From 5d1fed111a81284b61b4fe8cfaa7ee9dc1cc5edf Mon Sep 17 00:00:00 2001
From: nynex <nynex>
Date: Tue, 5 May 2015 12:27:32 +0000
Subject: [PATCH] v1.3 rebase

---
 trunk/BSDmakefile                             |     7 +
 trunk/Config.in                               |    33 +
 trunk/LICENSE                                 |   340 +
 trunk/Makefile                                |   105 +
 trunk/README                                  |    35 +
 trunk/README.md                               |    43 +
 trunk/config/Config-build.in                  |   219 +
 trunk/config/Config-devel.in                  |   111 +
 trunk/config/Config-images.in                 |   318 +
 trunk/config/Config-kernel.in                 |   467 +
 trunk/docs/BUILD_HOWTO.md                     |    58 +
 trunk/feeds.conf                              |     0
 trunk/include/autotools.mk                    |   166 +
 trunk/include/cmake.mk                        |    72 +
 trunk/include/debug.mk                        |    51 +
 trunk/include/depends.mk                      |    48 +
 trunk/include/device_table.txt                |     5 +
 trunk/include/download.mk                     |   184 +
 trunk/include/feeds.mk                        |    26 +
 trunk/include/host-build.mk                   |   205 +
 trunk/include/host.mk                         |    65 +
 trunk/include/image.mk                        |   289 +
 trunk/include/kernel-build.mk                 |   144 +
 trunk/include/kernel-defaults.mk              |   174 +
 trunk/include/kernel-version.mk               |    25 +
 trunk/include/kernel.mk                       |   231 +
 trunk/include/netfilter.mk                    |   382 +
 trunk/include/nls.mk                          |    40 +
 trunk/include/package-bin.mk                  |    33 +
 trunk/include/package-defaults.mk             |   157 +
 trunk/include/package-dumpinfo.mk             |    91 +
 trunk/include/package-ipkg.mk                 |   233 +
 trunk/include/package.mk                      |   316 +
 trunk/include/prereq-build.mk                 |   202 +
 trunk/include/prereq.mk                       |    62 +
 trunk/include/quilt.mk                        |   170 +
 trunk/include/scan.mk                         |    80 +
 trunk/include/scons.mk                        |    23 +
 trunk/include/shell.sh                        |    37 +
 trunk/include/site/aarch64-librecmc-linux-gnu |     5 +
 trunk/include/site/aarch64-linux              |    28 +
 .../site/aarch64_be-librecmc-linux-gnu        |     5 +
 trunk/include/site/aarch64_be-linux           |    28 +
 trunk/include/site/arm-librecmc-linux-gnu     |     5 +
 trunk/include/site/arm-librecmc-linux-gnueabi |     5 +
 trunk/include/site/arm-librecmc-linux-musl    |     5 +
 .../site/arm-librecmc-linux-muslgnueabi       |     5 +
 trunk/include/site/arm-librecmc-linux-uclibc  |     5 +
 .../site/arm-librecmc-linux-uclibcgnueabi     |     5 +
 trunk/include/site/arm-linux                  |    28 +
 trunk/include/site/armeb-librecmc-linux-gnu   |     5 +
 .../include/site/armeb-librecmc-linux-gnueabi |     5 +
 trunk/include/site/armeb-librecmc-linux-musl  |     5 +
 .../site/armeb-librecmc-linux-muslgnueabi     |     5 +
 .../include/site/armeb-librecmc-linux-uclibc  |     5 +
 .../site/armeb-librecmc-linux-uclibcgnueabi   |     5 +
 trunk/include/site/armeb-linux                |    28 +
 trunk/include/site/avr32-librecmc-linux-gnu   |     5 +
 .../include/site/avr32-librecmc-linux-uclibc  |     5 +
 trunk/include/site/avr32-linux                |    28 +
 trunk/include/site/cris-librecmc-linux-gnu    |     5 +
 trunk/include/site/cris-librecmc-linux-uclibc |     5 +
 trunk/include/site/cris-linux                 |    28 +
 trunk/include/site/i486-librecmc-linux-gnu    |     5 +
 trunk/include/site/i486-librecmc-linux-musl   |     5 +
 trunk/include/site/i486-librecmc-linux-uclibc |     5 +
 trunk/include/site/i486-linux                 |    28 +
 trunk/include/site/i686-librecmc-linux-gnu    |     5 +
 trunk/include/site/i686-librecmc-linux-musl   |     5 +
 trunk/include/site/i686-librecmc-linux-uclibc |     5 +
 trunk/include/site/i686-linux                 |    28 +
 trunk/include/site/linux                      |    78 +
 trunk/include/site/linux-gnu                  |     1 +
 trunk/include/site/linux-uclibc               |     1 +
 trunk/include/site/m68k-librecmc-linux-gnu    |     5 +
 trunk/include/site/m68k-librecmc-linux-uclibc |     5 +
 trunk/include/site/m68k-linux                 |    26 +
 trunk/include/site/mips-librecmc-linux-gnu    |     5 +
 trunk/include/site/mips-librecmc-linux-musl   |     5 +
 trunk/include/site/mips-librecmc-linux-uclibc |     5 +
 trunk/include/site/mips-linux                 |    28 +
 trunk/include/site/mips-linux-gnu             |     5 +
 trunk/include/site/mips64-librecmc-linux-gnu  |     5 +
 .../include/site/mips64-librecmc-linux-uclibc |     5 +
 trunk/include/site/mips64-linux               |    28 +
 .../include/site/mips64el-librecmc-linux-gnu  |     5 +
 .../site/mips64el-librecmc-linux-uclibc       |     5 +
 trunk/include/site/mips64el-linux             |    28 +
 trunk/include/site/mipsel-librecmc-linux-gnu  |     5 +
 trunk/include/site/mipsel-librecmc-linux-musl |     5 +
 .../include/site/mipsel-librecmc-linux-uclibc |     5 +
 .../site/mipsel-librecmc-linux2.4-uclibc      |     5 +
 trunk/include/site/mipsel-linux               |    28 +
 trunk/include/site/mipsel-linux-gnu           |     5 +
 trunk/include/site/powerpc-librecmc-linux-gnu |     5 +
 .../site/powerpc-librecmc-linux-gnuspe        |     5 +
 .../include/site/powerpc-librecmc-linux-musl  |     5 +
 .../site/powerpc-librecmc-linux-uclibc        |     5 +
 .../site/powerpc-librecmc-linux-uclibcspe     |     5 +
 trunk/include/site/powerpc-linux              |    28 +
 trunk/include/site/sparc-librecmc-linux-gnu   |     5 +
 .../include/site/sparc-librecmc-linux-uclibc  |     5 +
 trunk/include/site/sparc-linux                |    28 +
 trunk/include/site/sparc-linux-gnu            |     5 +
 trunk/include/site/x86_64-librecmc-linux-gnu  |     5 +
 trunk/include/site/x86_64-librecmc-linux-musl |     5 +
 .../include/site/x86_64-librecmc-linux-uclibc |     5 +
 trunk/include/site/x86_64-linux               |    28 +
 trunk/include/subdir.mk                       |    76 +
 trunk/include/target.mk                       |   296 +
 trunk/include/toolchain-build.mk              |    25 +
 trunk/include/toplevel.mk                     |   203 +
 trunk/include/uclibc++.mk                     |    16 +
 trunk/include/unpack.mk                       |    81 +
 trunk/include/verbose.mk                      |    67 +
 trunk/include/version.mk                      |    87 +
 trunk/package/Makefile                        |   174 +
 trunk/package/base-files/Makefile             |   159 +
 .../package/base-files/files/bin/board_detect |    14 +
 .../base-files/files/bin/config_generate      |   172 +
 trunk/package/base-files/files/bin/ipcalc.sh  |    71 +
 trunk/package/base-files/files/bin/login.sh   |    19 +
 trunk/package/base-files/files/etc/banner     |     7 +
 .../base-files/files/etc/banner.failsafe      |    13 +
 .../base-files/files/etc/config/network       |    18 +
 .../base-files/files/etc/config/system        |    11 +
 .../package/base-files/files/etc/device_info  |     3 +
 trunk/package/base-files/files/etc/diag.sh    |     4 +
 trunk/package/base-files/files/etc/group      |    10 +
 trunk/package/base-files/files/etc/hosts      |     1 +
 .../files/etc/hotplug.d/net/00-sysctl         |     6 +
 .../package/base-files/files/etc/init.d/boot  |    60 +
 .../package/base-files/files/etc/init.d/done  |    16 +
 trunk/package/base-files/files/etc/init.d/led |    92 +
 .../base-files/files/etc/init.d/sysctl        |     7 +
 .../base-files/files/etc/init.d/sysfixtime    |    11 +
 .../base-files/files/etc/init.d/system        |    49 +
 .../base-files/files/etc/init.d/umount        |     8 +
 trunk/package/base-files/files/etc/inittab    |     3 +
 .../base-files/files/etc/librecmc_release     |     7 +
 .../base-files/files/etc/librecmc_version     |     1 +
 trunk/package/base-files/files/etc/passwd     |     5 +
 trunk/package/base-files/files/etc/preinit    |    46 +
 trunk/package/base-files/files/etc/profile    |    16 +
 trunk/package/base-files/files/etc/protocols  |    56 +
 .../base-files/files/etc/rc.button/failsafe   |     3 +
 .../base-files/files/etc/rc.button/power      |     5 +
 .../base-files/files/etc/rc.button/reset      |    18 +
 .../base-files/files/etc/rc.button/rfkill     |    30 +
 trunk/package/base-files/files/etc/rc.common  |   138 +
 trunk/package/base-files/files/etc/rc.local   |     4 +
 trunk/package/base-files/files/etc/services   |   171 +
 trunk/package/base-files/files/etc/shadow     |     5 +
 trunk/package/base-files/files/etc/shells     |     1 +
 .../package/base-files/files/etc/sysctl.conf  |    30 +
 .../base-files/files/etc/sysupgrade.conf      |     5 +
 .../files/etc/uci-defaults/10_migrate-shadow  |    12 +
 .../files/etc/uci-defaults/11_migrate-sysctl  |    16 +
 .../etc/uci-defaults/12_network-generate-ula  |    15 +
 .../package/base-files/files/lib/functions.sh |   319 +
 .../base-files/files/lib/functions/leds.sh    |    68 +
 .../base-files/files/lib/functions/network.sh |   268 +
 .../base-files/files/lib/functions/preinit.sh |    87 +
 .../base-files/files/lib/functions/service.sh |   103 +
 .../base-files/files/lib/functions/system.sh  |   112 +
 .../files/lib/functions/uci-defaults-new.sh   |   302 +
 .../files/lib/functions/uci-defaults.sh       |   248 +
 .../files/lib/preinit/02_default_set_state    |     7 +
 .../files/lib/preinit/10_indicate_failsafe    |    17 +
 .../files/lib/preinit/10_indicate_preinit     |    49 +
 .../files/lib/preinit/30_failsafe_wait        |    96 +
 .../files/lib/preinit/40_run_failsafe_hook    |    12 +
 .../lib/preinit/50_indicate_regular_preinit   |    10 +
 .../files/lib/preinit/70_initramfs_test       |    13 +
 .../files/lib/preinit/80_mount_root           |    18 +
 .../files/lib/preinit/99_10_failsafe_login    |    16 +
 .../files/lib/preinit/99_10_run_init          |     9 +
 .../base-files/files/lib/upgrade/common.sh    |   245 +
 .../lib/upgrade/keep.d/base-files-essential   |    10 +
 trunk/package/base-files/files/rom/note       |     3 +
 trunk/package/base-files/files/sbin/firstboot |     3 +
 .../base-files/files/sbin/hotplug-call        |    18 +
 trunk/package/base-files/files/sbin/led.sh    |    25 +
 .../package/base-files/files/sbin/sysupgrade  |   232 +
 trunk/package/base-files/files/sbin/wifi      |   236 +
 trunk/package/base-files/image-config.in      |   274 +
 trunk/package/boot/grub2/Makefile             |    77 +
 .../grub2/patches/100-grub_setup_root.patch   |   118 +
 .../grub2/patches/200-fix-gets-removal.patch  |    16 +
 trunk/package/boot/kexec-tools/Config.in      |    26 +
 trunk/package/boot/kexec-tools/Makefile       |    87 +
 .../patches/0004-mips_regdefs.patch           |   103 +
 .../kexec-tools/patches/100-reduce_size.patch |    36 +
 trunk/package/boot/uboot-sunxi/Makefile       |   151 +
 ...96d4f1f602d62d36db660973249e16f9d088.patch | 10002 +++
 .../002-uboot-jwrdegoede-psci-support.patch   |  1495 +
 ...mac-not-working-reliable-on-bananapi.patch |    20 +
 trunk/package/boot/uboot-sunxi/uEnv.txt       |     5 +
 trunk/package/boot/uboot-xburst/Makefile      |    88 +
 .../0001-qi_lb60-add-nand-spl-support.patch   |   894 +
 ...qi_lb60-add-software-usbboot-support.patch |   916 +
 .../patches/0003-add-mmc-support.patch        |  1664 +
 ...dd-more-boot-options-F1-F2-F3-F4-M-S.patch |   200 +
 .../0005-add-nanonote-lcd-support.patch       |   847 +
 .../patches/0006-enable-silent-console.patch  |    60 +
 trunk/package/devel/binutils/Makefile         |    83 +
 trunk/package/devel/diffutils/Makefile        |    62 +
 trunk/package/devel/gcc/Makefile              |   115 +
 trunk/package/devel/gcc/README                |     8 +
 ...t-choke-when-building-32bit-on-64bit.patch |    15 +
 .../gcc/patches/003-mpfr-longlong-mips.patch  |    38 +
 .../devel/gcc/patches/010-documentation.patch |    23 +
 .../020-disable-check-for-sys-sdt-h.patch     |    45 +
 .../devel/gcc/patches/100-uclibc-conf.patch   |    33 +
 .../package/devel/gcc/patches/200-musl.patch  |   321 +
 .../patches/800-arm_v5te_no_ldrd_strd.patch   |    11 +
 .../patches/810-arm-softfloat-libgcc.patch    |    25 +
 .../devel/gcc/patches/820-libgcc_pic.patch    |    36 +
 .../gcc/patches/830-arm_unbreak_armv4t.patch  |    13 +
 .../840-armv4_pass_fix-v4bx_to_ld.patch       |    19 +
 .../gcc/patches/850-use_shared_libgcc.patch   |    47 +
 .../gcc/patches/860-uclibc_use_eh_frame.patch |    29 +
 .../gcc/patches/870-ppc_no_crtsavres.patch    |    11 +
 .../gcc/patches/880-no_java_section.patch     |    11 +
 .../gcc/patches/900-bad-mips16-crt.patch      |     9 +
 .../devel/gcc/patches/910-mbsd_multi.patch    |   253 +
 .../patches/920-specs_nonfatal_getenv.patch   |    14 +
 trunk/package/devel/gdb/Makefile              |    87 +
 .../001-gdb-pr14523-mips-signal-number.patch  |    16 +
 .../devel/gdb/patches/100-musl_fix.patch      |    28 +
 .../101-arm-uclibc-sim-needs-libm.patch       |    22 +
 trunk/package/devel/oprofile/Makefile         |    92 +
 .../100-use_insmod_instead_of_modprobe.patch  |    11 +
 .../patches/110-fix_compile_error.patch       |    30 +
 trunk/package/devel/patch/Makefile            |    48 +
 trunk/package/devel/perf/Makefile             |    66 +
 trunk/package/devel/strace/Makefile           |    50 +
 .../devel/strace/patches/100-musl_fix.patch   |   165 +
 trunk/package/devel/trace-cmd/Makefile        |    63 +
 .../patches/110-mac80211_tracepoint.patch     |    24 +
 trunk/package/devel/valgrind/Makefile         |   177 +
 .../package/devel/valgrind/files/default.supp |    42 +
 .../patches/100-fix_configure_check.patch     |    11 +
 .../valgrind/patches/110-add_a_out_h.patch    |   157 +
 .../devel/valgrind/patches/200-musl_fix.patch |    45 +
 trunk/package/devel/valgrind/src/abort.c      |     3 +
 trunk/package/kernel/button-hotplug/Makefile  |    55 +
 .../package/kernel/button-hotplug/src/Kconfig |     2 +
 .../kernel/button-hotplug/src/Makefile        |     1 +
 .../button-hotplug/src/button-hotplug.c       |   343 +
 .../kernel/gpio-button-hotplug/Makefile       |    51 +
 .../kernel/gpio-button-hotplug/src/Makefile   |     1 +
 .../src/gpio-button-hotplug.c                 |   660 +
 trunk/package/kernel/hostap-driver/Makefile   |   117 +
 .../hostap-driver/files/lib/wifi/hostap.sh    |   270 +
 .../patches/001-fix-txpower.patch             |   175 +
 trunk/package/kernel/i2c-gpio-custom/Makefile |    53 +
 .../kernel/i2c-gpio-custom/src/Kconfig        |    10 +
 .../kernel/i2c-gpio-custom/src/Makefile       |     1 +
 .../i2c-gpio-custom/src/i2c-gpio-custom.c     |   202 +
 trunk/package/kernel/linux/Makefile           |    65 +
 .../kernel/linux/modules/001-depends.mk       |    32 +
 trunk/package/kernel/linux/modules/block.mk   |   603 +
 trunk/package/kernel/linux/modules/can.mk     |   276 +
 trunk/package/kernel/linux/modules/crypto.mk  |   582 +
 trunk/package/kernel/linux/modules/fs.mk      |   447 +
 trunk/package/kernel/linux/modules/hwmon.mk   |   306 +
 trunk/package/kernel/linux/modules/i2c.mk     |   262 +
 trunk/package/kernel/linux/modules/input.mk   |   204 +
 trunk/package/kernel/linux/modules/leds.mk    |   199 +
 trunk/package/kernel/linux/modules/lib.mk     |   204 +
 .../kernel/linux/modules/netdevices.mk        |   736 +
 .../package/kernel/linux/modules/netfilter.mk |   823 +
 .../kernel/linux/modules/netsupport.mk        |   984 +
 trunk/package/kernel/linux/modules/nls.mk     |   307 +
 trunk/package/kernel/linux/modules/other.mk   |   919 +
 trunk/package/kernel/linux/modules/pcmcia.mk  |    74 +
 trunk/package/kernel/linux/modules/sound.mk   |   288 +
 trunk/package/kernel/linux/modules/spi.mk     |    91 +
 trunk/package/kernel/linux/modules/usb.mk     |  1487 +
 trunk/package/kernel/linux/modules/video.mk   |   740 +
 trunk/package/kernel/linux/modules/virtual.mk |   188 +
 trunk/package/kernel/linux/modules/w1.mk      |   176 +
 .../package/kernel/linux/modules/wireless.mk  |     8 +
 trunk/package/kernel/mac80211/Makefile        |   410 +
 .../files/lib/netifd/wireless/mac80211.sh     |   708 +
 .../mac80211/files/lib/wifi/mac80211.sh       |   126 +
 trunk/package/kernel/mac80211/files/regdb.txt |  1215 +
 .../mac80211/patches/000-fix_kconfig.patch    |    16 +
 .../mac80211/patches/001-fix_build.patch      |   156 +
 .../patches/002-change_allconfig.patch        |    44 +
 .../patches/003-remove_bogus_modparams.patch  |    34 +
 .../patches/008-fix_netdev_unregister.patch   |    16 +
 .../mac80211/patches/010-disable_rfkill.patch |    13 +
 .../patches/050-lib80211_option.patch         |    30 +
 .../patches/080-disable_clk_backport.patch    |    20 +
 .../patches/081-backport-devm_kmemdup.patch   |    23 +
 .../082-backport-list_last_entry.patch        |    20 +
 .../patches/100-revert_aes_ccm_port.patch     |   347 +
 .../110-mac80211_keep_keys_on_stop_ap.patch   |    12 +
 .../patches/150-disable_addr_notifier.patch   |    67 +
 .../201-ath5k-WAR-for-AR71xx-PCI-bug.patch    |    38 +
 .../kernel/mac80211/patches/210-ap_scan.patch |    11 +
 ...-Revert-ath5k-Remove-AHB-bus-support.patch |   395 +
 ...301-ath5k-fix-AHB-kconfig-dependency.patch |    37 +
 ...t-for-reporting-tx-power-to-mac80211.patch |   118 +
 .../304-ath9k-Fix-RTC_DERIVED_CLK-usage.patch |    61 +
 ...-debugfs-when-not-using-chan-context.patch |    33 +
 ...-regression-in-bssidmask-calculation.patch |    70 +
 ...t-early-IRQs-from-accessing-hardware.patch |    38 +
 ...OP_INVALID-before-disabling-hardware.patch |    29 +
 ...access-hardware-on-IRQs-during-reset.patch |    61 +
 ...gacy-rate-mask-handling-for-VHT-rate.patch |    22 +
 ...l_ht-add-a-small-optimization-to-min.patch |    33 +
 ...l_ht-move-aggregation-check-to-.get_.patch |    33 +
 ...-tx_status_noskb-to-rate_control_ops.patch |    43 +
 ...-minstrel-switch-to-.tx_status_noskb.patch |    31 +
 ...nstrel_ht-switch-to-.tx_status_noskb.patch |    41 +
 ...c80211-add-ieee80211_tx_status_noskb.patch |   219 +
 ...strel_ht-fix-a-crash-in-rate-sorting.patch |    47 +
 ...fy-drivers-on-sta-rate-table-changes.patch |    92 +
 ...intermediate-software-queue-implemen.patch |   498 +
 ...more-missing-checks-for-VHT-tx-rates.patch |    34 +
 ...11-copy-chandef-from-AP-vif-to-VLANs.patch |    82 +
 ...h9k_hw-fix-hardware-queue-allocation.patch |    31 +
 .../325-ath9k-fix-BE-BK-queue-order.patch     |    24 +
 ...-fix-hardware-queue-index-assignment.patch |    29 +
 .../patches/400-ath_move_debug_code.patch     |    30 +
 .../patches/401-ath9k_blink_default.patch     |    11 +
 .../patches/402-ath_regd_optional.patch       |    69 +
 .../patches/403-world_regd_fixup.patch        |    84 +
 .../patches/404-regd_no_assoc_hints.patch     |    19 +
 .../mac80211/patches/405-ath_regd_us.patch    |    26 +
 .../410-ath9k_allow_adhoc_and_ap.patch        |    10 +
 .../411-ath5k_allow_adhoc_and_ap.patch        |    46 +
 .../patches/420-ath5k_disable_fast_cc.patch   |    18 +
 .../patches/430-add_ath5k_platform.patch      |    33 +
 ...add_platform_eeprom_support_to_ath5k.patch |    56 +
 .../patches/432-ath5k_add_pciids.patch        |    11 +
 .../440-ath5k_channel_bw_debugfs.patch        |   143 +
 .../patches/500-ath9k_eeprom_debugfs.patch    |    65 +
 .../mac80211/patches/501-ath9k_ahb_init.patch |    32 +
 .../510-ath9k_intr_mitigation_tweak.patch     |    18 +
 .../patches/511-ath9k_reduce_rxbuf.patch      |    11 +
 .../patches/512-ath9k_channelbw_debugfs.patch |   125 +
 .../patches/513-ath9k_add_pci_ids.patch       |    30 +
 .../522-mac80211_configure_antenna_gain.patch |   160 +
 .../patches/530-ath9k_extra_leds.patch        |   248 +
 .../531-ath9k_extra_platform_leds.patch       |    71 +
 .../540-ath9k_reduce_ani_interval.patch       |    11 +
 .../patches/541-ath9k_rx_dma_stop_check.patch |    28 +
 .../patches/542-ath9k_debugfs_diag.patch      |   139 +
 .../patches/543-ath9k_entropy_from_adc.patch  |   186 +
 ...544-ath9k-ar933x-usb-hang-workaround.patch |    79 +
 .../patches/545-ath9k_ani_ws_detect.patch     |   155 +
 .../mac80211/scripts/import-backports.sh      |   109 +
 trunk/package/kernel/mmc_over_gpio/Makefile   |    77 +
 .../mmc_over_gpio/files/mmc_over_gpio.config  |     8 +
 .../mmc_over_gpio/files/mmc_over_gpio.init    |    83 +
 trunk/package/kernel/om-watchdog/Makefile     |    45 +
 .../kernel/om-watchdog/files/om-watchdog      |    15 +
 .../kernel/om-watchdog/files/om-watchdog.init |    36 +
 .../kernel/rotary-gpio-custom/Makefile        |    53 +
 .../kernel/rotary-gpio-custom/src/Kconfig     |     9 +
 .../kernel/rotary-gpio-custom/src/Makefile    |     1 +
 .../src/rotary-gpio-custom.c                  |   193 +
 trunk/package/kernel/rtc-rv5c386a/Makefile    |    38 +
 .../package/kernel/rtc-rv5c386a/src/Makefile  |    18 +
 trunk/package/kernel/rtc-rv5c386a/src/rtc.c   |   613 +
 trunk/package/kernel/spi-gpio-custom/Makefile |    53 +
 .../kernel/spi-gpio-custom/src/Kconfig        |    14 +
 .../kernel/spi-gpio-custom/src/Makefile       |     1 +
 .../spi-gpio-custom/src/spi-gpio-custom.c     |   365 +
 trunk/package/kernel/spi-ks8995/Makefile      |    54 +
 trunk/package/kernel/spi-ks8995/src/Kconfig   |     3 +
 trunk/package/kernel/spi-ks8995/src/Makefile  |     1 +
 .../kernel/spi-ks8995/src/spi_ks8995.c        |   419 +
 trunk/package/kernel/trelay/Makefile          |    50 +
 .../package/kernel/trelay/files/trelay.config |     4 +
 .../kernel/trelay/files/trelay.hotplug        |     5 +
 trunk/package/kernel/trelay/files/trelay.init |    32 +
 trunk/package/kernel/trelay/src/Makefile      |     1 +
 trunk/package/kernel/trelay/src/trelay.c      |   272 +
 trunk/package/kernel/w1-gpio-custom/Makefile  |    54 +
 .../package/kernel/w1-gpio-custom/src/Kconfig |     4 +
 .../kernel/w1-gpio-custom/src/Makefile        |     1 +
 .../w1-gpio-custom/src/w1-gpio-custom.c       |   189 +
 trunk/package/lang/dkjson/Makefile            |    46 +
 trunk/package/lang/erlang/Makefile            |   335 +
 .../patches/101-emulator_includes.patch       |    11 +
 .../erlang/patches/103-disable_emacs.patch    |    11 +
 trunk/package/lang/lua-bencode/Makefile       |    50 +
 trunk/package/lang/lua-mosquitto/Makefile     |    41 +
 trunk/package/lang/lua-penlight/Makefile      |    45 +
 trunk/package/lang/lua-sha2/Makefile          |    52 +
 .../lang/lua-sha2/patches/001-makefile.patch  |    14 +
 trunk/package/lang/luabitop/Makefile          |    53 +
 trunk/package/lang/luaexpat/Makefile          |    56 +
 .../luaexpat/files/compat-5.1r5/compat-5.1.c  |    97 +
 .../luaexpat/files/compat-5.1r5/compat-5.1.h  |    13 +
 .../files/compat-5.1r5/compat-5.1.lua         |   267 +
 trunk/package/lang/luafilesystem/Makefile     |    66 +
 trunk/package/lang/luai2c/Makefile            |    46 +
 trunk/package/lang/lualanes/Makefile          |    58 +
 trunk/package/lang/luaposix/Makefile          |    56 +
 .../luaposix/patches/100-eglibc-compat.patch  |    29 +
 .../luaposix/patches/101-disable-curses.patch |    30 +
 trunk/package/lang/luasec/Makefile            |    58 +
 trunk/package/lang/luasoap/Makefile           |    56 +
 trunk/package/lang/luasocket/Makefile         |    62 +
 .../patches/0001-Add-interface-support.patch  |   237 +
 trunk/package/lang/luasql/Makefile            |   116 +
 trunk/package/lang/micropython-lib/Makefile   |    55 +
 trunk/package/lang/micropython/Makefile       |    52 +
 .../package/lang/perl-compress-bzip2/Makefile |    48 +
 trunk/package/lang/perl-dbi/Makefile          |    63 +
 trunk/package/lang/perl-html-parser/Makefile  |    48 +
 trunk/package/lang/perl-html-tagset/Makefile  |    48 +
 trunk/package/lang/perl-html-tree/Makefile    |    49 +
 .../lang/perl-lockfile-simple/Makefile        |    48 +
 trunk/package/lang/perl-net-telnet/Makefile   |    48 +
 trunk/package/lang/perl-test-harness/Makefile |    48 +
 trunk/package/lang/perl-uri/Makefile          |    48 +
 trunk/package/lang/perl-www-curl/Makefile     |    49 +
 ...rl-www-curl_disable_curl-config_hack.patch |    74 +
 .../patches/200-fix_default_lflags.patch      |    11 +
 .../package/lang/perl-www-mechanize/Makefile  |    48 +
 trunk/package/lang/perl-www/Makefile          |    48 +
 ...ttps-call-verify-hostname-when-avail.patch |    41 +
 ...wp-https-verify-hostnames-by-default.patch |   113 +
 trunk/package/lang/perl/Config.in             |    15 +
 trunk/package/lang/perl/Makefile              |   178 +
 .../package/lang/perl/files/config.sh-arm.in  |  1161 +
 .../lang/perl/files/config.sh-armeb.in        |  1161 +
 .../lang/perl/files/config.sh-avr32.in        |  1163 +
 .../package/lang/perl/files/config.sh-i486.in |  1147 +
 .../package/lang/perl/files/config.sh-mips.in |  1161 +
 .../lang/perl/files/config.sh-mipsel.in       |  1147 +
 .../lang/perl/files/config.sh-powerpc.in      |  1161 +
 .../lang/perl/files/config.sh-x86_64.in       |  1147 +
 .../package/lang/perl/files/perl-run_tests.sh |    24 +
 ...x-cross-compile-endianness-detection.patch |    22 +
 ...st-libc-dir-moved-debian+derivatives.patch |    27 +
 .../patches/300-always_use_miniperl.patch     |    27 +
 .../400-add_microperl_caretx_dependency.patch |    22 +
 .../perl/patches/500-add-relink-hack.patch    |     6 +
 trunk/package/lang/perl/perlbase.mk           |  1539 +
 trunk/package/lang/perl/perlmod.mk            |   155 +
 trunk/package/lang/php5/Makefile              |   538 +
 trunk/package/lang/php5/files/php.ini         |   311 +
 .../lang/php5/files/php5-fastcgi.config       |     3 +
 .../package/lang/php5/files/php5-fastcgi.init |    30 +
 .../php5/patches/090-restore-sqlite2.patch    | 50845 ++++++++++++++++
 .../lang/php5/patches/091-fix-sqlite2.patch   |   101 +
 ...fix_membar_producer_link_error_gcc3x.patch |    11 +
 ...bian_patches_use_embedded_timezonedb.patch |   620 +
 ...bian_patches_use_embedded_timezonedb.patch |    19 +
 .../950-Fix-dl-cross-compiling-issue.patch    |    14 +
 trunk/package/lang/php5/pecl.mk               |    47 +
 trunk/package/lang/python-dns/Makefile        |    48 +
 trunk/package/lang/python-imglib/Makefile     |    62 +
 .../patches/010-cross-compile.patch           |    48 +
 .../patches/020-freetype-header-include.patch |    21 +
 trunk/package/lang/python-mysql/Makefile      |    50 +
 .../python-mysql/patches/010-threadsafe.patch |    11 +
 trunk/package/lang/python-pip/Makefile        |    54 +
 trunk/package/lang/python-setuptools/Makefile |    60 +
 trunk/package/lang/python/Makefile            |   209 +
 trunk/package/lang/python/files/config.site   |    12 +
 .../lang/python/files/python-package.mk       |   100 +
 .../lang/python/patches/110-enable-zlib.patch |    25 +
 ...dd-include-dirs-when-cross-compiling.patch |    14 +
 .../130-do-not-run-distutils-tests.patch      |    37 +
 .../140-do-not-write-bytes-codes.patch        |    22 +
 trunk/package/lang/python3/Makefile           |   196 +
 trunk/package/lang/python3/files/config.site  |    12 +
 .../lang/python3/files/python3-package.mk     |   100 +
 .../python3/patches/110-enable-zlib.patch     |    25 +
 ...dd-include-dirs-when-cross-compiling.patch |    14 +
 .../130-do-not-run-distutils-tests.patch      |    37 +
 .../140-do-not-write-bytes-codes.patch        |    22 +
 trunk/package/lang/ruby/Makefile              |  1340 +
 trunk/package/lang/ruby/files/ruby            |     5 +
 .../patches/001-rdoc-remove_gems_dep.patch    |    32 +
 .../002-minitest-remove_gems_dep.patch        |    13 +
 .../003-digest_rmd160_wrong_name_fix.patch    |    12 +
 ...4-digest_dont-link-ssl-if-not-needed.patch |   117 +
 trunk/package/lang/ruby/ruby_find_pkgsdeps    |   265 +
 trunk/package/lang/ruby/ruby_missingfiles     |    20 +
 trunk/package/lang/simplejson/Makefile        |    48 +
 trunk/package/lang/vala/Makefile              |    73 +
 trunk/package/libs/cyassl/Makefile            |    58 +
 .../cyassl/patches/100-respect_cflags.patch   |    11 +
 .../200-SSL_accept-handle-hello-garbage.patch |    13 +
 trunk/package/libs/gettext-full/Makefile      |    80 +
 .../gettext-full/patches/001-autotools.patch  |    35 +
 .../patches/001-no_examples_and_tests.patch   |    22 +
 .../003-gettext-error_print_progname.patch    |    11 +
 .../patches/100-error_progname.patch          |    10 +
 .../patches/110-error_progname_def.patch      |    11 +
 .../patches/120-uclibc-nolocale.patch         |    11 +
 .../patches/150-disable_libxml_iconv.patch    |    22 +
 trunk/package/libs/gettext/Makefile           |    68 +
 trunk/package/libs/gettext/src/LICENSE        |     7 +
 .../libs/gettext/src/include/libintl.h        |    53 +
 trunk/package/libs/gettext/src/m4/codeset.m4  |    21 +
 trunk/package/libs/gettext/src/m4/gettext.m4  |   383 +
 trunk/package/libs/gettext/src/m4/intl.m4     |   294 +
 trunk/package/libs/gettext/src/m4/intldir.m4  |    19 +
 .../package/libs/gettext/src/m4/intlmacosx.m4 |    51 +
 .../package/libs/gettext/src/m4/lcmessage.m4  |    31 +
 trunk/package/libs/gettext/src/m4/nls.m4      |    32 +
 trunk/package/libs/gettext/src/m4/po.m4       |   449 +
 trunk/package/libs/glib2/Makefile             |   102 +
 trunk/package/libs/gmp/Makefile               |    70 +
 trunk/package/libs/libbsd/Makefile            |    57 +
 .../libbsd/patches/001-aarch64_support.patch  |    19 +
 trunk/package/libs/libconfig/Makefile         |    59 +
 trunk/package/libs/libevent2/Makefile         |   158 +
 trunk/package/libs/libffi/Makefile            |    81 +
 trunk/package/libs/libiconv-full/Makefile     |    93 +
 .../patches/100-strip_charsets.patch          |  3438 ++
 .../libiconv-full/patches/101-autotools.patch | 26014 ++++++++
 .../patches/103-configure_ac_fix.patch        |    31 +
 .../patches/200-work-with-libtool2.patch      |    17 +
 trunk/package/libs/libiconv/COPYING           |   504 +
 trunk/package/libs/libiconv/COPYRIGHT         |    20 +
 trunk/package/libs/libiconv/Makefile          |    84 +
 trunk/package/libs/libiconv/src/LICENSE       |     6 +
 trunk/package/libs/libiconv/src/iconv.c       |   440 +
 .../libs/libiconv/src/include/charmaps.h      |    80 +
 .../src/include/charmaps/iso-8859-10.h        |    24 +
 .../src/include/charmaps/iso-8859-13.h        |    24 +
 .../src/include/charmaps/iso-8859-14.h        |    25 +
 .../src/include/charmaps/iso-8859-16.h        |    24 +
 .../src/include/charmaps/iso-8859-2.h         |    24 +
 .../src/include/charmaps/iso-8859-3.h         |    24 +
 .../src/include/charmaps/iso-8859-4.h         |    24 +
 .../src/include/charmaps/iso-8859-5.h         |    24 +
 .../src/include/charmaps/iso-8859-6.h         |    24 +
 .../src/include/charmaps/iso-8859-7.h         |    24 +
 .../src/include/charmaps/iso-8859-8.h         |    24 +
 .../src/include/charmaps/iso-8859-9.h         |    24 +
 .../libiconv/src/include/charmaps/koi8-r.h    |    24 +
 .../src/include/charmaps/windows-1250.h       |    24 +
 .../src/include/charmaps/windows-1251.h       |    24 +
 .../src/include/charmaps/windows-1252.h       |    25 +
 .../src/include/charmaps/windows-1253.h       |    24 +
 .../src/include/charmaps/windows-1254.h       |    24 +
 .../src/include/charmaps/windows-1255.h       |    24 +
 .../src/include/charmaps/windows-1256.h       |    24 +
 .../src/include/charmaps/windows-1257.h       |    24 +
 .../src/include/charmaps/windows-1258.h       |    24 +
 .../src/include/charmaps/windows-874.h        |    24 +
 .../package/libs/libiconv/src/include/iconv.h |    32 +
 trunk/package/libs/libiconv/src/m4/iconv.m4   |   214 +
 trunk/package/libs/libjson-c/Makefile         |    78 +
 trunk/package/libs/libmnl/Makefile            |    77 +
 .../libmnl/patches/100-upstream-fixes.patch   |   416 +
 .../libs/libnetfilter-conntrack/Makefile      |    74 +
 trunk/package/libs/libnetfilter-log/Makefile  |    74 +
 ...ecessary-pkgconfig-config.status-dep.patch |    25 +
 ...d-remove-unused-lines-in-Makefile.am.patch |    24 +
 ...build-resolve-automake-1.12-warnings.patch |    29 +
 ...e-needed-for-integer-type-definition.patch |    24 +
 ...0005-configure-uclinux-is-also-linux.patch |    27 +
 ...thout-ipulog-option-to-disable-libip.patch |    95 +
 trunk/package/libs/libnfnetlink/Makefile      |    71 +
 .../patches/100-missing_include.patch         |    10 +
 trunk/package/libs/libnftnl/Makefile          |    73 +
 trunk/package/libs/libnl-tiny/Makefile        |    55 +
 .../libs/libnl-tiny/files/libnl-tiny.pc       |    10 +
 trunk/package/libs/libnl-tiny/src/Makefile    |    17 +
 trunk/package/libs/libnl-tiny/src/attr.c      |   668 +
 trunk/package/libs/libnl-tiny/src/cache.c     |   839 +
 .../package/libs/libnl-tiny/src/cache_mngt.c  |   253 +
 trunk/package/libs/libnl-tiny/src/error.c     |   116 +
 trunk/package/libs/libnl-tiny/src/genl.c      |   268 +
 trunk/package/libs/libnl-tiny/src/genl_ctrl.c |   302 +
 .../package/libs/libnl-tiny/src/genl_family.c |   136 +
 trunk/package/libs/libnl-tiny/src/genl_mngt.c |   274 +
 trunk/package/libs/libnl-tiny/src/handlers.c  |   162 +
 .../libnl-tiny/src/include/linux/gen_stats.h  |    67 +
 .../libnl-tiny/src/include/linux/genetlink.h  |    83 +
 .../libs/libnl-tiny/src/include/linux/if.h    |   131 +
 .../libnl-tiny/src/include/linux/if_addr.h    |    62 +
 .../libnl-tiny/src/include/linux/netlink.h    |   150 +
 .../libnl-tiny/src/include/netlink-generic.h  |    20 +
 .../libnl-tiny/src/include/netlink-local.h    |   158 +
 .../libnl-tiny/src/include/netlink-types.h    |    81 +
 .../libnl-tiny/src/include/netlink/addr.h     |    69 +
 .../libnl-tiny/src/include/netlink/attr.h     |   726 +
 .../src/include/netlink/cache-api.h           |   199 +
 .../libnl-tiny/src/include/netlink/cache.h    |   128 +
 .../libnl-tiny/src/include/netlink/data.h     |    41 +
 .../libnl-tiny/src/include/netlink/errno.h    |    64 +
 .../src/include/netlink/genl/ctrl.h           |    37 +
 .../src/include/netlink/genl/family.h         |   130 +
 .../src/include/netlink/genl/genl.h           |    47 +
 .../src/include/netlink/genl/mngt.h           |    87 +
 .../libnl-tiny/src/include/netlink/handlers.h |   230 +
 .../libnl-tiny/src/include/netlink/list.h     |    88 +
 .../libs/libnl-tiny/src/include/netlink/msg.h |   308 +
 .../src/include/netlink/netlink-compat.h      |    50 +
 .../src/include/netlink/netlink-kernel.h      |   196 +
 .../libnl-tiny/src/include/netlink/netlink.h  |    82 +
 .../src/include/netlink/object-api.h          |   331 +
 .../libnl-tiny/src/include/netlink/object.h   |   164 +
 .../libnl-tiny/src/include/netlink/socket.h   |   221 +
 .../libnl-tiny/src/include/netlink/types.h    |   121 +
 .../libnl-tiny/src/include/netlink/utils.h    |    78 +
 .../libnl-tiny/src/include/netlink/version.h  |    18 +
 .../package/libs/libnl-tiny/src/include/unl.h |    47 +
 trunk/package/libs/libnl-tiny/src/msg.c       |   566 +
 trunk/package/libs/libnl-tiny/src/nl.c        |   720 +
 trunk/package/libs/libnl-tiny/src/object.c    |   279 +
 trunk/package/libs/libnl-tiny/src/socket.c    |   406 +
 trunk/package/libs/libnl-tiny/src/unl.c       |   290 +
 trunk/package/libs/libnl/Makefile             |    57 +
 trunk/package/libs/libpcap/Config.in          |    15 +
 trunk/package/libs/libpcap/Makefile           |    98 +
 .../patches/100-debian_shared_lib.patch       |   174 +
 .../102-makefile_disable_manpages.patch       |    71 +
 .../103-makefile_flex_workaround.patch        |    14 +
 .../patches/201-space_optimization.patch      |   133 +
 .../libpcap/patches/202-protocol_api.patch    |   140 +
 .../patches/203-undef_iw_mode_monitor.patch   |    11 +
 trunk/package/libs/libreadline/Makefile       |    74 +
 trunk/package/libs/libroxml/Makefile          |    48 +
 trunk/package/libs/librpc/Makefile            |    34 +
 .../libs/librpc/patches/100-compat_fix.patch  |   214 +
 .../libs/librpc/patches/110-musl_fixes.patch  |   330 +
 trunk/package/libs/libtool/Makefile           |    52 +
 trunk/package/libs/libubox/Makefile           |    99 +
 trunk/package/libs/libusb-compat/Makefile     |    53 +
 trunk/package/libs/libusb/Makefile            |    50 +
 .../libs/libusb/patches/001-timerfd.patch     |    33 +
 trunk/package/libs/lzo/Makefile               |    63 +
 trunk/package/libs/ncurses/Makefile           |   154 +
 .../100-ncurses-5.6-20080112-urxvt.patch      |   175 +
 .../101-ncurses-5.6-20080628-kbs.patch        |    52 +
 .../patches/200-fix_missing_include.patch     |    14 +
 .../libs/ncurses/patches/500-cross.patch      |    11 +
 .../libs/ncurses/patches/900-terminfo.patch   |    20 +
 trunk/package/libs/nettle/Config.in           |     9 +
 trunk/package/libs/nettle/Makefile            |    86 +
 .../patches/0001-Updated-mini-gmp.patch       |  1738 +
 ...ed-option-to-use-mini-gmp-in-hogweed.patch |   463 +
 ...cros-in-nettle.m4-to-allow-regenerat.patch |  1241 +
 ...Added-auto-generated-nettle-config.h.patch |   100 +
 ...er-iterator-to-be-used-with-mini-gmp.patch |    34 +
 .../package/libs/ocf-crypto-headers/Makefile  |    39 +
 .../libs/ocf-crypto-headers/src/cryptodev.h   |   480 +
 trunk/package/libs/openssl/Config.in          |    28 +
 trunk/package/libs/openssl/Makefile           |   214 +
 .../patches/110-optimize-for-size.patch       |    14 +
 .../libs/openssl/patches/130-perl-path.patch  |    64 +
 .../openssl/patches/140-makefile-dirs.patch   |    11 +
 .../libs/openssl/patches/150-no_engines.patch |    81 +
 .../patches/160-disable_doc_tests.patch       |    58 +
 .../libs/openssl/patches/170-bash_path.patch  |     8 +
 .../patches/180-fix_link_segfault.patch       |    18 +
 .../patches/190-remove_timestamp_check.patch  |    23 +
 .../openssl/patches/200-parallel_build.patch  |   334 +
 .../openssl/patches/210-termios_fix.patch     |    11 +
 trunk/package/libs/polarssl/Makefile          |    69 +
 .../polarssl/patches/100-disable_sslv3.patch  |    12 +
 .../polarssl/patches/200-reduce_config.patch  |   212 +
 trunk/package/libs/popt/Makefile              |    60 +
 .../libs/popt/patches/002-no-intl.patch       |    81 +
 trunk/package/libs/sysfsutils/Makefile        |    73 +
 .../patches/200-mnt_path_check.patch          |    55 +
 trunk/package/libs/toolchain/Makefile         |   637 +
 .../toolchain/eglibc-files/etc/nsswitch.conf  |    13 +
 trunk/package/libs/uclibc++/Makefile          |    93 +
 .../libs/uclibc++/files/config.default        |    58 +
 .../uclibc++/patches/002-path_to_bash.patch   |    11 +
 .../libs/uclibc++/patches/006-eabi_fix.patch  |    38 +
 trunk/package/libs/uclient/Makefile           |    51 +
 trunk/package/libs/ustream-ssl/Makefile       |    73 +
 trunk/package/libs/zlib/Makefile              |    72 +
 trunk/package/luci/CONTRIBUTING.md            |    43 +
 trunk/package/luci/INSTALL                    |    27 +
 trunk/package/luci/LICENSE                    |   201 +
 trunk/package/luci/Makefile                   |    99 +
 trunk/package/luci/NOTICE                     |     9 +
 trunk/package/luci/README.md                  |    21 +
 trunk/package/luci/THANKYOU                   |    26 +
 .../applications/freifunk-community/Makefile  |     2 +
 .../luci/applications/luci-ahcp/Makefile      |     4 +
 .../luci-ahcp/luasrc/controller/ahcp.lua      |    60 +
 .../luci-ahcp/luasrc/model/cbi/ahcp.lua       |   121 +
 .../luasrc/view/admin_status/index/ahcp.htm   |     1 +
 .../luci-ahcp/luasrc/view/ahcp_status.htm     |    53 +
 .../luci-ahcp/root/etc/uci-defaults/luci-ahcp |    11 +
 .../luci/applications/luci-asterisk/Makefile  |     4 +
 .../applications/luci-asterisk/ipkg/postinst  |     6 +
 .../luci-asterisk/luasrc/asterisk.lua         |   759 +
 .../luci-asterisk/luasrc/asterisk/cc_idd.lua  |   254 +
 .../luasrc/controller/asterisk.lua            |   205 +
 .../luasrc/model/cbi/asterisk-dialplans.lua   |   102 +
 .../model/cbi/asterisk-iax-connections.lua    |    60 +
 .../luasrc/model/cbi/asterisk-meetme.lua      |    33 +
 .../luasrc/model/cbi/asterisk-mod-app.lua     |   391 +
 .../luasrc/model/cbi/asterisk-mod-cdr.lua     |    58 +
 .../luasrc/model/cbi/asterisk-mod-chan.lua    |    56 +
 .../luasrc/model/cbi/asterisk-mod-codec.lua   |    64 +
 .../luasrc/model/cbi/asterisk-mod-format.lua  |   100 +
 .../luasrc/model/cbi/asterisk-mod-func.lua    |    40 +
 .../luasrc/model/cbi/asterisk-mod-pbx.lua     |    64 +
 .../model/cbi/asterisk-mod-res-feature.lua    |   111 +
 .../luasrc/model/cbi/asterisk-mod-res.lua     |    88 +
 .../model/cbi/asterisk-sip-connections.lua    |   109 +
 .../luasrc/model/cbi/asterisk-voice.lua       |    52 +
 .../luasrc/model/cbi/asterisk.lua             |   162 +
 .../model/cbi/asterisk/dialplan_out.lua       |   137 +
 .../luasrc/model/cbi/asterisk/dialplans.lua   |   115 +
 .../luasrc/model/cbi/asterisk/dialzones.lua   |   135 +
 .../luasrc/model/cbi/asterisk/meetme.lua      |    49 +
 .../model/cbi/asterisk/meetme_settings.lua    |    28 +
 .../luasrc/model/cbi/asterisk/phone_sip.lua   |   157 +
 .../luasrc/model/cbi/asterisk/phones.lua      |   116 +
 .../luasrc/model/cbi/asterisk/trunk_sip.lua   |    98 +
 .../luasrc/model/cbi/asterisk/trunks.lua      |   106 +
 .../luasrc/model/cbi/asterisk/voicemail.lua   |    59 +
 .../model/cbi/asterisk/voicemail_settings.lua |    62 +
 .../luasrc/view/asterisk/cbi/cell.htm         |    22 +
 .../luasrc/view/asterisk/dialplans.htm        |   254 +
 .../luasrc/view/asterisk/dialzones.htm        |   174 +
 .../luci-asterisk/root/etc/config/asterisk    |   231 +
 .../root/etc/uci-defaults/luci-asterisk       |    11 +
 .../luci/applications/luci-commands/Makefile  |     4 +
 .../luasrc/controller/commands.lua            |   237 +
 .../luasrc/model/cbi/commands.lua             |    37 +
 .../luci-commands/luasrc/view/commands.htm    |   176 +
 .../applications/luci-coovachilli/Makefile    |     4 +
 .../luasrc/controller/coovachilli.lua         |    26 +
 .../luasrc/model/cbi/coovachilli.lua          |    31 +
 .../luasrc/model/cbi/coovachilli_auth.lua     |    76 +
 .../luasrc/model/cbi/coovachilli_network.lua  |    67 +
 .../luasrc/model/cbi/coovachilli_radius.lua   |    67 +
 .../root/etc/config/coovachilli               |   243 +
 .../luci/applications/luci-ddns/CHANGELOG     |    51 +
 .../luci/applications/luci-ddns/Makefile      |     4 +
 .../luci/applications/luci-ddns/ipkg/postinst |     5 +
 .../applications/luci-ddns/ipkg/postinst-pkg  |     5 +
 .../luci-ddns/luasrc/controller/ddns.lua      |   261 +
 .../luasrc/model/cbi/ddns/detail.lua          |  1224 +
 .../luci-ddns/luasrc/model/cbi/ddns/hints.lua |   147 +
 .../luasrc/model/cbi/ddns/overview.lua        |   256 +
 .../luci-ddns/luasrc/tools/ddns.lua           |   295 +
 .../luasrc/view/admin_status/index/ddns.htm   |     1 +
 .../luasrc/view/ddns/detail_logview.htm       |    56 +
 .../luasrc/view/ddns/detail_lvalue.htm        |    22 +
 .../luasrc/view/ddns/detail_value.htm         |     9 +
 .../luasrc/view/ddns/overview_doubleline.htm  |    10 +
 .../luasrc/view/ddns/overview_enabled.htm     |    15 +
 .../luasrc/view/ddns/overview_startstop.htm   |    17 +
 .../luasrc/view/ddns/overview_status.htm      |   208 +
 .../luasrc/view/ddns/system_status.htm        |   158 +
 .../luci-ddns/root/etc/uci-defaults/luci-ddns |    19 +
 .../luci/applications/luci-diag-core/Makefile |     4 +
 .../luasrc/controller/luci_diag.lua           |    26 +
 .../luci-diag-core/luasrc/view/diag/index.htm |    18 +
 .../luasrc/view/diag/network_config_index.htm |    18 +
 .../applications/luci-diag-devinfo/Makefile   |     4 +
 .../controller/luci_diag/devinfo_common.lua   |   195 +
 .../luci_diag/luci_diag_devinfo.lua           |    56 +
 .../luci_diag/netdiscover_common.lua          |   101 +
 .../controller/luci_diag/smap_common.lua      |   112 +
 .../model/cbi/luci_diag/mactodevinfo.lua      |    36 +
 .../cbi/luci_diag/netdiscover_devinfo.lua     |    33 +
 .../luci_diag/netdiscover_devinfo_config.lua  |    30 +
 .../netdiscover_devinfo_config_mini.lua       |    30 +
 .../luci_diag/netdiscover_devinfo_mini.lua    |    33 +
 .../model/cbi/luci_diag/smap_devinfo.lua      |    33 +
 .../cbi/luci_diag/smap_devinfo_config.lua     |    35 +
 .../luci_diag/smap_devinfo_config_mini.lua    |    36 +
 .../model/cbi/luci_diag/smap_devinfo_mini.lua |    33 +
 .../luasrc/view/diag/smapsection.htm          |   137 +
 .../luasrc/view/diag/smapvalue.htm            |    21 +
 .../root/etc/config/luci_devinfo              |    20 +
 .../luci/applications/luci-dump1090/Makefile  |     4 +
 .../luasrc/controller/dump1090.lua            |    25 +
 .../luasrc/model/cbi/dump1090.lua             |   156 +
 .../root/etc/uci-defaults/luci-dump1090       |    12 +
 .../luci/applications/luci-firewall/Makefile  |     4 +
 .../luasrc/controller/firewall.lua            |    23 +
 .../luasrc/model/cbi/firewall/custom.lua      |    38 +
 .../model/cbi/firewall/forward-details.lua    |   161 +
 .../luasrc/model/cbi/firewall/forwards.lua    |   144 +
 .../model/cbi/firewall/rule-details.lua       |   329 +
 .../luasrc/model/cbi/firewall/rules.lua       |   269 +
 .../model/cbi/firewall/zone-details.lua       |   243 +
 .../luasrc/model/cbi/firewall/zones.lua       |    88 +
 .../luci-firewall/luasrc/tools/firewall.lua   |   289 +
 .../luasrc/view/firewall/cbi_addforward.htm   |   115 +
 .../luasrc/view/firewall/cbi_addrule.htm      |   112 +
 .../luasrc/view/firewall/cbi_addsnat.htm      |    66 +
 .../luci-freifunk-diagnostics/Makefile        |     2 +
 .../luci-freifunk-diagnostics/ipkg/postinst   |     4 +
 .../luasrc/controller/freifunk/diag.lua       |    82 +
 .../luasrc/view/freifunk/diagnostics.htm      |   120 +
 .../uci-defaults/luci-freifunk-diagnostics    |     2 +
 .../luci-freifunk-policyrouting/Makefile      |     4 +
 .../controller/freifunk/policy-routing.lua    |    18 +
 .../model/cbi/freifunk/policyrouting.lua      |    43 +
 .../luci-freifunk-widgets/Makefile            |     4 +
 .../luasrc/controller/freifunk/widgets.lua    |    44 +
 .../cbi/freifunk/widgets/heightwidth.lua      |    26 +
 .../model/cbi/freifunk/widgets/html.lua       |    41 +
 .../model/cbi/freifunk/widgets/iframe.lua     |    23 +
 .../model/cbi/freifunk/widgets/rssfeed.lua    |    35 +
 .../model/cbi/freifunk/widgets/search.lua     |    25 +
 .../model/cbi/freifunk/widgets/widget.lua     |    48 +
 .../cbi/freifunk/widgets/widgets_overview.lua |    75 +
 .../view/freifunk/widgets/clear/main.htm      |    15 +
 .../view/freifunk/widgets/html/main.htm       |    42 +
 .../view/freifunk/widgets/iframe/main.htm     |    45 +
 .../view/freifunk/widgets/rssfeed/main.htm    |    84 +
 .../view/freifunk/widgets/search/main.htm     |    54 +
 .../root/etc/config/freifunk-widgets          |    33 +
 .../root/lib/upgrade/keep.d/freifunk-widgets  |     1 +
 .../luci/applications/luci-hd-idle/Makefile   |     4 +
 .../applications/luci-hd-idle/ipkg/postinst   |     6 +
 .../luasrc/controller/hd_idle.lua             |    27 +
 .../luci-hd-idle/luasrc/model/cbi/hd_idle.lua |    41 +
 .../root/etc/uci-defaults/luci-hd_idle        |    11 +
 .../luci/applications/luci-ltqtapi/Makefile   |     4 +
 .../luasrc/controller/ltqtapi.lua             |    50 +
 .../luasrc/model/cbi/luci_ltqtapi/account.lua |    26 +
 .../luasrc/model/cbi/luci_ltqtapi/contact.lua |    30 +
 .../view/admin_status/index/telephony.htm     |     1 +
 .../luasrc/view/telephony_status.htm          |    32 +
 .../applications/luci-meshwizard/Makefile     |     4 +
 .../luci-meshwizard/ipkg/postinst             |     4 +
 .../luasrc/controller/meshwizard.lua          |    19 +
 .../luasrc/model/cbi/freifunk/meshwizard.lua  |   199 +
 .../root/etc/uci-defaults/meshwizard          |     8 +
 .../luci/applications/luci-minidlna/Makefile  |     4 +
 .../luasrc/controller/minidlna.lua            |    57 +
 .../luasrc/model/cbi/minidlna.lua             |   176 +
 .../view/admin_status/index/minidlna.htm      |     1 +
 .../luasrc/view/minidlna_status.htm           |    29 +
 .../root/etc/uci-defaults/luci-minidlna       |    15 +
 .../applications/luci-mmc-over-gpio/Makefile  |     4 +
 .../luci-mmc-over-gpio/ipkg/postinst          |     6 +
 .../luasrc/controller/mmc_over_gpio.lua       |    27 +
 .../luasrc/model/cbi/mmc_over_gpio.lua        |    41 +
 .../root/etc/uci-defaults/luci-mmc-over-gpio  |    11 +
 .../luci/applications/luci-multiwan/Makefile  |     4 +
 .../luasrc/controller/multiwan.lua            |    60 +
 .../luasrc/model/cbi/multiwan/multiwan.lua    |   155 +
 .../model/cbi/multiwan/multiwanmini.lua       |    67 +
 .../view/admin_status/index/multiwan.htm      |     1 +
 .../luasrc/view/multiwan_status.htm           |    71 +
 .../luci/applications/luci-ntpc/Makefile      |     4 +
 .../luci-ntpc/luasrc/controller/ntpc.lua      |    30 +
 .../luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua  |    49 +
 .../luasrc/model/cbi/ntpc/ntpcmini.lua        |    38 +
 .../luci/applications/luci-ocserv/Makefile    |     4 +
 .../luci-ocserv/luasrc/controller/ocserv.lua  |    88 +
 .../luasrc/model/cbi/ocserv/main.lua          |   148 +
 .../luasrc/model/cbi/ocserv/user-config.lua   |   149 +
 .../luasrc/model/cbi/ocserv/users.lua         |    85 +
 .../luasrc/view/admin_status/index/ocserv.htm |     1 +
 .../luci-ocserv/luasrc/view/ocserv_status.htm |    76 +
 .../applications/luci-olsr-services/Makefile  |     4 +
 .../luasrc/controller/services.lua            |    16 +
 .../view/freifunk-services/services.htm       |   201 +
 .../luci/applications/luci-olsr-viz/Makefile  |     4 +
 .../luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh  |    40 +
 .../luci-olsr-viz/htdocs/cgi-bin/vizdata.sh   |    48 +
 .../htdocs/luci-static/resources/olsr-viz.js  |   818 +
 .../resources/olsr-viz/dot_down.gif           |   Bin 0 -> 46 bytes
 .../resources/olsr-viz/dot_good.gif           |   Bin 0 -> 46 bytes
 .../luci-static/resources/olsr-viz/dot_ok.gif |   Bin 0 -> 46 bytes
 .../resources/olsr-viz/dot_weak.gif           |   Bin 0 -> 46 bytes
 .../resources/olsr-viz/node-hna-mini.gif      |   Bin 0 -> 1192 bytes
 .../resources/olsr-viz/node-mini.gif          |   Bin 0 -> 1194 bytes
 .../luasrc/controller/olsr-viz.lua            |     5 +
 .../luasrc/view/olsr-viz/olsr-viz.htm         |    10 +
 .../luci/applications/luci-olsr/Makefile      |     4 +
 .../luci-olsr/htdocs/cgi-bin-nodes.html       |    10 +
 .../luci-olsr/htdocs/cgi-bin-status.html      |    10 +
 .../luci/applications/luci-olsr/ipkg/postinst |     7 +
 .../luci-olsr/luasrc/controller/olsr.lua      |   413 +
 .../luci-olsr/luasrc/controller/olsr4.lua     |    47 +
 .../luci-olsr/luasrc/controller/olsr6.lua     |    47 +
 .../luci-olsr/luasrc/model/cbi/olsr/olsrd.lua |   420 +
 .../luasrc/model/cbi/olsr/olsrd6.lua          |   401 +
 .../luasrc/model/cbi/olsr/olsrddisplay.lua    |    23 +
 .../luasrc/model/cbi/olsr/olsrdhna.lua        |    56 +
 .../luasrc/model/cbi/olsr/olsrdhna6.lua       |    36 +
 .../luasrc/model/cbi/olsr/olsrdiface.lua      |   189 +
 .../luasrc/model/cbi/olsr/olsrdiface6.lua     |   176 +
 .../luasrc/model/cbi/olsr/olsrdplugins.lua    |   270 +
 .../luasrc/model/cbi/olsr/olsrdplugins6.lua   |   270 +
 .../luci-olsr/luasrc/tools/olsr.lua           |    42 +
 .../luasrc/view/status-olsr/common_js.htm     |    35 +
 .../luasrc/view/status-olsr/error_olsr.htm    |    17 +
 .../luci-olsr/luasrc/view/status-olsr/hna.htm |   129 +
 .../luasrc/view/status-olsr/interfaces.htm    |    57 +
 .../luasrc/view/status-olsr/legend.htm        |    24 +
 .../luci-olsr/luasrc/view/status-olsr/mid.htm |    58 +
 .../luasrc/view/status-olsr/neighbors.htm     |   181 +
 .../luasrc/view/status-olsr/overview.htm      |   220 +
 .../luasrc/view/status-olsr/routes.htm        |   148 +
 .../luasrc/view/status-olsr/smartgw.htm       |   158 +
 .../luasrc/view/status-olsr/topology.htm      |    68 +
 .../luci-olsr/root/etc/config/luci_olsr       |     2 +
 .../luci-olsr/root/etc/uci-defaults/luci-olsr |    14 +
 .../luci/applications/luci-openvpn/Makefile   |     4 +
 .../luasrc/controller/openvpn.lua             |    22 +
 .../luasrc/model/cbi/openvpn-advanced.lua     |   273 +
 .../luasrc/model/cbi/openvpn-basic.lua        |   102 +
 .../luci-openvpn/luasrc/model/cbi/openvpn.lua |   130 +
 .../view/openvpn/cbi-select-input-add.htm     |    11 +
 .../luasrc/view/openvpn/pageswitch.htm        |    45 +
 .../root/etc/config/openvpn_recipes           |   102 +
 .../luci/applications/luci-p2pblock/Makefile  |     4 +
 .../applications/luci-p2pblock/ipkg/postinst  |     6 +
 .../luasrc/controller/ff_p2pblock.lua         |    20 +
 .../luasrc/model/cbi/luci_fw/p2pblock.lua     |    77 +
 .../root/etc/uci-defaults/luci-p2pblock       |    11 +
 .../luci/applications/luci-p910nd/Makefile    |     4 +
 .../applications/luci-p910nd/ipkg/postinst    |     6 +
 .../luci-p910nd/luasrc/controller/p910nd.lua  |    27 +
 .../luci-p910nd/luasrc/model/cbi/p910nd.lua   |    59 +
 .../root/etc/uci-defaults/luci-p910nd         |    11 +
 .../applications/luci-pbx-voicemail/COPYING   |   674 +
 .../applications/luci-pbx-voicemail/Makefile  |     4 +
 .../luasrc/controller/pbx-voicemail.lua       |    24 +
 .../luasrc/model/cbi/pbx-voicemail.lua        |   153 +
 .../root/etc/config/pbx-voicemail             |     6 +
 .../root/etc/pbx-voicemail/pbx-move-greeting  |     6 +
 .../pbx-msmtprc-account-auth.TEMPLATE         |     2 +
 .../pbx-msmtprc-account-default.TEMPLATE      |     2 +
 .../pbx-msmtprc-account.TEMPLATE              |     5 +
 .../pbx-msmtprc-defaults.TEMPLATE             |     5 +
 .../root/etc/pbx-voicemail/pbx-send-voicemail |   114 +
 .../luci/applications/luci-pbx/COPYING        |   674 +
 .../luci/applications/luci-pbx/CREDITS-SOUNDS |     7 +
 .../luci/applications/luci-pbx/LICENSE-SOUNDS |   312 +
 .../luci/applications/luci-pbx/Makefile       |     4 +
 .../luci-pbx/luasrc/controller/pbx.lua        |    29 +
 .../luasrc/model/cbi/pbx-advanced.lua         |   293 +
 .../luci-pbx/luasrc/model/cbi/pbx-calls.lua   |   424 +
 .../luci-pbx/luasrc/model/cbi/pbx-google.lua  |   122 +
 .../luci-pbx/luasrc/model/cbi/pbx-users.lua   |   133 +
 .../luci-pbx/luasrc/model/cbi/pbx-voip.lua    |   116 +
 .../luci-pbx/luasrc/model/cbi/pbx.lua         |   115 +
 .../applications/luci-pbx/root/etc/config/pbx |     1 +
 .../luci-pbx/root/etc/config/pbx-advanced     |     5 +
 .../luci-pbx/root/etc/config/pbx-calls        |     7 +
 .../luci-pbx/root/etc/config/pbx-google       |     0
 .../luci-pbx/root/etc/config/pbx-users        |     1 +
 .../luci-pbx/root/etc/config/pbx-voip         |     0
 .../luci-pbx/root/etc/init.d/pbx-asterisk     |   837 +
 .../etc/pbx-asterisk/asterisk.conf.TEMPLATE   |    17 +
 .../root/etc/pbx-asterisk/delayedcallback     |    18 +
 .../etc/pbx-asterisk/extensions.conf.TEMPLATE |    25 +
 .../extensions_blacklist.conf.TEMPLATE        |     1 +
 .../extensions_blacklist_footer.conf.TEMPLATE |     2 +
 .../extensions_blacklist_header.conf.TEMPLATE |     3 +
 .../extensions_callback-check.conf.TEMPLATE   |     1 +
 ...nsions_callback-check_footer.conf.TEMPLATE |     2 +
 ...nsions_callback-check_header.conf.TEMPLATE |     3 +
 .../extensions_callback_gtalk.conf.TEMPLATE   |     4 +
 .../extensions_callback_header.conf.TEMPLATE  |     1 +
 .../extensions_callback_sip.conf.TEMPLATE     |     4 +
 .../extensions_default.conf.TEMPLATE          |    11 +
 .../extensions_default_user.conf.TEMPLATE     |     1 +
 .../extensions_disa-check.conf.TEMPLATE       |     1 +
 ...extensions_disa-check_footer.conf.TEMPLATE |     1 +
 ...extensions_disa-check_header.conf.TEMPLATE |     2 +
 .../extensions_disa-nopin.conf.TEMPLATE       |     5 +
 .../extensions_disa.conf.TEMPLATE             |     6 +
 .../extensions_disa_header.conf.TEMPLATE      |     1 +
 ...sions_incoming_context_gtalk.conf.TEMPLATE |    15 +
 ...ncoming_context_gtalk_header.conf.TEMPLATE |     1 +
 ...ensions_incoming_context_sip.conf.TEMPLATE |    12 +
 ...ons_outgoing_dial_local_user.conf.TEMPLATE |     1 +
 .../extensions_outgoing_gtalk.conf.TEMPLATE   |     9 +
 ...sions_outgoing_pattern_gtalk.conf.TEMPLATE |     2 +
 ...ensions_outgoing_pattern_sip.conf.TEMPLATE |     1 +
 .../extensions_outgoing_sip.conf.TEMPLATE     |     8 +
 ...tensions_user_context_footer.conf.TEMPLATE |     2 +
 ...tensions_user_context_header.conf.TEMPLATE |     3 +
 ...xtensions_voicemail_disabled.conf.TEMPLATE |     4 +
 ...extensions_voicemail_enabled.conf.TEMPLATE |    27 +
 .../root/etc/pbx-asterisk/gtalk.conf.TEMPLATE |    10 +
 .../pbx-asterisk/indications.conf.TEMPLATE    |   733 +
 .../etc/pbx-asterisk/jabber.conf.TEMPLATE     |     4 +
 .../pbx-asterisk/jabber_users.conf.TEMPLATE   |     8 +
 .../etc/pbx-asterisk/logger.conf.TEMPLATE     |     7 +
 .../etc/pbx-asterisk/manager.conf.TEMPLATE    |     7 +
 .../etc/pbx-asterisk/modules.conf.TEMPLATE    |    34 +
 .../root/etc/pbx-asterisk/rtp.conf.TEMPLATE   |     6 +
 .../root/etc/pbx-asterisk/sip.conf.TEMPLATE   |    39 +
 .../root/etc/pbx-asterisk/sip_peer.TEMPLATE   |    13 +
 .../pbx-asterisk/sip_registration.TEMPLATE    |     2 +
 .../root/etc/pbx-asterisk/sip_user.TEMPLATE   |    11 +
 .../pbx-asterisk/sounds/agent-alreadyon.gsm   |   Bin 0 -> 8943 bytes
 .../pbx-asterisk/sounds/agent-incorrect.gsm   |   Bin 0 -> 8085 bytes
 .../etc/pbx-asterisk/sounds/agent-pass.gsm    |   Bin 0 -> 4752 bytes
 .../pbx-asterisk/sounds/auth-incorrect.gsm    |   Bin 0 -> 7458 bytes
 .../etc/pbx-asterisk/sounds/auth-thankyou.gsm |   Bin 0 -> 1353 bytes
 .../root/etc/pbx-asterisk/sounds/beep.gsm     |   Bin 0 -> 726 bytes
 .../etc/pbx-asterisk/sounds/vm-goodbye.gsm    |   Bin 0 -> 1683 bytes
 .../luci/applications/luci-polipo/Makefile    |     4 +
 .../applications/luci-polipo/ipkg/postinst    |     6 +
 .../luci-polipo/luasrc/controller/polipo.lua  |    26 +
 .../luci-polipo/luasrc/model/cbi/polipo.lua   |   188 +
 .../luci-polipo/luasrc/view/polipo_status.htm |    18 +
 .../root/etc/uci-defaults/luci-polipo         |    11 +
 .../luci-polipo/root/usr/sbin/polipo_purge    |    18 +
 .../luci/applications/luci-qos/Makefile       |     4 +
 .../luci-qos/luasrc/controller/qos.lua        |    26 +
 .../luci-qos/luasrc/model/cbi/qos/qos.lua     |   101 +
 .../luci/applications/luci-radvd/Makefile     |     4 +
 .../applications/luci-radvd/ipkg/postinst     |     7 +
 .../luci-radvd/luasrc/controller/radvd.lua    |    28 +
 .../luci-radvd/luasrc/model/cbi/radvd.lua     |   335 +
 .../luasrc/model/cbi/radvd/dnssl.lua          |    99 +
 .../luasrc/model/cbi/radvd/interface.lua      |   276 +
 .../luasrc/model/cbi/radvd/prefix.lua         |   139 +
 .../luasrc/model/cbi/radvd/rdnss.lua          |   100 +
 .../luasrc/model/cbi/radvd/route.lua          |   108 +
 .../root/etc/uci-defaults/luci-radvd          |    11 +
 .../luci/applications/luci-samba/Makefile     |     4 +
 .../luci-samba/luasrc/controller/samba.lua    |    27 +
 .../luci-samba/luasrc/model/cbi/samba.lua     |    83 +
 .../luci/applications/luci-shairplay/Makefile |     4 +
 .../luasrc/controller/shairplay.lua           |    25 +
 .../luasrc/model/cbi/shairplay.lua            |    76 +
 .../root/etc/uci-defaults/luci-shairplay      |    12 +
 .../luci/applications/luci-shairport/Makefile |     4 +
 .../luasrc/controller/shairport.lua           |    25 +
 .../luasrc/model/cbi/shairport.lua            |   172 +
 .../root/etc/uci-defaults/luci-shairport      |    12 +
 .../applications/luci-siitwizard/Makefile     |     4 +
 .../luasrc/controller/siitwizard.lua          |    21 +
 .../luasrc/model/cbi/siitwizard.lua           |   383 +
 .../luci-siitwizard/root/etc/config/siit      |    14 +
 .../luci/applications/luci-splash/Makefile    |     4 +
 .../luci/applications/luci-splash/README      |     5 +
 .../htdocs/cgi-bin/splash/splash.sh           |    35 +
 .../luci-splash/htdocs/luci/splash/index.html |    10 +
 .../applications/luci-splash/ipkg/postinst    |     6 +
 .../luasrc/controller/splash/splash.lua       |   151 +
 .../luasrc/model/cbi/splash/splash.lua        |    87 +
 .../luasrc/model/cbi/splash/splashtext.lua    |    66 +
 .../luasrc/view/admin_status/splash.htm       |   294 +
 .../luasrc/view/splash/blocked.htm            |    25 +
 .../luci-splash/luasrc/view/splash/splash.htm |   139 +
 .../luasrc/view/splash_splash/index.htm       |    16 +
 .../luasrc/view/splash_splash/splash.htm      |    25 +
 .../luci-splash/root/etc/config/luci_splash   |     2 +
 .../root/etc/config/luci_splash_leases        |     1 +
 .../root/etc/hotplug.d/iface/25-splash        |    17 +
 .../luci-splash/root/etc/init.d/luci_splash   |   362 +
 .../luci-splash/root/usr/sbin/luci-splash     |   751 +
 .../applications/luci-statistics/Makefile     |     4 +
 .../luci-statistics/ipkg/postinst             |     9 +
 .../luci_statistics/luci_statistics.lua       |   209 +
 .../model/cbi/luci_statistics/collectd.lua    |    74 +
 .../model/cbi/luci_statistics/conntrack.lua   |    21 +
 .../luasrc/model/cbi/luci_statistics/cpu.lua  |    27 +
 .../luasrc/model/cbi/luci_statistics/csv.lua  |    41 +
 .../luasrc/model/cbi/luci_statistics/df.lua   |    53 +
 .../luasrc/model/cbi/luci_statistics/disk.lua |    41 +
 .../luasrc/model/cbi/luci_statistics/dns.lua  |    48 +
 .../model/cbi/luci_statistics/email.lua       |    60 +
 .../luasrc/model/cbi/luci_statistics/exec.lua |    89 +
 .../model/cbi/luci_statistics/interface.lua   |    47 +
 .../model/cbi/luci_statistics/iptables.lua    |   132 +
 .../luasrc/model/cbi/luci_statistics/irq.lua  |    42 +
 .../model/cbi/luci_statistics/iwinfo.lua      |    38 +
 .../luasrc/model/cbi/luci_statistics/load.lua |    29 +
 .../model/cbi/luci_statistics/memory.lua      |    21 +
 .../model/cbi/luci_statistics/netlink.lua     |    95 +
 .../model/cbi/luci_statistics/network.lua     |    98 +
 .../luasrc/model/cbi/luci_statistics/nut.lua  |    28 +
 .../model/cbi/luci_statistics/olsrd.lua       |    54 +
 .../luasrc/model/cbi/luci_statistics/ping.lua |    47 +
 .../model/cbi/luci_statistics/processes.lua   |    36 +
 .../model/cbi/luci_statistics/rrdtool.lua     |   108 +
 .../cbi/luci_statistics/splash_leases.lua     |    24 +
 .../model/cbi/luci_statistics/tcpconns.lua    |    45 +
 .../model/cbi/luci_statistics/unixsock.lua    |    49 +
 .../model/cbi/luci_statistics/uptime.lua      |    22 +
 .../luasrc/statistics/datatree.lua            |   209 +
 .../luasrc/statistics/i18n.lua                |   108 +
 .../luasrc/statistics/rrdtool.lua             |   561 +
 .../luasrc/statistics/rrdtool/colors.lua      |    73 +
 .../rrdtool/definitions/conntrack.lua         |    35 +
 .../statistics/rrdtool/definitions/cpu.lua    |    42 +
 .../statistics/rrdtool/definitions/df.lua     |    46 +
 .../statistics/rrdtool/definitions/disk.lua   |    74 +
 .../statistics/rrdtool/definitions/dns.lua    |    81 +
 .../rrdtool/definitions/interface.lua         |   117 +
 .../rrdtool/definitions/iptables.lua          |    53 +
 .../statistics/rrdtool/definitions/irq.lua    |    30 +
 .../statistics/rrdtool/definitions/iwinfo.lua |   102 +
 .../statistics/rrdtool/definitions/load.lua   |    36 +
 .../statistics/rrdtool/definitions/memory.lua |    33 +
 .../rrdtool/definitions/netlink.lua           |   203 +
 .../statistics/rrdtool/definitions/nut.lua    |   106 +
 .../statistics/rrdtool/definitions/olsrd.lua  |   146 +
 .../statistics/rrdtool/definitions/ping.lua   |    41 +
 .../rrdtool/definitions/processes.lua         |   110 +
 .../rrdtool/definitions/splash_leases.lua     |    37 +
 .../rrdtool/definitions/tcpconns.lua          |    37 +
 .../statistics/rrdtool/definitions/uptime.lua |    27 +
 .../luasrc/view/admin_statistics/index.htm    |    22 +
 .../luasrc/view/public_statistics/graph.htm   |    48 +
 .../root/etc/config/luci_statistics           |   143 +
 .../root/etc/init.d/luci_statistics           |    33 +
 .../root/etc/uci-defaults/luci-statistics     |    36 +
 .../root/usr/bin/stat-genconfig               |   438 +
 .../luci/applications/luci-tinyproxy/Makefile |     4 +
 .../luasrc/controller/tinyproxy.lua           |    26 +
 .../luasrc/model/cbi/tinyproxy.lua            |   250 +
 .../luasrc/view/tinyproxy_status.htm          |    50 +
 .../applications/luci-transmission/Makefile   |     4 +
 .../luasrc/controller/transmission.lua        |    25 +
 .../luasrc/model/cbi/transmission.lua         |   231 +
 .../root/etc/uci-defaults/luci-transmission   |    11 +
 .../luci/applications/luci-udpxy/Makefile     |     4 +
 .../luci-udpxy/luasrc/controller/udpxy.lua    |    25 +
 .../luci-udpxy/luasrc/model/cbi/udpxy.lua     |    74 +
 .../root/etc/uci-defaults/luci-udpxy          |    12 +
 .../luci/applications/luci-upnp/Makefile      |     4 +
 .../luci-upnp/luasrc/controller/upnp.lua      |    84 +
 .../luci-upnp/luasrc/model/cbi/upnp/upnp.lua  |   114 +
 .../luasrc/view/admin_status/index/upnp.htm   |     1 +
 .../luci-upnp/luasrc/view/upnp_status.htm     |    67 +
 .../luci-upnp/root/etc/uci-defaults/luci-upnp |     9 +
 .../luci/applications/luci-ushare/Makefile    |     4 +
 .../applications/luci-ushare/ipkg/postinst    |     6 +
 .../luci-ushare/luasrc/controller/ushare.lua  |    27 +
 .../luci-ushare/luasrc/model/cbi/ushare.lua   |    42 +
 .../root/etc/uci-defaults/luci-ushare         |    11 +
 .../luci/applications/luci-vnstat/Makefile    |     4 +
 .../applications/luci-vnstat/ipkg/postinst    |     7 +
 .../luci-vnstat/luasrc/controller/vnstat.lua  |    11 +
 .../luci-vnstat/luasrc/model/cbi/vnstat.lua   |    91 +
 .../luci-vnstat/luasrc/view/vnstat.htm        |   108 +
 .../root/etc/uci-defaults/luci-vnstat         |    11 +
 .../applications/luci-voice-core/Makefile     |     4 +
 .../luasrc/controller/luci_voice.lua          |    31 +
 .../luasrc/view/luci_voice/index.htm          |    24 +
 .../luasrc/view/luci_voice/phone_index.htm    |    20 +
 .../applications/luci-voice-diag/Makefile     |     4 +
 .../controller/luci_voice/luci_voice_diag.lua |    22 +
 .../luasrc/view/luci_voice/diag_index.htm     |    18 +
 .../luci/applications/luci-watchcat/Makefile  |     3 +
 .../applications/luci-watchcat/ipkg/postinst  |     7 +
 .../luasrc/controller/watchcat.lua            |    22 +
 .../luasrc/model/cbi/watchcat/watchcat.lua    |    64 +
 .../root/etc/uci-defaults/luci-watchcat       |    10 +
 .../luci/applications/luci-wol/Makefile       |     4 +
 .../luci-wol/luasrc/controller/wol.lua        |     6 +
 .../luci-wol/luasrc/model/cbi/wol.lua         |   103 +
 .../luci/applications/luci-wshaper/Makefile   |     4 +
 .../applications/luci-wshaper/ipkg/postinst   |     6 +
 .../luasrc/controller/wshaper.lua             |    19 +
 .../luci-wshaper/luasrc/model/cbi/wshaper.lua |    55 +
 .../root/etc/uci-defaults/wshaper             |    11 +
 .../luci/applications/myapplication/Makefile  |     2 +
 trunk/package/luci/build/config.mk            |    16 +
 trunk/package/luci/build/gccconfig.mk         |    22 +
 trunk/package/luci/build/hostenv.sh           |     8 +
 trunk/package/luci/build/i18n-init.sh         |    24 +
 trunk/package/luci/build/i18n-po2lua.pl       |    27 +
 trunk/package/luci/build/i18n-scan.pl         |   128 +
 trunk/package/luci/build/i18n-sync.sh         |    25 +
 trunk/package/luci/build/i18n-update.pl       |    69 +
 trunk/package/luci/build/luci.cgi             |     8 +
 trunk/package/luci/build/lucid.lua            |     2 +
 trunk/package/luci/build/makedocs.sh          |     2 +
 trunk/package/luci/build/mkbasepot.sh         |    15 +
 trunk/package/luci/build/mkrevision.sh        |    27 +
 trunk/package/luci/build/mkversion.sh         |    41 +
 trunk/package/luci/build/module.mk            |    46 +
 trunk/package/luci/build/setup.lua            |    46 +
 trunk/package/luci/build/zoneinfo2lua.pl      |   167 +
 trunk/package/luci/contrib/fwd/Makefile       |     2 +
 trunk/package/luci/contrib/fwd/src/Makefile   |    18 +
 trunk/package/luci/contrib/fwd/src/fwd.c      |   320 +
 trunk/package/luci/contrib/fwd/src/fwd.h      |   182 +
 trunk/package/luci/contrib/fwd/src/fwd_addr.c |   162 +
 trunk/package/luci/contrib/fwd/src/fwd_addr.h |    50 +
 .../package/luci/contrib/fwd/src/fwd_config.c |   987 +
 .../package/luci/contrib/fwd/src/fwd_config.h |    29 +
 trunk/package/luci/contrib/fwd/src/fwd_ipc.c  |    98 +
 trunk/package/luci/contrib/fwd/src/fwd_ipc.h  |    61 +
 .../package/luci/contrib/fwd/src/fwd_rules.c  |   886 +
 .../package/luci/contrib/fwd/src/fwd_rules.h  |    32 +
 .../package/luci/contrib/fwd/src/fwd_utils.c  |    78 +
 .../package/luci/contrib/fwd/src/fwd_utils.h  |    50 +
 .../luci/contrib/fwd/src/fwd_xtables.c        |   412 +
 .../luci/contrib/fwd/src/fwd_xtables.h        |    70 +
 trunk/package/luci/contrib/fwd/src/ucix.c     |   236 +
 trunk/package/luci/contrib/fwd/src/ucix.h     |    50 +
 trunk/package/luci/contrib/lar/Makefile       |    13 +
 trunk/package/luci/contrib/lar/cli.c          |   131 +
 trunk/package/luci/contrib/lar/lar.c          |   328 +
 trunk/package/luci/contrib/lar/lar.h          |   108 +
 trunk/package/luci/contrib/lar/lar.pl         |    50 +
 trunk/package/luci/contrib/lar/larlib.c       |   540 +
 trunk/package/luci/contrib/lar/md5.c          |   381 +
 trunk/package/luci/contrib/lar/md5.h          |    91 +
 .../lar/openwrt/050-lar-source-loader.patch   |  1561 +
 trunk/package/luci/contrib/luadoc/Makefile    |     2 +
 .../luci/contrib/luadoc/hostfiles/bin/luadoc  |   121 +
 .../luci/contrib/luadoc/lua/luadoc/config.lua |    34 +
 .../luadoc/lua/luadoc/doclet/debug.lua        |    46 +
 .../luadoc/lua/luadoc/doclet/formatter.lua    |    84 +
 .../contrib/luadoc/lua/luadoc/doclet/html.lua |   275 +
 .../luadoc/lua/luadoc/doclet/html/constant.lp |    28 +
 .../luadoc/lua/luadoc/doclet/html/file.lp     |   112 +
 .../luadoc/lua/luadoc/doclet/html/function.lp |    64 +
 .../luadoc/lua/luadoc/doclet/html/index.lp    |    67 +
 .../luadoc/lua/luadoc/doclet/html/luadoc.css  |   286 +
 .../luadoc/lua/luadoc/doclet/html/menu.lp     |    55 +
 .../luadoc/lua/luadoc/doclet/html/module.lp   |   120 +
 .../luadoc/lua/luadoc/doclet/html/table.lp    |    15 +
 .../contrib/luadoc/lua/luadoc/doclet/raw.lua  |    12 +
 .../luci/contrib/luadoc/lua/luadoc/init.lua   |    50 +
 .../luci/contrib/luadoc/lua/luadoc/lp.lua     |   130 +
 .../luadoc/lua/luadoc/taglet/standard.lua     |   565 +
 .../lua/luadoc/taglet/standard/tags.lua       |   178 +
 .../luci/contrib/luadoc/lua/luadoc/util.lua   |   201 +
 .../package/luci/contrib/luasrcdiet/Makefile  |     2 +
 .../luci/contrib/luasrcdiet/lua/COPYRIGHT     |    38 +
 .../contrib/luasrcdiet/lua/LuaSrcDiet.lua     |   670 +
 .../luci/contrib/luasrcdiet/lua/llex.lua      |   355 +
 .../luci/contrib/luasrcdiet/lua/lparser.lua   |  1295 +
 .../luci/contrib/luasrcdiet/lua/optlex.lua    |   832 +
 .../luci/contrib/luasrcdiet/lua/optparser.lua |   564 +
 trunk/package/luci/contrib/package/Makefile   |     2 +
 .../package/community-profiles/Makefile       |    39 +
 .../files/etc/config/profile_Freifunk         |    10 +
 .../files/etc/config/profile_aachen           |    10 +
 .../files/etc/config/profile_altmark          |    56 +
 .../files/etc/config/profile_arig_arad        |    22 +
 .../etc/config/profile_arig_neot_semadar      |    22 +
 .../files/etc/config/profile_arig_tel-aviv    |    22 +
 .../files/etc/config/profile_augsburg         |    66 +
 .../files/etc/config/profile_bayreuth         |    20 +
 .../files/etc/config/profile_bensheim         |     9 +
 .../files/etc/config/profile_bergischesland   |    15 +
 .../files/etc/config/profile_berlin           |    50 +
 .../files/etc/config/profile_bno              |    38 +
 .../files/etc/config/profile_carbodebit       |    23 +
 .../files/etc/config/profile_demo             |    24 +
 .../files/etc/config/profile_duesseldorf      |    15 +
 .../files/etc/config/profile_erfurt           |    48 +
 .../files/etc/config/profile_evernet          |    25 +
 .../files/etc/config/profile_freiburg         |    45 +
 .../files/etc/config/profile_gadow            |    23 +
 .../files/etc/config/profile_guifibages       |    19 +
 .../files/etc/config/profile_halle            |    40 +
 .../files/etc/config/profile_hannover         |    12 +
 .../files/etc/config/profile_heppenheim       |     9 +
 .../files/etc/config/profile_hooge            |    22 +
 .../files/etc/config/profile_kiberpipa        |    15 +
 .../files/etc/config/profile_kyritz           |    57 +
 .../files/etc/config/profile_l59              |    25 +
 .../files/etc/config/profile_leipzig          |    55 +
 .../files/etc/config/profile_marburg          |    12 +
 .../files/etc/config/profile_neuss            |    15 +
 .../files/etc/config/profile_oldenburg        |    15 +
 .../etc/config/profile_openwireless_bern      |    18 +
 .../files/etc/config/profile_pberg            |    38 +
 .../files/etc/config/profile_piraten_dresden  |    12 +
 .../files/etc/config/profile_potsdam          |    15 +
 .../files/etc/config/profile_reihen           |    20 +
 .../files/etc/config/profile_rosbach          |    15 +
 .../files/etc/config/profile_schwarzach       |    12 +
 .../files/etc/config/profile_seefeld          |    13 +
 .../files/etc/config/profile_stuttgart        |    13 +
 .../files/etc/config/profile_vogtland         |    23 +
 .../files/etc/config/profile_weil             |    23 +
 .../files/etc/config/profile_weimar           |    10 +
 .../files/etc/config/profile_weinstadt        |    19 +
 .../files/etc/config/profile_wlanljubljana    |    15 +
 .../contrib/package/freifunk-common/Makefile  |    42 +
 .../freifunk-common/files/etc/config/freifunk |   124 +
 .../freifunk-common/files/etc/init.d/freifunk |    25 +
 .../files/etc/rc.local.d/01-config-migration  |    51 +
 .../files/etc/uci-defaults/freifunk           |     2 +
 .../freifunk-common/files/usr/bin/ffdzero     |    10 +
 .../freifunk-common/files/usr/bin/neigh.sh    |    41 +
 .../freifunk-common/files/usr/bin/watch.sh    |    11 +
 .../files/usr/sbin/ff_olsr_watchdog           |    29 +
 .../package/freifunk-common/ipkg/postinst     |     6 +
 .../package/freifunk-firewall/Makefile        |    53 +
 .../files/etc/firewall.freifunk               |    40 +
 .../etc/hotplug.d/firewall/23-restricted-wan  |    65 +
 .../contrib/package/freifunk-gwcheck/Makefile |    40 +
 .../files/etc/config/freifunk-gwcheck         |     5 +
 .../files/usr/sbin/ff_olsr_test_gw.sh         |   132 +
 .../package/freifunk-gwcheck/ipkg/postinst    |     4 +
 .../package/freifunk-gwcheck/ipkg/postrm      |     5 +
 .../root/etc/uci-defaults/freifunk-gwcheck    |     7 +
 .../package/freifunk-mapupdate/Makefile       |    39 +
 .../files/etc/config/freifunk-mapupdate       |     3 +
 .../files/usr/sbin/ff_mapupdate.sh            |    59 +
 .../package/freifunk-mapupdate/ipkg/postinst  |     4 +
 .../package/freifunk-mapupdate/ipkg/postrm    |     5 +
 .../root/etc/uci-defaults/freifunk-mapupdate  |     6 +
 .../package/freifunk-p2pblock/Makefile        |    48 +
 .../files/freifunk-p2pblock.config            |     6 +
 .../files/freifunk-p2pblock.init              |    95 +
 .../package/freifunk-policyrouting/Makefile   |    47 +
 .../files/etc/config/freifunk-policyrouting   |     7 +
 .../etc/hotplug.d/iface/30-policyrouting      |   104 +
 .../files/etc/init.d/freifunk-policyrouting   |   161 +
 .../files/etc/rc.d/S15-freifunk-policyrouting |   161 +
 .../etc/uci-defaults/freifunk-policyrouting   |     7 +
 .../package/freifunk-watchdog/Makefile        |    55 +
 .../files/freifunk-watchdog.config            |     7 +
 .../files/freifunk-watchdog.init              |    39 +
 .../package/freifunk-watchdog/src/Makefile    |    12 +
 .../package/freifunk-watchdog/src/ucix.c      |   102 +
 .../package/freifunk-watchdog/src/ucix.h      |    29 +
 .../package/freifunk-watchdog/src/watchdog.c  |   527 +
 .../package/freifunk-watchdog/src/watchdog.h  |   141 +
 .../freifunk-watchdog/src/wireless.22.h       |  1139 +
 .../luci/contrib/package/luci-addons/Makefile |   287 +
 .../luci/contrib/package/luci/Makefile        |   403 +
 .../luci/contrib/package/meshwizard/Makefile  |    39 +
 .../meshwizard/files/etc/config/meshwizard    |     7 +
 .../files/usr/bin/meshwizard/functions.sh     |    59 +
 .../helpers/check-range-in-range.sh           |    31 +
 .../usr/bin/meshwizard/helpers/common.awk     |    20 +
 .../helpers/gen_auto-ipv6-dhcpv6-ip.sh        |    16 +
 .../usr/bin/meshwizard/helpers/gen_bssid.sh   |    36 +
 .../usr/bin/meshwizard/helpers/gen_dhcp_ip.sh |     6 +
 .../bin/meshwizard/helpers/initial_config.sh  |    42 +
 .../usr/bin/meshwizard/helpers/ipcalc-cidr.sh |    42 +
 .../bin/meshwizard/helpers/read_defaults.sh   |    35 +
 .../usr/bin/meshwizard/helpers/rename-wifi.sh |    46 +
 .../helpers/restore_default_config.sh         |    11 +
 .../helpers/setup_auto-ipv6-interface.sh      |    12 +
 .../bin/meshwizard/helpers/setup_auto-ipv6.sh |    17 +
 .../usr/bin/meshwizard/helpers/setup_dhcp.sh  |    42 +
 .../bin/meshwizard/helpers/setup_dnsmasq.sh   |    29 +
 .../bin/meshwizard/helpers/setup_firewall.sh  |   139 +
 .../helpers/setup_firewall_interface.sh       |   111 +
 .../bin/meshwizard/helpers/setup_lan_ipv6.sh  |    20 +
 .../meshwizard/helpers/setup_lan_static.sh    |    17 +
 .../bin/meshwizard/helpers/setup_network.sh   |   131 +
 .../usr/bin/meshwizard/helpers/setup_olsrd.sh |   145 +
 .../helpers/setup_olsrd_interface.sh          |    76 +
 .../meshwizard/helpers/setup_policyrouting.sh |    11 +
 .../usr/bin/meshwizard/helpers/setup_qos.sh   |    17 +
 .../bin/meshwizard/helpers/setup_splash.sh    |    52 +
 .../usr/bin/meshwizard/helpers/setup_ssh.sh   |    26 +
 .../bin/meshwizard/helpers/setup_system.sh    |     7 +
 .../bin/meshwizard/helpers/setup_uhttpd.sh    |    11 +
 .../bin/meshwizard/helpers/setup_wan_dhcp.sh  |    18 +
 .../meshwizard/helpers/setup_wan_static.sh    |    20 +
 .../bin/meshwizard/helpers/setup_widgets.sh   |    14 +
 .../usr/bin/meshwizard/helpers/setup_wifi.sh  |    80 +
 .../bin/meshwizard/helpers/setup_wifi_vap.sh  |    23 +
 .../bin/meshwizard/helpers/supports_vap.sh    |    34 +
 .../files/usr/bin/meshwizard/wizard.sh        |   141 +
 .../contrib/package/remote-update/Makefile    |    43 +
 .../files/usr/sbin/remote-update              |   306 +
 trunk/package/luci/contrib/uci/Makefile       |    43 +
 .../luci/contrib/uci/hostfiles/bin/uci        |     2 +
 .../contrib/uci/hostfiles/etc/config/batmand  |    10 +
 .../contrib/uci/hostfiles/etc/config/ddns     |    85 +
 .../contrib/uci/hostfiles/etc/config/dhcp     |    23 +
 .../contrib/uci/hostfiles/etc/config/dropbear |     3 +
 .../contrib/uci/hostfiles/etc/config/firewall |    80 +
 .../contrib/uci/hostfiles/etc/config/fstab    |    10 +
 .../contrib/uci/hostfiles/etc/config/httpd    |     5 +
 .../uci/hostfiles/etc/config/luci_devinfo     |    29 +
 .../uci/hostfiles/etc/config/mactodevinfo     |    10 +
 .../contrib/uci/hostfiles/etc/config/network  |    27 +
 .../uci/hostfiles/etc/config/ntpclient        |    22 +
 .../luci/contrib/uci/hostfiles/etc/config/qos |    89 +
 .../contrib/uci/hostfiles/etc/config/system   |     3 +
 .../contrib/uci/hostfiles/etc/config/upnpd    |     4 +
 .../contrib/uci/hostfiles/etc/config/wireless |    16 +
 trunk/package/luci/contrib/uhttpd/Makefile    |    30 +
 .../contrib/uhttpd/patches/001-pass-env.patch |    11 +
 .../uhttpd/patches/002-link-order.patch       |    11 +
 .../luci/contrib/uhttpd/patches/series        |     2 +
 trunk/package/luci/i18n/catalan/Makefile      |     5 +
 trunk/package/luci/i18n/catalan/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-catalan   |     6 +
 trunk/package/luci/i18n/chinese/Makefile      |     5 +
 trunk/package/luci/i18n/chinese/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-chinese   |     5 +
 trunk/package/luci/i18n/english/Makefile      |     5 +
 trunk/package/luci/i18n/english/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-english   |     6 +
 trunk/package/luci/i18n/french/Makefile       |     5 +
 trunk/package/luci/i18n/french/ipkg/postinst  |     4 +
 .../root/etc/uci-defaults/luci-i18n-french    |     6 +
 trunk/package/luci/i18n/german/Makefile       |     5 +
 trunk/package/luci/i18n/german/ipkg/postinst  |     4 +
 .../root/etc/uci-defaults/luci-i18n-german    |     6 +
 trunk/package/luci/i18n/greek/Makefile        |     5 +
 trunk/package/luci/i18n/greek/ipkg/postinst   |     4 +
 .../root/etc/uci-defaults/luci-i18n-greek     |     6 +
 trunk/package/luci/i18n/hebrew/Makefile       |     5 +
 trunk/package/luci/i18n/hebrew/ipkg/postinst  |     4 +
 .../root/etc/uci-defaults/luci-i18n-hebrew    |     6 +
 trunk/package/luci/i18n/hungarian/Makefile    |     5 +
 .../package/luci/i18n/hungarian/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-hungarian |     5 +
 trunk/package/luci/i18n/italian/Makefile      |     5 +
 trunk/package/luci/i18n/italian/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-italian   |     6 +
 trunk/package/luci/i18n/japanese/Makefile     |     5 +
 .../package/luci/i18n/japanese/ipkg/postinst  |     4 +
 .../root/etc/uci-defaults/luci-i18n-japanese  |     6 +
 trunk/package/luci/i18n/malay/Makefile        |     5 +
 .../root/etc/uci-defaults/luci-i18n-malay     |     6 +
 trunk/package/luci/i18n/norwegian/Makefile    |     5 +
 .../package/luci/i18n/norwegian/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-norwegian |     6 +
 trunk/package/luci/i18n/polish/Makefile       |     5 +
 trunk/package/luci/i18n/polish/ipkg/postinst  |     4 +
 .../root/etc/uci-defaults/luci-i18n-polish    |     5 +
 .../luci/i18n/portuguese-brazilian/Makefile   |     5 +
 .../i18n/portuguese-brazilian/ipkg/postinst   |     4 +
 .../luci-i18n-portuguese_brazilian            |     5 +
 trunk/package/luci/i18n/portuguese/Makefile   |     5 +
 .../luci/i18n/portuguese/ipkg/postinst        |     4 +
 .../etc/uci-defaults/luci-i18n-portuguese     |     6 +
 trunk/package/luci/i18n/romanian/Makefile     |     5 +
 .../package/luci/i18n/romanian/ipkg/postinst  |     4 +
 .../root/etc/uci-defaults/luci-i18n-romanian  |     6 +
 trunk/package/luci/i18n/russian/Makefile      |     5 +
 trunk/package/luci/i18n/russian/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-russian   |     6 +
 trunk/package/luci/i18n/spanish/Makefile      |     5 +
 .../root/etc/uci-defaults/luci-i18n-spanish   |     6 +
 trunk/package/luci/i18n/swedish/Makefile      |     5 +
 trunk/package/luci/i18n/swedish/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-swedish   |     6 +
 trunk/package/luci/i18n/ukrainian/Makefile    |     5 +
 .../package/luci/i18n/ukrainian/ipkg/postinst |     4 +
 .../root/etc/uci-defaults/luci-i18n-ukrainian |     6 +
 trunk/package/luci/i18n/vietnamese/Makefile   |     5 +
 .../luci/i18n/vietnamese/ipkg/postinst        |     4 +
 .../etc/uci-defaults/luci-i18n-vietnamese     |     6 +
 trunk/package/luci/libs/httpclient/Makefile   |     2 +
 .../libs/httpclient/luasrc/httpclient.lua     |   369 +
 .../httpclient/luasrc/httpclient/receiver.lua |   295 +
 trunk/package/luci/libs/json/Makefile         |     2 +
 trunk/package/luci/libs/json/luasrc/json.lua  |   600 +
 trunk/package/luci/libs/luaneightbl/Makefile  |    24 +
 .../luci/libs/luaneightbl/src/neightbl.c      |   122 +
 trunk/package/luci/libs/nixio/LICENSE         |   201 +
 trunk/package/luci/libs/nixio/Makefile        |   125 +
 trunk/package/luci/libs/nixio/NOTICE          |    10 +
 trunk/package/luci/libs/nixio/README          |    13 +
 trunk/package/luci/libs/nixio/axTLS/Makefile  |   181 +
 trunk/package/luci/libs/nixio/axTLS/README    |     3 +
 .../luci/libs/nixio/axTLS/bindings/Config.in  |   105 +
 .../luci/libs/nixio/axTLS/bindings/Makefile   |    86 +
 .../luci/libs/nixio/axTLS/bindings/README     |    43 +
 .../libs/nixio/axTLS/bindings/csharp/Makefile |    35 +
 .../libs/nixio/axTLS/bindings/csharp/axTLS.cs |   491 +
 .../axTLS/bindings/generate_SWIG_interface.pl |   393 +
 .../axTLS/bindings/generate_interface.pl      |   322 +
 .../libs/nixio/axTLS/bindings/java/Makefile   |    94 +
 .../libs/nixio/axTLS/bindings/java/SSL.java   |   137 +
 .../nixio/axTLS/bindings/java/SSLCTX.java     |   229 +
 .../nixio/axTLS/bindings/java/SSLClient.java  |    81 +
 .../axTLS/bindings/java/SSLReadHolder.java    |    61 +
 .../nixio/axTLS/bindings/java/SSLServer.java  |    72 +
 .../nixio/axTLS/bindings/java/SSLUtil.java    |   116 +
 .../libs/nixio/axTLS/bindings/lua/Makefile    |    67 +
 .../libs/nixio/axTLS/bindings/perl/Makefile   |    91 +
 .../libs/nixio/axTLS/bindings/vbnet/Makefile  |    35 +
 .../nixio/axTLS/bindings/vbnet/axTLSvb.vb     |   200 +
 .../luci/libs/nixio/axTLS/config/Config.in    |   114 +
 .../luci/libs/nixio/axTLS/config/JMeter.jmx   |   247 +
 .../luci/libs/nixio/axTLS/config/Rules.mak    |   220 +
 .../luci/libs/nixio/axTLS/config/axhttpd.aip  |   136 +
 .../luci/libs/nixio/axTLS/config/axtls.RES    |   Bin 0 -> 22748 bytes
 .../luci/libs/nixio/axTLS/config/axtls.rc     |    32 +
 .../luci/libs/nixio/axTLS/config/config.h     |   113 +
 .../luci/libs/nixio/axTLS/config/linuxconfig  |   119 +
 .../libs/nixio/axTLS/config/makefile.conf     |   127 +
 .../nixio/axTLS/config/makefile.dotnet.conf   |    65 +
 .../nixio/axTLS/config/makefile.java.conf     |    58 +
 .../libs/nixio/axTLS/config/makefile.post     |    19 +
 .../scripts/config/Kconfig-language.txt       |   255 +
 .../axTLS/config/scripts/config/Makefile      |   121 +
 .../nixio/axTLS/config/scripts/config/conf.c  |   583 +
 .../axTLS/config/scripts/config/confdata.c    |   458 +
 .../nixio/axTLS/config/scripts/config/expr.c  |  1099 +
 .../nixio/axTLS/config/scripts/config/expr.h  |   195 +
 .../config/scripts/config/lex.zconf.c_shipped |  3688 ++
 .../nixio/axTLS/config/scripts/config/lkc.h   |   123 +
 .../axTLS/config/scripts/config/lkc_proto.h   |    40 +
 .../scripts/config/lxdialog/BIG.FAT.WARNING   |     4 +
 .../scripts/config/lxdialog/checklist.c       |   372 +
 .../config/scripts/config/lxdialog/colors.h   |   161 +
 .../config/scripts/config/lxdialog/dialog.h   |   199 +
 .../config/scripts/config/lxdialog/inputbox.c |   240 +
 .../config/scripts/config/lxdialog/menubox.c  |   438 +
 .../config/scripts/config/lxdialog/msgbox.c   |    85 +
 .../config/scripts/config/lxdialog/textbox.c  |   556 +
 .../config/scripts/config/lxdialog/util.c     |   375 +
 .../config/scripts/config/lxdialog/yesno.c    |   118 +
 .../nixio/axTLS/config/scripts/config/mconf.c |   977 +
 .../nixio/axTLS/config/scripts/config/menu.c  |   390 +
 .../axTLS/config/scripts/config/mkconfigs     |    67 +
 .../axTLS/config/scripts/config/symbol.c      |   809 +
 .../nixio/axTLS/config/scripts/config/util.c  |   109 +
 .../nixio/axTLS/config/scripts/config/zconf.l |   366 +
 .../config/scripts/config/zconf.tab.c_shipped |  2130 +
 .../config/scripts/config/zconf.tab.h_shipped |   125 +
 .../nixio/axTLS/config/scripts/config/zconf.y |   690 +
 .../luci/libs/nixio/axTLS/config/win32config  |   119 +
 .../luci/libs/nixio/axTLS/crypto/Makefile     |    50 +
 .../luci/libs/nixio/axTLS/crypto/aes.c        |   456 +
 .../luci/libs/nixio/axTLS/crypto/bigint.c     |  1575 +
 .../luci/libs/nixio/axTLS/crypto/bigint.h     |    99 +
 .../libs/nixio/axTLS/crypto/bigint_impl.h     |   112 +
 .../luci/libs/nixio/axTLS/crypto/crypto.h     |   222 +
 .../libs/nixio/axTLS/crypto/crypto_misc.c     |   357 +
 .../luci/libs/nixio/axTLS/crypto/hmac.c       |   100 +
 .../luci/libs/nixio/axTLS/crypto/md2.c        |   162 +
 .../luci/libs/nixio/axTLS/crypto/md5.c        |   293 +
 .../luci/libs/nixio/axTLS/crypto/rc4.c        |    91 +
 .../luci/libs/nixio/axTLS/crypto/rsa.c        |   268 +
 .../luci/libs/nixio/axTLS/crypto/sha1.c       |   248 +
 .../luci/libs/nixio/axTLS/docsrc/Makefile     |    39 +
 .../luci/libs/nixio/axTLS/docsrc/axTLS.dox    |  1237 +
 .../libs/nixio/axTLS/docsrc/doco_footer.html  |     3 +
 .../nixio/axTLS/docsrc/images/axolotl.jpg     |   Bin 0 -> 3041 bytes
 .../nixio/axTLS/docsrc/images/tsbasbw.gif     |   Bin 0 -> 2481 bytes
 .../luci/libs/nixio/axTLS/httpd/Config.in     |   163 +
 .../luci/libs/nixio/axTLS/httpd/Makefile      |   127 +
 .../luci/libs/nixio/axTLS/httpd/axhttp.h      |   154 +
 .../luci/libs/nixio/axTLS/httpd/axhttpd.c     |   604 +
 .../luci/libs/nixio/axTLS/httpd/htpasswd.c    |   136 +
 .../kepler-1.1-snapshot-20070521-1825.tar.gz  |   Bin 0 -> 768249 bytes
 .../luci/libs/nixio/axTLS/httpd/kepler.patch  |    64 +
 .../luci/libs/nixio/axTLS/httpd/proc.c        |  1238 +
 .../luci/libs/nixio/axTLS/httpd/tdate_parse.c |   119 +
 .../luci/libs/nixio/axTLS/samples/Config.in   |    63 +
 .../luci/libs/nixio/axTLS/samples/Makefile    |    62 +
 .../luci/libs/nixio/axTLS/samples/c/Makefile  |    76 +
 .../luci/libs/nixio/axTLS/samples/c/axssl.c   |   883 +
 .../libs/nixio/axTLS/samples/csharp/Makefile  |    48 +
 .../libs/nixio/axTLS/samples/csharp/axssl.cs  |   758 +
 .../libs/nixio/axTLS/samples/java/Makefile    |    51 +
 .../libs/nixio/axTLS/samples/java/axssl.java  |   760 +
 .../libs/nixio/axTLS/samples/java/manifest.mf |     1 +
 .../libs/nixio/axTLS/samples/lua/Makefile     |    43 +
 .../libs/nixio/axTLS/samples/lua/axssl.lua    |   562 +
 .../libs/nixio/axTLS/samples/perl/Makefile    |    43 +
 .../libs/nixio/axTLS/samples/perl/axssl.pl    |   634 +
 .../libs/nixio/axTLS/samples/vbnet/Makefile   |    48 +
 .../libs/nixio/axTLS/samples/vbnet/axssl.vb   |   702 +
 .../luci/libs/nixio/axTLS/ssl/BigIntConfig.in |   132 +
 .../luci/libs/nixio/axTLS/ssl/Config.in       |   336 +
 .../luci/libs/nixio/axTLS/ssl/Makefile        |   123 +
 .../package/luci/libs/nixio/axTLS/ssl/asn1.c  |   510 +
 .../package/luci/libs/nixio/axTLS/ssl/cert.h  |    43 +
 .../luci/libs/nixio/axTLS/ssl/crypto_misc.h   |   164 +
 .../luci/libs/nixio/axTLS/ssl/gen_cert.c      |   363 +
 .../luci/libs/nixio/axTLS/ssl/loader.c        |   465 +
 .../luci/libs/nixio/axTLS/ssl/openssl.c       |   322 +
 .../luci/libs/nixio/axTLS/ssl/os_port.c       |   158 +
 .../luci/libs/nixio/axTLS/ssl/os_port.h       |   207 +
 trunk/package/luci/libs/nixio/axTLS/ssl/p12.c |   486 +
 .../luci/libs/nixio/axTLS/ssl/private_key.h   |    54 +
 trunk/package/luci/libs/nixio/axTLS/ssl/ssl.h |   474 +
 .../luci/libs/nixio/axTLS/ssl/test/Makefile   |    97 +
 .../nixio/axTLS/ssl/test/axTLS.ca_key.pem     |    15 +
 .../nixio/axTLS/ssl/test/axTLS.ca_x509.cer    |   Bin 0 -> 483 bytes
 .../nixio/axTLS/ssl/test/axTLS.ca_x509.pem    |    13 +
 .../nixio/axTLS/ssl/test/axTLS.device_key     |   Bin 0 -> 609 bytes
 .../nixio/axTLS/ssl/test/axTLS.device_key.pem |    15 +
 .../nixio/axTLS/ssl/test/axTLS.encrypted.p8   |   Bin 0 -> 385 bytes
 .../axTLS/ssl/test/axTLS.encrypted_pem.p8     |    11 +
 .../libs/nixio/axTLS/ssl/test/axTLS.key_1024  |   Bin 0 -> 609 bytes
 .../nixio/axTLS/ssl/test/axTLS.key_1024.pem   |    15 +
 .../libs/nixio/axTLS/ssl/test/axTLS.key_2048  |   Bin 0 -> 1191 bytes
 .../nixio/axTLS/ssl/test/axTLS.key_2048.pem   |    27 +
 .../libs/nixio/axTLS/ssl/test/axTLS.key_4096  |   Bin 0 -> 2349 bytes
 .../nixio/axTLS/ssl/test/axTLS.key_4096.pem   |    51 +
 .../libs/nixio/axTLS/ssl/test/axTLS.key_512   |   Bin 0 -> 321 bytes
 .../nixio/axTLS/ssl/test/axTLS.key_512.pem    |     9 +
 .../nixio/axTLS/ssl/test/axTLS.key_aes128.pem |    12 +
 .../nixio/axTLS/ssl/test/axTLS.key_aes256.pem |    12 +
 .../nixio/axTLS/ssl/test/axTLS.noname.p12     |   Bin 0 -> 1483 bytes
 .../nixio/axTLS/ssl/test/axTLS.unencrypted.p8 |   Bin 0 -> 347 bytes
 .../axTLS/ssl/test/axTLS.unencrypted_pem.p8   |    10 +
 .../nixio/axTLS/ssl/test/axTLS.withCA.p12     |   Bin 0 -> 2089 bytes
 .../nixio/axTLS/ssl/test/axTLS.withoutCA.p12  |   Bin 0 -> 1573 bytes
 .../nixio/axTLS/ssl/test/axTLS.x509_1024.cer  |   Bin 0 -> 475 bytes
 .../nixio/axTLS/ssl/test/axTLS.x509_1024.pem  |    12 +
 .../nixio/axTLS/ssl/test/axTLS.x509_2048.cer  |   Bin 0 -> 607 bytes
 .../nixio/axTLS/ssl/test/axTLS.x509_2048.pem  |    15 +
 .../nixio/axTLS/ssl/test/axTLS.x509_4096.cer  |   Bin 0 -> 863 bytes
 .../nixio/axTLS/ssl/test/axTLS.x509_4096.pem  |    20 +
 .../nixio/axTLS/ssl/test/axTLS.x509_512.cer   |   Bin 0 -> 406 bytes
 .../nixio/axTLS/ssl/test/axTLS.x509_512.pem   |    11 +
 .../axTLS/ssl/test/axTLS.x509_aes128.pem      |    11 +
 .../axTLS/ssl/test/axTLS.x509_aes256.pem      |    11 +
 .../axTLS/ssl/test/axTLS.x509_bad_after.pem   |    11 +
 .../axTLS/ssl/test/axTLS.x509_bad_before.pem  |    11 +
 .../axTLS/ssl/test/axTLS.x509_device.cer      |   Bin 0 -> 401 bytes
 .../axTLS/ssl/test/axTLS.x509_device.pem      |    24 +
 .../luci/libs/nixio/axTLS/ssl/test/datatest.c |    43 +
 .../libs/nixio/axTLS/ssl/test/datatest.c.old  |   280 +
 .../axTLS/ssl/test/deutsche_telecom.x509_ca   |   Bin 0 -> 670 bytes
 .../libs/nixio/axTLS/ssl/test/equifax.x509_ca |   Bin 0 -> 646 bytes
 .../luci/libs/nixio/axTLS/ssl/test/gnutls.cer |   Bin 0 -> 599 bytes
 .../nixio/axTLS/ssl/test/header_issue.dat     |   Bin 0 -> 1159 bytes
 .../libs/nixio/axTLS/ssl/test/killopenssl.sh  |     2 +
 .../libs/nixio/axTLS/ssl/test/make_certs.sh   |   174 +
 .../nixio/axTLS/ssl/test/microsoft.x509_ca    |   Bin 0 -> 1046 bytes
 .../axTLS/ssl/test/microsoft.x509_ca.pem      |    24 +
 .../luci/libs/nixio/axTLS/ssl/test/ms_iis.cer |    13 +
 .../libs/nixio/axTLS/ssl/test/perf_bigint.c   |   228 +
 .../luci/libs/nixio/axTLS/ssl/test/socgen.cer |   Bin 0 -> 980 bytes
 .../luci/libs/nixio/axTLS/ssl/test/ssltest.c  |  1983 +
 .../libs/nixio/axTLS/ssl/test/ssltest.c.bak   |  1940 +
 .../libs/nixio/axTLS/ssl/test/test_axssl.sh   |   163 +
 .../libs/nixio/axTLS/ssl/test/thawte.x509_ca  |   Bin 0 -> 811 bytes
 .../nixio/axTLS/ssl/test/verisign.x509_ca     |   Bin 0 -> 668 bytes
 .../nixio/axTLS/ssl/test/verisign.x509_ca.pem |    16 +
 .../axTLS/ssl/test/verisign.x509_my_cert      |   Bin 0 -> 1095 bytes
 .../axTLS/ssl/test/verisign.x509_my_cert.pem  |    25 +
 .../package/luci/libs/nixio/axTLS/ssl/tls1.c  |  2057 +
 .../package/luci/libs/nixio/axTLS/ssl/tls1.h  |   289 +
 .../luci/libs/nixio/axTLS/ssl/tls1_clnt.c     |   386 +
 .../luci/libs/nixio/axTLS/ssl/tls1_svr.c      |   476 +
 .../luci/libs/nixio/axTLS/ssl/version.h       |     1 +
 .../package/luci/libs/nixio/axTLS/ssl/x509.c  |   502 +
 .../luci/libs/nixio/axTLS/www/favicon.ico     |   Bin 0 -> 22486 bytes
 .../luci/libs/nixio/axTLS/www/index.html      |  7106 +++
 .../libs/nixio/axTLS/www/lua/download.lua     |    75 +
 .../luci/libs/nixio/axTLS/www/lua/env.lua     |    26 +
 .../luci/libs/nixio/axTLS/www/lua/overview.lp |    64 +
 .../libs/nixio/axTLS/www/lua/prepara_sql2.lua |    31 +
 .../libs/nixio/axTLS/www/lua/test_conc.lua    |    38 +
 .../libs/nixio/axTLS/www/lua/test_cookies.lp  |    13 +
 .../libs/nixio/axTLS/www/lua/test_cookies.lua |    14 +
 .../libs/nixio/axTLS/www/lua/test_err.lua     |     4 +
 .../luci/libs/nixio/axTLS/www/lua/test_fs.lua |    23 +
 .../libs/nixio/axTLS/www/lua/test_htk.lua     |    22 +
 .../libs/nixio/axTLS/www/lua/test_lib.lua     |    31 +
 .../libs/nixio/axTLS/www/lua/test_main.html   |   127 +
 .../libs/nixio/axTLS/www/lua/test_main.lp     |    31 +
 .../libs/nixio/axTLS/www/lua/test_main.lua    |    46 +
 .../libs/nixio/axTLS/www/lua/test_session.lua |    43 +
 .../libs/nixio/axTLS/www/lua/test_sql.lua     |    13 +
 .../libs/nixio/axTLS/www/lua/test_sql2.lua    |    24 +
 .../nixio/axTLS/www/lua/test_variables.lp     |    14 +
 .../axTLS/www/test_dir/no_http/index.html     |     6 +
 .../axTLS/www/test_dir/no_ssl/index.html      |     6 +
 .../luci/libs/nixio/axtls-config/config.h     |   113 +
 .../nixio/axtls-root/etc/nixio/rsa_main.der   |   Bin 0 -> 609 bytes
 .../luci/libs/nixio/docsrc/CHANGELOG.lua      |    29 +
 .../package/luci/libs/nixio/docsrc/README.lua |    95 +
 .../libs/nixio/docsrc/nixio.CryptoHash.lua    |    17 +
 .../luci/libs/nixio/docsrc/nixio.File.lua     |   109 +
 .../luci/libs/nixio/docsrc/nixio.Socket.lua   |   170 +
 .../libs/nixio/docsrc/nixio.TLSContext.lua    |    46 +
 .../libs/nixio/docsrc/nixio.TLSSocket.lua     |    73 +
 .../libs/nixio/docsrc/nixio.UnifiedIO.lua     |   129 +
 .../luci/libs/nixio/docsrc/nixio.bin.lua      |    33 +
 .../luci/libs/nixio/docsrc/nixio.bit.lua      |    92 +
 .../luci/libs/nixio/docsrc/nixio.crypto.lua   |    15 +
 .../luci/libs/nixio/docsrc/nixio.fs.lua       |   265 +
 .../package/luci/libs/nixio/docsrc/nixio.lua  |   467 +
 trunk/package/luci/libs/nixio/lua/bit.lua     |    15 +
 .../package/luci/libs/nixio/lua/nixio/fs.lua  |   175 +
 .../luci/libs/nixio/lua/nixio/util.lua        |   270 +
 .../luci/libs/nixio/nixio-0.3-1.rockspec      |    37 +
 .../root/lib/upgrade/luci-add-conffiles.sh    |    16 +
 trunk/package/luci/libs/nixio/src/address.c   |   565 +
 .../luci/libs/nixio/src/axtls-compat.c        |   297 +
 .../luci/libs/nixio/src/axtls-compat.h        |   150 +
 trunk/package/luci/libs/nixio/src/binary.c    |   313 +
 trunk/package/luci/libs/nixio/src/bind.c      |   293 +
 trunk/package/luci/libs/nixio/src/bit.c       |   149 +
 .../luci/libs/nixio/src/cyassl-compat.c       |    31 +
 .../luci/libs/nixio/src/cyassl-compat.h       |    32 +
 trunk/package/luci/libs/nixio/src/file.c      |   402 +
 trunk/package/luci/libs/nixio/src/fs.c        |   566 +
 trunk/package/luci/libs/nixio/src/io.c        |   225 +
 .../luci/libs/nixio/src/mingw-compat.c        |   220 +
 .../luci/libs/nixio/src/mingw-compat.h        |   112 +
 trunk/package/luci/libs/nixio/src/nixio-tls.h |    53 +
 trunk/package/luci/libs/nixio/src/nixio.c     |   240 +
 trunk/package/luci/libs/nixio/src/nixio.h     |   133 +
 trunk/package/luci/libs/nixio/src/poll.c      |   210 +
 trunk/package/luci/libs/nixio/src/process.c   |   450 +
 trunk/package/luci/libs/nixio/src/protoent.c  |   103 +
 trunk/package/luci/libs/nixio/src/socket.c    |   173 +
 trunk/package/luci/libs/nixio/src/sockopt.c   |   390 +
 trunk/package/luci/libs/nixio/src/splice.c    |   185 +
 trunk/package/luci/libs/nixio/src/syslog.c    |   122 +
 .../package/luci/libs/nixio/src/tls-context.c |   248 +
 .../package/luci/libs/nixio/src/tls-crypto.c  |   185 +
 .../package/luci/libs/nixio/src/tls-socket.c  |   263 +
 trunk/package/luci/libs/nixio/src/user.c      |   263 +
 trunk/package/luci/libs/nixio/standalone.mk   |    55 +
 trunk/package/luci/libs/px5g/Makefile         |    28 +
 .../package/luci/libs/px5g/lua/px5g/util.lua  |    44 +
 .../luci/libs/px5g/root/usr/sbin/px5g-genkeys |    19 +
 .../luci/libs/px5g/src/library/bignum.c       |  2010 +
 .../luci/libs/px5g/src/library/havege.c       |   276 +
 .../package/luci/libs/px5g/src/library/rsa.c  |   750 +
 .../package/luci/libs/px5g/src/library/sha1.c |   622 +
 .../luci/libs/px5g/src/library/timing.c       |   265 +
 .../luci/libs/px5g/src/library/x509write.c    |  1137 +
 .../luci/libs/px5g/src/polarssl/bignum.h      |   437 +
 .../luci/libs/px5g/src/polarssl/bn_mul.h      |   731 +
 .../luci/libs/px5g/src/polarssl/config.h      |   329 +
 .../luci/libs/px5g/src/polarssl/havege.h      |    75 +
 .../package/luci/libs/px5g/src/polarssl/rsa.h |   309 +
 .../luci/libs/px5g/src/polarssl/sha1.h        |   150 +
 .../luci/libs/px5g/src/polarssl/timing.h      |    81 +
 .../luci/libs/px5g/src/polarssl/x509.h        |   549 +
 trunk/package/luci/libs/px5g/src/px5g.c       |   159 +
 trunk/package/luci/libs/px5g/src/px5g.h       |    16 +
 trunk/package/luci/libs/rpcc/Makefile         |     2 +
 trunk/package/luci/libs/rpcc/luasrc/rpcc.lua  |    84 +
 .../luci/libs/rpcc/luasrc/rpcc/ruci.lua       |    63 +
 .../package/luci/modules/admin-full/Makefile  |    24 +
 .../luci-static/resources/bandwidth.svg       |    16 +
 .../luci-static/resources/connections.svg     |    17 +
 .../htdocs/luci-static/resources/load.svg     |    17 +
 .../htdocs/luci-static/resources/wifirate.svg |    15 +
 .../htdocs/luci-static/resources/wireless.svg |    16 +
 .../luasrc/controller/admin/filebrowser.lua   |    20 +
 .../luasrc/controller/admin/index.lua         |    49 +
 .../luasrc/controller/admin/network.lua       |   465 +
 .../luasrc/controller/admin/status.lua        |   164 +
 .../luasrc/controller/admin/system.lua        |   393 +
 .../luasrc/controller/admin/uci.lua           |    75 +
 .../luasrc/model/cbi/admin_network/dhcp.lua   |   264 +
 .../luasrc/model/cbi/admin_network/hosts.lua  |    41 +
 .../model/cbi/admin_network/iface_add.lua     |   104 +
 .../luasrc/model/cbi/admin_network/ifaces.lua |   527 +
 .../model/cbi/admin_network/network.lua       |    82 +
 .../model/cbi/admin_network/proto_ahcp.lua    |    76 +
 .../luasrc/model/cbi/admin_network/routes.lua |    86 +
 .../luasrc/model/cbi/admin_network/vlan.lua   |   315 +
 .../luasrc/model/cbi/admin_network/wifi.lua   |   956 +
 .../model/cbi/admin_network/wifi_add.lua      |   184 +
 .../model/cbi/admin_status/processes.lua      |    44 +
 .../luasrc/model/cbi/admin_system/admin.lua   |   130 +
 .../model/cbi/admin_system/backupfiles.lua    |    92 +
 .../luasrc/model/cbi/admin_system/buttons.lua |    38 +
 .../luasrc/model/cbi/admin_system/crontab.lua |    38 +
 .../luasrc/model/cbi/admin_system/fstab.lua   |   156 +
 .../model/cbi/admin_system/fstab/mount.lua    |   108 +
 .../model/cbi/admin_system/fstab/swap.lua     |    65 +
 .../luasrc/model/cbi/admin_system/ipkg.lua    |    36 +
 .../luasrc/model/cbi/admin_system/leds.lua    |   129 +
 .../luasrc/model/cbi/admin_system/startup.lua |   109 +
 .../luasrc/model/cbi/admin_system/system.lua  |   228 +
 .../luasrc/view/admin_network/diagnostics.htm |   120 +
 .../view/admin_network/iface_overview.htm     |   258 +
 .../view/admin_network/iface_status.htm       |    94 +
 .../view/admin_network/lease_status.htm       |   118 +
 .../view/admin_network/switch_status.htm      |    41 +
 .../luasrc/view/admin_network/wifi_join.htm   |   156 +
 .../view/admin_network/wifi_overview.htm      |   441 +
 .../luasrc/view/admin_network/wifi_status.htm |    78 +
 .../luasrc/view/admin_status/bandwidth.htm    |   311 +
 .../luasrc/view/admin_status/connections.htm  |   382 +
 .../luasrc/view/admin_status/dmesg.htm        |    20 +
 .../luasrc/view/admin_status/index.htm        |   713 +
 .../luasrc/view/admin_status/iptables.htm     |   159 +
 .../luasrc/view/admin_status/load.htm         |   291 +
 .../luasrc/view/admin_status/routes.htm       |   107 +
 .../luasrc/view/admin_status/syslog.htm       |    20 +
 .../luasrc/view/admin_status/wireless.htm     |   378 +
 .../luasrc/view/admin_system/applyreboot.htm  |    50 +
 .../luasrc/view/admin_system/backupfiles.htm  |    19 +
 .../luasrc/view/admin_system/clock_status.htm |    36 +
 .../luasrc/view/admin_system/flashops.htm     |    94 +
 .../luasrc/view/admin_system/ipkg.htm         |    19 +
 .../luasrc/view/admin_system/packages.htm     |   200 +
 .../luasrc/view/admin_system/reboot.htm       |    33 +
 .../luasrc/view/admin_system/upgrade.htm      |    67 +
 .../luasrc/view/admin_uci/apply.htm           |    32 +
 .../luasrc/view/admin_uci/changelog.htm       |    88 +
 .../luasrc/view/admin_uci/changes.htm         |    52 +
 .../luasrc/view/admin_uci/revert.htm          |    36 +
 .../luasrc/view/cbi/wireless_modefreq.htm     |   167 +
 .../luci/modules/admin-full/src/luci-bwc.c    |   778 +
 .../package/luci/modules/admin-mini/Makefile  |     2 +
 .../luasrc/controller/mini/index.lua          |    48 +
 .../luasrc/controller/mini/network.lua        |    23 +
 .../luasrc/controller/mini/system.lua         |   246 +
 .../admin-mini/luasrc/model/cbi/mini/dhcp.lua |   109 +
 .../luasrc/model/cbi/mini/index.lua           |    14 +
 .../admin-mini/luasrc/model/cbi/mini/luci.lua |    48 +
 .../luasrc/model/cbi/mini/network.lua         |   205 +
 .../luasrc/model/cbi/mini/passwd.lua          |    45 +
 .../luasrc/model/cbi/mini/system.lua          |    80 +
 .../admin-mini/luasrc/model/cbi/mini/wifi.lua |   373 +
 .../luasrc/view/mini/applyreboot.htm          |    21 +
 .../admin-mini/luasrc/view/mini/backup.htm    |    40 +
 .../admin-mini/luasrc/view/mini/index.htm     |    21 +
 .../admin-mini/luasrc/view/mini/reboot.htm    |    33 +
 .../admin-mini/luasrc/view/mini/upgrade.htm   |   105 +
 trunk/package/luci/modules/base/Makefile      |    45 +
 .../luci/modules/base/htdocs/cgi-bin/luci     |     5 +
 .../base/htdocs/luci-static/resources/cbi.js  |  1339 +
 .../htdocs/luci-static/resources/cbi/add.gif  |   Bin 0 -> 378 bytes
 .../luci-static/resources/cbi/apply.gif       |   Bin 0 -> 268 bytes
 .../luci-static/resources/cbi/arrow.gif       |   Bin 0 -> 135 bytes
 .../htdocs/luci-static/resources/cbi/down.gif |   Bin 0 -> 131 bytes
 .../luci-static/resources/cbi/download.gif    |   Bin 0 -> 189 bytes
 .../htdocs/luci-static/resources/cbi/edit.gif |   Bin 0 -> 280 bytes
 .../luci-static/resources/cbi/fieldadd.gif    |   Bin 0 -> 379 bytes
 .../htdocs/luci-static/resources/cbi/file.gif |   Bin 0 -> 371 bytes
 .../htdocs/luci-static/resources/cbi/find.gif |   Bin 0 -> 273 bytes
 .../luci-static/resources/cbi/folder.gif      |   Bin 0 -> 698 bytes
 .../htdocs/luci-static/resources/cbi/help.gif |   Bin 0 -> 266 bytes
 .../htdocs/luci-static/resources/cbi/key.gif  |   Bin 0 -> 230 bytes
 .../htdocs/luci-static/resources/cbi/link.gif |   Bin 0 -> 279 bytes
 .../luci-static/resources/cbi/reload.gif      |   Bin 0 -> 248 bytes
 .../luci-static/resources/cbi/remove.gif      |   Bin 0 -> 385 bytes
 .../luci-static/resources/cbi/reset.gif       |   Bin 0 -> 258 bytes
 .../htdocs/luci-static/resources/cbi/save.gif |   Bin 0 -> 263 bytes
 .../htdocs/luci-static/resources/cbi/up.gif   |   Bin 0 -> 130 bytes
 .../htdocs/luci-static/resources/cbi/user.gif |   Bin 0 -> 246 bytes
 .../luci-static/resources/icons/bridge.png    |   Bin 0 -> 838 bytes
 .../resources/icons/bridge_disabled.png       |   Bin 0 -> 517 bytes
 .../resources/icons/encryption.png            |   Bin 0 -> 1224 bytes
 .../resources/icons/encryption_disabled.png   |   Bin 0 -> 1197 bytes
 .../luci-static/resources/icons/ethernet.png  |   Bin 0 -> 814 bytes
 .../resources/icons/ethernet_disabled.png     |   Bin 0 -> 508 bytes
 .../luci-static/resources/icons/loading.gif   |   Bin 0 -> 1787 bytes
 .../luci-static/resources/icons/port_down.png |   Bin 0 -> 982 bytes
 .../luci-static/resources/icons/port_up.png   |   Bin 0 -> 1401 bytes
 .../resources/icons/signal-0-25.png           |   Bin 0 -> 495 bytes
 .../luci-static/resources/icons/signal-0.png  |   Bin 0 -> 478 bytes
 .../resources/icons/signal-25-50.png          |   Bin 0 -> 501 bytes
 .../resources/icons/signal-50-75.png          |   Bin 0 -> 500 bytes
 .../resources/icons/signal-75-100.png         |   Bin 0 -> 485 bytes
 .../resources/icons/signal-none.png           |   Bin 0 -> 681 bytes
 .../luci-static/resources/icons/switch.png    |   Bin 0 -> 794 bytes
 .../resources/icons/switch_disabled.png       |   Bin 0 -> 505 bytes
 .../luci-static/resources/icons/tunnel.png    |   Bin 0 -> 533 bytes
 .../resources/icons/tunnel_disabled.png       |   Bin 0 -> 546 bytes
 .../luci-static/resources/icons/vlan.png      |   Bin 0 -> 794 bytes
 .../resources/icons/vlan_disabled.png         |   Bin 0 -> 505 bytes
 .../luci-static/resources/icons/wifi.png      |   Bin 0 -> 1037 bytes
 .../luci-static/resources/icons/wifi_big.png  |   Bin 0 -> 2865 bytes
 .../resources/icons/wifi_big_disabled.png     |   Bin 0 -> 2853 bytes
 .../resources/icons/wifi_disabled.png         |   Bin 0 -> 980 bytes
 .../base/htdocs/luci-static/resources/xhr.js  |   241 +
 .../luci/modules/base/luasrc/cacheloader.lua  |    23 +
 .../package/luci/modules/base/luasrc/cbi.lua  |  1850 +
 .../modules/base/luasrc/cbi/datatypes.lua     |   345 +
 .../luci/modules/base/luasrc/ccache.lua       |    87 +
 .../luci/modules/base/luasrc/config.lua       |    42 +
 .../luasrc/controller/admin/servicectl.lua    |    60 +
 .../luci/modules/base/luasrc/debug.lua        |    37 +
 .../luci/modules/base/luasrc/dispatcher.lua   |   959 +
 trunk/package/luci/modules/base/luasrc/fs.lua |   244 +
 .../package/luci/modules/base/luasrc/http.lua |   344 +
 .../modules/base/luasrc/http/protocol.lua     |   688 +
 .../luasrc/http/protocol/conditionals.lua     |   153 +
 .../base/luasrc/http/protocol/date.lua        |   115 +
 .../base/luasrc/http/protocol/mime.lua        |    99 +
 .../package/luci/modules/base/luasrc/i18n.lua |   104 +
 .../package/luci/modules/base/luasrc/init.lua |    39 +
 trunk/package/luci/modules/base/luasrc/ip.lua |   673 +
 .../luci/modules/base/luasrc/ltn12.lua        |   392 +
 .../model/cbi/admin_network/proto_dhcp.lua    |    76 +
 .../model/cbi/admin_network/proto_none.lua    |    13 +
 .../model/cbi/admin_network/proto_static.lua  |    90 +
 .../modules/base/luasrc/model/firewall.lua    |   582 +
 .../luci/modules/base/luasrc/model/ipkg.lua   |   239 +
 .../modules/base/luasrc/model/network.lua     |  1597 +
 .../luci/modules/base/luasrc/model/uci.lua    |   404 +
 .../luci/modules/base/luasrc/sauth.lua        |   127 +
 .../luci/modules/base/luasrc/sgi/cgi.lua      |    95 +
 .../luci/modules/base/luasrc/sgi/uhttpd.lua   |   105 +
 .../luci/modules/base/luasrc/store.lua        |    16 +
 .../package/luci/modules/base/luasrc/sys.lua  |   962 +
 .../modules/base/luasrc/sys/iptparser.lua     |   373 +
 .../luci/modules/base/luasrc/sys/zoneinfo.lua |    28 +
 .../base/luasrc/sys/zoneinfo/tzdata.lua       |   430 +
 .../base/luasrc/sys/zoneinfo/tzoffset.lua     |   177 +
 .../luci/modules/base/luasrc/template.lua     |   123 +
 .../luci/modules/base/luasrc/tools/proto.lua  |    46 +
 .../luci/modules/base/luasrc/tools/status.lua |   218 +
 .../modules/base/luasrc/tools/webadmin.lua    |   173 +
 .../package/luci/modules/base/luasrc/util.lua |   791 +
 .../luci/modules/base/luasrc/version.lua      |    12 +
 .../base/luasrc/view/cbi/apply_xhr.htm        |    43 +
 .../modules/base/luasrc/view/cbi/browser.htm  |     7 +
 .../modules/base/luasrc/view/cbi/button.htm   |     7 +
 .../base/luasrc/view/cbi/cell_valuefooter.htm |    20 +
 .../base/luasrc/view/cbi/cell_valueheader.htm |     2 +
 .../modules/base/luasrc/view/cbi/compound.htm |     1 +
 .../base/luasrc/view/cbi/delegator.htm        |    24 +
 .../modules/base/luasrc/view/cbi/dvalue.htm   |    13 +
 .../modules/base/luasrc/view/cbi/dynlist.htm  |    26 +
 .../base/luasrc/view/cbi/filebrowser.htm      |   108 +
 .../luasrc/view/cbi/firewall_zoneforwards.htm |    59 +
 .../luasrc/view/cbi/firewall_zonelist.htm     |    89 +
 .../modules/base/luasrc/view/cbi/footer.htm   |    26 +
 .../base/luasrc/view/cbi/full_valuefooter.htm |    59 +
 .../base/luasrc/view/cbi/full_valueheader.htm |     9 +
 .../modules/base/luasrc/view/cbi/fvalue.htm   |     9 +
 .../modules/base/luasrc/view/cbi/header.htm   |     7 +
 .../modules/base/luasrc/view/cbi/lvalue.htm   |    18 +
 .../luci/modules/base/luasrc/view/cbi/map.htm |    13 +
 .../modules/base/luasrc/view/cbi/mvalue.htm   |    19 +
 .../luasrc/view/cbi/network_ifacelist.htm     |    81 +
 .../base/luasrc/view/cbi/network_netinfo.htm  |    27 +
 .../base/luasrc/view/cbi/network_netlist.htm  |    81 +
 .../modules/base/luasrc/view/cbi/nsection.htm |    31 +
 .../base/luasrc/view/cbi/nullsection.htm      |    38 +
 .../base/luasrc/view/cbi/simpleform.htm       |    57 +
 .../base/luasrc/view/cbi/tabcontainer.htm     |     7 +
 .../modules/base/luasrc/view/cbi/tabmenu.htm  |    13 +
 .../base/luasrc/view/cbi/tblsection.htm       |   146 +
 .../modules/base/luasrc/view/cbi/tsection.htm |    48 +
 .../modules/base/luasrc/view/cbi/tvalue.htm   |     5 +
 .../base/luasrc/view/cbi/ucisection.htm       |    75 +
 .../modules/base/luasrc/view/cbi/upload.htm   |    14 +
 .../modules/base/luasrc/view/cbi/value.htm    |    35 +
 .../base/luasrc/view/cbi/valuefooter.htm      |     1 +
 .../base/luasrc/view/cbi/valueheader.htm      |     1 +
 .../modules/base/luasrc/view/error404.htm     |    19 +
 .../modules/base/luasrc/view/error500.htm     |    19 +
 .../luci/modules/base/luasrc/view/footer.htm  |    15 +
 .../luci/modules/base/luasrc/view/header.htm  |    21 +
 .../luci/modules/base/luasrc/view/indexer.htm |    15 +
 .../luci/modules/base/luasrc/view/sysauth.htm |    80 +
 .../luci/modules/base/root/etc/config/luci    |    24 +
 .../modules/base/root/etc/config/ucitrack     |    57 +
 .../luci/modules/base/root/sbin/luci-reload   |    45 +
 .../luci/modules/base/root/www/index.html     |    10 +
 trunk/package/luci/modules/base/src/po2lmo.c  |   247 +
 .../luci/modules/base/src/template_lmo.c      |   328 +
 .../luci/modules/base/src/template_lmo.h      |    92 +
 .../luci/modules/base/src/template_lualib.c   |   179 +
 .../luci/modules/base/src/template_lualib.h   |    30 +
 .../luci/modules/base/src/template_parser.c   |   419 +
 .../luci/modules/base/src/template_parser.h   |    80 +
 .../luci/modules/base/src/template_utils.c    |   494 +
 .../luci/modules/base/src/template_utils.h    |    49 +
 trunk/package/luci/modules/base/standalone.mk |    56 +
 trunk/package/luci/modules/failsafe/Makefile  |     2 +
 .../luasrc/controller/failsafe/failsafe.lua   |   211 +
 .../luasrc/view/failsafe/applyreboot.htm      |    50 +
 .../luasrc/view/failsafe/flashops.htm         |    43 +
 .../failsafe/luasrc/view/failsafe/reboot.htm  |    26 +
 .../failsafe/luasrc/view/failsafe/upgrade.htm |    62 +
 trunk/package/luci/modules/freifunk/Makefile  |     4 +
 .../freifunk/htdocs/luci-static/flashing.html |    84 +
 .../luci-static/resources/OSMLatLon.htm       |    20 +
 .../htdocs/luci-static/resources/flashing.gif |   Bin 0 -> 4261 bytes
 .../resources/freifunk-map/hna.gif            |   Bin 0 -> 209 bytes
 .../resources/freifunk-map/node.gif           |   Bin 0 -> 209 bytes
 .../htdocs/luci-static/resources/osm.js       |   130 +
 .../luasrc/controller/freifunk/freifunk.lua   |   202 +
 .../controller/freifunk/remote_update.lua     |    62 +
 .../luasrc/model/cbi/freifunk/basics.lua      |   104 +
 .../luasrc/model/cbi/freifunk/contact.lua     |    25 +
 .../luasrc/model/cbi/freifunk/profile.lua     |    83 +
 .../model/cbi/freifunk/profile_expert.lua     |    41 +
 .../luasrc/model/cbi/freifunk/user_index.lua  |    30 +
 .../freifunk/luasrc/view/cbi/osmll_value.htm  |    55 +
 .../luasrc/view/freifunk-map/frame.htm        |    29 +
 .../freifunk/luasrc/view/freifunk-map/map.htm |   118 +
 .../luasrc/view/freifunk/adminindex.htm       |    51 +
 .../freifunk/luasrc/view/freifunk/contact.htm |    70 +
 .../freifunk/luasrc/view/freifunk/index.htm   |    92 +
 .../luasrc/view/freifunk/profile_error.htm    |    11 +
 .../luasrc/view/freifunk/public_status.htm    |   372 +
 .../luasrc/view/freifunk/remote_update.htm    |    59 +
 trunk/package/luci/modules/rpc/Makefile       |     2 +
 .../modules/rpc/luasrc/controller/rpc.lua     |   166 +
 .../luci/modules/rpc/luasrc/jsonrpc.lua       |    94 +
 .../modules/rpc/luasrc/jsonrpcbind/uci.lua    |    94 +
 trunk/package/luci/po/ca/ahcp.po              |   117 +
 trunk/package/luci/po/ca/asterisk.po          |   680 +
 trunk/package/luci/po/ca/base.po              |  3801 ++
 trunk/package/luci/po/ca/commands.po          |    98 +
 trunk/package/luci/po/ca/coovachilli.po       |   655 +
 trunk/package/luci/po/ca/ddns.po              |    92 +
 trunk/package/luci/po/ca/diag_core.po         |    33 +
 trunk/package/luci/po/ca/diag_devinfo.po      |   209 +
 trunk/package/luci/po/ca/ffwizard.po          |   162 +
 trunk/package/luci/po/ca/firewall.po          |   603 +
 .../luci/po/ca/freifunk-policyrouting.po      |    62 +
 trunk/package/luci/po/ca/freifunk.po          |   407 +
 trunk/package/luci/po/ca/hd_idle.po           |    52 +
 trunk/package/luci/po/ca/meshwizard.po        |   144 +
 trunk/package/luci/po/ca/minidlna.po          |   167 +
 trunk/package/luci/po/ca/mmc_over_gpio.po     |    43 +
 trunk/package/luci/po/ca/multiwan.po          |   124 +
 trunk/package/luci/po/ca/ntpc.po              |    57 +
 trunk/package/luci/po/ca/olsr.po              |   707 +
 trunk/package/luci/po/ca/openvpn.po           |   555 +
 trunk/package/luci/po/ca/p2pblock.po          |    46 +
 trunk/package/luci/po/ca/p910nd.po            |    55 +
 trunk/package/luci/po/ca/pbx-voicemail.po     |   100 +
 trunk/package/luci/po/ca/pbx.po               |   509 +
 trunk/package/luci/po/ca/polipo.po            |   299 +
 trunk/package/luci/po/ca/qos.po               |   122 +
 trunk/package/luci/po/ca/radvd.po             |   382 +
 trunk/package/luci/po/ca/rrdtool.po           |   359 +
 trunk/package/luci/po/ca/samba.po             |    95 +
 trunk/package/luci/po/ca/splash.po            |   330 +
 trunk/package/luci/po/ca/statistics.po        |   675 +
 trunk/package/luci/po/ca/tinyproxy.po         |   339 +
 trunk/package/luci/po/ca/transmission.po      |   297 +
 trunk/package/luci/po/ca/upnp.po              |   167 +
 trunk/package/luci/po/ca/ushare.po            |    55 +
 trunk/package/luci/po/ca/uvc_streamer.po      |    43 +
 trunk/package/luci/po/ca/vnstat.po            |    65 +
 trunk/package/luci/po/ca/voice_core.po        |    18 +
 trunk/package/luci/po/ca/voice_diag.po        |    30 +
 trunk/package/luci/po/ca/watchcat.po          |    71 +
 trunk/package/luci/po/ca/wol.po               |    58 +
 trunk/package/luci/po/ca/wshaper.po           |    59 +
 trunk/package/luci/po/cs/ahcp.po              |   114 +
 trunk/package/luci/po/cs/asterisk.po          |    11 +
 trunk/package/luci/po/cs/base.po              |  3204 +
 trunk/package/luci/po/cs/commands.po          |    96 +
 trunk/package/luci/po/cs/coovachilli.po       |   348 +
 trunk/package/luci/po/cs/ddns.po              |    87 +
 trunk/package/luci/po/cs/diag_core.po         |    39 +
 trunk/package/luci/po/cs/diag_devinfo.po      |   209 +
 trunk/package/luci/po/cs/ffwizard.po          |   166 +
 trunk/package/luci/po/cs/firewall.po          |   579 +
 .../luci/po/cs/freifunk-policyrouting.po      |    52 +
 trunk/package/luci/po/cs/freifunk.po          |   404 +
 trunk/package/luci/po/cs/hd_idle.po           |    52 +
 trunk/package/luci/po/cs/meshwizard.po        |   122 +
 trunk/package/luci/po/cs/minidlna.po          |   171 +
 trunk/package/luci/po/cs/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/cs/multiwan.po          |   124 +
 trunk/package/luci/po/cs/ntpc.po              |    55 +
 trunk/package/luci/po/cs/olsr.po              |   693 +
 trunk/package/luci/po/cs/openvpn.po           |   549 +
 trunk/package/luci/po/cs/p2pblock.po          |    41 +
 trunk/package/luci/po/cs/p910nd.po            |    49 +
 trunk/package/luci/po/cs/pbx-voicemail.po     |    91 +
 trunk/package/luci/po/cs/pbx.po               |   487 +
 trunk/package/luci/po/cs/polipo.po            |   205 +
 trunk/package/luci/po/cs/qos.po               |   114 +
 trunk/package/luci/po/cs/radvd.po             |   389 +
 trunk/package/luci/po/cs/rrdtool.po           |   359 +
 trunk/package/luci/po/cs/samba.po             |    83 +
 trunk/package/luci/po/cs/splash.po            |   340 +
 trunk/package/luci/po/cs/statistics.po        |   688 +
 trunk/package/luci/po/cs/tinyproxy.po         |   258 +
 trunk/package/luci/po/cs/transmission.po      |   295 +
 trunk/package/luci/po/cs/upnp.po              |   150 +
 trunk/package/luci/po/cs/ushare.po            |    53 +
 trunk/package/luci/po/cs/uvc_streamer.po      |    44 +
 trunk/package/luci/po/cs/vnstat.po            |    64 +
 trunk/package/luci/po/cs/voice_core.po        |    21 +
 trunk/package/luci/po/cs/voice_diag.po        |    29 +
 trunk/package/luci/po/cs/watchcat.po          |    72 +
 trunk/package/luci/po/cs/wol.po               |    55 +
 trunk/package/luci/po/cs/wshaper.po           |    58 +
 trunk/package/luci/po/de/ahcp.po              |   115 +
 trunk/package/luci/po/de/asterisk.po          |   131 +
 trunk/package/luci/po/de/base.po              |  4147 ++
 trunk/package/luci/po/de/commands.po          |    98 +
 trunk/package/luci/po/de/coovachilli.po       |   658 +
 trunk/package/luci/po/de/ddns.po              |   602 +
 trunk/package/luci/po/de/diag_core.po         |    42 +
 trunk/package/luci/po/de/diag_devinfo.po      |   221 +
 trunk/package/luci/po/de/ffwizard.po          |   180 +
 trunk/package/luci/po/de/firewall.po          |   748 +
 .../luci/po/de/freifunk-policyrouting.po      |    67 +
 trunk/package/luci/po/de/freifunk.po          |   447 +
 trunk/package/luci/po/de/hd_idle.po           |    50 +
 trunk/package/luci/po/de/meshwizard.po        |   145 +
 trunk/package/luci/po/de/minidlna.po          |   205 +
 trunk/package/luci/po/de/mmc_over_gpio.po     |    42 +
 trunk/package/luci/po/de/multiwan.po          |   124 +
 trunk/package/luci/po/de/ntpc.po              |    53 +
 trunk/package/luci/po/de/olsr.po              |   814 +
 trunk/package/luci/po/de/openvpn.po           |   560 +
 trunk/package/luci/po/de/p2pblock.po          |    44 +
 trunk/package/luci/po/de/p910nd.po            |    51 +
 trunk/package/luci/po/de/pbx-voicemail.po     |   141 +
 trunk/package/luci/po/de/pbx.po               |   699 +
 trunk/package/luci/po/de/polipo.po            |   272 +
 trunk/package/luci/po/de/qos.po               |   122 +
 trunk/package/luci/po/de/radvd.po             |   483 +
 trunk/package/luci/po/de/rrdtool.po           |   357 +
 trunk/package/luci/po/de/samba.po             |    87 +
 trunk/package/luci/po/de/splash.po            |   383 +
 trunk/package/luci/po/de/statistics.po        |   711 +
 trunk/package/luci/po/de/tinyproxy.po         |   373 +
 trunk/package/luci/po/de/transmission.po      |   300 +
 trunk/package/luci/po/de/upnp.po              |   171 +
 trunk/package/luci/po/de/ushare.po            |    53 +
 trunk/package/luci/po/de/uvc_streamer.po      |    43 +
 trunk/package/luci/po/de/vnstat.po            |    68 +
 trunk/package/luci/po/de/voice_core.po        |    18 +
 trunk/package/luci/po/de/voice_diag.po        |    29 +
 trunk/package/luci/po/de/watchcat.po          |    72 +
 trunk/package/luci/po/de/wol.po               |    58 +
 trunk/package/luci/po/de/wshaper.po           |    58 +
 trunk/package/luci/po/el/ahcp.po              |   114 +
 trunk/package/luci/po/el/asterisk.po          |    71 +
 trunk/package/luci/po/el/base.po              |  3857 ++
 trunk/package/luci/po/el/commands.po          |    91 +
 trunk/package/luci/po/el/coovachilli.po       |    50 +
 trunk/package/luci/po/el/ddns.po              |    90 +
 trunk/package/luci/po/el/diag_core.po         |    38 +
 trunk/package/luci/po/el/diag_devinfo.po      |   209 +
 trunk/package/luci/po/el/ffwizard.po          |   181 +
 trunk/package/luci/po/el/firewall.po          |   638 +
 .../luci/po/el/freifunk-policyrouting.po      |    39 +
 trunk/package/luci/po/el/freifunk.po          |   407 +
 trunk/package/luci/po/el/hd_idle.po           |    48 +
 trunk/package/luci/po/el/meshwizard.po        |   124 +
 trunk/package/luci/po/el/minidlna.po          |   164 +
 trunk/package/luci/po/el/mmc_over_gpio.po     |    39 +
 trunk/package/luci/po/el/multiwan.po          |   118 +
 trunk/package/luci/po/el/ntpc.po              |    56 +
 trunk/package/luci/po/el/olsr.po              |   695 +
 trunk/package/luci/po/el/openvpn.po           |   560 +
 trunk/package/luci/po/el/p2pblock.po          |    43 +
 trunk/package/luci/po/el/p910nd.po            |    55 +
 trunk/package/luci/po/el/pbx-voicemail.po     |    94 +
 trunk/package/luci/po/el/pbx.po               |   493 +
 trunk/package/luci/po/el/polipo.po            |   207 +
 trunk/package/luci/po/el/qos.po               |   124 +
 trunk/package/luci/po/el/radvd.po             |   370 +
 trunk/package/luci/po/el/rrdtool.po           |   358 +
 trunk/package/luci/po/el/samba.po             |    78 +
 trunk/package/luci/po/el/splash.po            |   307 +
 trunk/package/luci/po/el/statistics.po        |   606 +
 trunk/package/luci/po/el/tinyproxy.po         |   283 +
 trunk/package/luci/po/el/transmission.po      |   280 +
 trunk/package/luci/po/el/upnp.po              |   140 +
 trunk/package/luci/po/el/ushare.po            |    48 +
 trunk/package/luci/po/el/uvc_streamer.po      |    41 +
 trunk/package/luci/po/el/vnstat.po            |    59 +
 trunk/package/luci/po/el/voice_core.po        |    18 +
 trunk/package/luci/po/el/voice_diag.po        |    33 +
 trunk/package/luci/po/el/watchcat.po          |    53 +
 trunk/package/luci/po/el/wol.po               |    49 +
 trunk/package/luci/po/el/wshaper.po           |    55 +
 trunk/package/luci/po/en/ahcp.po              |   115 +
 trunk/package/luci/po/en/asterisk.po          |   680 +
 trunk/package/luci/po/en/base.po              |  3816 ++
 trunk/package/luci/po/en/commands.po          |    95 +
 trunk/package/luci/po/en/coovachilli.po       |   639 +
 trunk/package/luci/po/en/ddns.po              |    88 +
 trunk/package/luci/po/en/diag_core.po         |    42 +
 trunk/package/luci/po/en/diag_devinfo.po      |   213 +
 trunk/package/luci/po/en/ffwizard.po          |   171 +
 trunk/package/luci/po/en/firewall.po          |   635 +
 .../luci/po/en/freifunk-policyrouting.po      |    39 +
 trunk/package/luci/po/en/freifunk.po          |   400 +
 trunk/package/luci/po/en/hd_idle.po           |    48 +
 trunk/package/luci/po/en/meshwizard.po        |   109 +
 trunk/package/luci/po/en/minidlna.po          |   195 +
 trunk/package/luci/po/en/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/en/multiwan.po          |   114 +
 trunk/package/luci/po/en/ntpc.po              |    51 +
 trunk/package/luci/po/en/olsr.po              |   701 +
 trunk/package/luci/po/en/openvpn.po           |   552 +
 trunk/package/luci/po/en/p2pblock.po          |    28 +
 trunk/package/luci/po/en/p910nd.po            |    51 +
 trunk/package/luci/po/en/pbx-voicemail.po     |   169 +
 trunk/package/luci/po/en/pbx.po               |   502 +
 trunk/package/luci/po/en/polipo.po            |   284 +
 trunk/package/luci/po/en/qos.po               |    91 +
 trunk/package/luci/po/en/radvd.po             |   368 +
 trunk/package/luci/po/en/rrdtool.po           |   358 +
 trunk/package/luci/po/en/samba.po             |    82 +
 trunk/package/luci/po/en/splash.po            |   292 +
 trunk/package/luci/po/en/statistics.po        |   661 +
 trunk/package/luci/po/en/tinyproxy.po         |   331 +
 trunk/package/luci/po/en/transmission.po      |   280 +
 trunk/package/luci/po/en/upnp.po              |   157 +
 trunk/package/luci/po/en/ushare.po            |    49 +
 trunk/package/luci/po/en/uvc_streamer.po      |    40 +
 trunk/package/luci/po/en/vnstat.po            |    59 +
 trunk/package/luci/po/en/voice_core.po        |    23 +
 trunk/package/luci/po/en/voice_diag.po        |    34 +
 trunk/package/luci/po/en/watchcat.po          |    66 +
 trunk/package/luci/po/en/wol.po               |    50 +
 trunk/package/luci/po/en/wshaper.po           |    40 +
 trunk/package/luci/po/es/ahcp.po              |   115 +
 trunk/package/luci/po/es/asterisk.po          |   355 +
 trunk/package/luci/po/es/base.po              |  3943 ++
 trunk/package/luci/po/es/commands.po          |    97 +
 trunk/package/luci/po/es/coovachilli.po       |   113 +
 trunk/package/luci/po/es/ddns.po              |    89 +
 trunk/package/luci/po/es/diag_core.po         |    42 +
 trunk/package/luci/po/es/diag_devinfo.po      |   222 +
 trunk/package/luci/po/es/ffwizard.po          |   172 +
 trunk/package/luci/po/es/firewall.po          |   698 +
 .../luci/po/es/freifunk-policyrouting.po      |    66 +
 trunk/package/luci/po/es/freifunk.po          |   417 +
 trunk/package/luci/po/es/hd_idle.po           |    50 +
 trunk/package/luci/po/es/meshwizard.po        |   137 +
 trunk/package/luci/po/es/minidlna.po          |   184 +
 trunk/package/luci/po/es/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/es/multiwan.po          |   124 +
 trunk/package/luci/po/es/ntpc.po              |    53 +
 trunk/package/luci/po/es/olsr.po              |   830 +
 trunk/package/luci/po/es/openvpn.po           |   559 +
 trunk/package/luci/po/es/p2pblock.po          |    45 +
 trunk/package/luci/po/es/p910nd.po            |    51 +
 trunk/package/luci/po/es/pbx-voicemail.po     |   106 +
 trunk/package/luci/po/es/pbx.po               |   677 +
 trunk/package/luci/po/es/polipo.po            |   307 +
 trunk/package/luci/po/es/qos.po               |   123 +
 trunk/package/luci/po/es/radvd.po             |   412 +
 trunk/package/luci/po/es/rrdtool.po           |   360 +
 trunk/package/luci/po/es/samba.po             |    92 +
 trunk/package/luci/po/es/splash.po            |   376 +
 trunk/package/luci/po/es/statistics.po        |   721 +
 trunk/package/luci/po/es/tinyproxy.po         |   354 +
 trunk/package/luci/po/es/transmission.po      |   299 +
 trunk/package/luci/po/es/upnp.po              |   165 +
 trunk/package/luci/po/es/ushare.po            |    53 +
 trunk/package/luci/po/es/uvc_streamer.po      |    43 +
 trunk/package/luci/po/es/vnstat.po            |    68 +
 trunk/package/luci/po/es/voice_core.po        |    21 +
 trunk/package/luci/po/es/voice_diag.po        |    33 +
 trunk/package/luci/po/es/watchcat.po          |    68 +
 trunk/package/luci/po/es/wol.po               |    57 +
 trunk/package/luci/po/es/wshaper.po           |    58 +
 trunk/package/luci/po/fr/ahcp.po              |   115 +
 trunk/package/luci/po/fr/asterisk.po          |   569 +
 trunk/package/luci/po/fr/base.po              |  4107 ++
 trunk/package/luci/po/fr/commands.po          |   100 +
 trunk/package/luci/po/fr/coovachilli.po       |    26 +
 trunk/package/luci/po/fr/ddns.po              |    89 +
 trunk/package/luci/po/fr/diag_core.po         |    42 +
 trunk/package/luci/po/fr/diag_devinfo.po      |   220 +
 trunk/package/luci/po/fr/ffwizard.po          |   159 +
 trunk/package/luci/po/fr/firewall.po          |   693 +
 .../luci/po/fr/freifunk-policyrouting.po      |    39 +
 trunk/package/luci/po/fr/freifunk.po          |   395 +
 trunk/package/luci/po/fr/hd_idle.po           |    50 +
 trunk/package/luci/po/fr/meshwizard.po        |   139 +
 trunk/package/luci/po/fr/minidlna.po          |   164 +
 trunk/package/luci/po/fr/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/fr/multiwan.po          |   125 +
 trunk/package/luci/po/fr/ntpc.po              |    53 +
 trunk/package/luci/po/fr/olsr.po              |   692 +
 trunk/package/luci/po/fr/openvpn.po           |   580 +
 trunk/package/luci/po/fr/p2pblock.po          |    45 +
 trunk/package/luci/po/fr/p910nd.po            |    56 +
 trunk/package/luci/po/fr/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/fr/pbx.po               |   484 +
 trunk/package/luci/po/fr/polipo.po            |   206 +
 trunk/package/luci/po/fr/qos.po               |    97 +
 trunk/package/luci/po/fr/radvd.po             |   472 +
 trunk/package/luci/po/fr/rrdtool.po           |   358 +
 trunk/package/luci/po/fr/samba.po             |    84 +
 trunk/package/luci/po/fr/splash.po            |   337 +
 trunk/package/luci/po/fr/statistics.po        |   669 +
 trunk/package/luci/po/fr/tinyproxy.po         |   372 +
 trunk/package/luci/po/fr/transmission.po      |   280 +
 trunk/package/luci/po/fr/upnp.po              |   158 +
 trunk/package/luci/po/fr/ushare.po            |    50 +
 trunk/package/luci/po/fr/uvc_streamer.po      |    43 +
 trunk/package/luci/po/fr/vnstat.po            |    68 +
 trunk/package/luci/po/fr/voice_core.po        |    21 +
 trunk/package/luci/po/fr/voice_diag.po        |    33 +
 trunk/package/luci/po/fr/watchcat.po          |    53 +
 trunk/package/luci/po/fr/wol.po               |    57 +
 trunk/package/luci/po/fr/wshaper.po           |    43 +
 trunk/package/luci/po/he/ahcp.po              |   118 +
 trunk/package/luci/po/he/asterisk.po          |   194 +
 trunk/package/luci/po/he/base.po              |  2933 +
 trunk/package/luci/po/he/commands.po          |    91 +
 trunk/package/luci/po/he/coovachilli.po       |    26 +
 trunk/package/luci/po/he/ddns.po              |    87 +
 trunk/package/luci/po/he/diag_core.po         |    30 +
 trunk/package/luci/po/he/diag_devinfo.po      |   206 +
 trunk/package/luci/po/he/ffwizard.po          |   159 +
 trunk/package/luci/po/he/firewall.po          |   432 +
 .../luci/po/he/freifunk-policyrouting.po      |    50 +
 trunk/package/luci/po/he/freifunk.po          |   394 +
 trunk/package/luci/po/he/hd_idle.po           |    52 +
 trunk/package/luci/po/he/meshwizard.po        |   119 +
 trunk/package/luci/po/he/minidlna.po          |   164 +
 trunk/package/luci/po/he/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/he/multiwan.po          |   115 +
 trunk/package/luci/po/he/ntpc.po              |    59 +
 trunk/package/luci/po/he/olsr.po              |   687 +
 trunk/package/luci/po/he/openvpn.po           |   547 +
 trunk/package/luci/po/he/p2pblock.po          |    43 +
 trunk/package/luci/po/he/p910nd.po            |    53 +
 trunk/package/luci/po/he/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/he/pbx.po               |   484 +
 trunk/package/luci/po/he/polipo.po            |   202 +
 trunk/package/luci/po/he/qos.po               |    91 +
 trunk/package/luci/po/he/radvd.po             |   367 +
 trunk/package/luci/po/he/rrdtool.po           |   356 +
 trunk/package/luci/po/he/samba.po             |    73 +
 trunk/package/luci/po/he/splash.po            |   325 +
 trunk/package/luci/po/he/statistics.po        |   598 +
 trunk/package/luci/po/he/tinyproxy.po         |   255 +
 trunk/package/luci/po/he/transmission.po      |   280 +
 trunk/package/luci/po/he/upnp.po              |   136 +
 trunk/package/luci/po/he/ushare.po            |    52 +
 trunk/package/luci/po/he/uvc_streamer.po      |    45 +
 trunk/package/luci/po/he/vnstat.po            |    58 +
 trunk/package/luci/po/he/voice_core.po        |    22 +
 trunk/package/luci/po/he/voice_diag.po        |    22 +
 trunk/package/luci/po/he/watchcat.po          |    53 +
 trunk/package/luci/po/he/wol.po               |    49 +
 trunk/package/luci/po/he/wshaper.po           |    40 +
 trunk/package/luci/po/hu/ahcp.po              |   116 +
 trunk/package/luci/po/hu/asterisk.po          |   134 +
 trunk/package/luci/po/hu/base.po              |  3327 +
 trunk/package/luci/po/hu/commands.po          |    98 +
 trunk/package/luci/po/hu/coovachilli.po       |    26 +
 trunk/package/luci/po/hu/ddns.po              |    91 +
 trunk/package/luci/po/hu/diag_core.po         |    42 +
 trunk/package/luci/po/hu/diag_devinfo.po      |   222 +
 trunk/package/luci/po/hu/ffwizard.po          |   175 +
 trunk/package/luci/po/hu/firewall.po          |   580 +
 .../luci/po/hu/freifunk-policyrouting.po      |    50 +
 trunk/package/luci/po/hu/freifunk.po          |   392 +
 trunk/package/luci/po/hu/hd_idle.po           |    52 +
 trunk/package/luci/po/hu/meshwizard.po        |   122 +
 trunk/package/luci/po/hu/minidlna.po          |   199 +
 trunk/package/luci/po/hu/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/hu/multiwan.po          |   124 +
 trunk/package/luci/po/hu/ntpc.po              |    55 +
 trunk/package/luci/po/hu/olsr.po              |   687 +
 trunk/package/luci/po/hu/openvpn.po           |   557 +
 trunk/package/luci/po/hu/p2pblock.po          |    43 +
 trunk/package/luci/po/hu/p910nd.po            |    49 +
 trunk/package/luci/po/hu/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/hu/pbx.po               |   484 +
 trunk/package/luci/po/hu/polipo.po            |   202 +
 trunk/package/luci/po/hu/qos.po               |   111 +
 trunk/package/luci/po/hu/radvd.po             |   372 +
 trunk/package/luci/po/hu/rrdtool.po           |   359 +
 trunk/package/luci/po/hu/samba.po             |    84 +
 trunk/package/luci/po/hu/splash.po            |   303 +
 trunk/package/luci/po/hu/statistics.po        |   693 +
 trunk/package/luci/po/hu/tinyproxy.po         |   255 +
 trunk/package/luci/po/hu/transmission.po      |   300 +
 trunk/package/luci/po/hu/upnp.po              |   155 +
 trunk/package/luci/po/hu/ushare.po            |    53 +
 trunk/package/luci/po/hu/uvc_streamer.po      |    43 +
 trunk/package/luci/po/hu/vnstat.po            |    65 +
 trunk/package/luci/po/hu/voice_core.po        |    21 +
 trunk/package/luci/po/hu/voice_diag.po        |    30 +
 trunk/package/luci/po/hu/watchcat.po          |    64 +
 trunk/package/luci/po/hu/wol.po               |    59 +
 trunk/package/luci/po/hu/wshaper.po           |    54 +
 trunk/package/luci/po/it/ahcp.po              |   114 +
 trunk/package/luci/po/it/asterisk.po          |   162 +
 trunk/package/luci/po/it/base.po              |  3921 ++
 trunk/package/luci/po/it/commands.po          |    99 +
 trunk/package/luci/po/it/coovachilli.po       |    75 +
 trunk/package/luci/po/it/ddns.po              |    89 +
 trunk/package/luci/po/it/diag_core.po         |    42 +
 trunk/package/luci/po/it/diag_devinfo.po      |   221 +
 trunk/package/luci/po/it/ffwizard.po          |   180 +
 trunk/package/luci/po/it/firewall.po          |   502 +
 .../luci/po/it/freifunk-policyrouting.po      |    69 +
 trunk/package/luci/po/it/freifunk.po          |   422 +
 trunk/package/luci/po/it/hd_idle.po           |    50 +
 trunk/package/luci/po/it/meshwizard.po        |   143 +
 trunk/package/luci/po/it/minidlna.po          |   194 +
 trunk/package/luci/po/it/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/it/multiwan.po          |   124 +
 trunk/package/luci/po/it/ntpc.po              |    53 +
 trunk/package/luci/po/it/olsr.po              |   733 +
 trunk/package/luci/po/it/openvpn.po           |   553 +
 trunk/package/luci/po/it/p2pblock.po          |    45 +
 trunk/package/luci/po/it/p910nd.po            |    55 +
 trunk/package/luci/po/it/pbx-voicemail.po     |   110 +
 trunk/package/luci/po/it/pbx.po               |   487 +
 trunk/package/luci/po/it/polipo.po            |   219 +
 trunk/package/luci/po/it/qos.po               |   108 +
 trunk/package/luci/po/it/radvd.po             |   374 +
 trunk/package/luci/po/it/rrdtool.po           |   359 +
 trunk/package/luci/po/it/samba.po             |    85 +
 trunk/package/luci/po/it/splash.po            |   361 +
 trunk/package/luci/po/it/statistics.po        |   608 +
 trunk/package/luci/po/it/tinyproxy.po         |   265 +
 trunk/package/luci/po/it/transmission.po      |   295 +
 trunk/package/luci/po/it/upnp.po              |   155 +
 trunk/package/luci/po/it/ushare.po            |    53 +
 trunk/package/luci/po/it/uvc_streamer.po      |    43 +
 trunk/package/luci/po/it/vnstat.po            |    68 +
 trunk/package/luci/po/it/voice_core.po        |    21 +
 trunk/package/luci/po/it/voice_diag.po        |    30 +
 trunk/package/luci/po/it/watchcat.po          |    72 +
 trunk/package/luci/po/it/wol.po               |    56 +
 trunk/package/luci/po/it/wshaper.po           |    59 +
 trunk/package/luci/po/ja/ahcp.po              |   117 +
 trunk/package/luci/po/ja/asterisk.po          |    44 +
 trunk/package/luci/po/ja/base.po              |  4061 ++
 trunk/package/luci/po/ja/commands.po          |    94 +
 trunk/package/luci/po/ja/coovachilli.po       |    25 +
 trunk/package/luci/po/ja/ddns.po              |    89 +
 trunk/package/luci/po/ja/diag_core.po         |    33 +
 trunk/package/luci/po/ja/diag_devinfo.po      |   209 +
 trunk/package/luci/po/ja/ffwizard.po          |   159 +
 trunk/package/luci/po/ja/firewall.po          |   687 +
 .../luci/po/ja/freifunk-policyrouting.po      |    39 +
 trunk/package/luci/po/ja/freifunk.po          |   395 +
 trunk/package/luci/po/ja/hd_idle.po           |    50 +
 trunk/package/luci/po/ja/meshwizard.po        |   109 +
 trunk/package/luci/po/ja/minidlna.po          |   198 +
 trunk/package/luci/po/ja/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/ja/multiwan.po          |   120 +
 trunk/package/luci/po/ja/ntpc.po              |    53 +
 trunk/package/luci/po/ja/olsr.po              |   800 +
 trunk/package/luci/po/ja/openvpn.po           |   551 +
 trunk/package/luci/po/ja/p2pblock.po          |    28 +
 trunk/package/luci/po/ja/p910nd.po            |    51 +
 trunk/package/luci/po/ja/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/ja/pbx.po               |   493 +
 trunk/package/luci/po/ja/polipo.po            |   229 +
 trunk/package/luci/po/ja/qos.po               |    93 +
 trunk/package/luci/po/ja/radvd.po             |   378 +
 trunk/package/luci/po/ja/rrdtool.po           |   358 +
 trunk/package/luci/po/ja/samba.po             |    81 +
 trunk/package/luci/po/ja/splash.po            |   292 +
 trunk/package/luci/po/ja/statistics.po        |   601 +
 trunk/package/luci/po/ja/tinyproxy.po         |   280 +
 trunk/package/luci/po/ja/transmission.po      |   295 +
 trunk/package/luci/po/ja/upnp.po              |   160 +
 trunk/package/luci/po/ja/ushare.po            |    52 +
 trunk/package/luci/po/ja/uvc_streamer.po      |    43 +
 trunk/package/luci/po/ja/vnstat.po            |    68 +
 trunk/package/luci/po/ja/voice_core.po        |    18 +
 trunk/package/luci/po/ja/voice_diag.po        |    22 +
 trunk/package/luci/po/ja/watchcat.po          |    70 +
 trunk/package/luci/po/ja/wol.po               |    56 +
 trunk/package/luci/po/ja/wshaper.po           |    58 +
 trunk/package/luci/po/ms/ahcp.po              |   105 +
 trunk/package/luci/po/ms/asterisk.po          |   611 +
 trunk/package/luci/po/ms/base.po              |  3719 ++
 trunk/package/luci/po/ms/commands.po          |    90 +
 trunk/package/luci/po/ms/coovachilli.po       |    22 +
 trunk/package/luci/po/ms/ddns.po              |    81 +
 trunk/package/luci/po/ms/diag_core.po         |    29 +
 trunk/package/luci/po/ms/diag_devinfo.po      |   205 +
 trunk/package/luci/po/ms/ffwizard.po          |   158 +
 trunk/package/luci/po/ms/firewall.po          |   431 +
 .../luci/po/ms/freifunk-policyrouting.po      |    39 +
 trunk/package/luci/po/ms/freifunk.po          |   391 +
 trunk/package/luci/po/ms/hd_idle.po           |    47 +
 trunk/package/luci/po/ms/meshwizard.po        |   109 +
 trunk/package/luci/po/ms/minidlna.po          |   163 +
 trunk/package/luci/po/ms/mmc_over_gpio.po     |    37 +
 trunk/package/luci/po/ms/multiwan.po          |   114 +
 trunk/package/luci/po/ms/ntpc.po              |    52 +
 trunk/package/luci/po/ms/olsr.po              |   686 +
 trunk/package/luci/po/ms/openvpn.po           |   546 +
 trunk/package/luci/po/ms/p2pblock.po          |    28 +
 trunk/package/luci/po/ms/p910nd.po            |    43 +
 trunk/package/luci/po/ms/pbx-voicemail.po     |    87 +
 trunk/package/luci/po/ms/pbx.po               |   483 +
 trunk/package/luci/po/ms/polipo.po            |   201 +
 trunk/package/luci/po/ms/qos.po               |    90 +
 trunk/package/luci/po/ms/radvd.po             |   368 +
 trunk/package/luci/po/ms/rrdtool.po           |   355 +
 trunk/package/luci/po/ms/samba.po             |    72 +
 trunk/package/luci/po/ms/splash.po            |   292 +
 trunk/package/luci/po/ms/statistics.po        |   595 +
 trunk/package/luci/po/ms/tinyproxy.po         |   254 +
 trunk/package/luci/po/ms/transmission.po      |   280 +
 trunk/package/luci/po/ms/upnp.po              |   135 +
 trunk/package/luci/po/ms/ushare.po            |    46 +
 trunk/package/luci/po/ms/uvc_streamer.po      |    37 +
 trunk/package/luci/po/ms/vnstat.po            |    59 +
 trunk/package/luci/po/ms/voice_core.po        |    14 +
 trunk/package/luci/po/ms/voice_diag.po        |    21 +
 trunk/package/luci/po/ms/watchcat.po          |    52 +
 trunk/package/luci/po/ms/wol.po               |    48 +
 trunk/package/luci/po/ms/wshaper.po           |    40 +
 trunk/package/luci/po/no/ahcp.po              |   117 +
 trunk/package/luci/po/no/asterisk.po          |    12 +
 trunk/package/luci/po/no/base.po              |  3706 ++
 trunk/package/luci/po/no/commands.po          |    98 +
 trunk/package/luci/po/no/coovachilli.po       |    26 +
 trunk/package/luci/po/no/ddns.po              |    72 +
 trunk/package/luci/po/no/diag_core.po         |    35 +
 trunk/package/luci/po/no/diag_devinfo.po      |   213 +
 trunk/package/luci/po/no/ffwizard.po          |   159 +
 trunk/package/luci/po/no/firewall.po          |   565 +
 .../luci/po/no/freifunk-policyrouting.po      |    39 +
 trunk/package/luci/po/no/freifunk.po          |   430 +
 trunk/package/luci/po/no/hd_idle.po           |    39 +
 trunk/package/luci/po/no/meshwizard.po        |   109 +
 trunk/package/luci/po/no/minidlna.po          |   189 +
 trunk/package/luci/po/no/mmc_over_gpio.po     |    32 +
 trunk/package/luci/po/no/multiwan.po          |   117 +
 trunk/package/luci/po/no/ntpc.po              |    44 +
 trunk/package/luci/po/no/olsr.po              |   687 +
 trunk/package/luci/po/no/openvpn.po           |   547 +
 trunk/package/luci/po/no/p2pblock.po          |    36 +
 trunk/package/luci/po/no/p910nd.po            |    47 +
 trunk/package/luci/po/no/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/no/pbx.po               |   484 +
 trunk/package/luci/po/no/polipo.po            |   202 +
 trunk/package/luci/po/no/qos.po               |   106 +
 trunk/package/luci/po/no/radvd.po             |   435 +
 trunk/package/luci/po/no/rrdtool.po           |   354 +
 trunk/package/luci/po/no/samba.po             |    72 +
 trunk/package/luci/po/no/splash.po            |   292 +
 trunk/package/luci/po/no/statistics.po        |   678 +
 trunk/package/luci/po/no/tinyproxy.po         |   255 +
 trunk/package/luci/po/no/transmission.po      |   298 +
 trunk/package/luci/po/no/upnp.po              |   146 +
 trunk/package/luci/po/no/ushare.po            |    44 +
 trunk/package/luci/po/no/uvc_streamer.po      |    38 +
 trunk/package/luci/po/no/vnstat.po            |    58 +
 trunk/package/luci/po/no/voice_core.po        |    14 +
 trunk/package/luci/po/no/voice_diag.po        |    25 +
 trunk/package/luci/po/no/watchcat.po          |    53 +
 trunk/package/luci/po/no/wol.po               |    47 +
 trunk/package/luci/po/no/wshaper.po           |    40 +
 trunk/package/luci/po/pl/ahcp.po              |   115 +
 trunk/package/luci/po/pl/asterisk.po          |    75 +
 trunk/package/luci/po/pl/base.po              |  3198 +
 trunk/package/luci/po/pl/commands.po          |    99 +
 trunk/package/luci/po/pl/coovachilli.po       |    27 +
 trunk/package/luci/po/pl/ddns.po              |    90 +
 trunk/package/luci/po/pl/diag_core.po         |    43 +
 trunk/package/luci/po/pl/diag_devinfo.po      |   222 +
 trunk/package/luci/po/pl/ffwizard.po          |   178 +
 trunk/package/luci/po/pl/firewall.po          |   621 +
 .../luci/po/pl/freifunk-policyrouting.po      |    69 +
 trunk/package/luci/po/pl/freifunk.po          |   422 +
 trunk/package/luci/po/pl/hd_idle.po           |    51 +
 trunk/package/luci/po/pl/meshwizard.po        |   147 +
 trunk/package/luci/po/pl/minidlna.po          |   189 +
 trunk/package/luci/po/pl/mmc_over_gpio.po     |    42 +
 trunk/package/luci/po/pl/multiwan.po          |   125 +
 trunk/package/luci/po/pl/ntpc.po              |    54 +
 trunk/package/luci/po/pl/olsr.po              |   749 +
 trunk/package/luci/po/pl/openvpn.po           |   566 +
 trunk/package/luci/po/pl/p2pblock.po          |    46 +
 trunk/package/luci/po/pl/p910nd.po            |    56 +
 trunk/package/luci/po/pl/pbx-voicemail.po     |   111 +
 trunk/package/luci/po/pl/pbx.po               |   508 +
 trunk/package/luci/po/pl/polipo.po            |   231 +
 trunk/package/luci/po/pl/qos.po               |   111 +
 trunk/package/luci/po/pl/radvd.po             |   377 +
 trunk/package/luci/po/pl/rrdtool.po           |   360 +
 trunk/package/luci/po/pl/samba.po             |    83 +
 trunk/package/luci/po/pl/splash.po            |   385 +
 trunk/package/luci/po/pl/statistics.po        |   697 +
 trunk/package/luci/po/pl/tinyproxy.po         |   292 +
 trunk/package/luci/po/pl/transmission.po      |   302 +
 trunk/package/luci/po/pl/upnp.po              |   153 +
 trunk/package/luci/po/pl/ushare.po            |    54 +
 trunk/package/luci/po/pl/uvc_streamer.po      |    44 +
 trunk/package/luci/po/pl/vnstat.po            |    69 +
 trunk/package/luci/po/pl/voice_core.po        |    22 +
 trunk/package/luci/po/pl/voice_diag.po        |    33 +
 trunk/package/luci/po/pl/watchcat.po          |    71 +
 trunk/package/luci/po/pl/wol.po               |    57 +
 trunk/package/luci/po/pl/wshaper.po           |    59 +
 trunk/package/luci/po/pt/ahcp.po              |   116 +
 trunk/package/luci/po/pt/asterisk.po          |   150 +
 trunk/package/luci/po/pt/base.po              |  3855 ++
 trunk/package/luci/po/pt/commands.po          |    99 +
 trunk/package/luci/po/pt/coovachilli.po       |   372 +
 trunk/package/luci/po/pt/ddns.po              |    93 +
 trunk/package/luci/po/pt/diag_core.po         |    39 +
 trunk/package/luci/po/pt/diag_devinfo.po      |   209 +
 trunk/package/luci/po/pt/ffwizard.po          |   174 +
 trunk/package/luci/po/pt/firewall.po          |   585 +
 .../luci/po/pt/freifunk-policyrouting.po      |    56 +
 trunk/package/luci/po/pt/freifunk.po          |   401 +
 trunk/package/luci/po/pt/hd_idle.po           |    50 +
 trunk/package/luci/po/pt/meshwizard.po        |   133 +
 trunk/package/luci/po/pt/minidlna.po          |   171 +
 trunk/package/luci/po/pt/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/pt/multiwan.po          |   118 +
 trunk/package/luci/po/pt/ntpc.po              |    53 +
 trunk/package/luci/po/pt/olsr.po              |   715 +
 trunk/package/luci/po/pt/openvpn.po           |   559 +
 trunk/package/luci/po/pt/p2pblock.po          |    45 +
 trunk/package/luci/po/pt/p910nd.po            |    51 +
 trunk/package/luci/po/pt/pbx-voicemail.po     |    91 +
 trunk/package/luci/po/pt/pbx.po               |   487 +
 trunk/package/luci/po/pt/polipo.po            |   305 +
 trunk/package/luci/po/pt/qos.po               |   122 +
 trunk/package/luci/po/pt/radvd.po             |   368 +
 trunk/package/luci/po/pt/rrdtool.po           |   359 +
 trunk/package/luci/po/pt/samba.po             |    93 +
 trunk/package/luci/po/pt/splash.po            |   309 +
 trunk/package/luci/po/pt/statistics.po        |   668 +
 trunk/package/luci/po/pt/tinyproxy.po         |   334 +
 trunk/package/luci/po/pt/transmission.po      |   297 +
 trunk/package/luci/po/pt/upnp.po              |   157 +
 trunk/package/luci/po/pt/ushare.po            |    53 +
 trunk/package/luci/po/pt/uvc_streamer.po      |    43 +
 trunk/package/luci/po/pt/vnstat.po            |    65 +
 trunk/package/luci/po/pt/voice_core.po        |    18 +
 trunk/package/luci/po/pt/voice_diag.po        |    29 +
 trunk/package/luci/po/pt/watchcat.po          |    56 +
 trunk/package/luci/po/pt/wol.po               |    54 +
 trunk/package/luci/po/pt/wshaper.po           |    55 +
 trunk/package/luci/po/pt_BR/ahcp.po           |   115 +
 trunk/package/luci/po/pt_BR/asterisk.po       |   691 +
 trunk/package/luci/po/pt_BR/base.po           |  4145 ++
 trunk/package/luci/po/pt_BR/commands.po       |    98 +
 trunk/package/luci/po/pt_BR/coovachilli.po    |   657 +
 trunk/package/luci/po/pt_BR/ddns.po           |    90 +
 trunk/package/luci/po/pt_BR/diag_core.po      |    42 +
 trunk/package/luci/po/pt_BR/diag_devinfo.po   |   220 +
 trunk/package/luci/po/pt_BR/ffwizard.po       |   178 +
 trunk/package/luci/po/pt_BR/firewall.po       |   740 +
 .../luci/po/pt_BR/freifunk-policyrouting.po   |    68 +
 trunk/package/luci/po/pt_BR/freifunk.po       |   447 +
 trunk/package/luci/po/pt_BR/hd_idle.po        |    50 +
 trunk/package/luci/po/pt_BR/meshwizard.po     |   150 +
 trunk/package/luci/po/pt_BR/minidlna.po       |   193 +
 trunk/package/luci/po/pt_BR/mmc_over_gpio.po  |    41 +
 trunk/package/luci/po/pt_BR/multiwan.po       |   124 +
 trunk/package/luci/po/pt_BR/ntpc.po           |    53 +
 trunk/package/luci/po/pt_BR/olsr.po           |   906 +
 trunk/package/luci/po/pt_BR/openvpn.po        |   566 +
 trunk/package/luci/po/pt_BR/p2pblock.po       |    30 +
 trunk/package/luci/po/pt_BR/p910nd.po         |    57 +
 trunk/package/luci/po/pt_BR/pbx-voicemail.po  |   175 +
 trunk/package/luci/po/pt_BR/pbx.po            |   744 +
 trunk/package/luci/po/pt_BR/polipo.po         |   306 +
 trunk/package/luci/po/pt_BR/qos.po            |   127 +
 trunk/package/luci/po/pt_BR/radvd.po          |   469 +
 trunk/package/luci/po/pt_BR/rrdtool.po        |   359 +
 trunk/package/luci/po/pt_BR/samba.po          |    93 +
 trunk/package/luci/po/pt_BR/splash.po         |   402 +
 trunk/package/luci/po/pt_BR/statistics.po     |   705 +
 trunk/package/luci/po/pt_BR/tinyproxy.po      |   367 +
 trunk/package/luci/po/pt_BR/transmission.po   |   300 +
 trunk/package/luci/po/pt_BR/upnp.po           |   166 +
 trunk/package/luci/po/pt_BR/ushare.po         |    53 +
 trunk/package/luci/po/pt_BR/uvc_streamer.po   |    40 +
 trunk/package/luci/po/pt_BR/vnstat.po         |    68 +
 trunk/package/luci/po/pt_BR/voice_core.po     |    21 +
 trunk/package/luci/po/pt_BR/voice_diag.po     |    32 +
 trunk/package/luci/po/pt_BR/watchcat.po       |    71 +
 trunk/package/luci/po/pt_BR/wol.po            |    56 +
 trunk/package/luci/po/pt_BR/wshaper.po        |    59 +
 trunk/package/luci/po/ro/ahcp.po              |   115 +
 trunk/package/luci/po/ro/asterisk.po          |    54 +
 trunk/package/luci/po/ro/base.po              |  3124 +
 trunk/package/luci/po/ro/commands.po          |    99 +
 trunk/package/luci/po/ro/coovachilli.po       |    27 +
 trunk/package/luci/po/ro/ddns.po              |    92 +
 trunk/package/luci/po/ro/diag_core.po         |    45 +
 trunk/package/luci/po/ro/diag_devinfo.po      |   210 +
 trunk/package/luci/po/ro/ffwizard.po          |   165 +
 trunk/package/luci/po/ro/firewall.po          |   503 +
 .../luci/po/ro/freifunk-policyrouting.po      |    53 +
 trunk/package/luci/po/ro/freifunk.po          |   395 +
 trunk/package/luci/po/ro/hd_idle.po           |    53 +
 trunk/package/luci/po/ro/meshwizard.po        |   126 +
 trunk/package/luci/po/ro/minidlna.po          |   168 +
 trunk/package/luci/po/ro/mmc_over_gpio.po     |    42 +
 trunk/package/luci/po/ro/multiwan.po          |   119 +
 trunk/package/luci/po/ro/ntpc.po              |    56 +
 trunk/package/luci/po/ro/olsr.po              |   691 +
 trunk/package/luci/po/ro/openvpn.po           |   548 +
 trunk/package/luci/po/ro/p2pblock.po          |    44 +
 trunk/package/luci/po/ro/p910nd.po            |    47 +
 trunk/package/luci/po/ro/pbx-voicemail.po     |    89 +
 trunk/package/luci/po/ro/pbx.po               |   488 +
 trunk/package/luci/po/ro/polipo.po            |   206 +
 trunk/package/luci/po/ro/qos.po               |    97 +
 trunk/package/luci/po/ro/radvd.po             |   384 +
 trunk/package/luci/po/ro/rrdtool.po           |   360 +
 trunk/package/luci/po/ro/samba.po             |    82 +
 trunk/package/luci/po/ro/splash.po            |   292 +
 trunk/package/luci/po/ro/statistics.po        |   604 +
 trunk/package/luci/po/ro/tinyproxy.po         |   256 +
 trunk/package/luci/po/ro/transmission.po      |   296 +
 trunk/package/luci/po/ro/upnp.po              |   152 +
 trunk/package/luci/po/ro/ushare.po            |    51 +
 trunk/package/luci/po/ro/uvc_streamer.po      |    44 +
 trunk/package/luci/po/ro/vnstat.po            |    69 +
 trunk/package/luci/po/ro/voice_core.po        |    22 +
 trunk/package/luci/po/ro/voice_diag.po        |    33 +
 trunk/package/luci/po/ro/watchcat.po          |    57 +
 trunk/package/luci/po/ro/wol.po               |    57 +
 trunk/package/luci/po/ro/wshaper.po           |    56 +
 trunk/package/luci/po/ru/ahcp.po              |   120 +
 trunk/package/luci/po/ru/asterisk.po          |   515 +
 trunk/package/luci/po/ru/base.po              |  4080 ++
 trunk/package/luci/po/ru/commands.po          |   102 +
 trunk/package/luci/po/ru/coovachilli.po       |   560 +
 trunk/package/luci/po/ru/ddns.po              |    92 +
 trunk/package/luci/po/ru/diag_core.po         |    45 +
 trunk/package/luci/po/ru/diag_devinfo.po      |   223 +
 trunk/package/luci/po/ru/ffwizard.po          |   183 +
 trunk/package/luci/po/ru/firewall.po          |   679 +
 .../luci/po/ru/freifunk-policyrouting.po      |    70 +
 trunk/package/luci/po/ru/freifunk.po          |   451 +
 trunk/package/luci/po/ru/hd_idle.po           |    52 +
 trunk/package/luci/po/ru/meshwizard.po        |   150 +
 trunk/package/luci/po/ru/minidlna.po          |   191 +
 trunk/package/luci/po/ru/mmc_over_gpio.po     |    43 +
 trunk/package/luci/po/ru/multiwan.po          |   127 +
 trunk/package/luci/po/ru/ntpc.po              |    55 +
 trunk/package/luci/po/ru/olsr.po              |   812 +
 trunk/package/luci/po/ru/openvpn.po           |   575 +
 trunk/package/luci/po/ru/p2pblock.po          |    48 +
 trunk/package/luci/po/ru/p910nd.po            |    57 +
 trunk/package/luci/po/ru/pbx-voicemail.po     |   174 +
 trunk/package/luci/po/ru/pbx.po               |   525 +
 trunk/package/luci/po/ru/polipo.po            |   237 +
 trunk/package/luci/po/ru/qos.po               |   104 +
 trunk/package/luci/po/ru/radvd.po             |   473 +
 trunk/package/luci/po/ru/rrdtool.po           |   360 +
 trunk/package/luci/po/ru/samba.po             |    85 +
 trunk/package/luci/po/ru/splash.po            |   362 +
 trunk/package/luci/po/ru/statistics.po        |   696 +
 trunk/package/luci/po/ru/tinyproxy.po         |   294 +
 trunk/package/luci/po/ru/transmission.po      |   306 +
 trunk/package/luci/po/ru/upnp.po              |   158 +
 trunk/package/luci/po/ru/ushare.po            |    54 +
 trunk/package/luci/po/ru/uvc_streamer.po      |    46 +
 trunk/package/luci/po/ru/vnstat.po            |    71 +
 trunk/package/luci/po/ru/voice_core.po        |    24 +
 trunk/package/luci/po/ru/voice_diag.po        |    33 +
 trunk/package/luci/po/ru/watchcat.po          |    74 +
 trunk/package/luci/po/ru/wol.po               |    59 +
 trunk/package/luci/po/ru/wshaper.po           |    61 +
 trunk/package/luci/po/sk/ahcp.po              |   106 +
 trunk/package/luci/po/sk/asterisk.po          |     0
 trunk/package/luci/po/sk/base.po              |  2863 +
 trunk/package/luci/po/sk/commands.po          |    91 +
 trunk/package/luci/po/sk/coovachilli.po       |    21 +
 trunk/package/luci/po/sk/ddns.po              |    74 +
 trunk/package/luci/po/sk/diag_core.po         |    30 +
 trunk/package/luci/po/sk/diag_devinfo.po      |   206 +
 trunk/package/luci/po/sk/ffwizard.po          |   159 +
 trunk/package/luci/po/sk/firewall.po          |   432 +
 .../luci/po/sk/freifunk-policyrouting.po      |    49 +
 trunk/package/luci/po/sk/freifunk.po          |   391 +
 trunk/package/luci/po/sk/hd_idle.po           |    41 +
 trunk/package/luci/po/sk/meshwizard.po        |   119 +
 trunk/package/luci/po/sk/minidlna.po          |   164 +
 trunk/package/luci/po/sk/mmc_over_gpio.po     |    36 +
 trunk/package/luci/po/sk/multiwan.po          |   115 +
 trunk/package/luci/po/sk/ntpc.po              |    48 +
 trunk/package/luci/po/sk/olsr.po              |   687 +
 trunk/package/luci/po/sk/openvpn.po           |   546 +
 trunk/package/luci/po/sk/p2pblock.po          |    38 +
 trunk/package/luci/po/sk/p910nd.po            |    41 +
 trunk/package/luci/po/sk/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/sk/pbx.po               |   484 +
 trunk/package/luci/po/sk/polipo.po            |   202 +
 trunk/package/luci/po/sk/qos.po               |    86 +
 trunk/package/luci/po/sk/radvd.po             |   367 +
 trunk/package/luci/po/sk/rrdtool.po           |   356 +
 trunk/package/luci/po/sk/samba.po             |    73 +
 trunk/package/luci/po/sk/splash.po            |   303 +
 trunk/package/luci/po/sk/statistics.po        |   593 +
 trunk/package/luci/po/sk/tinyproxy.po         |   255 +
 trunk/package/luci/po/sk/transmission.po      |   290 +
 trunk/package/luci/po/sk/upnp.po              |   136 +
 trunk/package/luci/po/sk/ushare.po            |    45 +
 trunk/package/luci/po/sk/uvc_streamer.po      |    38 +
 trunk/package/luci/po/sk/vnstat.po            |    58 +
 trunk/package/luci/po/sk/voice_core.po        |    15 +
 trunk/package/luci/po/sk/voice_diag.po        |    22 +
 trunk/package/luci/po/sk/watchcat.po          |    53 +
 trunk/package/luci/po/sk/wol.po               |    44 +
 trunk/package/luci/po/sk/wshaper.po           |    50 +
 trunk/package/luci/po/sv/ahcp.po              |   109 +
 trunk/package/luci/po/sv/asterisk.po          |     0
 trunk/package/luci/po/sv/base.po              |  2875 +
 trunk/package/luci/po/sv/commands.po          |    92 +
 trunk/package/luci/po/sv/coovachilli.po       |    24 +
 trunk/package/luci/po/sv/ddns.po              |    75 +
 trunk/package/luci/po/sv/diag_core.po         |    31 +
 trunk/package/luci/po/sv/diag_devinfo.po      |   207 +
 trunk/package/luci/po/sv/ffwizard.po          |   166 +
 trunk/package/luci/po/sv/firewall.po          |   433 +
 .../luci/po/sv/freifunk-policyrouting.po      |    50 +
 trunk/package/luci/po/sv/freifunk.po          |   392 +
 trunk/package/luci/po/sv/hd_idle.po           |    42 +
 trunk/package/luci/po/sv/meshwizard.po        |   120 +
 trunk/package/luci/po/sv/minidlna.po          |   165 +
 trunk/package/luci/po/sv/mmc_over_gpio.po     |    37 +
 trunk/package/luci/po/sv/multiwan.po          |   116 +
 trunk/package/luci/po/sv/ntpc.po              |    49 +
 trunk/package/luci/po/sv/olsr.po              |   688 +
 trunk/package/luci/po/sv/openvpn.po           |   547 +
 trunk/package/luci/po/sv/p2pblock.po          |    39 +
 trunk/package/luci/po/sv/p910nd.po            |    42 +
 trunk/package/luci/po/sv/pbx-voicemail.po     |    89 +
 trunk/package/luci/po/sv/pbx.po               |   506 +
 trunk/package/luci/po/sv/polipo.po            |   203 +
 trunk/package/luci/po/sv/qos.po               |    87 +
 trunk/package/luci/po/sv/radvd.po             |   368 +
 trunk/package/luci/po/sv/rrdtool.po           |   357 +
 trunk/package/luci/po/sv/samba.po             |    74 +
 trunk/package/luci/po/sv/splash.po            |   303 +
 trunk/package/luci/po/sv/statistics.po        |   594 +
 trunk/package/luci/po/sv/tinyproxy.po         |   256 +
 trunk/package/luci/po/sv/transmission.po      |   291 +
 trunk/package/luci/po/sv/upnp.po              |   137 +
 trunk/package/luci/po/sv/ushare.po            |    46 +
 trunk/package/luci/po/sv/uvc_streamer.po      |    39 +
 trunk/package/luci/po/sv/vnstat.po            |    59 +
 trunk/package/luci/po/sv/voice_core.po        |    18 +
 trunk/package/luci/po/sv/voice_diag.po        |    23 +
 trunk/package/luci/po/sv/watchcat.po          |    54 +
 trunk/package/luci/po/sv/wol.po               |    45 +
 trunk/package/luci/po/sv/wshaper.po           |    51 +
 trunk/package/luci/po/templates/ahcp.pot      |    99 +
 trunk/package/luci/po/templates/asterisk.pot  |     0
 trunk/package/luci/po/templates/base.pot      |  2856 +
 trunk/package/luci/po/templates/commands.pot  |    84 +
 .../package/luci/po/templates/coovachilli.pot |    14 +
 trunk/package/luci/po/templates/ddns.pot      |   515 +
 trunk/package/luci/po/templates/diag_core.pot |    23 +
 .../luci/po/templates/diag_devinfo.pot        |   199 +
 trunk/package/luci/po/templates/ffwizard.pot  |   150 +
 trunk/package/luci/po/templates/firewall.pot  |   425 +
 .../po/templates/freifunk-policyrouting.pot   |    42 +
 trunk/package/luci/po/templates/freifunk.pot  |   384 +
 trunk/package/luci/po/templates/hd_idle.pot   |    34 +
 .../package/luci/po/templates/meshwizard.pot  |   112 +
 trunk/package/luci/po/templates/minidlna.pot  |   157 +
 .../luci/po/templates/mmc_over_gpio.pot       |    29 +
 trunk/package/luci/po/templates/multiwan.pot  |   108 +
 trunk/package/luci/po/templates/ntpc.pot      |    41 +
 trunk/package/luci/po/templates/olsr.pot      |   680 +
 trunk/package/luci/po/templates/openvpn.pot   |   539 +
 trunk/package/luci/po/templates/p2pblock.pot  |    31 +
 trunk/package/luci/po/templates/p910nd.pot    |    34 +
 .../luci/po/templates/pbx-voicemail.pot       |    81 +
 trunk/package/luci/po/templates/pbx.pot       |   477 +
 trunk/package/luci/po/templates/polipo.pot    |   195 +
 trunk/package/luci/po/templates/qos.pot       |    79 +
 trunk/package/luci/po/templates/radvd.pot     |   360 +
 trunk/package/luci/po/templates/rrdtool.pot   |   349 +
 trunk/package/luci/po/templates/samba.pot     |    66 +
 trunk/package/luci/po/templates/splash.pot    |   295 +
 .../package/luci/po/templates/statistics.pot  |   586 +
 trunk/package/luci/po/templates/tinyproxy.pot |   248 +
 .../luci/po/templates/transmission.pot        |   283 +
 trunk/package/luci/po/templates/upnp.pot      |   129 +
 trunk/package/luci/po/templates/ushare.pot    |    38 +
 .../luci/po/templates/uvc_streamer.pot        |    29 +
 trunk/package/luci/po/templates/vnstat.pot    |    51 +
 .../package/luci/po/templates/voice_core.pot  |     8 +
 .../package/luci/po/templates/voice_diag.pot  |    15 +
 trunk/package/luci/po/templates/watchcat.pot  |    46 +
 trunk/package/luci/po/templates/wol.pot       |    37 +
 trunk/package/luci/po/templates/wshaper.pot   |    43 +
 trunk/package/luci/po/tr/ahcp.po              |   113 +
 trunk/package/luci/po/tr/asterisk.po          |    12 +
 trunk/package/luci/po/tr/base.po              |  2902 +
 trunk/package/luci/po/tr/commands.po          |    91 +
 trunk/package/luci/po/tr/coovachilli.po       |    26 +
 trunk/package/luci/po/tr/ddns.po              |    84 +
 trunk/package/luci/po/tr/diag_core.po         |    30 +
 trunk/package/luci/po/tr/diag_devinfo.po      |   206 +
 trunk/package/luci/po/tr/ffwizard.po          |   159 +
 trunk/package/luci/po/tr/firewall.po          |   432 +
 .../luci/po/tr/freifunk-policyrouting.po      |    50 +
 trunk/package/luci/po/tr/freifunk.po          |   392 +
 trunk/package/luci/po/tr/hd_idle.po           |    52 +
 trunk/package/luci/po/tr/meshwizard.po        |   119 +
 trunk/package/luci/po/tr/minidlna.po          |   164 +
 trunk/package/luci/po/tr/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/tr/multiwan.po          |   115 +
 trunk/package/luci/po/tr/ntpc.po              |    55 +
 trunk/package/luci/po/tr/olsr.po              |   687 +
 trunk/package/luci/po/tr/openvpn.po           |   546 +
 trunk/package/luci/po/tr/p2pblock.po          |    43 +
 trunk/package/luci/po/tr/p910nd.po            |    46 +
 trunk/package/luci/po/tr/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/tr/pbx.po               |   484 +
 trunk/package/luci/po/tr/polipo.po            |   202 +
 trunk/package/luci/po/tr/qos.po               |    91 +
 trunk/package/luci/po/tr/radvd.po             |   367 +
 trunk/package/luci/po/tr/rrdtool.po           |   356 +
 trunk/package/luci/po/tr/samba.po             |    73 +
 trunk/package/luci/po/tr/splash.po            |   303 +
 trunk/package/luci/po/tr/statistics.po        |   594 +
 trunk/package/luci/po/tr/tinyproxy.po         |   255 +
 trunk/package/luci/po/tr/transmission.po      |   290 +
 trunk/package/luci/po/tr/upnp.po              |   136 +
 trunk/package/luci/po/tr/ushare.po            |    50 +
 trunk/package/luci/po/tr/uvc_streamer.po      |    45 +
 trunk/package/luci/po/tr/vnstat.po            |    58 +
 trunk/package/luci/po/tr/voice_core.po        |    18 +
 trunk/package/luci/po/tr/voice_diag.po        |    22 +
 trunk/package/luci/po/tr/watchcat.po          |    53 +
 trunk/package/luci/po/tr/wol.po               |    49 +
 trunk/package/luci/po/tr/wshaper.po           |    50 +
 trunk/package/luci/po/uk/ahcp.po              |   115 +
 trunk/package/luci/po/uk/asterisk.po          |    79 +
 trunk/package/luci/po/uk/base.po              |  3299 +
 trunk/package/luci/po/uk/commands.po          |   103 +
 trunk/package/luci/po/uk/coovachilli.po       |    27 +
 trunk/package/luci/po/uk/ddns.po              |    92 +
 trunk/package/luci/po/uk/diag_core.po         |    40 +
 trunk/package/luci/po/uk/diag_devinfo.po      |   219 +
 trunk/package/luci/po/uk/ffwizard.po          |   163 +
 trunk/package/luci/po/uk/firewall.po          |   619 +
 .../luci/po/uk/freifunk-policyrouting.po      |    72 +
 trunk/package/luci/po/uk/freifunk.po          |   393 +
 trunk/package/luci/po/uk/hd_idle.po           |    52 +
 trunk/package/luci/po/uk/meshwizard.po        |   126 +
 trunk/package/luci/po/uk/minidlna.po          |   165 +
 trunk/package/luci/po/uk/mmc_over_gpio.po     |    42 +
 trunk/package/luci/po/uk/multiwan.po          |   119 +
 trunk/package/luci/po/uk/ntpc.po              |    56 +
 trunk/package/luci/po/uk/olsr.po              |   688 +
 trunk/package/luci/po/uk/openvpn.po           |   550 +
 trunk/package/luci/po/uk/p2pblock.po          |    45 +
 trunk/package/luci/po/uk/p910nd.po            |    47 +
 trunk/package/luci/po/uk/pbx-voicemail.po     |    89 +
 trunk/package/luci/po/uk/pbx.po               |   501 +
 trunk/package/luci/po/uk/polipo.po            |   206 +
 trunk/package/luci/po/uk/qos.po               |   110 +
 trunk/package/luci/po/uk/radvd.po             |   381 +
 trunk/package/luci/po/uk/rrdtool.po           |   357 +
 trunk/package/luci/po/uk/samba.po             |    84 +
 trunk/package/luci/po/uk/splash.po            |   304 +
 trunk/package/luci/po/uk/statistics.po        |   599 +
 trunk/package/luci/po/uk/tinyproxy.po         |   256 +
 trunk/package/luci/po/uk/transmission.po      |   296 +
 trunk/package/luci/po/uk/upnp.po              |   155 +
 trunk/package/luci/po/uk/ushare.po            |    53 +
 trunk/package/luci/po/uk/uvc_streamer.po      |    44 +
 trunk/package/luci/po/uk/vnstat.po            |    67 +
 trunk/package/luci/po/uk/voice_core.po        |    22 +
 trunk/package/luci/po/uk/voice_diag.po        |    33 +
 trunk/package/luci/po/uk/watchcat.po          |    61 +
 trunk/package/luci/po/uk/wol.po               |    59 +
 trunk/package/luci/po/uk/wshaper.po           |    58 +
 trunk/package/luci/po/vi/ahcp.po              |   114 +
 trunk/package/luci/po/vi/asterisk.po          |   680 +
 trunk/package/luci/po/vi/base.po              |  3691 ++
 trunk/package/luci/po/vi/commands.po          |    91 +
 trunk/package/luci/po/vi/coovachilli.po       |   607 +
 trunk/package/luci/po/vi/ddns.po              |    89 +
 trunk/package/luci/po/vi/diag_core.po         |    30 +
 trunk/package/luci/po/vi/diag_devinfo.po      |   206 +
 trunk/package/luci/po/vi/ffwizard.po          |   159 +
 trunk/package/luci/po/vi/firewall.po          |   565 +
 .../luci/po/vi/freifunk-policyrouting.po      |    39 +
 trunk/package/luci/po/vi/freifunk.po          |   398 +
 trunk/package/luci/po/vi/hd_idle.po           |    53 +
 trunk/package/luci/po/vi/meshwizard.po        |   109 +
 trunk/package/luci/po/vi/minidlna.po          |   164 +
 trunk/package/luci/po/vi/mmc_over_gpio.po     |    41 +
 trunk/package/luci/po/vi/multiwan.po          |   115 +
 trunk/package/luci/po/vi/ntpc.po              |    57 +
 trunk/package/luci/po/vi/olsr.po              |   703 +
 trunk/package/luci/po/vi/openvpn.po           |   552 +
 trunk/package/luci/po/vi/p2pblock.po          |    42 +
 trunk/package/luci/po/vi/p910nd.po            |    52 +
 trunk/package/luci/po/vi/pbx-voicemail.po     |    88 +
 trunk/package/luci/po/vi/pbx.po               |   484 +
 trunk/package/luci/po/vi/polipo.po            |   290 +
 trunk/package/luci/po/vi/qos.po               |   122 +
 trunk/package/luci/po/vi/radvd.po             |   368 +
 trunk/package/luci/po/vi/rrdtool.po           |   524 +
 trunk/package/luci/po/vi/samba.po             |    96 +
 trunk/package/luci/po/vi/splash.po            |   292 +
 trunk/package/luci/po/vi/statistics.po        |   665 +
 trunk/package/luci/po/vi/tinyproxy.po         |   332 +
 trunk/package/luci/po/vi/transmission.po      |   280 +
 trunk/package/luci/po/vi/upnp.po              |   158 +
 trunk/package/luci/po/vi/ushare.po            |    50 +
 trunk/package/luci/po/vi/uvc_streamer.po      |    38 +
 trunk/package/luci/po/vi/vnstat.po            |    59 +
 trunk/package/luci/po/vi/voice_core.po        |    15 +
 trunk/package/luci/po/vi/voice_diag.po        |    22 +
 trunk/package/luci/po/vi/watchcat.po          |    53 +
 trunk/package/luci/po/vi/wol.po               |    49 +
 trunk/package/luci/po/vi/wshaper.po           |    40 +
 trunk/package/luci/po/zh_CN/ahcp.po           |   113 +
 trunk/package/luci/po/zh_CN/asterisk.po       |   171 +
 trunk/package/luci/po/zh_CN/base.po           |  3903 ++
 trunk/package/luci/po/zh_CN/commands.po       |    94 +
 trunk/package/luci/po/zh_CN/coovachilli.po    |    26 +
 trunk/package/luci/po/zh_CN/ddns.po           |    88 +
 trunk/package/luci/po/zh_CN/diag_core.po      |    36 +
 trunk/package/luci/po/zh_CN/diag_devinfo.po   |   210 +
 trunk/package/luci/po/zh_CN/ffwizard.po       |   166 +
 trunk/package/luci/po/zh_CN/firewall.po       |   589 +
 .../luci/po/zh_CN/freifunk-policyrouting.po   |    57 +
 trunk/package/luci/po/zh_CN/freifunk.po       |   403 +
 trunk/package/luci/po/zh_CN/hd_idle.po        |    48 +
 trunk/package/luci/po/zh_CN/meshwizard.po     |   126 +
 trunk/package/luci/po/zh_CN/minidlna.po       |   172 +
 trunk/package/luci/po/zh_CN/mmc_over_gpio.po  |    41 +
 trunk/package/luci/po/zh_CN/multiwan.po       |   118 +
 trunk/package/luci/po/zh_CN/ntpc.po           |    53 +
 trunk/package/luci/po/zh_CN/olsr.po           |   696 +
 trunk/package/luci/po/zh_CN/openvpn.po        |   551 +
 trunk/package/luci/po/zh_CN/p2pblock.po       |    43 +
 trunk/package/luci/po/zh_CN/p910nd.po         |    49 +
 trunk/package/luci/po/zh_CN/pbx-voicemail.po  |    97 +
 trunk/package/luci/po/zh_CN/pbx.po            |   495 +
 trunk/package/luci/po/zh_CN/polipo.po         |   205 +
 trunk/package/luci/po/zh_CN/qos.po            |   106 +
 trunk/package/luci/po/zh_CN/radvd.po          |   391 +
 trunk/package/luci/po/zh_CN/rrdtool.po        |   359 +
 trunk/package/luci/po/zh_CN/samba.po          |    83 +
 trunk/package/luci/po/zh_CN/splash.po         |   321 +
 trunk/package/luci/po/zh_CN/statistics.po     |   609 +
 trunk/package/luci/po/zh_CN/tinyproxy.po      |   262 +
 trunk/package/luci/po/zh_CN/transmission.po   |   295 +
 trunk/package/luci/po/zh_CN/upnp.po           |   149 +
 trunk/package/luci/po/zh_CN/ushare.po         |    52 +
 trunk/package/luci/po/zh_CN/uvc_streamer.po   |    41 +
 trunk/package/luci/po/zh_CN/vnstat.po         |    61 +
 trunk/package/luci/po/zh_CN/voice_core.po     |    18 +
 trunk/package/luci/po/zh_CN/voice_diag.po     |    25 +
 trunk/package/luci/po/zh_CN/watchcat.po       |    65 +
 trunk/package/luci/po/zh_CN/wol.po            |    50 +
 trunk/package/luci/po/zh_CN/wshaper.po        |    58 +
 trunk/package/luci/po/zh_TW/ahcp.po           |   109 +
 trunk/package/luci/po/zh_TW/asterisk.po       |    13 +
 trunk/package/luci/po/zh_TW/base.po           |  3013 +
 trunk/package/luci/po/zh_TW/commands.po       |    94 +
 trunk/package/luci/po/zh_TW/coovachilli.po    |    24 +
 trunk/package/luci/po/zh_TW/ddns.po           |    84 +
 trunk/package/luci/po/zh_TW/diag_core.po      |    33 +
 trunk/package/luci/po/zh_TW/diag_devinfo.po   |   210 +
 trunk/package/luci/po/zh_TW/ffwizard.po       |   164 +
 trunk/package/luci/po/zh_TW/firewall.po       |   449 +
 .../luci/po/zh_TW/freifunk-policyrouting.po   |    48 +
 trunk/package/luci/po/zh_TW/freifunk.po       |   390 +
 trunk/package/luci/po/zh_TW/hd_idle.po        |    44 +
 trunk/package/luci/po/zh_TW/meshwizard.po     |   118 +
 trunk/package/luci/po/zh_TW/minidlna.po       |   167 +
 trunk/package/luci/po/zh_TW/mmc_over_gpio.po  |    39 +
 trunk/package/luci/po/zh_TW/multiwan.po       |   118 +
 trunk/package/luci/po/zh_TW/ntpc.po           |    51 +
 trunk/package/luci/po/zh_TW/olsr.po           |   700 +
 trunk/package/luci/po/zh_TW/openvpn.po        |   545 +
 trunk/package/luci/po/zh_TW/p2pblock.po       |    41 +
 trunk/package/luci/po/zh_TW/p910nd.po         |    45 +
 trunk/package/luci/po/zh_TW/pbx-voicemail.po  |    98 +
 trunk/package/luci/po/zh_TW/pbx.po            |   507 +
 trunk/package/luci/po/zh_TW/polipo.po         |   205 +
 trunk/package/luci/po/zh_TW/qos.po            |   106 +
 trunk/package/luci/po/zh_TW/radvd.po          |   366 +
 trunk/package/luci/po/zh_TW/rrdtool.po        |   355 +
 trunk/package/luci/po/zh_TW/samba.po          |    76 +
 trunk/package/luci/po/zh_TW/splash.po         |   302 +
 trunk/package/luci/po/zh_TW/statistics.po     |   592 +
 trunk/package/luci/po/zh_TW/tinyproxy.po      |   254 +
 trunk/package/luci/po/zh_TW/transmission.po   |   295 +
 trunk/package/luci/po/zh_TW/upnp.po           |   147 +
 trunk/package/luci/po/zh_TW/ushare.po         |    48 +
 trunk/package/luci/po/zh_TW/uvc_streamer.po   |    42 +
 trunk/package/luci/po/zh_TW/vnstat.po         |    61 +
 trunk/package/luci/po/zh_TW/voice_core.po     |    18 +
 trunk/package/luci/po/zh_TW/voice_diag.po     |    25 +
 trunk/package/luci/po/zh_TW/watchcat.po       |    66 +
 trunk/package/luci/po/zh_TW/wol.po            |    48 +
 trunk/package/luci/po/zh_TW/wshaper.po        |    56 +
 trunk/package/luci/protocols/3g/Makefile      |     2 +
 .../model/cbi/admin_network/proto_3g.lua      |   153 +
 trunk/package/luci/protocols/ipv6/Makefile    |     2 +
 .../model/cbi/admin_network/proto_6in4.lua    |   111 +
 .../model/cbi/admin_network/proto_6rd.lua     |    81 +
 .../model/cbi/admin_network/proto_6to4.lua    |    46 +
 .../model/cbi/admin_network/proto_dhcpv6.lua  |    67 +
 .../model/cbi/admin_network/proto_dslite.lua  |    62 +
 .../model/cbi/admin_network/proto_hnet.lua    |    43 +
 .../ipv6/luasrc/model/network/proto_4x6.lua   |    65 +
 .../ipv6/luasrc/model/network/proto_6x4.lua   |    66 +
 .../luasrc/model/network/proto_dhcpv6.lua     |    32 +
 .../ipv6/luasrc/model/network/proto_hnet.lua  |    32 +
 .../luci/protocols/openconnect/Makefile       |     2 +
 .../cbi/admin_network/proto_openconnect.lua   |    78 +
 .../model/network/proto_openconnect.lua       |    61 +
 trunk/package/luci/protocols/ppp/Makefile     |     2 +
 .../model/cbi/admin_network/proto_l2tp.lua    |    69 +
 .../model/cbi/admin_network/proto_ppp.lua     |   136 +
 .../model/cbi/admin_network/proto_pppoa.lua   |   142 +
 .../model/cbi/admin_network/proto_pppoe.lua   |   136 +
 .../model/cbi/admin_network/proto_pptp.lua    |   116 +
 .../ppp/luasrc/model/network/proto_ppp.lua    |   104 +
 trunk/package/luci/protocols/relay/Makefile   |     2 +
 .../model/cbi/admin_network/proto_relay.lua   |    77 +
 .../luasrc/model/network/proto_relay.lua      |   165 +
 trunk/package/luci/themes/bootstrap/Makefile  |     2 +
 .../htdocs/luci-static/bootstrap/cascade.css  |  1946 +
 .../htdocs/luci-static/bootstrap/favicon.ico  |   Bin 0 -> 1150 bytes
 .../htdocs/luci-static/bootstrap/html5.js     |     3 +
 .../htdocs/luci-static/bootstrap/mobile.css   |     3 +
 .../luci/themes/bootstrap/ipkg/postinst       |     4 +
 .../luasrc/view/themes/bootstrap/footer.htm   |    41 +
 .../luasrc/view/themes/bootstrap/header.htm   |   209 +
 .../etc/uci-defaults/luci-theme-bootstrap     |     6 +
 .../package/luci/themes/freifunk-bno/Makefile |     2 +
 .../luci-static/freifunk-bno/cascade.css      |   872 +
 .../freifunk-bno/images/bgoption.png          |   Bin 0 -> 141 bytes
 .../freifunk-bno/images/favicon.ico           |   Bin 0 -> 5310 bytes
 .../freifunk-bno/images/header-back.gif       |   Bin 0 -> 127 bytes
 .../freifunk-bno/images/header-left.gif       |   Bin 0 -> 293 bytes
 .../freifunk-bno/images/header-right.gif      |   Bin 0 -> 365 bytes
 .../luci-static/freifunk-bno/images/logo.gif  |   Bin 0 -> 2415 bytes
 .../freifunk-bno/images/main-back.png         |   Bin 0 -> 404 bytes
 .../freifunk-bno/images/schriftzug.gif        |   Bin 0 -> 3606 bytes
 .../luci/themes/freifunk-bno/ipkg/postinst    |     4 +
 .../view/themes/freifunk-bno/footer.htm       |    29 +
 .../view/themes/freifunk-bno/header.htm       |   215 +
 .../etc/uci-defaults/luci-theme-freifunk-bno  |     6 +
 .../luci/themes/freifunk-generic/Makefile     |     2 +
 .../luci-static/freifunk-generic/bg.jpg       |   Bin 0 -> 354 bytes
 .../luci-static/freifunk-generic/cascade.css  |  1072 +
 .../luci-static/freifunk-generic/header.jpg   |   Bin 0 -> 316 bytes
 .../luci-static/freifunk-generic/ie7.css      |    20 +
 .../luci-static/freifunk-generic/logo.jpg     |   Bin 0 -> 4722 bytes
 .../luci-static/freifunk-generic/mobile.css   |    59 +
 .../freifunk-generic/smallscreen.css          |     3 +
 .../themes/freifunk-generic/ipkg/postinst     |     3 +
 .../view/themes/freifunk-generic/footer.htm   |    31 +
 .../view/themes/freifunk-generic/header.htm   |   226 +
 .../uci-defaults/luci-theme-freifunk-generic  |     4 +
 .../package/network/config/firewall/Makefile  |    64 +
 .../config/firewall/files/firewall.config     |   177 +
 .../config/firewall/files/firewall.hotplug    |    11 +
 .../config/firewall/files/firewall.init       |    61 +
 .../config/firewall/files/firewall.user       |     7 +
 trunk/package/network/config/gre/Makefile     |    65 +
 trunk/package/network/config/gre/files/gre.sh |   237 +
 trunk/package/network/config/ipip/Makefile    |    40 +
 .../package/network/config/ipip/files/ipip.sh |    80 +
 .../network/config/ltq-adsl-app/Makefile      |    84 +
 .../config/ltq-adsl-app/files/dsl_control     |    59 +
 .../patches/010-eglibc_compile_fix.patch      |    23 +
 .../network/config/ltq-vdsl-app/Makefile      |    77 +
 .../config/ltq-vdsl-app/files/dsl_control     |   197 +
 .../ltq-vdsl-app/patches/100-compat.patch     |    26 +
 trunk/package/network/config/netifd/Makefile  |    46 +
 .../files/etc/hotplug.d/iface/00-netstate     |     7 +
 .../config/netifd/files/etc/init.d/network    |   152 +
 .../netifd/files/lib/netifd/dhcp.script       |    98 +
 .../netifd/files/lib/netifd/proto/dhcp.sh     |    72 +
 .../config/netifd/files/lib/network/config.sh |    79 +
 .../config/netifd/files/sbin/devstatus        |    12 +
 .../network/config/netifd/files/sbin/ifdown   |    79 +
 .../network/config/netifd/files/sbin/ifstatus |    13 +
 .../network/config/netifd/files/sbin/ifup     |    79 +
 .../files/usr/share/udhcpc/default.script     |    57 +
 .../patches/001-musl_af_inet_include.patch    |    11 +
 .../network/config/qos-scripts/Makefile       |    52 +
 .../config/qos-scripts/files/etc/config/qos   |    68 +
 .../files/etc/hotplug.d/iface/10-qos          |     2 +
 .../config/qos-scripts/files/etc/init.d/qos   |    28 +
 .../qos-scripts/files/usr/bin/qos-start       |     4 +
 .../config/qos-scripts/files/usr/bin/qos-stat |    67 +
 .../config/qos-scripts/files/usr/bin/qos-stop |     6 +
 .../qos-scripts/files/usr/lib/qos/generate.sh |   504 +
 .../qos-scripts/files/usr/lib/qos/tcrules.awk |   106 +
 .../package/network/config/soloscli/Makefile  |    45 +
 .../files/etc/hotplug.d/atm/15-solos-init     |    26 +
 .../soloscli/files/etc/uci-default/solos      |    15 +
 .../config/soloscli/files/solos-log-stats     |    19 +
 .../soloscli/patches/001-no-driver.patch      |    11 +
 .../config/soloscli/patches/002-cflags.patch  |    12 +
 .../package/network/config/swconfig/Makefile  |    51 +
 .../network/config/swconfig/files/switch.sh   |    15 +
 .../network/config/swconfig/src/Makefile      |    12 +
 .../package/network/config/swconfig/src/cli.c |   354 +
 .../network/config/swconfig/src/swlib.c       |   780 +
 .../network/config/swconfig/src/swlib.h       |   252 +
 .../package/network/config/swconfig/src/uci.c |   246 +
 trunk/package/network/ipv6/6in4/Makefile      |    43 +
 trunk/package/network/ipv6/6in4/files/6in4.sh |   134 +
 trunk/package/network/ipv6/6rd/Makefile       |    54 +
 trunk/package/network/ipv6/6rd/files/6rd.sh   |   108 +
 trunk/package/network/ipv6/6rd/src/6rdcalc.c  |   126 +
 trunk/package/network/ipv6/6rd/src/Makefile   |     7 +
 trunk/package/network/ipv6/6to4/Makefile      |    43 +
 trunk/package/network/ipv6/6to4/files/6to4.sh |   104 +
 trunk/package/network/ipv6/ds-lite/Makefile   |    43 +
 .../network/ipv6/ds-lite/files/dslite.sh      |    90 +
 trunk/package/network/ipv6/map/Makefile       |    45 +
 trunk/package/network/ipv6/map/files/map.sh   |   215 +
 .../network/ipv6/map/src/CMakeLists.txt       |    26 +
 trunk/package/network/ipv6/map/src/mapcalc.c  |   370 +
 trunk/package/network/ipv6/odhcp6c/Makefile   |    60 +
 .../network/ipv6/odhcp6c/files/dhcpv6.script  |   172 +
 .../network/ipv6/odhcp6c/files/dhcpv6.sh      |    97 +
 trunk/package/network/ipv6/thc-ipv6/Makefile  |    60 +
 .../ipv6/thc-ipv6/patches/100-no-ssl.patch    |    11 +
 .../package/network/services/authsae/Makefile |    47 +
 .../authsae/files/lib/wifi/authsae.sh         |    57 +
 .../authsae/patches/100-musl_fix.patch        |    10 +
 trunk/package/network/services/cjdns/Makefile |   104 +
 .../services/cjdns/files/cjdns.defaults       |    37 +
 .../network/services/cjdns/files/cjdns.init   |    32 +
 .../network/services/cjdns/files/cjdrouteconf |    49 +
 .../services/cjdns/lua/cjdns/reload.lua       |    80 +
 .../network/services/cjdns/lua/cjdns/uci.lua  |   266 +
 .../services/cjdns/patches/001-libuv.patch    |    18 +
 .../package/network/services/dnsmasq/Makefile |   123 +
 .../network/services/dnsmasq/files/dhcp.conf  |    31 +
 .../services/dnsmasq/files/dnsmasq.conf       |    37 +
 .../services/dnsmasq/files/dnsmasq.hotplug    |     5 +
 .../services/dnsmasq/files/dnsmasq.init       |   612 +
 .../100-fix-dhcp-no-address-warning.patch     |    47 +
 .../110-ipset-remove-old-kernel-support.patch |   110 +
 .../network/services/dropbear/Config.in       |    27 +
 .../network/services/dropbear/Makefile        |   130 +
 .../services/dropbear/files/dropbear.config   |     5 +
 .../services/dropbear/files/dropbear.init     |   180 +
 .../001-dont_send_SSH_MSG_IMPLEMENTED.patch   |    58 +
 .../002-match_keepalive_to_OpenSSH.patch      |   333 +
 .../dropbear/patches/100-pubkey_path.patch    |    91 +
 .../dropbear/patches/110-change_user.patch    |    18 +
 .../patches/120-openwrt_options.patch         |    58 +
 .../patches/130-ssh_ignore_o_and_x_args.patch |    21 +
 .../dropbear/patches/140-disable_assert.patch |    15 +
 .../patches/150-dbconvert_standalone.patch    |    14 +
 .../patches/500-set-default-path.patch        |    11 +
 trunk/package/network/services/ead/Makefile   |    57 +
 .../package/network/services/ead/src/Makefile |    33 +
 trunk/package/network/services/ead/src/aes.c  |  1061 +
 .../network/services/ead/src/ead-client.c     |   433 +
 .../network/services/ead/src/ead-crypt.c      |   179 +
 .../network/services/ead/src/ead-crypt.h      |    21 +
 .../network/services/ead/src/ead-pcap.h       |    71 +
 trunk/package/network/services/ead/src/ead.c  |   991 +
 trunk/package/network/services/ead/src/ead.h  |   139 +
 .../package/network/services/ead/src/filter.c |    25 +
 .../network/services/ead/src/libbridge.h      |    85 +
 .../network/services/ead/src/libbridge_init.c |   208 +
 .../services/ead/src/libbridge_private.h      |    35 +
 trunk/package/network/services/ead/src/list.h |   602 +
 trunk/package/network/services/ead/src/passwd |     3 +
 trunk/package/network/services/ead/src/pfc.c  |    54 +
 .../network/services/ead/src/pw_encrypt_md5.c |   646 +
 trunk/package/network/services/ead/src/sha1.c |   104 +
 .../services/ead/src/tinysrp/Makefile.am      |    28 +
 .../services/ead/src/tinysrp/Makefile.in      |   477 +
 .../network/services/ead/src/tinysrp/Notes    |   110 +
 .../services/ead/src/tinysrp/acconfig.h       |     9 +
 .../services/ead/src/tinysrp/acinclude.m4     |    27 +
 .../services/ead/src/tinysrp/aclocal.m4       |   157 +
 .../network/services/ead/src/tinysrp/bn.h     |   471 +
 .../network/services/ead/src/tinysrp/bn_add.c |   305 +
 .../network/services/ead/src/tinysrp/bn_asm.c |   382 +
 .../network/services/ead/src/tinysrp/bn_ctx.c |   142 +
 .../network/services/ead/src/tinysrp/bn_div.c |   378 +
 .../network/services/ead/src/tinysrp/bn_exp.c |   395 +
 .../network/services/ead/src/tinysrp/bn_lcl.h |   419 +
 .../network/services/ead/src/tinysrp/bn_lib.c |   576 +
 .../network/services/ead/src/tinysrp/bn_mul.c |   172 +
 .../services/ead/src/tinysrp/bn_prime.h       |   325 +
 .../services/ead/src/tinysrp/bn_shift.c       |   139 +
 .../network/services/ead/src/tinysrp/bn_sqr.c |   160 +
 .../services/ead/src/tinysrp/bn_word.c        |   130 +
 .../services/ead/src/tinysrp/clitest.c        |   110 +
 .../services/ead/src/tinysrp/config.h.in      |    79 +
 .../services/ead/src/tinysrp/configure        |  2421 +
 .../services/ead/src/tinysrp/configure.in     |    52 +
 .../services/ead/src/tinysrp/install-sh       |   250 +
 .../network/services/ead/src/tinysrp/missing  |   134 +
 .../services/ead/src/tinysrp/mkinstalldirs    |    39 +
 .../services/ead/src/tinysrp/srvtest.c        |   111 +
 .../services/ead/src/tinysrp/stamp-h.in       |     1 +
 .../services/ead/src/tinysrp/t_client.c       |   285 +
 .../services/ead/src/tinysrp/t_client.h       |   148 +
 .../network/services/ead/src/tinysrp/t_conf.c |  1080 +
 .../network/services/ead/src/tinysrp/t_conv.c |   226 +
 .../services/ead/src/tinysrp/t_defines.h      |   169 +
 .../services/ead/src/tinysrp/t_getconf.c      |   118 +
 .../services/ead/src/tinysrp/t_getpass.c      |   191 +
 .../network/services/ead/src/tinysrp/t_math.c |   177 +
 .../network/services/ead/src/tinysrp/t_misc.c |   338 +
 .../network/services/ead/src/tinysrp/t_pw.c   |   262 +
 .../network/services/ead/src/tinysrp/t_pwd.h  |   310 +
 .../network/services/ead/src/tinysrp/t_read.c |    81 +
 .../network/services/ead/src/tinysrp/t_read.h |    55 +
 .../services/ead/src/tinysrp/t_server.c       |   259 +
 .../services/ead/src/tinysrp/t_server.h       |   138 +
 .../network/services/ead/src/tinysrp/t_sha.c  |   166 +
 .../network/services/ead/src/tinysrp/t_sha.h  |    26 +
 .../services/ead/src/tinysrp/t_truerand.c     |   151 +
 .../network/services/ead/src/tinysrp/tconf.c  |   157 +
 .../services/ead/src/tinysrp/tinysrp.c        |   235 +
 .../services/ead/src/tinysrp/tinysrp.h        |    18 +
 .../network/services/ead/src/tinysrp/tpasswd  |     2 +
 .../services/ead/src/tinysrp/tphrase.c        |   354 +
 .../network/services/hostapd/Config.in        |    47 +
 .../package/network/services/hostapd/Makefile |   414 +
 .../hostapd/files/hostapd-full.config         |   172 +
 .../hostapd/files/hostapd-mini.config         |   165 +
 .../network/services/hostapd/files/hostapd.sh |   359 +
 .../services/hostapd/files/multicall.c        |    28 +
 .../network/services/hostapd/files/netifd.sh  |   624 +
 .../hostapd/files/wpa_supplicant-full.config  |   409 +
 .../hostapd/files/wpa_supplicant-mini.config  |   407 +
 .../hostapd/files/wpa_supplicant-p2p.config   |   412 +
 .../services/hostapd/files/wpa_supplicant.sh  |   194 +
 .../services/hostapd/files/wps-hotplug.sh     |     8 +
 .../services/hostapd/madwifi/include/compat.h |   209 +
 .../hostapd/madwifi/net80211/_ieee80211.h     |   325 +
 .../hostapd/madwifi/net80211/ieee80211.h      |   997 +
 .../madwifi/net80211/ieee80211_crypto.h       |   207 +
 .../madwifi/net80211/ieee80211_ioctl.h        |   715 +
 .../patches/100-madwifi_key_fixes.patch       |    34 +
 .../hostapd/patches/110-bool_fix.patch        |    14 +
 .../hostapd/patches/120-daemonize_fix.patch   |    97 +
 .../hostapd/patches/130-no_eapol_fix.patch    |    14 +
 .../hostapd/patches/200-multicall.patch       |   276 +
 .../services/hostapd/patches/300-noscan.patch |    54 +
 .../patches/310-rescan_immediately.patch      |    11 +
 .../hostapd/patches/320-optional_rfkill.patch |    61 +
 .../patches/330-nl80211_fix_set_freq.patch    |    11 +
 .../patches/340-reload_freq_change.patch      |    43 +
 .../patches/350-nl80211_del_beacon_bss.patch  |    50 +
 .../patches/360-ctrl_iface_reload.patch       |    98 +
 .../hostapd/patches/370-ap_sta_support.patch  |   237 +
 .../patches/380-disable_ctrl_iface_mib.patch  |   183 +
 .../patches/390-wpa_ie_cap_workaround.patch   |    56 +
 .../400-wps_single_auth_enc_type.patch        |    25 +
 .../patches/410-limit_debug_messages.patch    |   214 +
 .../patches/420-indicate-features.patch       |    82 +
 .../patches/430-hostapd_cli_ifdef.patch       |    50 +
 .../hostapd/patches/431-wpa_cli_ifdef.patch   |    13 +
 .../patches/440-max_num_sta_probe.patch       |    13 +
 .../hostapd/patches/450-scan_wait.patch       |    66 +
 ...dd-new-config-params-to-be-used-with.patch |   191 +
 ...-use-new-parameters-during-ibss-join.patch |    59 +
 .../462-wpa_s-support-htmode-param.patch      |   156 +
 .../hostapd/patches/600-ubus_support.patch    |   729 +
 .../network/services/igmpproxy/Makefile       |    59 +
 .../services/igmpproxy/files/igmpproxy.config |    11 +
 .../services/igmpproxy/files/igmpproxy.init   |   134 +
 ...s-with-IP-Router-Alert-option-RFC-21.patch |    79 +
 ...nterface-state-to-disabled-wrt-29458.patch |    43 +
 ...ports-for-downstream-interfaces-wrt-.patch |   164 +
 ...ports-forwarding-to-upstream-interfa.patch |    62 +
 .../patches/010-missing_include.patch         |    10 +
 ...monotic-clock-instead-of-time-of-day.patch |   120 +
 .../patches/200-allow_wildcard_addr.patch     |    24 +
 .../network/services/ipset-dns/Makefile       |    60 +
 .../services/ipset-dns/files/ipset-dns.config |    16 +
 .../services/ipset-dns/files/ipset-dns.init   |    57 +
 .../patches/100-simultaneous-ipv4-ipv6.patch  |    57 +
 .../package/network/services/lldpd/Config.in  |    28 +
 trunk/package/network/services/lldpd/Makefile |    92 +
 .../network/services/lldpd/files/lldpd.config |    15 +
 .../network/services/lldpd/files/lldpd.init   |    69 +
 .../patches/002-no-stack-protector.patch      |    11 +
 trunk/package/network/services/mdns/Makefile  |    42 +
 .../network/services/mdns/files/mdns.config   |     2 +
 .../network/services/mdns/files/mdns.init     |    52 +
 .../package/network/services/odhcpd/Makefile  |    75 +
 .../services/odhcpd/files/odhcpd-update       |     5 +
 .../services/odhcpd/files/odhcpd.defaults     |    13 +
 .../network/services/odhcpd/files/odhcpd.init |    18 +
 .../services/openvpn-easy-rsa/Makefile        |    61 +
 .../openvpn-easy-rsa/files/easy-rsa.index     |     0
 .../openvpn-easy-rsa/files/easy-rsa.serial    |     1 +
 .../patches/100-run-ootb.patch                |   152 +
 .../network/services/openvpn/Config-nossl.in  |    54 +
 .../services/openvpn/Config-openssl.in        |    66 +
 .../services/openvpn/Config-polarssl.in       |    66 +
 .../package/network/services/openvpn/Makefile |   125 +
 .../services/openvpn/files/openvpn.config     |   398 +
 .../services/openvpn/files/openvpn.init       |   125 +
 .../services/openvpn/files/openvpn.upgrade    |     1 +
 .../openvpn/patches/100-polarssl_compat.h     |   257 +
 .../openvpn/patches/110-musl_compat.patch     |    13 +
 trunk/package/network/services/ppp/Makefile   |   265 +
 .../services/ppp/files/etc/ppp/chap-secrets   |     1 +
 .../network/services/ppp/files/etc/ppp/filter |    23 +
 .../services/ppp/files/etc/ppp/options        |    10 +
 .../services/ppp/files/etc/ppp/options.pptp   |     7 +
 .../services/ppp/files/etc/ppp/radius.conf    |     8 +
 .../ppp/files/etc/ppp/radius/dictionary       |   253 +
 .../ppp/files/etc/ppp/radius/dictionary.asnet |     3 +
 .../files/etc/ppp/radius/dictionary.microsoft |    80 +
 .../services/ppp/files/etc/ppp/radius/servers |     2 +
 .../services/ppp/files/lib/netifd/ppp-down    |    13 +
 .../services/ppp/files/lib/netifd/ppp-up      |    30 +
 .../package/network/services/ppp/files/ppp.sh |   230 +
 .../010-use_target_for_configure.patch        |    24 +
 .../ppp/patches/100-debian_ip-ip_option.patch |    96 +
 .../patches/101-debian_close_dev_ppp.patch    |    28 +
 .../patches/103-debian_fix_link_pidfile.patch |    23 +
 .../ppp/patches/105-debian_demand.patch       |   172 +
 .../patches/106-debian_stripMSdomain.patch    |    47 +
 .../patches/107-debian_pppoatm_wildcard.patch |    25 +
 .../ppp/patches/110-debian_defaultroute.patch |   313 +
 .../120-debian_ipv6_updown_option.patch       |    95 +
 .../121-debian_adaptive_lcp_echo.patch        |    56 +
 .../services/ppp/patches/130-no_cdefs_h.patch |    11 +
 .../patches/131-missing_prototype_macro.patch |    23 +
 .../ppp/patches/132-fix_linux_includes.patch  |    40 +
 .../ppp/patches/133-fix_sha1_include.patch    |    11 +
 .../ppp/patches/140-pppoe_compile_fix.patch   |   101 +
 .../services/ppp/patches/200-makefile.patch   |    49 +
 .../ppp/patches/201-mppe_mppc_1.1.patch       |  1495 +
 .../services/ppp/patches/202-no_strip.patch   |    88 +
 .../services/ppp/patches/203-opt_flags.patch  |    32 +
 .../ppp/patches/204-radius_config.patch       |    72 +
 .../patches/205-no_exponential_timeout.patch  |    29 +
 .../patches/206-compensate_time_change.patch  |    94 +
 .../ppp/patches/207-lcp_mtu_max.patch         |    25 +
 .../ppp/patches/208-fix_status_code.patch     |    24 +
 .../300-filter-pcap-includes-lib.patch        |    20 +
 .../ppp/patches/310-precompile_filter.patch   |   196 +
 .../ppp/patches/320-custom_iface_names.patch  |   135 +
 ...multilink_support_custom_iface_names.patch |   146 +
 .../330-retain_foreign_default_routes.patch   |    22 +
 .../340-populate_default_gateway.patch        |    34 +
 .../patches/400-simplify_kernel_checks.patch  |   154 +
 .../ppp/patches/401-no_record_file.patch      |    39 +
 .../services/ppp/patches/403-no_wtmp.patch    |    25 +
 .../404-remove_obsolete_protocol_names.patch  |   151 +
 .../ppp/patches/405-no_multilink_option.patch |    28 +
 .../ppp/patches/500-add-pptp-plugin.patch     |  3065 +
 .../ppp/patches/510-pptp_compile_fix.patch    |    11 +
 .../services/ppp/patches/520-uniq.patch       |   169 +
 .../package/network/services/ppp/utils/pfc.c  |    51 +
 .../package/network/services/relayd/Makefile  |    45 +
 .../services/relayd/files/relay.hotplug       |     2 +
 .../network/services/relayd/files/relay.init  |   112 +
 .../package/network/services/samba36/Makefile |   151 +
 .../services/samba36/files/samba.config       |     6 +
 .../network/services/samba36/files/samba.init |   100 +
 .../services/samba36/files/smb.conf.template  |    34 +
 .../samba36/patches/100-configure_fixes.patch |    14 +
 .../samba36/patches/110-multicall.patch       |   119 +
 .../samba36/patches/111-owrt_smbpasswd.patch  |   281 +
 .../patches/120-add_missing_ifdef.patch       |    26 +
 .../patches/200-remove_printer_support.patch  |   346 +
 .../patches/210-remove_ad_support.patch       |    88 +
 .../samba36/patches/220-remove_services.patch |    98 +
 .../patches/230-remove_winreg_support.patch   |   146 +
 .../samba36/patches/240-remove_dfs_api.patch  |    71 +
 .../patches/250-remove_domain_logon.patch     |   185 +
 .../samba36/patches/260-remove_samr.patch     |   144 +
 .../patches/270-remove_registry_backend.patch |    43 +
 .../samba36/patches/280-strip_srvsvc.patch    |   143 +
 .../samba36/patches/290-remove_lsa.patch      |    73 +
 .../patches/300-assert_debug_level.patch      |    11 +
 .../patches/310-remove_error_strings.patch    |   253 +
 .../patches/320-debug_level_checks.patch      |    22 +
 .../patches/330-librpc_default_print.patch    |  8854 +++
 .../package/network/services/uhttpd/Makefile  |   142 +
 .../services/uhttpd/files/ubus.default        |     6 +
 .../services/uhttpd/files/uhttpd.config       |   119 +
 .../network/services/uhttpd/files/uhttpd.init |   143 +
 .../package/network/utils/arptables/Makefile  |    43 +
 .../patches/100-always_optimize.patch         |    19 +
 trunk/package/network/utils/comgt/Makefile    |   106 +
 .../package/network/utils/comgt/files/3g.chat |    12 +
 trunk/package/network/utils/comgt/files/3g.sh |   109 +
 .../package/network/utils/comgt/files/3g.usb  |    33 +
 .../network/utils/comgt/files/data/0421:03a7  |     6 +
 .../network/utils/comgt/files/data/0421:060d  |     6 +
 .../network/utils/comgt/files/data/0421:060e  |     6 +
 .../network/utils/comgt/files/data/0421:0612  |     6 +
 .../network/utils/comgt/files/data/0421:0619  |     6 +
 .../network/utils/comgt/files/data/0421:061e  |     6 +
 .../network/utils/comgt/files/data/0421:0623  |     6 +
 .../network/utils/comgt/files/data/0421:0629  |     6 +
 .../network/utils/comgt/files/data/0421:062d  |     6 +
 .../network/utils/comgt/files/data/0421:062f  |     6 +
 .../network/utils/comgt/files/data/0421:0638  |     6 +
 .../network/utils/comgt/files/data/05c6:0016  |     6 +
 .../network/utils/comgt/files/data/05c6:0023  |     5 +
 .../network/utils/comgt/files/data/05c6:00a0  |     6 +
 .../network/utils/comgt/files/data/05c6:6000  |     5 +
 .../network/utils/comgt/files/data/05c6:9000  |     5 +
 .../network/utils/comgt/files/data/07d1:3e01  |     5 +
 .../network/utils/comgt/files/data/07d1:3e02  |     5 +
 .../network/utils/comgt/files/data/07d1:7e11  |     6 +
 .../network/utils/comgt/files/data/0af0:4005  |     4 +
 .../network/utils/comgt/files/data/0af0:6901  |     5 +
 .../network/utils/comgt/files/data/0af0:7201  |     5 +
 .../network/utils/comgt/files/data/0af0:8120  |     4 +
 .../network/utils/comgt/files/data/0af0:9200  |     5 +
 .../network/utils/comgt/files/data/0b3c:c000  |     4 +
 .../network/utils/comgt/files/data/0b3c:c001  |     4 +
 .../network/utils/comgt/files/data/0b3c:c002  |     4 +
 .../network/utils/comgt/files/data/0b3c:c003  |     5 +
 .../network/utils/comgt/files/data/0b3c:c004  |     4 +
 .../network/utils/comgt/files/data/0b3c:c005  |     4 +
 .../network/utils/comgt/files/data/0b3c:c00a  |     4 +
 .../network/utils/comgt/files/data/0b3c:c00b  |     4 +
 .../network/utils/comgt/files/data/0bdb:1900  |     6 +
 .../network/utils/comgt/files/data/0bdb:1902  |     6 +
 .../network/utils/comgt/files/data/0bdb:190a  |     6 +
 .../network/utils/comgt/files/data/0bdb:190d  |     6 +
 .../network/utils/comgt/files/data/0bdb:1910  |     6 +
 .../network/utils/comgt/files/data/0c88:17da  |     5 +
 .../network/utils/comgt/files/data/0c88:180a  |     5 +
 .../network/utils/comgt/files/data/0f3d:68a2  |     4 +
 .../network/utils/comgt/files/data/0f3d:68aa  |     5 +
 .../network/utils/comgt/files/data/1004:6124  |     6 +
 .../network/utils/comgt/files/data/1004:6141  |     6 +
 .../network/utils/comgt/files/data/1004:6157  |     6 +
 .../network/utils/comgt/files/data/1004:618f  |     5 +
 .../network/utils/comgt/files/data/106c:3711  |     6 +
 .../network/utils/comgt/files/data/106c:3714  |     6 +
 .../network/utils/comgt/files/data/106c:3715  |     6 +
 .../network/utils/comgt/files/data/106c:3716  |     6 +
 .../network/utils/comgt/files/data/106c:3717  |     6 +
 .../network/utils/comgt/files/data/106c:3718  |     4 +
 .../network/utils/comgt/files/data/106c:3721  |     4 +
 .../network/utils/comgt/files/data/1199:0017  |     5 +
 .../network/utils/comgt/files/data/1199:0018  |     5 +
 .../network/utils/comgt/files/data/1199:0019  |     5 +
 .../network/utils/comgt/files/data/1199:0020  |     5 +
 .../network/utils/comgt/files/data/1199:0021  |     5 +
 .../network/utils/comgt/files/data/1199:0022  |     5 +
 .../network/utils/comgt/files/data/1199:0023  |     5 +
 .../network/utils/comgt/files/data/1199:0024  |     5 +
 .../network/utils/comgt/files/data/1199:0025  |     5 +
 .../network/utils/comgt/files/data/1199:0026  |     5 +
 .../network/utils/comgt/files/data/1199:0027  |     5 +
 .../network/utils/comgt/files/data/1199:0028  |     5 +
 .../network/utils/comgt/files/data/1199:0112  |     5 +
 .../network/utils/comgt/files/data/1199:0120  |     5 +
 .../network/utils/comgt/files/data/1199:0218  |     5 +
 .../network/utils/comgt/files/data/1199:0220  |     5 +
 .../network/utils/comgt/files/data/1199:0224  |     5 +
 .../network/utils/comgt/files/data/1199:0301  |     5 +
 .../network/utils/comgt/files/data/1199:6802  |     5 +
 .../network/utils/comgt/files/data/1199:6803  |     5 +
 .../network/utils/comgt/files/data/1199:6804  |     5 +
 .../network/utils/comgt/files/data/1199:6805  |     5 +
 .../network/utils/comgt/files/data/1199:6808  |     5 +
 .../network/utils/comgt/files/data/1199:6809  |     5 +
 .../network/utils/comgt/files/data/1199:6813  |     5 +
 .../network/utils/comgt/files/data/1199:6815  |     5 +
 .../network/utils/comgt/files/data/1199:6816  |     5 +
 .../network/utils/comgt/files/data/1199:6820  |     5 +
 .../network/utils/comgt/files/data/1199:6821  |     5 +
 .../network/utils/comgt/files/data/1199:6822  |     5 +
 .../network/utils/comgt/files/data/1199:6833  |     5 +
 .../network/utils/comgt/files/data/1199:6834  |     5 +
 .../network/utils/comgt/files/data/1199:6835  |     5 +
 .../network/utils/comgt/files/data/1199:6838  |     5 +
 .../network/utils/comgt/files/data/1199:6839  |     5 +
 .../network/utils/comgt/files/data/1199:683a  |     5 +
 .../network/utils/comgt/files/data/1199:683b  |     5 +
 .../network/utils/comgt/files/data/1199:6850  |     5 +
 .../network/utils/comgt/files/data/1199:6851  |     5 +
 .../network/utils/comgt/files/data/1199:6852  |     5 +
 .../network/utils/comgt/files/data/1199:6853  |     5 +
 .../network/utils/comgt/files/data/1199:6855  |     5 +
 .../network/utils/comgt/files/data/1199:6856  |     5 +
 .../network/utils/comgt/files/data/1199:6859  |     5 +
 .../network/utils/comgt/files/data/1199:685a  |     5 +
 .../network/utils/comgt/files/data/1199:6880  |     5 +
 .../network/utils/comgt/files/data/1199:6890  |     5 +
 .../network/utils/comgt/files/data/1199:6891  |     5 +
 .../network/utils/comgt/files/data/1199:6892  |     5 +
 .../network/utils/comgt/files/data/1199:6893  |     5 +
 .../network/utils/comgt/files/data/1199:68a2  |     4 +
 .../network/utils/comgt/files/data/1199:68aa  |     5 +
 .../network/utils/comgt/files/data/12d1:1035  |     5 +
 .../network/utils/comgt/files/data/12d1:1404  |     4 +
 .../network/utils/comgt/files/data/12d1:1406  |     5 +
 .../network/utils/comgt/files/data/12d1:140b  |     5 +
 .../network/utils/comgt/files/data/12d1:140c  |     4 +
 .../network/utils/comgt/files/data/12d1:1412  |     5 +
 .../network/utils/comgt/files/data/12d1:141b  |     5 +
 .../network/utils/comgt/files/data/12d1:1433  |     5 +
 .../network/utils/comgt/files/data/12d1:1436  |     5 +
 .../network/utils/comgt/files/data/12d1:1444  |     5 +
 .../network/utils/comgt/files/data/12d1:144e  |     5 +
 .../network/utils/comgt/files/data/12d1:1464  |     5 +
 .../network/utils/comgt/files/data/12d1:1465  |     5 +
 .../network/utils/comgt/files/data/12d1:1491  |     5 +
 .../network/utils/comgt/files/data/12d1:14a5  |     5 +
 .../network/utils/comgt/files/data/12d1:14a8  |     5 +
 .../network/utils/comgt/files/data/12d1:14ac  |     4 +
 .../network/utils/comgt/files/data/12d1:14ae  |     5 +
 .../network/utils/comgt/files/data/12d1:14c6  |     4 +
 .../network/utils/comgt/files/data/12d1:14c8  |     4 +
 .../network/utils/comgt/files/data/12d1:14c9  |     4 +
 .../network/utils/comgt/files/data/12d1:14ca  |     4 +
 .../network/utils/comgt/files/data/12d1:14cb  |     5 +
 .../network/utils/comgt/files/data/12d1:14cc  |     4 +
 .../network/utils/comgt/files/data/12d1:14cf  |     5 +
 .../network/utils/comgt/files/data/12d1:14d2  |     4 +
 .../network/utils/comgt/files/data/12d1:1506  |     5 +
 .../network/utils/comgt/files/data/12d1:150a  |     4 +
 .../network/utils/comgt/files/data/12d1:150c  |     4 +
 .../network/utils/comgt/files/data/12d1:150f  |     4 +
 .../network/utils/comgt/files/data/12d1:151b  |     4 +
 .../network/utils/comgt/files/data/12d1:151d  |     5 +
 .../network/utils/comgt/files/data/12d1:156c  |     5 +
 .../network/utils/comgt/files/data/12d1:1576  |     4 +
 .../network/utils/comgt/files/data/12d1:1577  |     4 +
 .../network/utils/comgt/files/data/12d1:1578  |     4 +
 .../network/utils/comgt/files/data/12d1:1589  |     4 +
 .../network/utils/comgt/files/data/12d1:1c05  |     5 +
 .../network/utils/comgt/files/data/12d1:1c07  |     5 +
 .../network/utils/comgt/files/data/12d1:1c08  |     5 +
 .../network/utils/comgt/files/data/12d1:1c10  |     5 +
 .../network/utils/comgt/files/data/12d1:1c12  |     5 +
 .../network/utils/comgt/files/data/12d1:1c1e  |     4 +
 .../network/utils/comgt/files/data/12d1:1c1f  |     4 +
 .../network/utils/comgt/files/data/12d1:1c23  |     5 +
 .../network/utils/comgt/files/data/12d1:1f16  |     4 +
 .../network/utils/comgt/files/data/1410:1400  |     5 +
 .../network/utils/comgt/files/data/1410:1410  |     5 +
 .../network/utils/comgt/files/data/1410:1420  |     5 +
 .../network/utils/comgt/files/data/1410:1430  |     5 +
 .../network/utils/comgt/files/data/1410:1450  |     5 +
 .../network/utils/comgt/files/data/1410:2100  |     5 +
 .../network/utils/comgt/files/data/1410:2110  |     5 +
 .../network/utils/comgt/files/data/1410:2120  |     5 +
 .../network/utils/comgt/files/data/1410:2130  |     5 +
 .../network/utils/comgt/files/data/1410:2400  |     5 +
 .../network/utils/comgt/files/data/1410:2410  |     5 +
 .../network/utils/comgt/files/data/1410:2420  |     5 +
 .../network/utils/comgt/files/data/1410:4100  |     5 +
 .../network/utils/comgt/files/data/1410:4400  |     5 +
 .../network/utils/comgt/files/data/1410:6000  |     5 +
 .../network/utils/comgt/files/data/1410:6001  |     5 +
 .../network/utils/comgt/files/data/1410:6002  |     5 +
 .../network/utils/comgt/files/data/1410:6010  |     5 +
 .../network/utils/comgt/files/data/1410:7001  |     5 +
 .../network/utils/comgt/files/data/1410:7003  |     5 +
 .../network/utils/comgt/files/data/1410:7030  |     5 +
 .../network/utils/comgt/files/data/1410:7031  |     6 +
 .../network/utils/comgt/files/data/1410:7041  |     5 +
 .../network/utils/comgt/files/data/1410:7042  |     5 +
 .../network/utils/comgt/files/data/1410:9011  |     4 +
 .../network/utils/comgt/files/data/1410:b001  |     4 +
 .../network/utils/comgt/files/data/1529:3100  |     6 +
 .../network/utils/comgt/files/data/16d5:6202  |     5 +
 .../network/utils/comgt/files/data/16d5:6501  |     5 +
 .../network/utils/comgt/files/data/16d5:6502  |     5 +
 .../network/utils/comgt/files/data/16d5:6603  |     6 +
 .../network/utils/comgt/files/data/16d5:900d  |     6 +
 .../network/utils/comgt/files/data/16d8:5141  |     6 +
 .../network/utils/comgt/files/data/16d8:5533  |     6 +
 .../network/utils/comgt/files/data/16d8:5543  |     6 +
 .../network/utils/comgt/files/data/16d8:5553  |     6 +
 .../network/utils/comgt/files/data/16d8:6002  |     5 +
 .../network/utils/comgt/files/data/16d8:6006  |     5 +
 .../network/utils/comgt/files/data/16d8:6007  |     4 +
 .../network/utils/comgt/files/data/16d8:6008  |     4 +
 .../network/utils/comgt/files/data/16d8:6522  |     6 +
 .../network/utils/comgt/files/data/16d8:6523  |     6 +
 .../network/utils/comgt/files/data/16d8:6532  |     6 +
 .../network/utils/comgt/files/data/16d8:6533  |     6 +
 .../network/utils/comgt/files/data/16d8:6543  |     6 +
 .../network/utils/comgt/files/data/16d8:680a  |     6 +
 .../network/utils/comgt/files/data/19d2:0001  |     5 +
 .../network/utils/comgt/files/data/19d2:0002  |     4 +
 .../network/utils/comgt/files/data/19d2:0015  |     5 +
 .../network/utils/comgt/files/data/19d2:0016  |     5 +
 .../network/utils/comgt/files/data/19d2:0017  |     4 +
 .../network/utils/comgt/files/data/19d2:0018  |     5 +
 .../network/utils/comgt/files/data/19d2:0019  |     4 +
 .../network/utils/comgt/files/data/19d2:0022  |     5 +
 .../network/utils/comgt/files/data/19d2:0024  |     5 +
 .../network/utils/comgt/files/data/19d2:0025  |     4 +
 .../network/utils/comgt/files/data/19d2:0031  |     4 +
 .../network/utils/comgt/files/data/19d2:0033  |     5 +
 .../network/utils/comgt/files/data/19d2:0037  |     5 +
 .../network/utils/comgt/files/data/19d2:0039  |     5 +
 .../network/utils/comgt/files/data/19d2:0042  |     4 +
 .../network/utils/comgt/files/data/19d2:0052  |     4 +
 .../network/utils/comgt/files/data/19d2:0055  |     4 +
 .../network/utils/comgt/files/data/19d2:0057  |     5 +
 .../network/utils/comgt/files/data/19d2:0063  |     4 +
 .../network/utils/comgt/files/data/19d2:0064  |     5 +
 .../network/utils/comgt/files/data/19d2:0066  |     5 +
 .../network/utils/comgt/files/data/19d2:0073  |     5 +
 .../network/utils/comgt/files/data/19d2:0079  |     5 +
 .../network/utils/comgt/files/data/19d2:0082  |     5 +
 .../network/utils/comgt/files/data/19d2:0086  |     5 +
 .../network/utils/comgt/files/data/19d2:0091  |     5 +
 .../network/utils/comgt/files/data/19d2:0094  |     5 +
 .../network/utils/comgt/files/data/19d2:0104  |     4 +
 .../network/utils/comgt/files/data/19d2:0108  |     5 +
 .../network/utils/comgt/files/data/19d2:0116  |     6 +
 .../network/utils/comgt/files/data/19d2:0117  |     5 +
 .../network/utils/comgt/files/data/19d2:0121  |     4 +
 .../network/utils/comgt/files/data/19d2:0124  |     4 +
 .../network/utils/comgt/files/data/19d2:0128  |     5 +
 .../network/utils/comgt/files/data/19d2:0142  |     6 +
 .../network/utils/comgt/files/data/19d2:0143  |     6 +
 .../network/utils/comgt/files/data/19d2:0152  |     5 +
 .../network/utils/comgt/files/data/19d2:0157  |     4 +
 .../network/utils/comgt/files/data/19d2:0167  |     4 +
 .../network/utils/comgt/files/data/19d2:0170  |     6 +
 .../network/utils/comgt/files/data/19d2:0199  |     4 +
 .../network/utils/comgt/files/data/19d2:0257  |     4 +
 .../network/utils/comgt/files/data/19d2:0265  |     4 +
 .../network/utils/comgt/files/data/19d2:0284  |     4 +
 .../network/utils/comgt/files/data/19d2:0326  |     4 +
 .../network/utils/comgt/files/data/19d2:1003  |     6 +
 .../network/utils/comgt/files/data/19d2:1008  |     4 +
 .../network/utils/comgt/files/data/19d2:1010  |     4 +
 .../network/utils/comgt/files/data/19d2:1015  |     6 +
 .../network/utils/comgt/files/data/19d2:1018  |     4 +
 .../network/utils/comgt/files/data/19d2:1172  |     6 +
 .../network/utils/comgt/files/data/19d2:1173  |     6 +
 .../network/utils/comgt/files/data/19d2:1176  |     4 +
 .../network/utils/comgt/files/data/19d2:1177  |     6 +
 .../network/utils/comgt/files/data/19d2:1181  |     6 +
 .../network/utils/comgt/files/data/19d2:1203  |     6 +
 .../network/utils/comgt/files/data/19d2:1208  |     6 +
 .../network/utils/comgt/files/data/19d2:1211  |     6 +
 .../network/utils/comgt/files/data/19d2:1212  |     6 +
 .../network/utils/comgt/files/data/19d2:1217  |     6 +
 .../network/utils/comgt/files/data/19d2:1218  |     6 +
 .../network/utils/comgt/files/data/19d2:1220  |     6 +
 .../network/utils/comgt/files/data/19d2:1222  |     6 +
 .../network/utils/comgt/files/data/19d2:1245  |     4 +
 .../network/utils/comgt/files/data/19d2:1252  |     4 +
 .../network/utils/comgt/files/data/19d2:1254  |     4 +
 .../network/utils/comgt/files/data/19d2:1256  |     4 +
 .../network/utils/comgt/files/data/19d2:1270  |     4 +
 .../network/utils/comgt/files/data/19d2:1401  |     4 +
 .../network/utils/comgt/files/data/19d2:1402  |     4 +
 .../network/utils/comgt/files/data/19d2:1426  |     4 +
 .../network/utils/comgt/files/data/19d2:1512  |     6 +
 .../network/utils/comgt/files/data/19d2:1515  |     6 +
 .../network/utils/comgt/files/data/19d2:1518  |     6 +
 .../network/utils/comgt/files/data/19d2:1519  |     6 +
 .../network/utils/comgt/files/data/19d2:1522  |     6 +
 .../network/utils/comgt/files/data/19d2:1525  |     6 +
 .../network/utils/comgt/files/data/19d2:1527  |     6 +
 .../network/utils/comgt/files/data/19d2:1537  |     6 +
 .../network/utils/comgt/files/data/19d2:1538  |     6 +
 .../network/utils/comgt/files/data/19d2:1544  |     6 +
 .../network/utils/comgt/files/data/19d2:2002  |     4 +
 .../network/utils/comgt/files/data/19d2:2003  |     5 +
 .../network/utils/comgt/files/data/19d2:ffdd  |     5 +
 .../network/utils/comgt/files/data/19d2:ffe4  |     6 +
 .../network/utils/comgt/files/data/19d2:ffe9  |     5 +
 .../network/utils/comgt/files/data/19d2:fff1  |     5 +
 .../network/utils/comgt/files/data/19d2:fffb  |     5 +
 .../network/utils/comgt/files/data/19d2:fffc  |     5 +
 .../network/utils/comgt/files/data/19d2:fffd  |     5 +
 .../network/utils/comgt/files/data/19d2:fffe  |     5 +
 .../network/utils/comgt/files/data/19d2:ffff  |     5 +
 .../network/utils/comgt/files/data/1a8d:1002  |     5 +
 .../network/utils/comgt/files/data/1a8d:1003  |     5 +
 .../network/utils/comgt/files/data/1a8d:1007  |     5 +
 .../network/utils/comgt/files/data/1a8d:1009  |     5 +
 .../network/utils/comgt/files/data/1a8d:100c  |     5 +
 .../network/utils/comgt/files/data/1a8d:100d  |     5 +
 .../network/utils/comgt/files/data/1a8d:2006  |     6 +
 .../network/utils/comgt/files/data/1bbb:0000  |     5 +
 .../network/utils/comgt/files/data/1bbb:0012  |     6 +
 .../network/utils/comgt/files/data/1bbb:0017  |     5 +
 .../network/utils/comgt/files/data/1bbb:0052  |     5 +
 .../network/utils/comgt/files/data/1bbb:00b7  |     5 +
 .../network/utils/comgt/files/data/1bbb:00ca  |     6 +
 .../network/utils/comgt/files/data/1bbb:011e  |     4 +
 .../network/utils/comgt/files/data/1bbb:0203  |     4 +
 .../network/utils/comgt/files/data/1c9e:6060  |     6 +
 .../network/utils/comgt/files/data/1c9e:6061  |     6 +
 .../network/utils/comgt/files/data/1c9e:9000  |     6 +
 .../network/utils/comgt/files/data/1c9e:9603  |     5 +
 .../network/utils/comgt/files/data/1c9e:9605  |     5 +
 .../network/utils/comgt/files/data/1c9e:9607  |     5 +
 .../network/utils/comgt/files/data/1c9e:9801  |     6 +
 .../network/utils/comgt/files/data/1c9e:9900  |     6 +
 .../network/utils/comgt/files/data/1e0e:9000  |     5 +
 .../network/utils/comgt/files/data/1e0e:9100  |     5 +
 .../network/utils/comgt/files/data/1e0e:9200  |     5 +
 .../network/utils/comgt/files/data/1e0e:ce16  |     5 +
 .../network/utils/comgt/files/data/1e0e:cefe  |     6 +
 .../network/utils/comgt/files/data/2001:7d00  |     6 +
 .../network/utils/comgt/files/data/2001:7d01  |     5 +
 .../network/utils/comgt/files/data/2001:7d02  |     5 +
 .../network/utils/comgt/files/data/2001:7d03  |     5 +
 .../network/utils/comgt/files/data/211f:6801  |     5 +
 .../network/utils/comgt/files/data/2357:0201  |     4 +
 .../network/utils/comgt/files/data/2357:0202  |     4 +
 .../network/utils/comgt/files/data/2357:0203  |     4 +
 .../network/utils/comgt/files/data/2357:9000  |     4 +
 .../network/utils/comgt/files/data/413c:8114  |     5 +
 .../network/utils/comgt/files/data/413c:8115  |     5 +
 .../network/utils/comgt/files/data/413c:8116  |     5 +
 .../network/utils/comgt/files/data/413c:8117  |     5 +
 .../network/utils/comgt/files/data/413c:8118  |     5 +
 .../network/utils/comgt/files/data/413c:8128  |     5 +
 .../network/utils/comgt/files/data/413c:8129  |     5 +
 .../network/utils/comgt/files/data/413c:8133  |     5 +
 .../network/utils/comgt/files/data/413c:8134  |     5 +
 .../network/utils/comgt/files/data/413c:8135  |     5 +
 .../network/utils/comgt/files/data/413c:8136  |     5 +
 .../network/utils/comgt/files/data/413c:8137  |     5 +
 .../network/utils/comgt/files/data/413c:8138  |     5 +
 .../network/utils/comgt/files/data/413c:8147  |     6 +
 .../network/utils/comgt/files/data/413c:8180  |     5 +
 .../network/utils/comgt/files/data/413c:8181  |     5 +
 .../network/utils/comgt/files/data/413c:8182  |     5 +
 .../network/utils/comgt/files/data/413c:8186  |     4 +
 .../network/utils/comgt/files/data/413c:8194  |     4 +
 .../network/utils/comgt/files/data/413c:8195  |     4 +
 .../network/utils/comgt/files/data/413c:8196  |     4 +
 .../network/utils/comgt/files/data/413c:819b  |     5 +
 .../utils/comgt/files/directip-stop.gcom      |    16 +
 .../network/utils/comgt/files/directip.gcom   |    55 +
 .../network/utils/comgt/files/directip.sh     |   110 +
 .../network/utils/comgt/files/evdo.chat       |    17 +
 .../utils/comgt/files/getcardinfo.gcom        |    14 +
 .../network/utils/comgt/files/getcarrier.gcom |    20 +
 .../network/utils/comgt/files/getcnum.gcom    |    20 +
 .../network/utils/comgt/files/getimsi.gcom    |    17 +
 .../utils/comgt/files/getstrength.gcom        |    14 +
 .../network/utils/comgt/files/ncm.json        |    49 +
 .../package/network/utils/comgt/files/ncm.sh  |   156 +
 .../network/utils/comgt/files/runcommand.gcom |    26 +
 .../network/utils/comgt/files/setmode.gcom    |    26 +
 .../network/utils/comgt/files/setpin.gcom     |    55 +
 .../utils/comgt/patches/001-compile_fix.patch |    23 +
 .../utils/comgt/patches/002-termios.patch     |    29 +
 .../utils/comgt/patches/003-no_XCASE.patch    |    20 +
 .../network/utils/conntrack-tools/Makefile    |    64 +
 .../patches/100-compile_fix.patch             |    10 +
 trunk/package/network/utils/curl/Config.in    |   112 +
 trunk/package/network/utils/curl/Makefile     |   162 +
 .../curl/patches/100-check_long_long.patch    |    10 +
 .../curl/patches/200-no_docs_tests.patch      |    22 +
 trunk/package/network/utils/dante/Makefile    |   117 +
 .../dante/patches/001-automake-compat.patch   |   482 +
 .../patches/100-do-not-use-defdname.patch     |    42 +
 .../dante/patches/200-fix-RTLD_NEXT.patch     |    36 +
 trunk/package/network/utils/ebtables/Makefile |    72 +
 trunk/package/network/utils/fwknop/Makefile   |   118 +
 .../utils/fwknop/patches/001-fix_config.patch |    18 +
 .../utils/fwknop/patches/002-fix_init.patch   |    17 +
 trunk/package/network/utils/git/Makefile      |    71 +
 .../git/patches/100-convert_builtin.patch     |   252 +
 .../git/patches/200-disable_fasthash.patch    |    12 +
 .../package/network/utils/ifenslave/Makefile  |    43 +
 trunk/package/network/utils/iftop/Makefile    |    43 +
 .../iftop/patches/0001-force-ncurses.patch    |    12 +
 trunk/package/network/utils/iperf/Makefile    |    88 +
 ...port-next-time-in-single-thread-mode.patch |    14 +
 trunk/package/network/utils/iproute2/Makefile |   142 +
 .../network/utils/iproute2/files/15-teql      |    23 +
 .../utils/iproute2/patches/001-config.patch   |     7 +
 .../iproute2/patches/004-darwin_fixes.patch   |    59 +
 .../utils/iproute2/patches/006-no_sctp.patch  |    18 +
 .../utils/iproute2/patches/007-no_arpd.patch  |    11 +
 .../utils/iproute2/patches/008-no_netem.patch |    11 +
 .../iproute2/patches/010-type_fixes.patch     |   396 +
 .../patches/100-allow_pfifo_fast.patch        |     9 +
 .../iproute2/patches/110-extra-ccopts.patch   |    11 +
 .../iproute2/patches/120-libnetlink-pic.patch |    10 +
 .../iproute2/patches/200-add-tc_esfq.patch    |   249 +
 .../patches/210-add-act_connmark.patch        |    87 +
 .../utils/iproute2/patches/300-ip_tiny.patch  |   115 +
 .../patches/900-drop_FAILED_POLICY.patch      |    54 +
 trunk/package/network/utils/ipset/Makefile    |    84 +
 .../ipset/patches/001-timeout-size.patch      |    28 +
 trunk/package/network/utils/iptables/Makefile |   549 +
 .../network/utils/iptables/files/l7/aim.pat   |    28 +
 .../utils/iptables/files/l7/bittorrent.pat    |    25 +
 .../utils/iptables/files/l7/edonkey.pat       |    37 +
 .../utils/iptables/files/l7/fasttrack.pat     |    23 +
 .../network/utils/iptables/files/l7/ftp.pat   |    46 +
 .../utils/iptables/files/l7/gnutella.pat      |    34 +
 .../network/utils/iptables/files/l7/http.pat  |    28 +
 .../network/utils/iptables/files/l7/ident.pat |    15 +
 .../network/utils/iptables/files/l7/irc.pat   |    20 +
 .../utils/iptables/files/l7/jabber.pat        |    24 +
 .../utils/iptables/files/l7/msnmessenger.pat  |    28 +
 .../network/utils/iptables/files/l7/ntp.pat   |    17 +
 .../network/utils/iptables/files/l7/pop3.pat  |    50 +
 .../network/utils/iptables/files/l7/smtp.pat  |    40 +
 .../network/utils/iptables/files/l7/ssl.pat   |    16 +
 .../network/utils/iptables/files/l7/vnc.pat   |    23 +
 .../iptables/patches/002-layer7_2.22.patch    |   371 +
 .../020-iptables-disable-modprobe.patch       |    18 +
 .../patches/030-no-libnfnetlink.patch         |    94 +
 .../iptables/patches/100-bash-location.patch  |     8 +
 .../patches/200-configurable_builtin.patch    |    60 +
 .../iptables/patches/300-musl_fixes.patch     |   127 +
 .../patches/400-lenient-restore.patch         |   172 +
 .../patches/500-add-xt_id-match.patch         |    59 +
 trunk/package/network/utils/iputils/Makefile  |   181 +
 .../utils/iputils/patches/001-iputils.patch   |    14 +
 .../utils/iputils/patches/002-fix-ipv6.patch  |    14 +
 .../iputils/patches/003-fix-makefile.patch    |    18 +
 .../patches/010-ping6_uclibc_resolv.patch     |   200 +
 .../patches/011-ping6_use_gnu_source.patch    |    11 +
 .../iputils/patches/020-include_fixes.patch   |    32 +
 trunk/package/network/utils/irssi/Makefile    |    98 +
 trunk/package/network/utils/iw/Makefile       |    57 +
 .../utils/iw/patches/001-nl80211_h_sync.patch |   344 +
 .../network/utils/iw/patches/010-dynack.patch |    94 +
 .../utils/iw/patches/120-antenna_gain.patch   |    34 +
 .../utils/iw/patches/200-reduce_size.patch    |   109 +
 trunk/package/network/utils/iwcap/Makefile    |    51 +
 trunk/package/network/utils/iwcap/src/iwcap.c |   583 +
 trunk/package/network/utils/iwinfo/Makefile   |   121 +
 .../package/network/utils/linux-atm/Makefile  |   192 +
 .../network/utils/linux-atm/files/br2684ctl   |    89 +
 .../linux-atm/patches/000-debian_16.patch     |   270 +
 .../linux-atm/patches/200-no_libfl.patch      |   179 +
 .../linux-atm/patches/300-objcopy_path.patch  |    40 +
 .../patches/400-portability_fixes.patch       |    60 +
 trunk/package/network/utils/maccalc/Makefile  |    48 +
 .../network/utils/maccalc/src/Makefile        |    14 +
 .../package/network/utils/maccalc/src/main.c  |   256 +
 trunk/package/network/utils/nftables/Makefile |    44 +
 ...uilding-with-mini-gmp-instead-of-gmp.patch |  4946 ++
 .../patches/104-fix-CFLAGS-handling.patch     |    10 +
 trunk/package/network/utils/nginx/Config.in   |   192 +
 trunk/package/network/utils/nginx/Makefile    |   334 +
 .../network/utils/nginx/files/nginx.init      |    24 +
 .../nginx/files/nginx.proxyprotocol.example   |    40 +
 .../utils/nginx/files/nginx.syslog.example    |    59 +
 .../nginx/patches-lua-nginx/300-ldl.patch     |    21 +
 .../check_1.2.6+.patch                        |   209 +
 .../nginx/patches/101-feature_test_fix.patch  |   107 +
 .../nginx/patches/102-sizeof_test_fix.patch   |    26 +
 .../utils/nginx/patches/103-sys_nerr.patch    |    12 +
 .../utils/nginx/patches/200-config.patch      |    18 +
 .../patches/300-crosscompile_ccflags.patch    |    33 +
 ...-nginx-1.4.x_proxy_protocol_patch_v2.patch |  1183 +
 .../patches/401-nginx-1.4.0-syslog.patch      |   698 +
 trunk/package/network/utils/nmap/Makefile     |   143 +
 trunk/package/network/utils/owipcalc/Makefile |    50 +
 .../network/utils/owipcalc/src/owipcalc.c     |   951 +
 .../package/network/utils/resolveip/Makefile  |    46 +
 .../network/utils/resolveip/src/resolveip.c   |    98 +
 trunk/package/network/utils/rssileds/Makefile |    49 +
 .../utils/rssileds/files/rssileds.init        |    75 +
 .../network/utils/rssileds/src/rssileds.c     |   290 +
 trunk/package/network/utils/rsync/Config.in   |    25 +
 trunk/package/network/utils/rsync/Makefile    |   104 +
 .../network/utils/rsync/files/rsyncd.conf     |    16 +
 .../network/utils/rsync/files/rsyncd.init     |    14 +
 trunk/package/network/utils/tcpdump/Makefile  |    90 +
 .../patches/001-remove_pcap_debug.patch       |    23 +
 .../002-remove_static_libpcap_check.patch     |    73 +
 .../tcpdump/patches/100-tcpdump_mini.patch    |   844 +
 trunk/package/network/utils/umbim/Makefile    |    45 +
 .../umbim/files/lib/netifd/proto/mbim.sh      |   162 +
 trunk/package/network/utils/uqmi/Makefile     |    50 +
 .../utils/uqmi/files/lib/netifd/proto/qmi.sh  |   155 +
 .../network/utils/wireless-tools/Makefile     |    92 +
 .../wireless-tools/patches/001-debian.patch   |    35 +
 ...-fix-iwconfig-power-argument-parsing.patch |    13 +
 .../patches/003-we_essential_def.patch        |   359 +
 .../patches/004-increase_iwlist_buffer.patch  |    46 +
 trunk/package/network/utils/wwan/Makefile     |    33 +
 .../package/network/utils/wwan/files/wwan.sh  |   119 +
 .../package/network/utils/wwan/files/wwan.usb |    18 +
 .../network/utils/wwan/files/wwan.usbmisc     |    25 +
 .../network/utils/xtables-addons/Makefile     |   153 +
 .../002-fix-kernel-version-detection.patch    |  1954 +
 .../patches/100-add-rtsp-conntrack.patch      |  1526 +
 .../patches/200-add-lua-packetscript.patch    | 18158 ++++++
 .../patches/201-fix-lua-packetscript.patch    |    89 +
 .../patches/300-geoip-endian-detection.patch  |    18 +
 trunk/package/system/ca-certificates/Makefile |    48 +
 trunk/package/system/fstools/Makefile         |    80 +
 .../system/fstools/files/fstab.default        |     1 +
 trunk/package/system/fstools/files/fstab.init |    14 +
 .../system/fstools/files/mount.hotplug        |     1 +
 trunk/package/system/fstools/files/snapshot   |   111 +
 trunk/package/system/mountd/Makefile          |    49 +
 .../package/system/mountd/files/mountd.config |     3 +
 trunk/package/system/mountd/files/mountd.init |    19 +
 .../010-uci_rename_history_to_delta.patch     |    27 +
 .../mountd/patches/020-handle_timeout.patch   |    32 +
 .../mountd/patches/030-ext4_support.patch     |    85 +
 .../patches/040-optional-daemonize.patch      |    13 +
 .../mountd/patches/050-no_error_h.patch       |    10 +
 .../mountd/patches/060-link_libubox.patch     |    11 +
 trunk/package/system/mtd/Makefile             |    54 +
 trunk/package/system/mtd/src/Makefile         |    20 +
 trunk/package/system/mtd/src/crc32.c          |    95 +
 trunk/package/system/mtd/src/crc32.h          |    26 +
 trunk/package/system/mtd/src/fis.c            |   262 +
 trunk/package/system/mtd/src/fis.h            |    14 +
 trunk/package/system/mtd/src/imagetag.c       |   316 +
 trunk/package/system/mtd/src/jffs2.c          |   366 +
 trunk/package/system/mtd/src/jffs2.h          |   216 +
 trunk/package/system/mtd/src/md5.c            |   307 +
 trunk/package/system/mtd/src/md5.h            |    65 +
 trunk/package/system/mtd/src/mtd.c            |   907 +
 trunk/package/system/mtd/src/mtd.h            |    30 +
 trunk/package/system/mtd/src/seama.c          |   179 +
 trunk/package/system/mtd/src/seama.h          |   108 +
 trunk/package/system/mtd/src/trx.c            |   222 +
 trunk/package/system/opkg/Makefile            |   154 +
 .../package/system/opkg/files/opkg-smime.conf |     6 +
 trunk/package/system/opkg/files/opkg.conf     |     4 +
 .../system/opkg/patches/001-ship-pkg-m4.patch |   168 +
 .../system/opkg/patches/002-no-shave.patch    |    37 +
 .../system/opkg/patches/004-host_cpu.patch    |    20 +
 .../opkg/patches/007-force_static.patch       |    71 +
 .../opkg/patches/009-remove-upgrade-all.patch |    41 +
 .../patches/011-old-config-location.patch     |    12 +
 ...-strip-trailing-conffiles-whitespace.patch |    23 +
 .../opkg/patches/014-errors-to-stderr.patch   |    15 +
 .../opkg/patches/020-avoid_getline.patch      |   317 +
 .../opkg/patches/030-fix-double-free.patch    |    10 +
 .../040-wrap-descriptions-only-on-ttys.patch  |    31 +
 .../050-add-case-insensitive-flag.patch       |   169 +
 .../opkg/patches/060-add-find-command.patch   |    58 +
 .../patches/070-use_gzipped_pkg_list.patch    |   120 +
 .../080-suppress-blank-package-fields.patch   |    16 +
 .../090-suppress-blank-provides-field.patch   |    11 +
 .../opkg/patches/100-add-force-checksum.patch |    85 +
 .../system/opkg/patches/110-upgrade.patch     |    49 +
 trunk/package/system/procd/Makefile           |   103 +
 .../system/procd/files/hotplug-preinit.json   |    20 +
 trunk/package/system/procd/files/hotplug.json |    86 +
 .../system/procd/files/nand-preinit.sh        |    21 +
 trunk/package/system/procd/files/nand.sh      |   355 +
 trunk/package/system/procd/files/procd.sh     |   371 +
 .../package/system/procd/files/reload_config  |    15 +
 trunk/package/system/rpcd/Makefile            |    96 +
 trunk/package/system/rpcd/files/rpcd.config   |     7 +
 trunk/package/system/rpcd/files/rpcd.init     |    21 +
 trunk/package/system/ubox/Makefile            |    46 +
 trunk/package/system/ubox/files/log.init      |    94 +
 trunk/package/system/ubus/Makefile            |    80 +
 trunk/package/system/uci/Makefile             |    92 +
 .../system/uci/files/lib/config/uci.sh        |   137 +
 trunk/package/system/udev/Config.in           |   117 +
 trunk/package/system/udev/Makefile            |   157 +
 .../0001-build-don-t-use-gc-sections.patch    |    31 +
 ...vd-add-lrt-for-message-queue-symbols.patch |    25 +
 .../0003-add_btn_trigger_happy_define.patch   |    13 +
 trunk/package/system/zram-swap/Makefile       |    46 +
 .../package/system/zram-swap/files/zram.init  |   123 +
 trunk/package/utils/admswconfig/Makefile      |    52 +
 .../utils/admswconfig/files/admswconfig       |    68 +
 .../utils/admswconfig/files/admswswitch.sh    |    28 +
 .../admswconfig/patches/001-matrix.patch      |    15 +
 .../package/utils/busybox/Config-defaults.in  |  2673 +
 trunk/package/utils/busybox/Config.in         |    26 +
 trunk/package/utils/busybox/Makefile          |   123 +
 trunk/package/utils/busybox/config/Config.in  |   818 +
 .../utils/busybox/config/archival/Config.in   |   372 +
 .../busybox/config/console-tools/Config.in    |   176 +
 .../utils/busybox/config/coreutils/Config.in  |   933 +
 .../busybox/config/debianutils/Config.in      |    85 +
 .../utils/busybox/config/e2fsprogs/Config.in  |    71 +
 .../config/e2fsprogs/old_e2fsprogs/Config.in  |    69 +
 .../utils/busybox/config/editors/Config.in    |   204 +
 .../utils/busybox/config/findutils/Config.in  |   252 +
 .../utils/busybox/config/init/Config.in       |   184 +
 .../utils/busybox/config/libbb/Config.in      |   249 +
 .../utils/busybox/config/loginutils/Config.in |   342 +
 .../utils/busybox/config/mailutils/Config.in  |    55 +
 .../utils/busybox/config/miscutils/Config.in  |   762 +
 .../utils/busybox/config/modutils/Config.in   |   269 +
 .../utils/busybox/config/networking/Config.in |  1098 +
 .../busybox/config/networking/udhcp/Config.in |   160 +
 .../utils/busybox/config/printutils/Config.in |    28 +
 .../utils/busybox/config/procps/Config.in     |   273 +
 .../utils/busybox/config/runit/Config.in      |    89 +
 .../utils/busybox/config/selinux/Config.in    |   124 +
 .../utils/busybox/config/shell/Config.in      |   437 +
 .../utils/busybox/config/sysklogd/Config.in   |   169 +
 .../utils/busybox/config/util-linux/Config.in |   777 +
 .../config/util-linux/volume_id/Config.in     |   304 +
 .../package/utils/busybox/convert_defaults.pl |    13 +
 .../utils/busybox/convert_menuconfig.pl       |    67 +
 trunk/package/utils/busybox/files/cron        |    38 +
 .../package/utils/busybox/files/ntpd-hotplug  |     3 +
 trunk/package/utils/busybox/files/sysntpd     |    42 +
 trunk/package/utils/busybox/files/telnet      |    38 +
 .../patches/001-resource_h_include.patch      |    10 +
 .../patches/002-upstream_ash_fix.patch        |    11 +
 .../patches/003-upstream_date_fix.patch       |    30 +
 .../patches/004-upstream_iplink_fix.patch     |    19 +
 .../busybox/patches/005-upstream_nc_fix.patch |    15 +
 .../patches/006-upstream_lzop_fix.patch       |    59 +
 .../007-upstream_zcat_no_ext_fix.patch        |    59 +
 .../busybox/patches/100-trylink_bash.patch    |     8 +
 .../patches/101-gen_build_files_bash.patch    |     8 +
 .../patches/110-no_static_libgcc.patch        |    11 +
 .../patches/120-remove_uclibc_rpc_check.patch |    12 +
 .../patches/130-mconf_missing_sigwinch.patch  |    13 +
 .../patches/200-udhcpc_reduce_msgs.patch      |    18 +
 .../patches/201-udhcpc_changed_ifindex.patch  |    15 +
 .../203-udhcpc_renew_no_deconfig.patch        |    10 +
 .../patches/204-udhcpc_src_ip_rebind.patch    |    53 +
 .../busybox/patches/210-add_netmsg_util.patch |   103 +
 .../busybox/patches/220-add_lock_util.patch   |   173 +
 .../patches/230-ntpd_delayed_resolve.patch    |    48 +
 .../busybox/patches/240-telnetd_intr.patch    |    10 +
 .../busybox/patches/250-date-k-flag.patch     |    87 +
 .../patches/260-arping_missing_includes.patch |    11 +
 .../270-libbb_make_unicode_printable.patch    |    20 +
 trunk/package/utils/e2fsprogs/Makefile        |   170 +
 .../package/utils/e2fsprogs/files/e2fsck.conf |     3 +
 trunk/package/utils/e2fsprogs/files/e2fsck.sh |    38 +
 .../patches/001-link-against-libuuid.patch    |    38 +
 .../e2fsprogs/patches/002-no_malloc_h.patch   |    10 +
 .../patches/003-com_err_version.patch         |    13 +
 trunk/package/utils/fbtest/Makefile           |    44 +
 trunk/package/utils/fbtest/src/Makefile       |    14 +
 trunk/package/utils/fbtest/src/fbtest.c       |   448 +
 trunk/package/utils/flashrom/Makefile         |    48 +
 .../flashrom/patches/100-mipsel_fix.patch     |    16 +
 trunk/package/utils/fuse/Makefile             |   111 +
 .../fuse/patches/112-no_break_on_mknod.patch  |    11 +
 trunk/package/utils/hostap-utils/Makefile     |    44 +
 trunk/package/utils/jsonfilter/Makefile       |    33 +
 trunk/package/utils/lua/Makefile              |   183 +
 .../010-lua-5.1.3-lnum-full-260308.patch      |  3736 ++
 .../patches-host/011-lnum-use-double.patch    |    11 +
 .../patches-host/015-lnum-ppc-compat.patch    |    11 +
 .../030-archindependent-bytecode.patch        |   111 +
 .../lua/patches-host/100-no_readline.patch    |    49 +
 .../010-lua-5.1.3-lnum-full-260308.patch      |  3736 ++
 .../lua/patches/011-lnum-use-double.patch     |    11 +
 .../lua/patches/015-lnum-ppc-compat.patch     |    11 +
 .../utils/lua/patches/020-shared_liblua.patch |   140 +
 .../030-archindependent-bytecode.patch        |   111 +
 .../utils/lua/patches/100-no_readline.patch   |    49 +
 .../utils/lua/patches/200-lua-path.patch      |    15 +
 .../lua/patches/300-opcode_performance.patch  |   363 +
 trunk/package/utils/mdadm/Makefile            |    52 +
 .../utils/mdadm/patches/000-compile.patch     |    11 +
 .../mdadm/patches/100-cross_compile.patch     |    19 +
 .../utils/mdadm/patches/200-reduce_size.patch |    25 +
 trunk/package/utils/mkelfimage/Makefile       |    35 +
 .../patches/no-stack-protector.patch          |    11 +
 trunk/package/utils/nano/Makefile             |    54 +
 trunk/package/utils/nvram/Makefile            |    60 +
 trunk/package/utils/nvram/files/nvram.init    |    98 +
 trunk/package/utils/nvram/src/Makefile        |    33 +
 trunk/package/utils/nvram/src/cli.c           |   246 +
 trunk/package/utils/nvram/src/crc.c           |    69 +
 trunk/package/utils/nvram/src/nvram.c         |   556 +
 trunk/package/utils/nvram/src/nvram.h         |   123 +
 trunk/package/utils/nvram/src/sdinitvals.h    |    30 +
 trunk/package/utils/pciutils/Makefile         |    72 +
 .../patches/100-remove-no-timestamping.patch  |    11 +
 .../utils/pciutils/patches/101-no-strip.patch |    11 +
 .../pciutils/patches/102-compressed-ids.patch |    31 +
 .../patches/103-relative-path-ids.patch       |    11 +
 .../utils/pciutils/patches/104-resolv.patch   |    11 +
 trunk/package/utils/px5g-standalone/Makefile  |    41 +
 .../utils/px5g-standalone/src/Makefile        |    14 +
 .../px5g-standalone/src/library/base64.c      |   264 +
 .../px5g-standalone/src/library/bignum.c      |  2010 +
 .../px5g-standalone/src/library/havege.c      |   276 +
 .../utils/px5g-standalone/src/library/rsa.c   |   750 +
 .../utils/px5g-standalone/src/library/sha1.c  |   622 +
 .../px5g-standalone/src/library/timing.c      |   265 +
 .../px5g-standalone/src/library/x509write.c   |  1162 +
 .../px5g-standalone/src/polarssl/base64.h     |    93 +
 .../px5g-standalone/src/polarssl/bignum.h     |   437 +
 .../px5g-standalone/src/polarssl/bn_mul.h     |   731 +
 .../px5g-standalone/src/polarssl/config.h     |   329 +
 .../px5g-standalone/src/polarssl/havege.h     |    75 +
 .../utils/px5g-standalone/src/polarssl/rsa.h  |   309 +
 .../utils/px5g-standalone/src/polarssl/sha1.h |   150 +
 .../px5g-standalone/src/polarssl/timing.h     |    81 +
 .../utils/px5g-standalone/src/polarssl/x509.h |   549 +
 .../package/utils/px5g-standalone/src/px5g.c  |   200 +
 trunk/package/utils/px5g/Makefile             |    45 +
 trunk/package/utils/px5g/px5g.c               |   273 +
 trunk/package/utils/robocfg/Makefile          |    39 +
 trunk/package/utils/robocfg/src/Makefile      |    11 +
 trunk/package/utils/robocfg/src/etc53xx.h     |   619 +
 trunk/package/utils/robocfg/src/robocfg.c     |   582 +
 trunk/package/utils/spidev_test/Makefile      |    43 +
 trunk/package/utils/ubi-utils/Makefile        |    61 +
 .../ubi-utils/patches/010-fix-rpmatch.patch   |    19 +
 .../ubi-utils/patches/100-fix_includes.patch  |    30 +
 .../ubi-utils/patches/130-lzma_jffs2.patch    |  5029 ++
 trunk/package/utils/ugps/Makefile             |    42 +
 trunk/package/utils/ugps/files/gps.config     |     2 +
 trunk/package/utils/ugps/files/ugps.init      |    22 +
 trunk/package/utils/usbmode/Makefile          |    59 +
 trunk/package/utils/usbmode/data/12d1:1f16    |     2 +
 .../utils/usbmode/files/usbmode.hotplug       |     1 +
 .../package/utils/usbmode/files/usbmode.init  |    12 +
 trunk/package/utils/usbreset/Makefile         |    44 +
 trunk/package/utils/usbreset/src/usbreset.c   |   235 +
 trunk/package/utils/usbutils/Makefile         |    57 +
 trunk/package/utils/util-linux/Makefile       |   620 +
 ...ot-improve-statfs-f_type-portability.patch |    49 +
 ...use-static-buffers-when-parse-scheme.patch |   126 +
 .../patches/001-no-printf-alloc.patch         |   104 +
 .../util-linux/patches/002-mkostemp.patch     |    46 +
 trunk/package/utils/xfsprogs/Makefile         |    90 +
 .../patches/001-automake-compat.patch         |    84 +
 .../utils/xfsprogs/patches/100-no_aio.patch   |    21 +
 .../patches/110-uclibc_no_ustat.patch         |    34 +
 .../xfsprogs/patches/120-portability.patch    |    47 +
 .../patches/130-uclibc_no_xattr.patch         |    34 +
 .../utils/xfsprogs/patches/140-no_po.patch    |    20 +
 .../xfsprogs/patches/150-include_fixes.patch  |    72 +
 trunk/rules.mk                                |   335 +
 trunk/scripts/arm-magic.sh                    |    42 +
 trunk/scripts/brcmImage.pl                    |   162 +
 trunk/scripts/bundle-libraries.sh             |   110 +
 trunk/scripts/checkpatch.pl                   |  3490 ++
 trunk/scripts/clang-gcc-wrapper               |    12 +
 trunk/scripts/clean-package.sh                |    24 +
 trunk/scripts/cleanfile                       |   176 +
 trunk/scripts/cleanpatch                      |   258 +
 trunk/scripts/combined-ext-image.sh           |    61 +
 trunk/scripts/combined-image.sh               |    34 +
 trunk/scripts/config.guess                    |  1530 +
 trunk/scripts/config.rpath                    |   666 +
 trunk/scripts/config.sub                      |  1773 +
 trunk/scripts/config/Makefile                 |    52 +
 trunk/scripts/config/README                   |     2 +
 trunk/scripts/config/conf.c                   |   686 +
 trunk/scripts/config/confdata.c               |  1167 +
 trunk/scripts/config/expr.c                   |  1168 +
 trunk/scripts/config/expr.h                   |   236 +
 trunk/scripts/config/list.h                   |    91 +
 trunk/scripts/config/lkc.h                    |   198 +
 trunk/scripts/config/lkc_proto.h              |    57 +
 .../scripts/config/lxdialog/check-lxdialog.sh |    85 +
 trunk/scripts/config/lxdialog/checklist.c     |   332 +
 trunk/scripts/config/lxdialog/dialog.h        |   236 +
 trunk/scripts/config/lxdialog/inputbox.c      |   301 +
 trunk/scripts/config/lxdialog/menubox.c       |   436 +
 trunk/scripts/config/lxdialog/textbox.c       |   408 +
 trunk/scripts/config/lxdialog/util.c          |   664 +
 trunk/scripts/config/lxdialog/yesno.c         |   114 +
 trunk/scripts/config/mconf.c                  |   969 +
 trunk/scripts/config/mconf_check              |     0
 trunk/scripts/config/menu.c                   |   644 +
 trunk/scripts/config/symbol.c                 |  1310 +
 trunk/scripts/config/util.c                   |   159 +
 trunk/scripts/config/zconf.gperf              |    47 +
 trunk/scripts/config/zconf.hash.c             |   243 +
 trunk/scripts/config/zconf.hash.c_shipped     |   243 +
 trunk/scripts/config/zconf.l                  |   406 +
 trunk/scripts/config/zconf.lex.c              |  2463 +
 trunk/scripts/config/zconf.lex.c_shipped      |  2463 +
 trunk/scripts/config/zconf.tab.c              |  2561 +
 trunk/scripts/config/zconf.tab.c_shipped      |  2561 +
 trunk/scripts/config/zconf.y                  |   752 +
 trunk/scripts/deptest.sh                      |   211 +
 trunk/scripts/diffconfig.sh                   |    11 +
 trunk/scripts/dl_cleanup.py                   |   231 +
 trunk/scripts/download.pl                     |   195 +
 trunk/scripts/env                             |   225 +
 trunk/scripts/ext-toolchain.sh                |   581 +
 trunk/scripts/feeds                           |   681 +
 trunk/scripts/flashing/adam2flash-502T.pl     |   342 +
 trunk/scripts/flashing/adam2flash-fritzbox.pl |   209 +
 trunk/scripts/flashing/adam2flash.pl          |   174 +
 trunk/scripts/flashing/adsl2mue_flash.pl      |   170 +
 trunk/scripts/flashing/flash.sh               |    66 +
 trunk/scripts/flashing/jungo-image.py         |   283 +
 trunk/scripts/freebsd.sh                      |     1 +
 trunk/scripts/gen-dependencies.sh             |    35 +
 trunk/scripts/getver.sh                       |    34 +
 trunk/scripts/ipkg                            |  1183 +
 trunk/scripts/ipkg-make-index.sh              |    30 +
 trunk/scripts/kconfig.pl                      |   182 +
 trunk/scripts/make-ipkg-dir.sh                |    21 +
 trunk/scripts/md5sum                          |     2 +
 trunk/scripts/metadata.pl                     |   922 +
 trunk/scripts/metadata.pm                     |   163 +
 trunk/scripts/mkits.sh                        |   115 +
 trunk/scripts/om-fwupgradecfg-gen.sh          |    70 +
 trunk/scripts/openbsd.sh                      |    24 +
 trunk/scripts/pad_image                       |   100 +
 trunk/scripts/patch-kernel.sh                 |    54 +
 trunk/scripts/patch-specs.sh                  |    90 +
 trunk/scripts/relink-lib.sh                   |    14 +
 trunk/scripts/remote-gdb                      |    89 +
 trunk/scripts/rstrip.sh                       |    39 +
 trunk/scripts/slugimage.pl                    |  1217 +
 trunk/scripts/strip-kmod.sh                   |    50 +
 trunk/scripts/symlink-tree.sh                 |    45 +
 trunk/scripts/timestamp.pl                    |    69 +
 trunk/scripts/ubinize-image.sh                |   111 +
 trunk/scripts/update-package-md5sum           |    38 +
 trunk/target/Config.in                        |   207 +
 trunk/target/Makefile                         |    21 +
 trunk/target/imagebuilder/Config.in           |    10 +
 trunk/target/imagebuilder/Makefile            |    69 +
 trunk/target/imagebuilder/files/Makefile      |   178 +
 .../imagebuilder/files/repositories.conf      |     6 +
 trunk/target/linux/Makefile                   |    13 +
 trunk/target/linux/ar71xx/Makefile            |    24 +
 trunk/target/linux/ar71xx/base-files.mk       |     3 +
 .../linux/ar71xx/base-files/etc/diag.sh       |   318 +
 .../etc/hotplug.d/firmware/10-ath9k-eeprom    |    65 +
 .../etc/hotplug.d/net/10-ar922x-led-fix       |    51 +
 .../linux/ar71xx/base-files/etc/inittab       |     3 +
 .../base-files/etc/uci-defaults/01_leds       |   496 +
 .../base-files/etc/uci-defaults/02_network    |   454 +
 .../uci-defaults/03_network-switchX-migration |   108 +
 .../uci-defaults/03_network-vlan-migration    |    13 +
 .../etc/uci-defaults/04_led_migration         |    86 +
 .../etc/uci-defaults/09_fix-seama-header      |    21 +
 .../etc/uci-defaults/09_fix-trx-header        |    19 +
 .../linux/ar71xx/base-files/lib/ar71xx.sh     |   839 +
 .../lib/preinit/03_preinit_do_ar71xx.sh       |     9 +
 .../lib/preinit/05_set_iface_mac_ar71xx       |    45 +
 .../lib/preinit/05_set_preinit_iface_ar71xx   |    53 +
 .../lib/preinit/81_load_ath10k_board_bin      |    64 +
 .../base-files/lib/preinit/82_patch_ath10k    |    37 +
 .../ar71xx/base-files/lib/upgrade/allnet.sh   |   162 +
 .../ar71xx/base-files/lib/upgrade/dir825.sh   |   165 +
 .../ar71xx/base-files/lib/upgrade/openmesh.sh |   212 +
 .../ar71xx/base-files/lib/upgrade/platform.sh |   503 +
 .../linux/ar71xx/base-files/sbin/wget2nand    |    85 +
 trunk/target/linux/ar71xx/config-3.14         |   308 +
 .../files/arch/mips/ath79/dev-ap9x-pci.c      |   159 +
 .../files/arch/mips/ath79/dev-ap9x-pci.h      |    48 +
 .../ar71xx/files/arch/mips/ath79/dev-dsa.c    |    36 +
 .../ar71xx/files/arch/mips/ath79/dev-dsa.h    |    21 +
 .../ar71xx/files/arch/mips/ath79/dev-eth.c    |  1209 +
 .../ar71xx/files/arch/mips/ath79/dev-eth.h    |    52 +
 .../ar71xx/files/arch/mips/ath79/dev-m25p80.c |   118 +
 .../ar71xx/files/arch/mips/ath79/dev-m25p80.h |    17 +
 .../ar71xx/files/arch/mips/ath79/dev-nfc.c    |   141 +
 .../ar71xx/files/arch/mips/ath79/dev-nfc.h    |    34 +
 .../files/arch/mips/ath79/mach-alfa-ap96.c    |   151 +
 .../files/arch/mips/ath79/mach-alfa-nx.c      |   113 +
 .../files/arch/mips/ath79/mach-all0258n.c     |    88 +
 .../files/arch/mips/ath79/mach-all0315n.c     |    85 +
 .../ar71xx/files/arch/mips/ath79/mach-ap113.c |    84 +
 .../ar71xx/files/arch/mips/ath79/mach-ap132.c |   189 +
 .../ar71xx/files/arch/mips/ath79/mach-ap83.c  |   275 +
 .../ar71xx/files/arch/mips/ath79/mach-ap96.c  |   142 +
 .../files/arch/mips/ath79/mach-archer-c7.c    |   266 +
 .../files/arch/mips/ath79/mach-aw-nr580.c     |   107 +
 .../arch/mips/ath79/mach-bhu-bxu2000n2-a.c    |   120 +
 .../files/arch/mips/ath79/mach-cap4200ag.c    |   131 +
 .../files/arch/mips/ath79/mach-carambola2.c   |   105 +
 .../files/arch/mips/ath79/mach-cpe510.c       |   107 +
 .../files/arch/mips/ath79/mach-dgl-5500-a1.c  |   150 +
 .../files/arch/mips/ath79/mach-dhp-1565-a1.c  |   170 +
 .../files/arch/mips/ath79/mach-dir-505-a1.c   |   116 +
 .../files/arch/mips/ath79/mach-dir-600-a1.c   |   159 +
 .../files/arch/mips/ath79/mach-dir-615-c1.c   |   133 +
 .../files/arch/mips/ath79/mach-dir-825-b1.c   |   191 +
 .../files/arch/mips/ath79/mach-dir-825-c1.c   |   241 +
 .../files/arch/mips/ath79/mach-dragino2.c     |   136 +
 .../files/arch/mips/ath79/mach-eap300v2.c     |   101 +
 .../files/arch/mips/ath79/mach-eap7660d.c     |   181 +
 .../files/arch/mips/ath79/mach-el-m150.c      |   112 +
 .../files/arch/mips/ath79/mach-el-mini.c      |    86 +
 .../files/arch/mips/ath79/mach-esr1750.c      |   176 +
 .../files/arch/mips/ath79/mach-esr900.c       |   200 +
 .../files/arch/mips/ath79/mach-ew-dorin.c     |   144 +
 .../files/arch/mips/ath79/mach-gl-inet.c      |   104 +
 .../files/arch/mips/ath79/mach-gs-oolite.c    |   103 +
 .../arch/mips/ath79/mach-hiwifi-hc6361.c      |   115 +
 .../files/arch/mips/ath79/mach-hornet-ub.c    |   137 +
 .../files/arch/mips/ath79/mach-ja76pf.c       |   190 +
 .../files/arch/mips/ath79/mach-jwap003.c      |    95 +
 .../ar71xx/files/arch/mips/ath79/mach-mr600.c |   177 +
 .../ar71xx/files/arch/mips/ath79/mach-mr900.c |   159 +
 .../files/arch/mips/ath79/mach-mynet-n600.c   |   202 +
 .../files/arch/mips/ath79/mach-mynet-n750.c   |   226 +
 .../files/arch/mips/ath79/mach-mynet-rext.c   |   178 +
 .../files/arch/mips/ath79/mach-mzk-w04nu.c    |   124 +
 .../files/arch/mips/ath79/mach-mzk-w300nh.c   |   115 +
 .../files/arch/mips/ath79/mach-nbg460n.c      |   220 +
 .../files/arch/mips/ath79/mach-nbg6716.c      |   268 +
 .../ar71xx/files/arch/mips/ath79/mach-om2p.c  |   225 +
 .../ar71xx/files/arch/mips/ath79/mach-om5p.c  |   122 +
 .../ar71xx/files/arch/mips/ath79/mach-pb42.c  |    83 +
 .../ar71xx/files/arch/mips/ath79/mach-pb92.c  |    70 +
 .../files/arch/mips/ath79/mach-qihoo-c301.c   |   166 +
 .../ar71xx/files/arch/mips/ath79/mach-r6100.c |   146 +
 .../files/arch/mips/ath79/mach-rb2011.c       |   331 +
 .../ar71xx/files/arch/mips/ath79/mach-rb4xx.c |   465 +
 .../ar71xx/files/arch/mips/ath79/mach-rb750.c |   346 +
 .../ar71xx/files/arch/mips/ath79/mach-rb91x.c |   349 +
 .../ar71xx/files/arch/mips/ath79/mach-rb95x.c |   258 +
 .../files/arch/mips/ath79/mach-rbsxtlite.c    |   238 +
 .../files/arch/mips/ath79/mach-rw2458n.c      |    91 +
 .../files/arch/mips/ath79/mach-smart-300.c    |   135 +
 .../files/arch/mips/ath79/mach-tew-632brp.c   |   111 +
 .../files/arch/mips/ath79/mach-tew-673gru.c   |   198 +
 .../files/arch/mips/ath79/mach-tew-712br.c    |   153 +
 .../files/arch/mips/ath79/mach-tew-732br.c    |   127 +
 .../files/arch/mips/ath79/mach-tl-mr11u.c     |   183 +
 .../files/arch/mips/ath79/mach-tl-mr13u.c     |   107 +
 .../files/arch/mips/ath79/mach-tl-mr3020.c    |   126 +
 .../files/arch/mips/ath79/mach-tl-mr3x20.c    |   147 +
 .../arch/mips/ath79/mach-tl-wa830re-v2.c      |   132 +
 .../arch/mips/ath79/mach-tl-wa901nd-v2.c      |   104 +
 .../files/arch/mips/ath79/mach-tl-wa901nd.c   |   127 +
 .../files/arch/mips/ath79/mach-tl-wax50re.c   |   313 +
 .../files/arch/mips/ath79/mach-tl-wdr3500.c   |   169 +
 .../files/arch/mips/ath79/mach-tl-wdr4300.c   |   205 +
 .../arch/mips/ath79/mach-tl-wr1041n-v2.c      |   138 +
 .../arch/mips/ath79/mach-tl-wr1043nd-v2.c     |   215 +
 .../files/arch/mips/ath79/mach-tl-wr1043nd.c  |   141 +
 .../files/arch/mips/ath79/mach-tl-wr2543n.c   |   156 +
 .../files/arch/mips/ath79/mach-tl-wr703n.c    |   118 +
 .../files/arch/mips/ath79/mach-tl-wr720n-v3.c |   109 +
 .../arch/mips/ath79/mach-tl-wr741nd-v4.c      |   187 +
 .../files/arch/mips/ath79/mach-tl-wr741nd.c   |   130 +
 .../files/arch/mips/ath79/mach-tl-wr841n-v8.c |   225 +
 .../files/arch/mips/ath79/mach-tl-wr841n-v9.c |   138 +
 .../files/arch/mips/ath79/mach-tl-wr841n.c    |   140 +
 .../files/arch/mips/ath79/mach-tl-wr941nd.c   |   121 +
 .../files/arch/mips/ath79/mach-tube2h.c       |   113 +
 .../ar71xx/files/arch/mips/ath79/mach-ubnt.c  |   205 +
 .../files/arch/mips/ath79/mach-whr-hp-g300n.c |   155 +
 .../files/arch/mips/ath79/mach-wlae-ag300n.c  |   114 +
 .../files/arch/mips/ath79/mach-wlr8100.c      |   205 +
 .../files/arch/mips/ath79/mach-wndap360.c     |   105 +
 .../files/arch/mips/ath79/mach-wndr3700.c     |   172 +
 .../files/arch/mips/ath79/mach-wndr4300.c     |   210 +
 .../files/arch/mips/ath79/mach-wnr2000-v3.c   |   115 +
 .../files/arch/mips/ath79/mach-wnr2000-v4.c   |   175 +
 .../files/arch/mips/ath79/mach-wnr2000.c      |   145 +
 .../files/arch/mips/ath79/mach-wnr2200.c      |   137 +
 .../ar71xx/files/arch/mips/ath79/mach-wp543.c |   109 +
 .../ar71xx/files/arch/mips/ath79/mach-wpe72.c |    97 +
 .../files/arch/mips/ath79/mach-wrt160nl.c     |   126 +
 .../files/arch/mips/ath79/mach-wrt400n.c      |   161 +
 .../files/arch/mips/ath79/mach-wzr-450hp2.c   |   221 +
 .../arch/mips/ath79/mach-wzr-hp-ag300h.c      |   205 +
 .../arch/mips/ath79/mach-wzr-hp-g300nh.c      |   279 +
 .../arch/mips/ath79/mach-wzr-hp-g300nh2.c     |   170 +
 .../files/arch/mips/ath79/mach-wzr-hp-g450h.c |   165 +
 .../files/arch/mips/ath79/mach-zcn-1523h.c    |   154 +
 .../ar71xx/files/arch/mips/ath79/nvram.c      |    80 +
 .../ar71xx/files/arch/mips/ath79/nvram.h      |    19 +
 .../files/arch/mips/ath79/pci-ath9k-fixup.c   |   123 +
 .../files/arch/mips/ath79/pci-ath9k-fixup.h   |     6 +
 .../ar71xx/files/arch/mips/ath79/routerboot.c |   249 +
 .../ar71xx/files/arch/mips/ath79/routerboot.h |    57 +
 .../mips/include/asm/fw/myloader/myloader.h   |    34 +
 .../include/asm/mach-ath79/ag71xx_platform.h  |    65 +
 .../mips/include/asm/mach-ath79/mach-rb750.h  |    84 +
 .../mips/include/asm/mach-ath79/rb4xx_cpld.h  |    48 +
 .../ar71xx/files/drivers/gpio/gpio-latch.c    |   219 +
 .../files/drivers/gpio/gpio-nxp-74hc153.c     |   247 +
 .../ar71xx/files/drivers/leds/leds-rb750.c    |   144 +
 .../files/drivers/leds/leds-wndr3700-usb.c    |    76 +
 .../files/drivers/mtd/nand/ar934x_nfc.c       |  1504 +
 .../files/drivers/mtd/nand/rb4xx_nand.c       |   305 +
 .../files/drivers/mtd/nand/rb750_nand.c       |   354 +
 .../files/drivers/mtd/nand/rb91x_nand.c       |   377 +
 .../ar71xx/files/drivers/mtd/tplinkpart.c     |   199 +
 .../ar71xx/files/drivers/mtd/wrt160nl_part.c  |   207 +
 .../ar71xx/files/drivers/net/dsa/mv88e6063.c  |   294 +
 .../net/ethernet/atheros/ag71xx/Kconfig       |    33 +
 .../net/ethernet/atheros/ag71xx/Makefile      |    15 +
 .../net/ethernet/atheros/ag71xx/ag71xx.h      |   485 +
 .../ethernet/atheros/ag71xx/ag71xx_ar7240.c   |  1229 +
 .../ethernet/atheros/ag71xx/ag71xx_ar8216.c   |    44 +
 .../ethernet/atheros/ag71xx/ag71xx_debugfs.c  |   285 +
 .../ethernet/atheros/ag71xx/ag71xx_ethtool.c  |   130 +
 .../net/ethernet/atheros/ag71xx/ag71xx_main.c |  1406 +
 .../net/ethernet/atheros/ag71xx/ag71xx_mdio.c |   318 +
 .../net/ethernet/atheros/ag71xx/ag71xx_phy.c  |   235 +
 .../linux/ar71xx/files/drivers/spi/spi-ap83.c |   283 +
 .../ar71xx/files/drivers/spi/spi-rb4xx-cpld.c |   441 +
 .../ar71xx/files/drivers/spi/spi-rb4xx.c      |   507 +
 .../ar71xx/files/drivers/spi/spi-vsc7385.c    |   621 +
 .../ar71xx/files/include/linux/nxp_74hc153.h  |    24 +
 .../files/include/linux/platform/ar934x_nfc.h |    38 +
 .../include/linux/platform_data/gpio-latch.h  |    14 +
 .../include/linux/platform_data/rb91x_nand.h  |    16 +
 .../ar71xx/files/include/linux/spi/vsc7385.h  |    19 +
 .../linux/ar71xx/files/net/dsa/mv88e6063.c    |   294 +
 .../linux/ar71xx/generic/config-default       |     1 +
 .../ar71xx/generic/profiles/00-default.mk     |    17 +
 .../ar71xx/generic/profiles/01-minimal.mk     |    16 +
 .../linux/ar71xx/generic/profiles/8devices.mk |    17 +
 .../linux/ar71xx/generic/profiles/nclink.mk   |    15 +
 .../linux/ar71xx/generic/profiles/netgear.mk  |    72 +
 .../linux/ar71xx/generic/profiles/planex.mk   |    28 +
 .../linux/ar71xx/generic/profiles/rosewill.mk |    16 +
 .../linux/ar71xx/generic/profiles/senao.mk    |    17 +
 .../linux/ar71xx/generic/profiles/sitecom.mk  |    16 +
 .../linux/ar71xx/generic/profiles/tp-link.mk  |   355 +
 .../linux/ar71xx/generic/profiles/trendnet.mk |    62 +
 .../linux/ar71xx/generic/profiles/ubnt.mk     |    73 +
 .../linux/ar71xx/generic/profiles/wd.mk       |    36 +
 .../linux/ar71xx/generic/profiles/zcomax.mk   |    28 +
 trunk/target/linux/ar71xx/generic/target.mk   |     8 +
 trunk/target/linux/ar71xx/image/Makefile      |  1234 +
 .../linux/ar71xx/image/lzma-loader/Makefile   |    64 +
 .../ar71xx/image/lzma-loader/src/LzmaDecode.c |   584 +
 .../ar71xx/image/lzma-loader/src/LzmaDecode.h |   113 +
 .../ar71xx/image/lzma-loader/src/LzmaTypes.h  |    45 +
 .../ar71xx/image/lzma-loader/src/Makefile     |   105 +
 .../image/lzma-loader/src/ar71xx_regs.h       |   725 +
 .../ar71xx/image/lzma-loader/src/board.c      |    56 +
 .../ar71xx/image/lzma-loader/src/cache.c      |    43 +
 .../ar71xx/image/lzma-loader/src/cache.h      |    17 +
 .../ar71xx/image/lzma-loader/src/cacheops.h   |    85 +
 .../ar71xx/image/lzma-loader/src/config.h     |    31 +
 .../ar71xx/image/lzma-loader/src/cp0regdef.h  |    39 +
 .../linux/ar71xx/image/lzma-loader/src/head.S |   118 +
 .../ar71xx/image/lzma-loader/src/loader.c     |   263 +
 .../ar71xx/image/lzma-loader/src/loader.lds   |    35 +
 .../ar71xx/image/lzma-loader/src/loader2.lds  |    10 +
 .../image/lzma-loader/src/lzma-data.lds       |     8 +
 .../ar71xx/image/lzma-loader/src/printf.c     |   350 +
 .../ar71xx/image/lzma-loader/src/printf.h     |    18 +
 .../linux/ar71xx/image/ubinize-nbg6716.ini    |    24 +
 .../linux/ar71xx/image/ubinize-wndr4300.ini   |    26 +
 trunk/target/linux/ar71xx/luci/config-default |     1 +
 .../linux/ar71xx/luci/profiles/00-default.mk  |    17 +
 .../linux/ar71xx/luci/profiles/netgear.mk     |    72 +
 .../linux/ar71xx/luci/profiles/planex.mk      |    28 +
 .../linux/ar71xx/luci/profiles/tp-link.mk     |   355 +
 trunk/target/linux/ar71xx/luci/target.mk      |     8 +
 .../linux/ar71xx/mikrotik/config-default      |   129 +
 .../ar71xx/mikrotik/profiles/01-minimal.mk    |    16 +
 .../ar71xx/mikrotik/profiles/02-ath5k.mk      |    16 +
 trunk/target/linux/ar71xx/mikrotik/target.mk  |     9 +
 trunk/target/linux/ar71xx/modules.mk          |    71 +
 trunk/target/linux/ar71xx/nand/config-default |   111 +
 .../linux/ar71xx/nand/profiles/netgear.mk     |    29 +
 .../linux/ar71xx/nand/profiles/zyxel.mk       |    18 +
 trunk/target/linux/ar71xx/nand/target.mk      |     7 +
 ...Avoid-using-unitialized-reg-variable.patch |    42 +
 ...-make-chipselect-logic-more-flexible.patch |   301 +
 ...213-MIPS-ath79-fix-ar933x-wmac-reset.patch |    31 +
 .../220-add_cpu_feature_overrides.patch       |    28 +
 ...0-MIPS-add-MIPS_MACHINE_NONAME-macro.patch |    21 +
 .../310-lib-add-rle-decompression.patch       |   124 +
 .../401-mtd-physmap-add-lock-unlock.patch     |    94 +
 .../402-mtd-SST39VF6401B-support.patch        |    29 +
 ...mtd_fix_cfi_cmdset_0002_status_check.patch |    69 +
 .../404-mtd-wrt160nl-trx-parser.patch         |    25 +
 .../405-mtd-tp-link-partition-parser.patch    |    34 +
 ...25p80-allow-to-specify-max-read-size.patch |   106 +
 ...o-pass-probe-types-via-platform-data.patch |    23 +
 .../408-mtd-redboot_partition_scan.patch      |    44 +
 .../409-mtd-rb4xx_nand_driver.patch           |    21 +
 .../410-mtd-rb750-nand-driver.patch           |    21 +
 ...mtd-cfi_cmdset_0002-force-word-write.patch |    61 +
 ...td-m25p80-zero-partition-parser-data.patch |    10 +
 .../413-mtd-ar934x-nand-driver.patch          |    25 +
 .../414-mtd-rb91x-nand-driver.patch           |    23 +
 .../420-net-ar71xx_mac_driver.patch           |    28 +
 .../422-dsa-trailer-tag-validation-fix.patch  |    11 +
 .../423-dsa-add-88e6063-driver.patch          |    24 +
 ...-at803x-allow-to-configure-via-pdata.patch |   134 +
 .../430-drivers-link-spi-before-mtd.patch     |    12 +
 .../431-spi-add-various-flags.patch           |    19 +
 .../432-spi-rb4xx-spi-driver.patch            |    25 +
 .../433-spi-rb4xx-cpld-driver.patch           |    26 +
 .../434-spi-ap83_spi_controller.patch         |    27 +
 .../patches-3.14/435-spi-vsc7385_driver.patch |    23 +
 .../440-leds-wndr3700-usb-led-driver.patch    |    26 +
 .../441-leds-rb750-led-driver.patch           |    23 +
 ...50-gpio-nxp-74hc153-gpio-chip-driver.patch |    25 +
 ...x164-improve-platform-device-support.patch |    70 +
 .../452-gpio-add-gpio-latch-driver.patch      |    22 +
 ...-spi-bitbang-export-spi_bitbang_bufs.patch |    28 +
 ...1-spi-add-type-field-to-spi_transfer.patch |    23 +
 ...462-mtd-m25p80-set-spi-transfer-type.patch |    18 +
 .../463-spi-ath79-add-fast-flash-read.patch   |   185 +
 .../464-spi-ath79-fix-fast-flash-read.patch   |    34 +
 ...ath79-swizzle-pci-address-for-ar71xx.patch |   111 +
 .../480-ar913x_wmac_external_reset.patch      |    31 +
 ...490-usb-ehci-add-quirks-for-qca-socs.patch |   101 +
 .../patches-3.14/500-MIPS-fw-myloader.patch   |    22 +
 ...-mac-argument-to-ath79_register_wmac.patch |    81 +
 ...02-MIPS-ath79-export-ath79_gpio_base.patch |    23 +
 ...MIPS-ath79-add-flash-acquire-release.patch |    37 +
 ...IPS-ath79-add-ath79_device_reset_get.patch |    45 +
 ...ath79-add-ath79_gpio_function_select.patch |    47 +
 ...6-MIPS-ath79-prom-parse-redboot-args.patch |    86 +
 ...MIPS-ath79-prom-add-myloader-support.patch |    58 +
 ...S-ath79-prom-image-command-line-hack.patch |    57 +
 ...PS-ath79-process-board-kernel-option.patch |    11 +
 ...S-ath79-init-gpio-pin-of-wmac-device.patch |    14 +
 .../520-MIPS-ath79-enable-UART-function.patch |    18 +
 ...S-ath79-enable-UART-for-early_serial.patch |    61 +
 ...dd-ath79_wmac_register_simple-helper.patch |    21 +
 .../523-MIPS-ath79-OTP-support.patch          |   166 +
 ...add-ath79_wmac_disable_25ghz-helpers.patch |    31 +
 ...525-MIPS-ath79-enable-qca-usb-quirks.patch |   101 +
 ...MIPS-ath79-add-more-register-defines.patch |   359 +
 .../602-MIPS-ath79-add-openwrt-stuff.patch    |    76 +
 .../603-MIPS-ath79-ap121-fixes.patch          |   163 +
 .../604-MIPS-ath79-ap81-fixes.patch           |   128 +
 .../605-MIPS-ath79-db120-fixes.patch          |   209 +
 .../606-MIPS-ath79-pb44-fixes.patch           |   153 +
 .../607-MIPS-ath79-ubnt-xm-fixes.patch        |   109 +
 ...8-MIPS-ath79-ubnt-xm-add-more-boards.patch |   347 +
 .../609-MIPS-ath79-ap136-fixes.patch          |   316 +
 .../610-MIPS-ath79-openwrt-machines.patch     |  1179 +
 .../611-MIPS-ath79-wdt-timeout.patch          |    25 +
 .../612-MIPS-ath79-set-buffalo-txgain.patch   |    24 +
 ...ath79_wmac_setup_ext_lna_gpio-helper.patch |    76 +
 ...IPS-ath79-ap81-remove-mtd-partitions.patch |    49 +
 ...IPS-ath79-ap83-remove-mtd-partitions.patch |    44 +
 .../patches-3.14/616-MIPS-ath79-ubnt-xw.patch |    95 +
 .../634-MIPS-ath79-WNR2000V4-support.patch    |    39 +
 ...0-MIPS-ath79-add-TL-WA801NDv2-suport.patch |    10 +
 ...MIPS-ath79-add-TL-WA901ND-v3-support.patch |    10 +
 ...02-MIPS-ath79-add-MyNet-N750-support.patch |    39 +
 .../703-MIPS-ath79-add-RB91x-support.patch    |    39 +
 .../704-MIPS-ath79-TL-WDR4900v2-support.patch |    23 +
 ...-MIPS-ath79-add-RB951Ui-2HnD-support.patch |    10 +
 .../706-MIPS-ath79-oolite-v1-support.patch    |    39 +
 ...PS-ath79-add-support-for-QCA953x-SoC.patch |   435 +
 .../708-MIPS-ath79-TL-WR841v9-support.patch   |    38 +
 ...709-MIPS-ath79-HiWiFi-HC6361-support.patch |    39 +
 .../709-MIPS-ath79-add-NBG6716.patch          |    37 +
 .../710-MIPS-ath79-add-OM2Pv2.patch           |    10 +
 .../711-MIPS-ath79-add-OM2P-HSv2.patch        |    10 +
 .../712-MIPS-ath79-add-EasyLink-support.patch |    51 +
 ...713-MIPS-ath79-add-RBSXTLite-support.patch |    38 +
 ...-MIPS-ath79-add-TL-WA830REv2-support.patch |    39 +
 ...15-MIPS-ath79-add-TL-WA860RE-support.patch |    10 +
 ...6-MIPS-ath79-add_mikrotik_rb2011uias.patch |    26 +
 ...17-MIPS-ath79-add-gl-inet-v1-support.patch |    39 +
 .../718-MIPS-ath79-add-ESR1750-support.patch  |    39 +
 .../719-MIPS-ath79-add-ESR900-support.patch   |    39 +
 .../720-MIPS-ath79-add-Tube2H-support.patch   |    38 +
 .../721-MIPS-ath79-add-EAP300v2-support.patch |    38 +
 ...22-MIPS-ath79-add-airGateway-support.patch |    90 +
 .../723-MIPS-ath79-add-om5p-support.patch     |    38 +
 .../724-MIPS-ath79-archer_c5-support.patch    |    21 +
 ...725-MIPS-ath79-add-smart-300-support.patch |    38 +
 ...S-ath79-add_mikrotik_rb2011uias-2hnd.patch |    22 +
 ...IPS-ath79-add-qihoo-360-c301-support.patch |    40 +
 .../727-MIPS-ath79-ar934x-wmac-revision.patch |    11 +
 .../728-MIPS-ath79-fix-restart.patch          |    10 +
 .../729-MIPS-ath79-add-WZR-450HP2.patch       |    39 +
 .../730-MIPS-ath79-add-DHP-1565A1.patch       |    40 +
 .../730-MIPS-ath79-add-mr900-support.patch    |    39 +
 .../731-MIPS-ath79-add-mr900v2-support.patch  |    10 +
 .../732-MIPS-ath79-add-R6100-support.patch    |    40 +
 .../733-MIPS-ath79-add-DGL-5500-A1.patch      |    39 +
 .../901-mdio_bitbang_ignore_ta_value.patch    |    20 +
 .../902-unaligned_access_hacks.patch          |   883 +
 trunk/target/linux/generic/PATCHES            |    20 +
 trunk/target/linux/generic/base-files/init    |     4 +
 trunk/target/linux/generic/config-3.10        |  4040 ++
 trunk/target/linux/generic/config-3.13        |  4265 ++
 trunk/target/linux/generic/config-3.14        |  4324 ++
 trunk/target/linux/generic/config-3.18        |  4500 ++
 trunk/target/linux/generic/config-3.3         |  3529 ++
 trunk/target/linux/generic/config-3.8         |  3892 ++
 .../Documentation/networking/adm6996.txt      |   110 +
 .../files/arch/mips/fw/myloader/Makefile      |     5 +
 .../files/arch/mips/fw/myloader/myloader.c    |    63 +
 .../linux/generic/files/crypto/ocf/Config.in  |    38 +
 .../linux/generic/files/crypto/ocf/Kconfig    |   128 +
 .../linux/generic/files/crypto/ocf/Makefile   |   148 +
 .../generic/files/crypto/ocf/c7108/Makefile   |    12 +
 .../generic/files/crypto/ocf/c7108/aes-7108.c |   841 +
 .../generic/files/crypto/ocf/c7108/aes-7108.h |   134 +
 .../linux/generic/files/crypto/ocf/criov.c    |   215 +
 .../linux/generic/files/crypto/ocf/crypto.c   |  1766 +
 .../files/crypto/ocf/cryptocteon/Makefile     |    17 +
 .../files/crypto/ocf/cryptocteon/README.txt   |    11 +
 .../crypto/ocf/cryptocteon/cavium_crypto.c    |  2283 +
 .../crypto/ocf/cryptocteon/cryptocteon.c      |   576 +
 .../generic/files/crypto/ocf/cryptodev.c      |  1069 +
 .../generic/files/crypto/ocf/cryptodev.h      |   480 +
 .../generic/files/crypto/ocf/cryptosoft.c     |  1322 +
 .../generic/files/crypto/ocf/ep80579/Makefile |   119 +
 .../files/crypto/ocf/ep80579/environment.mk   |    78 +
 .../files/crypto/ocf/ep80579/icp_asym.c       |  1334 +
 .../files/crypto/ocf/ep80579/icp_common.c     |   773 +
 .../files/crypto/ocf/ep80579/icp_ocf.h        |   376 +
 .../files/crypto/ocf/ep80579/icp_sym.c        |  1153 +
 .../ocf/ep80579/linux_2.6_kernel_space.mk     |    69 +
 .../generic/files/crypto/ocf/hifn/Makefile    |    13 +
 .../generic/files/crypto/ocf/hifn/hifn7751.c  |  2954 +
 .../files/crypto/ocf/hifn/hifn7751reg.h       |   540 +
 .../files/crypto/ocf/hifn/hifn7751var.h       |   368 +
 .../generic/files/crypto/ocf/hifn/hifnHIPP.c  |   421 +
 .../files/crypto/ocf/hifn/hifnHIPPreg.h       |    46 +
 .../files/crypto/ocf/hifn/hifnHIPPvar.h       |    93 +
 .../generic/files/crypto/ocf/ixp4xx/Makefile  |   104 +
 .../generic/files/crypto/ocf/ixp4xx/ixp4xx.c  |  1339 +
 .../files/crypto/ocf/kirkwood/Makefile        |    19 +
 .../crypto/ocf/kirkwood/cesa/AES/mvAes.h      |    62 +
 .../crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c   |   317 +
 .../crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h   |    19 +
 .../crypto/ocf/kirkwood/cesa/AES/mvAesApi.c   |   312 +
 .../ocf/kirkwood/cesa/AES/mvAesBoxes.dat      |   123 +
 .../files/crypto/ocf/kirkwood/cesa/mvCesa.c   |  3126 +
 .../files/crypto/ocf/kirkwood/cesa/mvCesa.h   |   412 +
 .../crypto/ocf/kirkwood/cesa/mvCesaDebug.c    |   484 +
 .../crypto/ocf/kirkwood/cesa/mvCesaRegs.h     |   357 +
 .../crypto/ocf/kirkwood/cesa/mvCesaTest.c     |  3096 +
 .../crypto/ocf/kirkwood/cesa/mvCompVer.txt    |     4 +
 .../files/crypto/ocf/kirkwood/cesa/mvLru.c    |   158 +
 .../files/crypto/ocf/kirkwood/cesa/mvLru.h    |   112 +
 .../files/crypto/ocf/kirkwood/cesa/mvMD5.c    |   349 +
 .../files/crypto/ocf/kirkwood/cesa/mvMD5.h    |    93 +
 .../files/crypto/ocf/kirkwood/cesa/mvSHA1.c   |   239 +
 .../files/crypto/ocf/kirkwood/cesa/mvSHA1.h   |    88 +
 .../files/crypto/ocf/kirkwood/cesa_ocf_drv.c  |  1302 +
 .../ocf/kirkwood/mvHal/common/mv802_3.h       |   213 +
 .../ocf/kirkwood/mvHal/common/mvCommon.c      |   277 +
 .../ocf/kirkwood/mvHal/common/mvCommon.h      |   308 +
 .../ocf/kirkwood/mvHal/common/mvCompVer.txt   |     4 +
 .../ocf/kirkwood/mvHal/common/mvDebug.c       |   326 +
 .../ocf/kirkwood/mvHal/common/mvDebug.h       |   178 +
 .../ocf/kirkwood/mvHal/common/mvDeviceId.h    |   225 +
 .../ocf/kirkwood/mvHal/common/mvHalVer.h      |    73 +
 .../ocf/kirkwood/mvHal/common/mvStack.c       |   100 +
 .../ocf/kirkwood/mvHal/common/mvStack.h       |   140 +
 .../ocf/kirkwood/mvHal/common/mvTypes.h       |   245 +
 .../crypto/ocf/kirkwood/mvHal/dbg-trace.c     |   110 +
 .../crypto/ocf/kirkwood/mvHal/dbg-trace.h     |    24 +
 .../mvHal/kw_family/boardEnv/mvBoardEnvLib.c  |  2513 +
 .../mvHal/kw_family/boardEnv/mvBoardEnvLib.h  |   376 +
 .../mvHal/kw_family/boardEnv/mvBoardEnvSpec.c |   848 +
 .../mvHal/kw_family/boardEnv/mvBoardEnvSpec.h |   262 +
 .../ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c  |   320 +
 .../ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h  |    99 +
 .../kw_family/ctrlEnv/mvCtrlEnvAddrDec.c      |   296 +
 .../kw_family/ctrlEnv/mvCtrlEnvAddrDec.h      |   203 +
 .../mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h    |    98 +
 .../mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c    |  1825 +
 .../mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h    |   185 +
 .../mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h   |   419 +
 .../mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h   |   257 +
 .../mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c |  1048 +
 .../mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h |   130 +
 .../kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h   |   143 +
 .../mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c     |  1036 +
 .../mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h     |   120 +
 .../mvHal/kw_family/ctrlEnv/sys/mvCpuIfInit.S |   163 +
 .../mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h |   304 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c  |   324 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h  |   123 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c   |   382 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h   |   100 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysDram.c   |   348 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysDram.h   |    80 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c    |   658 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h    |   113 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysPex.c    |  1697 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysPex.h    |   348 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysSata.c   |   430 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysSata.h   |   128 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c  |   427 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h  |   125 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c    |   462 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h    |   106 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysTs.c     |   591 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysTs.h     |   110 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c    |   497 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h    |   125 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysXor.c    |   662 +
 .../mvHal/kw_family/ctrlEnv/sys/mvSysXor.h    |   140 +
 .../mvHal/kw_family/device/mvDevice.c         |    75 +
 .../mvHal/kw_family/device/mvDevice.h         |    74 +
 .../mvHal/kw_family/device/mvDeviceRegs.h     |   101 +
 .../kirkwood/mvHal/kw_family/mvCompVer.txt    |     4 +
 .../ocf/kirkwood/mvHal/linux_oss/mvOs.c       |   211 +
 .../ocf/kirkwood/mvHal/linux_oss/mvOs.h       |   423 +
 .../ocf/kirkwood/mvHal/linux_oss/mvOsSata.h   |   158 +
 .../crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h |   375 +
 .../ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c |   376 +
 .../ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h |   121 +
 .../kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h |   121 +
 .../kirkwood/mvHal/mv_hal/cntmr/mvCompVer.txt |     4 +
 .../kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c    |   207 +
 .../kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h    |   213 +
 .../kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c  |   143 +
 .../kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h  |   151 +
 .../mvHal/mv_hal/ddr1_2/mvCompVer.txt         |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c |  1479 +
 .../ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h |   191 +
 .../kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c   |  1599 +
 .../kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h   |   179 +
 .../mvHal/mv_hal/ddr1_2/mvDramIfBasicInit.S   |   988 +
 .../mvHal/mv_hal/ddr1_2/mvDramIfConfig.S      |   668 +
 .../mvHal/mv_hal/ddr1_2/mvDramIfConfig.h      |   192 +
 .../mvHal/mv_hal/ddr1_2/mvDramIfRegs.h        |   306 +
 .../kirkwood/mvHal/mv_hal/ddr2/mvCompVer.txt  |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c |  1855 +
 .../ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h |   172 +
 .../mvHal/mv_hal/ddr2/mvDramIfBasicInit.S     |   986 +
 .../mvHal/mv_hal/ddr2/mvDramIfConfig.S        |   528 +
 .../mvHal/mv_hal/ddr2/mvDramIfConfig.h        |   157 +
 .../kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h |   423 +
 .../mvHal/mv_hal/ddr2/mvDramIfStaticInit.h    |   179 +
 .../kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c    |  1474 +
 .../kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h    |   192 +
 .../ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c |  2952 +
 .../mvHal/mv_hal/eth/gbe/mvEthDebug.c         |   748 +
 .../mvHal/mv_hal/eth/gbe/mvEthDebug.h         |   146 +
 .../kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h  |   751 +
 .../kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h |   700 +
 .../kirkwood/mvHal/mv_hal/eth/mvCompVer.txt   |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h     |   356 +
 .../kirkwood/mvHal/mv_hal/gpp/mvCompVer.txt   |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c     |   362 +
 .../ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h     |   118 +
 .../ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h |   116 +
 .../mvHal/mv_hal/pci-if/mvCompVer.txt         |     4 +
 .../kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c    |   669 +
 .../kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h    |   134 +
 .../mvHal/mv_hal/pci-if/mvPciIfRegs.h         |   245 +
 .../mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c |  1006 +
 .../mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h |   323 +
 .../kirkwood/mvHal/mv_hal/pci/mvCompVer.txt   |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c     |  1047 +
 .../ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h     |   185 +
 .../ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h |   411 +
 .../kirkwood/mvHal/mv_hal/pex/mvCompVer.txt   |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c     |  1143 +
 .../ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h     |   168 +
 .../ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h |   751 +
 .../kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c   |   313 +
 .../kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h   |    82 +
 .../mvHal/mv_hal/sflash/mvCompVer.txt         |     4 +
 .../kirkwood/mvHal/mv_hal/sflash/mvSFlash.c   |  1522 +
 .../kirkwood/mvHal/mv_hal/sflash/mvSFlash.h   |   166 +
 .../mvHal/mv_hal/sflash/mvSFlashSpec.h        |   233 +
 .../kirkwood/mvHal/mv_hal/spi/mvCompVer.txt   |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c     |   576 +
 .../ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h     |    94 +
 .../ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c |   249 +
 .../ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h |    82 +
 .../ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h |    98 +
 .../kirkwood/mvHal/mv_hal/twsi/mvCompVer.txt  |     4 +
 .../ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c   |  1023 +
 .../ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h   |   121 +
 .../kirkwood/mvHal/mv_hal/twsi/mvTwsiEeprom.S |   457 +
 .../kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h   |   160 +
 .../generic/files/crypto/ocf/ocf-bench.c      |   514 +
 .../generic/files/crypto/ocf/ocf-compat.h     |   378 +
 .../generic/files/crypto/ocf/ocfnull/Makefile |    12 +
 .../files/crypto/ocf/ocfnull/ocfnull.c        |   204 +
 .../generic/files/crypto/ocf/pasemi/Makefile  |    12 +
 .../generic/files/crypto/ocf/pasemi/pasemi.c  |  1007 +
 .../files/crypto/ocf/pasemi/pasemi_fnu.h      |   410 +
 .../linux/generic/files/crypto/ocf/random.c   |   317 +
 .../linux/generic/files/crypto/ocf/rndtest.c  |   300 +
 .../linux/generic/files/crypto/ocf/rndtest.h  |    54 +
 .../generic/files/crypto/ocf/safe/Makefile    |    12 +
 .../generic/files/crypto/ocf/safe/hmachack.h  |    37 +
 .../linux/generic/files/crypto/ocf/safe/md5.c |   308 +
 .../linux/generic/files/crypto/ocf/safe/md5.h |    76 +
 .../generic/files/crypto/ocf/safe/safe.c      |  2230 +
 .../generic/files/crypto/ocf/safe/safereg.h   |   421 +
 .../generic/files/crypto/ocf/safe/safevar.h   |   229 +
 .../generic/files/crypto/ocf/safe/sha1.c      |   279 +
 .../generic/files/crypto/ocf/safe/sha1.h      |    72 +
 .../generic/files/crypto/ocf/talitos/Makefile |    12 +
 .../files/crypto/ocf/talitos/talitos.c        |  1355 +
 .../files/crypto/ocf/talitos/talitos_dev.h    |   277 +
 .../files/crypto/ocf/talitos/talitos_soft.h   |    76 +
 .../files/crypto/ocf/ubsec_ssb/Makefile       |    12 +
 .../files/crypto/ocf/ubsec_ssb/bsdqueue.h     |   527 +
 .../files/crypto/ocf/ubsec_ssb/ubsec_ssb.c    |  2220 +
 .../files/crypto/ocf/ubsec_ssb/ubsecreg.h     |   233 +
 .../files/crypto/ocf/ubsec_ssb/ubsecvar.h     |   228 +
 .../linux/generic/files/crypto/ocf/uio.h      |    54 +
 .../files/drivers/leds/ledtrig-morse.c        |   366 +
 .../files/drivers/leds/ledtrig-netdev.c       |   438 +
 .../files/drivers/leds/ledtrig-usbdev.c       |   348 +
 .../generic/files/drivers/mtd/mtdsplit.c      |   116 +
 .../generic/files/drivers/mtd/mtdsplit.h      |    55 +
 .../files/drivers/mtd/mtdsplit/Kconfig        |    24 +
 .../generic/files/drivers/mtd/mtdsplit_lzma.c |    96 +
 .../files/drivers/mtd/mtdsplit_seama.c        |   103 +
 .../files/drivers/mtd/mtdsplit_squashfs.c     |    72 +
 .../files/drivers/mtd/mtdsplit_uimage.c       |   287 +
 .../generic/files/drivers/mtd/myloader.c      |   182 +
 .../generic/files/drivers/net/phy/adm6996.c   |  1204 +
 .../generic/files/drivers/net/phy/adm6996.h   |   186 +
 .../generic/files/drivers/net/phy/ar8216.c    |  3101 +
 .../generic/files/drivers/net/phy/ar8216.h    |   488 +
 .../generic/files/drivers/net/phy/b53/Kconfig |    37 +
 .../files/drivers/net/phy/b53/Makefile        |    10 +
 .../files/drivers/net/phy/b53/b53_common.c    |  1428 +
 .../files/drivers/net/phy/b53/b53_mdio.c      |   425 +
 .../files/drivers/net/phy/b53/b53_mmap.c      |   240 +
 .../files/drivers/net/phy/b53/b53_phy_fixup.c |    55 +
 .../files/drivers/net/phy/b53/b53_priv.h      |   324 +
 .../files/drivers/net/phy/b53/b53_regs.h      |   313 +
 .../files/drivers/net/phy/b53/b53_spi.c       |   327 +
 .../files/drivers/net/phy/b53/b53_srab.c      |   379 +
 .../generic/files/drivers/net/phy/ip17xx.c    |  1410 +
 .../generic/files/drivers/net/phy/micrel.c    |    83 +
 .../generic/files/drivers/net/phy/mvsw6171.c  |   866 +
 .../generic/files/drivers/net/phy/mvsw6171.h  |   230 +
 .../generic/files/drivers/net/phy/mvswitch.c  |   433 +
 .../generic/files/drivers/net/phy/mvswitch.h  |   145 +
 .../generic/files/drivers/net/phy/psb6970.c   |   438 +
 .../generic/files/drivers/net/phy/rtl8306.c   |  1060 +
 .../files/drivers/net/phy/rtl8366_smi.c       |  1449 +
 .../files/drivers/net/phy/rtl8366_smi.h       |   152 +
 .../generic/files/drivers/net/phy/rtl8366rb.c |  1496 +
 .../generic/files/drivers/net/phy/rtl8366s.c  |  1148 +
 .../generic/files/drivers/net/phy/rtl8367.c   |  1835 +
 .../generic/files/drivers/net/phy/rtl8367b.c  |  1602 +
 .../generic/files/drivers/net/phy/swconfig.c  |  1148 +
 .../files/drivers/net/phy/swconfig_leds.c     |   354 +
 .../linux/generic/files/fs/yaffs2/Kconfig     |   171 +
 .../linux/generic/files/fs/yaffs2/Makefile    |    18 +
 .../generic/files/fs/yaffs2/NOTE.openwrt      |     4 +
 .../generic/files/fs/yaffs2/yaffs_allocator.c |   357 +
 .../generic/files/fs/yaffs2/yaffs_allocator.h |    30 +
 .../generic/files/fs/yaffs2/yaffs_attribs.c   |   124 +
 .../generic/files/fs/yaffs2/yaffs_attribs.h   |    28 +
 .../generic/files/fs/yaffs2/yaffs_bitmap.c    |    97 +
 .../generic/files/fs/yaffs2/yaffs_bitmap.h    |    33 +
 .../generic/files/fs/yaffs2/yaffs_checkptrw.c |   474 +
 .../generic/files/fs/yaffs2/yaffs_checkptrw.h |    33 +
 .../linux/generic/files/fs/yaffs2/yaffs_ecc.c |   281 +
 .../linux/generic/files/fs/yaffs2/yaffs_ecc.h |    44 +
 .../files/fs/yaffs2/yaffs_getblockinfo.h      |    35 +
 .../generic/files/fs/yaffs2/yaffs_guts.c      |  5082 ++
 .../generic/files/fs/yaffs2/yaffs_guts.h      |  1003 +
 .../generic/files/fs/yaffs2/yaffs_linux.h     |    48 +
 .../generic/files/fs/yaffs2/yaffs_mtdif.c     |   308 +
 .../generic/files/fs/yaffs2/yaffs_mtdif.h     |    25 +
 .../generic/files/fs/yaffs2/yaffs_nameval.c   |   208 +
 .../generic/files/fs/yaffs2/yaffs_nameval.h   |    28 +
 .../generic/files/fs/yaffs2/yaffs_nand.c      |   122 +
 .../generic/files/fs/yaffs2/yaffs_nand.h      |    39 +
 .../files/fs/yaffs2/yaffs_packedtags1.c       |    56 +
 .../files/fs/yaffs2/yaffs_packedtags1.h       |    39 +
 .../files/fs/yaffs2/yaffs_packedtags2.c       |   197 +
 .../files/fs/yaffs2/yaffs_packedtags2.h       |    47 +
 .../generic/files/fs/yaffs2/yaffs_summary.c   |   313 +
 .../generic/files/fs/yaffs2/yaffs_summary.h   |    37 +
 .../files/fs/yaffs2/yaffs_tagscompat.c        |   381 +
 .../files/fs/yaffs2/yaffs_tagscompat.h        |    44 +
 .../files/fs/yaffs2/yaffs_tagsmarshall.c      |   199 +
 .../files/fs/yaffs2/yaffs_tagsmarshall.h      |    22 +
 .../generic/files/fs/yaffs2/yaffs_trace.h     |    57 +
 .../generic/files/fs/yaffs2/yaffs_verify.c    |   529 +
 .../generic/files/fs/yaffs2/yaffs_verify.h    |    43 +
 .../linux/generic/files/fs/yaffs2/yaffs_vfs.c |  3462 ++
 .../generic/files/fs/yaffs2/yaffs_yaffs1.c    |   422 +
 .../generic/files/fs/yaffs2/yaffs_yaffs1.h    |    22 +
 .../generic/files/fs/yaffs2/yaffs_yaffs2.c    |  1532 +
 .../generic/files/fs/yaffs2/yaffs_yaffs2.h    |    39 +
 .../linux/generic/files/fs/yaffs2/yportenv.h  |    85 +
 .../files/include/linux/ar8216_platform.h     |   131 +
 .../files/include/linux/ath5k_platform.h      |    30 +
 .../files/include/linux/ath9k_platform.h      |    49 +
 .../generic/files/include/linux/myloader.h    |   121 +
 .../linux/platform_data/adm6996-gpio.h        |    30 +
 .../files/include/linux/platform_data/b53.h   |    36 +
 .../linux/platform_data/brcmfmac-sdio.h       |   124 +
 .../generic/files/include/linux/routerboot.h  |   106 +
 .../files/include/linux/rt2x00_platform.h     |    24 +
 .../generic/files/include/linux/rtl8366.h     |    40 +
 .../generic/files/include/linux/rtl8367.h     |    60 +
 .../generic/files/include/linux/switch.h      |   167 +
 .../generic/files/include/uapi/linux/switch.h |   103 +
 trunk/target/linux/generic/image/Makefile     |    12 +
 .../generic/image/initramfs-base-files.txt    |     9 +
 .../linux/generic/image/lzma-loader/Makefile  |    46 +
 .../image/lzma-loader/src/LzmaDecode.c        |   590 +
 .../image/lzma-loader/src/LzmaDecode.h        |   131 +
 .../generic/image/lzma-loader/src/Makefile    |    68 +
 .../image/lzma-loader/src/decompress.c        |   157 +
 .../image/lzma-loader/src/lzma-copy.lds.in    |    20 +
 .../generic/image/lzma-loader/src/lzma.lds.in |    24 +
 .../generic/image/lzma-loader/src/print.c     |   324 +
 .../generic/image/lzma-loader/src/print.h     |    36 +
 .../generic/image/lzma-loader/src/printf.c    |    35 +
 .../generic/image/lzma-loader/src/printf.h    |    18 +
 .../generic/image/lzma-loader/src/start.S     |   160 +
 .../generic/image/lzma-loader/src/uart16550.c |    86 +
 .../generic/image/lzma-loader/src/uart16550.h |    47 +
 ...late_load_store_microMIPS-as-a-stati.patch |    32 +
 ...u_has_mmips-if-SYS_SUPPORTS_MICROMIP.patch |    45 +
 ...of-pci-Add-of_pci_get_devfn-function.patch |    78 +
 ...hso-Earlier-catch-of-error-condition.patch |    42 +
 ...ack-corruption-on-some-architectures.patch |    50 +
 ...pport-for-PMC-SPI-Flash-chips-in-m25.patch |    94 +
 ...m25p80_add_support_for_esmt_f25l32pa.patch |    37 +
 .../generic/patches-3.10/020-ssb_update.patch |   981 +
 .../patches-3.10/025-bcma_backport.patch      |  2716 +
 ...O-block-driver-on-top-of-UBI-volumes.patch |   829 +
 ...041-UBI-block-do-not-use-term-attach.patch |   185 +
 ...-Mark-init-only-symbol-as-__initdata.patch |    37 +
 ...lock-Use-u64-for-the-64-bit-dividend.patch |    28 +
 .../044-UBI-rename-block-device-ioctls.patch  |    83 +
 ...e-__initdata-from-ubiblock_param_ops.patch |    30 +
 ...I-avoid-workqueue-format-string-leak.patch |    25 +
 ...VOLCRBLK-take-a-parameter-for-future.patch |    58 +
 .../patches-3.10/060-hso_devices.patch        |    36 +
 .../061-arm_xz_decompressor_build_fix.patch   |    10 +
 .../patches-3.10/063-arm-fix-fiq-vivt.patch   |    50 +
 .../065-iio_ad799x_backport_fixes.patch       |   157 +
 .../070-net_bridge_backports.patch            |   973 +
 .../generic/patches-3.10/100-overlayfs.patch  |  3232 +
 .../patches-3.10/102-ehci_hcd_ignore_oc.patch |    81 +
 ...ge_allow_receiption_on_disabled_port.patch |    54 +
 .../130-mips_remove_plat_dma_functions.patch  |   184 +
 .../131-improve_noncoherent_dma_checks.patch  |    91 +
 .../132-mips_inline_dma_ops.patch             |   662 +
 .../140-revert_usb_unbind_interfaces.patch    |   206 +
 .../patches-3.10/200-fix_localversion.patch   |    11 +
 .../patches-3.10/201-extra_optimization.patch |    14 +
 .../patches-3.10/202-reduce_module_size.patch |    11 +
 .../203-kallsyms_uncompressed.patch           |   108 +
 .../patches-3.10/204-module_strip.patch       |   200 +
 .../210-darwin_scripts_include.patch          |  3088 +
 .../212-byteshift_portability.patch           |    53 +
 .../patches-3.10/220-gc_sections.patch        |   545 +
 .../patches-3.10/221-module_exports.patch     |    88 +
 .../230-openwrt_lzma_options.patch            |    54 +
 .../patches-3.10/250-netfilter_depends.patch  |    18 +
 .../patches-3.10/251-sound_kconfig.patch      |    18 +
 .../patches-3.10/252-mv_cesa_depends.patch    |    10 +
 .../patches-3.10/253-ssb_b43_default_on.patch |    29 +
 .../254-textsearch_kconfig_hacks.patch        |    23 +
 .../255-lib80211_kconfig_hacks.patch          |    31 +
 .../256-crypto_add_kconfig_prompts.patch      |    47 +
 .../257-wireless_ext_kconfig_hack.patch       |    22 +
 .../258-netfilter_netlink_kconfig_hack.patch  |    11 +
 .../patches-3.10/259-regmap_dynamic.patch     |    72 +
 .../260-crypto_test_dependencies.patch        |    37 +
 .../262-compressor_kconfig_hack.patch         |    23 +
 .../300-mips_expose_boot_raw.patch            |    39 +
 .../301-mips_image_cmdline_hack.patch         |    28 +
 .../302-mips_no_branch_likely.patch           |    11 +
 .../patches-3.10/304-mips_disable_fpu.patch   |   160 +
 .../patches-3.10/305-mips_module_reloc.patch  |   352 +
 .../306-mips_mem_functions_performance.patch  |    83 +
 .../307-mips-Reimplement-get_cycles.patch     |    69 +
 .../309-mips_fuse_workaround.patch            |    32 +
 .../310-arm_module_unresolved_weak_sym.patch  |    13 +
 .../320-ppc4xx_optimization.patch             |    31 +
 .../321-powerpc_crtsavres_prereq.patch        |    10 +
 .../322-ppc4xx-crypto-compile-fix.patch       |    10 +
 .../400-mtd-add-rootfs-split-support.patch    |   285 +
 ...for-different-partition-parser-types.patch |   113 +
 ...arsers-for-rootfs-and-firmware-split.patch |    75 +
 .../403-mtd-hook-mtdsplit-to-Kbuild.patch     |    25 +
 ...td_get_squashfs_len-in-split_squasfh.patch |    69 +
 .../405-mtd-add-more-helper-functions.patch   |    83 +
 .../406-mtd-add-squashfs-parser.patch         |    30 +
 ...mtd-hook-mtdsplit_uimage-into-Kbuild.patch |    25 +
 ...-mtd-hook-mtdsplit_seama-into-Kbuild.patch |    23 +
 ...9-mtd-hook-mtdsplit_lzma-into-Kbuild.patch |    23 +
 ...rward-declaration-of-struct-mtd_info.patch |    18 +
 .../411-mtd-partial_eraseblock_write.patch    |   146 +
 .../412-mtd-partial_eraseblock_unlock.patch   |    18 +
 .../patches-3.10/420-mtd-redboot_space.patch  |    30 +
 ...30-mtd-add-myloader-partition-parser.patch |    35 +
 .../patches-3.10/440-block2mtd_init.patch     |   106 +
 .../patches-3.10/441-block2mtd_probe.patch    |   108 +
 ...-to-use-platform-specific-chip-fixup.patch |    37 +
 ...n-code-of-nand_correct_data-function.patch |    11 +
 ...mtd-cfi_cmdset_0002-no-erase_suspend.patch |    11 +
 ...et_0002-add-buffer-write-cmd-timeout.patch |    18 +
 ...-allow-to-disable-small-sector-erase.patch |    41 +
 ...add-support-for-Winbond-W25X05-flash.patch |    20 +
 ...-add-support-for-EON-EN25QH128-flash.patch |    20 +
 .../480-mtd-set-rootfs-to-be-root-dev.patch   |    26 +
 .../490-mtd-ubi-add-EOF-marker-support.patch  |    51 +
 ...mtd-device-named-ubi-or-data-on-boot.patch |    75 +
 ...to-create-ubiblock-device-for-rootfs.patch |    69 +
 ...ting-ubi0-rootfs-in-init-do_mounts.c.patch |    53 +
 ...ROOT_DEV-to-ubiblock-rootfs-if-unset.patch |    37 +
 .../500-yaffs-Kbuild-integration.patch        |    18 +
 ...ffs-3.5-convert-to-use-kuid_t-kgid_t.patch |   155 +
 .../502-yaffs-3.10-disable-proc-entry.patch   |    44 +
 ...3-yaffs-add-tags-9bytes-mount-option.patch |   115 +
 .../504-yaffs-fix-compat-tags-handling.patch  |   239 +
 .../520-squashfs_update_xz_comp_opts.patch    |    25 +
 .../530-jffs2_make_lzma_available.patch       |  5142 ++
 .../patches-3.10/531-debloat_lzma.patch       |  1021 +
 .../patches-3.10/532-jffs2_eofdetect.patch    |    56 +
 .../540-crypto-xz-decompression-support.patch |   146 +
 .../541-ubifs-xz-decompression-support.patch  |    92 +
 .../550-ubifs-symlink-xattr-support.patch     |    65 +
 ...fs-fix-default-compression-selection.patch |    29 +
 .../552-ubifs-respect-silent-mount-flag.patch |   122 +
 .../600-netfilter_layer7_2.22.patch           |  2141 +
 .../601-netfilter_layer7_pktmatch.patch       |   108 +
 .../602-netfilter_layer7_match.patch          |    51 +
 .../603-netfilter_layer7_2.6.36_fix.patch     |    61 +
 .../604-netfilter_conntrack_flush.patch       |    86 +
 ...etfilter_match_bypass_default_checks.patch |    93 +
 ...netfilter_match_bypass_default_table.patch |    83 +
 ...netfilter_match_reduce_memory_access.patch |    16 +
 ...-netfilter_optional_tcp_window_check.patch |    36 +
 .../614-netfilter_arpt_arp_padding_fix.patch  |    16 +
 .../615-netfilter_add_xt_id_match.patch       |    95 +
 .../616-net_optimize_xfrm_calls.patch         |    12 +
 .../617-netfilter_skip_filter_sysctl.patch    |    87 +
 .../generic/patches-3.10/620-sched_esfq.patch |   791 +
 .../patches-3.10/621-sched_act_connmark.patch |   183 +
 .../patches-3.10/630-packet_socket_type.patch |   134 +
 .../640-bridge_no_eap_forward.patch           |    15 +
 .../641-bridge_always_accept_eap.patch        |    11 +
 .../642-bridge_port_isolate.patch             |   104 +
 .../643-bridge_remove_ipv6_dependency.patch   |   107 +
 .../644-bridge_optimize_netfilter_hooks.patch |   155 +
 .../645-bridge_multicast_to_unicast.patch     |   375 +
 .../patches-3.10/650-pppoe_header_pad.patch   |    20 +
 .../651-wireless_mesh_header.patch            |    11 +
 .../patches-3.10/652-atm_header_changes.patch |    12 +
 .../653-disable_netlink_trim.patch            |    30 +
 .../patches-3.10/655-increase_skb_pad.patch   |    11 +
 .../656-skb_reduce_truesize-helper.patch      |    41 +
 .../657-qdisc_reduce_truesize.patch           |    63 +
 .../patches-3.10/660-fq_codel_defaults.patch  |    14 +
 .../661-fq_codel_keep_dropped_stats.patch     |    10 +
 .../662-use_fq_codel_by_default.patch         |    75 +
 .../patches-3.10/663-remove_pfifo_fast.patch  |   144 +
 ...Add-support-for-MAP-E-FMRs-mesh-mode.patch |   481 +
 ...ng-with-source-address-failed-policy.patch |   233 +
 ...86-flow_dissector-clean-up-IPIP-case.patch |    25 +
 ...ssector-add-support-for-IPPROTO_IPV6.patch |    25 +
 ...t-flow_dissector-add-802.1ad-support.patch |    24 +
 .../generic/patches-3.10/700-swconfig.patch   |    39 +
 .../patches-3.10/701-phy_extension.patch      |    63 +
 .../702-phy_add_aneg_done_function.patch      |    45 +
 ...detach-callback-to-struct-phy_driver.patch |    27 +
 ...710-phy-add-mdio_register_board_info.patch |   191 +
 .../patches-3.10/720-phy_adm6996.patch        |    26 +
 .../patches-3.10/721-phy_packets.patch        |   175 +
 .../patches-3.10/722-phy_mvswitch.patch       |    23 +
 .../generic/patches-3.10/723-phy_ip175c.patch |    23 +
 .../generic/patches-3.10/724-phy_ar8216.patch |    24 +
 .../patches-3.10/725-phy_rtl8306.patch        |    23 +
 .../patches-3.10/726-phy_rtl8366.patch        |    45 +
 .../patches-3.10/727-phy-rtl8367.patch        |    23 +
 .../generic/patches-3.10/728-phy-micrel.patch |    24 +
 .../patches-3.10/729-phy-rtl8367b.patch       |    23 +
 .../generic/patches-3.10/729-phy-tantos.patch |    21 +
 .../generic/patches-3.10/730-phy_b53.patch    |    21 +
 .../731-phy_mvswitch_3.10_compilation.patch   |    35 +
 .../732-phy-ar8216-led-support.patch          |    13 +
 .../patches-3.10/750-hostap_txpower.patch     |   154 +
 .../patches-3.10/770-bgmac-backport.patch     |  1101 +
 .../773-bgmac-add-srab-switch.patch           |    72 +
 ...bgmac-check-length-of-received-frame.patch |    39 +
 .../810-pci_disable_common_quirks.patch       |    51 +
 .../811-pci_disable_usb_common_quirks.patch   |    80 +
 .../820-usb_add_usb_find_device_by_name.patch |    84 +
 .../patches-3.10/830-ledtrig_morse.patch      |    28 +
 .../patches-3.10/831-ledtrig_netdev.patch     |    51 +
 .../patches-3.10/832-ledtrig_usbdev.patch     |    31 +
 .../generic/patches-3.10/840-rtc7301.patch    |   250 +
 .../patches-3.10/841-rtc_pt7c4338.patch       |   247 +
 .../861-04_spi_gpio_implement_spi_delay.patch |    58 +
 .../patches-3.10/862-gpio_spi_driver.patch    |   373 +
 .../generic/patches-3.10/863-gpiommc.patch    |   844 +
 .../864-gpiommc_configfs_locking.patch        |    58 +
 .../patches-3.10/870-hifn795x_byteswap.patch  |    17 +
 .../880-gateworks_system_controller.patch     |   339 +
 .../890-8250_optional_sysrq.patch             |    24 +
 .../patches-3.10/900-slab_maxsize.patch       |    13 +
 .../patches-3.10/901-debloat_sock_diag.patch  |    45 +
 .../patches-3.10/902-debloat_proc.patch       |   341 +
 .../patches-3.10/903-debloat_direct_io.patch  |    84 +
 .../patches-3.10/910-kobject_uevent.patch     |    21 +
 .../911-kobject_add_broadcast_uevent.patch    |    65 +
 .../921-use_preinit_as_init.patch             |    12 +
 ...ays-create-console-node-in-initramfs.patch |    30 +
 .../generic/patches-3.10/930-crashlog.patch   |   276 +
 .../940-ocf_kbuild_integration.patch          |    20 +
 .../patches-3.10/941-ocf_20120127.patch       |   166 +
 .../960-decompress_unlzo_fix.patch            |    23 +
 ...e-filenames-from-deps_initramfs-list.patch |    28 +
 .../980-arm_openwrt_machtypes.patch           |    32 +
 .../generic/patches-3.10/990-gpio_wdt.patch   |   360 +
 ...ore_wdt_fix_watchdog_counter_loading.patch |    75 +
 ...re_wdt_fix_wdioc_setoptions_handling.patch |    29 +
 .../994-mpcore_wdt_fix_timer_mode_setup.patch |    57 +
 ...995-mpcore_twd_calibrate_single_core.patch |    23 +
 .../996-zsmalloc_allow_module_build.patch     |     9 +
 .../997-device_tree_cmdline.patch             |    12 +
 .../000-keep_initrafs_the_default.patch       |    25 +
 .../generic/patches-3.13/020-ssb_update.patch |   686 +
 .../patches-3.13/025-bcma_backport.patch      |   870 +
 .../patches-3.13/060-hso_devices.patch        |    36 +
 .../061-arm_xz_decompressor_build_fix.patch   |    10 +
 .../062-mips_decompressor_build_fix.patch     |    66 +
 .../065-iio_ad799x_backport_fixes.patch       |   138 +
 .../generic/patches-3.13/100-overlayfs.patch  |  3231 +
 .../patches-3.13/102-ehci_hcd_ignore_oc.patch |    81 +
 ...ge_allow_receiption_on_disabled_port.patch |    54 +
 .../131-improve_noncoherent_dma_checks.patch  |    91 +
 .../132-mips_inline_dma_ops.patch             |   687 +
 .../patches-3.13/200-fix_localversion.patch   |    11 +
 .../patches-3.13/201-extra_optimization.patch |    14 +
 .../patches-3.13/202-reduce_module_size.patch |    11 +
 .../203-kallsyms_uncompressed.patch           |   108 +
 .../patches-3.13/204-module_strip.patch       |   200 +
 .../210-darwin_scripts_include.patch          |  3088 +
 .../212-byteshift_portability.patch           |    51 +
 .../patches-3.13/220-gc_sections.patch        |   531 +
 .../patches-3.13/221-module_exports.patch     |    88 +
 .../230-openwrt_lzma_options.patch            |    58 +
 .../patches-3.13/250-netfilter_depends.patch  |    18 +
 .../patches-3.13/251-sound_kconfig.patch      |    18 +
 .../patches-3.13/252-mv_cesa_depends.patch    |    10 +
 .../patches-3.13/253-ssb_b43_default_on.patch |    29 +
 .../254-textsearch_kconfig_hacks.patch        |    23 +
 .../255-lib80211_kconfig_hacks.patch          |    31 +
 .../256-crypto_add_kconfig_prompts.patch      |    47 +
 .../257-wireless_ext_kconfig_hack.patch       |    22 +
 .../258-netfilter_netlink_kconfig_hack.patch  |    11 +
 .../patches-3.13/259-regmap_dynamic.patch     |    76 +
 .../260-crypto_test_dependencies.patch        |    37 +
 .../patches-3.13/261-move_bcm963xx_tag.patch  |   219 +
 .../262-compressor_kconfig_hack.patch         |    23 +
 .../300-mips_expose_boot_raw.patch            |    39 +
 .../301-mips_image_cmdline_hack.patch         |    28 +
 .../302-mips_no_branch_likely.patch           |    11 +
 .../patches-3.13/304-mips_disable_fpu.patch   |   160 +
 .../patches-3.13/305-mips_module_reloc.patch  |   352 +
 .../306-mips_mem_functions_performance.patch  |    83 +
 .../309-mips_fuse_workaround.patch            |    32 +
 .../310-arm_module_unresolved_weak_sym.patch  |    13 +
 .../320-ppc4xx_optimization.patch             |    31 +
 .../321-powerpc_crtsavres_prereq.patch        |    10 +
 .../400-mtd-add-rootfs-split-support.patch    |   285 +
 ...for-different-partition-parser-types.patch |   113 +
 ...arsers-for-rootfs-and-firmware-split.patch |    75 +
 .../403-mtd-hook-mtdsplit-to-Kbuild.patch     |    25 +
 ...td_get_squashfs_len-in-split_squasfh.patch |    69 +
 .../405-mtd-add-more-helper-functions.patch   |    83 +
 .../406-mtd-add-squashfs-parser.patch         |    30 +
 ...mtd-hook-mtdsplit_uimage-into-Kbuild.patch |    25 +
 ...-mtd-hook-mtdsplit_seama-into-Kbuild.patch |    23 +
 ...9-mtd-hook-mtdsplit_lzma-into-Kbuild.patch |    23 +
 ...rward-declaration-of-struct-mtd_info.patch |    18 +
 .../411-mtd-partial_eraseblock_write.patch    |   146 +
 .../412-mtd-partial_eraseblock_unlock.patch   |    18 +
 .../patches-3.13/420-mtd-redboot_space.patch  |    30 +
 ...30-mtd-add-myloader-partition-parser.patch |    35 +
 .../patches-3.13/440-block2mtd_init.patch     |   107 +
 .../patches-3.13/441-block2mtd_probe.patch    |   108 +
 ...-to-use-platform-specific-chip-fixup.patch |    37 +
 ...n-code-of-nand_correct_data-function.patch |    11 +
 ...mtd-cfi_cmdset_0002-no-erase_suspend.patch |    11 +
 ...et_0002-add-buffer-write-cmd-timeout.patch |    18 +
 ...-allow-to-disable-small-sector-erase.patch |    41 +
 ...add-support-for-Winbond-W25X05-flash.patch |    20 +
 ...-add-support-for-EON-EN25QH128-flash.patch |    20 +
 .../480-mtd-set-rootfs-to-be-root-dev.patch   |    26 +
 .../500-yaffs-Kbuild-integration.patch        |    18 +
 ...ffs-3.5-convert-to-use-kuid_t-kgid_t.patch |   155 +
 .../502-yaffs-3.10-disable-proc-entry.patch   |    44 +
 ...affs-3.12-convert-readdir-to-iterate.patch |   129 +
 ...3-yaffs-add-tags-9bytes-mount-option.patch |   115 +
 .../504-yaffs-fix-compat-tags-handling.patch  |   239 +
 .../520-squashfs_update_xz_comp_opts.patch    |    25 +
 .../530-jffs2_make_lzma_available.patch       |  5142 ++
 .../patches-3.13/531-debloat_lzma.patch       |  1024 +
 .../patches-3.13/532-jffs2_eofdetect.patch    |    56 +
 .../540-crypto-xz-decompression-support.patch |   146 +
 .../541-ubifs-xz-decompression-support.patch  |    92 +
 .../550-ubifs-symlink-xattr-support.patch     |    65 +
 ...fs-fix-default-compression-selection.patch |    29 +
 .../555-gluebi-sysfs-support.patch            |    86 +
 .../600-netfilter_layer7_2.22.patch           |  2141 +
 .../601-netfilter_layer7_pktmatch.patch       |   108 +
 .../602-netfilter_layer7_match.patch          |    51 +
 .../603-netfilter_layer7_2.6.36_fix.patch     |    61 +
 .../604-netfilter_conntrack_flush.patch       |    86 +
 ...etfilter_match_bypass_default_checks.patch |    93 +
 ...netfilter_match_bypass_default_table.patch |    83 +
 ...netfilter_match_reduce_memory_access.patch |    16 +
 ...-netfilter_optional_tcp_window_check.patch |    36 +
 .../615-netfilter_add_xt_id_match.patch       |    95 +
 .../generic/patches-3.13/620-sched_esfq.patch |   791 +
 .../patches-3.13/621-sched_act_connmark.patch |   183 +
 .../patches-3.13/630-packet_socket_type.patch |   134 +
 .../640-bridge_no_eap_forward.patch           |    15 +
 .../641-bridge_always_accept_eap.patch        |    11 +
 .../642-bridge_port_isolate.patch             |   102 +
 .../643-bridge_remove_ipv6_dependency.patch   |   107 +
 .../644-bridge_optimize_netfilter_hooks.patch |   155 +
 .../patches-3.13/650-pppoe_header_pad.patch   |    20 +
 .../651-wireless_mesh_header.patch            |    11 +
 .../patches-3.13/652-atm_header_changes.patch |    12 +
 .../653-disable_netlink_trim.patch            |    30 +
 .../patches-3.13/655-increase_skb_pad.patch   |    11 +
 .../656-skb_reduce_truesize-helper.patch      |    41 +
 .../657-qdisc_reduce_truesize.patch           |    63 +
 .../patches-3.13/660-fq_codel_defaults.patch  |    14 +
 .../661-fq_codel_keep_dropped_stats.patch     |    10 +
 .../662-use_fq_codel_by_default.patch         |    75 +
 .../patches-3.13/663-remove_pfifo_fast.patch  |   143 +
 .../patches-3.13/664-codel_fix_3_12.patch     |    22 +
 ...Add-support-for-MAP-E-FMRs-mesh-mode.patch |   481 +
 ...ng-with-source-address-failed-policy.patch |   249 +
 ...nes-for-_POLICY_FAILED-until-all-cod.patch |    53 +
 .../generic/patches-3.13/700-swconfig.patch   |    39 +
 .../patches-3.13/701-phy_extension.patch      |    63 +
 .../702-phy_add_aneg_done_function.patch      |    45 +
 ...detach-callback-to-struct-phy_driver.patch |    27 +
 ...710-phy-add-mdio_register_board_info.patch |   191 +
 .../patches-3.13/720-phy_adm6996.patch        |    26 +
 .../patches-3.13/721-phy_packets.patch        |   153 +
 .../patches-3.13/722-phy_mvswitch.patch       |    23 +
 .../generic/patches-3.13/723-phy_ip175c.patch |    23 +
 .../generic/patches-3.13/724-phy_ar8216.patch |    24 +
 .../patches-3.13/725-phy_rtl8306.patch        |    23 +
 .../patches-3.13/726-phy_rtl8366.patch        |    45 +
 .../patches-3.13/727-phy-rtl8367.patch        |    23 +
 .../generic/patches-3.13/728-phy-micrel.patch |    24 +
 .../patches-3.13/729-phy-rtl8367b.patch       |    23 +
 .../generic/patches-3.13/729-phy-tantos.patch |    21 +
 .../generic/patches-3.13/730-phy_b53.patch    |    21 +
 .../731-phy_mvswitch_3.10_compilation.patch   |    35 +
 .../732-phy-ar8216-led-support.patch          |    13 +
 .../patches-3.13/750-hostap_txpower.patch     |   154 +
 .../patches-3.13/770-bgmac-backport.patch     |   748 +
 .../773-bgmac-add-srab-switch.patch           |    72 +
 ...bgmac-check-length-of-received-frame.patch |    39 +
 .../810-pci_disable_common_quirks.patch       |    51 +
 .../811-pci_disable_usb_common_quirks.patch   |   101 +
 .../820-usb_add_usb_find_device_by_name.patch |    84 +
 .../patches-3.13/830-ledtrig_morse.patch      |    28 +
 .../patches-3.13/831-ledtrig_netdev.patch     |    60 +
 .../patches-3.13/832-ledtrig_usbdev.patch     |    31 +
 .../generic/patches-3.13/840-rtc7301.patch    |   250 +
 .../patches-3.13/841-rtc_pt7c4338.patch       |   247 +
 .../861-04_spi_gpio_implement_spi_delay.patch |    58 +
 .../patches-3.13/862-gpio_spi_driver.patch    |   373 +
 .../generic/patches-3.13/863-gpiommc.patch    |   844 +
 .../864-gpiommc_configfs_locking.patch        |    58 +
 .../patches-3.13/870-hifn795x_byteswap.patch  |    17 +
 .../880-gateworks_system_controller.patch     |   339 +
 .../890-8250_optional_sysrq.patch             |    24 +
 .../patches-3.13/900-slab_maxsize.patch       |    13 +
 .../patches-3.13/901-debloat_sock_diag.patch  |    45 +
 .../patches-3.13/902-debloat_proc.patch       |   341 +
 .../patches-3.13/903-debloat_direct_io.patch  |    84 +
 .../patches-3.13/910-kobject_uevent.patch     |    21 +
 .../911-kobject_add_broadcast_uevent.patch    |    65 +
 .../921-use_preinit_as_init.patch             |    12 +
 ...ays-create-console-node-in-initramfs.patch |    30 +
 .../generic/patches-3.13/930-crashlog.patch   |   276 +
 .../940-ocf_kbuild_integration.patch          |    20 +
 .../patches-3.13/941-ocf_20120127.patch       |   166 +
 .../960-decompress_unlzo_fix.patch            |    23 +
 ...e-filenames-from-deps_initramfs-list.patch |    29 +
 .../980-arm_openwrt_machtypes.patch           |    32 +
 .../generic/patches-3.13/990-gpio_wdt.patch   |   360 +
 .../996-zsmalloc_allow_module_build.patch     |     9 +
 .../997-device_tree_cmdline.patch             |    12 +
 ...able_wilink_platform_without_drivers.patch |    15 +
 .../000-keep_initrafs_the_default.patch       |    25 +
 .../generic/patches-3.14/020-ssb_update.patch |   321 +
 .../patches-3.14/025-bcma_backport.patch      |  1606 +
 ...O-block-driver-on-top-of-UBI-volumes.patch |   829 +
 ...041-UBI-block-do-not-use-term-attach.patch |   185 +
 ...-Mark-init-only-symbol-as-__initdata.patch |    37 +
 ...lock-Use-u64-for-the-64-bit-dividend.patch |    28 +
 .../044-UBI-rename-block-device-ioctls.patch  |    83 +
 ...e-__initdata-from-ubiblock_param_ops.patch |    30 +
 ...I-avoid-workqueue-format-string-leak.patch |    25 +
 ...VOLCRBLK-take-a-parameter-for-future.patch |    58 +
 ...-mtd-bcm47xxpart-backports-from-3.16.patch |    59 +
 ...find-NVRAM-partitions-in-middle-bloc.patch |    19 +
 ...-mtd-bcm47xxpart-backports-from-3.19.patch |    50 +
 ...hso-Add-support-for-Option-GTM671WFS.patch |   323 +
 .../061-arm_xz_decompressor_build_fix.patch   |    10 +
 .../062-mips_decompressor_build_fix.patch     |    64 +
 .../063-mips_decompressor_memmove.patch       |    22 +
 .../065-iio_ad799x_backport_fixes.patch       |   122 +
 .../070-net-phy-move-PHY-software-reset.patch |    71 +
 .../071-net-phy-override-PHY-reset.patch      |    81 +
 .../080-backport_xfrm_crash_fix.patch         |   133 +
 .../090-backport_netfilter_rtcache.patch      |   504 +
 .../generic/patches-3.14/100-overlayfs.patch  |  3231 +
 .../patches-3.14/102-ehci_hcd_ignore_oc.patch |    81 +
 ...ge_allow_receiption_on_disabled_port.patch |    54 +
 .../132-mips_inline_dma_ops.patch             |   679 +
 .../patches-3.14/200-fix_localversion.patch   |    11 +
 .../patches-3.14/201-extra_optimization.patch |    14 +
 .../patches-3.14/202-reduce_module_size.patch |    11 +
 .../203-kallsyms_uncompressed.patch           |   108 +
 .../patches-3.14/204-module_strip.patch       |   200 +
 .../210-darwin_scripts_include.patch          |  3088 +
 .../212-byteshift_portability.patch           |    51 +
 .../patches-3.14/220-gc_sections.patch        |   540 +
 .../patches-3.14/221-module_exports.patch     |    88 +
 .../230-openwrt_lzma_options.patch            |    58 +
 .../patches-3.14/250-netfilter_depends.patch  |    18 +
 .../patches-3.14/251-sound_kconfig.patch      |    18 +
 .../patches-3.14/252-mv_cesa_depends.patch    |    10 +
 .../patches-3.14/253-ssb_b43_default_on.patch |    29 +
 .../254-textsearch_kconfig_hacks.patch        |    23 +
 .../255-lib80211_kconfig_hacks.patch          |    31 +
 .../256-crypto_add_kconfig_prompts.patch      |    47 +
 .../257-wireless_ext_kconfig_hack.patch       |    22 +
 .../258-netfilter_netlink_kconfig_hack.patch  |    11 +
 .../patches-3.14/259-regmap_dynamic.patch     |    76 +
 .../260-crypto_test_dependencies.patch        |    37 +
 .../262-compressor_kconfig_hack.patch         |    23 +
 .../270-x86_objdump_command.patch             |    16 +
 .../300-mips_expose_boot_raw.patch            |    39 +
 .../301-mips_image_cmdline_hack.patch         |    28 +
 .../302-mips_no_branch_likely.patch           |    11 +
 .../patches-3.14/304-mips_disable_fpu.patch   |   160 +
 .../patches-3.14/305-mips_module_reloc.patch  |   352 +
 .../306-mips_mem_functions_performance.patch  |    83 +
 .../309-mips_fuse_workaround.patch            |    32 +
 .../310-arm_module_unresolved_weak_sym.patch  |    13 +
 .../320-ppc4xx_optimization.patch             |    31 +
 .../321-powerpc_crtsavres_prereq.patch        |    10 +
 .../400-mtd-add-rootfs-split-support.patch    |   215 +
 ...for-different-partition-parser-types.patch |   113 +
 ...arsers-for-rootfs-and-firmware-split.patch |    77 +
 .../403-mtd-hook-mtdsplit-to-Kbuild.patch     |    25 +
 .../405-mtd-add-more-helper-functions.patch   |    83 +
 .../406-mtd-hook-mtdsplit-into-Kbuild.patch   |    24 +
 ...408-mtd-old-rootfs-squashfs-splitter.patch |    76 +
 ...rward-declaration-of-struct-mtd_info.patch |    18 +
 .../411-mtd-partial_eraseblock_write.patch    |   146 +
 .../412-mtd-partial_eraseblock_unlock.patch   |    18 +
 .../patches-3.14/420-mtd-redboot_space.patch  |    30 +
 ...30-mtd-add-myloader-partition-parser.patch |    35 +
 ...support-TRX-data-partition-being-UBI.patch |    66 +
 .../patches-3.14/440-block2mtd_init.patch     |   107 +
 .../patches-3.14/441-block2mtd_probe.patch    |   108 +
 ...-to-use-platform-specific-chip-fixup.patch |    37 +
 ...n-code-of-nand_correct_data-function.patch |    11 +
 ...mtd-cfi_cmdset_0002-no-erase_suspend.patch |    11 +
 ...et_0002-add-buffer-write-cmd-timeout.patch |    18 +
 ...-allow-to-disable-small-sector-erase.patch |    41 +
 ...add-support-for-Winbond-W25X05-flash.patch |    20 +
 ...-add-support-for-EON-EN25QH128-flash.patch |    20 +
 .../480-mtd-set-rootfs-to-be-root-dev.patch   |    26 +
 .../490-mtd-ubi-add-EOF-marker-support.patch  |    51 +
 ...mtd-device-named-ubi-or-data-on-boot.patch |    75 +
 ...to-create-ubiblock-device-for-rootfs.patch |    69 +
 ...ting-ubi0-rootfs-in-init-do_mounts.c.patch |    53 +
 ...ROOT_DEV-to-ubiblock-rootfs-if-unset.patch |    37 +
 .../500-yaffs-Kbuild-integration.patch        |    18 +
 ...ffs-3.5-convert-to-use-kuid_t-kgid_t.patch |   155 +
 .../502-yaffs-3.10-disable-proc-entry.patch   |    44 +
 ...affs-3.12-convert-readdir-to-iterate.patch |   129 +
 ...3-yaffs-add-tags-9bytes-mount-option.patch |   123 +
 .../504-yaffs-fix-compat-tags-handling.patch  |   239 +
 .../520-squashfs_update_xz_comp_opts.patch    |    25 +
 .../530-jffs2_make_lzma_available.patch       |  5142 ++
 .../patches-3.14/531-debloat_lzma.patch       |  1021 +
 .../patches-3.14/532-jffs2_eofdetect.patch    |    56 +
 .../540-crypto-xz-decompression-support.patch |   146 +
 .../541-ubifs-xz-decompression-support.patch  |    92 +
 .../550-ubifs-symlink-xattr-support.patch     |    65 +
 ...fs-fix-default-compression-selection.patch |    29 +
 .../552-ubifs-respect-silent-mount-flag.patch |   122 +
 .../600-netfilter_layer7_2.22.patch           |  2141 +
 .../601-netfilter_layer7_pktmatch.patch       |   108 +
 .../602-netfilter_layer7_match.patch          |    51 +
 .../603-netfilter_layer7_2.6.36_fix.patch     |    61 +
 .../604-netfilter_conntrack_flush.patch       |    86 +
 ...etfilter_match_bypass_default_checks.patch |    93 +
 ...netfilter_match_bypass_default_table.patch |    94 +
 ...netfilter_match_reduce_memory_access.patch |    16 +
 ...-netfilter_optional_tcp_window_check.patch |    36 +
 .../615-netfilter_add_xt_id_match.patch       |    95 +
 .../616-net_optimize_xfrm_calls.patch         |    12 +
 .../617-netfilter_skip_filter_sysctl.patch    |    87 +
 .../generic/patches-3.14/620-sched_esfq.patch |   791 +
 .../patches-3.14/621-sched_act_connmark.patch |   179 +
 .../patches-3.14/630-packet_socket_type.patch |   134 +
 .../640-bridge_no_eap_forward.patch           |    15 +
 .../641-bridge_always_accept_eap.patch        |    11 +
 .../642-bridge_port_isolate.patch             |   102 +
 .../643-bridge_remove_ipv6_dependency.patch   |   107 +
 .../644-bridge_optimize_netfilter_hooks.patch |   155 +
 .../645-bridge_multicast_to_unicast.patch     |   375 +
 .../patches-3.14/650-pppoe_header_pad.patch   |    20 +
 .../651-wireless_mesh_header.patch            |    11 +
 .../patches-3.14/652-atm_header_changes.patch |    12 +
 .../653-disable_netlink_trim.patch            |    30 +
 .../patches-3.14/655-increase_skb_pad.patch   |    11 +
 .../656-skb_reduce_truesize-helper.patch      |    41 +
 .../657-qdisc_reduce_truesize.patch           |    63 +
 .../patches-3.14/660-fq_codel_defaults.patch  |    14 +
 .../661-fq_codel_keep_dropped_stats.patch     |    10 +
 .../662-use_fq_codel_by_default.patch         |    75 +
 .../patches-3.14/663-remove_pfifo_fast.patch  |   143 +
 .../patches-3.14/664-codel_fix_3_12.patch     |    22 +
 ...Add-support-for-MAP-E-FMRs-mesh-mode.patch |   481 +
 ...ng-with-source-address-failed-policy.patch |   249 +
 ...nes-for-_POLICY_FAILED-until-all-cod.patch |    53 +
 .../generic/patches-3.14/700-swconfig.patch   |    39 +
 .../patches-3.14/701-phy_extension.patch      |    63 +
 .../702-phy_add_aneg_done_function.patch      |    49 +
 ...detach-callback-to-struct-phy_driver.patch |    27 +
 ...710-phy-add-mdio_register_board_info.patch |   191 +
 .../patches-3.14/720-phy_adm6996.patch        |    26 +
 .../patches-3.14/721-phy_packets.patch        |   154 +
 .../patches-3.14/722-phy_mvswitch.patch       |    23 +
 .../generic/patches-3.14/723-phy_ip175c.patch |    23 +
 .../generic/patches-3.14/724-phy_ar8216.patch |    24 +
 .../patches-3.14/725-phy_rtl8306.patch        |    23 +
 .../patches-3.14/726-phy_rtl8366.patch        |    45 +
 .../patches-3.14/727-phy-rtl8367.patch        |    23 +
 .../generic/patches-3.14/728-phy-micrel.patch |    24 +
 .../patches-3.14/729-phy-rtl8367b.patch       |    23 +
 .../generic/patches-3.14/729-phy-tantos.patch |    21 +
 .../generic/patches-3.14/730-phy_b53.patch    |    21 +
 .../731-phy_mvswitch_3.10_compilation.patch   |    35 +
 .../732-phy-ar8216-led-support.patch          |    13 +
 .../patches-3.14/733-phy_mvsw6171.patch       |    23 +
 .../patches-3.14/750-hostap_txpower.patch     |   154 +
 .../773-bgmac-add-srab-switch.patch           |    72 +
 ...bgmac-check-length-of-received-frame.patch |    39 +
 ...nter-dereference-in-igb_reset_q_vect.patch |    40 +
 .../785-hso-support-0af0-9300.patch           |    25 +
 .../810-pci_disable_common_quirks.patch       |    51 +
 .../811-pci_disable_usb_common_quirks.patch   |   101 +
 .../820-usb_add_usb_find_device_by_name.patch |    84 +
 .../patches-3.14/830-ledtrig_morse.patch      |    28 +
 .../patches-3.14/831-ledtrig_netdev.patch     |    60 +
 .../patches-3.14/832-ledtrig_usbdev.patch     |    31 +
 .../generic/patches-3.14/840-rtc7301.patch    |   250 +
 .../patches-3.14/841-rtc_pt7c4338.patch       |   247 +
 .../861-04_spi_gpio_implement_spi_delay.patch |    58 +
 .../patches-3.14/862-gpio_spi_driver.patch    |   373 +
 .../generic/patches-3.14/863-gpiommc.patch    |   844 +
 .../864-gpiommc_configfs_locking.patch        |    58 +
 .../patches-3.14/870-hifn795x_byteswap.patch  |    17 +
 .../880-gateworks_system_controller.patch     |   339 +
 .../890-8250_optional_sysrq.patch             |    24 +
 .../patches-3.14/900-slab_maxsize.patch       |    13 +
 .../patches-3.14/901-debloat_sock_diag.patch  |    45 +
 .../patches-3.14/902-debloat_proc.patch       |   341 +
 .../patches-3.14/903-debloat_direct_io.patch  |    84 +
 .../patches-3.14/910-kobject_uevent.patch     |    21 +
 .../911-kobject_add_broadcast_uevent.patch    |    65 +
 .../921-use_preinit_as_init.patch             |    12 +
 ...ays-create-console-node-in-initramfs.patch |    30 +
 .../generic/patches-3.14/930-crashlog.patch   |   276 +
 .../940-ocf_kbuild_integration.patch          |    20 +
 .../patches-3.14/941-ocf_20120127.patch       |   166 +
 .../960-decompress_unlzo_fix.patch            |    23 +
 ...e-filenames-from-deps_initramfs-list.patch |    29 +
 .../980-arm_openwrt_machtypes.patch           |    32 +
 .../generic/patches-3.14/990-gpio_wdt.patch   |   360 +
 .../996-zsmalloc_allow_module_build.patch     |    11 +
 .../997-device_tree_cmdline.patch             |    12 +
 ...able_wilink_platform_without_drivers.patch |    15 +
 .../000-keep_initrafs_the_default.patch       |    25 +
 .../generic/patches-3.18/020-ssb_update.patch |    78 +
 .../patches-3.18/025-bcma_backport.patch      |   249 +
 ...-mtd-bcm47xxpart-backports-from-3.19.patch |    50 +
 .../050-backport_netfilter_rtcache.patch      |   505 +
 .../patches-3.18/102-ehci_hcd_ignore_oc.patch |    82 +
 ...ge_allow_receiption_on_disabled_port.patch |    54 +
 .../132-mips_inline_dma_ops.patch             |   688 +
 .../patches-3.18/200-fix_localversion.patch   |    11 +
 .../patches-3.18/201-extra_optimization.patch |    14 +
 .../patches-3.18/202-reduce_module_size.patch |    11 +
 .../203-kallsyms_uncompressed.patch           |   108 +
 .../patches-3.18/204-module_strip.patch       |   194 +
 .../210-darwin_scripts_include.patch          |  3088 +
 .../212-byteshift_portability.patch           |    51 +
 .../patches-3.18/220-gc_sections.patch        |   531 +
 .../patches-3.18/221-module_exports.patch     |    88 +
 .../230-openwrt_lzma_options.patch            |    58 +
 .../patches-3.18/250-netfilter_depends.patch  |    18 +
 .../patches-3.18/251-sound_kconfig.patch      |    18 +
 .../patches-3.18/252-mv_cesa_depends.patch    |    10 +
 .../patches-3.18/253-ssb_b43_default_on.patch |    29 +
 .../254-textsearch_kconfig_hacks.patch        |    23 +
 .../255-lib80211_kconfig_hacks.patch          |    31 +
 .../256-crypto_add_kconfig_prompts.patch      |    47 +
 .../257-wireless_ext_kconfig_hack.patch       |    22 +
 .../258-netfilter_netlink_kconfig_hack.patch  |    11 +
 .../patches-3.18/259-regmap_dynamic.patch     |    79 +
 .../260-crypto_test_dependencies.patch        |    37 +
 .../patches-3.18/261-move_bcm963xx_tag.patch  |   219 +
 .../262-compressor_kconfig_hack.patch         |    23 +
 .../300-mips_expose_boot_raw.patch            |    39 +
 .../301-mips_image_cmdline_hack.patch         |    28 +
 .../302-mips_no_branch_likely.patch           |    11 +
 .../patches-3.18/304-mips_disable_fpu.patch   |   105 +
 .../patches-3.18/305-mips_module_reloc.patch  |   352 +
 .../306-mips_mem_functions_performance.patch  |    83 +
 .../309-mips_fuse_workaround.patch            |    32 +
 .../310-arm_module_unresolved_weak_sym.patch  |    13 +
 .../320-ppc4xx_optimization.patch             |    31 +
 .../321-powerpc_crtsavres_prereq.patch        |    10 +
 .../400-mtd-add-rootfs-split-support.patch    |   215 +
 ...for-different-partition-parser-types.patch |   113 +
 ...arsers-for-rootfs-and-firmware-split.patch |    77 +
 .../403-mtd-hook-mtdsplit-to-Kbuild.patch     |    25 +
 .../405-mtd-add-more-helper-functions.patch   |    83 +
 .../406-mtd-hook-mtdsplit-into-Kbuild.patch   |    24 +
 ...408-mtd-old-rootfs-squashfs-splitter.patch |    76 +
 ...rward-declaration-of-struct-mtd_info.patch |    18 +
 .../411-mtd-partial_eraseblock_write.patch    |   146 +
 .../412-mtd-partial_eraseblock_unlock.patch   |    18 +
 .../patches-3.18/420-mtd-redboot_space.patch  |    30 +
 ...30-mtd-add-myloader-partition-parser.patch |    35 +
 ...support-TRX-data-partition-being-UBI.patch |    66 +
 .../patches-3.18/440-block2mtd_init.patch     |   107 +
 .../patches-3.18/441-block2mtd_probe.patch    |   110 +
 ...-to-use-platform-specific-chip-fixup.patch |    37 +
 ...n-code-of-nand_correct_data-function.patch |    11 +
 ...mtd-cfi_cmdset_0002-no-erase_suspend.patch |    11 +
 ...et_0002-add-buffer-write-cmd-timeout.patch |    18 +
 ...add-support-for-Winbond-W25X05-flash.patch |    20 +
 .../480-mtd-set-rootfs-to-be-root-dev.patch   |    26 +
 ...mtd-device-named-ubi-or-data-on-boot.patch |    75 +
 ...to-create-ubiblock-device-for-rootfs.patch |    69 +
 ...ting-ubi0-rootfs-in-init-do_mounts.c.patch |    53 +
 ...ROOT_DEV-to-ubiblock-rootfs-if-unset.patch |    37 +
 .../500-yaffs-Kbuild-integration.patch        |    18 +
 ...ffs-3.5-convert-to-use-kuid_t-kgid_t.patch |   155 +
 .../502-yaffs-3.10-disable-proc-entry.patch   |    44 +
 ...affs-3.12-convert-readdir-to-iterate.patch |   129 +
 ...3-yaffs-add-tags-9bytes-mount-option.patch |   123 +
 .../504-yaffs-fix-compat-tags-handling.patch  |   239 +
 .../520-squashfs_update_xz_comp_opts.patch    |    25 +
 .../530-jffs2_make_lzma_available.patch       |  5142 ++
 .../patches-3.18/531-debloat_lzma.patch       |  1021 +
 .../patches-3.18/532-jffs2_eofdetect.patch    |    56 +
 .../540-crypto-xz-decompression-support.patch |   146 +
 .../541-ubifs-xz-decompression-support.patch  |    92 +
 .../550-ubifs-symlink-xattr-support.patch     |    55 +
 ...fs-fix-default-compression-selection.patch |    29 +
 .../600-netfilter_layer7_2.22.patch           |  2141 +
 .../601-netfilter_layer7_pktmatch.patch       |   108 +
 .../602-netfilter_layer7_match.patch          |    51 +
 .../603-netfilter_layer7_2.6.36_fix.patch     |    61 +
 .../604-netfilter_conntrack_flush.patch       |    86 +
 ...etfilter_match_bypass_default_checks.patch |    93 +
 ...netfilter_match_bypass_default_table.patch |    94 +
 ...netfilter_match_reduce_memory_access.patch |    16 +
 ...-netfilter_optional_tcp_window_check.patch |    36 +
 .../615-netfilter_add_xt_id_match.patch       |    95 +
 .../616-net_optimize_xfrm_calls.patch         |    12 +
 .../617-netfilter_skip_filter_sysctl.patch    |    87 +
 .../generic/patches-3.18/620-sched_esfq.patch |   791 +
 .../patches-3.18/621-sched_act_connmark.patch |   161 +
 .../patches-3.18/630-packet_socket_type.patch |   134 +
 .../640-bridge_no_eap_forward.patch           |    15 +
 .../641-bridge_always_accept_eap.patch        |    11 +
 .../642-bridge_port_isolate.patch             |   102 +
 .../643-bridge_remove_ipv6_dependency.patch   |   110 +
 .../644-bridge_optimize_netfilter_hooks.patch |   172 +
 .../645-bridge_multicast_to_unicast.patch     |   373 +
 .../patches-3.18/650-pppoe_header_pad.patch   |    20 +
 .../651-wireless_mesh_header.patch            |    11 +
 .../patches-3.18/652-atm_header_changes.patch |    12 +
 .../653-disable_netlink_trim.patch            |    30 +
 .../patches-3.18/655-increase_skb_pad.patch   |    11 +
 .../656-skb_reduce_truesize-helper.patch      |    41 +
 .../657-qdisc_reduce_truesize.patch           |    63 +
 .../patches-3.18/660-fq_codel_defaults.patch  |    14 +
 .../661-fq_codel_keep_dropped_stats.patch     |    10 +
 .../662-use_fq_codel_by_default.patch         |    75 +
 .../patches-3.18/663-remove_pfifo_fast.patch  |   143 +
 .../patches-3.18/664-codel_fix_3_12.patch     |    22 +
 ...Add-support-for-MAP-E-FMRs-mesh-mode.patch |   481 +
 ...ng-with-source-address-failed-policy.patch |   249 +
 ...nes-for-_POLICY_FAILED-until-all-cod.patch |    53 +
 .../generic/patches-3.18/700-swconfig.patch   |    39 +
 .../patches-3.18/701-phy_extension.patch      |    63 +
 .../702-phy_add_aneg_done_function.patch      |    27 +
 ...detach-callback-to-struct-phy_driver.patch |    27 +
 ...710-phy-add-mdio_register_board_info.patch |   192 +
 .../patches-3.18/720-phy_adm6996.patch        |    26 +
 .../patches-3.18/721-phy_packets.patch        |   161 +
 .../patches-3.18/722-phy_mvswitch.patch       |    23 +
 .../generic/patches-3.18/723-phy_ip175c.patch |    23 +
 .../generic/patches-3.18/724-phy_ar8216.patch |    24 +
 .../patches-3.18/725-phy_rtl8306.patch        |    23 +
 .../patches-3.18/726-phy_rtl8366.patch        |    45 +
 .../patches-3.18/727-phy-rtl8367.patch        |    23 +
 .../generic/patches-3.18/728-phy-micrel.patch |    24 +
 .../patches-3.18/729-phy-rtl8367b.patch       |    23 +
 .../generic/patches-3.18/729-phy-tantos.patch |    21 +
 .../generic/patches-3.18/730-phy_b53.patch    |    21 +
 .../731-phy_mvswitch_3.10_compilation.patch   |    35 +
 .../732-phy-ar8216-led-support.patch          |    13 +
 .../patches-3.18/733-phy_mvsw6171.patch       |    23 +
 .../patches-3.18/750-hostap_txpower.patch     |   154 +
 .../773-bgmac-add-srab-switch.patch           |    72 +
 ...bgmac-check-length-of-received-frame.patch |    39 +
 ...nter-dereference-in-igb_reset_q_vect.patch |    40 +
 .../785-hso-support-0af0-9300.patch           |    25 +
 .../810-pci_disable_common_quirks.patch       |    51 +
 .../811-pci_disable_usb_common_quirks.patch   |   101 +
 .../820-usb_add_usb_find_device_by_name.patch |    84 +
 .../patches-3.18/830-ledtrig_morse.patch      |    28 +
 .../patches-3.18/831-ledtrig_netdev.patch     |    60 +
 .../patches-3.18/832-ledtrig_usbdev.patch     |    31 +
 .../generic/patches-3.18/840-rtc7301.patch    |   250 +
 .../patches-3.18/841-rtc_pt7c4338.patch       |   247 +
 .../861-04_spi_gpio_implement_spi_delay.patch |    58 +
 .../patches-3.18/862-gpio_spi_driver.patch    |   373 +
 .../generic/patches-3.18/863-gpiommc.patch    |   844 +
 .../864-gpiommc_configfs_locking.patch        |    58 +
 .../patches-3.18/870-hifn795x_byteswap.patch  |    17 +
 .../880-gateworks_system_controller.patch     |   339 +
 .../890-8250_optional_sysrq.patch             |    24 +
 .../patches-3.18/900-slab_maxsize.patch       |    13 +
 .../patches-3.18/901-debloat_sock_diag.patch  |    45 +
 .../patches-3.18/902-debloat_proc.patch       |   341 +
 .../patches-3.18/903-debloat_direct_io.patch  |    83 +
 .../patches-3.18/910-kobject_uevent.patch     |    21 +
 .../911-kobject_add_broadcast_uevent.patch    |    65 +
 .../921-use_preinit_as_init.patch             |    12 +
 ...ays-create-console-node-in-initramfs.patch |    30 +
 .../generic/patches-3.18/930-crashlog.patch   |   276 +
 .../940-ocf_kbuild_integration.patch          |    20 +
 .../patches-3.18/941-ocf_20120127.patch       |   166 +
 .../960-decompress_unlzo_fix.patch            |    23 +
 ...e-filenames-from-deps_initramfs-list.patch |    29 +
 .../980-arm_openwrt_machtypes.patch           |    32 +
 .../generic/patches-3.18/990-gpio_wdt.patch   |   360 +
 .../997-device_tree_cmdline.patch             |    12 +
 ...able_wilink_platform_without_drivers.patch |    15 +
 ...emset-related-crashes-caused-by-rece.patch |   250 +
 ...emset-related-crashes-caused-by-rece.patch |    78 +
 ...r-clear_page-and-copy_page-functions.patch |   249 +
 .../006-arm_kernel_xz_support.patch           |    96 +
 ...hso-Earlier-catch-of-error-condition.patch |    40 +
 ...ack-corruption-on-some-architectures.patch |    48 +
 .../generic/patches-3.3/020-ssb_update.patch  |  3206 +
 .../patches-3.3/025-bcma_backport.patch       |  5794 ++
 .../040-Controlled-Delay-AQM.patch            |   757 +
 ...n-method-instead-of-sqrt-and-divides.patch |   185 +
 .../042-fq_codel-Fair-Queue-Codel-AQM.patch   |   839 +
 ...Add-missing-include-linux-prefetch.h.patch |    33 +
 .../044-net-codel-fix-build-errors.patch      |    51 +
 ...eld-instead-of-31bits-for-rec_inv_sq.patch |    86 +
 .../046-fq_codel-qdisc-backlog.patch          |   132 +
 .../patches-3.3/047-spi_message_queue.patch   |   603 +
 ...epare-unprepare-transfer-if-not-popu.patch |    39 +
 ...ondition-to-avoid-a-nul-rec_inv_sqrt.patch |    52 +
 .../patches-3.3/050-rng_git_backport.patch    |   783 +
 ...t_backport-remove_irqf_sample_random.patch |   543 +
 .../generic/patches-3.3/060-hso_devices.patch |    36 +
 ...060-tcp-ecn-dont-delay-ACKS-after-CE.patch |    61 +
 .../061-fq_codel-dont-reinit-flow-state.patch |    36 +
 .../patches-3.3/065-8139cp-fixes.patch        |   187 +
 ...lags-to-export-GPIOs-when-requesting.patch |    68 +
 .../patches-3.3/080-prot-release-cb.patch     |    27 +
 ...Add-a-generic-platform-device-driver.patch |   271 +
 ...Add-a-generic-platform-device-driver.patch |   283 +
 .../083-USB-EHCI-platform-remove-update.patch |    11 +
 .../084-x86_fix_perf_uclibc_build.patch       |    27 +
 .../patches-3.3/090-CVE-2013-1763.patch       |    27 +
 .../patches-3.3/100-overlayfs_v12.patch       |  3232 +
 .../patches-3.3/102-ehci_hcd_ignore_oc.patch  |    41 +
 .../patches-3.3/110-fix_mtd_include.patch     |    10 +
 .../patches-3.3/130-pppoatm-queue-depth.patch |   188 +
 .../generic/patches-3.3/131-atm-fixes.patch   |   900 +
 .../generic/patches-3.3/132-solos-dma.patch   |   442 +
 .../140-ixp4xx_hss_module_h_include.patch     |    39 +
 .../patches-3.3/200-fix_localversion.patch    |    11 +
 .../patches-3.3/201-extra_optimization.patch  |    14 +
 .../patches-3.3/202-reduce_module_size.patch  |    11 +
 .../210-darwin_scripts_include.patch          |  3088 +
 .../patches-3.3/211-stddef_include.patch      |    17 +
 .../212-x86_reloc_portability.patch           |    22 +
 .../patches-3.3/220-module_exports.patch      |    91 +
 .../230-openwrt_lzma_options.patch            |    54 +
 .../patches-3.3/250-netfilter_depends.patch   |    18 +
 .../patches-3.3/251-sound_kconfig.patch       |    18 +
 .../patches-3.3/252-mv_cesa_depends.patch     |    10 +
 .../patches-3.3/253-ssb_b43_default_on.patch  |    29 +
 .../254-textsearch_kconfig_hacks.patch        |    23 +
 .../255-lib80211_kconfig_hacks.patch          |    19 +
 .../256-crypto_add_kconfig_prompts.patch      |    47 +
 .../257-wireless_ext_kconfig_hack.patch       |    22 +
 .../258-netfilter_netlink_kconfig_hack.patch  |    11 +
 .../259-compressor_kconfig_hack.patch         |    23 +
 .../patches-3.3/260-move_bcm963xx_tag.patch   |   219 +
 .../patches-3.3/270-regmap_dynamic.patch      |    55 +
 .../300-mips_expose_boot_raw.patch            |    39 +
 .../301-mips_image_cmdline_hack.patch         |    28 +
 ...ps_use_generic_thread_info_allocator.patch |    18 +
 .../patches-3.3/303-mips_fix_kexec.patch      |    11 +
 .../patches-3.3/304-mips_disable_fpu.patch    |   160 +
 .../patches-3.3/305-mips_module_reloc.patch   |   371 +
 .../306-mips_mem_functions_performance.patch  |    83 +
 .../patches-3.3/307-mips_oprofile_fix.patch   |    35 +
 ...mips-show-correct-cpu-name-for-24KEc.patch |    17 +
 .../309-mips_fuse_workaround.patch            |    32 +
 .../310-arm_module_unresolved_weak_sym.patch  |    13 +
 .../patches-3.3/320-ppc4xx_optimization.patch |    31 +
 .../321-powerpc_crtsavres_prereq.patch        |    10 +
 .../322-ppc4xx-crypto-compile-fix.patch       |    10 +
 ...330-mips-add-crash-and-kdump-support.patch |   616 +
 .../331-mips-kexec-enhanche-the-support.patch |   157 +
 ...e-arguments-for-the-new-kernel-image.patch |    52 +
 ...t-kernel-parameters-from-kexec-tools.patch |    88 +
 ...compiling-failure-of-relocate_kernel.patch |    83 +
 ...eanup-kexec-tools-parameter-handling.patch |   186 +
 .../340-module_alloc_size_check.patch         |    20 +
 .../patches-3.3/400-rootfs_split.patch        |   327 +
 .../401-partial_eraseblock_write.patch        |   146 +
 .../410-mtd_info_move_forward_decl.patch      |    18 +
 .../patches-3.3/420-redboot_space.patch       |    30 +
 .../430-mtd_myloader_partition_parser.patch   |    35 +
 .../patches-3.3/440-block2mtd_init.patch      |   116 +
 .../patches-3.3/441-block2mtd_refresh.patch   |   291 +
 .../patches-3.3/442-block2mtd_probe.patch     |    10 +
 ...d-avoid-recursive-call-of-mtd_writev.patch |    10 +
 .../450-mtd_plat_nand_chip_fixup.patch        |    37 +
 ...td_fix_nand_correct_data_return_code.patch |    12 +
 ...460-cfi_cmdset_0002_no_erase_suspend.patch |    11 +
 ...-mtd_m25p80_add_pm25lv_flash_support.patch |    39 +
 .../473-mtd_m25p80_add_w25q128.patch          |    10 +
 ...et_0002-add-buffer-write-cmd-timeout.patch |    18 +
 ...-allow-to-disable-small-sector-erase.patch |    41 +
 ...add-support-for-the-EON-EN25Q64-chip.patch |    10 +
 .../478-mtd-partial_eraseblock_unlock.patch   |    18 +
 .../520-squashfs_update_xz_comp_opts.patch    |    25 +
 .../530-jffs2_make_lzma_available.patch       |  5142 ++
 .../patches-3.3/531-debloat_lzma.patch        |   485 +
 .../patches-3.3/532-jffs2_eofdetect.patch     |   132 +
 .../540-crypto-xz-decompression-support.patch |   146 +
 .../541-ubifs-xz-decompression-support.patch  |    94 +
 .../550-ubifs-symlink-xattr-support.patch     |    67 +
 .../600-netfilter_layer7_2.22.patch           |  2142 +
 .../601-netfilter_layer7_pktmatch.patch       |   108 +
 .../602-netfilter_layer7_match.patch          |    51 +
 .../603-netfilter_layer7_2.6.36_fix.patch     |    61 +
 .../604-netfilter_conntrack_flush.patch       |    86 +
 ...etfilter_match_bypass_default_checks.patch |    93 +
 ...netfilter_match_bypass_default_table.patch |    81 +
 ...netfilter_match_reduce_memory_access.patch |    16 +
 ...-netfilter_optional_tcp_window_check.patch |    36 +
 .../615-netfilter_add_xt_id_match.patch       |    95 +
 .../generic/patches-3.3/620-sched_esfq.patch  |   791 +
 .../patches-3.3/621-sched_act_connmark.patch  |   172 +
 .../patches-3.3/630-packet_socket_type.patch  |   132 +
 .../640-bridge_no_eap_forward.patch           |    15 +
 .../641-bridge_always_accept_eap.patch        |    11 +
 .../patches-3.3/642-bridge_port_isolate.patch |   103 +
 .../643-bridge_remove_ipv6_dependency.patch   |   107 +
 .../644-bridge_optimize_netfilter_hooks.patch |   146 +
 .../patches-3.3/650-pppoe_header_pad.patch    |    20 +
 .../651-wireless_mesh_header.patch            |    11 +
 .../patches-3.3/652-atm_header_changes.patch  |    12 +
 .../653-disable_netlink_trim.patch            |    28 +
 .../654-avoid_skb_cow_realloc.patch           |    21 +
 .../patches-3.3/655-increase_skb_pad.patch    |    11 +
 .../generic/patches-3.3/700-swconfig.patch    |    39 +
 .../patches-3.3/701-phy_extension.patch       |    72 +
 .../702-phy_add_aneg_done_function.patch      |    45 +
 ...detach-callback-to-struct-phy_driver.patch |    27 +
 ...710-phy-add-mdio_register_board_info.patch |   191 +
 .../generic/patches-3.3/720-phy_adm6996.patch |    26 +
 .../generic/patches-3.3/721-phy_packets.patch |   175 +
 .../patches-3.3/722-phy_mvswitch.patch        |    23 +
 .../generic/patches-3.3/723-phy_ip175c.patch  |    23 +
 .../generic/patches-3.3/724-phy_ar8216.patch  |    24 +
 .../generic/patches-3.3/725-phy_rtl8306.patch |    23 +
 .../generic/patches-3.3/726-phy_rtl8366.patch |    45 +
 .../generic/patches-3.3/727-phy-rtl8367.patch |    23 +
 .../generic/patches-3.3/728-phy-micrel.patch  |    24 +
 .../patches-3.3/729-phy-rtl8367b.patch        |    23 +
 .../generic/patches-3.3/729-phy-tantos.patch  |    21 +
 .../patches-3.3/750-hostap_txpower.patch      |   154 +
 ...sb-ohci-multiple-platform-driver-fix.patch |    51 +
 ...sb-ehci-multiple-platform-driver-fix.patch |    47 +
 .../810-pci_disable_common_quirks.patch       |    43 +
 .../811-pci_disable_usb_common_quirks.patch   |    38 +
 .../820-usb_add_usb_find_device_by_name.patch |    84 +
 .../patches-3.3/830-ledtrig_morse.patch       |    28 +
 .../patches-3.3/831-ledtrig_netdev.patch      |    51 +
 .../patches-3.3/832-ledtrig_usbdev.patch      |    31 +
 .../generic/patches-3.3/840-rtc7301.patch     |   250 +
 .../patches-3.3/841-rtc_pt7c4338.patch        |   247 +
 .../861-04_spi_gpio_implement_spi_delay.patch |    58 +
 .../patches-3.3/862-gpio_spi_driver.patch     |   373 +
 .../generic/patches-3.3/863-gpiommc.patch     |   844 +
 .../864-gpiommc_configfs_locking.patch        |    58 +
 .../patches-3.3/870-hifn795x_byteswap.patch   |    17 +
 .../880-gateworks_system_controller.patch     |   339 +
 .../patches-3.3/900-slab_maxsize.patch        |    13 +
 .../patches-3.3/910-kobject_uevent.patch      |    21 +
 .../911-kobject_add_broadcast_uevent.patch    |    85 +
 .../patches-3.3/921-use_preinit_as_init.patch |    14 +
 ...ays-create-console-node-in-initramfs.patch |    30 +
 .../generic/patches-3.3/930-crashlog.patch    |   285 +
 .../940-ocf_kbuild_integration.patch          |    20 +
 .../patches-3.3/941-ocf_20120127.patch        |   164 +
 .../960-decompress_unlzo_fix.patch            |    23 +
 ...e-filenames-from-deps_initramfs-list.patch |    28 +
 .../980-arm_openwrt_machtypes.patch           |    34 +
 ...ore_wdt_fix_watchdog_counter_loading.patch |    64 +
 ...re_wdt_fix_wdioc_setoptions_handling.patch |    29 +
 .../994-mpcore_wdt_fix_timer_mode_setup.patch |    57 +
 ...nfig_leds-define-leds_set_brightness.patch |    11 +
 ...onfig-revert-portid-snd_portid-usage.patch |    30 +
 ...-swconfig-revert-UAPI-disintegration.patch |   109 +
 ...emset-related-crashes-caused-by-rece.patch |   250 +
 ...emset-related-crashes-caused-by-rece.patch |    78 +
 ...hso-Earlier-catch-of-error-condition.patch |    40 +
 ...ack-corruption-on-some-architectures.patch |    48 +
 .../010-mtd_mp25p80_add_gd25q32_gd25q64.patch |    13 +
 .../generic/patches-3.8/020-ssb_update.patch  |  1589 +
 .../patches-3.8/025-bcma_backport.patch       |  1988 +
 ...vres-Introduce-devm_ioremap_resource.patch |   251 +
 ...k-annotation-from-pcibios_get_phb_of.patch |    40 +
 ...CI-Implement-pcibios_get_phb_of_node.patch |    48 +
 ...-DT-aliases-for-assigning-bus-number.patch |    37 +
 .../040-backport_led_gpio_request_fix.patch   |    25 +
 .../generic/patches-3.8/060-hso_devices.patch |    36 +
 .../061-arm_xz_decompressor_build_fix.patch   |    10 +
 .../062-mips_decompressor_build_fix.patch     |    66 +
 .../084-x86_fix_perf_uclibc_build.patch       |    27 +
 .../generic/patches-3.8/100-overlayfs.patch   |  3191 +
 .../patches-3.8/101-overlayfs_path_ref.patch  |    10 +
 .../patches-3.8/102-ehci_hcd_ignore_oc.patch  |    81 +
 .../patches-3.8/110-fix_mtd_include.patch     |    10 +
 .../patches-3.8/200-fix_localversion.patch    |    11 +
 .../patches-3.8/201-extra_optimization.patch  |    14 +
 .../patches-3.8/202-reduce_module_size.patch  |    11 +
 .../203-kallsyms_uncompressed.patch           |   108 +
 .../patches-3.8/204-module_strip.patch        |   200 +
 .../210-darwin_scripts_include.patch          |  3088 +
 .../212-byteshift_portability.patch           |    53 +
 .../generic/patches-3.8/220-gc_sections.patch |   483 +
 .../patches-3.8/221-module_exports.patch      |    88 +
 .../230-openwrt_lzma_options.patch            |    54 +
 .../patches-3.8/250-netfilter_depends.patch   |    18 +
 .../patches-3.8/251-sound_kconfig.patch       |    18 +
 .../patches-3.8/252-mv_cesa_depends.patch     |    10 +
 .../patches-3.8/253-ssb_b43_default_on.patch  |    29 +
 .../254-textsearch_kconfig_hacks.patch        |    23 +
 .../255-lib80211_kconfig_hacks.patch          |    19 +
 .../256-crypto_add_kconfig_prompts.patch      |    47 +
 .../257-wireless_ext_kconfig_hack.patch       |    22 +
 .../258-netfilter_netlink_kconfig_hack.patch  |    11 +
 .../patches-3.8/259-regmap_dynamic.patch      |    72 +
 .../260-crypto_test_dependencies.patch        |    37 +
 .../patches-3.8/261-move_bcm963xx_tag.patch   |   219 +
 .../262-compressor_kconfig_hack.patch         |    23 +
 .../300-mips_expose_boot_raw.patch            |    39 +
 .../301-mips_image_cmdline_hack.patch         |    28 +
 .../302-mips_no_branch_likely.patch           |    11 +
 .../patches-3.8/304-mips_disable_fpu.patch    |   160 +
 .../patches-3.8/305-mips_module_reloc.patch   |   350 +
 .../306-mips_mem_functions_performance.patch  |    83 +
 ...mips-show-correct-cpu-name-for-24KEc.patch |    17 +
 .../309-mips_fuse_workaround.patch            |    32 +
 .../310-arm_module_unresolved_weak_sym.patch  |    13 +
 .../patches-3.8/320-ppc4xx_optimization.patch |    31 +
 .../321-powerpc_crtsavres_prereq.patch        |    10 +
 .../322-ppc4xx-crypto-compile-fix.patch       |    10 +
 .../patches-3.8/400-rootfs_split.patch        |   316 +
 .../401-partial_eraseblock_write.patch        |   146 +
 .../410-mtd_info_move_forward_decl.patch      |    18 +
 .../patches-3.8/420-redboot_space.patch       |    30 +
 .../430-mtd_myloader_partition_parser.patch   |    35 +
 .../patches-3.8/440-block2mtd_init.patch      |   116 +
 .../patches-3.8/441-block2mtd_refresh.patch   |   269 +
 .../patches-3.8/442-block2mtd_probe.patch     |    10 +
 .../450-mtd_plat_nand_chip_fixup.patch        |    37 +
 ...td_fix_nand_correct_data_return_code.patch |    12 +
 ...460-cfi_cmdset_0002_no_erase_suspend.patch |    11 +
 ...-mtd_m25p80_add_pm25lv_flash_support.patch |    39 +
 .../473-mtd_m25p80_add_w25q128.patch          |    10 +
 .../474-mtd_mp25p80_add_pm25lq032.patch       |    10 +
 ...et_0002-add-buffer-write-cmd-timeout.patch |    18 +
 ...-allow-to-disable-small-sector-erase.patch |    41 +
 .../478-mtd-partial_eraseblock_unlock.patch   |    18 +
 .../500-yaffs-Kbuild-integration.patch        |    18 +
 ...ffs-3.5-convert-to-use-kuid_t-kgid_t.patch |   155 +
 .../520-squashfs_update_xz_comp_opts.patch    |    25 +
 .../530-jffs2_make_lzma_available.patch       |  5142 ++
 .../patches-3.8/531-debloat_lzma.patch        |  1024 +
 .../patches-3.8/532-jffs2_eofdetect.patch     |    53 +
 .../540-crypto-xz-decompression-support.patch |   146 +
 .../541-ubifs-xz-decompression-support.patch  |    92 +
 .../550-ubifs-symlink-xattr-support.patch     |    65 +
 ...fs-fix-default-compression-selection.patch |    29 +
 .../600-netfilter_layer7_2.22.patch           |  2141 +
 .../601-netfilter_layer7_pktmatch.patch       |   108 +
 .../602-netfilter_layer7_match.patch          |    51 +
 .../603-netfilter_layer7_2.6.36_fix.patch     |    61 +
 .../604-netfilter_conntrack_flush.patch       |    86 +
 ...etfilter_match_bypass_default_checks.patch |    93 +
 ...netfilter_match_bypass_default_table.patch |    81 +
 ...netfilter_match_reduce_memory_access.patch |    16 +
 ...-netfilter_optional_tcp_window_check.patch |    36 +
 .../615-netfilter_add_xt_id_match.patch       |    95 +
 .../generic/patches-3.8/620-sched_esfq.patch  |   791 +
 .../patches-3.8/621-sched_act_connmark.patch  |   172 +
 .../patches-3.8/630-packet_socket_type.patch  |   134 +
 .../640-bridge_no_eap_forward.patch           |    15 +
 .../641-bridge_always_accept_eap.patch        |    11 +
 .../patches-3.8/642-bridge_port_isolate.patch |   103 +
 .../643-bridge_remove_ipv6_dependency.patch   |   107 +
 .../644-bridge_optimize_netfilter_hooks.patch |   146 +
 .../patches-3.8/650-pppoe_header_pad.patch    |    20 +
 .../651-wireless_mesh_header.patch            |    11 +
 .../patches-3.8/652-atm_header_changes.patch  |    12 +
 .../653-disable_netlink_trim.patch            |    28 +
 .../patches-3.8/655-increase_skb_pad.patch    |    11 +
 .../656-skb_reduce_truesize-helper.patch      |    41 +
 .../657-qdisc_reduce_truesize.patch           |    63 +
 .../patches-3.8/660-fq_codel_defaults.patch   |    14 +
 .../661-fq_codel_keep_dropped_stats.patch     |    10 +
 .../662-use_fq_codel_by_default.patch         |    75 +
 .../patches-3.8/663-remove_pfifo_fast.patch   |   144 +
 ...ng-with-source-address-failed-policy.patch |   241 +
 .../generic/patches-3.8/700-swconfig.patch    |    39 +
 .../patches-3.8/701-phy_extension.patch       |    72 +
 .../702-phy_add_aneg_done_function.patch      |    45 +
 ...detach-callback-to-struct-phy_driver.patch |    27 +
 ...710-phy-add-mdio_register_board_info.patch |   191 +
 .../generic/patches-3.8/720-phy_adm6996.patch |    26 +
 .../generic/patches-3.8/721-phy_packets.patch |   175 +
 .../patches-3.8/722-phy_mvswitch.patch        |    23 +
 .../generic/patches-3.8/723-phy_ip175c.patch  |    23 +
 .../generic/patches-3.8/724-phy_ar8216.patch  |    24 +
 .../generic/patches-3.8/725-phy_rtl8306.patch |    23 +
 .../generic/patches-3.8/726-phy_rtl8366.patch |    45 +
 .../generic/patches-3.8/727-phy-rtl8367.patch |    23 +
 .../generic/patches-3.8/728-phy-micrel.patch  |    24 +
 .../patches-3.8/729-phy-rtl8367b.patch        |    23 +
 .../generic/patches-3.8/729-phy-tantos.patch  |    21 +
 .../generic/patches-3.8/730-phy_b53.patch     |    21 +
 .../patches-3.8/750-hostap_txpower.patch      |   154 +
 ...sb-ohci-multiple-platform-driver-fix.patch |    51 +
 .../810-pci_disable_common_quirks.patch       |    51 +
 .../811-pci_disable_usb_common_quirks.patch   |    80 +
 .../820-usb_add_usb_find_device_by_name.patch |    84 +
 .../patches-3.8/830-ledtrig_morse.patch       |    28 +
 .../patches-3.8/831-ledtrig_netdev.patch      |    51 +
 .../patches-3.8/832-ledtrig_usbdev.patch      |    31 +
 .../generic/patches-3.8/840-rtc7301.patch     |   250 +
 .../patches-3.8/841-rtc_pt7c4338.patch        |   247 +
 .../861-04_spi_gpio_implement_spi_delay.patch |    58 +
 .../patches-3.8/862-gpio_spi_driver.patch     |   373 +
 .../generic/patches-3.8/863-gpiommc.patch     |   844 +
 .../864-gpiommc_configfs_locking.patch        |    58 +
 .../patches-3.8/870-hifn795x_byteswap.patch   |    17 +
 .../880-gateworks_system_controller.patch     |   339 +
 .../patches-3.8/890-8250_optional_sysrq.patch |    24 +
 .../patches-3.8/900-slab_maxsize.patch        |    13 +
 .../patches-3.8/901-debloat_sock_diag.patch   |    46 +
 .../patches-3.8/902-debloat_proc.patch        |   327 +
 .../patches-3.8/903-debloat_direct_io.patch   |    84 +
 .../patches-3.8/910-kobject_uevent.patch      |    21 +
 .../911-kobject_add_broadcast_uevent.patch    |    65 +
 .../patches-3.8/921-use_preinit_as_init.patch |    12 +
 ...ays-create-console-node-in-initramfs.patch |    30 +
 .../generic/patches-3.8/930-crashlog.patch    |   276 +
 .../940-ocf_kbuild_integration.patch          |    20 +
 .../patches-3.8/941-ocf_20120127.patch        |   166 +
 .../960-decompress_unlzo_fix.patch            |    23 +
 ...e-filenames-from-deps_initramfs-list.patch |    28 +
 .../980-arm_openwrt_machtypes.patch           |    34 +
 ...ore_wdt_fix_watchdog_counter_loading.patch |    76 +
 ...re_wdt_fix_wdioc_setoptions_handling.patch |    29 +
 .../994-mpcore_wdt_fix_timer_mode_setup.patch |    57 +
 ...995-mpcore_twd_calibrate_single_core.patch |    23 +
 .../996-zsmalloc_allow_module_build.patch     |     9 +
 .../patches-3.8/997-device_tree_cmdline.patch |    12 +
 trunk/target/linux/sunxi/Makefile             |    29 +
 trunk/target/linux/sunxi/base-files.mk        |     3 +
 .../target/linux/sunxi/base-files/etc/inittab |     5 +
 .../base-files/etc/uci-defaults/02_network    |    33 +
 .../lib/preinit/01_preinit_sunxi.sh           |     9 +
 .../linux/sunxi/base-files/lib/sunxi.sh       |    45 +
 trunk/target/linux/sunxi/config-3.14          |   468 +
 trunk/target/linux/sunxi/config-3.18          |   529 +
 trunk/target/linux/sunxi/image/Config.in      |     5 +
 trunk/target/linux/sunxi/image/Makefile       |   112 +
 .../linux/sunxi/image/gen_sunxi_sdcard_img.sh |    35 +
 trunk/target/linux/sunxi/modules.mk           |   104 +
 ...-dt-sun4i-add-missing-serial-aliases.patch |    28 +
 ...-dt-sun6i-add-missing-serial-aliases.patch |    32 +
 ...-dt-sun7i-add-missing-serial-aliases.patch |    30 +
 ...-dt-sun5i-add-missing-serial-aliases.patch |    27 +
 ...104-dt-sun7i-add-pinmuxing-for-uart2.patch |    30 +
 .../105-dt-sun4i-add-linksprite-pcduino.patch |    78 +
 .../106-dt-sun7i-add-arch-timer-node.patch    |    31 +
 .../107-dt-sun4i-add-a10-lime.patch           |   141 +
 ...0-dt-sun6i-add-pll-and-spi-modclocks.patch |    77 +
 .../111-dt-sun4i-rename-clocknodes.patch      |   134 +
 .../112-dt-sun5i-rename-clocknodes.patch      |   254 +
 .../113-dt-sun6i-rename-clocknodes.patch      |   107 +
 .../114-dt-sun7i-rename-clocknodes.patch      |   127 +
 .../115-dt-sun6i-fix-mod0-compat.patch        |    51 +
 .../116-dt-sun7i-add-usb-to-cubietruck.patch  |    23 +
 .../120-dt-sun7i-add-gmac-clocknode.patch     |    51 +
 .../121-dt-sun7i-add-gmac-ctrlnode.patch      |    34 +
 .../122-dt-sun7i-add-pinmuxing-for-gmac.patch |    48 +
 .../123-dt-sun7i-cubietruck-enable-gmac.patch |    33 +
 ...124-dt-sun7i-cubieboard2-enable-gmac.patch |    56 +
 .../125-dt-sun7i-olinuxinom-enable-gmac.patch |    57 +
 .../126-dt-sun7i-add-eth-alias-for-gmac.patch |    26 +
 .../130-dt-sun4i-add-usbclock-bindings.patch  |    30 +
 .../131-dt-sun5i-add-usbclock-bindings.patch  |    49 +
 .../132-dt-sun7i-add-usbclock-bindings.patch  |    30 +
 .../patches-3.14/135-pinctrl-fixes.patch      |    78 +
 .../136-1-irqchip-sun4i-fixes.patch           |   217 +
 ...137-1-pinctrl-create-irq-pin-mapping.patch |    36 +
 ...-2-pinctrl-add-IRQCHIP_SKIP_SET_WAKE.patch |    26 +
 .../137-3-dt-sun7i-add-interrupt-cells.patch  |    26 +
 ...t-sunxi-convert-to-new-clock-compats.patch |  1017 +
 ...t-sunxi-add-common-regulator-include.patch |    97 +
 .../145-1-dt-sun7i-add-a20-spi.patch          |    73 +
 .../145-2-dt-sun4i-add-a10-spi.patch          |    72 +
 .../145-3-dt-sun5i-add-a13-spi.patch          |    55 +
 .../patches-3.14/146-1-spi-add-a31-spi.patch  |   559 +
 .../patches-3.14/146-2-spi-add-a10-spi.patch  |   558 +
 .../147-sun6i-enable-spi-in-defconfig.patch   |    29 +
 .../148-dt-sun7i-add-spi-muxing.patch         |    33 +
 .../149-dt-sun7i-add-spi-on-olinuxinom.patch  |    41 +
 .../patches-3.14/150-dt-sun4i-add-ahci.patch  |    78 +
 .../patches-3.14/151-dt-sun7i-add-ahci.patch  |   136 +
 .../155-wdt-add-new-compats.patch             |    46 +
 .../156-dt-sunxi-update-wdt-compats.patch     |    73 +
 ...ch-add-new-wdtcompats-to-reboot-code.patch |    26 +
 .../160-dt-sun4i-add-usb-host-bindings.patch  |    81 +
 .../161-dt-sun5i-add-usb-host-bindings.patch  |    55 +
 .../162-dt-sun7i-add-usb-host-bindings.patch  |    81 +
 .../163-dt-sun4i-add-usb-host-to-boards.patch |   240 +
 .../164-dt-sun5i-add-usb-host-to-boards.patch |   121 +
 .../165-dt-sun7i-add-usb-host-to-boards.patch |   161 +
 .../170-input-add-sun4i-ts-driver.patch       |   341 +
 .../171-input-add-temp-sensor-support.patch   |   256 +
 .../172-input-add-lradc-keys-driver.patch     |   326 +
 .../173-1-dt-sun4i-add-lradc-node.patch       |    26 +
 .../173-2-dt-sun5i-add-lradc-node.patch       |    53 +
 .../173-3-dt-sun7i-add-lradc-node.patch       |    52 +
 .../175-reset-add-of_reset_control_get.patch  |   112 +
 ...k-sun5i-add-support-for-reset-ctrler.patch |    62 +
 ...d-clock-output-names-dt-prop-support.patch |    50 +
 .../181-clk-sunxi-add-names-for-pll56.patch   |    78 +
 ...i-add-support-for-usb-clockreg-reset.patch |   128 +
 ...-clk-sunxi-get-divs-parent-clockname.patch |    40 +
 .../183-clk-sunxi-add-usb-clockreg-defs.patch |    69 +
 .../184-clk-sunxi-add-pll6-on-a31.patch       |   104 +
 ...185-clk-sunxi-add-a20-a31-gmac-clock.patch |   175 +
 .../186-clk-sunxi-add-new-clock-compats.patch |   178 +
 .../187-clk-sunxi-automatic-reparenting.patch |    68 +
 ...88-clk-sunxi-implement-mmc-phasectrl.patch |    87 +
 .../190-ahci-libahci-changes.patch            |   872 +
 .../191-ahci-add-sunxi-driver.patch           |   340 +
 .../192-ahci-platform-changes.patch           |   202 +
 .../195-1-ohci-plat-changes.patch             |   344 +
 .../195-2-ehci-plat-changes.patch             |   414 +
 .../195-3-uhci-plat-changes.patch             |    72 +
 .../195-4-xhci-plat-changes.patch             |    49 +
 .../196-usb-add-sunxi-phy-driver.patch        |   410 +
 .../patches-3.14/200-mmc-add-driver.patch     |  1150 +
 ...-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch |   159 +
 .../202-dt-sun5i-add-mmc-nodes.patch          |   125 +
 .../203-dt-sun7i-add-mmc-nodes.patch          |   171 +
 .../patches-3.14/205-nmi-add-driver.patch     |   239 +
 .../206-dt-sun67i-add-nmi-irqchip.patch       |    47 +
 .../210-mfd-add-axp20x-pmic-driver.patch      |   502 +
 ...-add-axp20x-power-enable-key-support.patch |   327 +
 ...gulator-add-axp20x-regulator-support.patch |   402 +
 .../213-dt-sunxi-add-x-powers.patch           |    77 +
 ...1-dt-sun7i-add-axp209-to-cubieboard2.patch |    35 +
 .../214-2-dt-sun4i-add-axp209-to-boards.patch |   142 +
 ...-3-dt-sun7i-add-axp209-to-cubietruck.patch |    49 +
 ...n5i-add-address-and-sizecells-to-i2c.patch |    40 +
 ...n7i-add-address-and-sizecells-to-i2c.patch |    58 +
 ...n4i-add-address-and-sizecells-to-i2c.patch |    40 +
 .../216-dt-sun7i-add-i2c-to-cubietruck.patch  |    43 +
 ...20-clk-sunxi-remove-calls-to-clk_put.patch |    36 +
 .../patches-3.14/230-net-rfkill-changes.patch |   148 +
 .../231-1-brcmfmac-fix-sdio-sending.patch     |    32 +
 ...mfmac-fix-use-of-skb-ctrlbuf-in-SDIO.patch |    64 +
 ...32-1-dt-sun7i-add-wifi-to-cubietruck.patch |    91 +
 ...dt-sun7i-add-bluetooth-to-cubietruck.patch |    73 +
 .../patches-3.14/250-pwm-add-driver.patch     |   369 +
 .../251-1-dt-sun4i-add-pinmux-for-pwm.patch   |    36 +
 .../251-2-dt-sun7i-add-pinmux-for-pwm.patch   |    36 +
 .../252-1-dt-sun4i-add-pwm-support.patch      |    30 +
 .../252-2-dt-sun7i-add-pwm-support.patch      |    30 +
 .../260-dt-sun7i-enable-arm-pmu.patch         |    28 +
 .../270-dt-sun7i-add-ss-to-a20.patch          |    17 +
 .../patches-3.14/271-crypto-add-ss.patch      |  1241 +
 .../275-clk-sunxi-late-clock-fixes.patch      |    29 +
 .../patches-3.14/280-ir-add-driver.patch      |   363 +
 .../281-dt-sun7i-add-ir-pins.patch            |    36 +
 .../282-dt-sun7i-add-ir-ctrlers.patch         |    40 +
 .../283-dt-sun7i-add-ir-to-cb2-cbt.patch      |    47 +
 .../284-ir-backports-from-3.15.patch          |  1210 +
 .../300-1-dt-sun7i-add-pcduino3.patch         |    39 +
 .../300-2-dt-sun7i-add-pcduino3-dts.patch     |   156 +
 .../301-dt-sun7i-update-pcduino3.patch        |    12 +
 ...302-1-dt-sun7i-add-bananapi-Makefile.patch |    10 +
 .../302-2-dt-sun7i-add-bananapi-dts.patch     |   163 +
 .../303-dt-sun7i-update-bananapi.patch        |    12 +
 ...sun7i-update-pcduino3-add-regulators.patch |    20 +
 ...sun7i-update-bananapi-add-regulators.patch |    20 +
 .../306-dt-sun7i-fix-gmac-on-bananapi.patch   |    46 +
 .../307-dt-sun7i-add-axp209-to-bananapi.patch |    17 +
 .../308-dt-sun7i-add-axp209-to-pcduino3.patch |    17 +
 .../309-dt-sun7i-add-ir-to-bananapi.patch     |    32 +
 .../310-dt-sun7i-add-a20-olinuxino-lime.patch |   159 +
 .../100-dt-sun7i-add_spi0_pins_a.patch        |    28 +
 .../101-dt-sun7i-add-uart3_pins.patch         |    31 +
 .../102-dt-sun7i-add_mmc2_pins.patch          |    28 +
 .../110-input-add-sun4i-lradc.patch           |   412 +
 .../patches-3.18/111-dt-sun4i-add-lradc.patch |    28 +
 .../patches-3.18/112-dt-sun5i-add-lradc.patch |   175 +
 .../patches-3.18/113-dt-sun7i-add-lradc.patch |   106 +
 ...115-input-sun4i-ts-update-temp-curve.patch |    83 +
 ...-sunxi-update-compats-for-tempcurves.patch |    57 +
 .../130-input-add-axp20x-pek.patch            |   339 +
 ...35-ahci-fix-threaded-interrupt-setup.patch |    97 +
 .../150-pwm-add-sunxi-driver.patch            |   409 +
 .../200-mmc-add-sdio-function-subnode.patch   |   148 +
 ...t-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch |    68 +
 ...dt-sun7i-add-bluetooth-to-cubietruck.patch |    75 +
 .../270-dt-sun7i-add-ss-to-a20.patch          |    17 +
 .../patches-3.18/271-crypto-add-ss.patch      |  1512 +
 .../300-dt-sun7i-add-bananapi.patch           |   250 +
 .../target/linux/sunxi/profiles/01-default.mk |    17 +
 .../linux/sunxi/profiles/a10-olinuxino.mk     |    18 +
 .../linux/sunxi/profiles/a13-olimex-som.mk    |    18 +
 .../linux/sunxi/profiles/a13-olinuxino.mk     |    18 +
 .../linux/sunxi/profiles/a20-olinuxino.mk     |    31 +
 trunk/target/linux/sunxi/profiles/bananapi.mk |    18 +
 .../target/linux/sunxi/profiles/cubieboard.mk |    18 +
 .../linux/sunxi/profiles/cubieboard2.mk       |    18 +
 trunk/target/linux/sunxi/profiles/pcduino.mk  |    18 +
 trunk/target/linux/sunxi/profiles/pcduino3.mk |    18 +
 trunk/target/linux/uml/Makefile               |    36 +
 trunk/target/linux/uml/README                 |    45 +
 trunk/target/linux/uml/config/i386            |   168 +
 trunk/target/linux/uml/config/x86_64          |   156 +
 trunk/target/linux/uml/image/Makefile         |    19 +
 .../001-fix_make_headers_install.patch        |  3814 ++
 .../uml/patches-3.14/101-mconsole-exec.patch  |   211 +
 .../patches-3.14/102-pseudo-random-mac.patch  |   124 +
 trunk/target/linux/x86/Makefile               |    26 +
 .../x86/alix2/base-files/etc/config/network   |    28 +
 .../x86/alix2/base-files/etc/config/system    |    29 +
 .../base-files/etc/hotplug.d/button/50-reboot |    13 +
 trunk/target/linux/x86/alix2/config-default   |    29 +
 trunk/target/linux/x86/alix2/target.mk        |    32 +
 trunk/target/linux/x86/base-files.mk          |     6 +
 .../linux/x86/base-files/etc/config/network   |    26 +
 trunk/target/linux/x86/base-files/etc/inittab |     4 +
 .../lib/preinit/15_essential_fs_x86           |     8 +
 .../x86/base-files/lib/preinit/20_check_iso   |     5 +
 .../x86/base-files/lib/preinit/79_move_config |    22 +
 .../x86/base-files/lib/upgrade/platform.sh    |    44 +
 trunk/target/linux/x86/config-3.10            |   414 +
 trunk/target/linux/x86/config-3.14            |   424 +
 trunk/target/linux/x86/config-3.3             |   381 +
 trunk/target/linux/x86/ep80579/config-3.3     |    11 +
 trunk/target/linux/x86/ep80579/target.mk      |    10 +
 trunk/target/linux/x86/generic/config-default |   190 +
 .../linux/x86/generic/profiles/000-Generic.mk |    18 +
 .../linux/x86/generic/profiles/Soekris45xx.mk |    16 +
 .../linux/x86/generic/profiles/Soekris48xx.mk |    16 +
 .../target/linux/x86/generic/profiles/Wrap.mk |    16 +
 trunk/target/linux/x86/generic/target.mk      |     7 +
 .../x86/geos/base-files/etc/config/network    |    53 +
 .../x86/geos/base-files/etc/config/system     |    30 +
 .../base-files/etc/hotplug.d/button/50-reboot |    13 +
 trunk/target/linux/x86/geos/config-default    |    24 +
 trunk/target/linux/x86/geos/target.mk         |    34 +
 trunk/target/linux/x86/image/Config.in        |    20 +
 trunk/target/linux/x86/image/Makefile         |   267 +
 .../linux/x86/image/gen_image_generic.sh      |    39 +
 .../target/linux/x86/image/gen_image_olpc.sh  |    35 +
 trunk/target/linux/x86/image/grub-early.cfg   |     1 +
 trunk/target/linux/x86/image/grub-iso.cfg     |    10 +
 trunk/target/linux/x86/image/grub.cfg         |    13 +
 .../linux/x86/image/mkimg_bifferboard.py      |    50 +
 trunk/target/linux/x86/image/mkimg_sitecom.pl |    11 +
 trunk/target/linux/x86/image/olpc.fth         |     5 +
 .../target/linux/x86/kvm_guest/config-default |    87 +
 trunk/target/linux/x86/kvm_guest/target.mk    |     3 +
 trunk/target/linux/x86/modules.mk             |   330 +
 .../x86/net5501/base-files/etc/config/network |    26 +
 .../x86/net5501/base-files/etc/config/system  |    16 +
 .../base-files/etc/hotplug.d/button/50-reboot |    13 +
 trunk/target/linux/x86/net5501/config-default |    22 +
 trunk/target/linux/x86/net5501/target.mk      |    33 +
 .../x86/olpc/base-files/etc/X11/xorg.conf     |    71 +
 .../x86/olpc/base-files/etc/config/network    |    16 +
 .../lib/preinit/15_essential_fs_x86           |     7 +
 .../olpc/base-files/lib/upgrade/platform.sh   |    27 +
 trunk/target/linux/x86/olpc/config-default    |   121 +
 trunk/target/linux/x86/olpc/target.mk         |     3 +
 .../x86/patches-3.10/006-yenta_mistery.patch  |    20 +
 .../009-rdc321x_select_embedded.patch         |    11 +
 .../x86/patches-3.10/010-rdc_cpu_ident.patch  |   176 +
 .../patches-3.10/011-tune_lzma_options.patch  |    22 +
 .../patches-3.10/012-export_erase_write.patch |    23 +
 .../x86/patches-3.10/100-rdc_boards.patch     |   745 +
 .../120-panic_on_unrecovered_nmi.patch        |    11 +
 .../x86/patches-3.10/150-pit-tick-rate.patch  |    13 +
 .../x86/patches-3.10/160-kexec-fix.patch      |    43 +
 .../x86/patches-3.14/006-yenta_mistery.patch  |    20 +
 .../009-rdc321x_select_embedded.patch         |    11 +
 .../x86/patches-3.14/010-rdc_cpu_ident.patch  |   176 +
 .../patches-3.14/011-tune_lzma_options.patch  |    22 +
 .../patches-3.14/012-export_erase_write.patch |    23 +
 .../x86/patches-3.14/100-rdc_boards.patch     |   745 +
 .../120-panic_on_unrecovered_nmi.patch        |    11 +
 .../x86/patches-3.14/150-pit-tick-rate.patch  |    13 +
 .../x86/patches-3.14/160-kexec-fix.patch      |    43 +
 .../x86/patches-3.3/001-alix_platform.patch   |   131 +
 .../x86/patches-3.3/002-geos_platform.patch   |   178 +
 .../patches-3.3/003-via-rhine-crash-fix.patch |    60 +
 .../x86/patches-3.3/006-yenta_mistery.patch   |    20 +
 .../009-rdc321x_select_embedded.patch         |    11 +
 .../x86/patches-3.3/010-rdc_cpu_ident.patch   |   176 +
 .../patches-3.3/011-tune_lzma_options.patch   |    22 +
 .../patches-3.3/012-export_erase_write.patch  |    23 +
 .../x86/patches-3.3/100-rdc_boards.patch      |   741 +
 .../120-panic_on_unrecovered_nmi.patch        |    11 +
 .../x86/patches-3.3/150-pit-tick-rate.patch   |    14 +
 .../linux/x86/patches-3.3/160-kexec-fix.patch |    43 +
 .../x86/rdc/base-files/etc/config/network     |    26 +
 .../linux/x86/rdc/base-files/etc/diag.sh      |    17 +
 .../lib/preinit/05_set_ether_mac_rdc          |    36 +
 .../rdc/base-files/lib/upgrade/platform.sh    |    10 +
 trunk/target/linux/x86/rdc/config-default     |    66 +
 trunk/target/linux/x86/rdc/profiles/ar525w.mk |    12 +
 .../linux/x86/rdc/profiles/bifferboard.mk     |    13 +
 trunk/target/linux/x86/rdc/profiles/r8610.mk  |    14 +
 .../target/linux/x86/rdc/profiles/sitecom.mk  |    12 +
 trunk/target/linux/x86/rdc/target.mk          |    13 +
 .../x86/thincan/base-files/etc/init.d/alsa    |     9 +
 trunk/target/linux/x86/thincan/config-default |    15 +
 .../linux/x86/thincan/profiles/dbe61.mk       |    25 +
 trunk/target/linux/x86/thincan/target.mk      |    35 +
 .../linux/x86/xen_domu/base-files/etc/inittab |     5 +
 .../base-files/lib/preinit/45_mount_xenfs     |    11 +
 .../target/linux/x86/xen_domu/config-default  |    85 +
 trunk/target/linux/x86/xen_domu/target.mk     |     3 +
 trunk/target/linux/x86_64/Makefile            |    23 +
 .../linux/x86_64/base-files/etc/inittab       |     4 +
 .../lib/preinit/15_essential_fs_x86           |     8 +
 .../base-files/lib/preinit/79_move_config     |    15 +
 .../x86_64/base-files/lib/upgrade/platform.sh |    66 +
 trunk/target/linux/x86_64/config-default      |   506 +
 trunk/target/linux/x86_64/image/Makefile      |   220 +
 .../linux/x86_64/image/gen_image_generic.sh   |    39 +
 .../target/linux/x86_64/image/grub-early.cfg  |     1 +
 trunk/target/linux/x86_64/image/grub-iso.cfg  |    10 +
 trunk/target/linux/x86_64/image/grub.cfg      |    13 +
 .../patches/011-tune_lzma_options.patch       |    22 +
 .../patches/012-export_erase_write.patch      |    23 +
 trunk/target/sdk/Config.in                    |     9 +
 trunk/target/sdk/Makefile                     |   130 +
 trunk/target/sdk/convert-config.pl            |    40 +
 trunk/target/sdk/files/Config.in              |     2 +
 trunk/target/sdk/files/Makefile               |    56 +
 trunk/target/sdk/files/README.SDK             |     7 +
 trunk/target/toolchain/Config.in              |     8 +
 trunk/target/toolchain/Makefile               |    73 +
 trunk/target/toolchain/files/README.TOOLCHAIN |     2 +
 trunk/target/toolchain/files/wrapper.sh       |    95 +
 trunk/toolchain/Config.in                     |   307 +
 trunk/toolchain/Makefile                      |    87 +
 trunk/toolchain/binutils/Config.in            |    33 +
 trunk/toolchain/binutils/Makefile             |    98 +
 .../patches/2.20.1/110-arm-eabi-conf.patch    |    22 +
 .../2.20.1/111-pr7093.elf32-arm.c.patch       |    13 +
 .../patches/2.20.1/200-mips_non_pic.patch     |   209 +
 .../2.20.1/300-001_ld_makefile_patch.patch    |    22 +
 .../300-012_check_ldrunpath_length.patch      |    20 +
 .../2.20.1/310-backport_fPIE_mips_fix.patch   |    15 +
 .../2.20.1/400-autoreconf-compat.patch        |    84 +
 .../binutils/patches/2.20.1/700-avr32.patch   | 30797 ++++++++++
 .../linaro/300-001_ld_makefile_patch.patch    |    22 +
 .../300-012_check_ldrunpath_length.patch      |    20 +
 .../400-mips_no_dynamic_linking_sym.patch     |    18 +
 trunk/toolchain/eglibc/Config.in              |    21 +
 trunk/toolchain/eglibc/Config.version         |    26 +
 trunk/toolchain/eglibc/Makefile               |    31 +
 trunk/toolchain/eglibc/common.mk              |   103 +
 trunk/toolchain/eglibc/config/Config.in       |   903 +
 trunk/toolchain/eglibc/headers/Makefile       |    27 +
 trunk/toolchain/eglibc/include/libintl.h      |     6 +
 .../patches/2.15/001-fix_autoconf_macro.patch |    48 +
 .../eglibc/patches/2.15/005-versions.patch    |    11 +
 ...050-all_glibc-2.14-leak-revert-crash.patch |   110 +
 .../patches/2.15/100-fix_cross_rpcgen.patch   |    71 +
 .../patches/2.15/110-fix_cross_zic.patch      |    27 +
 .../patches/2.15/120-use_host_cflags.patch    |    22 +
 .../2.15/200-add-dl-search-paths.patch        |    14 +
 .../patches/2.19/100-fix_cross_rpcgen.patch   |    52 +
 .../2.19/200-add-dl-search-paths.patch        |    14 +
 .../2.19/300-require-autoconf-2.69.patch      |    13 +
 trunk/toolchain/gcc/Config.in                 |    76 +
 trunk/toolchain/gcc/Config.version            |    39 +
 trunk/toolchain/gcc/common.mk                 |   211 +
 .../toolchain/gcc/files/alternate-arch-cc.in  |     3 +
 trunk/toolchain/gcc/final/Makefile            |    78 +
 trunk/toolchain/gcc/initial/Makefile          |    36 +
 trunk/toolchain/gcc/minimal/Makefile          |    46 +
 .../gcc/patches/4.4.7/100-uclibc-conf.patch   |    33 +
 .../4.4.7/301-missing-execinfo_h.patch        |    11 +
 .../gcc/patches/4.4.7/302-c99-snprintf.patch  |    11 +
 .../4.4.7/305-libmudflap-susv3-legacy.patch   |    47 +
 .../4.4.7/810-arm-softfloat-libgcc.patch      |    25 +
 .../gcc/patches/4.4.7/820-libgcc_pic.patch    |    36 +
 .../gcc/patches/4.4.7/910-mbsd_multi.patch    |   269 +
 .../4.4.7/920-specs_nonfatal_getenv.patch     |    14 +
 .../gcc/patches/4.4.7/930-avr32_support.patch | 22706 +++++++
 .../931-avr32_disable_shifted_data_opt.patch  |    32 +
 .../patches/4.4.7/933-avr32_bug_7435.patch    |    32 +
 .../patches/4.4.7/934-avr32_bug_9675.patch    |    21 +
 .../993-arm_insn-opinit-RTX_CODE-fixup.patch  |    14 +
 .../gcc/patches/4.4.7/999-coldfire.patch      |    10 +
 .../4.6-linaro/010-documentation.patch        |    23 +
 .../4.6-linaro/020-gcc_bug_54295.patch        |    70 +
 .../4.6-linaro/030-gcc_bug_48403.patch        |    16 +
 .../4.6-linaro/040-gcc_bug_49696.patch        |    65 +
 .../patches/4.6-linaro/100-uclibc-conf.patch  |    33 +
 .../gcc/patches/4.6-linaro/200-musl.patch     |   240 +
 .../4.6-linaro/301-missing-execinfo_h.patch   |    11 +
 .../patches/4.6-linaro/302-c99-snprintf.patch |    11 +
 .../305-libmudflap-susv3-legacy.patch         |    47 +
 .../800-arm_v5te_no_ldrd_strd.patch           |    11 +
 .../4.6-linaro/810-arm-softfloat-libgcc.patch |    26 +
 .../patches/4.6-linaro/820-libgcc_pic.patch   |    36 +
 .../4.6-linaro/830-arm_unbreak_armv4t.patch   |    13 +
 .../840-armv4_pass_fix-v4bx_to_ld.patch       |    19 +
 .../4.6-linaro/850-use_shared_libgcc.patch    |    86 +
 .../4.6-linaro/860-uclibc_use_eh_frame.patch  |    29 +
 .../4.6-linaro/870-ppc_no_crtsavres.patch     |    20 +
 .../4.6-linaro/880-no_java_section.patch      |    11 +
 .../gcc/patches/4.6-linaro/900-bad-mips16-crt |     9 +
 .../patches/4.6-linaro/910-mbsd_multi.patch   |   253 +
 .../920-specs_nonfatal_getenv.patch           |    14 +
 .../gcc/patches/4.6-linaro/999-coldfire.patch |    11 +
 .../001-revert_register_mode_search.patch     |    65 +
 .../4.8-linaro/002-weak_data_fix.patch        |    42 +
 .../003-universal_initializer.patch           |    94 +
 .../4.8-linaro/004-case_insensitive.patch     |    14 +
 .../4.8-linaro/010-documentation.patch        |    23 +
 .../patches/4.8-linaro/100-uclibc-conf.patch  |    33 +
 .../patches/4.8-linaro/200-musl_config.patch  |   204 +
 .../gcc/patches/4.8-linaro/201-musl_arm.patch |    40 +
 .../patches/4.8-linaro/202-musl_mips.patch    |    13 +
 .../patches/4.8-linaro/203-musl_powerpc.patch |   100 +
 .../gcc/patches/4.8-linaro/204-musl_sh.patch  |    17 +
 .../gcc/patches/4.8-linaro/205-musl_x86.patch |    48 +
 .../patches/4.8-linaro/206-musl_aarch64.patch |    14 +
 .../4.8-linaro/207-musl_fixincludes.patch     |    12 +
 .../patches/4.8-linaro/208-musl_gomp.patch    |    11 +
 .../4.8-linaro/209-musl_libstdc++.patch       |    26 +
 ...210-disable_libsanitizer_off_t_check.patch |    11 +
 .../4.8-linaro/220-musl_mips_softfloat.patch  |     8 +
 .../patches/4.8-linaro/221-musl_mips64.patch  |    22 +
 .../800-arm_v5te_no_ldrd_strd.patch           |    11 +
 .../4.8-linaro/810-arm-softfloat-libgcc.patch |    25 +
 .../patches/4.8-linaro/820-libgcc_pic.patch   |    36 +
 .../4.8-linaro/830-arm_unbreak_armv4t.patch   |    13 +
 .../840-armv4_pass_fix-v4bx_to_ld.patch       |    19 +
 .../4.8-linaro/850-use_shared_libgcc.patch    |    47 +
 .../patches/4.8-linaro/860-use_eh_frame.patch |    42 +
 .../4.8-linaro/870-ppc_no_crtsavres.patch     |    11 +
 .../4.8-linaro/880-no_java_section.patch      |    11 +
 .../4.8-linaro/900-bad-mips16-crt.patch       |     9 +
 .../patches/4.8-linaro/910-mbsd_multi.patch   |   253 +
 .../920-specs_nonfatal_getenv.patch           |    14 +
 .../4.8-linaro/930-fix-mips-noexecstack.patch |   111 +
 .../001-revert_register_mode_search.patch     |    65 +
 .../4.9-linaro/002-case_insensitive.patch     |    14 +
 .../4.9-linaro/010-documentation.patch        |    23 +
 .../patches/4.9-linaro/100-uclibc-conf.patch  |    33 +
 .../patches/4.9-linaro/200-musl_config.patch  |   199 +
 .../gcc/patches/4.9-linaro/201-musl_arm.patch |    40 +
 .../patches/4.9-linaro/202-musl_mips.patch    |    13 +
 .../patches/4.9-linaro/203-musl_powerpc.patch |   100 +
 .../gcc/patches/4.9-linaro/204-musl_sh.patch  |    17 +
 .../gcc/patches/4.9-linaro/205-musl_x86.patch |    48 +
 .../patches/4.9-linaro/206-musl_aarch64.patch |    11 +
 .../4.9-linaro/207-musl_fixincludes.patch     |    12 +
 .../patches/4.9-linaro/208-musl_gomp.patch    |    11 +
 .../4.9-linaro/209-musl_libstdc++.patch       |    26 +
 ...210-disable_libsanitizer_off_t_check.patch |    11 +
 .../4.9-linaro/220-musl_mips_softfloat.patch  |     8 +
 .../patches/4.9-linaro/221-musl_mips64.patch  |    22 +
 .../800-arm_v5te_no_ldrd_strd.patch           |    11 +
 .../4.9-linaro/810-arm-softfloat-libgcc.patch |    25 +
 .../patches/4.9-linaro/820-libgcc_pic.patch   |    36 +
 .../4.9-linaro/830-arm_unbreak_armv4t.patch   |    13 +
 .../840-armv4_pass_fix-v4bx_to_ld.patch       |    19 +
 .../4.9-linaro/850-use_shared_libgcc.patch    |    47 +
 .../patches/4.9-linaro/860-use_eh_frame.patch |    42 +
 .../4.9-linaro/870-ppc_no_crtsavres.patch     |    11 +
 .../4.9-linaro/880-no_java_section.patch      |    11 +
 .../4.9-linaro/900-bad-mips16-crt.patch       |     9 +
 .../patches/4.9-linaro/910-mbsd_multi.patch   |   232 +
 .../920-specs_nonfatal_getenv.patch           |    14 +
 .../4.9-linaro/930-fix-mips-noexecstack.patch |   111 +
 trunk/toolchain/gdb/Makefile                  |    53 +
 .../gdb/patches/100-ppc_compile_fix.patch     |    11 +
 .../gdb/patches/110-no_extern_inline.patch    |    32 +
 .../600-fix-compile-flag-mismatch.patch       |    32 +
 trunk/toolchain/info.mk                       |     6 +
 trunk/toolchain/insight/Makefile              |    54 +
 .../600-fix-compile-flag-mismatch.patch       |    31 +
 trunk/toolchain/kernel-headers/Makefile       |   109 +
 .../patches-3.3.5/100-ext2_fs_header.patch    |    24 +
 trunk/toolchain/llvm/Makefile                 |    44 +
 .../llvm/patches/100-darwin_arch_auto.patch   |    19 +
 .../patches/110-darwin_version_detect.patch   |    16 +
 trunk/toolchain/musl/Config.in                |     6 +
 trunk/toolchain/musl/Config.version           |     8 +
 trunk/toolchain/musl/Makefile                 |    31 +
 trunk/toolchain/musl/common.mk                |    62 +
 trunk/toolchain/musl/headers/Makefile         |    16 +
 trunk/toolchain/musl/include/bits/wordsize.h  |     1 +
 trunk/toolchain/musl/include/features.h       |    48 +
 trunk/toolchain/musl/include/sgidefs.h        |    73 +
 trunk/toolchain/musl/include/sys/cdefs.h      |   378 +
 .../toolchain/musl/include/sys/glibc-types.h  |    35 +
 trunk/toolchain/musl/include/sys/queue.h      |   574 +
 .../musl/patches/100-add_glob_onlydir.patch   |    11 +
 .../110-getopt_optional_argument_fix.patch    |    20 +
 .../120-getopt_non-option-arguments_fix.patch |    43 +
 .../musl/patches/900-iconv_size_hack.patch    |    68 +
 trunk/toolchain/uClibc/Config.in              |    21 +
 trunk/toolchain/uClibc/Config.version         |     9 +
 trunk/toolchain/uClibc/Makefile               |    41 +
 trunk/toolchain/uClibc/common.mk              |    97 +
 trunk/toolchain/uClibc/config-0.9.33.2/arm    |     7 +
 trunk/toolchain/uClibc/config-0.9.33.2/armeb  |     7 +
 trunk/toolchain/uClibc/config-0.9.33.2/avr32  |    12 +
 trunk/toolchain/uClibc/config-0.9.33.2/common |   213 +
 trunk/toolchain/uClibc/config-0.9.33.2/cris   |     8 +
 trunk/toolchain/uClibc/config-0.9.33.2/debug  |     6 +
 trunk/toolchain/uClibc/config-0.9.33.2/i386   |    21 +
 trunk/toolchain/uClibc/config-0.9.33.2/i686   |    21 +
 trunk/toolchain/uClibc/config-0.9.33.2/m68k   |     6 +
 trunk/toolchain/uClibc/config-0.9.33.2/mips   |    17 +
 trunk/toolchain/uClibc/config-0.9.33.2/mips64 |    17 +
 .../uClibc/config-0.9.33.2/mips64.32          |    18 +
 .../uClibc/config-0.9.33.2/mips64.64          |    18 +
 .../uClibc/config-0.9.33.2/mips64.n32         |    18 +
 .../toolchain/uClibc/config-0.9.33.2/mips64el |    17 +
 .../uClibc/config-0.9.33.2/mips64el.32        |    18 +
 .../uClibc/config-0.9.33.2/mips64el.64        |    18 +
 .../uClibc/config-0.9.33.2/mips64el.n32       |    18 +
 trunk/toolchain/uClibc/config-0.9.33.2/mipsel |    17 +
 .../uClibc/config-0.9.33.2/mipsel.cobalt      |    17 +
 .../toolchain/uClibc/config-0.9.33.2/powerpc  |     6 +
 .../uClibc/config-0.9.33.2/powerpc.e500       |     6 +
 trunk/toolchain/uClibc/config-0.9.33.2/sparc  |     8 +
 .../uClibc/config-0.9.33.2/sparc.leon         |     8 +
 trunk/toolchain/uClibc/config-0.9.33.2/x86_64 |     6 +
 trunk/toolchain/uClibc/headers/Makefile       |    26 +
 .../009_backport_mount.h-update.patch         |    91 +
 .../010-backport_sscanf_alloc.patch           |   184 +
 .../011-dlsym_rtld_next_fix.patch             |    25 +
 .../patches-0.9.33.2/100-fix_unifdef.patch    |    11 +
 .../patches-0.9.33.2/110-compat_macros.patch  |    51 +
 .../patches-0.9.33.2/120-adjtimex.patch       |    14 +
 ...inet-fix-__read_etc_hosts_r-segfault.patch |    10 +
 .../132-inet_fix_res_init.patch               |    15 +
 .../133-inet6-scoped-getnameinfo.patch        |    26 +
 ...et_fix_threaded_use_of_res_functions.patch |   126 +
 .../136-inet_make_res_init_thread_safe.patch  |    55 +
 .../137-inet_fix_threaded_res_init.patch      |    12 +
 .../140-avr32_atomic_fix.patch                |    10 +
 .../150-vasprintf_size_reduce.patch           |    37 +
 .../patches-0.9.33.2/170-math_finite.patch    |    23 +
 .../180-pthread_cleanup_fix.patch             |    45 +
 ...90-nptl_use_arch_default_stack_limit.patch |    13 +
 .../200-no_forced_unwind.patch                |    10 +
 .../210-mips_use_pic_crt1.patch               |    11 +
 .../350-use-fputs_unlocked.patch              |    19 +
 .../410-llvm_workaround.patch                 |    11 +
 .../450-powerpc_copysignl.patch               |   103 +
 .../480-powerpc_rel24_support.patch           |    26 +
 .../uClibc/patches-0.9.33.2/500-eventfd.patch |    53 +
 .../600-mips64_abi_selection.patch            |    48 +
 .../610-mips64_syscall_fix.patch              |   285 +
 .../611-mips_syscall_error_argument.patch     |    99 +
 .../612-mips64_relocation_fix.patch           |    29 +
 .../613-mips64_more_relocation_fixes.patch    |    20 +
 .../614-mips64_fix_setjmp_longjmp.patch       |    99 +
 .../615-mips_fix_sigev_pad_size.patch         |    58 +
 .../616-mips_fix_stat_time.patch              |   123 +
 .../617-mips_fix_setjmp_ptrsize.patch         |    58 +
 .../618-mips64_fix_syscall_error.patch        |    36 +
 .../619-mips64_fix_sysdep_cancel.patch        |   195 +
 .../960-remove_eabi_oabi_selection.patch      |    32 +
 ...add___kernel_long_and___kernel_ulong.patch |   320 +
 .../981-fix_setting_arch_native_bit.patch     |    28 +
 .../patches-0.9.33.2/990-no-stack-cache.patch |    11 +
 .../patches-0.9.33.2/991-gen_wctype.patch     |   183 +
 .../999-eventfd_use_bits_scheme.patch         |   269 +
 trunk/toolchain/uClibc/utils/Makefile         |    24 +
 trunk/toolchain/wrapper/Makefile              |    62 +
 trunk/tools/Makefile                          |   162 +
 trunk/tools/autoconf/Makefile                 |    37 +
 .../autoconf/patches/000-relocatable.patch    |   167 +
 .../autoconf/patches/001-no_emacs_lib.patch   |    22 +
 trunk/tools/automake/Makefile                 |    36 +
 trunk/tools/automake/files/aclocal            |     2 +
 .../automake/patches/000-relocatable.patch    |    46 +
 ...clocal-skip-not-existing-directories.patch |    15 +
 trunk/tools/bc/Makefile                       |    18 +
 trunk/tools/bc/patches/001-no_doc.patch       |    23 +
 trunk/tools/bison/Makefile                    |    28 +
 .../bison/patches/010-intl-stub-compat.patch  |    15 +
 .../bison/patches/100-fix-gets-removal.patch  |    16 +
 trunk/tools/ccache/Makefile                   |    52 +
 trunk/tools/ccache/files/ccache_cc            |     2 +
 trunk/tools/ccache/files/ccache_cxx           |     2 +
 trunk/tools/cloog/Makefile                    |    41 +
 trunk/tools/cmake/Makefile                    |    27 +
 .../cmake/patches/100-disable_qt_tests.patch  |    32 +
 trunk/tools/dosfstools/Makefile               |    30 +
 trunk/tools/e2fsprogs/Makefile                |    52 +
 .../001-exit_0_on_corrected_errors.patch      |    11 +
 .../patches/002-dont-build-e4defrag.patch     |    11 +
 .../patches/003-openbsd-compat.patch          |    24 +
 .../patches/004-freebsd-compat.patch          |    13 +
 trunk/tools/elftosb/Makefile                  |    26 +
 trunk/tools/elftosb/patches/001-libm.patch    |    11 +
 .../elftosb/patches/002-fix-header-path.patch |    19 +
 .../elftosb/patches/003-use-ldflags.patch     |    26 +
 trunk/tools/findutils/Makefile                |    20 +
 ...21-Fix-time_t-vs-long-int-mismatches.patch |   158 +
 trunk/tools/firmware-utils/Makefile           |    80 +
 trunk/tools/firmware-utils/src/add_header.c   |   138 +
 trunk/tools/firmware-utils/src/addpattern.c   |   333 +
 trunk/tools/firmware-utils/src/airlink.c      |   332 +
 trunk/tools/firmware-utils/src/bcm_tag.h      |    70 +
 trunk/tools/firmware-utils/src/bcmalgo.c      |   248 +
 trunk/tools/firmware-utils/src/bcmalgo.h      |    83 +
 trunk/tools/firmware-utils/src/buffalo-enc.c  |   298 +
 trunk/tools/firmware-utils/src/buffalo-lib.c  |   480 +
 trunk/tools/firmware-utils/src/buffalo-lib.h  |   121 +
 trunk/tools/firmware-utils/src/buffalo-tag.c  |   374 +
 trunk/tools/firmware-utils/src/buffalo-tftp.c |   177 +
 trunk/tools/firmware-utils/src/csysimg.h      |    79 +
 trunk/tools/firmware-utils/src/cyg_crc.h      |   109 +
 trunk/tools/firmware-utils/src/cyg_crc16.c    |   110 +
 trunk/tools/firmware-utils/src/cyg_crc32.c    |   172 +
 trunk/tools/firmware-utils/src/dgfirmware.c   |   376 +
 trunk/tools/firmware-utils/src/dgn3500sum.c   |   167 +
 trunk/tools/firmware-utils/src/encode_crc.c   |   151 +
 .../firmware-utils/src/fix-u-media-header.c   |   354 +
 trunk/tools/firmware-utils/src/fw.h           |    70 +
 trunk/tools/firmware-utils/src/hcsmakeimage.c |   181 +
 trunk/tools/firmware-utils/src/imagetag.c     |   524 +
 trunk/tools/firmware-utils/src/imagetag.ggo   |    45 +
 .../firmware-utils/src/imagetag_cmdline.c     |  1174 +
 .../firmware-utils/src/imagetag_cmdline.h     |   272 +
 trunk/tools/firmware-utils/src/lzma2eva.c     |   190 +
 trunk/tools/firmware-utils/src/makeamitbin.c  |   316 +
 trunk/tools/firmware-utils/src/md5.c          |   307 +
 trunk/tools/firmware-utils/src/md5.h          |    65 +
 trunk/tools/firmware-utils/src/mkbrncmdline.c |   168 +
 trunk/tools/firmware-utils/src/mkbrnimg.c     |   183 +
 trunk/tools/firmware-utils/src/mkcameofw.c    |   433 +
 trunk/tools/firmware-utils/src/mkcasfw.c      |  1030 +
 trunk/tools/firmware-utils/src/mkchkimg.c     |   327 +
 trunk/tools/firmware-utils/src/mkcsysimg.c    |  1157 +
 trunk/tools/firmware-utils/src/mkdapimg.c     |   226 +
 trunk/tools/firmware-utils/src/mkdcs932.c     |    39 +
 trunk/tools/firmware-utils/src/mkdniimg.c     |   208 +
 trunk/tools/firmware-utils/src/mkedimaximg.c  |   259 +
 trunk/tools/firmware-utils/src/mkfwimage.c    |   467 +
 trunk/tools/firmware-utils/src/mkfwimage2.c   |   447 +
 .../firmware-utils/src/mkheader_gemtek.c      |   211 +
 trunk/tools/firmware-utils/src/mkhilinkfw.c   |   322 +
 trunk/tools/firmware-utils/src/mkmylofw.c     |  1297 +
 trunk/tools/firmware-utils/src/mkplanexfw.c   |   269 +
 trunk/tools/firmware-utils/src/mkporayfw.c    |   791 +
 trunk/tools/firmware-utils/src/mkrtn56uimg.c  |   294 +
 trunk/tools/firmware-utils/src/mksenaofw.c    |   417 +
 trunk/tools/firmware-utils/src/mktitanimg.c   |  1040 +
 trunk/tools/firmware-utils/src/mktitanimg.h   |   171 +
 trunk/tools/firmware-utils/src/mktplinkfw.c   |  1158 +
 trunk/tools/firmware-utils/src/mktplinkfw2.c  |   944 +
 trunk/tools/firmware-utils/src/mkwrgimg.c     |   240 +
 trunk/tools/firmware-utils/src/mkzcfw.c       |   408 +
 trunk/tools/firmware-utils/src/mkzynfw.c      |  1130 +
 trunk/tools/firmware-utils/src/motorola-bin.c |   227 +
 trunk/tools/firmware-utils/src/myloader.h     |   176 +
 trunk/tools/firmware-utils/src/nand_ecc.c     |   204 +
 trunk/tools/firmware-utils/src/osbridge-crc.c |   309 +
 trunk/tools/firmware-utils/src/pc1crypt.c     |   361 +
 trunk/tools/firmware-utils/src/ptgen.c        |   245 +
 trunk/tools/firmware-utils/src/seama.c        |   529 +
 trunk/tools/firmware-utils/src/seama.h        |   108 +
 trunk/tools/firmware-utils/src/sha1.c         |   443 +
 trunk/tools/firmware-utils/src/sha1.h         |    57 +
 trunk/tools/firmware-utils/src/spw303v.c      |   242 +
 trunk/tools/firmware-utils/src/srec2bin.c     |   524 +
 .../firmware-utils/src/tplink-safeloader.c    |   546 +
 trunk/tools/firmware-utils/src/trx.c          |   418 +
 trunk/tools/firmware-utils/src/trx2edips.c    |   171 +
 trunk/tools/firmware-utils/src/trx2usr.c      |   186 +
 trunk/tools/firmware-utils/src/wrt400n.c      |   334 +
 trunk/tools/firmware-utils/src/xorimage.c     |   135 +
 trunk/tools/firmware-utils/src/zynos.h        |   225 +
 trunk/tools/firmware-utils/src/zyxbcm.c       |   259 +
 trunk/tools/flex/Makefile                     |    29 +
 .../patches/100-remove_no_undefined.patch     |    18 +
 trunk/tools/flock/Makefile                    |    22 +
 trunk/tools/flock/src/flock.c                 |   325 +
 trunk/tools/genext2fs/Makefile                |    51 +
 .../genext2fs/patches/100-c99_scanf.patch     |    21 +
 .../genext2fs/patches/200-autoconf.patch      |    13 +
 .../patches/300-blocksize-creator.patch       |   558 +
 .../genext2fs/patches/400-byteswap_fix.patch  |    44 +
 trunk/tools/gengetopt/Makefile                |    30 +
 .../patches/100-dependency_fix.patch          |    11 +
 trunk/tools/gmp/Makefile                      |    34 +
 trunk/tools/include/byteswap.h                |     5 +
 trunk/tools/include/elf.h                     |  3007 +
 trunk/tools/include/endian.h                  |    40 +
 trunk/tools/include/getline.h                 |    68 +
 trunk/tools/include/sys/sysmacros.h           |    56 +
 trunk/tools/ipkg-utils/Makefile               |    32 +
 .../ipkg-utils/patches/100-build_clean.patch  |    35 +
 .../ipkg-utils/patches/110-buildpackage.patch |    23 +
 .../patches/111-buildpackage_conffiles.patch  |    11 +
 .../ipkg-utils/patches/120-build_tar.patch    |    36 +
 .../patches/130-tar_wildcards.patch           |    23 +
 .../ipkg-utils/patches/140-portability.patch  |    19 +
 .../patches/150-uppercase_letters.patch       |    22 +
 trunk/tools/ipkg-utils/patches/160-find.patch |    39 +
 .../patches/170-resolve_conffiles.patch       |    23 +
 .../patches/180-add_installed_size.patch      |    14 +
 .../patches/190-preserve_permissions.patch    |    12 +
 .../patches/200-force_gnu_format.patch        |    27 +
 .../patches/210-remove_field_checks.patch     |    36 +
 trunk/tools/libelf/Makefile                   |    51 +
 trunk/tools/libtool/Makefile                  |    35 +
 trunk/tools/libtool/files/libtool-v1.5.patch  |   118 +
 trunk/tools/libtool/files/libtool-v2.2.patch  |   123 +
 trunk/tools/libtool/files/libtool-v2.4.patch  |   160 +
 .../libtool/patches/000-relocatable.patch     |    96 +
 .../libtool/patches/001-fix-func_append.patch |    22 +
 .../libtool/patches/100-libdir-fixes.patch    |    94 +
 ...10-dont-use-target-dir-for-relinking.patch |    20 +
 .../120-strip-unsafe-dirs-for-relinking.patch |    24 +
 .../libtool/patches/150-trailingslash.patch   |    49 +
 .../patches/200-openwrt-branding.patch        |   112 +
 trunk/tools/lzma-old/Makefile                 |    36 +
 .../lzma-old/patches/100-lzma_zlib.patch      |   404 +
 trunk/tools/lzma-old/patches/110-ranlib.patch |    10 +
 trunk/tools/lzma/Makefile                     |    36 +
 .../tools/lzma/patches/001-large_files.patch  |    13 +
 trunk/tools/lzma/patches/002-lzmp.patch       |  1059 +
 .../lzma/patches/003-compile_fixes.patch      |    26 +
 .../lzma/patches/100-static_library.patch     |    70 +
 trunk/tools/m4/Makefile                       |    30 +
 .../m4/patches/100-fix-gets-removal.patch     |    17 +
 trunk/tools/missing-macros/Makefile           |    26 +
 trunk/tools/missing-macros/src/README         |   100 +
 .../missing-macros/src/m4/as-ac-expand.m4     |    43 +
 .../missing-macros/src/m4/as-compiler-flag.m4 |    62 +
 .../src/m4/as-unaligned-access.m4             |    41 +
 .../tools/missing-macros/src/m4/as-version.m4 |    71 +
 trunk/tools/missing-macros/src/m4/dnet.m4     |   322 +
 trunk/tools/missing-macros/src/m4/esd.m4      |   196 +
 .../src/m4/fake-gtk-doc-check.m4              |    13 +
 .../missing-macros/src/m4/fake-intltool.m4    |    16 +
 trunk/tools/missing-macros/src/m4/glibc2.m4   |    30 +
 trunk/tools/missing-macros/src/m4/glibc21.m4  |    30 +
 trunk/tools/missing-macros/src/m4/intdiv0.m4  |    84 +
 trunk/tools/missing-macros/src/m4/intmax.m4   |    33 +
 .../missing-macros/src/m4/inttypes-pri.m4     |    36 +
 .../tools/missing-macros/src/m4/inttypes_h.m4 |    26 +
 trunk/tools/missing-macros/src/m4/lib-ld.m4   |   110 +
 trunk/tools/missing-macros/src/m4/lib-link.m4 |   774 +
 .../tools/missing-macros/src/m4/lib-prefix.m4 |   224 +
 trunk/tools/missing-macros/src/m4/mfx_acc.m4  |   163 +
 .../missing-macros/src/m4/mfx_cppflags.m4     |    41 +
 .../tools/missing-macros/src/m4/mfx_limits.m4 |   154 +
 trunk/tools/missing-macros/src/m4/progtest.m4 |    92 +
 trunk/tools/missing-macros/src/m4/stdint_h.m4 |    26 +
 .../tools/missing-macros/src/m4/uintmax_t.m4  |    30 +
 trunk/tools/missing-macros/src/m4/va_copy.m4  |   111 +
 trunk/tools/missing-macros/src/m4/wint_t.m4   |    28 +
 trunk/tools/missing-macros/src/m4/xaw.m4      |    65 +
 trunk/tools/missing-macros/src/m4/xmms.m4     |   149 +
 trunk/tools/mkimage/Makefile                  |    48 +
 .../patches/010-freebsd-ulong-fix.patch       |    13 +
 .../patches/020-include_compile_fix.patch     |    10 +
 .../030-allow-to-use-different-magic.patch    |    63 +
 .../mkimage/patches/040-include_order.patch   |    11 +
 .../patches/050-image_h_portability.patch     |    31 +
 .../patches/060-remove_kernel_includes.patch  |    35 +
 .../070-socfpgaimage_portability.patch        |    52 +
 .../patches/080-remove_compiler_check.patch   |    16 +
 trunk/tools/mklibs/Makefile                   |    35 +
 trunk/tools/mklibs/include/elf.h              |  2559 +
 trunk/tools/mklibs/patches/001-compile.patch  |     8 +
 .../patches/002-disable_symbol_checks.patch   |    20 +
 trunk/tools/mklibs/patches/003-no_copy.patch  |    50 +
 .../mklibs/patches/004-libpthread_link.patch  |    28 +
 .../mklibs/patches/005-duplicate_syms.patch   |    35 +
 .../mklibs/patches/006-uclibc_init.patch      |    14 +
 .../mklibs/patches/007-gc_sections.patch      |    11 +
 .../patches/008-uclibc_libgcc_link.patch      |    37 +
 .../009-uclibc_libpthread_symbols.patch       |    63 +
 .../patches/010-remove_STT_GNU_IFUNC.patch    |    20 +
 .../mklibs/patches/011-remove_multiarch.patch |    10 +
 trunk/tools/mm-macros/Makefile                |    31 +
 trunk/tools/mpc/Makefile                      |    28 +
 trunk/tools/mpfr/Makefile                     |    27 +
 trunk/tools/mpfr/patches/001-only_src.patch   |    22 +
 trunk/tools/mtd-utils/Makefile                |    65 +
 trunk/tools/mtd-utils/include/fls.h           |     2 +
 trunk/tools/mtd-utils/include/linux/types.h   |    18 +
 .../mtd-utils/patches/100-sscanf_fix.patch    |    11 +
 .../mtd-utils/patches/110-portability.patch   |   153 +
 .../mtd-utils/patches/120-cygwin_fixes.patch  |   457 +
 .../mtd-utils/patches/130-lzma_jffs2.patch    |  5031 ++
 .../patches/131-fix_lib_compile.patch         |    11 +
 .../mtd-utils/patches/133-error-fix.patch     |    20 +
 .../patches/134-freebsd_loff_t.patch          |    13 +
 .../patches/135-mkubifs_optional_lzo.patch    |   119 +
 .../patches/136-mkfs.ubifs-xz-support.patch   |   404 +
 .../patches/137-no_extern_inline.patch        |    41 +
 ...add-ubigen_write_terminator-function.patch |    89 +
 .../201-ubinize-add-terminator-support.patch  |    77 +
 trunk/tools/mtools/Makefile                   |    38 +
 trunk/tools/padjffs2/Makefile                 |    36 +
 trunk/tools/padjffs2/src/Makefile             |    15 +
 trunk/tools/padjffs2/src/padjffs2.c           |   198 +
 trunk/tools/patch-image/Makefile              |    28 +
 trunk/tools/patch-image/src/patch-cmdline.c   |    79 +
 trunk/tools/patch-image/src/patch-dtb.c       |   101 +
 trunk/tools/patch/Makefile                    |    18 +
 trunk/tools/pkg-config/Makefile               |    37 +
 trunk/tools/pkg-config/files/pkg-config       |     3 +
 .../patches/001-fix-package-rebuild.patch     |    22 +
 trunk/tools/ppl/Makefile                      |    37 +
 .../patches/001-disable-serial-tests.patch    |    44 +
 trunk/tools/qemu/Makefile                     |    41 +
 trunk/tools/quilt/Makefile                    |    39 +
 .../tools/quilt/patches/000-relocatable.patch |    72 +
 .../tools/quilt/patches/001-fix_compile.patch |    18 +
 trunk/tools/scons/Makefile                    |    34 +
 trunk/tools/scons/files/pywrap.sh             |    15 +
 .../scons/patches/001-platform_env.patch      |    11 +
 trunk/tools/sed/Makefile                      |    43 +
 trunk/tools/sparse/Makefile                   |    22 +
 trunk/tools/squashfs/Makefile                 |    39 +
 trunk/tools/squashfs/patches/100-lzma.patch   |    22 +
 .../patches/110-no_nonstatic_inline.patch     |    11 +
 trunk/tools/squashfs4/Makefile                |    43 +
 .../squashfs4/patches/100-portability.patch   |    40 +
 .../patches/110-allow_static_liblzma.patch    |    30 +
 .../squashfs4/patches/120-cygwin_fixes.patch  |   153 +
 .../squashfs4/patches/150-freebsd_fixes.patch |    10 +
 .../patches/160-expose_lzma_xz_options.patch  |   929 +
 ..._support_for_LZMA_MAGIC_to_unsqashfs.patch |    72 +
 .../patches/180-openbsd_compat.patch          |    26 +
 .../patches/190-no_nonstatic_inline.patch     |    36 +
 trunk/tools/sstrip/Makefile                   |    25 +
 trunk/tools/sstrip/src/sstrip.c               |   465 +
 trunk/tools/upslug2/Makefile                  |    36 +
 .../upslug2/patches/100-libpcap_fix.patch     |   153 +
 .../patches/110-wrt350nv2_support.patch       |   279 +
 trunk/tools/upx/Makefile                      |    36 +
 trunk/tools/upx/patches/100-lzmaonly.patch    |   156 +
 trunk/tools/xfce-macros/Makefile              |    32 +
 trunk/tools/xorg-macros/Makefile              |    31 +
 trunk/tools/xz/Makefile                       |    27 +
 trunk/tools/yaffs2/Makefile                   |    39 +
 trunk/tools/yaffs2/patches/100-compile.patch  |   125 +
 .../yaffs2/patches/110-openbsd-compat.patch   |    14 +
 6909 files changed, 1402293 insertions(+)
 create mode 100644 trunk/BSDmakefile
 create mode 100644 trunk/Config.in
 create mode 100644 trunk/LICENSE
 create mode 100644 trunk/Makefile
 create mode 100644 trunk/README
 create mode 100644 trunk/README.md
 create mode 100644 trunk/config/Config-build.in
 create mode 100644 trunk/config/Config-devel.in
 create mode 100644 trunk/config/Config-images.in
 create mode 100644 trunk/config/Config-kernel.in
 create mode 100644 trunk/docs/BUILD_HOWTO.md
 create mode 100644 trunk/feeds.conf
 create mode 100644 trunk/include/autotools.mk
 create mode 100644 trunk/include/cmake.mk
 create mode 100644 trunk/include/debug.mk
 create mode 100644 trunk/include/depends.mk
 create mode 100644 trunk/include/device_table.txt
 create mode 100644 trunk/include/download.mk
 create mode 100644 trunk/include/feeds.mk
 create mode 100644 trunk/include/host-build.mk
 create mode 100644 trunk/include/host.mk
 create mode 100644 trunk/include/image.mk
 create mode 100644 trunk/include/kernel-build.mk
 create mode 100644 trunk/include/kernel-defaults.mk
 create mode 100644 trunk/include/kernel-version.mk
 create mode 100644 trunk/include/kernel.mk
 create mode 100644 trunk/include/netfilter.mk
 create mode 100644 trunk/include/nls.mk
 create mode 100644 trunk/include/package-bin.mk
 create mode 100644 trunk/include/package-defaults.mk
 create mode 100644 trunk/include/package-dumpinfo.mk
 create mode 100644 trunk/include/package-ipkg.mk
 create mode 100644 trunk/include/package.mk
 create mode 100644 trunk/include/prereq-build.mk
 create mode 100644 trunk/include/prereq.mk
 create mode 100644 trunk/include/quilt.mk
 create mode 100644 trunk/include/scan.mk
 create mode 100644 trunk/include/scons.mk
 create mode 100644 trunk/include/shell.sh
 create mode 100644 trunk/include/site/aarch64-librecmc-linux-gnu
 create mode 100644 trunk/include/site/aarch64-linux
 create mode 100644 trunk/include/site/aarch64_be-librecmc-linux-gnu
 create mode 100644 trunk/include/site/aarch64_be-linux
 create mode 100644 trunk/include/site/arm-librecmc-linux-gnu
 create mode 100644 trunk/include/site/arm-librecmc-linux-gnueabi
 create mode 100644 trunk/include/site/arm-librecmc-linux-musl
 create mode 100644 trunk/include/site/arm-librecmc-linux-muslgnueabi
 create mode 100644 trunk/include/site/arm-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/arm-librecmc-linux-uclibcgnueabi
 create mode 100644 trunk/include/site/arm-linux
 create mode 100644 trunk/include/site/armeb-librecmc-linux-gnu
 create mode 100644 trunk/include/site/armeb-librecmc-linux-gnueabi
 create mode 100644 trunk/include/site/armeb-librecmc-linux-musl
 create mode 100644 trunk/include/site/armeb-librecmc-linux-muslgnueabi
 create mode 100644 trunk/include/site/armeb-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/armeb-librecmc-linux-uclibcgnueabi
 create mode 100644 trunk/include/site/armeb-linux
 create mode 100644 trunk/include/site/avr32-librecmc-linux-gnu
 create mode 100644 trunk/include/site/avr32-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/avr32-linux
 create mode 100644 trunk/include/site/cris-librecmc-linux-gnu
 create mode 100644 trunk/include/site/cris-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/cris-linux
 create mode 100644 trunk/include/site/i486-librecmc-linux-gnu
 create mode 100644 trunk/include/site/i486-librecmc-linux-musl
 create mode 100644 trunk/include/site/i486-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/i486-linux
 create mode 100644 trunk/include/site/i686-librecmc-linux-gnu
 create mode 100644 trunk/include/site/i686-librecmc-linux-musl
 create mode 100644 trunk/include/site/i686-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/i686-linux
 create mode 100644 trunk/include/site/linux
 create mode 100644 trunk/include/site/linux-gnu
 create mode 100644 trunk/include/site/linux-uclibc
 create mode 100644 trunk/include/site/m68k-librecmc-linux-gnu
 create mode 100644 trunk/include/site/m68k-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/m68k-linux
 create mode 100644 trunk/include/site/mips-librecmc-linux-gnu
 create mode 100644 trunk/include/site/mips-librecmc-linux-musl
 create mode 100644 trunk/include/site/mips-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/mips-linux
 create mode 100644 trunk/include/site/mips-linux-gnu
 create mode 100644 trunk/include/site/mips64-librecmc-linux-gnu
 create mode 100644 trunk/include/site/mips64-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/mips64-linux
 create mode 100644 trunk/include/site/mips64el-librecmc-linux-gnu
 create mode 100644 trunk/include/site/mips64el-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/mips64el-linux
 create mode 100644 trunk/include/site/mipsel-librecmc-linux-gnu
 create mode 100644 trunk/include/site/mipsel-librecmc-linux-musl
 create mode 100644 trunk/include/site/mipsel-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/mipsel-librecmc-linux2.4-uclibc
 create mode 100644 trunk/include/site/mipsel-linux
 create mode 100644 trunk/include/site/mipsel-linux-gnu
 create mode 100644 trunk/include/site/powerpc-librecmc-linux-gnu
 create mode 100644 trunk/include/site/powerpc-librecmc-linux-gnuspe
 create mode 100644 trunk/include/site/powerpc-librecmc-linux-musl
 create mode 100644 trunk/include/site/powerpc-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/powerpc-librecmc-linux-uclibcspe
 create mode 100644 trunk/include/site/powerpc-linux
 create mode 100644 trunk/include/site/sparc-librecmc-linux-gnu
 create mode 100644 trunk/include/site/sparc-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/sparc-linux
 create mode 100644 trunk/include/site/sparc-linux-gnu
 create mode 100644 trunk/include/site/x86_64-librecmc-linux-gnu
 create mode 100644 trunk/include/site/x86_64-librecmc-linux-musl
 create mode 100644 trunk/include/site/x86_64-librecmc-linux-uclibc
 create mode 100644 trunk/include/site/x86_64-linux
 create mode 100644 trunk/include/subdir.mk
 create mode 100644 trunk/include/target.mk
 create mode 100644 trunk/include/toolchain-build.mk
 create mode 100644 trunk/include/toplevel.mk
 create mode 100644 trunk/include/uclibc++.mk
 create mode 100644 trunk/include/unpack.mk
 create mode 100644 trunk/include/verbose.mk
 create mode 100644 trunk/include/version.mk
 create mode 100644 trunk/package/Makefile
 create mode 100644 trunk/package/base-files/Makefile
 create mode 100755 trunk/package/base-files/files/bin/board_detect
 create mode 100755 trunk/package/base-files/files/bin/config_generate
 create mode 100755 trunk/package/base-files/files/bin/ipcalc.sh
 create mode 100755 trunk/package/base-files/files/bin/login.sh
 create mode 100644 trunk/package/base-files/files/etc/banner
 create mode 100644 trunk/package/base-files/files/etc/banner.failsafe
 create mode 100644 trunk/package/base-files/files/etc/config/network
 create mode 100644 trunk/package/base-files/files/etc/config/system
 create mode 100644 trunk/package/base-files/files/etc/device_info
 create mode 100644 trunk/package/base-files/files/etc/diag.sh
 create mode 100644 trunk/package/base-files/files/etc/group
 create mode 100644 trunk/package/base-files/files/etc/hosts
 create mode 100644 trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl
 create mode 100755 trunk/package/base-files/files/etc/init.d/boot
 create mode 100755 trunk/package/base-files/files/etc/init.d/done
 create mode 100755 trunk/package/base-files/files/etc/init.d/led
 create mode 100755 trunk/package/base-files/files/etc/init.d/sysctl
 create mode 100755 trunk/package/base-files/files/etc/init.d/sysfixtime
 create mode 100755 trunk/package/base-files/files/etc/init.d/system
 create mode 100755 trunk/package/base-files/files/etc/init.d/umount
 create mode 100644 trunk/package/base-files/files/etc/inittab
 create mode 100644 trunk/package/base-files/files/etc/librecmc_release
 create mode 100644 trunk/package/base-files/files/etc/librecmc_version
 create mode 100644 trunk/package/base-files/files/etc/passwd
 create mode 100755 trunk/package/base-files/files/etc/preinit
 create mode 100644 trunk/package/base-files/files/etc/profile
 create mode 100644 trunk/package/base-files/files/etc/protocols
 create mode 100755 trunk/package/base-files/files/etc/rc.button/failsafe
 create mode 100755 trunk/package/base-files/files/etc/rc.button/power
 create mode 100755 trunk/package/base-files/files/etc/rc.button/reset
 create mode 100755 trunk/package/base-files/files/etc/rc.button/rfkill
 create mode 100755 trunk/package/base-files/files/etc/rc.common
 create mode 100644 trunk/package/base-files/files/etc/rc.local
 create mode 100644 trunk/package/base-files/files/etc/services
 create mode 100644 trunk/package/base-files/files/etc/shadow
 create mode 100644 trunk/package/base-files/files/etc/shells
 create mode 100644 trunk/package/base-files/files/etc/sysctl.conf
 create mode 100644 trunk/package/base-files/files/etc/sysupgrade.conf
 create mode 100644 trunk/package/base-files/files/etc/uci-defaults/10_migrate-shadow
 create mode 100644 trunk/package/base-files/files/etc/uci-defaults/11_migrate-sysctl
 create mode 100644 trunk/package/base-files/files/etc/uci-defaults/12_network-generate-ula
 create mode 100755 trunk/package/base-files/files/lib/functions.sh
 create mode 100644 trunk/package/base-files/files/lib/functions/leds.sh
 create mode 100644 trunk/package/base-files/files/lib/functions/network.sh
 create mode 100644 trunk/package/base-files/files/lib/functions/preinit.sh
 create mode 100644 trunk/package/base-files/files/lib/functions/service.sh
 create mode 100644 trunk/package/base-files/files/lib/functions/system.sh
 create mode 100755 trunk/package/base-files/files/lib/functions/uci-defaults-new.sh
 create mode 100644 trunk/package/base-files/files/lib/functions/uci-defaults.sh
 create mode 100644 trunk/package/base-files/files/lib/preinit/02_default_set_state
 create mode 100644 trunk/package/base-files/files/lib/preinit/10_indicate_failsafe
 create mode 100644 trunk/package/base-files/files/lib/preinit/10_indicate_preinit
 create mode 100644 trunk/package/base-files/files/lib/preinit/30_failsafe_wait
 create mode 100644 trunk/package/base-files/files/lib/preinit/40_run_failsafe_hook
 create mode 100644 trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit
 create mode 100644 trunk/package/base-files/files/lib/preinit/70_initramfs_test
 create mode 100644 trunk/package/base-files/files/lib/preinit/80_mount_root
 create mode 100644 trunk/package/base-files/files/lib/preinit/99_10_failsafe_login
 create mode 100644 trunk/package/base-files/files/lib/preinit/99_10_run_init
 create mode 100644 trunk/package/base-files/files/lib/upgrade/common.sh
 create mode 100644 trunk/package/base-files/files/lib/upgrade/keep.d/base-files-essential
 create mode 100644 trunk/package/base-files/files/rom/note
 create mode 100755 trunk/package/base-files/files/sbin/firstboot
 create mode 100755 trunk/package/base-files/files/sbin/hotplug-call
 create mode 100755 trunk/package/base-files/files/sbin/led.sh
 create mode 100755 trunk/package/base-files/files/sbin/sysupgrade
 create mode 100755 trunk/package/base-files/files/sbin/wifi
 create mode 100644 trunk/package/base-files/image-config.in
 create mode 100644 trunk/package/boot/grub2/Makefile
 create mode 100644 trunk/package/boot/grub2/patches/100-grub_setup_root.patch
 create mode 100644 trunk/package/boot/grub2/patches/200-fix-gets-removal.patch
 create mode 100644 trunk/package/boot/kexec-tools/Config.in
 create mode 100644 trunk/package/boot/kexec-tools/Makefile
 create mode 100644 trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch
 create mode 100644 trunk/package/boot/kexec-tools/patches/100-reduce_size.patch
 create mode 100644 trunk/package/boot/uboot-sunxi/Makefile
 create mode 100644 trunk/package/boot/uboot-sunxi/patches/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch
 create mode 100644 trunk/package/boot/uboot-sunxi/patches/002-uboot-jwrdegoede-psci-support.patch
 create mode 100644 trunk/package/boot/uboot-sunxi/patches/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch
 create mode 100644 trunk/package/boot/uboot-sunxi/uEnv.txt
 create mode 100644 trunk/package/boot/uboot-xburst/Makefile
 create mode 100644 trunk/package/boot/uboot-xburst/patches/0001-qi_lb60-add-nand-spl-support.patch
 create mode 100644 trunk/package/boot/uboot-xburst/patches/0002-qi_lb60-add-software-usbboot-support.patch
 create mode 100644 trunk/package/boot/uboot-xburst/patches/0003-add-mmc-support.patch
 create mode 100644 trunk/package/boot/uboot-xburst/patches/0004-add-more-boot-options-F1-F2-F3-F4-M-S.patch
 create mode 100644 trunk/package/boot/uboot-xburst/patches/0005-add-nanonote-lcd-support.patch
 create mode 100644 trunk/package/boot/uboot-xburst/patches/0006-enable-silent-console.patch
 create mode 100644 trunk/package/devel/binutils/Makefile
 create mode 100644 trunk/package/devel/diffutils/Makefile
 create mode 100644 trunk/package/devel/gcc/Makefile
 create mode 100644 trunk/package/devel/gcc/README
 create mode 100644 trunk/package/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
 create mode 100644 trunk/package/devel/gcc/patches/003-mpfr-longlong-mips.patch
 create mode 100644 trunk/package/devel/gcc/patches/010-documentation.patch
 create mode 100644 trunk/package/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch
 create mode 100644 trunk/package/devel/gcc/patches/100-uclibc-conf.patch
 create mode 100644 trunk/package/devel/gcc/patches/200-musl.patch
 create mode 100644 trunk/package/devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
 create mode 100644 trunk/package/devel/gcc/patches/810-arm-softfloat-libgcc.patch
 create mode 100644 trunk/package/devel/gcc/patches/820-libgcc_pic.patch
 create mode 100644 trunk/package/devel/gcc/patches/830-arm_unbreak_armv4t.patch
 create mode 100644 trunk/package/devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
 create mode 100644 trunk/package/devel/gcc/patches/850-use_shared_libgcc.patch
 create mode 100644 trunk/package/devel/gcc/patches/860-uclibc_use_eh_frame.patch
 create mode 100644 trunk/package/devel/gcc/patches/870-ppc_no_crtsavres.patch
 create mode 100644 trunk/package/devel/gcc/patches/880-no_java_section.patch
 create mode 100644 trunk/package/devel/gcc/patches/900-bad-mips16-crt.patch
 create mode 100644 trunk/package/devel/gcc/patches/910-mbsd_multi.patch
 create mode 100644 trunk/package/devel/gcc/patches/920-specs_nonfatal_getenv.patch
 create mode 100644 trunk/package/devel/gdb/Makefile
 create mode 100644 trunk/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch
 create mode 100644 trunk/package/devel/gdb/patches/100-musl_fix.patch
 create mode 100644 trunk/package/devel/gdb/patches/101-arm-uclibc-sim-needs-libm.patch
 create mode 100644 trunk/package/devel/oprofile/Makefile
 create mode 100644 trunk/package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch
 create mode 100644 trunk/package/devel/oprofile/patches/110-fix_compile_error.patch
 create mode 100644 trunk/package/devel/patch/Makefile
 create mode 100644 trunk/package/devel/perf/Makefile
 create mode 100644 trunk/package/devel/strace/Makefile
 create mode 100644 trunk/package/devel/strace/patches/100-musl_fix.patch
 create mode 100644 trunk/package/devel/trace-cmd/Makefile
 create mode 100644 trunk/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch
 create mode 100644 trunk/package/devel/valgrind/Makefile
 create mode 100644 trunk/package/devel/valgrind/files/default.supp
 create mode 100644 trunk/package/devel/valgrind/patches/100-fix_configure_check.patch
 create mode 100644 trunk/package/devel/valgrind/patches/110-add_a_out_h.patch
 create mode 100644 trunk/package/devel/valgrind/patches/200-musl_fix.patch
 create mode 100644 trunk/package/devel/valgrind/src/abort.c
 create mode 100644 trunk/package/kernel/button-hotplug/Makefile
 create mode 100644 trunk/package/kernel/button-hotplug/src/Kconfig
 create mode 100644 trunk/package/kernel/button-hotplug/src/Makefile
 create mode 100644 trunk/package/kernel/button-hotplug/src/button-hotplug.c
 create mode 100644 trunk/package/kernel/gpio-button-hotplug/Makefile
 create mode 100644 trunk/package/kernel/gpio-button-hotplug/src/Makefile
 create mode 100644 trunk/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
 create mode 100644 trunk/package/kernel/hostap-driver/Makefile
 create mode 100755 trunk/package/kernel/hostap-driver/files/lib/wifi/hostap.sh
 create mode 100644 trunk/package/kernel/hostap-driver/patches/001-fix-txpower.patch
 create mode 100644 trunk/package/kernel/i2c-gpio-custom/Makefile
 create mode 100644 trunk/package/kernel/i2c-gpio-custom/src/Kconfig
 create mode 100644 trunk/package/kernel/i2c-gpio-custom/src/Makefile
 create mode 100644 trunk/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c
 create mode 100644 trunk/package/kernel/linux/Makefile
 create mode 100644 trunk/package/kernel/linux/modules/001-depends.mk
 create mode 100644 trunk/package/kernel/linux/modules/block.mk
 create mode 100644 trunk/package/kernel/linux/modules/can.mk
 create mode 100644 trunk/package/kernel/linux/modules/crypto.mk
 create mode 100644 trunk/package/kernel/linux/modules/fs.mk
 create mode 100644 trunk/package/kernel/linux/modules/hwmon.mk
 create mode 100644 trunk/package/kernel/linux/modules/i2c.mk
 create mode 100644 trunk/package/kernel/linux/modules/input.mk
 create mode 100644 trunk/package/kernel/linux/modules/leds.mk
 create mode 100644 trunk/package/kernel/linux/modules/lib.mk
 create mode 100644 trunk/package/kernel/linux/modules/netdevices.mk
 create mode 100644 trunk/package/kernel/linux/modules/netfilter.mk
 create mode 100644 trunk/package/kernel/linux/modules/netsupport.mk
 create mode 100644 trunk/package/kernel/linux/modules/nls.mk
 create mode 100644 trunk/package/kernel/linux/modules/other.mk
 create mode 100644 trunk/package/kernel/linux/modules/pcmcia.mk
 create mode 100644 trunk/package/kernel/linux/modules/sound.mk
 create mode 100644 trunk/package/kernel/linux/modules/spi.mk
 create mode 100644 trunk/package/kernel/linux/modules/usb.mk
 create mode 100644 trunk/package/kernel/linux/modules/video.mk
 create mode 100644 trunk/package/kernel/linux/modules/virtual.mk
 create mode 100644 trunk/package/kernel/linux/modules/w1.mk
 create mode 100644 trunk/package/kernel/linux/modules/wireless.mk
 create mode 100644 trunk/package/kernel/mac80211/Makefile
 create mode 100644 trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 create mode 100644 trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh
 create mode 100644 trunk/package/kernel/mac80211/files/regdb.txt
 create mode 100644 trunk/package/kernel/mac80211/patches/000-fix_kconfig.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/001-fix_build.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/002-change_allconfig.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/003-remove_bogus_modparams.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/008-fix_netdev_unregister.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/010-disable_rfkill.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/050-lib80211_option.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/080-disable_clk_backport.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/081-backport-devm_kmemdup.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/082-backport-list_last_entry.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/210-ap_scan.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/300-Revert-ath5k-Remove-AHB-bus-support.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/301-ath5k-fix-AHB-kconfig-dependency.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/302-ath9k-add-support-for-reporting-tx-power-to-mac80211.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/304-ath9k-Fix-RTC_DERIVED_CLK-usage.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/306-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/307-ath9k-fix-regression-in-bssidmask-calculation.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/309-ath9k-prevent-early-IRQs-from-accessing-hardware.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/310-ath9k-set-ATH_OP_INVALID-before-disabling-hardware.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/312-mac80211-skip-legacy-rate-mask-handling-for-VHT-rate.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/313-mac80211-minstrel_ht-add-a-small-optimization-to-min.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/316-mac80211-minstrel-switch-to-.tx_status_noskb.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-switch-to-.tx_status_noskb.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/318-mac80211-add-ieee80211_tx_status_noskb.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/319-mac80211-minstrel_ht-fix-a-crash-in-rate-sorting.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/320-mac80211-notify-drivers-on-sta-rate-table-changes.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/321-mac80211-add-an-intermediate-software-queue-implemen.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/323-mac80211-copy-chandef-from-AP-vif-to-VLANs.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/324-ath9k_hw-fix-hardware-queue-allocation.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/325-ath9k-fix-BE-BK-queue-order.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/326-ath5k-fix-hardware-queue-index-assignment.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/400-ath_move_debug_code.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/401-ath9k_blink_default.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/402-ath_regd_optional.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/403-world_regd_fixup.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/405-ath_regd_us.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/420-ath5k_disable_fast_cc.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/430-add_ath5k_platform.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/432-ath5k_add_pciids.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/540-ath9k_reduce_ani_interval.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
 create mode 100644 trunk/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
 create mode 100755 trunk/package/kernel/mac80211/scripts/import-backports.sh
 create mode 100644 trunk/package/kernel/mmc_over_gpio/Makefile
 create mode 100644 trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.config
 create mode 100644 trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.init
 create mode 100644 trunk/package/kernel/om-watchdog/Makefile
 create mode 100644 trunk/package/kernel/om-watchdog/files/om-watchdog
 create mode 100644 trunk/package/kernel/om-watchdog/files/om-watchdog.init
 create mode 100644 trunk/package/kernel/rotary-gpio-custom/Makefile
 create mode 100644 trunk/package/kernel/rotary-gpio-custom/src/Kconfig
 create mode 100644 trunk/package/kernel/rotary-gpio-custom/src/Makefile
 create mode 100644 trunk/package/kernel/rotary-gpio-custom/src/rotary-gpio-custom.c
 create mode 100644 trunk/package/kernel/rtc-rv5c386a/Makefile
 create mode 100644 trunk/package/kernel/rtc-rv5c386a/src/Makefile
 create mode 100644 trunk/package/kernel/rtc-rv5c386a/src/rtc.c
 create mode 100644 trunk/package/kernel/spi-gpio-custom/Makefile
 create mode 100644 trunk/package/kernel/spi-gpio-custom/src/Kconfig
 create mode 100644 trunk/package/kernel/spi-gpio-custom/src/Makefile
 create mode 100644 trunk/package/kernel/spi-gpio-custom/src/spi-gpio-custom.c
 create mode 100644 trunk/package/kernel/spi-ks8995/Makefile
 create mode 100644 trunk/package/kernel/spi-ks8995/src/Kconfig
 create mode 100644 trunk/package/kernel/spi-ks8995/src/Makefile
 create mode 100644 trunk/package/kernel/spi-ks8995/src/spi_ks8995.c
 create mode 100644 trunk/package/kernel/trelay/Makefile
 create mode 100644 trunk/package/kernel/trelay/files/trelay.config
 create mode 100644 trunk/package/kernel/trelay/files/trelay.hotplug
 create mode 100644 trunk/package/kernel/trelay/files/trelay.init
 create mode 100644 trunk/package/kernel/trelay/src/Makefile
 create mode 100644 trunk/package/kernel/trelay/src/trelay.c
 create mode 100644 trunk/package/kernel/w1-gpio-custom/Makefile
 create mode 100644 trunk/package/kernel/w1-gpio-custom/src/Kconfig
 create mode 100644 trunk/package/kernel/w1-gpio-custom/src/Makefile
 create mode 100644 trunk/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c
 create mode 100644 trunk/package/lang/dkjson/Makefile
 create mode 100644 trunk/package/lang/erlang/Makefile
 create mode 100644 trunk/package/lang/erlang/patches/101-emulator_includes.patch
 create mode 100644 trunk/package/lang/erlang/patches/103-disable_emacs.patch
 create mode 100644 trunk/package/lang/lua-bencode/Makefile
 create mode 100644 trunk/package/lang/lua-mosquitto/Makefile
 create mode 100644 trunk/package/lang/lua-penlight/Makefile
 create mode 100644 trunk/package/lang/lua-sha2/Makefile
 create mode 100644 trunk/package/lang/lua-sha2/patches/001-makefile.patch
 create mode 100644 trunk/package/lang/luabitop/Makefile
 create mode 100644 trunk/package/lang/luaexpat/Makefile
 create mode 100644 trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.c
 create mode 100644 trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.h
 create mode 100644 trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua
 create mode 100644 trunk/package/lang/luafilesystem/Makefile
 create mode 100755 trunk/package/lang/luai2c/Makefile
 create mode 100644 trunk/package/lang/lualanes/Makefile
 create mode 100644 trunk/package/lang/luaposix/Makefile
 create mode 100644 trunk/package/lang/luaposix/patches/100-eglibc-compat.patch
 create mode 100644 trunk/package/lang/luaposix/patches/101-disable-curses.patch
 create mode 100644 trunk/package/lang/luasec/Makefile
 create mode 100644 trunk/package/lang/luasoap/Makefile
 create mode 100644 trunk/package/lang/luasocket/Makefile
 create mode 100644 trunk/package/lang/luasocket/patches/0001-Add-interface-support.patch
 create mode 100644 trunk/package/lang/luasql/Makefile
 create mode 100644 trunk/package/lang/micropython-lib/Makefile
 create mode 100644 trunk/package/lang/micropython/Makefile
 create mode 100644 trunk/package/lang/perl-compress-bzip2/Makefile
 create mode 100644 trunk/package/lang/perl-dbi/Makefile
 create mode 100644 trunk/package/lang/perl-html-parser/Makefile
 create mode 100644 trunk/package/lang/perl-html-tagset/Makefile
 create mode 100644 trunk/package/lang/perl-html-tree/Makefile
 create mode 100644 trunk/package/lang/perl-lockfile-simple/Makefile
 create mode 100644 trunk/package/lang/perl-net-telnet/Makefile
 create mode 100644 trunk/package/lang/perl-test-harness/Makefile
 create mode 100644 trunk/package/lang/perl-uri/Makefile
 create mode 100644 trunk/package/lang/perl-www-curl/Makefile
 create mode 100644 trunk/package/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch
 create mode 100644 trunk/package/lang/perl-www-curl/patches/200-fix_default_lflags.patch
 create mode 100644 trunk/package/lang/perl-www-mechanize/Makefile
 create mode 100644 trunk/package/lang/perl-www/Makefile
 create mode 100644 trunk/package/lang/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch
 create mode 100644 trunk/package/lang/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch
 create mode 100644 trunk/package/lang/perl/Config.in
 create mode 100644 trunk/package/lang/perl/Makefile
 create mode 100644 trunk/package/lang/perl/files/config.sh-arm.in
 create mode 100644 trunk/package/lang/perl/files/config.sh-armeb.in
 create mode 100644 trunk/package/lang/perl/files/config.sh-avr32.in
 create mode 100644 trunk/package/lang/perl/files/config.sh-i486.in
 create mode 100644 trunk/package/lang/perl/files/config.sh-mips.in
 create mode 100644 trunk/package/lang/perl/files/config.sh-mipsel.in
 create mode 100644 trunk/package/lang/perl/files/config.sh-powerpc.in
 create mode 100644 trunk/package/lang/perl/files/config.sh-x86_64.in
 create mode 100755 trunk/package/lang/perl/files/perl-run_tests.sh
 create mode 100644 trunk/package/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch
 create mode 100644 trunk/package/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch
 create mode 100644 trunk/package/lang/perl/patches/300-always_use_miniperl.patch
 create mode 100644 trunk/package/lang/perl/patches/400-add_microperl_caretx_dependency.patch
 create mode 100644 trunk/package/lang/perl/patches/500-add-relink-hack.patch
 create mode 100644 trunk/package/lang/perl/perlbase.mk
 create mode 100644 trunk/package/lang/perl/perlmod.mk
 create mode 100644 trunk/package/lang/php5/Makefile
 create mode 100644 trunk/package/lang/php5/files/php.ini
 create mode 100644 trunk/package/lang/php5/files/php5-fastcgi.config
 create mode 100644 trunk/package/lang/php5/files/php5-fastcgi.init
 create mode 100644 trunk/package/lang/php5/patches/090-restore-sqlite2.patch
 create mode 100644 trunk/package/lang/php5/patches/091-fix-sqlite2.patch
 create mode 100644 trunk/package/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch
 create mode 100644 trunk/package/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch
 create mode 100644 trunk/package/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch
 create mode 100644 trunk/package/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch
 create mode 100644 trunk/package/lang/php5/pecl.mk
 create mode 100644 trunk/package/lang/python-dns/Makefile
 create mode 100644 trunk/package/lang/python-imglib/Makefile
 create mode 100644 trunk/package/lang/python-imglib/patches/010-cross-compile.patch
 create mode 100644 trunk/package/lang/python-imglib/patches/020-freetype-header-include.patch
 create mode 100644 trunk/package/lang/python-mysql/Makefile
 create mode 100644 trunk/package/lang/python-mysql/patches/010-threadsafe.patch
 create mode 100644 trunk/package/lang/python-pip/Makefile
 create mode 100644 trunk/package/lang/python-setuptools/Makefile
 create mode 100644 trunk/package/lang/python/Makefile
 create mode 100644 trunk/package/lang/python/files/config.site
 create mode 100644 trunk/package/lang/python/files/python-package.mk
 create mode 100644 trunk/package/lang/python/patches/110-enable-zlib.patch
 create mode 100644 trunk/package/lang/python/patches/120-do-not-add-include-dirs-when-cross-compiling.patch
 create mode 100644 trunk/package/lang/python/patches/130-do-not-run-distutils-tests.patch
 create mode 100644 trunk/package/lang/python/patches/140-do-not-write-bytes-codes.patch
 create mode 100644 trunk/package/lang/python3/Makefile
 create mode 100644 trunk/package/lang/python3/files/config.site
 create mode 100644 trunk/package/lang/python3/files/python3-package.mk
 create mode 100644 trunk/package/lang/python3/patches/110-enable-zlib.patch
 create mode 100644 trunk/package/lang/python3/patches/120-do-not-add-include-dirs-when-cross-compiling.patch
 create mode 100644 trunk/package/lang/python3/patches/130-do-not-run-distutils-tests.patch
 create mode 100644 trunk/package/lang/python3/patches/140-do-not-write-bytes-codes.patch
 create mode 100644 trunk/package/lang/ruby/Makefile
 create mode 100644 trunk/package/lang/ruby/files/ruby
 create mode 100644 trunk/package/lang/ruby/patches/001-rdoc-remove_gems_dep.patch
 create mode 100644 trunk/package/lang/ruby/patches/002-minitest-remove_gems_dep.patch
 create mode 100644 trunk/package/lang/ruby/patches/003-digest_rmd160_wrong_name_fix.patch
 create mode 100644 trunk/package/lang/ruby/patches/004-digest_dont-link-ssl-if-not-needed.patch
 create mode 100644 trunk/package/lang/ruby/ruby_find_pkgsdeps
 create mode 100644 trunk/package/lang/ruby/ruby_missingfiles
 create mode 100644 trunk/package/lang/simplejson/Makefile
 create mode 100644 trunk/package/lang/vala/Makefile
 create mode 100644 trunk/package/libs/cyassl/Makefile
 create mode 100644 trunk/package/libs/cyassl/patches/100-respect_cflags.patch
 create mode 100644 trunk/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
 create mode 100644 trunk/package/libs/gettext-full/Makefile
 create mode 100644 trunk/package/libs/gettext-full/patches/001-autotools.patch
 create mode 100644 trunk/package/libs/gettext-full/patches/001-no_examples_and_tests.patch
 create mode 100644 trunk/package/libs/gettext-full/patches/003-gettext-error_print_progname.patch
 create mode 100644 trunk/package/libs/gettext-full/patches/100-error_progname.patch
 create mode 100644 trunk/package/libs/gettext-full/patches/110-error_progname_def.patch
 create mode 100644 trunk/package/libs/gettext-full/patches/120-uclibc-nolocale.patch
 create mode 100644 trunk/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch
 create mode 100644 trunk/package/libs/gettext/Makefile
 create mode 100644 trunk/package/libs/gettext/src/LICENSE
 create mode 100644 trunk/package/libs/gettext/src/include/libintl.h
 create mode 100644 trunk/package/libs/gettext/src/m4/codeset.m4
 create mode 100644 trunk/package/libs/gettext/src/m4/gettext.m4
 create mode 100644 trunk/package/libs/gettext/src/m4/intl.m4
 create mode 100644 trunk/package/libs/gettext/src/m4/intldir.m4
 create mode 100644 trunk/package/libs/gettext/src/m4/intlmacosx.m4
 create mode 100644 trunk/package/libs/gettext/src/m4/lcmessage.m4
 create mode 100644 trunk/package/libs/gettext/src/m4/nls.m4
 create mode 100644 trunk/package/libs/gettext/src/m4/po.m4
 create mode 100644 trunk/package/libs/glib2/Makefile
 create mode 100644 trunk/package/libs/gmp/Makefile
 create mode 100644 trunk/package/libs/libbsd/Makefile
 create mode 100644 trunk/package/libs/libbsd/patches/001-aarch64_support.patch
 create mode 100644 trunk/package/libs/libconfig/Makefile
 create mode 100644 trunk/package/libs/libevent2/Makefile
 create mode 100644 trunk/package/libs/libffi/Makefile
 create mode 100644 trunk/package/libs/libiconv-full/Makefile
 create mode 100644 trunk/package/libs/libiconv-full/patches/100-strip_charsets.patch
 create mode 100644 trunk/package/libs/libiconv-full/patches/101-autotools.patch
 create mode 100644 trunk/package/libs/libiconv-full/patches/103-configure_ac_fix.patch
 create mode 100644 trunk/package/libs/libiconv-full/patches/200-work-with-libtool2.patch
 create mode 100644 trunk/package/libs/libiconv/COPYING
 create mode 100644 trunk/package/libs/libiconv/COPYRIGHT
 create mode 100644 trunk/package/libs/libiconv/Makefile
 create mode 100644 trunk/package/libs/libiconv/src/LICENSE
 create mode 100644 trunk/package/libs/libiconv/src/iconv.c
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-10.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-13.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-14.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-16.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-2.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-3.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-4.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-5.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-6.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-7.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-8.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/iso-8859-9.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/koi8-r.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1250.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1251.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1252.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1253.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1254.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1255.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1256.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1257.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-1258.h
 create mode 100644 trunk/package/libs/libiconv/src/include/charmaps/windows-874.h
 create mode 100644 trunk/package/libs/libiconv/src/include/iconv.h
 create mode 100644 trunk/package/libs/libiconv/src/m4/iconv.m4
 create mode 100644 trunk/package/libs/libjson-c/Makefile
 create mode 100644 trunk/package/libs/libmnl/Makefile
 create mode 100644 trunk/package/libs/libmnl/patches/100-upstream-fixes.patch
 create mode 100644 trunk/package/libs/libnetfilter-conntrack/Makefile
 create mode 100644 trunk/package/libs/libnetfilter-log/Makefile
 create mode 100644 trunk/package/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch
 create mode 100644 trunk/package/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch
 create mode 100644 trunk/package/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch
 create mode 100644 trunk/package/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch
 create mode 100644 trunk/package/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch
 create mode 100644 trunk/package/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch
 create mode 100644 trunk/package/libs/libnfnetlink/Makefile
 create mode 100644 trunk/package/libs/libnfnetlink/patches/100-missing_include.patch
 create mode 100644 trunk/package/libs/libnftnl/Makefile
 create mode 100644 trunk/package/libs/libnl-tiny/Makefile
 create mode 100644 trunk/package/libs/libnl-tiny/files/libnl-tiny.pc
 create mode 100644 trunk/package/libs/libnl-tiny/src/Makefile
 create mode 100644 trunk/package/libs/libnl-tiny/src/attr.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/cache.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/cache_mngt.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/error.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/genl.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/genl_ctrl.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/genl_family.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/genl_mngt.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/handlers.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/linux/gen_stats.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/linux/genetlink.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/linux/if.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/linux/if_addr.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/linux/netlink.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink-generic.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink-local.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink-types.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/addr.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/attr.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/cache-api.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/cache.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/data.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/errno.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/genl/ctrl.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/genl/family.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/genl/genl.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/genl/mngt.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/handlers.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/list.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/msg.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/netlink-compat.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/netlink-kernel.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/netlink.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/object-api.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/object.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/socket.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/types.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/utils.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/netlink/version.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/include/unl.h
 create mode 100644 trunk/package/libs/libnl-tiny/src/msg.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/nl.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/object.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/socket.c
 create mode 100644 trunk/package/libs/libnl-tiny/src/unl.c
 create mode 100644 trunk/package/libs/libnl/Makefile
 create mode 100644 trunk/package/libs/libpcap/Config.in
 create mode 100644 trunk/package/libs/libpcap/Makefile
 create mode 100644 trunk/package/libs/libpcap/patches/100-debian_shared_lib.patch
 create mode 100644 trunk/package/libs/libpcap/patches/102-makefile_disable_manpages.patch
 create mode 100644 trunk/package/libs/libpcap/patches/103-makefile_flex_workaround.patch
 create mode 100644 trunk/package/libs/libpcap/patches/201-space_optimization.patch
 create mode 100644 trunk/package/libs/libpcap/patches/202-protocol_api.patch
 create mode 100644 trunk/package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch
 create mode 100644 trunk/package/libs/libreadline/Makefile
 create mode 100644 trunk/package/libs/libroxml/Makefile
 create mode 100644 trunk/package/libs/librpc/Makefile
 create mode 100644 trunk/package/libs/librpc/patches/100-compat_fix.patch
 create mode 100644 trunk/package/libs/librpc/patches/110-musl_fixes.patch
 create mode 100644 trunk/package/libs/libtool/Makefile
 create mode 100644 trunk/package/libs/libubox/Makefile
 create mode 100644 trunk/package/libs/libusb-compat/Makefile
 create mode 100644 trunk/package/libs/libusb/Makefile
 create mode 100644 trunk/package/libs/libusb/patches/001-timerfd.patch
 create mode 100644 trunk/package/libs/lzo/Makefile
 create mode 100644 trunk/package/libs/ncurses/Makefile
 create mode 100644 trunk/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
 create mode 100644 trunk/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
 create mode 100644 trunk/package/libs/ncurses/patches/200-fix_missing_include.patch
 create mode 100644 trunk/package/libs/ncurses/patches/500-cross.patch
 create mode 100644 trunk/package/libs/ncurses/patches/900-terminfo.patch
 create mode 100644 trunk/package/libs/nettle/Config.in
 create mode 100644 trunk/package/libs/nettle/Makefile
 create mode 100644 trunk/package/libs/nettle/patches/0001-Updated-mini-gmp.patch
 create mode 100644 trunk/package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch
 create mode 100644 trunk/package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch
 create mode 100644 trunk/package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch
 create mode 100644 trunk/package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch
 create mode 100644 trunk/package/libs/ocf-crypto-headers/Makefile
 create mode 100644 trunk/package/libs/ocf-crypto-headers/src/cryptodev.h
 create mode 100644 trunk/package/libs/openssl/Config.in
 create mode 100644 trunk/package/libs/openssl/Makefile
 create mode 100644 trunk/package/libs/openssl/patches/110-optimize-for-size.patch
 create mode 100644 trunk/package/libs/openssl/patches/130-perl-path.patch
 create mode 100644 trunk/package/libs/openssl/patches/140-makefile-dirs.patch
 create mode 100644 trunk/package/libs/openssl/patches/150-no_engines.patch
 create mode 100644 trunk/package/libs/openssl/patches/160-disable_doc_tests.patch
 create mode 100644 trunk/package/libs/openssl/patches/170-bash_path.patch
 create mode 100644 trunk/package/libs/openssl/patches/180-fix_link_segfault.patch
 create mode 100644 trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch
 create mode 100644 trunk/package/libs/openssl/patches/200-parallel_build.patch
 create mode 100644 trunk/package/libs/openssl/patches/210-termios_fix.patch
 create mode 100644 trunk/package/libs/polarssl/Makefile
 create mode 100644 trunk/package/libs/polarssl/patches/100-disable_sslv3.patch
 create mode 100644 trunk/package/libs/polarssl/patches/200-reduce_config.patch
 create mode 100644 trunk/package/libs/popt/Makefile
 create mode 100644 trunk/package/libs/popt/patches/002-no-intl.patch
 create mode 100644 trunk/package/libs/sysfsutils/Makefile
 create mode 100644 trunk/package/libs/sysfsutils/patches/200-mnt_path_check.patch
 create mode 100644 trunk/package/libs/toolchain/Makefile
 create mode 100644 trunk/package/libs/toolchain/eglibc-files/etc/nsswitch.conf
 create mode 100644 trunk/package/libs/uclibc++/Makefile
 create mode 100644 trunk/package/libs/uclibc++/files/config.default
 create mode 100644 trunk/package/libs/uclibc++/patches/002-path_to_bash.patch
 create mode 100644 trunk/package/libs/uclibc++/patches/006-eabi_fix.patch
 create mode 100644 trunk/package/libs/uclient/Makefile
 create mode 100644 trunk/package/libs/ustream-ssl/Makefile
 create mode 100644 trunk/package/libs/zlib/Makefile
 create mode 100644 trunk/package/luci/CONTRIBUTING.md
 create mode 100644 trunk/package/luci/INSTALL
 create mode 100644 trunk/package/luci/LICENSE
 create mode 100644 trunk/package/luci/Makefile
 create mode 100644 trunk/package/luci/NOTICE
 create mode 100644 trunk/package/luci/README.md
 create mode 100644 trunk/package/luci/THANKYOU
 create mode 100644 trunk/package/luci/applications/freifunk-community/Makefile
 create mode 100644 trunk/package/luci/applications/luci-ahcp/Makefile
 create mode 100644 trunk/package/luci/applications/luci-ahcp/luasrc/controller/ahcp.lua
 create mode 100644 trunk/package/luci/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
 create mode 100644 trunk/package/luci/applications/luci-ahcp/luasrc/view/admin_status/index/ahcp.htm
 create mode 100644 trunk/package/luci/applications/luci-ahcp/luasrc/view/ahcp_status.htm
 create mode 100755 trunk/package/luci/applications/luci-ahcp/root/etc/uci-defaults/luci-ahcp
 create mode 100644 trunk/package/luci/applications/luci-asterisk/Makefile
 create mode 100755 trunk/package/luci/applications/luci-asterisk/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/asterisk.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/asterisk/cc_idd.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/controller/asterisk.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phones.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/cbi/cell.htm
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
 create mode 100644 trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm
 create mode 100644 trunk/package/luci/applications/luci-asterisk/root/etc/config/asterisk
 create mode 100755 trunk/package/luci/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk
 create mode 100644 trunk/package/luci/applications/luci-commands/Makefile
 create mode 100644 trunk/package/luci/applications/luci-commands/luasrc/controller/commands.lua
 create mode 100644 trunk/package/luci/applications/luci-commands/luasrc/model/cbi/commands.lua
 create mode 100644 trunk/package/luci/applications/luci-commands/luasrc/view/commands.htm
 create mode 100644 trunk/package/luci/applications/luci-coovachilli/Makefile
 create mode 100644 trunk/package/luci/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
 create mode 100644 trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua
 create mode 100644 trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
 create mode 100644 trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua
 create mode 100644 trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
 create mode 100644 trunk/package/luci/applications/luci-coovachilli/root/etc/config/coovachilli
 create mode 100644 trunk/package/luci/applications/luci-ddns/CHANGELOG
 create mode 100644 trunk/package/luci/applications/luci-ddns/Makefile
 create mode 100644 trunk/package/luci/applications/luci-ddns/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-ddns/ipkg/postinst-pkg
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/controller/ddns.lua
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/detail.lua
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/hints.lua
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/overview.lua
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/tools/ddns.lua
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/admin_status/index/ddns.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_logview.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_lvalue.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_value.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_doubleline.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_enabled.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_startstop.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_status.htm
 create mode 100644 trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/system_status.htm
 create mode 100755 trunk/package/luci/applications/luci-ddns/root/etc/uci-defaults/luci-ddns
 create mode 100644 trunk/package/luci/applications/luci-diag-core/Makefile
 create mode 100644 trunk/package/luci/applications/luci-diag-core/luasrc/controller/luci_diag.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/index.htm
 create mode 100644 trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/Makefile
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm
 create mode 100644 trunk/package/luci/applications/luci-diag-devinfo/root/etc/config/luci_devinfo
 create mode 100644 trunk/package/luci/applications/luci-dump1090/Makefile
 create mode 100644 trunk/package/luci/applications/luci-dump1090/luasrc/controller/dump1090.lua
 create mode 100644 trunk/package/luci/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua
 create mode 100644 trunk/package/luci/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090
 create mode 100644 trunk/package/luci/applications/luci-firewall/Makefile
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/controller/firewall.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zones.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/tools/firewall.lua
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addforward.htm
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm
 create mode 100644 trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm
 create mode 100644 trunk/package/luci/applications/luci-freifunk-diagnostics/Makefile
 create mode 100644 trunk/package/luci/applications/luci-freifunk-diagnostics/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
 create mode 100644 trunk/package/luci/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics
 create mode 100644 trunk/package/luci/applications/luci-freifunk-policyrouting/Makefile
 create mode 100644 trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/Makefile
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/controller/freifunk/widgets.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/root/etc/config/freifunk-widgets
 create mode 100644 trunk/package/luci/applications/luci-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets
 create mode 100644 trunk/package/luci/applications/luci-hd-idle/Makefile
 create mode 100644 trunk/package/luci/applications/luci-hd-idle/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-hd-idle/luasrc/controller/hd_idle.lua
 create mode 100644 trunk/package/luci/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
 create mode 100755 trunk/package/luci/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle
 create mode 100644 trunk/package/luci/applications/luci-ltqtapi/Makefile
 create mode 100644 trunk/package/luci/applications/luci-ltqtapi/luasrc/controller/ltqtapi.lua
 create mode 100644 trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua
 create mode 100644 trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua
 create mode 100644 trunk/package/luci/applications/luci-ltqtapi/luasrc/view/admin_status/index/telephony.htm
 create mode 100644 trunk/package/luci/applications/luci-ltqtapi/luasrc/view/telephony_status.htm
 create mode 100644 trunk/package/luci/applications/luci-meshwizard/Makefile
 create mode 100644 trunk/package/luci/applications/luci-meshwizard/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-meshwizard/luasrc/controller/meshwizard.lua
 create mode 100644 trunk/package/luci/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
 create mode 100644 trunk/package/luci/applications/luci-meshwizard/root/etc/uci-defaults/meshwizard
 create mode 100644 trunk/package/luci/applications/luci-minidlna/Makefile
 create mode 100644 trunk/package/luci/applications/luci-minidlna/luasrc/controller/minidlna.lua
 create mode 100644 trunk/package/luci/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
 create mode 100644 trunk/package/luci/applications/luci-minidlna/luasrc/view/admin_status/index/minidlna.htm
 create mode 100644 trunk/package/luci/applications/luci-minidlna/luasrc/view/minidlna_status.htm
 create mode 100755 trunk/package/luci/applications/luci-minidlna/root/etc/uci-defaults/luci-minidlna
 create mode 100644 trunk/package/luci/applications/luci-mmc-over-gpio/Makefile
 create mode 100644 trunk/package/luci/applications/luci-mmc-over-gpio/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
 create mode 100644 trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
 create mode 100755 trunk/package/luci/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio
 create mode 100644 trunk/package/luci/applications/luci-multiwan/Makefile
 create mode 100644 trunk/package/luci/applications/luci-multiwan/luasrc/controller/multiwan.lua
 create mode 100644 trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
 create mode 100644 trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
 create mode 100644 trunk/package/luci/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm
 create mode 100644 trunk/package/luci/applications/luci-multiwan/luasrc/view/multiwan_status.htm
 create mode 100644 trunk/package/luci/applications/luci-ntpc/Makefile
 create mode 100644 trunk/package/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua
 create mode 100644 trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
 create mode 100644 trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
 create mode 100644 trunk/package/luci/applications/luci-ocserv/Makefile
 create mode 100644 trunk/package/luci/applications/luci-ocserv/luasrc/controller/ocserv.lua
 create mode 100644 trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/main.lua
 create mode 100644 trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/user-config.lua
 create mode 100644 trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/users.lua
 create mode 100644 trunk/package/luci/applications/luci-ocserv/luasrc/view/admin_status/index/ocserv.htm
 create mode 100644 trunk/package/luci/applications/luci-ocserv/luasrc/view/ocserv_status.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr-services/Makefile
 create mode 100644 trunk/package/luci/applications/luci-olsr-services/luasrc/controller/services.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/Makefile
 create mode 100755 trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh
 create mode 100755 trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/vizdata.sh
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/Makefile
 create mode 100644 trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-nodes.html
 create mode 100644 trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-status.html
 create mode 100755 trunk/package/luci/applications/luci-olsr/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr4.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr6.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd6.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/tools/olsr.lua
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/common_js.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/interfaces.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/legend.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/overview.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/smartgw.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
 create mode 100644 trunk/package/luci/applications/luci-olsr/root/etc/config/luci_olsr
 create mode 100755 trunk/package/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr
 create mode 100644 trunk/package/luci/applications/luci-openvpn/Makefile
 create mode 100644 trunk/package/luci/applications/luci-openvpn/luasrc/controller/openvpn.lua
 create mode 100644 trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua
 create mode 100644 trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
 create mode 100644 trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
 create mode 100644 trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
 create mode 100644 trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
 create mode 100644 trunk/package/luci/applications/luci-openvpn/root/etc/config/openvpn_recipes
 create mode 100644 trunk/package/luci/applications/luci-p2pblock/Makefile
 create mode 100755 trunk/package/luci/applications/luci-p2pblock/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua
 create mode 100644 trunk/package/luci/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
 create mode 100755 trunk/package/luci/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock
 create mode 100644 trunk/package/luci/applications/luci-p910nd/Makefile
 create mode 100644 trunk/package/luci/applications/luci-p910nd/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua
 create mode 100644 trunk/package/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
 create mode 100755 trunk/package/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/COPYING
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/Makefile
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/luasrc/controller/pbx-voicemail.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/root/etc/config/pbx-voicemail
 create mode 100755 trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE
 create mode 100755 trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail
 create mode 100644 trunk/package/luci/applications/luci-pbx/COPYING
 create mode 100644 trunk/package/luci/applications/luci-pbx/CREDITS-SOUNDS
 create mode 100644 trunk/package/luci/applications/luci-pbx/LICENSE-SOUNDS
 create mode 100644 trunk/package/luci/applications/luci-pbx/Makefile
 create mode 100644 trunk/package/luci/applications/luci-pbx/luasrc/controller/pbx.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx.lua
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/config/pbx
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-advanced
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-calls
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-google
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-users
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-voip
 create mode 100755 trunk/package/luci/applications/luci-pbx/root/etc/init.d/pbx-asterisk
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE
 create mode 100755 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/delayedcallback
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-incorrect.gsm
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-pass.gsm
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-incorrect.gsm
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-thankyou.gsm
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/beep.gsm
 create mode 100644 trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/vm-goodbye.gsm
 create mode 100644 trunk/package/luci/applications/luci-polipo/Makefile
 create mode 100755 trunk/package/luci/applications/luci-polipo/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-polipo/luasrc/controller/polipo.lua
 create mode 100644 trunk/package/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua
 create mode 100644 trunk/package/luci/applications/luci-polipo/luasrc/view/polipo_status.htm
 create mode 100755 trunk/package/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo
 create mode 100755 trunk/package/luci/applications/luci-polipo/root/usr/sbin/polipo_purge
 create mode 100644 trunk/package/luci/applications/luci-qos/Makefile
 create mode 100644 trunk/package/luci/applications/luci-qos/luasrc/controller/qos.lua
 create mode 100644 trunk/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
 create mode 100644 trunk/package/luci/applications/luci-radvd/Makefile
 create mode 100644 trunk/package/luci/applications/luci-radvd/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-radvd/luasrc/controller/radvd.lua
 create mode 100644 trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd.lua
 create mode 100644 trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/dnssl.lua
 create mode 100644 trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/interface.lua
 create mode 100644 trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/prefix.lua
 create mode 100644 trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua
 create mode 100644 trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/route.lua
 create mode 100755 trunk/package/luci/applications/luci-radvd/root/etc/uci-defaults/luci-radvd
 create mode 100644 trunk/package/luci/applications/luci-samba/Makefile
 create mode 100644 trunk/package/luci/applications/luci-samba/luasrc/controller/samba.lua
 create mode 100644 trunk/package/luci/applications/luci-samba/luasrc/model/cbi/samba.lua
 create mode 100644 trunk/package/luci/applications/luci-shairplay/Makefile
 create mode 100644 trunk/package/luci/applications/luci-shairplay/luasrc/controller/shairplay.lua
 create mode 100644 trunk/package/luci/applications/luci-shairplay/luasrc/model/cbi/shairplay.lua
 create mode 100644 trunk/package/luci/applications/luci-shairplay/root/etc/uci-defaults/luci-shairplay
 create mode 100644 trunk/package/luci/applications/luci-shairport/Makefile
 create mode 100644 trunk/package/luci/applications/luci-shairport/luasrc/controller/shairport.lua
 create mode 100644 trunk/package/luci/applications/luci-shairport/luasrc/model/cbi/shairport.lua
 create mode 100644 trunk/package/luci/applications/luci-shairport/root/etc/uci-defaults/luci-shairport
 create mode 100644 trunk/package/luci/applications/luci-siitwizard/Makefile
 create mode 100644 trunk/package/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua
 create mode 100644 trunk/package/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
 create mode 100644 trunk/package/luci/applications/luci-siitwizard/root/etc/config/siit
 create mode 100644 trunk/package/luci/applications/luci-splash/Makefile
 create mode 100644 trunk/package/luci/applications/luci-splash/README
 create mode 100755 trunk/package/luci/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh
 create mode 100644 trunk/package/luci/applications/luci-splash/htdocs/luci/splash/index.html
 create mode 100755 trunk/package/luci/applications/luci-splash/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/controller/splash/splash.lua
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/view/admin_status/splash.htm
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/view/splash/blocked.htm
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/view/splash/splash.htm
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm
 create mode 100644 trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm
 create mode 100644 trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash
 create mode 100644 trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash_leases
 create mode 100644 trunk/package/luci/applications/luci-splash/root/etc/hotplug.d/iface/25-splash
 create mode 100755 trunk/package/luci/applications/luci-splash/root/etc/init.d/luci_splash
 create mode 100755 trunk/package/luci/applications/luci-splash/root/usr/sbin/luci-splash
 create mode 100644 trunk/package/luci/applications/luci-statistics/Makefile
 create mode 100755 trunk/package/luci/applications/luci-statistics/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/nut.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/datatree.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/i18n.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/dns.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
 create mode 100644 trunk/package/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
 create mode 100644 trunk/package/luci/applications/luci-statistics/root/etc/config/luci_statistics
 create mode 100755 trunk/package/luci/applications/luci-statistics/root/etc/init.d/luci_statistics
 create mode 100755 trunk/package/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics
 create mode 100755 trunk/package/luci/applications/luci-statistics/root/usr/bin/stat-genconfig
 create mode 100644 trunk/package/luci/applications/luci-tinyproxy/Makefile
 create mode 100644 trunk/package/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
 create mode 100644 trunk/package/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua
 create mode 100644 trunk/package/luci/applications/luci-tinyproxy/luasrc/view/tinyproxy_status.htm
 create mode 100644 trunk/package/luci/applications/luci-transmission/Makefile
 create mode 100644 trunk/package/luci/applications/luci-transmission/luasrc/controller/transmission.lua
 create mode 100644 trunk/package/luci/applications/luci-transmission/luasrc/model/cbi/transmission.lua
 create mode 100644 trunk/package/luci/applications/luci-transmission/root/etc/uci-defaults/luci-transmission
 create mode 100644 trunk/package/luci/applications/luci-udpxy/Makefile
 create mode 100644 trunk/package/luci/applications/luci-udpxy/luasrc/controller/udpxy.lua
 create mode 100644 trunk/package/luci/applications/luci-udpxy/luasrc/model/cbi/udpxy.lua
 create mode 100644 trunk/package/luci/applications/luci-udpxy/root/etc/uci-defaults/luci-udpxy
 create mode 100644 trunk/package/luci/applications/luci-upnp/Makefile
 create mode 100644 trunk/package/luci/applications/luci-upnp/luasrc/controller/upnp.lua
 create mode 100644 trunk/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
 create mode 100644 trunk/package/luci/applications/luci-upnp/luasrc/view/admin_status/index/upnp.htm
 create mode 100644 trunk/package/luci/applications/luci-upnp/luasrc/view/upnp_status.htm
 create mode 100755 trunk/package/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp
 create mode 100644 trunk/package/luci/applications/luci-ushare/Makefile
 create mode 100644 trunk/package/luci/applications/luci-ushare/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-ushare/luasrc/controller/ushare.lua
 create mode 100644 trunk/package/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua
 create mode 100755 trunk/package/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare
 create mode 100644 trunk/package/luci/applications/luci-vnstat/Makefile
 create mode 100755 trunk/package/luci/applications/luci-vnstat/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-vnstat/luasrc/controller/vnstat.lua
 create mode 100644 trunk/package/luci/applications/luci-vnstat/luasrc/model/cbi/vnstat.lua
 create mode 100644 trunk/package/luci/applications/luci-vnstat/luasrc/view/vnstat.htm
 create mode 100755 trunk/package/luci/applications/luci-vnstat/root/etc/uci-defaults/luci-vnstat
 create mode 100644 trunk/package/luci/applications/luci-voice-core/Makefile
 create mode 100644 trunk/package/luci/applications/luci-voice-core/luasrc/controller/luci_voice.lua
 create mode 100644 trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/index.htm
 create mode 100644 trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/phone_index.htm
 create mode 100644 trunk/package/luci/applications/luci-voice-diag/Makefile
 create mode 100644 trunk/package/luci/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua
 create mode 100644 trunk/package/luci/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm
 create mode 100644 trunk/package/luci/applications/luci-watchcat/Makefile
 create mode 100644 trunk/package/luci/applications/luci-watchcat/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-watchcat/luasrc/controller/watchcat.lua
 create mode 100644 trunk/package/luci/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
 create mode 100644 trunk/package/luci/applications/luci-watchcat/root/etc/uci-defaults/luci-watchcat
 create mode 100644 trunk/package/luci/applications/luci-wol/Makefile
 create mode 100644 trunk/package/luci/applications/luci-wol/luasrc/controller/wol.lua
 create mode 100644 trunk/package/luci/applications/luci-wol/luasrc/model/cbi/wol.lua
 create mode 100644 trunk/package/luci/applications/luci-wshaper/Makefile
 create mode 100644 trunk/package/luci/applications/luci-wshaper/ipkg/postinst
 create mode 100644 trunk/package/luci/applications/luci-wshaper/luasrc/controller/wshaper.lua
 create mode 100644 trunk/package/luci/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
 create mode 100644 trunk/package/luci/applications/luci-wshaper/root/etc/uci-defaults/wshaper
 create mode 100644 trunk/package/luci/applications/myapplication/Makefile
 create mode 100644 trunk/package/luci/build/config.mk
 create mode 100644 trunk/package/luci/build/gccconfig.mk
 create mode 100755 trunk/package/luci/build/hostenv.sh
 create mode 100755 trunk/package/luci/build/i18n-init.sh
 create mode 100755 trunk/package/luci/build/i18n-po2lua.pl
 create mode 100755 trunk/package/luci/build/i18n-scan.pl
 create mode 100755 trunk/package/luci/build/i18n-sync.sh
 create mode 100755 trunk/package/luci/build/i18n-update.pl
 create mode 100755 trunk/package/luci/build/luci.cgi
 create mode 100644 trunk/package/luci/build/lucid.lua
 create mode 100755 trunk/package/luci/build/makedocs.sh
 create mode 100755 trunk/package/luci/build/mkbasepot.sh
 create mode 100755 trunk/package/luci/build/mkrevision.sh
 create mode 100755 trunk/package/luci/build/mkversion.sh
 create mode 100644 trunk/package/luci/build/module.mk
 create mode 100644 trunk/package/luci/build/setup.lua
 create mode 100755 trunk/package/luci/build/zoneinfo2lua.pl
 create mode 100644 trunk/package/luci/contrib/fwd/Makefile
 create mode 100644 trunk/package/luci/contrib/fwd/src/Makefile
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd.h
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_addr.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_addr.h
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_config.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_config.h
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_ipc.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_ipc.h
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_rules.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_rules.h
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_utils.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_utils.h
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_xtables.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/fwd_xtables.h
 create mode 100644 trunk/package/luci/contrib/fwd/src/ucix.c
 create mode 100644 trunk/package/luci/contrib/fwd/src/ucix.h
 create mode 100644 trunk/package/luci/contrib/lar/Makefile
 create mode 100644 trunk/package/luci/contrib/lar/cli.c
 create mode 100644 trunk/package/luci/contrib/lar/lar.c
 create mode 100644 trunk/package/luci/contrib/lar/lar.h
 create mode 100755 trunk/package/luci/contrib/lar/lar.pl
 create mode 100644 trunk/package/luci/contrib/lar/larlib.c
 create mode 100644 trunk/package/luci/contrib/lar/md5.c
 create mode 100644 trunk/package/luci/contrib/lar/md5.h
 create mode 100644 trunk/package/luci/contrib/lar/openwrt/050-lar-source-loader.patch
 create mode 100644 trunk/package/luci/contrib/luadoc/Makefile
 create mode 100755 trunk/package/luci/contrib/luadoc/hostfiles/bin/luadoc
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/config.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/init.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/lp.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua
 create mode 100644 trunk/package/luci/contrib/luadoc/lua/luadoc/util.lua
 create mode 100644 trunk/package/luci/contrib/luasrcdiet/Makefile
 create mode 100644 trunk/package/luci/contrib/luasrcdiet/lua/COPYRIGHT
 create mode 100755 trunk/package/luci/contrib/luasrcdiet/lua/LuaSrcDiet.lua
 create mode 100644 trunk/package/luci/contrib/luasrcdiet/lua/llex.lua
 create mode 100644 trunk/package/luci/contrib/luasrcdiet/lua/lparser.lua
 create mode 100644 trunk/package/luci/contrib/luasrcdiet/lua/optlex.lua
 create mode 100644 trunk/package/luci/contrib/luasrcdiet/lua/optparser.lua
 create mode 100644 trunk/package/luci/contrib/package/Makefile
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/Makefile
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_Freifunk
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_aachen
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_altmark
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_arad
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_neot_semadar
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_tel-aviv
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_augsburg
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bayreuth
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bensheim
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bergischesland
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_berlin
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bno
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_carbodebit
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_demo
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_duesseldorf
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_erfurt
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_evernet
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_freiburg
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_gadow
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_guifibages
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_halle
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hannover
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_heppenheim
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hooge
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kiberpipa
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kyritz
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_l59
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_leipzig
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_marburg
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_neuss
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_oldenburg
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_pberg
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_potsdam
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_reihen
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_rosbach
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_schwarzach
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_seefeld
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_stuttgart
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_vogtland
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weil
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weimar
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weinstadt
 create mode 100644 trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana
 create mode 100644 trunk/package/luci/contrib/package/freifunk-common/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-common/files/etc/config/freifunk
 create mode 100755 trunk/package/luci/contrib/package/freifunk-common/files/etc/init.d/freifunk
 create mode 100644 trunk/package/luci/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration
 create mode 100644 trunk/package/luci/contrib/package/freifunk-common/files/etc/uci-defaults/freifunk
 create mode 100755 trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/ffdzero
 create mode 100755 trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/neigh.sh
 create mode 100755 trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/watch.sh
 create mode 100755 trunk/package/luci/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
 create mode 100755 trunk/package/luci/contrib/package/freifunk-common/ipkg/postinst
 create mode 100644 trunk/package/luci/contrib/package/freifunk-firewall/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-firewall/files/etc/firewall.freifunk
 create mode 100644 trunk/package/luci/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan
 create mode 100644 trunk/package/luci/contrib/package/freifunk-gwcheck/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-gwcheck/files/etc/config/freifunk-gwcheck
 create mode 100755 trunk/package/luci/contrib/package/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh
 create mode 100644 trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postinst
 create mode 100644 trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postrm
 create mode 100644 trunk/package/luci/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck
 create mode 100644 trunk/package/luci/contrib/package/freifunk-mapupdate/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-mapupdate/files/etc/config/freifunk-mapupdate
 create mode 100755 trunk/package/luci/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh
 create mode 100644 trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postinst
 create mode 100644 trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postrm
 create mode 100644 trunk/package/luci/contrib/package/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate
 create mode 100644 trunk/package/luci/contrib/package/freifunk-p2pblock/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.config
 create mode 100644 trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
 create mode 100644 trunk/package/luci/contrib/package/freifunk-policyrouting/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
 create mode 100644 trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
 create mode 100755 trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
 create mode 100755 trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/rc.d/S15-freifunk-policyrouting
 create mode 100644 trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.config
 create mode 100755 trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.init
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/src/Makefile
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.c
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.h
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.c
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.h
 create mode 100644 trunk/package/luci/contrib/package/freifunk-watchdog/src/wireless.22.h
 create mode 100644 trunk/package/luci/contrib/package/luci-addons/Makefile
 create mode 100644 trunk/package/luci/contrib/package/luci/Makefile
 create mode 100644 trunk/package/luci/contrib/package/meshwizard/Makefile
 create mode 100644 trunk/package/luci/contrib/package/meshwizard/files/etc/config/meshwizard
 create mode 100644 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh
 create mode 100644 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/common.awk
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_qos.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi_vap.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh
 create mode 100755 trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
 create mode 100644 trunk/package/luci/contrib/package/remote-update/Makefile
 create mode 100755 trunk/package/luci/contrib/package/remote-update/files/usr/sbin/remote-update
 create mode 100644 trunk/package/luci/contrib/uci/Makefile
 create mode 100755 trunk/package/luci/contrib/uci/hostfiles/bin/uci
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/batmand
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/ddns
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/dhcp
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/dropbear
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/firewall
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/fstab
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/httpd
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/luci_devinfo
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/mactodevinfo
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/network
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/ntpclient
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/qos
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/system
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/upnpd
 create mode 100644 trunk/package/luci/contrib/uci/hostfiles/etc/config/wireless
 create mode 100644 trunk/package/luci/contrib/uhttpd/Makefile
 create mode 100644 trunk/package/luci/contrib/uhttpd/patches/001-pass-env.patch
 create mode 100644 trunk/package/luci/contrib/uhttpd/patches/002-link-order.patch
 create mode 100644 trunk/package/luci/contrib/uhttpd/patches/series
 create mode 100644 trunk/package/luci/i18n/catalan/Makefile
 create mode 100755 trunk/package/luci/i18n/catalan/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/catalan/root/etc/uci-defaults/luci-i18n-catalan
 create mode 100644 trunk/package/luci/i18n/chinese/Makefile
 create mode 100644 trunk/package/luci/i18n/chinese/ipkg/postinst
 create mode 100644 trunk/package/luci/i18n/chinese/root/etc/uci-defaults/luci-i18n-chinese
 create mode 100644 trunk/package/luci/i18n/english/Makefile
 create mode 100755 trunk/package/luci/i18n/english/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english
 create mode 100644 trunk/package/luci/i18n/french/Makefile
 create mode 100755 trunk/package/luci/i18n/french/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french
 create mode 100644 trunk/package/luci/i18n/german/Makefile
 create mode 100755 trunk/package/luci/i18n/german/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german
 create mode 100644 trunk/package/luci/i18n/greek/Makefile
 create mode 100755 trunk/package/luci/i18n/greek/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/greek/root/etc/uci-defaults/luci-i18n-greek
 create mode 100644 trunk/package/luci/i18n/hebrew/Makefile
 create mode 100755 trunk/package/luci/i18n/hebrew/ipkg/postinst
 create mode 100644 trunk/package/luci/i18n/hebrew/root/etc/uci-defaults/luci-i18n-hebrew
 create mode 100644 trunk/package/luci/i18n/hungarian/Makefile
 create mode 100755 trunk/package/luci/i18n/hungarian/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/hungarian/root/etc/uci-defaults/luci-i18n-hungarian
 create mode 100644 trunk/package/luci/i18n/italian/Makefile
 create mode 100755 trunk/package/luci/i18n/italian/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian
 create mode 100644 trunk/package/luci/i18n/japanese/Makefile
 create mode 100755 trunk/package/luci/i18n/japanese/ipkg/postinst
 create mode 100644 trunk/package/luci/i18n/japanese/root/etc/uci-defaults/luci-i18n-japanese
 create mode 100644 trunk/package/luci/i18n/malay/Makefile
 create mode 100755 trunk/package/luci/i18n/malay/root/etc/uci-defaults/luci-i18n-malay
 create mode 100644 trunk/package/luci/i18n/norwegian/Makefile
 create mode 100755 trunk/package/luci/i18n/norwegian/ipkg/postinst
 create mode 100644 trunk/package/luci/i18n/norwegian/root/etc/uci-defaults/luci-i18n-norwegian
 create mode 100644 trunk/package/luci/i18n/polish/Makefile
 create mode 100755 trunk/package/luci/i18n/polish/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/polish/root/etc/uci-defaults/luci-i18n-polish
 create mode 100644 trunk/package/luci/i18n/portuguese-brazilian/Makefile
 create mode 100755 trunk/package/luci/i18n/portuguese-brazilian/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/portuguese-brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
 create mode 100644 trunk/package/luci/i18n/portuguese/Makefile
 create mode 100755 trunk/package/luci/i18n/portuguese/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/portuguese/root/etc/uci-defaults/luci-i18n-portuguese
 create mode 100644 trunk/package/luci/i18n/romanian/Makefile
 create mode 100755 trunk/package/luci/i18n/romanian/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/romanian/root/etc/uci-defaults/luci-i18n-romanian
 create mode 100644 trunk/package/luci/i18n/russian/Makefile
 create mode 100755 trunk/package/luci/i18n/russian/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian
 create mode 100644 trunk/package/luci/i18n/spanish/Makefile
 create mode 100755 trunk/package/luci/i18n/spanish/root/etc/uci-defaults/luci-i18n-spanish
 create mode 100644 trunk/package/luci/i18n/swedish/Makefile
 create mode 100755 trunk/package/luci/i18n/swedish/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/swedish/root/etc/uci-defaults/luci-i18n-swedish
 create mode 100644 trunk/package/luci/i18n/ukrainian/Makefile
 create mode 100755 trunk/package/luci/i18n/ukrainian/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/ukrainian/root/etc/uci-defaults/luci-i18n-ukrainian
 create mode 100644 trunk/package/luci/i18n/vietnamese/Makefile
 create mode 100755 trunk/package/luci/i18n/vietnamese/ipkg/postinst
 create mode 100755 trunk/package/luci/i18n/vietnamese/root/etc/uci-defaults/luci-i18n-vietnamese
 create mode 100644 trunk/package/luci/libs/httpclient/Makefile
 create mode 100644 trunk/package/luci/libs/httpclient/luasrc/httpclient.lua
 create mode 100644 trunk/package/luci/libs/httpclient/luasrc/httpclient/receiver.lua
 create mode 100644 trunk/package/luci/libs/json/Makefile
 create mode 100644 trunk/package/luci/libs/json/luasrc/json.lua
 create mode 100644 trunk/package/luci/libs/luaneightbl/Makefile
 create mode 100644 trunk/package/luci/libs/luaneightbl/src/neightbl.c
 create mode 100644 trunk/package/luci/libs/nixio/LICENSE
 create mode 100644 trunk/package/luci/libs/nixio/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/NOTICE
 create mode 100644 trunk/package/luci/libs/nixio/README
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/README
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/Config.in
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/README
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/csharp/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/csharp/axTLS.cs
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/bindings/generate_interface.pl
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/java/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/java/SSL.java
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLCTX.java
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLClient.java
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLReadHolder.java
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLServer.java
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLUtil.java
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/lua/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/perl/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/Config.in
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/config/JMeter.jmx
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/Rules.mak
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/config/axhttpd.aip
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/axtls.RES
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/axtls.rc
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/config.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/linuxconfig
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/makefile.conf
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/makefile.dotnet.conf
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/makefile.java.conf
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/makefile.post
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/conf.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/confdata.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc_proto.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mconf.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/menu.c
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mkconfigs
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/symbol.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/util.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.l
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.y
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/config/win32config
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/aes.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/bigint.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/bigint.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/bigint_impl.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/crypto.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/crypto_misc.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/hmac.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/md2.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/md5.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/rc4.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/rsa.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/crypto/sha1.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/docsrc/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/docsrc/axTLS.dox
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/docsrc/doco_footer.html
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/docsrc/images/axolotl.jpg
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/docsrc/images/tsbasbw.gif
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/Config.in
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/axhttp.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/axhttpd.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/htpasswd.c
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/kepler.patch
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/proc.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/httpd/tdate_parse.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/Config.in
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/c/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/c/axssl.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/csharp/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/csharp/axssl.cs
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/java/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/java/axssl.java
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/java/manifest.mf
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/lua/Makefile
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/samples/lua/axssl.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/perl/Makefile
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/samples/perl/axssl.pl
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/vbnet/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/samples/vbnet/axssl.vb
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/BigIntConfig.in
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/Config.in
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/asn1.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/cert.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/crypto_misc.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/gen_cert.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/loader.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/openssl.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/os_port.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/os_port.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/p12.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/private_key.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/ssl.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/Makefile
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.device_key
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.encrypted.p8
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_1024
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_2048
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_4096
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_512
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.noname.p12
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.unencrypted.p8
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.withCA.p12
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.withoutCA.p12
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_512.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_device.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c.old
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/equifax.x509_ca
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/test/gnutls.cer
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/test/header_issue.dat
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/test/killopenssl.sh
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/test/make_certs.sh
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/microsoft.x509_ca
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/test/ms_iis.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/perf_bigint.c
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/test/socgen.cer
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c.bak
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/test/test_axssl.sh
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/thawte.x509_ca
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_ca
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/tls1.c
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/ssl/tls1.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/tls1_clnt.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/tls1_svr.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/version.h
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/ssl/x509.c
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/favicon.ico
 create mode 100755 trunk/package/luci/libs/nixio/axTLS/www/index.html
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/download.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/env.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/overview.lp
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/prepara_sql2.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_conc.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lp
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_err.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_fs.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_htk.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_lib.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.html
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lp
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_session.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql2.lua
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/lua/test_variables.lp
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_http/index.html
 create mode 100644 trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_ssl/index.html
 create mode 100644 trunk/package/luci/libs/nixio/axtls-config/config.h
 create mode 100644 trunk/package/luci/libs/nixio/axtls-root/etc/nixio/rsa_main.der
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/CHANGELOG.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/README.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.CryptoHash.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.File.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.Socket.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.TLSContext.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.TLSSocket.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.UnifiedIO.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.bin.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.bit.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.crypto.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.fs.lua
 create mode 100644 trunk/package/luci/libs/nixio/docsrc/nixio.lua
 create mode 100644 trunk/package/luci/libs/nixio/lua/bit.lua
 create mode 100644 trunk/package/luci/libs/nixio/lua/nixio/fs.lua
 create mode 100644 trunk/package/luci/libs/nixio/lua/nixio/util.lua
 create mode 100644 trunk/package/luci/libs/nixio/nixio-0.3-1.rockspec
 create mode 100644 trunk/package/luci/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
 create mode 100644 trunk/package/luci/libs/nixio/src/address.c
 create mode 100644 trunk/package/luci/libs/nixio/src/axtls-compat.c
 create mode 100644 trunk/package/luci/libs/nixio/src/axtls-compat.h
 create mode 100644 trunk/package/luci/libs/nixio/src/binary.c
 create mode 100644 trunk/package/luci/libs/nixio/src/bind.c
 create mode 100644 trunk/package/luci/libs/nixio/src/bit.c
 create mode 100644 trunk/package/luci/libs/nixio/src/cyassl-compat.c
 create mode 100644 trunk/package/luci/libs/nixio/src/cyassl-compat.h
 create mode 100644 trunk/package/luci/libs/nixio/src/file.c
 create mode 100644 trunk/package/luci/libs/nixio/src/fs.c
 create mode 100644 trunk/package/luci/libs/nixio/src/io.c
 create mode 100644 trunk/package/luci/libs/nixio/src/mingw-compat.c
 create mode 100644 trunk/package/luci/libs/nixio/src/mingw-compat.h
 create mode 100644 trunk/package/luci/libs/nixio/src/nixio-tls.h
 create mode 100644 trunk/package/luci/libs/nixio/src/nixio.c
 create mode 100644 trunk/package/luci/libs/nixio/src/nixio.h
 create mode 100644 trunk/package/luci/libs/nixio/src/poll.c
 create mode 100644 trunk/package/luci/libs/nixio/src/process.c
 create mode 100644 trunk/package/luci/libs/nixio/src/protoent.c
 create mode 100644 trunk/package/luci/libs/nixio/src/socket.c
 create mode 100644 trunk/package/luci/libs/nixio/src/sockopt.c
 create mode 100644 trunk/package/luci/libs/nixio/src/splice.c
 create mode 100644 trunk/package/luci/libs/nixio/src/syslog.c
 create mode 100644 trunk/package/luci/libs/nixio/src/tls-context.c
 create mode 100644 trunk/package/luci/libs/nixio/src/tls-crypto.c
 create mode 100644 trunk/package/luci/libs/nixio/src/tls-socket.c
 create mode 100644 trunk/package/luci/libs/nixio/src/user.c
 create mode 100644 trunk/package/luci/libs/nixio/standalone.mk
 create mode 100644 trunk/package/luci/libs/px5g/Makefile
 create mode 100644 trunk/package/luci/libs/px5g/lua/px5g/util.lua
 create mode 100755 trunk/package/luci/libs/px5g/root/usr/sbin/px5g-genkeys
 create mode 100644 trunk/package/luci/libs/px5g/src/library/bignum.c
 create mode 100644 trunk/package/luci/libs/px5g/src/library/havege.c
 create mode 100644 trunk/package/luci/libs/px5g/src/library/rsa.c
 create mode 100644 trunk/package/luci/libs/px5g/src/library/sha1.c
 create mode 100644 trunk/package/luci/libs/px5g/src/library/timing.c
 create mode 100644 trunk/package/luci/libs/px5g/src/library/x509write.c
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/bignum.h
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/bn_mul.h
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/config.h
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/havege.h
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/rsa.h
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/sha1.h
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/timing.h
 create mode 100644 trunk/package/luci/libs/px5g/src/polarssl/x509.h
 create mode 100644 trunk/package/luci/libs/px5g/src/px5g.c
 create mode 100644 trunk/package/luci/libs/px5g/src/px5g.h
 create mode 100644 trunk/package/luci/libs/rpcc/Makefile
 create mode 100644 trunk/package/luci/libs/rpcc/luasrc/rpcc.lua
 create mode 100644 trunk/package/luci/libs/rpcc/luasrc/rpcc/ruci.lua
 create mode 100644 trunk/package/luci/modules/admin-full/Makefile
 create mode 100644 trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/bandwidth.svg
 create mode 100644 trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/connections.svg
 create mode 100644 trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/load.svg
 create mode 100644 trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wifirate.svg
 create mode 100644 trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wireless.svg
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/controller/admin/index.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/controller/admin/network.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/controller/admin/status.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/controller/admin/system.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/controller/admin/uci.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/admin.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/startup.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_status.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/lease_status.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/switch_status.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/connections.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/index.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/iptables.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/load.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/routes.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_status/wireless.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/backupfiles.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/clock_status.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/flashops.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/packages.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changelog.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm
 create mode 100644 trunk/package/luci/modules/admin-full/luasrc/view/cbi/wireless_modefreq.htm
 create mode 100644 trunk/package/luci/modules/admin-full/src/luci-bwc.c
 create mode 100644 trunk/package/luci/modules/admin-mini/Makefile
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/controller/mini/index.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/controller/mini/network.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/controller/mini/system.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/view/mini/backup.htm
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/view/mini/index.htm
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/view/mini/reboot.htm
 create mode 100644 trunk/package/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm
 create mode 100644 trunk/package/luci/modules/base/Makefile
 create mode 100755 trunk/package/luci/modules/base/htdocs/cgi-bin/luci
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi.js
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/add.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/apply.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/arrow.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/down.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/download.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/edit.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/file.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/find.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/folder.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/help.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/key.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/link.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/reload.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/remove.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/reset.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/save.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/up.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/user.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/bridge.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/encryption.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/ethernet.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/loading.gif
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/port_down.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/port_up.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-0.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-none.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/switch.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/tunnel.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/vlan.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_big.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png
 create mode 100644 trunk/package/luci/modules/base/htdocs/luci-static/resources/xhr.js
 create mode 100644 trunk/package/luci/modules/base/luasrc/cacheloader.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/cbi.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/cbi/datatypes.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/ccache.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/config.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/controller/admin/servicectl.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/debug.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/dispatcher.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/fs.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/http.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/http/protocol.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/http/protocol/conditionals.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/http/protocol/date.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/http/protocol/mime.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/i18n.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/init.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/ip.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/ltn12.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_none.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_static.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/model/firewall.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/model/ipkg.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/model/network.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/model/uci.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sauth.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sgi/cgi.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sgi/uhttpd.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/store.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sys.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sys/iptparser.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sys/zoneinfo.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzdata.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/template.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/tools/proto.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/tools/status.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/tools/webadmin.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/util.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/version.lua
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/apply_xhr.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/browser.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/button.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/cell_valuefooter.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/cell_valueheader.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/compound.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/delegator.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/dvalue.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/dynlist.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/filebrowser.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zoneforwards.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zonelist.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/footer.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/full_valuefooter.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/full_valueheader.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/fvalue.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/header.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/lvalue.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/map.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/mvalue.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/network_ifacelist.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/network_netinfo.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/network_netlist.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/nsection.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/nullsection.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/simpleform.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/tabcontainer.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/tabmenu.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/tblsection.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/tsection.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/tvalue.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/ucisection.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/upload.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/value.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/valuefooter.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/cbi/valueheader.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/error404.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/error500.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/footer.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/header.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/indexer.htm
 create mode 100644 trunk/package/luci/modules/base/luasrc/view/sysauth.htm
 create mode 100644 trunk/package/luci/modules/base/root/etc/config/luci
 create mode 100644 trunk/package/luci/modules/base/root/etc/config/ucitrack
 create mode 100755 trunk/package/luci/modules/base/root/sbin/luci-reload
 create mode 100644 trunk/package/luci/modules/base/root/www/index.html
 create mode 100644 trunk/package/luci/modules/base/src/po2lmo.c
 create mode 100644 trunk/package/luci/modules/base/src/template_lmo.c
 create mode 100644 trunk/package/luci/modules/base/src/template_lmo.h
 create mode 100644 trunk/package/luci/modules/base/src/template_lualib.c
 create mode 100644 trunk/package/luci/modules/base/src/template_lualib.h
 create mode 100644 trunk/package/luci/modules/base/src/template_parser.c
 create mode 100644 trunk/package/luci/modules/base/src/template_parser.h
 create mode 100644 trunk/package/luci/modules/base/src/template_utils.c
 create mode 100644 trunk/package/luci/modules/base/src/template_utils.h
 create mode 100644 trunk/package/luci/modules/base/standalone.mk
 create mode 100644 trunk/package/luci/modules/failsafe/Makefile
 create mode 100644 trunk/package/luci/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
 create mode 100644 trunk/package/luci/modules/failsafe/luasrc/view/failsafe/applyreboot.htm
 create mode 100644 trunk/package/luci/modules/failsafe/luasrc/view/failsafe/flashops.htm
 create mode 100644 trunk/package/luci/modules/failsafe/luasrc/view/failsafe/reboot.htm
 create mode 100644 trunk/package/luci/modules/failsafe/luasrc/view/failsafe/upgrade.htm
 create mode 100644 trunk/package/luci/modules/freifunk/Makefile
 create mode 100644 trunk/package/luci/modules/freifunk/htdocs/luci-static/flashing.html
 create mode 100644 trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm
 create mode 100644 trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/flashing.gif
 create mode 100644 trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif
 create mode 100644 trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/freifunk-map/node.gif
 create mode 100644 trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/osm.js
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/remote_update.lua
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/cbi/osmll_value.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/frame.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/map.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk/adminindex.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk/contact.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk/index.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk/profile_error.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk/public_status.htm
 create mode 100644 trunk/package/luci/modules/freifunk/luasrc/view/freifunk/remote_update.htm
 create mode 100644 trunk/package/luci/modules/rpc/Makefile
 create mode 100644 trunk/package/luci/modules/rpc/luasrc/controller/rpc.lua
 create mode 100644 trunk/package/luci/modules/rpc/luasrc/jsonrpc.lua
 create mode 100644 trunk/package/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua
 create mode 100644 trunk/package/luci/po/ca/ahcp.po
 create mode 100644 trunk/package/luci/po/ca/asterisk.po
 create mode 100644 trunk/package/luci/po/ca/base.po
 create mode 100644 trunk/package/luci/po/ca/commands.po
 create mode 100644 trunk/package/luci/po/ca/coovachilli.po
 create mode 100644 trunk/package/luci/po/ca/ddns.po
 create mode 100644 trunk/package/luci/po/ca/diag_core.po
 create mode 100644 trunk/package/luci/po/ca/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/ca/ffwizard.po
 create mode 100644 trunk/package/luci/po/ca/firewall.po
 create mode 100644 trunk/package/luci/po/ca/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/ca/freifunk.po
 create mode 100644 trunk/package/luci/po/ca/hd_idle.po
 create mode 100644 trunk/package/luci/po/ca/meshwizard.po
 create mode 100644 trunk/package/luci/po/ca/minidlna.po
 create mode 100644 trunk/package/luci/po/ca/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/ca/multiwan.po
 create mode 100644 trunk/package/luci/po/ca/ntpc.po
 create mode 100644 trunk/package/luci/po/ca/olsr.po
 create mode 100644 trunk/package/luci/po/ca/openvpn.po
 create mode 100644 trunk/package/luci/po/ca/p2pblock.po
 create mode 100644 trunk/package/luci/po/ca/p910nd.po
 create mode 100644 trunk/package/luci/po/ca/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/ca/pbx.po
 create mode 100644 trunk/package/luci/po/ca/polipo.po
 create mode 100644 trunk/package/luci/po/ca/qos.po
 create mode 100644 trunk/package/luci/po/ca/radvd.po
 create mode 100644 trunk/package/luci/po/ca/rrdtool.po
 create mode 100644 trunk/package/luci/po/ca/samba.po
 create mode 100644 trunk/package/luci/po/ca/splash.po
 create mode 100644 trunk/package/luci/po/ca/statistics.po
 create mode 100644 trunk/package/luci/po/ca/tinyproxy.po
 create mode 100644 trunk/package/luci/po/ca/transmission.po
 create mode 100644 trunk/package/luci/po/ca/upnp.po
 create mode 100644 trunk/package/luci/po/ca/ushare.po
 create mode 100644 trunk/package/luci/po/ca/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/ca/vnstat.po
 create mode 100644 trunk/package/luci/po/ca/voice_core.po
 create mode 100644 trunk/package/luci/po/ca/voice_diag.po
 create mode 100644 trunk/package/luci/po/ca/watchcat.po
 create mode 100644 trunk/package/luci/po/ca/wol.po
 create mode 100644 trunk/package/luci/po/ca/wshaper.po
 create mode 100644 trunk/package/luci/po/cs/ahcp.po
 create mode 100644 trunk/package/luci/po/cs/asterisk.po
 create mode 100644 trunk/package/luci/po/cs/base.po
 create mode 100644 trunk/package/luci/po/cs/commands.po
 create mode 100644 trunk/package/luci/po/cs/coovachilli.po
 create mode 100644 trunk/package/luci/po/cs/ddns.po
 create mode 100644 trunk/package/luci/po/cs/diag_core.po
 create mode 100644 trunk/package/luci/po/cs/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/cs/ffwizard.po
 create mode 100644 trunk/package/luci/po/cs/firewall.po
 create mode 100644 trunk/package/luci/po/cs/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/cs/freifunk.po
 create mode 100644 trunk/package/luci/po/cs/hd_idle.po
 create mode 100644 trunk/package/luci/po/cs/meshwizard.po
 create mode 100644 trunk/package/luci/po/cs/minidlna.po
 create mode 100644 trunk/package/luci/po/cs/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/cs/multiwan.po
 create mode 100644 trunk/package/luci/po/cs/ntpc.po
 create mode 100644 trunk/package/luci/po/cs/olsr.po
 create mode 100644 trunk/package/luci/po/cs/openvpn.po
 create mode 100644 trunk/package/luci/po/cs/p2pblock.po
 create mode 100644 trunk/package/luci/po/cs/p910nd.po
 create mode 100644 trunk/package/luci/po/cs/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/cs/pbx.po
 create mode 100644 trunk/package/luci/po/cs/polipo.po
 create mode 100644 trunk/package/luci/po/cs/qos.po
 create mode 100644 trunk/package/luci/po/cs/radvd.po
 create mode 100644 trunk/package/luci/po/cs/rrdtool.po
 create mode 100644 trunk/package/luci/po/cs/samba.po
 create mode 100644 trunk/package/luci/po/cs/splash.po
 create mode 100644 trunk/package/luci/po/cs/statistics.po
 create mode 100644 trunk/package/luci/po/cs/tinyproxy.po
 create mode 100644 trunk/package/luci/po/cs/transmission.po
 create mode 100644 trunk/package/luci/po/cs/upnp.po
 create mode 100644 trunk/package/luci/po/cs/ushare.po
 create mode 100644 trunk/package/luci/po/cs/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/cs/vnstat.po
 create mode 100644 trunk/package/luci/po/cs/voice_core.po
 create mode 100644 trunk/package/luci/po/cs/voice_diag.po
 create mode 100644 trunk/package/luci/po/cs/watchcat.po
 create mode 100644 trunk/package/luci/po/cs/wol.po
 create mode 100644 trunk/package/luci/po/cs/wshaper.po
 create mode 100644 trunk/package/luci/po/de/ahcp.po
 create mode 100644 trunk/package/luci/po/de/asterisk.po
 create mode 100644 trunk/package/luci/po/de/base.po
 create mode 100644 trunk/package/luci/po/de/commands.po
 create mode 100644 trunk/package/luci/po/de/coovachilli.po
 create mode 100644 trunk/package/luci/po/de/ddns.po
 create mode 100644 trunk/package/luci/po/de/diag_core.po
 create mode 100644 trunk/package/luci/po/de/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/de/ffwizard.po
 create mode 100644 trunk/package/luci/po/de/firewall.po
 create mode 100644 trunk/package/luci/po/de/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/de/freifunk.po
 create mode 100644 trunk/package/luci/po/de/hd_idle.po
 create mode 100644 trunk/package/luci/po/de/meshwizard.po
 create mode 100644 trunk/package/luci/po/de/minidlna.po
 create mode 100644 trunk/package/luci/po/de/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/de/multiwan.po
 create mode 100644 trunk/package/luci/po/de/ntpc.po
 create mode 100644 trunk/package/luci/po/de/olsr.po
 create mode 100644 trunk/package/luci/po/de/openvpn.po
 create mode 100644 trunk/package/luci/po/de/p2pblock.po
 create mode 100644 trunk/package/luci/po/de/p910nd.po
 create mode 100644 trunk/package/luci/po/de/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/de/pbx.po
 create mode 100644 trunk/package/luci/po/de/polipo.po
 create mode 100644 trunk/package/luci/po/de/qos.po
 create mode 100644 trunk/package/luci/po/de/radvd.po
 create mode 100644 trunk/package/luci/po/de/rrdtool.po
 create mode 100644 trunk/package/luci/po/de/samba.po
 create mode 100644 trunk/package/luci/po/de/splash.po
 create mode 100644 trunk/package/luci/po/de/statistics.po
 create mode 100644 trunk/package/luci/po/de/tinyproxy.po
 create mode 100644 trunk/package/luci/po/de/transmission.po
 create mode 100644 trunk/package/luci/po/de/upnp.po
 create mode 100644 trunk/package/luci/po/de/ushare.po
 create mode 100644 trunk/package/luci/po/de/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/de/vnstat.po
 create mode 100644 trunk/package/luci/po/de/voice_core.po
 create mode 100644 trunk/package/luci/po/de/voice_diag.po
 create mode 100644 trunk/package/luci/po/de/watchcat.po
 create mode 100644 trunk/package/luci/po/de/wol.po
 create mode 100644 trunk/package/luci/po/de/wshaper.po
 create mode 100644 trunk/package/luci/po/el/ahcp.po
 create mode 100644 trunk/package/luci/po/el/asterisk.po
 create mode 100644 trunk/package/luci/po/el/base.po
 create mode 100644 trunk/package/luci/po/el/commands.po
 create mode 100644 trunk/package/luci/po/el/coovachilli.po
 create mode 100644 trunk/package/luci/po/el/ddns.po
 create mode 100644 trunk/package/luci/po/el/diag_core.po
 create mode 100644 trunk/package/luci/po/el/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/el/ffwizard.po
 create mode 100644 trunk/package/luci/po/el/firewall.po
 create mode 100644 trunk/package/luci/po/el/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/el/freifunk.po
 create mode 100644 trunk/package/luci/po/el/hd_idle.po
 create mode 100644 trunk/package/luci/po/el/meshwizard.po
 create mode 100644 trunk/package/luci/po/el/minidlna.po
 create mode 100644 trunk/package/luci/po/el/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/el/multiwan.po
 create mode 100644 trunk/package/luci/po/el/ntpc.po
 create mode 100644 trunk/package/luci/po/el/olsr.po
 create mode 100644 trunk/package/luci/po/el/openvpn.po
 create mode 100644 trunk/package/luci/po/el/p2pblock.po
 create mode 100644 trunk/package/luci/po/el/p910nd.po
 create mode 100644 trunk/package/luci/po/el/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/el/pbx.po
 create mode 100644 trunk/package/luci/po/el/polipo.po
 create mode 100644 trunk/package/luci/po/el/qos.po
 create mode 100644 trunk/package/luci/po/el/radvd.po
 create mode 100644 trunk/package/luci/po/el/rrdtool.po
 create mode 100644 trunk/package/luci/po/el/samba.po
 create mode 100644 trunk/package/luci/po/el/splash.po
 create mode 100644 trunk/package/luci/po/el/statistics.po
 create mode 100644 trunk/package/luci/po/el/tinyproxy.po
 create mode 100644 trunk/package/luci/po/el/transmission.po
 create mode 100644 trunk/package/luci/po/el/upnp.po
 create mode 100644 trunk/package/luci/po/el/ushare.po
 create mode 100644 trunk/package/luci/po/el/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/el/vnstat.po
 create mode 100644 trunk/package/luci/po/el/voice_core.po
 create mode 100644 trunk/package/luci/po/el/voice_diag.po
 create mode 100644 trunk/package/luci/po/el/watchcat.po
 create mode 100644 trunk/package/luci/po/el/wol.po
 create mode 100644 trunk/package/luci/po/el/wshaper.po
 create mode 100644 trunk/package/luci/po/en/ahcp.po
 create mode 100644 trunk/package/luci/po/en/asterisk.po
 create mode 100644 trunk/package/luci/po/en/base.po
 create mode 100644 trunk/package/luci/po/en/commands.po
 create mode 100644 trunk/package/luci/po/en/coovachilli.po
 create mode 100644 trunk/package/luci/po/en/ddns.po
 create mode 100644 trunk/package/luci/po/en/diag_core.po
 create mode 100644 trunk/package/luci/po/en/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/en/ffwizard.po
 create mode 100644 trunk/package/luci/po/en/firewall.po
 create mode 100644 trunk/package/luci/po/en/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/en/freifunk.po
 create mode 100644 trunk/package/luci/po/en/hd_idle.po
 create mode 100644 trunk/package/luci/po/en/meshwizard.po
 create mode 100644 trunk/package/luci/po/en/minidlna.po
 create mode 100644 trunk/package/luci/po/en/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/en/multiwan.po
 create mode 100644 trunk/package/luci/po/en/ntpc.po
 create mode 100644 trunk/package/luci/po/en/olsr.po
 create mode 100644 trunk/package/luci/po/en/openvpn.po
 create mode 100644 trunk/package/luci/po/en/p2pblock.po
 create mode 100644 trunk/package/luci/po/en/p910nd.po
 create mode 100644 trunk/package/luci/po/en/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/en/pbx.po
 create mode 100644 trunk/package/luci/po/en/polipo.po
 create mode 100644 trunk/package/luci/po/en/qos.po
 create mode 100644 trunk/package/luci/po/en/radvd.po
 create mode 100644 trunk/package/luci/po/en/rrdtool.po
 create mode 100644 trunk/package/luci/po/en/samba.po
 create mode 100644 trunk/package/luci/po/en/splash.po
 create mode 100644 trunk/package/luci/po/en/statistics.po
 create mode 100644 trunk/package/luci/po/en/tinyproxy.po
 create mode 100644 trunk/package/luci/po/en/transmission.po
 create mode 100644 trunk/package/luci/po/en/upnp.po
 create mode 100644 trunk/package/luci/po/en/ushare.po
 create mode 100644 trunk/package/luci/po/en/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/en/vnstat.po
 create mode 100644 trunk/package/luci/po/en/voice_core.po
 create mode 100644 trunk/package/luci/po/en/voice_diag.po
 create mode 100644 trunk/package/luci/po/en/watchcat.po
 create mode 100644 trunk/package/luci/po/en/wol.po
 create mode 100644 trunk/package/luci/po/en/wshaper.po
 create mode 100644 trunk/package/luci/po/es/ahcp.po
 create mode 100644 trunk/package/luci/po/es/asterisk.po
 create mode 100644 trunk/package/luci/po/es/base.po
 create mode 100644 trunk/package/luci/po/es/commands.po
 create mode 100644 trunk/package/luci/po/es/coovachilli.po
 create mode 100644 trunk/package/luci/po/es/ddns.po
 create mode 100644 trunk/package/luci/po/es/diag_core.po
 create mode 100644 trunk/package/luci/po/es/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/es/ffwizard.po
 create mode 100644 trunk/package/luci/po/es/firewall.po
 create mode 100644 trunk/package/luci/po/es/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/es/freifunk.po
 create mode 100644 trunk/package/luci/po/es/hd_idle.po
 create mode 100644 trunk/package/luci/po/es/meshwizard.po
 create mode 100644 trunk/package/luci/po/es/minidlna.po
 create mode 100644 trunk/package/luci/po/es/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/es/multiwan.po
 create mode 100644 trunk/package/luci/po/es/ntpc.po
 create mode 100644 trunk/package/luci/po/es/olsr.po
 create mode 100644 trunk/package/luci/po/es/openvpn.po
 create mode 100644 trunk/package/luci/po/es/p2pblock.po
 create mode 100644 trunk/package/luci/po/es/p910nd.po
 create mode 100644 trunk/package/luci/po/es/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/es/pbx.po
 create mode 100644 trunk/package/luci/po/es/polipo.po
 create mode 100644 trunk/package/luci/po/es/qos.po
 create mode 100644 trunk/package/luci/po/es/radvd.po
 create mode 100644 trunk/package/luci/po/es/rrdtool.po
 create mode 100644 trunk/package/luci/po/es/samba.po
 create mode 100644 trunk/package/luci/po/es/splash.po
 create mode 100644 trunk/package/luci/po/es/statistics.po
 create mode 100644 trunk/package/luci/po/es/tinyproxy.po
 create mode 100644 trunk/package/luci/po/es/transmission.po
 create mode 100644 trunk/package/luci/po/es/upnp.po
 create mode 100644 trunk/package/luci/po/es/ushare.po
 create mode 100644 trunk/package/luci/po/es/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/es/vnstat.po
 create mode 100644 trunk/package/luci/po/es/voice_core.po
 create mode 100644 trunk/package/luci/po/es/voice_diag.po
 create mode 100644 trunk/package/luci/po/es/watchcat.po
 create mode 100644 trunk/package/luci/po/es/wol.po
 create mode 100644 trunk/package/luci/po/es/wshaper.po
 create mode 100644 trunk/package/luci/po/fr/ahcp.po
 create mode 100644 trunk/package/luci/po/fr/asterisk.po
 create mode 100644 trunk/package/luci/po/fr/base.po
 create mode 100644 trunk/package/luci/po/fr/commands.po
 create mode 100644 trunk/package/luci/po/fr/coovachilli.po
 create mode 100644 trunk/package/luci/po/fr/ddns.po
 create mode 100644 trunk/package/luci/po/fr/diag_core.po
 create mode 100644 trunk/package/luci/po/fr/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/fr/ffwizard.po
 create mode 100644 trunk/package/luci/po/fr/firewall.po
 create mode 100644 trunk/package/luci/po/fr/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/fr/freifunk.po
 create mode 100644 trunk/package/luci/po/fr/hd_idle.po
 create mode 100644 trunk/package/luci/po/fr/meshwizard.po
 create mode 100644 trunk/package/luci/po/fr/minidlna.po
 create mode 100644 trunk/package/luci/po/fr/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/fr/multiwan.po
 create mode 100644 trunk/package/luci/po/fr/ntpc.po
 create mode 100644 trunk/package/luci/po/fr/olsr.po
 create mode 100644 trunk/package/luci/po/fr/openvpn.po
 create mode 100644 trunk/package/luci/po/fr/p2pblock.po
 create mode 100644 trunk/package/luci/po/fr/p910nd.po
 create mode 100644 trunk/package/luci/po/fr/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/fr/pbx.po
 create mode 100644 trunk/package/luci/po/fr/polipo.po
 create mode 100644 trunk/package/luci/po/fr/qos.po
 create mode 100644 trunk/package/luci/po/fr/radvd.po
 create mode 100644 trunk/package/luci/po/fr/rrdtool.po
 create mode 100644 trunk/package/luci/po/fr/samba.po
 create mode 100644 trunk/package/luci/po/fr/splash.po
 create mode 100644 trunk/package/luci/po/fr/statistics.po
 create mode 100644 trunk/package/luci/po/fr/tinyproxy.po
 create mode 100644 trunk/package/luci/po/fr/transmission.po
 create mode 100644 trunk/package/luci/po/fr/upnp.po
 create mode 100644 trunk/package/luci/po/fr/ushare.po
 create mode 100644 trunk/package/luci/po/fr/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/fr/vnstat.po
 create mode 100644 trunk/package/luci/po/fr/voice_core.po
 create mode 100644 trunk/package/luci/po/fr/voice_diag.po
 create mode 100644 trunk/package/luci/po/fr/watchcat.po
 create mode 100644 trunk/package/luci/po/fr/wol.po
 create mode 100644 trunk/package/luci/po/fr/wshaper.po
 create mode 100644 trunk/package/luci/po/he/ahcp.po
 create mode 100644 trunk/package/luci/po/he/asterisk.po
 create mode 100644 trunk/package/luci/po/he/base.po
 create mode 100644 trunk/package/luci/po/he/commands.po
 create mode 100644 trunk/package/luci/po/he/coovachilli.po
 create mode 100644 trunk/package/luci/po/he/ddns.po
 create mode 100644 trunk/package/luci/po/he/diag_core.po
 create mode 100644 trunk/package/luci/po/he/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/he/ffwizard.po
 create mode 100644 trunk/package/luci/po/he/firewall.po
 create mode 100644 trunk/package/luci/po/he/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/he/freifunk.po
 create mode 100644 trunk/package/luci/po/he/hd_idle.po
 create mode 100644 trunk/package/luci/po/he/meshwizard.po
 create mode 100644 trunk/package/luci/po/he/minidlna.po
 create mode 100644 trunk/package/luci/po/he/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/he/multiwan.po
 create mode 100644 trunk/package/luci/po/he/ntpc.po
 create mode 100644 trunk/package/luci/po/he/olsr.po
 create mode 100644 trunk/package/luci/po/he/openvpn.po
 create mode 100644 trunk/package/luci/po/he/p2pblock.po
 create mode 100644 trunk/package/luci/po/he/p910nd.po
 create mode 100644 trunk/package/luci/po/he/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/he/pbx.po
 create mode 100644 trunk/package/luci/po/he/polipo.po
 create mode 100644 trunk/package/luci/po/he/qos.po
 create mode 100644 trunk/package/luci/po/he/radvd.po
 create mode 100644 trunk/package/luci/po/he/rrdtool.po
 create mode 100644 trunk/package/luci/po/he/samba.po
 create mode 100644 trunk/package/luci/po/he/splash.po
 create mode 100644 trunk/package/luci/po/he/statistics.po
 create mode 100644 trunk/package/luci/po/he/tinyproxy.po
 create mode 100644 trunk/package/luci/po/he/transmission.po
 create mode 100644 trunk/package/luci/po/he/upnp.po
 create mode 100644 trunk/package/luci/po/he/ushare.po
 create mode 100644 trunk/package/luci/po/he/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/he/vnstat.po
 create mode 100644 trunk/package/luci/po/he/voice_core.po
 create mode 100644 trunk/package/luci/po/he/voice_diag.po
 create mode 100644 trunk/package/luci/po/he/watchcat.po
 create mode 100644 trunk/package/luci/po/he/wol.po
 create mode 100644 trunk/package/luci/po/he/wshaper.po
 create mode 100644 trunk/package/luci/po/hu/ahcp.po
 create mode 100644 trunk/package/luci/po/hu/asterisk.po
 create mode 100644 trunk/package/luci/po/hu/base.po
 create mode 100644 trunk/package/luci/po/hu/commands.po
 create mode 100644 trunk/package/luci/po/hu/coovachilli.po
 create mode 100644 trunk/package/luci/po/hu/ddns.po
 create mode 100644 trunk/package/luci/po/hu/diag_core.po
 create mode 100644 trunk/package/luci/po/hu/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/hu/ffwizard.po
 create mode 100644 trunk/package/luci/po/hu/firewall.po
 create mode 100644 trunk/package/luci/po/hu/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/hu/freifunk.po
 create mode 100644 trunk/package/luci/po/hu/hd_idle.po
 create mode 100644 trunk/package/luci/po/hu/meshwizard.po
 create mode 100644 trunk/package/luci/po/hu/minidlna.po
 create mode 100644 trunk/package/luci/po/hu/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/hu/multiwan.po
 create mode 100644 trunk/package/luci/po/hu/ntpc.po
 create mode 100644 trunk/package/luci/po/hu/olsr.po
 create mode 100644 trunk/package/luci/po/hu/openvpn.po
 create mode 100644 trunk/package/luci/po/hu/p2pblock.po
 create mode 100644 trunk/package/luci/po/hu/p910nd.po
 create mode 100644 trunk/package/luci/po/hu/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/hu/pbx.po
 create mode 100644 trunk/package/luci/po/hu/polipo.po
 create mode 100644 trunk/package/luci/po/hu/qos.po
 create mode 100644 trunk/package/luci/po/hu/radvd.po
 create mode 100644 trunk/package/luci/po/hu/rrdtool.po
 create mode 100644 trunk/package/luci/po/hu/samba.po
 create mode 100644 trunk/package/luci/po/hu/splash.po
 create mode 100644 trunk/package/luci/po/hu/statistics.po
 create mode 100644 trunk/package/luci/po/hu/tinyproxy.po
 create mode 100644 trunk/package/luci/po/hu/transmission.po
 create mode 100644 trunk/package/luci/po/hu/upnp.po
 create mode 100644 trunk/package/luci/po/hu/ushare.po
 create mode 100644 trunk/package/luci/po/hu/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/hu/vnstat.po
 create mode 100644 trunk/package/luci/po/hu/voice_core.po
 create mode 100644 trunk/package/luci/po/hu/voice_diag.po
 create mode 100644 trunk/package/luci/po/hu/watchcat.po
 create mode 100644 trunk/package/luci/po/hu/wol.po
 create mode 100644 trunk/package/luci/po/hu/wshaper.po
 create mode 100644 trunk/package/luci/po/it/ahcp.po
 create mode 100644 trunk/package/luci/po/it/asterisk.po
 create mode 100644 trunk/package/luci/po/it/base.po
 create mode 100644 trunk/package/luci/po/it/commands.po
 create mode 100644 trunk/package/luci/po/it/coovachilli.po
 create mode 100644 trunk/package/luci/po/it/ddns.po
 create mode 100644 trunk/package/luci/po/it/diag_core.po
 create mode 100644 trunk/package/luci/po/it/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/it/ffwizard.po
 create mode 100644 trunk/package/luci/po/it/firewall.po
 create mode 100644 trunk/package/luci/po/it/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/it/freifunk.po
 create mode 100644 trunk/package/luci/po/it/hd_idle.po
 create mode 100644 trunk/package/luci/po/it/meshwizard.po
 create mode 100644 trunk/package/luci/po/it/minidlna.po
 create mode 100644 trunk/package/luci/po/it/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/it/multiwan.po
 create mode 100644 trunk/package/luci/po/it/ntpc.po
 create mode 100644 trunk/package/luci/po/it/olsr.po
 create mode 100644 trunk/package/luci/po/it/openvpn.po
 create mode 100644 trunk/package/luci/po/it/p2pblock.po
 create mode 100644 trunk/package/luci/po/it/p910nd.po
 create mode 100644 trunk/package/luci/po/it/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/it/pbx.po
 create mode 100644 trunk/package/luci/po/it/polipo.po
 create mode 100644 trunk/package/luci/po/it/qos.po
 create mode 100644 trunk/package/luci/po/it/radvd.po
 create mode 100644 trunk/package/luci/po/it/rrdtool.po
 create mode 100644 trunk/package/luci/po/it/samba.po
 create mode 100644 trunk/package/luci/po/it/splash.po
 create mode 100644 trunk/package/luci/po/it/statistics.po
 create mode 100644 trunk/package/luci/po/it/tinyproxy.po
 create mode 100644 trunk/package/luci/po/it/transmission.po
 create mode 100644 trunk/package/luci/po/it/upnp.po
 create mode 100644 trunk/package/luci/po/it/ushare.po
 create mode 100644 trunk/package/luci/po/it/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/it/vnstat.po
 create mode 100644 trunk/package/luci/po/it/voice_core.po
 create mode 100644 trunk/package/luci/po/it/voice_diag.po
 create mode 100644 trunk/package/luci/po/it/watchcat.po
 create mode 100644 trunk/package/luci/po/it/wol.po
 create mode 100644 trunk/package/luci/po/it/wshaper.po
 create mode 100644 trunk/package/luci/po/ja/ahcp.po
 create mode 100644 trunk/package/luci/po/ja/asterisk.po
 create mode 100644 trunk/package/luci/po/ja/base.po
 create mode 100644 trunk/package/luci/po/ja/commands.po
 create mode 100644 trunk/package/luci/po/ja/coovachilli.po
 create mode 100644 trunk/package/luci/po/ja/ddns.po
 create mode 100644 trunk/package/luci/po/ja/diag_core.po
 create mode 100644 trunk/package/luci/po/ja/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/ja/ffwizard.po
 create mode 100644 trunk/package/luci/po/ja/firewall.po
 create mode 100644 trunk/package/luci/po/ja/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/ja/freifunk.po
 create mode 100644 trunk/package/luci/po/ja/hd_idle.po
 create mode 100644 trunk/package/luci/po/ja/meshwizard.po
 create mode 100644 trunk/package/luci/po/ja/minidlna.po
 create mode 100644 trunk/package/luci/po/ja/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/ja/multiwan.po
 create mode 100644 trunk/package/luci/po/ja/ntpc.po
 create mode 100644 trunk/package/luci/po/ja/olsr.po
 create mode 100644 trunk/package/luci/po/ja/openvpn.po
 create mode 100644 trunk/package/luci/po/ja/p2pblock.po
 create mode 100644 trunk/package/luci/po/ja/p910nd.po
 create mode 100644 trunk/package/luci/po/ja/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/ja/pbx.po
 create mode 100644 trunk/package/luci/po/ja/polipo.po
 create mode 100644 trunk/package/luci/po/ja/qos.po
 create mode 100644 trunk/package/luci/po/ja/radvd.po
 create mode 100644 trunk/package/luci/po/ja/rrdtool.po
 create mode 100644 trunk/package/luci/po/ja/samba.po
 create mode 100644 trunk/package/luci/po/ja/splash.po
 create mode 100644 trunk/package/luci/po/ja/statistics.po
 create mode 100644 trunk/package/luci/po/ja/tinyproxy.po
 create mode 100644 trunk/package/luci/po/ja/transmission.po
 create mode 100644 trunk/package/luci/po/ja/upnp.po
 create mode 100644 trunk/package/luci/po/ja/ushare.po
 create mode 100644 trunk/package/luci/po/ja/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/ja/vnstat.po
 create mode 100644 trunk/package/luci/po/ja/voice_core.po
 create mode 100644 trunk/package/luci/po/ja/voice_diag.po
 create mode 100644 trunk/package/luci/po/ja/watchcat.po
 create mode 100644 trunk/package/luci/po/ja/wol.po
 create mode 100644 trunk/package/luci/po/ja/wshaper.po
 create mode 100644 trunk/package/luci/po/ms/ahcp.po
 create mode 100644 trunk/package/luci/po/ms/asterisk.po
 create mode 100644 trunk/package/luci/po/ms/base.po
 create mode 100644 trunk/package/luci/po/ms/commands.po
 create mode 100644 trunk/package/luci/po/ms/coovachilli.po
 create mode 100644 trunk/package/luci/po/ms/ddns.po
 create mode 100644 trunk/package/luci/po/ms/diag_core.po
 create mode 100644 trunk/package/luci/po/ms/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/ms/ffwizard.po
 create mode 100644 trunk/package/luci/po/ms/firewall.po
 create mode 100644 trunk/package/luci/po/ms/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/ms/freifunk.po
 create mode 100644 trunk/package/luci/po/ms/hd_idle.po
 create mode 100644 trunk/package/luci/po/ms/meshwizard.po
 create mode 100644 trunk/package/luci/po/ms/minidlna.po
 create mode 100644 trunk/package/luci/po/ms/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/ms/multiwan.po
 create mode 100644 trunk/package/luci/po/ms/ntpc.po
 create mode 100644 trunk/package/luci/po/ms/olsr.po
 create mode 100644 trunk/package/luci/po/ms/openvpn.po
 create mode 100644 trunk/package/luci/po/ms/p2pblock.po
 create mode 100644 trunk/package/luci/po/ms/p910nd.po
 create mode 100644 trunk/package/luci/po/ms/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/ms/pbx.po
 create mode 100644 trunk/package/luci/po/ms/polipo.po
 create mode 100644 trunk/package/luci/po/ms/qos.po
 create mode 100644 trunk/package/luci/po/ms/radvd.po
 create mode 100644 trunk/package/luci/po/ms/rrdtool.po
 create mode 100644 trunk/package/luci/po/ms/samba.po
 create mode 100644 trunk/package/luci/po/ms/splash.po
 create mode 100644 trunk/package/luci/po/ms/statistics.po
 create mode 100644 trunk/package/luci/po/ms/tinyproxy.po
 create mode 100644 trunk/package/luci/po/ms/transmission.po
 create mode 100644 trunk/package/luci/po/ms/upnp.po
 create mode 100644 trunk/package/luci/po/ms/ushare.po
 create mode 100644 trunk/package/luci/po/ms/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/ms/vnstat.po
 create mode 100644 trunk/package/luci/po/ms/voice_core.po
 create mode 100644 trunk/package/luci/po/ms/voice_diag.po
 create mode 100644 trunk/package/luci/po/ms/watchcat.po
 create mode 100644 trunk/package/luci/po/ms/wol.po
 create mode 100644 trunk/package/luci/po/ms/wshaper.po
 create mode 100644 trunk/package/luci/po/no/ahcp.po
 create mode 100644 trunk/package/luci/po/no/asterisk.po
 create mode 100644 trunk/package/luci/po/no/base.po
 create mode 100644 trunk/package/luci/po/no/commands.po
 create mode 100644 trunk/package/luci/po/no/coovachilli.po
 create mode 100644 trunk/package/luci/po/no/ddns.po
 create mode 100644 trunk/package/luci/po/no/diag_core.po
 create mode 100644 trunk/package/luci/po/no/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/no/ffwizard.po
 create mode 100644 trunk/package/luci/po/no/firewall.po
 create mode 100644 trunk/package/luci/po/no/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/no/freifunk.po
 create mode 100644 trunk/package/luci/po/no/hd_idle.po
 create mode 100644 trunk/package/luci/po/no/meshwizard.po
 create mode 100644 trunk/package/luci/po/no/minidlna.po
 create mode 100644 trunk/package/luci/po/no/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/no/multiwan.po
 create mode 100644 trunk/package/luci/po/no/ntpc.po
 create mode 100644 trunk/package/luci/po/no/olsr.po
 create mode 100644 trunk/package/luci/po/no/openvpn.po
 create mode 100644 trunk/package/luci/po/no/p2pblock.po
 create mode 100644 trunk/package/luci/po/no/p910nd.po
 create mode 100644 trunk/package/luci/po/no/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/no/pbx.po
 create mode 100644 trunk/package/luci/po/no/polipo.po
 create mode 100644 trunk/package/luci/po/no/qos.po
 create mode 100644 trunk/package/luci/po/no/radvd.po
 create mode 100644 trunk/package/luci/po/no/rrdtool.po
 create mode 100644 trunk/package/luci/po/no/samba.po
 create mode 100644 trunk/package/luci/po/no/splash.po
 create mode 100644 trunk/package/luci/po/no/statistics.po
 create mode 100644 trunk/package/luci/po/no/tinyproxy.po
 create mode 100644 trunk/package/luci/po/no/transmission.po
 create mode 100644 trunk/package/luci/po/no/upnp.po
 create mode 100644 trunk/package/luci/po/no/ushare.po
 create mode 100644 trunk/package/luci/po/no/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/no/vnstat.po
 create mode 100644 trunk/package/luci/po/no/voice_core.po
 create mode 100644 trunk/package/luci/po/no/voice_diag.po
 create mode 100644 trunk/package/luci/po/no/watchcat.po
 create mode 100644 trunk/package/luci/po/no/wol.po
 create mode 100644 trunk/package/luci/po/no/wshaper.po
 create mode 100644 trunk/package/luci/po/pl/ahcp.po
 create mode 100644 trunk/package/luci/po/pl/asterisk.po
 create mode 100644 trunk/package/luci/po/pl/base.po
 create mode 100644 trunk/package/luci/po/pl/commands.po
 create mode 100644 trunk/package/luci/po/pl/coovachilli.po
 create mode 100644 trunk/package/luci/po/pl/ddns.po
 create mode 100644 trunk/package/luci/po/pl/diag_core.po
 create mode 100644 trunk/package/luci/po/pl/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/pl/ffwizard.po
 create mode 100644 trunk/package/luci/po/pl/firewall.po
 create mode 100644 trunk/package/luci/po/pl/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/pl/freifunk.po
 create mode 100644 trunk/package/luci/po/pl/hd_idle.po
 create mode 100644 trunk/package/luci/po/pl/meshwizard.po
 create mode 100644 trunk/package/luci/po/pl/minidlna.po
 create mode 100644 trunk/package/luci/po/pl/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/pl/multiwan.po
 create mode 100644 trunk/package/luci/po/pl/ntpc.po
 create mode 100644 trunk/package/luci/po/pl/olsr.po
 create mode 100644 trunk/package/luci/po/pl/openvpn.po
 create mode 100644 trunk/package/luci/po/pl/p2pblock.po
 create mode 100644 trunk/package/luci/po/pl/p910nd.po
 create mode 100644 trunk/package/luci/po/pl/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/pl/pbx.po
 create mode 100644 trunk/package/luci/po/pl/polipo.po
 create mode 100644 trunk/package/luci/po/pl/qos.po
 create mode 100644 trunk/package/luci/po/pl/radvd.po
 create mode 100644 trunk/package/luci/po/pl/rrdtool.po
 create mode 100644 trunk/package/luci/po/pl/samba.po
 create mode 100644 trunk/package/luci/po/pl/splash.po
 create mode 100644 trunk/package/luci/po/pl/statistics.po
 create mode 100644 trunk/package/luci/po/pl/tinyproxy.po
 create mode 100644 trunk/package/luci/po/pl/transmission.po
 create mode 100644 trunk/package/luci/po/pl/upnp.po
 create mode 100644 trunk/package/luci/po/pl/ushare.po
 create mode 100644 trunk/package/luci/po/pl/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/pl/vnstat.po
 create mode 100644 trunk/package/luci/po/pl/voice_core.po
 create mode 100644 trunk/package/luci/po/pl/voice_diag.po
 create mode 100644 trunk/package/luci/po/pl/watchcat.po
 create mode 100644 trunk/package/luci/po/pl/wol.po
 create mode 100644 trunk/package/luci/po/pl/wshaper.po
 create mode 100644 trunk/package/luci/po/pt/ahcp.po
 create mode 100644 trunk/package/luci/po/pt/asterisk.po
 create mode 100644 trunk/package/luci/po/pt/base.po
 create mode 100644 trunk/package/luci/po/pt/commands.po
 create mode 100644 trunk/package/luci/po/pt/coovachilli.po
 create mode 100644 trunk/package/luci/po/pt/ddns.po
 create mode 100644 trunk/package/luci/po/pt/diag_core.po
 create mode 100644 trunk/package/luci/po/pt/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/pt/ffwizard.po
 create mode 100644 trunk/package/luci/po/pt/firewall.po
 create mode 100644 trunk/package/luci/po/pt/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/pt/freifunk.po
 create mode 100644 trunk/package/luci/po/pt/hd_idle.po
 create mode 100644 trunk/package/luci/po/pt/meshwizard.po
 create mode 100644 trunk/package/luci/po/pt/minidlna.po
 create mode 100644 trunk/package/luci/po/pt/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/pt/multiwan.po
 create mode 100644 trunk/package/luci/po/pt/ntpc.po
 create mode 100644 trunk/package/luci/po/pt/olsr.po
 create mode 100644 trunk/package/luci/po/pt/openvpn.po
 create mode 100644 trunk/package/luci/po/pt/p2pblock.po
 create mode 100644 trunk/package/luci/po/pt/p910nd.po
 create mode 100644 trunk/package/luci/po/pt/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/pt/pbx.po
 create mode 100644 trunk/package/luci/po/pt/polipo.po
 create mode 100644 trunk/package/luci/po/pt/qos.po
 create mode 100644 trunk/package/luci/po/pt/radvd.po
 create mode 100644 trunk/package/luci/po/pt/rrdtool.po
 create mode 100644 trunk/package/luci/po/pt/samba.po
 create mode 100644 trunk/package/luci/po/pt/splash.po
 create mode 100644 trunk/package/luci/po/pt/statistics.po
 create mode 100644 trunk/package/luci/po/pt/tinyproxy.po
 create mode 100644 trunk/package/luci/po/pt/transmission.po
 create mode 100644 trunk/package/luci/po/pt/upnp.po
 create mode 100644 trunk/package/luci/po/pt/ushare.po
 create mode 100644 trunk/package/luci/po/pt/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/pt/vnstat.po
 create mode 100644 trunk/package/luci/po/pt/voice_core.po
 create mode 100644 trunk/package/luci/po/pt/voice_diag.po
 create mode 100644 trunk/package/luci/po/pt/watchcat.po
 create mode 100644 trunk/package/luci/po/pt/wol.po
 create mode 100644 trunk/package/luci/po/pt/wshaper.po
 create mode 100644 trunk/package/luci/po/pt_BR/ahcp.po
 create mode 100644 trunk/package/luci/po/pt_BR/asterisk.po
 create mode 100644 trunk/package/luci/po/pt_BR/base.po
 create mode 100644 trunk/package/luci/po/pt_BR/commands.po
 create mode 100644 trunk/package/luci/po/pt_BR/coovachilli.po
 create mode 100644 trunk/package/luci/po/pt_BR/ddns.po
 create mode 100644 trunk/package/luci/po/pt_BR/diag_core.po
 create mode 100644 trunk/package/luci/po/pt_BR/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/pt_BR/ffwizard.po
 create mode 100644 trunk/package/luci/po/pt_BR/firewall.po
 create mode 100644 trunk/package/luci/po/pt_BR/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/pt_BR/freifunk.po
 create mode 100644 trunk/package/luci/po/pt_BR/hd_idle.po
 create mode 100644 trunk/package/luci/po/pt_BR/meshwizard.po
 create mode 100644 trunk/package/luci/po/pt_BR/minidlna.po
 create mode 100644 trunk/package/luci/po/pt_BR/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/pt_BR/multiwan.po
 create mode 100644 trunk/package/luci/po/pt_BR/ntpc.po
 create mode 100644 trunk/package/luci/po/pt_BR/olsr.po
 create mode 100644 trunk/package/luci/po/pt_BR/openvpn.po
 create mode 100644 trunk/package/luci/po/pt_BR/p2pblock.po
 create mode 100644 trunk/package/luci/po/pt_BR/p910nd.po
 create mode 100644 trunk/package/luci/po/pt_BR/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/pt_BR/pbx.po
 create mode 100644 trunk/package/luci/po/pt_BR/polipo.po
 create mode 100644 trunk/package/luci/po/pt_BR/qos.po
 create mode 100644 trunk/package/luci/po/pt_BR/radvd.po
 create mode 100644 trunk/package/luci/po/pt_BR/rrdtool.po
 create mode 100644 trunk/package/luci/po/pt_BR/samba.po
 create mode 100644 trunk/package/luci/po/pt_BR/splash.po
 create mode 100644 trunk/package/luci/po/pt_BR/statistics.po
 create mode 100644 trunk/package/luci/po/pt_BR/tinyproxy.po
 create mode 100644 trunk/package/luci/po/pt_BR/transmission.po
 create mode 100644 trunk/package/luci/po/pt_BR/upnp.po
 create mode 100644 trunk/package/luci/po/pt_BR/ushare.po
 create mode 100644 trunk/package/luci/po/pt_BR/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/pt_BR/vnstat.po
 create mode 100644 trunk/package/luci/po/pt_BR/voice_core.po
 create mode 100644 trunk/package/luci/po/pt_BR/voice_diag.po
 create mode 100644 trunk/package/luci/po/pt_BR/watchcat.po
 create mode 100644 trunk/package/luci/po/pt_BR/wol.po
 create mode 100644 trunk/package/luci/po/pt_BR/wshaper.po
 create mode 100644 trunk/package/luci/po/ro/ahcp.po
 create mode 100644 trunk/package/luci/po/ro/asterisk.po
 create mode 100644 trunk/package/luci/po/ro/base.po
 create mode 100644 trunk/package/luci/po/ro/commands.po
 create mode 100644 trunk/package/luci/po/ro/coovachilli.po
 create mode 100644 trunk/package/luci/po/ro/ddns.po
 create mode 100644 trunk/package/luci/po/ro/diag_core.po
 create mode 100644 trunk/package/luci/po/ro/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/ro/ffwizard.po
 create mode 100644 trunk/package/luci/po/ro/firewall.po
 create mode 100644 trunk/package/luci/po/ro/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/ro/freifunk.po
 create mode 100644 trunk/package/luci/po/ro/hd_idle.po
 create mode 100644 trunk/package/luci/po/ro/meshwizard.po
 create mode 100644 trunk/package/luci/po/ro/minidlna.po
 create mode 100644 trunk/package/luci/po/ro/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/ro/multiwan.po
 create mode 100644 trunk/package/luci/po/ro/ntpc.po
 create mode 100644 trunk/package/luci/po/ro/olsr.po
 create mode 100644 trunk/package/luci/po/ro/openvpn.po
 create mode 100644 trunk/package/luci/po/ro/p2pblock.po
 create mode 100644 trunk/package/luci/po/ro/p910nd.po
 create mode 100644 trunk/package/luci/po/ro/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/ro/pbx.po
 create mode 100644 trunk/package/luci/po/ro/polipo.po
 create mode 100644 trunk/package/luci/po/ro/qos.po
 create mode 100644 trunk/package/luci/po/ro/radvd.po
 create mode 100644 trunk/package/luci/po/ro/rrdtool.po
 create mode 100644 trunk/package/luci/po/ro/samba.po
 create mode 100644 trunk/package/luci/po/ro/splash.po
 create mode 100644 trunk/package/luci/po/ro/statistics.po
 create mode 100644 trunk/package/luci/po/ro/tinyproxy.po
 create mode 100644 trunk/package/luci/po/ro/transmission.po
 create mode 100644 trunk/package/luci/po/ro/upnp.po
 create mode 100644 trunk/package/luci/po/ro/ushare.po
 create mode 100644 trunk/package/luci/po/ro/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/ro/vnstat.po
 create mode 100644 trunk/package/luci/po/ro/voice_core.po
 create mode 100644 trunk/package/luci/po/ro/voice_diag.po
 create mode 100644 trunk/package/luci/po/ro/watchcat.po
 create mode 100644 trunk/package/luci/po/ro/wol.po
 create mode 100644 trunk/package/luci/po/ro/wshaper.po
 create mode 100644 trunk/package/luci/po/ru/ahcp.po
 create mode 100644 trunk/package/luci/po/ru/asterisk.po
 create mode 100644 trunk/package/luci/po/ru/base.po
 create mode 100644 trunk/package/luci/po/ru/commands.po
 create mode 100644 trunk/package/luci/po/ru/coovachilli.po
 create mode 100644 trunk/package/luci/po/ru/ddns.po
 create mode 100644 trunk/package/luci/po/ru/diag_core.po
 create mode 100644 trunk/package/luci/po/ru/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/ru/ffwizard.po
 create mode 100644 trunk/package/luci/po/ru/firewall.po
 create mode 100644 trunk/package/luci/po/ru/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/ru/freifunk.po
 create mode 100644 trunk/package/luci/po/ru/hd_idle.po
 create mode 100644 trunk/package/luci/po/ru/meshwizard.po
 create mode 100644 trunk/package/luci/po/ru/minidlna.po
 create mode 100644 trunk/package/luci/po/ru/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/ru/multiwan.po
 create mode 100644 trunk/package/luci/po/ru/ntpc.po
 create mode 100644 trunk/package/luci/po/ru/olsr.po
 create mode 100644 trunk/package/luci/po/ru/openvpn.po
 create mode 100644 trunk/package/luci/po/ru/p2pblock.po
 create mode 100644 trunk/package/luci/po/ru/p910nd.po
 create mode 100644 trunk/package/luci/po/ru/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/ru/pbx.po
 create mode 100644 trunk/package/luci/po/ru/polipo.po
 create mode 100644 trunk/package/luci/po/ru/qos.po
 create mode 100644 trunk/package/luci/po/ru/radvd.po
 create mode 100644 trunk/package/luci/po/ru/rrdtool.po
 create mode 100644 trunk/package/luci/po/ru/samba.po
 create mode 100644 trunk/package/luci/po/ru/splash.po
 create mode 100644 trunk/package/luci/po/ru/statistics.po
 create mode 100644 trunk/package/luci/po/ru/tinyproxy.po
 create mode 100644 trunk/package/luci/po/ru/transmission.po
 create mode 100644 trunk/package/luci/po/ru/upnp.po
 create mode 100644 trunk/package/luci/po/ru/ushare.po
 create mode 100644 trunk/package/luci/po/ru/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/ru/vnstat.po
 create mode 100644 trunk/package/luci/po/ru/voice_core.po
 create mode 100644 trunk/package/luci/po/ru/voice_diag.po
 create mode 100644 trunk/package/luci/po/ru/watchcat.po
 create mode 100644 trunk/package/luci/po/ru/wol.po
 create mode 100644 trunk/package/luci/po/ru/wshaper.po
 create mode 100644 trunk/package/luci/po/sk/ahcp.po
 create mode 100644 trunk/package/luci/po/sk/asterisk.po
 create mode 100644 trunk/package/luci/po/sk/base.po
 create mode 100644 trunk/package/luci/po/sk/commands.po
 create mode 100644 trunk/package/luci/po/sk/coovachilli.po
 create mode 100644 trunk/package/luci/po/sk/ddns.po
 create mode 100644 trunk/package/luci/po/sk/diag_core.po
 create mode 100644 trunk/package/luci/po/sk/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/sk/ffwizard.po
 create mode 100644 trunk/package/luci/po/sk/firewall.po
 create mode 100644 trunk/package/luci/po/sk/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/sk/freifunk.po
 create mode 100644 trunk/package/luci/po/sk/hd_idle.po
 create mode 100644 trunk/package/luci/po/sk/meshwizard.po
 create mode 100644 trunk/package/luci/po/sk/minidlna.po
 create mode 100644 trunk/package/luci/po/sk/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/sk/multiwan.po
 create mode 100644 trunk/package/luci/po/sk/ntpc.po
 create mode 100644 trunk/package/luci/po/sk/olsr.po
 create mode 100644 trunk/package/luci/po/sk/openvpn.po
 create mode 100644 trunk/package/luci/po/sk/p2pblock.po
 create mode 100644 trunk/package/luci/po/sk/p910nd.po
 create mode 100644 trunk/package/luci/po/sk/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/sk/pbx.po
 create mode 100644 trunk/package/luci/po/sk/polipo.po
 create mode 100644 trunk/package/luci/po/sk/qos.po
 create mode 100644 trunk/package/luci/po/sk/radvd.po
 create mode 100644 trunk/package/luci/po/sk/rrdtool.po
 create mode 100644 trunk/package/luci/po/sk/samba.po
 create mode 100644 trunk/package/luci/po/sk/splash.po
 create mode 100644 trunk/package/luci/po/sk/statistics.po
 create mode 100644 trunk/package/luci/po/sk/tinyproxy.po
 create mode 100644 trunk/package/luci/po/sk/transmission.po
 create mode 100644 trunk/package/luci/po/sk/upnp.po
 create mode 100644 trunk/package/luci/po/sk/ushare.po
 create mode 100644 trunk/package/luci/po/sk/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/sk/vnstat.po
 create mode 100644 trunk/package/luci/po/sk/voice_core.po
 create mode 100644 trunk/package/luci/po/sk/voice_diag.po
 create mode 100644 trunk/package/luci/po/sk/watchcat.po
 create mode 100644 trunk/package/luci/po/sk/wol.po
 create mode 100644 trunk/package/luci/po/sk/wshaper.po
 create mode 100644 trunk/package/luci/po/sv/ahcp.po
 create mode 100644 trunk/package/luci/po/sv/asterisk.po
 create mode 100644 trunk/package/luci/po/sv/base.po
 create mode 100644 trunk/package/luci/po/sv/commands.po
 create mode 100644 trunk/package/luci/po/sv/coovachilli.po
 create mode 100644 trunk/package/luci/po/sv/ddns.po
 create mode 100644 trunk/package/luci/po/sv/diag_core.po
 create mode 100644 trunk/package/luci/po/sv/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/sv/ffwizard.po
 create mode 100644 trunk/package/luci/po/sv/firewall.po
 create mode 100644 trunk/package/luci/po/sv/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/sv/freifunk.po
 create mode 100644 trunk/package/luci/po/sv/hd_idle.po
 create mode 100644 trunk/package/luci/po/sv/meshwizard.po
 create mode 100644 trunk/package/luci/po/sv/minidlna.po
 create mode 100644 trunk/package/luci/po/sv/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/sv/multiwan.po
 create mode 100644 trunk/package/luci/po/sv/ntpc.po
 create mode 100644 trunk/package/luci/po/sv/olsr.po
 create mode 100644 trunk/package/luci/po/sv/openvpn.po
 create mode 100644 trunk/package/luci/po/sv/p2pblock.po
 create mode 100644 trunk/package/luci/po/sv/p910nd.po
 create mode 100644 trunk/package/luci/po/sv/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/sv/pbx.po
 create mode 100644 trunk/package/luci/po/sv/polipo.po
 create mode 100644 trunk/package/luci/po/sv/qos.po
 create mode 100644 trunk/package/luci/po/sv/radvd.po
 create mode 100644 trunk/package/luci/po/sv/rrdtool.po
 create mode 100644 trunk/package/luci/po/sv/samba.po
 create mode 100644 trunk/package/luci/po/sv/splash.po
 create mode 100644 trunk/package/luci/po/sv/statistics.po
 create mode 100644 trunk/package/luci/po/sv/tinyproxy.po
 create mode 100644 trunk/package/luci/po/sv/transmission.po
 create mode 100644 trunk/package/luci/po/sv/upnp.po
 create mode 100644 trunk/package/luci/po/sv/ushare.po
 create mode 100644 trunk/package/luci/po/sv/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/sv/vnstat.po
 create mode 100644 trunk/package/luci/po/sv/voice_core.po
 create mode 100644 trunk/package/luci/po/sv/voice_diag.po
 create mode 100644 trunk/package/luci/po/sv/watchcat.po
 create mode 100644 trunk/package/luci/po/sv/wol.po
 create mode 100644 trunk/package/luci/po/sv/wshaper.po
 create mode 100644 trunk/package/luci/po/templates/ahcp.pot
 create mode 100644 trunk/package/luci/po/templates/asterisk.pot
 create mode 100644 trunk/package/luci/po/templates/base.pot
 create mode 100644 trunk/package/luci/po/templates/commands.pot
 create mode 100644 trunk/package/luci/po/templates/coovachilli.pot
 create mode 100644 trunk/package/luci/po/templates/ddns.pot
 create mode 100644 trunk/package/luci/po/templates/diag_core.pot
 create mode 100644 trunk/package/luci/po/templates/diag_devinfo.pot
 create mode 100644 trunk/package/luci/po/templates/ffwizard.pot
 create mode 100644 trunk/package/luci/po/templates/firewall.pot
 create mode 100644 trunk/package/luci/po/templates/freifunk-policyrouting.pot
 create mode 100644 trunk/package/luci/po/templates/freifunk.pot
 create mode 100644 trunk/package/luci/po/templates/hd_idle.pot
 create mode 100644 trunk/package/luci/po/templates/meshwizard.pot
 create mode 100644 trunk/package/luci/po/templates/minidlna.pot
 create mode 100644 trunk/package/luci/po/templates/mmc_over_gpio.pot
 create mode 100644 trunk/package/luci/po/templates/multiwan.pot
 create mode 100644 trunk/package/luci/po/templates/ntpc.pot
 create mode 100644 trunk/package/luci/po/templates/olsr.pot
 create mode 100644 trunk/package/luci/po/templates/openvpn.pot
 create mode 100644 trunk/package/luci/po/templates/p2pblock.pot
 create mode 100644 trunk/package/luci/po/templates/p910nd.pot
 create mode 100644 trunk/package/luci/po/templates/pbx-voicemail.pot
 create mode 100644 trunk/package/luci/po/templates/pbx.pot
 create mode 100644 trunk/package/luci/po/templates/polipo.pot
 create mode 100644 trunk/package/luci/po/templates/qos.pot
 create mode 100644 trunk/package/luci/po/templates/radvd.pot
 create mode 100644 trunk/package/luci/po/templates/rrdtool.pot
 create mode 100644 trunk/package/luci/po/templates/samba.pot
 create mode 100644 trunk/package/luci/po/templates/splash.pot
 create mode 100644 trunk/package/luci/po/templates/statistics.pot
 create mode 100644 trunk/package/luci/po/templates/tinyproxy.pot
 create mode 100644 trunk/package/luci/po/templates/transmission.pot
 create mode 100644 trunk/package/luci/po/templates/upnp.pot
 create mode 100644 trunk/package/luci/po/templates/ushare.pot
 create mode 100644 trunk/package/luci/po/templates/uvc_streamer.pot
 create mode 100644 trunk/package/luci/po/templates/vnstat.pot
 create mode 100644 trunk/package/luci/po/templates/voice_core.pot
 create mode 100644 trunk/package/luci/po/templates/voice_diag.pot
 create mode 100644 trunk/package/luci/po/templates/watchcat.pot
 create mode 100644 trunk/package/luci/po/templates/wol.pot
 create mode 100644 trunk/package/luci/po/templates/wshaper.pot
 create mode 100644 trunk/package/luci/po/tr/ahcp.po
 create mode 100644 trunk/package/luci/po/tr/asterisk.po
 create mode 100644 trunk/package/luci/po/tr/base.po
 create mode 100644 trunk/package/luci/po/tr/commands.po
 create mode 100644 trunk/package/luci/po/tr/coovachilli.po
 create mode 100644 trunk/package/luci/po/tr/ddns.po
 create mode 100644 trunk/package/luci/po/tr/diag_core.po
 create mode 100644 trunk/package/luci/po/tr/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/tr/ffwizard.po
 create mode 100644 trunk/package/luci/po/tr/firewall.po
 create mode 100644 trunk/package/luci/po/tr/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/tr/freifunk.po
 create mode 100644 trunk/package/luci/po/tr/hd_idle.po
 create mode 100644 trunk/package/luci/po/tr/meshwizard.po
 create mode 100644 trunk/package/luci/po/tr/minidlna.po
 create mode 100644 trunk/package/luci/po/tr/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/tr/multiwan.po
 create mode 100644 trunk/package/luci/po/tr/ntpc.po
 create mode 100644 trunk/package/luci/po/tr/olsr.po
 create mode 100644 trunk/package/luci/po/tr/openvpn.po
 create mode 100644 trunk/package/luci/po/tr/p2pblock.po
 create mode 100644 trunk/package/luci/po/tr/p910nd.po
 create mode 100644 trunk/package/luci/po/tr/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/tr/pbx.po
 create mode 100644 trunk/package/luci/po/tr/polipo.po
 create mode 100644 trunk/package/luci/po/tr/qos.po
 create mode 100644 trunk/package/luci/po/tr/radvd.po
 create mode 100644 trunk/package/luci/po/tr/rrdtool.po
 create mode 100644 trunk/package/luci/po/tr/samba.po
 create mode 100644 trunk/package/luci/po/tr/splash.po
 create mode 100644 trunk/package/luci/po/tr/statistics.po
 create mode 100644 trunk/package/luci/po/tr/tinyproxy.po
 create mode 100644 trunk/package/luci/po/tr/transmission.po
 create mode 100644 trunk/package/luci/po/tr/upnp.po
 create mode 100644 trunk/package/luci/po/tr/ushare.po
 create mode 100644 trunk/package/luci/po/tr/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/tr/vnstat.po
 create mode 100644 trunk/package/luci/po/tr/voice_core.po
 create mode 100644 trunk/package/luci/po/tr/voice_diag.po
 create mode 100644 trunk/package/luci/po/tr/watchcat.po
 create mode 100644 trunk/package/luci/po/tr/wol.po
 create mode 100644 trunk/package/luci/po/tr/wshaper.po
 create mode 100644 trunk/package/luci/po/uk/ahcp.po
 create mode 100644 trunk/package/luci/po/uk/asterisk.po
 create mode 100644 trunk/package/luci/po/uk/base.po
 create mode 100644 trunk/package/luci/po/uk/commands.po
 create mode 100644 trunk/package/luci/po/uk/coovachilli.po
 create mode 100644 trunk/package/luci/po/uk/ddns.po
 create mode 100644 trunk/package/luci/po/uk/diag_core.po
 create mode 100644 trunk/package/luci/po/uk/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/uk/ffwizard.po
 create mode 100644 trunk/package/luci/po/uk/firewall.po
 create mode 100644 trunk/package/luci/po/uk/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/uk/freifunk.po
 create mode 100644 trunk/package/luci/po/uk/hd_idle.po
 create mode 100644 trunk/package/luci/po/uk/meshwizard.po
 create mode 100644 trunk/package/luci/po/uk/minidlna.po
 create mode 100644 trunk/package/luci/po/uk/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/uk/multiwan.po
 create mode 100644 trunk/package/luci/po/uk/ntpc.po
 create mode 100644 trunk/package/luci/po/uk/olsr.po
 create mode 100644 trunk/package/luci/po/uk/openvpn.po
 create mode 100644 trunk/package/luci/po/uk/p2pblock.po
 create mode 100644 trunk/package/luci/po/uk/p910nd.po
 create mode 100644 trunk/package/luci/po/uk/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/uk/pbx.po
 create mode 100644 trunk/package/luci/po/uk/polipo.po
 create mode 100644 trunk/package/luci/po/uk/qos.po
 create mode 100644 trunk/package/luci/po/uk/radvd.po
 create mode 100644 trunk/package/luci/po/uk/rrdtool.po
 create mode 100644 trunk/package/luci/po/uk/samba.po
 create mode 100644 trunk/package/luci/po/uk/splash.po
 create mode 100644 trunk/package/luci/po/uk/statistics.po
 create mode 100644 trunk/package/luci/po/uk/tinyproxy.po
 create mode 100644 trunk/package/luci/po/uk/transmission.po
 create mode 100644 trunk/package/luci/po/uk/upnp.po
 create mode 100644 trunk/package/luci/po/uk/ushare.po
 create mode 100644 trunk/package/luci/po/uk/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/uk/vnstat.po
 create mode 100644 trunk/package/luci/po/uk/voice_core.po
 create mode 100644 trunk/package/luci/po/uk/voice_diag.po
 create mode 100644 trunk/package/luci/po/uk/watchcat.po
 create mode 100644 trunk/package/luci/po/uk/wol.po
 create mode 100644 trunk/package/luci/po/uk/wshaper.po
 create mode 100644 trunk/package/luci/po/vi/ahcp.po
 create mode 100644 trunk/package/luci/po/vi/asterisk.po
 create mode 100644 trunk/package/luci/po/vi/base.po
 create mode 100644 trunk/package/luci/po/vi/commands.po
 create mode 100644 trunk/package/luci/po/vi/coovachilli.po
 create mode 100644 trunk/package/luci/po/vi/ddns.po
 create mode 100644 trunk/package/luci/po/vi/diag_core.po
 create mode 100644 trunk/package/luci/po/vi/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/vi/ffwizard.po
 create mode 100644 trunk/package/luci/po/vi/firewall.po
 create mode 100644 trunk/package/luci/po/vi/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/vi/freifunk.po
 create mode 100644 trunk/package/luci/po/vi/hd_idle.po
 create mode 100644 trunk/package/luci/po/vi/meshwizard.po
 create mode 100644 trunk/package/luci/po/vi/minidlna.po
 create mode 100644 trunk/package/luci/po/vi/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/vi/multiwan.po
 create mode 100644 trunk/package/luci/po/vi/ntpc.po
 create mode 100644 trunk/package/luci/po/vi/olsr.po
 create mode 100644 trunk/package/luci/po/vi/openvpn.po
 create mode 100644 trunk/package/luci/po/vi/p2pblock.po
 create mode 100644 trunk/package/luci/po/vi/p910nd.po
 create mode 100644 trunk/package/luci/po/vi/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/vi/pbx.po
 create mode 100644 trunk/package/luci/po/vi/polipo.po
 create mode 100644 trunk/package/luci/po/vi/qos.po
 create mode 100644 trunk/package/luci/po/vi/radvd.po
 create mode 100644 trunk/package/luci/po/vi/rrdtool.po
 create mode 100644 trunk/package/luci/po/vi/samba.po
 create mode 100644 trunk/package/luci/po/vi/splash.po
 create mode 100644 trunk/package/luci/po/vi/statistics.po
 create mode 100644 trunk/package/luci/po/vi/tinyproxy.po
 create mode 100644 trunk/package/luci/po/vi/transmission.po
 create mode 100644 trunk/package/luci/po/vi/upnp.po
 create mode 100644 trunk/package/luci/po/vi/ushare.po
 create mode 100644 trunk/package/luci/po/vi/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/vi/vnstat.po
 create mode 100644 trunk/package/luci/po/vi/voice_core.po
 create mode 100644 trunk/package/luci/po/vi/voice_diag.po
 create mode 100644 trunk/package/luci/po/vi/watchcat.po
 create mode 100644 trunk/package/luci/po/vi/wol.po
 create mode 100644 trunk/package/luci/po/vi/wshaper.po
 create mode 100644 trunk/package/luci/po/zh_CN/ahcp.po
 create mode 100644 trunk/package/luci/po/zh_CN/asterisk.po
 create mode 100644 trunk/package/luci/po/zh_CN/base.po
 create mode 100644 trunk/package/luci/po/zh_CN/commands.po
 create mode 100644 trunk/package/luci/po/zh_CN/coovachilli.po
 create mode 100644 trunk/package/luci/po/zh_CN/ddns.po
 create mode 100644 trunk/package/luci/po/zh_CN/diag_core.po
 create mode 100644 trunk/package/luci/po/zh_CN/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/zh_CN/ffwizard.po
 create mode 100644 trunk/package/luci/po/zh_CN/firewall.po
 create mode 100644 trunk/package/luci/po/zh_CN/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/zh_CN/freifunk.po
 create mode 100644 trunk/package/luci/po/zh_CN/hd_idle.po
 create mode 100644 trunk/package/luci/po/zh_CN/meshwizard.po
 create mode 100644 trunk/package/luci/po/zh_CN/minidlna.po
 create mode 100644 trunk/package/luci/po/zh_CN/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/zh_CN/multiwan.po
 create mode 100644 trunk/package/luci/po/zh_CN/ntpc.po
 create mode 100644 trunk/package/luci/po/zh_CN/olsr.po
 create mode 100644 trunk/package/luci/po/zh_CN/openvpn.po
 create mode 100644 trunk/package/luci/po/zh_CN/p2pblock.po
 create mode 100644 trunk/package/luci/po/zh_CN/p910nd.po
 create mode 100644 trunk/package/luci/po/zh_CN/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/zh_CN/pbx.po
 create mode 100644 trunk/package/luci/po/zh_CN/polipo.po
 create mode 100644 trunk/package/luci/po/zh_CN/qos.po
 create mode 100644 trunk/package/luci/po/zh_CN/radvd.po
 create mode 100644 trunk/package/luci/po/zh_CN/rrdtool.po
 create mode 100644 trunk/package/luci/po/zh_CN/samba.po
 create mode 100644 trunk/package/luci/po/zh_CN/splash.po
 create mode 100644 trunk/package/luci/po/zh_CN/statistics.po
 create mode 100644 trunk/package/luci/po/zh_CN/tinyproxy.po
 create mode 100644 trunk/package/luci/po/zh_CN/transmission.po
 create mode 100644 trunk/package/luci/po/zh_CN/upnp.po
 create mode 100644 trunk/package/luci/po/zh_CN/ushare.po
 create mode 100644 trunk/package/luci/po/zh_CN/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/zh_CN/vnstat.po
 create mode 100644 trunk/package/luci/po/zh_CN/voice_core.po
 create mode 100644 trunk/package/luci/po/zh_CN/voice_diag.po
 create mode 100644 trunk/package/luci/po/zh_CN/watchcat.po
 create mode 100644 trunk/package/luci/po/zh_CN/wol.po
 create mode 100644 trunk/package/luci/po/zh_CN/wshaper.po
 create mode 100644 trunk/package/luci/po/zh_TW/ahcp.po
 create mode 100644 trunk/package/luci/po/zh_TW/asterisk.po
 create mode 100644 trunk/package/luci/po/zh_TW/base.po
 create mode 100644 trunk/package/luci/po/zh_TW/commands.po
 create mode 100644 trunk/package/luci/po/zh_TW/coovachilli.po
 create mode 100644 trunk/package/luci/po/zh_TW/ddns.po
 create mode 100644 trunk/package/luci/po/zh_TW/diag_core.po
 create mode 100644 trunk/package/luci/po/zh_TW/diag_devinfo.po
 create mode 100644 trunk/package/luci/po/zh_TW/ffwizard.po
 create mode 100644 trunk/package/luci/po/zh_TW/firewall.po
 create mode 100644 trunk/package/luci/po/zh_TW/freifunk-policyrouting.po
 create mode 100644 trunk/package/luci/po/zh_TW/freifunk.po
 create mode 100644 trunk/package/luci/po/zh_TW/hd_idle.po
 create mode 100644 trunk/package/luci/po/zh_TW/meshwizard.po
 create mode 100644 trunk/package/luci/po/zh_TW/minidlna.po
 create mode 100644 trunk/package/luci/po/zh_TW/mmc_over_gpio.po
 create mode 100644 trunk/package/luci/po/zh_TW/multiwan.po
 create mode 100644 trunk/package/luci/po/zh_TW/ntpc.po
 create mode 100644 trunk/package/luci/po/zh_TW/olsr.po
 create mode 100644 trunk/package/luci/po/zh_TW/openvpn.po
 create mode 100644 trunk/package/luci/po/zh_TW/p2pblock.po
 create mode 100644 trunk/package/luci/po/zh_TW/p910nd.po
 create mode 100644 trunk/package/luci/po/zh_TW/pbx-voicemail.po
 create mode 100644 trunk/package/luci/po/zh_TW/pbx.po
 create mode 100644 trunk/package/luci/po/zh_TW/polipo.po
 create mode 100644 trunk/package/luci/po/zh_TW/qos.po
 create mode 100644 trunk/package/luci/po/zh_TW/radvd.po
 create mode 100644 trunk/package/luci/po/zh_TW/rrdtool.po
 create mode 100644 trunk/package/luci/po/zh_TW/samba.po
 create mode 100644 trunk/package/luci/po/zh_TW/splash.po
 create mode 100644 trunk/package/luci/po/zh_TW/statistics.po
 create mode 100644 trunk/package/luci/po/zh_TW/tinyproxy.po
 create mode 100644 trunk/package/luci/po/zh_TW/transmission.po
 create mode 100644 trunk/package/luci/po/zh_TW/upnp.po
 create mode 100644 trunk/package/luci/po/zh_TW/ushare.po
 create mode 100644 trunk/package/luci/po/zh_TW/uvc_streamer.po
 create mode 100644 trunk/package/luci/po/zh_TW/vnstat.po
 create mode 100644 trunk/package/luci/po/zh_TW/voice_core.po
 create mode 100644 trunk/package/luci/po/zh_TW/voice_diag.po
 create mode 100644 trunk/package/luci/po/zh_TW/watchcat.po
 create mode 100644 trunk/package/luci/po/zh_TW/wol.po
 create mode 100644 trunk/package/luci/po/zh_TW/wshaper.po
 create mode 100644 trunk/package/luci/protocols/3g/Makefile
 create mode 100644 trunk/package/luci/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/Makefile
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_4x6.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_6x4.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
 create mode 100644 trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_hnet.lua
 create mode 100644 trunk/package/luci/protocols/openconnect/Makefile
 create mode 100644 trunk/package/luci/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
 create mode 100644 trunk/package/luci/protocols/openconnect/luasrc/model/network/proto_openconnect.lua
 create mode 100644 trunk/package/luci/protocols/ppp/Makefile
 create mode 100644 trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
 create mode 100644 trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
 create mode 100644 trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
 create mode 100644 trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
 create mode 100644 trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
 create mode 100644 trunk/package/luci/protocols/ppp/luasrc/model/network/proto_ppp.lua
 create mode 100644 trunk/package/luci/protocols/relay/Makefile
 create mode 100644 trunk/package/luci/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua
 create mode 100644 trunk/package/luci/protocols/relay/luasrc/model/network/proto_relay.lua
 create mode 100644 trunk/package/luci/themes/bootstrap/Makefile
 create mode 100644 trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css
 create mode 100644 trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/favicon.ico
 create mode 100644 trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js
 create mode 100644 trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css
 create mode 100755 trunk/package/luci/themes/bootstrap/ipkg/postinst
 create mode 100644 trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm
 create mode 100644 trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
 create mode 100755 trunk/package/luci/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
 create mode 100644 trunk/package/luci/themes/freifunk-bno/Makefile
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
 create mode 100644 trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
 create mode 100755 trunk/package/luci/themes/freifunk-bno/ipkg/postinst
 create mode 100644 trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
 create mode 100644 trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
 create mode 100755 trunk/package/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
 create mode 100644 trunk/package/luci/themes/freifunk-generic/Makefile
 create mode 100644 trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
 create mode 100644 trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
 create mode 100644 trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
 create mode 100644 trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
 create mode 100644 trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
 create mode 100644 trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
 create mode 100644 trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
 create mode 100644 trunk/package/luci/themes/freifunk-generic/ipkg/postinst
 create mode 100644 trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
 create mode 100644 trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
 create mode 100644 trunk/package/luci/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
 create mode 100644 trunk/package/network/config/firewall/Makefile
 create mode 100644 trunk/package/network/config/firewall/files/firewall.config
 create mode 100644 trunk/package/network/config/firewall/files/firewall.hotplug
 create mode 100755 trunk/package/network/config/firewall/files/firewall.init
 create mode 100644 trunk/package/network/config/firewall/files/firewall.user
 create mode 100644 trunk/package/network/config/gre/Makefile
 create mode 100755 trunk/package/network/config/gre/files/gre.sh
 create mode 100644 trunk/package/network/config/ipip/Makefile
 create mode 100755 trunk/package/network/config/ipip/files/ipip.sh
 create mode 100644 trunk/package/network/config/ltq-adsl-app/Makefile
 create mode 100644 trunk/package/network/config/ltq-adsl-app/files/dsl_control
 create mode 100644 trunk/package/network/config/ltq-adsl-app/patches/010-eglibc_compile_fix.patch
 create mode 100644 trunk/package/network/config/ltq-vdsl-app/Makefile
 create mode 100644 trunk/package/network/config/ltq-vdsl-app/files/dsl_control
 create mode 100644 trunk/package/network/config/ltq-vdsl-app/patches/100-compat.patch
 create mode 100644 trunk/package/network/config/netifd/Makefile
 create mode 100644 trunk/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
 create mode 100755 trunk/package/network/config/netifd/files/etc/init.d/network
 create mode 100755 trunk/package/network/config/netifd/files/lib/netifd/dhcp.script
 create mode 100755 trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
 create mode 100755 trunk/package/network/config/netifd/files/lib/network/config.sh
 create mode 100755 trunk/package/network/config/netifd/files/sbin/devstatus
 create mode 100755 trunk/package/network/config/netifd/files/sbin/ifdown
 create mode 100755 trunk/package/network/config/netifd/files/sbin/ifstatus
 create mode 100755 trunk/package/network/config/netifd/files/sbin/ifup
 create mode 100755 trunk/package/network/config/netifd/files/usr/share/udhcpc/default.script
 create mode 100644 trunk/package/network/config/netifd/patches/001-musl_af_inet_include.patch
 create mode 100644 trunk/package/network/config/qos-scripts/Makefile
 create mode 100644 trunk/package/network/config/qos-scripts/files/etc/config/qos
 create mode 100755 trunk/package/network/config/qos-scripts/files/etc/hotplug.d/iface/10-qos
 create mode 100755 trunk/package/network/config/qos-scripts/files/etc/init.d/qos
 create mode 100755 trunk/package/network/config/qos-scripts/files/usr/bin/qos-start
 create mode 100755 trunk/package/network/config/qos-scripts/files/usr/bin/qos-stat
 create mode 100755 trunk/package/network/config/qos-scripts/files/usr/bin/qos-stop
 create mode 100755 trunk/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
 create mode 100644 trunk/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
 create mode 100644 trunk/package/network/config/soloscli/Makefile
 create mode 100644 trunk/package/network/config/soloscli/files/etc/hotplug.d/atm/15-solos-init
 create mode 100644 trunk/package/network/config/soloscli/files/etc/uci-default/solos
 create mode 100644 trunk/package/network/config/soloscli/files/solos-log-stats
 create mode 100644 trunk/package/network/config/soloscli/patches/001-no-driver.patch
 create mode 100644 trunk/package/network/config/soloscli/patches/002-cflags.patch
 create mode 100644 trunk/package/network/config/swconfig/Makefile
 create mode 100644 trunk/package/network/config/swconfig/files/switch.sh
 create mode 100644 trunk/package/network/config/swconfig/src/Makefile
 create mode 100644 trunk/package/network/config/swconfig/src/cli.c
 create mode 100644 trunk/package/network/config/swconfig/src/swlib.c
 create mode 100644 trunk/package/network/config/swconfig/src/swlib.h
 create mode 100644 trunk/package/network/config/swconfig/src/uci.c
 create mode 100644 trunk/package/network/ipv6/6in4/Makefile
 create mode 100755 trunk/package/network/ipv6/6in4/files/6in4.sh
 create mode 100644 trunk/package/network/ipv6/6rd/Makefile
 create mode 100644 trunk/package/network/ipv6/6rd/files/6rd.sh
 create mode 100644 trunk/package/network/ipv6/6rd/src/6rdcalc.c
 create mode 100644 trunk/package/network/ipv6/6rd/src/Makefile
 create mode 100644 trunk/package/network/ipv6/6to4/Makefile
 create mode 100755 trunk/package/network/ipv6/6to4/files/6to4.sh
 create mode 100644 trunk/package/network/ipv6/ds-lite/Makefile
 create mode 100755 trunk/package/network/ipv6/ds-lite/files/dslite.sh
 create mode 100644 trunk/package/network/ipv6/map/Makefile
 create mode 100755 trunk/package/network/ipv6/map/files/map.sh
 create mode 100644 trunk/package/network/ipv6/map/src/CMakeLists.txt
 create mode 100644 trunk/package/network/ipv6/map/src/mapcalc.c
 create mode 100644 trunk/package/network/ipv6/odhcp6c/Makefile
 create mode 100755 trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script
 create mode 100755 trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh
 create mode 100644 trunk/package/network/ipv6/thc-ipv6/Makefile
 create mode 100644 trunk/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch
 create mode 100644 trunk/package/network/services/authsae/Makefile
 create mode 100644 trunk/package/network/services/authsae/files/lib/wifi/authsae.sh
 create mode 100644 trunk/package/network/services/authsae/patches/100-musl_fix.patch
 create mode 100644 trunk/package/network/services/cjdns/Makefile
 create mode 100644 trunk/package/network/services/cjdns/files/cjdns.defaults
 create mode 100755 trunk/package/network/services/cjdns/files/cjdns.init
 create mode 100755 trunk/package/network/services/cjdns/files/cjdrouteconf
 create mode 100644 trunk/package/network/services/cjdns/lua/cjdns/reload.lua
 create mode 100644 trunk/package/network/services/cjdns/lua/cjdns/uci.lua
 create mode 100644 trunk/package/network/services/cjdns/patches/001-libuv.patch
 create mode 100644 trunk/package/network/services/dnsmasq/Makefile
 create mode 100644 trunk/package/network/services/dnsmasq/files/dhcp.conf
 create mode 100644 trunk/package/network/services/dnsmasq/files/dnsmasq.conf
 create mode 100644 trunk/package/network/services/dnsmasq/files/dnsmasq.hotplug
 create mode 100644 trunk/package/network/services/dnsmasq/files/dnsmasq.init
 create mode 100644 trunk/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
 create mode 100644 trunk/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch
 create mode 100644 trunk/package/network/services/dropbear/Config.in
 create mode 100644 trunk/package/network/services/dropbear/Makefile
 create mode 100644 trunk/package/network/services/dropbear/files/dropbear.config
 create mode 100755 trunk/package/network/services/dropbear/files/dropbear.init
 create mode 100644 trunk/package/network/services/dropbear/patches/001-dont_send_SSH_MSG_IMPLEMENTED.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/002-match_keepalive_to_OpenSSH.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/100-pubkey_path.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/110-change_user.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/120-openwrt_options.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/140-disable_assert.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/150-dbconvert_standalone.patch
 create mode 100644 trunk/package/network/services/dropbear/patches/500-set-default-path.patch
 create mode 100644 trunk/package/network/services/ead/Makefile
 create mode 100644 trunk/package/network/services/ead/src/Makefile
 create mode 100644 trunk/package/network/services/ead/src/aes.c
 create mode 100644 trunk/package/network/services/ead/src/ead-client.c
 create mode 100644 trunk/package/network/services/ead/src/ead-crypt.c
 create mode 100644 trunk/package/network/services/ead/src/ead-crypt.h
 create mode 100644 trunk/package/network/services/ead/src/ead-pcap.h
 create mode 100644 trunk/package/network/services/ead/src/ead.c
 create mode 100644 trunk/package/network/services/ead/src/ead.h
 create mode 100644 trunk/package/network/services/ead/src/filter.c
 create mode 100644 trunk/package/network/services/ead/src/libbridge.h
 create mode 100644 trunk/package/network/services/ead/src/libbridge_init.c
 create mode 100644 trunk/package/network/services/ead/src/libbridge_private.h
 create mode 100644 trunk/package/network/services/ead/src/list.h
 create mode 100644 trunk/package/network/services/ead/src/passwd
 create mode 100644 trunk/package/network/services/ead/src/pfc.c
 create mode 100644 trunk/package/network/services/ead/src/pw_encrypt_md5.c
 create mode 100644 trunk/package/network/services/ead/src/sha1.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/Makefile.am
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/Makefile.in
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/Notes
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/acconfig.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/acinclude.m4
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/aclocal.m4
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_add.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_asm.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_ctx.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_div.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_exp.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_lcl.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_lib.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_mul.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_prime.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_shift.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_sqr.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/bn_word.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/clitest.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/config.h.in
 create mode 100755 trunk/package/network/services/ead/src/tinysrp/configure
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/configure.in
 create mode 100755 trunk/package/network/services/ead/src/tinysrp/install-sh
 create mode 100755 trunk/package/network/services/ead/src/tinysrp/missing
 create mode 100755 trunk/package/network/services/ead/src/tinysrp/mkinstalldirs
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/srvtest.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/stamp-h.in
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_client.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_client.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_conf.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_conv.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_defines.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_getconf.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_getpass.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_math.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_misc.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_pw.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_pwd.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_read.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_read.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_server.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_server.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_sha.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_sha.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/t_truerand.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/tconf.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/tinysrp.c
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/tinysrp.h
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/tpasswd
 create mode 100644 trunk/package/network/services/ead/src/tinysrp/tphrase.c
 create mode 100644 trunk/package/network/services/hostapd/Config.in
 create mode 100644 trunk/package/network/services/hostapd/Makefile
 create mode 100644 trunk/package/network/services/hostapd/files/hostapd-full.config
 create mode 100644 trunk/package/network/services/hostapd/files/hostapd-mini.config
 create mode 100644 trunk/package/network/services/hostapd/files/hostapd.sh
 create mode 100644 trunk/package/network/services/hostapd/files/multicall.c
 create mode 100644 trunk/package/network/services/hostapd/files/netifd.sh
 create mode 100644 trunk/package/network/services/hostapd/files/wpa_supplicant-full.config
 create mode 100644 trunk/package/network/services/hostapd/files/wpa_supplicant-mini.config
 create mode 100644 trunk/package/network/services/hostapd/files/wpa_supplicant-p2p.config
 create mode 100644 trunk/package/network/services/hostapd/files/wpa_supplicant.sh
 create mode 100644 trunk/package/network/services/hostapd/files/wps-hotplug.sh
 create mode 100644 trunk/package/network/services/hostapd/madwifi/include/compat.h
 create mode 100644 trunk/package/network/services/hostapd/madwifi/net80211/_ieee80211.h
 create mode 100644 trunk/package/network/services/hostapd/madwifi/net80211/ieee80211.h
 create mode 100644 trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_crypto.h
 create mode 100644 trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_ioctl.h
 create mode 100644 trunk/package/network/services/hostapd/patches/100-madwifi_key_fixes.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/110-bool_fix.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/120-daemonize_fix.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/200-multicall.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/300-noscan.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/320-optional_rfkill.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/340-reload_freq_change.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/410-limit_debug_messages.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/420-indicate-features.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/440-max_num_sta_probe.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/450-scan_wait.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
 create mode 100644 trunk/package/network/services/hostapd/patches/600-ubus_support.patch
 create mode 100644 trunk/package/network/services/igmpproxy/Makefile
 create mode 100644 trunk/package/network/services/igmpproxy/files/igmpproxy.config
 create mode 100644 trunk/package/network/services/igmpproxy/files/igmpproxy.init
 create mode 100644 trunk/package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch
 create mode 100644 trunk/package/network/services/igmpproxy/patches/002-Change-default-interface-state-to-disabled-wrt-29458.patch
 create mode 100644 trunk/package/network/services/igmpproxy/patches/003-Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch
 create mode 100644 trunk/package/network/services/igmpproxy/patches/004-Restrict-igmp-reports-forwarding-to-upstream-interfa.patch
 create mode 100644 trunk/package/network/services/igmpproxy/patches/010-missing_include.patch
 create mode 100644 trunk/package/network/services/igmpproxy/patches/100-use-monotic-clock-instead-of-time-of-day.patch
 create mode 100644 trunk/package/network/services/igmpproxy/patches/200-allow_wildcard_addr.patch
 create mode 100644 trunk/package/network/services/ipset-dns/Makefile
 create mode 100644 trunk/package/network/services/ipset-dns/files/ipset-dns.config
 create mode 100755 trunk/package/network/services/ipset-dns/files/ipset-dns.init
 create mode 100644 trunk/package/network/services/ipset-dns/patches/100-simultaneous-ipv4-ipv6.patch
 create mode 100644 trunk/package/network/services/lldpd/Config.in
 create mode 100644 trunk/package/network/services/lldpd/Makefile
 create mode 100644 trunk/package/network/services/lldpd/files/lldpd.config
 create mode 100644 trunk/package/network/services/lldpd/files/lldpd.init
 create mode 100644 trunk/package/network/services/lldpd/patches/002-no-stack-protector.patch
 create mode 100644 trunk/package/network/services/mdns/Makefile
 create mode 100644 trunk/package/network/services/mdns/files/mdns.config
 create mode 100644 trunk/package/network/services/mdns/files/mdns.init
 create mode 100644 trunk/package/network/services/odhcpd/Makefile
 create mode 100755 trunk/package/network/services/odhcpd/files/odhcpd-update
 create mode 100644 trunk/package/network/services/odhcpd/files/odhcpd.defaults
 create mode 100644 trunk/package/network/services/odhcpd/files/odhcpd.init
 create mode 100644 trunk/package/network/services/openvpn-easy-rsa/Makefile
 create mode 100644 trunk/package/network/services/openvpn-easy-rsa/files/easy-rsa.index
 create mode 100644 trunk/package/network/services/openvpn-easy-rsa/files/easy-rsa.serial
 create mode 100644 trunk/package/network/services/openvpn-easy-rsa/patches/100-run-ootb.patch
 create mode 100644 trunk/package/network/services/openvpn/Config-nossl.in
 create mode 100644 trunk/package/network/services/openvpn/Config-openssl.in
 create mode 100644 trunk/package/network/services/openvpn/Config-polarssl.in
 create mode 100644 trunk/package/network/services/openvpn/Makefile
 create mode 100644 trunk/package/network/services/openvpn/files/openvpn.config
 create mode 100644 trunk/package/network/services/openvpn/files/openvpn.init
 create mode 100644 trunk/package/network/services/openvpn/files/openvpn.upgrade
 create mode 100644 trunk/package/network/services/openvpn/patches/100-polarssl_compat.h
 create mode 100644 trunk/package/network/services/openvpn/patches/110-musl_compat.patch
 create mode 100644 trunk/package/network/services/ppp/Makefile
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/chap-secrets
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/filter
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/options
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/options.pptp
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/radius.conf
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.asnet
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.microsoft
 create mode 100644 trunk/package/network/services/ppp/files/etc/ppp/radius/servers
 create mode 100755 trunk/package/network/services/ppp/files/lib/netifd/ppp-down
 create mode 100755 trunk/package/network/services/ppp/files/lib/netifd/ppp-up
 create mode 100755 trunk/package/network/services/ppp/files/ppp.sh
 create mode 100644 trunk/package/network/services/ppp/patches/010-use_target_for_configure.patch
 create mode 100644 trunk/package/network/services/ppp/patches/100-debian_ip-ip_option.patch
 create mode 100644 trunk/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
 create mode 100644 trunk/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
 create mode 100644 trunk/package/network/services/ppp/patches/105-debian_demand.patch
 create mode 100644 trunk/package/network/services/ppp/patches/106-debian_stripMSdomain.patch
 create mode 100644 trunk/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
 create mode 100644 trunk/package/network/services/ppp/patches/110-debian_defaultroute.patch
 create mode 100644 trunk/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
 create mode 100644 trunk/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch
 create mode 100644 trunk/package/network/services/ppp/patches/130-no_cdefs_h.patch
 create mode 100644 trunk/package/network/services/ppp/patches/131-missing_prototype_macro.patch
 create mode 100644 trunk/package/network/services/ppp/patches/132-fix_linux_includes.patch
 create mode 100644 trunk/package/network/services/ppp/patches/133-fix_sha1_include.patch
 create mode 100644 trunk/package/network/services/ppp/patches/140-pppoe_compile_fix.patch
 create mode 100644 trunk/package/network/services/ppp/patches/200-makefile.patch
 create mode 100644 trunk/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
 create mode 100644 trunk/package/network/services/ppp/patches/202-no_strip.patch
 create mode 100644 trunk/package/network/services/ppp/patches/203-opt_flags.patch
 create mode 100644 trunk/package/network/services/ppp/patches/204-radius_config.patch
 create mode 100644 trunk/package/network/services/ppp/patches/205-no_exponential_timeout.patch
 create mode 100644 trunk/package/network/services/ppp/patches/206-compensate_time_change.patch
 create mode 100644 trunk/package/network/services/ppp/patches/207-lcp_mtu_max.patch
 create mode 100644 trunk/package/network/services/ppp/patches/208-fix_status_code.patch
 create mode 100644 trunk/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch
 create mode 100644 trunk/package/network/services/ppp/patches/310-precompile_filter.patch
 create mode 100644 trunk/package/network/services/ppp/patches/320-custom_iface_names.patch
 create mode 100644 trunk/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
 create mode 100644 trunk/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch
 create mode 100644 trunk/package/network/services/ppp/patches/340-populate_default_gateway.patch
 create mode 100644 trunk/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
 create mode 100644 trunk/package/network/services/ppp/patches/401-no_record_file.patch
 create mode 100644 trunk/package/network/services/ppp/patches/403-no_wtmp.patch
 create mode 100644 trunk/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch
 create mode 100644 trunk/package/network/services/ppp/patches/405-no_multilink_option.patch
 create mode 100644 trunk/package/network/services/ppp/patches/500-add-pptp-plugin.patch
 create mode 100644 trunk/package/network/services/ppp/patches/510-pptp_compile_fix.patch
 create mode 100644 trunk/package/network/services/ppp/patches/520-uniq.patch
 create mode 100644 trunk/package/network/services/ppp/utils/pfc.c
 create mode 100644 trunk/package/network/services/relayd/Makefile
 create mode 100644 trunk/package/network/services/relayd/files/relay.hotplug
 create mode 100644 trunk/package/network/services/relayd/files/relay.init
 create mode 100644 trunk/package/network/services/samba36/Makefile
 create mode 100644 trunk/package/network/services/samba36/files/samba.config
 create mode 100755 trunk/package/network/services/samba36/files/samba.init
 create mode 100644 trunk/package/network/services/samba36/files/smb.conf.template
 create mode 100644 trunk/package/network/services/samba36/patches/100-configure_fixes.patch
 create mode 100644 trunk/package/network/services/samba36/patches/110-multicall.patch
 create mode 100644 trunk/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
 create mode 100644 trunk/package/network/services/samba36/patches/120-add_missing_ifdef.patch
 create mode 100644 trunk/package/network/services/samba36/patches/200-remove_printer_support.patch
 create mode 100644 trunk/package/network/services/samba36/patches/210-remove_ad_support.patch
 create mode 100644 trunk/package/network/services/samba36/patches/220-remove_services.patch
 create mode 100644 trunk/package/network/services/samba36/patches/230-remove_winreg_support.patch
 create mode 100644 trunk/package/network/services/samba36/patches/240-remove_dfs_api.patch
 create mode 100644 trunk/package/network/services/samba36/patches/250-remove_domain_logon.patch
 create mode 100644 trunk/package/network/services/samba36/patches/260-remove_samr.patch
 create mode 100644 trunk/package/network/services/samba36/patches/270-remove_registry_backend.patch
 create mode 100644 trunk/package/network/services/samba36/patches/280-strip_srvsvc.patch
 create mode 100644 trunk/package/network/services/samba36/patches/290-remove_lsa.patch
 create mode 100644 trunk/package/network/services/samba36/patches/300-assert_debug_level.patch
 create mode 100644 trunk/package/network/services/samba36/patches/310-remove_error_strings.patch
 create mode 100644 trunk/package/network/services/samba36/patches/320-debug_level_checks.patch
 create mode 100644 trunk/package/network/services/samba36/patches/330-librpc_default_print.patch
 create mode 100644 trunk/package/network/services/uhttpd/Makefile
 create mode 100644 trunk/package/network/services/uhttpd/files/ubus.default
 create mode 100644 trunk/package/network/services/uhttpd/files/uhttpd.config
 create mode 100755 trunk/package/network/services/uhttpd/files/uhttpd.init
 create mode 100644 trunk/package/network/utils/arptables/Makefile
 create mode 100644 trunk/package/network/utils/arptables/patches/100-always_optimize.patch
 create mode 100644 trunk/package/network/utils/comgt/Makefile
 create mode 100644 trunk/package/network/utils/comgt/files/3g.chat
 create mode 100644 trunk/package/network/utils/comgt/files/3g.sh
 create mode 100644 trunk/package/network/utils/comgt/files/3g.usb
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:03a7
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:060d
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:060e
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:0612
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:0619
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:061e
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:0623
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:0629
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:062d
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:062f
 create mode 100644 trunk/package/network/utils/comgt/files/data/0421:0638
 create mode 100644 trunk/package/network/utils/comgt/files/data/05c6:0016
 create mode 100644 trunk/package/network/utils/comgt/files/data/05c6:0023
 create mode 100644 trunk/package/network/utils/comgt/files/data/05c6:00a0
 create mode 100644 trunk/package/network/utils/comgt/files/data/05c6:6000
 create mode 100644 trunk/package/network/utils/comgt/files/data/05c6:9000
 create mode 100644 trunk/package/network/utils/comgt/files/data/07d1:3e01
 create mode 100644 trunk/package/network/utils/comgt/files/data/07d1:3e02
 create mode 100644 trunk/package/network/utils/comgt/files/data/07d1:7e11
 create mode 100644 trunk/package/network/utils/comgt/files/data/0af0:4005
 create mode 100644 trunk/package/network/utils/comgt/files/data/0af0:6901
 create mode 100644 trunk/package/network/utils/comgt/files/data/0af0:7201
 create mode 100644 trunk/package/network/utils/comgt/files/data/0af0:8120
 create mode 100644 trunk/package/network/utils/comgt/files/data/0af0:9200
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c000
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c001
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c002
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c003
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c004
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c005
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c00a
 create mode 100644 trunk/package/network/utils/comgt/files/data/0b3c:c00b
 create mode 100644 trunk/package/network/utils/comgt/files/data/0bdb:1900
 create mode 100644 trunk/package/network/utils/comgt/files/data/0bdb:1902
 create mode 100644 trunk/package/network/utils/comgt/files/data/0bdb:190a
 create mode 100644 trunk/package/network/utils/comgt/files/data/0bdb:190d
 create mode 100644 trunk/package/network/utils/comgt/files/data/0bdb:1910
 create mode 100644 trunk/package/network/utils/comgt/files/data/0c88:17da
 create mode 100644 trunk/package/network/utils/comgt/files/data/0c88:180a
 create mode 100644 trunk/package/network/utils/comgt/files/data/0f3d:68a2
 create mode 100644 trunk/package/network/utils/comgt/files/data/0f3d:68aa
 create mode 100644 trunk/package/network/utils/comgt/files/data/1004:6124
 create mode 100644 trunk/package/network/utils/comgt/files/data/1004:6141
 create mode 100644 trunk/package/network/utils/comgt/files/data/1004:6157
 create mode 100644 trunk/package/network/utils/comgt/files/data/1004:618f
 create mode 100644 trunk/package/network/utils/comgt/files/data/106c:3711
 create mode 100644 trunk/package/network/utils/comgt/files/data/106c:3714
 create mode 100644 trunk/package/network/utils/comgt/files/data/106c:3715
 create mode 100644 trunk/package/network/utils/comgt/files/data/106c:3716
 create mode 100644 trunk/package/network/utils/comgt/files/data/106c:3717
 create mode 100644 trunk/package/network/utils/comgt/files/data/106c:3718
 create mode 100644 trunk/package/network/utils/comgt/files/data/106c:3721
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0017
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0018
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0019
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0020
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0021
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0022
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0023
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0024
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0025
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0026
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0027
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0028
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0112
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0120
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0218
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0220
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0224
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:0301
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6802
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6803
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6804
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6805
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6808
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6809
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6813
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6815
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6816
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6820
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6821
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6822
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6833
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6834
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6835
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6838
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6839
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:683a
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:683b
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6850
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6851
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6852
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6853
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6855
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6856
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6859
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:685a
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6880
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6890
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6891
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6892
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:6893
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:68a2
 create mode 100644 trunk/package/network/utils/comgt/files/data/1199:68aa
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1035
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1404
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1406
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:140b
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:140c
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1412
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:141b
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1433
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1436
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1444
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:144e
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1464
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1465
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1491
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14a5
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14a8
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14ac
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14ae
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14c6
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14c8
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14c9
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14ca
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14cb
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14cc
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14cf
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:14d2
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1506
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:150a
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:150c
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:150f
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:151b
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:151d
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:156c
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1576
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1577
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1578
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1589
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c05
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c07
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c08
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c10
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c12
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c1e
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c1f
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1c23
 create mode 100644 trunk/package/network/utils/comgt/files/data/12d1:1f16
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:1400
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:1410
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:1420
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:1430
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:1450
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:2100
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:2110
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:2120
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:2130
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:2400
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:2410
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:2420
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:4100
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:4400
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:6000
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:6001
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:6002
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:6010
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:7001
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:7003
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:7030
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:7031
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:7041
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:7042
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:9011
 create mode 100644 trunk/package/network/utils/comgt/files/data/1410:b001
 create mode 100644 trunk/package/network/utils/comgt/files/data/1529:3100
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d5:6202
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d5:6501
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d5:6502
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d5:6603
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d5:900d
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:5141
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:5533
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:5543
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:5553
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6002
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6006
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6007
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6008
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6522
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6523
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6532
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6533
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:6543
 create mode 100644 trunk/package/network/utils/comgt/files/data/16d8:680a
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0001
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0002
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0015
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0016
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0017
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0018
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0019
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0022
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0024
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0025
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0031
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0033
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0037
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0039
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0042
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0052
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0055
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0057
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0063
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0064
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0066
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0073
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0079
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0082
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0086
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0091
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0094
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0104
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0108
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0116
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0117
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0121
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0124
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0128
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0142
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0143
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0152
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0157
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0167
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0170
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0199
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0257
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0265
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0284
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:0326
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1003
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1008
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1010
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1015
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1018
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1172
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1173
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1176
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1177
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1181
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1203
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1208
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1211
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1212
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1217
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1218
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1220
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1222
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1245
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1252
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1254
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1256
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1270
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1401
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1402
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1426
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1512
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1515
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1518
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1519
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1522
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1525
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1527
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1537
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1538
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:1544
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:2002
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:2003
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:ffdd
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:ffe4
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:ffe9
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:fff1
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:fffb
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:fffc
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:fffd
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:fffe
 create mode 100644 trunk/package/network/utils/comgt/files/data/19d2:ffff
 create mode 100644 trunk/package/network/utils/comgt/files/data/1a8d:1002
 create mode 100644 trunk/package/network/utils/comgt/files/data/1a8d:1003
 create mode 100644 trunk/package/network/utils/comgt/files/data/1a8d:1007
 create mode 100644 trunk/package/network/utils/comgt/files/data/1a8d:1009
 create mode 100644 trunk/package/network/utils/comgt/files/data/1a8d:100c
 create mode 100644 trunk/package/network/utils/comgt/files/data/1a8d:100d
 create mode 100644 trunk/package/network/utils/comgt/files/data/1a8d:2006
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:0000
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:0012
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:0017
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:0052
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:00b7
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:00ca
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:011e
 create mode 100644 trunk/package/network/utils/comgt/files/data/1bbb:0203
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:6060
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:6061
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:9000
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:9603
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:9605
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:9607
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:9801
 create mode 100644 trunk/package/network/utils/comgt/files/data/1c9e:9900
 create mode 100644 trunk/package/network/utils/comgt/files/data/1e0e:9000
 create mode 100644 trunk/package/network/utils/comgt/files/data/1e0e:9100
 create mode 100644 trunk/package/network/utils/comgt/files/data/1e0e:9200
 create mode 100644 trunk/package/network/utils/comgt/files/data/1e0e:ce16
 create mode 100644 trunk/package/network/utils/comgt/files/data/1e0e:cefe
 create mode 100644 trunk/package/network/utils/comgt/files/data/2001:7d00
 create mode 100644 trunk/package/network/utils/comgt/files/data/2001:7d01
 create mode 100644 trunk/package/network/utils/comgt/files/data/2001:7d02
 create mode 100644 trunk/package/network/utils/comgt/files/data/2001:7d03
 create mode 100644 trunk/package/network/utils/comgt/files/data/211f:6801
 create mode 100644 trunk/package/network/utils/comgt/files/data/2357:0201
 create mode 100644 trunk/package/network/utils/comgt/files/data/2357:0202
 create mode 100644 trunk/package/network/utils/comgt/files/data/2357:0203
 create mode 100644 trunk/package/network/utils/comgt/files/data/2357:9000
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8114
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8115
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8116
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8117
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8118
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8128
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8129
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8133
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8134
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8135
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8136
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8137
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8138
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8147
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8180
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8181
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8182
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8186
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8194
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8195
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:8196
 create mode 100644 trunk/package/network/utils/comgt/files/data/413c:819b
 create mode 100644 trunk/package/network/utils/comgt/files/directip-stop.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/directip.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/directip.sh
 create mode 100644 trunk/package/network/utils/comgt/files/evdo.chat
 create mode 100644 trunk/package/network/utils/comgt/files/getcardinfo.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/getcarrier.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/getcnum.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/getimsi.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/getstrength.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/ncm.json
 create mode 100644 trunk/package/network/utils/comgt/files/ncm.sh
 create mode 100644 trunk/package/network/utils/comgt/files/runcommand.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/setmode.gcom
 create mode 100644 trunk/package/network/utils/comgt/files/setpin.gcom
 create mode 100644 trunk/package/network/utils/comgt/patches/001-compile_fix.patch
 create mode 100644 trunk/package/network/utils/comgt/patches/002-termios.patch
 create mode 100644 trunk/package/network/utils/comgt/patches/003-no_XCASE.patch
 create mode 100644 trunk/package/network/utils/conntrack-tools/Makefile
 create mode 100644 trunk/package/network/utils/conntrack-tools/patches/100-compile_fix.patch
 create mode 100644 trunk/package/network/utils/curl/Config.in
 create mode 100644 trunk/package/network/utils/curl/Makefile
 create mode 100644 trunk/package/network/utils/curl/patches/100-check_long_long.patch
 create mode 100644 trunk/package/network/utils/curl/patches/200-no_docs_tests.patch
 create mode 100644 trunk/package/network/utils/dante/Makefile
 create mode 100644 trunk/package/network/utils/dante/patches/001-automake-compat.patch
 create mode 100644 trunk/package/network/utils/dante/patches/100-do-not-use-defdname.patch
 create mode 100644 trunk/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
 create mode 100644 trunk/package/network/utils/ebtables/Makefile
 create mode 100644 trunk/package/network/utils/fwknop/Makefile
 create mode 100644 trunk/package/network/utils/fwknop/patches/001-fix_config.patch
 create mode 100644 trunk/package/network/utils/fwknop/patches/002-fix_init.patch
 create mode 100644 trunk/package/network/utils/git/Makefile
 create mode 100644 trunk/package/network/utils/git/patches/100-convert_builtin.patch
 create mode 100644 trunk/package/network/utils/git/patches/200-disable_fasthash.patch
 create mode 100644 trunk/package/network/utils/ifenslave/Makefile
 create mode 100644 trunk/package/network/utils/iftop/Makefile
 create mode 100644 trunk/package/network/utils/iftop/patches/0001-force-ncurses.patch
 create mode 100644 trunk/package/network/utils/iperf/Makefile
 create mode 100644 trunk/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch
 create mode 100644 trunk/package/network/utils/iproute2/Makefile
 create mode 100644 trunk/package/network/utils/iproute2/files/15-teql
 create mode 100644 trunk/package/network/utils/iproute2/patches/001-config.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/004-darwin_fixes.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/006-no_sctp.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/007-no_arpd.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/008-no_netem.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/010-type_fixes.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/110-extra-ccopts.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/200-add-tc_esfq.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/210-add-act_connmark.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/300-ip_tiny.patch
 create mode 100644 trunk/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
 create mode 100644 trunk/package/network/utils/ipset/Makefile
 create mode 100644 trunk/package/network/utils/ipset/patches/001-timeout-size.patch
 create mode 100644 trunk/package/network/utils/iptables/Makefile
 create mode 100644 trunk/package/network/utils/iptables/files/l7/aim.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/bittorrent.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/edonkey.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/fasttrack.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/ftp.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/gnutella.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/http.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/ident.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/irc.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/jabber.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/msnmessenger.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/ntp.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/pop3.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/smtp.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/ssl.pat
 create mode 100644 trunk/package/network/utils/iptables/files/l7/vnc.pat
 create mode 100644 trunk/package/network/utils/iptables/patches/002-layer7_2.22.patch
 create mode 100644 trunk/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
 create mode 100644 trunk/package/network/utils/iptables/patches/030-no-libnfnetlink.patch
 create mode 100644 trunk/package/network/utils/iptables/patches/100-bash-location.patch
 create mode 100644 trunk/package/network/utils/iptables/patches/200-configurable_builtin.patch
 create mode 100644 trunk/package/network/utils/iptables/patches/300-musl_fixes.patch
 create mode 100644 trunk/package/network/utils/iptables/patches/400-lenient-restore.patch
 create mode 100644 trunk/package/network/utils/iptables/patches/500-add-xt_id-match.patch
 create mode 100644 trunk/package/network/utils/iputils/Makefile
 create mode 100644 trunk/package/network/utils/iputils/patches/001-iputils.patch
 create mode 100644 trunk/package/network/utils/iputils/patches/002-fix-ipv6.patch
 create mode 100644 trunk/package/network/utils/iputils/patches/003-fix-makefile.patch
 create mode 100644 trunk/package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch
 create mode 100644 trunk/package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch
 create mode 100644 trunk/package/network/utils/iputils/patches/020-include_fixes.patch
 create mode 100644 trunk/package/network/utils/irssi/Makefile
 create mode 100644 trunk/package/network/utils/iw/Makefile
 create mode 100644 trunk/package/network/utils/iw/patches/001-nl80211_h_sync.patch
 create mode 100644 trunk/package/network/utils/iw/patches/010-dynack.patch
 create mode 100644 trunk/package/network/utils/iw/patches/120-antenna_gain.patch
 create mode 100644 trunk/package/network/utils/iw/patches/200-reduce_size.patch
 create mode 100644 trunk/package/network/utils/iwcap/Makefile
 create mode 100644 trunk/package/network/utils/iwcap/src/iwcap.c
 create mode 100644 trunk/package/network/utils/iwinfo/Makefile
 create mode 100644 trunk/package/network/utils/linux-atm/Makefile
 create mode 100755 trunk/package/network/utils/linux-atm/files/br2684ctl
 create mode 100644 trunk/package/network/utils/linux-atm/patches/000-debian_16.patch
 create mode 100644 trunk/package/network/utils/linux-atm/patches/200-no_libfl.patch
 create mode 100644 trunk/package/network/utils/linux-atm/patches/300-objcopy_path.patch
 create mode 100644 trunk/package/network/utils/linux-atm/patches/400-portability_fixes.patch
 create mode 100644 trunk/package/network/utils/maccalc/Makefile
 create mode 100644 trunk/package/network/utils/maccalc/src/Makefile
 create mode 100644 trunk/package/network/utils/maccalc/src/main.c
 create mode 100644 trunk/package/network/utils/nftables/Makefile
 create mode 100644 trunk/package/network/utils/nftables/patches/102-build-allow-building-with-mini-gmp-instead-of-gmp.patch
 create mode 100644 trunk/package/network/utils/nftables/patches/104-fix-CFLAGS-handling.patch
 create mode 100644 trunk/package/network/utils/nginx/Config.in
 create mode 100644 trunk/package/network/utils/nginx/Makefile
 create mode 100644 trunk/package/network/utils/nginx/files/nginx.init
 create mode 100644 trunk/package/network/utils/nginx/files/nginx.proxyprotocol.example
 create mode 100644 trunk/package/network/utils/nginx/files/nginx.syslog.example
 create mode 100644 trunk/package/network/utils/nginx/patches-lua-nginx/300-ldl.patch
 create mode 100644 trunk/package/network/utils/nginx/patches-nginx-upstream-check/check_1.2.6+.patch
 create mode 100644 trunk/package/network/utils/nginx/patches/101-feature_test_fix.patch
 create mode 100644 trunk/package/network/utils/nginx/patches/102-sizeof_test_fix.patch
 create mode 100644 trunk/package/network/utils/nginx/patches/103-sys_nerr.patch
 create mode 100644 trunk/package/network/utils/nginx/patches/200-config.patch
 create mode 100644 trunk/package/network/utils/nginx/patches/300-crosscompile_ccflags.patch
 create mode 100644 trunk/package/network/utils/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
 create mode 100644 trunk/package/network/utils/nginx/patches/401-nginx-1.4.0-syslog.patch
 create mode 100644 trunk/package/network/utils/nmap/Makefile
 create mode 100644 trunk/package/network/utils/owipcalc/Makefile
 create mode 100644 trunk/package/network/utils/owipcalc/src/owipcalc.c
 create mode 100644 trunk/package/network/utils/resolveip/Makefile
 create mode 100644 trunk/package/network/utils/resolveip/src/resolveip.c
 create mode 100644 trunk/package/network/utils/rssileds/Makefile
 create mode 100644 trunk/package/network/utils/rssileds/files/rssileds.init
 create mode 100644 trunk/package/network/utils/rssileds/src/rssileds.c
 create mode 100644 trunk/package/network/utils/rsync/Config.in
 create mode 100644 trunk/package/network/utils/rsync/Makefile
 create mode 100644 trunk/package/network/utils/rsync/files/rsyncd.conf
 create mode 100644 trunk/package/network/utils/rsync/files/rsyncd.init
 create mode 100644 trunk/package/network/utils/tcpdump/Makefile
 create mode 100644 trunk/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch
 create mode 100644 trunk/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch
 create mode 100644 trunk/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
 create mode 100644 trunk/package/network/utils/umbim/Makefile
 create mode 100755 trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
 create mode 100644 trunk/package/network/utils/uqmi/Makefile
 create mode 100755 trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
 create mode 100644 trunk/package/network/utils/wireless-tools/Makefile
 create mode 100644 trunk/package/network/utils/wireless-tools/patches/001-debian.patch
 create mode 100644 trunk/package/network/utils/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch
 create mode 100644 trunk/package/network/utils/wireless-tools/patches/003-we_essential_def.patch
 create mode 100644 trunk/package/network/utils/wireless-tools/patches/004-increase_iwlist_buffer.patch
 create mode 100644 trunk/package/network/utils/wwan/Makefile
 create mode 100755 trunk/package/network/utils/wwan/files/wwan.sh
 create mode 100644 trunk/package/network/utils/wwan/files/wwan.usb
 create mode 100644 trunk/package/network/utils/wwan/files/wwan.usbmisc
 create mode 100644 trunk/package/network/utils/xtables-addons/Makefile
 create mode 100644 trunk/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
 create mode 100644 trunk/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
 create mode 100644 trunk/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
 create mode 100644 trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
 create mode 100644 trunk/package/network/utils/xtables-addons/patches/300-geoip-endian-detection.patch
 create mode 100644 trunk/package/system/ca-certificates/Makefile
 create mode 100644 trunk/package/system/fstools/Makefile
 create mode 100644 trunk/package/system/fstools/files/fstab.default
 create mode 100644 trunk/package/system/fstools/files/fstab.init
 create mode 100644 trunk/package/system/fstools/files/mount.hotplug
 create mode 100644 trunk/package/system/fstools/files/snapshot
 create mode 100644 trunk/package/system/mountd/Makefile
 create mode 100644 trunk/package/system/mountd/files/mountd.config
 create mode 100755 trunk/package/system/mountd/files/mountd.init
 create mode 100644 trunk/package/system/mountd/patches/010-uci_rename_history_to_delta.patch
 create mode 100644 trunk/package/system/mountd/patches/020-handle_timeout.patch
 create mode 100644 trunk/package/system/mountd/patches/030-ext4_support.patch
 create mode 100644 trunk/package/system/mountd/patches/040-optional-daemonize.patch
 create mode 100644 trunk/package/system/mountd/patches/050-no_error_h.patch
 create mode 100644 trunk/package/system/mountd/patches/060-link_libubox.patch
 create mode 100644 trunk/package/system/mtd/Makefile
 create mode 100644 trunk/package/system/mtd/src/Makefile
 create mode 100644 trunk/package/system/mtd/src/crc32.c
 create mode 100644 trunk/package/system/mtd/src/crc32.h
 create mode 100644 trunk/package/system/mtd/src/fis.c
 create mode 100644 trunk/package/system/mtd/src/fis.h
 create mode 100644 trunk/package/system/mtd/src/imagetag.c
 create mode 100644 trunk/package/system/mtd/src/jffs2.c
 create mode 100644 trunk/package/system/mtd/src/jffs2.h
 create mode 100644 trunk/package/system/mtd/src/md5.c
 create mode 100644 trunk/package/system/mtd/src/md5.h
 create mode 100644 trunk/package/system/mtd/src/mtd.c
 create mode 100644 trunk/package/system/mtd/src/mtd.h
 create mode 100644 trunk/package/system/mtd/src/seama.c
 create mode 100644 trunk/package/system/mtd/src/seama.h
 create mode 100644 trunk/package/system/mtd/src/trx.c
 create mode 100644 trunk/package/system/opkg/Makefile
 create mode 100644 trunk/package/system/opkg/files/opkg-smime.conf
 create mode 100644 trunk/package/system/opkg/files/opkg.conf
 create mode 100644 trunk/package/system/opkg/patches/001-ship-pkg-m4.patch
 create mode 100644 trunk/package/system/opkg/patches/002-no-shave.patch
 create mode 100644 trunk/package/system/opkg/patches/004-host_cpu.patch
 create mode 100644 trunk/package/system/opkg/patches/007-force_static.patch
 create mode 100644 trunk/package/system/opkg/patches/009-remove-upgrade-all.patch
 create mode 100644 trunk/package/system/opkg/patches/011-old-config-location.patch
 create mode 100644 trunk/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
 create mode 100644 trunk/package/system/opkg/patches/014-errors-to-stderr.patch
 create mode 100644 trunk/package/system/opkg/patches/020-avoid_getline.patch
 create mode 100644 trunk/package/system/opkg/patches/030-fix-double-free.patch
 create mode 100644 trunk/package/system/opkg/patches/040-wrap-descriptions-only-on-ttys.patch
 create mode 100644 trunk/package/system/opkg/patches/050-add-case-insensitive-flag.patch
 create mode 100644 trunk/package/system/opkg/patches/060-add-find-command.patch
 create mode 100644 trunk/package/system/opkg/patches/070-use_gzipped_pkg_list.patch
 create mode 100644 trunk/package/system/opkg/patches/080-suppress-blank-package-fields.patch
 create mode 100644 trunk/package/system/opkg/patches/090-suppress-blank-provides-field.patch
 create mode 100644 trunk/package/system/opkg/patches/100-add-force-checksum.patch
 create mode 100644 trunk/package/system/opkg/patches/110-upgrade.patch
 create mode 100644 trunk/package/system/procd/Makefile
 create mode 100644 trunk/package/system/procd/files/hotplug-preinit.json
 create mode 100644 trunk/package/system/procd/files/hotplug.json
 create mode 100644 trunk/package/system/procd/files/nand-preinit.sh
 create mode 100644 trunk/package/system/procd/files/nand.sh
 create mode 100644 trunk/package/system/procd/files/procd.sh
 create mode 100644 trunk/package/system/procd/files/reload_config
 create mode 100644 trunk/package/system/rpcd/Makefile
 create mode 100644 trunk/package/system/rpcd/files/rpcd.config
 create mode 100755 trunk/package/system/rpcd/files/rpcd.init
 create mode 100644 trunk/package/system/ubox/Makefile
 create mode 100644 trunk/package/system/ubox/files/log.init
 create mode 100644 trunk/package/system/ubus/Makefile
 create mode 100644 trunk/package/system/uci/Makefile
 create mode 100644 trunk/package/system/uci/files/lib/config/uci.sh
 create mode 100644 trunk/package/system/udev/Config.in
 create mode 100644 trunk/package/system/udev/Makefile
 create mode 100644 trunk/package/system/udev/patches/0001-build-don-t-use-gc-sections.patch
 create mode 100644 trunk/package/system/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch
 create mode 100644 trunk/package/system/udev/patches/0003-add_btn_trigger_happy_define.patch
 create mode 100644 trunk/package/system/zram-swap/Makefile
 create mode 100644 trunk/package/system/zram-swap/files/zram.init
 create mode 100644 trunk/package/utils/admswconfig/Makefile
 create mode 100644 trunk/package/utils/admswconfig/files/admswconfig
 create mode 100644 trunk/package/utils/admswconfig/files/admswswitch.sh
 create mode 100644 trunk/package/utils/admswconfig/patches/001-matrix.patch
 create mode 100644 trunk/package/utils/busybox/Config-defaults.in
 create mode 100644 trunk/package/utils/busybox/Config.in
 create mode 100644 trunk/package/utils/busybox/Makefile
 create mode 100644 trunk/package/utils/busybox/config/Config.in
 create mode 100644 trunk/package/utils/busybox/config/archival/Config.in
 create mode 100644 trunk/package/utils/busybox/config/console-tools/Config.in
 create mode 100644 trunk/package/utils/busybox/config/coreutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/debianutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/e2fsprogs/Config.in
 create mode 100644 trunk/package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
 create mode 100644 trunk/package/utils/busybox/config/editors/Config.in
 create mode 100644 trunk/package/utils/busybox/config/findutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/init/Config.in
 create mode 100644 trunk/package/utils/busybox/config/libbb/Config.in
 create mode 100644 trunk/package/utils/busybox/config/loginutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/mailutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/miscutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/modutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/networking/Config.in
 create mode 100644 trunk/package/utils/busybox/config/networking/udhcp/Config.in
 create mode 100644 trunk/package/utils/busybox/config/printutils/Config.in
 create mode 100644 trunk/package/utils/busybox/config/procps/Config.in
 create mode 100644 trunk/package/utils/busybox/config/runit/Config.in
 create mode 100644 trunk/package/utils/busybox/config/selinux/Config.in
 create mode 100644 trunk/package/utils/busybox/config/shell/Config.in
 create mode 100644 trunk/package/utils/busybox/config/sysklogd/Config.in
 create mode 100644 trunk/package/utils/busybox/config/util-linux/Config.in
 create mode 100644 trunk/package/utils/busybox/config/util-linux/volume_id/Config.in
 create mode 100755 trunk/package/utils/busybox/convert_defaults.pl
 create mode 100755 trunk/package/utils/busybox/convert_menuconfig.pl
 create mode 100755 trunk/package/utils/busybox/files/cron
 create mode 100755 trunk/package/utils/busybox/files/ntpd-hotplug
 create mode 100755 trunk/package/utils/busybox/files/sysntpd
 create mode 100755 trunk/package/utils/busybox/files/telnet
 create mode 100644 trunk/package/utils/busybox/patches/001-resource_h_include.patch
 create mode 100644 trunk/package/utils/busybox/patches/002-upstream_ash_fix.patch
 create mode 100644 trunk/package/utils/busybox/patches/003-upstream_date_fix.patch
 create mode 100644 trunk/package/utils/busybox/patches/004-upstream_iplink_fix.patch
 create mode 100644 trunk/package/utils/busybox/patches/005-upstream_nc_fix.patch
 create mode 100644 trunk/package/utils/busybox/patches/006-upstream_lzop_fix.patch
 create mode 100644 trunk/package/utils/busybox/patches/007-upstream_zcat_no_ext_fix.patch
 create mode 100644 trunk/package/utils/busybox/patches/100-trylink_bash.patch
 create mode 100644 trunk/package/utils/busybox/patches/101-gen_build_files_bash.patch
 create mode 100644 trunk/package/utils/busybox/patches/110-no_static_libgcc.patch
 create mode 100644 trunk/package/utils/busybox/patches/120-remove_uclibc_rpc_check.patch
 create mode 100644 trunk/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch
 create mode 100644 trunk/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
 create mode 100644 trunk/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch
 create mode 100644 trunk/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch
 create mode 100644 trunk/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch
 create mode 100644 trunk/package/utils/busybox/patches/210-add_netmsg_util.patch
 create mode 100644 trunk/package/utils/busybox/patches/220-add_lock_util.patch
 create mode 100644 trunk/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
 create mode 100644 trunk/package/utils/busybox/patches/240-telnetd_intr.patch
 create mode 100644 trunk/package/utils/busybox/patches/250-date-k-flag.patch
 create mode 100644 trunk/package/utils/busybox/patches/260-arping_missing_includes.patch
 create mode 100644 trunk/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch
 create mode 100644 trunk/package/utils/e2fsprogs/Makefile
 create mode 100644 trunk/package/utils/e2fsprogs/files/e2fsck.conf
 create mode 100644 trunk/package/utils/e2fsprogs/files/e2fsck.sh
 create mode 100644 trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
 create mode 100644 trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch
 create mode 100644 trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch
 create mode 100644 trunk/package/utils/fbtest/Makefile
 create mode 100644 trunk/package/utils/fbtest/src/Makefile
 create mode 100644 trunk/package/utils/fbtest/src/fbtest.c
 create mode 100644 trunk/package/utils/flashrom/Makefile
 create mode 100755 trunk/package/utils/flashrom/patches/100-mipsel_fix.patch
 create mode 100644 trunk/package/utils/fuse/Makefile
 create mode 100644 trunk/package/utils/fuse/patches/112-no_break_on_mknod.patch
 create mode 100644 trunk/package/utils/hostap-utils/Makefile
 create mode 100644 trunk/package/utils/jsonfilter/Makefile
 create mode 100644 trunk/package/utils/lua/Makefile
 create mode 100644 trunk/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch
 create mode 100644 trunk/package/utils/lua/patches-host/011-lnum-use-double.patch
 create mode 100644 trunk/package/utils/lua/patches-host/015-lnum-ppc-compat.patch
 create mode 100644 trunk/package/utils/lua/patches-host/030-archindependent-bytecode.patch
 create mode 100644 trunk/package/utils/lua/patches-host/100-no_readline.patch
 create mode 100644 trunk/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
 create mode 100644 trunk/package/utils/lua/patches/011-lnum-use-double.patch
 create mode 100644 trunk/package/utils/lua/patches/015-lnum-ppc-compat.patch
 create mode 100644 trunk/package/utils/lua/patches/020-shared_liblua.patch
 create mode 100644 trunk/package/utils/lua/patches/030-archindependent-bytecode.patch
 create mode 100644 trunk/package/utils/lua/patches/100-no_readline.patch
 create mode 100644 trunk/package/utils/lua/patches/200-lua-path.patch
 create mode 100644 trunk/package/utils/lua/patches/300-opcode_performance.patch
 create mode 100644 trunk/package/utils/mdadm/Makefile
 create mode 100644 trunk/package/utils/mdadm/patches/000-compile.patch
 create mode 100644 trunk/package/utils/mdadm/patches/100-cross_compile.patch
 create mode 100644 trunk/package/utils/mdadm/patches/200-reduce_size.patch
 create mode 100644 trunk/package/utils/mkelfimage/Makefile
 create mode 100644 trunk/package/utils/mkelfimage/patches/no-stack-protector.patch
 create mode 100644 trunk/package/utils/nano/Makefile
 create mode 100644 trunk/package/utils/nvram/Makefile
 create mode 100755 trunk/package/utils/nvram/files/nvram.init
 create mode 100644 trunk/package/utils/nvram/src/Makefile
 create mode 100644 trunk/package/utils/nvram/src/cli.c
 create mode 100644 trunk/package/utils/nvram/src/crc.c
 create mode 100644 trunk/package/utils/nvram/src/nvram.c
 create mode 100644 trunk/package/utils/nvram/src/nvram.h
 create mode 100644 trunk/package/utils/nvram/src/sdinitvals.h
 create mode 100644 trunk/package/utils/pciutils/Makefile
 create mode 100644 trunk/package/utils/pciutils/patches/100-remove-no-timestamping.patch
 create mode 100644 trunk/package/utils/pciutils/patches/101-no-strip.patch
 create mode 100644 trunk/package/utils/pciutils/patches/102-compressed-ids.patch
 create mode 100644 trunk/package/utils/pciutils/patches/103-relative-path-ids.patch
 create mode 100644 trunk/package/utils/pciutils/patches/104-resolv.patch
 create mode 100644 trunk/package/utils/px5g-standalone/Makefile
 create mode 100644 trunk/package/utils/px5g-standalone/src/Makefile
 create mode 100644 trunk/package/utils/px5g-standalone/src/library/base64.c
 create mode 100644 trunk/package/utils/px5g-standalone/src/library/bignum.c
 create mode 100644 trunk/package/utils/px5g-standalone/src/library/havege.c
 create mode 100644 trunk/package/utils/px5g-standalone/src/library/rsa.c
 create mode 100644 trunk/package/utils/px5g-standalone/src/library/sha1.c
 create mode 100644 trunk/package/utils/px5g-standalone/src/library/timing.c
 create mode 100644 trunk/package/utils/px5g-standalone/src/library/x509write.c
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/base64.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/bignum.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/bn_mul.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/config.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/havege.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/rsa.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/sha1.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/timing.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/polarssl/x509.h
 create mode 100644 trunk/package/utils/px5g-standalone/src/px5g.c
 create mode 100644 trunk/package/utils/px5g/Makefile
 create mode 100644 trunk/package/utils/px5g/px5g.c
 create mode 100644 trunk/package/utils/robocfg/Makefile
 create mode 100644 trunk/package/utils/robocfg/src/Makefile
 create mode 100644 trunk/package/utils/robocfg/src/etc53xx.h
 create mode 100644 trunk/package/utils/robocfg/src/robocfg.c
 create mode 100644 trunk/package/utils/spidev_test/Makefile
 create mode 100644 trunk/package/utils/ubi-utils/Makefile
 create mode 100644 trunk/package/utils/ubi-utils/patches/010-fix-rpmatch.patch
 create mode 100644 trunk/package/utils/ubi-utils/patches/100-fix_includes.patch
 create mode 100644 trunk/package/utils/ubi-utils/patches/130-lzma_jffs2.patch
 create mode 100644 trunk/package/utils/ugps/Makefile
 create mode 100644 trunk/package/utils/ugps/files/gps.config
 create mode 100644 trunk/package/utils/ugps/files/ugps.init
 create mode 100644 trunk/package/utils/usbmode/Makefile
 create mode 100644 trunk/package/utils/usbmode/data/12d1:1f16
 create mode 100644 trunk/package/utils/usbmode/files/usbmode.hotplug
 create mode 100755 trunk/package/utils/usbmode/files/usbmode.init
 create mode 100644 trunk/package/utils/usbreset/Makefile
 create mode 100644 trunk/package/utils/usbreset/src/usbreset.c
 create mode 100644 trunk/package/utils/usbutils/Makefile
 create mode 100644 trunk/package/utils/util-linux/Makefile
 create mode 100644 trunk/package/utils/util-linux/patches/0001-switch_root-improve-statfs-f_type-portability.patch
 create mode 100644 trunk/package/utils/util-linux/patches/0002-lib-colors-use-static-buffers-when-parse-scheme.patch
 create mode 100644 trunk/package/utils/util-linux/patches/001-no-printf-alloc.patch
 create mode 100644 trunk/package/utils/util-linux/patches/002-mkostemp.patch
 create mode 100644 trunk/package/utils/xfsprogs/Makefile
 create mode 100644 trunk/package/utils/xfsprogs/patches/001-automake-compat.patch
 create mode 100644 trunk/package/utils/xfsprogs/patches/100-no_aio.patch
 create mode 100644 trunk/package/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
 create mode 100644 trunk/package/utils/xfsprogs/patches/120-portability.patch
 create mode 100644 trunk/package/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
 create mode 100644 trunk/package/utils/xfsprogs/patches/140-no_po.patch
 create mode 100644 trunk/package/utils/xfsprogs/patches/150-include_fixes.patch
 create mode 100644 trunk/rules.mk
 create mode 100755 trunk/scripts/arm-magic.sh
 create mode 100755 trunk/scripts/brcmImage.pl
 create mode 100755 trunk/scripts/bundle-libraries.sh
 create mode 100755 trunk/scripts/checkpatch.pl
 create mode 100755 trunk/scripts/clang-gcc-wrapper
 create mode 100755 trunk/scripts/clean-package.sh
 create mode 100755 trunk/scripts/cleanfile
 create mode 100755 trunk/scripts/cleanpatch
 create mode 100755 trunk/scripts/combined-ext-image.sh
 create mode 100644 trunk/scripts/combined-image.sh
 create mode 100755 trunk/scripts/config.guess
 create mode 100755 trunk/scripts/config.rpath
 create mode 100755 trunk/scripts/config.sub
 create mode 100644 trunk/scripts/config/Makefile
 create mode 100644 trunk/scripts/config/README
 create mode 100644 trunk/scripts/config/conf.c
 create mode 100644 trunk/scripts/config/confdata.c
 create mode 100644 trunk/scripts/config/expr.c
 create mode 100644 trunk/scripts/config/expr.h
 create mode 100644 trunk/scripts/config/list.h
 create mode 100644 trunk/scripts/config/lkc.h
 create mode 100644 trunk/scripts/config/lkc_proto.h
 create mode 100644 trunk/scripts/config/lxdialog/check-lxdialog.sh
 create mode 100644 trunk/scripts/config/lxdialog/checklist.c
 create mode 100644 trunk/scripts/config/lxdialog/dialog.h
 create mode 100644 trunk/scripts/config/lxdialog/inputbox.c
 create mode 100644 trunk/scripts/config/lxdialog/menubox.c
 create mode 100644 trunk/scripts/config/lxdialog/textbox.c
 create mode 100644 trunk/scripts/config/lxdialog/util.c
 create mode 100644 trunk/scripts/config/lxdialog/yesno.c
 create mode 100644 trunk/scripts/config/mconf.c
 create mode 100644 trunk/scripts/config/mconf_check
 create mode 100644 trunk/scripts/config/menu.c
 create mode 100644 trunk/scripts/config/symbol.c
 create mode 100644 trunk/scripts/config/util.c
 create mode 100644 trunk/scripts/config/zconf.gperf
 create mode 100644 trunk/scripts/config/zconf.hash.c
 create mode 100644 trunk/scripts/config/zconf.hash.c_shipped
 create mode 100644 trunk/scripts/config/zconf.l
 create mode 100644 trunk/scripts/config/zconf.lex.c
 create mode 100644 trunk/scripts/config/zconf.lex.c_shipped
 create mode 100644 trunk/scripts/config/zconf.tab.c
 create mode 100644 trunk/scripts/config/zconf.tab.c_shipped
 create mode 100644 trunk/scripts/config/zconf.y
 create mode 100755 trunk/scripts/deptest.sh
 create mode 100755 trunk/scripts/diffconfig.sh
 create mode 100755 trunk/scripts/dl_cleanup.py
 create mode 100755 trunk/scripts/download.pl
 create mode 100755 trunk/scripts/env
 create mode 100755 trunk/scripts/ext-toolchain.sh
 create mode 100755 trunk/scripts/feeds
 create mode 100755 trunk/scripts/flashing/adam2flash-502T.pl
 create mode 100755 trunk/scripts/flashing/adam2flash-fritzbox.pl
 create mode 100755 trunk/scripts/flashing/adam2flash.pl
 create mode 100755 trunk/scripts/flashing/adsl2mue_flash.pl
 create mode 100755 trunk/scripts/flashing/flash.sh
 create mode 100755 trunk/scripts/flashing/jungo-image.py
 create mode 100644 trunk/scripts/freebsd.sh
 create mode 100755 trunk/scripts/gen-dependencies.sh
 create mode 100755 trunk/scripts/getver.sh
 create mode 100755 trunk/scripts/ipkg
 create mode 100755 trunk/scripts/ipkg-make-index.sh
 create mode 100755 trunk/scripts/kconfig.pl
 create mode 100755 trunk/scripts/make-ipkg-dir.sh
 create mode 100755 trunk/scripts/md5sum
 create mode 100755 trunk/scripts/metadata.pl
 create mode 100644 trunk/scripts/metadata.pm
 create mode 100755 trunk/scripts/mkits.sh
 create mode 100644 trunk/scripts/om-fwupgradecfg-gen.sh
 create mode 100644 trunk/scripts/openbsd.sh
 create mode 100755 trunk/scripts/pad_image
 create mode 100755 trunk/scripts/patch-kernel.sh
 create mode 100755 trunk/scripts/patch-specs.sh
 create mode 100755 trunk/scripts/relink-lib.sh
 create mode 100755 trunk/scripts/remote-gdb
 create mode 100755 trunk/scripts/rstrip.sh
 create mode 100755 trunk/scripts/slugimage.pl
 create mode 100755 trunk/scripts/strip-kmod.sh
 create mode 100755 trunk/scripts/symlink-tree.sh
 create mode 100755 trunk/scripts/timestamp.pl
 create mode 100755 trunk/scripts/ubinize-image.sh
 create mode 100755 trunk/scripts/update-package-md5sum
 create mode 100644 trunk/target/Config.in
 create mode 100644 trunk/target/Makefile
 create mode 100644 trunk/target/imagebuilder/Config.in
 create mode 100644 trunk/target/imagebuilder/Makefile
 create mode 100644 trunk/target/imagebuilder/files/Makefile
 create mode 100644 trunk/target/imagebuilder/files/repositories.conf
 create mode 100644 trunk/target/linux/Makefile
 create mode 100644 trunk/target/linux/ar71xx/Makefile
 create mode 100644 trunk/target/linux/ar71xx/base-files.mk
 create mode 100755 trunk/target/linux/ar71xx/base-files/etc/diag.sh
 create mode 100644 trunk/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
 create mode 100644 trunk/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
 create mode 100644 trunk/target/linux/ar71xx/base-files/etc/inittab
 create mode 100755 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 create mode 100755 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 create mode 100755 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
 create mode 100755 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration
 create mode 100755 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
 create mode 100755 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header
 create mode 100644 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-trx-header
 create mode 100755 trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/preinit/81_load_ath10k_board_bin
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
 create mode 100644 trunk/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
 create mode 100755 trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 create mode 100755 trunk/target/linux/ar71xx/base-files/sbin/wget2nand
 create mode 100644 trunk/target/linux/ar71xx/config-3.14
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap96.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0258n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0315n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap113.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap83.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-aw-nr580.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-bhu-bxu2000n2-a.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cap4200ag.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-505-a1.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap300v2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap7660d.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-m150.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-mini.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hiwifi-hc6361.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ja76pf.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap003.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr600.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n600.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w04nu.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w300nh.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb42.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-qihoo-c301.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-r6100.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb4xx.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rw2458n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-smart-300.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-632brp.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-673gru.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-732br.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr13u.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa830re-v2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wax50re.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr2543n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr720n-v3.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd-v4.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tube2h.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlae-ag300n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wp543.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wpe72.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt400n.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/include/asm/fw/myloader/myloader.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h
 create mode 100644 trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/rb4xx_cpld.h
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/gpio/gpio-latch.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Makefile
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar8216.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/spi/spi-ap83.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c
 create mode 100644 trunk/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c
 create mode 100644 trunk/target/linux/ar71xx/files/include/linux/nxp_74hc153.h
 create mode 100644 trunk/target/linux/ar71xx/files/include/linux/platform/ar934x_nfc.h
 create mode 100644 trunk/target/linux/ar71xx/files/include/linux/platform_data/gpio-latch.h
 create mode 100644 trunk/target/linux/ar71xx/files/include/linux/platform_data/rb91x_nand.h
 create mode 100644 trunk/target/linux/ar71xx/files/include/linux/spi/vsc7385.h
 create mode 100644 trunk/target/linux/ar71xx/files/net/dsa/mv88e6063.c
 create mode 100644 trunk/target/linux/ar71xx/generic/config-default
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/00-default.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/01-minimal.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/8devices.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/nclink.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/netgear.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/planex.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/rosewill.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/senao.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/sitecom.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/tp-link.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/trendnet.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/ubnt.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/wd.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/profiles/zcomax.mk
 create mode 100644 trunk/target/linux/ar71xx/generic/target.mk
 create mode 100644 trunk/target/linux/ar71xx/image/Makefile
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/Makefile
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.c
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.h
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaTypes.h
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/ar71xx_regs.h
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/board.c
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/cache.c
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/cache.h
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/cacheops.h
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/config.h
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/cp0regdef.h
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/head.S
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/loader.lds
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/loader2.lds
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/lzma-data.lds
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/printf.c
 create mode 100644 trunk/target/linux/ar71xx/image/lzma-loader/src/printf.h
 create mode 100644 trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini
 create mode 100644 trunk/target/linux/ar71xx/image/ubinize-wndr4300.ini
 create mode 100644 trunk/target/linux/ar71xx/luci/config-default
 create mode 100644 trunk/target/linux/ar71xx/luci/profiles/00-default.mk
 create mode 100644 trunk/target/linux/ar71xx/luci/profiles/netgear.mk
 create mode 100644 trunk/target/linux/ar71xx/luci/profiles/planex.mk
 create mode 100644 trunk/target/linux/ar71xx/luci/profiles/tp-link.mk
 create mode 100644 trunk/target/linux/ar71xx/luci/target.mk
 create mode 100644 trunk/target/linux/ar71xx/mikrotik/config-default
 create mode 100644 trunk/target/linux/ar71xx/mikrotik/profiles/01-minimal.mk
 create mode 100644 trunk/target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk
 create mode 100644 trunk/target/linux/ar71xx/mikrotik/target.mk
 create mode 100644 trunk/target/linux/ar71xx/modules.mk
 create mode 100644 trunk/target/linux/ar71xx/nand/config-default
 create mode 100644 trunk/target/linux/ar71xx/nand/profiles/netgear.mk
 create mode 100644 trunk/target/linux/ar71xx/nand/profiles/zyxel.mk
 create mode 100644 trunk/target/linux/ar71xx/nand/target.mk
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/102-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/206-spi-ath79-make-chipselect-logic-more-flexible.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/213-MIPS-ath79-fix-ar933x-wmac-reset.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/220-add_cpu_feature_overrides.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/300-MIPS-add-MIPS_MACHINE_NONAME-macro.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/310-lib-add-rle-decompression.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/401-mtd-physmap-add-lock-unlock.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/402-mtd-SST39VF6401B-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/406-mtd-m25p80-allow-to-specify-max-read-size.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/408-mtd-redboot_partition_scan.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/409-mtd-rb4xx_nand_driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/410-mtd-rb750-nand-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/411-mtd-cfi_cmdset_0002-force-word-write.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/412-mtd-m25p80-zero-partition-parser-data.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/413-mtd-ar934x-nand-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/414-mtd-rb91x-nand-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/420-net-ar71xx_mac_driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/422-dsa-trailer-tag-validation-fix.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/423-dsa-add-88e6063-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/425-net-phy-at803x-allow-to-configure-via-pdata.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/430-drivers-link-spi-before-mtd.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/431-spi-add-various-flags.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/432-spi-rb4xx-spi-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/433-spi-rb4xx-cpld-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/434-spi-ap83_spi_controller.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/435-spi-vsc7385_driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/440-leds-wndr3700-usb-led-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/441-leds-rb750-led-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/450-gpio-nxp-74hc153-gpio-chip-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/451-gpio-74x164-improve-platform-device-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/452-gpio-add-gpio-latch-driver.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/460-spi-bitbang-export-spi_bitbang_bufs.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/461-spi-add-type-field-to-spi_transfer.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/462-mtd-m25p80-set-spi-transfer-type.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/464-spi-ath79-fix-fast-flash-read.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/480-ar913x_wmac_external_reset.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/500-MIPS-fw-myloader.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/502-MIPS-ath79-export-ath79_gpio_base.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/503-MIPS-ath79-add-flash-acquire-release.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/504-MIPS-ath79-add-ath79_device_reset_get.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/505-MIPS-ath79-add-ath79_gpio_function_select.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/506-MIPS-ath79-prom-parse-redboot-args.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/508-MIPS-ath79-prom-image-command-line-hack.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/509-MIPS-ath79-process-board-kernel-option.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/510-MIPS-ath79-init-gpio-pin-of-wmac-device.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/520-MIPS-ath79-enable-UART-function.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/521-MIPS-ath79-enable-UART-for-early_serial.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/523-MIPS-ath79-OTP-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/525-MIPS-ath79-enable-qca-usb-quirks.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/601-MIPS-ath79-add-more-register-defines.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/602-MIPS-ath79-add-openwrt-stuff.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/603-MIPS-ath79-ap121-fixes.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/604-MIPS-ath79-ap81-fixes.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/605-MIPS-ath79-db120-fixes.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/606-MIPS-ath79-pb44-fixes.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/607-MIPS-ath79-ubnt-xm-fixes.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/609-MIPS-ath79-ap136-fixes.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/612-MIPS-ath79-set-buffalo-txgain.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/613-MIPS-ath79-add-ath79_wmac_setup_ext_lna_gpio-helper.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/614-MIPS-ath79-ap81-remove-mtd-partitions.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/615-MIPS-ath79-ap83-remove-mtd-partitions.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/634-MIPS-ath79-WNR2000V4-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/700-MIPS-ath79-add-TL-WA801NDv2-suport.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/701-MIPS-ath79-add-TL-WA901ND-v3-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/702-MIPS-ath79-add-MyNet-N750-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/703-MIPS-ath79-add-RB91x-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/704-MIPS-ath79-TL-WDR4900v2-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/705-MIPS-ath79-add-RB951Ui-2HnD-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/706-MIPS-ath79-oolite-v1-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/708-MIPS-ath79-TL-WR841v9-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-HiWiFi-HC6361-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/710-MIPS-ath79-add-OM2Pv2.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/711-MIPS-ath79-add-OM2P-HSv2.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/712-MIPS-ath79-add-EasyLink-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/713-MIPS-ath79-add-RBSXTLite-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/714-MIPS-ath79-add-TL-WA830REv2-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/715-MIPS-ath79-add-TL-WA860RE-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/717-MIPS-ath79-add-gl-inet-v1-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/720-MIPS-ath79-add-Tube2H-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/721-MIPS-ath79-add-EAP300v2-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/722-MIPS-ath79-add-airGateway-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/723-MIPS-ath79-add-om5p-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/724-MIPS-ath79-archer_c5-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add-smart-300-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/727-MIPS-ath79-ar934x-wmac-revision.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/728-MIPS-ath79-fix-restart.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/729-MIPS-ath79-add-WZR-450HP2.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-DHP-1565A1.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/731-MIPS-ath79-add-mr900v2-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/732-MIPS-ath79-add-R6100-support.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/733-MIPS-ath79-add-DGL-5500-A1.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/901-mdio_bitbang_ignore_ta_value.patch
 create mode 100644 trunk/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch
 create mode 100644 trunk/target/linux/generic/PATCHES
 create mode 100755 trunk/target/linux/generic/base-files/init
 create mode 100644 trunk/target/linux/generic/config-3.10
 create mode 100644 trunk/target/linux/generic/config-3.13
 create mode 100644 trunk/target/linux/generic/config-3.14
 create mode 100644 trunk/target/linux/generic/config-3.18
 create mode 100644 trunk/target/linux/generic/config-3.3
 create mode 100644 trunk/target/linux/generic/config-3.8
 create mode 100644 trunk/target/linux/generic/files/Documentation/networking/adm6996.txt
 create mode 100644 trunk/target/linux/generic/files/arch/mips/fw/myloader/Makefile
 create mode 100644 trunk/target/linux/generic/files/arch/mips/fw/myloader/myloader.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/Config.in
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/Kconfig
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/c7108/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/criov.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/crypto.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/cryptocteon/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/cryptocteon/README.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cavium_crypto.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/cryptodev.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/cryptodev.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/cryptosoft.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ep80579/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ep80579/environment.mk
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_asym.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_common.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_ocf.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_sym.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ep80579/linux_2.6_kernel_space.mk
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/hifn/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751reg.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751var.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPreg.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPvar.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ixp4xx/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesBoxes.dat
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfInit.S
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfBasicInit.S
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.S
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfBasicInit.S
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.S
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvCompVer.txt
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiEeprom.S
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ocf-bench.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ocf-compat.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ocfnull/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/pasemi/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi_fnu.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/random.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/rndtest.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/rndtest.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/hmachack.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/md5.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/md5.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/safe.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/safereg.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/safevar.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/sha1.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/safe/sha1.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/talitos/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/talitos/talitos.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_dev.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_soft.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/Makefile
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/bsdqueue.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecreg.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecvar.h
 create mode 100644 trunk/target/linux/generic/files/crypto/ocf/uio.h
 create mode 100644 trunk/target/linux/generic/files/drivers/leds/ledtrig-morse.c
 create mode 100644 trunk/target/linux/generic/files/drivers/leds/ledtrig-netdev.c
 create mode 100644 trunk/target/linux/generic/files/drivers/leds/ledtrig-usbdev.c
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/mtdsplit.c
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/mtdsplit.h
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/mtdsplit_lzma.c
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/mtdsplit_seama.c
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/mtdsplit_squashfs.c
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c
 create mode 100644 trunk/target/linux/generic/files/drivers/mtd/myloader.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/adm6996.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/adm6996.h
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/ar8216.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/ar8216.h
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/Kconfig
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/Makefile
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_regs.h
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/ip17xx.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/micrel.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.h
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/mvswitch.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/mvswitch.h
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/psb6970.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/rtl8306.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/rtl8366s.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/rtl8367.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/rtl8367b.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/swconfig.c
 create mode 100644 trunk/target/linux/generic/files/drivers/net/phy/swconfig_leds.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/Kconfig
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/Makefile
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/NOTE.openwrt
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_linux.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_trace.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_vfs.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.h
 create mode 100644 trunk/target/linux/generic/files/fs/yaffs2/yportenv.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/ar8216_platform.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/ath5k_platform.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/ath9k_platform.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/myloader.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/platform_data/b53.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/platform_data/brcmfmac-sdio.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/routerboot.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/rt2x00_platform.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/rtl8366.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/rtl8367.h
 create mode 100644 trunk/target/linux/generic/files/include/linux/switch.h
 create mode 100644 trunk/target/linux/generic/files/include/uapi/linux/switch.h
 create mode 100644 trunk/target/linux/generic/image/Makefile
 create mode 100644 trunk/target/linux/generic/image/initramfs-base-files.txt
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/Makefile
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.c
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.h
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/Makefile
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/decompress.c
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/lzma-copy.lds.in
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/lzma.lds.in
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/print.c
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/print.h
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/printf.c
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/printf.h
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/start.S
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/uart16550.c
 create mode 100644 trunk/target/linux/generic/image/lzma-loader/src/uart16550.h
 create mode 100644 trunk/target/linux/generic/patches-3.10/003-11-001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/003-11-002-MIPS-Only-set-cpu_has_mmips-if-SYS_SUPPORTS_MICROMIP.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/003-11-003-of-pci-Add-of_pci_get_devfn-function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/003-11-004-hso-Earlier-catch-of-error-condition.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/003-11-008-hso-Fix-stack-corruption-on-some-architectures.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/003-12-001-mtd-chips-Add-support-for-PMC-SPI-Flash-chips-in-m25.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/020-ssb_update.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/041-UBI-block-do-not-use-term-attach.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/044-UBI-rename-block-device-ioctls.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/046-UBI-avoid-workqueue-format-string-leak.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/060-hso_devices.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/061-arm_xz_decompressor_build_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/065-iio_ad799x_backport_fixes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/070-net_bridge_backports.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/100-overlayfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/200-fix_localversion.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/201-extra_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/202-reduce_module_size.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/204-module_strip.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/210-darwin_scripts_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/212-byteshift_portability.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/220-gc_sections.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/221-module_exports.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/250-netfilter_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/251-sound_kconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/252-mv_cesa_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/253-ssb_b43_default_on.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/254-textsearch_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/256-crypto_add_kconfig_prompts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/257-wireless_ext_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/258-netfilter_netlink_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/259-regmap_dynamic.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/262-compressor_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/302-mips_no_branch_likely.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/305-mips_module_reloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/309-mips_fuse_workaround.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/310-arm_module_unresolved_weak_sym.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/320-ppc4xx_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/321-powerpc_crtsavres_prereq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/322-ppc4xx-crypto-compile-fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/401-mtd-add-support-for-different-partition-parser-types.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/403-mtd-hook-mtdsplit-to-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/405-mtd-add-more-helper-functions.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/406-mtd-add-squashfs-parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/412-mtd-partial_eraseblock_unlock.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/440-block2mtd_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/441-block2mtd_probe.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/480-mtd-set-rootfs-to-be-root-dev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/490-mtd-ubi-add-EOF-marker-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/500-yaffs-Kbuild-integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/502-yaffs-3.10-disable-proc-entry.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/503-yaffs-add-tags-9bytes-mount-option.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/504-yaffs-fix-compat-tags-handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/520-squashfs_update_xz_comp_opts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/531-debloat_lzma.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/532-jffs2_eofdetect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/540-crypto-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/541-ubifs-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/551-ubifs-fix-default-compression-selection.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/601-netfilter_layer7_pktmatch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/602-netfilter_layer7_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/603-netfilter_layer7_2.6.36_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/611-netfilter_match_bypass_default_table.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/612-netfilter_match_reduce_memory_access.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/613-netfilter_optional_tcp_window_check.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/614-netfilter_arpt_arp_padding_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/615-netfilter_add_xt_id_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/617-netfilter_skip_filter_sysctl.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/620-sched_esfq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/621-sched_act_connmark.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/640-bridge_no_eap_forward.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/641-bridge_always_accept_eap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/650-pppoe_header_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/651-wireless_mesh_header.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/652-atm_header_changes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/655-increase_skb_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/660-fq_codel_defaults.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/661-fq_codel_keep_dropped_stats.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/662-use_fq_codel_by_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/663-remove_pfifo_fast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/700-swconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/701-phy_extension.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/703-phy-add-detach-callback-to-struct-phy_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/710-phy-add-mdio_register_board_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/720-phy_adm6996.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/721-phy_packets.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/722-phy_mvswitch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/723-phy_ip175c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/724-phy_ar8216.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/725-phy_rtl8306.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/726-phy_rtl8366.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/727-phy-rtl8367.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/728-phy-micrel.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/729-phy-rtl8367b.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/729-phy-tantos.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/730-phy_b53.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/731-phy_mvswitch_3.10_compilation.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/732-phy-ar8216-led-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/750-hostap_txpower.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/770-bgmac-backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/820-usb_add_usb_find_device_by_name.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/830-ledtrig_morse.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/831-ledtrig_netdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/832-ledtrig_usbdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/840-rtc7301.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/841-rtc_pt7c4338.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/861-04_spi_gpio_implement_spi_delay.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/862-gpio_spi_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/863-gpiommc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/870-hifn795x_byteswap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/880-gateworks_system_controller.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/890-8250_optional_sysrq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/900-slab_maxsize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/901-debloat_sock_diag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/902-debloat_proc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/903-debloat_direct_io.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/910-kobject_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/911-kobject_add_broadcast_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/922-always-create-console-node-in-initramfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/930-crashlog.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/940-ocf_kbuild_integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/941-ocf_20120127.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/960-decompress_unlzo_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/970-remove-unsane-filenames-from-deps_initramfs-list.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/980-arm_openwrt_machtypes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/990-gpio_wdt.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/994-mpcore_wdt_fix_timer_mode_setup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/995-mpcore_twd_calibrate_single_core.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/996-zsmalloc_allow_module_build.patch
 create mode 100644 trunk/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/020-ssb_update.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/025-bcma_backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/060-hso_devices.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/061-arm_xz_decompressor_build_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/062-mips_decompressor_build_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/065-iio_ad799x_backport_fixes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/100-overlayfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/102-ehci_hcd_ignore_oc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/120-bridge_allow_receiption_on_disabled_port.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/131-improve_noncoherent_dma_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/200-fix_localversion.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/201-extra_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/202-reduce_module_size.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/203-kallsyms_uncompressed.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/204-module_strip.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/210-darwin_scripts_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/212-byteshift_portability.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/220-gc_sections.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/221-module_exports.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/230-openwrt_lzma_options.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/250-netfilter_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/251-sound_kconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/252-mv_cesa_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/253-ssb_b43_default_on.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/254-textsearch_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/256-crypto_add_kconfig_prompts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/257-wireless_ext_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/258-netfilter_netlink_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/259-regmap_dynamic.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/260-crypto_test_dependencies.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/261-move_bcm963xx_tag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/262-compressor_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/301-mips_image_cmdline_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/302-mips_no_branch_likely.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/304-mips_disable_fpu.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/305-mips_module_reloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/306-mips_mem_functions_performance.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/309-mips_fuse_workaround.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/310-arm_module_unresolved_weak_sym.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/320-ppc4xx_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/321-powerpc_crtsavres_prereq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/400-mtd-add-rootfs-split-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/401-mtd-add-support-for-different-partition-parser-types.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/403-mtd-hook-mtdsplit-to-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/405-mtd-add-more-helper-functions.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/406-mtd-add-squashfs-parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/411-mtd-partial_eraseblock_write.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/412-mtd-partial_eraseblock_unlock.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/420-mtd-redboot_space.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/430-mtd-add-myloader-partition-parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/440-block2mtd_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/441-block2mtd_probe.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/480-mtd-set-rootfs-to-be-root-dev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/500-yaffs-Kbuild-integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/502-yaffs-3.10-disable-proc-entry.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/503-yaffs-3.12-convert-readdir-to-iterate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/503-yaffs-add-tags-9bytes-mount-option.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/504-yaffs-fix-compat-tags-handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/520-squashfs_update_xz_comp_opts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/530-jffs2_make_lzma_available.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/531-debloat_lzma.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/532-jffs2_eofdetect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/540-crypto-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/541-ubifs-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/551-ubifs-fix-default-compression-selection.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/555-gluebi-sysfs-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/600-netfilter_layer7_2.22.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/601-netfilter_layer7_pktmatch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/602-netfilter_layer7_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/603-netfilter_layer7_2.6.36_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/610-netfilter_match_bypass_default_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/611-netfilter_match_bypass_default_table.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/612-netfilter_match_reduce_memory_access.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/613-netfilter_optional_tcp_window_check.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/615-netfilter_add_xt_id_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/620-sched_esfq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/621-sched_act_connmark.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/640-bridge_no_eap_forward.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/641-bridge_always_accept_eap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/643-bridge_remove_ipv6_dependency.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/650-pppoe_header_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/651-wireless_mesh_header.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/652-atm_header_changes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/653-disable_netlink_trim.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/655-increase_skb_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/656-skb_reduce_truesize-helper.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/657-qdisc_reduce_truesize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/660-fq_codel_defaults.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/661-fq_codel_keep_dropped_stats.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/662-use_fq_codel_by_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/663-remove_pfifo_fast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/664-codel_fix_3_12.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/700-swconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/701-phy_extension.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/702-phy_add_aneg_done_function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/703-phy-add-detach-callback-to-struct-phy_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/710-phy-add-mdio_register_board_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/720-phy_adm6996.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/721-phy_packets.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/722-phy_mvswitch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/723-phy_ip175c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/724-phy_ar8216.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/725-phy_rtl8306.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/726-phy_rtl8366.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/727-phy-rtl8367.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/728-phy-micrel.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/729-phy-rtl8367b.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/729-phy-tantos.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/730-phy_b53.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/731-phy_mvswitch_3.10_compilation.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/732-phy-ar8216-led-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/750-hostap_txpower.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/770-bgmac-backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/773-bgmac-add-srab-switch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/775-bgmac-check-length-of-received-frame.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/810-pci_disable_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/830-ledtrig_morse.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/831-ledtrig_netdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/832-ledtrig_usbdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/840-rtc7301.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/841-rtc_pt7c4338.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/861-04_spi_gpio_implement_spi_delay.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/862-gpio_spi_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/863-gpiommc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/864-gpiommc_configfs_locking.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/870-hifn795x_byteswap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/880-gateworks_system_controller.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/890-8250_optional_sysrq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/900-slab_maxsize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/901-debloat_sock_diag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/902-debloat_proc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/903-debloat_direct_io.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/910-kobject_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/911-kobject_add_broadcast_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/921-use_preinit_as_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/922-always-create-console-node-in-initramfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/930-crashlog.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/940-ocf_kbuild_integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/941-ocf_20120127.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/960-decompress_unlzo_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/970-remove-unsane-filenames-from-deps_initramfs-list.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/980-arm_openwrt_machtypes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/990-gpio_wdt.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/996-zsmalloc_allow_module_build.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch
 create mode 100644 trunk/target/linux/generic/patches-3.13/998-enable_wilink_platform_without_drivers.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/000-keep_initrafs_the_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/020-ssb_update.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/041-UBI-block-do-not-use-term-attach.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/046-UBI-avoid-workqueue-format-string-leak.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/048-mtd-bcm47xxpart-backports-from-3.16.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/060-net-usb-hso-Add-support-for-Option-GTM671WFS.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/061-arm_xz_decompressor_build_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/062-mips_decompressor_build_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/065-iio_ad799x_backport_fixes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/070-net-phy-move-PHY-software-reset.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/071-net-phy-override-PHY-reset.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/080-backport_xfrm_crash_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/090-backport_netfilter_rtcache.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/100-overlayfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/200-fix_localversion.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/201-extra_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/202-reduce_module_size.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/203-kallsyms_uncompressed.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/204-module_strip.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/210-darwin_scripts_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/212-byteshift_portability.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/220-gc_sections.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/221-module_exports.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/230-openwrt_lzma_options.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/250-netfilter_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/251-sound_kconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/252-mv_cesa_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/253-ssb_b43_default_on.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/254-textsearch_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/256-crypto_add_kconfig_prompts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/257-wireless_ext_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/258-netfilter_netlink_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/259-regmap_dynamic.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/262-compressor_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/270-x86_objdump_command.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/301-mips_image_cmdline_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/302-mips_no_branch_likely.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/304-mips_disable_fpu.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/305-mips_module_reloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/306-mips_mem_functions_performance.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/309-mips_fuse_workaround.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/310-arm_module_unresolved_weak_sym.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/320-ppc4xx_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/321-powerpc_crtsavres_prereq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/406-mtd-hook-mtdsplit-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/411-mtd-partial_eraseblock_write.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/420-mtd-redboot_space.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/430-mtd-add-myloader-partition-parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/440-block2mtd_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/441-block2mtd_probe.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/480-mtd-set-rootfs-to-be-root-dev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/500-yaffs-Kbuild-integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/503-yaffs-3.12-convert-readdir-to-iterate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/504-yaffs-fix-compat-tags-handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/520-squashfs_update_xz_comp_opts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/530-jffs2_make_lzma_available.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/531-debloat_lzma.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/532-jffs2_eofdetect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/540-crypto-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/600-netfilter_layer7_2.22.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/601-netfilter_layer7_pktmatch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/602-netfilter_layer7_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/603-netfilter_layer7_2.6.36_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/611-netfilter_match_bypass_default_table.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/612-netfilter_match_reduce_memory_access.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/613-netfilter_optional_tcp_window_check.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/615-netfilter_add_xt_id_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/620-sched_esfq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/621-sched_act_connmark.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/640-bridge_no_eap_forward.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/641-bridge_always_accept_eap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/650-pppoe_header_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/651-wireless_mesh_header.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/652-atm_header_changes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/655-increase_skb_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/656-skb_reduce_truesize-helper.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/657-qdisc_reduce_truesize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/660-fq_codel_defaults.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/661-fq_codel_keep_dropped_stats.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/662-use_fq_codel_by_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/663-remove_pfifo_fast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/700-swconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/701-phy_extension.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/703-phy-add-detach-callback-to-struct-phy_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/710-phy-add-mdio_register_board_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/720-phy_adm6996.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/721-phy_packets.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/722-phy_mvswitch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/723-phy_ip175c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/724-phy_ar8216.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/725-phy_rtl8306.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/726-phy_rtl8366.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/727-phy-rtl8367.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/728-phy-micrel.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/729-phy-rtl8367b.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/729-phy-tantos.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/730-phy_b53.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/731-phy_mvswitch_3.10_compilation.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/732-phy-ar8216-led-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/733-phy_mvsw6171.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/750-hostap_txpower.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/775-bgmac-check-length-of-received-frame.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/785-hso-support-0af0-9300.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/820-usb_add_usb_find_device_by_name.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/830-ledtrig_morse.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/832-ledtrig_usbdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/840-rtc7301.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/841-rtc_pt7c4338.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/861-04_spi_gpio_implement_spi_delay.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/862-gpio_spi_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/863-gpiommc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/870-hifn795x_byteswap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/880-gateworks_system_controller.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/890-8250_optional_sysrq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/900-slab_maxsize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/901-debloat_sock_diag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/902-debloat_proc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/903-debloat_direct_io.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/910-kobject_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/911-kobject_add_broadcast_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/922-always-create-console-node-in-initramfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/930-crashlog.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/940-ocf_kbuild_integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/941-ocf_20120127.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/960-decompress_unlzo_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/970-remove-unsane-filenames-from-deps_initramfs-list.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/980-arm_openwrt_machtypes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/990-gpio_wdt.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/996-zsmalloc_allow_module_build.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
 create mode 100644 trunk/target/linux/generic/patches-3.14/998-enable_wilink_platform_without_drivers.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/020-ssb_update.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/025-bcma_backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/050-backport_netfilter_rtcache.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/200-fix_localversion.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/201-extra_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/202-reduce_module_size.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/203-kallsyms_uncompressed.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/204-module_strip.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/210-darwin_scripts_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/212-byteshift_portability.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/220-gc_sections.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/221-module_exports.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/230-openwrt_lzma_options.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/250-netfilter_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/251-sound_kconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/252-mv_cesa_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/253-ssb_b43_default_on.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/254-textsearch_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/256-crypto_add_kconfig_prompts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/257-wireless_ext_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/258-netfilter_netlink_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/259-regmap_dynamic.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/260-crypto_test_dependencies.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/261-move_bcm963xx_tag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/262-compressor_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/300-mips_expose_boot_raw.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/301-mips_image_cmdline_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/302-mips_no_branch_likely.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/304-mips_disable_fpu.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/305-mips_module_reloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/306-mips_mem_functions_performance.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/310-arm_module_unresolved_weak_sym.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/320-ppc4xx_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/321-powerpc_crtsavres_prereq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/400-mtd-add-rootfs-split-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/401-mtd-add-support-for-different-partition-parser-types.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/403-mtd-hook-mtdsplit-to-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/405-mtd-add-more-helper-functions.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/406-mtd-hook-mtdsplit-into-Kbuild.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/412-mtd-partial_eraseblock_unlock.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/420-mtd-redboot_space.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/430-mtd-add-myloader-partition-parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/440-block2mtd_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/441-block2mtd_probe.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/480-mtd-set-rootfs-to-be-root-dev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/500-yaffs-Kbuild-integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/503-yaffs-3.12-convert-readdir-to-iterate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/503-yaffs-add-tags-9bytes-mount-option.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/504-yaffs-fix-compat-tags-handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/530-jffs2_make_lzma_available.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/531-debloat_lzma.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/541-ubifs-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/551-ubifs-fix-default-compression-selection.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/600-netfilter_layer7_2.22.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/601-netfilter_layer7_pktmatch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/602-netfilter_layer7_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/603-netfilter_layer7_2.6.36_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/604-netfilter_conntrack_flush.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/611-netfilter_match_bypass_default_table.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/613-netfilter_optional_tcp_window_check.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/617-netfilter_skip_filter_sysctl.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/620-sched_esfq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/630-packet_socket_type.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/651-wireless_mesh_header.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/653-disable_netlink_trim.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/655-increase_skb_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/656-skb_reduce_truesize-helper.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/657-qdisc_reduce_truesize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/661-fq_codel_keep_dropped_stats.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/663-remove_pfifo_fast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/700-swconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/701-phy_extension.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/720-phy_adm6996.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/721-phy_packets.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/722-phy_mvswitch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/723-phy_ip175c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/724-phy_ar8216.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/725-phy_rtl8306.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/726-phy_rtl8366.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/727-phy-rtl8367.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/728-phy-micrel.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/729-phy-rtl8367b.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/729-phy-tantos.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/730-phy_b53.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/733-phy_mvsw6171.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/750-hostap_txpower.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/775-bgmac-check-length-of-received-frame.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/785-hso-support-0af0-9300.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/830-ledtrig_morse.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/831-ledtrig_netdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/832-ledtrig_usbdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/840-rtc7301.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/841-rtc_pt7c4338.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/861-04_spi_gpio_implement_spi_delay.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/862-gpio_spi_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/863-gpiommc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/864-gpiommc_configfs_locking.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/870-hifn795x_byteswap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/880-gateworks_system_controller.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/890-8250_optional_sysrq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/900-slab_maxsize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/902-debloat_proc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/903-debloat_direct_io.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/910-kobject_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/911-kobject_add_broadcast_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/922-always-create-console-node-in-initramfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/930-crashlog.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/941-ocf_20120127.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/960-decompress_unlzo_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/970-remove-unsane-filenames-from-deps_initramfs-list.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/980-arm_openwrt_machtypes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/990-gpio_wdt.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
 create mode 100644 trunk/target/linux/generic/patches-3.18/998-enable_wilink_platform_without_drivers.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/003-MIPS-Refactor-clear_page-and-copy_page-functions.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/006-arm_kernel_xz_support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/007-hso-Earlier-catch-of-error-condition.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/008-hso-Fix-stack-corruption-on-some-architectures.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/020-ssb_update.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/025-bcma_backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/040-Controlled-Delay-AQM.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/041-codel-use-Newton-method-instead-of-sqrt-and-divides.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/042-fq_codel-Fair-Queue-Codel-AQM.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/043-net-codel-Add-missing-include-linux-prefetch.h.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/044-net-codel-fix-build-errors.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/045-codel-use-u16-field-instead-of-31bits-for-rec_inv_sq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/047-spi_message_queue.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/048-spi-Dont-call-prepare-unprepare-transfer-if-not-popu.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/050-rng_git_backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/051-rng_git_backport-remove_irqf_sample_random.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/060-hso_devices.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/065-8139cp-fixes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/070-gpio-add-flags-to-export-GPIOs-when-requesting.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/080-prot-release-cb.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/081-USB-OHCI-Add-a-generic-platform-device-driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/082-USB-EHCI-Add-a-generic-platform-device-driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/083-USB-EHCI-platform-remove-update.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/090-CVE-2013-1763.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/102-ehci_hcd_ignore_oc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/110-fix_mtd_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/131-atm-fixes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/132-solos-dma.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/200-fix_localversion.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/201-extra_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/202-reduce_module_size.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/210-darwin_scripts_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/211-stddef_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/212-x86_reloc_portability.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/220-module_exports.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/230-openwrt_lzma_options.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/250-netfilter_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/251-sound_kconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/253-ssb_b43_default_on.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/255-lib80211_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/256-crypto_add_kconfig_prompts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/257-wireless_ext_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/258-netfilter_netlink_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/259-compressor_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/260-move_bcm963xx_tag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/300-mips_expose_boot_raw.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/301-mips_image_cmdline_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/302-mips_use_generic_thread_info_allocator.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/303-mips_fix_kexec.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/304-mips_disable_fpu.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/305-mips_module_reloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/306-mips_mem_functions_performance.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/307-mips_oprofile_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/308-mips-show-correct-cpu-name-for-24KEc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/309-mips_fuse_workaround.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/310-arm_module_unresolved_weak_sym.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/320-ppc4xx_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/322-ppc4xx-crypto-compile-fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/330-mips-add-crash-and-kdump-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/331-mips-kexec-enhanche-the-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/332-mips-kexec-init-the-arguments-for-the-new-kernel-image.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/334-mips-fix-compiling-failure-of-relocate_kernel.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/400-rootfs_split.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/401-partial_eraseblock_write.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/410-mtd_info_move_forward_decl.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/420-redboot_space.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/430-mtd_myloader_partition_parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/440-block2mtd_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/441-block2mtd_refresh.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/442-block2mtd_probe.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/443-block2mtd-avoid-recursive-call-of-mtd_writev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/451-mtd_fix_nand_correct_data_return_code.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/460-cfi_cmdset_0002_no_erase_suspend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/470-mtd_m25p80_add_pm25lv_flash_support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/473-mtd_m25p80_add_w25q128.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/477-mtd-m25p80-add-support-for-the-EON-EN25Q64-chip.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/520-squashfs_update_xz_comp_opts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/530-jffs2_make_lzma_available.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/531-debloat_lzma.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/532-jffs2_eofdetect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/540-crypto-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/541-ubifs-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/550-ubifs-symlink-xattr-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/600-netfilter_layer7_2.22.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/601-netfilter_layer7_pktmatch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/602-netfilter_layer7_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/603-netfilter_layer7_2.6.36_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/610-netfilter_match_bypass_default_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/611-netfilter_match_bypass_default_table.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/612-netfilter_match_reduce_memory_access.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/613-netfilter_optional_tcp_window_check.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/615-netfilter_add_xt_id_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/620-sched_esfq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/640-bridge_no_eap_forward.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/641-bridge_always_accept_eap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/642-bridge_port_isolate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/650-pppoe_header_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/651-wireless_mesh_header.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/652-atm_header_changes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/655-increase_skb_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/700-swconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/701-phy_extension.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/702-phy_add_aneg_done_function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/720-phy_adm6996.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/721-phy_packets.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/722-phy_mvswitch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/723-phy_ip175c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/724-phy_ar8216.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/725-phy_rtl8306.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/726-phy_rtl8366.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/727-phy-rtl8367.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/728-phy-micrel.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/729-phy-rtl8367b.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/729-phy-tantos.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/750-hostap_txpower.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/800-usb-ohci-multiple-platform-driver-fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/810-pci_disable_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/820-usb_add_usb_find_device_by_name.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/830-ledtrig_morse.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/832-ledtrig_usbdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/840-rtc7301.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/861-04_spi_gpio_implement_spi_delay.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/862-gpio_spi_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/863-gpiommc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/870-hifn795x_byteswap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/880-gateworks_system_controller.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/900-slab_maxsize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/910-kobject_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/922-always-create-console-node-in-initramfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/930-crashlog.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/941-ocf_20120127.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/960-decompress_unlzo_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/970-remove-unsane-filenames-from-deps_initramfs-list.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/980-arm_openwrt_machtypes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/994-mpcore_wdt_fix_timer_mode_setup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/a01-swconfig_leds-define-leds_set_brightness.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/a02-swconfig-revert-portid-snd_portid-usage.patch
 create mode 100644 trunk/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/007-hso-Earlier-catch-of-error-condition.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/008-hso-Fix-stack-corruption-on-some-architectures.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/020-ssb_update.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/025-bcma_backport.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/030-backport-lib-devres-Introduce-devm_ioremap_resource.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/032-MIPS-PCI-Implement-pcibios_get_phb_of_node.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/033-backport-spi-of-Use-DT-aliases-for-assigning-bus-number.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/060-hso_devices.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/061-arm_xz_decompressor_build_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/062-mips_decompressor_build_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/084-x86_fix_perf_uclibc_build.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/100-overlayfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/101-overlayfs_path_ref.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/110-fix_mtd_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/200-fix_localversion.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/201-extra_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/202-reduce_module_size.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/203-kallsyms_uncompressed.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/204-module_strip.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/210-darwin_scripts_include.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/212-byteshift_portability.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/220-gc_sections.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/221-module_exports.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/230-openwrt_lzma_options.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/250-netfilter_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/251-sound_kconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/252-mv_cesa_depends.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/253-ssb_b43_default_on.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/254-textsearch_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/255-lib80211_kconfig_hacks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/256-crypto_add_kconfig_prompts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/257-wireless_ext_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/258-netfilter_netlink_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/259-regmap_dynamic.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/260-crypto_test_dependencies.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/261-move_bcm963xx_tag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/262-compressor_kconfig_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/300-mips_expose_boot_raw.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/302-mips_no_branch_likely.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/304-mips_disable_fpu.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/305-mips_module_reloc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/306-mips_mem_functions_performance.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/308-mips-show-correct-cpu-name-for-24KEc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/309-mips_fuse_workaround.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/310-arm_module_unresolved_weak_sym.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/320-ppc4xx_optimization.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/321-powerpc_crtsavres_prereq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/322-ppc4xx-crypto-compile-fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/400-rootfs_split.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/401-partial_eraseblock_write.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/410-mtd_info_move_forward_decl.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/420-redboot_space.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/430-mtd_myloader_partition_parser.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/440-block2mtd_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/442-block2mtd_probe.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/451-mtd_fix_nand_correct_data_return_code.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/460-cfi_cmdset_0002_no_erase_suspend.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/470-mtd_m25p80_add_pm25lv_flash_support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/473-mtd_m25p80_add_w25q128.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/474-mtd_mp25p80_add_pm25lq032.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/478-mtd-partial_eraseblock_unlock.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/500-yaffs-Kbuild-integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/520-squashfs_update_xz_comp_opts.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/530-jffs2_make_lzma_available.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/531-debloat_lzma.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/532-jffs2_eofdetect.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/540-crypto-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/541-ubifs-xz-decompression-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/551-ubifs-fix-default-compression-selection.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/601-netfilter_layer7_pktmatch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/602-netfilter_layer7_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/611-netfilter_match_bypass_default_table.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/612-netfilter_match_reduce_memory_access.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/613-netfilter_optional_tcp_window_check.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/615-netfilter_add_xt_id_match.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/620-sched_esfq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/621-sched_act_connmark.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/640-bridge_no_eap_forward.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/641-bridge_always_accept_eap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/642-bridge_port_isolate.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/650-pppoe_header_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/652-atm_header_changes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/653-disable_netlink_trim.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/655-increase_skb_pad.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/656-skb_reduce_truesize-helper.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/657-qdisc_reduce_truesize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/660-fq_codel_defaults.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/661-fq_codel_keep_dropped_stats.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/662-use_fq_codel_by_default.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/663-remove_pfifo_fast.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/700-swconfig.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/701-phy_extension.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/702-phy_add_aneg_done_function.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/720-phy_adm6996.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/721-phy_packets.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/722-phy_mvswitch.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/723-phy_ip175c.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/724-phy_ar8216.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/725-phy_rtl8306.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/726-phy_rtl8366.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/727-phy-rtl8367.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/728-phy-micrel.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/729-phy-rtl8367b.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/729-phy-tantos.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/730-phy_b53.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/750-hostap_txpower.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/800-usb-ohci-multiple-platform-driver-fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/810-pci_disable_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/830-ledtrig_morse.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/831-ledtrig_netdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/832-ledtrig_usbdev.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/840-rtc7301.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/861-04_spi_gpio_implement_spi_delay.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/863-gpiommc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/870-hifn795x_byteswap.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/880-gateworks_system_controller.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/890-8250_optional_sysrq.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/900-slab_maxsize.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/901-debloat_sock_diag.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/902-debloat_proc.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/903-debloat_direct_io.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/910-kobject_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/911-kobject_add_broadcast_uevent.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/922-always-create-console-node-in-initramfs.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/930-crashlog.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/940-ocf_kbuild_integration.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/941-ocf_20120127.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/960-decompress_unlzo_fix.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/970-remove-unsane-filenames-from-deps_initramfs-list.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/980-arm_openwrt_machtypes.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/992-mpcore_wdt_fix_watchdog_counter_loading.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/994-mpcore_wdt_fix_timer_mode_setup.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/996-zsmalloc_allow_module_build.patch
 create mode 100644 trunk/target/linux/generic/patches-3.8/997-device_tree_cmdline.patch
 create mode 100644 trunk/target/linux/sunxi/Makefile
 create mode 100644 trunk/target/linux/sunxi/base-files.mk
 create mode 100644 trunk/target/linux/sunxi/base-files/etc/inittab
 create mode 100644 trunk/target/linux/sunxi/base-files/etc/uci-defaults/02_network
 create mode 100644 trunk/target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh
 create mode 100644 trunk/target/linux/sunxi/base-files/lib/sunxi.sh
 create mode 100644 trunk/target/linux/sunxi/config-3.14
 create mode 100644 trunk/target/linux/sunxi/config-3.18
 create mode 100644 trunk/target/linux/sunxi/image/Config.in
 create mode 100644 trunk/target/linux/sunxi/image/Makefile
 create mode 100755 trunk/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh
 create mode 100644 trunk/target/linux/sunxi/modules.mk
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/100-dt-sun4i-add-missing-serial-aliases.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/101-dt-sun6i-add-missing-serial-aliases.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/102-dt-sun7i-add-missing-serial-aliases.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/103-dt-sun5i-add-missing-serial-aliases.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/104-dt-sun7i-add-pinmuxing-for-uart2.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/105-dt-sun4i-add-linksprite-pcduino.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/107-dt-sun4i-add-a10-lime.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/110-dt-sun6i-add-pll-and-spi-modclocks.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/111-dt-sun4i-rename-clocknodes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/112-dt-sun5i-rename-clocknodes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/113-dt-sun6i-rename-clocknodes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/114-dt-sun7i-rename-clocknodes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/122-dt-sun7i-add-pinmuxing-for-gmac.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/123-dt-sun7i-cubietruck-enable-gmac.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/124-dt-sun7i-cubieboard2-enable-gmac.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/125-dt-sun7i-olinuxinom-enable-gmac.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/126-dt-sun7i-add-eth-alias-for-gmac.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/130-dt-sun4i-add-usbclock-bindings.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/131-dt-sun5i-add-usbclock-bindings.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/132-dt-sun7i-add-usbclock-bindings.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/135-pinctrl-fixes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/136-1-irqchip-sun4i-fixes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/137-1-pinctrl-create-irq-pin-mapping.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/137-2-pinctrl-add-IRQCHIP_SKIP_SET_WAKE.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/137-3-dt-sun7i-add-interrupt-cells.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/140-dt-sunxi-convert-to-new-clock-compats.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/141-dt-sunxi-add-common-regulator-include.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/145-2-dt-sun4i-add-a10-spi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/145-3-dt-sun5i-add-a13-spi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/146-1-spi-add-a31-spi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/146-2-spi-add-a10-spi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/149-dt-sun7i-add-spi-on-olinuxinom.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/151-dt-sun7i-add-ahci.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/160-dt-sun4i-add-usb-host-bindings.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/161-dt-sun5i-add-usb-host-bindings.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/162-dt-sun7i-add-usb-host-bindings.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/163-dt-sun4i-add-usb-host-to-boards.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/164-dt-sun5i-add-usb-host-to-boards.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/165-dt-sun7i-add-usb-host-to-boards.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/170-input-add-sun4i-ts-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/171-input-add-temp-sensor-support.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/172-input-add-lradc-keys-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/173-1-dt-sun4i-add-lradc-node.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/173-2-dt-sun5i-add-lradc-node.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/175-reset-add-of_reset_control_get.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/180-clk-sunxi-add-clock-output-names-dt-prop-support.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/181-clk-sunxi-add-names-for-pll56.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/183-clk-sunxi-add-usb-clockreg-defs.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/184-clk-sunxi-add-pll6-on-a31.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/185-clk-sunxi-add-a20-a31-gmac-clock.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/186-clk-sunxi-add-new-clock-compats.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/187-clk-sunxi-automatic-reparenting.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/190-ahci-libahci-changes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/191-ahci-add-sunxi-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/192-ahci-platform-changes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/195-1-ohci-plat-changes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/195-2-ehci-plat-changes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/195-3-uhci-plat-changes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/196-usb-add-sunxi-phy-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/200-mmc-add-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/202-dt-sun5i-add-mmc-nodes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/203-dt-sun7i-add-mmc-nodes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/205-nmi-add-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/210-mfd-add-axp20x-pmic-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/211-input-add-axp20x-power-enable-key-support.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/212-regulator-add-axp20x-regulator-support.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/213-dt-sunxi-add-x-powers.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/214-1-dt-sun7i-add-axp209-to-cubieboard2.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/214-2-dt-sun4i-add-axp209-to-boards.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/215-2-dt-sun5i-add-address-and-sizecells-to-i2c.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/215-3-dt-sun7i-add-address-and-sizecells-to-i2c.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/215-dt-sun4i-add-address-and-sizecells-to-i2c.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/216-dt-sun7i-add-i2c-to-cubietruck.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/220-clk-sunxi-remove-calls-to-clk_put.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/230-net-rfkill-changes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/231-1-brcmfmac-fix-sdio-sending.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/231-2-brcmfmac-fix-use-of-skb-ctrlbuf-in-SDIO.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/232-1-dt-sun7i-add-wifi-to-cubietruck.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/232-2-dt-sun7i-add-bluetooth-to-cubietruck.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/250-pwm-add-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/251-1-dt-sun4i-add-pinmux-for-pwm.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/251-2-dt-sun7i-add-pinmux-for-pwm.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/260-dt-sun7i-enable-arm-pmu.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/270-dt-sun7i-add-ss-to-a20.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/271-crypto-add-ss.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/280-ir-add-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/281-dt-sun7i-add-ir-pins.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/283-dt-sun7i-add-ir-to-cb2-cbt.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/284-ir-backports-from-3.15.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/300-1-dt-sun7i-add-pcduino3.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/300-2-dt-sun7i-add-pcduino3-dts.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/301-dt-sun7i-update-pcduino3.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/302-1-dt-sun7i-add-bananapi-Makefile.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/302-2-dt-sun7i-add-bananapi-dts.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/303-dt-sun7i-update-bananapi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/304-dt-sun7i-update-pcduino3-add-regulators.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/305-dt-sun7i-update-bananapi-add-regulators.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/306-dt-sun7i-fix-gmac-on-bananapi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/307-dt-sun7i-add-axp209-to-bananapi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/308-dt-sun7i-add-axp209-to-pcduino3.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/309-dt-sun7i-add-ir-to-bananapi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.14/310-dt-sun7i-add-a20-olinuxino-lime.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch
 create mode 100644 trunk/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch
 create mode 100644 trunk/target/linux/sunxi/profiles/01-default.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/a10-olinuxino.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/a13-olimex-som.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/a13-olinuxino.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/a20-olinuxino.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/bananapi.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/cubieboard.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/cubieboard2.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/pcduino.mk
 create mode 100644 trunk/target/linux/sunxi/profiles/pcduino3.mk
 create mode 100644 trunk/target/linux/uml/Makefile
 create mode 100644 trunk/target/linux/uml/README
 create mode 100644 trunk/target/linux/uml/config/i386
 create mode 100644 trunk/target/linux/uml/config/x86_64
 create mode 100644 trunk/target/linux/uml/image/Makefile
 create mode 100644 trunk/target/linux/uml/patches-3.14/001-fix_make_headers_install.patch
 create mode 100644 trunk/target/linux/uml/patches-3.14/101-mconsole-exec.patch
 create mode 100644 trunk/target/linux/uml/patches-3.14/102-pseudo-random-mac.patch
 create mode 100644 trunk/target/linux/x86/Makefile
 create mode 100644 trunk/target/linux/x86/alix2/base-files/etc/config/network
 create mode 100644 trunk/target/linux/x86/alix2/base-files/etc/config/system
 create mode 100644 trunk/target/linux/x86/alix2/base-files/etc/hotplug.d/button/50-reboot
 create mode 100644 trunk/target/linux/x86/alix2/config-default
 create mode 100644 trunk/target/linux/x86/alix2/target.mk
 create mode 100644 trunk/target/linux/x86/base-files.mk
 create mode 100644 trunk/target/linux/x86/base-files/etc/config/network
 create mode 100644 trunk/target/linux/x86/base-files/etc/inittab
 create mode 100644 trunk/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86
 create mode 100644 trunk/target/linux/x86/base-files/lib/preinit/20_check_iso
 create mode 100644 trunk/target/linux/x86/base-files/lib/preinit/79_move_config
 create mode 100644 trunk/target/linux/x86/base-files/lib/upgrade/platform.sh
 create mode 100644 trunk/target/linux/x86/config-3.10
 create mode 100644 trunk/target/linux/x86/config-3.14
 create mode 100644 trunk/target/linux/x86/config-3.3
 create mode 100644 trunk/target/linux/x86/ep80579/config-3.3
 create mode 100644 trunk/target/linux/x86/ep80579/target.mk
 create mode 100644 trunk/target/linux/x86/generic/config-default
 create mode 100644 trunk/target/linux/x86/generic/profiles/000-Generic.mk
 create mode 100644 trunk/target/linux/x86/generic/profiles/Soekris45xx.mk
 create mode 100644 trunk/target/linux/x86/generic/profiles/Soekris48xx.mk
 create mode 100644 trunk/target/linux/x86/generic/profiles/Wrap.mk
 create mode 100644 trunk/target/linux/x86/generic/target.mk
 create mode 100644 trunk/target/linux/x86/geos/base-files/etc/config/network
 create mode 100644 trunk/target/linux/x86/geos/base-files/etc/config/system
 create mode 100644 trunk/target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot
 create mode 100644 trunk/target/linux/x86/geos/config-default
 create mode 100644 trunk/target/linux/x86/geos/target.mk
 create mode 100644 trunk/target/linux/x86/image/Config.in
 create mode 100644 trunk/target/linux/x86/image/Makefile
 create mode 100755 trunk/target/linux/x86/image/gen_image_generic.sh
 create mode 100755 trunk/target/linux/x86/image/gen_image_olpc.sh
 create mode 100644 trunk/target/linux/x86/image/grub-early.cfg
 create mode 100644 trunk/target/linux/x86/image/grub-iso.cfg
 create mode 100644 trunk/target/linux/x86/image/grub.cfg
 create mode 100755 trunk/target/linux/x86/image/mkimg_bifferboard.py
 create mode 100755 trunk/target/linux/x86/image/mkimg_sitecom.pl
 create mode 100644 trunk/target/linux/x86/image/olpc.fth
 create mode 100644 trunk/target/linux/x86/kvm_guest/config-default
 create mode 100644 trunk/target/linux/x86/kvm_guest/target.mk
 create mode 100644 trunk/target/linux/x86/modules.mk
 create mode 100644 trunk/target/linux/x86/net5501/base-files/etc/config/network
 create mode 100644 trunk/target/linux/x86/net5501/base-files/etc/config/system
 create mode 100644 trunk/target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot
 create mode 100644 trunk/target/linux/x86/net5501/config-default
 create mode 100644 trunk/target/linux/x86/net5501/target.mk
 create mode 100644 trunk/target/linux/x86/olpc/base-files/etc/X11/xorg.conf
 create mode 100644 trunk/target/linux/x86/olpc/base-files/etc/config/network
 create mode 100644 trunk/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
 create mode 100644 trunk/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh
 create mode 100644 trunk/target/linux/x86/olpc/config-default
 create mode 100644 trunk/target/linux/x86/olpc/target.mk
 create mode 100644 trunk/target/linux/x86/patches-3.10/006-yenta_mistery.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/009-rdc321x_select_embedded.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/010-rdc_cpu_ident.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/011-tune_lzma_options.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/012-export_erase_write.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/100-rdc_boards.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/120-panic_on_unrecovered_nmi.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/150-pit-tick-rate.patch
 create mode 100644 trunk/target/linux/x86/patches-3.10/160-kexec-fix.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/006-yenta_mistery.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/009-rdc321x_select_embedded.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/010-rdc_cpu_ident.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/011-tune_lzma_options.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/012-export_erase_write.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/100-rdc_boards.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/120-panic_on_unrecovered_nmi.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/150-pit-tick-rate.patch
 create mode 100644 trunk/target/linux/x86/patches-3.14/160-kexec-fix.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/001-alix_platform.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/002-geos_platform.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/003-via-rhine-crash-fix.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/006-yenta_mistery.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/009-rdc321x_select_embedded.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/010-rdc_cpu_ident.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/011-tune_lzma_options.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/012-export_erase_write.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/100-rdc_boards.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/120-panic_on_unrecovered_nmi.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/150-pit-tick-rate.patch
 create mode 100644 trunk/target/linux/x86/patches-3.3/160-kexec-fix.patch
 create mode 100644 trunk/target/linux/x86/rdc/base-files/etc/config/network
 create mode 100644 trunk/target/linux/x86/rdc/base-files/etc/diag.sh
 create mode 100644 trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
 create mode 100644 trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh
 create mode 100644 trunk/target/linux/x86/rdc/config-default
 create mode 100644 trunk/target/linux/x86/rdc/profiles/ar525w.mk
 create mode 100644 trunk/target/linux/x86/rdc/profiles/bifferboard.mk
 create mode 100644 trunk/target/linux/x86/rdc/profiles/r8610.mk
 create mode 100644 trunk/target/linux/x86/rdc/profiles/sitecom.mk
 create mode 100644 trunk/target/linux/x86/rdc/target.mk
 create mode 100644 trunk/target/linux/x86/thincan/base-files/etc/init.d/alsa
 create mode 100644 trunk/target/linux/x86/thincan/config-default
 create mode 100644 trunk/target/linux/x86/thincan/profiles/dbe61.mk
 create mode 100644 trunk/target/linux/x86/thincan/target.mk
 create mode 100644 trunk/target/linux/x86/xen_domu/base-files/etc/inittab
 create mode 100644 trunk/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs
 create mode 100644 trunk/target/linux/x86/xen_domu/config-default
 create mode 100644 trunk/target/linux/x86/xen_domu/target.mk
 create mode 100644 trunk/target/linux/x86_64/Makefile
 create mode 100644 trunk/target/linux/x86_64/base-files/etc/inittab
 create mode 100644 trunk/target/linux/x86_64/base-files/lib/preinit/15_essential_fs_x86
 create mode 100644 trunk/target/linux/x86_64/base-files/lib/preinit/79_move_config
 create mode 100644 trunk/target/linux/x86_64/base-files/lib/upgrade/platform.sh
 create mode 100644 trunk/target/linux/x86_64/config-default
 create mode 100644 trunk/target/linux/x86_64/image/Makefile
 create mode 100755 trunk/target/linux/x86_64/image/gen_image_generic.sh
 create mode 100644 trunk/target/linux/x86_64/image/grub-early.cfg
 create mode 100644 trunk/target/linux/x86_64/image/grub-iso.cfg
 create mode 100644 trunk/target/linux/x86_64/image/grub.cfg
 create mode 100644 trunk/target/linux/x86_64/patches/011-tune_lzma_options.patch
 create mode 100644 trunk/target/linux/x86_64/patches/012-export_erase_write.patch
 create mode 100644 trunk/target/sdk/Config.in
 create mode 100644 trunk/target/sdk/Makefile
 create mode 100755 trunk/target/sdk/convert-config.pl
 create mode 100644 trunk/target/sdk/files/Config.in
 create mode 100644 trunk/target/sdk/files/Makefile
 create mode 100644 trunk/target/sdk/files/README.SDK
 create mode 100644 trunk/target/toolchain/Config.in
 create mode 100644 trunk/target/toolchain/Makefile
 create mode 100644 trunk/target/toolchain/files/README.TOOLCHAIN
 create mode 100755 trunk/target/toolchain/files/wrapper.sh
 create mode 100644 trunk/toolchain/Config.in
 create mode 100644 trunk/toolchain/Makefile
 create mode 100644 trunk/toolchain/binutils/Config.in
 create mode 100644 trunk/toolchain/binutils/Makefile
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/110-arm-eabi-conf.patch
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/111-pr7093.elf32-arm.c.patch
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/300-001_ld_makefile_patch.patch
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/300-012_check_ldrunpath_length.patch
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/400-autoreconf-compat.patch
 create mode 100644 trunk/toolchain/binutils/patches/2.20.1/700-avr32.patch
 create mode 100644 trunk/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch
 create mode 100644 trunk/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch
 create mode 100644 trunk/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch
 create mode 100644 trunk/toolchain/eglibc/Config.in
 create mode 100644 trunk/toolchain/eglibc/Config.version
 create mode 100644 trunk/toolchain/eglibc/Makefile
 create mode 100644 trunk/toolchain/eglibc/common.mk
 create mode 100644 trunk/toolchain/eglibc/config/Config.in
 create mode 100644 trunk/toolchain/eglibc/headers/Makefile
 create mode 100644 trunk/toolchain/eglibc/include/libintl.h
 create mode 100644 trunk/toolchain/eglibc/patches/2.15/001-fix_autoconf_macro.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.15/005-versions.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.15/050-all_glibc-2.14-leak-revert-crash.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.15/100-fix_cross_rpcgen.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.15/110-fix_cross_zic.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.15/200-add-dl-search-paths.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.19/100-fix_cross_rpcgen.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.19/200-add-dl-search-paths.patch
 create mode 100644 trunk/toolchain/eglibc/patches/2.19/300-require-autoconf-2.69.patch
 create mode 100644 trunk/toolchain/gcc/Config.in
 create mode 100644 trunk/toolchain/gcc/Config.version
 create mode 100644 trunk/toolchain/gcc/common.mk
 create mode 100644 trunk/toolchain/gcc/files/alternate-arch-cc.in
 create mode 100644 trunk/toolchain/gcc/final/Makefile
 create mode 100644 trunk/toolchain/gcc/initial/Makefile
 create mode 100644 trunk/toolchain/gcc/minimal/Makefile
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/100-uclibc-conf.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/301-missing-execinfo_h.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/302-c99-snprintf.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/305-libmudflap-susv3-legacy.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/810-arm-softfloat-libgcc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/820-libgcc_pic.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/910-mbsd_multi.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/930-avr32_support.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/931-avr32_disable_shifted_data_opt.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/933-avr32_bug_7435.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/934-avr32_bug_9675.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/993-arm_insn-opinit-RTX_CODE-fixup.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.4.7/999-coldfire.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/010-documentation.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/020-gcc_bug_54295.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/030-gcc_bug_48403.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/040-gcc_bug_49696.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/100-uclibc-conf.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/200-musl.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/301-missing-execinfo_h.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/302-c99-snprintf.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/305-libmudflap-susv3-legacy.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/800-arm_v5te_no_ldrd_strd.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/810-arm-softfloat-libgcc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/820-libgcc_pic.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/830-arm_unbreak_armv4t.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/850-use_shared_libgcc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/860-uclibc_use_eh_frame.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/870-ppc_no_crtsavres.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/880-no_java_section.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/900-bad-mips16-crt
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/910-mbsd_multi.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/920-specs_nonfatal_getenv.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.6-linaro/999-coldfire.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/001-revert_register_mode_search.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/002-weak_data_fix.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/003-universal_initializer.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/004-case_insensitive.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/010-documentation.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/200-musl_config.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/201-musl_arm.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/202-musl_mips.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/203-musl_powerpc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/204-musl_sh.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/205-musl_x86.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/206-musl_aarch64.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/207-musl_fixincludes.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/208-musl_gomp.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/209-musl_libstdc++.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/210-disable_libsanitizer_off_t_check.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/220-musl_mips_softfloat.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/800-arm_v5te_no_ldrd_strd.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/810-arm-softfloat-libgcc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/820-libgcc_pic.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/830-arm_unbreak_armv4t.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/860-use_eh_frame.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/880-no_java_section.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/900-bad-mips16-crt.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.8-linaro/930-fix-mips-noexecstack.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/001-revert_register_mode_search.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/002-case_insensitive.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/010-documentation.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/100-uclibc-conf.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/200-musl_config.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/201-musl_arm.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/202-musl_mips.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/203-musl_powerpc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/204-musl_sh.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/206-musl_aarch64.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/207-musl_fixincludes.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/208-musl_gomp.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/209-musl_libstdc++.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/210-disable_libsanitizer_off_t_check.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/220-musl_mips_softfloat.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/800-arm_v5te_no_ldrd_strd.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/810-arm-softfloat-libgcc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/820-libgcc_pic.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/830-arm_unbreak_armv4t.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/850-use_shared_libgcc.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/860-use_eh_frame.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/870-ppc_no_crtsavres.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/880-no_java_section.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/900-bad-mips16-crt.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/910-mbsd_multi.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/920-specs_nonfatal_getenv.patch
 create mode 100644 trunk/toolchain/gcc/patches/4.9-linaro/930-fix-mips-noexecstack.patch
 create mode 100644 trunk/toolchain/gdb/Makefile
 create mode 100644 trunk/toolchain/gdb/patches/100-ppc_compile_fix.patch
 create mode 100644 trunk/toolchain/gdb/patches/110-no_extern_inline.patch
 create mode 100644 trunk/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch
 create mode 100644 trunk/toolchain/info.mk
 create mode 100644 trunk/toolchain/insight/Makefile
 create mode 100644 trunk/toolchain/insight/patches/600-fix-compile-flag-mismatch.patch
 create mode 100644 trunk/toolchain/kernel-headers/Makefile
 create mode 100644 trunk/toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch
 create mode 100644 trunk/toolchain/llvm/Makefile
 create mode 100644 trunk/toolchain/llvm/patches/100-darwin_arch_auto.patch
 create mode 100644 trunk/toolchain/llvm/patches/110-darwin_version_detect.patch
 create mode 100644 trunk/toolchain/musl/Config.in
 create mode 100644 trunk/toolchain/musl/Config.version
 create mode 100644 trunk/toolchain/musl/Makefile
 create mode 100644 trunk/toolchain/musl/common.mk
 create mode 100644 trunk/toolchain/musl/headers/Makefile
 create mode 100644 trunk/toolchain/musl/include/bits/wordsize.h
 create mode 100644 trunk/toolchain/musl/include/features.h
 create mode 100644 trunk/toolchain/musl/include/sgidefs.h
 create mode 100644 trunk/toolchain/musl/include/sys/cdefs.h
 create mode 100644 trunk/toolchain/musl/include/sys/glibc-types.h
 create mode 100644 trunk/toolchain/musl/include/sys/queue.h
 create mode 100644 trunk/toolchain/musl/patches/100-add_glob_onlydir.patch
 create mode 100644 trunk/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
 create mode 100644 trunk/toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch
 create mode 100644 trunk/toolchain/musl/patches/900-iconv_size_hack.patch
 create mode 100644 trunk/toolchain/uClibc/Config.in
 create mode 100644 trunk/toolchain/uClibc/Config.version
 create mode 100644 trunk/toolchain/uClibc/Makefile
 create mode 100644 trunk/toolchain/uClibc/common.mk
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/arm
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/armeb
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/avr32
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/common
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/cris
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/debug
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/i386
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/i686
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/m68k
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64.32
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64.64
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64.n32
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64el
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64el.32
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64el.64
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mips64el.n32
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mipsel
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/mipsel.cobalt
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/powerpc
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/powerpc.e500
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/sparc
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/sparc.leon
 create mode 100644 trunk/toolchain/uClibc/config-0.9.33.2/x86_64
 create mode 100644 trunk/toolchain/uClibc/headers/Makefile
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/009_backport_mount.h-update.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/100-fix_unifdef.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/110-compat_macros.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/120-adjtimex.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/132-inet_fix_res_init.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/150-vasprintf_size_reduce.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/170-math_finite.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/180-pthread_cleanup_fix.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/190-nptl_use_arch_default_stack_limit.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/200-no_forced_unwind.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/210-mips_use_pic_crt1.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/350-use-fputs_unlocked.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/410-llvm_workaround.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/450-powerpc_copysignl.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/480-powerpc_rel24_support.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/600-mips64_abi_selection.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/610-mips64_syscall_fix.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/611-mips_syscall_error_argument.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/612-mips64_relocation_fix.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/613-mips64_more_relocation_fixes.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/614-mips64_fix_setjmp_longjmp.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/615-mips_fix_sigev_pad_size.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/616-mips_fix_stat_time.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/618-mips64_fix_syscall_error.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/619-mips64_fix_sysdep_cancel.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/960-remove_eabi_oabi_selection.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/981-fix_setting_arch_native_bit.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/990-no-stack-cache.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch
 create mode 100644 trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch
 create mode 100644 trunk/toolchain/uClibc/utils/Makefile
 create mode 100644 trunk/toolchain/wrapper/Makefile
 create mode 100644 trunk/tools/Makefile
 create mode 100644 trunk/tools/autoconf/Makefile
 create mode 100644 trunk/tools/autoconf/patches/000-relocatable.patch
 create mode 100644 trunk/tools/autoconf/patches/001-no_emacs_lib.patch
 create mode 100644 trunk/tools/automake/Makefile
 create mode 100755 trunk/tools/automake/files/aclocal
 create mode 100644 trunk/tools/automake/patches/000-relocatable.patch
 create mode 100644 trunk/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
 create mode 100644 trunk/tools/bc/Makefile
 create mode 100644 trunk/tools/bc/patches/001-no_doc.patch
 create mode 100644 trunk/tools/bison/Makefile
 create mode 100644 trunk/tools/bison/patches/010-intl-stub-compat.patch
 create mode 100644 trunk/tools/bison/patches/100-fix-gets-removal.patch
 create mode 100644 trunk/tools/ccache/Makefile
 create mode 100755 trunk/tools/ccache/files/ccache_cc
 create mode 100755 trunk/tools/ccache/files/ccache_cxx
 create mode 100644 trunk/tools/cloog/Makefile
 create mode 100644 trunk/tools/cmake/Makefile
 create mode 100644 trunk/tools/cmake/patches/100-disable_qt_tests.patch
 create mode 100644 trunk/tools/dosfstools/Makefile
 create mode 100644 trunk/tools/e2fsprogs/Makefile
 create mode 100644 trunk/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
 create mode 100644 trunk/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
 create mode 100644 trunk/tools/e2fsprogs/patches/003-openbsd-compat.patch
 create mode 100644 trunk/tools/e2fsprogs/patches/004-freebsd-compat.patch
 create mode 100644 trunk/tools/elftosb/Makefile
 create mode 100644 trunk/tools/elftosb/patches/001-libm.patch
 create mode 100644 trunk/tools/elftosb/patches/002-fix-header-path.patch
 create mode 100644 trunk/tools/elftosb/patches/003-use-ldflags.patch
 create mode 100644 trunk/tools/findutils/Makefile
 create mode 100644 trunk/tools/findutils/patches/21-Fix-time_t-vs-long-int-mismatches.patch
 create mode 100644 trunk/tools/firmware-utils/Makefile
 create mode 100644 trunk/tools/firmware-utils/src/add_header.c
 create mode 100644 trunk/tools/firmware-utils/src/addpattern.c
 create mode 100644 trunk/tools/firmware-utils/src/airlink.c
 create mode 100644 trunk/tools/firmware-utils/src/bcm_tag.h
 create mode 100644 trunk/tools/firmware-utils/src/bcmalgo.c
 create mode 100644 trunk/tools/firmware-utils/src/bcmalgo.h
 create mode 100644 trunk/tools/firmware-utils/src/buffalo-enc.c
 create mode 100644 trunk/tools/firmware-utils/src/buffalo-lib.c
 create mode 100644 trunk/tools/firmware-utils/src/buffalo-lib.h
 create mode 100644 trunk/tools/firmware-utils/src/buffalo-tag.c
 create mode 100644 trunk/tools/firmware-utils/src/buffalo-tftp.c
 create mode 100644 trunk/tools/firmware-utils/src/csysimg.h
 create mode 100644 trunk/tools/firmware-utils/src/cyg_crc.h
 create mode 100644 trunk/tools/firmware-utils/src/cyg_crc16.c
 create mode 100644 trunk/tools/firmware-utils/src/cyg_crc32.c
 create mode 100644 trunk/tools/firmware-utils/src/dgfirmware.c
 create mode 100644 trunk/tools/firmware-utils/src/dgn3500sum.c
 create mode 100644 trunk/tools/firmware-utils/src/encode_crc.c
 create mode 100644 trunk/tools/firmware-utils/src/fix-u-media-header.c
 create mode 100644 trunk/tools/firmware-utils/src/fw.h
 create mode 100644 trunk/tools/firmware-utils/src/hcsmakeimage.c
 create mode 100644 trunk/tools/firmware-utils/src/imagetag.c
 create mode 100644 trunk/tools/firmware-utils/src/imagetag.ggo
 create mode 100644 trunk/tools/firmware-utils/src/imagetag_cmdline.c
 create mode 100644 trunk/tools/firmware-utils/src/imagetag_cmdline.h
 create mode 100644 trunk/tools/firmware-utils/src/lzma2eva.c
 create mode 100644 trunk/tools/firmware-utils/src/makeamitbin.c
 create mode 100644 trunk/tools/firmware-utils/src/md5.c
 create mode 100644 trunk/tools/firmware-utils/src/md5.h
 create mode 100644 trunk/tools/firmware-utils/src/mkbrncmdline.c
 create mode 100644 trunk/tools/firmware-utils/src/mkbrnimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mkcameofw.c
 create mode 100644 trunk/tools/firmware-utils/src/mkcasfw.c
 create mode 100644 trunk/tools/firmware-utils/src/mkchkimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mkcsysimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mkdapimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mkdcs932.c
 create mode 100644 trunk/tools/firmware-utils/src/mkdniimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mkedimaximg.c
 create mode 100644 trunk/tools/firmware-utils/src/mkfwimage.c
 create mode 100644 trunk/tools/firmware-utils/src/mkfwimage2.c
 create mode 100644 trunk/tools/firmware-utils/src/mkheader_gemtek.c
 create mode 100644 trunk/tools/firmware-utils/src/mkhilinkfw.c
 create mode 100644 trunk/tools/firmware-utils/src/mkmylofw.c
 create mode 100644 trunk/tools/firmware-utils/src/mkplanexfw.c
 create mode 100644 trunk/tools/firmware-utils/src/mkporayfw.c
 create mode 100644 trunk/tools/firmware-utils/src/mkrtn56uimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mksenaofw.c
 create mode 100644 trunk/tools/firmware-utils/src/mktitanimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mktitanimg.h
 create mode 100644 trunk/tools/firmware-utils/src/mktplinkfw.c
 create mode 100644 trunk/tools/firmware-utils/src/mktplinkfw2.c
 create mode 100644 trunk/tools/firmware-utils/src/mkwrgimg.c
 create mode 100644 trunk/tools/firmware-utils/src/mkzcfw.c
 create mode 100644 trunk/tools/firmware-utils/src/mkzynfw.c
 create mode 100644 trunk/tools/firmware-utils/src/motorola-bin.c
 create mode 100644 trunk/tools/firmware-utils/src/myloader.h
 create mode 100644 trunk/tools/firmware-utils/src/nand_ecc.c
 create mode 100644 trunk/tools/firmware-utils/src/osbridge-crc.c
 create mode 100644 trunk/tools/firmware-utils/src/pc1crypt.c
 create mode 100644 trunk/tools/firmware-utils/src/ptgen.c
 create mode 100644 trunk/tools/firmware-utils/src/seama.c
 create mode 100644 trunk/tools/firmware-utils/src/seama.h
 create mode 100644 trunk/tools/firmware-utils/src/sha1.c
 create mode 100644 trunk/tools/firmware-utils/src/sha1.h
 create mode 100644 trunk/tools/firmware-utils/src/spw303v.c
 create mode 100644 trunk/tools/firmware-utils/src/srec2bin.c
 create mode 100644 trunk/tools/firmware-utils/src/tplink-safeloader.c
 create mode 100644 trunk/tools/firmware-utils/src/trx.c
 create mode 100644 trunk/tools/firmware-utils/src/trx2edips.c
 create mode 100644 trunk/tools/firmware-utils/src/trx2usr.c
 create mode 100644 trunk/tools/firmware-utils/src/wrt400n.c
 create mode 100644 trunk/tools/firmware-utils/src/xorimage.c
 create mode 100644 trunk/tools/firmware-utils/src/zynos.h
 create mode 100644 trunk/tools/firmware-utils/src/zyxbcm.c
 create mode 100644 trunk/tools/flex/Makefile
 create mode 100644 trunk/tools/flex/patches/100-remove_no_undefined.patch
 create mode 100644 trunk/tools/flock/Makefile
 create mode 100644 trunk/tools/flock/src/flock.c
 create mode 100644 trunk/tools/genext2fs/Makefile
 create mode 100644 trunk/tools/genext2fs/patches/100-c99_scanf.patch
 create mode 100644 trunk/tools/genext2fs/patches/200-autoconf.patch
 create mode 100644 trunk/tools/genext2fs/patches/300-blocksize-creator.patch
 create mode 100644 trunk/tools/genext2fs/patches/400-byteswap_fix.patch
 create mode 100644 trunk/tools/gengetopt/Makefile
 create mode 100644 trunk/tools/gengetopt/patches/100-dependency_fix.patch
 create mode 100644 trunk/tools/gmp/Makefile
 create mode 100644 trunk/tools/include/byteswap.h
 create mode 100644 trunk/tools/include/elf.h
 create mode 100644 trunk/tools/include/endian.h
 create mode 100644 trunk/tools/include/getline.h
 create mode 100644 trunk/tools/include/sys/sysmacros.h
 create mode 100644 trunk/tools/ipkg-utils/Makefile
 create mode 100644 trunk/tools/ipkg-utils/patches/100-build_clean.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/110-buildpackage.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/120-build_tar.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/130-tar_wildcards.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/140-portability.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/150-uppercase_letters.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/160-find.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/170-resolve_conffiles.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/180-add_installed_size.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/190-preserve_permissions.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/200-force_gnu_format.patch
 create mode 100644 trunk/tools/ipkg-utils/patches/210-remove_field_checks.patch
 create mode 100644 trunk/tools/libelf/Makefile
 create mode 100644 trunk/tools/libtool/Makefile
 create mode 100644 trunk/tools/libtool/files/libtool-v1.5.patch
 create mode 100644 trunk/tools/libtool/files/libtool-v2.2.patch
 create mode 100644 trunk/tools/libtool/files/libtool-v2.4.patch
 create mode 100644 trunk/tools/libtool/patches/000-relocatable.patch
 create mode 100644 trunk/tools/libtool/patches/001-fix-func_append.patch
 create mode 100644 trunk/tools/libtool/patches/100-libdir-fixes.patch
 create mode 100644 trunk/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
 create mode 100644 trunk/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
 create mode 100644 trunk/tools/libtool/patches/150-trailingslash.patch
 create mode 100644 trunk/tools/libtool/patches/200-openwrt-branding.patch
 create mode 100644 trunk/tools/lzma-old/Makefile
 create mode 100644 trunk/tools/lzma-old/patches/100-lzma_zlib.patch
 create mode 100644 trunk/tools/lzma-old/patches/110-ranlib.patch
 create mode 100644 trunk/tools/lzma/Makefile
 create mode 100644 trunk/tools/lzma/patches/001-large_files.patch
 create mode 100644 trunk/tools/lzma/patches/002-lzmp.patch
 create mode 100644 trunk/tools/lzma/patches/003-compile_fixes.patch
 create mode 100644 trunk/tools/lzma/patches/100-static_library.patch
 create mode 100644 trunk/tools/m4/Makefile
 create mode 100644 trunk/tools/m4/patches/100-fix-gets-removal.patch
 create mode 100644 trunk/tools/missing-macros/Makefile
 create mode 100644 trunk/tools/missing-macros/src/README
 create mode 100644 trunk/tools/missing-macros/src/m4/as-ac-expand.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/as-compiler-flag.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/as-unaligned-access.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/as-version.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/dnet.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/esd.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/fake-intltool.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/glibc2.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/glibc21.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/intdiv0.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/intmax.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/inttypes-pri.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/inttypes_h.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/lib-ld.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/lib-link.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/lib-prefix.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/mfx_acc.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/mfx_cppflags.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/mfx_limits.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/progtest.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/stdint_h.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/uintmax_t.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/va_copy.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/wint_t.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/xaw.m4
 create mode 100644 trunk/tools/missing-macros/src/m4/xmms.m4
 create mode 100644 trunk/tools/mkimage/Makefile
 create mode 100644 trunk/tools/mkimage/patches/010-freebsd-ulong-fix.patch
 create mode 100644 trunk/tools/mkimage/patches/020-include_compile_fix.patch
 create mode 100644 trunk/tools/mkimage/patches/030-allow-to-use-different-magic.patch
 create mode 100644 trunk/tools/mkimage/patches/040-include_order.patch
 create mode 100644 trunk/tools/mkimage/patches/050-image_h_portability.patch
 create mode 100644 trunk/tools/mkimage/patches/060-remove_kernel_includes.patch
 create mode 100644 trunk/tools/mkimage/patches/070-socfpgaimage_portability.patch
 create mode 100644 trunk/tools/mkimage/patches/080-remove_compiler_check.patch
 create mode 100644 trunk/tools/mklibs/Makefile
 create mode 100644 trunk/tools/mklibs/include/elf.h
 create mode 100644 trunk/tools/mklibs/patches/001-compile.patch
 create mode 100644 trunk/tools/mklibs/patches/002-disable_symbol_checks.patch
 create mode 100644 trunk/tools/mklibs/patches/003-no_copy.patch
 create mode 100644 trunk/tools/mklibs/patches/004-libpthread_link.patch
 create mode 100644 trunk/tools/mklibs/patches/005-duplicate_syms.patch
 create mode 100644 trunk/tools/mklibs/patches/006-uclibc_init.patch
 create mode 100644 trunk/tools/mklibs/patches/007-gc_sections.patch
 create mode 100644 trunk/tools/mklibs/patches/008-uclibc_libgcc_link.patch
 create mode 100644 trunk/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
 create mode 100644 trunk/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch
 create mode 100644 trunk/tools/mklibs/patches/011-remove_multiarch.patch
 create mode 100644 trunk/tools/mm-macros/Makefile
 create mode 100644 trunk/tools/mpc/Makefile
 create mode 100644 trunk/tools/mpfr/Makefile
 create mode 100644 trunk/tools/mpfr/patches/001-only_src.patch
 create mode 100644 trunk/tools/mtd-utils/Makefile
 create mode 100644 trunk/tools/mtd-utils/include/fls.h
 create mode 100644 trunk/tools/mtd-utils/include/linux/types.h
 create mode 100644 trunk/tools/mtd-utils/patches/100-sscanf_fix.patch
 create mode 100644 trunk/tools/mtd-utils/patches/110-portability.patch
 create mode 100644 trunk/tools/mtd-utils/patches/120-cygwin_fixes.patch
 create mode 100644 trunk/tools/mtd-utils/patches/130-lzma_jffs2.patch
 create mode 100644 trunk/tools/mtd-utils/patches/131-fix_lib_compile.patch
 create mode 100644 trunk/tools/mtd-utils/patches/133-error-fix.patch
 create mode 100644 trunk/tools/mtd-utils/patches/134-freebsd_loff_t.patch
 create mode 100644 trunk/tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
 create mode 100644 trunk/tools/mtd-utils/patches/136-mkfs.ubifs-xz-support.patch
 create mode 100644 trunk/tools/mtd-utils/patches/137-no_extern_inline.patch
 create mode 100644 trunk/tools/mtd-utils/patches/200-libubigen-add-ubigen_write_terminator-function.patch
 create mode 100644 trunk/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch
 create mode 100644 trunk/tools/mtools/Makefile
 create mode 100644 trunk/tools/padjffs2/Makefile
 create mode 100644 trunk/tools/padjffs2/src/Makefile
 create mode 100644 trunk/tools/padjffs2/src/padjffs2.c
 create mode 100644 trunk/tools/patch-image/Makefile
 create mode 100644 trunk/tools/patch-image/src/patch-cmdline.c
 create mode 100644 trunk/tools/patch-image/src/patch-dtb.c
 create mode 100644 trunk/tools/patch/Makefile
 create mode 100644 trunk/tools/pkg-config/Makefile
 create mode 100755 trunk/tools/pkg-config/files/pkg-config
 create mode 100644 trunk/tools/pkg-config/patches/001-fix-package-rebuild.patch
 create mode 100644 trunk/tools/ppl/Makefile
 create mode 100644 trunk/tools/ppl/patches/001-disable-serial-tests.patch
 create mode 100644 trunk/tools/qemu/Makefile
 create mode 100644 trunk/tools/quilt/Makefile
 create mode 100644 trunk/tools/quilt/patches/000-relocatable.patch
 create mode 100644 trunk/tools/quilt/patches/001-fix_compile.patch
 create mode 100644 trunk/tools/scons/Makefile
 create mode 100755 trunk/tools/scons/files/pywrap.sh
 create mode 100644 trunk/tools/scons/patches/001-platform_env.patch
 create mode 100644 trunk/tools/sed/Makefile
 create mode 100644 trunk/tools/sparse/Makefile
 create mode 100644 trunk/tools/squashfs/Makefile
 create mode 100644 trunk/tools/squashfs/patches/100-lzma.patch
 create mode 100644 trunk/tools/squashfs/patches/110-no_nonstatic_inline.patch
 create mode 100644 trunk/tools/squashfs4/Makefile
 create mode 100644 trunk/tools/squashfs4/patches/100-portability.patch
 create mode 100644 trunk/tools/squashfs4/patches/110-allow_static_liblzma.patch
 create mode 100644 trunk/tools/squashfs4/patches/120-cygwin_fixes.patch
 create mode 100644 trunk/tools/squashfs4/patches/150-freebsd_fixes.patch
 create mode 100644 trunk/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
 create mode 100644 trunk/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch
 create mode 100644 trunk/tools/squashfs4/patches/180-openbsd_compat.patch
 create mode 100644 trunk/tools/squashfs4/patches/190-no_nonstatic_inline.patch
 create mode 100644 trunk/tools/sstrip/Makefile
 create mode 100644 trunk/tools/sstrip/src/sstrip.c
 create mode 100644 trunk/tools/upslug2/Makefile
 create mode 100644 trunk/tools/upslug2/patches/100-libpcap_fix.patch
 create mode 100644 trunk/tools/upslug2/patches/110-wrt350nv2_support.patch
 create mode 100644 trunk/tools/upx/Makefile
 create mode 100644 trunk/tools/upx/patches/100-lzmaonly.patch
 create mode 100644 trunk/tools/xfce-macros/Makefile
 create mode 100644 trunk/tools/xorg-macros/Makefile
 create mode 100644 trunk/tools/xz/Makefile
 create mode 100644 trunk/tools/yaffs2/Makefile
 create mode 100644 trunk/tools/yaffs2/patches/100-compile.patch
 create mode 100644 trunk/tools/yaffs2/patches/110-openbsd-compat.patch

diff --git a/trunk/BSDmakefile b/trunk/BSDmakefile
new file mode 100644
index 00000000..c6a04256
--- /dev/null
+++ b/trunk/BSDmakefile
@@ -0,0 +1,7 @@
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+world ${.TARGETS}:
+	@gmake $@
diff --git a/trunk/Config.in b/trunk/Config.in
new file mode 100644
index 00000000..96123bcf
--- /dev/null
+++ b/trunk/Config.in
@@ -0,0 +1,33 @@
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+mainmenu "libreCMC Configuration"
+
+config MODULES
+	bool
+	default y
+
+config HAVE_DOT_CONFIG
+	bool
+	default y
+
+source "target/Config.in"
+
+source "config/Config-images.in"
+
+source "config/Config-build.in"
+
+source "config/Config-devel.in"
+
+source "toolchain/Config.in"
+
+source "target/imagebuilder/Config.in"
+
+source "target/sdk/Config.in"
+
+source "target/toolchain/Config.in"
+
+source "tmp/.config-package.in"
diff --git a/trunk/LICENSE b/trunk/LICENSE
new file mode 100644
index 00000000..d60c31a9
--- /dev/null
+++ b/trunk/LICENSE
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/trunk/Makefile b/trunk/Makefile
new file mode 100644
index 00000000..f4cbc19c
--- /dev/null
+++ b/trunk/Makefile
@@ -0,0 +1,105 @@
+# Makefile for libreCMC
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+export TOPDIR LC_ALL LANG
+
+empty:=
+space:= $(empty) $(empty)
+$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the libreCMC directory must not include any spaces))
+
+world:
+
+include $(TOPDIR)/include/host.mk
+
+ifneq ($(LIBRECMC_BUILD),1)
+  _SINGLE=export MAKEFLAGS=$(space);
+
+  override LIBRECMC_BUILD=1
+  export LIBRECMC_BUILD
+  GREP_OPTIONS=
+  export GREP_OPTIONS
+  include $(TOPDIR)/include/debug.mk
+  include $(TOPDIR)/include/depends.mk
+  include $(TOPDIR)/include/toplevel.mk
+else
+  include rules.mk
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include target/Makefile
+  include package/Makefile
+  include tools/Makefile
+  include toolchain/Makefile
+
+$(toolchain/stamp-install): $(tools/stamp-install)
+$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared
+$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
+$(package/stamp-install): $(package/stamp-compile)
+$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
+
+printdb:
+	@true
+
+prepare: $(target/stamp-compile)
+
+clean: FORCE
+	rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR)
+
+dirclean: clean
+	rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
+	rm -rf $(TMP_DIR)
+
+ifndef DUMP_TARGET_DB
+$(BUILD_DIR)/.prepared: Makefile
+	@mkdir -p $$(dirname $@)
+	@touch $@
+
+tmp/.prereq_packages: .config
+	unset ERROR; \
+	for package in $(sort $(prereq-y) $(prereq-m)); do \
+		$(_SINGLE)$(NO_TRACE_MAKE) -s -r -C package/$$package prereq || ERROR=1; \
+	done; \
+	if [ -n "$$ERROR" ]; then \
+		echo "Package prerequisite check failed."; \
+		false; \
+	fi
+	touch $@
+endif
+
+# check prerequisites before starting to build
+prereq: $(target/stamp-prereq) tmp/.prereq_packages
+	@if [ ! -f "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" ]; then \
+		echo 'ERROR: Missing site config for target "$(REAL_GNU_TARGET_NAME)" !'; \
+		echo '       The missing file will cause configure scripts to fail during compilation.'; \
+		echo '       Please provide a "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" file and restart the build.'; \
+		exit 1; \
+	fi
+
+prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
+world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
+	$(_SINGLE)$(SUBMAKE) -r package/index
+
+# update all feeds, re-create index files, install symlinks
+package/symlinks:
+	$(SCRIPT_DIR)/feeds update -a
+	$(SCRIPT_DIR)/feeds install -a
+
+# re-create index files, install symlinks
+package/symlinks-install:
+	$(SCRIPT_DIR)/feeds update -i
+	$(SCRIPT_DIR)/feeds install -a
+
+# remove all symlinks, don't touch ./feeds
+package/symlinks-clean:
+	$(SCRIPT_DIR)/feeds uninstall -a
+
+.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean
+
+endif
diff --git a/trunk/README b/trunk/README
new file mode 100644
index 00000000..f3a738d6
--- /dev/null
+++ b/trunk/README
@@ -0,0 +1,35 @@
+This is the buildsystem for the libreCMC Linux distribution.
+
+Please use "make menuconfig" to configure your appreciated
+configuration for the toolchain and firmware.
+
+You need to have installed gcc, binutils, bzip2, flex, python, perl, make,
+find, grep, diff, unzip, gawk, getopt, subversion, libz-dev and libc headers.
+
+Run "./scripts/feeds update -a" to get all the latest package definitions
+defined in feeds.conf / feeds.conf.default respectively
+and "./scripts/feeds install -a" to install symlinks of all of them into
+package/feeds/.
+
+Use "make menuconfig" to configure your image.
+
+Simply running "make" will build your firmware.
+It will download all sources, build the cross-compile toolchain, 
+the kernel and all choosen applications.
+
+You can use "scripts/flashing/flash.sh" for remotely updating your embedded
+system via tftp.
+
+The libreCMC system is documented in docs/. You will need a LaTeX distribution
+and the tex4ht package to build the documentation. Type "make -C docs/" to build it.
+
+To build your own firmware you need to have access to a Linux, BSD or MacOSX system
+(case-sensitive filesystem required). Cygwin will not be supported because of
+the lack of case sensitiveness in the file system.
+
+
+Sunshine!
+	Your libreCMC Project
+	http://librecmc.org
+
+
diff --git a/trunk/README.md b/trunk/README.md
new file mode 100644
index 00000000..279f2952
--- /dev/null
+++ b/trunk/README.md
@@ -0,0 +1,43 @@
+![librecmc](http://downloads.librecmc.org/res/img/main_white.png "librecmc")
+# libre Concurrent Machine Cluster : The *libre* embedded GNU/Linux distro
+
+libreCMC is an embedded GNU/Linux distro with the focus of providing a platform
+that is 100% free software and that does not contain non-free blobs. While libreCMC
+is currently a hard fork of the popular OpenWRT project, it uses a linux-libre kenrel and
+does not contain non-free parts.
+
+
+## Why would I want to use libreCMC?
+
+Well, many in the Free Software community feel that it is important to have control
+over the software that runs on their devices. In the embedded world, it is quite
+rare to find a device that does not require the use of a non-free part where code
+can't be obtained or where the user is not allowed to change the software. Having 
+the freedom to change **ALL** of the software on a device is essential to ensuring
+that the software is doing what the user wants and not bending to the will of a third party.
+These freedoms should also include :
+
+0. The freedom to run the software as the user sees fit.
+
+1. The freedom to study how the program works.
+
+2. The freedom to copy the software.
+
+3. The freedom to share changes to the software.
+
+
+## Why is libreCMC a **HARD** fork of OpenWRT?
+
+Well, to bootstrap the project in a timely fashion, we needed a build system
+that we could use. libreCMC is a hard fork of OpenWRT because the changes that
+we make won't be pushed upstream (we've tried) and because work is currently being
+done to fully replace the build system. Another reason for creating this fork is 
+because the goals and views of the libreCMC project conflict with those of the 
+non-free OpenWRT.
+
+
+# Useful Things
+
+[BUILD-HOWTO](docs/BUILD_HOWTO.md) : Basic instructions for building libreCMC.
+
+## More work being done ;)
diff --git a/trunk/config/Config-build.in b/trunk/config/Config-build.in
new file mode 100644
index 00000000..77a105e6
--- /dev/null
+++ b/trunk/config/Config-build.in
@@ -0,0 +1,219 @@
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menu "Global build settings"
+
+	config ALL
+		bool "Select all packages by default"
+		default n
+
+	comment "General build options"
+
+	config DISPLAY_SUPPORT
+		bool "Show packages that require graphics support (local or remote)"
+		default n
+
+	config BUILD_PATENTED
+		default y
+		bool "Compile with support for patented functionality"
+		help
+		  When this option is disabled, software which provides patented functionality
+		  will not be built.  In case software provides optional support for patented
+		  functionality, this optional support will get disabled for this package.
+
+	config BUILD_NLS
+		default n
+		bool "Compile with full language support"
+		help
+		  When this option is enabled, packages are built with the full versions of
+		  iconv and GNU gettext instead of the default libreCMC stubs. If uClibc is
+		  used, it is also built with locale support.
+
+	config BUILD_STATIC_TOOLS
+		default n
+		bool "Attempt to link host utilities statically"
+		help
+		  Linking host utilities like sed or firmware-utils statically increases the
+		  portability of the generated ImageBuilder and SDK tarballs; however, it may
+		  fail on some Linux distributions.
+
+	config SHADOW_PASSWORDS
+		bool
+		prompt "Enable shadow password support"
+		default y
+		help
+		  Enable shadow password support.
+
+	config CLEAN_IPKG
+		bool
+		prompt "Remove ipkg/opkg status data files in final images"
+		default n
+		help
+		  This removes all ipkg/opkg status data files from the target directory
+		  before building the root filesystem.
+
+	config COLLECT_KERNEL_DEBUG
+		bool
+		prompt "Collect kernel debug information"
+		select KERNEL_DEBUG_INFO
+		default n
+		help
+		  This collects debugging symbols from the kernel and all compiled modules.
+		  Useful for release builds, so that kernel issues can be debugged offline
+		  later.
+
+	comment "Kernel build options"
+
+	source "config/Config-kernel.in"
+
+	comment "Package build options"
+
+	config DEBUG
+		bool
+		prompt "Compile packages with debugging info"
+		default n
+		help
+		  Adds -g3 to the CFLAGS.
+
+	config IPV6
+		bool
+		prompt "Enable IPv6 support in packages"
+		default y
+		help
+		  Enable IPv6 support in packages (passes --enable-ipv6 to configure scripts).
+
+	config PKG_BUILD_PARALLEL
+		bool
+		prompt "Compile certain packages parallelized"
+		default y
+		help
+		  This adds a -jX option to certain packages that are known to behave well
+		  for parallel build. By default, the package make processes use the main
+		  jobserver, in which case this option only takes effect when you add -jX
+		  to the make command.
+
+		  If you are unsure, select N.
+
+	config PKG_CHECK_FORMAT_SECURITY
+		bool
+		prompt "Enable gcc format-security"
+		default n
+		help
+		  Add -Wformat -Werror=format-security to the CFLAGS.  You can disable
+		  this per package by adding PKG_CHECK_FORMAT_SECURITY:=0 in the package
+		  Makefile.
+
+	config PKG_BUILD_USE_JOBSERVER
+		bool
+		prompt "Use top-level make jobserver for packages"
+		depends on PKG_BUILD_PARALLEL
+		default y
+		help
+		  This passes the main make process jobserver fds to package builds,
+		  enabling full parallelization across different packages.
+
+		  Note that disabling this may overcommit CPU resources depending on the
+		  -j level of the main make process, the number of package submake jobs
+		  selected below and the number of actual CPUs present.
+		  Example: If the main make is passed a -j4 and the submake -j
+		  is also set to 4, we may end up with 16 parallel make processes
+		  in the worst case.
+
+	config PKG_BUILD_JOBS
+		int
+		prompt "Number of package submake jobs (2-512)"
+		range 2 512
+		default 2
+		depends on PKG_BUILD_PARALLEL && !PKG_BUILD_USE_JOBSERVER
+		help
+		  The number of jobs (-jX) to pass to packages submake.
+
+	config PKG_DEFAULT_PARALLEL
+		bool
+		prompt "Parallelize the default package build rule (May break build)"
+		depends on PKG_BUILD_PARALLEL
+		depends on BROKEN
+		default n
+		help
+		  Always set the default package build rules to parallel build.
+
+		  WARNING: This may break build or kill your cat, as it builds packages
+		  with multiple jobs that are probably not tested in a parallel build
+		  environment.
+
+		  Only say Y if you don't mind fixing broken packages.  Before reporting
+		  build bugs, set this to N and re-run the build.
+
+	comment "Stripping options"
+
+	choice
+		prompt "Binary stripping method"
+		default USE_STRIP   if EXTERNAL_TOOLCHAIN
+		default USE_STRIP   if USE_GLIBC || USE_EGLIBC || USE_MUSL
+		default USE_SSTRIP
+		help
+		  Select the binary stripping method you wish to use.
+
+		config NO_STRIP
+			bool "none"
+			help
+			  This will install unstripped binaries (useful for native
+		 	  compiling/debugging).
+
+		config USE_STRIP
+			bool "strip"
+			help
+			  This will install binaries stripped using strip from binutils.
+
+
+		config USE_SSTRIP
+			bool "sstrip"
+			depends on !DEBUG
+			depends on !USE_GLIBC
+			depends on !USE_EGLIBC
+			help
+			  This will install binaries stripped using sstrip.
+	endchoice
+
+	config STRIP_ARGS
+		string
+		prompt "Strip arguments"
+		depends on USE_STRIP
+		default "--strip-unneeded --remove-section=.comment --remove-section=.note" if DEBUG
+		default "--strip-all"
+		help
+		  Specifies arguments passed to the strip command when stripping binaries.
+
+	config STRIP_KERNEL_EXPORTS
+		bool "Strip unnecessary exports from the kernel image"
+		help
+		  Reduces kernel size by stripping unused kernel exports from the kernel
+		  image.  Note that this might make the kernel incompatible with any kernel
+		  modules that were not selected at the time the kernel image was created.
+
+	config USE_MKLIBS
+		bool "Strip unnecessary functions from libraries"
+		help
+		  Reduces libraries to only those functions that are necessary for using all
+		  selected packages (including those selected as <M>).  Note that this will
+		  make the system libraries incompatible with most of the packages that are
+		  not selected during the build process.
+
+	choice
+		prompt "Preferred standard C++ library"
+		default USE_LIBSTDCXX if USE_EGLIBC
+		default USE_UCLIBCXX
+		help
+		  Select the preferred standard C++ library for all packages that support this.
+
+		config USE_UCLIBCXX
+			bool "uClibc++"
+
+		config USE_LIBSTDCXX
+			bool "libstdc++"
+	endchoice
+
+endmenu
diff --git a/trunk/config/Config-devel.in b/trunk/config/Config-devel.in
new file mode 100644
index 00000000..c6bc9902
--- /dev/null
+++ b/trunk/config/Config-devel.in
@@ -0,0 +1,111 @@
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menuconfig DEVEL
+	bool "Advanced configuration options (for developers)"
+	default n
+
+	config BROKEN
+		bool "Show broken platforms / packages" if DEVEL
+		default n
+
+	config BINARY_FOLDER
+		string "Binary folder" if DEVEL
+		default ""
+		help
+		  Store built firmware images and filesystem images in this directory.
+		  If not set, uses './bin/$(BOARD)'
+
+	config DOWNLOAD_FOLDER
+		string "Download folder" if DEVEL
+		default ""
+		help
+		  Store downloaded source bundles in this directory.
+		  If not set then defaults to './dl', which is removed by operations such as
+		  'git clean -xdf' or 'make distclean'.
+		  This option is useful if you have a low bandwidth Internet connection, and by
+		  setting a path outside the libreCMC tree downloads will be saved.
+
+	config LOCALMIRROR
+		string "Local mirror for source packages" if DEVEL
+		default ""
+
+	config AUTOREBUILD
+		bool "Automatic rebuild of packages" if DEVEL
+		default y
+		help
+		  Automatically rebuild packages when their files change.
+
+	config BUILD_SUFFIX
+		string "Build suffix to append to the target BUILD_DIR variable" if DEVEL
+		default ""
+		help
+		  Build suffix to append to the BUILD_DIR variable, i.e: './build_dir/{target-build-dir}_$(BUILD_SUFFIX)'.
+		  This allows you to switch to a different .config whilst retaining all the build
+		  objects generated by the first .config
+
+	config TARGET_ROOTFS_DIR
+		string "Override the default TARGET_ROOTFS_DIR variable" if DEVEL
+		default ""
+		help
+		  Override the default TARGET_ROOTFS_DIR variable content $(BUILD_DIR) with
+		  custom path.  Use this option to re-define the location of the target
+		  root filesystem directory.
+
+	config CCACHE
+		bool "Use ccache" if DEVEL
+		default n
+		help
+		  Compiler cache; see http://ccache.samba.org/.
+
+	config EXTERNAL_KERNEL_TREE
+		string "Use external kernel tree" if DEVEL
+		default ""
+
+	config KERNEL_GIT_CLONE_URI
+		string "Enter git repository to clone" if DEVEL
+		default ""
+		help
+		  Enter the full git repository path i.e.:
+		  git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+		  This will create a git clone of the kernel in your build directory.
+
+	config KERNEL_GIT_LOCAL_REPOSITORY
+		string "Enter path to local reference repository" if DEVEL
+		depends on (KERNEL_GIT_CLONE_URI != "")
+		default ""
+		help
+		  Enter a full pathname to a local reference git repository.
+		  In this instance, the --reference option of git clone will
+		  be used thus creating a quick local clone of your repo.
+
+	config KERNEL_GIT_BRANCH
+		string "Enter git branch to clone" if DEVEL
+		depends on (KERNEL_GIT_CLONE_URI != "")
+		default ""
+		help
+		  Enter the branch name to checkout after cloning the git repository.
+		  In this instance, the --branch option of git clone will be used.
+		  If unused, the clone's repository HEAD will be checked-out.
+
+	config BUILD_LOG
+		bool "Enable log files during build process" if DEVEL
+		help
+		  If enabled, log files will be written to the ./log directory.
+
+	config SRC_TREE_OVERRIDE
+		bool "Enable package source tree override" if DEVEL
+		help
+		  If enabled, you can force a package to use a git tree as source
+		  code instead of the normal tarball. Create a symlink 'git-src'
+		  in the package directory, pointing to the .git tree that you want
+		  to pull the source code from.
+
+	config EXTRA_OPTIMIZATION
+		string "Additional compiler options" if DEVEL
+		default "-fno-caller-saves"
+		help
+		  Extra target-independent optimizations to use when building for the target.
diff --git a/trunk/config/Config-images.in b/trunk/config/Config-images.in
new file mode 100644
index 00000000..5c2e79e4
--- /dev/null
+++ b/trunk/config/Config-images.in
@@ -0,0 +1,318 @@
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menu "Target Images"
+
+	menuconfig TARGET_ROOTFS_INITRAMFS
+		bool "ramdisk"
+		default y if USES_INITRAMFS
+		help
+		  Embed the root filesystem into the kernel (initramfs).
+
+		choice
+			prompt "Compression"
+			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
+			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
+			default TARGET_INITRAMFS_COMPRESSION_NONE
+			depends on TARGET_ROOTFS_INITRAMFS
+			help
+			  Select ramdisk compression.
+
+			config TARGET_INITRAMFS_COMPRESSION_NONE
+				bool "none"
+
+			config TARGET_INITRAMFS_COMPRESSION_GZIP
+				bool "gzip"
+
+			config TARGET_INITRAMFS_COMPRESSION_BZIP2
+				bool "bzip2"
+
+			config TARGET_INITRAMFS_COMPRESSION_LZMA
+				bool "lzma"
+
+			config TARGET_INITRAMFS_COMPRESSION_LZO
+				bool "lzo"
+
+			config TARGET_INITRAMFS_COMPRESSION_LZ4
+				bool "lz4"
+
+			config TARGET_INITRAMFS_COMPRESSION_XZ
+				bool "xz"
+		endchoice
+
+		config EXTERNAL_CPIO
+			string
+			prompt "Use external cpio" if TARGET_ROOTFS_INITRAMFS
+			default ""
+			help
+			  Kernel uses specified external cpio as INITRAMFS_SOURCE.
+
+	comment "Root filesystem archives"
+
+	config TARGET_ROOTFS_CPIOGZ
+		bool "cpio.gz"
+		default y if USES_CPIOGZ
+		help
+		  Build a compressed cpio archive of the root filesystem.
+
+	config TARGET_ROOTFS_TARGZ
+		bool "tar.gz"
+		default y if USES_TARGZ
+		help
+		  Build a compressed tar archive of the root filesystem.
+
+	comment "Root filesystem images"
+
+	menuconfig TARGET_ROOTFS_EXT4FS
+		bool "ext4"
+		default y if USES_EXT4
+		help
+		  Build an ext4 root filesystem.
+
+		config TARGET_EXT4_MAXINODE
+			int "Maximum number of inodes in root filesystem"
+			depends on TARGET_ROOTFS_EXT4FS
+			default 6000
+			help
+			  Select the maximum number of inodes in the root filesystem.
+
+		config TARGET_EXT4_RESERVED_PCT
+			int "Percentage of reserved blocks in root filesystem"
+			depends on TARGET_ROOTFS_EXT4FS
+			default 0
+			help
+			  Select the percentage of reserved blocks in the root filesystem.
+
+		choice
+			prompt "Root filesystem block size"
+			default TARGET_EXT4_BLOCKSIZE_4K
+			depends on TARGET_ROOTFS_EXT4FS
+			help
+			  Select the block size of the root filesystem.
+
+			config TARGET_EXT4_BLOCKSIZE_4K
+				bool "4k"
+
+			config TARGET_EXT4_BLOCKSIZE_2K
+				bool "2k"
+
+			config TARGET_EXT4_BLOCKSIZE_1K
+				bool "1k"
+		endchoice
+
+		config TARGET_EXT4_BLOCKSIZE
+			int
+			default 4096 if TARGET_EXT4_BLOCKSIZE_4K
+			default 2048 if TARGET_EXT4_BLOCKSIZE_2K
+			default 1024 if TARGET_EXT4_BLOCKSIZE_1K
+			depends on TARGET_ROOTFS_EXT4FS
+
+		config TARGET_EXT4_JOURNAL
+			bool "Create a journaling filesystem"
+			depends on TARGET_ROOTFS_EXT4FS
+			default n
+			help
+			  Create an ext4 filesystem with a journal.
+
+	config TARGET_ROOTFS_ISO
+		bool "iso"
+		default n
+		depends on TARGET_x86_generic
+		help
+		  Create a bootable ISO image.
+
+	config TARGET_ROOTFS_JFFS2
+		bool "jffs2"
+		default y if USES_JFFS2
+		help
+		  Build a JFFS2 root filesystem.
+
+	config TARGET_ROOTFS_JFFS2_NAND
+		bool "jffs2 for NAND"
+		default y if USES_JFFS2_NAND
+		depends on USES_JFFS2_NAND
+		help
+		  Build a JFFS2 root filesystem for NAND flash.
+
+	menuconfig TARGET_ROOTFS_SQUASHFS
+		bool "squashfs"
+		default y if USES_SQUASHFS
+		help
+		  Build a squashfs-lzma root filesystem.
+
+		config TARGET_SQUASHFS_BLOCK_SIZE
+			int "Block size (in KiB)"
+			depends on TARGET_ROOTFS_SQUASHFS
+			default 64 if LOW_MEMORY_FOOTPRINT
+			default 256
+
+	menuconfig TARGET_ROOTFS_UBIFS
+		bool "ubifs"
+		default y if USES_UBIFS
+		depends on USES_UBIFS
+		help
+		  Build a UBIFS root filesystem.
+
+		choice
+			prompt "compression"
+			default TARGET_UBIFS_COMPRESSION_ZLIB
+			depends on TARGET_ROOTFS_UBIFS
+			help
+			  Select compression type
+
+			config TARGET_UBIFS_COMPRESSION_NONE
+				bool "none"
+
+			config TARGET_UBIFS_COMPRESSION_LZO
+				bool "lzo"
+
+			config TARGET_UBIFS_COMPRESSION_ZLIB
+				bool "zlib"
+		endchoice
+
+		config TARGET_UBIFS_FREE_SPACE_FIXUP
+			bool "free space fixup" if TARGET_ROOTFS_UBIFS
+			default y
+			help
+			  The filesystem free space has to be fixed up on first mount.
+
+		config TARGET_UBIFS_JOURNAL_SIZE
+			string
+			prompt "journal size" if TARGET_ROOTFS_UBIFS
+			default ""
+
+	config GRUB_IMAGES
+		bool "Build GRUB images (Linux x86 or x86_64 host only)"
+		depends on TARGET_x86_64 || (TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc))
+		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+		select PACKAGE_grub2
+		default y
+
+	config GRUB_CONSOLE
+		bool "Use Console Terminal (in addition to Serial)"
+		depends on GRUB_IMAGES
+		default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
+		default y
+
+	config GRUB_SERIAL
+		string "Serial port device"
+		depends on GRUB_IMAGES
+		default "hvc0" if TARGET_x86_xen_domu
+		default "ttyS0" if ! TARGET_x86_xen_domu
+
+	config GRUB_BAUDRATE
+		int "Serial port baud rate"
+		depends on GRUB_IMAGES
+		default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
+		default 38400 if TARGET_x86_alix2
+		default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
+		default 38400
+
+	config GRUB_BOOTOPTS
+		string "Extra kernel boot options"
+		depends on GRUB_IMAGES
+		default "xencons=hvc" if TARGET_x86_xen_domu
+		help
+		  If you don't know, just leave it blank.
+
+	config GRUB_TIMEOUT
+		string "Seconds to wait before booting the default entry"
+		depends on GRUB_IMAGES
+		default "5"
+		help
+		  If you don't know, 5 seconds is a reasonable default.
+
+	config VDI_IMAGES
+		bool "Build VirtualBox image files (VDI)"
+		depends on TARGET_x86 || TARGET_x86_64
+		select GRUB_IMAGES
+		select TARGET_IMAGES_PAD
+		select PACKAGE_kmod-e1000
+
+	config VMDK_IMAGES
+		bool "Build VMware image files (VMDK)"
+		depends on TARGET_x86 || TARGET_x86_64
+		select GRUB_IMAGES
+		select TARGET_IMAGES_PAD
+		select PACKAGE_kmod-e1000
+
+	config TARGET_IMAGES_PAD
+		bool "Pad images to filesystem size (for JFFS2)"
+		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+
+	config TARGET_IMAGES_GZIP
+		bool "GZip images"
+		depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
+		default y
+
+	comment "Image Options"
+
+	source "target/linux/*/image/Config.in"
+
+	config TARGET_KERNEL_PARTSIZE
+		int "Kernel partition size (in MB)"
+		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+		default 4
+
+	config TARGET_ROOTFS_PARTSIZE
+		int "Root filesystem partition size (in MB)"
+		depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
+		default 48
+		help
+		  Select the root filesystem partition size.
+
+	config TARGET_ROOTFS_PARTNAME
+		string "Root partition on target device"
+		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+		default "/dev/xvda2" if TARGET_x86_xen_domu
+		default "/dev/sda2" if TARGET_x86 && ! TARGET_x86_xen_domu
+		help
+		  Override the root partition on the final device. If left empty,
+		  it will be mounted by PARTUUID which makes the kernel find the
+		  appropriate disk automatically.
+
+
+	menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
+		bool "Include kernel in root filesystem"
+		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
+		default n
+		help
+		  Include the kernel image in the rootfs. Typically, the image is placed
+		  below /boot.
+
+		config TARGET_ROOTFS_INCLUDE_UIMAGE
+			bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL
+			default y
+			help
+			  This option might not apply to all targets. Make sure
+			  to check target/linux/<your_target>/image/Makefile to
+			  see if this option will have any effect.
+
+		config TARGET_ROOTFS_INCLUDE_ZIMAGE
+			bool "include zImage" if TARGET_ROOTFS_INCLUDE_KERNEL
+			default y
+			help
+			  This option might not apply to all targets. Make sure
+			  to check target/linux/<your_target>/image/Makefile to
+			  see if this option will have any effect.
+
+		config TARGET_ROOTFS_INCLUDE_FIT
+			bool "include FIT" if TARGET_ROOTFS_INCLUDE_KERNEL
+			default y
+			help
+			  This option might not apply to all targets. Make sure
+			  to check target/linux/<your_target>/image/Makefile to
+			  see if this option will have any effect.
+
+	config TARGET_ROOTFS_INCLUDE_DTB
+		bool "Include DTB in root filesystem"
+		depends on USES_DEVICETREE && (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS)
+		default n
+		help
+		  Include the device tree blob file(s) in the rootfs. Typically the DTBs
+		  are placed below /boot.
+
+endmenu
diff --git a/trunk/config/Config-kernel.in b/trunk/config/Config-kernel.in
new file mode 100644
index 00000000..51cc31f5
--- /dev/null
+++ b/trunk/config/Config-kernel.in
@@ -0,0 +1,467 @@
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+config KERNEL_PRINTK
+	bool "Enable support for printk"
+	default y
+
+config KERNEL_CRASHLOG
+	bool "Crash logging"
+	depends on !(arm || powerpc || sparc || TARGET_uml)
+	default y
+
+config KERNEL_SWAP
+	bool "Support for paging of anonymous memory (swap)"
+	default y
+
+config KERNEL_DEBUG_FS
+	bool "Compile the kernel with debug filesystem enabled"
+	default y
+	help
+	  debugfs is a virtual file system that kernel developers use to put
+	  debugging files into. Enable this option to be able to read and
+	  write to these files. Many common debugging facilities, such as
+	  ftrace, require the existence of debugfs.
+
+config KERNEL_PERF_EVENTS
+	bool
+	default n
+
+config KERNEL_PROFILING
+	bool "Compile the kernel with profiling enabled"
+	default n
+	select KERNEL_PERF_EVENTS
+	help
+	  Enable the extended profiling support mechanisms used by profilers such
+	  as OProfile.
+
+config KERNEL_KALLSYMS
+	bool "Compile the kernel with symbol table information"
+	default y
+	help
+	  This will give you more information in stack traces from kernel oopses.
+
+config KERNEL_FTRACE
+	bool "Compile the kernel with tracing support"
+	default n
+
+config KERNEL_FTRACE_SYSCALLS
+	bool "Trace system calls"
+	depends on KERNEL_FTRACE
+	default n
+
+config KERNEL_ENABLE_DEFAULT_TRACERS
+	bool "Trace process context switches and events"
+	depends on KERNEL_FTRACE
+	default n
+
+config KERNEL_DEBUG_KERNEL
+	bool
+	default n
+
+config KERNEL_DEBUG_INFO
+	bool "Compile the kernel with debug information"
+	default y
+	select KERNEL_DEBUG_KERNEL
+	help
+	  This will compile your kernel and modules with debug information.
+
+config KERNEL_DEBUG_LL_UART_NONE
+	bool
+	default n
+	depends on arm
+
+config KERNEL_DEBUG_LL
+	bool
+	default n
+	depends on arm
+	select KERNEL_DEBUG_LL_UART_NONE
+	help
+	  ARM low level debugging.
+
+config KERNEL_DYNAMIC_DEBUG 
+	bool "Compile the kernel with dynamic printk"
+	select KERNEL_DEBUG_FS
+	default n
+	help
+	  Compiles debug level messages into the kernel, which would not
+	  otherwise be available at runtime. These messages can then be
+	  enabled/disabled based on various levels of scope - per source file,
+	  function, module, format string, and line number. This mechanism
+	  implicitly compiles in all pr_debug() and dev_dbg() calls, which
+	  enlarges the kernel text size by about 2%.
+
+config KERNEL_EARLY_PRINTK
+	bool "Compile the kernel with early printk"
+	default n
+	depends on arm
+	select KERNEL_DEBUG_KERNEL
+	select KERNEL_DEBUG_LL if arm
+	help
+	  Compile the kernel with early printk support.  This is only useful for
+	  debugging purposes to send messages over the serial console in early boot.
+	  Enable this to debug early boot problems.
+
+config KERNEL_AIO
+	bool "Compile the kernel with asynchronous IO support"
+	default n
+
+config KERNEL_DIRECT_IO
+	bool "Compile the kernel with direct IO support"
+	default n
+
+config KERNEL_MAGIC_SYSRQ
+	bool "Compile the kernel with SysRq support"
+	default y
+
+config KERNEL_COREDUMP
+	bool
+
+config KERNEL_ELF_CORE
+	bool "Enable process core dump support"
+	select KERNEL_COREDUMP
+	default y
+
+config KERNEL_PROVE_LOCKING
+	bool "Enable kernel lock checking"
+	select KERNEL_DEBUG_KERNEL
+	default n
+
+config KERNEL_PRINTK_TIME
+	bool "Enable printk timestamps"
+	default y
+
+config KERNEL_SLUB_DEBUG
+	bool
+
+config KERNEL_SLUB_DEBUG_ON
+	bool
+
+config KERNEL_SLABINFO
+	select KERNEL_SLUB_DEBUG
+	select KERNEL_SLUB_DEBUG_ON
+	bool "Enable /proc slab debug info"
+
+config KERNEL_PROC_PAGE_MONITOR
+	bool "Enable /proc page monitoring"
+
+config KERNEL_RELAY
+	bool
+
+config KERNEL_KEXEC
+	bool "Enable kexec support"
+
+config USE_RFKILL
+	bool "Enable rfkill support"
+	default RFKILL_SUPPORT
+
+config USE_SPARSE
+	bool "Enable sparse check during kernel build"
+	default n
+
+#
+# CGROUP support symbols
+#
+
+config KERNEL_CGROUPS
+	bool "Enable kernel cgroups"
+	default n
+
+if KERNEL_CGROUPS
+
+	config KERNEL_CGROUP_DEBUG
+		bool "Example debug cgroup subsystem"
+		default n
+		help
+		  This option enables a simple cgroup subsystem that
+		  exports useful debugging information about the cgroups
+		  framework.
+
+	config KERNEL_FREEZER
+		bool
+		default y if KERNEL_CGROUP_FREEZER
+
+	config KERNEL_CGROUP_FREEZER
+		bool "Freezer cgroup subsystem"
+		default y
+		help
+		  Provides a way to freeze and unfreeze all tasks in a
+		  cgroup.
+
+	config KERNEL_CGROUP_DEVICE
+		bool "Device controller for cgroups"
+		default y
+		help
+		  Provides a cgroup implementing whitelists for devices which
+		  a process in the cgroup can mknod or open.
+
+	config KERNEL_CPUSETS
+		bool "Cpuset support"
+		default n
+		help
+		  This option will let you create and manage CPUSETs which
+		  allow dynamically partitioning a system into sets of CPUs and
+		  Memory Nodes and assigning tasks to run only within those sets.
+		  This is primarily useful on large SMP or NUMA systems.
+
+	config KERNEL_PROC_PID_CPUSET
+		bool "Include legacy /proc/<pid>/cpuset file"
+		default n
+		depends on KERNEL_CPUSETS
+
+	config KERNEL_CGROUP_CPUACCT
+		bool "Simple CPU accounting cgroup subsystem"
+		default n
+		help
+		  Provides a simple Resource Controller for monitoring the
+		  total CPU consumed by the tasks in a cgroup.
+
+	config KERNEL_RESOURCE_COUNTERS
+		bool "Resource counters"
+		default n
+		help
+		  This option enables controller independent resource accounting
+		  infrastructure that works with cgroups.
+
+	config KERNEL_MM_OWNER
+		bool
+		default y if KERNEL_MEMCG
+
+	config KERNEL_MEMCG
+		bool "Memory Resource Controller for Control Groups"
+		default n
+		depends on KERNEL_RESOURCE_COUNTERS
+		help
+		  Provides a memory resource controller that manages both anonymous
+		  memory and page cache. (See Documentation/cgroups/memory.txt)
+
+		  Note that setting this option increases fixed memory overhead
+		  associated with each page of memory in the system. By this,
+		  20(40)bytes/PAGE_SIZE on 32(64)bit system will be occupied by memory
+		  usage tracking struct at boot. Total amount of this is printed out
+		  at boot.
+
+		  Only enable when you're ok with these tradeoffs and really
+		  sure you need the memory resource controller. Even when you enable
+		  this, you can set "cgroup_disable=memory" at your boot option to
+		  disable memory resource controller and you can avoid overheads
+		  (but lose benefits of memory resource controller).
+
+		  This config option also selects MM_OWNER config option, which
+		  could in turn add some fork/exit overhead.
+
+	config KERNEL_MEMCG_SWAP
+		bool "Memory Resource Controller Swap Extension"
+		default n
+		depends on KERNEL_MEMCG
+		help
+		  Add swap management feature to memory resource controller. When you
+		  enable this, you can limit mem+swap usage per cgroup. In other words,
+		  when you disable this, memory resource controller has no cares to
+		  usage of swap...a process can exhaust all of the swap. This extension
+		  is useful when you want to avoid exhaustion swap but this itself
+		  adds more overheads and consumes memory for remembering information.
+		  Especially if you use 32bit system or small memory system, please
+		  be careful about enabling this. When memory resource controller
+		  is disabled by boot option, this will be automatically disabled and
+		  there will be no overhead from this. Even when you set this config=y,
+		  if boot option "swapaccount=0" is set, swap will not be accounted.
+		  Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
+		  size is 4096bytes, 512k per 1Gbytes of swap.
+
+	config KERNEL_MEMCG_SWAP_ENABLED
+		bool "Memory Resource Controller Swap Extension enabled by default"
+		default n
+		depends on KERNEL_MEMCG_SWAP
+		help
+		  Memory Resource Controller Swap Extension comes with its price in
+		  a bigger memory consumption. General purpose distribution kernels
+		  which want to enable the feature but keep it disabled by default
+		  and let the user enable it by swapaccount boot command line
+		  parameter should have this option unselected.
+
+		  Those who want to have the feature enabled by default should
+		  select this option (if, for some reason, they need to disable it,
+		  then swapaccount=0 does the trick).
+
+
+	config KERNEL_MEMCG_KMEM
+		bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
+		default n
+		depends on KERNEL_MEMCG
+		help
+		  The Kernel Memory extension for Memory Resource Controller can limit
+		  the amount of memory used by kernel objects in the system. Those are
+		  fundamentally different from the entities handled by the standard
+		  Memory Controller, which are page-based, and can be swapped. Users of
+		  the kmem extension can use it to guarantee that no group of processes
+		  will ever exhaust kernel resources alone.
+
+	config KERNEL_CGROUP_PERF
+		bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
+		select KERNEL_PERF_EVENTS
+		default n
+		help
+		  This option extends the per-cpu mode to restrict monitoring to
+		  threads which belong to the cgroup specified and run on the
+		  designated cpu.
+
+	menuconfig KERNEL_CGROUP_SCHED
+		bool "Group CPU scheduler"
+		default n
+		help
+		  This feature lets CPU scheduler recognize task groups and control CPU
+		  bandwidth allocation to such task groups. It uses cgroups to group
+		  tasks.
+
+	if KERNEL_CGROUP_SCHED
+
+		config KERNEL_FAIR_GROUP_SCHED
+			bool "Group scheduling for SCHED_OTHER"
+			default n
+
+		config KERNEL_CFS_BANDWIDTH
+			bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED"
+			default n
+			depends on KERNEL_FAIR_GROUP_SCHED
+			help
+			  This option allows users to define CPU bandwidth rates (limits) for
+			  tasks running within the fair group scheduler.  Groups with no limit
+			  set are considered to be unconstrained and will run with no
+			  restriction.
+			  See tip/Documentation/scheduler/sched-bwc.txt for more information.
+
+		config KERNEL_RT_GROUP_SCHED
+			bool "Group scheduling for SCHED_RR/FIFO"
+			default n
+			help
+			  This feature lets you explicitly allocate real CPU bandwidth
+			  to task groups. If enabled, it will also make it impossible to
+			  schedule realtime tasks for non-root users until you allocate
+			  realtime bandwidth for them.
+
+	endif
+
+	config KERNEL_BLK_CGROUP
+		bool "Block IO controller"
+		default y
+		help
+		  Generic block IO controller cgroup interface. This is the common
+		  cgroup interface which should be used by various IO controlling
+		  policies.
+
+		  Currently, CFQ IO scheduler uses it to recognize task groups and
+		  control disk bandwidth allocation (proportional time slice allocation)
+		  to such task groups. It is also used by bio throttling logic in
+		  block layer to implement upper limit in IO rates on a device.
+
+		  This option only enables generic Block IO controller infrastructure.
+		  One needs to also enable actual IO controlling logic/policy. For
+		  enabling proportional weight division of disk bandwidth in CFQ, set
+		  CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
+		  CONFIG_BLK_DEV_THROTTLING=y.
+
+	config KERNEL_DEBUG_BLK_CGROUP
+		bool "Enable Block IO controller debugging"
+		default n
+		depends on KERNEL_BLK_CGROUP
+		help
+		  Enable some debugging help. Currently it exports additional stat
+		  files in a cgroup which can be useful for debugging.
+
+	config KERNEL_NET_CLS_CGROUP
+		bool "Control Group Classifier"
+		default y
+
+	config KERNEL_NETPRIO_CGROUP
+		bool "Network priority cgroup"
+		default y
+
+endif
+
+#
+# Namespace support symbols
+#
+
+config KERNEL_NAMESPACES
+	bool "Enable kernel namespaces"
+	default n
+
+if KERNEL_NAMESPACES
+
+	config KERNEL_UTS_NS
+		bool "UTS namespace"
+		default y
+		help
+		  In this namespace, tasks see different info provided
+		  with the uname() system call.
+
+	config KERNEL_IPC_NS
+		bool "IPC namespace"
+		default y
+		help
+		  In this namespace, tasks work with IPC ids which correspond to
+		  different IPC objects in different namespaces.
+
+	config KERNEL_USER_NS
+		bool "User namespace (EXPERIMENTAL)"
+		default y
+		help
+		  This allows containers, i.e. vservers, to use user namespaces
+		  to provide different user info for different servers.
+
+	config KERNEL_PID_NS
+		bool "PID Namespaces"
+		default y
+		help
+		  Support process id namespaces. This allows having multiple
+		  processes with the same pid as long as they are in different
+		  pid namespaces. This is a building block of containers.
+
+	config KERNEL_NET_NS
+		bool "Network namespace"
+		default y
+		help
+		  Allow user space to create what appear to be multiple instances
+		  of the network stack.
+
+endif
+
+#
+# LXC related symbols
+#
+
+config KERNEL_LXC_MISC
+	bool "Enable miscellaneous LXC related options"
+	default n
+
+if KERNEL_LXC_MISC
+
+	config KERNEL_DEVPTS_MULTIPLE_INSTANCES
+		bool "Support multiple instances of devpts"
+		default y
+		help
+		  Enable support for multiple instances of devpts filesystem.
+		  If you want to have isolated PTY namespaces (eg: in containers),
+		  say Y here. Otherwise, say N. If enabled, each mount of devpts
+		  filesystem with the '-o newinstance' option will create an
+		  independent PTY namespace.
+
+	config KERNEL_POSIX_MQUEUE
+		bool "POSIX Message Queues"
+		default y
+		help
+		  POSIX variant of message queues is a part of IPC. In POSIX message
+		  queues every message has a priority which decides about succession
+		  of receiving it by a process. If you want to compile and run
+		  programs written e.g. for Solaris with use of its POSIX message
+		  queues (functions mq_*) say Y here.
+
+		  POSIX message queues are visible as a filesystem called 'mqueue'
+		  and can be mounted somewhere if you want to do filesystem
+		  operations on message queues.
+
+endif
diff --git a/trunk/docs/BUILD_HOWTO.md b/trunk/docs/BUILD_HOWTO.md
new file mode 100644
index 00000000..649a7e80
--- /dev/null
+++ b/trunk/docs/BUILD_HOWTO.md
@@ -0,0 +1,58 @@
+# libreCMC build HOWTO
+
+This generic documentation is for building libreCMC firmware images that are for supported target devices. While libreCMC does allow for building for other tagets, not all have been tested to work with libreCMC and are not supported if they are not mentioned on the libreCMC wiki.
+
+libreCMC is licensed under the GPLv2 and contains code from other free software projects. Some code may be licensed under other free software licenses and will be noted. All software is to be distributed under the terms of the GPLv2 or their respective free software licenses.
+
+## What do I need to get started?
+
+* GNU/Linux distro (Trisquel, *buntu, Fedora or others)
+* GNU GCC / GCC-C++
+* flex
+* gawk
+* ncurses-dev (ncurses5-devel, etc..)
+* libghc-zlib-dev
+* patch
+* perl5
+* subversion
+* git-core 
+
+## Building libreCMC
+
+1) Get the latest libreCMC source code:
+
+`git clone git://gitorious.org/librecmc/librecmc.git`
+`git clone http://gitboria.com/RISCi_ATOM/librecmc.git`
+
+or download v1.2.1 :
+
+[librecmc-v1.2.1.tar.bz2](http://downloads.librecmc.org/sources/v1.2.1/librecmc-v1.2.1.tar.bz2)
+
+2) Configure libreCMC for your device. 
+
+ `make menuconfig` 
+
+ When configuring libreCMC for your device, it is imperative that the right target and profile are selected. Currently, we only _officially_ support the AR71XX target and the TP-Link TL-MR3020 and Netgear WNDR3800. If you want other packages, please keep in mind that these devices don't have very much in terms of flash ROM and your selection of packages may not work properly. Generally, a good default configuration includes:
+
+
+ * luci : Collections -> luci  + luci -> protocols -> luci-proto-relayd
+ * Networking : wpa-cli + wpa-supplicant + iw
+ * Utilities : Editors -> Nano
+
+3) When done configuring, run:
+
+ `make`
+
+ If the build fails, type:
+
+ `make V=s`
+
+ if there are missing dependencies in your build environment, please install them and then run `make`.
+
+4) If the build exits without any errors, you should have a new image in:
+
+ `$SRC_ROOT/bin/$BUILD_TARGET/librecmc-$BUILD_TARGET-generic-$TARGET_PROFILE-$VERSION-$FS_TYPE-factory.bin`
+
+ Where `$BUILD_TARGET = target (ex. ar71xx)`, `$TARGET_PROFILE = device`, `$VERSION = device version (some don't any)`
+
+5) Flash the newly built image (if you are confident). libreCMC project is not responsible for bricked devices.
diff --git a/trunk/feeds.conf b/trunk/feeds.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/include/autotools.mk b/trunk/include/autotools.mk
new file mode 100644
index 00000000..7ebeff6c
--- /dev/null
+++ b/trunk/include/autotools.mk
@@ -0,0 +1,166 @@
+#
+# Copyright (C) 2007-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
+
+# delete *.la-files from staging_dir - we can not yet remove respective lines within all package
+# Makefiles, since backfire still uses libtool v1.5.x which (may) require those files
+define libtool_remove_files
+	find $(1) -name '*.la' | $(XARGS) rm -f;
+endef
+
+
+AM_TOOL_PATHS:= \
+	AUTOM4TE=$(STAGING_DIR_HOST)/bin/autom4te \
+	AUTOCONF=$(STAGING_DIR_HOST)/bin/autoconf \
+	AUTOMAKE=$(STAGING_DIR_HOST)/bin/automake \
+	ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
+	AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
+	LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \
+	LIBTOOL=$(STAGING_DIR_HOST)/bin/libtool \
+	M4=$(STAGING_DIR_HOST)/bin/m4 \
+	AUTOPOINT=true
+
+# 1: build dir
+# 2: remove files
+# 3: automake paths
+# 4: libtool paths
+# 5: extra m4 dirs
+define autoreconf
+	(cd $(1); \
+		$(patsubst %,rm -f %;,$(2)) \
+		$(foreach p,$(3), \
+			if [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
+				[ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
+				[ -e $(p)/config.rpath ] || \
+						ln -s $(SCRIPT_DIR)/config.rpath $(p)/config.rpath; \
+				touch NEWS AUTHORS COPYING ABOUT-NLS ChangeLog; \
+				$(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
+					$(if $(word 2,$(3)),--no-recursive) \
+					-B $(STAGING_DIR_HOST)/share/aclocal \
+					$(patsubst %,-I %,$(5)) \
+					$(patsubst %,-I %,$(4)) $(p) || true; \
+			fi; \
+		) \
+	);
+endef
+
+# 1: build dir
+define patch_libtool
+	@(cd $(1); \
+		for lt in $$$$($$(STAGING_DIR_HOST)/bin/find . -name ltmain.sh); do \
+			lt_version="$$$$($$(STAGING_DIR_HOST)/bin/sed -ne 's,^[[:space:]]*VERSION="\?\([0-9]\.[0-9]\+\).*,\1,p' $$$$lt)"; \
+			case "$$$$lt_version" in \
+				1.5|2.2|2.4) echo "autotools.mk: Found libtool v$$$$lt_version - applying patch to $$$$lt"; \
+					(cd $$$$(dirname $$$$lt) && $$(PATCH) -N -s -p1 < $$(TOPDIR)/tools/libtool/files/libtool-v$$$$lt_version.patch || true) ;; \
+				*) echo "autotools.mk: error: Unsupported libtool version v$$$$lt_version - cannot patch $$$$lt"; exit 1 ;; \
+			esac; \
+		done; \
+	);
+endef
+
+
+PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
+PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)
+PKG_MACRO_PATHS?=m4
+PKG_REMOVE_FILES?=aclocal.m4
+
+Hooks/InstallDev/Post += libtool_remove_files
+
+define autoreconf_target
+  $(strip $(call autoreconf, \
+    $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
+    $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \
+    $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
+endef
+
+define patch_libtool_target
+  $(strip $(call patch_libtool, \
+    $(PKG_BUILD_DIR)))
+endef
+
+define gettext_version_target
+  cd $(PKG_BUILD_DIR) && \
+  GETTEXT_VERSION=$(shell $(STAGING_DIR_HOST)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.* //p') && \
+  $(STAGING_DIR_HOST)/bin/sed \
+  -i $(PKG_BUILD_DIR)/configure.ac \
+  -e "s/AM_GNU_GETTEXT_VERSION(\[.*\])/AM_GNU_GETTEXT_VERSION(\[$$$$GETTEXT_VERSION\])/g" && \
+  $(STAGING_DIR_HOST)/bin/autopoint --force
+endef
+
+ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
+  Hooks/Configure/Pre += patch_libtool_target
+endif
+
+ifneq ($(filter libtool,$(PKG_FIXUP)),)
+  PKG_BUILD_DEPENDS += libtool libintl libiconv
+ ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
+  Hooks/Configure/Pre += autoreconf_target
+ endif
+endif
+
+ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
+  PKG_BUILD_DEPENDS += libtool libintl libiconv
+ ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
+  Hooks/Configure/Pre += autoreconf_target
+ endif
+endif
+
+ifneq ($(filter autoreconf,$(PKG_FIXUP)),)
+  ifeq ($(filter autoreconf,$(Hooks/Configure/Pre)),)
+    Hooks/Configure/Pre += autoreconf_target
+  endif
+endif
+
+ifneq ($(filter gettext-version,$(PKG_FIXUP)),)
+  Hooks/Configure/Pre += gettext_version_target
+endif
+
+
+HOST_FIXUP?=$(PKG_FIXUP)
+HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.)
+HOST_AUTOMAKE_PATHS?=$(if $(PKG_AUTOMAKE_PATHS),$(PKG_AUTOMAKE_PATHS),.)
+HOST_MACRO_PATHS?=$(if $(PKG_MACRO_PATHS),$(PKG_MACRO_PATHS),m4)
+HOST_REMOVE_FILES?=$(PKG_REMOVE_FILES)
+
+define autoreconf_host
+  $(strip $(call autoreconf, \
+    $(HOST_BUILD_DIR), $(HOST_REMOVE_FILES), \
+    $(HOST_AUTOMAKE_PATHS), $(HOST_LIBTOOL_PATHS), \
+    $(HOST_MACRO_PATHS)))
+endef
+
+define patch_libtool_host
+  $(strip $(call patch_libtool, \
+    $(HOST_BUILD_DIR)))
+endef
+
+ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
+  Hooks/HostConfigure/Pre += patch_libtool_host
+endif
+
+ifneq ($(filter patch-libtool,$(HOST_FIXUP)),)
+  Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR)))
+endif
+
+ifneq ($(filter libtool,$(HOST_FIXUP)),)
+ ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
+  Hooks/HostConfigure/Pre += autoreconf_host
+ endif
+endif
+
+ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),)
+ ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
+  Hooks/HostConfigure/Pre += autoreconf_host
+ endif
+endif
+
+ifneq ($(filter autoreconf,$(HOST_FIXUP)),)
+  ifeq ($(filter autoreconf,$(Hooks/HostConfigure/Pre)),)
+    Hooks/HostConfigure/Pre += autoreconf_host
+  endif
+endif
diff --git a/trunk/include/cmake.mk b/trunk/include/cmake.mk
new file mode 100644
index 00000000..91303dcf
--- /dev/null
+++ b/trunk/include/cmake.mk
@@ -0,0 +1,72 @@
+PKG_INSTALL:=1
+
+ifneq ($(findstring c,$(LIBRECMC_VERBOSE)),)
+  MAKE_FLAGS+=VERBOSE=1
+endif
+
+CMAKE_SOURCE_DIR:=.
+
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
+else
+  cmake_tool=$(shell which $(1))
+endif
+
+ifeq ($(CONFIG_CCACHE),)
+ CMAKE_C_COMPILER:=$(call cmake_tool,$(TARGET_CC))
+ CMAKE_CXX_COMPILER:=$(call cmake_tool,$(TARGET_CXX))
+ CMAKE_C_COMPILER_ARG1:=
+ CMAKE_CXX_COMPILER_ARG1:=
+else
+  CCACHE:=$(shell which ccache)
+  ifeq ($(CCACHE),)
+    CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
+  endif
+  CMAKE_C_COMPILER:=$(CCACHE)
+  CMAKE_C_COMPILER_ARG1:=$(TARGET_CC_NOCACHE)
+  CMAKE_CXX_COMPILER:=$(CCACHE)
+  CMAKE_CXX_COMPILER_ARG1:=$(TARGET_CXX_NOCACHE)
+endif
+CMAKE_AR:=$(call cmake_tool,$(TARGET_CROSS)ar)
+CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_CROSS)ranlib)
+
+define Build/Configure/Default
+	(cd $(PKG_BUILD_DIR); \
+		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
+		cmake \
+			-DCMAKE_SYSTEM_NAME=Linux \
+			-DCMAKE_SYSTEM_VERSION=1 \
+			-DCMAKE_SYSTEM_PROCESSOR=$(ARCH) \
+			-DCMAKE_BUILD_TYPE=Release \
+			-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
+			-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
+			-DCMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \
+			-DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
+			-DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
+			-DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
+			-DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+			-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+			-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+			-DCMAKE_AR="$(CMAKE_AR)" \
+			-DCMAKE_RANLIB="$(CMAKE_RANLIB)" \
+			-DCMAKE_FIND_ROOT_PATH="$(STAGING_DIR);$(TOOLCHAIN_DIR)" \
+			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \
+			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+			-DCMAKE_STRIP=: \
+			-DCMAKE_INSTALL_PREFIX=/usr \
+			-DDL_LIBRARY=$(STAGING_DIR) \
+			-DCMAKE_PREFIX_PATH=$(STAGING_DIR) \
+			$(CMAKE_OPTIONS) \
+		$(CMAKE_SOURCE_DIR) \
+	)
+endef
+
+define Build/InstallDev/cmake
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+Build/InstallDev = $(if $(CMAKE_INSTALL),$(Build/InstallDev/cmake))
diff --git a/trunk/include/debug.mk b/trunk/include/debug.mk
new file mode 100644
index 00000000..bec74d18
--- /dev/null
+++ b/trunk/include/debug.mk
@@ -0,0 +1,51 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# debug flags:
+#
+# d: show subdirectory tree
+# t: show added targets
+# l: show legacy targets
+# r: show autorebuild messages
+# v: verbose (no .SILENCE for common targets)
+
+ifeq ($(DUMP),)
+  ifeq ($(DEBUG),all)
+    build_debug:=dltvr
+  else
+    build_debug:=$(DEBUG)
+  endif
+endif
+
+ifneq ($(DEBUG),)
+
+define debug
+$$(findstring $(2),$$(if $$(DEBUG_SCOPE_DIR),$$(if $$(filter $$(DEBUG_SCOPE_DIR)%,$(1)),$(build_debug)),$(build_debug)))
+endef
+
+define warn
+$$(if $(call debug,$(1),$(2)),$$(warning $(3)))
+endef
+
+define debug_eval
+$$(if $(call debug,$(1),$(2)),$(3))
+endef
+
+define warn_eval
+$(call warn,$(1),$(2),$(3)	$(4))
+$(4)
+endef
+
+else
+
+debug:=
+warn:=
+debug_eval:=
+warn_eval = $(4)
+
+endif
+
diff --git a/trunk/include/depends.mk b/trunk/include/depends.mk
new file mode 100644
index 00000000..14cdcdf7
--- /dev/null
+++ b/trunk/include/depends.mk
@@ -0,0 +1,48 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# define a dependency on a subtree
+# parameters:
+#	1: directories/files
+#	2: directory dependency
+#	3: tempfile for file listings
+#	4: find options
+
+DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check" -x "*/.*.swp"
+
+find_md5=$(SH_FUNC) find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
+
+define rdep
+  .PRECIOUS: $(2)
+  .SILENT: $(2)_check
+
+  $(2): $(2)_check
+
+ifneq ($(wildcard $(2)),)
+  $(2)_check::
+	$(if $(3), \
+		$(call find_md5,$(1),$(4)) > $(3).1; \
+		{ [ \! -f "$(3)" ] || diff $(3) $(3).1 >/dev/null; } && \
+	) \
+	{ \
+		[ -f "$(2)_check.1" ] && mv "$(2)_check.1"; \
+	    $(TOPDIR)/scripts/timestamp.pl $(DEP_FINDPARAMS) $(4) -n $(2) $(1) && { \
+			$(call debug_eval,$(SUBDIR),r,echo "No need to rebuild $(2)";) \
+			touch -r "$(2)" "$(2)_check"; \
+		} \
+	} || { \
+		$(call debug_eval,$(SUBDIR),r,echo "Need to rebuild $(2)";) \
+		touch "$(2)_check"; \
+	}
+	$(if $(3), mv $(3).1 $(3))
+else
+  $(2)_check::
+	$(if $(3), rm -f $(3) $(3).1)
+	$(call debug_eval,$(SUBDIR),r,echo "Target $(2) not built")
+endif
+
+endef
+
diff --git a/trunk/include/device_table.txt b/trunk/include/device_table.txt
new file mode 100644
index 00000000..f9f167d6
--- /dev/null
+++ b/trunk/include/device_table.txt
@@ -0,0 +1,5 @@
+# minimal device table file for libreCMC
+
+#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
+/dev		d	755	0	0	-	-	-	-	-
+/dev/console	c	600	0	0	5	1	0	0	-
diff --git a/trunk/include/download.mk b/trunk/include/download.mk
new file mode 100644
index 00000000..adaa2e6a
--- /dev/null
+++ b/trunk/include/download.mk
@@ -0,0 +1,184 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
+
+# Try to guess the download method from the URL
+define dl_method
+$(strip \
+  $(if $(2),$(2), \
+    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
+      $(if $(filter git://%,$(1)),git, \
+        $(if $(filter svn://%,$(1)),svn, \
+          $(if $(filter cvs://%,$(1)),cvs, \
+            $(if $(filter hg://%,$(1)),hg, \
+              $(if $(filter sftp://%,$(1)),bzr, \
+                unknown \
+              ) \
+            ) \
+          ) \
+        ) \
+      ) \
+    ) \
+  ) \
+)
+endef
+
+# code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support
+dl_pack/bz2=$(TAR) cjf $(1) $(2)
+dl_pack/gz=$(TAR) czf $(1) $(2)
+dl_pack/xz=$(TAR) c $(2) | xz -zc > $(1)
+dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
+define dl_pack
+	$(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown))
+endef
+
+define DownloadMethod/unknown
+	@echo "ERROR: No download method available"; false
+endef
+
+define DownloadMethod/default
+	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" $(foreach url,$(URL),"$(url)")
+endef
+
+define wrap_mirror
+	$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" || ( $(1) ),$(1))
+endef
+
+define DownloadMethod/cvs
+	$(call wrap_mirror, \
+		echo "Checking out files from the cvs repository..."; \
+		mkdir -p $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
+		rm -rf $(SUBDIR) && \
+		[ \! -d $(SUBDIR) ] && \
+		cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
+		echo "Packing checkout..." && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+		rm -rf $(SUBDIR); \
+	)
+endef
+
+define DownloadMethod/svn
+	$(call wrap_mirror, \
+		echo "Checking out files from the svn repository..."; \
+		mkdir -p $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
+		rm -rf $(SUBDIR) && \
+		[ \! -d $(SUBDIR) ] && \
+		( svn help export | grep -q trust-server-cert && \
+		svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
+		svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
+		echo "Packing checkout..." && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+		rm -rf $(SUBDIR); \
+	)
+endef
+
+define DownloadMethod/git
+	$(call wrap_mirror, \
+		echo "Checking out files from the git repository..."; \
+		mkdir -p $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
+		rm -rf $(SUBDIR) && \
+		[ \! -d $(SUBDIR) ] && \
+		git clone $(URL) $(SUBDIR) --recursive && \
+		(cd $(SUBDIR) && git checkout $(VERSION) && git submodule update) && \
+		echo "Packing checkout..." && \
+		rm -rf $(SUBDIR)/.git && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+		rm -rf $(SUBDIR); \
+	)
+endef
+
+define DownloadMethod/bzr
+	$(call wrap_mirror, \
+		echo "Checking out files from the bzr repository..."; \
+		mkdir -p $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
+		rm -rf $(SUBDIR) && \
+		[ \! -d $(SUBDIR) ] && \
+		bzr export -r$(VERSION) $(SUBDIR) $(URL) && \
+		echo "Packing checkout..." && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+		rm -rf $(SUBDIR); \
+	)
+endef
+
+define DownloadMethod/hg
+	$(call wrap_mirror, \
+		echo "Checking out files from the hg repository..."; \
+		mkdir -p $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
+		rm -rf $(SUBDIR) && \
+		[ \! -d $(SUBDIR) ] && \
+		hg clone -r $(VERSION) $(URL) $(SUBDIR) && \
+		find $(SUBDIR) -name .hg | xargs rm -rf && \
+		echo "Packing checkout..." && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+		rm -rf $(SUBDIR); \
+	)
+endef
+
+define DownloadMethod/darcs
+	$(call wrap_mirror, \
+		echo "Checking out files from the darcs repository..."; \
+		mkdir -p $(TMP_DIR)/dl && \
+		cd $(TMP_DIR)/dl && \
+		rm -rf $(SUBDIR) && \
+		[ \! -d $(SUBDIR) ] && \
+		darcs get -t $(VERSION) $(URL) $(SUBDIR) && \
+		find $(SUBDIR) -name _darcs | xargs rm -rf && \
+		echo "Packing checkout..." && \
+		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+		rm -rf $(SUBDIR); \
+	)
+endef
+
+Validate/cvs=VERSION SUBDIR
+Validate/svn=VERSION SUBDIR
+Validate/git=VERSION SUBDIR
+Validate/bzr=VERSION SUBDIR
+Validate/hg=VERSION SUBDIR
+Validate/darcs=VERSION SUBDIR
+
+define Download/Defaults
+  URL:=
+  FILE:=
+  PROTO:=
+  MD5SUM:=
+  SUBDIR:=
+  MIRROR:=1
+  MIRROR_MD5SUM:=x
+  VERSION:=
+endef
+
+define Download
+  $(eval $(Download/Defaults))
+  $(eval $(Download/$(1)))
+  $(foreach FIELD,URL FILE $(Validate/$(call dl_method,$(URL),$(PROTO))),
+    ifeq ($($(FIELD)),)
+      $$(error Download/$(1) is missing the $(FIELD) field.)
+    endif
+  )
+
+  $(foreach dep,$(DOWNLOAD_RDEP),
+    $(dep): $(DL_DIR)/$(FILE)
+  )
+  download: $(DL_DIR)/$(FILE)
+
+  $(DL_DIR)/$(FILE):
+	mkdir -p $(DL_DIR)
+	$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown))
+
+endef
diff --git a/trunk/include/feeds.mk b/trunk/include/feeds.mk
new file mode 100644
index 00000000..695b03b1
--- /dev/null
+++ b/trunk/include/feeds.mk
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+-include $(TMP_DIR)/.packagefeeds
+
+FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n)
+FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
+FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed)))
+FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))
+
+PKG_CONFIG_DEPENDS += \
+	CONFIG_PER_FEED_REPO \
+	CONFIG_PER_FEED_REPO_ADD_DISABLED \
+	CONFIG_PER_FEED_REPO_ADD_COMMENTED \
+	$(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
+
+# 1: package name
+define FeedPackageDir
+$(strip $(if $(CONFIG_PER_FEED_REPO), \
+  $(abspath $(PACKAGE_DIR)/$(if $(Package/$(1)/feed),$(Package/$(1)/feed),base)), \
+  $(PACKAGE_DIR)))
+endef
diff --git a/trunk/include/host-build.mk b/trunk/include/host-build.mk
new file mode 100644
index 00000000..126671a0
--- /dev/null
+++ b/trunk/include/host-build.mk
@@ -0,0 +1,205 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
+HOST_BUILD_PARALLEL ?=
+
+ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
+  HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
+else
+  HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
+endif
+
+ifeq ($(strip $(HOST_BUILD_PARALLEL)),0)
+HOST_JOBS?=-j1
+else
+HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\
+	$(if $(CONFIG_PKG_BUILD_PARALLEL),$(HOST_MAKE_J),-j1),-j1)
+endif
+
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/depends.mk
+
+BUILD_TYPES += host
+HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))
+HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
+HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
+HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
+
+override MAKEFLAGS=
+
+include $(INCLUDE_DIR)/download.mk
+include $(INCLUDE_DIR)/quilt.mk
+include $(INCLUDE_DIR)/autotools.mk
+
+Host/Patch:=$(Host/Patch/Default)
+ifneq ($(strip $(HOST_UNPACK)),)
+  define Host/Prepare/Default
+	$(HOST_UNPACK)
+	$(Host/Patch)
+  endef
+endif
+
+define Host/Prepare
+  $(call Host/Prepare/Default)
+endef
+
+HOST_CONFIGURE_VARS = \
+	CC="$(HOSTCC)" \
+	CFLAGS="$(HOST_CFLAGS)" \
+	CPPFLAGS="$(HOST_CPPFLAGS)" \
+	LDFLAGS="$(HOST_LDFLAGS)" \
+	SHELL="$(BASH)"
+
+HOST_CONFIGURE_ARGS = \
+	--target=$(GNU_HOST_NAME) \
+	--host=$(GNU_HOST_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--program-prefix="" \
+	--program-suffix="" \
+	--prefix=$(STAGING_DIR_HOST) \
+	--exec-prefix=$(STAGING_DIR_HOST) \
+	--sysconfdir=$(STAGING_DIR_HOST)/etc \
+	--localstatedir=$(STAGING_DIR_HOST)/var \
+	--sbindir=$(STAGING_DIR_HOST)/bin
+
+HOST_MAKE_FLAGS =
+
+HOST_CONFIGURE_CMD = $(BASH) ./configure
+
+ifneq ($(HOST_OS),Darwin)
+  ifeq ($(CONFIG_BUILD_STATIC_TOOLS),y)
+    HOST_STATIC_LINKING = -static
+  endif
+endif
+
+define Host/Configure/Default
+	$(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \
+		if [ -x configure ]; then \
+			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
+			$(2) \
+			$(HOST_CONFIGURE_CMD) \
+			$(HOST_CONFIGURE_VARS) \
+			$(HOST_CONFIGURE_ARGS) \
+			$(1); \
+		fi \
+	)
+endef
+
+define Host/Configure
+  $(call Host/Configure/Default)
+endef
+
+define Host/Compile/Default
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+		$(HOST_MAKE_FLAGS) \
+		$(1)
+endef
+
+define Host/Compile
+  $(call Host/Compile/Default)
+endef
+
+define Host/Install/Default
+	$(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install
+endef
+
+define Host/Install
+  $(call Host/Install/Default)
+endef
+
+
+ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
+  define HostHost/Autoclean
+    $(call rdep,${CURDIR} $(PKG_FILE_DEPENDS),$(HOST_STAMP_PREPARED))
+    $(if $(if $(Host/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(HOST_BUILD_DIR),$(HOST_STAMP_BUILT)))
+  endef
+endif
+
+define Download/default
+  FILE:=$(PKG_SOURCE)
+  URL:=$(PKG_SOURCE_URL)
+  PROTO:=$(PKG_SOURCE_PROTO)
+  SUBDIR:=$(PKG_SOURCE_SUBDIR)
+  VERSION:=$(PKG_SOURCE_VERSION)
+  MD5SUM:=$(PKG_MD5SUM)
+  MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM)
+endef
+
+define Host/Exports/Default
+  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-*),-I $$(p))
+  $(1) : export STAGING_PREFIX=$$(STAGING_DIR_HOST)
+  $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig
+  $(1) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR_HOST)/lib/pkgconfig
+endef
+Host/Exports=$(Host/Exports/Default)
+
+.NOTPARALLEL:
+
+ifndef DUMP
+  define HostBuild
+  $(if $(HOST_QUILT),$(Host/Quilt))
+  $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
+  $(if $(DUMP),,$(call HostHost/Autoclean))
+
+  $(HOST_STAMP_PREPARED):
+	@-rm -rf $(HOST_BUILD_DIR)
+	@mkdir -p $(HOST_BUILD_DIR)
+	$(foreach hook,$(Hooks/HostPrepare/Pre),$(call $(hook))$(sep))
+	$(call Host/Prepare)
+	$(foreach hook,$(Hooks/HostPrepare/Post),$(call $(hook))$(sep))
+	touch $$@
+
+  $(call Host/Exports,$(HOST_STAMP_CONFIGURED))
+  $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED)
+	$(foreach hook,$(Hooks/HostConfigure/Pre),$(call $(hook))$(sep))
+	$(call Host/Configure)
+	$(foreach hook,$(Hooks/HostConfigure/Post),$(call $(hook))$(sep))
+	touch $$@
+
+  $(call Host/Exports,$(HOST_STAMP_BUILT))
+  $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+		$(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep))
+		$(call Host/Compile)
+		$(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))
+		touch $$@
+
+  $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
+		$(call Host/Install)
+		$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
+		mkdir -p $$(shell dirname $$@)
+		touch $$@
+
+  ifndef STAMP_BUILT
+    prepare: host-prepare
+    compile: host-compile
+    install: host-install
+    clean: host-clean
+    update: host-update
+    refresh: host-refresh
+  endif
+
+  host-prepare: $(HOST_STAMP_PREPARED)
+  host-configure: $(HOST_STAMP_CONFIGURED)
+  host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED))
+  host-install: $(HOST_STAMP_INSTALLED)
+  host-clean: FORCE
+	$(call Host/Clean)
+	$(call Host/Uninstall)
+	rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT)
+
+  endef
+
+  download:
+  prepare:
+  compile:
+  install:
+  clean:
+
+endif
diff --git a/trunk/include/host.mk b/trunk/include/host.mk
new file mode 100644
index 00000000..000fb189
--- /dev/null
+++ b/trunk/include/host.mk
@@ -0,0 +1,65 @@
+# 
+# Copyright (C) 2007-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+TMP_DIR ?= $(TOPDIR)/tmp
+ifeq ($(if $(TARGET_BUILD),,$(DUMP)),)
+  -include $(TMP_DIR)/.host.mk
+endif
+
+export TAR FIND
+
+ifneq ($(__host_inc),1)
+__host_inc:=1
+
+try-run = $(shell set -e; \
+	TMP_F="$(TMP_DIR)/try-run.$$$$.tmp"; \
+	if ($(1)) >/dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi; \
+	rm -f "$$TMP_F"; \
+)
+
+host-cc-option = $(call try-run, \
+	$(HOSTCC) $(HOST_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP_F",$(1),$(2) \
+)
+
+.PRECIOUS: $(TMP_DIR)/.host.mk
+$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
+	@mkdir -p $(TMP_DIR)
+	@( \
+		HOST_OS=`uname`; \
+		case "$$HOST_OS" in \
+			Linux) HOST_ARCH=`uname -m`;; \
+			Darwin) HOST_ARCH=`uname -m`;; \
+			*) HOST_ARCH=`uname -p`;; \
+		esac; \
+		GNU_HOST_NAME=`gcc -dumpmachine`; \
+		[ -z "$$GNU_HOST_NAME" -o "$$HOST_OS" = "Darwin" ] && \
+			GNU_HOST_NAME=`$(TOPDIR)/scripts/config.guess`; \
+		echo "HOST_OS:=$$HOST_OS" > $@; \
+		echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
+		echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
+		TAR=`which gtar 2>/dev/null`; \
+		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which gnutar 2>/dev/null`; \
+		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
+		echo "TAR:=$$TAR" >> $@; \
+		FIND=`which gfind 2>/dev/null`; \
+		[ -n "$$FIND" -a -x "$$FIND" ] || FIND=`which find 2>/dev/null`; \
+		echo "FIND:=$$FIND" >> $@; \
+		echo "BASH:=$(shell which bash)" >> $@; \
+		if $$FIND -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \
+			echo "FIND_L=$$FIND -L \$$(1)" >>$@; \
+		else \
+			echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \
+		fi; \
+		PATCH=`which gpatch 2>/dev/null`; \
+		[ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \
+		echo "PATCH:=$$PATCH" >> $@; \
+		PYTHON=`which python2.7 2>/dev/null`; \
+		[ -n "$$PYTHON" -a -x "$$PYTHON" ] || PYTHON=`which python 2>/dev/null`; \
+		echo "PYTHON:=$$PYTHON" >> $@; \
+	)
+
+endif
diff --git a/trunk/include/image.mk b/trunk/include/image.mk
new file mode 100644
index 00000000..4f37ce0e
--- /dev/null
+++ b/trunk/include/image.mk
@@ -0,0 +1,289 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+override TARGET_BUILD=
+include $(INCLUDE_DIR)/prereq.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/host.mk
+
+override MAKE:=$(_SINGLE)$(SUBMAKE)
+override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
+
+KDIR=$(KERNEL_BUILD_DIR)
+DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/
+
+IMG_PREFIX:=librecmc-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
+
+MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt
+
+ifneq ($(CONFIG_BIG_ENDIAN),)
+  JFFS2OPTS     :=  --big-endian --squash-uids -v
+else
+  JFFS2OPTS     :=  --little-endian --squash-uids -v
+endif
+
+ifeq ($(CONFIG_JFFS2_RTIME),y)
+  JFFS2OPTS += -X rtime
+endif
+ifeq ($(CONFIG_JFFS2_ZLIB),y)
+  JFFS2OPTS += -X zlib
+endif
+ifeq ($(CONFIG_JFFS2_LZMA),y)
+  JFFS2OPTS += -X lzma --compression-mode=size
+endif
+ifneq ($(CONFIG_JFFS2_RTIME),y)
+  JFFS2OPTS += -x rtime
+endif
+ifneq ($(CONFIG_JFFS2_ZLIB),y)
+  JFFS2OPTS += -x zlib
+endif
+ifneq ($(CONFIG_JFFS2_LZMA),y)
+  JFFS2OPTS += -x lzma
+endif
+
+JFFS2OPTS += $(MKFS_DEVTABLE_OPT)
+
+SQUASHFS_BLOCKSIZE := $(CONFIG_TARGET_SQUASHFS_BLOCK_SIZE)k
+SQUASHFSOPT := -b $(SQUASHFS_BLOCKSIZE)
+SQUASHFSOPT += -p '/dev d 755 0 0' -p '/dev/console c 600 0 0 5 1'
+SQUASHFSCOMP := gzip
+LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
+ifeq ($(CONFIG_SQUASHFS_LZMA),y)
+  SQUASHFSCOMP := lzma $(LZMA_XZ_OPTIONS)
+endif
+ifeq ($(CONFIG_SQUASHFS_XZ),y)
+  ifneq ($(filter arm x86 powerpc sparc,$(LINUX_KARCH)),)
+    BCJ_FILTER:=-Xbcj $(LINUX_KARCH)
+  endif
+  SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS) $(BCJ_FILTER)
+endif
+
+JFFS2_BLOCKSIZE ?= 64k 128k
+
+fs-types-$(CONFIG_TARGET_ROOTFS_SQUASHFS) += squashfs
+fs-types-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addprefix jffs2-,$(JFFS2_BLOCKSIZE))
+fs-types-$(CONFIG_TARGET_ROOTFS_JFFS2_NAND) += $(addprefix jffs2-nand-,$(NAND_BLOCKSIZE))
+fs-types-$(CONFIG_TARGET_ROOTFS_EXT4FS) += ext4
+fs-types-$(CONFIG_TARGET_ROOTFS_ISO) += iso
+fs-subtypes-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addsuffix -raw,$(addprefix jffs2-,$(JFFS2_BLOCKSIZE)))
+fs-subtypes-$(CONFIG_TARGET_ROOTFS_CPIOGZ) += cpiogz
+fs-subtypes-$(CONFIG_TARGET_ROOTFS_TARGZ) += targz
+
+TARGET_FILESYSTEMS := $(fs-types-y)
+
+define add_jffs2_mark
+	echo -ne '\xde\xad\xc0\xde' >> $(1)
+endef
+
+define toupper
+$(shell echo $(1) | tr '[:lower:]' '[:upper:]')
+endef
+
+# pad to 4k, 8k, 16k, 64k, 128k, 256k and add jffs2 end-of-filesystem mark
+define prepare_generic_squashfs
+	$(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256
+endef
+
+define Image/BuildKernel/Initramfs
+	cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf
+	$(call Image/Build/Initramfs)
+endef
+
+define Image/BuildKernel/MkuImage
+	mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
+		-n '$(call toupper,$(ARCH)) libreCMC Linux-$(LINUX_VERSION)' -d $(4) $(5)
+endef
+
+define Image/BuildKernel/MkFIT
+	$(TOPDIR)/scripts/mkits.sh \
+		-D $(1) -o $(KDIR)/fit-$(1).its -k $(2) -d $(3) -C $(4) -a $(5) -e $(6) \
+		-A $(ARCH) -v $(LINUX_VERSION)
+	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(1).its $(KDIR)/fit-$(1)$(7).itb
+endef
+
+define Image/mkfs/jffs2/sub
+		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) --pad -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
+		$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(2))
+endef
+
+define Image/mkfs/jffs2/sub-raw
+		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2)-raw -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
+endef
+
+define Image/mkfs/jffs2/template
+  Image/mkfs/jffs2-$(1) = $$(call Image/mkfs/jffs2/sub,$(1),$(1),$(JFFS2OPTS))
+  Image/mkfs/jffs2-$(1)-raw = $$(call Image/mkfs/jffs2/sub-raw,$(1),$(1),$(JFFS2OPTS))
+
+endef
+
+define Image/mkfs/jffs2-nand/template
+  Image/mkfs/jffs2-nand-$(1) = \
+	$$(call Image/mkfs/jffs2/sub, \
+		$(word 2,$(subst -, ,$(1))),nand-$(1), \
+			$(JFFS2OPTS) --no-cleanmarkers --pagesize=$(word 1,$(subst -, ,$(1))))
+
+endef
+
+$(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
+$(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
+
+define Image/mkfs/squashfs
+	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
+endef
+
+# $(1): board name
+# $(2): rootfs type
+# $(3): kernel image
+ifneq ($(CONFIG_NAND_SUPPORT),)
+   define Image/Build/SysupgradeNAND
+	mkdir -p "$(KDIR_TMP)/sysupgrade-$(1)/"
+	echo "BOARD=$(1)" > "$(KDIR_TMP)/sysupgrade-$(1)/CONTROL"
+	[ -z "$(2)" ] || $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(1)/root"
+	[ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel"
+	(cd "$(KDIR_TMP)"; $(TAR) cvf \
+		"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
+   endef
+# $(1) board name
+# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage)
+# $(3) rootfstype (e.g. squashfs or ubifs)
+# $(4) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS)))
+   define Image/Build/UbinizeImage
+	sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \
+		"$(KDIR)/root.$(3)" \
+		"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
+		$(4)
+   endef
+
+endif
+
+ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
+    define Image/mkfs/ubifs/generate
+	$(CP) ./ubinize$(1).cfg $(KDIR)
+	( cd $(KDIR); \
+		$(STAGING_DIR_HOST)/bin/ubinize \
+		$(if $($(PROFILE)_UBI_OPTS), \
+			$(shell echo $($(PROFILE)_UBI_OPTS)), \
+			$(shell echo $(UBI_OPTS)) \
+		) \
+		-o $(KDIR)/root$(1).ubi \
+		ubinize$(1).cfg \
+	)
+    endef
+
+    define Image/mkfs/ubifs
+
+        ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),)
+		$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
+			$(if $($(PROFILE)_UBIFS_OPTS), \
+				$(shell echo $($(PROFILE)_UBIFS_OPTS)), \
+				$(shell echo $(UBIFS_OPTS)) \
+			) \
+			$(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
+			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \
+			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \
+			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \
+			$(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \
+			--squash-uids \
+			-o $(KDIR)/root.ubifs \
+			-d $(TARGET_DIR)
+        endif
+	$(call Image/Build,ubifs)
+
+        ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),)
+		$(call Image/mkfs/ubifs/generate,)
+		$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
+        endif
+	$(call Image/Build,ubi)
+    endef
+endif
+
+define Image/mkfs/cpiogz
+	( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz )
+endef
+
+define Image/mkfs/targz
+	$(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE),-$(PROFILE))-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+endef
+
+E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024/$(CONFIG_TARGET_EXT4_BLOCKSIZE))))
+
+define Image/mkfs/ext4
+# generate an ext2 fs
+	$(STAGING_DIR_HOST)/bin/genext2fs -U -B $(CONFIG_TARGET_EXT4_BLOCKSIZE) -b $(E2SIZE) -N $(CONFIG_TARGET_EXT4_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 -m $(CONFIG_TARGET_EXT4_RESERVED_PCT) $(MKFS_DEVTABLE_OPT)
+# convert it to ext4
+	$(STAGING_DIR_HOST)/bin/tune2fs $(if $(CONFIG_TARGET_EXT4_JOURNAL),-j) -O extents,uninit_bg,dir_index $(KDIR)/root.ext4
+# fix it up
+	$(STAGING_DIR_HOST)/bin/e2fsck -fy $(KDIR)/root.ext4
+endef
+
+define Image/mkfs/prepare/default
+	# Use symbolic permissions to avoid clobbering SUID/SGID/sticky bits
+	- $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -not -name 'shadow' -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r
+	- $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
+	- $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
+	$(INSTALL_DIR) $(TARGET_DIR)/tmp $(TARGET_DIR)/overlay
+	chmod 1777 $(TARGET_DIR)/tmp
+endef
+
+define Image/mkfs/prepare
+	$(call Image/mkfs/prepare/default)
+endef
+
+
+define Image/Checksum
+	( cd ${BIN_DIR} ; \
+		$(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | sort | xargs \
+		md5sum --binary > md5sums \
+	)
+endef
+
+define BuildImage/mkfs
+  install: mkfs-$(1)
+  .PHONY: mkfs-$(1)
+  mkfs-$(1): mkfs_prepare
+	$(Image/mkfs/$(1))
+
+endef
+
+define BuildImage
+
+  download:
+  prepare:
+  compile:
+  clean:
+  image_prepare:
+
+  ifeq ($(IB),)
+    .PHONY: download prepare compile clean image_prepare mkfs_prepare kernel_prepare install
+    compile:
+		$(call Build/Compile)
+
+    clean:
+		$(call Build/Clean)
+
+    image_prepare: compile
+		$(call Image/Prepare)
+  endif
+
+  mkfs_prepare: image_prepare
+	$(call Image/mkfs/prepare)
+
+  kernel_prepare: mkfs_prepare
+	$(call Image/BuildKernel)
+	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs))
+	$(call Image/InstallKernel)
+
+  $(foreach fs,$(TARGET_FILESYSTEMS) $(fs-subtypes-y),$(call BuildImage/mkfs,$(fs)))
+
+  install: kernel_prepare
+	$(foreach fs,$(TARGET_FILESYSTEMS),
+		$(call Image/Build,$(fs))
+	)
+	$(call Image/mkfs/ubifs)
+	$(call Image/Checksum)
+
+endef
diff --git a/trunk/include/kernel-build.mk b/trunk/include/kernel-build.mk
new file mode 100644
index 00000000..41ae0caa
--- /dev/null
+++ b/trunk/include/kernel-build.mk
@@ -0,0 +1,144 @@
+#
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/prereq.mk
+
+ifneq ($(DUMP),1)
+  all: compile
+endif
+
+export QUILT=1
+STAMP_PREPARED:=$(LINUX_DIR)/.prepared
+STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
+include $(INCLUDE_DIR)/download.mk
+include $(INCLUDE_DIR)/quilt.mk
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+define Kernel/Prepare
+	$(call Kernel/Prepare/Default)
+endef
+
+define Kernel/Configure
+	$(call Kernel/Configure/Default)
+endef
+
+define Kernel/CompileModules
+	$(call Kernel/CompileModules/Default)
+endef
+
+define Kernel/CompileImage
+	$(call Kernel/CompileImage/Default)
+	$(call Kernel/CompileImage/Initramfs)
+endef
+
+define Kernel/Clean
+	$(call Kernel/Clean/Default)
+endef
+
+define Download/kernel
+  URL:=$(LINUX_SITE)
+  FILE:=$(LINUX_SOURCE)
+  MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+endef
+
+ifdef CONFIG_COLLECT_KERNEL_DEBUG
+  define Kernel/CollectDebug
+	rm -rf $(KERNEL_BUILD_DIR)/debug
+	mkdir -p $(KERNEL_BUILD_DIR)/debug/modules
+	$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/debug/
+	-$(CP) \
+		$(STAGING_DIR_ROOT)/lib/modules/$(LINUX_VERSION)-gnu/* \
+		$(KERNEL_BUILD_DIR)/debug/modules/
+	$(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug
+	$(TAR) c -C $(KERNEL_BUILD_DIR) debug | bzip2 -c -9 > $(BIN_DIR)/kernel-debug.tar.bz2
+  endef
+endif
+
+define BuildKernel
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(LINUX_SITE),$(call Download,kernel))
+
+  .NOTPARALLEL:
+
+  $(STAMP_PREPARED): $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
+	-rm -rf $(KERNEL_BUILD_DIR)
+	-mkdir -p $(KERNEL_BUILD_DIR)
+	$(Kernel/Prepare)
+	touch $$@
+
+  $(KERNEL_BUILD_DIR)/symtab.h: FORCE
+	rm -f $(KERNEL_BUILD_DIR)/symtab.h
+	touch $(KERNEL_BUILD_DIR)/symtab.h
+	+$(MAKE) $(KERNEL_MAKEOPTS) vmlinux
+	find $(LINUX_DIR) $(STAGING_DIR_ROOT)/lib/modules -name \*.ko | \
+		xargs $(TARGET_CROSS)nm | \
+		awk '$$$$1 == "U" { print $$$$2 } ' | \
+		sort -u > $(KERNEL_BUILD_DIR)/mod_symtab.txt
+	$(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | grep ' [rR] __ksymtab' | sed -e 's,........ [rR] __ksymtab_,,' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt
+	grep -Ff $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_include.txt
+	grep -Fvf $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_exclude.txt
+	( \
+		echo '#define SYMTAB_KEEP \'; \
+		cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
+			awk '{print "KEEP(*(___ksymtab+" $$$$1 ")) \\" }'; \
+		echo; \
+		echo '#define SYMTAB_KEEP_GPL \'; \
+		cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
+			awk '{print "KEEP(*(___ksymtab_gpl+" $$$$1 ")) \\" }'; \
+		echo; \
+		echo '#define SYMTAB_DISCARD \'; \
+		cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
+			awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \
+		echo; \
+		echo '#define SYMTAB_DISCARD_GPL \'; \
+		cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
+			awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \
+		echo; \
+	) > $$@
+
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config
+	$(Kernel/Configure)
+	touch $$@
+
+  $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
+	$(Kernel/CompileModules)
+	touch $$@
+
+  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) $(if $(CONFIG_STRIP_KERNEL_EXPORTS),$(KERNEL_BUILD_DIR)/symtab.h) FORCE
+	$(Kernel/CompileImage)
+	$(Kernel/CollectDebug)
+	touch $$@
+	
+  mostlyclean: FORCE
+	$(Kernel/Clean)
+
+  define BuildKernel
+  endef
+
+  download: $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
+  prepare: $(STAMP_CONFIGURED)
+  compile: $(LINUX_DIR)/.modules
+	$(MAKE) -C image compile TARGET_BUILD=
+
+  oldconfig menuconfig nconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE
+	rm -f $(STAMP_CONFIGURED)
+	$(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config
+	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
+	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET)
+
+  install: $(LINUX_DIR)/.image
+	+$(MAKE) -C image compile install TARGET_BUILD=
+
+  clean: FORCE
+	rm -rf $(KERNEL_BUILD_DIR)
+
+  image-prereq:
+	@+$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=
+
+  prereq: image-prereq
+
+endef
diff --git a/trunk/include/kernel-defaults.mk b/trunk/include/kernel-defaults.mk
new file mode 100644
index 00000000..03420a23
--- /dev/null
+++ b/trunk/include/kernel-defaults.mk
@@ -0,0 +1,174 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
+	HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
+	CROSS_COMPILE="$(KERNEL_CROSS)" \
+	ARCH="$(LINUX_KARCH)" \
+	KBUILD_HAVE_NLS=no \
+	CONFIG_SHELL="$(BASH)" \
+	$(if $(findstring c,$(LIBRECMC_VERBOSE)),V=1,V='')
+
+ifdef CONFIG_STRIP_KERNEL_EXPORTS
+  KERNEL_MAKEOPTS += \
+	EXTRA_LDSFLAGS="-I$(KERNEL_BUILD_DIR) -include symtab.h"
+endif
+
+INITRAMFS_EXTRA_FILES ?= $(GENERIC_PLATFORM_DIR)/image/initramfs-base-files.txt
+
+ifneq (,$(KERNEL_CC))
+  KERNEL_MAKEOPTS += CC="$(KERNEL_CC)"
+endif
+
+ifdef CONFIG_USE_SPARSE
+  KERNEL_MAKEOPTS += C=1 CHECK=$(STAGING_DIR_HOST)/bin/sparse
+endif
+
+export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
+
+# defined in quilt.mk
+Kernel/Patch:=$(Kernel/Patch/Default)
+
+KERNEL_GIT_OPTS:=
+ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"")
+  KERNEL_GIT_OPTS+=--reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)
+endif
+
+ifneq ($(strip $(CONFIG_KERNEL_GIT_BRANCH)),"")
+  KERNEL_GIT_OPTS+=--branch $(CONFIG_KERNEL_GIT_BRANCH)
+endif
+
+ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
+  ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
+    define Kernel/Prepare/Default
+	xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
+	$(Kernel/Patch)
+	touch $(LINUX_DIR)/.quilt_used
+    endef
+  else
+    define Kernel/Prepare/Default
+	git clone $(KERNEL_GIT_OPTS) $(CONFIG_KERNEL_GIT_CLONE_URI) $(LINUX_DIR)
+    endef
+  endif
+else
+  define Kernel/Prepare/Default
+	mkdir -p $(KERNEL_BUILD_DIR)
+	if [ -d $(LINUX_DIR) ]; then \
+		rmdir $(LINUX_DIR); \
+	fi
+	ln -s $(CONFIG_EXTERNAL_KERNEL_TREE) $(LINUX_DIR)
+  endef
+endif
+
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+  ifeq ($(strip $(CONFIG_EXTERNAL_CPIO)),"")
+    define Kernel/SetInitramfs/PreConfigure
+	grep -v -e INITRAMFS -e CONFIG_RD_ -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+	echo 'CONFIG_BLK_DEV_INITRD=y' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_SOURCE="$(strip $(TARGET_DIR) $(INITRAMFS_EXTRA_FILES))"' >> $(LINUX_DIR)/.config
+    endef
+  else
+    define Kernel/SetInitramfs/PreConfigure
+	grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_SOURCE="$(call qstrip,$(CONFIG_EXTERNAL_CPIO))"' >> $(LINUX_DIR)/.config
+    endef
+  endif
+
+  define Kernel/SetInitramfs
+	mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+	$(call Kernel/SetInitramfs/PreConfigure)
+	echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config
+	echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),CONFIG_INITRAMFS_COMPRESSION_BZIP2=y\nCONFIG_RD_BZIP2=y,# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set\n# CONFIG_RD_BZIP2 is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA),CONFIG_INITRAMFS_COMPRESSION_LZMA=y\nCONFIG_RD_LZMA=y,# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set\n# CONFIG_RD_LZMA is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),CONFIG_INITRAMFS_COMPRESSION_LZO=y\nCONFIG_RD_LZO=y,# CONFIG_INITRAMFS_COMPRESSION_LZO is not set\n# CONFIG_RD_LZO is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ),CONFIG_INITRAMFS_COMPRESSION_XZ=y\nCONFIG_RD_XZ=y,# CONFIG_INITRAMFS_COMPRESSION_XZ is not set\n# CONFIG_RD_XZ is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),CONFIG_INITRAMFS_COMPRESSION_LZ4=y\nCONFIG_RD_LZ4=y,# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set\n# CONFIG_RD_LZ4 is not set)" >> $(LINUX_DIR)/.config
+  endef
+else
+endif
+
+define Kernel/SetNoInitramfs
+	mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+	grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+endef
+
+define Kernel/Configure/Default
+	$(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target
+# copy CONFIG_KERNEL_* settings over to .config.target
+	awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target
+	echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
+	echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
+	echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
+	echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target
+	$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
+	$(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
+	$(call Kernel/SetNoInitramfs)
+	rm -rf $(KERNEL_BUILD_DIR)/modules
+	$(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
+	$(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
+endef
+
+define Kernel/Configure/Initramfs
+	$(call Kernel/SetInitramfs)
+endef
+
+define Kernel/CompileModules/Default
+	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
+	+$(MAKE) $(KERNEL_MAKEOPTS) modules
+endef
+
+OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
+
+# AVR32 uses a non-standard location
+ifeq ($(LINUX_KARCH),avr32)
+IMAGES_DIR:=images
+endif
+
+# AMD64 shares the location with x86
+ifeq ($(LINUX_KARCH),x86_64)
+IMAGES_DIR:=../../x86/boot
+endif
+
+define Kernel/CopyImage
+	$(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)$(1)
+	$(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).elf
+	$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.debug
+ifneq ($(KERNELNAME),)
+	$(foreach k,$(filter-out dtbs,$(KERNELNAME)),$(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1);)
+endif
+endef
+
+define Kernel/CompileImage/Default
+	rm -f $(TARGET_DIR)/init
+	+$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules
+	$(call Kernel/CopyImage)
+endef
+
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+define Kernel/CompileImage/Initramfs
+	$(call Kernel/Configure/Initramfs)
+	$(CP) $(GENERIC_PLATFORM_DIR)/base-files/init $(TARGET_DIR)/init
+	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
+	+$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules
+	$(call Kernel/CopyImage,-initramfs)
+endef
+else
+define Kernel/CompileImage/Initramfs
+endef
+endif
+
+define Kernel/Clean/Default
+	rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.configured
+	rm -f $(LINUX_KERNEL)
+	$(_SINGLE)$(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
+endef
+
+
diff --git a/trunk/include/kernel-version.mk b/trunk/include/kernel-version.mk
new file mode 100644
index 00000000..73a7a8e4
--- /dev/null
+++ b/trunk/include/kernel-version.mk
@@ -0,0 +1,25 @@
+# Use the default kernel version if the Makefile doesn't override it
+
+LINUX_RELEASE?=1
+
+LINUX_VERSION-3.10 = .58
+LINUX_VERSION-3.14 = .26
+LINUX_VERSION-3.18 =
+
+LINUX_KERNEL_MD5SUM-3.10.58 = bca8cde0dddf27d980fe1d393ea743f7
+LINUX_KERNEL_MD5SUM-3.14.26 = 69b27733f335c557946edd58554debb7
+LINUX_KERNEL_MD5SUM-3.18    = 9e854df51ca3fef8bfe566dbd7b89241
+
+ifdef KERNEL_PATCHVER
+  LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
+endif
+
+split_version=$(subst ., ,$(1))
+merge_version=$(subst $(space),.,$(1))
+KERNEL_BASE=$(firstword $(subst -, ,$(LINUX_VERSION)))
+KERNEL=$(call merge_version,$(wordlist 1,2,$(call split_version,$(KERNEL_BASE))))
+KERNEL_PATCHVER ?= $(KERNEL)
+
+# disable the md5sum check for unknown kernel versions
+LINUX_KERNEL_MD5SUM:=$(LINUX_KERNEL_MD5SUM-$(strip $(LINUX_VERSION)))
+LINUX_KERNEL_MD5SUM?=x
diff --git a/trunk/include/kernel.mk b/trunk/include/kernel.mk
new file mode 100644
index 00000000..8a5d8972
--- /dev/null
+++ b/trunk/include/kernel.mk
@@ -0,0 +1,231 @@
+# 
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifeq ($(__target_inc),)
+  include $(INCLUDE_DIR)/target.mk
+endif
+
+ifeq ($(DUMP),1)
+  KERNEL?=<KERNEL>
+  BOARD?=<BOARD>
+  LINUX_VERSION?=<LINUX_VERSION>
+  LINUX_VERMAGIC?=<LINUX_VERMAGIC>
+else
+  ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+    export GCC_HONOUR_COPTS=s
+  endif
+
+  LINUX_KMOD_SUFFIX=ko
+
+  ifneq (,$(findstring uml,$(BOARD)))
+    KERNEL_CC?=$(HOSTCC)
+    KERNEL_CROSS?=
+  else
+    KERNEL_CC?=$(TARGET_CC)
+    KERNEL_CROSS?=$(TARGET_CROSS)
+  endif
+
+  ifeq ($(TARGET_BUILD),1)
+    PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+    FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
+  endif
+  KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
+  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+    LINUX_UAPI_DIR=uapi/
+  endif
+  LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null))
+  LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown)
+
+  LINUX_UNAME_VERSION:=$(if $(word 3,$(subst ., ,$(KERNEL_BASE))),$(KERNEL_BASE),$(KERNEL_BASE).0)
+  ifneq ($(findstring -rc,$(LINUX_VERSION)),)
+    LINUX_UNAME_VERSION:=$(LINUX_UNAME_VERSION)-$(strip $(lastword $(subst -, ,$(LINUX_VERSION))))
+  endif
+
+  MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)-gnu
+  TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
+
+  LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
+
+  LINUX_SOURCE:=linux-libre-$(LINUX_VERSION)-gnu.tar.xz
+  TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
+  ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
+      LINUX_SITE:=@KERNEL/linux/kernel/v3.x$(TESTING)
+  endif
+
+  ifneq ($(TARGET_BUILD),1)
+    PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+  endif
+endif
+
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH=um
+else
+  ifeq (,$(LINUX_KARCH))
+    LINUX_KARCH=$(strip $(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(subst aarch64,arm64,$(subst aarch64_be,arm64,$(ARCH))))))))))))
+  endif
+endif
+
+
+define KernelPackage/Defaults
+  FILES:=
+  AUTOLOAD:=
+endef
+
+define ModuleAutoLoad
+	$(SH_FUNC) \
+	export modules=; \
+	probe_module() { \
+		mods="$$$$$$$$1"; \
+		boot="$$$$$$$$2"; \
+		shift 2; \
+		for mod in $$$$$$$$mods; do \
+			mkdir -p $(2)/etc/modules.d; \
+			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \
+		done; \
+		if [ -e $(2)/etc/modules.d/$(1) ]; then \
+			if [ "$$$$$$$$boot" = "1" ]; then \
+				mkdir -p $(2)/etc/modules-boot.d; \
+				ln -s ../modules.d/$(1) $(2)/etc/modules-boot.d/; \
+			fi; \
+			modules="$$$$$$$${modules:+$$$$$$$$modules}"; \
+		fi; \
+	}; \
+	add_module() { \
+		priority="$$$$$$$$1"; \
+		mods="$$$$$$$$2"; \
+		boot="$$$$$$$$3"; \
+		shift 3; \
+		for mod in $$$$$$$$mods; do \
+			mkdir -p $(2)/etc/modules.d; \
+			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
+		done; \
+		if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \
+			if [ "$$$$$$$$boot" = "1" ]; then \
+				mkdir -p $(2)/etc/modules-boot.d; \
+				ln -s ../modules.d/$$$$$$$$priority-$(1) $(2)/etc/modules-boot.d/; \
+			fi; \
+			modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \
+		fi; \
+	}; \
+	$(3) \
+	if [ -n "$$$$$$$$modules" ]; then \
+		mkdir -p $(2)/etc/modules.d; \
+		mkdir -p $(2)/CONTROL; \
+		echo "#!/bin/sh" > $(2)/CONTROL/postinst; \
+		echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \
+		echo ". /lib/functions.sh" >> $(2)/CONTROL/postinst; \
+		echo "insert_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \
+		chmod 0755 $(2)/CONTROL/postinst; \
+	fi
+endef
+
+ifeq ($(DUMP)$(TARGET_BUILD),)
+  -include $(LINUX_DIR)/.config
+endif
+
+define KernelPackage/depends
+  $(STAMP_BUILT): $(LINUX_DIR)/.config
+  define KernelPackage/depends
+  endef
+endef
+
+define KernelPackage
+  NAME:=$(1)
+  $(eval $(call Package/Default))
+  $(eval $(call KernelPackage/Defaults))
+  $(eval $(call KernelPackage/$(1)))
+  $(eval $(call KernelPackage/$(1)/$(BOARD)))
+
+  define Package/kmod-$(1)
+    TITLE:=$(TITLE)
+    SECTION:=kernel
+    CATEGORY:=Kernel modules
+    DESCRIPTION:=$(DESCRIPTION)
+    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC))
+    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
+    $(call KernelPackage/$(1))
+    $(call KernelPackage/$(1)/$(BOARD))
+  endef
+
+  ifdef KernelPackage/$(1)/description
+    define Package/kmod-$(1)/description
+$(call KernelPackage/$(1)/description)
+    endef
+  endif
+
+  ifdef KernelPackage/$(1)/config
+    define Package/kmod-$(1)/config
+$(call KernelPackage/$(1)/config)
+    endef
+  endif
+
+  $(call KernelPackage/depends)
+
+  ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
+    ifneq ($(if $(SDK),$(filter-out $(LINUX_DIR)/%.ko,$(FILES)),$(strip $(FILES))),)
+      define Package/kmod-$(1)/install
+		  @for mod in $$(FILES); do \
+			if [ -e $$$$$$$$mod ]; then \
+				mkdir -p $$(1)/$(MODULES_SUBDIR) ; \
+				$(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \
+			elif [ -e "$(LINUX_DIR)/modules.builtin" ]; then \
+				if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \
+					echo "NOTICE: module '$$$$$$$$mod' is built-in."; \
+				else \
+					echo "ERROR: module '$$$$$$$$mod' is missing." >&2; \
+					exit 1; \
+				fi; \
+			else \
+				echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in." >&2; \
+			fi; \
+		  done;
+		  $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
+		  $(call KernelPackage/$(1)/install,$$(1))
+      endef
+    endif
+  $(if $(CONFIG_PACKAGE_kmod-$(1)),
+    else
+      compile: $(1)-disabled
+      $(1)-disabled:
+		@echo "WARNING: kmod-$(1) is not available in the kernel config - generating empty package" >&2
+
+      define Package/kmod-$(1)/install
+		true
+      endef
+  )
+  endif
+  $$(eval $$(call BuildPackage,kmod-$(1)))
+
+  $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))
+endef
+
+define AutoLoad
+  add_module "$(1)" "$(2)" "$(3)";
+endef
+
+define AutoProbe
+  probe_module "$(1)" "$(2)";
+endef
+
+version_field=$(if $(word $(1),$(2)),$(word $(1),$(2)),0)
+kernel_version_merge=$$(( ($(call version_field,1,$(1)) << 24) + ($(call version_field,2,$(1)) << 16) + ($(call version_field,3,$(1)) << 8) + $(call version_field,4,$(1)) ))
+
+ifdef DUMP
+  kernel_version_cmp=
+else
+  kernel_version_cmp=$(shell [ $(call kernel_version_merge,$(call split_version,$(2))) $(1) $(call kernel_version_merge,$(call split_version,$(3))) ] && echo 1 )
+endif
+
+CompareKernelPatchVer=$(if $(call kernel_version_cmp,-$(2),$(1),$(3)),1,0)
+
+kernel_patchver_gt=$(call kernel_version_cmp,-gt,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_ge=$(call kernel_version_cmp,-ge,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_eq=$(call kernel_version_cmp,-eq,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_le=$(call kernel_version_cmp,-le,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_lt=$(call kernel_version_cmp,-lt,$(KERNEL_PATCHVER),$(1))
+
diff --git a/trunk/include/netfilter.mk b/trunk/include/netfilter.mk
new file mode 100644
index 00000000..660bcc3d
--- /dev/null
+++ b/trunk/include/netfilter.mk
@@ -0,0 +1,382 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifneq ($(__inc_netfilter),1)
+__inc_netfilter:=1
+
+ifeq ($(NF_KMOD),1)
+P_V4:=ipv4/netfilter/
+P_V6:=ipv6/netfilter/
+P_XT:=netfilter/
+P_EBT:=bridge/netfilter/
+endif
+
+# 1: variable
+# 2: kconfig symbols
+# 3: file list
+# 4: version dependency
+define nf_add
+ $(if $(4),ifeq ($$(strip $$(call CompareKernelPatchVer,$$(KERNEL_PATCHVER),$(firstword $(4)),$(lastword $(4)))),1))
+  $(1)-$$($(2)) += $(3)
+ $(if $(4),endif)
+ KCONFIG_$(1) = $(filter-out $(2),$(KCONFIG_$(1))) $(2)
+endef
+
+
+# core
+
+# kernel only
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT,CONFIG_IP_NF_IPTABLES, $(P_V4)ip_tables),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT,CONFIG_NETFILTER_XTABLES, $(P_XT)x_tables),))
+
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_NETFILTER_XTABLES, $(P_XT)xt_tcpudp),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_FILTER, $(P_V4)iptable_filter),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_MANGLE, $(P_V4)iptable_mangle),))
+
+# userland only
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP_NF_IPTABLES, xt_standard ipt_icmp xt_tcp xt_udp xt_comment xt_id xt_set xt_SET)))
+
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_LIMIT, $(P_XT)xt_limit))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MAC, $(P_XT)xt_mac))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MULTIPORT, $(P_XT)xt_multiport))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_COMMENT, $(P_XT)xt_comment))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_ID, $(P_XT)xt_id))
+
+#cluster
+$(eval $(call nf_add,IPT_CLUSTER,CONFIG_NETFILTER_XT_MATCH_CLUSTER, $(P_XT)xt_cluster))
+
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG, ge 3.4.0))
+$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG, lt 3.4.0))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS))
+$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT))
+$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)nf_reject_ipv4, ge 3.18.0))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_TIME, $(P_XT)xt_time))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MARK, $(P_XT)xt_mark))
+
+# kernel has xt_MARK.ko merged into xt_mark.ko, userspace is still separate
+# userland: xt_MARK.so
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MARK, $(P_XT)xt_MARK)))
+
+
+# conntrack
+
+# kernel only
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK, $(P_XT)nf_conntrack),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK_RTCACHE, $(P_XT)nf_conntrack_rtcache),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_DEFRAG_IPV4, $(P_V4)nf_defrag_ipv4),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK_IPV4, $(P_V4)nf_conntrack_ipv4),))
+
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_STATE, $(P_XT)xt_state))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_RAW, $(P_V4)iptable_raw))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_NOTRACK, $(P_XT)xt_NOTRACK, lt 3.7.0))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_CT, $(P_XT)xt_CT))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNTRACK, $(P_XT)xt_conntrack))
+
+
+# conntrack-extra
+
+$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_CONNBYTES, $(P_XT)xt_connbytes))
+$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_CONNLIMIT, $(P_XT)xt_connlimit))
+$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_CONNMARK, $(P_XT)xt_connmark))
+$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_HELPER, $(P_XT)xt_helper))
+$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_RECENT, $(P_XT)xt_recent))
+
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_CONNMARK, $(P_XT)xt_CONNMARK)))
+
+# extra
+
+$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE, $(if $(NF_KMOD),$(P_XT)xt_addrtype,$(P_XT)ipt_addrtype)))
+$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_OWNER, $(P_XT)xt_owner))
+$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_physdev))
+$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PKTTYPE, $(P_XT)xt_pkttype))
+$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_QUOTA, $(P_XT)xt_quota))
+
+#$(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_TARGET_ROUTE, $(P_V4)ipt_ROUTE))
+
+
+# filter
+
+$(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_LAYER7, $(P_XT)xt_layer7))
+$(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_STRING, $(P_XT)xt_string))
+
+
+# ipopt
+
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP))
+$(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit)) 
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_STATISTIC, $(P_XT)xt_statistic))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_TCPMSS, $(P_XT)xt_tcpmss))
+
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_CLASSIFY, $(P_XT)xt_CLASSIFY))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_DSCP, $(P_V4)ipt_dscp))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_ECN, $(P_V4)ipt_ECN))
+
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_ECN, $(P_XT)xt_ecn))
+
+# userland only
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, xt_tos)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, xt_TOS)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_HL, ipt_ttl)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, ipt_TTL)))
+
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_HL, $(P_XT)xt_hl))
+$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, $(P_XT)xt_HL))
+
+# iprange
+$(eval $(call nf_add,IPT_IPRANGE,CONFIG_NETFILTER_XT_MATCH_IPRANGE, $(P_XT)xt_iprange))
+
+#clusterip
+$(eval $(call nf_add,IPT_CLUSTERIP,CONFIG_IP_NF_TARGET_CLUSTERIP, $(P_V4)ipt_CLUSTERIP))
+
+# ipsec
+$(eval $(call nf_add,IPT_IPSEC,CONFIG_IP_NF_MATCH_AH, $(P_V4)ipt_ah))
+$(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_ESP, $(P_XT)xt_esp))
+$(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_POLICY, $(P_XT)xt_policy))
+
+
+# IPv6
+
+# kernel only
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT6,CONFIG_IP6_NF_IPTABLES, $(P_V6)ip6_tables),))
+
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_DEFRAG_IPV6, $(P_V6)nf_defrag_ipv6),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_CONNTRACK_IPV6, $(P_V6)nf_conntrack_ipv6),))
+
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6table_mangle),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_QUEUE, $(P_V6)ip6_queue),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_RAW, $(P_V6)ip6table_raw),))
+
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6)))
+
+
+$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_LOG, $(P_V6)ip6t_LOG))
+$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)ip6t_REJECT))
+$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)nf_reject_ipv6, ge 3.18.0))
+
+# ipv6 extra
+$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_IPV6HEADER, $(P_V6)ip6t_ipv6header))
+$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_AH, $(P_V6)ip6t_ah))
+$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_MH, $(P_V6)ip6t_mh))
+$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_EUI64, $(P_V6)ip6t_eui64))
+$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_OPTS, $(P_V6)ip6t_hbh))
+$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_FRAG, $(P_V6)ip6t_frag))
+$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt))
+
+# nat
+
+# kernel only
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat, lt 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat, ge 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4, ge 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6, ge 3.7.0),))
+
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_XT)xt_nat, ge 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_NAT, $(P_XT)xt_nat, ge 3.18.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)iptable_nat, lt 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)iptable_nat, ge 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_IP_NF_NAT, $(P_V4)iptable_nat, ge 3.18.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)ip6table_nat, ge 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_MASQUERADE, $(P_V6)ip6t_MASQUERADE, ge 3.7.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, $(P_V6)ip6t_NPT, ge 3.7.0),))
+
+# userland only
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_SNAT ipt_DNAT)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, ip6t_DNPT ip6t_SNPT)))
+
+$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERADE))
+$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)nf_nat_masquerade_ipv4, ge 3.18.0))
+$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT, ge 3.7.0))
+$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDIRECT, lt 3.7.0))
+
+
+# nat-extra
+
+$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_XT)xt_NETMAP, ge 3.7.0))
+$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_V4)ipt_NETMAP, lt 3.7.0))
+
+
+# nathelper
+
+$(eval $(call nf_add,NF_NATHELPER,CONFIG_IP_NF_NAT_FTP, $(P_V4)ip_nat_ftp))
+$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_CONNTRACK_FTP, $(P_XT)nf_conntrack_ftp))
+$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc))
+$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp, ge 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc, ge 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_FTP, $(P_V4)nf_nat_ftp, lt 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc, lt 3.7.0))
+
+
+# nathelper-extra
+
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_BROADCAST, $(P_XT)nf_conntrack_broadcast))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_AMANDA, $(P_XT)nf_conntrack_amanda))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_XT)nf_nat_amanda, ge 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_V4)nf_nat_amanda, lt 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CT_PROTO_GRE, $(P_XT)nf_conntrack_proto_gre))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_H323, $(P_XT)nf_conntrack_h323))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_H323, $(P_V4)nf_nat_h323))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_PPTP, $(P_XT)nf_conntrack_pptp))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PPTP, $(P_V4)nf_nat_pptp))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SIP, $(P_XT)nf_conntrack_sip))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_SIP, $(P_XT)nf_nat_sip, ge 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_SIP, $(P_V4)nf_nat_sip, lt 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SNMP, $(P_XT)nf_conntrack_snmp))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_SNMP_BASIC, $(P_V4)nf_nat_snmp_basic))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_TFTP, $(P_XT)nf_conntrack_tftp))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_XT)nf_nat_tftp, ge 3.7.0))
+$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_V4)nf_nat_tftp, lt 3.7.0))
+
+
+# queue
+
+$(eval $(call nf_add,IPT_QUEUE,CONFIG_IP_NF_QUEUE, $(P_V4)ip_queue, lt 3.5.0))
+
+
+# ulog
+
+$(eval $(call nf_add,IPT_ULOG,CONFIG_IP_NF_TARGET_ULOG, $(P_V4)ipt_ULOG))
+
+
+# nflog
+
+$(eval $(call nf_add,IPT_NFLOG,CONFIG_NETFILTER_XT_TARGET_NFLOG, $(P_XT)xt_NFLOG))
+
+
+# nfqueue
+
+$(eval $(call nf_add,IPT_NFQUEUE,CONFIG_NETFILTER_XT_TARGET_NFQUEUE, $(P_XT)xt_NFQUEUE))
+
+
+# debugging
+
+$(eval $(call nf_add,IPT_DEBUG,CONFIG_NETFILTER_XT_TARGET_TRACE, $(P_XT)xt_TRACE))
+
+# tproxy
+
+$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket))
+$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_TARGET_TPROXY, $(P_XT)xt_TPROXY))
+
+# led
+$(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED))
+
+# tee
+
+$(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE))
+
+# u32 
+
+$(eval $(call nf_add,IPT_U32,CONFIG_NETFILTER_XT_MATCH_U32, $(P_XT)xt_u32))
+
+
+# netlink
+
+$(eval $(call nf_add,NFNETLINK,CONFIG_NETFILTER_NETLINK, $(P_XT)nfnetlink))
+
+# nflog
+
+$(eval $(call nf_add,NFNETLINK_LOG,CONFIG_NETFILTER_NETLINK_LOG, $(P_XT)nfnetlink_log))
+
+# nfqueue
+
+$(eval $(call nf_add,NFNETLINK_QUEUE,CONFIG_NETFILTER_NETLINK_QUEUE, $(P_XT)nfnetlink_queue))
+
+#
+# ebtables
+#
+
+$(eval $(if $(NF_KMOD),$(call nf_add,EBTABLES,CONFIG_BRIDGE_NF_EBTABLES, $(P_EBT)ebtables),))
+
+# ebtables: tables
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_BROUTE, $(P_EBT)ebtable_broute))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_T_FILTER, $(P_EBT)ebtable_filter))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_T_NAT, $(P_EBT)ebtable_nat))
+
+# ebtables: matches
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_802_3, $(P_EBT)ebt_802_3))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_AMONG, $(P_EBT)ebt_among))
+$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_ARP, $(P_EBT)ebt_arp))
+$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_IP, $(P_EBT)ebt_ip))
+$(eval $(call nf_add,EBTABLES_IP6,CONFIG_BRIDGE_EBT_IP6, $(P_EBT)ebt_ip6))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_LIMIT, $(P_EBT)ebt_limit))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_MARK, $(P_EBT)ebt_mark_m))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_PKTTYPE, $(P_EBT)ebt_pkttype))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_STP, $(P_EBT)ebt_stp))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_VLAN, $(P_EBT)ebt_vlan))
+
+# targets
+$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_ARPREPLY, $(P_EBT)ebt_arpreply))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_MARK_T, $(P_EBT)ebt_mark))
+$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_DNAT, $(P_EBT)ebt_dnat))
+$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_REDIRECT, $(P_EBT)ebt_redirect))
+$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_SNAT, $(P_EBT)ebt_snat))
+
+# watchers
+$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_LOG, $(P_EBT)ebt_log))
+$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_ULOG, $(P_EBT)ebt_ulog))
+$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFLOG, $(P_EBT)ebt_nflog))
+$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFQUEUE, $(P_EBT)ebt_nfqueue))
+
+# nftables
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES, $(P_XT)nf_tables, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_INET, $(P_XT)nf_tables_inet, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_EXTHDR, $(P_XT)nft_exthdr, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_META, $(P_XT)nft_meta, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CT, $(P_XT)nft_ct, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_RBTREE, $(P_XT)nft_rbtree, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_HASH, $(P_XT)nft_hash, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_COUNTER, $(P_XT)nft_counter, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT, $(P_XT)nft_reject $(P_V4)nft_reject_ipv4 $(P_V6)nft_reject_ipv6, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT_INET, $(P_XT)nft_reject_inet, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV4, $(P_V4)nf_tables_ipv4, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV6, $(P_V6)nf_tables_ipv6, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V6)nft_chain_route_ipv6, ge 3.14.0),))
+
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_NAT, $(P_XT)nft_nat, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_CHAIN_NAT_IPV4, $(P_V4)nft_chain_nat_ipv4, ge 3.14.0),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_CHAIN_NAT_IPV6, $(P_V6)nft_chain_nat_ipv6, ge 3.14.0),))
+
+# userland only
+IPT_BUILTIN += $(NF_IPT-y) $(NF_IPT-m)
+IPT_BUILTIN += $(IPT_CORE-y) $(IPT_CORE-m)
+IPT_BUILTIN += $(NF_CONNTRACK-y)
+IPT_BUILTIN += $(NF_CONNTRACK6-y)
+IPT_BUILTIN += $(IPT_CONNTRACK-y)
+IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
+IPT_BUILTIN += $(IPT_EXTRA-y)
+IPT_BUILTIN += $(IPT_FILTER-y)
+IPT_BUILTIN += $(IPT_IPOPT-y)
+IPT_BUILTIN += $(IPT_IPRANGE-y)
+IPT_BUILTIN += $(IPT_CLUSTER-y)
+IPT_BUILTIN += $(IPT_CLUSTERIP-y)
+IPT_BUILTIN += $(IPT_IPSEC-y)
+IPT_BUILTIN += $(IPT_IPV6-y) $(IPT_IPV6-m)
+IPT_BUILTIN += $(NF_NAT-y)
+IPT_BUILTIN += $(NF_NAT6-y)
+IPT_BUILTIN += $(IPT_NAT-y)
+IPT_BUILTIN += $(IPT_NAT6-y)
+IPT_BUILTIN += $(IPT_NAT_EXTRA-y)
+IPT_BUILTIN += $(NF_NATHELPER-y)
+IPT_BUILTIN += $(NF_NATHELPER_EXTRA-y)
+IPT_BUILTIN += $(IPT_ULOG-y)
+IPT_BUILTIN += $(IPT_DEBUG-y)
+IPT_BUILTIN += $(IPT_TPROXY-y)
+IPT_BUILTIN += $(NFNETLINK-y)
+IPT_BUILTIN += $(NFNETLINK_LOG-y)
+IPT_BUILTIN += $(NFNETLINK_QUEUE-y)
+IPT_BUILTIN += $(EBTABLES-y)
+IPT_BUILTIN += $(EBTABLES_IP4-y)
+IPT_BUILTIN += $(EBTABLES_IP6-y)
+IPT_BUILTIN += $(EBTABLES_WATCHERS-y)
+
+endif # __inc_netfilter
diff --git a/trunk/include/nls.mk b/trunk/include/nls.mk
new file mode 100644
index 00000000..19456640
--- /dev/null
+++ b/trunk/include/nls.mk
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# iconv full
+ifeq ($(CONFIG_BUILD_NLS),y)
+	ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-full
+	ICONV_FULL:=1
+
+	INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-full
+	INTL_FULL:=1
+
+# iconv stub
+else
+	ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-stub
+	ICONV_FULL:=
+
+	INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-stub
+	INTL_FULL:=
+endif
+
+PKG_CONFIG_DEPENDS += CONFIG_BUILD_NLS
+PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv !BUILD_NLS:libintl
+
+ICONV_DEPENDS:=+BUILD_NLS:libiconv-full
+ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
+ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include
+ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib
+
+INTL_DEPENDS:=+BUILD_NLS:libintl-full
+INTL_CFLAGS:=-I$(INTL_PREFIX)/include
+INTL_CPPFLAGS:=-I$(INTL_PREFIX)/include
+INTL_LDFLAGS:=-L$(INTL_PREFIX)/lib
+
+TARGET_CFLAGS += $(ICONV_CFLAGS) $(INTL_CFLAGS)
+TARGET_CPPFLAGS += $(ICONV_CFLAGS) $(INTL_CPPFLAGS)
+TARGET_LDFLAGS += $(ICONV_LDFLAGS) $(INTL_LDFLAGS)
diff --git a/trunk/include/package-bin.mk b/trunk/include/package-bin.mk
new file mode 100644
index 00000000..c6cb9caf
--- /dev/null
+++ b/trunk/include/package-bin.mk
@@ -0,0 +1,33 @@
+# 
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifeq ($(DUMP),)
+  define BuildTarget/bin
+    ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
+    ifdef Package/$(1)/install
+      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+        compile: install-bin-$(1)
+      else
+        compile: $(1)-disabled
+        $(1)-disabled:
+		@echo "WARNING: skipping $(1) -- package not selected" >&2
+      endif
+    endif
+    endif
+
+    install-bin-$(1): $(STAMP_BUILT)
+	  rm -rf $(BIN_DIR)/$(1)
+	  $(INSTALL_DIR) $(BIN_DIR)/$(1)
+	  $(call Package/$(1)/install,$(BIN_DIR)/$(1))
+
+    clean-$(1):
+	  rm -rf $(BIN_DIR)/$(1)
+
+    clean: clean-$(1)
+    .PHONY: install-bin-$(1)
+  endef
+endif
diff --git a/trunk/include/package-defaults.mk b/trunk/include/package-defaults.mk
new file mode 100644
index 00000000..6a345b6f
--- /dev/null
+++ b/trunk/include/package-defaults.mk
@@ -0,0 +1,157 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+PKG_DEFAULT_DEPENDS = +libc +USE_EGLIBC:librt +USE_EGLIBC:libpthread
+
+ifneq ($(PKG_NAME),toolchain)
+  PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2)))
+else
+  PKG_FIXUP_DEPENDS = $(2)
+endif
+
+define Package/Default
+  CONFIGFILE:=
+  SECTION:=opt
+  CATEGORY:=Extra packages
+  DEPENDS:=
+  MDEPENDS:=
+  CONFLICTS:=
+  PROVIDES:=
+  EXTRA_DEPENDS:=
+  MAINTAINER:=$(PKG_MAINTAINER)
+  SOURCE:=$(patsubst $(TOPDIR)/%,%,$(CURDIR))
+  ifneq ($(PKG_VERSION),)
+    ifneq ($(PKG_RELEASE),)
+      VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+    else
+      VERSION:=$(PKG_VERSION)
+    endif
+  else
+    VERSION:=$(PKG_RELEASE)
+  endif
+  ABI_VERSION:=
+  ifneq ($(PKG_FLAGS),)
+    PKGFLAGS:=$(PKG_FLAGS)
+  else
+    PKGFLAGS:=
+  endif
+  ifneq ($(ARCH_PACKAGES),)
+    PKGARCH:=$(ARCH_PACKAGES)
+  else
+    PKGARCH:=$(BOARD)
+  endif
+  DEFAULT:=
+  MENU:=
+  SUBMENU:=
+  SUBMENUDEP:=
+  TITLE:=
+  KCONFIG:=
+  BUILDONLY:=
+  HIDDEN:=
+  URL:=
+  VARIANT:=
+  DEFAULT_VARIANT:=
+  USERID:=
+endef
+
+Build/Patch:=$(Build/Patch/Default)
+ifneq ($(strip $(PKG_UNPACK)),)
+  define Build/Prepare/Default
+	$(PKG_UNPACK)
+	$(Build/Patch)
+  endef
+endif
+
+EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
+DISABLE_NLS:=--disable-nls
+
+CONFIGURE_PREFIX:=/usr
+CONFIGURE_ARGS = \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--program-prefix="" \
+		--program-suffix="" \
+		--prefix=$(CONFIGURE_PREFIX) \
+		--exec-prefix=$(CONFIGURE_PREFIX) \
+		--bindir=$(CONFIGURE_PREFIX)/bin \
+		--sbindir=$(CONFIGURE_PREFIX)/sbin \
+		--libexecdir=$(CONFIGURE_PREFIX)/lib \
+		--sysconfdir=/etc \
+		--datadir=$(CONFIGURE_PREFIX)/share \
+		--localstatedir=/var \
+		--mandir=$(CONFIGURE_PREFIX)/man \
+		--infodir=$(CONFIGURE_PREFIX)/info \
+		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
+		$(DISABLE_IPV6)
+
+CONFIGURE_VARS = \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
+
+CONFIGURE_PATH = .
+CONFIGURE_CMD = ./configure
+
+replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; \
+	       $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp --remove-destination \
+	       $(SCRIPT_DIR)/$(2);
+
+define Build/Configure/Default
+	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
+	if [ -x $(CONFIGURE_CMD) ]; then \
+		$(call replace_script,$(PKG_BUILD_DIR)/$(3),config.guess) \
+		$(call replace_script,$(PKG_BUILD_DIR)/$(3),config.sub) \
+		$(CONFIGURE_VARS) \
+		$(2) \
+		$(CONFIGURE_CMD) \
+		$(CONFIGURE_ARGS) \
+		$(1); \
+	fi; \
+	)
+endef
+
+MAKE_VARS = \
+	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+	CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"
+
+MAKE_FLAGS = \
+	$(TARGET_CONFIGURE_OPTS) \
+	CROSS="$(TARGET_CROSS)" \
+	ARCH="$(ARCH)"
+
+MAKE_INSTALL_FLAGS = \
+	$(MAKE_FLAGS) \
+	DESTDIR="$(PKG_INSTALL_DIR)"
+
+MAKE_PATH = .
+
+define Build/Compile/Default
+	+$(MAKE_VARS) \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+		$(MAKE_FLAGS) \
+		$(1);
+endef
+
+define Build/Install/Default
+	$(MAKE_VARS) \
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+		$(MAKE_INSTALL_FLAGS) \
+		$(if $(1), $(1), install);
+endef
+
+define Build/Dist/Default
+	$(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" dist)
+endef
+
+define Build/DistCheck/Default
+	$(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" distcheck)
+endef
diff --git a/trunk/include/package-dumpinfo.mk b/trunk/include/package-dumpinfo.mk
new file mode 100644
index 00000000..b6e2f0f7
--- /dev/null
+++ b/trunk/include/package-dumpinfo.mk
@@ -0,0 +1,91 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifneq ($(DUMP),)
+
+dumpinfo: FORCE
+
+define Config/template
+Preconfig: $(1)
+Preconfig-Type: $(2)
+Preconfig-Default: $(3)
+Preconfig-Label: $(4)
+
+endef
+
+define Config
+  Preconfig/$(1) = $$(call Config/template,$(1),$(2),$(3),$(4))
+  preconfig_$$(1) += $(1)
+endef
+
+define Dumpinfo/Package
+$(info Package: $(1)
+$(if $(MENU),Menu: $(MENU)
+)$(if $(SUBMENU),Submenu: $(SUBMENU)
+)$(if $(SUBMENUDEP),Submenu-Depends: $(SUBMENUDEP)
+)$(if $(DEFAULT),Default: $(DEFAULT)
+)$(if $(findstring $(PREREQ_CHECK),1),Prereq-Check: 1
+)Version: $(VERSION)
+Depends: $(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
+Conflicts: $(CONFLICTS)
+Menu-Depends: $(MDEPENDS)
+Provides: $(PROVIDES)
+$(if $(VARIANT),Build-Variant: $(VARIANT)
+$(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT)
+))$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
+)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS)
+)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES)
+)Section: $(SECTION)
+Category: $(CATEGORY)
+Title: $(TITLE)
+Maintainer: $(MAINTAINER)
+$(if $(USERID),Require-User: $(USERID)
+)Source: $(PKG_SOURCE)
+$(if $(PKG_LICENSE),License: $(PKG_LICENSE)
+)$(if $(PKG_LICENSE_FILES),LicenseFiles: $(PKG_LICENSE_FILES)
+)Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
+$(if $(KCONFIG),Kernel-Config: $(KCONFIG)
+)$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
+)$(if $(HIDDEN),Hidden: $(HIDDEN)
+)$(if $(FEED),Feed: $(FEED)
+)Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE))
+$(if $(URL),$(URL)
+)$(MAINTAINER)
+@@
+$(if $(Package/$(1)/config),Config:
+$(Package/$(1)/config)
+@@
+)$(foreach pc,$(preconfig_$(1)),
+$(Preconfig/$(pc))))
+endef
+
+define Feature/Default
+  TARGET_NAME:=
+  TARGET_TITLE:=
+  PRIORITY:=
+  NAME:=
+endef
+
+define Feature
+  $(eval $(Feature/Default))
+  $(eval $(Feature/$(1)))
+  $(if $(DUMP),$(call Dumpinfo/Feature,$(1)))
+endef
+
+define Dumpinfo/Feature
+$(info Feature: $(TARGET_NAME)_$(1)
+Target-Name: $(TARGET_NAME)
+Target-Title: $(TARGET_TITLE)
+Feature-Name: $(NAME)
+$(if $(PRIORITY),Feature-Priority: $(PRIORITY)
+)Feature-Description:
+$(Feature/$(1)/description)
+@@
+)
+endef
+
+endif
diff --git a/trunk/include/package-ipkg.mk b/trunk/include/package-ipkg.mk
new file mode 100644
index 00000000..77eaeb82
--- /dev/null
+++ b/trunk/include/package-ipkg.mk
@@ -0,0 +1,233 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(INCLUDE_DIR)/feeds.mk
+
+# invoke ipkg-build with some default options
+IPKG_BUILD:= \
+  $(STAGING_DIR_HOST)/bin/ipkg-build -c -o 0 -g 0
+
+IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
+
+# 1: package name
+# 2: variable name
+# 3: variable suffix
+define BuildIPKGVariable
+ifdef Package/$(1)/$(2)
+  $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2))
+  $(call shexport,Package/$(1)/$(2))
+  $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3);
+endif
+endef
+
+PARENL :=(
+PARENR :=)
+
+dep_split=$(subst :,$(space),$(1))
+dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
+dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond))))
+dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
+dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
+dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
+dep_val=$(word 2,$(call dep_split,$(1)))
+strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
+filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
+
+define AddDependency
+  $$(if $(1),$$(if $(2),$$(foreach pkg,$(1),$$(IPKG_$$(pkg))): $$(foreach pkg,$(2),$$(IPKG_$$(pkg)))))
+endef
+
+define FixupReverseDependencies
+  DEPS := $$(filter %:$(1),$$(IDEPEND))
+  DEPS := $$(patsubst %:$(1),%,$$(DEPS))
+  DEPS := $$(filter $$(DEPS),$$(IPKGS))
+  $(call AddDependency,$$(DEPS),$(1))
+endef
+
+define FixupDependencies
+  DEPS := $$(filter $(1):%,$$(IDEPEND))
+  DEPS := $$(patsubst $(1):%,%,$$(DEPS))
+  DEPS := $$(filter $$(DEPS),$$(IPKGS))
+  $(call AddDependency,$(1),$$(DEPS))
+endef
+
+ifneq ($(PKG_NAME),toolchain)
+  define CheckDependencies
+	@( \
+		rm -f $(PKG_INFO_DIR)/$(1).missing; \
+		( \
+			export \
+				READELF=$(TARGET_CROSS)readelf \
+				OBJCOPY=$(TARGET_CROSS)objcopy \
+				XARGS="$(XARGS)"; \
+			$(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \
+		) | while read FILE; do \
+			grep -q "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \
+				echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \
+		done; \
+		if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
+			echo "Package $(1) is missing dependencies for the following libraries:" >&2; \
+			cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \
+			false; \
+		fi; \
+	)
+  endef
+endif
+
+_addsep=$(word 1,$(1))$(foreach w,$(wordlist 2,$(words $(1)),$(1)),$(strip $(2) $(w)))
+_cleansep=$(subst $(space)$(2)$(space),$(2)$(space),$(1))
+mergelist=$(call _cleansep,$(call _addsep,$(1),$(comma)),$(comma))
+addfield=$(if $(strip $(2)),$(1): $(2))
+_define=define
+_endef=endef
+
+ifeq ($(DUMP),)
+  define BuildTarget/ipkg
+    PDIR_$(1):=$(call FeedPackageDir,$(1))
+    IPKG_$(1):=$$(PDIR_$(1))/$(1)_$(VERSION)_$(PKGARCH).ipk
+    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
+    KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
+
+    ifeq ($(BUILD_VARIANT),$$(if $$(VARIANT),$$(VARIANT),$(BUILD_VARIANT)))
+    ifdef Package/$(1)/install
+      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+        IPKGS += $(1)
+        compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
+        ifneq ($(ABI_VERSION),)
+        compile: $(PKG_INFO_DIR)/$(1).version
+        endif
+
+        ifeq ($(CONFIG_PACKAGE_$(1)),y)
+          .PHONY: $(PKG_INSTALL_STAMP).$(1)
+          compile: $(PKG_INSTALL_STAMP).$(1)
+          $(PKG_INSTALL_STAMP).$(1):
+			if [ -f $(PKG_INSTALL_STAMP).clean ]; then \
+				rm -f \
+					$(PKG_INSTALL_STAMP) \
+					$(PKG_INSTALL_STAMP).clean; \
+			fi; \
+			echo "$(1)" >> $(PKG_INSTALL_STAMP)
+        endif
+      else
+        $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))
+      endif
+    endif
+    endif
+
+    DEPENDS:=$(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
+    IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS))
+    IDEPEND += $$(patsubst %,$(1):%,$$(IDEPEND_$(1)))
+    $(FixupDependencies)
+    $(FixupReverseDependencies)
+
+    $(eval $(call BuildIPKGVariable,$(1),conffiles))
+    $(eval $(call BuildIPKGVariable,$(1),preinst))
+    $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg))
+    $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg))
+    $(eval $(call BuildIPKGVariable,$(1),postrm))
+
+    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
+	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
+	mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1)
+	$(call Package/$(1)/install,$(STAGING_DIR_ROOT)/tmp-$(1))
+	$(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)/tmp-$(1))
+	$(call locked,$(CP) $(STAGING_DIR_ROOT)/tmp-$(1)/. $(STAGING_DIR_ROOT)/,root-copy)
+	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
+	touch $$@
+
+    $(PKG_INFO_DIR)/$(1).version: $$(IPKG_$(1))
+	echo '$(ABI_VERSION)' | cmp -s - $$@ || \
+		echo '$(ABI_VERSION)' > $$@
+
+    Package/$(1)/DEPENDS := $$(call mergelist,$$(filter-out @%,$$(IDEPEND_$(1))))
+    ifneq ($$(EXTRA_DEPENDS),)
+      Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS))
+    endif
+
+$(_define) Package/$(1)/CONTROL
+Package: $(1)
+Version: $(VERSION)
+$$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
+)$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
+)$$(call addfield,Provides,$(PROVIDES)
+)$$(call addfield,Source,$(SOURCE)
+)$$(call addfield,License,$$(PKG_LICENSE)
+)$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES)
+)$$(call addfield,Section,$(SECTION)
+)$$(call addfield,Require-User,$(USERID)
+)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed
+)$(if $(filter essential,$(PKG_FLAGS)),Essential: yes
+)$(if $(MAINTAINER),Maintainer: $(MAINTAINER)
+)Architecture: $(PKGARCH)
+Installed-Size: 0
+$(_endef)
+
+    $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1))
+    $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL)
+    $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description)
+    $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
+	@rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1))
+	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
+	$(call Package/$(1)/install,$$(IDIR_$(1)))
+	-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
+	@( \
+		find $$(IDIR_$(1)) -name lib\*.so\* -or -name \*.ko | awk -F/ '{ print $$$$NF }'; \
+		for file in $$(patsubst %,$(PKG_INFO_DIR)/%.provides,$$(IDEPEND_$(1))); do \
+			if [ -f "$$$$file" ]; then \
+				cat $$$$file; \
+			fi; \
+		done; $(Package/$(1)/extra_provides) \
+	) | sort -u > $(PKG_INFO_DIR)/$(1).provides
+	$(if $(PROVIDES),@for pkg in $(PROVIDES); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
+	$(CheckDependencies)
+
+	$(RSTRIP) $$(IDIR_$(1))
+	(cd $$(IDIR_$(1))/CONTROL; \
+		( \
+			echo "$$$$CONTROL"; \
+			printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \
+		) > control; \
+		chmod 644 control; \
+		( \
+			echo "#!/bin/sh"; \
+			echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
+			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
+			echo "default_postinst \$$$$0 \$$$$@"; \
+		) > postinst; \
+		( \
+			echo "#!/bin/sh"; \
+			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
+			echo "default_prerm \$$$$0 \$$$$@"; \
+		) > prerm; \
+		chmod 0755 prerm; \
+		$($(1)_COMMANDS) \
+	)
+
+    ifneq ($$(KEEP_$(1)),)
+		@( \
+			keepfiles=""; \
+			for x in $$(KEEP_$(1)); do \
+				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
+			done; \
+			[ -z "$$$$keepfiles" ] || { \
+				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
+				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
+			}; \
+		)
+    endif
+
+	$(INSTALL_DIR) $$(PDIR_$(1))
+	$(IPKG_BUILD) $$(IDIR_$(1)) $$(PDIR_$(1))
+	@[ -f $$(IPKG_$(1)) ]
+
+    $(1)-clean:
+	rm -f $$(PDIR_$(1))/$(1)_*
+
+    clean: $(1)-clean
+
+  endef
+endif
diff --git a/trunk/include/package.mk b/trunk/include/package.mk
new file mode 100644
index 00000000..a1b90da3
--- /dev/null
+++ b/trunk/include/package.mk
@@ -0,0 +1,316 @@
+#
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+__package_mk:=1
+
+all: $(if $(DUMP),dumpinfo,compile)
+
+PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM ?= unknown
+PKG_BUILD_PARALLEL ?=
+PKG_USE_MIPS16 ?= 1
+PKG_CHECK_FORMAT_SECURITY ?= 1
+
+ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
+  MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
+else
+  MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
+endif
+
+ifeq ($(strip $(PKG_BUILD_PARALLEL)),0)
+PKG_JOBS?=-j1
+else
+PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\
+	$(if $(CONFIG_PKG_BUILD_PARALLEL),$(MAKE_J),-j1),-j1)
+endif
+ifdef CONFIG_USE_MIPS16
+  ifeq ($(strip $(PKG_USE_MIPS16)),1)
+    TARGET_ASFLAGS_DEFAULT = $(filter-out -mips16 -minterlink-mips16,$(TARGET_CFLAGS))
+    TARGET_CFLAGS += -mips16 -minterlink-mips16
+  endif
+endif
+ifdef CONFIG_PKG_CHECK_FORMAT_SECURITY
+  ifeq ($(strip $(PKG_CHECK_FORMAT_SECURITY)),1)
+    TARGET_CFLAGS += -Wformat -Werror=format-security
+  endif
+endif
+
+include $(INCLUDE_DIR)/prereq.mk
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/depends.mk
+
+find_library_dependencies = $(wildcard $(patsubst %,$(STAGING_DIR)/pkginfo/%.version, \
+	$(filter-out $(BUILD_PACKAGES),$(foreach dep, \
+		$(filter-out @%, $(patsubst +%,%,$(1))), \
+		$(if $(findstring :,$(dep)), \
+			$(word 2,$(subst :,$(space),$(dep))), \
+			$(dep) \
+		) \
+	))))
+
+STAMP_NO_AUTOREBUILD=$(wildcard $(PKG_BUILD_DIR)/.no_autorebuild)
+PREV_STAMP_PREPARED:=$(if $(STAMP_NO_AUTOREBUILD),$(wildcard $(PKG_BUILD_DIR)/.prepared*))
+ifneq ($(PREV_STAMP_PREPARED),)
+  STAMP_PREPARED:=$(PREV_STAMP_PREPARED)
+  CONFIG_AUTOREBUILD:=
+else
+  STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))$(call confvar,$(PKG_PREPARED_DEPENDS)))
+endif
+STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
+STAMP_CONFIGURED_WILDCARD=$(patsubst %_$(call confvar,$(PKG_CONFIG_DEPENDS)),%_*,$(STAMP_CONFIGURED))
+STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed
+
+STAGING_FILES_LIST:=$(PKG_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),).list
+ifneq ($(if $(CONFIG_SRC_TREE_OVERRIDE),$(wildcard ./git-src)),)
+  USE_GIT_TREE:=1
+  QUILT:=1
+endif
+ifdef USE_SOURCE_DIR
+  QUILT:=1
+endif
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.source_dir),)
+  QUILT:=1
+endif
+
+PKG_DIR_NAME:=$(lastword $(subst /,$(space),$(CURDIR)))
+PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD_VARIANT),default).install
+
+include $(INCLUDE_DIR)/download.mk
+include $(INCLUDE_DIR)/quilt.mk
+include $(INCLUDE_DIR)/package-defaults.mk
+include $(INCLUDE_DIR)/package-dumpinfo.mk
+include $(INCLUDE_DIR)/package-ipkg.mk
+include $(INCLUDE_DIR)/package-bin.mk
+include $(INCLUDE_DIR)/autotools.mk
+
+override MAKEFLAGS=
+CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
+CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
+SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
+PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig
+unexport QUIET
+
+ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
+  ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
+    define Build/Autoclean
+      $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
+      $(call rdep,${CURDIR} $(PKG_FILE_DEPENDS),$(STAMP_PREPARED),$(PKG_BUILD_DIR)/.dep_files,-x "*/.dep_*")
+      $(if $(filter prepare,$(MAKECMDGOALS)),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),,-x "*/.dep_*" -x "*/ipkg*"))
+    endef
+  endif
+endif
+
+define Download/default
+  FILE:=$(PKG_SOURCE)
+  URL:=$(PKG_SOURCE_URL)
+  SUBDIR:=$(PKG_SOURCE_SUBDIR)
+  PROTO:=$(PKG_SOURCE_PROTO)
+  $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
+  $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
+  VERSION:=$(PKG_SOURCE_VERSION)
+  MD5SUM:=$(PKG_MD5SUM)
+endef
+
+ifdef USE_GIT_TREE
+  define Build/Prepare/Default
+	mkdir -p $(PKG_BUILD_DIR)
+	ln -s $(CURDIR)/git-src $(PKG_BUILD_DIR)/.git
+	( cd $(PKG_BUILD_DIR); git checkout .)
+  endef
+endif
+ifdef USE_SOURCE_DIR
+  define Build/Prepare/Default
+	rm -rf $(PKG_BUILD_DIR)
+	$(if $(wildcard $(USE_SOURCE_DIR)/*),,@echo "Error: USE_SOURCE_DIR=$(USE_SOURCE_DIR) path not found"; false)
+	ln -snf $(USE_SOURCE_DIR) $(PKG_BUILD_DIR)
+	touch $(PKG_BUILD_DIR)/.source_dir
+  endef
+endif
+
+define Build/Exports/Default
+  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p))
+  $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr
+  $(1) : export PATH=$$(TARGET_PATH_PKG)
+  $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
+  $(1) : export PKG_CONFIG_PATH:=$$(PKG_CONFIG_PATH)
+  $(1) : export PKG_CONFIG_LIBDIR:=$$(PKG_CONFIG_PATH)
+  $(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache
+endef
+Build/Exports=$(Build/Exports/Default)
+
+define Build/DefaultTargets
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
+  $(call Build/Autoclean)
+
+  download:
+	$(foreach hook,$(Hooks/Download),
+		$(call $(hook))$(sep)
+	)
+
+  $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG)
+  $(STAMP_PREPARED):
+	@-rm -rf $(PKG_BUILD_DIR)
+	@mkdir -p $(PKG_BUILD_DIR)
+	$(foreach hook,$(Hooks/Prepare/Pre),$(call $(hook))$(sep))
+	$(Build/Prepare)
+	$(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep))
+	touch $$@
+
+  $(call Build/Exports,$(STAMP_CONFIGURED))
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED)
+	$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
+	$(Build/Configure)
+	$(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep))
+	rm -f $(STAMP_CONFIGURED_WILDCARD)
+	touch $$@
+
+  $(call Build/Exports,$(STAMP_BUILT))
+  $(STAMP_BUILT): $(STAMP_CONFIGURED)
+	$(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
+	$(Build/Compile)
+	$(foreach hook,$(Hooks/Compile/Post),$(call $(hook))$(sep))
+	$(Build/Install)
+	$(foreach hook,$(Hooks/Install/Post),$(call $(hook))$(sep))
+	touch $$@
+
+  $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG)
+  $(STAMP_INSTALLED): $(STAMP_BUILT)
+	$(SUBMAKE) -j1 clean-staging
+	rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
+	mkdir -p $(TMP_DIR)/stage-$(PKG_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
+	$(foreach hook,$(Hooks/InstallDev/Pre),\
+		$(call $(hook),$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)$(sep)\
+	)
+	$(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)
+	$(foreach hook,$(Hooks/InstallDev/Post),\
+		$(call $(hook),$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)$(sep)\
+	)
+	if [ -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) ]; then \
+		$(SCRIPT_DIR)/clean-package.sh \
+			"$(STAGING_DIR)/packages/$(STAGING_FILES_LIST)" \
+			"$(STAGING_DIR)"; \
+	fi
+	if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \
+		(cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(TMP_DIR)/stage-$(PKG_NAME).files); \
+		$(call locked, \
+			mv $(TMP_DIR)/stage-$(PKG_NAME).files $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) && \
+			$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
+		,staging-dir); \
+	fi
+	rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
+	touch $$@
+
+  ifdef Build/InstallDev
+    compile: $(STAMP_INSTALLED)
+  endif
+
+  define Build/DefaultTargets
+  endef
+
+  prepare: $(STAMP_PREPARED)
+  configure: $(STAMP_CONFIGURED)
+  dist: $(STAMP_CONFIGURED)
+  distcheck: $(STAMP_CONFIGURED)
+endef
+
+define Build/IncludeOverlay
+  $(eval -include $(wildcard $(TOPDIR)/overlay/*/$(PKG_NAME).mk))
+  define Build/IncludeOverlay
+  endef
+endef
+
+define BuildPackage
+  $(Build/IncludeOverlay)
+  $(eval $(Package/Default))
+  $(eval $(Package/$(1)))
+
+ifdef DESCRIPTION
+$$(error DESCRIPTION:= is obsolete, use Package/PKG_NAME/description)
+endif
+
+ifndef Package/$(1)/description
+define Package/$(1)/description
+	$(TITLE)
+endef
+endif
+
+  BUILD_PACKAGES += $(1)
+  $(STAMP_PREPARED): $$(if $(QUILT)$(DUMP),,$(call find_library_dependencies,$(DEPENDS)))
+
+  $(foreach FIELD, TITLE CATEGORY SECTION VERSION,
+    ifeq ($($(FIELD)),)
+      $$(error Package/$(1) is missing the $(FIELD) field)
+    endif
+  )
+
+  $(if $(DUMP), \
+    $(Dumpinfo/Package), \
+    $(foreach target, \
+      $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
+        $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg) \
+      ), $(BuildTarget/$(target)) \
+    ) \
+  )
+  $(if $(PKG_HOST_ONLY)$(DUMP),,$(call Build/DefaultTargets,$(1)))
+endef
+
+define pkg_install_files
+	$(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)
+endef
+
+define pkg_install_bin
+	$(foreach install_apps,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_apps)`; $(INSTALL_BIN) $(2)/$(install_apps) $(3)/`dirname $(install_apps)`;)
+endef
+
+Build/Prepare=$(call Build/Prepare/Default,)
+Build/Configure=$(call Build/Configure/Default,)
+Build/Compile=$(call Build/Compile/Default,)
+Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,))
+Build/Dist=$(call Build/Dist/Default,)
+Build/DistCheck=$(call Build/DistCheck/Default,)
+
+.NOTPARALLEL:
+
+.PHONY: prepare-package-install
+prepare-package-install:
+	@mkdir -p $(PKG_INFO_DIR)
+	@touch $(PKG_INSTALL_STAMP).clean
+	@echo "$(filter-out essential,$(PKG_FLAGS))" > $(PKG_INSTALL_STAMP).flags
+
+$(PACKAGE_DIR):
+	mkdir -p $@
+	
+dumpinfo:
+download:
+prepare:
+configure:
+compile: prepare-package-install
+install: compile
+clean-staging: FORCE
+	rm -f $(STAMP_INSTALLED)
+	@-(\
+		cd "$(STAGING_DIR)"; \
+		if [ -f packages/$(STAGING_FILES_LIST) ]; then \
+			cat packages/$(STAGING_FILES_LIST) | xargs -r rm -f 2>/dev/null; \
+		fi; \
+	)
+
+clean: clean-staging FORCE
+	$(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))
+	$(Build/Clean)
+	rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) $(STAGING_DIR_HOST)/packages/$(STAGING_FILES_LIST)
+	rm -rf $(PKG_BUILD_DIR)
+
+dist:
+	$(Build/Dist)
+   
+distcheck:
+	$(Build/DistCheck) 
diff --git a/trunk/include/prereq-build.mk b/trunk/include/prereq-build.mk
new file mode 100644
index 00000000..a806ffef
--- /dev/null
+++ b/trunk/include/prereq-build.mk
@@ -0,0 +1,202 @@
+# 
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/prereq.mk
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+PKG_NAME:=Build dependency
+
+define Require/non-root
+	[ "$$(shell whoami)" != "root" ]
+endef
+$(eval $(call Require,non-root, \
+	Please do not compile as root. \
+))
+
+# Required for the toolchain
+define Require/working-make
+	$(MAKE) -v | awk '($$$$1 == "GNU") && ($$$$2 == "Make") && ($$$$3 >= "3.81") { print "ok" }' | grep ok > /dev/null
+endef
+
+$(eval $(call Require,working-make, \
+	Please install GNU make v3.81 or later. (This version has bugs) \
+))
+
+define Require/case-sensitive-fs
+	rm -f $(TMP_DIR)/test.*
+	touch $(TMP_DIR)/test.fs
+	[ \! -f $(TMP_DIR)/test.FS ]
+endef
+
+$(eval $(call Require,case-sensitive-fs, \
+	libreCMC can only be built on a case-sensitive filesystem \
+))
+
+define Require/getopt
+	gnugetopt --help 2>&1 | grep long >/dev/null || \
+	/usr/local/bin/getopt --help 2>&1 | grep long >/dev/null || \
+	getopt --help 2>&1 | grep long >/dev/null
+endef
+$(eval $(call Require,getopt, \
+	Please install GNU getopt \
+))
+
+define Require/fileutils
+	gcp --help || cp --help
+endef
+$(eval $(call Require,fileutils, \
+	Please install GNU fileutils \
+))
+
+define Require/working-gcc
+	echo 'int main(int argc, char **argv) { return 0; }' | \
+		gcc -x c -o $(TMP_DIR)/a.out -
+endef
+
+$(eval $(call Require,working-gcc, \
+	Please install the GNU C Compiler (gcc). \
+))
+
+define Require/working-g++
+	echo 'int main(int argc, char **argv) { return 0; }' | \
+		g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
+		$(TMP_DIR)/a.out
+endef
+
+$(eval $(call Require,working-g++, \
+	Please install the GNU C++ Compiler (g++). \
+))
+
+ifneq ($(HOST_STATIC_LINKING),)
+  define Require/working-gcc-static
+	echo 'int main(int argc, char **argv) { return 0; }' | \
+		gcc -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out -
+  endef
+
+  $(eval $(call Require,working-gcc-static, \
+    Please install the static libc development package (glibc-static on CentOS/Fedora/RHEL). \
+  ))
+
+  define Require/working-g++-static
+	echo 'int main(int argc, char **argv) { return 0; }' | \
+		g++ -x c++ $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lstdc++ && \
+		$(TMP_DIR)/a.out
+  endef
+
+  $(eval $(call Require,working-g++-static, \
+	Please install the static libstdc++ development package (libstdc++-static on CentOS/Fedora/RHEL). \
+  ))
+endif
+
+define Require/ncurses
+	echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
+		gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses
+endef
+
+$(eval $(call Require,ncurses, \
+	Please install ncurses. (Missing libncurses.so or ncurses.h) \
+))
+
+
+define Require/zlib
+	echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
+		gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - -lz
+endef
+
+$(eval $(call Require,zlib, \
+	Please install zlib. (Missing libz.so or zlib.h) \
+))
+
+ifneq ($(HOST_STATIC_LINKING),)
+  define Require/zlib-static
+	echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
+		gcc -include zlib.h -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lz
+  endef
+
+  $(eval $(call Require,zlib-static, \
+	Please install a static zlib. (zlib-static on CentOS/Fedora/RHEL). \
+  ))
+endif
+
+$(eval $(call RequireCommand,gawk, \
+	Please install GNU awk. \
+))
+
+$(eval $(call RequireCommand,unzip, \
+	Please install unzip. \
+))
+
+$(eval $(call RequireCommand,bzip2, \
+	Please install bzip2. \
+))
+
+$(eval $(call RequireCommand,perl, \
+	Please install perl. \
+))
+
+$(eval $(call RequireCommand,$(PYTHON), \
+	Please install python. \
+))
+
+$(eval $(call RequireCommand,wget, \
+	Please install wget. \
+))
+
+define Require/git
+	git --version | awk '($$$$1 == "git") && ($$$$2 == "version") && ($$$$3 >= "1.6.5") { print "ok" }' | grep ok > /dev/null
+endef
+
+$(eval $(call Require,git, \
+	Please install git (git-core) v1.6.5 or later. \
+))
+
+define Require/gnutar
+	$(TAR) --version 2>&1 | grep GNU > /dev/null
+endef
+
+$(eval $(call Require,gnutar, \
+	Please install GNU tar. \
+))
+
+$(eval $(call RequireCommand,svn, \
+	Please install the subversion client. \
+))
+
+define Require/libssl
+	echo 'int main(int argc, char **argv) { SSL_library_init(); return 0; }' | \
+		gcc -include openssl/ssl.h -x c -o $(TMP_DIR)/a.out - -lcrypto -lssl
+endef
+
+$(eval $(call Require,libssl, \
+	Please install the openssl library (with development headers) \
+))
+
+$(eval $(call RequireCommand,openssl, \
+       Please install openssl. \
+))
+
+define Require/gnu-find
+	$(FIND) --version 2>/dev/null
+endef
+
+$(eval $(call Require,gnu-find, \
+	Please install GNU find \
+))
+
+define Require/getopt-extended
+	getopt --long - - >/dev/null
+endef
+
+$(eval $(call Require,getopt-extended, \
+	Please install an extended getopt version that supports --long \
+))
+
+$(eval $(call RequireCommand,file, \
+	Please install the 'file' package. \
+))
diff --git a/trunk/include/prereq.mk b/trunk/include/prereq.mk
new file mode 100644
index 00000000..45ee77e9
--- /dev/null
+++ b/trunk/include/prereq.mk
@@ -0,0 +1,62 @@
+# 
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifneq ($(__prereq_inc),1)
+__prereq_inc:=1
+
+prereq:
+	if [ -f $(TMP_DIR)/.prereq-error ]; then \
+		echo; \
+		cat $(TMP_DIR)/.prereq-error; \
+		rm -f $(TMP_DIR)/.prereq-error; \
+		echo; \
+		false; \
+	fi
+
+.SILENT: prereq
+endif
+
+define Require
+  export PREREQ_CHECK=1
+  ifeq ($$(CHECK_$(1)),)
+    prereq: prereq-$(1)
+
+    prereq-$(1): FORCE
+		echo -n "Checking '$(1)'... "
+		if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \
+			echo 'ok.'; \
+		else \
+			echo 'failed.'; \
+			echo -e "$(PKG_NAME): $(strip $(2))" | perl -ne 's/\\\s*/\n/g,print' >> $(TMP_DIR)/.prereq-error; \
+		fi
+
+    check-$(1): FORCE
+	  $(call Require/$(1))
+    CHECK_$(1):=1
+
+    .SILENT: prereq-$(1) check-$(1)
+    .NOTPARALLEL:
+  endif
+endef
+
+
+define RequireCommand
+  define Require/$(1)
+    which $(1)
+  endef
+
+  $$(eval $$(call Require,$(1),$(2)))
+endef
+
+define RequireHeader
+  define Require/$(1)
+    [ -e "$(1)" ]
+  endef
+  
+  $$(eval $$(call Require,$(1),$(2)))
+endef
+
diff --git a/trunk/include/quilt.mk b/trunk/include/quilt.mk
new file mode 100644
index 00000000..925b7a73
--- /dev/null
+++ b/trunk/include/quilt.mk
@@ -0,0 +1,170 @@
+# 
+# Copyright (C) 2007-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+ifneq ($(if $(DUMP),1,$(__quilt_inc)),1)
+__quilt_inc:=1
+
+ifeq ($(TARGET_BUILD),1)
+  PKG_BUILD_DIR:=$(LINUX_DIR)
+endif
+PATCH_DIR?=./patches
+FILES_DIR?=./files
+HOST_PATCH_DIR?=$(PATCH_DIR)
+HOST_FILES_DIR?=$(FILES_DIR)
+
+ifeq ($(MAKECMDGOALS),refresh)
+  override QUILT=1
+endif
+
+QUILT_CMD:=quilt --quiltrc=-
+
+define filter_series
+sed -e s,\\\#.*,, $(1) | grep -E \[a-zA-Z0-9\]
+endef
+
+define PatchDir/Quilt
+	@mkdir -p "$(1)/patches$(if $(3),/$(patsubst %/,%,$(3)))"
+	@if [ -s "$(2)/series" ]; then \
+		mkdir -p "$(1)/patches/$(3)"; \
+		cp "$(2)/series" "$(1)/patches/$(3)"; \
+	fi
+	@for patch in $$$$( (cd "$(2)" && if [ -f series ]; then $(call filter_series,series); else ls | sort; fi; ) 2>/dev/null ); do ( \
+		cp "$(2)/$$$$patch" "$(1)/patches/$(3)"; \
+		echo "$(3)$$$$patch" >> "$(1)/patches/series"; \
+	); done
+	$(if $(3),@echo $(3) >> "$(1)/patches/.subdirs")
+endef
+
+define PatchDir/Default
+	@if [ -d "$(2)" ] && [ "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
+		export PATCH="$(PATCH)"; \
+		if [ -s "$(2)/series" ]; then \
+			$(call filter_series,$(2)/series) | xargs -n1 \
+				$(KPATCH) "$(1)" "$(2)"; \
+		else \
+			$(KPATCH) "$(1)" "$(2)"; \
+		fi; \
+	fi
+endef
+
+define PatchDir
+$(call PatchDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3)))
+endef
+
+define HostPatchDir
+$(call PatchDir/$(if $(strip $(HOST_QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3)))
+endef
+
+ifneq ($(PKG_BUILD_DIR),)
+  QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y)
+  ifneq ($(QUILT),)
+    STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
+    override CONFIG_AUTOREBUILD=
+    quilt-check: $(STAMP_CHECKED)
+  endif
+endif
+
+ifneq ($(HOST_BUILD_DIR),)
+  HOST_QUILT?=$(if $(findstring command,$(origin QUILT)),$(QUILT),$(if $(wildcard $(HOST_BUILD_DIR)/.quilt_used),y))
+  ifneq ($(HOST_QUILT),)
+    HOST_STAMP_CHECKED:=$(HOST_BUILD_DIR)/.quilt_checked
+    override CONFIG_AUTOREBUILD=
+    host-quilt-check: $(HOST_STAMP_CHECKED)
+  endif
+endif
+
+define Host/Patch/Default
+	$(if $(HOST_QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches)
+	$(call HostPatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),)
+	$(if $(HOST_QUILT),touch $(HOST_BUILD_DIR)/.quilt_used)
+endef
+
+define Build/Patch/Default
+	$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
+	$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),)
+	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
+endef
+
+kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.)
+define Kernel/Patch/Default
+	rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches
+	$(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/)
+	find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
+	$(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
+	$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/)
+endef
+
+define Quilt/RefreshDir
+	mkdir -p $(2)
+	-rm -f $(2)/* 2>/dev/null >/dev/null
+	@( \
+		for patch in $$$$($(if $(3),grep "^$(3)",cat) $(1)/patches/series | awk '{print $$$$1}'); do \
+			$(CP) -v "$(1)/patches/$$$$patch" $(2); \
+		done; \
+	)
+endef
+
+define Quilt/Refresh/Host
+	$(call Quilt/RefreshDir,$(HOST_BUILD_DIR),$(PATCH_DIR))
+endef
+
+define Quilt/Refresh/Package
+	$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR))
+endef
+
+define Quilt/Refresh/Kernel
+	@[ -z "$$(grep -v '^generic/' $(PKG_BUILD_DIR)/patches/series | grep -v '^platform/')" ] || { \
+		echo "All kernel patches must start with either generic/ or platform/"; \
+		false; \
+	}
+	$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
+	$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/)
+endef
+
+define Quilt/Template
+  $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED)
+  $(if $(NO_RECONFIGURE),$($(2)STAMP_BUILT),$($(2)STAMP_CONFIGURED)): FORCE
+  $($(2)STAMP_CHECKED): $($(2)STAMP_PREPARED)
+	if [ -s "$(1)/patches/series" ]; then \
+		(cd "$(1)"; \
+			if $(QUILT_CMD) next >/dev/null 2>&1; then \
+				$(QUILT_CMD) push -a; \
+			else \
+				$(QUILT_CMD) top >/dev/null 2>&1; \
+			fi \
+		); \
+	fi
+	touch "$$@"
+
+  $(3)quilt-check: $($(2)STAMP_PREPARED) FORCE
+	@[ -f "$(1)/.quilt_used" ] || { \
+		echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
+		false; \
+	}
+	@[ -f "$(1)/patches/series" ] || { \
+		echo "The source directory contains no quilt patches."; \
+		false; \
+	}
+	@[ -n "$$$$(ls $(1)/patches/series)" -o "$$$$(cat $(1)/patches/series | md5sum)" = "$$(sort $(1)/patches/series | md5sum)" ] || { \
+		echo "The patches are not sorted in the right order. Please fix."; \
+		false; \
+	}
+
+  $(3)refresh: $(3)quilt-check
+	@cd "$(1)"; $(QUILT_CMD) pop -a -f >/dev/null 2>/dev/null
+	@cd "$(1)"; while $(QUILT_CMD) next 2>/dev/null >/dev/null && $(QUILT_CMD) push; do \
+		QUILT_DIFF_OPTS="-p" $(QUILT_CMD) refresh -p ab --no-index --no-timestamps; \
+	done; ! $(QUILT_CMD) next 2>/dev/null >/dev/null
+	$(Quilt/Refresh/$(4))
+	
+  $(3)update: $(3)quilt-check
+	$(Quilt/Refresh/$(4))
+endef
+
+Build/Quilt=$(call Quilt/Template,$(PKG_BUILD_DIR),,,$(if $(TARGET_BUILD),Kernel,Package))
+Host/Quilt=$(call Quilt/Template,$(HOST_BUILD_DIR),HOST_,host-,Host)
+
+endif
diff --git a/trunk/include/scan.mk b/trunk/include/scan.mk
new file mode 100644
index 00000000..09983334
--- /dev/null
+++ b/trunk/include/scan.mk
@@ -0,0 +1,80 @@
+include $(TOPDIR)/include/verbose.mk
+TMP_DIR:=$(TOPDIR)/tmp
+
+all: $(TMP_DIR)/.$(SCAN_TARGET)
+
+include $(TOPDIR)/include/host.mk
+
+SCAN_TARGET ?= packageinfo
+SCAN_NAME ?= package
+SCAN_DIR ?= package
+TARGET_STAMP:=$(TMP_DIR)/info/.files-$(SCAN_TARGET).stamp
+FILELIST:=$(TMP_DIR)/info/.files-$(SCAN_TARGET)-$(SCAN_COOKIE)
+
+ifeq ($(IS_TTY),1)
+  define progress
+	printf "\033[M\r$(1)" >&2;
+  endef
+else
+  define progress
+	:;
+  endef
+endif
+
+define feedname
+$(if $(patsubst feeds/%,,$(1)),,$(word 2,$(subst /, ,$(1))))
+endef
+
+define PackageDir
+  $(TMP_DIR)/.$(SCAN_TARGET): $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1)
+  $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(2)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(2)/$(DEP))))
+	{ \
+		$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
+		echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
+		$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null || { \
+			mkdir -p "$(TOPDIR)/logs/$(SCAN_DIR)/$(2)"; \
+			$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) > $(TOPDIR)/logs/$(SCAN_DIR)/$(2)/dump.txt 2>&1; \
+			$$(call progress,ERROR: please fix $(SCAN_DIR)/$(2)/Makefile - see logs/$(SCAN_DIR)/$(2)/dump.txt for details\n) \
+			rm -f $$@; \
+		}; \
+		echo; \
+	} > $$@ || true
+endef
+
+$(FILELIST):
+	rm -f $(TMP_DIR)/info/.files-$(SCAN_TARGET)-*
+	$(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
+
+$(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
+	( \
+		cat $< | awk '{print "$(SCAN_DIR)/" $$0 "/Makefile" }' | xargs grep -HE '^ *SCAN_DEPS *= *' | awk -F: '{ gsub(/^.*DEPS *= */, "", $$2); print "DEPS_" $$1 "=" $$2 }'; \
+		awk -v deps="$$DEPS" '{ \
+			info=$$0; \
+			gsub(/\//, "_", info); \
+			print "$$(eval $$(call PackageDir," info "," $$0 "))"; \
+		} ' < $<; \
+		true; \
+	) > $@
+
+-include $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk
+
+$(TARGET_STAMP)::
+	+( \
+		$(NO_TRACE_MAKE) $(FILELIST); \
+		MD5SUM=$$(cat $(FILELIST) | (md5sum || md5) 2>/dev/null | awk '{print $$1}'); \
+		[ -f "$@.$$MD5SUM" ] || { \
+			rm -f $@.*; \
+			touch $@.$$MD5SUM; \
+			touch $@; \
+		} \
+	)
+
+$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
+	$(call progress,Collecting $(SCAN_NAME) info: merging...)
+	-cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 2>/dev/null
+	$(call progress,Collecting $(SCAN_NAME) info: done)
+	echo
+
+FORCE:
+.PHONY: FORCE
+.NOTPARALLEL:
diff --git a/trunk/include/scons.mk b/trunk/include/scons.mk
new file mode 100644
index 00000000..a8306b65
--- /dev/null
+++ b/trunk/include/scons.mk
@@ -0,0 +1,23 @@
+export PLATFORM=posix
+
+SCONS_VARS = \
+	CC="$(TARGET_CC_NOCACHE)" \
+	CXX="$(TARGET_CXX_NOCACHE)" \
+	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+	CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
+	DESTDIR="$(PKG_INSTALL_DIR)"
+
+define Build/Configure/Default
+	(cd $(PKG_BUILD_DIR); \
+		$(SCONS_VARS) \
+		scons \
+			prefix=/usr \
+			$(SCONS_OPTIONS) \
+		install \
+	)
+endef
+
+define Build/Compile
+endef
diff --git a/trunk/include/shell.sh b/trunk/include/shell.sh
new file mode 100644
index 00000000..634beedc
--- /dev/null
+++ b/trunk/include/shell.sh
@@ -0,0 +1,37 @@
+getvar() {
+	eval "echo \"\${$1}\""
+}
+
+var2file() {
+	local var
+	eval "var=\"\${$1}\""
+	if [ -n "$var" ]; then echo "$var" > "$2"; fi
+}
+
+isset() {
+	local var
+	eval "var=\"\${$1}\""
+	[ -n "$var" ]
+}
+
+trapret() {(
+	local retvals="$1"; shift
+	local cmd="$1"; shift
+	for retval in $(echo $retvals); do
+		local trap_$retval=1
+	done
+	"$cmd" "$@" || {
+		local retval="$?"
+		eval "trapped=\${trap_$retval}"
+		[ -n "$trapped" ] || {
+			return $retval
+		}
+	}
+)}
+
+md5s() {
+	cat "$@" | (
+		md5sum 2>/dev/null ||
+		md5 
+	) | awk '{print $1}'
+}
diff --git a/trunk/include/site/aarch64-librecmc-linux-gnu b/trunk/include/site/aarch64-librecmc-linux-gnu
new file mode 100644
index 00000000..d84dd0a1
--- /dev/null
+++ b/trunk/include/site/aarch64-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/aarch64-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/aarch64-linux b/trunk/include/site/aarch64-linux
new file mode 100644
index 00000000..41dfc01d
--- /dev/null
+++ b/trunk/include/site/aarch64-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=8
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=8
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=8
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=8
+ac_cv_sizeof_ssize_t=8
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=8
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=8
diff --git a/trunk/include/site/aarch64_be-librecmc-linux-gnu b/trunk/include/site/aarch64_be-librecmc-linux-gnu
new file mode 100644
index 00000000..d84dd0a1
--- /dev/null
+++ b/trunk/include/site/aarch64_be-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/aarch64-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/aarch64_be-linux b/trunk/include/site/aarch64_be-linux
new file mode 100644
index 00000000..1541a89d
--- /dev/null
+++ b/trunk/include/site/aarch64_be-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=8
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=8
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=8
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=8
+ac_cv_sizeof_ssize_t=8
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=8
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=8
diff --git a/trunk/include/site/arm-librecmc-linux-gnu b/trunk/include/site/arm-librecmc-linux-gnu
new file mode 100644
index 00000000..efb72453
--- /dev/null
+++ b/trunk/include/site/arm-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/arm-librecmc-linux-gnueabi b/trunk/include/site/arm-librecmc-linux-gnueabi
new file mode 100644
index 00000000..efb72453
--- /dev/null
+++ b/trunk/include/site/arm-librecmc-linux-gnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/arm-librecmc-linux-musl b/trunk/include/site/arm-librecmc-linux-musl
new file mode 100644
index 00000000..f17d96ab
--- /dev/null
+++ b/trunk/include/site/arm-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/arm-librecmc-linux-muslgnueabi b/trunk/include/site/arm-librecmc-linux-muslgnueabi
new file mode 100644
index 00000000..f17d96ab
--- /dev/null
+++ b/trunk/include/site/arm-librecmc-linux-muslgnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/arm-librecmc-linux-uclibc b/trunk/include/site/arm-librecmc-linux-uclibc
new file mode 100644
index 00000000..f17d96ab
--- /dev/null
+++ b/trunk/include/site/arm-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/arm-librecmc-linux-uclibcgnueabi b/trunk/include/site/arm-librecmc-linux-uclibcgnueabi
new file mode 100644
index 00000000..f17d96ab
--- /dev/null
+++ b/trunk/include/site/arm-librecmc-linux-uclibcgnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/arm-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/arm-linux b/trunk/include/site/arm-linux
new file mode 100644
index 00000000..80cc8db2
--- /dev/null
+++ b/trunk/include/site/arm-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/armeb-librecmc-linux-gnu b/trunk/include/site/armeb-librecmc-linux-gnu
new file mode 100644
index 00000000..41129b07
--- /dev/null
+++ b/trunk/include/site/armeb-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/armeb-librecmc-linux-gnueabi b/trunk/include/site/armeb-librecmc-linux-gnueabi
new file mode 100644
index 00000000..41129b07
--- /dev/null
+++ b/trunk/include/site/armeb-librecmc-linux-gnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/armeb-librecmc-linux-musl b/trunk/include/site/armeb-librecmc-linux-musl
new file mode 100644
index 00000000..dd64a9c5
--- /dev/null
+++ b/trunk/include/site/armeb-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/armeb-librecmc-linux-muslgnueabi b/trunk/include/site/armeb-librecmc-linux-muslgnueabi
new file mode 100644
index 00000000..dd64a9c5
--- /dev/null
+++ b/trunk/include/site/armeb-librecmc-linux-muslgnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/armeb-librecmc-linux-uclibc b/trunk/include/site/armeb-librecmc-linux-uclibc
new file mode 100644
index 00000000..dd64a9c5
--- /dev/null
+++ b/trunk/include/site/armeb-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/armeb-librecmc-linux-uclibcgnueabi b/trunk/include/site/armeb-librecmc-linux-uclibcgnueabi
new file mode 100644
index 00000000..dd64a9c5
--- /dev/null
+++ b/trunk/include/site/armeb-librecmc-linux-uclibcgnueabi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/armeb-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/armeb-linux b/trunk/include/site/armeb-linux
new file mode 100644
index 00000000..c421c51a
--- /dev/null
+++ b/trunk/include/site/armeb-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/avr32-librecmc-linux-gnu b/trunk/include/site/avr32-librecmc-linux-gnu
new file mode 100644
index 00000000..87cfe7d9
--- /dev/null
+++ b/trunk/include/site/avr32-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/avr32-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/avr32-librecmc-linux-uclibc b/trunk/include/site/avr32-librecmc-linux-uclibc
new file mode 100644
index 00000000..9fe045fa
--- /dev/null
+++ b/trunk/include/site/avr32-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/avr32-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/avr32-linux b/trunk/include/site/avr32-linux
new file mode 100644
index 00000000..c421c51a
--- /dev/null
+++ b/trunk/include/site/avr32-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/cris-librecmc-linux-gnu b/trunk/include/site/cris-librecmc-linux-gnu
new file mode 100644
index 00000000..c35ddcda
--- /dev/null
+++ b/trunk/include/site/cris-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/cris-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/cris-librecmc-linux-uclibc b/trunk/include/site/cris-librecmc-linux-uclibc
new file mode 100644
index 00000000..87346ee6
--- /dev/null
+++ b/trunk/include/site/cris-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/cris-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/cris-linux b/trunk/include/site/cris-linux
new file mode 100644
index 00000000..80cc8db2
--- /dev/null
+++ b/trunk/include/site/cris-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/i486-librecmc-linux-gnu b/trunk/include/site/i486-librecmc-linux-gnu
new file mode 100644
index 00000000..77bbe241
--- /dev/null
+++ b/trunk/include/site/i486-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i486-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/i486-librecmc-linux-musl b/trunk/include/site/i486-librecmc-linux-musl
new file mode 100644
index 00000000..4d796d68
--- /dev/null
+++ b/trunk/include/site/i486-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i486-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/i486-librecmc-linux-uclibc b/trunk/include/site/i486-librecmc-linux-uclibc
new file mode 100644
index 00000000..4d796d68
--- /dev/null
+++ b/trunk/include/site/i486-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i486-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/i486-linux b/trunk/include/site/i486-linux
new file mode 100644
index 00000000..80cc8db2
--- /dev/null
+++ b/trunk/include/site/i486-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/i686-librecmc-linux-gnu b/trunk/include/site/i686-librecmc-linux-gnu
new file mode 100644
index 00000000..6c9c929c
--- /dev/null
+++ b/trunk/include/site/i686-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i686-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/i686-librecmc-linux-musl b/trunk/include/site/i686-librecmc-linux-musl
new file mode 100644
index 00000000..ef073da3
--- /dev/null
+++ b/trunk/include/site/i686-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i686-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/i686-librecmc-linux-uclibc b/trunk/include/site/i686-librecmc-linux-uclibc
new file mode 100644
index 00000000..ef073da3
--- /dev/null
+++ b/trunk/include/site/i686-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/i686-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/i686-linux b/trunk/include/site/i686-linux
new file mode 100644
index 00000000..80cc8db2
--- /dev/null
+++ b/trunk/include/site/i686-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/linux b/trunk/include/site/linux
new file mode 100644
index 00000000..b193d25c
--- /dev/null
+++ b/trunk/include/site/linux
@@ -0,0 +1,78 @@
+ac_atomic_add=yes
+ac_atomic_sub=yes
+ac_cv_c_gettext_without_libintl=yes
+ac_cv_c_long_double=no
+ac_cv_conv_longlong_to_float=yes
+ac_cv_file__dev_zero=yes
+ac_cv_func___va_copy=no
+ac_cv_func__exit=yes
+ac_cv_func_bcopy=yes
+ac_cv_func_bzero=yes
+ac_cv_func_bcmp=yes
+ac_cv_func_creal=yes
+ac_cv_func_cimag=yes
+ac_cv_func_fchmod=yes
+ac_cv_func_getaddrinfo=yes
+ac_cv_func_getcwd=yes
+ac_cv_func_getdomainname=yes
+ac_cv_func_getpgrp_void=yes
+ac_cv_func_getpwuid_r=yes
+ac_cv_func_gettimeofday=yes
+ac_cv_func_index=yes
+ac_cv_func_lstat_dereferences_slashed_symlink=yes
+ac_cv_func_lstat_empty_string_bug=no
+ac_cv_func_lstat=yes
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_malloc_works=yes
+ac_cv_func_memcmp_clean=yes
+ac_cv_func_memcmp_working=yes
+ac_cv_func_posix_getgrgid_r=yes
+ac_cv_func_posix_getpwuid_r=yes
+ac_cv_func_psignal=yes
+ac_cv_func_pthread_key_delete=yes
+ac_cv_func_realloc_0_nonnull=yes
+ac_cv_func_realloc_works=yes
+ac_cv_func_rename=yes
+ac_cv_func_rindex=yes
+ac_cv_func_setlocale=yes
+ac_cv_func_setgrent_void=yes
+ac_cv_func_setpgrp_void=yes
+ac_cv_func_setresuid=no
+ac_cv_func_setvbuf_reversed=no
+ac_cv_func_stat_empty_string_bug=no
+ac_cv_func_stat_ignores_trailing_slash=no
+ac_cv_func_strerror=yes
+ac_cv_func_strftime=yes
+ac_cv_func_utimes=yes
+ac_cv_func___adjtimex=yes
+ac_cv_func_va_copy=no
+ac_cv_func_vsnprintf=yes
+ac_cv_have_accrights_in_msghdr=no
+ac_cv_have_broken_snprintf=no
+ac_cv_have_control_in_msghdr=yes
+ac_cv_have_decl_sys_siglist=no
+ac_cv_have_openpty_ctty_bug=yes
+ac_cv_have_space_d_name_in_struct_dirent=yes
+ac_cv_header_netinet_sctp_h=no
+ac_cv_header_netinet_sctp_uio_h=no
+ac_cv_int64_t=yes
+ac_cv_lbl_unaligned_fail=no
+ac_cv_linux_kernel_pppoe=yes
+ac_cv_linux_vers=2
+ac_cv_pack_bitfields_reversed=yes
+ac_cv_path_LDCONFIG=
+ac_cv_regexec_segfault_emptystr=no
+ac_cv_sctp=no
+ac_cv_sys_restartable_syscalls=yes
+ac_cv_time_r_type=POSIX
+ac_cv_type_suseconds_t=yes
+ac_cv_uchar=no
+ac_cv_uint=yes
+ac_cv_uint64_t=yes
+ac_cv_ulong=yes
+ac_cv_ushort=yes
+ac_cv_va_copy=C99
+ac_cv_va_val_copy=yes
+as_cv_unaligned_access=yes
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_realloc_0_nonnull=yes
diff --git a/trunk/include/site/linux-gnu b/trunk/include/site/linux-gnu
new file mode 100644
index 00000000..be4a8d00
--- /dev/null
+++ b/trunk/include/site/linux-gnu
@@ -0,0 +1 @@
+. $TOPDIR/include/site/linux
diff --git a/trunk/include/site/linux-uclibc b/trunk/include/site/linux-uclibc
new file mode 100644
index 00000000..be4a8d00
--- /dev/null
+++ b/trunk/include/site/linux-uclibc
@@ -0,0 +1 @@
+. $TOPDIR/include/site/linux
diff --git a/trunk/include/site/m68k-librecmc-linux-gnu b/trunk/include/site/m68k-librecmc-linux-gnu
new file mode 100644
index 00000000..69c51d59
--- /dev/null
+++ b/trunk/include/site/m68k-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/m68k-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/m68k-librecmc-linux-uclibc b/trunk/include/site/m68k-librecmc-linux-uclibc
new file mode 100644
index 00000000..69c51d59
--- /dev/null
+++ b/trunk/include/site/m68k-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/m68k-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/m68k-linux b/trunk/include/site/m68k-linux
new file mode 100644
index 00000000..a2533ded
--- /dev/null
+++ b/trunk/include/site/m68k-linux
@@ -0,0 +1,26 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/mips-librecmc-linux-gnu b/trunk/include/site/mips-librecmc-linux-gnu
new file mode 100644
index 00000000..a70e9a71
--- /dev/null
+++ b/trunk/include/site/mips-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/mips-librecmc-linux-musl b/trunk/include/site/mips-librecmc-linux-musl
new file mode 100644
index 00000000..76a1b283
--- /dev/null
+++ b/trunk/include/site/mips-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/mips-librecmc-linux-uclibc b/trunk/include/site/mips-librecmc-linux-uclibc
new file mode 100644
index 00000000..76a1b283
--- /dev/null
+++ b/trunk/include/site/mips-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/mips-linux b/trunk/include/site/mips-linux
new file mode 100644
index 00000000..c421c51a
--- /dev/null
+++ b/trunk/include/site/mips-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/mips-linux-gnu b/trunk/include/site/mips-linux-gnu
new file mode 100644
index 00000000..a70e9a71
--- /dev/null
+++ b/trunk/include/site/mips-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/mips64-librecmc-linux-gnu b/trunk/include/site/mips64-librecmc-linux-gnu
new file mode 100644
index 00000000..b7474d52
--- /dev/null
+++ b/trunk/include/site/mips64-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips64-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/mips64-librecmc-linux-uclibc b/trunk/include/site/mips64-librecmc-linux-uclibc
new file mode 100644
index 00000000..1b1347ce
--- /dev/null
+++ b/trunk/include/site/mips64-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips64-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/mips64-linux b/trunk/include/site/mips64-linux
new file mode 100644
index 00000000..1541a89d
--- /dev/null
+++ b/trunk/include/site/mips64-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=8
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=8
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=8
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=8
+ac_cv_sizeof_ssize_t=8
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=8
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=8
diff --git a/trunk/include/site/mips64el-librecmc-linux-gnu b/trunk/include/site/mips64el-librecmc-linux-gnu
new file mode 100644
index 00000000..b7474d52
--- /dev/null
+++ b/trunk/include/site/mips64el-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips64-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/mips64el-librecmc-linux-uclibc b/trunk/include/site/mips64el-librecmc-linux-uclibc
new file mode 100644
index 00000000..1b1347ce
--- /dev/null
+++ b/trunk/include/site/mips64el-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mips64-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/mips64el-linux b/trunk/include/site/mips64el-linux
new file mode 100644
index 00000000..41dfc01d
--- /dev/null
+++ b/trunk/include/site/mips64el-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=8
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=8
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=8
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=8
+ac_cv_sizeof_ssize_t=8
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=8
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=8
diff --git a/trunk/include/site/mipsel-librecmc-linux-gnu b/trunk/include/site/mipsel-librecmc-linux-gnu
new file mode 100644
index 00000000..fa33e56f
--- /dev/null
+++ b/trunk/include/site/mipsel-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mipsel-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/mipsel-librecmc-linux-musl b/trunk/include/site/mipsel-librecmc-linux-musl
new file mode 100644
index 00000000..b53d4d48
--- /dev/null
+++ b/trunk/include/site/mipsel-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mipsel-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/mipsel-librecmc-linux-uclibc b/trunk/include/site/mipsel-librecmc-linux-uclibc
new file mode 100644
index 00000000..b53d4d48
--- /dev/null
+++ b/trunk/include/site/mipsel-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mipsel-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/mipsel-librecmc-linux2.4-uclibc b/trunk/include/site/mipsel-librecmc-linux2.4-uclibc
new file mode 100644
index 00000000..3412411c
--- /dev/null
+++ b/trunk/include/site/mipsel-librecmc-linux2.4-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mipsel-linux
+. $TOPDIR/include/site/linux-uclibc
+ac_cv_header_sys_inotify_h=no
diff --git a/trunk/include/site/mipsel-linux b/trunk/include/site/mipsel-linux
new file mode 100644
index 00000000..80cc8db2
--- /dev/null
+++ b/trunk/include/site/mipsel-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/mipsel-linux-gnu b/trunk/include/site/mipsel-linux-gnu
new file mode 100644
index 00000000..fa33e56f
--- /dev/null
+++ b/trunk/include/site/mipsel-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mipsel-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/powerpc-librecmc-linux-gnu b/trunk/include/site/powerpc-librecmc-linux-gnu
new file mode 100644
index 00000000..bafb5df3
--- /dev/null
+++ b/trunk/include/site/powerpc-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/powerpc-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/powerpc-librecmc-linux-gnuspe b/trunk/include/site/powerpc-librecmc-linux-gnuspe
new file mode 100644
index 00000000..bafb5df3
--- /dev/null
+++ b/trunk/include/site/powerpc-librecmc-linux-gnuspe
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/powerpc-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/powerpc-librecmc-linux-musl b/trunk/include/site/powerpc-librecmc-linux-musl
new file mode 100644
index 00000000..bb48ee23
--- /dev/null
+++ b/trunk/include/site/powerpc-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/powerpc-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/powerpc-librecmc-linux-uclibc b/trunk/include/site/powerpc-librecmc-linux-uclibc
new file mode 100644
index 00000000..bb48ee23
--- /dev/null
+++ b/trunk/include/site/powerpc-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/powerpc-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/powerpc-librecmc-linux-uclibcspe b/trunk/include/site/powerpc-librecmc-linux-uclibcspe
new file mode 100644
index 00000000..bb48ee23
--- /dev/null
+++ b/trunk/include/site/powerpc-librecmc-linux-uclibcspe
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/powerpc-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/powerpc-linux b/trunk/include/site/powerpc-linux
new file mode 100644
index 00000000..c421c51a
--- /dev/null
+++ b/trunk/include/site/powerpc-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/sparc-librecmc-linux-gnu b/trunk/include/site/sparc-librecmc-linux-gnu
new file mode 100644
index 00000000..2fc6bf55
--- /dev/null
+++ b/trunk/include/site/sparc-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/sparc-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/sparc-librecmc-linux-uclibc b/trunk/include/site/sparc-librecmc-linux-uclibc
new file mode 100644
index 00000000..7a56dbd4
--- /dev/null
+++ b/trunk/include/site/sparc-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/sparc-linux
+. $TOPDIR/include/site/linux
+
diff --git a/trunk/include/site/sparc-linux b/trunk/include/site/sparc-linux
new file mode 100644
index 00000000..c421c51a
--- /dev/null
+++ b/trunk/include/site/sparc-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=4
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=4
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=4
+ac_cv_sizeof_ssize_t=4
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=4
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=4
diff --git a/trunk/include/site/sparc-linux-gnu b/trunk/include/site/sparc-linux-gnu
new file mode 100644
index 00000000..2fc6bf55
--- /dev/null
+++ b/trunk/include/site/sparc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/sparc-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/x86_64-librecmc-linux-gnu b/trunk/include/site/x86_64-librecmc-linux-gnu
new file mode 100644
index 00000000..60225840
--- /dev/null
+++ b/trunk/include/site/x86_64-librecmc-linux-gnu
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/x86_64-linux
+. $TOPDIR/include/site/linux-gnu
+
diff --git a/trunk/include/site/x86_64-librecmc-linux-musl b/trunk/include/site/x86_64-librecmc-linux-musl
new file mode 100644
index 00000000..cc351dfe
--- /dev/null
+++ b/trunk/include/site/x86_64-librecmc-linux-musl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/x86_64-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/x86_64-librecmc-linux-uclibc b/trunk/include/site/x86_64-librecmc-linux-uclibc
new file mode 100644
index 00000000..cc351dfe
--- /dev/null
+++ b/trunk/include/site/x86_64-librecmc-linux-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/x86_64-linux
+. $TOPDIR/include/site/linux-uclibc
+
diff --git a/trunk/include/site/x86_64-linux b/trunk/include/site/x86_64-linux
new file mode 100644
index 00000000..803213c5
--- /dev/null
+++ b/trunk/include/site/x86_64-linux
@@ -0,0 +1,28 @@
+ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+ac_cv_sizeof___int64=0
+ac_cv_sizeof_char=1
+ac_cv_sizeof_int=4
+ac_cv_sizeof_int16_t=2
+ac_cv_sizeof_int32_t=4
+ac_cv_sizeof_int64_t=8
+ac_cv_sizeof_long_int=8
+ac_cv_sizeof_long_long=8
+ac_cv_sizeof_long=8
+ac_cv_sizeof_off_t=8
+ac_cv_sizeof_short_int=2
+ac_cv_sizeof_short=2
+ac_cv_sizeof_size_t=8
+ac_cv_sizeof_ssize_t=8
+ac_cv_sizeof_u_int16_t=2
+ac_cv_sizeof_u_int32_t=4
+ac_cv_sizeof_u_int64_t=8
+ac_cv_sizeof_uint16_t=2
+ac_cv_sizeof_uint32_t=4
+ac_cv_sizeof_uint64_t=8
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=8
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_unsigned_short=2
+ac_cv_sizeof_void_p=8
diff --git a/trunk/include/subdir.mk b/trunk/include/subdir.mk
new file mode 100644
index 00000000..aa905bcb
--- /dev/null
+++ b/trunk/include/subdir.mk
@@ -0,0 +1,76 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifeq ($(MAKECMDGOALS),prereq)
+  SUBTARGETS:=prereq
+  PREREQ_ONLY:=1
+else
+  SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure
+endif
+
+subtarget-default = $(filter-out ., \
+	$(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)), \
+	$(if $($(1)/builddirs-default),$($(1)/builddirs-default), \
+	$($(1)/builddirs))))
+
+define subtarget
+  $(call warn_eval,$(1),t,T,$(1)/$(2): $($(1)/) $(foreach bd,$(call subtarget-default,$(1),$(2)),$(1)/$(bd)/$(2)))
+
+endef
+
+define ERROR
+	($(call MESSAGE, $(2)); $(if $(BUILD_LOG), echo "$(2)" >> $(BUILD_LOG_DIR)/$(1)/error.txt))
+endef
+
+lastdir=$(word $(words $(subst /, ,$(1))),$(subst /, ,$(1)))
+diralias=$(if $(findstring $(1),$(call lastdir,$(1))),,$(call lastdir,$(1)))
+
+# Parameters: <subdir>
+define subdir
+  $(call warn,$(1),d,D $(1))
+  $(foreach bd,$($(1)/builddirs),
+    $(call warn,$(1),d,BD $(1)/$(bd))
+    $(foreach target,$(SUBTARGETS),
+      $(foreach btype,$(buildtypes-$(bd)),
+        $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(btype)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(btype)/$(target)) $(call $(1)//$(btype)/$(target),$(1)/$(bd)/$(btype))))
+		  $(if $(call debug,$(1)/$(bd),v),,@)+$$(SUBMAKE) -r -C $(1)/$(bd) $(btype)-$(target) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(btype)-$(target))), || $(call ERROR,$(1),   ERROR: $(1)/$(bd) [$(btype)] failed to build.))
+        $(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(btype)/$(target): $(1)/$(bd)/$(btype)/$(target)))
+      )
+      $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd))))
+	  	$(if $(BUILD_LOG),@mkdir -p $(BUILD_LOG_DIR)/$(1)/$(bd))
+        $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $(strip $($(1)/$(bd)/variants)),$($(1)/$(bd)/variants),$(if $($(1)/$(bd)/default-variant),$($(1)/$(bd)/default-variant),__default))),
+			$(if $(call debug,$(1)/$(bd),v),,@)+$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -r -C $(1)/$(bd) $(target) BUILD_VARIANT="$(filter-out __default,$(variant))" $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call ERROR,$(1),   ERROR: $(1)/$(bd) failed to build$(if $(filter-out __default,$(variant)), (build variant: $(variant))).))
+        )
+      $(if $(PREREQ_ONLY)$(DUMP_TARGET_DB),,
+        # aliases
+        $(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(target): $(1)/$(bd)/$(target)))
+	  )
+	)
+  )
+  $(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target)))
+endef
+
+ifndef DUMP_TARGET_DB
+# Parameters: <subdir> <name> <target> <depends> <config options> <stampfile location>
+define stampfile
+  $(1)/stamp-$(3):=$(if $(6),$(6),$(STAGING_DIR))/stamp/.$(2)_$(3)$(5)
+  $$($(1)/stamp-$(3)): $(TMP_DIR)/.build $(4)
+	@+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) $(4) || \
+		$(MAKE) $(if $(QUIET),--no-print-directory) $$($(1)/flags-$(3)) $(1)/$(3)
+	@mkdir -p $$$$(dirname $$($(1)/stamp-$(3)))
+	@touch $$($(1)/stamp-$(3))
+
+  $$(if $(call debug,$(1),v),,.SILENT: $$($(1)/stamp-$(3)))
+
+  .PRECIOUS: $$($(1)/stamp-$(3)) # work around a make bug
+
+  $(1)//clean:=$(1)/stamp-$(3)/clean
+  $(1)/stamp-$(3)/clean: FORCE
+	@rm -f $$($(1)/stamp-$(3))
+
+endef
+endif
diff --git a/trunk/include/target.mk b/trunk/include/target.mk
new file mode 100644
index 00000000..db501e06
--- /dev/null
+++ b/trunk/include/target.mk
@@ -0,0 +1,296 @@
+#
+# Copyright (C) 2007-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifneq ($(__target_inc),1)
+__target_inc=1
+
+# default device type
+DEVICE_TYPE?=router
+
+# Default packages - the really basic set
+DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools
+# For nas targets
+DEFAULT_PACKAGES.nas:=block-mount fdisk lvm2 lsblk mdadm
+# For router targets
+DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-nf-nathelper firewall odhcpd odhcp6c
+DEFAULT_PACKAGES.bootloader:=
+
+ifneq ($(DUMP),)
+  all: dumpinfo
+endif
+
+target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+ifeq ($(DUMP),)
+  PLATFORM_DIR:=$(TOPDIR)/target/linux/$(BOARD)
+  SUBTARGET:=$(strip $(foreach subdir,$(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)),$(if $(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(subdir))),$(subdir))))
+else
+  PLATFORM_DIR:=${CURDIR}
+  ifeq ($(SUBTARGETS),)
+    SUBTARGETS:=$(strip $(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)))
+  endif
+endif
+
+TARGETID:=$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))
+PLATFORM_SUBDIR:=$(PLATFORM_DIR)$(if $(SUBTARGET),/$(SUBTARGET))
+
+ifneq ($(TARGET_BUILD),1)
+  ifndef DUMP
+    include $(PLATFORM_DIR)/Makefile
+    ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+      include $(PLATFORM_SUBDIR)/target.mk
+    endif
+  endif
+else
+  ifneq ($(SUBTARGET),)
+    -include ./$(SUBTARGET)/target.mk
+  endif
+endif
+
+# Add device specific packages (here below to allow device type set from subtarget)
+DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
+
+filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
+extra_packages = $(if $(filter wpad-mini wpad nas,$(1)),iwinfo)
+
+define Profile/Default
+  NAME:=
+  PACKAGES:=
+endef
+
+ifndef Profile
+define Profile
+  $(eval $(call Profile/Default))
+  $(eval $(call Profile/$(1)))
+  dumpinfo : $(call shexport,Profile/$(1)/Config)
+  dumpinfo : $(call shexport,Profile/$(1)/Description)
+  DUMPINFO += \
+	echo "Target-Profile: $(1)"; \
+	echo "Target-Profile-Name: $(NAME)"; \
+	echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \
+	if [ -f ./config/profile-$(1) ]; then \
+		echo "Target-Profile-Kconfig: yes"; \
+	fi; \
+	echo "Target-Profile-Config: "; \
+	echo "$$$$$$$$$(call shvar,Profile/$(1)/Config)"; \
+	echo "@@"; \
+	echo "Target-Profile-Description:"; \
+	echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \
+	echo "@@"; \
+	echo;
+  ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y)
+    PROFILE=$(1)
+  endif
+endef
+endif
+
+ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+  define IncludeProfiles
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
+    -include $(sort $(wildcard $(PLATFORM_SUBDIR)/profiles/*.mk))
+  endef
+else
+  define IncludeProfiles
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
+  endef
+endif
+
+ifeq ($(TARGET_BUILD),1)
+  $(eval $(call IncludeProfiles))
+else
+  ifeq ($(DUMP),)
+    $(eval $(call IncludeProfiles))
+  endif
+endif
+
+ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
+  include $(INCLUDE_DIR)/kernel-version.mk
+endif
+
+GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
+GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
+
+__config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
+__config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
+find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))
+
+GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR))
+LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR))
+ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+  LINUX_SUBTARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_SUBDIR))
+endif
+
+# config file list used for compiling
+LINUX_KCONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(TOPDIR)/env/kernel-config)
+
+# default config list for reconfiguring
+# defaults to subtarget if subtarget exists and target does not
+# defaults to target otherwise
+USE_SUBTARGET_CONFIG = $(if $(wildcard $(LINUX_TARGET_CONFIG)),,$(if $(LINUX_SUBTARGET_CONFIG),1))
+
+LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG)))
+LINUX_RECONFIG_TARGET = $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG),$(LINUX_TARGET_CONFIG))
+
+# select the config file to be changed by kernel_menuconfig/kernel_oldconfig
+ifeq ($(CONFIG_TARGET),platform)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_TARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),subtarget)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_SUBTARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),subtarget_platform)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(LINUX_TARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_TARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),env)
+  LINUX_RECONFIG_LIST = $(LINUX_KCONFIG_LIST)
+  LINUX_RECONFIG_TARGET = $(TOPDIR)/env/kernel-config
+endif
+
+__linux_confcmd = $(SCRIPT_DIR)/kconfig.pl $(2) $(patsubst %,+,$(wordlist 2,9999,$(1))) $(1)
+
+LINUX_CONF_CMD = $(call __linux_confcmd,$(LINUX_KCONFIG_LIST),)
+LINUX_RECONF_CMD = $(call __linux_confcmd,$(LINUX_RECONFIG_LIST),)
+LINUX_RECONF_DIFF = $(call __linux_confcmd,$(filter-out $(LINUX_RECONFIG_TARGET),$(LINUX_RECONFIG_LIST)),'>')
+
+ifeq ($(DUMP),1)
+  BuildTarget=$(BuildTargets/DumpCurrent)
+
+  ifneq ($(BOARD),)
+    TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(call target_conf,$(TARGETID))
+    $(TMP_CONFIG): $(LINUX_KCONFIG_LIST)
+		$(LINUX_CONF_CMD) > $@ || rm -f $@
+    -include $(TMP_CONFIG)
+    .SILENT: $(TMP_CONFIG)
+    .PRECIOUS: $(TMP_CONFIG)
+
+    ifneq ($(CONFIG_OF),)
+      FEATURES += dt
+    endif
+    ifneq ($(CONFIG_GENERIC_GPIO)$(CONFIG_GPIOLIB),)
+      FEATURES += gpio
+    endif
+    ifneq ($(CONFIG_PCI),)
+      FEATURES += pci
+    endif
+    ifneq ($(CONFIG_PCIEPORTBUS),)
+      FEATURES += pcie
+    endif
+    ifneq ($(CONFIG_USB)$(CONFIG_USB_SUPPORT),)
+      ifneq ($(CONFIG_USB_ARCH_HAS_HCD)$(CONFIG_USB_EHCI_HCD),)
+        FEATURES += usb
+      endif
+    endif
+    ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
+      FEATURES += pcmcia
+    endif
+    ifneq ($(CONFIG_VGA_CONSOLE)$(CONFIG_FB),)
+      FEATURES += display
+    endif
+    ifneq ($(CONFIG_RTC_CLASS),)
+      FEATURES += rtc
+    endif
+    FEATURES += $(foreach v,v4 v5 v6 v7,$(if $(findstring -march=arm$(v),$(CFLAGS)),arm_$(v)))
+
+    # remove duplicates
+    FEATURES:=$(sort $(FEATURES))
+  endif
+  CPU_CFLAGS = -Os -pipe
+  ifneq ($(findstring mips,$(ARCH)),)
+    ifneq ($(findstring mips64,$(ARCH)),)
+      CPU_TYPE ?= mips64
+    else
+      CPU_TYPE ?= mips32
+    endif
+    CPU_CFLAGS += -mno-branch-likely
+    CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
+    CPU_CFLAGS_mips32r2 = -mips32r2 -mtune=mips32r2
+    CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
+    CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec
+    CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc
+    CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
+    CPU_CFLAGS_octeon = -march=octeon -mabi=64
+    CPU_CFLAGS_dsp = -mdsp
+    CPU_CFLAGS_dsp2 = -mdspr2
+  endif
+  ifeq ($(ARCH),i386)
+    CPU_TYPE ?= i486
+    CPU_CFLAGS_i486 = -march=i486
+    CPU_CFLAGS_geode = -march=geode -mmmx -m3dnow
+  endif
+  ifneq ($(findstring arm,$(ARCH)),)
+    CPU_TYPE ?= xscale
+    CPU_CFLAGS_arm920t = -march=armv4t -mtune=arm920t
+    CPU_CFLAGS_arm926ej-s = -march=armv5te -mtune=arm926ej-s
+    CPU_CFLAGS_arm1136j-s = -march=armv6 -mtune=arm1136j-s
+    CPU_CFLAGS_arm1176jzf-s = -march=armv6 -mtune=arm1176jzf-s
+    CPU_CFLAGS_cortex-a5 = -march=armv7-a -mtune=cortex-a5
+    CPU_CFLAGS_cortex-a7 = -march=armv7-a -mtune=cortex-a7
+    CPU_CFLAGS_cortex-a8 = -march=armv7-a -mtune=cortex-a8
+    CPU_CFLAGS_cortex-a9 = -march=armv7-a -mtune=cortex-a9
+    CPU_CFLAGS_cortex-a15 = -march=armv7-a -mtune=cortex-a15
+    CPU_CFLAGS_fa526 = -march=armv4 -mtune=fa526
+    CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore
+    CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale
+    ifeq ($(CONFIG_SOFT_FLOAT),)
+      CPU_CFLAGS_neon = -mfpu=neon
+      CPU_CFLAGS_vfp = -mfpu=vfp
+      CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16
+    endif
+  endif
+  ifeq ($(ARCH),powerpc)
+    CPU_CFLAGS_603e:=-mcpu=603e
+    CPU_CFLAGS_8540:=-mcpu=8540
+    CPU_CFLAGS_405:=-mcpu=405
+    CPU_CFLAGS_440:=-mcpu=440
+  endif
+  ifeq ($(ARCH),sparc)
+    CPU_TYPE = sparc
+    CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc
+  endif
+  ifeq ($(ARCH),aarch64)
+    CPU_TYPE ?= armv8-a
+    CPU_CFLAGS_armv8-a = -mcpu=armv8-a
+  endif
+  DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))
+endif
+
+define BuildTargets/DumpCurrent
+  .PHONY: dumpinfo
+  dumpinfo : export DESCRIPTION=$$(Target/Description)
+  dumpinfo:
+	@echo 'Target: $(TARGETID)'; \
+	 echo 'Target-Board: $(BOARD)'; \
+	 echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),$(if $(SUBTARGET),))'; \
+	 echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'; \
+	 echo 'Target-Arch: $(ARCH)'; \
+	 echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD))'; \
+	 echo 'Target-Features: $(FEATURES)'; \
+	 echo 'Target-Depends: $(DEPENDS)'; \
+	 echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \
+	 echo 'CPU-Type: $(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))'; \
+	 echo 'Linux-Version: $(LINUX_VERSION)'; \
+	 echo 'Linux-Release: $(LINUX_RELEASE)'; \
+	 echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
+	$(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; )) \
+	 echo 'Target-Description:'; \
+	 echo "$$$$DESCRIPTION"; \
+	 echo '@@'; \
+	 echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \
+	 $(DUMPINFO)
+	$(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s DUMP=1 SUBTARGET=$(SUBTARGET); ))
+endef
+
+include $(INCLUDE_DIR)/kernel.mk
+ifeq ($(TARGET_BUILD),1)
+  include $(INCLUDE_DIR)/kernel-build.mk
+  BuildTarget?=$(BuildKernel)
+endif
+
+endif #__target_inc
diff --git a/trunk/include/toolchain-build.mk b/trunk/include/toolchain-build.mk
new file mode 100644
index 00000000..a86f6aba
--- /dev/null
+++ b/trunk/include/toolchain-build.mk
@@ -0,0 +1,25 @@
+# 
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+override CONFIG_AUTOREBUILD=
+
+REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared
+
+define FixupLibdir
+	if [ -d $(1)/lib64 -a \! -L $(1)/lib64 ]; then \
+		mkdir -p $(1)/lib; \
+		mv $(1)/lib64/* $(1)/lib/; \
+		rm -rf $(1)/lib64; \
+	fi
+	ln -sf lib $(1)/lib64
+endef
diff --git a/trunk/include/toplevel.mk b/trunk/include/toplevel.mk
new file mode 100644
index 00000000..9a8e6ac7
--- /dev/null
+++ b/trunk/include/toplevel.mk
@@ -0,0 +1,203 @@
+# Makefile for libreCMC
+#
+# Copyright (C) 2007-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+RELEASE:=Elegant Eleanor
+PREP_MK= LIBRECMC_BUILD= QUIET=0
+
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+
+include $(TOPDIR)/include/verbose.mk
+
+ifeq ($(SDK),1)
+  include $(TOPDIR)/include/version.mk
+else
+  REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)
+endif
+
+HOSTCC ?= gcc
+LIBRECMCVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
+export RELEASE
+export REVISION
+export LIBRECMCVERSION
+export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
+export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
+export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
+export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS))
+
+# prevent perforce from messing with the patch utility
+unexport P4PORT P4USER P4CONFIG P4CLIENT
+
+# prevent user defaults for quilt from interfering
+unexport QUILT_PATCHES QUILT_PATCH_OPTS
+
+unexport C_INCLUDE_PATH CROSS_COMPILE ARCH
+
+# prevent distro default LPATH from interfering
+unexport LPATH
+
+# make sure that a predefined CFLAGS variable does not disturb packages
+export CFLAGS=
+
+unexport TAR_OPTIONS
+
+ifneq ($(shell $(HOSTCC) 2>&1 | grep clang),)
+  export HOSTCC_REAL?=$(HOSTCC)
+  export HOSTCC_WRAPPER:=$(TOPDIR)/scripts/clang-gcc-wrapper
+else
+  export HOSTCC_WRAPPER:=$(HOSTCC)
+endif
+
+ifeq ($(FORCE),)
+  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
+endif
+
+SCAN_COOKIE?=$(shell echo $$$$)
+export SCAN_COOKIE
+
+SUBMAKE:=umask 022; $(SUBMAKE)
+
+ULIMIT_FIX=_limit=`ulimit -n`; [ "$$_limit" = "unlimited" -o "$$_limit" -ge 1024 ] || ulimit -n 1024;
+
+prepare-mk: FORCE ;
+
+prepare-tmpinfo: FORCE
+	mkdir -p tmp/info
+	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_DEPTH=5 SCAN_EXTRA=""
+	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
+	for type in package target; do \
+		f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
+		[ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
+	done
+	[ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
+	./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
+	./scripts/metadata.pl package_feeds tmp/.packageinfo > tmp/.packagefeeds || { rm -f tmp/.packagefeeds; false; }
+	touch $(TOPDIR)/tmp/.build
+
+.config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo)
+	@+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \
+		[ -e $(HOME)/.librecmc/defconfig ] && cp $(HOME)/.librecmc/defconfig .config; \
+		$(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
+	fi
+
+scripts/config/mconf:
+	@$(_SINGLE)$(SUBMAKE) -s -C scripts/config all CC="$(HOSTCC_WRAPPER)"
+
+$(eval $(call rdep,scripts/config,scripts/config/mconf))
+
+scripts/config/conf:
+	@$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf CC="$(HOSTCC_WRAPPER)"
+
+config: scripts/config/conf prepare-tmpinfo FORCE
+	$< Config.in
+
+config-clean: FORCE
+	$(_SINGLE)$(NO_TRACE_MAKE) -C scripts/config clean
+
+defconfig: scripts/config/conf prepare-tmpinfo FORCE
+	touch .config
+	@if [ -e $(HOME)/.librecmc/defconfig ]; then cp $(HOME)/.librecmc/defconfig .config; fi
+	$< --defconfig=.config Config.in
+
+confdefault-y=allyes
+confdefault-m=allmod
+confdefault-n=allno
+confdefault:=$(confdefault-$(CONFDEFAULT))
+
+oldconfig: scripts/config/conf prepare-tmpinfo FORCE
+	$< --$(if $(confdefault),$(confdefault),old)config Config.in
+
+menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
+	if [ \! -e .config -a -e $(HOME)/.librecmc/defconfig ]; then \
+		cp $(HOME)/.librecmc/defconfig .config; \
+	fi
+	$< Config.in
+
+prepare_kernel_conf: .config FORCE
+
+ifeq ($(wildcard staging_dir/host/bin/quilt),)
+  prepare_kernel_conf:
+	@+$(SUBMAKE) -r tools/quilt/install
+else
+  prepare_kernel_conf: ;
+endif
+
+kernel_oldconfig: prepare_kernel_conf
+	$(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig
+
+kernel_menuconfig: prepare_kernel_conf
+	$(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig
+
+kernel_nconfig: prepare_kernel_conf
+	$(_SINGLE)$(NO_TRACE_MAKE) -C target/linux nconfig
+
+tmp/.prereq-build: include/prereq-build.mk
+	mkdir -p tmp
+	rm -f tmp/.host.mk
+	@$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
+		echo "Prerequisite check failed. Use FORCE=1 to override."; \
+		false; \
+	}
+	touch $@
+
+printdb: FORCE
+	@$(_SINGLE)$(NO_TRACE_MAKE) -p $@ V=99 DUMP_TARGET_DB=1 2>&1
+
+download: .config FORCE
+	@+$(SUBMAKE) tools/download
+	@+$(SUBMAKE) toolchain/download
+	@+$(SUBMAKE) package/download
+	@+$(SUBMAKE) target/download
+
+clean dirclean: .config
+	@+$(SUBMAKE) -r $@ 
+
+prereq:: prepare-tmpinfo .config
+	@+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK)
+	@+$(NO_TRACE_MAKE) -r -s $@
+
+ifeq ($(SDK),1)
+
+%::
+	@+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
+	@./scripts/config/conf --defconfig=.config Config.in
+	@+$(ULIMIT_FIX) $(SUBMAKE) -r $@
+
+else
+
+%::
+	@+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
+	@( \
+		cp .config tmp/.config; \
+		./scripts/config/conf --defconfig=tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
+		if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
+			printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \
+		fi \
+	)
+	@+$(ULIMIT_FIX) $(SUBMAKE) -r $@
+
+endif
+
+help:
+	cat README
+
+docs docs/compile: FORCE
+	@$(_SINGLE)$(SUBMAKE) -C docs compile
+
+docs/clean: FORCE
+	@$(_SINGLE)$(SUBMAKE) -C docs clean
+
+distclean:
+	rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds package/librecmc-packages bin
+	@$(_SINGLE)$(SUBMAKE) -C scripts/config clean
+
+ifeq ($(findstring v,$(DEBUG)),)
+  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo
+endif
+.PHONY: help FORCE
+.NOTPARALLEL:
+
diff --git a/trunk/include/uclibc++.mk b/trunk/include/uclibc++.mk
new file mode 100644
index 00000000..a1a61f26
--- /dev/null
+++ b/trunk/include/uclibc++.mk
@@ -0,0 +1,16 @@
+ifndef DUMP
+  ifdef __package_mk
+    $(error uclibc++.mk must be included before package.mk)
+  endif
+endif
+
+PKG_PREPARED_DEPENDS += CONFIG_USE_UCLIBCXX
+CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp
+
+ifneq ($(CONFIG_USE_UCLIBCXX),)
+ ifneq ($(CONFIG_CCACHE),)
+  TARGET_CXX_NOCACHE=g++-uc
+ else
+  TARGET_CXX=g++-uc
+ endif
+endif
diff --git a/trunk/include/unpack.mk b/trunk/include/unpack.mk
new file mode 100644
index 00000000..2d358630
--- /dev/null
+++ b/trunk/include/unpack.mk
@@ -0,0 +1,81 @@
+# 
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# unpacking files with +s may break on some platforms. this typically emits error code 2
+ifneq ($(HOST_OS),Linux)
+  HOST_TAR:=trapret 2 $(TAR)
+else
+  HOST_TAR:=$(TAR)
+endif
+TAR_CMD=$(HOST_TAR) -C $(1)/.. $(TAR_OPTIONS)
+UNZIP_CMD=unzip -d $(1)/.. $(DL_DIR)/$(PKG_SOURCE)
+
+ifeq ($(PKG_SOURCE),)
+  PKG_UNPACK ?= true
+else
+
+ifeq ($(strip $(UNPACK_CMD)),)
+  ifeq ($(strip $(PKG_CAT)),)
+    # try to autodetect file type
+    EXT:=$(call ext,$(PKG_SOURCE))
+    EXT1:=$(EXT)
+
+    ifeq ($(filter gz tgz,$(EXT)),$(EXT))
+      EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+      DECOMPRESS_CMD:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) |
+    endif
+    ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT))
+      EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+      DECOMPRESS_CMD:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
+    endif
+    ifeq ($(filter xz txz,$(EXT)),$(EXT))
+      EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+      DECOMPRESS_CMD:=xzcat $(DL_DIR)/$(PKG_SOURCE) |
+    endif
+    ifeq ($(filter tgz tbz tbz2 txz,$(EXT1)),$(EXT1))
+      EXT:=tar
+    endif
+    DECOMPRESS_CMD ?= cat $(DL_DIR)/$(PKG_SOURCE) |
+    ifeq ($(EXT),tar)
+      UNPACK_CMD=$(DECOMPRESS_CMD) $(TAR_CMD)
+    endif
+    ifeq ($(EXT),cpio)
+      UNPACK_CMD=$(DECOMPRESS_CMD) (cd $(1)/..; cpio -i -d)
+    endif
+    ifeq ($(EXT),zip)
+      UNPACK_CMD=$(UNZIP_CMD)
+    endif
+  endif
+
+  # compatibility code for packages that set PKG_CAT
+  ifeq ($(strip $(UNPACK_CMD)),)
+    # use existing PKG_CAT
+    UNPACK_CMD=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
+    ifeq ($(PKG_CAT),unzip)
+      UNPACK_CMD=$(UNZIP_CMD)
+    endif
+    # replace zcat with $(ZCAT), because some system don't support it properly
+    ifeq ($(PKG_CAT),zcat)
+      UNPACK_CMD=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
+    endif
+  endif
+  ifneq ($(strip $(CRLF_WORKAROUND)),)
+    CRLF_CMD := && find $(PKG_BUILD_DIR) -type f -print0 | xargs -0 perl -pi -e 's!\r$$$$!!g'
+  else
+    CRLF_CMD :=
+  endif
+endif
+
+ifdef PKG_BUILD_DIR
+  PKG_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR))
+endif
+ifdef HOST_BUILD_DIR
+  HOST_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR))
+endif
+
+endif # PKG_SOURCE
+
diff --git a/trunk/include/verbose.mk b/trunk/include/verbose.mk
new file mode 100644
index 00000000..bbfb61cb
--- /dev/null
+++ b/trunk/include/verbose.mk
@@ -0,0 +1,67 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifndef LIBRECMC_VERBOSE
+  LIBRECMC_VERBOSE:=
+endif
+ifeq ("$(origin V)", "command line")
+  LIBRECMC_VERBOSE:=$(V)
+endif
+
+ifeq ($(LIBRECMC_VERBOSE),1)
+  LIBRECMC_VERBOSE:=w
+endif
+ifeq ($(LIBRECMC_VERBOSE),99)
+  LIBRECMC_VERBOSE:=s
+endif
+
+ifeq ($(NO_TRACE_MAKE),)
+NO_TRACE_MAKE := $(MAKE) V=s$(LIBRECMC_VERBOSE)
+export NO_TRACE_MAKE
+endif
+
+ifeq ($(IS_TTY),1)
+  ifneq ($(strip $(NO_COLOR)),1)
+    _Y:=\\033[33m
+    _R:=\\033[31m
+    _N:=\\033[m
+  endif
+endif
+
+ifeq ($(findstring s,$(LIBRECMC_VERBOSE)),)
+  define MESSAGE
+	printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+  endef
+
+  define ERROR_MESSAGE
+	printf "$(_R)%s$(_N)\n" "$(1)" >&8
+  endef
+
+  ifeq ($(QUIET),1)
+    ifneq ($(CURDIR),$(TOPDIR))
+      _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
+    else
+      _DIR:=
+    endif
+    _NULL:=$(if $(MAKECMDGOALS),$(shell \
+		$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
+    ))
+    SUBMAKE=$(MAKE)
+  else
+    SILENT:=>/dev/null $(if $(findstring w,$(LIBRECMC_VERBOSE)),,2>&1)
+    export QUIET:=1
+    SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=s to see what's going on"; false; } } 8>&1 9>&2; cmd
+  endif
+
+  .SILENT: $(MAKECMDGOALS)
+else
+  SUBMAKE=$(MAKE) -w
+  define MESSAGE
+    printf "%s\n" "$(1)"
+  endef
+  ERROR_MESSAGE=$(MESSAGE)
+endif
diff --git a/trunk/include/version.mk b/trunk/include/version.mk
new file mode 100644
index 00000000..75b19044
--- /dev/null
+++ b/trunk/include/version.mk
@@ -0,0 +1,87 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# Substituted by SDK, do not remove
+# REVISION:=x
+
+PKG_CONFIG_DEPENDS += \
+	CONFIG_VERSION_NUMBER \
+	CONFIG_VERSION_NICK \
+	CONFIG_VERSION_REPO \
+	CONFIG_VERSION_DIST \
+	CONFIG_VERSION_MANUFACTURER \
+	CONFIG_VERSION_PRODUCT \
+	CONFIG_VERSION_HWREV \
+
+qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
+#'
+
+VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))
+
+VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Bleeding Edge)
+
+VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
+VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))
+
+VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%T/packages)
+
+VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
+VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),libreCMC)
+
+VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
+VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),libreCMC)
+
+VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
+VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
+
+VERSION_HWREV:=$(call qstrip_escape,$(CONFIG_VERSION_HWREV))
+VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v0)
+
+define taint2sym
+$(CONFIG_$(firstword $(subst :, ,$(subst +,,$(subst -,,$(1))))))
+endef
+
+define taint2name
+$(lastword $(subst :, ,$(1)))
+endef
+
+VERSION_TAINT_SPECS := \
+	-ALL:no-all \
+	-IPV6:no-ipv6 \
+	+USE_EGLIBC:eglibc \
+	+USE_MKLIBS:mklibs \
+	+BUSYBOX_CUSTOM:busybox \
+
+VERSION_TAINTS := $(strip $(foreach taint,$(VERSION_TAINT_SPECS), \
+	$(if $(findstring +,$(taint)), \
+		$(if $(call taint2sym,$(taint)),$(call taint2name,$(taint))), \
+		$(if $(call taint2sym,$(taint)),,$(call taint2name,$(taint))) \
+	)))
+
+PKG_CONFIG_DEPENDS += $(foreach taint,$(VERSION_TAINT_SPECS),$(call taint2sym,$(taint)))
+
+VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
+	-e 's,%V,$(VERSION_NUMBER),g' \
+	-e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \
+	-e 's,%C,$(VERSION_CODE),g' \
+	-e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \
+	-e 's,%N,$(VERSION_NICK),g' \
+	-e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \
+	-e 's,%D,$(VERSION_DIST),g' \
+	-e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \
+	-e 's,%R,$(REVISION),g' \
+	-e 's,%T,$(BOARD),g' \
+	-e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \
+	-e 's,%t,$(VERSION_TAINTS),g' \
+	-e 's,%M,$(VERSION_MANUFACTURER),g' \
+	-e 's,%P,$(VERSION_PRODUCT),g' \
+	-e 's,%h,$(VERSION_HWREV),g'
+
+VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED))
diff --git a/trunk/package/Makefile b/trunk/package/Makefile
new file mode 100644
index 00000000..a6b34be0
--- /dev/null
+++ b/trunk/package/Makefile
@@ -0,0 +1,174 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+curdir:=package
+
+include $(INCLUDE_DIR)/feeds.mk
+
+-include $(TMP_DIR)/.packagedeps
+$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
+$(curdir)/builddirs-install:=.
+$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
+$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
+ifneq ($(IGNORE_ERRORS),)
+  package-y-filter := $(package-y)
+  package-m-filter := $(filter-out $(package-y),$(package-m))
+  package-n-filter := $(filter-out $(package-y) $(package-m),$(package-))
+  package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS))
+  package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m)
+  $(curdir)/builddirs-ignore-download := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))
+  $(curdir)/builddirs-ignore-compile := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))
+endif
+
+ifdef CONFIG_USE_MKLIBS
+  define mklibs
+	rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
+	# first find all programs and add them to the mklibs list
+	find $(STAGING_DIR_ROOT) -type f -perm /100 -exec \
+		file -r -N -F '' {} + | \
+		awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs
+	# find all loadable objects that are not regular libraries and add them to the list as well
+	find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
+		file -r -N -F '' {} + | \
+		awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs
+	mkdir -p $(TMP_DIR)/mklibs-out
+	$(STAGING_DIR_HOST)/bin/mklibs -D \
+		-d $(TMP_DIR)/mklibs-out \
+		--sysroot $(STAGING_DIR_ROOT) \
+		`cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \
+		--ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
+			$(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so, \
+			  $(STAGING_DIR_ROOT)/lib/$(name) \
+			)))) \
+		--target $(REAL_GNU_TARGET_NAME) \
+		`cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 2>&1
+	$(RSTRIP) $(TMP_DIR)/mklibs-out
+	for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
+		LIB="$${lib##*/}"; \
+		DEST="`ls "$(TARGET_DIR)/lib/$$LIB" "$(TARGET_DIR)/usr/lib/$$LIB" 2>/dev/null`"; \
+		[ -n "$$DEST" ] || continue; \
+		echo "Copying stripped library $$lib to $$DEST"; \
+		cp "$$lib" "$$DEST" || exit 1; \
+	done
+  endef
+endif
+
+# where to build (and put) .ipk packages
+OPKG:= \
+  IPKG_NO_SCRIPT=1 \
+  IPKG_TMP=$(TMP_DIR)/ipkg \
+  IPKG_INSTROOT=$(TARGET_DIR) \
+  IPKG_CONF_DIR=$(STAGING_DIR)/etc \
+  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
+  $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
+	--offline-root $(TARGET_DIR) \
+	--force-depends \
+	--force-overwrite \
+	--force-postinstall \
+	--force-maintainer \
+	--add-dest root:/ \
+	--add-arch all:100 \
+	--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
+
+PACKAGE_INSTALL_FILES:= \
+	$(foreach pkg,$(sort $(package-y)), \
+		$(foreach variant, \
+			$(if $(strip $(package/$(pkg)/variants)), \
+				$(package/$(pkg)/variants), \
+				$(if $(package/$(pkg)/default-variant), \
+					$(package/$(pkg)/default-variant), \
+					default \
+				) \
+			), \
+			$(PKG_INFO_DIR)/$(lastword $(subst /,$(space),$(pkg))).$(variant).install \
+		) \
+	)
+
+$(curdir)/cleanup: $(TMP_DIR)/.build
+	rm -rf $(STAGING_DIR_ROOT)
+
+$(curdir)/install: $(TMP_DIR)/.build
+	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
+	rm -rf $(TARGET_DIR)
+	[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
+	@$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)$(if $(CONFIG_PER_FEED_REPO),/*)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install
+	@for file in $(PACKAGE_INSTALL_FILES); do \
+		[ -s $$file.flags ] || continue; \
+		for flag in `cat $$file.flags`; do \
+			$(OPKG) flag $$flag < $$file; \
+		done; \
+	done || true
+	@-$(MAKE) package/preconfig
+	@if [ -d $(TOPDIR)/files ]; then \
+		$(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \
+	fi
+	@mkdir -p $(TARGET_DIR)/etc/rc.d
+	@( \
+		cd $(TARGET_DIR); \
+		for script in ./usr/lib/opkg/info/*.postinst; do \
+			IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \
+		done || true \
+	)
+	@-find $(TARGET_DIR) -name CVS   | $(XARGS) rm -rf
+	@-find $(TARGET_DIR) -name .svn  | $(XARGS) rm -rf
+	@-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
+	rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst*
+	rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm*
+	$(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
+	$(call mklibs)
+
+PASSOPT=""
+PASSARG=""
+ifndef CONFIG_OPKGSMIME_PASSPHRASE
+  ifneq ($(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE)),)
+    PASSOPT="-passin"
+    PASSARG="file:$(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE))"
+  endif
+endif
+
+PACKAGE_SUBDIRS=.
+ifneq ($(CONFIG_PER_FEED_REPO),)
+  PACKAGE_SUBDIRS=base $(FEEDS_ENABLED)
+endif
+
+$(curdir)/index: FORCE
+	@echo Generating package index...
+	@for d in $(PACKAGE_SUBDIRS); do ( \
+		[ -d $(PACKAGE_DIR)/$$d ] && \
+			cd $(PACKAGE_DIR)/$$d || continue; \
+		$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
+			gzip -9c Packages > Packages.gz; \
+	); done
+ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_KEY)),)
+	@echo Signing key has not been configured
+else
+ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_CERT)),)
+	@echo Certificate has not been configured
+else
+	@echo Signing package index...
+	@for d in $(PACKAGE_SUBDIRS); do ( \
+		[ -d $(PACKAGE_DIR)/$$d ] && \
+			cd $(PACKAGE_DIR)/$$d || continue; \
+		openssl smime -binary -in Packages.gz \
+			-out Packages.sig -outform PEM -sign \
+			-signer $(CONFIG_OPKGSMIME_CERT) \
+			-inkey $(CONFIG_OPKGSMIME_KEY) \
+			$(PASSOPT) $(PASSARG); \
+	); done
+endif
+endif
+
+$(curdir)/preconfig:
+
+$(curdir)/flags-install:= -j1
+
+$(eval $(call stampfile,$(curdir),package,prereq,.config))
+$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
+
+$(eval $(call subdir,$(curdir)))
diff --git a/trunk/package/base-files/Makefile b/trunk/package/base-files/Makefile
new file mode 100644
index 00000000..ba74da96
--- /dev/null
+++ b/trunk/package/base-files/Makefile
@@ -0,0 +1,159 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/version.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=base-files
+PKG_RELEASE:=157
+
+PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
+PKG_BUILD_DEPENDS:=opkg/host
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+ifneq ($(DUMP),1)
+  TARGET:=-$(BOARD)
+  ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),)
+    TARGET:=$(TARGET)-$(PROFILE)
+  endif
+endif
+
+define Package/base-files
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+netifd +libc +procd +jsonfilter
+  TITLE:=Base filesystem for libreCMC
+  URL:=http://openwrt.org/
+  VERSION:=$(PKG_RELEASE)-$(REVISION)
+endef
+
+define Package/base-files/conffiles
+/etc/hosts
+/etc/inittab
+/etc/group
+/etc/passwd
+/etc/shadow
+/etc/profile
+/etc/shells
+/etc/sysctl.conf
+/etc/rc.local
+/etc/sysupgrade.conf
+/etc/config/
+/etc/dropbear/
+/etc/crontabs/
+$(call $(TARGET)/conffiles)
+endef
+
+define Package/base-files/description
+ This package contains a base filesystem and system scripts for libreCMC.
+endef
+
+ifneq ($(CONFIG_PREINITOPT),)
+define ImageConfigOptions
+	mkdir -p $(1)/lib/preinit
+	echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf
+	echo 'fs_failsafe_wait_timeout=$(if $(CONFIG_TARGET_PREINIT_TIMEOUT),$(CONFIG_TARGET_PREINIT_TIMEOUT),2)' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_init_path=$(if $(CONFIG_TARGET_INIT_PATH),$(CONFIG_TARGET_INIT_PATH),"/bin:/sbin:/usr/bin:/usr/sbin")' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_init_env=$(if $(CONFIG_TARGET_INIT_ENV),$(CONFIG_TARGET_INIT_ENV),"")' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_init_cmd=$(if $(CONFIG_TARGET_INIT_CMD),$(CONFIG_TARGET_INIT_CMD),"/sbin/init")' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_init_suppress_stderr="$(CONFIG_TARGET_INIT_SUPPRESS_STDERR)"' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_ifname=$(if $(CONFIG_TARGET_PREINIT_IFNAME),$(CONFIG_TARGET_PREINIT_IFNAME),"")' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_ip=$(if $(CONFIG_TARGET_PREINIT_IP),$(CONFIG_TARGET_PREINIT_IP),"192.168.1.1")' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_netmask=$(if $(CONFIG_TARGET_PREINIT_NETMASK),$(CONFIG_TARGET_PREINIT_NETMASK),"255.255.255.0")' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"192.168.1.255")' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_preinit_net_messages="$(CONFIG_TARGET_PREINIT_SHOW_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf
+endef
+endif
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile/Default
+
+endef
+Build/Compile = $(Build/Compile/Default)
+
+define Package/base-files/install
+	$(CP) ./files/* $(1)/
+	if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
+		$(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
+	fi
+	if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
+		$(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
+	fi
+	if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \
+		$(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \
+	fi
+	if [ -d $(PLATFORM_DIR)/$(PROFILE)/base-files/. ]; then \
+		$(CP) $(PLATFORM_DIR)/$(PROFILE)/base-files/* $(1)/; \
+	fi
+	$(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
+		if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
+			$(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
+		fi; \
+		if [ -d $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/. ]; then \
+			$(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
+		fi; \
+		if [ -d $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/. ]; then \
+			$(CP) $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/* $(1)/; \
+		fi \
+	)
+
+	$(VERSION_SED) \
+		$(1)/etc/banner \
+		$(1)/etc/librecmc_version
+
+	$(VERSION_SED_SCRIPT) \
+		$(1)/etc/librecmc_release \
+		$(1)/etc/device_info
+
+	mkdir -p $(1)/CONTROL
+	mkdir -p $(1)/dev
+	mkdir -p $(1)/etc/crontabs
+	mkdir -p $(1)/etc/rc.d
+	mkdir -p $(1)/overlay
+	mkdir -p $(1)/lib/firmware
+	$(if $(LIB_SUFFIX),-ln -s lib $(1)/lib$(LIB_SUFFIX))
+	mkdir -p $(1)/mnt
+	mkdir -p $(1)/proc
+	mkdir -p $(1)/tmp
+	mkdir -p $(1)/usr/lib
+	$(if $(LIB_SUFFIX),-ln -s lib $(1)/usr/lib$(LIB_SUFFIX))
+	mkdir -p $(1)/usr/bin
+	mkdir -p $(1)/sys
+	mkdir -p $(1)/www
+	mkdir -p $(1)/root
+	$(LN) /proc/mounts $(1)/etc/mtab
+	rm -f $(1)/var
+	$(LN) /tmp $(1)/var
+	mkdir -p $(1)/etc
+	$(LN) /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
+
+	chmod 0600 $(1)/etc/shadow
+	chmod 1777 $(1)/tmp
+
+	$(call ImageConfigOptions,$(1))
+	$(call Package/base-files/install-target,$(1))
+	for conffile in $(1)/etc/config/*; do \
+		if [ -f "$$$$conffile" ]; then \
+			grep "$$$${conffile##$(1)}" $(1)/CONTROL/conffiles || \
+				echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
+		fi \
+	done
+endef
+
+ifneq ($(DUMP),1)
+  -include $(PLATFORM_DIR)/base-files.mk
+endif
+
+$(eval $(call BuildPackage,base-files))
diff --git a/trunk/package/base-files/files/bin/board_detect b/trunk/package/base-files/files/bin/board_detect
new file mode 100755
index 00000000..ee04b9e6
--- /dev/null
+++ b/trunk/package/base-files/files/bin/board_detect
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+[ -d "/etc/board.d/" -a ! -f "/etc/board.json" ] && {
+	for a in `ls /etc/board.d/*`; do
+		[ -x $a ] || continue;
+		$(. $a)
+	done
+}
+
+[ -f "/etc/board.json" ] || return 1
+[ -f "/etc/config/network" ] || {
+	touch /etc/config/network
+	/bin/config_generate
+}
diff --git a/trunk/package/base-files/files/bin/config_generate b/trunk/package/base-files/files/bin/config_generate
new file mode 100755
index 00000000..7bec566f
--- /dev/null
+++ b/trunk/package/base-files/files/bin/config_generate
@@ -0,0 +1,172 @@
+#!/bin/sh
+
+CFG=/etc/board.json
+
+. /usr/share/libubox/jshn.sh
+
+[ -f $CFG ] || exit 1
+
+generate_static_network() {
+	uci -q batch <<EOF
+delete network.loopback
+set network.loopback='interface'
+set network.loopback.ifname='lo'
+set network.loopback.proto='static'
+set network.loopback.ipaddr='127.0.0.1'
+set network.loopback.netmask='255.0.0.0'
+delete network.globals
+set network.globals='globals'
+set network.globals.ula_prefix='auto'
+EOF
+}
+
+next_vlan=3
+generate_network() {
+	local vlan
+
+	json_select network
+	json_select $1
+	json_get_vars ifname create_vlan macaddr
+	json_select ..
+	json_select ..
+
+	[ -n "$ifname" ] || return
+	[ "$create_vlan" -eq 1 ] && case $1 in
+	lan) vlan=1;;
+	wan) vlan=2;;
+	*)
+		vlan=$next_vlan
+		next_vlan=$((next_vlan + 1))
+		;;
+	esac
+	[ -n "$vlan" ] && ifname=${ifname}.${vlan}
+	uci -q batch <<EOF
+delete network.$1
+set network.$1='interface'
+set network.$1.ifname='$ifname'
+set network.$1.force_link=1
+set network.$1.proto='none'
+set network.$1.macaddr='$macaddr'
+EOF
+
+	case $1 in
+	lan) uci -q batch <<EOF
+set network.$1.type='bridge'
+set network.$1.proto='static'
+set network.$1.ipaddr='192.168.1.1'
+set network.$1.netmask='255.255.255.0'
+set network.$1.ip6assign='60'
+EOF
+		;;
+	wan) uci -q batch <<EOF
+set network.$1.proto='dhcp'
+delete network.wan6
+set network.wan6='interface'
+set network.wan6.ifname='$ifname'
+set network.wan6.proto='dhcpv6'
+EOF
+		;;
+	esac
+}
+
+generate_switch_vlan() {
+	local device=$1
+	local vlan=$2
+	local cpu_port=$3
+
+	case $vlan in
+	lan)	vlan=1;;
+	wan)	vlan=2;;
+	*)	vlan=${vlan##vlan};;
+	esac
+
+	json_select vlans
+	json_select $2
+	json_get_values ports
+	json_select ..
+	json_select ..
+
+	uci -q batch <<EOF
+add network switch_vlan
+set network.@switch_vlan[-1].device='$device'
+set network.@switch_vlan[-1].vlan='$vlan'
+set network.@switch_vlan[-1].ports='$ports ${cpu_port}t'
+EOF
+}
+
+generate_switch() {
+	local key=$1
+	local vlans
+
+	json_select switch
+	json_select $key
+	json_get_vars enable reset blinkrate cpu_port
+
+	uci -q batch <<EOF
+add network switch
+set network.@switch[-1].name='$key'
+set network.@switch[-1].reset='$reset'
+set network.@switch[-1].enable_vlan='$enable'
+set network.@switch[-1].blinkrate='$blinkrate'
+EOF
+	[ -n "$cpu_port" ] && {
+		json_get_keys vlans vlans
+		for vlan in $vlans; do generate_switch_vlan $1 $vlan $cpu_port; done
+	}
+	json_select ..
+	json_select ..
+}
+
+generate_led() {
+	local key=$1
+	local cfg="led_$key"
+
+	json_select led
+	json_select $key
+	json_get_vars name sysfs type trigger device interface default
+	json_select ..
+	json_select ..
+
+	uci -q batch <<EOF
+delete system.$cfg
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.dev='$device'
+set system.$cfg.trigger='$trigger'
+set system.$cfg.port_mask='$port_mask'
+set system.$cfg.default='$default'
+EOF
+	case $type in
+	netdev)
+		uci -q batch <<EOF
+set system.$cfg.trigger='netdev'
+set system.$cfg.mode='link tx rx'
+EOF
+	;;
+
+	usb)
+		uci -q batch <<EOF
+set system.$cfg.trigger='usbdev'
+set system.$cfg.interval='50'
+EOF
+	;;
+
+	esac
+}
+
+json_init
+json_load "$(cat ${CFG})"
+
+generate_static_network
+
+json_get_keys keys network
+for key in $keys; do generate_network $key; done
+
+json_get_keys keys switch
+for key in $keys; do generate_switch $key; done
+
+json_get_keys keys led
+for key in $keys; do generate_led $key; done
+
+uci commit
diff --git a/trunk/package/base-files/files/bin/ipcalc.sh b/trunk/package/base-files/files/bin/ipcalc.sh
new file mode 100755
index 00000000..5d5eac3e
--- /dev/null
+++ b/trunk/package/base-files/files/bin/ipcalc.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+awk -f - $* <<EOF
+function bitcount(c) {
+	c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
+	c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
+	c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
+	c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
+	c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
+	return c
+}
+
+function ip2int(ip) {
+	for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x])
+	return ret
+}
+
+function int2ip(ip,ret,x) {
+	ret=and(ip,255)
+	ip=rshift(ip,8)
+	for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
+	return ret
+}
+
+function compl32(v) {
+	ret=xor(v, 0xffffffff)
+	return ret
+}
+
+BEGIN {
+	slpos=index(ARGV[1],"/")
+	if (slpos == 0) {
+		ipaddr=ip2int(ARGV[1])
+		dotpos=index(ARGV[2],".")
+		if (dotpos == 0)
+			netmask=compl32(2**(32-int(ARGV[2]))-1)
+		else
+			netmask=ip2int(ARGV[2])
+	} else {
+		ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
+		netmask=compl32(2**(32-int(substr(ARGV[1],slpos+1)))-1)
+		ARGV[4]=ARGV[3]
+		ARGV[3]=ARGV[2]
+	}
+
+	network=and(ipaddr,netmask)
+	broadcast=or(network,compl32(netmask))
+
+	start=or(network,and(ip2int(ARGV[3]),compl32(netmask)))
+	limit=network+1
+	if (start<limit) start=limit
+
+	end=start+ARGV[4]
+	limit=or(network,compl32(netmask))-1
+	if (end>limit) end=limit
+
+	print "IP="int2ip(ipaddr)
+	print "NETMASK="int2ip(netmask)
+	print "BROADCAST="int2ip(broadcast)
+	print "NETWORK="int2ip(network)
+	print "PREFIX="32-bitcount(compl32(netmask))
+
+	# range calculations:
+	# ipcalc <ip> <netmask> <start> <num>
+
+	if (ARGC > 3) {
+		print "START="int2ip(start)
+		print "END="int2ip(end)
+	}
+}
+EOF
diff --git a/trunk/package/base-files/files/bin/login.sh b/trunk/package/base-files/files/bin/login.sh
new file mode 100755
index 00000000..25627b66
--- /dev/null
+++ b/trunk/package/base-files/files/bin/login.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Copyright (C) 2006-2011 OpenWrt.org
+
+if ( ! grep -qsE '^root:[!x]?:' /etc/shadow || \
+     ! grep -qsE '^root:[!x]?:' /etc/passwd ) && \
+   [ -z "$FAILSAFE" ]
+then
+	echo "Login failed."
+	exit 0
+else
+cat << EOF
+ === IMPORTANT ============================
+  Use 'passwd' to set your login password
+  this will disable telnet and enable SSH
+ ------------------------------------------
+EOF
+fi
+
+exec /bin/ash --login
diff --git a/trunk/package/base-files/files/etc/banner b/trunk/package/base-files/files/etc/banner
new file mode 100644
index 00000000..4a53134f
--- /dev/null
+++ b/trunk/package/base-files/files/etc/banner
@@ -0,0 +1,7 @@
+                    ____  _____	 ____  
+  _ _ _            |  __||     ||  __| 
+ | (_) |__ _ _ ___ | |   | | | || |    
+ | | | '_ \ '_/ -_)| |__ | | | || |__  
+ |_|_|_.__/_| \___||____||_|_|_||____| 
+ -----------------------------------------
+ Elegant Eleanor Version 1.3
diff --git a/trunk/package/base-files/files/etc/banner.failsafe b/trunk/package/base-files/files/etc/banner.failsafe
new file mode 100644
index 00000000..14615e1e
--- /dev/null
+++ b/trunk/package/base-files/files/etc/banner.failsafe
@@ -0,0 +1,13 @@
+================= FAILSAFE MODE active ================
+special commands:
+* firstboot	     reset settings to factory defaults
+* mount_root	 mount root-partition with config files
+
+after mount_root:
+* passwd			 change root's password
+* /etc/config		    directory with config files
+
+for more help see:
+http://wiki.openwrt.org/doc/howto/generic.failsafe
+=======================================================
+
diff --git a/trunk/package/base-files/files/etc/config/network b/trunk/package/base-files/files/etc/config/network
new file mode 100644
index 00000000..d3cd3c61
--- /dev/null
+++ b/trunk/package/base-files/files/etc/config/network
@@ -0,0 +1,18 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface lan
+	option ifname	eth0
+	option type 	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+	option ip6assign 60
+
+config globals globals
+	option ula_prefix auto
diff --git a/trunk/package/base-files/files/etc/config/system b/trunk/package/base-files/files/etc/config/system
new file mode 100644
index 00000000..918ec319
--- /dev/null
+++ b/trunk/package/base-files/files/etc/config/system
@@ -0,0 +1,11 @@
+config system
+	option hostname	libreCMC
+	option timezone	UTC
+
+config timeserver ntp
+	list server	0.librecmc.pool.ntp.org
+	list server	1.librecmc.pool.ntp.org
+	list server	2.librecmc.pool.ntp.org
+	list server	3.librecmc.pool.ntp.org
+	option enabled 1
+	option enable_server 0
diff --git a/trunk/package/base-files/files/etc/device_info b/trunk/package/base-files/files/etc/device_info
new file mode 100644
index 00000000..2962cd7f
--- /dev/null
+++ b/trunk/package/base-files/files/etc/device_info
@@ -0,0 +1,3 @@
+DEVICE_MANUFACTURER='%M'
+DEVICE_PRODUCT='%P'
+DEVICE_REVISION='%h'
diff --git a/trunk/package/base-files/files/etc/diag.sh b/trunk/package/base-files/files/etc/diag.sh
new file mode 100644
index 00000000..8726a439
--- /dev/null
+++ b/trunk/package/base-files/files/etc/diag.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Copyright (C) 2006-2009 OpenWrt.org
+
+set_state() { :; }
diff --git a/trunk/package/base-files/files/etc/group b/trunk/package/base-files/files/etc/group
new file mode 100644
index 00000000..d3668513
--- /dev/null
+++ b/trunk/package/base-files/files/etc/group
@@ -0,0 +1,10 @@
+root:x:0:
+daemon:x:1:
+adm:x:4:
+mail:x:8:
+audio:x:29:
+www-data:x:33:
+ftp:x:55:
+users:x:100:
+network:x:101:
+nogroup:x:65534:
diff --git a/trunk/package/base-files/files/etc/hosts b/trunk/package/base-files/files/etc/hosts
new file mode 100644
index 00000000..75721cd5
--- /dev/null
+++ b/trunk/package/base-files/files/etc/hosts
@@ -0,0 +1 @@
+127.0.0.1 localhost
diff --git a/trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl b/trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl
new file mode 100644
index 00000000..5d9da8ac
--- /dev/null
+++ b/trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -f /etc/sysctl.conf ] && [ "$ACTION" = add ]; then
+	sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" /etc/sysctl.conf | \
+		sysctl -e -p - | logger -t sysctl
+fi
diff --git a/trunk/package/base-files/files/etc/init.d/boot b/trunk/package/base-files/files/etc/init.d/boot
new file mode 100755
index 00000000..f10db134
--- /dev/null
+++ b/trunk/package/base-files/files/etc/init.d/boot
@@ -0,0 +1,60 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=10
+STOP=98
+
+uci_apply_defaults() {
+	. /lib/functions/system.sh
+
+	cd /etc/uci-defaults || return 0
+	files="$(ls)"
+	[ -z "$files" ] && return 0
+	mkdir -p /tmp/.uci
+	for file in $files; do
+		( . "./$(basename $file)" ) && rm -f "$file"
+	done
+	uci commit
+}
+
+boot() {
+	[ -f /proc/mounts ] || /sbin/mount_root
+	[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
+	[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
+
+	mkdir -p /var/run
+	mkdir -p /var/log
+	mkdir -p /var/lock
+	mkdir -p /var/state
+	mkdir -p /tmp/.uci
+	chmod 0700 /tmp/.uci
+	touch /var/log/wtmp
+	touch /var/log/lastlog
+	touch /tmp/resolv.conf.auto
+	ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
+	grep -q debugfs /proc/filesystems && /bin/mount -o noatime -t debugfs debugfs /sys/kernel/debug
+	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
+
+	/sbin/kmodloader
+
+	# allow wifi modules time to settle
+	sleep 1
+
+	/sbin/wifi detect > /tmp/wireless.tmp
+	[ -s /tmp/wireless.tmp ] && {
+		cat /tmp/wireless.tmp >> /etc/config/wireless
+	}
+	rm -f /tmp/wireless.tmp
+
+	/bin/board_detect
+	uci_apply_defaults
+	
+	# temporary hack until configd exists
+	/sbin/reload_config
+
+	# create /dev/root if it doesn't exist
+	[ -e /dev/root -o -h /dev/root ] || {
+		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
+		[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
+	}
+}
diff --git a/trunk/package/base-files/files/etc/init.d/done b/trunk/package/base-files/files/etc/init.d/done
new file mode 100755
index 00000000..b254aff3
--- /dev/null
+++ b/trunk/package/base-files/files/etc/init.d/done
@@ -0,0 +1,16 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=95
+boot() {
+	[ -d /tmp/root ] && mount_root done
+
+	# process user commands
+	[ -f /etc/rc.local ] && {
+		sh /etc/rc.local
+	}
+
+	# set leds to normal state
+	. /etc/diag.sh
+	set_state done
+}
diff --git a/trunk/package/base-files/files/etc/init.d/led b/trunk/package/base-files/files/etc/init.d/led
new file mode 100755
index 00000000..d2310f01
--- /dev/null
+++ b/trunk/package/base-files/files/etc/init.d/led
@@ -0,0 +1,92 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008 OpenWrt.org
+
+START=96
+
+load_led() {
+	local name
+	local sysfs
+	local trigger
+	local dev
+	local mode
+	local default
+	local delayon
+	local delayoff
+	local interval
+
+	config_get sysfs $1 sysfs
+	config_get name $1 name "$sysfs"
+	config_get trigger $1 trigger "none"
+	config_get dev $1 dev
+	config_get mode $1 mode "link"
+	config_get_bool default $1 default "nil"
+	config_get delayon $1 delayon
+	config_get delayoff $1 delayoff
+	config_get interval $1 interval "50"
+	config_get port_state $1 port_state
+	config_get delay $1 delay "150"
+	config_get message $1 message ""
+
+	if [ "$trigger" = "rssi" ]; then
+		# handled by rssileds userspace process
+		return
+	fi
+
+	[ -e /sys/class/leds/${sysfs}/brightness ] && {
+		echo "setting up led ${name}"
+		[ "$default" != nil ] && {
+			[ $default -eq 1 ] &&
+				echo 1 >/sys/class/leds/${sysfs}/brightness
+			[ $default -eq 1 ] ||
+				echo 0 >/sys/class/leds/${sysfs}/brightness
+		}
+		echo $trigger > /sys/class/leds/${sysfs}/trigger
+		case "$trigger" in
+		"netdev")
+			[ -n "$dev" ] && {
+				echo $dev > /sys/class/leds/${sysfs}/device_name
+				echo $mode > /sys/class/leds/${sysfs}/mode
+			}
+			;;
+
+		"timer")
+			[ -n "$delayon" ] && \
+				echo $delayon > /sys/class/leds/${sysfs}/delay_on
+			[ -n "$delayoff" ] && \
+				echo $delayoff > /sys/class/leds/${sysfs}/delay_off
+			;;
+
+		"usbdev")
+			[ -n "$dev" ] && {
+				echo $dev > /sys/class/leds/${sysfs}/device_name
+				echo $interval > /sys/class/leds/${sysfs}/activity_interval
+			}
+			;;
+
+		"port_state")
+			[ -n "$port_state" ] && \
+				echo $port_state > /sys/class/leds/${sysfs}/port_state
+			;;
+
+		"morse")
+			echo $message > /sys/class/leds/${sysfs}/message
+			echo $delay > /sys/class/leds/${sysfs}/delay
+			;;
+
+		switch[0-9]*)
+			local port_mask
+
+			config_get port_mask $1 port_mask
+			[ -n "$port_mask" ] && \
+				echo $port_mask > /sys/class/leds/${sysfs}/port_mask
+			;;
+		esac
+	}
+}
+
+start() {
+	[ -e /sys/class/leds/ ] && {
+		config_load system
+		config_foreach load_led led
+	}
+}
diff --git a/trunk/package/base-files/files/etc/init.d/sysctl b/trunk/package/base-files/files/etc/init.d/sysctl
new file mode 100755
index 00000000..36e29eab
--- /dev/null
+++ b/trunk/package/base-files/files/etc/init.d/sysctl
@@ -0,0 +1,7 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=11
+start() {
+	[ -f /etc/sysctl.conf ] && sysctl -p -e >&-
+}
diff --git a/trunk/package/base-files/files/etc/init.d/sysfixtime b/trunk/package/base-files/files/etc/init.d/sysfixtime
new file mode 100755
index 00000000..4010e06f
--- /dev/null
+++ b/trunk/package/base-files/files/etc/init.d/sysfixtime
@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2013-2014 OpenWrt.org
+
+START=00
+
+boot() {
+	local curtime="$(date +%s)"
+	local maxtime="$(find /etc -type f -exec date -r {} +%s \; | sort -nr | head -n1)"
+	[ $curtime -lt $maxtime ] && date -s @$maxtime
+}
+
diff --git a/trunk/package/base-files/files/etc/init.d/system b/trunk/package/base-files/files/etc/init.d/system
new file mode 100755
index 00000000..090fcba9
--- /dev/null
+++ b/trunk/package/base-files/files/etc/init.d/system
@@ -0,0 +1,49 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2014 OpenWrt.org
+
+START=10
+USE_PROCD=1
+
+validate_system_section()
+{
+	uci_validate_section system system "${1}" \
+		'hostname:string:libreCMC' \
+		'conloglevel:uinteger' \
+		'buffersize:uinteger' \
+		'timezone:string:UTC' \
+		'zonename:string'
+}
+
+system_config() {
+	local cfg="$1"
+
+	local hostname conloglevel buffersize timezone zonename
+
+	validate_system_section "${1}" || {
+		echo "validation failed"
+		return 1
+	}
+
+	echo "$hostname" > /proc/sys/kernel/hostname
+	[ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
+	echo "$timezone" > /tmp/TZ
+	[ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime
+
+	# apply timezone to kernel
+	date -k
+}
+
+reload_service() {
+	config_load system
+	config_foreach system_config system
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "system"
+	procd_add_validation validate_system_section
+}
+
+start_service() {
+	reload_service
+}
diff --git a/trunk/package/base-files/files/etc/init.d/umount b/trunk/package/base-files/files/etc/init.d/umount
new file mode 100755
index 00000000..349b2b32
--- /dev/null
+++ b/trunk/package/base-files/files/etc/init.d/umount
@@ -0,0 +1,8 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+STOP=99
+stop() {
+	sync
+	/bin/umount -a -d -r
+}
diff --git a/trunk/package/base-files/files/etc/inittab b/trunk/package/base-files/files/etc/inittab
new file mode 100644
index 00000000..78171859
--- /dev/null
+++ b/trunk/package/base-files/files/etc/inittab
@@ -0,0 +1,3 @@
+::sysinit:/etc/init.d/rcS S boot
+::shutdown:/etc/init.d/rcS K shutdown
+::askconsole:/bin/ash --login
diff --git a/trunk/package/base-files/files/etc/librecmc_release b/trunk/package/base-files/files/etc/librecmc_release
new file mode 100644
index 00000000..9b2a40c8
--- /dev/null
+++ b/trunk/package/base-files/files/etc/librecmc_release
@@ -0,0 +1,7 @@
+DISTRIB_ID='%D'
+DISTRIB_RELEASE='%C'
+DISTRIB_REVISION='%R'
+DISTRIB_CODENAME='%n'
+DISTRIB_TARGET='%S'
+DISTRIB_DESCRIPTION='%D %N %V'
+DISTRIB_TAINTS='%t'
diff --git a/trunk/package/base-files/files/etc/librecmc_version b/trunk/package/base-files/files/etc/librecmc_version
new file mode 100644
index 00000000..4b14f596
--- /dev/null
+++ b/trunk/package/base-files/files/etc/librecmc_version
@@ -0,0 +1 @@
+%V
diff --git a/trunk/package/base-files/files/etc/passwd b/trunk/package/base-files/files/etc/passwd
new file mode 100644
index 00000000..1d06a803
--- /dev/null
+++ b/trunk/package/base-files/files/etc/passwd
@@ -0,0 +1,5 @@
+root:x:0:0:root:/root:/bin/ash
+daemon:*:1:1:daemon:/var:/bin/false
+ftp:*:55:55:ftp:/home/ftp:/bin/false
+network:*:101:101:network:/var:/bin/false
+nobody:*:65534:65534:nobody:/var:/bin/false
diff --git a/trunk/package/base-files/files/etc/preinit b/trunk/package/base-files/files/etc/preinit
new file mode 100755
index 00000000..9cc8a9a8
--- /dev/null
+++ b/trunk/package/base-files/files/etc/preinit
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+[ -z "$PREINIT" ] && exec /sbin/init
+
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
+pi_ifname=
+pi_ip=192.168.1.1
+pi_broadcast=192.168.1.255
+pi_netmask=255.255.255.0
+
+fs_failsafe_ifname=
+fs_failsafe_ip=192.168.1.1
+fs_failsafe_broadcast=192.168.1.255
+fs_failsafe_netmask=255.255.255.0
+
+fs_failsafe_wait_timeout=2
+
+pi_suppress_stderr="y"
+pi_init_suppress_stderr="y"
+pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin"
+pi_init_cmd="/sbin/init"
+
+. /lib/functions.sh
+. /lib/functions/preinit.sh
+. /lib/functions/system.sh
+
+boot_hook_init preinit_essential
+boot_hook_init preinit_main
+boot_hook_init failsafe
+boot_hook_init initramfs
+boot_hook_init preinit_mount_root
+
+for pi_source_file in /lib/preinit/*; do
+	. $pi_source_file
+done
+
+boot_run_hook preinit_essential
+
+pi_mount_skip_next=false
+pi_jffs2_mount_success=false
+pi_failsafe_net_message=false
+
+boot_run_hook preinit_main
diff --git a/trunk/package/base-files/files/etc/profile b/trunk/package/base-files/files/etc/profile
new file mode 100644
index 00000000..3dd58e14
--- /dev/null
+++ b/trunk/package/base-files/files/etc/profile
@@ -0,0 +1,16 @@
+#!/bin/sh
+[ -f /etc/banner ] && cat /etc/banner
+[ -e /tmp/.failsafe ] && cat /etc/banner.failsafe
+
+export PATH=/usr/bin:/usr/sbin:/bin:/sbin
+export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
+export HOME=${HOME:-/root}
+export PS1='\u@\h:\w\$ '
+
+[ -x /bin/more ] || alias more=less
+[ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi
+
+[ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
+
+[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
+[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
diff --git a/trunk/package/base-files/files/etc/protocols b/trunk/package/base-files/files/etc/protocols
new file mode 100644
index 00000000..53fecb6d
--- /dev/null
+++ b/trunk/package/base-files/files/etc/protocols
@@ -0,0 +1,56 @@
+# Internet (IP) protocols
+#
+# Updated from http://www.iana.org/assignments/protocol-numbers and other
+# sources.
+# New protocols will be added on request if they have been officially
+# assigned by IANA and are not historical.
+# If you need a huge list of used numbers please install the nmap package.
+
+ip	0	IP		# internet protocol, pseudo protocol number
+#hopopt	0	HOPOPT		# IPv6 Hop-by-Hop Option [RFC1883]
+icmp	1	ICMP		# internet control message protocol
+igmp	2	IGMP		# Internet Group Management
+ggp	3	GGP		# gateway-gateway protocol
+ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
+st	5	ST		# ST datagram mode
+tcp	6	TCP		# transmission control protocol
+egp	8	EGP		# exterior gateway protocol
+igp	9	IGP		# any private interior gateway (Cisco)
+pup	12	PUP		# PARC universal packet protocol
+udp	17	UDP		# user datagram protocol
+hmp	20	HMP		# host monitoring protocol
+xns-idp	22	XNS-IDP		# Xerox NS IDP
+rdp	27	RDP		# "reliable datagram" protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4 [RFC905]
+xtp	36	XTP		# Xpress Transfer Protocol
+ddp	37	DDP		# Datagram Delivery Protocol
+idpr-cmtp 38	IDPR-CMTP	# IDPR Control Message Transport
+ipv6	41	IPv6		# Internet Protocol, version 6
+ipv6-route 43	IPv6-Route	# Routing Header for IPv6
+ipv6-frag 44	IPv6-Frag	# Fragment Header for IPv6
+idrp	45	IDRP		# Inter-Domain Routing Protocol
+rsvp	46	RSVP		# Reservation Protocol
+gre	47	GRE		# General Routing Encapsulation
+esp	50	IPSEC-ESP	# Encap Security Payload [RFC2046]
+ah	51	IPSEC-AH	# Authentication Header [RFC2402]
+skip	57	SKIP		# SKIP
+ipv6-icmp 58	IPv6-ICMP	# ICMP for IPv6
+ipv6-nonxt 59	IPv6-NoNxt	# No Next Header for IPv6
+ipv6-opts 60	IPv6-Opts	# Destination Options for IPv6
+rspf	73	RSPF CPHB	# Radio Shortest Path First (officially CPHB)
+vmtp	81	VMTP		# Versatile Message Transport
+eigrp	88	EIGRP		# Enhanced Interior Routing Protocol (Cisco)
+ospf	89	OSPFIGP		# Open Shortest Path First IGP
+ax.25	93	AX.25		# AX.25 frames
+ipip	94	IPIP		# IP-within-IP Encapsulation Protocol
+etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation [RFC3378]
+encap	98	ENCAP		# Yet Another IP encapsulation [RFC1241]
+#	99			# any private encryption scheme
+pim	103	PIM		# Protocol Independent Multicast
+ipcomp	108	IPCOMP		# IP Payload Compression Protocol
+vrrp	112	VRRP		# Virtual Router Redundancy Protocol
+l2tp	115	L2TP		# Layer Two Tunneling Protocol [RFC2661]
+isis	124	ISIS		# IS-IS over IPv4
+sctp	132	SCTP		# Stream Control Transmission Protocol
+fc	133	FC		# Fibre Channel
+
diff --git a/trunk/package/base-files/files/etc/rc.button/failsafe b/trunk/package/base-files/files/etc/rc.button/failsafe
new file mode 100755
index 00000000..bfad8104
--- /dev/null
+++ b/trunk/package/base-files/files/etc/rc.button/failsafe
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ "${TYPE}" = "switch" ] || echo ${BUTTON} > /tmp/failsafe_button
diff --git a/trunk/package/base-files/files/etc/rc.button/power b/trunk/package/base-files/files/etc/rc.button/power
new file mode 100755
index 00000000..0cb74b9f
--- /dev/null
+++ b/trunk/package/base-files/files/etc/rc.button/power
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ "${ACTION}" = "released" ] || exit 0
+
+exec /sbin/poweroff
diff --git a/trunk/package/base-files/files/etc/rc.button/reset b/trunk/package/base-files/files/etc/rc.button/reset
new file mode 100755
index 00000000..229b503a
--- /dev/null
+++ b/trunk/package/base-files/files/etc/rc.button/reset
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+[ "${ACTION}" = "released" ] || exit 0
+
+. /lib/functions.sh
+
+logger "$BUTTON pressed for $SEEN seconds"
+
+if [ "$SEEN" -lt 1 ]
+then
+	echo "REBOOT" > /dev/console
+	sync
+	reboot
+elif [ "$SEEN" -gt 5 ]
+then
+	echo "FACTORY RESET" > /dev/console
+	jffs2reset -y && reboot &
+fi
diff --git a/trunk/package/base-files/files/etc/rc.button/rfkill b/trunk/package/base-files/files/etc/rc.button/rfkill
new file mode 100755
index 00000000..e8d5a9c8
--- /dev/null
+++ b/trunk/package/base-files/files/etc/rc.button/rfkill
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+[ "${ACTION}" = "released" -o -n "${TYPE}" ] || exit 0
+
+. /lib/functions.sh
+
+local rfkill_state=0
+
+wifi_rfkill_set() {
+	uci set wireless.$1.disabled=$rfkill_state
+}
+
+wifi_rfkill_check() {
+	local disabled
+	config_get disabled $1 disabled
+	[ "$disabled" = "1" ] || rfkill_state=1
+}
+
+config_load wireless
+case "${TYPE}" in
+"switch")
+	[ "${ACTION}" = "released" ] && rfkill_state=1
+	;;
+*)
+	config_foreach wifi_rfkill_check wifi-device
+	;;
+esac
+config_foreach wifi_rfkill_set wifi-device
+uci commit wireless
+wifi up
diff --git a/trunk/package/base-files/files/etc/rc.common b/trunk/package/base-files/files/etc/rc.common
new file mode 100755
index 00000000..695fc166
--- /dev/null
+++ b/trunk/package/base-files/files/etc/rc.common
@@ -0,0 +1,138 @@
+#!/bin/sh
+# Copyright (C) 2006-2012 OpenWrt.org
+
+. $IPKG_INSTROOT/lib/functions.sh
+. $IPKG_INSTROOT/lib/functions/service.sh
+
+initscript=$1
+action=${2:-help}
+shift 2
+
+start() {
+	return 0
+}
+
+stop() {
+	return 0
+}
+
+reload() {
+	return 1
+}
+
+restart() {
+	trap '' TERM
+	stop "$@"
+	start "$@"
+}
+
+boot() {
+	start "$@"
+}
+
+shutdown() {
+	stop
+}
+
+disable() {
+	name="$(basename "${initscript}")"
+	rm -f "$IPKG_INSTROOT"/etc/rc.d/S??$name
+	rm -f "$IPKG_INSTROOT"/etc/rc.d/K??$name
+}
+
+enable() {
+	name="$(basename "${initscript}")"
+	disable
+	[ -n "$START" -o -n "$STOP" ] || {
+		echo "/etc/init.d/$name does not have a START or STOP value"
+		return 1
+	}
+	[ "$START" ] && ln -s "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}"
+	[ "$STOP"  ] && ln -s "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/K${STOP}${name##K[0-9][0-9]}"
+}
+
+enabled() {
+	name="$(basename "${initscript}")"
+	[ -x "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" ]
+}
+
+depends() {
+	return 0
+}
+
+help() {
+	cat <<EOF
+Syntax: $initscript [command]
+
+Available commands:
+	start	Start the service
+	stop	Stop the service
+	restart	Restart the service
+	reload	Reload configuration files (or restart if that fails)
+	enable	Enable service autostart
+	disable	Disable service autostart
+$EXTRA_HELP
+EOF
+}
+
+# for procd
+start_service() {
+	return 0
+}
+
+stop_service() {
+	return 0
+}
+
+service_triggers() {
+	return 0
+}
+
+service_running() {
+	return 0
+}
+
+${INIT_TRACE:+set -x}
+
+. "$initscript"
+
+[ -n "$USE_PROCD" ] && {
+	EXTRA_COMMANDS="${EXTRA_COMMANDS} running"
+
+	. $IPKG_INSTROOT/lib/functions/procd.sh
+	basescript=$(readlink "$initscript")
+	rc_procd() {
+		procd_open_service "$(basename ${basescript:-$initscript})" "$initscript"
+		"$@"
+		procd_close_service
+	}
+
+	start() {
+		rc_procd start_service "$@"
+		if eval "type service_started" 2>/dev/null >/dev/null; then
+			service_started
+		fi
+	}
+
+	stop() {
+		stop_service "$@"
+		procd_kill "$(basename ${basescript:-$initscript})" "$1"
+	}
+
+	reload() {
+		if eval "type reload_service" 2>/dev/null >/dev/null; then
+			reload_service "$@"
+		else
+			start
+		fi
+	}
+
+	running() {
+		service_running "$@"
+	}
+}
+
+ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"
+list_contains ALL_COMMANDS "$action" || action=help
+[ "$action" = "reload" ] && action='eval reload "$@" || restart "$@" && :'
+$action "$@"
diff --git a/trunk/package/base-files/files/etc/rc.local b/trunk/package/base-files/files/etc/rc.local
new file mode 100644
index 00000000..56394773
--- /dev/null
+++ b/trunk/package/base-files/files/etc/rc.local
@@ -0,0 +1,4 @@
+# Put your custom commands here that should be executed once
+# the system init finished. By default this file does nothing.
+
+exit 0
diff --git a/trunk/package/base-files/files/etc/services b/trunk/package/base-files/files/etc/services
new file mode 100644
index 00000000..a12853ef
--- /dev/null
+++ b/trunk/package/base-files/files/etc/services
@@ -0,0 +1,171 @@
+echo		7/tcp
+echo		7/udp
+discard		9/tcp
+discard		9/udp
+daytime		13/tcp
+daytime		13/udp
+netstat		15/tcp
+chargen		19/tcp
+chargen		19/udp
+ftp-data	20/tcp
+ftp		21/tcp
+ssh		22/tcp
+ssh		22/udp
+telnet		23/tcp
+smtp		25/tcp
+time		37/tcp
+time		37/udp
+whois		43/tcp
+domain		53/tcp
+domain		53/udp
+bootps		67/tcp
+bootps		67/udp
+bootpc		68/tcp
+bootpc		68/udp
+tftp		69/udp
+finger		79/tcp
+www		80/tcp		http
+kerberos	88/tcp		kerberos5 krb5 kerberos-sec
+kerberos	88/udp		kerberos5 krb5 kerberos-sec
+pop3		110/tcp
+pop3		110/udp
+sunrpc		111/tcp
+sunrpc		111/udp
+auth		113/tcp		ident
+sftp		115/tcp
+nntp		119/tcp
+ntp		123/tcp
+ntp		123/udp
+netbios-ns	137/tcp
+netbios-ns	137/udp
+netbios-dgm	138/tcp
+netbios-dgm	138/udp
+netbios-ssn	139/tcp
+netbios-ssn	139/udp
+imap2		143/tcp		imap
+imap2		143/udp		imap
+snmp		161/tcp
+snmp		161/udp
+snmp-trap	162/tcp		snmptrap
+snmp-trap	162/udp		snmptrap
+xdmcp		177/tcp
+xdmcp		177/udp
+bgp		179/tcp
+bgp		179/udp
+imap3		220/tcp
+imap3		220/udp
+ldap		389/tcp
+ldap		389/udp
+https		443/tcp
+https		443/udp
+microsoft-ds	445/tcp
+microsoft-ds	445/udp
+isakmp		500/tcp
+isakmp		500/udp
+rtsp		554/tcp
+rtsp		554/udp
+ipp		631/tcp
+ipp		631/udp
+syslog		514/udp
+printer		515/tcp		spooler
+dhcpv6-client	546/tcp
+dhcpv6-client	546/udp
+dhcpv6-server	547/tcp
+dhcpv6-server	547/udp
+afpovertcp	548/tcp
+afpovertcp	548/udp
+nntps		563/tcp		snntp
+nntps		563/udp		snntp
+ldaps		636/tcp
+ldaps		636/udp
+tinc		655/tcp
+tinc		655/udp
+rsync		873/tcp
+rsync		873/udp
+ftps-data	989/tcp
+ftps		990/tcp
+imaps		993/tcp
+imaps		993/udp
+ircs		994/tcp
+ircs		994/udp
+pop3s		995/tcp
+pop3s		995/udp
+socks		1080/tcp
+socks		1080/udp
+openvpn		1194/tcp
+openvpn		1194/udp
+l2f		1701/tcp	l2tp
+l2f		1701/udp	l2tp
+radius		1812/tcp
+radius		1812/udp
+radius-acct	1813/tcp	radacct
+radius-acct	1813/udp	radacct
+nfs		2049/tcp
+nfs		2049/udp
+dict		2628/tcp
+dict		2628/udp
+gpsd		2947/tcp
+gpsd		2947/udp
+icpv2		3130/tcp	icp
+icpv2		3130/udp	icp
+mysql		3306/tcp
+mysql		3306/udp
+nut		3493/tcp
+nut		3493/udp
+distcc		3632/tcp
+distcc		3632/udp
+daap		3689/tcp
+daap		3689/udp
+svn		3690/tcp	subversion
+svn		3690/udp	subversion
+epmd		4369/tcp
+epmd		4369/udp
+iax		4569/tcp
+iax		4569/udp
+mtn		4691/tcp
+mtn		4691/udp
+munin		4949/tcp
+sip		5060/tcp
+sip		5060/udp
+sip-tls		5061/tcp
+sip-tls		5061/udp
+xmpp-client	5222/tcp	jabber-client
+xmpp-client	5222/udp	jabber-client
+xmpp-server	5269/tcp	jabber-server
+xmpp-server	5269/udp	jabber-server
+mdns		5353/tcp
+mdns		5353/udp
+postgresql	5432/tcp	postgres
+postgresql	5432/udp	postgres
+x11		6000/tcp
+x11		6000/udp
+mysql-proxy	6446/tcp
+mysql-proxy	6446/udp
+bacula-dir	9101/tcp
+bacula-dir	9101/udp
+bacula-fd	9102/tcp
+bacula-fd	9102/udp
+bacula-sd	9103/tcp
+bacula-sd	9103/udp
+nbd		10809/tcp
+zabbix-agent	10050/tcp
+zabbix-agent	10050/udp
+zabbix-trapper	10051/tcp
+zabbix-trapper	10051/udp
+hkp		11371/tcp
+hkp		11371/udp
+ssmtp		465/tcp		smtps
+spamd		783/tcp
+zebrasrv	2600/tcp
+zebra		2601/tcp
+ripd		2602/tcp
+ripngd		2603/tcp
+ospfd		2604/tcp
+bgpd		2605/tcp
+ospf6d		2606/tcp
+ospfapi		2607/tcp
+isisd		2608/tcp
+sane-port	6566/tcp	sane saned
+ircd		6667/tcp
+git		9418/tcp
+
diff --git a/trunk/package/base-files/files/etc/shadow b/trunk/package/base-files/files/etc/shadow
new file mode 100644
index 00000000..4b4154f2
--- /dev/null
+++ b/trunk/package/base-files/files/etc/shadow
@@ -0,0 +1,5 @@
+root::0:0:99999:7:::
+daemon:*:0:0:99999:7:::
+ftp:*:0:0:99999:7:::
+network:*:0:0:99999:7:::
+nobody:*:0:0:99999:7:::
diff --git a/trunk/package/base-files/files/etc/shells b/trunk/package/base-files/files/etc/shells
new file mode 100644
index 00000000..006aa38c
--- /dev/null
+++ b/trunk/package/base-files/files/etc/shells
@@ -0,0 +1 @@
+/bin/ash
diff --git a/trunk/package/base-files/files/etc/sysctl.conf b/trunk/package/base-files/files/etc/sysctl.conf
new file mode 100644
index 00000000..1225e46f
--- /dev/null
+++ b/trunk/package/base-files/files/etc/sysctl.conf
@@ -0,0 +1,30 @@
+kernel.panic=3
+net.ipv4.conf.default.arp_ignore=1
+net.ipv4.conf.all.arp_ignore=1
+net.ipv4.ip_forward=1
+net.ipv4.icmp_echo_ignore_broadcasts=1
+net.ipv4.icmp_ignore_bogus_error_responses=1
+net.ipv4.igmp_max_memberships=100
+net.ipv4.tcp_ecn=0
+net.ipv4.tcp_fin_timeout=30
+net.ipv4.tcp_keepalive_time=120
+net.ipv4.tcp_syncookies=1
+net.ipv4.tcp_timestamps=1
+net.ipv4.tcp_sack=1
+net.ipv4.tcp_dsack=1
+
+net.ipv6.conf.default.forwarding=1
+net.ipv6.conf.all.forwarding=1
+
+net.netfilter.nf_conntrack_acct=1
+net.netfilter.nf_conntrack_checksum=0
+net.netfilter.nf_conntrack_max=16384
+net.netfilter.nf_conntrack_tcp_timeout_established=7440
+net.netfilter.nf_conntrack_udp_timeout=60
+net.netfilter.nf_conntrack_udp_timeout_stream=180
+net.netfilter.nf_conntrack_skip_filter=1
+
+# disable bridge firewalling by default
+net.bridge.bridge-nf-call-arptables=0
+net.bridge.bridge-nf-call-ip6tables=0
+net.bridge.bridge-nf-call-iptables=0
diff --git a/trunk/package/base-files/files/etc/sysupgrade.conf b/trunk/package/base-files/files/etc/sysupgrade.conf
new file mode 100644
index 00000000..e06fd5e3
--- /dev/null
+++ b/trunk/package/base-files/files/etc/sysupgrade.conf
@@ -0,0 +1,5 @@
+## This file contains files and directories that should
+## be preserved during an upgrade.
+
+# /etc/example.conf
+# /etc/openvpn/
diff --git a/trunk/package/base-files/files/etc/uci-defaults/10_migrate-shadow b/trunk/package/base-files/files/etc/uci-defaults/10_migrate-shadow
new file mode 100644
index 00000000..b7ea5718
--- /dev/null
+++ b/trunk/package/base-files/files/etc/uci-defaults/10_migrate-shadow
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+local ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)"
+local spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)"
+
+if [ -n "${ppwd#[\!x]}" ] && [ -z "${spwd#[\!x]}" ]; then
+	logger -t migrate-shadow "Moving root password hash into shadow database"
+	sed -i -e "s:^root\:[^\:]*\::root\:x\::"     /etc/passwd
+	sed -i -e "s:^root\:[^\:]*\::root\:$ppwd\::" /etc/shadow
+fi
+
+exit 0
diff --git a/trunk/package/base-files/files/etc/uci-defaults/11_migrate-sysctl b/trunk/package/base-files/files/etc/uci-defaults/11_migrate-sysctl
new file mode 100644
index 00000000..464e2757
--- /dev/null
+++ b/trunk/package/base-files/files/etc/uci-defaults/11_migrate-sysctl
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ ! -f "/rom/etc/sysctl.conf" ] || cmp -s "/rom/etc/sysctl.conf" "/etc/sysctl.conf"; then
+	exit 0
+fi
+
+fingerprint="$(md5sum /etc/sysctl.conf)"
+fingerprint="${fingerprint%% *}"
+
+if [ "$fingerprint" = "1b05ebb41f72cb84e5510573cd4aca26" ] || \
+   [ "$fingerprint" = "62deb895be1a7f496040187b7c930e4e" ]; then
+	logger -t migrate-sysctl "Updating sysctl.conf to use current defaults"
+	cp "/rom/etc/sysctl.conf" "/etc/sysctl.conf"
+fi
+
+exit 0
diff --git a/trunk/package/base-files/files/etc/uci-defaults/12_network-generate-ula b/trunk/package/base-files/files/etc/uci-defaults/12_network-generate-ula
new file mode 100644
index 00000000..8871427c
--- /dev/null
+++ b/trunk/package/base-files/files/etc/uci-defaults/12_network-generate-ula
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+[ "$(uci -q get network.globals.ula_prefix)" != "auto" ] && exit 0
+
+r1=$(dd if=/dev/urandom bs=1 count=1 |hexdump -e '1/1 "%02x"')
+r2=$(dd if=/dev/urandom bs=2 count=1 |hexdump -e '2/1 "%02x"')
+r3=$(dd if=/dev/urandom bs=2 count=1 |hexdump -e '2/1 "%02x"')
+
+uci -q batch <<-EOF >/dev/null
+	set network.globals.ula_prefix=fd$r1:$r2:$r3::/48
+	commit network
+EOF
+
+exit 0
+
diff --git a/trunk/package/base-files/files/lib/functions.sh b/trunk/package/base-files/files/lib/functions.sh
new file mode 100755
index 00000000..9d98fb0f
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions.sh
@@ -0,0 +1,319 @@
+#!/bin/sh
+# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
+# Copyright (C) 2010 Vertical Communications
+
+
+debug () {
+	${DEBUG:-:} "$@"
+}
+
+# newline
+N="
+"
+
+_C=0
+NO_EXPORT=1
+LOAD_STATE=1
+LIST_SEP=" "
+
+append() {
+	local var="$1"
+	local value="$2"
+	local sep="${3:- }"
+
+	eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+}
+
+list_contains() {
+	local var="$1"
+	local str="$2"
+	local val
+
+	eval "val=\" \${$var} \""
+	[ "${val%% $str *}" != "$val" ]
+}
+
+config_load() {
+	[ -n "$IPKG_INSTROOT" ] && return 0
+	uci_load "$@"
+}
+
+reset_cb() {
+	config_cb() { return 0; }
+	option_cb() { return 0; }
+	list_cb() { return 0; }
+}
+reset_cb
+
+package() {
+	return 0
+}
+
+config () {
+	local cfgtype="$1"
+	local name="$2"
+
+	export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1))
+	name="${name:-cfg$CONFIG_NUM_SECTIONS}"
+	append CONFIG_SECTIONS "$name"
+	[ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
+	export ${NO_EXPORT:+-n} CONFIG_SECTION="$name"
+	export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
+}
+
+option () {
+	local varname="$1"; shift
+	local value="$*"
+
+	export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
+	[ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"
+}
+
+list() {
+	local varname="$1"; shift
+	local value="$*"
+	local len
+
+	config_get len "$CONFIG_SECTION" "${varname}_LENGTH" 0
+	[ $len = 0 ] && append CONFIG_LIST_STATE "${CONFIG_SECTION}_${varname}"
+	len=$(($len + 1))
+	config_set "$CONFIG_SECTION" "${varname}_ITEM$len" "$value"
+	config_set "$CONFIG_SECTION" "${varname}_LENGTH" "$len"
+	append "CONFIG_${CONFIG_SECTION}_${varname}" "$value" "$LIST_SEP"
+	list_cb "$varname" "$*"
+}
+
+config_unset() {
+	config_set "$1" "$2" ""
+}
+
+# config_get <variable> <section> <option> [<default>]
+# config_get <section> <option>
+config_get() {
+	case "$3" in
+		"") eval echo "\${CONFIG_${1}_${2}:-\${4}}";;
+		*)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;
+	esac
+}
+
+# config_get_bool <variable> <section> <option> [<default>]
+config_get_bool() {
+	local _tmp
+	config_get _tmp "$2" "$3" "$4"
+	case "$_tmp" in
+		1|on|true|yes|enabled) _tmp=1;;
+		0|off|false|no|disabled) _tmp=0;;
+		*) _tmp="$4";;
+	esac
+	export ${NO_EXPORT:+-n} "$1=$_tmp"
+}
+
+config_set() {
+	local section="$1"
+	local option="$2"
+	local value="$3"
+	local old_section="$CONFIG_SECTION"
+
+	CONFIG_SECTION="$section"
+	option "$option" "$value"
+	CONFIG_SECTION="$old_section"
+}
+
+config_foreach() {
+	local ___function="$1"
+	[ "$#" -ge 1 ] && shift
+	local ___type="$1"
+	[ "$#" -ge 1 ] && shift
+	local section cfgtype
+
+	[ -z "$CONFIG_SECTIONS" ] && return 0
+	for section in ${CONFIG_SECTIONS}; do
+		config_get cfgtype "$section" TYPE
+		[ -n "$___type" -a "x$cfgtype" != "x$___type" ] && continue
+		eval "$___function \"\$section\" \"\$@\""
+	done
+}
+
+config_list_foreach() {
+	[ "$#" -ge 3 ] || return 0
+	local section="$1"; shift
+	local option="$1"; shift
+	local function="$1"; shift
+	local val
+	local len
+	local c=1
+
+	config_get len "${section}" "${option}_LENGTH"
+	[ -z "$len" ] && return 0
+	while [ $c -le "$len" ]; do
+		config_get val "${section}" "${option}_ITEM$c"
+		eval "$function \"\$val\" \"\$@\""
+		c="$(($c + 1))"
+	done
+}
+
+insert_modules() {
+	[ -d /etc/modules.d ] && {
+		cd /etc/modules.d
+		sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+	}
+}
+
+default_prerm() {
+	local name
+	name=$(echo $(basename $1) | cut -d. -f1)
+	[ -f /usr/lib/opkg/info/${name}.prerm-pkg ] && . /usr/lib/opkg/info/${name}.prerm-pkg
+	for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
+		$i disable
+		$i stop
+	done
+}
+
+default_postinst() {
+	local name rusers
+	name=$(echo $(basename $1) | cut -d. -f1)
+	rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.control)
+	[ -n "$rusers" ] && {
+		local user group uid gid
+		for a in $(echo $rusers | sed "s/Require-User://g"); do
+			user=""
+			group=""
+			for b in $(echo $a | sed "s/:/ /g"); do
+				local name id
+
+				name=$(echo $b | cut -d= -f1)
+				id=$(echo $b | cut -d= -f2)
+
+				[ -z "$user" ] && {
+					user=$name
+					uid=$id
+					continue
+				}
+
+				gid=$id
+				[ -n "$gid" ] && {
+					group_exists $name || group_add $name $gid
+				}
+
+				[ -z "$gid" ] && {
+					group_add_next $name
+					gid=$?
+				}
+
+				[ -z "$group" ] && {
+					user_exists $user || user_add $user "$uid" $gid
+					group=$name
+					continue
+				}
+
+				group_add_user $name $user
+			done
+		done
+	}
+
+	[ -f ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg ] && ( . ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg )
+	[ -n "${IPKG_INSTROOT}" ] || rm -f /tmp/luci-indexcache 2>/dev/null
+
+	[ "$PKG_UPGRADE" = "1" ] || for i in `cat ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
+		[ -n "${IPKG_INSTROOT}" ] && $(which bash) ${IPKG_INSTROOT}/etc/rc.common ${IPKG_INSTROOT}$i enable; \
+		[ -n "${IPKG_INSTROOT}" ] || {
+			$i enable
+			$i start
+		}
+	done
+	return 0
+}
+
+include() {
+	local file
+
+	for file in $(ls $1/*.sh 2>/dev/null); do
+		. $file
+	done
+}
+
+find_mtd_index() {
+	local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+	local INDEX="${PART##mtd}"
+
+	echo ${INDEX}
+}
+
+find_mtd_part() {
+	local INDEX=$(find_mtd_index "$1")
+	local PREFIX=/dev/mtdblock
+
+	[ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
+	echo "${INDEX:+$PREFIX$INDEX}"
+}
+
+group_add() {
+	local name="$1"
+	local gid="$2"
+	local rc
+	[ -f "${IPKG_INSTROOT}/etc/group" ] || return 1
+	[ -n "$IPKG_INSTROOT" ] || lock /var/lock/group
+	echo "${name}:x:${gid}:" >> ${IPKG_INSTROOT}/etc/group
+	rc=$?
+	[ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/group
+	return $rc
+}
+
+group_exists() {
+	grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/group
+}
+
+group_add_next() {
+	local gid gids
+	gid=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group | cut -d: -f3)
+	[ -n "$gid" ] && return $gid
+	gids=$(cat ${IPKG_INSTROOT}/etc/group | cut -d: -f3)
+	gid=100
+	while [ -n "$(echo $gids | grep $gid)" ] ; do
+	        gid=$((gid + 1))
+	done
+	group_add $1 $gid
+	return $gid
+}
+
+group_add_user() {
+	local grp delim=","
+	grp=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group)
+	[ -z "$(echo $grp | cut -d: -f4 | grep $2)" ] || return
+	[ -n "$(echo $grp | grep ":$")" ] && delim=""
+	[ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd
+	sed -i "s/$grp/$grp$delim$2/g" ${IPKG_INSTROOT}/etc/group
+	[ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd
+}
+
+user_add() {
+	local name="${1}"
+	local uid="${2}"
+	local gid="${3}"
+	local desc="${4:-$1}"
+	local home="${5:-/var/run/$1}"
+	local shell="${6:-/bin/false}"
+	local rc
+	[ -z "$uid" ] && {
+		uids=$(cat ${IPKG_INSTROOT}/etc/passwd | cut -d: -f3)
+		uid=100
+		while [ -n "$(echo $uids | grep $uid)" ] ; do
+		        uid=$((uid + 1))
+		done
+	}
+	[ -z "$gid" ] && gid=$uid
+	[ -f "${IPKG_INSTROOT}/etc/passwd" ] || return 1
+	[ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd
+	echo "${name}:x:${uid}:${gid}:${desc}:${home}:${shell}" >> ${IPKG_INSTROOT}/etc/passwd
+	echo "${name}:x:0:0:99999:7:::" >> ${IPKG_INSTROOT}/etc/shadow
+	rc=$?
+	[ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd
+	return $rc
+}
+
+user_exists() {
+	grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd
+}
+
+[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh
diff --git a/trunk/package/base-files/files/lib/functions/leds.sh b/trunk/package/base-files/files/lib/functions/leds.sh
new file mode 100644
index 00000000..743c7da7
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions/leds.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Copyright (C) 2013 OpenWrt.org
+
+led_set_attr() {
+	[ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2"
+}
+
+led_timer() {
+	led_set_attr $1 "trigger" "timer"
+	led_set_attr $1 "delay_on" "$2"
+	led_set_attr $1 "delay_off" "$3"
+}
+
+led_on() {
+	led_set_attr $1 "trigger" "none"
+	led_set_attr $1 "brightness" 255
+}
+
+led_off() {
+	led_set_attr $1 "trigger" "none"
+	led_set_attr $1 "brightness" 0
+}
+
+led_morse() {
+	led_set_attr $1 "trigger" "morse"
+	led_set_attr $1 "delay" "$2"
+	led_set_attr $1 "message" "$3"
+}
+
+status_led_set_timer() {
+	led_timer $status_led "$1" "$2"
+	[ -n "$status_led2" ] && led_timer $status_led2 "$1" "$2"
+}
+
+status_led_set_heartbeat() {
+	led_set_attr $status_led "trigger" "heartbeat"
+}
+
+status_led_set_morse() {
+	led_morse $status_led "$1" "$2"
+	[ -n "$status_led2" ] && led_morse $status_led2 "$1" "$2"
+}
+
+status_led_on() {
+	led_on $status_led
+	[ -n "$status_led2" ] && led_on $status_led2
+}
+
+status_led_off() {
+	led_off $status_led
+	[ -n "$status_led2" ] && led_off $status_led2
+}
+
+status_led_blink_slow() {
+	led_timer $status_led 1000 1000
+}
+
+status_led_blink_fast() {
+	led_timer $status_led 100 100
+}
+
+status_led_blink_preinit() {
+	led_timer $status_led 200 200
+}
+
+status_led_blink_failsafe() {
+	led_timer $status_led 50 50
+}
diff --git a/trunk/package/base-files/files/lib/functions/network.sh b/trunk/package/base-files/files/lib/functions/network.sh
new file mode 100644
index 00000000..1b0c7172
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions/network.sh
@@ -0,0 +1,268 @@
+# 1: destination variable
+# 2: interface
+# 3: path
+# 4: separator
+# 5: limit
+__network_ifstatus() {
+	local __tmp
+
+	[ -z "$__NETWORK_CACHE" ] && \
+		export __NETWORK_CACHE="$(ubus call network.interface dump)"
+
+	__tmp="$(jsonfilter ${4:+-F "$4"} ${5:+-l "$5"} -s "$__NETWORK_CACHE" -e "$1=@.interface${2:+[@.interface='$2']}$3")"
+
+	[ -z "$__tmp" ] && \
+		unset "$1" && \
+		return 1
+
+	eval "$__tmp"
+}
+
+# determine first IPv4 address of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_ipaddr() {
+	__network_ifstatus "$1" "$2" "['ipv4-address'][0].address";
+}
+
+# determine first IPv6 address of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_ipaddr6() {
+	local __addr
+
+	if __network_ifstatus "__addr" "$2" "['ipv6-address','ipv6-prefix-assignment'][0].address"; then
+		case "$__addr" in
+			*:)	export "$1=${__addr}1" ;;
+			*)	export "$1=${__addr}" ;;
+		esac
+		return 0
+	fi
+
+	unset $1
+	return 1
+}
+
+# determine first IPv4 subnet of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_subnet() {
+	__network_ifstatus "$1" "$2" "['ipv4-address'][0]['address','mask']" "/"
+}
+
+# determine first IPv6 subnet of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_subnet6() {
+	__network_ifstatus "$1" "$2" "['ipv6-address'][0]['address','mask']" "/"
+}
+
+# determine first IPv6 prefix of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_prefix6() {
+	__network_ifstatus "$1" "$2" "['ipv6-prefix'][0]['address','mask']" "/"
+}
+
+# determine all IPv4 addresses of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_ipaddrs() {
+	__network_ifstatus "$1" "$2" "['ipv4-address'][*].address"
+}
+
+# determine all IPv6 addresses of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_ipaddrs6() {
+	local __addr
+	local __list=""
+
+	if __network_ifstatus "__addr" "$2" "['ipv6-address','ipv6-prefix-assignment'][*].address"; then
+		for __addr in $__addr; do
+			case "$__addr" in
+				*:) __list="${__list:+$__list }${__addr}1" ;;
+				*)  __list="${__list:+$__list }${__addr}"  ;;
+			esac
+		done
+
+		export "$1=$__list"
+		return 0
+	fi
+
+	unset "$1"
+	return 1
+}
+
+# determine all IP addresses of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_ipaddrs_all() {
+	local __addr
+	local __list=""
+
+	if __network_ifstatus "__addr" "$2" "['ipv4-address','ipv6-address','ipv6-prefix-assignment'][*].address"; then
+		for __addr in $__addr; do
+			case "$__addr" in
+				*:) __list="${__list:+$__list }${__addr}1" ;;
+				*)  __list="${__list:+$__list }${__addr}"  ;;
+			esac
+		done
+
+		export "$1=$__list"
+		return 0
+	fi
+
+	unset "$1"
+	return 1
+}
+
+# determine all IPv4 subnets of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_subnets() {
+	__network_ifstatus "$1" "$2" "['ipv4-address'][*]['address','mask']" "/ "
+}
+
+# determine all IPv6 subnets of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_subnets6() {
+	local __addr
+	local __list=""
+
+	if __network_ifstatus "__addr" "$2" "['ipv6-address','ipv6-prefix-assignment'][*]['address','mask']" "/ "; then
+		for __addr in $__addr; do
+			case "$__addr" in
+				*:/*) __list="${__list:+$__list }${__addr%/*}1/${__addr##*/}" ;;
+				*)    __list="${__list:+$__list }${__addr}"                   ;;
+			esac
+		done
+
+		export "$1=$__list"
+		return 0
+	fi
+
+	unset "$1"
+	return 1
+}
+
+# determine all IPv6 prefixes of given logical interface
+# 1: destination variable
+# 2: interface
+network_get_prefixes6() {
+	__network_ifstatus "$1" "$2" "['ipv6-prefix'][*]['address','mask']" "/ "
+}
+
+# determine IPv4 gateway of given logical interface
+# 1: destination variable
+# 2: interface
+# 3: consider inactive gateway if "true" (optional)
+network_get_gateway() {
+	__network_ifstatus "$1" "$2" ".route[@.target='0.0.0.0' && !@.table].nexthop" "" 1 && \
+		return 0
+
+	[ "$3" = 1 -o "$3" = "true" ] && \
+		__network_ifstatus "$1" "$2" ".inactive.route[@.target='0.0.0.0' && !@.table].nexthop" "" 1
+}
+
+# determine IPv6 gateway of given logical interface
+# 1: destination variable
+# 2: interface
+# 3: consider inactive gateway if "true" (optional)
+network_get_gateway6() {
+	__network_ifstatus "$1" "$2" ".route[@.target='::' && !@.table].nexthop" "" 1 && \
+		return 0
+
+	[ "$3" = 1 -o "$3" = "true" ] && \
+		__network_ifstatus "$1" "$2" ".inactive.route[@.target='::' && !@.table].nexthop" "" 1
+}
+
+# determine the DNS servers of the given logical interface
+# 1: destination variable
+# 2: interface
+# 3: consider inactive servers if "true" (optional)
+network_get_dnsserver() {
+	__network_ifstatus "$1" "$2" "['dns-server'][*]" && return 0
+
+	[ "$3" = 1 -o "$3" = "true" ] && \
+		__network_ifstatus "$1" "$2" ".inactive['dns-server'][*]"
+}
+
+# determine the domains of the given logical interface
+# 1: destination variable
+# 2: interface
+# 3: consider inactive domains if "true" (optional)
+network_get_dnssearch() {
+	__network_ifstatus "$1" "$2" "['dns-search'][*]" && return 0
+
+	[ "$3" = 1 -o "$3" = "true" ] && \
+		__network_ifstatus "$1" "$2" ".inactive['dns-search'][*]"
+}
+
+
+# 1: destination variable
+# 2: addr
+# 3: inactive
+__network_wan()
+{
+	__network_ifstatus "$1" "" \
+		"[@.route[@.target='$2' && !@.table]].interface" "" 1 && \
+			return 0
+
+	[ "$3" = 1 -o "$3" = "true" ] && \
+		__network_ifstatus "$1" "" \
+			"[@.inactive.route[@.target='$2' && !@.table]].interface" "" 1
+}
+
+# find the logical interface which holds the current IPv4 default route
+# 1: destination variable
+# 2: consider inactive default routes if "true" (optional)
+network_find_wan() { __network_wan "$1" "0.0.0.0" "$2"; }
+
+# find the logical interface which holds the current IPv6 default route
+# 1: destination variable
+# 2: consider inactive dafault routes if "true" (optional)
+network_find_wan6() { __network_wan "$1" "::" "$2"; }
+
+# test whether the given logical interface is running
+# 1: interface
+network_is_up()
+{
+	local __up
+	__network_ifstatus "__up" "$1" ".up" && [ "$__up" = 1 ]
+}
+
+# determine the protocol of the given logical interface
+# 1: destination variable
+# 2: interface
+network_get_protocol() { __network_ifstatus "$1" "$2" ".proto"; }
+
+# determine the layer 3 linux network device of the given logical interface
+# 1: destination variable
+# 2: interface
+network_get_device() { __network_ifstatus "$1" "$2" ".l3_device"; }
+
+# determine the layer 2 linux network device of the given logical interface
+# 1: destination variable
+# 2: interface
+network_get_physdev() { __network_ifstatus "$1" "$2" ".device"; }
+
+# defer netifd actions on the given linux network device
+# 1: device name
+network_defer_device()
+{
+	ubus call network.device set_state \
+		"$(printf '{ "name": "%s", "defer": true }' "$1")" 2>/dev/null
+}
+
+# continue netifd actions on the given linux network device
+# 1: device name
+network_ready_device()
+{
+	ubus call network.device set_state \
+		"$(printf '{ "name": "%s", "defer": false }' "$1")" 2>/dev/null
+}
+
+# flush the internal value cache to force re-reading values from ubus
+network_flush_cache() { unset __NETWORK_CACHE; }
diff --git a/trunk/package/base-files/files/lib/functions/preinit.sh b/trunk/package/base-files/files/lib/functions/preinit.sh
new file mode 100644
index 00000000..db1f298c
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions/preinit.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+boot_hook_splice_start() {
+	export -n PI_HOOK_SPLICE=1
+}
+
+boot_hook_splice_finish() {
+	local hook
+	for hook in $PI_STACK_LIST; do
+		local v; eval "v=\${${hook}_splice:+\$${hook}_splice }$hook"
+		export -n "${hook}=${v% }"
+		export -n "${hook}_splice="
+	done
+	export -n PI_HOOK_SPLICE=
+}
+
+boot_hook_init() {
+	local hook="${1}_hook"
+	export -n "PI_STACK_LIST=${PI_STACK_LIST:+$PI_STACK_LIST }$hook"
+	export -n "$hook="
+}
+
+boot_hook_add() {
+	local hook="${1}_hook${PI_HOOK_SPLICE:+_splice}"
+	local func="${2}"
+
+	[ -n "$func" ] && {
+		local v; eval "v=\$$hook"
+		export -n "$hook=${v:+$v }$func"
+	}
+}
+
+boot_hook_shift() {
+	local hook="${1}_hook"
+	local rvar="${2}"
+
+	local v; eval "v=\$$hook"
+	[ -n "$v" ] && {
+		local first="${v%% *}"
+
+		[ "$v" != "${v#* }" ] && \
+			export -n "$hook=${v#* }" || \
+			export -n "$hook="
+
+		export -n "$rvar=$first"
+		return 0
+	}
+
+	return 1
+}
+
+boot_run_hook() {
+	local hook="$1"
+	local func
+
+	while boot_hook_shift "$hook" func; do
+		local ran; eval "ran=\$PI_RAN_$func"
+		[ -n "$ran" ] || {
+			export -n "PI_RAN_$func=1"
+			$func "$1" "$2"
+		}
+	done
+}
+
+pivot() { # <new_root> <old_root>
+	/bin/mount -o noatime,move /proc $1/proc && \
+	pivot_root $1 $1$2 && {
+		/bin/mount -o noatime,move $2/dev /dev
+		/bin/mount -o noatime,move $2/tmp /tmp
+		/bin/mount -o noatime,move $2/sys /sys 2>&-
+		/bin/mount -o noatime,move $2/overlay /overlay 2>&-
+		return 0
+	}
+}
+
+fopivot() { # <rw_root> <ro_root> <dupe?>
+	/bin/mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt
+	pivot /mnt $2
+}
+
+ramoverlay() {
+	mkdir -p /tmp/root
+	/bin/mount -t tmpfs -o noatime,mode=0755 root /tmp/root
+	fopivot /tmp/root /rom 1
+}
diff --git a/trunk/package/base-files/files/lib/functions/service.sh b/trunk/package/base-files/files/lib/functions/service.sh
new file mode 100644
index 00000000..3d08e143
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions/service.sh
@@ -0,0 +1,103 @@
+#
+# service: simple wrapper around start-stop-daemon
+#
+# Usage: service ACTION EXEC ARGS...
+#
+# Action:
+#   -C	check if EXEC is alive
+#   -S	start EXEC, passing it ARGS as its arguments
+#   -K	kill EXEC, sending it a TERM signal if not specified otherwise
+#
+# Environment variables exposed:
+#   SERVICE_DAEMONIZE	run EXEC in background
+#   SERVICE_WRITE_PID	create a pid-file and use it for matching
+#   SERVICE_MATCH_EXEC	use EXEC command-line for matching (default)
+#   SERVICE_MATCH_NAME	use EXEC process name for matching
+#   SERVICE_USE_PID	assume EXEC create its own pid-file and use it for matching
+#   SERVICE_NAME	process name to use (default to EXEC file part)
+#   SERVICE_PID_FILE	pid file to use (default to /var/run/$SERVICE_NAME.pid)
+#   SERVICE_SIG		signal to send when using -K
+#   SERVICE_SIG_RELOAD	default signal used when reloading
+#   SERVICE_SIG_STOP	default signal used when stopping
+#   SERVICE_STOP_TIME	time to wait for a process to stop gracefully before killing it
+#   SERVICE_UID		user EXEC should be run as
+#   SERVICE_GID		group EXEC should be run as
+#
+#   SERVICE_DEBUG	don't do anything, but show what would be done
+#   SERVICE_QUIET	don't print anything
+#
+
+SERVICE_QUIET=1
+SERVICE_SIG_RELOAD="HUP"
+SERVICE_SIG_STOP="TERM"
+SERVICE_STOP_TIME=5
+SERVICE_MATCH_EXEC=1
+
+service() {
+	local ssd
+	local exec
+	local name
+	local start
+	ssd="${SERVICE_DEBUG:+echo }start-stop-daemon${SERVICE_QUIET:+ -q}"
+	case "$1" in
+	  -C)
+		ssd="$ssd -K -t"
+		;;
+	  -S)
+		ssd="$ssd -S${SERVICE_DAEMONIZE:+ -b}${SERVICE_WRITE_PID:+ -m}"
+		start=1
+		;;
+	  -K)
+		ssd="$ssd -K${SERVICE_SIG:+ -s $SERVICE_SIG}"
+		;;
+	  *)
+		echo "service: unknown ACTION '$1'" 1>&2
+		return 1
+	esac
+	shift
+	exec="$1"
+	[ -n "$exec" ] || {
+		echo "service: missing argument" 1>&2
+		return 1
+	}
+	[ -x "$exec" ] || {
+		echo "service: file '$exec' is not executable" 1>&2
+		return 1
+	}
+	name="${SERVICE_NAME:-${exec##*/}}"
+	[ -z "$SERVICE_USE_PID$SERVICE_WRITE_PID$SERVICE_PID_FILE" ] \
+		|| ssd="$ssd -p ${SERVICE_PID_FILE:-/var/run/$name.pid}"
+	[ -z "$SERVICE_MATCH_NAME" ] || ssd="$ssd -n $name"
+	ssd="$ssd${SERVICE_UID:+ -c $SERVICE_UID${SERVICE_GID:+:$SERVICE_GID}}"
+	[ -z "$SERVICE_MATCH_EXEC$start" ] || ssd="$ssd -x $exec"
+	shift
+	$ssd${1:+ -- "$@"}
+}
+
+service_check() {
+	service -C "$@"
+}
+
+service_signal() {
+	SERVICE_SIG="${SERVICE_SIG:-USR1}" service -K "$@"
+}
+
+service_start() {
+	service -S "$@"
+}
+
+service_stop() {
+	local try
+	SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_STOP}" service -K "$@" || return 1
+	while [ $((try++)) -lt $SERVICE_STOP_TIME ]; do
+		service -C "$@" || return 0
+		sleep 1
+	done
+	SERVICE_SIG="KILL" service -K "$@"
+	sleep 1
+	! service -C "$@"
+}
+
+service_reload() {
+	SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_RELOAD}" service -K "$@"
+}
diff --git a/trunk/package/base-files/files/lib/functions/system.sh b/trunk/package/base-files/files/lib/functions/system.sh
new file mode 100644
index 00000000..8d75a5a8
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions/system.sh
@@ -0,0 +1,112 @@
+# Copyright (C) 2006-2013 OpenWrt.org
+
+find_mtd_chardev() {
+	local INDEX=$(find_mtd_index "$1")
+	local PREFIX=/dev/mtd
+
+	[ -d /dev/mtd ] && PREFIX=/dev/mtd/
+	echo "${INDEX:+$PREFIX$INDEX}"
+}
+
+mtd_get_mac_ascii()
+{
+	local mtdname="$1"
+	local key="$2"
+	local part
+	local mac_dirty
+
+	part=$(find_mtd_part "$mtdname")
+	if [ -z "$part" ]; then
+		echo "mtd_get_mac_ascii: partition $mtdname not found!" >&2
+		return
+	fi
+
+	mac_dirty=$(strings "$part" | sed -n 's/^'"$key"'=//p')
+
+	# "canonicalize" mac
+	[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
+}
+
+mtd_get_mac_binary() {
+	local mtdname="$1"
+	local offset="$2"
+	local part
+
+	part=$(find_mtd_part "$mtdname")
+	if [ -z "$part" ]; then
+		echo "mtd_get_mac_binary: partition $mtdname not found!" >&2
+		return
+	fi
+
+	dd bs=1 skip=$offset count=6 if=$part 2>/dev/null | hexdump -v -n 6 -e '5/1 "%02x:" 1/1 "%02x"'
+}
+
+mtd_get_part_size() {
+	local part_name=$1
+	local first dev size erasesize name
+	while read dev size erasesize name; do
+		name=${name#'"'}; name=${name%'"'}
+		if [ "$name" = "$part_name" ]; then
+			echo $((0x$size))
+			break
+		fi
+	done < /proc/mtd
+}
+
+macaddr_add() {
+	local mac=$1
+	local val=$2
+	local oui=${mac%:*:*:*}
+	local nic=${mac#*:*:*:}
+
+	nic=$(printf "%06x" $((0x${nic//:/} + $val & 0xffffff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/')
+	echo $oui:$nic
+}
+
+macaddr_setbit_la()
+{
+	local mac=$1
+
+	printf "%02x:%s" $((0x${mac%%:*} | 0x02)) ${mac#*:}
+}
+
+macaddr_2bin()
+{
+	local mac=$1
+
+	echo -ne \\x${mac//:/\\x}
+}
+
+macaddr_canonicalize()
+{
+	local mac="$1"
+	local canon=""
+
+	mac=$(echo -n $mac | tr -d \")
+	[ ${#mac} -gt 17 ] && return
+	[ -n "${mac//[a-fA-F0-9\.: -]/}" ] && return
+
+	for octet in ${mac//[\.:-]/ }; do
+		case "${#octet}" in
+		1)
+			octet="0${octet}"
+			;;
+		2)
+			;;
+		4)
+			octet="${octet:0:2} ${octet:2:2}"
+			;;
+		12)
+			octet="${octet:0:2} ${octet:2:2} ${octet:4:2} ${octet:6:2} ${octet:8:2} ${octet:10:2}"
+			;;
+		*)
+			return
+			;;
+		esac
+		canon=${canon}${canon:+ }${octet}
+	done
+
+	[ ${#canon} -ne 17 ] && return
+
+	printf "%02x:%02x:%02x:%02x:%02x:%02x" 0x${canon// / 0x} 2>/dev/null
+}
diff --git a/trunk/package/base-files/files/lib/functions/uci-defaults-new.sh b/trunk/package/base-files/files/lib/functions/uci-defaults-new.sh
new file mode 100755
index 00000000..0751744d
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions/uci-defaults-new.sh
@@ -0,0 +1,302 @@
+#!/bin/ash
+
+CFG=/etc/board.json
+
+. /usr/share/libubox/jshn.sh
+
+json_select_array() {
+	local _json_no_warning=1
+
+	json_select "$1"
+	[ $? = 0 ] && return
+
+	json_add_array $1
+	json_close_array
+
+	json_select "$1"
+}
+
+json_select_object() {
+	local _json_no_warning=1
+
+	json_select "$1"
+	[ $? = 0 ] && return
+
+	json_add_object $1
+	json_close_object
+
+	json_select "$1"
+}
+
+_ucidef_set_interface() {
+	local name=$1
+	local iface=$2
+
+	json_select_object $name
+	json_add_string ifname "${iface%%.*}"
+	[ "$iface" = "${iface%%.*}" ] || json_add_boolean create_vlan 1
+	json_select ..
+}
+
+ucidef_set_interface_loopback()
+{
+	# stub
+	local a=$1
+}
+
+ucidef_set_interface_lan() {
+	local lan_if=$1
+
+	json_select_object network
+	_ucidef_set_interface lan $lan_if
+	json_select ..
+}
+
+ucidef_set_interfaces_lan_wan() {
+	local lan_if=$1
+	local wan_if=$2
+
+	json_select_object network
+	_ucidef_set_interface lan $lan_if
+	_ucidef_set_interface wan $wan_if
+	json_select ..
+}
+
+ucidef_add_switch() {
+	local name=$1
+	local reset=$2
+	local enable=$3
+
+	json_select_object switch
+
+	json_select_object $name
+	[ "$enable" -eq 1 ] && json_add_boolean enable 1
+	[ "$reset" -eq 1 ] && json_add_boolean reset 1
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_add_switch_attr() {
+	local name=$1
+	local key=$2
+	local val=$3
+
+	json_select_object switch
+
+	json_select_object $name
+	json_add_string $key $val
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_add_switch_vlan() {
+	local name=$1
+	local vlan=$2
+	local ports=$3
+	local cpu_port=''
+
+	case $vlan in
+	1)	vlan=lan;;
+	2)	vlan=wan;;
+	*)	vlan=vlan$vlan;;
+	esac
+
+	json_select_object switch
+	json_select_object $name
+	json_select_object vlans
+
+	json_add_array $vlan
+	for p in $ports; do
+		if [ ${p%t} != $p ]; then
+			cpu_port=$p
+		else
+			json_add_int "" $p
+		fi
+	done
+	json_close_array
+
+	json_select ..
+	[ -n "$cpu_port" ] && json_add_int cpu_port $cpu_port
+	json_select ..
+	json_select ..
+}
+
+ucidef_set_interface_macaddr() {
+	local network=$1
+	local macaddr=$2
+
+	json_select_object network
+
+	json_select $network
+	[ $? -eq 0 ] || {
+		json_select ..
+		return
+	}
+
+	json_add_string macaddr $macaddr
+	json_select ..
+	
+	json_select ..
+}
+
+ucidef_set_led_netdev() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local dev=$4
+
+	json_select_object led
+	
+	json_select_object $1
+	json_add_string name $name
+	json_add_string type netdev
+	json_add_string sysfs $sysfs
+	json_add_string device $dev
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_set_led_interface() {
+	local name=$1
+	local sysfs=$2
+
+	json_select_object led
+	
+	json_select_object $1
+	json_add_string name $name
+	json_add_string type interface
+	json_add_string sysfs $sysfs
+	json_add_string interface $name
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_set_led_usbdev() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local dev=$4
+
+	json_select_object led
+	
+	json_select_object $1
+	json_add_string name $name	
+	json_add_string type usb
+	json_add_string sysfs $sysfs
+	json_add_string device $dev
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_set_led_wlan() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local trigger=$4
+
+	json_select_object led
+	
+	json_select_object $1
+	json_add_string name $name
+	json_add_string type trigger
+	json_add_string sysfs $sysfs
+	json_add_string trigger $trigger
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_set_led_switch() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local trigger=$4
+	local port_mask=$5
+
+	json_select_object led
+	
+	json_select_object $1
+	json_add_string name $name
+	json_add_string type switch
+	json_add_string sysfs $sysfs
+	json_add_string trigger $trigger
+	json_add_string port_mask $port_mask
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_set_led_default() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local default=$4
+
+	json_select_object led
+	
+	json_select_object $1
+	json_add_string name $name
+	json_add_string sysfs $sysfs
+	json_add_string default $default
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_set_led_rssi() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local iface=$4
+	local minq=$5
+	local maxq=$6
+	local offset=$7
+	local factor=$8
+
+	json_select_object led
+	
+	json_select_object rssi
+	json_select_object $1
+	json_add_string name $name
+	json_add_string sysfs $sysfs
+	json_add_string minq $minq
+	json_add_string maxq $maxq
+	json_add_string offset $offset
+	json_add_string factor $factor
+	json_select ..
+	json_select ..
+
+	json_select ..
+}
+
+ucidef_set_rssimon() {
+	local dev="$1"
+	local refresh="$2"
+	local threshold="$3"
+
+	json_select_object led
+	
+	json_select_object rssi
+	json_add_string type rssi
+	json_add_string dev $dev
+	json_add_string threshold $threshold
+	json_select ..
+
+	json_select ..
+	
+}
+
+board_config_update() {
+	json_init
+	[ -f ${CFG} ] && json_load "$(cat ${CFG})"
+}
+
+board_config_flush() {
+	json_dump -i > /tmp/.board.json
+	mv /tmp/.board.json ${CFG}
+}
diff --git a/trunk/package/base-files/files/lib/functions/uci-defaults.sh b/trunk/package/base-files/files/lib/functions/uci-defaults.sh
new file mode 100644
index 00000000..6ed0bf11
--- /dev/null
+++ b/trunk/package/base-files/files/lib/functions/uci-defaults.sh
@@ -0,0 +1,248 @@
+#!/bin/sh
+# Copyright (C) 2011 OpenWrt.org
+
+UCIDEF_LEDS_CHANGED=0
+
+ucidef_set_led_netdev() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local dev=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='netdev'
+set system.$cfg.dev='$dev'
+set system.$cfg.mode='link tx rx'
+EOF
+	UCIDEF_LEDS_CHANGED=1
+}
+
+ucidef_set_led_usbdev() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local dev=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='usbdev'
+set system.$cfg.dev='$dev'
+set system.$cfg.interval='50'
+EOF
+	UCIDEF_LEDS_CHANGED=1
+}
+
+ucidef_set_led_wlan() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local trigger=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='$trigger'
+EOF
+	UCIDEF_LEDS_CHANGED=1
+}
+
+ucidef_set_led_switch() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local trigger=$4
+	local port_mask=$5
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='$trigger'
+set system.$cfg.port_mask='$port_mask'
+EOF
+	UCIDEF_LEDS_CHANGED=1
+}
+
+ucidef_set_led_default() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local default=$4
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.default='$default'
+EOF
+	UCIDEF_LEDS_CHANGED=1
+}
+
+ucidef_set_led_rssi() {
+	local cfg="led_$1"
+	local name=$2
+	local sysfs=$3
+	local iface=$4
+	local minq=$5
+	local maxq=$6
+	local offset=$7
+	local factor=$8
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='led'
+set system.$cfg.name='$name'
+set system.$cfg.sysfs='$sysfs'
+set system.$cfg.trigger='rssi'
+set system.$cfg.iface='rssid_$iface'
+set system.$cfg.minq='$minq'
+set system.$cfg.maxq='$maxq'
+set system.$cfg.offset='$offset'
+set system.$cfg.factor='$factor'
+EOF
+	UCIDEF_LEDS_CHANGED=1
+}
+
+ucidef_set_rssimon() {
+	local dev="$1"
+	local refresh="$2"
+	local threshold="$3"
+
+	local cfg="rssid_$dev"
+
+	uci -q get system.$cfg && return 0
+
+	uci batch <<EOF
+set system.$cfg='rssid'
+set system.$cfg.dev='$dev'
+set system.$cfg.refresh='$refresh'
+set system.$cfg.threshold='$threshold'
+EOF
+	UCIDEF_LEDS_CHANGED=1
+}
+
+ucidef_commit_leds()
+{
+	[ "$UCIDEF_LEDS_CHANGED" = "1" ] && uci commit system
+}
+
+ucidef_set_interface_loopback() {
+	uci batch <<EOF
+set network.loopback='interface'
+set network.loopback.ifname='lo'
+set network.loopback.proto='static'
+set network.loopback.ipaddr='127.0.0.1'
+set network.loopback.netmask='255.0.0.0'
+set network.globals='globals'
+set network.globals.ula_prefix='auto'
+EOF
+}
+
+ucidef_set_interface_raw() {
+	local cfg=$1
+	local ifname=$2
+	local proto=${3:-"none"}
+
+	uci batch <<EOF
+set network.$cfg='interface'
+set network.$cfg.ifname='$ifname'
+set network.$cfg.proto='$proto'
+EOF
+}
+
+ucidef_set_interface_lan() {
+	local ifname=$1
+
+	uci batch <<EOF
+set network.lan='interface'
+set network.lan.ifname='$ifname'
+set network.lan.force_link=1
+set network.lan.type='bridge'
+set network.lan.proto='static'
+set network.lan.ipaddr='192.168.1.1'
+set network.lan.netmask='255.255.255.0'
+set network.lan.ip6assign='60'
+EOF
+}
+
+ucidef_set_interface_wan() {
+	local ifname=$1
+
+	uci batch <<EOF
+set network.wan='interface'
+set network.wan.ifname='$ifname'
+set network.wan.proto='dhcp'
+set network.wan6='interface'
+set network.wan6.ifname='$ifname'
+set network.wan6.proto='dhcpv6'
+EOF
+}
+
+ucidef_set_interfaces_lan_wan() {
+	local lan_ifname=$1
+	local wan_ifname=$2
+
+	ucidef_set_interface_lan "$lan_ifname"
+	ucidef_set_interface_wan "$wan_ifname"
+}
+
+ucidef_set_interface_macaddr() {
+	local ifname=$1
+	local mac=$2
+
+	uci batch <<EOF
+set network.$ifname.macaddr='$mac'
+EOF
+}
+
+ucidef_add_switch() {
+	local name=$1
+	local reset=$2
+	local enable=$3
+	uci batch <<EOF
+add network switch
+set network.@switch[-1].name='$name'
+set network.@switch[-1].reset='$reset'
+set network.@switch[-1].enable_vlan='$enable'
+EOF
+}
+
+ucidef_add_switch_vlan() {
+	local device=$1
+	local vlan=$2
+	local ports=$3
+	uci batch <<EOF
+add network switch_vlan
+set network.@switch_vlan[-1].device='$device'
+set network.@switch_vlan[-1].vlan='$vlan'
+set network.@switch_vlan[-1].ports='$ports'
+EOF
+}
+
+ucidef_add_switch_port() {
+	local device=$1
+	local port=$2
+	uci batch <<EOF
+add network switch_port
+set network.@switch_port[-1].device='$device'
+set network.@switch_port[-1].port='$port'
+EOF
+}
+
diff --git a/trunk/package/base-files/files/lib/preinit/02_default_set_state b/trunk/package/base-files/files/lib/preinit/02_default_set_state
new file mode 100644
index 00000000..df433957
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/02_default_set_state
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+define_default_set_state() {
+	. /etc/diag.sh
+}
+
+boot_hook_add preinit_main define_default_set_state
diff --git a/trunk/package/base-files/files/lib/preinit/10_indicate_failsafe b/trunk/package/base-files/files/lib/preinit/10_indicate_failsafe
new file mode 100644
index 00000000..6afae410
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/10_indicate_failsafe
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+# commands for emitting messages to network in failsafe mode
+
+indicate_failsafe_led () {
+	set_state failsafe
+}
+
+indicate_failsafe() {
+	echo "- failsafe -"
+	preinit_net_echo "Entering Failsafe!\n"
+	indicate_failsafe_led
+}
+
+boot_hook_add failsafe indicate_failsafe
diff --git a/trunk/package/base-files/files/lib/preinit/10_indicate_preinit b/trunk/package/base-files/files/lib/preinit/10_indicate_preinit
new file mode 100644
index 00000000..d6d143b2
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -0,0 +1,49 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+preinit_ip() {
+	# if the preinit interface isn't specified and ifname is set in
+	# preinit.arch use that interface
+	if [ -z "$pi_ifname" ]; then
+		pi_ifname=$ifname
+	fi
+
+	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+		ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
+	}
+}
+
+preinit_ip_deconfig() {
+	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+		ifconfig $pi_ifname 0.0.0.0 down
+	}
+}
+
+preinit_net_echo() {
+	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+		{
+			[ "$pi_preinit_net_messages" = "y" ] || {
+				[ "$pi_failsafe_net_message" = "true" ] &&
+					[ "$pi_preinit_no_failsafe_netmsg" != "y" ]
+			}
+		} && netmsg $pi_broadcast "$1"
+	}
+}
+
+preinit_echo() {
+	preinit_net_echo $1
+	echo $1
+}
+
+pi_indicate_led() {
+	set_state preinit
+}
+
+pi_indicate_preinit() {
+	preinit_net_echo "Doing libreCMC Preinit\n"
+	pi_indicate_led
+}
+
+boot_hook_add preinit_main preinit_ip
+boot_hook_add preinit_main pi_indicate_preinit
diff --git a/trunk/package/base-files/files/lib/preinit/30_failsafe_wait b/trunk/package/base-files/files/lib/preinit/30_failsafe_wait
new file mode 100644
index 00000000..3d69baf3
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -0,0 +1,96 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+fs_wait_for_key () {
+	local timeout=$3
+	local timer
+	local do_keypress
+	local keypress_true="$(mktemp)"
+	local keypress_wait="$(mktemp)"
+	local keypress_sec="$(mktemp)"
+	if [ -z "$keypress_wait" ]; then
+		keypress_wait=/tmp/.keypress_wait
+		touch $keypress_wait
+	fi
+	if [ -z "$keypress_true" ]; then
+		keypress_true=/tmp/.keypress_true
+		touch $keypress_true
+	fi
+	if [ -z "$keypress_sec" ]; then
+		keypress_sec=/tmp/.keypress_sec
+		touch $keypress_sec
+	fi
+
+	trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait" INT
+	trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait" USR1
+
+	[ -n "$timeout" ] || timeout=1
+	[ $timeout -ge 1 ] || timeout=1
+	timer=$timeout
+	lock $keypress_wait
+	{
+		while [ $timer -gt 0 ]; do
+			echo "$timer" >$keypress_sec
+			timer=$(($timer - 1))
+			sleep 1
+		done
+		lock -u $keypress_wait
+		rm -f $keypress_wait
+	} &
+
+	echo "Press the [$1] key and hit [enter] $2"
+	echo "Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level"
+	# if we're on the console we wait for input
+	{
+		while [ -r $keypress_wait ]; do
+			timer="$(cat $keypress_sec)"
+
+			[ -n "$timer" ] || timer=1
+			timer="${timer%%\ *}"
+			[ $timer -ge 1 ] || timer=1
+			do_keypress=""
+			{
+				read -t "$timer" do_keypress
+				case "$do_keypress" in
+				$1)
+					echo "true" >$keypress_true
+					;;
+				1 | 2 | 3 | 4)
+					echo "$do_keypress" >/tmp/debug_level
+					;;
+				*)
+					continue;
+					;;
+				esac
+				lock -u $keypress_wait
+				rm -f $keypress_wait
+			}
+		done
+	}
+	lock -w $keypress_wait
+
+	keypressed=1
+	[ "$(cat $keypress_true)" = "true" ] && keypressed=0
+
+	rm -f $keypress_true
+	rm -f $keypress_wait
+	rm -f $keypress_sec
+
+	return $keypressed
+}
+
+failsafe_wait() {
+	FAILSAFE=
+	grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE
+	if [ "$FAILSAFE" != "true" ]; then
+		pi_failsafe_net_message=true
+		preinit_net_echo "Please press button now to enter failsafe"
+		pi_failsafe_net_message=false
+		fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true
+		[ -f "/tmp/failsafe_button" ] && FAILSAFE=true && echo "- failsafe button "`cat /tmp/failsafe_button`" was pressed -"
+		[ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe
+	fi
+}
+
+boot_hook_add preinit_main failsafe_wait
diff --git a/trunk/package/base-files/files/lib/preinit/40_run_failsafe_hook b/trunk/package/base-files/files/lib/preinit/40_run_failsafe_hook
new file mode 100644
index 00000000..cb43ad39
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/40_run_failsafe_hook
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+run_failsafe_hook() {
+    if [ "$FAILSAFE" = "true" ]; then
+	boot_run_hook failsafe
+	lock -w /tmp/.failsafe
+    fi
+}
+
+boot_hook_add preinit_main run_failsafe_hook
diff --git a/trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit b/trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit
new file mode 100644
index 00000000..bc223b35
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+indicate_regular_preinit() {
+	preinit_net_echo "Continuing with Regular Preinit\n"
+	pi_indicate_led
+}
+
+boot_hook_add preinit_main indicate_regular_preinit
diff --git a/trunk/package/base-files/files/lib/preinit/70_initramfs_test b/trunk/package/base-files/files/lib/preinit/70_initramfs_test
new file mode 100644
index 00000000..8504e34d
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/70_initramfs_test
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+initramfs_test() {
+	if [ -n "$INITRAMFS" ]; then
+		boot_run_hook initramfs
+		preinit_ip_deconfig
+		break
+	fi
+}
+
+boot_hook_add preinit_main initramfs_test
diff --git a/trunk/package/base-files/files/lib/preinit/80_mount_root b/trunk/package/base-files/files/lib/preinit/80_mount_root
new file mode 100644
index 00000000..0292d82d
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/80_mount_root
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+do_mount_root() {
+	mount_root
+	boot_run_hook preinit_mount_root
+	[ -f /sysupgrade.tgz ] && {
+		echo "- config restore -"
+		cd /
+		mv sysupgrade.tgz /tmp
+		tar xzf /tmp/sysupgrade.tgz
+		rm -f /tmp/sysupgrade.tgz
+		sync
+	}
+}
+
+[ "$INITRAMFS" = "1" ] || boot_hook_add preinit_main do_mount_root
diff --git a/trunk/package/base-files/files/lib/preinit/99_10_failsafe_login b/trunk/package/base-files/files/lib/preinit/99_10_failsafe_login
new file mode 100644
index 00000000..15dcbd88
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/99_10_failsafe_login
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+failsafe_netlogin () {
+	telnetd -l /bin/login.sh <> /dev/null 2>&1
+}
+
+failsafe_shell() {
+	lock /tmp/.failsafe
+	ash --login
+	echo "Please reboot system when done with failsafe network logins"
+}
+
+boot_hook_add failsafe failsafe_netlogin
+boot_hook_add failsafe failsafe_shell
diff --git a/trunk/package/base-files/files/lib/preinit/99_10_run_init b/trunk/package/base-files/files/lib/preinit/99_10_run_init
new file mode 100644
index 00000000..b4f0ec20
--- /dev/null
+++ b/trunk/package/base-files/files/lib/preinit/99_10_run_init
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+run_init() {
+	preinit_ip_deconfig
+}
+
+boot_hook_add preinit_main run_init
diff --git a/trunk/package/base-files/files/lib/upgrade/common.sh b/trunk/package/base-files/files/lib/upgrade/common.sh
new file mode 100644
index 00000000..f9b30a46
--- /dev/null
+++ b/trunk/package/base-files/files/lib/upgrade/common.sh
@@ -0,0 +1,245 @@
+#!/bin/sh
+
+RAM_ROOT=/tmp/root
+
+[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
+libs() { ldd $* 2>/dev/null | sed -r 's/(.* => )?(.*) .*/\2/'; }
+
+install_file() { # <file> [ <file> ... ]
+	for file in "$@"; do
+		dest="$RAM_ROOT/$file"
+		[ -f $file -a ! -f $dest ] && {
+			dir="$(dirname $dest)"
+			mkdir -p "$dir"
+			cp $file $dest
+		}
+	done
+}
+
+install_bin() { # <file> [ <symlink> ... ]
+	src=$1
+	files=$1
+	[ -x "$src" ] && files="$src $(libs $src)"
+	install_file $files
+	shift
+	for link in "$@"; do {
+		dest="$RAM_ROOT/$link"
+		dir="$(dirname $dest)"
+		mkdir -p "$dir"
+		[ -f "$dest" ] || ln -s $src $dest
+	}; done
+}
+
+supivot() { # <new_root> <old_root>
+	/bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o bind $1 $1
+	mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
+	/bin/mount -o noatime,move /proc $1/proc && \
+	pivot_root $1 $1$2 || {
+		/bin/umount -l $1 $1
+		return 1
+	}
+
+	/bin/mount -o noatime,move $2/sys /sys
+	/bin/mount -o noatime,move $2/dev /dev
+	/bin/mount -o noatime,move $2/tmp /tmp
+	/bin/mount -o noatime,move $2/overlay /overlay 2>&-
+	return 0
+}
+
+run_ramfs() { # <command> [...]
+	install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount	\
+		/sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd	\
+		/bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/["	\
+		/bin/dd /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump	\
+		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
+		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
+		/bin/rm /usr/bin/basename /bin/kill /bin/chmod
+
+	install_bin /sbin/mtd
+	install_bin /sbin/ubi
+	install_bin /sbin/mount_root
+	install_bin /sbin/snapshot
+	install_bin /sbin/snapshot_tool
+	install_bin /usr/sbin/ubiupdatevol
+	install_bin /usr/sbin/ubiattach
+	install_bin /usr/sbin/ubiblock
+	install_bin /usr/sbin/ubiformat
+	install_bin /usr/sbin/ubidetach
+	install_bin /usr/sbin/ubirsvol
+	install_bin /usr/sbin/ubirmvol
+	install_bin /usr/sbin/ubimkvol
+	for file in $RAMFS_COPY_BIN; do
+		install_bin ${file//:/ }
+	done
+	install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
+
+	[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
+
+	supivot $RAM_ROOT /mnt || {
+		echo "Failed to switch over to ramfs. Please reboot."
+		exit 1
+	}
+
+	/bin/mount -o remount,ro /mnt
+	/bin/umount -l /mnt
+
+	grep /overlay /proc/mounts > /dev/null && {
+		/bin/mount -o noatime,remount,ro /overlay
+		/bin/umount -l /overlay
+	}
+
+	# spawn a new shell from ramdisk to reduce the probability of cache issues
+	exec /bin/busybox ash -c "$*"
+}
+
+kill_remaining() { # [ <signal> ]
+	local sig="${1:-TERM}"
+	echo -n "Sending $sig to remaining processes ... "
+
+	local my_pid=$$
+	local my_ppid=$(cut -d' ' -f4  /proc/$my_pid/stat)
+	local my_ppisupgraded=
+	grep -q upgraded /proc/$my_ppid/cmdline >/dev/null && {
+		local my_ppisupgraded=1
+	}
+	
+	local stat
+	for stat in /proc/[0-9]*/stat; do
+		[ -f "$stat" ] || continue
+
+		local pid name state ppid rest
+		read pid name state ppid rest < $stat
+		name="${name#(}"; name="${name%)}"
+
+		local cmdline
+		read cmdline < /proc/$pid/cmdline
+
+		# Skip kernel threads
+		[ -n "$cmdline" ] || continue
+
+		if [ $$ -eq 1 ] || [ $my_ppid -eq 1 ] && [ -n "$my_ppisupgraded" ]; then
+			# Running as init process, kill everything except me
+			if [ $pid -ne $$ ] && [ $pid -ne $my_ppid ]; then
+				echo -n "$name "
+				kill -$sig $pid 2>/dev/null
+			fi
+		else 
+			case "$name" in
+				# Skip essential services
+				*procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*) : ;;
+
+				# Killable process
+				*)
+					if [ $pid -ne $$ ] && [ $ppid -ne $$ ]; then
+						echo -n "$name "
+						kill -$sig $pid 2>/dev/null
+					fi
+				;;
+			esac
+		fi
+	done
+	echo ""
+}
+
+run_hooks() {
+	local arg="$1"; shift
+	for func in "$@"; do
+		eval "$func $arg"
+	done
+}
+
+ask_bool() {
+	local default="$1"; shift;
+	local answer="$default"
+
+	[ "$INTERACTIVE" -eq 1 ] && {
+		case "$default" in
+			0) echo -n "$* (y/N): ";;
+			*) echo -n "$* (Y/n): ";;
+		esac
+		read answer
+		case "$answer" in
+			y*) answer=1;;
+			n*) answer=0;;
+			*) answer="$default";;
+		esac
+	}
+	[ "$answer" -gt 0 ]
+}
+
+v() {
+	[ "$VERBOSE" -ge 1 ] && echo "$@"
+}
+
+rootfs_type() {
+	/bin/mount | awk '($3 ~ /^\/$/) && ($5 !~ /rootfs/) { print $5 }'
+}
+
+get_image() { # <source> [ <command> ]
+	local from="$1"
+	local conc="$2"
+	local cmd
+
+	case "$from" in
+		http://*|ftp://*) cmd="wget -O- -q";;
+		*) cmd="cat";;
+	esac
+	if [ -z "$conc" ]; then
+		local magic="$(eval $cmd $from 2>/dev/null | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
+		case "$magic" in
+			1f8b) conc="zcat";;
+			425a) conc="bzcat";;
+		esac
+	fi
+
+	eval "$cmd $from 2>/dev/null ${conc:+| $conc}"
+}
+
+get_magic_word() {
+	(get_image "$@" | dd bs=2 count=1 | hexdump -v -n 2 -e '1/1 "%02x"') 2>/dev/null
+}
+
+get_magic_long() {
+	(get_image "$@" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
+}
+
+jffs2_copy_config() {
+	if grep rootfs_data /proc/mtd >/dev/null; then
+		# squashfs+jffs2
+		mtd -e rootfs_data jffs2write "$CONF_TAR" rootfs_data
+	else
+		# jffs2
+		mtd jffs2write "$CONF_TAR" rootfs
+	fi
+}
+
+default_do_upgrade() {
+	sync
+	if [ "$SAVE_CONFIG" -eq 1 ]; then
+		get_image "$1" | mtd $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}"
+	else
+		get_image "$1" | mtd write - "${PART_NAME:-image}"
+	fi
+}
+
+do_upgrade() {
+	v "Performing system upgrade..."
+	if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
+		platform_do_upgrade "$ARGV"
+	else
+		default_do_upgrade "$ARGV"
+	fi
+
+	if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then
+		platform_copy_config
+	fi
+
+	v "Upgrade completed"
+	[ -n "$DELAY" ] && sleep "$DELAY"
+	ask_bool 1 "Reboot" && {
+		v "Rebooting system..."
+		reboot -f
+		sleep 5
+		echo b 2>/dev/null >/proc/sysrq-trigger
+	}
+}
diff --git a/trunk/package/base-files/files/lib/upgrade/keep.d/base-files-essential b/trunk/package/base-files/files/lib/upgrade/keep.d/base-files-essential
new file mode 100644
index 00000000..978d4b58
--- /dev/null
+++ b/trunk/package/base-files/files/lib/upgrade/keep.d/base-files-essential
@@ -0,0 +1,10 @@
+# Essential files that will be always kept
+/etc/hosts
+/etc/inittab
+/etc/group
+/etc/passwd
+/etc/profile
+/etc/shadow
+/etc/shells
+/etc/sysctl.conf
+/etc/rc.local
diff --git a/trunk/package/base-files/files/rom/note b/trunk/package/base-files/files/rom/note
new file mode 100644
index 00000000..1746eb05
--- /dev/null
+++ b/trunk/package/base-files/files/rom/note
@@ -0,0 +1,3 @@
+SQUASHFS USERS:
+After firstboot has been run, / will be jffs2 and /rom will be squashfs
+(* except when in failsafe)
diff --git a/trunk/package/base-files/files/sbin/firstboot b/trunk/package/base-files/files/sbin/firstboot
new file mode 100755
index 00000000..081febb7
--- /dev/null
+++ b/trunk/package/base-files/files/sbin/firstboot
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/sbin/jffs2reset
diff --git a/trunk/package/base-files/files/sbin/hotplug-call b/trunk/package/base-files/files/sbin/hotplug-call
new file mode 100755
index 00000000..260be0b7
--- /dev/null
+++ b/trunk/package/base-files/files/sbin/hotplug-call
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+
+export HOTPLUG_TYPE="$1"
+
+. /lib/functions.sh
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+LOGNAME=root
+USER=root
+export PATH LOGNAME USER
+export DEVICENAME="${DEVPATH##*/}"
+
+[ \! -z "$1" -a -d /etc/hotplug.d/$1 ] && {
+	for script in $(ls /etc/hotplug.d/$1/* 2>&-); do (
+		[ -f $script ] && . $script
+	); done
+}
diff --git a/trunk/package/base-files/files/sbin/led.sh b/trunk/package/base-files/files/sbin/led.sh
new file mode 100755
index 00000000..d750f06e
--- /dev/null
+++ b/trunk/package/base-files/files/sbin/led.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# (C) 2008 openwrt.org
+
+. /lib/functions.sh
+ACTION=$1
+NAME=$2
+do_led() {
+	local name
+	local sysfs
+	config_get name $1 name
+	config_get sysfs $1 sysfs
+	[ "$name" = "$NAME" -o "$sysfs" = "$NAME" -a -e "/sys/class/leds/${sysfs}" ] && {
+		[ "$ACTION" = "set" ] &&
+			echo 1 >/sys/class/leds/${sysfs}/brightness \
+			|| echo 0 >/sys/class/leds/${sysfs}/brightness
+		exit 0
+	}
+}
+
+[ "$1" = "clear" -o "$1" = "set" ] &&
+	[ -n "$2" ] &&{
+		config_load system
+		config_foreach do_led
+		exit 1
+	}
diff --git a/trunk/package/base-files/files/sbin/sysupgrade b/trunk/package/base-files/files/sbin/sysupgrade
new file mode 100755
index 00000000..215f4823
--- /dev/null
+++ b/trunk/package/base-files/files/sbin/sysupgrade
@@ -0,0 +1,232 @@
+#!/bin/sh
+. /lib/functions.sh
+. /lib/functions/system.sh
+
+# initialize defaults
+RAMFS_COPY_BIN=""	# extra programs for temporary ramfs root
+RAMFS_COPY_DATA=""	# extra data files
+export MTD_CONFIG_ARGS=""
+export INTERACTIVE=0
+export VERBOSE=1
+export SAVE_CONFIG=1
+export SAVE_OVERLAY=0
+export DELAY=
+export CONF_IMAGE=
+export CONF_BACKUP_LIST=0
+export CONF_BACKUP=
+export CONF_RESTORE=
+export NEED_IMAGE=
+export HELP=0
+export FORCE=0
+export TEST=0
+
+# parse options
+while [ -n "$1" ]; do
+	case "$1" in
+		-i) export INTERACTIVE=1;;
+		-d) export DELAY="$2"; shift;;
+		-v) export VERBOSE="$(($VERBOSE + 1))";;
+		-q) export VERBOSE="$(($VERBOSE - 1))";;
+		-n) export SAVE_CONFIG=0;;
+		-c) export SAVE_OVERLAY=1;;
+		-b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;;
+		-r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
+		-l|--list-backup) export CONF_BACKUP_LIST=1; break;;
+		-f) export CONF_IMAGE="$2"; shift;;
+		-F|--force) export FORCE=1;;
+		-T|--test) export TEST=1;;
+		-h|--help) export HELP=1; break;;
+		-*)
+			echo "Invalid option: $1"
+			exit 1
+		;;
+		*) break;;
+	esac
+	shift;
+done
+
+export CONFFILES=/tmp/sysupgrade.conffiles
+export CONF_TAR=/tmp/sysupgrade.tgz
+
+export ARGV="$*"
+export ARGC="$#"
+
+[ -z "$ARGV" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && {
+	cat <<EOF
+Usage: $0 [<upgrade-option>...] <image file or URL>
+       $0 [-q] [-i] <backup-command> <file>
+
+upgrade-option:
+	-d <delay>   add a delay before rebooting
+	-f <config>  restore configuration from .tar.gz (file or url)
+	-i           interactive mode
+	-c           attempt to preserve all changed files in /etc/
+	-n           do not save configuration over reflash
+	-T | --test
+	             Verify image and config .tar.gz but do not actually flash.
+	-F | --force
+	             Flash image even if image checks fail, this is dangerous!
+	-q           less verbose
+	-v           more verbose
+	-h | --help  display this help
+
+backup-command:
+	-b | --create-backup <file>
+	             create .tar.gz of files specified in sysupgrade.conf
+	             then exit. Does not flash an image. If file is '-',
+	             i.e. stdout, verbosity is set to 0 (i.e. quiet).
+	-r | --restore-backup <file>
+	             restore a .tar.gz created with sysupgrade -b
+	             then exit. Does not flash an image. If file is '-',
+	             the archive is read from stdin.
+	-l | --list-backup
+	             list the files that would be backed up when calling
+	             sysupgrade -b. Does not create a backup file.
+
+EOF
+	exit 1
+}
+
+[ -n "$ARGV" -a -n "$NEED_IMAGE" ] && {
+	cat <<-EOF
+		-b|--create-backup and -r|--restore-backup do not perform a firmware upgrade.
+		Do not specify both -b|-r and a firmware image.
+	EOF
+	exit 1
+}
+
+# prevent messages from clobbering the tarball when using stdout
+[ "$CONF_BACKUP" = "-" ] && export VERBOSE=0
+
+add_uci_conffiles() {
+	local file="$1"
+	( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
+		/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
+		-type f -o -type l 2>/dev/null;
+	  opkg list-changed-conffiles ) | sort -u > "$file"
+	return 0
+}
+
+add_overlayfiles() {
+	local file="$1"
+	if [ -d /overlay/upper ]; then
+		local overlaydir="/overlay/upper"
+	else
+		local overlaydir="/overlay"
+	fi
+	find $overlaydir/etc/ -type f -o -type l | sed \
+		-e 's,^/overlay/,/,' \
+		-e '\,/META_[a-zA-Z0-9]*$,d' \
+		-e '\,/functions.sh$,d' \
+		-e '\,/[^/]*-opkg$,d' \
+	> "$file"
+	return 0
+}
+
+# hooks
+sysupgrade_image_check="platform_check_image"
+[ $SAVE_OVERLAY = 0 -o ! -d /overlay/etc ] && \
+	sysupgrade_init_conffiles="add_uci_conffiles" || \
+	sysupgrade_init_conffiles="add_overlayfiles"
+
+include /lib/upgrade
+
+[ "$1" = "nand" ] && nand_upgrade_stage2 $@
+
+do_save_conffiles() {
+	local conf_tar="${1:-$CONF_TAR}"
+
+	[ -z "$(rootfs_type)" ] && {
+		echo "Cannot save config while running from ramdisk."
+		ask_bool 0 "Abort" && exit
+		return 0
+	}
+	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
+	ask_bool 0 "Edit config file list" && vi "$CONFFILES"
+
+	v "Saving config files..."
+	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
+	tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null
+
+	rm -f "$CONFFILES"
+}
+
+if [ $CONF_BACKUP_LIST -eq 1 ]; then
+	add_uci_conffiles "$CONFFILES"
+	cat "$CONFFILES"
+	rm -f "$CONFFILES"
+	exit 0
+fi
+
+if [ -n "$CONF_BACKUP" ]; then
+	do_save_conffiles "$CONF_BACKUP"
+	exit $?
+fi
+
+if [ -n "$CONF_RESTORE" ]; then
+	if [ "$CONF_RESTORE" != "-" ] && [ ! -f "$CONF_RESTORE" ]; then
+		echo "Backup archive '$CONF_RESTORE' not found."
+		exit 1
+	fi
+
+	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
+	tar -C / -x${TAR_V}zf "$CONF_RESTORE"
+	exit $?
+fi
+
+type platform_check_image >/dev/null 2>/dev/null || {
+	echo "Firmware upgrade is not implemented for this platform."
+	exit 1
+}
+
+for check in $sysupgrade_image_check; do
+	( eval "$check \"\$ARGV\"" ) || {
+		if [ $FORCE -eq 1 ]; then
+			echo "Image check '$check' failed but --force given - will update anyway!"
+			break
+		else
+			echo "Image check '$check' failed."
+			exit 1
+		fi
+	}
+done
+
+if [ -n "$CONF_IMAGE" ]; then
+	case "$(get_magic_word $CONF_IMAGE cat)" in
+		# .gz files
+		1f8b) ;;
+		*)
+			echo "Invalid config file. Please use only .tar.gz files"
+			exit 1
+		;;
+	esac
+	get_image "$CONF_IMAGE" "cat" > "$CONF_TAR"
+	export SAVE_CONFIG=1
+elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
+	[ $TEST -eq 1 ] || do_save_conffiles
+	export SAVE_CONFIG=1
+else
+	export SAVE_CONFIG=0
+fi
+
+if [ $TEST -eq 1 ]; then
+	exit 0
+fi
+
+run_hooks "" $sysupgrade_pre_upgrade
+
+ubus call system upgrade
+touch /tmp/sysupgrade
+
+if [ ! -f /tmp/failsafe ] ; then
+	kill_remaining TERM
+	sleep 3
+	kill_remaining KILL
+fi
+
+if [ -n "$(rootfs_type)" ]; then
+	v "Switching to ramdisk..."
+	run_ramfs '. /lib/functions.sh; include /lib/upgrade; do_upgrade'
+else
+	do_upgrade
+fi
diff --git a/trunk/package/base-files/files/sbin/wifi b/trunk/package/base-files/files/sbin/wifi
new file mode 100755
index 00000000..24764143
--- /dev/null
+++ b/trunk/package/base-files/files/sbin/wifi
@@ -0,0 +1,236 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+usage() {
+	cat <<EOF
+Usage: $0 [down|detect|reload|status]
+enables (default), disables or detects a wifi configuration.
+EOF
+	exit 1
+}
+
+ubus_wifi_cmd() {
+	local cmd="$1"
+	local dev="$2"
+
+	json_init
+	[ -n "$2" ] && json_add_string device "$2"
+	ubus call network.wireless "$1" "$(json_dump)"
+}
+
+find_net_config() {(
+	local vif="$1"
+	local cfg
+	local ifname
+
+	config_get cfg "$vif" network
+
+	[ -z "$cfg" ] && {
+		include /lib/network
+		scan_interfaces
+
+		config_get ifname "$vif" ifname
+
+		cfg="$(find_config "$ifname")"
+	}
+	[ -z "$cfg" ] && return 0
+	echo "$cfg"
+)}
+
+
+bridge_interface() {(
+	local cfg="$1"
+	[ -z "$cfg" ] && return 0
+
+	include /lib/network
+	scan_interfaces
+
+	for cfg in $cfg; do
+		config_get iftype "$cfg" type
+		[ "$iftype" = bridge ] && config_get "$cfg" ifname
+		prepare_interface_bridge "$cfg"
+		return $?
+	done
+)}
+
+prepare_key_wep() {
+	local key="$1"
+	local hex=1
+
+	echo -n "$key" | grep -qE "[^a-fA-F0-9]" && hex=0
+	[ "${#key}" -eq 10 -a $hex -eq 1 ] || \
+	[ "${#key}" -eq 26 -a $hex -eq 1 ] || {
+		[ "${key:0:2}" = "s:" ] && key="${key#s:}"
+		key="$(echo -n "$key" | hexdump -ve '1/1 "%02x" ""')"
+	}
+	echo "$key"
+}
+
+wifi_fixup_hwmode() {
+	local device="$1"
+	local default="$2"
+	local hwmode hwmode_11n
+
+	config_get channel "$device" channel
+	config_get hwmode "$device" hwmode
+	case "$hwmode" in
+		11bg) hwmode=bg;;
+		11a) hwmode=a;;
+		11b) hwmode=b;;
+		11g) hwmode=g;;
+		11n*)
+			hwmode_11n="${hwmode##11n}"
+			case "$hwmode_11n" in
+				a|g) ;;
+				default) hwmode_11n="$default"
+			esac
+			config_set "$device" hwmode_11n "$hwmode_11n"
+		;;
+		*)
+			hwmode=
+			if [ "${channel:-0}" -gt 0 ]; then
+				if [ "${channel:-0}" -gt 14 ]; then
+					hwmode=a
+				else
+					hwmode=g
+				fi
+			else
+				hwmode="$default"
+			fi
+		;;
+	esac
+	config_set "$device" hwmode "$hwmode"
+}
+
+_wifi_updown() {
+	for device in ${2:-$DEVICES}; do (
+		config_get disabled "$device" disabled
+		[ "$disabled" = "1" ] && {
+			echo "'$device' is disabled"
+			set disable
+		}
+		config_get iftype "$device" type
+		if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
+			eval "scan_$iftype '$device'"
+			eval "${1}_$iftype '$device'" || echo "$device($iftype): ${1} failed"
+		elif [ ! -f /lib/netifd/wireless/$iftype.sh ]; then
+			echo "$device($iftype): Interface type not supported"
+		fi
+	); done
+}
+
+wifi_updown() {
+	cmd=down
+	[ enable = "$1" ] && {
+		_wifi_updown disable "$2"
+		ubus_wifi_cmd "$cmd" "$2"
+		scan_wifi
+		cmd=up
+	}
+	ubus_wifi_cmd "$cmd" "$2"
+	_wifi_updown "$@"
+}
+
+wifi_reload_legacy() {
+	_wifi_updown "disable" "$1"
+	scan_wifi
+	_wifi_updown "enable" "$1"
+}
+
+wifi_reload() {
+	ubus call network reload
+	wifi_reload_legacy
+}
+
+wifi_detect() {
+	for driver in ${2:-$DRIVERS}; do (
+		if eval "type detect_$driver" 2>/dev/null >/dev/null; then
+			eval "detect_$driver" || echo "$driver: Detect failed" >&2
+		else
+			echo "$driver: Hardware detection not supported" >&2
+		fi
+	); done
+}
+
+start_net() {(
+	local iface="$1"
+	local config="$2"
+	local vifmac="$3"
+
+	[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
+	[ -z "$config" ] || {
+		include /lib/network
+		scan_interfaces
+		for config in $config; do
+			setup_interface "$iface" "$config" "" "$vifmac"
+		done
+	}
+)}
+
+set_wifi_up() {
+	local cfg="$1"
+	local ifname="$2"
+	uci_set_state wireless "$cfg" up 1
+	uci_set_state wireless "$cfg" ifname "$ifname"
+}
+
+set_wifi_down() {
+	local cfg="$1"
+	local vifs vif vifstr
+
+	[ -f "/var/run/wifi-${cfg}.pid" ] &&
+		kill "$(cat "/var/run/wifi-${cfg}.pid")" 2>/dev/null
+	uci_revert_state wireless "$cfg"
+	config_get vifs "$cfg" vifs
+	for vif in $vifs; do
+		uci_revert_state wireless "$vif"
+	done
+}
+
+scan_wifi() {
+	local cfgfile="$1"
+	DEVICES=
+	config_cb() {
+		local type="$1"
+		local section="$2"
+
+		# section start
+		case "$type" in
+			wifi-device)
+				append DEVICES "$section"
+				config_set "$section" vifs ""
+				config_set "$section" ht_capab ""
+			;;
+		esac
+
+		# section end
+		config_get TYPE "$CONFIG_SECTION" TYPE
+		case "$TYPE" in
+			wifi-iface)
+				config_get device "$CONFIG_SECTION" device
+				config_get vifs "$device" vifs
+				append vifs "$CONFIG_SECTION"
+				config_set "$device" vifs "$vifs"
+			;;
+		esac
+	}
+	config_load "${cfgfile:-wireless}"
+}
+
+DEVICES=
+DRIVERS=
+include /lib/wifi
+scan_wifi
+
+case "$1" in
+	down) wifi_updown "disable" "$2";;
+	detect) wifi_detect "$2";;
+	status) ubus_wifi_cmd "status" "$2";;
+	reload) wifi_reload "$2";;
+	reload_legacy) wifi_reload_legacy "$2";;
+	--help|help) usage;;
+	*) ubus call network reload; wifi_updown "enable" "$2";;
+esac
diff --git a/trunk/package/base-files/image-config.in b/trunk/package/base-files/image-config.in
new file mode 100644
index 00000000..eb956069
--- /dev/null
+++ b/trunk/package/base-files/image-config.in
@@ -0,0 +1,274 @@
+# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menuconfig PREINITOPT
+	bool "Preinit configuration options" if IMAGEOPT
+	default n
+	help
+		These options are used to control the environment used to initialize
+		the system before running init (which typically mean /sbin/init which
+		switches to multiuser mode).
+
+config TARGET_PREINIT_SUPPRESS_STDERR
+	bool "Suppress stderr messages during preinit" if PREINITOPT
+	default y
+	help
+		Sends stderr to null during preinit.  This is the default behaviour
+		in previous versions of libreCMC.  This also prevents init process
+		itself from displaying stderr, however processes launched by init
+		in multiuser through inittab will use the current terminal (e.g.
+		the ash shell launched by inittab will display stderr).  That's
+		the same behaviour as seen in previous version of libreCMC.
+
+config TARGET_PREINIT_TIMEOUT
+	int
+	prompt "Failsafe wait timeout" if PREINITOPT
+	default 2
+	help
+		How long to wait for failsafe mode to be entered before
+		continuing with a regular boot if failsafe not selected.
+
+config TARGET_PREINIT_SHOW_NETMSG
+	bool
+	prompt "Show all preinit network messages" if PREINITOPT
+	default n
+	help
+		Show preinit all network messages (via netmsg broadcast), not only
+		the message indicating to press reset to enter failsafe.  Note that
+		if the architecture doesn't define an interface, and there is no
+		'Preinit network interface' defined, then no messages will be
+		emitted, even if this is set.
+
+config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG
+	bool
+	prompt "Suppress network message indicating failsafe" if PREINITOPT
+	default n
+	help
+		If "Show all preinit network messages" above is not set, then
+		setting this option suppresses the only message that would be
+		emitted otherwise, name the network message to enter failsafe
+		(via netmsg).
+
+config TARGET_PREINIT_IFNAME
+	string
+	prompt "Preinit network interface" if PREINITOPT
+	default ""
+	help
+		Interface for sending preinit messages to network, and any other
+		default networking in failsafe or preinit.  If empty
+		uses $ifname (if defined in /etc/preinit.arch).
+
+config TARGET_PREINIT_IP
+	string
+	prompt "IP address for preinit network messages" if PREINITOPT
+	default "192.168.10.1"
+	help
+		IP address used to configure interface for preinit network
+		messages, including failsafe messages
+
+config TARGET_PREINIT_NETMASK
+	string
+	prompt "Netmask for preinit network messages" if PREINITOPT
+	default "255.255.255.0"
+	help
+		Netmask used to configure interface for preinit network
+		messages, including failsafes messages
+
+config TARGET_PREINIT_BROADCAST
+	string
+	prompt "Broadcast address for preinit network messages" if PREINITOPT
+	default "192.168.10.255"
+	help
+		Broadcast address to which to send preinit network messages, as
+		as failsafe messages
+
+
+menuconfig INITOPT
+	bool "Init configuration options" if IMAGEOPT
+	default n
+	help
+		These option choose the command that will run as the 'init' command
+		(that is which is responsible for controlling the system once preinit
+		transfers control to it) as well as some options controlling its
+		behaviour.  Normally init is /sbin/init.
+
+	config TARGET_INIT_PATH
+		string
+		prompt "PATH for regular boot" if INITOPT
+		default "/bin:/sbin:/usr/bin:/usr/sbin"
+		help
+			Default PATH used during normal operation
+
+	config TARGET_INIT_ENV
+		string
+		prompt "Environment variables to set when starting init (start with none)" if INITOPT
+		default ""
+		help
+			Should be a space seperated list of variable assignments.  These
+			variables will be present in the environment.  Spaces may not be
+			present (including through expansion) even in a quoted string
+			(env doesn't understanding quoting).
+
+	config TARGET_INIT_CMD
+		string
+		prompt "Init command" if INITOPT
+		default "/sbin/init"
+		help
+			The executable to run as the init process.  Is 'exec'd by
+			preinit (which is the init that the kernel launches on boot).
+
+	config TARGET_INIT_SUPPRESS_STDERR
+		bool
+		prompt "Suppress stderr messages of init" if INITOPT
+		default y
+		help
+			Prevents showing stderr messages for init command if not already
+			suppressed during preinit.  This is the default behaviour in
+			previous versions of libreCMC.  Removing this does nothing if
+			stderr is suppressed during preinit (which is the default).
+
+
+menuconfig VERSIONOPT
+	bool "Version configuration options" if IMAGEOPT
+	default n
+	help
+		These options allow to override the version information embedded in
+		the /etc/librecmc_version, /etc/librecmc_release, /etc/banner and
+		/etc/opkg.conf files. Usually there is no need to set these, but
+		they're useful for release builds or custom libreCMC redistributions
+		that should carry custom version tags.
+
+if VERSIONOPT
+
+	config VERSION_DIST
+		string
+		prompt "Release distribution"
+		default "libreCMC"
+		help
+			This is the name of the release distribution.
+			If unspecified, it defaults to libreCMC.
+
+	config VERSION_NICK
+		string
+		prompt "Release version nickname"
+		default "Elegant Eleanor"
+		help
+			This is the release codename embedded in the image.
+			If unspecified, it defaults to the name of source branch.
+
+	config VERSION_NUMBER
+		string
+		prompt "Release version number"
+		default "v1.3"
+		help
+			This is the release version number embedded in the image.
+			If unspecified, it defaults to the svn or git-svn revision
+			of the build tree.
+
+	config VERSION_REPO
+		string
+		prompt "Release repository"
+		default "http://downloads.librecmc.org/snapshots/%v/%S/packages"
+		help
+			This is the repository address embedded in the image, it defaults
+			to the trunk snapshot repo; the url may contain the following placeholders:
+			 %R .. Revision number
+			 %V .. Release version or revision number, uppercase
+			 %v .. Release version or revision number, lowercase
+			 %C .. Release version or "Bleeding Edge", uppercase
+			 %c .. Release version or "bleeding_edge", lowercase
+			 %N .. Release name, uppercase
+			 %n .. Release name, lowercase
+			 %D .. Distribution name or "libreCMC", uppercase
+			 %d .. Distribution name or "librecmc", lowercase
+			 %T .. Target name
+			 %S .. Target/Subtarget name
+
+	config VERSION_MANUFACTURER
+		string
+		prompt "Manufacturer name"
+		help
+			This is the manufacturer name embedded in /etc/device_info
+			Useful for OEMs building libreCMC based firmware
+
+	config VERSION_PRODUCT
+		string
+		prompt "Product name"
+		help
+			This is the product name embedded in /etc/device_info
+			Useful for OEMs building libreCMC based firmware
+
+	config VERSION_HWREV
+		string
+		prompt "Hardware revision"
+		help
+			This is the hardware revision string embedded in /etc/device_info
+			Useful for OEMs building libreCMC based firmware
+endif
+
+
+menuconfig PER_FEED_REPO
+	bool "Separate feed repositories" if IMAGEOPT
+	default y
+	help
+		If set, a separate repository is generated within bin/*/packages/
+		for the core packages and each enabled feed.
+
+	config PER_FEED_REPO_ADD_DISABLED
+		bool "Add available but not enabled feeds to opkg.conf"
+		default y
+		depends on PER_FEED_REPO
+		help
+		  Add not installed or disabled feeds from feeds.conf to opkg.conf.
+
+	config PER_FEED_REPO_ADD_COMMENTED
+		bool "Comment out not enabled feeds"
+		default y
+		depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED
+		help
+		  Add not enabled feeds as commented out source lines to opkg.conf.
+
+source "tmp/.config-feeds.in"
+
+
+menuconfig SMIMEOPT
+	bool "Package signing options" if IMAGEOPT
+        default n
+	help
+		These options configure the signing key and certificate to
+		be used for signing and verifying packages.
+
+	config OPKGSMIME_CERT
+		string
+		prompt "Path to certificate (PEM certificate format)" if SMIMEOPT
+		help
+		  Path to the certificate to use for signature verification
+
+	config OPKGSMIME_KEY
+		string
+		prompt "Path to signing key (PEM private key format)" if SMIMEOPT
+		help
+		  Path to the key to use for signing packages
+
+	config OPKGSMIME_PASSPHRASE
+		bool
+		default y
+		prompt "Wait for a passphrase when signing packages?" if SMIMEOPT
+		help
+		  If this value is set, then the build will pause and request a passphrase
+                  from the command line when signing packages. This SHOULD NOT be used with
+                  automatic builds. If this value is not set, a file can be specified from
+                  which the passphrase will be read.
+
+	config OPKGSMIME_PASSFILE
+		string
+		prompt "Path to a file containing the passphrase" if SMIMEOPT
+                depends on !OPKGSMIME_PASSPHRASE
+		help
+		  Path to a file containing the passphrase for the signing key.
+                  If the signing key is not encrypted and does not require a passphrase,
+                  this option may be left blank.
diff --git a/trunk/package/boot/grub2/Makefile b/trunk/package/boot/grub2/Makefile
new file mode 100644
index 00000000..64a30589
--- /dev/null
+++ b/trunk/package/boot/grub2/Makefile
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=grub
+PKG_VERSION:=2.02~beta2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=http://alpha.gnu.org/gnu/grub
+PKG_MD5SUM:=be62932eade308a364ea4bbc91295930
+
+HOST_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=grub2/host
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/grub2
+  SUBMENU:=Boot Loaders
+  CATEGORY:=Utilities
+  SECTION:=utils
+  TITLE:=GRand Unified Bootloader
+  URL:=http://www.gnu.org/software/grub/
+  DEPENDS:=@TARGET_x86||TARGET_x86_64
+endef
+
+define Package/grub2-editenv
+  CATEGORY:=Utilities
+  SECTION:=utils
+  TITLE:=Grub2 Environment editor
+  URL:=http://www.gnu.org/software/grub/
+  DEPENDS:=@TARGET_x86||TARGET_x86_64
+endef
+
+define Package/grub2-editenv/description
+	Edit grub2 environment files.
+endef
+
+CONFIGURE_ARGS += \
+	--target=$(REAL_GNU_TARGET_NAME) \
+	--disable-werror \
+	--disable-nls \
+	--disable-device-mapper \
+	--disable-libzfs \
+	--disable-grub-mkfont
+
+HOST_CONFIGURE_ARGS += \
+	--target=$(REAL_GNU_TARGET_NAME) \
+	--sbindir="$(STAGING_DIR_HOST)/bin" \
+	--disable-werror \
+	--disable-libzfs \
+	--disable-nls
+
+HOST_MAKE_FLAGS += \
+	TARGET_RANLIB=$(TARGET_RANLIB) \
+	LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a
+
+define Host/Configure
+	$(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in
+	$(Host/Configure/Default)
+endef
+
+define Package/grub2-editenv/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,grub2))
+$(eval $(call BuildPackage,grub2-editenv))
diff --git a/trunk/package/boot/grub2/patches/100-grub_setup_root.patch b/trunk/package/boot/grub2/patches/100-grub_setup_root.patch
new file mode 100644
index 00000000..9619c410
--- /dev/null
+++ b/trunk/package/boot/grub2/patches/100-grub_setup_root.patch
@@ -0,0 +1,118 @@
+--- a/util/grub-setup.c
++++ b/util/grub-setup.c
+@@ -87,6 +87,8 @@ static struct argp_option options[] = {
+    N_("install even if problems are detected"), 0},
+   {"skip-fs-probe",'s',0,      0,
+    N_("do not probe for filesystems in DEVICE"), 0},
++  {"root-device", 'r', N_("DEVICE"), 0,
++   N_("use DEVICE as the root device"), 0},
+   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
+   {"allow-floppy", 'a', 0,      0,
+    /* TRANSLATORS: The potential breakage isn't limited to floppies but it's
+@@ -130,6 +132,7 @@ struct arguments
+   char *core_file;
+   char *dir;
+   char *dev_map;
++  char *root_dev;
+   int  force;
+   int  fs_probe;
+   int allow_floppy;
+@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct 
+         arguments->dev_map = xstrdup (arg);
+         break;
+ 
++      case 'r':
++        if (arguments->root_dev)
++          free (arguments->root_dev);
++
++        arguments->root_dev = xstrdup (arg);
++        break;
++
+       case 'f':
+         arguments->force = 1;
+         break;
+@@ -313,7 +323,7 @@ main (int argc, char *argv[])
+   GRUB_SETUP_FUNC (arguments.dir ? : DEFAULT_DIRECTORY,
+ 		   arguments.boot_file ? : DEFAULT_BOOT_FILE,
+ 		   arguments.core_file ? : DEFAULT_CORE_FILE,
+-		   dest_dev, arguments.force,
++		   arguments.root_dev, dest_dev, arguments.force,
+ 		   arguments.fs_probe, arguments.allow_floppy,
+ 		   arguments.add_rs_codes);
+ 
+--- a/util/setup.c
++++ b/util/setup.c
+@@ -247,13 +247,12 @@ identify_partmap (grub_disk_t disk __att
+ void
+ SETUP (const char *dir,
+        const char *boot_file, const char *core_file,
+-       const char *dest, int force,
++       const char *root, const char *dest, int force,
+        int fs_probe, int allow_floppy,
+        int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */
+ {
+   char *core_path;
+   char *boot_img, *core_img, *boot_path;
+-  char *root = 0;
+   size_t boot_size, core_size;
+ #ifdef GRUB_SETUP_BIOS
+   grub_uint16_t core_sectors;
+@@ -307,7 +306,10 @@ SETUP (const char *dir,
+ 
+   core_dev = dest_dev;
+ 
+-  {
++  if (root)
++    root_dev = grub_device_open(root);
++
++  if (!root_dev) {
+     char **root_devices = grub_guess_root_devices (dir);
+     char **cur;
+     int found = 0;
+@@ -317,6 +319,8 @@ SETUP (const char *dir,
+ 	char *drive;
+ 	grub_device_t try_dev;
+ 
++	if (root_dev)
++	  break;
+ 	drive = grub_util_get_grub_dev (*cur);
+ 	if (!drive)
+ 	  continue;
+--- a/include/grub/util/install.h
++++ b/include/grub/util/install.h
+@@ -182,13 +182,13 @@ grub_install_get_image_target (const cha
+ void
+ grub_util_bios_setup (const char *dir,
+ 		      const char *boot_file, const char *core_file,
+-		      const char *dest, int force,
++		      const char *root, const char *dest, int force,
+ 		      int fs_probe, int allow_floppy,
+ 		      int add_rs_codes);
+ void
+ grub_util_sparc_setup (const char *dir,
+ 		       const char *boot_file, const char *core_file,
+-		       const char *dest, int force,
++		       const char *root, const char *dest, int force,
+ 		       int fs_probe, int allow_floppy,
+ 		       int add_rs_codes);
+ 
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -1660,7 +1660,7 @@ main (int argc, char *argv[])
+ 	/*  Now perform the installation.  */
+ 	if (install_bootsector)
+ 	  grub_util_bios_setup (platdir, "boot.img", "core.img",
+-				install_drive, force,
++				NULL, install_drive, force,
+ 				fs_probe, allow_floppy, add_rs_codes);
+ 	break;
+       }
+@@ -1686,7 +1686,7 @@ main (int argc, char *argv[])
+ 	/*  Now perform the installation.  */
+ 	if (install_bootsector)
+ 	  grub_util_sparc_setup (platdir, "boot.img", "core.img",
+-				 install_device, force,
++				 NULL, install_device, force,
+ 				 fs_probe, allow_floppy,
+ 				 0 /* unused */ );
+ 	break;
diff --git a/trunk/package/boot/grub2/patches/200-fix-gets-removal.patch b/trunk/package/boot/grub2/patches/200-fix-gets-removal.patch
new file mode 100644
index 00000000..737fb975
--- /dev/null
+++ b/trunk/package/boot/grub2/patches/200-fix-gets-removal.patch
@@ -0,0 +1,16 @@
+--- a/grub-core/gnulib/stdio.in.h
++++ b/grub-core/gnulib/stdio.in.h
+@@ -695,13 +695,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning; besides, C11
+-   removed it.  */
+-#undef gets
+-#if HAVE_RAW_DECL_GETS
+-#endif
+-
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
+ struct obstack;
diff --git a/trunk/package/boot/kexec-tools/Config.in b/trunk/package/boot/kexec-tools/Config.in
new file mode 100644
index 00000000..2642171b
--- /dev/null
+++ b/trunk/package/boot/kexec-tools/Config.in
@@ -0,0 +1,26 @@
+menu "Configuration"
+	depends on PACKAGE_kexec-tools
+
+config KEXEC_TOOLS_TARGET_NAME
+	string
+	prompt "Target name for kexec kernel"
+	default EXTRA_TARGET_ARCH_NAME	if powerpc64
+	default ARCH
+	help
+	  Defines the target type of the kernels that kexec deals
+	  with. This should be the target specification of
+	  the kernel you're booting.
+
+config KEXEC_TOOLS_kdump
+	bool
+	prompt "kdump support"
+	default n
+	help
+	  Include the kdump utility.
+
+config KEXEC_ZLIB
+	bool
+	prompt "zlib support"
+	default y
+
+endmenu
diff --git a/trunk/package/boot/kexec-tools/Makefile b/trunk/package/boot/kexec-tools/Makefile
new file mode 100644
index 00000000..8c1c255c
--- /dev/null
+++ b/trunk/package/boot/kexec-tools/Makefile
@@ -0,0 +1,87 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=kexec-tools
+PKG_VERSION:=2.0.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kexec
+PKG_MD5SUM:=05992bc8c0673fc55be7b6d27e48a8db
+
+PKG_FIXUP:=autoreconf
+
+PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/kexec-tools
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=@armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib
+  TITLE:=Kernel boots kernel
+  URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
+  MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+  MENU:=1
+endef
+
+define Package/kexec-tools/description
+ kexec is a set of systems call that allows you to load
+ another kernel from the currently executing Linux kernel.
+endef
+
+define Package/kexec-tools/config
+	source "$(SOURCE)/Config.in"
+endef
+
+KEXEC_TARGET_NAME:=$(call qstrip,$(CONFIG_KEXEC_TOOLS_TARGET_NAME))-linux-$(TARGET_SUFFIX)
+
+CONFIGURE_ARGS = \
+		--target=$(KEXEC_TARGET_NAME) \
+		--host=$(REAL_GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--program-prefix="" \
+		--program-suffix="" \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		$(if $(CONFIG_KEXEC_ZLIB),--with,--without)-zlib \
+		--without-lzma
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+CONFIGURE_VARS += \
+	BUILD_CC="$(HOSTCC)" \
+	TARGET_CC="$(TARGET_CC)"
+
+kexec-extra-sbin-$(CONFIG_KEXEC_TOOLS_kdump) += kdump
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+endef
+
+define Package/kexec-tools/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(addprefix $(PKG_INSTALL_DIR)/usr/sbin/, \
+			$(kexec-extra-sbin-y)) \
+		$(kexec-extra-bin-y) \
+		$(PKG_INSTALL_DIR)/usr/sbin/kexec \
+		$(1)/usr/sbin
+
+# make a link for compatability with other distros
+	$(INSTALL_DIR) $(1)/sbin
+	ln -s /usr/sbin/kexec $(1)/sbin/kexec
+endef
+
+$(eval $(call BuildPackage,kexec-tools))
diff --git a/trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch b/trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch
new file mode 100644
index 00000000..7e21349a
--- /dev/null
+++ b/trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch
@@ -0,0 +1,103 @@
+--- /dev/null
++++ b/kexec/arch/mips/regdef.h
+@@ -0,0 +1,100 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 1985 MIPS Computer Systems, Inc.
++ * Copyright (C) 1994, 95, 99, 2003 by Ralf Baechle
++ * Copyright (C) 1990 - 1992, 1999 Silicon Graphics, Inc.
++ */
++#ifndef _ASM_REGDEF_H
++#define _ASM_REGDEF_H
++
++#include <asm/sgidefs.h>
++
++#if _MIPS_SIM == _MIPS_SIM_ABI32
++
++/*
++ * Symbolic register names for 32 bit ABI
++ */
++#define zero    $0      /* wired zero */
++#define AT      $1      /* assembler temp  - uppercase because of ".set at" */
++#define v0      $2      /* return value */
++#define v1      $3
++#define a0      $4      /* argument registers */
++#define a1      $5
++#define a2      $6
++#define a3      $7
++#define t0      $8      /* caller saved */
++#define t1      $9
++#define t2      $10
++#define t3      $11
++#define t4      $12
++#define t5      $13
++#define t6      $14
++#define t7      $15
++#define s0      $16     /* callee saved */
++#define s1      $17
++#define s2      $18
++#define s3      $19
++#define s4      $20
++#define s5      $21
++#define s6      $22
++#define s7      $23
++#define t8      $24     /* caller saved */
++#define t9      $25
++#define jp      $25     /* PIC jump register */
++#define k0      $26     /* kernel scratch */
++#define k1      $27
++#define gp      $28     /* global pointer */
++#define sp      $29     /* stack pointer */
++#define fp      $30     /* frame pointer */
++#define s8	$30	/* same like fp! */
++#define ra      $31     /* return address */
++
++#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
++
++#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
++
++#define zero	$0	/* wired zero */
++#define AT	$at	/* assembler temp - uppercase because of ".set at" */
++#define v0	$2	/* return value - caller saved */
++#define v1	$3
++#define a0	$4	/* argument registers */
++#define a1	$5
++#define a2	$6
++#define a3	$7
++#define a4	$8	/* arg reg 64 bit; caller saved in 32 bit */
++#define ta0	$8
++#define a5	$9
++#define ta1	$9
++#define a6	$10
++#define ta2	$10
++#define a7	$11
++#define ta3	$11
++#define t0	$12	/* caller saved */
++#define t1	$13
++#define t2	$14
++#define t3	$15
++#define s0	$16	/* callee saved */
++#define s1	$17
++#define s2	$18
++#define s3	$19
++#define s4	$20
++#define s5	$21
++#define s6	$22
++#define s7	$23
++#define t8	$24	/* caller saved */
++#define t9	$25	/* callee address for PIC/temp */
++#define jp	$25	/* PIC jump register */
++#define k0	$26	/* kernel temporary */
++#define k1	$27
++#define gp	$28	/* global pointer - caller saved for PIC */
++#define sp	$29	/* stack pointer */
++#define fp	$30	/* frame pointer */
++#define s8	$30	/* callee saved */
++#define ra	$31	/* return address */
++
++#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
++
++#endif /* _ASM_REGDEF_H */
diff --git a/trunk/package/boot/kexec-tools/patches/100-reduce_size.patch b/trunk/package/boot/kexec-tools/patches/100-reduce_size.patch
new file mode 100644
index 00000000..eafca7bf
--- /dev/null
+++ b/trunk/package/boot/kexec-tools/patches/100-reduce_size.patch
@@ -0,0 +1,36 @@
+--- a/kexec/crashdump-xen.c
++++ b/kexec/crashdump-xen.c
+@@ -111,6 +111,7 @@ static int xen_detect_pv_guest(void)
+  * This includes dom0, which is the only PV guest where kexec/kdump works.
+  * HVM guests have to be handled as native hardware.
+  */
++#if defined(__i386__) || defined(__x86_64__)
+ int xen_present(void)
+ {
+ 	if (!is_dom0) {
+@@ -121,6 +122,7 @@ int xen_present(void)
+ 	}
+ 	return is_dom0 > 0;
+ }
++#endif
+ 
+ unsigned long xen_architecture(struct crash_elf_info *elf_info)
+ {
+--- a/kexec/crashdump.h
++++ b/kexec/crashdump.h
+@@ -56,7 +56,15 @@ unsigned long crash_architecture(struct 
+ unsigned long phys_to_virt(struct crash_elf_info *elf_info,
+ 			   unsigned long paddr);
+ 
++#if defined(__i386__) || defined(__x86_64__)
+ int xen_present(void);
++#else
++static inline int xen_present(void)
++{
++	return 0;
++}
++#endif
++
+ unsigned long xen_architecture(struct crash_elf_info *elf_info);
+ int xen_get_nr_phys_cpus(void);
+ int xen_get_note(int cpu, uint64_t *addr, uint64_t *len);
diff --git a/trunk/package/boot/uboot-sunxi/Makefile b/trunk/package/boot/uboot-sunxi/Makefile
new file mode 100644
index 00000000..9aa27bf3
--- /dev/null
+++ b/trunk/package/boot/uboot-sunxi/Makefile
@@ -0,0 +1,151 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=u-boot
+PKG_VERSION:=2014.04
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://mirror2.openwrt.org/sources \
+	ftp://ftp.denx.de/pub/u-boot
+PKG_SOURCE_VERSION:=6d2116d1385a66e9a59742caa9d62a54
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPL-2.0 GPL-2.0+
+PKG_LICENSE_FILES:=Licenses/README
+
+include $(INCLUDE_DIR)/package.mk
+
+define uboot/Default
+  TITLE:=
+  CONFIG:=
+  IMAGE:=
+endef
+
+define uboot/A10-OLinuXino-Lime
+  TITLE:=U-Boot for the A10 OLinuXino LIME
+endef
+
+define uboot/A13-OLinuXino
+  TITLE:=U-Boot for the A13 OlinuXino
+endef
+
+define uboot/A20-OLinuXino_Lime
+  TITLE:=U-Boot for the A20 OLinuXino LIME
+endef
+
+define uboot/A20-OLinuXino_MICRO
+  TITLE:=U-Boot for A20 OLinuXino MICRO
+endef
+
+define uboot/Bananapi
+  TITLE:=U-Boot for Bananapi
+endef
+
+define uboot/Cubieboard
+  TITLE:=U-Boot for Cubieboard
+endef
+
+define uboot/Cubieboard2
+  TITLE:=U-Boot for Cubieboard2
+endef
+
+define uboot/Cubietruck
+  TITLE:=U-Boot for Cubietruck
+endef
+
+define uboot/Hackberry
+  TITLE:=U-Boot for the Hackbeery
+endef
+
+define uboot/OLIMEX-A13-SOM
+  TITLE:=U-Boot for the Olimex A13 SOM
+endef
+
+define uboot/pcDuino
+  TITLE:=U-Boot for pcDuino
+endef  
+
+define uboot/Linksprite_pcDuino3
+  TITLE:=U-Boot for Linksprite pcDuino3
+endef  
+
+UBOOTS:= \
+	A10-OLinuXino-Lime \
+	A13-OLinuXino \
+	A20-OLinuXino_Lime \
+	A20-OLinuXino_MICRO \
+	Bananapi \
+	Cubieboard \
+	Cubieboard2 \
+	Cubietruck \
+	Hackberry \
+	OLIMEX-A13-SOM \
+	pcDuino \
+	Linksprite_pcDuino3 \
+
+define Package/uboot/template
+define Package/uboot-sunxi-$(1)
+  SECTION:=boot
+  CATEGORY:=Boot Loaders
+  DEPENDS:=@TARGET_sunxi
+  TITLE:=$(2)
+  URL:=http://www.denx.de/wiki/U-Boot
+  VARIANT:=$(1)
+  MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
+endef
+endef
+
+define BuildUBootPackage
+	$(eval $(uboot/Default))
+	$(eval $(uboot/$(1)))
+	$(call Package/uboot/template,$(1),$(TITLE))
+endef
+
+ifdef BUILD_VARIANT
+$(eval $(call uboot/$(BUILD_VARIANT)))
+UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
+UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),librecmc-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin)
+endif
+
+define Build/Configure
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE=$(TARGET_CROSS)
+endef
+
+define Package/uboot/install/default
+	$(INSTALL_DIR) $(BIN_DIR)/uboot-$(BOARD)-$(1)
+	$(CP) $(PKG_BUILD_DIR)/u-boot.bin \
+		$(BIN_DIR)/uboot-$(BOARD)-$(1)/librecmc-$(BOARD)-$(1)-u-boot.bin
+	$(CP) $(PKG_BUILD_DIR)/spl/sunxi-spl.bin \
+		$(BIN_DIR)/uboot-$(BOARD)-$(1)/librecmc-$(BOARD)-$(1)-spl.bin
+	$(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
+		$(BIN_DIR)/uboot-$(BOARD)-$(1)/librecmc-$(BOARD)-$(1)-u-boot-with-spl.bin
+	$(CP) uEnv.txt \
+		$(BIN_DIR)/uboot-$(BOARD)-$(1)/librecmc-$(BOARD)-$(1)-uEnv.txt
+endef
+
+define Package/uboot/install/template
+define Package/uboot-sunxi-$(1)/install
+	$(call Package/uboot/install/default,$(2))
+endef
+endef
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call Package/uboot/install/template,$(u),$(u))) \
+)
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call BuildUBootPackage,$(u))) \
+	$(eval $(call BuildPackage,uboot-sunxi-$(u))) \
+)
diff --git a/trunk/package/boot/uboot-sunxi/patches/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch b/trunk/package/boot/uboot-sunxi/patches/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch
new file mode 100644
index 00000000..15aac6b2
--- /dev/null
+++ b/trunk/package/boot/uboot-sunxi/patches/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch
@@ -0,0 +1,10002 @@
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/cmd_boot.c u-boot-sunxi/arch/arm/cpu/armv7/cmd_boot.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/cmd_boot.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/cmd_boot.c	2014-09-06 16:58:35.193953144 +0200
+@@ -0,0 +1,20 @@
++/*
++ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++/*
++ * Misc boot support
++ */
++#include <common.h>
++#include <command.h>
++
++#ifdef CONFIG_CMD_GO
++unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
++				 char * const argv[])
++{
++	invalidate_icache_all();
++	return entry(argc, argv);
++}
++#endif
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/Makefile u-boot-sunxi/arch/arm/cpu/armv7/Makefile
+--- u-boot-2014.04/arch/arm/cpu/armv7/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/arch/arm/cpu/armv7/Makefile	2014-09-06 16:58:35.185953145 +0200
+@@ -11,8 +11,9 @@
+ 
+ obj-y	+= cpu.o
+ obj-y	+= syslib.o
++obj-y	+= cmd_boot.o
+ 
+-ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY),)
++ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI),)
+ ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y)
+ obj-y	+= lowlevel_init.o
+ endif
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/board.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/board.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/board.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/board.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,166 @@
++/*
++ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Some init for sunxi platform.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <i2c.h>
++#include <netdev.h>
++#include <miiphy.h>
++#include <serial.h>
++#ifdef CONFIG_SPL_BUILD
++#include <spl.h>
++#endif
++#include <asm/gpio.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/sys_proto.h>
++#include <asm/arch/timer.h>
++#include <asm/arch/watchdog.h>
++
++#ifdef CONFIG_SPL_BUILD
++/* Pointer to the global data structure for SPL */
++DECLARE_GLOBAL_DATA_PTR;
++
++/* The sunxi internal brom will try to loader external bootloader
++ * from mmc0, nand flash, mmc2.
++ * Unfortunately we can't check how SPL was loaded so assume
++ * it's always the first SD/MMC controller
++ */
++u32 spl_boot_device(void)
++{
++	return BOOT_DEVICE_MMC1;
++}
++
++/* No confirmation data available in SPL yet. Hardcode bootmode */
++u32 spl_boot_mode(void)
++{
++	return MMCSD_MODE_RAW;
++}
++#endif
++
++int gpio_init(void)
++{
++#if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F)
++#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN7I)
++	/* disable GPB22,23 as uart0 tx,rx to avoid conflict */
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(22), SUNXI_GPIO_INPUT);
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUNXI_GPIO_INPUT);
++#endif
++	sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF2_UART0_TX);
++	sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF4_UART0_RX);
++	sunxi_gpio_set_pull(SUNXI_GPF(4), 1);
++#elif CONFIG_CONS_INDEX == 1 && (defined(CONFIG_SUN4I) || defined(CONFIG_SUN7I))
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(22), SUN4I_GPB22_UART0_TX);
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUN4I_GPB23_UART0_RX);
++	sunxi_gpio_set_pull(SUNXI_GPB(23), 1);
++#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_SUN6I)
++	sunxi_gpio_set_cfgpin(SUNXI_GPH(20), 2);
++	sunxi_gpio_set_cfgpin(SUNXI_GPH(21), 2);
++	sunxi_gpio_set_pull(SUNXI_GPH(21), 1);
++#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_SUN5I)
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(19), SUN5I_GPB19_UART0_TX);
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(20), SUN5I_GPB20_UART0_RX);
++	sunxi_gpio_set_pull(SUNXI_GPB(20), 1);
++#elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_SUN5I)
++	sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG3_UART1_TX);
++	sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG4_UART1_RX);
++	sunxi_gpio_set_pull(SUNXI_GPG(4), 1);
++#elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_SUN8I)
++	sunxi_gpio_set_cfgpin(SUNXI_GPL(2), SUN8I_GPL2_R_UART_TX);
++	sunxi_gpio_set_cfgpin(SUNXI_GPL(3), SUN8I_GPL3_R_UART_RX);
++	sunxi_gpio_set_pull(SUNXI_GPL(3), 1);
++#else
++#error Unsupported console port number. Please fix pin mux settings in board.c
++#endif
++
++	return 0;
++}
++
++void reset_cpu(ulong addr)
++{
++	watchdog_set(0);
++	while (1);
++}
++
++/* do some early init */
++void s_init(void)
++{
++#if !defined CONFIG_SPL_BUILD && (defined CONFIG_SUN7I || defined CONFIG_SUN6I)
++	/* Enable SMP mode for CPU0, by setting bit 6 of Auxiliary Ctl reg */
++	asm volatile(
++		"mrc p15, 0, r0, c1, c0, 1\n"
++		"orr r0, r0, #1 << 6\n"
++		"mcr p15, 0, r0, c1, c0, 1\n");
++#endif
++
++	watchdog_init();
++	clock_init();
++	timer_init();
++	gpio_init();
++	i2c_init_board();
++
++#ifdef CONFIG_SPL_BUILD
++	gd = &gdata;
++	preloader_console_init();
++
++#ifdef CONFIG_SPL_I2C_SUPPORT
++	/* Needed early by sunxi_board_init if PMU is enabled */
++	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
++#endif
++#endif
++/* No SPL on sun6i, so we do sunxi_board_init() from non spl there */
++#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I)
++	sunxi_board_init();
++#endif
++}
++
++#ifndef CONFIG_SYS_DCACHE_OFF
++void enable_caches(void)
++{
++	/* Enable D-cache. I-cache is already enabled in start.S */
++	dcache_enable();
++}
++#endif
++
++#ifdef CONFIG_CMD_NET
++/*
++ * Initializes on-chip ethernet controllers.
++ * to override, implement board_eth_init()
++ */
++int cpu_eth_init(bd_t *bis)
++{
++	__maybe_unused int rc;
++
++#ifdef CONFIG_MACPWR
++	gpio_direction_output(CONFIG_MACPWR, 1);
++	mdelay(200);
++#endif
++
++#ifdef CONFIG_SUNXI_EMAC
++	rc = sunxi_emac_initialize(bis);
++	if (rc < 0) {
++		printf("sunxi: failed to initialize emac\n");
++		return rc;
++	}
++#endif
++
++#ifdef CONFIG_SUNXI_GMAC
++	rc = sunxi_gmac_initialize(bis);
++	if (rc < 0) {
++		printf("sunxi: failed to initialize gmac\n");
++		return rc;
++	}
++#endif
++
++	return 0;
++}
++#endif
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/clock.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/clock.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/clock.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/clock.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,25 @@
++/*
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/sys_proto.h>
++
++int clock_init(void)
++{
++#ifdef CONFIG_SPL_BUILD
++	clock_init_safe();
++#endif
++	clock_init_uart();
++
++	return 0;
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/clock_sun4i.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/clock_sun4i.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/clock_sun4i.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/clock_sun4i.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,188 @@
++/*
++ * sun4i, sun5i and sun7i specific clock code
++ *
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/sys_proto.h>
++
++#ifdef CONFIG_SPL_BUILD
++void clock_init_safe(void)
++{
++	struct sunxi_ccm_reg * const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	/* Set safe defaults until PMU is configured */
++	writel(AXI_DIV_1 << AXI_DIV_SHIFT |
++	       AHB_DIV_2 << AHB_DIV_SHIFT |
++	       APB0_DIV_1 << APB0_DIV_SHIFT |
++	       CPU_CLK_SRC_OSC24M << CPU_CLK_SRC_SHIFT,
++	       &ccm->cpu_ahb_apb0_cfg);
++	writel(PLL1_CFG_DEFAULT, &ccm->pll1_cfg);
++	sdelay(200);
++	writel(AXI_DIV_1 << AXI_DIV_SHIFT |
++	       AHB_DIV_2 << AHB_DIV_SHIFT |
++	       APB0_DIV_1 << APB0_DIV_SHIFT |
++	       CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT,
++	       &ccm->cpu_ahb_apb0_cfg);
++#ifdef CONFIG_SUN7I
++	writel(0x1 << AHB_GATE_OFFSET_DMA | readl(&ccm->ahb_gate0),
++	       &ccm->ahb_gate0);
++#endif
++	writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg);
++}
++#endif
++
++void clock_init_uart(void)
++{
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	/* uart clock source is apb1 */
++	writel(APB1_CLK_SRC_OSC24M|
++	       APB1_CLK_RATE_N_1|
++	       APB1_CLK_RATE_M(1),
++	       &ccm->apb1_clk_div_cfg);
++
++	/* open the clock for uart */
++	setbits_le32(&ccm->apb1_gate,
++		CLK_GATE_OPEN << (APB1_GATE_UART_SHIFT+CONFIG_CONS_INDEX-1));
++}
++
++int clock_twi_onoff(int port, int state)
++{
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	if (port > 2)
++		return -1;
++
++	/* set the apb clock gate for twi */
++	if (state)
++		setbits_le32(&ccm->apb1_gate,
++			     CLK_GATE_OPEN << (APB1_GATE_TWI_SHIFT+port));
++	else
++		clrbits_le32(&ccm->apb1_gate,
++			     CLK_GATE_OPEN << (APB1_GATE_TWI_SHIFT+port));
++
++	return 0;
++}
++
++#ifdef CONFIG_SPL_BUILD
++#define PLL1_CFG(N, K, M, P)	( 1 << CCM_PLL1_CFG_ENABLE_SHIFT | \
++				  0 << CCM_PLL1_CFG_VCO_RST_SHIFT |  \
++				  8 << CCM_PLL1_CFG_VCO_BIAS_SHIFT | \
++				  0 << CCM_PLL1_CFG_PLL4_EXCH_SHIFT | \
++				 16 << CCM_PLL1_CFG_BIAS_CUR_SHIFT | \
++				 (P)<< CCM_PLL1_CFG_DIVP_SHIFT | \
++				  2 << CCM_PLL1_CFG_LCK_TMR_SHIFT | \
++				 (N)<< CCM_PLL1_CFG_FACTOR_N_SHIFT | \
++				 (K)<< CCM_PLL1_CFG_FACTOR_K_SHIFT | \
++				  0 << CCM_PLL1_CFG_SIG_DELT_PAT_IN_SHIFT | \
++				  0 << CCM_PLL1_CFG_SIG_DELT_PAT_EN_SHIFT | \
++				 (M)<< CCM_PLL1_CFG_FACTOR_M_SHIFT)
++
++static struct {
++	u32 pll1_cfg;
++	unsigned int freq;
++} pll1_para[] = {
++	/* This array must be ordered by frequency. */
++	{ PLL1_CFG(16, 0, 0, 0), 384000000 },
++	{ PLL1_CFG(16, 1, 0, 0), 768000000 },
++	{ PLL1_CFG(20, 1, 0, 0), 960000000 },
++	{ PLL1_CFG(21, 1, 0, 0), 1008000000},
++	{ PLL1_CFG(22, 1, 0, 0), 1056000000},
++	{ PLL1_CFG(23, 1, 0, 0), 1104000000},
++	{ PLL1_CFG(24, 1, 0, 0), 1152000000},
++	{ PLL1_CFG(25, 1, 0, 0), 1200000000},
++	{ PLL1_CFG(26, 1, 0, 0), 1248000000},
++	{ PLL1_CFG(27, 1, 0, 0), 1296000000},
++	{ PLL1_CFG(28, 1, 0, 0), 1344000000},
++	{ PLL1_CFG(29, 1, 0, 0), 1392000000},
++	{ PLL1_CFG(30, 1, 0, 0), 1440000000},
++	{ PLL1_CFG(31, 1, 0, 0), 1488000000},
++	/* Final catchall entry */
++	{ PLL1_CFG(31, 1, 0, 0), ~0},
++};
++
++void clock_set_pll1(unsigned int hz)
++{
++	int i = 0;
++	int axi, ahb, apb0;
++	struct sunxi_ccm_reg * const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	/* Find target frequency */
++	while (pll1_para[i].freq < hz)
++		i++;
++
++	hz = pll1_para[i].freq;
++
++	/* Calculate system clock divisors */
++	axi = DIV_ROUND_UP(hz, 432000000);	/* Max 450MHz */
++	ahb = DIV_ROUND_UP(hz/axi, 204000000);	/* Max 250MHz */
++	apb0 = 2;				/* Max 150MHz */
++
++	printf("CPU: %uHz, AXI/AHB/APB: %d/%d/%d\n", hz, axi, ahb, apb0);
++
++	/* Map divisors to register values */
++	axi = axi - 1;
++	if (ahb > 4)
++		ahb = 3;
++	else if (ahb > 2)
++		ahb = 2;
++	else if (ahb > 1)
++		ahb = 1;
++	else
++		ahb = 0;
++
++	apb0 = apb0 - 1;
++
++	/* Switch to 24MHz clock while changing PLL1 */
++	writel(AXI_DIV_1 << AXI_DIV_SHIFT |
++	       AHB_DIV_2 << AHB_DIV_SHIFT |
++	       APB0_DIV_1 << APB0_DIV_SHIFT |
++	       CPU_CLK_SRC_OSC24M << CPU_CLK_SRC_SHIFT,
++	       &ccm->cpu_ahb_apb0_cfg);
++	sdelay(20);
++
++	/* Configure sys clock divisors */
++	writel(axi << AXI_DIV_SHIFT |
++	       ahb << AHB_DIV_SHIFT |
++	       apb0 << APB0_DIV_SHIFT |
++	       CPU_CLK_SRC_OSC24M << CPU_CLK_SRC_SHIFT,
++	       &ccm->cpu_ahb_apb0_cfg);
++
++	/* Configure PLL1 at the desired frequency */
++	writel(pll1_para[i].pll1_cfg, &ccm->pll1_cfg);
++	sdelay(200);
++
++	/* Switch CPU to PLL1 */
++	writel(axi << AXI_DIV_SHIFT |
++	       ahb << AHB_DIV_SHIFT |
++	       apb0 << APB0_DIV_SHIFT |
++	       CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT,
++	       &ccm->cpu_ahb_apb0_cfg);
++	sdelay(20);
++}
++#endif
++
++unsigned int clock_get_pll6(void)
++{
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++	uint32_t rval = readl(&ccm->pll6_cfg);
++	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT);
++	int k = ((rval & CCM_PLL6_CTRL_K_MASK) >> CCM_PLL6_CTRL_K_SHIFT) + 1;
++	return 24000000 * n * k / 2;
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/clock_sun6i.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/clock_sun6i.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/clock_sun6i.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/clock_sun6i.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,110 @@
++/*
++ * sun6i specific clock code
++ *
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/prcm.h>
++#include <asm/arch/sys_proto.h>
++
++#ifdef CONFIG_SPL_BUILD
++void clock_init_safe(void)
++{
++	struct sunxi_ccm_reg * const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++	struct sunxi_prcm_reg * const prcm =
++		(struct sunxi_prcm_reg *)SUNXI_PRCM_BASE;
++
++	/* Set PLL ldo voltage without this PLL6 does not work properly */
++	writel(PRCM_PLL_CTRL_LDO_DIGITAL_EN | PRCM_PLL_CTRL_LDO_ANALOG_EN |
++		PRCM_PLL_CTRL_EXT_OSC_EN | PRCM_PLL_CTRL_LDO_OUT_L(1140) |
++		PRCM_PLL_CTRL_LDO_KEY, &prcm->pll_ctrl1);
++	writel(PRCM_PLL_CTRL_LDO_DIGITAL_EN | PRCM_PLL_CTRL_LDO_ANALOG_EN |
++		PRCM_PLL_CTRL_EXT_OSC_EN | PRCM_PLL_CTRL_LDO_OUT_L(1140) |
++		PRCM_PLL_CTRL_LDO_KEY, &prcm->pll_ctrl1);
++	writel(PRCM_PLL_CTRL_LDO_DIGITAL_EN | PRCM_PLL_CTRL_LDO_ANALOG_EN |
++		PRCM_PLL_CTRL_EXT_OSC_EN | PRCM_PLL_CTRL_LDO_OUT_L(1140),
++		&prcm->pll_ctrl1);
++
++	/* AXI and PLL1 settings from boot0 / boot1, PLL1 set to 486 Mhz */
++	writel(AXI_DIV_3 << AXI_DIV_SHIFT |
++	       ATB_DIV_2 << ATB_DIV_SHIFT |
++	       CPU_CLK_SRC_OSC24M << CPU_CLK_SRC_SHIFT,
++	       &ccm->cpu_axi_cfg);
++	writel(PLL1_CFG_DEFAULT, &ccm->pll1_cfg);
++	sdelay(200);
++	writel(AXI_DIV_3 << AXI_DIV_SHIFT |
++	       ATB_DIV_2 << ATB_DIV_SHIFT |
++	       CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT,
++	       &ccm->cpu_axi_cfg);
++
++	writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg);
++}
++#endif
++
++void clock_init_uart(void)
++{
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++#if CONFIG_CONS_INDEX < 5
++	/* uart clock source is apb2 */
++	writel(APB2_CLK_SRC_OSC24M|
++	       APB2_CLK_RATE_N_1|
++	       APB2_CLK_RATE_M(1),
++	       &ccm->apb2_div);
++
++	/* open the clock for uart */
++	setbits_le32(&ccm->apb2_gate,
++		CLK_GATE_OPEN << (APB2_GATE_UART_SHIFT+CONFIG_CONS_INDEX-1));
++
++	/* deassert uart reset */
++	setbits_le32(&ccm->apb2_reset_cfg,
++		1 << (APB2_RESET_UART_SHIFT+CONFIG_CONS_INDEX-1));
++#else
++	/* enable R_PIO and R_UART clocks, and de-assert resets */
++	prcm_apb0_enable(PRCM_APB0_GATE_PIO | PRCM_APB0_GATE_UART);
++#endif
++
++	/* Dup with clock_init_safe(), drop once sun6i SPL support lands */
++	writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg);
++}
++
++int clock_twi_onoff(int port, int state)
++{
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	if (port > 3)
++		return -1;
++
++	/* set the apb clock gate for twi */
++	if (state)
++		setbits_le32(&ccm->apb2_gate,
++			     CLK_GATE_OPEN << (APB2_GATE_TWI_SHIFT+port));
++	else
++		clrbits_le32(&ccm->apb2_gate,
++			     CLK_GATE_OPEN << (APB2_GATE_TWI_SHIFT+port));
++
++	return 0;
++}
++
++unsigned int clock_get_pll6(void)
++{
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++	uint32_t rval = readl(&ccm->pll6_cfg);
++	int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT) + 1;
++	int k = ((rval & CCM_PLL6_CTRL_K_MASK) >> CCM_PLL6_CTRL_K_SHIFT) + 1;
++	return 24000000 * n * k / 2;
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/cmd_watchdog.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/cmd_watchdog.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/cmd_watchdog.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/cmd_watchdog.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,29 @@
++/*
++ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/watchdog.h>
++
++int do_sunxi_watchdog(cmd_tbl_t *cmdtp, int flag, int argc, const char *argv[])
++{
++	unsigned long interval;
++
++	if (argc < 2) {
++		printf("usage: watchdog seconds\n");
++		printf("over %d to disable watchdog\n", WDT_MAX_TIMEOUT);
++	}
++	interval = simple_strtoul(argv[1], NULL, 10);
++	watchdog_set((unsigned int)interval);
++
++	return 0;
++}
++
++U_BOOT_CMD(
++	watchdog, 2, 1, do_sunxi_watchdog,
++	"Set watchdog [0 - 16]. [17+} disables",
++	""
++);
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/config.mk u-boot-sunxi/arch/arm/cpu/armv7/sunxi/config.mk
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/config.mk	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/config.mk	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,8 @@
++# Build a combined spl + u-boot image
++ifdef CONFIG_SPL
++ifndef CONFIG_SPL_BUILD
++ifndef CONFIG_SPL_FEL
++ALL-y += u-boot-sunxi-with-spl.bin
++endif
++endif
++endif
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/cpu_info.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/cpu_info.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/cpu_info.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/cpu_info.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,38 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/cpu.h>
++
++#ifdef CONFIG_DISPLAY_CPUINFO
++int print_cpuinfo(void)
++{
++#ifdef CONFIG_SUN4I
++	puts("CPU:   Allwinner A10 (SUN4I)\n");
++#elif defined CONFIG_SUN5I
++	u32 val = readl(SUNXI_SID_BASE + 0x08);
++	switch ((val >> 12) & 0xf) {
++	case 0: puts("CPU:   Allwinner A12 (SUN5I)\n"); break;
++	case 3: puts("CPU:   Allwinner A13 (SUN5I)\n"); break;
++	case 7: puts("CPU:   Allwinner A10s (SUN5I)\n"); break;
++	default: puts("CPU:   Allwinner A1X (SUN5I)\n");
++	}
++#elif defined CONFIG_SUN6I
++	puts("CPU:   Allwinner A31 (SUN6I)\n");
++#elif defined CONFIG_SUN7I
++	puts("CPU:   Allwinner A20 (SUN7I)\n");
++#elif defined CONFIG_SUN8I
++	puts("CPU:   Allwinner A23 (SUN8I)\n");
++#else
++#warning Please update cpu_info.c with correct CPU information
++	puts("CPU:   SUNXI Family\n");
++#endif
++	return 0;
++}
++#endif
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/dram.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/dram.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/dram.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/dram.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,693 @@
++/*
++ * sunxi DRAM controller initialization
++ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ *
++ * Based on sun4i Linux kernel sources mach-sunxi/pm/standby/dram*.c
++ * and earlier U-Boot Allwiner A10 SPL work
++ *
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Berg Xing <bergxing@allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++/*
++ * Unfortunately the only documentation we have on the sun7i DRAM
++ * controller is Allwinner boot0 + boot1 code, and that code uses
++ * magic numbers & shifts with no explanations. Hence this code is
++ * rather undocumented and full of magic.
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/dram.h>
++#include <asm/arch/timer.h>
++#include <asm/arch/sys_proto.h>
++
++#define CPU_CFG_CHIP_VER(n) ((n) << 6)
++#define CPU_CFG_CHIP_VER_MASK CPU_CFG_CHIP_VER(0x3)
++#define CPU_CFG_CHIP_REV_A 0x0
++#define CPU_CFG_CHIP_REV_C1 0x1
++#define CPU_CFG_CHIP_REV_C2 0x2
++#define CPU_CFG_CHIP_REV_B 0x3
++
++/*
++ * Wait up to 1s for mask to be clear in given reg.
++ */
++static void await_completion(u32 *reg, u32 mask)
++{
++	unsigned long tmo = timer_get_us() + 1000000;
++
++	while (readl(reg) & mask) {
++		if (timer_get_us() > tmo)
++			panic("Timeout initialising DRAM\n");
++	}
++}
++
++static void mctl_ddr3_reset(void)
++{
++	struct sunxi_dram_reg *dram =
++			(struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++
++#ifdef CONFIG_SUN4I
++	struct sunxi_timer_reg *timer =
++			(struct sunxi_timer_reg *)SUNXI_TIMER_BASE;
++	u32 reg_val;
++
++	writel(0, &timer->cpu_cfg);
++	reg_val = readl(&timer->cpu_cfg);
++
++	if ((reg_val & CPU_CFG_CHIP_VER_MASK) !=
++	    CPU_CFG_CHIP_VER(CPU_CFG_CHIP_REV_A)) {
++		setbits_le32(&dram->mcr, DRAM_MCR_RESET);
++		udelay(2);
++		clrbits_le32(&dram->mcr, DRAM_MCR_RESET);
++	} else
++#endif
++	{
++		clrbits_le32(&dram->mcr, DRAM_MCR_RESET);
++		udelay(2);
++		setbits_le32(&dram->mcr, DRAM_MCR_RESET);
++	}
++}
++
++static void mctl_set_drive(void)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++
++#ifdef CONFIG_SUN7I
++	clrsetbits_le32(&dram->mcr, DRAM_MCR_MODE_NORM(0x3) | (0x3 << 28),
++#else
++	clrsetbits_le32(&dram->mcr, DRAM_MCR_MODE_NORM(0x3),
++#endif
++			DRAM_MCR_MODE_EN(0x3) |
++			0xffc);
++}
++
++static void mctl_itm_disable(void)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++
++	clrsetbits_le32(&dram->ccr, DRAM_CCR_INIT, DRAM_CCR_ITM_OFF);
++}
++
++static void mctl_itm_enable(void)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++
++	clrbits_le32(&dram->ccr, DRAM_CCR_ITM_OFF);
++}
++
++static void mctl_enable_dll0(u32 phase)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++
++	clrsetbits_le32(&dram->dllcr[0], 0x3f << 6,
++			((phase >> 16) & 0x3f) << 6);
++	clrsetbits_le32(&dram->dllcr[0], DRAM_DLLCR_NRESET, DRAM_DLLCR_DISABLE);
++	udelay(2);
++
++	clrbits_le32(&dram->dllcr[0], DRAM_DLLCR_NRESET | DRAM_DLLCR_DISABLE);
++	udelay(22);
++
++	clrsetbits_le32(&dram->dllcr[0], DRAM_DLLCR_DISABLE, DRAM_DLLCR_NRESET);
++	udelay(22);
++}
++
++/*
++ * Note: This differs from pm/standby in that it checks the bus width
++ */
++static void mctl_enable_dllx(u32 phase)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++	u32 i, n, bus_width;
++
++	bus_width = readl(&dram->dcr);
++
++	if ((bus_width & DRAM_DCR_BUS_WIDTH_MASK) ==
++	    DRAM_DCR_BUS_WIDTH(DRAM_DCR_BUS_WIDTH_32BIT))
++		n = DRAM_DCR_NR_DLLCR_32BIT;
++	else
++		n = DRAM_DCR_NR_DLLCR_16BIT;
++
++	for (i = 1; i < n; i++) {
++		clrsetbits_le32(&dram->dllcr[i], 0xf << 14,
++				(phase & 0xf) << 14);
++		clrsetbits_le32(&dram->dllcr[i], DRAM_DLLCR_NRESET,
++				DRAM_DLLCR_DISABLE);
++		phase >>= 4;
++	}
++	udelay(2);
++
++	for (i = 1; i < n; i++)
++		clrbits_le32(&dram->dllcr[i], DRAM_DLLCR_NRESET |
++			     DRAM_DLLCR_DISABLE);
++	udelay(22);
++
++	for (i = 1; i < n; i++)
++		clrsetbits_le32(&dram->dllcr[i], DRAM_DLLCR_DISABLE,
++				DRAM_DLLCR_NRESET);
++	udelay(22);
++}
++
++static u32 hpcr_value[32] = {
++#ifdef CONFIG_SUN5I
++	0, 0, 0, 0,
++	0, 0, 0, 0,
++	0, 0, 0, 0,
++	0, 0, 0, 0,
++	0x1031, 0x1031, 0x0735, 0x1035,
++	0x1035, 0x0731, 0x1031, 0,
++	0x0301, 0x0301, 0x0301, 0x0301,
++	0x0301, 0x0301, 0x0301, 0
++#endif
++#ifdef CONFIG_SUN4I
++	0x0301, 0x0301, 0x0301, 0x0301,
++	0x0301, 0x0301, 0, 0,
++	0, 0, 0, 0,
++	0, 0, 0, 0,
++	0x1031, 0x1031, 0x0735, 0x5031,
++	0x1035, 0x0731, 0x1031, 0x0735,
++	0x1035, 0x1031, 0x0731, 0x1035,
++	0x1031, 0x0301, 0x0301, 0x0731
++#endif
++#ifdef CONFIG_SUN7I
++	0x0301, 0x0301, 0x0301, 0x0301,
++	0x0301, 0x0301, 0x0301, 0x0301,
++	0, 0, 0, 0,
++	0, 0, 0, 0,
++	0x1031, 0x1031, 0x0735, 0x1035,
++	0x1035, 0x0731, 0x1031, 0x0735,
++	0x1035, 0x1031, 0x0731, 0x1035,
++	0x0001, 0x1031, 0, 0x1031
++	/* last row differs from boot0 source table
++	 * 0x1031, 0x0301, 0x0301, 0x0731
++	 * but boot0 code skips #28 and #30, and sets #29 and #31 to the
++	 * value from #28 entry (0x1031)
++	 */
++#endif
++};
++
++static void mctl_configure_hostport(void)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++	u32 i;
++
++	for (i = 0; i < 32; i++)
++		writel(hpcr_value[i], &dram->hpcr[i]);
++}
++
++static void mctl_setup_dram_clock(u32 clk)
++{
++	u32 reg_val;
++	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	/* setup DRAM PLL */
++	reg_val = readl(&ccm->pll5_cfg);
++	reg_val &= ~CCM_PLL5_CTRL_M_MASK;		/* set M to 0 (x1) */
++	reg_val &= ~CCM_PLL5_CTRL_K_MASK;		/* set K to 0 (x1) */
++	reg_val &= ~CCM_PLL5_CTRL_N_MASK;		/* set N to 0 (x0) */
++	reg_val &= ~CCM_PLL5_CTRL_P_MASK;		/* set P to 0 (x1) */
++	if (clk >= 540 && clk < 552) {
++		/* dram = 540MHz, pll5p = 540MHz */
++		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2));
++		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(3));
++		reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(15));
++		reg_val |= CCM_PLL5_CTRL_P(1);
++	} else if (clk >= 512 && clk < 528) {
++		/* dram = 512MHz, pll5p = 384MHz */
++		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(3));
++		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(4));
++		reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(16));
++		reg_val |= CCM_PLL5_CTRL_P(2);
++	} else if (clk >= 496 && clk < 504) {
++		/* dram = 496MHz, pll5p = 372MHz */
++		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(3));
++		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(2));
++		reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(31));
++		reg_val |= CCM_PLL5_CTRL_P(2);
++	} else if (clk >= 468 && clk < 480) {
++		/* dram = 468MHz, pll5p = 468MHz */
++		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2));
++		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(3));
++		reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(13));
++		reg_val |= CCM_PLL5_CTRL_P(1);
++	} else if (clk >= 396 && clk < 408) {
++		/* dram = 396MHz, pll5p = 396MHz */
++		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2));
++		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(3));
++		reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(11));
++		reg_val |= CCM_PLL5_CTRL_P(1);
++	} else 	{
++		/* any other frequency that is a multiple of 24 */
++		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2));
++		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(2));
++		reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(clk / 24));
++		reg_val |= CCM_PLL5_CTRL_P(CCM_PLL5_CTRL_P_X(2));
++	}
++	reg_val &= ~CCM_PLL5_CTRL_VCO_GAIN;		/* PLL VCO Gain off */
++	reg_val |= CCM_PLL5_CTRL_EN;			/* PLL On */
++	writel(reg_val, &ccm->pll5_cfg);
++	udelay(5500);
++
++	setbits_le32(&ccm->pll5_cfg, CCM_PLL5_CTRL_DDR_CLK);
++
++#if defined(CONFIG_SUN4I) || defined(CONFIG_SUN7I)
++	/* reset GPS */
++	clrbits_le32(&ccm->gps_clk_cfg, CCM_GPS_CTRL_RESET | CCM_GPS_CTRL_GATE);
++	setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_GPS);
++	udelay(1);
++	clrbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_GPS);
++#endif
++
++#if defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I)
++	/* setup MBUS clock */
++	reg_val = CCM_MBUS_CTRL_GATE |
++#if defined(CONFIG_SUN7I) && defined(CONFIG_FAST_MBUS)
++		  CCM_MBUS_CTRL_CLK_SRC(CCM_MBUS_CTRL_CLK_SRC_PLL6) |
++		  CCM_MBUS_CTRL_N(CCM_MBUS_CTRL_N_X(1)) |
++		  CCM_MBUS_CTRL_M(CCM_MBUS_CTRL_M_X(3));
++#elif defined(CONFIG_SUN7I) && !defined(CONFIG_FAST_MBUS)
++		  CCM_MBUS_CTRL_CLK_SRC(CCM_MBUS_CTRL_CLK_SRC_PLL6) |
++		  CCM_MBUS_CTRL_N(CCM_MBUS_CTRL_N_X(2)) |
++		  CCM_MBUS_CTRL_M(CCM_MBUS_CTRL_M_X(2));
++#else /* defined(CONFIG_SUN5I) */
++		  CCM_MBUS_CTRL_CLK_SRC(CCM_MBUS_CTRL_CLK_SRC_PLL5) |
++		  CCM_MBUS_CTRL_N(CCM_MBUS_CTRL_N_X(1)) |
++		  CCM_MBUS_CTRL_M(CCM_MBUS_CTRL_M_X(2));
++#endif
++	writel(reg_val, &ccm->mbus_clk_cfg);
++#endif
++
++	/*
++	 * open DRAMC AHB & DLL register clock
++	 * close it first
++	 */
++#if defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I)
++	clrbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM | CCM_AHB_GATE_DLL);
++#else
++	clrbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM);
++#endif
++	udelay(22);
++
++	/* then open it */
++#if defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I)
++	setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM | CCM_AHB_GATE_DLL);
++#else
++	setbits_le32(&ccm->ahb_gate0, CCM_AHB_GATE_SDRAM);
++#endif
++	udelay(22);
++}
++
++static int dramc_scan_readpipe(void)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++	u32 reg_val;
++
++	/* data training trigger */
++#ifdef CONFIG_SUN7I
++	clrbits_le32(&dram->csr, DRAM_CSR_FAILED);
++#endif
++	setbits_le32(&dram->ccr, DRAM_CCR_DATA_TRAINING);
++
++	/* check whether data training process has completed */
++	await_completion(&dram->ccr, DRAM_CCR_DATA_TRAINING);
++
++	/* check data training result */
++	reg_val = readl(&dram->csr);
++	if (reg_val & DRAM_CSR_FAILED)
++		return -1;
++
++	return 0;
++}
++
++static int dramc_scan_dll_para(void)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++	const u32 dqs_dly[7] = {0x3, 0x2, 0x1, 0x0, 0xe, 0xd, 0xc};
++	const u32 clk_dly[15] = {0x07, 0x06, 0x05, 0x04, 0x03,
++				 0x02, 0x01, 0x00, 0x08, 0x10,
++				 0x18, 0x20, 0x28, 0x30, 0x38};
++	u32 clk_dqs_count[15];
++	u32 dqs_i, clk_i, cr_i;
++	u32 max_val, min_val;
++	u32 dqs_index, clk_index;
++
++	/* Find DQS_DLY Pass Count for every CLK_DLY */
++	for (clk_i = 0; clk_i < 15; clk_i++) {
++		clk_dqs_count[clk_i] = 0;
++		clrsetbits_le32(&dram->dllcr[0], 0x3f << 6,
++				(clk_dly[clk_i] & 0x3f) << 6);
++		for (dqs_i = 0; dqs_i < 7; dqs_i++) {
++			for (cr_i = 1; cr_i < 5; cr_i++) {
++				clrsetbits_le32(&dram->dllcr[cr_i],
++						0x4f << 14,
++						(dqs_dly[dqs_i] & 0x4f) << 14);
++			}
++			udelay(2);
++			if (dramc_scan_readpipe() == 0)
++				clk_dqs_count[clk_i]++;
++		}
++	}
++	/* Test DQS_DLY Pass Count for every CLK_DLY from up to down */
++	for (dqs_i = 15; dqs_i > 0; dqs_i--) {
++		max_val = 15;
++		min_val = 15;
++		for (clk_i = 0; clk_i < 15; clk_i++) {
++			if (clk_dqs_count[clk_i] == dqs_i) {
++				max_val = clk_i;
++				if (min_val == 15)
++					min_val = clk_i;
++			}
++		}
++		if (max_val < 15)
++			break;
++	}
++
++	/* Check if Find a CLK_DLY failed */
++	if (!dqs_i)
++		goto fail;
++
++	/* Find the middle index of CLK_DLY */
++	clk_index = (max_val + min_val) >> 1;
++	if ((max_val == (15 - 1)) && (min_val > 0))
++		/* if CLK_DLY[MCTL_CLK_DLY_COUNT] is very good, then the middle
++		 * value can be more close to the max_val
++		 */
++		clk_index = (15 + clk_index) >> 1;
++	else if ((max_val < (15 - 1)) && (min_val == 0))
++		/* if CLK_DLY[0] is very good, then the middle value can be more
++		 * close to the min_val
++		 */
++		clk_index >>= 1;
++	if (clk_dqs_count[clk_index] < dqs_i)
++		clk_index = min_val;
++
++	/* Find the middle index of DQS_DLY for the CLK_DLY got above, and Scan
++	 * read pipe again
++	 */
++	clrsetbits_le32(&dram->dllcr[0], 0x3f << 6,
++			(clk_dly[clk_index] & 0x3f) << 6);
++	max_val = 7;
++	min_val = 7;
++	for (dqs_i = 0; dqs_i < 7; dqs_i++) {
++		clk_dqs_count[dqs_i] = 0;
++		for (cr_i = 1; cr_i < 5; cr_i++) {
++			clrsetbits_le32(&dram->dllcr[cr_i],
++					0x4f << 14,
++					(dqs_dly[dqs_i] & 0x4f) << 14);
++		}
++		udelay(2);
++		if (dramc_scan_readpipe() == 0) {
++			clk_dqs_count[dqs_i] = 1;
++			max_val = dqs_i;
++			if (min_val == 7)
++				min_val = dqs_i;
++		}
++	}
++
++	if (max_val < 7) {
++		dqs_index = (max_val + min_val) >> 1;
++		if ((max_val == (7-1)) && (min_val > 0))
++			dqs_index = (7 + dqs_index) >> 1;
++		else if ((max_val < (7-1)) && (min_val == 0))
++			dqs_index >>= 1;
++		if (!clk_dqs_count[dqs_index])
++			dqs_index = min_val;
++		for (cr_i = 1; cr_i < 5; cr_i++) {
++			clrsetbits_le32(&dram->dllcr[cr_i],
++					0x4f << 14,
++					(dqs_dly[dqs_index] & 0x4f) << 14);
++		}
++		udelay(2);
++		return dramc_scan_readpipe();
++	}
++
++fail:
++	clrbits_le32(&dram->dllcr[0], 0x3f << 6);
++	for (cr_i = 1; cr_i < 5; cr_i++)
++		clrbits_le32(&dram->dllcr[cr_i], 0x4f << 14);
++	udelay(2);
++
++	return dramc_scan_readpipe();
++}
++
++static void dramc_clock_output_en(u32 on)
++{
++#if defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I)
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++
++	if (on)
++		setbits_le32(&dram->mcr, DRAM_MCR_DCLK_OUT);
++	else
++		clrbits_le32(&dram->mcr, DRAM_MCR_DCLK_OUT);
++#endif
++#ifdef CONFIG_SUN4I
++	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++	if (on)
++		setbits_le32(&ccm->dram_clk_cfg, CCM_DRAM_CTRL_DCLK_OUT);
++	else
++		clrbits_le32(&ccm->dram_clk_cfg, CCM_DRAM_CTRL_DCLK_OUT);
++#endif
++}
++
++static const u16 tRFC_table[2][6] = {
++	/*       256Mb    512Mb    1Gb      2Gb      4Gb      8Gb      */
++	/* DDR2  75ns     105ns    127.5ns  195ns    327.5ns  invalid  */
++	{        77,      108,     131,     200,     336,     336 },
++	/* DDR3  invalid  90ns     110ns    160ns    300ns    350ns    */
++	{        93,      93,      113,     164,     308,     359 }
++};
++
++static void dramc_set_autorefresh_cycle(u32 clk, u32 type, u32 density)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++	u32 tRFC, tREFI;
++
++	tRFC = (tRFC_table[type][density] * clk + 1023) >> 10;
++	tREFI = (7987 * clk) >> 10;	/* <= 7.8us */
++
++	writel(DRAM_DRR_TREFI(tREFI) | DRAM_DRR_TRFC(tRFC), &dram->drr);
++}
++
++unsigned long dramc_init(struct dram_para *para)
++{
++	struct sunxi_dram_reg *dram = (struct sunxi_dram_reg *)SUNXI_DRAMC_BASE;
++	u32 reg_val;
++	u32 density;
++	int ret_val;
++
++	/* check input dram parameter structure */
++	if (!para)
++		return 0;
++
++	/* setup DRAM relative clock */
++	mctl_setup_dram_clock(para->clock);
++
++#ifdef CONFIG_SUN5I
++	/* Disable any pad power save control */
++	writel(0, &dram->ppwrsctl);
++#endif
++
++	/* reset external DRAM */
++#ifndef CONFIG_SUN7I
++	mctl_ddr3_reset();
++#endif
++	mctl_set_drive();
++
++	/* dram clock off */
++	dramc_clock_output_en(0);
++
++#ifdef CONFIG_SUN4I
++	/* select dram controller 1 */
++	writel(DRAM_CSEL_MAGIC, &dram->csel);
++#endif
++
++	mctl_itm_disable();
++	mctl_enable_dll0(para->tpr3);
++
++	/* configure external DRAM */
++	reg_val = 0x0;
++	if (para->type == DRAM_MEMORY_TYPE_DDR3)
++		reg_val |= DRAM_DCR_TYPE_DDR3;
++	reg_val |= DRAM_DCR_IO_WIDTH(para->io_width >> 3);
++
++	if (para->density == 256)
++		density = DRAM_DCR_CHIP_DENSITY_256M;
++	else if (para->density == 512)
++		density = DRAM_DCR_CHIP_DENSITY_512M;
++	else if (para->density == 1024)
++		density = DRAM_DCR_CHIP_DENSITY_1024M;
++	else if (para->density == 2048)
++		density = DRAM_DCR_CHIP_DENSITY_2048M;
++	else if (para->density == 4096)
++		density = DRAM_DCR_CHIP_DENSITY_4096M;
++	else if (para->density == 8192)
++		density = DRAM_DCR_CHIP_DENSITY_8192M;
++	else
++		density = DRAM_DCR_CHIP_DENSITY_256M;
++
++	reg_val |= DRAM_DCR_CHIP_DENSITY(density);
++	reg_val |= DRAM_DCR_BUS_WIDTH((para->bus_width >> 3) - 1);
++	reg_val |= DRAM_DCR_RANK_SEL(para->rank_num - 1);
++	reg_val |= DRAM_DCR_CMD_RANK_ALL;
++	reg_val |= DRAM_DCR_MODE(DRAM_DCR_MODE_INTERLEAVE);
++	writel(reg_val, &dram->dcr);
++
++#ifdef CONFIG_SUN7I
++	setbits_le32(&dram->zqcr1, (0x1 << 24) | (0x1 << 1));
++	if (para->tpr4 & 0x2)
++		clrsetbits_le32(&dram->zqcr1, (0x1 << 24), (0x1 << 1));
++	dramc_clock_output_en(1);
++#endif
++
++#if (defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I))
++	/* set odt impendance divide ratio */
++	reg_val = ((para->zq) >> 8) & 0xfffff;
++	reg_val |= ((para->zq) & 0xff) << 20;
++	reg_val |= (para->zq) & 0xf0000000;
++	writel(reg_val, &dram->zqcr0);
++#endif
++
++#ifdef CONFIG_SUN7I
++	/* Set CKE Delay to about 1ms */
++	setbits_le32(&dram->idcr, 0x1ffff);
++#endif
++
++#ifdef CONFIG_SUN7I
++	if ((readl(&dram->ppwrsctl) & 0x1) != 0x1)
++		mctl_ddr3_reset();
++	else
++		setbits_le32(&dram->mcr, DRAM_MCR_RESET);
++#else
++	/* dram clock on */
++	dramc_clock_output_en(1);
++#endif
++
++	udelay(1);
++
++	await_completion(&dram->ccr, DRAM_CCR_INIT);
++
++	mctl_enable_dllx(para->tpr3);
++
++#ifdef CONFIG_SUN4I
++	/* set odt impedance divide ratio */
++	reg_val = ((para->zq) >> 8) & 0xfffff;
++	reg_val |= ((para->zq) & 0xff) << 20;
++	reg_val |= (para->zq) & 0xf0000000;
++	writel(reg_val, &dram->zqcr0);
++#endif
++
++#ifdef CONFIG_SUN4I
++	/* set I/O configure register */
++	reg_val = 0x00cc0000;
++	reg_val |= (para->odt_en) & 0x3;
++	reg_val |= ((para->odt_en) & 0x3) << 30;
++	writel(reg_val, &dram->iocr);
++#endif
++
++	/* set refresh period */
++	dramc_set_autorefresh_cycle(para->clock, para->type - 2, density);
++
++	/* set timing parameters */
++	writel(para->tpr0, &dram->tpr0);
++	writel(para->tpr1, &dram->tpr1);
++	writel(para->tpr2, &dram->tpr2);
++
++	if (para->type == DRAM_MEMORY_TYPE_DDR3) {
++		reg_val = DRAM_MR_BURST_LENGTH(0x0);
++#if (defined(CONFIG_SUN5I) || defined(CONFIG_SUN7I))
++		reg_val |= DRAM_MR_POWER_DOWN;
++#endif
++		reg_val |= DRAM_MR_CAS_LAT(para->cas - 4);
++		reg_val |= DRAM_MR_WRITE_RECOVERY(0x5);
++	} else if (para->type == DRAM_MEMORY_TYPE_DDR2) {
++		reg_val = DRAM_MR_BURST_LENGTH(0x2);
++		reg_val |= DRAM_MR_CAS_LAT(para->cas);
++		reg_val |= DRAM_MR_WRITE_RECOVERY(0x5);
++	}
++	writel(reg_val, &dram->mr);
++
++	writel(para->emr1, &dram->emr);
++	writel(para->emr2, &dram->emr2);
++	writel(para->emr3, &dram->emr3);
++
++	/* set DQS window mode */
++	clrsetbits_le32(&dram->ccr, DRAM_CCR_DQS_DRIFT_COMP, DRAM_CCR_DQS_GATE);
++
++#ifdef CONFIG_SUN7I
++	/* Command rate timing mode 2T & 1T */
++	if (para->tpr4 & 0x1)
++		setbits_le32(&dram->ccr, DRAM_CCR_COMMAND_RATE_1T);
++#endif
++	/* reset external DRAM */
++	setbits_le32(&dram->ccr, DRAM_CCR_INIT);
++	await_completion(&dram->ccr, DRAM_CCR_INIT);
++
++#ifdef CONFIG_SUN7I
++	/* setup zq calibration manual */
++	reg_val = readl(&dram->ppwrsctl);
++	if ((reg_val & 0x1) == 1) {
++		/* super_standby_flag = 1 */
++
++		reg_val = readl(0x01c20c00 + 0x120); /* rtc */
++		reg_val &= 0x000fffff;
++		reg_val |= 0x17b00000;
++		writel(reg_val, &dram->zqcr0);
++
++		/* exit self-refresh state */
++		clrsetbits_le32(&dram->dcr, 0x1f << 27, 0x12 << 27);
++		/* check whether command has been executed */
++		await_completion(&dram->dcr, 0x1 << 31);
++
++		udelay(2);
++
++		/* dram pad hold off */
++		setbits_le32(&dram->ppwrsctl, 0x16510000);
++
++		await_completion(&dram->ppwrsctl, 0x1);
++
++		/* exit self-refresh state */
++		clrsetbits_le32(&dram->dcr, 0x1f << 27, 0x12 << 27);
++
++		/* check whether command has been executed */
++		await_completion(&dram->dcr, 0x1 << 31);
++
++		udelay(2);
++
++		/* issue a refresh command */
++		clrsetbits_le32(&dram->dcr, 0x1f << 27, 0x13 << 27);
++		await_completion(&dram->dcr, 0x1 << 31);
++
++		udelay(2);
++	}
++#endif
++
++	/* scan read pipe value */
++	mctl_itm_enable();
++	if (para->tpr3 & (0x1 << 31)) {
++		ret_val = dramc_scan_dll_para();
++		if (ret_val == 0)
++			para->tpr3 =
++				(((readl(&dram->dllcr[0]) >> 6) & 0x3f) << 16) |
++				(((readl(&dram->dllcr[1]) >> 14) & 0xf) << 0) |
++				(((readl(&dram->dllcr[2]) >> 14) & 0xf) << 4) |
++				(((readl(&dram->dllcr[3]) >> 14) & 0xf) << 8) |
++				(((readl(&dram->dllcr[4]) >> 14) & 0xf) << 12
++				);
++	} else {
++		ret_val = dramc_scan_readpipe();
++	}
++
++	if (ret_val < 0)
++		return 0;
++
++	/* configure all host port */
++	mctl_configure_hostport();
++
++	return get_ram_size((long *)PHYS_SDRAM_0, PHYS_SDRAM_0_SIZE);
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/early_print.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/early_print.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/early_print.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/early_print.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,55 @@
++/*
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Early uart print for debugging.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/cpu.h>
++#include <asm/arch/early_print.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/sys_proto.h>
++
++static int uart_initialized = 0;
++
++#if CONFIG_CONS_INDEX < 5
++#define UART	CONFIG_CONS_INDEX-1
++#else
++/* SUNXI_R_UART_BASE */
++#define UART	2922
++#endif
++
++void uart_init(void) {
++
++	/* select dll dlh */
++	writel(UART_LCR_DLAB, UART_LCR(UART));
++	/* set baudrate */
++	writel(0, UART_DLH(UART));
++	writel(BAUD_115200, UART_DLL(UART));
++	/* set line control */
++	writel(LC_8_N_1, UART_LCR(UART));
++
++	uart_initialized = 1;
++}
++
++#define TX_READY (readl(UART_LSR(UART)) & UART_LSR_TEMT)
++
++void uart_putc(char c) {
++
++	while (!TX_READY)
++		;
++	writel(c, UART_THR(UART));
++}
++
++void uart_puts(const char *s) {
++
++	while (*s)
++		uart_putc(*s++);
++}
++
++
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/Makefile u-boot-sunxi/arch/arm/cpu/armv7/sunxi/Makefile
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/Makefile	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,44 @@
++#
++# (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++#
++# Based on some other Makefile
++# (C) Copyright 2000-2003
++# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
++#
++# SPDX-License-Identifier:	GPL-2.0+
++#
++obj-y	+= timer.o
++obj-y	+= board.o
++obj-y	+= clock.o
++obj-y	+= pinmux.o
++obj-y	+= watchdog.o
++obj-$(CONFIG_SUN6I)	+= prcm.o
++obj-$(CONFIG_SUN8I)	+= prcm.o
++obj-$(CONFIG_SUN6I)	+= p2wi.o
++obj-$(CONFIG_SUN4I)	+= clock_sun4i.o
++obj-$(CONFIG_SUN5I)	+= clock_sun4i.o
++obj-$(CONFIG_SUN6I)	+= clock_sun6i.o
++obj-$(CONFIG_SUN7I)	+= clock_sun4i.o
++obj-$(CONFIG_SUN8I)	+= clock_sun6i.o
++ifdef DEBUG
++obj-y	+= early_print.o
++endif
++obj-$(CONFIG_BOARD_POSTCLK_INIT)	+= postclk_init.o
++obj-$(CONFIG_SYS_SECONDARY_ON)	+= secondary_init.o
++obj-$(CONFIG_SYS_SECONDARY_ON)	+= smp.o
++
++ifndef CONFIG_SPL_BUILD
++obj-y	+= cpu_info.o
++ifdef CONFIG_CMD_WATCHDOG
++obj-$(CONFIG_CMD_WATCHDOG)	+= cmd_watchdog.o
++endif
++endif
++
++ifdef CONFIG_SPL_BUILD
++obj-$(CONFIG_SUN4I)	+= dram.o
++obj-$(CONFIG_SUN5I)	+= dram.o
++obj-$(CONFIG_SUN7I)	+= dram.o
++ifdef CONFIG_SPL_FEL
++obj-y	+= start.o
++endif
++endif
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/p2wi.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/p2wi.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/p2wi.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/p2wi.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,120 @@
++/*
++ * Sunxi A31 Power Management Unit
++ *
++ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
++ * http://linux-sunxi.org
++ *
++ * Based on sun6i sources and earlier U-Boot Allwiner A10 SPL work
++ *
++ * (C) Copyright 2006-2013
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Berg Xing <bergxing@allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <errno.h>
++#include <asm/io.h>
++#include <asm/arch/cpu.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/p2wi.h>
++#include <asm/arch/prcm.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/sys_proto.h>
++
++void p2wi_init(void)
++{
++	struct sunxi_p2wi_reg *p2wi = (struct sunxi_p2wi_reg *)SUNXI_P2WI_BASE;
++
++	/* Enable p2wi and PIO clk, and de-assert their resets */
++	prcm_apb0_enable(PRCM_APB0_GATE_PIO | PRCM_APB0_GATE_P2WI);
++
++	sunxi_gpio_set_cfgpin(SUNXI_GPL(0), SUNXI_GPL0_R_P2WI_SCK);
++	sunxi_gpio_set_cfgpin(SUNXI_GPL(1), SUNXI_GPL1_R_P2WI_SDA);
++
++	/* Reset p2wi controller and set clock to CLKIN(12)/8 = 1.5 MHz */
++	writel(P2WI_CTRL_RESET, &p2wi->ctrl);
++	sdelay(0x100);
++	writel(P2WI_CC_SDA_OUT_DELAY(1) | P2WI_CC_CLK_DIV(8),
++	       &p2wi->cc);
++}
++
++int p2wi_set_pmu_address(u8 slave_addr, u8 ctrl_reg, u8 init_data)
++{
++	struct sunxi_p2wi_reg *p2wi = (struct sunxi_p2wi_reg *)SUNXI_P2WI_BASE;
++	int i;
++
++	writel(P2WI_PM_DEV_ADDR(slave_addr) |
++	       P2WI_PM_CTRL_ADDR(ctrl_reg) |
++	       P2WI_PM_INIT_DATA(init_data) |
++	       P2WI_PM_INIT_SEND,
++	       &p2wi->pm);
++	for (i = 0xffffff; i != 0; i--)
++		if (!(readl(&p2wi->pm) & P2WI_PM_INIT_SEND))
++			break;
++	if (readl(&p2wi->pm) & P2WI_PM_INIT_SEND)
++		return -EFAULT;
++
++	return 0;
++}
++
++int p2wi_read(const u8 addr, u8 *data)
++{
++	struct sunxi_p2wi_reg *p2wi = (struct sunxi_p2wi_reg *)SUNXI_P2WI_BASE;
++	int i, ret = 0;
++	u8 reg;
++
++	writel(P2WI_DATADDR_BYTE_1(addr), &p2wi->dataddr0);
++	writel(P2WI_DATA_NUM_BYTES(1) |
++	       P2WI_DATA_NUM_BYTES_READ, &p2wi->numbytes);
++	writel(P2WI_STAT_TRANS_DONE, &p2wi->status);
++	writel(P2WI_CTRL_TRANS_START, &p2wi->ctrl);
++
++	for (i = 0xffffff; i != 0; i--) {
++	        reg = readl(&p2wi->status);
++	        if (reg & P2WI_STAT_TRANS_ERR) {
++	                ret = -EIO;
++	                break;
++                }
++		if (reg & P2WI_STAT_TRANS_DONE)
++			break;
++        }
++
++	if (i == 0)
++		ret = -ETIME;
++
++	*data = readl(&p2wi->data0) & P2WI_DATA_BYTE_1_MASK;
++	writel(reg, &p2wi->status); /* Clear status bits */
++	return ret;
++}
++
++int p2wi_write(const u8 addr, u8 data)
++{
++	struct sunxi_p2wi_reg *p2wi = (struct sunxi_p2wi_reg *)SUNXI_P2WI_BASE;
++	int i, ret = 0;
++	u8 reg;
++
++	writel(P2WI_DATADDR_BYTE_1(addr), &p2wi->dataddr0);
++	writel(P2WI_DATA_BYTE_1(data), &p2wi->data0);
++	writel(P2WI_DATA_NUM_BYTES(1), &p2wi->numbytes);
++	writel(P2WI_STAT_TRANS_DONE, &p2wi->status);
++	writel(P2WI_CTRL_TRANS_START, &p2wi->ctrl);
++
++	for (i = 0xffffff; i != 0; i--) {
++	        reg = readl(&p2wi->status);
++	        if (reg & P2WI_STAT_TRANS_ERR) {
++	                ret = -EIO;
++	                break;
++                }
++		if (reg & P2WI_STAT_TRANS_DONE)
++			break;
++        }
++
++	if (i == 0)
++		ret = -ETIME;
++
++	writel(reg, &p2wi->status); /* Clear status bits */
++	return ret;
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/pinmux.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/pinmux.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/pinmux.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/pinmux.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,61 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/gpio.h>
++
++int sunxi_gpio_set_cfgpin(u32 pin, u32 val)
++{
++	u32 bank = GPIO_BANK(pin);
++	u32 index = GPIO_CFG_INDEX(pin);
++	u32 offset = GPIO_CFG_OFFSET(pin);
++	struct sunxi_gpio *pio = BANK_TO_GPIO(bank);
++
++	clrsetbits_le32(&pio->cfg[0] + index, 0xf << offset, val << offset);
++
++	return 0;
++}
++
++int sunxi_gpio_get_cfgpin(u32 pin)
++{
++	u32 cfg;
++	u32 bank = GPIO_BANK(pin);
++	u32 index = GPIO_CFG_INDEX(pin);
++	u32 offset = GPIO_CFG_OFFSET(pin);
++	struct sunxi_gpio *pio = BANK_TO_GPIO(bank);
++
++	cfg = readl(&pio->cfg[0] + index);
++	cfg >>= offset;
++
++	return cfg & 0xf;
++}
++
++int sunxi_gpio_set_drv(u32 pin, u32 val)
++{
++	u32 bank = GPIO_BANK(pin);
++	u32 index = GPIO_DRV_INDEX(pin);
++	u32 offset = GPIO_DRV_OFFSET(pin);
++	struct sunxi_gpio *pio = BANK_TO_GPIO(bank);
++
++	clrsetbits_le32(&pio->drv[0] + index, 0x3 << offset, val << offset);
++
++	return 0;
++}
++
++int sunxi_gpio_set_pull(u32 pin, u32 val)
++{
++	u32 bank = GPIO_BANK(pin);
++	u32 index = GPIO_PULL_INDEX(pin);
++	u32 offset = GPIO_PULL_OFFSET(pin);
++	struct sunxi_gpio *pio = BANK_TO_GPIO(bank);
++
++	clrsetbits_le32(&pio->pull[0] + index, 0x3 << offset, val << offset);
++
++	return 0;
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/postclk_init.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/postclk_init.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/postclk_init.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/postclk_init.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,20 @@
++/*
++ * (C) Copyright 2013
++ * Carl van Schaik <carl@ok-labs.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#if defined(CONFIG_SYS_SECONDARY_ON)
++#include <asm/arch/smp.h>
++#endif
++
++
++int board_postclk_init(void)
++{
++#if defined(CONFIG_SYS_SECONDARY_ON)
++	startup_secondaries();
++#endif
++	return 0;
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/prcm.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/prcm.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/prcm.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/prcm.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,35 @@
++/*
++ * Sunxi A31 Power Management Unit
++ *
++ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
++ * http://linux-sunxi.org
++ *
++ * Based on sun6i sources and earlier U-Boot Allwiner A10 SPL work
++ *
++ * (C) Copyright 2006-2013
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Berg Xing <bergxing@allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <errno.h>
++#include <asm/io.h>
++#include <asm/arch/cpu.h>
++#include <asm/arch/prcm.h>
++#include <asm/arch/sys_proto.h>
++
++/* APB0 clock gate and reset bit offsets are the same. */
++void prcm_apb0_enable(u32 flags)
++{
++	struct sunxi_prcm_reg *prcm =
++		(struct sunxi_prcm_reg *)SUNXI_PRCM_BASE;
++
++	/* open the clock for module */
++	setbits_le32(&prcm->apb0_gate, flags);
++
++	/* deassert reset for module */
++	setbits_le32(&prcm->apb0_reset, flags);
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/secondary_init.S u-boot-sunxi/arch/arm/cpu/armv7/sunxi/secondary_init.S
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/secondary_init.S	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/secondary_init.S	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,31 @@
++/*
++ * A lowlevel_init function that sets up the stack to call a C function to
++ * perform further init.
++ *
++ * (C) Copyright 2013
++ * Carl van Schaik <carl@ok-labs.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#include <asm-offsets.h>
++#include <config.h>
++#include <linux/linkage.h>
++
++ENTRY(secondary_init)
++	/* Get cpu number : r5 */
++	mrc	p15, 0, r5, c0, c0, 5
++	and	r5, r5, #0xff
++
++	/*
++	 * Setup a secondary stack, each core gets 128 bytes.
++	 */
++	ldr	sp, =secondary_stack
++	mov	r0, #0x80
++	add	sp, sp, r0, lsl r5
++
++	/*
++	 * Jump to C
++	 */
++	bl	secondary_start
++ENDPROC(secondary_init)
++
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/smp.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/smp.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/smp.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/smp.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,80 @@
++/*
++ * (C) Copyright 2013
++ * Carl van Schaik <carl@ok-labs.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/smp.h>
++#include <asm/arch/cpucfg.h>
++
++/* Right now we assume only a single secondary as in sun7i */
++#if defined(CONFIG_SUN7I)
++#define NUM_CORES 2
++#else
++#error unsupported SoC
++#endif
++
++static void secondary_pen(void)
++{
++	struct sunxi_cpucfg *cpucfg = (struct sunxi_cpucfg *)SUNXI_CPUCFG_BASE;
++
++	while (1) {
++		__asm__ __volatile__("wfe" ::: "memory");
++
++		unsigned long boot_addr = readl(&cpucfg->boot_addr);
++
++		__asm__ __volatile__(
++			"mov	r14, %0	\n"
++			"bx	r14	\n"
++			: : "r" (boot_addr)
++		);
++	};
++}
++
++u32 secondary_stack[32*(NUM_CORES-1)];
++
++void secondary_start(void)
++{
++	secondary_pen();
++}
++
++/* Power on secondaries */
++void startup_secondaries(void)
++{
++	int i;
++	struct sunxi_cpucfg *cpucfg = (struct sunxi_cpucfg *)SUNXI_CPUCFG_BASE;
++
++	writel((u32)secondary_init, &cpucfg->boot_addr);
++
++	for (i = 1; i < NUM_CORES; i++) {
++		/* Assert CPU reset just in case */
++		writel(CPU_RESET_SET, &cpucfg->cpu[i].reset_ctrl);
++		/* Ensure CPU reset also invalidates L1 caches */
++		clrbits_le32(&cpucfg->general_ctrl,
++				GENERAL_CTRL_NO_L1_RESET_CPU(i));
++		/* Lock CPU */
++		clrbits_le32(&cpucfg->debug1_ctrl, 1 << i);
++
++		/* Ramp up power to CPU1 */
++		assert(i == 1);
++		u32 j = 0xff << 1;
++		do {
++			j = j >> 1;
++			writel(j, &cpucfg->cpu1_power_clamp);
++		} while (j != 0);
++
++		udelay(10*1000); /* 10ms */
++
++		clrbits_le32(&cpucfg->cpu1_power_off, 1);
++		/* Release CPU reset */
++		writel(CPU_RESET_CLEAR, &cpucfg->cpu[i].reset_ctrl);
++
++		/* Unlock CPU */
++		setbits_le32(&cpucfg->debug1_ctrl, 1 << i);
++
++		printf("Secondary CPU%d power-on\n", i);
++	}
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/start.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/start.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/start.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/start.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1 @@
++/* Intentionally empty. Only needed to get FEL SPL link line right */
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/timer.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/timer.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/timer.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/timer.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,113 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/timer.h>
++
++DECLARE_GLOBAL_DATA_PTR;
++
++#define TIMER_MODE   (0x0 << 7)	/* continuous mode */
++#define TIMER_DIV    (0x0 << 4)	/* pre scale 1 */
++#define TIMER_SRC    (0x1 << 2)	/* osc24m */
++#define TIMER_RELOAD (0x1 << 1)	/* reload internal value */
++#define TIMER_EN     (0x1 << 0)	/* enable timer */
++
++#define TIMER_CLOCK		(24 * 1000 * 1000)
++#define COUNT_TO_USEC(x)	((x) / 24)
++#define USEC_TO_COUNT(x)	((x) * 24)
++#define TICKS_PER_HZ		(TIMER_CLOCK / CONFIG_SYS_HZ)
++#define TICKS_TO_HZ(x)		((x) / TICKS_PER_HZ)
++
++#define TIMER_LOAD_VAL		0xffffffff
++
++#define TIMER_NUM		0	/* we use timer 0 */
++
++/* read the 32-bit timer */
++static ulong read_timer(void)
++{
++	struct sunxi_timer_reg *timers =
++		(struct sunxi_timer_reg *)SUNXI_TIMER_BASE;
++	struct sunxi_timer *timer = &timers->timer[TIMER_NUM];
++
++	/*
++	 * The hardware timer counts down, therefore we invert to
++	 * produce an incrementing timer.
++	 */
++	return ~readl(&timer->val);
++}
++
++/* init timer register */
++int timer_init(void)
++{
++	struct sunxi_timer_reg *timers =
++		(struct sunxi_timer_reg *)SUNXI_TIMER_BASE;
++	struct sunxi_timer *timer = &timers->timer[TIMER_NUM];
++	writel(TIMER_LOAD_VAL, &timer->inter);
++	writel(TIMER_MODE | TIMER_DIV | TIMER_SRC | TIMER_RELOAD | TIMER_EN,
++	       &timer->ctl);
++
++	return 0;
++}
++
++/* timer without interrupts */
++ulong get_timer(ulong base)
++{
++	return get_timer_masked() - base;
++}
++
++ulong get_timer_masked(void)
++{
++	/* current tick value */
++	ulong now = TICKS_TO_HZ(read_timer());
++
++	if (now >= gd->arch.lastinc)	/* normal (non rollover) */
++		gd->arch.tbl += (now - gd->arch.lastinc);
++	else {
++		/* rollover */
++		gd->arch.tbl += (TICKS_TO_HZ(TIMER_LOAD_VAL)
++				- gd->arch.lastinc) + now;
++	}
++	gd->arch.lastinc = now;
++
++	return gd->arch.tbl;
++}
++
++/* delay x useconds */
++void __udelay(unsigned long usec)
++{
++	long tmo = USEC_TO_COUNT(usec);
++	ulong now, last = read_timer();
++
++	while (tmo > 0) {
++		now = read_timer();
++		if (now > last)	/* normal (non rollover) */
++			tmo -= now - last;
++		else		/* rollover */
++			tmo -= TIMER_LOAD_VAL - last + now;
++		last = now;
++	}
++}
++
++/*
++ * This function is derived from PowerPC code (read timebase as long long).
++ * On ARM it just returns the timer value.
++ */
++unsigned long long get_ticks(void)
++{
++	return get_timer(0);
++}
++
++/*
++ * This function is derived from PowerPC code (timebase clock frequency).
++ * On ARM it returns the number of timer ticks per second.
++ */
++ulong get_tbclk(void)
++{
++	return CONFIG_SYS_HZ;
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds u-boot-sunxi/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,77 @@
++/*
++ * (C) Copyright 2013
++ * Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
++OUTPUT_ARCH(arm)
++ENTRY(s_init)
++SECTIONS
++{
++	. = 0x00002000;
++
++	. = ALIGN(4);
++	.text :
++	{
++		*(.text.s_init)
++		*(.text*)
++	}
++
++	. = ALIGN(4);
++	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
++
++	. = ALIGN(4);
++	.data : {
++		*(.data*)
++	}
++
++	. = ALIGN(4);
++	. = .;
++
++	. = ALIGN(4);
++	.rel.dyn : {
++		__rel_dyn_start = .;
++		*(.rel*)
++		__rel_dyn_end = .;
++	}
++
++	.dynsym : {
++		__dynsym_start = .;
++		*(.dynsym)
++	}
++
++	. = ALIGN(4);
++	.note.gnu.build-id :
++	{
++		*(.note.gnu.build-id)
++	}
++	_end = .;
++
++	. = ALIGN(4096);
++	.mmutable : {
++		*(.mmutable)
++	}
++
++	.bss_start __rel_dyn_start (OVERLAY) : {
++		KEEP(*(.__bss_start));
++		__bss_base = .;
++	}
++
++	.bss __bss_base (OVERLAY) : {
++		*(.bss*)
++		. = ALIGN(4);
++		__bss_limit = .;
++	}
++
++	.bss_end __bss_limit (OVERLAY) : {
++		KEEP(*(.__bss_end));
++	}
++
++	/DISCARD/ : { *(.dynstr*) }
++	/DISCARD/ : { *(.dynamic*) }
++	/DISCARD/ : { *(.plt*) }
++	/DISCARD/ : { *(.interp*) }
++	/DISCARD/ : { *(.gnu*) }
++	/DISCARD/ : { *(.note*) }
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds u-boot-sunxi/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,52 @@
++/*
++ * (C) Copyright 2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Based on omap-common/u-boot-spl.lds:
++ *
++ * (C) Copyright 2002
++ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
++ *
++ * (C) Copyright 2010
++ * Texas Instruments, <www.ti.com>
++ *	Aneesh V <aneesh@ti.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\
++		LENGTH = CONFIG_SPL_MAX_SIZE }
++MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
++		LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
++
++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
++OUTPUT_ARCH(arm)
++ENTRY(_start)
++SECTIONS
++{
++	.text      :
++	{
++		__start = .;
++		arch/arm/cpu/armv7/start.o	(.text)
++		*(.text*)
++	} > .sram
++
++	. = ALIGN(4);
++	.rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram
++
++	. = ALIGN(4);
++	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
++
++	. = ALIGN(4);
++	__image_copy_end = .;
++	_end = .;
++
++	.bss :
++	{
++		. = ALIGN(4);
++		__bss_start = .;
++		*(.bss*)
++		. = ALIGN(4);
++		__bss_end = .;
++	} > .sdram
++}
+diff -ruN u-boot-2014.04/arch/arm/cpu/armv7/sunxi/watchdog.c u-boot-sunxi/arch/arm/cpu/armv7/sunxi/watchdog.c
+--- u-boot-2014.04/arch/arm/cpu/armv7/sunxi/watchdog.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/cpu/armv7/sunxi/watchdog.c	2014-09-06 16:58:35.317953141 +0200
+@@ -0,0 +1,83 @@
++/*
++ * Watchdog driver for the Allwinner sunxi platform.
++ * Copyright (C) 2013  Oliver Schinagl <oliver@schinagl.nl>
++ * http://www.linux-sunxi.org/
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <asm/io.h>
++#include <asm/arch/timer.h>
++#include <asm/arch/watchdog.h>
++#include <common.h>
++#include <watchdog.h>
++
++
++#define WDT_CTRL_RESTART	(0x1 << 0)
++#define WDT_CTRL_KEY		(0x0a57 << 1)
++
++#define WDT_MODE_EN		(0x1 << 0)
++#define WDT_MODE_RESET_EN	(0x1 << 1)
++#define WDT_MAX_TIMEOUT		16
++#define WDT_MODE_TIMEOUT(n) \
++	 (wdt_timeout_map[(n) < WDT_MAX_TIMEOUT ? (n) : WDT_MAX_TIMEOUT] << 3)
++
++
++/*
++ * Watchdog timeout table. The sunxi cores only use 4 bits for the watchdog as
++ * set by the table below. The gaps are filled by rounding up to the next
++ * second up.
++ */
++const unsigned int wdt_timeout_map[] = {
++	[0] = 0b0000,  /* 0.5s*/
++	[1] = 0b0001,  /* 1s  */
++	[2] = 0b0010,  /* 2s  */
++	[3] = 0b0011,  /* 3s  */
++	[4] = 0b0100,  /* 4s  */
++	[5] = 0b0101,  /* 5s  */
++	[6] = 0b0110,  /* 6s  */
++	[7] = 0b0111,  /* 8s  */
++	[8] = 0b0111,  /* 8s  */
++	[9] = 0b1000, /* 10s */
++	[10] = 0b1000, /* 10s */
++	[11] = 0b1001, /* 12s */
++	[12] = 0b1001, /* 12s */
++	[13] = 0b1010, /* 14s */
++	[14] = 0b1010, /* 14s */
++	[15] = 0b1011, /* 16s */
++	[16] = 0b1011, /* 16s */
++};
++
++
++void watchdog_reset(void)
++{
++	static const struct sunxi_wdog *wdog =
++		&((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog;
++
++	writel(WDT_CTRL_KEY | WDT_CTRL_RESTART, &wdog->ctl);
++}
++
++void watchdog_set(int timeout)
++{
++	static struct sunxi_wdog *const wdog =
++		&((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog;
++
++	/* Set timeout, reset & enable */
++	if (timeout >= 0) {
++		writel(WDT_MODE_TIMEOUT(timeout) |
++				WDT_MODE_RESET_EN | WDT_MODE_EN,
++		       &wdog->mode);
++	} else {
++		writel(0, &wdog->mode);
++	}
++	watchdog_reset();
++}
++
++void watchdog_init(void)
++{
++#ifdef CONFIG_WATCHDOG
++	watchdog_set(WDT_MAX_TIMEOUT);
++#else
++	watchdog_set(WDT_OFF); /* no timeout */
++#endif
++}
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/clock.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/clock.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/clock.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/clock.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,33 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_CLOCK_H
++#define _SUNXI_CLOCK_H
++
++#include <linux/types.h>
++
++#define CLK_GATE_OPEN			0x1
++#define CLK_GATE_CLOSE			0x0
++
++/* clock control module regs definition */
++#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I)
++#include <asm/arch/clock_sun6i.h>
++#else
++#include <asm/arch/clock_sun4i.h>
++#endif
++
++#ifndef __ASSEMBLY__
++int clock_init(void);
++int clock_twi_onoff(int port, int state);
++void clock_set_pll1(unsigned int hz);
++unsigned int clock_get_pll6(void);
++void clock_init_safe(void);
++void clock_init_uart(void);
++#endif
++
++#endif /* _SUNXI_CLOCK_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/clock_sun4i.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/clock_sun4i.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/clock_sun4i.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/clock_sun4i.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,256 @@
++/*
++ * sun4i, sun5i and sun7i clock register definitions
++ *
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_CLOCK_SUN4I_H
++#define _SUNXI_CLOCK_SUN4I_H
++
++struct sunxi_ccm_reg {
++	u32 pll1_cfg;		/* 0x00 pll1 control */
++	u32 pll1_tun;		/* 0x04 pll1 tuning */
++	u32 pll2_cfg;		/* 0x08 pll2 control */
++	u32 pll2_tun;		/* 0x0c pll2 tuning */
++	u32 pll3_cfg;		/* 0x10 pll3 control */
++	u8 res0[0x4];
++	u32 pll4_cfg;		/* 0x18 pll4 control */
++	u8 res1[0x4];
++	u32 pll5_cfg;		/* 0x20 pll5 control */
++	u32 pll5_tun;		/* 0x24 pll5 tuning */
++	u32 pll6_cfg;		/* 0x28 pll6 control */
++	u32 pll6_tun;		/* 0x2c pll6 tuning */
++	u32 pll7_cfg;		/* 0x30 pll7 control */
++	u32 pll1_tun2;		/* 0x34 pll5 tuning2 */
++	u8 res2[0x4];
++	u32 pll5_tun2;		/* 0x3c pll5 tuning2 */
++	u8 res3[0xc];
++	u32 pll_lock_dbg;	/* 0x4c pll lock time debug */
++	u32 osc24m_cfg;		/* 0x50 osc24m control */
++	u32 cpu_ahb_apb0_cfg;	/* 0x54 cpu,ahb and apb0 divide ratio */
++	u32 apb1_clk_div_cfg;	/* 0x58 apb1 clock dividor */
++	u32 axi_gate;		/* 0x5c axi module clock gating */
++	u32 ahb_gate0;		/* 0x60 ahb module clock gating 0 */
++	u32 ahb_gate1;		/* 0x64 ahb module clock gating 1 */
++	u32 apb0_gate;		/* 0x68 apb0 module clock gating */
++	u32 apb1_gate;		/* 0x6c apb1 module clock gating */
++	u8 res4[0x10];
++	u32 nand_sclk_cfg;	/* 0x80 nand sub clock control */
++	u32 ms_sclk_cfg;	/* 0x84 memory stick sub clock control */
++	u32 sd0_clk_cfg;	/* 0x88 sd0 clock control */
++	u32 sd1_clk_cfg;	/* 0x8c sd1 clock control */
++	u32 sd2_clk_cfg;	/* 0x90 sd2 clock control */
++	u32 sd3_clk_cfg;	/* 0x94 sd3 clock control */
++	u32 ts_clk_cfg;		/* 0x98 transport stream clock control */
++	u32 ss_clk_cfg;		/* 0x9c */
++	u32 spi0_clk_cfg;	/* 0xa0 */
++	u32 spi1_clk_cfg;	/* 0xa4 */
++	u32 spi2_clk_cfg;	/* 0xa8 */
++	u32 pata_clk_cfg;	/* 0xac */
++	u32 ir0_clk_cfg;	/* 0xb0 */
++	u32 ir1_clk_cfg;	/* 0xb4 */
++	u32 iis_clk_cfg;	/* 0xb8 */
++	u32 ac97_clk_cfg;	/* 0xbc */
++	u32 spdif_clk_cfg;	/* 0xc0 */
++	u32 keypad_clk_cfg;	/* 0xc4 */
++	u32 sata_clk_cfg;	/* 0xc8 */
++	u32 usb_clk_cfg;	/* 0xcc */
++	u32 gps_clk_cfg;	/* 0xd0 */
++	u32 spi3_clk_cfg;	/* 0xd4 */
++	u8 res5[0x28];
++	u32 dram_clk_cfg;	/* 0x100 */
++	u32 be0_clk_cfg;	/* 0x104 */
++	u32 be1_clk_cfg;	/* 0x108 */
++	u32 fe0_clk_cfg;	/* 0x10c */
++	u32 fe1_clk_cfg;	/* 0x110 */
++	u32 mp_clk_cfg;		/* 0x114 */
++	u32 lcd0_ch0_clk_cfg;	/* 0x118 */
++	u32 lcd1_ch0_clk_cfg;	/* 0x11c */
++	u32 csi_isp_clk_cfg;	/* 0x120 */
++	u8 res6[0x4];
++	u32 tvd_clk_reg;	/* 0x128 */
++	u32 lcd0_ch1_clk_cfg;	/* 0x12c */
++	u32 lcd1_ch1_clk_cfg;	/* 0x130 */
++	u32 csi0_clk_cfg;	/* 0x134 */
++	u32 csi1_clk_cfg;	/* 0x138 */
++	u32 ve_clk_cfg;		/* 0x13c */
++	u32 audio_codec_clk_cfg;	/* 0x140 */
++	u32 avs_clk_cfg;	/* 0x144 */
++	u32 ace_clk_cfg;	/* 0x148 */
++	u32 lvds_clk_cfg;	/* 0x14c */
++	u32 hdmi_clk_cfg;	/* 0x150 */
++	u32 mali_clk_cfg;	/* 0x154 */
++	u8 res7[0x4];
++	u32 mbus_clk_cfg;	/* 0x15c */
++	u8 res8[0x4];
++	u32 gmac_clk_cfg;	/* 0x164 */
++};
++
++/* apb1 bit field */
++#define APB1_CLK_SRC_OSC24M		(0x0 << 24)
++#define APB1_CLK_SRC_PLL6		(0x1 << 24)
++#define APB1_CLK_SRC_LOSC		(0x2 << 24)
++#define APB1_CLK_SRC_MASK		(0x3 << 24)
++#define APB1_CLK_RATE_N_1		(0x0 << 16)
++#define APB1_CLK_RATE_N_2		(0x1 << 16)
++#define APB1_CLK_RATE_N_4		(0x2 << 16)
++#define APB1_CLK_RATE_N_8		(0x3 << 16)
++#define APB1_CLK_RATE_N_MASK		(3 << 16)
++#define APB1_CLK_RATE_M(m)		(((m)-1) << 0)
++#define APB1_CLK_RATE_M_MASK            (0x1f << 0)
++
++/* apb1 gate field */
++#define APB1_GATE_UART_SHIFT	(16)
++#define APB1_GATE_UART_MASK		(0xff << APB1_GATE_UART_SHIFT)
++#define APB1_GATE_TWI_SHIFT	(0)
++#define APB1_GATE_TWI_MASK		(0xf << APB1_GATE_TWI_SHIFT)
++
++/* clock divide */
++#define AXI_DIV_SHIFT		(0)
++#define AXI_DIV_1			0
++#define AXI_DIV_2			1
++#define AXI_DIV_3			2
++#define AXI_DIV_4			3
++#define AHB_DIV_SHIFT		(4)
++#define AHB_DIV_1			0
++#define AHB_DIV_2			1
++#define AHB_DIV_4			2
++#define AHB_DIV_8			3
++#define APB0_DIV_SHIFT		(8)
++#define APB0_DIV_1			0
++#define APB0_DIV_2			1
++#define APB0_DIV_4			2
++#define APB0_DIV_8			3
++#define CPU_CLK_SRC_SHIFT	(16)
++#define CPU_CLK_SRC_OSC24M		1
++#define CPU_CLK_SRC_PLL1		2
++
++#define CCM_PLL1_CFG_ENABLE_SHIFT		31
++#define CCM_PLL1_CFG_VCO_RST_SHIFT		30
++#define CCM_PLL1_CFG_VCO_BIAS_SHIFT		26
++#define CCM_PLL1_CFG_PLL4_EXCH_SHIFT		25
++#define CCM_PLL1_CFG_BIAS_CUR_SHIFT		20
++#define CCM_PLL1_CFG_DIVP_SHIFT			16
++#define CCM_PLL1_CFG_LCK_TMR_SHIFT		13
++#define CCM_PLL1_CFG_FACTOR_N_SHIFT		8
++#define CCM_PLL1_CFG_FACTOR_K_SHIFT		4
++#define CCM_PLL1_CFG_SIG_DELT_PAT_IN_SHIFT	3
++#define CCM_PLL1_CFG_SIG_DELT_PAT_EN_SHIFT	2
++#define CCM_PLL1_CFG_FACTOR_M_SHIFT		0
++
++#define PLL1_CFG_DEFAULT	0xa1005000
++
++#define PLL6_CFG_DEFAULT	0xa1009911
++
++/* nand clock */
++#define NAND_CLK_SRC_OSC24		0
++#define NAND_CLK_DIV_N			0
++#define NAND_CLK_DIV_M			0
++
++/* gps clock */
++#define GPS_SCLK_GATING_OFF		0
++#define GPS_RESET			0
++
++/* ahb clock gate bit offset */
++#define AHB_GATE_OFFSET_GPS		26
++#define AHB_GATE_OFFSET_SATA		25
++#define AHB_GATE_OFFSET_PATA		24
++#define AHB_GATE_OFFSET_SPI3		23
++#define AHB_GATE_OFFSET_SPI2		22
++#define AHB_GATE_OFFSET_SPI1		21
++#define AHB_GATE_OFFSET_SPI0		20
++#define AHB_GATE_OFFSET_TS0		18
++#define AHB_GATE_OFFSET_EMAC		17
++#define AHB_GATE_OFFSET_ACE		16
++#define AHB_GATE_OFFSET_DLL		15
++#define AHB_GATE_OFFSET_SDRAM		14
++#define AHB_GATE_OFFSET_NAND		13
++#define AHB_GATE_OFFSET_MS		12
++#define AHB_GATE_OFFSET_MMC3		11
++#define AHB_GATE_OFFSET_MMC2		10
++#define AHB_GATE_OFFSET_MMC1		9
++#define AHB_GATE_OFFSET_MMC0		8
++#define AHB_GATE_OFFSET_MMC(n)		(AHB_GATE_OFFSET_MMC0 + (n))
++#define AHB_GATE_OFFSET_BIST		7
++#define AHB_GATE_OFFSET_DMA		6
++#define AHB_GATE_OFFSET_SS		5
++#define AHB_GATE_OFFSET_USB_OHCI1	4
++#define AHB_GATE_OFFSET_USB_EHCI1	3
++#define AHB_GATE_OFFSET_USB_OHCI0	2
++#define AHB_GATE_OFFSET_USB_EHCI0	1
++#define AHB_GATE_OFFSET_USB		0
++
++/* ahb clock gate bit offset (second register) */
++#define AHB_GATE_OFFSET_GMAC		17
++
++#define CCM_AHB_GATE_GPS (0x1 << 26)
++#define CCM_AHB_GATE_SDRAM (0x1 << 14)
++#define CCM_AHB_GATE_DLL (0x1 << 15)
++#define CCM_AHB_GATE_ACE (0x1 << 16)
++
++#define CCM_PLL5_CTRL_M(n) (((n) & 0x3) << 0)
++#define CCM_PLL5_CTRL_M_MASK CCM_PLL5_CTRL_M(0x3)
++#define CCM_PLL5_CTRL_M_X(n) ((n) - 1)
++#define CCM_PLL5_CTRL_M1(n) (((n) & 0x3) << 2)
++#define CCM_PLL5_CTRL_M1_MASK CCM_PLL5_CTRL_M1(0x3)
++#define CCM_PLL5_CTRL_M1_X(n) ((n) - 1)
++#define CCM_PLL5_CTRL_K(n) (((n) & 0x3) << 4)
++#define CCM_PLL5_CTRL_K_MASK CCM_PLL5_CTRL_K(0x3)
++#define CCM_PLL5_CTRL_K_X(n) ((n) - 1)
++#define CCM_PLL5_CTRL_LDO (0x1 << 7)
++#define CCM_PLL5_CTRL_N(n) (((n) & 0x1f) << 8)
++#define CCM_PLL5_CTRL_N_MASK CCM_PLL5_CTRL_N(0x1f)
++#define CCM_PLL5_CTRL_N_X(n) (n)
++#define CCM_PLL5_CTRL_P(n) (((n) & 0x3) << 16)
++#define CCM_PLL5_CTRL_P_MASK CCM_PLL5_CTRL_P(0x3)
++#define CCM_PLL5_CTRL_P_X(n) ((n) - 1)
++#define CCM_PLL5_CTRL_BW (0x1 << 18)
++#define CCM_PLL5_CTRL_VCO_GAIN (0x1 << 19)
++#define CCM_PLL5_CTRL_BIAS(n) (((n) & 0x1f) << 20)
++#define CCM_PLL5_CTRL_BIAS_MASK CCM_PLL5_CTRL_BIAS(0x1f)
++#define CCM_PLL5_CTRL_BIAS_X(n) ((n) - 1)
++#define CCM_PLL5_CTRL_VCO_BIAS (0x1 << 25)
++#define CCM_PLL5_CTRL_DDR_CLK (0x1 << 29)
++#define CCM_PLL5_CTRL_BYPASS (0x1 << 30)
++#define CCM_PLL5_CTRL_EN (0x1 << 31)
++
++#define CCM_PLL6_CTRL_N_SHIFT	8
++#define CCM_PLL6_CTRL_N_MASK	(0x1f << CCM_PLL6_CTRL_N_SHIFT)
++#define CCM_PLL6_CTRL_K_SHIFT	4
++#define CCM_PLL6_CTRL_K_MASK	(0x3 << CCM_PLL6_CTRL_K_SHIFT)
++
++#define CCM_GPS_CTRL_RESET (0x1 << 0)
++#define CCM_GPS_CTRL_GATE (0x1 << 1)
++
++#define CCM_DRAM_CTRL_DCLK_OUT (0x1 << 15)
++
++#define CCM_MBUS_CTRL_M(n) (((n) & 0xf) << 0)
++#define CCM_MBUS_CTRL_M_MASK CCM_MBUS_CTRL_M(0xf)
++#define CCM_MBUS_CTRL_M_X(n) ((n) - 1)
++#define CCM_MBUS_CTRL_N(n) (((n) & 0xf) << 16)
++#define CCM_MBUS_CTRL_N_MASK CCM_MBUS_CTRL_N(0xf)
++#define CCM_MBUS_CTRL_N_X(n) (((n) >> 3) ? 3 : (((n) >> 2) ? 2 : (((n) >> 1) ? 1 : 0)))
++#define CCM_MBUS_CTRL_CLK_SRC(n) (((n) & 0x3) << 24)
++#define CCM_MBUS_CTRL_CLK_SRC_MASK CCM_MBUS_CTRL_CLK_SRC(0x3)
++#define CCM_MBUS_CTRL_CLK_SRC_HOSC 0x0
++#define CCM_MBUS_CTRL_CLK_SRC_PLL6 0x1
++#define CCM_MBUS_CTRL_CLK_SRC_PLL5 0x2
++#define CCM_MBUS_CTRL_GATE (0x1 << 31)
++
++#define CCM_MMC_CTRL_OSCM24 (0x0 << 24)
++#define CCM_MMC_CTRL_PLL6   (0x1 << 24)
++#define CCM_MMC_CTRL_PLL5   (0x2 << 24)
++
++#define CCM_MMC_CTRL_ENABLE (0x1 << 31)
++
++#define CCM_GMAC_CTRL_TX_CLK_SRC_MII 0x0
++#define CCM_GMAC_CTRL_TX_CLK_SRC_EXT_RGMII 0x1
++#define CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII 0x2
++#define CCM_GMAC_CTRL_GPIT_MII (0x0 << 2)
++#define CCM_GMAC_CTRL_GPIT_RGMII (0x1 << 2)
++
++#endif /* _SUNXI_CLOCK_SUN4I_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/clock_sun6i.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/clock_sun6i.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/clock_sun6i.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,205 @@
++/*
++ * sun6i clock register definitions
++ *
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_CLOCK_SUN6I_H
++#define _SUNXI_CLOCK_SUN6I_H
++
++struct sunxi_ccm_reg {
++	u32 pll1_cfg;		/* 0x00 pll1 control */
++	u32 reserved0;
++	u32 pll2_cfg;		/* 0x08 pll2 control */
++	u32 reserved1;
++	u32 pll3_cfg;		/* 0x10 pll3 control */
++	u32 reserved2;
++	u32 pll4_cfg;		/* 0x18 pll4 control */
++	u32 reserved3;
++	u32 pll5_cfg;		/* 0x20 pll5 control */
++	u32 reserved4;
++	u32 pll6_cfg;		/* 0x28 pll6 control */
++	u32 reserved5;
++	u32 pll7_cfg;		/* 0x30 pll7 control */
++	u32 reserved6;
++	u32 pll8_cfg;		/* 0x38 pll8 control */
++	u32 reserved7;
++	u32 mipi_pll_cfg;	/* 0x40 MIPI pll control */
++	u32 pll9_cfg;		/* 0x44 pll9 control */
++	u32 pll10_cfg;		/* 0x48 pll10 control */
++	u32 reserved8;
++	u32 cpu_axi_cfg;	/* 0x50 CPU/AXI divide ratio */
++	u32 ahb1_apb1_div;	/* 0x54 AHB1/APB1 divide ratio */
++	u32 apb2_div;		/* 0x58 APB2 divide ratio */
++	u32 axi_gate;		/* 0x5c axi module clock gating */
++	u32 ahb_gate0;		/* 0x60 ahb module clock gating 0 */
++	u32 ahb_gate1;		/* 0x64 ahb module clock gating 1 */
++	u32 apb1_gate;		/* 0x68 apb1 module clock gating */
++	u32 apb2_gate;		/* 0x6c apb2 module clock gating */
++	u32 reserved9[4];
++	u32 nand0_clk_cfg;	/* 0x80 nand0 clock control */
++	u32 nand1_clk_cfg;	/* 0x84 nand1 clock control */
++	u32 sd0_clk_cfg;	/* 0x88 sd0 clock control */
++	u32 sd1_clk_cfg;	/* 0x8c sd1 clock control */
++	u32 sd2_clk_cfg;	/* 0x90 sd2 clock control */
++	u32 sd3_clk_cfg;	/* 0x94 sd3 clock control */
++	u32 ts_clk_cfg;		/* 0x98 transport stream clock control */
++	u32 ss_clk_cfg;		/* 0x9c security system clock control */
++	u32 spi0_clk_cfg;	/* 0xa0 spi0 clock control */
++	u32 spi1_clk_cfg;	/* 0xa4 spi1 clock control */
++	u32 spi2_clk_cfg;	/* 0xa8 spi2 clock control */
++	u32 spi3_clk_cfg;	/* 0xac spi3 clock control */
++	u32 i2s0_clk_cfg;	/* 0xb0 I2S0 clock control*/
++	u32 i2s1_clk_cfg;	/* 0xb4 I2S1 clock control */
++	u32 reserved10[2];
++	u32 spdif_clk_cfg;	/* 0xc0 SPDIF clock control */
++	u32 reserved11[2];
++	u32 usb_clk_cfg;	/* 0xcc USB clock control */
++	u32 gmac_clk_cfg;	/* 0xd0 GMAC clock control */
++	u32 reserved12[7];
++	u32 mdfs_clk_cfg;	/* 0xf0 MDFS clock control */
++	u32 dram_clk_cfg;	/* 0xf4 DRAM configuration clock control */
++	u32 reserved13[2];
++	u32 dram_clk_gate;	/* 0x100 DRAM module gating */
++	u32 be0_clk_cfg;	/* 0x104 BE0 module clock */
++	u32 be1_clk_cfg;	/* 0x108 BE1 module clock */
++	u32 fe0_clk_cfg;	/* 0x10c FE0 module clock */
++	u32 fe1_clk_cfg;	/* 0x110 FE1 module clock */
++	u32 mp_clk_cfg;		/* 0x114 MP module clock */
++	u32 lcd0_ch0_clk_cfg;	/* 0x118 LCD0 CH0 module clock */
++	u32 lcd1_ch0_clk_cfg;	/* 0x11c LCD1 CH0 module clock */
++	u32 reserved14[3];
++	u32 lcd0_ch1_clk_cfg;	/* 0x12c LCD0 CH1 module clock */
++	u32 lcd1_ch1_clk_cfg;	/* 0x130 LCD1 CH1 module clock */
++	u32 csi0_clk_cfg;	/* 0x134 CSI0 module clock */
++	u32 csi1_clk_cfg;	/* 0x138 CSI1 module clock */
++	u32 ve_clk_cfg;		/* 0x13c VE module clock */
++	u32 adda_clk_cfg;	/* 0x140 ADDA module clock */
++	u32 avs_clk_cfg;	/* 0x144 AVS module clock */
++	u32 dmic_clk_cfg;	/* 0x148 Digital Mic module clock*/
++	u32 reserved15;
++	u32 hdmi_clk_cfg;	/* 0x150 HDMI module clock */
++	u32 ps_clk_cfg;		/* 0x154 PS module clock */
++	u32 mtc_clk_cfg;	/* 0x158 MTC module clock */
++	u32 mbus0_clk_cfg;	/* 0x15c MBUS0 module clock */
++	u32 mbus1_clk_cfg;	/* 0x160 MBUS1 module clock */
++	u32 reserved16;
++	u32 mipi_dsi_clk_cfg;	/* 0x168 MIPI DSI clock control */
++	u32 mipi_csi_clk_cfg;	/* 0x16c MIPI CSI clock control */
++	u32 reserved17[4];
++	u32 iep_drc0_clk_cfg;	/* 0x180 IEP DRC0 module clock */
++	u32 iep_drc1_clk_cfg;	/* 0x184 IEP DRC1 module clock */
++	u32 iep_deu0_clk_cfg;	/* 0x188 IEP DEU0 module clock */
++	u32 iep_deu1_clk_cfg;	/* 0x18c IEP DEU1 module clock */
++	u32 reserved18[4];
++	u32 gpu_core_clk_cfg;	/* 0x1a0 GPU core clock config */
++	u32 gpu_mem_clk_cfg;	/* 0x1a4 GPU memory clock config */
++	u32 gpu_hyd_clk_cfg;	/* 0x1a0 GPU HYD clock config */
++	u32 reserved19[21];
++	u32 pll_lock;		/* 0x200 PLL Lock Time */
++	u32 pll1_lock;		/* 0x204 PLL1 Lock Time */
++	u32 reserved20[6];
++	u32 pll1_bias_cfg;	/* 0x220 PLL1 Bias config */
++	u32 pll2_bias_cfg;	/* 0x224 PLL2 Bias config */
++	u32 pll3_bias_cfg;	/* 0x228 PLL3 Bias config */
++	u32 pll4_bias_cfg;	/* 0x22c PLL4 Bias config */
++	u32 pll5_bias_cfg;	/* 0x230 PLL5 Bias config */
++	u32 pll6_bias_cfg;	/* 0x234 PLL6 Bias config */
++	u32 pll7_bias_cfg;	/* 0x238 PLL7 Bias config */
++	u32 pll8_bias_cfg;	/* 0x23c PLL8 Bias config */
++	u32 mipi_bias_cfg;	/* 0x240 MIPI Bias config */
++	u32 pll9_bias_cfg;	/* 0x244 PLL9 Bias config */
++	u32 pll10_bias_cfg;	/* 0x248 PLL10 Bias config */
++	u32 reserved21[13];
++	u32 pll1_pattern_cfg;	/* 0x280 PLL1 Pattern config */
++	u32 pll2_pattern_cfg;	/* 0x284 PLL2 Pattern config */
++	u32 pll3_pattern_cfg;	/* 0x288 PLL3 Pattern config */
++	u32 pll4_pattern_cfg;	/* 0x28c PLL4 Pattern config */
++	u32 pll5_pattern_cfg;	/* 0x290 PLL5 Pattern config */
++	u32 pll6_pattern_cfg;	/* 0x294 PLL6 Pattern config */
++	u32 pll7_pattern_cfg;	/* 0x298 PLL7 Pattern config */
++	u32 pll8_pattern_cfg;	/* 0x29c PLL8 Pattern config */
++	u32 mipi_pattern_cfg;	/* 0x2a0 MIPI Pattern config */
++	u32 pll9_pattern_cfg;	/* 0x2a4 PLL9 Pattern config */
++	u32 pll10_pattern_cfg;	/* 0x2a8 PLL10 Pattern config */
++	u32 reserved22[5];
++	u32 ahb_reset0_cfg;	/* 0x2c0 AHB1 Reset 0 config */
++	u32 ahb_reset1_cfg;	/* 0x2c4 AHB1 Reset 1 config */
++	u32 ahb_reset2_cfg;	/* 0x2c8 AHB1 Reset 2 config */
++	u32 reserved23;
++	u32 apb1_reset_cfg;	/* 0x2d0 APB1 Reset config */
++	u32 reserved24;
++	u32 apb2_reset_cfg;	/* 0x2d8 APB2 Reset config */
++};
++
++/* apb2 bit field */
++#define APB2_CLK_SRC_LOSC		(0x0 << 24)
++#define APB2_CLK_SRC_OSC24M		(0x1 << 24)
++#define APB2_CLK_SRC_PLL6		(0x2 << 24)
++#define APB2_CLK_SRC_MASK		(0x3 << 24)
++#define APB2_CLK_RATE_N_1		(0x0 << 16)
++#define APB2_CLK_RATE_N_2		(0x1 << 16)
++#define APB2_CLK_RATE_N_4		(0x2 << 16)
++#define APB2_CLK_RATE_N_8		(0x3 << 16)
++#define APB2_CLK_RATE_N_MASK		(3 << 16)
++#define APB2_CLK_RATE_M(m)		(((m)-1) << 0)
++#define APB2_CLK_RATE_M_MASK            (0x1f << 0)
++
++/* apb2 gate field */
++#define APB2_GATE_UART_SHIFT	(16)
++#define APB2_GATE_UART_MASK		(0xff << APB2_GATE_UART_SHIFT)
++#define APB2_GATE_TWI_SHIFT	(0)
++#define APB2_GATE_TWI_MASK		(0xf << APB2_GATE_TWI_SHIFT)
++
++/* cpu_axi_cfg bits */
++#define AXI_DIV_SHIFT			0
++#define ATB_DIV_SHIFT			8
++#define CPU_CLK_SRC_SHIFT		16
++
++#define AXI_DIV_1			0
++#define AXI_DIV_2			1
++#define AXI_DIV_3			2
++#define AXI_DIV_4			3
++#define ATB_DIV_1			0
++#define ATB_DIV_2			1
++#define ATB_DIV_4			2
++#define CPU_CLK_SRC_OSC24M		1
++#define CPU_CLK_SRC_PLL1		2
++
++#define PLL1_CFG_DEFAULT		0x90011b21
++
++#define PLL6_CFG_DEFAULT		0x90041811
++
++#define CCM_PLL6_CTRL_N_SHIFT		8
++#define CCM_PLL6_CTRL_N_MASK		(0x1f << CCM_PLL6_CTRL_N_SHIFT)
++#define CCM_PLL6_CTRL_K_SHIFT		4
++#define CCM_PLL6_CTRL_K_MASK		(0x3 << CCM_PLL6_CTRL_K_SHIFT)
++
++#define AHB_GATE_OFFSET_MMC3		11
++#define AHB_GATE_OFFSET_MMC2		10
++#define AHB_GATE_OFFSET_MMC1		9
++#define AHB_GATE_OFFSET_MMC0		8
++#define AHB_GATE_OFFSET_MMC(n)		(AHB_GATE_OFFSET_MMC0 + (n))
++
++#define CCM_MMC_CTRL_OSCM24 (0x0 << 24)
++#define CCM_MMC_CTRL_PLL6   (0x1 << 24)
++
++#define CCM_MMC_CTRL_ENABLE (0x1 << 31)
++
++#define AHB_RESET_OFFSET_MMC3		11
++#define AHB_RESET_OFFSET_MMC2		10
++#define AHB_RESET_OFFSET_MMC1		9
++#define AHB_RESET_OFFSET_MMC0		8
++#define AHB_RESET_OFFSET_MMC(n)		(AHB_RESET_OFFSET_MMC0 + (n))
++
++/* apb2 reset */
++#define APB2_RESET_UART_SHIFT		(16)
++#define APB2_RESET_UART_MASK		(0xff << APB2_RESET_UART_SHIFT)
++#define APB2_RESET_TWI_SHIFT		(0)
++#define APB2_RESET_TWI_MASK		(0xf << APB2_RESET_TWI_SHIFT)
++
++#endif /* _SUNXI_CLOCK_SUN6I_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/cpucfg.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/cpucfg.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/cpucfg.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/cpucfg.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,55 @@
++/*
++ * (C) Copyright 2013
++ * Carl van Schaik <carl@ok-labs.com>
++ *
++ * CPU configuration registers for the sun7i (A20).
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_CPUCFG_H_
++#define _SUNXI_CPUCFG_H_
++
++#ifndef __ASSEMBLY__
++
++struct sunxi_cpu_ctrl {
++	u32 reset_ctrl;
++	u32 cpu_ctrl;
++	u32 status;
++	u32 _res[13];
++};
++
++#define CPU_RESET_SET	0
++#define CPU_RESET_CLEAR	3
++
++#define CPU_STATUS_SMP	(1 << 0)
++#define CPU_STATUS_WFE	(1 << 1)
++#define CPU_STATUS_WFI	(1 << 2)
++
++struct sunxi_cpucfg {
++	u32 _res1[16];			/* 0x000 */
++	struct sunxi_cpu_ctrl cpu[2];	/* 0x040 */
++	u32 _res2[48];			/* 0x0c0 */
++	u32 _res3;			/* 0x180 */
++	u32 general_ctrl;		/* 0x184 */
++	u32 _res4[2];			/* 0x188 */
++	u32 event_input;		/* 0x190 */
++	u32 _res5[4];			/* 0x194 */
++	u32 boot_addr;			/* 0x1a4 - also known as PRIVATE_REG */
++	u32 _res6[2];			/* 0x1a8 */
++	u32 cpu1_power_clamp;		/* 0x1b0 */
++	u32 cpu1_power_off;		/* 0x1b4 */
++	u32 _res7[10];			/* 0x1b8 */
++	u32 debug0_ctrl;		/* 0x1e0 */
++	u32 debug1_ctrl;		/* 0x1e4 */
++};
++
++#define GENERAL_CTRL_NO_L1_RESET_CPU(x)	(1UL << (x))
++#define GENERAL_CTRL_NO_L2_AUTO_RESET	(1UL << 4)
++#define GENERAL_CTRL_L2_RESET_SET	(0UL << 5)
++#define GENERAL_CTRL_L2_RESET_CLEAR	(1UL << 5)
++#define GENERAL_CTRL_CFGSDISABLE	(1UL << 8)
++
++#endif /* __ASSEMBLY__ */
++
++#endif /* _SUNXI_CPUCFG_H_ */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/cpu.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/cpu.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/cpu.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/cpu.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,141 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_CPU_H
++#define _SUNXI_CPU_H
++
++#define SUNXI_SRAM_A1_BASE		0x00000000
++#define SUNXI_SRAM_A1_SIZE		(16 * 1024)	/* 16 kiB */
++
++#define SUNXI_SRAM_A2_BASE		0x00004000	/* 16 kiB */
++#define SUNXI_SRAM_A3_BASE		0x00008000	/* 13 kiB */
++#define SUNXI_SRAM_A4_BASE		0x0000b400	/* 3 kiB */
++#define SUNXI_SRAM_D_BASE		0x00010000	/* 4 kiB */
++#define SUNXI_SRAM_B_BASE		0x00020000	/* 64 kiB (secure) */
++
++#define SUNXI_SRAMC_BASE		0x01c00000
++#define SUNXI_DRAMC_BASE		0x01c01000
++#define SUNXI_DMA_BASE			0x01c02000
++#define SUNXI_NFC_BASE			0x01c03000
++#define SUNXI_TS_BASE			0x01c04000
++#define SUNXI_SPI0_BASE			0x01c05000
++#define SUNXI_SPI1_BASE			0x01c06000
++#define SUNXI_MS_BASE			0x01c07000
++#define SUNXI_TVD_BASE			0x01c08000
++#define SUNXI_CSI0_BASE			0x01c09000
++#define SUNXI_TVE0_BASE			0x01c0a000
++#define SUNXI_EMAC_BASE			0x01c0b000
++#define SUNXI_LCD0_BASE			0x01c0C000
++#define SUNXI_LCD1_BASE			0x01c0d000
++#define SUNXI_VE_BASE			0x01c0e000
++#define SUNXI_MMC0_BASE			0x01c0f000
++#define SUNXI_MMC1_BASE			0x01c10000
++#define SUNXI_MMC2_BASE			0x01c11000
++#define SUNXI_MMC3_BASE			0x01c12000
++#define SUNXI_USB0_BASE			0x01c13000
++#define SUNXI_USB1_BASE			0x01c14000
++#define SUNXI_SS_BASE			0x01c15000
++#define SUNXI_HDMI_BASE			0x01c16000
++#define SUNXI_SPI2_BASE			0x01c17000
++#define SUNXI_SATA_BASE			0x01c18000
++#define SUNXI_PATA_BASE			0x01c19000
++#define SUNXI_ACE_BASE			0x01c1a000
++#define SUNXI_TVE1_BASE			0x01c1b000
++#define SUNXI_USB2_BASE			0x01c1c000
++#define SUNXI_CSI1_BASE			0x01c1d000
++#define SUNXI_TZASC_BASE		0x01c1e000
++#define SUNXI_SPI3_BASE			0x01c1f000
++
++#define SUNXI_CCM_BASE			0x01c20000
++#define SUNXI_INTC_BASE			0x01c20400
++#define SUNXI_PIO_BASE			0x01c20800
++#define SUNXI_TIMER_BASE		0x01c20c00
++#define SUNXI_SPDIF_BASE		0x01c21000
++#define SUNXI_AC97_BASE			0x01c21400
++#define SUNXI_IR0_BASE			0x01c21800
++#define SUNXI_IR1_BASE			0x01c21c00
++
++#define SUNXI_IIS_BASE			0x01c22400
++#define SUNXI_LRADC_BASE		0x01c22800
++#define SUNXI_AD_DA_BASE		0x01c22c00
++#define SUNXI_KEYPAD_BASE		0x01c23000
++#define SUNXI_TZPC_BASE			0x01c23400
++#define SUNXI_SID_BASE			0x01c23800
++#define SUNXI_SJTAG_BASE		0x01c23c00
++
++#define SUNXI_TP_BASE			0x01c25000
++#define SUNXI_PMU_BASE			0x01c25400
++#define SUNXI_CPUCFG_BASE		0x01c25c00	/* sun7i only ? */
++
++#define SUNXI_UART0_BASE		0x01c28000
++#define SUNXI_UART1_BASE		0x01c28400
++#define SUNXI_UART2_BASE		0x01c28800
++#define SUNXI_UART3_BASE		0x01c28c00
++#define SUNXI_UART4_BASE		0x01c29000
++#define SUNXI_UART5_BASE		0x01c29400
++#define SUNXI_UART6_BASE		0x01c29800
++#define SUNXI_UART7_BASE		0x01c29c00
++#define SUNXI_PS2_0_BASE		0x01c2a000
++#define SUNXI_PS2_1_BASE		0x01c2a400
++
++#define SUNXI_TWI0_BASE			0x01c2ac00
++#define SUNXI_TWI1_BASE			0x01c2b000
++#define SUNXI_TWI2_BASE			0x01c2b400
++
++#define SUNXI_CAN_BASE			0x01c2bc00
++
++#define SUNXI_SCR_BASE			0x01c2c400
++
++#define SUNXI_GPS_BASE			0x01c30000
++#define SUNXI_MALI400_BASE		0x01c40000
++#define SUNXI_GMAC_BASE			0x01c50000
++
++#define SUNXI_DRAM_COM_BASE		0x01c62000
++#define SUNXI_DRAM_CTL_BASE		0x01c63000
++#define SUNXI_DRAM_PHY_CH1_BASE		0x01c65000
++#define SUNXI_DRAM_PHY_CH2_BASE		0x01c66000
++
++/* module sram */
++#define SUNXI_SRAM_C_BASE		0x01d00000
++
++#define SUNXI_DE_FE0_BASE		0x01e00000
++#define SUNXI_DE_FE1_BASE		0x01e20000
++#define SUNXI_DE_BE0_BASE		0x01e60000
++#define SUNXI_DE_BE1_BASE		0x01e40000
++#define SUNXI_MP_BASE			0x01e80000
++#define SUNXI_AVG_BASE			0x01ea0000
++
++#define SUNXI_PRCM_BASE			0x01f01400
++#define SUNXI_R_UART_BASE		0x01f02800
++#define SUNXI_R_PIO_BASE		0x01f02c00
++#define SUNXI_P2WI_BASE			0x01f03400
++
++/* CoreSight Debug Module */
++#define SUNXI_CSDM_BASE			0x3f500000
++
++#define SUNXI_DDRII_DDRIII_BASE		0x40000000	/* 2 GiB */
++
++#define SUNXI_BROM_BASE			0xffff0000	/* 32 kiB */
++
++#define SUNXI_CPU_CFG			(SUNXI_TIMER_BASE + 0x13c)
++
++#ifndef __ASSEMBLY__
++/* boot type */
++enum sunxi_boot_type_t {
++	SUNXI_BOOT_TYPE_NULL,
++	SUNXI_BOOT_TYPE_MMC0,
++	SUNXI_BOOT_TYPE_NAND,
++	SUNXI_BOOT_TYPE_MMC2,
++	SUNXI_BOOT_TYPE_SPI
++};
++
++void sunxi_board_init(void);
++void sunxi_reset(void);
++#endif /* __ASSEMBLY__ */
++
++#endif /* _CPU_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/dram.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/dram.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/dram.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/dram.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,179 @@
++/*
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Berg Xing <bergxing@allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Sunxi platform dram register definition.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_DRAM_H
++#define _SUNXI_DRAM_H
++
++#include <linux/types.h>
++
++struct sunxi_dram_reg {
++	u32 ccr;		/* 0x00 controller configuration register */
++	u32 dcr;		/* 0x04 dram configuration register */
++	u32 iocr;		/* 0x08 i/o configuration register */
++	u32 csr;		/* 0x0c controller status register */
++	u32 drr;		/* 0x10 dram refresh register */
++	u32 tpr0;		/* 0x14 dram timing parameters register 0 */
++	u32 tpr1;		/* 0x18 dram timing parameters register 1 */
++	u32 tpr2;		/* 0x1c dram timing parameters register 2 */
++	u32 gdllcr;		/* 0x20 global dll control register */
++	u8 res0[0x28];
++	u32 rslr0;		/* 0x4c rank system latency register */
++	u32 rslr1;		/* 0x50 rank system latency register */
++	u8 res1[0x8];
++	u32 rdgr0;		/* 0x5c rank dqs gating register */
++	u32 rdgr1;		/* 0x60 rank dqs gating register */
++	u8 res2[0x34];
++	u32 odtcr;		/* 0x98 odt configuration register */
++	u32 dtr0;		/* 0x9c data training register 0 */
++	u32 dtr1;		/* 0xa0 data training register 1 */
++	u32 dtar;		/* 0xa4 data training address register */
++	u32 zqcr0;		/* 0xa8 zq control register 0 */
++	u32 zqcr1;		/* 0xac zq control register 1 */
++	u32 zqsr;		/* 0xb0 zq status register */
++	u32 idcr;		/* 0xb4 initializaton delay configure reg */
++	u8 res3[0x138];
++	u32 mr;			/* 0x1f0 mode register */
++	u32 emr;		/* 0x1f4 extended mode register */
++	u32 emr2;		/* 0x1f8 extended mode register */
++	u32 emr3;		/* 0x1fc extended mode register */
++	u32 dllctr;		/* 0x200 dll control register */
++	u32 dllcr[5];		/* 0x204 dll control register 0(byte 0) */
++	/* 0x208 dll control register 1(byte 1) */
++	/* 0x20c dll control register 2(byte 2) */
++	/* 0x210 dll control register 3(byte 3) */
++	/* 0x214 dll control register 4(byte 4) */
++	u32 dqtr0;		/* 0x218 dq timing register */
++	u32 dqtr1;		/* 0x21c dq timing register */
++	u32 dqtr2;		/* 0x220 dq timing register */
++	u32 dqtr3;		/* 0x224 dq timing register */
++	u32 dqstr;		/* 0x228 dqs timing register */
++	u32 dqsbtr;		/* 0x22c dqsb timing register */
++	u32 mcr;		/* 0x230 mode configure register */
++	u8 res[0x8];
++	u32 ppwrsctl;		/* 0x23c pad power save control */
++	u32 apr;		/* 0x240 arbiter period register */
++	u32 pldtr;		/* 0x244 priority level data threshold reg */
++	u8 res5[0x8];
++	u32 hpcr[32];		/* 0x250 host port configure register */
++	u8 res6[0x10];
++	u32 csel;		/* 0x2e0 controller select register */
++};
++
++struct dram_para {
++	u32 clock;
++	u32 type;
++	u32 rank_num;
++	u32 density;
++	u32 io_width;
++	u32 bus_width;
++	u32 cas;
++	u32 zq;
++	u32 odt_en;
++	u32 size;
++	u32 tpr0;
++	u32 tpr1;
++	u32 tpr2;
++	u32 tpr3;
++	u32 tpr4;
++	u32 tpr5;
++	u32 emr1;
++	u32 emr2;
++	u32 emr3;
++};
++
++#define DRAM_CCR_COMMAND_RATE_1T (0x1 << 5)
++#define DRAM_CCR_DQS_GATE (0x1 << 14)
++#define DRAM_CCR_DQS_DRIFT_COMP (0x1 << 17)
++#define DRAM_CCR_ITM_OFF (0x1 << 28)
++#define DRAM_CCR_DATA_TRAINING (0x1 << 30)
++#define DRAM_CCR_INIT (0x1 << 31)
++
++#define DRAM_MEMORY_TYPE_DDR1 1
++#define DRAM_MEMORY_TYPE_DDR2 2
++#define DRAM_MEMORY_TYPE_DDR3 3
++#define DRAM_MEMORY_TYPE_LPDDR2 4
++#define DRAM_MEMORY_TYPE_LPDDR 5
++#define DRAM_DCR_TYPE (0x1 << 0)
++#define DRAM_DCR_TYPE_DDR2 0x0
++#define DRAM_DCR_TYPE_DDR3 0x1
++#define DRAM_DCR_IO_WIDTH(n) (((n) & 0x3) << 1)
++#define DRAM_DCR_IO_WIDTH_MASK DRAM_DCR_IO_WIDTH(0x3)
++#define DRAM_DCR_IO_WIDTH_8BIT 0x0
++#define DRAM_DCR_IO_WIDTH_16BIT 0x1
++#define DRAM_DCR_CHIP_DENSITY(n) (((n) & 0x7) << 3)
++#define DRAM_DCR_CHIP_DENSITY_MASK DRAM_DCR_CHIP_DENSITY(0x7)
++#define DRAM_DCR_CHIP_DENSITY_256M 0x0
++#define DRAM_DCR_CHIP_DENSITY_512M 0x1
++#define DRAM_DCR_CHIP_DENSITY_1024M 0x2
++#define DRAM_DCR_CHIP_DENSITY_2048M 0x3
++#define DRAM_DCR_CHIP_DENSITY_4096M 0x4
++#define DRAM_DCR_CHIP_DENSITY_8192M 0x5
++#define DRAM_DCR_BUS_WIDTH(n) (((n) & 0x7) << 6)
++#define DRAM_DCR_BUS_WIDTH_MASK DRAM_DCR_BUS_WIDTH(0x7)
++#define DRAM_DCR_BUS_WIDTH_32BIT 0x3
++#define DRAM_DCR_BUS_WIDTH_16BIT 0x1
++#define DRAM_DCR_BUS_WIDTH_8BIT 0x0
++#define DRAM_DCR_NR_DLLCR_32BIT 5
++#define DRAM_DCR_NR_DLLCR_16BIT 3
++#define DRAM_DCR_NR_DLLCR_8BIT 2
++#define DRAM_DCR_RANK_SEL(n) (((n) & 0x3) << 10)
++#define DRAM_DCR_RANK_SEL_MASK DRAM_DCR_CMD_RANK(0x3)
++#define DRAM_DCR_CMD_RANK_ALL (0x1 << 12)
++#define DRAM_DCR_MODE(n) (((n) & 0x3) << 13)
++#define DRAM_DCR_MODE_MASK DRAM_DCR_MODE(0x3)
++#define DRAM_DCR_MODE_SEQ 0x0
++#define DRAM_DCR_MODE_INTERLEAVE 0x1
++
++#define DRAM_CSR_FAILED (0x1 << 20)
++
++#define DRAM_DRR_TRFC(n) ((n) & 0xff)
++#define DRAM_DRR_TREFI(n) (((n) & 0xffff) << 8)
++#define DRAM_DRR_BURST(n) ((((n) - 1) & 0xf) << 24)
++
++#define DRAM_MCR_MODE_NORM(n) (((n) & 0x3) << 0)
++#define DRAM_MCR_MODE_NORM_MASK DRAM_MCR_MOD_NORM(0x3)
++#define DRAM_MCR_MODE_DQ_OUT(n) (((n) & 0x3) << 2)
++#define DRAM_MCR_MODE_DQ_OUT_MASK DRAM_MCR_MODE_DQ_OUT(0x3)
++#define DRAM_MCR_MODE_ADDR_OUT(n) (((n) & 0x3) << 4)
++#define DRAM_MCR_MODE_ADDR_OUT_MASK DRAM_MCR_MODE_ADDR_OUT(0x3)
++#define DRAM_MCR_MODE_DQ_IN_OUT(n) (((n) & 0x3) << 6)
++#define DRAM_MCR_MODE_DQ_IN_OUT_MASK DRAM_MCR_MODE_DQ_IN_OUT(0x3)
++#define DRAM_MCR_MODE_DQ_TURNON_DELAY(n) (((n) & 0x7) << 8)
++#define DRAM_MCR_MODE_DQ_TURNON_DELAY_MASK DRAM_MCR_MODE_DQ_TURNON_DELAY(0x7)
++#define DRAM_MCR_MODE_ADDR_IN (0x1 << 11)
++#define DRAM_MCR_RESET (0x1 << 12)
++#define DRAM_MCR_MODE_EN(n) (((n) & 0x3) << 13)
++#define DRAM_MCR_MODE_EN_MASK DRAM_MCR_MOD_EN(0x3)
++#define DRAM_MCR_DCLK_OUT (0x1 << 16)
++
++#define DRAM_DLLCR_NRESET (0x1 << 30)
++#define DRAM_DLLCR_DISABLE (0x1 << 31)
++
++#define DRAM_ZQCR0_IMP_DIV(n) (((n) & 0xff) << 20)
++#define DRAM_ZQCR0_IMP_DIV_MASK DRAM_ZQCR0_IMP_DIV(0xff)
++
++#define DRAM_IOCR_ODT_EN(n) ((((n) & 0x3) << 30) | ((n) & 0x3) << 0)
++#define DRAM_IOCR_ODT_EN_MASK DRAM_IOCR_ODT_EN(0x3)
++
++#define DRAM_MR_BURST_LENGTH(n) (((n) & 0x7) << 0)
++#define DRAM_MR_BURST_LENGTH_MASK DRAM_MR_BURST_LENGTH(0x7)
++#define DRAM_MR_CAS_LAT(n) (((n) & 0x7) << 4)
++#define DRAM_MR_CAS_LAT_MASK DRAM_MR_CAS_LAT(0x7)
++#define DRAM_MR_WRITE_RECOVERY(n) (((n) & 0x7) << 9)
++#define DRAM_MR_WRITE_RECOVERY_MASK DRAM_MR_WRITE_RECOVERY(0x7)
++#define DRAM_MR_POWER_DOWN (0x1 << 12)
++
++#define DRAM_CSEL_MAGIC 0x16237495
++
++unsigned long sunxi_dram_init(void);
++unsigned long dramc_init(struct dram_para *para);
++
++#endif /* _SUNXI_DRAM_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/early_print.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/early_print.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/early_print.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/early_print.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,58 @@
++/*
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Early uart print for debugging.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_EARLY_PRINT_H
++#define _SUNXI_EARLY_PRINT_H
++
++#include <asm/arch/cpu.h>
++
++#define SUNXI_UART_BASE SUNXI_UART0_BASE
++
++#define UART_OFFSET 0x400
++
++/* receive buffer register */
++#define UART_RBR(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x0)
++/* transmit holding register */
++#define UART_THR(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x0)
++/* divisor latch low register */
++#define UART_DLL(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x0)
++
++/* divisor latch high register */
++#define UART_DLH(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x4)
++/* interrupt enable reigster */
++#define UART_IER(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x4)
++
++/* interrupt identity register */
++#define UART_IIR(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x8)
++/* fifo control register */
++#define UART_FCR(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x8)
++
++/* line control register */
++#define UART_LCR(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0xc)
++#define UART_LCR_DLAB (0x1 << 7)
++
++/* line status register */
++#define UART_LSR(n) (SUNXI_UART_BASE + (n) * UART_OFFSET + 0x14)
++#define UART_LSR_TEMT (0x1 << 6)
++
++
++#define BAUD_115200    (0xd) /* 24 * 1000 * 1000 / 16 / 115200 = 13 */
++#define NO_PARITY      (0)
++#define ONE_STOP_BIT   (0)
++#define DAT_LEN_8_BITS (3)
++#define LC_8_N_1          (NO_PARITY << 3 | ONE_STOP_BIT << 2 | DAT_LEN_8_BITS)
++
++#ifndef __ASSEMBLY__
++void uart_init(void);
++void uart_putc(char c);
++void uart_puts(const char *s);
++#endif /* __ASSEMBLY__ */
++
++#endif /* _SUNXI_EARLY_PRINT_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/gpio.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/gpio.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/gpio.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/gpio.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,174 @@
++/*
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_GPIO_H
++#define _SUNXI_GPIO_H
++
++#include <linux/types.h>
++#include <asm/arch/cpu.h>
++
++/*
++ * sunxi has 9 banks of gpio, they are:
++ * PA0 - PA17 | PB0 - PB23 | PC0 - PC24
++ * PD0 - PD27 | PE0 - PE31 | PF0 - PF5
++ * PG0 - PG9  | PH0 - PH27 | PI0 - PI12
++ */
++
++#define SUNXI_GPIO_A	0
++#define SUNXI_GPIO_B	1
++#define SUNXI_GPIO_C	2
++#define SUNXI_GPIO_D	3
++#define SUNXI_GPIO_E	4
++#define SUNXI_GPIO_F	5
++#define SUNXI_GPIO_G	6
++#define SUNXI_GPIO_H	7
++#define SUNXI_GPIO_I	8
++#define SUNXI_GPIO_BANKS 9
++
++/*
++ * sun6i has atleast 1 additional bank, note banks J K don't exist!
++ * PL0 - PL1 at the very least is known.
++ *
++ * Note this bank is at a different register offset!
++ */
++#define SUNXI_GPIO_L	9
++
++struct sunxi_gpio {
++	u32 cfg[4];
++	u32 dat;
++	u32 drv[2];
++	u32 pull[2];
++};
++
++/* gpio interrupt control */
++struct sunxi_gpio_int {
++	u32 cfg[3];
++	u32 ctl;
++	u32 sta;
++	u32 deb;		/* interrupt debounce */
++};
++
++struct sunxi_gpio_reg {
++	struct sunxi_gpio gpio_bank[SUNXI_GPIO_BANKS];
++	u8 res[0xbc];
++	struct sunxi_gpio_int gpio_int;
++};
++
++#define BANK_TO_GPIO(bank)	(((bank) < SUNXI_GPIO_BANKS) ? \
++	&((struct sunxi_gpio_reg *)SUNXI_PIO_BASE)->gpio_bank[bank] : \
++	(struct sunxi_gpio *)SUNXI_R_PIO_BASE)
++
++#define GPIO_BANK(pin)		((pin) >> 5)
++#define GPIO_NUM(pin)		((pin) & 0x1f)
++
++#define GPIO_CFG_INDEX(pin)	(((pin) & 0x1f) >> 3)
++#define GPIO_CFG_OFFSET(pin)	((((pin) & 0x1f) & 0x7) << 2)
++
++#define GPIO_DRV_INDEX(pin)   (((pin) & 0x1f) >> 4)
++#define GPIO_DRV_OFFSET(pin)	((((pin) & 0x1f) & 0xf) << 1)
++
++#define GPIO_PULL_INDEX(pin)	(((pin) & 0x1f) >> 4)
++#define GPIO_PULL_OFFSET(pin)	((((pin) & 0x1f) & 0xf) << 1)
++
++/* GPIO bank sizes */
++#define SUNXI_GPIO_A_NR		32
++#define SUNXI_GPIO_B_NR		32
++#define SUNXI_GPIO_C_NR		32
++#define SUNXI_GPIO_D_NR		32
++#define SUNXI_GPIO_E_NR		32
++#define SUNXI_GPIO_F_NR		32
++#define SUNXI_GPIO_G_NR		32
++#define SUNXI_GPIO_H_NR		32
++#define SUNXI_GPIO_I_NR		32
++#define SUNXI_GPIO_L_NR		32
++
++#define SUNXI_GPIO_NEXT(__gpio) \
++	((__gpio##_START) + (__gpio##_NR) + 0)
++
++enum sunxi_gpio_number {
++	SUNXI_GPIO_A_START = 0,
++	SUNXI_GPIO_B_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_A),
++	SUNXI_GPIO_C_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_B),
++	SUNXI_GPIO_D_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_C),
++	SUNXI_GPIO_E_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_D),
++	SUNXI_GPIO_F_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_E),
++	SUNXI_GPIO_G_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_F),
++	SUNXI_GPIO_H_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_G),
++	SUNXI_GPIO_I_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_H),
++	SUNXI_GPIO_L_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_I),
++};
++
++/* SUNXI GPIO number definitions */
++#define SUNXI_GPA(_nr)	(SUNXI_GPIO_A_START + (_nr))
++#define SUNXI_GPB(_nr)	(SUNXI_GPIO_B_START + (_nr))
++#define SUNXI_GPC(_nr)	(SUNXI_GPIO_C_START + (_nr))
++#define SUNXI_GPD(_nr)	(SUNXI_GPIO_D_START + (_nr))
++#define SUNXI_GPE(_nr)	(SUNXI_GPIO_E_START + (_nr))
++#define SUNXI_GPF(_nr)	(SUNXI_GPIO_F_START + (_nr))
++#define SUNXI_GPG(_nr)	(SUNXI_GPIO_G_START + (_nr))
++#define SUNXI_GPH(_nr)	(SUNXI_GPIO_H_START + (_nr))
++#define SUNXI_GPI(_nr)	(SUNXI_GPIO_I_START + (_nr))
++#define SUNXI_GPL(_nr)	(SUNXI_GPIO_L_START + (_nr))
++
++/* GPIO pin function config */
++#define SUNXI_GPIO_INPUT	0
++#define SUNXI_GPIO_OUTPUT	1
++
++#define SUNXI_GPA0_EMAC		2
++#define SUN7I_GPA0_GMAC		5
++
++#define SUNXI_GPB0_TWI0		2
++
++#define SUN4I_GPB22_UART0_TX	2
++#define SUN4I_GPB23_UART0_RX	2
++
++#define SUN5I_GPB19_UART0_TX	2
++#define SUN5I_GPB20_UART0_RX	2
++
++#define SUN5I_GPG3_UART1_TX	4
++#define SUN5I_GPG4_UART1_RX	4
++
++#define SUNXI_GPC6_SDC2		3
++
++#define SUNXI_GPF0_SDC0		2
++
++#define SUNXI_GPF2_SDC0		2
++
++#ifdef CONFIG_SUN8I
++#define SUNXI_GPF2_UART0_TX	3
++#define SUNXI_GPF4_UART0_RX	3
++#else
++#define SUNXI_GPF2_UART0_TX	4
++#define SUNXI_GPF4_UART0_RX	4
++#endif
++
++#define SUN4I_GPG0_SDC1		4
++
++#define SUN4I_GPH22_SDC1	5
++
++#define SUN4I_GPI4_SDC3		2
++
++/* GPIO pin pull-up/down config */
++#define SUNXI_GPIO_PULL_DISABLE	0
++#define SUNXI_GPIO_PULL_UP	1
++#define SUNXI_GPIO_PULL_DOWN	2
++
++#define SUNXI_GPL0_R_P2WI_SCK	3
++#define SUNXI_GPL1_R_P2WI_SDA	3
++
++#define SUN8I_GPL2_R_UART_TX	2
++#define SUN8I_GPL3_R_UART_RX	2
++
++int sunxi_gpio_set_cfgpin(u32 pin, u32 val);
++int sunxi_gpio_get_cfgpin(u32 pin);
++int sunxi_gpio_set_drv(u32 pin, u32 val);
++int sunxi_gpio_set_pull(u32 pin, u32 val);
++int sunxi_name_to_gpio(const char *name);
++#define name_to_gpio(name) sunxi_name_to_gpio(name)
++
++#endif /* _SUNXI_GPIO_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/i2c.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/i2c.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/i2c.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/i2c.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,15 @@
++/*
++ * Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#ifndef _SUNXI_I2C_H_
++#define _SUNXI_I2C_H_
++
++#include <asm/arch/cpu.h>
++
++#define CONFIG_I2C_MVTWSI_BASE	SUNXI_TWI0_BASE
++/* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */
++#define CONFIG_SYS_TCLK		24000000
++
++#endif
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/mmc.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/mmc.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/mmc.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/mmc.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,122 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Aaron <leafy.myeh@allwinnertech.com>
++ *
++ * MMC register definition for allwinner sunxi platform.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_MMC_H
++#define _SUNXI_MMC_H
++
++#include <linux/types.h>
++
++struct sunxi_mmc {
++	u32 gctrl;		/* 0x00 global control */
++	u32 clkcr;		/* 0x04 clock control */
++	u32 timeout;		/* 0x08 time out */
++	u32 width;		/* 0x0c bus width */
++	u32 blksz;		/* 0x10 block size */
++	u32 bytecnt;		/* 0x14 byte count */
++	u32 cmd;		/* 0x18 command */
++	u32 arg;		/* 0x1c argument */
++	u32 resp0;		/* 0x20 response 0 */
++	u32 resp1;		/* 0x24 response 1 */
++	u32 resp2;		/* 0x28 response 2 */
++	u32 resp3;		/* 0x2c response 3 */
++	u32 imask;		/* 0x30 interrupt mask */
++	u32 mint;		/* 0x34 masked interrupt status */
++	u32 rint;		/* 0x38 raw interrupt status */
++	u32 status;		/* 0x3c status */
++	u32 ftrglevel;		/* 0x40 FIFO threshold watermark*/
++	u32 funcsel;		/* 0x44 function select */
++	u32 cbcr;		/* 0x48 CIU byte count */
++	u32 bbcr;		/* 0x4c BIU byte count */
++	u32 dbgc;		/* 0x50 debug enable */
++	u32 res0[11];
++	u32 dmac;		/* 0x80 internal DMA control */
++	u32 dlba;		/* 0x84 internal DMA descr list base address */
++	u32 idst;		/* 0x88 internal DMA status */
++	u32 idie;		/* 0x8c internal DMA interrupt enable */
++	u32 chda;		/* 0x90 */
++	u32 cbda;		/* 0x94 */
++};
++
++#define SUNXI_MMC_CLK_POWERSAVE		(0x1 << 17)
++#define SUNXI_MMC_CLK_ENABLE		(0x1 << 16)
++#define SUNXI_MMC_CLK_DIVIDER_MASK	(0xff)
++
++#define SUNXI_MMC_GCTRL_SOFT_RESET	(0x1 << 0)
++#define SUNXI_MMC_GCTRL_FIFO_RESET	(0x1 << 1)
++#define SUNXI_MMC_GCTRL_DMA_RESET	(0x1 << 2)
++#define SUNXI_MMC_GCTRL_RESET		(SUNXI_MMC_GCTRL_SOFT_RESET|\
++					 SUNXI_MMC_GCTRL_FIFO_RESET|\
++					 SUNXI_MMC_GCTRL_DMA_RESET)
++#define SUNXI_MMC_GCTRL_DMA_ENABLE	(0x1 << 5)
++#define SUNXI_MMC_GCTRL_ACCESS_BY_AHB   (0x1 << 31)
++
++#define SUNXI_MMC_CMD_RESP_EXPIRE	(0x1 << 6)
++#define SUNXI_MMC_CMD_LONG_RESPONSE	(0x1 << 7)
++#define SUNXI_MMC_CMD_CHK_RESPONSE_CRC	(0x1 << 8)
++#define SUNXI_MMC_CMD_DATA_EXPIRE	(0x1 << 9)
++#define SUNXI_MMC_CMD_WRITE		(0x1 << 10)
++#define SUNXI_MMC_CMD_AUTO_STOP		(0x1 << 12)
++#define SUNXI_MMC_CMD_WAIT_PRE_OVER	(0x1 << 13)
++#define SUNXI_MMC_CMD_SEND_INIT_SEQ	(0x1 << 15)
++#define SUNXI_MMC_CMD_UPCLK_ONLY	(0x1 << 21)
++#define SUNXI_MMC_CMD_START		(0x1 << 31)
++
++#define SUNXI_MMC_RINT_RESP_ERROR		(0x1 << 1)
++#define SUNXI_MMC_RINT_COMMAND_DONE		(0x1 << 2)
++#define SUNXI_MMC_RINT_DATA_OVER		(0x1 << 3)
++#define SUNXI_MMC_RINT_TX_DATA_REQUEST		(0x1 << 4)
++#define SUNXI_MMC_RINT_RX_DATA_REQUEST		(0x1 << 5)
++#define SUNXI_MMC_RINT_RESP_CRC_ERROR		(0x1 << 6)
++#define SUNXI_MMC_RINT_DATA_CRC_ERROR		(0x1 << 7)
++#define SUNXI_MMC_RINT_RESP_TIMEOUT		(0x1 << 8)
++#define SUNXI_MMC_RINT_DATA_TIMEOUT		(0x1 << 9)
++#define SUNXI_MMC_RINT_VOLTAGE_CHANGE_DONE	(0x1 << 10)
++#define SUNXI_MMC_RINT_FIFO_RUN_ERROR		(0x1 << 11)
++#define SUNXI_MMC_RINT_HARD_WARE_LOCKED		(0x1 << 12)
++#define SUNXI_MMC_RINT_START_BIT_ERROR		(0x1 << 13)
++#define SUNXI_MMC_RINT_AUTO_COMMAND_DONE	(0x1 << 14)
++#define SUNXI_MMC_RINT_END_BIT_ERROR		(0x1 << 15)
++#define SUNXI_MMC_RINT_SDIO_INTERRUPT		(0x1 << 16)
++#define SUNXI_MMC_RINT_CARD_INSERT		(0x1 << 30)
++#define SUNXI_MMC_RINT_CARD_REMOVE		(0x1 << 31)
++#define SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT      \
++	(SUNXI_MMC_RINT_RESP_ERROR |		\
++	 SUNXI_MMC_RINT_RESP_CRC_ERROR |	\
++	 SUNXI_MMC_RINT_DATA_CRC_ERROR |	\
++	 SUNXI_MMC_RINT_RESP_TIMEOUT |		\
++	 SUNXI_MMC_RINT_DATA_TIMEOUT |		\
++	 SUNXI_MMC_RINT_VOLTAGE_CHANGE_DONE |	\
++	 SUNXI_MMC_RINT_FIFO_RUN_ERROR |	\
++	 SUNXI_MMC_RINT_HARD_WARE_LOCKED |	\
++	 SUNXI_MMC_RINT_START_BIT_ERROR |	\
++	 SUNXI_MMC_RINT_END_BIT_ERROR) /* 0xbfc2 */
++#define SUNXI_MMC_RINT_INTERRUPT_DONE_BIT	\
++	(SUNXI_MMC_RINT_AUTO_COMMAND_DONE |	\
++	 SUNXI_MMC_RINT_DATA_OVER |		\
++	 SUNXI_MMC_RINT_COMMAND_DONE |		\
++	 SUNXI_MMC_RINT_VOLTAGE_CHANGE_DONE)
++
++#define SUNXI_MMC_STATUS_RXWL_FLAG		(0x1 << 0)
++#define SUNXI_MMC_STATUS_TXWL_FLAG		(0x1 << 1)
++#define SUNXI_MMC_STATUS_FIFO_EMPTY		(0x1 << 2)
++#define SUNXI_MMC_STATUS_FIFO_FULL		(0x1 << 3)
++#define SUNXI_MMC_STATUS_CARD_PRESENT		(0x1 << 8)
++#define SUNXI_MMC_STATUS_CARD_DATA_BUSY		(0x1 << 9)
++#define SUNXI_MMC_STATUS_DATA_FSM_BUSY		(0x1 << 10)
++
++#define SUNXI_MMC_IDMAC_RESET		(0x1 << 0)
++#define SUNXI_MMC_IDMAC_FIXBURST	(0x1 << 1)
++#define SUNXI_MMC_IDMAC_ENABLE		(0x1 << 7)
++
++#define SUNXI_MMC_IDIE_TXIRQ		(0x1 << 0)
++#define SUNXI_MMC_IDIE_RXIRQ		(0x1 << 1)
++
++int sunxi_mmc_init(int sdc_no);
++#endif /* _SUNXI_MMC_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/p2wi.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/p2wi.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/p2wi.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/p2wi.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,142 @@
++/*
++ * Sunxi platform Push-Push i2c register definition.
++ *
++ * (c) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
++ * http://linux-sunxi.org
++ *
++ * (c)Copyright 2006-2013
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Berg Xing <bergxing@allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_P2WI_H
++#define _SUNXI_P2WI_H
++
++#include <linux/types.h>
++
++#define P2WI_CTRL_RESET (0x1 << 0)
++#define P2WI_CTRL_IRQ_EN (0x1 << 1)
++#define P2WI_CTRL_TRANS_ABORT (0x1 << 6)
++#define P2WI_CTRL_TRANS_START (0x1 << 7)
++
++#define __P2WI_CC_CLK(n) (((n) & 0xff) << 0)
++#define P2WI_CC_CLK_MASK __P2WI_CC_CLK_DIV(0xff)
++#define __P2WI_CC_CLK_DIV(n) (((n) >> 1) - 1)
++#define P2WI_CC_CLK_DIV(n) \
++	__P2WI_CC_CLK(__P2WI_CC_CLK_DIV(n))
++#define P2WI_CC_SDA_OUT_DELAY(n) (((n) & 0x7) << 8)
++#define P2WI_CC_SDA_OUT_DELAY_MASK P2WI_CC_SDA_OUT_DELAY(0x7)
++
++#define P2WI_IRQ_TRANS_DONE (0x1 << 0)
++#define P2WI_IRQ_TRANS_ERR (0x1 << 1)
++#define P2WI_IRQ_LOAD_BUSY (0x1 << 2)
++
++#define P2WI_STAT_TRANS_DONE (0x1 << 0)
++#define P2WI_STAT_TRANS_ERR (0x1 << 1)
++#define P2WI_STAT_LOAD_BUSY (0x1 << 2)
++#define __P2WI_STAT_TRANS_ERR(n) (((n) & 0xff) << 8)
++#define P2WI_STAT_TRANS_ERR_MASK __P2WI_STAT_TRANS_ERR_ID(0xff)
++#define __P2WI_STAT_TRANS_ERR_BYTE_1 0x01
++#define __P2WI_STAT_TRANS_ERR_BYTE_2 0x02
++#define __P2WI_STAT_TRANS_ERR_BYTE_3 0x04
++#define __P2WI_STAT_TRANS_ERR_BYTE_4 0x08
++#define __P2WI_STAT_TRANS_ERR_BYTE_5 0x10
++#define __P2WI_STAT_TRANS_ERR_BYTE_6 0x20
++#define __P2WI_STAT_TRANS_ERR_BYTE_7 0x40
++#define __P2WI_STAT_TRANS_ERR_BYTE_8 0x80
++#define P2WI_STAT_TRANS_ERR_BYTE_1 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_1)
++#define P2WI_STAT_TRANS_ERR_BYTE_2 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_2)
++#define P2WI_STAT_TRANS_ERR_BYTE_3 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_3)
++#define P2WI_STAT_TRANS_ERR_BYTE_4 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_4)
++#define P2WI_STAT_TRANS_ERR_BYTE_5 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_5)
++#define P2WI_STAT_TRANS_ERR_BYTE_6 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_6)
++#define P2WI_STAT_TRANS_ERR_BYTE_7 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_7)
++#define P2WI_STAT_TRANS_ERR_BYTE_8 \
++	__P2WI_STAT_TRANS_ERR(__P2WI_STAT_TRANS_ERR_BYTE_8)
++
++#define P2WI_DATADDR_BYTE_1(n) (((n) & 0xff) << 0)
++#define P2WI_DATADDR_BYTE_1_MASK P2WI_DATADDR_BYTE_1(0xff)
++#define P2WI_DATADDR_BYTE_2(n) (((n) & 0xff) << 8)
++#define P2WI_DATADDR_BYTE_2_MASK P2WI_DATADDR_BYTE_2(0xff)
++#define P2WI_DATADDR_BYTE_3(n) (((n) & 0xff) << 16)
++#define P2WI_DATADDR_BYTE_3_MASK P2WI_DATADDR_BYTE_3(0xff)
++#define P2WI_DATADDR_BYTE_4(n) (((n) & 0xff) << 24)
++#define P2WI_DATADDR_BYTE_4_MASK P2WI_DATADDR_BYTE_4(0xff)
++#define P2WI_DATADDR_BYTE_5(n) (((n) & 0xff) << 0)
++#define P2WI_DATADDR_BYTE_5_MASK P2WI_DATADDR_BYTE_5(0xff)
++#define P2WI_DATADDR_BYTE_6(n) (((n) & 0xff) << 8)
++#define P2WI_DATADDR_BYTE_6_MASK P2WI_DATADDR_BYTE_6(0xff)
++#define P2WI_DATADDR_BYTE_7(n) (((n) & 0xff) << 16)
++#define P2WI_DATADDR_BYTE_7_MASK P2WI_DATADDR_BYTE_7(0xff)
++#define P2WI_DATADDR_BYTE_8(n) (((n) & 0xff) << 24)
++#define P2WI_DATADDR_BYTE_8_MASK P2WI_DATADDR_BYTE_8(0xff)
++
++#define __P2WI_DATA_NUM_BYTES(n) (((n) & 0x7) << 0)
++#define P2WI_DATA_NUM_BYTES_MASK __P2WI_DATA_NUM_BYTES(0x7)
++#define P2WI_DATA_NUM_BYTES(n) __P2WI_DATA_NUM_BYTES((n) - 1)
++#define P2WI_DATA_NUM_BYTES_READ (0x1 << 4)
++
++#define P2WI_DATA_BYTE_1(n) (((n) & 0xff) << 0)
++#define P2WI_DATA_BYTE_1_MASK P2WI_DATA_BYTE_1(0xff)
++#define P2WI_DATA_BYTE_2(n) (((n) & 0xff) << 8)
++#define P2WI_DATA_BYTE_2_MASK P2WI_DATA_BYTE_2(0xff)
++#define P2WI_DATA_BYTE_3(n) (((n) & 0xff) << 16)
++#define P2WI_DATA_BYTE_3_MASK P2WI_DATA_BYTE_3(0xff)
++#define P2WI_DATA_BYTE_4(n) (((n) & 0xff) << 24)
++#define P2WI_DATA_BYTE_4_MASK P2WI_DATA_BYTE_4(0xff)
++#define P2WI_DATA_BYTE_5(n) (((n) & 0xff) << 0)
++#define P2WI_DATA_BYTE_5_MASK P2WI_DATA_BYTE_5(0xff)
++#define P2WI_DATA_BYTE_6(n) (((n) & 0xff) << 8)
++#define P2WI_DATA_BYTE_6_MASK P2WI_DATA_BYTE_6(0xff)
++#define P2WI_DATA_BYTE_7(n) (((n) & 0xff) << 16)
++#define P2WI_DATA_BYTE_7_MASK P2WI_DATA_BYTE_7(0xff)
++#define P2WI_DATA_BYTE_8(n) (((n) & 0xff) << 24)
++#define P2WI_DATA_BYTE_8_MASK P2WI_DATA_BYTE_8(0xff)
++
++#define P2WI_LINECTRL_SDA_CTRL_EN (0x1 << 0)
++#define P2WI_LINECTRL_SDA_OUT_HIGH (0x1 << 1)
++#define P2WI_LINECTRL_SCL_CTRL_EN (0x1 << 2)
++#define P2WI_LINECTRL_SCL_OUT_HIGH (0x1 << 3)
++#define P2WI_LINECTRL_SDA_STATE_HIGH (0x1 << 4)
++#define P2WI_LINECTRL_SCL_STATE_HIGH (0x1 << 5)
++
++#define P2WI_PM_DEV_ADDR(n) (((n) & 0xff) << 0)
++#define P2WI_PM_DEV_ADDR_MASK P2WI_PM_DEV_ADDR(0xff)
++#define P2WI_PM_CTRL_ADDR(n) (((n) & 0xff) << 8)
++#define P2WI_PM_CTRL_ADDR_MASK P2WI_PM_CTRL_ADDR(0xff)
++#define P2WI_PM_INIT_DATA(n) (((n) & 0xff) << 16)
++#define P2WI_PM_INIT_DATA_MASK P2WI_PM_INIT_DATA(0xff)
++#define P2WI_PM_INIT_SEND (0x1 << 31)
++
++#ifndef __ASSEMBLY__
++struct sunxi_p2wi_reg {
++	u32 ctrl;	/* 0x00 control */
++	u32 cc;		/* 0x04 clock control */
++	u32 irq;	/* 0x08 interrupt */
++	u32 status;	/* 0x0c status */
++	u32 dataddr0;	/* 0x10 data address 0 */
++	u32 dataddr1;	/* 0x14 data address 1 */
++	u32 numbytes;	/* 0x18 num bytes */
++	u32 data0;	/* 0x1c data buffer 0 */
++	u32 data1;	/* 0x20 data buffer 1 */
++	u32 linectrl;	/* 0x24 line control */
++	u32 pm;		/* 0x28 power management */
++};
++
++void p2wi_init(void);
++int p2wi_set_pmu_address(u8 slave_addr, u8 ctrl_reg, u8 init_data);
++int p2wi_read(const u8 addr, u8 *data);
++int p2wi_write(const u8 addr, u8 data);
++
++#endif /* __ASSEMBLY__ */
++#endif /* _SUNXI_P2WI_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/prcm.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/prcm.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/prcm.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/prcm.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,238 @@
++/*
++ * Sunxi A31 Power Management Unit register definition.
++ *
++ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
++ * http://linux-sunxi.org
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Berg Xing <bergxing@allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_PRCM_H
++#define _SUNXI_PRCM_H
++
++#define __PRCM_CPUS_CFG_PRE(n) (((n) & 0x3) << 4)
++#define PRCM_CPUS_CFG_PRE_MASK __PRCM_CPUS_CFG_PRE(0x3)
++#define __PRCM_CPUS_CFG_PRE_DIV(n) (((n) >> 1) - 1)
++#define PRCM_CPUS_CFG_PRE_DIV(n) \
++	__PRCM_CPUS_CFG_PRE(__PRCM_CPUS_CFG_CLK_PRE(n))
++#define __PRCM_CPUS_CFG_POST(n) (((n) & 0x1f) << 8)
++#define PRCM_CPUS_CFG_POST_MASK __PRCM_CPUS_CFG_POST(0x1f)
++#define __PRCM_CPUS_CFG_POST_DIV(n) ((n) - 1)
++#define PRCM_CPUS_CFG_POST_DIV(n) \
++	__PRCM_CPUS_CFG_POST_DIV(__PRCM_CPUS_CFG_POST_DIV(n))
++#define __PRCM_CPUS_CFG_CLK_SRC(n) (((n) & 0x3) << 16)
++#define PRCM_CPUS_CFG_CLK_SRC_MASK __PRCM_CPUS_CFG_CLK_SRC(0x3)
++#define __PRCM_CPUS_CFG_CLK_SRC_LOSC 0x0
++#define __PRCM_CPUS_CFG_CLK_SRC_HOSC 0x1
++#define __PRCM_CPUS_CFG_CLK_SRC_PLL6 0x2
++#define __PRCM_CPUS_CFG_CLK_SRC_PDIV 0x3
++#define PRCM_CPUS_CFG_CLK_SRC_LOSC \
++	__PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_LOSC)
++#define PRCM_CPUS_CFG_CLK_SRC_HOSC \
++	__PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_HOSC)
++#define PRCM_CPUS_CFG_CLK_SRC_PLL6 \
++	__PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PLL6)
++#define PRCM_CPUS_CFG_CLK_SRC_PDIV \
++	__PRCM_CPUS_CFG_CLK_SRC(__PRCM_CPUS_CFG_CLK_SRC_PDIV)
++
++#define __PRCM_APB0_RATIO(n) (((n) & 0x3) <<0)
++#define PRCM_APB0_RATIO_DIV_MASK __PRCM_APB0_RATIO_DIV(0x3)
++#define __PRCM_APB0_RATIO_DIV(n) (((n) >> 1) - 1)
++#define PRCM_APB0_RATIO_DIV(n) \
++	__PRCM_APB0_RATIO(__PRCM_APB0_RATIO_DIV(n))
++
++#define PRCM_CPU_CFG_NEON_CLK_EN (0x1 << 0)
++#define PRCM_CPU_CFG_CPU_CLK_EN (0x1 << 1)
++
++#define PRCM_APB0_GATE_PIO (0x1 << 0)
++#define PRCM_APB0_GATE_IR (0x1 << 1)
++#define PRCM_APB0_GATE_TIMER01 (0x1 << 2)
++#define PRCM_APB0_GATE_P2WI (0x1 << 3)
++#define PRCM_APB0_GATE_UART (0x1 << 4)
++#define PRCM_APB0_GATE_1WIRE (0x1 << 5)
++#define PRCM_APB0_GATE_I2C (0x1 << 6)
++
++#define PRCM_APB0_RESET_PIO (0x1 << 0)
++#define PRCM_APB0_RESET_IR (0x1 << 1)
++#define PRCM_APB0_RESET_TIMER01 (0x1 << 2)
++#define PRCM_APB0_RESET_P2WI (0x1 << 3)
++#define PRCM_APB0_RESET_UART (0x1 << 4)
++#define PRCM_APB0_RESET_1WIRE (0x1 << 5)
++#define PRCM_APB0_RESET_I2C (0x1 << 6)
++
++#define PRCM_PLL_CTRL_PLL_BIAS (0x1 << 0)
++#define PRCM_PLL_CTRL_HOSC_GAIN_ENH (0x1 << 1)
++#define __PRCM_PLL_CTRL_USB_CLK_SRC(n) (((n) & 0x3) << 4)
++#define PRCM_PLL_CTRL_USB_CLK_SRC_MASK \
++	__PRCM_PLL_CTRL_USB_CLK_SRC(0x3)
++#define __PRCM_PLL_CTRL_USB_CLK_0 0x0
++#define __PRCM_PLL_CTRL_USB_CLK_1 0x1
++#define __PRCM_PLL_CTRL_USB_CLK_2 0x2
++#define __PRCM_PLL_CTRL_USB_CLK_3 0x3
++#define PRCM_PLL_CTRL_USB_CLK_0 \
++	__PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_0)
++#define PRCM_PLL_CTRL_USB_CLK_1 \
++	__PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_1)
++#define PRCM_PLL_CTRL_USB_CLK_2 \
++	__PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_2)
++#define PRCM_PLL_CTRL_USB_CLK_3 \
++	__PRCM_PLL_CTRL_USB_CLK_SRC(__PRCM_PLL_CTRL_USB_CLK_3)
++#define __PRCM_PLL_CTRL_INT_PLL_IN_SEL(n) (((n) & 0x3) << 12)
++#define PRCM_PLL_CTRL_INT_PLL_IN_SEL_MASK \
++	__PRCM_PLL_CTRL_INT_PLL_IN_SEL(0x3)
++#define PRCM_PLL_CTRL_INT_PLL_IN_SEL(n) \
++	__PRCM_PLL_CTRL_INT_PLL_IN_SEL(n)
++#define __PRCM_PLL_CTRL_HOSC_CLK_SEL(n) (((n) & 0x3) << 20)
++#define PRCM_PLL_CTRL_HOSC_CLK_SEL_MASK \
++	__PRCM_PLL_CTRL_HOSC_CLK_SEL(0x3)
++#define __PRCM_PLL_CTRL_HOSC_CLK_0 0x0
++#define __PRCM_PLL_CTRL_HOSC_CLK_1 0x1
++#define __PRCM_PLL_CTRL_HOSC_CLK_2 0x2
++#define __PRCM_PLL_CTRL_HOSC_CLK_3 0x3
++#define PRCM_PLL_CTRL_HOSC_CLK_0 \
++	__PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_0)
++#define PRCM_PLL_CTRL_HOSC_CLK_1 \
++	__PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_1)
++#define PRCM_PLL_CTRL_HOSC_CLK_2 \
++	__PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_2)
++#define PRCM_PLL_CTRL_HOSC_CLK_3 \
++	__PRCM_PLL_CTRL_HOSC_CLK_SEL(__PRCM_PLL_CTRL_HOSC_CLK_3)
++#define PRCM_PLL_CTRL_PLL_TST_SRC_EXT (0x1 << 24)
++#define PRCM_PLL_CTRL_LDO_DIGITAL_EN (0x1 << 0)
++#define PRCM_PLL_CTRL_LDO_ANALOG_EN (0x1 << 1)
++#define PRCM_PLL_CTRL_EXT_OSC_EN (0x1 << 2)
++#define PRCM_PLL_CTRL_CLK_TST_EN (0x1 << 3)
++#define PRCM_PLL_CTRL_IN_PWR_HIGH (0x1 << 15) /* 3.3 for hi 2.5 for lo */
++#define __PRCM_PLL_CTRL_VDD_LDO_OUT(n) (((n) & 0x7) << 16)
++#define PRCM_PLL_CTRL_LDO_OUT_MASK \
++	__PRCM_PLL_CTRL_LDO_OUT(0x7)
++/* When using the low voltage 20 mV steps, and high voltage 30 mV steps */
++#define PRCM_PLL_CTRL_LDO_OUT_L(n) \
++	__PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1000) / 20) & 0x7)
++#define PRCM_PLL_CTRL_LDO_OUT_H(n) \
++	__PRCM_PLL_CTRL_VDD_LDO_OUT((((n) - 1160) / 30) & 0x7)
++#define PRCM_PLL_CTRL_LDO_OUT_LV(n) \
++	__PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 20) + 1000)
++#define PRCM_PLL_CTRL_LDO_OUT_HV(n) \
++	__PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 30) + 1160)
++#define PRCM_PLL_CTRL_LDO_KEY (0xa7 << 24)
++
++#define PRCM_CLK_1WIRE_GATE (0x1 << 31)
++
++#define __PRCM_CLK_MOD0_M(n) (((n) & 0xf) << 0)
++#define PRCM_CLK_MOD0_M_MASK __PRCM_CLK_MOD0_M(0xf)
++#define __PRCM_CLK_MOD0_M_X(n) (n - 1)
++#define PRCM_CLK_MOD0_M(n) __PRCM_CLK_MOD0_M(__PRCM_CLK_MOD0_M_X(n))
++#define PRCM_CLK_MOD0_OUT_PHASE(n) (((n) & 0x7) << 8)
++#define PRCM_CLK_MOD0_OUT_PHASE_MASK(n) PRCM_CLK_MOD0_OUT_PHASE(0x7)
++#define _PRCM_CLK_MOD0_N(n) (((n) & 0x3) << 16)
++#define PRCM_CLK_MOD0_N_MASK __PRCM_CLK_MOD_N(0x3)
++#define __PRCM_CLK_MOD0_N_X(n) (((n) >> 1) -1)
++#define PRCM_CLK_MOD0_N(n) __PRCM_CLK_MOD0_N(__PRCM_CLK_MOD0_N_X(n))
++#define PRCM_CLK_MOD0_SMPL_PHASE(n) (((n) & 0x7) << 20)
++#define PRCM_CLK_MOD0_SMPL_PHASE_MASK PRCM_CLK_MOD0_SMPL_PHASE(0x7)
++#define PRCM_CLK_MOD0_SRC_SEL(n) (((n) & 0x7) << 24)
++#define PRCM_CLK_MOD0_SRC_SEL_MASK PRCM_CLK_MOD0_SRC_SEL(0x7)
++#define PRCM_CLK_MOD0_GATE_EN (0x1 << 31)
++
++#define PRCM_APB0_RESET_PIO (0x1 << 0)
++#define PRCM_APB0_RESET_IR (0x1 << 1)
++#define PRCM_APB0_RESET_TIMER01 (0x1 << 2)
++#define PRCM_APB0_RESET_P2WI (0x1 << 3)
++#define PRCM_APB0_RESET_UART (0x1 << 4)
++#define PRCM_APB0_RESET_1WIRE (0x1 << 5)
++#define PRCM_APB0_RESET_I2C (0x1 << 6)
++
++#define __PRCM_CLK_OUTD_M(n) (((n) & 0x7) << 8)
++#define PRCM_CLK_OUTD_M_MASK __PRCM_CLK_OUTD_M(0x7)
++#define __PRCM_CLK_OUTD_M_X() ((n) - 1)
++#define PRCM_CLK_OUTD_M(n) __PRCM_CLK_OUTD_M(__PRCM_CLK_OUTD_M_X(n))
++#define __PRCM_CLK_OUTD_N(n) (((n) & 0x7) << 20)
++#define PRCM_CLK_OUTD_N_MASK __PRCM_CLK_OUTD_N(0x7)
++#define __PRCM_CLK_OUTD_N_X(n) (((n) >> 1) - 1)
++#define PRCM_CLK_OUTD_N(n) __PRCM_CLK_OUTD_N(__PRCM_CLK_OUTD_N_X(n)
++#define __PRCM_CLK_OUTD_SRC_SEL(n) (((n) & 0x3) << 24)
++#define PRCM_CLK_OUTD_SRC_SEL_MASK __PRCM_CLK_OUTD_SRC_SEL(0x3)
++#define __PRCM_CLK_OUTD_SRC_LOSC2 0x0
++#define __PRCM_CLK_OUTD_SRC_LOSC 0x1
++#define __PRCM_CLK_OUTD_SRC_HOSC 0x2
++#define __PRCM_CLK_OUTD_SRC_ERR 0x3
++#define PRCM_CLK_OUTD_SRC_LOSC2 \
++#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC2)
++#define PRCM_CLK_OUTD_SRC_LOSC \
++#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_LOSC)
++#define PRCM_CLK_OUTD_SRC_HOSC \
++#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_HOSC)
++#define PRCM_CLK_OUTD_SRC_ERR \
++#deifne __PRCM_CLK_OUTD_SRC_SEL(__PRCM_CLK_OUTD_SRC_ERR)
++#define PRCM_CLK_OUTD_EN (0x1 << 31)
++
++#define PRCM_CPU0_PWROFF (0x1 << 0)
++#define PRCM_CPU1_PWROFF (0x1 << 1)
++#define PRCM_CPU2_PWROFF (0x1 << 2)
++#define PRCM_CPU3_PWROFF (0x1 << 3)
++#define PRCM_CPU_ALL_PWROFF (0xf << 0)
++
++#define PRCM_VDD_SYS_DRAM_CH0_PAD_HOLD_PWROFF (0x1 << 0)
++#define PRCM_VDD_SYS_DRAM_CH1_PAD_HOLD_PWROFF (0x1 << 1)
++#define PRCM_VDD_SYS_AVCC_A_PWROFF (0x1 << 2)
++#define PRCM_VDD_SYS_CPU0_VDD_PWROFF (0x1 << 3)
++
++#define PRCM_VDD_GPU_PWROFF (0x1 << 0)
++
++#define PRCM_VDD_SYS_RESET (0x1 << 0)
++
++#define PRCM_CPU1_PWR_CLAMP(n) (((n) & 0xff) << 0)
++#define PRCM_CPU1_PWR_CLAMP_MASK PRCM_CPU1_PWR_CLAMP(0xff)
++
++#define PRCM_CPU2_PWR_CLAMP(n) (((n) & 0xff) << 0)
++#define PRCM_CPU2_PWR_CLAMP_MASK PRCM_CPU2_PWR_CLAMP(0xff)
++
++#define PRCM_CPU3_PWR_CLAMP(n) (((n) & 0xff) << 0)
++#define PRCM_CPU3_PWR_CLAMP_MASK PRCM_CPU3_PWR_CLAMP(0xff)
++
++#ifndef __ASSEMBLY__
++struct sunxi_prcm_reg {
++	u32 cpus_cfg;		/* 0x000 */
++	u8 res0[0x8];		/* 0x004 */
++	u32 apb0_ratio;		/* 0x00c */
++	u32 cpu0_cfg;		/* 0x010 */
++	u32 cpu1_cfg;		/* 0x014 */
++	u32 cpu2_cfg;		/* 0x018 */
++	u32 cpu3_cfg;		/* 0x01c */
++	u8 res1[0x8];		/* 0x020 */
++	u32 apb0_gate;		/* 0x028 */
++	u8 res2[0x14];		/* 0x02c */
++	u32 pll_ctrl0;		/* 0x040 */
++	u32 pll_ctrl1;		/* 0x044 */
++	u8 res3[0x8];		/* 0x048 */
++	u32 clk_1wire;		/* 0x050 */
++	u32 clk_ir;		/* 0x054 */
++	u8 res4[0x58];		/* 0x058 */
++	u32 apb0_reset;		/* 0x0b0 */
++	u8 res5[0x3c];		/* 0x0b4 */
++	u32 clk_outd;		/* 0x0f0 */
++	u8 res6[0xc];		/* 0x0f4 */
++	u32 cpu_pwroff;		/* 0x100 */
++	u8 res7[0xc];		/* 0x104 */
++	u32 vdd_sys_pwroff;	/* 0x110 */
++	u8 res8[0x4];		/* 0x114 */
++	u32 gpu_pwroff;		/* 0x118 */
++	u8 res9[0x4];		/* 0x11c */
++	u32 vdd_pwr_reset;	/* 0x120 */
++	u8 res10[0x20];		/* 0x124 */
++	u32 cpu1_pwr_clamp;	/* 0x144 */
++	u32 cpu2_pwr_clamp;	/* 0x148 */
++	u32 cpu3_pwr_clamp;	/* 0x14c */
++	u8 res11[0x30];		/* 0x150 */
++	u32 dram_pwr;		/* 0x180 */
++	u8 res12[0xc];		/* 0x184 */
++	u32 dram_tst;		/* 0x190 */
++};
++
++void prcm_apb0_enable(u32 flags);
++#endif /* __ASSEMBLY__ */
++#endif /* _PRCM_H */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/smp.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/smp.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/smp.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/smp.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,22 @@
++/*
++ * (C) Copyright 2013
++ * Carl van Schaik <carl@ok-labs.com>
++ *
++ * CPU configuration registers for the sun7i (A20).
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_SMP_H_
++#define _SUNXI_SMP_H_
++
++#ifndef __ASSEMBLY__
++
++void startup_secondaries(void);
++
++/* Assembly entry point */
++extern void secondary_init(void);
++
++#endif /* __ASSEMBLY__ */
++
++#endif /* _SUNXI_SMP_H_ */
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/spl.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/spl.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/spl.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/spl.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,20 @@
++/*
++ * This is a copy of omap3/spl.h:
++ *
++ * (C) Copyright 2012
++ * Texas Instruments, <www.ti.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#ifndef	_ASM_ARCH_SPL_H_
++#define	_ASM_SPL_H_
++
++#define BOOT_DEVICE_NONE	0
++#define BOOT_DEVICE_XIP		1
++#define BOOT_DEVICE_NAND	2
++#define BOOT_DEVICE_ONE_NAND	3
++#define BOOT_DEVICE_MMC2	5 /*emmc*/
++#define BOOT_DEVICE_MMC1	6
++#define BOOT_DEVICE_XIPWAIT	7
++#define BOOT_DEVICE_MMC2_2      0xff
++#endif
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/sys_proto.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/sys_proto.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/sys_proto.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/sys_proto.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,16 @@
++/*
++ * (C) Copyright 2007-2012
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SYS_PROTO_H_
++#define _SYS_PROTO_H_
++
++#include <linux/types.h>
++
++void sdelay(unsigned long);
++
++#endif
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/timer.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/timer.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/timer.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/timer.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,88 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Configuration settings for the Allwinner A10-evb board.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_TIMER_H_
++#define _SUNXI_TIMER_H_
++
++#ifndef __ASSEMBLY__
++
++#include <linux/types.h>
++
++/* General purpose timer */
++struct sunxi_timer {
++	u32 ctl;
++	u32 inter;
++	u32 val;
++	u8 res[4];
++};
++
++/* Audio video sync*/
++struct sunxi_avs {
++	u32 ctl;		/* 0x80 */
++	u32 cnt0;		/* 0x84 */
++	u32 cnt1;		/* 0x88 */
++	u32 div;		/* 0x8c */
++};
++
++/* 64 bit counter */
++struct sunxi_64cnt {
++	u32 ctl;		/* 0xa0 */
++	u32 lo;			/* 0xa4 */
++	u32 hi;			/* 0xa8 */
++};
++
++/* Watchdog */
++struct sunxi_wdog {
++	u32 ctl;		/* 0x90 */
++	u32 mode;		/* 0x94 */
++};
++
++/* Rtc */
++struct sunxi_rtc {
++	u32 ctl;		/* 0x100 */
++	u32 yymmdd;		/* 0x104 */
++	u32 hhmmss;		/* 0x108 */
++};
++
++/* Alarm */
++struct sunxi_alarm {
++	u32 ddhhmmss;		/* 0x10c */
++	u32 hhmmss;		/* 0x110 */
++	u32 en;			/* 0x114 */
++	u32 irqen;		/* 0x118 */
++	u32 irqsta;		/* 0x11c */
++};
++
++/* Timer general purpose register */
++struct sunxi_tgp {
++	u32 tgpd;
++};
++
++struct sunxi_timer_reg {
++	u32 tirqen;		/* 0x00 */
++	u32 tirqsta;		/* 0x04 */
++	u8 res1[8];
++	struct sunxi_timer timer[6];	/* We have 6 timers */
++	u8 res2[16];
++	struct sunxi_avs avs;
++	struct sunxi_wdog wdog;
++	u8 res3[8];
++	struct sunxi_64cnt cnt64;
++	u8 res4[0x58];
++	struct sunxi_rtc rtc;
++	struct sunxi_alarm alarm;
++	struct sunxi_tgp tgp[4];
++	u8 res5[8];
++	u32 cpu_cfg;
++};
++
++#endif /* __ASSEMBLY__ */
++
++#endif
+diff -ruN u-boot-2014.04/arch/arm/include/asm/arch-sunxi/watchdog.h u-boot-sunxi/arch/arm/include/asm/arch-sunxi/watchdog.h
+--- u-boot-2014.04/arch/arm/include/asm/arch-sunxi/watchdog.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/arch/arm/include/asm/arch-sunxi/watchdog.h	2014-09-06 16:58:35.381953139 +0200
+@@ -0,0 +1,22 @@
++/*
++ * Watchdog driver for the Allwinner sunxi platform.
++ * Copyright (C) 2013  Oliver Schinagl <oliver@schinagl.nl>
++ * http://www.linux-sunxi.org/
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_WATCHDOG_H_
++#define _SUNXI_WATCHDOG_H_
++
++/* Timeout limits */
++#define WDT_MAX_TIMEOUT 16
++#define WDT_OFF -1
++
++#ifndef __ASSEMBLY__
++void watchdog_reset(void);
++void watchdog_set(int timeout);
++void watchdog_init(void);
++#endif /* __ASSEMBLY__ */
++
++#endif
+diff -ruN u-boot-2014.04/board/sunxi/board.c u-boot-sunxi/board/sunxi/board.c
+--- u-boot-2014.04/board/sunxi/board.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/board.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,239 @@
++/*
++ * (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ *
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Some board init for the Allwinner A10-evb board.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#ifdef CONFIG_AXP152_POWER
++#include <axp152.h>
++#endif
++#ifdef CONFIG_AXP209_POWER
++#include <axp209.h>
++#endif
++#ifdef CONFIG_AXP221_POWER
++#include <axp221.h>
++#endif
++#include <asm/arch/clock.h>
++#include <asm/arch/cpu.h>
++#include <asm/arch/dram.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/mmc.h>
++#include <asm/io.h>
++#include <net.h>
++
++DECLARE_GLOBAL_DATA_PTR;
++
++/* add board specific code here */
++int board_init(void)
++{
++	int id_pfr1;
++
++	gd->bd->bi_boot_params = (PHYS_SDRAM_0 + 0x100);
++
++	asm volatile("mrc p15, 0, %0, c0, c1, 1" : "=r"(id_pfr1));
++	debug("id_pfr1: 0x%08x\n", id_pfr1);
++	/* Generic Timer Extension available? */
++	if ((id_pfr1 >> 16) & 0xf) {
++		debug("Setting CNTFRQ\n");
++		/* CNTFRQ == 24 MHz */
++		asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r"(24000000));
++	}
++
++#ifdef CONFIG_STATUS_LED
++	status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
++#endif
++	return 0;
++}
++
++#ifdef CONFIG_DISPLAY_BOARDINFO
++int checkboard(void)
++{
++	printf("Board: %s\n", CONFIG_SYS_BOARD_NAME);
++
++	return 0;
++}
++#endif
++
++int dram_init(void)
++{
++	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_0, PHYS_SDRAM_0_SIZE);
++
++	return 0;
++}
++
++#ifdef CONFIG_GENERIC_MMC
++static void mmc_pinmux_setup(int sdc)
++{
++	unsigned int pin;
++
++	switch (sdc) {
++	case 0:
++		/* D1-PF0, D0-PF1, CLK-PF2, CMD-PF3, D3-PF4, D4-PF5 */
++		for (pin = SUNXI_GPF(0); pin <= SUNXI_GPF(5); pin++) {
++			sunxi_gpio_set_cfgpin(pin, SUNXI_GPF0_SDC0);
++			sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
++			sunxi_gpio_set_drv(pin, 2);
++		}
++		break;
++
++	case 1:
++		/* CMD-PH22, CLK-PH23, D0~D3-PH24~27 : 5 */
++		for (pin = SUNXI_GPH(22); pin <= SUNXI_GPH(27); pin++) {
++			sunxi_gpio_set_cfgpin(pin, SUN4I_GPH22_SDC1);
++			sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
++			sunxi_gpio_set_drv(pin, 2);
++		}
++		break;
++
++	case 2:
++		/* CMD-PC6, CLK-PC7, D0-PC8, D1-PC9, D2-PC10, D3-PC11 */
++		for (pin = SUNXI_GPC(6); pin <= SUNXI_GPC(11); pin++) {
++			sunxi_gpio_set_cfgpin(pin, SUNXI_GPC6_SDC2);
++			sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
++			sunxi_gpio_set_drv(pin, 2);
++		}
++		break;
++
++	case 3:
++		/* CMD-PI4, CLK-PI5, D0~D3-PI6~9 : 2 */
++		for (pin = SUNXI_GPI(4); pin <= SUNXI_GPI(9); pin++) {
++			sunxi_gpio_set_cfgpin(pin, SUN4I_GPI4_SDC3);
++			sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
++			sunxi_gpio_set_drv(pin, 2);
++		}
++		break;
++
++	default:
++		printf("sunxi: invalid MMC slot %d for pinmux setup\n", sdc);
++		break;
++	}
++}
++
++int board_mmc_init(bd_t *bis)
++{
++	mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
++	sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT);
++#if !defined (CONFIG_SPL_BUILD) && defined (CONFIG_MMC_SUNXI_SLOT_EXTRA)
++	mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA);
++	sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA);
++#endif
++
++	return 0;
++}
++#endif
++
++void i2c_init_board(void)
++{
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUNXI_GPB0_TWI0);
++	sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUNXI_GPB0_TWI0);
++	clock_twi_onoff(0, 1);
++}
++
++#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I)
++void sunxi_board_init(void)
++{
++	int power_failed = 0;
++#if !defined(CONFIG_SUN6I) && !defined(CONFIG_SUN8I)
++	unsigned long ramsize;
++#endif
++
++#ifdef CONFIG_AXP152_POWER
++	power_failed = axp152_init();
++	power_failed |= axp152_set_dcdc2(1400);
++	power_failed |= axp152_set_dcdc3(1500);
++	power_failed |= axp152_set_dcdc4(1250);
++	power_failed |= axp152_set_ldo2(3000);
++#endif
++#ifdef CONFIG_AXP209_POWER
++	power_failed |= axp209_init();
++	power_failed |= axp209_set_dcdc2(1400);
++#ifdef CONFIG_FAST_MBUS
++	power_failed |= axp209_set_dcdc3(1300);
++#else
++	power_failed |= axp209_set_dcdc3(1250);
++#endif
++	power_failed |= axp209_set_ldo2(3000);
++	power_failed |= axp209_set_ldo3(2800);
++	power_failed |= axp209_set_ldo4(2800);
++#endif
++#ifdef CONFIG_AXP221_POWER
++	power_failed = axp221_init();
++	power_failed |= axp221_set_dcdc1(3300);
++	power_failed |= axp221_set_dcdc2(1200);
++	power_failed |= axp221_set_dcdc3(1260);
++	power_failed |= axp221_set_dcdc4(1200);
++	power_failed |= axp221_set_dcdc5(1500);
++#ifdef CONFIG_ENABLE_DLDO1_POWER
++	power_failed |= axp221_set_dldo1(3300);
++#endif
++#endif
++
++#if !defined(CONFIG_SUN6I) && !defined(CONFIG_SUN8I)
++	printf("DRAM:");
++	ramsize = sunxi_dram_init();
++	printf(" %lu MiB\n", ramsize >> 20);
++	if (!ramsize)
++		hang();
++
++	/*
++	 * Only clock up the CPU to full speed if we are reasonably
++	 * assured it's being powered with suitable core voltage
++	 */
++	if (!power_failed)
++		clock_set_pll1(CONFIG_CLK_FULL_SPEED);
++	else
++		printf("Failed to set core voltage! Can't set CPU frequency\n");
++#endif
++}
++#endif
++
++#if defined(CONFIG_SPL_OS_BOOT) && defined(CONFIG_AXP209_POWER)
++int spl_start_uboot(void)
++{
++	if (axp209_poweron_by_dc())
++		return 0;
++	axp209_power_button(); /* Clear any pending button event */
++	mdelay(100);
++	return axp209_power_button();
++}
++#endif
++
++#ifdef CONFIG_SPL_DISPLAY_PRINT
++void spl_display_print(void)
++{
++	printf("Board: %s\n", CONFIG_SYS_BOARD_NAME);
++}
++#endif
++
++#ifdef CONFIG_MISC_INIT_R
++int misc_init_r(void)
++{
++	if (!getenv("ethaddr")) {
++		uint32_t reg_val = readl(SUNXI_SID_BASE);
++
++		if (reg_val) {
++			uint8_t mac_addr[6];
++
++			mac_addr[0] = 0x02; /* Non OUI / registered MAC address */
++			mac_addr[1] = (reg_val >>  0) & 0xff;
++			reg_val = readl(SUNXI_SID_BASE + 0x0c);
++			mac_addr[2] = (reg_val >> 24) & 0xff;
++			mac_addr[3] = (reg_val >> 16) & 0xff;
++			mac_addr[4] = (reg_val >>  8) & 0xff;
++			mac_addr[5] = (reg_val >>  0) & 0xff;
++
++			eth_setenv_enetaddr("ethaddr", mac_addr);
++		}
++	}
++
++	return 0;
++}
++#endif
+diff -ruN u-boot-2014.04/board/sunxi/dram_a10_olinuxino_l.c u-boot-sunxi/board/sunxi/dram_a10_olinuxino_l.c
+--- u-boot-2014.04/board/sunxi/dram_a10_olinuxino_l.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_a10_olinuxino_l.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 480,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_a13_oli_micro.c u-boot-sunxi/board/sunxi/dram_a13_oli_micro.c
+--- u-boot-2014.04/board/sunxi/dram_a13_oli_micro.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_a13_oli_micro.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,32 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 256,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0x10,
++	.emr3 = 0,
++
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_a13_olinuxino.c u-boot-sunxi/board/sunxi/dram_a13_olinuxino.c
+--- u-boot-2014.04/board/sunxi/dram_a13_olinuxino.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_a13_olinuxino.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_a20_olinuxino_l2.c u-boot-sunxi/board/sunxi/dram_a20_olinuxino_l2.c
+--- u-boot-2014.04/board/sunxi/dram_a20_olinuxino_l2.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_a20_olinuxino_l2.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 480,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_a20_olinuxino_l.c u-boot-sunxi/board/sunxi/dram_a20_olinuxino_l.c
+--- u-boot-2014.04/board/sunxi/dram_a20_olinuxino_l.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_a20_olinuxino_l.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 480,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_ainol_aw1.c u-boot-sunxi/board/sunxi/dram_ainol_aw1.c
+--- u-boot-2014.04/board/sunxi/dram_ainol_aw1.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_ainol_aw1.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7b,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 1,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_auxtek_t003.c u-boot-sunxi/board/sunxi/dram_auxtek_t003.c
+--- u-boot-2014.04/board/sunxi/dram_auxtek_t003.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_auxtek_t003.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_cubieboard.c u-boot-sunxi/board/sunxi/dram_cubieboard.c
+--- u-boot-2014.04/board/sunxi/dram_cubieboard.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_cubieboard.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 480,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_cubietruck.c u-boot-sunxi/board/sunxi/dram_cubietruck.c
+--- u-boot-2014.04/board/sunxi/dram_cubietruck.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_cubietruck.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 2048,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0x0,
++	.tpr4 = 0x1,
++	.tpr5 = 0x0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0x0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_eu3000.c u-boot-sunxi/board/sunxi/dram_eu3000.c
+--- u-boot-2014.04/board/sunxi/dram_eu3000.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_eu3000.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7b,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 1,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_forfun_q88db.c u-boot-sunxi/board/sunxi/dram_forfun_q88db.c
+--- u-boot-2014.04/board/sunxi/dram_forfun_q88db.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_forfun_q88db.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 0x7b,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_gooseberry_a721.c u-boot-sunxi/board/sunxi/dram_gooseberry_a721.c
+--- u-boot-2014.04/board/sunxi/dram_gooseberry_a721.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_gooseberry_a721.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 1024,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_h6.c u-boot-sunxi/board/sunxi/dram_h6.c
+--- u-boot-2014.04/board/sunxi/dram_h6.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_h6.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_hackberry.c u-boot-sunxi/board/sunxi/dram_hackberry.c
+--- u-boot-2014.04/board/sunxi/dram_hackberry.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_hackberry.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 1,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_icou_fatty_i.c u-boot-sunxi/board/sunxi/dram_icou_fatty_i.c
+--- u-boot-2014.04/board/sunxi/dram_icou_fatty_i.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_icou_fatty_i.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 1,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_inet_k70hc.c u-boot-sunxi/board/sunxi/dram_inet_k70hc.c
+--- u-boot-2014.04/board/sunxi/dram_inet_k70hc.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_inet_k70hc.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x12331a7f,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 1,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_linksprite_pcduino3.c u-boot-sunxi/board/sunxi/dram_linksprite_pcduino3.c
+--- u-boot-2014.04/board/sunxi/dram_linksprite_pcduino3.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_linksprite_pcduino3.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 480,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7a,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0x0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_megafeis_a08.c u-boot-sunxi/board/sunxi/dram_megafeis_a08.c
+--- u-boot-2014.04/board/sunxi/dram_megafeis_a08.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_megafeis_a08.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_merrii_m2.c u-boot-sunxi/board/sunxi/dram_merrii_m2.c
+--- u-boot-2014.04/board/sunxi/dram_merrii_m2.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_merrii_m2.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 127,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0x0,
++	.tpr4 = 0x0,
++	.tpr5 = 0x0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0x0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_mini_x_a10s.c u-boot-sunxi/board/sunxi/dram_mini_x_a10s.c
+--- u-boot-2014.04/board/sunxi/dram_mini_x_a10s.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_mini_x_a10s.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_mk802_a10s.c u-boot-sunxi/board/sunxi/dram_mk802_a10s.c
+--- u-boot-2014.04/board/sunxi/dram_mk802_a10s.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_mk802_a10s.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_mk802ii_a20.c u-boot-sunxi/board/sunxi/dram_mk802ii_a20.c
+--- u-boot-2014.04/board/sunxi/dram_mk802ii_a20.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_mk802ii_a20.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_olimex_a13_som.c u-boot-sunxi/board/sunxi/dram_olimex_a13_som.c
+--- u-boot-2014.04/board/sunxi/dram_olimex_a13_som.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_olimex_a13_som.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,32 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0x10,
++	.emr3 = 0,
++
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_pov_protab2.c u-boot-sunxi/board/sunxi/dram_pov_protab2.c
+--- u-boot-2014.04/board/sunxi/dram_pov_protab2.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_pov_protab2.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_pov_protab2_xxl.c u-boot-sunxi/board/sunxi/dram_pov_protab2_xxl.c
+--- u-boot-2014.04/board/sunxi/dram_pov_protab2_xxl.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_pov_protab2_xxl.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_pov_tab_p703.c u-boot-sunxi/board/sunxi/dram_pov_tab_p703.c
+--- u-boot-2014.04/board/sunxi/dram_pov_tab_p703.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_pov_tab_p703.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 0x56b9697b,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_r7dongle.c u-boot-sunxi/board/sunxi/dram_r7dongle.c
+--- u-boot-2014.04/board/sunxi/dram_r7dongle.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_r7dongle.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x04,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sanei_n90.c u-boot-sunxi/board/sunxi/dram_sanei_n90.c
+--- u-boot-2014.04/board/sunxi/dram_sanei_n90.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sanei_n90.c	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,30 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 456,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 1,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_semitime_g2.c u-boot-sunxi/board/sunxi/dram_semitime_g2.c
+--- u-boot-2014.04/board/sunxi/dram_semitime_g2.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_semitime_g2.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7b,
++	.odt_en = 0,
++	.size = 1024, /* in MiB */
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0x00,
++	.tpr4 = 0x00,
++	.tpr5 = 0x00,
++	.emr1 = 0x00,
++	.emr2 = 0x10,
++	.emr3 = 0x00,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_312_1024_iow8.c u-boot-sunxi/board/sunxi/dram_sun4i_312_1024_iow8.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_312_1024_iow8.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_312_1024_iow8.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 312,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_360_1024_iow16.c u-boot-sunxi/board/sunxi/dram_sun4i_360_1024_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_360_1024_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_360_1024_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_360_1024_iow8.c u-boot-sunxi/board/sunxi/dram_sun4i_360_1024_iow8.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_360_1024_iow8.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_360_1024_iow8.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_360_512.c u-boot-sunxi/board/sunxi/dram_sun4i_360_512.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_360_512.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_360_512.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_384_1024_iow16.c u-boot-sunxi/board/sunxi/dram_sun4i_384_1024_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_384_1024_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_384_1024_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_384_1024_iow8.c u-boot-sunxi/board/sunxi/dram_sun4i_384_1024_iow8.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_384_1024_iow8.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_384_1024_iow8.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_408_1024_iow16.c u-boot-sunxi/board/sunxi/dram_sun4i_408_1024_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_408_1024_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_408_1024_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_408_1024_iow8.c u-boot-sunxi/board/sunxi/dram_sun4i_408_1024_iow8.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_408_1024_iow8.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_408_1024_iow8.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun4i_408_512.c u-boot-sunxi/board/sunxi/dram_sun4i_408_512.c
+--- u-boot-2014.04/board/sunxi/dram_sun4i_408_512.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun4i_408_512.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 0x7b,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun5i_408_1024_iow16.c u-boot-sunxi/board/sunxi/dram_sun5i_408_1024_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun5i_408_1024_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun5i_408_1024_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7b,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun5i_408_512_busw16_iow8.c u-boot-sunxi/board/sunxi/dram_sun5i_408_512_busw16_iow8.c
+--- u-boot-2014.04/board/sunxi/dram_sun5i_408_512_busw16_iow8.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun5i_408_512_busw16_iow8.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 1,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun5i_432_512_busw16_iow16.c u-boot-sunxi/board/sunxi/dram_sun5i_432_512_busw16_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun5i_432_512_busw16_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun5i_432_512_busw16_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun7i_360_512_busw16_iow16.c u-boot-sunxi/board/sunxi/dram_sun7i_360_512_busw16_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun7i_360_512_busw16_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun7i_360_512_busw16_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 360,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun7i_384_1024_iow16.c u-boot-sunxi/board/sunxi/dram_sun7i_384_1024_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun7i_384_1024_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun7i_384_1024_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun7i_384_512_busw16_iow16.c u-boot-sunxi/board/sunxi/dram_sun7i_384_512_busw16_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun7i_384_512_busw16_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun7i_384_512_busw16_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun7i_432_1024_iow16.c u-boot-sunxi/board/sunxi/dram_sun7i_432_1024_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun7i_432_1024_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun7i_432_1024_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 1,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_sun7i_460_1024_iow16.c u-boot-sunxi/board/sunxi/dram_sun7i_460_1024_iow16.c
+--- u-boot-2014.04/board/sunxi/dram_sun7i_460_1024_iow16.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_sun7i_460_1024_iow16.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 480,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0x0,
++	.tpr4 = 0x1,
++	.tpr5 = 0x0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0x0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_wexler_tab_7200.c u-boot-sunxi/board/sunxi/dram_wexler_tab_7200.c
+--- u-boot-2014.04/board/sunxi/dram_wexler_tab_7200.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_wexler_tab_7200.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include "common.h"
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 384,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 0x7f,
++	.odt_en = 1,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 1,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_wobo_i5.c u-boot-sunxi/board/sunxi/dram_wobo_i5.c
+--- u-boot-2014.04/board/sunxi/dram_wobo_i5.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_wobo_i5.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 9,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x04,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_xzpad700.c u-boot-sunxi/board/sunxi/dram_xzpad700.c
+--- u-boot-2014.04/board/sunxi/dram_xzpad700.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_xzpad700.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 408,
++	.type = 3,
++	.rank_num = 1,
++	.density = 4096,
++	.io_width = 16,
++	.bus_width = 16,
++	.cas = 9,
++	.zq = 0x56b9487b,
++	.odt_en = 0,
++	.size = 512,
++	.tpr0 = 0x42d899b7,
++	.tpr1 = 0xa090,
++	.tpr2 = 0x22a00,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0x10,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/dram_zatab.c u-boot-sunxi/board/sunxi/dram_zatab.c
+--- u-boot-2014.04/board/sunxi/dram_zatab.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/dram_zatab.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,31 @@
++/* this file is generated, don't edit it yourself */
++
++#include <common.h>
++#include <asm/arch/dram.h>
++
++static struct dram_para dram_para = {
++	.clock = 432,
++	.type = 3,
++	.rank_num = 1,
++	.density = 2048,
++	.io_width = 8,
++	.bus_width = 32,
++	.cas = 6,
++	.zq = 123,
++	.odt_en = 0,
++	.size = 1024,
++	.tpr0 = 0x30926692,
++	.tpr1 = 0x1090,
++	.tpr2 = 0x1a0c8,
++	.tpr3 = 0,
++	.tpr4 = 0,
++	.tpr5 = 0,
++	.emr1 = 0x4,
++	.emr2 = 0,
++	.emr3 = 0,
++};
++
++unsigned long sunxi_dram_init(void)
++{
++	return dramc_init(&dram_para);
++}
+diff -ruN u-boot-2014.04/board/sunxi/gmac.c u-boot-sunxi/board/sunxi/gmac.c
+--- u-boot-2014.04/board/sunxi/gmac.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/gmac.c	2014-09-06 16:58:36.165953115 +0200
+@@ -0,0 +1,43 @@
++#include <common.h>
++#include <netdev.h>
++#include <miiphy.h>
++#include <asm/gpio.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/gpio.h>
++
++int sunxi_gmac_initialize(bd_t *bis)
++{
++	int pin;
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	/* Set up clock gating */
++	setbits_le32(&ccm->ahb_gate1, 0x1 << AHB_GATE_OFFSET_GMAC);
++
++	/* Set MII clock */
++#ifdef CONFIG_RGMII
++	setbits_le32(&ccm->gmac_clk_cfg, CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII |
++		CCM_GMAC_CTRL_GPIT_RGMII);
++#else
++	setbits_le32(&ccm->gmac_clk_cfg, CCM_GMAC_CTRL_TX_CLK_SRC_MII |
++		CCM_GMAC_CTRL_GPIT_MII);
++#endif
++
++	/* Configure pin mux settings for GMAC */
++	for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
++#ifdef CONFIG_RGMII
++		/* skip unused pins in RGMII mode */
++		if (pin == SUNXI_GPA(9) || pin == SUNXI_GPA(14))
++			continue;
++#endif
++		sunxi_gpio_set_cfgpin(pin, SUN7I_GPA0_GMAC);
++		sunxi_gpio_set_drv(pin, 3);
++	}
++
++#ifdef CONFIG_RGMII
++	return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_RGMII);
++#else
++	return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_MII);
++#endif
++}
+diff -ruN u-boot-2014.04/board/sunxi/Makefile u-boot-sunxi/board/sunxi/Makefile
+--- u-boot-2014.04/board/sunxi/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/board/sunxi/Makefile	2014-09-06 16:58:36.161953116 +0200
+@@ -0,0 +1,95 @@
++#
++# (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++#
++# Based on some other board Makefile
++#
++# (C) Copyright 2000-2003
++# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
++#
++# SPDX-License-Identifier:	GPL-2.0+
++#
++obj-y	+= board.o
++obj-$(CONFIG_SUNXI_GMAC)	+= gmac.o
++obj-$(CONFIG_A10_MID_1GB)	+= dram_sun4i_360_1024_iow16.o
++obj-$(CONFIG_A10_OLINUXINO_L)	+= dram_a10_olinuxino_l.o
++obj-$(CONFIG_A10S_OLINUXINO_M)	+= dram_sun5i_432_512_busw16_iow16.o
++obj-$(CONFIG_A13_OLINUXINO)	+= dram_a13_olinuxino.o
++obj-$(CONFIG_A13_OLINUXINOM)	+= dram_a13_oli_micro.o
++obj-$(CONFIG_A13_MID)		+= dram_sun5i_408_512_busw16_iow8.o
++obj-$(CONFIG_A20_OLINUXINO_L)	+= dram_a20_olinuxino_l.o
++obj-$(CONFIG_A20_OLINUXINO_L2)	+= dram_a20_olinuxino_l2.o
++obj-$(CONFIG_A20_OLINUXINO_M)	+= dram_sun7i_384_1024_iow16.o
++obj-$(CONFIG_A20_SOM)		+= dram_sun7i_384_1024_iow16.o
++obj-$(CONFIG_AINOL_AW1)		+= dram_ainol_aw1.o
++obj-$(CONFIG_AMPE_A76)		+= dram_sun5i_432_512_busw16_iow16.o
++obj-$(CONFIG_AUXTEK_T003)	+= dram_auxtek_t003.o
++obj-$(CONFIG_AUXTEK_T004)	+= dram_sun5i_432_512_busw16_iow16.o
++obj-$(CONFIG_BA10_TV_BOX)	+= dram_sun4i_384_1024_iow8.o
++obj-$(CONFIG_COBY_MID7042)	+= dram_sun4i_408_1024_iow16.o
++obj-$(CONFIG_COBY_MID8042)	+= dram_sun4i_360_1024_iow16.o
++obj-$(CONFIG_COBY_MID9742)	+= dram_sun4i_408_1024_iow16.o
++obj-$(CONFIG_MARSBOARD_A10)	+= dram_sun4i_360_1024_iow16.o
++obj-$(CONFIG_MARSBOARD_A20)	+= dram_sun4i_360_1024_iow16.o
++obj-$(CONFIG_CUBIEBOARD)	+= dram_cubieboard.o
++obj-$(CONFIG_CUBIEBOARD2)	+= dram_sun7i_460_1024_iow16.o
++obj-$(CONFIG_BANANAPI)		+= dram_sun7i_432_1024_iow16.o
++obj-$(CONFIG_CUBIETRUCK)	+= dram_cubietruck.o
++obj-$(CONFIG_DNS_M82)		+= dram_sun4i_360_1024_iow16.o
++obj-$(CONFIG_EOMA68_A10)	+= dram_sun4i_360_1024_iow8.o
++obj-$(CONFIG_EOMA68_A20)	+= dram_sun7i_384_1024_iow16.o
++obj-$(CONFIG_EU3000)		+= dram_eu3000.o
++obj-$(CONFIG_FORFUN_Q88DB)	+= dram_forfun_q88db.o
++obj-$(CONFIG_GOOSEBERRY_A721)	+= dram_gooseberry_a721.o
++obj-$(CONFIG_H6)		+= dram_h6.o
++obj-$(CONFIG_HACKBERRY)		+= dram_hackberry.o
++obj-$(CONFIG_HBD_MID_S906)	+= dram_sun7i_432_1024_iow16.o
++obj-$(CONFIG_HCORE_HC860)	+= dram_sun4i_384_1024_iow16.o
++obj-$(CONFIG_HYUNDAI_A7)	+= dram_sun4i_360_512.o
++obj-$(CONFIG_A7HD)		+= dram_sun4i_360_1024_iow8.o
++obj-$(CONFIG_I12_TVBOX)		+= dram_sun7i_384_1024_iow16.o
++obj-$(CONFIG_ICOU_FATTY_I)	+= dram_icou_fatty_i.o
++obj-$(CONFIG_INTERRA3)		+= dram_mk802ii_a20.o
++obj-$(CONFIG_INET_86VZ)		+= dram_sun5i_432_512_busw16_iow16.o
++obj-$(CONFIG_INET97F_II)	+= dram_sun4i_408_512.o
++obj-$(CONFIG_INET_K70HC)	+= dram_inet_k70hc.o
++obj-$(CONFIG_ITEADA10)		+= dram_cubieboard.o
++obj-$(CONFIG_ITEADA20)		+= dram_sun7i_460_1024_iow16.o
++obj-$(CONFIG_JESURUN_Q5)	+= dram_sun4i_312_1024_iow8.o
++obj-$(CONFIG_K1001L1C)		+= dram_sun7i_384_1024_iow16.o
++obj-$(CONFIG_KURIO_7S)		+= dram_sun7i_432_1024_iow16.o
++obj-$(CONFIG_LANGCENT_H6S)	+= dram_sun7i_360_512_busw16_iow16.o
++obj-$(CONFIG_LINKSPRITE_PCDUINO3)	+= dram_linksprite_pcduino3.o
++obj-$(CONFIG_MEFAFEIS_A08)	+= dram_megafeis_a08.o
++obj-$(CONFIG_MELE_A1000)	+= dram_sun4i_360_512.o
++obj-$(CONFIG_MELE_A1000G)	+= dram_sun4i_360_1024_iow8.o
++obj-$(CONFIG_MELE_A3700)	+= dram_sun4i_360_1024_iow8.o
++obj-$(CONFIG_MERRII_HUMMINGBIRD_A20)	+= dram_sun7i_460_1024_iow16.o
++obj-$(CONFIG_MINI_X)		+= dram_sun4i_360_512.o
++obj-$(CONFIG_MINI_X_1GB)	+= dram_sun4i_360_1024_iow16.o
++obj-$(CONFIG_MINI_X_A10S)	+= dram_mini_x_a10s.o
++obj-$(CONFIG_MK802)		+= dram_sun4i_360_512.o
++obj-$(CONFIG_MK802_1GB)		+= dram_sun4i_360_1024_iow16.o
++obj-$(CONFIG_MK802_A10S)	+= dram_mk802_a10s.o
++obj-$(CONFIG_MK802II)		+= dram_sun4i_408_1024_iow8.o
++obj-$(CONFIG_MK802II_A20)	+= dram_mk802ii_a20.o
++obj-$(CONFIG_MK808C_A20)	+= dram_sun7i_384_1024_iow16.o
++obj-$(CONFIG_OLIMEX_A13_SOM)	+= dram_olimex_a13_som.o
++obj-$(CONFIG_PCDUINO)		+= dram_sun4i_408_1024_iow8.o
++obj-$(CONFIG_PENGPOD700)	+= dram_sun4i_384_1024_iow8.o
++obj-$(CONFIG_PENGPOD1000)	+= dram_sun4i_408_1024_iow16.o
++obj-$(CONFIG_PINERIVER-H25)	+= dram_sun5i_408_1024_iow16.o
++obj-$(CONFIG_POV_TAB_P703)	+= dram_pov_tab_p703.o
++obj-$(CONFIG_POV_PROTAB2)	+= dram_pov_protab2.o
++obj-$(CONFIG_POV_PROTAB2_XXL)	+= dram_pov_protab2_xxl.o
++obj-$(CONFIG_QT840A)		+= dram_sun7i_384_512_busw16_iow16.o
++obj-$(CONFIG_R7DONGLE)		+= dram_r7dongle.o
++obj-$(CONFIG_SANEI_N90)		+= dram_sanei_n90.o
++obj-$(CONFIG_SEMITIME_G2)	+= dram_semitime_g2.o
++obj-$(CONFIG_TZX_Q8_713B6)	+= dram_sun5i_408_512_busw16_iow8.o
++obj-$(CONFIG_TZX_Q8_713B7)	+= dram_sun5i_408_512_busw16_iow8.o
++obj-$(CONFIG_UHOST_U1A)		+= dram_sun4i_360_1024_iow8.o
++obj-$(CONFIG_WEXLER_TAB_7200)	+= dram_wexler_tab_7200.o
++obj-$(CONFIG_WOBO_I5)		+= dram_wobo_i5.o
++obj-$(CONFIG_XZPAD700)		+= dram_xzpad700.o
++obj-$(CONFIG_ZATAB)		+= dram_zatab.o
++obj-$(CONFIG_MERRII_M2)		+= dram_merrii_m2.o
+diff -ruN u-boot-2014.04/boards.cfg u-boot-sunxi/boards.cfg
+--- u-boot-2014.04/boards.cfg	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/boards.cfg	2014-09-06 16:58:36.185953115 +0200
+@@ -371,6 +371,111 @@
+ Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                             -                                                                                                                                 Mateusz Zalega <m.zalega@samsung.com>
+ Active  arm         armv7          s5pc1xx     samsung         smdkc100            smdkc100                             -                                                                                                                                 Minkyu Kang <mk7.kang@samsung.com>
+ Active  arm         armv7          socfpga     altera          socfpga             socfpga_cyclone5                     -                                                                                                                                 -
++Active  arm         armv7          sunxi       -               sunxi               A10_MID_1GB                          sun4i:A10_MID_1GB,SPL                                                                                                             -
++Active  arm         armv7          sunxi       -               sunxi               A10-OLinuXino-Lime                   sun4i:A10_OLINUXINO_L,STATUSLED=226,SPL,SUNXI_EMAC                                                                                -
++Active  arm         armv7          sunxi       -               sunxi               A10s-OLinuXino-M                     sun5i:A10S_OLINUXINO_M,STATUSLED=131,AXP152_POWER,CONS_INDEX=1,SPL,SUNXI_EMAC                                                     -
++Active  arm         armv7          sunxi       -               sunxi               A10s-OLinuXino-M_FEL                 sun5i:A10S_OLINUXINO_M,STATUSLED=131,AXP152_POWER,CONS_INDEX=1,SPL_FEL,SUNXI_EMAC                                                 -
++Active  arm         armv7          sunxi       -               sunxi               A13-OLinuXino                        sun5i:A13_OLINUXINO,SPL,STATUSLED=201,CONS_INDEX=2                                                                                -
++Active  arm         armv7          sunxi       -               sunxi               A13-OLinuXino_FEL                    sun5i:A13_OLINUXINO,SPL_FEL,STATUSLED=201,CONS_INDEX=2                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               A13-OLinuXino_FEL_sdcon              sun5i:A13_OLINUXINO,SPL_FEL,STATUSLED=201,UART0_PORT_F                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               A13-OLinuXinoM                       sun5i:A13_OLINUXINOM,SPL,NO_AXP,STATUSLED=201,CONS_INDEX=2                                                                        -
++Active  arm         armv7          sunxi       -               sunxi               A13-OLinuXinoM_FEL                   sun5i:A13_OLINUXINOM,SPL_FEL,NO_AXP,STATUSLED=201,CONS_INDEX=2                                                                    -
++Active  arm         armv7          sunxi       -               sunxi               A13_MID                              sun5i:A13_MID,SPL,CONS_INDEX=2                                                                                                    -
++Active  arm         armv7          sunxi       -               sunxi               A20-OLinuXino_Lime                   sun7i:A20_OLINUXINO_L,CONS_INDEX=1,STATUSLED=226,SPL,SUNXI_EMAC                                                                   -
++Active  arm         armv7          sunxi       -               sunxi               A20-OLinuXino_Lime2                  sun7i:A20_OLINUXINO_L2,CONS_INDEX=1,STATUSLED=226,SPL,SUNXI_GMAC                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               A20-OLinuXino_MICRO                  sun7i:A20_OLINUXINO_M,CONS_INDEX=1,STATUSLED=226,SPL,SUNXI_EMAC                                                                   -
++Active  arm         armv7          sunxi       -               sunxi               A20-OLinuXino_MICRO_FEL              sun7i:A20_OLINUXINO_M,CONS_INDEX=1,STATUSLED=226,SPL_FEL,SUNXI_EMAC                                                               -
++Active  arm         armv7          sunxi       -               sunxi               A20-SOM                              sun7i:A20_SOM,SPL,SUNXI_GMAC,RGMII,STATUSLED1=245,FAST_MBUS                                                                       -
++Active  arm         armv7          sunxi       -               sunxi               Ainol_AW1                            sun7i:AINOL_AW1,SPL                                                                                                               -
++Active  arm         armv7          sunxi       -               sunxi               Ampe_A76                             sun5i:AMPE_A76,SPL,CONS_INDEX=2                                                                                                   -
++Active  arm         armv7          sunxi       -               sunxi               Auxtek-T003                          sun5i:AUXTEK_T003,SPL,AXP152_POWER,STATUSLED=34                                                                                   -
++Active  arm         armv7          sunxi       -               sunxi               Auxtek-T004                          sun5i:AUXTEK_T004,SPL,AXP152_POWER,STATUSLED=34                                                                                   -
++Active  arm         armv7          sunxi       -               sunxi               ba10_tv_box                          sun4i:BA10_TV_BOX,SPL,SUNXI_EMAC                                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               Bananapi                             sun7i:BANANAPI,SPL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=244,STATUSLED1=245,FAST_MBUS                                   -
++Active  arm         armv7          sunxi       -               sunxi               Bananapi_FEL                         sun7i:BANANAPI,SPL_FEL,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),STATUSLED=244,STATUSLED1=245,FAST_MBUS                               -
++Active  arm         armv7          sunxi       -               sunxi               Coby_MID7042                         sun4i:COBY_MID7042,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Coby_MID8042                         sun4i:COBY_MID8042,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Coby_MID9742                         sun4i:COBY_MID9742,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Iteaduino_Plus_A10                   sun4i:ITEADA10,SPL,SUNXI_EMAC,STATUSLED=244,STATUSLED1=245                                                                        -
++Active  arm         armv7          sunxi       -               sunxi               Iteaduino_Plus_A20                   sun7i:ITEADA20,SPL,SUNXI_EMAC,STATUSLED=244,STATUSLED1=245                                                                        -
++Active  arm         armv7          sunxi       -               sunxi               Colombus                             sun6i:COLOMBUS,AXP221_POWER,ENABLE_DLDO1_POWER                                                                                    -
++Active  arm         armv7          sunxi       -               sunxi               Ippo_q8h                             sun8i:IPPO_Q8H,NO_AXP,CONS_INDEX=5                                                                                                -
++Active  arm         armv7          sunxi       -               sunxi               Cubieboard                           sun4i:CUBIEBOARD,SPL,SUNXI_EMAC,STATUSLED=244,STATUSLED1=245                                                                      -
++Active  arm         armv7          sunxi       -               sunxi               Cubieboard2                          sun7i:CUBIEBOARD2,SPL,SUNXI_GMAC,STATUSLED=244,STATUSLED1=245,FAST_MBUS                                                           -
++Active  arm         armv7          sunxi       -               sunxi               Cubieboard2_FEL                      sun7i:CUBIEBOARD2,SPL_FEL,SUNXI_GMAC,STATUSLED=244,STATUSLED1=245,FAST_MBUS                                                       -
++Active  arm         armv7          sunxi       -               sunxi               Cubietruck                           sun7i:CUBIETRUCK,SPL,SUNXI_GMAC,RGMII,STATUSLED=245,STATUSLED1=244,STATUSLED2=235,STATUSLED3=231,FAST_MBUS                        -
++Active  arm         armv7          sunxi       -               sunxi               Cubietruck_FEL                       sun7i:CUBIETRUCK,SPL_FEL,SUNXI_GMAC,RGMII,STATUSLED=245,STATUSLED1=244,STATUSLED2=235,STATUSLED3=231,FAST_MBUS                    -
++Active  arm         armv7          sunxi       -               sunxi               Cubieboard_FEL                       sun4i:CUBIEBOARD,SPL_FEL,SUNXI_EMAC,STATUSLED=244,STATUSLED1=245                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               DNS_M82                              sun4i:DNS_M82,SPL                                                                                                                 -
++Active  arm         armv7          sunxi       -               sunxi               EOMA68_A10                           sun4i:EOMA68_A10,SPL,MMC_SUNXI_SLOT=3,SUNXI_EMAC                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               EOMA68_A10_FEL                       sun4i:EOMA68_A10,SPL_FEL,MMC_SUNXI_SLOT=3,SUNXI_EMAC                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               EOMA68_A20                           sun7i:EOMA68_A20,SPL,MMC_SUNXI_SLOT=3,SUNXI_EMAC                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               EOMA68_A20_FEL                       sun7i:EOMA68_A20,SPL_FEL,MMC_SUNXI_SLOT=3,SUNXI_EMAC                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               EU3000                               sun7i:EU3000,SPL                                                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               Forfun_Q88DB                         sun7i:FORFUN_Q88DB,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Gooseberry_A721                      sun4i:GOOSEBERRY_A721,SPL                                                                                                         -
++Active  arm         armv7          sunxi       -               sunxi               H6                                   sun4i:H6,SPL                                                                                                                      -
++Active  arm         armv7          sunxi       -               sunxi               Hackberry                            sun4i:HACKBERRY,SPL,SUNXI_EMAC,MACPWR=SUNXI_GPH(19)                                                                               -
++Active  arm         armv7          sunxi       -               sunxi               HBD_MID_S906                         sun7i:HBD_MID_S906,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               HCore_HC860                          sun4i:HCORE_HC860,SPL                                                                                                             -
++Active  arm         armv7          sunxi       -               sunxi               Hyundai_A7                           sun4i:HYUNDAI_A7,SPL                                                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               Hyundai_A7HD                         sun4i:A7HD,SPL                                                                                                                    -
++Active  arm         armv7          sunxi       -               sunxi               i12-tvbox                            sun7i:I12_TVBOX,SPL,FAST_MBUS,STATUSLED=244                                                                                       -
++Active  arm         armv7          sunxi       -               sunxi               ICOU_Fatty_I                         sun7i:ICOU_FATTY_I,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Interra-3                            sun7i:INTERRA3,SPL,SUNXI_GMAC,FAST_MBUS,MMC_SUNXI_SLOT=2                                                                          -
++Active  arm         armv7          sunxi       -               sunxi               INet_86VZ                            sun5i:INET_86VZ,SPL														  -
++Active  arm         armv7          sunxi       -               sunxi               INet_86VZ_FEL                        sun5i:INET_86VZ,SPL_FEL,UART0_PORT_F                                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               INet97F-II                           sun4i:INET97F_II,SPL                                                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               INet_K70HC                           sun7i:INET_K70HC,SPL                                                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               Jesurun-Q5                           sun4i:JESURUN_Q5,SPL,SUNXI_EMAC,STATUSLED=244                                                                                     -
++Active  arm         armv7          sunxi       -               sunxi               K1001L1C                             sun7i:K1001L1C,SPL                                                                                                                -
++Active  arm         armv7          sunxi       -               sunxi               Kurio_7S                             sun7i:KURIO_7S,SPL                                                                                                                -
++Active  arm         armv7          sunxi       -               sunxi               Langcent_H6S                         sun7i:LANGCENT_H6S,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Linksprite_pcDuino3                  sun7i:LINKSPRITE_PCDUINO3,SPL,SUNXI_GMAC,FAST_MBUS                                                                                -
++Active  arm         armv7          sunxi       -               sunxi               Marsboard_A10                        sun4i:MARSBOARD_A10,SPL,SUNXI_EMAC,NO_AXP                                                                                         -
++Active  arm         armv7          sunxi       -               sunxi               Marsboard_A20                        sun7i:MARSBOARD_A20,SPL,SUNXI_EMAC,NO_AXP                                                                                         -
++Active  arm         armv7          sunxi       -               sunxi               Marsboard_A20_debug                  sun7i:MARSBOARD_A20,SPL,SUNXI_EMAC,NO_AXP,SYS_SECONDARY_ON                                                                        -
++Active  arm         armv7          sunxi       -               sunxi               Megafeis_A08                         sun5i:MEFAFEIS_A08,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Mele_A1000                           sun4i:MELE_A1000,SPL,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),STATUSLED=234                                                                -
++Active  arm         armv7          sunxi       -               sunxi               Mele_A1000_FEL                       sun4i:MELE_A1000,SPL_FEL,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),STATUSLED=234                                                            -
++Active  arm         armv7          sunxi       -               sunxi               Mele_A1000G                          sun4i:MELE_A1000G,SPL,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),STATUSLED=234                                                               -
++Active  arm         armv7          sunxi       -               sunxi               Mele_A3700                           sun4i:MELE_A3700,SPL,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),STATUSLED=234                                                                -
++Active  arm         armv7          sunxi       -               sunxi               Merrii_Hummingbird_A20               sun7i:MERRII_HUMMINGBIRD_A20,SPL                                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               merrii_m2                            sun7i:MERRII_M2,SPL,SUNXI_EMAC                                                                                                    -
++Active  arm         armv7          sunxi       -               sunxi               Mini-X                               sun4i:MINI_X,SPL                                                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               Mini-X-1Gb                           sun4i:MINI_X_1GB,SPL                                                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               Mini-X_A10s                          sun5i:MINI_X_A10S,SPL                                                                                                             -
++Active  arm         armv7          sunxi       -               sunxi               mk802                                sun4i:MK802,SPL,NO_AXP                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               mk802-1gb                            sun4i:MK802_1GB,SPL,NO_AXP                                                                                                        -
++Active  arm         armv7          sunxi       -               sunxi               mk802_a10s                           sun5i:MK802_A10S,SPL,AXP152_POWER,STATUSLED=34                                                                                    -
++Active  arm         armv7          sunxi       -               sunxi               mk802ii_A20                          sun7i:MK802II_A20,SPL                                                                                                             -
++Active  arm         armv7          sunxi       -               sunxi               mk802ii                              sun4i:MK802II,SPL                                                                                                                 -
++Active  arm         armv7          sunxi       -               sunxi               mk808c_A20                           sun7i:MK808C_A20,SPL                                                                                                              -
++Active  arm         armv7          sunxi       -               sunxi               OLIMEX-A13-SOM                       sun5i:OLIMEX_A13_SOM,SPL,NO_AXP,STATUSLED=201,CONS_INDEX=2                                                                        -
++Active  arm         armv7          sunxi       -               sunxi               pcDuino                              sun4i:PCDUINO,SPL,SUNXI_EMAC                                                                                                      -
++Active  arm         armv7          sunxi       -               sunxi               pengpod1000                          sun4i:PENGPOD1000,SPL                                                                                                             -
++Active  arm         armv7          sunxi       -               sunxi               pengpod700                           sun4i:PENGPOD700,SPL                                                                                                              -
++Active	arm         armv7          suxni       -               sunxi               pineriver-h25                        sun5i:PINERIVER-H25,SPL
++Active  arm         armv7          sunxi       -               sunxi               POV_TAB_P703                         sun5i:POV_TAB_P703,SPL                                                                                                            -
++Active  arm         armv7          sunxi       -               sunxi               PoV_ProTab2_IPS9                     sun4i:POV_PROTAB2,SPL                                                                                                             -
++Active  arm         armv7          sunxi       -               sunxi               PoV_ProTab2_IPS_3g                   sun4i:POV_PROTAB2,SPL                                                                                                             -
++Active  arm         armv7          sunxi       -               sunxi               PoV_ProTab2_XXL                      sun4i:POV_PROTAB2_XXL,SPL                                                                                                         -
++Active  arm         armv7          sunxi       -               sunxi               qt840a                               sun7i:QT840A,SPL,FAST_MBUS,STATUSLED=244                                                                                          -
++Active  arm         armv7          sunxi       -               sunxi               r7-tv-dongle                         sun5i:R7DONGLE,SPL,AXP152_POWER,STATUSLED=34                                                                                      -
++Active  arm         armv7          sunxi       -               sunxi               Sanei_N90                            sun4i:SANEI_N90,SPL                                                                                                               -
++Active  arm         armv7          sunxi       -               sunxi               Semitime_G2                          sun5i:SEMITIME_G2,SPL,AXP152_POWER,STATUSLED=34                                                                                   -
++Active  arm         armv7          sunxi       -               sunxi               sun4i                                sun4i:SUNXI_EMAC                                                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               sun4i_sdcon                          sun4i:UART0_PORT_F,SUNXI_EMAC                                                                                                     -
++Active  arm         armv7          sunxi       -               sunxi               sun5i                                sun5i:SUNXI_EMAC                                                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               sun5i_sdcon                          sun5i:UART0_PORT_F,SUNXI_EMAC                                                                                                     -
++Active  arm         armv7          sunxi       -               sunxi               sun5i_uart1                          sun5i:CONS_INDEX=2,SUNXI_EMAC                                                                                                     -
++Active  arm         armv7          sunxi       -               sunxi               TZX-Q8-713B6                         sun5i:TZX_Q8_713B6,SPL,CONS_INDEX=2                                                                                               -
++Active  arm         armv7          sunxi       -               sunxi               TZX-Q8-713B7                         sun5i:TZX_Q8_713B7,SPL,CONS_INDEX=2                                                                                               -
++Active  arm         armv7          sunxi       -               sunxi               uhost_u1a                            sun4i:UHOST_U1A,SPL,STATUSLED=34                                                                                                  -
++Active  arm         armv7          sunxi       -               sunxi               Wexler_TAB_7200                      sun7i:WEXLER_TAB_7200,SPL                                                                                                         -
++Active  arm         armv7          sunxi       -               sunxi               wobo-i5                              sun5i:WOBO_I5,SPL,STATUSLED=34                                                                                                    -
++Active  arm         armv7          sunxi       -               sunxi               xzpad700                             sun5i:XZPAD700,SPL                                                                                                                -
++Active  arm         armv7          sunxi       -               sunxi               zatab                                sun4i:ZATAB,SPL                                                                                                                   -
+ Active  arm         armv7          u8500       st-ericsson     snowball            snowball                             -                                                                                                                                 Mathieu Poirier <mathieu.poirier@linaro.org>
+ Active  arm         armv7          u8500       st-ericsson     u8500               u8500_href                           -                                                                                                                                 -
+ Active  arm         armv7          vf610       freescale       vf610twr            vf610twr                             vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg                                                                         Alison Wang <b18965@freescale.com>
+diff -ruN u-boot-2014.04/common/spl/spl_mmc.c u-boot-sunxi/common/spl/spl_mmc.c
+--- u-boot-2014.04/common/spl/spl_mmc.c	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/common/spl/spl_mmc.c	2014-09-06 16:58:36.205953114 +0200
+@@ -29,8 +29,10 @@
+ 	if (err == 0)
+ 		goto end;
+ 
+-	if (image_get_magic(header) != IH_MAGIC)
++	if (image_get_magic(header) != IH_MAGIC) {
++		printf("spl: not an uImage at %lu\n", sector);
+ 		return -1;
++	}
+ 
+ 	spl_parse_image_header(header);
+ 
+diff -ruN u-boot-2014.04/drivers/gpio/Makefile u-boot-sunxi/drivers/gpio/Makefile
+--- u-boot-2014.04/drivers/gpio/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/gpio/Makefile	2014-09-06 16:58:36.253953113 +0200
+@@ -34,3 +34,4 @@
+ obj-$(CONFIG_ADI_GPIO2)	+= adi_gpio2.o
+ obj-$(CONFIG_TCA642X)		+= tca642x.o
+ oby-$(CONFIG_SX151X)		+= sx151x.o
++obj-$(CONFIG_SUNXI_GPIO)	+= sunxi_gpio.o
+diff -ruN u-boot-2014.04/drivers/gpio/sunxi_gpio.c u-boot-sunxi/drivers/gpio/sunxi_gpio.c
+--- u-boot-2014.04/drivers/gpio/sunxi_gpio.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/drivers/gpio/sunxi_gpio.c	2014-09-06 16:58:36.253953113 +0200
+@@ -0,0 +1,102 @@
++/*
++ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * Based on earlier arch/arm/cpu/armv7/sunxi/gpio.c:
++ *
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/gpio.h>
++
++static int sunxi_gpio_output(u32 pin, u32 val)
++{
++	u32 dat;
++	u32 bank = GPIO_BANK(pin);
++	u32 num = GPIO_NUM(pin);
++	struct sunxi_gpio *pio = BANK_TO_GPIO(bank);
++
++	dat = readl(&pio->dat);
++	if (val)
++		dat |= 0x1 << num;
++	else
++		dat &= ~(0x1 << num);
++
++	writel(dat, &pio->dat);
++
++	return 0;
++}
++
++static int sunxi_gpio_input(u32 pin)
++{
++	u32 dat;
++	u32 bank = GPIO_BANK(pin);
++	u32 num = GPIO_NUM(pin);
++	struct sunxi_gpio *pio = BANK_TO_GPIO(bank);
++
++	dat = readl(&pio->dat);
++	dat >>= num;
++
++	return dat & 0x1;
++}
++
++int gpio_request(unsigned gpio, const char *label)
++{
++	return 0;
++}
++
++int gpio_free(unsigned gpio)
++{
++	return 0;
++}
++
++int gpio_direction_input(unsigned gpio)
++{
++	sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_INPUT);
++
++	return sunxi_gpio_input(gpio);
++}
++
++int gpio_direction_output(unsigned gpio, int value)
++{
++	sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_OUTPUT);
++
++	return sunxi_gpio_output(gpio, value);
++}
++
++int gpio_get_value(unsigned gpio)
++{
++	return sunxi_gpio_input(gpio);
++}
++
++int gpio_set_value(unsigned gpio, int value)
++{
++	return sunxi_gpio_output(gpio, value);
++}
++
++int sunxi_name_to_gpio(const char *name)
++{
++	int group = 0;
++	int groupsize = 9 * 32;
++	long pin;
++	char *eptr;
++	if (*name == 'P' || *name == 'p')
++		name++;
++	if (*name >= 'A') {
++		group = *name - (*name > 'a' ? 'a' : 'A');
++		groupsize = 32;
++		name++;
++	}
++
++	pin = simple_strtol(name, &eptr, 10);
++	if (!*name || *eptr)
++		return -1;
++	if (pin < 0 || pin > groupsize || group >= 9)
++		return -1;
++	return group * 32 + pin;
++}
+diff -ruN u-boot-2014.04/drivers/i2c/Makefile u-boot-sunxi/drivers/i2c/Makefile
+--- u-boot-2014.04/drivers/i2c/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/i2c/Makefile	2014-09-06 16:58:36.265953112 +0200
+@@ -27,5 +27,6 @@
+ obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o
+ obj-$(CONFIG_SYS_I2C_SH) += sh_i2c.o
+ obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
++obj-$(CONFIG_SYS_I2C_SUNXI) += mvtwsi.o
+ obj-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o
+ obj-$(CONFIG_SYS_I2C_ZYNQ) += zynq_i2c.o
+diff -ruN u-boot-2014.04/drivers/i2c/mvtwsi.c u-boot-sunxi/drivers/i2c/mvtwsi.c
+--- u-boot-2014.04/drivers/i2c/mvtwsi.c	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/i2c/mvtwsi.c	2014-09-06 16:58:36.265953112 +0200
+@@ -22,6 +22,8 @@
+ #include <asm/arch/orion5x.h>
+ #elif defined(CONFIG_KIRKWOOD)
+ #include <asm/arch/kirkwood.h>
++#elif defined(CONFIG_SUNXI)
++#include <asm/arch/i2c.h>
+ #else
+ #error Driver mvtwsi not supported by SoC or board
+ #endif
+@@ -30,6 +32,20 @@
+  * TWSI register structure
+  */
+ 
++#ifdef CONFIG_SUNXI
++
++struct  mvtwsi_registers {
++	u32 slave_address;
++	u32 xtnd_slave_addr;
++	u32 data;
++	u32 control;
++	u32 status;
++	u32 baudrate;
++	u32 soft_reset;
++};
++
++#else
++
+ struct  mvtwsi_registers {
+ 	u32 slave_address;
+ 	u32 data;
+@@ -43,6 +59,8 @@
+ 	u32 soft_reset;
+ };
+ 
++#endif
++
+ /*
+  * Control register fields
+  */
+@@ -216,21 +234,7 @@
+  */
+ 
+ #define TWSI_FREQUENCY(m, n) \
+-	((u8) (CONFIG_SYS_TCLK / (10 * (m + 1) * 2 * (1 << n))))
+-
+-/*
+- * These are required to be reprogrammed before enabling the controller
+- * because a reset loses them.
+- * Default values come from the spec, but a twsi_reset will change them.
+- * twsi_slave_address left uninitialized lest checkpatch.pl complains.
+- */
+-
+-/* Baudrate generator: m (bits 7..4) =4, n (bits 3..0) =4 */
+-static u8 twsi_baud_rate = 0x44; /* baudrate at controller reset */
+-/* Default frequency corresponding to default m=4, n=4 */
+-static u8 twsi_actual_speed = TWSI_FREQUENCY(4, 4);
+-/* Default slave address is 0 (so is an uninitialized static) */
+-static u8 twsi_slave_address;
++	(CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n)))
+ 
+ /*
+  * Reset controller.
+@@ -238,7 +242,7 @@
+  * Controller reset also resets the baud rate and slave address, so
+  * re-establish them.
+  */
+-static void twsi_reset(void)
++static void twsi_reset(u8 baud_rate, u8 slave_address)
+ {
+ 	/* ensure controller will be enabled by any twsi*() function */
+ 	twsi_control_flags = MVTWSI_CONTROL_TWSIEN;
+@@ -247,9 +251,9 @@
+ 	/* wait 2 ms -- this is what the Marvell LSP does */
+ 	udelay(20000);
+ 	/* set baud rate */
+-	writel(twsi_baud_rate, &twsi->baudrate);
++	writel(baud_rate, &twsi->baudrate);
+ 	/* set slave address even though we don't use it */
+-	writel(twsi_slave_address, &twsi->slave_address);
++	writel(slave_address, &twsi->slave_address);
+ 	writel(0, &twsi->xtnd_slave_addr);
+ 	/* assert STOP but don't care for the result */
+ 	(void) twsi_stop(0);
+@@ -277,12 +281,8 @@
+ 			}
+ 		}
+ 	}
+-	/* save baud rate and slave for later calls to twsi_reset */
+-	twsi_baud_rate = baud;
+-	twsi_actual_speed = highest_speed;
+-	twsi_slave_address = slaveadd;
+ 	/* reset controller */
+-	twsi_reset();
++	twsi_reset(baud, slaveadd);
+ }
+ 
+ /*
+diff -ruN u-boot-2014.04/drivers/mmc/Makefile u-boot-sunxi/drivers/mmc/Makefile
+--- u-boot-2014.04/drivers/mmc/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/mmc/Makefile	2014-09-06 16:58:36.281953112 +0200
+@@ -28,6 +28,7 @@
+ obj-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
+ obj-$(CONFIG_DWMMC) += dw_mmc.o
+ obj-$(CONFIG_EXYNOS_DWMMC) += exynos_dw_mmc.o
++obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o
+ obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o
+ obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o
+ ifdef CONFIG_SPL_BUILD
+diff -ruN u-boot-2014.04/drivers/mmc/sunxi_mmc.c u-boot-sunxi/drivers/mmc/sunxi_mmc.c
+--- u-boot-2014.04/drivers/mmc/sunxi_mmc.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/drivers/mmc/sunxi_mmc.c	2014-09-06 16:58:36.281953112 +0200
+@@ -0,0 +1,385 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Aaron <leafy.myeh@allwinnertech.com>
++ *
++ * MMC driver for allwinner sunxi platform.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <malloc.h>
++#include <mmc.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/cpu.h>
++#include <asm/arch/mmc.h>
++
++struct sunxi_mmc_host {
++	unsigned mmc_no;
++	uint32_t *mclkreg;
++	unsigned database;
++	unsigned fatal_err;
++	unsigned mod_clk;
++	struct sunxi_mmc *reg;
++	struct mmc_config cfg;
++};
++
++/* support 4 mmc hosts */
++struct sunxi_mmc_host mmc_host[4];
++
++static int mmc_resource_init(int sdc_no)
++{
++	struct sunxi_mmc_host *mmchost = &mmc_host[sdc_no];
++	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	debug("init mmc %d resource\n", sdc_no);
++
++	switch (sdc_no) {
++	case 0:
++		mmchost->reg = (struct sunxi_mmc *)SUNXI_MMC0_BASE;
++		mmchost->mclkreg = &ccm->sd0_clk_cfg;
++		break;
++	case 1:
++		mmchost->reg = (struct sunxi_mmc *)SUNXI_MMC1_BASE;
++		mmchost->mclkreg = &ccm->sd1_clk_cfg;
++		break;
++	case 2:
++		mmchost->reg = (struct sunxi_mmc *)SUNXI_MMC2_BASE;
++		mmchost->mclkreg = &ccm->sd2_clk_cfg;
++		break;
++	case 3:
++		mmchost->reg = (struct sunxi_mmc *)SUNXI_MMC3_BASE;
++		mmchost->mclkreg = &ccm->sd3_clk_cfg;
++		break;
++	default:
++		printf("Wrong mmc number %d\n", sdc_no);
++		return -1;
++	}
++#ifdef CONFIG_SUN6I
++	mmchost->database = (unsigned int)mmchost->reg + 0x200;
++#else
++	mmchost->database = (unsigned int)mmchost->reg + 0x100;
++#endif
++	mmchost->mmc_no = sdc_no;
++
++	return 0;
++}
++
++static int mmc_clk_io_on(int sdc_no)
++{
++	unsigned int pll_clk;
++	unsigned int divider;
++	struct sunxi_mmc_host *mmchost = &mmc_host[sdc_no];
++	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++
++	debug("init mmc %d clock and io\n", sdc_no);
++
++	/* config ahb clock */
++	setbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_MMC(sdc_no));
++
++#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN8I)
++	/* unassert reset */
++	setbits_le32(&ccm->ahb_reset0_cfg, 1 << AHB_RESET_OFFSET_MMC(sdc_no));
++#endif
++
++	/* config mod clock */
++	pll_clk = clock_get_pll6();
++	/* should be close to 100 MHz but no more, so round up */
++	divider = ((pll_clk + 99999999) / 100000000) - 1;
++	writel(CCM_MMC_CTRL_ENABLE | CCM_MMC_CTRL_PLL6 | divider,
++	       mmchost->mclkreg);
++	mmchost->mod_clk = pll_clk / (divider + 1);
++
++	return 0;
++}
++
++static int mmc_update_clk(struct mmc *mmc)
++{
++	struct sunxi_mmc_host *mmchost = mmc->priv;
++	unsigned int cmd;
++	unsigned timeout_msecs = 2000;
++
++	cmd = SUNXI_MMC_CMD_START |
++	      SUNXI_MMC_CMD_UPCLK_ONLY |
++	      SUNXI_MMC_CMD_WAIT_PRE_OVER;
++	writel(cmd, &mmchost->reg->cmd);
++	while (readl(&mmchost->reg->cmd) & SUNXI_MMC_CMD_START) {
++		if (!timeout_msecs--)
++			return -1;
++		udelay(1000);
++	}
++
++	/* clock update sets various irq status bits, clear these */
++	writel(readl(&mmchost->reg->rint), &mmchost->reg->rint);
++
++	return 0;
++}
++
++static int mmc_config_clock(struct mmc *mmc, unsigned div)
++{
++	struct sunxi_mmc_host *mmchost = mmc->priv;
++	unsigned rval = readl(&mmchost->reg->clkcr);
++
++	/* Disable Clock */
++	rval &= ~SUNXI_MMC_CLK_ENABLE;
++	writel(rval, &mmchost->reg->clkcr);
++	if (mmc_update_clk(mmc))
++		return -1;
++
++	/* Change Divider Factor */
++	rval &= ~SUNXI_MMC_CLK_DIVIDER_MASK;
++	rval |= div;
++	writel(rval, &mmchost->reg->clkcr);
++	if (mmc_update_clk(mmc))
++		return -1;
++	/* Re-enable Clock */
++	rval |= SUNXI_MMC_CLK_ENABLE;
++	writel(rval, &mmchost->reg->clkcr);
++
++	if (mmc_update_clk(mmc))
++		return -1;
++
++	return 0;
++}
++
++static void mmc_set_ios(struct mmc *mmc)
++{
++	struct sunxi_mmc_host *mmchost = mmc->priv;
++	unsigned int clkdiv = 0;
++
++	debug("set ios: bus_width: %x, clock: %d, mod_clk: %d\n",
++	      mmc->bus_width, mmc->clock, mmchost->mod_clk);
++
++	/* Change clock first */
++	clkdiv = (mmchost->mod_clk + (mmc->clock >> 1)) / mmc->clock / 2;
++	if (mmc->clock) {
++		if (mmc_config_clock(mmc, clkdiv)) {
++			mmchost->fatal_err = 1;
++			return;
++		}
++	}
++
++	/* Change bus width */
++	if (mmc->bus_width == 8)
++		writel(0x2, &mmchost->reg->width);
++	else if (mmc->bus_width == 4)
++		writel(0x1, &mmchost->reg->width);
++	else
++		writel(0x0, &mmchost->reg->width);
++}
++
++static int mmc_core_init(struct mmc *mmc)
++{
++	struct sunxi_mmc_host *mmchost = mmc->priv;
++
++	/* Reset controller */
++	writel(SUNXI_MMC_GCTRL_RESET, &mmchost->reg->gctrl);
++	udelay(1000);
++
++	return 0;
++}
++
++static int mmc_trans_data_by_cpu(struct mmc *mmc, struct mmc_data *data)
++{
++	struct sunxi_mmc_host *mmchost = mmc->priv;
++	const int reading = !!(data->flags & MMC_DATA_READ);
++	const uint32_t status_bit = reading ? SUNXI_MMC_STATUS_FIFO_EMPTY :
++					      SUNXI_MMC_STATUS_FIFO_FULL;
++	unsigned i;
++	unsigned byte_cnt = data->blocksize * data->blocks;
++	unsigned timeout_msecs = 2000;
++	unsigned *buff = (unsigned int *)(reading ? data->dest : data->src);
++
++	/* Always read / write data through the CPU */
++	setbits_le32(&mmchost->reg->gctrl, SUNXI_MMC_GCTRL_ACCESS_BY_AHB);
++
++	for (i = 0; i < (byte_cnt >> 2); i++) {
++		while (readl(&mmchost->reg->status) & status_bit) {
++			if (!timeout_msecs--)
++				return -1;
++			udelay(1000);
++		}
++
++		if (reading)
++			buff[i] = readl(mmchost->database);
++		else
++			writel(buff[i], mmchost->database);
++	}
++
++	return 0;
++}
++
++static int mmc_rint_wait(struct mmc *mmc, unsigned int timeout_msecs,
++			 unsigned int done_bit, const char *what)
++{
++	struct sunxi_mmc_host *mmchost = mmc->priv;
++	unsigned int status;
++
++	do {
++		status = readl(&mmchost->reg->rint);
++		if (!timeout_msecs-- ||
++		    (status & SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT)) {
++			debug("%s timeout %x\n", what,
++			      status & SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT);
++			return TIMEOUT;
++		}
++		udelay(1000);
++	} while (!(status & done_bit));
++
++	return 0;
++}
++
++static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
++			struct mmc_data *data)
++{
++	struct sunxi_mmc_host *mmchost = mmc->priv;
++	unsigned int cmdval = SUNXI_MMC_CMD_START;
++	unsigned int timeout_msecs;
++	int error = 0;
++	unsigned int status = 0;
++	unsigned int bytecnt = 0;
++
++	if (mmchost->fatal_err)
++		return -1;
++	if (cmd->resp_type & MMC_RSP_BUSY)
++		debug("mmc cmd %d check rsp busy\n", cmd->cmdidx);
++	if (cmd->cmdidx == 12)
++		return 0;
++
++	if (!cmd->cmdidx)
++		cmdval |= SUNXI_MMC_CMD_SEND_INIT_SEQ;
++	if (cmd->resp_type & MMC_RSP_PRESENT)
++		cmdval |= SUNXI_MMC_CMD_RESP_EXPIRE;
++	if (cmd->resp_type & MMC_RSP_136)
++		cmdval |= SUNXI_MMC_CMD_LONG_RESPONSE;
++	if (cmd->resp_type & MMC_RSP_CRC)
++		cmdval |= SUNXI_MMC_CMD_CHK_RESPONSE_CRC;
++
++	if (data) {
++		if ((u32) data->dest & 0x3) {
++			error = -1;
++			goto out;
++		}
++
++		cmdval |= SUNXI_MMC_CMD_DATA_EXPIRE|SUNXI_MMC_CMD_WAIT_PRE_OVER;
++		if (data->flags & MMC_DATA_WRITE)
++			cmdval |= SUNXI_MMC_CMD_WRITE;
++		if (data->blocks > 1)
++			cmdval |= SUNXI_MMC_CMD_AUTO_STOP;
++		writel(data->blocksize, &mmchost->reg->blksz);
++		writel(data->blocks * data->blocksize, &mmchost->reg->bytecnt);
++	}
++
++	debug("mmc %d, cmd %d(0x%08x), arg 0x%08x\n", mmchost->mmc_no,
++	      cmd->cmdidx, cmdval | cmd->cmdidx, cmd->cmdarg);
++	writel(cmd->cmdarg, &mmchost->reg->arg);
++
++	if (!data)
++		writel(cmdval | cmd->cmdidx, &mmchost->reg->cmd);
++
++	/*
++	 * transfer data and check status
++	 * STATREG[2] : FIFO empty
++	 * STATREG[3] : FIFO full
++	 */
++	if (data) {
++		int ret = 0;
++
++		bytecnt = data->blocksize * data->blocks;
++		debug("trans data %d bytes\n", bytecnt);
++		writel(cmdval | cmd->cmdidx, &mmchost->reg->cmd);
++		ret = mmc_trans_data_by_cpu(mmc, data);
++		if (ret) {
++			error = readl(&mmchost->reg->rint) & \
++				SUNXI_MMC_RINT_INTERRUPT_ERROR_BIT;
++			error = TIMEOUT;
++			goto out;
++		}
++	}
++
++	error = mmc_rint_wait(mmc, 0xfffff, SUNXI_MMC_RINT_COMMAND_DONE, "cmd");
++	if (error)
++		goto out;
++
++	if (data) {
++		timeout_msecs = 120;
++		debug("cacl timeout %x msec\n", timeout_msecs);
++		error = mmc_rint_wait(mmc, timeout_msecs,
++				      data->blocks > 1 ?
++				      SUNXI_MMC_RINT_AUTO_COMMAND_DONE :
++				      SUNXI_MMC_RINT_DATA_OVER,
++				      "data");
++		if (error)
++			goto out;
++	}
++
++	if (cmd->resp_type & MMC_RSP_BUSY) {
++		timeout_msecs = 2000;
++		do {
++			status = readl(&mmchost->reg->status);
++			if (!timeout_msecs--) {
++				debug("busy timeout\n");
++				error = TIMEOUT;
++				goto out;
++			}
++			udelay(1000);
++		} while (status & SUNXI_MMC_STATUS_CARD_DATA_BUSY);
++	}
++
++	if (cmd->resp_type & MMC_RSP_136) {
++		cmd->response[0] = readl(&mmchost->reg->resp3);
++		cmd->response[1] = readl(&mmchost->reg->resp2);
++		cmd->response[2] = readl(&mmchost->reg->resp1);
++		cmd->response[3] = readl(&mmchost->reg->resp0);
++		debug("mmc resp 0x%08x 0x%08x 0x%08x 0x%08x\n",
++		      cmd->response[3], cmd->response[2],
++		      cmd->response[1], cmd->response[0]);
++	} else {
++		cmd->response[0] = readl(&mmchost->reg->resp0);
++		debug("mmc resp 0x%08x\n", cmd->response[0]);
++	}
++out:
++	if (error < 0) {
++		writel(SUNXI_MMC_GCTRL_RESET, &mmchost->reg->gctrl);
++		mmc_update_clk(mmc);
++	}
++	writel(0xffffffff, &mmchost->reg->rint);
++	writel(readl(&mmchost->reg->gctrl) | SUNXI_MMC_GCTRL_FIFO_RESET,
++	       &mmchost->reg->gctrl);
++
++	return error;
++}
++
++static const struct mmc_ops sunxi_mmc_ops = {
++	.send_cmd	= mmc_send_cmd,
++	.set_ios	= mmc_set_ios,
++	.init		= mmc_core_init,
++};
++
++int sunxi_mmc_init(int sdc_no)
++{
++	struct mmc_config *cfg = &mmc_host[sdc_no].cfg;
++
++	memset(&mmc_host[sdc_no], 0, sizeof(struct sunxi_mmc_host));
++
++	cfg->name = "SUNXI SD/MMC";
++	cfg->ops  = &sunxi_mmc_ops;
++
++	cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
++	cfg->host_caps = MMC_MODE_4BIT;
++	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
++	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
++
++	cfg->f_min = 400000;
++	cfg->f_max = 52000000;
++
++	mmc_resource_init(sdc_no);
++	mmc_clk_io_on(sdc_no);
++
++	if (mmc_create(cfg, &mmc_host[sdc_no]) == NULL)
++		return -1;
++
++	return 0;
++}
+diff -ruN u-boot-2014.04/drivers/net/designware.c u-boot-sunxi/drivers/net/designware.c
+--- u-boot-2014.04/drivers/net/designware.c	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/net/designware.c	2014-09-06 16:58:36.301953111 +0200
+@@ -249,7 +249,7 @@
+ 	rx_descs_init(dev);
+ 	tx_descs_init(dev);
+ 
+-	writel(FIXEDBURST | PRIORXTX_41 | BURST_16, &dma_p->busmode);
++	writel(FIXEDBURST | PRIORXTX_41 | DMA_PBL, &dma_p->busmode);
+ 
+ 	writel(readl(&dma_p->opmode) | FLUSHTXFIFO | STOREFORWARD,
+ 	       &dma_p->opmode);
+@@ -280,10 +280,18 @@
+ 	u32 desc_num = priv->tx_currdescnum;
+ 	struct dmamacdescr *desc_p = &priv->tx_mac_descrtable[desc_num];
+ 
+-	/* Invalidate only "status" field for the following check */
+-	invalidate_dcache_range((unsigned long)&desc_p->txrx_status,
+-				(unsigned long)&desc_p->txrx_status +
+-				sizeof(desc_p->txrx_status));
++	/*
++	 * Strictly we only need to invalidate the "txrx_status" field
++	 * for the following check, but on some platforms we cannot
++	 * invalidate only 4 bytes, so roundup to
++	 * ARCH_DMA_MINALIGN. This is safe because the individual
++	 * descriptors in the array are each aligned to
++	 * ARCH_DMA_MINALIGN.
++	 */
++	invalidate_dcache_range(
++		(unsigned long)desc_p,
++		(unsigned long)desc_p +
++		roundup(sizeof(desc_p->txrx_status), ARCH_DMA_MINALIGN));
+ 
+ 	/* Check if the descriptor is owned by CPU */
+ 	if (desc_p->txrx_status & DESC_TXSTS_OWNBYDMA) {
+@@ -351,7 +359,7 @@
+ 		/* Invalidate received data */
+ 		invalidate_dcache_range((unsigned long)desc_p->dmamac_addr,
+ 					(unsigned long)desc_p->dmamac_addr +
+-					length);
++					roundup(length, ARCH_DMA_MINALIGN));
+ 
+ 		NetReceive(desc_p->dmamac_addr, length);
+ 
+@@ -390,6 +398,8 @@
+ 	if (!phydev)
+ 		return -1;
+ 
++	phy_connect_dev(phydev, dev);
++
+ 	phydev->supported &= PHY_GBIT_FEATURES;
+ 	phydev->advertising = phydev->supported;
+ 
+@@ -412,7 +422,8 @@
+ 	 * Since the priv structure contains the descriptors which need a strict
+ 	 * buswidth alignment, memalign is used to allocate memory
+ 	 */
+-	priv = (struct dw_eth_dev *) memalign(16, sizeof(struct dw_eth_dev));
++	priv = (struct dw_eth_dev *) memalign(ARCH_DMA_MINALIGN,
++					      sizeof(struct dw_eth_dev));
+ 	if (!priv) {
+ 		free(dev);
+ 		return -ENOMEM;
+diff -ruN u-boot-2014.04/drivers/net/designware.h u-boot-sunxi/drivers/net/designware.h
+--- u-boot-2014.04/drivers/net/designware.h	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/net/designware.h	2014-09-06 16:58:36.301953111 +0200
+@@ -77,18 +77,18 @@
+ 
+ #define DW_DMA_BASE_OFFSET	(0x1000)
+ 
++/* Default DMA Burst length */
++#ifndef CONFIG_DW_GMAC_DEFAULT_DMA_PBL
++#define CONFIG_DW_GMAC_DEFAULT_DMA_PBL 8
++#endif
++
+ /* Bus mode register definitions */
+ #define FIXEDBURST		(1 << 16)
+ #define PRIORXTX_41		(3 << 14)
+ #define PRIORXTX_31		(2 << 14)
+ #define PRIORXTX_21		(1 << 14)
+ #define PRIORXTX_11		(0 << 14)
+-#define BURST_1			(1 << 8)
+-#define BURST_2			(2 << 8)
+-#define BURST_4			(4 << 8)
+-#define BURST_8			(8 << 8)
+-#define BURST_16		(16 << 8)
+-#define BURST_32		(32 << 8)
++#define DMA_PBL			(CONFIG_DW_GMAC_DEFAULT_DMA_PBL<<8)
+ #define RXHIGHPRIO		(1 << 1)
+ #define DMAMAC_SRST		(1 << 0)
+ 
+@@ -215,15 +215,14 @@
+ #endif
+ 
+ struct dw_eth_dev {
+-	u32 interface;
+-	u32 tx_currdescnum;
+-	u32 rx_currdescnum;
+-
+ 	struct dmamacdescr tx_mac_descrtable[CONFIG_TX_DESCR_NUM];
+ 	struct dmamacdescr rx_mac_descrtable[CONFIG_RX_DESCR_NUM];
++	char txbuffs[TX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
++	char rxbuffs[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
+ 
+-	char txbuffs[TX_TOTAL_BUFSIZE];
+-	char rxbuffs[RX_TOTAL_BUFSIZE];
++	u32 interface;
++	u32 tx_currdescnum;
++	u32 rx_currdescnum;
+ 
+ 	struct eth_mac_regs *mac_regs_p;
+ 	struct eth_dma_regs *dma_regs_p;
+diff -ruN u-boot-2014.04/drivers/net/Makefile u-boot-sunxi/drivers/net/Makefile
+--- u-boot-2014.04/drivers/net/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/net/Makefile	2014-09-06 16:58:36.297953112 +0200
+@@ -50,7 +50,7 @@
+ obj-$(CONFIG_SH_ETHER) += sh_eth.o
+ obj-$(CONFIG_SMC91111) += smc91111.o
+ obj-$(CONFIG_SMC911X) += smc911x.o
+-obj-$(CONFIG_SUNXI_WEMAC) += sunxi_wemac.o
++obj-$(CONFIG_SUNXI_EMAC) += sunxi_emac.o
+ obj-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o
+ obj-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o
+ obj-$(CONFIG_DRIVER_TI_CPSW) += cpsw.o
+diff -ruN u-boot-2014.04/drivers/net/sunxi_emac.c u-boot-sunxi/drivers/net/sunxi_emac.c
+--- u-boot-2014.04/drivers/net/sunxi_emac.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/drivers/net/sunxi_emac.c	2014-09-06 16:58:36.317953111 +0200
+@@ -0,0 +1,521 @@
++/*
++ * sunxi_emac.c -- Allwinner A10 ethernet driver
++ *
++ * (C) Copyright 2012, Stefan Roese <sr@denx.de>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <linux/err.h>
++#include <malloc.h>
++#include <miiphy.h>
++#include <net.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/gpio.h>
++
++/* EMAC register  */
++struct emac_regs {
++	u32 ctl;	/* 0x00 */
++	u32 tx_mode;	/* 0x04 */
++	u32 tx_flow;	/* 0x08 */
++	u32 tx_ctl0;	/* 0x0c */
++	u32 tx_ctl1;	/* 0x10 */
++	u32 tx_ins;	/* 0x14 */
++	u32 tx_pl0;	/* 0x18 */
++	u32 tx_pl1;	/* 0x1c */
++	u32 tx_sta;	/* 0x20 */
++	u32 tx_io_data;	/* 0x24 */
++	u32 tx_io_data1;/* 0x28 */
++	u32 tx_tsvl0;	/* 0x2c */
++	u32 tx_tsvh0;	/* 0x30 */
++	u32 tx_tsvl1;	/* 0x34 */
++	u32 tx_tsvh1;	/* 0x38 */
++	u32 rx_ctl;	/* 0x3c */
++	u32 rx_hash0;	/* 0x40 */
++	u32 rx_hash1;	/* 0x44 */
++	u32 rx_sta;	/* 0x48 */
++	u32 rx_io_data;	/* 0x4c */
++	u32 rx_fbc;	/* 0x50 */
++	u32 int_ctl;	/* 0x54 */
++	u32 int_sta;	/* 0x58 */
++	u32 mac_ctl0;	/* 0x5c */
++	u32 mac_ctl1;	/* 0x60 */
++	u32 mac_ipgt;	/* 0x64 */
++	u32 mac_ipgr;	/* 0x68 */
++	u32 mac_clrt;	/* 0x6c */
++	u32 mac_maxf;	/* 0x70 */
++	u32 mac_supp;	/* 0x74 */
++	u32 mac_test;	/* 0x78 */
++	u32 mac_mcfg;	/* 0x7c */
++	u32 mac_mcmd;	/* 0x80 */
++	u32 mac_madr;	/* 0x84 */
++	u32 mac_mwtd;	/* 0x88 */
++	u32 mac_mrdd;	/* 0x8c */
++	u32 mac_mind;	/* 0x90 */
++	u32 mac_ssrr;	/* 0x94 */
++	u32 mac_a0;	/* 0x98 */
++	u32 mac_a1;	/* 0x9c */
++};
++
++/* SRAMC register  */
++struct sunxi_sramc_regs {
++	u32 ctrl0;
++	u32 ctrl1;
++};
++
++/* 0: Disable       1: Aborted frame enable(default) */
++#define EMAC_TX_AB_M		(0x1 << 0)
++/* 0: CPU           1: DMA(default) */
++#define EMAC_TX_TM		(0x1 << 1)
++
++#define EMAC_TX_SETUP		(0)
++
++/* 0: DRQ asserted  1: DRQ automatically(default) */
++#define EMAC_RX_DRQ_MODE	(0x1 << 1)
++/* 0: CPU           1: DMA(default) */
++#define EMAC_RX_TM		(0x1 << 2)
++/* 0: Normal(default)        1: Pass all Frames */
++#define EMAC_RX_PA		(0x1 << 4)
++/* 0: Normal(default)        1: Pass Control Frames */
++#define EMAC_RX_PCF		(0x1 << 5)
++/* 0: Normal(default)        1: Pass Frames with CRC Error */
++#define EMAC_RX_PCRCE		(0x1 << 6)
++/* 0: Normal(default)        1: Pass Frames with Length Error */
++#define EMAC_RX_PLE		(0x1 << 7)
++/* 0: Normal                 1: Pass Frames length out of range(default) */
++#define EMAC_RX_POR		(0x1 << 8)
++/* 0: Not accept             1: Accept unicast Packets(default) */
++#define EMAC_RX_UCAD		(0x1 << 16)
++/* 0: Normal(default)        1: DA Filtering */
++#define EMAC_RX_DAF		(0x1 << 17)
++/* 0: Not accept             1: Accept multicast Packets(default) */
++#define EMAC_RX_MCO		(0x1 << 20)
++/* 0: Disable(default)       1: Enable Hash filter */
++#define EMAC_RX_MHF		(0x1 << 21)
++/* 0: Not accept             1: Accept Broadcast Packets(default) */
++#define EMAC_RX_BCO		(0x1 << 22)
++/* 0: Disable(default)       1: Enable SA Filtering */
++#define EMAC_RX_SAF		(0x1 << 24)
++/* 0: Normal(default)        1: Inverse Filtering */
++#define EMAC_RX_SAIF		(0x1 << 25)
++
++#define EMAC_RX_SETUP		(EMAC_RX_POR | EMAC_RX_UCAD | EMAC_RX_DAF | \
++				 EMAC_RX_MCO | EMAC_RX_BCO)
++
++/* 0: Disable                1: Enable Receive Flow Control(default) */
++#define EMAC_MAC_CTL0_RFC	(0x1 << 2)
++/* 0: Disable                1: Enable Transmit Flow Control(default) */
++#define EMAC_MAC_CTL0_TFC	(0x1 << 3)
++
++#define EMAC_MAC_CTL0_SETUP	(EMAC_MAC_CTL0_RFC | EMAC_MAC_CTL0_TFC)
++
++/* 0: Disable                1: Enable MAC Frame Length Checking(default) */
++#define EMAC_MAC_CTL1_FLC	(0x1 << 1)
++/* 0: Disable(default)       1: Enable Huge Frame */
++#define EMAC_MAC_CTL1_HF	(0x1 << 2)
++/* 0: Disable(default)       1: Enable MAC Delayed CRC */
++#define EMAC_MAC_CTL1_DCRC	(0x1 << 3)
++/* 0: Disable                1: Enable MAC CRC(default) */
++#define EMAC_MAC_CTL1_CRC	(0x1 << 4)
++/* 0: Disable                1: Enable MAC PAD Short frames(default) */
++#define EMAC_MAC_CTL1_PC	(0x1 << 5)
++/* 0: Disable(default)       1: Enable MAC PAD Short frames and append CRC */
++#define EMAC_MAC_CTL1_VC	(0x1 << 6)
++/* 0: Disable(default)       1: Enable MAC auto detect Short frames */
++#define EMAC_MAC_CTL1_ADP	(0x1 << 7)
++/* 0: Disable(default)       1: Enable */
++#define EMAC_MAC_CTL1_PRE	(0x1 << 8)
++/* 0: Disable(default)       1: Enable */
++#define EMAC_MAC_CTL1_LPE	(0x1 << 9)
++/* 0: Disable(default)       1: Enable no back off */
++#define EMAC_MAC_CTL1_NB	(0x1 << 12)
++/* 0: Disable(default)       1: Enable */
++#define EMAC_MAC_CTL1_BNB	(0x1 << 13)
++/* 0: Disable(default)       1: Enable */
++#define EMAC_MAC_CTL1_ED	(0x1 << 14)
++
++#define EMAC_MAC_CTL1_SETUP	(EMAC_MAC_CTL1_FLC | EMAC_MAC_CTL1_CRC | \
++				 EMAC_MAC_CTL1_PC)
++
++#define EMAC_MAC_IPGT		0x15
++
++#define EMAC_MAC_NBTB_IPG1	0xc
++#define EMAC_MAC_NBTB_IPG2	0x12
++
++#define EMAC_MAC_CW		0x37
++#define EMAC_MAC_RM		0xf
++
++#define EMAC_MAC_MFL		0x0600
++
++/* Receive status */
++#define EMAC_CRCERR		(0x1 << 4)
++#define EMAC_LENERR		(0x3 << 5)
++
++#define DMA_CPU_TRRESHOLD	2000
++
++struct emac_eth_dev {
++	u32 speed;
++	u32 duplex;
++	u32 phy_configured;
++	int link_printed;
++};
++
++struct emac_rxhdr {
++	s16 rx_len;
++	u16 rx_status;
++};
++
++static void emac_inblk_32bit(void *reg, void *data, int count)
++{
++	int cnt = (count + 3) >> 2;
++
++	if (cnt) {
++		u32 *buf = data;
++
++		do {
++			u32 x = readl(reg);
++			*buf++ = x;
++		} while (--cnt);
++	}
++}
++
++static void emac_outblk_32bit(void *reg, void *data, int count)
++{
++	int cnt = (count + 3) >> 2;
++
++	if (cnt) {
++		const u32 *buf = data;
++
++		do {
++			writel(*buf++, reg);
++		} while (--cnt);
++	}
++}
++
++/* Read a word from phyxcer */
++static int emac_phy_read(const char *devname, unsigned char addr,
++			  unsigned char reg, unsigned short *value)
++{
++	struct eth_device *dev = eth_get_dev_by_name(devname);
++	struct emac_regs *regs = (struct emac_regs *)dev->iobase;
++
++	/* issue the phy address and reg */
++	writel(addr << 8 | reg, &regs->mac_madr);
++
++	/* pull up the phy io line */
++	writel(0x1, &regs->mac_mcmd);
++
++	/* Wait read complete */
++	mdelay(1);
++
++	/* push down the phy io line */
++	writel(0x0, &regs->mac_mcmd);
++
++	/* and write data */
++	*value = readl(&regs->mac_mrdd);
++
++	return 0;
++}
++
++/* Write a word to phyxcer */
++static int emac_phy_write(const char *devname, unsigned char addr,
++			   unsigned char reg, unsigned short value)
++{
++	struct eth_device *dev = eth_get_dev_by_name(devname);
++	struct emac_regs *regs = (struct emac_regs *)dev->iobase;
++
++	/* issue the phy address and reg */
++	writel(addr << 8 | reg, &regs->mac_madr);
++
++	/* pull up the phy io line */
++	writel(0x1, &regs->mac_mcmd);
++
++	/* Wait write complete */
++	mdelay(1);
++
++	/* push down the phy io line */
++	writel(0x0, &regs->mac_mcmd);
++
++	/* and write data */
++	writel(value, &regs->mac_mwtd);
++
++	return 0;
++}
++
++static void emac_setup(struct eth_device *dev)
++{
++	struct emac_regs *regs = (struct emac_regs *)dev->iobase;
++	u32 reg_val;
++	u16 phy_val;
++	u32 duplex_flag;
++
++	/* Set up TX */
++	writel(EMAC_TX_SETUP, &regs->tx_mode);
++
++	/* Set up RX */
++	writel(EMAC_RX_SETUP, &regs->rx_ctl);
++
++	/* Set MAC */
++	/* Set MAC CTL0 */
++	writel(EMAC_MAC_CTL0_SETUP, &regs->mac_ctl0);
++
++	/* Set MAC CTL1 */
++	emac_phy_read(dev->name, 1, 0, &phy_val);
++	debug("PHY SETUP, reg 0 value: %x\n", phy_val);
++	duplex_flag = !!(phy_val & (1 << 8));
++
++	reg_val = 0;
++	if (duplex_flag)
++		reg_val = (0x1 << 0);
++	writel(EMAC_MAC_CTL1_SETUP | reg_val, &regs->mac_ctl1);
++
++	/* Set up IPGT */
++	writel(EMAC_MAC_IPGT, &regs->mac_ipgt);
++
++	/* Set up IPGR */
++	writel(EMAC_MAC_NBTB_IPG2 | (EMAC_MAC_NBTB_IPG1 << 8), &regs->mac_ipgr);
++
++	/* Set up Collison window */
++	writel(EMAC_MAC_RM | (EMAC_MAC_CW << 8), &regs->mac_clrt);
++
++	/* Set up Max Frame Length */
++	writel(EMAC_MAC_MFL, &regs->mac_maxf);
++}
++
++static void emac_reset(struct eth_device *dev)
++{
++	struct emac_regs *regs = (struct emac_regs *)dev->iobase;
++
++	debug("resetting device\n");
++
++	/* RESET device */
++	writel(0, &regs->ctl);
++	udelay(200);
++
++	writel(1, &regs->ctl);
++	udelay(200);
++}
++
++static int sunxi_emac_eth_init(struct eth_device *dev, bd_t *bd)
++{
++	struct emac_regs *regs = (struct emac_regs *)dev->iobase;
++	struct emac_eth_dev *priv = dev->priv;
++	u16 phy_reg;
++
++	/* Init EMAC */
++
++	/* Flush RX FIFO */
++	setbits_le32(&regs->rx_ctl, 0x8);
++	udelay(1);
++
++	/* Init MAC */
++
++	/* Soft reset MAC */
++	clrbits_le32(&regs->mac_ctl0, 0x1 << 15);
++
++	/* Clear RX counter */
++	writel(0x0, &regs->rx_fbc);
++	udelay(1);
++
++	/* Set up EMAC */
++	emac_setup(dev);
++
++	writel(dev->enetaddr[0] << 16 | dev->enetaddr[1] << 8 |
++	       dev->enetaddr[2], &regs->mac_a1);
++	writel(dev->enetaddr[3] << 16 | dev->enetaddr[4] << 8 |
++	       dev->enetaddr[5], &regs->mac_a0);
++
++	mdelay(1);
++
++	emac_reset(dev);
++
++	/* PHY POWER UP */
++	emac_phy_read(dev->name, 1, 0, &phy_reg);
++	emac_phy_write(dev->name, 1, 0, phy_reg & (~(0x1 << 11)));
++	mdelay(1);
++
++	emac_phy_read(dev->name, 1, 0, &phy_reg);
++
++	priv->speed = miiphy_speed(dev->name, 0);
++	priv->duplex = miiphy_duplex(dev->name, 0);
++
++	/* Print link status only once */
++	if (!priv->link_printed) {
++		printf("ENET Speed is %d Mbps - %s duplex connection\n",
++		       priv->speed, (priv->duplex == HALF) ? "HALF" : "FULL");
++		priv->link_printed = 1;
++	}
++
++	/* Set EMAC SPEED depend on PHY */
++	clrsetbits_le32(&regs->mac_supp, 1 << 8,
++			((phy_reg & (0x1 << 13)) >> 13) << 8);
++
++	/* Set duplex depend on phy */
++	clrsetbits_le32(&regs->mac_ctl1, 1 << 0,
++			((phy_reg & (0x1 << 8)) >> 8) << 0);
++
++	/* Enable RX/TX */
++	setbits_le32(&regs->ctl, 0x7);
++
++	return 0;
++}
++
++static void sunxi_emac_eth_halt(struct eth_device *dev)
++{
++	/* Nothing to do here */
++}
++
++static int sunxi_emac_eth_recv(struct eth_device *dev)
++{
++	struct emac_regs *regs = (struct emac_regs *)dev->iobase;
++	struct emac_rxhdr rxhdr;
++	u32 rxcount;
++	u32 reg_val;
++	int rx_len;
++	int rx_status;
++	int good_packet;
++
++	/* Check packet ready or not */
++
++	/* Race warning: The first packet might arrive with
++	 * the interrupts disabled, but the second will fix
++	 */
++	rxcount = readl(&regs->rx_fbc);
++	if (!rxcount) {
++		/* Had one stuck? */
++		rxcount = readl(&regs->rx_fbc);
++		if (!rxcount)
++			return 0;
++	}
++
++	reg_val = readl(&regs->rx_io_data);
++	if (reg_val != 0x0143414d) {
++		/* Disable RX */
++		clrbits_le32(&regs->ctl, 0x1 << 2);
++
++		/* Flush RX FIFO */
++		setbits_le32(&regs->rx_ctl, 0x1 << 3);
++		while (readl(&regs->rx_ctl) & (0x1 << 3))
++			;
++
++		/* Enable RX */
++		setbits_le32(&regs->ctl, 0x1 << 2);
++
++		return 0;
++	}
++
++	/* A packet ready now
++	 * Get status/length
++	 */
++	good_packet = 1;
++
++	emac_inblk_32bit(&regs->rx_io_data, &rxhdr, sizeof(rxhdr));
++
++	rx_len = rxhdr.rx_len;
++	rx_status = rxhdr.rx_status;
++
++	/* Packet Status check */
++	if (rx_len < 0x40) {
++		good_packet = 0;
++		debug("RX: Bad Packet (runt)\n");
++	}
++
++	/* rx_status is identical to RSR register. */
++	if (0 & rx_status & (EMAC_CRCERR | EMAC_LENERR)) {
++		good_packet = 0;
++		if (rx_status & EMAC_CRCERR)
++			printf("crc error\n");
++		if (rx_status & EMAC_LENERR)
++			printf("length error\n");
++	}
++
++	/* Move data from EMAC */
++	if (good_packet) {
++		if (rx_len > DMA_CPU_TRRESHOLD) {
++			printf("Received packet is too big (len=%d)\n", rx_len);
++		} else {
++			emac_inblk_32bit((void *)&regs->rx_io_data,
++					 NetRxPackets[0], rx_len);
++
++			/* Pass to upper layer */
++			NetReceive(NetRxPackets[0], rx_len);
++			return rx_len;
++		}
++	}
++
++	return 0;
++}
++
++static int sunxi_emac_eth_send(struct eth_device *dev, void *packet, int len)
++{
++	struct emac_regs *regs = (struct emac_regs *)dev->iobase;
++
++	/* Select channel 0 */
++	writel(0, &regs->tx_ins);
++
++	/* Write packet */
++	emac_outblk_32bit((void *)&regs->tx_io_data, packet, len);
++
++	/* Set TX len */
++	writel(len, &regs->tx_pl0);
++
++	/* Start translate from fifo to phy */
++	setbits_le32(&regs->tx_ctl0, 1);
++
++	return 0;
++}
++
++int sunxi_emac_initialize(void)
++{
++	struct sunxi_ccm_reg *const ccm =
++		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
++	struct sunxi_sramc_regs *sram =
++		(struct sunxi_sramc_regs *)SUNXI_SRAMC_BASE;
++	struct emac_regs *regs =
++		(struct emac_regs *)SUNXI_EMAC_BASE;
++	struct eth_device *dev;
++	struct emac_eth_dev *priv;
++	int pin;
++
++	dev = malloc(sizeof(*dev));
++	if (dev == NULL)
++		return -ENOMEM;
++
++	priv = (struct emac_eth_dev *)malloc(sizeof(struct emac_eth_dev));
++	if (!priv) {
++		free(dev);
++		return -ENOMEM;
++	}
++
++	memset(dev, 0, sizeof(*dev));
++	memset(priv, 0, sizeof(struct emac_eth_dev));
++
++	/* Map SRAM to EMAC */
++	setbits_le32(&sram->ctrl1, 0x5 << 2);
++
++	/* Configure pin mux settings for MII Ethernet */
++	for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(17); pin++)
++		sunxi_gpio_set_cfgpin(pin, SUNXI_GPA0_EMAC);
++
++	/* Set up clock gating */
++	setbits_le32(&ccm->ahb_gate0, 0x1 << AHB_GATE_OFFSET_EMAC);
++
++	/* Set MII clock */
++	clrsetbits_le32(&regs->mac_mcfg, 0xf << 2, 0xd << 2);
++
++	dev->iobase = (int)regs;
++	dev->priv = priv;
++	dev->init = sunxi_emac_eth_init;
++	dev->halt = sunxi_emac_eth_halt;
++	dev->send = sunxi_emac_eth_send;
++	dev->recv = sunxi_emac_eth_recv;
++	strcpy(dev->name, "emac");
++
++	eth_register(dev);
++
++	miiphy_register(dev->name, emac_phy_read, emac_phy_write);
++
++	return 0;
++}
+diff -ruN u-boot-2014.04/drivers/net/sunxi_wemac.c u-boot-sunxi/drivers/net/sunxi_wemac.c
+--- u-boot-2014.04/drivers/net/sunxi_wemac.c	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/net/sunxi_wemac.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,525 +0,0 @@
+-/*
+- * sunxi_wemac.c -- Allwinner A10 ethernet driver
+- *
+- * (C) Copyright 2012, Stefan Roese <sr@denx.de>
+- *
+- * SPDX-License-Identifier:	GPL-2.0+
+- */
+-
+-#include <common.h>
+-#include <malloc.h>
+-#include <net.h>
+-#include <miiphy.h>
+-#include <linux/err.h>
+-#include <asm/io.h>
+-#include <asm/arch/clock.h>
+-#include <asm/arch/gpio.h>
+-
+-/* EMAC register  */
+-struct wemac_regs {
+-	u32 ctl;	/* 0x00 */
+-	u32 tx_mode;	/* 0x04 */
+-	u32 tx_flow;	/* 0x08 */
+-	u32 tx_ctl0;	/* 0x0c */
+-	u32 tx_ctl1;	/* 0x10 */
+-	u32 tx_ins;	/* 0x14 */
+-	u32 tx_pl0;	/* 0x18 */
+-	u32 tx_pl1;	/* 0x1c */
+-	u32 tx_sta;	/* 0x20 */
+-	u32 tx_io_data;	/* 0x24 */
+-	u32 tx_io_data1; /* 0x28 */
+-	u32 tx_tsvl0;	/* 0x2c */
+-	u32 tx_tsvh0;	/* 0x30 */
+-	u32 tx_tsvl1;	/* 0x34 */
+-	u32 tx_tsvh1;	/* 0x38 */
+-	u32 rx_ctl;	/* 0x3c */
+-	u32 rx_hash0;	/* 0x40 */
+-	u32 rx_hash1;	/* 0x44 */
+-	u32 rx_sta;	/* 0x48 */
+-	u32 rx_io_data;	/* 0x4c */
+-	u32 rx_fbc;	/* 0x50 */
+-	u32 int_ctl;	/* 0x54 */
+-	u32 int_sta;	/* 0x58 */
+-	u32 mac_ctl0;	/* 0x5c */
+-	u32 mac_ctl1;	/* 0x60 */
+-	u32 mac_ipgt;	/* 0x64 */
+-	u32 mac_ipgr;	/* 0x68 */
+-	u32 mac_clrt;	/* 0x6c */
+-	u32 mac_maxf;	/* 0x70 */
+-	u32 mac_supp;	/* 0x74 */
+-	u32 mac_test;	/* 0x78 */
+-	u32 mac_mcfg;	/* 0x7c */
+-	u32 mac_mcmd;	/* 0x80 */
+-	u32 mac_madr;	/* 0x84 */
+-	u32 mac_mwtd;	/* 0x88 */
+-	u32 mac_mrdd;	/* 0x8c */
+-	u32 mac_mind;	/* 0x90 */
+-	u32 mac_ssrr;	/* 0x94 */
+-	u32 mac_a0;	/* 0x98 */
+-	u32 mac_a1;	/* 0x9c */
+-};
+-
+-/* SRAMC register  */
+-struct sunxi_sramc_regs {
+-	u32 ctrl0;
+-	u32 ctrl1;
+-};
+-
+-/* 0: Disable       1: Aborted frame enable(default) */
+-#define EMAC_TX_AB_M		(0x1 << 0)
+-/* 0: CPU           1: DMA(default) */
+-#define EMAC_TX_TM		(0x1 << 1)
+-
+-#define EMAC_TX_SETUP		(0)
+-
+-/* 0: DRQ asserted  1: DRQ automatically(default) */
+-#define EMAC_RX_DRQ_MODE	(0x1 << 1)
+-/* 0: CPU           1: DMA(default) */
+-#define EMAC_RX_TM		(0x1 << 2)
+-/* 0: Normal(default)        1: Pass all Frames */
+-#define EMAC_RX_PA		(0x1 << 4)
+-/* 0: Normal(default)        1: Pass Control Frames */
+-#define EMAC_RX_PCF		(0x1 << 5)
+-/* 0: Normal(default)        1: Pass Frames with CRC Error */
+-#define EMAC_RX_PCRCE		(0x1 << 6)
+-/* 0: Normal(default)        1: Pass Frames with Length Error */
+-#define EMAC_RX_PLE		(0x1 << 7)
+-/* 0: Normal                 1: Pass Frames length out of range(default) */
+-#define EMAC_RX_POR		(0x1 << 8)
+-/* 0: Not accept             1: Accept unicast Packets(default) */
+-#define EMAC_RX_UCAD		(0x1 << 16)
+-/* 0: Normal(default)        1: DA Filtering */
+-#define EMAC_RX_DAF		(0x1 << 17)
+-/* 0: Not accept             1: Accept multicast Packets(default) */
+-#define EMAC_RX_MCO		(0x1 << 20)
+-/* 0: Disable(default)       1: Enable Hash filter */
+-#define EMAC_RX_MHF		(0x1 << 21)
+-/* 0: Not accept             1: Accept Broadcast Packets(default) */
+-#define EMAC_RX_BCO		(0x1 << 22)
+-/* 0: Disable(default)       1: Enable SA Filtering */
+-#define EMAC_RX_SAF		(0x1 << 24)
+-/* 0: Normal(default)        1: Inverse Filtering */
+-#define EMAC_RX_SAIF		(0x1 << 25)
+-
+-#define EMAC_RX_SETUP		(EMAC_RX_POR | EMAC_RX_UCAD | EMAC_RX_DAF | \
+-				 EMAC_RX_MCO | EMAC_RX_BCO)
+-
+-/* 0: Disable                1: Enable Receive Flow Control(default) */
+-#define EMAC_MAC_CTL0_RFC	(0x1 << 2)
+-/* 0: Disable                1: Enable Transmit Flow Control(default) */
+-#define EMAC_MAC_CTL0_TFC	(0x1 << 3)
+-
+-#define EMAC_MAC_CTL0_SETUP	(EMAC_MAC_CTL0_RFC | EMAC_MAC_CTL0_TFC)
+-
+-/* 0: Disable                1: Enable MAC Frame Length Checking(default) */
+-#define EMAC_MAC_CTL1_FLC	(0x1 << 1)
+-/* 0: Disable(default)       1: Enable Huge Frame */
+-#define EMAC_MAC_CTL1_HF	(0x1 << 2)
+-/* 0: Disable(default)       1: Enable MAC Delayed CRC */
+-#define EMAC_MAC_CTL1_DCRC	(0x1 << 3)
+-/* 0: Disable                1: Enable MAC CRC(default) */
+-#define EMAC_MAC_CTL1_CRC	(0x1 << 4)
+-/* 0: Disable                1: Enable MAC PAD Short frames(default) */
+-#define EMAC_MAC_CTL1_PC	(0x1 << 5)
+-/* 0: Disable(default)       1: Enable MAC PAD Short frames and append CRC */
+-#define EMAC_MAC_CTL1_VC	(0x1 << 6)
+-/* 0: Disable(default)       1: Enable MAC auto detect Short frames */
+-#define EMAC_MAC_CTL1_ADP	(0x1 << 7)
+-/* 0: Disable(default)       1: Enable */
+-#define EMAC_MAC_CTL1_PRE	(0x1 << 8)
+-/* 0: Disable(default)       1: Enable */
+-#define EMAC_MAC_CTL1_LPE	(0x1 << 9)
+-/* 0: Disable(default)       1: Enable no back off */
+-#define EMAC_MAC_CTL1_NB	(0x1 << 12)
+-/* 0: Disable(default)       1: Enable */
+-#define EMAC_MAC_CTL1_BNB	(0x1 << 13)
+-/* 0: Disable(default)       1: Enable */
+-#define EMAC_MAC_CTL1_ED	(0x1 << 14)
+-
+-#define EMAC_MAC_CTL1_SETUP	(EMAC_MAC_CTL1_FLC | EMAC_MAC_CTL1_CRC | \
+-				 EMAC_MAC_CTL1_PC)
+-
+-#define EMAC_MAC_IPGT		0x15
+-
+-#define EMAC_MAC_NBTB_IPG1	0xC
+-#define EMAC_MAC_NBTB_IPG2	0x12
+-
+-#define EMAC_MAC_CW		0x37
+-#define EMAC_MAC_RM		0xF
+-
+-#define EMAC_MAC_MFL		0x0600
+-
+-/* Receive status */
+-#define EMAC_CRCERR		(1 << 4)
+-#define EMAC_LENERR		(3 << 5)
+-
+-#define DMA_CPU_TRRESHOLD	2000
+-
+-struct wemac_eth_dev {
+-	u32 speed;
+-	u32 duplex;
+-	u32 phy_configured;
+-	int link_printed;
+-};
+-
+-struct wemac_rxhdr {
+-	s16 rx_len;
+-	u16 rx_status;
+-};
+-
+-static void wemac_inblk_32bit(void *reg, void *data, int count)
+-{
+-	int cnt = (count + 3) >> 2;
+-
+-	if (cnt) {
+-		u32 *buf = data;
+-
+-		do {
+-			u32 x = readl(reg);
+-			*buf++ = x;
+-		} while (--cnt);
+-	}
+-}
+-
+-static void wemac_outblk_32bit(void *reg, void *data, int count)
+-{
+-	int cnt = (count + 3) >> 2;
+-
+-	if (cnt) {
+-		const u32 *buf = data;
+-
+-		do {
+-			writel(*buf++, reg);
+-		} while (--cnt);
+-	}
+-}
+-
+-/*
+- * Read a word from phyxcer
+- */
+-static int wemac_phy_read(const char *devname, unsigned char addr,
+-			  unsigned char reg, unsigned short *value)
+-{
+-	struct eth_device *dev = eth_get_dev_by_name(devname);
+-	struct wemac_regs *regs = (struct wemac_regs *)dev->iobase;
+-
+-	/* issue the phy address and reg */
+-	writel(addr << 8 | reg, &regs->mac_madr);
+-
+-	/* pull up the phy io line */
+-	writel(0x1, &regs->mac_mcmd);
+-
+-	/* Wait read complete */
+-	mdelay(1);
+-
+-	/* push down the phy io line */
+-	writel(0x0, &regs->mac_mcmd);
+-
+-	/* and write data */
+-	*value = readl(&regs->mac_mrdd);
+-
+-	return 0;
+-}
+-
+-/*
+- * Write a word to phyxcer
+- */
+-static int wemac_phy_write(const char *devname, unsigned char addr,
+-			   unsigned char reg, unsigned short value)
+-{
+-	struct eth_device *dev = eth_get_dev_by_name(devname);
+-	struct wemac_regs *regs = (struct wemac_regs *)dev->iobase;
+-
+-	/* issue the phy address and reg */
+-	writel(addr << 8 | reg, &regs->mac_madr);
+-
+-	/* pull up the phy io line */
+-	writel(0x1, &regs->mac_mcmd);
+-
+-	/* Wait write complete */
+-	mdelay(1);
+-
+-	/* push down the phy io line */
+-	writel(0x0, &regs->mac_mcmd);
+-
+-	/* and write data */
+-	writel(value, &regs->mac_mwtd);
+-
+-	return 0;
+-}
+-
+-static void emac_setup(struct eth_device *dev)
+-{
+-	struct wemac_regs *regs = (struct wemac_regs *)dev->iobase;
+-	u32 reg_val;
+-	u16 phy_val;
+-	u32 duplex_flag;
+-
+-	/* Set up TX */
+-	writel(EMAC_TX_SETUP, &regs->tx_mode);
+-
+-	/* Set up RX */
+-	writel(EMAC_RX_SETUP, &regs->rx_ctl);
+-
+-	/* Set MAC */
+-	/* Set MAC CTL0 */
+-	writel(EMAC_MAC_CTL0_SETUP, &regs->mac_ctl0);
+-
+-	/* Set MAC CTL1 */
+-	wemac_phy_read(dev->name, 1, 0, &phy_val);
+-	debug("PHY SETUP, reg 0 value: %x\n", phy_val);
+-	duplex_flag = !!(phy_val & (1 << 8));
+-
+-	reg_val = 0;
+-	if (duplex_flag)
+-		reg_val = (0x1 << 0);
+-	writel(EMAC_MAC_CTL1_SETUP | reg_val, &regs->mac_ctl1);
+-
+-	/* Set up IPGT */
+-	writel(EMAC_MAC_IPGT, &regs->mac_ipgt);
+-
+-	/* Set up IPGR */
+-	writel(EMAC_MAC_NBTB_IPG2 | (EMAC_MAC_NBTB_IPG1 << 8), &regs->mac_ipgr);
+-
+-	/* Set up Collison window */
+-	writel(EMAC_MAC_RM | (EMAC_MAC_CW << 8), &regs->mac_clrt);
+-
+-	/* Set up Max Frame Length */
+-	writel(EMAC_MAC_MFL, &regs->mac_maxf);
+-}
+-
+-static void wemac_reset(struct eth_device *dev)
+-{
+-	struct wemac_regs *regs = (struct wemac_regs *)dev->iobase;
+-
+-	debug("resetting device\n");
+-
+-	/* RESET device */
+-	writel(0, &regs->ctl);
+-	udelay(200);
+-
+-	writel(1, &regs->ctl);
+-	udelay(200);
+-}
+-
+-static int sunxi_wemac_eth_init(struct eth_device *dev, bd_t *bd)
+-{
+-	struct wemac_regs *regs = (struct wemac_regs *)dev->iobase;
+-	struct wemac_eth_dev *priv = dev->priv;
+-	u16 phy_reg;
+-
+-	/* Init EMAC */
+-
+-	/* Flush RX FIFO */
+-	setbits_le32(&regs->rx_ctl, 0x8);
+-	udelay(1);
+-
+-	/* Init MAC */
+-
+-	/* Soft reset MAC */
+-	clrbits_le32(&regs->mac_ctl0, 1 << 15);
+-
+-	/* Set MII clock */
+-	clrsetbits_le32(&regs->mac_mcfg, 0xf << 2, 0xd << 2);
+-
+-	/* Clear RX counter */
+-	writel(0x0, &regs->rx_fbc);
+-	udelay(1);
+-
+-	/* Set up EMAC */
+-	emac_setup(dev);
+-
+-	writel(dev->enetaddr[0] << 16 | dev->enetaddr[1] << 8 |
+-	       dev->enetaddr[2], &regs->mac_a1);
+-	writel(dev->enetaddr[3] << 16 | dev->enetaddr[4] << 8 |
+-	       dev->enetaddr[5], &regs->mac_a0);
+-
+-	mdelay(1);
+-
+-	wemac_reset(dev);
+-
+-	/* PHY POWER UP */
+-	wemac_phy_read(dev->name, 1, 0, &phy_reg);
+-	wemac_phy_write(dev->name, 1, 0, phy_reg & (~(1 << 11)));
+-	mdelay(1);
+-
+-	wemac_phy_read(dev->name, 1, 0, &phy_reg);
+-
+-	priv->speed = miiphy_speed(dev->name, 0);
+-	priv->duplex = miiphy_duplex(dev->name, 0);
+-
+-	/* Print link status only once */
+-	if (!priv->link_printed) {
+-		printf("ENET Speed is %d Mbps - %s duplex connection\n",
+-		       priv->speed, (priv->duplex == HALF) ? "HALF" : "FULL");
+-		priv->link_printed = 1;
+-	}
+-
+-	/* Set EMAC SPEED depend on PHY */
+-	clrsetbits_le32(&regs->mac_supp, 1 << 8,
+-			((phy_reg & (1 << 13)) >> 13) << 8);
+-
+-	/* Set duplex depend on phy */
+-	clrsetbits_le32(&regs->mac_ctl1, 1 << 0,
+-			((phy_reg & (1 << 8)) >> 8) << 0);
+-
+-	/* Enable RX/TX */
+-	setbits_le32(&regs->ctl, 0x7);
+-
+-	return 0;
+-}
+-
+-static void sunxi_wemac_eth_halt(struct eth_device *dev)
+-{
+-	/* Nothing to do here */
+-}
+-
+-static int sunxi_wemac_eth_recv(struct eth_device *dev)
+-{
+-	struct wemac_regs *regs = (struct wemac_regs *)dev->iobase;
+-	struct wemac_rxhdr rxhdr;
+-	u32 rxcount;
+-	u32 reg_val;
+-	int rx_len;
+-	int rx_status;
+-	int good_packet;
+-
+-	/* Check packet ready or not */
+-
+-	/*
+-	 * Race warning: The first packet might arrive with
+-	 * the interrupts disabled, but the second will fix
+-	 */
+-	rxcount = readl(&regs->rx_fbc);
+-	if (!rxcount) {
+-		/* Had one stuck? */
+-		rxcount = readl(&regs->rx_fbc);
+-		if (!rxcount)
+-			return 0;
+-	}
+-
+-	reg_val = readl(&regs->rx_io_data);
+-	if (reg_val != 0x0143414d) {
+-		/* Disable RX */
+-		clrbits_le32(&regs->ctl, 1 << 2);
+-
+-		/* Flush RX FIFO */
+-		setbits_le32(&regs->rx_ctl, 1 << 3);
+-		while (readl(&regs->rx_ctl) & (1 << 3))
+-			;
+-
+-		/* Enable RX */
+-		setbits_le32(&regs->ctl, 1 << 2);
+-
+-		return 0;
+-	}
+-
+-	/*
+-	 * A packet ready now
+-	 * Get status/length
+-	 */
+-	good_packet = 1;
+-
+-	wemac_inblk_32bit(&regs->rx_io_data, &rxhdr, sizeof(rxhdr));
+-
+-	rx_len = rxhdr.rx_len;
+-	rx_status = rxhdr.rx_status;
+-
+-	/* Packet Status check */
+-	if (rx_len < 0x40) {
+-		good_packet = 0;
+-		debug("RX: Bad Packet (runt)\n");
+-	}
+-
+-	/* rx_status is identical to RSR register. */
+-	if (0 & rx_status & (EMAC_CRCERR | EMAC_LENERR)) {
+-		good_packet = 0;
+-		if (rx_status & EMAC_CRCERR)
+-			printf("crc error\n");
+-		if (rx_status & EMAC_LENERR)
+-			printf("length error\n");
+-	}
+-
+-	/* Move data from WEMAC */
+-	if (good_packet) {
+-		if (rx_len > DMA_CPU_TRRESHOLD) {
+-			printf("Received packet is too big (len=%d)\n", rx_len);
+-		} else {
+-			wemac_inblk_32bit((void *)&regs->rx_io_data,
+-					  NetRxPackets[0], rx_len);
+-
+-			/* Pass to upper layer */
+-			NetReceive(NetRxPackets[0], rx_len);
+-			return rx_len;
+-		}
+-	}
+-
+-	return 0;
+-}
+-
+-static int sunxi_wemac_eth_send(struct eth_device *dev, void *packet, int len)
+-{
+-	struct wemac_regs *regs = (struct wemac_regs *)dev->iobase;
+-
+-	/* Select channel 0 */
+-	writel(0, &regs->tx_ins);
+-
+-	/* Write packet */
+-	wemac_outblk_32bit((void *)&regs->tx_io_data, packet, len);
+-
+-	/* Set TX len */
+-	writel(len, &regs->tx_pl0);
+-
+-	/* Start translate from fifo to phy */
+-	setbits_le32(&regs->tx_ctl0, 1);
+-
+-	return 0;
+-}
+-
+-int sunxi_wemac_initialize(void)
+-{
+-	struct sunxi_ccm_reg *const ccm =
+-		(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+-	struct sunxi_sramc_regs *sram =
+-		(struct sunxi_sramc_regs *)SUNXI_SRAMC_BASE;
+-	struct eth_device *dev;
+-	struct wemac_eth_dev *priv;
+-	int pin;
+-
+-	dev = malloc(sizeof(*dev));
+-	if (dev == NULL)
+-		return -ENOMEM;
+-
+-	priv = (struct wemac_eth_dev *)malloc(sizeof(struct wemac_eth_dev));
+-	if (!priv) {
+-		free(dev);
+-		return -ENOMEM;
+-	}
+-
+-	memset(dev, 0, sizeof(*dev));
+-	memset(priv, 0, sizeof(struct wemac_eth_dev));
+-
+-	/* Map SRAM to EMAC */
+-	setbits_le32(&sram->ctrl1, 0x5 << 2);
+-
+-	/* Configure pin mux settings for MII Ethernet */
+-	for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(17); pin++)
+-		sunxi_gpio_set_cfgpin(pin, 2);
+-
+-	/* Set up clock gating */
+-	setbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_EMAC);
+-
+-	dev->iobase = SUNXI_EMAC_BASE;
+-	dev->priv = priv;
+-	dev->init = sunxi_wemac_eth_init;
+-	dev->halt = sunxi_wemac_eth_halt;
+-	dev->send = sunxi_wemac_eth_send;
+-	dev->recv = sunxi_wemac_eth_recv;
+-	strcpy(dev->name, "wemac");
+-
+-	eth_register(dev);
+-
+-	miiphy_register(dev->name, wemac_phy_read, wemac_phy_write);
+-
+-	return 0;
+-}
+diff -ruN u-boot-2014.04/drivers/power/axp152.c u-boot-sunxi/drivers/power/axp152.c
+--- u-boot-2014.04/drivers/power/axp152.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/drivers/power/axp152.c	2014-09-06 16:58:36.321953111 +0200
+@@ -0,0 +1,112 @@
++/*
++ * (C) Copyright 2012
++ * Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#include <common.h>
++#include <i2c.h>
++#include <axp152.h>
++
++enum axp152_reg {
++	AXP152_CHIP_VERSION = 0x3,
++	AXP152_DCDC2_VOLTAGE = 0x23,
++	AXP152_DCDC3_VOLTAGE = 0x27,
++	AXP152_DCDC4_VOLTAGE = 0x2B,
++	AXP152_LDO2_VOLTAGE = 0x2A,
++	AXP152_SHUTDOWN = 0x32,
++};
++
++#define AXP152_POWEROFF			(1 << 7)
++
++static int axp152_write(enum axp152_reg reg, u8 val)
++{
++	return i2c_write(0x30, reg, 1, &val, 1);
++}
++
++static int axp152_read(enum axp152_reg reg, u8 *val)
++{
++	return i2c_read(0x30, reg, 1, val, 1);
++}
++
++static int axp152_mvolt_to_target(int mvolt, int min, int max, int div)
++{
++	if (mvolt < min)
++		mvolt = min;
++	else if (mvolt > max)
++		mvolt = max;
++
++	return (mvolt - min) / div;
++}
++
++int axp152_set_dcdc2(int mvolt)
++{
++	int rc, target;
++	u8 current;
++
++	target = axp152_mvolt_to_target(mvolt, 700, 2275, 25);
++
++	/* Do we really need to be this gentle? It has built-in voltage slope */
++	while ((rc = axp152_read(AXP152_DCDC2_VOLTAGE, &current)) == 0 &&
++	       current != target) {
++		if (current < target)
++			current++;
++		else
++			current--;
++		rc = axp152_write(AXP152_DCDC2_VOLTAGE, current);
++		if (rc)
++			break;
++	}
++	return rc;
++}
++
++int axp152_set_dcdc3(int mvolt)
++{
++	int target = axp152_mvolt_to_target(mvolt, 700, 3500, 25);
++
++	return axp152_write(AXP152_DCDC3_VOLTAGE, target);
++}
++
++int axp152_set_dcdc4(int mvolt)
++{
++	int target = axp152_mvolt_to_target(mvolt, 700, 3500, 25);
++
++	return axp152_write(AXP152_DCDC4_VOLTAGE, target);
++}
++
++int axp152_set_ldo2(int mvolt)
++{
++	int target = axp152_mvolt_to_target(mvolt, 700, 3500, 100);
++
++	return axp152_write(AXP152_LDO2_VOLTAGE, target);
++}
++
++void axp152_poweroff(void)
++{
++	u8 val;
++
++	if (axp152_read(AXP152_SHUTDOWN, &val) != 0)
++		return;
++
++	val |= AXP152_POWEROFF;
++
++	if (axp152_write(AXP152_SHUTDOWN, val) != 0)
++		return;
++
++	udelay(10000);	/* wait for power to drain */
++}
++
++int axp152_init(void)
++{
++	u8 ver;
++	int rc;
++
++	rc = axp152_read(AXP152_CHIP_VERSION, &ver);
++	if (rc)
++		return rc;
++
++	if (ver != 0x05)
++		return -1;
++
++	return 0;
++}
+diff -ruN u-boot-2014.04/drivers/power/axp209.c u-boot-sunxi/drivers/power/axp209.c
+--- u-boot-2014.04/drivers/power/axp209.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/drivers/power/axp209.c	2014-09-06 16:58:36.321953111 +0200
+@@ -0,0 +1,180 @@
++/*
++ * (C) Copyright 2012
++ * Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <i2c.h>
++#include <axp209.h>
++
++enum axp209_reg {
++	AXP209_POWER_STATUS = 0x00,
++	AXP209_CHIP_VERSION = 0x03,
++	AXP209_DCDC2_VOLTAGE = 0x23,
++	AXP209_DCDC3_VOLTAGE = 0x27,
++	AXP209_LDO24_VOLTAGE = 0x28,
++	AXP209_LDO3_VOLTAGE = 0x29,
++	AXP209_IRQ_STATUS5 = 0x4c,
++	AXP209_SHUTDOWN = 0x32,
++};
++
++#define AXP209_POWER_STATUS_ON_BY_DC	(1 << 0)
++
++#define AXP209_IRQ5_PEK_UP		(1 << 6)
++#define AXP209_IRQ5_PEK_DOWN		(1 << 5)
++
++#define AXP209_POWEROFF			(1 << 7)
++
++static int axp209_write(enum axp209_reg reg, u8 val)
++{
++	return i2c_write(0x34, reg, 1, &val, 1);
++}
++
++static int axp209_read(enum axp209_reg reg, u8 *val)
++{
++	return i2c_read(0x34, reg, 1, val, 1);
++}
++
++static int axp209_mvolt_to_cfg(int mvolt, int min, int max, int div)
++{
++	if (mvolt < min)
++		mvolt = min;
++	else if (mvolt > max)
++		mvolt = max;
++
++	return (mvolt - min) / div;
++}
++
++int axp209_set_dcdc2(int mvolt)
++{
++	int cfg, rc;
++	u8 current;
++
++	cfg = axp209_mvolt_to_cfg(mvolt, 700, 2275, 25);
++
++	/* Do we really need to be this gentle? It has built-in voltage slope */
++	while ((rc = axp209_read(AXP209_DCDC2_VOLTAGE, &current)) == 0 &&
++	       current != cfg) {
++		if (current < cfg)
++			current++;
++		else
++			current--;
++
++		rc = axp209_write(AXP209_DCDC2_VOLTAGE, current);
++		if (rc)
++			break;
++	}
++
++	return rc;
++}
++
++int axp209_set_dcdc3(int mvolt)
++{
++	int cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25);
++
++	return axp209_write(AXP209_DCDC3_VOLTAGE, cfg);
++}
++
++int axp209_set_ldo2(int mvolt)
++{
++	int rc, cfg;
++	u8 reg;
++
++	cfg = axp209_mvolt_to_cfg(mvolt, 1800, 3300, 100);
++
++	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
++	if (rc)
++		return rc;
++
++	/* LDO2 configuration is in upper 4 bits */
++	reg = (reg & 0x0f) | (cfg << 4);
++	return axp209_write(AXP209_LDO24_VOLTAGE, reg);
++}
++
++int axp209_set_ldo3(int mvolt)
++{
++	int cfg = axp209_mvolt_to_cfg(mvolt, 700, 2275, 25);
++
++	if (mvolt == -1)
++		cfg = 0x80;	/* determined by LDO3IN pin */
++
++	return axp209_write(AXP209_LDO3_VOLTAGE, cfg);
++}
++
++int axp209_set_ldo4(int mvolt)
++{
++	int cfg, rc;
++	static const int vindex[] = {
++		1250, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2500,
++		2700, 2800, 3000, 3100, 3200, 3300
++	};
++	u8 reg;
++
++	/* Translate mvolt to register cfg value, requested <= selected */
++	for (cfg = 15; vindex[cfg] > mvolt && cfg > 0; cfg--);
++
++	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
++	if (rc)
++		return rc;
++
++	/* LDO4 configuration is in lower 4 bits */
++	reg = (reg & 0xf0) | (cfg << 0);
++	return axp209_write(AXP209_LDO24_VOLTAGE, reg);
++}
++
++void axp209_poweroff(void)
++{
++	u8 val;
++
++	if (axp209_read(AXP209_SHUTDOWN, &val) != 0)
++		return;
++
++	val |= AXP209_POWEROFF;
++
++	if (axp209_write(AXP209_SHUTDOWN, val) != 0)
++		return;
++
++	udelay(10000);		/* wait for power to drain */
++}
++
++int axp209_init(void)
++{
++	u8 ver;
++	int rc;
++
++	rc = axp209_read(AXP209_CHIP_VERSION, &ver);
++	if (rc)
++		return rc;
++
++	/* Low 4 bits is chip version */
++	ver &= 0x0f;
++
++	if (ver != 0x1)
++		return -1;
++
++	return 0;
++}
++
++int axp209_poweron_by_dc(void)
++{
++	u8 v;
++
++	if (axp209_read(AXP209_POWER_STATUS, &v))
++		return 0;
++
++	return (v & AXP209_POWER_STATUS_ON_BY_DC);
++}
++
++int axp209_power_button(void)
++{
++	u8 v;
++
++	if (axp209_read(AXP209_IRQ_STATUS5, &v))
++		return 0;
++
++	axp209_write(AXP209_IRQ_STATUS5, AXP209_IRQ5_PEK_DOWN);
++
++	return v & AXP209_IRQ5_PEK_DOWN;
++}
+diff -ruN u-boot-2014.04/drivers/power/axp221.c u-boot-sunxi/drivers/power/axp221.c
+--- u-boot-2014.04/drivers/power/axp221.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/drivers/power/axp221.c	2014-09-06 16:58:36.321953111 +0200
+@@ -0,0 +1,73 @@
++/*
++ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#include <common.h>
++#include <errno.h>
++#include <asm/arch/p2wi.h>
++#include <axp221.h>
++
++int axp221_set_dcdc1(unsigned int mvolt)
++{
++	return p2wi_write(AXP221_DCDC1_CTRL, (mvolt - 1600) / 100);
++}
++
++int axp221_set_dcdc2(unsigned int mvolt)
++{
++	return p2wi_write(AXP221_DCDC2_CTRL, (mvolt - 600) / 20);
++}
++
++int axp221_set_dcdc3(unsigned int mvolt)
++{
++	return p2wi_write(AXP221_DCDC3_CTRL, (mvolt - 600) / 20);
++}
++
++int axp221_set_dcdc4(unsigned int mvolt)
++{
++	return p2wi_write(AXP221_DCDC4_CTRL, (mvolt - 600) / 20);
++}
++
++int axp221_set_dcdc5(unsigned int mvolt)
++{
++	return p2wi_write(AXP221_DCDC5_CTRL, (mvolt - 600) / 20);
++}
++
++int axp221_set_dldo1(unsigned int mvolt)
++{
++	int ret;
++	u8 val;
++
++	ret = p2wi_write(AXP221_DLDO1_CTRL, (mvolt - 700) / 100);
++	if (ret)
++		return ret;
++
++	ret = p2wi_read(AXP221_OUTPUT_CTRL2, &val);
++	if (ret)
++		return ret;
++
++	val |= 1 << 3;
++	return p2wi_write(AXP221_OUTPUT_CTRL2, val);
++}
++
++int axp221_init(void)
++{
++	u8 axp_chip_id;
++	int ret;
++
++	p2wi_init();
++	ret = p2wi_set_pmu_address(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
++				   AXP221_INIT_DATA);
++	if (ret)
++		return ret;
++
++	ret = p2wi_read(AXP221_CHIP_ID, &axp_chip_id);
++	if (ret)
++		return ret;
++
++	if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17))
++		return -ENODEV;
++
++	return 0;
++}
+diff -ruN u-boot-2014.04/drivers/power/Makefile u-boot-sunxi/drivers/power/Makefile
+--- u-boot-2014.04/drivers/power/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/power/Makefile	2014-09-06 16:58:36.321953111 +0200
+@@ -5,6 +5,9 @@
+ # SPDX-License-Identifier:	GPL-2.0+
+ #
+ 
++obj-$(CONFIG_AXP152_POWER)	+= axp152.o
++obj-$(CONFIG_AXP209_POWER)	+= axp209.o
++obj-$(CONFIG_AXP221_POWER)	+= axp221.o
+ obj-$(CONFIG_EXYNOS_TMU)	+= exynos-tmu.o
+ obj-$(CONFIG_FTPMU010_POWER)	+= ftpmu010.o
+ obj-$(CONFIG_TPS6586X_POWER)	+= tps6586x.o
+diff -ruN u-boot-2014.04/drivers/serial/arm_dcc.c u-boot-sunxi/drivers/serial/arm_dcc.c
+--- u-boot-2014.04/drivers/serial/arm_dcc.c	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/drivers/serial/arm_dcc.c	2014-09-06 16:58:36.329953111 +0200
+@@ -29,7 +29,7 @@
+ #include <common.h>
+ #include <serial.h>
+ 
+-#if defined(CONFIG_CPU_V6)
++#if defined(CONFIG_CPU_V6) || 1
+ /*
+  * ARMV6
+  */
+diff -ruN u-boot-2014.04/.git/config u-boot-sunxi/.git/config
+--- u-boot-2014.04/.git/config	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/config	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1,11 @@
++[core]
++	repositoryformatversion = 0
++	filemode = true
++	bare = false
++	logallrefupdates = true
++[remote "origin"]
++	fetch = +refs/heads/*:refs/remotes/origin/*
++	url = https://github.com/linux-sunxi/u-boot-sunxi
++[branch "sunxi"]
++	remote = origin
++	merge = refs/heads/sunxi
+diff -ruN u-boot-2014.04/.git/description u-boot-sunxi/.git/description
+--- u-boot-2014.04/.git/description	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/description	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1 @@
++Unnamed repository; edit this file 'description' to name the repository.
+diff -ruN u-boot-2014.04/.git/HEAD u-boot-sunxi/.git/HEAD
+--- u-boot-2014.04/.git/HEAD	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/HEAD	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1 @@
++ref: refs/heads/sunxi
+diff -ruN u-boot-2014.04/.git/hooks/applypatch-msg.sample u-boot-sunxi/.git/hooks/applypatch-msg.sample
+--- u-boot-2014.04/.git/hooks/applypatch-msg.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/applypatch-msg.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,15 @@
++#!/bin/sh
++#
++# An example hook script to check the commit log message taken by
++# applypatch from an e-mail message.
++#
++# The hook should exit with non-zero status after issuing an
++# appropriate message if it wants to stop the commit.  The hook is
++# allowed to edit the commit message file.
++#
++# To enable this hook, rename this file to "applypatch-msg".
++
++. git-sh-setup
++test -x "$GIT_DIR/hooks/commit-msg" &&
++	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
++:
+diff -ruN u-boot-2014.04/.git/hooks/commit-msg.sample u-boot-sunxi/.git/hooks/commit-msg.sample
+--- u-boot-2014.04/.git/hooks/commit-msg.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/commit-msg.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,24 @@
++#!/bin/sh
++#
++# An example hook script to check the commit log message.
++# Called by "git commit" with one argument, the name of the file
++# that has the commit message.  The hook should exit with non-zero
++# status after issuing an appropriate message if it wants to stop the
++# commit.  The hook is allowed to edit the commit message file.
++#
++# To enable this hook, rename this file to "commit-msg".
++
++# Uncomment the below to add a Signed-off-by line to the message.
++# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
++# hook is more suited to it.
++#
++# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
++# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
++
++# This example catches duplicate Signed-off-by lines.
++
++test "" = "$(grep '^Signed-off-by: ' "$1" |
++	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
++	echo >&2 Duplicate Signed-off-by lines.
++	exit 1
++}
+diff -ruN u-boot-2014.04/.git/hooks/post-update.sample u-boot-sunxi/.git/hooks/post-update.sample
+--- u-boot-2014.04/.git/hooks/post-update.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/post-update.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,8 @@
++#!/bin/sh
++#
++# An example hook script to prepare a packed repository for use over
++# dumb transports.
++#
++# To enable this hook, rename this file to "post-update".
++
++exec git update-server-info
+diff -ruN u-boot-2014.04/.git/hooks/pre-applypatch.sample u-boot-sunxi/.git/hooks/pre-applypatch.sample
+--- u-boot-2014.04/.git/hooks/pre-applypatch.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/pre-applypatch.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,14 @@
++#!/bin/sh
++#
++# An example hook script to verify what is about to be committed
++# by applypatch from an e-mail message.
++#
++# The hook should exit with non-zero status after issuing an
++# appropriate message if it wants to stop the commit.
++#
++# To enable this hook, rename this file to "pre-applypatch".
++
++. git-sh-setup
++test -x "$GIT_DIR/hooks/pre-commit" &&
++	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
++:
+diff -ruN u-boot-2014.04/.git/hooks/pre-commit.sample u-boot-sunxi/.git/hooks/pre-commit.sample
+--- u-boot-2014.04/.git/hooks/pre-commit.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/pre-commit.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,50 @@
++#!/bin/sh
++#
++# An example hook script to verify what is about to be committed.
++# Called by "git commit" with no arguments.  The hook should
++# exit with non-zero status after issuing an appropriate message if
++# it wants to stop the commit.
++#
++# To enable this hook, rename this file to "pre-commit".
++
++if git rev-parse --verify HEAD >/dev/null 2>&1
++then
++	against=HEAD
++else
++	# Initial commit: diff against an empty tree object
++	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
++fi
++
++# If you want to allow non-ascii filenames set this variable to true.
++allownonascii=$(git config hooks.allownonascii)
++
++# Redirect output to stderr.
++exec 1>&2
++
++# Cross platform projects tend to avoid non-ascii filenames; prevent
++# them from being added to the repository. We exploit the fact that the
++# printable range starts at the space character and ends with tilde.
++if [ "$allownonascii" != "true" ] &&
++	# Note that the use of brackets around a tr range is ok here, (it's
++	# even required, for portability to Solaris 10's /usr/bin/tr), since
++	# the square bracket bytes happen to fall in the designated range.
++	test $(git diff --cached --name-only --diff-filter=A -z $against |
++	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
++then
++	echo "Error: Attempt to add a non-ascii file name."
++	echo
++	echo "This can cause problems if you want to work"
++	echo "with people on other platforms."
++	echo
++	echo "To be portable it is advisable to rename the file ..."
++	echo
++	echo "If you know what you are doing you can disable this"
++	echo "check using:"
++	echo
++	echo "  git config hooks.allownonascii true"
++	echo
++	exit 1
++fi
++
++# If there are whitespace errors, print the offending file names and fail.
++exec git diff-index --check --cached $against --
+diff -ruN u-boot-2014.04/.git/hooks/prepare-commit-msg.sample u-boot-sunxi/.git/hooks/prepare-commit-msg.sample
+--- u-boot-2014.04/.git/hooks/prepare-commit-msg.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/prepare-commit-msg.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,36 @@
++#!/bin/sh
++#
++# An example hook script to prepare the commit log message.
++# Called by "git commit" with the name of the file that has the
++# commit message, followed by the description of the commit
++# message's source.  The hook's purpose is to edit the commit
++# message file.  If the hook fails with a non-zero status,
++# the commit is aborted.
++#
++# To enable this hook, rename this file to "prepare-commit-msg".
++
++# This hook includes three examples.  The first comments out the
++# "Conflicts:" part of a merge commit.
++#
++# The second includes the output of "git diff --name-status -r"
++# into the message, just before the "git status" output.  It is
++# commented because it doesn't cope with --amend or with squashed
++# commits.
++#
++# The third example adds a Signed-off-by line to the message, that can
++# still be edited.  This is rarely a good idea.
++
++case "$2,$3" in
++  merge,)
++    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
++
++# ,|template,)
++#   /usr/bin/perl -i.bak -pe '
++#      print "\n" . `git diff --cached --name-status -r`
++#	 if /^#/ && $first++ == 0' "$1" ;;
++
++  *) ;;
++esac
++
++# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
++# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+diff -ruN u-boot-2014.04/.git/hooks/pre-rebase.sample u-boot-sunxi/.git/hooks/pre-rebase.sample
+--- u-boot-2014.04/.git/hooks/pre-rebase.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/pre-rebase.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,169 @@
++#!/bin/sh
++#
++# Copyright (c) 2006, 2008 Junio C Hamano
++#
++# The "pre-rebase" hook is run just before "git rebase" starts doing
++# its job, and can prevent the command from running by exiting with
++# non-zero status.
++#
++# The hook is called with the following parameters:
++#
++# $1 -- the upstream the series was forked from.
++# $2 -- the branch being rebased (or empty when rebasing the current branch).
++#
++# This sample shows how to prevent topic branches that are already
++# merged to 'next' branch from getting rebased, because allowing it
++# would result in rebasing already published history.
++
++publish=next
++basebranch="$1"
++if test "$#" = 2
++then
++	topic="refs/heads/$2"
++else
++	topic=`git symbolic-ref HEAD` ||
++	exit 0 ;# we do not interrupt rebasing detached HEAD
++fi
++
++case "$topic" in
++refs/heads/??/*)
++	;;
++*)
++	exit 0 ;# we do not interrupt others.
++	;;
++esac
++
++# Now we are dealing with a topic branch being rebased
++# on top of master.  Is it OK to rebase it?
++
++# Does the topic really exist?
++git show-ref -q "$topic" || {
++	echo >&2 "No such branch $topic"
++	exit 1
++}
++
++# Is topic fully merged to master?
++not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
++if test -z "$not_in_master"
++then
++	echo >&2 "$topic is fully merged to master; better remove it."
++	exit 1 ;# we could allow it, but there is no point.
++fi
++
++# Is topic ever merged to next?  If so you should not be rebasing it.
++only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
++only_next_2=`git rev-list ^master           ${publish} | sort`
++if test "$only_next_1" = "$only_next_2"
++then
++	not_in_topic=`git rev-list "^$topic" master`
++	if test -z "$not_in_topic"
++	then
++		echo >&2 "$topic is already up-to-date with master"
++		exit 1 ;# we could allow it, but there is no point.
++	else
++		exit 0
++	fi
++else
++	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
++	/usr/bin/perl -e '
++		my $topic = $ARGV[0];
++		my $msg = "* $topic has commits already merged to public branch:\n";
++		my (%not_in_next) = map {
++			/^([0-9a-f]+) /;
++			($1 => 1);
++		} split(/\n/, $ARGV[1]);
++		for my $elem (map {
++				/^([0-9a-f]+) (.*)$/;
++				[$1 => $2];
++			} split(/\n/, $ARGV[2])) {
++			if (!exists $not_in_next{$elem->[0]}) {
++				if ($msg) {
++					print STDERR $msg;
++					undef $msg;
++				}
++				print STDERR " $elem->[1]\n";
++			}
++		}
++	' "$topic" "$not_in_next" "$not_in_master"
++	exit 1
++fi
++
++<<\DOC_END
++
++This sample hook safeguards topic branches that have been
++published from being rewound.
++
++The workflow assumed here is:
++
++ * Once a topic branch forks from "master", "master" is never
++   merged into it again (either directly or indirectly).
++
++ * Once a topic branch is fully cooked and merged into "master",
++   it is deleted.  If you need to build on top of it to correct
++   earlier mistakes, a new topic branch is created by forking at
++   the tip of the "master".  This is not strictly necessary, but
++   it makes it easier to keep your history simple.
++
++ * Whenever you need to test or publish your changes to topic
++   branches, merge them into "next" branch.
++
++The script, being an example, hardcodes the publish branch name
++to be "next", but it is trivial to make it configurable via
++$GIT_DIR/config mechanism.
++
++With this workflow, you would want to know:
++
++(1) ... if a topic branch has ever been merged to "next".  Young
++    topic branches can have stupid mistakes you would rather
++    clean up before publishing, and things that have not been
++    merged into other branches can be easily rebased without
++    affecting other people.  But once it is published, you would
++    not want to rewind it.
++
++(2) ... if a topic branch has been fully merged to "master".
++    Then you can delete it.  More importantly, you should not
++    build on top of it -- other people may already want to
++    change things related to the topic as patches against your
++    "master", so if you need further changes, it is better to
++    fork the topic (perhaps with the same name) afresh from the
++    tip of "master".
++
++Let's look at this example:
++
++		   o---o---o---o---o---o---o---o---o---o "next"
++		  /       /           /           /
++		 /   a---a---b A     /           /
++		/   /               /           /
++	       /   /   c---c---c---c B         /
++	      /   /   /             \         /
++	     /   /   /   b---b C     \       /
++	    /   /   /   /             \     /
++    ---o---o---o---o---o---o---o---o---o---o---o "master"
++
++
++A, B and C are topic branches.
++
++ * A has one fix since it was merged up to "next".
++
++ * B has finished.  It has been fully merged up to "master" and "next",
++   and is ready to be deleted.
++
++ * C has not merged to "next" at all.
++
++We would want to allow C to be rebased, refuse A, and encourage
++B to be deleted.
++
++To compute (1):
++
++	git rev-list ^master ^topic next
++	git rev-list ^master        next
++
++	if these match, topic has not merged in next at all.
++
++To compute (2):
++
++	git rev-list master..topic
++
++	if this is empty, it is fully merged to "master".
++
++DOC_END
+diff -ruN u-boot-2014.04/.git/hooks/update.sample u-boot-sunxi/.git/hooks/update.sample
+--- u-boot-2014.04/.git/hooks/update.sample	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/hooks/update.sample	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,128 @@
++#!/bin/sh
++#
++# An example hook script to blocks unannotated tags from entering.
++# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
++#
++# To enable this hook, rename this file to "update".
++#
++# Config
++# ------
++# hooks.allowunannotated
++#   This boolean sets whether unannotated tags will be allowed into the
++#   repository.  By default they won't be.
++# hooks.allowdeletetag
++#   This boolean sets whether deleting tags will be allowed in the
++#   repository.  By default they won't be.
++# hooks.allowmodifytag
++#   This boolean sets whether a tag may be modified after creation. By default
++#   it won't be.
++# hooks.allowdeletebranch
++#   This boolean sets whether deleting branches will be allowed in the
++#   repository.  By default they won't be.
++# hooks.denycreatebranch
++#   This boolean sets whether remotely creating branches will be denied
++#   in the repository.  By default this is allowed.
++#
++
++# --- Command line
++refname="$1"
++oldrev="$2"
++newrev="$3"
++
++# --- Safety check
++if [ -z "$GIT_DIR" ]; then
++	echo "Don't run this script from the command line." >&2
++	echo " (if you want, you could supply GIT_DIR then run" >&2
++	echo "  $0 <ref> <oldrev> <newrev>)" >&2
++	exit 1
++fi
++
++if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
++	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
++	exit 1
++fi
++
++# --- Config
++allowunannotated=$(git config --bool hooks.allowunannotated)
++allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
++denycreatebranch=$(git config --bool hooks.denycreatebranch)
++allowdeletetag=$(git config --bool hooks.allowdeletetag)
++allowmodifytag=$(git config --bool hooks.allowmodifytag)
++
++# check for no description
++projectdesc=$(sed -e '1q' "$GIT_DIR/description")
++case "$projectdesc" in
++"Unnamed repository"* | "")
++	echo "*** Project description file hasn't been set" >&2
++	exit 1
++	;;
++esac
++
++# --- Check types
++# if $newrev is 0000...0000, it's a commit to delete a ref.
++zero="0000000000000000000000000000000000000000"
++if [ "$newrev" = "$zero" ]; then
++	newrev_type=delete
++else
++	newrev_type=$(git cat-file -t $newrev)
++fi
++
++case "$refname","$newrev_type" in
++	refs/tags/*,commit)
++		# un-annotated tag
++		short_refname=${refname##refs/tags/}
++		if [ "$allowunannotated" != "true" ]; then
++			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
++			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
++			exit 1
++		fi
++		;;
++	refs/tags/*,delete)
++		# delete tag
++		if [ "$allowdeletetag" != "true" ]; then
++			echo "*** Deleting a tag is not allowed in this repository" >&2
++			exit 1
++		fi
++		;;
++	refs/tags/*,tag)
++		# annotated tag
++		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
++		then
++			echo "*** Tag '$refname' already exists." >&2
++			echo "*** Modifying a tag is not allowed in this repository." >&2
++			exit 1
++		fi
++		;;
++	refs/heads/*,commit)
++		# branch
++		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
++			echo "*** Creating a branch is not allowed in this repository" >&2
++			exit 1
++		fi
++		;;
++	refs/heads/*,delete)
++		# delete branch
++		if [ "$allowdeletebranch" != "true" ]; then
++			echo "*** Deleting a branch is not allowed in this repository" >&2
++			exit 1
++		fi
++		;;
++	refs/remotes/*,commit)
++		# tracking branch
++		;;
++	refs/remotes/*,delete)
++		# delete tracking branch
++		if [ "$allowdeletebranch" != "true" ]; then
++			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
++			exit 1
++		fi
++		;;
++	*)
++		# Anything else (is there anything else?)
++		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
++		exit 1
++		;;
++esac
++
++# --- Finished
++exit 0
+Binary files u-boot-2014.04/.git/index and u-boot-sunxi/.git/index differ
+diff -ruN u-boot-2014.04/.git/info/exclude u-boot-sunxi/.git/info/exclude
+--- u-boot-2014.04/.git/info/exclude	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/info/exclude	2014-09-06 16:58:09.553953909 +0200
+@@ -0,0 +1,6 @@
++# git ls-files --others --exclude-from=.git/info/exclude
++# Lines that start with '#' are comments.
++# For a project mostly in C, the following would be a good set of
++# exclude patterns (uncomment them if you want to use them):
++# *.[oa]
++# *~
+diff -ruN u-boot-2014.04/.git/logs/HEAD u-boot-sunxi/.git/logs/HEAD
+--- u-boot-2014.04/.git/logs/HEAD	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/logs/HEAD	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1 @@
++0000000000000000000000000000000000000000 509d96d4f1f602d62d36db660973249e16f9d088 Zoltan HERPAI <wigyori@uid0.hu> 1410015515 +0200	clone: from https://github.com/linux-sunxi/u-boot-sunxi
+diff -ruN u-boot-2014.04/.git/logs/refs/heads/sunxi u-boot-sunxi/.git/logs/refs/heads/sunxi
+--- u-boot-2014.04/.git/logs/refs/heads/sunxi	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/logs/refs/heads/sunxi	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1 @@
++0000000000000000000000000000000000000000 509d96d4f1f602d62d36db660973249e16f9d088 Zoltan HERPAI <wigyori@uid0.hu> 1410015515 +0200	clone: from https://github.com/linux-sunxi/u-boot-sunxi
+diff -ruN u-boot-2014.04/.git/logs/refs/remotes/origin/HEAD u-boot-sunxi/.git/logs/refs/remotes/origin/HEAD
+--- u-boot-2014.04/.git/logs/refs/remotes/origin/HEAD	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/logs/refs/remotes/origin/HEAD	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1 @@
++0000000000000000000000000000000000000000 509d96d4f1f602d62d36db660973249e16f9d088 Zoltan HERPAI <wigyori@uid0.hu> 1410015515 +0200	clone: from https://github.com/linux-sunxi/u-boot-sunxi
+Binary files u-boot-2014.04/.git/objects/pack/pack-67611423d2b8399a45fe3205d396caff441c8135.idx and u-boot-sunxi/.git/objects/pack/pack-67611423d2b8399a45fe3205d396caff441c8135.idx differ
+Binary files u-boot-2014.04/.git/objects/pack/pack-67611423d2b8399a45fe3205d396caff441c8135.pack and u-boot-sunxi/.git/objects/pack/pack-67611423d2b8399a45fe3205d396caff441c8135.pack differ
+diff -ruN u-boot-2014.04/.git/packed-refs u-boot-sunxi/.git/packed-refs
+--- u-boot-2014.04/.git/packed-refs	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/packed-refs	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1,25 @@
++# pack-refs with: peeled 
++3212c6fd4beaa14a21a57e5241022702c986f82e refs/remotes/origin/lichee-dev
++c0860ba179bc0cf016831ceeeacd0dd4e287a860 refs/remotes/origin/lichee-dev-a20
++1076d3bdd67db39f34bc91857c636525874441ae refs/remotes/origin/lichee/lichee-dev
++40b4fba701c1824cc60c7ab966f4a5dd674e947d refs/remotes/origin/lichee/lichee-dev-ICS
++cf54463fd782c690cf790ca35b5a15504b57c287 refs/remotes/origin/lichee/lichee-dev-mmc
++218f643881c0dabd7e40cdb21a757416fa80afb2 refs/remotes/origin/old/sunxi-current
++509d96d4f1f602d62d36db660973249e16f9d088 refs/remotes/origin/sunxi
++43fb1236c3330676f49220cc1dfc235eb0558e4c refs/remotes/origin/sunxi-patchqueue
++80fd9a5c5b87ba2f48f4a71b666839870e780be6 refs/remotes/origin/wip/a20
++27113637710a574d1fb6325817ffa9ced7afe019 refs/tags/v2011.09-sun4i
++^22b38fa5c0348ac4f285f038999f9a617f98e73a
++9ba56441491542cd06b30c514e544d96b29ef801 refs/tags/v2011.09-sun4i-20120808
++88eacf3372855579760ba6bc8fa3e0d4e53fdef8 refs/tags/v2012.10-sunxi
++1ae18d97d24c5d6dd4cb7949d8e5fb602728601c refs/tags/v2013.01-sunxi
++fc40799c144d035c595c4abe3032a03be8f0e2c4 refs/tags/v2013.01.01-sunxi
++90c8c0c88362d1e39bb1433f04b9a21bb1c74e45 refs/tags/v2013.04-sunxi
++57ff4519ba0f47f1647f7def5864ae4c9ef3e6a0 refs/tags/v2013.07-rc1-sunxi
++c416374795b584f025a80b1f81db215456567155 refs/tags/v2013.07-sunxi
++8969c6f654248ececdfcf05eb51de9a8bc0a8703 refs/tags/v2013.07-sunxi.2
++88b1df7ee9c15c821a2209791f513b21596f21b4 refs/tags/v2013.07-sunxi.3
++569c37da7dfd4ed93b6e8b5993df760b9ed18c8d refs/tags/v2013.07-sunxi.4
++7a63a6882876b76e47746c1254e8cd1120a52b0d refs/tags/v2013.10-rc1-sunxi
++951e509384822e39149c22f44cde6a01f5105c40 refs/tags/v2013.10-rc2-sunxi
++09ef3a640a3eb58e66eedcf239193e2ab548e730 refs/tags/v2013.10-sunxi
+diff -ruN u-boot-2014.04/.git/refs/heads/sunxi u-boot-sunxi/.git/refs/heads/sunxi
+--- u-boot-2014.04/.git/refs/heads/sunxi	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/refs/heads/sunxi	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1 @@
++509d96d4f1f602d62d36db660973249e16f9d088
+diff -ruN u-boot-2014.04/.git/refs/remotes/origin/HEAD u-boot-sunxi/.git/refs/remotes/origin/HEAD
+--- u-boot-2014.04/.git/refs/remotes/origin/HEAD	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/.git/refs/remotes/origin/HEAD	2014-09-06 16:58:35.001953150 +0200
+@@ -0,0 +1 @@
++ref: refs/remotes/origin/sunxi
+diff -ruN u-boot-2014.04/include/axp152.h u-boot-sunxi/include/axp152.h
+--- u-boot-2014.04/include/axp152.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/axp152.h	2014-09-06 16:58:36.397953109 +0200
+@@ -0,0 +1,11 @@
++/*
++ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++int axp152_set_dcdc2(int mvolt);
++int axp152_set_dcdc3(int mvolt);
++int axp152_set_dcdc4(int mvolt);
++int axp152_set_ldo2(int mvolt);
++void axp152_poweroff(void);
++int axp152_init(void);
+diff -ruN u-boot-2014.04/include/axp209.h u-boot-sunxi/include/axp209.h
+--- u-boot-2014.04/include/axp209.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/axp209.h	2014-09-06 16:58:36.397953109 +0200
+@@ -0,0 +1,15 @@
++/*
++ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++extern int axp209_set_dcdc2(int mvolt);
++extern int axp209_set_dcdc3(int mvolt);
++extern int axp209_set_ldo2(int mvolt);
++extern int axp209_set_ldo3(int mvolt);
++extern int axp209_set_ldo4(int mvolt);
++extern void axp209_poweroff(void);
++extern int axp209_init(void);
++extern int axp209_poweron_by_dc(void);
++extern int axp209_power_button(void);
+diff -ruN u-boot-2014.04/include/axp221.h u-boot-sunxi/include/axp221.h
+--- u-boot-2014.04/include/axp221.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/axp221.h	2014-09-06 16:58:36.397953109 +0200
+@@ -0,0 +1,30 @@
++/*
++ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
++ *
++ * X-Powers AXP221 Power Management IC driver
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#define AXP221_CHIP_ADDR 0x68
++#define AXP221_CTRL_ADDR 0x3e
++#define AXP221_INIT_DATA 0x3e
++
++#define AXP221_CHIP_ID		0x03
++#define AXP221_OUTPUT_CTRL1	0x10
++#define AXP221_OUTPUT_CTRL2	0x12
++#define AXP221_OUTPUT_CTRL3	0x13
++#define AXP221_DLDO1_CTRL	0x15
++#define AXP221_DCDC1_CTRL	0x21
++#define AXP221_DCDC2_CTRL	0x22
++#define AXP221_DCDC3_CTRL	0x23
++#define AXP221_DCDC4_CTRL	0x24
++#define AXP221_DCDC5_CTRL	0x25
++
++int axp221_set_dcdc1(unsigned int mvolt);
++int axp221_set_dcdc2(unsigned int mvolt);
++int axp221_set_dcdc3(unsigned int mvolt);
++int axp221_set_dcdc4(unsigned int mvolt);
++int axp221_set_dcdc5(unsigned int mvolt);
++int axp221_set_dldo1(unsigned int mvolt);
++int axp221_init(void);
+diff -ruN u-boot-2014.04/include/config_fallbacks.h u-boot-sunxi/include/config_fallbacks.h
+--- u-boot-2014.04/include/config_fallbacks.h	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/include/config_fallbacks.h	2014-09-06 16:58:36.401953108 +0200
+@@ -55,6 +55,10 @@
+ #define HAVE_BLOCK_DEVICE
+ #endif
+ 
++#ifndef CONFIG_SYS_BOARD_NAME
++#define CONFIG_SYS_BOARD_NAME CONFIG_SYS_TARGET
++#endif
++
+ #if (defined(CONFIG_PARTITION_UUIDS) || \
+ 	defined(CONFIG_EFI_PARTITION) || \
+ 	defined(CONFIG_RANDOM_UUID) || \
+diff -ruN u-boot-2014.04/include/configs/sun4i.h u-boot-sunxi/include/configs/sun4i.h
+--- u-boot-2014.04/include/configs/sun4i.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/configs/sun4i.h	2014-09-06 16:58:36.461953107 +0200
+@@ -0,0 +1,25 @@
++/*
++ * (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * Configuration settings for the Allwinner A10 (sun4i) CPU
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * A10 specific configuration
++ */
++#define CONFIG_SUN4I		/* sun4i SoC generation */
++#define CONFIG_CLK_FULL_SPEED		1008000000
++
++#define CONFIG_SYS_PROMPT		"sun4i# "
++#define CONFIG_MACH_TYPE		4104
++
++/*
++ * Include common sunxi configuration where most the settings are
++ */
++#include <configs/sunxi-common.h>
++
++#endif /* __CONFIG_H */
+diff -ruN u-boot-2014.04/include/configs/sun5i.h u-boot-sunxi/include/configs/sun5i.h
+--- u-boot-2014.04/include/configs/sun5i.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/configs/sun5i.h	2014-09-06 16:58:36.461953107 +0200
+@@ -0,0 +1,25 @@
++/*
++ * (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * Configuration settings for the Allwinner A13 (sun5i) CPU
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * High Level Configuration Options
++ */
++#define CONFIG_SUN5I		/* sun5i SoC generation */
++#define CONFIG_CLK_FULL_SPEED		1008000000
++
++#define CONFIG_SYS_PROMPT		"sun5i# "
++#define CONFIG_MACH_TYPE		4138
++
++/*
++ * Include common sunxi configuration where most the settings are
++ */
++#include <configs/sunxi-common.h>
++
++#endif /* __CONFIG_H */
+diff -ruN u-boot-2014.04/include/configs/sun6i.h u-boot-sunxi/include/configs/sun6i.h
+--- u-boot-2014.04/include/configs/sun6i.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/configs/sun6i.h	2014-09-06 16:58:36.461953107 +0200
+@@ -0,0 +1,43 @@
++/*
++ * (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ * (C) Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com>
++ *
++ * Configuration settings for the Allwinner A31 (sun6i) CPU
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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 __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * A31 specific configuration
++ */
++#define CONFIG_SUN6I		/* sun6i SoC generation */
++
++#define CONFIG_SYS_PROMPT		"sun6i# "
++#define CONFIG_MACH_TYPE		3892
++
++/*
++ * Include common sunxi configuration where most the settings are
++ */
++#include <configs/sunxi-common.h>
++
++#endif /* __CONFIG_H */
+diff -ruN u-boot-2014.04/include/configs/sun7i.h u-boot-sunxi/include/configs/sun7i.h
+--- u-boot-2014.04/include/configs/sun7i.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/configs/sun7i.h	2014-09-06 16:58:36.461953107 +0200
+@@ -0,0 +1,30 @@
++/*
++ * (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ *
++ * Configuration settings for the Allwinner A20 (sun7i) CPU
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * A20 specific configuration
++ */
++#define CONFIG_SUN7I		/* sun7i SoC generation */
++#define CONFIG_CLK_FULL_SPEED		912000000
++
++#define CONFIG_SYS_PROMPT		"sun7i# "
++#define CONFIG_MACH_TYPE		4283
++
++#if defined(CONFIG_SYS_SECONDARY_ON)
++#define CONFIG_BOARD_POSTCLK_INIT 1
++#endif
++
++/*
++ * Include common sunxi configuration where most the settings are
++ */
++#include <configs/sunxi-common.h>
++
++#endif /* __CONFIG_H */
+diff -ruN u-boot-2014.04/include/configs/sun8i.h u-boot-sunxi/include/configs/sun8i.h
+--- u-boot-2014.04/include/configs/sun8i.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/configs/sun8i.h	2014-09-06 16:58:36.461953107 +0200
+@@ -0,0 +1,28 @@
++/*
++ * (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
++ * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
++ * (C) Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com>
++ * (C) Copyright 2014 Chen-Yu Tsai <wens@csie.org>
++ *
++ * Configuration settings for the Allwinner A23 (sun8i) CPU
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef __CONFIG_H
++#define __CONFIG_H
++
++/*
++ * A23 specific configuration
++ */
++#define CONFIG_SUN8I		/* sun8i SoC generation */
++
++#define CONFIG_SYS_PROMPT		"sun8i# "
++#define CONFIG_MACH_TYPE		4137
++
++/*
++ * Include common sunxi configuration where most the settings are
++ */
++#include <configs/sunxi-common.h>
++
++#endif /* __CONFIG_H */
+diff -ruN u-boot-2014.04/include/configs/sunxi-common.h u-boot-sunxi/include/configs/sunxi-common.h
+--- u-boot-2014.04/include/configs/sunxi-common.h	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/include/configs/sunxi-common.h	2014-09-06 16:58:36.461953107 +0200
+@@ -0,0 +1,427 @@
++/*
++ * (C) Copyright 2012-2012 Henrik Nordstrom <henrik@henriknordstrom.net>
++ *
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * Configuration settings for the Allwinner sunxi series of boards.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++
++#ifndef _SUNXI_COMMON_CONFIG_H
++#define _SUNXI_COMMON_CONFIG_H
++
++/*
++ * High Level Configuration Options
++ */
++#define CONFIG_SUNXI		/* sunxi family */
++#ifdef CONFIG_SPL_BUILD
++#ifndef CONFIG_SPL_FEL
++#define CONFIG_SYS_THUMB_BUILD	/* Thumbs mode to save space in SPL */
++#endif
++#endif
++
++#include <asm/arch/cpu.h>	/* get chip and board defs */
++
++#define CONFIG_SYS_TEXT_BASE		0x4a000000
++
++/*
++ * Display CPU and Board information
++ */
++#define CONFIG_DISPLAY_CPUINFO
++#define CONFIG_DISPLAY_BOARDINFO
++
++/* Serial & console */
++#define CONFIG_SYS_NS16550
++#define CONFIG_SYS_NS16550_SERIAL
++/* ns16550 reg in the low bits of cpu reg */
++#define CONFIG_SYS_NS16550_REG_SIZE	-4
++#define CONFIG_SYS_NS16550_CLK		24000000
++#define CONFIG_SYS_NS16550_COM1		SUNXI_UART0_BASE
++#define CONFIG_SYS_NS16550_COM2		SUNXI_UART1_BASE
++#define CONFIG_SYS_NS16550_COM3		SUNXI_UART2_BASE
++#define CONFIG_SYS_NS16550_COM4		SUNXI_UART3_BASE
++#define CONFIG_SYS_NS16550_COM5		SUNXI_R_UART_BASE
++
++/* DRAM Base */
++#define CONFIG_SYS_SDRAM_BASE		0x40000000
++#define CONFIG_SYS_INIT_RAM_ADDR	0x0
++#define CONFIG_SYS_INIT_RAM_SIZE	0x8000	/* 32 KiB */
++
++#define CONFIG_SYS_INIT_SP_OFFSET \
++	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
++#define CONFIG_SYS_INIT_SP_ADDR \
++	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
++
++/* A10 has 1 banks of DRAM, we use only bank 1 in U-Boot */
++#define CONFIG_NR_DRAM_BANKS		1
++#define PHYS_SDRAM_0			CONFIG_SYS_SDRAM_BASE
++#if defined(CONFIG_SUN6I) || defined(CONFIG_SUN7I)
++#define PHYS_SDRAM_0_SIZE		0x80000000 /* 2 GiB */
++#else
++#define PHYS_SDRAM_0_SIZE		0x40000000 /* 1 GiB */
++#endif
++#if 0
++/* Nand config */
++#define CONFIG_NAND
++#define CONFIG_NAND_SUNXI
++#define CONFIG_CMD_NAND                         /* NAND support */
++#define CONFIG_SYS_MAX_NAND_DEVICE      1
++#define CONFIG_SYS_NAND_BASE            0x00
++#endif
++
++#define CONFIG_CMD_MEMORY
++#define CONFIG_CMD_SETEXPR
++
++#define CONFIG_SETUP_MEMORY_TAGS
++#define CONFIG_CMDLINE_TAG
++#define CONFIG_INITRD_TAG
++
++/* mmc config */
++/* Can't use MMC slot 0 if the UART is directed there */
++#if !defined CONFIG_UART0_PORT_F || CONFIG_MMC_SUNXI_SLOT != 0
++#define CONFIG_MMC
++#define CONFIG_GENERIC_MMC
++#define CONFIG_CMD_MMC
++#define CONFIG_MMC_SUNXI
++#ifndef CONFIG_MMC_SUNXI_SLOT
++#define CONFIG_MMC_SUNXI_SLOT		0
++#endif
++#define CONFIG_ENV_IS_IN_MMC
++#define CONFIG_SYS_MMC_ENV_DEV		0	/* first detected MMC controller */
++#endif
++
++/* 4MB of malloc() pool */
++#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (4 << 20))
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_CMD_ECHO
++#define CONFIG_SYS_CBSIZE	256	/* Console I/O Buffer Size */
++#define CONFIG_SYS_PBSIZE	384	/* Print Buffer Size */
++#define CONFIG_SYS_MAXARGS	16	/* max number of command args */
++#define CONFIG_SYS_GENERIC_BOARD
++
++/* Boot Argument Buffer Size */
++#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
++
++#define CONFIG_SYS_LOAD_ADDR		0x48000000 /* default load address */
++
++/* standalone support */
++#define CONFIG_STANDALONE_LOAD_ADDR	0x48000000
++
++#define CONFIG_SYS_HZ			1000
++
++/* baudrate */
++#define CONFIG_BAUDRATE			115200
++
++/* The stack sizes are set up in start.S using the settings below */
++#define CONFIG_STACKSIZE		(256 << 10)	/* 256 KiB */
++
++/* FLASH and environment organization */
++
++#define CONFIG_SYS_NO_FLASH
++
++#define CONFIG_SYS_MONITOR_LEN		(512 << 10)	/* 512 KiB */
++#define CONFIG_IDENT_STRING		" Allwinner Technology"
++
++#define CONFIG_ENV_OFFSET		(544 << 10) /* (8 + 24 + 512) KiB */
++#define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
++
++#ifdef CONFIG_SPL_FEL
++#define RUN_BOOT_RAM	"run boot_ram;"
++#else
++#define RUN_BOOT_RAM	""
++#endif
++
++#define CONFIG_BOOTCOMMAND \
++	RUN_BOOT_RAM \
++	"if run loadbootenv; then " \
++	  "echo Loaded environment from ${bootenv};" \
++	  "env import -t ${scriptaddr} ${filesize};" \
++	"fi;" \
++	"if test -n \\\"${uenvcmd}\\\"; then " \
++	  "echo Running uenvcmd ...;" \
++	  "run uenvcmd;" \
++	"fi;" \
++	"if run loadbootscr; then "\
++	  "echo Jumping to ${bootscr};" \
++	  "source ${scriptaddr};" \
++	"fi;" \
++	"run autoboot;" \
++	""
++
++#ifdef CONFIG_CMD_WATCHDOG
++#define	RESET_WATCHDOG "watchdog 0"
++#else
++#define RESET_WATCHDOG "true"
++#endif
++
++#define CONFIG_EXTRA_ENV_SETTINGS \
++	"bootm_size=0x10000000\0" \
++	"console=ttyS0,115200\0" \
++	"panicarg=panic=10\0" \
++	"extraargs=\0" \
++	"loglevel=8\0" \
++	"scriptaddr=0x44000000\0" \
++	"device=mmc\0" \
++	"partition=0:1\0" \
++	"setargs=" \
++	  "if test -z \\\\\"$root\\\\\"; then"\
++	    " if test \\\\\"$bootpath\\\\\" = \"/boot/\"; then"\
++	      " root=\"/dev/mmcblk0p1 rootwait\";"\
++	    " else" \
++	      " root=\"/dev/mmcblk0p2 rootwait\";"\
++	    " fi;"\
++	  " fi;"\
++	  " setenv bootargs console=${console} root=${root}" \
++	  " loglevel=${loglevel} ${panicarg} ${extraargs}" \
++	  "\0" \
++	"kernel=uImage\0" \
++	"bootenv=uEnv.txt\0" \
++	"bootscr=boot.scr\0" \
++	"script=script.bin\0" \
++	"loadbootscr=" \
++	  "fatload $device $partition $scriptaddr ${bootscr}" \
++	  " || " \
++	  "ext2load $device $partition $scriptaddr boot/${bootscr}" \
++	  " ||" \
++	  "ext2load $device $partition $scriptaddr ${bootscr}" \
++	  "\0" \
++	"loadbootenv=" \
++	  "fatload $device $partition $scriptaddr ${bootenv}" \
++	  " || " \
++	  "ext2load $device $partition $scriptaddr boot/${bootenv}" \
++	  " || " \
++	  "ext2load $device $partition $scriptaddr ${bootenv}" \
++	  "\0" \
++	"loadkernel=" \
++	  "if "\
++	    "bootpath=/boot/" \
++	    " && " \
++	    "ext2load $device $partition 0x43000000 ${bootpath}${script}" \
++	    " && " \
++	    "ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
++	  ";then true; elif " \
++	    "bootpath=/" \
++	    " && " \
++	    "fatload $device $partition 0x43000000 ${script}" \
++	    " && " \
++	    "fatload $device $partition 0x48000000 ${kernel}" \
++	  ";then true; elif " \
++	    "bootpath=/" \
++	    " && " \
++	    "ext2load $device $partition 0x43000000 ${bootpath}${script}" \
++	    " && " \
++	    "ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
++	  ";then true; else "\
++	    "false" \
++	  ";fi" \
++	  "\0" \
++	"autoboot=" \
++	  "run loadkernel" \
++	  " && " \
++	  "run setargs" \
++	  " && " \
++	  RESET_WATCHDOG \
++	  " && " \
++	  "bootm 0x48000000" \
++	  "\0" \
++	"boot_ram=" \
++	  "saved_stdout=$stdout;setenv stdout nc;"\
++	  "if iminfo 0x41000000; then" \
++	    " " RESET_WATCHDOG ";"\
++	    " setenv stdout $saved_stdout;" \
++	    " source 0x41000000;" \
++	  "else" \
++	    " setenv stdout $saved_stdout;" \
++	  "fi" \
++	  "\0" \
++	""
++
++#define CONFIG_SYS_BOOT_GET_CMDLINE
++
++#include <config_cmd_default.h>
++
++#define CONFIG_FAT_WRITE	/* enable write access */
++
++#define CONFIG_SPL_FRAMEWORK
++#define CONFIG_SPL_LIBCOMMON_SUPPORT
++#define CONFIG_SPL_SERIAL_SUPPORT
++#define CONFIG_SPL_LIBGENERIC_SUPPORT
++#define CONFIG_SPL_DISPLAY_PRINT
++
++/* Falcon boot mode support */
++/* Disabled by default on sun4i/sun7i. Many GCC versions produces a too
++ * large SPL for A10/A20 with this on. sun5i however accepts a much larger
++ * SPL
++ */
++#if defined( CONFIG_SUN5I ) || defined ( CONFIG_SYS_THUMB_BUILD )
++#define CONFIG_SPL_OS_BOOT
++#endif
++
++#ifdef CONFIG_SPL_FEL
++
++#define CONFIG_SPL
++#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds"
++#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/armv7/sunxi"
++#define CONFIG_SPL_TEXT_BASE		0x2000
++#define CONFIG_SPL_MAX_SIZE		0x4000		/* 16 KiB */
++
++#else /* CONFIG_SPL */
++
++#define CONFIG_SPL_BSS_START_ADDR	0x4ff80000
++#define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KiB */
++
++#define CONFIG_SPL_TEXT_BASE		0x20		/* sram start+header */
++#ifdef CONFIG_SUN5I
++#define CONFIG_SPL_MAX_SIZE		0x75e0		/* 7748+ is used */
++#else
++#define CONFIG_SPL_MAX_SIZE		0x5fe0		/* 24KB on sun4i/sun7i */
++#endif
++
++#define CONFIG_SPL_LIBDISK_SUPPORT
++#define CONFIG_SPL_MMC_SUPPORT
++
++#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds"
++
++#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	80	/* 40KiB */
++#define CONFIG_SPL_PAD_TO		32768		/* decimal for 'dd' */
++
++#endif /* CONFIG_SPL */
++/* end of 32 KiB in sram */
++#define LOW_LEVEL_SRAM_STACK		0x00008000 /* End of sram */
++#define CONFIG_SPL_STACK		LOW_LEVEL_SRAM_STACK
++#define CONFIG_SYS_SPL_MALLOC_START	0x4ff00000
++#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00080000	/* 512 KiB */
++
++#ifdef CONFIG_SPL_OS_BOOT
++#define CONFIG_CMD_SPL
++#define CONFIG_SYS_SPL_ARGS_ADDR		(PHYS_SDRAM_0 + 0x100)
++#ifdef CONFIG_SPL_MMC_SUPPORT
++#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	1344
++#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS  256
++#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 1600
++#endif
++#endif
++
++#undef CONFIG_CMD_FPGA
++#undef CONFIG_CMD_NET
++#undef CONFIG_CMD_NFS
++
++/* I2C */
++#if !defined CONFIG_SUN6I && !defined CONFIG_SUN8I
++#define CONFIG_SPL_I2C_SUPPORT
++#endif
++/* No CONFIG_SYS_I2C as we use the non converted mvtwsi driver */
++#define CONFIG_HARD_I2C
++#define CONFIG_SYS_I2C_SUNXI
++#define CONFIG_SYS_I2C_SPEED		400000
++#define CONFIG_SYS_I2C_SLAVE		0x7f
++#define CONFIG_CMD_I2C
++
++/* Watchdog */
++#if 0
++#define CONFIG_WATCHDOG			/* automatic watchdog support */
++#define CONFIG_CMD_WATCHDOG		/* watchdog command setting the watchdog timeout */
++#endif
++
++/* GPIO */
++#define CONFIG_SUNXI_GPIO
++#define CONFIG_CMD_GPIO
++
++/* PMU */
++#if !defined CONFIG_AXP152_POWER && !defined CONFIG_AXP221_POWER && !defined CONFIG_NO_AXP
++#define CONFIG_AXP209_POWER
++#endif
++#if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || defined CONFIG_AXP221_POWER
++#define CONFIG_SPL_POWER_SUPPORT
++#endif
++
++#ifdef CONFIG_STATUSLED
++#define STATUS_LED_BIT CONFIG_STATUSLED
++#endif
++#ifdef CONFIG_STATUSLED1
++#define STATUS_LED_BIT1 CONFIG_STATUSLED1
++#endif
++#ifdef CONFIG_STATUSLED2
++#define STATUS_LED_BIT2 CONFIG_STATUSLED2
++#endif
++#ifdef CONFIG_STATUSLED3
++#define STATUS_LED_BIT3 CONFIG_STATUSLED3
++#endif
++
++#ifndef CONFIG_SPL_BUILD
++#ifdef STATUS_LED_BIT
++#define CONFIG_GPIO_LED
++#define CONFIG_STATUS_LED
++#ifndef STATUS_LED_BOOT
++#define STATUS_LED_BOOT 0
++#endif
++#ifndef STATUS_LED_STATE
++#define STATUS_LED_STATE STATUS_LED_ON
++#define STATUS_LED_PERIOD 1
++#endif
++#ifndef STATUS_LED_STATE1
++#define STATUS_LED_STATE1 STATUS_LED_OFF
++#define STATUS_LED_PERIOD1 1
++#endif
++#ifndef STATUS_LED_STATE2
++#define STATUS_LED_STATE2 STATUS_LED_OFF
++#define STATUS_LED_PERIOD2 1
++#endif
++#ifndef STATUS_LED_STATE3
++#define STATUS_LED_STATE3 STATUS_LED_OFF
++#define STATUS_LED_PERIOD3 1
++#endif
++#define CONFIG_BOARD_SPECIFIC_LED
++#define CONFIG_CMD_LED
++#endif
++#endif
++
++/* Define this to have serial channel 1 (UART0) redirected to SD port */
++/* #define CONFIG_UART0_PORT_F */
++
++#ifndef CONFIG_CONS_INDEX
++#define CONFIG_CONS_INDEX              1       /* UART0 */
++#endif
++
++/* Ethernet support */
++#ifdef CONFIG_SUNXI_EMAC
++#define CONFIG_MII			/* MII PHY management		*/
++#endif
++
++#ifdef CONFIG_SUNXI_GMAC
++#define CONFIG_DESIGNWARE_ETH		/* GMAC can use designware driver */
++#define CONFIG_DW_AUTONEG
++#define CONFIG_PHY_GIGE			/* GMAC can use gigabit PHY	*/
++#define CONFIG_PHY_ADDR		1
++#define CONFIG_MII			/* MII PHY management		*/
++#define CONFIG_PHYLIB
++#endif
++
++#ifdef CONFIG_CMD_NET
++#define CONFIG_CMD_NFS
++#define CONFIG_CMD_DNS
++#define CONFIG_NETCONSOLE
++#define CONFIG_BOOTP_DNS2
++#define CONFIG_BOOTP_SEND_HOSTNAME
++#endif
++
++#if !defined CONFIG_ENV_IS_IN_MMC && \
++    !defined CONFIG_ENV_IS_IN_NAND && \
++    !defined CONFIG_ENV_IS_IN_FAT && \
++    !defined CONFIG_ENV_IS_IN_SPI_FLASH
++#define CONFIG_ENV_IS_NOWHERE
++#endif
++
++#define CONFIG_MISC_INIT_R
++
++#ifndef CONFIG_SPL_BUILD
++#include <config_distro_defaults.h>
++#endif
++
++#endif /* _SUNXI_COMMON_CONFIG_H */
+diff -ruN u-boot-2014.04/include/netdev.h u-boot-sunxi/include/netdev.h
+--- u-boot-2014.04/include/netdev.h	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/include/netdev.h	2014-09-06 16:58:36.485953106 +0200
+@@ -79,7 +79,8 @@
+ int skge_initialize(bd_t *bis);
+ int smc91111_initialize(u8 dev_num, int base_addr);
+ int smc911x_initialize(u8 dev_num, int base_addr);
+-int sunxi_wemac_initialize(bd_t *bis);
++int sunxi_emac_initialize(bd_t *bis);
++int sunxi_gmac_initialize(bd_t *bis);
+ int tsi108_eth_initialize(bd_t *bis);
+ int uec_standard_init(bd_t *bis);
+ int uli526x_initialize(bd_t *bis);
+diff -ruN u-boot-2014.04/Makefile u-boot-sunxi/Makefile
+--- u-boot-2014.04/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/Makefile	2014-09-06 16:58:35.065953148 +0200
+@@ -870,6 +870,13 @@
+ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE
+ 	$(call if_changed,pad_cat)
+ 
++ifneq ($(CONFIG_SUNXI),)
++OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \
++				   --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
++u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE
++	$(call if_changed,pad_cat)
++endif
++
+ ifneq ($(CONFIG_TEGRA),)
+ OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE)
+ u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot.bin FORCE
+@@ -1081,6 +1088,9 @@
+ spl/u-boot-spl: tools prepare
+ 	$(Q)$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
+ 
++spl/sunxi-spl.bin: spl/u-boot-spl
++	@:
++
+ tpl/u-boot-tpl.bin: tools prepare
+ 	$(Q)$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
+ 
+diff -ruN u-boot-2014.04/mkconfig u-boot-sunxi/mkconfig
+--- u-boot-2014.04/mkconfig	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/mkconfig	2014-09-06 16:58:36.509953105 +0200
+@@ -174,6 +174,7 @@
+ echo "#define CONFIG_SYS_ARCH  \"${arch}\""  >> config.h
+ echo "#define CONFIG_SYS_CPU   \"${cpu}\""   >> config.h
+ echo "#define CONFIG_SYS_BOARD \"${board}\"" >> config.h
++echo "#define CONFIG_SYS_TARGET \"${BOARD_NAME}\"" >> config.h
+ 
+ [ "${vendor}" ] && echo "#define CONFIG_SYS_VENDOR \"${vendor}\"" >> config.h
+ 
+diff -ruN u-boot-2014.04/snapshot.commit u-boot-sunxi/snapshot.commit
+--- u-boot-2014.04/snapshot.commit	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/snapshot.commit	2014-09-06 16:58:36.521953105 +0200
+@@ -1 +1 @@
+-dda0dbfc69f3d560c87f5be85f127ed862ea6721  Mon, 14 Apr 2014 15:19:24 -0400
++$Format:%H  %cD$
+diff -ruN u-boot-2014.04/spl/Makefile u-boot-sunxi/spl/Makefile
+--- u-boot-2014.04/spl/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/spl/Makefile	2014-09-06 16:58:36.521953105 +0200
+@@ -188,6 +188,12 @@
+ ALL-y	+= $(obj)/$(BOARD)-spl.bin
+ endif
+ 
++ifdef CONFIG_SUNXI
++ifndef CONFIG_SPL_FEL
++ALL-y	+= $(obj)/sunxi-spl.bin
++endif
++endif
++
+ all:	$(ALL-y)
+ 
+ ifdef CONFIG_SAMSUNG
+@@ -215,6 +221,13 @@
+ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
+ endif
+ 
++ifdef CONFIG_SUNXI
++quiet_cmd_mksunxiboot = MKSUNXI $@
++cmd_mksunxiboot = $(objtree)/tools/mksunxiboot $< $@
++$(obj)/sunxi-spl.bin: $(obj)/$(SPL_BIN).bin
++	$(call if_changed,mksunxiboot)
++endif
++
+ quiet_cmd_u-boot-spl = LD      $@
+       cmd_u-boot-spl = cd $(obj) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \
+ 		       $(patsubst $(obj)/%,%,$(u-boot-spl-init)) --start-group \
+diff -ruN u-boot-2014.04/tools/.gitignore u-boot-sunxi/tools/.gitignore
+--- u-boot-2014.04/tools/.gitignore	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/tools/.gitignore	2014-09-06 16:58:36.521953105 +0200
+@@ -9,6 +9,7 @@
+ /mkexynosspl
+ /mpc86x_clk
+ /mxsboot
++/mksunxiboot
+ /ncb
+ /proftool
+ /relocate-rela
+diff -ruN u-boot-2014.04/tools/Makefile u-boot-sunxi/tools/Makefile
+--- u-boot-2014.04/tools/Makefile	2014-04-14 21:19:24.000000000 +0200
++++ u-boot-sunxi/tools/Makefile	2014-09-06 16:58:36.521953105 +0200
+@@ -120,6 +120,8 @@
+ hostprogs-$(CONFIG_MX28) += mxsboot$(SFX)
+ HOSTCFLAGS_mxsboot$(SFX).o := -pedantic
+ 
++hostprogs-$(CONFIG_SUNXI) += mksunxiboot$(SFX)
++
+ hostprogs-$(CONFIG_NETCONSOLE) += ncb$(SFX)
+ hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
+ 
+diff -ruN u-boot-2014.04/tools/mksunxiboot.c u-boot-sunxi/tools/mksunxiboot.c
+--- u-boot-2014.04/tools/mksunxiboot.c	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/tools/mksunxiboot.c	2014-09-06 16:58:36.529953105 +0200
+@@ -0,0 +1,140 @@
++/*
++ * (C) Copyright 2007-2011
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ * Tom Cubie <tangliang@allwinnertech.com>
++ *
++ * a simple tool to generate bootable image for sunxi platform.
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ */
++#include <fcntl.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++
++/* boot head definition from sun4i boot code */
++struct boot_file_head {
++	uint32_t b_instruction;	/* one intruction jumping to real code */
++	uint8_t magic[8];	/* ="eGON.BT0" or "eGON.BT1", not C-style str */
++	uint32_t check_sum;	/* generated by PC */
++	uint32_t length;	/* generated by PC */
++	/*
++	 * We use a simplified header, only filling in what is needed
++	 * by the boot ROM. To be compatible with Allwinner tools we
++	 * would need to implement the proper fields here instead of
++	 * padding.
++	 */
++	uint8_t pad[12];		/* align to 32 bytes */
++};
++
++#define BOOT0_MAGIC                     "eGON.BT0"
++#define STAMP_VALUE                     0x5F0A6C39
++
++/* check sum functon from sun4i boot code */
++int gen_check_sum(struct boot_file_head *head_p)
++{
++	uint32_t length;
++	uint32_t *buf;
++	uint32_t loop;
++	uint32_t i;
++	uint32_t sum;
++
++	length = head_p->length;
++	if ((length & 0x3) != 0)	/* must 4-byte-aligned */
++		return -1;
++	buf = (uint32_t *)head_p;
++	head_p->check_sum = STAMP_VALUE;	/* fill stamp */
++	loop = length >> 2;
++
++	/* calculate the sum */
++	for (i = 0, sum = 0; i < loop; i++)
++		sum += buf[i];
++
++	/* write back check sum */
++	head_p->check_sum = sum;
++
++	return 0;
++}
++
++#define ALIGN(x, a) __ALIGN_MASK((x), (typeof(x))(a)-1)
++#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
++
++#define SUN4I_SRAM_SIZE 0x7600	/* 0x7748+ is used by BROM */
++#define SRAM_LOAD_MAX_SIZE (SUN4I_SRAM_SIZE - sizeof(struct boot_file_head))
++#define BLOCK_SIZE 512
++
++struct boot_img {
++	struct boot_file_head header;
++	char code[SRAM_LOAD_MAX_SIZE];
++	char pad[BLOCK_SIZE];
++};
++
++int main(int argc, char *argv[])
++{
++	int fd_in, fd_out;
++	struct boot_img img;
++	unsigned file_size;
++	int count;
++
++	if (argc < 2) {
++		printf("\tThis program makes an input bin file to sun4i " \
++		       "bootable image.\n" \
++		       "\tUsage: %s input_file out_putfile\n", argv[0]);
++		return EXIT_FAILURE;
++	}
++
++	fd_in = open(argv[1], O_RDONLY);
++	if (fd_in < 0) {
++		perror("Open input file");
++		return EXIT_FAILURE;
++	}
++
++	memset(img.pad, 0, BLOCK_SIZE);
++
++	/* get input file size */
++	file_size = lseek(fd_in, 0, SEEK_END);
++
++	if (file_size > SRAM_LOAD_MAX_SIZE) {
++		fprintf(stderr, "ERROR: File too large!\n");
++		return EXIT_FAILURE;
++	}
++
++	fd_out = open(argv[2], O_WRONLY | O_CREAT, 0666);
++	if (fd_out < 0) {
++		perror("Open output file");
++		return EXIT_FAILURE;
++	}
++
++	/* read file to buffer to calculate checksum */
++	lseek(fd_in, 0, SEEK_SET);
++	count = read(fd_in, img.code, file_size);
++	if (count != file_size) {
++		perror("Reading input image");
++		return EXIT_FAILURE;
++	}
++
++	/* fill the header */
++	img.header.b_instruction =	/* b instruction */
++		0xEA000000 |	/* jump to the first instr after the header */
++		((sizeof(struct boot_file_head) / sizeof(int) - 2)
++		 & 0x00FFFFFF);
++	memcpy(img.header.magic, BOOT0_MAGIC, 8);	/* no '0' termination */
++	img.header.length =
++		ALIGN(file_size + sizeof(struct boot_file_head), BLOCK_SIZE);
++	gen_check_sum(&img.header);
++
++	count = write(fd_out, &img, img.header.length);
++	if (count != img.header.length) {
++		perror("Writing output");
++		return EXIT_FAILURE;
++	}
++
++	close(fd_in);
++	close(fd_out);
++
++	return EXIT_SUCCESS;
++}
+diff -ruN u-boot-2014.04/tools/mksunxiboot.README u-boot-sunxi/tools/mksunxiboot.README
+--- u-boot-2014.04/tools/mksunxiboot.README	1970-01-01 01:00:00.000000000 +0100
++++ u-boot-sunxi/tools/mksunxiboot.README	2014-09-06 16:58:36.529953105 +0200
+@@ -0,0 +1,13 @@
++This program make a arm binary file can be loaded by Allwinner A10 and related
++chips from storage media such as nand and mmc.
++
++More information about A10 boot, please refer to
++http://rhombus-tech.net/allwinner_a10/a10_boot_process/
++
++To compile this program, just type make, you will get 'mksunxiboot'.
++
++To use it,
++$./mksunxiboot u-boot.bin u-boot-mmc.bin
++then you can write it to a mmc card with dd.
++$sudo dd if=u-boot-mmc.bin of=/dev/sdb bs=1024 seek=8
++then insert your mmc card to your A10 tablet, you can boot from mmc card.
diff --git a/trunk/package/boot/uboot-sunxi/patches/002-uboot-jwrdegoede-psci-support.patch b/trunk/package/boot/uboot-sunxi/patches/002-uboot-jwrdegoede-psci-support.patch
new file mode 100644
index 00000000..65407aaa
--- /dev/null
+++ b/trunk/package/boot/uboot-sunxi/patches/002-uboot-jwrdegoede-psci-support.patch
@@ -0,0 +1,1495 @@
+From 86f31982ac62e80fe586cad2e0a49a7b22e3d4ee Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:07 +0000
+Subject: [PATCH] ARM: HYP/non-sec: move switch to non-sec to the last boot
+ phase
+
+Having the switch to non-secure in the "prep" phase is causing
+all kind of troubles, as that stage can be called multiple times.
+
+Instead, move the switch to non-secure to the last possible phase,
+when there is no turning back anymore.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/lib/bootm.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
+index 47ee070..10634a4 100644
+--- a/arch/arm/lib/bootm.c
++++ b/arch/arm/lib/bootm.c
+@@ -242,7 +242,6 @@ static void boot_prep_linux(bootm_headers_t *images)
+ 		printf("FDT and ATAGS support not compiled in - hanging\n");
+ 		hang();
+ 	}
+-	do_nonsec_virt_switch();
+ }
+ 
+ /* Subcommand: GO */
+@@ -287,8 +286,10 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
+ 	else
+ 		r2 = gd->bd->bi_boot_params;
+ 
+-	if (!fake)
++	if (!fake) {
++		do_nonsec_virt_switch();
+ 		kernel_entry(0, machid, r2);
++	}
+ #endif
+ }
+ 
+From c26d288f6cbc6d53219001d42476f314c403257b Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:08 +0000
+Subject: [PATCH] ARM: HYP/non-sec: add a barrier after setting SCR.NS==1
+
+A CP15 instruction execution can be reordered, requiring an
+isb to be sure it is executed in program order.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/cpu/armv7/nonsec_virt.S | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
+index 6367e09..12de5c2 100644
+--- a/arch/arm/cpu/armv7/nonsec_virt.S
++++ b/arch/arm/cpu/armv7/nonsec_virt.S
+@@ -46,6 +46,7 @@ _secure_monitor:
+ #endif
+ 
+ 	mcr	p15, 0, r1, c1, c1, 0		@ write SCR (with NS bit set)
++	isb
+ 
+ #ifdef CONFIG_ARMV7_VIRT
+ 	mrceq	p15, 0, r0, c12, c0, 1		@ get MVBAR value
+From 06feeea3c84cc58ff3d5c19f6a430886495f86ce Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:09 +0000
+Subject: [PATCH] ARM: non-sec: reset CNTVOFF to zero
+
+Before switching to non-secure, make sure that CNTVOFF is set
+to zero on all CPUs. Otherwise, kernel running in non-secure
+without HYP enabled (hence using virtual timers) may observe
+timers that are not synchronized, effectively seeing time
+going backward...
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/cpu/armv7/nonsec_virt.S | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
+index 12de5c2..b5c946f 100644
+--- a/arch/arm/cpu/armv7/nonsec_virt.S
++++ b/arch/arm/cpu/armv7/nonsec_virt.S
+@@ -38,10 +38,10 @@ _secure_monitor:
+ 	bic	r1, r1, #0x4e			@ clear IRQ, FIQ, EA, nET bits
+ 	orr	r1, r1, #0x31			@ enable NS, AW, FW bits
+ 
+-#ifdef CONFIG_ARMV7_VIRT
+ 	mrc	p15, 0, r0, c0, c1, 1		@ read ID_PFR1
+ 	and	r0, r0, #CPUID_ARM_VIRT_MASK	@ mask virtualization bits
+ 	cmp	r0, #(1 << CPUID_ARM_VIRT_SHIFT)
++#ifdef CONFIG_ARMV7_VIRT
+ 	orreq	r1, r1, #0x100			@ allow HVC instruction
+ #endif
+ 
+@@ -52,7 +52,14 @@ _secure_monitor:
+ 	mrceq	p15, 0, r0, c12, c0, 1		@ get MVBAR value
+ 	mcreq	p15, 4, r0, c12, c0, 0		@ write HVBAR
+ #endif
++	bne	1f
+ 
++	@ Reset CNTVOFF to 0 before leaving monitor mode
++	mrc	p15, 0, r0, c0, c1, 1		@ read ID_PFR1
++	ands	r0, r0, #CPUID_ARM_GENTIMER_MASK	@ test arch timer bits
++	movne	r0, #0
++	mcrrne	p15, 4, r0, r0, c14		@ Reset CNTVOFF to zero
++1:
+ 	movs	pc, lr				@ return to non-secure SVC
+ 
+ _hyp_trap:
+From 054bcf5147ff5a20298bce5b3bdfbf3e1c797594 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:10 +0000
+Subject: [PATCH] ARM: add missing HYP mode constant
+
+In order to be able to use the various mode constants (far more
+readable than random hex values), add the missing HYP and A
+values.
+
+Also update arm/lib/interrupts.c to display HYP instead of an
+unknown value.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/include/asm/proc-armv/ptrace.h | 2 ++
+ arch/arm/lib/interrupts.c               | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/include/asm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h
+index 21aef58..71df5a9 100644
+--- a/arch/arm/include/asm/proc-armv/ptrace.h
++++ b/arch/arm/include/asm/proc-armv/ptrace.h
+@@ -38,12 +38,14 @@ struct pt_regs {
+ #define IRQ_MODE	0x12
+ #define SVC_MODE	0x13
+ #define ABT_MODE	0x17
++#define HYP_MODE	0x1a
+ #define UND_MODE	0x1b
+ #define SYSTEM_MODE	0x1f
+ #define MODE_MASK	0x1f
+ #define T_BIT		0x20
+ #define F_BIT		0x40
+ #define I_BIT		0x80
++#define A_BIT		0x100
+ #define CC_V_BIT	(1 << 28)
+ #define CC_C_BIT	(1 << 29)
+ #define CC_Z_BIT	(1 << 30)
+diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
+index 758b013..f6b7c03 100644
+--- a/arch/arm/lib/interrupts.c
++++ b/arch/arm/lib/interrupts.c
+@@ -103,7 +103,7 @@ void show_regs (struct pt_regs *regs)
+ 	"UK12_26",	"UK13_26",	"UK14_26",	"UK15_26",
+ 	"USER_32",	"FIQ_32",	"IRQ_32",	"SVC_32",
+ 	"UK4_32",	"UK5_32",	"UK6_32",	"ABT_32",
+-	"UK8_32",	"UK9_32",	"UK10_32",	"UND_32",
++	"UK8_32",	"UK9_32",	"HYP_32",	"UND_32",
+ 	"UK12_32",	"UK13_32",	"UK14_32",	"SYS_32",
+ 	};
+ 
+From 213a8d9b7e613210d3c7d8b99c95b454ad0527d8 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:11 +0000
+Subject: [PATCH] ARM: HYP/non-sec: add separate section for secure code
+
+In anticipation of refactoring the HYP/non-secure code to run
+from secure RAM, add a new linker section that will contain that
+code.
+
+Nothing is using it just yet.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/config.mk      |  2 +-
+ arch/arm/cpu/u-boot.lds | 30 ++++++++++++++++++++++++++++++
+ arch/arm/lib/sections.c |  2 ++
+ 3 files changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/config.mk b/arch/arm/config.mk
+index 66ecc2e..2bdfca5 100644
+--- a/arch/arm/config.mk
++++ b/arch/arm/config.mk
+@@ -113,7 +113,7 @@ endif
+ ifdef CONFIG_ARM64
+ OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn
+ else
+-OBJCOPYFLAGS += -j .text -j .rodata -j .hash -j .data -j .got.plt -j .u_boot_list -j .rel.dyn
++OBJCOPYFLAGS += -j .text -j .secure_text -j .rodata -j .hash -j .data -j .got.plt -j .u_boot_list -j .rel.dyn
+ endif
+ 
+ ifneq ($(CONFIG_IMX_CONFIG),)
+diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
+index 33c1f99..f45885d 100644
+--- a/arch/arm/cpu/u-boot.lds
++++ b/arch/arm/cpu/u-boot.lds
+@@ -7,6 +7,8 @@
+  * SPDX-License-Identifier:	GPL-2.0+
+  */
+ 
++#include <config.h>
++
+ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+ OUTPUT_ARCH(arm)
+ ENTRY(_start)
+@@ -22,6 +24,34 @@ SECTIONS
+ 		*(.text*)
+ 	}
+ 
++#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) || defined(CONFIG_ARMV7_PSCI)
++
++#ifndef CONFIG_ARMV7_SECURE_BASE
++#define CONFIG_ARMV7_SECURE_BASE
++#endif
++
++	.__secure_start : {
++		. = ALIGN(0x1000);
++		*(.__secure_start)
++	}
++
++	.secure_text CONFIG_ARMV7_SECURE_BASE :
++		AT(ADDR(.__secure_start) + SIZEOF(.__secure_start))
++	{
++		*(._secure.text)
++	}
++
++	. = LOADADDR(.__secure_start) +
++		SIZEOF(.__secure_start) +
++		SIZEOF(.secure_text);
++
++	__secure_end_lma = .;
++	.__secure_end : AT(__secure_end_lma) {
++		*(.__secure_end)
++		LONG(0x1d1071c);	/* Must output something to reset LMA */
++	}
++#endif
++
+ 	. = ALIGN(4);
+ 	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+ 
+diff --git a/arch/arm/lib/sections.c b/arch/arm/lib/sections.c
+index 5b30bcb..a1205c3 100644
+--- a/arch/arm/lib/sections.c
++++ b/arch/arm/lib/sections.c
+@@ -25,4 +25,6 @@ char __image_copy_start[0] __attribute__((section(".__image_copy_start")));
+ char __image_copy_end[0] __attribute__((section(".__image_copy_end")));
+ char __rel_dyn_start[0] __attribute__((section(".__rel_dyn_start")));
+ char __rel_dyn_end[0] __attribute__((section(".__rel_dyn_end")));
++char __secure_start[0] __attribute__((section(".__secure_start")));
++char __secure_end[0] __attribute__((section(".__secure_end")));
+ char _end[0] __attribute__((section(".__end")));
+From d7ebd8f57e84ea92ef0cf55080f0acec9c6d1ace Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:12 +0000
+Subject: [PATCH] ARM: HYP/non-sec: allow relocation to secure RAM
+
+The current non-sec switching code suffers from one major issue:
+it cannot run in secure RAM, as a large part of u-boot still needs
+to be run while we're switched to non-secure.
+
+This patch reworks the whole HYP/non-secure strategy by:
+- making sure the secure code is the *last* thing u-boot executes
+  before entering the payload
+- performing an exception return from secure mode directly into
+  the payload
+- allowing the code to be dynamically relocated to secure RAM
+  before switching to non-secure.
+
+This involves quite a bit of horrible code, specially as u-boot
+relocation is quite primitive.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/cpu/armv7/nonsec_virt.S | 161 +++++++++++++++++++--------------------
+ arch/arm/cpu/armv7/virt-v7.c     |  59 +++++---------
+ arch/arm/include/asm/armv7.h     |  10 ++-
+ arch/arm/include/asm/secure.h    |  26 +++++++
+ arch/arm/lib/bootm.c             |  22 +++---
+ 5 files changed, 138 insertions(+), 140 deletions(-)
+ create mode 100644 arch/arm/include/asm/secure.h
+
+diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
+index b5c946f..2a43e3c 100644
+--- a/arch/arm/cpu/armv7/nonsec_virt.S
++++ b/arch/arm/cpu/armv7/nonsec_virt.S
+@@ -10,10 +10,13 @@
+ #include <linux/linkage.h>
+ #include <asm/gic.h>
+ #include <asm/armv7.h>
++#include <asm/proc-armv/ptrace.h>
+ 
+ .arch_extension sec
+ .arch_extension virt
+ 
++	.pushsection ._secure.text, "ax"
++
+ 	.align	5
+ /* the vector table for secure state and HYP mode */
+ _monitor_vectors:
+@@ -22,51 +25,86 @@ _monitor_vectors:
+ 	adr pc, _secure_monitor
+ 	.word 0
+ 	.word 0
+-	adr pc, _hyp_trap
++	.word 0
+ 	.word 0
+ 	.word 0
+ 
++.macro is_cpu_virt_capable	tmp
++	mrc	p15, 0, \tmp, c0, c1, 1		@ read ID_PFR1
++	and	\tmp, \tmp, #CPUID_ARM_VIRT_MASK	@ mask virtualization bits
++	cmp	\tmp, #(1 << CPUID_ARM_VIRT_SHIFT)
++.endm
++
+ /*
+  * secure monitor handler
+  * U-boot calls this "software interrupt" in start.S
+  * This is executed on a "smc" instruction, we use a "smc #0" to switch
+  * to non-secure state.
+- * We use only r0 and r1 here, due to constraints in the caller.
++ * r0, r1, r2: passed to the callee
++ * ip: target PC
+  */
+ _secure_monitor:
+-	mrc	p15, 0, r1, c1, c1, 0		@ read SCR
+-	bic	r1, r1, #0x4e			@ clear IRQ, FIQ, EA, nET bits
+-	orr	r1, r1, #0x31			@ enable NS, AW, FW bits
++	mrc	p15, 0, r5, c1, c1, 0		@ read SCR
++	bic	r5, r5, #0x4e			@ clear IRQ, FIQ, EA, nET bits
++	orr	r5, r5, #0x31			@ enable NS, AW, FW bits
+ 
+-	mrc	p15, 0, r0, c0, c1, 1		@ read ID_PFR1
+-	and	r0, r0, #CPUID_ARM_VIRT_MASK	@ mask virtualization bits
+-	cmp	r0, #(1 << CPUID_ARM_VIRT_SHIFT)
++	mov	r6, #SVC_MODE			@ default mode is SVC
++	is_cpu_virt_capable r4
+ #ifdef CONFIG_ARMV7_VIRT
+-	orreq	r1, r1, #0x100			@ allow HVC instruction
++	orreq	r5, r5, #0x100			@ allow HVC instruction
++	moveq	r6, #HYP_MODE			@ Enter the kernel as HYP
+ #endif
+ 
+-	mcr	p15, 0, r1, c1, c1, 0		@ write SCR (with NS bit set)
++	mcr	p15, 0, r5, c1, c1, 0		@ write SCR (with NS bit set)
+ 	isb
+ 
+-#ifdef CONFIG_ARMV7_VIRT
+-	mrceq	p15, 0, r0, c12, c0, 1		@ get MVBAR value
+-	mcreq	p15, 4, r0, c12, c0, 0		@ write HVBAR
+-#endif
+ 	bne	1f
+ 
+ 	@ Reset CNTVOFF to 0 before leaving monitor mode
+-	mrc	p15, 0, r0, c0, c1, 1		@ read ID_PFR1
+-	ands	r0, r0, #CPUID_ARM_GENTIMER_MASK	@ test arch timer bits
+-	movne	r0, #0
+-	mcrrne	p15, 4, r0, r0, c14		@ Reset CNTVOFF to zero
++	mrc	p15, 0, r4, c0, c1, 1		@ read ID_PFR1
++	ands	r4, r4, #CPUID_ARM_GENTIMER_MASK	@ test arch timer bits
++	movne	r4, #0
++	mcrrne	p15, 4, r4, r4, c14		@ Reset CNTVOFF to zero
+ 1:
+-	movs	pc, lr				@ return to non-secure SVC
+-
+-_hyp_trap:
+-	mrs	lr, elr_hyp	@ for older asm: .byte 0x00, 0xe3, 0x0e, 0xe1
+-	mov pc, lr				@ do no switch modes, but
+-						@ return to caller
+-
++	mov	lr, ip
++	mov	ip, #(F_BIT | I_BIT | A_BIT)	@ Set A, I and F
++	tst	lr, #1				@ Check for Thumb PC
++	orrne	ip, ip, #T_BIT			@ Set T if Thumb
++	orr	ip, ip, r6			@ Slot target mode in
++	msr	spsr_cxfs, ip			@ Set full SPSR
++	movs	pc, lr				@ ERET to non-secure
++
++ENTRY(_do_nonsec_entry)
++	mov	ip, r0
++	mov	r0, r1
++	mov	r1, r2
++	mov	r2, r3
++	smc	#0
++ENDPROC(_do_nonsec_entry)
++
++.macro get_cbar_addr	addr
++#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
++	ldr	\addr, =CONFIG_ARM_GIC_BASE_ADDRESS
++#else
++	mrc	p15, 4, \addr, c15, c0, 0	@ read CBAR
++	bfc	\addr, #0, #15			@ clear reserved bits
++#endif
++.endm
++
++.macro get_gicd_addr	addr
++	get_cbar_addr	\addr
++	add	\addr, \addr, #GIC_DIST_OFFSET	@ GIC dist i/f offset
++.endm
++
++.macro get_gicc_addr	addr, tmp
++	get_cbar_addr	\addr
++	is_cpu_virt_capable \tmp
++	movne	\tmp, #GIC_CPU_OFFSET_A9	@ GIC CPU offset for A9
++	moveq	\tmp, #GIC_CPU_OFFSET_A15	@ GIC CPU offset for A15/A7
++	add	\addr, \addr, \tmp
++.endm
++
++#ifndef CONFIG_ARMV7_PSCI
+ /*
+  * Secondary CPUs start here and call the code for the core specific parts
+  * of the non-secure and HYP mode transition. The GIC distributor specific
+@@ -74,31 +112,21 @@ _hyp_trap:
+  * Then they go back to wfi and wait to be woken up by the kernel again.
+  */
+ ENTRY(_smp_pen)
+-	mrs	r0, cpsr
+-	orr	r0, r0, #0xc0
+-	msr	cpsr, r0			@ disable interrupts
+-	ldr	r1, =_start
+-	mcr	p15, 0, r1, c12, c0, 0		@ set VBAR
++	cpsid	i
++	cpsid	f
+ 
+ 	bl	_nonsec_init
+-	mov	r12, r0				@ save GICC address
+-#ifdef CONFIG_ARMV7_VIRT
+-	bl	_switch_to_hyp
+-#endif
+-
+-	ldr	r1, [r12, #GICC_IAR]		@ acknowledge IPI
+-	str	r1, [r12, #GICC_EOIR]		@ signal end of interrupt
+ 
+ 	adr	r0, _smp_pen			@ do not use this address again
+ 	b	smp_waitloop			@ wait for IPIs, board specific
+ ENDPROC(_smp_pen)
++#endif
+ 
+ /*
+  * Switch a core to non-secure state.
+  *
+  *  1. initialize the GIC per-core interface
+  *  2. allow coprocessor access in non-secure modes
+- *  3. switch the cpu mode (by calling "smc #0")
+  *
+  * Called from smp_pen by secondary cores and directly by the BSP.
+  * Do not assume that the stack is available and only use registers
+@@ -108,38 +136,23 @@ ENDPROC(_smp_pen)
+  * though, but we check this in C before calling this function.
+  */
+ ENTRY(_nonsec_init)
+-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
+-	ldr	r2, =CONFIG_ARM_GIC_BASE_ADDRESS
+-#else
+-	mrc	p15, 4, r2, c15, c0, 0		@ read CBAR
+-	bfc	r2, #0, #15			@ clear reserved bits
+-#endif
+-	add	r3, r2, #GIC_DIST_OFFSET	@ GIC dist i/f offset
++	get_gicd_addr	r3
++
+ 	mvn	r1, #0				@ all bits to 1
+ 	str	r1, [r3, #GICD_IGROUPRn]	@ allow private interrupts
+ 
+-	mrc	p15, 0, r0, c0, c0, 0		@ read MIDR
+-	ldr	r1, =MIDR_PRIMARY_PART_MASK
+-	and	r0, r0, r1			@ mask out variant and revision
++	get_gicc_addr	r3, r1
+ 
+-	ldr	r1, =MIDR_CORTEX_A7_R0P0 & MIDR_PRIMARY_PART_MASK
+-	cmp	r0, r1				@ check for Cortex-A7
+-
+-	ldr	r1, =MIDR_CORTEX_A15_R0P0 & MIDR_PRIMARY_PART_MASK
+-	cmpne	r0, r1				@ check for Cortex-A15
+-
+-	movne	r1, #GIC_CPU_OFFSET_A9		@ GIC CPU offset for A9
+-	moveq	r1, #GIC_CPU_OFFSET_A15		@ GIC CPU offset for A15/A7
+-	add	r3, r2, r1			@ r3 = GIC CPU i/f addr
+-
+-	mov	r1, #1				@ set GICC_CTLR[enable]
++	mov	r1, #3				@ Enable both groups
+ 	str	r1, [r3, #GICC_CTLR]		@ and clear all other bits
+ 	mov	r1, #0xff
+ 	str	r1, [r3, #GICC_PMR]		@ set priority mask register
+ 
++	mrc	p15, 0, r0, c1, c1, 2
+ 	movw	r1, #0x3fff
+-	movt	r1, #0x0006
+-	mcr	p15, 0, r1, c1, c1, 2		@ NSACR = all copros to non-sec
++	movt	r1, #0x0004
++	orr	r0, r0, r1
++	mcr	p15, 0, r0, c1, c1, 2		@ NSACR = all copros to non-sec
+ 
+ /* The CNTFRQ register of the generic timer needs to be
+  * programmed in secure state. Some primary bootloaders / firmware
+@@ -157,21 +170,9 @@ ENTRY(_nonsec_init)
+ 
+ 	adr	r1, _monitor_vectors
+ 	mcr	p15, 0, r1, c12, c0, 1		@ set MVBAR to secure vectors
+-
+-	mrc	p15, 0, ip, c12, c0, 0		@ save secure copy of VBAR
+-
+ 	isb
+-	smc	#0				@ call into MONITOR mode
+-
+-	mcr	p15, 0, ip, c12, c0, 0		@ write non-secure copy of VBAR
+-
+-	mov	r1, #1
+-	str	r1, [r3, #GICC_CTLR]		@ enable non-secure CPU i/f
+-	add	r2, r2, #GIC_DIST_OFFSET
+-	str	r1, [r2, #GICD_CTLR]		@ allow private interrupts
+ 
+ 	mov	r0, r3				@ return GICC address
+-
+ 	bx	lr
+ ENDPROC(_nonsec_init)
+ 
+@@ -183,18 +184,10 @@ ENTRY(smp_waitloop)
+ 	ldr	r1, [r1]
+ 	cmp	r0, r1			@ make sure we dont execute this code
+ 	beq	smp_waitloop		@ again (due to a spurious wakeup)
+-	mov	pc, r1
++	mov	r0, r1
++	b	_do_nonsec_entry
+ ENDPROC(smp_waitloop)
+ .weak smp_waitloop
+ #endif
+ 
+-ENTRY(_switch_to_hyp)
+-	mov	r0, lr
+-	mov	r1, sp				@ save SVC copy of LR and SP
+-	isb
+-	hvc #0			 @ for older asm: .byte 0x70, 0x00, 0x40, 0xe1
+-	mov	sp, r1
+-	mov	lr, r0				@ restore SVC copy of LR and SP
+-
+-	bx	lr
+-ENDPROC(_switch_to_hyp)
++	.popsection
+diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
+index 2cd604f..6500030 100644
+--- a/arch/arm/cpu/armv7/virt-v7.c
++++ b/arch/arm/cpu/armv7/virt-v7.c
+@@ -13,17 +13,10 @@
+ #include <asm/armv7.h>
+ #include <asm/gic.h>
+ #include <asm/io.h>
++#include <asm/secure.h>
+ 
+ unsigned long gic_dist_addr;
+ 
+-static unsigned int read_cpsr(void)
+-{
+-	unsigned int reg;
+-
+-	asm volatile ("mrs %0, cpsr\n" : "=r" (reg));
+-	return reg;
+-}
+-
+ static unsigned int read_id_pfr1(void)
+ {
+ 	unsigned int reg;
+@@ -72,6 +65,18 @@ static unsigned long get_gicd_base_address(void)
+ #endif
+ }
+ 
++static void relocate_secure_section(void)
++{
++#ifdef CONFIG_ARMV7_SECURE_BASE
++	size_t sz = __secure_end - __secure_start;
++
++	memcpy((void *)CONFIG_ARMV7_SECURE_BASE, __secure_start, sz);
++	flush_dcache_range(CONFIG_ARMV7_SECURE_BASE,
++			   CONFIG_ARMV7_SECURE_BASE + sz + 1);
++	invalidate_icache_all();
++#endif
++}
++
+ static void kick_secondary_cpus_gic(unsigned long gicdaddr)
+ {
+ 	/* kick all CPUs (except this one) by writing to GICD_SGIR */
+@@ -83,35 +88,7 @@ void __weak smp_kick_all_cpus(void)
+ 	kick_secondary_cpus_gic(gic_dist_addr);
+ }
+ 
+-int armv7_switch_hyp(void)
+-{
+-	unsigned int reg;
+-
+-	/* check whether we are in HYP mode already */
+-	if ((read_cpsr() & 0x1f) == 0x1a) {
+-		debug("CPU already in HYP mode\n");
+-		return 0;
+-	}
+-
+-	/* check whether the CPU supports the virtualization extensions */
+-	reg = read_id_pfr1();
+-	if ((reg & CPUID_ARM_VIRT_MASK) != 1 << CPUID_ARM_VIRT_SHIFT) {
+-		printf("HYP mode: Virtualization extensions not implemented.\n");
+-		return -1;
+-	}
+-
+-	/* call the HYP switching code on this CPU also */
+-	_switch_to_hyp();
+-
+-	if ((read_cpsr() & 0x1F) != 0x1a) {
+-		printf("HYP mode: switch not successful.\n");
+-		return -1;
+-	}
+-
+-	return 0;
+-}
+-
+-int armv7_switch_nonsec(void)
++int armv7_init_nonsec(void)
+ {
+ 	unsigned int reg;
+ 	unsigned itlinesnr, i;
+@@ -147,11 +124,13 @@ int armv7_switch_nonsec(void)
+ 	for (i = 1; i <= itlinesnr; i++)
+ 		writel((unsigned)-1, gic_dist_addr + GICD_IGROUPRn + 4 * i);
+ 
+-	smp_set_core_boot_addr((unsigned long)_smp_pen, -1);
++#ifndef CONFIG_ARMV7_PSCI
++	smp_set_core_boot_addr((unsigned long)secure_ram_addr(_smp_pen), -1);
+ 	smp_kick_all_cpus();
++#endif
+ 
+ 	/* call the non-sec switching code on this CPU also */
+-	_nonsec_init();
+-
++	relocate_secure_section();
++	secure_ram_addr(_nonsec_init)();
+ 	return 0;
+ }
+diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h
+index 395444e..11476dd 100644
+--- a/arch/arm/include/asm/armv7.h
++++ b/arch/arm/include/asm/armv7.h
+@@ -78,13 +78,17 @@ void v7_outer_cache_inval_range(u32 start, u32 end);
+ 
+ #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
+ 
+-int armv7_switch_nonsec(void);
+-int armv7_switch_hyp(void);
++int armv7_init_nonsec(void);
+ 
+ /* defined in assembly file */
+ unsigned int _nonsec_init(void);
++void _do_nonsec_entry(void *target_pc, unsigned long r0,
++		      unsigned long r1, unsigned long r2);
+ void _smp_pen(void);
+-void _switch_to_hyp(void);
++
++extern char __secure_start[];
++extern char __secure_end[];
++
+ #endif /* CONFIG_ARMV7_NONSEC || CONFIG_ARMV7_VIRT */
+ 
+ #endif /* ! __ASSEMBLY__ */
+diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h
+new file mode 100644
+index 0000000..effdb18
+--- /dev/null
++++ b/arch/arm/include/asm/secure.h
+@@ -0,0 +1,26 @@
++#ifndef __ASM_SECURE_H
++#define __ASM_SECURE_H
++
++#include <config.h>
++
++#ifdef CONFIG_ARMV7_SECURE_BASE
++/*
++ * Warning, horror ahead.
++ *
++ * The target code lives in our "secure ram", but u-boot doesn't know
++ * that, and has blindly added reloc_off to every relocation
++ * entry. Gahh. Do the opposite conversion. This hack also prevents
++ * GCC from generating code veeners, which u-boot doesn't relocate at
++ * all...
++ */
++#define secure_ram_addr(_fn) ({						\
++			DECLARE_GLOBAL_DATA_PTR;			\
++			void *__fn = _fn;				\
++			typeof(_fn) *__tmp = (__fn - gd->reloc_off);	\
++			__tmp;						\
++		})
++#else
++#define secure_ram_addr(_fn)	(_fn)
++#endif
++
++#endif
+diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
+index 10634a4..61aa14e 100644
+--- a/arch/arm/lib/bootm.c
++++ b/arch/arm/lib/bootm.c
+@@ -20,6 +20,7 @@
+ #include <libfdt.h>
+ #include <fdt_support.h>
+ #include <asm/bootm.h>
++#include <asm/secure.h>
+ #include <linux/compiler.h>
+ 
+ #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
+@@ -184,27 +185,17 @@ static void setup_end_tag(bd_t *bd)
+ 
+ __weak void setup_board_tags(struct tag **in_params) {}
+ 
++#ifdef CONFIG_ARM64
+ static void do_nonsec_virt_switch(void)
+ {
+-#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
+-	if (armv7_switch_nonsec() == 0)
+-#ifdef CONFIG_ARMV7_VIRT
+-		if (armv7_switch_hyp() == 0)
+-			debug("entered HYP mode\n");
+-#else
+-		debug("entered non-secure state\n");
+-#endif
+-#endif
+-
+-#ifdef CONFIG_ARM64
+ 	smp_kick_all_cpus();
+ 	flush_dcache_all();	/* flush cache before swtiching to EL2 */
+ 	armv8_switch_to_el2();
+ #ifdef CONFIG_ARMV8_SWITCH_TO_EL1
+ 	armv8_switch_to_el1();
+ #endif
+-#endif
+ }
++#endif
+ 
+ /* Subcommand: PREP */
+ static void boot_prep_linux(bootm_headers_t *images)
+@@ -287,8 +278,13 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
+ 		r2 = gd->bd->bi_boot_params;
+ 
+ 	if (!fake) {
+-		do_nonsec_virt_switch();
++#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
++		armv7_init_nonsec();
++		secure_ram_addr(_do_nonsec_entry)(kernel_entry,
++						  0, machid, r2);
++#else
+ 		kernel_entry(0, machid, r2);
++#endif
+ 	}
+ #endif
+ }
+From 8ea1554da4a6e556d3213a77cf59daa1c154bdb5 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:13 +0000
+Subject: [PATCH] ARM: HYP/non-sec: add generic ARMv7 PSCI code
+
+Implement core support for PSCI. As this is generic code, it doesn't
+implement anything really useful (all the functions are returning
+Not Implemented).
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/cpu/armv7/Makefile |   4 ++
+ arch/arm/cpu/armv7/psci.S   | 105 ++++++++++++++++++++++++++++++++++++++++++++
+ arch/arm/include/asm/psci.h |  35 +++++++++++++++
+ 3 files changed, 144 insertions(+)
+ create mode 100644 arch/arm/cpu/armv7/psci.S
+ create mode 100644 arch/arm/include/asm/psci.h
+
+diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
+index 6f17771..0cf5c45 100644
+--- a/arch/arm/cpu/armv7/Makefile
++++ b/arch/arm/cpu/armv7/Makefile
+@@ -24,6 +24,10 @@ obj-y	+= nonsec_virt.o
+ obj-y	+= virt-v7.o
+ endif
+ 
++ifneq ($(CONFIG_ARMV7_PSCI),)
++obj-y	+= psci.o
++endif
++
+ obj-$(CONFIG_KONA) += kona-common/
+ obj-$(CONFIG_OMAP_COMMON) += omap-common/
+ obj-$(CONFIG_TEGRA) += tegra-common/
+diff --git a/arch/arm/cpu/armv7/psci.S b/arch/arm/cpu/armv7/psci.S
+new file mode 100644
+index 0000000..a9341e0
+--- /dev/null
++++ b/arch/arm/cpu/armv7/psci.S
+@@ -0,0 +1,105 @@
++/*
++ * Copyright (C) 2013 - ARM Ltd
++ * Author: Marc Zyngier <marc.zyngier@arm.com>
++ *
++ * This program is free software; you can redistribute 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 that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <config.h>
++#include <linux/linkage.h>
++#include <asm/psci.h>
++
++	.pushsection ._secure.text, "ax"
++
++	.arch_extension	sec
++
++	.align	5
++	.globl _psci_vectors
++_psci_vectors:
++	b	default_psci_vector	@ reset
++	b	default_psci_vector	@ undef
++	b	_smc_psci		@ smc
++	b	default_psci_vector	@ pabort
++	b	default_psci_vector	@ dabort
++	b	default_psci_vector	@ hyp
++	b	default_psci_vector	@ irq
++	b	psci_fiq_enter		@ fiq
++
++ENTRY(psci_fiq_enter)
++	movs	pc, lr
++ENDPROC(psci_fiq_enter)
++.weak psci_fiq_enter
++
++ENTRY(default_psci_vector)
++	movs	pc, lr
++ENDPROC(default_psci_vector)
++.weak default_psci_vector
++
++ENTRY(psci_cpu_suspend)
++ENTRY(psci_cpu_off)
++ENTRY(psci_cpu_on)
++ENTRY(psci_migrate)
++	mov	r0, #ARM_PSCI_RET_NI	@ Return -1 (Not Implemented)
++	mov	pc, lr
++ENDPROC(psci_migrate)
++ENDPROC(psci_cpu_on)
++ENDPROC(psci_cpu_off)
++ENDPROC(psci_cpu_suspend)
++.weak psci_cpu_suspend
++.weak psci_cpu_off
++.weak psci_cpu_on
++.weak psci_migrate
++
++_psci_table:
++	.word	ARM_PSCI_FN_CPU_SUSPEND
++	.word	psci_cpu_suspend
++	.word	ARM_PSCI_FN_CPU_OFF
++	.word	psci_cpu_off
++	.word	ARM_PSCI_FN_CPU_ON
++	.word	psci_cpu_on
++	.word	ARM_PSCI_FN_MIGRATE
++	.word	psci_migrate
++	.word	0
++	.word	0
++
++_smc_psci:
++	push	{r3-r7,lr}
++
++	@ Switch to secure
++	mrc	p15, 0, r7, c1, c1, 0
++	bic	r4, r7, #1
++	mcr	p15, 0, r4, c1, c1, 0
++	isb
++
++	adr	r4, _psci_table
++1:	ldr	r5, [r4]	@ Load PSCI function ID
++	ldr	r6, [r4, #4]	@ Load target PC
++	cmp	r5, #0		@ If reach the end, bail out
++	mvneq	r0, #0		@ Return -1 (Not Implemented)
++	beq	2f
++	cmp	r0, r5		@ If not matching, try next entry
++	addne	r4, r4, #8
++	bne	1b
++	cmp	r6, #0		@ Not implemented
++	moveq	r0, #ARM_PSCI_RET_NI
++	beq	2f
++
++	blx	r6		@ Execute PSCI function
++
++	@ Switch back to non-secure
++	mcr	p15, 0, r7, c1, c1, 0
++
++2:	pop	{r3-r7, lr}
++	movs	pc, lr		@ Return to the kernel
++
++	.popsection
+diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
+new file mode 100644
+index 0000000..704b4b0
+--- /dev/null
++++ b/arch/arm/include/asm/psci.h
+@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2013 - ARM Ltd
++ * Author: Marc Zyngier <marc.zyngier@arm.com>
++ *
++ * This program is free software; you can redistribute 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 that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef __ARM_PSCI_H__
++#define __ARM_PSCI_H__
++
++/* PSCI interface */
++#define ARM_PSCI_FN_BASE		0x95c1ba5e
++#define ARM_PSCI_FN(n)			(ARM_PSCI_FN_BASE + (n))
++
++#define ARM_PSCI_FN_CPU_SUSPEND		ARM_PSCI_FN(0)
++#define ARM_PSCI_FN_CPU_OFF		ARM_PSCI_FN(1)
++#define ARM_PSCI_FN_CPU_ON		ARM_PSCI_FN(2)
++#define ARM_PSCI_FN_MIGRATE		ARM_PSCI_FN(3)
++
++#define ARM_PSCI_RET_SUCCESS		0
++#define ARM_PSCI_RET_NI			(-1)
++#define ARM_PSCI_RET_INVAL		(-2)
++#define ARM_PSCI_RET_DENIED		(-3)
++
++#endif /* __ARM_PSCI_H__ */
+From 0ca6171c385fed00125b320592ee94922f44f13a Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:14 +0000
+Subject: [PATCH] ARM: HYP/non-sec: add the option for a second-stage monitor
+
+Allow the switch to a second stage secure monitor just before
+switching to non-secure.
+
+This allows a resident piece of firmware to be active once the
+kernel has been entered (the u-boot monitor is dead anyway,
+its pages being reused).
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/cpu/armv7/nonsec_virt.S | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
+index 2a43e3c..745670e 100644
+--- a/arch/arm/cpu/armv7/nonsec_virt.S
++++ b/arch/arm/cpu/armv7/nonsec_virt.S
+@@ -44,10 +44,19 @@ _monitor_vectors:
+  * ip: target PC
+  */
+ _secure_monitor:
++#ifdef CONFIG_ARMV7_PSCI
++	ldr	r5, =_psci_vectors		@ Switch to the next monitor
++	mcr	p15, 0, r5, c12, c0, 1
++	isb
++
++	@ Obtain a secure stack, and configure the PSCI backend
++	bl	psci_arch_init
++#endif
++
+ 	mrc	p15, 0, r5, c1, c1, 0		@ read SCR
+-	bic	r5, r5, #0x4e			@ clear IRQ, FIQ, EA, nET bits
++	bic	r5, r5, #0x4a			@ clear IRQ, EA, nET bits
+ 	orr	r5, r5, #0x31			@ enable NS, AW, FW bits
+-
++						@ FIQ preserved for secure mode
+ 	mov	r6, #SVC_MODE			@ default mode is SVC
+ 	is_cpu_virt_capable r4
+ #ifdef CONFIG_ARMV7_VIRT
+From 9aa373162eb2cc0055a6e4ecd46977c911de1124 Mon Sep 17 00:00:00 2001
+From: Ma Haijun <mahaijuns@gmail.com>
+Date: Sat, 15 Feb 2014 12:51:10 +0000
+Subject: [PATCH] ARM: convert arch_fixup_memory_node to a generic FDT fixup
+ function
+
+Some architecture needs extra device tree setup. Instead of adding
+yet another hook, convert arch_fixup_memory_node to be a generic
+FDT fixup function.
+
+[maz: collapsed 3 patches into one, rewrote commit message]
+
+Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/lib/bootm-fdt.c | 2 +-
+ arch/arm/lib/bootm.c     | 2 +-
+ common/image-fdt.c       | 7 +++++--
+ include/common.h         | 6 +++---
+ 4 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
+index e40691d..8394e15 100644
+--- a/arch/arm/lib/bootm-fdt.c
++++ b/arch/arm/lib/bootm-fdt.c
+@@ -20,7 +20,7 @@
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+-int arch_fixup_memory_node(void *blob)
++int arch_fixup_fdt(void *blob)
+ {
+ 	bd_t *bd = gd->bd;
+ 	int bank;
+diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
+index 61aa14e..4cff6b0 100644
+--- a/arch/arm/lib/bootm.c
++++ b/arch/arm/lib/bootm.c
+@@ -357,7 +357,7 @@ void boot_prep_vxworks(bootm_headers_t *images)
+ 	if (images->ft_addr) {
+ 		off = fdt_path_offset(images->ft_addr, "/memory");
+ 		if (off < 0) {
+-			if (arch_fixup_memory_node(images->ft_addr))
++			if (arch_fixup_fdt(images->ft_addr))
+ 				puts("## WARNING: fixup memory failed!\n");
+ 		}
+ 	}
+diff --git a/common/image-fdt.c b/common/image-fdt.c
+index a54a919..6f074de 100644
+--- a/common/image-fdt.c
++++ b/common/image-fdt.c
+@@ -445,7 +445,7 @@ __weak int ft_verify_fdt(void *fdt)
+ 	return 1;
+ }
+ 
+-__weak int arch_fixup_memory_node(void *blob)
++__weak int arch_fixup_fdt(void *blob)
+ {
+ 	return 0;
+ }
+@@ -462,7 +462,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
+ 		puts(" - must RESET the board to recover.\n");
+ 		return -1;
+ 	}
+-	arch_fixup_memory_node(blob);
++	if (arch_fixup_fdt(blob) < 0) {
++		puts("ERROR: arch specific fdt fixup failed");
++		return -1;
++	}
+ 	if (IMAGE_OF_BOARD_SETUP)
+ 		ft_board_setup(blob, gd->bd);
+ 	fdt_fixup_ethernet(blob);
+diff --git a/include/common.h b/include/common.h
+index cbd3c9e..700b015 100644
+--- a/include/common.h
++++ b/include/common.h
+@@ -326,14 +326,14 @@ int arch_early_init_r(void);
+ void board_show_dram(ulong size);
+ 
+ /**
+- * arch_fixup_memory_node() - Write arch-specific memory information to fdt
++ * arch_fixup_fdt() - Write arch-specific information to fdt
+  *
+- * Defined in arch/$(ARCH)/lib/bootm.c
++ * Defined in arch/$(ARCH)/lib/bootm-fdt.c
+  *
+  * @blob:	FDT blob to write to
+  * @return 0 if ok, or -ve FDT_ERR_... on failure
+  */
+-int arch_fixup_memory_node(void *blob);
++int arch_fixup_fdt(void *blob);
+ 
+ /* common/flash.c */
+ void flash_perror (int);
+From ccdf689da800c9f1c5226146e936b071c7ec8800 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:15 +0000
+Subject: [PATCH] ARM: HYP/non-sec/PSCI: emit DT nodes
+
+Generate the PSCI node in the device tree.
+
+Also add a reserve section for the "secure" code that lives in
+in normal RAM, so that the kernel knows it'd better not trip on
+it.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/cpu/armv7/Makefile  |   1 +
+ arch/arm/cpu/armv7/virt-dt.c | 100 +++++++++++++++++++++++++++++++++++++++++++
+ arch/arm/include/asm/armv7.h |   1 +
+ arch/arm/lib/bootm-fdt.c     |  11 ++++-
+ 4 files changed, 111 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm/cpu/armv7/virt-dt.c
+
+diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
+index 0cf5c45..93a5a69 100644
+--- a/arch/arm/cpu/armv7/Makefile
++++ b/arch/arm/cpu/armv7/Makefile
+@@ -22,6 +22,7 @@ endif
+ ifneq ($(CONFIG_ARMV7_NONSEC)$(CONFIG_ARMV7_VIRT),)
+ obj-y	+= nonsec_virt.o
+ obj-y	+= virt-v7.o
++obj-y	+= virt-dt.o
+ endif
+ 
+ ifneq ($(CONFIG_ARMV7_PSCI),)
+diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c
+new file mode 100644
+index 0000000..0b0d6a7
+--- /dev/null
++++ b/arch/arm/cpu/armv7/virt-dt.c
+@@ -0,0 +1,100 @@
++/*
++ * Copyright (C) 2013 - ARM Ltd
++ * Author: Marc Zyngier <marc.zyngier@arm.com>
++ *
++ * This program is free software; you can redistribute 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 that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <common.h>
++#include <stdio_dev.h>
++#include <linux/ctype.h>
++#include <linux/types.h>
++#include <asm/global_data.h>
++#include <libfdt.h>
++#include <fdt_support.h>
++#include <asm/armv7.h>
++#include <asm/psci.h>
++
++static int fdt_psci(void *fdt)
++{
++#ifdef CONFIG_ARMV7_PSCI
++	int nodeoff;
++	int tmp;
++
++	nodeoff = fdt_path_offset(fdt, "/cpus");
++	if (nodeoff < 0) {
++		printf("couldn't find /cpus\n");
++		return nodeoff;
++	}
++
++	/* add 'enable-method = "psci"' to each cpu node */
++	for (tmp = fdt_first_subnode(fdt, nodeoff);
++	     tmp >= 0;
++	     tmp = fdt_next_subnode(fdt, tmp)) {
++		const struct fdt_property *prop;
++		int len;
++
++		prop = fdt_get_property(fdt, tmp, "device_type", &len);
++		if (!prop)
++			continue;
++		if (len < 4)
++			continue;
++		if (strcmp(prop->data, "cpu"))
++			continue;
++
++		fdt_setprop_string(fdt, tmp, "enable-method", "psci");
++	}
++
++	nodeoff = fdt_path_offset(fdt, "/psci");
++	if (nodeoff < 0) {
++		nodeoff = fdt_path_offset(fdt, "/");
++		if (nodeoff < 0)
++			return nodeoff;
++
++		nodeoff = fdt_add_subnode(fdt, nodeoff, "psci");
++		if (nodeoff < 0)
++			return nodeoff;
++	}
++
++	tmp = fdt_setprop_string(fdt, nodeoff, "compatible", "arm,psci");
++	if (tmp)
++		return tmp;
++	tmp = fdt_setprop_string(fdt, nodeoff, "method", "smc");
++	if (tmp)
++		return tmp;
++	tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_suspend", ARM_PSCI_FN_CPU_SUSPEND);
++	if (tmp)
++		return tmp;
++	tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_off", ARM_PSCI_FN_CPU_OFF);
++	if (tmp)
++		return tmp;
++	tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_on", ARM_PSCI_FN_CPU_ON);
++	if (tmp)
++		return tmp;
++	tmp = fdt_setprop_u32(fdt, nodeoff, "migrate", ARM_PSCI_FN_MIGRATE);
++	if (tmp)
++		return tmp;
++#endif
++	return 0;
++}
++
++int armv7_update_dt(void *fdt)
++{
++#ifndef CONFIG_ARMV7_SECURE_BASE
++	/* secure code lives in RAM, keep it alive */
++	fdt_add_mem_rsv(fdt, (unsigned long)__secure_start,
++			__secure_end - __secure_start);
++#endif
++
++	return fdt_psci(fdt);
++}
+diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h
+index 11476dd..323f282 100644
+--- a/arch/arm/include/asm/armv7.h
++++ b/arch/arm/include/asm/armv7.h
+@@ -79,6 +79,7 @@ void v7_outer_cache_inval_range(u32 start, u32 end);
+ #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
+ 
+ int armv7_init_nonsec(void);
++int armv7_update_dt(void *fdt);
+ 
+ /* defined in assembly file */
+ unsigned int _nonsec_init(void);
+diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
+index 8394e15..ccb76c7 100644
+--- a/arch/arm/lib/bootm-fdt.c
++++ b/arch/arm/lib/bootm-fdt.c
+@@ -17,13 +17,14 @@
+ 
+ #include <common.h>
+ #include <fdt_support.h>
++#include <asm/armv7.h>
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+ int arch_fixup_fdt(void *blob)
+ {
+ 	bd_t *bd = gd->bd;
+-	int bank;
++	int bank, ret;
+ 	u64 start[CONFIG_NR_DRAM_BANKS];
+ 	u64 size[CONFIG_NR_DRAM_BANKS];
+ 
+@@ -32,5 +33,11 @@ int arch_fixup_fdt(void *blob)
+ 		size[bank] = bd->bi_dram[bank].size;
+ 	}
+ 
+-	return fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
++	ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
++	if (ret)
++		return ret;
++
++#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
++	return armv7_update_dt(blob);
++#endif
+ }
+From d5ee64675e6481e4f29e48e494ea132cd74786c8 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:17 +0000
+Subject: [PATCH] sunxi: HYP/non-sec: add sun7i PSCI backend
+
+So far, only supporting the CPU_ON method.
+Other functions can be added later.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm/cpu/armv7/sunxi/Makefile |   3 +
+ arch/arm/cpu/armv7/sunxi/psci.S   | 162 ++++++++++++++++++++++++++++++++++++++
+ include/configs/sun7i.h           |   6 ++
+ 3 files changed, 171 insertions(+)
+ create mode 100644 arch/arm/cpu/armv7/sunxi/psci.S
+
+diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile
+index 19e4b17..0df6772 100644
+--- a/arch/arm/cpu/armv7/sunxi/Makefile
++++ b/arch/arm/cpu/armv7/sunxi/Makefile
+@@ -32,6 +32,9 @@ obj-y	+= cpu_info.o
+ ifdef CONFIG_CMD_WATCHDOG
+ obj-$(CONFIG_CMD_WATCHDOG)	+= cmd_watchdog.o
+ endif
++ifdef CONFIG_ARMV7_PSCI
++obj-y	+= psci.o
++endif
+ endif
+ 
+ ifdef CONFIG_SPL_BUILD
+diff --git a/arch/arm/cpu/armv7/sunxi/psci.S b/arch/arm/cpu/armv7/sunxi/psci.S
+new file mode 100644
+index 0000000..0084c81
+--- /dev/null
++++ b/arch/arm/cpu/armv7/sunxi/psci.S
+@@ -0,0 +1,162 @@
++/*
++ * Copyright (C) 2013 - ARM Ltd
++ * Author: Marc Zyngier <marc.zyngier@arm.com>
++ *
++ * Based on code by Carl van Schaik <carl@ok-labs.com>.
++ *
++ * This program is free software; you can redistribute 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 that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <config.h>
++#include <asm/psci.h>
++#include <asm/arch/cpu.h>
++
++/*
++ * Memory layout:
++ *
++ * SECURE_RAM to text_end :
++ *	._secure_text section
++ * text_end to ALIGN_PAGE(text_end):
++ *	nothing
++ * ALIGN_PAGE(text_end) to ALIGN_PAGE(text_end) + 0x1000)
++ *	1kB of stack per CPU (4 CPUs max).
++ */
++
++	.pushsection ._secure.text, "ax"
++
++	.arch_extension sec
++
++#define	ONE_MS			(CONFIG_SYS_CLK_FREQ / 1000)
++#define	TEN_MS			(10 * ONE_MS)
++
++.macro	timer_wait	reg, ticks
++	@ Program CNTP_TVAL
++	movw	\reg, #(\ticks & 0xffff)
++	movt	\reg, #(\ticks >> 16)
++	mcr	p15, 0, \reg, c14, c2, 0
++	isb
++	@ Enable physical timer, mask interrupt
++	mov	\reg, #3
++	mcr	p15, 0, \reg, c14, c2, 1
++	@ Poll physical timer until ISTATUS is on
++1:	isb
++	mrc	p15, 0, \reg, c14, c2, 1
++	ands	\reg, \reg, #4
++	bne	1b
++	@ Disable timer
++	mov	\reg, #0
++	mcr	p15, 0, \reg, c14, c2, 1
++	isb
++.endm
++
++.globl	psci_arch_init
++psci_arch_init:
++	mrc	p15, 0, r5, c1, c1, 0	@ Read SCR
++	bic	r5, r5, #1		@ Secure mode
++	mcr	p15, 0, r5, c1, c1, 0	@ Write SCR
++	isb
++
++	mrc	p15, 0, r4, c0, c0, 5	@ MPIDR
++	and	r4, r4, #3		@ cpu number in cluster
++	mov	r5, #400		@ 1kB of stack per CPU
++	mul	r4, r4, r5
++
++	adr	r5, text_end		@ end of text
++	add	r5, r5, #0x2000		@ Skip two pages
++	lsr	r5, r5, #12		@ Align to start of page
++	lsl	r5, r5, #12
++	sub	sp, r5, r4		@ here's our stack!
++
++	bx	lr
++
++	@ r1 = target CPU
++	@ r2 = target PC
++.globl	psci_cpu_on
++psci_cpu_on:
++	adr	r0, _target_pc
++	str	r2, [r0]
++	dsb
++
++	movw	r0, #(SUNXI_CPUCFG_BASE & 0xffff)
++	movt	r0, #(SUNXI_CPUCFG_BASE >> 16)
++
++	@ CPU mask
++	and	r1, r1, #3	@ only care about first cluster
++	mov	r4, #1
++	lsl	r4, r4, r1
++
++	adr	r6, _sunxi_cpu_entry
++	str	r6, [r0, #0x1a4] @ PRIVATE_REG (boot vector)
++
++	@ Assert reset on target CPU
++	mov	r6, #0
++	lsl	r5, r1, #6	@ 64 bytes per CPU
++	add	r5, r5, #0x40	@ Offset from base
++	add	r5, r5, r0	@ CPU control block
++	str	r6, [r5]	@ Reset CPU
++
++	@ l1 invalidate
++	ldr	r6, [r0, #0x184]
++	bic	r6, r6, r4
++	str	r6, [r0, #0x184]
++
++	@ Lock CPU
++	ldr	r6, [r0, #0x1e4]
++	bic	r6, r6, r4
++	str	r6, [r0, #0x1e4]
++
++	@ Release power clamp
++	movw	r6, #0x1ff
++	movt	r6, #0
++1:	lsrs	r6, r6, #1
++	str	r6, [r0, #0x1b0]
++	bne	1b
++
++	timer_wait r1, TEN_MS
++
++	@ Clear power gating
++	ldr	r6, [r0, #0x1b4]
++	bic	r6, r6, #1
++	str	r6, [r0, #0x1b4]
++
++	@ Deassert reset on target CPU
++	mov	r6, #3
++	str	r6, [r5]
++
++	@ Unlock CPU
++	ldr	r6, [r0, #0x1e4]
++	orr	r6, r6, r4
++	str	r6, [r0, #0x1e4]
++
++	mov	r0, #ARM_PSCI_RET_SUCCESS	@ Return PSCI_RET_SUCCESS
++	mov	pc, lr
++
++_target_pc:
++	.word	0
++
++_sunxi_cpu_entry:
++	@ Set SMP bit
++	mrc	p15, 0, r0, c1, c0, 1
++	orr	r0, r0, #0x40
++	mcr	p15, 0, r0, c1, c0, 1
++	isb
++
++	bl	_nonsec_init
++	bl	psci_arch_init
++
++	adr	r0, _target_pc
++	ldr	r0, [r0]
++	b	_do_nonsec_entry
++
++text_end:
++	.popsection
+diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
+index 11cc9ea..bae7b37 100644
+--- a/include/configs/sun7i.h
++++ b/include/configs/sun7i.h
+@@ -22,6 +22,12 @@
+ #define CONFIG_BOARD_POSTCLK_INIT 1
+ #endif
+ 
++#define CONFIG_ARMV7_VIRT		1
++#define CONFIG_ARMV7_NONSEC		1
++#define CONFIG_ARMV7_PSCI		1
++#define CONFIG_ARMV7_PSCI_NR_CPUS	2
++#define CONFIG_ARMV7_SECURE_BASE	SUNXI_SRAM_B_BASE
++
+ /*
+  * Include common sunxi configuration where most the settings are
+  */
+From a74a847c3727209a45c30a80c01b930938941dd4 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Sat, 7 Dec 2013 11:19:18 +0000
+Subject: [PATCH] sunxi: HYP/non-sec: configure CNTFRQ on all CPUs
+
+CNTFRQ needs to be properly configured on all CPUs. Otherwise,
+virtual machines hoping to find valuable information on secondary
+CPUs will be disapointed...
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ include/configs/sun7i.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
+index bae7b37..58a254b 100644
+--- a/include/configs/sun7i.h
++++ b/include/configs/sun7i.h
+@@ -27,6 +27,7 @@
+ #define CONFIG_ARMV7_PSCI		1
+ #define CONFIG_ARMV7_PSCI_NR_CPUS	2
+ #define CONFIG_ARMV7_SECURE_BASE	SUNXI_SRAM_B_BASE
++#define CONFIG_SYS_CLK_FREQ		24000000
+ 
+ /*
+  * Include common sunxi configuration where most the settings are
diff --git a/trunk/package/boot/uboot-sunxi/patches/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch b/trunk/package/boot/uboot-sunxi/patches/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch
new file mode 100644
index 00000000..6bc8c939
--- /dev/null
+++ b/trunk/package/boot/uboot-sunxi/patches/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch
@@ -0,0 +1,20 @@
+diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
+index e7ff952..f58c963 100644
+--- a/board/sunxi/gmac.c
++++ b/board/sunxi/gmac.c
+@@ -24,6 +24,15 @@ int sunxi_gmac_initialize(bd_t *bis)
+ 		CCM_GMAC_CTRL_GPIT_MII);
+ #endif
+ 
++	/*
++	 * HdG: this is necessary to get GMAC to work reliable on the
++	 * Bananapi. We don't know what these undocumented bits do, so this
++	 * is a Bananapi specific hack for now.
++	 */
++#ifdef CONFIG_BANANAPI
++	setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
++#endif
++
+ 	/* Configure pin mux settings for GMAC */
+ 	for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
+ #ifdef CONFIG_RGMII
diff --git a/trunk/package/boot/uboot-sunxi/uEnv.txt b/trunk/package/boot/uboot-sunxi/uEnv.txt
new file mode 100644
index 00000000..e4fc0e19
--- /dev/null
+++ b/trunk/package/boot/uboot-sunxi/uEnv.txt
@@ -0,0 +1,5 @@
+fdt_high=ffffffff
+loadkernel=fatload mmc 0 0x46000000 uImage
+loaddtb=fatload mmc 0 0x49000000 dtb
+bootargs=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+uenvcmd=run loadkernel && run loaddtb && bootm 0x46000000 - 0x49000000
diff --git a/trunk/package/boot/uboot-xburst/Makefile b/trunk/package/boot/uboot-xburst/Makefile
new file mode 100644
index 00000000..066fc244
--- /dev/null
+++ b/trunk/package/boot/uboot-xburst/Makefile
@@ -0,0 +1,88 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=u-boot
+PKG_VERSION:=2012.10-rc2-libre
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://mirror2.openwrt.org/sources \
+	ftp://ftp.denx.de/pub/u-boot
+PKG_MD5SUM:=ffd6e3795d221bc43c70bed97c919f70
+PKG_TARGETS:=bin
+
+PKG_LICENSE:=GPL-2.0 GPL-2.0+
+PKG_LICENSE_FILES:=Licenses/README
+
+include $(INCLUDE_DIR)/package.mk
+
+define uboot/Default
+  TITLE:=
+  CONFIG:=
+  IMAGE:=
+endef
+
+define uboot/qi_lb60
+  TITLE:=U-boot for the qi_lb60 board
+endef
+
+UBOOTS:=qi_lb60
+
+define Package/uboot/template
+define Package/uboot-xburst-$(1)
+  SECTION:=boot
+  CATEGORY:=Boot Loaders
+  DEPENDS:=@TARGET_xburst
+  TITLE:=$(2)
+  URL:=http://www.denx.de/wiki/UBoot/WebHome
+  VARIANT:=$(1)
+endef
+endef
+
+define BuildUbootPackage
+	$(eval $(uboot/Default))
+	$(eval $(uboot/$(1)))
+	$(call Package/uboot/template,$(1),$(TITLE))
+endef
+
+
+ifdef BUILD_VARIANT
+$(eval $(call uboot/$(BUILD_VARIANT)))
+UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
+UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),librecmc-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin)
+endif
+
+define Build/Configure
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(UBOOT_CONFIG)_config
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE=$(TARGET_CROSS)
+endef
+
+define Package/uboot/install/template
+define Package/uboot-xburst-$(1)/install
+	$(CP) $(PKG_BUILD_DIR)/u-boot-xburst.bin $(BIN_DIR)/$(2)
+	rmdir $$(1)
+endef
+endef
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call Package/uboot/install/template,$(u),librecmc-$(BOARD)-$(u)-u-boot.bin)) \
+)
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call BuildUbootPackage,$(u))) \
+	$(eval $(call BuildPackage,uboot-xburst-$(u))) \
+)
diff --git a/trunk/package/boot/uboot-xburst/patches/0001-qi_lb60-add-nand-spl-support.patch b/trunk/package/boot/uboot-xburst/patches/0001-qi_lb60-add-nand-spl-support.patch
new file mode 100644
index 00000000..e7702435
--- /dev/null
+++ b/trunk/package/boot/uboot-xburst/patches/0001-qi_lb60-add-nand-spl-support.patch
@@ -0,0 +1,894 @@
+From 0329cf7965956a5a7044827e0ce88ae8d5150e54 Mon Sep 17 00:00:00 2001
+From: Xiangfu <xiangfu@openmobilefree.net>
+Date: Fri, 12 Oct 2012 09:46:58 +0800
+Subject: [PATCH 1/6] qi_lb60: add nand spl support
+
+  The JZ4740 CPU can load 8KB from two different addresses:
+   1. the normal area up to 8KB starting from NAND flash address 0x00000000
+   2. the backup area up to 8KB starting from NAND flash address 0x00002000
+
+Signed-off-by: Xiangfu <xiangfu@openmobilefree.net>
+---
+ Makefile                          |   12 +++
+ arch/mips/cpu/xburst/Makefile     |    7 +-
+ arch/mips/cpu/xburst/cpu.c        |    4 +
+ arch/mips/cpu/xburst/jz4740.c     |   82 +++++++----------
+ arch/mips/cpu/xburst/spl/Makefile |   47 ++++++++++
+ arch/mips/cpu/xburst/spl/start.S  |   63 +++++++++++++
+ board/qi/qi_lb60/Makefile         |    4 +
+ board/qi/qi_lb60/qi_lb60-spl.c    |   30 +++++++
+ board/qi/qi_lb60/qi_lb60.c        |    8 +-
+ board/qi/qi_lb60/u-boot-spl.lds   |   61 +++++++++++++
+ drivers/mtd/nand/jz4740_nand.c    |   39 ++++++++-
+ include/configs/qi_lb60.h         |  175 ++++++++++++++++++-------------------
+ 12 files changed, 386 insertions(+), 146 deletions(-)
+ create mode 100644 arch/mips/cpu/xburst/spl/Makefile
+ create mode 100644 arch/mips/cpu/xburst/spl/start.S
+ create mode 100644 board/qi/qi_lb60/qi_lb60-spl.c
+ create mode 100644 board/qi/qi_lb60/u-boot-spl.lds
+
+diff --git a/Makefile b/Makefile
+index 34d9075..a22778e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -393,6 +393,10 @@ ALL-y += $(obj)u-boot-nodtb-tegra.bin
+ endif
+ endif
+ 
++ifeq ($(CPU),xburst)
++ALL-y += $(obj)u-boot-xburst.bin
++endif
++
+ all:		$(ALL-y) $(SUBDIR_EXAMPLES)
+ 
+ $(obj)u-boot.dtb:	$(obj)u-boot
+@@ -506,6 +510,14 @@ $(obj)u-boot-nodtb-tegra.bin:	$(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
+ endif
+ endif
+ 
++ifeq ($(CPU),xburst)
++$(obj)u-boot-xburst.bin:	$(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
++	        dd if=$(obj)spl/u-boot-spl.bin of=$(obj)spl/u-boot-pad.bin conv=sync bs=8192 count=1
++		dd if=$(obj)spl/u-boot-spl.bin of=$(obj)spl/u-boot-pad.bin conv=sync,notrunc oflag=append bs=8192 count=1
++	        tr '\0' '\377' < /dev/zero | dd of=$(obj)spl/u-boot-pad.bin conv=sync,notrunc oflag=append bs=16384 count=1
++	        cat $(obj)spl/u-boot-pad.bin u-boot.bin > $@
++endif
++
+ ifeq ($(CONFIG_SANDBOX),y)
+ GEN_UBOOT = \
+ 		cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
+diff --git a/arch/mips/cpu/xburst/Makefile b/arch/mips/cpu/xburst/Makefile
+index b1f2ae4..ec35e55 100644
+--- a/arch/mips/cpu/xburst/Makefile
++++ b/arch/mips/cpu/xburst/Makefile
+@@ -24,9 +24,12 @@ include $(TOPDIR)/config.mk
+ 
+ LIB	= $(obj)lib$(CPU).o
+ 
++COBJS-y	= cpu.o jz_serial.o
++
++ifneq ($(CONFIG_SPL_BUILD),y)
+ START	= start.o
+-SOBJS-y	=
+-COBJS-y	= cpu.o timer.o jz_serial.o
++COBJS-y += timer.o
++endif
+ 
+ COBJS-$(CONFIG_JZ4740) += jz4740.o
+ 
+diff --git a/arch/mips/cpu/xburst/cpu.c b/arch/mips/cpu/xburst/cpu.c
+index ddcbfaa..1432838 100644
+--- a/arch/mips/cpu/xburst/cpu.c
++++ b/arch/mips/cpu/xburst/cpu.c
+@@ -42,6 +42,8 @@
+ 		:			\
+ 		: "i" (op), "R" (*(unsigned char *)(addr)))
+ 
++#ifndef CONFIG_SPL_BUILD
++
+ void __attribute__((weak)) _machine_restart(void)
+ {
+ 	struct jz4740_wdt *wdt = (struct jz4740_wdt *)JZ4740_WDT_BASE;
+@@ -109,6 +111,8 @@ void invalidate_dcache_range(ulong start_addr, ulong stop)
+ 		cache_op(Hit_Invalidate_D, addr);
+ }
+ 
++#endif
++
+ void flush_icache_all(void)
+ {
+ 	u32 addr, t = 0;
+diff --git a/arch/mips/cpu/xburst/jz4740.c b/arch/mips/cpu/xburst/jz4740.c
+index c0b9817..8816aa3 100644
+--- a/arch/mips/cpu/xburst/jz4740.c
++++ b/arch/mips/cpu/xburst/jz4740.c
+@@ -32,31 +32,19 @@ int disable_interrupts(void)
+ 	return 0;
+ }
+ 
+-/*
+- * PLL output clock = EXTAL * NF / (NR * NO)
+- * NF = FD + 2, NR = RD + 2
+- * NO = 1 (if OD = 0), NO = 2 (if OD = 1 or 2), NO = 4 (if OD = 3)
+- */
+ void pll_init(void)
+ {
+ 	struct jz4740_cpm *cpm = (struct jz4740_cpm *)JZ4740_CPM_BASE;
+ 
+-	register unsigned int cfcr, plcr1;
+-	int n2FR[33] = {
+-		0, 0, 1, 2, 3, 0, 4, 0, 5, 0, 0, 0, 6, 0, 0, 0,
+-		7, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
+-		9
+-	};
+-	int div[5] = {1, 3, 3, 3, 3}; /* divisors of I:S:P:L:M */
+-	int nf, pllout2;
++	register unsigned int cfcr, plcr;
++	unsigned int nf, pllout2;
+ 
+ 	cfcr =	CPM_CPCCR_CLKOEN |
+-		CPM_CPCCR_PCS |
+-		(n2FR[div[0]] << CPM_CPCCR_CDIV_BIT) |
+-		(n2FR[div[1]] << CPM_CPCCR_HDIV_BIT) |
+-		(n2FR[div[2]] << CPM_CPCCR_PDIV_BIT) |
+-		(n2FR[div[3]] << CPM_CPCCR_MDIV_BIT) |
+-		(n2FR[div[4]] << CPM_CPCCR_LDIV_BIT);
++		(0 << CPM_CPCCR_CDIV_BIT) |
++		(2 << CPM_CPCCR_HDIV_BIT) |
++		(2 << CPM_CPCCR_PDIV_BIT) |
++		(2 << CPM_CPCCR_MDIV_BIT) |
++		(2 << CPM_CPCCR_LDIV_BIT);
+ 
+ 	pllout2 = (cfcr & CPM_CPCCR_PCS) ?
+ 		CONFIG_SYS_CPU_SPEED : (CONFIG_SYS_CPU_SPEED / 2);
+@@ -65,15 +53,18 @@ void pll_init(void)
+ 	writel(pllout2 / 48000000 - 1, &cpm->uhccdr);
+ 
+ 	nf = CONFIG_SYS_CPU_SPEED * 2 / CONFIG_SYS_EXTAL;
+-	plcr1 = ((nf - 2) << CPM_CPPCR_PLLM_BIT) | /* FD */
++	plcr = ((nf - 2) << CPM_CPPCR_PLLM_BIT) | /* FD */
+ 		(0 << CPM_CPPCR_PLLN_BIT) |	/* RD=0, NR=2 */
+ 		(0 << CPM_CPPCR_PLLOD_BIT) |	/* OD=0, NO=1 */
+-		(0x20 << CPM_CPPCR_PLLST_BIT) |	/* PLL stable time */
++		(0x32 << CPM_CPPCR_PLLST_BIT) |	/* PLL stable time */
+ 		CPM_CPPCR_PLLEN;		/* enable PLL */
+ 
+ 	/* init PLL */
+ 	writel(cfcr, &cpm->cpccr);
+-	writel(plcr1, &cpm->cppcr);
++	writel(plcr, &cpm->cppcr);
++
++	while (!(readl(&cpm->cppcr) & CPM_CPPCR_PLLS))
++		;
+ }
+ 
+ void sdram_init(void)
+@@ -92,26 +83,12 @@ void sdram_init(void)
+ 		2 << EMC_DMCR_TCL_BIT	/* CAS latency is 3 */
+ 	};
+ 
+-	int div[] = {1, 2, 3, 4, 6, 8, 12, 16, 24, 32};
+-
+ 	cpu_clk = CONFIG_SYS_CPU_SPEED;
+-	mem_clk = cpu_clk * div[__cpm_get_cdiv()] / div[__cpm_get_mdiv()];
++	mem_clk = 84000000;
+ 
+ 	writel(0, &emc->bcr);	/* Disable bus release */
+ 	writew(0, &emc->rtcsr);	/* Disable clock for counting */
+ 
+-	/* Fault DMCR value for mode register setting*/
+-#define SDRAM_ROW0	11
+-#define SDRAM_COL0	8
+-#define SDRAM_BANK40	0
+-
+-	dmcr0 = ((SDRAM_ROW0 - 11) << EMC_DMCR_RA_BIT) |
+-		((SDRAM_COL0 - 8) << EMC_DMCR_CA_BIT) |
+-		(SDRAM_BANK40 << EMC_DMCR_BA_BIT) |
+-		(SDRAM_BW16 << EMC_DMCR_BW_BIT) |
+-		EMC_DMCR_EPIN |
+-		cas_latency_dmcr[((SDRAM_CASL == 3) ? 1 : 0)];
+-
+ 	/* Basic DMCR value */
+ 	dmcr = ((SDRAM_ROW - 11) << EMC_DMCR_RA_BIT) |
+ 		((SDRAM_COL - 8) << EMC_DMCR_CA_BIT) |
+@@ -128,31 +105,31 @@ void sdram_init(void)
+ 	if (tmp > 11)
+ 		tmp = 11;
+ 	dmcr |= (tmp - 4) << EMC_DMCR_TRAS_BIT;
+-	tmp = SDRAM_RCD / ns;
+ 
++	tmp = SDRAM_RCD / ns;
+ 	if (tmp > 3)
+ 		tmp = 3;
+ 	dmcr |= tmp << EMC_DMCR_RCD_BIT;
+-	tmp = SDRAM_TPC / ns;
+ 
++	tmp = SDRAM_TPC / ns;
+ 	if (tmp > 7)
+ 		tmp = 7;
+ 	dmcr |= tmp << EMC_DMCR_TPC_BIT;
+-	tmp = SDRAM_TRWL / ns;
+ 
++	tmp = SDRAM_TRWL / ns;
+ 	if (tmp > 3)
+ 		tmp = 3;
+ 	dmcr |= tmp << EMC_DMCR_TRWL_BIT;
+-	tmp = (SDRAM_TRAS + SDRAM_TPC) / ns;
+ 
++	tmp = (SDRAM_TRAS + SDRAM_TPC) / ns;
+ 	if (tmp > 14)
+ 		tmp = 14;
+ 	dmcr |= ((tmp + 1) >> 1) << EMC_DMCR_TRC_BIT;
+ 
+ 	/* SDRAM mode value */
+-	sdmode = EMC_SDMR_BT_SEQ |
+-		 EMC_SDMR_OM_NORMAL |
+-		 EMC_SDMR_BL_4 |
++	sdmode = EMC_SDMR_BT_SEQ	|
++		 EMC_SDMR_OM_NORMAL	|
++		 EMC_SDMR_BL_4		|
+ 		 cas_latency_sdmr[((SDRAM_CASL == 3) ? 1 : 0)];
+ 
+ 	/* Stage 1. Precharge all banks by writing SDMR with DMCR.MRSET=0 */
+@@ -172,8 +149,8 @@ void sdram_init(void)
+ 	if (tmp > 0xff)
+ 		tmp = 0xff;
+ 	writew(tmp, &emc->rtcor);
++
+ 	writew(0, &emc->rtcnt);
+-	/* Divisor is 64, CKO/64 */
+ 	writew(EMC_RTCSR_CKS_64, &emc->rtcsr);
+ 
+ 	/* Wait for number of auto-refresh cycles */
+@@ -182,13 +159,17 @@ void sdram_init(void)
+ 		;
+ 
+ 	/* Stage 3. Mode Register Set */
++	dmcr0 = (11 << EMC_DMCR_RA_BIT)	|
++		(8 << EMC_DMCR_CA_BIT)	|
++		(0 << EMC_DMCR_BA_BIT)	|
++		EMC_DMCR_EPIN		|
++		(SDRAM_BW16 << EMC_DMCR_BW_BIT) |
++		cas_latency_dmcr[((SDRAM_CASL == 3) ? 1 : 0)];
+ 	writel(dmcr0 | EMC_DMCR_RFSH | EMC_DMCR_MRSET, &emc->dmcr);
+ 	writeb(0, JZ4740_EMC_SDMR0 | sdmode);
+ 
+ 	/* Set back to basic DMCR value */
+ 	writel(dmcr | EMC_DMCR_RFSH | EMC_DMCR_MRSET, &emc->dmcr);
+-
+-	/* everything is ok now */
+ }
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+@@ -232,9 +213,10 @@ void rtc_init(void)
+ phys_size_t initdram(int board_type)
+ {
+ 	struct jz4740_emc *emc = (struct jz4740_emc *)JZ4740_EMC_BASE;
+-	u32 dmcr;
+-	u32 rows, cols, dw, banks;
+-	ulong size;
++
++	unsigned int dmcr;
++	unsigned int rows, cols, dw, banks;
++	unsigned long size;
+ 
+ 	dmcr = readl(&emc->dmcr);
+ 	rows = 11 + ((dmcr & EMC_DMCR_RA_MASK) >> EMC_DMCR_RA_BIT);
+diff --git a/arch/mips/cpu/xburst/spl/Makefile b/arch/mips/cpu/xburst/spl/Makefile
+new file mode 100644
+index 0000000..f45e8c8
+--- /dev/null
++++ b/arch/mips/cpu/xburst/spl/Makefile
+@@ -0,0 +1,47 @@
++#
++# Copyright (C) 2011 Xiangfu Liu <xiangfu@openmobilefree.net>
++#
++# See file CREDITS for list of people who contributed to this
++# project.
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# This program is distributed in the hope that 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 $(TOPDIR)/config.mk
++
++LIB	= $(obj)lib$(CPU).o
++
++START	= start.o
++SOBJS-y	=
++COBJS-y	=
++
++SRCS	:= $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
++OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
++START	:= $(addprefix $(obj),$(START))
++
++all:	$(obj).depend $(START) $(LIB)
++
++$(LIB):	$(OBJS)
++	$(call cmd_link_o_target, $(OBJS))
++
++#########################################################################
++
++# defines $(obj).depend target
++include $(SRCTREE)/rules.mk
++
++sinclude $(obj).depend
++
++#########################################################################
+diff --git a/arch/mips/cpu/xburst/spl/start.S b/arch/mips/cpu/xburst/spl/start.S
+new file mode 100644
+index 0000000..e31c4c8
+--- /dev/null
++++ b/arch/mips/cpu/xburst/spl/start.S
+@@ -0,0 +1,63 @@
++/*
++ * Copyright (c) 2010 Xiangfu Liu <xiangfu@openmobilefree.net>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 3 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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 <config.h>
++#include <version.h>
++#include <asm/regdef.h>
++#include <asm/mipsregs.h>
++#include <asm/addrspace.h>
++#include <asm/cacheops.h>
++
++#include <asm/jz4740.h>
++
++	.set noreorder
++
++	.globl _start
++	.text
++_start:
++	.word JZ4740_NANDBOOT_CFG /* fetched during NAND Boot */
++reset:
++	/*
++	 * STATUS register
++	 * CU0=UM=EXL=IE=0, BEV=ERL=1, IP2~7=1
++	 */
++	li	t0, 0x0040FC04
++	mtc0	t0, CP0_STATUS
++	/*
++	 * CAUSE register
++	 * IV=1, use the specical interrupt vector (0x200)
++	 */
++	li	t1, 0x00800000
++	mtc0	t1, CP0_CAUSE
++
++	bal     1f
++	 nop
++	.word   _GLOBAL_OFFSET_TABLE_
++1:
++	move    gp, ra
++	lw      t1, 0(ra)
++	move	gp, t1
++
++	la	sp, 0x80004000
++	la	t9, nand_spl_boot
++	j	t9
++	nop
+diff --git a/board/qi/qi_lb60/Makefile b/board/qi/qi_lb60/Makefile
+index 5dae11b..e399246 100644
+--- a/board/qi/qi_lb60/Makefile
++++ b/board/qi/qi_lb60/Makefile
+@@ -22,7 +22,11 @@ include $(TOPDIR)/config.mk
+ 
+ LIB	= $(obj)lib$(BOARD).o
+ 
++ifeq ($(CONFIG_SPL_BUILD),y)
++COBJS	:= $(BOARD)-spl.o
++else
+ COBJS	:= $(BOARD).o
++endif
+ 
+ SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
+diff --git a/board/qi/qi_lb60/qi_lb60-spl.c b/board/qi/qi_lb60/qi_lb60-spl.c
+new file mode 100644
+index 0000000..3fe3fa3
+--- /dev/null
++++ b/board/qi/qi_lb60/qi_lb60-spl.c
+@@ -0,0 +1,30 @@
++/*
++ * Authors: Xiangfu Liu <xiangfu@openmobilefree.cc>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 3 of the License, or (at your option) any later version.
++ */
++
++#include <common.h>
++#include <nand.h>
++#include <asm/io.h>
++#include <asm/jz4740.h>
++
++void nand_spl_boot(void)
++{
++	__gpio_as_sdram_16bit_4720();
++	__gpio_as_uart0();
++	__gpio_jtag_to_uart0();
++
++	serial_init();
++
++	pll_init();
++	sdram_init();
++
++	nand_init();
++
++	puts("\nQi LB60 SPL: Starting U-Boot ...\n");
++	nand_boot();
++}
+diff --git a/board/qi/qi_lb60/qi_lb60.c b/board/qi/qi_lb60/qi_lb60.c
+index d975209..3bd4e2f 100644
+--- a/board/qi/qi_lb60/qi_lb60.c
++++ b/board/qi/qi_lb60/qi_lb60.c
+@@ -1,5 +1,5 @@
+ /*
+- * Authors: Xiangfu Liu <xiangfu@sharism.cc>
++ * Authors: Xiangfu Liu <xiangfu@openmobilefree.net>
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+@@ -97,8 +97,10 @@ int board_early_init_f(void)
+ /* U-Boot common routines */
+ int checkboard(void)
+ {
+-	printf("Board: Qi LB60 (Ingenic XBurst Jz4740 SoC, Speed %ld MHz)\n",
+-	       gd->cpu_clk / 1000000);
++	printf("Board: Qi LB60 (Ingenic XBurst Jz4740 SoC)\n");
++	printf(" CPU: %ld\n", gd->cpu_clk);
++	printf(" MEM: %ld\n", gd->mem_clk);
++	printf(" DEV: %ld\n", gd->dev_clk);
+ 
+ 	return 0;
+ }
+diff --git a/board/qi/qi_lb60/u-boot-spl.lds b/board/qi/qi_lb60/u-boot-spl.lds
+new file mode 100644
+index 0000000..930537f
+--- /dev/null
++++ b/board/qi/qi_lb60/u-boot-spl.lds
+@@ -0,0 +1,61 @@
++/*
++ * (C) Copyright 2012 Xiangfu Liu <xiangfu@openmobilefree.net>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++
++OUTPUT_FORMAT("elf32-tradlittlemips", "elf32-tradlittlemips", "elf32-tradlittlemips")
++
++OUTPUT_ARCH(mips)
++ENTRY(_start)
++SECTIONS
++{
++	. = 0x80000000;
++	. = ALIGN(4);
++	.text :
++	{
++	  *(.text)
++	}
++
++	. = ALIGN(4);
++	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
++
++	. = ALIGN(4);
++	.data  : { *(.data) }
++
++	. = ALIGN(4);
++	.sdata  : { *(.sdata) }
++
++	_gp = ALIGN(16);
++
++	__got_start = .;
++	.got  : { *(.got) }
++	__got_end = .;
++
++	. = .;
++	__u_boot_cmd_start = .;
++	.u_boot_cmd : { *(.u_boot_cmd) }
++	__u_boot_cmd_end = .;
++
++	uboot_end_data = .;
++	num_got_entries = (__got_end - __got_start) >> 2;
++
++	. = ALIGN(4);
++	.sbss  : { *(.sbss) }
++	.bss  : { *(.bss) }
++	uboot_end = .;
++}
++ASSERT(uboot_end <= 0x80002000, "NAND bootstrap too big");
+diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
+index 3ec34f3..24a4921 100644
+--- a/drivers/mtd/nand/jz4740_nand.c
++++ b/drivers/mtd/nand/jz4740_nand.c
+@@ -15,6 +15,9 @@
+ #include <asm/io.h>
+ #include <asm/jz4740.h>
+ 
++#ifdef CONFIG_SPL_BUILD
++#define printf(s) puts(s)
++#endif
+ #define JZ_NAND_DATA_ADDR ((void __iomem *)0xB8000000)
+ #define JZ_NAND_CMD_ADDR (JZ_NAND_DATA_ADDR + 0x8000)
+ #define JZ_NAND_ADDR_ADDR (JZ_NAND_DATA_ADDR + 0x10000)
+@@ -176,7 +179,7 @@ static int jz_nand_rs_correct_data(struct mtd_info *mtd, u_char *dat,
+ 		for (k = 0; k < 9; k++)
+ 			writeb(read_ecc[k], &emc->nfpar[k]);
+ 	}
+-	/* Set PRDY */
++
+ 	writel(readl(&emc->nfecr) | EMC_NFECR_PRDY, &emc->nfecr);
+ 
+ 	/* Wait for completion */
+@@ -184,7 +187,7 @@ static int jz_nand_rs_correct_data(struct mtd_info *mtd, u_char *dat,
+ 		status = readl(&emc->nfints);
+ 	} while (!(status & EMC_NFINTS_DECF));
+ 
+-	/* disable ecc */
++	/* Disable ECC */
+ 	writel(readl(&emc->nfecr) & ~EMC_NFECR_ECCE, &emc->nfecr);
+ 
+ 	/* Check decoding */
+@@ -192,7 +195,7 @@ static int jz_nand_rs_correct_data(struct mtd_info *mtd, u_char *dat,
+ 		return 0;
+ 
+ 	if (status & EMC_NFINTS_UNCOR) {
+-		printf("uncorrectable ecc\n");
++		printf("JZ4740 uncorrectable ECC\n");
+ 		return -1;
+ 	}
+ 
+@@ -230,6 +233,32 @@ static int jz_nand_rs_correct_data(struct mtd_info *mtd, u_char *dat,
+ 	return errcnt;
+ }
+ 
++#ifdef CONFIG_SPL_BUILD
++static void jz_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
++{
++	int i;
++	struct nand_chip *this = mtd->priv;
++
++#if (JZ4740_NANDBOOT_CFG == JZ4740_NANDBOOT_B16R3) || \
++	(JZ4740_NANDBOOT_CFG == JZ4740_NANDBOOT_B16R2)
++	for (i = 0; i < len; i += 2)
++		buf[i] = readw(this->IO_ADDR_R);
++#elif (JZ4740_NANDBOOT_CFG == JZ4740_NANDBOOT_B8R3) || \
++	(JZ4740_NANDBOOT_CFG == JZ4740_NANDBOOT_B8R2)
++	for (i = 0; i < len; i++)
++		buf[i] = readb(this->IO_ADDR_R);
++#else
++	#error JZ4740_NANDBOOT_CFG not defined or wrong
++#endif
++}
++
++static uint8_t jz_nand_read_byte(struct mtd_info *mtd)
++{
++	struct nand_chip *this = mtd->priv;
++	return readb(this->IO_ADDR_R);
++}
++#endif
++
+ /*
+  * Main initialization routine
+  */
+@@ -254,6 +283,10 @@ int board_nand_init(struct nand_chip *nand)
+ 	nand->ecc.size		= CONFIG_SYS_NAND_ECCSIZE;
+ 	nand->ecc.bytes		= CONFIG_SYS_NAND_ECCBYTES;
+ 	nand->ecc.layout	= &qi_lb60_ecclayout_2gb;
++#ifdef CONFIG_SPL_BUILD
++	nand->read_byte		= jz_nand_read_byte;
++	nand->read_buf		= jz_nand_read_buf;
++#endif
+ 	nand->chip_delay	= 50;
+ 	nand->options		= NAND_USE_FLASH_BBT;
+ 
+diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h
+index 4bb5bbc..7bff444 100644
+--- a/include/configs/qi_lb60.h
++++ b/include/configs/qi_lb60.h
+@@ -1,5 +1,5 @@
+ /*
+- * Authors: Xiangfu Liu <xiangfu.z@gmail.com>
++ * Authors: Xiangfu Liu <xiangfu@openmobilefree.net>
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+@@ -14,7 +14,6 @@
+ #define CONFIG_SYS_LITTLE_ENDIAN
+ #define CONFIG_JZSOC		/* Jz SoC */
+ #define CONFIG_JZ4740		/* Jz4740 SoC */
+-#define CONFIG_NAND_JZ4740
+ 
+ #define CONFIG_SYS_CPU_SPEED	336000000	/* CPU clock: 336 MHz */
+ #define CONFIG_SYS_EXTAL	12000000	/* EXTAL freq: 12 MHz */
+@@ -24,24 +23,43 @@
+ #define CONFIG_SYS_UART_BASE	JZ4740_UART0_BASE /* Base of the UART channel */
+ #define CONFIG_BAUDRATE		57600
+ 
++#define CONFIG_BOOTP_MASK	(CONFIG_BOOTP_DEFAUL)
++#define CONFIG_BOOTDELAY	0
++#define CONFIG_BOOTARGS "mem=32M console=tty0 console=ttyS0,57600n8 ubi.mtd=2 rootfstype=ubifs root=ubi0:rootfs rw rootwait"
++#define CONFIG_BOOTCOMMAND	"nand read 0x80600000 0x400000 0x280000;bootm"
++
++/*
++ * Miscellaneous configurable options
++ */
++#define CONFIG_SYS_SDRAM_BASE		0x80000000	/* Cached addr */
++#define CONFIG_SYS_INIT_SP_OFFSET	0x400000
++#define CONFIG_SYS_LOAD_ADDR		0x80600000
++#define CONFIG_SYS_MEMTEST_START	0x80100000
++#define CONFIG_SYS_MEMTEST_END		0x80A00000
++#define CONFIG_SYS_TEXT_BASE		0x80100000
++#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE
++
++#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
++#define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
++
++#define CONFIG_SYS_CBSIZE	256 /* Console I/O Buffer Size */
++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
++
++#define CONFIG_SYS_LONGHELP
++#define CONFIG_SYS_MAXARGS	16
++#define CONFIG_SYS_PROMPT	"NanoNote# "
++
+ #define CONFIG_SKIP_LOWLEVEL_INIT
+ #define CONFIG_BOARD_EARLY_INIT_F
+ #define CONFIG_SYS_NO_FLASH
+ #define CONFIG_SYS_FLASH_BASE	0 /* init flash_base as 0 */
+-#define CONFIG_ENV_OVERWRITE
+-
+-#define CONFIG_BOOTP_MASK	(CONFIG_BOOTP_DEFAUL)
+-#define CONFIG_BOOTDELAY	0
+-#define CONFIG_BOOTARGS		"mem=32M console=tty0 console=ttyS0,57600n8 ubi.mtd=2 rootfstype=ubifs root=ubi0:rootfs rw rootwait"
+-#define CONFIG_BOOTCOMMAND	"nand read 0x80600000 0x400000 0x200000;bootm"
+ 
+ /*
+- * Command line configuration.
++ * Command line configuration
+  */
+ #define CONFIG_CMD_BOOTD	/* bootd			*/
+ #define CONFIG_CMD_CONSOLE	/* coninfo			*/
+ #define CONFIG_CMD_ECHO		/* echo arguments		*/
+-
+ #define CONFIG_CMD_LOADB	/* loadb			*/
+ #define CONFIG_CMD_LOADS	/* loads			*/
+ #define CONFIG_CMD_MEMORY	/* md mm nm mw cp cmp crc base loop mtest */
+@@ -58,45 +76,16 @@
+ #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
+ 
+ /*
+- * Miscellaneous configurable options
+- */
+-#define CONFIG_SYS_MAXARGS 16
+-#define CONFIG_SYS_LONGHELP
+-#define CONFIG_SYS_PROMPT "NanoNote# "
+-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
+-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+-
+-#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
+-#define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
+-
+-#define CONFIG_SYS_SDRAM_BASE		0x80000000	/* Cached addr */
+-#define CONFIG_SYS_INIT_SP_OFFSET	0x400000
+-#define CONFIG_SYS_LOAD_ADDR		0x80600000
+-#define CONFIG_SYS_MEMTEST_START	0x80100000
+-#define CONFIG_SYS_MEMTEST_END		0x80800000
+-
+-/*
+- * Environment
++ * NAND driver configuration
+  */
+-#define CONFIG_ENV_IS_IN_NAND		/* use NAND for environment vars */
+-
+-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
+-/*
+- * if board nand flash is 1GB, set to 1
+- * if board nand flash is 2GB, set to 2
+- * for change the PAGE_SIZE and BLOCK_SIZE
+- * will delete when there is no 1GB flash
+- */
+-#define NANONOTE_NAND_SIZE	2
+-
+-#define CONFIG_SYS_NAND_PAGE_SIZE	(2048 * NANONOTE_NAND_SIZE)
+-#define CONFIG_SYS_NAND_BLOCK_SIZE	(256 * NANONOTE_NAND_SIZE << 10)
+-/* nand bad block was marked at this page in a block, start from 0 */
++#define CONFIG_NAND_JZ4740
++#define CONFIG_SYS_NAND_PAGE_SIZE	4096
++#define CONFIG_SYS_NAND_BLOCK_SIZE	(512 << 10)
++/* NAND bad block was marked at this page in a block, start from 0 */
+ #define CONFIG_SYS_NAND_BADBLOCK_PAGE	127
+ #define CONFIG_SYS_NAND_PAGE_COUNT	128
+ #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
+-/* ECC offset position in oob area, default value is 6 if it isn't defined */
+-#define CONFIG_SYS_NAND_ECC_POS		(6 * NANONOTE_NAND_SIZE)
++#define CONFIG_SYS_NAND_ECC_POS		12
+ #define CONFIG_SYS_NAND_ECCSIZE		512
+ #define CONFIG_SYS_NAND_ECCBYTES	9
+ #define CONFIG_SYS_NAND_ECCPOS		\
+@@ -115,10 +104,9 @@
+ #define CONFIG_SYS_ONENAND_BASE		CONFIG_SYS_NAND_BASE
+ #define CONFIG_SYS_MAX_NAND_DEVICE	1
+ #define CONFIG_SYS_NAND_SELECT_DEVICE	1 /* nand driver supports mutipl.*/
+-#define CONFIG_NAND_SPL_TEXT_BASE	0x80000000
+ 
+ /*
+- * IPL (Initial Program Loader, integrated inside CPU)
++ * IPL (Initial Program Loader, integrated inside Ingenic Xburst JZ4740 CPU)
+  * Will load first 8k from NAND (SPL) into cache and execute it from there.
+  *
+  * SPL (Secondary Program Loader)
+@@ -130,77 +118,88 @@
+  * NUB (NAND U-Boot)
+  * This NAND U-Boot (NUB) is a special U-Boot version which can be started
+  * from RAM. Therefore it mustn't (re-)configure the SDRAM controller.
+- *
+  */
++
++/*
++ * NAND SPL configuration
++ */
++#define CONFIG_SPL
++#define CONFIG_SPL_LIBGENERIC_SUPPORT
++#define CONFIG_SPL_LIBCOMMON_SUPPORT
++#define CONFIG_SPL_NAND_LOAD
++#define CONFIG_SPL_NAND_SIMPLE
++#define CONFIG_SPL_NAND_SUPPORT
++#define CONFIG_SPL_TEXT_BASE	0x80000000
++#define CONFIG_SPL_START_S_PATH	"arch/mips/cpu/xburst/spl"
++
++#define CONFIG_SYS_NAND_5_ADDR_CYCLE
++#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
++#define JZ4740_NANDBOOT_CFG		JZ4740_NANDBOOT_B8R3
++
+ #define CONFIG_SYS_NAND_U_BOOT_DST	0x80100000 /* Load NUB to this addr */
+ #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_NAND_U_BOOT_DST
+-/* Start NUB from this addr*/
++					/* Start NUB from this addr */
++#define CONFIG_SYS_NAND_U_BOOT_OFFS (32  << 10) /* Offset of NUB */
++#define CONFIG_SYS_NAND_U_BOOT_SIZE (256 << 10) /* Size of NUB */
+ 
+ /*
+- * Define the partitioning of the NAND chip (only RAM U-Boot is needed here)
++ * Environment configuration
+  */
+-#define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) /* Offset to RAM U-Boot image */
+-#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10) /* Size of RAM U-Boot image */
+-
++#define CONFIG_ENV_OVERWRITE
++#define CONFIG_ENV_IS_IN_NAND
+ #define CONFIG_ENV_SIZE		(4 << 10)
+ #define CONFIG_ENV_OFFSET	\
+ 	(CONFIG_SYS_NAND_BLOCK_SIZE + CONFIG_SYS_NAND_U_BOOT_SIZE)
+ #define CONFIG_ENV_OFFSET_REDUND \
+ 	(CONFIG_ENV_OFFSET  + CONFIG_SYS_NAND_BLOCK_SIZE)
+ 
+-#define CONFIG_SYS_TEXT_BASE	0x80100000
+-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE
+-
+ /*
+- * SDRAM Info.
++ * CPU cache configuration
+  */
+-#define CONFIG_NR_DRAM_BANKS	1
++#define CONFIG_SYS_DCACHE_SIZE		16384
++#define CONFIG_SYS_ICACHE_SIZE		16384
++#define CONFIG_SYS_CACHELINE_SIZE	32
+ 
+ /*
+- * Cache Configuration
++ * SDRAM configuration
+  */
+-#define CONFIG_SYS_DCACHE_SIZE	16384
+-#define CONFIG_SYS_ICACHE_SIZE	16384
+-#define CONFIG_SYS_CACHELINE_SIZE	32
++#define CONFIG_NR_DRAM_BANKS	1
++
++#define SDRAM_BW16		1	/* Data bus width: 0-32bit, 1-16bit */
++#define SDRAM_BANK4		1	/* Banks each chip: 0-2bank, 1-4bank */
++#define SDRAM_ROW		13	/* Row address: 11 to 13 */
++#define SDRAM_COL		9	/* Column address: 8 to 12 */
++#define SDRAM_CASL		2	/* CAS latency: 2 or 3 */
++#define SDRAM_TRAS		45	/* RAS# Active Time */
++#define SDRAM_RCD		20	/* RAS# to CAS# Delay */
++#define SDRAM_TPC		20	/* RAS# Precharge Time */
++#define SDRAM_TRWL		7	/* Write Latency Time */
++#define SDRAM_TREF		15625	/* Refresh period: 8192 cycles/64ms */
+ 
+ /*
+- * GPIO definition
++ * GPIO configuration
+  */
+-#define GPIO_LCD_CS	(2 * 32 + 21)
+-#define GPIO_AMP_EN	(3 * 32 + 4)
++#define GPIO_LCD_CS		(2 * 32 + 21)
++#define GPIO_AMP_EN		(3 * 32 + 4)
+ 
+-#define GPIO_SDPW_EN	(3 * 32 + 2)
+-#define GPIO_SD_DETECT	(3 * 32 + 0)
++#define GPIO_SDPW_EN		(3 * 32 + 2)
++#define GPIO_SD_DETECT		(3 * 32 + 0)
+ 
+-#define GPIO_BUZZ_PWM	(3 * 32 + 27)
+-#define GPIO_USB_DETECT	(3 * 32 + 28)
++#define GPIO_BUZZ_PWM		(3 * 32 + 27)
++#define GPIO_USB_DETECT		(3 * 32 + 28)
+ 
+-#define GPIO_AUDIO_POP	(1 * 32 + 29)
+-#define GPIO_COB_TEST	(1 * 32 + 30)
++#define GPIO_AUDIO_POP		(1 * 32 + 29)
++#define GPIO_COB_TEST		(1 * 32 + 30)
+ 
+ #define GPIO_KEYOUT_BASE	(2 * 32 + 10)
+-#define GPIO_KEYIN_BASE	(3 * 32 + 18)
+-#define GPIO_KEYIN_8	(3 * 32 + 26)
++#define GPIO_KEYIN_BASE		(3 * 32 + 18)
++#define GPIO_KEYIN_8		(3 * 32 + 26)
+ 
+-#define GPIO_SD_CD_N	GPIO_SD_DETECT		/* SD Card insert detect */
++#define GPIO_SD_CD_N		GPIO_SD_DETECT	/* SD Card insert detect */
+ #define GPIO_SD_VCC_EN_N	GPIO_SDPW_EN	/* SD Card Power Enable */
+ 
+ #define SPEN	GPIO_LCD_CS	/* LCDCS :Serial command enable      */
+ #define SPDA	(2 * 32 + 22)	/* LCDSCL:Serial command clock input */
+ #define SPCK	(2 * 32 + 23)	/* LCDSDA:Serial command data input  */
+ 
+-/* SDRAM paramters */
+-#define SDRAM_BW16		1	/* Data bus width: 0-32bit, 1-16bit */
+-#define SDRAM_BANK4		1	/* Banks each chip: 0-2bank, 1-4bank */
+-#define SDRAM_ROW		13	/* Row address: 11 to 13 */
+-#define SDRAM_COL		9	/* Column address: 8 to 12 */
+-#define SDRAM_CASL		2	/* CAS latency: 2 or 3 */
+-
+-/* SDRAM Timings, unit: ns */
+-#define SDRAM_TRAS		45	/* RAS# Active Time */
+-#define SDRAM_RCD		20	/* RAS# to CAS# Delay */
+-#define SDRAM_TPC		20	/* RAS# Precharge Time */
+-#define SDRAM_TRWL		7	/* Write Latency Time */
+-#define SDRAM_TREF		15625	/* Refresh period: 8192 cycles/64ms */
+-
+ #endif
+-- 
+1.7.9.5
+
diff --git a/trunk/package/boot/uboot-xburst/patches/0002-qi_lb60-add-software-usbboot-support.patch b/trunk/package/boot/uboot-xburst/patches/0002-qi_lb60-add-software-usbboot-support.patch
new file mode 100644
index 00000000..feaf297b
--- /dev/null
+++ b/trunk/package/boot/uboot-xburst/patches/0002-qi_lb60-add-software-usbboot-support.patch
@@ -0,0 +1,916 @@
+From fa51192b912d296b8eec10f7d44c6c17eb1dd368 Mon Sep 17 00:00:00 2001
+From: Xiangfu <xiangfu@openmobilefree.net>
+Date: Fri, 12 Oct 2012 09:47:39 +0800
+Subject: [PATCH 2/6] qi_lb60: add software usbboot support
+
+  JZ4740 CPU have a internal ROM have such kind of code, that make
+  JZ4740 can boot from USB
+
+  usbboot.S can downloads user program from the USB port to internal
+  SRAM and branches to the internal SRAM to execute the program
+
+Signed-off-by: Xiangfu <xiangfu@openmobilefree.net>
+---
+ board/qi/qi_lb60/Makefile      |    1 +
+ board/qi/qi_lb60/qi_lb60-spl.c |   20 +
+ board/qi/qi_lb60/usbboot.S     |  838 ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 859 insertions(+)
+ create mode 100644 board/qi/qi_lb60/usbboot.S
+
+diff --git a/board/qi/qi_lb60/Makefile b/board/qi/qi_lb60/Makefile
+index e399246..6dd8c6f 100644
+--- a/board/qi/qi_lb60/Makefile
++++ b/board/qi/qi_lb60/Makefile
+@@ -23,6 +23,7 @@ include $(TOPDIR)/config.mk
+ LIB	= $(obj)lib$(BOARD).o
+ 
+ ifeq ($(CONFIG_SPL_BUILD),y)
++SOBJS	:= usbboot.o
+ COBJS	:= $(BOARD)-spl.o
+ else
+ COBJS	:= $(BOARD).o
+diff --git a/board/qi/qi_lb60/qi_lb60-spl.c b/board/qi/qi_lb60/qi_lb60-spl.c
+index 3fe3fa3..aea459c 100644
+--- a/board/qi/qi_lb60/qi_lb60-spl.c
++++ b/board/qi/qi_lb60/qi_lb60-spl.c
+@@ -12,6 +12,24 @@
+ #include <asm/io.h>
+ #include <asm/jz4740.h>
+ 
++#define KEY_U_OUT       (32 * 2 + 16)
++#define KEY_U_IN        (32 * 3 + 19)
++
++extern void usb_boot(void);
++
++static void check_usb_boot(void)
++{
++	__gpio_as_input(KEY_U_IN);
++	__gpio_enable_pull(KEY_U_IN);
++	__gpio_as_output(KEY_U_OUT);
++	__gpio_clear_pin(KEY_U_OUT);
++
++	if (!__gpio_get_pin(KEY_U_IN)) {
++		puts("[U] pressed, goto USBBOOT mode\n");
++		usb_boot();
++	}
++}
++
+ void nand_spl_boot(void)
+ {
+ 	__gpio_as_sdram_16bit_4720();
+@@ -23,6 +41,8 @@ void nand_spl_boot(void)
+ 	pll_init();
+ 	sdram_init();
+ 
++	check_usb_boot();
++
+ 	nand_init();
+ 
+ 	puts("\nQi LB60 SPL: Starting U-Boot ...\n");
+diff --git a/board/qi/qi_lb60/usbboot.S b/board/qi/qi_lb60/usbboot.S
+new file mode 100644
+index 0000000..c872266
+--- /dev/null
++++ b/board/qi/qi_lb60/usbboot.S
+@@ -0,0 +1,838 @@
++/*
++ *  for jz4740 usb boot
++ *
++ *  Copyright (c) 2009 Author: <jlwei@ingenic.cn>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++    .set noreorder
++    .globl usb_boot
++    .text
++
++/*
++ * Both NAND and USB boot load data to D-Cache first, then transfer
++ * data from D-Cache to I-Cache, and jump to execute the code in I-Cache.
++ * So init caches first and then dispatch to a proper boot routine.
++ */
++
++.macro load_addr reg addr
++	li \reg, 0x80000000
++	addiu \reg, \reg, \addr
++	la $2, usbboot_begin
++	subu \reg, \reg, $2
++.endm
++
++usb_boot:
++	/* Initialize PLL: set ICLK to 84MHz and HCLK to 42MHz. */
++	la	$9, 0xB0000000		/* CPCCR: Clock Control Register */
++	la	$8, 0x42041110		/* I:S:M:P=1:2:2:2 */
++	sw	$8, 0($9)
++
++	la	$9, 0xB0000010		/* CPPCR: PLL Control Register */
++	la	$8, 0x06000120		/* M=12 N=0 D=0 CLK=12*(M+2)/(N+2) */
++	sw	$8, 0($9)
++
++	mtc0	$0, $26		/* CP0_ERRCTL, restore WST reset state */
++	nop
++
++	mtc0	$0, $16			/* CP0_CONFIG */
++	nop
++
++	/* Relocate code to beginning of the ram */
++
++	la $2, usbboot_begin
++	la $3, usbboot_end
++	li $4, 0x80000000
++
++1:
++	lw $5, 0($2)
++	sw $5, 0($4)
++	addiu $2, $2, 4
++	bne $2, $3, 1b
++	addiu $4, $4, 4
++
++	li $2, 0x80000000
++	ori $3, $2, 0
++	addiu $3, $3, usbboot_end
++	la $4, usbboot_begin
++	subu $3, $3, $4
++
++
++2:
++	cache	0x0, 0($2)		/* Index_Invalidate_I */
++	cache	0x1, 0($2)		/* Index_Writeback_Inv_D */
++	addiu	$2, $2, 32
++	subu $4, $3, $2
++	bgtz	$4, 2b
++	nop
++
++	load_addr $3, usb_boot_return
++
++	jr $3
++
++usbboot_begin:
++
++init_caches:
++	li	$2, 3			/* cacheable for kseg0 access */
++	mtc0	$2, $16			/* CP0_CONFIG */
++	nop
++
++	li	$2, 0x20000000		/* enable idx-store-data cache insn */
++	mtc0	$2, $26			/* CP0_ERRCTL */
++
++	ori	$2, $28, 0		/* start address */
++	ori	$3, $2, 0x3fe0		/* end address, total 16KB */
++	mtc0	$0, $28, 0		/* CP0_TAGLO */
++	mtc0	$0, $28, 1		/* CP0_DATALO */
++cache_clear_a_line:
++	cache	0x8, 0($2)		/* Index_Store_Tag_I */
++	cache	0x9, 0($2)		/* Index_Store_Tag_D */
++	bne	$2, $3, cache_clear_a_line
++	addiu	$2, $2, 32		/* increment CACHE_LINE_SIZE */
++
++	ori	$2, $28, 0		/* start address */
++	ori	$3, $2, 0x3fe0		/* end address, total 16KB */
++	la	$4, 0x1ffff000		/* physical address and 4KB page mask */
++cache_alloc_a_line:
++	and	$5, $2, $4
++	ori	$5, $5, 1		/* V bit of the physical tag */
++	mtc0	$5, $28, 0		/* CP0_TAGLO */
++	cache	0x8, 0($2)		/* Index_Store_Tag_I */
++	cache	0x9, 0($2)		/* Index_Store_Tag_D */
++	bne	$2, $3, cache_alloc_a_line
++	addiu	$2, $2, 32		/* increment CACHE_LINE_SIZE */
++
++	nop
++	nop
++	nop
++	/*
++	 * Transfer data from dcache to icache, then jump to icache.
++	 * Input parameters:
++	 * $19: data length in bytes
++	 * $20: jump target address
++	 */
++xfer_d2i:
++
++	ori	$8, $20, 0
++	addu	$9, $8, $19		/* total 16KB */
++
++1:
++	cache	0x0, 0($8)		/* Index_Invalidate_I */
++	cache	0x1, 0($8)		/* Index_Writeback_Inv_D */
++	bne	$8, $9, 1b
++	addiu	$8, $8, 32
++
++	/* flush write-buffer */
++	sync
++
++	/* Invalidate BTB */
++	mfc0	$8, $16, 7		/* CP0_CONFIG */
++	nop
++	ori	$8, 2
++	mtc0	$8, $16, 7
++	nop
++
++	/* Overwrite config to disable ram initalisation */
++	li $2, 0xff
++	sb $2, 20($20)
++
++	jalr	$20
++	nop
++
++icache_return:
++	/* User code can return to here after executing itself in
++	  icache, by jumping to $31. */
++	b	usb_boot_return
++	nop
++
++
++usb_boot_return:
++	/* Enable the USB PHY */
++	la	$9, 0xB0000024		/* CPM_SCR */
++	lw	$8, 0($9)
++	ori	$8, 0x40		/* USBPHY_ENABLE */
++	sw	$8, 0($9)
++
++	/* Initialize USB registers */
++	la	$27, 0xb3040000	/* USB registers base address */
++
++	sb	$0, 0x0b($27)	/* INTRUSBE: disable common USB interrupts */
++	sh	$0, 0x06($27)	/* INTRINE: disable EPIN interrutps */
++	sh	$0, 0x08($27)	/* INTROUTE: disable EPOUT interrutps */
++
++	li	$9, 0x61
++	sb	$9, 0x01($27)	/* POWER: HSENAB | SUSPENDM | SOFTCONN */
++
++	/* Initialize USB states */
++	li	$22, 0			/* set EP0 to IDLE state */
++	li	$23, 1			/* no data stage */
++
++	/* Main loop of polling the usb commands */
++usb_command_loop:
++	lbu	$9, 0x0a($27)		/* read INTRUSB */
++	andi	$9, 0x04		/* check USB_INTR_RESET */
++	beqz	$9, check_intr_ep0in
++	nop
++
++ 	/* 1. Handle USB reset interrupt */
++handle_reset_intr:
++	lbu	$9, 0x01($27)		/* read POWER */
++	andi	$9, 0x10		/* test HS_MODE */
++	bnez	$9, _usb_set_maxpktsize
++	li	$9, 512			/* max packet size of HS mode */
++	li	$9, 64			/* max packet size of FS mode */
++
++_usb_set_maxpktsize:
++	li	$8, 1
++	sb	$8, 0x0e($27)		/* set INDEX 1 */
++
++	sh	$9, 0x10($27)		/* INMAXP */
++	sb	$0, 0x13($27)		/* INCSRH */
++	sh	$9, 0x14($27)		/* OUTMAXP */
++	sb	$0, 0x17($27)		/* OUTCSRH */
++
++_usb_flush_fifo:
++	li	$8, 0x48		/* INCSR_CDT && INCSR_FF */
++	sb	$8, 0x12($27)		/* INCSR */
++	li	$8, 0x90		/* OUTCSR_CDT && OUTCSR_FF */
++	sb	$8, 0x16($27)		/* OUTCSR */
++
++	li	$22, 0			/* set EP0 to IDLE state */
++	li	$23, 1			/* no data stage */
++
++	/* 2. Check and handle EP0 interrupt */
++check_intr_ep0in:
++	lhu	$10, 0x02($27)		/* read INTRIN */
++	andi	$9, $10, 0x1		/* check EP0 interrupt */
++	beqz	$9, check_intr_ep1in
++	nop
++
++handle_ep0_intr:
++	sb	$0, 0x0e($27)		/* set INDEX 0 */
++	lbu	$11, 0x12($27)		/* read CSR0 */
++
++	andi	$9, $11, 0x04		/* check SENTSTALL */
++	beqz	$9, _ep0_setupend
++	nop
++
++_ep0_sentstall:
++	andi	$9, $11, 0xdb
++	sb	$9, 0x12($27)		/* clear SENDSTALL and SENTSTALL */
++	li	$22, 0			/* set EP0 to IDLE state */
++
++_ep0_setupend:
++	andi	$9, $11, 0x10		/* check SETUPEND */
++	beqz	$9, ep0_idle_state
++	nop
++
++	ori	$9, $11, 0x80
++	sb	$9, 0x12($27)		/* set SVDSETUPEND */
++	li	$22, 0			/* set EP0 to IDLE state */
++
++ep0_idle_state:
++	bnez	$22, ep0_tx_state
++	nop
++
++	/* 2.1 Handle EP0 IDLE state interrupt */
++	andi	$9, $11, 0x01		/* check OUTPKTRDY */
++	beqz	$9, check_intr_ep1in
++	nop
++
++	/* Read 8-bytes setup packet from the FIFO */
++	lw	$25, 0x20($27)		/* first word of setup packet */
++	lw	$26, 0x20($27)		/* second word of setup packet */
++
++	andi	$9, $25, 0x60		/* bRequestType & USB_TYPE_MASK */
++	beqz	$9, _ep0_std_req
++	nop
++
++	/* 2.1.1 Vendor-specific setup request */
++_ep0_vend_req:
++	li	$22, 0			/* set EP0 to IDLE state */
++	li	$23, 1			/* NoData = 1 */
++
++	andi	$9, $25, 0xff00		/* check bRequest */
++	srl	$9, $9, 8
++	beqz	$9, __ep0_get_cpu_info
++	sub	$8, $9, 0x1
++	beqz	$8, __ep0_set_data_address
++	sub	$8, $9, 0x2
++	beqz	$8, __ep0_set_data_length
++	sub	$8, $9, 0x3
++	beqz	$8, __ep0_flush_caches
++	sub	$8, $9, 0x4
++	beqz	$8, __ep0_prog_start1
++	sub	$8, $9, 0x5
++	beqz	$8, __ep0_prog_start2
++	nop
++	b	_ep0_idle_state_fini	/* invalid request */
++	nop
++
++__ep0_get_cpu_info:
++	load_addr $20, cpu_info_data	/* data pointer to transfer */
++	li	$21, 8			/* bytes left to transfer */
++	li	$22, 1			/* set EP0 to TX state */
++	li	$23, 0			/* NoData = 0 */
++
++	b	_ep0_idle_state_fini
++	nop
++
++__ep0_set_data_address:
++	li	$9, 0xffff0000
++	and	$9, $25, $9
++	andi	$8, $26, 0xffff
++	or	$20, $9, $8		/* data address of next transfer */
++
++	b	_ep0_idle_state_fini
++	nop
++
++__ep0_set_data_length:
++	li	$9, 0xffff0000
++	and	$9, $25, $9
++	andi	$8, $26, 0xffff
++	or	$21, $9, $8		/* data length of next transfer */
++
++	li	$9, 0x48		/* SVDOUTPKTRDY and DATAEND */
++	sb	$9, 0x12($27)		/* CSR0 */
++
++	/* We must write packet to FIFO before EP1-IN interrupt here. */
++	b	handle_epin1_intr
++	nop
++
++__ep0_flush_caches:
++	/* Flush dcache and invalidate icache. */
++	li	$8, 0x80000000
++	addi	$9, $8, 0x3fe0		/* total 16KB */
++
++1:
++	cache	0x0, 0($8)		/* Index_Invalidate_I */
++	cache	0x1, 0($8)		/* Index_Writeback_Inv_D */
++	bne	$8, $9, 1b
++	addiu	$8, $8, 32
++
++	/* flush write-buffer */
++	sync
++
++	/* Invalidate BTB */
++	mfc0	$8, $16, 7		/* CP0_CONFIG */
++	nop
++	ori	$8, 2
++	mtc0	$8, $16, 7
++	nop
++
++	b	_ep0_idle_state_fini
++	nop
++
++__ep0_prog_start1:
++	li	$9, 0x48		/* SVDOUTPKTRDY and DATAEND */
++	sb	$9, 0x12($27)		/* CSR0 */
++
++	li	$9, 0xffff0000
++	and	$9, $25, $9
++	andi	$8, $26, 0xffff
++	or	$20, $9, $8		/* target address */
++
++	b	xfer_d2i
++	li	$19, 0x2000		/* 16KB data length */
++
++__ep0_prog_start2:
++	li	$9, 0x48		/* SVDOUTPKTRDY and DATAEND */
++	sb	$9, 0x12($27)		/* CSR0 */
++
++	li	$9, 0xffff0000
++	and	$9, $25, $9
++	andi	$8, $26, 0xffff
++	or	$20, $9, $8		/* target address */
++
++	jalr	$20		/* jump, and place the return address in $31 */
++	nop
++
++__ep0_prog_start2_return:
++/* User code can return to here after executing itself, by jumping to $31 */
++	b	usb_boot_return
++	nop
++
++	/* 2.1.2 Standard setup request */
++_ep0_std_req:
++	andi	$12, $25, 0xff00	/* check bRequest */
++	srl	$12, $12, 8
++	sub	$9, $12, 0x05		/* check USB_REQ_SET_ADDRESS */
++	bnez	$9, __ep0_req_set_config
++	nop
++
++	/* Handle USB_REQ_SET_ADDRESS */
++__ep0_req_set_addr:
++	srl	$9, $25, 16		/* get wValue */
++	sb	$9, 0x0($27)		/* set FADDR */
++	li	$23, 1			/* NoData = 1 */
++	b	_ep0_idle_state_fini
++	nop
++
++__ep0_req_set_config:
++	sub	$9, $12, 0x09		/* check USB_REQ_SET_CONFIGURATION */
++	bnez	$9, __ep0_req_get_desc
++	nop
++
++	/* Handle USB_REQ_SET_CONFIGURATION */
++	li	$23, 1			/* NoData = 1 */
++	b	_ep0_idle_state_fini
++	nop
++
++__ep0_req_get_desc:
++	sub	$9, $12, 0x06		/* check USB_REQ_GET_DESCRIPTOR */
++	bnez	$9, _ep0_idle_state_fini
++	li	$23, 1			/* NoData = 1 */
++
++	/* Handle USB_REQ_GET_DESCRIPTOR */
++	li	$23, 0			/* NoData = 0 */
++
++	srl	$9, $25, 24		/* wValue >> 8 */
++	sub	$8, $9, 0x01		/* check USB_DT_DEVICE */
++	beqz	$8, ___ep0_get_dev_desc
++	srl	$21, $26, 16		/* get wLength */
++	sub	$8, $9, 0x02		/* check USB_DT_CONFIG */
++	beqz	$8, ___ep0_get_conf_desc
++	sub	$8, $9, 0x03		/* check USB_DT_STRING */
++	beqz	$8, ___ep0_get_string_desc
++	sub	$8, $9, 0x06		/* check USB_DT_DEVICE_QUALIFIER */
++	beqz	$8, ___ep0_get_dev_qualifier
++	nop
++	b	_ep0_idle_state_fini
++	nop
++
++___ep0_get_dev_desc:
++	load_addr	$20, device_desc	/* data pointer */
++	li	$22, 1			/* set EP0 to TX state */
++	sub	$8, $21, 18
++	blez	$8, _ep0_idle_state_fini /* wLength <= 18 */
++	nop
++	li	$21, 18			/* max length of device_desc */
++	b	_ep0_idle_state_fini
++	nop
++
++___ep0_get_dev_qualifier:
++	load_addr	$20, dev_qualifier	/* data pointer */
++	li	$22, 1			/* set EP0 to TX state */
++	sub	$8, $21, 10
++	blez	$8, _ep0_idle_state_fini /* wLength <= 10 */
++	nop
++	li	$21, 10			/* max length of dev_qualifier */
++	b	_ep0_idle_state_fini
++	nop
++
++___ep0_get_conf_desc:
++	load_addr	$20, config_desc_fs	/* data pointer of FS mode */
++	lbu	$8, 0x01($27)		/* read POWER */
++	andi	$8, 0x10		/* test HS_MODE */
++	beqz	$8, ___ep0_get_conf_desc2
++	nop
++	load_addr $20, config_desc_hs	/* data pointer of HS mode */
++
++___ep0_get_conf_desc2:
++	li	$22, 1			/* set EP0 to TX state */
++	sub	$8, $21, 32
++	blez	$8, _ep0_idle_state_fini /* wLength <= 32 */
++	nop
++	li	$21, 32			/* max length of config_desc */
++	b	_ep0_idle_state_fini
++	nop
++
++___ep0_get_string_desc:
++	li	$22, 1			/* set EP0 to TX state */
++
++	srl	$9, $25, 16		/* wValue & 0xff */
++	andi	$9, 0xff
++
++	sub	$8, $9, 1
++	beqz	$8, ___ep0_get_string_manufacture
++	sub	$8, $9, 2
++	beqz	$8, ___ep0_get_string_product
++	nop
++
++___ep0_get_string_lang_ids:
++	load_addr	$20, string_lang_ids	/* data pointer */
++	b	_ep0_idle_state_fini
++	li	$21, 4			/* data length */
++
++___ep0_get_string_manufacture:
++	load_addr	$20, string_manufacture	/* data pointer */
++	b	_ep0_idle_state_fini
++	li	$21, 16			/* data length */
++
++___ep0_get_string_product:
++	load_addr	$20, string_product	/* data pointer */
++	b	_ep0_idle_state_fini
++	li	$21, 46			/* data length */
++
++_ep0_idle_state_fini:
++	li	$9, 0x40		/* SVDOUTPKTRDY */
++	beqz	$23, _ep0_idle_state_fini2
++	nop
++	ori	$9, $9, 0x08		/* DATAEND */
++_ep0_idle_state_fini2:
++	sb	$9, 0x12($27)		/* CSR0 */
++	beqz	$22, check_intr_ep1in
++	nop
++
++	/* 2.2 Handle EP0 TX state interrupt */
++ep0_tx_state:
++	sub	$9, $22, 1
++	bnez	$9, check_intr_ep1in
++	nop
++
++	sub	$9, $21, 64		/* max packetsize */
++	blez	$9, _ep0_tx_state2	/* data count <= 64 */
++	ori	$19, $21, 0
++	li	$19, 64
++
++_ep0_tx_state2:
++	beqz	$19, _ep0_tx_state3	/* send ZLP */
++	ori	$18, $19, 0		/* record bytes to be transferred */
++	sub	$21, $21, $19		/* decrement data count */
++
++_ep0_fifo_write_loop:
++	lbu	$9, 0($20)		/* read data */
++	sb	$9, 0x20($27)		/* load FIFO */
++	sub	$19, $19, 1		/* decrement counter */
++	bnez	$19, _ep0_fifo_write_loop
++	addi	$20, $20, 1		/* increment data pointer */
++
++	sub	$9, $18, 64		/* max packetsize */
++	beqz	$9, _ep0_tx_state4
++	nop
++
++_ep0_tx_state3:
++	/* transferred bytes < max packetsize */
++	li	$9, 0x0a		/* set INPKTRDY and DATAEND */
++	sb	$9, 0x12($27)		/* CSR0 */
++	li	$22, 0			/* set EP0 to IDLE state */
++	b	check_intr_ep1in
++	nop
++
++_ep0_tx_state4:
++	/* transferred bytes == max packetsize */
++	li	$9, 0x02		/* set INPKTRDY */
++	sb	$9, 0x12($27)		/* CSR0 */
++	b	check_intr_ep1in
++	nop
++
++	/* 3. Check and handle EP1 BULK-IN interrupt */
++check_intr_ep1in:
++	andi	$9, $10, 0x2		/* check EP1 IN interrupt */
++	beqz	$9, check_intr_ep1out
++	nop
++
++handle_epin1_intr:
++	li	$9, 1
++	sb	$9, 0x0e($27)		/* set INDEX 1 */
++	lbu	$9, 0x12($27)		/* read INCSR */
++
++	andi	$8, $9, 0x2		/* check INCSR_FFNOTEMPT */
++	bnez	$8, _epin1_tx_state4
++	nop
++
++_epin1_write_fifo:
++	lhu	$9, 0x10($27)		/* get INMAXP */
++	sub	$8, $21, $9
++	blez	$8, _epin1_tx_state1	/* bytes left <= INMAXP */
++	ori	$19, $21, 0
++	ori	$19, $9, 0
++
++_epin1_tx_state1:
++	beqz	$19, _epin1_tx_state4	/* No data */
++	nop
++
++	sub	$21, $21, $19		/* decrement data count */
++
++	srl	$5, $19, 2		/* # of word */
++	andi	$6, $19, 0x3		/* # of byte */
++	beqz	$5, _epin1_tx_state2
++	nop
++
++_epin1_fifo_write_word:
++	lw	$9, 0($20)		/* read data from source address */
++	sw	$9, 0x24($27)		/* write FIFO */
++	sub	$5, $5, 1		/* decrement counter */
++	bnez	$5, _epin1_fifo_write_word
++	addiu	$20, $20, 4		/* increment dest address */
++
++_epin1_tx_state2:
++	beqz	$6, _epin1_tx_state3
++	nop
++
++_epin1_fifo_write_byte:
++	lbu	$9, 0($20)		/* read data from source address */
++	sb	$9, 0x24($27)		/* write FIFO */
++	sub	$6, $6, 1		/* decrement counter */
++	bnez	$6, _epin1_fifo_write_byte
++	addiu	$20, $20, 1		/* increment dest address */
++
++_epin1_tx_state3:
++	li	$9, 0x1
++	sb	$9, 0x12($27)		/* INCSR, set INPKTRDY */
++
++_epin1_tx_state4:
++	/* 4. Check and handle EP1 BULK-OUT interrupt */
++check_intr_ep1out:
++	lhu	$9, 0x04($27)		/* read INTROUT */
++	andi	$9, 0x2
++	beqz	$9, check_status_next
++	nop
++
++handle_epout1_intr:
++	li	$9, 1
++	sb	$9, 0x0e($27)		/* set INDEX 1 */
++
++	lbu	$9, 0x16($27)		/* read OUTCSR */
++	andi	$9, 0x1			/* check OUTPKTRDY */
++	beqz	$9, check_status_next
++	nop
++
++_epout1_read_fifo:
++	lhu	$19, 0x18($27)		/* read OUTCOUNT */
++	srl	$5, $19, 2		/* # of word */
++	andi	$6, $19, 0x3		/* # of byte */
++	beqz	$5, _epout1_rx_state1
++	nop
++
++_epout1_fifo_read_word:
++	lw	$9, 0x24($27)		/* read FIFO */
++	sw	$9, 0($20)		/* store to dest address */
++	sub	$5, $5, 1		/* decrement counter */
++	bnez	$5, _epout1_fifo_read_word
++	addiu	$20, $20, 4		/* increment dest address */
++
++_epout1_rx_state1:
++	beqz	$6, _epout1_rx_state2
++	nop
++
++_epout1_fifo_read_byte:
++	lbu	$9, 0x24($27)		/* read FIFO */
++	sb	$9, 0($20)		/* store to dest address */
++	sub	$6, $6, 1		/* decrement counter */
++	bnez	$6, _epout1_fifo_read_byte
++	addiu	$20, $20, 1		/* increment dest address */
++
++_epout1_rx_state2:
++	sb	$0, 0x16($27)		/* clear OUTPKTRDY */
++
++check_status_next:
++	b	usb_command_loop
++	nop
++
++/* Device/Configuration/Interface/Endpoint/String Descriptors */
++
++	.align	2
++device_desc:
++	.byte	0x12		/* bLength */
++	.byte	0x01		/* bDescriptorType */
++	.byte	0x00		/* bcdUSB */
++	.byte	0x02		/* bcdUSB */
++	.byte	0x00		/* bDeviceClass */
++	.byte	0x00		/* bDeviceSubClass */
++	.byte	0x00		/* bDeviceProtocol */
++	.byte	0x40		/* bMaxPacketSize0 */
++	.byte	0x1a		/* idVendor */
++	.byte	0x60		/* idVendor */
++	.byte	0x40		/* idProduct */
++	.byte	0x47		/* idProduct */
++	.byte	0x00		/* bcdDevice */
++	.byte	0x01		/* bcdDevice */
++	.byte	0x01		/* iManufacturer */
++	.byte	0x02		/* iProduct */
++	.byte	0x00		/* iSerialNumber */
++	.byte	0x01		/* bNumConfigurations */
++
++	.align	2
++dev_qualifier:
++	.byte	0x0a		/* bLength */
++	.byte	0x06		/* bDescriptorType */
++	.byte	0x00		/* bcdUSB */
++	.byte	0x02		/* bcdUSB */
++	.byte	0x00		/* bDeviceClass */
++	.byte	0x00		/* bDeviceSubClass */
++	.byte	0x00		/* bDeviceProtocol */
++	.byte	0x40		/* bMaxPacketSize0 */
++	.byte	0x01		/* bNumConfigurations */
++	.byte	0x00		/* bRESERVED */
++
++	.align	2
++config_desc_hs:
++	.byte	0x09		/* bLength */
++	.byte	0x02		/* bDescriptorType */
++	.byte	0x20		/* wTotalLength */
++	.byte	0x00		/* wTotalLength */
++	.byte	0x01		/* bNumInterfaces */
++	.byte	0x01		/* bConfigurationValue */
++	.byte	0x00		/* iConfiguration */
++	.byte	0xc0		/* bmAttributes */
++	.byte	0x01		/* MaxPower */
++intf_desc_hs:
++	.byte	0x09		/* bLength */
++	.byte	0x04		/* bDescriptorType */
++	.byte	0x00		/* bInterfaceNumber */
++	.byte	0x00		/* bAlternateSetting */
++	.byte	0x02		/* bNumEndpoints */
++	.byte	0xff		/* bInterfaceClass */
++	.byte	0x00		/* bInterfaceSubClass */
++	.byte	0x50		/* bInterfaceProtocol */
++	.byte	0x00		/* iInterface */
++ep1_desc_hs:
++	.byte	0x07		/* bLength */
++	.byte	0x05		/* bDescriptorType */
++	.byte	0x01		/* bEndpointAddress */
++	.byte	0x02		/* bmAttributes */
++	.byte	0x00		/* wMaxPacketSize */
++	.byte	0x02		/* wMaxPacketSize */
++	.byte	0x00		/* bInterval */
++ep2_desc_hs:
++	.byte	0x07		/* bLength */
++	.byte	0x05		/* bDescriptorType */
++	.byte	0x81		/* bEndpointAddress */
++	.byte	0x02		/* bmAttributes */
++	.byte	0x00		/* wMaxPacketSize */
++	.byte	0x02		/* wMaxPacketSize */
++	.byte	0x00		/* bInterval */
++
++	.align	2
++config_desc_fs:
++	.byte	0x09		/* bLength */
++	.byte	0x02		/* bDescriptorType */
++	.byte	0x20		/* wTotalLength */
++	.byte	0x00		/* wTotalLength */
++	.byte	0x01		/* bNumInterfaces */
++	.byte	0x01		/* bConfigurationValue */
++	.byte	0x00		/* iConfiguration */
++	.byte	0xc0		/* bmAttributes */
++	.byte	0x01		/* MaxPower */
++intf_desc_fs:
++	.byte	0x09		/* bLength */
++	.byte	0x04		/* bDescriptorType */
++	.byte	0x00		/* bInterfaceNumber */
++	.byte	0x00		/* bAlternateSetting */
++	.byte	0x02		/* bNumEndpoints */
++	.byte	0xff		/* bInterfaceClass */
++	.byte	0x00		/* bInterfaceSubClass */
++	.byte	0x50		/* bInterfaceProtocol */
++	.byte	0x00		/* iInterface */
++ep1_desc_fs:
++	.byte	0x07		/* bLength */
++	.byte	0x05		/* bDescriptorType */
++	.byte	0x01		/* bEndpointAddress */
++	.byte	0x02		/* bmAttributes */
++	.byte	0x40		/* wMaxPacketSize */
++	.byte	0x00		/* wMaxPacketSize */
++	.byte	0x00		/* bInterval */
++ep2_desc_fs:
++	.byte	0x07		/* bLength */
++	.byte	0x05		/* bDescriptorType */
++	.byte	0x81		/* bEndpointAddress */
++	.byte	0x02		/* bmAttributes */
++	.byte	0x40		/* wMaxPacketSize */
++	.byte	0x00		/* wMaxPacketSize */
++	.byte	0x00		/* bInterval */
++
++	.align	2
++string_lang_ids:
++	.byte	0x04
++	.byte	0x03
++	.byte	0x09
++	.byte	0x04
++
++	.align	2
++string_manufacture:
++	.byte	0x10
++	.byte	0x03
++	.byte	0x49
++	.byte	0x00
++	.byte	0x6e
++	.byte	0x00
++	.byte	0x67
++	.byte	0x00
++	.byte	0x65
++	.byte	0x00
++	.byte	0x6e
++	.byte	0x00
++	.byte	0x69
++	.byte	0x00
++	.byte	0x63
++	.byte	0x00
++
++	.align	2
++string_product:
++	.byte	0x2e
++	.byte	0x03
++	.byte	0x4a
++	.byte	0x00
++	.byte	0x5a
++	.byte	0x00
++	.byte	0x34
++	.byte	0x00
++	.byte	0x37
++	.byte	0x00
++	.byte	0x34
++	.byte	0x00
++	.byte	0x30
++	.byte	0x00
++	.byte	0x20
++	.byte	0x00
++	.byte	0x55
++	.byte	0x00
++	.byte	0x53
++	.byte	0x00
++	.byte	0x42
++	.byte	0x00
++	.byte	0x20
++	.byte	0x00
++	.byte	0x42
++	.byte	0x00
++	.byte	0x6f
++	.byte	0x00
++	.byte	0x6f
++	.byte	0x00
++	.byte	0x74
++	.byte	0x00
++	.byte	0x20
++	.byte	0x00
++	.byte	0x44
++	.byte	0x00
++	.byte	0x65
++	.byte	0x00
++	.byte	0x76
++	.byte	0x00
++	.byte	0x69
++	.byte	0x00
++	.byte	0x63
++	.byte	0x00
++	.byte	0x65
++	.byte	0x00
++
++	.align	2
++cpu_info_data:
++	.byte	0x4a
++	.byte	0x5a
++	.byte	0x34
++	.byte	0x37
++	.byte	0x34
++	.byte	0x30
++	.byte	0x56
++	.byte	0x31
++usbboot_end:
++
++    .set reorder
+-- 
+1.7.9.5
+
diff --git a/trunk/package/boot/uboot-xburst/patches/0003-add-mmc-support.patch b/trunk/package/boot/uboot-xburst/patches/0003-add-mmc-support.patch
new file mode 100644
index 00000000..e9baa7c3
--- /dev/null
+++ b/trunk/package/boot/uboot-xburst/patches/0003-add-mmc-support.patch
@@ -0,0 +1,1664 @@
+From bd36739e77669e8df45c38f6acfe2cea511534d9 Mon Sep 17 00:00:00 2001
+From: Xiangfu <xiangfu@openmobilefree.net>
+Date: Wed, 10 Oct 2012 18:19:41 +0800
+Subject: [PATCH 3/6] add mmc support
+
+---
+ arch/mips/include/asm/jz4740.h |  166 ++++++
+ board/qi/qi_lb60/qi_lb60.c     |    9 +-
+ drivers/mmc/Makefile           |    1 +
+ drivers/mmc/jz_mmc.c           | 1179 ++++++++++++++++++++++++++++++++++++++++
+ drivers/mmc/jz_mmc.h           |  176 ++++++
+ include/configs/qi_lb60.h      |    9 +
+ include/mmc.h                  |   40 ++
+ 7 files changed, 1578 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/mmc/jz_mmc.c
+ create mode 100644 drivers/mmc/jz_mmc.h
+
+diff --git a/arch/mips/include/asm/jz4740.h b/arch/mips/include/asm/jz4740.h
+index 7a7cfff..68287fb 100644
+--- a/arch/mips/include/asm/jz4740.h
++++ b/arch/mips/include/asm/jz4740.h
+@@ -1146,5 +1146,171 @@ extern void sdram_init(void);
+ extern void calc_clocks(void);
+ extern void rtc_init(void);
+ 
++/*************************************************************************
++ * MSC
++ *************************************************************************/
++#define REG8(addr)	*((volatile u8 *)(addr))
++#define REG16(addr)	*((volatile u16 *)(addr))
++#define REG32(addr)	*((volatile u32 *)(addr))
++
++#define	CPM_BASE	0xB0000000
++#define CPM_CPCCR	(CPM_BASE+0x00)
++#define CPM_MSCCDR	(CPM_BASE+0x68)
++#define REG_CPM_MSCCDR	REG32(CPM_MSCCDR)
++#define REG_CPM_CPCCR	REG32(CPM_CPCCR)
++
++#define	MSC_BASE	0xB0021000
++
++#define	MSC_STRPCL		(MSC_BASE + 0x000)
++#define	MSC_STAT		(MSC_BASE + 0x004)
++#define	MSC_CLKRT		(MSC_BASE + 0x008)
++#define	MSC_CMDAT		(MSC_BASE + 0x00C)
++#define	MSC_RESTO		(MSC_BASE + 0x010)
++#define	MSC_RDTO		(MSC_BASE + 0x014)
++#define	MSC_BLKLEN		(MSC_BASE + 0x018)
++#define	MSC_NOB			(MSC_BASE + 0x01C)
++#define	MSC_SNOB		(MSC_BASE + 0x020)
++#define	MSC_IMASK		(MSC_BASE + 0x024)
++#define	MSC_IREG		(MSC_BASE + 0x028)
++#define	MSC_CMD			(MSC_BASE + 0x02C)
++#define	MSC_ARG			(MSC_BASE + 0x030)
++#define	MSC_RES			(MSC_BASE + 0x034)
++#define	MSC_RXFIFO		(MSC_BASE + 0x038)
++#define	MSC_TXFIFO		(MSC_BASE + 0x03C)
++
++#define	REG_MSC_STRPCL		REG16(MSC_STRPCL)
++#define	REG_MSC_STAT		REG32(MSC_STAT)
++#define	REG_MSC_CLKRT		REG16(MSC_CLKRT)
++#define	REG_MSC_CMDAT		REG32(MSC_CMDAT)
++#define	REG_MSC_RESTO		REG16(MSC_RESTO)
++#define	REG_MSC_RDTO		REG16(MSC_RDTO)
++#define	REG_MSC_BLKLEN		REG16(MSC_BLKLEN)
++#define	REG_MSC_NOB		REG16(MSC_NOB)
++#define	REG_MSC_SNOB		REG16(MSC_SNOB)
++#define	REG_MSC_IMASK		REG16(MSC_IMASK)
++#define	REG_MSC_IREG		REG16(MSC_IREG)
++#define	REG_MSC_CMD		REG8(MSC_CMD)
++#define	REG_MSC_ARG		REG32(MSC_ARG)
++#define	REG_MSC_RES		REG16(MSC_RES)
++#define	REG_MSC_RXFIFO		REG32(MSC_RXFIFO)
++#define	REG_MSC_TXFIFO		REG32(MSC_TXFIFO)
++
++/* MSC Clock and Control Register (MSC_STRPCL) */
++
++#define MSC_STRPCL_EXIT_MULTIPLE	(1 << 7)
++#define MSC_STRPCL_EXIT_TRANSFER	(1 << 6)
++#define MSC_STRPCL_START_READWAIT	(1 << 5)
++#define MSC_STRPCL_STOP_READWAIT	(1 << 4)
++#define MSC_STRPCL_RESET		(1 << 3)
++#define MSC_STRPCL_START_OP		(1 << 2)
++#define MSC_STRPCL_CLOCK_CONTROL_BIT	0
++#define MSC_STRPCL_CLOCK_CONTROL_MASK	(0x3 << MSC_STRPCL_CLOCK_CONTROL_BIT)
++  #define MSC_STRPCL_CLOCK_CONTROL_STOP	  (0x1 << MSC_STRPCL_CLOCK_CONTROL_BIT) /* Stop MMC/SD clock */
++  #define MSC_STRPCL_CLOCK_CONTROL_START  (0x2 << MSC_STRPCL_CLOCK_CONTROL_BIT) /* Start MMC/SD clock */
++
++/* MSC Status Register (MSC_STAT) */
++
++#define MSC_STAT_IS_RESETTING		(1 << 15)
++#define MSC_STAT_SDIO_INT_ACTIVE	(1 << 14)
++#define MSC_STAT_PRG_DONE		(1 << 13)
++#define MSC_STAT_DATA_TRAN_DONE		(1 << 12)
++#define MSC_STAT_END_CMD_RES		(1 << 11)
++#define MSC_STAT_DATA_FIFO_AFULL	(1 << 10)
++#define MSC_STAT_IS_READWAIT		(1 << 9)
++#define MSC_STAT_CLK_EN			(1 << 8)
++#define MSC_STAT_DATA_FIFO_FULL		(1 << 7)
++#define MSC_STAT_DATA_FIFO_EMPTY	(1 << 6)
++#define MSC_STAT_CRC_RES_ERR		(1 << 5)
++#define MSC_STAT_CRC_READ_ERROR		(1 << 4)
++#define MSC_STAT_CRC_WRITE_ERROR_BIT	2
++#define MSC_STAT_CRC_WRITE_ERROR_MASK	(0x3 << MSC_STAT_CRC_WRITE_ERROR_BIT)
++  #define MSC_STAT_CRC_WRITE_ERROR_NO		(0 << MSC_STAT_CRC_WRITE_ERROR_BIT) /* No error on transmission of data */
++  #define MSC_STAT_CRC_WRITE_ERROR		(1 << MSC_STAT_CRC_WRITE_ERROR_BIT) /* Card observed erroneous transmission of data */
++  #define MSC_STAT_CRC_WRITE_ERROR_NOSTS	(2 << MSC_STAT_CRC_WRITE_ERROR_BIT) /* No CRC status is sent back */
++#define MSC_STAT_TIME_OUT_RES		(1 << 1)
++#define MSC_STAT_TIME_OUT_READ		(1 << 0)
++
++/* MSC Bus Clock Control Register (MSC_CLKRT) */
++
++#define	MSC_CLKRT_CLK_RATE_BIT		0
++#define	MSC_CLKRT_CLK_RATE_MASK		(0x7 << MSC_CLKRT_CLK_RATE_BIT)
++  #define MSC_CLKRT_CLK_RATE_DIV_1	  (0x0 << MSC_CLKRT_CLK_RATE_BIT) /* CLK_SRC */
++  #define MSC_CLKRT_CLK_RATE_DIV_2	  (0x1 << MSC_CLKRT_CLK_RATE_BIT) /* 1/2 of CLK_SRC */
++  #define MSC_CLKRT_CLK_RATE_DIV_4	  (0x2 << MSC_CLKRT_CLK_RATE_BIT) /* 1/4 of CLK_SRC */
++  #define MSC_CLKRT_CLK_RATE_DIV_8	  (0x3 << MSC_CLKRT_CLK_RATE_BIT) /* 1/8 of CLK_SRC */
++  #define MSC_CLKRT_CLK_RATE_DIV_16	  (0x4 << MSC_CLKRT_CLK_RATE_BIT) /* 1/16 of CLK_SRC */
++  #define MSC_CLKRT_CLK_RATE_DIV_32	  (0x5 << MSC_CLKRT_CLK_RATE_BIT) /* 1/32 of CLK_SRC */
++  #define MSC_CLKRT_CLK_RATE_DIV_64	  (0x6 << MSC_CLKRT_CLK_RATE_BIT) /* 1/64 of CLK_SRC */
++  #define MSC_CLKRT_CLK_RATE_DIV_128	  (0x7 << MSC_CLKRT_CLK_RATE_BIT) /* 1/128 of CLK_SRC */
++
++/* MSC Command Sequence Control Register (MSC_CMDAT) */
++
++#define	MSC_CMDAT_IO_ABORT	(1 << 11)
++#define	MSC_CMDAT_BUS_WIDTH_BIT	9
++#define	MSC_CMDAT_BUS_WIDTH_MASK (0x3 << MSC_CMDAT_BUS_WIDTH_BIT)
++#define MSC_CMDAT_BUS_WIDTH_1BIT (0x0 << MSC_CMDAT_BUS_WIDTH_BIT)
++#define MSC_CMDAT_BUS_WIDTH_4BIT (0x2 << MSC_CMDAT_BUS_WIDTH_BIT)
++#define	MSC_CMDAT_DMA_EN	(1 << 8)
++#define	MSC_CMDAT_INIT		(1 << 7)
++#define	MSC_CMDAT_BUSY		(1 << 6)
++#define	MSC_CMDAT_STREAM_BLOCK	(1 << 5)
++#define	MSC_CMDAT_WRITE		(1 << 4)
++#define	MSC_CMDAT_READ		(0 << 4)
++#define	MSC_CMDAT_DATA_EN	(1 << 3)
++#define	MSC_CMDAT_RESPONSE_BIT	0
++#define	MSC_CMDAT_RESPONSE_MASK	(0x7 << MSC_CMDAT_RESPONSE_BIT)
++#define MSC_CMDAT_RESPONSE_NONE	(0x0 << MSC_CMDAT_RESPONSE_BIT)
++#define MSC_CMDAT_RESPONSE_R1	(0x1 << MSC_CMDAT_RESPONSE_BIT)
++#define MSC_CMDAT_RESPONSE_R2	(0x2 << MSC_CMDAT_RESPONSE_BIT)
++#define MSC_CMDAT_RESPONSE_R3	(0x3 << MSC_CMDAT_RESPONSE_BIT)
++#define MSC_CMDAT_RESPONSE_R4	(0x4 << MSC_CMDAT_RESPONSE_BIT)
++#define MSC_CMDAT_RESPONSE_R5	(0x5 << MSC_CMDAT_RESPONSE_BIT)
++#define MSC_CMDAT_RESPONSE_R6	(0x6 << MSC_CMDAT_RESPONSE_BIT)
++
++/* MSC Interrupts Mask Register (MSC_IMASK) */
++#define	MSC_IMASK_SDIO			(1 << 7)
++#define	MSC_IMASK_TXFIFO_WR_REQ		(1 << 6)
++#define	MSC_IMASK_RXFIFO_RD_REQ		(1 << 5)
++#define	MSC_IMASK_END_CMD_RES		(1 << 2)
++#define	MSC_IMASK_PRG_DONE		(1 << 1)
++#define	MSC_IMASK_DATA_TRAN_DONE	(1 << 0)
++
++
++/* MSC Interrupts Status Register (MSC_IREG) */
++#define	MSC_IREG_SDIO			(1 << 7)
++#define	MSC_IREG_TXFIFO_WR_REQ		(1 << 6)
++#define	MSC_IREG_RXFIFO_RD_REQ		(1 << 5)
++#define	MSC_IREG_END_CMD_RES		(1 << 2)
++#define	MSC_IREG_PRG_DONE		(1 << 1)
++#define	MSC_IREG_DATA_TRAN_DONE		(1 << 0)
++
++static __inline__ unsigned int __cpm_get_pllout2(void)
++{
++	if (REG_CPM_CPCCR & CPM_CPCCR_PCS)
++		return __cpm_get_pllout();
++	else
++		return __cpm_get_pllout()/2;
++}
++
++static inline void __cpm_select_msc_clk(int sd)
++{
++	unsigned int pllout2 = __cpm_get_pllout2();
++	unsigned int div = 0;
++
++	if (sd) {
++		div = pllout2 / 24000000;
++	}
++	else {
++		div = pllout2 / 16000000;
++	}
++
++	REG_CPM_MSCCDR = div - 1;
++}
++#define __msc_reset() 						\
++do { 								\
++	REG_MSC_STRPCL = MSC_STRPCL_RESET;			\
++ 	while (REG_MSC_STAT & MSC_STAT_IS_RESETTING);		\
++} while (0)
++
+ #endif	/* !__ASSEMBLY__ */
+ #endif	/* __JZ4740_H__ */
+diff --git a/board/qi/qi_lb60/qi_lb60.c b/board/qi/qi_lb60/qi_lb60.c
+index 3bd4e2f..a2ba648 100644
+--- a/board/qi/qi_lb60/qi_lb60.c
++++ b/board/qi/qi_lb60/qi_lb60.c
+@@ -40,8 +40,13 @@ static void gpio_init(void)
+ 		__gpio_clear_pin(GPIO_KEYOUT_BASE + i);
+ 	}
+ 
+-	__gpio_as_input(GPIO_KEYIN_8);
+-	__gpio_enable_pull(GPIO_KEYIN_8);
++	if (__gpio_get_pin(GPIO_KEYIN_BASE + 2) == 0){
++		printf("[S] pressed, enable UART0\n");
++		__gpio_as_uart0();
++	} else {
++		__gpio_as_input(GPIO_KEYIN_8);
++		__gpio_enable_pull(GPIO_KEYIN_8);
++	}
+ 
+ 	/* enable the TP4, TP5 as UART0 */
+ 	__gpio_jtag_to_uart0();
+diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
+index 565ba6a..3c717b1 100644
+--- a/drivers/mmc/Makefile
++++ b/drivers/mmc/Makefile
+@@ -47,6 +47,7 @@ COBJS-$(CONFIG_SDHCI) += sdhci.o
+ COBJS-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o
+ COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o
+ COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
++COBJS-$(CONFIG_JZ4740_MMC) += jz_mmc.o
+ 
+ COBJS	:= $(COBJS-y)
+ SRCS	:= $(COBJS:.o=.c)
+diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c
+new file mode 100644
+index 0000000..642cecc
+--- /dev/null
++++ b/drivers/mmc/jz_mmc.c
+@@ -0,0 +1,1179 @@
++/*
++ * (C) Copyright 2003
++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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 <config.h>
++#include <common.h>
++#include <part.h>
++#include <mmc.h>
++
++#include <asm/io.h>
++#include <asm/jz4740.h>
++#include "jz_mmc.h"
++
++static int sd2_0 = 0;
++static int mmc_ready = 0;
++static int use_4bit;		/* Use 4-bit data bus */
++/*
++ *  MMC Events
++ */
++#define MMC_EVENT_NONE	        0x00	/* No events */
++#define MMC_EVENT_RX_DATA_DONE	0x01	/* Rx data done */
++#define MMC_EVENT_TX_DATA_DONE	0x02	/* Tx data done */
++#define MMC_EVENT_PROG_DONE	0x04	/* Programming is done */
++
++
++#define MMC_IRQ_MASK()				\
++do {						\
++      	REG_MSC_IMASK = 0xffff;			\
++      	REG_MSC_IREG = 0xffff;			\
++} while (0)
++
++/*
++ * GPIO definition
++ */
++#if defined(CONFIG_SAKC)
++
++#define __msc_init_io()				\
++do {						\
++	__gpio_as_input(GPIO_SD_CD_N);		\
++} while (0)
++
++#else
++#define __msc_init_io()				\
++do {						\
++	__gpio_as_output(GPIO_SD_VCC_EN_N);	\
++	__gpio_as_input(GPIO_SD_CD_N);		\
++} while (0)
++
++#define __msc_enable_power()			\
++do {						\
++	__gpio_clear_pin(GPIO_SD_VCC_EN_N);	\
++} while (0)
++
++#define __msc_disable_power()			\
++do {						\
++	__gpio_set_pin(GPIO_SD_VCC_EN_N);	\
++} while (0)
++	
++#endif /* CONFIG_SAKE */
++
++#define __msc_card_detected()			\
++({						\
++	int detected = 1;			\
++	__gpio_as_input(GPIO_SD_CD_N);		\
++	__gpio_disable_pull(GPIO_SD_CD_N);	\
++	if (!__gpio_get_pin(GPIO_SD_CD_N))	\
++		detected = 0;			\
++	detected;				\
++})
++
++/*
++ * Local functions
++ */
++
++extern int
++fat_register_device(block_dev_desc_t *dev_desc, int part_no);
++
++static block_dev_desc_t mmc_dev;
++
++block_dev_desc_t * mmc_get_dev(int dev)
++{
++	return ((block_dev_desc_t *)&mmc_dev);
++}
++
++/* Stop the MMC clock and wait while it happens */
++static inline int jz_mmc_stop_clock(void)
++{
++	int timeout = 1000;
++
++	REG_MSC_STRPCL = MSC_STRPCL_CLOCK_CONTROL_STOP;
++
++	while (timeout && (REG_MSC_STAT & MSC_STAT_CLK_EN)) {
++		timeout--;
++		if (timeout == 0)
++			return MMC_ERROR_TIMEOUT;
++		udelay(1);
++	}
++        return MMC_NO_ERROR;
++}
++
++/* Start the MMC clock and operation */
++static inline int jz_mmc_start_clock(void)
++{
++	REG_MSC_STRPCL = MSC_STRPCL_CLOCK_CONTROL_START | MSC_STRPCL_START_OP;
++	return MMC_NO_ERROR;
++}
++
++static inline u32 jz_mmc_calc_clkrt(int is_sd, u32 rate)
++{
++	u32 clkrt = 0;
++	u32 clk_src = is_sd ? 24000000 : 16000000;
++
++  	while (rate < clk_src) {
++      		clkrt ++;
++      		clk_src >>= 1;
++    	}
++
++	return clkrt;
++}
++
++/* Set the MMC clock frequency */
++void jz_mmc_set_clock(int sd, u32 rate)
++{
++	jz_mmc_stop_clock();
++
++	/* Select clock source of MSC */
++	__cpm_select_msc_clk(sd);
++
++	/* Set clock dividor of MSC */
++	REG_MSC_CLKRT = jz_mmc_calc_clkrt(sd, rate);
++}
++
++static int jz_mmc_check_status(struct mmc_request *request)
++{
++	u32 status = REG_MSC_STAT;
++
++	/* Checking for response or data timeout */
++	if (status & (MSC_STAT_TIME_OUT_RES | MSC_STAT_TIME_OUT_READ)) {
++		printf("MMC/SD timeout, MMC_STAT 0x%x CMD %d\n", status, request->cmd);
++		return MMC_ERROR_TIMEOUT;
++	}
++
++	/* Checking for CRC error */
++	if (status & (MSC_STAT_CRC_READ_ERROR | MSC_STAT_CRC_WRITE_ERROR | MSC_STAT_CRC_RES_ERR)) {
++		printf("MMC/CD CRC error, MMC_STAT 0x%x\n", status);
++		return MMC_ERROR_CRC;
++	}
++
++	return MMC_NO_ERROR;
++}
++
++/* Obtain response to the command and store it to response buffer */
++static void jz_mmc_get_response(struct mmc_request *request)
++{
++	int i;
++	u8 *buf;
++	u32 data;
++
++	debug("fetch response for request %d, cmd %d\n", 
++	      request->rtype, request->cmd);
++
++	buf = request->response;
++	request->result = MMC_NO_ERROR;
++
++	switch (request->rtype) {
++	case RESPONSE_R1: case RESPONSE_R1B: case RESPONSE_R6:
++	case RESPONSE_R3: case RESPONSE_R4: case RESPONSE_R5:
++	{
++		data = REG_MSC_RES;
++		buf[0] = (data >> 8) & 0xff;
++		buf[1] = data & 0xff;
++		data = REG_MSC_RES;
++		buf[2] = (data >> 8) & 0xff;
++		buf[3] = data & 0xff;
++		data = REG_MSC_RES;
++		buf[4] = data & 0xff;
++
++		debug("request %d, response [%02x %02x %02x %02x %02x]\n",
++		      request->rtype, buf[0], buf[1], buf[2], buf[3], buf[4]);
++		break;
++	}
++	case RESPONSE_R2_CID: case RESPONSE_R2_CSD:
++	{
++		for (i = 0; i < 16; i += 2) {
++			data = REG_MSC_RES;
++			buf[i] = (data >> 8) & 0xff;
++			buf[i+1] = data & 0xff;
++		}
++		debug("request %d, response [", request->rtype);
++#if CONFIG_MMC_DEBUG_VERBOSE > 2
++		if (g_mmc_debug >= 3) {
++			int n;
++			for (n = 0; n < 17; n++)
++				printk("%02x ", buf[n]);
++			printk("]\n");
++		}
++#endif
++		break;
++	}
++	case RESPONSE_NONE:
++		debug("No response\n");
++		break;
++
++	default:
++		debug("unhandled response type for request %d\n", request->rtype);
++		break;
++	}
++}
++
++static int jz_mmc_receive_data(struct mmc_request *req)
++{
++	u32  stat, timeout, data, cnt;
++	u8 *buf = req->buffer;
++	u32 wblocklen = (u32)(req->block_len + 3) >> 2; /* length in word */
++
++	timeout = 0x3ffffff;
++
++	while (timeout) {
++		timeout--;
++		stat = REG_MSC_STAT;
++
++		if (stat & MSC_STAT_TIME_OUT_READ)
++			return MMC_ERROR_TIMEOUT;
++		else if (stat & MSC_STAT_CRC_READ_ERROR)
++			return MMC_ERROR_CRC;
++		else if (!(stat & MSC_STAT_DATA_FIFO_EMPTY)
++			 || (stat & MSC_STAT_DATA_FIFO_AFULL)) {
++			/* Ready to read data */
++			break;
++		}
++		udelay(1);
++	}
++	if (!timeout)
++		return MMC_ERROR_TIMEOUT;
++
++	/* Read data from RXFIFO. It could be FULL or PARTIAL FULL */
++	cnt = wblocklen;
++	while (cnt) {
++		data = REG_MSC_RXFIFO;
++		{
++			*buf++ = (u8)(data >> 0);
++			*buf++ = (u8)(data >> 8);
++			*buf++ = (u8)(data >> 16);
++			*buf++ = (u8)(data >> 24);
++		}
++		cnt --;
++		while (cnt && (REG_MSC_STAT & MSC_STAT_DATA_FIFO_EMPTY))
++			;
++	}
++	return MMC_NO_ERROR;
++}
++
++static int jz_mmc_transmit_data(struct mmc_request *req)
++{
++#if 0
++	u32 nob = req->nob;
++	u32 wblocklen = (u32)(req->block_len + 3) >> 2; /* length in word */
++	u8 *buf = req->buffer;
++	u32 *wbuf = (u32 *)buf;
++	u32 waligned = (((u32)buf & 0x3) == 0); /* word aligned ? */
++	u32 stat, timeout, data, cnt;
++
++	for (nob; nob >= 1; nob--) {
++		timeout = 0x3FFFFFF;
++
++		while (timeout) {
++			timeout--;
++			stat = REG_MSC_STAT;
++
++			if (stat & (MSC_STAT_CRC_WRITE_ERROR | MSC_STAT_CRC_WRITE_ERROR_NOSTS))
++				return MMC_ERROR_CRC;
++			else if (!(stat & MSC_STAT_DATA_FIFO_FULL)) {
++				/* Ready to write data */
++				break;
++			}
++
++			udelay(1);
++		}
++
++		if (!timeout)
++			return MMC_ERROR_TIMEOUT;
++
++		/* Write data to TXFIFO */
++		cnt = wblocklen;
++		while (cnt) {
++			while (REG_MSC_STAT & MSC_STAT_DATA_FIFO_FULL)
++				;
++
++			if (waligned) {
++				REG_MSC_TXFIFO = *wbuf++;
++			}
++			else {
++				data = *buf++ | (*buf++ << 8) | (*buf++ << 16) | (*buf++ << 24);
++				REG_MSC_TXFIFO = data;
++			}
++
++			cnt--;
++		}
++	}
++#endif
++	return MMC_NO_ERROR;
++}
++
++
++/*
++ * Name:	  int jz_mmc_exec_cmd()
++ * Function:      send command to the card, and get a response
++ * Input:	  struct mmc_request *req	: MMC/SD request
++ * Output:	  0:  right		>0:  error code
++ */
++int jz_mmc_exec_cmd(struct mmc_request *request)
++{
++	u32 cmdat = 0, events = 0;
++	int retval, timeout = 0x3fffff;
++
++	/* Indicate we have no result yet */
++	request->result = MMC_NO_RESPONSE;
++	if (request->cmd == MMC_CIM_RESET) {
++		/* On reset, 1-bit bus width */
++		use_4bit = 0;
++
++		/* Reset MMC/SD controller */
++		__msc_reset();
++
++		/* On reset, drop MMC clock down */
++		jz_mmc_set_clock(0, MMC_CLOCK_SLOW);
++
++		/* On reset, stop MMC clock */
++		jz_mmc_stop_clock();
++	}
++	if (request->cmd == MMC_CMD_SEND_OP_COND) {
++		debug("Have an MMC card\n");
++		/* always use 1bit for MMC */
++		use_4bit = 0;
++	}
++	if (request->cmd == SET_BUS_WIDTH) {
++		if (request->arg == 0x2) {
++			printf("Use 4-bit bus width\n");
++			use_4bit = 1;
++		} else {
++			printf("Use 1-bit bus width\n");
++			use_4bit = 0;
++		}
++	}
++
++	/* stop clock */
++	jz_mmc_stop_clock();
++
++	/* mask all interrupts */
++	REG_MSC_IMASK = 0xffff;
++
++	/* clear status */
++	REG_MSC_IREG = 0xffff;
++
++	/* use 4-bit bus width when possible */
++	if (use_4bit)
++		cmdat |= MSC_CMDAT_BUS_WIDTH_4BIT;
++
++        /* Set command type and events */
++	switch (request->cmd) {
++	/* MMC core extra command */
++	case MMC_CIM_RESET:
++		cmdat |= MSC_CMDAT_INIT; /* Initialization sequence sent prior to command */
++		break;
++
++	/* bc - broadcast - no response */
++	case MMC_CMD_GO_IDLE_STATE:
++	case MMC_CMD_SET_DSR:
++		break;
++
++	/* bcr - broadcast with response */
++	case MMC_CMD_SEND_OP_COND:
++	case MMC_CMD_ALL_SEND_CID:
++	case MMC_GO_IRQ_STATE:
++		break;
++
++	/* adtc - addressed with data transfer */
++	case MMC_READ_DAT_UNTIL_STOP:
++	case MMC_CMD_READ_SINGLE_BLOCK:
++	case MMC_CMD_READ_MULTIPLE_BLOCK:
++	case SD_CMD_APP_SEND_SCR:
++		cmdat |= MSC_CMDAT_DATA_EN | MSC_CMDAT_READ;
++		events = MMC_EVENT_RX_DATA_DONE;
++		break;
++
++	case MMC_WRITE_DAT_UNTIL_STOP:
++	case MMC_CMD_WRITE_SINGLE_BLOCK:
++	case MMC_CMD_WRITE_MULTIPLE_BLOCK:
++	case MMC_PROGRAM_CID:
++	case MMC_PROGRAM_CSD:
++	case MMC_SEND_WRITE_PROT:
++	case MMC_GEN_CMD:
++	case MMC_LOCK_UNLOCK:
++		cmdat |= MSC_CMDAT_DATA_EN | MSC_CMDAT_WRITE;
++		events = MMC_EVENT_TX_DATA_DONE | MMC_EVENT_PROG_DONE;
++
++		break;
++
++	case MMC_CMD_STOP_TRANSMISSION:
++		events = MMC_EVENT_PROG_DONE;
++		break;
++
++	/* ac - no data transfer */
++	default:
++		break;
++	}
++
++	/* Set response type */
++	switch (request->rtype) {
++	case RESPONSE_NONE:
++		break;
++
++	case RESPONSE_R1B:
++		cmdat |= MSC_CMDAT_BUSY;
++		/*FALLTHRU*/
++	case RESPONSE_R1:
++		cmdat |= MSC_CMDAT_RESPONSE_R1;
++		break;
++	case RESPONSE_R2_CID:
++	case RESPONSE_R2_CSD:
++		cmdat |= MSC_CMDAT_RESPONSE_R2;
++		break;
++	case RESPONSE_R3:
++		cmdat |= MSC_CMDAT_RESPONSE_R3;
++		break;
++	case RESPONSE_R4:
++		cmdat |= MSC_CMDAT_RESPONSE_R4;
++		break;
++	case RESPONSE_R5:
++		cmdat |= MSC_CMDAT_RESPONSE_R5;
++		break;
++	case RESPONSE_R6:
++		cmdat |= MSC_CMDAT_RESPONSE_R6;
++		break;
++	default:
++		break;
++	}
++
++	/* Set command index */
++	if (request->cmd == MMC_CIM_RESET) {
++		REG_MSC_CMD = MMC_CMD_GO_IDLE_STATE;
++	} else {
++		REG_MSC_CMD = request->cmd;
++	}
++
++        /* Set argument */
++	REG_MSC_ARG = request->arg;
++
++	/* Set block length and nob */
++	if (request->cmd == SD_CMD_APP_SEND_SCR) { /* get SCR from DataFIFO */
++		REG_MSC_BLKLEN = 8;
++		REG_MSC_NOB = 1;
++	} else {
++		REG_MSC_BLKLEN = request->block_len;
++		REG_MSC_NOB = request->nob;
++	}
++
++	/* Set command */
++	REG_MSC_CMDAT = cmdat;
++
++	debug("Send cmd %d cmdat: %x arg: %x resp %d\n", request->cmd,
++	      cmdat, request->arg, request->rtype);
++
++        /* Start MMC/SD clock and send command to card */
++	jz_mmc_start_clock();
++
++	/* Wait for command completion */
++	while (timeout-- && !(REG_MSC_STAT & MSC_STAT_END_CMD_RES))
++		;
++
++	if (timeout == 0)
++		return MMC_ERROR_TIMEOUT;
++
++	REG_MSC_IREG = MSC_IREG_END_CMD_RES; /* clear flag */
++
++	/* Check for status */
++	retval = jz_mmc_check_status(request);
++	if (retval) {
++		return retval;
++	}
++
++	/* Complete command with no response */
++	if (request->rtype == RESPONSE_NONE) {
++		return MMC_NO_ERROR;
++	}
++
++	/* Get response */
++	jz_mmc_get_response(request);
++
++	/* Start data operation */
++	if (events & (MMC_EVENT_RX_DATA_DONE | MMC_EVENT_TX_DATA_DONE)) {
++		if (events & MMC_EVENT_RX_DATA_DONE) {
++			if (request->cmd == SD_CMD_APP_SEND_SCR) {
++				/* SD card returns SCR register as data.
++				   MMC core expect it in the response buffer,
++				   after normal response. */
++				request->buffer = (u8 *)((u32)request->response + 5);
++			}
++			jz_mmc_receive_data(request);
++		}
++
++		if (events & MMC_EVENT_TX_DATA_DONE) {
++			jz_mmc_transmit_data(request);
++		}
++
++		/* Wait for Data Done */
++		while (!(REG_MSC_IREG & MSC_IREG_DATA_TRAN_DONE))
++			;
++		REG_MSC_IREG = MSC_IREG_DATA_TRAN_DONE; /* clear status */
++	}
++
++	/* Wait for Prog Done event */
++	if (events & MMC_EVENT_PROG_DONE) {
++		while (!(REG_MSC_IREG & MSC_IREG_PRG_DONE))
++			;
++		REG_MSC_IREG = MSC_IREG_PRG_DONE; /* clear status */
++	}
++
++	/* Command completed */
++
++	return MMC_NO_ERROR;			 /* return successfully */
++}
++
++int mmc_block_read(u8 *dst, ulong src, ulong len)
++{
++
++	struct mmc_request request;
++	struct mmc_response_r1 r1;
++	int retval = 0;
++
++	if (len == 0)
++		goto exit;
++
++	mmc_simple_cmd(&request, MMC_CMD_SEND_STATUS, mmcinfo.rca, RESPONSE_R1);
++	retval = mmc_unpack_r1(&request, &r1, 0);
++	if (retval && (retval != MMC_ERROR_STATE_MISMATCH))
++		goto exit;
++
++	mmc_simple_cmd(&request, MMC_CMD_SET_BLOCKLEN, len, RESPONSE_R1);
++	if (retval = mmc_unpack_r1(&request, &r1, 0))
++		goto exit;
++
++	if (!sd2_0)
++		src *= mmcinfo.block_len;
++
++	mmc_send_cmd(&request, MMC_CMD_READ_SINGLE_BLOCK, src, 1, len, RESPONSE_R1, dst);
++	if (retval = mmc_unpack_r1(&request, &r1, 0))
++		goto exit;
++
++exit:
++	return retval;
++}
++
++ulong mmc_bread(int dev_num, ulong blkstart, ulong blkcnt, ulong *dst)
++{
++	if (!mmc_ready) {
++		printf("Please initial the MMC first\n");
++		return -1;
++	}
++
++	int i = 0;
++	ulong dst_tmp = dst;
++ 
++	for (i = 0; i < blkcnt; i++) {
++		if ((mmc_block_read((uchar *)(dst_tmp), blkstart, mmcinfo.block_len)) < 0)
++			return -1;
++
++		dst_tmp += mmcinfo.block_len;
++		blkstart++;
++	}
++ 
++	return i;
++}
++
++int mmc_select_card(void)
++{
++	struct mmc_request request;
++	struct mmc_response_r1 r1;
++	int retval;
++
++	mmc_simple_cmd(&request, MMC_CMD_SELECT_CARD, mmcinfo.rca, RESPONSE_R1B);
++	retval = mmc_unpack_r1(&request, &r1, 0);
++	if (retval) {
++		return retval;
++	}
++
++	if (mmcinfo.sd) {
++		mmc_simple_cmd(&request, MMC_CMD_APP_CMD,  mmcinfo.rca, RESPONSE_R1);
++		retval = mmc_unpack_r1(&request,&r1,0);
++		if (retval) {
++			return retval;
++		}
++#if defined(MMC_BUS_WIDTH_1BIT)		
++		mmc_simple_cmd(&request, SET_BUS_WIDTH, 1, RESPONSE_R1);
++#else
++		mmc_simple_cmd(&request, SET_BUS_WIDTH, 2, RESPONSE_R1);
++#endif
++                retval = mmc_unpack_r1(&request,&r1,0);
++                if (retval) {
++			return retval;
++		}
++	}
++	return 0;
++}
++
++/*
++ * Configure card
++ */
++static void mmc_configure_card(void)
++{
++	u32 rate;
++
++	/* Get card info */
++	if (sd2_0)
++		mmcinfo.block_num = (mmcinfo.csd.c_size + 1) << 10;
++	else
++		mmcinfo.block_num = (mmcinfo.csd.c_size + 1) * (1 << (mmcinfo.csd.c_size_mult + 2));
++
++	mmcinfo.block_len = 1 << mmcinfo.csd.read_bl_len;
++
++	mmc_dev.if_type = IF_TYPE_SD;
++	mmc_dev.part_type = PART_TYPE_DOS;
++	mmc_dev.dev = 0;
++	mmc_dev.lun = 0;
++	mmc_dev.type = 0;
++	mmc_dev.blksz = mmcinfo.block_len;
++	mmc_dev.lba = mmcinfo.block_num;
++	mmc_dev.removable = 0;
++
++	printf("%s Detected: %lu blocks of %lu bytes\n",
++	       sd2_0 == 1 ? "SDHC" : "SD",
++	       mmc_dev.lba,
++	       mmc_dev.blksz);
++
++	/* Fix the clock rate */
++	rate = mmc_tran_speed(mmcinfo.csd.tran_speed);
++	if (rate < MMC_CLOCK_SLOW)
++		rate = MMC_CLOCK_SLOW;
++	if ((mmcinfo.sd == 0) && (rate > MMC_CLOCK_FAST))
++		rate = MMC_CLOCK_FAST;
++        if ((mmcinfo.sd) && (rate > SD_CLOCK_FAST))
++		rate = SD_CLOCK_FAST;
++
++	debug("%s: block_len=%d block_num=%d rate=%d\n", 
++	      __func__, mmcinfo.block_len, mmcinfo.block_num, rate);
++
++	jz_mmc_set_clock(mmcinfo.sd, rate);
++}
++
++/*
++ * State machine routines to initialize card(s)
++ */
++
++/*
++  CIM_SINGLE_CARD_ACQ  (frequency at 400 kHz)
++  --- Must enter from GO_IDLE_STATE ---
++  1. SD_SEND_OP_COND (SD Card) [CMD55] + [CMD41]
++  2. SEND_OP_COND (Full Range) [CMD1]   {optional}
++  3. SEND_OP_COND (Set Range ) [CMD1]
++     If busy, delay and repeat step 2
++  4. ALL_SEND_CID              [CMD2]
++     If timeout, set an error (no cards found)
++  5. SET_RELATIVE_ADDR         [CMD3]
++  6. SEND_CSD                  [CMD9]
++  7. SET_DSR                   [CMD4]    Only call this if (csd.dsr_imp).
++  8. Set clock frequency (check available in csd.tran_speed)
++ */
++
++#define MMC_INIT_DOING   0
++#define MMC_INIT_PASSED  1
++#define MMC_INIT_FAILED  2
++
++static int mmc_init_card_state(struct mmc_request *request)
++{
++	struct mmc_response_r1 r1;
++	struct mmc_response_r3 r3;
++	int retval;
++	int ocr = 0x40300000;
++	int limit_41 = 0;
++
++	switch (request->cmd) {
++	case MMC_CMD_GO_IDLE_STATE: /* No response to parse */
++		if (mmcinfo.sd)
++			mmc_simple_cmd(request, 8, 0x1aa, RESPONSE_R1);
++		else
++			mmc_simple_cmd(request, MMC_CMD_SEND_OP_COND, MMC_OCR_ARG, RESPONSE_R3);
++		break;
++
++	case 8:
++        	retval = mmc_unpack_r1(request,&r1,mmcinfo.state);
++		mmc_simple_cmd(request, MMC_CMD_APP_CMD,  0, RESPONSE_R1);
++		break;
++
++        case MMC_CMD_APP_CMD:
++        	retval = mmc_unpack_r1(request,&r1,mmcinfo.state);
++		if (retval & (limit_41 < 100)) {
++			debug("%s: unable to MMC_APP_CMD error=%d (%s)\n", 
++			      __func__, retval, mmc_result_to_string(retval));
++			limit_41++;
++			mmc_simple_cmd(request, SD_CMD_APP_SEND_OP_COND, ocr, RESPONSE_R3);
++		} else if (limit_41 < 100) {
++			limit_41++;
++			mmc_simple_cmd(request, SD_CMD_APP_SEND_OP_COND, ocr, RESPONSE_R3);
++		} else{
++			/* reset the card to idle*/
++			mmc_simple_cmd(request, MMC_CMD_GO_IDLE_STATE, 0, RESPONSE_NONE);
++			mmcinfo.sd = 0;
++		}
++		break;
++
++        case SD_CMD_APP_SEND_OP_COND:
++                retval = mmc_unpack_r3(request, &r3);
++                if (retval) {
++			debug("%s: try MMC card\n", __func__);
++			mmc_simple_cmd(request, SD_CMD_APP_SEND_OP_COND, MMC_OCR_ARG, RESPONSE_R3);
++			break;
++		}
++
++                debug("%s: read ocr value = 0x%08x\n", __func__, r3.ocr);
++
++		if(!(r3.ocr & MMC_CARD_BUSY || ocr == 0)){
++			udelay(50000);
++			mmc_simple_cmd(request, MMC_CMD_APP_CMD, 0, RESPONSE_R1);
++		} else {
++			mmcinfo.sd = 1; /* SD Card ready */
++			mmcinfo.state = CARD_STATE_READY;
++			mmc_simple_cmd(request, MMC_CMD_ALL_SEND_CID, 0, RESPONSE_R2_CID);
++		}
++		break;
++
++	case MMC_CMD_SEND_OP_COND:
++		retval = mmc_unpack_r3(request, &r3);
++		if (retval) {
++			debug("%s: failed SEND_OP_COND error=%d (%s)\n", 
++			      __func__, retval, mmc_result_to_string(retval));
++			return MMC_INIT_FAILED;
++		}
++
++		debug("%s: read ocr value = 0x%08x\n", __func__, r3.ocr);
++		if (!(r3.ocr & MMC_CARD_BUSY)) {
++	                mmc_simple_cmd(request, MMC_CMD_SEND_OP_COND, MMC_OCR_ARG, RESPONSE_R3);
++		} else {
++		        mmcinfo.sd = 0; /* MMC Card ready */
++			mmcinfo.state = CARD_STATE_READY;
++			mmc_simple_cmd(request, MMC_CMD_ALL_SEND_CID, 0, RESPONSE_R2_CID);
++		}
++		break;
++
++	case MMC_CMD_ALL_SEND_CID: 
++		retval = mmc_unpack_cid( request, &mmcinfo.cid );
++		/*FIXME:ignore CRC error for CMD2/CMD9/CMD10 */
++		if ( retval && (retval != MMC_ERROR_CRC)) {
++			debug("mmc_init_card_state: unable to ALL_SEND_CID error=%d (%s)\n", 
++			      retval, mmc_result_to_string(retval));
++			return MMC_INIT_FAILED;
++		}
++		mmcinfo.state = CARD_STATE_IDENT;
++		if(mmcinfo.sd)
++			mmc_simple_cmd(request, MMC_CMD_SET_RELATIVE_ADDR, 0, RESPONSE_R6);
++                else
++			mmc_simple_cmd(request, MMC_CMD_SET_RELATIVE_ADDR, ID_TO_RCA(mmcinfo.id) << 16, RESPONSE_R1);
++		break;
++
++        case MMC_CMD_SET_RELATIVE_ADDR:
++	        if (mmcinfo.sd)	{
++			retval = mmc_unpack_r6(request, &r1, mmcinfo.state, &mmcinfo.rca);
++			mmcinfo.rca = mmcinfo.rca << 16; 
++			debug("%s: Get RCA from SD: 0x%04x Status: %x\n",
++			      __func__, mmcinfo.rca, r1.status);
++                } else {
++			retval = mmc_unpack_r1(request,&r1,mmcinfo.state);
++			mmcinfo.rca = ID_TO_RCA(mmcinfo.id) << 16;
++	        }
++		if (retval) {
++			debug("%s: unable to SET_RELATIVE_ADDR error=%d (%s)\n", 
++			      __func__, retval, mmc_result_to_string(retval));
++			return MMC_INIT_FAILED;
++		}
++
++		mmcinfo.state = CARD_STATE_STBY;
++                mmc_simple_cmd(request, MMC_CMD_SEND_CSD, mmcinfo.rca, RESPONSE_R2_CSD);
++
++		break;
++
++	case MMC_CMD_SEND_CSD:
++		retval = mmc_unpack_csd(request, &mmcinfo.csd);
++		mmc_ready = 1;
++		/*FIXME:ignore CRC error for CMD2/CMD9/CMD10 */
++	        if (retval && (retval != MMC_ERROR_CRC)) {
++			debug("%s: unable to SEND_CSD error=%d (%s)\n", 
++			      __func__, retval, mmc_result_to_string(retval));
++			return MMC_INIT_FAILED;
++		}
++		if (mmcinfo.csd.dsr_imp) {
++			debug("%s: driver doesn't support setting DSR\n", __func__);
++		}
++		mmc_configure_card();
++		return MMC_INIT_PASSED;
++
++	default:
++		debug("%s: error!  Illegal last cmd %d\n", __func__, request->cmd);
++		return MMC_INIT_FAILED;
++	}
++
++	return MMC_INIT_DOING;
++}
++
++int mmc_init_card(void)
++{
++	struct mmc_request request;
++	int retval;
++
++	mmc_simple_cmd(&request, MMC_CIM_RESET, 0, RESPONSE_NONE); /* reset card */
++	mmc_simple_cmd(&request, MMC_CMD_GO_IDLE_STATE, 0, RESPONSE_NONE);
++	mmcinfo.sd = 1;  /* assuming a SD card */
++
++	while ((retval = mmc_init_card_state(&request)) == MMC_INIT_DOING)
++		;
++
++	if (retval == MMC_INIT_PASSED)
++		return MMC_NO_ERROR;
++	else
++		return MMC_NO_RESPONSE;
++}
++
++int mmc_legacy_init(int verbose)
++{
++	if (!__msc_card_detected())
++		return 1;
++
++	/* Step-1: init GPIO */
++	__gpio_as_msc();
++	__msc_init_io();
++
++	/* Step-2: turn on power of card */
++#if !defined(CONFIG_SAKC)
++	__msc_enable_power();
++#endif
++
++	/* Step-3: Reset MSC Controller. */
++	__msc_reset();
++
++	/* Step-3: mask all IRQs. */
++	MMC_IRQ_MASK();
++
++	/* Step-4: stop MMC/SD clock */
++	jz_mmc_stop_clock();
++	mmc_init_card();
++	mmc_select_card();
++
++	mmc_dev.block_read = mmc_bread;
++	fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */
++
++	return 0;
++}
++
++/*
++ * Debugging functions
++ */
++static char * mmc_result_strings[] = {
++	"NO_RESPONSE",
++	"NO_ERROR",
++	"ERROR_OUT_OF_RANGE",
++	"ERROR_ADDRESS",
++	"ERROR_BLOCK_LEN",
++	"ERROR_ERASE_SEQ",
++	"ERROR_ERASE_PARAM",
++	"ERROR_WP_VIOLATION",
++	"ERROR_CARD_IS_LOCKED",
++	"ERROR_LOCK_UNLOCK_FAILED",
++	"ERROR_COM_CRC",
++	"ERROR_ILLEGAL_COMMAND",
++	"ERROR_CARD_ECC_FAILED",
++	"ERROR_CC",
++	"ERROR_GENERAL",
++	"ERROR_UNDERRUN",
++	"ERROR_OVERRUN",
++	"ERROR_CID_CSD_OVERWRITE",
++	"ERROR_STATE_MISMATCH",
++	"ERROR_HEADER_MISMATCH",
++	"ERROR_TIMEOUT",
++	"ERROR_CRC",
++	"ERROR_DRIVER_FAILURE",
++};
++
++char * mmc_result_to_string(int i)
++{
++	return mmc_result_strings[i+1];
++}
++
++static char * card_state_strings[] = {
++	"empty",
++	"idle",
++	"ready",
++	"ident",
++	"stby",
++	"tran",
++	"data",
++	"rcv",
++	"prg",
++	"dis",
++};
++
++static inline char * card_state_to_string(int i)
++{
++	return card_state_strings[i+1];
++}
++
++/*
++ * Utility functions
++ */
++
++#define PARSE_U32(_buf,_index) \
++	(((u32)_buf[_index]) << 24) | (((u32)_buf[_index+1]) << 16) | \
++        (((u32)_buf[_index+2]) << 8) | ((u32)_buf[_index+3]);
++
++#define PARSE_U16(_buf,_index) \
++	(((u16)_buf[_index]) << 8) | ((u16)_buf[_index+1]);
++
++int mmc_unpack_csd(struct mmc_request *request, struct mmc_csd *csd)
++{
++	u8 *buf = request->response;
++	int num = 0;
++
++	if (request->result)
++		return request->result;
++
++	if (buf[0] != 0x3f)
++		return MMC_ERROR_HEADER_MISMATCH;
++
++	csd->csd_structure = (buf[1] & 0xc0) >> 6;
++	if (csd->csd_structure)
++		sd2_0 = 1;
++	else
++		sd2_0 = 0;
++
++	switch (csd->csd_structure) {
++	case 0 :/* Version 1.01-1.10
++		 * Version 2.00/Standard Capacity */
++		csd->taac               = buf[2];
++		csd->nsac               = buf[3];
++		csd->tran_speed         = buf[4];
++		csd->ccc                = (((u16)buf[5]) << 4) | ((buf[6] & 0xf0) >> 4);
++		csd->read_bl_len        = buf[6] & 0x0f;
++		/* for support 2GB card*/
++		if (csd->read_bl_len >= 10)
++		{
++			num = csd->read_bl_len - 9;
++			csd->read_bl_len = 9;
++		}
++
++		csd->read_bl_partial    = (buf[7] & 0x80) ? 1 : 0;
++		csd->write_blk_misalign = (buf[7] & 0x40) ? 1 : 0;
++		csd->read_blk_misalign  = (buf[7] & 0x20) ? 1 : 0;
++		csd->dsr_imp            = (buf[7] & 0x10) ? 1 : 0;
++		csd->c_size             = ((((u16)buf[7]) & 0x03) << 10) | (((u16)buf[8]) << 2) | (((u16)buf[9]) & 0xc0) >> 6;
++
++		if (num)
++			csd->c_size = csd->c_size << num;
++
++
++		csd->vdd_r_curr_min     = (buf[9] & 0x38) >> 3;
++		csd->vdd_r_curr_max     = buf[9] & 0x07;
++		csd->vdd_w_curr_min     = (buf[10] & 0xe0) >> 5;
++		csd->vdd_w_curr_max     = (buf[10] & 0x1c) >> 2;
++		csd->c_size_mult        = ((buf[10] & 0x03) << 1) | ((buf[11] & 0x80) >> 7);
++		csd->sector_size    = (buf[11] & 0x7c) >> 2;
++		csd->erase_grp_size = ((buf[11] & 0x03) << 3) | ((buf[12] & 0xe0) >> 5);
++		csd->wp_grp_size        = buf[12] & 0x1f;
++		csd->wp_grp_enable      = (buf[13] & 0x80) ? 1 : 0;
++		csd->default_ecc        = (buf[13] & 0x60) >> 5;
++		csd->r2w_factor         = (buf[13] & 0x1c) >> 2;
++		csd->write_bl_len       = ((buf[13] & 0x03) << 2) | ((buf[14] & 0xc0) >> 6);
++		if (csd->write_bl_len >= 10)
++			csd->write_bl_len = 9;
++
++		csd->write_bl_partial   = (buf[14] & 0x20) ? 1 : 0;
++		csd->file_format_grp    = (buf[15] & 0x80) ? 1 : 0;
++		csd->copy               = (buf[15] & 0x40) ? 1 : 0;
++		csd->perm_write_protect = (buf[15] & 0x20) ? 1 : 0;
++		csd->tmp_write_protect  = (buf[15] & 0x10) ? 1 : 0;
++		csd->file_format        = (buf[15] & 0x0c) >> 2;
++		csd->ecc                = buf[15] & 0x03;
++		break;
++	case 1 :	/* Version 2.00/High Capacity */
++		csd->taac               = 0;
++		csd->nsac               = 0;
++		csd->tran_speed         = buf[4];
++		csd->ccc                = (((u16)buf[5]) << 4) | ((buf[6] & 0xf0) >> 4);
++
++		csd->read_bl_len        = 9;
++		csd->read_bl_partial    = 0;
++		csd->write_blk_misalign = 0;
++		csd->read_blk_misalign  = 0;
++		csd->dsr_imp            = (buf[7] & 0x10) ? 1 : 0;
++		csd->c_size             = ((((u16)buf[8]) & 0x3f) << 16) | (((u16)buf[9]) << 8) | ((u16)buf[10]) ;
++		csd->sector_size	= 0x7f;
++		csd->erase_grp_size	= 0;
++		csd->wp_grp_size        = 0;
++		csd->wp_grp_enable      = 0;
++		csd->default_ecc        = (buf[13] & 0x60) >> 5;
++		csd->r2w_factor         = 4;/* Unused */
++		csd->write_bl_len       = 9;
++
++		csd->write_bl_partial   = 0;
++		csd->file_format_grp    = 0;
++		csd->copy               = (buf[15] & 0x40) ? 1 : 0;
++		csd->perm_write_protect = (buf[15] & 0x20) ? 1 : 0;
++		csd->tmp_write_protect  = (buf[15] & 0x10) ? 1 : 0;
++		csd->file_format        = 0;
++		csd->ecc                = buf[15] & 0x03;
++	}
++
++	return 0;
++}
++
++int mmc_unpack_r1(struct mmc_request *request, struct mmc_response_r1 *r1, enum card_state state)
++{
++	u8 *buf = request->response;
++
++	if (request->result)
++		return request->result;
++
++	r1->cmd    = buf[0];
++	r1->status = PARSE_U32(buf,1);
++
++	debug("mmc_unpack_r1: cmd=%d status=%08x\n", r1->cmd, r1->status);
++
++	if (R1_STATUS(r1->status)) {
++		if (r1->status & R1_OUT_OF_RANGE)       return MMC_ERROR_OUT_OF_RANGE;
++		if (r1->status & R1_ADDRESS_ERROR)      return MMC_ERROR_ADDRESS;
++		if (r1->status & R1_BLOCK_LEN_ERROR)    return MMC_ERROR_BLOCK_LEN;
++		if (r1->status & R1_ERASE_SEQ_ERROR)    return MMC_ERROR_ERASE_SEQ;
++		if (r1->status & R1_ERASE_PARAM)        return MMC_ERROR_ERASE_PARAM;
++		if (r1->status & R1_WP_VIOLATION)       return MMC_ERROR_WP_VIOLATION;
++		/*if (r1->status & R1_CARD_IS_LOCKED)     return MMC_ERROR_CARD_IS_LOCKED; */
++		if (r1->status & R1_LOCK_UNLOCK_FAILED) return MMC_ERROR_LOCK_UNLOCK_FAILED;
++		if (r1->status & R1_COM_CRC_ERROR)      return MMC_ERROR_COM_CRC;
++		if (r1->status & R1_ILLEGAL_COMMAND)    return MMC_ERROR_ILLEGAL_COMMAND;
++		if (r1->status & R1_CARD_ECC_FAILED)    return MMC_ERROR_CARD_ECC_FAILED;
++		if (r1->status & R1_CC_ERROR)           return MMC_ERROR_CC;
++		if (r1->status & R1_ERROR)              return MMC_ERROR_GENERAL;
++		if (r1->status & R1_UNDERRUN)           return MMC_ERROR_UNDERRUN;
++		if (r1->status & R1_OVERRUN)            return MMC_ERROR_OVERRUN;
++		if (r1->status & R1_CID_CSD_OVERWRITE)  return MMC_ERROR_CID_CSD_OVERWRITE;
++	}
++
++	if (buf[0] != request->cmd) 
++		return MMC_ERROR_HEADER_MISMATCH;
++
++	/* This should be last - it's the least dangerous error */
++
++	return 0;
++}
++
++int mmc_unpack_scr(struct mmc_request *request, struct mmc_response_r1 *r1, enum card_state state, u32 *scr)
++{
++        u8 *buf = request->response;
++	if (request->result)
++		return request->result;
++
++        *scr = PARSE_U32(buf, 5); /* Save SCR returned by the SD Card */
++        return mmc_unpack_r1(request, r1, state);
++
++}
++
++int mmc_unpack_r6(struct mmc_request *request, struct mmc_response_r1 *r1, enum card_state state, int *rca)
++{
++	u8 *buf = request->response;
++
++	if (request->result)
++		return request->result;
++
++        *rca = PARSE_U16(buf,1);  /* Save RCA returned by the SD Card */
++
++        *(buf+1) = 0;
++        *(buf+2) = 0;
++
++        return mmc_unpack_r1(request, r1, state);
++}
++
++int mmc_unpack_cid(struct mmc_request *request, struct mmc_cid *cid)
++{
++	int i;
++	u8 *buf = request->response;
++
++	if (request->result) 
++		return request->result;
++
++	cid->mid = buf[1];
++	cid->oid = PARSE_U16(buf,2);
++	for (i = 0 ; i < 5 ; i++)
++		cid->pnm[i] = buf[4+i];
++	cid->pnm[6] = 0;
++	cid->prv = buf[10];
++	cid->psn = PARSE_U32(buf,10);
++	cid->mdt = buf[15];
++
++	printf("Man %02x OEM 0x%04x \"%s\" %d.%d 0x%08x "
++	       "Date %02u/%04u\n",
++	       cid->mid,
++	       cid->oid,
++	       cid->pnm, 
++	       cid->prv >> 4,
++	       cid->prv & 0xf, 
++	       cid->psn,
++	       cid->mdt & 0xf,
++	       (cid->mdt >> 4) + 2000);
++
++	if (buf[0] != 0x3f)
++		return MMC_ERROR_HEADER_MISMATCH;
++      	return 0;
++}
++
++int mmc_unpack_r3(struct mmc_request *request, struct mmc_response_r3 *r3)
++{
++	u8 *buf = request->response;
++
++	if (request->result)
++		return request->result;
++
++	r3->ocr = PARSE_U32(buf,1);
++	debug("mmc_unpack_r3: ocr=%08x\n", r3->ocr);
++
++	if (buf[0] != 0x3f)  return MMC_ERROR_HEADER_MISMATCH;
++	return 0;
++}
++
++#define KBPS 1
++#define MBPS 1000
++
++static u32 ts_exp[] = { 100*KBPS, 1*MBPS, 10*MBPS, 100*MBPS, 0, 0, 0, 0 };
++static u32 ts_mul[] = { 0,    1000, 1200, 1300, 1500, 2000, 2500, 3000, 
++			3500, 4000, 4500, 5000, 5500, 6000, 7000, 8000 };
++
++u32 mmc_tran_speed(u8 ts)
++{
++	u32 rate = ts_exp[(ts & 0x7)] * ts_mul[(ts & 0x78) >> 3];
++
++	if (rate <= 0) {
++		debug("%s: error - unrecognized speed 0x%02x\n", __func__, ts);
++		return 1;
++	}
++
++	return rate;
++}
++
++void mmc_send_cmd(struct mmc_request *request, int cmd, u32 arg, 
++		  u16 nob, u16 block_len, enum mmc_rsp_t rtype, u8 *buffer)
++{
++	request->cmd       = cmd;
++	request->arg       = arg;
++	request->rtype     = rtype;
++	request->nob       = nob;
++	request->block_len = block_len;
++	request->buffer    = buffer;
++	request->cnt       = nob * block_len;
++
++	jz_mmc_exec_cmd(request);
++}
+diff --git a/drivers/mmc/jz_mmc.h b/drivers/mmc/jz_mmc.h
+new file mode 100644
+index 0000000..936c514
+--- /dev/null
++++ b/drivers/mmc/jz_mmc.h
+@@ -0,0 +1,176 @@
++/*
++ *  linux/drivers/mmc/jz_mmc.h
++ *
++ *  Author: Vladimir Shebordaev, Igor Oblakov
++ *  Copyright:  MontaVista Software Inc.
++ *
++ *  $Id: jz_mmc.h,v 1.3 2007-06-15 08:04:20 jlwei Exp $
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ */
++#ifndef __MMC_JZMMC_H__
++#define __MMC_JZMMC_H__
++
++#define ID_TO_RCA(x) ((x)+1)
++#define MMC_OCR_ARG		0x00ff8000	/* Argument of OCR */
++
++/* Standard MMC/SD clock speeds */
++#define MMC_CLOCK_SLOW    400000      /* 400 kHz for initial setup */
++#define MMC_CLOCK_FAST  20000000      /* 20 MHz for maximum for normal operation */
++#define SD_CLOCK_FAST   24000000      /* 24 MHz for SD Cards */
++
++/* Use negative numbers to disambiguate */
++#define MMC_CIM_RESET            -1
++#define SET_BUS_WIDTH            6    /* ac   [1:0] bus width    R1  */    
++
++#define R1_OUT_OF_RANGE		(1 << 31)	/* er, c */
++#define R1_ADDRESS_ERROR	(1 << 30)	/* erx, c */
++#define R1_BLOCK_LEN_ERROR	(1 << 29)	/* er, c */
++#define R1_ERASE_SEQ_ERROR      (1 << 28)	/* er, c */
++#define R1_ERASE_PARAM		(1 << 27)	/* ex, c */
++#define R1_WP_VIOLATION		(1 << 26)	/* erx, c */
++#define R1_CARD_IS_LOCKED	(1 << 25)	/* sx, a */
++#define R1_LOCK_UNLOCK_FAILED	(1 << 24)	/* erx, c */
++#define R1_COM_CRC_ERROR	(1 << 23)	/* er, b */
++#define R1_ILLEGAL_COMMAND	(1 << 22)	/* er, b */
++#define R1_CARD_ECC_FAILED	(1 << 21)	/* ex, c */
++#define R1_CC_ERROR		(1 << 20)	/* erx, c */
++#define R1_ERROR		(1 << 19)	/* erx, c */
++#define R1_UNDERRUN		(1 << 18)	/* ex, c */
++#define R1_OVERRUN		(1 << 17)	/* ex, c */
++#define R1_CID_CSD_OVERWRITE	(1 << 16)	/* erx, c, CID/CSD overwrite */
++#define R1_WP_ERASE_SKIP	(1 << 15)	/* sx, c */
++#define R1_CARD_ECC_DISABLED	(1 << 14)	/* sx, a */
++#define R1_ERASE_RESET		(1 << 13)	/* sr, c */
++#define R1_STATUS(x)            (x & 0xFFFFE000)
++
++#define MMC_CARD_BUSY	0x80000000	/* Card Power up status bit */
++
++#define MMC_PROGRAM_CID          26   /* adtc                    R1  */
++#define MMC_PROGRAM_CSD          27   /* adtc                    R1  */
++
++#define MMC_GO_IRQ_STATE         40   /* bcr                     R5  */
++#define MMC_GEN_CMD              56   /* adtc [0] RD/WR          R1b */
++#define MMC_LOCK_UNLOCK          42   /* adtc                    R1b */
++#define MMC_WRITE_DAT_UNTIL_STOP 20   /* adtc [31:0] data addr   R1  */
++#define MMC_READ_DAT_UNTIL_STOP  11   /* adtc [31:0] dadr        R1  */
++#define MMC_SEND_WRITE_PROT      30   /* adtc [31:0] wpdata addr R1  */
++
++
++enum mmc_result_t {
++	MMC_NO_RESPONSE        = -1,
++	MMC_NO_ERROR           = 0,
++	MMC_ERROR_OUT_OF_RANGE,
++	MMC_ERROR_ADDRESS,
++	MMC_ERROR_BLOCK_LEN,
++	MMC_ERROR_ERASE_SEQ,
++	MMC_ERROR_ERASE_PARAM,
++	MMC_ERROR_WP_VIOLATION,
++	MMC_ERROR_CARD_IS_LOCKED,
++	MMC_ERROR_LOCK_UNLOCK_FAILED,
++	MMC_ERROR_COM_CRC,
++	MMC_ERROR_ILLEGAL_COMMAND,
++	MMC_ERROR_CARD_ECC_FAILED,
++	MMC_ERROR_CC,
++	MMC_ERROR_GENERAL,
++	MMC_ERROR_UNDERRUN,
++	MMC_ERROR_OVERRUN,
++	MMC_ERROR_CID_CSD_OVERWRITE,
++	MMC_ERROR_STATE_MISMATCH,
++	MMC_ERROR_HEADER_MISMATCH,
++	MMC_ERROR_TIMEOUT,
++	MMC_ERROR_CRC,
++	MMC_ERROR_DRIVER_FAILURE,
++};
++
++enum card_state {
++	CARD_STATE_EMPTY = -1,
++	CARD_STATE_IDLE	 = 0,
++	CARD_STATE_READY = 1,
++	CARD_STATE_IDENT = 2,
++	CARD_STATE_STBY	 = 3,
++	CARD_STATE_TRAN	 = 4,
++	CARD_STATE_DATA	 = 5,
++	CARD_STATE_RCV	 = 6,
++	CARD_STATE_PRG	 = 7,
++	CARD_STATE_DIS	 = 8,
++};
++
++enum mmc_rsp_t {
++	RESPONSE_NONE   = 0,
++	RESPONSE_R1     = 1,
++	RESPONSE_R1B    = 2,
++	RESPONSE_R2_CID = 3,
++	RESPONSE_R2_CSD  = 4,
++	RESPONSE_R3      = 5,
++	RESPONSE_R4      = 6,
++	RESPONSE_R5      = 7,
++        RESPONSE_R6      = 8,
++};
++
++struct mmc_response_r1 {
++	u8  cmd;
++	u32 status;
++};
++
++struct mmc_response_r3 {  
++	u32 ocr;
++}; 
++
++/* the information structure of MMC/SD Card */
++struct  mmc_info {
++	int             id;     /* Card index */
++        int             sd;     /* MMC or SD card */
++        int             rca;    /* RCA */
++        u32             scr;    /* SCR 63:32*/
++	int             flags;  /* Ejected, inserted */
++	enum card_state state;  /* empty, ident, ready, whatever */
++
++	/* Card specific information */
++	struct mmc_cid  cid;
++	struct mmc_csd  csd;
++	u32             block_num;
++	u32             block_len;
++	u32             erase_unit;
++};
++
++struct mmc_info mmcinfo;
++
++struct mmc_request {
++	int               index;      /* Slot index - used for CS lines */
++	int               cmd;        /* Command to send */
++	u32               arg;        /* Argument to send */
++	enum mmc_rsp_t    rtype;      /* Response type expected */
++
++	/* Data transfer (these may be modified at the low level) */
++	u16               nob;        /* Number of blocks to transfer*/
++	u16               block_len;  /* Block length */
++	u8               *buffer;     /* Data buffer */
++	u32               cnt;        /* Data length, for PIO */
++
++	/* Results */
++	u8                response[18]; /* Buffer to store response - CRC is optional */
++	enum mmc_result_t result;
++};
++
++char * mmc_result_to_string(int);
++int    mmc_unpack_csd(struct mmc_request *request, struct mmc_csd *csd);
++int    mmc_unpack_r1(struct mmc_request *request, struct mmc_response_r1 *r1, enum card_state state);
++int    mmc_unpack_r6(struct mmc_request *request, struct mmc_response_r1 *r1, enum card_state state, int *rca);
++int    mmc_unpack_scr(struct mmc_request *request, struct mmc_response_r1 *r1, enum card_state state, u32 *scr);
++int    mmc_unpack_cid(struct mmc_request *request, struct mmc_cid *cid);
++int    mmc_unpack_r3(struct mmc_request *request, struct mmc_response_r3 *r3);
++
++void   mmc_send_cmd(struct mmc_request *request, int cmd, u32 arg, 
++		     u16 nob, u16 block_len, enum mmc_rsp_t rtype, u8 *buffer);
++u32    mmc_tran_speed(u8 ts);
++void   jz_mmc_set_clock(int sd, u32 rate);
++
++static inline void mmc_simple_cmd(struct mmc_request *request, int cmd, u32 arg, enum mmc_rsp_t rtype)
++{
++	mmc_send_cmd( request, cmd, arg, 0, 0, rtype, 0);
++}
++
++#endif /* __MMC_JZMMC_H__ */
+diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h
+index 7bff444..7b33be0 100644
+--- a/include/configs/qi_lb60.h
++++ b/include/configs/qi_lb60.h
+@@ -31,6 +31,15 @@
+ /*
+  * Miscellaneous configurable options
+  */
++#define CONFIG_JZ4740_MMC
++#define CONFIG_MMC      	1
++#define CONFIG_FAT      	1
++#define CONFIG_DOS_PARTITION	1
++#define CONFIG_CMD_MMC
++#define CONFIG_CMD_FAT
++#define CONFIG_CMD_EXT2
++
++
+ #define CONFIG_SYS_SDRAM_BASE		0x80000000	/* Cached addr */
+ #define CONFIG_SYS_INIT_SP_OFFSET	0x400000
+ #define CONFIG_SYS_LOAD_ADDR		0x80600000
+diff --git a/include/mmc.h b/include/mmc.h
+index a13e2bd..3c4761c 100644
+--- a/include/mmc.h
++++ b/include/mmc.h
+@@ -283,4 +283,44 @@ struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode);
+ int mmc_legacy_init(int verbose);
+ #endif
+ 
++struct mmc_csd
++{
++	u8	csd_structure:2,
++		spec_vers:4,
++		rsvd1:2;
++	u8	taac;
++	u8	nsac;
++	u8	tran_speed;
++	u16	ccc:12,
++		read_bl_len:4;
++	u32	c_size:22;
++	u64	read_bl_partial:1,
++		write_blk_misalign:1,
++		read_blk_misalign:1,
++		dsr_imp:1,
++		rsvd2:2,
++		vdd_r_curr_min:3,
++		vdd_r_curr_max:3,
++		vdd_w_curr_min:3,
++		vdd_w_curr_max:3,
++		c_size_mult:3,
++		sector_size:5,
++		erase_grp_size:5,
++		wp_grp_size:5,
++		wp_grp_enable:1,
++		default_ecc:2,
++		r2w_factor:3,
++		write_bl_len:4,
++		write_bl_partial:1,
++		rsvd3:5;
++	u8	file_format_grp:1,
++		copy:1,
++		perm_write_protect:1,
++		tmp_write_protect:1,
++		file_format:2,
++		ecc:2;
++	u8	crc:7;
++	u8	one:1;
++};
++
+ #endif /* _MMC_H_ */
+-- 
+1.7.9.5
+
diff --git a/trunk/package/boot/uboot-xburst/patches/0004-add-more-boot-options-F1-F2-F3-F4-M-S.patch b/trunk/package/boot/uboot-xburst/patches/0004-add-more-boot-options-F1-F2-F3-F4-M-S.patch
new file mode 100644
index 00000000..73e03243
--- /dev/null
+++ b/trunk/package/boot/uboot-xburst/patches/0004-add-more-boot-options-F1-F2-F3-F4-M-S.patch
@@ -0,0 +1,200 @@
+From c52b6168979d03fc31205444c3278c537787472a Mon Sep 17 00:00:00 2001
+From: Xiangfu <xiangfu@openmobilefree.net>
+Date: Wed, 10 Oct 2012 18:39:55 +0800
+Subject: [PATCH 4/6] add more boot options(F1/F2/F3/F4/M/S)
+
+---
+ arch/mips/include/asm/global_data.h |    3 +++
+ arch/mips/lib/bootm.c               |   17 ++++++++++++++++-
+ board/qi/qi_lb60/qi_lb60.c          |   26 +++++++++++++++++++++++---
+ common/main.c                       |   21 +++++++++++++++++++--
+ include/configs/qi_lb60.h           |   32 ++++++++++++++++++++++++++++++++
+ 5 files changed, 93 insertions(+), 6 deletions(-)
+
+diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h
+index 6e2cdc7..cd03d7e 100644
+--- a/arch/mips/include/asm/global_data.h
++++ b/arch/mips/include/asm/global_data.h
+@@ -59,6 +59,9 @@ typedef	struct	global_data {
+ 	unsigned long	env_valid;	/* Checksum of Environment valid? */
+ 	void		**jt;		/* jump table */
+ 	char		env_buf[32];	/* buffer for getenv() before reloc. */
++#if defined(CONFIG_NANONOTE)
++        unsigned long   boot_option;
++#endif
+ } gd_t;
+ 
+ #include <asm-generic/global_data_flags.h>
+diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
+index 608c1a7..e00416b 100644
+--- a/arch/mips/lib/bootm.c
++++ b/arch/mips/lib/bootm.c
+@@ -47,10 +47,25 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
+ 			bootm_headers_t *images)
+ {
+ 	void (*theKernel) (int, char **, char **, int *);
+-	char *commandline = getenv("bootargs");
++	char *commandline;
+ 	char env_buf[12];
+ 	char *cp;
+ 
++#if defined(CONFIG_NANONOTE)
++        if (gd->boot_option & BOOT_FROM_MEMCARD)
++                commandline = getenv ("bootargsfromsd");
++        else if (gd->boot_option & BOOT_WITH_F1)
++                commandline = getenv ("bootargsf1");
++        else if (gd->boot_option & BOOT_WITH_F2)
++                commandline = getenv ("bootargsf2");
++        else if (gd->boot_option & BOOT_WITH_F3)
++                commandline = getenv ("bootargsf3");
++        else if (gd->boot_option & BOOT_WITH_F4)
++                commandline = getenv ("bootargsf4");
++        else
++#endif
++                commandline = getenv ("bootargs");
++
+ 	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+ 		return 1;
+ 
+diff --git a/board/qi/qi_lb60/qi_lb60.c b/board/qi/qi_lb60/qi_lb60.c
+index a2ba648..d622219 100644
+--- a/board/qi/qi_lb60/qi_lb60.c
++++ b/board/qi/qi_lb60/qi_lb60.c
+@@ -15,7 +15,7 @@ DECLARE_GLOBAL_DATA_PTR;
+ 
+ static void gpio_init(void)
+ {
+-	unsigned int i;
++	unsigned int i, j;
+ 
+ 	/* Initialize NAND Flash Pins */
+ 	__gpio_as_nand();
+@@ -42,14 +42,34 @@ static void gpio_init(void)
+ 
+ 	if (__gpio_get_pin(GPIO_KEYIN_BASE + 2) == 0){
+ 		printf("[S] pressed, enable UART0\n");
++		gd->boot_option |= BOOT_WITH_ENABLE_UART;
+ 		__gpio_as_uart0();
+ 	} else {
+ 		__gpio_as_input(GPIO_KEYIN_8);
+ 		__gpio_enable_pull(GPIO_KEYIN_8);
+ 	}
+ 
+-	/* enable the TP4, TP5 as UART0 */
+-	__gpio_jtag_to_uart0();
++	if (__gpio_get_pin(GPIO_KEYIN_BASE + 3) == 0) {
++		printf("[M] pressed, boot from memory card\n");
++		gd->boot_option |= BOOT_FROM_MEMCARD;
++		__gpio_jtag_to_uart0();
++	}
++
++	for (j = 0; j < 4; j++) {
++		for (i = 0; i < 4; i++)
++			__gpio_set_pin(GPIO_KEYOUT_BASE + i);
++
++		__gpio_clear_pin(GPIO_KEYOUT_BASE + j);
++
++		if (__gpio_get_pin(GPIO_KEYIN_BASE) == 0) {
++			printf("[F%d] pressed", (j + 1));
++			gd->boot_option |= (1 << (j + 2));
++			/* BOOT_WITH_F1	(1 << 2) */
++			/* BOOT_WITH_F2	(1 << 3) */
++			/* BOOT_WITH_F3	(1 << 4) */
++			/* BOOT_WITH_F4	(1 << 5) */
++		}
++	}
+ 
+ 	__gpio_as_output(GPIO_AUDIO_POP);
+ 	__gpio_set_pin(GPIO_AUDIO_POP);
+diff --git a/common/main.c b/common/main.c
+index 9507cec..dbfb7ca 100644
+--- a/common/main.c
++++ b/common/main.c
+@@ -355,7 +355,11 @@ void main_loop (void)
+ #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
+ 	s = getenv ("bootdelay");
+ 	bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
+-
++#if defined(CONFIG_NANONOTE)
++	DECLARE_GLOBAL_DATA_PTR;
++	if (gd->boot_option & BOOT_WITH_ENABLE_UART)
++		bootdelay = 3;
++# endif
+ 	debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay);
+ 
+ #if defined(CONFIG_MENU_SHOW)
+@@ -379,7 +383,20 @@ void main_loop (void)
+ 	}
+ 	else
+ #endif /* CONFIG_BOOTCOUNT_LIMIT */
+-		s = getenv ("bootcmd");
++#if defined(CONFIG_NANONOTE)
++		if (gd->boot_option & BOOT_FROM_MEMCARD)
++			s = getenv ("bootcmdfromsd");
++		else if (gd->boot_option & BOOT_WITH_F1)
++			s = getenv ("bootcmdf1");
++		else if (gd->boot_option & BOOT_WITH_F2)
++			s = getenv ("bootcmdf2");
++		else if (gd->boot_option & BOOT_WITH_F3)
++			s = getenv ("bootcmdf3");
++		else if (gd->boot_option & BOOT_WITH_F4)
++			s = getenv ("bootcmdf4");
++		else
++#endif
++			s = getenv ("bootcmd");
+ 
+ 	debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
+ 
+diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h
+index 7b33be0..52b370c 100644
+--- a/include/configs/qi_lb60.h
++++ b/include/configs/qi_lb60.h
+@@ -31,6 +31,7 @@
+ /*
+  * Miscellaneous configurable options
+  */
++#define CONFIG_NANONOTE
+ #define CONFIG_JZ4740_MMC
+ #define CONFIG_MMC      	1
+ #define CONFIG_FAT      	1
+@@ -39,6 +40,37 @@
+ #define CONFIG_CMD_FAT
+ #define CONFIG_CMD_EXT2
+ 
++#define CONFIG_CMD_UBIFS
++#define CONFIG_CMD_UBI
++#define CONFIG_MTD_PARTITIONS
++#define CONFIG_MTD_DEVICE
++#define CONFIG_CMD_MTDPARTS
++#define CONFIG_CMD_UBI
++#define CONFIG_CMD_UBIFS
++#define CONFIG_LZO
++#define CONFIG_RBTREE
++
++#define MTDIDS_DEFAULT		"nand0=jz4740-nand"
++#define MTDPARTS_DEFAULT	"mtdparts=jz4740-nand:4M@0(uboot)ro,4M@4M(kernel)ro,512M@8M(rootfs)ro,-(data)ro"
++
++#define BOOT_FROM_MEMCARD	1
++#define BOOT_WITH_ENABLE_UART	(1 << 1)	/* Vaule for global_data.h gd->boot_option */
++#define BOOT_WITH_F1		(1 << 2)
++#define BOOT_WITH_F2		(1 << 3)
++#define BOOT_WITH_F3		(1 << 4)
++#define BOOT_WITH_F4		(1 << 5)
++
++#define CONFIG_EXTRA_ENV_SETTINGS \
++	"bootcmdfromsd=mmc init; ext2load mmc 0 0x80600000 /boot/uImage; bootm;\0" \
++	"bootargsfromsd=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p1 rw rootwait\0" \
++	"bootcmdf1=mmc init; ext2load mmc 0:1 0x80600000 /boot/uImage; bootm;\0" \
++	"bootargsf1=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p1 rw rootwait\0" \
++	"bootcmdf2=mmc init; ext2load mmc 0:2 0x80600000 /boot/uImage; bootm;\0" \
++	"bootargsf2=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p2 rw rootwait\0" \
++	"bootcmdf3=mmc init; ext2load mmc 0:3 0x80600000 /boot/uImage; bootm;\0" \
++	"bootargsf3=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p3 rw rootwait\0" \
++	"bootcmdf4=mtdparts default;ubi part rootfs;ubifsmount rootfs;ubifsload 0x80600000 /boot/uImage; bootm;\0" \
++	"bootargsf4=mem=32M console=tty0 console=ttyS0,57600n8 ubi.mtd=2 rootfstype=ubifs root=ubi0:rootfs rw rootwait"
+ 
+ #define CONFIG_SYS_SDRAM_BASE		0x80000000	/* Cached addr */
+ #define CONFIG_SYS_INIT_SP_OFFSET	0x400000
+-- 
+1.7.9.5
+
diff --git a/trunk/package/boot/uboot-xburst/patches/0005-add-nanonote-lcd-support.patch b/trunk/package/boot/uboot-xburst/patches/0005-add-nanonote-lcd-support.patch
new file mode 100644
index 00000000..2c550f72
--- /dev/null
+++ b/trunk/package/boot/uboot-xburst/patches/0005-add-nanonote-lcd-support.patch
@@ -0,0 +1,847 @@
+From ca8c5216cfd3ad3fda9867ed2d157ae5a209834b Mon Sep 17 00:00:00 2001
+From: Xiangfu <xiangfu@openmobilefree.net>
+Date: Wed, 10 Oct 2012 22:05:27 +0800
+Subject: [PATCH 5/6] add nanonote lcd support
+
+---
+ arch/mips/include/asm/global_data.h |    1 +
+ arch/mips/include/asm/jz4740.h      |   90 ++++++++
+ arch/mips/lib/board.c               |    6 +
+ common/lcd.c                        |    9 +-
+ drivers/video/Makefile              |    1 +
+ drivers/video/nanonote_gpm940b0.c   |  400 +++++++++++++++++++++++++++++++++++
+ drivers/video/nanonote_gpm940b0.h   |  135 ++++++++++++
+ include/configs/qi_lb60.h           |    7 +
+ include/lcd.h                       |   52 ++++-
+ 9 files changed, 697 insertions(+), 4 deletions(-)
+ create mode 100644 drivers/video/nanonote_gpm940b0.c
+ create mode 100644 drivers/video/nanonote_gpm940b0.h
+
+diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h
+index cd03d7e..7cec2de 100644
+--- a/arch/mips/include/asm/global_data.h
++++ b/arch/mips/include/asm/global_data.h
+@@ -44,6 +44,7 @@ typedef	struct	global_data {
+ 	unsigned long	per_clk;	/* Peripheral bus clock */
+ 	unsigned long	mem_clk;	/* Memory bus clock */
+ 	unsigned long	dev_clk;	/* Device clock */
++        unsigned long   fb_base;        /* base address of framebuffer */
+ 	/* "static data" needed by most of timer.c */
+ 	unsigned long	tbl;
+ 	unsigned long	lastinc;
+diff --git a/arch/mips/include/asm/jz4740.h b/arch/mips/include/asm/jz4740.h
+index 68287fb..13724a2 100644
+--- a/arch/mips/include/asm/jz4740.h
++++ b/arch/mips/include/asm/jz4740.h
+@@ -1312,5 +1312,95 @@ do { 								\
+  	while (REG_MSC_STAT & MSC_STAT_IS_RESETTING);		\
+ } while (0)
+ 
++/*************************************************************************
++ * LCD (LCD Controller)
++ *************************************************************************/
++#define REG32(addr)	*((volatile u32 *)(addr))
++
++#define	CPM_BASE	0xB0000000
++#define CPM_CPCCR	(CPM_BASE+0x00)
++#define REG_CPM_CPCCR	REG32(CPM_CPCCR)
++
++#define	LCD_BASE	0xB3050000
++#define LCD_CFG		(LCD_BASE + 0x00) /* LCD Configure Register */
++#define LCD_VSYNC	(LCD_BASE + 0x04) /* Vertical Synchronize Register */
++#define LCD_HSYNC	(LCD_BASE + 0x08) /* Horizontal Synchronize Register */
++#define LCD_VAT		(LCD_BASE + 0x0c) /* Virtual Area Setting Register */
++#define LCD_DAH		(LCD_BASE + 0x10) /* Display Area Horizontal Start/End Point */
++#define LCD_DAV		(LCD_BASE + 0x14) /* Display Area Vertical Start/End Point */
++#define LCD_PS		(LCD_BASE + 0x18) /* PS Signal Setting */
++#define LCD_CLS		(LCD_BASE + 0x1c) /* CLS Signal Setting */
++#define LCD_SPL		(LCD_BASE + 0x20) /* SPL Signal Setting */
++#define LCD_REV		(LCD_BASE + 0x24) /* REV Signal Setting */
++#define LCD_CTRL	(LCD_BASE + 0x30) /* LCD Control Register */
++#define LCD_STATE	(LCD_BASE + 0x34) /* LCD Status Register */
++#define LCD_IID		(LCD_BASE + 0x38) /* Interrupt ID Register */
++#define LCD_DA0		(LCD_BASE + 0x40) /* Descriptor Address Register 0 */
++#define LCD_SA0		(LCD_BASE + 0x44) /* Source Address Register 0 */
++#define LCD_FID0	(LCD_BASE + 0x48) /* Frame ID Register 0 */
++#define LCD_CMD0	(LCD_BASE + 0x4c) /* DMA Command Register 0 */
++#define LCD_DA1		(LCD_BASE + 0x50) /* Descriptor Address Register 1 */
++#define LCD_SA1		(LCD_BASE + 0x54) /* Source Address Register 1 */
++#define LCD_FID1	(LCD_BASE + 0x58) /* Frame ID Register 1 */
++#define LCD_CMD1	(LCD_BASE + 0x5c) /* DMA Command Register 1 */
++
++#define REG_LCD_CFG	REG32(LCD_CFG)
++#define REG_LCD_VSYNC	REG32(LCD_VSYNC)
++#define REG_LCD_HSYNC	REG32(LCD_HSYNC)
++#define REG_LCD_VAT	REG32(LCD_VAT)
++#define REG_LCD_DAH	REG32(LCD_DAH)
++#define REG_LCD_DAV	REG32(LCD_DAV)
++#define REG_LCD_PS	REG32(LCD_PS)
++#define REG_LCD_CLS	REG32(LCD_CLS)
++#define REG_LCD_SPL	REG32(LCD_SPL)
++#define REG_LCD_REV	REG32(LCD_REV)
++#define REG_LCD_CTRL	REG32(LCD_CTRL)
++#define REG_LCD_STATE	REG32(LCD_STATE)
++#define REG_LCD_IID	REG32(LCD_IID)
++#define REG_LCD_DA0	REG32(LCD_DA0)
++#define REG_LCD_SA0	REG32(LCD_SA0)
++#define REG_LCD_FID0	REG32(LCD_FID0)
++#define REG_LCD_CMD0	REG32(LCD_CMD0)
++#define REG_LCD_DA1	REG32(LCD_DA1)
++#define REG_LCD_SA1	REG32(LCD_SA1)
++#define REG_LCD_FID1	REG32(LCD_FID1)
++#define REG_LCD_CMD1	REG32(LCD_CMD1)
++
++#define LCD_CTRL_BPP_BIT	0  /* Bits Per Pixel */
++#define LCD_CTRL_BPP_MASK	(0x07 << LCD_CTRL_BPP_BIT)
++  #define LCD_CTRL_BPP_1	(0 << LCD_CTRL_BPP_BIT) /* 1 bpp */
++  #define LCD_CTRL_BPP_2	(1 << LCD_CTRL_BPP_BIT) /* 2 bpp */
++  #define LCD_CTRL_BPP_4	(2 << LCD_CTRL_BPP_BIT) /* 4 bpp */
++  #define LCD_CTRL_BPP_8	(3 << LCD_CTRL_BPP_BIT) /* 8 bpp */
++  #define LCD_CTRL_BPP_16	(4 << LCD_CTRL_BPP_BIT) /* 15/16 bpp */
++  #define LCD_CTRL_BPP_18_24	(5 << LCD_CTRL_BPP_BIT) /* 18/24/32 bpp */
++
++#define LCD_CTRL_BST_BIT	28  /* Burst Length Selection */
++#define LCD_CTRL_BST_MASK	(0x03 << LCD_CTRL_BST_BIT)
++  #define LCD_CTRL_BST_4	(0 << LCD_CTRL_BST_BIT) /* 4-word */
++  #define LCD_CTRL_BST_8	(1 << LCD_CTRL_BST_BIT) /* 8-word */
++  #define LCD_CTRL_BST_16	(2 << LCD_CTRL_BST_BIT) /* 16-word */
++#define LCD_CTRL_RGB565		(0 << 27) /* RGB565 mode */
++#define LCD_CTRL_RGB555		(1 << 27) /* RGB555 mode */
++#define LCD_CTRL_OFUP		(1 << 26) /* Output FIFO underrun protection enable */
++#define LCD_CTRL_FRC_BIT	24  /* STN FRC Algorithm Selection */
++#define LCD_CTRL_FRC_MASK	(0x03 << LCD_CTRL_FRC_BIT)
++  #define LCD_CTRL_FRC_16	(0 << LCD_CTRL_FRC_BIT) /* 16 grayscale */
++  #define LCD_CTRL_FRC_4	(1 << LCD_CTRL_FRC_BIT) /* 4 grayscale */
++  #define LCD_CTRL_FRC_2	(2 << LCD_CTRL_FRC_BIT) /* 2 grayscale */
++
++#define CPM_LPCDR	(CPM_BASE+0x64)
++#define CPM_CLKGR	(CPM_BASE+0x20)
++#define REG_CPM_LPCDR	REG32(CPM_LPCDR)
++#define REG_CPM_CLKGR	REG32(CPM_CLKGR)
++
++#define __cpm_start_tcu()	(REG_CPM_CLKGR &= ~CPM_CLKGR_TCU)
++#define __cpm_stop_lcd()	(REG_CPM_CLKGR |= CPM_CLKGR_LCD)
++#define __cpm_set_pixdiv(v) \
++	(REG_CPM_LPCDR = (REG_CPM_LPCDR & ~CPM_LPCDR_PIXDIV_MASK) | ((v) << (CPM_LPCDR_PIXDIV_BIT)))
++#define __cpm_set_ldiv(v) \
++	(REG_CPM_CPCCR = (REG_CPM_CPCCR & ~CPM_CPCCR_LDIV_MASK) | ((v) << (CPM_CPCCR_LDIV_BIT)))
++#define __cpm_start_lcd()	(REG_CPM_CLKGR &= ~CPM_CLKGR_LCD)
++
+ #endif	/* !__ASSEMBLY__ */
+ #endif	/* __JZ4740_H__ */
+diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
+index b14b33e..c2e64d9 100644
+--- a/arch/mips/lib/board.c
++++ b/arch/mips/lib/board.c
+@@ -172,6 +172,12 @@ void board_init_f(ulong bootflag)
+ 	addr &= ~(4096 - 1);
+ 	debug("Top of RAM usable for U-Boot at: %08lx\n", addr);
+ 
++#ifdef CONFIG_LCD
++        /* reserve memory for LCD display (always full pages) */
++        addr = lcd_setmem (addr);
++        gd->fb_base = addr;
++#endif /* CONFIG_LCD */
++
+ 	/* Reserve memory for U-Boot code, data & bss
+ 	 * round down to next 16 kB limit
+ 	 */
+diff --git a/common/lcd.c b/common/lcd.c
+index b6be800..af1281a 100644
+--- a/common/lcd.c
++++ b/common/lcd.c
+@@ -263,6 +263,13 @@ static void lcd_drawchars(ushort x, ushort y, uchar *str, int count)
+ 						lcd_color_fg : lcd_color_bg;
+ 				bits <<= 1;
+ 			}
++#elif LCD_BPP == LCD_COLOR32
++                       uint *m = (uint *)d;
++                       for (c=0; c<32; ++c) {
++                               *m++ = (bits & 0x80) ?
++				       lcd_color_fg : lcd_color_bg;
++                               bits <<= 1;
++                       }
+ #endif
+ 		}
+ #if LCD_BPP == LCD_MONOCHROME
+@@ -509,7 +516,7 @@ static inline ushort *configuration_get_cmap(void)
+ 	return (ushort *)&(cp->lcd_cmap[255 * sizeof(ushort)]);
+ #elif defined(CONFIG_ATMEL_LCD)
+ 	return (ushort *)(panel_info.mmio + ATMEL_LCDC_LUT(0));
+-#elif !defined(CONFIG_ATMEL_HLCD) && !defined(CONFIG_EXYNOS_FB)
++#elif !defined(CONFIG_ATMEL_HLCD) && !defined(CONFIG_EXYNOS_FB) && !defined(CONFIG_VIDEO_GPM940B0)
+ 	return panel_info.cmap;
+ #else
+ #if defined(CONFIG_LCD_LOGO)
+diff --git a/drivers/video/Makefile b/drivers/video/Makefile
+index ebb6da8..03625bc 100644
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
+@@ -50,6 +50,7 @@ COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o
+ COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
+ COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
+ COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
++COBJS-$(CONFIG_VIDEO_GPM940B0) += nanonote_gpm940b0.o
+ 
+ COBJS	:= $(sort $(COBJS-y))
+ SRCS	:= $(COBJS:.o=.c)
+diff --git a/drivers/video/nanonote_gpm940b0.c b/drivers/video/nanonote_gpm940b0.c
+new file mode 100644
+index 0000000..11efb72
+--- /dev/null
++++ b/drivers/video/nanonote_gpm940b0.c
+@@ -0,0 +1,400 @@
++/*
++ * JzRISC lcd controller
++ *
++ * Xiangfu Liu <xiangfu@sharism.cc>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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 <config.h>
++#include <common.h>
++#include <lcd.h>
++
++#include <asm/io.h>               /* virt_to_phys() */
++#include <asm/jz4740.h>
++
++#include "nanonote_gpm940b0.h"
++
++#define align2(n) (n)=((((n)+1)>>1)<<1)
++#define align4(n) (n)=((((n)+3)>>2)<<2)
++#define align8(n) (n)=((((n)+7)>>3)<<3)
++
++struct jzfb_info {
++	unsigned int cfg;	/* panel mode and pin usage etc. */
++	unsigned int w;
++	unsigned int h;
++	unsigned int bpp;	/* bit per pixel */
++	unsigned int fclk;	/* frame clk */
++	unsigned int hsw;	/* hsync width, in pclk */
++	unsigned int vsw;	/* vsync width, in line count */
++	unsigned int elw;	/* end of line, in pclk */
++	unsigned int blw;	/* begin of line, in pclk */
++	unsigned int efw;	/* end of frame, in line count */
++	unsigned int bfw;	/* begin of frame, in line count */
++};
++
++static struct jzfb_info jzfb = {
++	MODE_8BIT_SERIAL_TFT | PCLK_N | HSYNC_N | VSYNC_N,
++	320, 240, 32, 70, 1, 1, 273, 140, 1, 20
++};
++
++vidinfo_t panel_info = {
++	320, 240, LCD_BPP,
++};
++
++void *lcd_base;
++void *lcd_console_address;
++int lcd_line_length;
++int lcd_color_fg;
++int lcd_color_bg;
++short console_col;
++short console_row;
++
++static int jz_lcd_init_mem(void *lcdbase, vidinfo_t *vid)
++{
++	u_long palette_mem_size;
++	struct jz_fb_info *fbi = &vid->jz_fb;
++	int fb_size = vid->vl_row * (vid->vl_col * NBITS (vid->vl_bpix)) / 8;
++
++	fbi->screen = (u_long)lcdbase;
++	fbi->palette_size = 256;
++	palette_mem_size = fbi->palette_size * sizeof(u16);
++
++	debug("jz_lcd.c palette_mem_size = 0x%08lx\n", (u_long) palette_mem_size);
++	/* locate palette and descs at end of page following fb */
++	fbi->palette = (u_long)lcdbase + fb_size + PAGE_SIZE - palette_mem_size;
++
++	return 0;
++}
++
++static void jz_lcd_desc_init(vidinfo_t *vid)
++{
++	struct jz_fb_info * fbi;
++	fbi = &vid->jz_fb;
++	fbi->dmadesc_fblow = (struct jz_fb_dma_descriptor *)((unsigned int)fbi->palette - 3*16);
++	fbi->dmadesc_fbhigh = (struct jz_fb_dma_descriptor *)((unsigned int)fbi->palette - 2*16);
++	fbi->dmadesc_palette = (struct jz_fb_dma_descriptor *)((unsigned int)fbi->palette - 1*16);
++
++	#define BYTES_PER_PANEL	 (vid->vl_col * vid->vl_row * NBITS(vid->vl_bpix) / 8)
++
++	/* populate descriptors */
++	fbi->dmadesc_fblow->fdadr = virt_to_phys(fbi->dmadesc_fblow);
++	fbi->dmadesc_fblow->fsadr = virt_to_phys((void *)(fbi->screen + BYTES_PER_PANEL));
++	fbi->dmadesc_fblow->fidr  = 0;
++	fbi->dmadesc_fblow->ldcmd = BYTES_PER_PANEL / 4 ;
++
++	fbi->fdadr1 = virt_to_phys(fbi->dmadesc_fblow); /* only used in dual-panel mode */
++
++	fbi->dmadesc_fbhigh->fsadr = virt_to_phys((void *)fbi->screen);
++	fbi->dmadesc_fbhigh->fidr = 0;
++	fbi->dmadesc_fbhigh->ldcmd =  BYTES_PER_PANEL / 4; /* length in word */
++
++	fbi->dmadesc_palette->fsadr = virt_to_phys((void *)fbi->palette);
++	fbi->dmadesc_palette->fidr  = 0;
++	fbi->dmadesc_palette->ldcmd = (fbi->palette_size * 2)/4 | (1<<28);
++
++	if(NBITS(vid->vl_bpix) < 12) {
++		/* assume any mode with <12 bpp is palette driven */
++		fbi->dmadesc_palette->fdadr = virt_to_phys(fbi->dmadesc_fbhigh);
++		fbi->dmadesc_fbhigh->fdadr = virt_to_phys(fbi->dmadesc_palette);
++		/* flips back and forth between pal and fbhigh */
++		fbi->fdadr0 = virt_to_phys(fbi->dmadesc_palette);
++	} else {
++		/* palette shouldn't be loaded in true-color mode */
++		fbi->dmadesc_fbhigh->fdadr = virt_to_phys((void *)fbi->dmadesc_fbhigh);
++		fbi->fdadr0 = virt_to_phys(fbi->dmadesc_fbhigh); /* no pal just fbhigh */
++	}
++}
++
++static int  jz_lcd_hw_init(vidinfo_t *vid)
++{
++	struct jz_fb_info *fbi = &vid->jz_fb;
++	unsigned int val = 0;
++	unsigned int pclk;
++	unsigned int stnH;
++	int pll_div;
++
++	/* Setting Control register */
++	switch (jzfb.bpp) {
++	case 1:
++		val |= LCD_CTRL_BPP_1;
++		break;
++	case 2:
++		val |= LCD_CTRL_BPP_2;
++		break;
++	case 4:
++		val |= LCD_CTRL_BPP_4;
++		break;
++	case 8:
++		val |= LCD_CTRL_BPP_8;
++		break;
++	case 15:
++		val |= LCD_CTRL_RGB555;
++	case 16:
++		val |= LCD_CTRL_BPP_16;
++		break;
++	case 17 ... 32:
++		val |= LCD_CTRL_BPP_18_24;	/* target is 4bytes/pixel */
++		break;
++
++	default:
++		printf("jz_lcd.c The BPP %d is not supported\n", jzfb.bpp);
++		val |= LCD_CTRL_BPP_16;
++		break;
++	}
++
++	switch (jzfb.cfg & MODE_MASK) {
++	case MODE_STN_MONO_DUAL:
++	case MODE_STN_COLOR_DUAL:
++	case MODE_STN_MONO_SINGLE:
++	case MODE_STN_COLOR_SINGLE:
++		switch (jzfb.bpp) {
++		case 1:
++			/* val |= LCD_CTRL_PEDN; */
++		case 2:
++			val |= LCD_CTRL_FRC_2;
++			break;
++		case 4:
++			val |= LCD_CTRL_FRC_4;
++			break;
++		case 8:
++		default:
++			val |= LCD_CTRL_FRC_16;
++			break;
++		}
++		break;
++	}
++
++	val |= LCD_CTRL_BST_16;		/* Burst Length is 16WORD=64Byte */
++	val |= LCD_CTRL_OFUP;		/* OutFIFO underrun protect */
++
++	switch (jzfb.cfg & MODE_MASK) {
++	case MODE_STN_MONO_DUAL:
++	case MODE_STN_COLOR_DUAL:
++	case MODE_STN_MONO_SINGLE:
++	case MODE_STN_COLOR_SINGLE:
++		switch (jzfb.cfg & STN_DAT_PINMASK) {
++		case STN_DAT_PIN1:
++			/* Do not adjust the hori-param value. */
++			break;
++		case STN_DAT_PIN2:
++			align2(jzfb.hsw);
++			align2(jzfb.elw);
++			align2(jzfb.blw);
++			break;
++		case STN_DAT_PIN4:
++			align4(jzfb.hsw);
++			align4(jzfb.elw);
++			align4(jzfb.blw);
++			break;
++		case STN_DAT_PIN8:
++			align8(jzfb.hsw);
++			align8(jzfb.elw);
++			align8(jzfb.blw);
++			break;
++		}
++		break;
++	}
++
++	REG_LCD_CTRL = val;
++
++	switch (jzfb.cfg & MODE_MASK) {
++	case MODE_STN_MONO_DUAL:
++	case MODE_STN_COLOR_DUAL:
++	case MODE_STN_MONO_SINGLE:
++	case MODE_STN_COLOR_SINGLE:
++		if (((jzfb.cfg & MODE_MASK) == MODE_STN_MONO_DUAL) ||
++		    ((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_DUAL))
++			stnH = jzfb.h >> 1;
++		else
++			stnH = jzfb.h;
++
++		REG_LCD_VSYNC = (0 << 16) | jzfb.vsw;
++		REG_LCD_HSYNC = ((jzfb.blw+jzfb.w) << 16) | (jzfb.blw+jzfb.w+jzfb.hsw);
++
++		/* Screen setting */
++		REG_LCD_VAT = ((jzfb.blw + jzfb.w + jzfb.hsw + jzfb.elw) << 16) | (stnH + jzfb.vsw + jzfb.bfw + jzfb.efw);
++		REG_LCD_DAH = (jzfb.blw << 16) | (jzfb.blw + jzfb.w);
++		REG_LCD_DAV = (0 << 16) | (stnH);
++
++		/* AC BIAs signal */
++		REG_LCD_PS = (0 << 16) | (stnH+jzfb.vsw+jzfb.efw+jzfb.bfw);
++
++		break;
++
++	case MODE_TFT_GEN:
++	case MODE_TFT_SHARP:
++	case MODE_TFT_CASIO:
++	case MODE_TFT_SAMSUNG:
++	case MODE_8BIT_SERIAL_TFT:
++	case MODE_TFT_18BIT:
++		REG_LCD_VSYNC = (0 << 16) | jzfb.vsw;
++		REG_LCD_HSYNC = (0 << 16) | jzfb.hsw;
++		REG_LCD_DAV =((jzfb.vsw+jzfb.bfw) << 16) | (jzfb.vsw +jzfb.bfw+jzfb.h);
++		REG_LCD_DAH = ((jzfb.hsw + jzfb.blw) << 16) | (jzfb.hsw + jzfb.blw + jzfb.w );
++		REG_LCD_VAT = (((jzfb.blw + jzfb.w + jzfb.elw + jzfb.hsw)) << 16) \
++			| (jzfb.vsw + jzfb.bfw + jzfb.h + jzfb.efw);
++		break;
++	}
++
++	switch (jzfb.cfg & MODE_MASK) {
++	case MODE_TFT_SAMSUNG:
++	{
++		unsigned int total, tp_s, tp_e, ckv_s, ckv_e;
++		unsigned int rev_s, rev_e, inv_s, inv_e;
++
++		pclk = val * (jzfb.w + jzfb.hsw + jzfb.elw + jzfb.blw) *
++			(jzfb.h + jzfb.vsw + jzfb.efw + jzfb.bfw); /* Pixclk */
++
++		total = jzfb.blw + jzfb.w + jzfb.elw + jzfb.hsw;
++		tp_s = jzfb.blw + jzfb.w + 1;
++		tp_e = tp_s + 1;
++		ckv_s = tp_s - pclk/(1000000000/4100);
++		ckv_e = tp_s + total;
++		rev_s = tp_s - 11;	/* -11.5 clk */
++		rev_e = rev_s + total;
++		inv_s = tp_s;
++		inv_e = inv_s + total;
++		REG_LCD_CLS = (tp_s << 16) | tp_e;
++		REG_LCD_PS = (ckv_s << 16) | ckv_e;
++		REG_LCD_SPL = (rev_s << 16) | rev_e;
++		REG_LCD_REV = (inv_s << 16) | inv_e;
++		jzfb.cfg |= STFT_REVHI | STFT_SPLHI;
++		break;
++	}
++	case MODE_TFT_SHARP:
++	{
++		unsigned int total, cls_s, cls_e, ps_s, ps_e;
++		unsigned int spl_s, spl_e, rev_s, rev_e;
++		total = jzfb.blw + jzfb.w + jzfb.elw + jzfb.hsw;
++		spl_s = 1;
++		spl_e = spl_s + 1;
++		cls_s = 0;
++		cls_e = total - 60;	/* > 4us (pclk = 80ns) */
++		ps_s = cls_s;
++		ps_e = cls_e;
++		rev_s = total - 40;	/* > 3us (pclk = 80ns) */
++		rev_e = rev_s + total;
++		jzfb.cfg |= STFT_PSHI; 
++		REG_LCD_SPL = (spl_s << 16) | spl_e;
++		REG_LCD_CLS = (cls_s << 16) | cls_e;
++		REG_LCD_PS = (ps_s << 16) | ps_e;
++		REG_LCD_REV = (rev_s << 16) | rev_e;
++		break;
++	}
++	case MODE_TFT_CASIO:
++		break;
++	}
++
++	/* Configure the LCD panel */
++	REG_LCD_CFG = jzfb.cfg;
++
++	/* Timing setting */
++	__cpm_stop_lcd();
++
++	val = jzfb.fclk; /* frame clk */
++	if ( (jzfb.cfg & MODE_MASK) != MODE_8BIT_SERIAL_TFT) {
++		pclk = val * (jzfb.w + jzfb.hsw + jzfb.elw + jzfb.blw) *
++			(jzfb.h + jzfb.vsw + jzfb.efw + jzfb.bfw); /* Pixclk */
++	} else {
++		/* serial mode: Hsync period = 3*Width_Pixel */
++		pclk = val * (jzfb.w*3 + jzfb.hsw + jzfb.elw + jzfb.blw) *
++			(jzfb.h + jzfb.vsw + jzfb.efw + jzfb.bfw); /* Pixclk */
++	}
++
++	if (((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_SINGLE) ||
++	    ((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_DUAL))
++		pclk = (pclk * 3);
++
++	if (((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_SINGLE) ||
++	    ((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_DUAL) ||
++	    ((jzfb.cfg & MODE_MASK) == MODE_STN_MONO_SINGLE) ||
++	    ((jzfb.cfg & MODE_MASK) == MODE_STN_MONO_DUAL))
++		pclk = pclk >> ((jzfb.cfg & STN_DAT_PINMASK) >> 4);
++
++	if (((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_DUAL) ||
++	    ((jzfb.cfg & MODE_MASK) == MODE_STN_MONO_DUAL))
++		pclk >>= 1;
++
++	pll_div = (REG_CPM_CPCCR & CPM_CPCCR_PCS); /* clock source,0:pllout/2 1: pllout */
++	pll_div = pll_div ? 1 : 2;
++	val = (__cpm_get_pllout() / pll_div) / pclk;
++	val--;
++	if (val > 0x1ff) {
++		printf("CPM_LPCDR too large, set it to 0x1ff\n");
++		val = 0x1ff;
++	}
++	__cpm_set_pixdiv(val);
++
++	val = pclk * 3 ;	/* LCDClock > 2.5*Pixclock */
++	if (val > 150000000) {
++		printf("Warning: LCDClock=%d\n, LCDClock must less or equal to 150MHz.\n", val);
++		printf("Change LCDClock to 150MHz\n");
++		val = 150000000;
++	}
++	val = (__cpm_get_pllout() / pll_div) / val;
++	val--;
++	if (val > 0x1f) {
++		printf("CPM_CPCCR.LDIV too large, set it to 0x1f\n");
++		val = 0x1f;
++	}
++	__cpm_set_ldiv( val );
++	REG_CPM_CPCCR |= CPM_CPCCR_CE ; /* update divide */
++
++	__cpm_start_lcd();
++	udelay(1000);
++
++	REG_LCD_DA0 = fbi->fdadr0; /* frame descripter*/
++
++	if (((jzfb.cfg & MODE_MASK) == MODE_STN_COLOR_DUAL) ||
++	    ((jzfb.cfg & MODE_MASK) == MODE_STN_MONO_DUAL))
++		REG_LCD_DA1 = fbi->fdadr1; /* frame descripter*/
++
++	return 0;
++}
++
++void lcd_ctrl_init (void *lcdbase)
++{
++	__lcd_display_pin_init();
++	__lcd_display_on() ;
++
++	jz_lcd_init_mem(lcdbase, &panel_info);
++	jz_lcd_desc_init(&panel_info);
++	jz_lcd_hw_init(&panel_info);
++
++}
++
++/*
++ * Before enabled lcd controller, lcd registers should be configured correctly.
++ */
++void lcd_enable (void)
++{
++	REG_LCD_CTRL &= ~(1<<4); /* LCDCTRL.DIS */
++	REG_LCD_CTRL |= 1<<3;    /* LCDCTRL.ENA*/
++}
++
++void lcd_disable (void)
++{
++	REG_LCD_CTRL |= (1<<4);
++}
++
++void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue)
++{
++}
++
++void lcd_initcolregs (void)
++{
++}
+diff --git a/drivers/video/nanonote_gpm940b0.h b/drivers/video/nanonote_gpm940b0.h
+new file mode 100644
+index 0000000..efe491e
+--- /dev/null
++++ b/drivers/video/nanonote_gpm940b0.h
+@@ -0,0 +1,135 @@
++/*
++ * JzRISC lcd controller
++ *
++ * Xiangfu Liu <xiangfu@sharism.cc>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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 __QI_LB60_GPM940B0_H__
++#define __QI_LB60_GPM940B0_H__
++
++struct lcd_desc{
++	unsigned int next_desc; /* LCDDAx */
++	unsigned int databuf;   /* LCDSAx */
++	unsigned int frame_id;  /* LCDFIDx */ 
++	unsigned int cmd;       /* LCDCMDx */
++};
++
++#define MODE_MASK		0x0f
++#define MODE_TFT_GEN		0x00
++#define MODE_TFT_SHARP		0x01
++#define MODE_TFT_CASIO		0x02
++#define MODE_TFT_SAMSUNG	0x03
++#define MODE_CCIR656_NONINT	0x04
++#define MODE_CCIR656_INT	0x05
++#define MODE_STN_COLOR_SINGLE	0x08
++#define MODE_STN_MONO_SINGLE	0x09
++#define MODE_STN_COLOR_DUAL	0x0a
++#define MODE_STN_MONO_DUAL	0x0b
++#define MODE_8BIT_SERIAL_TFT    0x0c
++
++#define MODE_TFT_18BIT          (1<<7)
++
++#define STN_DAT_PIN1	(0x00 << 4)
++#define STN_DAT_PIN2	(0x01 << 4)
++#define STN_DAT_PIN4	(0x02 << 4)
++#define STN_DAT_PIN8	(0x03 << 4)
++#define STN_DAT_PINMASK	STN_DAT_PIN8
++
++#define STFT_PSHI	(1 << 15)
++#define STFT_CLSHI	(1 << 14)
++#define STFT_SPLHI	(1 << 13)
++#define STFT_REVHI	(1 << 12)
++
++#define SYNC_MASTER	(0 << 16)
++#define SYNC_SLAVE	(1 << 16)
++
++#define DE_P		(0 << 9)
++#define DE_N		(1 << 9)
++
++#define PCLK_P		(0 << 10)
++#define PCLK_N		(1 << 10)
++
++#define HSYNC_P		(0 << 11)
++#define HSYNC_N		(1 << 11)
++
++#define VSYNC_P		(0 << 8)
++#define VSYNC_N		(1 << 8)
++
++#define DATA_NORMAL	(0 << 17)
++#define DATA_INVERSE	(1 << 17)
++
++
++/* Jz LCDFB supported I/O controls. */
++#define FBIOSETBACKLIGHT	0x4688
++#define FBIODISPON		0x4689
++#define FBIODISPOFF		0x468a
++#define FBIORESET		0x468b
++#define FBIOPRINT_REG		0x468c
++
++/*
++ * LCD panel specific definition
++ */
++#define MODE	(0xc9)		/* 8bit serial RGB */
++
++#define __spi_write_reg1(reg, val)		\
++do {						\
++	unsigned char no;			\
++	unsigned short value;			\
++	unsigned char a=reg;			\
++	unsigned char b=val;			\
++	__gpio_set_pin(SPEN);			\
++	__gpio_set_pin(SPCK);			\
++	__gpio_clear_pin(SPDA);			\
++	__gpio_clear_pin(SPEN);			\
++	value=((a<<8)|(b&0xFF));		\
++	for(no=0;no<16;no++)			\
++	{					\
++		__gpio_clear_pin(SPCK);		\
++		if((value&0x8000)==0x8000)	\
++			__gpio_set_pin(SPDA);	\
++		else				\
++			__gpio_clear_pin(SPDA);	\
++		__gpio_set_pin(SPCK);		\
++		value=(value<<1);		\
++	}					\
++	__gpio_set_pin(SPEN);			\
++} while (0)
++
++#define __lcd_display_pin_init()		\
++do {						\
++	__cpm_start_tcu();			\
++	__gpio_as_output(SPEN); /* use SPDA */	\
++	__gpio_as_output(SPCK); /* use SPCK */	\
++	__gpio_as_output(SPDA); /* use SPDA */	\
++} while (0)
++
++#define __lcd_display_on()			\
++do {						\
++	__spi_write_reg1(0x05, 0x1e);		\
++	__spi_write_reg1(0x05, 0x5e);		\
++	__spi_write_reg1(0x07, 0x8d);		\
++	__spi_write_reg1(0x13, 0x01);		\
++	__spi_write_reg1(0x05, 0x5f);		\
++} while (0)
++
++#define __lcd_display_off()			\
++do {						\
++	__spi_write_reg1(0x05, 0x5e);		\
++} while (0)
++
++#endif /* __QI_LB60_GPM940B0_H__ */
+diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h
+index 52b370c..d3e78ad 100644
+--- a/include/configs/qi_lb60.h
++++ b/include/configs/qi_lb60.h
+@@ -32,6 +32,13 @@
+  * Miscellaneous configurable options
+  */
+ #define CONFIG_NANONOTE
++
++#define CONFIG_LCD
++#define CONFIG_SYS_WHITE_ON_BLACK
++#define LCD_BPP			LCD_COLOR32
++#define CONFIG_VIDEO_GPM940B0
++
++
+ #define CONFIG_JZ4740_MMC
+ #define CONFIG_MMC      	1
+ #define CONFIG_FAT      	1
+diff --git a/include/lcd.h b/include/lcd.h
+index 42070d7..6de5482 100644
+--- a/include/lcd.h
++++ b/include/lcd.h
+@@ -263,8 +263,44 @@ typedef struct vidinfo {
+ 
+ void init_panel_info(vidinfo_t *vid);
+ 
+-#else
++#elif defined(CONFIG_JZSOC)
++/*
++ * LCD controller stucture for JZSOC: JZ4740
++ */
++struct jz_fb_dma_descriptor {
++       u_long  fdadr;          /* Frame descriptor address register */
++       u_long  fsadr;          /* Frame source address register */
++       u_long  fidr;           /* Frame ID register */
++       u_long  ldcmd;          /* Command register */
++};
++
++/*
++ * Jz LCD info
++ */
++struct jz_fb_info {
++
++       u_long  fdadr0; /* physical address of frame/palette descriptor */
++       u_long  fdadr1; /* physical address of frame descriptor */
++
++       /* DMA descriptors */
++       struct  jz_fb_dma_descriptor *  dmadesc_fblow;
++       struct  jz_fb_dma_descriptor *  dmadesc_fbhigh;
++       struct  jz_fb_dma_descriptor *  dmadesc_palette;
++       u_long  screen;         /* address of frame buffer */
++       u_long  palette;        /* address of palette memory */
++       u_int   palette_size;
++};
++typedef struct vidinfo {
++       ushort  vl_col;         /* Number of columns (i.e. 640) */
++       ushort  vl_row;         /* Number of rows (i.e. 480) */
++       u_char  vl_bpix;        /* Bits per pixel, 0 = 1, 1 = 2, 2 = 4, 3 = 8 */
++
++       struct jz_fb_info jz_fb;
++} vidinfo_t;
++
++extern vidinfo_t panel_info;
+ 
++#else
+ typedef struct vidinfo {
+ 	ushort	vl_col;		/* Number of columns (i.e. 160) */
+ 	ushort	vl_row;		/* Number of rows (i.e. 100) */
+@@ -318,6 +354,7 @@ void lcd_show_board_info(void);
+ #define LCD_COLOR4	2
+ #define LCD_COLOR8	3
+ #define LCD_COLOR16	4
++#define LCD_COLOR32	5
+ 
+ /*----------------------------------------------------------------------*/
+ #if defined(CONFIG_LCD_INFO_BELOW_LOGO)
+@@ -369,7 +406,7 @@ void lcd_show_board_info(void);
+ # define CONSOLE_COLOR_GREY	14
+ # define CONSOLE_COLOR_WHITE	15	/* Must remain last / highest	*/
+ 
+-#else
++#elif LCD_BPP == LCD_COLOR16
+ 
+ /*
+  * 16bpp color definitions
+@@ -377,6 +414,15 @@ void lcd_show_board_info(void);
+ # define CONSOLE_COLOR_BLACK	0x0000
+ # define CONSOLE_COLOR_WHITE	0xffff	/* Must remain last / highest	*/
+ 
++#elif LCD_BPP == LCD_COLOR32
++/*
++ * 18,24,32 bpp color definitions
++ */
++# define CONSOLE_COLOR_BLACK   0x00000000
++# define CONSOLE_COLOR_WHITE   0xffffffff /* Must remain last / highest */
++
++#else
++
+ #endif /* color definitions */
+ 
+ /************************************************************************/
+@@ -406,7 +452,7 @@ void lcd_show_board_info(void);
+ #if LCD_BPP == LCD_MONOCHROME
+ # define COLOR_MASK(c)		((c)	  | (c) << 1 | (c) << 2 | (c) << 3 | \
+ 				 (c) << 4 | (c) << 5 | (c) << 6 | (c) << 7)
+-#elif (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16)
++#elif (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16) || (LCD_BPP == LCD_COLOR32)
+ # define COLOR_MASK(c)		(c)
+ #else
+ # error Unsupported LCD BPP.
+-- 
+1.7.9.5
+
diff --git a/trunk/package/boot/uboot-xburst/patches/0006-enable-silent-console.patch b/trunk/package/boot/uboot-xburst/patches/0006-enable-silent-console.patch
new file mode 100644
index 00000000..ebd6a6a7
--- /dev/null
+++ b/trunk/package/boot/uboot-xburst/patches/0006-enable-silent-console.patch
@@ -0,0 +1,60 @@
+From 5eb4d4c598f2806bd1b3d1140e917bfead7851ad Mon Sep 17 00:00:00 2001
+From: Xiangfu <xiangfu@openmobilefree.net>
+Date: Wed, 10 Oct 2012 23:51:26 +0800
+Subject: [PATCH 6/6] enable silent console
+
+---
+ common/console.c          |   16 ++++++++++++++++
+ include/configs/qi_lb60.h |    2 ++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/common/console.c b/common/console.c
+index 1177f7d..e8a2078 100644
+--- a/common/console.c
++++ b/common/console.c
+@@ -685,6 +685,14 @@ done:
+ 
+ 	gd->flags |= GD_FLG_DEVINIT;	/* device initialization completed */
+ 
++#ifdef CONFIG_SILENT_CONSOLE
++	/* Check one more time the contents of the silent environment
++	 * variable, because if the environment is loaded from NAND it was
++	 * not available when console_init_f() was called */
++	if (getenv("silent") != NULL)
++		gd->flags |= GD_FLG_SILENT;
++#endif
++
+ 	stdio_print_current_devices();
+ 
+ #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
+@@ -760,6 +768,14 @@ int console_init_r(void)
+ 
+ 	gd->flags |= GD_FLG_DEVINIT;	/* device initialization completed */
+ 
++#ifdef CONFIG_SILENT_CONSOLE
++	/* Check one more time the contents of the silent environment
++	 * variable, because if the environment is loaded from NAND it was
++	 * not available when console_init_f() was called */
++	if (getenv("silent") != NULL)
++		gd->flags |= GD_FLG_SILENT;
++#endif
++
+ 	stdio_print_current_devices();
+ 
+ 	/* Setting environment variables */
+diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h
+index d3e78ad..a3534ff 100644
+--- a/include/configs/qi_lb60.h
++++ b/include/configs/qi_lb60.h
+@@ -102,6 +102,8 @@
+ #define CONFIG_SYS_NO_FLASH
+ #define CONFIG_SYS_FLASH_BASE	0 /* init flash_base as 0 */
+ 
++#define CONFIG_SILENT_CONSOLE		1	/* Enable silent console */
++
+ /*
+  * Command line configuration
+  */
+-- 
+1.7.9.5
+
diff --git a/trunk/package/devel/binutils/Makefile b/trunk/package/devel/binutils/Makefile
new file mode 100644
index 00000000..ff968b98
--- /dev/null
+++ b/trunk/package/devel/binutils/Makefile
@@ -0,0 +1,83 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=binutils
+PKG_VERSION:=2.24
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=@GNU/binutils
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_VERSION:=$(PKG_VERSION)
+PKG_MD5SUM:=e0f71a7b2ddab0f8612336ac81d9636b
+
+PKG_FIXUP:=autoreconf
+PKG_LIBTOOL_PATHS:=. gas bfd opcodes gprof binutils ld libiberty gold intl
+PKG_REMOVE_FILES:=libtool.m4
+PKG_INSTALL:=1
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-3.0+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/binutils
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=binutils
+  DEPENDS:=+objdump
+endef
+
+define Package/objdump
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=objdump
+  DEPENDS:=+zlib 
+endef
+
+define Package/binutils/description
+  The Binutils package contains a linker, an assembler, and other tools for handling object files
+endef
+
+TARGET_CFLAGS += $(FPIC) -Wno-unused-value
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-install-libiberty \
+	--enable-install-libbfd
+
+define Build/Install
+	$(call Build/Install/Default)
+	$(MAKE) -C $(PKG_BUILD_DIR)/libiberty \
+		target_header_dir=libiberty \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		MULTIOSDIR="" \
+		install
+endef
+
+define Build/InstallDev
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/objdump/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/objdump $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopcodes*.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbfd*.so $(1)/usr/lib/
+endef
+
+define Package/binutils/install
+	$(INSTALL_DIR) $(1)/usr $(1)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/
+	mv $(1)/usr/bin/strings $(1)/bin/strings
+	rm -f $(1)/usr/bin/objdump
+endef
+
+$(eval $(call BuildPackage,binutils))
+$(eval $(call BuildPackage,objdump))
diff --git a/trunk/package/devel/diffutils/Makefile b/trunk/package/devel/diffutils/Makefile
new file mode 100644
index 00000000..33cdc121
--- /dev/null
+++ b/trunk/package/devel/diffutils/Makefile
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=diffutils
+PKG_VERSION:=3.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/diffutils
+PKG_MD5SUM:=99180208ec2a82ce71f55b0d7389f1b3
+PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
+PKG_LICENSE:=GPL-3.0
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/diffutils
+  SECTION:=devel
+  CATEGORY:=Development
+  DEPENDS:=+USE_EGLIBC:librt
+  TITLE:=diffutils
+  URL:=http://www.gnu.org/software/diffutils/
+endef
+
+define Package/diffutils/description
+  The Diffutils package contains programs that show the differences between
+  files or directories.
+endef
+
+CONFIGURE_VARS += \
+	ac_cv_func_mempcpy=n
+TARGET_CFLAGS += --std=c99
+
+define Package/diffutils/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3,diff,cmp} $(1)/usr/bin/
+endef
+
+define Package/diffutils/preinst
+#!/bin/sh
+for x in sdiff diff3 diff cmp; do
+  [ -L "$${IPKG_INSTROOT}/usr/bin/$$x" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/$$x"
+done
+exit 0
+endef
+
+define Package/diffutils/postrm
+#!/bin/sh
+for x in sdiff diff3 diff cmp; do
+  /bin/busybox $$x -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/$$x
+done
+exit 0
+endef
+
+$(eval $(call BuildPackage,diffutils))
diff --git a/trunk/package/devel/gcc/Makefile b/trunk/package/devel/gcc/Makefile
new file mode 100644
index 00000000..c8d87335
--- /dev/null
+++ b/trunk/package/devel/gcc/Makefile
@@ -0,0 +1,115 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gcc
+PKG_VERSION:=4.8.3
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \
+     http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \
+    ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=7c60f24fab389f77af203d2516ee110f
+PKG_INSTALL:=1
+PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_LANGUAGES:="c,c++"
+BUGURL=https://dev.openwrt.org/
+PKGVERSION=OpenWrt GCC $(PKG_VERSION)
+
+# not using sstrip here as this fucks up the .so's somehow
+STRIP:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)strip
+RSTRIP:= \
+       NM="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)nm" \
+       STRIP="$(STRIP)" \
+       STRIP_KMOD="$(STRIP) --strip-debug" \
+       $(SCRIPT_DIR)/rstrip.sh
+
+
+define Package/gcc
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=gcc
+  MAINTAINER:=Christian Beier <cb@shoutrlabs.com>
+  DEPENDS:= +binutils +libstdcpp
+endef
+
+define Package/gcc/description
+	build a native toolchain for compiling on target
+endef
+
+
+define Build/Prepare
+	$(PKG_UNPACK)
+# 	we have to download additional stuff before patching
+	(cd $(PKG_BUILD_DIR) && ./contrib/download_prerequisites)
+	$(Build/Patch)
+endef
+
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+		SHELL="$(BASH)" \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(PKG_BUILD_DIR)/configure \
+			$(CONFIGURE_ARGS) \
+			--build=$(GNU_HOST_NAME) \
+			--host=$(REAL_GNU_TARGET_NAME) \
+			--target=$(REAL_GNU_TARGET_NAME) \
+			--enable-languages=$(TARGET_LANGUAGES) \
+			--with-bugurl=$(BUGURL) \
+			--with-pkgversion="$(PKGVERSION)" \
+			--enable-shared \
+			--disable-__cxa_atexit \
+			--enable-target-optspace \
+			--with-gnu-ld \
+			--disable-nls \
+			--disable-libmudflap \
+			--disable-multilib \
+			--disable-libgomp \
+			--disable-libquadmath \
+			--disable-libssp \
+			--disable-decimal-float \
+			--disable-libstdcxx-pch \
+			--with-host-libstdcxx=-lstdc++ \
+			--prefix=/usr \
+			--libexecdir=/usr/lib \
+			$(SOFT_FLOAT_CONFIG_OPTION) \
+			$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
+			$(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 \
+			--with-abi=$(subst ",,$(CONFIG_MIPS64_ABI))) \
+	);
+endef
+
+define Build/Compile
+	export SHELL="$(BASH)"; $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
+			DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE_ARGS) all install
+endef
+
+define Package/gcc/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
+	cp -ar $(PKG_INSTALL_DIR)/usr/include $(1)/usr
+	cp -a $(PKG_INSTALL_DIR)/usr/bin/{$(REAL_GNU_TARGET_NAME)-{g++,gcc},cpp,gcov} $(1)/usr/bin
+	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/c++
+	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/g++
+	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++
+	ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/gcc
+	ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc-$(PKG_VERSION)
+	cp -ar $(PKG_INSTALL_DIR)/usr/lib/gcc $(1)/usr/lib
+	$(RM) $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)/*.a
+	cp -ar $(TOOLCHAIN_DIR)/include $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
+	cp -a $(TOOLCHAIN_DIR)/lib/*.{o,so*} $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
+	cp -a $(TOOLCHAIN_DIR)/lib/*nonshared*.a  $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)
+endef
+
+$(eval $(call BuildPackage,gcc))
diff --git a/trunk/package/devel/gcc/README b/trunk/package/devel/gcc/README
new file mode 100644
index 00000000..6cbc80d2
--- /dev/null
+++ b/trunk/package/devel/gcc/README
@@ -0,0 +1,8 @@
+Native GCC that runs on target.
+
+To save disk space, this GCC only supports dynamic linking on the target box,
+there are no static libraries shipped.
+
+For now, this was only tested on a mips target. Others to be done...
+
+   Christian Beier <cb@shoutrlabs.com>
\ No newline at end of file
diff --git a/trunk/package/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch b/trunk/package/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
new file mode 100644
index 00000000..84729605
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
@@ -0,0 +1,15 @@
+diff --git a/gcc/real.h b/gcc/real.h
+index 2ff84f6..fbb4b0e 100644
+--- a/gcc/real.h
++++ b/gcc/real.h
+@@ -72,8 +72,10 @@ struct GTY(()) real_value {
+    + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */
+ 
+ /* Verify the guess.  */
++#ifndef __LP64__
+ extern char test_real_width
+   [sizeof(REAL_VALUE_TYPE) <= REAL_WIDTH*sizeof(HOST_WIDE_INT) ? 1 : -1];
++#endif
+ 
+ /* Calculate the format for CONST_DOUBLE.  We need as many slots as
+    are necessary to overlay a REAL_VALUE_TYPE on them.  This could be
diff --git a/trunk/package/devel/gcc/patches/003-mpfr-longlong-mips.patch b/trunk/package/devel/gcc/patches/003-mpfr-longlong-mips.patch
new file mode 100644
index 00000000..0ab9fe50
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/003-mpfr-longlong-mips.patch
@@ -0,0 +1,38 @@
+diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
+--- -a/mpfr-2.4.2/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
++++ -b/mpfr-2.4.2/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
+@@ -1011,7 +1011,15 @@
+ #endif /* __m88000__ */
+ 
+ #if defined (__mips) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {									\
++    UDItype _r;							\
++    _r = (UDItype) u * v;						\
++    (w1) = _r >> 32;							\
++    (w0) = (USItype) _r;						\
++  } while (0)
++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+ #else
+@@ -1024,7 +1032,16 @@
+ #endif /* __mips */
+ 
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
++typedef unsigned int UTItype __attribute__ ((mode (TI)));
++#define umul_ppmm(w1, w0, u, v) \
++  do {									\
++    UTItype _r;							\
++    _r = (UTItype) u * v;						\
++    (w1) = _r >> 64;							\
++    (w0) = (UDItype) _r;						\
++  } while (0)
++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+ #else
diff --git a/trunk/package/devel/gcc/patches/010-documentation.patch b/trunk/package/devel/gcc/patches/010-documentation.patch
new file mode 100644
index 00000000..3f604ee4
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/010-documentation.patch
@@ -0,0 +1,23 @@
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -4326,18 +4326,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
+ doc/gccint.info: $(TEXI_GCCINT_FILES)
+ doc/cppinternals.info: $(TEXI_CPPINT_FILES)
+ 
+-doc/%.info: %.texi
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/%.info:
+ 
+ # Duplicate entry to handle renaming of gccinstall.info
+-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/gccinstall.info:
+ 
+ doc/cpp.dvi: $(TEXI_CPP_FILES)
+ doc/gcc.dvi: $(TEXI_GCC_FILES)
diff --git a/trunk/package/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch b/trunk/package/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch
new file mode 100644
index 00000000..afc5cfdc
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch
@@ -0,0 +1,45 @@
+diff --git a/gcc/configure b/gcc/configure
+index 3793681..bcda752 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -26876,19 +26876,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>confdefs.h
+ 
+ fi
+ 
+-# Test for <sys/sdt.h> on the target.
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
+-$as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
+-have_sys_sdt_h=no
+-if test -f $target_header_dir/sys/sdt.h; then
+-  have_sys_sdt_h=yes
+-
+-$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
+-$as_echo "$have_sys_sdt_h" >&6; }
+ 
+ # Check if TFmode long double should be used by default or not.
+ # Some glibc targets used DFmode long double, but with glibc 2.4
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 3ee1d67..e321218 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -4796,16 +4796,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
+ 	    [Define if your target C library provides stack protector support])
+ fi
+ 
+-# Test for <sys/sdt.h> on the target.
+-GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
+-AC_MSG_CHECKING(sys/sdt.h in the target C library)
+-have_sys_sdt_h=no
+-if test -f $target_header_dir/sys/sdt.h; then
+-  have_sys_sdt_h=yes
+-  AC_DEFINE(HAVE_SYS_SDT_H, 1,
+-            [Define if your target C library provides sys/sdt.h])
+-fi
+-AC_MSG_RESULT($have_sys_sdt_h)
+ 
+ # Check if TFmode long double should be used by default or not.
+ # Some glibc targets used DFmode long double, but with glibc 2.4
diff --git a/trunk/package/devel/gcc/patches/100-uclibc-conf.patch b/trunk/package/devel/gcc/patches/100-uclibc-conf.patch
new file mode 100644
index 00000000..ff9ad94f
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- a/libjava/classpath/ltconfig
++++ b/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/trunk/package/devel/gcc/patches/200-musl.patch b/trunk/package/devel/gcc/patches/200-musl.patch
new file mode 100644
index 00000000..2e6df47e
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/200-musl.patch
@@ -0,0 +1,321 @@
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -549,7 +549,7 @@ case ${target} in
+ esac
+ 
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+ 
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -652,6 +652,9 @@ case ${target} in
+     *-*-*uclibc*)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+       ;;
++    *-*-*musl*)
++      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++      ;;
+     *)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+       ;;
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -77,6 +77,10 @@
+     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
+     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+ 
++/* musl has no "classic" (i.e. broken) mode */
++#undef  MUSL_DYNAMIC_LINKER
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+--- a/gcc/config/i386/linux.h
++++ b/gcc/config/i386/linux.h
+@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.
+ 
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+--- a/gcc/config/i386/linux64.h
++++ b/gcc/config/i386/linux64.h
+@@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
+ #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
+ #endif
+ 
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
+@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+ 
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
+-  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
++  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+ 
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTI
+ 
+ #define GNU_USER_DYNAMIC_LINKER						\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
+-			 BIONIC_DYNAMIC_LINKER)
++			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+-			 BIONIC_DYNAMIC_LINKER32)
++			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+-			 BIONIC_DYNAMIC_LINKER64)
++			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+-			 BIONIC_DYNAMIC_LINKERX32)
++			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+ 
+ /* Determine whether the entire c99 runtime
+    is present in the runtime library.  */
+--- a/gcc/config/linux.opt
++++ b/gcc/config/linux.opt
+@@ -30,3 +30,7 @@ Use GNU C library
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -18,3 +18,5 @@ along with GCC; see the file COPYING3.
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -364,17 +364,21 @@ extern int dot_symbols;
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ 
+ 
+ #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -789,15 +789,18 @@ extern int fixuplabelno;
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ 
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__	/* BeOS */
+ #define __SIZE_T__	/* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -197,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+   || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t;
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+--- a/libgomp/config/posix/time.c
++++ b/libgomp/config/posix/time.c
+@@ -28,6 +28,8 @@
+    The following implementation uses the most simple POSIX routines.
+    If present, POSIX 4 clocks should be used instead.  */
+ 
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
+--- a/libitm/config/arm/hwcap.cc
++++ b/libitm/config/arm/hwcap.cc
+@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
+ 
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+ 
+ static void __attribute__((constructor))
+--- a/libitm/config/linux/x86/tls.h
++++ b/libitm/config/linux/x86/tls.h
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+    GLIBC has reserved words 10 through 13 for TM.  */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+ 
+ #include "config/generic/tls.h"
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+ 
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a
+ 
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+ 
+ #endif // LIBITM_X86_TLS_H
+--- a/libstdc++-v3/configure.host
++++ b/libstdc++-v3/configure.host
+@@ -264,6 +264,13 @@ case "${host_os}" in
+     os_include_dir="os/bsd/freebsd"
+     ;;
+   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++    # check for musl by target
++    case "${host_os}" in
++      *-musl*)
++        os_include_dir="os/generic"
++        ;;
++      *)
++
+     if [ "$uclibc" = "yes" ]; then
+       os_include_dir="os/uclibc"
+     elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@ case "${host_os}" in
+       os_include_dir="os/gnu-linux"
+     fi
+     ;;
++
++    esac
++    ;;
+   hpux*)
+     os_include_dir="os/hpux"
+     ;;
+--- a/gcc/config/mips/linux64.h
++++ b/gcc/config/mips/linux64.h
+@@ -27,6 +27,9 @@ along with GCC; see the file COPYING3.
+ #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
+ #define GNU_USER_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
+-			 BIONIC_DYNAMIC_LINKERN32)
++			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
+--- a/gcc/config/sparc/linux64.h       2013-09-10 10:02:45.663973856 +0100
++++ b/gcc/config/sparc/linux64.h       2013-09-10 10:03:17.871972435 +0100
+@@ -104,6 +104,9 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+ 
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1"
++
+ #ifdef SPARC_BI_ARCH
+ 
+ #undef SUBTARGET_EXTRA_SPECS
+
diff --git a/trunk/package/devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch b/trunk/package/devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
new file mode 100644
index 00000000..ae4f6516
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/arm/arm.h
++++ b/gcc/config/arm/arm.h
+@@ -271,7 +271,7 @@ extern void (*arm_lang_output_object_att
+ /* Thumb-1 only.  */
+ #define TARGET_THUMB1_ONLY		(TARGET_THUMB1 && !arm_arch_notm)
+ 
+-#define TARGET_LDRD			(arm_arch5e && ARM_DOUBLEWORD_ALIGN \
++#define TARGET_LDRD			(arm_arch6 && ARM_DOUBLEWORD_ALIGN \
+                                          && !TARGET_THUMB1)
+ 
+ /* The following two macros concern the ability to execute coprocessor
diff --git a/trunk/package/devel/gcc/patches/810-arm-softfloat-libgcc.patch b/trunk/package/devel/gcc/patches/810-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..33cf8add
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,25 @@
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,10 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -55,8 +55,6 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
+-
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} \
diff --git a/trunk/package/devel/gcc/patches/820-libgcc_pic.patch b/trunk/package/devel/gcc/patches/820-libgcc_pic.patch
new file mode 100644
index 00000000..7a0ac735
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/820-libgcc_pic.patch
@@ -0,0 +1,36 @@
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -865,11 +865,12 @@ $(libgcov-objects): %$(objext): $(srcdir
+ 
+ # Static libraries.
+ libgcc.a: $(libgcc-objects)
++libgcc_pic.a: $(libgcc-s-objects)
+ libgcov.a: $(libgcov-objects)
+ libunwind.a: $(libunwind-objects)
+ libgcc_eh.a: $(libgcc-eh-objects)
+ 
+-libgcc.a libgcov.a libunwind.a libgcc_eh.a:
++libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
+ 	-rm -f $@
+ 
+ 	objects="$(objects)";					\
+@@ -891,7 +892,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E
+ endif
+ 
+ ifeq ($(enable_shared),yes)
+-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
++all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
+ ifneq ($(LIBUNWIND),)
+ all: libunwind$(SHLIB_EXT)
+ endif
+@@ -1058,6 +1059,10 @@ install-shared:
+ 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 
++	$(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
++	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++
+ 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
diff --git a/trunk/package/devel/gcc/patches/830-arm_unbreak_armv4t.patch b/trunk/package/devel/gcc/patches/830-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..37f8f2a5
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/830-arm_unbreak_armv4t.patch
@@ -0,0 +1,13 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/trunk/package/devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch b/trunk/package/devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
new file mode 100644
index 00000000..e938905a
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
@@ -0,0 +1,19 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -81,10 +81,15 @@
+ #undef  MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
+ 
++/* For armv4 we pass --fix-v4bx to linker to support EABI */
++#undef TARGET_FIX_V4BX_SPEC
++#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
++  "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+-#define LINK_SPEC BE8_LINK_SPEC						\
++#define LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC			\
+   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
+ 		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
+ 
diff --git a/trunk/package/devel/gcc/patches/850-use_shared_libgcc.patch b/trunk/package/devel/gcc/patches/850-use_shared_libgcc.patch
new file mode 100644
index 00000000..2c7369fc
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/850-use_shared_libgcc.patch
@@ -0,0 +1,47 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -114,10 +114,6 @@
+ #define ENDFILE_SPEC \
+   LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
+ 
+-/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
+-   do not use -lfloat.  */
+-#undef LIBGCC_SPEC
+-
+ /* Clear the instruction cache from `beg' to `end'.  This is
+    implemented in lib1funcs.S, so ensure an error if this definition
+    is used.  */
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -51,6 +51,10 @@ see the files COPYING3 and COPYING.RUNTI
+ 	builtin_assert ("system=posix");			\
+     } while (0)
+ 
++#ifndef LIBGCC_SPEC
++#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
++#endif
++
+ /* Determine which dynamic linker to use depending on whether GLIBC or
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+--- a/libgcc/mkmap-symver.awk
++++ b/libgcc/mkmap-symver.awk
+@@ -132,5 +132,5 @@ function output(lib) {
+   else if (inherit[lib])
+     printf("} %s;\n", inherit[lib]);
+   else
+-    printf ("\n  local:\n\t*;\n};\n");
++    printf ("\n\t*;\n};\n");
+ }
+--- a/gcc/config/rs6000/linux.h
++++ b/gcc/config/rs6000/linux.h
+@@ -61,6 +61,9 @@
+ #undef  CPLUSPLUS_CPP_SPEC
+ #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
+ 
++#undef LIBGCC_SPEC
++#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
++
+ #undef  LINK_SHLIB_SPEC
+ #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
+ 
diff --git a/trunk/package/devel/gcc/patches/860-uclibc_use_eh_frame.patch b/trunk/package/devel/gcc/patches/860-uclibc_use_eh_frame.patch
new file mode 100644
index 00000000..0464bd7d
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/860-uclibc_use_eh_frame.patch
@@ -0,0 +1,29 @@
+--- a/libgcc/crtstuff.c
++++ b/libgcc/crtstuff.c
+@@ -100,15 +100,20 @@ call_ ## FUNC (void)					\
+ #if defined(OBJECT_FORMAT_ELF) \
+     && !defined(OBJECT_FORMAT_FLAT) \
+     && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
+-    && defined(__GLIBC__) && __GLIBC__ >= 2
++    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O)
+ #include <link.h>
+ /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
+    But it doesn't use PT_GNU_EH_FRAME ELF segment currently.  */
+-# if !defined(__UCLIBC__) \
+-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+-     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+-#  define USE_PT_GNU_EH_FRAME
++# if defined(__UCLIBC__)
++#  if (__UCLIBC_MAJOR__ > 0 || __UCLIBC_MINOR__ > 9 || \
++       (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 33))
++#   define USE_PT_GNU_EH_FRAME
++#  endif
++# elif defined(__GLIBC__)
++#  if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
++       || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
++#   define USE_PT_GNU_EH_FRAME
++#  endif
+ # endif
+ #endif
+ 
diff --git a/trunk/package/devel/gcc/patches/870-ppc_no_crtsavres.patch b/trunk/package/devel/gcc/patches/870-ppc_no_crtsavres.patch
new file mode 100644
index 00000000..d8c460a9
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/870-ppc_no_crtsavres.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -17653,7 +17653,7 @@ rs6000_savres_strategy (rs6000_stack_t *
+   /* Define cutoff for using out-of-line functions to save registers.  */
+   if (DEFAULT_ABI == ABI_V4 || TARGET_ELF)
+     {
+-      if (!optimize_size)
++      if (1)
+ 	{
+ 	  strategy |= SAVE_INLINE_FPRS | REST_INLINE_FPRS;
+ 	  strategy |= SAVE_INLINE_GPRS | REST_INLINE_GPRS;
diff --git a/trunk/package/devel/gcc/patches/880-no_java_section.patch b/trunk/package/devel/gcc/patches/880-no_java_section.patch
new file mode 100644
index 00000000..def6c9f4
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/880-no_java_section.patch
@@ -0,0 +1,11 @@
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
+@@ -380,7 +380,7 @@ see the files COPYING3 and COPYING.RUNTI
+ /* If we have named section and we support weak symbols, then use the
+    .jcr section for recording java classes which need to be registered
+    at program start-up time.  */
+-#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
++#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
+ #ifndef JCR_SECTION_NAME
+ #define JCR_SECTION_NAME ".jcr"
+ #endif
diff --git a/trunk/package/devel/gcc/patches/900-bad-mips16-crt.patch b/trunk/package/devel/gcc/patches/900-bad-mips16-crt.patch
new file mode 100644
index 00000000..dd6e9dc8
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/900-bad-mips16-crt.patch
@@ -0,0 +1,9 @@
+--- a/libgcc/config/mips/t-mips16
++++ b/libgcc/config/mips/t-mips16
+@@ -43,3 +43,6 @@ SYNC_CFLAGS = -mno-mips16
+ 
+ # Version these symbols if building libgcc.so.
+ SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver
++
++CRTSTUFF_T_CFLAGS += -mno-mips16
++CRTSTUFF_T_CFLAGS_S += -mno-mips16
diff --git a/trunk/package/devel/gcc/patches/910-mbsd_multi.patch b/trunk/package/devel/gcc/patches/910-mbsd_multi.patch
new file mode 100644
index 00000000..d04dc7d9
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/910-mbsd_multi.patch
@@ -0,0 +1,253 @@
+
+	This patch brings over a few features from MirBSD:
+	* -fhonour-copts
+	  If this option is not given, it's warned (depending
+	  on environment variables). This is to catch errors
+	  of misbuilt packages which override CFLAGS themselves.
+	* -Werror-maybe-reset
+	  Has the effect of -Wno-error if GCC_NO_WERROR is
+	  set and not '0', a no-operation otherwise. This is
+	  to be able to use -Werror in "make" but prevent
+	  GNU autoconf generated configure scripts from
+	  freaking out.
+	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
+	  the default for -O2/-Os, because they trigger gcc bugs
+	  and can delete code with security implications.
+
+	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
+	with copyright assignment to the FSF in effect.
+
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -104,6 +104,9 @@ static size_t include_cursor;
+ /* Whether any standard preincluded header has been preincluded.  */
+ static bool done_preinclude;
+ 
++/* Check if a port honours COPTS.  */
++static int honour_copts = 0;
++
+ static void handle_OPT_d (const char *);
+ static void set_std_cxx98 (int);
+ static void set_std_cxx11 (int);
+@@ -383,6 +386,9 @@ c_common_handle_option (size_t scode, co
+       cpp_opts->warn_endif_labels = value;
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      break;
++
+     case OPT_Winvalid_pch:
+       cpp_opts->warn_invalid_pch = value;
+       break;
+@@ -491,6 +497,12 @@ c_common_handle_option (size_t scode, co
+       flag_no_builtin = !value;
+       break;
+ 
++    case OPT_fhonour_copts:
++      if (c_language == clk_c) {
++        honour_copts++;
++      }
++      break;
++
+     case OPT_fconstant_string_class_:
+       constant_string_class_name = arg;
+       break;
+@@ -1027,6 +1039,47 @@ c_common_init (void)
+       return false;
+     }
+ 
++  if (c_language == clk_c) {
++    char *ev = getenv ("GCC_HONOUR_COPTS");
++    int evv;
++    if (ev == NULL)
++      evv = -1;
++    else if ((*ev == '0') || (*ev == '\0'))
++      evv = 0;
++    else if (*ev == '1')
++      evv = 1;
++    else if (*ev == '2')
++      evv = 2;
++    else if (*ev == 's')
++      evv = -1;
++    else {
++      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
++      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
++    }
++    if (evv == 1) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in lenient mode");
++        return false;
++      } else if (honour_copts != 1) {
++        warning (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++      }
++    } else if (evv == 2) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in strict mode");
++        return false;
++      } else if (honour_copts != 1) {
++        error ("someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++        return false;
++      }
++    } else if (evv == 0) {
++      if (honour_copts != 1)
++        inform (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++    }
++  }
++
+   return true;
+ }
+ 
+--- a/gcc/c-family/c.opt
++++ b/gcc/c-family/c.opt
+@@ -379,6 +379,10 @@ Werror-implicit-function-declaration
+ C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
+ This switch is deprecated; use -Werror=implicit-function-declaration instead
+ 
++Werror-maybe-reset
++C ObjC C++ ObjC++
++; Documented in common.opt
++
+ Wfloat-equal
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
+ Warn if testing floating point numbers for equality
+@@ -949,6 +953,9 @@ C++ ObjC++ Optimization Alias(fexception
+ fhonor-std
+ C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
+ 
++fhonour-copts
++C ObjC C++ ObjC++ RejectNegative
++
+ fhosted
+ C ObjC
+ Assume normal C execution environment
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -541,6 +541,10 @@ Werror=
+ Common Joined
+ Treat specified warning as error
+ 
++Werror-maybe-reset
++Common
++If environment variable GCC_NO_WERROR is set, act as -Wno-error
++
+ Wextra
+ Common Var(extra_warnings) Warning
+ Print extra (possibly unwanted) warnings
+@@ -1242,6 +1246,9 @@ fguess-branch-probability
+ Common Report Var(flag_guess_branch_prob) Optimization
+ Enable guessing of branch probabilities
+ 
++fhonour-copts
++Common RejectNegative
++
+ ; Nonzero means ignore `#ident' directives.  0 means handle them.
+ ; Generate position-independent code for executables if possible
+ ; On SVR4 targets, it also controls whether or not to emit a
+--- a/gcc/opts.c
++++ b/gcc/opts.c
+@@ -468,8 +468,6 @@ static const struct default_options defa
+     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
+ #endif
+     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
+@@ -488,6 +486,8 @@ static const struct default_options defa
+     { OPT_LEVELS_2_PLUS, OPT_fhoist_adjacent_loads, NULL, 1 },
+ 
+     /* -O3 optimizations.  */
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
+     /* Inlining of functions reducing size is a good idea with -Os
+@@ -1423,6 +1423,17 @@ common_handle_option (struct gcc_options
+ 			       opts, opts_set, loc, dc);
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++        char *ev = getenv ("GCC_NO_WERROR");
++        if ((ev != NULL) && (*ev != '0'))
++          warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wlarger_than_:
+       opts->x_larger_than_size = value;
+       opts->x_warn_larger_than = value != -1;
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -163,6 +163,11 @@ in older programs.  This warning is on b
+ Make all warnings into hard errors.  Source code which triggers warnings
+ will be rejected.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
+ @item -Wsystem-headers
+ @opindex Wsystem-headers
+ Issue warnings for code in system headers.  These are normally unhelpful
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -240,7 +240,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
+ -Wno-deprecated-declarations -Wdisabled-optimization  @gol
+ -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
+--Wno-endif-labels -Werror  -Werror=* @gol
++-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
+ -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
+ -Wformat-security  -Wformat-y2k @gol
+@@ -4808,6 +4808,22 @@ This option is only supported for C and
+ @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
+ @option{-Wno-pointer-sign}.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
++ at item -fhonour-copts
++ at opindex fhonour-copts
++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
++given at least once, and warn if it is given more than once.
++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
++given exactly once.
++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
++is not given exactly once.
++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
++This flag and environment variable only affect the C language.
++
+ @item -Wstack-protector
+ @opindex Wstack-protector
+ @opindex Wno-stack-protector
+@@ -6919,7 +6935,7 @@ so, the first branch is redirected to ei
+ second branch or a point immediately following it, depending on whether
+ the condition is known to be true or false.
+ 
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+ 
+ @item -fsplit-wide-types
+ @opindex fsplit-wide-types
+--- a/gcc/java/jvspec.c
++++ b/gcc/java/jvspec.c
+@@ -626,6 +626,7 @@ lang_specific_pre_link (void)
+      class name.  Append dummy `.c' that can be stripped by set_input so %b
+      is correct.  */ 
+   set_input (concat (main_class_name, "main.c", NULL));
++  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
+   err = do_spec (jvgenmain_spec);
+   if (err == 0)
+     {
diff --git a/trunk/package/devel/gcc/patches/920-specs_nonfatal_getenv.patch b/trunk/package/devel/gcc/patches/920-specs_nonfatal_getenv.patch
new file mode 100644
index 00000000..4baa9669
--- /dev/null
+++ b/trunk/package/devel/gcc/patches/920-specs_nonfatal_getenv.patch
@@ -0,0 +1,14 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -8003,7 +8003,10 @@ getenv_spec_function (int argc, const ch
+ 
+   value = getenv (argv[0]);
+   if (!value)
+-    fatal_error ("environment variable %qs not defined", argv[0]);
++    {
++      warning (0, "environment variable %qs not defined", argv[0]);
++      value = "";
++    }
+ 
+   /* We have to escape every character of the environment variable so
+      they are not interpreted as active spec characters.  A
diff --git a/trunk/package/devel/gdb/Makefile b/trunk/package/devel/gdb/Makefile
new file mode 100644
index 00000000..c47735a8
--- /dev/null
+++ b/trunk/package/devel/gdb/Makefile
@@ -0,0 +1,87 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gdb
+PKG_VERSION:=7.8
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/gdb
+PKG_MD5SUM:=bd958fe9019d7c7896f29f6724a764ed
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+PKG_LICENSE:=GPL-3.0+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/gdb/Default
+  SECTION:=devel
+  CATEGORY:=Development
+  DEPENDS:=@!(avr32||cris) +!USE_MUSL:libthread-db +PACKAGE_zlib:zlib
+  URL:=http://www.gnu.org/software/gdb/
+endef
+
+define Package/gdb
+$(call Package/gdb/Default)
+  TITLE:=GNU Debugger
+  DEPENDS+=+libreadline +libncurses +zlib
+endef
+
+define Package/gdb/description
+GDB, the GNU Project debugger, allows you to see what is going on `inside'
+another program while it executes -- or what another program was doing at the
+moment it crashed.
+endef
+
+define Package/gdbserver
+$(call Package/gdb/Default)
+  TITLE:=Remote server for GNU Debugger
+endef
+
+define Package/gdbserver/description
+GDBSERVER is a program that allows you to run GDB on a different machine than the
+one which is running the program being debugged.
+endef
+
+# XXX: add --disable-werror to prevent build failure with arm
+CONFIGURE_ARGS+= \
+	--with-system-readline \
+	--without-expat \
+	--disable-werror
+
+CONFIGURE_VARS+= \
+	ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline"
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		all
+endef
+
+define Build/Install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		install-gdb
+endef
+
+define Package/gdb/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdb $(1)/usr/bin/
+endef
+
+define Package/gdbserver/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,gdb))
+$(eval $(call BuildPackage,gdbserver))
diff --git a/trunk/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch b/trunk/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch
new file mode 100644
index 00000000..6b324a32
--- /dev/null
+++ b/trunk/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch
@@ -0,0 +1,16 @@
+See http://sourceware.org/bugzilla/show_bug.cgi?id=14523
+---
+--- a/gdb/common/signals.c
++++ b/gdb/common/signals.c
+@@ -350,6 +350,11 @@ gdb_signal_from_host (int hostsig)
+       else if (64 <= hostsig && hostsig <= 127)
+ 	return (enum gdb_signal)
+ 	  (hostsig - 64 + (int) GDB_SIGNAL_REALTIME_64);
++      else if (hostsig == 128)
++	/* Some platforms, such as Linux MIPS, have NSIG == 128, in which case
++	   signal 128 is the highest realtime signal. There is no constant for
++	   that though. */
++	return GDB_SIGNAL_UNKNOWN;
+       else
+ 	error (_("GDB bug: target.c (gdb_signal_from_host): "
+ 	       "unrecognized real-time signal"));
diff --git a/trunk/package/devel/gdb/patches/100-musl_fix.patch b/trunk/package/devel/gdb/patches/100-musl_fix.patch
new file mode 100644
index 00000000..d6dd7a01
--- /dev/null
+++ b/trunk/package/devel/gdb/patches/100-musl_fix.patch
@@ -0,0 +1,28 @@
+--- a/gdb/linux-nat.c
++++ b/gdb/linux-nat.c
+@@ -17,6 +17,7 @@
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
++#include "stopcode.h"
+ #include "defs.h"
+ #include "inferior.h"
+ #include "infrun.h"
+@@ -81,6 +82,10 @@
+ # endif
+ #endif /* HAVE_PERSONALITY */
+ 
++#ifndef __SIGRTMIN
++#define __SIGRTMIN SIGRTMIN
++#endif
++
+ /* This comment documents high-level logic of this file.
+ 
+ Waiting for events in sync mode
+--- /dev/null
++++ b/gdb/stopcode.h
+@@ -0,0 +1,4 @@
++#ifndef W_STOPCODE
++#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
++#endif
++
diff --git a/trunk/package/devel/gdb/patches/101-arm-uclibc-sim-needs-libm.patch b/trunk/package/devel/gdb/patches/101-arm-uclibc-sim-needs-libm.patch
new file mode 100644
index 00000000..010b1c1a
--- /dev/null
+++ b/trunk/package/devel/gdb/patches/101-arm-uclibc-sim-needs-libm.patch
@@ -0,0 +1,22 @@
+This patch fixes a build error on arm:
+
+arm-librecmc-linux-uclibcgnueabi-gcc -DHAVE_CONFIG_H     -DPROFILE=1 -DWITH_PROFILE=-1          -DDEFAULT_INLINE=0           -DMODET -DNEED_UI_LOOP_HOOK -DSIM_TARGET_SWITCHES   -I. -I. -I../common -I./../common -I../../include -I./../../include -I../../bfd -I./../../bfd -I../../opcodes -I./../../opcodes  -Os -pipe -march=armv7-a -mtune=cortex-a8 -mfpu=vfpv3-d16 -fno-caller-saves -fhonour-copts -Wno-error=unused-but-set-variable -mfloat-abi=hard  -static-libstdc++ -static-libgcc -L/fun/Projects/libreCMC/dev/librecmc-core-2/staging_dir/target-arm_cortex-a8+vfpv3_uClibc-0.9.33.2_eabi/usr/lib -L/fun/Projects/libreCMC/dev/librecmc-core-2/staging_dir/target-arm_cortex-a8+vfpv3_uClibc-0.9.33.2_eabi/lib -L/fun/Projects/libreCMC/dev/librecmc-core-2/staging_dir/toolchain-arm_cortex-a8+vfpv3_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/usr/lib -L/fun/Projects/libreCMC/dev/librecmc-core-2/staging_dir/toolchain-arm_cortex-a8+vfpv3_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/lib  -o run \
+	  run.o libsim.a ../../bfd/libbfd.a ../../opcodes/libopcodes.a  ../../libiberty/libiberty.a -lz -lnsl   
+../../libiberty/libiberty.a(floatformat.o): In function `floatformat_to_double':
+floatformat.c:(.text+0x454): undefined reference to `ldexp'
+floatformat.c:(.text+0x4a4): undefined reference to `ldexp'
+../../libiberty/libiberty.a(floatformat.o): In function `floatformat_from_double':
+floatformat.c:(.text+0x5dc): undefined reference to `frexp'
+floatformat.c:(.text+0x644): undefined reference to `ldexp'
+collect2: error: ld returned 1 exit status
+
+--- a/sim/arm/Makefile.in
++++ b/sim/arm/Makefile.in
+@@ -18,6 +18,7 @@
+ ## COMMON_PRE_CONFIG_FRAG
+ 
+ SIM_EXTRA_CFLAGS = -DMODET -DNEED_UI_LOOP_HOOK -DSIM_TARGET_SWITCHES
++SIM_EXTRA_LIBS = -lm
+ 
+ COPRO=@COPRO@
+ 
diff --git a/trunk/package/devel/oprofile/Makefile b/trunk/package/devel/oprofile/Makefile
new file mode 100644
index 00000000..cc23c939
--- /dev/null
+++ b/trunk/package/devel/oprofile/Makefile
@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2009-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=oprofile
+PKG_VERSION:=0.9.9
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/oprofile/
+PKG_MD5SUM:=00aec1287da2dfffda17a9b1c0a01868
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_BUILD_DEPENDS:=binutils
+PKG_LICENSE:=GPL-2.0+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/oprofile
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=OProfile System Profiler
+  URL:=http://oprofile.sourceforge.net
+  DEPENDS:=+libpopt +kmod-oprofile +libstdcpp +objdump
+endef
+
+define Package/oprofile/description
+ A transparent low-overhead system-wide profiler.
+endef
+
+define Package/oprofile-utils
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=OProfile System Profiler (extra utilities)
+  URL:=http://oprofile.sourceforge.net
+  DEPENDS:=oprofile
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--with-kernel-support \
+		--without-x \
+	)
+endef
+
+TARGET_CXXFLAGS += -fpermissive
+TARGET_LDFLAGS := -L$(STAGING_DIR)/usr/lib $(TARGET_LDFLAGS)
+
+define Package/oprofile-utils/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/opannotate \
+		$(PKG_INSTALL_DIR)/usr/bin/oparchive \
+		$(PKG_INSTALL_DIR)/usr/bin/opgprof \
+		$(1)/usr/bin
+endef
+
+define Package/oprofile/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/* \
+		$(1)/usr/bin
+
+	rm -f \
+		$(1)/usr/bin/opannotate \
+		$(1)/usr/bin/oparchive \
+		$(1)/usr/bin/opgprof
+
+	$(INSTALL_DIR) $(1)/usr/lib/oprofile
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/oprofile/*.so* \
+		$(1)/usr/lib/oprofile/
+
+	$(INSTALL_DIR) $(1)/usr/share/oprofile
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/share/oprofile/stl.pat \
+		$(PKG_INSTALL_DIR)/usr/share/oprofile/$(patsubst x86,i386,$(LINUX_KARCH)) \
+		$(1)/usr/share/oprofile/
+endef
+
+$(eval $(call BuildPackage,oprofile))
+$(eval $(call BuildPackage,oprofile-utils))
diff --git a/trunk/package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch b/trunk/package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch
new file mode 100644
index 00000000..cd71d0d9
--- /dev/null
+++ b/trunk/package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch
@@ -0,0 +1,11 @@
+--- a/utils/opcontrol
++++ b/utils/opcontrol
+@@ -249,7 +249,7 @@ load_module_26()
+ {
+ 	grep oprofilefs /proc/filesystems >/dev/null
+ 	if test "$?" -ne 0; then
+-		modprobe oprofile
++		insmod oprofile
+ 		if test "$?" != "0"; then
+ 			# couldn't load the module
+ 			return
diff --git a/trunk/package/devel/oprofile/patches/110-fix_compile_error.patch b/trunk/package/devel/oprofile/patches/110-fix_compile_error.patch
new file mode 100644
index 00000000..708f83ee
--- /dev/null
+++ b/trunk/package/devel/oprofile/patches/110-fix_compile_error.patch
@@ -0,0 +1,30 @@
+--- a/libop/op_cpu_type.c
++++ b/libop/op_cpu_type.c
+@@ -250,6 +250,7 @@ static void release_at_hw_platform(void)
+ 	}
+ }
+ 
++#ifdef PPC64
+ static op_cpu _try_ppc64_arch_generic_cpu(void)
+ {
+ 	const char * platform, * base_platform;
+@@ -312,6 +313,7 @@ static op_cpu _get_ppc64_cpu_type(void)
+ 	cpu_type = op_get_cpu_number(cpu_type_str);
+ 	return cpu_type;
+ }
++#endif
+ 
+ static op_cpu _get_arm_cpu_type(void)
+ {
+@@ -592,9 +594,11 @@ static op_cpu __get_cpu_type_alt_method(
+ 	    fnmatch("i?86", uname_info.machine, 0) == 0) {
+ 		return _get_x86_64_cpu_type();
+ 	}
++#ifdef PPC64
+ 	if (strncmp(uname_info.machine, "ppc64", 5) == 0) {
+ 		return _get_ppc64_cpu_type();
+ 	}
++#endif
+ 	if (strncmp(uname_info.machine, "arm", 3) == 0) {
+ 		return _get_arm_cpu_type();
+ 	}
diff --git a/trunk/package/devel/patch/Makefile b/trunk/package/devel/patch/Makefile
new file mode 100644
index 00000000..63809c5b
--- /dev/null
+++ b/trunk/package/devel/patch/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2008-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=patch
+PKG_VERSION:=2.7.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/patch
+PKG_MD5SUM:=e9ae5393426d3ad783a300a338c09b72
+PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/patch
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=patch
+  URL:=http://www.gnu.org/
+  MAINTAINER:=Russell Senior <russell@personaltelco.net>
+endef
+
+define Package/patch/description
+  The Patch package contains a program for modifying or creating files
+  by applying a "patch" file typically created by the diff program.
+endef
+
+CONFIGURE_ARGS+= --disable-xattr
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+endef
+
+define Package/patch/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/patch $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,patch))
diff --git a/trunk/package/devel/perf/Makefile b/trunk/package/devel/perf/Makefile
new file mode 100644
index 00000000..3899b48d
--- /dev/null
+++ b/trunk/package/devel/perf/Makefile
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2011-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=perf
+PKG_VERSION:=$(LINUX_VERSION)
+PKG_RELEASE:=2
+
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/perf
+  SECTION:=devel
+  CATEGORY:=Development
+  DEPENDS:= @USE_EGLIBC +libelf1 +libdw +libpthread +librt +binutils
+  TITLE:=Linux performance monitoring tool
+  VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
+  URL:=http://www.kernel.org
+endef
+
+define Package/perf/description
+  perf is the Linux performance monitoring tool
+endef
+
+# Perf's makefile and headers are not relocatable and must be built from the
+# Linux sources directory
+define Build/Prepare
+	$(RM) -r $(PKG_BUILD_DIR)
+	ln -s $(LINUX_DIR)/tools/perf $(PKG_BUILD_DIR)
+endef
+
+# MAKE_FLAGS should be passed again upon cleaning because Perf's makefile
+# always performs checks before processing any rule
+define Build/Clean
+	-$(MAKE) -C $(PKG_BUILD_DIR) \
+		NO_DWARF=1 \
+		$(MAKE_FLAGS) \
+		clean
+endef
+
+MAKE_FLAGS = \
+	ARCH="$(LINUX_KARCH)" \
+	NO_LIBPERL=1 \
+	NO_LIBPYTHON=1 \
+	NO_NEWT=1 \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	CC="$(TARGET_CC)" \
+	LD="$(TARGET_CROSS)ld" \
+	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	V=1 \
+	prefix=/usr
+
+define Package/perf/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,perf))
diff --git a/trunk/package/devel/strace/Makefile b/trunk/package/devel/strace/Makefile
new file mode 100644
index 00000000..4c29d69c
--- /dev/null
+++ b/trunk/package/devel/strace/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=strace
+
+PKG_VERSION:=4.8
+PKG_RELEASE:=1
+PKG_MD5SUM:=c575ef43829586801f514fd91bfe7575
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+
+PKG_LICENSE:=BSD-3c
+PKG_LICENSE_FILES:=COPYRIGHT
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/strace
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=System call tracer
+  URL:=http://strace.sourceforge.net/
+endef
+
+define Package/strace/description
+A useful diagnostic, instructional, and debugging tool. Allows you to track what
+system calls a program makes while it is running.
+endef
+
+MAKE_FLAGS := \
+	CCOPT="$(TARGET_CFLAGS)"
+
+define Package/strace/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/strace $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,strace))
diff --git a/trunk/package/devel/strace/patches/100-musl_fix.patch b/trunk/package/devel/strace/patches/100-musl_fix.patch
new file mode 100644
index 00000000..e4105bc5
--- /dev/null
+++ b/trunk/package/devel/strace/patches/100-musl_fix.patch
@@ -0,0 +1,165 @@
+--- a/net.c
++++ b/net.c
+@@ -50,11 +50,7 @@
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <asm/types.h>
+-#if defined(__GLIBC__)
+-# include <netipx/ipx.h>
+-#else
+-# include <linux/ipx.h>
+-#endif
++#include <linux/ipx.h>
+ 
+ #if defined(__GLIBC__) && defined(HAVE_SIN6_SCOPE_ID_LINUX)
+ # if defined(HAVE_LINUX_IN6_H)
+@@ -94,14 +90,6 @@
+ # define PF_UNSPEC AF_UNSPEC
+ #endif
+ 
+-/* Under Linux these are enums so we can't test for them with ifdef. */
+-#define IPPROTO_EGP IPPROTO_EGP
+-#define IPPROTO_PUP IPPROTO_PUP
+-#define IPPROTO_IDP IPPROTO_IDP
+-#define IPPROTO_IGMP IPPROTO_IGMP
+-#define IPPROTO_RAW IPPROTO_RAW
+-#define IPPROTO_MAX IPPROTO_MAX
+-
+ static const struct xlat domains[] = {
+ #ifdef PF_UNSPEC
+ 	{ PF_UNSPEC,	"PF_UNSPEC"	},
+@@ -493,24 +481,16 @@ static const struct xlat protocols[] = {
+ 	{ IPPROTO_ICMP,	"IPPROTO_ICMP"	},
+ 	{ IPPROTO_TCP,	"IPPROTO_TCP"	},
+ 	{ IPPROTO_UDP,	"IPPROTO_UDP"	},
+-#ifdef IPPROTO_IGMP
+ 	{ IPPROTO_IGMP,	"IPPROTO_IGMP"	},
+-#endif
+ #ifdef IPPROTO_GGP
+ 	{ IPPROTO_GGP,	"IPPROTO_GGP"	},
+ #endif
+ #ifdef IPPROTO_IPIP
+ 	{ IPPROTO_IPIP,	"IPPROTO_IPIP"	},
+ #endif
+-#ifdef IPPROTO_EGP
+ 	{ IPPROTO_EGP,	"IPPROTO_EGP"	},
+-#endif
+-#ifdef IPPROTO_PUP
+ 	{ IPPROTO_PUP,	"IPPROTO_PUP"	},
+-#endif
+-#ifdef IPPROTO_IDP
+ 	{ IPPROTO_IDP,	"IPPROTO_IDP"	},
+-#endif
+ #ifdef IPPROTO_TP
+ 	{ IPPROTO_TP,	"IPPROTO_TP"	},
+ #endif
+@@ -571,12 +551,8 @@ static const struct xlat protocols[] = {
+ #ifdef IPPROTO_UDPLITE
+ 	{ IPPROTO_UDPLITE, "IPPROTO_UDPLITE" },
+ #endif
+-#ifdef IPPROTO_RAW
+ 	{ IPPROTO_RAW,	"IPPROTO_RAW"	},
+-#endif
+-#ifdef IPPROTO_MAX
+ 	{ IPPROTO_MAX,	"IPPROTO_MAX"	},
+-#endif
+ 	{ 0,		NULL		},
+ };
+ static const struct xlat msg_flags[] = {
+--- a/process.c
++++ b/process.c
+@@ -55,19 +55,6 @@
+ # endif
+ #endif
+ 
+-#ifdef HAVE_LINUX_PTRACE_H
+-# undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-#  define ia64_fpreg XXX_ia64_fpreg
+-# endif
+-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+-#  define pt_all_user_regs XXX_pt_all_user_regs
+-# endif
+-# include <linux/ptrace.h>
+-# undef ia64_fpreg
+-# undef pt_all_user_regs
+-#endif
+-
+ #if defined(SPARC64)
+ # define r_pc r_tpc
+ # undef PTRACE_GETREGS
+@@ -94,6 +81,7 @@
+ 
+ #include <sched.h>
+ #include <asm/posix_types.h>
++#include <asm/ptrace.h>
+ #undef GETGROUPS_T
+ #define GETGROUPS_T __kernel_gid_t
+ #undef GETGROUPS32_T
+@@ -2857,7 +2845,7 @@ sys_sched_setscheduler(struct tcb *tcp)
+ 		if (umove(tcp, tcp->u_arg[2], &p) < 0)
+ 			tprintf(", %#lx", tcp->u_arg[2]);
+ 		else
+-			tprintf(", { %d }", p.__sched_priority);
++			tprintf(", { %d }", p.sched_priority);
+ 	}
+ 	return 0;
+ }
+@@ -2872,7 +2860,7 @@ sys_sched_getparam(struct tcb *tcp)
+ 		if (umove(tcp, tcp->u_arg[1], &p) < 0)
+ 			tprintf("%#lx", tcp->u_arg[1]);
+ 		else
+-			tprintf("{ %d }", p.__sched_priority);
++			tprintf("{ %d }", p.sched_priority);
+ 	}
+ 	return 0;
+ }
+@@ -2885,7 +2873,7 @@ sys_sched_setparam(struct tcb *tcp)
+ 		if (umove(tcp, tcp->u_arg[1], &p) < 0)
+ 			tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
+ 		else
+-			tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
++			tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
+ 	}
+ 	return 0;
+ }
+--- a/signal.c
++++ b/signal.c
+@@ -35,6 +35,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ 
++#include <asm/ptrace.h>
+ #ifdef HAVE_SYS_REG_H
+ # include <sys/reg.h>
+ # ifndef PTRACE_PEEKUSR
+--- a/time.c
++++ b/time.c
+@@ -774,7 +774,7 @@ printsigevent(struct tcb *tcp, long arg)
+ 			/* _pad[0] is the _tid field which might not be
+ 			   present in the userlevel definition of the
+ 			   struct.  */
+-			tprintf("{%d}", sev._sigev_un._pad[0]);
++			tprintf("{%d}", *(int *) &sev.sigev_notify_function);
+ 		else if (sev.sigev_notify == SIGEV_THREAD)
+ 			tprintf("{%p, %p}", sev.sigev_notify_function,
+ 				sev.sigev_notify_attributes);
+--- a/defs.h
++++ b/defs.h
+@@ -27,6 +27,7 @@
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#define _LARGEFILE64_SOURCE 1
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+@@ -222,7 +223,7 @@ extern long ptrace(int, int, char *, lon
+ # define PTRACE_EVENT_EXIT	6
+ #endif
+ 
+-#if !defined(__GLIBC__)
++#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER)
+ # define PTRACE_PEEKUSER PTRACE_PEEKUSR
+ # define PTRACE_POKEUSER PTRACE_POKEUSR
+ #endif
diff --git a/trunk/package/devel/trace-cmd/Makefile b/trunk/package/devel/trace-cmd/Makefile
new file mode 100644
index 00000000..49b5f107
--- /dev/null
+++ b/trunk/package/devel/trace-cmd/Makefile
@@ -0,0 +1,63 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=trace-cmd
+PKG_VERSION:=v2.4
+PKG_RELEASE=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=0517388225e776a865fa07fa2ce105e97bd19212
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+# PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620
+PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/trace-cmd
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=Linux trace command line utility
+  DEPENDS:=
+endef
+
+define Package/trace-cmd-extra
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=Extra plugins for trace-cmd
+  DEPENDS:=
+endef
+
+MAKE_FLAGS += \
+	NO_PYTHON=1 \
+	prefix=/usr
+
+PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins
+PLUGINS_MAIN := function hrtimer mac80211 sched_switch
+
+TARGET_CFLAGS += --std=gnu99 -D_GNU_SOURCE
+
+define Package/trace-cmd/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/trace-cmd/plugins
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trace-cmd $(1)/usr/bin/
+	$(CP) \
+		$(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \
+		$(1)/usr/lib/trace-cmd/plugins
+endef
+
+define Package/trace-cmd-extra/install
+	$(INSTALL_DIR) $(1)/usr/lib/trace-cmd/plugins
+	$(CP) \
+		$$(patsubst %,$(PLUGINS_DIR)/plugin_%.so, \
+			$$(filter-out $(PLUGINS_MAIN), \
+				$$(patsubst $(PLUGINS_DIR)/plugin_%.so,%, \
+					$$(wildcard $(PLUGINS_DIR)/plugin_*.so)))) \
+		$(1)/usr/lib/trace-cmd/plugins
+endef
+
+$(eval $(call BuildPackage,trace-cmd))
+$(eval $(call BuildPackage,trace-cmd-extra))
diff --git a/trunk/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch b/trunk/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch
new file mode 100644
index 00000000..e2a68972
--- /dev/null
+++ b/trunk/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch
@@ -0,0 +1,24 @@
+--- a/plugin_mac80211.c
++++ b/plugin_mac80211.c
+@@ -179,12 +179,15 @@ static int drv_config(struct trace_seq *
+ 		{ 2, "IDLE" },
+ 		{ 3, "QOS"},
+ 	);
+-	pevent_print_num_field(s, " chan:%d/", event, "center_freq", record, 1);
+-	print_enum(s, event, "channel_type", data,
+-		{ 0, "noht" },
+-		{ 1, "ht20" },
+-		{ 2, "ht40-" },
+-		{ 3, "ht40+" });
++	pevent_print_num_field(s, " chan:%d@", event, "control_freq", record, 1);
++	print_enum(s, event, "chan_width", data,
++		{ 0, "20_noht" },
++		{ 1, "20" },
++		{ 2, "40" },
++		{ 3, "80" },
++		{ 4, "80p80" },
++		{ 5, "160" });
++
+ 	trace_seq_putc(s, ' ');
+ 	SF("power_level");
+ 
diff --git a/trunk/package/devel/valgrind/Makefile b/trunk/package/devel/valgrind/Makefile
new file mode 100644
index 00000000..e2c7f672
--- /dev/null
+++ b/trunk/package/devel/valgrind/Makefile
@@ -0,0 +1,177 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=valgrind
+PKG_VERSION:=3.10.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://valgrind.org/downloads/
+PKG_MD5SUM:=7c311a72a20388aceced1aa5573ce970
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
+
+PKG_FIXUP = autoreconf
+PKG_INSTALL := 1
+PKG_BUILD_PARALLEL := 1
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/valgrind
+  SECTION:=devel
+  CATEGORY:=Development
+  DEPENDS:=@mips||mipsel||i386||x86_64||powerpc||arm_v7 +libpthread +librt
+  TITLE:=debugging and profiling tools for Linux
+  URL:=http://www.valgrind.org
+endef
+
+define Package/valgrind/default
+  $(Package/valgrind)
+  DEPENDS := valgrind
+endef
+
+define Package/valgrind-cachegrind
+  $(Package/valgrind/default)
+  TITLE += (cache profiling)
+endef
+
+define Package/valgrind-callgrind
+  $(Package/valgrind/default)
+  TITLE += (callgraph profiling)
+endef
+
+define Package/valgrind-drd
+  $(Package/valgrind/default)
+  TITLE += (thread error detection)
+endef
+
+define Package/valgrind-massif
+  $(Package/valgrind/default)
+  TITLE += (heap profiling)
+endef
+
+define Package/valgrind-helgrind
+  $(Package/valgrind/default)
+  TITLE += (thread debugging)
+endef
+
+define Package/valgrind-vgdb
+  $(Package/valgrind/default)
+  TITLE += (GDB interface)
+endef
+
+define Package/valgrind/description
+	Valgrind is an award-winning suite of tools for debugging and
+	profiling Linux programs. With the tools that come with Valgrind,
+	you can automatically detect many memory management and threading
+	bugs, avoiding hours of frustrating bug-hunting, making your
+	programs more stable. You can also perform detailed profiling,
+	to speed up and reduce memory use of your programs.
+endef
+
+CPU := $(patsubst x86_64,amd64,$(patsubst x86,i386,$(patsubst um,$(ARCH),$(LINUX_KARCH))))
+
+CONFIGURE_VARS += \
+	UNAME_R=$(LINUX_VERSION)
+
+ifeq ($(ARCH),x86_64)
+	CONFIGURE_ARGS += \
+		--enable-only64bit
+	BITS := 64bit
+else
+	CONFIGURE_ARGS += \
+		--enable-only32bit
+	BITS := 32bit
+endif
+
+CONFIGURE_ARGS += \
+	--enable-tls \
+	--without-x \
+	--without-mpicc \
+	--without-uiout \
+	--disable-valgrindmi \
+	--disable-tui \
+	--disable-valgrindtk \
+	--without-included-gettext
+
+define Package/valgrind/install	
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/valgrind* $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/valgrind
+	$(CP) \
+		./files/default.supp \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/none-* \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_core*.so \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/$(CPU)-*.xml \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-core*.xml \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-linux*.xml \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/memcheck-* \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_memcheck*.so \
+		$(1)/usr/lib/valgrind/
+endef
+
+define Package/valgrind-cachegrind/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cg_* $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/valgrind
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/cachegrind-* \
+		$(1)/usr/lib/valgrind/
+endef
+
+define Package/valgrind-callgrind/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/callgrind* $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/valgrind
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/callgrind-* \
+		$(1)/usr/lib/valgrind/
+endef
+
+define Package/valgrind-drd/install
+	$(INSTALL_DIR) $(1)/usr/lib/valgrind
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/drd-* \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_drd*.so \
+		$(1)/usr/lib/valgrind/
+endef
+
+define Package/valgrind-massif/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ms_print $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/valgrind
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/massif-* \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_massif*.so \
+		$(1)/usr/lib/valgrind/
+endef
+
+define Package/valgrind-helgrind/install
+	$(INSTALL_DIR) $(1)/usr/lib/valgrind
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/helgrind-* \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_helgrind*.so \
+		$(1)/usr/lib/valgrind/
+endef
+
+define Package/valgrind-vgdb/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vgdb $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,valgrind))
+$(eval $(call BuildPackage,valgrind-cachegrind))
+$(eval $(call BuildPackage,valgrind-callgrind))
+$(eval $(call BuildPackage,valgrind-drd))
+$(eval $(call BuildPackage,valgrind-massif))
+$(eval $(call BuildPackage,valgrind-helgrind))
+$(eval $(call BuildPackage,valgrind-vgdb))
diff --git a/trunk/package/devel/valgrind/files/default.supp b/trunk/package/devel/valgrind/files/default.supp
new file mode 100644
index 00000000..beff5598
--- /dev/null
+++ b/trunk/package/devel/valgrind/files/default.supp
@@ -0,0 +1,42 @@
+{
+   ld(Addr1)
+   Memcheck:Addr1
+   fun:*
+   obj:/lib/ld-*
+}
+{
+   ld(Addr2)
+   Memcheck:Addr2
+   fun:*
+   obj:/lib/ld-*
+}
+{
+   ld(Addr4)
+   Memcheck:Addr4
+   fun:*
+   obj:/lib/ld-*
+}
+{
+   ld(Cond)
+   Memcheck:Cond
+   fun:*
+   obj:/lib/ld-*
+}
+{
+	strlen(Cond)
+	Memcheck:Cond
+	fun:strlen
+	fun:*
+}
+{
+	strnlen(Cond)
+	Memcheck:Cond
+	fun:strnlen
+	fun:*
+}
+{
+	index(Cond)
+	Memcheck:Cond
+	fun:index
+	fun:*
+}
diff --git a/trunk/package/devel/valgrind/patches/100-fix_configure_check.patch b/trunk/package/devel/valgrind/patches/100-fix_configure_check.patch
new file mode 100644
index 00000000..87ef3b39
--- /dev/null
+++ b/trunk/package/devel/valgrind/patches/100-fix_configure_check.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -300,7 +300,7 @@ case "${host_os}" in
+         # Ok, this is linux. Check the kernel version
+         AC_MSG_CHECKING([for the kernel version])
+ 
+-        kernel=`uname -r`
++        kernel=${UNAME_R:-`uname -r`}
+ 
+         case "${kernel}" in
+              2.6.*|3.*) 
diff --git a/trunk/package/devel/valgrind/patches/110-add_a_out_h.patch b/trunk/package/devel/valgrind/patches/110-add_a_out_h.patch
new file mode 100644
index 00000000..7d95fb34
--- /dev/null
+++ b/trunk/package/devel/valgrind/patches/110-add_a_out_h.patch
@@ -0,0 +1,157 @@
+--- /dev/null
++++ b/include/a.out.h
+@@ -0,0 +1,138 @@
++#ifndef __A_OUT_GNU_H__
++#define __A_OUT_GNU_H__
++
++#include <bits/a.out.h>
++
++#define __GNU_EXEC_MACROS__
++
++struct exec
++{
++  unsigned long a_info;	/* Use macros N_MAGIC, etc for access.  */
++  unsigned int a_text;	/* Length of text, in bytes.  */
++  unsigned int a_data;	/* Length of data, in bytes.  */
++  unsigned int a_bss;	/* Length of uninitialized data area for file, in bytes.  */
++  unsigned int a_syms;	/* Length of symbol table data in file, in bytes.  */
++  unsigned int a_entry;	/* Start address.  */
++  unsigned int a_trsize;/* Length of relocation info for text, in bytes.  */
++  unsigned int a_drsize;/* Length of relocation info for data, in bytes.  */
++};
++
++enum machine_type
++{
++  M_OLDSUN2 = 0,
++  M_68010 = 1,
++  M_68020 = 2,
++  M_SPARC = 3,
++  M_386 = 100,
++  M_MIPS1 = 151,
++  M_MIPS2 = 152
++};
++
++#define N_MAGIC(exec)	((exec).a_info & 0xffff)
++#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
++#define N_FLAGS(exec)	(((exec).a_info >> 24) & 0xff)
++#define N_SET_INFO(exec, magic, type, flags) \
++  ((exec).a_info = ((magic) & 0xffff)					\
++   | (((int)(type) & 0xff) << 16)					\
++   | (((flags) & 0xff) << 24))
++#define N_SET_MAGIC(exec, magic) \
++  ((exec).a_info = ((exec).a_info & 0xffff0000) | ((magic) & 0xffff))
++#define N_SET_MACHTYPE(exec, machtype) \
++  ((exec).a_info =							\
++   ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
++#define N_SET_FLAGS(exec, flags) \
++  ((exec).a_info =							\
++   ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
++
++/* Code indicating object file or impure executable.  */
++#define OMAGIC 0407
++/* Code indicating pure executable.  */
++#define NMAGIC 0410
++/* Code indicating demand-paged executable.  */
++#define ZMAGIC 0413
++/* This indicates a demand-paged executable with the header in the text. 
++   The first page is unmapped to help trap NULL pointer references.  */
++#define QMAGIC 0314
++/* Code indicating core file.  */
++#define CMAGIC 0421
++
++#define N_TRSIZE(a)	((a).a_trsize)
++#define N_DRSIZE(a)	((a).a_drsize)
++#define N_SYMSIZE(a)	((a).a_syms)
++#define N_BADMAG(x) \
++  (N_MAGIC(x) != OMAGIC	&& N_MAGIC(x) != NMAGIC				\
++   && N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC)
++#define _N_HDROFF(x)	(1024 - sizeof (struct exec))
++#define N_TXTOFF(x) \
++  (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) :	\
++   (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
++#define N_DATOFF(x)	(N_TXTOFF(x) + (x).a_text)
++#define N_TRELOFF(x)	(N_DATOFF(x) + (x).a_data)
++#define N_DRELOFF(x)	(N_TRELOFF(x) + N_TRSIZE(x))
++#define N_SYMOFF(x)	(N_DRELOFF(x) + N_DRSIZE(x))
++#define N_STROFF(x)	(N_SYMOFF(x) + N_SYMSIZE(x))
++
++/* Address of text segment in memory after it is loaded.  */
++#define N_TXTADDR(x)	(N_MAGIC(x) == QMAGIC ? 4096 : 0)
++
++/* Address of data segment in memory after it is loaded.  */
++#define SEGMENT_SIZE	1024
++
++#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1))
++#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)
++
++#define N_DATADDR(x) \
++  (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x))				\
++   : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
++#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data)
++
++#if !defined (N_NLIST_DECLARED)
++struct nlist
++{
++  union
++    {
++      char *n_name;
++      struct nlist *n_next;
++      long n_strx;
++    } n_un;
++  unsigned char n_type;
++  char n_other;
++  short n_desc;
++  unsigned long n_value;
++};
++#endif /* no N_NLIST_DECLARED.  */
++
++#define N_UNDF	0
++#define N_ABS	2
++#define N_TEXT	4
++#define N_DATA	6
++#define N_BSS	8
++#define N_FN	15
++#define N_EXT	1
++#define N_TYPE	036
++#define N_STAB	0340
++#define N_INDR	0xa
++#define	N_SETA	0x14	/* Absolute set element symbol.  */
++#define	N_SETT	0x16	/* Text set element symbol.  */
++#define	N_SETD	0x18	/* Data set element symbol.  */
++#define	N_SETB	0x1A	/* Bss set element symbol.  */
++#define N_SETV	0x1C	/* Pointer to set vector in data area.  */
++
++#if !defined (N_RELOCATION_INFO_DECLARED)
++/* This structure describes a single relocation to be performed.
++   The text-relocation section of the file is a vector of these structures,
++   all of which apply to the text section.
++   Likewise, the data-relocation section applies to the data section.  */
++
++struct relocation_info
++{
++  int r_address;
++  unsigned int r_symbolnum:24;
++  unsigned int r_pcrel:1;
++  unsigned int r_length:2;
++  unsigned int r_extern:1;
++  unsigned int r_pad:4;
++};
++#endif /* no N_RELOCATION_INFO_DECLARED.  */
++
++#endif /* __A_OUT_GNU_H__ */
+--- /dev/null
++++ b/include/bits/a.out.h
+@@ -0,0 +1,13 @@
++#ifndef __A_OUT_GNU_H__
++# error "Never use <bits/a.out.h> directly; include <a.out.h> instead."
++#endif
++
++#include <bits/wordsize.h>
++
++#if __WORDSIZE == 64
++
++/* Signal to users of this header that this architecture really doesn't
++   support a.out binary format.  */
++#define __NO_A_OUT_SUPPORT 1
++
++#endif
diff --git a/trunk/package/devel/valgrind/patches/200-musl_fix.patch b/trunk/package/devel/valgrind/patches/200-musl_fix.patch
new file mode 100644
index 00000000..7bb20296
--- /dev/null
+++ b/trunk/package/devel/valgrind/patches/200-musl_fix.patch
@@ -0,0 +1,45 @@
+--- a/coregrind/vg_preloaded.c
++++ b/coregrind/vg_preloaded.c
+@@ -56,7 +56,7 @@
+ void VG_NOTIFY_ON_LOAD(freeres)( void );
+ void VG_NOTIFY_ON_LOAD(freeres)( void )
+ {
+-#  if !defined(__UCLIBC__) \
++#  if !defined(__UCLIBC__) && defined(__GLIBC__) \
+    && !defined(VGPV_arm_linux_android) && !defined(VGPV_x86_linux_android) \
+    && !defined(VGPV_mips32_linux_android)
+    extern void __libc_freeres(void);
+--- a/include/pub_tool_redir.h
++++ b/include/pub_tool_redir.h
+@@ -241,7 +241,7 @@
+ /* --- Soname of the standard C library. --- */
+ 
+ #if defined(VGO_linux)
+-#  define  VG_Z_LIBC_SONAME  libcZdsoZa              // libc.so*
++#  define  VG_Z_LIBC_SONAME  libcZdZa                // libc.*
+ 
+ #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
+ #  define  VG_Z_LIBC_SONAME  libSystemZdZaZddylib    // libSystem.*.dylib
+@@ -273,7 +273,11 @@
+ /* --- Soname of the pthreads library. --- */
+ 
+ #if defined(VGO_linux)
++# if defined(__GLIBC__) || defined(__UCLIBC__)
+ #  define  VG_Z_LIBPTHREAD_SONAME  libpthreadZdsoZd0     // libpthread.so.0
++# else
++#  define  VG_Z_LIBPTHREAD_SONAME  libcZdZa              // libc.*
++# endif
+ #elif defined(VGO_darwin)
+ #  define  VG_Z_LIBPTHREAD_SONAME  libSystemZdZaZddylib  // libSystem.*.dylib
+ #else
+--- a/configure.ac
++++ b/configure.ac
+@@ -1031,8 +1031,6 @@ case "${GLIBC_VERSION}" in
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.19])
+-	AC_MSG_ERROR([or Darwin or Bionic libc])
+ 	;;
+ esac
+ 
diff --git a/trunk/package/devel/valgrind/src/abort.c b/trunk/package/devel/valgrind/src/abort.c
new file mode 100644
index 00000000..0b4ad98e
--- /dev/null
+++ b/trunk/package/devel/valgrind/src/abort.c
@@ -0,0 +1,3 @@
+void abort(void)
+{
+}
diff --git a/trunk/package/kernel/button-hotplug/Makefile b/trunk/package/kernel/button-hotplug/Makefile
new file mode 100644
index 00000000..347544c7
--- /dev/null
+++ b/trunk/package/kernel/button-hotplug/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=button-hotplug
+PKG_RELEASE:=3
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/button-hotplug
+  SUBMENU:=Other modules
+  TITLE:=Button Hotplug driver
+  DEPENDS:=+kmod-input-core
+  FILES:=$(PKG_BUILD_DIR)/button-hotplug.ko
+  AUTOLOAD:=$(call AutoLoad,30,button-hotplug,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/button-hotplug/description
+  Kernel module to generate button uevent-s from input subsystem events.
+  If your device uses GPIO buttons, see gpio-button-hotplug.
+endef
+
+EXTRA_KCONFIG:= \
+	CONFIG_BUTTON_HOTPLUG=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,button-hotplug))
diff --git a/trunk/package/kernel/button-hotplug/src/Kconfig b/trunk/package/kernel/button-hotplug/src/Kconfig
new file mode 100644
index 00000000..aa292e9c
--- /dev/null
+++ b/trunk/package/kernel/button-hotplug/src/Kconfig
@@ -0,0 +1,2 @@
+config BUTTON_HOTPLUG
+	tristate "Button Hotplug driver"
diff --git a/trunk/package/kernel/button-hotplug/src/Makefile b/trunk/package/kernel/button-hotplug/src/Makefile
new file mode 100644
index 00000000..230d604f
--- /dev/null
+++ b/trunk/package/kernel/button-hotplug/src/Makefile
@@ -0,0 +1 @@
+obj-${CONFIG_BUTTON_HOTPLUG}	+= button-hotplug.o
\ No newline at end of file
diff --git a/trunk/package/kernel/button-hotplug/src/button-hotplug.c b/trunk/package/kernel/button-hotplug/src/button-hotplug.c
new file mode 100644
index 00000000..41fdf3a2
--- /dev/null
+++ b/trunk/package/kernel/button-hotplug/src/button-hotplug.c
@@ -0,0 +1,343 @@
+/*
+ *  Button Hotplug driver
+ *
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  Based on the diag.c - GPIO interface driver for Broadcom boards
+ *    Copyright (C) 2006 Mike Baker <mbm@openwrt.org>,
+ *    Copyright (C) 2006-2007 Felix Fietkau <nbd@openwrt.org>
+ *    Copyright (C) 2008 Andy Boyett <agb@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/kmod.h>
+#include <linux/input.h>
+
+#include <linux/workqueue.h>
+#include <linux/skbuff.h>
+#include <linux/netlink.h>
+#include <linux/kobject.h>
+
+#define DRV_NAME	"button-hotplug"
+#define DRV_VERSION	"0.4.1"
+#define DRV_DESC	"Button Hotplug driver"
+
+#define BH_SKB_SIZE	2048
+
+#define PFX	DRV_NAME ": "
+
+#undef BH_DEBUG
+
+#ifdef BH_DEBUG
+#define BH_DBG(fmt, args...) printk(KERN_DEBUG "%s: " fmt, DRV_NAME, ##args )
+#else
+#define BH_DBG(fmt, args...) do {} while (0)
+#endif
+
+#define BH_ERR(fmt, args...) printk(KERN_ERR "%s: " fmt, DRV_NAME, ##args )
+
+#ifndef BIT_MASK
+#define BIT_MASK(nr)            (1UL << ((nr) % BITS_PER_LONG))
+#endif
+
+struct bh_priv {
+	unsigned long		*seen;
+	struct input_handle	handle;
+};
+
+struct bh_event {
+	const char		*name;
+	char			*action;
+	unsigned long		seen;
+
+	struct sk_buff		*skb;
+	struct work_struct	work;
+};
+
+struct bh_map {
+	unsigned int	code;
+	const char	*name;
+};
+
+extern u64 uevent_next_seqnum(void);
+
+#define BH_MAP(_code, _name)		\
+	{				\
+		.code = (_code),	\
+		.name = (_name),	\
+	}
+
+static struct bh_map button_map[] = {
+	BH_MAP(BTN_0,		"BTN_0"),
+	BH_MAP(BTN_1,		"BTN_1"),
+	BH_MAP(BTN_2,		"BTN_2"),
+	BH_MAP(BTN_3,		"BTN_3"),
+	BH_MAP(BTN_4,		"BTN_4"),
+	BH_MAP(BTN_5,		"BTN_5"),
+	BH_MAP(BTN_6,		"BTN_6"),
+	BH_MAP(BTN_7,		"BTN_7"),
+	BH_MAP(BTN_8,		"BTN_8"),
+	BH_MAP(BTN_9,		"BTN_9"),
+	BH_MAP(KEY_RESTART,	"reset"),
+	BH_MAP(KEY_POWER,	"power"),
+	BH_MAP(KEY_RFKILL,	"rfkill"),
+	BH_MAP(KEY_WPS_BUTTON,	"wps"),
+	BH_MAP(KEY_WIMAX,	"wwan"),
+};
+
+/* -------------------------------------------------------------------------*/
+
+static int bh_event_add_var(struct bh_event *event, int argv,
+		const char *format, ...)
+{
+	static char buf[128];
+	char *s;
+	va_list args;
+	int len;
+
+	if (argv)
+		return 0;
+
+	va_start(args, format);
+	len = vsnprintf(buf, sizeof(buf), format, args);
+	va_end(args);
+
+	if (len >= sizeof(buf)) {
+		BH_ERR("buffer size too small\n");
+		WARN_ON(1);
+		return -ENOMEM;
+	}
+
+	s = skb_put(event->skb, len + 1);
+	strcpy(s, buf);
+
+	BH_DBG("added variable '%s'\n", s);
+
+	return 0;
+}
+
+static int button_hotplug_fill_event(struct bh_event *event)
+{
+	int ret;
+
+	ret = bh_event_add_var(event, 0, "HOME=%s", "/");
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "PATH=%s",
+					"/sbin:/bin:/usr/sbin:/usr/bin");
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "SUBSYSTEM=%s", "button");
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "ACTION=%s", event->action);
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "BUTTON=%s", event->name);
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "SEEN=%ld", event->seen);
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "SEQNUM=%llu", uevent_next_seqnum());
+
+	return ret;
+}
+
+static void button_hotplug_work(struct work_struct *work)
+{
+	struct bh_event *event = container_of(work, struct bh_event, work);
+	int ret = 0;
+
+	event->skb = alloc_skb(BH_SKB_SIZE, GFP_KERNEL);
+	if (!event->skb)
+		goto out_free_event;
+
+	ret = bh_event_add_var(event, 0, "%s@", event->action);
+	if (ret)
+		goto out_free_skb;
+
+	ret = button_hotplug_fill_event(event);
+	if (ret)
+		goto out_free_skb;
+
+	NETLINK_CB(event->skb).dst_group = 1;
+	broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);
+
+ out_free_skb:
+	if (ret) {
+		BH_ERR("work error %d\n", ret);
+		kfree_skb(event->skb);
+	}
+ out_free_event:
+	kfree(event);
+}
+
+static int button_hotplug_create_event(const char *name, unsigned long seen,
+		int pressed)
+{
+	struct bh_event *event;
+
+	BH_DBG("create event, name=%s, seen=%lu, pressed=%d\n",
+		name, seen, pressed);
+
+	event = kzalloc(sizeof(*event), GFP_KERNEL);
+	if (!event)
+		return -ENOMEM;
+
+	event->name = name;
+	event->seen = seen;
+	event->action = pressed ? "pressed" : "released";
+
+	INIT_WORK(&event->work, (void *)(void *)button_hotplug_work);
+	schedule_work(&event->work);
+
+	return 0;
+}
+
+/* -------------------------------------------------------------------------*/
+
+static int button_get_index(unsigned int code)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(button_map); i++)
+		if (button_map[i].code == code)
+			return i;
+
+	return -1;
+}
+static void button_hotplug_event(struct input_handle *handle,
+			   unsigned int type, unsigned int code, int value)
+{
+	struct bh_priv *priv = handle->private;
+	unsigned long seen = jiffies;
+	int btn;
+
+	BH_DBG("event type=%u, code=%u, value=%d\n", type, code, value);
+
+	if (type != EV_KEY)
+		return;
+
+	btn = button_get_index(code);
+	if (btn < 0)
+		return;
+
+	button_hotplug_create_event(button_map[btn].name,
+			(seen - priv->seen[btn]) / HZ, value);
+	priv->seen[btn] = seen;
+}
+
+static int button_hotplug_connect(struct input_handler *handler,
+		struct input_dev *dev, const struct input_device_id *id)
+{
+	struct bh_priv *priv;
+	int ret;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(button_map); i++)
+		if (test_bit(button_map[i].code, dev->keybit))
+			break;
+
+	if (i == ARRAY_SIZE(button_map))
+		return -ENODEV;
+
+	priv = kzalloc(sizeof(*priv) +
+		       (sizeof(unsigned long) * ARRAY_SIZE(button_map)),
+		       GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	priv->seen = (unsigned long *) &priv[1];
+	priv->handle.private = priv;
+	priv->handle.dev = dev;
+	priv->handle.handler = handler;
+	priv->handle.name = DRV_NAME;
+
+	ret = input_register_handle(&priv->handle);
+	if (ret)
+		goto err_free_priv;
+
+	ret = input_open_device(&priv->handle);
+	if (ret)
+		goto err_unregister_handle;
+
+	BH_DBG("connected to %s\n", dev->name);
+
+	return 0;
+
+ err_unregister_handle:
+	input_unregister_handle(&priv->handle);
+
+ err_free_priv:
+	kfree(priv);
+	return ret;
+}
+
+static void button_hotplug_disconnect(struct input_handle *handle)
+{
+	struct bh_priv *priv = handle->private;
+
+	input_close_device(handle);
+	input_unregister_handle(handle);
+
+	kfree(priv);
+}
+
+static const struct input_device_id button_hotplug_ids[] = {
+	{
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
+                .evbit = { BIT_MASK(EV_KEY) },
+        },
+	{
+		/* Terminating entry */
+	},
+};
+
+MODULE_DEVICE_TABLE(input, button_hotplug_ids);
+
+static struct input_handler button_hotplug_handler = {
+	.event =	button_hotplug_event,
+	.connect =	button_hotplug_connect,
+	.disconnect =	button_hotplug_disconnect,
+	.name =		DRV_NAME,
+	.id_table =	button_hotplug_ids,
+};
+
+/* -------------------------------------------------------------------------*/
+
+static int __init button_hotplug_init(void)
+{
+	int ret;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+	ret = input_register_handler(&button_hotplug_handler);
+	if (ret)
+		BH_ERR("unable to register input handler\n");
+
+	return ret;
+}
+module_init(button_hotplug_init);
+
+static void __exit button_hotplug_exit(void)
+{
+	input_unregister_handler(&button_hotplug_handler);
+}
+module_exit(button_hotplug_exit);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+
diff --git a/trunk/package/kernel/gpio-button-hotplug/Makefile b/trunk/package/kernel/gpio-button-hotplug/Makefile
new file mode 100644
index 00000000..d7434aca
--- /dev/null
+++ b/trunk/package/kernel/gpio-button-hotplug/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=gpio-button-hotplug
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/gpio-button-hotplug
+  SUBMENU:=Other modules
+  DEPENDS:=@!LINUX_3_3
+  TITLE:=Simple GPIO Button Hotplug driver
+  FILES:=$(PKG_BUILD_DIR)/gpio-button-hotplug.ko
+  AUTOLOAD:=$(call AutoLoad,30,gpio-button-hotplug,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/gpio-button-hotplug/description
+ This is a replacement for the following in-kernel drivers:
+ 1) gpio_keys (KEYBOARD_GPIO)
+ 2) gpio_keys_polled (KEYBOARD_GPIO_POLLED)
+
+ Instead of generating input events (like in-kernel drivers do) it generates
+ uevent-s and broadcasts them. This allows disabling input subsystem which is
+ an overkill for libreCMC simple needs.
+endef
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)"
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,gpio-button-hotplug))
diff --git a/trunk/package/kernel/gpio-button-hotplug/src/Makefile b/trunk/package/kernel/gpio-button-hotplug/src/Makefile
new file mode 100644
index 00000000..e9688656
--- /dev/null
+++ b/trunk/package/kernel/gpio-button-hotplug/src/Makefile
@@ -0,0 +1 @@
+obj-m += gpio-button-hotplug.o
diff --git a/trunk/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/trunk/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
new file mode 100644
index 00000000..c997e358
--- /dev/null
+++ b/trunk/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -0,0 +1,660 @@
+/*
+ *  GPIO Button Hotplug driver
+ *
+ *  Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  Based on the diag.c - GPIO interface driver for Broadcom boards
+ *    Copyright (C) 2006 Mike Baker <mbm@openwrt.org>,
+ *    Copyright (C) 2006-2007 Felix Fietkau <nbd@openwrt.org>
+ *    Copyright (C) 2008 Andy Boyett <agb@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/kmod.h>
+
+#include <linux/workqueue.h>
+#include <linux/skbuff.h>
+#include <linux/netlink.h>
+#include <linux/kobject.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/of_gpio.h>
+#include <linux/gpio_keys.h>
+
+#define DRV_NAME	"gpio-keys"
+
+#define BH_SKB_SIZE	2048
+
+#define PFX	DRV_NAME ": "
+
+#undef BH_DEBUG
+
+#ifdef BH_DEBUG
+#define BH_DBG(fmt, args...) printk(KERN_DEBUG "%s: " fmt, DRV_NAME, ##args )
+#else
+#define BH_DBG(fmt, args...) do {} while (0)
+#endif
+
+#define BH_ERR(fmt, args...) printk(KERN_ERR "%s: " fmt, DRV_NAME, ##args )
+
+struct bh_priv {
+	unsigned long		seen;
+};
+
+struct bh_event {
+	const char		*name;
+	unsigned int		type;
+	char			*action;
+	unsigned long		seen;
+
+	struct sk_buff		*skb;
+	struct work_struct	work;
+};
+
+struct bh_map {
+	unsigned int	code;
+	const char	*name;
+};
+
+struct gpio_keys_button_data {
+	struct delayed_work work;
+	struct bh_priv bh;
+	int last_state;
+	int count;
+	int threshold;
+	int can_sleep;
+	struct gpio_keys_button *b;
+};
+
+extern u64 uevent_next_seqnum(void);
+
+#define BH_MAP(_code, _name)		\
+	{				\
+		.code = (_code),	\
+		.name = (_name),	\
+	}
+
+static struct bh_map button_map[] = {
+	BH_MAP(BTN_0,		"BTN_0"),
+	BH_MAP(BTN_1,		"BTN_1"),
+	BH_MAP(BTN_2,		"BTN_2"),
+	BH_MAP(BTN_3,		"BTN_3"),
+	BH_MAP(BTN_4,		"BTN_4"),
+	BH_MAP(BTN_5,		"BTN_5"),
+	BH_MAP(BTN_6,		"BTN_6"),
+	BH_MAP(BTN_7,		"BTN_7"),
+	BH_MAP(BTN_8,		"BTN_8"),
+	BH_MAP(BTN_9,		"BTN_9"),
+	BH_MAP(KEY_POWER,	"power"),
+	BH_MAP(KEY_RESTART,	"reset"),
+	BH_MAP(KEY_RFKILL,	"rfkill"),
+	BH_MAP(KEY_WPS_BUTTON,	"wps"),
+	BH_MAP(KEY_WIMAX,	"wwan"),
+};
+
+/* -------------------------------------------------------------------------*/
+
+static int bh_event_add_var(struct bh_event *event, int argv,
+		const char *format, ...)
+{
+	static char buf[128];
+	char *s;
+	va_list args;
+	int len;
+
+	if (argv)
+		return 0;
+
+	va_start(args, format);
+	len = vsnprintf(buf, sizeof(buf), format, args);
+	va_end(args);
+
+	if (len >= sizeof(buf)) {
+		BH_ERR("buffer size too small\n");
+		WARN_ON(1);
+		return -ENOMEM;
+	}
+
+	s = skb_put(event->skb, len + 1);
+	strcpy(s, buf);
+
+	BH_DBG("added variable '%s'\n", s);
+
+	return 0;
+}
+
+static int button_hotplug_fill_event(struct bh_event *event)
+{
+	int ret;
+
+	ret = bh_event_add_var(event, 0, "HOME=%s", "/");
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "PATH=%s",
+					"/sbin:/bin:/usr/sbin:/usr/bin");
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "SUBSYSTEM=%s", "button");
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "ACTION=%s", event->action);
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "BUTTON=%s", event->name);
+	if (ret)
+		return ret;
+
+	if (event->type == EV_SW) {
+		ret = bh_event_add_var(event, 0, "TYPE=%s", "switch");
+		if (ret)
+			return ret;
+	}
+
+	ret = bh_event_add_var(event, 0, "SEEN=%ld", event->seen);
+	if (ret)
+		return ret;
+
+	ret = bh_event_add_var(event, 0, "SEQNUM=%llu", uevent_next_seqnum());
+
+	return ret;
+}
+
+static void button_hotplug_work(struct work_struct *work)
+{
+	struct bh_event *event = container_of(work, struct bh_event, work);
+	int ret = 0;
+
+	event->skb = alloc_skb(BH_SKB_SIZE, GFP_KERNEL);
+	if (!event->skb)
+		goto out_free_event;
+
+	ret = bh_event_add_var(event, 0, "%s@", event->action);
+	if (ret)
+		goto out_free_skb;
+
+	ret = button_hotplug_fill_event(event);
+	if (ret)
+		goto out_free_skb;
+
+	NETLINK_CB(event->skb).dst_group = 1;
+	broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);
+
+ out_free_skb:
+	if (ret) {
+		BH_ERR("work error %d\n", ret);
+		kfree_skb(event->skb);
+	}
+ out_free_event:
+	kfree(event);
+}
+
+static int button_hotplug_create_event(const char *name, unsigned int type,
+		unsigned long seen, int pressed)
+{
+	struct bh_event *event;
+
+	BH_DBG("create event, name=%s, seen=%lu, pressed=%d\n",
+		name, seen, pressed);
+
+	event = kzalloc(sizeof(*event), GFP_KERNEL);
+	if (!event)
+		return -ENOMEM;
+
+	event->name = name;
+	event->type = type;
+	event->seen = seen;
+	event->action = pressed ? "pressed" : "released";
+
+	INIT_WORK(&event->work, (void *)(void *)button_hotplug_work);
+	schedule_work(&event->work);
+
+	return 0;
+}
+
+/* -------------------------------------------------------------------------*/
+
+static int button_get_index(unsigned int code)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(button_map); i++)
+		if (button_map[i].code == code)
+			return i;
+
+	return -1;
+}
+
+static void button_hotplug_event(struct gpio_keys_button_data *data,
+			   unsigned int type, int value)
+{
+	struct bh_priv *priv = &data->bh;
+	unsigned long seen = jiffies;
+	int btn;
+
+	BH_DBG("event type=%u, code=%u, value=%d\n", type, data->b->code, value);
+
+	if ((type != EV_KEY) && (type != EV_SW))
+		return;
+
+	btn = button_get_index(data->b->code);
+	if (btn < 0)
+		return;
+
+	button_hotplug_create_event(button_map[btn].name, type,
+			(seen - priv->seen) / HZ, value);
+	priv->seen = seen;
+}
+
+struct gpio_keys_button_dev {
+	int polled;
+	struct delayed_work work;
+
+	struct device *dev;
+	struct gpio_keys_platform_data *pdata;
+	struct gpio_keys_button_data data[0];
+};
+
+static int gpio_button_get_value(struct gpio_keys_button_data *bdata)
+{
+	int val;
+
+	if (bdata->can_sleep)
+		val = !!gpio_get_value_cansleep(bdata->b->gpio);
+	else
+		val = !!gpio_get_value(bdata->b->gpio);
+
+	return val ^ bdata->b->active_low;
+}
+
+static void gpio_keys_polled_check_state(struct gpio_keys_button_data *bdata)
+{
+	int state = gpio_button_get_value(bdata);
+
+	if (state != bdata->last_state) {
+		unsigned int type = bdata->b->type ?: EV_KEY;
+
+		if (bdata->count < bdata->threshold) {
+			bdata->count++;
+			return;
+		}
+
+		if ((bdata->last_state != -1) || (type == EV_SW))
+			button_hotplug_event(bdata, type, state);
+
+		bdata->last_state = state;
+	}
+
+	bdata->count = 0;
+}
+
+static void gpio_keys_polled_queue_work(struct gpio_keys_button_dev *bdev)
+{
+	struct gpio_keys_platform_data *pdata = bdev->pdata;
+	unsigned long delay = msecs_to_jiffies(pdata->poll_interval);
+
+	if (delay >= HZ)
+		delay = round_jiffies_relative(delay);
+	schedule_delayed_work(&bdev->work, delay);
+}
+
+static void gpio_keys_polled_poll(struct work_struct *work)
+{
+	struct gpio_keys_button_dev *bdev =
+		container_of(work, struct gpio_keys_button_dev, work.work);
+	int i;
+
+	for (i = 0; i < bdev->pdata->nbuttons; i++) {
+		struct gpio_keys_button_data *bdata = &bdev->data[i];
+		gpio_keys_polled_check_state(bdata);
+	}
+	gpio_keys_polled_queue_work(bdev);
+}
+
+static void gpio_keys_polled_close(struct gpio_keys_button_dev *bdev)
+{
+	struct gpio_keys_platform_data *pdata = bdev->pdata;
+
+	cancel_delayed_work_sync(&bdev->work);
+
+	if (pdata->disable)
+		pdata->disable(bdev->dev);
+}
+
+static irqreturn_t button_handle_irq(int irq, void *_bdata)
+{
+	struct gpio_keys_button_data *bdata = (struct gpio_keys_button_data *) _bdata;
+
+	button_hotplug_event(bdata, bdata->b->type ?: EV_KEY, gpio_button_get_value(bdata));
+
+	return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_OF
+static struct gpio_keys_platform_data *
+gpio_keys_get_devtree_pdata(struct device *dev)
+{
+	struct device_node *node, *pp;
+	struct gpio_keys_platform_data *pdata;
+	struct gpio_keys_button *button;
+	int error;
+	int nbuttons;
+	int i = 0;
+
+	node = dev->of_node;
+	if (!node)
+		return NULL;
+
+	nbuttons = of_get_child_count(node);
+	if (nbuttons == 0)
+		return NULL;
+
+	pdata = devm_kzalloc(dev, sizeof(*pdata) + nbuttons * (sizeof *button),
+		GFP_KERNEL);
+	if (!pdata) {
+		error = -ENOMEM;
+		goto err_out;
+	}
+
+	pdata->buttons = (struct gpio_keys_button *)(pdata + 1);
+	pdata->nbuttons = nbuttons;
+
+	pdata->rep = !!of_get_property(node, "autorepeat", NULL);
+	of_property_read_u32(node, "poll-interval", &pdata->poll_interval);
+
+	for_each_child_of_node(node, pp) {
+		enum of_gpio_flags flags;
+
+		if (!of_find_property(pp, "gpios", NULL)) {
+			pdata->nbuttons--;
+			dev_warn(dev, "Found button without gpios\n");
+			continue;
+		}
+
+		button = &pdata->buttons[i++];
+
+		button->gpio = of_get_gpio_flags(pp, 0, &flags);
+		button->active_low = flags & OF_GPIO_ACTIVE_LOW;
+
+		if (of_property_read_u32(pp, "linux,code", &button->code)) {
+			dev_err(dev, "Button without keycode: 0x%x\n",
+				button->gpio);
+			error = -EINVAL;
+			goto err_out;
+		}
+
+		button->desc = of_get_property(pp, "label", NULL);
+
+		if (of_property_read_u32(pp, "linux,input-type", &button->type))
+			button->type = EV_KEY;
+
+		button->wakeup = !!of_get_property(pp, "gpio-key,wakeup", NULL);
+
+		if (of_property_read_u32(pp, "debounce-interval",
+					&button->debounce_interval))
+			button->debounce_interval = 5;
+	}
+
+	if (pdata->nbuttons == 0) {
+		error = -EINVAL;
+		goto err_out;
+	}
+
+	return pdata;
+
+err_out:
+	return ERR_PTR(error);
+}
+
+static struct of_device_id gpio_keys_of_match[] = {
+	{ .compatible = "gpio-keys", },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, gpio_keys_of_match);
+
+static struct of_device_id gpio_keys_polled_of_match[] = {
+	{ .compatible = "gpio-keys-polled", },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, gpio_keys_polled_of_match);
+
+#else
+
+static inline struct gpio_keys_platform_data *
+gpio_keys_get_devtree_pdata(struct device *dev)
+{
+	return NULL;
+}
+#endif
+
+static int gpio_keys_button_probe(struct platform_device *pdev,
+		struct gpio_keys_button_dev **_bdev, int polled)
+{
+	struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
+	struct device *dev = &pdev->dev;
+	struct gpio_keys_button_dev *bdev;
+	struct gpio_keys_button *buttons;
+	int error;
+	int i;
+
+	if (!pdata) {
+		pdata = gpio_keys_get_devtree_pdata(dev);
+		if (IS_ERR(pdata))
+			return PTR_ERR(pdata);
+		if (!pdata) {
+			dev_err(dev, "missing platform data\n");
+			return -EINVAL;
+		}
+		pdev->dev.platform_data = pdata;
+	}
+
+	if (polled && !pdata->poll_interval) {
+		dev_err(dev, "missing poll_interval value\n");
+		return -EINVAL;
+	}
+
+	buttons = devm_kzalloc(dev, pdata->nbuttons * sizeof(struct gpio_keys_button),
+		       GFP_KERNEL);
+	if (!buttons) {
+		dev_err(dev, "no memory for button data\n");
+		return -ENOMEM;
+	}
+	memcpy(buttons, pdata->buttons, pdata->nbuttons * sizeof(struct gpio_keys_button));
+
+	bdev = devm_kzalloc(dev, sizeof(struct gpio_keys_button_dev) +
+		       pdata->nbuttons * sizeof(struct gpio_keys_button_data),
+		       GFP_KERNEL);
+	if (!bdev) {
+		dev_err(dev, "no memory for private data\n");
+		return -ENOMEM;
+	}
+
+	bdev->polled = polled;
+
+	for (i = 0; i < pdata->nbuttons; i++) {
+		struct gpio_keys_button *button = &buttons[i];
+		struct gpio_keys_button_data *bdata = &bdev->data[i];
+		unsigned int gpio = button->gpio;
+
+		if (button->wakeup) {
+			dev_err(dev, DRV_NAME "does not support wakeup\n");
+			return -EINVAL;
+		}
+
+		error = devm_gpio_request(dev, gpio,
+				     button->desc ? button->desc : DRV_NAME);
+		if (error) {
+			dev_err(dev, "unable to claim gpio %u, err=%d\n",
+				gpio, error);
+			return error;
+		}
+
+		error = gpio_direction_input(gpio);
+		if (error) {
+			dev_err(dev,
+				"unable to set direction on gpio %u, err=%d\n",
+				gpio, error);
+			return error;
+		}
+
+		bdata->can_sleep = gpio_cansleep(gpio);
+		bdata->last_state = -1;
+
+		if (bdev->polled)
+			bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
+						pdata->poll_interval);
+		else
+			bdata->threshold = 1;
+
+		bdata->b = &pdata->buttons[i];
+	}
+
+	bdev->dev = &pdev->dev;
+	bdev->pdata = pdata;
+	platform_set_drvdata(pdev, bdev);
+
+	*_bdev = bdev;
+
+	return 0;
+}
+
+static int gpio_keys_probe(struct platform_device *pdev)
+{
+	struct gpio_keys_platform_data *pdata;
+	struct gpio_keys_button_dev *bdev;
+	int ret, i;
+
+
+	ret = gpio_keys_button_probe(pdev, &bdev, 0);
+
+	if (ret)
+		return ret;
+
+	pdata = pdev->dev.platform_data;
+	for (i = 0; i < pdata->nbuttons; i++) {
+		struct gpio_keys_button *button = &pdata->buttons[i];
+		struct gpio_keys_button_data *bdata = &bdev->data[i];
+
+		if (bdata->can_sleep) {
+			dev_err(&pdev->dev, "skipping gpio:%d, it can sleep\n", button->gpio);
+			continue;
+		}
+		if (!button->irq)
+			button->irq = gpio_to_irq(button->gpio);
+		if (button->irq < 0) {
+			dev_err(&pdev->dev, "failed to get irq for gpio:%d\n", button->gpio);
+			continue;
+		}
+		ret = devm_request_irq(&pdev->dev, button->irq, button_handle_irq,
+					IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+					dev_name(&pdev->dev), bdata);
+		if (ret)
+			dev_err(&pdev->dev, "failed to request irq:%d for gpio:%d\n", button->irq, button->gpio);
+		else
+			dev_dbg(&pdev->dev, "gpio:%d has irq:%d\n", button->gpio, button->irq);
+
+		if (bdata->b->type == EV_SW)
+			button_hotplug_event(bdata, EV_SW, gpio_button_get_value(bdata));
+	}
+
+	return 0;
+}
+
+static int gpio_keys_polled_probe(struct platform_device *pdev)
+{
+	struct gpio_keys_platform_data *pdata;
+	struct gpio_keys_button_dev *bdev;
+	int ret;
+	int i;
+
+	ret = gpio_keys_button_probe(pdev, &bdev, 1);
+
+	if (ret)
+		return ret;
+
+	INIT_DELAYED_WORK(&bdev->work, gpio_keys_polled_poll);
+
+	pdata = bdev->pdata;
+
+	if (pdata->enable)
+		pdata->enable(bdev->dev);
+
+	for (i = 0; i < pdata->nbuttons; i++)
+		gpio_keys_polled_check_state(&bdev->data[i]);
+
+	gpio_keys_polled_queue_work(bdev);
+
+	return ret;
+}
+
+static int gpio_keys_remove(struct platform_device *pdev)
+{
+	struct gpio_keys_button_dev *bdev = platform_get_drvdata(pdev);
+
+	platform_set_drvdata(pdev, NULL);
+
+	if (bdev->polled)
+		gpio_keys_polled_close(bdev);
+
+	return 0;
+}
+
+static struct platform_driver gpio_keys_driver = {
+	.probe	= gpio_keys_probe,
+	.remove	= gpio_keys_remove,
+	.driver	= {
+		.name	= "gpio-keys",
+		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(gpio_keys_of_match),
+	},
+};
+
+static struct platform_driver gpio_keys_polled_driver = {
+	.probe	= gpio_keys_polled_probe,
+	.remove	= gpio_keys_remove,
+	.driver	= {
+		.name	= "gpio-keys-polled",
+		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(gpio_keys_polled_of_match),
+	},
+};
+
+static int __init gpio_button_init(void)
+{
+	int ret;
+
+	ret = platform_driver_register(&gpio_keys_driver);
+	if (ret)
+		return ret;
+
+	ret = platform_driver_register(&gpio_keys_polled_driver);
+	if (ret)
+		platform_driver_unregister(&gpio_keys_driver);
+
+	return ret;
+}
+
+static void __exit gpio_button_exit(void)
+{
+	platform_driver_unregister(&gpio_keys_driver);
+	platform_driver_unregister(&gpio_keys_polled_driver);
+}
+
+module_init(gpio_button_init);
+module_exit(gpio_button_exit);
+
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_DESCRIPTION("Polled GPIO Buttons hotplug driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/trunk/package/kernel/hostap-driver/Makefile b/trunk/package/kernel/hostap-driver/Makefile
new file mode 100644
index 00000000..87c854c2
--- /dev/null
+++ b/trunk/package/kernel/hostap-driver/Makefile
@@ -0,0 +1,117 @@
+# 
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=hostap-driver
+PKG_VERSION:=0.4.9
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/hostap/Default
+  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  SUBMENU:=Wireless Drivers
+  URL:=http://hostap.epitest.fi/
+endef
+
+define KernelPackage/hostap/Default/description
+ Host AP is a driver for 802.11b wireless cards based on Intersil 
+ Prism2/2.5/3 chipset. It supports so called Host AP mode that allows the 
+ card to act as an IEEE 802.11 access point.
+endef
+
+
+define KernelPackage/hostap
+$(call KernelPackage/hostap/Default)
+  TITLE:=Host AP support for Prism2/2.5/3
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-lib80211 +wireless-tools +hostapd-common-old
+  KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.ko
+  AUTOLOAD:=$(call AutoProbe,hostap)
+endef
+
+define KernelPackage/hostap/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the base Host AP driver code that is shared by 
+ different hardware models. You will also need to enable support for 
+ PLX/PCI/CS version of the driver to actually use the driver.
+endef
+
+
+define KernelPackage/hostap-cs
+$(call KernelPackage/hostap/Default)
+  TITLE:=Host AP driver for PCMCIA adaptors
+  DEPENDS:=@PCMCIA_SUPPORT +kmod-hostap +kmod-pcmcia-core
+  KCONFIG:=CONFIG_HOSTAP_CS
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_cs.ko
+  AUTOLOAD:=$(call AutoProbe,hostap_cs)
+endef
+
+define KernelPackage/hostap-cs/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2/2.5/3 PC cards.
+endef
+
+
+define KernelPackage/hostap-pci
+$(call KernelPackage/hostap/Default)
+  TITLE:=Host AP driver for PCI adaptors
+  DEPENDS:=@PCI_SUPPORT +kmod-hostap
+  KCONFIG:=CONFIG_HOSTAP_PCI
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.ko
+  AUTOLOAD:=$(call AutoProbe,hostap_pci)
+endef
+
+define KernelPackage/hostap-pci/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2.5 PCI adaptors.
+endef
+
+
+define KernelPackage/hostap-plx
+$(call KernelPackage/hostap/Default)
+  TITLE:=Host AP driver for PLX9052 based PCI adaptors
+  DEPENDS:=@PCI_SUPPORT +kmod-hostap
+  KCONFIG:=CONFIG_HOSTAP_PLX
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.ko
+  AUTOLOAD:=$(call AutoProbe,hostap_plx)
+endef
+
+define KernelPackage/hostap-plx/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 
+ based PCI adaptors.
+endef
+
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+
+endef
+
+define Build/Compile
+
+endef
+
+define KernelPackage/hostap/install
+	$(INSTALL_DIR) $(1)/lib/wifi
+	$(INSTALL_DATA) ./files/lib/wifi/hostap.sh $(1)/lib/wifi
+endef
+
+$(eval $(call KernelPackage,hostap))
+$(eval $(call KernelPackage,hostap-cs))
+$(eval $(call KernelPackage,hostap-pci))
+$(eval $(call KernelPackage,hostap-plx))
diff --git a/trunk/package/kernel/hostap-driver/files/lib/wifi/hostap.sh b/trunk/package/kernel/hostap-driver/files/lib/wifi/hostap.sh
new file mode 100755
index 00000000..702a4043
--- /dev/null
+++ b/trunk/package/kernel/hostap-driver/files/lib/wifi/hostap.sh
@@ -0,0 +1,270 @@
+#!/bin/sh
+append DRIVERS "prism2"
+
+find_prism2_phy() {
+	local device="$1"
+
+	local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')"
+	config_get phy "$device" phy
+	[ -z "$phy" -a -n "$macaddr" ] && {
+		cd /proc/net/hostap
+		for phy in $(ls -d wlan* 2>&-); do
+			[ "$macaddr" = "$(cat /sys/class/net/${phy}/address)" ] || continue
+			config_set "$device" phy "$phy"
+			break
+		done
+		config_get phy "$device" phy
+	}
+	[ -n "$phy" -a -d "/proc/net/hostap/$phy" ] || {
+		echo "phy for wifi device $1 not found"
+		return 1
+	}
+	[ -z "$macaddr" ] && {
+		config_set "$device" macaddr "$(cat /sys/class/net/${phy}/address)"
+	}
+	return 0
+}
+
+scan_prism2() {
+	local device="$1"
+	local mainvif
+	local wds
+
+	[ ${device%[0-9]} = "wlan" ] && config_set "$device" phy "$device" || find_prism2_phy "$device" || {
+		config_unset "$device" vifs
+		return 0
+	}
+	config_get phy "$device" phy
+
+	config_get vifs "$device" vifs
+	local _c=0
+	for vif in $vifs; do
+		config_get_bool disabled "$vif" disabled 0
+		[ $disabled = 0 ] || continue
+
+		config_get mode "$vif" mode
+		case "$mode" in
+			adhoc|sta|ap|monitor)
+				# Only one vif is allowed on AP, station, Ad-hoc or monitor mode
+				[ -z "$mainvif" ] && {
+					mainvif="$vif"
+					config_set "$vif" ifname "$phy"
+				}
+			;;
+			wds)
+				config_get ssid "$vif" ssid
+				[ -z "$ssid" ] && continue
+				config_set "$vif" ifname "${phy}wds${_c}"
+				_c=$(($_c + 1))
+				addr="$ssid"
+				${addr:+append wds "$vif"}
+			;;
+			*) echo "$device($vif): Invalid mode, ignored."; continue;;
+		esac
+	done
+	config_set "$device" vifs "${mainvif:+$mainvif }${wds:+$wds}"
+}
+
+disable_prism2() (
+	local device="$1"
+
+	find_prism2_phy "$device" || return 0
+	config_get phy "$device" phy
+
+	set_wifi_down "$device"
+
+	include /lib/network
+	while read line < /proc/net/hostap/${phy}/wds; do
+		set $line
+		[ -f "/var/run/wifi-${1}.pid" ] &&
+			kill "$(cat "/var/run/wifi-${1}.pid")"
+		ifconfig "$1" down
+		unbridge "$1"
+		iwpriv "$phy" wds_del "$2"
+	done
+	unbridge "$phy"
+	return 0
+)
+
+enable_prism2() {
+	local device="$1"
+
+	find_prism2_phy "$device" || return 0
+	config_get phy "$device" phy
+
+	config_get rxantenna "$device" rxantenna
+	config_get txantenna "$device" txantenna
+	config_get_bool diversity "$device" diversity
+	[ -n "$diversity" ] && {
+		rxantenna="1"
+		txantenna="1"
+	}
+	[ -n "$rxantenna" ] && iwpriv "$phy" antsel_rx "$rxantenna"
+	[ -n "$txantenna" ] && iwpriv "$phy" antsel_tx "$txantenna"
+
+	config_get channel "$device" channel
+	[ -n "$channel" ] && iwconfig "$phy" channel "$channel" >/dev/null 2>/dev/null
+
+	config_get txpower "$device" txpower
+	[ -n "$txpower" ] && iwconfig "$phy" txpower "${txpower%%.*}"
+
+	config_get vifs "$device" vifs
+	local first=1
+	for vif in $vifs; do
+		config_get ifname "$vif" ifname
+		config_get ssid "$vif" ssid
+		config_get mode "$vif" mode
+
+		[ "$mode" = "wds" ] || iwconfig "$phy" essid ${ssid:+-- }"${ssid:-any}"
+
+		case "$mode" in
+			sta)
+				iwconfig "$phy" mode managed
+				config_get addr "$device" bssid
+				[ -z "$addr" ] || { 
+					iwconfig "$phy" ap "$addr"
+				}
+			;;
+			ap) iwconfig "$phy" mode master;;
+			wds) iwpriv "$phy" wds_add "$ssid";;
+			adhoc) iwconfig "$phy" mode ad-hoc;;
+			*) iwconfig "$phy" mode "$mode";;
+		esac
+
+		[ "$first" = 1 ] && {
+			config_get rate "$vif" rate
+			[ -n "$rate" ] && iwconfig "$phy" rate "${rate%%.*}"
+
+			config_get_bool hidden "$vif" hidden 0
+			iwpriv "$phy" enh_sec "$hidden"
+
+			config_get frag "$vif" frag
+			[ -n "$frag" ] && iwconfig "$phy" frag "${frag%%.*}"
+
+			config_get rts "$vif" rts
+			[ -n "$rts" ] && iwconfig "$phy" rts "${rts%%.*}"
+
+			config_get maclist "$vif" maclist
+			[ -n "$maclist" ] && {
+				# flush MAC list
+				iwpriv "$phy" maccmd 3
+				for mac in $maclist; do
+					iwpriv "$phy" addmac "$mac"
+				done
+			}
+			config_get macpolicy "$vif" macpolicy
+			case "$macpolicy" in
+				allow)
+					iwpriv "$phy" maccmd 2
+				;;
+				deny)
+					iwpriv "$phy" maccmd 1
+				;;
+				*)
+					# default deny policy if mac list exists
+					[ -n "$maclist" ] && iwpriv "$phy" maccmd 1
+				;;
+			esac
+			# kick all stations if we have policy explicitly set
+			[ -n "$macpolicy" ] && iwpriv "$phy" maccmd 4
+		}
+
+		config_get enc "$vif" encryption
+		case "$enc" in
+			WEP|wep)
+				for idx in 1 2 3 4; do
+					config_get key "$vif" "key${idx}"
+					iwconfig "$ifname" enc "[$idx]" "${key:-off}"
+				done
+				config_get key "$vif" key
+				key="${key:-1}"
+				case "$key" in
+					[1234]) iwconfig "$ifname" enc "[$key]";;
+					*) iwconfig "$ifname" enc "$key";;
+				esac
+			;;
+			psk*|wpa*)
+				start_hostapd=1
+				config_get key "$vif" key
+			;;
+		esac
+
+		local net_cfg bridge
+		net_cfg="$(find_net_config "$vif")"
+		[ -z "$net_cfg" ] || {
+			bridge="$(bridge_interface "$net_cfg")"
+			config_set "$vif" bridge "$bridge"
+			start_net "$ifname" "$net_cfg"
+		}
+		set_wifi_up "$vif" "$ifname"
+
+		case "$mode" in
+			ap)
+				if [ -n "$start_hostapd" ] && eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
+					hostapd_setup_vif "$vif" hostap || {
+						echo "enable_prism2($device): Failed to set up hostapd for interface $ifname" >&2
+						# make sure this wifi interface won't accidentally stay open without encryption
+						ifconfig "$ifname" down
+						continue
+					}
+				fi
+			;;
+			wds|sta)
+				if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+					wpa_supplicant_setup_vif "$vif" wext || {
+						echo "enable_prism2($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+						ifconfig "$ifname" down
+						continue
+					}
+				fi
+			;;
+		esac
+		first=0
+	done
+
+}
+
+check_prism2_device() {
+	[ ${1%[0-9]} = "wlan" ] && config_set "$1" phy "$1"
+	config_get phy "$1" phy
+	[ -z "$phy" ] && {
+		find_prism2_phy "$1" >/dev/null || return 0
+		config_get phy "$1" phy
+	}
+	[ "$phy" = "$dev" ] && found=1
+}
+
+detect_prism2() {
+	devidx=0
+	config_load wireless
+	while :; do
+		config_get type "radio$devidx" type
+		[ -n "$type" ] || break
+		devidx=$(($devidx + 1))
+	done
+	cd /proc/net/hostap
+	[ -d wlan* ] || return
+	for dev in $(ls -d wlan* 2>&-); do
+		found=0
+		config_foreach check_prism2_device wifi-device
+		[ "$found" -gt 0 ] && continue
+		cat <<EOF
+config wifi-device radio$devidx
+	option type	prism2
+	option channel  11
+	option macaddr	$(cat /sys/class/net/${dev}/address)
+
+	# REMOVE THIS LINE TO ENABLE WIFI:
+	option disabled 1
+
+config wifi-iface
+	option device	radio$devidx
+	option network	lan
+	option mode	ap
+	option ssid	libreCMC
+	option encryption none
+
+EOF
+	devidx=$(($devidx + 1))
+	done
+}
diff --git a/trunk/package/kernel/hostap-driver/patches/001-fix-txpower.patch b/trunk/package/kernel/hostap-driver/patches/001-fix-txpower.patch
new file mode 100644
index 00000000..94ca3449
--- /dev/null
+++ b/trunk/package/kernel/hostap-driver/patches/001-fix-txpower.patch
@@ -0,0 +1,175 @@
+diff -Naur hostap-driver-0.3.7/driver/modules/hostap.c hostap-driver-0.3.7-patched/driver/modules/hostap.c
+--- hostap-driver-0.3.7/driver/modules/hostap.c	2004-08-28 06:26:46.000000000 +0300
++++ hostap-driver-0.3.7-patched/driver/modules/hostap.c	2005-04-20 17:20:56.000000000 +0300
+@@ -1164,6 +1164,36 @@
+ 	return ret;
+ }
+ 
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = dev->priv;
++       local_info_t *local = iface->local;
++               
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
+ 
+ struct proc_dir_entry *hostap_proc;
+ 
+@@ -1214,6 +1244,7 @@
+ EXPORT_SYMBOL(hostap_set_hostapd_sta);
+ EXPORT_SYMBOL(hostap_add_interface);
+ EXPORT_SYMBOL(hostap_remove_interface);
++EXPORT_SYMBOL(hostap_restore_power);
+ EXPORT_SYMBOL(prism2_update_comms_qual);
+ 
+ module_init(hostap_init);
+diff -Naur hostap-driver-0.3.7/driver/modules/hostap.h hostap-driver-0.3.7-patched/driver/modules/hostap.h
+--- hostap-driver-0.3.7/driver/modules/hostap.h	2003-11-30 04:14:26.000000000 +0200
++++ hostap-driver-0.3.7-patched/driver/modules/hostap.h	2005-04-20 17:21:23.000000000 +0300
+@@ -36,6 +36,7 @@
+ 					 const char *prefix, const char *name);
+ void hostap_remove_interface(struct net_device *dev, int rtnl_locked,
+ 			     int remove_from_list);
++int hostap_restore_power(struct net_device *dev);
+ int prism2_update_comms_qual(struct net_device *dev);
+ int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u8 stype,
+ 			 u8 *body, size_t bodylen);
+diff -Naur hostap-driver-0.3.7/driver/modules/hostap_ap.c hostap-driver-0.3.7-patched/driver/modules/hostap_ap.c
+--- hostap-driver-0.3.7/driver/modules/hostap_ap.c	2005-01-24 04:52:00.000000000 +0200
++++ hostap-driver-0.3.7-patched/driver/modules/hostap_ap.c	2005-04-21 20:06:12.000000000 +0300
+@@ -2346,13 +2346,13 @@
+ 		addr[count].sa_family = ARPHRD_ETHER;
+ 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+ 		if (sta->last_rx_silence == 0)
+-			qual[count].qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			qual[count].qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+ 		qual[count].updated = sta->last_rx_updated;
+ 
+ 		sta->last_rx_updated = 0;
+@@ -2413,13 +2413,13 @@
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = IWEVQUAL;
+ 		if (sta->last_rx_silence == 0)
+-			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			iwe.u.qual.qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+ 		iwe.u.qual.updated = sta->last_rx_updated;
+ 		iwe.len = IW_EV_QUAL_LEN;
+ 		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+diff -Naur hostap-driver-0.3.7/driver/modules/hostap_config.h hostap-driver-0.3.7-patched/driver/modules/hostap_config.h
+--- hostap-driver-0.3.7/driver/modules/hostap_config.h	2005-02-12 18:12:56.000000000 +0200
++++ hostap-driver-0.3.7-patched/driver/modules/hostap_config.h	2005-04-20 17:25:23.000000000 +0300
+@@ -94,6 +94,12 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++
++#define RAW_TXPOWER_SETTING
++
+ /* Use Linux crypto API instead of own encryption implementation whenever
+  * possible. */
+ /* #define HOSTAP_USE_CRYPTO_API */
+diff -Naur hostap-driver-0.3.7/driver/modules/hostap_hw.c hostap-driver-0.3.7-patched/driver/modules/hostap_hw.c
+--- hostap-driver-0.3.7/driver/modules/hostap_hw.c	2005-02-05 09:20:09.000000000 +0200
++++ hostap-driver-0.3.7-patched/driver/modules/hostap_hw.c	2005-04-20 17:25:55.000000000 +0300
+@@ -1039,6 +1039,7 @@
+ 		       dev->name, local->fragm_threshold);
+ 	}
+ 
++	hostap_restore_power(dev);
+ 	return res;
+ }
+ 
+diff -Naur hostap-driver-0.3.7/driver/modules/hostap_info.c hostap-driver-0.3.7-patched/driver/modules/hostap_info.c
+--- hostap-driver-0.3.7/driver/modules/hostap_info.c	2004-02-29 20:05:44.000000000 +0200
++++ hostap-driver-0.3.7-patched/driver/modules/hostap_info.c	2005-04-20 17:26:36.000000000 +0300
+@@ -418,6 +418,11 @@
+ 	}
+ 
+ 	/* Get BSSID if we have a valid AP address */
++
++	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++	     val == HFA384X_LINKSTATUS_DISCONNECTED ) 
++			hostap_restore_power(local->dev);
++
+ 	if (connected) {
+ 		netif_carrier_on(local->dev);
+ 		netif_carrier_on(local->ddev);
+diff -Naur hostap-driver-0.3.7/driver/modules/hostap_ioctl.c hostap-driver-0.3.7-patched/driver/modules/hostap_ioctl.c
+--- hostap-driver-0.3.7/driver/modules/hostap_ioctl.c	2004-11-22 08:03:05.000000000 +0200
++++ hostap-driver-0.3.7-patched/driver/modules/hostap_ioctl.c	2005-04-20 17:42:41.000000000 +0300
+@@ -1453,23 +1453,20 @@
+ 		val = 255;
+ 
+ 	tmp = val;
+-	tmp >>= 2;
+ 
+-	return -12 - tmp;
++	return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+ 	signed char tmp;
+ 
+-	if (val > 20)
+-		return 128;
+-	else if (val < -43)
++	if (val > 127)
+ 		return 127;
++	else if (val < -128)
++		return 128;
+ 
+ 	tmp = val;
+-	tmp = -12 - tmp;
+-	tmp <<= 2;
+ 
+ 	return (unsigned char) tmp;
+ }
diff --git a/trunk/package/kernel/i2c-gpio-custom/Makefile b/trunk/package/kernel/i2c-gpio-custom/Makefile
new file mode 100644
index 00000000..8585a5ab
--- /dev/null
+++ b/trunk/package/kernel/i2c-gpio-custom/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=i2c-gpio-custom
+PKG_RELEASE:=2
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/i2c-gpio-custom
+  SUBMENU:=I2C support
+  TITLE:=Custom GPIO-based I2C device
+  DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +kmod-i2c-gpio
+  FILES:=$(PKG_BUILD_DIR)/i2c-gpio-custom.ko
+  KCONFIG:=
+endef
+
+define KernelPackage/i2c-gpio-custom/description
+ Kernel module for register a custom i2c-gpio platform device.
+endef
+
+EXTRA_KCONFIG:= \
+	CONFIG_I2C_GPIO_CUSTOM=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,i2c-gpio-custom))
diff --git a/trunk/package/kernel/i2c-gpio-custom/src/Kconfig b/trunk/package/kernel/i2c-gpio-custom/src/Kconfig
new file mode 100644
index 00000000..e2e3a68d
--- /dev/null
+++ b/trunk/package/kernel/i2c-gpio-custom/src/Kconfig
@@ -0,0 +1,10 @@
+config I2C_GPIO_CUSTOM
+	tristate "Custom GPIO-based I2C driver"
+	depends on GENERIC_GPIO
+	select I2C_GPIO
+	help
+	  This is an I2C driver to register 1 to 4 custom I2C buses using
+	  GPIO lines.
+
+	  This support is also available as a module.  If so, the module
+	  will be called i2c-gpio-custom.
diff --git a/trunk/package/kernel/i2c-gpio-custom/src/Makefile b/trunk/package/kernel/i2c-gpio-custom/src/Makefile
new file mode 100644
index 00000000..dcb2e2ab
--- /dev/null
+++ b/trunk/package/kernel/i2c-gpio-custom/src/Makefile
@@ -0,0 +1 @@
+obj-${CONFIG_I2C_GPIO_CUSTOM}	+= i2c-gpio-custom.o
\ No newline at end of file
diff --git a/trunk/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c b/trunk/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c
new file mode 100644
index 00000000..921d290d
--- /dev/null
+++ b/trunk/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c
@@ -0,0 +1,202 @@
+/*
+ *  Custom GPIO-based I2C driver
+ *
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ * ---------------------------------------------------------------------------
+ *
+ *  The behaviour of this driver can be altered by setting some parameters
+ *  from the insmod command line.
+ *
+ *  The following parameters are adjustable:
+ *
+ *	bus0	These four arguments can be arrays of
+ *	bus1	1-8 unsigned integers as follows:
+ *	bus2
+ *	bus3	<id>,<sda>,<scl>,<udelay>,<timeout>,<sda_od>,<scl_od>,<scl_oo>
+ *
+ *  where:
+ *
+ *  <id>	ID to used as device_id for the corresponding bus (required)
+ *  <sda>	GPIO pin ID to used for SDA (required)
+ *  <scl>	GPIO pin ID to used for SCL (required)
+ *  <udelay>	signal toggle delay.
+ *  <timeout>	clock stretching timeout.
+ *  <sda_od>	SDA is configured as open drain.
+ *  <scl_od>	SCL is configured as open drain.
+ *  <scl_oo>	SCL output drivers cannot be turned off.
+ *
+ *  See include/i2c-gpio.h for more information about the parameters.
+ *
+ *  If this driver is built into the kernel, you can use the following kernel
+ *  command line parameters, with the same values as the corresponding module
+ *  parameters listed above:
+ *
+ *	i2c-gpio-custom.bus0
+ *	i2c-gpio-custom.bus1
+ *	i2c-gpio-custom.bus2
+ *	i2c-gpio-custom.bus3
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <linux/i2c-gpio.h>
+
+#define DRV_NAME	"i2c-gpio-custom"
+#define DRV_DESC	"Custom GPIO-based I2C driver"
+#define DRV_VERSION	"0.1.1"
+
+#define PFX		DRV_NAME ": "
+
+#define BUS_PARAM_ID		0
+#define BUS_PARAM_SDA		1
+#define BUS_PARAM_SCL		2
+#define BUS_PARAM_UDELAY	3
+#define BUS_PARAM_TIMEOUT	4
+#define BUS_PARAM_SDA_OD	5
+#define BUS_PARAM_SCL_OD	6
+#define BUS_PARAM_SCL_OO	7
+
+#define BUS_PARAM_REQUIRED	3
+#define BUS_PARAM_COUNT		8
+#define BUS_COUNT_MAX		4
+
+static unsigned int bus0[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus1[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus2[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus3[BUS_PARAM_COUNT] __initdata;
+
+static unsigned int bus_nump[BUS_COUNT_MAX] __initdata;
+
+#define BUS_PARM_DESC \
+	" config -> id,sda,scl[,udelay,timeout,sda_od,scl_od,scl_oo]"
+
+module_param_array(bus0, uint, &bus_nump[0], 0);
+MODULE_PARM_DESC(bus0, "bus0" BUS_PARM_DESC);
+module_param_array(bus1, uint, &bus_nump[1], 0);
+MODULE_PARM_DESC(bus1, "bus1" BUS_PARM_DESC);
+module_param_array(bus2, uint, &bus_nump[2], 0);
+MODULE_PARM_DESC(bus2, "bus2" BUS_PARM_DESC);
+module_param_array(bus3, uint, &bus_nump[3], 0);
+MODULE_PARM_DESC(bus3, "bus3" BUS_PARM_DESC);
+
+static struct platform_device *devices[BUS_COUNT_MAX];
+static unsigned int nr_devices;
+
+static void i2c_gpio_custom_cleanup(void)
+{
+	int i;
+
+	for (i = 0; i < nr_devices; i++)
+		if (devices[i])
+			platform_device_put(devices[i]);
+}
+
+static int __init i2c_gpio_custom_add_one(unsigned int id, unsigned int *params)
+{
+	struct platform_device *pdev;
+	struct i2c_gpio_platform_data pdata;
+	int err;
+
+	if (!bus_nump[id])
+		return 0;
+
+	if (bus_nump[id] < BUS_PARAM_REQUIRED) {
+		printk(KERN_ERR PFX "not enough parameters for bus%d\n", id);
+		err = -EINVAL;
+		goto err;
+	}
+
+	pdev = platform_device_alloc("i2c-gpio", params[BUS_PARAM_ID]);
+	if (!pdev) {
+		err = -ENOMEM;
+		goto err;
+	}
+
+	pdata.sda_pin = params[BUS_PARAM_SDA];
+	pdata.scl_pin = params[BUS_PARAM_SCL];
+	pdata.udelay = params[BUS_PARAM_UDELAY];
+	pdata.timeout = params[BUS_PARAM_TIMEOUT];
+	pdata.sda_is_open_drain = params[BUS_PARAM_SDA_OD] != 0;
+	pdata.scl_is_open_drain = params[BUS_PARAM_SCL_OD] != 0;
+	pdata.scl_is_output_only = params[BUS_PARAM_SCL_OO] != 0;
+
+	err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+	if (err)
+		goto err_put;
+
+	err = platform_device_add(pdev);
+	if (err)
+		goto err_put;
+
+	devices[nr_devices++] = pdev;
+	return 0;
+
+err_put:
+	platform_device_put(pdev);
+err:
+	return err;
+}
+
+static int __init i2c_gpio_custom_probe(void)
+{
+	int err;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+
+	err = i2c_gpio_custom_add_one(0, bus0);
+	if (err)
+		goto err;
+
+	err = i2c_gpio_custom_add_one(1, bus1);
+	if (err)
+		goto err;
+
+	err = i2c_gpio_custom_add_one(2, bus2);
+	if (err)
+		goto err;
+
+	err = i2c_gpio_custom_add_one(3, bus3);
+	if (err)
+		goto err;
+
+	if (!nr_devices) {
+		printk(KERN_ERR PFX "no bus parameter(s) specified\n");
+		err = -ENODEV;
+		goto err;
+	}
+
+	return 0;
+
+err:
+	i2c_gpio_custom_cleanup();
+	return err;
+}
+
+#ifdef MODULE
+static int __init i2c_gpio_custom_init(void)
+{
+	return i2c_gpio_custom_probe();
+}
+module_init(i2c_gpio_custom_init);
+
+static void __exit i2c_gpio_custom_exit(void)
+{
+	i2c_gpio_custom_cleanup();
+}
+module_exit(i2c_gpio_custom_exit);
+#else
+subsys_initcall(i2c_gpio_custom_probe);
+#endif /* MODULE*/
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org >");
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
diff --git a/trunk/package/kernel/linux/Makefile b/trunk/package/kernel/linux/Makefile
new file mode 100644
index 00000000..45ca9faa
--- /dev/null
+++ b/trunk/package/kernel/linux/Makefile
@@ -0,0 +1,65 @@
+# 
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=kernel
+PKG_FLAGS:=hold
+
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
+SCAN_DEPS=modules/*.mk $(TOPDIR)/target/linux/*/modules.mk $(TOPDIR)/include/netfilter.mk
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=
+
+export SHELL:=/bin/sh
+.ONESHELL:
+
+include $(INCLUDE_DIR)/package.mk
+
+STAMP_BUILT:=$(STAMP_BUILT)_$(firstword $(shell $(SCRIPT_DIR)/kconfig.pl $(LINUX_DIR)/.config | md5sum))
+
+ifeq ($(DUMP),)
+  -include $(LINUX_DIR)/.config
+endif
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define KernelPackage/depends
+endef
+
+CONFIG_PACKAGE_kernel=y
+define Package/kernel
+  SECTION:=sys
+  CATEGORY:=Kernel
+  DEFAULT:=y
+  TITLE:=Virtual kernel package
+  VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)
+  URL:=http://www.kernel.org/
+endef
+
+define Package/kernel/install
+  # nothing to do
+endef
+
+define Package/kernel/extra_provides
+	sed -e 's,.*/,,' $(LINUX_DIR)/modules.builtin;
+endef
+
+$(eval $(if $(DUMP),,$(call BuildPackage,kernel)))
+
+include $(sort $(wildcard ./modules/*.mk))
+-include $(TOPDIR)/target/linux/*/modules.mk
diff --git a/trunk/package/kernel/linux/modules/001-depends.mk b/trunk/package/kernel/linux/modules/001-depends.mk
new file mode 100644
index 00000000..d0ad0836
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/001-depends.mk
@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2010-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define AddDepends/crc16
+  DEPENDS+= +kmod-lib-crc16 $(1)
+endef
+
+define AddDepends/hid
+  DEPENDS+= +kmod-hid $(1)
+endef
+
+define AddDepends/input
+  DEPENDS+= +kmod-input-core $(1)
+endef
+
+
+define AddDepends/nls
+  DEPENDS+= +kmod-nls-base $(foreach cp,$(1),+kmod-nls-$(cp))
+endef
+
+define AddDepends/rfkill
+  DEPENDS+= +USE_RFKILL:kmod-rfkill $(1)
+endef
+
+
+define AddDepends/rtc
+  DEPENDS+= @RTC_SUPPORT $(1)
+endef
diff --git a/trunk/package/kernel/linux/modules/block.mk b/trunk/package/kernel/linux/modules/block.mk
new file mode 100644
index 00000000..8a84aa4e
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/block.mk
@@ -0,0 +1,603 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+BLOCK_MENU:=Block Devices
+
+define KernelPackage/aoe
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=ATA over Ethernet support
+  KCONFIG:=CONFIG_ATA_OVER_ETH
+  FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.ko
+  AUTOLOAD:=$(call AutoLoad,30,aoe)
+endef
+
+define KernelPackage/aoe/description
+ Kernel support for ATA over Ethernet
+endef
+
+$(eval $(call KernelPackage,aoe))
+
+
+define KernelPackage/ata-core
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Serial and Parallel ATA support
+  DEPENDS:=@PCI_SUPPORT +kmod-scsi-core
+  KCONFIG:=CONFIG_ATA
+  FILES:=$(LINUX_DIR)/drivers/ata/libata.ko
+endef
+
+$(eval $(call KernelPackage,ata-core))
+
+
+define AddDepends/ata
+  SUBMENU:=$(BLOCK_MENU)
+  DEPENDS+=kmod-ata-core $(1)
+endef
+
+
+define KernelPackage/ata-ahci
+  TITLE:=AHCI Serial ATA support
+  KCONFIG:=CONFIG_SATA_AHCI
+  FILES:= \
+    $(LINUX_DIR)/drivers/ata/ahci.ko \
+    $(LINUX_DIR)/drivers/ata/libahci.ko
+  AUTOLOAD:=$(call AutoLoad,41,libahci ahci,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-ahci/description
+ Support for AHCI Serial ATA controllers
+endef
+
+$(eval $(call KernelPackage,ata-ahci))
+
+
+define KernelPackage/ata-artop
+  TITLE:=ARTOP 6210/6260 PATA support
+  KCONFIG:=CONFIG_PATA_ARTOP
+  FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.ko
+  AUTOLOAD:=$(call AutoLoad,41,pata_artop,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-artop/description
+ PATA support for ARTOP 6210/6260 host controllers
+endef
+
+$(eval $(call KernelPackage,ata-artop))
+
+
+define KernelPackage/ata-imx
+  TITLE:=Freescale i.MX AHCI SATA support
+  DEPENDS:=@TARGET_imx6
+  KCONFIG:=\
+	CONFIG_AHCI_IMX \
+	CONFIG_SATA_AHCI_PLATFORM \
+	CONFIG_PATA_IMX=n
+  FILES:=$(LINUX_DIR)/drivers/ata/ahci_imx.ko
+  AUTOLOAD:=$(call AutoLoad,41,ahci_imx,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-imx/description
+ SATA support for the Freescale i.MX6 SoC's onboard AHCI SATA
+endef
+
+$(eval $(call KernelPackage,ata-imx))
+
+
+define KernelPackage/ata-marvell-sata
+  TITLE:=Marvell Serial ATA support
+  KCONFIG:=CONFIG_SATA_MV
+  FILES:=$(LINUX_DIR)/drivers/ata/sata_mv.ko
+  AUTOLOAD:=$(call AutoLoad,41,sata_mv,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-marvell-sata/description
+ SATA support for marvell chipsets
+endef
+
+$(eval $(call KernelPackage,ata-marvell-sata))
+
+
+define KernelPackage/ata-nvidia-sata
+  TITLE:=Nvidia Serial ATA support
+  KCONFIG:=CONFIG_SATA_NV
+  FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.ko
+  AUTOLOAD:=$(call AutoLoad,41,sata_nv,1)
+  $(call AddDepends/ata)
+endef
+
+$(eval $(call KernelPackage,ata-nvidia-sata))
+
+
+define KernelPackage/ata-pdc202xx-old
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Older Promise PATA controller support
+  DEPENDS:=kmod-ata-core
+  KCONFIG:= \
+       CONFIG_ATA_SFF=y \
+       CONFIG_PATA_PDC_OLD
+  FILES:=$(LINUX_DIR)/drivers/ata/pata_pdc202xx_old.ko
+  AUTOLOAD:=$(call AutoLoad,41,pata_pdc202xx_old,1)
+endef
+
+define KernelPackage/ata-pdc202xx-old/description
+ This option enables support for the Promise 20246, 20262, 20263,
+ 20265 and 20267 adapters
+endef
+
+$(eval $(call KernelPackage,ata-pdc202xx-old))
+
+
+define KernelPackage/ata-piix
+  TITLE:=Intel PIIX PATA/SATA support
+  KCONFIG:=CONFIG_ATA_PIIX
+  FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.ko
+  AUTOLOAD:=$(call AutoLoad,41,ata_piix,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-piix/description
+ SATA support for Intel ICH5/6/7/8 series host controllers and
+ PATA support for Intel ESB/ICH/PIIX3/PIIX4 series host controllers
+endef
+
+$(eval $(call KernelPackage,ata-piix))
+
+
+define KernelPackage/ata-sil
+  TITLE:=Silicon Image SATA support
+  KCONFIG:=CONFIG_SATA_SIL
+  FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.ko
+  AUTOLOAD:=$(call AutoLoad,41,sata_sil,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-sil/description
+ Support for Silicon Image Serial ATA controllers
+endef
+
+$(eval $(call KernelPackage,ata-sil))
+
+
+define KernelPackage/ata-sil24
+  TITLE:=Silicon Image 3124/3132 SATA support
+  KCONFIG:=CONFIG_SATA_SIL24
+  FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.ko
+  AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-sil24/description
+ Support for Silicon Image 3124/3132 Serial ATA controllers
+endef
+
+$(eval $(call KernelPackage,ata-sil24))
+
+
+define KernelPackage/ata-via-sata
+  TITLE:=VIA SATA support
+  KCONFIG:=CONFIG_SATA_VIA
+  FILES:=$(LINUX_DIR)/drivers/ata/sata_via.ko
+  AUTOLOAD:=$(call AutoLoad,41,sata_via,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-via-sata/description
+ This option enables support for VIA Serial ATA
+endef
+
+$(eval $(call KernelPackage,ata-via-sata))
+
+
+define KernelPackage/block2mtd
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Block device MTD emulation
+  KCONFIG:=CONFIG_MTD_BLOCK2MTD
+  FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.ko
+endef
+
+$(eval $(call KernelPackage,block2mtd))
+
+
+define KernelPackage/dm
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Device Mapper
+  DEPENDS:=+kmod-crypto-manager
+  # All the "=n" are unnecessary, they're only there
+  # to stop the config from asking the question.
+  # MIRROR is M because I've needed it for pvmove.
+  KCONFIG:= \
+	CONFIG_BLK_DEV_MD=n \
+	CONFIG_DM_DEBUG=n \
+	CONFIG_DM_UEVENT=n \
+	CONFIG_DM_DELAY=n \
+	CONFIG_DM_MULTIPATH=n \
+	CONFIG_DM_ZERO=n \
+	CONFIG_DM_SNAPSHOT=n \
+	CONFIG_DM_LOG_USERSPACE=n \
+	CONFIG_MD=y \
+	CONFIG_BLK_DEV_DM \
+	CONFIG_DM_CRYPT \
+	CONFIG_DM_MIRROR
+  FILES:=$(LINUX_DIR)/drivers/md/dm-*.ko
+  AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-log dm-region-hash dm-mirror dm-crypt)
+endef
+
+define KernelPackage/dm/description
+ Kernel module necessary for LVM2 support
+endef
+
+$(eval $(call KernelPackage,dm))
+
+
+define KernelPackage/md-mod
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=MD RAID
+  KCONFIG:= \
+       CONFIG_MD=y \
+       CONFIG_BLK_DEV_MD=m \
+       CONFIG_MD_AUTODETECT=y \
+       CONFIG_MD_FAULTY=n
+  FILES:=$(LINUX_DIR)/drivers/md/md-mod.ko
+  AUTOLOAD:=$(call AutoLoad,27,md-mod)
+endef
+
+define KernelPackage/md-mod/description
+ Kernel RAID md module (md-mod.ko).
+ You will need to select at least one RAID level module below.
+endef
+
+$(eval $(call KernelPackage,md-mod))
+
+
+define KernelPackage/md/Depends
+  SUBMENU:=$(BLOCK_MENU)
+  DEPENDS:=kmod-md-mod $(1)
+endef
+
+
+define KernelPackage/md-linear
+$(call KernelPackage/md/Depends,)
+  TITLE:=RAID Linear Module
+  KCONFIG:=CONFIG_MD_LINEAR
+  FILES:=$(LINUX_DIR)/drivers/md/linear.ko
+  AUTOLOAD:=$(call AutoLoad,28,linear)
+endef
+
+define KernelPackage/md-linear/description
+ RAID "Linear" or "Append" driver module (linear.ko)
+endef
+
+$(eval $(call KernelPackage,md-linear))
+
+
+define KernelPackage/md-raid0
+$(call KernelPackage/md/Depends,)
+  TITLE:=RAID0 Module
+  KCONFIG:=CONFIG_MD_RAID0
+  FILES:=$(LINUX_DIR)/drivers/md/raid0.ko
+  AUTOLOAD:=$(call AutoLoad,28,raid0)
+endef
+
+define KernelPackage/md-raid0/description
+ RAID Level 0 (Striping) driver module (raid0.ko)
+endef
+
+$(eval $(call KernelPackage,md-raid0))
+
+
+define KernelPackage/md-raid1
+$(call KernelPackage/md/Depends,)
+  TITLE:=RAID1 Module
+  KCONFIG:=CONFIG_MD_RAID1
+  FILES:=$(LINUX_DIR)/drivers/md/raid1.ko
+  AUTOLOAD:=$(call AutoLoad,28,raid1)
+endef
+
+define KernelPackage/md-raid1/description
+ RAID Level 1 (Mirroring) driver (raid1.ko)
+endef
+
+$(eval $(call KernelPackage,md-raid1))
+
+
+define KernelPackage/md-raid10
+$(call KernelPackage/md/Depends,)
+  TITLE:=RAID10 Module
+  KCONFIG:=CONFIG_MD_RAID10
+  FILES:=$(LINUX_DIR)/drivers/md/raid10.ko
+  AUTOLOAD:=$(call AutoLoad,28,raid10)
+endef
+
+define KernelPackage/md-raid10/description
+ RAID Level 10 (Mirroring+Striping) driver module (raid10.ko)
+endef
+
+$(eval $(call KernelPackage,md-raid10))
+
+
+define KernelPackage/md-raid456
+$(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor)
+  TITLE:=RAID Level 456 Driver
+  KCONFIG:= \
+       CONFIG_ASYNC_CORE \
+       CONFIG_ASYNC_MEMCPY \
+       CONFIG_ASYNC_XOR \
+       CONFIG_ASYNC_PQ \
+       CONFIG_ASYNC_RAID6_RECOV \
+       CONFIG_ASYNC_RAID6_TEST=n \
+       CONFIG_MD_RAID456 \
+       CONFIG_MULTICORE_RAID456=n
+  FILES:= \
+	$(LINUX_DIR)/crypto/async_tx/async_tx.ko \
+	$(LINUX_DIR)/crypto/async_tx/async_memcpy.ko \
+	$(LINUX_DIR)/crypto/async_tx/async_xor.ko \
+	$(LINUX_DIR)/crypto/async_tx/async_pq.ko \
+	$(LINUX_DIR)/crypto/async_tx/async_raid6_recov.ko \
+	$(LINUX_DIR)/drivers/md/raid456.ko
+  AUTOLOAD:=$(call AutoLoad,28, async_tx async_memcpy async_xor async_pq async_raid6_recov raid456)
+endef
+
+define KernelPackage/md-raid456/description
+ RAID Level 4,5,6 kernel module (raid456.ko)
+
+ Includes the following modules required by
+ raid456.ko:
+    xor.ko
+    async_tx.ko
+    async_xor.ko
+    async_memcpy.ko
+    async_pq.ko
+    async_raid5_recov.ko
+    raid6_pq.ko
+endef
+
+$(eval $(call KernelPackage,md-raid456))
+
+
+define KernelPackage/md-multipath
+$(call KernelPackage/md/Depends,)
+  TITLE:=MD Multipath Module
+  KCONFIG:=CONFIG_MD_MULTIPATH
+  FILES:=$(LINUX_DIR)/drivers/md/multipath.ko
+  AUTOLOAD:=$(call AutoLoad,29,multipath)
+endef
+
+define KernelPackage/md-multipath/description
+ Multipath driver module (multipath.ko)
+endef
+
+$(eval $(call KernelPackage,md-multipath))
+
+
+define KernelPackage/ide-core
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=IDE (ATA/ATAPI) device support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:= \
+	CONFIG_IDE \
+	CONFIG_BLK_DEV_IDE \
+	CONFIG_BLK_DEV_IDEDISK \
+	CONFIG_IDE_GD \
+	CONFIG_IDE_GD_ATA=y \
+	CONFIG_IDE_GD_ATAPI=n \
+	CONFIG_IDEPCI_PCIBUS_ORDER=y \
+	CONFIG_BLK_DEV_IDEDMA_PCI=y \
+	CONFIG_BLK_DEV_IDEPCI=y
+  FILES:= \
+	$(LINUX_DIR)/drivers/ide/ide-core.ko \
+	$(LINUX_DIR)/drivers/ide/ide-gd_mod.ko
+endef
+
+define KernelPackage/ide-core/description
+ Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
+ Includes:
+ - ide-core
+ - ide-gd_mod
+endef
+
+$(eval $(call KernelPackage,ide-core))
+
+
+define AddDepends/ide
+  SUBMENU:=$(BLOCK_MENU)
+  DEPENDS+=kmod-ide-core $(1)
+endef
+
+
+define KernelPackage/ide-generic
+  SUBMENU:=$(BLOCK_MENU)
+  DEPENDS:=@PCI_SUPPORT
+  TITLE:=Kernel support for generic PCI IDE chipsets
+  KCONFIG:=CONFIG_BLK_DEV_GENERIC
+  FILES:=$(LINUX_DIR)/drivers/ide/ide-pci-generic.ko
+  AUTOLOAD:=$(call AutoLoad,30,ide-pci-generic,1)
+  $(call AddDepends/ide)
+endef
+
+$(eval $(call KernelPackage,ide-generic))
+
+
+define KernelPackage/ide-generic-old
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Kernel support for generic (legacy) IDE chipsets
+  KCONFIG:=CONFIG_IDE_GENERIC
+  FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.ko
+  AUTOLOAD:=$(call AutoLoad,30,ide-generic,1)
+  $(call AddDepends/ide)
+endef
+
+$(eval $(call KernelPackage,ide-generic-old))
+
+
+define KernelPackage/ide-aec62xx
+  TITLE:=Acard AEC62xx IDE driver
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_BLK_DEV_AEC62XX
+  FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.ko
+  AUTOLOAD:=$(call AutoLoad,30,aec62xx,1)
+  $(call AddDepends/ide)
+endef
+
+define KernelPackage/ide-aec62xx/description
+ Support for Acard AEC62xx (Artop ATP8xx) IDE controllers
+endef
+
+$(eval $(call KernelPackage,ide-aec62xx,1))
+
+
+define KernelPackage/ide-pdc202xx
+  TITLE:=Promise PDC202xx IDE driver
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
+  FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.ko
+  AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old,1)
+  $(call AddDepends/ide)
+endef
+
+define KernelPackage/ide-pdc202xx/description
+ Support for the Promise Ultra 33/66/100 (PDC202{46|62|65|67|68}) IDE
+ controllers.
+endef
+
+$(eval $(call KernelPackage,ide-pdc202xx))
+
+
+define KernelPackage/ide-it821x
+  TITLE:=ITE IT821x IDE driver
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_BLK_DEV_IT821X
+  FILES=$(LINUX_DIR)/drivers/ide/it821x.ko
+  AUTOLOAD:=$(call AutoLoad,30,it821x,1)
+  $(call AddDepends/ide)
+endef
+
+define KernelPackage/ide-it821x/description
+ Kernel module for the ITE IDE821x IDE controllers
+endef
+
+$(eval $(call KernelPackage,ide-it821x))
+
+
+define KernelPackage/libsas
+  SUBMENU:=$(BLOCK_MENU)
+  DEPENDS:=@TARGET_x86
+  TITLE:=SAS Domain Transport Attributes
+  KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \
+	CONFIG_SCSI_SAS_ATTRS \
+	CONFIG_SCSI_SAS_ATA=y \
+	CONFIG_SCSI_SAS_HOST_SMP=y \
+	CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
+  FILES:= \
+	$(LINUX_DIR)/drivers/scsi/scsi_transport_sas.ko \
+	$(LINUX_DIR)/drivers/scsi/libsas/libsas.ko
+  AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas,1)
+endef
+
+define KernelPackage/libsas/description
+ SAS Domain Transport Attributes support
+endef
+
+$(eval $(call KernelPackage,libsas,1))
+
+
+define KernelPackage/loop
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Loopback device support
+  KCONFIG:= \
+	CONFIG_BLK_DEV_LOOP \
+	CONFIG_BLK_DEV_CRYPTOLOOP=n
+  FILES:=$(LINUX_DIR)/drivers/block/loop.ko
+  AUTOLOAD:=$(call AutoLoad,30,loop)
+endef
+
+define KernelPackage/loop/description
+ Kernel module for loopback device support
+endef
+
+$(eval $(call KernelPackage,loop))
+
+
+define KernelPackage/mvsas
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Marvell 88SE6440 SAS/SATA driver
+  DEPENDS:=@TARGET_x86 +kmod-libsas
+  KCONFIG:= \
+	CONFIG_SCSI_MVSAS \
+	CONFIG_SCSI_MVSAS_TASKLET=n
+  FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.ko
+  AUTOLOAD:=$(call AutoLoad,40,mvsas,1)
+endef
+
+define KernelPackage/mvsas/description
+ Kernel support for the Marvell SAS SCSI adapters
+endef
+
+$(eval $(call KernelPackage,mvsas))
+
+
+define KernelPackage/nbd
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Network block device support
+  KCONFIG:=CONFIG_BLK_DEV_NBD
+  FILES:=$(LINUX_DIR)/drivers/block/nbd.ko
+  AUTOLOAD:=$(call AutoLoad,30,nbd)
+endef
+
+define KernelPackage/nbd/description
+ Kernel module for network block device support
+endef
+
+$(eval $(call KernelPackage,nbd))
+
+
+define KernelPackage/scsi-core
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=SCSI device support
+  KCONFIG:= \
+	CONFIG_SCSI \
+	CONFIG_BLK_DEV_SD
+  FILES:= \
+	$(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.ko) \
+	$(LINUX_DIR)/drivers/scsi/sd_mod.ko
+  AUTOLOAD:=$(call AutoLoad,40,sd_mod,1)
+endef
+
+$(eval $(call KernelPackage,scsi-core))
+
+
+define KernelPackage/scsi-generic
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Kernel support for SCSI generic
+  DEPENDS:=+kmod-scsi-core
+  KCONFIG:= \
+	CONFIG_CHR_DEV_SG
+  FILES:= \
+	$(LINUX_DIR)/drivers/scsi/sg.ko
+  AUTOLOAD:=$(call AutoLoad,65,sg)
+endef
+
+$(eval $(call KernelPackage,scsi-generic))
+
+
+define KernelPackage/scsi-cdrom
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Kernel support for CD / DVD drives
+  DEPENDS:=+kmod-scsi-core
+  KCONFIG:= \
+    CONFIG_BLK_DEV_SR \
+    CONFIG_BLK_DEV_SR_VENDOR=n
+  FILES:= \
+    $(LINUX_DIR)/drivers/cdrom/cdrom.ko \
+    $(LINUX_DIR)/drivers/scsi/sr_mod.ko
+  AUTOLOAD:=$(call AutoLoad,45,sr_mod)
+endef
+
+$(eval $(call KernelPackage,scsi-cdrom))
diff --git a/trunk/package/kernel/linux/modules/can.mk b/trunk/package/kernel/linux/modules/can.mk
new file mode 100644
index 00000000..9245490a
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/can.mk
@@ -0,0 +1,276 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+CAN_MENU:=CAN Support
+
+define KernelPackage/can
+  SUBMENU:=$(CAN_MENU)
+  TITLE:=CAN bus support
+  KCONFIG:=\
+	CONFIG_CAN=m \
+	CONFIG_CAN_DEV \
+	CONFIG_CAN_CALC_BITTIMING=y \
+	CONFIG_CAN_LEDS=y \
+	CONFIG_CAN_AT91=n \
+	CONFIG_CAN_TI_HECC=n \
+	CONFIG_CAN_MCP251X=n \
+	CONFIG_CAN_BFIN=n \
+	CONFIG_CAN_JANZ_ICAN3=n \
+	CONFIG_PCH_CAN=n \
+	CONFIG_CAN_GRCAN=n \
+	CONFIG_CAN_CC770=n \
+	CONFIG_CAN_MSCAN=n \
+	CONFIG_CAN_SJA1000=n \
+	CONFIG_CAN_SOFTING=n \
+	CONFIG_NET_EMATCH_CANID=n \
+	CONFIG_CAN_DEBUG_DEVICES=n
+  FILES:=$(LINUX_DIR)/drivers/net/can/can-dev.ko \
+	 $(LINUX_DIR)/net/can/can.ko
+  AUTOLOAD:=$(call AutoProbe,can can-dev)
+endef
+
+define KernelPackage/can/description
+ Kernel module for CAN bus support.
+endef
+
+$(eval $(call KernelPackage,can))
+
+
+define AddDepends/can
+  SUBMENU:=$(CAN_MENU)
+  DEPENDS+=kmod-can $(1)
+endef
+
+
+define KernelPackage/can-raw
+  TITLE:=Raw CAN Protcol
+  KCONFIG:=CONFIG_CAN_RAW
+  FILES:=$(LINUX_DIR)/net/can/can-raw.ko
+  AUTOLOAD:=$(call AutoProbe,can-raw)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-raw/description
+ The raw CAN protocol option offers access to the CAN bus via
+ the BSD  socket API.
+endef
+
+$(eval $(call KernelPackage,can-raw))
+
+
+define KernelPackage/can-bcm
+  TITLE:=Broadcast Manager CAN Protcol
+  KCONFIG:=CONFIG_CAN_BCM
+  FILES:=$(LINUX_DIR)/net/can/can-bcm.ko
+  AUTOLOAD:=$(call AutoProbe,can-bcm)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-bcm/description
+ The Broadcast Manager offers content filtering, timeout monitoring,
+ sending of RTR frames, and cyclic CAN messages without permanent user
+ interaction.
+endef
+
+$(eval $(call KernelPackage,can-bcm))
+
+
+define KernelPackage/can-gw
+  TITLE:=CAN Gateway/Router
+  KCONFIG:=CONFIG_CAN_GW
+  FILES:=$(LINUX_DIR)/net/can/can-gw.ko
+  AUTOLOAD:=$(call AutoProbe,can-gw)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-gw/description
+ The CAN Gateway/Router is used to route (and modify) CAN frames.
+endef
+
+$(eval $(call KernelPackage,can-gw))
+
+
+define KernelPackage/can-vcan
+  TITLE:=Virtual Local CAN Interface (vcan)
+  KCONFIG:=CONFIG_CAN_VCAN
+  FILES:=$(LINUX_DIR)/drivers/net/can/vcan.ko
+  AUTOLOAD:=$(call AutoProbe,vcan)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-vcan/description
+ Similar to the network loopback devices, vcan offers a
+ virtual local CAN interface.
+endef
+
+$(eval $(call KernelPackage,can-vcan))
+
+
+define KernelPackage/can-slcan
+  TITLE:=Serial / USB serial CAN Adaptors (slcan)
+  KCONFIG:=CONFIG_CAN_SLCAN
+  FILES:=$(LINUX_DIR)/drivers/net/can/slcan.ko
+  AUTOLOAD:=$(call AutoProbe,slcan)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-slcan/description
+ CAN driver for several 'low cost' CAN interfaces that are attached
+ via serial lines or via USB-to-serial adapters using the LAWICEL
+ ASCII protocol.
+endef
+
+$(eval $(call KernelPackage,can-slcan))
+
+
+define KernelPackage/can-flexcan
+  TITLE:=Support for Freescale FLEXCAN based chips
+  KCONFIG:=CONFIG_CAN_FLEXCAN
+  FILES:=$(LINUX_DIR)/drivers/net/can/flexcan.ko
+  AUTOLOAD:=$(call AutoProbe,flexcan)
+  $(call AddDepends/can,@TARGET_imx6)
+endef
+
+define KernelPackage/can-flexcan/description
+ Freescale FLEXCAN CAN bus controller implementation.
+endef
+
+$(eval $(call KernelPackage,can-flexcan))
+
+
+define KernelPackage/can-usb-ems
+  TITLE:=EMS CPC-USB/ARM7 CAN/USB interface
+  KCONFIG:=CONFIG_CAN_EMS_USB
+  FILES:=$(LINUX_DIR)/drivers/net/can/usb/ems_usb.ko
+  AUTOLOAD:=$(call AutoProbe,ems_usb)
+  $(call AddDepends/can,+kmod-usb-core)
+endef
+
+define KernelPackage/can-usb-ems/description
+ This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
+ from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
+endef
+
+$(eval $(call KernelPackage,can-usb-ems))
+
+
+define KernelPackage/can-usb-esd
+  TITLE:=ESD USB/2 CAN/USB interface
+  KCONFIG:=CONFIG_CAN_ESD_USB2
+  FILES:=$(LINUX_DIR)/drivers/net/can/usb/esd_usb2.ko
+  AUTOLOAD:=$(call AutoProbe,esd_usb2)
+  $(call AddDepends/can,+kmod-usb-core)
+endef
+
+define KernelPackage/can-usb-esd/description
+ This driver supports the CAN-USB/2 interface
+ from esd electronic system design gmbh (http://www.esd.eu).
+endef
+
+$(eval $(call KernelPackage,can-usb-esd))
+
+
+define KernelPackage/can-usb-kvaser
+  TITLE:=Kvaser CAN/USB interface
+  KCONFIG:=CONFIG_CAN_KVASER_USB
+  FILES:=$(LINUX_DIR)/drivers/net/can/usb/kvaser_usb.ko
+  AUTOLOAD:=$(call AutoProbe,kvaser_usb)
+  $(call AddDepends/can,+kmod-usb-core)
+endef
+
+define KernelPackage/can-usb-kvaser/description
+ This driver adds support for Kvaser CAN/USB devices like Kvaser
+ Leaf Light.
+endef
+
+$(eval $(call KernelPackage,can-usb-kvaser))
+
+
+define KernelPackage/can-usb-peak
+  TITLE:=PEAK PCAN-USB/USB Pro interfaces
+  KCONFIG:=CONFIG_CAN_PEAK_USB
+  FILES:=$(LINUX_DIR)/drivers/net/can/usb/peak_usb/peak_usb.ko
+  AUTOLOAD:=$(call AutoProbe,peak_usb)
+  $(call AddDepends/can,+kmod-usb-core)
+endef
+
+define KernelPackage/can-usb-peak/description
+ This driver supports the PCAN-USB and PCAN-USB Pro adapters
+ from PEAK-System Technik (http://www.peak-system.com).
+endef
+
+$(eval $(call KernelPackage,can-usb-peak))
+
+
+define KernelPackage/can-usb-8dev
+  TITLE:=8 devices USB2CAN interface
+  KCONFIG:=CONFIG_CAN_8DEV_USB
+  FILES:=$(LINUX_DIR)/drivers/net/can/usb/usb_8dev.ko
+  AUTOLOAD:=$(call AutoProbe,usb_8dev)
+  $(call AddDepends/can,+kmod-usb-core)
+endef
+
+define KernelPackage/can-usb-8dev/description
+ This driver supports the USB2CAN interface
+ from 8 devices (http://www.8devices.com).
+endef
+
+$(eval $(call KernelPackage,can-usb-8dev))
+
+
+define KernelPackage/can-c-can
+  TITLE:=BOSCH C_CAN/D_CAN drivers
+  KCONFIG:=CONFIG_CAN_C_CAN
+  FILES:=$(LINUX_DIR)/drivers/net/can/c_can/c_can.ko
+  AUTOLOAD:=$(call AutoProbe,c_can)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-c-can/description
+ This driver adds generic support for the C_CAN/D_CAN chips.
+endef
+
+$(eval $(call KernelPackage,can-c-can))
+
+
+define KernelPackage/can-c-can-platform
+  TITLE:=Platform Bus based BOSCH C_CAN/D_CAN driver
+  KCONFIG:=CONFIG_CAN_C_CAN_PLATFORM
+  DEPENDS:=kmod-can-c-can
+  FILES:=$(LINUX_DIR)/drivers/net/can/c_can/c_can_platform.ko
+  AUTOLOAD:=$(call AutoProbe,c_can_platform)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-c-can-platform/description
+ This driver adds support for the C_CAN/D_CAN chips connected
+ to the "platform bus" (Linux abstraction for directly to the
+ processor attached devices) which can be found on various
+ boards from ST Microelectronics (http://www.st.com) like the
+ SPEAr1310 and SPEAr320 evaluation boards & TI (www.ti.com)
+ boards like am335x, dm814x, dm813x and dm811x.
+endef
+
+$(eval $(call KernelPackage,can-c-can-platform))
+
+
+define KernelPackage/can-c-can-pci
+  TITLE:=PCI Bus based BOSCH C_CAN/D_CAN driver
+  KCONFIG:=CONFIG_CAN_C_CAN_PCI
+  DEPENDS:=kmod-can-c-can @PCI_SUPPORT
+  FILES:=$(LINUX_DIR)/drivers/net/can/c_can/c_can_pci.ko
+  AUTOLOAD:=$(call AutoProbe,c_can_pci)
+  $(call AddDepends/can)
+endef
+
+define KernelPackage/can-c-can-pci/description
+ This driver adds support for the C_CAN/D_CAN chips connected
+ to the PCI bus.
+endef
+
+$(eval $(call KernelPackage,can-c-can-pci))
+
diff --git a/trunk/package/kernel/linux/modules/crypto.mk b/trunk/package/kernel/linux/modules/crypto.mk
new file mode 100644
index 00000000..d9d673c1
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/crypto.mk
@@ -0,0 +1,582 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+CRYPTO_MENU:=Cryptographic API modules
+
+CRYPTO_MODULES = \
+	ALGAPI2=crypto_algapi \
+	BLKCIPHER2=crypto_blkcipher
+
+CRYPTOMGR_MODULES = \
+	AEAD2=aead \
+	MANAGER2=cryptomgr \
+
+crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
+crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko
+crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1))))
+
+define KernelPackage/crypto-core
+  SUBMENU:=$(CRYPTO_MENU)
+  TITLE:=Core CryptoAPI modules
+  KCONFIG:= \
+	CONFIG_CRYPTO=y \
+	CONFIG_CRYPTO_HW=y \
+	CONFIG_CRYPTO_BLKCIPHER \
+	CONFIG_CRYPTO_ALGAPI \
+	$(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
+  FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
+endef
+
+$(eval $(call KernelPackage,crypto-core))
+
+
+define AddDepends/crypto
+  SUBMENU:=$(CRYPTO_MENU)
+  DEPENDS+=+kmod-crypto-core $(1)
+endef
+
+define KernelPackage/crypto-hash
+  TITLE:=CryptoAPI hash support
+  KCONFIG:=CONFIG_CRYPTO_HASH
+  FILES:=$(LINUX_DIR)/crypto/crypto_hash.ko
+  AUTOLOAD:=$(call AutoLoad,02,crypto_hash,1)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-hash))
+
+
+define KernelPackage/crypto-manager
+  TITLE:=CryptoAPI algorithm manager
+  DEPENDS:=+kmod-crypto-hash +kmod-crypto-pcompress
+  KCONFIG:= \
+	CONFIG_CRYPTO_AEAD \
+	CONFIG_CRYPTO_MANAGER \
+	$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_confvar,$(mod)))
+  FILES:=$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_file,$(mod)))
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-manager))
+
+
+define KernelPackage/crypto-pcompress
+  TITLE:=CryptoAPI Partial (de)compression operations
+  KCONFIG:= \
+	CONFIG_CRYPTO_PCOMP=y \
+	CONFIG_CRYPTO_PCOMP2
+  FILES:=$(LINUX_DIR)/crypto/pcompress.ko
+  AUTOLOAD:=$(call AutoLoad,09,pcompress)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-pcompress))
+
+
+define KernelPackage/crypto-user
+  TITLE:=CryptoAPI userspace interface
+  DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager
+  KCONFIG:= \
+	CONFIG_CRYPTO_USER_API \
+	CONFIG_CRYPTO_USER_API_HASH \
+	CONFIG_CRYPTO_USER_API_SKCIPHER
+  FILES:= \
+	$(LINUX_DIR)/crypto/af_alg.ko \
+	$(LINUX_DIR)/crypto/algif_hash.ko \
+	$(LINUX_DIR)/crypto/algif_skcipher.ko
+  AUTOLOAD:=$(call AutoLoad,09,af_alg algif_hash algif_skcipher)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-user))
+
+
+define KernelPackage/crypto-wq
+  TITLE:=CryptoAPI work queue handling
+  KCONFIG:=CONFIG_CRYPTO_WORKQUEUE
+  FILES:=$(LINUX_DIR)/crypto/crypto_wq.ko
+  AUTOLOAD:=$(call AutoLoad,09,crypto_wq)
+  $(call AddDepends/crypto)
+endef
+$(eval $(call KernelPackage,crypto-wq))
+
+define KernelPackage/crypto-rng
+  TITLE:=CryptoAPI random number generation
+  KCONFIG:=CONFIG_CRYPTO_RNG2
+  FILES:= \
+	$(LINUX_DIR)/crypto/rng.ko \
+	$(LINUX_DIR)/crypto/krng.ko
+  AUTOLOAD:=$(call AutoLoad,09,rng krng)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-rng))
+
+
+define KernelPackage/crypto-iv
+  TITLE:=CryptoAPI initialization vectors
+  DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq
+  KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2
+  FILES:= \
+	$(LINUX_DIR)/crypto/eseqiv.ko \
+	$(LINUX_DIR)/crypto/chainiv.ko
+  AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-iv))
+
+
+define KernelPackage/crypto-hw-talitos
+  TITLE:=Freescale integrated security engine (SEC) driver
+  DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc
+  KCONFIG:= \
+	CONFIG_CRYPTO_DEV_TALITOS
+  FILES:= \
+	$(LINUX_DIR)/drivers/crypto/talitos.ko
+  AUTOLOAD:=$(call AutoLoad,09,talitos)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-hw-talitos))
+
+
+define KernelPackage/crypto-hw-padlock
+  TITLE:=VIA PadLock ACE with AES/SHA hw crypto module
+  DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager
+  KCONFIG:= \
+	CONFIG_CRYPTO_DEV_PADLOCK \
+	CONFIG_CRYPTO_DEV_PADLOCK_AES \
+	CONFIG_CRYPTO_DEV_PADLOCK_SHA
+  FILES:= \
+	$(LINUX_DIR)/drivers/crypto/padlock-aes.ko \
+	$(LINUX_DIR)/drivers/crypto/padlock-sha.ko
+  AUTOLOAD:=$(call AutoLoad,09,padlock-aes padlock-sha)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-hw-padlock))
+
+
+define KernelPackage/crypto-hw-geode
+  TITLE:=AMD Geode hardware crypto module
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:= \
+	CONFIG_CRYPTO_DEV_GEODE
+  FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.ko
+  AUTOLOAD:=$(call AutoLoad,09,geode-aes)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-hw-geode))
+
+
+define KernelPackage/crypto-hw-hifn-795x
+  TITLE:=HIFN 795x crypto accelerator
+  DEPENDS:=+kmod-random-core +kmod-crypto-manager
+  KCONFIG:= \
+	CONFIG_CRYPTO_DEV_HIFN_795X \
+	CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+  FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.ko
+  AUTOLOAD:=$(call AutoLoad,09,hifn_795x)
+  $(call AddDepends/crypto,+kmod-crypto-des)
+endef
+
+$(eval $(call KernelPackage,crypto-hw-hifn-795x))
+
+
+define KernelPackage/crypto-hw-ppc4xx
+  TITLE:=AMCC PPC4xx hardware crypto module
+  DEPENDS:=@TARGET_ppc40x||TARGET_ppc44x
+  KCONFIG:= \
+	CONFIG_CRYPTO_DEV_PPC4XX
+  FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.ko
+  AUTOLOAD:=$(call AutoLoad,90,crypto4xx)
+  $(call AddDepends/crypto,+kmod-crypto-manager +kmod-crypto-hash)
+endef
+
+define KernelPackage/crypto-hw-ppc4xx/description
+  Kernel support for the AMCC PPC4xx HW crypto engine.
+endef
+
+$(eval $(call KernelPackage,crypto-hw-ppc4xx))
+
+
+define KernelPackage/crypto-hw-omap
+  TITLE:=TI OMAP hardware crypto modules
+  DEPENDS:=@TARGET_omap
+  KCONFIG:= \
+	CONFIG_CRYPTO_DEV_OMAP_AES \
+	CONFIG_CRYPTO_DEV_OMAP_DES \
+	CONFIG_CRYPTO_DEV_OMAP_SHAM
+ifneq ($(wildcard $(LINUX_DIR)/drivers/crypto/omap-des.ko),)
+  FILES:= \
+	$(LINUX_DIR)/drivers/crypto/omap-aes.ko \
+	$(LINUX_DIR)/drivers/crypto/omap-des.ko \
+	$(LINUX_DIR)/drivers/crypto/omap-sham.ko
+  AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-des omap-sham)
+else
+  FILES:= \
+	$(LINUX_DIR)/drivers/crypto/omap-aes.ko \
+	$(LINUX_DIR)/drivers/crypto/omap-sham.ko
+  AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-sham)
+endif
+  $(call AddDepends/crypto,+kmod-crypto-manager +kmod-crypto-hash)
+endef
+
+define KernelPackage/crypto-hw-omap/description
+  Kernel support for the TI OMAP HW crypto engine.
+endef
+
+$(eval $(call KernelPackage,crypto-hw-omap))
+
+
+define KernelPackage/crypto-aes
+  TITLE:=AES cipher CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586
+  FILES:=$(LINUX_DIR)/crypto/aes_generic.ko
+  AUTOLOAD:=$(call AutoLoad,09,aes_generic)
+  $(call AddDepends/crypto)
+endef
+
+define KernelPackage/crypto-aes/x86
+  FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.ko
+  AUTOLOAD:=$(call AutoLoad,09,aes-i586)
+endef
+
+$(eval $(call KernelPackage,crypto-aes))
+
+
+define KernelPackage/crypto-arc4
+  TITLE:=ARC4 (RC4) cipher CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_ARC4
+  FILES:=$(LINUX_DIR)/crypto/arc4.ko
+  AUTOLOAD:=$(call AutoLoad,09,arc4)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-arc4))
+
+
+define KernelPackage/crypto-authenc
+  TITLE:=Combined mode wrapper for IPsec
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:=CONFIG_CRYPTO_AUTHENC
+  FILES:=$(LINUX_DIR)/crypto/authenc.ko
+  AUTOLOAD:=$(call AutoLoad,09,authenc)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-authenc))
+
+define KernelPackage/crypto-cbc
+  TITLE:=Cipher Block Chaining CryptoAPI module
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:=CONFIG_CRYPTO_CBC
+  FILES:=$(LINUX_DIR)/crypto/cbc.ko
+  AUTOLOAD:=$(call AutoLoad,09,cbc)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-cbc))
+
+define KernelPackage/crypto-pcbc
+  TITLE:=Propagating Cipher Block Chaining CryptoAPI module
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:=CONFIG_CRYPTO_PCBC
+  FILES:=$(LINUX_DIR)/crypto/pcbc.ko
+  AUTOLOAD:=$(call AutoLoad,09,pcbc)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-pcbc))
+
+define KernelPackage/crypto-crc32c
+  TITLE:=CRC32c CRC module
+  DEPENDS:=+kmod-crypto-hash
+  KCONFIG:=CONFIG_CRYPTO_CRC32C
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.15.0)),1)
+  FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko
+  AUTOLOAD:=$(call AutoLoad,04,crc32c_generic,1)
+else
+  FILES:=$(LINUX_DIR)/crypto/crc32c.ko
+  AUTOLOAD:=$(call AutoLoad,04,crc32c,1)
+endif
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-crc32c))
+
+
+define KernelPackage/crypto-des
+  TITLE:=DES/3DES cipher CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_DES
+  FILES:=$(LINUX_DIR)/crypto/des_generic.ko
+  AUTOLOAD:=$(call AutoLoad,09,des_generic)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-des))
+
+
+define KernelPackage/crypto-deflate
+  TITLE:=Deflate compression CryptoAPI module
+  DEPENDS:=+kmod-lib-zlib
+  KCONFIG:=CONFIG_CRYPTO_DEFLATE
+  FILES:=$(LINUX_DIR)/crypto/deflate.ko
+  AUTOLOAD:=$(call AutoLoad,09,deflate)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-deflate))
+
+
+define KernelPackage/crypto-fcrypt
+  TITLE:=FCRYPT cipher CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_FCRYPT
+  FILES:=$(LINUX_DIR)/crypto/fcrypt.ko
+  AUTOLOAD:=$(call AutoLoad,09,fcrypt)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-fcrypt))
+
+define KernelPackage/crypto-ecb
+  TITLE:=Electronic CodeBook CryptoAPI module
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:=CONFIG_CRYPTO_ECB
+  FILES:=$(LINUX_DIR)/crypto/ecb.ko
+  AUTOLOAD:=$(call AutoLoad,09,ecb)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-ecb))
+
+
+define KernelPackage/crypto-hmac
+  TITLE:=HMAC digest CryptoAPI module
+  DEPENDS:=+kmod-crypto-hash
+  KCONFIG:=CONFIG_CRYPTO_HMAC
+  FILES:=$(LINUX_DIR)/crypto/hmac.ko
+  DEPENDS:=+kmod-crypto-manager
+  AUTOLOAD:=$(call AutoLoad,09,hmac)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-hmac))
+
+
+define KernelPackage/crypto-md4
+  TITLE:=MD4 digest CryptoAPI module
+  DEPENDS:=+kmod-crypto-hash
+  KCONFIG:=CONFIG_CRYPTO_MD4
+  FILES:=$(LINUX_DIR)/crypto/md4.ko
+  AUTOLOAD:=$(call AutoLoad,09,md4)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-md4))
+
+
+define KernelPackage/crypto-md5
+  TITLE:=MD5 digest CryptoAPI module
+  DEPENDS:=+kmod-crypto-hash
+  KCONFIG:=CONFIG_CRYPTO_MD5
+  FILES:=$(LINUX_DIR)/crypto/md5.ko
+  AUTOLOAD:=$(call AutoLoad,09,md5)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-md5))
+
+
+define KernelPackage/crypto-michael-mic
+  TITLE:=Michael MIC keyed digest CryptoAPI module
+  DEPENDS:=+kmod-crypto-hash
+  KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC
+  FILES:=$(LINUX_DIR)/crypto/michael_mic.ko
+  AUTOLOAD:=$(call AutoLoad,09,michael_mic)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-michael-mic))
+
+
+define KernelPackage/crypto-sha1
+  TITLE:=SHA1 digest CryptoAPI module
+  DEPENDS:=+kmod-crypto-hash
+  KCONFIG:=CONFIG_CRYPTO_SHA1
+  FILES:=$(LINUX_DIR)/crypto/sha1_generic.ko
+  AUTOLOAD:=$(call AutoLoad,09,sha1_generic)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-sha1))
+
+
+define KernelPackage/crypto-sha256
+  TITLE:=SHA224 SHA256 digest CryptoAPI module
+  DEPENDS:=+kmod-crypto-hash
+  KCONFIG:=CONFIG_CRYPTO_SHA256
+  FILES:=$(LINUX_DIR)/crypto/sha256_generic.ko
+  AUTOLOAD:=$(call AutoLoad,09,sha256_generic)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-sha256))
+
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+camellia_mod_suffix=_generic
+endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+cast56_mod_suffix=_generic
+endif
+
+define KernelPackage/crypto-misc
+  TITLE:=Other CryptoAPI modules
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:= \
+	CONFIG_CRYPTO_ANUBIS \
+	CONFIG_CRYPTO_BLOWFISH \
+	CONFIG_CRYPTO_CAMELLIA \
+	CONFIG_CRYPTO_CAST5 \
+	CONFIG_CRYPTO_CAST6 \
+	CONFIG_CRYPTO_FCRYPT \
+	CONFIG_CRYPTO_KHAZAD \
+	CONFIG_CRYPTO_SERPENT \
+	CONFIG_CRYPTO_SHA512 \
+	CONFIG_CRYPTO_TEA \
+	CONFIG_CRYPTO_TGR192 \
+	CONFIG_CRYPTO_TWOFISH \
+	CONFIG_CRYPTO_TWOFISH_COMMON \
+	CONFIG_CRYPTO_TWOFISH_586 \
+	CONFIG_CRYPTO_WP512
+  FILES:= \
+	$(LINUX_DIR)/crypto/anubis.ko \
+	$(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \
+	$(if $(call kernel_patchver_ge,3.7),$(LINUX_DIR)/crypto/cast_common.ko) \
+	$(LINUX_DIR)/crypto/cast5$(cast56_mod_suffix).ko \
+	$(LINUX_DIR)/crypto/cast6$(cast56_mod_suffix).ko \
+	$(LINUX_DIR)/crypto/khazad.ko \
+	$(LINUX_DIR)/crypto/sha512_generic.ko \
+	$(LINUX_DIR)/crypto/tea.ko \
+	$(LINUX_DIR)/crypto/tgr192.ko \
+	$(LINUX_DIR)/crypto/twofish_common.ko \
+	$(LINUX_DIR)/crypto/wp512.ko \
+	$(LINUX_DIR)/crypto/twofish_generic.ko \
+	$(LINUX_DIR)/crypto/blowfish_common.ko \
+	$(LINUX_DIR)/crypto/blowfish_generic.ko \
+	$(LINUX_DIR)/crypto/serpent_generic.ko
+  $(call AddDepends/crypto)
+endef
+
+define KernelPackage/crypto-misc/x86
+  FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko
+endef
+
+$(eval $(call KernelPackage,crypto-misc))
+
+
+define KernelPackage/crypto-ocf
+  TITLE:=OCF modules
+  DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @!TARGET_uml +kmod-crypto-manager
+  KCONFIG:= \
+	CONFIG_OCF_OCF \
+	CONFIG_OCF_CRYPTODEV \
+	CONFIG_OCF_CRYPTOSOFT \
+	CONFIG_OCF_FIPS=y \
+	CONFIG_OCF_RANDOMHARVEST=y
+  FILES:= \
+	$(LINUX_DIR)/crypto/ocf/ocf.ko \
+	$(LINUX_DIR)/crypto/ocf/cryptodev.ko \
+	$(LINUX_DIR)/crypto/ocf/cryptosoft.ko
+  AUTOLOAD:=$(call AutoLoad,09, \
+	ocf \
+	cryptodev \
+	cryptosoft \
+  )
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-ocf))
+
+
+define KernelPackage/crypto-ocf-hifn7751
+  TITLE:=OCF support for Hifn 6500/7751/7811/795x, Invertex AEON and NetSec 7751 devices
+  DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf
+  KCONFIG:=CONFIG_OCF_HIFN
+  FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.ko
+  AUTOLOAD:=$(call AutoLoad,10,hifn7751)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-ocf-hifn7751))
+
+
+define KernelPackage/crypto-ocf-hifnhipp
+  TITLE:=OCF support for Hifn 7855/8155 devices
+  DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf
+  KCONFIG:=CONFIG_OCF_HIFNHIPP
+  FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.ko
+  AUTOLOAD:=$(call AutoLoad,10,hifnHIPP)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-ocf-hifnhipp))
+
+
+define KernelPackage/crypto-null
+  TITLE:=Null CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_NULL
+  FILES:=$(LINUX_DIR)/crypto/crypto_null.ko
+  AUTOLOAD:=$(call AutoLoad,09,crypto_null)
+  $(call AddDepends/crypto,+kmod-crypto-manager)
+endef
+
+$(eval $(call KernelPackage,crypto-null))
+
+
+define KernelPackage/crypto-test
+  TITLE:=Test CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_TEST
+  FILES:=$(LINUX_DIR)/crypto/tcrypt.ko
+  $(call AddDepends/crypto,+kmod-crypto-manager)
+endef
+
+$(eval $(call KernelPackage,crypto-test))
+
+
+define KernelPackage/crypto-xts
+  TITLE:=XTS cipher CryptoAPI module
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:= \
+	CONFIG_CRYPTO_GF128MUL \
+	CONFIG_CRYPTO_XTS
+  FILES:= \
+	$(LINUX_DIR)/crypto/xts.ko \
+	$(LINUX_DIR)/crypto/gf128mul.ko
+  AUTOLOAD:=$(call AutoLoad,09, \
+	gf128mul \
+	xts \
+  )
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-xts))
+
+
+define KernelPackage/crypto-mv-cesa
+  TITLE:=Marvell crypto engine
+  DEPENDS:=+kmod-crypto-manager +kmod-crypto-aes @TARGET_kirkwood||TARGET_orion||TARGET_mvebu
+  KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA
+  FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko
+  AUTOLOAD:=$(call AutoLoad,09,mv_cesa)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-mv-cesa))
diff --git a/trunk/package/kernel/linux/modules/fs.mk b/trunk/package/kernel/linux/modules/fs.mk
new file mode 100644
index 00000000..c1174154
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/fs.mk
@@ -0,0 +1,447 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+FS_MENU:=Filesystems
+
+define KernelPackage/fs-fscache
+  SUBMENU:=$(FS_MENU)
+  TITLE:=General filesystem local cache manager
+  DEPENDS:=
+  KCONFIG:=\
+	CONFIG_FSCACHE=m \
+	CONFIG_FSCACHE_STATS=y \
+	CONFIG_FSCACHE_HISTOGRAM=n \
+	CONFIG_FSCACHE_DEBUG=n \
+	CONFIG_FSCACHE_OBJECT_LIST=n \
+	CONFIG_CACHEFILES=y \
+	CONFIG_CACHEFILES_DEBUG=n \
+	CONFIG_CACHEFILES_HISTOGRAM=n
+  FILES:=$(LINUX_DIR)/fs/fscache/fscache.ko
+  AUTOLOAD:=$(call AutoLoad,29,fscache)
+endef
+
+$(eval $(call KernelPackage,fs-fscache))
+
+define KernelPackage/fs-afs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Andrew FileSystem client
+  DEPENDS:=+kmod-rxrpc +kmod-dnsresolver +kmod-fs-fscache
+  KCONFIG:=\
+	CONFIG_AFS_FS=m \
+	CONFIG_AFS_DEBUG=n \
+	CONFIG_AFS_FSCACHE=y
+  FILES:=$(LINUX_DIR)/fs/afs/kafs.ko
+  AUTOLOAD:=$(call AutoLoad,30,kafs)
+endef
+
+define KernelPackage/fs-afs/description
+  Kernel module for Andrew FileSystem client support
+endef
+
+$(eval $(call KernelPackage,fs-afs))
+
+define KernelPackage/fs-autofs4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=AUTOFS4 filesystem support
+  KCONFIG:=CONFIG_AUTOFS4_FS
+  FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.ko
+  AUTOLOAD:=$(call AutoLoad,30,autofs4)
+endef
+
+define KernelPackage/fs-autofs4/description
+ Kernel module for AutoFS4 support
+endef
+
+$(eval $(call KernelPackage,fs-autofs4))
+
+
+define KernelPackage/fs-btrfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=BTRFS filesystem support
+  DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-raid6 +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-xor
+  KCONFIG:=\
+	CONFIG_BTRFS_FS \
+	CONFIG_BTRFS_FS_POSIX_ACL=n \
+	CONFIG_BTRFS_FS_CHECK_INTEGRITY=n
+  FILES:=\
+	$(LINUX_DIR)/fs/btrfs/btrfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
+endef
+
+define KernelPackage/fs-btrfs/description
+ Kernel module for BTRFS support
+endef
+
+$(eval $(call KernelPackage,fs-btrfs))
+
+
+define KernelPackage/fs-cifs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=CIFS support
+  KCONFIG:= \
+	CONFIG_CIFS \
+	CONFIG_CIFS_DFS_UPCALL=n \
+	CONFIG_CIFS_UPCALL=n
+  FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko
+  AUTOLOAD:=$(call AutoLoad,30,cifs)
+  $(call AddDepends/nls)
+  DEPENDS+= \
+    +kmod-crypto-arc4 \
+    +kmod-crypto-hmac \
+    +kmod-crypto-md5 \
+    +kmod-crypto-md4 \
+    +kmod-crypto-des \
+    +kmod-crypto-ecb \
+    +!LINUX_3_3&&!LINUX_3_6:kmod-crypto-sha256
+endef
+
+define KernelPackage/fs-cifs/description
+ Kernel module for CIFS support
+endef
+
+$(eval $(call KernelPackage,fs-cifs))
+
+
+define KernelPackage/fs-configfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Configuration filesystem support
+  KCONFIG:= \
+	CONFIG_CONFIGFS_FS
+  FILES:=$(LINUX_DIR)/fs/configfs/configfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,configfs)
+endef
+
+define KernelPackage/fs-configfs/description
+ Kernel module for configfs support
+endef
+
+$(eval $(call KernelPackage,fs-configfs))
+
+define KernelPackage/fs-cramfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Compressed RAM/ROM filesystem support
+  DEPENDS:=+kmod-lib-zlib
+  KCONFIG:= \
+	CONFIG_CRAMFS
+  FILES:=$(LINUX_DIR)/fs/cramfs/cramfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,cramfs)
+endef
+
+define KernelPackage/fs-cramfs/description
+ Kernel module for cramfs support
+endef
+
+$(eval $(call KernelPackage,fs-cramfs))
+
+define KernelPackage/fs-exportfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=exportfs kernel server support
+  KCONFIG:=CONFIG_EXPORTFS
+  FILES=$(LINUX_DIR)/fs/exportfs/exportfs.ko
+  AUTOLOAD:=$(call AutoLoad,20,exportfs,1)
+endef
+
+define KernelPackage/fs-exportfs/description
+ Kernel module for exportfs. Needed for some other modules.
+endef
+
+$(eval $(call KernelPackage,fs-exportfs))
+
+
+define KernelPackage/fs-ext4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=EXT4 filesystem support
+  KCONFIG:= \
+	CONFIG_EXT4_FS \
+	CONFIG_JBD2
+  FILES:= \
+	$(LINUX_DIR)/fs/ext4/ext4.ko \
+	$(LINUX_DIR)/fs/jbd2/jbd2.ko \
+	$(LINUX_DIR)/fs/mbcache.ko
+  AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
+  $(call AddDepends/crc16, +!LINUX_3_3:kmod-crypto-hash)
+endef
+
+define KernelPackage/fs-ext4/description
+ Kernel module for EXT4 filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-ext4))
+
+
+define KernelPackage/fuse
+  SUBMENU:=$(FS_MENU)
+  TITLE:=FUSE (Filesystem in Userspace) support
+  KCONFIG:= CONFIG_FUSE_FS
+  FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
+  AUTOLOAD:=$(call AutoLoad,80,fuse)
+endef
+
+define KernelPackage/fuse/description
+ Kernel module for userspace filesystem support
+endef
+
+$(eval $(call KernelPackage,fuse))
+
+
+define KernelPackage/fs-hfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=HFS filesystem support
+  KCONFIG:=CONFIG_HFS_FS
+  FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,hfs)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-hfs/description
+ Kernel module for HFS filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-hfs))
+
+
+define KernelPackage/fs-hfsplus
+  SUBMENU:=$(FS_MENU)
+  TITLE:=HFS+ filesystem support
+  KCONFIG:=CONFIG_HFSPLUS_FS
+  FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko
+  AUTOLOAD:=$(call AutoLoad,30,hfsplus)
+  $(call AddDepends/nls,utf8)
+endef
+
+define KernelPackage/fs-hfsplus/description
+ Kernel module for HFS+ filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-hfsplus))
+
+
+define KernelPackage/fs-isofs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ISO9660 filesystem support
+  DEPENDS:=+kmod-lib-zlib
+  KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
+  FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
+  AUTOLOAD:=$(call AutoLoad,30,isofs)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-isofs/description
+ Kernel module for ISO9660 filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-isofs))
+
+
+define KernelPackage/fs-minix
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Minix filesystem support
+  KCONFIG:=CONFIG_MINIX_FS
+  FILES:=$(LINUX_DIR)/fs/minix/minix.ko
+  AUTOLOAD:=$(call AutoLoad,30,minix)
+endef
+
+define KernelPackage/fs-minix/description
+ Kernel module for Minix filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-minix))
+
+
+define KernelPackage/fs-msdos
+  SUBMENU:=$(FS_MENU)
+  TITLE:=MSDOS filesystem support
+  DEPENDS:=+kmod-fs-vfat
+  KCONFIG:=CONFIG_MSDOS_FS
+  FILES:=$(LINUX_DIR)/fs/fat/msdos.ko
+  AUTOLOAD:=$(call AutoLoad,40,msdos)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-msdos/description
+ Kernel module for MSDOS filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-msdos))
+
+
+define KernelPackage/fs-nfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=NFS filesystem support
+  DEPENDS:=+kmod-fs-nfs-common +kmod-dnsresolver
+  KCONFIG:= \
+	CONFIG_NFS_FS \
+	CONFIG_NFS_USE_LEGACY_DNS=n \
+	CONFIG_NFS_USE_NEW_IDMAPPER=n
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+  FILES:= \
+	$(LINUX_DIR)/fs/nfs/nfs.ko \
+	$(LINUX_DIR)/fs/nfs/nfsv3.ko
+else
+  FILES:= \
+	$(LINUX_DIR)/fs/nfs/nfs.ko
+endif
+  AUTOLOAD:=$(call AutoLoad,40,nfs nfsv3)
+endef
+
+define KernelPackage/fs-nfs/description
+ Kernel module for NFS support
+endef
+
+$(eval $(call KernelPackage,fs-nfs))
+
+
+define KernelPackage/fs-nfs-common
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Common NFS filesystem modules
+  KCONFIG:= \
+	CONFIG_LOCKD \
+	CONFIG_SUNRPC
+  FILES:= \
+	$(LINUX_DIR)/fs/lockd/lockd.ko \
+	$(LINUX_DIR)/net/sunrpc/sunrpc.ko
+  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
+endef
+
+$(eval $(call KernelPackage,fs-nfs-common))
+
+
+define KernelPackage/fs-nfs-common-v4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Common NFS V4 filesystem modules
+  KCONFIG+=\
+	CONFIG_SUNRPC_GSS\
+	CONFIG_NFS_V4=y\
+	CONFIG_NFSD_V4=y
+  DEPENDS:= @BROKEN
+  FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko
+  AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
+endef
+
+define KernelPackage/fs-nfs-common-v4/description
+ Kernel modules for NFS V4 & NFSD V4 kernel support
+endef
+
+$(eval $(call KernelPackage,fs-nfs-common-v4))
+
+
+define KernelPackage/fs-nfsd
+  SUBMENU:=$(FS_MENU)
+  TITLE:=NFS kernel server support
+  DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs
+  KCONFIG:= \
+	CONFIG_NFSD \
+	CONFIG_NFSD_FAULT_INJECTION=n
+  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
+  AUTOLOAD:=$(call AutoLoad,40,nfsd)
+endef
+
+define KernelPackage/fs-nfsd/description
+ Kernel module for NFS kernel server support
+endef
+
+$(eval $(call KernelPackage,fs-nfsd))
+
+
+define KernelPackage/fs-ntfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=NTFS filesystem support
+  KCONFIG:=CONFIG_NTFS_FS
+  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,ntfs)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-ntfs/description
+ Kernel module for NTFS filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-ntfs))
+
+
+define KernelPackage/fs-reiserfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ReiserFS filesystem support
+  KCONFIG:=CONFIG_REISERFS_FS
+  FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,reiserfs,1)
+endef
+
+define KernelPackage/fs-reiserfs/description
+ Kernel module for ReiserFS support
+endef
+
+$(eval $(call KernelPackage,fs-reiserfs))
+
+
+define KernelPackage/fs-udf
+  SUBMENU:=$(FS_MENU)
+  TITLE:=UDF filesystem support
+  KCONFIG:=CONFIG_UDF_FS
+  FILES:=$(LINUX_DIR)/fs/udf/udf.ko
+  AUTOLOAD:=$(call AutoLoad,30,udf)
+  DEPENDS:=+kmod-lib-crc-itu-t
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-udf/description
+ Kernel module for UDF filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-udf))
+
+
+define KernelPackage/fs-vfat
+  SUBMENU:=$(FS_MENU)
+  TITLE:=VFAT filesystem support
+  KCONFIG:= \
+	CONFIG_FAT_FS \
+	CONFIG_VFAT_FS
+  FILES:= \
+	$(LINUX_DIR)/fs/fat/fat.ko \
+	$(LINUX_DIR)/fs/fat/vfat.ko
+  AUTOLOAD:=$(call AutoLoad,30,fat vfat)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-vfat/description
+ Kernel module for VFAT filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-vfat))
+
+
+define KernelPackage/fs-xfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=XFS filesystem support
+  KCONFIG:=CONFIG_XFS_FS
+  DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c @!avr32
+  FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,xfs,1)
+endef
+
+define KernelPackage/fs-xfs/description
+ Kernel module for XFS support
+endef
+
+$(eval $(call KernelPackage,fs-xfs))
+
+
+define KernelPackage/fs-jfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=JFS filesystem support
+  KCONFIG:=CONFIG_JFS_FS
+  FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,jfs,1)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-jfs/description
+ Kernel module for JFS support
+endef
+
+$(eval $(call KernelPackage,fs-jfs))
diff --git a/trunk/package/kernel/linux/modules/hwmon.mk b/trunk/package/kernel/linux/modules/hwmon.mk
new file mode 100644
index 00000000..5b7936a9
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/hwmon.mk
@@ -0,0 +1,306 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+HWMON_MENU:=Hardware Monitoring Support
+
+define KernelPackage/hwmon-core
+  SUBMENU:=$(HWMON_MENU)
+  TITLE:=Hardware monitoring support
+  KCONFIG:= \
+	CONFIG_HWMON \
+	CONFIG_HWMON_DEBUG_CHIP=n
+  FILES:= \
+	$(LINUX_DIR)/drivers/hwmon/hwmon.ko
+endef
+
+define KernelPackage/hwmon-core/description
+ Kernel modules for hardware monitoring
+endef
+
+$(eval $(call KernelPackage,hwmon-core))
+
+
+define AddDepends/hwmon
+  SUBMENU:=$(HWMON_MENU)
+  DEPENDS:=kmod-hwmon-core $(1)
+endef
+
+define KernelPackage/hwmon-vid
+  TITLE:=VID/VRM/VRD voltage conversion module.
+  KCONFIG:=CONFIG_HWMON_VID
+  FILES:=$(LINUX_DIR)/drivers/hwmon/hwmon-vid.ko
+  AUTOLOAD:=$(call AutoLoad,41,hwmon-vid)
+  $(call AddDepends/hwmon,)
+endef
+
+define KernelPackage/hwmon-vid/description
+ VID/VRM/VRD voltage conversion module for hardware monitoring
+endef
+
+$(eval $(call KernelPackage,hwmon-vid))
+
+
+define KernelPackage/hwmon-adt7410
+  TITLE:=ADT7410 monitoring support
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.10.0)),1)
+  KCONFIG:= \
+	CONFIG_SENSORS_ADT7X10 \
+	CONFIG_SENSORS_ADT7410
+  FILES:= \
+	$(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
+	$(LINUX_DIR)/drivers/hwmon/adt7410.ko
+  AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410)
+else
+  KCONFIG:=CONFIG_SENSORS_ADT7410
+  FILES:=$(LINUX_DIR)/drivers/hwmon/adt7410.ko
+  AUTOLOAD:=$(call AutoLoad,60,adt7410)
+endif
+  $(call AddDepends/hwmon,+kmod-i2c-core @!(LINUX_3_3||LINUX_3_6))
+endef
+
+define KernelPackage/hwmon-adt7410/description
+ Kernel module for ADT7410/7420 I2C thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-adt7410))
+
+
+define KernelPackage/hwmon-adt7475
+  TITLE:=ADT7473/7475/7476/7490 monitoring support
+  KCONFIG:=CONFIG_SENSORS_ADT7475
+  FILES:=$(LINUX_DIR)/drivers/hwmon/adt7475.ko
+  AUTOLOAD:=$(call AutoProbe,adt7475)
+  $(call AddDepends/hwmon,+kmod-i2c-core +kmod-hwmon-vid)
+endef
+
+define KernelPackage/hwmon-adt7475/description
+ Kernel module for ADT7473/7475/7476/7490 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-adt7475))
+
+
+define KernelPackage/hwmon-ina2xx
+  TITLE:=INA2XX monitoring support
+  KCONFIG:=CONFIG_SENSORS_INA2XX
+  FILES:=$(LINUX_DIR)/drivers/hwmon/ina2xx.ko
+  AUTOLOAD:=$(call AutoProbe,ina2xx)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-ina2xx/description
+ Kernel module for ina2xx dc current monitor chips
+endef
+
+$(eval $(call KernelPackage,hwmon-ina2xx))
+
+
+define KernelPackage/hwmon-lm63
+  TITLE:=LM63/64 monitoring support
+  KCONFIG:=CONFIG_SENSORS_LM63
+  FILES:=$(LINUX_DIR)/drivers/hwmon/lm63.ko
+  AUTOLOAD:=$(call AutoProbe,lm63)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-lm63/description
+ Kernel module for lm63 and lm64 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm63))
+
+
+define KernelPackage/hwmon-lm75
+  TITLE:=LM75 monitoring support
+  KCONFIG:=CONFIG_SENSORS_LM75
+  FILES:=$(LINUX_DIR)/drivers/hwmon/lm75.ko
+  AUTOLOAD:=$(call AutoProbe,lm75)
+  $(call AddDepends/hwmon,+kmod-i2c-core +PACKAGE_kmod-thermal:kmod-thermal)
+endef
+
+define KernelPackage/hwmon-lm75/description
+ Kernel module for lm75 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm75))
+
+
+define KernelPackage/hwmon-lm77
+  TITLE:=LM77 monitoring support
+  KCONFIG:=CONFIG_SENSORS_LM77
+  FILES:=$(LINUX_DIR)/drivers/hwmon/lm77.ko
+  AUTOLOAD:=$(call AutoProbe,lm77)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-lm77/description
+ Kernel module for LM77 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm77))
+
+
+define KernelPackage/hwmon-lm85
+  TITLE:=LM85 monitoring support
+  KCONFIG:=CONFIG_SENSORS_LM85
+  FILES:=$(LINUX_DIR)/drivers/hwmon/lm85.ko
+  AUTOLOAD:=$(call AutoProbe,lm85)
+  $(call AddDepends/hwmon,+kmod-i2c-core +kmod-hwmon-vid)
+endef
+
+define KernelPackage/hwmon-lm85/description
+ Kernel module for LM85 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm85))
+
+
+define KernelPackage/hwmon-lm90
+  TITLE:=LM90 monitoring support
+  KCONFIG:=CONFIG_SENSORS_LM90
+  FILES:=$(LINUX_DIR)/drivers/hwmon/lm90.ko
+  AUTOLOAD:=$(call AutoProbe,lm90)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-lm90/description
+ Kernel module for LM90 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm90))
+
+define KernelPackage/hwmon-lm92
+  TITLE:=LM92 monitoring support
+  KCONFIG:=CONFIG_SENSORS_LM92
+  FILES:=$(LINUX_DIR)/drivers/hwmon/lm92.ko
+  AUTOLOAD:=$(call AutoProbe,lm92)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-lm92/description
+ Kernel module for LM92 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm92))
+
+define KernelPackage/hwmon-lm95241
+  TITLE:=LM95241 monitoring support
+  KCONFIG:=CONFIG_SENSORS_LM95241
+  FILES:=$(LINUX_DIR)/drivers/hwmon/lm95241.ko
+  AUTOLOAD:=$(call AutoProbe,lm95241)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-lm95241/description
+ Kernel module for LM95241 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm95241))
+
+define KernelPackage/hwmon-sht21
+  TITLE:=Sensiron SHT21 and compat. monitoring support
+  KCONFIG:=CONFIG_SENSORS_SHT21
+  FILES:=$(LINUX_DIR)/drivers/hwmon/sht21.ko
+  AUTOLOAD:=$(call AutoProbe,sht21)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-sht21/description
+ Kernel module for Sensirion SHT21 and SHT25 temperature and humidity sensors chip
+endef
+
+$(eval $(call KernelPackage,hwmon-sht21))
+
+define KernelPackage/hwmon-pc87360
+  TITLE:=PC87360 monitoring support
+  KCONFIG:=CONFIG_SENSORS_PC87360
+  FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.ko
+  AUTOLOAD:=$(call AutoProbe,pc87360)
+  $(call AddDepends/hwmon,@TARGET_x86 +kmod-hwmon-vid)
+endef
+
+define KernelPackage/hwmon-pc87360/description
+ Kernel modules for PC87360 chips
+endef
+
+$(eval $(call KernelPackage,hwmon-pc87360))
+
+
+define KernelPackage/hwmon-w83627hf
+  TITLE:=Winbond W83627HF monitoring support
+  KCONFIG:=CONFIG_SENSORS_W83627HF
+  FILES:=$(LINUX_DIR)/drivers/hwmon/w83627hf.ko
+  AUTOLOAD:=$(call AutoLoad,50,w83627hf)
+  $(call AddDepends/hwmon,@TARGET_rdc||TARGET_x86 +kmod-hwmon-vid)
+endef
+
+define KernelPackage/hwmon-w83627hf/description
+  Kernel module for the Winbond W83627HF chips.
+endef
+
+$(eval $(call KernelPackage,hwmon-w83627hf))
+
+
+define KernelPackage/hwmon-gsc
+  TITLE:=Gateworks GSC monitoring support
+  KCONFIG:=CONFIG_SENSORS_GSC
+  FILES:=$(LINUX_DIR)/drivers/hwmon/gsc.ko
+  AUTOLOAD:=$(call AutoLoad,60,gsc)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-gsc/description
+  Kernel module for the Gateworks System Controller chips.
+endef
+
+$(eval $(call KernelPackage,hwmon-gsc))
+
+
+define KernelPackage/hwmon-tmp421
+  TITLE:=TI TMP421 and compatible monitoring support
+  KCONFIG:=CONFIG_SENSORS_TMP421
+  FILES:=$(LINUX_DIR)/drivers/hwmon/tmp421.ko
+  AUTOLOAD:=$(call AutoLoad,60,tmp421)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-tmp421/description
+  Kernel module for the Texas Instruments TMP421 and compatible chips.
+endef
+
+$(eval $(call KernelPackage,hwmon-tmp421))
+
+
+define KernelPackage/hwmon-gpiofan
+  TITLE:=Generic GPIO FAN support
+  KCONFIG:=CONFIG_SENSORS_GPIO_FAN
+  FILES:=$(LINUX_DIR)/drivers/hwmon/gpio-fan.ko
+  AUTOLOAD:=$(call AutoLoad,60,gpio-fan)
+  $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-gpiofan/description
+  Kernel module for GPIO controlled FANs
+endef
+
+$(eval $(call KernelPackage,hwmon-gpiofan))
+
+
+define KernelPackage/hwmon-k10temp
+  TITLE:=AMD Family 10h+ temperature sensor
+  KCONFIG:=CONFIG_SENSORS_K10TEMP
+  FILES:=$(LINUX_DIR)/drivers/hwmon/k10temp.ko
+  AUTOLOAD:=$(call AutoLoad,60,k10temp)
+  $(call AddDepends/hwmon,@PCI_SUPPORT @(x86||x86_64))
+endef
+
+define KernelPackage/hwmon-k10temp/description
+  Thermal sensor support for AMD 10h, 11h, 12h (Llano), 14h (Brazos),
+  15h (Bulldozer/Trinity/Kaveri) and 16h (Kabini/Mullins) CPUs
+endef
+
+$(eval $(call KernelPackage,hwmon-k10temp))
diff --git a/trunk/package/kernel/linux/modules/i2c.mk b/trunk/package/kernel/linux/modules/i2c.mk
new file mode 100644
index 00000000..76431380
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/i2c.mk
@@ -0,0 +1,262 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+I2C_MENU:=I2C support
+
+ModuleConfVar=$(word 1,$(subst :,$(space),$(1)))
+ModuleFullPath=$(LINUX_DIR)/$(word 2,$(subst :,$(space),$(1))).ko
+ModuleKconfig=$(foreach mod,$(1),$(call ModuleConfVar,$(mod)))
+ModuleFiles=$(foreach mod,$(1),$(call ModuleFullPath,$(mod)))
+ModuleAuto=$(call AutoLoad,$(1),$(foreach mod,$(2),$(basename $(notdir $(call ModuleFullPath,$(mod))))),$(3))
+
+define i2c_defaults
+  SUBMENU:=$(I2C_MENU)
+  KCONFIG:=$(call ModuleKconfig,$(1))
+  FILES:=$(call ModuleFiles,$(1))
+  AUTOLOAD:=$(call ModuleAuto,$(2),$(1),$(3))
+endef
+
+I2C_CORE_MODULES:= \
+  CONFIG_I2C:drivers/i2c/i2c-core \
+  CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1)
+  ifeq ($(CONFIG_OF),y)
+    I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/of_i2c
+  endif
+endif
+
+define KernelPackage/i2c-core
+  $(call i2c_defaults,$(I2C_CORE_MODULES),51)
+  TITLE:=I2C support
+endef
+
+define KernelPackage/i2c-core/description
+ Kernel modules for I2C support
+endef
+
+$(eval $(call KernelPackage,i2c-core))
+
+
+I2C_ALGOBIT_MODULES:= \
+  CONFIG_I2C_ALGOBIT:drivers/i2c/algos/i2c-algo-bit
+
+define KernelPackage/i2c-algo-bit
+  $(call i2c_defaults,$(I2C_ALGOBIT_MODULES),55)
+  TITLE:=I2C bit-banging interfaces
+  DEPENDS:=kmod-i2c-core
+endef
+
+define KernelPackage/i2c-algo-bit/description
+ Kernel modules for I2C bit-banging interfaces
+endef
+
+$(eval $(call KernelPackage,i2c-algo-bit))
+
+
+I2C_ALGOPCA_MODULES:= \
+  CONFIG_I2C_ALGOPCA:drivers/i2c/algos/i2c-algo-pca
+
+define KernelPackage/i2c-algo-pca
+  $(call i2c_defaults,$(I2C_ALGOPCA_MODULES),55)
+  TITLE:=I2C PCA 9564 interfaces
+  DEPENDS:=kmod-i2c-core
+endef
+
+define KernelPackage/i2c-algo-pca/description
+ Kernel modules for I2C PCA 9564 interfaces
+endef
+
+$(eval $(call KernelPackage,i2c-algo-pca))
+
+
+I2C_ALGOPCF_MODULES:= \
+  CONFIG_I2C_ALGOPCF:drivers/i2c/algos/i2c-algo-pcf
+
+define KernelPackage/i2c-algo-pcf
+  $(call i2c_defaults,$(I2C_ALGOPCF_MODULES),55)
+  TITLE:=I2C PCF 8584 interfaces
+  DEPENDS:=kmod-i2c-core
+endef
+
+define KernelPackage/i2c-algo-pcf/description
+ Kernel modules for I2C PCF 8584 interfaces
+endef
+
+$(eval $(call KernelPackage,i2c-algo-pcf))
+
+
+I2C_GPIO_MODULES:= \
+  CONFIG_I2C_GPIO:drivers/i2c/busses/i2c-gpio
+
+define KernelPackage/i2c-gpio
+  $(call i2c_defaults,$(I2C_GPIO_MODULES),59)
+  TITLE:=GPIO-based bitbanging I2C
+  DEPENDS:=@GPIO_SUPPORT +kmod-i2c-algo-bit
+endef
+
+define KernelPackage/i2c-gpio/description
+ Kernel modules for a very simple bitbanging I2C driver utilizing the
+ arch-neutral GPIO API to control the SCL and SDA lines.
+endef
+
+$(eval $(call KernelPackage,i2c-gpio))
+
+I2C_MPC_MODULES:=\
+  CONFIG_I2C_MPC:drivers/i2c/busses/i2c-mpc
+
+define KernelPackage/i2c-mpc
+  $(call i2c_defaults,$(I2C_MPC_MODULES),59)
+  TITLE:=MPC I2C accessors
+  DEPENDS:=@TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx +kmod-i2c-core
+endef
+
+define KernelPackage/i2c-mpc/description
+ Kernel module for Freescale MPC52xx MPC83xx MPC85xx I2C accessors
+endef
+
+$(eval $(call KernelPackage,i2c-mpc))
+
+I2C_IBM_IIC_MODULES:=\
+  CONFIG_I2C_IBM_IIC:drivers/i2c/busses/i2c-ibm_iic
+
+define KernelPackage/i2c-ibm-iic
+  $(call i2c_defaults,$(OF_I2C_MODULES),59)
+  TITLE:=IBM PPC 4xx on-chip I2C interface support
+  DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx +kmod-i2c-core
+endef
+
+define KernelPackage/i2c-ibm-iic/description
+ Kernel module for IIC peripheral found on embedded IBM PPC4xx based systems
+endef
+
+$(eval $(call KernelPackage,i2c-ibm-iic))
+
+I2C_MV64XXX_MODULES:=\
+  CONFIG_I2C_MV64XXX:drivers/i2c/busses/i2c-mv64xxx
+
+define KernelPackage/i2c-mv64xxx
+  $(call i2c_defaults,$(I2C_MV64XXX_MODULES),59)
+  TITLE:=Orion Platform I2C interface support
+  DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu +kmod-i2c-core
+endef
+
+define KernelPackage/i2c-mv64xxx/description
+ Kernel module for I2C interface on the Kirkwood, Orion and Armada XP/370
+ family processors
+endef
+
+$(eval $(call KernelPackage,i2c-mv64xxx))
+
+
+I2C_TINY_USB_MODULES:= \
+  CONFIG_I2C_TINY_USB:drivers/i2c/busses/i2c-tiny-usb
+
+define KernelPackage/i2c-tiny-usb
+  $(call i2c_defaults,$(I2C_TINY_USB_MODULES),59)
+  TITLE:=I2C Tiny USB adaptor
+  DEPENDS:=@USB_SUPPORT kmod-i2c-core +kmod-usb-core
+endef
+
+define KernelPackage/i2c-tiny-usb/description
+ Kernel module for the I2C Tiny USB adaptor developed
+ by Till Harbaum (http://www.harbaum.org/till/i2c_tiny_usb)
+endef
+
+$(eval $(call KernelPackage,i2c-tiny-usb))
+
+
+I2C_PIIX4_MODULES:= \
+  CONFIG_I2C_PIIX4:drivers/i2c/busses/i2c-piix4
+
+define KernelPackage/i2c-piix4
+  $(call i2c_defaults,$(I2C_PIIX4_MODULES),59)
+  TITLE:=Intel PIIX4 and compatible I2C interfaces
+  DEPENDS:=@PCI_SUPPORT @(x86||x86_64) kmod-i2c-core
+endef
+
+define KernelPackage/i2c-piix4/description
+ Support for the Intel PIIX4 family of mainboard I2C interfaces,
+ specifically Intel PIIX4, Intel 440MX, ATI IXP200, ATI IXP300,
+ ATI IXP400, ATI SB600, ATI SB700/SP5100, ATI SB800, AMD Hudson-2,
+ AMD ML, AMD CZ, Serverworks OSB4, Serverworks CSB5,
+ Serverworks CSB6, Serverworks HT-1000, Serverworks HT-1100 and
+ SMSC Victory66.
+endef
+
+$(eval $(call KernelPackage,i2c-piix4))
+
+
+I2C_MUX_MODULES:= \
+  CONFIG_I2C_MUX:drivers/i2c/i2c-mux
+
+define KernelPackage/i2c-mux
+  $(call i2c_defaults,$(I2C_MUX_MODULES),51)
+  TITLE:=I2C bus multiplexing support
+  DEPENDS:=kmod-i2c-core
+endef
+
+define KernelPackage/i2c-mux/description
+ Kernel modules for I2C bus multiplexing support
+endef
+
+$(eval $(call KernelPackage,i2c-mux))
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+I2C_MUX_GPIO_MODULES:= \
+  CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/i2c-mux-gpio
+else
+I2C_MUX_GPIO_MODULES:= \
+  CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/gpio-i2cmux
+endif
+
+define KernelPackage/i2c-mux-gpio
+  $(call i2c_defaults,$(I2C_MUX_GPIO_MODULES),51)
+  TITLE:=GPIO-based I2C mux/switches
+  DEPENDS:=kmod-i2c-mux
+endef
+
+define KernelPackage/i2c-mux-gpio/description
+ Kernel modules for GENERIC_GPIO I2C bus mux/switching devices
+endef
+
+$(eval $(call KernelPackage,i2c-mux-gpio))
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+I2C_MUX_PREFIX:=i2c-mux-
+endif
+
+I2C_MUX_PCA954x_MODULES:= \
+  CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca954x
+
+define KernelPackage/i2c-mux-pca954x
+  $(call i2c_defaults,$(I2C_MUX_PCA954x_MODULES),51)
+  TITLE:=Philips PCA954x I2C mux/switches
+  DEPENDS:=kmod-i2c-mux
+endef
+
+define KernelPackage/i2c-mux-pca954x/description
+ Kernel modules for PCA954x I2C bus mux/switching devices
+endef
+
+$(eval $(call KernelPackage,i2c-mux-pca954x))
+
+
+I2C_MUX_PCA9541_MODULES:= \
+  CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca9541
+
+define KernelPackage/i2c-mux-pca9541
+  $(call i2c_defaults,$(I2C_MUX_PCA9541_MODULES),51)
+  TITLE:=Philips PCA9541 I2C mux/switches
+  DEPENDS:=kmod-i2c-mux
+endef
+
+define KernelPackage/i2c-mux-pca9541/description
+ Kernel modules for PCA9541 I2C bus mux/switching devices
+endef
+
+$(eval $(call KernelPackage,i2c-mux-pca9541))
diff --git a/trunk/package/kernel/linux/modules/input.mk b/trunk/package/kernel/linux/modules/input.mk
new file mode 100644
index 00000000..32adc1ec
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/input.mk
@@ -0,0 +1,204 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+INPUT_MODULES_MENU:=Input modules
+
+define KernelPackage/hid
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=HID Devices
+  KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y
+  FILES:=$(LINUX_DIR)/drivers/hid/hid.ko
+  AUTOLOAD:=$(call AutoLoad,61,hid)
+  $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+define KernelPackage/hid/description
+ Kernel modules for HID devices
+endef
+
+$(eval $(call KernelPackage,hid))
+
+define KernelPackage/hid-generic
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=Generic HID device support
+  KCONFIG:=CONFIG_HID_GENERIC
+  FILES:=$(LINUX_DIR)/drivers/hid/hid-generic.ko
+  AUTOLOAD:=$(call AutoProbe,hid-generic)
+  $(call AddDepends/hid)
+endef
+
+define KernelPackage/hid/description
+ Kernel modules for generic HID device (e.g. keyboards and mice) support
+endef
+
+$(eval $(call KernelPackage,hid-generic))
+
+define KernelPackage/input-core
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=Input device core
+  KCONFIG:=CONFIG_INPUT
+  FILES:=$(LINUX_DIR)/drivers/input/input-core.ko
+endef
+
+define KernelPackage/input-core/description
+ Kernel modules for support of input device
+endef
+
+$(eval $(call KernelPackage,input-core))
+
+
+define KernelPackage/input-evdev
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=Input event device
+  KCONFIG:=CONFIG_INPUT_EVDEV
+  FILES:=$(LINUX_DIR)/drivers/input/evdev.ko
+  AUTOLOAD:=$(call AutoLoad,60,evdev)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-evdev/description
+ Kernel modules for support of input device events
+endef
+
+$(eval $(call KernelPackage,input-evdev))
+
+
+define KernelPackage/input-gpio-keys
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=GPIO key support
+  DEPENDS:= @GPIO_SUPPORT
+  KCONFIG:= \
+	CONFIG_KEYBOARD_GPIO \
+	CONFIG_INPUT_KEYBOARD=y
+  FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko
+  AUTOLOAD:=$(call AutoProbe,gpio_keys)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-gpio-keys/description
+ This driver implements support for buttons connected
+ to GPIO pins of various CPUs (and some other chips).
+endef
+
+$(eval $(call KernelPackage,input-gpio-keys))
+
+
+define KernelPackage/input-gpio-keys-polled
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=Polled GPIO key support
+  DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
+  KCONFIG:= \
+	CONFIG_KEYBOARD_GPIO_POLLED \
+	CONFIG_INPUT_KEYBOARD=y
+  FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys_polled.ko
+  AUTOLOAD:=$(call AutoProbe,gpio_keys_polled,1)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-gpio-keys-polled/description
+ Kernel module for support polled GPIO keys input device
+endef
+
+$(eval $(call KernelPackage,input-gpio-keys-polled))
+
+
+define KernelPackage/input-gpio-encoder
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=GPIO rotay encoder
+  KCONFIG:=CONFIG_INPUT_GPIO_ROTARY_ENCODER
+  FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.ko
+  AUTOLOAD:=$(call AutoProbe,rotary_encoder)
+  $(call AddDepends/input,@GPIO_SUPPORT)
+endef
+
+define KernelPackage/gpio-encoder/description
+ Kernel module to use rotary encoders connected to GPIO pins
+endef
+
+$(eval $(call KernelPackage,input-gpio-encoder))
+
+
+define KernelPackage/input-joydev
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=Joystick device support
+  KCONFIG:=CONFIG_INPUT_JOYDEV
+  FILES:=$(LINUX_DIR)/drivers/input/joydev.ko
+  AUTOLOAD:=$(call AutoProbe,joydev)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-joydev/description
+ Kernel module for joystick support
+endef
+
+$(eval $(call KernelPackage,input-joydev))
+
+
+define KernelPackage/input-polldev
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=Polled Input device support
+  KCONFIG:=CONFIG_INPUT_POLLDEV
+  FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-polldev/description
+ Kernel module for support of polled input devices
+endef
+
+$(eval $(call KernelPackage,input-polldev))
+
+
+define KernelPackage/input-matrixkmap
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=Input matrix devices support
+  KCONFIG:=CONFIG_INPUT_MATRIXKMAP
+  DEPENDS:=@!LINUX_3_3
+  FILES:=$(LINUX_DIR)/drivers/input/matrix-keymap.ko
+  AUTOLOAD:=$(call AutoProbe,matrix-keymap)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-matrix/description
+ Kernel module support for input matrix devices
+endef
+
+$(eval $(call KernelPackage,input-matrixkmap))
+
+
+define KernelPackage/acpi-button
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=ACPI Button Support
+  DEPENDS:=@(TARGET_x86_generic||TARGET_x86_kvm_guest||TARGET_x86_xen_domu) +kmod-input-evdev
+  KCONFIG:=CONFIG_ACPI_BUTTON
+  FILES:=$(LINUX_DIR)/drivers/acpi/button.ko
+  AUTOLOAD:=$(call AutoLoad,06,button)
+endef
+
+define KernelPackage/acpi-button/description
+ Kernel module for ACPI Button support
+endef
+
+$(eval $(call KernelPackage,acpi-button))
+
+
+define KernelPackage/keyboard-imx
+  SUBMENU:=$(INPUT_MODULES_MENU)
+  TITLE:=IMX keypad support
+  DEPENDS:=@(TARGET_mxs||TARGET_imx6) +kmod-input-matrixkmap
+  KCONFIG:= \
+	CONFIG_KEYBOARD_IMX \
+	CONFIG_INPUT_KEYBOARD=y
+  FILES:=$(LINUX_DIR)/drivers/input/keyboard/imx_keypad.ko
+  AUTOLOAD:=$(call AutoProbe,imx_keypad)
+endef
+
+define KernelPackage/keyboard-imx/description
+ Enable support for IMX keypad port.
+endef
+
+$(eval $(call KernelPackage,keyboard-imx))
diff --git a/trunk/package/kernel/linux/modules/leds.mk b/trunk/package/kernel/linux/modules/leds.mk
new file mode 100644
index 00000000..9c54c781
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/leds.mk
@@ -0,0 +1,199 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+LEDS_MENU:=LED modules
+
+define KernelPackage/leds-gpio
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=GPIO LED support
+  DEPENDS:= @GPIO_SUPPORT
+  KCONFIG:=CONFIG_LEDS_GPIO
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,60,leds-gpio,1)
+endef
+
+define KernelPackage/leds-gpio/description
+ Kernel module for LEDs on GPIO lines
+endef
+
+$(eval $(call KernelPackage,leds-gpio))
+
+
+define KernelPackage/ledtrig-heartbeat
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED Heartbeat Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-heartbeat.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat)
+endef
+
+define KernelPackage/ledtrig-gpio/description
+ Kernel module that allows LEDs to blink like heart beat
+endef
+
+$(eval $(call KernelPackage,ledtrig-heartbeat))
+
+
+define KernelPackage/ledtrig-gpio
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED GPIO Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio)
+endef
+
+define KernelPackage/ledtrig-gpio/description
+ Kernel module that allows LEDs to be controlled by gpio events
+endef
+
+$(eval $(call KernelPackage,ledtrig-gpio))
+
+
+define KernelPackage/ledtrig-morse
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED Morse Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse)
+endef
+
+define KernelPackage/ledtrig-morse/description
+ Kernel module to show morse coded messages on LEDs
+endef
+
+$(eval $(call KernelPackage,ledtrig-morse))
+
+
+define KernelPackage/ledtrig-netdev
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED NETDEV Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-netdev)
+endef
+
+define KernelPackage/ledtrig-netdev/description
+ Kernel module to drive LEDs based on network activity
+endef
+
+$(eval $(call KernelPackage,ledtrig-netdev))
+
+
+define KernelPackage/ledtrig-netfilter
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED NetFilter Trigger
+  DEPENDS:=kmod-ipt-core
+  KCONFIG:=CONFIG_NETFILTER_XT_TARGET_LED
+  FILES:=$(LINUX_DIR)/net/netfilter/xt_LED.ko
+  AUTOLOAD:=$(call AutoLoad,50,xt_LED)
+endef
+
+define KernelPackage/ledtrig-netfilter/description
+ Kernel module to flash LED when a particular packets passing through your machine.
+
+ For example to create an LED trigger for incoming SSH traffic:
+    iptables -A INPUT -p tcp --dport 22 -j LED --led-trigger-id ssh --led-delay 1000
+ Then attach the new trigger to an LED on your system:
+    echo netfilter-ssh > /sys/class/leds/<ledname>/trigger
+endef
+
+$(eval $(call KernelPackage,ledtrig-netfilter))
+
+
+define KernelPackage/ledtrig-usbdev
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED USB device Trigger
+  DEPENDS:=@USB_SUPPORT kmod-usb-core
+  KCONFIG:=CONFIG_LEDS_TRIGGER_USBDEV
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-usbdev.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-usbdev)
+endef
+
+define KernelPackage/ledtrig-usbdev/description
+ Kernel module to drive LEDs based on USB device presence/activity
+endef
+
+$(eval $(call KernelPackage,ledtrig-usbdev))
+
+
+define KernelPackage/ledtrig-default-on
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED Default ON Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-default-on.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on,1)
+endef
+
+define KernelPackage/ledtrig-default-on/description
+ Kernel module that allows LEDs to be initialised in the ON state
+endef
+
+$(eval $(call KernelPackage,ledtrig-default-on))
+
+
+define KernelPackage/ledtrig-timer
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED Timer Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-timer.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer,1)
+endef
+
+define KernelPackage/ledtrig-timer/description
+ Kernel module that allows LEDs to be controlled by a programmable timer
+ via sysfs
+endef
+
+$(eval $(call KernelPackage,ledtrig-timer))
+
+
+define KernelPackage/ledtrig-transient
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED Transient Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_TRANSIENT
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-transient.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-transient,1)
+endef
+
+define KernelPackage/ledtrig-transient/description
+ Kernel module that allows LEDs one time activation of a transient state.
+endef
+
+$(eval $(call KernelPackage,ledtrig-transient))
+
+
+define KernelPackage/ledtrig-oneshot
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=LED One-Shot Trigger
+  DEPENDS:=@!LINUX_3_3
+  KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot)
+endef
+
+define KernelPackage/ledtrig-oneshot/description
+ Kernel module that allows LEDs to be triggered by sporadic events in
+ one-shot pulses
+endef
+
+$(eval $(call KernelPackage,ledtrig-oneshot))
+
+
+define KernelPackage/leds-tlc59116
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=TLC59116 LED support
+  DEPENDS:=@TARGET_mvebu kmod-i2c-core
+  KCONFIG:=CONFIG_LEDS_TLC59116
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-tlc59116.ko
+  AUTOLOAD:=$(call AutoLoad,60,leds-tlc59116,1)
+endef
+
+define KernelPackage/leds-tlc59116/description
+ Kernel module for LEDs on TLC59116
+endef
+
+$(eval $(call KernelPackage,leds-tlc59116))
diff --git a/trunk/package/kernel/linux/modules/lib.mk b/trunk/package/kernel/linux/modules/lib.mk
new file mode 100644
index 00000000..cd919ba6
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/lib.mk
@@ -0,0 +1,204 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+LIB_MENU:=Libraries
+
+define KernelPackage/lib-crc-ccitt
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=CRC-CCITT support
+  KCONFIG:=CONFIG_CRC_CCITT
+  FILES:=$(LINUX_DIR)/lib/crc-ccitt.ko
+  AUTOLOAD:=$(call AutoProbe,crc-ccitt)
+endef
+
+define KernelPackage/lib-crc-ccitt/description
+ Kernel module for CRC-CCITT support
+endef
+
+$(eval $(call KernelPackage,lib-crc-ccitt))
+
+
+define KernelPackage/lib-crc-itu-t
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=CRC ITU-T V.41 support
+  KCONFIG:=CONFIG_CRC_ITU_T
+  FILES:=$(LINUX_DIR)/lib/crc-itu-t.ko
+  AUTOLOAD:=$(call AutoProbe,crc-itu-t)
+endef
+
+define KernelPackage/lib-crc-itu-t/description
+ Kernel module for CRC ITU-T V.41 support
+endef
+
+$(eval $(call KernelPackage,lib-crc-itu-t))
+
+
+define KernelPackage/lib-crc7
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=CRC7 support
+  KCONFIG:=CONFIG_CRC7
+  FILES:=$(LINUX_DIR)/lib/crc7.ko
+  AUTOLOAD:=$(call AutoProbe,crc7)
+endef
+
+define KernelPackage/lib-crc7/description
+ Kernel module for CRC7 support
+endef
+
+$(eval $(call KernelPackage,lib-crc7))
+
+
+define KernelPackage/lib-crc8
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=CRC8 support
+  KCONFIG:=CONFIG_CRC8
+  FILES:=$(LINUX_DIR)/lib/crc8.ko
+  AUTOLOAD:=$(call AutoProbe,crc8)
+endef
+
+define KernelPackage/lib-crc8/description
+ Kernel module for CRC8 support
+endef
+
+$(eval $(call KernelPackage,lib-crc8))
+
+
+define KernelPackage/lib-crc16
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=CRC16 support
+  KCONFIG:=CONFIG_CRC16
+  FILES:=$(LINUX_DIR)/lib/crc16.ko
+  AUTOLOAD:=$(call AutoProbe,crc16)
+endef
+
+define KernelPackage/lib-crc16/description
+ Kernel module for CRC16 support
+endef
+
+$(eval $(call KernelPackage,lib-crc16))
+
+
+define KernelPackage/lib-crc32c
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=CRC32 support
+  KCONFIG:=CONFIG_LIBCRC32C
+  DEPENDS:=+kmod-crypto-crc32c
+  FILES:=$(LINUX_DIR)/lib/libcrc32c.ko
+  AUTOLOAD:=$(call AutoProbe,libcrc32c)
+endef
+
+define KernelPackage/lib-crc32c/description
+ Kernel module for CRC32 support
+endef
+
+$(eval $(call KernelPackage,lib-crc32c))
+
+
+define KernelPackage/lib-lzo
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=LZO support
+  KCONFIG:= \
+	CONFIG_LZO_COMPRESS \
+	CONFIG_LZO_DECOMPRESS
+  FILES:= \
+	$(LINUX_DIR)/lib/lzo/lzo_compress.ko \
+	$(LINUX_DIR)/lib/lzo/lzo_decompress.ko
+  AUTOLOAD:=$(call AutoProbe,lzo_compress lzo_decompress)
+endef
+
+define KernelPackage/lib-lzo/description
+ Kernel module for LZO compression/decompression support
+endef
+
+$(eval $(call KernelPackage,lib-lzo))
+
+
+define KernelPackage/lib-raid6
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=RAID6 algorithm support
+  HIDDEN:=1
+  KCONFIG:=CONFIG_RAID6_PQ
+  FILES:=$(LINUX_DIR)/lib/raid6/raid6_pq.ko
+  AUTOLOAD:=$(call AutoProbe,raid6_pq)
+endef
+
+define KernelPackage/lib-raid6/description
+ Kernel module for RAID6 algorithms
+endef
+
+$(eval $(call KernelPackage,lib-raid6))
+
+
+define KernelPackage/lib-xor
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=XOR blocks algorithm support
+  HIDDEN:=1
+  KCONFIG:=CONFIG_XOR_BLOCKS
+ifneq ($(wildcard $(LINUX_DIR)/arch/arm/lib/xor-neon.ko),)
+  FILES:= \
+    $(LINUX_DIR)/crypto/xor.ko \
+    $(LINUX_DIR)/arch/arm/lib/xor-neon.ko
+  AUTOLOAD:=$(call AutoProbe,xor-neon xor)
+else
+  FILES:=$(LINUX_DIR)/crypto/xor.ko
+  AUTOLOAD:=$(call AutoProbe,xor)
+endif
+endef
+
+define KernelPackage/lib-xor/description
+ Kernel module for XOR blocks algorithms
+endef
+
+$(eval $(call KernelPackage,lib-xor))
+
+
+define KernelPackage/lib-textsearch
+SUBMENU:=$(LIB_MENU)
+  TITLE:=Textsearch support
+  KCONFIG:= \
+    CONFIG_TEXTSEARCH=y \
+    CONFIG_TEXTSEARCH_KMP \
+    CONFIG_TEXTSEARCH_BM \
+    CONFIG_TEXTSEARCH_FSM
+  FILES:= \
+    $(LINUX_DIR)/lib/ts_kmp.ko \
+    $(LINUX_DIR)/lib/ts_bm.ko \
+    $(LINUX_DIR)/lib/ts_fsm.ko
+  AUTOLOAD:=$(call AutoProbe,ts_kmp ts_bm ts_fsm)
+endef
+
+$(eval $(call KernelPackage,lib-textsearch))
+
+
+define KernelPackage/lib-zlib
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=Zlib support
+  KCONFIG:= \
+    CONFIG_ZLIB_DEFLATE \
+    CONFIG_ZLIB_INFLATE
+  FILES:= \
+    $(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko \
+    $(LINUX_DIR)/lib/zlib_inflate/zlib_inflate.ko
+  AUTOLOAD:=$(call AutoProbe,zlib_deflate zlib_inflate)
+endef
+
+$(eval $(call KernelPackage,lib-zlib))
+
+
+define KernelPackage/lib-cordic
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=Cordic function support
+  KCONFIG:=CONFIG_CORDIC
+  FILES:=$(LINUX_DIR)/lib/cordic.ko
+  AUTOLOAD:=$(call AutoProbe,cordic)
+endef
+
+define KernelPackage/lib-cordic/description
+ Kernel module for Cordic function support
+endef
+
+$(eval $(call KernelPackage,lib-cordic))
diff --git a/trunk/package/kernel/linux/modules/netdevices.mk b/trunk/package/kernel/linux/modules/netdevices.mk
new file mode 100644
index 00000000..4f1a82a7
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/netdevices.mk
@@ -0,0 +1,736 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+NETWORK_DEVICES_MENU:=Network Devices
+
+define KernelPackage/sis190
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SiS 190 Fast/Gigabit Ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_SIS190
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis190.ko
+  AUTOLOAD:=$(call AutoProbe,sis190)
+endef
+
+$(eval $(call KernelPackage,sis190))
+
+
+define KernelPackage/skge
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SysKonnect Yukon support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_SKGE \
+	CONFIG_SKGE_DEBUG=n \
+	CONFIG_SKGE_GENESIS=n
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/skge.ko
+  AUTOLOAD:=$(call AutoProbe,skge)
+endef
+
+$(eval $(call KernelPackage,skge))
+
+
+define KernelPackage/atl2
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L2 Fast Ethernet support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_ATL2
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl2.ko
+  AUTOLOAD:=$(call AutoProbe,atl2)
+endef
+
+$(eval $(call KernelPackage,atl2))
+
+
+define KernelPackage/atl1
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L1 Gigabit Ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_ATL1
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl1.ko
+  AUTOLOAD:=$(call AutoProbe,atl1)
+endef
+
+$(eval $(call KernelPackage,atl1))
+
+
+define KernelPackage/atl1c
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L1C
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_ATL1C
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+  AUTOLOAD:=$(call AutoProbe,atl1c)
+endef
+
+$(eval $(call KernelPackage,atl1c))
+
+
+define KernelPackage/atl1e
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L1E
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_ATL1E
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+  AUTOLOAD:=$(call AutoProbe,atl1e)
+endef
+
+$(eval $(call KernelPackage,atl1e))
+
+
+define KernelPackage/libphy
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=PHY library
+  KCONFIG:=CONFIG_PHYLIB
+  FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.ko
+  AUTOLOAD:=$(call AutoLoad,15,libphy,1)
+endef
+
+define KernelPackage/libphy/description
+ PHY library
+endef
+
+$(eval $(call KernelPackage,libphy))
+
+define KernelPackage/mii
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=MII library
+  KCONFIG:=CONFIG_MII
+  FILES:=$(LINUX_DIR)/drivers/net/mii.ko
+  AUTOLOAD:=$(call AutoLoad,15,mii,1)
+endef
+
+define KernelPackage/mii/description
+  MII library
+endef
+
+$(eval $(call KernelPackage,mii))
+
+
+define KernelPackage/et131x
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Agere ET131x Gigabit Ethernet driver
+  URL:=http://sourceforge.net/projects/et131x
+  FILES:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:= \
+	CONFIG_ET131X \
+	CONFIG_ET131X_DEBUG=n
+  DEPENDS:=@PCI_SUPPORT +kmod-libphy
+  AUTOLOAD:=$(call AutoProbe,et131x)
+endef
+
+define KernelPackage/et131x/description
+ This package contains the et131x kernel module
+endef
+
+$(eval $(call KernelPackage,et131x))
+
+
+define KernelPackage/gw16083
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Gateworks Ventana Ethernet Expansion Mezzanine driver
+  URL:=http://www.gateworks.com
+  FILES:=$(LINUX_DIR)/drivers/net/phy/gw16083.ko
+  KCONFIG:=CONFIG_GATEWORKS_GW16083
+  DEPENDS:=@TARGET_imx6 @PCI_SUPPORT +kmod-libphy +kmod-igb
+  AUTOLOAD:=$(call AutoLoad,36,gw16083)
+endef
+
+define KernelPackage/gw16083/description
+ This package contains the gw16083 kernel module for supporting the Gateworks
+ Ventana Ethernet Expansion Mezzanine.
+endef
+
+$(eval $(call KernelPackage,gw16083))
+
+
+define KernelPackage/swconfig
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=switch configuration API
+  DEPENDS:=+kmod-libphy
+  KCONFIG:=CONFIG_SWCONFIG
+  FILES:=$(LINUX_DIR)/drivers/net/phy/swconfig.ko
+  AUTOLOAD:=$(call AutoLoad,41,swconfig)
+endef
+
+define KernelPackage/swconfig/description
+ Switch configuration API module
+endef
+
+$(eval $(call KernelPackage,swconfig))
+
+
+define KernelPackage/switch-ip17xx
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=IC+ IP17XX switch support
+  DEPENDS:=+kmod-swconfig
+  KCONFIG:=CONFIG_IP17XX_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/ip17xx.ko
+  AUTOLOAD:=$(call AutoLoad,42,ip17xx)
+endef
+
+define KernelPackage/switch-ip17xx/description
+ IC+ IP175C/IP178C switch support
+endef
+
+$(eval $(call KernelPackage,switch-ip17xx))
+
+
+define KernelPackage/switch-rtl8366-smi
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Realtek RTL8366 SMI switch interface support
+  DEPENDS:=@GPIO_SUPPORT +kmod-swconfig
+  KCONFIG:=CONFIG_RTL8366_SMI
+  FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366_smi.ko
+  AUTOLOAD:=$(call AutoLoad,42,rtl8366_smi)
+endef
+
+define KernelPackage/switch-rtl8366_smi/description
+  Realtek RTL8366 series SMI switch interface support
+endef
+
+$(eval $(call KernelPackage,switch-rtl8366-smi))
+
+
+define KernelPackage/switch-rtl8366rb
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Realtek RTL8366RB switch support
+  DEPENDS:=+kmod-switch-rtl8366-smi
+  KCONFIG:=CONFIG_RTL8366RB_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366rb.ko
+  AUTOLOAD:=$(call AutoLoad,43,rtl8366rb)
+endef
+
+define KernelPackage/switch-rtl8366rb/description
+ Realtek RTL8366RB switch support
+endef
+
+$(eval $(call KernelPackage,switch-rtl8366rb))
+
+
+define KernelPackage/switch-rtl8366s
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Realtek RTL8366S switch support
+  DEPENDS:=+kmod-switch-rtl8366-smi
+  KCONFIG:=CONFIG_RTL8366S_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366s.ko
+  AUTOLOAD:=$(call AutoLoad,43,rtl8366s)
+endef
+
+define KernelPackage/switch-rtl8366s/description
+ Realtek RTL8366S switch support
+endef
+
+$(eval $(call KernelPackage,switch-rtl8366s))
+
+
+define KernelPackage/natsemi
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=National Semiconductor DP8381x series
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_NATSEMI
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/natsemi/natsemi.ko
+  AUTOLOAD:=$(call AutoLoad,20,natsemi)
+endef
+
+define KernelPackage/natsemi/description
+ Kernel modules for National Semiconductor DP8381x series PCI Ethernet
+ adapters.
+endef
+
+$(eval $(call KernelPackage,natsemi))
+
+
+define KernelPackage/r6040
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=RDC Fast-Ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-libphy
+  KCONFIG:=CONFIG_R6040 \
+		CONFIG_R6040_NAPI=y
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/rdc/r6040.ko
+  AUTOLOAD:=$(call AutoProbe,r6040)
+endef
+
+define KernelPackage/r6040/description
+ Kernel modules for RDC Fast-Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,r6040))
+
+
+define KernelPackage/sis900
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SiS 900 Ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_SIS900
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis900.ko
+  AUTOLOAD:=$(call AutoProbe,sis900)
+endef
+
+define KernelPackage/sis900/description
+ Kernel modules for Sis 900 Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,sis900))
+
+
+define KernelPackage/sky2
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SysKonnect Yukon2 support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_SKY2
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/sky2.ko
+  AUTOLOAD:=$(call AutoProbe,sky2)
+endef
+
+define KernelPackage/sky2/description
+  This driver supports Gigabit Ethernet adapters based on the
+  Marvell Yukon 2 chipset:
+  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
+  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
+
+  There is companion driver for the older Marvell Yukon and
+  Genesis based adapters: skge.
+endef
+
+$(eval $(call KernelPackage,sky2))
+
+
+define KernelPackage/via-rhine
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Via Rhine ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_VIA_RHINE \
+    CONFIG_VIA_RHINE_MMIO=y
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-rhine.ko
+  AUTOLOAD:=$(call AutoProbe,via-rhine)
+endef
+
+define KernelPackage/via-rhine/description
+ Kernel modules for Via Rhine Ethernet chipsets
+endef
+
+$(eval $(call KernelPackage,via-rhine))
+
+
+define KernelPackage/via-velocity
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
+  DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||PCI_SUPPORT +kmod-lib-crc-ccitt
+  KCONFIG:=CONFIG_VIA_VELOCITY
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-velocity.ko
+  AUTOLOAD:=$(call AutoProbe,via-velocity)
+endef
+
+define KernelPackage/via-velocity/description
+ Kernel modules for VIA Velocity Gigabit Ethernet chipsets
+endef
+
+$(eval $(call KernelPackage,via-velocity))
+
+
+define KernelPackage/8139too
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_8139TOO \
+    CONFIG_8139TOO_PIO=y \
+    CONFIG_8139TOO_TUNE_TWISTER=n \
+    CONFIG_8139TOO_8129=n \
+    CONFIG_8139_OLD_RX_RESET=n
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139too.ko
+  AUTOLOAD:=$(call AutoProbe,8139too)
+endef
+
+define KernelPackage/8139too/description
+ Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters
+endef
+
+$(eval $(call KernelPackage,8139too))
+
+
+define KernelPackage/8139cp
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=RealTek RTL-8139C+ PCI Fast Ethernet Adapter kernel support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_8139CP
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139cp.ko
+  AUTOLOAD:=$(call AutoProbe,8139cp)
+endef
+
+define KernelPackage/8139cp/description
+ Kernel module for RealTek RTL-8139C+ PCI Fast Ethernet adapters
+endef
+
+$(eval $(call KernelPackage,8139cp))
+
+
+define KernelPackage/r8169
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware
+  KCONFIG:=CONFIG_R8169 \
+    CONFIG_R8169_NAPI=y \
+    CONFIG_R8169_VLAN=n
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko
+  AUTOLOAD:=$(call AutoProbe,r8169)
+endef
+
+define KernelPackage/r8169/description
+ Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters
+endef
+
+$(eval $(call KernelPackage,r8169))
+
+
+define KernelPackage/ne2k-pci
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=ne2k-pci Ethernet Adapter kernel support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_NE2K_PCI
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/ethernet/8390/ne2k-pci.ko \
+	$(LINUX_DIR)/drivers/net/ethernet/8390/8390.ko
+  AUTOLOAD:=$(call AutoProbe,8390 ne2k-pci)
+endef
+
+define KernelPackage/ne2k-pci/description
+ Kernel modules for NE2000 PCI Ethernet Adapter kernel
+endef
+
+$(eval $(call KernelPackage,ne2k-pci))
+
+define KernelPackage/igb
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-i2c-algo-bit +kmod-ptp
+  KCONFIG:=CONFIG_IGB \
+    CONFIG_IGB_HWMON=n \
+    CONFIG_IGB_DCA=n
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/igb/igb.ko
+  AUTOLOAD:=$(call AutoLoad,35,igb)
+endef
+
+define KernelPackage/igb/description
+ Kernel modules for Intel(R) 82575/82576 PCI-Express Gigabit Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,igb))
+
+
+define KernelPackage/3c59x
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_VORTEX
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/3com/3c59x.ko
+  AUTOLOAD:=$(call AutoProbe,3c59x)
+endef
+
+define KernelPackage/3c59x/description
+ This option enables driver support for a large number of 10mbps and
+ 10/100mbps EISA, PCI and PCMCIA 3Com Ethernet adapters:
+ - "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
+ - "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
+ - "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
+ - "Tornado"   (3c905)                                  PCI
+ - "Hurricane" (3c555/3cSOHO)                           PCI
+endef
+
+$(eval $(call KernelPackage,3c59x))
+
+
+define KernelPackage/pcnet32
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=AMD PCnet32 PCI support
+  DEPENDS:=@(PCI_SUPPORT||TARGET_malta) +kmod-mii
+  KCONFIG:=CONFIG_PCNET32
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/pcnet32.ko
+  AUTOLOAD:=$(call AutoProbe,pcnet32)
+endef
+
+define KernelPackage/pcnet32/description
+ Kernel modules for AMD PCnet32 Ethernet adapters
+endef
+
+$(eval $(call KernelPackage,pcnet32))
+
+
+define KernelPackage/tg3
+  TITLE:=Broadcom Tigon3 Gigabit Ethernet
+  KCONFIG:=CONFIG_TIGON3
+  DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(!LINUX_3_3&&!LINUX_3_6):kmod-ptp
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
+  AUTOLOAD:=$(call AutoLoad,19,tg3,1)
+endef
+
+define KernelPackage/tg3/description
+ Kernel modules for Broadcom Tigon3 Gigabit Ethernet adapters
+endef
+
+$(eval $(call KernelPackage,tg3))
+
+
+define KernelPackage/hfcpci
+  TITLE:=HFC PCI cards (single port) support for mISDN
+  KCONFIG:=CONFIG_MISDN_HFCPCI
+  DEPENDS:=+kmod-misdn
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcpci.ko
+  AUTOLOAD:=$(call AutoLoad,31,hfcpci)
+endef
+
+define KernelPackage/hfcpci/description
+ Kernel modules for Cologne AG's HFC pci cards (single port)
+ using the mISDN V2 stack
+endef
+
+$(eval $(call KernelPackage,hfcpci))
+
+
+define KernelPackage/hfcmulti
+  TITLE:=HFC multiport cards (HFC-4S/8S/E1) support for mISDN
+  KCONFIG:=CONFIG_MISDN_HFCMULTI
+  DEPENDS:=+kmod-misdn
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcmulti.ko
+  AUTOLOAD:=$(call AutoLoad,31,hfcmulti)
+endef
+
+define KernelPackage/hfcmulti/description
+ Kernel modules for Cologne AG's HFC multiport cards (HFC-4S/8S/E1)
+ using the mISDN V2 stack
+endef
+
+$(eval $(call KernelPackage,hfcmulti))
+
+
+define KernelPackage/gigaset
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Siemens Gigaset support for isdn4linux
+  DEPENDS:=@USB_SUPPORT +kmod-isdn4linux +kmod-lib-crc-ccitt +kmod-usb-core
+  URL:=http://gigaset307x.sourceforge.net/
+  KCONFIG:= \
+    CONFIG_ISDN_DRV_GIGASET \
+    CONFIG_GIGASET_BASE \
+    CONFIG_GIGASET_M101 \
+    CONFIG_GIGASET_M105 \
+    CONFIG_GIGASET_UNDOCREQ=y \
+    CONFIG_GIGASET_I4L=y
+  FILES:= \
+    $(LINUX_DIR)/drivers/isdn/gigaset/gigaset.ko \
+    $(LINUX_DIR)/drivers/isdn/gigaset/bas_gigaset.ko \
+    $(LINUX_DIR)/drivers/isdn/gigaset/ser_gigaset.ko \
+    $(LINUX_DIR)/drivers/isdn/gigaset/usb_gigaset.ko
+  AUTOLOAD:=$(call AutoProbe,gigaset bas_gigaset ser_gigaset usb_gigaset)
+endef
+
+define KernelPackage/gigaset/description
+ This driver supports the Siemens Gigaset SX205/255 family of
+ ISDN DECT bases, including the predecessors Gigaset 3070/3075
+ and 4170/4175 and their T-Com versions Sinus 45isdn and Sinus
+ 721X.
+endef
+
+$(eval $(call KernelPackage,gigaset))
+
+
+define KernelPackage/macvlan
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=MAC-VLAN support
+  KCONFIG:=CONFIG_MACVLAN
+  FILES:=$(LINUX_DIR)/drivers/net/macvlan.ko
+  AUTOLOAD:=$(call AutoProbe,macvlan)
+endef
+
+define KernelPackage/macvlan/description
+ A kernel module which allows one to create virtual interfaces that
+ map packets to or from specific MAC addresses to a particular interface
+endef
+
+$(eval $(call KernelPackage,macvlan))
+
+
+define KernelPackage/tulip
+  TITLE:=Tulip family network device support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  KCONFIG:= \
+    CONFIG_NET_TULIP=y \
+    CONFIG_DE2104X \
+    CONFIG_DE2104X_DSL=0 \
+    CONFIG_TULIP \
+    CONFIG_TULIP_MWI=y \
+    CONFIG_TULIP_MMIO=y \
+    CONFIG_TULIP_NAPI=y \
+    CONFIG_TULIP_NAPI_HW_MITIGATION=y \
+    CONFIG_DE4X5=n \
+    CONFIG_WINBOND_840 \
+    CONFIG_DM9102 \
+    CONFIG_ULI526X
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/tulip.ko \
+	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/de2104x.ko \
+	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/dmfe.ko \
+	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/uli526x.ko \
+	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/winbond-840.ko
+  AUTOLOAD:=$(call AutoProbe,tulip)
+endef
+
+define KernelPackage/tulip/description
+ Kernel modules for the Tulip family of network cards,
+ including DECchip Tulip, DIGITAL EtherWORKS, Winbond W89c840,
+ Davicom DM910x/DM980x and ULi M526x controller support.
+endef
+
+$(eval $(call KernelPackage,tulip))
+
+
+define KernelPackage/solos-pci
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Solos ADSL2+ multiport modem
+  DEPENDS:=@PCI_SUPPORT +kmod-atm
+  KCONFIG:=CONFIG_ATM_SOLOS
+  FILES:=$(LINUX_DIR)/drivers/atm/solos-pci.ko
+  AUTOLOAD:=$(call AutoProbe,solos-pci)
+endef
+
+define KernelPackage/solos-pci/description
+ Kernel module for Traverse Technologies' Solos PCI cards
+ and Geos ADSL2+ x86 motherboard
+endef
+
+$(eval $(call KernelPackage,solos-pci))
+
+
+define KernelPackage/dummy
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Dummy network device
+  KCONFIG:=CONFIG_DUMMY
+  FILES:=$(LINUX_DIR)/drivers/net/dummy.ko
+  AUTOLOAD:=$(call AutoLoad,34,dummy)
+endef
+
+define KernelPackage/dummy/description
+ The dummy network device
+endef
+
+$(eval $(call KernelPackage,dummy))
+
+
+define KernelPackage/ifb
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Intermediate Functional Block support
+  KCONFIG:= \
+	CONFIG_IFB \
+	CONFIG_NET_CLS=y
+  FILES:=$(LINUX_DIR)/drivers/net/ifb.ko
+  AUTOLOAD:=$(call AutoLoad,34,ifb)
+endef
+
+define KernelPackage/ifb/description
+  The Intermediate Functional Block
+endef
+
+$(eval $(call KernelPackage,ifb))
+
+
+define KernelPackage/dm9000
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Davicom 9000 Ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
+  KCONFIG:=CONFIG_DM9000 \
+    CONFIG_DM9000_DEBUGLEVEL=4 \
+    CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/davicom/dm9000.ko
+  AUTOLOAD:=$(call AutoLoad,34,dm9000)
+endef
+
+define KernelPackage/dm9000/description
+ Kernel driver for Davicom 9000 Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,dm9000))
+
+
+define KernelPackage/forcedeth
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=nForce Ethernet support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_FORCEDETH
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/nvidia/forcedeth.ko
+  AUTOLOAD:=$(call AutoProbe,forcedeth)
+endef
+
+define KernelPackage/forcedeth/description
+ Kernel driver for Nvidia Ethernet support
+endef
+
+$(eval $(call KernelPackage,forcedeth))
+
+define KernelPackage/of-mdio
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=OpenFirmware MDIO support
+  DEPENDS:=+kmod-libphy
+  KCONFIG:=CONFIG_OF_MDIO
+  FILES:=$(LINUX_DIR)/drivers/of/of_mdio.ko
+  AUTOLOAD:=$(call AutoLoad,41,of_mdio)
+endef
+
+define KernelPackage/of-mdio/description
+ Kernel driver for OpenFirmware MDIO support
+endef
+
+$(eval $(call KernelPackage,of-mdio))
+
+
+define KernelPackage/fsl-pq-mdio
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Freescale PQ MDIO bus support
+  DEPENDS:=@TARGET_mpc85xx +kmod-of-mdio
+  KCONFIG:=CONFIG_FSL_PQ_MDIO
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/fsl_pq_mdio.ko
+  AUTOLOAD:=$(call AutoLoad,42,fsl_pq_mdio)
+endef
+
+define KernelPackage/fsl-pq-mdio/description
+ Kernel driver for the Freescale PQ MDIO bus
+endef
+
+$(eval $(call KernelPackage,fsl-pq-mdio))
+
+
+define KernelPackage/gianfar
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Gianfar Ethernet support
+  DEPENDS:=@TARGET_mpc85xx +kmod-fsl-pq-mdio
+  KCONFIG:=CONFIG_GIANFAR
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_driver.ko
+  AUTOLOAD:=$(call AutoProbe,gianfar_driver)
+endef
+
+define KernelPackage/gianfar/description
+ Kernel driver for Freescale Gianfar Ethernet support
+endef
+
+$(eval $(call KernelPackage,gianfar))
+
+
+define KernelPackage/vmxnet3
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=VMware VMXNET3 ethernet driver 
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_VMXNET3
+  FILES:=$(LINUX_DIR)/drivers/net/vmxnet3/vmxnet3.ko
+  AUTOLOAD:=$(call AutoLoad,35,vmxnet3)
+endef
+
+define KernelPackage/vmxnet3/description
+ Kernel modules for VMware VMXNET3 ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,vmxnet3))
diff --git a/trunk/package/kernel/linux/modules/netfilter.mk b/trunk/package/kernel/linux/modules/netfilter.mk
new file mode 100644
index 00000000..2cb769de
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/netfilter.mk
@@ -0,0 +1,823 @@
+
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+NF_MENU:=Netfilter Extensions
+NF_KMOD:=1
+include $(INCLUDE_DIR)/netfilter.mk
+
+
+define KernelPackage/nf-ipt
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Iptables core
+  KCONFIG:= \
+  	CONFIG_NETFILTER=y \
+	CONFIG_NETFILTER_ADVANCED=y \
+	$(KCONFIG_NF_IPT)
+  FILES:=$(foreach mod,$(NF_IPT-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_IPT-m)))
+endef
+
+$(eval $(call KernelPackage,nf-ipt))
+
+
+define KernelPackage/nf-ipt6
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Ip6tables core
+  KCONFIG:=$(KCONFIG_NF_IPT6)
+  FILES:=$(foreach mod,$(NF_IPT6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_IPT6-m)))
+  DEPENDS:=+kmod-nf-ipt +kmod-nf-conntrack6
+endef
+
+$(eval $(call KernelPackage,nf-ipt6))
+
+
+
+define KernelPackage/ipt-core
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Iptables core
+  KCONFIG:=$(KCONFIG_IPT_CORE)
+  FILES:=$(foreach mod,$(IPT_CORE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CORE-m)))
+  DEPENDS:=+kmod-nf-ipt
+endef
+
+define KernelPackage/ipt-core/description
+ Netfilter core kernel modules
+ Includes:
+ - comment
+ - limit
+ - LOG
+ - mac
+ - multiport
+ - REJECT
+ - TCPMSS
+endef
+
+$(eval $(call KernelPackage,ipt-core))
+
+
+define KernelPackage/nf-conntrack
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter connection tracking
+  KCONFIG:= \
+        CONFIG_NETFILTER=y \
+        CONFIG_NETFILTER_ADVANCED=y \
+	$(KCONFIG_NF_CONNTRACK)
+  FILES:=$(foreach mod,$(NF_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK-m)))
+endef
+
+$(eval $(call KernelPackage,nf-conntrack))
+
+
+define KernelPackage/nf-conntrack6
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter IPv6 connection tracking
+  KCONFIG:=$(KCONFIG_NF_CONNTRACK6)
+  DEPENDS:=+kmod-ipv6 +kmod-nf-conntrack
+  FILES:=$(foreach mod,$(NF_CONNTRACK6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK6-m)))
+endef
+
+$(eval $(call KernelPackage,nf-conntrack6))
+
+
+define KernelPackage/nf-nat
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter NAT
+  KCONFIG:=$(KCONFIG_NF_NAT)
+  DEPENDS:=+kmod-nf-conntrack +kmod-nf-ipt
+  FILES:=$(foreach mod,$(NF_NAT-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NAT-m)))
+endef
+
+$(eval $(call KernelPackage,nf-nat))
+
+
+define KernelPackage/nf-nat6
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter IPV6-NAT
+  KCONFIG:=$(KCONFIG_NF_NAT6)
+  DEPENDS:=+kmod-nf-conntrack6 +kmod-nf-ipt6 +kmod-nf-nat
+  FILES:=$(foreach mod,$(NF_NAT6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NAT6-m)))
+endef
+
+$(eval $(call KernelPackage,nf-nat6))
+
+
+define AddDepends/ipt
+  SUBMENU:=$(NF_MENU)
+  DEPENDS+= +kmod-ipt-core $(1)
+endef
+
+
+define KernelPackage/ipt-conntrack
+  TITLE:=Basic connection tracking modules
+  KCONFIG:=$(KCONFIG_IPT_CONNTRACK)
+  FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CONNTRACK-m)))
+  $(call AddDepends/ipt,+kmod-nf-conntrack)
+endef
+
+define KernelPackage/ipt-conntrack/description
+ Netfilter (IPv4) kernel modules for connection tracking
+ Includes:
+ - conntrack
+ - defrag
+ - iptables_raw
+ - NOTRACK
+ - state
+endef
+
+$(eval $(call KernelPackage,ipt-conntrack))
+
+
+define KernelPackage/ipt-conntrack-extra
+  TITLE:=Extra connection tracking modules
+  KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA)
+  FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CONNTRACK_EXTRA-m)))
+  $(call AddDepends/ipt,+kmod-ipt-conntrack)
+endef
+
+define KernelPackage/ipt-conntrack-extra/description
+ Netfilter (IPv4) extra kernel modules for connection tracking
+ Includes:
+ - connbytes
+ - connmark/CONNMARK
+ - conntrack
+ - helper
+ - recent
+endef
+
+$(eval $(call KernelPackage,ipt-conntrack-extra))
+
+
+define KernelPackage/ipt-filter
+  TITLE:=Modules for packet content inspection
+  KCONFIG:=$(KCONFIG_IPT_FILTER)
+  FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_FILTER-m)))
+  $(call AddDepends/ipt,+kmod-lib-textsearch +kmod-ipt-conntrack)
+endef
+
+define KernelPackage/ipt-filter/description
+ Netfilter (IPv4) kernel modules for packet content inspection
+ Includes:
+ - layer7
+ - string
+endef
+
+$(eval $(call KernelPackage,ipt-filter))
+
+
+define KernelPackage/ipt-ipopt
+  TITLE:=Modules for matching/changing IP packet options
+  KCONFIG:=$(KCONFIG_IPT_IPOPT)
+  FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_IPOPT-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-ipopt/description
+ Netfilter (IPv4) modules for matching/changing IP packet options
+ Includes:
+ - CLASSIFY
+ - dscp/DSCP
+ - ecn/ECN
+ - hl/HL
+ - length
+ - mark/MARK
+ - statistic
+ - tcpmss
+ - time
+ - ttl/TTL
+ - unclean
+endef
+
+$(eval $(call KernelPackage,ipt-ipopt))
+
+
+define KernelPackage/ipt-ipsec
+  TITLE:=Modules for matching IPSec packets
+  KCONFIG:=$(KCONFIG_IPT_IPSEC)
+  FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_IPSEC-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-ipsec/description
+ Netfilter (IPv4) modules for matching IPSec packets
+ Includes:
+ - ah
+ - esp
+ - policy
+endef
+
+$(eval $(call KernelPackage,ipt-ipsec))
+
+
+define KernelPackage/ipt-nat
+  TITLE:=Basic NAT targets
+  KCONFIG:=$(KCONFIG_IPT_NAT)
+  FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_NAT-m)))
+  $(call AddDepends/ipt,+kmod-nf-nat)
+endef
+
+define KernelPackage/ipt-nat/description
+ Netfilter (IPv4) kernel modules for basic NAT targets
+ Includes:
+ - MASQUERADE
+endef
+
+$(eval $(call KernelPackage,ipt-nat))
+
+
+define KernelPackage/ipt-nat6
+  TITLE:=IPv6 NAT targets
+  KCONFIG:=$(KCONFIG_IPT_NAT6)
+  FILES:=$(foreach mod,$(IPT_NAT6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT6-m)))
+  $(call AddDepends/ipt,+kmod-nf-nat6)
+  $(call AddDepends/ipt,+kmod-ipt-conntrack)
+  $(call AddDepends/ipt,+kmod-ipt-nat)
+  $(call AddDepends/ipt,+kmod-ip6tables)
+endef
+
+define KernelPackage/ipt-nat6/description
+ Netfilter (IPv6) kernel modules for NAT targets
+endef
+
+$(eval $(call KernelPackage,ipt-nat6))
+
+
+define KernelPackage/ipt-nat-extra
+  TITLE:=Extra NAT targets
+  KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA)
+  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_NAT_EXTRA-m)))
+  $(call AddDepends/ipt,+kmod-ipt-nat)
+endef
+
+define KernelPackage/ipt-nat-extra/description
+ Netfilter (IPv4) kernel modules for extra NAT targets
+ Includes:
+ - NETMAP
+ - REDIRECT
+endef
+
+$(eval $(call KernelPackage,ipt-nat-extra))
+
+
+define KernelPackage/nf-nathelper
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Basic Conntrack and NAT helpers
+  KCONFIG:=$(KCONFIG_NF_NATHELPER)
+  FILES:=$(foreach mod,$(NF_NATHELPER-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER-m)))
+  DEPENDS:=+kmod-nf-nat
+endef
+
+define KernelPackage/nf-nathelper/description
+ Default Netfilter (IPv4) Conntrack and NAT helpers
+ Includes:
+ - ftp
+ - irc
+ - tftp
+endef
+
+$(eval $(call KernelPackage,nf-nathelper))
+
+
+define KernelPackage/nf-nathelper-extra
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Extra Conntrack and NAT helpers
+  KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA)
+  FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m)))
+  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch
+endef
+
+define KernelPackage/nf-nathelper-extra/description
+ Extra Netfilter (IPv4) Conntrack and NAT helpers
+ Includes:
+ - amanda
+ - h323
+ - mms
+ - pptp
+ - proto_gre
+ - sip
+ - snmp_basic
+ - broadcast
+endef
+
+$(eval $(call KernelPackage,nf-nathelper-extra))
+
+
+define KernelPackage/ipt-queue
+  TITLE:=Module for user-space packet queueing
+  KCONFIG:=$(KCONFIG_IPT_QUEUE)
+  DEPENDS:=@!LINUX_3_6
+  FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_QUEUE-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-queue/description
+ Netfilter (IPv4) module for user-space packet queueing
+ Includes:
+ - QUEUE
+endef
+
+$(eval $(call KernelPackage,ipt-queue))
+
+
+define KernelPackage/ipt-ulog
+  TITLE:=Module for user-space packet logging
+  KCONFIG:=$(KCONFIG_IPT_ULOG)
+  FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_ULOG-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-ulog/description
+ Netfilter (IPv4) module for user-space packet logging
+ Includes:
+ - ULOG
+endef
+
+$(eval $(call KernelPackage,ipt-ulog))
+
+
+define KernelPackage/ipt-nflog
+  TITLE:=Module for user-space packet logging
+  KCONFIG:=$(KCONFIG_IPT_NFLOG)
+  FILES:=$(foreach mod,$(IPT_NFLOG-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_NFLOG-m)))
+  $(call AddDepends/ipt,+kmod-nfnetlink-log)
+endef
+
+define KernelPackage/ipt-nflog/description
+ Netfilter module for user-space packet logging
+ Includes:
+ - NFLOG
+endef
+
+$(eval $(call KernelPackage,ipt-nflog))
+
+
+define KernelPackage/ipt-nfqueue
+  TITLE:=Module for user-space packet queuing
+  KCONFIG:=$(KCONFIG_IPT_NFQUEUE)
+  FILES:=$(foreach mod,$(IPT_NFQUEUE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_NFQUEUE-m)))
+  $(call AddDepends/ipt,+kmod-nfnetlink-queue)
+endef
+
+define KernelPackage/ipt-nfqueue/description
+ Netfilter module for user-space packet queuing
+ Includes:
+ - NFQUEUE
+endef
+
+$(eval $(call KernelPackage,ipt-nfqueue))
+
+
+define KernelPackage/ipt-debug
+  TITLE:=Module for debugging/development
+  KCONFIG:=$(KCONFIG_IPT_DEBUG)
+  DEFAULT:=n
+  FILES:=$(foreach mod,$(IPT_DEBUG-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_DEBUG-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-debug/description
+ Netfilter modules for debugging/development of the firewall
+ Includes:
+ - TRACE
+endef
+
+$(eval $(call KernelPackage,ipt-debug))
+
+
+define KernelPackage/ipt-led
+  TITLE:=Module to trigger a LED with a Netfilter rule
+  KCONFIG:=$(KCONFIG_IPT_LED)
+  FILES:=$(foreach mod,$(IPT_LED-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_LED-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-led/description
+ Netfilter target to trigger a LED when a network packet is matched.
+endef
+
+$(eval $(call KernelPackage,ipt-led))
+
+define KernelPackage/ipt-tproxy
+  TITLE:=Transparent proxying support
+  DEPENDS+=+kmod-ipt-conntrack +IPV6:kmod-ipv6 +IPV6:kmod-ip6tables
+  KCONFIG:= \
+  	CONFIG_NETFILTER_TPROXY \
+  	CONFIG_NETFILTER_XT_MATCH_SOCKET \
+  	CONFIG_NETFILTER_XT_TARGET_TPROXY
+  FILES:= \
+	$(if $(call kernel_patchver_lt,3.12),$(LINUX_DIR)/net/netfilter/nf_tproxy_core.ko) \
+  	$(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir nf_tproxy_core $(IPT_TPROXY-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-tproxy/description
+  Kernel modules for Transparent Proxying
+endef
+
+$(eval $(call KernelPackage,ipt-tproxy))
+
+define KernelPackage/ipt-tee
+  TITLE:=TEE support
+  DEPENDS:=+kmod-ipt-conntrack +IPV6:kmod-ipv6
+  KCONFIG:= \
+  	CONFIG_NETFILTER_XT_TARGET_TEE
+  FILES:= \
+  	$(LINUX_DIR)/net/netfilter/xt_TEE.ko \
+  	$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-tee/description
+  Kernel modules for TEE
+endef
+
+$(eval $(call KernelPackage,ipt-tee))
+
+
+define KernelPackage/ipt-u32
+  TITLE:=U32 support
+  KCONFIG:= \
+  	CONFIG_NETFILTER_XT_MATCH_U32
+  FILES:= \
+  	$(LINUX_DIR)/net/netfilter/xt_u32.ko \
+  	$(foreach mod,$(IPT_U32-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_U32-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-u32/description
+  Kernel modules for U32
+endef
+
+$(eval $(call KernelPackage,ipt-u32))
+
+
+define KernelPackage/ipt-iprange
+  TITLE:=Module for matching ip ranges
+  KCONFIG:=$(KCONFIG_IPT_IPRANGE)
+  FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_IPRANGE-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-iprange/description
+ Netfilter (IPv4) module for matching ip ranges
+ Includes:
+ - iprange
+endef
+
+$(eval $(call KernelPackage,ipt-iprange))
+
+define KernelPackage/ipt-cluster
+  TITLE:=Module for matching cluster
+  KCONFIG:=$(KCONFIG_IPT_CLUSTER)
+  FILES:=$(foreach mod,$(IPT_CLUSTER-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CLUSTER-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-cluster/description
+ Netfilter (IPv4/IPv6) module for matching cluster
+ This option allows you to build work-load-sharing clusters of
+ network servers/stateful firewalls without having a dedicated
+ load-balancing router/server/switch. Basically, this match returns
+ true when the packet must be handled by this cluster node. Thus,
+ all nodes see all packets and this match decides which node handles
+ what packets. The work-load sharing algorithm is based on source
+ address hashing.
+
+ This module is usable for ipv4 and ipv6.
+
+ To use it also enable iptables-mod-cluster
+
+ see `iptables -m cluster --help` for more information.
+endef
+
+$(eval $(call KernelPackage,ipt-cluster))
+
+define KernelPackage/ipt-clusterip
+  TITLE:=Module for CLUSTERIP
+  KCONFIG:=$(KCONFIG_IPT_CLUSTERIP)
+  FILES:=$(foreach mod,$(IPT_CLUSTERIP-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CLUSTERIP-m)))
+  $(call AddDepends/ipt,+kmod-nf-conntrack)
+endef
+
+define KernelPackage/ipt-clusterip/description
+ Netfilter (IPv4-only) module for CLUSTERIP
+ The CLUSTERIP target allows you to build load-balancing clusters of
+ network servers without having a dedicated load-balancing
+ router/server/switch.
+
+ To use it also enable iptables-mod-clusterip
+
+ see `iptables -j CLUSTERIP --help` for more information.
+endef
+
+$(eval $(call KernelPackage,ipt-clusterip))
+
+
+define KernelPackage/ipt-extra
+  TITLE:=Extra modules
+  KCONFIG:=$(KCONFIG_IPT_EXTRA)
+  FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_EXTRA-m)))
+  $(call AddDepends/ipt)
+endef
+
+define KernelPackage/ipt-extra/description
+ Other Netfilter (IPv4) kernel modules
+ Includes:
+ - addrtype
+ - owner
+ - physdev (if bridge support was enabled in kernel)
+ - pkttype
+ - quota
+endef
+
+$(eval $(call KernelPackage,ipt-extra))
+
+
+define KernelPackage/ip6tables
+  SUBMENU:=$(NF_MENU)
+  TITLE:=IPv6 modules
+  DEPENDS:=+kmod-nf-ipt6 +kmod-ipt-core +kmod-ipt-conntrack
+  KCONFIG:=$(KCONFIG_IPT_IPV6)
+  FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_IPV6-m)))
+endef
+
+define KernelPackage/ip6tables/description
+ Netfilter IPv6 firewalling support
+endef
+
+$(eval $(call KernelPackage,ip6tables))
+
+define KernelPackage/ip6tables-extra
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Extra IPv6 modules
+  DEPENDS:=+kmod-ip6tables
+  KCONFIG:=$(KCONFIG_IPT_IPV6_EXTRA)
+  FILES:=$(foreach mod,$(IPT_IPV6_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_IPV6_EXTRA-m)))
+endef
+
+define KernelPackage/ip6tables-extra/description
+ Netfilter IPv6 extra header matching modules
+endef
+
+$(eval $(call KernelPackage,ip6tables-extra))
+
+ARP_MODULES = arp_tables arpt_mangle arptable_filter
+define KernelPackage/arptables
+  SUBMENU:=$(NF_MENU)
+  TITLE:=ARP firewalling modules
+  DEPENDS:=+kmod-ipt-core
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.ko
+  KCONFIG:=CONFIG_IP_NF_ARPTABLES \
+    CONFIG_IP_NF_ARPFILTER \
+    CONFIG_IP_NF_ARP_MANGLE
+  AUTOLOAD:=$(call AutoProbe,$(ARP_MODULES))
+endef
+
+define KernelPackage/arptables/description
+ Kernel modules for ARP firewalling
+endef
+
+$(eval $(call KernelPackage,arptables))
+
+
+define KernelPackage/ebtables
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Bridge firewalling modules
+  DEPENDS:=+kmod-ipt-core +kmod-bridge
+  FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \
+	$(KCONFIG_EBTABLES)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(EBTABLES-m)))
+endef
+
+define KernelPackage/ebtables/description
+  ebtables is a general, extensible frame/packet identification
+  framework. It provides you to do Ethernet
+  filtering/NAT/brouting on the Ethernet bridge.
+endef
+
+$(eval $(call KernelPackage,ebtables))
+
+
+define AddDepends/ebtables
+  SUBMENU:=$(NF_MENU)
+  DEPENDS+=kmod-ebtables $(1)
+endef
+
+
+define KernelPackage/ebtables-ipv4
+  TITLE:=ebtables: IPv4 support
+  FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_EBTABLES_IP4)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(EBTABLES_IP4-m)))
+  $(call AddDepends/ebtables)
+endef
+
+define KernelPackage/ebtables-ipv4/description
+ This option adds the IPv4 support to ebtables, which allows basic
+ IPv4 header field filtering, ARP filtering as well as SNAT, DNAT targets.
+endef
+
+$(eval $(call KernelPackage,ebtables-ipv4))
+
+
+define KernelPackage/ebtables-ipv6
+  TITLE:=ebtables: IPv6 support
+  FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_EBTABLES_IP6)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(EBTABLES_IP6-m)))
+  $(call AddDepends/ebtables)
+endef
+
+define KernelPackage/ebtables-ipv6/description
+ This option adds the IPv6 support to ebtables, which allows basic
+ IPv6 header field filtering and target support.
+endef
+
+$(eval $(call KernelPackage,ebtables-ipv6))
+
+
+define KernelPackage/ebtables-watchers
+  TITLE:=ebtables: watchers support
+  FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(EBTABLES_WATCHERS-m)))
+  $(call AddDepends/ebtables)
+endef
+
+define KernelPackage/ebtables-watchers/description
+ This option adds the log watchers, that you can use in any rule
+ in any ebtables table.
+endef
+
+$(eval $(call KernelPackage,ebtables-watchers))
+
+
+define KernelPackage/nfnetlink
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netlink-based userspace interface
+  FILES:=$(foreach mod,$(NFNETLINK-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_NFNETLINK)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFNETLINK-m)))
+endef
+
+define KernelPackage/nfnetlink/description
+ Kernel modules support for a netlink-based userspace interface
+endef
+
+$(eval $(call KernelPackage,nfnetlink))
+
+
+define AddDepends/nfnetlink
+  SUBMENU:=$(NF_MENU)
+  DEPENDS+=+kmod-nfnetlink $(1)
+endef
+
+
+define KernelPackage/nfnetlink-log
+  TITLE:=Netfilter LOG over NFNETLINK interface
+  FILES:=$(foreach mod,$(NFNETLINK_LOG-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_NFNETLINK_LOG)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFNETLINK_LOG-m)))
+  $(call AddDepends/nfnetlink)
+endef
+
+define KernelPackage/nfnetlink-log/description
+ Kernel modules support for logging packets via NFNETLINK
+ Includes:
+ - NFLOG
+endef
+
+$(eval $(call KernelPackage,nfnetlink-log))
+
+
+define KernelPackage/nfnetlink-queue
+  TITLE:=Netfilter QUEUE over NFNETLINK interface
+  FILES:=$(foreach mod,$(NFNETLINK_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko)
+  KCONFIG:=$(KCONFIG_NFNETLINK_QUEUE)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFNETLINK_QUEUE-m)))
+  $(call AddDepends/nfnetlink)
+endef
+
+define KernelPackage/nfnetlink-queue/description
+ Kernel modules support for queueing packets via NFNETLINK
+ Includes:
+ - NFQUEUE
+endef
+
+$(eval $(call KernelPackage,nfnetlink-queue))
+
+
+define KernelPackage/nf-conntrack-netlink
+  TITLE:=Connection tracking netlink interface
+  FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.ko
+  KCONFIG:=CONFIG_NF_CT_NETLINK
+  AUTOLOAD:=$(call AutoProbe,nf_conntrack_netlink)
+  $(call AddDepends/nfnetlink,+kmod-ipt-conntrack)
+endef
+
+define KernelPackage/nf-conntrack-netlink/description
+ Kernel modules support for a netlink-based connection tracking
+ userspace interface
+endef
+
+$(eval $(call KernelPackage,nf-conntrack-netlink))
+
+define KernelPackage/ipt-hashlimit
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter hashlimit match
+  DEPENDS:=+kmod-ipt-core
+  KCONFIG:=$(KCONFIG_IPT_HASHLIMIT)
+  FILES:=$(LINUX_DIR)/net/netfilter/xt_hashlimit.ko
+  AUTOLOAD:=$(call AutoProbe,xt_hashlimit)
+  $(call KernelPackage/ipt)
+endef
+
+define KernelPackage/ipt-hashlimit/description
+ Kernel modules support for the hashlimit bucket match module
+endef
+
+$(eval $(call KernelPackage,ipt-hashlimit))
+
+
+define KernelPackage/nft-core
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter nf_tables support
+  DEPENDS:=+kmod-nfnetlink +kmod-nf-conntrack6
+  FILES:=$(foreach mod,$(NFT_CORE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m)))
+  KCONFIG:= \
+	CONFIG_NETFILTER=y \
+	CONFIG_NETFILTER_ADVANCED=y \
+	CONFIG_NFT_COMPAT=n \
+	CONFIG_NFT_QUEUE=n \
+	CONFIG_NF_TABLES_ARP=n \
+	CONFIG_NF_TABLES_BRIDGE=n \
+	$(KCONFIG_NFT_CORE)
+endef
+
+define KernelPackage/nft-core/description
+ Kernel module support for nftables
+endef
+
+$(eval $(call KernelPackage,nft-core))
+
+
+define KernelPackage/nft-nat
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter nf_tables NAT support
+  DEPENDS:=+kmod-nft-core +kmod-nf-nat
+  FILES:=$(foreach mod,$(NFT_NAT-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_NAT-m)))
+  KCONFIG:=$(KCONFIG_NFT_NAT)
+endef
+
+$(eval $(call KernelPackage,nft-nat))
+
+
+define KernelPackage/nft-nat6
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter nf_tables IPv6-NAT support
+  DEPENDS:=+kmod-nft-core +kmod-nf-nat6
+  FILES:=$(foreach mod,$(NFT_NAT6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_NAT6-m)))
+  KCONFIG:=$(KCONFIG_NFT_NAT6)
+endef
+
+$(eval $(call KernelPackage,nft-nat6))
+
diff --git a/trunk/package/kernel/linux/modules/netsupport.mk b/trunk/package/kernel/linux/modules/netsupport.mk
new file mode 100644
index 00000000..8671df13
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/netsupport.mk
@@ -0,0 +1,984 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+NETWORK_SUPPORT_MENU:=Network Support
+
+define KernelPackage/atm
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=ATM support
+  KCONFIG:= \
+	CONFIG_ATM \
+	CONFIG_ATM_BR2684
+  FILES:= \
+	$(LINUX_DIR)/net/atm/atm.ko \
+	$(LINUX_DIR)/net/atm/br2684.ko
+  AUTOLOAD:=$(call AutoLoad,30,atm br2684)
+endef
+
+define KernelPackage/atm/description
+ Kernel modules for ATM support
+endef
+
+$(eval $(call KernelPackage,atm))
+
+
+define KernelPackage/atmtcp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=ATM over TCP
+  DEPENDS:=kmod-atm
+  KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y
+  FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.ko
+  AUTOLOAD:=$(call AutoLoad,40,atmtcp)
+endef
+
+define KernelPackage/atmtcp/description
+ Kernel module for ATM over TCP support
+endef
+
+$(eval $(call KernelPackage,atmtcp))
+
+
+define KernelPackage/appletalk
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Appletalk protocol support
+  DEPENDS:=+PACKAGE_kmod-llc:kmod-llc
+  KCONFIG:= \
+	CONFIG_ATALK \
+	CONFIG_DEV_APPLETALK \
+	CONFIG_IPDDP \
+	CONFIG_IPDDP_ENCAP=y \
+	CONFIG_IPDDP_DECAP=y
+  FILES:= \
+	$(LINUX_DIR)/net/appletalk/appletalk.ko \
+	$(LINUX_DIR)/drivers/net/appletalk/ipddp.ko
+  AUTOLOAD:=$(call AutoLoad,40,appletalk ipddp)
+endef
+
+define KernelPackage/appletalk/description
+ Kernel module for AppleTalk protocol.
+endef
+
+$(eval $(call KernelPackage,appletalk))
+
+
+define KernelPackage/bonding
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Ethernet bonding driver
+  KCONFIG:=CONFIG_BONDING
+  FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.ko
+  AUTOLOAD:=$(call AutoLoad,40,bonding)
+endef
+
+define KernelPackage/bonding/description
+ Kernel module for NIC bonding.
+endef
+
+$(eval $(call KernelPackage,bonding))
+
+
+define KernelPackage/bridge
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Ethernet bridging support
+  DEPENDS:=+kmod-stp
+  KCONFIG:= \
+	CONFIG_BRIDGE \
+	CONFIG_BRIDGE_IGMP_SNOOPING=y
+  FILES:=$(LINUX_DIR)/net/bridge/bridge.ko
+  AUTOLOAD:=$(call AutoLoad,11,bridge)
+endef
+
+define KernelPackage/bridge/description
+ Kernel module for Ethernet bridging.
+endef
+
+$(eval $(call KernelPackage,bridge))
+
+define KernelPackage/llc
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=ANSI/IEEE 802.2 LLC support
+  KCONFIG:=CONFIG_LLC
+  FILES:= \
+	$(LINUX_DIR)/net/llc/llc.ko \
+	$(LINUX_DIR)/net/802/p8022.ko \
+	$(LINUX_DIR)/net/802/psnap.ko
+  AUTOLOAD:=$(call AutoLoad,09,llc p8022 psnap)
+endef
+
+define KernelPackage/llc/description
+ Kernel module for ANSI/IEEE 802.2 LLC support.
+endef
+
+$(eval $(call KernelPackage,llc))
+
+define KernelPackage/stp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Ethernet Spanning Tree Protocol support
+  DEPENDS:=+kmod-llc
+  KCONFIG:=CONFIG_STP
+  FILES:=$(LINUX_DIR)/net/802/stp.ko
+  AUTOLOAD:=$(call AutoLoad,10,stp)
+endef
+
+define KernelPackage/stp/description
+ Kernel module for Ethernet Spanning Tree Protocol support.
+endef
+
+$(eval $(call KernelPackage,stp))
+
+define KernelPackage/8021q
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=802.1Q VLAN support
+  KCONFIG:=CONFIG_VLAN_8021Q \
+		CONFIG_VLAN_8021Q_GVRP=n
+  FILES:=$(LINUX_DIR)/net/8021q/8021q.ko
+  AUTOLOAD:=$(call AutoLoad,12,8021q)
+endef
+
+define KernelPackage/8021q/description
+ Kernel module for 802.1Q VLAN support
+endef
+
+$(eval $(call KernelPackage,8021q))
+
+define KernelPackage/vxlan
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Native VXLAN Kernel support
+  DEPENDS:=+kmod-iptunnel
+  KCONFIG:=CONFIG_VXLAN
+  FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
+  AUTOLOAD:=$(call AutoLoad,13,vxlan)
+endef
+
+define KernelPackage/vxlan/description
+ Kernel module for supporting VXLAN in the Kernel.
+ Requires Kernel 3.12 or newer.
+endef
+
+$(eval $(call KernelPackage,vxlan))
+
+define KernelPackage/capi
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=CAPI (ISDN) Support
+  KCONFIG:= \
+	CONFIG_ISDN_CAPI \
+	CONFIG_ISDN_CAPI_CAPI20 \
+	CONFIG_ISDN_CAPIFS \
+	CONFIG_ISDN_CAPI_CAPIFS
+  FILES:= \
+	$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.ko \
+	$(LINUX_DIR)/drivers/isdn/capi/capi.ko
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+endef
+
+define KernelPackage/capi/description
+ Kernel module for basic CAPI (ISDN) support
+endef
+
+$(eval $(call KernelPackage,capi))
+
+define KernelPackage/misdn
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=mISDN (ISDN) Support
+  KCONFIG:= \
+	CONFIG_ISDN=y \
+  	CONFIG_MISDN \
+	CONFIG_MISDN_DSP \
+	CONFIG_MISDN_L1OIP
+  FILES:= \
+  	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.ko \
+	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.ko \
+	$(LINUX_DIR)/drivers/isdn/mISDN/l1oip.ko
+  AUTOLOAD:=$(call AutoLoad,30,mISDN_core mISDN_dsp l1oip)
+endef
+
+define KernelPackage/misdn/description
+  Modular ISDN driver support
+endef
+
+$(eval $(call KernelPackage,misdn))
+
+
+define KernelPackage/isdn4linux
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Old ISDN4Linux (deprecated)
+  DEPENDS:=+kmod-ppp
+  KCONFIG:= \
+	CONFIG_ISDN=y \
+    CONFIG_ISDN_I4L \
+    CONFIG_ISDN_PPP=y \
+    CONFIG_ISDN_PPP_VJ=y \
+    CONFIG_ISDN_MPP=y \
+    CONFIG_IPPP_FILTER=y \
+    CONFIG_ISDN_PPP_BSDCOMP \
+    CONFIG_ISDN_CAPI_MIDDLEWARE=y \
+    CONFIG_ISDN_CAPI_CAPIFS_BOOL=y \
+    CONFIG_ISDN_AUDIO=y \
+    CONFIG_ISDN_TTY_FAX=y \
+    CONFIG_ISDN_X25=y \
+    CONFIG_ISDN_DIVERSION
+  FILES:= \
+    $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.ko \
+	$(LINUX_DIR)/drivers/isdn/i4l/isdn.ko \
+	$(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.ko
+  AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert)
+endef
+
+define KernelPackage/isdn4linux/description
+  This driver allows you to use an ISDN adapter for networking
+endef
+
+$(eval $(call KernelPackage,isdn4linux))
+
+
+define KernelPackage/ipip
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IP-in-IP encapsulation
+  DEPENDS:=+kmod-iptunnel +kmod-iptunnel4
+  KCONFIG:=CONFIG_NET_IPIP
+  FILES:=$(LINUX_DIR)/net/ipv4/ipip.ko
+  AUTOLOAD:=$(call AutoLoad,32,ipip)
+endef
+
+define KernelPackage/ipip/description
+ Kernel modules for IP-in-IP encapsulation
+endef
+
+$(eval $(call KernelPackage,ipip))
+
+
+IPSEC-m:= \
+	$(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \
+	xfrm/xfrm_ipcomp \
+	xfrm/xfrm_user \
+	key/af_key \
+
+define KernelPackage/ipsec
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPsec related modules (IPv4 and IPv6)
+  DEPENDS:=+kmod-crypto-authenc +kmod-crypto-iv +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 +kmod-crypto-deflate +kmod-crypto-cbc
+  KCONFIG:= \
+	CONFIG_NET_KEY \
+	CONFIG_XFRM_USER \
+	CONFIG_INET_IPCOMP \
+	CONFIG_XFRM_IPCOMP
+  FILES:=$(foreach mod,$(IPSEC-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,30,$(notdir $(IPSEC-m)))
+endef
+
+define KernelPackage/ipsec/description
+ Kernel modules for IPsec support in both IPv4 and IPv6.
+ Includes:
+ - af_key
+ - xfrm_ipcomp
+ - xfrm_user
+endef
+
+$(eval $(call KernelPackage,ipsec))
+
+
+IPSEC4-m:= \
+	ipv4/ah4 \
+	ipv4/esp4 \
+	ipv4/xfrm4_mode_beet \
+	ipv4/xfrm4_mode_transport \
+	ipv4/xfrm4_mode_tunnel \
+	ipv4/xfrm4_tunnel \
+	ipv4/ipcomp \
+
+define KernelPackage/ipsec4
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPsec related modules (IPv4)
+  DEPENDS:=kmod-ipsec +kmod-iptunnel4
+  KCONFIG:= \
+	CONFIG_INET_AH \
+	CONFIG_INET_ESP \
+	CONFIG_INET_IPCOMP \
+	CONFIG_INET_XFRM_MODE_BEET \
+	CONFIG_INET_XFRM_MODE_TRANSPORT \
+	CONFIG_INET_XFRM_MODE_TUNNEL \
+	CONFIG_INET_XFRM_TUNNEL
+  FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m)))
+endef
+
+define KernelPackage/ipsec4/description
+ Kernel modules for IPsec support in IPv4.
+ Includes:
+ - ah4
+ - esp4
+ - ipcomp4
+ - xfrm4_mode_beet
+ - xfrm4_mode_transport
+ - xfrm4_mode_tunnel
+ - xfrm4_tunnel
+endef
+
+$(eval $(call KernelPackage,ipsec4))
+
+
+IPSEC6-m:= \
+	ipv6/ah6 \
+	ipv6/esp6 \
+	ipv6/xfrm6_mode_beet \
+	ipv6/xfrm6_mode_transport \
+	ipv6/xfrm6_mode_tunnel \
+	ipv6/xfrm6_tunnel \
+	ipv6/ipcomp6 \
+
+define KernelPackage/ipsec6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPsec related modules (IPv6)
+  DEPENDS:=kmod-ipsec +kmod-iptunnel6
+  KCONFIG:= \
+	CONFIG_INET6_AH \
+	CONFIG_INET6_ESP \
+	CONFIG_INET6_IPCOMP \
+	CONFIG_INET6_XFRM_MODE_BEET \
+	CONFIG_INET6_XFRM_MODE_TRANSPORT \
+	CONFIG_INET6_XFRM_MODE_TUNNEL \
+	CONFIG_INET6_XFRM_TUNNEL
+  FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m)))
+endef
+
+define KernelPackage/ipsec6/description
+ Kernel modules for IPsec support in IPv6.
+ Includes:
+ - ah6
+ - esp6
+ - ipcomp6
+ - xfrm6_mode_beet
+ - xfrm6_mode_transport
+ - xfrm6_mode_tunnel
+ - xfrm6_tunnel
+endef
+
+$(eval $(call KernelPackage,ipsec6))
+
+
+define KernelPackage/iptunnel
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IP tunnel support
+  HIDDEN:=1
+  KCONFIG:= \
+	CONFIG_NET_IP_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv4/ip_tunnel.ko
+  AUTOLOAD:=$(call AutoLoad,31,ip_tunnel)
+endef
+
+define KernelPackage/iptunnel/description
+ Kernel module for generic IP tunnel support
+endef
+
+$(eval $(call KernelPackage,iptunnel))
+
+
+define KernelPackage/iptunnel4
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPv4 tunneling
+  HIDDEN:=1
+  KCONFIG:= \
+	CONFIG_INET_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv4/tunnel4.ko
+  AUTOLOAD:=$(call AutoLoad,31,tunnel4)
+endef
+
+define KernelPackage/iptunnel4/description
+ Kernel modules for IPv4 tunneling
+endef
+
+$(eval $(call KernelPackage,iptunnel4))
+
+
+define KernelPackage/iptunnel6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPv6 tunneling
+  DEPENDS:= +kmod-ipv6
+  KCONFIG:= \
+	CONFIG_INET6_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.ko
+  AUTOLOAD:=$(call AutoLoad,31,tunnel6)
+endef
+
+define KernelPackage/iptunnel6/description
+ Kernel modules for IPv6 tunneling
+endef
+
+$(eval $(call KernelPackage,iptunnel6))
+
+
+define KernelPackage/ipv6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPv6 support
+  KCONFIG:= \
+	CONFIG_IPV6 \
+	CONFIG_IPV6_PRIVACY=y \
+	CONFIG_IPV6_MULTIPLE_TABLES=y \
+	CONFIG_IPV6_MROUTE=y \
+	CONFIG_IPV6_PIMSM_V2=n \
+	CONFIG_IPV6_SUBTREES=y
+  FILES:=$(LINUX_DIR)/net/ipv6/ipv6.ko
+  AUTOLOAD:=$(call AutoLoad,20,ipv6)
+endef
+
+define KernelPackage/ipv6/description
+ Kernel modules for IPv6 support
+endef
+
+$(eval $(call KernelPackage,ipv6))
+
+
+define KernelPackage/sit
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-iptunnel4
+  TITLE:=IPv6-in-IPv4 tunnel
+  KCONFIG:=CONFIG_IPV6_SIT \
+	CONFIG_IPV6_SIT_6RD=y
+  FILES:=$(LINUX_DIR)/net/ipv6/sit.ko
+  AUTOLOAD:=$(call AutoLoad,32,sit)
+endef
+
+define KernelPackage/sit/description
+ Kernel modules for IPv6-in-IPv4 tunnelling
+endef
+
+$(eval $(call KernelPackage,sit))
+
+
+define KernelPackage/ip6-tunnel
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IP-in-IPv6 tunnelling
+  DEPENDS:= +kmod-ipv6 +kmod-iptunnel6
+  KCONFIG:= CONFIG_IPV6_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv6/ip6_tunnel.ko
+  AUTOLOAD:=$(call AutoLoad,32,ip6_tunnel)
+endef
+
+define KernelPackage/ip6-tunnel/description
+ Kernel modules for IPv6-in-IPv6 and IPv4-in-IPv6 tunnelling
+endef
+
+$(eval $(call KernelPackage,ip6-tunnel))
+
+
+define KernelPackage/gre
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=GRE support
+  DEPENDS:=+PACKAGE_kmod-ipv6:kmod-ipv6 +kmod-iptunnel
+  KCONFIG:=CONFIG_NET_IPGRE CONFIG_NET_IPGRE_DEMUX
+  FILES:=$(LINUX_DIR)/net/ipv4/ip_gre.ko $(LINUX_DIR)/net/ipv4/gre.ko
+  AUTOLOAD:=$(call AutoLoad,39,gre ip_gre)
+endef
+
+define KernelPackage/gre/description
+ Generic Routing Encapsulation support
+endef
+
+$(eval $(call KernelPackage,gre))
+
+
+define KernelPackage/gre6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=GRE support over IPV6
+  DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6
+  KCONFIG:=CONFIG_IPV6_GRE
+  FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko
+  AUTOLOAD:=$(call AutoLoad,39,ip6_gre)
+endef
+
+define KernelPackage/gre6/description
+ Generic Routing Encapsulation support over IPv6
+endef
+
+$(eval $(call KernelPackage,gre6))
+
+
+define KernelPackage/tun
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Universal TUN/TAP driver
+  KCONFIG:=CONFIG_TUN
+  FILES:=$(LINUX_DIR)/drivers/net/tun.ko
+  AUTOLOAD:=$(call AutoLoad,30,tun)
+endef
+
+define KernelPackage/tun/description
+ Kernel support for the TUN/TAP tunneling device
+endef
+
+$(eval $(call KernelPackage,tun))
+
+
+define KernelPackage/veth
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Virtual ethernet pair device
+  KCONFIG:=CONFIG_VETH
+  FILES:=$(LINUX_DIR)/drivers/net/veth.ko
+  AUTOLOAD:=$(call AutoLoad,30,veth)
+endef
+
+define KernelPackage/veth/description
+ This device is a local ethernet tunnel. Devices are created in pairs.
+ When one end receives the packet it appears on its pair and vice
+ versa.
+endef
+
+$(eval $(call KernelPackage,veth))
+
+
+define KernelPackage/slhc
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  HIDDEN:=1
+  TITLE:=Serial Line Header Compression
+  DEPENDS:=+kmod-lib-crc-ccitt
+  KCONFIG:=CONFIG_SLHC
+  FILES:=$(LINUX_DIR)/drivers/net/slip/slhc.ko
+endef
+
+$(eval $(call KernelPackage,slhc))
+
+
+define KernelPackage/ppp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPP modules
+  DEPENDS:=+kmod-lib-crc-ccitt +kmod-slhc
+  KCONFIG:= \
+	CONFIG_PPP \
+	CONFIG_PPP_ASYNC
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/ppp/ppp_async.ko \
+	$(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko
+  AUTOLOAD:=$(call AutoProbe,ppp_async)
+endef
+
+define KernelPackage/ppp/description
+ Kernel modules for PPP support
+endef
+
+$(eval $(call KernelPackage,ppp))
+
+
+define KernelPackage/ppp-synctty
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPP sync tty support
+  DEPENDS:=kmod-ppp
+  KCONFIG:=CONFIG_PPP_SYNC_TTY
+  FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko
+  AUTOLOAD:=$(call AutoProbe,ppp_synctty)
+endef
+
+define KernelPackage/ppp-synctty/description
+ Kernel modules for PPP sync tty support
+endef
+
+$(eval $(call KernelPackage,ppp-synctty))
+
+
+define KernelPackage/pppox
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPPoX helper
+  DEPENDS:=kmod-ppp
+  KCONFIG:=CONFIG_PPPOE
+  FILES:=$(LINUX_DIR)/drivers/net/ppp/pppox.ko
+endef
+
+define KernelPackage/pppox/description
+ Kernel helper module for PPPoE and PPTP support
+endef
+
+$(eval $(call KernelPackage,pppox))
+
+
+define KernelPackage/pppoe
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPPoE support
+  DEPENDS:=kmod-ppp +kmod-pppox
+  KCONFIG:=CONFIG_PPPOE
+  FILES:=$(LINUX_DIR)/drivers/net/ppp/pppoe.ko
+  AUTOLOAD:=$(call AutoProbe,pppoe)
+endef
+
+define KernelPackage/pppoe/description
+ Kernel module for PPPoE (PPP over Ethernet) support
+endef
+
+$(eval $(call KernelPackage,pppoe))
+
+
+define KernelPackage/pppoa
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPPoA support
+  DEPENDS:=kmod-ppp +kmod-atm
+  KCONFIG:=CONFIG_PPPOATM CONFIG_ATM_DRIVERS=y
+  FILES:=$(LINUX_DIR)/net/atm/pppoatm.ko
+  AUTOLOAD:=$(call AutoLoad,40,pppoatm)
+endef
+
+define KernelPackage/pppoa/description
+ Kernel modules for PPPoA (PPP over ATM) support
+endef
+
+$(eval $(call KernelPackage,pppoa))
+
+
+define KernelPackage/pptp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPtP support
+  DEPENDS:=kmod-ppp +kmod-gre +kmod-pppox
+  KCONFIG:=CONFIG_PPTP
+  FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko
+  AUTOLOAD:=$(call AutoProbe,pptp)
+endef
+
+$(eval $(call KernelPackage,pptp))
+
+
+define KernelPackage/pppol2tp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPPoL2TP support
+  DEPENDS:=kmod-ppp +kmod-pppox +kmod-l2tp
+  KCONFIG:=CONFIG_PPPOL2TP
+  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko
+  AUTOLOAD:=$(call AutoProbe,l2tp_ppp)
+endef
+
+define KernelPackage/pppol2tp/description
+  Kernel modules for PPPoL2TP (PPP over L2TP) support
+endef
+
+$(eval $(call KernelPackage,pppol2tp))
+
+
+define KernelPackage/ipoa
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPoA support
+  DEPENDS:=kmod-atm
+  KCONFIG:=CONFIG_ATM_CLIP
+  FILES:=$(LINUX_DIR)/net/atm/clip.ko
+  AUTOLOAD:=$(call AutoProbe,clip)
+endef
+
+define KernelPackage/ipoa/description
+  Kernel modules for IPoA (IP over ATM) support
+endef
+
+$(eval $(call KernelPackage,ipoa))
+
+
+define KernelPackage/mppe
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Microsoft PPP compression/encryption
+  DEPENDS:=kmod-ppp +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-sha1 +kmod-crypto-ecb
+  KCONFIG:= \
+	CONFIG_PPP_MPPE_MPPC \
+	CONFIG_PPP_MPPE
+  FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko
+  AUTOLOAD:=$(call AutoProbe,ppp_mppe)
+endef
+
+define KernelPackage/mppe/description
+ Kernel modules for Microsoft PPP compression/encryption
+endef
+
+$(eval $(call KernelPackage,mppe))
+
+
+SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
+SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
+SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_esfq
+SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
+SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
+SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA))
+
+define KernelPackage/sched-core
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Traffic schedulers
+  KCONFIG:= \
+	CONFIG_NET_SCHED=y \
+	CONFIG_NET_SCH_HFSC \
+	CONFIG_NET_SCH_INGRESS \
+	CONFIG_NET_SCH_FQ_CODEL \
+	CONFIG_NET_CLS=y \
+	CONFIG_NET_CLS_ACT=y \
+	CONFIG_NET_CLS_FLOW \
+	CONFIG_NET_CLS_FW \
+	CONFIG_NET_CLS_ROUTE4 \
+	CONFIG_NET_CLS_TCINDEX \
+	CONFIG_NET_CLS_U32 \
+	CONFIG_NET_ACT_MIRRED \
+	CONFIG_NET_ACT_SKBEDIT \
+	CONFIG_NET_EMATCH=y \
+	CONFIG_NET_EMATCH_U32
+  FILES:=$(SCHED_FILES)
+  AUTOLOAD:=$(call AutoLoad,70, $(SCHED_MODULES_CORE))
+endef
+
+define KernelPackage/sched-core/description
+ Core kernel scheduler support for IP traffic
+endef
+
+$(eval $(call KernelPackage,sched-core))
+
+
+define KernelPackage/sched-connmark
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Traffic shaper conntrack mark support
+  DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack-extra
+  KCONFIG:=CONFIG_NET_ACT_CONNMARK
+  FILES:=$(LINUX_DIR)/net/sched/act_connmark.ko
+  AUTOLOAD:=$(call AutoLoad,71, act_connmark)
+endef
+$(eval $(call KernelPackage,sched-connmark))
+
+define KernelPackage/sched-esfq
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Traffic shaper ESFQ support
+  DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack
+  KCONFIG:= \
+	CONFIG_NET_SCH_ESFQ \
+	CONFIG_NET_SCH_ESFQ_NFCT=y
+  FILES:=$(LINUX_DIR)/net/sched/sch_esfq.ko
+  AUTOLOAD:=$(call AutoLoad,72, sch_esfq)
+endef
+$(eval $(call KernelPackage,sched-esfq))
+
+define KernelPackage/sched
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Extra traffic schedulers
+  DEPENDS:=+kmod-sched-core +kmod-ipt-core
+  KCONFIG:= \
+	CONFIG_NET_SCH_CODEL \
+	CONFIG_NET_SCH_DSMARK \
+	CONFIG_NET_SCH_HTB \
+	CONFIG_NET_SCH_FIFO \
+	CONFIG_NET_SCH_GRED \
+	CONFIG_NET_SCH_PRIO \
+	CONFIG_NET_SCH_RED \
+	CONFIG_NET_SCH_TBF \
+	CONFIG_NET_SCH_SFQ \
+	CONFIG_NET_SCH_TEQL \
+	CONFIG_NET_CLS_BASIC \
+	CONFIG_NET_ACT_POLICE \
+	CONFIG_NET_ACT_IPT \
+	CONFIG_NET_EMATCH_CMP \
+	CONFIG_NET_EMATCH_NBYTE \
+	CONFIG_NET_EMATCH_META \
+	CONFIG_NET_EMATCH_TEXT
+  FILES:=$(SCHED_FILES_EXTRA)
+  AUTOLOAD:=$(call AutoLoad,73, $(SCHED_MODULES_EXTRA))
+endef
+
+define KernelPackage/sched/description
+ Extra kernel schedulers modules for IP traffic
+endef
+
+$(eval $(call KernelPackage,sched))
+
+
+define KernelPackage/ax25
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=AX25 support
+  KCONFIG:= \
+	CONFIG_AX25 \
+	CONFIG_MKISS
+  FILES:= \
+	$(LINUX_DIR)/net/ax25/ax25.ko \
+	$(LINUX_DIR)/drivers/net/hamradio/mkiss.ko
+  AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
+  $(call AddDepends/crc16)
+endef
+
+define KernelPackage/ax25/description
+ Kernel modules for AX25 support
+endef
+
+$(eval $(call KernelPackage,ax25))
+
+
+define KernelPackage/mp-alg
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=ECMP caching algorithms
+  KCONFIG:= \
+	CONFIG_IP_ROUTE_MULTIPATH_RR \
+	CONFIG_IP_ROUTE_MULTIPATH_RANDOM \
+	CONFIG_IP_ROUTE_MULTIPATH_WRANDOM \
+	CONFIG_IP_ROUTE_MULTIPATH_DRR
+  FILES:= \
+	$(LINUX_DIR)/net/ipv4/multipath_rr.ko \
+	$(LINUX_DIR)/net/ipv4/multipath_random.ko \
+	$(LINUX_DIR)/net/ipv4/multipath_wrandom.ko \
+	$(LINUX_DIR)/net/ipv4/multipath_drr.ko
+  AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
+endef
+
+define KernelPackage/mp-alg/description
+ Kernel modules that provide several different algorithms for multipath
+ route selection from the route cache. The iproute "mpath" argument allows
+ specifying which algorithm to use for routes.
+ quagga (at least <=0.99.6) requires a multipath patch to support this
+ cached mp route feature.
+endef
+
+$(eval $(call KernelPackage,mp-alg))
+
+
+define KernelPackage/pktgen
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  DEPENDS:=@!TARGET_uml
+  TITLE:=Network packet generator
+  KCONFIG:=CONFIG_NET_PKTGEN
+  FILES:=$(LINUX_DIR)/net/core/pktgen.ko
+  AUTOLOAD:=$(call AutoLoad,99,pktgen)
+endef
+
+define KernelPackage/pktgen/description
+  Kernel modules for the Network Packet Generator
+endef
+
+$(eval $(call KernelPackage,pktgen))
+
+define KernelPackage/l2tp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Layer Two Tunneling Protocol (L2TP)
+  DEPENDS:=+IPV6:kmod-ipv6
+  KCONFIG:=CONFIG_L2TP \
+	CONFIG_L2TP_V3=y \
+	CONFIG_L2TP_DEBUGFS=n
+  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.ko \
+	$(LINUX_DIR)/net/l2tp/l2tp_netlink.ko
+  AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink)
+endef
+
+define KernelPackage/l2tp/description
+ Kernel modules for L2TP V3 Support
+endef
+
+$(eval $(call KernelPackage,l2tp))
+
+
+define KernelPackage/l2tp-eth
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=L2TP ethernet pseudowire support for L2TPv3
+  DEPENDS:=+kmod-l2tp
+  KCONFIG:=CONFIG_L2TP_ETH
+  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_eth.ko
+  AUTOLOAD:=$(call AutoLoad,33,l2tp_eth)
+endef
+
+define KernelPackage/l2tp-eth/description
+ Kernel modules for L2TP ethernet pseudowire support for L2TPv3
+endef
+
+$(eval $(call KernelPackage,l2tp-eth))
+
+define KernelPackage/l2tp-ip
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=L2TP IP encapsulation for L2TPv3
+  DEPENDS:=+kmod-l2tp
+  KCONFIG:=CONFIG_L2TP_IP
+  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko
+  AUTOLOAD:=$(call AutoLoad,33,l2tp_ip)
+endef
+
+define KernelPackage/l2tp-ip/description
+ Kernel modules for L2TP IP encapsulation for L2TPv3
+endef
+
+$(eval $(call KernelPackage,l2tp-ip))
+
+
+define KernelPackage/sctp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=SCTP protocol kernel support
+  KCONFIG:=\
+     CONFIG_IP_SCTP \
+     CONFIG_SCTP_DBG_MSG=n \
+     CONFIG_SCTP_DBG_OBJCNT=n \
+     CONFIG_SCTP_HMAC_NONE=n \
+     CONFIG_SCTP_HMAC_SHA1=n \
+     CONFIG_SCTP_HMAC_MD5=y \
+     CONFIG_SCTP_COOKIE_HMAC_SHA1=n \
+     CONFIG_SCTP_COOKIE_HMAC_MD5=y \
+     CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE=n \
+     CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=n \
+     CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+  FILES:= $(LINUX_DIR)/net/sctp/sctp.ko
+  AUTOLOAD:= $(call AutoLoad,32,sctp)
+  DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac +IPV6:kmod-ipv6
+endef
+
+define KernelPackage/sctp/description
+ Kernel modules for SCTP protocol support
+endef
+
+$(eval $(call KernelPackage,sctp))
+
+
+define KernelPackage/netem
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Network emulation functionality
+  DEPENDS:=+kmod-sched
+  KCONFIG:=CONFIG_NET_SCH_NETEM
+  FILES:=$(LINUX_DIR)/net/sched/sch_netem.ko
+  AUTOLOAD:=$(call AutoLoad,99,netem)
+endef
+
+define KernelPackage/netem/description
+  Kernel modules for emulating the properties of wide area networks
+endef
+
+$(eval $(call KernelPackage,netem))
+
+define KernelPackage/slip
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  DEPENDS:=+kmod-slhc
+  TITLE:=SLIP modules
+  KCONFIG:= \
+       CONFIG_SLIP \
+       CONFIG_SLIP_COMPRESSED=y \
+       CONFIG_SLIP_SMART=y \
+       CONFIG_SLIP_MODE_SLIP6=y
+
+  FILES:= \
+       $(LINUX_DIR)/drivers/net/slip/slip.ko
+  AUTOLOAD:=$(call AutoLoad,30,slip)
+endef
+
+define KernelPackage/slip/description
+ Kernel modules for SLIP support
+endef
+
+$(eval $(call KernelPackage,slip))
+
+define KernelPackage/dnsresolver
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=In-kernel DNS Resolver
+  KCONFIG:= CONFIG_DNS_RESOLVER
+  FILES:=$(LINUX_DIR)/net/dns_resolver/dns_resolver.ko
+  AUTOLOAD:=$(call AutoLoad,30,dns_resolver)
+endef
+
+$(eval $(call KernelPackage,dnsresolver))
+
+define KernelPackage/rxrpc
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=AF_RXRPC support
+  KCONFIG:= \
+	CONFIG_AF_RXRPC \
+	CONFIG_RXKAD=m \
+	CONFIG_AF_RXRPC_DEBUG=n
+  FILES:= \
+	$(LINUX_DIR)/net/rxrpc/af-rxrpc.ko \
+	$(LINUX_DIR)/net/rxrpc/rxkad.ko
+  AUTOLOAD:=$(call AutoLoad,30,rxkad af-rxrpc)
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt
+endef
+
+define KernelPackage/rxrpc/description
+  Kernel support for AF_RXRPC; required for AFS client
+endef
+
+$(eval $(call KernelPackage,rxrpc))
diff --git a/trunk/package/kernel/linux/modules/nls.mk b/trunk/package/kernel/linux/modules/nls.mk
new file mode 100644
index 00000000..55c5c1a8
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/nls.mk
@@ -0,0 +1,307 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define KernelPackage/nls-base
+  SUBMENU:=Native Language Support
+  TITLE:=Native Language Support
+  KCONFIG:=CONFIG_NLS
+  FILES:=$(LINUX_DIR)/fs/nls/nls_base.ko
+endef
+
+define KernelPackage/nls-base/description
+ Kernel module for NLS (Native Language Support)
+endef
+
+$(eval $(call KernelPackage,nls-base))
+
+
+define KernelPackage/nls-cp437
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 437 (United States, Canada)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_437
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp437/description
+ Kernel module for NLS Codepage 437 (United States, Canada)
+endef
+
+$(eval $(call KernelPackage,nls-cp437))
+
+
+define KernelPackage/nls-cp775
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 775 (Baltic Rim)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_775
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp775)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp775/description
+ Kernel module for NLS Codepage 775 (Baltic Rim)
+endef
+
+$(eval $(call KernelPackage,nls-cp775))
+
+
+define KernelPackage/nls-cp850
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 850 (Europe)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_850
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp850/description
+ Kernel module for NLS Codepage 850 (Europe)
+endef
+
+$(eval $(call KernelPackage,nls-cp850))
+
+
+define KernelPackage/nls-cp852
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 852 (Europe)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_852
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp852)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp852/description
+ Kernel module for NLS Codepage 852 (Europe)
+endef
+
+$(eval $(call KernelPackage,nls-cp852))
+
+
+define KernelPackage/nls-cp862
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 862 (Hebrew)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_862
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp862.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp862)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp862/description
+  Kernel module for NLS Codepage 862 (Hebrew)
+endef
+
+$(eval $(call KernelPackage,nls-cp862))
+
+
+define KernelPackage/nls-cp864
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 864 (Arabic)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_864
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp864.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp864)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp864/description
+  Kernel module for NLS Codepage 864 (Arabic)
+endef
+
+$(eval $(call KernelPackage,nls-cp864))
+
+
+define KernelPackage/nls-cp866
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 866 (Cyrillic)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_866
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp866)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp866/description
+  Kernel module for NLS Codepage 866 (Cyrillic)
+endef
+
+$(eval $(call KernelPackage,nls-cp866))
+
+
+define KernelPackage/nls-cp932
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 932 (Japanese)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_932
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp932.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp932)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp932/description
+  Kernel module for NLS Codepage 932 (Japanese)
+endef
+
+$(eval $(call KernelPackage,nls-cp932))
+
+
+define KernelPackage/nls-cp1250
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 1250 (Eastern Europe)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_1250
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp1250/description
+ Kernel module for NLS Codepage 1250 (Eastern Europe)
+endef
+
+$(eval $(call KernelPackage,nls-cp1250))
+
+
+define KernelPackage/nls-cp1251
+  SUBMENU:=Native Language Support
+  TITLE:=Codepage 1251 (Russian)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_1251
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp1251)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-cp1251/description
+ Kernel module for NLS Codepage 1251 (Russian)
+endef
+
+$(eval $(call KernelPackage,nls-cp1251))
+
+
+define KernelPackage/nls-iso8859-1
+  SUBMENU:=Native Language Support
+  TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
+  KCONFIG:=CONFIG_NLS_ISO8859_1
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-1/description
+ Kernel module for NLS ISO 8859-1 (Latin 1)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-1))
+
+
+define KernelPackage/nls-iso8859-2
+  SUBMENU:=Native Language Support
+  TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
+  KCONFIG:=CONFIG_NLS_ISO8859_2
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-2/description
+ Kernel module for NLS ISO 8859-2 (Latin 2)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-2))
+
+
+define KernelPackage/nls-iso8859-6
+  SUBMENU:=Native Language Support
+  TITLE:=ISO 8859-6 (Arabic)
+  KCONFIG:=CONFIG_NLS_ISO8859_6
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-6.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-6)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-6/description
+ Kernel module for NLS ISO 8859-6 (Arabic)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-6))
+
+
+define KernelPackage/nls-iso8859-8
+  SUBMENU:=Native Language Support
+  TITLE:=ISO 8859-8, CP1255 (Hebrew)
+  KCONFIG:=CONFIG_NLS_ISO8859_8
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1255.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp1255)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-8/description
+ Kernel module for Hebrew charsets (ISO-8859-8, CP1255)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-8))
+
+
+define KernelPackage/nls-iso8859-13
+  SUBMENU:=Native Language Support
+  TITLE:=ISO 8859-13 (Latin 7; Baltic)
+  KCONFIG:=CONFIG_NLS_ISO8859_13
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-13)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-13/description
+ Kernel module for NLS ISO 8859-13 (Latin 7; Baltic)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-13))
+
+
+define KernelPackage/nls-iso8859-15
+  SUBMENU:=Native Language Support
+  TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
+  KCONFIG:=CONFIG_NLS_ISO8859_15
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-iso8859-15/description
+ Kernel module for NLS ISO 8859-15 (Latin 9)
+endef
+
+$(eval $(call KernelPackage,nls-iso8859-15))
+
+
+define KernelPackage/nls-koi8r
+  SUBMENU:=Native Language Support
+  TITLE:=KOI8-R (Russian)
+  KCONFIG:=CONFIG_NLS_KOI8_R
+  FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-koi8r/description
+ Kernel module for NLS KOI8-R (Russian)
+endef
+
+$(eval $(call KernelPackage,nls-koi8r))
+
+
+define KernelPackage/nls-utf8
+  SUBMENU:=Native Language Support
+  TITLE:=UTF-8
+  KCONFIG:=CONFIG_NLS_UTF8
+  FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.ko
+  AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/nls-utf8/description
+ Kernel module for NLS UTF-8
+endef
+
+$(eval $(call KernelPackage,nls-utf8))
diff --git a/trunk/package/kernel/linux/modules/other.mk b/trunk/package/kernel/linux/modules/other.mk
new file mode 100644
index 00000000..001f7873
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/other.mk
@@ -0,0 +1,919 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+OTHER_MENU:=Other modules
+
+WATCHDOG_DIR:=watchdog
+
+
+define KernelPackage/6lowpan-iphc
+  USBMENU:=$(OTHER_MENU)
+  TITLE:=6lowpan shared code
+  DEPENDS:=@!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_13
+  KCONFIG:=CONFIG_6LOWPAN_IPHC
+  HIDDEN:=1
+  FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko
+  AUTOLOAD:=$(call Autoprobe,6lowpan_iphc)
+endef
+
+define KernelPackage/6lowpan-iphc/description
+  Shared 6lowpan code for IEEE 802.15.4 and Bluetooth.
+endef
+
+$(eval $(call KernelPackage,6lowpan-iphc))
+
+define KernelPackage/bluetooth
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Bluetooth support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +(!LINUX_3_3&&!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-6lowpan-iphc
+  KCONFIG:= \
+	CONFIG_BLUEZ \
+	CONFIG_BLUEZ_L2CAP \
+	CONFIG_BLUEZ_SCO \
+	CONFIG_BLUEZ_RFCOMM \
+	CONFIG_BLUEZ_BNEP \
+	CONFIG_BLUEZ_HCIUART \
+	CONFIG_BLUEZ_HCIUSB \
+	CONFIG_BLUEZ_HIDP \
+	CONFIG_BT \
+	CONFIG_BT_L2CAP=y \
+	CONFIG_BT_SCO=y \
+	CONFIG_BT_RFCOMM \
+	CONFIG_BT_BNEP \
+	CONFIG_BT_HCIBTUSB \
+	CONFIG_BT_HCIUSB \
+	CONFIG_BT_HCIUART \
+	CONFIG_BT_HCIUART_H4 \
+	CONFIG_BT_HIDP \
+	CONFIG_HID_SUPPORT=y
+  $(call AddDepends/crc16)
+  $(call AddDepends/hid)
+  $(call AddDepends/rfkill)
+  FILES:= \
+	$(LINUX_DIR)/net/bluetooth/bluetooth.ko \
+	$(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.ko \
+	$(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \
+	$(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \
+	$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
+	$(LINUX_DIR)/drivers/bluetooth/btusb.ko
+  AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
+endef
+
+define KernelPackage/bluetooth/description
+ Kernel support for Bluetooth devices
+endef
+
+$(eval $(call KernelPackage,bluetooth))
+
+
+define KernelPackage/bluetooth-hci-h4p
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=HCI driver with H4 Nokia extensions
+  DEPENDS:=@TARGET_omap24xx +kmod-bluetooth
+  KCONFIG:=CONFIG_BT_HCIH4P
+  FILES:=$(LINUX_DIR)/drivers/bluetooth/hci_h4p/hci_h4p.ko
+  AUTOLOAD:=$(call AutoProbe,hci_h4p)
+endef
+
+define KernelPackage/bluetooth-hci-h4p/description
+ HCI driver with H4 Nokia extensions
+endef
+
+$(eval $(call KernelPackage,bluetooth-hci-h4p))
+
+
+define KernelPackage/eeprom-93cx6
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=EEPROM 93CX6 support
+  KCONFIG:=CONFIG_EEPROM_93CX6
+  FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.ko
+  AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6)
+endef
+
+define KernelPackage/eeprom-93cx6/description
+ Kernel module for EEPROM 93CX6 support
+endef
+
+$(eval $(call KernelPackage,eeprom-93cx6))
+
+
+define KernelPackage/eeprom-at24
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=EEPROM AT24 support
+  KCONFIG:=CONFIG_EEPROM_AT24
+  DEPENDS:=+kmod-i2c-core
+  FILES:=$(LINUX_DIR)/drivers/misc/eeprom/at24.ko
+  AUTOLOAD:=$(call AutoProbe,at24)
+endef
+
+define KernelPackage/eeprom-at24/description
+ Kernel module for most I2C EEPROMs
+endef
+
+$(eval $(call KernelPackage,eeprom-at24))
+
+
+define KernelPackage/eeprom-at25
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=EEPROM AT25 support
+  KCONFIG:=CONFIG_EEPROM_AT25
+  FILES:=$(LINUX_DIR)/drivers/misc/eeprom/at25.ko
+  AUTOLOAD:=$(call AutoProbe,at25)
+endef
+
+define KernelPackage/eeprom-at25/description
+ Kernel module for most SPI EEPROMs
+endef
+
+$(eval $(call KernelPackage,eeprom-at25))
+
+
+define KernelPackage/gpio-dev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Generic GPIO char device support
+  DEPENDS:=@GPIO_SUPPORT
+  KCONFIG:=CONFIG_GPIO_DEVICE
+  FILES:=$(LINUX_DIR)/drivers/char/gpio_dev.ko
+  AUTOLOAD:=$(call AutoLoad,40,gpio_dev)
+endef
+
+define KernelPackage/gpio-dev/description
+ Kernel module to allows control of GPIO pins using a character device.
+endef
+
+$(eval $(call KernelPackage,gpio-dev))
+
+
+define KernelPackage/gpio-mcp23s08
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Microchip MCP23xxx I/O expander
+  DEPENDS:=@GPIO_SUPPORT +PACKAGE_kmod-i2c-core:kmod-i2c-core
+  KCONFIG:=CONFIG_GPIO_MCP23S08
+  FILES:=$(LINUX_DIR)/drivers/gpio/gpio-mcp23s08.ko
+  AUTOLOAD:=$(call AutoLoad,40,gpio-mcp23s08)
+endef
+
+define KernelPackage/gpio-mcp23s08/description
+ Kernel module for Microchip MCP23xxx SPI/I2C I/O expander
+endef
+
+$(eval $(call KernelPackage,gpio-mcp23s08))
+
+
+define KernelPackage/gpio-nxp-74hc164
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=NXP 74HC164 GPIO expander support
+  KCONFIG:=CONFIG_GPIO_NXP_74HC164
+  FILES:=$(LINUX_DIR)/drivers/gpio/nxp_74hc164.ko
+  AUTOLOAD:=$(call AutoProbe,nxp_74hc164)
+endef
+
+define KernelPackage/gpio-nxp-74hc164/description
+ Kernel module for NXP 74HC164 GPIO expander
+endef
+
+$(eval $(call KernelPackage,gpio-nxp-74hc164))
+
+define KernelPackage/gpio-pca953x
+  SUBMENU:=$(OTHER_MENU)
+  DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core
+  TITLE:=PCA95xx, TCA64xx, and MAX7310 I/O ports
+  KCONFIG:=CONFIG_GPIO_PCA953X
+  FILES:=$(LINUX_DIR)/drivers/gpio/gpio-pca953x.ko
+  AUTOLOAD:=$(call AutoLoad,55,gpio-pca953x)
+endef
+
+define KernelPackage/gpio-pca953x/description
+ Kernel module for MAX731{0,2,3,5}, PCA6107, PCA953{4-9}, PCA955{4-7},
+ PCA957{4,5} and TCA64{08,16} I2C GPIO expanders
+endef
+
+$(eval $(call KernelPackage,gpio-pca953x))
+
+define KernelPackage/gpio-pcf857x
+  SUBMENU:=$(OTHER_MENU)
+  DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core
+  TITLE:=PCX857x, PCA967x and MAX732X I2C GPIO expanders
+  KCONFIG:=CONFIG_GPIO_PCF857X
+  FILES:=$(LINUX_DIR)/drivers/gpio/gpio-pcf857x.ko
+  AUTOLOAD:=$(call AutoLoad,55,gpio-pcf857x)
+endef
+
+define KernelPackage/gpio-pcf857x/description
+ Kernel module for PCF857x, PCA{85,96}7x, and MAX732[89] I2C GPIO expanders
+endef
+
+$(eval $(call KernelPackage,gpio-pcf857x))
+
+define KernelPackage/iio-core
+  SUBMENU:=$(OTHER_MENU)
+  DEPENDS:=@!LINUX_3_3 @!LINUX_3_6
+  TITLE:=Industrial IO core
+  KCONFIG:= \
+	CONFIG_IIO \
+	CONFIG_IIO_BUFFER=y \
+	CONFIG_IIO_KFIFO_BUF \
+	CONFIG_IIO_TRIGGER=y \
+	CONFIG_IIO_TRIGGERED_BUFFER
+  FILES:= \
+	$(LINUX_DIR)/drivers/iio/industrialio.ko \
+	$(if $(CONFIG_IIO_TRIGGERED_BUFFER),$(LINUX_DIR)/drivers/iio/industrialio-triggered-buffer.ko) \
+	$(LINUX_DIR)/drivers/iio/kfifo_buf.ko
+  AUTOLOAD:=$(call AutoLoad,55,industrialio kfifo_buf industrialio-triggered-buffer)
+endef
+
+define KernelPackage/iio-core/description
+ The industrial I/O subsystem provides a unified framework for
+ drivers for many different types of embedded sensors using a
+ number of different physical interfaces (i2c, spi, etc)
+endef
+
+$(eval $(call KernelPackage,iio-core))
+
+
+define KernelPackage/iio-ad799x
+  SUBMENU:=$(OTHER_MENU)
+  DEPENDS:=kmod-i2c-core kmod-iio-core
+  TITLE:=Analog Devices AD799x ADC driver
+  KCONFIG:= \
+	CONFIG_AD799X_RING_BUFFER=y \
+	CONFIG_AD799X
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1)
+  FILES:=$(LINUX_DIR)/drivers/iio/adc/ad799x.ko
+else
+  FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/ad799x.ko
+endif
+  AUTOLOAD:=$(call AutoLoad,56,ad799x)
+endef
+
+define KernelPackage/iio-ad799x/description
+ support for Analog Devices:
+ ad7991, ad7995, ad7999, ad7992, ad7993, ad7994, ad7997, ad7998
+ i2c analog to digital converters (ADC).
+endef
+
+$(eval $(call KernelPackage,iio-ad799x))
+
+
+define KernelPackage/iio-dht11
+  SUBMENU:=$(OTHER_MENU)
+  DEPENDS:=kmod-iio-core @GPIO_SUPPORT @USES_DEVICETREE
+  TITLE:=DHT11 (and compatible) humidity and temperature sensors
+  KCONFIG:= \
+	CONFIG_DHT11
+  FILES:=$(LINUX_DIR)/drivers/iio/humidity/dht11.ko
+  AUTOLOAD:=$(call AutoLoad,56,dht11)
+endef
+
+define KernelPackage/iio-dht11/description
+ support for DHT11 and DHT22 digitial humidity and temperature sensors
+ attached at GPIO lines. You will need a custom device tree file to
+ specify the GPIO line to use.
+endef
+
+$(eval $(call KernelPackage,iio-dht11))
+
+
+define KernelPackage/lp
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Parallel port and line printer support
+  DEPENDS:=@BROKEN
+  KCONFIG:= \
+	CONFIG_PARPORT \
+	CONFIG_PRINTER \
+	CONFIG_PPDEV
+  FILES:= \
+	$(LINUX_DIR)/drivers/parport/parport.ko \
+	$(LINUX_DIR)/drivers/char/lp.ko \
+	$(LINUX_DIR)/drivers/char/ppdev.ko
+  AUTOLOAD:=$(call AutoLoad,50,parport lp)
+endef
+
+$(eval $(call KernelPackage,lp))
+
+
+define KernelPackage/mmc
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=MMC/SD Card Support
+  KCONFIG:= \
+	CONFIG_MMC \
+	CONFIG_MMC_BLOCK \
+	CONFIG_MMC_DEBUG=n \
+	CONFIG_MMC_UNSAFE_RESUME=n \
+	CONFIG_MMC_BLOCK_BOUNCE=y \
+	CONFIG_MMC_TIFM_SD=n \
+	CONFIG_MMC_WBSD=n \
+	CONFIG_SDIO_UART=n
+  FILES:= \
+	$(LINUX_DIR)/drivers/mmc/core/mmc_core.ko \
+	$(LINUX_DIR)/drivers/mmc/card/mmc_block.ko
+  AUTOLOAD:=$(call AutoProbe,mmc_core mmc_block,1)
+endef
+
+define KernelPackage/mmc/description
+ Kernel support for MMC/SD cards
+endef
+
+$(eval $(call KernelPackage,mmc))
+
+
+define KernelPackage/sdhci
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Secure Digital Host Controller Interface support
+  DEPENDS:=+kmod-mmc
+  KCONFIG:= \
+	CONFIG_MMC_SDHCI \
+	CONFIG_MMC_SDHCI_PLTFM \
+	CONFIG_MMC_SDHCI_PCI=n
+  FILES:= \
+	$(LINUX_DIR)/drivers/mmc/host/sdhci.ko \
+	$(LINUX_DIR)/drivers/mmc/host/sdhci-pltfm.ko
+
+  AUTOLOAD:=$(call AutoProbe,sdhci sdhci-pltfm,1)
+endef
+
+define KernelPackage/sdhci/description
+ Kernel support for SDHCI Hosts
+endef
+
+$(eval $(call KernelPackage,sdhci))
+
+
+define KernelPackage/oprofile
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=OProfile profiling support
+  KCONFIG:=CONFIG_OPROFILE
+  FILES:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/oprofile/oprofile.ko
+  DEPENDS:=@KERNEL_PROFILING
+endef
+
+define KernelPackage/oprofile/description
+ Kernel module for support for oprofile system profiling
+endef
+
+$(eval $(call KernelPackage,oprofile))
+
+
+define KernelPackage/rfkill
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RF switch subsystem support
+  DEPENDS:=@USE_RFKILL +kmod-input-core
+  KCONFIG:= \
+    CONFIG_RFKILL \
+    CONFIG_RFKILL_INPUT=y \
+    CONFIG_RFKILL_LEDS=y \
+    CONFIG_RFKILL_GPIO=y
+  FILES:= \
+    $(LINUX_DIR)/net/rfkill/rfkill.ko
+  AUTOLOAD:=$(call AutoLoad,20,rfkill)
+endef
+
+define KernelPackage/rfkill/description
+ Say Y here if you want to have control over RF switches
+ found on many WiFi and Bluetooth cards
+endef
+
+$(eval $(call KernelPackage,rfkill))
+
+
+define KernelPackage/softdog
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Software watchdog driver
+  KCONFIG:=CONFIG_SOFT_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.ko
+  AUTOLOAD:=$(call AutoLoad,50,softdog)
+endef
+
+define KernelPackage/softdog/description
+ Software watchdog driver
+endef
+
+$(eval $(call KernelPackage,softdog))
+
+
+define KernelPackage/wdt-omap
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=OMAP Watchdog timer
+  DEPENDS:=@(TARGET_omap24xx||TARGET_omap35xx)
+  KCONFIG:=CONFIG_OMAP_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/omap_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,omap_wdt.ko)
+endef
+
+define KernelPackage/wdt-omap/description
+ Kernel module for TI omap watchdog timer
+endef
+
+$(eval $(call KernelPackage,wdt-omap))
+
+
+define KernelPackage/wdt-orion
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Marvell Orion Watchdog timer
+  DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu
+  KCONFIG:=CONFIG_ORION_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/orion_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,orion_wdt)
+endef
+
+define KernelPackage/wdt-orion/description
+ Kernel module for Marvell Orion, Kirkwood and Armada XP/370 watchdog timer
+endef
+
+$(eval $(call KernelPackage,wdt-orion))
+
+
+define KernelPackage/booke-wdt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PowerPC Book-E Watchdog Timer
+  DEPENDS:=@(TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x)
+  KCONFIG:=CONFIG_BOOKE_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,booke_wdt)
+endef
+
+define KernelPackage/booke-wdt/description
+ Kernel module for PowerPC Book-E Watchdog Timer
+endef
+
+$(eval $(call KernelPackage,booke-wdt))
+
+
+define KernelPackage/pwm
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PWM generic API
+  KCONFIG:=CONFIG_GENERIC_PWM
+  FILES:=$(LINUX_DIR)/drivers/pwm/pwm.ko
+endef
+
+define KernelPackage/pwm/description
+ Kernel module that implement a generic PWM API
+endef
+
+$(eval $(call KernelPackage,pwm))
+
+
+define KernelPackage/rtc-ds1307
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Dallas/Maxim DS1307 (and compatible) RTC support
+  $(call AddDepends/rtc)
+  DEPENDS+=+kmod-i2c-core
+  KCONFIG:=CONFIG_RTC_DRV_DS1307
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-ds1307.ko
+  AUTOLOAD:=$(call AutoProbe,rtc-ds1307)
+endef
+
+define KernelPackage/rtc-ds1307/description
+ Kernel module for Dallas/Maxim DS1307/DS1337/DS1338/DS1340/DS1388/DS3231,
+ Epson RX-8025 and various other compatible RTC chips connected via I2C.
+endef
+
+$(eval $(call KernelPackage,rtc-ds1307))
+
+
+define KernelPackage/rtc-ds1672
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Dallas/Maxim DS1672 RTC support
+  $(call AddDepends/rtc)
+  DEPENDS+=+kmod-i2c-core
+  KCONFIG:=CONFIG_RTC_DRV_DS1672
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-ds1672.ko
+  AUTOLOAD:=$(call AutoProbe,rtc-ds1672)
+endef
+
+define KernelPackage/rtc-ds1672/description
+ Kernel module for Dallas/Maxim DS1672 RTC.
+endef
+
+$(eval $(call KernelPackage,rtc-ds1672))
+
+
+define KernelPackage/rtc-isl1208
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Intersil ISL1208 RTC support
+  $(call AddDepends/rtc)
+  DEPENDS+=+kmod-i2c-core
+  KCONFIG:=CONFIG_RTC_DRV_ISL1208
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-isl1208.ko
+  AUTOLOAD:=$(call AutoProbe,rtc-isl1208)
+endef
+
+define KernelPackage/rtc-isl1208/description
+ Kernel module for Intersil ISL1208 RTC.
+endef
+
+$(eval $(call KernelPackage,rtc-isl1208))
+
+
+define KernelPackage/rtc-marvell
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Marvell SoC built-in RTC support
+  $(call AddDepends/rtc)
+  DEPENDS+=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu
+  KCONFIG:=CONFIG_RTC_DRV_MV
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-mv.ko
+  AUTOLOAD:=$(call AutoProbe,rtc-mv)
+endef
+
+define KernelPackage/rtc-marvell/description
+ Kernel module for Marvell SoC built-in RTC.
+endef
+
+$(eval $(call KernelPackage,rtc-marvell))
+
+define KernelPackage/rtc-pcf8563
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Philips PCF8563/Epson RTC8564 RTC support
+  $(call AddDepends/rtc,+kmod-i2c-core)
+  KCONFIG:=CONFIG_RTC_DRV_PCF8563
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf8563.ko
+  AUTOLOAD:=$(call AutoProbe,rtc-pcf8563)
+endef
+
+define KernelPackage/rtc-pcf8563/description
+ Kernel module for Philips PCF8563 RTC chip.
+ The Epson RTC8564 should work as well.
+endef
+
+$(eval $(call KernelPackage,rtc-pcf8563))
+
+
+define KernelPackage/rtc-pcf2123
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Philips PCF2123 RTC support
+  $(call AddDepends/rtc)
+  KCONFIG:=CONFIG_RTC_DRV_PCF2123
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf2123.ko
+  AUTOLOAD:=$(call AutoProbe,rtc-pcf2123)
+endef
+
+define KernelPackage/rtc-pcf2123/description
+ Kernel module for Philips PCF2123 RTC chip
+endef
+
+$(eval $(call KernelPackage,rtc-pcf2123))
+
+define KernelPackage/rtc-pt7c4338
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Pericom PT7C4338 RTC support
+  $(call AddDepends/rtc,+kmod-i2c-core)
+  KCONFIG:=CONFIG_RTC_DRV_PT7C4338
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pt7c4338.ko
+  AUTOLOAD:=$(call AutoProbe,rtc-pt7c4338)
+endef
+
+define KernelPackage/rtc-pt7c4338/description
+ Kernel module for Pericom PT7C4338 i2c RTC chip
+endef
+
+$(eval $(call KernelPackage,rtc-pt7c4338))
+
+
+define KernelPackage/mtdtests
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=MTD subsystem tests
+  KCONFIG:=CONFIG_MTD_TESTS
+  DEPENDS:=+kmod-nand
+  FILES:=\
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_nandecctest.ko \
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_oobtest.ko \
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_pagetest.ko \
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_readtest.ko \
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_speedtest.ko \
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_stresstest.ko \
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_subpagetest.ko \
+	$(LINUX_DIR)/drivers/mtd/tests/mtd_torturetest.ko
+endef
+
+define KernelPackage/mtdtests/description
+ Kernel modules for MTD subsystem/driver testing
+endef
+
+$(eval $(call KernelPackage,mtdtests))
+
+
+define KernelPackage/nand
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=NAND flash support
+  KCONFIG:=CONFIG_MTD_NAND \
+	CONFIG_MTD_NAND_IDS \
+	CONFIG_MTD_NAND_ECC
+  FILES:= \
+	$(LINUX_DIR)/drivers/mtd/nand/nand_ids.ko \
+	$(LINUX_DIR)/drivers/mtd/nand/nand_ecc.ko \
+	$(LINUX_DIR)/drivers/mtd/nand/nand.ko
+  AUTOLOAD:=$(call AutoLoad,20,nand_ids nand_ecc nand)
+endef
+
+define KernelPackage/nand/description
+ Kernel module for NAND support
+endef
+
+$(eval $(call KernelPackage,nand))
+
+
+define KernelPackage/nandsim
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=NAND simulator
+  DEPENDS:=+kmod-nand
+  KCONFIG:=CONFIG_MTD_NAND_NANDSIM
+  FILES:=$(LINUX_DIR)/drivers/mtd/nand/nandsim.ko
+endef
+
+define KernelPackage/nandsim/description
+ Kernel module for NAND flash simulation.
+endef
+
+$(eval $(call KernelPackage,nandsim))
+
+define KernelPackage/serial-8250
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=8250 UARTs
+  KCONFIG:= CONFIG_SERIAL_8250 \
+	CONFIG_SERIAL_8250_NR_UARTS=16 \
+  	CONFIG_SERIAL_8250_RUNTIME_UARTS=16 \
+  	CONFIG_SERIAL_8250_EXTENDED=y \
+  	CONFIG_SERIAL_8250_MANY_PORTS=y \
+	CONFIG_SERIAL_8250_SHARE_IRQ=y \
+	CONFIG_SERIAL_8250_DETECT_IRQ=n \
+	CONFIG_SERIAL_8250_RSA=n
+  FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(call kernel_patchver_ge,3.7),$(if $(call kernel_patchver_le,3.8),_core)).ko
+endef
+
+define KernelPackage/serial-8250/description
+ Kernel module for 8250 UART based serial ports
+endef
+
+$(eval $(call KernelPackage,serial-8250))
+
+
+define KernelPackage/regmap
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Generic register map support
+  DEPENDS:=+kmod-lib-lzo +kmod-i2c-core
+  KCONFIG:=CONFIG_REGMAP \
+	   CONFIG_REGMAP_SPI \
+	   CONFIG_REGMAP_I2C \
+	   CONFIG_SPI=y
+  FILES:= \
+	$(LINUX_DIR)/drivers/base/regmap/regmap-core.ko \
+	$(LINUX_DIR)/drivers/base/regmap/regmap-i2c.ko \
+	$(if $(CONFIG_SPI),$(LINUX_DIR)/drivers/base/regmap/regmap-spi.ko)
+  AUTOLOAD:=$(call AutoLoad,21,regmap-core regmap-i2c regmap-spi)
+endef
+
+define KernelPackage/regmap/description
+ Generic register map support
+endef
+
+$(eval $(call KernelPackage,regmap))
+
+define KernelPackage/ikconfig
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Kernel configuration via /proc/config.gz
+  KCONFIG:=CONFIG_IKCONFIG \
+	   CONFIG_IKCONFIG_PROC=y
+  FILES:=$(LINUX_DIR)/kernel/configs.ko
+  AUTOLOAD:=$(call AutoLoad,70,configs)
+endef
+
+define KernelPackage/ikconfig/description
+ Kernel configuration via /proc/config.gz
+endef
+
+$(eval $(call KernelPackage,ikconfig))
+
+
+define KernelPackage/zram
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=ZRAM
+  DEPENDS:=@!LINUX_3_3 +kmod-lib-lzo
+  KCONFIG:= \
+	CONFIG_ZSMALLOC \
+	CONFIG_ZRAM \
+	CONFIG_ZRAM_DEBUG=n \
+	CONFIG_PGTABLE_MAPPING=n \
+	CONFIG_ZRAM_LZ4_COMPRESS=y
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1)
+  FILES:=\
+	$(LINUX_DIR)/mm/zsmalloc.ko \
+	$(LINUX_DIR)/drivers/block/zram/zram.ko
+else
+  FILES:= \
+	$(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \
+	$(LINUX_DIR)/drivers/staging/zram/zram.ko
+endif
+  AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram)
+endef
+
+define KernelPackage/zram/description
+ Compressed RAM block device support
+endef
+
+$(eval $(call KernelPackage,zram))
+
+
+define KernelPackage/mvsdio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Marvell SDIO support
+  DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu +kmod-mmc
+  KCONFIG:=CONFIG_MMC_MVSDIO
+  FILES:=$(LINUX_DIR)/drivers/mmc/host/mvsdio.ko
+  AUTOLOAD:=$(call AutoProbe,mvsdio)
+endef
+
+define KernelPackage/mvsdio/description
+ Kernel support for the Marvell SDIO controller
+endef
+
+$(eval $(call KernelPackage,mvsdio))
+
+
+define KernelPackage/pps
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PPS support
+  KCONFIG:=CONFIG_PPS
+  FILES:=$(LINUX_DIR)/drivers/pps/pps_core.ko
+  AUTOLOAD:=$(call AutoLoad,17,pps_core,1)
+endef
+
+define KernelPackage/pps/description
+ PPS (Pulse Per Second) is a special pulse provided by some GPS
+ antennae. Userland can use it to get a high-precision time
+ reference.
+endef
+
+$(eval $(call KernelPackage,pps))
+
+
+define KernelPackage/pps-gpio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PPS client using GPIO
+  DEPENDS:=+kmod-pps
+  KCONFIG:=CONFIG_PPS_CLIENT_GPIO
+  FILES:=$(LINUX_DIR)/drivers/pps/clients/pps-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,18,pps-gpio,1)
+endef
+
+define KernelPackage/pps-gpio/description
+ Support for a PPS source using GPIO. To be useful you must
+ also register a platform device specifying the GPIO pin and
+ other options, usually in your board setup.
+endef
+
+$(eval $(call KernelPackage,pps-gpio))
+
+
+define KernelPackage/ptp
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PTP clock support
+  DEPENDS:=+kmod-pps
+  KCONFIG:=CONFIG_PTP_1588_CLOCK
+  FILES:=$(LINUX_DIR)/drivers/ptp/ptp.ko
+  AUTOLOAD:=$(call AutoLoad,18,ptp,1)
+endef
+
+define KernelPackage/ptp/description
+ The IEEE 1588 standard defines a method to precisely
+ synchronize distributed clocks over Ethernet networks.
+endef
+
+$(eval $(call KernelPackage,ptp))
+
+
+define KernelPackage/ptp-gianfar
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Freescale Gianfar PTP support
+  DEPENDS:=@TARGET_mpc85xx +kmod-gianfar +kmod-ptp
+  KCONFIG:=CONFIG_PTP_1588_CLOCK_GIANFAR
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_ptp.ko
+  AUTOLOAD:=$(call AutoProbe,gianfar_ptp)
+endef
+
+define KernelPackage/ptp-gianfar/description
+ Kernel module for IEEE 1588 support for Freescale
+ Gianfar Ethernet drivers
+endef
+
+$(eval $(call KernelPackage,ptp-gianfar))
+
+
+define KernelPackage/random-core
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Hardware Random Number Generator Core support
+  KCONFIG:=CONFIG_HW_RANDOM
+  FILES:=$(LINUX_DIR)/drivers/char/hw_random/rng-core.ko
+endef
+
+define KernelPackage/random-core/description
+ Kernel module for the HW random number generator core infrastructure
+endef
+
+$(eval $(call KernelPackage,random-core))
+
+
+define KernelPackage/thermal
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Generic Thermal sysfs driver
+  DEPENDS:=+kmod-hwmon-core
+  HIDDEN:=1
+  KCONFIG:= \
+	CONFIG_THERMAL \
+	CONFIG_THERMAL_OF=y \
+	CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y \
+	CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE=n \
+	CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=n \
+	CONFIG_THERMAL_GOV_FAIR_SHARE=n \
+	CONFIG_THERMAL_GOV_STEP_WISE=y \
+	CONFIG_THERMAL_GOV_USER_SPACE=n \
+	CONFIG_THERMAL_HWMON=y \
+	CONFIG_THERMAL_EMULATION=n
+  FILES:=$(LINUX_DIR)/drivers/thermal/thermal_sys.ko
+  AUTOLOAD:=$(call AutoProbe,thermal_sys)
+endef
+
+define KernelPackage/thermal/description
+ Generic Thermal Sysfs driver offers a generic mechanism for thermal
+ management. Usually it's made up of one or more thermal zone and cooling
+ device.
+endef
+
+$(eval $(call KernelPackage,thermal))
+
+
+define KernelPackage/thermal-armada
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Armada 370/XP thermal management
+  DEPENDS:=@TARGET_mvebu +kmod-thermal
+  KCONFIG:=CONFIG_ARMADA_THERMAL
+  FILES:=$(LINUX_DIR)/drivers/thermal/armada_thermal.ko
+  AUTOLOAD:=$(call AutoProbe,armada_thermal)
+endef
+
+define KernelPackage/thermal-armada/description
+ Enable this module if you want to have support for thermal management
+ controller present in Armada 370 and Armada XP SoC.
+endef
+
+$(eval $(call KernelPackage,thermal-armada))
+
+
+define KernelPackage/thermal-imx
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Temperature sensor driver for Freescale i.MX SoCs
+  DEPENDS:=@TARGET_imx6 +kmod-thermal
+  KCONFIG:= \
+	CONFIG_CPU_THERMAL=y \
+	CONFIG_IMX_THERMAL
+  FILES:=$(LINUX_DIR)/drivers/thermal/imx_thermal.ko
+  AUTOLOAD:=$(call AutoProbe,imx_thermal)
+endef
+
+define KernelPackage/thermal-imx/description
+ Support for Temperature Monitor (TEMPMON) found on Freescale i.MX SoCs.
+ It supports one critical trip point and one passive trip point. The
+ cpufreq is used as the cooling device to throttle CPUs when the
+ passive trip is crossed.
+endef
+
+$(eval $(call KernelPackage,thermal-imx))
+
+
+define KernelPackage/thermal-kirkwood
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Temperature sensor on Marvell Kirkwood SoCs
+  DEPENDS:=@TARGET_kirkwood +kmod-thermal
+  KCONFIG:=CONFIG_KIRKWOOD_THERMAL
+  FILES:=$(LINUX_DIR)/drivers/thermal/kirkwood_thermal.ko
+  AUTOLOAD:=$(call AutoProbe,kirkwood_thermal)
+endef
+
+define KernelPackage/thermal-kirkwood/description
+ Support for the Kirkwood thermal sensor driver into the Linux thermal
+ framework. Only kirkwood 88F6282 and 88F6283 have this sensor.
+endef
+
+$(eval $(call KernelPackage,thermal-kirkwood))
+
+
+define KernelPackage/gpio-beeper
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=GPIO beeper support
+  KCONFIG:= \
+	CONFIG_INPUT_MISC=y \
+	CONFIG_INPUT_GPIO_BEEPER
+  FILES:= \
+	$(LINUX_DIR)/drivers/input/misc/gpio-beeper.ko
+  AUTOLOAD:=$(call AutoLoad,50,gpio-beeper)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/gpio-beeper/description
+ This enables playing beeps through an GPIO-connected buzzer
+endef
+
+$(eval $(call KernelPackage,gpio-beeper))
diff --git a/trunk/package/kernel/linux/modules/pcmcia.mk b/trunk/package/kernel/linux/modules/pcmcia.mk
new file mode 100644
index 00000000..51668fac
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/pcmcia.mk
@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+PCMCIA_MENU:=PCMCIA support
+
+define KernelPackage/pcmcia-core
+  SUBMENU:=$(PCMCIA_MENU)
+  TITLE:=PCMCIA/CardBus support
+  DEPENDS:=@PCMCIA_SUPPORT
+  KCONFIG:= \
+	CONFIG_PCMCIA \
+	CONFIG_CARDBUS \
+	CONFIG_PCCARD \
+	PCMCIA_DEBUG=n
+  FILES:= \
+	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \
+	$(LINUX_DIR)/drivers/pcmcia/pcmcia.ko
+  AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia)
+endef
+
+define KernelPackage/pcmcia-core/description
+ Kernel support for PCMCIA/CardBus controllers
+endef
+
+$(eval $(call KernelPackage,pcmcia-core))
+
+define KernelPackage/pcmcia-rsrc
+  SUBMENU:=$(PCMCIA_MENU)
+  TITLE:=PCMCIA resource support
+  DEPENDS:=kmod-pcmcia-core
+  KCONFIG:=CONFIG_PCCARD_NONSTATIC=y
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko
+  AUTOLOAD:=$(call AutoLoad,26,pcmcia_rsrc)
+endef
+
+define KernelPackage/pcmcia-rsrc/description
+ Kernel support for PCMCIA resource allocation
+endef
+
+$(eval $(call KernelPackage,pcmcia-rsrc))
+
+
+define KernelPackage/pcmcia-yenta
+  SUBMENU:=$(PCMCIA_MENU)
+  TITLE:=yenta socket driver
+  DEPENDS:=kmod-pcmcia-rsrc
+  KCONFIG:=CONFIG_YENTA
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
+  AUTOLOAD:=$(call AutoLoad,41,pcmcia_rsrc yenta_socket)
+endef
+
+$(eval $(call KernelPackage,pcmcia-yenta))
+
+
+define KernelPackage/pcmcia-serial
+  SUBMENU:=$(PCMCIA_MENU)
+  TITLE:=Serial devices support
+  DEPENDS:=kmod-pcmcia-core +kmod-serial-8250
+  KCONFIG:= \
+	CONFIG_PCMCIA_SERIAL_CS \
+	CONFIG_SERIAL_8250_CS
+    FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/serial_cs.ko
+  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
+endef
+
+define KernelPackage/pcmcia-serial/description
+ Kernel support for PCMCIA/CardBus serial devices
+endef
+
+$(eval $(call KernelPackage,pcmcia-serial))
diff --git a/trunk/package/kernel/linux/modules/sound.mk b/trunk/package/kernel/linux/modules/sound.mk
new file mode 100644
index 00000000..be016381
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/sound.mk
@@ -0,0 +1,288 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+SOUND_MENU:=Sound Support
+
+# allow targets to override the soundcore stuff
+SOUNDCORE_LOAD ?= \
+	soundcore \
+	snd \
+	snd-hwdep \
+	snd-seq-device \
+	snd-rawmidi \
+	snd-timer \
+	snd-pcm \
+	snd-mixer-oss \
+	snd-pcm-oss
+
+SOUNDCORE_FILES ?= \
+	$(LINUX_DIR)/sound/soundcore.ko \
+	$(LINUX_DIR)/sound/core/snd.ko \
+	$(LINUX_DIR)/sound/core/snd-hwdep.ko \
+	$(LINUX_DIR)/sound/core/seq/snd-seq-device.ko \
+	$(LINUX_DIR)/sound/core/snd-rawmidi.ko \
+	$(LINUX_DIR)/sound/core/snd-timer.ko \
+	$(LINUX_DIR)/sound/core/snd-pcm.ko \
+	$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
+	$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3.0)),1)
+SOUNDCORE_LOAD += \
+	snd-compress
+
+SOUNDCORE_FILES += \
+	$(LINUX_DIR)/sound/core/snd-compress.ko
+endif
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.12.0)),1)
+SOUNDCORE_LOAD += \
+	$(if $(CONFIG_SND_DMAENGINE_PCM),snd-pcm-dmaengine)
+
+SOUNDCORE_FILES += \
+	$(if $(CONFIG_SND_DMAENGINE_PCM),$(LINUX_DIR)/sound/core/snd-pcm-dmaengine.ko)
+endif
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.14.0)),1)
+SOUNDCORE_LOAD += \
+	snd-page-alloc
+
+SOUNDCORE_FILES += \
+	$(LINUX_DIR)/sound/core/snd-page-alloc.ko
+endif
+
+define KernelPackage/sound-core
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=Sound support
+  DEPENDS:=@AUDIO_SUPPORT
+  KCONFIG:= \
+	CONFIG_SOUND \
+	CONFIG_SND \
+	CONFIG_SND_HWDEP \
+	CONFIG_SND_RAWMIDI \
+	CONFIG_SND_TIMER \
+	CONFIG_SND_PCM \
+	CONFIG_SND_SEQUENCER \
+	CONFIG_SND_VIRMIDI \
+	CONFIG_SND_SEQ_DUMMY \
+	CONFIG_SND_SEQUENCER_OSS=y \
+	CONFIG_HOSTAUDIO \
+	CONFIG_SND_PCM_OSS \
+	CONFIG_SND_MIXER_OSS \
+	CONFIG_SOUND_OSS_CORE_PRECLAIM=y \
+	CONFIG_SND_COMPRESS_OFFLOAD
+  FILES:=$(SOUNDCORE_FILES)
+  AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/sound-core/uml
+  FILES:= \
+	$(LINUX_DIR)/sound/soundcore.ko \
+	$(LINUX_DIR)/arch/um/drivers/hostaudio.ko
+  AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
+endef
+
+define KernelPackage/sound-core/description
+ Kernel modules for sound support
+endef
+
+$(eval $(call KernelPackage,sound-core))
+
+
+define AddDepends/sound
+  SUBMENU:=$(SOUND_MENU)
+  DEPENDS+=kmod-sound-core $(1) @!TARGET_uml
+endef
+
+
+define KernelPackage/ac97
+  TITLE:=ac97 controller
+  KCONFIG:=CONFIG_SND_AC97_CODEC
+  FILES:= \
+	$(LINUX_DIR)/sound/ac97_bus.ko \
+	$(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko
+  AUTOLOAD:=$(call AutoLoad,35,ac97_bus snd-ac97-codec)
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/ac97/description
+ The ac97 controller
+endef
+
+$(eval $(call KernelPackage,ac97))
+
+
+define KernelPackage/sound-seq
+  TITLE:=Sequencer support
+  FILES:= \
+	$(LINUX_DIR)/sound/core/seq/snd-seq.ko \
+	$(LINUX_DIR)/sound/core/seq/snd-seq-midi-event.ko \
+	$(LINUX_DIR)/sound/core/seq/snd-seq-midi.ko
+  AUTOLOAD:=$(call AutoLoad,35,snd-seq snd-seq-midi-event snd-seq-midi)
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/sound-seq/description
+ Kernel modules for sequencer support
+endef
+
+$(eval $(call KernelPackage,sound-seq))
+
+
+define KernelPackage/sound-i8x0
+  TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller
+  DEPENDS:=+kmod-ac97
+  KCONFIG:=CONFIG_SND_INTEL8X0
+  FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.ko
+  AUTOLOAD:=$(call AutoLoad,36,snd-intel8x0)
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/sound-i8x0/description
+ support for the integrated AC97 sound device on motherboards
+ with Intel/SiS/nVidia/AMD chipsets, or ALi chipsets using
+ the M5455 Audio Controller.
+endef
+
+$(eval $(call KernelPackage,sound-i8x0))
+
+
+define KernelPackage/sound-cs5535audio
+  TITLE:=CS5535 PCI Controller
+  DEPENDS:=+kmod-ac97
+  KCONFIG:=CONFIG_SND_CS5535AUDIO
+  FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko
+  AUTOLOAD:=$(call AutoLoad,36,snd-cs5535audio)
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/sound-cs5535audio/description
+ Support for the integrated AC97 sound device on olpc
+endef
+
+$(eval $(call KernelPackage,sound-cs5535audio))
+
+
+define KernelPackage/sound-soc-core
+  TITLE:=SoC sound support
+  DEPENDS:=+kmod-regmap +kmod-ac97
+  KCONFIG:= \
+	CONFIG_SND_SOC \
+	CONFIG_SND_SOC_DMAENGINE_PCM=y \
+	CONFIG_SND_SOC_ALL_CODECS=n
+  FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko
+  AUTOLOAD:=$(call AutoLoad,55, snd-soc-core)
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-core))
+
+
+define KernelPackage/sound-soc-ac97
+  TITLE:=AC97 Codec support
+  KCONFIG:=CONFIG_SND_SOC_AC97_CODEC
+  FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-ac97.ko
+  AUTOLOAD:=$(call AutoLoad,57,snd-soc-ac97)
+  DEPENDS:=+kmod-ac97 +kmod-sound-soc-core +TARGET_ep93xx:kmod-sound-soc-ep93xx-ac97
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-ac97))
+
+
+define KernelPackage/sound-soc-imx
+  TITLE:=IMX SoC support
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1)
+  KCONFIG:=\
+	CONFIG_SND_IMX_SOC \
+	CONFIG_SND_SOC_IMX_AUDMUX \
+	CONFIG_SND_SOC_FSL_SSI \
+	CONFIG_SND_SOC_IMX_PCM
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-audmux.ko \
+	$(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \
+	$(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-pcm.ko
+  AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm)
+else
+  KCONFIG:=\
+	CONFIG_SND_IMX_SOC \
+	CONFIG_SND_SOC_IMX_AUDMUX \
+	CONFIG_SND_SOC_FSL_SSI \
+	CONFIG_SND_SOC_IMX_PCM_DMA
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-audmux.ko \
+	$(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \
+	$(LINUX_DIR)/sound/soc/fsl/imx-pcm-dma.ko
+  AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm)
+endif
+  DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/sound-soc-imx/description
+ Support for i.MX6 Platform sound (ssi/audmux/pcm)
+endef
+
+$(eval $(call KernelPackage,sound-soc-imx))
+
+
+define KernelPackage/sound-soc-imx-sgtl5000
+  TITLE:=IMX SoC support for SGTL5000
+  KCONFIG:=CONFIG_SND_SOC_IMX_SGTL5000
+  FILES:=\
+	$(LINUX_DIR)/sound/soc/codecs/snd-soc-sgtl5000.ko \
+	$(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-sgtl5000.ko
+  AUTOLOAD:=$(call AutoLoad,57,snd-soc-sgtl5000 snd-soc-imx-sgtl5000)
+  DEPENDS:=@TARGET_imx6 +kmod-sound-soc-imx
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/sound-soc-imx-sgtl5000/description
+ Support for i.MX6 Platform sound SGTL5000 codec
+endef
+
+$(eval $(call KernelPackage,sound-soc-imx-sgtl5000))
+
+
+define KernelPackage/sound-soc-gw_avila
+  TITLE:=Gateworks Avila SoC sound support
+  KCONFIG:= \
+	CONFIG_SND_GW_AVILA_SOC \
+	CONFIG_SND_GW_AVILA_SOC_PCM \
+	CONFIG_SND_GW_AVILA_SOC_HSS
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
+	$(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila.ko \
+	$(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-pcm.ko \
+	$(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-hss.ko
+  AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-gw-avila snd-soc-gw-avila-pcm snd-soc-gw-avila-hss)
+  DEPENDS:=@TARGET_ixp4xx +kmod-sound-soc-core
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-gw_avila))
+
+
+define KernelPackage/pcspkr
+  DEPENDS:=@TARGET_x86
+  TITLE:=PC speaker support
+  KCONFIG:= \
+	CONFIG_INPUT_PCSPKR \
+	CONFIG_SND_PCSP
+  FILES:= \
+	$(LINUX_DIR)/drivers/input/misc/pcspkr.ko \
+	$(LINUX_DIR)/sound/drivers/pcsp/snd-pcsp.ko
+  AUTOLOAD:=$(call AutoLoad,50,pcspkr snd-pcsp)
+  $(call AddDepends/input)
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/pcspkr/description
+ This enables sounds (tones) through the pc speaker
+endef
+
+$(eval $(call KernelPackage,pcspkr))
diff --git a/trunk/package/kernel/linux/modules/spi.mk b/trunk/package/kernel/linux/modules/spi.mk
new file mode 100644
index 00000000..1c2a789f
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/spi.mk
@@ -0,0 +1,91 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+SPI_MENU:=SPI Support
+
+define KernelPackage/mmc-spi
+  SUBMENU:=$(SPI_MENU)
+  TITLE:=MMC/SD over SPI Support
+  DEPENDS:=+kmod-mmc +kmod-lib-crc-itu-t +kmod-lib-crc7
+  KCONFIG:=CONFIG_MMC_SPI \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
+  FILES:=\
+	$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/mmc/host/of_mmc_spi.ko) \
+	$(LINUX_DIR)/drivers/mmc/host/mmc_spi.ko
+  AUTOLOAD:=$(call AutoProbe,$(if $(CONFIG_OF),of_mmc_spi) mmc_spi)
+endef
+
+define KernelPackage/mmc-spi/description
+ Kernel support for MMC/SD over SPI
+endef
+
+$(eval $(call KernelPackage,mmc-spi))
+
+
+define KernelPackage/spi-bitbang
+  SUBMENU:=$(SPI_MENU)
+  TITLE:=Serial Peripheral Interface bitbanging library
+  KCONFIG:=CONFIG_SPI_BITBANG \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
+  FILES:=$(LINUX_DIR)/drivers/spi/spi-bitbang.ko
+endef
+
+define KernelPackage/spi-bitbang/description
+ This package contains the SPI bitbanging library
+endef
+
+$(eval $(call KernelPackage,spi-bitbang))
+
+
+define KernelPackage/spi-gpio-old
+  SUBMENU:=$(SPI_MENU)
+  TITLE:=Old GPIO based bitbanging SPI controller (DEPRECATED)
+  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang
+  KCONFIG:=CONFIG_SPI_GPIO_OLD
+  FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.ko
+  AUTOLOAD:=$(call AutoProbe,spi_gpio_old)
+endef
+
+define KernelPackage/spi-gpio-old/description
+ This package contains the GPIO based bitbanging SPI controller driver
+endef
+
+$(eval $(call KernelPackage,spi-gpio-old))
+
+
+define KernelPackage/spi-gpio
+  SUBMENU:=$(SPI_MENU)
+  TITLE:=GPIO-based bitbanging SPI Master
+  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang
+  KCONFIG:=CONFIG_SPI_GPIO
+  FILES:=$(LINUX_DIR)/drivers/spi/spi-gpio.ko
+  AUTOLOAD:=$(call AutoProbe,spi-gpio)
+endef
+
+define KernelPackage/spi-gpio/description
+ This package contains the GPIO-based bitbanging SPI Master
+endef
+
+$(eval $(call KernelPackage,spi-gpio))
+
+define KernelPackage/spi-dev
+  SUBMENU:=$(SPI_MENU)
+  TITLE:=User mode SPI device driver
+  KCONFIG:=CONFIG_SPI_SPIDEV \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
+  FILES:=$(LINUX_DIR)/drivers/spi/spidev.ko
+  AUTOLOAD:=$(call AutoProbe,spidev)
+endef
+
+define KernelPackage/spi-dev/description
+ This package contains the user mode SPI device driver
+endef
+
+$(eval $(call KernelPackage,spi-dev))
diff --git a/trunk/package/kernel/linux/modules/usb.mk b/trunk/package/kernel/linux/modules/usb.mk
new file mode 100644
index 00000000..4644cbbe
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/usb.mk
@@ -0,0 +1,1487 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+USB_MENU:=USB Support
+
+USBNET_DIR:=net/usb
+USBHID_DIR?=hid/usbhid
+USBINPUT_DIR?=input/misc
+
+define KernelPackage/usb-core
+  SUBMENU:=$(USB_MENU)
+  TITLE:=Support for USB
+  DEPENDS:=@USB_SUPPORT
+  KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1)
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/core/usbcore.ko \
+	$(LINUX_DIR)/drivers/usb/common/usb-common.ko
+else
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/core/usbcore.ko \
+	$(LINUX_DIR)/drivers/usb/usb-common.ko
+endif
+  AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1)
+  $(call AddDepends/nls)
+endef
+
+define KernelPackage/usb-core/description
+ Kernel support for USB
+endef
+
+$(eval $(call KernelPackage,usb-core))
+
+
+define AddDepends/usb
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=+kmod-usb-core $(1)
+endef
+
+
+define KernelPackage/usb-musb-hdrc
+  TITLE:=Support for Mentor Graphics silicon dual role USB
+  KCONFIG:= \
+	CONFIG_USB_MUSB_HDRC \
+	CONFIG_USB_INVENTRA_DMA=n \
+	CONFIG_USB_TI_CPPI41_DMA=n \
+	CONFIG_MUSB_PIO_ONLY=y \
+	CONFIG_USB_MUSB_DUAL_ROLE=y \
+	CONFIG_USB_MUSB_GADGET=n \
+	CONFIG_USB_MUSB_HOST=n \
+	CONFIG_USB_MUSB_DEBUG=y
+  DEPENDS:= \
+	@(TARGET_omap||TARGET_omap24xx) +kmod-usb-gadget \
+	+TARGET_omap24xx:kmod-usb-musb-tusb6010
+  FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko
+  AUTOLOAD:=$(call AutoLoad,46,musb_hdrc)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-musb-hdrc/description
+  Kernel support for Mentor Graphics silicon dual role USB device.
+endef
+
+$(eval $(call KernelPackage,usb-musb-hdrc))
+
+
+define KernelPackage/usb-musb-platformglue
+  TITLE:=MUSB platform glue layer
+  KCONFIG:= \
+	CONFIG_USB_MUSB_TUSB6010=n \
+	CONFIG_USB_MUSB_OMAP2PLUS=n \
+	CONFIG_USB_MUSB_AM35X=n \
+	CONFIG_USB_MUSB_DSPS \
+	CONFIG_USB_MUSB_UX500=n
+  DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-musb-hdrc +kmod-usb-phy-am335x
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/musb/musb_dsps.ko \
+	$(LINUX_DIR)/drivers/usb/musb/musb_am335x.ko
+  AUTOLOAD:=$(call AutoLoad,45,phy-omap-control musb_dsps musb_am335x)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-musb-platformglue/description
+  MUSB platform glue modules
+endef
+
+$(eval $(call KernelPackage,usb-musb-platformglue))
+
+
+define KernelPackage/usb-musb-tusb6010
+  TITLE:=Support for TUSB 6010
+  KCONFIG:=CONFIG_USB_MUSB_TUSB6010
+  DEPENDS:=@TARGET_omap24xx
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-musb-tusb6010/description
+  TUSB6010 support
+endef
+
+$(eval $(call KernelPackage,usb-musb-tusb6010))
+
+
+define KernelPackage/usb-phy-nop
+  TITLE:=Support for USB NOP transceiver
+  KCONFIG:=CONFIG_NOP_USB_XCEIV
+  HIDDEN:=1
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-generic.ko),)
+  FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-generic.ko
+  AUTOLOAD:=$(call AutoLoad,43,phy-generic)
+else
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-nop.ko),)
+  FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-nop.ko
+  AUTOLOAD:=$(call AutoLoad,43,phy-nop)
+else
+  FILES:=$(LINUX_DIR)/drivers/usb/otg/nop-usb-xceiv.ko
+  AUTOLOAD:=$(call AutoLoad,43,nop-usb-xceiv)
+endif
+endif
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-phy-nop/description
+  Support for USB NOP transceiver
+endef
+
+$(eval $(call KernelPackage,usb-phy-nop))
+
+
+define KernelPackage/usb-phy-am335x
+  TITLE:=Support for AM335x USB PHY
+  KCONFIG:= \
+	CONFIG_AM335X_PHY_USB \
+	CONFIG_AM335X_CONTROL_USB
+  DEPENDS:=@TARGET_omap +kmod-usb-phy-nop
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/phy/phy-am335x.ko \
+	$(LINUX_DIR)/drivers/usb/phy/phy-am335x-control.ko
+  AUTOLOAD:=$(call AutoLoad,44,phy-am335x)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-phy-am335x/description
+  Support for AM335x USB PHY
+endef
+
+$(eval $(call KernelPackage,usb-phy-am335x))
+
+
+define KernelPackage/usb-phy-omap-usb2
+  TITLE:=Support for OMAP2 USB PHY
+  KCONFIG:= \
+	CONFIG_OMAP_USB2 \
+	CONFIG_OMAP_CONTROL_USB
+  DEPENDS:=@TARGET_omap
+  FILES:= \
+	$(LINUX_DIR)/drivers/phy/phy-omap-usb2.ko \
+	$(LINUX_DIR)/drivers/usb/phy/phy-omap-control.ko
+  AUTOLOAD:=$(call AutoLoad,45,phy-omap-control phy-omap-usb2)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-phy-omap-usb2/description
+  Support for AM335x USB PHY
+endef
+
+$(eval $(call KernelPackage,usb-phy-omap-usb2))
+
+
+define KernelPackage/usb-phy-omap-usb3
+  TITLE:=Support for OMAP USB3 PHY
+  KCONFIG:=CONFIG_OMAP_USB3
+  DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2
+  FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-omap-usb3.ko
+  AUTOLOAD:=$(call AutoLoad,45,phy-omap-usb3)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-phy-omap-usb3/description
+  Support for OMAP USB3 PHY
+endef
+
+$(eval $(call KernelPackage,usb-phy-omap-usb3))
+
+
+define KernelPackage/usb-phy-twl4030
+  TITLE:=Support for TWL4030 OTG PHY
+  KCONFIG:=CONFIG_TWL4030_USB
+  DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2 +kmod-usb-musb-hdrc
+  FILES:=$(LINUX_DIR)/drivers/phy/phy-twl4030-usb.ko
+  AUTOLOAD:=$(call AutoLoad,45,phy-twl4030-usb)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-phy-twl4030/description
+  Support for TWL4030/TWL5030/TPS659x0 OTG PHY
+endef
+
+$(eval $(call KernelPackage,usb-phy-twl4030))
+
+
+define KernelPackage/usb-phy-twl6030
+  TITLE:=Support for TWL6030 OTG PHY
+  KCONFIG:=CONFIG_TWL6030_USB
+  DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2 +kmod-usb-musb-hdrc
+  FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-twl6030-usb.ko
+  AUTOLOAD:=$(call AutoLoad,45,phy-twl6030-usb)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-phy-twl6030/description
+  Support for TWL6030 OTG PHY
+endef
+
+$(eval $(call KernelPackage,usb-phy-twl6030))
+
+
+define KernelPackage/usb-gadget
+  TITLE:=USB Gadget support
+  KCONFIG:=CONFIG_USB_GADGET
+  FILES:=$(LINUX_DIR)/drivers/usb/gadget/udc-core.ko
+  AUTOLOAD:=$(call AutoLoad,45,udc-core)
+  DEPENDS:=@USB_GADGET_SUPPORT
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-gadget/description
+ Kernel support for USB Gadget mode
+endef
+
+$(eval $(call KernelPackage,usb-gadget))
+
+define KernelPackage/usb-lib-composite
+  TITLE:=USB lib composite
+  KCONFIG:=CONFIG_USB_LIBCOMPOSITE
+  DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs @!LINUX_3_3 @!LINUX_3_6
+  FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko
+  AUTOLOAD:=$(call AutoLoad,50,libcomposite)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-lib-composite/description
+ Lib Composite
+endef
+
+$(eval $(call KernelPackage,usb-lib-composite))
+
+
+define KernelPackage/usb-eth-gadget
+  TITLE:=USB Ethernet Gadget support
+  KCONFIG:= \
+	CONFIG_USB_ETH \
+	CONFIG_USB_ETH_RNDIS=y \
+	CONFIG_USB_ETH_EEM=n
+  DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),)
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
+  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko),)
+    FILES+=$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
+else
+  FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
+  AUTOLOAD:=$(call AutoLoad,52,g_ether)
+endif
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-eth-gadget/description
+ Kernel support for USB Ethernet Gadget
+endef
+
+$(eval $(call KernelPackage,usb-eth-gadget))
+
+
+define KernelPackage/usb-serial-gadget
+  TITLE:=USB Serial Gadget support
+  KCONFIG:=CONFIG_USB_G_SERIAL
+  DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko),)
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/gadget/u_serial.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko
+  AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial)
+else
+  FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko
+  AUTOLOAD:=$(call AutoLoad,52,g_serial)
+endif
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-serial-gadget/description
+  Kernel support for USB Serial Gadget.
+endef
+
+$(eval $(call KernelPackage,usb-serial-gadget))
+
+
+define KernelPackage/usb-uhci
+  TITLE:=Support for UHCI controllers
+  KCONFIG:= \
+	CONFIG_USB_UHCI_ALT \
+	CONFIG_USB_UHCI_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
+  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-uhci/description
+ Kernel support for USB UHCI controllers
+endef
+
+$(eval $(call KernelPackage,usb-uhci,1))
+
+
+define KernelPackage/usb-ohci
+  TITLE:=Support for OHCI controllers
+  DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx
+  KCONFIG:= \
+	CONFIG_USB_OHCI \
+	CONFIG_USB_OHCI_HCD \
+	CONFIG_USB_OHCI_ATH79=y \
+	CONFIG_USB_OHCI_HCD_AT91=y \
+	CONFIG_USB_OHCI_BCM63XX=y \
+	CONFIG_USB_OCTEON_OHCI=y \
+	CONFIG_USB_OHCI_HCD_OMAP3=y \
+	CONFIG_USB_OHCI_HCD_PLATFORM=y
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.11.0)),1)
+  FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko
+endif
+  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-ohci/description
+ Kernel support for USB OHCI controllers
+endef
+
+$(eval $(call KernelPackage,usb-ohci,1))
+
+
+define KernelPackage/usb2-fsl
+  TITLE:=Support for Freescale USB2 controllers
+  DEPENDS:=@TARGET_mpc85xx
+  KCONFIG:=\
+	CONFIG_USB_FSL_MPH_DR_OF \
+  	CONFIG_USB_EHCI_FSL=y
+  FILES:=$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko
+  AUTOLOAD:=$(call AutoLoad,39,fsl-mph-dr-of,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2-fsl/description
+ Kernel support for Freescale USB2 (EHCI) controllers
+endef
+
+$(eval $(call KernelPackage,usb2-fsl))
+
+
+define KernelPackage/usb2-omap
+  TITLE:=Support for USB2 for OMAP
+  DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-phy-am335x +kmod-usb2
+  KCONFIG:=CONFIG_USB_EHCI_HCD_OMAP
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-omap.ko
+  AUTOLOAD:=$(call AutoLoad,39,ehci-omap)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2-omap/description
+ Kernel support for OMAP USB2 (EHCI) controllers
+endef
+
+$(eval $(call KernelPackage,usb2-omap))
+
+
+define KernelPackage/usb2
+  TITLE:=Support for USB2 controllers
+  DEPENDS:=\
+	+TARGET_brcm47xx:kmod-usb-brcm47xx \
+	+TARGET_mpc85xx:kmod-usb2-fsl
+  KCONFIG:=\
+	CONFIG_USB_EHCI_HCD \
+	CONFIG_USB_EHCI_ATH79=y \
+	CONFIG_USB_EHCI_BCM63XX=y \
+	CONFIG_USB_IMX21_HCD=y \
+	CONFIG_USB_EHCI_MXC=y \
+	CONFIG_USB_OCTEON_EHCI=y \
+	CONFIG_USB_EHCI_HCD_ORION=y \
+	CONFIG_USB_EHCI_HCD_PLATFORM=y
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.8.0)),1)
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \
+	$(LINUX_DIR)/drivers/usb/host/ehci-platform.ko
+  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-orion.ko),)
+    FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-orion.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion,1)
+else
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko
+  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1)
+endif
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2/description
+ Kernel support for USB2 (EHCI) controllers
+endef
+
+$(eval $(call KernelPackage,usb2))
+
+
+define KernelPackage/usb2-pci
+  TITLE:=Support for PCI USB2 controllers
+  DEPENDS:=@PCI_SUPPORT @(!LINUX_3_3&&!LINUX_3_6) +kmod-usb2
+  KCONFIG:=CONFIG_USB_EHCI_PCI
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko
+  AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2-pci/description
+ Kernel support for PCI USB2 (EHCI) controllers
+endef
+
+$(eval $(call KernelPackage,usb2-pci))
+
+
+define KernelPackage/usb-dwc2
+  TITLE:=DWC2 USB controller driver
+  DEPENDS:=@(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8&&!LINUX_3_9)
+  KCONFIG:= \
+	CONFIG_USB_DWC2 \
+	CONFIG_USB_DWC2_DEBUG=n \
+	CONFIG_USB_DWC2_VERBOSE=n \
+	CONFIG_USB_DWC2_TRACK_MISSED_SOFS=n
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1)
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko \
+	$(LINUX_DIR)/drivers/usb/dwc2/dwc2_platform.ko
+else
+  FILES:= \
+	$(LINUX_DIR)/drivers/staging/dwc2/dwc2.ko \
+	$(LINUX_DIR)/drivers/staging/dwc2/dwc2_platform.ko
+endif
+  AUTOLOAD:=$(call AutoLoad,54,dwc2 dwc2_platform,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-dwc2/description
+ This driver provides USB Device Controller support for the
+ Synopsys DesignWare USB OTG Core
+endef
+
+$(eval $(call KernelPackage,usb-dwc2))
+
+
+define KernelPackage/usb2-oxnas
+  TITLE:=OXNAS USB controller driver
+  DEPENDS:=@TARGET_oxnas +kmod-usb2
+  KCONFIG:=CONFIG_USB_EHCI_OXNAS
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-oxnas.ko
+  AUTOLOAD:=$(call AutoLoad,55,ehci-oxnas,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2-oxnas/description
+ This driver provides USB Device Controller support for the
+ EHCI USB host built-in to the PLXTECH NAS782x SoC
+endef
+
+$(eval $(call KernelPackage,usb2-oxnas))
+
+
+define KernelPackage/usb-acm
+  TITLE:=Support for modems/isdn controllers
+  KCONFIG:=CONFIG_USB_ACM
+  FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko
+  AUTOLOAD:=$(call AutoProbe,cdc-acm)
+$(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-acm/description
+ Kernel support for USB ACM devices (modems/isdn controllers)
+endef
+
+$(eval $(call KernelPackage,usb-acm))
+
+
+define KernelPackage/usb-wdm
+  TITLE:=USB Wireless Device Management
+  KCONFIG:=CONFIG_USB_WDM
+  FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-wdm.ko
+  AUTOLOAD:=$(call AutoProbe,cdc-wdm)
+$(call AddDepends/usb)
+$(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-wdm/description
+ USB Wireless Device Management support
+endef
+
+$(eval $(call KernelPackage,usb-wdm))
+
+
+define KernelPackage/usb-audio
+  TITLE:=Support for USB audio devices
+  KCONFIG:= \
+	CONFIG_USB_AUDIO \
+	CONFIG_SND_USB_AUDIO
+  $(call AddDepends/usb)
+  $(call AddDepends/sound)
+# For Linux 2.6.35+
+ifneq ($(wildcard $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko),)
+  FILES:= \
+	$(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \
+	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
+  AUTOLOAD:=$(call AutoProbe,snd-usbmidi-lib snd-usb-audio)
+else
+  FILES:= \
+	$(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
+	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
+  AUTOLOAD:=$(call AutoProbe,snd-usb-lib snd-usb-audio)
+endif
+endef
+
+define KernelPackage/usb-audio/description
+ Kernel support for USB audio devices
+endef
+
+$(eval $(call KernelPackage,usb-audio))
+
+
+define KernelPackage/usb-printer
+  TITLE:=Support for printers
+  KCONFIG:=CONFIG_USB_PRINTER
+  FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko
+  AUTOLOAD:=$(call AutoProbe,usblp)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-printer/description
+ Kernel support for USB printers
+endef
+
+$(eval $(call KernelPackage,usb-printer))
+
+
+define KernelPackage/usb-serial
+  TITLE:=Support for USB-to-Serial converters
+  KCONFIG:=CONFIG_USB_SERIAL
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.ko
+  AUTOLOAD:=$(call AutoProbe,usbserial)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-serial/description
+ Kernel support for USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial))
+
+
+define AddDepends/usb-serial
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=kmod-usb-serial $(1)
+endef
+
+
+define KernelPackage/usb-serial-belkin
+  TITLE:=Support for Belkin devices
+  KCONFIG:=CONFIG_USB_SERIAL_BELKIN
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.ko
+  AUTOLOAD:=$(call AutoProbe,belkin_sa)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-belkin/description
+ Kernel support for Belkin USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-belkin))
+
+
+define KernelPackage/usb-serial-ch341
+  TITLE:=Support for CH341 devices
+  KCONFIG:=CONFIG_USB_SERIAL_CH341
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.ko
+  AUTOLOAD:=$(call AutoProbe,ch341)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-ch341/description
+ Kernel support for Winchiphead CH341 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-ch341))
+
+
+define KernelPackage/usb-serial-ftdi
+  TITLE:=Support for FTDI devices
+  KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.ko
+  AUTOLOAD:=$(call AutoProbe,ftdi_sio)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-ftdi/description
+ Kernel support for FTDI USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-ftdi))
+
+
+define KernelPackage/usb-serial-ti-usb
+  TITLE:=Support for TI USB 3410/5052
+  KCONFIG:=CONFIG_USB_SERIAL_TI
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ti_usb_3410_5052.ko
+  AUTOLOAD:=$(call AutoProbe,ti_usb_3410_5052)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-ti-usb/description
+ Kernel support for TI USB 3410/5052 devices
+endef
+
+$(eval $(call KernelPackage,usb-serial-ti-usb))
+
+
+define KernelPackage/usb-serial-ipw
+  TITLE:=Support for IPWireless 3G devices
+  KCONFIG:=CONFIG_USB_SERIAL_IPW
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ipw.ko
+  AUTOLOAD:=$(call AutoProbe,ipw)
+  $(call AddDepends/usb-serial,+kmod-usb-serial-wwan)
+endef
+
+$(eval $(call KernelPackage,usb-serial-ipw))
+
+
+define KernelPackage/usb-serial-mct
+  TITLE:=Support for Magic Control Tech. devices
+  KCONFIG:=CONFIG_USB_SERIAL_MCT_U232
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.ko
+  AUTOLOAD:=$(call AutoProbe,mct_u232)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-mct/description
+ Kernel support for Magic Control Technology USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-mct))
+
+
+define KernelPackage/usb-serial-mos7720
+  TITLE:=Support for Moschip MOS7720 devices
+  KCONFIG:=CONFIG_USB_SERIAL_MOS7720
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/mos7720.ko
+  AUTOLOAD:=$(call AutoProbe,mos7720)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-mos7720/description
+ Kernel support for Moschip MOS7720 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-mos7720))
+
+
+define KernelPackage/usb-serial-pl2303
+  TITLE:=Support for Prolific PL2303 devices
+  KCONFIG:=CONFIG_USB_SERIAL_PL2303
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.ko
+  AUTOLOAD:=$(call AutoProbe,pl2303)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-pl2303/description
+ Kernel support for Prolific PL2303 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-pl2303))
+
+
+define KernelPackage/usb-serial-cp210x
+  TITLE:=Support for Silicon Labs cp210x devices
+  KCONFIG:=CONFIG_USB_SERIAL_CP210X
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.ko
+  AUTOLOAD:=$(call AutoProbe,cp210x)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-cp210x/description
+ Kernel support for Silicon Labs cp210x USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-cp210x))
+
+
+define KernelPackage/usb-serial-ark3116
+  TITLE:=Support for ArkMicroChips ARK3116 devices
+  KCONFIG:=CONFIG_USB_SERIAL_ARK3116
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.ko
+  AUTOLOAD:=$(call AutoProbe,ark3116)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-ark3116/description
+ Kernel support for ArkMicroChips ARK3116 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-ark3116))
+
+
+define KernelPackage/usb-serial-oti6858
+  TITLE:=Support for Ours Technology OTI6858 devices
+  KCONFIG:=CONFIG_USB_SERIAL_OTI6858
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.ko
+  AUTOLOAD:=$(call AutoProbe,oti6858)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-oti6858/description
+ Kernel support for Ours Technology OTI6858 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-oti6858))
+
+
+define KernelPackage/usb-serial-sierrawireless
+  TITLE:=Support for Sierra Wireless devices
+  KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.ko
+  AUTOLOAD:=$(call AutoProbe,sierra)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-sierrawireless/description
+ Kernel support for Sierra Wireless devices
+endef
+
+$(eval $(call KernelPackage,usb-serial-sierrawireless))
+
+
+define KernelPackage/usb-serial-motorola-phone
+  TITLE:=Support for Motorola usb phone
+  KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.ko
+  AUTOLOAD:=$(call AutoProbe,moto_modem)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-motorola-phone/description
+ Kernel support for Motorola usb phone
+endef
+
+$(eval $(call KernelPackage,usb-serial-motorola-phone))
+
+
+define KernelPackage/usb-serial-visor
+  TITLE:=Support for Handspring Visor devices
+  KCONFIG:=CONFIG_USB_SERIAL_VISOR
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.ko
+  AUTOLOAD:=$(call AutoProbe,visor)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-visor/description
+ Kernel support for Handspring Visor PDAs
+endef
+
+$(eval $(call KernelPackage,usb-serial-visor))
+
+
+define KernelPackage/usb-serial-cypress-m8
+  TITLE:=Support for CypressM8 USB-Serial
+  KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.ko
+  AUTOLOAD:=$(call AutoProbe,cypress_m8)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-cypress-m8/description
+ Kernel support for devices with Cypress M8 USB to Serial chip
+ (for example, the Delorme Earthmate LT-20 GPS)
+ Supported microcontrollers in the CY4601 family are:
+ CY7C63741 CY7C63742 CY7C63743 CY7C64013
+endef
+
+$(eval $(call KernelPackage,usb-serial-cypress-m8))
+
+
+define KernelPackage/usb-serial-keyspan
+  TITLE:=Support for Keyspan USB-to-Serial devices
+  KCONFIG:= \
+	CONFIG_USB_SERIAL_KEYSPAN \
+	CONFIG_USB_SERIAL_KEYSPAN_USA28 \
+	CONFIG_USB_SERIAL_KEYSPAN_USA28X \
+	CONFIG_USB_SERIAL_KEYSPAN_USA28XA \
+	CONFIG_USB_SERIAL_KEYSPAN_USA28XB \
+	CONFIG_USB_SERIAL_KEYSPAN_USA19 \
+	CONFIG_USB_SERIAL_KEYSPAN_USA18X \
+	CONFIG_USB_SERIAL_KEYSPAN_USA19W \
+	CONFIG_USB_SERIAL_KEYSPAN_USA19QW \
+	CONFIG_USB_SERIAL_KEYSPAN_USA19QI \
+	CONFIG_USB_SERIAL_KEYSPAN_MPR \
+	CONFIG_USB_SERIAL_KEYSPAN_USA49W \
+	CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/serial/keyspan.ko \
+	$(wildcard $(LINUX_DIR)/drivers/usb/misc/ezusb.ko)
+  AUTOLOAD:=$(call AutoProbe,ezusb keyspan)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-keyspan/description
+ Kernel support for Keyspan USB-to-Serial devices
+endef
+
+$(eval $(call KernelPackage,usb-serial-keyspan))
+
+
+define KernelPackage/usb-serial-wwan
+  TITLE:=Support for GSM and CDMA modems
+  KCONFIG:=CONFIG_USB_SERIAL_WWAN
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
+  AUTOLOAD:=$(call AutoProbe,usb_wwan)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-wwan/description
+ Kernel support for USB GSM and CDMA modems
+endef
+
+$(eval $(call KernelPackage,usb-serial-wwan))
+
+
+define KernelPackage/usb-serial-option
+  TITLE:=Support for Option HSDPA modems
+  DEPENDS:=+kmod-usb-serial-wwan
+  KCONFIG:=CONFIG_USB_SERIAL_OPTION
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
+  AUTOLOAD:=$(call AutoProbe,option)
+  $(call AddDepends/usb-serial)
+endef
+
+define KernelPackage/usb-serial-option/description
+ Kernel support for Option HSDPA modems
+endef
+
+$(eval $(call KernelPackage,usb-serial-option))
+
+
+define KernelPackage/usb-serial-qualcomm
+  TITLE:=Support for Qualcomm USB serial
+  KCONFIG:=CONFIG_USB_SERIAL_QUALCOMM
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/qcserial.ko
+  AUTOLOAD:=$(call AutoProbe,qcserial)
+  $(call AddDepends/usb-serial,+kmod-usb-serial-wwan)
+endef
+
+define KernelPackage/usb-serial-qualcomm/description
+ Kernel support for Qualcomm USB Serial devices (Gobi)
+endef
+
+$(eval $(call KernelPackage,usb-serial-qualcomm))
+
+
+define KernelPackage/usb-storage
+  TITLE:=USB Storage support
+  DEPENDS:= +kmod-scsi-core
+  KCONFIG:=CONFIG_USB_STORAGE
+  FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.ko
+  AUTOLOAD:=$(call AutoProbe,usb-storage,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-storage/description
+ Kernel support for USB Mass Storage devices
+endef
+
+$(eval $(call KernelPackage,usb-storage))
+
+
+define KernelPackage/usb-storage-extras
+  SUBMENU:=$(USB_MENU)
+  TITLE:=Extra drivers for usb-storage
+  DEPENDS:=+kmod-usb-storage
+  KCONFIG:= \
+	CONFIG_USB_STORAGE_ALAUDA \
+	CONFIG_USB_STORAGE_CYPRESS_ATACB \
+	CONFIG_USB_STORAGE_DATAFAB \
+	CONFIG_USB_STORAGE_FREECOM \
+	CONFIG_USB_STORAGE_ISD200 \
+	CONFIG_USB_STORAGE_JUMPSHOT \
+	CONFIG_USB_STORAGE_KARMA \
+	CONFIG_USB_STORAGE_SDDR09 \
+	CONFIG_USB_STORAGE_SDDR55 \
+	CONFIG_USB_STORAGE_USBAT
+  FILES:= \
+	$(LINUX_DIR)/drivers/usb/storage/ums-alauda.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-cypress.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-datafab.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-freecom.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-isd200.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-jumpshot.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-karma.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-sddr09.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-sddr55.ko \
+	$(LINUX_DIR)/drivers/usb/storage/ums-usbat.ko
+  AUTOLOAD:=$(call AutoProbe,ums-alauda ums-cypress ums-datafab \
+				ums-freecom ums-isd200 ums-jumpshot \
+				ums-karma ums-sddr09 ums-sddr55 ums-usbat)
+endef
+
+define KernelPackage/usb-storage-extras/description
+ Say Y here if you want to have some more drivers,
+ such as for SmartMedia card readers
+endef
+
+$(eval $(call KernelPackage,usb-storage-extras))
+
+
+define KernelPackage/usb-atm
+  TITLE:=Support for ATM on USB bus
+  DEPENDS:=+kmod-atm
+  KCONFIG:=CONFIG_USB_ATM
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.ko
+  AUTOLOAD:=$(call AutoProbe,usbatm)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-atm/description
+ Kernel support for USB DSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm))
+
+
+define AddDepends/usb-atm
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=kmod-usb-atm $(1)
+endef
+
+
+define KernelPackage/usb-atm-speedtouch
+  TITLE:=SpeedTouch USB ADSL modems support
+  KCONFIG:=CONFIG_USB_SPEEDTOUCH
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.ko
+  AUTOLOAD:=$(call AutoProbe,speedtch)
+  $(call AddDepends/usb-atm)
+endef
+
+define KernelPackage/usb-atm-speedtouch/description
+ Kernel support for SpeedTouch USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-speedtouch))
+
+
+define KernelPackage/usb-atm-ueagle
+  TITLE:=Eagle 8051 based USB ADSL modems support
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.ko
+  KCONFIG:=CONFIG_USB_UEAGLEATM
+  AUTOLOAD:=$(call AutoProbe,ueagle-atm)
+  $(call AddDepends/usb-atm)
+endef
+
+define KernelPackage/usb-atm-ueagle/description
+ Kernel support for Eagle 8051 based USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-ueagle))
+
+
+define KernelPackage/usb-atm-cxacru
+  TITLE:=cxacru
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.ko
+  KCONFIG:=CONFIG_USB_CXACRU
+  AUTOLOAD:=$(call AutoProbe,cxacru)
+  $(call AddDepends/usb-atm)
+endef
+
+define KernelPackage/usb-atm-cxacru/description
+ Kernel support for cxacru based USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-cxacru))
+
+
+define KernelPackage/usb-net
+  TITLE:=Kernel modules for USB-to-Ethernet convertors
+  DEPENDS:=+kmod-mii
+  KCONFIG:=CONFIG_USB_USBNET
+  AUTOLOAD:=$(call AutoProbe,usbnet)
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-net/description
+ Kernel modules for USB-to-Ethernet convertors
+endef
+
+$(eval $(call KernelPackage,usb-net))
+
+
+define AddDepends/usb-net
+  SUBMENU:=$(USB_MENU)
+  DEPENDS+=kmod-usb-net $(1)
+endef
+
+
+define KernelPackage/usb-net-asix
+  TITLE:=Kernel module for USB-to-Ethernet Asix convertors
+  DEPENDS:=+!LINUX_3_3:kmod-libphy
+  KCONFIG:=CONFIG_USB_NET_AX8817X
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
+  AUTOLOAD:=$(call AutoProbe,asix)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-asix/description
+ Kernel module for USB-to-Ethernet Asix convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-asix))
+
+
+define KernelPackage/usb-net-hso
+  TITLE:=Kernel module for Option USB High Speed Mobile Devices
+  KCONFIG:=CONFIG_USB_HSO
+  FILES:= \
+	$(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.ko
+  AUTOLOAD:=$(call AutoProbe,hso)
+  $(call AddDepends/usb-net)
+  $(call AddDepends/rfkill)
+endef
+
+define KernelPackage/usb-net-hso/description
+ Kernel module for Option USB High Speed Mobile Devices
+endef
+
+$(eval $(call KernelPackage,usb-net-hso))
+
+
+define KernelPackage/usb-net-kaweth
+  TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
+  KCONFIG:=CONFIG_USB_KAWETH
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.ko
+  AUTOLOAD:=$(call AutoProbe,kaweth)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-kaweth/description
+ Kernel module for USB-to-Ethernet Kaweth convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-kaweth))
+
+
+define KernelPackage/usb-net-pegasus
+  TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
+  KCONFIG:=CONFIG_USB_PEGASUS
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.ko
+  AUTOLOAD:=$(call AutoProbe,pegasus)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-pegasus/description
+ Kernel module for USB-to-Ethernet Pegasus convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-pegasus))
+
+
+define KernelPackage/usb-net-mcs7830
+  TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors
+  KCONFIG:=CONFIG_USB_NET_MCS7830
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.ko
+  AUTOLOAD:=$(call AutoProbe,mcs7830)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-mcs7830/description
+ Kernel module for USB-to-Ethernet MCS7830 convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-mcs7830))
+
+
+define KernelPackage/usb-net-smsc95xx
+  TITLE:=SMSC LAN95XX based USB 2.0 10/100 ethernet devices
+  KCONFIG:=CONFIG_USB_NET_SMSC95XX
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko
+  AUTOLOAD:=$(call AutoProbe,smsc95xx)
+  $(call AddDepends/usb-net, +(!LINUX_3_3&&!LINUX_3_6):kmod-lib-crc16)
+endef
+
+define KernelPackage/usb-net-smsc95xx/description
+ Kernel module for SMSC LAN95XX based devices
+endef
+
+$(eval $(call KernelPackage,usb-net-smsc95xx))
+
+
+define KernelPackage/usb-net-dm9601-ether
+  TITLE:=Support for DM9601 ethernet connections
+  KCONFIG:=CONFIG_USB_NET_DM9601
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.ko
+  AUTOLOAD:=$(call AutoProbe,dm9601)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-dm9601-ether/description
+ Kernel support for USB DM9601 devices
+endef
+
+$(eval $(call KernelPackage,usb-net-dm9601-ether))
+
+define KernelPackage/usb-net-cdc-ether
+  TITLE:=Support for cdc ethernet connections
+  KCONFIG:=CONFIG_USB_NET_CDCETHER
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.ko
+  AUTOLOAD:=$(call AutoProbe,cdc_ether)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-cdc-ether/description
+ Kernel support for USB CDC Ethernet devices
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-ether))
+
+
+define KernelPackage/usb-net-cdc-eem
+  TITLE:=Support for CDC EEM connections
+  KCONFIG:=CONFIG_USB_NET_CDC_EEM
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_eem.ko
+  AUTOLOAD:=$(call AutoProbe,cdc_eem)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-cdc-eem/description
+ Kernel support for USB CDC EEM
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-eem))
+
+
+define KernelPackage/usb-net-cdc-subset
+  TITLE:=Support for CDC Ethernet subset connections
+  KCONFIG:= \
+	CONFIG_USB_NET_CDC_SUBSET \
+	CONFIG_USB_ARMLINUX
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_subset.ko
+  AUTOLOAD:=$(call AutoProbe,cdc_subset)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-cdc-subset/description
+ Kernel support for Simple USB Network Links (CDC Ethernet subset)
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-subset))
+
+
+define KernelPackage/usb-net-qmi-wwan
+  TITLE:=QMI WWAN driver
+  KCONFIG:=CONFIG_USB_NET_QMI_WWAN
+  FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/qmi_wwan.ko
+  AUTOLOAD:=$(call AutoProbe,qmi_wwan)
+  $(call AddDepends/usb-net,+kmod-usb-wdm)
+endef
+
+define KernelPackage/usb-net-qmi-wwan/description
+ QMI WWAN driver for Qualcomm MSM based 3G and LTE modems
+endef
+
+$(eval $(call KernelPackage,usb-net-qmi-wwan))
+
+
+define KernelPackage/usb-net-rndis
+  TITLE:=Support for RNDIS connections
+  KCONFIG:=CONFIG_USB_NET_RNDIS_HOST
+  FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.ko
+  AUTOLOAD:=$(call AutoProbe,rndis_host)
+  $(call AddDepends/usb-net,+kmod-usb-net-cdc-ether)
+endef
+
+define KernelPackage/usb-net-rndis/description
+ Kernel support for RNDIS connections
+endef
+
+$(eval $(call KernelPackage,usb-net-rndis))
+
+
+define KernelPackage/usb-net-cdc-mbim
+  SUBMENU:=$(USB_MENU)
+  TITLE:=Kernel module for MBIM Devices
+  KCONFIG:=CONFIG_USB_NET_CDC_MBIM
+  FILES:= \
+   $(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_mbim.ko
+  AUTOLOAD:=$(call AutoProbe,cdc_mbim)
+  $(call AddDepends/usb-net,+kmod-usb-wdm +kmod-usb-net-cdc-ncm)
+endef
+
+define KernelPackage/usb-net-cdc-mbim/description
+ Kernel module for Option USB High Speed Mobile Devices
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-mbim))
+
+
+define KernelPackage/usb-net-cdc-ncm
+  TITLE:=Support for CDC NCM connections
+  KCONFIG:=CONFIG_USB_NET_CDC_NCM
+  FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ncm.ko
+  AUTOLOAD:=$(call AutoProbe,cdc_ncm)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-cdc-ncm/description
+ Kernel support for CDC NCM connections
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-ncm))
+
+
+define KernelPackage/usb-net-huawei-cdc-ncm
+  TITLE:=Support for Huawei CDC NCM connections
+  KCONFIG:=CONFIG_USB_NET_HUAWEI_CDC_NCM
+  FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/huawei_cdc_ncm.ko
+  AUTOLOAD:=$(call AutoProbe,huawei_cdc_ncm)
+  $(call AddDepends/usb-net,+kmod-usb-wdm @!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10)
+endef
+
+define KernelPackage/usb-net-huawei-cdc-ncm/description
+ Kernel support for Huawei CDC NCM connections
+endef
+
+$(eval $(call KernelPackage,usb-net-huawei-cdc-ncm))
+
+
+define KernelPackage/usb-net-sierrawireless
+  TITLE:=Support for Sierra Wireless devices
+  KCONFIG:=CONFIG_USB_SIERRA_NET
+  FILES:=$(LINUX_DIR)/drivers/net/usb/sierra_net.ko
+  AUTOLOAD:=$(call AutoProbe,sierra_net)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-sierrawireless/description
+ Kernel support for Sierra Wireless devices
+endef
+
+$(eval $(call KernelPackage,usb-net-sierrawireless))
+
+
+define KernelPackage/usb-net-ipheth
+  TITLE:=Apple iPhone USB Ethernet driver
+  KCONFIG:=CONFIG_USB_IPHETH
+  FILES:=$(LINUX_DIR)/drivers/net/usb/ipheth.ko
+  AUTOLOAD:=$(call AutoProbe,ipheth)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-ipheth/description
+ Kernel support for Apple iPhone USB Ethernet driver
+endef
+
+$(eval $(call KernelPackage,usb-net-ipheth))
+
+
+define KernelPackage/usb-net-kalmia
+  TITLE:=Samsung Kalmia based LTE USB modem
+  KCONFIG:=CONFIG_USB_NET_KALMIA
+  FILES:=$(LINUX_DIR)/drivers/net/usb/kalmia.ko
+  AUTOLOAD:=$(call AutoProbe,kalmia)
+  $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-kalmia/description
+ Kernel support for Samsung Kalmia based LTE USB modem
+endef
+
+$(eval $(call KernelPackage,usb-net-kalmia))
+
+
+define KernelPackage/usb-hid
+  TITLE:=Support for USB Human Input Devices
+  KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID CONFIG_USB_HIDDEV=y
+  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
+  AUTOLOAD:=$(call AutoProbe,usbhid)
+  $(call AddDepends/usb)
+  $(call AddDepends/hid,+kmod-hid-generic)
+  $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+define KernelPackage/usb-hid/description
+ Kernel support for USB HID devices such as keyboards and mice
+endef
+
+$(eval $(call KernelPackage,usb-hid))
+
+
+define KernelPackage/usb-yealink
+  TITLE:=USB Yealink VOIP phone
+  KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y
+  FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
+  AUTOLOAD:=$(call AutoProbe,yealink)
+  $(call AddDepends/usb)
+  $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+define KernelPackage/usb-yealink/description
+ Kernel support for Yealink VOIP phone
+endef
+
+$(eval $(call KernelPackage,usb-yealink))
+
+
+define KernelPackage/usb-cm109
+  TITLE:=Support for CM109 device
+  KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y
+  FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko
+  AUTOLOAD:=$(call AutoProbe,cm109)
+  $(call AddDepends/usb)
+  $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+define KernelPackage/usb-cm109/description
+ Kernel support for CM109 VOIP phone
+endef
+
+$(eval $(call KernelPackage,usb-cm109))
+
+
+define KernelPackage/usb-test
+  TITLE:=USB Testing Driver
+  DEPENDS:=@DEVEL
+  KCONFIG:=CONFIG_USB_TEST
+  FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-test/description
+ Kernel support for testing USB Host Controller software
+endef
+
+$(eval $(call KernelPackage,usb-test))
+
+
+define KernelPackage/usbip
+  TITLE := USB-over-IP kernel support
+  KCONFIG:= \
+	CONFIG_USBIP_CORE \
+	CONFIG_USBIP_DEBUG=n
+  FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip-core.ko
+  AUTOLOAD:=$(call AutoProbe,usbip-core)
+  $(call AddDepends/usb)
+endef
+
+$(eval $(call KernelPackage,usbip))
+
+
+define KernelPackage/usbip-client
+  TITLE := USB-over-IP client driver
+  DEPENDS := +kmod-usbip
+  KCONFIG := CONFIG_USBIP_VHCI_HCD
+  FILES := $(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD := $(call AutoProbe,vhci-hcd)
+  $(call AddDepends/usb)
+endef
+
+$(eval $(call KernelPackage,usbip-client))
+
+
+define KernelPackage/usbip-server
+$(call KernelPackage/usbip/Default)
+  TITLE := USB-over-IP host driver
+  DEPENDS := +kmod-usbip
+  KCONFIG := CONFIG_USBIP_HOST
+  FILES := $(LINUX_DIR)/drivers/staging/usbip/usbip-host.ko
+  AUTOLOAD := $(call AutoProbe,usbip-host)
+  $(call AddDepends/usb)
+endef
+
+$(eval $(call KernelPackage,usbip-server))
+
+
+define KernelPackage/usb-chipidea
+  TITLE:=Support for ChipIdea controllers
+  DEPENDS:=+kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget
+  KCONFIG:=\
+	CONFIG_USB_CHIPIDEA \
+	CONFIG_USB_CHIPIDEA_HOST=y \
+	CONFIG_USB_CHIPIDEA_UDC=y \
+	CONFIG_USB_CHIPIDEA_DEBUG=y
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1)
+  FILES:=\
+	$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
+	$(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko) \
+	$(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q).ko)
+  AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF_DEVICE),ci13xxx_imx usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q)),1)
+else
+  FILES:=\
+	$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
+	$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko) \
+	$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko)
+  AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1)
+endif
+  $(call AddDepends/usb)
+endef
+  
+define KernelPackage/usb-chipidea/description
+ Kernel support for USB ChipIdea controllers
+endef
+
+$(eval $(call KernelPackage,usb-chipidea,1))
+
+
+define KernelPackage/usb-mxs-phy
+  TITLE:=Support for Freescale MXS USB PHY
+  DEPENDS:=@TARGET_imx6||TARGET_mxs +TARGET_mxs:kmod-usb-chipidea-imx
+  KCONFIG:=CONFIG_USB_MXS_PHY
+  FILES:=\
+	$(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko
+  AUTOLOAD:=$(call AutoLoad,52,phy-mxs-usb,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-mxs-phy/description
+ Kernel support for Freescale MXS USB PHY
+endef
+
+$(eval $(call KernelPackage,usb-mxs-phy,1))
+
+
+define KernelPackage/usbmon
+  TITLE:=USB traffic monitor
+  KCONFIG:=CONFIG_USB_MON
+  $(call AddDepends/usb)
+  FILES:=$(LINUX_DIR)/drivers/usb/mon/usbmon.ko
+  AUTOLOAD:=$(call AutoProbe,usbmon)
+endef
+
+define KernelPackage/usbmon/description
+ Kernel support for USB traffic monitoring
+endef
+
+$(eval $(call KernelPackage,usbmon))
+
+XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,xhci-hcd xhci-pci xhci-plat))
+XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES))
+
+define KernelPackage/usb3
+  TITLE:=Support for USB3 controllers
+  DEPENDS:=+TARGET_omap:kmod-usb-phy-omap-usb3
+  KCONFIG:= \
+	CONFIG_USB_XHCI_HCD \
+	CONFIG_USB_XHCI_PCI \
+	CONFIG_USB_XHCI_PLATFORM \
+	CONFIG_USB_XHCI_HCD_DEBUGGING=n
+  FILES:= \
+	$(XHCI_FILES)
+  AUTOLOAD:=$(call AutoLoad,54,$(XHCI_AUTOLOAD),1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb3/description
+ Kernel support for USB3 (XHCI) controllers
+endef
+
+$(eval $(call KernelPackage,usb3))
diff --git a/trunk/package/kernel/linux/modules/video.mk b/trunk/package/kernel/linux/modules/video.mk
new file mode 100644
index 00000000..0681b0e7
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/video.mk
@@ -0,0 +1,740 @@
+#
+# Copyright (C) 2009 David Cooper <dave@kupesoft.com>
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+VIDEO_MENU:=Video Support
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+V4L2_DIR=v4l2-core
+V4L2_USB_DIR=usb
+else
+V4L2_DIR=video
+V4L2_USB_DIR=video
+endif
+
+
+define KernelPackage/fb
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=Framebuffer support
+  DEPENDS:=@DISPLAY_SUPPORT
+  KCONFIG:=CONFIG_FB
+  FILES:=$(LINUX_DIR)/drivers/video/fb.ko
+  AUTOLOAD:=$(call AutoLoad,06,fb)
+endef
+
+define KernelPackage/fb/description
+ Kernel support for framebuffers
+endef
+
+define KernelPackage/fb/x86
+  FILES+=$(LINUX_DIR)/arch/x86/video/fbdev.ko
+  AUTOLOAD:=$(call AutoLoad,06,fbdev fb)
+endef
+
+$(eval $(call KernelPackage,fb))
+
+define KernelPackage/fb-cfb-fillrect
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=Framebuffer software rectangle filling support
+  DEPENDS:=+kmod-fb
+  KCONFIG:=CONFIG_FB_CFB_FILLRECT
+  FILES:=$(LINUX_DIR)/drivers/video/cfbfillrect.ko
+  AUTOLOAD:=$(call AutoLoad,07,cfbfillrect)
+endef
+
+define KernelPackage/fb-cfb-fillrect/description
+ Kernel support for software rectangle filling
+endef
+
+$(eval $(call KernelPackage,fb-cfb-fillrect))
+
+
+define KernelPackage/fb-cfb-copyarea
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=Framebuffer software copy area support
+  DEPENDS:=+kmod-fb
+  KCONFIG:=CONFIG_FB_CFB_COPYAREA
+  FILES:=$(LINUX_DIR)/drivers/video/cfbcopyarea.ko
+  AUTOLOAD:=$(call AutoLoad,07,cfbcopyarea)
+endef
+
+define KernelPackage/fb-cfb-copyarea/description
+ Kernel support for software copy area
+endef
+
+$(eval $(call KernelPackage,fb-cfb-copyarea))
+
+define KernelPackage/fb-cfb-imgblt
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=Framebuffer software image blit support
+  DEPENDS:=+kmod-fb
+  KCONFIG:=CONFIG_FB_CFB_IMAGEBLIT
+  FILES:=$(LINUX_DIR)/drivers/video/cfbimgblt.ko
+  AUTOLOAD:=$(call AutoLoad,07,cfbimgblt)
+endef
+
+define KernelPackage/fb-cfb-imgblt/description
+ Kernel support for software image blitting
+endef
+
+$(eval $(call KernelPackage,fb-cfb-imgblt))
+
+
+define KernelPackage/video-core
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE=Video4Linux support
+  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT +PACKAGE_kmod-i2c-core:kmod-i2c-core
+  KCONFIG:= \
+	CONFIG_MEDIA_SUPPORT=m \
+	CONFIG_MEDIA_CAMERA_SUPPORT=y \
+	CONFIG_VIDEO_DEV \
+	CONFIG_VIDEO_V4L1=y \
+	CONFIG_VIDEO_ALLOW_V4L1=y \
+	CONFIG_VIDEO_CAPTURE_DRIVERS=y \
+	CONFIG_V4L_USB_DRIVERS=y \
+	CONFIG_V4L_PCI_DRIVERS=y \
+	CONFIG_V4L_PLATFORM_DRIVERS=y \
+	CONFIG_V4L_ISA_PARPORT_DRIVERS=y
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+  FILES:= \
+	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-common.ko \
+	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko
+  AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common)
+else
+  FILES:= \
+	$(if $(CONFIG_COMPAT),$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-compat-ioctl32.ko) \
+	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-common.ko \
+	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko
+  AUTOLOAD:=$(call AutoLoad,60, $(if $(CONFIG_COMPAT),v4l2-compat-ioctl32) videodev v4l2-common)
+endif
+endef
+
+define KernelPackage/video-core/description
+ Kernel modules for Video4Linux support
+endef
+
+$(eval $(call KernelPackage,video-core))
+
+
+define AddDepends/video
+  SUBMENU:=$(VIDEO_MENU)
+  DEPENDS+=kmod-video-core $(1)
+endef
+
+define AddDepends/camera
+  SUBMENU:=$(VIDEO_MENU)
+  KCONFIG+=CONFIG_MEDIA_USB_SUPPORT=y \
+	 CONFIG_MEDIA_CAMERA_SUPPORT=y
+  DEPENDS+=kmod-video-core $(1)
+endef
+
+
+define KernelPackage/video-videobuf2
+  TITLE:=videobuf2 lib
+  KCONFIG:= \
+	CONFIG_VIDEOBUF2_CORE \
+	CONFIG_VIDEOBUF2_MEMOPS \
+	CONFIG_VIDEOBUF2_VMALLOC
+  FILES:= \
+	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko \
+	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko \
+	$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko
+  AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf2-memops videobuf2-vmalloc)
+  $(call AddDepends/video)
+endef
+
+define KernelPackage/video-videobuf2/description
+ Kernel modules that implements three basic types of media buffers.
+endef
+
+$(eval $(call KernelPackage,video-videobuf2))
+
+
+define KernelPackage/video-cpia2
+  TITLE:=CPIA2 video driver
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
+  KCONFIG:=CONFIG_VIDEO_CPIA2
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/cpia2/cpia2.ko
+  AUTOLOAD:=$(call AutoProbe,cpia2)
+  $(call AddDepends/camera)
+endef
+
+define KernelPackage/video-cpia2/description
+ Kernel modules for supporting CPIA2 USB based cameras
+endef
+
+$(eval $(call KernelPackage,video-cpia2))
+
+
+define KernelPackage/video-sn9c102
+  TITLE:=SN9C102 Camera Chip support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
+  KCONFIG:=CONFIG_USB_SN9C102
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/sn9c102/sn9c102.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_sn9c20x)
+  $(call AddDepends/camera)
+endef
+
+define KernelPackage/video-sn9c102/description
+ Kernel modules for supporting SN9C102 camera chips
+endef
+
+$(eval $(call KernelPackage,video-sn9c102))
+
+
+define KernelPackage/video-pwc
+  TITLE:=Philips USB webcam support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2
+  KCONFIG:= \
+	CONFIG_USB_PWC \
+	CONFIG_USB_PWC_DEBUG=n
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/pwc/pwc.ko
+  AUTOLOAD:=$(call AutoProbe,pwc)
+  $(call AddDepends/camera)
+endef
+
+define KernelPackage/video-pwc/description
+ Kernel modules for supporting Philips USB based cameras
+endef
+
+$(eval $(call KernelPackage,video-pwc))
+
+
+define KernelPackage/video-uvc
+  TITLE:=USB Video Class (UVC) support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2
+  KCONFIG:= CONFIG_USB_VIDEO_CLASS
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko
+  AUTOLOAD:=$(call AutoProbe,uvcvideo)
+  $(call AddDepends/camera)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/video-uvc/description
+ Kernel modules for supporting USB Video Class (UVC) devices
+endef
+
+$(eval $(call KernelPackage,video-uvc))
+
+
+define KernelPackage/video-gspca-core
+  MENU:=1
+  TITLE:=GSPCA webcam core support framework
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core
+  KCONFIG:=CONFIG_USB_GSPCA
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_main.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_main)
+  $(call AddDepends/camera)
+endef
+
+define KernelPackage/video-gspca-core/description
+ Kernel modules for supporting GSPCA based webcam devices. Note this is just
+ the core of the driver, please select a submodule that supports your webcam.
+endef
+
+$(eval $(call KernelPackage,video-gspca-core))
+
+
+define AddDepends/camera-gspca
+  SUBMENU:=$(VIDEO_MENU)
+  DEPENDS+=kmod-video-gspca-core $(1)
+endef
+
+
+define KernelPackage/video-gspca-conex
+  TITLE:=conex webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_CONEX
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_conex.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_conex)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-conex/description
+ The Conexant Camera Driver (conex) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-conex))
+
+
+define KernelPackage/video-gspca-etoms
+  TITLE:=etoms webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_ETOMS
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_etoms.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_etoms)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-etoms/description
+ The Etoms USB Camera Driver (etoms) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-etoms))
+
+
+define KernelPackage/video-gspca-finepix
+  TITLE:=finepix webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_FINEPIX
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_finepix.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_finepix)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-finepix/description
+ The Fujifilm FinePix USB V4L2 driver (finepix) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-finepix))
+
+
+define KernelPackage/video-gspca-mars
+  TITLE:=mars webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_MARS
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_mars.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_mars)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-mars/description
+ The Mars USB Camera Driver (mars) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-mars))
+
+
+define KernelPackage/video-gspca-mr97310a
+  TITLE:=mr97310a webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_MR97310A
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_mr97310a.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_mr97310a)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-mr97310a/description
+ The Mars-Semi MR97310A USB Camera Driver (mr97310a) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-mr97310a))
+
+
+define KernelPackage/video-gspca-ov519
+  TITLE:=ov519 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_OV519
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov519.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_ov519)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-ov519/description
+ The OV519 USB Camera Driver (ov519) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-ov519))
+
+
+define KernelPackage/video-gspca-ov534
+  TITLE:=ov534 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_OV534
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov534.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_ov534)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-ov534/description
+ The OV534 USB Camera Driver (ov534) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-ov534))
+
+
+define KernelPackage/video-gspca-ov534-9
+  TITLE:=ov534-9 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_OV534_9
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov534_9.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_ov534_9)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-ov534-9/description
+ The OV534-9 USB Camera Driver (ov534_9) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-ov534-9))
+
+
+define KernelPackage/video-gspca-pac207
+  TITLE:=pac207 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_PAC207
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_pac207.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_pac207)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-pac207/description
+ The Pixart PAC207 USB Camera Driver (pac207) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-pac207))
+
+
+define KernelPackage/video-gspca-pac7311
+  TITLE:=pac7311 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_PAC7311
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_pac7311.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_pac7311)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-pac7311/description
+ The Pixart PAC7311 USB Camera Driver (pac7311) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-pac7311))
+
+
+define KernelPackage/video-gspca-se401
+  TITLE:=se401 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SE401
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_se401.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_se401)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-se401/description
+ The SE401 USB Camera Driver kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-se401))
+
+
+define KernelPackage/video-gspca-sn9c20x
+  TITLE:=sn9c20x webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SN9C20X
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sn9c20x.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_sn9c20x)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-sn9c20x/description
+ The SN9C20X USB Camera Driver (sn9c20x) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-sn9c20x))
+
+
+define KernelPackage/video-gspca-sonixb
+  TITLE:=sonixb webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SONIXB
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sonixb.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_sonixb)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-sonixb/description
+ The SONIX Bayer USB Camera Driver (sonixb) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-sonixb))
+
+
+define KernelPackage/video-gspca-sonixj
+  TITLE:=sonixj webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SONIXJ
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sonixj.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_sonixj)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-sonixj/description
+ The SONIX JPEG USB Camera Driver (sonixj) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-sonixj))
+
+
+define KernelPackage/video-gspca-spca500
+  TITLE:=spca500 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SPCA500
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca500.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_spca500)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-spca500/description
+ The SPCA500 USB Camera Driver (spca500) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-spca500))
+
+
+define KernelPackage/video-gspca-spca501
+  TITLE:=spca501 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SPCA501
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca501.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_spca501)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-spca501/description
+ The SPCA501 USB Camera Driver (spca501) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-spca501))
+
+
+define KernelPackage/video-gspca-spca505
+  TITLE:=spca505 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SPCA505
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca505.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_spca505)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-spca505/description
+ The SPCA505 USB Camera Driver (spca505) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-spca505))
+
+
+define KernelPackage/video-gspca-spca506
+  TITLE:=spca506 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SPCA506
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca506.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_spca506)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-spca506/description
+ The SPCA506 USB Camera Driver (spca506) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-spca506))
+
+
+define KernelPackage/video-gspca-spca508
+  TITLE:=spca508 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SPCA508
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca508.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_spca508)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-spca508/description
+ The SPCA508 USB Camera Driver (spca508) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-spca508))
+
+
+define KernelPackage/video-gspca-spca561
+  TITLE:=spca561 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SPCA561
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca561.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_spca561)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-spca561/description
+ The SPCA561 USB Camera Driver (spca561) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-spca561))
+
+
+define KernelPackage/video-gspca-sq905
+  TITLE:=sq905 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SQ905
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sq905.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_sq905)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-sq905/description
+ The SQ Technologies SQ905 based USB Camera Driver (sq905) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-sq905))
+
+
+define KernelPackage/video-gspca-sq905c
+  TITLE:=sq905c webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SQ905C
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sq905c.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_sq905c)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-sq905c/description
+ The SQ Technologies SQ905C based USB Camera Driver (sq905c) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-sq905c))
+
+
+define KernelPackage/video-gspca-stk014
+  TITLE:=stk014 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_STK014
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_stk014.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_stk014)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-stk014/description
+ The Syntek DV4000 (STK014) USB Camera Driver (stk014) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-stk014))
+
+
+define KernelPackage/video-gspca-sunplus
+  TITLE:=sunplus webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_SUNPLUS
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sunplus.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_sunplus)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-sunplus/description
+ The SUNPLUS USB Camera Driver (sunplus) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-sunplus))
+
+
+define KernelPackage/video-gspca-t613
+  TITLE:=t613 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_T613
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_t613.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_t613)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-t613/description
+ The T613 (JPEG Compliance) USB Camera Driver (t613) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-t613))
+
+
+define KernelPackage/video-gspca-tv8532
+  TITLE:=tv8532 webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_TV8532
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_tv8532.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_tv8532)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-tv8532/description
+ The TV8532 USB Camera Driver (tv8532) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-tv8532))
+
+
+define KernelPackage/video-gspca-vc032x
+  TITLE:=vc032x webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_VC032X
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_vc032x.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_vc032x)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-vc032x/description
+ The VC032X USB Camera Driver (vc032x) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-vc032x))
+
+
+define KernelPackage/video-gspca-zc3xx
+  TITLE:=zc3xx webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_ZC3XX
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_zc3xx.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_zc3xx)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-zc3xx/description
+ The ZC3XX USB Camera Driver (zc3xx) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-zc3xx))
+
+
+define KernelPackage/video-gspca-m5602
+  TITLE:=m5602 webcam support
+  KCONFIG:=CONFIG_USB_M5602
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/m5602/gspca_m5602.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_m5602)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-m5602/description
+ The ALi USB m5602 Camera Driver (m5602) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-m5602))
+
+
+define KernelPackage/video-gspca-stv06xx
+  TITLE:=stv06xx webcam support
+  KCONFIG:=CONFIG_USB_STV06XX
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/stv06xx/gspca_stv06xx.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_stv06xx)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-stv06xx/description
+ The STV06XX USB Camera Driver (stv06xx) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-stv06xx))
+
+
+define KernelPackage/video-gspca-gl860
+  TITLE:=gl860 webcam support
+  KCONFIG:=CONFIG_USB_GL860
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gl860/gspca_gl860.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_gl860)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-gl800/description
+ The GL860 USB Camera Driver (gl860) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-gl860))
+
+
+define KernelPackage/video-gspca-jeilinj
+  TITLE:=jeilinj webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_JEILINJ
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_jeilinj.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_jeilinj)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-jeilinj/description
+ The JEILINJ USB Camera Driver (jeilinj) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-jeilinj))
+
+
+define KernelPackage/video-gspca-konica
+  TITLE:=konica webcam support
+  KCONFIG:=CONFIG_USB_GSPCA_KONICA
+  FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_konica.ko
+  AUTOLOAD:=$(call AutoProbe,gspca_konica)
+  $(call AddDepends/camera-gspca)
+endef
+
+define KernelPackage/video-gspca-konica/description
+ The Konica USB Camera Driver (konica) kernel module
+endef
+
+$(eval $(call KernelPackage,video-gspca-konica))
diff --git a/trunk/package/kernel/linux/modules/virtual.mk b/trunk/package/kernel/linux/modules/virtual.mk
new file mode 100644
index 00000000..190d8446
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/virtual.mk
@@ -0,0 +1,188 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+VIRTUAL_MENU:=Virtualization Support
+
+define KernelPackage/virtio-balloon
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=VirtIO balloon driver
+  DEPENDS:=@TARGET_x86_kvm_guest
+  KCONFIG:=CONFIG_VIRTIO_BALLOON
+  FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.ko
+  AUTOLOAD:=$(call AutoLoad,06,virtio-balloon)
+endef
+
+define KernelPackage/virtio-balloon/description
+ Kernel module for VirtIO memory ballooning support
+endef
+
+$(eval $(call KernelPackage,virtio-balloon))
+
+
+define KernelPackage/virtio-net
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=VirtIO network driver
+  DEPENDS:=@TARGET_x86_kvm_guest
+  KCONFIG:=CONFIG_VIRTIO_NET
+  FILES:=$(LINUX_DIR)/drivers/net/virtio_net.ko
+  AUTOLOAD:=$(call AutoLoad,50,virtio_net)
+endef
+
+define KernelPackage/virtio-net/description
+ Kernel module for the VirtIO paravirtualized network device
+endef
+
+$(eval $(call KernelPackage,virtio-net))
+
+
+define KernelPackage/virtio-random
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=VirtIO Random Number Generator support
+  DEPENDS:=@TARGET_x86_kvm_guest
+  KCONFIG:=CONFIG_HW_RANDOM_VIRTIO
+  FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.ko
+  AUTOLOAD:=$(call AutoLoad,09,virtio-rng)
+endef
+
+define KernelPackage/virtio-random/description
+ Kernel module for the VirtIO Random Number Generator
+endef
+
+$(eval $(call KernelPackage,virtio-random))
+
+
+define KernelPackage/xen-privcmd
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen private commands
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_PRIVCMD
+  FILES:=$(LINUX_DIR)/drivers/xen/xen-privcmd.ko
+  AUTOLOAD:=$(call AutoLoad,04,xen-privcmd)
+endef
+
+define KernelPackage/xen-privcmd/description
+ Kernel module for Xen private commands
+endef
+
+$(eval $(call KernelPackage,xen-privcmd))
+
+
+define KernelPackage/xen-fs
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen filesystem
+  DEPENDS:=@TARGET_x86_xen_domu +kmod-xen-privcmd
+  KCONFIG:= \
+  	CONFIG_XENFS \
+  	CONFIG_XEN_COMPAT_XENFS=y
+  FILES:=$(LINUX_DIR)/drivers/xen/xenfs/xenfs.ko
+  AUTOLOAD:=$(call AutoLoad,05,xenfs)
+endef
+
+define KernelPackage/xen-fs/description
+ Kernel module for the Xen filesystem
+endef
+
+$(eval $(call KernelPackage,xen-fs))
+
+
+define KernelPackage/xen-evtchn
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen event channels
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_DEV_EVTCHN
+  FILES:=$(LINUX_DIR)/drivers/xen/xen-evtchn.ko
+  AUTOLOAD:=$(call AutoLoad,06,xen-evtchn)
+endef
+
+define KernelPackage/xen-evtchn/description
+ Kernel module for the /dev/xen/evtchn device
+endef
+
+$(eval $(call KernelPackage,xen-evtchn))
+
+define KernelPackage/xen-fbdev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen virtual frame buffer
+  DEPENDS:=@TARGET_x86_xen_domu +kmod-fb
+  KCONFIG:= \
+  	CONFIG_XEN_FBDEV_FRONTEND \
+  	CONFIG_FB_DEFERRED_IO=y \
+  	CONFIG_FB_SYS_COPYAREA \
+  	CONFIG_FB_SYS_FILLRECT \
+  	CONFIG_FB_SYS_FOPS \
+  	CONFIG_FB_SYS_IMAGEBLIT \
+  	CONFIG_FIRMWARE_EDID=n
+  FILES:= \
+  	$(LINUX_DIR)/drivers/video/xen-fbfront.ko \
+  	$(LINUX_DIR)/drivers/video/syscopyarea.ko \
+  	$(LINUX_DIR)/drivers/video/sysfillrect.ko \
+  	$(LINUX_DIR)/drivers/video/fb_sys_fops.ko \
+  	$(LINUX_DIR)/drivers/video/sysimgblt.ko
+  AUTOLOAD:=$(call AutoLoad,07, \
+  	fb \
+  	syscopyarea \
+  	sysfillrect \
+  	fb_sys_fops \
+  	sysimgblt \
+  	xen-fbfront \
+  )
+endef
+
+define KernelPackage/xen-fbdev/description
+ Kernel module for the Xen virtual frame buffer
+endef
+
+$(eval $(call KernelPackage,xen-fbdev))
+
+
+define KernelPackage/xen-kbddev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen virtual keyboard and mouse
+  DEPENDS:=@TARGET_x86_xen_domu +kmod-input-core
+  KCONFIG:=CONFIG_INPUT_MISC=y \
+	CONFIG_INPUT_XEN_KBDDEV_FRONTEND
+  FILES:=$(LINUX_DIR)/drivers/input/misc/xen-kbdfront.ko
+  AUTOLOAD:=$(call AutoLoad,08,xen-kbdfront)
+endef
+
+define KernelPackage/xen-kbddev/description
+ Kernel module for the Xen virtual keyboard and mouse
+endef
+
+$(eval $(call KernelPackage,xen-kbddev))
+
+
+define KernelPackage/xen-netdev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen network device frontend
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_NETDEV_FRONTEND
+  FILES:=$(LINUX_DIR)/drivers/net/xen-netfront.ko
+  AUTOLOAD:=$(call AutoLoad,09,xen-netfront)
+endef
+
+define KernelPackage/xen-netdev/description
+ Kernel module for the Xen network device frontend
+endef
+
+$(eval $(call KernelPackage,xen-netdev))
+
+
+define KernelPackage/xen-pcidev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen PCI device frontend
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND
+  FILES:=$(LINUX_DIR)/drivers/pci/xen-pcifront.ko
+  AUTOLOAD:=$(call AutoLoad,10,xen-pcifront)
+endef
+
+define KernelPackage/xen-pcidev/description
+ Kernel module for the Xen network device frontend
+endef
+
+$(eval $(call KernelPackage,xen-pcidev))
diff --git a/trunk/package/kernel/linux/modules/w1.mk b/trunk/package/kernel/linux/modules/w1.mk
new file mode 100644
index 00000000..c2fc6495
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/w1.mk
@@ -0,0 +1,176 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+W1_MENU:=W1 support
+W1_MASTERS_DIR:=$(LINUX_DIR)/drivers/w1/masters
+W1_SLAVES_DIR:=$(LINUX_DIR)/drivers/w1/slaves
+
+define KernelPackage/w1
+  SUBMENU:=$(W1_MENU)
+  TITLE:=Dallas's 1-wire support
+  KCONFIG:=CONFIG_W1
+  FILES:=$(LINUX_DIR)/drivers/w1/wire.ko
+endef
+
+define KernelPackage/w1/description
+ Kernel module for Dallas's 1-wire support
+endef
+
+$(eval $(call KernelPackage,w1))
+
+
+define AddDepends/w1
+  SUBMENU:=$(W1_MENU)
+  DEPENDS+=kmod-w1 $(1)
+endef
+
+
+#
+# 1-wire masters
+#
+define KernelPackage/w1-master-gpio
+  TITLE:=GPIO 1-wire bus master driver
+  DEPENDS:=@GPIO_SUPPORT
+  KCONFIG:=CONFIG_W1_MASTER_GPIO
+  FILES:=$(W1_MASTERS_DIR)/w1-gpio.ko
+  AUTOLOAD:=$(call AutoProbe,w1-gpio)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-master-gpio/description
+ Kernel module for the GPIO 1-wire bus master driver
+endef
+
+$(eval $(call KernelPackage,w1-master-gpio))
+
+define KernelPackage/w1-master-ds2482
+  TITLE:=DS2482 1-wire i2c bus master driver
+  KCONFIG:=CONFIG_W1_MASTER_DS2482
+  FILES:=$(W1_MASTERS_DIR)/ds2482.ko
+  AUTOLOAD:=$(call AutoProbe,ds2482)
+  $(call AddDepends/w1,+kmod-i2c-core)
+endef
+
+define KernelPackage/w1-master-ds2482/description
+ Kernel module for the DS2482 i2c 1-wire bus master driver
+ NOTE: Init with: echo ds2482 0x18 > /sys/bus/i2c/devices/i2c-0/new_device
+ or use owfs
+endef
+
+$(eval $(call KernelPackage,w1-master-ds2482))
+
+
+define KernelPackage/w1-master-ds2490
+  TITLE:=DS2490 1-wire usb bus master driver
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
+  KCONFIG:=CONFIG_W1_MASTER_DS2490
+  FILES:=$(W1_MASTERS_DIR)/ds2490.ko
+  AUTOLOAD:=$(call AutoProbe,ds2490)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-master-ds2490/description
+ Kernel module for the DS2490 usb 1-wire bus master driver
+endef
+
+$(eval $(call KernelPackage,w1-master-ds2490))
+
+
+define KernelPackage/w1-master-mxc
+  TITLE:=Freescale MXC 1-wire busmaster
+  DEPENDS:=@(TARGET_mxs||TARGET_imx6)
+  KCONFIG:=CONFIG_W1_MASTER_MXC
+  FILES:=$(W1_MASTERS_DIR)/mxc_w1.ko
+  AUTOLOAD:=$(call AutoProbe,mxc_w1)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-master-mxc/description
+ Kernel module for 1-wire Freescale MXC 1-wire busmaster
+endef
+
+$(eval $(call KernelPackage,w1-master-mxc))
+
+
+#
+# 1-wire slaves
+#
+define KernelPackage/w1-slave-therm
+  TITLE:=Thermal family implementation
+  KCONFIG:=CONFIG_W1_SLAVE_THERM
+  FILES:=$(W1_SLAVES_DIR)/w1_therm.ko
+  AUTOLOAD:=$(call AutoProbe,w1_therm)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-slave-therm/description
+ Kernel module for 1-wire thermal sensors
+endef
+
+$(eval $(call KernelPackage,w1-slave-therm))
+
+
+define KernelPackage/w1-slave-smem
+  TITLE:=Simple 64bit memory family implementation
+  KCONFIG:=CONFIG_W1_SLAVE_SMEM
+  FILES:=$(W1_SLAVES_DIR)/w1_smem.ko
+  AUTOLOAD:=$(call AutoProbe,w1_smem)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-slave-smem/description
+ Kernel module for 1-wire simple 64bit memory rom(ds2401/ds2411/ds1990*)
+endef
+
+$(eval $(call KernelPackage,w1-slave-smem))
+
+define KernelPackage/w1-slave-ds2431
+  TITLE:=DS2431 1kb EEPROM driver
+  KCONFIG:= CONFIG_W1_SLAVE_DS2431
+  FILES:=$(W1_SLAVES_DIR)/w1_ds2431.ko
+  AUTOLOAD:=$(call AutoProbe,w1_ds2431)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-slave-ds2431/description
+ Kernel module for 1-wire 1kb EEPROM (DS2431)
+endef
+
+$(eval $(call KernelPackage,w1-slave-ds2431))
+
+define KernelPackage/w1-slave-ds2433
+  TITLE:=DS2433 4kb EEPROM driver
+  KCONFIG:= \
+	CONFIG_W1_SLAVE_DS2433 \
+	CONFIG_W1_SLAVE_DS2433_CRC=n
+  FILES:=$(W1_SLAVES_DIR)/w1_ds2433.ko
+  AUTOLOAD:=$(call AutoProbe,w1_ds2433)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-slave-ds2433/description
+ Kernel module for 1-wire 4kb EEPROM (DS2433)
+endef
+
+$(eval $(call KernelPackage,w1-slave-ds2433))
+
+
+define KernelPackage/w1-slave-ds2760
+  TITLE:=Dallas 2760 battery monitor chip (HP iPAQ & others)
+  KCONFIG:= \
+	CONFIG_W1_SLAVE_DS2760 \
+	CONFIG_W1_SLAVE_DS2433_CRC=n
+  FILES:=$(W1_SLAVES_DIR)/w1_ds2760.ko
+  AUTOLOAD:=$(call AutoProbe,w1_ds2760)
+  $(call AddDepends/w1)
+endef
+
+define KernelPackage/w1-slave-ds2760/description
+ Kernel module for 1-wire DS2760 battery monitor chip support
+endef
+
+$(eval $(call KernelPackage,w1-slave-ds2760))
diff --git a/trunk/package/kernel/linux/modules/wireless.mk b/trunk/package/kernel/linux/modules/wireless.mk
new file mode 100644
index 00000000..f1c1d4ba
--- /dev/null
+++ b/trunk/package/kernel/linux/modules/wireless.mk
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+WIRELESS_MENU:=Wireless Drivers
diff --git a/trunk/package/kernel/mac80211/Makefile b/trunk/package/kernel/mac80211/Makefile
new file mode 100644
index 00000000..2cb91cc9
--- /dev/null
+++ b/trunk/package/kernel/mac80211/Makefile
@@ -0,0 +1,410 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mac80211
+
+PKG_VERSION:=2014-11-04-librecmc
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=http://downloads.librecmc.org/sources/v1.3
+PKG_BACKPORT_VERSION:=
+PKG_MD5SUM:=d612b84e904a8e486b17298ef770d9d6
+
+PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_DRIVERS = \
+	ath5k mac80211-hwsim carl9170 ath9k-common ath9k ath9k-htc ath lib80211 
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_PACKAGE_kmod-mac80211 \
+	$(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \
+	CONFIG_PACKAGE_MAC80211_DEBUGFS \
+	CONFIG_PACKAGE_MAC80211_MESH \
+	CONFIG_PACKAGE_ATH_DEBUG \
+	CONFIG_PACKAGE_ATH_DFS \
+	CONFIG_ATH_USER_REGD \
+
+include $(INCLUDE_DIR)/package.mk
+
+WMENU:=Wireless Drivers
+
+define KernelPackage/mac80211/Default
+  SUBMENU:=$(WMENU)
+  URL:=http://linuxwireless.org/
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+  DEPENDS:=@(!(TARGET_avr32||TARGET_ps3||TARGET_pxcab)||BROKEN)
+endef
+
+define KernelPackage/cfg80211
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=cfg80211 - wireless configuration API
+  DEPENDS+= +iw
+  FILES:= \
+	$(PKG_BUILD_DIR)/compat/compat.ko \
+	$(PKG_BUILD_DIR)/net/wireless/cfg80211.ko
+endef
+
+define KernelPackage/cfg80211/description
+cfg80211 is the Linux wireless LAN (802.11) configuration API.
+endef
+
+define KernelPackage/mac80211
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Linux 802.11 Wireless Networking Stack
+  DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211 +hostapd-common
+  KCONFIG:=\
+	CONFIG_AVERAGE=y
+  FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
+  MENU:=1
+endef
+
+define KernelPackage/mac80211/config
+  if PACKAGE_kmod-mac80211
+
+	config PACKAGE_MAC80211_DEBUGFS
+		bool "Export mac80211 internals in DebugFS"
+		select KERNEL_DEBUG_FS
+		select KERNEL_RELAY if PACKAGE_kmod-ath9k-common
+		default y
+		help
+		  Select this to see extensive information about
+		  the internal state of mac80211 in debugfs.
+
+	config PACKAGE_MAC80211_MESH
+		bool "Enable 802.11s mesh support"
+		default y
+
+  endif
+endef
+
+define KernelPackage/mac80211/description
+Generic IEEE 802.11 Networking Stack (mac80211)
+endef
+
+
+define KernelPackage/ath/config
+  if PACKAGE_kmod-ath
+	config ATH_USER_REGD
+		bool "Force Atheros drivers to respect the user's regdomain settings"
+		help
+		  Atheros' idea of regulatory handling is that the EEPROM of the card defines
+		  the regulatory limits and the user is only allowed to restrict the settings
+		  even further, even if the country allows frequencies or power levels that
+		  are forbidden by the EEPROM settings.
+
+		  Select this option if you want the driver to respect the user's decision about
+		  regulatory settings.
+
+	config PACKAGE_ATH_DEBUG
+		bool "Atheros wireless debugging"
+		help
+		  Say Y, if you want to debug atheros wireless drivers.
+		  Right now only ath9k makes use of this.
+
+	config PACKAGE_ATH_DFS
+		bool "Enable DFS support"
+		default y
+		help
+		  Dynamic frequency selection (DFS) is required for most of the 5 GHz band
+		  channels in Europe, US, and Japan.
+
+		  Select this option if you want to use such channels.
+
+  endif
+endef
+
+define KernelPackage/ath
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Atheros common driver part
+  DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx||TARGET_atheros +kmod-mac80211
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko
+  MENU:=1
+endef
+
+define KernelPackage/ath/description
+ This module contains some common parts needed by Atheros Wireless drivers.
+endef
+
+define KernelPackage/ath5k
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Atheros 5xxx wireless cards support
+  URL:=http://linuxwireless.org/en/users/Drivers/ath5k
+  DEPENDS+= @PCI_SUPPORT||@TARGET_atheros +kmod-ath
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.ko
+  AUTOLOAD:=$(call AutoProbe,ath5k)
+endef
+
+define KernelPackage/ath5k/description
+ This module adds support for wireless adapters based on
+ Atheros 5xxx chipset.
+endef
+
+define KernelPackage/ath9k-common
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc)
+  URL:=http://linuxwireless.org/en/users/Drivers/ath9k
+  DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+endef
+
+define KernelPackage/ath9k
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Atheros 802.11n PCI wireless cards support
+  URL:=http://linuxwireless.org/en/users/Drivers/ath9k
+  DEPENDS+= @PCI_SUPPORT||TARGET_ar71xx +kmod-ath9k-common
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.ko
+  AUTOLOAD:=$(call AutoProbe,ath9k)
+endef
+
+define KernelPackage/ath9k/description
+This module adds support for wireless adapters based on
+Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets.
+endef
+
+define KernelPackage/ath9k/config
+
+	config ATH9K_SUPPORT_PCOEM
+		bool "Support chips used in PC OEM cards"
+		depends on PACKAGE_kmod-ath9k
+	
+endef
+
+define KernelPackage/ath9k-htc
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Atheros 802.11n USB device support
+  URL:=http://linuxwireless.org/en/users/Drivers/ath9k
+  DEPENDS+= @USB_SUPPORT +kmod-ath9k-common +kmod-usb-core
+  FILES:= \
+	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+  AUTOLOAD:=$(call AutoProbe,ath9k_htc)
+endef
+
+define KernelPackage/ath9k-htc/description
+This module adds support for wireless adapters based on
+Atheros USB AR9271 and AR7010 family of chipsets.
+endef
+
+define KernelPackage/carl9170
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Driver for Atheros AR9170 USB sticks
+  DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core +kmod-input-core +@DRIVER_11N_SUPPORT
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170/carl9170.ko
+  AUTOLOAD:=$(call AutoProbe,carl9170)
+endef
+
+define KernelPackage/lib80211
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=802.11 Networking stack
+  DEPENDS:=+kmod-cfg80211
+  FILES:= \
+	$(PKG_BUILD_DIR)/net/wireless/lib80211.ko \
+	$(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \
+	$(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_ccmp.ko \
+	$(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_tkip.ko
+  AUTOLOAD:=$(call AutoProbe, \
+	lib80211 \
+	lib80211_crypt_wep \
+	lib80211_crypt_ccmp \
+	lib80211_crypt_tkip \
+  )
+endef
+
+define KernelPackage/lib80211/description
+ Kernel modules for 802.11 Networking stack
+ Includes:
+ - lib80211
+ - lib80211_crypt_wep
+ - lib80211_crypt_tkip
+ - lib80211_crytp_ccmp
+endef
+
+define KernelPackage/mac80211-hwsim
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=mac80211 HW simulation device
+  DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.ko
+  AUTOLOAD:=$(call AutoProbe,mac80211_hwsim)
+endef
+
+
+
+
+
+
+
+config_package=$(if $(CONFIG_PACKAGE_kmod-$(1)),m)
+
+config-y:= \
+	WLAN \
+	NL80211_TESTMODE \
+	CFG80211_WEXT \
+	CFG80211_INTERNAL_REGDB \
+	CFG80211_CERTIFICATION_ONUS \
+	MAC80211_RC_MINSTREL \
+	MAC80211_RC_MINSTREL_HT \
+	MAC80211_RC_MINSTREL_VHT \
+	MAC80211_RC_DEFAULT_MINSTREL \
+
+config-$(call config_package,cfg80211) += CFG80211
+
+config-$(call config_package,mac80211) += MAC80211
+config-$(CONFIG_PACKAGE_MAC80211_MESH) += MAC80211_MESH
+ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
+  config-y += \
+	CFG80211_DEBUGFS \
+	MAC80211_DEBUGFS \
+	ATH9K_DEBUGFS \
+	ATH9K_HTC_DEBUGFS \
+	CARL9170_DEBUGFS \
+	ATH5K_DEBUG
+endif
+
+config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP
+
+config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
+config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
+config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
+
+config-$(call config_package,ath9k) += ATH9K
+config-$(call config_package,ath9k-common) += ATH9K_COMMON
+config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB
+config-$(CONFIG_PCI) += ATH9K_PCI
+config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD
+config-$(CONFIG_ATH9K_SUPPORT_PCOEM) += ATH9K_PCOEM
+
+config-$(call config_package,ath9k-htc) += ATH9K_HTC
+
+config-$(call config_package,ath5k) += ATH5K
+ifdef CONFIG_TARGET_atheros
+  config-y += ATH5K_AHB
+else
+  config-y += ATH5K_PCI
+endif
+
+config-$(call config_package,carl9170) += CARL9170
+
+config-$(call config_package,mac80211-hwsim) += MAC80211_HWSIM
+
+config-$(CONFIG_PACKAGE_RTLWIFI_DEBUG) += RTLWIFI_DEBUG
+
+config-$(CONFIG_LEDS_TRIGGERS) += MAC80211_LEDS B43_LEDS B43LEGACY_LEDS
+
+MAKE_OPTS:= -C "$(PKG_BUILD_DIR)" \
+	CROSS_COMPILE="$(KERNEL_CROSS)" \
+	ARCH="$(LINUX_KARCH)" \
+	EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include" \
+	KLIB_BUILD="$(LINUX_DIR)" \
+	MODPROBE=true \
+	KLIB=$(TARGET_MODULES_DIR) \
+	KERNEL_SUBLEVEL=$(lastword $(subst ., ,$(KERNEL_PATCHVER))) \
+	KBUILD_LDFLAGS_MODULE_PREREQ=
+
+ifneq ($(findstring c,$(LIBRECMC_VERBOSE)),)
+  MAKE_OPTS += V=1
+endif
+
+define ConfigVars
+$(subst $(space),,$(foreach opt,$(config-$(1)),CPTCFG_$(opt)=$(1)
+))
+endef
+
+define mac80211_config
+$(call ConfigVars,m)$(call ConfigVars,y)
+endef
+$(eval $(call shexport,mac80211_config))
+
+define Build/Prepare
+	rm -rf $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
+	$(PKG_UNPACK)
+	$(Build/Patch)
+	rm -rf \
+		$(PKG_BUILD_DIR)/include/linux/ssb \
+		$(PKG_BUILD_DIR)/include/linux/bcma \
+		$(PKG_BUILD_DIR)/include/net/bluetooth
+
+	rm -f \
+		$(PKG_BUILD_DIR)/include/linux/cordic.h \
+		$(PKG_BUILD_DIR)/include/linux/crc8.h \
+		$(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h \
+		$(PKG_BUILD_DIR)/include/linux/wl12xx.h \
+		$(PKG_BUILD_DIR)/include/linux/spi/libertas_spi.h \
+		$(PKG_BUILD_DIR)/include/net/ieee80211.h
+
+	echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version
+	$(CP) ./files/regdb.txt $(PKG_BUILD_DIR)/net/wireless/db.txt
+endef
+
+ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)
+ define Build/Compile/kmod
+	rm -rf $(PKG_BUILD_DIR)/modules
+	+$(MAKE) $(PKG_JOBS) $(MAKE_OPTS) modules
+ endef
+endif
+
+define Build/Configure
+	cmp $(PKG_BUILD_DIR)/include/linux/ath9k_platform.h $(LINUX_DIR)/include/linux/ath9k_platform.h
+	cmp $(PKG_BUILD_DIR)/include/linux/ath5k_platform.h $(LINUX_DIR)/include/linux/ath5k_platform.h
+endef
+
+define Build/Compile
+	$(SH_FUNC) var2file "$(call shvar,mac80211_config)" $(PKG_BUILD_DIR)/.config
+	$(MAKE) $(MAKE_OPTS) allnoconfig
+	$(call Build/Compile/kmod)
+endef
+
+define Build/InstallDev
+	mkdir -p \
+		$(1)/usr/include/mac80211 \
+		$(1)/usr/include/mac80211-backport \
+		$(1)/usr/include/mac80211/ath \
+		$(1)/usr/include/net/mac80211
+	$(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
+	$(CP) $(PKG_BUILD_DIR)/backport-include/* $(1)/usr/include/mac80211-backport/
+	$(CP) $(PKG_BUILD_DIR)/net/mac80211/rate.h $(1)/usr/include/net/mac80211/
+	$(CP) $(PKG_BUILD_DIR)/drivers/net/wireless/ath/*.h $(1)/usr/include/mac80211/ath/
+endef
+
+define KernelPackage/cfg80211/install
+	$(INSTALL_DIR) $(1)/lib/wifi $(1)/lib/netifd/wireless
+	$(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
+	$(INSTALL_BIN) ./files/lib/netifd/wireless/mac80211.sh $(1)/lib/netifd/wireless
+endef
+
+define KernelPackage/carl9170/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/carl9170-1.fw $(1)/lib/firmware
+endef
+
+define KernelPackage/ath9k-htc/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_9271.fw \
+		$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_7010.fw \
+		$(1)/lib/firmware/
+endef
+
+
+$(eval $(call KernelPackage,ath5k))
+$(eval $(call KernelPackage,lib80211))
+$(eval $(call KernelPackage,cfg80211))
+$(eval $(call KernelPackage,mac80211))
+$(eval $(call KernelPackage,mac80211-hwsim))
+$(eval $(call KernelPackage,ath9k-common))
+$(eval $(call KernelPackage,ath9k))
+$(eval $(call KernelPackage,ath9k-htc))
+$(eval $(call KernelPackage,ath))
+$(eval $(call KernelPackage,carl9170))
diff --git a/trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
new file mode 100644
index 00000000..d8fa07e2
--- /dev/null
+++ b/trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -0,0 +1,708 @@
+#!/bin/sh
+. /lib/netifd/netifd-wireless.sh
+. /lib/netifd/hostapd.sh
+
+init_wireless_driver "$@"
+
+MP_CONFIG_INT="mesh_retry_timeout mesh_confirm_timeout mesh_holding_timeout mesh_max_peer_links
+	       mesh_max_retries mesh_ttl mesh_element_ttl mesh_hwmp_max_preq_retries
+	       mesh_path_refresh_time mesh_min_discovery_timeout mesh_hwmp_active_path_timeout
+	       mesh_hwmp_preq_min_interval mesh_hwmp_net_diameter_traversal_time mesh_hwmp_rootmode
+	       mesh_hwmp_rann_interval mesh_gate_announcements mesh_sync_offset_max_neighor
+	       mesh_rssi_threshold mesh_hwmp_active_path_to_root_timeout mesh_hwmp_root_interval
+	       mesh_hwmp_confirmation_interval mesh_awake_window mesh_plink_timeout"
+MP_CONFIG_BOOL="mesh_auto_open_plinks mesh_fwding"
+MP_CONFIG_STRING="mesh_power_mode"
+
+drv_mac80211_init_device_config() {
+	hostapd_common_add_device_config
+
+	config_add_string path phy 'macaddr:macaddr'
+	config_add_string hwmode
+	config_add_int beacon_int chanbw frag rts
+	config_add_int rxantenna txantenna antenna_gain txpower distance
+	config_add_boolean noscan
+	config_add_array ht_capab
+	config_add_boolean \
+		rxldpc \
+		short_gi_80 \
+		short_gi_160 \
+		tx_stbc_2by1 \
+		su_beamformer \
+		su_beamformee \
+		mu_beamformer \
+		mu_beamformee \
+		vht_txop_ps \
+		htc_vht \
+		rx_antenna_pattern \
+		tx_antenna_pattern
+	config_add_int vht_max_a_mpdu_len_exp vht_max_mpdu vht_link_adapt vht160 rx_stbc tx_stbc
+	config_add_boolean \
+		ldpc \
+		greenfield \
+		short_gi_20 \
+		short_gi_40 \
+		dsss_cck_40
+}
+
+drv_mac80211_init_iface_config() {
+	hostapd_common_add_bss_config
+
+	config_add_string 'macaddr:macaddr' ifname
+
+	config_add_boolean wds powersave
+	config_add_int maxassoc
+	config_add_int max_listen_int
+	config_add_int dtim_period
+
+	# mesh
+	config_add_string mesh_id
+	config_add_int $MP_CONFIG_INT
+	config_add_boolean $MP_CONFIG_BOOL
+	config_add_string $MP_CONFIG_STRING
+}
+
+mac80211_add_capabilities() {
+	local __var="$1"; shift
+	local __mask="$1"; shift
+	local __out= oifs
+
+	oifs="$IFS"
+	IFS=:
+	for capab in "$@"; do
+		set -- $capab
+
+		[ "$(($4))" -gt 0 ] || continue
+		[ "$(($__mask & $2))" -eq "$((${3:-$2}))" ] || continue
+		__out="$__out[$1]"
+	done
+	IFS="$oifs"
+
+	export -n -- "$__var=$__out"
+}
+
+mac80211_hostapd_setup_base() {
+	local phy="$1"
+
+	json_select config
+
+	[ "$auto_channel" -gt 0 ] && channel=acs_survey
+
+	json_get_vars noscan htmode
+	json_get_values ht_capab_list ht_capab
+
+	ieee80211n=1
+	ht_capab=
+	case "$htmode" in
+		VHT20|HT20) ;;
+		HT40*|VHT40|VHT80|VHT160)
+			case "$hwmode" in
+				a)
+					case "$(( ($channel / 4) % 2 ))" in
+						1) ht_capab="[HT40+]";;
+						0) ht_capab="[HT40-]";;
+					esac
+				;;
+				*)
+					case "$htmode" in
+						HT40+) ht_capab="[HT40+]";;
+						HT40-) ht_capab="[HT40-]";;
+						*)
+							if [ "$channel" -lt 7 ]; then
+								ht_capab="[HT40+]"
+							else
+								ht_capab="[HT40-]"
+							fi
+						;;
+					esac
+				;;
+			esac
+			[ "$auto_channel" -gt 0 ] && ht_capab="[HT40+]"
+		;;
+		*) ieee80211n= ;;
+	esac
+
+	[ -n "$ieee80211n" ] && {
+		append base_cfg "ieee80211n=1" "$N"
+
+		json_get_vars \
+			ldpc:1 \
+			greenfield:0 \
+			short_gi_20:1 \
+			short_gi_40:1 \
+			tx_stbc:1 \
+			rx_stbc:3 \
+			dsss_cck_40:1
+
+		ht_cap_mask=0
+		for cap in $(iw phy "$phy" info | grep 'Capabilities:' | cut -d: -f2); do
+			ht_cap_mask="$(($ht_cap_mask | $cap))"
+		done
+
+		cap_rx_stbc=$((($ht_cap_mask >> 8) & 3))
+		[ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
+		ht_cap_mask="$(( ($ht_cap_mask & ~(0x300)) | ($cap_rx_stbc << 8) ))"
+
+		mac80211_add_capabilities ht_capab_flags $ht_cap_mask \
+			LDPC:0x1::$ldpc \
+			GF:0x10::$greenfield \
+			SHORT-GI-20:0x20::$short_gi_20 \
+			SHORT-GI-40:0x40::$short_gi_40 \
+			TX-STBC:0x80::$tx_stbc \
+			RX-STBC1:0x300:0x100:1 \
+			RX-STBC12:0x300:0x200:1 \
+			RX-STBC123:0x300:0x300:1 \
+			DSSS_CCK-40:0x1000::$dsss_cck_40
+
+		ht_capab="$ht_capab$ht_capab_flags"
+		[ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N"
+	}
+
+	# 802.11ac
+	enable_ac=0
+	idx="$channel"
+	case "$htmode" in
+		VHT20) enable_ac=1;;
+		VHT40)
+			case "$(( ($channel / 4) % 2 ))" in
+				1) idx=$(($channel + 2));;
+				0) idx=$(($channel - 2));;
+			esac
+			enable_ac=1
+			append base_cfg "vht_oper_chwidth=0" "$N"
+			append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
+		;;
+		VHT80)
+			case "$(( ($channel / 4) % 4 ))" in
+				1) idx=$(($channel + 6));;
+				2) idx=$(($channel + 2));;
+				3) idx=$(($channel - 2));;
+				0) idx=$(($channel - 6));;
+			esac
+			enable_ac=1
+			append base_cfg "vht_oper_chwidth=1" "$N"
+			append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
+		;;
+		VHT160)
+			case "$channel" in
+				36|40|44|48|52|56|60|64) idx=50;;
+				100|104|108|112|116|120|124|128) idx=114;;
+			esac
+			enable_ac=1
+			append base_cfg "vht_oper_chwidth=2" "$N"
+			append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
+		;;
+	esac
+
+	if [ "$enable_ac" != "0" ]; then
+		json_get_vars \
+			rxldpc:1 \
+			short_gi_80:1 \
+			short_gi_160:1 \
+			tx_stbc_2by1:1 \
+			su_beamformer:1 \
+			su_beamformee:1 \
+			mu_beamformer:1 \
+			mu_beamformee:1 \
+			vht_txop_ps:1 \
+			htc_vht:1 \
+			rx_antenna_pattern:1 \
+			tx_antenna_pattern:1 \
+			vht_max_a_mpdu_len_exp:7 \
+			vht_max_mpdu:11454 \
+			rx_stbc:4 \
+			tx_stbc:4 \
+			vht_link_adapt:3 \
+			vht160:2
+
+		append base_cfg "ieee80211ac=1" "$N"
+		vht_cap=0
+		for cap in $(iw phy "$phy" info | awk -F "[()]" '/VHT Capabilities/ { print $2 }'); do
+			vht_cap="$(($vht_cap | $cap))"
+		done
+
+		cap_rx_stbc=$((($vht_cap >> 8) & 7))
+		[ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
+		ht_cap_mask="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
+
+		mac80211_add_capabilities vht_capab $vht_cap \
+			RXLDPC:0x10::$rxldpc \
+			SHORT-GI-80:0x20::$short_gi_80 \
+			SHORT-GI-160:0x40::$short_gi_160 \
+			TX-STBC-2BY1:0x80::$tx_stbc \
+			SU-BEAMFORMER:0x800::$su_beamformer \
+			SU-BEAMFORMEE:0x1000::$su_beamformee \
+			MU-BEAMFORMER:0x80000::$mu_beamformer \
+			MU-BEAMFORMEE:0x100000::$mu_beamformee \
+			VHT-TXOP-PS:0x200000::$vht_txop_ps \
+			HTC-VHT:0x400000::$htc_vht \
+			RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \
+			TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \
+			RX-STBC1:0x700:0x100:1 \
+			RX-STBC12:0x700:0x200:1 \
+			RX-STBC123:0x700:0x300:1 \
+			RX-STBC1234:0x700:0x400:1 \
+
+		# supported Channel widths
+		vht160_hw=0
+		[ "$(($vht_cap & 12))" -eq 4 -a 1 -le "$vht160" ] && \
+			vht160_hw=1
+		[ "$(($vht_cap & 12))" -eq 8 -a 2 -le "$vht160" ] && \
+			vht160_hw=2
+		[ "$vht160_hw" = 1 ] && vht_capab="$vht_capab[VHT160]"
+		[ "$vht160_hw" = 2 ] && vht_capab="$vht_capab[VHT160-80PLUS80]"
+
+		# maximum MPDU length
+		vht_max_mpdu_hw=3895
+		[ "$(($vht_cap & 3))" -ge 1 -a 7991 -le "$vht_max_mpdu" ] && \
+			vht_max_mpdu_hw=7991
+		[ "$(($vht_cap & 3))" -ge 2 -a 11454 -le "$vht_max_mpdu" ] && \
+			vht_max_mpdu_hw=11454
+		[ "$vht_max_mpdu_hw" != 3895 ] && \
+			vht_capab="$vht_capab[MAX-MPDU-$vht_max_mpdu_hw]"
+			
+		# maximum A-MPDU length exponent
+		vht_max_a_mpdu_len_exp_hw=0
+		[ "$(($vht_cap & 58720256))" -ge 8388608 -a 1 -le "$vht_max_a_mpdu_len_exp" ] && \
+			vht_max_a_mpdu_len_exp_hw=1
+		[ "$(($vht_cap & 58720256))" -ge 16777216 -a 2 -le "$vht_max_a_mpdu_len_exp" ] && \
+			vht_max_a_mpdu_len_exp_hw=2
+		[ "$(($vht_cap & 58720256))" -ge 25165824 -a 3 -le "$vht_max_a_mpdu_len_exp" ] && \
+			vht_max_a_mpdu_len_exp_hw=3
+		[ "$(($vht_cap & 58720256))" -ge 33554432 -a 4 -le "$vht_max_a_mpdu_len_exp" ] && \
+			vht_max_a_mpdu_len_exp_hw=4
+		[ "$(($vht_cap & 58720256))" -ge 41943040 -a 5 -le "$vht_max_a_mpdu_len_exp" ] && \
+			vht_max_a_mpdu_len_exp_hw=5
+		[ "$(($vht_cap & 58720256))" -ge 50331648 -a 6 -le "$vht_max_a_mpdu_len_exp" ] && \
+			vht_max_a_mpdu_len_exp_hw=6
+		[ "$(($vht_cap & 58720256))" -ge 58720256 -a 7 -le "$vht_max_a_mpdu_len_exp" ] && \
+			vht_max_a_mpdu_len_exp_hw=7
+		vht_capab="$vht_capab[MAX-A-MPDU-LEN-EXP$vht_max_a_mpdu_len_exp_hw]"
+
+		# whether or not the STA supports link adaptation using VHT variant
+		vht_link_adapt_hw=0
+		[ "$(($vht_cap & 201326592))" -ge 134217728 -a 2 -le "$vht_link_adapt" ] && \
+			vht_link_adapt_hw=2
+		[ "$(($vht_cap & 201326592))" -ge 201326592 -a 3 -le "$vht_link_adapt" ] && \
+			vht_link_adapt_hw=3
+		[ "$vht_link_adapt_hw" != 0 ] && \
+			vht_capab="$vht_capab[VHT-LINK-ADAPT-$vht_link_adapt_hw]"
+
+		[ -n "$vht_capab" ] && append base_cfg "vht_capab=$vht_capab" "$N"
+	fi
+
+	hostapd_prepare_device_config "$hostapd_conf_file" nl80211
+	cat >> "$hostapd_conf_file" <<EOF
+${channel:+channel=$channel}
+${noscan:+noscan=$noscan}
+$base_cfg
+
+EOF
+	json_select ..
+}
+
+mac80211_hostapd_setup_bss() {
+	local phy="$1"
+	local ifname="$2"
+	local macaddr="$3"
+	local type="$4"
+
+	hostapd_cfg=
+	append hostapd_cfg "$type=$ifname" "$N"
+
+	hostapd_set_bss_options hostapd_cfg "$vif" || return 1
+	json_get_vars wds dtim_period max_listen_int
+
+	set_default wds 0
+
+	[ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
+	[ "$staidx" -gt 0 ] && append hostapd_cfg "start_disabled=1" "$N"
+
+	cat >> /var/run/hostapd-$phy.conf <<EOF
+$hostapd_cfg
+bssid=$macaddr
+${dtim_period:+dtim_period=$dtim_period}
+${max_listen_int:+max_listen_interval=$max_listen_int}
+EOF
+}
+
+mac80211_get_addr() {
+	local phy="$1"
+	local idx="$(($2 + 1))"
+
+	head -n $(($macidx + 1)) /sys/class/ieee80211/${phy}/addresses | tail -n1
+}
+
+mac80211_generate_mac() {
+	local phy="$1"
+	local id="${macidx:-0}"
+
+	local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
+	local mask="$(cat /sys/class/ieee80211/${phy}/address_mask)"
+
+	[ "$mask" = "00:00:00:00:00:00" ] && {
+		mask="ff:ff:ff:ff:ff:ff";
+
+		[ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt 1 ] && {
+			addr="$(mac80211_get_addr "$phy" "$id")"
+			[ -n "$addr" ] && {
+				echo "$addr"
+				return
+			}
+		}
+	}
+
+	local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
+
+	local mask1=$1
+	local mask6=$6
+
+	local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
+
+	macidx=$(($id + 1))
+	[ "$((0x$mask1))" -gt 0 ] && {
+		b1="0x$1"
+		[ "$id" -gt 0 ] && \
+			b1=$(($b1 ^ ((($id - 1) << 2) | 0x2)))
+		printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6
+		return
+	}
+
+	[ "$((0x$mask6))" -lt 255 ] && {
+		printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $(( 0x$6 ^ $id ))
+		return
+	}
+
+	off2=$(( (0x$6 + $id) / 0x100 ))
+	printf "%s:%s:%s:%s:%02x:%02x" \
+		$1 $2 $3 $4 \
+		$(( (0x$5 + $off2) % 0x100 )) \
+		$(( (0x$6 + $id) % 0x100 ))
+}
+
+find_phy() {
+	[ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
+	[ -n "$path" ] && {
+		for phy in /sys/devices/$path/ieee80211/phy*; do
+			[ -e "$phy" ] && {
+				phy="${phy##*/}"
+				return 0
+			}
+		done
+	}
+	[ -n "$macaddr" ] && {
+		for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
+			grep -i -q "$macaddr" "/sys/class/ieee80211/${phy}/macaddress" && return 0
+		done
+	}
+	return 1
+}
+
+mac80211_check_ap() {
+	has_ap=1
+}
+
+mac80211_prepare_vif() {
+	json_select config
+
+	json_get_vars ifname mode ssid wds powersave macaddr
+
+	[ -n "$ifname" ] || ifname="wlan${phy#phy}${if_idx:+-$if_idx}"
+	if_idx=$((${if_idx:-0} + 1))
+
+	set_default wds 0
+	set_default powersave 0
+
+	json_select ..
+
+	[ -n "$macaddr" ] || {
+		macaddr="$(mac80211_generate_mac $phy)"
+		macidx="$(($macidx + 1))"
+	}
+
+	json_add_object data
+	json_add_string ifname "$ifname"
+	json_close_object
+	json_select config
+
+	# It is far easier to delete and create the desired interface
+	case "$mode" in
+		adhoc)
+			iw phy "$phy" interface add "$ifname" type adhoc
+		;;
+		ap)
+			# Hostapd will handle recreating the interface and
+			# subsequent virtual APs belonging to the same PHY
+			if [ -n "$hostapd_ctrl" ]; then
+				type=bss
+			else
+				type=interface
+			fi
+
+			mac80211_hostapd_setup_bss "$phy" "$ifname" "$macaddr" "$type" || return
+
+			[ -n "$hostapd_ctrl" ] || {
+				iw phy "$phy" interface add "$ifname" type managed
+				hostapd_ctrl="${hostapd_ctrl:-/var/run/hostapd/$ifname}"
+			}
+		;;
+		mesh)
+			json_get_vars key mesh_id
+			if [ -n "$key" ]; then
+				iw phy "$phy" interface add "$ifname" type mp
+			else
+				iw phy "$phy" interface add "$ifname" type mp mesh_id "$mesh_id"
+			fi
+		;;
+		monitor)
+			iw phy "$phy" interface add "$ifname" type monitor
+		;;
+		sta)
+			local wdsflag=
+			staidx="$(($staidx + 1))"
+			[ "$wds" -gt 0 ] && wdsflag="4addr on"
+			iw phy "$phy" interface add "$ifname" type managed $wdsflag
+			[ "$powersave" -gt 0 ] && powersave="on" || powersave="off"
+			iw "$ifname" set power_save "$powersave"
+		;;
+	esac
+
+	case "$mode" in
+		monitor|mesh)
+			[ "$auto_channel" -gt 0 ] || iw dev "$ifname" set channel "$channel" $htmode
+		;;
+	esac
+
+	if [ "$mode" != "ap" ]; then
+		# ALL ap functionality will be passed to hostapd
+		# All interfaces must have unique mac addresses
+		# which can either be explicitly set in the device
+		# section, or automatically generated
+		ifconfig "$ifname" hw ether "$macaddr"
+	fi
+
+	json_select ..
+}
+
+mac80211_setup_supplicant() {
+	wpa_supplicant_prepare_interface "$ifname" nl80211 || return 1
+	wpa_supplicant_add_network "$ifname"
+	wpa_supplicant_run "$ifname" ${hostapd_ctrl:+-H $hostapd_ctrl}
+}
+
+mac80211_setup_adhoc() {
+	json_get_vars bssid ssid key mcast_rate
+
+	keyspec=
+	[ "$auth_type" = "wep" ] && {
+		set_default key 1
+		case "$key" in
+			[1234])
+				local idx
+				for idx in 1 2 3 4; do
+					json_get_var ikey "key$idx"
+
+					[ -n "$ikey" ] && {
+						ikey="$(($idx - 1)):$(prepare_key_wep "$ikey")"
+						[ $idx -eq $key ] && ikey="d:$ikey"
+						append keyspec "$ikey"
+					}
+				done
+			;;
+			*)
+				append keyspec "d:0:$(prepare_key_wep "$key")"
+			;;
+		esac
+	}
+
+	brstr=
+	for br in $basic_rate_list; do
+		hostapd_add_rate brstr "$br"
+	done
+
+	mcval=
+	[ -n "$mcast_rate" ] && hostapd_add_rate mcval "$mcast_rate"
+
+	iw dev "$ifname" ibss join "$ssid" $freq $htmode fixed-freq $bssid \
+		${beacon_int:+beacon-interval $beacon_int} \
+		${brstr:+basic-rates $brstr} \
+		${mcval:+mcast-rate $mcval} \
+		${keyspec:+keys $keyspec}
+}
+
+mac80211_setup_vif() {
+	local name="$1"
+	local failed
+
+	json_select data
+	json_get_vars ifname
+	json_select ..
+
+	json_select config
+	json_get_vars mode
+	json_get_var vif_txpower txpower
+
+	ifconfig "$ifname" up || {
+		wireless_setup_vif_failed IFUP_ERROR
+		json_select ..
+		return
+	}
+
+	set_default vif_txpower "$txpower"
+	[ -z "$vif_txpower" ] || iw dev "$ifname" set txpower fixed "${vif_txpower%%.*}00"
+
+	case "$mode" in
+		mesh)
+			for var in $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING; do
+				json_get_var mp_val "$var"
+				[ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
+			done
+
+			# authsae
+			json_get_vars key
+			if [ -n "$key" ]; then
+				if [ -e "/lib/wifi/authsae.sh" ]; then
+					. /lib/wifi/authsae.sh
+					authsae_start_interface || failed=1
+				else
+					wireless_setup_vif_failed AUTHSAE_NOT_INSTALLED
+					json_select ..
+					return
+				fi
+			fi
+		;;
+		adhoc)
+			wireless_vif_parse_encryption
+			if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ]; then
+				mac80211_setup_supplicant || failed=1
+			else
+				mac80211_setup_adhoc
+			fi
+		;;
+		sta)
+			mac80211_setup_supplicant || failed=1
+		;;
+	esac
+
+	json_select ..
+	[ -n "$failed" ] || wireless_add_vif "$name" "$ifname"
+}
+
+get_freq() {
+	local phy="$1"
+	local chan="$2"
+	iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $2}'
+}
+
+mac80211_interface_cleanup() {
+	local phy="$1"
+
+	for wdev in $(list_phy_interfaces "$phy"); do
+		ifconfig "$wdev" down 2>/dev/null
+		iw dev "$wdev" del
+	done
+}
+
+drv_mac80211_cleanup() {
+	hostapd_common_cleanup
+}
+
+drv_mac80211_setup() {
+	json_select config
+	json_get_vars \
+		phy macaddr path \
+		country chanbw distance \
+		txpower antenna_gain \
+		rxantenna txantenna \
+		frag rts beacon_int
+	json_get_values basic_rate_list basic_rate
+	json_select ..
+
+	find_phy || {
+		echo "Could not find PHY for device '$1'"
+		wireless_set_retry 0
+		return 1
+	}
+
+	wireless_set_data phy="$phy"
+	mac80211_interface_cleanup "$phy"
+
+	# convert channel to frequency
+	[ "$auto_channel" -gt 0 ] || freq="$(get_freq "$phy" "$channel")"
+
+	[ -n "$country" ] && {
+		iw reg get | grep -q "^country $country:" || {
+			iw reg set "$country"
+			sleep 1
+		}
+	}
+
+	hostapd_conf_file="/var/run/hostapd-$phy.conf"
+
+	no_ap=1
+	macidx=0
+	staidx=0
+
+	[ -n "$chanbw" ] && {
+		for file in /sys/kernel/debug/ieee80211/$phy/ath9k/chanbw /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode; do
+			[ -f "$file" ] && echo "$chanbw" > "$file"
+		done
+	}
+
+	set_default rxantenna all
+	set_default txantenna all
+	set_default distance 0
+	set_default antenna_gain 0
+
+	iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1
+	iw phy "$phy" set antenna_gain $antenna_gain
+	iw phy "$phy" set distance "$distance"
+
+	[ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
+	[ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
+
+	has_ap=
+	hostapd_ctrl=
+	for_each_interface "ap" mac80211_check_ap
+
+	rm -f "$hostapd_conf_file"
+	[ -n "$has_ap" ] && mac80211_hostapd_setup_base "$phy"
+
+	for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif
+	for_each_interface "ap" mac80211_prepare_vif
+
+	[ -n "$hostapd_ctrl" ] && {
+		/usr/sbin/hostapd -P /var/run/wifi-$phy.pid -B "$hostapd_conf_file"
+		ret="$?"
+		wireless_add_process "$(cat /var/run/wifi-$phy.pid)" "/usr/sbin/hostapd" 1
+		[ "$ret" != 0 ] && {
+			wireless_setup_failed HOSTAPD_START_FAILED
+			return
+		}
+	}
+
+	for_each_interface "ap sta adhoc mesh monitor" mac80211_setup_vif
+
+	wireless_set_up
+}
+
+list_phy_interfaces() {
+	local phy="$1"
+	if [ -d "/sys/class/ieee80211/${phy}/device/net" ]; then
+		ls "/sys/class/ieee80211/${phy}/device/net" 2>/dev/null;
+	else
+		ls "/sys/class/ieee80211/${phy}/device" 2>/dev/null | grep net: | sed -e 's,net:,,g'
+	fi
+}
+
+drv_mac80211_teardown() {
+	wireless_process_kill_all
+
+	json_select data
+	json_get_vars phy
+	json_select ..
+
+	mac80211_interface_cleanup "$phy"
+}
+
+add_driver mac80211
diff --git a/trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh
new file mode 100644
index 00000000..03e82fb0
--- /dev/null
+++ b/trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -0,0 +1,126 @@
+#!/bin/sh
+append DRIVERS "mac80211"
+
+lookup_phy() {
+	[ -n "$phy" ] && {
+		[ -d /sys/class/ieee80211/$phy ] && return
+	}
+
+	local devpath
+	config_get devpath "$device" path
+	[ -n "$devpath" ] && {
+		for _phy in /sys/devices/$devpath/ieee80211/phy*; do
+			[ -e "$_phy" ] && {
+				phy="${_phy##*/}"
+				return
+			}
+		done
+	}
+
+	local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')"
+	[ -n "$macaddr" ] && {
+		for _phy in /sys/class/ieee80211/*; do
+			[ -e "$_phy" ] || continue
+
+			[ "$macaddr" = "$(cat ${_phy}/macaddress)" ] || continue
+			phy="${_phy##*/}"
+			return
+		done
+	}
+	phy=
+	return
+}
+
+find_mac80211_phy() {
+	local device="$1"
+
+	config_get phy "$device" phy
+	lookup_phy
+	[ -n "$phy" -a -d "/sys/class/ieee80211/$phy" ] || {
+		echo "PHY for wifi device $1 not found"
+		return 1
+	}
+	config_set "$device" phy "$phy"
+
+	config_get macaddr "$device" macaddr
+	[ -z "$macaddr" ] && {
+		config_set "$device" macaddr "$(cat /sys/class/ieee80211/${phy}/macaddress)"
+	}
+
+	return 0
+}
+
+check_mac80211_device() {
+	config_get phy "$1" phy
+	[ -z "$phy" ] && {
+		find_mac80211_phy "$1" >/dev/null || return 0
+		config_get phy "$1" phy
+	}
+	[ "$phy" = "$dev" ] && found=1
+}
+
+detect_mac80211() {
+	devidx=0
+	config_load wireless
+	while :; do
+		config_get type "radio$devidx" type
+		[ -n "$type" ] || break
+		devidx=$(($devidx + 1))
+	done
+
+	for _dev in /sys/class/ieee80211/*; do
+		[ -e "$_dev" ] || continue
+
+		dev="${_dev##*/}"
+
+		found=0
+		config_foreach check_mac80211_device wifi-device
+		[ "$found" -gt 0 ] && continue
+
+		mode_band="g"
+		channel="11"
+		htmode=""
+		ht_capab=""
+
+		iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT20
+		iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
+
+		vht_cap=$(iw phy "$dev" info | grep -c 'VHT Capabilities')
+		[ "$vht_cap" -gt 0 ] && {
+			mode_band="a";
+			channel="36"
+			htmode="VHT80"
+		}
+
+		[ -n $htmode ] && append ht_capab "	option htmode	$htmode" "$N"
+
+		if [ -x /usr/bin/readlink ]; then
+			path="$(readlink -f /sys/class/ieee80211/${dev}/device)"
+			path="${path##/sys/devices/}"
+			dev_id="	option path	'$path'"
+		else
+			dev_id="	option macaddr	$(cat /sys/class/ieee80211/${dev}/macaddress)"
+		fi
+
+		cat <<EOF
+config wifi-device  radio$devidx
+	option type     mac80211
+	option channel  ${channel}
+	option hwmode	11${mode_band}
+$dev_id
+$ht_capab
+	# REMOVE THIS LINE TO ENABLE WIFI:
+	option disabled 1
+
+config wifi-iface
+	option device   radio$devidx
+	option network  lan
+	option mode     ap
+	option ssid     libreCMC
+	option encryption none
+
+EOF
+	devidx=$(($devidx + 1))
+	done
+}
+
diff --git a/trunk/package/kernel/mac80211/files/regdb.txt b/trunk/package/kernel/mac80211/files/regdb.txt
new file mode 100644
index 00000000..ba95fc6d
--- /dev/null
+++ b/trunk/package/kernel/mac80211/files/regdb.txt
@@ -0,0 +1,1215 @@
+# This is the world regulatory domain
+country 00:
+	(2402 - 2472 @ 40), (20)
+	# Channel 12 - 13.
+	(2457 - 2482 @ 40), (20), NO-IR
+	# Channel 14. Only JP enables this and for 802.11b only
+	(2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
+	# Channel 36 - 48
+	(5170 - 5250 @ 80), (20)
+	# Channel 52 - 64
+	(5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW
+	# Channel 100 - 144
+	(5490 - 5730 @ 160), (20), NO-IR, DFS
+	# Channel 149 - 165
+	(5735 - 5835 @ 80), (20), NO-IR
+	# IEEE 802.11ad (60GHz), channels 1..3
+	(57240 - 63720 @ 2160), (0)
+
+
+country AD:
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20)
+	(5250 - 5330 @ 80), (20), DFS
+	(5490 - 5710 @ 80), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country AE: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country AF: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+# Source:
+# http://pucanguilla.org/Downloads/January2005-Anguilla%20Table%20of%20Allocations.pdf
+country AI: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country AL: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20.00), AUTO-BW
+	(5250 - 5330 @ 80), (20.00), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27.00), DFS
+
+country AM: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (18)
+	(5250 - 5330 @ 80), (18), DFS
+
+country AN: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country AR: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country AS: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country AT: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country AU:
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country AW: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country AZ: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (18), AUTO-BW
+	(5250 - 5330 @ 80), (18), DFS, AUTO-BW
+
+country BA: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country BB: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (23), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+
+country BD: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5735 - 5835 @ 80), (30)
+
+country BE: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country BF: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country BG: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country BH: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20)
+	(5250 - 5330 @ 80), (20), DFS
+	(5735 - 5835 @ 80), (20)
+
+country BL: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country BM: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country BN: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (20)
+
+country BO: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5250 - 5330 @ 80), (30), DFS
+	(5735 - 5835 @ 80), (30)
+
+country BR: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country BS: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+# Source:
+# http://www.bicma.gov.bt/paper/publication/nrrpart4.pdf
+country BT: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country BY: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country BZ: DFS-JP
+	(2402 - 2482 @ 40), (30)
+	(5735 - 5835 @ 80), (30)
+
+country CA: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+# Source:
+# http://www.art-rca.org
+country CF: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 40), (17)
+	(5250 - 5330 @ 40), (24), DFS
+	(5490 - 5730 @ 40), (24), DFS
+	(5735 - 5835 @ 40), (30)
+
+country CH: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country CI: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country CL: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (20)
+
+country CN: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (23), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+	# 60 gHz band channels 1,4: 28dBm, channels 2,3: 44dBm
+	# ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
+	(57240 - 59400 @ 2160), (28)
+	(59400 - 63720 @ 2160), (44)
+	(63720 - 65880 @ 2160), (28)
+
+country CO: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country CR: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17)
+	(5250 - 5330 @ 80), (24), DFS
+	(5490 - 5730 @ 80), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country CX: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country CY: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+# Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf
+# and http://www.ctu.eu/164/download/VOR/VOR-12-05-2007-6-AN.pdf
+# Power at 5250 - 5350 MHz and 5470 - 5725 MHz can be doubled if TPC is
+# implemented.
+country CZ: DFS-ETSI
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
+	(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
+	(5470 - 5725 @ 160), (500 mW), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+# Data from "Frequenznutzungsplan" (as published in April 2008), downloaded from
+# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38448/publicationFile/2659/Frequenznutzungsplan2008_Id17448pdf.pdf
+# For the 5GHz range also see
+# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38216/publicationFile/6579/WLAN5GHzVfg7_2010_28042010pdf.pdf
+# The values have been reduced by a factor of 2 (3db) for non TPC devices
+# (in other words: devices with TPC can use twice the tx power of this table).
+# Note that the docs do not require TPC for 5150--5250; the reduction to
+# 100mW thus is not strictly required -- however the conservative 100mW
+# limit is used here as the non-interference with radar and satellite
+# apps relies on the attenuation by the building walls only in the
+# absence of DFS; the neighbour countries have 100mW limit here as well.
+
+country DE: DFS-ETSI
+	# entries 279004 and 280006
+	(2400 - 2483.5 @ 40), (100 mW)
+	# entry 303005
+	(5150 - 5250 @ 80), (100 mW), NO-OUTDOOR, AUTO-BW
+	# entries 304002 and 305002
+	(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
+	# entries 308002, 309001 and 310003
+	(5470 - 5725 @ 160), (500 mW), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country DK: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+# Source:
+# http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=blog&id=10&Itemid=55
+country DM: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+
+country DO: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+
+country DZ: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170.000 - 5250.000 @ 80.000), (23.00), AUTO-BW
+	(5250.000 - 5330.000 @ 80.000), (23.00), DFS, AUTO-BW
+	(5490.000 - 5670.000 @ 160.000), (23.00), DFS
+
+country EC: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17)
+	(5250 - 5330 @ 80), (24), DFS
+	(5490 - 5730 @ 80), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country EE: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country EG: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20)
+	(5250 - 5330 @ 80), (20), DFS
+
+# Orden IET/787/2013, de 25 de abril, por la que se aprueba
+# el cuadro nacional de atribución de frecuencias.
+# http://www.boe.es/diario_boe/txt.php?id=BOE-A-2013-4845
+#
+# more info at "Cuadro nacional de atribución de frecuencias (CNAF)":
+# http://www.minetur.gob.es/telecomunicaciones/espectro/paginas/cnaf.aspx
+
+country ES: DFS-ETSI
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
+	(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
+	(5470 - 5725 @ 160), (500 mW), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country ET: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country FI: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country FM: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country FR: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country GB: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country GD: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country GE: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (18), AUTO-BW
+	(5250 - 5330 @ 80), (18), DFS, AUTO-BW
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country GF: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country GH: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country GL: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20)
+	(5250 - 5330 @ 80), (20), DFS
+	(5490 - 5710 @ 80), (27), DFS
+
+country GP: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country GR: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country GT: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+
+country GU: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17)
+	(5250 - 5330 @ 80), (24), DFS
+	(5490 - 5730 @ 80), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country GY:
+	(2402 - 2482 @ 40), (30)
+	(5735 - 5835 @ 80), (30)
+
+country HK:
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country HN: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country HR: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country HT: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country HU: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country ID: DFS-JP
+	# ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
+	(2402 - 2482 @ 40), (20)
+	(5735 - 5815 @ 80), (23)
+
+country IE: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country IL: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
+	(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW
+
+country IN: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (20)
+
+country IR: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5735 - 5835 @ 80), (30)
+
+country IS: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country IT: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country JM: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country JO: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (23)
+	(5735 - 5835 @ 80), (23)
+
+country JP: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(2474 - 2494 @ 20), (20), NO-OFDM
+	(4910 - 4990 @ 40), (23)
+	(5030 - 5090 @ 40), (23)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (23), DFS
+
+country KE: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (23)
+	(5490 - 5570 @ 80), (30), DFS
+	(5735 - 5775 @ 40), (23)
+
+country KH: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+# Source
+# http://ntrc.kn/?page_id=7
+country KN: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (30), DFS
+	(5735 - 5815 @ 80), (30)
+
+country KP: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5630 @ 80), (30), DFS
+	(5735 - 5815 @ 80), (30)
+
+country KR: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (30), DFS
+	(5735 - 5835 @ 80), (30)
+
+country KW: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+
+country KY: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country KZ:
+	(2402 - 2482 @ 40), (20)
+
+country LB: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+# Source:
+# http://www.ntrc.org.lc/operational_structures.htm
+country LC: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (30), DFS
+	(5735 - 5815 @ 80), (30)
+
+country LI: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country LK: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17)
+	(5250 - 5330 @ 80), (24), DFS
+	(5490 - 5730 @ 80), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+# Source:
+# http://lca.org.ls/images/documents/lesotho_national_frequency_allocation_plan.pdf
+country LS: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country LT: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country LU: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country LV: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country MA: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+
+country MC: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+# Source:
+# http://www.cnfr.md/index.php?pag=sec&id=117&l=en
+country MD: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+# Source:
+# http://www.cept.org/files/1050/Tools%20and%20Services/EFIS%20-%20ECO%20Frequency%20Information%20System/National%20frequency%20tables/Montenegro%20NAFT%20-%202010.pdf
+country ME: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country MF: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country MH: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country MK: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country MN: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country MO:
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 40), (23)
+	(5250 - 5330 @ 40), (23), DFS
+	(5735 - 5835 @ 40), (30)
+
+country MP: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country MQ: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+# Source:
+# http://www.are.mr/pdfs/telec_freq_TNAbf_2010.pdf
+country MR: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country MT: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country MU: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country MW: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country MX: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country MY: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+
+country NI: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country NL: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW
+	(5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+# Data from http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77
+# Power at 5250 - 5350 MHz, 5470 - 5725 MHz and 5815 – 5850 MHz can
+# be doubled if TPC is implemented.
+# Up to 2W (or 4W with TPC) is allowed in the 5725 – 5795 MHz band
+# which has been merged with 5470 - 5725 MHz to allow wide channels
+country NO: DFS-ETSI
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5250 @ 80), (200 mW), AUTO-BW
+	(5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW
+	(5470 - 5795 @ 160), (500 mW), DFS
+	(5815 - 5850 @ 35), (2000 mW), DFS
+	(17100 - 17300 @ 200), (100 mW)
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country NP: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (20)
+
+country NZ: DFS-FCC
+	(2402 - 2482 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country OM: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country PA: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+
+country PE: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country PF: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country PG: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country PH: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country PK: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5735 - 5835 @ 80), (30)
+
+country PL: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country PM: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country PR: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country PT: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country PW: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country PY: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country QA: DFS-JP
+	(2402 - 2482 @ 40), (20)
+	(5735 - 5835 @ 80), (30)
+
+country RE: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country RO: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+
+# Source:
+# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
+country RS: DFS-ETSI
+	(2400 - 2483.5 @ 40), (100 mW)
+	(5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
+	(5470 - 5725 @ 20), (1000 mW), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country RU: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20)
+	(5250 - 5330 @ 80), (20), DFS
+	(5650 - 5730 @ 80), (30), DFS
+	(5735 - 5835 @ 80), (30)
+
+country RW: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country SA: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country SE: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country SG: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country SI: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country SK: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+# Source:
+# Regulation N° 2004-005 ART/DG/DRC/D.Rég
+country SN: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country SR: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country SV: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17)
+	(5250 - 5330 @ 80), (23), DFS
+	(5735 - 5835 @ 80), (30)
+
+country SY:
+	(2402 - 2482 @ 40), (20)
+
+# Source:
+# http://www.telecommission.tc/Spectrum-plan20110324-101210.html
+country TC: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country TD: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country TG: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 40), (20)
+	(5250 - 5330 @ 40), (20), DFS
+	(5490 - 5710 @ 40), (27), DFS
+
+country TH: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country TN: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+
+country TR: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country TT: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country TW: DFS-JP
+	(2402 - 2472 @ 40), (30)
+	(5270 - 5330 @ 40), (17), DFS
+	(5490 - 5590 @ 80), (30), DFS
+	(5650 - 5710 @ 40), (30), DFS
+	(5735 - 5835 @ 80), (30)
+ 
+# Source:
+# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874
+# #1174 / 23 Oct 2008: http://www.nkrz.gov.ua/uk/activities/ruling/1225269361
+# (appendix 8)
+# Listed 5GHz range is a lowest common denominator for all related
+# rules in the referenced laws. Such a range is used because of
+# disputable definitions there.
+country UA: DFS-ETSI
+	(2400 - 2483.5 @ 40), (20), NO-OUTDOOR
+	(5150 - 5350 @ 40), (20), NO-OUTDOOR
+	(5490 - 5670 @ 80), (20), DFS
+	(5735 - 5835 @ 80), (20)
+	# 60 gHz band channels 1-4, ref: Etsi En 302 567
+	(57000 - 66000 @ 2160), (40)
+
+country UG: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country US: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+	# 60g band
+	# reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255
+	# channels 1,2,3, EIRP=40dBm(43dBm peak)
+	(57240 - 63720 @ 2160), (40)
+
+country UY: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+# Source:
+# http://cemc.uz/article/1976/
+country UZ: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+
+# Source:
+# http://www.ntrc.vc/regulations/Jun_2006_Spectrum_Managment_Regulations.pdf
+country VC: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+# Source:
+# Official Gazette (Gaceta Oficial) concerning Unlicensed transmitter use
+# (10 June 2013)
+# http://www.conatel.gob.ve/
+country VE: DFS-FCC
+	(2402 - 2482 @ 40), (30)
+	(5170 - 5250 @ 80), (23), AUTO-BW
+	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+	(5735 - 5835 @ 80), (30)
+
+country VI: DFS-FCC
+	(2402 - 2472 @ 40), (30)
+	(5170 - 5250 @ 80), (24), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country VN: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17)
+	(5250 - 5330 @ 80), (24), DFS
+	(5490 - 5730 @ 80), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+# Source:
+# http://www.trr.vu/attachments/category/130/GURL_for_Short-range_Radiocommunication_Devices2.pdf
+country VU: DFS-FCC
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (17), AUTO-BW
+	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
+	(5490 - 5730 @ 160), (24), DFS
+	(5735 - 5835 @ 80), (30)
+
+country WF: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country YE:
+	(2402 - 2482 @ 40), (20)
+
+country YT: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country ZA: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
+country ZW: DFS-ETSI
+	(2402 - 2482 @ 40), (20)
+	(5170 - 5250 @ 80), (20), AUTO-BW
+	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+	(5490 - 5710 @ 160), (27), DFS
+
diff --git a/trunk/package/kernel/mac80211/patches/000-fix_kconfig.patch b/trunk/package/kernel/mac80211/patches/000-fix_kconfig.patch
new file mode 100644
index 00000000..662608ed
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/000-fix_kconfig.patch
@@ -0,0 +1,16 @@
+--- a/kconf/Makefile
++++ b/kconf/Makefile
+@@ -1,10 +1,10 @@
+-CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
++CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DKBUILD_NO_NLS
+ 
+ LXDIALOG := lxdialog/checklist.o lxdialog/inputbox.o lxdialog/menubox.o lxdialog/textbox.o lxdialog/util.o lxdialog/yesno.o
+ 
+ conf: conf.o zconf.tab.o
+-mconf: LDFLAGS = -Wl,--add-needed $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC))
+-mconf: CFLAGS += -DCURSES_LOC="<ncurses.h>" -DLOCALE
++mconf: LDFLAGS = $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC))
++mconf: CFLAGS += -DCURSES_LOC="<ncurses.h>"
+ mconf: mconf.o zconf.tab.o $(LXDIALOG)
+ 
+ .PHONY: clean
diff --git a/trunk/package/kernel/mac80211/patches/001-fix_build.patch b/trunk/package/kernel/mac80211/patches/001-fix_build.patch
new file mode 100644
index 00000000..99ef50e1
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/001-fix_build.patch
@@ -0,0 +1,156 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,6 +19,7 @@ KLIB_BUILD ?= $(KLIB)/build/
+ KERNEL_CONFIG := $(KLIB_BUILD)/.config
+ KERNEL_MAKEFILE := $(KLIB_BUILD)/Makefile
+ CONFIG_MD5 := $(shell md5sum $(KERNEL_CONFIG) 2>/dev/null | sed 's/\s.*//')
++STAMP_KERNEL_CONFIG := .kernel_config_md5_$(CONFIG_MD5)
+ 
+ export KLIB KLIB_BUILD BACKPORT_PWD KMODDIR KMODPATH_ARG
+ 
+@@ -36,7 +37,8 @@ mrproper:
+ 	@rm -f .kernel_config_md5 Kconfig.versions Kconfig.kernel
+ 	@rm -f backport-include/backport/autoconf.h
+ 
+-.DEFAULT:
++.SILENT: $(STAMP_KERNEL_CONFIG)
++$(STAMP_KERNEL_CONFIG):
+ 	@set -e ; test -f .local-symbols || (						\
+ 	echo "/--------------"								;\
+ 	echo "| You shouldn't run make in the backports tree, but only in"		;\
+@@ -60,56 +62,60 @@ mrproper:
+ 	echo "| (that isn't currently running.)"					;\
+ 	echo "\\--"									;\
+ 	false)
+-	@set -e ; if [ "$$(cat .kernel_config_md5 2>/dev/null)" != "$(CONFIG_MD5)" ]	;\
+-	then 										\
+-		echo -n "Generating local configuration database from kernel ..."	;\
+-		grep -v -f .local-symbols $(KERNEL_CONFIG) | grep = | (			\
+-			while read l ; do						\
+-				if [ "$${l:0:7}" != "CONFIG_" ] ; then			\
+-					continue					;\
+-				fi							;\
+-				l=$${l:7}						;\
+-				n=$${l%%=*}						;\
+-				v=$${l#*=}						;\
+-				if [ "$$v" = "m" ] ; then				\
+-					echo config $$n					;\
+-					echo '    tristate' 				;\
+-				elif [ "$$v" = "y" ] ; then				\
+-					echo config $$n					;\
+-					echo '    bool'					;\
+-				else							\
+-					continue					;\
+-				fi							;\
+-				echo "    default $$v"					;\
+-				echo ""							;\
+-			done								\
+-		) > Kconfig.kernel							;\
+-		kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion |	\
+-			sed 's/^\(\(3\|2\.6\)\.[0-9]\+\).*/\1/;t;d')			;\
+-		test "$$kver" != "" || echo "Kernel version parse failed!"		;\
+-		test "$$kver" != ""							;\
+-		kvers="$$(seq 14 39 | sed 's/^/2.6./')"					;\
+-		kvers="$$kvers $$(seq 0 99 | sed 's/^/3./')"				;\
+-		print=0									;\
+-		for v in $$kvers ; do							\
+-			if [ "$$print" = "1" ] ; then					\
+-				echo config BACKPORT_KERNEL_$$(echo $$v | tr . _)	;\
+-				echo "    def_bool y"					;\
+-			fi								;\
+-			if [ "$$v" = "$$kver" ] ; then print=1 ; fi			;\
+-		done > Kconfig.versions							;\
+-		# RHEL as well, sadly we need to grep for it				;\
+-		RHEL_MAJOR=$$(grep '^RHEL_MAJOR' $(KERNEL_MAKEFILE) | 			\
+-					sed 's/.*=\s*\([0-9]*\)/\1/;t;d')		;\
+-		RHEL_MINOR=$$(grep '^RHEL_MINOR' $(KERNEL_MAKEFILE) | 			\
+-					sed 's/.*=\s*\([0-9]*\)/\1/;t;d')		;\
+-		for v in $$(seq 0 $$RHEL_MINOR) ; do 					\
+-			echo config BACKPORT_RHEL_KERNEL_$${RHEL_MAJOR}_$$v		;\
+-			echo "    def_bool y"						;\
+-		done >> Kconfig.versions						;\
+-		echo " done."								;\
+-	fi										;\
+-	echo "$(CONFIG_MD5)" > .kernel_config_md5
++	@rm -f .kernel_config_md5_*
++	@touch $@
++
++Kconfig.kernel: $(STAMP_KERNEL_CONFIG) .local-symbols
++	@printf "Generating local configuration database from kernel ..."
++	@grep -v -f .local-symbols $(KERNEL_CONFIG) | grep = | (			\
++		while read l ; do						\
++			if [ "$${l:0:7}" != "CONFIG_" ] ; then			\
++				continue					;\
++			fi							;\
++			l=$${l:7}						;\
++			n=$${l%%=*}						;\
++			v=$${l#*=}						;\
++			if [ "$$v" = "m" ] ; then				\
++				echo config $$n					;\
++				echo '    tristate' 				;\
++			elif [ "$$v" = "y" ] ; then				\
++				echo config $$n					;\
++				echo '    bool'					;\
++			else							\
++				continue					;\
++			fi							;\
++			echo "    default $$v"					;\
++			echo ""							;\
++		done								\
++	) > $@
++	@echo " done."
++
++Kconfig.versions: Kconfig.kernel
++	@kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion |	\
++		sed 's/^\(\(3\|2\.6\)\.[0-9]\+\).*/\1/;t;d')			;\
++	test "$$kver" != "" || echo "Kernel version parse failed!"		;\
++	test "$$kver" != ""							;\
++	kvers="$$(seq 14 39 | sed 's/^/2.6./')"					;\
++	kvers="$$kvers $$(seq 0 99 | sed 's/^/3./')"				;\
++	print=0									;\
++	for v in $$kvers ; do							\
++		if [ "$$print" = "1" ] ; then					\
++			echo config BACKPORT_KERNEL_$$(echo $$v | tr . _)	;\
++			echo "    def_bool y"					;\
++		fi								;\
++		if [ "$$v" = "$$kver" ] ; then print=1 ; fi			;\
++	done > $@
++	@RHEL_MAJOR=$$(grep '^RHEL_MAJOR' $(KERNEL_MAKEFILE) | 			\
++				sed 's/.*=\s*\([0-9]*\)/\1/;t;d')		;\
++	RHEL_MINOR=$$(grep '^RHEL_MINOR' $(KERNEL_MAKEFILE) | 			\
++				sed 's/.*=\s*\([0-9]*\)/\1/;t;d')		;\
++	for v in $$(seq 0 $$RHEL_MINOR) ; do 					\
++		echo config BACKPORT_RHEL_KERNEL_$${RHEL_MAJOR}_$$v		;\
++		echo "    def_bool y"						;\
++	done >> $@
++
++.DEFAULT:
++	@$(MAKE) Kconfig.versions
+ 	@$(MAKE) -f Makefile.real "$@"
+ 
+ .PHONY: defconfig-help
+--- a/Makefile.real
++++ b/Makefile.real
+@@ -59,7 +59,7 @@ defconfig-%::
+ 
+ backport-include/backport/autoconf.h: .config Kconfig.versions Kconfig.kernel
+ 	@$(MAKE) oldconfig
+-	@echo -n "Building backport-include/backport/autoconf.h ..."
++	@printf "Building backport-include/backport/autoconf.h ..."
+ 	@grep -f .local-symbols .config | (				\
+ 		echo "#ifndef COMPAT_AUTOCONF_INCLUDED"			;\
+ 		echo "#define COMPAT_AUTOCONF_INCLUDED"			;\
+@@ -80,7 +80,12 @@ backport-include/backport/autoconf.h: .c
+ 			esac						;\
+ 		done							;\
+ 		echo "#endif /* COMPAT_AUTOCONF_INCLUDED */"		;\
+-	) > backport-include/backport/autoconf.h
++	) > $@.new
++	@if cmp -s $@ $@.new; then \
++		rm -f $@.new; \
++	else \
++		mv $@.new $@; \
++	fi
+ 	@echo " done."
+ 
+ .PHONY: modules
diff --git a/trunk/package/kernel/mac80211/patches/002-change_allconfig.patch b/trunk/package/kernel/mac80211/patches/002-change_allconfig.patch
new file mode 100644
index 00000000..91ad20f0
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/002-change_allconfig.patch
@@ -0,0 +1,44 @@
+--- a/kconf/conf.c
++++ b/kconf/conf.c
+@@ -578,40 +578,12 @@ int main(int ac, char **av)
+ 	case oldconfig:
+ 	case listnewconfig:
+ 	case olddefconfig:
+-		conf_read(NULL);
+-		break;
+ 	case allnoconfig:
+ 	case allyesconfig:
+ 	case allmodconfig:
+ 	case alldefconfig:
+ 	case randconfig:
+-		name = getenv("KCONFIG_ALLCONFIG");
+-		if (!name)
+-			break;
+-		if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
+-			if (conf_read_simple(name, S_DEF_USER)) {
+-				fprintf(stderr,
+-					_("*** Can't read seed configuration \"%s\"!\n"),
+-					name);
+-				exit(1);
+-			}
+-			break;
+-		}
+-		switch (input_mode) {
+-		case allnoconfig:	name = "allno.config"; break;
+-		case allyesconfig:	name = "allyes.config"; break;
+-		case allmodconfig:	name = "allmod.config"; break;
+-		case alldefconfig:	name = "alldef.config"; break;
+-		case randconfig:	name = "allrandom.config"; break;
+-		default: break;
+-		}
+-		if (conf_read_simple(name, S_DEF_USER) &&
+-		    conf_read_simple("all.config", S_DEF_USER)) {
+-			fprintf(stderr,
+-				_("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
+-				name);
+-			exit(1);
+-		}
++		conf_read(NULL);
+ 		break;
+ 	default:
+ 		break;
diff --git a/trunk/package/kernel/mac80211/patches/003-remove_bogus_modparams.patch b/trunk/package/kernel/mac80211/patches/003-remove_bogus_modparams.patch
new file mode 100644
index 00000000..ffb730b1
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/003-remove_bogus_modparams.patch
@@ -0,0 +1,34 @@
+--- a/compat/main.c
++++ b/compat/main.c
+@@ -20,31 +20,6 @@ MODULE_LICENSE("GPL");
+ #error "You need a BACKPORTS_VERSION"
+ #endif
+ 
+-static char *backported_kernel_name = BACKPORTED_KERNEL_NAME;
+-
+-module_param(backported_kernel_name, charp, 0400);
+-MODULE_PARM_DESC(backported_kernel_name,
+-		 "The kernel tree name that was used for this backport (" BACKPORTED_KERNEL_NAME ")");
+-
+-#ifdef BACKPORTS_GIT_TRACKED 
+-static char *backports_tracker_id = BACKPORTS_GIT_TRACKED;
+-module_param(backports_tracker_id, charp, 0400);
+-MODULE_PARM_DESC(backports_tracker_id,
+-		 "The version of the tree containing this backport (" BACKPORTS_GIT_TRACKED ")");
+-#else
+-static char *backported_kernel_version = BACKPORTED_KERNEL_VERSION;
+-static char *backports_version = BACKPORTS_VERSION;
+-
+-module_param(backported_kernel_version, charp, 0400);
+-MODULE_PARM_DESC(backported_kernel_version,
+-		 "The kernel version that was used for this backport (" BACKPORTED_KERNEL_VERSION ")");
+-
+-module_param(backports_version, charp, 0400);
+-MODULE_PARM_DESC(backports_version,
+-		 "The git version of the backports tree used to generate this backport (" BACKPORTS_VERSION ")");
+-
+-#endif
+-
+ void backport_dependency_symbol(void)
+ {
+ }
diff --git a/trunk/package/kernel/mac80211/patches/008-fix_netdev_unregister.patch b/trunk/package/kernel/mac80211/patches/008-fix_netdev_unregister.patch
new file mode 100644
index 00000000..ab39a0ad
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/008-fix_netdev_unregister.patch
@@ -0,0 +1,16 @@
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -1859,6 +1859,13 @@ void ieee80211_remove_interfaces(struct 
+ 	}
+ 	mutex_unlock(&local->iflist_mtx);
+ 	unregister_netdevice_many(&unreg_list);
++#if (!(LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,45) && \
++       LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)) && \
++     !(LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,9) && \
++       LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) && \
++     (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)))
++	list_del(&unreg_list);
++#endif
+ 
+ 	list_for_each_entry_safe(sdata, tmp, &wdev_list, list) {
+ 		list_del(&sdata->list);
diff --git a/trunk/package/kernel/mac80211/patches/010-disable_rfkill.patch b/trunk/package/kernel/mac80211/patches/010-disable_rfkill.patch
new file mode 100644
index 00000000..c5a92d6b
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/010-disable_rfkill.patch
@@ -0,0 +1,13 @@
+--- a/backport-include/linux/rfkill.h
++++ b/backport-include/linux/rfkill.h
+@@ -2,6 +2,10 @@
+ #define __COMPAT_RFKILL_H
+ #include <linux/version.h>
+ 
++#undef CONFIG_RFKILL
++#undef CONFIG_RFKILL_LEDS
++#undef CONFIG_RFKILL_MODULE
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+ #include_next <linux/rfkill.h>
+ #else
diff --git a/trunk/package/kernel/mac80211/patches/050-lib80211_option.patch b/trunk/package/kernel/mac80211/patches/050-lib80211_option.patch
new file mode 100644
index 00000000..64e4efb7
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/050-lib80211_option.patch
@@ -0,0 +1,30 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -166,7 +166,7 @@ config CFG80211_WEXT
+ 	  extensions with cfg80211-based drivers.
+ 
+ config LIB80211
+-	tristate
++	tristate "lib80211"
+ 	depends on m
+ 	default n
+ 	help
+@@ -176,15 +176,15 @@ config LIB80211
+ 	  Drivers should select this themselves if needed.
+ 
+ config LIB80211_CRYPT_WEP
+-	tristate
++	tristate "lib80211 WEP support"
+ 	depends on m
+ 
+ config LIB80211_CRYPT_CCMP
+-	tristate
++	tristate "lib80211 CCMP support"
+ 	depends on m
+ 
+ config LIB80211_CRYPT_TKIP
+-	tristate
++	tristate "lib80211 TKIP support"
+ 	depends on m
+ 
+ config LIB80211_DEBUG
diff --git a/trunk/package/kernel/mac80211/patches/080-disable_clk_backport.patch b/trunk/package/kernel/mac80211/patches/080-disable_clk_backport.patch
new file mode 100644
index 00000000..3765591e
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/080-disable_clk_backport.patch
@@ -0,0 +1,20 @@
+--- a/compat/compat-3.6.c
++++ b/compat/compat-3.6.c
+@@ -147,17 +147,3 @@ int sg_alloc_table_from_pages(struct sg_
+ 	return 0;
+ }
+ EXPORT_SYMBOL_GPL(sg_alloc_table_from_pages);
+-
+-/* whoopsie ! */
+-#ifndef CONFIG_COMMON_CLK
+-int clk_enable(struct clk *clk)
+-{
+-	return 0;
+-}
+-EXPORT_SYMBOL_GPL(clk_enable);
+-
+-void clk_disable(struct clk *clk)
+-{
+-}
+-EXPORT_SYMBOL_GPL(clk_disable);
+-#endif
diff --git a/trunk/package/kernel/mac80211/patches/081-backport-devm_kmemdup.patch b/trunk/package/kernel/mac80211/patches/081-backport-devm_kmemdup.patch
new file mode 100644
index 00000000..fb61625d
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/081-backport-devm_kmemdup.patch
@@ -0,0 +1,23 @@
+--- a/backport-include/linux/device.h
++++ b/backport-include/linux/device.h
+@@ -177,4 +177,20 @@ static inline void *devm_kmalloc_array(s
+ }
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
++#define devm_kmemdup LINUX_BACKPORT(devm_kmemdup)
++static inline void *devm_kmemdup(struct device *dev, const void *src,
++				 size_t len, gfp_t gfp)
++{
++	void *p;
++
++	p = devm_kmalloc(dev, len, gfp);
++	if (p)
++		memcpy(p, src, len);
++
++	return p;
++}
++#endif
++
++
+ #endif /* __BACKPORT_DEVICE_H */
diff --git a/trunk/package/kernel/mac80211/patches/082-backport-list_last_entry.patch b/trunk/package/kernel/mac80211/patches/082-backport-list_last_entry.patch
new file mode 100644
index 00000000..4ee90479
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/082-backport-list_last_entry.patch
@@ -0,0 +1,20 @@
+--- a/backport-include/linux/list.h
++++ b/backport-include/linux/list.h
+@@ -73,4 +73,17 @@
+ 	list_entry((pos)->member.next, typeof(*(pos)), member)
+ #endif /* list_next_entry */
+ 
++#ifndef list_last_entry
++/**
++ * list_last_entry - get the last element from a list
++ * @ptr:	the list head to take the element from.
++ * @type:	the type of the struct this is embedded in.
++ * @member:	the name of the list_struct within the struct.
++ *
++ * Note, that list is expected to be not empty.
++ */
++#define list_last_entry(ptr, type, member) \
++	list_entry((ptr)->prev, type, member)
++#endif
++
+ #endif /* __BACKPORT_LIST_H */
diff --git a/trunk/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch b/trunk/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch
new file mode 100644
index 00000000..cb14c0bc
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch
@@ -0,0 +1,347 @@
+--- a/net/mac80211/Kconfig
++++ b/net/mac80211/Kconfig
+@@ -5,7 +5,6 @@ config MAC80211
+ 	depends on CRYPTO
+ 	depends on CRYPTO_ARC4
+ 	depends on CRYPTO_AES
+-	select BACKPORT_CRYPTO_CCM
+ 	depends on CRC32
+ 	select BACKPORT_AVERAGE
+ 	---help---
+--- a/net/mac80211/aes_ccm.c
++++ b/net/mac80211/aes_ccm.c
+@@ -2,8 +2,6 @@
+  * Copyright 2003-2004, Instant802 Networks, Inc.
+  * Copyright 2005-2006, Devicescape Software, Inc.
+  *
+- * Rewrite: Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
+- *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+@@ -19,76 +17,134 @@
+ #include "key.h"
+ #include "aes_ccm.h"
+ 
+-void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+-			       u8 *data, size_t data_len, u8 *mic)
++static void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *scratch, u8 *a)
++{
++	int i;
++	u8 *b_0, *aad, *b, *s_0;
++
++	b_0 = scratch + 3 * AES_BLOCK_SIZE;
++	aad = scratch + 4 * AES_BLOCK_SIZE;
++	b = scratch;
++	s_0 = scratch + AES_BLOCK_SIZE;
++
++	crypto_cipher_encrypt_one(tfm, b, b_0);
++
++	/* Extra Authenticate-only data (always two AES blocks) */
++	for (i = 0; i < AES_BLOCK_SIZE; i++)
++		aad[i] ^= b[i];
++	crypto_cipher_encrypt_one(tfm, b, aad);
++
++	aad += AES_BLOCK_SIZE;
++
++	for (i = 0; i < AES_BLOCK_SIZE; i++)
++		aad[i] ^= b[i];
++	crypto_cipher_encrypt_one(tfm, a, aad);
++
++	/* Mask out bits from auth-only-b_0 */
++	b_0[0] &= 0x07;
++
++	/* S_0 is used to encrypt T (= MIC) */
++	b_0[14] = 0;
++	b_0[15] = 0;
++	crypto_cipher_encrypt_one(tfm, s_0, b_0);
++}
++
++
++void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
++			       u8 *data, size_t data_len,
++			       u8 *cdata, u8 *mic)
+ {
+-	struct scatterlist assoc, pt, ct[2];
++	int i, j, last_len, num_blocks;
++	u8 *pos, *cpos, *b, *s_0, *e, *b_0;
+ 
+-	char aead_req_data[sizeof(struct aead_request) +
+-			   crypto_aead_reqsize(tfm)]
+-		__aligned(__alignof__(struct aead_request));
+-	struct aead_request *aead_req = (void *) aead_req_data;
+-
+-	memset(aead_req, 0, sizeof(aead_req_data));
+-
+-	sg_init_one(&pt, data, data_len);
+-	sg_init_one(&assoc, &aad[2], be16_to_cpup((__be16 *)aad));
+-	sg_init_table(ct, 2);
+-	sg_set_buf(&ct[0], data, data_len);
+-	sg_set_buf(&ct[1], mic, IEEE80211_CCMP_MIC_LEN);
+-
+-	aead_request_set_tfm(aead_req, tfm);
+-	aead_request_set_assoc(aead_req, &assoc, assoc.length);
+-	aead_request_set_crypt(aead_req, &pt, ct, data_len, b_0);
++	b = scratch;
++	s_0 = scratch + AES_BLOCK_SIZE;
++	e = scratch + 2 * AES_BLOCK_SIZE;
++	b_0 = scratch + 3 * AES_BLOCK_SIZE;
++
++	num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
++	last_len = data_len % AES_BLOCK_SIZE;
++	aes_ccm_prepare(tfm, scratch, b);
++
++	/* Process payload blocks */
++	pos = data;
++	cpos = cdata;
++	for (j = 1; j <= num_blocks; j++) {
++		int blen = (j == num_blocks && last_len) ?
++			last_len : AES_BLOCK_SIZE;
++
++		/* Authentication followed by encryption */
++		for (i = 0; i < blen; i++)
++			b[i] ^= pos[i];
++		crypto_cipher_encrypt_one(tfm, b, b);
++
++		b_0[14] = (j >> 8) & 0xff;
++		b_0[15] = j & 0xff;
++		crypto_cipher_encrypt_one(tfm, e, b_0);
++		for (i = 0; i < blen; i++)
++			*cpos++ = *pos++ ^ e[i];
++	}
+ 
+-	crypto_aead_encrypt(aead_req);
++	for (i = 0; i < IEEE80211_CCMP_MIC_LEN; i++)
++		mic[i] = b[i] ^ s_0[i];
+ }
+ 
+-int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+-			      u8 *data, size_t data_len, u8 *mic)
++
++int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
++			      u8 *cdata, size_t data_len, u8 *mic, u8 *data)
+ {
+-	struct scatterlist assoc, pt, ct[2];
+-	char aead_req_data[sizeof(struct aead_request) +
+-			   crypto_aead_reqsize(tfm)]
+-		__aligned(__alignof__(struct aead_request));
+-	struct aead_request *aead_req = (void *) aead_req_data;
+-
+-	memset(aead_req, 0, sizeof(aead_req_data));
+-
+-	sg_init_one(&pt, data, data_len);
+-	sg_init_one(&assoc, &aad[2], be16_to_cpup((__be16 *)aad));
+-	sg_init_table(ct, 2);
+-	sg_set_buf(&ct[0], data, data_len);
+-	sg_set_buf(&ct[1], mic, IEEE80211_CCMP_MIC_LEN);
+-
+-	aead_request_set_tfm(aead_req, tfm);
+-	aead_request_set_assoc(aead_req, &assoc, assoc.length);
+-	aead_request_set_crypt(aead_req, ct, &pt,
+-			       data_len + IEEE80211_CCMP_MIC_LEN, b_0);
++	int i, j, last_len, num_blocks;
++	u8 *pos, *cpos, *b, *s_0, *a, *b_0;
++
++	b = scratch;
++	s_0 = scratch + AES_BLOCK_SIZE;
++	a = scratch + 2 * AES_BLOCK_SIZE;
++	b_0 = scratch + 3 * AES_BLOCK_SIZE;
++
++	num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
++	last_len = data_len % AES_BLOCK_SIZE;
++	aes_ccm_prepare(tfm, scratch, a);
++
++	/* Process payload blocks */
++	cpos = cdata;
++	pos = data;
++	for (j = 1; j <= num_blocks; j++) {
++		int blen = (j == num_blocks && last_len) ?
++			last_len : AES_BLOCK_SIZE;
++
++		/* Decryption followed by authentication */
++		b_0[14] = (j >> 8) & 0xff;
++		b_0[15] = j & 0xff;
++		crypto_cipher_encrypt_one(tfm, b, b_0);
++		for (i = 0; i < blen; i++) {
++			*pos = *cpos++ ^ b[i];
++			a[i] ^= *pos++;
++		}
++		crypto_cipher_encrypt_one(tfm, a, a);
++	}
++
++	for (i = 0; i < IEEE80211_CCMP_MIC_LEN; i++) {
++		if ((mic[i] ^ s_0[i]) != a[i])
++			return -1;
++	}
+ 
+-	return crypto_aead_decrypt(aead_req);
++	return 0;
+ }
+ 
+-struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[])
++
++struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[])
+ {
+-	struct crypto_aead *tfm;
+-	int err;
++	struct crypto_cipher *tfm;
+ 
+-	tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC);
+-	if (IS_ERR(tfm))
+-		return tfm;
+-
+-	err = crypto_aead_setkey(tfm, key, WLAN_KEY_LEN_CCMP);
+-	if (!err)
+-		err = crypto_aead_setauthsize(tfm, IEEE80211_CCMP_MIC_LEN);
+-	if (!err)
+-		return tfm;
++	tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
++	if (!IS_ERR(tfm))
++		crypto_cipher_setkey(tfm, key, WLAN_KEY_LEN_CCMP);
+ 
+-	crypto_free_aead(tfm);
+-	return ERR_PTR(err);
++	return tfm;
+ }
+ 
+-void ieee80211_aes_key_free(struct crypto_aead *tfm)
++
++void ieee80211_aes_key_free(struct crypto_cipher *tfm)
+ {
+-	crypto_free_aead(tfm);
++	crypto_free_cipher(tfm);
+ }
+--- a/net/mac80211/aes_ccm.h
++++ b/net/mac80211/aes_ccm.h
+@@ -12,11 +12,13 @@
+ 
+ #include <linux/crypto.h>
+ 
+-struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[]);
+-void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+-			       u8 *data, size_t data_len, u8 *mic);
+-int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+-			      u8 *data, size_t data_len, u8 *mic);
+-void ieee80211_aes_key_free(struct crypto_aead *tfm);
++struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]);
++void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
++			       u8 *data, size_t data_len,
++			       u8 *cdata, u8 *mic);
++int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
++			      u8 *cdata, size_t data_len,
++			      u8 *mic, u8 *data);
++void ieee80211_aes_key_free(struct crypto_cipher *tfm);
+ 
+ #endif /* AES_CCM_H */
+--- a/net/mac80211/key.h
++++ b/net/mac80211/key.h
+@@ -84,7 +84,7 @@ struct ieee80211_key {
+ 			 * Management frames.
+ 			 */
+ 			u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
+-			struct crypto_aead *tfm;
++			struct crypto_cipher *tfm;
+ 			u32 replays; /* dot11RSNAStatsCCMPReplays */
+ 		} ccmp;
+ 		struct {
+--- a/net/mac80211/wpa.c
++++ b/net/mac80211/wpa.c
+@@ -302,15 +302,22 @@ ieee80211_crypto_tkip_decrypt(struct iee
+ }
+ 
+ 
+-static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *b_0, u8 *aad)
++static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *scratch,
++				int encrypted)
+ {
+ 	__le16 mask_fc;
+ 	int a4_included, mgmt;
+ 	u8 qos_tid;
+-	u16 len_a;
++	u8 *b_0, *aad;
++	u16 data_len, len_a;
+ 	unsigned int hdrlen;
+ 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+ 
++	memset(scratch, 0, 6 * AES_BLOCK_SIZE);
++
++	b_0 = scratch + 3 * AES_BLOCK_SIZE;
++	aad = scratch + 4 * AES_BLOCK_SIZE;
++
+ 	/*
+ 	 * Mask FC: zero subtype b4 b5 b6 (if not mgmt)
+ 	 * Retry, PwrMgt, MoreData; set Protected
+@@ -332,21 +339,20 @@ static void ccmp_special_blocks(struct s
+ 	else
+ 		qos_tid = 0;
+ 
+-	/* In CCM, the initial vectors (IV) used for CTR mode encryption and CBC
+-	 * mode authentication are not allowed to collide, yet both are derived
+-	 * from this vector b_0. We only set L := 1 here to indicate that the
+-	 * data size can be represented in (L+1) bytes. The CCM layer will take
+-	 * care of storing the data length in the top (L+1) bytes and setting
+-	 * and clearing the other bits as is required to derive the two IVs.
+-	 */
+-	b_0[0] = 0x1;
++	data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN;
++	if (encrypted)
++		data_len -= IEEE80211_CCMP_MIC_LEN;
+ 
++	/* First block, b_0 */
++	b_0[0] = 0x59; /* flags: Adata: 1, M: 011, L: 001 */
+ 	/* Nonce: Nonce Flags | A2 | PN
+ 	 * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
+ 	 */
+ 	b_0[1] = qos_tid | (mgmt << 4);
+ 	memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
+ 	memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
++	/* l(m) */
++	put_unaligned_be16(data_len, &b_0[14]);
+ 
+ 	/* AAD (extra authenticate-only data) / masked 802.11 header
+ 	 * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
+@@ -402,8 +408,7 @@ static int ccmp_encrypt_skb(struct ieee8
+ 	u8 *pos;
+ 	u8 pn[6];
+ 	u64 pn64;
+-	u8 aad[2 * AES_BLOCK_SIZE];
+-	u8 b_0[AES_BLOCK_SIZE];
++	u8 scratch[6 * AES_BLOCK_SIZE];
+ 
+ 	if (info->control.hw_key &&
+ 	    !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
+@@ -457,9 +462,9 @@ static int ccmp_encrypt_skb(struct ieee8
+ 		return 0;
+ 
+ 	pos += IEEE80211_CCMP_HDR_LEN;
+-	ccmp_special_blocks(skb, pn, b_0, aad);
+-	ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
+-				  skb_put(skb, IEEE80211_CCMP_MIC_LEN));
++	ccmp_special_blocks(skb, pn, scratch, 0);
++	ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, scratch, pos, len,
++				  pos, skb_put(skb, IEEE80211_CCMP_MIC_LEN));
+ 
+ 	return 0;
+ }
+@@ -522,16 +527,16 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+ 	}
+ 
+ 	if (!(status->flag & RX_FLAG_DECRYPTED)) {
+-		u8 aad[2 * AES_BLOCK_SIZE];
+-		u8 b_0[AES_BLOCK_SIZE];
++		u8 scratch[6 * AES_BLOCK_SIZE];
+ 		/* hardware didn't decrypt/verify MIC */
+-		ccmp_special_blocks(skb, pn, b_0, aad);
++		ccmp_special_blocks(skb, pn, scratch, 1);
+ 
+ 		if (ieee80211_aes_ccm_decrypt(
+-			    key->u.ccmp.tfm, b_0, aad,
++			    key->u.ccmp.tfm, scratch,
+ 			    skb->data + hdrlen + IEEE80211_CCMP_HDR_LEN,
+ 			    data_len,
+-			    skb->data + skb->len - IEEE80211_CCMP_MIC_LEN))
++			    skb->data + skb->len - IEEE80211_CCMP_MIC_LEN,
++			    skb->data + hdrlen + IEEE80211_CCMP_HDR_LEN))
+ 			return RX_DROP_UNUSABLE;
+ 	}
+ 
diff --git a/trunk/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch b/trunk/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
new file mode 100644
index 00000000..d266e6d8
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
@@ -0,0 +1,12 @@
+Used for AP+STA support in libreCMC - preserve AP mode keys across STA reconnects
+
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -848,7 +848,6 @@ static int ieee80211_stop_ap(struct wiph
+ 	sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
+ 
+ 	__sta_info_flush(sdata, true);
+-	ieee80211_free_keys(sdata, true);
+ 
+ 	sdata->vif.bss_conf.enable_beacon = false;
+ 	sdata->vif.bss_conf.ssid_len = 0;
diff --git a/trunk/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/trunk/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
new file mode 100644
index 00000000..479b409f
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
@@ -0,0 +1,67 @@
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -287,7 +287,7 @@ void ieee80211_restart_hw(struct ieee802
+ }
+ EXPORT_SYMBOL(ieee80211_restart_hw);
+ 
+-#ifdef CONFIG_INET
++#ifdef __disabled__CONFIG_INET
+ static int ieee80211_ifa_changed(struct notifier_block *nb,
+ 				 unsigned long data, void *arg)
+ {
+@@ -346,7 +346,7 @@ static int ieee80211_ifa_changed(struct 
+ }
+ #endif
+ 
+-#if IS_ENABLED(CONFIG_IPV6)
++#if IS_ENABLED(__disabled__CONFIG_IPV6)
+ static int ieee80211_ifa6_changed(struct notifier_block *nb,
+ 				  unsigned long data, void *arg)
+ {
+@@ -1044,14 +1044,14 @@ int ieee80211_register_hw(struct ieee802
+ 		goto fail_pm_qos;
+ 	}
+ 
+-#ifdef CONFIG_INET
++#ifdef __disabled__CONFIG_INET
+ 	local->ifa_notifier.notifier_call = ieee80211_ifa_changed;
+ 	result = register_inetaddr_notifier(&local->ifa_notifier);
+ 	if (result)
+ 		goto fail_ifa;
+ #endif
+ 
+-#if IS_ENABLED(CONFIG_IPV6)
++#if IS_ENABLED(__disabled__CONFIG_IPV6)
+ 	local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
+ 	result = register_inet6addr_notifier(&local->ifa6_notifier);
+ 	if (result)
+@@ -1060,13 +1060,13 @@ int ieee80211_register_hw(struct ieee802
+ 
+ 	return 0;
+ 
+-#if IS_ENABLED(CONFIG_IPV6)
++#if IS_ENABLED(__disabled__CONFIG_IPV6)
+  fail_ifa6:
+-#ifdef CONFIG_INET
++#ifdef __disabled__CONFIG_INET
+ 	unregister_inetaddr_notifier(&local->ifa_notifier);
+ #endif
+ #endif
+-#if defined(CONFIG_INET) || defined(CONFIG_IPV6)
++#if defined(__disabled__CONFIG_INET) || defined(__disabled__CONFIG_IPV6)
+  fail_ifa:
+ 	pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY,
+ 			       &local->network_latency_notifier);
+@@ -1111,10 +1111,10 @@ void ieee80211_unregister_hw(struct ieee
+ 
+ 	pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY,
+ 			       &local->network_latency_notifier);
+-#ifdef CONFIG_INET
++#ifdef __disabled__CONFIG_INET
+ 	unregister_inetaddr_notifier(&local->ifa_notifier);
+ #endif
+-#if IS_ENABLED(CONFIG_IPV6)
++#if IS_ENABLED(__disabled__CONFIG_IPV6)
+ 	unregister_inet6addr_notifier(&local->ifa6_notifier);
+ #endif
+ 
diff --git a/trunk/package/kernel/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch b/trunk/package/kernel/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
new file mode 100644
index 00000000..21516ffd
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
@@ -0,0 +1,38 @@
+--- a/drivers/net/wireless/ath/ath5k/initvals.c
++++ b/drivers/net/wireless/ath/ath5k/initvals.c
+@@ -62,8 +62,14 @@ static const struct ath5k_ini ar5210_ini
+ 	{ AR5K_IMR,		0 },
+ 	{ AR5K_IER,		AR5K_IER_DISABLE },
+ 	{ AR5K_BSR,		0, AR5K_INI_READ },
++#if !defined(CONFIG_ATHEROS_AR71XX) && !defined(CONFIG_ATH79)
+ 	{ AR5K_TXCFG,		AR5K_DMASIZE_128B },
+ 	{ AR5K_RXCFG,		AR5K_DMASIZE_128B },
++#else
++	/* WAR for AR71xx PCI bug */
++	{ AR5K_TXCFG,		AR5K_DMASIZE_128B },
++	{ AR5K_RXCFG,		AR5K_DMASIZE_4B },
++#endif
+ 	{ AR5K_CFG,		AR5K_INIT_CFG },
+ 	{ AR5K_TOPS,		8 },
+ 	{ AR5K_RXNOFRM,		8 },
+--- a/drivers/net/wireless/ath/ath5k/dma.c
++++ b/drivers/net/wireless/ath/ath5k/dma.c
+@@ -869,10 +869,18 @@ ath5k_hw_dma_init(struct ath5k_hw *ah)
+ 	 * guess we can tweak it and see how it goes ;-)
+ 	 */
+ 	if (ah->ah_version != AR5K_AR5210) {
++#if !defined(CONFIG_ATHEROS_AR71XX) && !defined(CONFIG_ATH79)
+ 		AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
+ 			AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
+ 		AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
+ 			AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_128B);
++#else
++		/* WAR for AR71xx PCI bug */
++		AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
++			AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
++		AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
++			AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B);
++#endif
+ 	}
+ 
+ 	/* Pre-enable interrupts on 5211/5212*/
diff --git a/trunk/package/kernel/mac80211/patches/210-ap_scan.patch b/trunk/package/kernel/mac80211/patches/210-ap_scan.patch
new file mode 100644
index 00000000..9e94d00b
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/210-ap_scan.patch
@@ -0,0 +1,11 @@
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -1947,7 +1947,7 @@ static int ieee80211_scan(struct wiphy *
+ 		 * the  frames sent while scanning on other channel will be
+ 		 * lost)
+ 		 */
+-		if (sdata->u.ap.beacon &&
++		if (0 && sdata->u.ap.beacon &&
+ 		    (!(wiphy->features & NL80211_FEATURE_AP_SCAN) ||
+ 		     !(req->flags & NL80211_SCAN_FLAG_AP)))
+ 			return -EOPNOTSUPP;
diff --git a/trunk/package/kernel/mac80211/patches/300-Revert-ath5k-Remove-AHB-bus-support.patch b/trunk/package/kernel/mac80211/patches/300-Revert-ath5k-Remove-AHB-bus-support.patch
new file mode 100644
index 00000000..cb714995
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/300-Revert-ath5k-Remove-AHB-bus-support.patch
@@ -0,0 +1,395 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 27 Sep 2014 15:57:09 +0200
+Subject: [PATCH] Revert "ath5k: Remove AHB bus support"
+
+This reverts commit 093ec3c5337434f40d77c1af06c139da3e5ba6dc.
+---
+ create mode 100644 drivers/net/wireless/ath/ath5k/ahb.c
+
+--- a/drivers/net/wireless/ath/ath5k/Kconfig
++++ b/drivers/net/wireless/ath/ath5k/Kconfig
+@@ -1,13 +1,14 @@
+ config ATH5K
+ 	tristate "Atheros 5xxx wireless cards support"
+ 	depends on m
+-	depends on PCI && MAC80211
++	depends on (PCI || ATHEROS_AR231X) && MAC80211
+ 	select ATH_COMMON
+ 	select MAC80211_LEDS
+ 	select BACKPORT_LEDS_CLASS
+ 	select BACKPORT_NEW_LEDS
+ 	select BACKPORT_AVERAGE
+-	select ATH5K_PCI
++	select ATH5K_AHB if (ATHEROS_AR231X && !PCI)
++	select ATH5K_PCI if (!ATHEROS_AR231X && PCI)
+ 	---help---
+ 	  This module adds support for wireless adapters based on
+ 	  Atheros 5xxx chipset.
+@@ -52,9 +53,16 @@ config ATH5K_TRACER
+ 
+ 	  If unsure, say N.
+ 
++config ATH5K_AHB
++	bool "Atheros 5xxx AHB bus support"
++	depends on (ATHEROS_AR231X && !PCI)
++	---help---
++	  This adds support for WiSoC type chipsets of the 5xxx Atheros
++	  family.
++
+ config ATH5K_PCI
+ 	bool "Atheros 5xxx PCI bus support"
+-	depends on PCI
++	depends on (!ATHEROS_AR231X && PCI)
+ 	---help---
+ 	  This adds support for PCI type chipsets of the 5xxx Atheros
+ 	  family.
+--- a/drivers/net/wireless/ath/ath5k/Makefile
++++ b/drivers/net/wireless/ath/ath5k/Makefile
+@@ -17,5 +17,6 @@ ath5k-y				+= ani.o
+ ath5k-y				+= sysfs.o
+ ath5k-y				+= mac80211-ops.o
+ ath5k-$(CPTCFG_ATH5K_DEBUG)	+= debug.o
++ath5k-$(CPTCFG_ATH5K_AHB)	+= ahb.o
+ ath5k-$(CPTCFG_ATH5K_PCI)	+= pci.o
+ obj-$(CPTCFG_ATH5K)		+= ath5k.o
+--- /dev/null
++++ b/drivers/net/wireless/ath/ath5k/ahb.c
+@@ -0,0 +1,234 @@
++/*
++ * Copyright (c) 2008-2009 Atheros Communications Inc.
++ * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <linux/nl80211.h>
++#include <linux/platform_device.h>
++#include <linux/etherdevice.h>
++#include <linux/export.h>
++#include <ar231x_platform.h>
++#include "ath5k.h"
++#include "debug.h"
++#include "base.h"
++#include "reg.h"
++
++/* return bus cachesize in 4B word units */
++static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)
++{
++	*csz = L1_CACHE_BYTES >> 2;
++}
++
++static bool
++ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
++{
++	struct ath5k_hw *ah = common->priv;
++	struct platform_device *pdev = to_platform_device(ah->dev);
++	struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
++	u16 *eeprom, *eeprom_end;
++
++	eeprom = (u16 *) bcfg->radio;
++	eeprom_end = ((void *) bcfg->config) + BOARD_CONFIG_BUFSZ;
++
++	eeprom += off;
++	if (eeprom > eeprom_end)
++		return false;
++
++	*data = *eeprom;
++	return true;
++}
++
++int ath5k_hw_read_srev(struct ath5k_hw *ah)
++{
++	struct platform_device *pdev = to_platform_device(ah->dev);
++	struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
++	ah->ah_mac_srev = bcfg->devid;
++	return 0;
++}
++
++static int ath5k_ahb_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
++{
++	struct platform_device *pdev = to_platform_device(ah->dev);
++	struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
++	u8 *cfg_mac;
++
++	if (to_platform_device(ah->dev)->id == 0)
++		cfg_mac = bcfg->config->wlan0_mac;
++	else
++		cfg_mac = bcfg->config->wlan1_mac;
++
++	memcpy(mac, cfg_mac, ETH_ALEN);
++	return 0;
++}
++
++static const struct ath_bus_ops ath_ahb_bus_ops = {
++	.ath_bus_type = ATH_AHB,
++	.read_cachesize = ath5k_ahb_read_cachesize,
++	.eeprom_read = ath5k_ahb_eeprom_read,
++	.eeprom_read_mac = ath5k_ahb_eeprom_read_mac,
++};
++
++/*Initialization*/
++static int ath_ahb_probe(struct platform_device *pdev)
++{
++	struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
++	struct ath5k_hw *ah;
++	struct ieee80211_hw *hw;
++	struct resource *res;
++	void __iomem *mem;
++	int irq;
++	int ret = 0;
++	u32 reg;
++
++	if (!dev_get_platdata(&pdev->dev)) {
++		dev_err(&pdev->dev, "no platform data specified\n");
++		ret = -EINVAL;
++		goto err_out;
++	}
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (res == NULL) {
++		dev_err(&pdev->dev, "no memory resource found\n");
++		ret = -ENXIO;
++		goto err_out;
++	}
++
++	mem = ioremap_nocache(res->start, resource_size(res));
++	if (mem == NULL) {
++		dev_err(&pdev->dev, "ioremap failed\n");
++		ret = -ENOMEM;
++		goto err_out;
++	}
++
++	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
++	if (res == NULL) {
++		dev_err(&pdev->dev, "no IRQ resource found\n");
++		ret = -ENXIO;
++		goto err_iounmap;
++	}
++
++	irq = res->start;
++
++	hw = ieee80211_alloc_hw(sizeof(struct ath5k_hw), &ath5k_hw_ops);
++	if (hw == NULL) {
++		dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
++		ret = -ENOMEM;
++		goto err_iounmap;
++	}
++
++	ah = hw->priv;
++	ah->hw = hw;
++	ah->dev = &pdev->dev;
++	ah->iobase = mem;
++	ah->irq = irq;
++	ah->devid = bcfg->devid;
++
++	if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
++		/* Enable WMAC AHB arbitration */
++		reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
++		reg |= AR5K_AR2315_AHB_ARB_CTL_WLAN;
++		iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
++
++		/* Enable global WMAC swapping */
++		reg = ioread32((void __iomem *) AR5K_AR2315_BYTESWAP);
++		reg |= AR5K_AR2315_BYTESWAP_WMAC;
++		iowrite32(reg, (void __iomem *) AR5K_AR2315_BYTESWAP);
++	} else {
++		/* Enable WMAC DMA access (assuming 5312 or 231x*/
++		/* TODO: check other platforms */
++		reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
++		if (to_platform_device(ah->dev)->id == 0)
++			reg |= AR5K_AR5312_ENABLE_WLAN0;
++		else
++			reg |= AR5K_AR5312_ENABLE_WLAN1;
++		iowrite32(reg, (void __iomem *) AR5K_AR5312_ENABLE);
++
++		/*
++		 * On a dual-band AR5312, the multiband radio is only
++		 * used as pass-through. Disable 2 GHz support in the
++		 * driver for it
++		 */
++		if (to_platform_device(ah->dev)->id == 0 &&
++		    (bcfg->config->flags & (BD_WLAN0 | BD_WLAN1)) ==
++		     (BD_WLAN1 | BD_WLAN0))
++			ah->ah_capabilities.cap_needs_2GHz_ovr = true;
++		else
++			ah->ah_capabilities.cap_needs_2GHz_ovr = false;
++	}
++
++	ret = ath5k_init_ah(ah, &ath_ahb_bus_ops);
++	if (ret != 0) {
++		dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret);
++		ret = -ENODEV;
++		goto err_free_hw;
++	}
++
++	platform_set_drvdata(pdev, hw);
++
++	return 0;
++
++ err_free_hw:
++	ieee80211_free_hw(hw);
++ err_iounmap:
++        iounmap(mem);
++ err_out:
++	return ret;
++}
++
++static int ath_ahb_remove(struct platform_device *pdev)
++{
++	struct ar231x_board_config *bcfg = dev_get_platdata(&pdev->dev);
++	struct ieee80211_hw *hw = platform_get_drvdata(pdev);
++	struct ath5k_hw *ah;
++	u32 reg;
++
++	if (!hw)
++		return 0;
++
++	ah = hw->priv;
++
++	if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
++		/* Disable WMAC AHB arbitration */
++		reg = ioread32((void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
++		reg &= ~AR5K_AR2315_AHB_ARB_CTL_WLAN;
++		iowrite32(reg, (void __iomem *) AR5K_AR2315_AHB_ARB_CTL);
++	} else {
++		/*Stop DMA access */
++		reg = ioread32((void __iomem *) AR5K_AR5312_ENABLE);
++		if (to_platform_device(ah->dev)->id == 0)
++			reg &= ~AR5K_AR5312_ENABLE_WLAN0;
++		else
++			reg &= ~AR5K_AR5312_ENABLE_WLAN1;
++		iowrite32(reg, (void __iomem *) AR5K_AR5312_ENABLE);
++	}
++
++	ath5k_deinit_ah(ah);
++	iounmap(ah->iobase);
++	ieee80211_free_hw(hw);
++
++	return 0;
++}
++
++static struct platform_driver ath_ahb_driver = {
++	.probe      = ath_ahb_probe,
++	.remove     = ath_ahb_remove,
++	.driver		= {
++		.name	= "ar231x-wmac",
++		.owner	= THIS_MODULE,
++	},
++};
++
++module_platform_driver(ath_ahb_driver);
+--- a/drivers/net/wireless/ath/ath5k/ath5k.h
++++ b/drivers/net/wireless/ath/ath5k/ath5k.h
+@@ -1647,6 +1647,32 @@ static inline struct ath_regulatory *ath
+ 	return &(ath5k_hw_common(ah)->regulatory);
+ }
+ 
++#ifdef CONFIG_ATHEROS_AR231X
++#define AR5K_AR2315_PCI_BASE	((void __iomem *)0xb0100000)
++
++static inline void __iomem *ath5k_ahb_reg(struct ath5k_hw *ah, u16 reg)
++{
++	/* On AR2315 and AR2317 the PCI clock domain registers
++	 * are outside of the WMAC register space */
++	if (unlikely((reg >= 0x4000) && (reg < 0x5000) &&
++	    (ah->ah_mac_srev >= AR5K_SREV_AR2315_R6)))
++		return AR5K_AR2315_PCI_BASE + reg;
++
++	return ah->iobase + reg;
++}
++
++static inline u32 ath5k_hw_reg_read(struct ath5k_hw *ah, u16 reg)
++{
++	return ioread32(ath5k_ahb_reg(ah, reg));
++}
++
++static inline void ath5k_hw_reg_write(struct ath5k_hw *ah, u32 val, u16 reg)
++{
++	iowrite32(val, ath5k_ahb_reg(ah, reg));
++}
++
++#else
++
+ static inline u32 ath5k_hw_reg_read(struct ath5k_hw *ah, u16 reg)
+ {
+ 	return ioread32(ah->iobase + reg);
+@@ -1657,6 +1683,8 @@ static inline void ath5k_hw_reg_write(st
+ 	iowrite32(val, ah->iobase + reg);
+ }
+ 
++#endif
++
+ static inline enum ath_bus_type ath5k_get_bus_type(struct ath5k_hw *ah)
+ {
+ 	return ath5k_hw_common(ah)->bus_ops->ath_bus_type;
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -99,6 +99,15 @@ static int ath5k_reset(struct ath5k_hw *
+ 
+ /* Known SREVs */
+ static const struct ath5k_srev_name srev_names[] = {
++#ifdef CONFIG_ATHEROS_AR231X
++	{ "5312",	AR5K_VERSION_MAC,	AR5K_SREV_AR5312_R2 },
++	{ "5312",	AR5K_VERSION_MAC,	AR5K_SREV_AR5312_R7 },
++	{ "2313",	AR5K_VERSION_MAC,	AR5K_SREV_AR2313_R8 },
++	{ "2315",	AR5K_VERSION_MAC,	AR5K_SREV_AR2315_R6 },
++	{ "2315",	AR5K_VERSION_MAC,	AR5K_SREV_AR2315_R7 },
++	{ "2317",	AR5K_VERSION_MAC,	AR5K_SREV_AR2317_R1 },
++	{ "2317",	AR5K_VERSION_MAC,	AR5K_SREV_AR2317_R2 },
++#else
+ 	{ "5210",	AR5K_VERSION_MAC,	AR5K_SREV_AR5210 },
+ 	{ "5311",	AR5K_VERSION_MAC,	AR5K_SREV_AR5311 },
+ 	{ "5311A",	AR5K_VERSION_MAC,	AR5K_SREV_AR5311A },
+@@ -117,6 +126,7 @@ static const struct ath5k_srev_name srev
+ 	{ "5418",	AR5K_VERSION_MAC,	AR5K_SREV_AR5418 },
+ 	{ "2425",	AR5K_VERSION_MAC,	AR5K_SREV_AR2425 },
+ 	{ "2417",	AR5K_VERSION_MAC,	AR5K_SREV_AR2417 },
++#endif
+ 	{ "xxxxx",	AR5K_VERSION_MAC,	AR5K_SREV_UNKNOWN },
+ 	{ "5110",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5110 },
+ 	{ "5111",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5111 },
+@@ -132,6 +142,10 @@ static const struct ath5k_srev_name srev
+ 	{ "5413",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5413 },
+ 	{ "5424",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5424 },
+ 	{ "5133",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_5133 },
++#ifdef CONFIG_ATHEROS_AR231X
++	{ "2316",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2316 },
++	{ "2317",	AR5K_VERSION_RAD,	AR5K_SREV_RAD_2317 },
++#endif
+ 	{ "xxxxx",	AR5K_VERSION_RAD,	AR5K_SREV_UNKNOWN },
+ };
+ 
+--- a/drivers/net/wireless/ath/ath5k/led.c
++++ b/drivers/net/wireless/ath/ath5k/led.c
+@@ -163,14 +163,20 @@ int ath5k_init_leds(struct ath5k_hw *ah)
+ {
+ 	int ret = 0;
+ 	struct ieee80211_hw *hw = ah->hw;
++#ifndef CONFIG_ATHEROS_AR231X
+ 	struct pci_dev *pdev = ah->pdev;
++#endif
+ 	char name[ATH5K_LED_MAX_NAME_LEN + 1];
+ 	const struct pci_device_id *match;
+ 
+ 	if (!ah->pdev)
+ 		return 0;
+ 
++#ifdef CONFIG_ATHEROS_AR231X
++	match = NULL;
++#else
+ 	match = pci_match_id(&ath5k_led_devices[0], pdev);
++#endif
+ 	if (match) {
+ 		__set_bit(ATH_STAT_LEDSOFT, ah->status);
+ 		ah->led_pin = ATH_PIN(match->driver_data);
diff --git a/trunk/package/kernel/mac80211/patches/301-ath5k-fix-AHB-kconfig-dependency.patch b/trunk/package/kernel/mac80211/patches/301-ath5k-fix-AHB-kconfig-dependency.patch
new file mode 100644
index 00000000..5db28be1
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/301-ath5k-fix-AHB-kconfig-dependency.patch
@@ -0,0 +1,37 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 27 Sep 2014 15:58:51 +0200
+Subject: [PATCH] ath5k: fix AHB kconfig dependency
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath5k/Kconfig
++++ b/drivers/net/wireless/ath/ath5k/Kconfig
+@@ -7,8 +7,8 @@ config ATH5K
+ 	select BACKPORT_LEDS_CLASS
+ 	select BACKPORT_NEW_LEDS
+ 	select BACKPORT_AVERAGE
+-	select ATH5K_AHB if (ATHEROS_AR231X && !PCI)
+-	select ATH5K_PCI if (!ATHEROS_AR231X && PCI)
++	select ATH5K_AHB if ATHEROS_AR231X
++	select ATH5K_PCI if !ATHEROS_AR231X
+ 	---help---
+ 	  This module adds support for wireless adapters based on
+ 	  Atheros 5xxx chipset.
+@@ -55,14 +55,14 @@ config ATH5K_TRACER
+ 
+ config ATH5K_AHB
+ 	bool "Atheros 5xxx AHB bus support"
+-	depends on (ATHEROS_AR231X && !PCI)
++	depends on ATHEROS_AR231X
+ 	---help---
+ 	  This adds support for WiSoC type chipsets of the 5xxx Atheros
+ 	  family.
+ 
+ config ATH5K_PCI
+ 	bool "Atheros 5xxx PCI bus support"
+-	depends on (!ATHEROS_AR231X && PCI)
++	depends on !ATHEROS_AR231X
+ 	---help---
+ 	  This adds support for PCI type chipsets of the 5xxx Atheros
+ 	  family.
diff --git a/trunk/package/kernel/mac80211/patches/302-ath9k-add-support-for-reporting-tx-power-to-mac80211.patch b/trunk/package/kernel/mac80211/patches/302-ath9k-add-support-for-reporting-tx-power-to-mac80211.patch
new file mode 100644
index 00000000..8bb41bd3
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/302-ath9k-add-support-for-reporting-tx-power-to-mac80211.patch
@@ -0,0 +1,118 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Wed, 22 Oct 2014 18:18:04 +0200
+Subject: [PATCH] ath9k: add support for reporting tx power to mac80211
+
+Track it per channel context instead of in the softc
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -347,6 +347,7 @@ struct ath_chanctx {
+ 
+ 	int flush_timeout;
+ 	u16 txpower;
++	u16 cur_txpower;
+ 	bool offchannel;
+ 	bool stopped;
+ 	bool active;
+@@ -987,7 +988,6 @@ struct ath_softc {
+ 	u8 gtt_cnt;
+ 	u32 intrstatus;
+ 	u16 ps_flags; /* PS_* */
+-	u16 curtxpow;
+ 	bool ps_enabled;
+ 	bool ps_idle;
+ 	short nbcnvifs;
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -172,17 +172,20 @@ static void ath9k_reg_notifier(struct wi
+ 	ath_reg_notifier_apply(wiphy, request, reg);
+ 
+ 	/* Set tx power */
+-	if (ah->curchan) {
+-		sc->cur_chan->txpower = 2 * ah->curchan->chan->max_power;
+-		ath9k_ps_wakeup(sc);
+-		ath9k_hw_set_txpowerlimit(ah, sc->cur_chan->txpower, false);
+-		sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
+-		/* synchronize DFS detector if regulatory domain changed */
+-		if (sc->dfs_detector != NULL)
+-			sc->dfs_detector->set_dfs_domain(sc->dfs_detector,
+-							 request->dfs_region);
+-		ath9k_ps_restore(sc);
+-	}
++	if (!ah->curchan)
++		return;
++
++	sc->cur_chan->txpower = 2 * ah->curchan->chan->max_power;
++	ath9k_ps_wakeup(sc);
++	ath9k_hw_set_txpowerlimit(ah, sc->cur_chan->txpower, false);
++	ath9k_cmn_update_txpow(ah, sc->cur_chan->cur_txpower,
++			       sc->cur_chan->txpower,
++			       &sc->cur_chan->cur_txpower);
++	/* synchronize DFS detector if regulatory domain changed */
++	if (sc->dfs_detector != NULL)
++		sc->dfs_detector->set_dfs_domain(sc->dfs_detector,
++						 request->dfs_region);
++	ath9k_ps_restore(sc);
+ }
+ 
+ /*
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -233,8 +233,9 @@ static bool ath_complete_reset(struct at
+ 
+ 	ath9k_calculate_summary_state(sc, sc->cur_chan);
+ 	ath_startrecv(sc);
+-	ath9k_cmn_update_txpow(ah, sc->curtxpow,
+-			       sc->cur_chan->txpower, &sc->curtxpow);
++	ath9k_cmn_update_txpow(ah, sc->cur_chan->cur_txpower,
++			       sc->cur_chan->txpower,
++			       &sc->cur_chan->cur_txpower);
+ 	clear_bit(ATH_OP_HW_RESET, &common->op_flags);
+ 
+ 	if (!sc->cur_chan->offchannel && start) {
+@@ -1471,8 +1472,9 @@ static int ath9k_config(struct ieee80211
+ 	if (changed & IEEE80211_CONF_CHANGE_POWER) {
+ 		ath_dbg(common, CONFIG, "Set power: %d\n", conf->power_level);
+ 		sc->cur_chan->txpower = 2 * conf->power_level;
+-		ath9k_cmn_update_txpow(ah, sc->curtxpow,
+-				       sc->cur_chan->txpower, &sc->curtxpow);
++		ath9k_cmn_update_txpow(ah, sc->cur_chan->cur_txpower,
++				       sc->cur_chan->txpower,
++				       &sc->cur_chan->cur_txpower);
+ 	}
+ 
+ 	mutex_unlock(&sc->mutex);
+@@ -2594,6 +2596,24 @@ void ath9k_fill_chanctx_ops(void)
+ 
+ #endif
+ 
++static int ath9k_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
++			     int *dbm)
++{
++	struct ath_softc *sc = hw->priv;
++	struct ath_vif *avp = (void *)vif->drv_priv;
++
++	mutex_lock(&sc->mutex);
++	if (avp->chanctx)
++		*dbm = avp->chanctx->cur_txpower;
++	else
++		*dbm = sc->cur_chan->cur_txpower;
++	mutex_unlock(&sc->mutex);
++
++	*dbm /= 2;
++
++	return 0;
++}
++
+ struct ieee80211_ops ath9k_ops = {
+ 	.tx 		    = ath9k_tx,
+ 	.start 		    = ath9k_start,
+@@ -2640,4 +2660,5 @@ struct ieee80211_ops ath9k_ops = {
+ #endif
+ 	.sw_scan_start	    = ath9k_sw_scan_start,
+ 	.sw_scan_complete   = ath9k_sw_scan_complete,
++	.get_txpower        = ath9k_get_txpower,
+ };
diff --git a/trunk/package/kernel/mac80211/patches/304-ath9k-Fix-RTC_DERIVED_CLK-usage.patch b/trunk/package/kernel/mac80211/patches/304-ath9k-Fix-RTC_DERIVED_CLK-usage.patch
new file mode 100644
index 00000000..a9205c05
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/304-ath9k-Fix-RTC_DERIVED_CLK-usage.patch
@@ -0,0 +1,61 @@
+From: Miaoqing Pan <miaoqing@qca.qualcomm.com>
+Date: Thu, 6 Nov 2014 10:52:23 +0530
+Subject: [PATCH] ath9k: Fix RTC_DERIVED_CLK usage
+
+Based on the reference clock, which could be 25MHz or 40MHz,
+AR_RTC_DERIVED_CLK is programmed differently for AR9340 and AR9550.
+But, when a chip reset is done, processing the initvals
+sets the register back to the default value.
+
+Fix this by moving the code in ath9k_hw_init_pll() to
+ar9003_hw_override_ini(). Also, do this override for AR9531.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Miaoqing Pan <miaoqing@qca.qualcomm.com>
+Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -664,6 +664,19 @@ static void ar9003_hw_override_ini(struc
+ 		ah->enabled_cals |= TX_CL_CAL;
+ 	else
+ 		ah->enabled_cals &= ~TX_CL_CAL;
++
++	if (AR_SREV_9340(ah) || AR_SREV_9531(ah) || AR_SREV_9550(ah)) {
++		if (ah->is_clk_25mhz) {
++			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x17c << 1);
++			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f3d7);
++			REG_WRITE(ah, AR_SLP32_INC, 0x0001e7ae);
++		} else {
++			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x261 << 1);
++			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f400);
++			REG_WRITE(ah, AR_SLP32_INC, 0x0001e800);
++		}
++		udelay(100);
++	}
+ }
+ 
+ static void ar9003_hw_prog_ini(struct ath_hw *ah,
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -870,19 +870,6 @@ static void ath9k_hw_init_pll(struct ath
+ 	udelay(RTC_PLL_SETTLE_DELAY);
+ 
+ 	REG_WRITE(ah, AR_RTC_SLEEP_CLK, AR_RTC_FORCE_DERIVED_CLK);
+-
+-	if (AR_SREV_9340(ah) || AR_SREV_9550(ah)) {
+-		if (ah->is_clk_25mhz) {
+-			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x17c << 1);
+-			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f3d7);
+-			REG_WRITE(ah,  AR_SLP32_INC, 0x0001e7ae);
+-		} else {
+-			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x261 << 1);
+-			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f400);
+-			REG_WRITE(ah,  AR_SLP32_INC, 0x0001e800);
+-		}
+-		udelay(100);
+-	}
+ }
+ 
+ static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,
diff --git a/trunk/package/kernel/mac80211/patches/306-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch b/trunk/package/kernel/mac80211/patches/306-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch
new file mode 100644
index 00000000..30b3dcff
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/306-ath9k-fix-misc-debugfs-when-not-using-chan-context.patch
@@ -0,0 +1,33 @@
+From: Ben Greear <greearb@candelatech.com>
+Date: Tue, 4 Nov 2014 15:22:49 -0800
+Subject: [PATCH] ath9k: fix misc debugfs when not using chan context
+
+When channel-context is not enabled, all vifs belong to
+the first context, but it is not configured as 'assigned'.
+
+Fix misc debugfs file to print out info for non-assigned
+contexts, and also print whether ctx is assigned or not.
+
+Signed-off-by: Ben Greear <greearb@candelatech.com>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -828,13 +828,14 @@ static ssize_t read_file_misc(struct fil
+ 
+ 	i = 0;
+ 	ath_for_each_chanctx(sc, ctx) {
+-		if (!ctx->assigned || list_empty(&ctx->vifs))
++		if (list_empty(&ctx->vifs))
+ 			continue;
+ 		ath9k_calculate_iter_data(sc, ctx, &iter_data);
+ 
+ 		len += scnprintf(buf + len, sizeof(buf) - len,
+-			"VIF-COUNTS: CTX %i AP: %i STA: %i MESH: %i WDS: %i",
+-			i++, iter_data.naps, iter_data.nstations,
++			"VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i",
++			i++, (int)(ctx->assigned), iter_data.naps,
++			iter_data.nstations,
+ 			iter_data.nmeshes, iter_data.nwds);
+ 		len += scnprintf(buf + len, sizeof(buf) - len,
+ 			" ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",
diff --git a/trunk/package/kernel/mac80211/patches/307-ath9k-fix-regression-in-bssidmask-calculation.patch b/trunk/package/kernel/mac80211/patches/307-ath9k-fix-regression-in-bssidmask-calculation.patch
new file mode 100644
index 00000000..d5963925
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/307-ath9k-fix-regression-in-bssidmask-calculation.patch
@@ -0,0 +1,70 @@
+From: Ben Greear <greearb@candelatech.com>
+Date: Tue, 4 Nov 2014 15:22:50 -0800
+Subject: [PATCH] ath9k: fix regression in bssidmask calculation
+
+The commit that went into 3.17:
+
+    ath9k: Summarize hw state per channel context
+
+    Group and set hw state (opmode, primary_sta, beacon conf) per
+    channel context instead of whole list of vifs. This would allow
+    each channel context to run in different mode (STA/AP).
+
+    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+    Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
+    Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+broke multi-vif configuration due to not properly calculating
+the bssid mask.
+
+The test case that caught this was:
+
+ create wlan0 and sta0-4 (6 total), not sure how much that matters.
+ associate all 6 (works fine)
+ disconnect 5 of them, leaving sta0 up
+ Start trying to bring up the other 5 one at a time.  It will
+ fail, with iw events looking like this (in these logs, several
+ sta are trying to come up, but symptom is the same with just one)
+
+The patch causing the regression made quite a few changes, but
+the part I think caused this particular problem was not
+recalculating the bssid mask when adding and removing interfaces.
+
+Re-adding those calls fixes my test case.  Fix bad comment
+as well.
+
+Signed-off-by: Ben Greear <greearb@candelatech.com>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -994,9 +994,8 @@ void ath9k_calculate_iter_data(struct at
+ 	struct ath_vif *avp;
+ 
+ 	/*
+-	 * Pick the MAC address of the first interface as the new hardware
+-	 * MAC address. The hardware will use it together with the BSSID mask
+-	 * when matching addresses.
++	 * The hardware will use primary station addr together with the
++	 * BSSID mask when matching addresses.
+ 	 */
+ 	memset(iter_data, 0, sizeof(*iter_data));
+ 	memset(&iter_data->mask, 0xff, ETH_ALEN);
+@@ -1225,6 +1224,8 @@ static int ath9k_add_interface(struct ie
+ 		list_add_tail(&avp->list, &avp->chanctx->vifs);
+ 	}
+ 
++	ath9k_calculate_summary_state(sc, avp->chanctx);
++
+ 	ath9k_assign_hw_queues(hw, vif);
+ 
+ 	an->sc = sc;
+@@ -1294,6 +1295,8 @@ static void ath9k_remove_interface(struc
+ 
+ 	ath_tx_node_cleanup(sc, &avp->mcast_node);
+ 
++	ath9k_calculate_summary_state(sc, avp->chanctx);
++
+ 	mutex_unlock(&sc->mutex);
+ }
+ 
diff --git a/trunk/package/kernel/mac80211/patches/309-ath9k-prevent-early-IRQs-from-accessing-hardware.patch b/trunk/package/kernel/mac80211/patches/309-ath9k-prevent-early-IRQs-from-accessing-hardware.patch
new file mode 100644
index 00000000..6af94c8e
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/309-ath9k-prevent-early-IRQs-from-accessing-hardware.patch
@@ -0,0 +1,38 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Thu, 13 Nov 2014 18:27:47 +0100
+Subject: [PATCH] ath9k: prevent early IRQs from accessing hardware
+
+IRQs are suppressed if ah == NULL and ATH_OP_INVALID being set in
+common->op_flags. Close a short time window between those two.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -513,10 +513,14 @@ static int ath9k_init_softc(u16 devid, s
+ 	ah->reg_ops.read = ath9k_ioread32;
+ 	ah->reg_ops.write = ath9k_iowrite32;
+ 	ah->reg_ops.rmw = ath9k_reg_rmw;
+-	sc->sc_ah = ah;
+ 	pCap = &ah->caps;
+ 
+ 	common = ath9k_hw_common(ah);
++
++	/* Will be cleared in ath9k_start() */
++	set_bit(ATH_OP_INVALID, &common->op_flags);
++
++	sc->sc_ah = ah;
+ 	sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
+ 	sc->tx99_power = MAX_RATE_POWER + 1;
+ 	init_waitqueue_head(&sc->tx_wait);
+@@ -876,9 +880,6 @@ int ath9k_init_device(u16 devid, struct 
+ 	common = ath9k_hw_common(ah);
+ 	ath9k_set_hw_capab(sc, hw);
+ 
+-	/* Will be cleared in ath9k_start() */
+-	set_bit(ATH_OP_INVALID, &common->op_flags);
+-
+ 	/* Initialize regulatory */
+ 	error = ath_regd_init(&common->regulatory, sc->hw->wiphy,
+ 			      ath9k_reg_notifier);
diff --git a/trunk/package/kernel/mac80211/patches/310-ath9k-set-ATH_OP_INVALID-before-disabling-hardware.patch b/trunk/package/kernel/mac80211/patches/310-ath9k-set-ATH_OP_INVALID-before-disabling-hardware.patch
new file mode 100644
index 00000000..c382e5d1
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/310-ath9k-set-ATH_OP_INVALID-before-disabling-hardware.patch
@@ -0,0 +1,29 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Thu, 13 Nov 2014 18:29:00 +0100
+Subject: [PATCH] ath9k: set ATH_OP_INVALID before disabling hardware
+
+Closes another small IRQ handler race
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -885,6 +885,9 @@ static void ath9k_stop(struct ieee80211_
+ 						    &sc->cur_chan->chandef);
+ 
+ 	ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
++
++	set_bit(ATH_OP_INVALID, &common->op_flags);
++
+ 	ath9k_hw_phy_disable(ah);
+ 
+ 	ath9k_hw_configpcipowersave(ah, true);
+@@ -893,7 +896,6 @@ static void ath9k_stop(struct ieee80211_
+ 
+ 	ath9k_ps_restore(sc);
+ 
+-	set_bit(ATH_OP_INVALID, &common->op_flags);
+ 	sc->ps_idle = prev_idle;
+ 
+ 	mutex_unlock(&sc->mutex);
diff --git a/trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch b/trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch
new file mode 100644
index 00000000..2994632b
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/311-ath9k-do-not-access-hardware-on-IRQs-during-reset.patch
@@ -0,0 +1,61 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Thu, 13 Nov 2014 18:29:26 +0100
+Subject: [PATCH] ath9k: do not access hardware on IRQs during reset
+
+Instead of killing interrupts during reset when the first one happens,
+kill them before issuing the reset.
+This fixes an easy to reproduce crash with multiple cards sharing the
+same IRQ.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -512,16 +512,13 @@ irqreturn_t ath_isr(int irq, void *dev)
+ 	if (!ah || test_bit(ATH_OP_INVALID, &common->op_flags))
+ 		return IRQ_NONE;
+ 
+-	/* shared irq, not for us */
++	if (!AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
++		return IRQ_NONE;
+ 
++	/* shared irq, not for us */
+ 	if (!ath9k_hw_intrpend(ah))
+ 		return IRQ_NONE;
+ 
+-	if (test_bit(ATH_OP_HW_RESET, &common->op_flags)) {
+-		ath9k_hw_kill_interrupts(ah);
+-		return IRQ_HANDLED;
+-	}
+-
+ 	/*
+ 	 * Figure out the reason(s) for the interrupt.  Note
+ 	 * that the hal returns a pseudo-ISR that may include
+@@ -532,6 +529,9 @@ irqreturn_t ath_isr(int irq, void *dev)
+ 	ath9k_debug_sync_cause(sc, sync_cause);
+ 	status &= ah->imask;	/* discard unasked-for bits */
+ 
++	if (AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
++		return IRQ_HANDLED;
++
+ 	/*
+ 	 * If there are no status bits set, then this interrupt was not
+ 	 * for me (should have been caught above).
+@@ -613,6 +613,7 @@ int ath_reset(struct ath_softc *sc, stru
+ 	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ 	int r;
+ 
++	ath9k_hw_kill_interrupts(sc->sc_ah);
+ 	set_bit(ATH_OP_HW_RESET, &common->op_flags);
+ 
+ 	ath9k_ps_wakeup(sc);
+@@ -633,6 +634,7 @@ void ath9k_queue_reset(struct ath_softc 
+ #ifdef CPTCFG_ATH9K_DEBUGFS
+ 	RESET_STAT_INC(sc, type);
+ #endif
++	ath9k_hw_kill_interrupts(sc->sc_ah);
+ 	set_bit(ATH_OP_HW_RESET, &common->op_flags);
+ 	ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+ }
diff --git a/trunk/package/kernel/mac80211/patches/312-mac80211-skip-legacy-rate-mask-handling-for-VHT-rate.patch b/trunk/package/kernel/mac80211/patches/312-mac80211-skip-legacy-rate-mask-handling-for-VHT-rate.patch
new file mode 100644
index 00000000..23957afc
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/312-mac80211-skip-legacy-rate-mask-handling-for-VHT-rate.patch
@@ -0,0 +1,22 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 15 Nov 2014 03:45:56 +0100
+Subject: [PATCH] mac80211: skip legacy rate mask handling for VHT rates
+
+The rate mask code currently assumes that a rate is legacy if
+IEEE80211_TX_RC_MCS is not set. This might be the cause of bogus VHT
+rates being reported with minstrel_ht.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/rate.c
++++ b/net/mac80211/rate.c
+@@ -385,7 +385,7 @@ static void rate_idx_match_mask(struct i
+ 			*rate = alt_rate;
+ 			return;
+ 		}
+-	} else {
++	} else if (!(rate->flags & IEEE80211_TX_RC_VHT_MCS)) {
+ 		/* handle legacy rates */
+ 		if (rate_idx_match_legacy_mask(rate, sband->n_bitrates, mask))
+ 			return;
diff --git a/trunk/package/kernel/mac80211/patches/313-mac80211-minstrel_ht-add-a-small-optimization-to-min.patch b/trunk/package/kernel/mac80211/patches/313-mac80211-minstrel_ht-add-a-small-optimization-to-min.patch
new file mode 100644
index 00000000..ba2ce1eb
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/313-mac80211-minstrel_ht-add-a-small-optimization-to-min.patch
@@ -0,0 +1,33 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 15 Nov 2014 22:13:38 +0100
+Subject: [PATCH] mac80211: minstrel_ht: add a small optimization to
+ minstrel_aggr_check
+
+Check the queue mapping earlier, skb->queue_mapping is more likely than
+skb->data to still be in d-cache.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -690,6 +690,9 @@ minstrel_aggr_check(struct ieee80211_sta
+ 	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
+ 	u16 tid;
+ 
++	if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
++		return;
++
+ 	if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
+ 		return;
+ 
+@@ -700,9 +703,6 @@ minstrel_aggr_check(struct ieee80211_sta
+ 	if (likely(sta->ampdu_mlme.tid_tx[tid]))
+ 		return;
+ 
+-	if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
+-		return;
+-
+ 	ieee80211_start_tx_ba_session(pubsta, tid, 5000);
+ }
+ 
diff --git a/trunk/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch b/trunk/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch
new file mode 100644
index 00000000..38e867ff
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch
@@ -0,0 +1,33 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 15 Nov 2014 22:16:36 +0100
+Subject: [PATCH] mac80211: minstrel_ht: move aggregation check to
+ .get_rate()
+
+Preparation for adding a no-skb tx status path
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -782,9 +782,6 @@ minstrel_ht_tx_status(void *priv, struct
+ 	if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
+ 		update = true;
+ 		minstrel_ht_update_stats(mp, mi);
+-		if (!(info->flags & IEEE80211_TX_CTL_AMPDU) &&
+-		    mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP)
+-			minstrel_aggr_check(sta, skb);
+ 	}
+ 
+ 	if (update)
+@@ -1026,6 +1023,10 @@ minstrel_ht_get_rate(void *priv, struct 
+ 	if (!msp->is_ht)
+ 		return mac80211_minstrel.get_rate(priv, sta, &msp->legacy, txrc);
+ 
++	if (!(info->flags & IEEE80211_TX_CTL_AMPDU) &&
++		mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP)
++		minstrel_aggr_check(sta, txrc->skb);
++
+ 	info->flags |= mi->tx_flags;
+ 	minstrel_ht_check_cck_shortpreamble(mp, mi, txrc->short_preamble);
+ 
diff --git a/trunk/package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch b/trunk/package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch
new file mode 100644
index 00000000..8a939709
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch
@@ -0,0 +1,43 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 15 Nov 2014 22:23:44 +0100
+Subject: [PATCH] mac80211: add tx_status_noskb to rate_control_ops
+
+This op works like .tx_status, except it does not need access to the
+skb. This will be used by drivers that cannot match tx status
+information to specific packets.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -4727,6 +4727,10 @@ struct rate_control_ops {
+ 	void (*free_sta)(void *priv, struct ieee80211_sta *sta,
+ 			 void *priv_sta);
+ 
++	void (*tx_status_noskb)(void *priv,
++				struct ieee80211_supported_band *sband,
++				struct ieee80211_sta *sta, void *priv_sta,
++				struct ieee80211_tx_info *info);
+ 	void (*tx_status)(void *priv, struct ieee80211_supported_band *sband,
+ 			  struct ieee80211_sta *sta, void *priv_sta,
+ 			  struct sk_buff *skb);
+--- a/net/mac80211/rate.h
++++ b/net/mac80211/rate.h
+@@ -37,11 +37,15 @@ static inline void rate_control_tx_statu
+ 	struct rate_control_ref *ref = local->rate_ctrl;
+ 	struct ieee80211_sta *ista = &sta->sta;
+ 	void *priv_sta = sta->rate_ctrl_priv;
++	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ 
+ 	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
+ 		return;
+ 
+-	ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
++	if (ref->ops->tx_status)
++		ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
++	else
++		ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);
+ }
+ 
+ 
diff --git a/trunk/package/kernel/mac80211/patches/316-mac80211-minstrel-switch-to-.tx_status_noskb.patch b/trunk/package/kernel/mac80211/patches/316-mac80211-minstrel-switch-to-.tx_status_noskb.patch
new file mode 100644
index 00000000..b32e4109
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/316-mac80211-minstrel-switch-to-.tx_status_noskb.patch
@@ -0,0 +1,31 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 15 Nov 2014 22:38:07 +0100
+Subject: [PATCH] mac80211: minstrel: switch to .tx_status_noskb
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/rc80211_minstrel.c
++++ b/net/mac80211/rc80211_minstrel.c
+@@ -223,11 +223,10 @@ minstrel_update_stats(struct minstrel_pr
+ static void
+ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,
+ 		   struct ieee80211_sta *sta, void *priv_sta,
+-		   struct sk_buff *skb)
++		   struct ieee80211_tx_info *info)
+ {
+ 	struct minstrel_priv *mp = priv;
+ 	struct minstrel_sta_info *mi = priv_sta;
+-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ 	struct ieee80211_tx_rate *ar = info->status.rates;
+ 	int i, ndx;
+ 	int success;
+@@ -674,7 +673,7 @@ static u32 minstrel_get_expected_through
+ 
+ const struct rate_control_ops mac80211_minstrel = {
+ 	.name = "minstrel",
+-	.tx_status = minstrel_tx_status,
++	.tx_status_noskb = minstrel_tx_status,
+ 	.get_rate = minstrel_get_rate,
+ 	.rate_init = minstrel_rate_init,
+ 	.alloc = minstrel_alloc,
diff --git a/trunk/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-switch-to-.tx_status_noskb.patch b/trunk/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-switch-to-.tx_status_noskb.patch
new file mode 100644
index 00000000..6900005d
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-switch-to-.tx_status_noskb.patch
@@ -0,0 +1,41 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 15 Nov 2014 22:38:21 +0100
+Subject: [PATCH] mac80211: minstrel_ht: switch to .tx_status_noskb
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -709,11 +709,10 @@ minstrel_aggr_check(struct ieee80211_sta
+ static void
+ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
+                       struct ieee80211_sta *sta, void *priv_sta,
+-                      struct sk_buff *skb)
++                      struct ieee80211_tx_info *info)
+ {
+ 	struct minstrel_ht_sta_priv *msp = priv_sta;
+ 	struct minstrel_ht_sta *mi = &msp->ht;
+-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ 	struct ieee80211_tx_rate *ar = info->status.rates;
+ 	struct minstrel_rate_stats *rate, *rate2;
+ 	struct minstrel_priv *mp = priv;
+@@ -721,7 +720,8 @@ minstrel_ht_tx_status(void *priv, struct
+ 	int i;
+ 
+ 	if (!msp->is_ht)
+-		return mac80211_minstrel.tx_status(priv, sband, sta, &msp->legacy, skb);
++		return mac80211_minstrel.tx_status_noskb(priv, sband, sta,
++							 &msp->legacy, info);
+ 
+ 	/* This packet was aggregated but doesn't carry status info */
+ 	if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
+@@ -1343,7 +1343,7 @@ static u32 minstrel_ht_get_expected_thro
+ 
+ static const struct rate_control_ops mac80211_minstrel_ht = {
+ 	.name = "minstrel_ht",
+-	.tx_status = minstrel_ht_tx_status,
++	.tx_status_noskb = minstrel_ht_tx_status,
+ 	.get_rate = minstrel_ht_get_rate,
+ 	.rate_init = minstrel_ht_rate_init,
+ 	.rate_update = minstrel_ht_rate_update,
diff --git a/trunk/package/kernel/mac80211/patches/318-mac80211-add-ieee80211_tx_status_noskb.patch b/trunk/package/kernel/mac80211/patches/318-mac80211-add-ieee80211_tx_status_noskb.patch
new file mode 100644
index 00000000..18d39055
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/318-mac80211-add-ieee80211_tx_status_noskb.patch
@@ -0,0 +1,219 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sat, 15 Nov 2014 23:50:27 +0100
+Subject: [PATCH] mac80211: add ieee80211_tx_status_noskb
+
+This can be used by drivers that cannot reliably map tx status
+information onto specific skbs.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -3517,6 +3517,28 @@ void ieee80211_tx_status(struct ieee8021
+ 			 struct sk_buff *skb);
+ 
+ /**
++ * ieee80211_tx_status_noskb - transmit status callback without skb
++ *
++ * This function can be used as a replacement for ieee80211_tx_status
++ * in drivers that cannot reliably map tx status information back to
++ * specific skbs.
++ *
++ * This function may not be called in IRQ context. Calls to this function
++ * for a single hardware must be synchronized against each other. Calls
++ * to this function, ieee80211_tx_status_ni() and ieee80211_tx_status_irqsafe()
++ * may not be mixed for a single hardware. Must not run concurrently with
++ * ieee80211_rx() or ieee80211_rx_ni().
++ *
++ * @hw: the hardware the frame was transmitted by
++ * @sta: the receiver station to which this packet is sent
++ *	(NULL for multicast packets)
++ * @info: tx status information
++ */
++void ieee80211_tx_status_noskb(struct ieee80211_hw *hw,
++			       struct ieee80211_sta *sta,
++			       struct ieee80211_tx_info *info);
++
++/**
+  * ieee80211_tx_status_ni - transmit status callback (in process context)
+  *
+  * Like ieee80211_tx_status() but can be called in process context.
+--- a/net/mac80211/rate.h
++++ b/net/mac80211/rate.h
+@@ -49,6 +49,23 @@ static inline void rate_control_tx_statu
+ }
+ 
+ 
++static inline void
++rate_control_tx_status_noskb(struct ieee80211_local *local,
++			     struct ieee80211_supported_band *sband,
++			     struct sta_info *sta,
++			     struct ieee80211_tx_info *info)
++{
++	struct rate_control_ref *ref = local->rate_ctrl;
++	struct ieee80211_sta *ista = &sta->sta;
++	void *priv_sta = sta->rate_ctrl_priv;
++
++	if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
++		return;
++
++	ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info);
++}
++
++
+ static inline void rate_control_rate_init(struct sta_info *sta)
+ {
+ 	struct ieee80211_local *local = sta->sdata->local;
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -541,10 +541,9 @@ static void ieee80211_tx_latency_end_msr
+ #define STA_LOST_TDLS_PKT_THRESHOLD	10
+ #define STA_LOST_TDLS_PKT_TIME		(10*HZ) /* 10secs since last ACK */
+ 
+-static void ieee80211_lost_packet(struct sta_info *sta, struct sk_buff *skb)
++static void ieee80211_lost_packet(struct sta_info *sta,
++				  struct ieee80211_tx_info *info)
+ {
+-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+-
+ 	/* This packet was aggregated but doesn't carry status info */
+ 	if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
+ 	    !(info->flags & IEEE80211_TX_STAT_AMPDU))
+@@ -571,24 +570,13 @@ static void ieee80211_lost_packet(struct
+ 	sta->lost_packets = 0;
+ }
+ 
+-void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
++static int ieee80211_tx_get_rates(struct ieee80211_hw *hw,
++				  struct ieee80211_tx_info *info,
++				  int *retry_count)
+ {
+-	struct sk_buff *skb2;
+-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+-	struct ieee80211_local *local = hw_to_local(hw);
+-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+-	__le16 fc;
+-	struct ieee80211_supported_band *sband;
+-	struct ieee80211_sub_if_data *sdata;
+-	struct net_device *prev_dev = NULL;
+-	struct sta_info *sta, *tmp;
+-	int retry_count = -1, i;
+ 	int rates_idx = -1;
+-	bool send_to_cooked;
+-	bool acked;
+-	struct ieee80211_bar *bar;
+-	int rtap_len;
+-	int shift = 0;
++	int count = -1;
++	int i;
+ 
+ 	for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+ 		if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
+@@ -606,12 +594,94 @@ void ieee80211_tx_status(struct ieee8021
+ 			break;
+ 		}
+ 
+-		retry_count += info->status.rates[i].count;
++		count += info->status.rates[i].count;
+ 	}
+ 	rates_idx = i - 1;
+ 
+-	if (retry_count < 0)
+-		retry_count = 0;
++	if (count < 0)
++		count = 0;
++
++	*retry_count = count;
++	return rates_idx;
++}
++
++void ieee80211_tx_status_noskb(struct ieee80211_hw *hw,
++			       struct ieee80211_sta *pubsta,
++			       struct ieee80211_tx_info *info)
++{
++	struct ieee80211_local *local = hw_to_local(hw);
++	struct ieee80211_supported_band *sband;
++	int retry_count;
++	int rates_idx;
++	bool acked;
++
++	rates_idx = ieee80211_tx_get_rates(hw, info, &retry_count);
++
++	sband = hw->wiphy->bands[info->band];
++
++	acked = !!(info->flags & IEEE80211_TX_STAT_ACK);
++	if (pubsta) {
++		struct sta_info *sta;
++
++		sta = container_of(pubsta, struct sta_info, sta);
++
++		if (info->flags & IEEE80211_TX_STATUS_EOSP)
++			clear_sta_flag(sta, WLAN_STA_SP);
++
++		if (!acked)
++			sta->tx_retry_failed++;
++		sta->tx_retry_count += retry_count;
++
++		if (acked) {
++			sta->last_rx = jiffies;
++
++			if (sta->lost_packets)
++				sta->lost_packets = 0;
++
++			/* Track when last TDLS packet was ACKed */
++			if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH))
++				sta->last_tdls_pkt_time = jiffies;
++		} else {
++			ieee80211_lost_packet(sta, info);
++		}
++
++		rate_control_tx_status_noskb(local, sband, sta, info);
++	}
++
++	if (acked) {
++		    local->dot11TransmittedFrameCount++;
++		    if (!pubsta)
++			    local->dot11MulticastTransmittedFrameCount++;
++		    if (retry_count > 0)
++			    local->dot11RetryCount++;
++		    if (retry_count > 1)
++			    local->dot11MultipleRetryCount++;
++	} else {
++		local->dot11FailedCount++;
++	}
++}
++EXPORT_SYMBOL(ieee80211_tx_status_noskb);
++
++void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
++{
++	struct sk_buff *skb2;
++	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
++	struct ieee80211_local *local = hw_to_local(hw);
++	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
++	__le16 fc;
++	struct ieee80211_supported_band *sband;
++	struct ieee80211_sub_if_data *sdata;
++	struct net_device *prev_dev = NULL;
++	struct sta_info *sta, *tmp;
++	int retry_count;
++	int rates_idx;
++	bool send_to_cooked;
++	bool acked;
++	struct ieee80211_bar *bar;
++	int rtap_len;
++	int shift = 0;
++
++	rates_idx = ieee80211_tx_get_rates(hw, info, &retry_count);
+ 
+ 	rcu_read_lock();
+ 
+@@ -716,7 +786,7 @@ void ieee80211_tx_status(struct ieee8021
+ 				if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH))
+ 					sta->last_tdls_pkt_time = jiffies;
+ 			} else {
+-				ieee80211_lost_packet(sta, skb);
++				ieee80211_lost_packet(sta, info);
+ 			}
+ 		}
+ 
diff --git a/trunk/package/kernel/mac80211/patches/319-mac80211-minstrel_ht-fix-a-crash-in-rate-sorting.patch b/trunk/package/kernel/mac80211/patches/319-mac80211-minstrel_ht-fix-a-crash-in-rate-sorting.patch
new file mode 100644
index 00000000..784a973e
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/319-mac80211-minstrel_ht-fix-a-crash-in-rate-sorting.patch
@@ -0,0 +1,47 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Tue, 18 Nov 2014 21:43:25 +0100
+Subject: [PATCH] mac80211: minstrel_ht: fix a crash in rate sorting
+
+The commit 5935839ad73583781b8bbe8d91412f6826e218a4
+"mac80211: improve minstrel_ht rate sorting by throughput & probability"
+
+introduced a crash on rate sorting that occurs when the rate added to
+the sorting array is faster than all the previous rates. Due to an
+off-by-one error, it reads the rate index from tp_list[-1], which
+contains uninitialized stack garbage, and then uses the resulting index
+for accessing the group rate stats, leading to a crash if the garbage
+value is big enough.
+
+Cc: Thomas Huehn <thomas@net.t-labs.tu-berlin.de>
+Reported-by: Jouni Malinen <j@w1.fi>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -394,19 +394,16 @@ minstrel_ht_sort_best_tp_rates(struct mi
+ 	cur_thr = mi->groups[cur_group].rates[cur_idx].cur_tp;
+ 	cur_prob = mi->groups[cur_group].rates[cur_idx].probability;
+ 
+-	tmp_group = tp_list[j - 1] / MCS_GROUP_RATES;
+-	tmp_idx = tp_list[j - 1] % MCS_GROUP_RATES;
+-	tmp_thr = mi->groups[tmp_group].rates[tmp_idx].cur_tp;
+-	tmp_prob = mi->groups[tmp_group].rates[tmp_idx].probability;
+-
+-	while (j > 0 && (cur_thr > tmp_thr ||
+-	      (cur_thr == tmp_thr && cur_prob > tmp_prob))) {
+-		j--;
++	do {
+ 		tmp_group = tp_list[j - 1] / MCS_GROUP_RATES;
+ 		tmp_idx = tp_list[j - 1] % MCS_GROUP_RATES;
+ 		tmp_thr = mi->groups[tmp_group].rates[tmp_idx].cur_tp;
+ 		tmp_prob = mi->groups[tmp_group].rates[tmp_idx].probability;
+-	}
++		if (cur_thr < tmp_thr ||
++		    (cur_thr == tmp_thr && cur_prob <= tmp_prob))
++			break;
++		j--;
++	} while (j > 0);
+ 
+ 	if (j < MAX_THR_RATES - 1) {
+ 		memmove(&tp_list[j + 1], &tp_list[j], (sizeof(*tp_list) *
diff --git a/trunk/package/kernel/mac80211/patches/320-mac80211-notify-drivers-on-sta-rate-table-changes.patch b/trunk/package/kernel/mac80211/patches/320-mac80211-notify-drivers-on-sta-rate-table-changes.patch
new file mode 100644
index 00000000..2ae07299
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/320-mac80211-notify-drivers-on-sta-rate-table-changes.patch
@@ -0,0 +1,92 @@
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Tue, 18 Nov 2014 23:26:40 +0100
+Subject: [PATCH] mac80211: notify drivers on sta rate table changes
+
+This allows drivers with a firmware or chip-based rate lookup table to
+use the most recent default rate selection without having to get it from
+per-packet data or explicit ieee80211_get_tx_rate calls
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -2631,6 +2631,9 @@ enum ieee80211_reconfig_type {
+  *	uses hardware rate control (%IEEE80211_HW_HAS_RATE_CONTROL) since
+  *	otherwise the rate control algorithm is notified directly.
+  *	Must be atomic.
++ * @sta_rate_tbl_update: Notifies the driver that the rate table changed. This
++ *	is only used if the configured rate control algorithm actually uses
++ *	the new rate table API, and is therefore optional. Must be atomic.
+  *
+  * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
+  *	bursting) for a hardware TX queue.
+@@ -2972,6 +2975,9 @@ struct ieee80211_ops {
+ 			      struct ieee80211_vif *vif,
+ 			      struct ieee80211_sta *sta,
+ 			      u32 changed);
++	void (*sta_rate_tbl_update)(struct ieee80211_hw *hw,
++				    struct ieee80211_vif *vif,
++				    struct ieee80211_sta *sta);
+ 	int (*conf_tx)(struct ieee80211_hw *hw,
+ 		       struct ieee80211_vif *vif, u16 ac,
+ 		       const struct ieee80211_tx_queue_params *params);
+--- a/net/mac80211/driver-ops.h
++++ b/net/mac80211/driver-ops.h
+@@ -621,6 +621,21 @@ static inline void drv_sta_rc_update(str
+ 	trace_drv_return_void(local);
+ }
+ 
++static inline void drv_sta_rate_tbl_update(struct ieee80211_local *local,
++					   struct ieee80211_sub_if_data *sdata,
++					   struct ieee80211_sta *sta)
++{
++	sdata = get_bss_sdata(sdata);
++	if (!check_sdata_in_driver(sdata))
++		return;
++
++	trace_drv_sta_rate_tbl_update(local, sdata, sta);
++	if (local->ops->sta_rate_tbl_update)
++		local->ops->sta_rate_tbl_update(&local->hw, &sdata->vif, sta);
++
++	trace_drv_return_void(local);
++}
++
+ static inline int drv_conf_tx(struct ieee80211_local *local,
+ 			      struct ieee80211_sub_if_data *sdata, u16 ac,
+ 			      const struct ieee80211_tx_queue_params *params)
+--- a/net/mac80211/rate.c
++++ b/net/mac80211/rate.c
+@@ -696,6 +696,7 @@ int rate_control_set_rates(struct ieee80
+ 			   struct ieee80211_sta *pubsta,
+ 			   struct ieee80211_sta_rates *rates)
+ {
++	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
+ 	struct ieee80211_sta_rates *old;
+ 
+ 	/*
+@@ -709,6 +710,8 @@ int rate_control_set_rates(struct ieee80
+ 	if (old)
+ 		kfree_rcu(old, rcu_head);
+ 
++	drv_sta_rate_tbl_update(hw_to_local(hw), sta->sdata, pubsta);
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(rate_control_set_rates);
+--- a/net/mac80211/trace.h
++++ b/net/mac80211/trace.h
+@@ -826,6 +826,13 @@ DEFINE_EVENT(sta_event, drv_sta_pre_rcu_
+ 	TP_ARGS(local, sdata, sta)
+ );
+ 
++DEFINE_EVENT(sta_event, drv_sta_rate_tbl_update,
++	TP_PROTO(struct ieee80211_local *local,
++		 struct ieee80211_sub_if_data *sdata,
++		 struct ieee80211_sta *sta),
++	TP_ARGS(local, sdata, sta)
++);
++
+ TRACE_EVENT(drv_conf_tx,
+ 	TP_PROTO(struct ieee80211_local *local,
+ 		 struct ieee80211_sub_if_data *sdata,
diff --git a/trunk/package/kernel/mac80211/patches/321-mac80211-add-an-intermediate-software-queue-implemen.patch b/trunk/package/kernel/mac80211/patches/321-mac80211-add-an-intermediate-software-queue-implemen.patch
new file mode 100644
index 00000000..ce5d4dcc
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/321-mac80211-add-an-intermediate-software-queue-implemen.patch
@@ -0,0 +1,498 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Tue, 18 Nov 2014 23:58:51 +0100
+Subject: [PATCH] mac80211: add an intermediate software queue implementation
+
+This allows drivers to request per-vif and per-sta-tid queues from which
+they can pull frames. This makes it easier to keep the hardware queues
+short, and to improve fairness between clients and vifs.
+
+The task of scheduling packet transmission is left up to the driver -
+queueing is controlled by mac80211. Drivers can only dequeue packets by
+calling ieee80211_tx_dequeue. This makes it possible to add active queue
+management later without changing drivers using this code.
+
+This can also be used as a starting point to implement A-MSDU
+aggregation in a way that does not add artificially induced latency.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -1192,6 +1192,8 @@ struct ieee80211_vif {
+ 	u8 cab_queue;
+ 	u8 hw_queue[IEEE80211_NUM_ACS];
+ 
++	struct ieee80211_txq *txq;
++
+ 	struct ieee80211_chanctx_conf __rcu *chanctx_conf;
+ 
+ 	u32 driver_flags;
+@@ -1448,6 +1450,8 @@ struct ieee80211_sta {
+ 	bool tdls;
+ 	bool tdls_initiator;
+ 
++	struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
++
+ 	/* must be last */
+ 	u8 drv_priv[0] __aligned(sizeof(void *));
+ };
+@@ -1476,6 +1480,27 @@ struct ieee80211_tx_control {
+ };
+ 
+ /**
++ * struct ieee80211_txq - Software intermediate tx queue
++ *
++ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
++ * @sta: station table entry, may be NULL for per-vif queue
++ * @tid: the TID for this queue (unset for per-vif queue)
++ * @ac: the AC for this queue
++ *
++ * The driver can obtain packets from this queue by calling
++ * ieee80211_tx_dequeue().
++ */
++struct ieee80211_txq {
++	struct ieee80211_vif *vif;
++	struct ieee80211_sta *sta;
++	u8 tid;
++	u8 ac;
++
++	/* must be last */
++	u8 drv_priv[0] __aligned(sizeof(void *));
++};
++
++/**
+  * enum ieee80211_hw_flags - hardware flags
+  *
+  * These flags are used to indicate hardware capabilities to
+@@ -1698,6 +1723,8 @@ enum ieee80211_hw_flags {
+  *	within &struct ieee80211_sta.
+  * @chanctx_data_size: size (in bytes) of the drv_priv data area
+  *	within &struct ieee80211_chanctx_conf.
++ * @txq_data_size: size (in bytes) of the drv_priv data area
++ *	within @struct ieee80211_txq.
+  *
+  * @max_rates: maximum number of alternate rate retry stages the hw
+  *	can handle.
+@@ -1746,6 +1773,9 @@ enum ieee80211_hw_flags {
+  * @n_cipher_schemes: a size of an array of cipher schemes definitions.
+  * @cipher_schemes: a pointer to an array of cipher scheme definitions
+  *	supported by HW.
++ *
++ * @txq_ac_max_pending: maximum number of frames per AC pending in all txq
++ *	entries for a vif.
+  */
+ struct ieee80211_hw {
+ 	struct ieee80211_conf conf;
+@@ -1758,6 +1788,7 @@ struct ieee80211_hw {
+ 	int vif_data_size;
+ 	int sta_data_size;
+ 	int chanctx_data_size;
++	int txq_data_size;
+ 	u16 queues;
+ 	u16 max_listen_interval;
+ 	s8 max_signal;
+@@ -1774,6 +1805,7 @@ struct ieee80211_hw {
+ 	u8 uapsd_max_sp_len;
+ 	u8 n_cipher_schemes;
+ 	const struct ieee80211_cipher_scheme *cipher_schemes;
++	int txq_ac_max_pending;
+ };
+ 
+ /**
+@@ -2881,6 +2913,8 @@ enum ieee80211_reconfig_type {
+  *
+  * @get_txpower: get current maximum tx power (in dBm) based on configuration
+  *	and hardware limits.
++ *
++ * @wake_tx_queue: Called when new packets have been added to the queue.
+  */
+ struct ieee80211_ops {
+ 	void (*tx)(struct ieee80211_hw *hw,
+@@ -3095,6 +3129,9 @@ struct ieee80211_ops {
+ 	u32 (*get_expected_throughput)(struct ieee80211_sta *sta);
+ 	int (*get_txpower)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ 			   int *dbm);
++
++	void (*wake_tx_queue)(struct ieee80211_hw *hw,
++			      struct ieee80211_txq *txq);
+ };
+ 
+ /**
+@@ -5038,4 +5075,17 @@ void ieee80211_tdls_oper_request(struct 
+  */
+ size_t ieee80211_ie_split(const u8 *ies, size_t ielen,
+ 			  const u8 *ids, int n_ids, size_t offset);
++
++/**
++ * ieee80211_tx_dequeue - dequeue a packet from a software tx queue
++ *
++ * @hw: pointer as obtained from ieee80211_alloc_hw()
++ * @txq: pointer obtained from .add_tx_queue() call
++ *
++ * Returns 0 if successful, -EAGAIN if no frame was available.
++ */
++int ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *txq,
++			 struct sk_buff **skb);
++
++
+ #endif /* MAC80211_H */
+--- a/net/mac80211/driver-ops.h
++++ b/net/mac80211/driver-ops.h
+@@ -1311,4 +1311,21 @@ static inline int drv_get_txpower(struct
+ 	return ret;
+ }
+ 
++static inline void drv_wake_tx_queue(struct ieee80211_local *local,
++				     struct txq_info *txq)
++{
++	struct ieee80211_sub_if_data *sdata = vif_to_sdata(txq->txq.vif);
++
++	if (!check_sdata_in_driver(sdata))
++		return;
++
++	if (txq->txq.sta)
++		trace_drv_wake_sta_tx_queue(local, sdata, txq->txq.sta,
++					    txq->txq.tid);
++	else
++		trace_drv_wake_vif_tx_queue(local, sdata);
++
++	local->ops->wake_tx_queue(&local->hw, &txq->txq);
++}
++
+ #endif /* __MAC80211_DRIVER_OPS */
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -793,6 +793,13 @@ struct mac80211_qos_map {
+ 	struct rcu_head rcu_head;
+ };
+ 
++struct txq_info {
++	struct sk_buff_head queue;
++
++	/* keep last! */
++	struct ieee80211_txq txq;
++};
++
+ struct ieee80211_sub_if_data {
+ 	struct list_head list;
+ 
+@@ -837,6 +844,8 @@ struct ieee80211_sub_if_data {
+ 	bool control_port_no_encrypt;
+ 	int encrypt_headroom;
+ 
++	struct txq_info *txq;
++	atomic_t txq_len[IEEE80211_NUM_ACS];
+ 	struct ieee80211_tx_queue_params tx_conf[IEEE80211_NUM_ACS];
+ 	struct mac80211_qos_map __rcu *qos_map;
+ 
+@@ -1868,6 +1877,11 @@ void ieee80211_add_pending_skbs(struct i
+ 				struct sk_buff_head *skbs);
+ void ieee80211_flush_queues(struct ieee80211_local *local,
+ 			    struct ieee80211_sub_if_data *sdata);
++void ieee80211_init_tx_queue(struct ieee80211_sub_if_data *sdata,
++			     struct sta_info *sta,
++			     struct txq_info *txq, int tid);
++void ieee80211_flush_tx_queue(struct ieee80211_local *local,
++			      struct ieee80211_txq *txq);
+ 
+ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
+ 			 u16 transaction, u16 auth_alg, u16 status,
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -967,6 +967,9 @@ static void ieee80211_do_stop(struct iee
+ 	}
+ 	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+ 
++	if (sdata->vif.txq)
++		ieee80211_flush_tx_queue(local, sdata->vif.txq);
++
+ 	if (local->open_count == 0)
+ 		ieee80211_clear_tx_pending(local);
+ 
+@@ -1773,6 +1776,13 @@ int ieee80211_if_add(struct ieee80211_lo
+ 	/* setup type-dependent data */
+ 	ieee80211_setup_sdata(sdata, type);
+ 
++	if (local->ops->wake_tx_queue) {
++		sdata->txq = kzalloc(sizeof(*sdata->txq) +
++				     local->hw.txq_data_size, GFP_KERNEL);
++		if (sdata->txq)
++			ieee80211_init_tx_queue(sdata, NULL, sdata->txq, 0);
++	}
++
+ 	if (ndev) {
+ 		if (params) {
+ 			ndev->ieee80211_ptr->use_4addr = params->use_4addr;
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -1004,6 +1004,9 @@ int ieee80211_register_hw(struct ieee802
+ 
+ 	local->dynamic_ps_forced_timeout = -1;
+ 
++	if (!local->hw.txq_ac_max_pending)
++		local->hw.txq_ac_max_pending = 64;
++
+ 	result = ieee80211_wep_init(local);
+ 	if (result < 0)
+ 		wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -119,6 +119,11 @@ static void __cleanup_single_sta(struct 
+ 		sta_info_recalc_tim(sta);
+ 	}
+ 
++	if (sta->txq) {
++		for (i = 0; i < IEEE80211_NUM_TIDS; i++)
++			ieee80211_flush_tx_queue(local, sta->sta.txq[i]);
++	}
++
+ 	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
+ 		local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]);
+ 		ieee80211_purge_tx_queue(&local->hw, &sta->ps_tx_buf[ac]);
+@@ -241,6 +246,8 @@ void sta_info_free(struct ieee80211_loca
+ 		kfree(sta->tx_lat);
+ 	}
+ 
++	kfree(sta->txq);
++
+ 	sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
+ 
+ 	kfree(rcu_dereference_raw(sta->sta.rates));
+@@ -294,12 +301,13 @@ struct sta_info *sta_info_alloc(struct i
+ 				const u8 *addr, gfp_t gfp)
+ {
+ 	struct ieee80211_local *local = sdata->local;
++	struct ieee80211_hw *hw = &local->hw;
+ 	struct sta_info *sta;
+ 	struct timespec uptime;
+ 	struct ieee80211_tx_latency_bin_ranges *tx_latency;
+ 	int i;
+ 
+-	sta = kzalloc(sizeof(*sta) + local->hw.sta_data_size, gfp);
++	sta = kzalloc(sizeof(*sta) + hw->sta_data_size, gfp);
+ 	if (!sta)
+ 		return NULL;
+ 
+@@ -357,6 +365,20 @@ struct sta_info *sta_info_alloc(struct i
+ 	for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)
+ 		ewma_init(&sta->chain_signal_avg[i], 1024, 8);
+ 
++	if (local->ops->wake_tx_queue) {
++		int size = sizeof(struct txq_info) +
++			   ALIGN(hw->txq_data_size, sizeof(void *));
++
++		sta->txq = kcalloc(IEEE80211_NUM_TIDS, size, gfp);
++		if (!sta->txq)
++			goto free;
++
++		for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
++			struct txq_info *txq = sta->txq + i * size;
++			ieee80211_init_tx_queue(sdata, sta, txq, i);
++		}
++	}
++
+ 	if (sta_prepare_rate_control(local, sta, gfp))
+ 		goto free;
+ 
+@@ -380,7 +402,7 @@ struct sta_info *sta_info_alloc(struct i
+ 	if (sdata->vif.type == NL80211_IFTYPE_AP ||
+ 	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+ 		struct ieee80211_supported_band *sband =
+-			local->hw.wiphy->bands[ieee80211_get_sdata_band(sdata)];
++			hw->wiphy->bands[ieee80211_get_sdata_band(sdata)];
+ 		u8 smps = (sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >>
+ 				IEEE80211_HT_CAP_SM_PS_SHIFT;
+ 		/*
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -371,6 +371,7 @@ struct sta_info {
+ 	struct sk_buff_head ps_tx_buf[IEEE80211_NUM_ACS];
+ 	struct sk_buff_head tx_filtered[IEEE80211_NUM_ACS];
+ 	unsigned long driver_buffered_tids;
++	void *txq;
+ 
+ 	/* Updated from RX path only, no locking requirements */
+ 	unsigned long rx_packets;
+--- a/net/mac80211/trace.h
++++ b/net/mac80211/trace.h
+@@ -2201,6 +2201,40 @@ TRACE_EVENT(drv_get_txpower,
+ 	)
+ );
+ 
++DEFINE_EVENT(local_sdata_evt, drv_wake_vif_tx_queue,
++	TP_PROTO(struct ieee80211_local *local,
++		 struct ieee80211_sub_if_data *sdata),
++	TP_ARGS(local, sdata)
++);
++
++TRACE_EVENT(drv_wake_sta_tx_queue,
++	TP_PROTO(struct ieee80211_local *local,
++		 struct ieee80211_sub_if_data *sdata,
++		 struct ieee80211_sta *sta,
++		 u8 tid),
++
++	TP_ARGS(local, sdata, sta, tid),
++
++	TP_STRUCT__entry(
++		LOCAL_ENTRY
++		VIF_ENTRY
++		STA_ENTRY
++		__field(u8, tid)
++	),
++
++	TP_fast_assign(
++		LOCAL_ASSIGN;
++		VIF_ASSIGN;
++		STA_ASSIGN;
++		__entry->tid = tid;
++	),
++
++	TP_printk(
++		LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " tid: 0x%x",
++		LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->tid
++	)
++);
++
+ 
+ #ifdef CPTCFG_MAC80211_MESSAGE_TRACING
+ #undef TRACE_SYSTEM
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1198,13 +1198,75 @@ ieee80211_tx_prepare(struct ieee80211_su
+ 	return TX_CONTINUE;
+ }
+ 
++static void ieee80211_drv_tx(struct ieee80211_local *local,
++			     struct ieee80211_vif *vif,
++			     struct ieee80211_sta *pubsta,
++			     struct sk_buff *skb)
++{
++	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
++	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
++	struct ieee80211_tx_control control = {
++		.sta = pubsta
++	};
++	struct ieee80211_txq *pubtxq = NULL;
++	struct txq_info *txq;
++	u8 ac;
++
++	if (ieee80211_is_mgmt(hdr->frame_control) ||
++	    ieee80211_is_ctl(hdr->frame_control))
++		goto tx_normal;
++
++	if (pubsta) {
++		u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
++		pubtxq = pubsta->txq[tid];
++	} else {
++		pubtxq = vif->txq;
++	}
++
++	if (!pubtxq)
++		goto tx_normal;
++
++	ac = pubtxq->ac;
++	txq = container_of(pubtxq, struct txq_info, txq);
++	atomic_inc(&sdata->txq_len[ac]);
++	if (atomic_read(&sdata->txq_len[ac]) >= local->hw.txq_ac_max_pending)
++		netif_stop_subqueue(sdata->dev, ac);
++
++	skb_queue_tail(&txq->queue, skb);
++	drv_wake_tx_queue(local, txq);
++
++	return;
++
++tx_normal:
++	drv_tx(local, &control, skb);
++}
++
++int ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *pubtxq,
++			 struct sk_buff **dest)
++{
++	struct ieee80211_local *local = hw_to_local(hw);
++	struct ieee80211_sub_if_data *sdata = vif_to_sdata(pubtxq->vif);
++	struct txq_info *txq = container_of(pubtxq, struct txq_info, txq);
++	u8 ac = pubtxq->ac;
++
++	*dest = skb_dequeue(&txq->queue);
++	if (!*dest)
++		return -EAGAIN;
++
++	atomic_dec(&sdata->txq_len[ac]);
++	if (__netif_subqueue_stopped(sdata->dev, ac))
++		ieee80211_propagate_queue_wake(local, sdata->vif.hw_queue[ac]);
++
++	return 0;
++}
++EXPORT_SYMBOL(ieee80211_tx_dequeue);
++
+ static bool ieee80211_tx_frags(struct ieee80211_local *local,
+ 			       struct ieee80211_vif *vif,
+ 			       struct ieee80211_sta *sta,
+ 			       struct sk_buff_head *skbs,
+ 			       bool txpending)
+ {
+-	struct ieee80211_tx_control control;
+ 	struct sk_buff *skb, *tmp;
+ 	unsigned long flags;
+ 
+@@ -1262,10 +1324,9 @@ static bool ieee80211_tx_frags(struct ie
+ 		spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+ 
+ 		info->control.vif = vif;
+-		control.sta = sta;
+ 
+ 		__skb_unlink(skb, skbs);
+-		drv_tx(local, &control, skb);
++		ieee80211_drv_tx(local, vif, sta, skb);
+ 	}
+ 
+ 	return true;
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -308,6 +308,11 @@ void ieee80211_propagate_queue_wake(stru
+ 		for (ac = 0; ac < n_acs; ac++) {
+ 			int ac_queue = sdata->vif.hw_queue[ac];
+ 
++			if (local->ops->wake_tx_queue &&
++			    (atomic_read(&sdata->txq_len[ac]) >
++			     local->hw.txq_ac_max_pending))
++				continue;
++
+ 			if (ac_queue == queue ||
+ 			    (sdata->vif.cab_queue == queue &&
+ 			     local->queue_stop_reasons[ac_queue] == 0 &&
+@@ -3182,3 +3187,33 @@ u8 *ieee80211_add_wmm_info_ie(u8 *buf, u
+ 
+ 	return buf;
+ }
++
++void ieee80211_init_tx_queue(struct ieee80211_sub_if_data *sdata,
++			     struct sta_info *sta,
++			     struct txq_info *txq, int tid)
++{
++	skb_queue_head_init(&txq->queue);
++	txq->txq.vif = &sdata->vif;
++
++	if (sta) {
++		txq->txq.sta = &sta->sta;
++		sta->sta.txq[tid] = &txq->txq;
++		txq->txq.ac = ieee802_1d_to_ac[tid & 7];
++	} else {
++		sdata->vif.txq = &txq->txq;
++		txq->txq.ac = IEEE80211_AC_BE;
++	}
++}
++
++void ieee80211_flush_tx_queue(struct ieee80211_local *local,
++			      struct ieee80211_txq *pubtxq)
++{
++	struct txq_info *txq = container_of(pubtxq, struct txq_info, txq);
++	struct ieee80211_sub_if_data *sdata = vif_to_sdata(pubtxq->vif);
++	struct sk_buff *skb;
++
++	while ((skb = skb_dequeue(&txq->queue)) != NULL) {
++		atomic_dec(&sdata->txq_len[pubtxq->ac]);
++		ieee80211_free_txskb(&local->hw, skb);
++	}
++}
diff --git a/trunk/package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch b/trunk/package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch
new file mode 100644
index 00000000..4d1465ca
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch
@@ -0,0 +1,34 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Fri, 21 Nov 2014 23:27:33 +0100
+Subject: [PATCH] mac80211: add more missing checks for VHT tx rates
+
+Fixes a crash on attempting to calculate the frame duration for a VHT
+packet (which needs to be handled by hw/driver instead).
+
+Reported-by: Jouni Malinen <j@w1.fi>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/rate.c
++++ b/net/mac80211/rate.c
+@@ -446,7 +446,8 @@ static void rate_fixup_ratelist(struct i
+ 	 *
+ 	 * XXX: Should this check all retry rates?
+ 	 */
+-	if (!(rates[0].flags & IEEE80211_TX_RC_MCS)) {
++	if (!(rates[0].flags &
++	      (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))) {
+ 		u32 basic_rates = vif->bss_conf.basic_rates;
+ 		s8 baserate = basic_rates ? ffs(basic_rates) - 1 : 0;
+ 
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -60,7 +60,7 @@ static __le16 ieee80211_duration(struct 
+ 	rcu_read_unlock();
+ 
+ 	/* assume HW handles this */
+-	if (tx->rate.flags & IEEE80211_TX_RC_MCS)
++	if (tx->rate.flags & (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))
+ 		return 0;
+ 
+ 	/* uh huh? */
diff --git a/trunk/package/kernel/mac80211/patches/323-mac80211-copy-chandef-from-AP-vif-to-VLANs.patch b/trunk/package/kernel/mac80211/patches/323-mac80211-copy-chandef-from-AP-vif-to-VLANs.patch
new file mode 100644
index 00000000..fca0c165
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/323-mac80211-copy-chandef-from-AP-vif-to-VLANs.patch
@@ -0,0 +1,82 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 24 Nov 2014 18:09:03 +0100
+Subject: [PATCH] mac80211: copy chandef from AP vif to VLANs
+
+Fixes a crash in nl80211_send_chandef, introduced in
+
+commit c12bc4885f4b3bab0ed779c69d5d7e3223fa5003
+"mac80211: return the vif's chandef in ieee80211_cfg_get_channel()"
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/chan.c
++++ b/net/mac80211/chan.c
+@@ -932,6 +932,21 @@ ieee80211_vif_chanctx_reservation_comple
+ 	}
+ }
+ 
++static void
++ieee80211_vif_update_chandef(struct ieee80211_sub_if_data *sdata,
++			     const struct cfg80211_chan_def *chandef)
++{
++	struct ieee80211_sub_if_data *vlan;
++
++	sdata->vif.bss_conf.chandef = *chandef;
++
++	if (sdata->vif.type != NL80211_IFTYPE_AP)
++		return;
++
++	list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
++		vlan->vif.bss_conf.chandef = *chandef;
++}
++
+ static int
+ ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata)
+ {
+@@ -994,7 +1009,7 @@ ieee80211_vif_use_reserved_reassign(stru
+ 	if (sdata->vif.bss_conf.chandef.width != sdata->reserved_chandef.width)
+ 		changed = BSS_CHANGED_BANDWIDTH;
+ 
+-	sdata->vif.bss_conf.chandef = sdata->reserved_chandef;
++	ieee80211_vif_update_chandef(sdata, &sdata->reserved_chandef);
+ 
+ 	if (changed)
+ 		ieee80211_bss_info_change_notify(sdata, changed);
+@@ -1336,7 +1351,7 @@ static int ieee80211_vif_use_reserved_sw
+ 			    sdata->reserved_chandef.width)
+ 				changed = BSS_CHANGED_BANDWIDTH;
+ 
+-			sdata->vif.bss_conf.chandef = sdata->reserved_chandef;
++			ieee80211_vif_update_chandef(sdata, &sdata->reserved_chandef);
+ 			if (changed)
+ 				ieee80211_bss_info_change_notify(sdata,
+ 								 changed);
+@@ -1507,7 +1522,7 @@ int ieee80211_vif_use_channel(struct iee
+ 		goto out;
+ 	}
+ 
+-	sdata->vif.bss_conf.chandef = *chandef;
++	ieee80211_vif_update_chandef(sdata, chandef);
+ 
+ 	ret = ieee80211_assign_vif_chanctx(sdata, ctx);
+ 	if (ret) {
+@@ -1649,7 +1664,7 @@ int ieee80211_vif_change_bandwidth(struc
+ 		break;
+ 	}
+ 
+-	sdata->vif.bss_conf.chandef = *chandef;
++	ieee80211_vif_update_chandef(sdata, chandef);
+ 
+ 	ieee80211_recalc_chanctx_chantype(local, ctx);
+ 
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -520,6 +520,7 @@ int ieee80211_do_open(struct wireless_de
+ 		sdata->vif.cab_queue = master->vif.cab_queue;
+ 		memcpy(sdata->vif.hw_queue, master->vif.hw_queue,
+ 		       sizeof(sdata->vif.hw_queue));
++		sdata->vif.bss_conf.chandef = master->vif.bss_conf.chandef;
+ 		break;
+ 		}
+ 	case NL80211_IFTYPE_AP:
diff --git a/trunk/package/kernel/mac80211/patches/324-ath9k_hw-fix-hardware-queue-allocation.patch b/trunk/package/kernel/mac80211/patches/324-ath9k_hw-fix-hardware-queue-allocation.patch
new file mode 100644
index 00000000..8eba1f27
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/324-ath9k_hw-fix-hardware-queue-allocation.patch
@@ -0,0 +1,31 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sun, 30 Nov 2014 20:30:46 +0100
+Subject: [PATCH] ath9k_hw: fix hardware queue allocation
+
+The driver passes the desired hardware queue index for a WMM data queue
+in qinfo->tqi_subtype. This was ignored in ath9k_hw_setuptxqueue, which
+instead relied on the order in which the function is called.
+
+Cc: stable@vger.kernel.org
+Reported-by: Hubert Feurstein <h.feurstein@gmail.com>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -311,14 +311,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw 
+ 		q = ATH9K_NUM_TX_QUEUES - 3;
+ 		break;
+ 	case ATH9K_TX_QUEUE_DATA:
+-		for (q = 0; q < ATH9K_NUM_TX_QUEUES; q++)
+-			if (ah->txq[q].tqi_type ==
+-			    ATH9K_TX_QUEUE_INACTIVE)
+-				break;
+-		if (q == ATH9K_NUM_TX_QUEUES) {
+-			ath_err(common, "No available TX queue\n");
+-			return -1;
+-		}
++		q = qinfo->tqi_subtype;
+ 		break;
+ 	default:
+ 		ath_err(common, "Invalid TX queue type: %u\n", type);
diff --git a/trunk/package/kernel/mac80211/patches/325-ath9k-fix-BE-BK-queue-order.patch b/trunk/package/kernel/mac80211/patches/325-ath9k-fix-BE-BK-queue-order.patch
new file mode 100644
index 00000000..3087b0c6
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/325-ath9k-fix-BE-BK-queue-order.patch
@@ -0,0 +1,24 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sun, 30 Nov 2014 20:34:16 +0100
+Subject: [PATCH] ath9k: fix BE/BK queue order
+
+Hardware queues are ordered by priority. Use queue index 0 for BK, which
+has lower priority than BE.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -217,8 +217,8 @@
+ #define AH_WOW_BEACON_MISS		BIT(3)
+ 
+ enum ath_hw_txq_subtype {
+-	ATH_TXQ_AC_BE = 0,
+-	ATH_TXQ_AC_BK = 1,
++	ATH_TXQ_AC_BK = 0,
++	ATH_TXQ_AC_BE = 1,
+ 	ATH_TXQ_AC_VI = 2,
+ 	ATH_TXQ_AC_VO = 3,
+ };
diff --git a/trunk/package/kernel/mac80211/patches/326-ath5k-fix-hardware-queue-index-assignment.patch b/trunk/package/kernel/mac80211/patches/326-ath5k-fix-hardware-queue-index-assignment.patch
new file mode 100644
index 00000000..81807a9b
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/326-ath5k-fix-hardware-queue-index-assignment.patch
@@ -0,0 +1,29 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Sun, 30 Nov 2014 21:51:12 +0100
+Subject: [PATCH] ath5k: fix hardware queue index assignment
+
+Like with ath9k, ath5k queues also need to be ordered by priority.
+queue_info->tqi_subtype already contains the correct index, so use it
+instead of relying on the order of ath5k_hw_setup_tx_queue calls.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/drivers/net/wireless/ath/ath5k/qcu.c
++++ b/drivers/net/wireless/ath/ath5k/qcu.c
+@@ -225,13 +225,7 @@ ath5k_hw_setup_tx_queue(struct ath5k_hw 
+ 	} else {
+ 		switch (queue_type) {
+ 		case AR5K_TX_QUEUE_DATA:
+-			for (queue = AR5K_TX_QUEUE_ID_DATA_MIN;
+-				ah->ah_txq[queue].tqi_type !=
+-				AR5K_TX_QUEUE_INACTIVE; queue++) {
+-
+-				if (queue > AR5K_TX_QUEUE_ID_DATA_MAX)
+-					return -EINVAL;
+-			}
++			queue = queue_info->tqi_subtype;
+ 			break;
+ 		case AR5K_TX_QUEUE_UAPSD:
+ 			queue = AR5K_TX_QUEUE_ID_UAPSD;
diff --git a/trunk/package/kernel/mac80211/patches/400-ath_move_debug_code.patch b/trunk/package/kernel/mac80211/patches/400-ath_move_debug_code.patch
new file mode 100644
index 00000000..229fc461
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/400-ath_move_debug_code.patch
@@ -0,0 +1,30 @@
+--- a/drivers/net/wireless/ath/Makefile
++++ b/drivers/net/wireless/ath/Makefile
+@@ -13,10 +13,10 @@ ath-objs :=	main.o \
+ 		regd.o \
+ 		hw.o \
+ 		key.o \
++		debug.o \
+ 		dfs_pattern_detector.o \
+ 		dfs_pri_detector.o
+ 
+-ath-$(CPTCFG_ATH_DEBUG) += debug.o
+ ath-$(CPTCFG_ATH_TRACEPOINTS) += trace.o
+ 
+ ccflags-y += -D__CHECK_ENDIAN__
+--- a/drivers/net/wireless/ath/ath.h
++++ b/drivers/net/wireless/ath/ath.h
+@@ -301,13 +301,6 @@ void _ath_dbg(struct ath_common *common,
+ #endif /* CPTCFG_ATH_DEBUG */
+ 
+ /** Returns string describing opmode, or NULL if unknown mode. */
+-#ifdef CPTCFG_ATH_DEBUG
+ const char *ath_opmode_to_string(enum nl80211_iftype opmode);
+-#else
+-static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)
+-{
+-	return "UNKNOWN";
+-}
+-#endif
+ 
+ #endif /* ATH_H */
diff --git a/trunk/package/kernel/mac80211/patches/401-ath9k_blink_default.patch b/trunk/package/kernel/mac80211/patches/401-ath9k_blink_default.patch
new file mode 100644
index 00000000..b0cef877
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/401-ath9k_blink_default.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -45,7 +45,7 @@ int ath9k_modparam_nohwcrypt;
+ module_param_named(nohwcrypt, ath9k_modparam_nohwcrypt, int, 0444);
+ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
+ 
+-int led_blink;
++int led_blink = 1;
+ module_param_named(blink, led_blink, int, 0444);
+ MODULE_PARM_DESC(blink, "Enable LED blink on activity");
+ 
diff --git a/trunk/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/trunk/package/kernel/mac80211/patches/402-ath_regd_optional.patch
new file mode 100644
index 00000000..3c1bfeeb
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/402-ath_regd_optional.patch
@@ -0,0 +1,69 @@
+--- a/drivers/net/wireless/ath/regd.c
++++ b/drivers/net/wireless/ath/regd.c
+@@ -341,6 +341,10 @@ ath_reg_apply_beaconing_flags(struct wip
+ 	struct ieee80211_channel *ch;
+ 	unsigned int i;
+ 
++#ifdef CPTCFG_ATH_USER_REGD
++	return;
++#endif
++
+ 	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+ 		if (!wiphy->bands[band])
+ 			continue;
+@@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
+ {
+ 	struct ieee80211_supported_band *sband;
+ 
++#ifdef CPTCFG_ATH_USER_REGD
++	return;
++#endif
++
+ 	sband = wiphy->bands[IEEE80211_BAND_2GHZ];
+ 	if (!sband)
+ 		return;
+@@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st
+ 	struct ieee80211_channel *ch;
+ 	unsigned int i;
+ 
++#ifdef CPTCFG_ATH_USER_REGD
++	return;
++#endif
++
+ 	if (!wiphy->bands[IEEE80211_BAND_5GHZ])
+ 		return;
+ 
+@@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator
+ 	const struct ieee80211_regdomain *regd;
+ 
+ 	wiphy->reg_notifier = reg_notifier;
++
++#ifdef CPTCFG_ATH_USER_REGD
++	return 0;
++#endif
++
+ 	wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
+ 				   REGULATORY_CUSTOM_REG;
+ 
+--- a/drivers/net/wireless/ath/Kconfig
++++ b/drivers/net/wireless/ath/Kconfig
+@@ -21,6 +21,9 @@ menuconfig ATH_CARDS
+ 
+ if ATH_CARDS
+ 
++config ATH_USER_REGD
++	bool "Do not enforce EEPROM regulatory restrictions"
++
+ config ATH_DEBUG
+ 	bool "Atheros wireless debugging"
+ 	---help---
+--- a/.local-symbols
++++ b/.local-symbols
+@@ -116,6 +116,7 @@ RTL8187_LEDS=
+ ATH_COMMON=
+ ATH_CARDS=
+ ATH_DEBUG=
++ATH_USER_REGD=
+ ATH_TRACEPOINTS=
+ ATH_REG_DYNAMIC_USER_REG_HINTS=
+ ATH_REG_DYNAMIC_USER_CERT_TESTING=
diff --git a/trunk/package/kernel/mac80211/patches/403-world_regd_fixup.patch b/trunk/package/kernel/mac80211/patches/403-world_regd_fixup.patch
new file mode 100644
index 00000000..2b04309c
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/403-world_regd_fixup.patch
@@ -0,0 +1,84 @@
+--- a/drivers/net/wireless/ath/regd.c
++++ b/drivers/net/wireless/ath/regd.c
+@@ -43,7 +43,8 @@ static int __ath_regd_init(struct ath_re
+ 					 NL80211_RRF_NO_OFDM)
+ 
+ /* We allow IBSS on these on a case by case basis by regulatory domain */
+-#define ATH9K_5GHZ_5150_5350	REG_RULE(5150-10, 5350+10, 80, 0, 30,\
++#define ATH9K_5GHZ_5150_5350	REG_RULE(5150-10, 5240+10, 80, 0, 30, 0),\
++				REG_RULE(5260-10, 5350+10, 80, 0, 30,\
+ 					 NL80211_RRF_NO_IR)
+ #define ATH9K_5GHZ_5470_5850	REG_RULE(5470-10, 5850+10, 80, 0, 30,\
+ 					 NL80211_RRF_NO_IR)
+@@ -61,57 +62,56 @@ static int __ath_regd_init(struct ath_re
+ #define ATH9K_5GHZ_NO_MIDBAND	ATH9K_5GHZ_5150_5350, \
+ 				ATH9K_5GHZ_5725_5850
+ 
++#define REGD_RULES(...) \
++	.reg_rules = { __VA_ARGS__ }, \
++	.n_reg_rules = ARRAY_SIZE(((struct ieee80211_reg_rule[]) { __VA_ARGS__ }))
++
+ /* Can be used for:
+  * 0x60, 0x61, 0x62 */
+ static const struct ieee80211_regdomain ath_world_regdom_60_61_62 = {
+-	.n_reg_rules = 5,
+ 	.alpha2 =  "99",
+-	.reg_rules = {
++	REGD_RULES(
+ 		ATH9K_2GHZ_ALL,
+ 		ATH9K_5GHZ_ALL,
+-	}
++	)
+ };
+ 
+ /* Can be used by 0x63 and 0x65 */
+ static const struct ieee80211_regdomain ath_world_regdom_63_65 = {
+-	.n_reg_rules = 4,
+ 	.alpha2 =  "99",
+-	.reg_rules = {
++	REGD_RULES(
+ 		ATH9K_2GHZ_CH01_11,
+ 		ATH9K_2GHZ_CH12_13,
+ 		ATH9K_5GHZ_NO_MIDBAND,
+-	}
++	)
+ };
+ 
+ /* Can be used by 0x64 only */
+ static const struct ieee80211_regdomain ath_world_regdom_64 = {
+-	.n_reg_rules = 3,
+ 	.alpha2 =  "99",
+-	.reg_rules = {
++	REGD_RULES(
+ 		ATH9K_2GHZ_CH01_11,
+ 		ATH9K_5GHZ_NO_MIDBAND,
+-	}
++	)
+ };
+ 
+ /* Can be used by 0x66 and 0x69 */
+ static const struct ieee80211_regdomain ath_world_regdom_66_69 = {
+-	.n_reg_rules = 3,
+ 	.alpha2 =  "99",
+-	.reg_rules = {
++	REGD_RULES(
+ 		ATH9K_2GHZ_CH01_11,
+ 		ATH9K_5GHZ_ALL,
+-	}
++	)
+ };
+ 
+ /* Can be used by 0x67, 0x68, 0x6A and 0x6C */
+ static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
+-	.n_reg_rules = 4,
+ 	.alpha2 =  "99",
+-	.reg_rules = {
++	REGD_RULES(
+ 		ATH9K_2GHZ_CH01_11,
+ 		ATH9K_2GHZ_CH12_13,
+ 		ATH9K_5GHZ_ALL,
+-	}
++	)
+ };
+ 
+ static bool dynamic_country_user_possible(struct ath_regulatory *reg)
diff --git a/trunk/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch b/trunk/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
new file mode 100644
index 00000000..85f1fc02
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
@@ -0,0 +1,19 @@
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -2112,6 +2112,8 @@ void regulatory_hint_country_ie(struct w
+ 	enum environment_cap env = ENVIRON_ANY;
+ 	struct regulatory_request *request = NULL, *lr;
+ 
++	return;
++
+ 	/* IE len must be evenly divisible by 2 */
+ 	if (country_ie_len & 0x01)
+ 		return;
+@@ -2308,6 +2310,7 @@ static void restore_regulatory_settings(
+ 
+ void regulatory_hint_disconnect(void)
+ {
++	return;
+ 	REG_DBG_PRINT("All devices are disconnected, going to restore regulatory settings\n");
+ 	restore_regulatory_settings(false);
+ }
diff --git a/trunk/package/kernel/mac80211/patches/405-ath_regd_us.patch b/trunk/package/kernel/mac80211/patches/405-ath_regd_us.patch
new file mode 100644
index 00000000..cc558778
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/405-ath_regd_us.patch
@@ -0,0 +1,26 @@
+--- a/drivers/net/wireless/ath/regd_common.h
++++ b/drivers/net/wireless/ath/regd_common.h
+@@ -32,6 +32,7 @@ enum EnumRd {
+ 	FCC2_WORLD = 0x21,
+ 	FCC2_ETSIC = 0x22,
+ 	FCC6_WORLD = 0x23,
++	FCC3_FCCA_2 = 0x2A,
+ 	FRANCE_RES = 0x31,
+ 	FCC3_FCCA = 0x3A,
+ 	FCC3_WORLD = 0x3B,
+@@ -167,6 +168,7 @@ static struct reg_dmn_pair_mapping regDo
+ 	{FCC2_WORLD, CTL_FCC, CTL_ETSI},
+ 	{FCC2_ETSIC, CTL_FCC, CTL_ETSI},
+ 	{FCC3_FCCA, CTL_FCC, CTL_FCC},
++	{FCC3_FCCA_2, CTL_FCC, CTL_FCC},
+ 	{FCC3_WORLD, CTL_FCC, CTL_ETSI},
+ 	{FCC4_FCCA, CTL_FCC, CTL_FCC},
+ 	{FCC5_FCCA, CTL_FCC, CTL_FCC},
+@@ -463,6 +465,7 @@ static struct country_code_to_enum_rd al
+ 	{CTRY_UAE, NULL1_WORLD, "AE"},
+ 	{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB"},
+ 	{CTRY_UNITED_STATES, FCC3_FCCA, "US"},
++	{CTRY_UNITED_STATES, FCC3_FCCA_2, "US"},
+ 	/* This "PS" is for US public safety actually... to support this we
+ 	 * would need to assign new special alpha2 to CRDA db as with the world
+ 	 * regdomain and use another alpha2 */
diff --git a/trunk/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/trunk/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
new file mode 100644
index 00000000..16bf144e
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
@@ -0,0 +1,10 @@
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -684,6 +684,7 @@ static const struct ieee80211_iface_limi
+ 				 BIT(NL80211_IFTYPE_AP) },
+ 	{ .max = 1,	.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
+ 				 BIT(NL80211_IFTYPE_P2P_GO) },
++	{ .max = 1,	.types = BIT(NL80211_IFTYPE_ADHOC) },
+ };
+ 
+ static const struct ieee80211_iface_limit wds_limits[] = {
diff --git a/trunk/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/trunk/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
new file mode 100644
index 00000000..23f9435e
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
@@ -0,0 +1,46 @@
+--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
++++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+@@ -86,13 +86,8 @@ ath5k_add_interface(struct ieee80211_hw 
+ 		goto end;
+ 	}
+ 
+-	/* Don't allow other interfaces if one ad-hoc is configured.
+-	 * TODO: Fix the problems with ad-hoc and multiple other interfaces.
+-	 * We would need to operate the HW in ad-hoc mode to allow TSF updates
+-	 * for the IBSS, but this breaks with additional AP or STA interfaces
+-	 * at the moment. */
+-	if (ah->num_adhoc_vifs ||
+-	    (ah->nvifs && vif->type == NL80211_IFTYPE_ADHOC)) {
++	/* Don't allow more than one ad-hoc interface */
++	if (ah->num_adhoc_vifs && vif->type == NL80211_IFTYPE_ADHOC) {
+ 		ATH5K_ERR(ah, "Only one single ad-hoc interface is allowed.\n");
+ 		ret = -ELNRNG;
+ 		goto end;
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1962,7 +1962,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
+ 	}
+ 
+ 	if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs +
+-			ah->num_mesh_vifs > 1) ||
++			ah->num_adhoc_vifs + ah->num_mesh_vifs > 1) ||
+ 			ah->opmode == NL80211_IFTYPE_MESH_POINT) {
+ 		u64 tsf = ath5k_hw_get_tsf64(ah);
+ 		u32 tsftu = TSF_TO_TU(tsf);
+@@ -2048,7 +2048,7 @@ ath5k_beacon_update_timers(struct ath5k_
+ 
+ 	intval = ah->bintval & AR5K_BEACON_PERIOD;
+ 	if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs
+-		+ ah->num_mesh_vifs > 1) {
++		+ ah->num_adhoc_vifs + ah->num_mesh_vifs > 1) {
+ 		intval /= ATH_BCBUF;	/* staggered multi-bss beacons */
+ 		if (intval < 15)
+ 			ATH5K_WARN(ah, "intval %u is too low, min 15\n",
+@@ -2515,6 +2515,7 @@ static const struct ieee80211_iface_limi
+ 				 BIT(NL80211_IFTYPE_MESH_POINT) |
+ #endif
+ 				 BIT(NL80211_IFTYPE_AP) },
++	{ .max = 1,	.types = BIT(NL80211_IFTYPE_ADHOC) },
+ };
+ 
+ static const struct ieee80211_iface_combination if_comb = {
diff --git a/trunk/package/kernel/mac80211/patches/420-ath5k_disable_fast_cc.patch b/trunk/package/kernel/mac80211/patches/420-ath5k_disable_fast_cc.patch
new file mode 100644
index 00000000..414f4950
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/420-ath5k_disable_fast_cc.patch
@@ -0,0 +1,18 @@
+--- a/drivers/net/wireless/ath/ath5k/reset.c
++++ b/drivers/net/wireless/ath/ath5k/reset.c
+@@ -1154,6 +1154,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum
+ 	tsf_lo = 0;
+ 	mode = 0;
+ 
++#if 0
+ 	/*
+ 	 * Sanity check for fast flag
+ 	 * Fast channel change only available
+@@ -1161,6 +1162,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum
+ 	 */
+ 	if (fast && (ah->ah_radio != AR5K_RF2413) &&
+ 	(ah->ah_radio != AR5K_RF5413))
++#endif
+ 		fast = false;
+ 
+ 	/* Disable sleep clock operation
diff --git a/trunk/package/kernel/mac80211/patches/430-add_ath5k_platform.patch b/trunk/package/kernel/mac80211/patches/430-add_ath5k_platform.patch
new file mode 100644
index 00000000..b213e2a8
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/430-add_ath5k_platform.patch
@@ -0,0 +1,33 @@
+--- /dev/null
++++ b/include/linux/ath5k_platform.h
+@@ -0,0 +1,30 @@
++/*
++ * Copyright (c) 2008 Atheros Communications Inc.
++ * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
++ * Copyright (c) 2010 Daniel Golle <daniel.golle@gmail.com>
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifndef _LINUX_ATH5K_PLATFORM_H
++#define _LINUX_ATH5K_PLATFORM_H
++
++#define ATH5K_PLAT_EEP_MAX_WORDS	2048
++
++struct ath5k_platform_data {
++	u16 *eeprom_data;
++	u8 *macaddr;
++};
++
++#endif /* _LINUX_ATH5K_PLATFORM_H */
diff --git a/trunk/package/kernel/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch b/trunk/package/kernel/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
new file mode 100644
index 00000000..5cb4b513
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
@@ -0,0 +1,56 @@
+--- a/drivers/net/wireless/ath/ath5k/pci.c
++++ b/drivers/net/wireless/ath/ath5k/pci.c
+@@ -21,6 +21,7 @@
+ #include <linux/pci-aspm.h>
+ #include <linux/etherdevice.h>
+ #include <linux/module.h>
++#include <linux/ath5k_platform.h>
+ #include "../ath.h"
+ #include "ath5k.h"
+ #include "debug.h"
+@@ -72,7 +73,7 @@ static void ath5k_pci_read_cachesize(str
+ }
+ 
+ /*
+- * Read from eeprom
++ * Read from eeprom or platform_data
+  */
+ static bool
+ ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)
+@@ -80,6 +81,19 @@ ath5k_pci_eeprom_read(struct ath_common 
+ 	struct ath5k_hw *ah = (struct ath5k_hw *) common->ah;
+ 	u32 status, timeout;
+ 
++	struct ath5k_platform_data *pdata = NULL;
++
++	if (ah->pdev)
++		pdata = ah->pdev->dev.platform_data;
++
++	if (pdata && pdata->eeprom_data && pdata->eeprom_data[61] == AR5K_EEPROM_MAGIC_VALUE) {
++		if (offset >= ATH5K_PLAT_EEP_MAX_WORDS)
++			return false;
++
++		*data = pdata->eeprom_data[offset];
++		return true;
++	}
++
+ 	/*
+ 	 * Initialize EEPROM access
+ 	 */
+@@ -123,6 +137,16 @@ static int ath5k_pci_eeprom_read_mac(str
+ 	u16 data;
+ 	int octet;
+ 
++	struct ath5k_platform_data *pdata = NULL;
++
++	if (ah->pdev)
++		pdata = ah->pdev->dev.platform_data;
++
++	if (pdata && pdata->macaddr) {
++		memcpy(mac, pdata->macaddr, ETH_ALEN);
++		return 0;
++	}
++
+ 	AR5K_EEPROM_READ(0x20, data);
+ 
+ 	for (offset = 0x1f, octet = 0, total = 0; offset >= 0x1d; offset--) {
diff --git a/trunk/package/kernel/mac80211/patches/432-ath5k_add_pciids.patch b/trunk/package/kernel/mac80211/patches/432-ath5k_add_pciids.patch
new file mode 100644
index 00000000..d82f8001
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/432-ath5k_add_pciids.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/ath/ath5k/pci.c
++++ b/drivers/net/wireless/ath/ath5k/pci.c
+@@ -48,6 +48,8 @@ static const struct pci_device_id ath5k_
+ 	{ PCI_VDEVICE(ATHEROS, 0x001b) }, /* 5413 Eagle */
+ 	{ PCI_VDEVICE(ATHEROS, 0x001c) }, /* PCI-E cards */
+ 	{ PCI_VDEVICE(ATHEROS, 0x001d) }, /* 2417 Nala */
++	{ PCI_VDEVICE(ATHEROS, 0xff16) }, /* 2413,2414 sx76x on lantiq_danube */
++	{ PCI_VDEVICE(ATHEROS, 0xff1a) }, /* 2417 arv45xx on lantiq_danube */
+ 	{ PCI_VDEVICE(ATHEROS, 0xff1b) }, /* AR5BXB63 */
+ 	{ 0 }
+ };
diff --git a/trunk/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch b/trunk/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
new file mode 100644
index 00000000..d2c6c5fc
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
@@ -0,0 +1,143 @@
+This adds a bwmode debugfs file which can be used to set alternate
+channel operating bandwidths.  Only tested with AR5413 and only at
+5 and 20 mhz channels.
+
+Signed-off-by: Pat Erley <pat-lkml at erley.org>
+---
+Other devices will need to be added to the switch in  write_file_bwmode
+
+drivers/net/wireless/ath/ath5k/debug.c |   86 ++++++++++++++++++++++++++++++++
+ 1 files changed, 86 insertions(+), 0 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath5k/debug.c
++++ b/drivers/net/wireless/ath/ath5k/debug.c
+@@ -823,6 +823,97 @@ static const struct file_operations fops
+ 	.llseek = default_llseek,
+ };
+ 
++/* debugfs: bwmode */
++
++static ssize_t read_file_bwmode(struct file *file, char __user *user_buf,
++				   size_t count, loff_t *ppos)
++{
++	struct ath5k_hw *ah = file->private_data;
++	char buf[15];
++	unsigned int len = 0;
++
++	int cur_ah_bwmode = ah->ah_bwmode_debug;
++
++#define print_selected(MODE, LABEL) \
++	if (cur_ah_bwmode == MODE) \
++		len += snprintf(buf+len, sizeof(buf)-len, "[%s]", LABEL); \
++	else \
++		len += snprintf(buf+len, sizeof(buf)-len, "%s", LABEL); \
++	len += snprintf(buf+len, sizeof(buf)-len, " ");
++
++	print_selected(AR5K_BWMODE_5MHZ, "5");
++	print_selected(AR5K_BWMODE_10MHZ, "10");
++	print_selected(AR5K_BWMODE_DEFAULT, "20");
++	print_selected(AR5K_BWMODE_40MHZ, "40");
++#undef print_selected
++
++	len += snprintf(buf+len, sizeof(buf)-len, "\n");
++
++	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
++}
++
++static ssize_t write_file_bwmode(struct file *file,
++				 const char __user *userbuf,
++				 size_t count, loff_t *ppos)
++{
++	struct ath5k_hw *ah = file->private_data;
++	char buf[3];
++	int bw = 20;
++	int tobwmode = AR5K_BWMODE_DEFAULT;
++
++	if (copy_from_user(buf, userbuf, min(count, sizeof(buf))))
++		return -EFAULT;
++
++	/* TODO: Add check for active interface */
++
++	if(strncmp(buf, "5", 1) == 0 ) {
++		tobwmode = AR5K_BWMODE_5MHZ;
++		bw = 5;
++	} else if ( strncmp(buf, "10", 2) == 0 ) {
++		tobwmode = AR5K_BWMODE_10MHZ;
++		bw = 10;
++	} else if ( strncmp(buf, "20", 2) == 0 ) {
++		tobwmode = AR5K_BWMODE_DEFAULT;
++		bw = 20;
++	} else if ( strncmp(buf, "40", 2) == 0 ) {
++		tobwmode = AR5K_BWMODE_40MHZ;
++		bw = 40;
++	} else
++		return -EINVAL;
++
++	ATH5K_INFO(ah, "Changing to %imhz channel width[%i]\n",
++		bw, tobwmode);
++
++	switch (ah->ah_radio) {
++	/* TODO: only define radios that actually support 5/10mhz channels */
++	case AR5K_RF5413:
++	case AR5K_RF5110:
++	case AR5K_RF5111:
++	case AR5K_RF5112:
++	case AR5K_RF2413:
++	case AR5K_RF2316:
++	case AR5K_RF2317:
++	case AR5K_RF2425:
++		if(ah->ah_bwmode_debug != tobwmode) {
++			mutex_lock(&ah->lock);
++			ah->ah_bwmode = tobwmode;
++			ah->ah_bwmode_debug = tobwmode;
++			mutex_unlock(&ah->lock);
++		}
++		break;
++	default:
++		return -EOPNOTSUPP;
++	}
++	return count;
++}
++
++static const struct file_operations fops_bwmode = {
++	.read = read_file_bwmode,
++	.write = write_file_bwmode,
++	.open = simple_open,
++	.owner = THIS_MODULE,
++	.llseek = default_llseek,
++};
+ 
+ /* debugfs: queues etc */
+ 
+@@ -1010,6 +1101,9 @@ ath5k_debug_init_device(struct ath5k_hw 
+ 	debugfs_create_file("beacon", S_IWUSR | S_IRUSR, phydir, ah,
+ 			    &fops_beacon);
+ 
++	debugfs_create_file("bwmode", S_IWUSR | S_IRUSR, phydir, ah,
++			    &fops_bwmode);
++
+ 	debugfs_create_file("reset", S_IWUSR, phydir, ah, &fops_reset);
+ 
+ 	debugfs_create_file("antenna", S_IWUSR | S_IRUSR, phydir, ah,
+--- a/drivers/net/wireless/ath/ath5k/ath5k.h
++++ b/drivers/net/wireless/ath/ath5k/ath5k.h
+@@ -1370,6 +1370,7 @@ struct ath5k_hw {
+ 	u8			ah_coverage_class;
+ 	bool			ah_ack_bitrate_high;
+ 	u8			ah_bwmode;
++	u8			ah_bwmode_debug;
+ 	bool			ah_short_slot;
+ 
+ 	/* Antenna Control */
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -466,6 +466,9 @@ ath5k_chan_set(struct ath5k_hw *ah, stru
+ 		return -EINVAL;
+ 	}
+ 
++	if (ah->ah_bwmode_debug != AR5K_BWMODE_DEFAULT)
++		ah->ah_bwmode = ah->ah_bwmode_debug;
++
+ 	/*
+ 	 * To switch channels clear any pending DMA operations;
+ 	 * wait long enough for the RX fifo to drain, reset the
diff --git a/trunk/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/trunk/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
new file mode 100644
index 00000000..dfcbe569
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -0,0 +1,65 @@
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1314,6 +1314,53 @@ void ath9k_deinit_debug(struct ath_softc
+ 	ath9k_spectral_deinit_debug(sc);
+ }
+ 
++static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
++			     size_t count, loff_t *ppos)
++{
++	struct ath_softc *sc = file->private_data;
++	struct ath_hw *ah = sc->sc_ah;
++	struct ath_common *common = ath9k_hw_common(ah);
++	int bytes = 0;
++	int pos = *ppos;
++	int size = 4096;
++	u16 val;
++	int i;
++
++	if (AR_SREV_9300_20_OR_LATER(ah))
++		size = 16384;
++
++	if (*ppos < 0)
++		return -EINVAL;
++
++	if (count > size - *ppos)
++		count = size - *ppos;
++
++	for (i = *ppos / 2; count > 0; count -= bytes, *ppos += bytes, i++) {
++		void *from = &val;
++
++		if (!common->bus_ops->eeprom_read(common, i, &val))
++			val = 0xffff;
++
++		if (*ppos % 2) {
++			from++;
++			bytes = 1;
++		} else if (count == 1) {
++			bytes = 1;
++		} else {
++			bytes = 2;
++		}
++		copy_to_user(user_buf, from, bytes);
++		user_buf += bytes;
++	}
++	return *ppos - pos;
++}
++
++static const struct file_operations fops_eeprom = {
++	.read = read_file_eeprom,
++	.open = simple_open,
++	.owner = THIS_MODULE
++};
++
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+ 	struct ath_common *common = ath9k_hw_common(ah);
+@@ -1333,6 +1380,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 	ath9k_tx99_init_debug(sc);
+ 	ath9k_spectral_init_debug(sc);
+ 
++	debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_eeprom);
+ 	debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_dma);
+ 	debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
diff --git a/trunk/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch b/trunk/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
new file mode 100644
index 00000000..965cb6b0
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
@@ -0,0 +1,32 @@
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -990,23 +990,23 @@ static int __init ath9k_init(void)
+ {
+ 	int error;
+ 
+-	error = ath_pci_init();
++	error = ath_ahb_init();
+ 	if (error < 0) {
+-		pr_err("No PCI devices found, driver not installed\n");
+ 		error = -ENODEV;
+ 		goto err_out;
+ 	}
+ 
+-	error = ath_ahb_init();
++	error = ath_pci_init();
+ 	if (error < 0) {
++		pr_err("No PCI devices found, driver not installed\n");
+ 		error = -ENODEV;
+-		goto err_pci_exit;
++		goto err_ahb_exit;
+ 	}
+ 
+ 	return 0;
+ 
+- err_pci_exit:
+-	ath_pci_exit();
++ err_ahb_exit:
++	ath_ahb_exit();
+  err_out:
+ 	return error;
+ }
diff --git a/trunk/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch b/trunk/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
new file mode 100644
index 00000000..eebf6fc7
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
@@ -0,0 +1,18 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -356,13 +356,8 @@ static void ath9k_hw_init_config(struct 
+ 
+ 	ah->config.rx_intr_mitigation = true;
+ 
+-	if (AR_SREV_9300_20_OR_LATER(ah)) {
+-		ah->config.rimt_last = 500;
+-		ah->config.rimt_first = 2000;
+-	} else {
+-		ah->config.rimt_last = 250;
+-		ah->config.rimt_first = 700;
+-	}
++	ah->config.rimt_last = 250;
++	ah->config.rimt_first = 500;
+ 
+ 	/*
+ 	 * We need this for PCI devices only (Cardbus, PCI, miniPCI)
diff --git a/trunk/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch b/trunk/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
new file mode 100644
index 00000000..6766111d
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -88,7 +88,7 @@ int ath_descdma_setup(struct ath_softc *
+ 		(_l) &= ((_sz) - 1);		\
+ 	} while (0)
+ 
+-#define ATH_RXBUF               512
++#define ATH_RXBUF               256
+ #define ATH_TXBUF               512
+ #define ATH_TXBUF_RESERVE       5
+ #define ATH_MAX_QDEPTH          (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
diff --git a/trunk/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/trunk/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
new file mode 100644
index 00000000..e8a92c48
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@ -0,0 +1,125 @@
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1361,6 +1361,52 @@ static const struct file_operations fops
+ 	.owner = THIS_MODULE
+ };
+ 
++
++static ssize_t read_file_chan_bw(struct file *file, char __user *user_buf,
++			     size_t count, loff_t *ppos)
++{
++	struct ath_softc *sc = file->private_data;
++	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
++	char buf[32];
++	unsigned int len;
++
++	len = sprintf(buf, "0x%08x\n", common->chan_bw);
++	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
++}
++
++static ssize_t write_file_chan_bw(struct file *file, const char __user *user_buf,
++			     size_t count, loff_t *ppos)
++{
++	struct ath_softc *sc = file->private_data;
++	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
++	unsigned long chan_bw;
++	char buf[32];
++	ssize_t len;
++
++	len = min(count, sizeof(buf) - 1);
++	if (copy_from_user(buf, user_buf, len))
++		return -EFAULT;
++
++	buf[len] = '\0';
++	if (kstrtoul(buf, 0, &chan_bw))
++		return -EINVAL;
++
++	common->chan_bw = chan_bw;
++	if (!test_bit(ATH_OP_INVALID, &common->op_flags))
++		ath9k_ops.config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL);
++
++	return count;
++}
++
++static const struct file_operations fops_chanbw = {
++	.read = read_file_chan_bw,
++	.write = write_file_chan_bw,
++	.open = simple_open,
++	.owner = THIS_MODULE,
++	.llseek = default_llseek,
++};
++
++
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+ 	struct ath_common *common = ath9k_hw_common(ah);
+@@ -1382,6 +1428,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 
+ 	debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_eeprom);
++	debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
++			    sc, &fops_chanbw);
+ 	debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_dma);
+ 	debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
+--- a/drivers/net/wireless/ath/ath.h
++++ b/drivers/net/wireless/ath/ath.h
+@@ -142,6 +142,7 @@ struct ath_common {
+ 	int debug_mask;
+ 	enum ath_device_state state;
+ 	unsigned long op_flags;
++	u32 chan_bw;
+ 
+ 	struct ath_ani ani;
+ 
+--- a/drivers/net/wireless/ath/ath9k/common.c
++++ b/drivers/net/wireless/ath/ath9k/common.c
+@@ -296,11 +296,13 @@ EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_ke
+ /*
+  * Update internal channel flags.
+  */
+-static void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
++static void ath9k_cmn_update_ichannel(struct ath_common *common,
++				      struct ath9k_channel *ichan,
+ 				      struct cfg80211_chan_def *chandef)
+ {
+ 	struct ieee80211_channel *chan = chandef->chan;
+ 	u16 flags = 0;
++	int width;
+ 
+ 	ichan->channel = chan->center_freq;
+ 	ichan->chan = chan;
+@@ -308,7 +310,19 @@ static void ath9k_cmn_update_ichannel(st
+ 	if (chan->band == IEEE80211_BAND_5GHZ)
+ 		flags |= CHANNEL_5GHZ;
+ 
+-	switch (chandef->width) {
++	switch (common->chan_bw) {
++	case 5:
++		width = NL80211_CHAN_WIDTH_5;
++		break;
++	case 10:
++		width = NL80211_CHAN_WIDTH_10;
++		break;
++	default:
++		width = chandef->width;
++		break;
++	}
++
++	switch (width) {
+ 	case NL80211_CHAN_WIDTH_5:
+ 		flags |= CHANNEL_QUARTER;
+ 		break;
+@@ -341,10 +355,11 @@ struct ath9k_channel *ath9k_cmn_get_chan
+ 					    struct cfg80211_chan_def *chandef)
+ {
+ 	struct ieee80211_channel *curchan = chandef->chan;
++	struct ath_common *common = ath9k_hw_common(ah);
+ 	struct ath9k_channel *channel;
+ 
+ 	channel = &ah->channels[curchan->hw_value];
+-	ath9k_cmn_update_ichannel(channel, chandef);
++	ath9k_cmn_update_ichannel(common, channel, chandef);
+ 
+ 	return channel;
+ }
diff --git a/trunk/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/trunk/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
new file mode 100644
index 00000000..09c16dd5
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
@@ -0,0 +1,30 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -611,6 +611,7 @@ int ath9k_hw_init(struct ath_hw *ah)
+ 
+ 	/* These are all the AR5008/AR9001/AR9002/AR9003 hardware family of chipsets */
+ 	switch (ah->hw_version.devid) {
++	case AR9300_DEVID_INVALID:
+ 	case AR5416_DEVID_PCI:
+ 	case AR5416_DEVID_PCIE:
+ 	case AR5416_AR9100_DEVID:
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -35,6 +35,7 @@
+ 
+ #define ATHEROS_VENDOR_ID	0x168c
+ 
++#define AR9300_DEVID_INVALID	0xabcd
+ #define AR5416_DEVID_PCI	0x0023
+ #define AR5416_DEVID_PCIE	0x0024
+ #define AR9160_DEVID_PCI	0x0027
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -664,6 +664,7 @@ static const struct pci_device_id ath_pc
+ 	  .driver_data = ATH9K_PCI_BT_ANT_DIV },
+ #endif
+ 
++	{ PCI_VDEVICE(ATHEROS, 0xabcd) }, /* PCI-E  internal chip default ID */
+ 	{ 0 }
+ };
+ 
diff --git a/trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
new file mode 100644
index 00000000..36e51c82
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
@@ -0,0 +1,160 @@
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -2245,6 +2245,7 @@ struct cfg80211_qos_map {
+  *	(as advertised by the nl80211 feature flag.)
+  * @get_tx_power: store the current TX power into the dbm variable;
+  *	return 0 if successful
++ * @set_antenna_gain: set antenna gain to reduce maximum tx power if necessary
+  *
+  * @set_wds_peer: set the WDS peer for a WDS interface
+  *
+@@ -2495,6 +2496,7 @@ struct cfg80211_ops {
+ 				enum nl80211_tx_power_setting type, int mbm);
+ 	int	(*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
+ 				int *dbm);
++	int	(*set_antenna_gain)(struct wiphy *wiphy, int dbi);
+ 
+ 	int	(*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
+ 				const u8 *addr);
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -1078,6 +1078,7 @@ enum ieee80211_smps_mode {
+  *
+  * @power_level: requested transmit power (in dBm), backward compatibility
+  *	value only that is set to the minimum of all interfaces
++ * @max_antenna_gain: maximum antenna gain adjusted by user config (in dBi)
+  *
+  * @chandef: the channel definition to tune to
+  * @radar_enabled: whether radar detection is enabled
+@@ -1099,6 +1100,7 @@ struct ieee80211_conf {
+ 	u32 flags;
+ 	int power_level, dynamic_ps_timeout;
+ 	int max_sleep_period;
++	int max_antenna_gain;
+ 
+ 	u16 listen_interval;
+ 	u8 ps_dtim_period;
+--- a/include/uapi/linux/nl80211.h
++++ b/include/uapi/linux/nl80211.h
+@@ -1656,6 +1656,9 @@ enum nl80211_commands {
+  * @NL80211_ATTR_SMPS_MODE: SMPS mode to use (ap mode). see
+  *	&enum nl80211_smps_mode.
+  *
++ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
++ *	transmit power to stay within regulatory limits. u32, dBi.
++ *
+  * @NL80211_ATTR_MAX: highest attribute number currently defined
+  * @__NL80211_ATTR_AFTER_LAST: internal use
+  */
+@@ -2008,6 +2011,8 @@ enum nl80211_attrs {
+ 
+ 	NL80211_ATTR_SMPS_MODE,
+ 
++	NL80211_ATTR_WIPHY_ANTENNA_GAIN,
++
+ 	/* add attributes here, update the policy in nl80211.c */
+ 
+ 	__NL80211_ATTR_AFTER_LAST,
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -2155,6 +2155,19 @@ static int ieee80211_get_tx_power(struct
+ 	return 0;
+ }
+ 
++static int ieee80211_set_antenna_gain(struct wiphy *wiphy, int dbi)
++{
++	struct ieee80211_local *local = wiphy_priv(wiphy);
++
++	if (dbi < 0)
++		return -EINVAL;
++
++	local->user_antenna_gain = dbi;
++	ieee80211_hw_config(local, 0);
++
++	return 0;
++}
++
+ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
+ 				  const u8 *addr)
+ {
+@@ -3723,6 +3736,7 @@ const struct cfg80211_ops mac80211_confi
+ 	.set_wiphy_params = ieee80211_set_wiphy_params,
+ 	.set_tx_power = ieee80211_set_tx_power,
+ 	.get_tx_power = ieee80211_get_tx_power,
++	.set_antenna_gain = ieee80211_set_antenna_gain,
+ 	.set_wds_peer = ieee80211_set_wds_peer,
+ 	.rfkill_poll = ieee80211_rfkill_poll,
+ 	CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1339,6 +1339,7 @@ struct ieee80211_local {
+ 	int dynamic_ps_forced_timeout;
+ 
+ 	int user_power_level; /* in dBm, for all interfaces */
++	int user_antenna_gain; /* in dBi */
+ 
+ 	enum ieee80211_smps_mode smps_mode;
+ 
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -98,7 +98,7 @@ static u32 ieee80211_hw_conf_chan(struct
+ 	struct ieee80211_sub_if_data *sdata;
+ 	struct cfg80211_chan_def chandef = {};
+ 	u32 changed = 0;
+-	int power;
++	int power, max_power;
+ 	u32 offchannel_flag;
+ 
+ 	offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
+@@ -155,6 +155,12 @@ static u32 ieee80211_hw_conf_chan(struct
+ 	}
+ 	rcu_read_unlock();
+ 
++	max_power = chandef.chan->max_reg_power;
++	if (local->user_antenna_gain > 0) {
++		max_power -= local->user_antenna_gain;
++		power = min(power, max_power);
++	}
++
+ 	if (local->hw.conf.power_level != power) {
+ 		changed |= IEEE80211_CONF_CHANGE_POWER;
+ 		local->hw.conf.power_level = power;
+@@ -578,6 +584,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+ 					 IEEE80211_RADIOTAP_MCS_HAVE_BW;
+ 	local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
+ 					 IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
++	local->user_antenna_gain = 0;
+ 	local->hw.uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
+ 	local->hw.uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
+ 	local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -395,6 +395,7 @@ static const struct nla_policy nl80211_p
+ 	[NL80211_ATTR_USER_PRIO] = { .type = NLA_U8 },
+ 	[NL80211_ATTR_ADMITTED_TIME] = { .type = NLA_U16 },
+ 	[NL80211_ATTR_SMPS_MODE] = { .type = NLA_U8 },
++	[NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
+ };
+ 
+ /* policy for the key attributes */
+@@ -2184,6 +2185,20 @@ static int nl80211_set_wiphy(struct sk_b
+ 			return result;
+ 	}
+ 
++	if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
++		int idx, dbi = 0;
++
++		if (!rdev->ops->set_antenna_gain)
++			return -EOPNOTSUPP;
++
++		idx = NL80211_ATTR_WIPHY_ANTENNA_GAIN;
++		dbi = nla_get_u32(info->attrs[idx]);
++
++		result = rdev->ops->set_antenna_gain(&rdev->wiphy, dbi);
++		if (result)
++			return result;
++	}
++
+ 	if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
+ 	    info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
+ 		u32 tx_ant, rx_ant;
diff --git a/trunk/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/trunk/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
new file mode 100644
index 00000000..cb6c477f
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
@@ -0,0 +1,248 @@
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -812,6 +812,9 @@ static inline int ath9k_dump_btcoex(stru
+ void ath_init_leds(struct ath_softc *sc);
+ void ath_deinit_leds(struct ath_softc *sc);
+ void ath_fill_led_pin(struct ath_softc *sc);
++int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
++                        const char *trigger, bool active_low);
++
+ #else
+ static inline void ath_init_leds(struct ath_softc *sc)
+ {
+@@ -952,6 +955,13 @@ void ath_ant_comb_scan(struct ath_softc 
+ 
+ #define ATH9K_NUM_CHANCTX  2 /* supports 2 operating channels */
+ 
++struct ath_led {
++	struct list_head list;
++	struct ath_softc *sc;
++	const struct gpio_led *gpio;
++	struct led_classdev cdev;
++};
++
+ struct ath_softc {
+ 	struct ieee80211_hw *hw;
+ 	struct device *dev;
+@@ -1003,9 +1013,8 @@ struct ath_softc {
+ 	spinlock_t chan_lock;
+ 
+ #ifdef CPTCFG_MAC80211_LEDS
+-	bool led_registered;
+-	char led_name[32];
+-	struct led_classdev led_cdev;
++	const char *led_default_trigger;
++	struct list_head leds;
+ #endif
+ 
+ #ifdef CPTCFG_ATH9K_DEBUGFS
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -24,40 +24,102 @@
+ static void ath_led_brightness(struct led_classdev *led_cdev,
+ 			       enum led_brightness brightness)
+ {
+-	struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
+-	ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, (brightness == LED_OFF));
++	struct ath_led *led = container_of(led_cdev, struct ath_led, cdev);
++	struct ath_softc *sc = led->sc;
++
++	ath9k_ps_wakeup(sc);
++	ath9k_hw_set_gpio(sc->sc_ah, led->gpio->gpio,
++			  (brightness != LED_OFF) ^ led->gpio->active_low);
++	ath9k_ps_restore(sc);
++}
++
++static int ath_add_led(struct ath_softc *sc, struct ath_led *led)
++{
++	const struct gpio_led *gpio = led->gpio;
++	int ret;
++
++	led->cdev.name = gpio->name;
++	led->cdev.default_trigger = gpio->default_trigger;
++	led->cdev.brightness_set = ath_led_brightness;
++
++	ret = led_classdev_register(wiphy_dev(sc->hw->wiphy), &led->cdev);
++	if (ret < 0)
++		return ret;
++
++	led->sc = sc;
++	list_add(&led->list, &sc->leds);
++
++	/* Configure gpio for output */
++	ath9k_hw_cfg_output(sc->sc_ah, gpio->gpio,
++			    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
++
++	/* LED off */
++	ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
++
++	return 0;
++}
++
++int ath_create_gpio_led(struct ath_softc *sc, int gpio_num, const char *name,
++			const char *trigger, bool active_low)
++{
++	struct ath_led *led;
++	struct gpio_led *gpio;
++	char *_name;
++	int ret;
++
++	led = kzalloc(sizeof(*led) + sizeof(*gpio) + strlen(name) + 1,
++		      GFP_KERNEL);
++	if (!led)
++		return -ENOMEM;
++
++	led->gpio = gpio = (struct gpio_led *) (led + 1);
++	_name = (char *) (led->gpio + 1);
++
++	strcpy(_name, name);
++	gpio->name = _name;
++	gpio->gpio = gpio_num;
++	gpio->active_low = active_low;
++	gpio->default_trigger = trigger;
++
++	ret = ath_add_led(sc, led);
++	if (unlikely(ret < 0))
++		kfree(led);
++
++	return ret;
+ }
+ 
+ void ath_deinit_leds(struct ath_softc *sc)
+ {
+-	if (!sc->led_registered)
+-		return;
++	struct ath_led *led;
+ 
+-	ath_led_brightness(&sc->led_cdev, LED_OFF);
+-	led_classdev_unregister(&sc->led_cdev);
++	while (!list_empty(&sc->leds)) {
++		led = list_first_entry(&sc->leds, struct ath_led, list);
++		list_del(&led->list);
++		ath_led_brightness(&led->cdev, LED_OFF);
++		led_classdev_unregister(&led->cdev);
++		kfree(led);
++	}
+ }
+ 
+ void ath_init_leds(struct ath_softc *sc)
+ {
+-	int ret;
++	char led_name[32];
++	const char *trigger;
++
++	INIT_LIST_HEAD(&sc->leds);
+ 
+ 	if (AR_SREV_9100(sc->sc_ah))
+ 		return;
+ 
+-	if (!led_blink)
+-		sc->led_cdev.default_trigger =
+-			ieee80211_get_radio_led_name(sc->hw);
+-
+-	snprintf(sc->led_name, sizeof(sc->led_name),
+-		"ath9k-%s", wiphy_name(sc->hw->wiphy));
+-	sc->led_cdev.name = sc->led_name;
+-	sc->led_cdev.brightness_set = ath_led_brightness;
++	snprintf(led_name, sizeof(led_name), "ath9k-%s",
++		 wiphy_name(sc->hw->wiphy));
+ 
+-	ret = led_classdev_register(wiphy_dev(sc->hw->wiphy), &sc->led_cdev);
+-	if (ret < 0)
+-		return;
++	if (led_blink)
++		trigger = sc->led_default_trigger;
++	else
++		trigger = ieee80211_get_radio_led_name(sc->hw);
+ 
+-	sc->led_registered = true;
++	ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, 1);
+ }
+ 
+ void ath_fill_led_pin(struct ath_softc *sc)
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -903,7 +903,7 @@ int ath9k_init_device(u16 devid, struct 
+ 
+ #ifdef CPTCFG_MAC80211_LEDS
+ 	/* must be initialized before ieee80211_register_hw */
+-	sc->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(sc->hw,
++	sc->led_default_trigger = ieee80211_create_tpt_led_trigger(sc->hw,
+ 		IEEE80211_TPT_LEDTRIG_FL_RADIO, ath9k_tpt_blink,
+ 		ARRAY_SIZE(ath9k_tpt_blink));
+ #endif
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1406,6 +1406,61 @@ static const struct file_operations fops
+ 	.llseek = default_llseek,
+ };
+ 
++#ifdef CONFIG_MAC80211_LEDS
++
++static ssize_t write_file_gpio_led(struct file *file, const char __user *ubuf,
++				   size_t count, loff_t *ppos)
++{
++	struct ath_softc *sc = file->private_data;
++	char buf[32], *str, *name, *c;
++	ssize_t len;
++	unsigned int gpio;
++	bool active_low = false;
++
++	len = min(count, sizeof(buf) - 1);
++	if (copy_from_user(buf, ubuf, len))
++		return -EFAULT;
++
++	buf[len] = '\0';
++	name = strchr(buf, ',');
++	if (!name)
++		return -EINVAL;
++
++	*(name++) = 0;
++	if (!*name)
++		return -EINVAL;
++
++	c = strchr(name, '\n');
++	if (c)
++		*c = 0;
++
++	str = buf;
++	if (*str == '!') {
++		str++;
++		active_low = true;
++	}
++
++	if (kstrtouint(str, 0, &gpio) < 0)
++		return -EINVAL;
++
++	if (gpio >= sc->sc_ah->caps.num_gpio_pins)
++		return -EINVAL;
++
++	if (ath_create_gpio_led(sc, gpio, name, NULL, active_low) < 0)
++		return -EINVAL;
++
++	return count;
++}
++
++static const struct file_operations fops_gpio_led = {
++	.write = write_file_gpio_led,
++	.open = simple_open,
++	.owner = THIS_MODULE,
++	.llseek = default_llseek,
++};
++
++#endif
++
+ 
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+@@ -1430,6 +1485,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 			    &fops_eeprom);
+ 	debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+ 			    sc, &fops_chanbw);
++#ifdef CONFIG_MAC80211_LEDS
++	debugfs_create_file("gpio_led", S_IWUSR,
++			   sc->debug.debugfs_phy, sc, &fops_gpio_led);
++#endif
+ 	debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_dma);
+ 	debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
diff --git a/trunk/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch b/trunk/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
new file mode 100644
index 00000000..dc33cd02
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
@@ -0,0 +1,71 @@
+--- a/include/linux/ath9k_platform.h
++++ b/include/linux/ath9k_platform.h
+@@ -41,6 +41,9 @@ struct ath9k_platform_data {
+ 	int (*external_reset)(void);
+ 
+ 	bool use_eeprom;
++
++	int num_leds;
++	const struct gpio_led *leds;
+ };
+ 
+ #endif /* _LINUX_ATH9K_PLATFORM_H */
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include "ath9k.h"
++#include <linux/ath9k_platform.h>
+ 
+ /********************************/
+ /*	 LED functions		*/
+@@ -88,6 +89,24 @@ int ath_create_gpio_led(struct ath_softc
+ 	return ret;
+ }
+ 
++static int ath_create_platform_led(struct ath_softc *sc,
++				   const struct gpio_led *gpio)
++{
++	struct ath_led *led;
++	int ret;
++
++	led = kzalloc(sizeof(*led), GFP_KERNEL);
++	if (!led)
++		return -ENOMEM;
++
++	led->gpio = gpio;
++	ret = ath_add_led(sc, led);
++	if (ret < 0)
++		kfree(led);
++
++	return ret;
++}
++
+ void ath_deinit_leds(struct ath_softc *sc)
+ {
+ 	struct ath_led *led;
+@@ -103,8 +122,10 @@ void ath_deinit_leds(struct ath_softc *s
+ 
+ void ath_init_leds(struct ath_softc *sc)
+ {
++	struct ath9k_platform_data *pdata = sc->dev->platform_data;
+ 	char led_name[32];
+ 	const char *trigger;
++	int i;
+ 
+ 	INIT_LIST_HEAD(&sc->leds);
+ 
+@@ -120,6 +141,12 @@ void ath_init_leds(struct ath_softc *sc)
+ 		trigger = ieee80211_get_radio_led_name(sc->hw);
+ 
+ 	ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, 1);
++
++	if (!pdata)
++		return;
++
++	for (i = 0; i < pdata->num_leds; i++)
++		ath_create_platform_led(sc, &pdata->leds[i]);
+ }
+ 
+ void ath_fill_led_pin(struct ath_softc *sc)
diff --git a/trunk/package/kernel/mac80211/patches/540-ath9k_reduce_ani_interval.patch b/trunk/package/kernel/mac80211/patches/540-ath9k_reduce_ani_interval.patch
new file mode 100644
index 00000000..e8999034
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/540-ath9k_reduce_ani_interval.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/ath/ath9k/ani.h
++++ b/drivers/net/wireless/ath/ath9k/ani.h
+@@ -42,7 +42,7 @@
+ #define ATH9K_ANI_PERIOD                  300
+ 
+ /* in ms */
+-#define ATH9K_ANI_POLLINTERVAL            1000
++#define ATH9K_ANI_POLLINTERVAL            300
+ 
+ #define ATH9K_SIG_FIRSTEP_SETTING_MIN     0
+ #define ATH9K_SIG_FIRSTEP_SETTING_MAX     20
diff --git a/trunk/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch b/trunk/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
new file mode 100644
index 00000000..b01555c3
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
@@ -0,0 +1,28 @@
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -693,7 +693,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
+ {
+ #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
+ 	struct ath_common *common = ath9k_hw_common(ah);
+-	u32 mac_status, last_mac_status = 0;
++	u32 mac_status = 0, last_mac_status = 0;
+ 	int i;
+ 
+ 	/* Enable access to the DMA observation bus */
+@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
+ 	}
+ 
+ 	if (i == 0) {
++		if (!AR_SREV_9300_20_OR_LATER(ah) &&
++		    (mac_status & 0x700) == 0) {
++			/*
++			 * DMA is idle but the MAC is still stuck
++			 * processing events
++			 */
++			*reset = true;
++			return true;
++		}
++
+ 		ath_err(common,
+ 			"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
+ 			AH_RX_STOP_DMA_TIMEOUT / 1000,
diff --git a/trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
new file mode 100644
index 00000000..34d698ba
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
@@ -0,0 +1,139 @@
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1462,6 +1462,50 @@ static const struct file_operations fops
+ #endif
+ 
+ 
++static ssize_t read_file_diag(struct file *file, char __user *user_buf,
++			     size_t count, loff_t *ppos)
++{
++	struct ath_softc *sc = file->private_data;
++	struct ath_hw *ah = sc->sc_ah;
++	char buf[32];
++	unsigned int len;
++
++	len = sprintf(buf, "0x%08lx\n", ah->diag);
++	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
++}
++
++static ssize_t write_file_diag(struct file *file, const char __user *user_buf,
++			     size_t count, loff_t *ppos)
++{
++	struct ath_softc *sc = file->private_data;
++	struct ath_hw *ah = sc->sc_ah;
++	unsigned long diag;
++	char buf[32];
++	ssize_t len;
++
++	len = min(count, sizeof(buf) - 1);
++	if (copy_from_user(buf, user_buf, len))
++		return -EFAULT;
++
++	buf[len] = '\0';
++	if (kstrtoul(buf, 0, &diag))
++		return -EINVAL;
++
++	ah->diag = diag;
++	ath9k_hw_update_diag(ah);
++
++	return count;
++}
++
++static const struct file_operations fops_diag = {
++	.read = read_file_diag,
++	.write = write_file_diag,
++	.open = simple_open,
++	.owner = THIS_MODULE,
++	.llseek = default_llseek,
++};
++
++
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+ 	struct ath_common *common = ath9k_hw_common(ah);
+@@ -1489,6 +1533,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 	debugfs_create_file("gpio_led", S_IWUSR,
+ 			   sc->debug.debugfs_phy, sc, &fops_gpio_led);
+ #endif
++	debugfs_create_file("diag", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
++			    sc, &fops_diag);
+ 	debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_dma);
+ 	debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -490,6 +490,12 @@ enum {
+ 	ATH9K_RESET_COLD,
+ };
+ 
++enum {
++	ATH_DIAG_DISABLE_RX,
++	ATH_DIAG_DISABLE_TX,
++	ATH_DIAG_TRIGGER_ERROR,
++};
++
+ struct ath9k_hw_version {
+ 	u32 magic;
+ 	u16 devid;
+@@ -769,6 +775,8 @@ struct ath_hw {
+ 	u32 rfkill_polarity;
+ 	u32 ah_flags;
+ 
++	unsigned long diag;
++
+ 	bool reset_power_on;
+ 	bool htc_reset_init;
+ 
+@@ -1025,6 +1033,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
+ bool ath9k_hw_check_alive(struct ath_hw *ah);
+ 
+ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
++void ath9k_hw_update_diag(struct ath_hw *ah);
+ 
+ /* Generic hw timer primitives */
+ struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1753,6 +1753,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
+ }
+ EXPORT_SYMBOL(ath9k_hw_get_tsf_offset);
+ 
++void ath9k_hw_update_diag(struct ath_hw *ah)
++{
++	if (test_bit(ATH_DIAG_DISABLE_RX, &ah->diag))
++		REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
++	else
++		REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
++
++	if (test_bit(ATH_DIAG_DISABLE_TX, &ah->diag))
++		REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_LOOP_BACK);
++	else
++		REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_LOOP_BACK);
++}
++EXPORT_SYMBOL(ath9k_hw_update_diag);
++
+ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
+ 		   struct ath9k_hw_cal_data *caldata, bool fastcc)
+ {
+@@ -1957,6 +1971,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ 		ar9003_hw_disable_phy_restart(ah);
+ 
+ 	ath9k_hw_apply_gpio_override(ah);
++	ath9k_hw_update_diag(ah);
+ 
+ 	if (AR_SREV_9565(ah) && common->bt_ant_diversity)
+ 		REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -532,6 +532,11 @@ irqreturn_t ath_isr(int irq, void *dev)
+ 	if (AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
+ 		return IRQ_HANDLED;
+ 
++	if (test_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag)) {
++		status |= ATH9K_INT_FATAL;
++		clear_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag);
++	}
++
+ 	/*
+ 	 * If there are no status bits set, then this interrupt was not
+ 	 * for me (should have been caught above).
diff --git a/trunk/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/trunk/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
new file mode 100644
index 00000000..89f89ece
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
@@ -0,0 +1,186 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -686,6 +686,7 @@ struct ath_spec_scan {
+  * @config_pci_powersave:
+  * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
+  *
++ * @get_adc_entropy: get entropy from the raw ADC I/Q output
+  * @spectral_scan_config: set parameters for spectral scan and enable/disable it
+  * @spectral_scan_trigger: trigger a spectral scan run
+  * @spectral_scan_wait: wait for a spectral scan run to finish
+@@ -708,6 +709,7 @@ struct ath_hw_ops {
+ 			struct ath_hw_antcomb_conf *antconf);
+ 	void (*antdiv_comb_conf_set)(struct ath_hw *ah,
+ 			struct ath_hw_antcomb_conf *antconf);
++	void (*get_adc_entropy)(struct ath_hw *ah, u8 *buf, size_t len);
+ 	void (*spectral_scan_config)(struct ath_hw *ah,
+ 				     struct ath_spec_scan *param);
+ 	void (*spectral_scan_trigger)(struct ath_hw *ah);
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -1799,6 +1799,26 @@ static void ar9003_hw_tx99_set_txpower(s
+ 		  ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14],  0));
+ }
+ 
++static void ar9003_hw_get_adc_entropy(struct ath_hw *ah, u8 *buf, size_t len)
++{
++	int i, j;
++
++	REG_RMW_FIELD(ah, AR_PHY_TEST, AR_PHY_TEST_BBB_OBS_SEL, 1);
++	REG_CLR_BIT(ah, AR_PHY_TEST, AR_PHY_TEST_RX_OBS_SEL_BIT5);
++	REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS, AR_PHY_TEST_CTL_RX_OBS_SEL, 0);
++
++	memset(buf, 0, len);
++	for (i = 0; i < len; i++) {
++		for (j = 0; j < 4; j++) {
++			u32 regval = REG_READ(ah, AR_PHY_TST_ADC);
++
++			buf[i] <<= 2;
++			buf[i] |= (regval & 1) | ((regval & BIT(10)) >> 9);
++			udelay(1);
++		}
++	}
++}
++
+ void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
+ {
+ 	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+@@ -1834,6 +1854,7 @@ void ar9003_hw_attach_phy_ops(struct ath
+ 	priv_ops->set_radar_params = ar9003_hw_set_radar_params;
+ 	priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;
+ 
++	ops->get_adc_entropy = ar9003_hw_get_adc_entropy;
+ 	ops->antdiv_comb_conf_get = ar9003_hw_antdiv_comb_conf_get;
+ 	ops->antdiv_comb_conf_set = ar9003_hw_antdiv_comb_conf_set;
+ 	ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -672,7 +672,8 @@ static void ath9k_init_txpower_limits(st
+ 	if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
+ 		ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
+ 
+-	ah->curchan = curchan;
++	if (curchan)
++		ah->curchan = curchan;
+ }
+ 
+ static const struct ieee80211_iface_limit if_limits[] = {
+@@ -863,6 +864,18 @@ static void ath9k_set_hw_capab(struct at
+ 	SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
+ }
+ 
++static void ath_get_initial_entropy(struct ath_softc *sc)
++{
++	struct ath_hw *ah = sc->sc_ah;
++	char buf[256];
++
++	/* reuse last channel initialized by the tx power test */
++	ath9k_hw_reset(ah, ah->curchan, NULL, false);
++
++	ath9k_hw_get_adc_entropy(ah, buf, sizeof(buf));
++	add_device_randomness(buf, sizeof(buf));
++}
++
+ int ath9k_init_device(u16 devid, struct ath_softc *sc,
+ 		    const struct ath_bus_ops *bus_ops)
+ {
+@@ -908,6 +921,8 @@ int ath9k_init_device(u16 devid, struct 
+ 		ARRAY_SIZE(ath9k_tpt_blink));
+ #endif
+ 
++	ath_get_initial_entropy(sc);
++
+ 	/* Register with mac80211 */
+ 	error = ieee80211_register_hw(hw);
+ 	if (error)
+--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
++++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
+@@ -100,6 +100,12 @@ static inline void ath9k_hw_tx99_set_txp
+ 		ath9k_hw_ops(ah)->tx99_set_txpower(ah, power);
+ }
+ 
++static inline void ath9k_hw_get_adc_entropy(struct ath_hw *ah,
++		u8 *buf, size_t len)
++{
++	ath9k_hw_ops(ah)->get_adc_entropy(ah, buf, len);
++}
++
+ #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
+ 
+ static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
+--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+@@ -1235,9 +1235,30 @@ static void ar5008_hw_set_radar_conf(str
+ 	conf->radar_inband = 8;
+ }
+ 
++static void ar5008_hw_get_adc_entropy(struct ath_hw *ah, u8 *buf, size_t len)
++{
++	int i, j;
++
++	REG_RMW_FIELD(ah, AR_PHY_TEST, AR_PHY_TEST_BBB_OBS_SEL, 1);
++	REG_CLR_BIT(ah, AR_PHY_TEST, AR_PHY_TEST_RX_OBS_SEL_BIT5);
++	REG_RMW_FIELD(ah, AR_PHY_TEST2, AR_PHY_TEST2_RX_OBS_SEL, 0);
++
++	memset(buf, 0, len);
++	for (i = 0; i < len; i++) {
++		for (j = 0; j < 4; j++) {
++			u32 regval = REG_READ(ah, AR_PHY_TST_ADC);
++
++			buf[i] <<= 2;
++			buf[i] |= (regval & 1) | ((regval & BIT(9)) >> 8);
++			udelay(1);
++		}
++	}
++}
++
+ int ar5008_hw_attach_phy_ops(struct ath_hw *ah)
+ {
+ 	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
++	struct ath_hw_ops *ops = ath9k_hw_ops(ah);
+ 	static const u32 ar5416_cca_regs[6] = {
+ 		AR_PHY_CCA,
+ 		AR_PHY_CH1_CCA,
+@@ -1252,6 +1273,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
+ 	if (ret)
+ 	    return ret;
+ 
++	ops->get_adc_entropy = ar5008_hw_get_adc_entropy;
++
+ 	priv_ops->rf_set_freq = ar5008_hw_set_channel;
+ 	priv_ops->spur_mitigate_freq = ar5008_hw_spur_mitigate;
+ 
+--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.h
++++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
+@@ -20,6 +20,12 @@
+ #define PHY_AGC_CLR             0x10000000
+ #define RFSILENT_BB             0x00002000
+ 
++#define AR_PHY_TEST_BBB_OBS_SEL       0x780000
++#define AR_PHY_TEST_BBB_OBS_SEL_S     19
++
++#define AR_PHY_TEST_RX_OBS_SEL_BIT5_S 23
++#define AR_PHY_TEST_RX_OBS_SEL_BIT5   (1 << AR_PHY_TEST_RX_OBS_SEL_BIT5_S)
++
+ #define AR_PHY_TURBO                0x9804
+ #define AR_PHY_FC_TURBO_MODE        0x00000001
+ #define AR_PHY_FC_TURBO_SHORT       0x00000002
+@@ -36,6 +42,9 @@
+ 
+ #define AR_PHY_TEST2			0x9808
+ 
++#define AR_PHY_TEST2_RX_OBS_SEL        0x3C00
++#define AR_PHY_TEST2_RX_OBS_SEL_S      10
++
+ #define AR_PHY_TIMING2           0x9810
+ #define AR_PHY_TIMING3           0x9814
+ #define AR_PHY_TIMING3_DSC_MAN   0xFFFE0000
+@@ -390,6 +399,8 @@
+ #define AR_PHY_RFBUS_GRANT       0x9C20
+ #define AR_PHY_RFBUS_GRANT_EN    0x00000001
+ 
++#define AR_PHY_TST_ADC      0x9C24
++
+ #define AR_PHY_CHAN_INFO_GAIN_DIFF             0x9CF4
+ #define AR_PHY_CHAN_INFO_GAIN_DIFF_UPPER_LIMIT 320
+ 
diff --git a/trunk/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch b/trunk/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
new file mode 100644
index 00000000..68d121a4
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
@@ -0,0 +1,79 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -215,6 +215,19 @@ void ath9k_hw_get_channel_centers(struct
+ 		centers->synth_center + (extoff * HT40_CHANNEL_CENTER_SHIFT);
+ }
+ 
++static inline void ath9k_hw_disable_pll_lock_detect(struct ath_hw *ah)
++{
++	/* On AR9330 and AR9340 devices, some PHY registers must be
++	 * tuned to gain better stability/performance. These registers
++	 * might be changed while doing wlan reset so the registers must
++	 * be reprogrammed after each reset.
++	 */
++	REG_CLR_BIT(ah, AR_PHY_USB_CTRL1, BIT(20));
++	REG_RMW(ah, AR_PHY_USB_CTRL2,
++		(1 << 21) | (0xf << 22),
++		(1 << 21) | (0x3 << 22));
++}
++
+ /******************/
+ /* Chip Revisions */
+ /******************/
+@@ -1338,6 +1351,9 @@ static bool ath9k_hw_set_reset(struct at
+ 	if (AR_SREV_9100(ah))
+ 		udelay(50);
+ 
++	if (AR_SREV_9330(ah) || AR_SREV_9340(ah))
++		ath9k_hw_disable_pll_lock_detect(ah);
++
+ 	return true;
+ }
+ 
+@@ -1437,6 +1453,9 @@ static bool ath9k_hw_chip_reset(struct a
+ 		ar9003_hw_internal_regulator_apply(ah);
+ 	ath9k_hw_init_pll(ah, chan);
+ 
++	if (AR_SREV_9330(ah) || AR_SREV_9340(ah))
++		ath9k_hw_disable_pll_lock_detect(ah);
++
+ 	return true;
+ }
+ 
+@@ -1731,8 +1750,14 @@ static int ath9k_hw_do_fastcc(struct ath
+ 	if (AR_SREV_9271(ah))
+ 		ar9002_hw_load_ani_reg(ah, chan);
+ 
++	if (AR_SREV_9330(ah) || AR_SREV_9340(ah))
++		ath9k_hw_disable_pll_lock_detect(ah);
++
+ 	return 0;
+ fail:
++	if (AR_SREV_9330(ah) || AR_SREV_9340(ah))
++		ath9k_hw_disable_pll_lock_detect(ah);
++
+ 	return -EINVAL;
+ }
+ 
+@@ -1982,6 +2007,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ 		ath9k_hw_set_radar_params(ah);
+ 	}
+ 
++	if (AR_SREV_9330(ah) || AR_SREV_9340(ah))
++		ath9k_hw_disable_pll_lock_detect(ah);
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(ath9k_hw_reset);
+--- a/drivers/net/wireless/ath/ath9k/phy.h
++++ b/drivers/net/wireless/ath/ath9k/phy.h
+@@ -48,6 +48,9 @@
+ #define AR_PHY_PLL_CONTROL 0x16180
+ #define AR_PHY_PLL_MODE 0x16184
+ 
++#define AR_PHY_USB_CTRL1	0x16c84
++#define AR_PHY_USB_CTRL2	0x16c88
++
+ enum ath9k_ant_div_comb_lna_conf {
+ 	ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2,
+ 	ATH_ANT_DIV_COMB_LNA2,
diff --git a/trunk/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch b/trunk/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
new file mode 100644
index 00000000..5db8c4a5
--- /dev/null
+++ b/trunk/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
@@ -0,0 +1,155 @@
+--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+@@ -929,55 +929,6 @@ static bool ar5008_hw_ani_control_new(st
+ 		 * on == 0 means more noise imm
+ 		 */
+ 		u32 on = param ? 1 : 0;
+-		/*
+-		 * make register setting for default
+-		 * (weak sig detect ON) come from INI file
+-		 */
+-		int m1ThreshLow = on ?
+-			aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
+-		int m2ThreshLow = on ?
+-			aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
+-		int m1Thresh = on ?
+-			aniState->iniDef.m1Thresh : m1Thresh_off;
+-		int m2Thresh = on ?
+-			aniState->iniDef.m2Thresh : m2Thresh_off;
+-		int m2CountThr = on ?
+-			aniState->iniDef.m2CountThr : m2CountThr_off;
+-		int m2CountThrLow = on ?
+-			aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
+-		int m1ThreshLowExt = on ?
+-			aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
+-		int m2ThreshLowExt = on ?
+-			aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
+-		int m1ThreshExt = on ?
+-			aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
+-		int m2ThreshExt = on ?
+-			aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
+-
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-			      AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
+-			      m1ThreshLow);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-			      AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
+-			      m2ThreshLow);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-			      AR_PHY_SFCORR_M1_THRESH, m1Thresh);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-			      AR_PHY_SFCORR_M2_THRESH, m2Thresh);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-			      AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-			      AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
+-			      m2CountThrLow);
+-
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
+ 
+ 		if (on)
+ 			REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -26,20 +26,6 @@ static const int cycpwrThr1_table[] =
+ /* level:  0   1   2   3   4   5   6   7   8  */
+ 	{ -6, -4, -2,  0,  2,  4,  6,  8 };     /* lvl 0-7, default 3 */
+ 
+-/*
+- * register values to turn OFDM weak signal detection OFF
+- */
+-static const int m1ThreshLow_off = 127;
+-static const int m2ThreshLow_off = 127;
+-static const int m1Thresh_off = 127;
+-static const int m2Thresh_off = 127;
+-static const int m2CountThr_off =  31;
+-static const int m2CountThrLow_off =  63;
+-static const int m1ThreshLowExt_off = 127;
+-static const int m2ThreshLowExt_off = 127;
+-static const int m1ThreshExt_off = 127;
+-static const int m2ThreshExt_off = 127;
+-
+ /**
+  * ar9003_hw_set_channel - set channel on single-chip device
+  * @ah: atheros hardware structure
+@@ -984,11 +970,6 @@ static bool ar9003_hw_ani_control(struct
+ 	struct ath_common *common = ath9k_hw_common(ah);
+ 	struct ath9k_channel *chan = ah->curchan;
+ 	struct ar5416AniState *aniState = &ah->ani;
+-	int m1ThreshLow, m2ThreshLow;
+-	int m1Thresh, m2Thresh;
+-	int m2CountThr, m2CountThrLow;
+-	int m1ThreshLowExt, m2ThreshLowExt;
+-	int m1ThreshExt, m2ThreshExt;
+ 	s32 value, value2;
+ 
+ 	switch (cmd & ah->ani_function) {
+@@ -1002,61 +983,6 @@ static bool ar9003_hw_ani_control(struct
+ 		 */
+ 		u32 on = param ? 1 : 0;
+ 
+-		if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
+-			goto skip_ws_det;
+-
+-		m1ThreshLow = on ?
+-			aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
+-		m2ThreshLow = on ?
+-			aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
+-		m1Thresh = on ?
+-			aniState->iniDef.m1Thresh : m1Thresh_off;
+-		m2Thresh = on ?
+-			aniState->iniDef.m2Thresh : m2Thresh_off;
+-		m2CountThr = on ?
+-			aniState->iniDef.m2CountThr : m2CountThr_off;
+-		m2CountThrLow = on ?
+-			aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
+-		m1ThreshLowExt = on ?
+-			aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
+-		m2ThreshLowExt = on ?
+-			aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
+-		m1ThreshExt = on ?
+-			aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
+-		m2ThreshExt = on ?
+-			aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
+-
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-			      AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
+-			      m1ThreshLow);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-			      AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
+-			      m2ThreshLow);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-			      AR_PHY_SFCORR_M1_THRESH,
+-			      m1Thresh);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-			      AR_PHY_SFCORR_M2_THRESH,
+-			      m2Thresh);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
+-			      AR_PHY_SFCORR_M2COUNT_THR,
+-			      m2CountThr);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
+-			      AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
+-			      m2CountThrLow);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M1_THRESH_LOW,
+-			      m1ThreshLowExt);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M2_THRESH_LOW,
+-			      m2ThreshLowExt);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M1_THRESH,
+-			      m1ThreshExt);
+-		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
+-			      AR_PHY_SFCORR_EXT_M2_THRESH,
+-			      m2ThreshExt);
+-skip_ws_det:
+ 		if (on)
+ 			REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
+ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
diff --git a/trunk/package/kernel/mac80211/scripts/import-backports.sh b/trunk/package/kernel/mac80211/scripts/import-backports.sh
new file mode 100755
index 00000000..d056eb6d
--- /dev/null
+++ b/trunk/package/kernel/mac80211/scripts/import-backports.sh
@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+BASE=$1; shift
+
+usage() {
+	echo "Usage: $0 NNN <file>..."
+	exit 1
+}
+
+check_number() {
+	case "$1" in
+		[0-9][0-9][0-9]) return 0;;
+	esac
+	return 1;
+}
+
+patch_header()
+{
+	awk '
+	/^(---|\*\*\*|Index:)[ \t][^ \t]|^diff -/ \
+		{ exit }
+		{ print }
+	'
+}
+
+strip_diffstat()
+{
+	awk '
+	/#? .* \| / \
+		{ eat = eat $0 "\n"
+		  next }
+	/^#? .* files? changed(, .* insertions?\(\+\))?(, .* deletions?\(-\))?/ \
+		{ eat = ""
+		  next }
+		{ print eat $0
+		  eat = "" }
+	'
+}
+
+strip_trailing_whitespace() {
+	sed -e 's:[ '$'\t'']*$::'
+}
+
+fixup_header() {
+	awk '
+		/^From / { next }
+		/^Subject: / {
+			sub("Subject: \\[[^\]]*\\]", "Subject: [PATCH]")
+		}
+		{ print }
+	'
+}
+
+check_number "$BASE" || usage
+
+quilt series > /dev/null || {
+	echo "Not in quilt directory"
+	exit 2
+}
+
+get_next() {
+	NEW=$BASE
+	quilt series | while read CUR; do
+		[ -n "$CUR" ] || break
+		CUR=${CUR%%-*}
+		check_number "$CUR" || continue
+		[ "$CUR" -lt "$NEW" ] && continue
+		[ "$CUR" -ge "$(($BASE + 100))" ] && continue
+		NEW="$(($CUR + 1))"
+		echo $NEW
+	done | tail -n1
+}
+
+CUR=`get_next`
+CUR="${CUR:-$BASE}"
+
+while [ -n "$1" ]; do
+	FILE="$1"; shift
+	NAME="$(basename $FILE)"
+	NAME="${NAME#[0-9]*-}"
+	echo -n "Processing patch $NAME: "
+
+	[ -e "$FILE" ] || {
+		echo "file $FILE not found"
+		exit 1
+	}
+
+	grep -qE "$NAME$" patches/series && {
+		echo "already applied"
+		continue
+	}
+
+	quilt new "$CUR-$NAME" || exit 1
+	patch_header < "$FILE" |
+		strip_diffstat |
+		strip_trailing_whitespace |
+		fixup_header > "patches/$CUR-$NAME"
+
+	quilt fold < "$FILE" || {
+		cp "$FILE" ./cur_patch
+		echo "patch $FILE failed to apply, copied to ./cur_patch"
+		exit 1
+	}
+
+	quilt refresh -p ab --no-index --no-timestamps
+
+	CUR="$(($CUR + 1))"
+done
+
+exit 0
diff --git a/trunk/package/kernel/mmc_over_gpio/Makefile b/trunk/package/kernel/mmc_over_gpio/Makefile
new file mode 100644
index 00000000..69985a75
--- /dev/null
+++ b/trunk/package/kernel/mmc_over_gpio/Makefile
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mmc-over-gpio
+PKG_RELEASE:=4
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define KernelPackage/mmc-over-gpio
+  SUBMENU:=Other modules
+  DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio-old +kmod-fs-configfs
+  KCONFIG:=CONFIG_GPIOMMC
+  TITLE:=MMC/SD card over GPIO support
+  FILES:=$(LINUX_DIR)/drivers/mmc/host/gpiommc.ko
+  AUTOLOAD:=$(call AutoProbe,gpiommc)
+  MENU:=1
+endef
+
+define Package/kmod-mmc-over-gpio/config
+	menu "Configuration"
+		depends on PACKAGE_kmod-mmc-over-gpio
+
+	config KMOD_MMC_OVER_GPIO_DI_PIN
+		int "GPIO DI (Data-In) pin"
+		default 1
+
+	config KMOD_MMC_OVER_GPIO_DO_PIN
+		int "GPIO DO (Data-Out) pin"
+		default 3
+
+	config KMOD_MMC_OVER_GPIO_CLK_PIN
+		int "GPIO CLK (Clock) pin"
+		default 4
+
+	config KMOD_MMC_OVER_GPIO_CS_PIN
+		int "GPIO CS (Chip-Select) pin"
+		default 7
+
+	endmenu
+endef
+
+define KernelPackage/mmc-over-gpio/description
+ Support for driving an MMC/SD card over GPIO pins via SPI.
+endef
+
+define KernelPackage/mmc-over-gpio/conffiles
+/etc/config/mmc_over_gpio
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile
+endef
+
+define KernelPackage/mmc-over-gpio/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/mmc_over_gpio.config $(1)/etc/config/mmc_over_gpio
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/mmc_over_gpio.init $(1)/etc/init.d/mmc_over_gpio
+
+	$(SED) 's,@GPIO_DI_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_DI_PIN),g' \
+		-e 's,@GPIO_DO_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_DO_PIN),g' \
+		-e 's,@GPIO_CLK_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_CLK_PIN),g' \
+		-e 's,@GPIO_CS_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_CS_PIN),g' \
+		$(1)/etc/config/mmc_over_gpio
+endef
+
+$(eval $(call KernelPackage,mmc-over-gpio))
diff --git a/trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.config b/trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.config
new file mode 100644
index 00000000..23f00848
--- /dev/null
+++ b/trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.config
@@ -0,0 +1,8 @@
+config 'mmc_over_gpio'
+	option 'name' 'default'
+	option 'enabled' '0'
+	option 'DI_pin' '@GPIO_DI_PIN@'
+	option 'DO_pin' '@GPIO_DO_PIN@'
+	option 'CLK_pin' '@GPIO_CLK_PIN@'
+	option 'CS_pin' '@GPIO_CS_PIN@'
+	option 'mode' '0'
diff --git a/trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.init b/trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.init
new file mode 100644
index 00000000..121c8039
--- /dev/null
+++ b/trunk/package/kernel/mmc_over_gpio/files/mmc_over_gpio.init
@@ -0,0 +1,83 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008 OpenWrt.org
+START=90
+
+CONFIGFS_DIR="/config/gpiommc"
+
+# add_device(name, DI_pin, DO_pin, CLK_pin, CS_pin, mode)
+add_device() {
+	local dir="$CONFIGFS_DIR/$1"
+
+	mkdir -p $dir
+	[ $? -eq 0 ] || return 1
+	echo $2 > $dir/gpio_data_in
+	[ $? -eq 0 ] || return 1
+	echo $3 > $dir/gpio_data_out
+	[ $? -eq 0 ] || return 1
+	echo $4 > $dir/gpio_clock
+	[ $? -eq 0 ] || return 1
+	echo $5 > $dir/gpio_chipselect
+	[ $? -eq 0 ] || return 1
+	echo $6 > $dir/spi_mode
+	[ $? -eq 0 ] || return 1
+	# XXX We have more config options available. Use defaults for now.
+
+	echo 1 > $dir/register
+	[ $? -eq 0 ] || return 1
+
+	return 0
+}
+
+# remove_device(name)
+remove_device() {
+	local dir="$CONFIGFS_DIR/$1"
+
+	rmdir $dir
+}
+
+mount_configfs() {
+	# FIXME: This should probably be done somewhere else.
+	mount | grep configfs
+	if [ $? -eq 0 ]; then
+		# already mounted
+		return 0
+	fi
+	mkdir -p /config
+	[ $? -eq 0 ] || return 1
+	mount configfs -t configfs /config
+	[ $? -eq 0 ] || return 1
+
+	return 0
+}
+
+start_service() {
+	local section="$1"
+	config_get "name" "$section" "name"
+	config_get "DI_pin" "$section" "DI_pin"
+	config_get "DO_pin" "$section" "DO_pin"
+	config_get "CLK_pin" "$section" "CLK_pin"
+	config_get "CS_pin" "$section" "CS_pin"
+	config_get "mode" "$section" "mode"
+	config_get_bool "enabled" "$section" "enabled" '1'
+	[ "$enabled" -gt 0 ] && add_device "$name" $DI_pin $DO_pin $CLK_pin $CS_pin $mode &
+}
+
+stop_service() {
+	local section="$1"
+	config_get "name" "$section" "name"
+	remove_device "$name"
+}
+
+start() {
+	# Make sure configfs is mounted
+	mount_configfs
+	[ $? -eq 0 ] || return 1
+
+	config_load "mmc_over_gpio"
+	config_foreach start_service "mmc_over_gpio"
+}
+
+stop() {
+	config_load "mmc_over_gpio"
+	config_foreach stop_service "mmc_over_gpio"
+}
diff --git a/trunk/package/kernel/om-watchdog/Makefile b/trunk/package/kernel/om-watchdog/Makefile
new file mode 100644
index 00000000..7d517a11
--- /dev/null
+++ b/trunk/package/kernel/om-watchdog/Makefile
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=om-watchdog
+PKG_RELEASE:=1
+PKG_VERSION:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/om-watchdog
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=om watchdog
+  URL:=http://openwrt.org/
+endef
+
+define Package/om-watchdog/description
+ This package contains the hw watchdog script for the OM1P and OM2P device.
+endef
+
+define Build/Prepare
+endef
+
+define Build/Compile
+endef
+
+define Build/Compile
+endef
+
+define Package/om-watchdog/install
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/sbin/
+	$(INSTALL_BIN) ./files/om-watchdog.init $(1)/etc/init.d/om-watchdog
+	$(INSTALL_BIN) ./files/om-watchdog $(1)/sbin/om-watchdog
+endef
+
+
+$(eval $(call BuildPackage,om-watchdog))
+
diff --git a/trunk/package/kernel/om-watchdog/files/om-watchdog b/trunk/package/kernel/om-watchdog/files/om-watchdog
new file mode 100644
index 00000000..d730c684
--- /dev/null
+++ b/trunk/package/kernel/om-watchdog/files/om-watchdog
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+GPIO=$1
+
+trap "" INT HUP
+
+echo $GPIO > /sys/class/gpio/export
+echo out > /sys/class/gpio/gpio${GPIO}/direction
+
+while true; do
+	echo 1 > /sys/class/gpio/gpio${GPIO}/value
+	sleep 1
+	echo 0 > /sys/class/gpio/gpio${GPIO}/value
+	sleep 180
+done
diff --git a/trunk/package/kernel/om-watchdog/files/om-watchdog.init b/trunk/package/kernel/om-watchdog/files/om-watchdog.init
new file mode 100644
index 00000000..36b31dae
--- /dev/null
+++ b/trunk/package/kernel/om-watchdog/files/om-watchdog.init
@@ -0,0 +1,36 @@
+#!/bin/sh /etc/rc.common
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+
+START=11
+
+SERVICE_DAEMONIZE=1
+
+boot() {
+	if [ -r /lib/ar71xx.sh ]; then
+		. /lib/ar71xx.sh
+		local board=$(ar71xx_board_name)
+
+		case "$board" in
+			"om2p"|"om2p-hs"|"om2p-hsv2")
+				service_start /sbin/om-watchdog 12
+				;;
+			"om2pv2"|"om2p-lc")
+				service_start /sbin/om-watchdog 26
+				;;
+			"om5p")
+				service_start /sbin/om-watchdog 11
+				;;
+			"mr600v2")
+				service_start /sbin/om-watchdog 15
+				;;
+			"mr900"|"mr900v2")
+				service_start /sbin/om-watchdog 16
+				;;
+		esac
+	else
+		#we assume it is om1p in this case
+		service_start /sbin/om-watchdog 3
+	fi
+}
diff --git a/trunk/package/kernel/rotary-gpio-custom/Makefile b/trunk/package/kernel/rotary-gpio-custom/Makefile
new file mode 100644
index 00000000..315ec31f
--- /dev/null
+++ b/trunk/package/kernel/rotary-gpio-custom/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=rotary-gpio-custom
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/rotary-gpio-custom
+  SUBMENU:=Other modules
+  TITLE:=Custom GPIO-based rotary encoder device
+  DEPENDS:=@GPIO_SUPPORT +kmod-input-gpio-encoder
+  FILES:=$(PKG_BUILD_DIR)/rotary-gpio-custom.ko
+  KCONFIG:=
+endef
+
+define KernelPackage/rotary-gpio-custom/description
+ Kernel module for register a custom rotary-gpio-encoder platform device.
+endef
+
+EXTRA_KCONFIG:= \
+	CONFIG_ROTARY_GPIO_CUSTOM=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,rotary-gpio-custom))
diff --git a/trunk/package/kernel/rotary-gpio-custom/src/Kconfig b/trunk/package/kernel/rotary-gpio-custom/src/Kconfig
new file mode 100644
index 00000000..b4d55d53
--- /dev/null
+++ b/trunk/package/kernel/rotary-gpio-custom/src/Kconfig
@@ -0,0 +1,9 @@
+config ROTARY_GPIO_CUSTOM
+	tristate "Custom GPIO-based rotary driver"
+	depends on GENERIC_GPIO
+	help
+	  This is a driver to register 1 to 4 custom rotary encoder using
+	  GPIO lines.
+
+	  This support is also available as a module.  If so, the module
+	  will be called rotary-gpio-custom.
diff --git a/trunk/package/kernel/rotary-gpio-custom/src/Makefile b/trunk/package/kernel/rotary-gpio-custom/src/Makefile
new file mode 100644
index 00000000..13367268
--- /dev/null
+++ b/trunk/package/kernel/rotary-gpio-custom/src/Makefile
@@ -0,0 +1 @@
+obj-${CONFIG_ROTARY_GPIO_CUSTOM}	+= rotary-gpio-custom.o
diff --git a/trunk/package/kernel/rotary-gpio-custom/src/rotary-gpio-custom.c b/trunk/package/kernel/rotary-gpio-custom/src/rotary-gpio-custom.c
new file mode 100644
index 00000000..9a16e452
--- /dev/null
+++ b/trunk/package/kernel/rotary-gpio-custom/src/rotary-gpio-custom.c
@@ -0,0 +1,193 @@
+/*
+ *  Custom GPIO-based rotary driver
+ *
+ *  Copyright (C) 2010 Claudio Mignanti <c.mignanti@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  Strongly based on Custom GPIO-based I2C driver by:
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * ---------------------------------------------------------------------------
+ *
+ *  The behaviour of this driver can be altered by setting some parameters
+ *  from the insmod command line.
+ *
+ *  The following parameters are adjustable:
+ *
+ *	bus0	These four arguments can be arrays of
+ *	bus1	1-8 unsigned integers as follows:
+ *	bus2
+ *	bus3	<id>,<steps>,<axis>,<gpioa>,<gpiob>,<inverted>
+ *
+ *
+ *  If this driver is built into the kernel, you can use the following kernel
+ *  command line parameters, with the same values as the corresponding module
+ *  parameters listed above:
+ *
+ *	rotary-gpio-custom.bus0
+ *	rotary-gpio-custom.bus1
+ *	rotary-gpio-custom.bus2
+ *	rotary-gpio-custom.bus3
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/platform_device.h>
+#include <linux/rotary_encoder.h>
+
+#define DRV_NAME	"rotary-gpio-custom"
+#define DRV_DESC	"Custom GPIO-based rotary driver"
+#define DRV_VERSION	"0.1.0"
+
+#define PFX		DRV_NAME ": "
+
+#define BUS_PARAM_REQUIRED	5
+#define BUS_PARAM_COUNT		6
+#define BUS_COUNT_MAX		4
+
+static unsigned int bus0[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus1[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus2[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus3[BUS_PARAM_COUNT] __initdata;
+
+static unsigned int bus_nump[BUS_COUNT_MAX] __initdata;
+
+#define BUS_PARM_DESC \
+	" config -> id,steps,axis,gpioa,gpiob[,inverted]"
+
+module_param_array(bus0, uint, &bus_nump[0], 0);
+MODULE_PARM_DESC(bus0, "bus0" BUS_PARM_DESC);
+module_param_array(bus1, uint, &bus_nump[1], 0);
+MODULE_PARM_DESC(bus1, "bus1" BUS_PARM_DESC);
+module_param_array(bus2, uint, &bus_nump[2], 0);
+MODULE_PARM_DESC(bus2, "bus2" BUS_PARM_DESC);
+module_param_array(bus3, uint, &bus_nump[3], 0);
+MODULE_PARM_DESC(bus3, "bus3" BUS_PARM_DESC);
+
+static struct platform_device *devices[BUS_COUNT_MAX];
+static unsigned int nr_devices;
+
+static void rotary_gpio_custom_cleanup(void)
+{
+	int i;
+
+	for (i = 0; i < nr_devices; i++)
+		if (devices[i])
+			platform_device_put(devices[i]);
+}
+
+static int __init rotary_gpio_custom_add_one(unsigned int id,
+					     unsigned int *params)
+{
+	struct platform_device *pdev;
+	struct rotary_encoder_platform_data pdata;
+	int err;
+
+	if (!bus_nump[id])
+		return 0;
+
+	if (bus_nump[id] < BUS_PARAM_REQUIRED) {
+		printk(KERN_ERR PFX "not enough parameters for bus%d\n", id);
+		err = -EINVAL;
+		goto err;
+	}
+
+	pdev = platform_device_alloc("rotary-gpio", params[0]);
+	if (!pdev) {
+		err = -ENOMEM;
+		goto err;
+	}
+
+	pdata.steps = params[1];
+	pdata.axis = params[2];
+	pdata.relative_axis = false;
+	pdata.rollover = false;
+	pdata.gpio_a = params[3];
+	pdata.gpio_b = params[4];
+
+	if (params[5] == 1) {
+		pdata.inverted_a = 1;
+		pdata.inverted_b = 1;
+	} else {
+		pdata.inverted_a = 0;
+		pdata.inverted_b = 0;
+	}
+
+	err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+	if (err)
+		goto err_put;
+
+	err = platform_device_add(pdev);
+	if (err)
+		goto err_put;
+
+	devices[nr_devices++] = pdev;
+	return 0;
+
+err_put:
+	platform_device_put(pdev);
+err:
+	return err;
+}
+
+static int __init rotary_gpio_custom_probe(void)
+{
+	int err;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+
+	err = rotary_gpio_custom_add_one(0, bus0);
+	if (err)
+		goto err;
+
+	err = rotary_gpio_custom_add_one(1, bus1);
+	if (err)
+		goto err;
+
+	err = rotary_gpio_custom_add_one(2, bus2);
+	if (err)
+		goto err;
+
+	err = rotary_gpio_custom_add_one(3, bus3);
+	if (err)
+		goto err;
+
+	if (!nr_devices) {
+		printk(KERN_ERR PFX "no bus parameter(s) specified\n");
+		err = -ENODEV;
+		goto err;
+	}
+
+	return 0;
+
+err:
+	rotary_gpio_custom_cleanup();
+	return err;
+}
+
+#ifdef MODULE
+static int __init rotary_gpio_custom_init(void)
+{
+	return rotary_gpio_custom_probe();
+}
+module_init(rotary_gpio_custom_init);
+
+static void __exit rotary_gpio_custom_exit(void)
+{
+	rotary_gpio_custom_cleanup();
+}
+module_exit(rotary_gpio_custom_exit);
+#else
+subsys_initcall(rotary_gpio_custom_probe);
+#endif /* MODULE*/
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org >");
+MODULE_AUTHOR("Claudio Mignanti <c.mignanti@gmail.com>");
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
diff --git a/trunk/package/kernel/rtc-rv5c386a/Makefile b/trunk/package/kernel/rtc-rv5c386a/Makefile
new file mode 100644
index 00000000..e13ead52
--- /dev/null
+++ b/trunk/package/kernel/rtc-rv5c386a/Makefile
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=rtc-rv5c386a
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/rtc-rv5c386a
+  SUBMENU:=Other modules
+  DEPENDS:=@TARGET_brcm47xx
+  TITLE:=Driver for RTC RV5C386A (used in WL-700gE and WL-HDD)
+  AUTOLOAD:=$(call AutoLoad,70,rtc)
+  FILES:=$(PKG_BUILD_DIR)/rtc.ko
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(BUILDFLAGS)" \
+		modules
+endef
+
+$(eval $(call KernelPackage,rtc-rv5c386a))
diff --git a/trunk/package/kernel/rtc-rv5c386a/src/Makefile b/trunk/package/kernel/rtc-rv5c386a/src/Makefile
new file mode 100644
index 00000000..eeb04307
--- /dev/null
+++ b/trunk/package/kernel/rtc-rv5c386a/src/Makefile
@@ -0,0 +1,18 @@
+# $Id$
+#
+# Makefile for Real Time Clock driver for WL-HDD
+#
+# Copyright (C) 2007 Andreas Engel
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
+#
+
+obj-m := rtc.o
+
+ifeq ($(MAKING_MODULES),1)
+
+-include $(TOPDIR)/Rules.make
+endif
diff --git a/trunk/package/kernel/rtc-rv5c386a/src/rtc.c b/trunk/package/kernel/rtc-rv5c386a/src/rtc.c
new file mode 100644
index 00000000..22154c85
--- /dev/null
+++ b/trunk/package/kernel/rtc-rv5c386a/src/rtc.c
@@ -0,0 +1,613 @@
+/*
+ * Real Time Clock driver for WL-HDD
+ *
+ * Copyright (C) 2007 Andreas Engel
+ *
+ * Hacked together mostly by copying the relevant code parts from:
+ *   drivers/i2c/i2c-bcm5365.c
+ *   drivers/i2c/i2c-algo-bit.c
+ *   drivers/char/rtc.c
+ *
+ * Note 1:
+ * This module uses the standard char device (10,135), while the Asus module
+ * rtcdrv.o uses (12,0). So, both can coexist which might be handy during
+ * development (but see the comment in rtc_open()).
+ *
+ * Note 2:
+ * You might need to set the clock once after loading the driver the first
+ * time because the driver switches the chip into 24h mode if it is running
+ * in 12h mode.
+ *
+ * Usage:
+ * For compatibility reasons with the original asus driver, the time can be
+ * read and set via the /dev/rtc device entry. The only accepted data format
+ * is "YYYY:MM:DD:W:HH:MM:SS\n". See libreCMC wiki for a script which handles
+ * this format.
+ *
+ * In addition, this driver supports the standard ioctl() calls for setting
+ * and reading the hardware clock, so the ordinary hwclock utility can also
+ * be used.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * TODO:
+ * - add a /proc/driver/rtc interface?
+ * - make the battery failure bit available through the /proc interface?
+ *
+ * $Id: rtc.c 7 2007-05-25 19:37:01Z ae $
+ */
+
+#include <linux/module.h>
+#include <linux/kmod.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/miscdevice.h>
+#include <linux/ioport.h>
+#include <linux/fcntl.h>
+#include <linux/mc146818rtc.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/rtc.h>
+#include <linux/delay.h>
+#include <linux/version.h>
+#include <linux/gpio.h>
+#include <linux/uaccess.h>
+
+#include <asm/current.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
+#include <asm/system.h>
+#endif
+
+#include <bcm47xx.h>
+#include <bcm47xx_nvram.h>
+
+#define RTC_IS_OPEN		0x01	/* Means /dev/rtc is in use.  */
+
+/* Can be changed via a module parameter.  */
+static int rtc_debug = 0;
+
+static unsigned long rtc_status = 0;	/* Bitmapped status byte.	*/
+
+/* These settings are platform dependents.  */
+unsigned int sda_index = 0;
+unsigned int scl_index = 0;
+
+#define I2C_READ_MASK  1
+#define I2C_WRITE_MASK 0
+
+#define I2C_ACK 1
+#define I2C_NAK 0
+
+#define RTC_EPOCH		1900
+#define RTC_I2C_ADDRESS		(0x32 << 1)
+#define RTC_24HOUR_MODE_MASK	0x20
+#define RTC_PM_MASK		0x20
+#define RTC_VDET_MASK		0x40
+#define RTC_Y2K_MASK		0x80
+
+/*
+ * Delay in microseconds for generating the pulses on the I2C bus. We use
+ * a rather conservative setting here.  See datasheet of the RTC chip.
+ */
+#define ADAP_DELAY 50
+
+/* Avoid spurious compiler warnings.  */
+#define UNUSED __attribute__((unused))
+
+MODULE_AUTHOR("Andreas Engel");
+MODULE_LICENSE("GPL");
+
+/* Test stolen from switch-adm.c.  */
+module_param(rtc_debug, int, 0);
+
+static inline void sdalo(void)
+{
+	gpio_direction_output(sda_index, 1);
+	udelay(ADAP_DELAY);
+}
+
+static inline void sdahi(void)
+{
+	gpio_direction_input(sda_index);
+	udelay(ADAP_DELAY);
+}
+
+static inline void scllo(void)
+{
+   gpio_direction_output(scl_index, 1);
+	udelay(ADAP_DELAY);
+}
+
+static inline int getscl(void)
+{
+	return (gpio_get_value(scl_index));
+}
+
+static inline int getsda(void)
+{
+	return (gpio_get_value(sda_index));
+}
+
+/*
+ * We shouldn't simply set the SCL pin to high. Like SDA, the SCL line is
+ * bidirectional too. According to the I2C spec, the slave is allowed to
+ * pull down the SCL line to slow down the clock, so we need to check this.
+ * Generally, we'd need a timeout here, but in our case, we just check the
+ * line, assuming the RTC chip behaves well.
+ */
+static int sclhi(void)
+{
+	gpio_direction_input(scl_index);
+	udelay(ADAP_DELAY);
+	if (!getscl()) {
+		printk(KERN_ERR "SCL pin should be low\n");
+		return -ETIMEDOUT;
+	}
+	return 0;
+}
+
+static void i2c_start(void)
+{
+	sdalo();
+	scllo();
+}
+
+static void i2c_stop(void)
+{
+	sdalo();
+	sclhi();
+	sdahi();
+}
+
+static int i2c_outb(int c)
+{
+	int i;
+	int ack;
+
+	/* assert: scl is low */
+	for (i = 7; i >= 0; i--) {
+		if (c & ( 1 << i )) {
+			sdahi();
+		} else {
+			sdalo();
+		}
+		if (sclhi() < 0) { /* timed out */
+			sdahi(); /* we don't want to block the net */
+			return -ETIMEDOUT;
+		};
+		scllo();
+	}
+	sdahi();
+	if (sclhi() < 0) {
+		return -ETIMEDOUT;
+	};
+	/* read ack: SDA should be pulled down by slave */
+	ack = getsda() == 0;	/* ack: sda is pulled low ->success.	 */
+	scllo();
+
+	if (rtc_debug)
+		printk(KERN_DEBUG "i2c_outb(0x%02x) -> %s\n",
+		       c, ack ? "ACK": "NAK");
+
+	return ack;		/* return 1 if device acked	 */
+	/* assert: scl is low (sda undef) */
+}
+
+static int i2c_inb(int ack)
+{
+	int i;
+	unsigned int indata = 0;
+
+	/* assert: scl is low */
+
+	sdahi();
+	for (i = 0; i < 8; i++) {
+		if (sclhi() < 0) {
+			return -ETIMEDOUT;
+		};
+		indata *= 2;
+		if (getsda())
+			indata |= 0x01;
+		scllo();
+	}
+	if (ack) {
+		sdalo();
+	} else {
+		sdahi();
+	}
+
+	if (sclhi() < 0) {
+		sdahi();
+		return -ETIMEDOUT;
+	}
+	scllo();
+	sdahi();
+
+	if (rtc_debug)
+		printk(KERN_DEBUG "i2c_inb() -> 0x%02x\n", indata);
+
+	/* assert: scl is low */
+	return indata & 0xff;
+}
+
+static void i2c_init(void)
+{
+    /* no gpio_control for EXTIF */
+	// ssb_gpio_control(&ssb, sda_mask | scl_mask, 0);
+
+   gpio_set_value(sda_index, 0);
+   gpio_set_value(scl_index, 0);
+	sdahi();
+	sclhi();
+}
+
+static int rtc_open(UNUSED struct inode *inode, UNUSED struct file *filp)
+{
+	spin_lock_irq(&rtc_lock);
+
+	if (rtc_status & RTC_IS_OPEN) {
+		spin_unlock_irq(&rtc_lock);
+		return -EBUSY;
+	}
+
+	rtc_status |= RTC_IS_OPEN;
+
+	/*
+	 * The following call is only necessary if we use both this driver and
+	 * the proprietary one from asus at the same time (which, b.t.w. only
+	 * makes sense during development). Otherwise, each access via the asus
+	 * driver will make access via this driver impossible.
+	 */
+	i2c_init();
+
+	spin_unlock_irq(&rtc_lock);
+
+	return 0;
+}
+
+static int rtc_release(UNUSED struct inode *inode, UNUSED struct file *filp)
+{
+	/* No need for locking here. */
+	rtc_status &= ~RTC_IS_OPEN;
+	return 0;
+}
+
+static int from_bcd(int bcdnum)
+{
+	int fac, num = 0;
+
+	for (fac = 1; bcdnum; fac *= 10) {
+		num += (bcdnum % 16) * fac;
+		bcdnum /= 16;
+	}
+
+	return num;
+}
+
+static int to_bcd(int decnum)
+{
+	int fac, num = 0;
+
+	for (fac = 1; decnum; fac *= 16) {
+		num += (decnum % 10) * fac;
+		decnum /= 10;
+	}
+
+	return num;
+}
+
+static void get_rtc_time(struct rtc_time *rtc_tm)
+{
+	int cr2;
+
+	/*
+	 * Read date and time from the RTC. We use read method (3).
+	 */
+
+	spin_lock_irq(&rtc_lock);
+	i2c_start();
+	i2c_outb(RTC_I2C_ADDRESS | I2C_READ_MASK);
+	cr2             = i2c_inb(I2C_ACK);
+	rtc_tm->tm_sec  = i2c_inb(I2C_ACK);
+	rtc_tm->tm_min  = i2c_inb(I2C_ACK);
+	rtc_tm->tm_hour = i2c_inb(I2C_ACK);
+	rtc_tm->tm_wday = i2c_inb(I2C_ACK);
+	rtc_tm->tm_mday = i2c_inb(I2C_ACK);
+	rtc_tm->tm_mon  = i2c_inb(I2C_ACK);
+	rtc_tm->tm_year = i2c_inb(I2C_NAK);
+	i2c_stop();
+	spin_unlock_irq(&rtc_lock);
+
+	if (cr2 & RTC_VDET_MASK) {
+		printk(KERN_WARNING "***RTC BATTERY FAILURE***\n");
+	}
+
+	/* Handle century bit */
+	if (rtc_tm->tm_mon & RTC_Y2K_MASK) {
+		rtc_tm->tm_mon &= ~RTC_Y2K_MASK;
+		rtc_tm->tm_year += 0x100;
+	}
+
+	rtc_tm->tm_sec  = from_bcd(rtc_tm->tm_sec);
+	rtc_tm->tm_min  = from_bcd(rtc_tm->tm_min);
+	rtc_tm->tm_hour = from_bcd(rtc_tm->tm_hour);
+	rtc_tm->tm_mday = from_bcd(rtc_tm->tm_mday);
+	rtc_tm->tm_mon  = from_bcd(rtc_tm->tm_mon) - 1;
+	rtc_tm->tm_year = from_bcd(rtc_tm->tm_year);
+
+	rtc_tm->tm_isdst = -1; /* DST not known */
+}
+
+static void set_rtc_time(struct rtc_time *rtc_tm)
+{
+	rtc_tm->tm_sec  = to_bcd(rtc_tm->tm_sec);
+	rtc_tm->tm_min  = to_bcd(rtc_tm->tm_min);
+	rtc_tm->tm_hour = to_bcd(rtc_tm->tm_hour);
+	rtc_tm->tm_mday = to_bcd(rtc_tm->tm_mday);
+	rtc_tm->tm_mon  = to_bcd(rtc_tm->tm_mon + 1);
+	rtc_tm->tm_year = to_bcd(rtc_tm->tm_year);
+
+	if (rtc_tm->tm_year >= 0x100) {
+		rtc_tm->tm_year -= 0x100;
+		rtc_tm->tm_mon |= RTC_Y2K_MASK;
+	}
+
+	spin_lock_irq(&rtc_lock);
+	i2c_start();
+	i2c_outb(RTC_I2C_ADDRESS | I2C_WRITE_MASK);
+	i2c_outb(0x00);	/* set starting register to 0 (=seconds) */
+	i2c_outb(rtc_tm->tm_sec);
+	i2c_outb(rtc_tm->tm_min);
+	i2c_outb(rtc_tm->tm_hour);
+	i2c_outb(rtc_tm->tm_wday);
+	i2c_outb(rtc_tm->tm_mday);
+	i2c_outb(rtc_tm->tm_mon);
+	i2c_outb(rtc_tm->tm_year);
+	i2c_stop();
+	spin_unlock_irq(&rtc_lock);
+}
+
+static ssize_t rtc_write(UNUSED struct file *filp, const char *buf,
+                         size_t count, loff_t *ppos)
+{
+	struct rtc_time rtc_tm;
+	char buffer[23];
+	char *p;
+
+	if (!capable(CAP_SYS_TIME))
+		return -EACCES;
+
+	if (ppos != &filp->f_pos)
+		return -ESPIPE;
+
+	/*
+	 * For simplicity, the only acceptable format is:
+	 * YYYY:MM:DD:W:HH:MM:SS\n
+	 */
+
+	if (count != 22)
+		goto err_out;
+
+	if (copy_from_user(buffer, buf, count))
+		return -EFAULT;
+
+	buffer[sizeof(buffer)-1] = '\0';
+
+	p = &buffer[0];
+
+	rtc_tm.tm_year  = simple_strtoul(p, &p, 10);
+	if (*p++ != ':') goto err_out;
+
+	rtc_tm.tm_mon = simple_strtoul(p, &p, 10) - 1;
+	if (*p++ != ':') goto err_out;
+
+	rtc_tm.tm_mday = simple_strtoul(p, &p, 10);
+	if (*p++ != ':') goto err_out;
+
+	rtc_tm.tm_wday = simple_strtoul(p, &p, 10);
+	if (*p++ != ':') goto err_out;
+
+	rtc_tm.tm_hour = simple_strtoul(p, &p, 10);
+	if (*p++ != ':') goto err_out;
+
+	rtc_tm.tm_min = simple_strtoul(p, &p, 10);
+	if (*p++ != ':') goto err_out;
+
+	rtc_tm.tm_sec = simple_strtoul(p, &p, 10);
+	if (*p != '\n') goto err_out;
+
+	rtc_tm.tm_year -= RTC_EPOCH;
+
+	set_rtc_time(&rtc_tm);
+
+	*ppos += count;
+
+	return count;
+
+ err_out:
+	printk(KERN_ERR "invalid format: use YYYY:MM:DD:W:HH:MM:SS\\n\n");
+	return -EINVAL;
+}
+
+
+static ssize_t rtc_read(UNUSED struct file *filp, char *buf, size_t count,
+                        loff_t *ppos)
+{
+	char wbuf[23];
+	struct rtc_time tm;
+	ssize_t len;
+
+	if (count == 0 || *ppos != 0)
+		return 0;
+
+	get_rtc_time(&tm);
+
+	len = sprintf(wbuf, "%04d:%02d:%02d:%d:%02d:%02d:%02d\n",
+		      tm.tm_year + RTC_EPOCH,
+		      tm.tm_mon + 1,
+		      tm.tm_mday,
+		      tm.tm_wday,
+		      tm.tm_hour,
+		      tm.tm_min,
+		      tm.tm_sec);
+
+	if (len > (ssize_t)count)
+		len = count;
+
+	if (copy_to_user(buf, wbuf, len))
+		return -EFAULT;
+
+	*ppos += len;
+
+	return len;
+}
+
+static int rtc_do_ioctl(unsigned int cmd, unsigned long arg)
+{
+	struct rtc_time rtc_tm;
+
+	switch (cmd) {
+		case RTC_RD_TIME:
+			memset(&rtc_tm, 0, sizeof(struct rtc_time));
+			get_rtc_time(&rtc_tm);
+			if (copy_to_user((void *)arg, &rtc_tm, sizeof(rtc_tm)))
+				return -EFAULT;
+			break;
+
+		case RTC_SET_TIME:
+			if (!capable(CAP_SYS_TIME))
+				return -EACCES;
+
+			if (copy_from_user(&rtc_tm, (struct rtc_time *)arg,
+					   sizeof(struct rtc_time)))
+				return -EFAULT;
+
+			set_rtc_time(&rtc_tm);
+			break;
+
+		default:
+			return -ENOTTY;
+	}
+
+	return 0;
+}
+
+static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+	long ret;
+	ret = rtc_do_ioctl(cmd, arg);
+	return ret;
+}
+
+static const struct file_operations rtc_fops = {
+	.owner		= THIS_MODULE,
+	.llseek		= no_llseek,
+	.read		= rtc_read,
+	.write		= rtc_write,
+	.unlocked_ioctl	= rtc_ioctl,
+	.open		= rtc_open,
+	.release	= rtc_release,
+};
+
+static struct miscdevice rtc_dev = {
+	.minor = RTC_MINOR,
+	.name  = "rtc",
+	.fops  = &rtc_fops,
+};
+
+/* Savagely ripped from diag.c.  */
+static inline int startswith (char *source, char *cmp)
+{
+	return !strncmp(source, cmp, strlen(cmp));
+}
+
+static void platform_detect(void)
+{
+	char buf[20];
+	int et0phyaddr, et1phyaddr;
+
+	/* Based on "model_no".  */
+	if (bcm47xx_nvram_getenv("model_no", buf, sizeof(buf)) >= 0) {
+		if (startswith(buf, "WL700")) { /* WL700* */
+			sda_index = 2;
+			scl_index = 5;
+			return;
+		}
+	}
+
+	if (bcm47xx_nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 )
+		et0phyaddr = simple_strtoul(buf, NULL, 0);
+	if (bcm47xx_nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 )
+		et1phyaddr = simple_strtoul(buf, NULL, 0);
+
+	if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0) {
+		/* Either WL-300g or WL-HDD, do more extensive checks */
+		if (startswith(buf, "WL300-") && et0phyaddr == 0 && et1phyaddr == 1) {
+			sda_index = 4;
+			scl_index = 5;
+			return;
+		}
+	}
+	/* not found */
+}
+
+static int __init rtc_init(void)
+{
+	int cr1;
+
+	platform_detect();
+
+	if (sda_index == scl_index) {
+		printk(KERN_ERR "RTC-RV5C386A: unrecognized platform!\n");
+		return -ENODEV;
+	}
+
+	i2c_init();
+
+	/*
+	 * Switch RTC to 24h mode
+	 */
+	spin_lock_irq(&rtc_lock);
+	i2c_start();
+	i2c_outb(RTC_I2C_ADDRESS | I2C_WRITE_MASK);
+	i2c_outb(0xE4); /* start at address 0xE, transmission mode 4 */
+	cr1 = i2c_inb(I2C_NAK);
+	i2c_stop();
+	spin_unlock_irq(&rtc_lock);
+	if ((cr1 & RTC_24HOUR_MODE_MASK) == 0) {
+		/* RTC is running in 12h mode */
+		printk(KERN_INFO "rtc.o: switching to 24h mode\n");
+		spin_lock_irq(&rtc_lock);
+		i2c_start();
+		i2c_outb(RTC_I2C_ADDRESS | I2C_WRITE_MASK);
+		i2c_outb(0xE0);
+		i2c_outb(cr1 | RTC_24HOUR_MODE_MASK);
+		i2c_stop();
+		spin_unlock_irq(&rtc_lock);
+	}
+
+	misc_register(&rtc_dev);
+
+	printk(KERN_INFO "RV5C386A Real Time Clock Driver loaded\n");
+
+	return 0;
+}
+
+static void __exit rtc_exit (void)
+{
+	misc_deregister(&rtc_dev);
+	printk(KERN_INFO "Successfully removed RTC RV5C386A driver\n");
+}
+
+module_init(rtc_init);
+module_exit(rtc_exit);
+
+/*
+ * Local Variables:
+ * indent-tabs-mode:t
+ * c-basic-offset:8
+ * End:
+ */
diff --git a/trunk/package/kernel/spi-gpio-custom/Makefile b/trunk/package/kernel/spi-gpio-custom/Makefile
new file mode 100644
index 00000000..3282f063
--- /dev/null
+++ b/trunk/package/kernel/spi-gpio-custom/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=spi-gpio-custom
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/spi-gpio-custom
+  SUBMENU:=SPI Support
+  TITLE:=Custom GPIO-based SPI device
+  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang +kmod-spi-gpio +kmod-spi-dev
+  FILES:=$(PKG_BUILD_DIR)/spi-gpio-custom.ko
+  KCONFIG:=
+endef
+
+define KernelPackage/spi-gpio-custom/description
+ Kernel module for register a custom spi-gpio platform device.
+endef
+
+EXTRA_KCONFIG:= \
+	CONFIG_SPI_GPIO_CUSTOM=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,spi-gpio-custom))
diff --git a/trunk/package/kernel/spi-gpio-custom/src/Kconfig b/trunk/package/kernel/spi-gpio-custom/src/Kconfig
new file mode 100644
index 00000000..5e15f05a
--- /dev/null
+++ b/trunk/package/kernel/spi-gpio-custom/src/Kconfig
@@ -0,0 +1,14 @@
+config SPI_GPIO_CUSTOM
+	tristate "Custom GPIO-based SPI driver"
+	depends on GENERIC_GPIO
+	select SPI_GPIO
+	help
+	  This is an SPI driver to register 1 to 4 custom SPI buses using
+	  GPIO lines. Each bus can have up to 8 slaves.
+	  The devices will be exposed to userspace as /dev/spidevX.X
+	  
+	  This module is maily intended to interface microcontrollers
+	  and other SPI devices without a specific kernel driver.
+
+	  This support is also available as a module.  If so, the module
+	  will be called spi-gpio-custom.
diff --git a/trunk/package/kernel/spi-gpio-custom/src/Makefile b/trunk/package/kernel/spi-gpio-custom/src/Makefile
new file mode 100644
index 00000000..cf8c55f9
--- /dev/null
+++ b/trunk/package/kernel/spi-gpio-custom/src/Makefile
@@ -0,0 +1 @@
+obj-${CONFIG_SPI_GPIO_CUSTOM}	+= spi-gpio-custom.o
\ No newline at end of file
diff --git a/trunk/package/kernel/spi-gpio-custom/src/spi-gpio-custom.c b/trunk/package/kernel/spi-gpio-custom/src/spi-gpio-custom.c
new file mode 100644
index 00000000..a4f93c67
--- /dev/null
+++ b/trunk/package/kernel/spi-gpio-custom/src/spi-gpio-custom.c
@@ -0,0 +1,365 @@
+/*
+ *  Custom GPIO-based SPI driver
+ *
+ *  Copyright (C) 2013 Marco Burato <zmaster.adsl@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  Based on i2c-gpio-custom by:
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ * ---------------------------------------------------------------------------
+ *
+ *  The behaviour of this driver can be altered by setting some parameters
+ *  from the insmod command line.
+ *
+ *  The following parameters are adjustable:
+ *
+ *	bus0	These four arguments can be arrays of
+ *	bus1	1-8 unsigned integers as follows:
+ *	bus2
+ *	bus3	<id>,<sck>,<mosi>,<miso>,<mode1>,<maxfreq1>,<cs1>,...
+ *
+ *  where:
+ *
+ *  <id>	ID to used as device_id for the corresponding bus (required)
+ *  <sck>	GPIO pin ID to be used for bus SCK (required)
+ *  <mosi>	GPIO pin ID to be used for bus MOSI (required*)
+ *  <miso>	GPIO pin ID to be used for bus MISO (required*)
+ *  <modeX>	Mode configuration for slave X in the bus (required)
+ *		(see /include/linux/spi/spi.h)
+ *  <maxfreqX>	Maximum clock frequency in Hz for slave X in the bus (required)
+ *  <csX>	GPIO pin ID to be used for slave X CS (required**)
+ *
+ *	Notes:
+ *	*	If a signal is not used (for example there is no MISO) you need
+ *		to set the GPIO pin ID for that signal to an invalid value.
+ *	**	If you only have 1 slave in the bus with no CS, you can omit the
+ *		<cs1> param or set it to an invalid GPIO id to disable it. When
+ *		you have 2 or more slaves, they must all have a valid CS.
+ *
+ *  If this driver is built into the kernel, you can use the following kernel
+ *  command line parameters, with the same values as the corresponding module
+ *  parameters listed above:
+ *
+ *	spi-gpio-custom.bus0
+ *	spi-gpio-custom.bus1
+ *	spi-gpio-custom.bus2
+ *	spi-gpio-custom.bus3
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <linux/gpio.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
+
+#define DRV_NAME	"spi-gpio-custom"
+#define DRV_DESC	"Custom GPIO-based SPI driver"
+#define DRV_VERSION	"0.1"
+
+#define PFX		DRV_NAME ": "
+
+#define BUS_PARAM_ID		0
+#define BUS_PARAM_SCK		1
+#define BUS_PARAM_MOSI		2
+#define BUS_PARAM_MISO		3
+#define BUS_PARAM_MODE1		4
+#define BUS_PARAM_MAXFREQ1	5
+#define BUS_PARAM_CS1		6
+
+#define BUS_SLAVE_COUNT_MAX	8
+#define BUS_PARAM_REQUIRED	6
+#define BUS_PARAM_PER_SLAVE	3
+#define BUS_PARAM_COUNT		(4+BUS_PARAM_PER_SLAVE*BUS_SLAVE_COUNT_MAX)
+#define BUS_COUNT_MAX		4
+
+static unsigned int bus0[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus1[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus2[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus3[BUS_PARAM_COUNT] __initdata;
+
+static unsigned int bus_nump[BUS_COUNT_MAX] __initdata;
+
+#define BUS_PARM_DESC \
+	" config -> id,sck,mosi,miso,mode1,maxfreq1[,cs1,mode2,maxfreq2,cs2,...]"
+
+module_param_array(bus0, uint, &bus_nump[0], 0);
+MODULE_PARM_DESC(bus0, "bus0" BUS_PARM_DESC);
+module_param_array(bus1, uint, &bus_nump[1], 0);
+MODULE_PARM_DESC(bus1, "bus1" BUS_PARM_DESC);
+module_param_array(bus2, uint, &bus_nump[2], 0);
+MODULE_PARM_DESC(bus2, "bus2" BUS_PARM_DESC);
+module_param_array(bus3, uint, &bus_nump[3], 0);
+MODULE_PARM_DESC(bus3, "bus3" BUS_PARM_DESC);
+
+static struct platform_device *devices[BUS_COUNT_MAX];
+static unsigned int nr_devices;
+
+static void spi_gpio_custom_cleanup(void)
+{
+	int i;
+
+	for (i = 0; i < nr_devices; i++)
+		if (devices[i])
+			platform_device_unregister(devices[i]);
+}
+
+static int spi_gpio_custom_get_slave_mode(unsigned int id,
+					  unsigned int *params,
+					  int slave_index)
+{
+	int param_index;
+
+	param_index = BUS_PARAM_MODE1+slave_index*BUS_PARAM_PER_SLAVE;
+	if (param_index >= bus_nump[id])
+		return -1;
+
+	return params[param_index];
+}
+static int spi_gpio_custom_get_slave_maxfreq(unsigned int id,
+					     unsigned int *params,
+					     int slave_index)
+{
+	int param_index;
+
+	param_index = BUS_PARAM_MAXFREQ1+slave_index*BUS_PARAM_PER_SLAVE;
+	if (param_index >= bus_nump[id])
+		return -1;
+
+	return params[param_index];
+}
+static int spi_gpio_custom_get_slave_cs(unsigned int id,
+					unsigned int *params,
+					int slave_index)
+{
+	int param_index;
+
+	param_index = BUS_PARAM_CS1+slave_index*BUS_PARAM_PER_SLAVE;
+	if (param_index >= bus_nump[id])
+		return -1;
+	if (!gpio_is_valid(params[param_index]))
+		return -1;
+
+	return params[param_index];
+}
+
+static int spi_gpio_custom_check_params(unsigned int id, unsigned int *params)
+{
+	int i;
+	struct spi_master *master;
+
+	if (bus_nump[id] < BUS_PARAM_REQUIRED) {
+		printk(KERN_ERR PFX "not enough values for parameter bus%d\n",
+		       id);
+		return -EINVAL;
+	}
+
+	if (bus_nump[id] > (1+BUS_PARAM_CS1)) {
+		/* more than 1 device: check CS GPIOs */
+		for (i = 0; i < BUS_SLAVE_COUNT_MAX; i++) {
+			/* no more slaves? */
+			if (spi_gpio_custom_get_slave_mode(id, params, i) < 0)
+				break;
+
+			if (spi_gpio_custom_get_slave_cs(id, params, i) < 0) {
+				printk(KERN_ERR PFX "invalid/missing CS gpio for slave %d on bus %d\n",
+				       i, params[BUS_PARAM_ID]);
+				return -EINVAL;
+			}
+		}
+	}
+
+	if (!gpio_is_valid(params[BUS_PARAM_SCK])) {
+		printk(KERN_ERR PFX "invalid SCK gpio for bus %d\n",
+		       params[BUS_PARAM_ID]);
+		return -EINVAL;
+	}
+
+	master = spi_busnum_to_master(params[BUS_PARAM_ID]);
+	if (master) {
+		spi_master_put(master);
+		printk(KERN_ERR PFX "bus %d already exists\n",
+		       params[BUS_PARAM_ID]);
+		return -EEXIST;
+	}
+
+	return 0;
+}
+
+static int __init spi_gpio_custom_add_one(unsigned int id, unsigned int *params)
+{
+	struct platform_device *pdev;
+	struct spi_gpio_platform_data pdata;
+	int i;
+	int num_cs;
+	int err;
+	struct spi_master *master;
+	struct spi_device *slave;
+	struct spi_board_info slave_info;
+	int mode, maxfreq, cs;
+
+
+	if (!bus_nump[id])
+		return 0;
+
+	err = spi_gpio_custom_check_params(id, params);
+	if (err)
+		goto err;
+
+	/* Create BUS device node */
+
+	pdev = platform_device_alloc("spi_gpio", params[BUS_PARAM_ID]);
+	if (!pdev) {
+		err = -ENOMEM;
+		goto err;
+	}
+
+	num_cs = 0;
+	for (i = 0; i < BUS_SLAVE_COUNT_MAX; i++) {
+		/* no more slaves? */
+		if (spi_gpio_custom_get_slave_mode(id, params, i) < 0)
+			break;
+
+		if (spi_gpio_custom_get_slave_cs(id, params, i) >= 0)
+			num_cs++;
+	}
+	if (num_cs == 0) {
+		/*
+		 * Even if no CS is used, spi modules expect
+		 * at least 1 (unused)
+		 */
+		num_cs = 1;
+	}
+
+	pdata.sck = params[BUS_PARAM_SCK];
+	pdata.mosi = gpio_is_valid(params[BUS_PARAM_MOSI])
+		? params[BUS_PARAM_MOSI]
+		: SPI_GPIO_NO_MOSI;
+	pdata.miso = gpio_is_valid(params[BUS_PARAM_MISO])
+		? params[BUS_PARAM_MISO]
+		: SPI_GPIO_NO_MISO;
+	pdata.num_chipselect = num_cs;
+
+	err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+	if (err) {
+		platform_device_put(pdev);
+		goto err;
+	}
+
+	err = platform_device_add(pdev);
+	if (err) {
+		printk(KERN_ERR PFX "platform_device_add failed with return code %d\n",
+		       err);
+		platform_device_put(pdev);
+		goto err;
+	}
+
+	/* Register SLAVE devices */
+
+	for (i = 0; i < BUS_SLAVE_COUNT_MAX; i++) {
+		mode = spi_gpio_custom_get_slave_mode(id, params, i);
+		maxfreq = spi_gpio_custom_get_slave_maxfreq(id, params, i);
+		cs = spi_gpio_custom_get_slave_cs(id, params, i);
+
+		/* no more slaves? */
+		if (mode < 0)
+			break;
+
+		memset(&slave_info, 0, sizeof(slave_info));
+		strcpy(slave_info.modalias, "spidev");
+		slave_info.controller_data = (void *)((cs >= 0)
+			? cs
+			: SPI_GPIO_NO_CHIPSELECT);
+		slave_info.max_speed_hz = maxfreq;
+		slave_info.bus_num = params[BUS_PARAM_ID];
+		slave_info.chip_select = i;
+		slave_info.mode = mode;
+
+		master = spi_busnum_to_master(params[BUS_PARAM_ID]);
+		if (!master) {
+			printk(KERN_ERR PFX "unable to get master for bus %d\n",
+			       params[BUS_PARAM_ID]);
+			err = -EINVAL;
+			goto err_unregister;
+		}
+		slave = spi_new_device(master, &slave_info);
+		spi_master_put(master);
+		if (!slave) {
+			printk(KERN_ERR PFX "unable to create slave %d for bus %d\n",
+			       i, params[BUS_PARAM_ID]);
+			/* Will most likely fail due to unsupported mode bits */
+			err = -EINVAL;
+			goto err_unregister;
+		}
+	}
+
+	devices[nr_devices++] = pdev;
+
+	return 0;
+
+err_unregister:
+	platform_device_unregister(pdev);
+err:
+	return err;
+}
+
+static int __init spi_gpio_custom_probe(void)
+{
+	int err;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+
+	err = spi_gpio_custom_add_one(0, bus0);
+	if (err)
+		goto err;
+
+	err = spi_gpio_custom_add_one(1, bus1);
+	if (err)
+		goto err;
+
+	err = spi_gpio_custom_add_one(2, bus2);
+	if (err)
+		goto err;
+
+	err = spi_gpio_custom_add_one(3, bus3);
+	if (err)
+		goto err;
+
+	if (!nr_devices) {
+		printk(KERN_ERR PFX "no bus parameter(s) specified\n");
+		err = -ENODEV;
+		goto err;
+	}
+
+	return 0;
+
+err:
+	spi_gpio_custom_cleanup();
+	return err;
+}
+
+#ifdef MODULE
+static int __init spi_gpio_custom_init(void)
+{
+	return spi_gpio_custom_probe();
+}
+module_init(spi_gpio_custom_init);
+
+static void __exit spi_gpio_custom_exit(void)
+{
+	spi_gpio_custom_cleanup();
+}
+module_exit(spi_gpio_custom_exit);
+#else
+subsys_initcall(spi_gpio_custom_probe);
+#endif /* MODULE*/
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Marco Burato <zmaster.adsl@gmail.com>");
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
diff --git a/trunk/package/kernel/spi-ks8995/Makefile b/trunk/package/kernel/spi-ks8995/Makefile
new file mode 100644
index 00000000..0be9fe3d
--- /dev/null
+++ b/trunk/package/kernel/spi-ks8995/Makefile
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=spi-ks8995
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/spi-ks8995
+  SUBMENU:=SPI Support
+  TITLE:=Micrel/Kendin KS8995 Ethernet switch control
+  FILES:=$(PKG_BUILD_DIR)/spi_ks8995.ko
+  KCONFIG:=CONFIG_SPI=y \
+	CONFIG_SPI_MASTER=y
+  AUTOLOAD:=$(call AutoLoad,50,spi_ks8995)
+endef
+
+define KernelPackage/spi-ks8995/description
+  Kernel module for Micrel/Kendin KS8995 ethernet switch
+endef
+
+EXTRA_KCONFIG:= \
+	CONFIG_SPI_KS8995=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,spi-ks8995))
diff --git a/trunk/package/kernel/spi-ks8995/src/Kconfig b/trunk/package/kernel/spi-ks8995/src/Kconfig
new file mode 100644
index 00000000..7859be18
--- /dev/null
+++ b/trunk/package/kernel/spi-ks8995/src/Kconfig
@@ -0,0 +1,3 @@
+config SPI_KS8995
+	tristate "Micrel/Kendin KS8995 Ethernet switch"
+	depends on SPI
diff --git a/trunk/package/kernel/spi-ks8995/src/Makefile b/trunk/package/kernel/spi-ks8995/src/Makefile
new file mode 100644
index 00000000..810c3bd1
--- /dev/null
+++ b/trunk/package/kernel/spi-ks8995/src/Makefile
@@ -0,0 +1 @@
+obj-${CONFIG_SPI_KS8995}	+= spi_ks8995.o
\ No newline at end of file
diff --git a/trunk/package/kernel/spi-ks8995/src/spi_ks8995.c b/trunk/package/kernel/spi-ks8995/src/spi_ks8995.c
new file mode 100644
index 00000000..dc42b5d3
--- /dev/null
+++ b/trunk/package/kernel/spi-ks8995/src/spi_ks8995.c
@@ -0,0 +1,419 @@
+/*
+ * SPI driver for Micrel/Kendin KS8995M ethernet switch
+ *
+ * Copyright (C) 2008 Gabor Juhos <juhosg at openwrt.org>
+ *
+ * This file was based on: drivers/spi/at25.c
+ *	Copyright (C) 2006 David Brownell
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+
+#include <linux/spi/spi.h>
+
+#define DRV_VERSION	"0.1.1"
+#define DRV_DESC	"Micrel/Kendin KS8995 Ethernet switch SPI driver"
+
+/*-------------------------------------------------------------------------*/
+
+#define KS8995_REG_ID0		0x00	/* Chip ID0 */
+#define KS8995_REG_ID1		0x01	/* Chip ID1 */
+
+#define KS8995_REG_GC0		0x02	/* Global Control 0 */
+#define KS8995_REG_GC1		0x03	/* Global Control 1 */
+#define KS8995_REG_GC2		0x04	/* Global Control 2 */
+#define KS8995_REG_GC3		0x05	/* Global Control 3 */
+#define KS8995_REG_GC4		0x06	/* Global Control 4 */
+#define KS8995_REG_GC5		0x07	/* Global Control 5 */
+#define KS8995_REG_GC6		0x08	/* Global Control 6 */
+#define KS8995_REG_GC7		0x09	/* Global Control 7 */
+#define KS8995_REG_GC8		0x0a	/* Global Control 8 */
+#define KS8995_REG_GC9		0x0b	/* Global Control 9 */
+
+#define KS8995_REG_PC(p,r)	((0x10 * p) + r)	/* Port Control */
+#define KS8995_REG_PS(p,r)	((0x10 * p) + r + 0xe)	/* Port Status */
+
+#define KS8995_REG_TPC0		0x60	/* TOS Priority Control 0 */
+#define KS8995_REG_TPC1		0x61	/* TOS Priority Control 1 */
+#define KS8995_REG_TPC2		0x62	/* TOS Priority Control 2 */
+#define KS8995_REG_TPC3		0x63	/* TOS Priority Control 3 */
+#define KS8995_REG_TPC4		0x64	/* TOS Priority Control 4 */
+#define KS8995_REG_TPC5		0x65	/* TOS Priority Control 5 */
+#define KS8995_REG_TPC6		0x66	/* TOS Priority Control 6 */
+#define KS8995_REG_TPC7		0x67	/* TOS Priority Control 7 */
+
+#define KS8995_REG_MAC0		0x68	/* MAC address 0 */
+#define KS8995_REG_MAC1		0x69	/* MAC address 1 */
+#define KS8995_REG_MAC2		0x6a	/* MAC address 2 */
+#define KS8995_REG_MAC3		0x6b	/* MAC address 3 */
+#define KS8995_REG_MAC4		0x6c	/* MAC address 4 */
+#define KS8995_REG_MAC5		0x6d	/* MAC address 5 */
+
+#define KS8995_REG_IAC0		0x6e	/* Indirect Access Control 0 */
+#define KS8995_REG_IAC1		0x6f	/* Indirect Access Control 0 */
+
+#define KS8995_REG_IAD7		0x70	/* Indirect Access Data 7 */
+#define KS8995_REG_IAD6		0x71	/* Indirect Access Data 6 */
+#define KS8995_REG_IAD5		0x72	/* Indirect Access Data 5 */
+#define KS8995_REG_IAD4		0x73	/* Indirect Access Data 4 */
+#define KS8995_REG_IAD3		0x74	/* Indirect Access Data 3 */
+#define KS8995_REG_IAD2		0x75	/* Indirect Access Data 2 */
+#define KS8995_REG_IAD1		0x76	/* Indirect Access Data 1 */
+#define KS8995_REG_IAD0		0x77	/* Indirect Access Data 0 */
+
+#define KS8995_REGS_SIZE	0x80
+
+#define ID1_CHIPID_M	0xf
+#define ID1_CHIPID_S	4
+#define ID1_REVISION_M	0x7
+#define ID1_REVISION_S	1
+#define ID1_START_SW	1	/* start the switch */
+
+#define FAMILY_KS8995	0x95
+#define CHIPID_M	0
+
+#define KS8995_CMD_WRITE	0x02U
+#define KS8995_CMD_READ		0x03U
+
+#define KS8995_RESET_DELAY	10 /* usec */
+
+/*-------------------------------------------------------------------------*/
+
+struct ks8995_pdata {
+	/* not yet implemented */
+};
+
+struct ks8995_switch {
+	struct spi_device	*spi;
+	struct mutex		lock;
+	struct ks8995_pdata	*pdata;
+};
+
+/*-------------------------------------------------------------------------*/
+
+static inline u8 get_chip_id(u8 val)
+{
+	return ((val >> ID1_CHIPID_S) & ID1_CHIPID_M);
+}
+
+static inline u8 get_chip_rev(u8 val)
+{
+	return ((val >> ID1_REVISION_S) & ID1_REVISION_M);
+}
+
+/*-------------------------------------------------------------------------*/
+
+static int ks8995_read(struct ks8995_switch *ks, char *buf,
+		unsigned offset, size_t count)
+{
+	u8 cmd[2];
+	struct spi_transfer t[2];
+	struct spi_message m;
+	int err;
+
+	spi_message_init(&m);
+
+	memset(&t, 0, sizeof(t));
+
+	t[0].tx_buf = cmd;
+	t[0].len = sizeof(cmd);
+	spi_message_add_tail(&t[0], &m);
+
+	t[1].rx_buf = buf;
+	t[1].len = count;
+	spi_message_add_tail(&t[1], &m);
+
+	cmd[0] = KS8995_CMD_READ;
+	cmd[1] = offset;
+
+	mutex_lock(&ks->lock);
+	err = spi_sync(ks->spi, &m);
+	mutex_unlock(&ks->lock);
+
+	return err ? err : count;
+}
+
+
+static int ks8995_write(struct ks8995_switch *ks, char *buf,
+		unsigned offset, size_t count)
+{
+	u8 cmd[2];
+	struct spi_transfer t[2];
+	struct spi_message m;
+	int err;
+
+	spi_message_init(&m);
+
+	memset(&t, 0, sizeof(t));
+
+	t[0].tx_buf = cmd;
+	t[0].len = sizeof(cmd);
+	spi_message_add_tail(&t[0], &m);
+
+	t[1].tx_buf = buf;
+	t[1].len = count;
+	spi_message_add_tail(&t[1], &m);
+
+	cmd[0] = KS8995_CMD_WRITE;
+	cmd[1] = offset;
+
+	mutex_lock(&ks->lock);
+	err = spi_sync(ks->spi, &m);
+	mutex_unlock(&ks->lock);
+
+	return err ? err : count;
+}
+
+static inline int ks8995_read_reg(struct ks8995_switch *ks, u8 addr, u8 *buf)
+{
+	return (ks8995_read(ks, buf, addr, 1) != 1);
+}
+
+static inline int ks8995_write_reg(struct ks8995_switch *ks, u8 addr, u8 val)
+{
+	char buf = val;
+
+	return (ks8995_write(ks, &buf, addr, 1) != 1);
+}
+
+/*-------------------------------------------------------------------------*/
+
+#if 0
+static int ks8995_setup(struct spi_device *spi)
+{
+	struct ks8995_switch *ks;
+	u8 t;
+
+	ks = dev_get_drvdata(&spi->dev);
+
+	ks8995_write_reg(ks, KS8995_REG_GC0, 0x4c);
+	ks8995_write_reg(ks, KS8995_REG_GC1, 0x05);
+
+	ks8995_read_reg(ks, KS8995_REG_GC2, &t);
+	ks8995_write_reg(ks, KS8995_REG_GC2, t | 1);
+
+	ks8995_write_reg(ks, KS8995_REG_GC4, 0x20);
+
+	ks8995_write_reg(ks, KS8995_REG_PC(1,0), 0x61);
+	ks8995_write_reg(ks, KS8995_REG_PC(2,0), 0x61);
+	ks8995_write_reg(ks, KS8995_REG_PC(3,0), 0x61);
+	ks8995_write_reg(ks, KS8995_REG_PC(4,0), 0x61);
+	ks8995_write_reg(ks, KS8995_REG_PC(5,0), 0x61);
+
+	ks8995_write_reg(ks, KS8995_REG_PC(5,11), 0x18);
+
+	ks8995_write_reg(ks, KS8995_REG_TPC0, 0xff);
+	ks8995_write_reg(ks, KS8995_REG_TPC1, 0xff);
+	ks8995_write_reg(ks, KS8995_REG_TPC2, 0xff);
+	ks8995_write_reg(ks, KS8995_REG_TPC3, 0xff);
+	ks8995_write_reg(ks, KS8995_REG_TPC4, 0xff);
+	ks8995_write_reg(ks, KS8995_REG_TPC5, 0xff);
+	ks8995_write_reg(ks, KS8995_REG_TPC6, 0xff);
+	ks8995_write_reg(ks, KS8995_REG_TPC7, 0xfe);
+
+	return 0;
+}
+#endif
+
+static int ks8995_stop(struct ks8995_switch *ks)
+{
+	return ks8995_write_reg(ks, KS8995_REG_ID1, 0);
+}
+
+static int ks8995_start(struct ks8995_switch *ks)
+{
+	return ks8995_write_reg(ks, KS8995_REG_ID1, 1);
+}
+
+static int ks8995_reset(struct ks8995_switch *ks)
+{
+	int err;
+
+	err = ks8995_stop(ks);
+	if (err)
+		return err;
+
+	udelay(KS8995_RESET_DELAY);
+
+	return ks8995_start(ks);
+}
+
+/*-------------------------------------------------------------------------*/
+
+static int ks8995_registers_read(struct kobject *kobj,
+	struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)
+{
+	struct device *dev;
+	struct ks8995_switch *ks8995;
+
+	dev = container_of(kobj, struct device, kobj);
+	ks8995 = dev_get_drvdata(dev);
+
+	if (unlikely(off > KS8995_REGS_SIZE))
+		return 0;
+
+	if ((off + count) > KS8995_REGS_SIZE)
+		count = KS8995_REGS_SIZE - off;
+
+	if (unlikely(!count))
+		return count;
+
+	return ks8995_read(ks8995, buf, off, count);
+}
+
+
+static int ks8995_registers_write(struct kobject *kobj,
+	struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)
+{
+	struct device *dev;
+	struct ks8995_switch *ks8995;
+
+	dev = container_of(kobj, struct device, kobj);
+	ks8995 = dev_get_drvdata(dev);
+
+	if (unlikely(off >= KS8995_REGS_SIZE))
+		return -EFBIG;
+
+	if ((off + count) > KS8995_REGS_SIZE)
+		count = KS8995_REGS_SIZE - off;
+
+	if (unlikely(!count))
+		return count;
+
+	return ks8995_write(ks8995, buf, off, count);
+}
+
+
+static struct bin_attribute ks8995_registers_attr = {
+	.attr = {
+		.name	= "registers",
+		.mode	= S_IRUSR | S_IWUSR,
+	},
+	.size	= KS8995_REGS_SIZE,
+	.read	= ks8995_registers_read,
+	.write	= ks8995_registers_write,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int ks8995_probe(struct spi_device *spi)
+{
+	struct ks8995_switch	*ks;
+	struct ks8995_pdata	*pdata;
+	u8	ids[2];
+	int	err;
+
+	/* Chip description */
+	pdata = spi->dev.platform_data;
+
+	ks = kzalloc(sizeof(*ks), GFP_KERNEL);
+	if (!ks) {
+		dev_err(&spi->dev, "no memory for private data\n");
+		return-ENOMEM;
+	}
+
+	mutex_init(&ks->lock);
+	ks->pdata = pdata;
+	ks->spi = spi_dev_get(spi);
+	dev_set_drvdata(&spi->dev, ks);
+
+	spi->mode = SPI_MODE_0;
+	spi->bits_per_word = 8;
+	err = spi_setup(spi);
+	if (err) {
+		dev_err(&spi->dev, "spi_setup failed, err=%d \n", err);
+		goto err_drvdata;
+	}
+
+	err = ks8995_read(ks, ids, KS8995_REG_ID0, sizeof(ids));
+	if (err < 0) {
+		dev_err(&spi->dev, "unable to read id registers, err=%d \n",
+				err);
+		goto err_drvdata;
+	}
+
+	switch (ids[0]) {
+	case FAMILY_KS8995:
+		break;
+	default:
+		dev_err(&spi->dev, "unknown family id:%02x\n", ids[0]);
+		err = -ENODEV;
+		goto err_drvdata;
+	}
+
+	err = ks8995_reset(ks);
+	if (err)
+		goto err_drvdata;
+
+	err = sysfs_create_bin_file(&spi->dev.kobj, &ks8995_registers_attr);
+	if (err) {
+		dev_err(&spi->dev, "unable to create sysfs file, err=%d\n",
+					err);
+		goto err_drvdata;
+	}
+
+	dev_info(&spi->dev, "KS89%02X device found, Chip ID:%01x, "
+			"Revision:%01x\n", ids[0],
+			get_chip_id(ids[1]), get_chip_rev(ids[1]));
+
+	return 0;
+
+err_drvdata:
+	dev_set_drvdata(&spi->dev, NULL);
+	kfree(ks);
+	return err;
+}
+
+static int ks8995_remove(struct spi_device *spi)
+{
+	struct ks8995_data	*ks8995;
+
+	ks8995 = dev_get_drvdata(&spi->dev);
+	sysfs_remove_bin_file(&spi->dev.kobj, &ks8995_registers_attr);
+
+	dev_set_drvdata(&spi->dev, NULL);
+	kfree(ks8995);
+
+	return 0;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static struct spi_driver ks8995_driver = {
+	.driver = {
+		.name		= "spi-ks8995",
+		.bus		= &spi_bus_type,
+		.owner		= THIS_MODULE,
+	},
+	.probe		= ks8995_probe,
+	.remove		= ks8995_remove,
+};
+
+static int __init ks8995_init(void)
+{
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION"\n");
+
+	return spi_register_driver(&ks8995_driver);
+}
+module_init(ks8995_init);
+
+static void __exit ks8995_exit(void)
+{
+	spi_unregister_driver(&ks8995_driver);
+}
+module_exit(ks8995_exit);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
+MODULE_LICENSE("GPL v2");
+
diff --git a/trunk/package/kernel/trelay/Makefile b/trunk/package/kernel/trelay/Makefile
new file mode 100644
index 00000000..82c41018
--- /dev/null
+++ b/trunk/package/kernel/trelay/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=trelay
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/trelay
+  SUBMENU:=Network Support
+  TITLE:=Trivial Ethernet Relay
+  FILES:=$(PKG_BUILD_DIR)/trelay.ko
+  AUTOLOAD:=$(call AutoLoad,50,trelay)
+endef
+
+define KernelPackage/trelay/description
+trelay relays ethernet packets between two devices (similar to a bridge), but
+without any MAC address checks. This makes it possible to bridge client mode
+or ad-hoc mode wifi devices to ethernet VLANs, assuming the remote end uses
+the same source MAC address as the device that packets are supposed to exit
+from.
+endef
+
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	cp src/Makefile src/trelay.c $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) $(KERNEL_MAKEOPTS) SUBDIRS="$(PKG_BUILD_DIR)" modules
+endef
+
+define KernelPackage/trelay/install
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/net $(1)/etc/init.d $(1)/etc/config
+	$(INSTALL_DATA) ./files/trelay.hotplug $(1)/etc/hotplug.d/net/50-trelay
+	$(INSTALL_BIN) ./files/trelay.init $(1)/etc/init.d/trelay
+	$(INSTALL_DATA) ./files/trelay.config $(1)/etc/config/trelay
+endef
+
+$(eval $(call KernelPackage,trelay))
diff --git a/trunk/package/kernel/trelay/files/trelay.config b/trunk/package/kernel/trelay/files/trelay.config
new file mode 100644
index 00000000..eb050130
--- /dev/null
+++ b/trunk/package/kernel/trelay/files/trelay.config
@@ -0,0 +1,4 @@
+config trelay
+	option enabled	0
+	option dev1	eth0
+	option dev2	wlan0
diff --git a/trunk/package/kernel/trelay/files/trelay.hotplug b/trunk/package/kernel/trelay/files/trelay.hotplug
new file mode 100644
index 00000000..31f73784
--- /dev/null
+++ b/trunk/package/kernel/trelay/files/trelay.hotplug
@@ -0,0 +1,5 @@
+case "$ACTION" in
+	add|register)
+		[ -f /var/run/trelay.active ] && /etc/init.d/trelay start
+	;;
+esac
diff --git a/trunk/package/kernel/trelay/files/trelay.init b/trunk/package/kernel/trelay/files/trelay.init
new file mode 100644
index 00000000..c812e12c
--- /dev/null
+++ b/trunk/package/kernel/trelay/files/trelay.init
@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+START=80
+
+check_relay() {
+	local cfg="$1"
+
+	config_get_bool enabled "$cfg" enabled 1
+	[ "$enabled" -gt 0 ] || return
+
+	config_get dev1 "$cfg" dev1
+	config_get dev2 "$cfg" dev2
+
+	[ -d "/sys/kernel/debug/trelay/${dev1}-${dev2}" ] && return
+	[ -d "/sys/class/net/${dev1}" -a -d "/sys/class/net/${dev2}" ] || return
+
+	ifconfig "$dev1" up
+	ifconfig "$dev2" up
+	echo "${dev1}-${dev2},${dev1},${dev2}" > /sys/kernel/debug/trelay/add
+}
+
+start() {
+	config_load trelay
+	config_foreach check_relay trelay
+	touch /var/run/trelay.active
+}
+
+stop() {
+	rm -f /var/run/trelay.active
+	for relay in /sys/kernel/debug/trelay/*; do
+		[ -d "$relay" ] && echo > "$relay/remove"
+	done
+}
diff --git a/trunk/package/kernel/trelay/src/Makefile b/trunk/package/kernel/trelay/src/Makefile
new file mode 100644
index 00000000..e6bde896
--- /dev/null
+++ b/trunk/package/kernel/trelay/src/Makefile
@@ -0,0 +1 @@
+obj-m   := trelay.o
diff --git a/trunk/package/kernel/trelay/src/trelay.c b/trunk/package/kernel/trelay/src/trelay.c
new file mode 100644
index 00000000..8fa4374c
--- /dev/null
+++ b/trunk/package/kernel/trelay/src/trelay.c
@@ -0,0 +1,272 @@
+/*
+ * trelay.c: Trivial Ethernet Relay
+ *
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/netdevice.h>
+#include <linux/rtnetlink.h>
+#include <linux/debugfs.h>
+
+static LIST_HEAD(trelay_devs);
+static struct dentry *debugfs_dir;
+
+struct trelay {
+	struct list_head list;
+	struct net_device *dev1, *dev2;
+	struct dentry *debugfs;
+	char name[];
+};
+
+rx_handler_result_t trelay_handle_frame(struct sk_buff **pskb)
+{
+	struct net_device *dev;
+	struct sk_buff *skb = *pskb;
+
+	dev = rcu_dereference(skb->dev->rx_handler_data);
+	if (!dev)
+		return RX_HANDLER_PASS;
+
+	if (skb->protocol == htons(ETH_P_PAE))
+		return RX_HANDLER_PASS;
+
+	skb_push(skb, ETH_HLEN);
+	skb->dev = dev;
+	skb_forward_csum(skb);
+	dev_queue_xmit(skb);
+
+	return RX_HANDLER_CONSUMED;
+}
+
+static int trelay_open(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private;
+	return 0;
+}
+
+static int trelay_do_remove(struct trelay *tr)
+{
+	list_del(&tr->list);
+
+	dev_put(tr->dev1);
+	dev_put(tr->dev2);
+
+	netdev_rx_handler_unregister(tr->dev1);
+	netdev_rx_handler_unregister(tr->dev2);
+
+	debugfs_remove_recursive(tr->debugfs);
+	kfree(tr);
+
+	return 0;
+}
+
+static struct trelay *trelay_find(struct net_device *dev)
+{
+	struct trelay *tr;
+
+	list_for_each_entry(tr, &trelay_devs, list) {
+		if (tr->dev1 == dev || tr->dev2 == dev)
+			return tr;
+	}
+	return NULL;
+}
+
+static int tr_device_event(struct notifier_block *unused, unsigned long event,
+			   void *ptr)
+{
+	struct net_device *dev = ptr;
+	struct trelay *tr;
+
+	if (event != NETDEV_UNREGISTER)
+		goto out;
+
+	tr = trelay_find(dev);
+	if (!tr)
+		goto out;
+
+	trelay_do_remove(tr);
+
+out:
+	return NOTIFY_DONE;
+}
+
+static ssize_t trelay_remove_write(struct file *file, const char __user *ubuf,
+				   size_t count, loff_t *ppos)
+{
+	struct trelay *tr = file->private_data;
+	int ret;
+
+	rtnl_lock();
+	ret = trelay_do_remove(tr);
+	rtnl_unlock();
+
+	if (ret < 0)
+		 return ret;
+
+	return count;
+}
+
+static const struct file_operations fops_remove = {
+	.owner = THIS_MODULE,
+	.open = trelay_open,
+	.write = trelay_remove_write,
+	.llseek = default_llseek,
+};
+
+
+static int trelay_do_add(char *name, char *devn1, char *devn2)
+{
+	struct net_device *dev1, *dev2;
+	struct trelay *tr, *tr1;
+	int ret;
+
+	tr = kzalloc(sizeof(*tr) + strlen(name) + 1, GFP_KERNEL);
+	if (!tr)
+		return -ENOMEM;
+
+	rtnl_lock();
+	rcu_read_lock();
+
+	ret = -EEXIST;
+	list_for_each_entry(tr1, &trelay_devs, list) {
+		if (!strcmp(tr1->name, name))
+			goto out;
+	}
+
+	ret = -ENOENT;
+	dev1 = dev_get_by_name_rcu(&init_net, devn1);
+	dev2 = dev_get_by_name_rcu(&init_net, devn2);
+	if (!dev1 || !dev2)
+		goto out;
+
+	ret = netdev_rx_handler_register(dev1, trelay_handle_frame, dev2);
+	if (ret < 0)
+		goto out;
+
+	ret = netdev_rx_handler_register(dev2, trelay_handle_frame, dev1);
+	if (ret < 0) {
+		netdev_rx_handler_unregister(dev1);
+		goto out;
+	}
+
+	dev_hold(dev1);
+	dev_hold(dev2);
+
+	strcpy(tr->name, name);
+	tr->dev1 = dev1;
+	tr->dev2 = dev2;
+	list_add_tail(&tr->list, &trelay_devs);
+
+	tr->debugfs = debugfs_create_dir(name, debugfs_dir);
+	debugfs_create_file("remove", S_IWUSR, tr->debugfs, tr, &fops_remove);
+	ret = 0;
+
+out:
+	rcu_read_unlock();
+	rtnl_unlock();
+	if (ret < 0)
+		kfree(tr);
+
+	return ret;
+}
+
+static ssize_t trelay_add_write(struct file *file, const char __user *ubuf,
+				size_t count, loff_t *ppos)
+{
+	char buf[256];
+	char *dev1, *dev2, *tmp;
+	ssize_t len, ret;
+
+	len = min(count, sizeof(buf) - 1);
+	if (copy_from_user(buf, ubuf, len))
+		return -EFAULT;
+
+	buf[len] = 0;
+
+	if ((tmp = strchr(buf, '\n')))
+		*tmp = 0;
+
+	dev1 = strchr(buf, ',');
+	if (!dev1)
+		return -EINVAL;
+
+	*(dev1++) = 0;
+
+	dev2 = strchr(dev1, ',');
+	if (!dev2)
+		return -EINVAL;
+
+	*(dev2++) = 0;
+	if (strchr(dev2, ','))
+		return -EINVAL;
+
+	if (!strlen(buf) || !strlen(dev1) || !strlen(dev2))
+		return -EINVAL;
+
+	ret = trelay_do_add(buf, dev1, dev2);
+	if (ret < 0)
+		return ret;
+
+	return count;
+}
+
+static const struct file_operations fops_add = {
+	.owner = THIS_MODULE,
+	.write = trelay_add_write,
+	.llseek = default_llseek,
+};
+
+static struct notifier_block tr_dev_notifier = {
+	.notifier_call = tr_device_event
+};
+
+static int __init trelay_init(void)
+{
+	int ret;
+
+	debugfs_dir = debugfs_create_dir("trelay", NULL);
+	if (!debugfs_dir)
+		return -ENOMEM;
+
+	debugfs_create_file("add", S_IWUSR, debugfs_dir, NULL, &fops_add);
+
+	ret = register_netdevice_notifier(&tr_dev_notifier);
+	if (ret < 0)
+		goto error;
+
+	return 0;
+
+error:
+	debugfs_remove_recursive(debugfs_dir);
+	return ret;
+}
+
+static void __exit trelay_exit(void)
+{
+	struct trelay *tr, *tmp;
+
+	unregister_netdevice_notifier(&tr_dev_notifier);
+
+	rtnl_lock();
+	list_for_each_entry_safe(tr, tmp, &trelay_devs, list)
+		trelay_do_remove(tr);
+	rtnl_unlock();
+
+	debugfs_remove_recursive(debugfs_dir);
+}
+
+module_init(trelay_init);
+module_exit(trelay_exit);
+MODULE_LICENSE("GPL");
diff --git a/trunk/package/kernel/w1-gpio-custom/Makefile b/trunk/package/kernel/w1-gpio-custom/Makefile
new file mode 100644
index 00000000..bf50d1a5
--- /dev/null
+++ b/trunk/package/kernel/w1-gpio-custom/Makefile
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=w1-gpio-custom
+PKG_RELEASE:=3
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/w1-gpio-custom
+  SUBMENU:=W1 support
+  TITLE:=Custom GPIO-based 1-wire device
+  DEPENDS:=kmod-w1 +kmod-w1-master-gpio
+  FILES:=$(PKG_BUILD_DIR)/w1-gpio-custom.ko
+  KCONFIG:=
+endef
+
+define KernelPackage/w1-gpio-custom/description
+ Kernel module to register a custom w1-gpio platform device.
+endef
+
+EXTRA_KCONFIG:= \
+	CONFIG_W1_MASTER_GPIO_CUSTOM=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG))))
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,w1-gpio-custom))
+
diff --git a/trunk/package/kernel/w1-gpio-custom/src/Kconfig b/trunk/package/kernel/w1-gpio-custom/src/Kconfig
new file mode 100644
index 00000000..74b9226c
--- /dev/null
+++ b/trunk/package/kernel/w1-gpio-custom/src/Kconfig
@@ -0,0 +1,4 @@
+config W1_MASTER_GPIO_CUSTOM
+	tristate "Custom GPIO-based W1 driver"
+	depends on GENERIC_GPIO
+	select W1_GPIO
\ No newline at end of file
diff --git a/trunk/package/kernel/w1-gpio-custom/src/Makefile b/trunk/package/kernel/w1-gpio-custom/src/Makefile
new file mode 100644
index 00000000..6a527432
--- /dev/null
+++ b/trunk/package/kernel/w1-gpio-custom/src/Makefile
@@ -0,0 +1 @@
+obj-${CONFIG_W1_MASTER_GPIO_CUSTOM}	+= w1-gpio-custom.o
\ No newline at end of file
diff --git a/trunk/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c b/trunk/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c
new file mode 100644
index 00000000..fc2f8422
--- /dev/null
+++ b/trunk/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c
@@ -0,0 +1,189 @@
+/*
+ *  Custom GPIO-based W1 driver
+ *
+ *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2008 Bifferos <bifferos at yahoo.co.uk>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ * ---------------------------------------------------------------------------
+ *
+ *  The behaviour of this driver can be altered by setting some parameters
+ *  from the insmod command line.
+ *
+ *  The following parameters are adjustable:
+ *
+ *	bus0	These four arguments must be arrays of
+ *	bus1	3 unsigned integers as follows:
+ *	bus2
+ *	bus3	<id>,<pin>,<od>
+ *
+ *  where:
+ *
+ *  <id>	ID to used as device_id for the corresponding bus (required)
+ *  <sda>	GPIO pin ID of data pin (required)
+ *  <od>	Pin is configured as open drain.
+ *
+ *  See include/w1-gpio.h for more information about the parameters.
+ *
+ *  If this driver is built into the kernel, you can use the following kernel
+ *  command line parameters, with the same values as the corresponding module
+ *  parameters listed above:
+ *
+ *	w1-gpio-custom.bus0
+ *	w1-gpio-custom.bus1
+ *	w1-gpio-custom.bus2
+ *	w1-gpio-custom.bus3
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <linux/w1-gpio.h>
+
+#define DRV_NAME	"w1-gpio-custom"
+#define DRV_DESC	"Custom GPIO-based W1 driver"
+#define DRV_VERSION	"0.1.1"
+
+#define PFX		DRV_NAME ": "
+
+#define BUS_PARAM_ID		0
+#define BUS_PARAM_PIN		1
+#define BUS_PARAM_OD		2
+
+#define BUS_PARAM_REQUIRED	3
+#define BUS_PARAM_COUNT		3
+#define BUS_COUNT_MAX		4
+
+static unsigned int bus0[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus1[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus2[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus3[BUS_PARAM_COUNT] __initdata;
+
+static unsigned int bus_nump[BUS_COUNT_MAX] __initdata;
+
+#define BUS_PARM_DESC " config -> id,pin,od"
+
+module_param_array(bus0, uint, &bus_nump[0], 0);
+MODULE_PARM_DESC(bus0, "bus0" BUS_PARM_DESC);
+module_param_array(bus1, uint, &bus_nump[1], 0);
+MODULE_PARM_DESC(bus1, "bus1" BUS_PARM_DESC);
+module_param_array(bus2, uint, &bus_nump[2], 0);
+MODULE_PARM_DESC(bus2, "bus2" BUS_PARM_DESC);
+module_param_array(bus3, uint, &bus_nump[3], 0);
+MODULE_PARM_DESC(bus3, "bus3" BUS_PARM_DESC);
+
+static struct platform_device *devices[BUS_COUNT_MAX];
+static unsigned int nr_devices;
+
+static void w1_gpio_custom_cleanup(void)
+{
+	int i;
+
+	for (i = 0; i < nr_devices; i++)
+		if (devices[i])
+			platform_device_put(devices[i]);
+}
+
+static int __init w1_gpio_custom_add_one(unsigned int id, unsigned int *params)
+{
+	struct platform_device *pdev;
+	struct w1_gpio_platform_data pdata;
+	int err;
+
+	if (!bus_nump[id])
+		return 0;
+
+	if (bus_nump[id] < BUS_PARAM_REQUIRED) {
+		printk(KERN_ERR PFX "not enough parameters for bus%d\n", id);
+		err = -EINVAL;
+		goto err;
+	}
+
+	pdev = platform_device_alloc("w1-gpio", params[BUS_PARAM_ID]);
+	if (!pdev) {
+		err = -ENOMEM;
+		goto err;
+	}
+
+	pdata.pin = params[BUS_PARAM_PIN];
+	pdata.is_open_drain = params[BUS_PARAM_OD] ? 1 : 0;
+	pdata.enable_external_pullup = NULL;
+
+	err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+	if (err)
+		goto err_put;
+
+	err = platform_device_add(pdev);
+	if (err)
+		goto err_put;
+
+	devices[nr_devices++] = pdev;
+	return 0;
+
+ err_put:
+	platform_device_put(pdev);
+ err:
+	return err;
+}
+
+static int __init w1_gpio_custom_probe(void)
+{
+	int err;
+
+	nr_devices = 0;
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+
+	err = w1_gpio_custom_add_one(0, bus0);
+	if (err)
+		goto err;
+
+	err = w1_gpio_custom_add_one(1, bus1);
+	if (err)
+		goto err;
+
+	err = w1_gpio_custom_add_one(2, bus2);
+	if (err)
+		goto err;
+
+	err = w1_gpio_custom_add_one(3, bus3);
+	if (err)
+		goto err;
+
+	if (!nr_devices) {
+		printk(KERN_ERR PFX "no bus parameter(s) specified\n");
+		err = -ENODEV;
+		goto err;
+	}
+
+	return 0;
+
+err:
+	w1_gpio_custom_cleanup();
+	return err;
+}
+
+#ifdef MODULE
+static int __init w1_gpio_custom_init(void)
+{
+	return w1_gpio_custom_probe();
+}
+module_init(w1_gpio_custom_init);
+
+static void __exit w1_gpio_custom_exit(void)
+{
+	w1_gpio_custom_cleanup();
+}
+module_exit(w1_gpio_custom_exit);
+#else
+subsys_initcall(w1_gpio_custom_probe);
+#endif /* MODULE*/
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Bifferos <bifferos at yahoo.co.uk >");
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
diff --git a/trunk/package/lang/dkjson/Makefile b/trunk/package/lang/dkjson/Makefile
new file mode 100644
index 00000000..4a642287
--- /dev/null
+++ b/trunk/package/lang/dkjson/Makefile
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 20013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dkjson
+PKG_VERSION:=2.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://dkolf.de/src/dkjson-lua.fsl/tarball/
+PKG_MD5SUM:=dbe706722dd64308172cf8e37395e762
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dkjson
+	SUBMENU:=Lua
+	SECTION:=lang
+	CATEGORY:=Languages
+	TITLE:=DKJSON
+	URL:=http://dkolf.de/src/dkjson-lua.fsl/home
+	MAINTAINER:=Lars Gierth <larsg@systemli.org>
+	DEPENDS:=+lua
+endef
+
+define Package/dkjson/description
+	Lua JSON parser/serializer with UTF-8 support
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/dkjson/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dkjson.lua $(1)/usr/lib/lua/
+endef
+
+$(eval $(call BuildPackage,dkjson))
diff --git a/trunk/package/lang/erlang/Makefile b/trunk/package/lang/erlang/Makefile
new file mode 100644
index 00000000..b6193af7
--- /dev/null
+++ b/trunk/package/lang/erlang/Makefile
@@ -0,0 +1,335 @@
+#
+# Copyright (C) 2009-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=erlang
+PKG_VERSION:=17.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:= http://www.erlang.org/download/ \
+	http://erlang.mirror.su.se/
+PKG_MD5SUM:=1d0bb2d54dfe1bb6844756b99902ba20
+
+PKG_LICENSE:=ErlPL-1.1
+PKG_LICENSE_FILES:=EPLICENCE
+PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
+
+PKG_BUILD_DEPENDS:=erlang/host openssl
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/otp_src_$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/otp_src_$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/erlang/Default
+  SUBMENU:=Erlang
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Erlang/OTP programming language
+  URL:=http://www.erlang.org/
+endef
+
+define Package/erlang/Default/description
+ Erlang/OTP is a general-purpose programming language and runtime
+ environment. Erlang has built-in support for concurrency, distribution
+ and fault tolerance.
+endef
+
+define Package/erlang
+$(call Package/erlang/Default)
+  DEPENDS+= +libncurses +librt +zlib
+  PROVIDES:= erlang-erts=6.1 erlang-kernel=3.0.1 erlang-sasl=2.4 erlang-stdlib=2.1
+endef
+
+define Package/erlang/description
+$(call Package/erlang/Default/description)
+ .
+ This package contains the runtime implementation and a minimal set of
+ modules (erts, kernel, sasl & stdlib).
+endef
+
+
+define Package/erlang-asn1
+$(call Package/erlang/Default)
+  TITLE:=Abstract Syntax Notation One (ASN.1) support
+  VERSION:=3.0.1
+  DEPENDS+= +erlang +erlang-syntax-tools
+endef
+
+define Package/erlang-asn1/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides Abstract Syntax Notation One (ASN.1)
+ support.
+endef
+
+
+define Package/erlang-compiler
+$(call Package/erlang/Default)
+  TITLE:=Byte code compiler
+  VERSION:=5.0.1
+  DEPENDS+= +erlang +erlang-hipe
+endef
+
+define Package/erlang-compiler/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides a byte code compiler for Erlang which
+ produces highly compact code.
+endef
+
+
+define Package/erlang-crypto
+$(call Package/erlang/Default)
+  TITLE:=Cryptography support
+  VERSION:=3.4
+  DEPENDS+= +erlang +libopenssl
+endef
+
+define Package/erlang-crypto/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides functions for computation of message
+ digests, and encryption and decryption functions.
+endef
+
+
+define Package/erlang-hipe
+$(call Package/erlang/Default)
+  TITLE:=High Performance Erlang
+  VERSION:=3.11
+  DEPENDS+= +erlang
+endef
+
+define Package/erlang-hipe/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides HiPE (High Performance Erlang)
+ support.
+endef
+
+
+define Package/erlang-inets
+$(call Package/erlang/Default)
+  TITLE:=Internet clients and servers
+  VERSION:=5.10.2
+  DEPENDS+= +erlang
+endef
+
+define Package/erlang-inets/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides a container for Internet clients and
+ servers. Currently a FTP client, a HTTP client and server, and a tftp
+ client and server have been incorporated in Inets.
+endef
+
+
+define Package/erlang-mnesia
+$(call Package/erlang/Default)
+  TITLE:=Distributed database
+  VERSION:=4.12.1
+  DEPENDS+= +erlang
+endef
+
+define Package/erlang-mnesia/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides a distributed DataBase Management
+ System (DBMS), appropriate for telecommunications applications and
+ other Erlang applications which require continuous operation and
+ exhibit soft real-time properties.
+endef
+
+
+define Package/erlang-runtime-tools
+$(call Package/erlang/Default)
+  TITLE:=Low-profile debugging/tracing tools
+  VERSION:=1.8.14
+  DEPENDS+= +erlang
+endef
+
+define Package/erlang-runtime-tools/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides low footprint tracing/debugging tools
+ suitable for inclusion in a production system.
+endef
+
+
+define Package/erlang-snmp
+$(call Package/erlang/Default)
+  TITLE:=Simple Network Management Protocol (SNMP) support
+  VERSION:=4.25.1
+  DEPENDS+= +erlang +erlang-asn1
+endef
+
+define Package/erlang-snmp/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides Simple Network Management Protocol
+ (SNMP) support including a MIB compiler and tools for creating SNMP
+ agents.
+endef
+
+
+define Package/erlang-ssh
+$(call Package/erlang/Default)
+  TITLE:=Secure Shell (SSH) support
+  VERSION:=3.0.3
+  DEPENDS+= +erlang +erlang-crypto
+endef
+
+define Package/erlang-ssh/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides an implementation of the Secure Shell
+ protocol, with SSH & SFTP support.
+endef
+
+
+define Package/erlang-ssl
+$(call Package/erlang/Default)
+  TITLE:=Secure Sockets Layer (SSL) support
+  VERSION:=5.3.5
+  DEPENDS+= +erlang +erlang-crypto
+endef
+
+define Package/erlang-ssl/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides support for secure communication over
+ sockets.
+endef
+
+
+define Package/erlang-syntax-tools
+$(call Package/erlang/Default)
+  TITLE:=Abstract Erlang syntax trees handling support
+  VERSION:=1.6.15
+  DEPENDS+= +erlang
+endef
+
+define Package/erlang-syntax-tools/description
+$(call Package/erlang/Default/description)
+ .
+ This Erlang/OTP package provides support for handling abstract Erlang
+ syntax trees.
+endef
+
+
+# Host
+
+HOST_CONFIGURE_ARGS += \
+	--disable-hipe \
+	--disable-smp-support \
+	--without-javac
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) all
+endef
+
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) install
+endef
+
+
+# Target
+
+CONFIGURE_ARGS += \
+	--disable-hipe \
+	--disable-smp-support \
+	--without-javac \
+	--enable-dynamic-ssl-lib
+
+CONFIGURE_VARS += \
+	SHLIB_LD="$(TARGET_CC)" \
+	TARGET_ARCH="$(TARGET_ARCH)" \
+	ac_cv_func_mmap_fixed_mapped=yes \
+	ac_cv_path_WX_CONFIG_PATH=no \
+	erl_xcomp_getaddrinfo=no \
+	erl_xcomp_sysroot="$(STAGING_DIR)"
+
+EXTRA_LDFLAGS+=-lz
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		noboot
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+		install
+endef
+
+define Package/erlang/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	for f in epmd erl erlc escript run_erl; do \
+		$(CP) $(PKG_INSTALL_DIR)/usr/bin/$$$$f $(1)/usr/bin/ ; \
+	done
+	$(INSTALL_DIR) $(1)/usr/lib/erlang/bin
+	for f in erl erlc escript run_erl start start.boot start.script start_clean.boot start_erl start_sasl.boot to_erl; do \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/bin/$$$$f $(1)/usr/lib/erlang/bin/ ; \
+	done
+	$(INSTALL_DIR) $(1)/usr/lib/erlang/lib
+	for m in erts kernel sasl stdlib; do \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/lib/$$$$m-* $(1)/usr/lib/erlang/lib/ ; \
+		rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/examples ; \
+		rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/src ; \
+	done
+	$(INSTALL_DIR) $(1)/usr/lib/erlang
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/erts-* $(1)/usr/lib/erlang/
+	rm -rf $(1)/usr/lib/erlang/erts-*/{doc,include,lib,man,src}
+	rm -rf $(1)/usr/lib/erlang/erts-*/bin/*.src
+	$(INSTALL_DIR) $(1)/usr/lib/erlang/releases
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/releases/* $(1)/usr/lib/erlang/releases/
+	$(SED) 's,%ERL_ROOT%,/usr/lib/erlang,g' \
+		$(1)/usr/lib/erlang/releases/RELEASES.src
+	mv -f $(1)/usr/lib/erlang/releases/RELEASES.src \
+		$(1)/usr/lib/erlang/releases/RELEASES
+	for f in bin/erl bin/start erts-*/bin/erl erts-*/bin/start; do \
+		$(SED) 's,^\(ROOTDIR\)=.*,\1=/usr/lib/erlang,g' \
+			$(1)/usr/lib/erlang/$$$$f ; \
+	done
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/erl_interface/obj/*/*.a $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/lib/erl_interface/include/*.h $(1)/usr/include
+endef
+
+define BuildModule
+
+  define Package/erlang-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/erlang/lib
+	for m in $(2); do \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/lib/$$$$$$$$m-* $$(1)/usr/lib/erlang/lib/ ; \
+		rm -rf $$(1)/usr/lib/erlang/lib/$$$$$$$$m-*/{examples,priv/obj,src} ; \
+	done
+  endef
+
+  $$(eval $$(call BuildPackage,erlang-$(1)))
+
+endef
+
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,erlang))
+$(eval $(call BuildModule,asn1,asn1))
+$(eval $(call BuildModule,compiler,compiler))
+$(eval $(call BuildModule,crypto,crypto))
+$(eval $(call BuildModule,hipe,hipe))
+$(eval $(call BuildModule,inets,inets))
+$(eval $(call BuildModule,mnesia,mnesia))
+$(eval $(call BuildModule,runtime-tools,runtime_tools))
+$(eval $(call BuildModule,snmp,snmp))
+$(eval $(call BuildModule,ssh,ssh))
+$(eval $(call BuildModule,ssl,ssl))
+$(eval $(call BuildModule,syntax-tools,syntax_tools))
diff --git a/trunk/package/lang/erlang/patches/101-emulator_includes.patch b/trunk/package/lang/erlang/patches/101-emulator_includes.patch
new file mode 100644
index 00000000..5a413af4
--- /dev/null
+++ b/trunk/package/lang/erlang/patches/101-emulator_includes.patch
@@ -0,0 +1,11 @@
+--- a/erts/emulator/Makefile.in
++++ b/erts/emulator/Makefile.in
+@@ -682,7 +682,7 @@ $(OBJDIR)/beam_emu.o: beam/beam_emu.c
+ endif
+ 
+ $(OBJDIR)/%.o: beam/%.c
+-	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
++	$(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
+ 
+ $(OBJDIR)/%.o: $(TARGET)/%.c
+ 	$(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
diff --git a/trunk/package/lang/erlang/patches/103-disable_emacs.patch b/trunk/package/lang/erlang/patches/103-disable_emacs.patch
new file mode 100644
index 00000000..94121952
--- /dev/null
+++ b/trunk/package/lang/erlang/patches/103-disable_emacs.patch
@@ -0,0 +1,11 @@
+--- a/lib/tools/Makefile
++++ b/lib/tools/Makefile
+@@ -23,7 +23,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
+ # Macros
+ # ----------------------------------------------------
+ 
+-SUB_DIRECTORIES = c_src src doc/src examples priv emacs
++SUB_DIRECTORIES = c_src src doc/src examples priv
+ 
+ include vsn.mk
+ VSN = $(TOOLS_VSN)
diff --git a/trunk/package/lang/lua-bencode/Makefile b/trunk/package/lang/lua-bencode/Makefile
new file mode 100644
index 00000000..0b320560
--- /dev/null
+++ b/trunk/package/lang/lua-bencode/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 20013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-bencode
+PKG_VERSION:=2.1.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://bitbucket.org/wilhelmy/lua-bencode
+PKG_SOURCE_PROTO:=hg
+PKG_SOURCE_VERSION:=500243383cb6acbddd3cf12aee6e4667aab53324
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lua-bencode
+	SUBMENU:=Lua
+	SECTION:=lang
+	CATEGORY:=Languages
+	TITLE:=lua-bencode
+	URL:=https://bitbucket.org/wilhelmy/lua-bencode
+	MAINTAINER:=Lars Gierth <larsg@systemli.org>
+	DEPENDS:=+lua
+endef
+
+define Package/lua-bencode/description
+	This is a module for the lua programming language for decoding and encoding
+	bencoded data which can be used to read and write torrent files for bittorrent.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+
+define Package/lua-bencode/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/bencode.lua $(1)/usr/lib/lua
+endef
+
+$(eval $(call BuildPackage,lua-bencode))
diff --git a/trunk/package/lang/lua-mosquitto/Makefile b/trunk/package/lang/lua-mosquitto/Makefile
new file mode 100644
index 00000000..a8d625f1
--- /dev/null
+++ b/trunk/package/lang/lua-mosquitto/Makefile
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-mosquitto
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE:=v$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/flukso/$(PKG_NAME)/archive/
+PKG_MD5SUM:=fd26fa08fc855ba4a66ce521fe5aae13
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+    SUBMENU:=Lua
+    SECTION:=lang
+    CATEGORY:=Languages
+    TITLE:=Lua-mosquitto
+    DEPENDS:=+libmosquitto +lua
+    MAINTAINER:=Karl Palsson <karlp@remake.is>
+endef
+
+define Package/$(PKG_NAME)/description
+	Lua bindings to libmosquitto
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto.so $(1)/usr/lib/lua
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/trunk/package/lang/lua-penlight/Makefile b/trunk/package/lang/lua-penlight/Makefile
new file mode 100644
index 00000000..e06f4c25
--- /dev/null
+++ b/trunk/package/lang/lua-penlight/Makefile
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-penlight
+PKG_VERSION:=1.3.1
+PKG_RELEASE:=1
+PKG_BUILD_DIR:=$(BUILD_DIR)/Penlight-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/stevedonovan/Penlight/archive/
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILE:=LICENSE.md
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Penlight
+  URL:=http://stevedonovan.github.io/Penlight/api/manual/01-introduction.md.html
+  DEPENDS:=+luafilesystem
+  MAINTAINER:= Karl Palsson <karlp@remake.is>
+endef
+
+define Package/$(PKG_NAME)/description
+  It is often said of Lua that it does not include batteries.
+  Penlight is the batteries.
+endef
+
+define Build/Compile
+	echo "Nothing to compile, pure lua package"
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(CP) $(PKG_BUILD_DIR)/lua/pl $(1)/usr/lib/lua
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/trunk/package/lang/lua-sha2/Makefile b/trunk/package/lang/lua-sha2/Makefile
new file mode 100644
index 00000000..6a82334e
--- /dev/null
+++ b/trunk/package/lang/lua-sha2/Makefile
@@ -0,0 +1,52 @@
+#
+# Copyright (C) 20013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-sha2
+PKG_VERSION:=0.2.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://code.google.com/p/sha2/
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=02bd4bfdc806
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lua-sha2
+	SUBMENU:=Lua
+	SECTION:=lang
+	CATEGORY:=Languages
+	TITLE:=Lua binding for Aaron Gifford's SHA-2 implementation
+	URL:=https://code.google.com/p/sha2/
+	MAINTAINER:=Lars Gierth <larsg@systemli.org>
+	DEPENDS:=+lua
+endef
+
+define Package/lua-sha2/description
+	Lua Binding for the SHA-2 (SHA-256/384/512) BSD-licensed C implementation by Aaron Gifford.
+	Also contains a HMAC implementation in Lua.
+endef
+
+TARGET_CFLAGS += -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN
+TARGET_LDFLAGS += -fPIC -DSHA2_USE_INTTYPES_H -DBYTE_ORDER -DLITTLE_ENDIAN
+
+define Build/Configure
+endef
+
+define Package/lua-sha2/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua/hmac
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/sha2.so $(1)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac.lua $(1)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/sha2.lua $(1)/usr/lib/lua/hmac
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hmac/md5.lua $(1)/usr/lib/lua/hmac
+endef
+
+$(eval $(call BuildPackage,lua-sha2))
diff --git a/trunk/package/lang/lua-sha2/patches/001-makefile.patch b/trunk/package/lang/lua-sha2/patches/001-makefile.patch
new file mode 100644
index 00000000..e395044e
--- /dev/null
+++ b/trunk/package/lang/lua-sha2/patches/001-makefile.patch
@@ -0,0 +1,14 @@
+From: Lars Gierth <larsg@systemli.org>
+Date: Tue, 2 Sep 2014 00:05:39 +0200
+
+    Add rump Makefile
+
+new file mode 100644
+index 0000000..f081d38
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,4 @@
++all: sha2.o sha2lib.o
++	$(CC) -shared -o sha2.so sha2.o sha2lib.o
++
++.PHONY: all
diff --git a/trunk/package/lang/luabitop/Makefile b/trunk/package/lang/luabitop/Makefile
new file mode 100644
index 00000000..eda6f9b8
--- /dev/null
+++ b/trunk/package/lang/luabitop/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luabitop
+PKG_VERSION:=1.0.2
+PKG_RELEASE:=1
+
+_BASENAME:=LuaBitOp
+
+PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
+PKG_SOURCE:=$(_BASENAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://bitop.luajit.org/download/
+PKG_MD5SUM:=d0c1080fe0c844e8477279668e2d0d06
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(_BASENAME)-$(PKG_VERSION)
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luabitop
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=luabitop
+  URL:=http://bitop.luajit.org/
+  DEPENDS:=+lua
+endef
+
+define Package/luabitop/description
+Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise operations on numbers.
+endef
+
+define Build/Configure
+endef
+
+
+TARGET_CFLAGS += $(FPIC) -DLUA_USE_LINUX -DLUA_NUMBER_DOUBLE
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) -std=gnu99 $(FPIC) -DLUA_USE_LINUX -shared -o $(PKG_BUILD_DIR)/bit.so $(PKG_BUILD_DIR)/bit.c
+endef
+
+define Package/luabitop/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bit.so $(1)/usr/lib/lua
+endef
+
+$(eval $(call BuildPackage,luabitop))
diff --git a/trunk/package/lang/luaexpat/Makefile b/trunk/package/lang/luaexpat/Makefile
new file mode 100644
index 00000000..6b73254d
--- /dev/null
+++ b/trunk/package/lang/luaexpat/Makefile
@@ -0,0 +1,56 @@
+# 
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luaexpat
+PKG_VERSION:=1.3.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://matthewwild.co.uk/projects/luaexpat
+PKG_MD5SUM:=3c20b5795e7107f847f8da844fbfe2da
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luaexpat
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LuaExpat 
+  URL:=http://www.keplerproject.org/luaexpat/
+  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+  DEPENDS:=+lua +libexpat
+endef
+
+define Package/luaexpat/description
+  LuaExpat is a SAX XML parser based on the Expat library.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(CP) files/compat-5.1r5 $(PKG_BUILD_DIR)/compat-5.1r5
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	EXPAT_INC="-I$(STAGING_DIR)/usr/include/" \
+	LUA_INC="-I$(STAGING_DIR)/usr/include/" \
+	LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \
+	COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \
+	LIB_OPTION="-shared $(TARGET_LDFLAGS)" \
+	CC="$(TARGET_CC) $(TARGET_CFLAGS) $(FPIC) -std=c99" \
+	LD="$(TARGET_CROSS)ld -shared" 
+endef
+
+define Package/luaexpat/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp.so $(1)/usr/lib/lua/lxp.so
+	$(INSTALL_DIR) $(1)/usr/lib/lua/lxp
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp/lom.lua $(1)/usr/lib/lua/lxp
+endef
+
+$(eval $(call BuildPackage,luaexpat))
diff --git a/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.c b/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.c
new file mode 100644
index 00000000..6fdb8b7b
--- /dev/null
+++ b/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.c
@@ -0,0 +1,97 @@
+/*
+** Compat-5.1
+** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat)
+** $Id: compat-5.1.c,v 1.13 2006/02/20 21:12:47 carregal Exp $
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "lua.h"
+#include "lauxlib.h"
+#include "compat-5.1.h"
+
+static void getfield(lua_State *L, int idx, const char *name) {
+    const char *end = strchr(name, '.');
+    lua_pushvalue(L, idx);
+    while (end) {
+        lua_pushlstring(L, name, end - name);
+        lua_gettable(L, -2);
+        lua_remove(L, -2);
+        if (lua_isnil(L, -1)) return;
+        name = end+1;
+        end = strchr(name, '.');
+    }
+    lua_pushstring(L, name);
+    lua_gettable(L, -2);
+    lua_remove(L, -2);
+}
+
+static void setfield(lua_State *L, int idx, const char *name) {
+    const char *end = strchr(name, '.');
+    lua_pushvalue(L, idx);
+    while (end) {
+        lua_pushlstring(L, name, end - name);
+        lua_gettable(L, -2);
+        /* create table if not found */
+        if (lua_isnil(L, -1)) {
+            lua_pop(L, 1);
+            lua_newtable(L);
+            lua_pushlstring(L, name, end - name);
+            lua_pushvalue(L, -2);
+            lua_settable(L, -4);
+        }
+        lua_remove(L, -2);
+        name = end+1;
+        end = strchr(name, '.');
+    }
+    lua_pushstring(L, name);
+    lua_pushvalue(L, -3);
+    lua_settable(L, -3);
+    lua_pop(L, 2);
+}
+
+LUALIB_API void luaL_module(lua_State *L, const char *libname,
+                              const luaL_reg *l, int nup) {
+  if (libname) {
+    getfield(L, LUA_GLOBALSINDEX, libname);  /* check whether lib already exists */
+    if (lua_isnil(L, -1)) { 
+      int env, ns;
+      lua_pop(L, 1); /* get rid of nil */
+      lua_pushliteral(L, "require");
+      lua_gettable(L, LUA_GLOBALSINDEX); /* look for require */
+      lua_getfenv(L, -1); /* getfenv(require) */
+      lua_remove(L, -2); /* remove function require */
+      env = lua_gettop(L);
+
+      lua_newtable(L); /* create namespace for lib */
+      ns = lua_gettop(L);
+      getfield(L, env, "package.loaded"); /* get package.loaded table */
+      if (lua_isnil(L, -1)) { /* create package.loaded table */
+          lua_pop(L, 1); /* remove previous result */
+          lua_newtable(L);
+          lua_pushvalue(L, -1);
+          setfield(L, env, "package.loaded");
+      }
+      else if (!lua_istable(L, -1))
+        luaL_error(L, "name conflict for library `%s'", libname);
+      lua_pushstring(L, libname);
+      lua_pushvalue(L, ns); 
+      lua_settable(L, -3); /* package.loaded[libname] = ns */
+      lua_pop(L, 1); /* get rid of package.loaded table */
+      lua_pushvalue(L, ns); /* copy namespace */
+      setfield(L, LUA_GLOBALSINDEX, libname);
+      lua_remove (L, env); /* remove env */
+    }
+    lua_insert(L, -(nup+1));  /* move library table to below upvalues */
+  }
+  for (; l->name; l++) {
+    int i;
+    lua_pushstring(L, l->name);
+    for (i=0; i<nup; i++)  /* copy upvalues to the top */
+      lua_pushvalue(L, -(nup+1));
+    lua_pushcclosure(L, l->func, nup);
+    lua_settable(L, -(nup+3));
+  }
+  lua_pop(L, nup);  /* remove upvalues */
+}
+
diff --git a/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.h b/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.h
new file mode 100644
index 00000000..97570d9c
--- /dev/null
+++ b/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.h
@@ -0,0 +1,13 @@
+/*
+** Compat-5.1
+** Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat/)
+** $Id: compat-5.1.h,v 1.8 2006/02/20 21:12:47 carregal Exp $
+*/
+
+#ifndef COMPAT_H
+
+LUALIB_API void luaL_module(lua_State *L, const char *libname,
+                                       const luaL_reg *l, int nup);
+#define luaL_openlib luaL_module
+
+#endif
diff --git a/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua b/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua
new file mode 100644
index 00000000..0938d56a
--- /dev/null
+++ b/trunk/package/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua
@@ -0,0 +1,267 @@
+--
+-- Compat-5.1
+-- Copyright Kepler Project 2004-2006 (http://www.keplerproject.org/compat)
+-- According to Lua 5.1
+-- $Id: compat-5.1.lua,v 1.22 2006/02/20 21:12:47 carregal Exp $
+--
+
+_COMPAT51 = "Compat-5.1 R5"
+
+local LUA_DIRSEP = '/'
+local LUA_OFSEP = '_'
+local OLD_LUA_OFSEP = ''
+local POF = 'luaopen_'
+local LUA_PATH_MARK = '?'
+local LUA_IGMARK = ':'
+
+local assert, error, getfenv, ipairs, loadfile, loadlib, pairs, setfenv, setmetatable, type = assert, error, getfenv, ipairs, loadfile, loadlib, pairs, setfenv, setmetatable, type
+local find, format, gfind, gsub, sub = string.find, string.format, string.gfind, string.gsub, string.sub
+
+--
+-- avoid overwriting the package table if it's already there
+--
+package = package or {}
+local _PACKAGE = package
+
+package.path = LUA_PATH or os.getenv("LUA_PATH") or
+             ("./?.lua;" ..
+              "/usr/local/share/lua/5.0/?.lua;" ..
+              "/usr/local/share/lua/5.0/?/?.lua;" ..
+              "/usr/local/share/lua/5.0/?/init.lua" )
+ 
+package.cpath = LUA_CPATH or os.getenv("LUA_CPATH") or
+             "./?.so;" ..
+             "./l?.so;" ..
+             "/usr/local/lib/lua/5.0/?.so;" ..
+             "/usr/local/lib/lua/5.0/l?.so"
+
+--
+-- make sure require works with standard libraries
+--
+package.loaded = package.loaded or {}
+package.loaded.debug = debug
+package.loaded.string = string
+package.loaded.math = math
+package.loaded.io = io
+package.loaded.os = os
+package.loaded.table = table 
+package.loaded.base = _G
+package.loaded.coroutine = coroutine
+local _LOADED = package.loaded
+
+--
+-- avoid overwriting the package.preload table if it's already there
+--
+package.preload = package.preload or {}
+local _PRELOAD = package.preload
+
+
+--
+-- looks for a file `name' in given path
+--
+local function findfile (name, pname)
+	name = gsub (name, "%.", LUA_DIRSEP)
+	local path = _PACKAGE[pname]
+	assert (type(path) == "string", format ("package.%s must be a string", pname))
+	for c in gfind (path, "[^;]+") do
+		c = gsub (c, "%"..LUA_PATH_MARK, name)
+		local f = io.open (c)
+		if f then
+			f:close ()
+			return c
+		end
+	end
+	return nil -- not found
+end
+
+
+--
+-- check whether library is already loaded
+--
+local function loader_preload (name)
+	assert (type(name) == "string", format (
+		"bad argument #1 to `require' (string expected, got %s)", type(name)))
+	assert (type(_PRELOAD) == "table", "`package.preload' must be a table")
+	return _PRELOAD[name]
+end
+
+
+--
+-- Lua library loader
+--
+local function loader_Lua (name)
+	assert (type(name) == "string", format (
+		"bad argument #1 to `require' (string expected, got %s)", type(name)))
+	local filename = findfile (name, "path")
+	if not filename then
+		return false
+	end
+	local f, err = loadfile (filename)
+	if not f then
+		error (format ("error loading module `%s' (%s)", name, err))
+	end
+	return f
+end
+
+
+local function mkfuncname (name)
+	name = gsub (name, "^.*%"..LUA_IGMARK, "")
+	name = gsub (name, "%.", LUA_OFSEP)
+	return POF..name
+end
+
+local function old_mkfuncname (name)
+	--name = gsub (name, "^.*%"..LUA_IGMARK, "")
+	name = gsub (name, "%.", OLD_LUA_OFSEP)
+	return POF..name
+end
+
+--
+-- C library loader
+--
+local function loader_C (name)
+	assert (type(name) == "string", format (
+		"bad argument #1 to `require' (string expected, got %s)", type(name)))
+	local filename = findfile (name, "cpath")
+	if not filename then
+		return false
+	end
+	local funcname = mkfuncname (name)
+	local f, err = loadlib (filename, funcname)
+	if not f then
+		funcname = old_mkfuncname (name)
+		f, err = loadlib (filename, funcname)
+		if not f then
+			error (format ("error loading module `%s' (%s)", name, err))
+		end
+	end
+	return f
+end
+
+
+local function loader_Croot (name)
+	local p = gsub (name, "^([^.]*).-$", "%1")
+	if p == "" then
+		return
+	end
+	local filename = findfile (p, "cpath")
+	if not filename then
+		return
+	end
+	local funcname = mkfuncname (name)
+	local f, err, where = loadlib (filename, funcname)
+	if f then
+		return f
+	elseif where ~= "init" then
+		error (format ("error loading module `%s' (%s)", name, err))
+	end
+end
+
+-- create `loaders' table
+package.loaders = package.loaders or { loader_preload, loader_Lua, loader_C, loader_Croot, }
+local _LOADERS = package.loaders
+
+
+--
+-- iterate over available loaders
+--
+local function load (name, loaders)
+	-- iterate over available loaders
+	assert (type (loaders) == "table", "`package.loaders' must be a table")
+	for i, loader in ipairs (loaders) do
+		local f = loader (name)
+		if f then
+			return f
+		end
+	end
+	error (format ("module `%s' not found", name))
+end
+
+-- sentinel
+local sentinel = function () end
+
+--
+-- new require
+--
+function _G.require (modname)
+	assert (type(modname) == "string", format (
+		"bad argument #1 to `require' (string expected, got %s)", type(name)))
+	local p = _LOADED[modname]
+	if p then -- is it there?
+		if p == sentinel then
+			error (format ("loop or previous error loading module '%s'", modname))
+		end
+		return p -- package is already loaded
+	end
+	local init = load (modname, _LOADERS)
+	_LOADED[modname] = sentinel
+	local actual_arg = _G.arg
+	_G.arg = { modname }
+	local res = init (modname)
+	if res then
+		_LOADED[modname] = res
+	end
+	_G.arg = actual_arg
+	if _LOADED[modname] == sentinel then
+		_LOADED[modname] = true
+	end
+	return _LOADED[modname]
+end
+
+
+-- findtable
+local function findtable (t, f)
+	assert (type(f)=="string", "not a valid field name ("..tostring(f)..")")
+	local ff = f.."."
+	local ok, e, w = find (ff, '(.-)%.', 1)
+	while ok do
+		local nt = rawget (t, w)
+		if not nt then
+			nt = {}
+			t[w] = nt
+		elseif type(t) ~= "table" then
+			return sub (f, e+1)
+		end
+		t = nt
+		ok, e, w = find (ff, '(.-)%.', e+1)
+	end
+	return t
+end
+
+--
+-- new package.seeall function
+--
+function _PACKAGE.seeall (module)
+	local t = type(module)
+	assert (t == "table", "bad argument #1 to package.seeall (table expected, got "..t..")")
+	local meta = getmetatable (module)
+	if not meta then
+		meta = {}
+		setmetatable (module, meta)
+	end
+	meta.__index = _G
+end
+
+
+--
+-- new module function
+--
+function _G.module (modname, ...)
+	local ns = _LOADED[modname]
+	if type(ns) ~= "table" then
+		ns = findtable (_G, modname)
+		if not ns then
+			error (string.format ("name conflict for module '%s'", modname))
+		end
+		_LOADED[modname] = ns
+	end
+	if not ns._NAME then
+		ns._NAME = modname
+		ns._M = ns
+		ns._PACKAGE = gsub (modname, "[^.]*$", "")
+	end
+	setfenv (2, ns)
+	for i, f in ipairs (arg) do
+		f (ns)
+	end
+end
diff --git a/trunk/package/lang/luafilesystem/Makefile b/trunk/package/lang/luafilesystem/Makefile
new file mode 100644
index 00000000..13abef6a
--- /dev/null
+++ b/trunk/package/lang/luafilesystem/Makefile
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luafilesystem
+PKG_VERSION:=1.6.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/keplerproject/luafilesystem.git
+PKG_SOURCE_VERSION:=2fd989cd6c777583be1c93616018c55b2cbb1bcf
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luafilesystem
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LuaFileSystem
+  URL:=http://keplerproject.github.com/luafilesystem/
+  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+  DEPENDS:=+liblua
+endef
+
+define Package/luafilesystem/description
+ This package contains the LuaFileSystem library, a set of portable
+ functions for directory creation, listing and deletion and for file
+ locking.
+endef
+
+define Build/Configure
+endef
+
+TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS)
+
+TARGET_LDFLAGS += -llua
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+	$(TARGET_CROSS)ar r $(PKG_BUILD_DIR)/src/luafilesystem.a $(PKG_BUILD_DIR)/src/lfs.o
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)/usr/lib/lua
+endef
+
+define Package/luafilesystem/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/lfs.so
+endef
+
+$(eval $(call BuildPackage,luafilesystem))
diff --git a/trunk/package/lang/luai2c/Makefile b/trunk/package/lang/luai2c/Makefile
new file mode 100755
index 00000000..2a7dbbfb
--- /dev/null
+++ b/trunk/package/lang/luai2c/Makefile
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luai2c
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=2
+PKG_MAINTAINER:=Frank Edelhaeuser <fedel@users.sourceforge.net>
+
+PKG_SOURCE_NAME:=i2c-lua
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_SOURCE_NAME)
+PKG_MD5SUM:=7098577f101410b201cd43a7467e408d
+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luai2c
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Lua I2C binding
+  URL:=http://sourceforge.net/projects/i2c-lua/
+  DEPENDS:=+liblua +kmod-i2c-core
+  MAINTAINER:=Frank Edelhaeuser <fedel@users.sourceforge.net>
+endef
+
+define Package/luai2c/description
+	This is the Lua binding for I2C. It provides access to I2C slaves supported by the kernel.
+endef
+
+define Package/luai2c/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/i2c.so $(1)/usr/lib/lua
+	$(INSTALL_DIR) $(1)/usr/lib/lua/i2c
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/* $(1)/usr/lib/lua/i2c
+endef
+
+$(eval $(call BuildPackage,luai2c))
diff --git a/trunk/package/lang/lualanes/Makefile b/trunk/package/lang/lualanes/Makefile
new file mode 100644
index 00000000..4a8e9dc1
--- /dev/null
+++ b/trunk/package/lang/lualanes/Makefile
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lualanes
+PKG_REV:=aa9bfcf2dd49f55f11b27e7c21d5b75d81ccfc7e
+PKG_VERSION:=3.9.4
+PKG_RELEASE=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
+PKG_SOURCE_URL:=https://github.com/LuaLanes/lanes.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
+PKG_BUILD_DEPENDS:=lua/host luac/host
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lualanes
+	SUBMENU:=Lua
+	SECTION:=lang
+	CATEGORY:=Languages
+	TITLE:=LuaLanes
+	URL:=http://luaforge.net/projects/lanes/
+	DEPENDS:=+lua +luac +liblua +libpthread
+	MAINTAINER:=Vladimir Malyutin <first-leon@yandex.ru>
+endef
+
+define Package/lualanes/description
+	Lanes is a lightweight, native, lazy evaluating multithreading library for Lua 5.1 and 5.2.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) all \
+        CC="$(TARGET_CC)" \
+        LUA="$(STAGING_DIR_HOST)/bin/lua" \
+        LUAC="$(STAGING_DIR_HOST)/bin/luac" \
+        OPT_FLAGS="$(TARGET_CFLAGS) --std=c99 -Dpthread_yield=sched_yield"
+endef
+
+define Package/lualanes/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lanes.lua $(1)/usr/lib/lua/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/lanes
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lanes/core.so $(1)/usr/lib/lua/lanes/core.so
+endef
+
+$(eval $(call BuildPackage,lualanes))
diff --git a/trunk/package/lang/luaposix/Makefile b/trunk/package/lang/luaposix/Makefile
new file mode 100644
index 00000000..a3cd736d
--- /dev/null
+++ b/trunk/package/lang/luaposix/Makefile
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luaposix
+PKG_VERSION:=v33.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=release-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/luaposix/luaposix/archive/
+PKG_MD5SUM:=3241c33566542b7563ae001112646af6
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
+PKG_REMOVE_FILES:=aclocal.m4
+PKG_FIXUP:=autoreconf
+PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luaposix
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=luaposix
+  URL:=http://luaforge.net/projects/luaposix/
+  DEPENDS:=+lua +librt +luabitop
+  PKG_BUILD_DEPENDS:=+lua/host
+endef
+
+define Package/luaposix/description
+  luaposix is a general POSIX library for Lua providing access
+  to various low level libc functions.
+endef
+
+TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99
+
+ifneq ($(CONFIG_USE_EGLIBC),)
+  ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),)
+    TARGET_CFLAGS += -DNO_GETLOGIN
+  endif
+endif
+
+
+define Package/luaposix/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ext/posix/.libs/posix.so $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/posix.lua $(1)/usr/lib/lua
+endef
+
+$(eval $(call BuildPackage,luaposix))
diff --git a/trunk/package/lang/luaposix/patches/100-eglibc-compat.patch b/trunk/package/lang/luaposix/patches/100-eglibc-compat.patch
new file mode 100644
index 00000000..7fc02859
--- /dev/null
+++ b/trunk/package/lang/luaposix/patches/100-eglibc-compat.patch
@@ -0,0 +1,29 @@
+diff -Naur luaposix-release-v33.0.0.orig/ext/posix/unistd.c luaposix-release-v33.0.0/ext/posix/unistd.c
+--- luaposix-release-v33.0.0.orig/ext/posix/unistd.c	2014-11-04 17:49:35.000000000 +0200
++++ luaposix-release-v33.0.0/ext/posix/unistd.c	2014-12-14 00:59:14.878622722 +0200
+@@ -526,6 +526,7 @@
+ #endif
+ 
+ 
++#ifndef NO_GETLOGIN
+ /***
+ Current logged-in user.
+ @treturn[1] string username, if successful
+@@ -538,6 +539,7 @@
+ 	checknargs(L, 0);
+ 	return pushstringresult(getlogin());
+ }
++#endif
+ 
+ 
+ /***
+@@ -1037,7 +1039,9 @@
+ 	LPOSIX_FUNC( Pgetegid		),
+ 	LPOSIX_FUNC( Pgeteuid		),
+ 	LPOSIX_FUNC( Pgetgid		),
++#ifndef NO_GETLOGIN
+ 	LPOSIX_FUNC( Pgetlogin		),
++#endif
+ 	LPOSIX_FUNC( Pgetpgrp		),
+ 	LPOSIX_FUNC( Pgetpid		),
+ 	LPOSIX_FUNC( Pgetppid		),
diff --git a/trunk/package/lang/luaposix/patches/101-disable-curses.patch b/trunk/package/lang/luaposix/patches/101-disable-curses.patch
new file mode 100644
index 00000000..0ea052b1
--- /dev/null
+++ b/trunk/package/lang/luaposix/patches/101-disable-curses.patch
@@ -0,0 +1,30 @@
+diff -Naur luaposix-release-v33.0.0.orig/ext/posix/posix.c luaposix-release-v33.0.0/ext/posix/posix.c
+--- luaposix-release-v33.0.0.orig/ext/posix/posix.c	2014-11-04 17:49:35.000000000 +0200
++++ luaposix-release-v33.0.0/ext/posix/posix.c	2014-12-14 01:49:44.486562194 +0200
+@@ -11,7 +11,6 @@
+  */
+ 
+ #include "ctype.c"
+-#include "curses.c"
+ #include "dirent.c"
+ #include "errno.c"
+ #include "fcntl.c"
+diff -Naur luaposix-release-v33.0.0.orig/configure.ac luaposix-release-v33.0.0/configure.ac
+--- luaposix-release-v33.0.0.orig/configure.ac	2014-11-04 17:49:35.000000000 +0200
++++ luaposix-release-v33.0.0/configure.ac	2014-12-14 01:58:08.214554482 +0200
+@@ -109,15 +109,6 @@
+   AC_SUBST([LIBRT], [-lrt])
+ fi
+ 
+-dnl Curses
+-AX_WITH_CURSES
+-AC_ARG_VAR(CURSES_LIB, [linker flags for curses library])
+-
+-save_LIBS=$LIBS
+-LIBS="$CURSES_LIB $LIBS"
+-AC_CHECK_FUNCS([resizeterm])
+-LIBS=$save_LIBS
+-
+ dnl Lua 5.1 or 5.2
+ AX_PROG_LUA(5.1, 5.3)
+ AX_LUA_HEADERS
diff --git a/trunk/package/lang/luasec/Makefile b/trunk/package/lang/luasec/Makefile
new file mode 100644
index 00000000..4f212304
--- /dev/null
+++ b/trunk/package/lang/luasec/Makefile
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2009-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luasec
+PKG_VERSION:=0.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://files.luaforge.net/releases/luasec/LuaSec/LuaSec0.4/
+PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luasec
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LuaSec
+  URL:=http://luasec.luaforge.net/
+  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+  DEPENDS:=+lua +libopenssl +luasocket
+endef
+
+define Package/luasec/description
+  LuaSec is a binding for OpenSSL library to provide TLS/SSL communication.
+endef
+
+define Build/Configure
+endef
+
+MAKE_PATH = ./src
+
+MAKE_FLAGS += \
+	INCDIR="$(TARGET_CPPFLAGS)" \
+	LIBDIR="$(TARGET_LDFLAGS)" \
+	CC="$(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99" \
+	LD="$(TARGET_CROSS)ld -shared" \
+	LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
+	LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
+	linux \
+
+define Package/luasec/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.so $(1)/usr/lib/lua/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.lua $(1)/usr/lib/lua/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/ssl
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl/https.lua $(1)/usr/lib/lua/ssl/
+endef
+
+$(eval $(call BuildPackage,luasec))
diff --git a/trunk/package/lang/luasoap/Makefile b/trunk/package/lang/luasoap/Makefile
new file mode 100644
index 00000000..6ebf03b7
--- /dev/null
+++ b/trunk/package/lang/luasoap/Makefile
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luasoap
+PKG_VERSION:=2014-08-21
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/tomasguisasola/luasoap.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=af1e100281cee4b972df10121e37e51d53367a98
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=
+
+PKG_MAINTAINER:=Liu Peng <pengliu@credosemi.com>
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luasoap
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LuaSOAP
+  URL:=https://github.com/tomasguisasola/luasoap
+  DEPENDS:=+lua +luaexpat +luasec +luasocket
+endef
+
+define Package/luasoap/description
+  LuaSOAP is a library of functions to deal with SOAP.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/luasoap/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/soap.lua $(1)/usr/lib/lua/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/soap
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{client,server}.lua $(1)/usr/lib/lua/soap/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/soap/client
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/client/https.lua $(1)/usr/lib/lua/soap/client/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/soap/tests
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/tests/test{,-http,-server}.lua $(1)/usr/lib/lua/soap/tests/
+endef
+
+$(eval $(call BuildPackage,luasoap))
diff --git a/trunk/package/lang/luasocket/Makefile b/trunk/package/lang/luasocket/Makefile
new file mode 100644
index 00000000..ceb70772
--- /dev/null
+++ b/trunk/package/lang/luasocket/Makefile
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luasocket
+PKG_SOURCE_VERSION:=6d5e40c324c84d9c1453ae88e0ad5bdd0a631448
+PKG_VERSION:=3.0-rc1-20130909
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://github.com/diegonehab/luasocket.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luasocket
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LuaSocket
+  URL:=http://luasocket.luaforge.net/
+  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+  DEPENDS:=+lua
+endef
+
+define Package/luasocket/description
+  LuaSocket is the most comprehensive networking support
+  library for the Lua language. It provides easy access to
+  TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/ \
+		LIBDIR="$(TARGET_LDFLAGS)" \
+		CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
+		LD="$(TARGET_CROSS)ld -shared" \
+		all
+endef
+
+
+define Package/luasocket/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime.so.1.0.3 $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.3.0-rc1 $(1)/usr/lib/lua
+	$(INSTALL_DIR) $(1)/usr/lib/lua/mime
+	ln -sf ../mime.so.1.0.3 $(1)/usr/lib/lua/mime/core.so
+	$(INSTALL_DIR) $(1)/usr/lib/lua/socket
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url,headers}.lua $(1)/usr/lib/lua/socket
+	ln -sf ../socket.so.3.0-rc1 $(1)/usr/lib/lua/socket/core.so
+endef
+
+$(eval $(call BuildPackage,luasocket))
diff --git a/trunk/package/lang/luasocket/patches/0001-Add-interface-support.patch b/trunk/package/lang/luasocket/patches/0001-Add-interface-support.patch
new file mode 100644
index 00000000..3be42ed5
--- /dev/null
+++ b/trunk/package/lang/luasocket/patches/0001-Add-interface-support.patch
@@ -0,0 +1,237 @@
+From 96fdf07acf78ecfc9be76a8b0591f38fe6f1a875 Mon Sep 17 00:00:00 2001
+From: Steven Barth <steven@midlink.org>
+Date: Sat, 9 Nov 2013 12:01:42 +0100
+Subject: [PATCH] Add interface resolving
+
+---
+ src/if.c        | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/if.h        |  27 ++++++++++++++
+ src/luasocket.c |   2 +
+ src/makefile    |   2 +
+ src/options.c   |   9 +++++
+ 5 files changed, 153 insertions(+)
+ create mode 100644 src/if.c
+ create mode 100644 src/if.h
+
+diff --git a/src/if.c b/src/if.c
+new file mode 100644
+index 0000000..db231aa
+--- /dev/null
++++ b/src/if.c
+@@ -0,0 +1,113 @@
++/*
++ * $Id: if.c $
++ *
++ * Author: Markus Stenberg <fingon@iki.fi>
++ *
++ * Copyright (c) 2012 cisco Systems, Inc.
++ *
++ * Created:       Tue Dec  4 14:50:34 2012 mstenber
++ * Last modified: Wed Dec  5 18:51:08 2012 mstenber
++ * Edit time:     24 min
++ *
++ */
++
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <net/if.h>
++
++#include "if.h"
++
++#include "lauxlib.h"
++
++static int if_global_indextoname(lua_State *L);
++static int if_global_nametoindex(lua_State *L);
++static int if_global_nameindex(lua_State *L);
++
++static luaL_Reg func[] = {
++    { "indextoname", if_global_indextoname},
++    { "nametoindex", if_global_nametoindex},
++    { "nameindex", if_global_nameindex},
++    { NULL, NULL}
++};
++
++int if_open(lua_State *L)
++{
++    lua_pushstring(L, "iface");
++    lua_newtable(L);
++    luaL_openlib(L, NULL, func, 0);
++    lua_settable(L, -3);
++    return 0;
++}
++
++int if_global_indextoname(lua_State *L)
++{
++  unsigned int ifnumber;
++  const char *name;
++  char buf[IF_NAMESIZE+1];
++
++  if (!lua_isnumber(L, 1))
++    {
++      lua_pushnil(L);
++      lua_pushstring(L, "indextoname expects only number argument");
++      return 2;
++    }
++  ifnumber = lua_tonumber(L, 1);
++  if (!(name = if_indextoname(ifnumber, buf)))
++    {
++      lua_pushnil(L);
++      lua_pushstring(L, "nonexistent interface");
++      return 2;
++    }
++  lua_pushstring(L, name);
++  return 1;
++}
++
++int if_global_nametoindex(lua_State *L)
++{
++  unsigned int ifnumber;
++  if (!lua_isstring(L, 1))
++    {
++      lua_pushnil(L);
++      lua_pushstring(L, "nametoindex expects only string argument");
++      return 2;
++    }
++  if (!(ifnumber = if_nametoindex(lua_tostring(L, 1))))
++    {
++      lua_pushnil(L);
++      lua_pushstring(L, "nonexistent interface");
++      return 2;
++    }
++  lua_pushnumber(L, ifnumber);
++  return 1;
++}
++
++int if_global_nameindex(lua_State *L)
++{
++  struct if_nameindex *ni, *oni;
++  int i = 1;
++  oni = ni = if_nameindex();
++  lua_newtable(L);
++  while (ni && ni->if_index && *(ni->if_name))
++    {
++      /* at result[i], we store.. */
++      lua_pushnumber(L, i);
++
++      /* new table with two items - index, name*/
++      lua_newtable(L);
++      lua_pushstring(L, "index");
++      lua_pushnumber(L, ni->if_index);
++      lua_settable(L, -3);
++
++      lua_pushstring(L, "name");
++      lua_pushstring(L, ni->if_name);
++      lua_settable(L, -3);
++
++      /* Then, actually store it */
++      lua_settable(L, -3);
++
++      i++;
++      ni++;
++    }
++  if_freenameindex(oni);
++  return 1;
++}
+diff --git a/src/if.h b/src/if.h
+new file mode 100644
+index 0000000..dc7faf8
+--- /dev/null
++++ b/src/if.h
+@@ -0,0 +1,27 @@
++/*
++ * $Id: if.h $
++ *
++ * Author: Markus Stenberg <fingon@iki.fi>
++ *
++ *  Copyright (c) 2012 cisco Systems, Inc.
++ *
++ * Created:       Tue Dec  4 14:37:24 2012 mstenber
++ * Last modified: Tue Dec  4 14:51:43 2012 mstenber
++ * Edit time:     7 min
++ *
++ */
++
++/* This module provides Lua wrapping for the advanced socket API
++ * defined in RFC3542, or mainly, the access to the system's interface
++ * list. It is necessary for use of recvmsg/sendmsg.
++ *
++ * TODO - Do something clever with Windows?
++ */
++#ifndef IF_H
++#define IF_H
++
++#include "lua.h"
++
++int if_open(lua_State *L);
++
++#endif /* IF_H */
+diff --git a/src/luasocket.c b/src/luasocket.c
+index e6ee747..85d41a6 100644
+--- a/src/luasocket.c
++++ b/src/luasocket.c
+@@ -31,6 +31,7 @@
+ #include "tcp.h"
+ #include "udp.h"
+ #include "select.h"
++#include "if.h"
+ 
+ /*-------------------------------------------------------------------------*\
+ * Internal function prototypes
+@@ -51,6 +52,7 @@ static const luaL_Reg mod[] = {
+     {"tcp", tcp_open},
+     {"udp", udp_open},
+     {"select", select_open},
++    {"iface", if_open},
+     {NULL, NULL}
+ };
+ 
+diff --git a/src/makefile b/src/makefile
+index 8d3521e..09d4882 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -262,6 +262,7 @@ SOCKET_OBJS= \
+ 	auxiliar.$(O) \
+ 	options.$(O) \
+ 	inet.$(O) \
++	if.$(O) \
+ 	$(SOCKET) \
+ 	except.$(O) \
+ 	select.$(O) \
+@@ -387,6 +388,7 @@ auxiliar.$(O): auxiliar.c auxiliar.h
+ buffer.$(O): buffer.c buffer.h io.h timeout.h
+ except.$(O): except.c except.h
+ inet.$(O): inet.c inet.h socket.h io.h timeout.h usocket.h
++if.$(O): if.c if.h
+ io.$(O): io.c io.h timeout.h
+ luasocket.$(O): luasocket.c luasocket.h auxiliar.h except.h \
+ 	timeout.h buffer.h io.h inet.h socket.h usocket.h tcp.h \
+diff --git a/src/options.c b/src/options.c
+index 8ac2a14..1c73e6f 100644
+--- a/src/options.c
++++ b/src/options.c
+@@ -3,6 +3,9 @@
+ * LuaSocket toolkit
+ \*=========================================================================*/
+ #include <string.h> 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <net/if.h>
+ 
+ #include "lauxlib.h"
+ 
+@@ -285,6 +288,12 @@ static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name)
+     if (!lua_isnil(L, -1)) {
+         if (lua_isnumber(L, -1)) {
+             val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1);
++        } else if (lua_isstring(L, -1)) {
++            if (!(val.ipv6mr_interface = if_nametoindex(lua_tostring(L, -1)))) {
++                lua_pushnil(L);
++                lua_pushstring(L, "nonexistent interface");
++                return 2;
++            }
+         } else
+           luaL_argerror(L, -1, "number 'interface' field expected");
+     }
+-- 
+1.8.4.rc3
+
diff --git a/trunk/package/lang/luasql/Makefile b/trunk/package/lang/luasql/Makefile
new file mode 100644
index 00000000..6df105dc
--- /dev/null
+++ b/trunk/package/lang/luasql/Makefile
@@ -0,0 +1,116 @@
+#
+# Copyright (C) 2010-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luasql
+PKG_VERSION:=2.3.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/keplerproject/luasql/archive/
+PKG_MD5SUM:=af9f0f3a2313a1fcf88c40700092048d
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=docs/us/license.html
+PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luasql/Default
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Lua SQL binding
+  URL:=http://www.keplerproject.org/luasql/
+  DEPENDS:= +lua
+endef
+
+define Package/luasql/Default/description
+ LuaSQL is a simple interface from Lua to a DBMS.
+endef
+
+
+define Package/luasql-mysql
+$(call Package/luasql/Default)
+  TITLE+= for MySQL
+  DEPENDS+= +libmysqlclient
+  VARIANT:=mysql
+endef
+
+define Package/luasql-mysql/description
+$(call Package/luasql/Default/description)
+ .
+ This package contains the MySQL binding.
+endef
+
+
+define Package/luasql-pgsql
+$(call Package/luasql/Default)
+  TITLE+= for PostgreSQL
+  DEPENDS+= +libpq
+  VARIANT:=postgres
+endef
+
+define Package/luasql-pgsql/description
+$(call Package/luasql/Default/description)
+ .
+ This package contains the PostgreSQL binding.
+endef
+
+
+define Package/luasql-sqlite3
+$(call Package/luasql/Default)
+  TITLE+= for SQLite 3
+  DEPENDS+= +libsqlite3
+  VARIANT:=sqlite3
+endef
+
+define Package/luasql-sqlite3/description
+$(call Package/luasql/Default/description)
+ .
+ This package contains the SQLite 3 binding.
+endef
+
+
+TARGET_CFLAGS += $(FPIC) -std=gnu99
+TARGET_CPPFLAGS += -DLUA_USE_LINUX
+
+ifeq ($(BUILD_VARIANT),mysql)
+  TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/mysql
+  TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz
+endif
+
+ifeq ($(BUILD_VARIANT),postgres)
+  TARGET_LDFLAGS += -lpq
+endif
+
+ifeq ($(BUILD_VARIANT),sqlite3)
+  TARGET_LDFLAGS += -lsqlite3 -lpthread
+endif
+
+MAKE_FLAGS += \
+	T="$(BUILD_VARIANT)" \
+	DRIVER_INCS="$(TARGET_CPPFLAGS)" \
+	DRIVER_LIBS="$(TARGET_LDFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+	lib
+
+define Package/Install/Default
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luasql
+	$(CP) $(PKG_BUILD_DIR)/src/*.so $(1)/usr/lib/lua/luasql/
+endef
+
+Package/luasql-mysql/install = $(Package/Install/Default)
+Package/luasql-pgsql/install = $(Package/Install/Default)
+Package/luasql-sqlite3/install = $(Package/Install/Default)
+
+$(eval $(call BuildPackage,luasql-mysql))
+$(eval $(call BuildPackage,luasql-pgsql))
+$(eval $(call BuildPackage,luasql-sqlite3))
diff --git a/trunk/package/lang/micropython-lib/Makefile b/trunk/package/lang/micropython-lib/Makefile
new file mode 100644
index 00000000..b74ad0e0
--- /dev/null
+++ b/trunk/package/lang/micropython-lib/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=micropython-lib
+PKG_VERSION=0.1-20141028-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
+
+PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
+PKG_LICENSE:=MIT, PSFL
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/micropython/micropython-lib.git
+PKG_SOURCE_VERSION:=610aa65ceff9f4b0a60514423f543aa807f49f76
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/micropython-lib
+    SUBMENU:=Python
+    SECTION:=lang
+    CATEGORY:=Languages
+    TITLE:=micropython-lib
+    URL:=https://github.com/micropython/micropython-lib
+    DEPENDS:=+micropython
+endef
+
+define Package/micropython-lib/description
+    This package contains micropython-lib, a project to develop a non-monolothic
+    standard library for Micro Python. Note that this is a work in progress and
+    several libraries may be missing, incomplete or buggy.
+endef
+
+MAKE_FLAGS:=\
+	-C $(PKG_BUILD_DIR) \
+	PREFIX=$(PKG_BUILD_DIR)/_install_tmp \
+	install
+
+define Package/micropython-lib/install
+	$(INSTALL_DIR) $(1)/usr/lib/micropython
+	$(CP) $(PKG_BUILD_DIR)/_install_tmp/* $(1)/usr/lib/micropython
+endef
+
+$(eval $(call BuildPackage,micropython-lib))
+
diff --git a/trunk/package/lang/micropython/Makefile b/trunk/package/lang/micropython/Makefile
new file mode 100644
index 00000000..c1904567
--- /dev/null
+++ b/trunk/package/lang/micropython/Makefile
@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=micropython
+PKG_VERSION=1.3.7-20141209-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
+
+PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/micropython/micropython.git
+PKG_SOURCE_VERSION:=e6e8ad8ab238cd596a3eedf8f4dd635e2e84f46e
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/micropython
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Micro Python
+  URL:=http://micropython.org
+  DEPENDS:=+libffi
+endef
+
+define Package/micropython/description
+ This package contains Micro Python, a lean and fast implementation of the Python 3.4 programming language
+ that is optimised to run on a microcontroller (and low power computers).
+endef
+
+MAKE_FLAGS += \
+       -C $(PKG_BUILD_DIR)/unix \
+       MICROPY_USE_READLINE=0
+
+define Package/micropython/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/unix/micropython $(1)/usr/bin/micropython
+endef
+
+$(eval $(call BuildPackage,micropython))
diff --git a/trunk/package/lang/perl-compress-bzip2/Makefile b/trunk/package/lang/perl-compress-bzip2/Makefile
new file mode 100644
index 00000000..fefd3f52
--- /dev/null
+++ b/trunk/package/lang/perl-compress-bzip2/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-compress-bzip2
+PKG_VERSION:=2.19
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/R/RU/RURBAN/
+PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=dd4ebb4e88a50cc9a85e282618fdf88f
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Compress-Bzip2-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-compress-bzip2
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Perl interface to bzip2 compression library
+  URL:=http://search.cpan.org/dist/Compress-Bzip2/
+  DEPENDS:=perl +libbz2
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,BUILD_BZLIB=0)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-compress-bzip2/install
+	$(call perlmod/Install,$(1),Compress auto/Compress)
+endef
+
+
+$(eval $(call BuildPackage,perl-compress-bzip2))
diff --git a/trunk/package/lang/perl-dbi/Makefile b/trunk/package/lang/perl-dbi/Makefile
new file mode 100644
index 00000000..7af28ce2
--- /dev/null
+++ b/trunk/package/lang/perl-dbi/Makefile
@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-dbi
+PKG_VERSION:=1.632
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TI/TIMB/
+PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=285fc34c1ee20125aabbd50bc3e587fb
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/DBI-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+include ../perl/perlmod.mk
+
+define Package/perl-dbi
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Database independent interface for Perl
+  URL:=http://search.cpan.org/dist/DBI/
+  DEPENDS:=perl +perlbase-essential
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Host/Configure
+	$(call perlmod/host/Configure,,)
+endef
+
+define Host/Compile
+	$(call perlmod/host/Compile,,)
+endef
+
+define Host/Install
+	$(call perlmod/host/Install,$(1),)
+endef
+
+define Package/perl-dbi/install
+	$(call perlmod/Install,$(1),DB* auto/DBI,DBI/W32ODBC.pm auto/DBI/*.h)
+endef
+
+
+$(eval $(call BuildPackage,perl-dbi))
+$(eval $(call HostBuild))
diff --git a/trunk/package/lang/perl-html-parser/Makefile b/trunk/package/lang/perl-html-parser/Makefile
new file mode 100644
index 00000000..6baa88d8
--- /dev/null
+++ b/trunk/package/lang/perl-html-parser/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-html-parser
+PKG_VERSION:=3.71
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS/
+PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=9128a45893097dfa3bf03301b19c5efe
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-html-parser
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=A collection of modules that parse HTML text documents
+  URL:=http://search.cpan.org/dist/HTML-Parser/
+  DEPENDS:=perl +perl-html-tagset +perl-uri
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-html-parser/install
+	$(call perlmod/Install,$(1),HTML auto/HTML)
+endef
+
+
+$(eval $(call BuildPackage,perl-html-parser))
diff --git a/trunk/package/lang/perl-html-tagset/Makefile b/trunk/package/lang/perl-html-tagset/Makefile
new file mode 100644
index 00000000..fbec409c
--- /dev/null
+++ b/trunk/package/lang/perl-html-tagset/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-html-tagset
+PKG_VERSION:=3.20
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETDANCE/
+PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=d2bfa18fe1904df7f683e96611e87437
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tagset-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-html-tagset
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Data tables pertaining to HTML
+  URL:=http://search.cpan.org/dist/HTML-Tagset/
+  DEPENDS:=perl
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-html-tagset/install
+	$(call perlmod/Install,$(1),HTML)
+endef
+
+
+$(eval $(call BuildPackage,perl-html-tagset))
diff --git a/trunk/package/lang/perl-html-tree/Makefile b/trunk/package/lang/perl-html-tree/Makefile
new file mode 100644
index 00000000..614aff7f
--- /dev/null
+++ b/trunk/package/lang/perl-html-tree/Makefile
@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-html-tree
+PKG_VERSION:=3.23
+PKG_RELEASE:=2
+PKG_MD5SUM:=6352f50be402301f79b580dd235d7762
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETEK/
+PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=6352f50be402301f79b580dd235d7762
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tree-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-html-tree
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=represent and create HTML syntax trees
+  URL:=http://search.cpan.org/dist/HTML-Tree/
+  DEPENDS:=perl +perl-html-parser +perl-html-tagset
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-html-tree/install
+	$(call perlmod/Install,$(1),HTML)
+endef
+
+
+$(eval $(call BuildPackage,perl-html-tree))
diff --git a/trunk/package/lang/perl-lockfile-simple/Makefile b/trunk/package/lang/perl-lockfile-simple/Makefile
new file mode 100644
index 00000000..e65d4a57
--- /dev/null
+++ b/trunk/package/lang/perl-lockfile-simple/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-lockfile-simple
+PKG_VERSION:=0.208
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SC/SCHWIGON/lockfile-simple/
+PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=4421283b4f32549e5299963734170044
+
+PKG_LICENSE:=GPL-2.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LockFile-Simple-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-lockfile-simple
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Simple advisory file locking
+  URL:=http://search.cpan.org/dist/LockFile-Simple/
+  DEPENDS:=perl
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-lockfile-simple/install
+	$(call perlmod/Install,$(1),LockFile auto/LockFile)
+endef
+
+
+$(eval $(call BuildPackage,perl-lockfile-simple))
diff --git a/trunk/package/lang/perl-net-telnet/Makefile b/trunk/package/lang/perl-net-telnet/Makefile
new file mode 100644
index 00000000..d229cd81
--- /dev/null
+++ b/trunk/package/lang/perl-net-telnet/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2011-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-net-telnet
+PKG_VERSION:=3.04
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/J/JR/JROGERS/
+PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=d2514080116c1b0fa5f96295c84538e3
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-Telnet-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-net-telnet
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Telnet client
+  URL:=http://search.cpan.org/dist/Net-Telnet/
+  DEPENDS:=perl
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-net-telnet/install
+	$(call perlmod/Install,$(1),Net auto/Net)
+endef
+
+
+$(eval $(call BuildPackage,perl-net-telnet))
diff --git a/trunk/package/lang/perl-test-harness/Makefile b/trunk/package/lang/perl-test-harness/Makefile
new file mode 100644
index 00000000..59af42ae
--- /dev/null
+++ b/trunk/package/lang/perl-test-harness/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-test-harness
+PKG_VERSION:=3.34
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/L/LE/LEONT/
+PKG_SOURCE:=Test-Harness-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=aa0175e8fef92c19f06128810f1a2921
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Test-Harness-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-test-harness
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Perl Test Harness
+  URL:=http://search.cpan.org/dist/Test-Harness/
+  DEPENDS:=perl
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-test-harness/install
+	$(call perlmod/Install,$(1),App auto/Test TAP Test)
+endef
+
+
+$(eval $(call BuildPackage,perl-test-harness))
diff --git a/trunk/package/lang/perl-uri/Makefile b/trunk/package/lang/perl-uri/Makefile
new file mode 100644
index 00000000..64cc10f1
--- /dev/null
+++ b/trunk/package/lang/perl-uri/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-uri
+PKG_VERSION:=1.65
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/
+PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=12c5d612a20ddd42041a5aa426f66269
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/URI-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-uri
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Manipulates and accesses URI strings
+  URL:=http://search.cpan.org/dist/URI/
+  DEPENDS:=perl
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-uri/install
+	$(call perlmod/Install,$(1),URI URI.pm)
+endef
+
+
+$(eval $(call BuildPackage,perl-uri))
diff --git a/trunk/package/lang/perl-www-curl/Makefile b/trunk/package/lang/perl-www-curl/Makefile
new file mode 100644
index 00000000..8bc3bfda
--- /dev/null
+++ b/trunk/package/lang/perl-www-curl/Makefile
@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-www-curl
+PKG_VERSION:=4.17
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SZ/SZBALINT/
+PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=997ac81cd6b03b30b36f7cd930474845
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Curl-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-www-curl
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Perl bindings to libcurl
+  URL:=http://search.cpan.org/dist/WWW-Curl/
+  DEPENDS:=perl +libcurl
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,$(STAGING_DIR)/usr/include,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-www-curl/install
+	$(call perlmod/Install,$(1),WWW/Curl WWW/Curl.pm auto/WWW/Curl)
+endef
+
+
+$(eval $(call BuildPackage,perl-www-curl))
diff --git a/trunk/package/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch b/trunk/package/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch
new file mode 100644
index 00000000..568b65c2
--- /dev/null
+++ b/trunk/package/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch
@@ -0,0 +1,74 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -12,31 +12,31 @@ no_index		directory => 'template';
+ repository		'http://github.com/szbalint/WWW--Curl';
+ # This is a hack. If you have libcurl installed, just specify curl.h below
+ # and comment out this line.
+-if ($^O ne 'MSWin32') {
+-    if (!$ENV{CURL_CONFIG}) {
+-	    requires_external_bin	'curl-config';
+-    }
+-} else {
+-	print	"Sorry, no automated install is available on Windows,\n".
+-		"please see the README.Win32 file on instructions for a manual install.\n";
+-	exit(0);
+-}
+-
+-my $curl_config = $ENV{CURL_CONFIG} || 'curl-config';
+-
+-my $vernum = `${curl_config} --vernum`; chomp $vernum;
+-my $version = `${curl_config} --version`; chomp $version; 
+-
+-my $minimum_ver = hex("070a08");
+-
+-if ($vernum && hex($vernum) <= $minimum_ver) {
+-	print	"Your currently installed libcurl version - $version - is too old.\n".
+-		"This module doesn't seek compatibility with versions older than 7.10.8\n".
+-		"Proceed manually if you know what you're doing.\n";
+-	exit(0);
+-}
+-
+-print "The version is $version\n";
++#if ($^O ne 'MSWin32') {
++#    if (!$ENV{CURL_CONFIG}) {
++#	    requires_external_bin	'curl-config';
++#    }
++#} else {
++#	print	"Sorry, no automated install is available on Windows,\n".
++#		"please see the README.Win32 file on instructions for a manual install.\n";
++#	exit(0);
++#}
++#
++#my $curl_config = $ENV{CURL_CONFIG} || 'curl-config';
++#
++#my $vernum = `${curl_config} --vernum`; chomp $vernum;
++#my $version = `${curl_config} --version`; chomp $version; 
++#
++#my $minimum_ver = hex("070a08");
++#
++#if ($vernum && hex($vernum) <= $minimum_ver) {
++#	print	"Your currently installed libcurl version - $version - is too old.\n".
++#		"This module doesn't seek compatibility with versions older than 7.10.8\n".
++#		"Proceed manually if you know what you're doing.\n";
++#	exit(0);
++#}
++#
++#print "The version is $version\n";
+ 
+ my @includes = qw();
+ my ($cflags,$lflags, $ldflags) = ('','','');
+@@ -58,10 +58,10 @@ if ($^O ne 'MSWin32') {
+ # Get curl to tell us where it is, if we can.
+ #
+ 
+-if ($^O ne 'MSWin32') {
+-	$cflags = `${curl_config} --cflags`;
+-	$lflags = `${curl_config} --libs`;
+-}
++#if ($^O ne 'MSWin32') {
++#	$cflags = `${curl_config} --cflags`;
++#	$lflags = `${curl_config} --libs`;
++#}
+ 
+ # can't find link flags, make some guesses
+ if (!defined($lflags)) {
diff --git a/trunk/package/lang/perl-www-curl/patches/200-fix_default_lflags.patch b/trunk/package/lang/perl-www-curl/patches/200-fix_default_lflags.patch
new file mode 100644
index 00000000..f51eaf58
--- /dev/null
+++ b/trunk/package/lang/perl-www-curl/patches/200-fix_default_lflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -39,7 +39,7 @@ repository		'http://github.com/szbalint/
+ #print "The version is $version\n";
+ 
+ my @includes = qw();
+-my ($cflags,$lflags, $ldflags) = ('','','');
++my ($cflags,$lflags, $ldflags) = ('','-lcurl','');
+ 
+ # You may need to specify where to find curl.h on your platform
+ # These are guesses only, in case curl-config is not telling us.
diff --git a/trunk/package/lang/perl-www-mechanize/Makefile b/trunk/package/lang/perl-www-mechanize/Makefile
new file mode 100644
index 00000000..4fe85ebc
--- /dev/null
+++ b/trunk/package/lang/perl-www-mechanize/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2010-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-www-mechanize
+PKG_VERSION:=1.73
+PKG_RELEASE:=1
+
+PKG_SOURCE:=WWW-Mechanize-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/
+PKG_MD5SUM:=de0a9c528c12793c881151301bc14d1a
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Mechanize-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-www-mechanize
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Perl WWW Mechanize
+  URL:=http://search.cpan.org/dist/WWW-Mechanize/
+  DEPENDS:=perl +perl-www
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,$(STAGING_DIR)/usr/include,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-www-mechanize/install
+	$(call perlmod/Install,$(1),WWW/Mechanize WWW/Mechanize.pm)
+endef
+
+
+$(eval $(call BuildPackage,perl-www-mechanize))
diff --git a/trunk/package/lang/perl-www/Makefile b/trunk/package/lang/perl-www/Makefile
new file mode 100644
index 00000000..fadc1c02
--- /dev/null
+++ b/trunk/package/lang/perl-www/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl-www
+PKG_VERSION:=5.837
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS/
+PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=9bbf1bce482b0bac98bb4f04253c03d0
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/libwww-perl-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../perl/perlmod.mk
+
+define Package/perl-www
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=WWW client/server library for Perl (aka LWP)
+  URL:=http://search.cpan.org/dist/libwww-perl/
+  DEPENDS:=perl +perl-html-parser +perl-html-tagset +perl-uri
+endef
+
+define Build/Configure
+	$(call perlmod/Configure,-n,)
+endef
+
+define Build/Compile
+	$(call perlmod/Compile,,)
+endef
+
+define Package/perl-www/install
+	$(call perlmod/Install,$(1),File HTML HTTP LWP LWP.pm Net WWW)
+endef
+
+
+$(eval $(call BuildPackage,perl-www))
diff --git a/trunk/package/lang/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch b/trunk/package/lang/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch
new file mode 100644
index 00000000..9166e891
--- /dev/null
+++ b/trunk/package/lang/perl-www/patches/010-lwp-https-call-verify-hostname-when-avail.patch
@@ -0,0 +1,41 @@
+commit 3b266f17ccd5613a9c42d1e04118e94ca6467489
+Author: Gisle Aas <gisle@aas.no>
+Date:   Sun Jan 16 12:56:30 2011 +0100
+
+    Call IO::Socket::SSL's verify_hostname when available
+
+--- a/lib/LWP/Protocol/https.pm
++++ b/lib/LWP/Protocol/https.pm
+@@ -14,6 +14,15 @@ sub socket_type
+ sub _check_sock
+ {
+     my($self, $req, $sock) = @_;
++    if ($sock->can("verify_hostname")) {
++	if (!$sock->verify_hostname($req->uri->host, "www")) {
++	    my $subject = $sock->peer_certificate("subject");
++	    die "SSL-peer fails verification [subject=$subject]\n";
++	}
++	else {
++	    $req->{ssl_sock_verified}++;
++	}
++    }
+     my $check = $req->header("If-SSL-Cert-Subject");
+     if (defined $check) {
+ 	my $cert = $sock->get_peer_certificate ||
+@@ -36,9 +45,14 @@ sub _get_sock_info
+ 	$res->header("Client-SSL-Cert-Subject" => $cert->subject_name);
+ 	$res->header("Client-SSL-Cert-Issuer" => $cert->issuer_name);
+     }
+-    if(! eval { $sock->get_peer_verify }) {
+-       $res->header("Client-SSL-Warning" => "Peer certificate not verified");
++    if (!$res->request->{ssl_sock_verified}) {
++	if(! eval { $sock->get_peer_verify }) {
++	    my $msg = "Peer certificate not verified";
++	    $msg .= " [$@]" if $@;
++	    $res->header("Client-SSL-Warning" => $msg);
++	}
+     }
++    $res->header("Client-SSL-Socket-Class" => $Net::HTTPS::SSL_SOCKET_CLASS);
+ }
+ 
+ #-----------------------------------------------------------
diff --git a/trunk/package/lang/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch b/trunk/package/lang/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch
new file mode 100644
index 00000000..465010e2
--- /dev/null
+++ b/trunk/package/lang/perl-www/patches/020-lwp-https-verify-hostnames-by-default.patch
@@ -0,0 +1,113 @@
+commit 62dd58188d8f8987d24bd84951813a54a8bf5987
+Author: Gisle Aas <gisle@aas.no>
+Date:   Mon Jan 24 23:19:59 2011 +0100
+
+    Default to verifying hostnames when using SSL
+
+--- a/lib/LWP/Protocol/https.pm
++++ b/lib/LWP/Protocol/https.pm
+@@ -11,18 +11,30 @@ sub socket_type
+     return "https";
+ }
+ 
+-sub _check_sock
++sub _extra_sock_opts
+ {
+-    my($self, $req, $sock) = @_;
+-    if ($sock->can("verify_hostname")) {
+-	if (!$sock->verify_hostname($req->uri->host, "www")) {
+-	    my $subject = $sock->peer_certificate("subject");
+-	    die "SSL-peer fails verification [subject=$subject]\n";
+-	}
+-	else {
+-	    $req->{ssl_sock_verified}++;
++    my $self = shift;
++    my %ssl_opts = %{$self->{ua}{ssl_opts} || {}};
++    unless (exists $ssl_opts{SSL_verify_mode}) {
++	$ssl_opts{SSL_verify_mode} = 1;
++    }
++    if (delete $ssl_opts{verify_hostname}) {
++	$ssl_opts{SSL_verify_mode} ||= 1;
++	$ssl_opts{SSL_verifycn_scheme} = 'www';
++    }
++    if ($ssl_opts{SSL_verify_mode}) {
++	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
++	    require Mozilla::CA;
++	    $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
+ 	}
+     }
++    $self->{ssl_opts} = \%ssl_opts;
++    return (%ssl_opts, $self->SUPER::_extra_sock_opts);
++}
++
++sub _check_sock
++{
++    my($self, $req, $sock) = @_;
+     my $check = $req->header("If-SSL-Cert-Subject");
+     if (defined $check) {
+ 	my $cert = $sock->get_peer_certificate ||
+@@ -45,12 +57,11 @@ sub _get_sock_info
+ 	$res->header("Client-SSL-Cert-Subject" => $cert->subject_name);
+ 	$res->header("Client-SSL-Cert-Issuer" => $cert->issuer_name);
+     }
+-    if (!$res->request->{ssl_sock_verified}) {
+-	if(! eval { $sock->get_peer_verify }) {
+-	    my $msg = "Peer certificate not verified";
+-	    $msg .= " [$@]" if $@;
+-	    $res->header("Client-SSL-Warning" => $msg);
+-	}
++    if (!$self->{ssl_opts}{SSL_verify_mode}) {
++	$res->push_header("Client-SSL-Warning" => "Peer certificate not verified");
++    }
++    elsif (!$self->{ssl_opts}{SSL_verifycn_scheme}) {
++	$res->push_header("Client-SSL-Warning" => "Peer hostname match with certificate not verified");
+     }
+     $res->header("Client-SSL-Socket-Class" => $Net::HTTPS::SSL_SOCKET_CLASS);
+ }
+--- a/lib/LWP/UserAgent.pm
++++ b/lib/LWP/UserAgent.pm
+@@ -41,6 +41,7 @@ sub new
+     my $timeout = delete $cnf{timeout};
+     $timeout = 3*60 unless defined $timeout;
+     my $local_address = delete $cnf{local_address};
++    my $ssl_opts = delete $cnf{ssl_opts};
+     my $use_eval = delete $cnf{use_eval};
+     $use_eval = 1 unless defined $use_eval;
+     my $parse_head = delete $cnf{parse_head};
+@@ -83,6 +84,7 @@ sub new
+ 		      def_headers  => $def_headers,
+ 		      timeout      => $timeout,
+ 		      local_address => $local_address,
++		      ssl_opts     => { $ssl_opts ? %$ssl_opts  : (verify_hostname => 1) },
+ 		      use_eval     => $use_eval,
+                       show_progress=> $show_progress,
+ 		      max_size     => $max_size,
+@@ -582,6 +584,20 @@ sub max_size     { shift->_elem('max_siz
+ sub max_redirect { shift->_elem('max_redirect', @_); }
+ sub show_progress{ shift->_elem('show_progress', @_); }
+ 
++sub ssl_opts {
++    my $self = shift;
++    if (@_ == 1) {
++	my $k = shift;
++	return $self->{ssl_opts}{$k};
++    }
++    if (@_) {
++	%{$self->{ssl_opts}} = (%{$self->{ssl_opts}}, @_);
++    }
++    else {
++	return keys %{$self->{ssl_opts}};
++    }
++}
++
+ sub parse_head {
+     my $self = shift;
+     if (@_) {
+@@ -1040,6 +1056,7 @@ The following options correspond to attr
+    cookie_jar              undef
+    default_headers         HTTP::Headers->new
+    local_address           undef
++   ssl_opts		   { verify_hostname => 1 }
+    max_size                undef
+    max_redirect            7
+    parse_head              1
diff --git a/trunk/package/lang/perl/Config.in b/trunk/package/lang/perl/Config.in
new file mode 100644
index 00000000..3cfa71da
--- /dev/null
+++ b/trunk/package/lang/perl/Config.in
@@ -0,0 +1,15 @@
+menu "Configuration"
+	depends on PACKAGE_perl
+
+config PERL_TESTS
+	bool "Include perl tests"
+	default n
+	help
+		Include test suites for all perl packages.
+		This will make perl related packages much bigger, so
+		use with care.
+		
+		Note: Test support is still in development. Some tests
+		still fail, others are just missing completely.
+
+endmenu
diff --git a/trunk/package/lang/perl/Makefile b/trunk/package/lang/perl/Makefile
new file mode 100644
index 00000000..be4f773e
--- /dev/null
+++ b/trunk/package/lang/perl/Makefile
@@ -0,0 +1,178 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=perl
+PKG_VERSION:=5.20.1
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
+		http://www.cpan.org/src/5.0/perl-5.20.0.tar.gz \
+		ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
+		http://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \
+		ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \
+		http://ftp5.gwdg.de/pub/languages/perl/CPAN/src/ \
+		ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 \
+		http://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=7a195abb7d6769f751e90c7d30dcf2e0
+
+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE_FILES:=Copying Artistic README
+PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+
+# Build settings
+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=perl/host
+PKG_BUILD_PARALLEL:=1
+HOST_BUILD_PARALLEL:=1
+
+# Variables used during configuration/build
+HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
+ifneq ($(CONFIG_USE_EGLIBC),)
+	EXTRA_LIBS:=bsd
+	EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
+endif
+# Filter -g3, it will break Compress-Raw-Zlib
+TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS))
+TARGET_CPPFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CPPFLAGS))
+
+# A list of disabled testss
+# ExtUtils tests are disabled for now as we don't support building
+# native extensions on the target machine at the moment
+PERL_DISABLEDTESTS:=cpan/ExtUtils-Constant cpan/ExtUtils-MakeMaker
+# We're on Linux, so don't even package those
+PERL_DISABLEDTESTS+=cpan/Win32API-File cpan/Win32 ext/VMS-DCLsym ext/VMS-Filespec ext/VMS-Stdio ext/Win32CORE
+# NDBM and ODBM not supported
+PERL_DISABLEDTESTS+=ext/NDBM_File ext/ODBM_File
+
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+include perlmod.mk
+
+define Package/perl
+  SUBMENU:=Perl
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=The Perl intepreter
+  URL:=http://www.perl.com/
+  DEPENDS:=+USE_EGLIBC:libbsd
+endef
+
+define Package/perl/description
+  Perl is a stable, cross platform programming language.
+  It is used for mission critical projects in the public and private sectors
+  and is widely used to program web applications of all needs.
+endef
+
+define Package/perl/config
+	source "$(SOURCE)/Config.in"
+endef
+
+# Static host perl
+define Host/Configure
+	( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Duserelocatableinc -Dprefix=$(HOST_PERL_PREFIX) )
+endef
+
+define Host/Install
+	( cd $(HOST_BUILD_DIR); ./miniperl installperl )
+	$(INSTALL_DIR) $(HOST_PERL_PREFIX)/bin/
+	$(CP) $(HOST_BUILD_DIR)/generate_uudmap $(HOST_PERL_PREFIX)/bin/
+	
+	# Link any possibly installed static extension in
+	$(MAKE) -C $(HOST_BUILD_DIR)/relink clean || true
+	( cd $(HOST_BUILD_DIR)/relink && $(HOST_PERL_PREFIX)/bin/perl Makefile.PL )
+	$(call perlmod/host/relink,$(HOST_BUILD_DIR)/relink)
+endef
+
+# Target perl
+define Build/Configure
+	sed \
+		-e 's!%%CC%%!$(TARGET_CC)!g' \
+		-e 's!%%CFLAGS%%!$(TARGET_CFLAGS_PERL) $(TARGET_CPPFLAGS_PERL)!g' \
+		-e 's!%%CPP%%!$(TARGET_CROSS)gcc -E!g' \
+		-e 's!%%AR%%!$(TARGET_CROSS)ar!g' \
+		-e 's!%%LD%%!$(TARGET_CROSS)gcc!g' \
+		-e 's!%%LDFLAGS%%!-rdynamic $(TARGET_LDFLAGS)!g' \
+		-e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \
+		-e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \
+		-e 's!%%EXTRA_PERLLIBS%%!$(EXTRA_LIBS:%=-l%)!g' \
+		-e 's!%%EXTRA_PERLLIBDIRS%%!$(EXTRA_LIBDIRS:%=-L%)!g' \
+		-e 's!%%IPV6%%!$(if $($(CONFIG_IPV6)),define,undef)!g' \
+		-e 's!%%HOSTMINIPERL%%!$(HOST_PERL_PREFIX)/bin/perl!g' \
+		-e 's!%%HOSTGENERATE%%!$(HOST_PERL_PREFIX)/bin/generate_uudmap!g' \
+		files/config.sh-$(patsubst i386,i486,$(ARCH)).in \
+		> $(PKG_BUILD_DIR)/config.sh
+	(cd $(PKG_BUILD_DIR) && ./Configure -S)
+	install -m 0644 $(PKG_BUILD_DIR)/config.h $(PKG_BUILD_DIR)/xconfig.h
+endef
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/5.20 $(1)/usr/lib/perl5/
+endef
+
+define Package/perl/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/perl$(PKG_VERSION) $(1)/usr/bin
+	ln -nsf perl$(PKG_VERSION) $(1)/usr/bin/perl
+	
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/CORE
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/5.20/CORE/libperl.so $(1)/usr/lib/perl5/5.20/CORE/
+endef
+
+
+$(eval $(call RequireCommand,rsync, \
+	$(PKG_NAME) requires rsync installed on the host-system. \
+))
+
+$(eval $(call BuildPackage,perl))
+$(eval $(call HostBuild))
+
+-include perlbase.mk
+
+# A helper package that includes all sort of supplementary files for tests
+define Package/perl-tests-common
+$(call Package/perlbase-template)
+TITLE:=Common test support files
+DEPENDS:=@PERL_TESTS
+endef
+
+define Package/perl-tests-common/install
+	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)
+	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/Porting
+	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/regen
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/XS
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/auto/XS
+	$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/unicore
+	
+	$(CP) $(PKG_BUILD_DIR)/t $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/Porting $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/regen $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/MANIFEST $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/TestInit.pm $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/vutil.c $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/vxs.inc $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/lib/XS $(1)/usr/lib/perl5/5.20/
+	$(CP) $(PKG_BUILD_DIR)/lib/auto/XS $(1)/usr/lib/perl5/5.20/auto
+	$(CP) $(PKG_BUILD_DIR)/lib/vmsish.pm $(1)/usr/lib/perl5/5.20/
+	$(CP) $(PKG_BUILD_DIR)/lib/unicore/TestProp.pl $(1)/usr/lib/perl5/5.20/unicore
+	$(CP) files/perl-run_tests.sh $(1)/$(PERL_TESTSDIR)/run_tests.sh
+	sed -e 's!%%PERL_DISABLEDTESTS%%!$(PERL_DISABLEDTESTS)!' -i $(1)/$(PERL_TESTSDIR)/run_tests.sh
+	$(CP) $(PKG_BUILD_DIR)/config_h.SH $(1)/$(PERL_TESTSDIR)
+	$(CP) $(PKG_BUILD_DIR)/perl.h $(1)/$(PERL_TESTSDIR)
+endef
+
+$(eval $(call BuildPackage,perl-tests-common))
diff --git a/trunk/package/lang/perl/files/config.sh-arm.in b/trunk/package/lang/perl/files/config.sh-arm.in
new file mode 100644
index 00000000..df6152ed
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-arm.in
@@ -0,0 +1,1161 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Fri Jul 20 04:18:17 MDT 2007
+# Configured by     : root
+# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5tel unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='4'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+
+
+ar='ar'
+archname64=''
+archname='arm-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols='__ARM_ARCH_3__=1'
+ccversion=''
+cf_by='root'
+cf_email='root@maia.dev.null'
+cf_time='Fri Jul 20 04:18:17 MDT 2007'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='undef'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='define'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='20'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='signed short'
+i32size='4'
+i32type='signed long'
+i64size='8'
+i64type='signed long long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+
+installscript='/usr/bin'
+
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='arm-linux-uclibc'
+mydomain='.dev.null'
+myhostname='maia'
+myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5tel unknown unknown gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.22'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@maia.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+
+
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='64'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
+sig_size='68'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='arm-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='define'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+
+
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=1
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/config.sh-armeb.in b/trunk/package/lang/perl/files/config.sh-armeb.in
new file mode 100644
index 00000000..6c12a536
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-armeb.in
@@ -0,0 +1,1161 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Fri Jul 20 04:39:05 MDT 2007
+# Configured by     : root
+# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='4'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+
+
+ar='ar'
+archname64=''
+archname='armeb-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='4321'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols='__ARM_ARCH_3__=1'
+ccversion=''
+cf_by='root'
+cf_email='root@maia.dev.null'
+cf_time='Fri Jul 20 04:39:05 MDT 2007'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='undef'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='define'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='20'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='signed short'
+i32size='4'
+i32type='signed long'
+i64size='8'
+i64type='signed long long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+
+installscript='/usr/bin'
+
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='armeb-linux-uclibc'
+mydomain='.dev.null'
+myhostname='maia'
+myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.22'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@maia.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+
+
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='64'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
+sig_size='68'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+subversion='0'
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='armeb-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='define'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+
+
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=0
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+api_subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/config.sh-avr32.in b/trunk/package/lang/perl/files/config.sh-avr32.in
new file mode 100644
index 00000000..33cfa69d
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-avr32.in
@@ -0,0 +1,1163 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Fri Jul 20 04:39:05 MDT 2007
+# Configured by     : root
+# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+
+
+ar='ar'
+archname64=''
+archname='avr32-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='4321'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='root'
+cf_email='root@maia.dev.null'
+cf_time='Fri Jul 20 04:39:05 MDT 2007'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+# Matteo Croce, Mon, 21 Apr 2008 03:19:30 +0200
+# Fixes perl: can't resolve symbol 'gcvt'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='undef'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='define'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='20'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+
+installscript='/usr/bin'
+
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='avr32-linux-uclibc'
+mydomain='.dev.null'
+myhostname='maia'
+myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 armv5teb unknown unknown gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.22'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@maia.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+
+
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='64'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
+sig_size='68'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='avr32-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='undef'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+
+
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=1
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/config.sh-i486.in b/trunk/package/lang/perl/files/config.sh-i486.in
new file mode 100644
index 00000000..b04fa4e7
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-i486.in
@@ -0,0 +1,1147 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Sat Apr 19 15:51:11 MDT 2008
+# Configured by     : root
+# Target system     : linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='4'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+ar='ar'
+archname64=''
+archname='i386-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='root'
+cf_email='root@maia.dev.null'
+cf_time='Sat Apr 19 15:51:11 MDT 2008'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 i386=1 __i386=1 __i386__=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='undef'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='define'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='20'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installscript='/usr/bin'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='12'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='i386-linux-uclibc'
+mydomain='.dev.null'
+myhostname='maia'
+myuname='linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.25'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@maia.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"LE"'
+sPRIFUldbl='"LF"'
+sPRIGUldbl='"LG"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"Le"'
+sPRIfldbl='"Lf"'
+sPRIgldbl='"Lg"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"Lf"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='64'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
+sig_size='68'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='i386-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='define'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=1
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/config.sh-mips.in b/trunk/package/lang/perl/files/config.sh-mips.in
new file mode 100644
index 00000000..75ae8c92
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-mips.in
@@ -0,0 +1,1161 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Thu Jan 25 03:12:45 MST 2007
+# Configured by     : root
+# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+
+
+ar='ar'
+archname64=''
+archname='mips-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='4321'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='root'
+cf_email='root@merope.dev.null'
+cf_time='Thu Jan 25 03:12:45 MST 2007'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=_MIPS_ISA_MIPS1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='undef'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='define'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='24'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+
+installscript='/usr/bin'
+
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='mips-linux-uclibc'
+mydomain='.dev.null'
+myhostname='merope'
+myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.4.30'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@merope.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+
+
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='128'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM 111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
+sig_size='131'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='mips-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='define'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+
+
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=1
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/config.sh-mipsel.in b/trunk/package/lang/perl/files/config.sh-mipsel.in
new file mode 100644
index 00000000..86b6c643
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-mipsel.in
@@ -0,0 +1,1147 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Thu Jan 25 03:12:45 MST 2007
+# Configured by     : root
+# Target system     : linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+ar='ar'
+archname64=''
+archname='mipsel-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='root'
+cf_email='root@merope.dev.null'
+cf_time='Thu Jan 25 03:12:45 MST 2007'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 LANGUAGE_C=1 _LANGUAGE_C=1 __LANGUAGE_C=1 __LANGUAGE_C__=1 _LARGEFILE_SOURCE=1 MIPSEL=1 _MIPSEL=1 __MIPSEL=1 __MIPSEL__=1 _MIPS_FPSET=16 _MIPS_ISA=_MIPS_ISA_MIPS1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 __PIC__=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 R3000=1 _R3000=1 __R3000=1 __R3000__=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 mips=1 _mips=1 __mips=1 __mips__=1 __pic__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='undef'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='define'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='24'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installscript='/usr/bin'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='mipsel-linux-uclibc'
+mydomain='.dev.null'
+myhostname='merope'
+myuname='linux merope 2.4.30 #1 di 23. jan 15:23:42 cet 2007 mips unknown unknown gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.4.30'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@merope.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='128'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
+sig_size='131'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='mipsel-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='define'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=1
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/config.sh-powerpc.in b/trunk/package/lang/perl/files/config.sh-powerpc.in
new file mode 100644
index 00000000..650f94f0
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-powerpc.in
@@ -0,0 +1,1161 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Fri Jul 20 04:26:18 MDT 2007
+# Configured by     : root
+# Target system     : linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 ppc unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+
+
+ar='ar'
+archname64=''
+archname='powerpc-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='4321'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 system=linux system=posix system=unix'
+ccversion=''
+cf_by='root'
+cf_email='root@maia.dev.null'
+cf_time='Fri Jul 20 04:26:18 MDT 2007'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols='linux=1 unix=1'
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='_BIG_ENDIAN=1 __BIG_ENDIAN__=1 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 __linux=1 __linux__=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='undef'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='undef'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='define'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='24'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='signed short'
+i32size='4'
+i32type='signed long'
+i64size='8'
+i64type='signed long long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+
+installscript='/usr/bin'
+
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='powerpc-linux-uclibc'
+mydomain='.dev.null'
+myhostname='maia'
+myuname='linux maia 2.6.22 #1 wed jul 11 12:24:09 cest 2007 ppc unknown unknown gnulinux '
+n='-n'
+need_va_copy='define'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.22'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@maia.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+
+
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='64'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
+sig_size='68'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='powerpc-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='define'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+
+
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=1
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/config.sh-x86_64.in b/trunk/package/lang/perl/files/config.sh-x86_64.in
new file mode 100644
index 00000000..6a2bd1bf
--- /dev/null
+++ b/trunk/package/lang/perl/files/config.sh-x86_64.in
@@ -0,0 +1,1147 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Sat Apr 19 15:51:11 MDT 2008
+# Configured by     : root
+# Target system     : linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 i686 unknown unknown gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+ar='ar'
+archname64=''
+archname='x86_64-linux-uclibc'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='12345678'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='root'
+cf_email='root@maia.dev.null'
+cf_time='Sat Apr 19 15:51:11 MDT 2008'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='__ELF__=1 _LP64=1 __FLT_EVAL_METHOD__=0 __FXSR__=1 __GCC_ATOMIC_LLONG_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __INT64_MAX__=9223372036854775807L __INT64_TYPE__=long\ int __INTMAX_MAX__=9223372036854775807L __INTMAX_TYPE__=long\ int __INTPTR_MAX__=9223372036854775807L __INTPTR_TYPE__=long\ int __INT_FAST16_MAX__=9223372036854775807L __INT_FAST16_TYPE__=long\ int __INT_FAST32_MAX__=9223372036854775807L __INT_FAST32_TYPE__=long\ int __INT_FAST64_MAX__=9223372036854775807L __INT_FAST64_TYPE__=long\ int __INT_LEAST64_MAX__=9223372036854775807L __INT_LEAST64_TYPE__=long\ int __LONG_MAX__=9223372036854775807L __LP64__=1 __MMX__=1 __PTRDIFF_MAX__=9223372036854775807L __PTRDIFF_TYPE__=long\ int __SIZEOF_INT128__=16 __SIZEOF_LONG_DOUBLE__=16 __SIZEOF_LONG__=8 __SIZEOF_POINTER__=8 __SIZEOF_PTRDIFF_T__=8 __SIZEOF_SIZE_T__=8 __SIZE_MAX__=18446744073709551615UL __SIZE_TYPE__=long\ unsigned\ int __SSE2_MATH__=1 __SSE2__=1 __SSE_MATH__=1 __SSE__=1 __UINT64_MAX__=18446744073709551615UL __UINT64_TYPE__=long\ unsigned\ int __UINTMAX_MAX__=18446744073709551615UL __UINTMAX_TYPE__=long\ unsigned\ int __UINTPTR_MAX__=18446744073709551615UL __UINTPTR_TYPE__=long\ unsigned\ int __UINT_FAST16_MAX__=18446744073709551615UL __UINT_FAST16_TYPE__=long\ unsigned\ int __UINT_FAST32_MAX__=18446744073709551615UL __UINT_FAST32_TYPE__=long\ unsigned\ int __UINT_FAST64_MAX__=18446744073709551615UL __UINT_FAST64_TYPE__=long\ unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615UL __UINT_LEAST64_TYPE__=long\ unsigned\ int __WCHAR_MAX__=2147483647 __WCHAR_MIN__=(-2147483647\ -\ 1) __WCHAR_TYPE__=int __amd64=1 __amd64__=1 __code_model_small__=1 __k8=1 __k8__=1 __x86_64=1 __x86_64__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC__=3 __GNUC_MINOR__=4 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=199506L _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='undef'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='undef'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='undef'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='undef'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='undef'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='undef'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_printf_format_null='undef'
+d_procselfexe='define'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='undef'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='undef'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='define'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='16'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.4.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"u"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='int'
+i64size='8'
+i64type='long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='define'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+installbin='/usr/bin'
+initialinstalllocation='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installscript='/usr/bin'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='8'
+ivtype='long'
+known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+ksh=''
+ld='%%LD%%'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags='%%EXTRA_PERLLIBDIRS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.so'
+libpth='%%LIBDIRS%%'
+libs='-lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth=' '
+loclibpth=' '
+longdblsize='16'
+longlongsize='8'
+longsize='8'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='x86_64-linux-uclibc'
+mydomain='.dev.null'
+myhostname='maia'
+myuname='linux maia 2.6.25 #2 sat apr 19 09:46:49 cest 2008 x86_64 unknown unknown gnulinux '
+n='-n'
+need_va_copy='define'
+netdb_hlen_type='size_t'
+netdb_host_type='char *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='53'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.25'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+path_sep=':'
+perl5=''
+perl=''
+perl_patchlevel=''
+perladmin='root@maia.dev.null'
+perllibs='-ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='8'
+quadkind='2'
+quadtype='long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"LE"'
+sPRIFUldbl='"LF"'
+sPRIGUldbl='"LG"'
+sPRIXU64='"lX"'
+sPRId64='"ld"'
+sPRIeldbl='"Le"'
+sPRIfldbl='"Lf"'
+sPRIgldbl='"Lg"'
+sPRIi64='"li"'
+sPRIo64='"lo"'
+sPRIu64='"lu"'
+sPRIx64='"lx"'
+sSCNfldbl='"Lf"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='64'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='64'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
+sig_size='68'
+signal_t='void'
+sitearch=''
+sitearchexp=''
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib=''
+#sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp=''
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='8'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+#strings='/usr/include/string.h'
+submit=''
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch='x86_64-linux-uclibc'
+tbl=''
+tee=''
+test='test'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned int'
+u64size='8'
+u64type='unsigned long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"u"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long'
+use5005threads='undef'
+use64bitall='define'
+use64bitint='define'
+usecrosscompile='define'
+usedl='define'
+usefaststdio='undef'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='8'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args='-der'
+config_argc=1
+config_arg1='-der'
+PERL_REVISION=5
+PERL_API_REVISION=5
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
+# Fix problem with HiRes timer.
+d_nanosleep='define'
+d_clock_gettime='define'
+d_clock_getres='define'
+d_clock_nanosleep='define'
+d_clock='define'
+
+# New symbols for perl 5.20.0
+bin_ELF='define'
+bootstrap_charset='undef'
+charbits='8'
+charsize='1'
+d_asctime64='undef'
+d_attribute_deprecated='define'
+d_ctime64='undef'
+d_difftime64='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getnameinfo='define'
+d_gmtime64='undef'
+d_inetntop='define'
+d_inetpton='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='%%IPV6%%'
+d_ipv6_mreq_source='undef'
+d_isblank='define'
+d_libname_unique='undef'
+d_localtime64='undef'
+d_mktime64='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_prctl='define'
+d_prctl_set_name='define'
+d_sin6_scope_id='%%IPV6%%'
+d_sockaddr_in6='%%IPV6%%'
+d_sockaddr_sa_len='undef'
+d_static_inline='define'
+d_timegm='define'
+dtrace=''
+extern_C='extern'
+hostosname=''
+i_assert='define'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_mallocmalloc='undef'
+i_stdbool='define'
+i_syspoll='define'
+#incpth='/usr/lib/gcc/i486-slackware-linux/4.8.2/include /usr/local/include /usr/lib/gcc/i486-slackware-linux/4.8.2/include-fixed /usr/include'
+ld_can_script='define'
+#libsfound=' /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+perl_static_inline='static __inline__'
+sGMTIME_max='67768036191676799'
+sGMTIME_min='-62167219200'
+sLOCALTIME_max='67768036191673199'
+sLOCALTIME_min='-62167222408'
+#sitelib_stem='/usr/local/lib/perl5/site_perl'
+st_ino_sign='1'
+st_ino_size='8'
+#strings='/usr/include/string.h'
+sysroot=''
+targetdir=''
+targetenv=''
+targethost=''
+targetmkdir=''
+targetport=''
+targetsh='/bin/sh'
+#timeincl='/usr/include/sys/time.h /usr/include/time.h '
+usedevel='undef'
+usedtrace='undef'
+usekernprocpathname='undef'
+usensgetexecutablepath='undef'
+useversionedarchname='undef'
+vaproto='define'
+libdb_needs_pthread='N'
+
+# These symbols changed from perl 5.10.0 to 5.20.0 and probably will
+# change again for new versions, so they're included here for
+# future reference
+api_version='20'
+api_versionstring='5.20.0'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+installarchlib='/usr/lib/perl5/5.20'
+installprivlib='/usr/lib/perl5/5.20'
+installsitearch='/usr/lib/perl5/5.20'
+installsitelib='/usr/lib/perl5/5.20'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+privlib='/usr/lib/perl5/5.20'
+privlibexp='/usr/lib/perl5/5.20'
+archlib='/usr/lib/perl5/5.20'
+archlibexp='/usr/lib/perl5/5.20'
+version='5.20.1'
+version_patchlevel_string='version 20 subversion 1'
+PERL_VERSION=20
+PERL_API_VERSION=20
+PERL_SUBVERSION=1
+patchlevel='20'
+ccdlflags='-fPIC -Wl,-rpath,/usr/lib/perl5/5.20/CORE'
+subversion='1'
+
+# Make perl use these tools instead of the target binaries during build.
+hostgenerate='%%HOSTGENERATE%%'
+hostperl='%%HOSTMINIPERL%%'
diff --git a/trunk/package/lang/perl/files/perl-run_tests.sh b/trunk/package/lang/perl/files/perl-run_tests.sh
new file mode 100755
index 00000000..af6a39c9
--- /dev/null
+++ b/trunk/package/lang/perl/files/perl-run_tests.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+PERL_TESTSDIR="/usr/share/perl/perl-tests"
+PERL_LIBDIR="/usr/lib/perl5/5.20/"
+PERL_DISABLEDTESTS="%%PERL_DISABLEDTESTS%%"
+
+if [ ! -f "$PERL_TESTSDIR/__prepared" ]; then
+	ln -s "$PERL_LIBDIR" "$PERL_TESTSDIR/lib"
+	ln -s /usr/bin/perl "$PERL_TESTSDIR/perl"
+	ln -s /usr/bin/perl "$PERL_TESTSDIR/t/perl"
+	touch "$PERL_TESTSDIR/__prepared"
+	
+	for i in $PERL_DISABLEDTESTS; do
+		echo "Disabling $i tests"
+		sed 's!^'$i'.*$!!' -i $PERL_TESTSDIR/MANIFEST
+	done
+	
+	cat $PERL_TESTSDIR/MANIFEST | grep -v '^$' > $PERL_TESTSDIR/MANIFEST_NEW
+	rm $PERL_TESTSDIR/MANIFEST
+	mv $PERL_TESTSDIR/MANIFEST_NEW $PERL_TESTSDIR/MANIFEST
+fi
+
+cd "$PERL_TESTSDIR/t"
+./perl TEST
diff --git a/trunk/package/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch b/trunk/package/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch
new file mode 100644
index 00000000..e187941e
--- /dev/null
+++ b/trunk/package/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch
@@ -0,0 +1,22 @@
+--- a/config_h.SH
++++ b/config_h.SH
+@@ -52,6 +52,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
+ #ifndef _config_h_
+ #define _config_h_
+ 
++#if defined(USE_CROSS_COMPILE) && !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
++#  include <endian.h>
++#  if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
++#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
++#      define __LITTLE_ENDIAN__
++#    elif (__BYTE_ORDER == __BIG_ENDIAN)
++#      define __BIG_ENDIAN__
++#    else
++#      error Unknown endianness
++#    endif
++#  endif
++#endif
++
+ /* LOC_SED:
+  *	This symbol holds the complete pathname to the sed program.
+  */
diff --git a/trunk/package/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch b/trunk/package/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch
new file mode 100644
index 00000000..761f8b92
--- /dev/null
+++ b/trunk/package/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch
@@ -0,0 +1,27 @@
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -204,6 +204,24 @@ case "$libc" in
+     ;;
+ esac
+ 
++# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
++# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
++# where to look.  We don't want gcc's own libraries, however, so we
++# filter those out.
++# This could be conditional on Unbuntu, but other distributions may
++# follow suit, and this scheme seems to work even on rather old gcc's.
++# This unconditionally uses gcc because even if the user is using another
++# compiler, we still need to find the math library and friends, and I don't
++# know how other compilers will cope with that situation.
++# Still, as an escape hatch, allow Configure command line overrides to
++# plibpth to bypass this check.
++case "$plibpth" in
++'') plibpth=`gcc -print-search-dirs | grep libraries |
++	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc'`
++    plibpth="$plibpth"  # Collapse all entries on one line
++    ;;
++esac
++
+ # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
+ # for this test.
+ cat >try.c <<'EOM'
diff --git a/trunk/package/lang/perl/patches/300-always_use_miniperl.patch b/trunk/package/lang/perl/patches/300-always_use_miniperl.patch
new file mode 100644
index 00000000..f8f8a65d
--- /dev/null
+++ b/trunk/package/lang/perl/patches/300-always_use_miniperl.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.SH
++++ b/Makefile.SH
+@@ -315,22 +315,11 @@ MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE
+ 
+ !GROK!THIS!
+ 
+-case "$usecrosscompile$perl" in
+-define?*)
+-	$spitshell >>$Makefile <<!GROK!THIS!
+-# Macros to invoke a copy of our fully operational perl during the build.
+-PERL_EXE = perl\$(EXE_EXT)
+-RUN_PERL = \$(LDLIBPTH) \$(RUN) $perl\$(EXE_EXT)
+-!GROK!THIS!
+-	;;
+-*)
+-	$spitshell >>$Makefile <<!GROK!THIS!
++$spitshell >>$Makefile <<!GROK!THIS!
+ # Macros to invoke a copy of our fully operational perl during the build.
+ PERL_EXE = perl\$(EXE_EXT)
+-RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT) -Ilib
++RUN_PERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib
+ !GROK!THIS!
+-	;;
+-esac
+ 
+ $spitshell >>$Makefile <<!GROK!THIS!
+ # Macros to run our tests
diff --git a/trunk/package/lang/perl/patches/400-add_microperl_caretx_dependency.patch b/trunk/package/lang/perl/patches/400-add_microperl_caretx_dependency.patch
new file mode 100644
index 00000000..1c25fea4
--- /dev/null
+++ b/trunk/package/lang/perl/patches/400-add_microperl_caretx_dependency.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.micro
++++ b/Makefile.micro
+@@ -22,7 +22,8 @@ O = uav$(_O) udeb$(_O) udoio$(_O) udoop$
+ 	uregcomp$(_O) uregexec$(_O) urun$(_O) \
+ 	uscope$(_O) usv$(_O) utaint$(_O) utoke$(_O) \
+ 	unumeric$(_O) ulocale$(_O) umathoms$(_O) \
+-	uuniversal$(_O) uutf8$(_O) uutil$(_O) uperlapi$(_O) ukeywords$(_O)
++	uuniversal$(_O) uutf8$(_O) uutil$(_O) uperlapi$(_O) ukeywords$(_O) \
++	ucaretx$(_O)
+ 
+ microperl:	$(O)
+ 	$(LD) -o $@ $(O) $(LDFLAGS) $(LIBS)
+@@ -178,6 +179,9 @@ uutil$(_O):	$(HE) util.c
+ uperlapi$(_O):	$(HE) perlapi.c perlapi.h
+ 	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlapi.c
+ 
++ucaretx$(_O): $(HE) caretx.c
++	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) caretx.c
++
+ uuudmap.h umg_data.h: ubitcount.h
+ 
+ ubitcount.h: ugenerate_uudmap$(_X)
diff --git a/trunk/package/lang/perl/patches/500-add-relink-hack.patch b/trunk/package/lang/perl/patches/500-add-relink-hack.patch
new file mode 100644
index 00000000..fd3d3861
--- /dev/null
+++ b/trunk/package/lang/perl/patches/500-add-relink-hack.patch
@@ -0,0 +1,6 @@
+--- /dev/null
++++ b/relink/Makefile.PL
+@@ -0,0 +1,3 @@
++use ExtUtils::MakeMaker;
++
++WriteMakefile(NAME => "relink");
diff --git a/trunk/package/lang/perl/perlbase.mk b/trunk/package/lang/perl/perlbase.mk
new file mode 100644
index 00000000..ab08b386
--- /dev/null
+++ b/trunk/package/lang/perl/perlbase.mk
@@ -0,0 +1,1539 @@
+define Package/perlbase-template
+SUBMENU:=Perl
+SECTION:=lang
+CATEGORY:=Languages
+URL:=http://www.cpan.org/
+DEPENDS:=perl
+endef
+
+define Package/perlbase-anydbm-file
+$(call Package/perlbase-template)
+TITLE:=AnyDBM_File perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-anydbm-file/install
+$(call perlmod/Install,$(1),AnyDBM_File.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-anydbm-file))
+
+
+define Package/perlbase-app
+$(call Package/perlbase-template)
+TITLE:=app perl module
+DEPENDS+=+perlbase-autouse +perlbase-base +perlbase-config +perlbase-cpan +perlbase-essential +perlbase-file +perlbase-getopt +perlbase-if +perlbase-tap +perlbase-text
+endef
+
+define Package/perlbase-app/install
+$(call perlmod/Install,$(1),App,)
+endef
+
+$(eval $(call BuildPackage,perlbase-app))
+
+
+define Package/perlbase-archive
+$(call Package/perlbase-template)
+TITLE:=Archive perl module
+DEPENDS+=+perlbase-cwd +perlbase-essential +perlbase-file +perlbase-io
+endef
+
+define Package/perlbase-archive/install
+$(call perlmod/Install,$(1),Archive,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Archive-Tar/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-archive))
+
+
+define Package/perlbase-arybase
+$(call Package/perlbase-template)
+TITLE:=arybase perl module
+endef
+
+define Package/perlbase-arybase/install
+$(call perlmod/Install,$(1),arybase.pm auto/arybase,)
+$(call perlmod/InstallBaseTests,$(1),ext/arybase/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-arybase))
+
+
+define Package/perlbase-attribute
+$(call Package/perlbase-template)
+TITLE:=Attribute perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-attribute/install
+$(call perlmod/Install,$(1),Attribute,)
+$(call perlmod/InstallBaseTests,$(1),dist/Attribute-Handlers/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-attribute))
+
+
+define Package/perlbase-attributes
+$(call Package/perlbase-template)
+TITLE:=attributes perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-attributes/install
+$(call perlmod/Install,$(1),attributes.pm auto/attributes,)
+endef
+
+$(eval $(call BuildPackage,perlbase-attributes))
+
+
+define Package/perlbase-autodie
+$(call Package/perlbase-template)
+TITLE:=autodie perl module
+DEPENDS+=+perlbase-base +perlbase-essential +perlbase-fatal +perlbase-if
+endef
+
+define Package/perlbase-autodie/install
+$(call perlmod/Install,$(1),autodie autodie.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/autodie/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-autodie))
+
+
+define Package/perlbase-autoloader
+$(call Package/perlbase-template)
+TITLE:=AutoLoader perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-autoloader/install
+$(call perlmod/Install,$(1),AutoLoader.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/AutoLoader/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-autoloader))
+
+
+define Package/perlbase-autosplit
+$(call Package/perlbase-template)
+TITLE:=AutoSplit perl module
+DEPENDS+=+perlbase-config +perlbase-essential +perlbase-file
+endef
+
+define Package/perlbase-autosplit/install
+$(call perlmod/Install/NoStrip,$(1),AutoSplit.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-autosplit))
+
+
+define Package/perlbase-autouse
+$(call Package/perlbase-template)
+TITLE:=autouse perl module
+endef
+
+define Package/perlbase-autouse/install
+$(call perlmod/Install,$(1),autouse.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/autouse/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-autouse))
+
+
+define Package/perlbase-b
+$(call Package/perlbase-template)
+TITLE:=B perl module
+DEPENDS+=+perlbase-config +perlbase-essential
+endef
+
+define Package/perlbase-b/install
+$(call perlmod/Install,$(1),B B.pm auto/B,)
+$(call perlmod/InstallBaseTests,$(1),cpan/B-Debug/t ext/B/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-b))
+
+
+define Package/perlbase-base
+$(call Package/perlbase-template)
+TITLE:=base perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-base/install
+$(call perlmod/Install,$(1),base.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/base/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-base))
+
+
+define Package/perlbase-benchmark
+$(call Package/perlbase-template)
+TITLE:=Benchmark perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-benchmark/install
+$(call perlmod/Install,$(1),Benchmark.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-benchmark))
+
+
+define Package/perlbase-bigint
+$(call Package/perlbase-template)
+TITLE:=bigint perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-bigint/install
+$(call perlmod/Install,$(1),bigint.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-bigint))
+
+
+define Package/perlbase-bignum
+$(call Package/perlbase-template)
+TITLE:=bignum perl module
+DEPENDS+=+perlbase-bigint +perlbase-essential
+endef
+
+define Package/perlbase-bignum/install
+$(call perlmod/Install,$(1),bignum.pm bigrat.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/bignum/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-bignum))
+
+
+define Package/perlbase-blib
+$(call Package/perlbase-template)
+TITLE:=blib perl module
+DEPENDS+=+perlbase-cwd +perlbase-essential +perlbase-file
+endef
+
+define Package/perlbase-blib/install
+$(call perlmod/Install,$(1),blib.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-blib))
+
+
+define Package/perlbase-bytes
+$(call Package/perlbase-template)
+TITLE:=bytes perl module
+endef
+
+define Package/perlbase-bytes/install
+$(call perlmod/Install,$(1),bytes.pm bytes_heavy.pl,)
+endef
+
+$(eval $(call BuildPackage,perlbase-bytes))
+
+
+define Package/perlbase-cgi
+$(call Package/perlbase-template)
+TITLE:=CGI perl module
+DEPENDS+=+perlbase-base +perlbase-essential +perlbase-file +perlbase-if
+endef
+
+define Package/perlbase-cgi/install
+$(call perlmod/Install,$(1),CGI CGI.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/CGI/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-cgi))
+
+
+define Package/perlbase-charnames
+$(call Package/perlbase-template)
+TITLE:=charnames perl module
+DEPENDS+=+perlbase-bytes +perlbase-essential +perlbase-file +perlbase-re +perlbase-unicore
+endef
+
+define Package/perlbase-charnames/install
+$(call perlmod/Install,$(1),_charnames.pm charnames.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-charnames))
+
+
+define Package/perlbase-class
+$(call Package/perlbase-template)
+TITLE:=Class perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-class/install
+$(call perlmod/Install,$(1),Class,)
+endef
+
+$(eval $(call BuildPackage,perlbase-class))
+
+
+define Package/perlbase-compress
+$(call Package/perlbase-template)
+TITLE:=Compress perl module
+DEPENDS+=+perlbase-bytes +perlbase-essential +perlbase-io +perlbase-scalar
+endef
+
+define Package/perlbase-compress/install
+$(call perlmod/Install,$(1),Compress auto/Compress,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Compress-Raw-Bzip2/t cpan/Compress-Raw-Zlib/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-compress))
+
+
+define Package/perlbase-config
+$(call Package/perlbase-template)
+TITLE:=Config perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-config/install
+$(call perlmod/Install,$(1),Config Config.pm Config_git.pl Config_heavy.pl,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Config-Perl-V/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-config))
+
+
+define Package/perlbase-cpan
+$(call Package/perlbase-template)
+TITLE:=CPAN perl module
+DEPENDS+=+perlbase-b +perlbase-config +perlbase-cwd +perlbase-dirhandle +perlbase-essential +perlbase-extutils +perlbase-fcntl +perlbase-file +perlbase-filehandle +perlbase-http-tiny +perlbase-list +perlbase-net +perlbase-safe +perlbase-scalar +perlbase-sys +perlbase-text +perlbase-version
+endef
+
+define Package/perlbase-cpan/install
+$(call perlmod/Install,$(1),CPAN CPAN.pm Parse/CPAN/Meta.pm,CPAN/FirstTime.pm)
+$(call perlmod/Install/NoStrip,$(1),CPAN/FirstTime.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/CPAN-Meta-Requirements/t cpan/CPAN-Meta-YAML/t cpan/CPAN-Meta/t cpan/CPAN/t cpan/Parse-CPAN-Meta/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-cpan))
+
+
+define Package/perlbase-cwd
+$(call Package/perlbase-template)
+TITLE:=Cwd perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-cwd/install
+$(call perlmod/Install,$(1),Cwd.pm auto/Cwd,)
+endef
+
+$(eval $(call BuildPackage,perlbase-cwd))
+
+
+define Package/perlbase-data
+$(call Package/perlbase-template)
+TITLE:=Data perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-data/install
+$(call perlmod/Install,$(1),Data auto/Data,)
+$(call perlmod/InstallBaseTests,$(1),dist/Data-Dumper/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-data))
+
+
+define Package/perlbase-db
+$(call Package/perlbase-template)
+TITLE:=DB perl module
+DEPENDS+=+libdb47 +perlbase-essential
+endef
+
+define Package/perlbase-db/install
+$(call perlmod/Install,$(1),DB.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-db))
+
+
+define Package/perlbase-db-file
+$(call Package/perlbase-template)
+TITLE:=DB_File perl module
+DEPENDS+=+libdb47 +perlbase-essential
+endef
+
+define Package/perlbase-db-file/install
+$(call perlmod/Install,$(1),DB_File.pm auto/DB_File,)
+$(call perlmod/InstallBaseTests,$(1),cpan/DB_File/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-db-file))
+
+
+define Package/perlbase-dbm-filter
+$(call Package/perlbase-template)
+TITLE:=DBM_Filter perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-dbm-filter/install
+$(call perlmod/Install,$(1),DBM_Filter DBM_Filter.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-dbm-filter))
+
+
+define Package/perlbase-devel
+$(call Package/perlbase-template)
+TITLE:=Devel perl module
+DEPENDS+=+perlbase-essential +perlbase-file
+endef
+
+define Package/perlbase-devel/install
+$(call perlmod/Install,$(1),Devel auto/Devel,Devel/PPPort.pm)
+$(call perlmod/Install/NoStrip,$(1),Devel/PPPort.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Devel-PPPort/t dist/Devel-SelfStubber/t ext/Devel-Peek/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-devel))
+
+
+define Package/perlbase-diagnostics
+$(call Package/perlbase-template)
+TITLE:=diagnostics perl module
+DEPENDS+=+perlbase-config +perlbase-essential +perlbase-text
+endef
+
+define Package/perlbase-diagnostics/install
+$(call perlmod/Install,$(1),diagnostics.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-diagnostics))
+
+
+define Package/perlbase-digest
+$(call Package/perlbase-template)
+TITLE:=Digest perl module
+DEPENDS+=+perlbase-essential +perlbase-fcntl +perlbase-integer
+endef
+
+define Package/perlbase-digest/install
+$(call perlmod/Install,$(1),Digest Digest.pm auto/Digest,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Digest-MD5/MD5.xs cpan/Digest-MD5/t cpan/Digest-SHA/t cpan/Digest/t)
+	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/cpan/Digest-SHA/src
+endef
+
+$(eval $(call BuildPackage,perlbase-digest))
+
+
+define Package/perlbase-dirhandle
+$(call Package/perlbase-template)
+TITLE:=DirHandle perl module
+DEPENDS+=+perlbase-essential +perlbase-symbol
+endef
+
+define Package/perlbase-dirhandle/install
+$(call perlmod/Install,$(1),DirHandle.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-dirhandle))
+
+
+define Package/perlbase-dumpvalue
+$(call Package/perlbase-template)
+TITLE:=Dumpvalue perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-dumpvalue/install
+$(call perlmod/Install,$(1),Dumpvalue.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/Dumpvalue/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-dumpvalue))
+
+
+define Package/perlbase-dumpvar
+$(call Package/perlbase-template)
+TITLE:=dumpvar perl module
+endef
+
+define Package/perlbase-dumpvar/install
+$(call perlmod/Install,$(1),dumpvar.pl,)
+endef
+
+$(eval $(call BuildPackage,perlbase-dumpvar))
+
+
+define Package/perlbase-dynaloader
+$(call Package/perlbase-template)
+TITLE:=DynaLoader perl module
+DEPENDS+=+perlbase-config
+endef
+
+define Package/perlbase-dynaloader/install
+$(call perlmod/Install,$(1),DynaLoader.pm,)
+$(call perlmod/InstallBaseTests,$(1),ext/DynaLoader/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-dynaloader))
+
+
+define Package/perlbase-encode
+$(call Package/perlbase-template)
+TITLE:=Encode perl module
+DEPENDS+=+perlbase-essential +perlbase-mime +perlbase-utf8 +perlbase-xsloader
+endef
+
+define Package/perlbase-encode/install
+$(call perlmod/Install,$(1),Encode Encode.pm auto/Encode,Encode/PerlIO.pod Encode/Supported.pod)
+$(call perlmod/InstallBaseTests,$(1),cpan/Encode/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-encode))
+
+
+define Package/perlbase-encoding
+$(call Package/perlbase-template)
+TITLE:=encoding perl module
+DEPENDS+=+perlbase-encode +perlbase-essential
+endef
+
+define Package/perlbase-encoding/install
+$(call perlmod/Install,$(1),encoding encoding.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/encoding-warnings/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-encoding))
+
+
+define Package/perlbase-english
+$(call Package/perlbase-template)
+TITLE:=English perl module
+endef
+
+define Package/perlbase-english/install
+$(call perlmod/Install,$(1),English.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-english))
+
+
+define Package/perlbase-env
+$(call Package/perlbase-template)
+TITLE:=Env perl module
+DEPENDS+=+perlbase-config +perlbase-tie
+endef
+
+define Package/perlbase-env/install
+$(call perlmod/Install,$(1),Env.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/Env/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-env))
+
+
+define Package/perlbase-errno
+$(call Package/perlbase-template)
+TITLE:=Errno perl module
+DEPENDS+=+perlbase-config +perlbase-essential
+endef
+
+define Package/perlbase-errno/install
+$(call perlmod/Install,$(1),Errno.pm,)
+$(call perlmod/InstallBaseTests,$(1),ext/Errno/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-errno))
+
+
+define Package/perlbase-essential
+$(call Package/perlbase-template)
+TITLE:=essential perl module
+endef
+
+define Package/perlbase-essential/install
+$(call perlmod/Install,$(1),Carp Carp.pm Exporter Exporter.pm constant.pm deprecate.pm lib.pm locale.pm overload.pm overloading.pm parent.pm strict.pm subs.pm vars.pm warnings warnings.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/parent/t dist/Carp/t dist/Exporter/t dist/constant/t dist/lib/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-essential))
+
+
+define Package/perlbase-experimental
+$(call Package/perlbase-template)
+TITLE:=perl module to enable/disable experimental features
+DEPENDS+=+perlbase-essential +perlbase-feature
+endef
+
+define Package/perlbase-experimental/install
+$(call perlmod/Install,$(1),experimental.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/experimental/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-experimental))
+
+
+define Package/perlbase-extutils
+$(call Package/perlbase-template)
+TITLE:=ExtUtils perl module
+DEPENDS+=+perlbase-autosplit +perlbase-config +perlbase-cwd +perlbase-dirhandle +perlbase-essential +perlbase-file +perlbase-io +perlbase-ipc +perlbase-ostype +perlbase-symbol +perlbase-text
+endef
+
+define Package/perlbase-extutils/install
+$(call perlmod/Install,$(1),ExtUtils,ExtUtils/MakeMaker/FAQ.pod ExtUtils/MakeMaker/Tutorial.pod ExtUtils/ParseXS.pm ExtUtils/ParseXS/Utilities.pm)
+$(call perlmod/Install/NoStrip,$(1),ExtUtils/ParseXS.pm ExtUtils/ParseXS/Utilities.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/ExtUtils-Constant/t cpan/ExtUtils-MakeMaker/t dist/ExtUtils-CBuilder/t dist/ExtUtils-Command/t dist/ExtUtils-Install/t dist/ExtUtils-Manifest/t dist/ExtUtils-ParseXS/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-extutils))
+
+
+define Package/perlbase-fatal
+$(call Package/perlbase-template)
+TITLE:=Fatal perl module
+DEPENDS+=+perlbase-config +perlbase-essential +perlbase-scalar +perlbase-tie
+endef
+
+define Package/perlbase-fatal/install
+$(call perlmod/Install,$(1),Fatal.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-fatal))
+
+
+define Package/perlbase-fcntl
+$(call Package/perlbase-template)
+TITLE:=Fcntl perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-fcntl/install
+$(call perlmod/Install,$(1),Fcntl.pm auto/Fcntl,)
+$(call perlmod/InstallBaseTests,$(1),ext/Fcntl/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-fcntl))
+
+
+define Package/perlbase-feature
+$(call Package/perlbase-template)
+TITLE:=feature perl module
+endef
+
+define Package/perlbase-feature/install
+$(call perlmod/Install,$(1),feature.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-feature))
+
+
+define Package/perlbase-fields
+$(call Package/perlbase-template)
+TITLE:=fields perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-fields/install
+$(call perlmod/Install,$(1),fields.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-fields))
+
+
+define Package/perlbase-file
+$(call Package/perlbase-template)
+TITLE:=File perl module
+DEPENDS+=+perlbase-class +perlbase-config +perlbase-cwd +perlbase-errno +perlbase-essential +perlbase-fcntl +perlbase-filehandle +perlbase-io +perlbase-locale +perlbase-params +perlbase-scalar
+endef
+
+define Package/perlbase-file/install
+$(call perlmod/Install,$(1),File auto/File,File/Find.pm)
+$(call perlmod/Install/NoStrip,$(1),File/Find.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/File-Fetch/t cpan/File-Path/t cpan/File-Temp/t dist/PathTools/t ext/File-DosGlob/t ext/File-Find/t ext/File-Glob/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-file))
+
+
+define Package/perlbase-filecache
+$(call Package/perlbase-template)
+TITLE:=FileCache perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-filecache/install
+$(call perlmod/Install,$(1),FileCache.pm,)
+$(call perlmod/InstallBaseTests,$(1),ext/FileCache/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-filecache))
+
+
+define Package/perlbase-filehandle
+$(call Package/perlbase-template)
+TITLE:=FileHandle perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-filehandle/install
+$(call perlmod/Install,$(1),FileHandle.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-filehandle))
+
+
+define Package/perlbase-filetest
+$(call Package/perlbase-template)
+TITLE:=filetest perl module
+endef
+
+define Package/perlbase-filetest/install
+$(call perlmod/Install,$(1),filetest.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-filetest))
+
+
+define Package/perlbase-filter
+$(call Package/perlbase-template)
+TITLE:=Filter perl module
+DEPENDS+=+perlbase-essential +perlbase-text
+endef
+
+define Package/perlbase-filter/install
+$(call perlmod/Install,$(1),Filter auto/Filter,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Filter-Util-Call/filter-util.pl cpan/Filter-Util-Call/t dist/Filter-Simple/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-filter))
+
+
+define Package/perlbase-findbin
+$(call Package/perlbase-template)
+TITLE:=FindBin perl module
+DEPENDS+=+perlbase-cwd +perlbase-essential +perlbase-file
+endef
+
+define Package/perlbase-findbin/install
+$(call perlmod/Install,$(1),FindBin.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-findbin))
+
+
+define Package/perlbase-gdbm-file
+$(call Package/perlbase-template)
+TITLE:=GDBM_File perl module
+DEPENDS+=+libgdbm +perlbase-essential
+endef
+
+define Package/perlbase-gdbm-file/install
+$(call perlmod/Install,$(1),GDBM_File.pm auto/GDBM_File,)
+$(call perlmod/InstallBaseTests,$(1),ext/GDBM_File/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-gdbm-file))
+
+
+define Package/perlbase-getopt
+$(call Package/perlbase-template)
+TITLE:=Getopt perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-getopt/install
+$(call perlmod/Install,$(1),Getopt,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Getopt-Long/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-getopt))
+
+
+define Package/perlbase-hash
+$(call Package/perlbase-template)
+TITLE:=Hash perl module
+DEPENDS+=+perlbase-essential +perlbase-scalar
+endef
+
+define Package/perlbase-hash/install
+$(call perlmod/Install,$(1),Hash auto/Hash,)
+$(call perlmod/InstallBaseTests,$(1),ext/Hash-Util-FieldHash/t ext/Hash-Util/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-hash))
+
+
+define Package/perlbase-http-tiny
+$(call Package/perlbase-template)
+TITLE:=http-tiny perl module
+DEPENDS+=+perlbase-errno +perlbase-essential +perlbase-io
+endef
+
+define Package/perlbase-http-tiny/install
+$(call perlmod/Install,$(1),HTTP/Tiny.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/HTTP-Tiny/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-http-tiny))
+
+
+define Package/perlbase-i18n
+$(call Package/perlbase-template)
+TITLE:=I18N perl module
+DEPENDS+=+perlbase-essential +perlbase-posix
+endef
+
+define Package/perlbase-i18n/install
+$(call perlmod/Install,$(1),I18N auto/I18N,I18N/LangTags/List.pm)
+$(call perlmod/InstallBaseTests,$(1),dist/I18N-Collate/t dist/I18N-LangTags/t ext/I18N-Langinfo/t)
+$(call perlmod/Install/NoStrip,$(1),I18N/LangTags/List.pm)
+endef
+
+$(eval $(call BuildPackage,perlbase-i18n))
+
+
+define Package/perlbase-if
+$(call Package/perlbase-template)
+TITLE:=if perl module
+endef
+
+define Package/perlbase-if/install
+$(call perlmod/Install,$(1),if.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/if/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-if))
+
+
+define Package/perlbase-integer
+$(call Package/perlbase-template)
+TITLE:=integer perl module
+endef
+
+define Package/perlbase-integer/install
+$(call perlmod/Install,$(1),integer.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-integer))
+
+
+define Package/perlbase-io
+$(call Package/perlbase-template)
+TITLE:=IO perl module
+DEPENDS+=+perlbase-base +perlbase-bytes +perlbase-config +perlbase-errno +perlbase-essential +perlbase-fcntl +perlbase-list +perlbase-posix +perlbase-scalar +perlbase-selectsaver +perlbase-socket +perlbase-symbol +perlbase-tie +perlbase-xsloader
+endef
+
+define Package/perlbase-io/install
+$(call perlmod/Install,$(1),IO IO.pm auto/IO,)
+$(call perlmod/InstallBaseTests,$(1),cpan/IO-Compress/t cpan/IO-Socket-IP/t cpan/IO-Zlib/t dist/IO/Makefile.PL dist/IO/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-io))
+
+
+define Package/perlbase-ipc
+$(call Package/perlbase-template)
+TITLE:=IPC perl module
+DEPENDS+=+perlbase-config +perlbase-essential +perlbase-file +perlbase-locale +perlbase-params +perlbase-symbol +perlbase-text
+endef
+
+define Package/perlbase-ipc/install
+$(call perlmod/Install,$(1),IPC auto/IPC,)
+$(call perlmod/InstallBaseTests,$(1),cpan/IPC-Cmd/t cpan/IPC-SysV/t ext/IPC-Open3/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-ipc))
+
+
+define Package/perlbase-json-pp
+$(call Package/perlbase-template)
+TITLE:=json-pp perl module
+DEPENDS+=+perlbase-b +perlbase-base +perlbase-essential
+endef
+
+define Package/perlbase-json-pp/install
+$(call perlmod/Install,$(1),JSON/PP JSON/PP.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/JSON-PP/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-json-pp))
+
+
+define Package/perlbase-less
+$(call Package/perlbase-template)
+TITLE:=less perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-less/install
+$(call perlmod/Install,$(1),less.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-less))
+
+
+define Package/perlbase-list
+$(call Package/perlbase-template)
+TITLE:=List perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-list/install
+$(call perlmod/Install,$(1),List auto/List,)
+endef
+
+$(eval $(call BuildPackage,perlbase-list))
+
+
+define Package/perlbase-locale
+$(call Package/perlbase-template)
+TITLE:=Locale perl module
+DEPENDS+=+perlbase-essential +perlbase-i18n +perlbase-integer +perlbase-utf8
+endef
+
+define Package/perlbase-locale/install
+$(call perlmod/Install,$(1),Locale,Locale/Constants.pod Locale/Country.pod Locale/Currency.pod Locale/Language.pod Locale/Maketext.pod Locale/Maketext/TPJ13.pod Locale/Script.pod)
+$(call perlmod/InstallBaseTests,$(1),cpan/Locale-Codes/t cpan/Locale-Maketext-Simple/t dist/Locale-Maketext/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-locale))
+
+
+define Package/perlbase-math
+$(call Package/perlbase-template)
+TITLE:=Math perl module
+DEPENDS+=+perlbase-config +perlbase-essential +perlbase-scalar
+endef
+
+define Package/perlbase-math/install
+$(call perlmod/Install,$(1),Math auto/Math,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Math-Complex/t dist/Math-BigInt-FastCalc/t dist/Math-BigInt/t dist/Math-BigRat/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-math))
+
+
+define Package/perlbase-memoize
+$(call Package/perlbase-template)
+TITLE:=Memoize perl module
+DEPENDS+=+perlbase-config +perlbase-essential +perlbase-storable
+endef
+
+define Package/perlbase-memoize/install
+$(call perlmod/Install,$(1),Memoize Memoize.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Memoize/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-memoize))
+
+
+define Package/perlbase-mime
+$(call Package/perlbase-template)
+TITLE:=MIME perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-mime/install
+$(call perlmod/Install,$(1),MIME auto/MIME,)
+$(call perlmod/InstallBaseTests,$(1),cpan/MIME-Base64/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-mime))
+
+
+define Package/perlbase-module
+$(call Package/perlbase-template)
+TITLE:=Module perl module
+DEPENDS+=+perlbase-config +perlbase-cwd +perlbase-data +perlbase-essential +perlbase-extutils +perlbase-file +perlbase-filehandle +perlbase-if +perlbase-io +perlbase-locale +perlbase-ostype +perlbase-params +perlbase-text +perlbase-version
+endef
+
+define Package/perlbase-module/install
+$(call perlmod/Install,$(1),Module,Module/Build Module/Build.pm Module/Build/API.pod Module/Build/Authoring.pod)
+$(call perlmod/Install/NoStrip,$(1),Module/Build Module/Build.pm,Module/Build/API.pod Module/Build/Authoring.pod)
+$(call perlmod/InstallBaseTests,$(1),cpan/Module-Build/lib cpan/Module-Build/t cpan/Module-Load-Conditional/t cpan/Module-Load/t cpan/Module-Loaded/t cpan/Module-Metadata/lib cpan/Module-Metadata/t dist/Module-CoreList/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-module))
+
+
+define Package/perlbase-mro
+$(call Package/perlbase-template)
+TITLE:=mro perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-mro/install
+$(call perlmod/Install,$(1),auto/mro mro.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-mro))
+
+
+define Package/perlbase-net
+$(call Package/perlbase-template)
+TITLE:=Net perl module
+DEPENDS+=+perlbase-class +perlbase-errno +perlbase-essential +perlbase-fcntl +perlbase-filehandle +perlbase-io +perlbase-posix +perlbase-socket +perlbase-symbol +perlbase-time
+endef
+
+define Package/perlbase-net/install
+$(call perlmod/Install,$(1),Net,Net/libnetFAQ.pod)
+$(call perlmod/InstallBaseTests,$(1),cpan/libnet/t dist/Net-Ping/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-net))
+
+
+define Package/perlbase-next
+$(call Package/perlbase-template)
+TITLE:=NEXT perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-next/install
+$(call perlmod/Install,$(1),NEXT.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/NEXT/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-next))
+
+
+define Package/perlbase-o
+$(call Package/perlbase-template)
+TITLE:=O perl module
+DEPENDS+=+perlbase-b +perlbase-essential
+endef
+
+define Package/perlbase-o/install
+$(call perlmod/Install,$(1),O.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-o))
+
+
+define Package/perlbase-opcode
+$(call Package/perlbase-template)
+TITLE:=Opcode perl module
+DEPENDS+=+perlbase-essential +perlbase-xsloader
+endef
+
+define Package/perlbase-opcode/install
+$(call perlmod/Install,$(1),auto/Opcode,)
+$(call perlmod/Install/NoStrip,$(1),Opcode.pm,)
+$(call perlmod/InstallBaseTests,$(1),ext/Opcode/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-opcode))
+
+
+define Package/perlbase-open
+$(call Package/perlbase-template)
+TITLE:=open perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-open/install
+$(call perlmod/Install,$(1),open.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-open))
+
+
+define Package/perlbase-ops
+$(call Package/perlbase-template)
+TITLE:=ops perl module
+DEPENDS+=+perlbase-opcode
+endef
+
+define Package/perlbase-ops/install
+$(call perlmod/Install,$(1),ops.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-ops))
+
+
+define Package/perlbase-ostype
+$(call Package/perlbase-template)
+TITLE:=OSType perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-ostype/install
+$(call perlmod/Install,$(1),Perl/OSType.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Perl-OSType/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-ostype))
+
+
+define Package/perlbase-package
+$(call Package/perlbase-template)
+TITLE:=Package perl module
+DEPENDS+=+perlbase-essential +perlbase-if
+endef
+
+define Package/perlbase-package/install
+$(call perlmod/Install,$(1),Package,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Package-Constants/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-package))
+
+
+define Package/perlbase-params
+$(call Package/perlbase-template)
+TITLE:=Params perl module
+DEPENDS+=+perlbase-essential +perlbase-locale
+endef
+
+define Package/perlbase-params/install
+$(call perlmod/Install,$(1),Params,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Params-Check/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-params))
+
+
+define Package/perlbase-perl5db
+$(call Package/perlbase-template)
+TITLE:=perl5db perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-perl5db/install
+$(call perlmod/Install,$(1),perl5db.pl,)
+endef
+
+$(eval $(call BuildPackage,perlbase-perl5db))
+
+
+define Package/perlbase-perlio
+$(call Package/perlbase-template)
+TITLE:=PerlIO perl module
+DEPENDS+=+perlbase-essential +perlbase-mime +perlbase-xsloader
+endef
+
+define Package/perlbase-perlio/install
+$(call perlmod/Install,$(1),PerlIO PerlIO.pm auto/PerlIO,)
+$(call perlmod/InstallBaseTests,$(1),cpan/PerlIO-via-QuotedPrint/t ext/PerlIO-encoding/t ext/PerlIO-scalar/t ext/PerlIO-via/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-perlio))
+
+
+define Package/perlbase-pod
+$(call Package/perlbase-template)
+TITLE:=Pod perl module
+DEPENDS+=+perlbase-config +perlbase-cwd +perlbase-encode +perlbase-essential +perlbase-fcntl +perlbase-file +perlbase-getopt +perlbase-integer +perlbase-posix +perlbase-symbol +perlbase-term +perlbase-text
+endef
+
+define Package/perlbase-pod/install
+$(call perlmod/Install,$(1),Pod,Pod/Usage.pm)
+$(call perlmod/Install/NoStrip,$(1),Pod/Usage.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Pod-Checker/t cpan/Pod-Escapes/t cpan/Pod-Parser/lib cpan/Pod-Parser/scripts cpan/Pod-Parser/t cpan/Pod-Perldoc/t cpan/Pod-Simple/t cpan/Pod-Usage/scripts cpan/Pod-Usage/t cpan/podlators/t ext/Pod-Functions/Functions.pm ext/Pod-Functions/t ext/Pod-Html/t)
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/pod2man $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/pod2text $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,perlbase-pod))
+
+
+define Package/perlbase-posix
+$(call Package/perlbase-template)
+TITLE:=POSIX perl module
+DEPENDS+=+perlbase-essential +perlbase-fcntl
+endef
+
+define Package/perlbase-posix/install
+$(call perlmod/Install,$(1),POSIX.pm auto/POSIX,)
+$(call perlmod/InstallBaseTests,$(1),ext/POSIX/Makefile.PL ext/POSIX/POSIX.xs ext/POSIX/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-posix))
+
+
+define Package/perlbase-re
+$(call Package/perlbase-template)
+TITLE:=re perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-re/install
+$(call perlmod/Install,$(1),auto/re re.pm,)
+$(call perlmod/InstallBaseTests,$(1),ext/re/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-re))
+
+
+define Package/perlbase-safe
+$(call Package/perlbase-template)
+TITLE:=Safe perl module
+DEPENDS+=+perlbase-b +perlbase-essential +perlbase-opcode +perlbase-scalar
+endef
+
+define Package/perlbase-safe/install
+$(call perlmod/Install,$(1),Safe.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/Safe/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-safe))
+
+
+define Package/perlbase-scalar
+$(call Package/perlbase-template)
+TITLE:=Scalar perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-scalar/install
+$(call perlmod/Install,$(1),Scalar,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Scalar-List-Utils/t)
+	$(INSTALL_DIR) $(1)/$(PERL_TESTSDIR)/cpan/Scalar-List-Utils/blib
+endef
+
+$(eval $(call BuildPackage,perlbase-scalar))
+
+
+define Package/perlbase-sdbm-file
+$(call Package/perlbase-template)
+TITLE:=SDBM_File perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-sdbm-file/install
+$(call perlmod/Install,$(1),SDBM_File.pm auto/SDBM_File,)
+$(call perlmod/InstallBaseTests,$(1),ext/SDBM_File/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-sdbm-file))
+
+
+define Package/perlbase-search
+$(call Package/perlbase-template)
+TITLE:=Search perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-search/install
+$(call perlmod/Install,$(1),Search,)
+$(call perlmod/InstallBaseTests,$(1),dist/Search-Dict/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-search))
+
+
+define Package/perlbase-selectsaver
+$(call Package/perlbase-template)
+TITLE:=SelectSaver perl module
+DEPENDS+=+perlbase-essential +perlbase-symbol
+endef
+
+define Package/perlbase-selectsaver/install
+$(call perlmod/Install,$(1),SelectSaver.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-selectsaver))
+
+
+define Package/perlbase-selfloader
+$(call Package/perlbase-template)
+TITLE:=SelfLoader perl module
+DEPENDS+=+perlbase-essential +perlbase-io
+endef
+
+define Package/perlbase-selfloader/install
+$(call perlmod/Install,$(1),SelfLoader.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/SelfLoader/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-selfloader))
+
+
+define Package/perlbase-sigtrap
+$(call Package/perlbase-template)
+TITLE:=sigtrap perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-sigtrap/install
+$(call perlmod/Install,$(1),sigtrap.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-sigtrap))
+
+
+define Package/perlbase-socket
+$(call Package/perlbase-template)
+TITLE:=Socket perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-socket/install
+$(call perlmod/Install,$(1),Socket.pm auto/Socket,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Socket/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-socket))
+
+
+define Package/perlbase-sort
+$(call Package/perlbase-template)
+TITLE:=sort perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-sort/install
+$(call perlmod/Install,$(1),sort.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-sort))
+
+
+define Package/perlbase-storable
+$(call Package/perlbase-template)
+TITLE:=Storable perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-storable/install
+$(call perlmod/Install,$(1),Storable.pm auto/Storable,)
+$(call perlmod/InstallBaseTests,$(1),dist/Storable/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-storable))
+
+
+define Package/perlbase-symbol
+$(call Package/perlbase-template)
+TITLE:=Symbol perl module
+endef
+
+define Package/perlbase-symbol/install
+$(call perlmod/Install,$(1),Symbol.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-symbol))
+
+
+define Package/perlbase-sys
+$(call Package/perlbase-template)
+TITLE:=Sys perl module
+DEPENDS+=+perlbase-essential +perlbase-file +perlbase-posix +perlbase-socket
+endef
+
+define Package/perlbase-sys/install
+$(call perlmod/Install,$(1),Sys auto/Sys,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Sys-Syslog/t ext/Sys-Hostname/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-sys))
+
+
+define Package/perlbase-tap
+$(call Package/perlbase-template)
+TITLE:=TAP perl module
+DEPENDS+=+perlbase-base +perlbase-benchmark +perlbase-config +perlbase-essential +perlbase-file +perlbase-io +perlbase-posix +perlbase-text
+endef
+
+define Package/perlbase-tap/install
+$(call perlmod/Install,$(1),TAP,)
+endef
+
+$(eval $(call BuildPackage,perlbase-tap))
+
+
+define Package/perlbase-term
+$(call Package/perlbase-template)
+TITLE:=Term perl module
+DEPENDS+=+perlbase-essential
+endef
+
+define Package/perlbase-term/install
+$(call perlmod/Install,$(1),Term,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Term-ANSIColor/t cpan/Term-Cap/test.pl dist/Term-Complete/t dist/Term-ReadLine/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-term))
+
+
+define Package/perlbase-test
+$(call Package/perlbase-template)
+TITLE:=Test perl module
+DEPENDS+=+perlbase-base +perlbase-config +perlbase-essential +perlbase-symbol +perlbase-tap +perlbase-text
+endef
+
+define Package/perlbase-test/install
+$(call perlmod/Install,$(1),Test Test.pm,Test/Builder.pm Test/Harness/TAP.pod Test/More.pm Test/Tutorial.pod)
+$(call perlmod/Install/NoStrip,$(1),Test/Builder.pm Test/More.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Test-Harness/t cpan/Test-Simple/t cpan/Test/t)
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prove $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,perlbase-test))
+
+
+define Package/perlbase-text
+$(call Package/perlbase-template)
+TITLE:=Text perl module
+DEPENDS+=+perlbase-essential +perlbase-selfloader
+endef
+
+define Package/perlbase-text/install
+$(call perlmod/Install,$(1),Text,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Text-Balanced/t cpan/Text-ParseWords/t cpan/Text-Tabs/t dist/Text-Abbrev/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-text))
+
+
+define Package/perlbase-thread
+$(call Package/perlbase-template)
+TITLE:=Thread perl module
+DEPENDS+=+perlbase-essential +perlbase-scalar +perlbase-threads
+endef
+
+define Package/perlbase-thread/install
+$(call perlmod/Install,$(1),Thread Thread.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/Thread-Queue/t dist/Thread-Semaphore/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-thread))
+
+
+define Package/perlbase-threads
+$(call Package/perlbase-template)
+TITLE:=threads perl module
+DEPENDS+=+perlbase-essential +perlbase-scalar
+endef
+
+define Package/perlbase-threads/install
+$(call perlmod/Install,$(1),auto/threads threads threads.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/threads-shared/t dist/threads/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-threads))
+
+
+define Package/perlbase-tie
+$(call Package/perlbase-template)
+TITLE:=Tie perl module
+DEPENDS+=+perlbase-essential +perlbase-fcntl +perlbase-posix
+endef
+
+define Package/perlbase-tie/install
+$(call perlmod/Install,$(1),Tie auto/Tie,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Tie-RefHash/t dist/Tie-File/t ext/Tie-Hash-NamedCapture/t ext/Tie-Memoize/lib/Tie/Memoize.pm ext/Tie-Memoize/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-tie))
+
+
+define Package/perlbase-time
+$(call Package/perlbase-template)
+TITLE:=Time perl module
+DEPENDS+=+perlbase-class +perlbase-config +perlbase-essential
+endef
+
+define Package/perlbase-time/install
+$(call perlmod/Install,$(1),Time auto/Time,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Time-HiRes/t cpan/Time-Local/t cpan/Time-Piece/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-time))
+
+
+define Package/perlbase-unicode
+$(call Package/perlbase-template)
+TITLE:=Unicode perl module
+DEPENDS+=+perlbase-base +perlbase-charnames +perlbase-essential +perlbase-file
+endef
+
+define Package/perlbase-unicode/install
+$(call perlmod/Install,$(1),Unicode auto/Unicode,)
+$(call perlmod/InstallBaseTests,$(1),cpan/Unicode-Collate/t cpan/Unicode-Normalize/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-unicode))
+
+
+define Package/perlbase-unicore
+$(call Package/perlbase-template)
+TITLE:=unicore perl module
+endef
+
+define Package/perlbase-unicore/install
+$(call perlmod/Install,$(1),unicore,)
+endef
+
+$(eval $(call BuildPackage,perlbase-unicore))
+
+
+define Package/perlbase-universal
+$(call Package/perlbase-template)
+TITLE:=UNIVERSAL perl module
+endef
+
+define Package/perlbase-universal/install
+$(call perlmod/Install,$(1),UNIVERSAL.pm,)
+endef
+
+$(eval $(call BuildPackage,perlbase-universal))
+
+
+define Package/perlbase-user
+$(call Package/perlbase-template)
+TITLE:=User perl module
+DEPENDS+=+perlbase-class +perlbase-config +perlbase-essential
+endef
+
+define Package/perlbase-user/install
+$(call perlmod/Install,$(1),User,)
+endef
+
+$(eval $(call BuildPackage,perlbase-user))
+
+
+define Package/perlbase-utf8
+$(call Package/perlbase-template)
+TITLE:=utf8 perl module
+DEPENDS+=+perlbase-essential +perlbase-re
+endef
+
+define Package/perlbase-utf8/install
+$(call perlmod/Install,$(1),utf8.pm utf8_heavy.pl,)
+endef
+
+$(eval $(call BuildPackage,perlbase-utf8))
+
+
+define Package/perlbase-version
+$(call Package/perlbase-template)
+TITLE:=version perl module
+DEPENDS+=+perlbase-config +perlbase-essential
+endef
+
+define Package/perlbase-version/install
+$(call perlmod/Install,$(1),version version.pm,)
+$(call perlmod/InstallBaseTests,$(1),cpan/version/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-version))
+
+
+define Package/perlbase-xsloader
+$(call Package/perlbase-template)
+TITLE:=XSLoader perl module
+endef
+
+define Package/perlbase-xsloader/install
+$(call perlmod/Install,$(1),XSLoader.pm,)
+$(call perlmod/InstallBaseTests,$(1),dist/XSLoader/t ext/XS-APItest/t ext/XS-Typemap/t)
+endef
+
+$(eval $(call BuildPackage,perlbase-xsloader))
+
+
+# Generated Mon Oct 13 10:06:15 2014
diff --git a/trunk/package/lang/perl/perlmod.mk b/trunk/package/lang/perl/perlmod.mk
new file mode 100644
index 00000000..e8706dc6
--- /dev/null
+++ b/trunk/package/lang/perl/perlmod.mk
@@ -0,0 +1,155 @@
+# This makefile simplifies perl module builds.
+#
+
+# Build environment
+HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
+ifneq ($(CONFIG_USE_EGLIBC),)
+	EXTRA_LIBS:=bsd
+	EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
+endif
+PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl5.20.0
+
+# Module install prefix
+PERL_SITELIB:=/usr/lib/perl5/5.20
+PERL_TESTSDIR:=/usr/share/perl/perl-tests
+PERLBASE_TESTSDIR:=/usr/share/perl/perlbase-tests
+PERLMOD_TESTSDIR:=/usr/share/perl/perlmod-tests
+
+define perlmod/host/relink
+	rm -f $(1)/Makefile.aperl
+	$(MAKE) -C $(1) perl
+	$(CP) $(1)/perl $(PERL_CMD)
+	$(CP) $(1)/perl $(STAGING_DIR_HOST)/usr/bin/perl
+endef
+
+define perlmod/host/Configure
+	(cd $(HOST_BUILD_DIR); \
+	PERL_MM_USE_DEFAULT=1 \
+	$(2) \
+	$(PERL_CMD) Makefile.PL \
+		$(1) \
+	);
+endef
+
+define perlmod/host/Compile
+	$(2) \
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		$(1) \
+		install
+endef
+
+define perlmod/host/Install
+	$(2) \
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		$(1) \
+		install
+	$(call perlmod/host/relink,$(HOST_BUILD_DIR))
+endef
+
+define perlmod/Configure
+	(cd $(PKG_BUILD_DIR); \
+	PERL_MM_USE_DEFAULT=1 \
+	$(2) \
+	$(PERL_CMD) Makefile.PL \
+		$(1) \
+		AR=ar \
+		CC=$(GNU_TARGET_NAME)-gcc \
+		CCFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		CCCDLFLAGS=-fPIC \
+		CCDLFLAGS=-Wl,-E \
+		DLEXT=so \
+		DLSRC=dl_dlopen.xs \
+		EXE_EXT=" " \
+		FULL_AR=$(GNU_TARGET_NAME)-ar \
+		LD=$(GNU_TARGET_NAME)-gcc \
+		LDDLFLAGS="-shared $(TARGET_LDFLAGS)"  \
+		LDFLAGS="$(EXTRA_LIBDIRS:%=-L%) $(EXTRA_LIBS:%=-l%) " \
+		LIBC=" " \
+		LIB_EXT=.a \
+		OBJ_EXT=.o \
+		OSNAME=linux \
+		OSVERS=2.4.30 \
+		RANLIB=: \
+		SITELIBEXP=" " \
+		SITEARCHEXP=" " \
+		SO=so  \
+		VENDORARCHEXP=" " \
+		VENDORLIBEXP=" " \
+		SITEPREFIX=/usr \
+		INSTALLPRIVLIB=$(PERL_SITELIB) \
+		INSTALLSITELIB=$(PERL_SITELIB) \
+		INSTALLVENDORLIB=" " \
+		INSTALLARCHLIB=$(PERL_SITELIB) \
+		INSTALLSITEARCH=$(PERL_SITELIB) \
+		INSTALLVENDORARCH=" " \
+		INSTALLBIN=/usr/bin \
+		INSTALLSITEBIN=/usr/bin \
+		INSTALLVENDORBIN=" " \
+		INSTALLSCRIPT=/usr/bin \
+		INSTALLSITESCRIPT=/usr/bin \
+		INSTALLVENDORSCRIPT=" " \
+		INSTALLMAN1DIR=/usr/man/man1 \
+		INSTALLSITEMAN1DIR=/usr/man/man1 \
+		INSTALLVENDORMAN1DIR=" " \
+		INSTALLMAN3DIR=/usr/man/man3 \
+		INSTALLSITEMAN3DIR=/usr/man/man3 \
+		INSTALLVENDORMAN3DIR=" " \
+		LINKTYPE=dynamic \
+		DESTDIR=$(PKG_INSTALL_DIR) \
+	);
+	sed 's!^PERL_INC = .*!PERL_INC = $(STAGING_DIR)/usr/lib/perl5/5.20/CORE/!' -i $(PKG_BUILD_DIR)/Makefile
+endef
+
+define perlmod/Compile
+	PERL5LIB=$(PERL_LIB) \
+	$(2) \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(1) \
+		install
+endef
+
+define perlmod/Install/NoStrip
+	$(INSTALL_DIR) $(strip $(1))$(PERL_SITELIB)
+	(cd $(PKG_INSTALL_DIR)$(PERL_SITELIB) && \
+	rsync --relative -rlHp --itemize-changes \
+		--exclude=\*.pod \
+		--exclude=.packlist \
+		$(addprefix --exclude=/,$(strip $(3))) \
+		--prune-empty-dirs \
+		$(strip $(2)) $(strip $(1))$(PERL_SITELIB))
+
+	chmod -R u+w $(strip $(1))$(PERL_SITELIB)
+endef
+
+
+define perlmod/Install
+	$(call perlmod/Install/NoStrip,$(1),$(2),$(3))
+
+	@echo "---> Stripping modules in: $(strip $(1))$(PERL_SITELIB)"
+	find $(strip $(1))$(PERL_SITELIB) -name \*.pm -or -name \*.pl | \
+	xargs -r sed -i \
+		-e '/^=\(head\|pod\|item\|over\|back\|encoding\|begin\|end\|for\)/,/^=cut/d' \
+		-e '/^=\(head\|pod\|item\|over\|back\|encoding\|begin\|end\|for\)/,$$$$d' \
+		-e '/^#$$$$/d' \
+		-e '/^#[^!"'"'"']/d'
+endef
+
+# You probably don't want to use this directly. Look at perlmod/InstallTests
+define perlmod/_InstallTests
+	$(INSTALL_DIR) $(strip $(1))
+	(cd $(PKG_BUILD_DIR)/$(2) && \
+	rsync --relative -rlHp --itemize-changes \
+		--exclude=.packlist \
+		--prune-empty-dirs \
+		$(strip $(3)) $(strip $(1)))
+
+	chmod -R u+w $(strip $(1))
+endef
+
+define perlmod/InstallBaseTests
+	$(if $(CONFIG_PERL_TESTS),$(call perlmod/_InstallTests,$(1)$(PERL_TESTSDIR),,$(2)))
+endef
+
+define perlmod/InstallTests
+	$(if $(CONFIG_PERL_TESTS),$(call perlmod/_InstallTests,$(1)$(PERL_TESTSDIR),$(2),$(3)))
+endef
diff --git a/trunk/package/lang/php5/Makefile b/trunk/package/lang/php5/Makefile
new file mode 100644
index 00000000..d64aad7d
--- /dev/null
+++ b/trunk/package/lang/php5/Makefile
@@ -0,0 +1,538 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=php
+PKG_VERSION:=5.4.35
+PKG_RELEASE:=1
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=PHPv3.01
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.php.net/distributions/
+PKG_MD5SUM:=489cc8336488fb2e722ffa3c08f9c864
+
+PKG_FIXUP:=libtool no-autoreconf
+PKG_BUILD_PARALLEL:=1
+
+PHP5_MODULES = \
+	calendar ctype curl \
+	fileinfo \
+	dom \
+	exif \
+	ftp \
+	gettext gd gmp \
+	hash \
+	iconv \
+	json \
+	ldap \
+	mbstring mcrypt mysql mysqli \
+	openssl \
+	pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql \
+	session shmop simplexml soap sockets sqlite sqlite3 sysvmsg sysvsem sysvshm \
+	tokenizer \
+	xml xmlreader xmlwriter zip \
+
+PKG_CONFIG_DEPENDS:= \
+	$(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \
+	CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML CONFIG_PHP5_SYSTEMTZDATA
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/php5/Default
+  SUBMENU:=PHP
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=PHP5 Hypertext preprocessor
+  URL:=http://www.php.net/
+  MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+  DEPENDS:=php5
+endef
+
+define Package/php5/Default/description
+  PHP is a widely-used general-purpose scripting language that is especially
+  suited for Web development and can be embedded into HTML.
+endef
+
+define Package/php5/config
+	config PHP5_FILTER
+		bool "PHP5 Filter support"
+		depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
+
+	config PHP5_LIBXML
+		bool "PHP5 LIBXML support"
+		depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
+
+	config PHP5_SYSTEMTZDATA
+		bool "Use system timezone data instead of php's built-in database"
+		depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
+		select PACKAGE_zoneinfo-core
+		default y
+		help
+			Enabling this feature automatically selects the zoneinfo-core package
+			which contains data for UTC timezone. To use other timezones you have
+			to install the corresponding zoneinfo-... package(s).
+endef
+
+define Package/php5
+  $(call Package/php5/Default)
+
+  DEPENDS:=+libpcre +zlib \
+           +PHP5_LIBXML:libxml2
+endef
+
+define Package/php5/description
+  $(call Package/php5/Default/description)
+  This package contains only the PHP config file. You must actually choose
+  your PHP flavour (cli, cgi or fastcgi).
+endef
+
+define Package/php5-cli
+  $(call Package/php5/Default)
+  TITLE+= (CLI)
+endef
+
+define Package/php5-cli/description
+  $(call Package/php5/Default/description)
+  This package contains the CLI version of the PHP5 interpreter.
+endef
+
+define Package/php5-cgi
+  $(call Package/php5/Default)
+  TITLE+= (CGI & FastCGI)
+endef
+
+define Package/php5-cgi/description
+  $(call Package/php5/Default/description)
+  This package contains the CGI version of the PHP5 interpreter.
+endef
+
+define Package/php5-fastcgi
+  $(call Package/php5/Default)
+  DEPENDS+= +php5-cgi
+  TITLE:=FastCGI startup script
+endef
+
+define Package/php5-fastcgi/description
+  As FastCGI support is now a core feature the php5-fastcgi package now depends
+  on the php5-cgi package, containing just the startup script.
+endef
+
+CONFIGURE_ARGS+= \
+	--enable-cli \
+	--enable-cgi \
+	--enable-shared \
+	--disable-static \
+	--disable-rpath \
+	--disable-debug \
+	--without-pear \
+	\
+	--with-config-file-path=/etc \
+	--with-config-file-scan-dir=/etc/php5 \
+	--disable-short-tags \
+	\
+	--with-zlib="$(STAGING_DIR)/usr" \
+	  --with-zlib-dir="$(STAGING_DIR)/usr" \
+	--with-pcre-regex="$(STAGING_DIR)/usr" \
+	--disable-phar
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-calendar),)
+  CONFIGURE_ARGS+= --enable-calendar=shared
+else
+  CONFIGURE_ARGS+= --disable-calendar
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ctype),)
+  CONFIGURE_ARGS+= --enable-ctype=shared
+else
+  CONFIGURE_ARGS+= --disable-ctype
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-curl),)
+  CONFIGURE_ARGS+= --with-curl=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-curl
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-fileinfo),)
+  CONFIGURE_ARGS+= --enable-fileinfo=shared
+else
+  CONFIGURE_ARGS+= --disable-fileinfo
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gettext),)
+  CONFIGURE_ARGS+= --with-gettext=shared,"$(STAGING_DIR)/usr/lib/libintl-full"
+else
+  CONFIGURE_ARGS+= --without-gettext
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dom),)
+  CONFIGURE_ARGS+= --enable-dom=shared
+else
+  CONFIGURE_ARGS+= --disable-dom
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-exif),)
+  CONFIGURE_ARGS+= --enable-exif=shared
+else
+  CONFIGURE_ARGS+= --disable-exif
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ftp),)
+  CONFIGURE_ARGS+= --enable-ftp=shared
+else
+  CONFIGURE_ARGS+= --disable-ftp
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gd),)
+  CONFIGURE_ARGS+= \
+	--with-gd=shared \
+	--without-freetype-dir \
+	--with-jpeg-dir="$(STAGING_DIR)/usr" \
+	--with-png-dir="$(STAGING_DIR)/usr" \
+	--without-xpm-dir \
+	--without-t1lib \
+	--enable-gd-native-ttf \
+	--disable-gd-jis-conv
+else
+  CONFIGURE_ARGS+= --without-gd
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gmp),)
+  CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-gmp
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-hash),)
+  CONFIGURE_ARGS+= --enable-hash=shared
+else
+  CONFIGURE_ARGS+= --disable-hash
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-iconv),)
+  CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)"
+else
+  CONFIGURE_ARGS+= --without-iconv
+endif
+
+ifneq ($(CONFIG_PACKAGE_php5-mod-json),)
+  CONFIGURE_ARGS+= --enable-json=shared
+else
+  CONFIGURE_ARGS+= --disable-json
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ldap),)
+  CONFIGURE_ARGS+= \
+	--with-ldap=shared,"$(STAGING_DIR)/usr" \
+	--with-ldap-sasl="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-ldap
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mbstring),)
+  CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex
+else
+  CONFIGURE_ARGS+= --disable-mbstring
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mcrypt),)
+  CONFIGURE_ARGS+=  --with-mcrypt=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-mcrypt
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysql),)
+  CONFIGURE_ARGS+= --with-mysql=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-mysql
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysqli),)
+  CONFIGURE_ARGS+= --with-mysqli=shared,"$(STAGING_DIR)/usr/bin/mysql_config"
+else
+  CONFIGURE_ARGS+= --without-mysqli
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-openssl),)
+  CONFIGURE_ARGS+= \
+	--with-openssl=shared,"$(STAGING_DIR)/usr" \
+	--with-kerberos=no \
+	--with-openssl-dir="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-openssl
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pcntl),)
+  CONFIGURE_ARGS+= --enable-pcntl=shared
+else
+  CONFIGURE_ARGS+= --disable-pcntl
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo),)
+  CONFIGURE_ARGS+= --enable-pdo=shared
+  ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-mysql),)
+    CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr"
+  else
+    CONFIGURE_ARGS+= --without-pdo-mysql
+  endif
+  ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-pgsql),)
+    CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr"
+  else
+    CONFIGURE_ARGS+= --without-pdo-pgsql
+  endif
+  ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),)
+    CONFIGURE_ARGS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr"
+  else
+    CONFIGURE_ARGS+= --without-pdo-sqlite
+  endif
+else
+  CONFIGURE_ARGS+= --disable-pdo
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pgsql),)
+  CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-pgsql
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-session),)
+  CONFIGURE_ARGS+= --enable-session=shared
+else
+  CONFIGURE_ARGS+= --disable-session
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-shmop),)
+  CONFIGURE_ARGS+= --enable-shmop=shared
+else
+  CONFIGURE_ARGS+= --disable-shmop
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-simplexml),)
+  CONFIGURE_ARGS+= --enable-simplexml=shared
+else
+  CONFIGURE_ARGS+= --disable-simplexml
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-soap),)
+  CONFIGURE_ARGS+= --enable-soap=shared
+else
+  CONFIGURE_ARGS+= --disable-soap
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sockets),)
+  CONFIGURE_ARGS+= --enable-sockets=shared
+else
+  CONFIGURE_ARGS+= --disable-sockets
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite),)
+  CONFIGURE_ARGS+= --with-sqlite=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-sqlite
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite3),)
+  CONFIGURE_ARGS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-sqlite3
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvmsg),)
+  CONFIGURE_ARGS+= --enable-sysvmsg=shared
+else
+  CONFIGURE_ARGS+= --disable-sysvmsg
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvsem),)
+  CONFIGURE_ARGS+= --enable-sysvsem=shared
+else
+  CONFIGURE_ARGS+= --disable-sysvsem
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvshm),)
+  CONFIGURE_ARGS+= --enable-sysvshm=shared
+else
+  CONFIGURE_ARGS+= --disable-sysvshm
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-tokenizer),)
+  CONFIGURE_ARGS+= --enable-tokenizer=shared
+else
+  CONFIGURE_ARGS+= --disable-tokenizer
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xml),)
+  CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr"
+  ifneq ($(CONFIG_PHP5_LIBXML),)
+    CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
+  else
+    CONFIGURE_ARGS+= --with-libexpat-dir="$(STAGING_DIR)/usr"
+  endif
+else
+  CONFIGURE_ARGS+= --disable-xml
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlreader),)
+  CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --disable-xmlreader
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlwriter),)
+  CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --disable-xmlwriter
+endif
+
+ifneq ($(CONFIG_PACKAGE_php5-mod-zip),)
+  CONFIGURE_ARGS+= --enable-zip=shared
+else
+  CONFIGURE_ARGS+= --disable-zip
+endif
+
+ifneq ($(SDK)$(CONFIG_PHP5_FILTER),)
+  CONFIGURE_ARGS+= --enable-filter
+else
+  CONFIGURE_ARGS+= --disable-filter
+endif
+
+ifneq ($(SDK)$(CONFIG_PHP5_LIBXML),)
+  CONFIGURE_ARGS+= --enable-libxml
+  CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
+else
+  CONFIGURE_ARGS+= --disable-libxml
+endif
+
+ifneq ($(CONFIG_PHP5_SYSTEMTZDATA),)
+  CONFIGURE_ARGS+= --with-system-tzdata
+else
+  CONFIGURE_ARGS+= --without-system-tzdata
+endif
+
+CONFIGURE_VARS+= \
+	ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \
+	php_cv_cc_rpath="no" \
+	iconv_impl_name="gnu_libiconv" \
+	ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \
+
+define Package/php5/conffiles
+/etc/php.ini
+endef
+
+define Package/php5/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/php.ini $(1)/etc/
+endef
+
+define Package/php5-cli/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_BUILD_DIR)/sapi/cli/php $(1)/usr/bin/php-cli
+endef
+
+define Package/php5-cgi/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(1)/usr/bin/php-cgi
+	ln -sf php-cgi $(1)/usr/bin/php-fcgi
+endef
+
+define Package/php5-fastcgi/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/php5-fastcgi.config $(1)/etc/config/php5-fastcgi
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/php5-fastcgi.init $(1)/etc/init.d/php5-fastcgi
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	( cd $(PKG_BUILD_DIR); touch configure.in; ./buildconf --force )
+endef
+
+define Build/InstallDev
+	mkdir -p $(PKG_BUILD_DIR)/staging/usr/bin
+	make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging
+	rm -f $(PKG_BUILD_DIR)/staging/usr/bin/php
+	$(CP) $(PKG_BUILD_DIR)/staging/* $(STAGING_DIR_HOST)
+	sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize
+	sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize
+	sed -i -e "s#prefix=\"/usr\"#prefix=\"$(STAGING_DIR_HOST)/usr\"#" $(STAGING_DIR_HOST)/usr/bin/php-config
+endef
+
+define BuildModule
+
+  define Package/php5-mod-$(1)
+    $(call Package/php5/Default)
+
+    ifneq ($(3),)
+      DEPENDS+=$(3)
+    endif
+
+    TITLE:=$(2) shared module
+  endef
+
+  define Package/php5-mod-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/php
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
+	$(INSTALL_DIR) $$(1)/etc/php5
+	echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
+  endef
+
+  $$(eval $$(call BuildPackage,php5-mod-$(1)))
+
+endef
+
+$(eval $(call BuildPackage,php5))
+$(eval $(call BuildPackage,php5-cli))
+$(eval $(call BuildPackage,php5-cgi))
+$(eval $(call BuildPackage,php5-fastcgi))
+
+#$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS]))
+$(eval $(call BuildModule,calendar,Calendar))
+$(eval $(call BuildModule,ctype,Ctype))
+$(eval $(call BuildModule,curl,cURL,+PACKAGE_php5-mod-curl:libcurl))
+$(eval $(call BuildModule,fileinfo,Fileinfo,+PACKAGE_php5-mod-fileinfo:libmagic))
+$(eval $(call BuildModule,dom,DOM,+@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2))
+$(eval $(call BuildModule,exif,EXIF))
+$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php5-mod-ftp:libopenssl))
+$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full))
+$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libjpeg +PACKAGE_php5-mod-gd:libpng))
+$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp))
+$(eval $(call BuildModule,hash,Hash))
+$(eval $(call BuildModule,iconv,iConv,+PACKAGE_php5-mod-iconv:libiconv))
+$(eval $(call BuildModule,json,JSON))
+$(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php5-mod-ldap:libopenldap +PACKAGE_php5-mod-ldap:libsasl2))
+$(eval $(call BuildModule,mbstring,MBString))
+$(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php5-mod-mcrypt:libmcrypt +PACKAGE_php5-mod-mcrypt:libltdl))
+$(eval $(call BuildModule,mysql,MySQL,+PACKAGE_php5-mod-mysql:libmysqlclient))
+$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php5-mod-mysqli:libmysqlclient))
+$(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php5-mod-openssl:libopenssl))
+$(eval $(call BuildModule,pcntl,PCNTL))
+$(eval $(call BuildModule,pdo,PHP Data Objects))
+$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-mysql:libmysqlclient))
+$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-pgsql:libpq))
+$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php5-mod-pdo +PACKAGE_php5-mod-pdo-sqlite:libsqlite3 +PACKAGE_php5-mod-pdo-sqlite:libpthread +PACKAGE_php5-mod-pdo-sqlite:librt))
+$(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php5-mod-pgsql:libpq))
+$(eval $(call BuildModule,session,Session))
+$(eval $(call BuildModule,shmop,Shared Memory))
+$(eval $(call BuildModule,simplexml,SimpleXML,+@PHP5_LIBXML +PACKAGE_php5-mod-simplexml:libxml2))
+$(eval $(call BuildModule,soap,SOAP,+@PHP5_LIBXML +PACKAGE_php5-mod-soap:libxml2))
+$(eval $(call BuildModule,sockets,Sockets))
+$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php5-mod-sqlite3:libsqlite3 +PACKAGE_php5-mod-sqlite3:libpthread))
+$(eval $(call BuildModule,sysvmsg,System V messages))
+$(eval $(call BuildModule,sysvsem,System V shared memory))
+$(eval $(call BuildModule,sysvshm,System V semaphore))
+$(eval $(call BuildModule,tokenizer,Tokenizer))
+$(eval $(call BuildModule,xml,XML,+PHP5_LIBXML:libxml2 +!PHP5_LIBXML:libexpat))
+$(eval $(call BuildModule,xmlreader,XMLReader,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlreader:libxml2 +PACKAGE_php5-mod-xmlreader:libiconv))
+$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlwriter:libxml2 +PACKAGE_php5-mod-xmlwriter:libiconv))
+$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php5-mod-zip:zlib))
diff --git a/trunk/package/lang/php5/files/php.ini b/trunk/package/lang/php5/files/php.ini
new file mode 100644
index 00000000..6fe2a310
--- /dev/null
+++ b/trunk/package/lang/php5/files/php.ini
@@ -0,0 +1,311 @@
+[PHP]
+
+zend.ze1_compatibility_mode = Off
+
+; Language Options
+
+engine = On
+;short_open_tag = Off
+precision    =  12
+y2k_compliance = On
+output_buffering = Off
+;output_handler =
+zlib.output_compression = Off
+;zlib.output_compression_level = -1
+;zlib.output_handler =
+implicit_flush = Off
+unserialize_callback_func =
+serialize_precision = 100
+
+;open_basedir =
+disable_functions =
+disable_classes =
+
+; Colors for Syntax Highlighting mode.  Anything that's acceptable in
+; <span style="color: ???????"> would work.
+;highlight.string  = #DD0000
+;highlight.comment = #FF9900
+;highlight.keyword = #007700
+;highlight.bg      = #FFFFFF
+;highlight.default = #0000BB
+;highlight.html    = #000000
+
+;ignore_user_abort = On
+;realpath_cache_size = 16k
+;realpath_cache_ttl = 120
+
+; Miscellaneous
+
+expose_php = On
+
+; Resource Limits
+
+max_execution_time = 30	; Maximum execution time of each script, in seconds.
+max_input_time = 60	; Maximum amount of time each script may spend parsing request data.
+;max_input_nesting_level = 64
+memory_limit = 8M	; Maximum amount of memory a script may consume.
+
+; Error handling and logging
+
+; Error Level Constants:
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 6.0.0)
+; E_ERROR           - fatal run-time errors
+; E_RECOVERABLE_ERROR  - almost fatal run-time errors
+; E_WARNING         - run-time warnings (non-fatal errors)
+; E_PARSE           - compile-time parse errors
+; E_NOTICE          - run-time notices (these are warnings which often result
+;                     from a bug in your code, but it's possible that it was
+;                     intentional (e.g., using an uninitialized variable and
+;                     relying on the fact it's automatically initialized to an
+;                     empty string)
+; E_STRICT			- run-time notices, enable to have PHP suggest changes
+;                     to your code which will ensure the best interoperability
+;                     and forward compatibility of your code
+; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
+; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
+;                     initial startup
+; E_COMPILE_ERROR   - fatal compile-time errors
+; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
+; E_USER_ERROR      - user-generated error message
+; E_USER_WARNING    - user-generated warning message
+; E_USER_NOTICE     - user-generated notice message
+; E_DEPRECATED      - warn about code that will not work in future versions
+;                     of PHP
+; E_USER_DEPRECATED - user-generated deprecation warnings
+;
+; Common Values:
+;   E_ALL & ~E_NOTICE  (Show all errors, except for notices and coding standards warnings.)
+;   E_ALL & ~E_NOTICE | E_STRICT  (Show all errors, except for notices)
+;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
+;   E_ALL | E_STRICT  (Show all errors, warnings and notices including coding standards.)
+; Default Value: E_ALL & ~E_NOTICE
+error_reporting  =  E_ALL & ~E_NOTICE & ~E_STRICT
+
+display_errors = On
+display_startup_errors = Off
+log_errors = Off
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off
+report_memleaks = On
+;report_zend_debug = 0
+track_errors = Off
+;html_errors = Off
+;docref_root = "/phpmanual/"
+;docref_ext = .html
+;error_prepend_string = "<font color=#ff0000>"
+;error_append_string = "</font>"
+; Log errors to specified file.
+;error_log = /var/log/php_errors.log
+; Log errors to syslog.
+;error_log = syslog
+
+; Data Handling
+
+;arg_separator.output = "&amp;"
+;arg_separator.input = ";&"
+variables_order = "EGPCS"
+request_order = "GP"
+register_globals = Off
+register_long_arrays = Off
+register_argc_argv = On
+auto_globals_jit = On
+post_max_size = 8M
+;magic_quotes_gpc = Off
+magic_quotes_runtime = Off
+magic_quotes_sybase = Off
+auto_prepend_file =
+auto_append_file =
+default_mimetype = "text/html"
+;default_charset = "iso-8859-1"
+;always_populate_raw_post_data = On
+
+; Paths and Directories
+
+; UNIX: "/path1:/path2"
+;include_path = ".:/php/includes"
+doc_root = "/www"
+user_dir =
+extension_dir = "/usr/lib/php"
+enable_dl = On
+;cgi.force_redirect = 1
+;cgi.nph = 1
+;cgi.redirect_status_env = ;
+cgi.fix_pathinfo=1
+;fastcgi.impersonate = 1;
+;fastcgi.logging = 0
+;cgi.rfc2616_headers = 0
+
+; File Uploads
+
+file_uploads = On
+upload_tmp_dir = "/tmp"
+upload_max_filesize = 2M
+max_file_uploads = 20
+
+; Fopen wrappers
+
+allow_url_fopen = On
+allow_url_include = Off
+;from="john@doe.com"
+;user_agent="PHP"
+default_socket_timeout = 60
+;auto_detect_line_endings = Off
+
+; Dynamic Extensions
+
+;extension=ctype.so
+;extension=curl.so
+;extension=dom.so
+;extension=exif.so
+;extension=ftp.so
+;extension=gd.so
+;extension=gmp.so
+;extension=hash.so
+;extension=iconv.so
+;extension=json.so
+;extension=ldap.so
+;extension=mbstring.so
+;extension=mcrypt.so
+;extension=mysql.so
+;extension=openssl.so
+;extension=pcre.so
+;extension=pdo.so
+;extension=pdo-mysql.so
+;extension=pdo-pgsql.so
+;extension=pdo_sqlite.so
+;extension=pgsql.so
+;extension=session.so
+;extension=soap.so
+;extension=sockets.so
+;extension=sqlite.so
+;extension=sqlite3.so
+;extension=tokenizer.so
+;extension=xml.so
+;extension=xmlreader.so
+;extension=xmlwriter.so
+
+; Module Settings
+
+[APC]
+apc.enabled = 1
+apc.shm_segments = 1	;The number of shared memory segments to allocate for the compiler cache.
+apc.shm_size = 4M	;The size of each shared memory segment.
+
+[Date]
+;date.timezone =
+;date.default_latitude = 31.7667
+;date.default_longitude = 35.2333
+;date.sunrise_zenith = 90.583333
+;date.sunset_zenith = 90.583333
+
+[filter]
+;filter.default = unsafe_raw
+;filter.default_flags =
+
+[iconv]
+;iconv.input_encoding = ISO-8859-1
+;iconv.internal_encoding = ISO-8859-1
+;iconv.output_encoding = ISO-8859-1
+
+[sqlite]
+;sqlite.assoc_case = 0
+
+[sqlite3]
+;sqlite3.extension_dir =
+
+[Pdo_mysql]
+pdo_mysql.cache_size = 2000
+pdo_mysql.default_socket=
+
+[MySQL]
+mysql.allow_local_infile = On
+mysql.allow_persistent = On
+mysql.cache_size = 2000
+mysql.max_persistent = -1
+mysql.max_links = -1
+mysql.default_port =
+mysql.default_socket =
+mysql.default_host =
+mysql.default_user =
+mysql.default_password =
+mysql.connect_timeout = 60
+mysql.trace_mode = Off
+
+[PostgresSQL]
+pgsql.allow_persistent = On
+pgsql.auto_reset_persistent = Off
+pgsql.max_persistent = -1
+pgsql.max_links = -1
+pgsql.ignore_notice = 0
+pgsql.log_notice = 0
+
+[Session]
+session.save_handler = files
+session.save_path = "/tmp"
+session.use_cookies = 1
+;session.cookie_secure =
+session.use_only_cookies = 1
+session.name = PHPSESSID
+session.auto_start = 0
+session.cookie_lifetime = 0
+session.cookie_path = /
+session.cookie_domain =
+session.cookie_httponly =
+session.serialize_handler = php
+session.gc_probability = 1
+session.gc_divisor     = 100
+session.gc_maxlifetime = 1440
+session.bug_compat_42 = On
+session.bug_compat_warn = On
+session.referer_check =
+session.entropy_length = 0
+;session.entropy_file = /dev/urandom
+session.entropy_file =
+;session.entropy_length = 16
+session.cache_limiter = nocache
+session.cache_expire = 180
+session.use_trans_sid = 0
+session.hash_function = 0
+session.hash_bits_per_character = 4
+url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset="
+
+[mbstring]
+;mbstring.language = Japanese
+;mbstring.internal_encoding = EUC-JP
+;mbstring.http_input = auto
+;mbstring.http_output = SJIS
+;mbstring.encoding_translation = Off
+;mbstring.detect_order = auto
+;mbstring.substitute_character = none;
+;mbstring.func_overload = 0
+;mbstring.strict_detection = Off
+;mbstring.http_output_conv_mimetype=
+;mbstring.script_encoding=
+
+[gd]
+;gd.jpeg_ignore_warning = 0
+
+[exif]
+;exif.encode_unicode = ISO-8859-15
+;exif.decode_unicode_motorola = UCS-2BE
+;exif.decode_unicode_intel    = UCS-2LE
+;exif.encode_jis =
+;exif.decode_jis_motorola = JIS
+;exif.decode_jis_intel    = JIS
+
+[soap]
+soap.wsdl_cache_enabled=1
+soap.wsdl_cache_dir="/tmp"
+soap.wsdl_cache_ttl=86400
+soap.wsdl_cache_limit = 5
+
+[sysvshm]
+;sysvshm.init_mem = 10000
+
+[ldap]
+ldap.max_links = -1
+
+[mcrypt]
+;mcrypt.algorithms_dir=
+;mcrypt.modes_dir=
diff --git a/trunk/package/lang/php5/files/php5-fastcgi.config b/trunk/package/lang/php5/files/php5-fastcgi.config
new file mode 100644
index 00000000..039d3bbc
--- /dev/null
+++ b/trunk/package/lang/php5/files/php5-fastcgi.config
@@ -0,0 +1,3 @@
+config php5-fastcgi
+	option enabled 1
+	option port '1026'
diff --git a/trunk/package/lang/php5/files/php5-fastcgi.init b/trunk/package/lang/php5/files/php5-fastcgi.init
new file mode 100644
index 00000000..0c452ad2
--- /dev/null
+++ b/trunk/package/lang/php5/files/php5-fastcgi.init
@@ -0,0 +1,30 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2010-2011 OpenWrt.org
+
+START=50
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+start_instance() {
+	local section="$1"
+	local enabled
+	local port
+
+	config_get_bool enabled "$section" 'enabled' 0
+	config_get port "$section" 'port' 1026
+
+	[ $enabled -gt 0 ] || return 1
+
+	PHP_FCGI_CHILDREN='' \
+	service_start /usr/bin/php-fcgi -b $port
+}
+
+start() {
+	config_load 'php5-fastcgi'
+	config_foreach start_instance 'php5-fastcgi'
+}
+
+stop() {
+	service_stop /usr/bin/php-fcgi
+}
diff --git a/trunk/package/lang/php5/patches/090-restore-sqlite2.patch b/trunk/package/lang/php5/patches/090-restore-sqlite2.patch
new file mode 100644
index 00000000..27bcec5c
--- /dev/null
+++ b/trunk/package/lang/php5/patches/090-restore-sqlite2.patch
@@ -0,0 +1,50845 @@
+--- /dev/null
++++ b/ext/sqlite/config.m4
+@@ -0,0 +1,157 @@
++dnl $Id$
++dnl config.m4 for extension sqlite
++dnl vim:et:ts=2:sw=2
++
++PHP_ARG_WITH(sqlite, for sqlite support,
++[  --without-sqlite=DIR    Do not include sqlite support.  DIR is the sqlite base
++                          install directory [BUNDLED]], yes)
++
++PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: ISO-8859-1),
++[  --enable-sqlite-utf8      SQLite: Enable UTF-8 support for SQLite], no, no)
++
++
++
++dnl
++dnl PHP_PROG_LEMON
++dnl
++dnl Search for lemon binary and check its version
++dnl
++AC_DEFUN([PHP_PROG_LEMON],[
++  # we only support certain lemon versions
++  lemon_version_list="1.0"
++
++  AC_CHECK_PROG(LEMON, lemon, lemon)
++  if test "$LEMON"; then
++    AC_CACHE_CHECK([for lemon version], php_cv_lemon_version, [
++      lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'`
++      php_cv_lemon_version=invalid
++      for lemon_check_version in $lemon_version_list; do
++        if test "$lemon_version" = "$lemon_check_version"; then
++          php_cv_lemon_version="$lemon_check_version (ok)"
++        fi
++      done
++    ])
++  else
++    lemon_version=none
++  fi
++  case $php_cv_lemon_version in
++    ""|invalid[)]
++      lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)."
++      AC_MSG_WARN([$lemon_msg])
++      LEMON="exit 0;"
++      ;;
++  esac
++  PHP_SUBST(LEMON)
++])
++
++
++if test "$PHP_SQLITE" != "no"; then
++  if test "$PHP_PDO" != "no"; then
++    PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])])
++    if test -n "$pdo_inc_path"; then
++      AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
++      pdo_inc_path="-I$pdo_inc_path"
++    fi
++  fi  
++
++  if test "$PHP_SQLITE" != "yes"; then
++    SEARCH_PATH="/usr/local /usr"
++    SEARCH_FOR="/include/sqlite.h"
++    if test -r $PHP_SQLITE/; then # path given as parameter
++      SQLITE_DIR=$PHP_SQLITE
++    else # search default path list
++      AC_MSG_CHECKING([for sqlite files in default path])
++      for i in $SEARCH_PATH ; do
++        if test -r $i/$SEARCH_FOR; then
++          SQLITE_DIR=$i
++          AC_MSG_RESULT(found in $i)
++        fi
++      done
++    fi
++  
++    if test -z "$SQLITE_DIR"; then
++      AC_MSG_RESULT([not found])
++      AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org])
++    fi
++
++    PHP_CHECK_LIBRARY(sqlite, sqlite_open, [
++      PHP_ADD_LIBRARY_WITH_PATH(sqlite, $SQLITE_DIR/$PHP_LIBDIR, SQLITE_SHARED_LIBADD)
++      PHP_ADD_INCLUDE($SQLITE_DIR/include)
++    ],[
++      AC_MSG_ERROR([wrong sqlite lib version or lib not found])
++    ],[
++      -L$SQLITE_DIR/$PHP_LIBDIR -lm
++    ])
++    SQLITE_MODULE_TYPE=external
++    PHP_SQLITE_CFLAGS=$pdo_inc_path
++    sqlite_extra_sources="libsqlite/src/encode.c"
++  else
++    # use bundled library
++    PHP_PROG_LEMON
++    SQLITE_MODULE_TYPE=builtin
++    PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
++    sqlite_extra_sources="libsqlite/src/opcodes.c \
++        libsqlite/src/parse.c libsqlite/src/encode.c \
++        libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
++        libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
++        libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
++        libsqlite/src/os.c libsqlite/src/pager.c \
++        libsqlite/src/printf.c libsqlite/src/random.c \
++        libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
++        libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
++        libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
++        libsqlite/src/vacuum.c libsqlite/src/copy.c \
++        libsqlite/src/vdbeaux.c libsqlite/src/date.c \
++        libsqlite/src/where.c libsqlite/src/trigger.c"
++  fi
++  dnl
++  dnl Common for both bundled/external
++  dnl
++  sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" 
++  PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
++  PHP_ADD_EXTENSION_DEP(sqlite, spl, true)
++  PHP_ADD_EXTENSION_DEP(sqlite, pdo, true)
++
++  PHP_ADD_MAKEFILE_FRAGMENT
++  PHP_SUBST(SQLITE_SHARED_LIBADD)
++  PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h])
++  
++  if test "$SQLITE_MODULE_TYPE" = "builtin"; then
++    PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src, 1)
++    AC_CHECK_SIZEOF(char *, 4)
++    AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
++    dnl use latin 1 for SQLite older than 2.8.9; the utf-8 handling 
++    dnl in funcs.c uses assert(), which is a bit silly and something 
++    dnl we want to avoid. This assert() was removed in SQLite 2.8.9.
++    if test "$PHP_SQLITE_UTF8" = "yes"; then
++      SQLITE_ENCODING="UTF8"
++      AC_DEFINE(SQLITE_UTF8, 1, [ ])
++    else
++      SQLITE_ENCODING="ISO8859"
++    fi
++    PHP_SUBST(SQLITE_ENCODING)
++
++    SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
++    PHP_SUBST(SQLITE_VERSION)
++
++    sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h
++
++    if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
++      echo '#include <php_config.h>' > $ext_builddir/libsqlite/src/config.h
++    else
++      echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h
++    fi
++    
++    cat >> $ext_builddir/libsqlite/src/config.h <<EOF
++#if ZTS
++# define THREADSAFE 1
++#endif
++#if !ZEND_DEBUG
++# define NDEBUG
++#endif
++EOF
++  fi
++  
++  AC_CHECK_FUNCS(usleep nanosleep)
++  AC_CHECK_HEADERS(time.h)
++fi
+--- /dev/null
++++ b/ext/sqlite/config.w32
+@@ -0,0 +1,39 @@
++// $Id$
++// vim:ft=javascript
++
++ARG_WITH("sqlite", "SQLite support", "no");
++
++if (PHP_SQLITE != "no") {
++	copy_and_subst(configure_module_dirname + "\\libsqlite\\src\\sqlite.h.in",
++		configure_module_dirname + "\\libsqlite\\src\\sqlite.h", new Array(
++			"--VERS--", file_get_contents(configure_module_dirname + "\\libsqlite\\VERSION").replace(new RegExp("[\r\n]+", "g"), ""),
++			"--ENCODING--", "ISO8859"
++		));
++	
++	FSO.CopyFile(configure_module_dirname + "\\libsqlite\\src\\sqlite_config.w32.h",
++	   	configure_module_dirname + "\\libsqlite\\src\\config.h");
++
++	if (FSO.FileExists(configure_module_dirname + "\\..\\pdo\\php_pdo_driver.h")) {
++		PHP_SQLITE2_PDO_CFLAGS = " /DPHP_SQLITE2_HAVE_PDO=1 /I " + configure_module_dirname + "\\..";
++		ADD_EXTENSION_DEP('sqlite', 'pdo')
++	} else {
++		PHP_SQLITE2_PDO_CFLAGS = "";
++	}
++	
++	EXTENSION("sqlite", "sqlite.c sess_sqlite.c pdo_sqlite2.c", null,
++		"/D PHP_SQLITE_EXPORTS /I " + configure_module_dirname + "/libsqlite/src" +
++		PHP_SQLITE2_PDO_CFLAGS);
++		
++	
++	ADD_SOURCES(configure_module_dirname + "/libsqlite/src", "opcodes.c parse.c encode.c \
++		auth.c btree.c build.c delete.c expr.c func.c hash.c insert.c \
++		main.c os.c pager.c printf.c random.c select.c table.c tokenize.c \
++		update.c util.c vdbe.c attach.c btree_rb.c pragma.c vacuum.c \
++		copy.c where.c trigger.c vdbeaux.c date.c", "sqlite");
++
++	AC_DEFINE("HAVE_SQLITE", 1, "SQLite support");
++	if (!PHP_SQLITE_SHARED) {
++		ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite.def");
++	}
++	ADD_EXTENSION_DEP('sqlite', 'spl')
++}
+--- /dev/null
++++ b/ext/sqlite/CREDITS
+@@ -0,0 +1,2 @@
++SQLite
++Wez Furlong, Tal Peer, Marcus Boerger, Ilia Alshanetsky
+--- /dev/null
++++ b/ext/sqlite/libsqlite/README
+@@ -0,0 +1,37 @@
++This directory contains source code to 
++
++    SQLite: An Embeddable SQL Database Engine
++
++To compile the project, first create a directory in which to place
++the build products.  It is recommended, but not required, that the
++build directory be separate from the source directory.  Cd into the
++build directory and then from the build directory run the configure
++script found at the root of the source tree.  Then run "make".
++
++For example:
++
++    tar xzf sqlite.tar.gz    ;#  Unpack the source tree into "sqlite"
++    mkdir bld                ;#  Build will occur in a sibling directory
++    cd bld                   ;#  Change to the build directory
++    ../sqlite/configure      ;#  Run the configure script
++    make                     ;#  Run the makefile.
++
++The configure script uses autoconf 2.50 and libtool.  If the configure
++script does not work out for you, there is a generic makefile named
++"Makefile.linux-gcc" in the top directory of the source tree that you
++can copy and edit to suite your needs.  Comments on the generic makefile
++show what changes are needed.
++
++The linux binaries on the website are created using the generic makefile,
++not the configure script.  The configure script is unmaintained.  (You
++can volunteer to take over maintenance of the configure script, if you want!)
++The windows binaries on the website are created using MinGW32 configured
++as a cross-compiler running under Linux.  For details, see the ./publish.sh
++script at the top-level of the source tree.
++
++Contacts:
++
++   http://www.sqlite.org/
++   http://www.hwaci.com/sw/sqlite/
++   http://groups.yahoo.com/group/sqlite/
++   drh@hwaci.com
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/attach.c
+@@ -0,0 +1,311 @@
++/*
++** 2003 April 6
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code used to implement the ATTACH and DETACH commands.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++/*
++** This routine is called by the parser to process an ATTACH statement:
++**
++**     ATTACH DATABASE filename AS dbname
++**
++** The pFilename and pDbname arguments are the tokens that define the
++** filename and dbname in the ATTACH statement.
++*/
++void sqliteAttach(Parse *pParse, Token *pFilename, Token *pDbname, Token *pKey){
++  Db *aNew;
++  int rc, i;
++  char *zFile, *zName;
++  sqlite *db;
++  Vdbe *v;
++
++  v = sqliteGetVdbe(pParse);
++  sqliteVdbeAddOp(v, OP_Halt, 0, 0);
++  if( pParse->explain ) return;
++  db = pParse->db;
++  if( db->file_format<4 ){
++    sqliteErrorMsg(pParse, "cannot attach auxiliary databases to an "
++       "older format master database", 0);
++    pParse->rc = SQLITE_ERROR;
++    return;
++  }
++  if( db->nDb>=MAX_ATTACHED+2 ){
++    sqliteErrorMsg(pParse, "too many attached databases - max %d", 
++       MAX_ATTACHED);
++    pParse->rc = SQLITE_ERROR;
++    return;
++  }
++
++  zFile = 0;
++  sqliteSetNString(&zFile, pFilename->z, pFilename->n, 0);
++  if( zFile==0 ) return;
++  sqliteDequote(zFile);
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  if( sqliteAuthCheck(pParse, SQLITE_ATTACH, zFile, 0, 0)!=SQLITE_OK ){
++    sqliteFree(zFile);
++    return;
++  }
++#endif /* SQLITE_OMIT_AUTHORIZATION */
++
++  zName = 0;
++  sqliteSetNString(&zName, pDbname->z, pDbname->n, 0);
++  if( zName==0 ) return;
++  sqliteDequote(zName);
++  for(i=0; i<db->nDb; i++){
++    if( db->aDb[i].zName && sqliteStrICmp(db->aDb[i].zName, zName)==0 ){
++      sqliteErrorMsg(pParse, "database %z is already in use", zName);
++      pParse->rc = SQLITE_ERROR;
++      sqliteFree(zFile);
++      return;
++    }
++  }
++
++  if( db->aDb==db->aDbStatic ){
++    aNew = sqliteMalloc( sizeof(db->aDb[0])*3 );
++    if( aNew==0 ) return;
++    memcpy(aNew, db->aDb, sizeof(db->aDb[0])*2);
++  }else{
++    aNew = sqliteRealloc(db->aDb, sizeof(db->aDb[0])*(db->nDb+1) );
++    if( aNew==0 ) return;
++  }
++  db->aDb = aNew;
++  aNew = &db->aDb[db->nDb++];
++  memset(aNew, 0, sizeof(*aNew));
++  sqliteHashInit(&aNew->tblHash, SQLITE_HASH_STRING, 0);
++  sqliteHashInit(&aNew->idxHash, SQLITE_HASH_STRING, 0);
++  sqliteHashInit(&aNew->trigHash, SQLITE_HASH_STRING, 0);
++  sqliteHashInit(&aNew->aFKey, SQLITE_HASH_STRING, 1);
++  aNew->zName = zName;
++  rc = sqliteBtreeFactory(db, zFile, 0, MAX_PAGES, &aNew->pBt);
++  if( rc ){
++    sqliteErrorMsg(pParse, "unable to open database: %s", zFile);
++  }
++#if SQLITE_HAS_CODEC
++  {
++    extern int sqliteCodecAttach(sqlite*, int, void*, int);
++    char *zKey = 0;
++    int nKey;
++    if( pKey && pKey->z && pKey->n ){
++      sqliteSetNString(&zKey, pKey->z, pKey->n, 0);
++      sqliteDequote(zKey);
++      nKey = strlen(zKey);
++    }else{
++      zKey = 0;
++      nKey = 0;
++    }
++    sqliteCodecAttach(db, db->nDb-1, zKey, nKey);
++  }
++#endif
++  sqliteFree(zFile);
++  db->flags &= ~SQLITE_Initialized;
++  if( pParse->nErr ) return;
++  if( rc==SQLITE_OK ){
++    rc = sqliteInit(pParse->db, &pParse->zErrMsg);
++  }
++  if( rc ){
++    int i = db->nDb - 1;
++    assert( i>=2 );
++    if( db->aDb[i].pBt ){
++      sqliteBtreeClose(db->aDb[i].pBt);
++      db->aDb[i].pBt = 0;
++    }
++    sqliteResetInternalSchema(db, 0);
++    pParse->nErr++;
++    pParse->rc = SQLITE_ERROR;
++  }
++}
++
++/*
++** This routine is called by the parser to process a DETACH statement:
++**
++**    DETACH DATABASE dbname
++**
++** The pDbname argument is the name of the database in the DETACH statement.
++*/
++void sqliteDetach(Parse *pParse, Token *pDbname){
++  int i;
++  sqlite *db;
++  Vdbe *v;
++  Db *pDb;
++
++  v = sqliteGetVdbe(pParse);
++  sqliteVdbeAddOp(v, OP_Halt, 0, 0);
++  if( pParse->explain ) return;
++  db = pParse->db;
++  for(i=0; i<db->nDb; i++){
++    pDb = &db->aDb[i];
++    if( pDb->pBt==0 || pDb->zName==0 ) continue;
++    if( strlen(pDb->zName)!=pDbname->n ) continue;
++    if( sqliteStrNICmp(pDb->zName, pDbname->z, pDbname->n)==0 ) break;
++  }
++  if( i>=db->nDb ){
++    sqliteErrorMsg(pParse, "no such database: %T", pDbname);
++    return;
++  }
++  if( i<2 ){
++    sqliteErrorMsg(pParse, "cannot detach database %T", pDbname);
++    return;
++  }
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  if( sqliteAuthCheck(pParse,SQLITE_DETACH,db->aDb[i].zName,0,0)!=SQLITE_OK ){
++    return;
++  }
++#endif /* SQLITE_OMIT_AUTHORIZATION */
++  sqliteBtreeClose(pDb->pBt);
++  pDb->pBt = 0;
++  sqliteFree(pDb->zName);
++  sqliteResetInternalSchema(db, i);
++  if( pDb->pAux && pDb->xFreeAux ) pDb->xFreeAux(pDb->pAux);
++  db->nDb--;
++  if( i<db->nDb ){
++    db->aDb[i] = db->aDb[db->nDb];
++    memset(&db->aDb[db->nDb], 0, sizeof(db->aDb[0]));
++    sqliteResetInternalSchema(db, i);
++  }
++}
++
++/*
++** Initialize a DbFixer structure.  This routine must be called prior
++** to passing the structure to one of the sqliteFixAAAA() routines below.
++**
++** The return value indicates whether or not fixation is required.  TRUE
++** means we do need to fix the database references, FALSE means we do not.
++*/
++int sqliteFixInit(
++  DbFixer *pFix,      /* The fixer to be initialized */
++  Parse *pParse,      /* Error messages will be written here */
++  int iDb,            /* This is the database that must must be used */
++  const char *zType,  /* "view", "trigger", or "index" */
++  const Token *pName  /* Name of the view, trigger, or index */
++){
++  sqlite *db;
++
++  if( iDb<0 || iDb==1 ) return 0;
++  db = pParse->db;
++  assert( db->nDb>iDb );
++  pFix->pParse = pParse;
++  pFix->zDb = db->aDb[iDb].zName;
++  pFix->zType = zType;
++  pFix->pName = pName;
++  return 1;
++}
++
++/*
++** The following set of routines walk through the parse tree and assign
++** a specific database to all table references where the database name
++** was left unspecified in the original SQL statement.  The pFix structure
++** must have been initialized by a prior call to sqliteFixInit().
++**
++** These routines are used to make sure that an index, trigger, or
++** view in one database does not refer to objects in a different database.
++** (Exception: indices, triggers, and views in the TEMP database are
++** allowed to refer to anything.)  If a reference is explicitly made
++** to an object in a different database, an error message is added to
++** pParse->zErrMsg and these routines return non-zero.  If everything
++** checks out, these routines return 0.
++*/
++int sqliteFixSrcList(
++  DbFixer *pFix,       /* Context of the fixation */
++  SrcList *pList       /* The Source list to check and modify */
++){
++  int i;
++  const char *zDb;
++
++  if( pList==0 ) return 0;
++  zDb = pFix->zDb;
++  for(i=0; i<pList->nSrc; i++){
++    if( pList->a[i].zDatabase==0 ){
++      pList->a[i].zDatabase = sqliteStrDup(zDb);
++    }else if( sqliteStrICmp(pList->a[i].zDatabase,zDb)!=0 ){
++      sqliteErrorMsg(pFix->pParse,
++         "%s %z cannot reference objects in database %s",
++         pFix->zType, sqliteStrNDup(pFix->pName->z, pFix->pName->n),
++         pList->a[i].zDatabase);
++      return 1;
++    }
++    if( sqliteFixSelect(pFix, pList->a[i].pSelect) ) return 1;
++    if( sqliteFixExpr(pFix, pList->a[i].pOn) ) return 1;
++  }
++  return 0;
++}
++int sqliteFixSelect(
++  DbFixer *pFix,       /* Context of the fixation */
++  Select *pSelect      /* The SELECT statement to be fixed to one database */
++){
++  while( pSelect ){
++    if( sqliteFixExprList(pFix, pSelect->pEList) ){
++      return 1;
++    }
++    if( sqliteFixSrcList(pFix, pSelect->pSrc) ){
++      return 1;
++    }
++    if( sqliteFixExpr(pFix, pSelect->pWhere) ){
++      return 1;
++    }
++    if( sqliteFixExpr(pFix, pSelect->pHaving) ){
++      return 1;
++    }
++    pSelect = pSelect->pPrior;
++  }
++  return 0;
++}
++int sqliteFixExpr(
++  DbFixer *pFix,     /* Context of the fixation */
++  Expr *pExpr        /* The expression to be fixed to one database */
++){
++  while( pExpr ){
++    if( sqliteFixSelect(pFix, pExpr->pSelect) ){
++      return 1;
++    }
++    if( sqliteFixExprList(pFix, pExpr->pList) ){
++      return 1;
++    }
++    if( sqliteFixExpr(pFix, pExpr->pRight) ){
++      return 1;
++    }
++    pExpr = pExpr->pLeft;
++  }
++  return 0;
++}
++int sqliteFixExprList(
++  DbFixer *pFix,     /* Context of the fixation */
++  ExprList *pList    /* The expression to be fixed to one database */
++){
++  int i;
++  if( pList==0 ) return 0;
++  for(i=0; i<pList->nExpr; i++){
++    if( sqliteFixExpr(pFix, pList->a[i].pExpr) ){
++      return 1;
++    }
++  }
++  return 0;
++}
++int sqliteFixTriggerStep(
++  DbFixer *pFix,     /* Context of the fixation */
++  TriggerStep *pStep /* The trigger step be fixed to one database */
++){
++  while( pStep ){
++    if( sqliteFixSelect(pFix, pStep->pSelect) ){
++      return 1;
++    }
++    if( sqliteFixExpr(pFix, pStep->pWhere) ){
++      return 1;
++    }
++    if( sqliteFixExprList(pFix, pStep->pExprList) ){
++      return 1;
++    }
++    pStep = pStep->pNext;
++  }
++  return 0;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/auth.c
+@@ -0,0 +1,219 @@
++/*
++** 2003 January 11
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code used to implement the sqlite_set_authorizer()
++** API.  This facility is an optional feature of the library.  Embedded
++** systems that do not need this facility may omit it by recompiling
++** the library with -DSQLITE_OMIT_AUTHORIZATION=1
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++/*
++** All of the code in this file may be omitted by defining a single
++** macro.
++*/
++#ifndef SQLITE_OMIT_AUTHORIZATION
++
++/*
++** Set or clear the access authorization function.
++**
++** The access authorization function is be called during the compilation
++** phase to verify that the user has read and/or write access permission on
++** various fields of the database.  The first argument to the auth function
++** is a copy of the 3rd argument to this routine.  The second argument
++** to the auth function is one of these constants:
++**
++**       SQLITE_COPY
++**       SQLITE_CREATE_INDEX
++**       SQLITE_CREATE_TABLE
++**       SQLITE_CREATE_TEMP_INDEX
++**       SQLITE_CREATE_TEMP_TABLE
++**       SQLITE_CREATE_TEMP_TRIGGER
++**       SQLITE_CREATE_TEMP_VIEW
++**       SQLITE_CREATE_TRIGGER
++**       SQLITE_CREATE_VIEW
++**       SQLITE_DELETE
++**       SQLITE_DROP_INDEX
++**       SQLITE_DROP_TABLE
++**       SQLITE_DROP_TEMP_INDEX
++**       SQLITE_DROP_TEMP_TABLE
++**       SQLITE_DROP_TEMP_TRIGGER
++**       SQLITE_DROP_TEMP_VIEW
++**       SQLITE_DROP_TRIGGER
++**       SQLITE_DROP_VIEW
++**       SQLITE_INSERT
++**       SQLITE_PRAGMA
++**       SQLITE_READ
++**       SQLITE_SELECT
++**       SQLITE_TRANSACTION
++**       SQLITE_UPDATE
++**
++** The third and fourth arguments to the auth function are the name of
++** the table and the column that are being accessed.  The auth function
++** should return either SQLITE_OK, SQLITE_DENY, or SQLITE_IGNORE.  If
++** SQLITE_OK is returned, it means that access is allowed.  SQLITE_DENY
++** means that the SQL statement will never-run - the sqlite_exec() call
++** will return with an error.  SQLITE_IGNORE means that the SQL statement
++** should run but attempts to read the specified column will return NULL
++** and attempts to write the column will be ignored.
++**
++** Setting the auth function to NULL disables this hook.  The default
++** setting of the auth function is NULL.
++*/
++int sqlite_set_authorizer(
++  sqlite *db,
++  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
++  void *pArg
++){
++  db->xAuth = xAuth;
++  db->pAuthArg = pArg;
++  return SQLITE_OK;
++}
++
++/*
++** Write an error message into pParse->zErrMsg that explains that the
++** user-supplied authorization function returned an illegal value.
++*/
++static void sqliteAuthBadReturnCode(Parse *pParse, int rc){
++  sqliteErrorMsg(pParse, "illegal return value (%d) from the "
++    "authorization function - should be SQLITE_OK, SQLITE_IGNORE, "
++    "or SQLITE_DENY", rc);
++  pParse->rc = SQLITE_MISUSE;
++}
++
++/*
++** The pExpr should be a TK_COLUMN expression.  The table referred to
++** is in pTabList or else it is the NEW or OLD table of a trigger.  
++** Check to see if it is OK to read this particular column.
++**
++** If the auth function returns SQLITE_IGNORE, change the TK_COLUMN 
++** instruction into a TK_NULL.  If the auth function returns SQLITE_DENY,
++** then generate an error.
++*/
++void sqliteAuthRead(
++  Parse *pParse,        /* The parser context */
++  Expr *pExpr,          /* The expression to check authorization on */
++  SrcList *pTabList     /* All table that pExpr might refer to */
++){
++  sqlite *db = pParse->db;
++  int rc;
++  Table *pTab;          /* The table being read */
++  const char *zCol;     /* Name of the column of the table */
++  int iSrc;             /* Index in pTabList->a[] of table being read */
++  const char *zDBase;   /* Name of database being accessed */
++  TriggerStack *pStack; /* The stack of current triggers */
++
++  if( db->xAuth==0 ) return;
++  assert( pExpr->op==TK_COLUMN );
++  for(iSrc=0; iSrc<pTabList->nSrc; iSrc++){
++    if( pExpr->iTable==pTabList->a[iSrc].iCursor ) break;
++  }
++  if( iSrc>=0 && iSrc<pTabList->nSrc ){
++    pTab = pTabList->a[iSrc].pTab;
++  }else if( (pStack = pParse->trigStack)!=0 ){
++    /* This must be an attempt to read the NEW or OLD pseudo-tables
++    ** of a trigger.
++    */
++    assert( pExpr->iTable==pStack->newIdx || pExpr->iTable==pStack->oldIdx );
++    pTab = pStack->pTab;
++  }else{
++    return;
++  }
++  if( pTab==0 ) return;
++  if( pExpr->iColumn>=0 ){
++    assert( pExpr->iColumn<pTab->nCol );
++    zCol = pTab->aCol[pExpr->iColumn].zName;
++  }else if( pTab->iPKey>=0 ){
++    assert( pTab->iPKey<pTab->nCol );
++    zCol = pTab->aCol[pTab->iPKey].zName;
++  }else{
++    zCol = "ROWID";
++  }
++  assert( pExpr->iDb<db->nDb );
++  zDBase = db->aDb[pExpr->iDb].zName;
++  rc = db->xAuth(db->pAuthArg, SQLITE_READ, pTab->zName, zCol, zDBase, 
++                 pParse->zAuthContext);
++  if( rc==SQLITE_IGNORE ){
++    pExpr->op = TK_NULL;
++  }else if( rc==SQLITE_DENY ){
++    if( db->nDb>2 || pExpr->iDb!=0 ){
++      sqliteErrorMsg(pParse, "access to %s.%s.%s is prohibited", 
++         zDBase, pTab->zName, zCol);
++    }else{
++      sqliteErrorMsg(pParse, "access to %s.%s is prohibited", pTab->zName,zCol);
++    }
++    pParse->rc = SQLITE_AUTH;
++  }else if( rc!=SQLITE_OK ){
++    sqliteAuthBadReturnCode(pParse, rc);
++  }
++}
++
++/*
++** Do an authorization check using the code and arguments given.  Return
++** either SQLITE_OK (zero) or SQLITE_IGNORE or SQLITE_DENY.  If SQLITE_DENY
++** is returned, then the error count and error message in pParse are
++** modified appropriately.
++*/
++int sqliteAuthCheck(
++  Parse *pParse,
++  int code,
++  const char *zArg1,
++  const char *zArg2,
++  const char *zArg3
++){
++  sqlite *db = pParse->db;
++  int rc;
++
++  if( db->init.busy || db->xAuth==0 ){
++    return SQLITE_OK;
++  }
++  rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2, zArg3, pParse->zAuthContext);
++  if( rc==SQLITE_DENY ){
++    sqliteErrorMsg(pParse, "not authorized");
++    pParse->rc = SQLITE_AUTH;
++  }else if( rc!=SQLITE_OK && rc!=SQLITE_IGNORE ){
++    rc = SQLITE_DENY;
++    sqliteAuthBadReturnCode(pParse, rc);
++  }
++  return rc;
++}
++
++/*
++** Push an authorization context.  After this routine is called, the
++** zArg3 argument to authorization callbacks will be zContext until
++** popped.  Or if pParse==0, this routine is a no-op.
++*/
++void sqliteAuthContextPush(
++  Parse *pParse,
++  AuthContext *pContext, 
++  const char *zContext
++){
++  pContext->pParse = pParse;
++  if( pParse ){
++    pContext->zAuthContext = pParse->zAuthContext;
++    pParse->zAuthContext = zContext;
++  }
++}
++
++/*
++** Pop an authorization context that was previously pushed
++** by sqliteAuthContextPush
++*/
++void sqliteAuthContextPop(AuthContext *pContext){
++  if( pContext->pParse ){
++    pContext->pParse->zAuthContext = pContext->zAuthContext;
++    pContext->pParse = 0;
++  }
++}
++
++#endif /* SQLITE_OMIT_AUTHORIZATION */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/btree.c
+@@ -0,0 +1,3584 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** $Id$
++**
++** This file implements a external (disk-based) database using BTrees.
++** For a detailed discussion of BTrees, refer to
++**
++**     Donald E. Knuth, THE ART OF COMPUTER PROGRAMMING, Volume 3:
++**     "Sorting And Searching", pages 473-480. Addison-Wesley
++**     Publishing Company, Reading, Massachusetts.
++**
++** The basic idea is that each page of the file contains N database
++** entries and N+1 pointers to subpages.
++**
++**   ----------------------------------------------------------------
++**   |  Ptr(0) | Key(0) | Ptr(1) | Key(1) | ... | Key(N) | Ptr(N+1) |
++**   ----------------------------------------------------------------
++**
++** All of the keys on the page that Ptr(0) points to have values less
++** than Key(0).  All of the keys on page Ptr(1) and its subpages have
++** values greater than Key(0) and less than Key(1).  All of the keys
++** on Ptr(N+1) and its subpages have values greater than Key(N).  And
++** so forth.
++**
++** Finding a particular key requires reading O(log(M)) pages from the 
++** disk where M is the number of entries in the tree.
++**
++** In this implementation, a single file can hold one or more separate 
++** BTrees.  Each BTree is identified by the index of its root page.  The
++** key and data for any entry are combined to form the "payload".  Up to
++** MX_LOCAL_PAYLOAD bytes of payload can be carried directly on the
++** database page.  If the payload is larger than MX_LOCAL_PAYLOAD bytes
++** then surplus bytes are stored on overflow pages.  The payload for an
++** entry and the preceding pointer are combined to form a "Cell".  Each 
++** page has a small header which contains the Ptr(N+1) pointer.
++**
++** The first page of the file contains a magic string used to verify that
++** the file really is a valid BTree database, a pointer to a list of unused
++** pages in the file, and some meta information.  The root of the first
++** BTree begins on page 2 of the file.  (Pages are numbered beginning with
++** 1, not 0.)  Thus a minimum database contains 2 pages.
++*/
++#include "sqliteInt.h"
++#include "pager.h"
++#include "btree.h"
++#include <assert.h>
++
++/* Forward declarations */
++static BtOps sqliteBtreeOps;
++static BtCursorOps sqliteBtreeCursorOps;
++
++/*
++** Macros used for byteswapping.  B is a pointer to the Btree
++** structure.  This is needed to access the Btree.needSwab boolean
++** in order to tell if byte swapping is needed or not.
++** X is an unsigned integer.  SWAB16 byte swaps a 16-bit integer.
++** SWAB32 byteswaps a 32-bit integer.
++*/
++#define SWAB16(B,X)   ((B)->needSwab? swab16((u16)X) : ((u16)X))
++#define SWAB32(B,X)   ((B)->needSwab? swab32(X) : (X))
++#define SWAB_ADD(B,X,A) \
++   if((B)->needSwab){ X=swab32(swab32(X)+A); }else{ X += (A); }
++
++/*
++** The following global variable - available only if SQLITE_TEST is
++** defined - is used to determine whether new databases are created in
++** native byte order or in non-native byte order.  Non-native byte order
++** databases are created for testing purposes only.  Under normal operation,
++** only native byte-order databases should be created, but we should be
++** able to read or write existing databases regardless of the byteorder.
++*/
++#ifdef SQLITE_TEST
++int btree_native_byte_order = 1;
++#else
++# define btree_native_byte_order 1
++#endif
++
++/*
++** Forward declarations of structures used only in this file.
++*/
++typedef struct PageOne PageOne;
++typedef struct MemPage MemPage;
++typedef struct PageHdr PageHdr;
++typedef struct Cell Cell;
++typedef struct CellHdr CellHdr;
++typedef struct FreeBlk FreeBlk;
++typedef struct OverflowPage OverflowPage;
++typedef struct FreelistInfo FreelistInfo;
++
++/*
++** All structures on a database page are aligned to 4-byte boundries.
++** This routine rounds up a number of bytes to the next multiple of 4.
++**
++** This might need to change for computer architectures that require
++** and 8-byte alignment boundry for structures.
++*/
++#define ROUNDUP(X)  ((X+3) & ~3)
++
++/*
++** This is a magic string that appears at the beginning of every
++** SQLite database in order to identify the file as a real database.
++*/
++static const char zMagicHeader[] = 
++   "** This file contains an SQLite 2.1 database **";
++#define MAGIC_SIZE (sizeof(zMagicHeader))
++
++/*
++** This is a magic integer also used to test the integrity of the database
++** file.  This integer is used in addition to the string above so that
++** if the file is written on a little-endian architecture and read
++** on a big-endian architectures (or vice versa) we can detect the
++** problem.
++**
++** The number used was obtained at random and has no special
++** significance other than the fact that it represents a different
++** integer on little-endian and big-endian machines.
++*/
++#define MAGIC 0xdae37528
++
++/*
++** The first page of the database file contains a magic header string
++** to identify the file as an SQLite database file.  It also contains
++** a pointer to the first free page of the file.  Page 2 contains the
++** root of the principle BTree.  The file might contain other BTrees
++** rooted on pages above 2.
++**
++** The first page also contains SQLITE_N_BTREE_META integers that
++** can be used by higher-level routines.
++**
++** Remember that pages are numbered beginning with 1.  (See pager.c
++** for additional information.)  Page 0 does not exist and a page
++** number of 0 is used to mean "no such page".
++*/
++struct PageOne {
++  char zMagic[MAGIC_SIZE]; /* String that identifies the file as a database */
++  int iMagic;              /* Integer to verify correct byte order */
++  Pgno freeList;           /* First free page in a list of all free pages */
++  int nFree;               /* Number of pages on the free list */
++  int aMeta[SQLITE_N_BTREE_META-1];  /* User defined integers */
++};
++
++/*
++** Each database page has a header that is an instance of this
++** structure.
++**
++** PageHdr.firstFree is 0 if there is no free space on this page.
++** Otherwise, PageHdr.firstFree is the index in MemPage.u.aDisk[] of a 
++** FreeBlk structure that describes the first block of free space.  
++** All free space is defined by a linked list of FreeBlk structures.
++**
++** Data is stored in a linked list of Cell structures.  PageHdr.firstCell
++** is the index into MemPage.u.aDisk[] of the first cell on the page.  The
++** Cells are kept in sorted order.
++**
++** A Cell contains all information about a database entry and a pointer
++** to a child page that contains other entries less than itself.  In
++** other words, the i-th Cell contains both Ptr(i) and Key(i).  The
++** right-most pointer of the page is contained in PageHdr.rightChild.
++*/
++struct PageHdr {
++  Pgno rightChild;  /* Child page that comes after all cells on this page */
++  u16 firstCell;    /* Index in MemPage.u.aDisk[] of the first cell */
++  u16 firstFree;    /* Index in MemPage.u.aDisk[] of the first free block */
++};
++
++/*
++** Entries on a page of the database are called "Cells".  Each Cell
++** has a header and data.  This structure defines the header.  The
++** key and data (collectively the "payload") follow this header on
++** the database page.
++**
++** A definition of the complete Cell structure is given below.  The
++** header for the cell must be defined first in order to do some
++** of the sizing #defines that follow.
++*/
++struct CellHdr {
++  Pgno leftChild; /* Child page that comes before this cell */
++  u16 nKey;       /* Number of bytes in the key */
++  u16 iNext;      /* Index in MemPage.u.aDisk[] of next cell in sorted order */
++  u8 nKeyHi;      /* Upper 8 bits of key size for keys larger than 64K bytes */
++  u8 nDataHi;     /* Upper 8 bits of data size when the size is more than 64K */
++  u16 nData;      /* Number of bytes of data */
++};
++
++/*
++** The key and data size are split into a lower 16-bit segment and an
++** upper 8-bit segment in order to pack them together into a smaller
++** space.  The following macros reassembly a key or data size back
++** into an integer.
++*/
++#define NKEY(b,h)  (SWAB16(b,h.nKey) + h.nKeyHi*65536)
++#define NDATA(b,h) (SWAB16(b,h.nData) + h.nDataHi*65536)
++
++/*
++** The minimum size of a complete Cell.  The Cell must contain a header
++** and at least 4 bytes of payload.
++*/
++#define MIN_CELL_SIZE  (sizeof(CellHdr)+4)
++
++/*
++** The maximum number of database entries that can be held in a single
++** page of the database. 
++*/
++#define MX_CELL ((SQLITE_USABLE_SIZE-sizeof(PageHdr))/MIN_CELL_SIZE)
++
++/*
++** The amount of usable space on a single page of the BTree.  This is the
++** page size minus the overhead of the page header.
++*/
++#define USABLE_SPACE  (SQLITE_USABLE_SIZE - sizeof(PageHdr))
++
++/*
++** The maximum amount of payload (in bytes) that can be stored locally for
++** a database entry.  If the entry contains more data than this, the
++** extra goes onto overflow pages.
++**
++** This number is chosen so that at least 4 cells will fit on every page.
++*/
++#define MX_LOCAL_PAYLOAD ((USABLE_SPACE/4-(sizeof(CellHdr)+sizeof(Pgno)))&~3)
++
++/*
++** Data on a database page is stored as a linked list of Cell structures.
++** Both the key and the data are stored in aPayload[].  The key always comes
++** first.  The aPayload[] field grows as necessary to hold the key and data,
++** up to a maximum of MX_LOCAL_PAYLOAD bytes.  If the size of the key and
++** data combined exceeds MX_LOCAL_PAYLOAD bytes, then Cell.ovfl is the
++** page number of the first overflow page.
++**
++** Though this structure is fixed in size, the Cell on the database
++** page varies in size.  Every cell has a CellHdr and at least 4 bytes
++** of payload space.  Additional payload bytes (up to the maximum of
++** MX_LOCAL_PAYLOAD) and the Cell.ovfl value are allocated only as
++** needed.
++*/
++struct Cell {
++  CellHdr h;                        /* The cell header */
++  char aPayload[MX_LOCAL_PAYLOAD];  /* Key and data */
++  Pgno ovfl;                        /* The first overflow page */
++};
++
++/*
++** Free space on a page is remembered using a linked list of the FreeBlk
++** structures.  Space on a database page is allocated in increments of
++** at least 4 bytes and is always aligned to a 4-byte boundry.  The
++** linked list of FreeBlks is always kept in order by address.
++*/
++struct FreeBlk {
++  u16 iSize;      /* Number of bytes in this block of free space */
++  u16 iNext;      /* Index in MemPage.u.aDisk[] of the next free block */
++};
++
++/*
++** The number of bytes of payload that will fit on a single overflow page.
++*/
++#define OVERFLOW_SIZE (SQLITE_USABLE_SIZE-sizeof(Pgno))
++
++/*
++** When the key and data for a single entry in the BTree will not fit in
++** the MX_LOCAL_PAYLOAD bytes of space available on the database page,
++** then all extra bytes are written to a linked list of overflow pages.
++** Each overflow page is an instance of the following structure.
++**
++** Unused pages in the database are also represented by instances of
++** the OverflowPage structure.  The PageOne.freeList field is the
++** page number of the first page in a linked list of unused database
++** pages.
++*/
++struct OverflowPage {
++  Pgno iNext;
++  char aPayload[OVERFLOW_SIZE];
++};
++
++/*
++** The PageOne.freeList field points to a linked list of overflow pages
++** hold information about free pages.  The aPayload section of each
++** overflow page contains an instance of the following structure.  The
++** aFree[] array holds the page number of nFree unused pages in the disk
++** file.
++*/
++struct FreelistInfo {
++  int nFree;
++  Pgno aFree[(OVERFLOW_SIZE-sizeof(int))/sizeof(Pgno)];
++};
++
++/*
++** For every page in the database file, an instance of the following structure
++** is stored in memory.  The u.aDisk[] array contains the raw bits read from
++** the disk.  The rest is auxiliary information held in memory only. The
++** auxiliary info is only valid for regular database pages - it is not
++** used for overflow pages and pages on the freelist.
++**
++** Of particular interest in the auxiliary info is the apCell[] entry.  Each
++** apCell[] entry is a pointer to a Cell structure in u.aDisk[].  The cells are
++** put in this array so that they can be accessed in constant time, rather
++** than in linear time which would be needed if we had to walk the linked 
++** list on every access.
++**
++** Note that apCell[] contains enough space to hold up to two more Cells
++** than can possibly fit on one page.  In the steady state, every apCell[]
++** points to memory inside u.aDisk[].  But in the middle of an insert
++** operation, some apCell[] entries may temporarily point to data space
++** outside of u.aDisk[].  This is a transient situation that is quickly
++** resolved.  But while it is happening, it is possible for a database
++** page to hold as many as two more cells than it might otherwise hold.
++** The extra two entries in apCell[] are an allowance for this situation.
++**
++** The pParent field points back to the parent page.  This allows us to
++** walk up the BTree from any leaf to the root.  Care must be taken to
++** unref() the parent page pointer when this page is no longer referenced.
++** The pageDestructor() routine handles that chore.
++*/
++struct MemPage {
++  union u_page_data {
++    char aDisk[SQLITE_PAGE_SIZE];  /* Page data stored on disk */
++    PageHdr hdr;                   /* Overlay page header */
++  } u;
++  u8 isInit;                     /* True if auxiliary data is initialized */
++  u8 idxShift;                   /* True if apCell[] indices have changed */
++  u8 isOverfull;                 /* Some apCell[] points outside u.aDisk[] */
++  MemPage *pParent;              /* The parent of this page.  NULL for root */
++  int idxParent;                 /* Index in pParent->apCell[] of this node */
++  int nFree;                     /* Number of free bytes in u.aDisk[] */
++  int nCell;                     /* Number of entries on this page */
++  Cell *apCell[MX_CELL+2];       /* All data entires in sorted order */
++};
++
++/*
++** The in-memory image of a disk page has the auxiliary information appended
++** to the end.  EXTRA_SIZE is the number of bytes of space needed to hold
++** that extra information.
++*/
++#define EXTRA_SIZE (sizeof(MemPage)-sizeof(union u_page_data))
++
++/*
++** Everything we need to know about an open database
++*/
++struct Btree {
++  BtOps *pOps;          /* Function table */
++  Pager *pPager;        /* The page cache */
++  BtCursor *pCursor;    /* A list of all open cursors */
++  PageOne *page1;       /* First page of the database */
++  u8 inTrans;           /* True if a transaction is in progress */
++  u8 inCkpt;            /* True if there is a checkpoint on the transaction */
++  u8 readOnly;          /* True if the underlying file is readonly */
++  u8 needSwab;          /* Need to byte-swapping */
++};
++typedef Btree Bt;
++
++/*
++** A cursor is a pointer to a particular entry in the BTree.
++** The entry is identified by its MemPage and the index in
++** MemPage.apCell[] of the entry.
++*/
++struct BtCursor {
++  BtCursorOps *pOps;        /* Function table */
++  Btree *pBt;               /* The Btree to which this cursor belongs */
++  BtCursor *pNext, *pPrev;  /* Forms a linked list of all cursors */
++  BtCursor *pShared;        /* Loop of cursors with the same root page */
++  Pgno pgnoRoot;            /* The root page of this tree */
++  MemPage *pPage;           /* Page that contains the entry */
++  int idx;                  /* Index of the entry in pPage->apCell[] */
++  u8 wrFlag;                /* True if writable */
++  u8 eSkip;                 /* Determines if next step operation is a no-op */
++  u8 iMatch;                /* compare result from last sqliteBtreeMoveto() */
++};
++
++/*
++** Legal values for BtCursor.eSkip.
++*/
++#define SKIP_NONE     0   /* Always step the cursor */
++#define SKIP_NEXT     1   /* The next sqliteBtreeNext() is a no-op */
++#define SKIP_PREV     2   /* The next sqliteBtreePrevious() is a no-op */
++#define SKIP_INVALID  3   /* Calls to Next() and Previous() are invalid */
++
++/* Forward declarations */
++static int fileBtreeCloseCursor(BtCursor *pCur);
++
++/*
++** Routines for byte swapping.
++*/
++u16 swab16(u16 x){
++  return ((x & 0xff)<<8) | ((x>>8)&0xff);
++}
++u32 swab32(u32 x){
++  return ((x & 0xff)<<24) | ((x & 0xff00)<<8) |
++         ((x>>8) & 0xff00) | ((x>>24)&0xff);
++}
++
++/*
++** Compute the total number of bytes that a Cell needs on the main
++** database page.  The number returned includes the Cell header,
++** local payload storage, and the pointer to overflow pages (if
++** applicable).  Additional space allocated on overflow pages
++** is NOT included in the value returned from this routine.
++*/
++static int cellSize(Btree *pBt, Cell *pCell){
++  int n = NKEY(pBt, pCell->h) + NDATA(pBt, pCell->h);
++  if( n>MX_LOCAL_PAYLOAD ){
++    n = MX_LOCAL_PAYLOAD + sizeof(Pgno);
++  }else{
++    n = ROUNDUP(n);
++  }
++  n += sizeof(CellHdr);
++  return n;
++}
++
++/*
++** Defragment the page given.  All Cells are moved to the
++** beginning of the page and all free space is collected 
++** into one big FreeBlk at the end of the page.
++*/
++static void defragmentPage(Btree *pBt, MemPage *pPage){
++  int pc, i, n;
++  FreeBlk *pFBlk;
++  char newPage[SQLITE_USABLE_SIZE];
++
++  assert( sqlitepager_iswriteable(pPage) );
++  assert( pPage->isInit );
++  pc = sizeof(PageHdr);
++  pPage->u.hdr.firstCell = SWAB16(pBt, pc);
++  memcpy(newPage, pPage->u.aDisk, pc);
++  for(i=0; i<pPage->nCell; i++){
++    Cell *pCell = pPage->apCell[i];
++
++    /* This routine should never be called on an overfull page.  The
++    ** following asserts verify that constraint. */
++    assert( Addr(pCell) > Addr(pPage) );
++    assert( Addr(pCell) < Addr(pPage) + SQLITE_USABLE_SIZE );
++
++    n = cellSize(pBt, pCell);
++    pCell->h.iNext = SWAB16(pBt, pc + n);
++    memcpy(&newPage[pc], pCell, n);
++    pPage->apCell[i] = (Cell*)&pPage->u.aDisk[pc];
++    pc += n;
++  }
++  assert( pPage->nFree==SQLITE_USABLE_SIZE-pc );
++  memcpy(pPage->u.aDisk, newPage, pc);
++  if( pPage->nCell>0 ){
++    pPage->apCell[pPage->nCell-1]->h.iNext = 0;
++  }
++  pFBlk = (FreeBlk*)&pPage->u.aDisk[pc];
++  pFBlk->iSize = SWAB16(pBt, SQLITE_USABLE_SIZE - pc);
++  pFBlk->iNext = 0;
++  pPage->u.hdr.firstFree = SWAB16(pBt, pc);
++  memset(&pFBlk[1], 0, SQLITE_USABLE_SIZE - pc - sizeof(FreeBlk));
++}
++
++/*
++** Allocate nByte bytes of space on a page.  nByte must be a 
++** multiple of 4.
++**
++** Return the index into pPage->u.aDisk[] of the first byte of
++** the new allocation. Or return 0 if there is not enough free
++** space on the page to satisfy the allocation request.
++**
++** If the page contains nBytes of free space but does not contain
++** nBytes of contiguous free space, then this routine automatically
++** calls defragementPage() to consolidate all free space before 
++** allocating the new chunk.
++*/
++static int allocateSpace(Btree *pBt, MemPage *pPage, int nByte){
++  FreeBlk *p;
++  u16 *pIdx;
++  int start;
++  int iSize;
++#ifndef NDEBUG
++  int cnt = 0;
++#endif
++
++  assert( sqlitepager_iswriteable(pPage) );
++  assert( nByte==ROUNDUP(nByte) );
++  assert( pPage->isInit );
++  if( pPage->nFree<nByte || pPage->isOverfull ) return 0;
++  pIdx = &pPage->u.hdr.firstFree;
++  p = (FreeBlk*)&pPage->u.aDisk[SWAB16(pBt, *pIdx)];
++  while( (iSize = SWAB16(pBt, p->iSize))<nByte ){
++    assert( cnt++ < SQLITE_USABLE_SIZE/4 );
++    if( p->iNext==0 ){
++      defragmentPage(pBt, pPage);
++      pIdx = &pPage->u.hdr.firstFree;
++    }else{
++      pIdx = &p->iNext;
++    }
++    p = (FreeBlk*)&pPage->u.aDisk[SWAB16(pBt, *pIdx)];
++  }
++  if( iSize==nByte ){
++    start = SWAB16(pBt, *pIdx);
++    *pIdx = p->iNext;
++  }else{
++    FreeBlk *pNew;
++    start = SWAB16(pBt, *pIdx);
++    pNew = (FreeBlk*)&pPage->u.aDisk[start + nByte];
++    pNew->iNext = p->iNext;
++    pNew->iSize = SWAB16(pBt, iSize - nByte);
++    *pIdx = SWAB16(pBt, start + nByte);
++  }
++  pPage->nFree -= nByte;
++  return start;
++}
++
++/*
++** Return a section of the MemPage.u.aDisk[] to the freelist.
++** The first byte of the new free block is pPage->u.aDisk[start]
++** and the size of the block is "size" bytes.  Size must be
++** a multiple of 4.
++**
++** Most of the effort here is involved in coalesing adjacent
++** free blocks into a single big free block.
++*/
++static void freeSpace(Btree *pBt, MemPage *pPage, int start, int size){
++  int end = start + size;
++  u16 *pIdx, idx;
++  FreeBlk *pFBlk;
++  FreeBlk *pNew;
++  FreeBlk *pNext;
++  int iSize;
++
++  assert( sqlitepager_iswriteable(pPage) );
++  assert( size == ROUNDUP(size) );
++  assert( start == ROUNDUP(start) );
++  assert( pPage->isInit );
++  pIdx = &pPage->u.hdr.firstFree;
++  idx = SWAB16(pBt, *pIdx);
++  while( idx!=0 && idx<start ){
++    pFBlk = (FreeBlk*)&pPage->u.aDisk[idx];
++    iSize = SWAB16(pBt, pFBlk->iSize);
++    if( idx + iSize == start ){
++      pFBlk->iSize = SWAB16(pBt, iSize + size);
++      if( idx + iSize + size == SWAB16(pBt, pFBlk->iNext) ){
++        pNext = (FreeBlk*)&pPage->u.aDisk[idx + iSize + size];
++        if( pBt->needSwab ){
++          pFBlk->iSize = swab16((u16)swab16(pNext->iSize)+iSize+size);
++        }else{
++          pFBlk->iSize += pNext->iSize;
++        }
++        pFBlk->iNext = pNext->iNext;
++      }
++      pPage->nFree += size;
++      return;
++    }
++    pIdx = &pFBlk->iNext;
++    idx = SWAB16(pBt, *pIdx);
++  }
++  pNew = (FreeBlk*)&pPage->u.aDisk[start];
++  if( idx != end ){
++    pNew->iSize = SWAB16(pBt, size);
++    pNew->iNext = SWAB16(pBt, idx);
++  }else{
++    pNext = (FreeBlk*)&pPage->u.aDisk[idx];
++    pNew->iSize = SWAB16(pBt, size + SWAB16(pBt, pNext->iSize));
++    pNew->iNext = pNext->iNext;
++  }
++  *pIdx = SWAB16(pBt, start);
++  pPage->nFree += size;
++}
++
++/*
++** Initialize the auxiliary information for a disk block.
++**
++** The pParent parameter must be a pointer to the MemPage which
++** is the parent of the page being initialized.  The root of the
++** BTree (usually page 2) has no parent and so for that page, 
++** pParent==NULL.
++**
++** Return SQLITE_OK on success.  If we see that the page does
++** not contain a well-formed database page, then return 
++** SQLITE_CORRUPT.  Note that a return of SQLITE_OK does not
++** guarantee that the page is well-formed.  It only shows that
++** we failed to detect any corruption.
++*/
++static int initPage(Bt *pBt, MemPage *pPage, Pgno pgnoThis, MemPage *pParent){
++  int idx;           /* An index into pPage->u.aDisk[] */
++  Cell *pCell;       /* A pointer to a Cell in pPage->u.aDisk[] */
++  FreeBlk *pFBlk;    /* A pointer to a free block in pPage->u.aDisk[] */
++  int sz;            /* The size of a Cell in bytes */
++  int freeSpace;     /* Amount of free space on the page */
++
++  if( pPage->pParent ){
++    assert( pPage->pParent==pParent );
++    return SQLITE_OK;
++  }
++  if( pParent ){
++    pPage->pParent = pParent;
++    sqlitepager_ref(pParent);
++  }
++  if( pPage->isInit ) return SQLITE_OK;
++  pPage->isInit = 1;
++  pPage->nCell = 0;
++  freeSpace = USABLE_SPACE;
++  idx = SWAB16(pBt, pPage->u.hdr.firstCell);
++  while( idx!=0 ){
++    if( idx>SQLITE_USABLE_SIZE-MIN_CELL_SIZE ) goto page_format_error;
++    if( idx<sizeof(PageHdr) ) goto page_format_error;
++    if( idx!=ROUNDUP(idx) ) goto page_format_error;
++    pCell = (Cell*)&pPage->u.aDisk[idx];
++    sz = cellSize(pBt, pCell);
++    if( idx+sz > SQLITE_USABLE_SIZE ) goto page_format_error;
++    freeSpace -= sz;
++    pPage->apCell[pPage->nCell++] = pCell;
++    idx = SWAB16(pBt, pCell->h.iNext);
++  }
++  pPage->nFree = 0;
++  idx = SWAB16(pBt, pPage->u.hdr.firstFree);
++  while( idx!=0 ){
++    int iNext;
++    if( idx>SQLITE_USABLE_SIZE-sizeof(FreeBlk) ) goto page_format_error;
++    if( idx<sizeof(PageHdr) ) goto page_format_error;
++    pFBlk = (FreeBlk*)&pPage->u.aDisk[idx];
++    pPage->nFree += SWAB16(pBt, pFBlk->iSize);
++    iNext = SWAB16(pBt, pFBlk->iNext);
++    if( iNext>0 && iNext <= idx ) goto page_format_error;
++    idx = iNext;
++  }
++  if( pPage->nCell==0 && pPage->nFree==0 ){
++    /* As a special case, an uninitialized root page appears to be
++    ** an empty database */
++    return SQLITE_OK;
++  }
++  if( pPage->nFree!=freeSpace ) goto page_format_error;
++  return SQLITE_OK;
++
++page_format_error:
++  return SQLITE_CORRUPT;
++}
++
++/*
++** Set up a raw page so that it looks like a database page holding
++** no entries.
++*/
++static void zeroPage(Btree *pBt, MemPage *pPage){
++  PageHdr *pHdr;
++  FreeBlk *pFBlk;
++  assert( sqlitepager_iswriteable(pPage) );
++  memset(pPage, 0, SQLITE_USABLE_SIZE);
++  pHdr = &pPage->u.hdr;
++  pHdr->firstCell = 0;
++  pHdr->firstFree = SWAB16(pBt, sizeof(*pHdr));
++  pFBlk = (FreeBlk*)&pHdr[1];
++  pFBlk->iNext = 0;
++  pPage->nFree = SQLITE_USABLE_SIZE - sizeof(*pHdr);
++  pFBlk->iSize = SWAB16(pBt, pPage->nFree);
++  pPage->nCell = 0;
++  pPage->isOverfull = 0;
++}
++
++/*
++** This routine is called when the reference count for a page
++** reaches zero.  We need to unref the pParent pointer when that
++** happens.
++*/
++static void pageDestructor(void *pData){
++  MemPage *pPage = (MemPage*)pData;
++  if( pPage->pParent ){
++    MemPage *pParent = pPage->pParent;
++    pPage->pParent = 0;
++    sqlitepager_unref(pParent);
++  }
++}
++
++/*
++** Open a new database.
++**
++** Actually, this routine just sets up the internal data structures
++** for accessing the database.  We do not open the database file 
++** until the first page is loaded.
++**
++** zFilename is the name of the database file.  If zFilename is NULL
++** a new database with a random name is created.  This randomly named
++** database file will be deleted when sqliteBtreeClose() is called.
++*/
++int sqliteBtreeOpen(
++  const char *zFilename,    /* Name of the file containing the BTree database */
++  int omitJournal,          /* if TRUE then do not journal this file */
++  int nCache,               /* How many pages in the page cache */
++  Btree **ppBtree           /* Pointer to new Btree object written here */
++){
++  Btree *pBt;
++  int rc;
++
++  /*
++  ** The following asserts make sure that structures used by the btree are
++  ** the right size.  This is to guard against size changes that result
++  ** when compiling on a different architecture.
++  */
++  assert( sizeof(u32)==4 );
++  assert( sizeof(u16)==2 );
++  assert( sizeof(Pgno)==4 );
++  assert( sizeof(PageHdr)==8 );
++  assert( sizeof(CellHdr)==12 );
++  assert( sizeof(FreeBlk)==4 );
++  assert( sizeof(OverflowPage)==SQLITE_USABLE_SIZE );
++  assert( sizeof(FreelistInfo)==OVERFLOW_SIZE );
++  assert( sizeof(ptr)==sizeof(char*) );
++  assert( sizeof(uptr)==sizeof(ptr) );
++
++  pBt = sqliteMalloc( sizeof(*pBt) );
++  if( pBt==0 ){
++    *ppBtree = 0;
++    return SQLITE_NOMEM;
++  }
++  if( nCache<10 ) nCache = 10;
++  rc = sqlitepager_open(&pBt->pPager, zFilename, nCache, EXTRA_SIZE,
++                        !omitJournal);
++  if( rc!=SQLITE_OK ){
++    if( pBt->pPager ) sqlitepager_close(pBt->pPager);
++    sqliteFree(pBt);
++    *ppBtree = 0;
++    return rc;
++  }
++  sqlitepager_set_destructor(pBt->pPager, pageDestructor);
++  pBt->pCursor = 0;
++  pBt->page1 = 0;
++  pBt->readOnly = sqlitepager_isreadonly(pBt->pPager);
++  pBt->pOps = &sqliteBtreeOps;
++  *ppBtree = pBt;
++  return SQLITE_OK;
++}
++
++/*
++** Close an open database and invalidate all cursors.
++*/
++static int fileBtreeClose(Btree *pBt){
++  while( pBt->pCursor ){
++    fileBtreeCloseCursor(pBt->pCursor);
++  }
++  sqlitepager_close(pBt->pPager);
++  sqliteFree(pBt);
++  return SQLITE_OK;
++}
++
++/*
++** Change the limit on the number of pages allowed in the cache.
++**
++** The maximum number of cache pages is set to the absolute
++** value of mxPage.  If mxPage is negative, the pager will
++** operate asynchronously - it will not stop to do fsync()s
++** to insure data is written to the disk surface before
++** continuing.  Transactions still work if synchronous is off,
++** and the database cannot be corrupted if this program
++** crashes.  But if the operating system crashes or there is
++** an abrupt power failure when synchronous is off, the database
++** could be left in an inconsistent and unrecoverable state.
++** Synchronous is on by default so database corruption is not
++** normally a worry.
++*/
++static int fileBtreeSetCacheSize(Btree *pBt, int mxPage){
++  sqlitepager_set_cachesize(pBt->pPager, mxPage);
++  return SQLITE_OK;
++}
++
++/*
++** Change the way data is synced to disk in order to increase or decrease
++** how well the database resists damage due to OS crashes and power
++** failures.  Level 1 is the same as asynchronous (no syncs() occur and
++** there is a high probability of damage)  Level 2 is the default.  There
++** is a very low but non-zero probability of damage.  Level 3 reduces the
++** probability of damage to near zero but with a write performance reduction.
++*/
++static int fileBtreeSetSafetyLevel(Btree *pBt, int level){
++  sqlitepager_set_safety_level(pBt->pPager, level);
++  return SQLITE_OK;
++}
++
++/*
++** Get a reference to page1 of the database file.  This will
++** also acquire a readlock on that file.
++**
++** SQLITE_OK is returned on success.  If the file is not a
++** well-formed database file, then SQLITE_CORRUPT is returned.
++** SQLITE_BUSY is returned if the database is locked.  SQLITE_NOMEM
++** is returned if we run out of memory.  SQLITE_PROTOCOL is returned
++** if there is a locking protocol violation.
++*/
++static int lockBtree(Btree *pBt){
++  int rc;
++  if( pBt->page1 ) return SQLITE_OK;
++  rc = sqlitepager_get(pBt->pPager, 1, (void**)&pBt->page1);
++  if( rc!=SQLITE_OK ) return rc;
++
++  /* Do some checking to help insure the file we opened really is
++  ** a valid database file. 
++  */
++  if( sqlitepager_pagecount(pBt->pPager)>0 ){
++    PageOne *pP1 = pBt->page1;
++    if( strcmp(pP1->zMagic,zMagicHeader)!=0 ||
++          (pP1->iMagic!=MAGIC && swab32(pP1->iMagic)!=MAGIC) ){
++      rc = SQLITE_NOTADB;
++      goto page1_init_failed;
++    }
++    pBt->needSwab = pP1->iMagic!=MAGIC;
++  }
++  return rc;
++
++page1_init_failed:
++  sqlitepager_unref(pBt->page1);
++  pBt->page1 = 0;
++  return rc;
++}
++
++/*
++** If there are no outstanding cursors and we are not in the middle
++** of a transaction but there is a read lock on the database, then
++** this routine unrefs the first page of the database file which 
++** has the effect of releasing the read lock.
++**
++** If there are any outstanding cursors, this routine is a no-op.
++**
++** If there is a transaction in progress, this routine is a no-op.
++*/
++static void unlockBtreeIfUnused(Btree *pBt){
++  if( pBt->inTrans==0 && pBt->pCursor==0 && pBt->page1!=0 ){
++    sqlitepager_unref(pBt->page1);
++    pBt->page1 = 0;
++    pBt->inTrans = 0;
++    pBt->inCkpt = 0;
++  }
++}
++
++/*
++** Create a new database by initializing the first two pages of the
++** file.
++*/
++static int newDatabase(Btree *pBt){
++  MemPage *pRoot;
++  PageOne *pP1;
++  int rc;
++  if( sqlitepager_pagecount(pBt->pPager)>1 ) return SQLITE_OK;
++  pP1 = pBt->page1;
++  rc = sqlitepager_write(pBt->page1);
++  if( rc ) return rc;
++  rc = sqlitepager_get(pBt->pPager, 2, (void**)&pRoot);
++  if( rc ) return rc;
++  rc = sqlitepager_write(pRoot);
++  if( rc ){
++    sqlitepager_unref(pRoot);
++    return rc;
++  }
++  strcpy(pP1->zMagic, zMagicHeader);
++  if( btree_native_byte_order ){
++    pP1->iMagic = MAGIC;
++    pBt->needSwab = 0;
++  }else{
++    pP1->iMagic = swab32(MAGIC);
++    pBt->needSwab = 1;
++  }
++  zeroPage(pBt, pRoot);
++  sqlitepager_unref(pRoot);
++  return SQLITE_OK;
++}
++
++/*
++** Attempt to start a new transaction.
++**
++** A transaction must be started before attempting any changes
++** to the database.  None of the following routines will work
++** unless a transaction is started first:
++**
++**      sqliteBtreeCreateTable()
++**      sqliteBtreeCreateIndex()
++**      sqliteBtreeClearTable()
++**      sqliteBtreeDropTable()
++**      sqliteBtreeInsert()
++**      sqliteBtreeDelete()
++**      sqliteBtreeUpdateMeta()
++*/
++static int fileBtreeBeginTrans(Btree *pBt){
++  int rc;
++  if( pBt->inTrans ) return SQLITE_ERROR;
++  if( pBt->readOnly ) return SQLITE_READONLY;
++  if( pBt->page1==0 ){
++    rc = lockBtree(pBt);
++    if( rc!=SQLITE_OK ){
++      return rc;
++    }
++  }
++  rc = sqlitepager_begin(pBt->page1);
++  if( rc==SQLITE_OK ){
++    rc = newDatabase(pBt);
++  }
++  if( rc==SQLITE_OK ){
++    pBt->inTrans = 1;
++    pBt->inCkpt = 0;
++  }else{
++    unlockBtreeIfUnused(pBt);
++  }
++  return rc;
++}
++
++/*
++** Commit the transaction currently in progress.
++**
++** This will release the write lock on the database file.  If there
++** are no active cursors, it also releases the read lock.
++*/
++static int fileBtreeCommit(Btree *pBt){
++  int rc;
++  rc = pBt->readOnly ? SQLITE_OK : sqlitepager_commit(pBt->pPager);
++  pBt->inTrans = 0;
++  pBt->inCkpt = 0;
++  unlockBtreeIfUnused(pBt);
++  return rc;
++}
++
++/*
++** Rollback the transaction in progress.  All cursors will be
++** invalided by this operation.  Any attempt to use a cursor
++** that was open at the beginning of this operation will result
++** in an error.
++**
++** This will release the write lock on the database file.  If there
++** are no active cursors, it also releases the read lock.
++*/
++static int fileBtreeRollback(Btree *pBt){
++  int rc;
++  BtCursor *pCur;
++  if( pBt->inTrans==0 ) return SQLITE_OK;
++  pBt->inTrans = 0;
++  pBt->inCkpt = 0;
++  rc = pBt->readOnly ? SQLITE_OK : sqlitepager_rollback(pBt->pPager);
++  for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){
++    if( pCur->pPage && pCur->pPage->isInit==0 ){
++      sqlitepager_unref(pCur->pPage);
++      pCur->pPage = 0;
++    }
++  }
++  unlockBtreeIfUnused(pBt);
++  return rc;
++}
++
++/*
++** Set the checkpoint for the current transaction.  The checkpoint serves
++** as a sub-transaction that can be rolled back independently of the
++** main transaction.  You must start a transaction before starting a
++** checkpoint.  The checkpoint is ended automatically if the transaction
++** commits or rolls back.
++**
++** Only one checkpoint may be active at a time.  It is an error to try
++** to start a new checkpoint if another checkpoint is already active.
++*/
++static int fileBtreeBeginCkpt(Btree *pBt){
++  int rc;
++  if( !pBt->inTrans || pBt->inCkpt ){
++    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
++  }
++  rc = pBt->readOnly ? SQLITE_OK : sqlitepager_ckpt_begin(pBt->pPager);
++  pBt->inCkpt = 1;
++  return rc;
++}
++
++
++/*
++** Commit a checkpoint to transaction currently in progress.  If no
++** checkpoint is active, this is a no-op.
++*/
++static int fileBtreeCommitCkpt(Btree *pBt){
++  int rc;
++  if( pBt->inCkpt && !pBt->readOnly ){
++    rc = sqlitepager_ckpt_commit(pBt->pPager);
++  }else{
++    rc = SQLITE_OK;
++  }
++  pBt->inCkpt = 0;
++  return rc;
++}
++
++/*
++** Rollback the checkpoint to the current transaction.  If there
++** is no active checkpoint or transaction, this routine is a no-op.
++**
++** All cursors will be invalided by this operation.  Any attempt
++** to use a cursor that was open at the beginning of this operation
++** will result in an error.
++*/
++static int fileBtreeRollbackCkpt(Btree *pBt){
++  int rc;
++  BtCursor *pCur;
++  if( pBt->inCkpt==0 || pBt->readOnly ) return SQLITE_OK;
++  rc = sqlitepager_ckpt_rollback(pBt->pPager);
++  for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){
++    if( pCur->pPage && pCur->pPage->isInit==0 ){
++      sqlitepager_unref(pCur->pPage);
++      pCur->pPage = 0;
++    }
++  }
++  pBt->inCkpt = 0;
++  return rc;
++}
++
++/*
++** Create a new cursor for the BTree whose root is on the page
++** iTable.  The act of acquiring a cursor gets a read lock on 
++** the database file.
++**
++** If wrFlag==0, then the cursor can only be used for reading.
++** If wrFlag==1, then the cursor can be used for reading or for
++** writing if other conditions for writing are also met.  These
++** are the conditions that must be met in order for writing to
++** be allowed:
++**
++** 1:  The cursor must have been opened with wrFlag==1
++**
++** 2:  No other cursors may be open with wrFlag==0 on the same table
++**
++** 3:  The database must be writable (not on read-only media)
++**
++** 4:  There must be an active transaction.
++**
++** Condition 2 warrants further discussion.  If any cursor is opened
++** on a table with wrFlag==0, that prevents all other cursors from
++** writing to that table.  This is a kind of "read-lock".  When a cursor
++** is opened with wrFlag==0 it is guaranteed that the table will not
++** change as long as the cursor is open.  This allows the cursor to
++** do a sequential scan of the table without having to worry about
++** entries being inserted or deleted during the scan.  Cursors should
++** be opened with wrFlag==0 only if this read-lock property is needed.
++** That is to say, cursors should be opened with wrFlag==0 only if they
++** intend to use the sqliteBtreeNext() system call.  All other cursors
++** should be opened with wrFlag==1 even if they never really intend
++** to write.
++** 
++** No checking is done to make sure that page iTable really is the
++** root page of a b-tree.  If it is not, then the cursor acquired
++** will not work correctly.
++*/
++static 
++int fileBtreeCursor(Btree *pBt, int iTable, int wrFlag, BtCursor **ppCur){
++  int rc;
++  BtCursor *pCur, *pRing;
++
++  if( pBt->readOnly && wrFlag ){
++    *ppCur = 0;
++    return SQLITE_READONLY;
++  }
++  if( pBt->page1==0 ){
++    rc = lockBtree(pBt);
++    if( rc!=SQLITE_OK ){
++      *ppCur = 0;
++      return rc;
++    }
++  }
++  pCur = sqliteMalloc( sizeof(*pCur) );
++  if( pCur==0 ){
++    rc = SQLITE_NOMEM;
++    goto create_cursor_exception;
++  }
++  pCur->pgnoRoot = (Pgno)iTable;
++  rc = sqlitepager_get(pBt->pPager, pCur->pgnoRoot, (void**)&pCur->pPage);
++  if( rc!=SQLITE_OK ){
++    goto create_cursor_exception;
++  }
++  rc = initPage(pBt, pCur->pPage, pCur->pgnoRoot, 0);
++  if( rc!=SQLITE_OK ){
++    goto create_cursor_exception;
++  }
++  pCur->pOps = &sqliteBtreeCursorOps;
++  pCur->pBt = pBt;
++  pCur->wrFlag = wrFlag;
++  pCur->idx = 0;
++  pCur->eSkip = SKIP_INVALID;
++  pCur->pNext = pBt->pCursor;
++  if( pCur->pNext ){
++    pCur->pNext->pPrev = pCur;
++  }
++  pCur->pPrev = 0;
++  pRing = pBt->pCursor;
++  while( pRing && pRing->pgnoRoot!=pCur->pgnoRoot ){ pRing = pRing->pNext; }
++  if( pRing ){
++    pCur->pShared = pRing->pShared;
++    pRing->pShared = pCur;
++  }else{
++    pCur->pShared = pCur;
++  }
++  pBt->pCursor = pCur;
++  *ppCur = pCur;
++  return SQLITE_OK;
++
++create_cursor_exception:
++  *ppCur = 0;
++  if( pCur ){
++    if( pCur->pPage ) sqlitepager_unref(pCur->pPage);
++    sqliteFree(pCur);
++  }
++  unlockBtreeIfUnused(pBt);
++  return rc;
++}
++
++/*
++** Close a cursor.  The read lock on the database file is released
++** when the last cursor is closed.
++*/
++static int fileBtreeCloseCursor(BtCursor *pCur){
++  Btree *pBt = pCur->pBt;
++  if( pCur->pPrev ){
++    pCur->pPrev->pNext = pCur->pNext;
++  }else{
++    pBt->pCursor = pCur->pNext;
++  }
++  if( pCur->pNext ){
++    pCur->pNext->pPrev = pCur->pPrev;
++  }
++  if( pCur->pPage ){
++    sqlitepager_unref(pCur->pPage);
++  }
++  if( pCur->pShared!=pCur ){
++    BtCursor *pRing = pCur->pShared;
++    while( pRing->pShared!=pCur ){ pRing = pRing->pShared; }
++    pRing->pShared = pCur->pShared;
++  }
++  unlockBtreeIfUnused(pBt);
++  sqliteFree(pCur);
++  return SQLITE_OK;
++}
++
++/*
++** Make a temporary cursor by filling in the fields of pTempCur.
++** The temporary cursor is not on the cursor list for the Btree.
++*/
++static void getTempCursor(BtCursor *pCur, BtCursor *pTempCur){
++  memcpy(pTempCur, pCur, sizeof(*pCur));
++  pTempCur->pNext = 0;
++  pTempCur->pPrev = 0;
++  if( pTempCur->pPage ){
++    sqlitepager_ref(pTempCur->pPage);
++  }
++}
++
++/*
++** Delete a temporary cursor such as was made by the CreateTemporaryCursor()
++** function above.
++*/
++static void releaseTempCursor(BtCursor *pCur){
++  if( pCur->pPage ){
++    sqlitepager_unref(pCur->pPage);
++  }
++}
++
++/*
++** Set *pSize to the number of bytes of key in the entry the
++** cursor currently points to.  Always return SQLITE_OK.
++** Failure is not possible.  If the cursor is not currently
++** pointing to an entry (which can happen, for example, if
++** the database is empty) then *pSize is set to 0.
++*/
++static int fileBtreeKeySize(BtCursor *pCur, int *pSize){
++  Cell *pCell;
++  MemPage *pPage;
++
++  pPage = pCur->pPage;
++  assert( pPage!=0 );
++  if( pCur->idx >= pPage->nCell ){
++    *pSize = 0;
++  }else{
++    pCell = pPage->apCell[pCur->idx];
++    *pSize = NKEY(pCur->pBt, pCell->h);
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Read payload information from the entry that the pCur cursor is
++** pointing to.  Begin reading the payload at "offset" and read
++** a total of "amt" bytes.  Put the result in zBuf.
++**
++** This routine does not make a distinction between key and data.
++** It just reads bytes from the payload area.
++*/
++static int getPayload(BtCursor *pCur, int offset, int amt, char *zBuf){
++  char *aPayload;
++  Pgno nextPage;
++  int rc;
++  Btree *pBt = pCur->pBt;
++  assert( pCur!=0 && pCur->pPage!=0 );
++  assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell );
++  aPayload = pCur->pPage->apCell[pCur->idx]->aPayload;
++  if( offset<MX_LOCAL_PAYLOAD ){
++    int a = amt;
++    if( a+offset>MX_LOCAL_PAYLOAD ){
++      a = MX_LOCAL_PAYLOAD - offset;
++    }
++    memcpy(zBuf, &aPayload[offset], a);
++    if( a==amt ){
++      return SQLITE_OK;
++    }
++    offset = 0;
++    zBuf += a;
++    amt -= a;
++  }else{
++    offset -= MX_LOCAL_PAYLOAD;
++  }
++  if( amt>0 ){
++    nextPage = SWAB32(pBt, pCur->pPage->apCell[pCur->idx]->ovfl);
++  }
++  while( amt>0 && nextPage ){
++    OverflowPage *pOvfl;
++    rc = sqlitepager_get(pBt->pPager, nextPage, (void**)&pOvfl);
++    if( rc!=0 ){
++      return rc;
++    }
++    nextPage = SWAB32(pBt, pOvfl->iNext);
++    if( offset<OVERFLOW_SIZE ){
++      int a = amt;
++      if( a + offset > OVERFLOW_SIZE ){
++        a = OVERFLOW_SIZE - offset;
++      }
++      memcpy(zBuf, &pOvfl->aPayload[offset], a);
++      offset = 0;
++      amt -= a;
++      zBuf += a;
++    }else{
++      offset -= OVERFLOW_SIZE;
++    }
++    sqlitepager_unref(pOvfl);
++  }
++  if( amt>0 ){
++    return SQLITE_CORRUPT;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Read part of the key associated with cursor pCur.  A maximum
++** of "amt" bytes will be transfered into zBuf[].  The transfer
++** begins at "offset".  The number of bytes actually read is
++** returned. 
++**
++** Change:  It used to be that the amount returned will be smaller
++** than the amount requested if there are not enough bytes in the key
++** to satisfy the request.  But now, it must be the case that there
++** is enough data available to satisfy the request.  If not, an exception
++** is raised.  The change was made in an effort to boost performance
++** by eliminating unneeded tests.
++*/
++static int fileBtreeKey(BtCursor *pCur, int offset, int amt, char *zBuf){
++  MemPage *pPage;
++
++  assert( amt>=0 );
++  assert( offset>=0 );
++  assert( pCur->pPage!=0 );
++  pPage = pCur->pPage;
++  if( pCur->idx >= pPage->nCell ){
++    return 0;
++  }
++  assert( amt+offset <= NKEY(pCur->pBt, pPage->apCell[pCur->idx]->h) );
++  getPayload(pCur, offset, amt, zBuf);
++  return amt;
++}
++
++/*
++** Set *pSize to the number of bytes of data in the entry the
++** cursor currently points to.  Always return SQLITE_OK.
++** Failure is not possible.  If the cursor is not currently
++** pointing to an entry (which can happen, for example, if
++** the database is empty) then *pSize is set to 0.
++*/
++static int fileBtreeDataSize(BtCursor *pCur, int *pSize){
++  Cell *pCell;
++  MemPage *pPage;
++
++  pPage = pCur->pPage;
++  assert( pPage!=0 );
++  if( pCur->idx >= pPage->nCell ){
++    *pSize = 0;
++  }else{
++    pCell = pPage->apCell[pCur->idx];
++    *pSize = NDATA(pCur->pBt, pCell->h);
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Read part of the data associated with cursor pCur.  A maximum
++** of "amt" bytes will be transfered into zBuf[].  The transfer
++** begins at "offset".  The number of bytes actually read is
++** returned.  The amount returned will be smaller than the
++** amount requested if there are not enough bytes in the data
++** to satisfy the request.
++*/
++static int fileBtreeData(BtCursor *pCur, int offset, int amt, char *zBuf){
++  Cell *pCell;
++  MemPage *pPage;
++
++  assert( amt>=0 );
++  assert( offset>=0 );
++  assert( pCur->pPage!=0 );
++  pPage = pCur->pPage;
++  if( pCur->idx >= pPage->nCell ){
++    return 0;
++  }
++  pCell = pPage->apCell[pCur->idx];
++  assert( amt+offset <= NDATA(pCur->pBt, pCell->h) );
++  getPayload(pCur, offset + NKEY(pCur->pBt, pCell->h), amt, zBuf);
++  return amt;
++}
++
++/*
++** Compare an external key against the key on the entry that pCur points to.
++**
++** The external key is pKey and is nKey bytes long.  The last nIgnore bytes
++** of the key associated with pCur are ignored, as if they do not exist.
++** (The normal case is for nIgnore to be zero in which case the entire
++** internal key is used in the comparison.)
++**
++** The comparison result is written to *pRes as follows:
++**
++**    *pRes<0    This means pCur<pKey
++**
++**    *pRes==0   This means pCur==pKey for all nKey bytes
++**
++**    *pRes>0    This means pCur>pKey
++**
++** When one key is an exact prefix of the other, the shorter key is
++** considered less than the longer one.  In order to be equal the
++** keys must be exactly the same length. (The length of the pCur key
++** is the actual key length minus nIgnore bytes.)
++*/
++static int fileBtreeKeyCompare(
++  BtCursor *pCur,       /* Pointer to entry to compare against */
++  const void *pKey,     /* Key to compare against entry that pCur points to */
++  int nKey,             /* Number of bytes in pKey */
++  int nIgnore,          /* Ignore this many bytes at the end of pCur */
++  int *pResult          /* Write the result here */
++){
++  Pgno nextPage;
++  int n, c, rc, nLocal;
++  Cell *pCell;
++  Btree *pBt = pCur->pBt;
++  const char *zKey  = (const char*)pKey;
++
++  assert( pCur->pPage );
++  assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell );
++  pCell = pCur->pPage->apCell[pCur->idx];
++  nLocal = NKEY(pBt, pCell->h) - nIgnore;
++  if( nLocal<0 ) nLocal = 0;
++  n = nKey<nLocal ? nKey : nLocal;
++  if( n>MX_LOCAL_PAYLOAD ){
++    n = MX_LOCAL_PAYLOAD;
++  }
++  c = memcmp(pCell->aPayload, zKey, n);
++  if( c!=0 ){
++    *pResult = c;
++    return SQLITE_OK;
++  }
++  zKey += n;
++  nKey -= n;
++  nLocal -= n;
++  nextPage = SWAB32(pBt, pCell->ovfl);
++  while( nKey>0 && nLocal>0 ){
++    OverflowPage *pOvfl;
++    if( nextPage==0 ){
++      return SQLITE_CORRUPT;
++    }
++    rc = sqlitepager_get(pBt->pPager, nextPage, (void**)&pOvfl);
++    if( rc ){
++      return rc;
++    }
++    nextPage = SWAB32(pBt, pOvfl->iNext);
++    n = nKey<nLocal ? nKey : nLocal;
++    if( n>OVERFLOW_SIZE ){
++      n = OVERFLOW_SIZE;
++    }
++    c = memcmp(pOvfl->aPayload, zKey, n);
++    sqlitepager_unref(pOvfl);
++    if( c!=0 ){
++      *pResult = c;
++      return SQLITE_OK;
++    }
++    nKey -= n;
++    nLocal -= n;
++    zKey += n;
++  }
++  if( c==0 ){
++    c = nLocal - nKey;
++  }
++  *pResult = c;
++  return SQLITE_OK;
++}
++
++/*
++** Move the cursor down to a new child page.  The newPgno argument is the
++** page number of the child page in the byte order of the disk image.
++*/
++static int moveToChild(BtCursor *pCur, int newPgno){
++  int rc;
++  MemPage *pNewPage;
++  Btree *pBt = pCur->pBt;
++
++  newPgno = SWAB32(pBt, newPgno);
++  rc = sqlitepager_get(pBt->pPager, newPgno, (void**)&pNewPage);
++  if( rc ) return rc;
++  rc = initPage(pBt, pNewPage, newPgno, pCur->pPage);
++  if( rc ) return rc;
++  assert( pCur->idx>=pCur->pPage->nCell
++          || pCur->pPage->apCell[pCur->idx]->h.leftChild==SWAB32(pBt,newPgno) );
++  assert( pCur->idx<pCur->pPage->nCell
++          || pCur->pPage->u.hdr.rightChild==SWAB32(pBt,newPgno) );
++  pNewPage->idxParent = pCur->idx;
++  pCur->pPage->idxShift = 0;
++  sqlitepager_unref(pCur->pPage);
++  pCur->pPage = pNewPage;
++  pCur->idx = 0;
++  if( pNewPage->nCell<1 ){
++    return SQLITE_CORRUPT;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Move the cursor up to the parent page.
++**
++** pCur->idx is set to the cell index that contains the pointer
++** to the page we are coming from.  If we are coming from the
++** right-most child page then pCur->idx is set to one more than
++** the largest cell index.
++*/
++static void moveToParent(BtCursor *pCur){
++  Pgno oldPgno;
++  MemPage *pParent;
++  MemPage *pPage;
++  int idxParent;
++  pPage = pCur->pPage;
++  assert( pPage!=0 );
++  pParent = pPage->pParent;
++  assert( pParent!=0 );
++  idxParent = pPage->idxParent;
++  sqlitepager_ref(pParent);
++  sqlitepager_unref(pPage);
++  pCur->pPage = pParent;
++  assert( pParent->idxShift==0 );
++  if( pParent->idxShift==0 ){
++    pCur->idx = idxParent;
++#ifndef NDEBUG  
++    /* Verify that pCur->idx is the correct index to point back to the child
++    ** page we just came from 
++    */
++    oldPgno = SWAB32(pCur->pBt, sqlitepager_pagenumber(pPage));
++    if( pCur->idx<pParent->nCell ){
++      assert( pParent->apCell[idxParent]->h.leftChild==oldPgno );
++    }else{
++      assert( pParent->u.hdr.rightChild==oldPgno );
++    }
++#endif
++  }else{
++    /* The MemPage.idxShift flag indicates that cell indices might have 
++    ** changed since idxParent was set and hence idxParent might be out
++    ** of date.  So recompute the parent cell index by scanning all cells
++    ** and locating the one that points to the child we just came from.
++    */
++    int i;
++    pCur->idx = pParent->nCell;
++    oldPgno = SWAB32(pCur->pBt, sqlitepager_pagenumber(pPage));
++    for(i=0; i<pParent->nCell; i++){
++      if( pParent->apCell[i]->h.leftChild==oldPgno ){
++        pCur->idx = i;
++        break;
++      }
++    }
++  }
++}
++
++/*
++** Move the cursor to the root page
++*/
++static int moveToRoot(BtCursor *pCur){
++  MemPage *pNew;
++  int rc;
++  Btree *pBt = pCur->pBt;
++
++  rc = sqlitepager_get(pBt->pPager, pCur->pgnoRoot, (void**)&pNew);
++  if( rc ) return rc;
++  rc = initPage(pBt, pNew, pCur->pgnoRoot, 0);
++  if( rc ) return rc;
++  sqlitepager_unref(pCur->pPage);
++  pCur->pPage = pNew;
++  pCur->idx = 0;
++  return SQLITE_OK;
++}
++
++/*
++** Move the cursor down to the left-most leaf entry beneath the
++** entry to which it is currently pointing.
++*/
++static int moveToLeftmost(BtCursor *pCur){
++  Pgno pgno;
++  int rc;
++
++  while( (pgno = pCur->pPage->apCell[pCur->idx]->h.leftChild)!=0 ){
++    rc = moveToChild(pCur, pgno);
++    if( rc ) return rc;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Move the cursor down to the right-most leaf entry beneath the
++** page to which it is currently pointing.  Notice the difference
++** between moveToLeftmost() and moveToRightmost().  moveToLeftmost()
++** finds the left-most entry beneath the *entry* whereas moveToRightmost()
++** finds the right-most entry beneath the *page*.
++*/
++static int moveToRightmost(BtCursor *pCur){
++  Pgno pgno;
++  int rc;
++
++  while( (pgno = pCur->pPage->u.hdr.rightChild)!=0 ){
++    pCur->idx = pCur->pPage->nCell;
++    rc = moveToChild(pCur, pgno);
++    if( rc ) return rc;
++  }
++  pCur->idx = pCur->pPage->nCell - 1;
++  return SQLITE_OK;
++}
++
++/* Move the cursor to the first entry in the table.  Return SQLITE_OK
++** on success.  Set *pRes to 0 if the cursor actually points to something
++** or set *pRes to 1 if the table is empty.
++*/
++static int fileBtreeFirst(BtCursor *pCur, int *pRes){
++  int rc;
++  if( pCur->pPage==0 ) return SQLITE_ABORT;
++  rc = moveToRoot(pCur);
++  if( rc ) return rc;
++  if( pCur->pPage->nCell==0 ){
++    *pRes = 1;
++    return SQLITE_OK;
++  }
++  *pRes = 0;
++  rc = moveToLeftmost(pCur);
++  pCur->eSkip = SKIP_NONE;
++  return rc;
++}
++
++/* Move the cursor to the last entry in the table.  Return SQLITE_OK
++** on success.  Set *pRes to 0 if the cursor actually points to something
++** or set *pRes to 1 if the table is empty.
++*/
++static int fileBtreeLast(BtCursor *pCur, int *pRes){
++  int rc;
++  if( pCur->pPage==0 ) return SQLITE_ABORT;
++  rc = moveToRoot(pCur);
++  if( rc ) return rc;
++  assert( pCur->pPage->isInit );
++  if( pCur->pPage->nCell==0 ){
++    *pRes = 1;
++    return SQLITE_OK;
++  }
++  *pRes = 0;
++  rc = moveToRightmost(pCur);
++  pCur->eSkip = SKIP_NONE;
++  return rc;
++}
++
++/* Move the cursor so that it points to an entry near pKey.
++** Return a success code.
++**
++** If an exact match is not found, then the cursor is always
++** left pointing at a leaf page which would hold the entry if it
++** were present.  The cursor might point to an entry that comes
++** before or after the key.
++**
++** The result of comparing the key with the entry to which the
++** cursor is left pointing is stored in pCur->iMatch.  The same
++** value is also written to *pRes if pRes!=NULL.  The meaning of
++** this value is as follows:
++**
++**     *pRes<0      The cursor is left pointing at an entry that
++**                  is smaller than pKey or if the table is empty
++**                  and the cursor is therefore left point to nothing.
++**
++**     *pRes==0     The cursor is left pointing at an entry that
++**                  exactly matches pKey.
++**
++**     *pRes>0      The cursor is left pointing at an entry that
++**                  is larger than pKey.
++*/
++static
++int fileBtreeMoveto(BtCursor *pCur, const void *pKey, int nKey, int *pRes){
++  int rc;
++  if( pCur->pPage==0 ) return SQLITE_ABORT;
++  pCur->eSkip = SKIP_NONE;
++  rc = moveToRoot(pCur);
++  if( rc ) return rc;
++  for(;;){
++    int lwr, upr;
++    Pgno chldPg;
++    MemPage *pPage = pCur->pPage;
++    int c = -1;  /* pRes return if table is empty must be -1 */
++    lwr = 0;
++    upr = pPage->nCell-1;
++    while( lwr<=upr ){
++      pCur->idx = (lwr+upr)/2;
++      rc = fileBtreeKeyCompare(pCur, pKey, nKey, 0, &c);
++      if( rc ) return rc;
++      if( c==0 ){
++        pCur->iMatch = c;
++        if( pRes ) *pRes = 0;
++        return SQLITE_OK;
++      }
++      if( c<0 ){
++        lwr = pCur->idx+1;
++      }else{
++        upr = pCur->idx-1;
++      }
++    }
++    assert( lwr==upr+1 );
++    assert( pPage->isInit );
++    if( lwr>=pPage->nCell ){
++      chldPg = pPage->u.hdr.rightChild;
++    }else{
++      chldPg = pPage->apCell[lwr]->h.leftChild;
++    }
++    if( chldPg==0 ){
++      pCur->iMatch = c;
++      if( pRes ) *pRes = c;
++      return SQLITE_OK;
++    }
++    pCur->idx = lwr;
++    rc = moveToChild(pCur, chldPg);
++    if( rc ) return rc;
++  }
++  /* NOT REACHED */
++}
++
++/*
++** Advance the cursor to the next entry in the database.  If
++** successful then set *pRes=0.  If the cursor
++** was already pointing to the last entry in the database before
++** this routine was called, then set *pRes=1.
++*/
++static int fileBtreeNext(BtCursor *pCur, int *pRes){
++  int rc;
++  MemPage *pPage = pCur->pPage;
++  assert( pRes!=0 );
++  if( pPage==0 ){
++    *pRes = 1;
++    return SQLITE_ABORT;
++  }
++  assert( pPage->isInit );
++  assert( pCur->eSkip!=SKIP_INVALID );
++  if( pPage->nCell==0 ){
++    *pRes = 1;
++    return SQLITE_OK;
++  }
++  assert( pCur->idx<pPage->nCell );
++  if( pCur->eSkip==SKIP_NEXT ){
++    pCur->eSkip = SKIP_NONE;
++    *pRes = 0;
++    return SQLITE_OK;
++  }
++  pCur->eSkip = SKIP_NONE;
++  pCur->idx++;
++  if( pCur->idx>=pPage->nCell ){
++    if( pPage->u.hdr.rightChild ){
++      rc = moveToChild(pCur, pPage->u.hdr.rightChild);
++      if( rc ) return rc;
++      rc = moveToLeftmost(pCur);
++      *pRes = 0;
++      return rc;
++    }
++    do{
++      if( pPage->pParent==0 ){
++        *pRes = 1;
++        return SQLITE_OK;
++      }
++      moveToParent(pCur);
++      pPage = pCur->pPage;
++    }while( pCur->idx>=pPage->nCell );
++    *pRes = 0;
++    return SQLITE_OK;
++  }
++  *pRes = 0;
++  if( pPage->u.hdr.rightChild==0 ){
++    return SQLITE_OK;
++  }
++  rc = moveToLeftmost(pCur);
++  return rc;
++}
++
++/*
++** Step the cursor to the back to the previous entry in the database.  If
++** successful then set *pRes=0.  If the cursor
++** was already pointing to the first entry in the database before
++** this routine was called, then set *pRes=1.
++*/
++static int fileBtreePrevious(BtCursor *pCur, int *pRes){
++  int rc;
++  Pgno pgno;
++  MemPage *pPage;
++  pPage = pCur->pPage;
++  if( pPage==0 ){
++    *pRes = 1;
++    return SQLITE_ABORT;
++  }
++  assert( pPage->isInit );
++  assert( pCur->eSkip!=SKIP_INVALID );
++  if( pPage->nCell==0 ){
++    *pRes = 1;
++    return SQLITE_OK;
++  }
++  if( pCur->eSkip==SKIP_PREV ){
++    pCur->eSkip = SKIP_NONE;
++    *pRes = 0;
++    return SQLITE_OK;
++  }
++  pCur->eSkip = SKIP_NONE;
++  assert( pCur->idx>=0 );
++  if( (pgno = pPage->apCell[pCur->idx]->h.leftChild)!=0 ){
++    rc = moveToChild(pCur, pgno);
++    if( rc ) return rc;
++    rc = moveToRightmost(pCur);
++  }else{
++    while( pCur->idx==0 ){
++      if( pPage->pParent==0 ){
++        if( pRes ) *pRes = 1;
++        return SQLITE_OK;
++      }
++      moveToParent(pCur);
++      pPage = pCur->pPage;
++    }
++    pCur->idx--;
++    rc = SQLITE_OK;
++  }
++  *pRes = 0;
++  return rc;
++}
++
++/*
++** Allocate a new page from the database file.
++**
++** The new page is marked as dirty.  (In other words, sqlitepager_write()
++** has already been called on the new page.)  The new page has also
++** been referenced and the calling routine is responsible for calling
++** sqlitepager_unref() on the new page when it is done.
++**
++** SQLITE_OK is returned on success.  Any other return value indicates
++** an error.  *ppPage and *pPgno are undefined in the event of an error.
++** Do not invoke sqlitepager_unref() on *ppPage if an error is returned.
++**
++** If the "nearby" parameter is not 0, then a (feeble) effort is made to 
++** locate a page close to the page number "nearby".  This can be used in an
++** attempt to keep related pages close to each other in the database file,
++** which in turn can make database access faster.
++*/
++static int allocatePage(Btree *pBt, MemPage **ppPage, Pgno *pPgno, Pgno nearby){
++  PageOne *pPage1 = pBt->page1;
++  int rc;
++  if( pPage1->freeList ){
++    OverflowPage *pOvfl;
++    FreelistInfo *pInfo;
++
++    rc = sqlitepager_write(pPage1);
++    if( rc ) return rc;
++    SWAB_ADD(pBt, pPage1->nFree, -1);
++    rc = sqlitepager_get(pBt->pPager, SWAB32(pBt, pPage1->freeList),
++                        (void**)&pOvfl);
++    if( rc ) return rc;
++    rc = sqlitepager_write(pOvfl);
++    if( rc ){
++      sqlitepager_unref(pOvfl);
++      return rc;
++    }
++    pInfo = (FreelistInfo*)pOvfl->aPayload;
++    if( pInfo->nFree==0 ){
++      *pPgno = SWAB32(pBt, pPage1->freeList);
++      pPage1->freeList = pOvfl->iNext;
++      *ppPage = (MemPage*)pOvfl;
++    }else{
++      int closest, n;
++      n = SWAB32(pBt, pInfo->nFree);
++      if( n>1 && nearby>0 ){
++        int i, dist;
++        closest = 0;
++        dist = SWAB32(pBt, pInfo->aFree[0]) - nearby;
++        if( dist<0 ) dist = -dist;
++        for(i=1; i<n; i++){
++          int d2 = SWAB32(pBt, pInfo->aFree[i]) - nearby;
++          if( d2<0 ) d2 = -d2;
++          if( d2<dist ) closest = i;
++        }
++      }else{
++        closest = 0;
++      }
++      SWAB_ADD(pBt, pInfo->nFree, -1);
++      *pPgno = SWAB32(pBt, pInfo->aFree[closest]);
++      pInfo->aFree[closest] = pInfo->aFree[n-1];
++      rc = sqlitepager_get(pBt->pPager, *pPgno, (void**)ppPage);
++      sqlitepager_unref(pOvfl);
++      if( rc==SQLITE_OK ){
++        sqlitepager_dont_rollback(*ppPage);
++        rc = sqlitepager_write(*ppPage);
++      }
++    }
++  }else{
++    *pPgno = sqlitepager_pagecount(pBt->pPager) + 1;
++    rc = sqlitepager_get(pBt->pPager, *pPgno, (void**)ppPage);
++    if( rc ) return rc;
++    rc = sqlitepager_write(*ppPage);
++  }
++  return rc;
++}
++
++/*
++** Add a page of the database file to the freelist.  Either pgno or
++** pPage but not both may be 0. 
++**
++** sqlitepager_unref() is NOT called for pPage.
++*/
++static int freePage(Btree *pBt, void *pPage, Pgno pgno){
++  PageOne *pPage1 = pBt->page1;
++  OverflowPage *pOvfl = (OverflowPage*)pPage;
++  int rc;
++  int needUnref = 0;
++  MemPage *pMemPage;
++
++  if( pgno==0 ){
++    assert( pOvfl!=0 );
++    pgno = sqlitepager_pagenumber(pOvfl);
++  }
++  assert( pgno>2 );
++  assert( sqlitepager_pagenumber(pOvfl)==pgno );
++  pMemPage = (MemPage*)pPage;
++  pMemPage->isInit = 0;
++  if( pMemPage->pParent ){
++    sqlitepager_unref(pMemPage->pParent);
++    pMemPage->pParent = 0;
++  }
++  rc = sqlitepager_write(pPage1);
++  if( rc ){
++    return rc;
++  }
++  SWAB_ADD(pBt, pPage1->nFree, 1);
++  if( pPage1->nFree!=0 && pPage1->freeList!=0 ){
++    OverflowPage *pFreeIdx;
++    rc = sqlitepager_get(pBt->pPager, SWAB32(pBt, pPage1->freeList),
++                        (void**)&pFreeIdx);
++    if( rc==SQLITE_OK ){
++      FreelistInfo *pInfo = (FreelistInfo*)pFreeIdx->aPayload;
++      int n = SWAB32(pBt, pInfo->nFree);
++      if( n<(sizeof(pInfo->aFree)/sizeof(pInfo->aFree[0])) ){
++        rc = sqlitepager_write(pFreeIdx);
++        if( rc==SQLITE_OK ){
++          pInfo->aFree[n] = SWAB32(pBt, pgno);
++          SWAB_ADD(pBt, pInfo->nFree, 1);
++          sqlitepager_unref(pFreeIdx);
++          sqlitepager_dont_write(pBt->pPager, pgno);
++          return rc;
++        }
++      }
++      sqlitepager_unref(pFreeIdx);
++    }
++  }
++  if( pOvfl==0 ){
++    assert( pgno>0 );
++    rc = sqlitepager_get(pBt->pPager, pgno, (void**)&pOvfl);
++    if( rc ) return rc;
++    needUnref = 1;
++  }
++  rc = sqlitepager_write(pOvfl);
++  if( rc ){
++    if( needUnref ) sqlitepager_unref(pOvfl);
++    return rc;
++  }
++  pOvfl->iNext = pPage1->freeList;
++  pPage1->freeList = SWAB32(pBt, pgno);
++  memset(pOvfl->aPayload, 0, OVERFLOW_SIZE);
++  if( needUnref ) rc = sqlitepager_unref(pOvfl);
++  return rc;
++}
++
++/*
++** Erase all the data out of a cell.  This involves returning overflow
++** pages back the freelist.
++*/
++static int clearCell(Btree *pBt, Cell *pCell){
++  Pager *pPager = pBt->pPager;
++  OverflowPage *pOvfl;
++  Pgno ovfl, nextOvfl;
++  int rc;
++
++  if( NKEY(pBt, pCell->h) + NDATA(pBt, pCell->h) <= MX_LOCAL_PAYLOAD ){
++    return SQLITE_OK;
++  }
++  ovfl = SWAB32(pBt, pCell->ovfl);
++  pCell->ovfl = 0;
++  while( ovfl ){
++    rc = sqlitepager_get(pPager, ovfl, (void**)&pOvfl);
++    if( rc ) return rc;
++    nextOvfl = SWAB32(pBt, pOvfl->iNext);
++    rc = freePage(pBt, pOvfl, ovfl);
++    if( rc ) return rc;
++    sqlitepager_unref(pOvfl);
++    ovfl = nextOvfl;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Create a new cell from key and data.  Overflow pages are allocated as
++** necessary and linked to this cell.  
++*/
++static int fillInCell(
++  Btree *pBt,              /* The whole Btree.  Needed to allocate pages */
++  Cell *pCell,             /* Populate this Cell structure */
++  const void *pKey, int nKey,    /* The key */
++  const void *pData,int nData    /* The data */
++){
++  OverflowPage *pOvfl, *pPrior;
++  Pgno *pNext;
++  int spaceLeft;
++  int n, rc;
++  int nPayload;
++  const char *pPayload;
++  char *pSpace;
++  Pgno nearby = 0;
++
++  pCell->h.leftChild = 0;
++  pCell->h.nKey = SWAB16(pBt, nKey & 0xffff);
++  pCell->h.nKeyHi = nKey >> 16;
++  pCell->h.nData = SWAB16(pBt, nData & 0xffff);
++  pCell->h.nDataHi = nData >> 16;
++  pCell->h.iNext = 0;
++
++  pNext = &pCell->ovfl;
++  pSpace = pCell->aPayload;
++  spaceLeft = MX_LOCAL_PAYLOAD;
++  pPayload = pKey;
++  pKey = 0;
++  nPayload = nKey;
++  pPrior = 0;
++  while( nPayload>0 ){
++    if( spaceLeft==0 ){
++      rc = allocatePage(pBt, (MemPage**)&pOvfl, pNext, nearby);
++      if( rc ){
++        *pNext = 0;
++      }else{
++        nearby = *pNext;
++      }
++      if( pPrior ) sqlitepager_unref(pPrior);
++      if( rc ){
++        clearCell(pBt, pCell);
++        return rc;
++      }
++      if( pBt->needSwab ) *pNext = swab32(*pNext);
++      pPrior = pOvfl;
++      spaceLeft = OVERFLOW_SIZE;
++      pSpace = pOvfl->aPayload;
++      pNext = &pOvfl->iNext;
++    }
++    n = nPayload;
++    if( n>spaceLeft ) n = spaceLeft;
++    memcpy(pSpace, pPayload, n);
++    nPayload -= n;
++    if( nPayload==0 && pData ){
++      pPayload = pData;
++      nPayload = nData;
++      pData = 0;
++    }else{
++      pPayload += n;
++    }
++    spaceLeft -= n;
++    pSpace += n;
++  }
++  *pNext = 0;
++  if( pPrior ){
++    sqlitepager_unref(pPrior);
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Change the MemPage.pParent pointer on the page whose number is
++** given in the second argument so that MemPage.pParent holds the
++** pointer in the third argument.
++*/
++static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){
++  MemPage *pThis;
++
++  if( pgno==0 ) return;
++  assert( pPager!=0 );
++  pThis = sqlitepager_lookup(pPager, pgno);
++  if( pThis && pThis->isInit ){
++    if( pThis->pParent!=pNewParent ){
++      if( pThis->pParent ) sqlitepager_unref(pThis->pParent);
++      pThis->pParent = pNewParent;
++      if( pNewParent ) sqlitepager_ref(pNewParent);
++    }
++    pThis->idxParent = idx;
++    sqlitepager_unref(pThis);
++  }
++}
++
++/*
++** Reparent all children of the given page to be the given page.
++** In other words, for every child of pPage, invoke reparentPage()
++** to make sure that each child knows that pPage is its parent.
++**
++** This routine gets called after you memcpy() one page into
++** another.
++*/
++static void reparentChildPages(Btree *pBt, MemPage *pPage){
++  int i;
++  Pager *pPager = pBt->pPager;
++  for(i=0; i<pPage->nCell; i++){
++    reparentPage(pPager, SWAB32(pBt, pPage->apCell[i]->h.leftChild), pPage, i);
++  }
++  reparentPage(pPager, SWAB32(pBt, pPage->u.hdr.rightChild), pPage, i);
++  pPage->idxShift = 0;
++}
++
++/*
++** Remove the i-th cell from pPage.  This routine effects pPage only.
++** The cell content is not freed or deallocated.  It is assumed that
++** the cell content has been copied someplace else.  This routine just
++** removes the reference to the cell from pPage.
++**
++** "sz" must be the number of bytes in the cell.
++**
++** Do not bother maintaining the integrity of the linked list of Cells.
++** Only the pPage->apCell[] array is important.  The relinkCellList() 
++** routine will be called soon after this routine in order to rebuild 
++** the linked list.
++*/
++static void dropCell(Btree *pBt, MemPage *pPage, int idx, int sz){
++  int j;
++  assert( idx>=0 && idx<pPage->nCell );
++  assert( sz==cellSize(pBt, pPage->apCell[idx]) );
++  assert( sqlitepager_iswriteable(pPage) );
++  freeSpace(pBt, pPage, Addr(pPage->apCell[idx]) - Addr(pPage), sz);
++  for(j=idx; j<pPage->nCell-1; j++){
++    pPage->apCell[j] = pPage->apCell[j+1];
++  }
++  pPage->nCell--;
++  pPage->idxShift = 1;
++}
++
++/*
++** Insert a new cell on pPage at cell index "i".  pCell points to the
++** content of the cell.
++**
++** If the cell content will fit on the page, then put it there.  If it
++** will not fit, then just make pPage->apCell[i] point to the content
++** and set pPage->isOverfull.  
++**
++** Do not bother maintaining the integrity of the linked list of Cells.
++** Only the pPage->apCell[] array is important.  The relinkCellList() 
++** routine will be called soon after this routine in order to rebuild 
++** the linked list.
++*/
++static void insertCell(Btree *pBt, MemPage *pPage, int i, Cell *pCell, int sz){
++  int idx, j;
++  assert( i>=0 && i<=pPage->nCell );
++  assert( sz==cellSize(pBt, pCell) );
++  assert( sqlitepager_iswriteable(pPage) );
++  idx = allocateSpace(pBt, pPage, sz);
++  for(j=pPage->nCell; j>i; j--){
++    pPage->apCell[j] = pPage->apCell[j-1];
++  }
++  pPage->nCell++;
++  if( idx<=0 ){
++    pPage->isOverfull = 1;
++    pPage->apCell[i] = pCell;
++  }else{
++    memcpy(&pPage->u.aDisk[idx], pCell, sz);
++    pPage->apCell[i] = (Cell*)&pPage->u.aDisk[idx];
++  }
++  pPage->idxShift = 1;
++}
++
++/*
++** Rebuild the linked list of cells on a page so that the cells
++** occur in the order specified by the pPage->apCell[] array.  
++** Invoke this routine once to repair damage after one or more
++** invocations of either insertCell() or dropCell().
++*/
++static void relinkCellList(Btree *pBt, MemPage *pPage){
++  int i;
++  u16 *pIdx;
++  assert( sqlitepager_iswriteable(pPage) );
++  pIdx = &pPage->u.hdr.firstCell;
++  for(i=0; i<pPage->nCell; i++){
++    int idx = Addr(pPage->apCell[i]) - Addr(pPage);
++    assert( idx>0 && idx<SQLITE_USABLE_SIZE );
++    *pIdx = SWAB16(pBt, idx);
++    pIdx = &pPage->apCell[i]->h.iNext;
++  }
++  *pIdx = 0;
++}
++
++/*
++** Make a copy of the contents of pFrom into pTo.  The pFrom->apCell[]
++** pointers that point into pFrom->u.aDisk[] must be adjusted to point
++** into pTo->u.aDisk[] instead.  But some pFrom->apCell[] entries might
++** not point to pFrom->u.aDisk[].  Those are unchanged.
++*/
++static void copyPage(MemPage *pTo, MemPage *pFrom){
++  uptr from, to;
++  int i;
++  memcpy(pTo->u.aDisk, pFrom->u.aDisk, SQLITE_USABLE_SIZE);
++  pTo->pParent = 0;
++  pTo->isInit = 1;
++  pTo->nCell = pFrom->nCell;
++  pTo->nFree = pFrom->nFree;
++  pTo->isOverfull = pFrom->isOverfull;
++  to = Addr(pTo);
++  from = Addr(pFrom);
++  for(i=0; i<pTo->nCell; i++){
++    uptr x = Addr(pFrom->apCell[i]);
++    if( x>from && x<from+SQLITE_USABLE_SIZE ){
++      *((uptr*)&pTo->apCell[i]) = x + to - from;
++    }else{
++      pTo->apCell[i] = pFrom->apCell[i];
++    }
++  }
++}
++
++/*
++** The following parameters determine how many adjacent pages get involved
++** in a balancing operation.  NN is the number of neighbors on either side
++** of the page that participate in the balancing operation.  NB is the
++** total number of pages that participate, including the target page and
++** NN neighbors on either side.
++**
++** The minimum value of NN is 1 (of course).  Increasing NN above 1
++** (to 2 or 3) gives a modest improvement in SELECT and DELETE performance
++** in exchange for a larger degradation in INSERT and UPDATE performance.
++** The value of NN appears to give the best results overall.
++*/
++#define NN 1             /* Number of neighbors on either side of pPage */
++#define NB (NN*2+1)      /* Total pages involved in the balance */
++
++/*
++** This routine redistributes Cells on pPage and up to two siblings
++** of pPage so that all pages have about the same amount of free space.
++** Usually one sibling on either side of pPage is used in the balancing,
++** though both siblings might come from one side if pPage is the first
++** or last child of its parent.  If pPage has fewer than two siblings
++** (something which can only happen if pPage is the root page or a 
++** child of root) then all available siblings participate in the balancing.
++**
++** The number of siblings of pPage might be increased or decreased by
++** one in an effort to keep pages between 66% and 100% full. The root page
++** is special and is allowed to be less than 66% full. If pPage is 
++** the root page, then the depth of the tree might be increased
++** or decreased by one, as necessary, to keep the root page from being
++** overfull or empty.
++**
++** This routine calls relinkCellList() on its input page regardless of
++** whether or not it does any real balancing.  Client routines will typically
++** invoke insertCell() or dropCell() before calling this routine, so we
++** need to call relinkCellList() to clean up the mess that those other
++** routines left behind.
++**
++** pCur is left pointing to the same cell as when this routine was called
++** even if that cell gets moved to a different page.  pCur may be NULL.
++** Set the pCur parameter to NULL if you do not care about keeping track
++** of a cell as that will save this routine the work of keeping track of it.
++**
++** Note that when this routine is called, some of the Cells on pPage
++** might not actually be stored in pPage->u.aDisk[].  This can happen
++** if the page is overfull.  Part of the job of this routine is to
++** make sure all Cells for pPage once again fit in pPage->u.aDisk[].
++**
++** In the course of balancing the siblings of pPage, the parent of pPage
++** might become overfull or underfull.  If that happens, then this routine
++** is called recursively on the parent.
++**
++** If this routine fails for any reason, it might leave the database
++** in a corrupted state.  So if this routine fails, the database should
++** be rolled back.
++*/
++static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){
++  MemPage *pParent;            /* The parent of pPage */
++  int nCell;                   /* Number of cells in apCell[] */
++  int nOld;                    /* Number of pages in apOld[] */
++  int nNew;                    /* Number of pages in apNew[] */
++  int nDiv;                    /* Number of cells in apDiv[] */
++  int i, j, k;                 /* Loop counters */
++  int idx;                     /* Index of pPage in pParent->apCell[] */
++  int nxDiv;                   /* Next divider slot in pParent->apCell[] */
++  int rc;                      /* The return code */
++  int iCur;                    /* apCell[iCur] is the cell of the cursor */
++  MemPage *pOldCurPage;        /* The cursor originally points to this page */
++  int subtotal;                /* Subtotal of bytes in cells on one page */
++  MemPage *extraUnref = 0;     /* A page that needs to be unref-ed */
++  MemPage *apOld[NB];          /* pPage and up to two siblings */
++  Pgno pgnoOld[NB];            /* Page numbers for each page in apOld[] */
++  MemPage *apNew[NB+1];        /* pPage and up to NB siblings after balancing */
++  Pgno pgnoNew[NB+1];          /* Page numbers for each page in apNew[] */
++  int idxDiv[NB];              /* Indices of divider cells in pParent */
++  Cell *apDiv[NB];             /* Divider cells in pParent */
++  Cell aTemp[NB];              /* Temporary holding area for apDiv[] */
++  int cntNew[NB+1];            /* Index in apCell[] of cell after i-th page */
++  int szNew[NB+1];             /* Combined size of cells place on i-th page */
++  MemPage aOld[NB];            /* Temporary copies of pPage and its siblings */
++  Cell *apCell[(MX_CELL+2)*NB]; /* All cells from pages being balanced */
++  int szCell[(MX_CELL+2)*NB];  /* Local size of all cells */
++
++  /* 
++  ** Return without doing any work if pPage is neither overfull nor
++  ** underfull.
++  */
++  assert( sqlitepager_iswriteable(pPage) );
++  if( !pPage->isOverfull && pPage->nFree<SQLITE_USABLE_SIZE/2 
++        && pPage->nCell>=2){
++    relinkCellList(pBt, pPage);
++    return SQLITE_OK;
++  }
++
++  /*
++  ** Find the parent of the page to be balanceed.
++  ** If there is no parent, it means this page is the root page and
++  ** special rules apply.
++  */
++  pParent = pPage->pParent;
++  if( pParent==0 ){
++    Pgno pgnoChild;
++    MemPage *pChild;
++    assert( pPage->isInit );
++    if( pPage->nCell==0 ){
++      if( pPage->u.hdr.rightChild ){
++        /*
++        ** The root page is empty.  Copy the one child page
++        ** into the root page and return.  This reduces the depth
++        ** of the BTree by one.
++        */
++        pgnoChild = SWAB32(pBt, pPage->u.hdr.rightChild);
++        rc = sqlitepager_get(pBt->pPager, pgnoChild, (void**)&pChild);
++        if( rc ) return rc;
++        memcpy(pPage, pChild, SQLITE_USABLE_SIZE);
++        pPage->isInit = 0;
++        rc = initPage(pBt, pPage, sqlitepager_pagenumber(pPage), 0);
++        assert( rc==SQLITE_OK );
++        reparentChildPages(pBt, pPage);
++        if( pCur && pCur->pPage==pChild ){
++          sqlitepager_unref(pChild);
++          pCur->pPage = pPage;
++          sqlitepager_ref(pPage);
++        }
++        freePage(pBt, pChild, pgnoChild);
++        sqlitepager_unref(pChild);
++      }else{
++        relinkCellList(pBt, pPage);
++      }
++      return SQLITE_OK;
++    }
++    if( !pPage->isOverfull ){
++      /* It is OK for the root page to be less than half full.
++      */
++      relinkCellList(pBt, pPage);
++      return SQLITE_OK;
++    }
++    /*
++    ** If we get to here, it means the root page is overfull.
++    ** When this happens, Create a new child page and copy the
++    ** contents of the root into the child.  Then make the root
++    ** page an empty page with rightChild pointing to the new
++    ** child.  Then fall thru to the code below which will cause
++    ** the overfull child page to be split.
++    */
++    rc = sqlitepager_write(pPage);
++    if( rc ) return rc;
++    rc = allocatePage(pBt, &pChild, &pgnoChild, sqlitepager_pagenumber(pPage));
++    if( rc ) return rc;
++    assert( sqlitepager_iswriteable(pChild) );
++    copyPage(pChild, pPage);
++    pChild->pParent = pPage;
++    pChild->idxParent = 0;
++    sqlitepager_ref(pPage);
++    pChild->isOverfull = 1;
++    if( pCur && pCur->pPage==pPage ){
++      sqlitepager_unref(pPage);
++      pCur->pPage = pChild;
++    }else{
++      extraUnref = pChild;
++    }
++    zeroPage(pBt, pPage);
++    pPage->u.hdr.rightChild = SWAB32(pBt, pgnoChild);
++    pParent = pPage;
++    pPage = pChild;
++  }
++  rc = sqlitepager_write(pParent);
++  if( rc ) return rc;
++  assert( pParent->isInit );
++  
++  /*
++  ** Find the Cell in the parent page whose h.leftChild points back
++  ** to pPage.  The "idx" variable is the index of that cell.  If pPage
++  ** is the rightmost child of pParent then set idx to pParent->nCell 
++  */
++  if( pParent->idxShift ){
++    Pgno pgno, swabPgno;
++    pgno = sqlitepager_pagenumber(pPage);
++    swabPgno = SWAB32(pBt, pgno);
++    for(idx=0; idx<pParent->nCell; idx++){
++      if( pParent->apCell[idx]->h.leftChild==swabPgno ){
++        break;
++      }
++    }
++    assert( idx<pParent->nCell || pParent->u.hdr.rightChild==swabPgno );
++  }else{
++    idx = pPage->idxParent;
++  }
++
++  /*
++  ** Initialize variables so that it will be safe to jump
++  ** directly to balance_cleanup at any moment.
++  */
++  nOld = nNew = 0;
++  sqlitepager_ref(pParent);
++
++  /*
++  ** Find sibling pages to pPage and the Cells in pParent that divide
++  ** the siblings.  An attempt is made to find NN siblings on either
++  ** side of pPage.  More siblings are taken from one side, however, if
++  ** pPage there are fewer than NN siblings on the other side.  If pParent
++  ** has NB or fewer children then all children of pParent are taken.
++  */
++  nxDiv = idx - NN;
++  if( nxDiv + NB > pParent->nCell ){
++    nxDiv = pParent->nCell - NB + 1;
++  }
++  if( nxDiv<0 ){
++    nxDiv = 0;
++  }
++  nDiv = 0;
++  for(i=0, k=nxDiv; i<NB; i++, k++){
++    if( k<pParent->nCell ){
++      idxDiv[i] = k;
++      apDiv[i] = pParent->apCell[k];
++      nDiv++;
++      pgnoOld[i] = SWAB32(pBt, apDiv[i]->h.leftChild);
++    }else if( k==pParent->nCell ){
++      pgnoOld[i] = SWAB32(pBt, pParent->u.hdr.rightChild);
++    }else{
++      break;
++    }
++    rc = sqlitepager_get(pBt->pPager, pgnoOld[i], (void**)&apOld[i]);
++    if( rc ) goto balance_cleanup;
++    rc = initPage(pBt, apOld[i], pgnoOld[i], pParent);
++    if( rc ) goto balance_cleanup;
++    apOld[i]->idxParent = k;
++    nOld++;
++  }
++
++  /*
++  ** Set iCur to be the index in apCell[] of the cell that the cursor
++  ** is pointing to.  We will need this later on in order to keep the
++  ** cursor pointing at the same cell.  If pCur points to a page that
++  ** has no involvement with this rebalancing, then set iCur to a large
++  ** number so that the iCur==j tests always fail in the main cell
++  ** distribution loop below.
++  */
++  if( pCur ){
++    iCur = 0;
++    for(i=0; i<nOld; i++){
++      if( pCur->pPage==apOld[i] ){
++        iCur += pCur->idx;
++        break;
++      }
++      iCur += apOld[i]->nCell;
++      if( i<nOld-1 && pCur->pPage==pParent && pCur->idx==idxDiv[i] ){
++        break;
++      }
++      iCur++;
++    }
++    pOldCurPage = pCur->pPage;
++  }
++
++  /*
++  ** Make copies of the content of pPage and its siblings into aOld[].
++  ** The rest of this function will use data from the copies rather
++  ** that the original pages since the original pages will be in the
++  ** process of being overwritten.
++  */
++  for(i=0; i<nOld; i++){
++    copyPage(&aOld[i], apOld[i]);
++  }
++
++  /*
++  ** Load pointers to all cells on sibling pages and the divider cells
++  ** into the local apCell[] array.  Make copies of the divider cells
++  ** into aTemp[] and remove the the divider Cells from pParent.
++  */
++  nCell = 0;
++  for(i=0; i<nOld; i++){
++    MemPage *pOld = &aOld[i];
++    for(j=0; j<pOld->nCell; j++){
++      apCell[nCell] = pOld->apCell[j];
++      szCell[nCell] = cellSize(pBt, apCell[nCell]);
++      nCell++;
++    }
++    if( i<nOld-1 ){
++      szCell[nCell] = cellSize(pBt, apDiv[i]);
++      memcpy(&aTemp[i], apDiv[i], szCell[nCell]);
++      apCell[nCell] = &aTemp[i];
++      dropCell(pBt, pParent, nxDiv, szCell[nCell]);
++      assert( SWAB32(pBt, apCell[nCell]->h.leftChild)==pgnoOld[i] );
++      apCell[nCell]->h.leftChild = pOld->u.hdr.rightChild;
++      nCell++;
++    }
++  }
++
++  /*
++  ** Figure out the number of pages needed to hold all nCell cells.
++  ** Store this number in "k".  Also compute szNew[] which is the total
++  ** size of all cells on the i-th page and cntNew[] which is the index
++  ** in apCell[] of the cell that divides path i from path i+1.  
++  ** cntNew[k] should equal nCell.
++  **
++  ** This little patch of code is critical for keeping the tree
++  ** balanced. 
++  */
++  for(subtotal=k=i=0; i<nCell; i++){
++    subtotal += szCell[i];
++    if( subtotal > USABLE_SPACE ){
++      szNew[k] = subtotal - szCell[i];
++      cntNew[k] = i;
++      subtotal = 0;
++      k++;
++    }
++  }
++  szNew[k] = subtotal;
++  cntNew[k] = nCell;
++  k++;
++  for(i=k-1; i>0; i--){
++    while( szNew[i]<USABLE_SPACE/2 ){
++      cntNew[i-1]--;
++      assert( cntNew[i-1]>0 );
++      szNew[i] += szCell[cntNew[i-1]];
++      szNew[i-1] -= szCell[cntNew[i-1]-1];
++    }
++  }
++  assert( cntNew[0]>0 );
++
++  /*
++  ** Allocate k new pages.  Reuse old pages where possible.
++  */
++  for(i=0; i<k; i++){
++    if( i<nOld ){
++      apNew[i] = apOld[i];
++      pgnoNew[i] = pgnoOld[i];
++      apOld[i] = 0;
++      sqlitepager_write(apNew[i]);
++    }else{
++      rc = allocatePage(pBt, &apNew[i], &pgnoNew[i], pgnoNew[i-1]);
++      if( rc ) goto balance_cleanup;
++    }
++    nNew++;
++    zeroPage(pBt, apNew[i]);
++    apNew[i]->isInit = 1;
++  }
++
++  /* Free any old pages that were not reused as new pages.
++  */
++  while( i<nOld ){
++    rc = freePage(pBt, apOld[i], pgnoOld[i]);
++    if( rc ) goto balance_cleanup;
++    sqlitepager_unref(apOld[i]);
++    apOld[i] = 0;
++    i++;
++  }
++
++  /*
++  ** Put the new pages in accending order.  This helps to
++  ** keep entries in the disk file in order so that a scan
++  ** of the table is a linear scan through the file.  That
++  ** in turn helps the operating system to deliver pages
++  ** from the disk more rapidly.
++  **
++  ** An O(n^2) insertion sort algorithm is used, but since
++  ** n is never more than NB (a small constant), that should
++  ** not be a problem.
++  **
++  ** When NB==3, this one optimization makes the database
++  ** about 25% faster for large insertions and deletions.
++  */
++  for(i=0; i<k-1; i++){
++    int minV = pgnoNew[i];
++    int minI = i;
++    for(j=i+1; j<k; j++){
++      if( pgnoNew[j]<(unsigned)minV ){
++        minI = j;
++        minV = pgnoNew[j];
++      }
++    }
++    if( minI>i ){
++      int t;
++      MemPage *pT;
++      t = pgnoNew[i];
++      pT = apNew[i];
++      pgnoNew[i] = pgnoNew[minI];
++      apNew[i] = apNew[minI];
++      pgnoNew[minI] = t;
++      apNew[minI] = pT;
++    }
++  }
++
++  /*
++  ** Evenly distribute the data in apCell[] across the new pages.
++  ** Insert divider cells into pParent as necessary.
++  */
++  j = 0;
++  for(i=0; i<nNew; i++){
++    MemPage *pNew = apNew[i];
++    while( j<cntNew[i] ){
++      assert( pNew->nFree>=szCell[j] );
++      if( pCur && iCur==j ){ pCur->pPage = pNew; pCur->idx = pNew->nCell; }
++      insertCell(pBt, pNew, pNew->nCell, apCell[j], szCell[j]);
++      j++;
++    }
++    assert( pNew->nCell>0 );
++    assert( !pNew->isOverfull );
++    relinkCellList(pBt, pNew);
++    if( i<nNew-1 && j<nCell ){
++      pNew->u.hdr.rightChild = apCell[j]->h.leftChild;
++      apCell[j]->h.leftChild = SWAB32(pBt, pgnoNew[i]);
++      if( pCur && iCur==j ){ pCur->pPage = pParent; pCur->idx = nxDiv; }
++      insertCell(pBt, pParent, nxDiv, apCell[j], szCell[j]);
++      j++;
++      nxDiv++;
++    }
++  }
++  assert( j==nCell );
++  apNew[nNew-1]->u.hdr.rightChild = aOld[nOld-1].u.hdr.rightChild;
++  if( nxDiv==pParent->nCell ){
++    pParent->u.hdr.rightChild = SWAB32(pBt, pgnoNew[nNew-1]);
++  }else{
++    pParent->apCell[nxDiv]->h.leftChild = SWAB32(pBt, pgnoNew[nNew-1]);
++  }
++  if( pCur ){
++    if( j<=iCur && pCur->pPage==pParent && pCur->idx>idxDiv[nOld-1] ){
++      assert( pCur->pPage==pOldCurPage );
++      pCur->idx += nNew - nOld;
++    }else{
++      assert( pOldCurPage!=0 );
++      sqlitepager_ref(pCur->pPage);
++      sqlitepager_unref(pOldCurPage);
++    }
++  }
++
++  /*
++  ** Reparent children of all cells.
++  */
++  for(i=0; i<nNew; i++){
++    reparentChildPages(pBt, apNew[i]);
++  }
++  reparentChildPages(pBt, pParent);
++
++  /*
++  ** balance the parent page.
++  */
++  rc = balance(pBt, pParent, pCur);
++
++  /*
++  ** Cleanup before returning.
++  */
++balance_cleanup:
++  if( extraUnref ){
++    sqlitepager_unref(extraUnref);
++  }
++  for(i=0; i<nOld; i++){
++    if( apOld[i]!=0 && apOld[i]!=&aOld[i] ) sqlitepager_unref(apOld[i]);
++  }
++  for(i=0; i<nNew; i++){
++    sqlitepager_unref(apNew[i]);
++  }
++  if( pCur && pCur->pPage==0 ){
++    pCur->pPage = pParent;
++    pCur->idx = 0;
++  }else{
++    sqlitepager_unref(pParent);
++  }
++  return rc;
++}
++
++/*
++** This routine checks all cursors that point to the same table
++** as pCur points to.  If any of those cursors were opened with
++** wrFlag==0 then this routine returns SQLITE_LOCKED.  If all
++** cursors point to the same table were opened with wrFlag==1
++** then this routine returns SQLITE_OK.
++**
++** In addition to checking for read-locks (where a read-lock 
++** means a cursor opened with wrFlag==0) this routine also moves
++** all cursors other than pCur so that they are pointing to the 
++** first Cell on root page.  This is necessary because an insert 
++** or delete might change the number of cells on a page or delete
++** a page entirely and we do not want to leave any cursors 
++** pointing to non-existant pages or cells.
++*/
++static int checkReadLocks(BtCursor *pCur){
++  BtCursor *p;
++  assert( pCur->wrFlag );
++  for(p=pCur->pShared; p!=pCur; p=p->pShared){
++    assert( p );
++    assert( p->pgnoRoot==pCur->pgnoRoot );
++    if( p->wrFlag==0 ) return SQLITE_LOCKED;
++    if( sqlitepager_pagenumber(p->pPage)!=p->pgnoRoot ){
++      moveToRoot(p);
++    }
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Insert a new record into the BTree.  The key is given by (pKey,nKey)
++** and the data is given by (pData,nData).  The cursor is used only to
++** define what database the record should be inserted into.  The cursor
++** is left pointing at the new record.
++*/
++static int fileBtreeInsert(
++  BtCursor *pCur,                /* Insert data into the table of this cursor */
++  const void *pKey, int nKey,    /* The key of the new record */
++  const void *pData, int nData   /* The data of the new record */
++){
++  Cell newCell;
++  int rc;
++  int loc;
++  int szNew;
++  MemPage *pPage;
++  Btree *pBt = pCur->pBt;
++
++  if( pCur->pPage==0 ){
++    return SQLITE_ABORT;  /* A rollback destroyed this cursor */
++  }
++  if( !pBt->inTrans || nKey+nData==0 ){
++    /* Must start a transaction before doing an insert */
++    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
++  }
++  assert( !pBt->readOnly );
++  if( !pCur->wrFlag ){
++    return SQLITE_PERM;   /* Cursor not open for writing */
++  }
++  if( checkReadLocks(pCur) ){
++    return SQLITE_LOCKED; /* The table pCur points to has a read lock */
++  }
++  rc = fileBtreeMoveto(pCur, pKey, nKey, &loc);
++  if( rc ) return rc;
++  pPage = pCur->pPage;
++  assert( pPage->isInit );
++  rc = sqlitepager_write(pPage);
++  if( rc ) return rc;
++  rc = fillInCell(pBt, &newCell, pKey, nKey, pData, nData);
++  if( rc ) return rc;
++  szNew = cellSize(pBt, &newCell);
++  if( loc==0 ){
++    newCell.h.leftChild = pPage->apCell[pCur->idx]->h.leftChild;
++    rc = clearCell(pBt, pPage->apCell[pCur->idx]);
++    if( rc ) return rc;
++    dropCell(pBt, pPage, pCur->idx, cellSize(pBt, pPage->apCell[pCur->idx]));
++  }else if( loc<0 && pPage->nCell>0 ){
++    assert( pPage->u.hdr.rightChild==0 );  /* Must be a leaf page */
++    pCur->idx++;
++  }else{
++    assert( pPage->u.hdr.rightChild==0 );  /* Must be a leaf page */
++  }
++  insertCell(pBt, pPage, pCur->idx, &newCell, szNew);
++  rc = balance(pCur->pBt, pPage, pCur);
++  /* sqliteBtreePageDump(pCur->pBt, pCur->pgnoRoot, 1); */
++  /* fflush(stdout); */
++  pCur->eSkip = SKIP_INVALID;
++  return rc;
++}
++
++/*
++** Delete the entry that the cursor is pointing to.
++**
++** The cursor is left pointing at either the next or the previous
++** entry.  If the cursor is left pointing to the next entry, then 
++** the pCur->eSkip flag is set to SKIP_NEXT which forces the next call to 
++** sqliteBtreeNext() to be a no-op.  That way, you can always call
++** sqliteBtreeNext() after a delete and the cursor will be left
++** pointing to the first entry after the deleted entry.  Similarly,
++** pCur->eSkip is set to SKIP_PREV is the cursor is left pointing to
++** the entry prior to the deleted entry so that a subsequent call to
++** sqliteBtreePrevious() will always leave the cursor pointing at the
++** entry immediately before the one that was deleted.
++*/
++static int fileBtreeDelete(BtCursor *pCur){
++  MemPage *pPage = pCur->pPage;
++  Cell *pCell;
++  int rc;
++  Pgno pgnoChild;
++  Btree *pBt = pCur->pBt;
++
++  assert( pPage->isInit );
++  if( pCur->pPage==0 ){
++    return SQLITE_ABORT;  /* A rollback destroyed this cursor */
++  }
++  if( !pBt->inTrans ){
++    /* Must start a transaction before doing a delete */
++    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
++  }
++  assert( !pBt->readOnly );
++  if( pCur->idx >= pPage->nCell ){
++    return SQLITE_ERROR;  /* The cursor is not pointing to anything */
++  }
++  if( !pCur->wrFlag ){
++    return SQLITE_PERM;   /* Did not open this cursor for writing */
++  }
++  if( checkReadLocks(pCur) ){
++    return SQLITE_LOCKED; /* The table pCur points to has a read lock */
++  }
++  rc = sqlitepager_write(pPage);
++  if( rc ) return rc;
++  pCell = pPage->apCell[pCur->idx];
++  pgnoChild = SWAB32(pBt, pCell->h.leftChild);
++  clearCell(pBt, pCell);
++  if( pgnoChild ){
++    /*
++    ** The entry we are about to delete is not a leaf so if we do not
++    ** do something we will leave a hole on an internal page.
++    ** We have to fill the hole by moving in a cell from a leaf.  The
++    ** next Cell after the one to be deleted is guaranteed to exist and
++    ** to be a leaf so we can use it.
++    */
++    BtCursor leafCur;
++    Cell *pNext;
++    int szNext;
++    int notUsed;
++    getTempCursor(pCur, &leafCur);
++    rc = fileBtreeNext(&leafCur, &notUsed);
++    if( rc!=SQLITE_OK ){
++      if( rc!=SQLITE_NOMEM ) rc = SQLITE_CORRUPT;
++      return rc;
++    }
++    rc = sqlitepager_write(leafCur.pPage);
++    if( rc ) return rc;
++    dropCell(pBt, pPage, pCur->idx, cellSize(pBt, pCell));
++    pNext = leafCur.pPage->apCell[leafCur.idx];
++    szNext = cellSize(pBt, pNext);
++    pNext->h.leftChild = SWAB32(pBt, pgnoChild);
++    insertCell(pBt, pPage, pCur->idx, pNext, szNext);
++    rc = balance(pBt, pPage, pCur);
++    if( rc ) return rc;
++    pCur->eSkip = SKIP_NEXT;
++    dropCell(pBt, leafCur.pPage, leafCur.idx, szNext);
++    rc = balance(pBt, leafCur.pPage, pCur);
++    releaseTempCursor(&leafCur);
++  }else{
++    dropCell(pBt, pPage, pCur->idx, cellSize(pBt, pCell));
++    if( pCur->idx>=pPage->nCell ){
++      pCur->idx = pPage->nCell-1;
++      if( pCur->idx<0 ){ 
++        pCur->idx = 0;
++        pCur->eSkip = SKIP_NEXT;
++      }else{
++        pCur->eSkip = SKIP_PREV;
++      }
++    }else{
++      pCur->eSkip = SKIP_NEXT;
++    }
++    rc = balance(pBt, pPage, pCur);
++  }
++  return rc;
++}
++
++/*
++** Create a new BTree table.  Write into *piTable the page
++** number for the root page of the new table.
++**
++** In the current implementation, BTree tables and BTree indices are the 
++** the same.  In the future, we may change this so that BTree tables
++** are restricted to having a 4-byte integer key and arbitrary data and
++** BTree indices are restricted to having an arbitrary key and no data.
++** But for now, this routine also serves to create indices.
++*/
++static int fileBtreeCreateTable(Btree *pBt, int *piTable){
++  MemPage *pRoot;
++  Pgno pgnoRoot;
++  int rc;
++  if( !pBt->inTrans ){
++    /* Must start a transaction first */
++    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
++  }
++  if( pBt->readOnly ){
++    return SQLITE_READONLY;
++  }
++  rc = allocatePage(pBt, &pRoot, &pgnoRoot, 0);
++  if( rc ) return rc;
++  assert( sqlitepager_iswriteable(pRoot) );
++  zeroPage(pBt, pRoot);
++  sqlitepager_unref(pRoot);
++  *piTable = (int)pgnoRoot;
++  return SQLITE_OK;
++}
++
++/*
++** Erase the given database page and all its children.  Return
++** the page to the freelist.
++*/
++static int clearDatabasePage(Btree *pBt, Pgno pgno, int freePageFlag){
++  MemPage *pPage;
++  int rc;
++  Cell *pCell;
++  int idx;
++
++  rc = sqlitepager_get(pBt->pPager, pgno, (void**)&pPage);
++  if( rc ) return rc;
++  rc = sqlitepager_write(pPage);
++  if( rc ) return rc;
++  rc = initPage(pBt, pPage, pgno, 0);
++  if( rc ) return rc;
++  idx = SWAB16(pBt, pPage->u.hdr.firstCell);
++  while( idx>0 ){
++    pCell = (Cell*)&pPage->u.aDisk[idx];
++    idx = SWAB16(pBt, pCell->h.iNext);
++    if( pCell->h.leftChild ){
++      rc = clearDatabasePage(pBt, SWAB32(pBt, pCell->h.leftChild), 1);
++      if( rc ) return rc;
++    }
++    rc = clearCell(pBt, pCell);
++    if( rc ) return rc;
++  }
++  if( pPage->u.hdr.rightChild ){
++    rc = clearDatabasePage(pBt, SWAB32(pBt, pPage->u.hdr.rightChild), 1);
++    if( rc ) return rc;
++  }
++  if( freePageFlag ){
++    rc = freePage(pBt, pPage, pgno);
++  }else{
++    zeroPage(pBt, pPage);
++  }
++  sqlitepager_unref(pPage);
++  return rc;
++}
++
++/*
++** Delete all information from a single table in the database.
++*/
++static int fileBtreeClearTable(Btree *pBt, int iTable){
++  int rc;
++  BtCursor *pCur;
++  if( !pBt->inTrans ){
++    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
++  }
++  for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){
++    if( pCur->pgnoRoot==(Pgno)iTable ){
++      if( pCur->wrFlag==0 ) return SQLITE_LOCKED;
++      moveToRoot(pCur);
++    }
++  }
++  rc = clearDatabasePage(pBt, (Pgno)iTable, 0);
++  if( rc ){
++    fileBtreeRollback(pBt);
++  }
++  return rc;
++}
++
++/*
++** Erase all information in a table and add the root of the table to
++** the freelist.  Except, the root of the principle table (the one on
++** page 2) is never added to the freelist.
++*/
++static int fileBtreeDropTable(Btree *pBt, int iTable){
++  int rc;
++  MemPage *pPage;
++  BtCursor *pCur;
++  if( !pBt->inTrans ){
++    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
++  }
++  for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){
++    if( pCur->pgnoRoot==(Pgno)iTable ){
++      return SQLITE_LOCKED;  /* Cannot drop a table that has a cursor */
++    }
++  }
++  rc = sqlitepager_get(pBt->pPager, (Pgno)iTable, (void**)&pPage);
++  if( rc ) return rc;
++  rc = fileBtreeClearTable(pBt, iTable);
++  if( rc ) return rc;
++  if( iTable>2 ){
++    rc = freePage(pBt, pPage, iTable);
++  }else{
++    zeroPage(pBt, pPage);
++  }
++  sqlitepager_unref(pPage);
++  return rc;  
++}
++
++#if 0 /* UNTESTED */
++/*
++** Copy all cell data from one database file into another.
++** pages back the freelist.
++*/
++static int copyCell(Btree *pBtFrom, BTree *pBtTo, Cell *pCell){
++  Pager *pFromPager = pBtFrom->pPager;
++  OverflowPage *pOvfl;
++  Pgno ovfl, nextOvfl;
++  Pgno *pPrev;
++  int rc = SQLITE_OK;
++  MemPage *pNew, *pPrevPg;
++  Pgno new;
++
++  if( NKEY(pBtTo, pCell->h) + NDATA(pBtTo, pCell->h) <= MX_LOCAL_PAYLOAD ){
++    return SQLITE_OK;
++  }
++  pPrev = &pCell->ovfl;
++  pPrevPg = 0;
++  ovfl = SWAB32(pBtTo, pCell->ovfl);
++  while( ovfl && rc==SQLITE_OK ){
++    rc = sqlitepager_get(pFromPager, ovfl, (void**)&pOvfl);
++    if( rc ) return rc;
++    nextOvfl = SWAB32(pBtFrom, pOvfl->iNext);
++    rc = allocatePage(pBtTo, &pNew, &new, 0);
++    if( rc==SQLITE_OK ){
++      rc = sqlitepager_write(pNew);
++      if( rc==SQLITE_OK ){
++        memcpy(pNew, pOvfl, SQLITE_USABLE_SIZE);
++        *pPrev = SWAB32(pBtTo, new);
++        if( pPrevPg ){
++          sqlitepager_unref(pPrevPg);
++        }
++        pPrev = &pOvfl->iNext;
++        pPrevPg = pNew;
++      }
++    }
++    sqlitepager_unref(pOvfl);
++    ovfl = nextOvfl;
++  }
++  if( pPrevPg ){
++    sqlitepager_unref(pPrevPg);
++  }
++  return rc;
++}
++#endif
++
++
++#if 0 /* UNTESTED */
++/*
++** Copy a page of data from one database over to another.
++*/
++static int copyDatabasePage(
++  Btree *pBtFrom,
++  Pgno pgnoFrom,
++  Btree *pBtTo,
++  Pgno *pTo
++){
++  MemPage *pPageFrom, *pPage;
++  Pgno to;
++  int rc;
++  Cell *pCell;
++  int idx;
++
++  rc = sqlitepager_get(pBtFrom->pPager, pgno, (void**)&pPageFrom);
++  if( rc ) return rc;
++  rc = allocatePage(pBt, &pPage, pTo, 0);
++  if( rc==SQLITE_OK ){
++    rc = sqlitepager_write(pPage);
++  }
++  if( rc==SQLITE_OK ){
++    memcpy(pPage, pPageFrom, SQLITE_USABLE_SIZE);
++    idx = SWAB16(pBt, pPage->u.hdr.firstCell);
++    while( idx>0 ){
++      pCell = (Cell*)&pPage->u.aDisk[idx];
++      idx = SWAB16(pBt, pCell->h.iNext);
++      if( pCell->h.leftChild ){
++        Pgno newChld;
++        rc = copyDatabasePage(pBtFrom, SWAB32(pBtFrom, pCell->h.leftChild),
++                              pBtTo, &newChld);
++        if( rc ) return rc;
++        pCell->h.leftChild = SWAB32(pBtFrom, newChld);
++      }
++      rc = copyCell(pBtFrom, pBtTo, pCell);
++      if( rc ) return rc;
++    }
++    if( pPage->u.hdr.rightChild ){
++      Pgno newChld;
++      rc = copyDatabasePage(pBtFrom, SWAB32(pBtFrom, pPage->u.hdr.rightChild), 
++                            pBtTo, &newChld);
++      if( rc ) return rc;
++      pPage->u.hdr.rightChild = SWAB32(pBtTo, newChild);
++    }
++  }
++  sqlitepager_unref(pPage);
++  return rc;
++}
++#endif
++
++/*
++** Read the meta-information out of a database file.
++*/
++static int fileBtreeGetMeta(Btree *pBt, int *aMeta){
++  PageOne *pP1;
++  int rc;
++  int i;
++
++  rc = sqlitepager_get(pBt->pPager, 1, (void**)&pP1);
++  if( rc ) return rc;
++  aMeta[0] = SWAB32(pBt, pP1->nFree);
++  for(i=0; i<sizeof(pP1->aMeta)/sizeof(pP1->aMeta[0]); i++){
++    aMeta[i+1] = SWAB32(pBt, pP1->aMeta[i]);
++  }
++  sqlitepager_unref(pP1);
++  return SQLITE_OK;
++}
++
++/*
++** Write meta-information back into the database.
++*/
++static int fileBtreeUpdateMeta(Btree *pBt, int *aMeta){
++  PageOne *pP1;
++  int rc, i;
++  if( !pBt->inTrans ){
++    return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR;
++  }
++  pP1 = pBt->page1;
++  rc = sqlitepager_write(pP1);
++  if( rc ) return rc;   
++  for(i=0; i<sizeof(pP1->aMeta)/sizeof(pP1->aMeta[0]); i++){
++    pP1->aMeta[i] = SWAB32(pBt, aMeta[i+1]);
++  }
++  return SQLITE_OK;
++}
++
++/******************************************************************************
++** The complete implementation of the BTree subsystem is above this line.
++** All the code the follows is for testing and troubleshooting the BTree
++** subsystem.  None of the code that follows is used during normal operation.
++******************************************************************************/
++
++/*
++** Print a disassembly of the given page on standard output.  This routine
++** is used for debugging and testing only.
++*/
++#ifdef SQLITE_TEST
++static int fileBtreePageDump(Btree *pBt, int pgno, int recursive){
++  int rc;
++  MemPage *pPage;
++  int i, j;
++  int nFree;
++  u16 idx;
++  char range[20];
++  unsigned char payload[20];
++  rc = sqlitepager_get(pBt->pPager, (Pgno)pgno, (void**)&pPage);
++  if( rc ){
++    return rc;
++  }
++  if( recursive ) printf("PAGE %d:\n", pgno);
++  i = 0;
++  idx = SWAB16(pBt, pPage->u.hdr.firstCell);
++  while( idx>0 && idx<=SQLITE_USABLE_SIZE-MIN_CELL_SIZE ){
++    Cell *pCell = (Cell*)&pPage->u.aDisk[idx];
++    int sz = cellSize(pBt, pCell);
++    sprintf(range,"%d..%d", idx, idx+sz-1);
++    sz = NKEY(pBt, pCell->h) + NDATA(pBt, pCell->h);
++    if( sz>sizeof(payload)-1 ) sz = sizeof(payload)-1;
++    memcpy(payload, pCell->aPayload, sz);
++    for(j=0; j<sz; j++){
++      if( payload[j]<0x20 || payload[j]>0x7f ) payload[j] = '.';
++    }
++    payload[sz] = 0;
++    printf(
++      "cell %2d: i=%-10s chld=%-4d nk=%-4d nd=%-4d payload=%s\n",
++      i, range, (int)pCell->h.leftChild, 
++      NKEY(pBt, pCell->h), NDATA(pBt, pCell->h),
++      payload
++    );
++    if( pPage->isInit && pPage->apCell[i]!=pCell ){
++      printf("**** apCell[%d] does not match on prior entry ****\n", i);
++    }
++    i++;
++    idx = SWAB16(pBt, pCell->h.iNext);
++  }
++  if( idx!=0 ){
++    printf("ERROR: next cell index out of range: %d\n", idx);
++  }
++  printf("right_child: %d\n", SWAB32(pBt, pPage->u.hdr.rightChild));
++  nFree = 0;
++  i = 0;
++  idx = SWAB16(pBt, pPage->u.hdr.firstFree);
++  while( idx>0 && idx<SQLITE_USABLE_SIZE ){
++    FreeBlk *p = (FreeBlk*)&pPage->u.aDisk[idx];
++    sprintf(range,"%d..%d", idx, idx+p->iSize-1);
++    nFree += SWAB16(pBt, p->iSize);
++    printf("freeblock %2d: i=%-10s size=%-4d total=%d\n",
++       i, range, SWAB16(pBt, p->iSize), nFree);
++    idx = SWAB16(pBt, p->iNext);
++    i++;
++  }
++  if( idx!=0 ){
++    printf("ERROR: next freeblock index out of range: %d\n", idx);
++  }
++  if( recursive && pPage->u.hdr.rightChild!=0 ){
++    idx = SWAB16(pBt, pPage->u.hdr.firstCell);
++    while( idx>0 && idx<SQLITE_USABLE_SIZE-MIN_CELL_SIZE ){
++      Cell *pCell = (Cell*)&pPage->u.aDisk[idx];
++      fileBtreePageDump(pBt, SWAB32(pBt, pCell->h.leftChild), 1);
++      idx = SWAB16(pBt, pCell->h.iNext);
++    }
++    fileBtreePageDump(pBt, SWAB32(pBt, pPage->u.hdr.rightChild), 1);
++  }
++  sqlitepager_unref(pPage);
++  return SQLITE_OK;
++}
++#endif
++
++#ifdef SQLITE_TEST
++/*
++** Fill aResult[] with information about the entry and page that the
++** cursor is pointing to.
++** 
++**   aResult[0] =  The page number
++**   aResult[1] =  The entry number
++**   aResult[2] =  Total number of entries on this page
++**   aResult[3] =  Size of this entry
++**   aResult[4] =  Number of free bytes on this page
++**   aResult[5] =  Number of free blocks on the page
++**   aResult[6] =  Page number of the left child of this entry
++**   aResult[7] =  Page number of the right child for the whole page
++**
++** This routine is used for testing and debugging only.
++*/
++static int fileBtreeCursorDump(BtCursor *pCur, int *aResult){
++  int cnt, idx;
++  MemPage *pPage = pCur->pPage;
++  Btree *pBt = pCur->pBt;
++  aResult[0] = sqlitepager_pagenumber(pPage);
++  aResult[1] = pCur->idx;
++  aResult[2] = pPage->nCell;
++  if( pCur->idx>=0 && pCur->idx<pPage->nCell ){
++    aResult[3] = cellSize(pBt, pPage->apCell[pCur->idx]);
++    aResult[6] = SWAB32(pBt, pPage->apCell[pCur->idx]->h.leftChild);
++  }else{
++    aResult[3] = 0;
++    aResult[6] = 0;
++  }
++  aResult[4] = pPage->nFree;
++  cnt = 0;
++  idx = SWAB16(pBt, pPage->u.hdr.firstFree);
++  while( idx>0 && idx<SQLITE_USABLE_SIZE ){
++    cnt++;
++    idx = SWAB16(pBt, ((FreeBlk*)&pPage->u.aDisk[idx])->iNext);
++  }
++  aResult[5] = cnt;
++  aResult[7] = SWAB32(pBt, pPage->u.hdr.rightChild);
++  return SQLITE_OK;
++}
++#endif
++
++/*
++** Return the pager associated with a BTree.  This routine is used for
++** testing and debugging only.
++*/
++static Pager *fileBtreePager(Btree *pBt){
++  return pBt->pPager;
++}
++
++/*
++** This structure is passed around through all the sanity checking routines
++** in order to keep track of some global state information.
++*/
++typedef struct IntegrityCk IntegrityCk;
++struct IntegrityCk {
++  Btree *pBt;    /* The tree being checked out */
++  Pager *pPager; /* The associated pager.  Also accessible by pBt->pPager */
++  int nPage;     /* Number of pages in the database */
++  int *anRef;    /* Number of times each page is referenced */
++  char *zErrMsg; /* An error message.  NULL of no errors seen. */
++};
++
++/*
++** Append a message to the error message string.
++*/
++static void checkAppendMsg(IntegrityCk *pCheck, char *zMsg1, char *zMsg2){
++  if( pCheck->zErrMsg ){
++    char *zOld = pCheck->zErrMsg;
++    pCheck->zErrMsg = 0;
++    sqliteSetString(&pCheck->zErrMsg, zOld, "\n", zMsg1, zMsg2, (char*)0);
++    sqliteFree(zOld);
++  }else{
++    sqliteSetString(&pCheck->zErrMsg, zMsg1, zMsg2, (char*)0);
++  }
++}
++
++/*
++** Add 1 to the reference count for page iPage.  If this is the second
++** reference to the page, add an error message to pCheck->zErrMsg.
++** Return 1 if there are 2 ore more references to the page and 0 if
++** if this is the first reference to the page.
++**
++** Also check that the page number is in bounds.
++*/
++static int checkRef(IntegrityCk *pCheck, int iPage, char *zContext){
++  if( iPage==0 ) return 1;
++  if( iPage>pCheck->nPage || iPage<0 ){
++    char zBuf[100];
++    sprintf(zBuf, "invalid page number %d", iPage);
++    checkAppendMsg(pCheck, zContext, zBuf);
++    return 1;
++  }
++  if( pCheck->anRef[iPage]==1 ){
++    char zBuf[100];
++    sprintf(zBuf, "2nd reference to page %d", iPage);
++    checkAppendMsg(pCheck, zContext, zBuf);
++    return 1;
++  }
++  return  (pCheck->anRef[iPage]++)>1;
++}
++
++/*
++** Check the integrity of the freelist or of an overflow page list.
++** Verify that the number of pages on the list is N.
++*/
++static void checkList(
++  IntegrityCk *pCheck,  /* Integrity checking context */
++  int isFreeList,       /* True for a freelist.  False for overflow page list */
++  int iPage,            /* Page number for first page in the list */
++  int N,                /* Expected number of pages in the list */
++  char *zContext        /* Context for error messages */
++){
++  int i;
++  char zMsg[100];
++  while( N-- > 0 ){
++    OverflowPage *pOvfl;
++    if( iPage<1 ){
++      sprintf(zMsg, "%d pages missing from overflow list", N+1);
++      checkAppendMsg(pCheck, zContext, zMsg);
++      break;
++    }
++    if( checkRef(pCheck, iPage, zContext) ) break;
++    if( sqlitepager_get(pCheck->pPager, (Pgno)iPage, (void**)&pOvfl) ){
++      sprintf(zMsg, "failed to get page %d", iPage);
++      checkAppendMsg(pCheck, zContext, zMsg);
++      break;
++    }
++    if( isFreeList ){
++      FreelistInfo *pInfo = (FreelistInfo*)pOvfl->aPayload;
++      int n = SWAB32(pCheck->pBt, pInfo->nFree);
++      for(i=0; i<n; i++){
++        checkRef(pCheck, SWAB32(pCheck->pBt, pInfo->aFree[i]), zContext);
++      }
++      N -= n;
++    }
++    iPage = SWAB32(pCheck->pBt, pOvfl->iNext);
++    sqlitepager_unref(pOvfl);
++  }
++}
++
++/*
++** Return negative if zKey1<zKey2.
++** Return zero if zKey1==zKey2.
++** Return positive if zKey1>zKey2.
++*/
++static int keyCompare(
++  const char *zKey1, int nKey1,
++  const char *zKey2, int nKey2
++){
++  int min = nKey1>nKey2 ? nKey2 : nKey1;
++  int c = memcmp(zKey1, zKey2, min);
++  if( c==0 ){
++    c = nKey1 - nKey2;
++  }
++  return c;
++}
++
++/*
++** Do various sanity checks on a single page of a tree.  Return
++** the tree depth.  Root pages return 0.  Parents of root pages
++** return 1, and so forth.
++** 
++** These checks are done:
++**
++**      1.  Make sure that cells and freeblocks do not overlap
++**          but combine to completely cover the page.
++**      2.  Make sure cell keys are in order.
++**      3.  Make sure no key is less than or equal to zLowerBound.
++**      4.  Make sure no key is greater than or equal to zUpperBound.
++**      5.  Check the integrity of overflow pages.
++**      6.  Recursively call checkTreePage on all children.
++**      7.  Verify that the depth of all children is the same.
++**      8.  Make sure this page is at least 33% full or else it is
++**          the root of the tree.
++*/
++static int checkTreePage(
++  IntegrityCk *pCheck,  /* Context for the sanity check */
++  int iPage,            /* Page number of the page to check */
++  MemPage *pParent,     /* Parent page */
++  char *zParentContext, /* Parent context */
++  char *zLowerBound,    /* All keys should be greater than this, if not NULL */
++  int nLower,           /* Number of characters in zLowerBound */
++  char *zUpperBound,    /* All keys should be less than this, if not NULL */
++  int nUpper            /* Number of characters in zUpperBound */
++){
++  MemPage *pPage;
++  int i, rc, depth, d2, pgno;
++  char *zKey1, *zKey2;
++  int nKey1, nKey2;
++  BtCursor cur;
++  Btree *pBt;
++  char zMsg[100];
++  char zContext[100];
++  char hit[SQLITE_USABLE_SIZE];
++
++  /* Check that the page exists
++  */
++  cur.pBt = pBt = pCheck->pBt;
++  if( iPage==0 ) return 0;
++  if( checkRef(pCheck, iPage, zParentContext) ) return 0;
++  sprintf(zContext, "On tree page %d: ", iPage);
++  if( (rc = sqlitepager_get(pCheck->pPager, (Pgno)iPage, (void**)&pPage))!=0 ){
++    sprintf(zMsg, "unable to get the page. error code=%d", rc);
++    checkAppendMsg(pCheck, zContext, zMsg);
++    return 0;
++  }
++  if( (rc = initPage(pBt, pPage, (Pgno)iPage, pParent))!=0 ){
++    sprintf(zMsg, "initPage() returns error code %d", rc);
++    checkAppendMsg(pCheck, zContext, zMsg);
++    sqlitepager_unref(pPage);
++    return 0;
++  }
++
++  /* Check out all the cells.
++  */
++  depth = 0;
++  if( zLowerBound ){
++    zKey1 = sqliteMalloc( nLower+1 );
++    memcpy(zKey1, zLowerBound, nLower);
++    zKey1[nLower] = 0;
++  }else{
++    zKey1 = 0;
++  }
++  nKey1 = nLower;
++  cur.pPage = pPage;
++  for(i=0; i<pPage->nCell; i++){
++    Cell *pCell = pPage->apCell[i];
++    int sz;
++
++    /* Check payload overflow pages
++    */
++    nKey2 = NKEY(pBt, pCell->h);
++    sz = nKey2 + NDATA(pBt, pCell->h);
++    sprintf(zContext, "On page %d cell %d: ", iPage, i);
++    if( sz>MX_LOCAL_PAYLOAD ){
++      int nPage = (sz - MX_LOCAL_PAYLOAD + OVERFLOW_SIZE - 1)/OVERFLOW_SIZE;
++      checkList(pCheck, 0, SWAB32(pBt, pCell->ovfl), nPage, zContext);
++    }
++
++    /* Check that keys are in the right order
++    */
++    cur.idx = i;
++    zKey2 = sqliteMallocRaw( nKey2+1 );
++    getPayload(&cur, 0, nKey2, zKey2);
++    if( zKey1 && keyCompare(zKey1, nKey1, zKey2, nKey2)>=0 ){
++      checkAppendMsg(pCheck, zContext, "Key is out of order");
++    }
++
++    /* Check sanity of left child page.
++    */
++    pgno = SWAB32(pBt, pCell->h.leftChild);
++    d2 = checkTreePage(pCheck, pgno, pPage, zContext, zKey1,nKey1,zKey2,nKey2);
++    if( i>0 && d2!=depth ){
++      checkAppendMsg(pCheck, zContext, "Child page depth differs");
++    }
++    depth = d2;
++    sqliteFree(zKey1);
++    zKey1 = zKey2;
++    nKey1 = nKey2;
++  }
++  pgno = SWAB32(pBt, pPage->u.hdr.rightChild);
++  sprintf(zContext, "On page %d at right child: ", iPage);
++  checkTreePage(pCheck, pgno, pPage, zContext, zKey1,nKey1,zUpperBound,nUpper);
++  sqliteFree(zKey1);
++ 
++  /* Check for complete coverage of the page
++  */
++  memset(hit, 0, sizeof(hit));
++  memset(hit, 1, sizeof(PageHdr));
++  for(i=SWAB16(pBt, pPage->u.hdr.firstCell); i>0 && i<SQLITE_USABLE_SIZE; ){
++    Cell *pCell = (Cell*)&pPage->u.aDisk[i];
++    int j;
++    for(j=i+cellSize(pBt, pCell)-1; j>=i; j--) hit[j]++;
++    i = SWAB16(pBt, pCell->h.iNext);
++  }
++  for(i=SWAB16(pBt,pPage->u.hdr.firstFree); i>0 && i<SQLITE_USABLE_SIZE; ){
++    FreeBlk *pFBlk = (FreeBlk*)&pPage->u.aDisk[i];
++    int j;
++    for(j=i+SWAB16(pBt,pFBlk->iSize)-1; j>=i; j--) hit[j]++;
++    i = SWAB16(pBt,pFBlk->iNext);
++  }
++  for(i=0; i<SQLITE_USABLE_SIZE; i++){
++    if( hit[i]==0 ){
++      sprintf(zMsg, "Unused space at byte %d of page %d", i, iPage);
++      checkAppendMsg(pCheck, zMsg, 0);
++      break;
++    }else if( hit[i]>1 ){
++      sprintf(zMsg, "Multiple uses for byte %d of page %d", i, iPage);
++      checkAppendMsg(pCheck, zMsg, 0);
++      break;
++    }
++  }
++
++  /* Check that free space is kept to a minimum
++  */
++#if 0
++  if( pParent && pParent->nCell>2 && pPage->nFree>3*SQLITE_USABLE_SIZE/4 ){
++    sprintf(zMsg, "free space (%d) greater than max (%d)", pPage->nFree,
++       SQLITE_USABLE_SIZE/3);
++    checkAppendMsg(pCheck, zContext, zMsg);
++  }
++#endif
++
++  sqlitepager_unref(pPage);
++  return depth;
++}
++
++/*
++** This routine does a complete check of the given BTree file.  aRoot[] is
++** an array of pages numbers were each page number is the root page of
++** a table.  nRoot is the number of entries in aRoot.
++**
++** If everything checks out, this routine returns NULL.  If something is
++** amiss, an error message is written into memory obtained from malloc()
++** and a pointer to that error message is returned.  The calling function
++** is responsible for freeing the error message when it is done.
++*/
++char *fileBtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){
++  int i;
++  int nRef;
++  IntegrityCk sCheck;
++
++  nRef = *sqlitepager_stats(pBt->pPager);
++  if( lockBtree(pBt)!=SQLITE_OK ){
++    return sqliteStrDup("Unable to acquire a read lock on the database");
++  }
++  sCheck.pBt = pBt;
++  sCheck.pPager = pBt->pPager;
++  sCheck.nPage = sqlitepager_pagecount(sCheck.pPager);
++  if( sCheck.nPage==0 ){
++    unlockBtreeIfUnused(pBt);
++    return 0;
++  }
++  sCheck.anRef = sqliteMallocRaw( (sCheck.nPage+1)*sizeof(sCheck.anRef[0]) );
++  sCheck.anRef[1] = 1;
++  for(i=2; i<=sCheck.nPage; i++){ sCheck.anRef[i] = 0; }
++  sCheck.zErrMsg = 0;
++
++  /* Check the integrity of the freelist
++  */
++  checkList(&sCheck, 1, SWAB32(pBt, pBt->page1->freeList),
++            SWAB32(pBt, pBt->page1->nFree), "Main freelist: ");
++
++  /* Check all the tables.
++  */
++  for(i=0; i<nRoot; i++){
++    if( aRoot[i]==0 ) continue;
++    checkTreePage(&sCheck, aRoot[i], 0, "List of tree roots: ", 0,0,0,0);
++  }
++
++  /* Make sure every page in the file is referenced
++  */
++  for(i=1; i<=sCheck.nPage; i++){
++    if( sCheck.anRef[i]==0 ){
++      char zBuf[100];
++      sprintf(zBuf, "Page %d is never used", i);
++      checkAppendMsg(&sCheck, zBuf, 0);
++    }
++  }
++
++  /* Make sure this analysis did not leave any unref() pages
++  */
++  unlockBtreeIfUnused(pBt);
++  if( nRef != *sqlitepager_stats(pBt->pPager) ){
++    char zBuf[100];
++    sprintf(zBuf, 
++      "Outstanding page count goes from %d to %d during this analysis",
++      nRef, *sqlitepager_stats(pBt->pPager)
++    );
++    checkAppendMsg(&sCheck, zBuf, 0);
++  }
++
++  /* Clean  up and report errors.
++  */
++  sqliteFree(sCheck.anRef);
++  return sCheck.zErrMsg;
++}
++
++/*
++** Return the full pathname of the underlying database file.
++*/
++static const char *fileBtreeGetFilename(Btree *pBt){
++  assert( pBt->pPager!=0 );
++  return sqlitepager_filename(pBt->pPager);
++}
++
++/*
++** Copy the complete content of pBtFrom into pBtTo.  A transaction
++** must be active for both files.
++**
++** The size of file pBtFrom may be reduced by this operation.
++** If anything goes wrong, the transaction on pBtFrom is rolled back.
++*/
++static int fileBtreeCopyFile(Btree *pBtTo, Btree *pBtFrom){
++  int rc = SQLITE_OK;
++  Pgno i, nPage, nToPage;
++
++  if( !pBtTo->inTrans || !pBtFrom->inTrans ) return SQLITE_ERROR;
++  if( pBtTo->needSwab!=pBtFrom->needSwab ) return SQLITE_ERROR;
++  if( pBtTo->pCursor ) return SQLITE_BUSY;
++  memcpy(pBtTo->page1, pBtFrom->page1, SQLITE_USABLE_SIZE);
++  rc = sqlitepager_overwrite(pBtTo->pPager, 1, pBtFrom->page1);
++  nToPage = sqlitepager_pagecount(pBtTo->pPager);
++  nPage = sqlitepager_pagecount(pBtFrom->pPager);
++  for(i=2; rc==SQLITE_OK && i<=nPage; i++){
++    void *pPage;
++    rc = sqlitepager_get(pBtFrom->pPager, i, &pPage);
++    if( rc ) break;
++    rc = sqlitepager_overwrite(pBtTo->pPager, i, pPage);
++    if( rc ) break;
++    sqlitepager_unref(pPage);
++  }
++  for(i=nPage+1; rc==SQLITE_OK && i<=nToPage; i++){
++    void *pPage;
++    rc = sqlitepager_get(pBtTo->pPager, i, &pPage);
++    if( rc ) break;
++    rc = sqlitepager_write(pPage);
++    sqlitepager_unref(pPage);
++    sqlitepager_dont_write(pBtTo->pPager, i);
++  }
++  if( !rc && nPage<nToPage ){
++    rc = sqlitepager_truncate(pBtTo->pPager, nPage);
++  }
++  if( rc ){
++    fileBtreeRollback(pBtTo);
++  }
++  return rc;  
++}
++
++/*
++** The following tables contain pointers to all of the interface
++** routines for this implementation of the B*Tree backend.  To
++** substitute a different implemention of the backend, one has merely
++** to provide pointers to alternative functions in similar tables.
++*/
++static BtOps sqliteBtreeOps = {
++    fileBtreeClose,
++    fileBtreeSetCacheSize,
++    fileBtreeSetSafetyLevel,
++    fileBtreeBeginTrans,
++    fileBtreeCommit,
++    fileBtreeRollback,
++    fileBtreeBeginCkpt,
++    fileBtreeCommitCkpt,
++    fileBtreeRollbackCkpt,
++    fileBtreeCreateTable,
++    fileBtreeCreateTable,  /* Really sqliteBtreeCreateIndex() */
++    fileBtreeDropTable,
++    fileBtreeClearTable,
++    fileBtreeCursor,
++    fileBtreeGetMeta,
++    fileBtreeUpdateMeta,
++    fileBtreeIntegrityCheck,
++    fileBtreeGetFilename,
++    fileBtreeCopyFile,
++    fileBtreePager,
++#ifdef SQLITE_TEST
++    fileBtreePageDump,
++#endif
++};
++static BtCursorOps sqliteBtreeCursorOps = {
++    fileBtreeMoveto,
++    fileBtreeDelete,
++    fileBtreeInsert,
++    fileBtreeFirst,
++    fileBtreeLast,
++    fileBtreeNext,
++    fileBtreePrevious,
++    fileBtreeKeySize,
++    fileBtreeKey,
++    fileBtreeKeyCompare,
++    fileBtreeDataSize,
++    fileBtreeData,
++    fileBtreeCloseCursor,
++#ifdef SQLITE_TEST
++    fileBtreeCursorDump,
++#endif
++};
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/btree.h
+@@ -0,0 +1,156 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This header file defines the interface that the sqlite B-Tree file
++** subsystem.  See comments in the source code for a detailed description
++** of what each interface routine does.
++**
++** @(#) $Id$
++*/
++#ifndef _BTREE_H_
++#define _BTREE_H_
++
++/*
++** Forward declarations of structure
++*/
++typedef struct Btree Btree;
++typedef struct BtCursor BtCursor;
++typedef struct BtOps BtOps;
++typedef struct BtCursorOps BtCursorOps;
++
++
++/*
++** An instance of the following structure contains pointers to all
++** methods against an open BTree.  Alternative BTree implementations
++** (examples: file based versus in-memory) can be created by substituting
++** different methods.  Users of the BTree cannot tell the difference.
++**
++** In C++ we could do this by defining a virtual base class and then
++** creating subclasses for each different implementation.  But this is
++** C not C++ so we have to be a little more explicit.
++*/
++struct BtOps {
++    int (*Close)(Btree*);
++    int (*SetCacheSize)(Btree*, int);
++    int (*SetSafetyLevel)(Btree*, int);
++    int (*BeginTrans)(Btree*);
++    int (*Commit)(Btree*);
++    int (*Rollback)(Btree*);
++    int (*BeginCkpt)(Btree*);
++    int (*CommitCkpt)(Btree*);
++    int (*RollbackCkpt)(Btree*);
++    int (*CreateTable)(Btree*, int*);
++    int (*CreateIndex)(Btree*, int*);
++    int (*DropTable)(Btree*, int);
++    int (*ClearTable)(Btree*, int);
++    int (*Cursor)(Btree*, int iTable, int wrFlag, BtCursor **ppCur);
++    int (*GetMeta)(Btree*, int*);
++    int (*UpdateMeta)(Btree*, int*);
++    char *(*IntegrityCheck)(Btree*, int*, int);
++    const char *(*GetFilename)(Btree*);
++    int (*Copyfile)(Btree*,Btree*);
++    struct Pager *(*Pager)(Btree*);
++#ifdef SQLITE_TEST
++    int (*PageDump)(Btree*, int, int);
++#endif
++};
++
++/*
++** An instance of this structure defines all of the methods that can
++** be executed against a cursor.
++*/
++struct BtCursorOps {
++    int (*Moveto)(BtCursor*, const void *pKey, int nKey, int *pRes);
++    int (*Delete)(BtCursor*);
++    int (*Insert)(BtCursor*, const void *pKey, int nKey,
++                             const void *pData, int nData);
++    int (*First)(BtCursor*, int *pRes);
++    int (*Last)(BtCursor*, int *pRes);
++    int (*Next)(BtCursor*, int *pRes);
++    int (*Previous)(BtCursor*, int *pRes);
++    int (*KeySize)(BtCursor*, int *pSize);
++    int (*Key)(BtCursor*, int offset, int amt, char *zBuf);
++    int (*KeyCompare)(BtCursor*, const void *pKey, int nKey,
++                                 int nIgnore, int *pRes);
++    int (*DataSize)(BtCursor*, int *pSize);
++    int (*Data)(BtCursor*, int offset, int amt, char *zBuf);
++    int (*CloseCursor)(BtCursor*);
++#ifdef SQLITE_TEST
++    int (*CursorDump)(BtCursor*, int*);
++#endif
++};
++
++/*
++** The number of 4-byte "meta" values contained on the first page of each
++** database file.
++*/
++#define SQLITE_N_BTREE_META 10
++
++int sqliteBtreeOpen(const char *zFilename, int mode, int nPg, Btree **ppBtree);
++int sqliteRbtreeOpen(const char *zFilename, int mode, int nPg, Btree **ppBtree);
++
++#define btOps(pBt) (*((BtOps **)(pBt)))
++#define btCOps(pCur) (*((BtCursorOps **)(pCur)))
++
++#define sqliteBtreeClose(pBt)              (btOps(pBt)->Close(pBt))
++#define sqliteBtreeSetCacheSize(pBt, sz)   (btOps(pBt)->SetCacheSize(pBt, sz))
++#define sqliteBtreeSetSafetyLevel(pBt, sl) (btOps(pBt)->SetSafetyLevel(pBt, sl))
++#define sqliteBtreeBeginTrans(pBt)         (btOps(pBt)->BeginTrans(pBt))
++#define sqliteBtreeCommit(pBt)             (btOps(pBt)->Commit(pBt))
++#define sqliteBtreeRollback(pBt)           (btOps(pBt)->Rollback(pBt))
++#define sqliteBtreeBeginCkpt(pBt)          (btOps(pBt)->BeginCkpt(pBt))
++#define sqliteBtreeCommitCkpt(pBt)         (btOps(pBt)->CommitCkpt(pBt))
++#define sqliteBtreeRollbackCkpt(pBt)       (btOps(pBt)->RollbackCkpt(pBt))
++#define sqliteBtreeCreateTable(pBt,piTable)\
++                (btOps(pBt)->CreateTable(pBt,piTable))
++#define sqliteBtreeCreateIndex(pBt, piIndex)\
++                (btOps(pBt)->CreateIndex(pBt, piIndex))
++#define sqliteBtreeDropTable(pBt, iTable) (btOps(pBt)->DropTable(pBt, iTable))
++#define sqliteBtreeClearTable(pBt, iTable)\
++                (btOps(pBt)->ClearTable(pBt, iTable))
++#define sqliteBtreeCursor(pBt, iTable, wrFlag, ppCur)\
++                (btOps(pBt)->Cursor(pBt, iTable, wrFlag, ppCur))
++#define sqliteBtreeMoveto(pCur, pKey, nKey, pRes)\
++                (btCOps(pCur)->Moveto(pCur, pKey, nKey, pRes))
++#define sqliteBtreeDelete(pCur)           (btCOps(pCur)->Delete(pCur))
++#define sqliteBtreeInsert(pCur, pKey, nKey, pData, nData) \
++                (btCOps(pCur)->Insert(pCur, pKey, nKey, pData, nData))
++#define sqliteBtreeFirst(pCur, pRes)      (btCOps(pCur)->First(pCur, pRes))
++#define sqliteBtreeLast(pCur, pRes)       (btCOps(pCur)->Last(pCur, pRes))
++#define sqliteBtreeNext(pCur, pRes)       (btCOps(pCur)->Next(pCur, pRes))
++#define sqliteBtreePrevious(pCur, pRes)   (btCOps(pCur)->Previous(pCur, pRes))
++#define sqliteBtreeKeySize(pCur, pSize)   (btCOps(pCur)->KeySize(pCur, pSize) )
++#define sqliteBtreeKey(pCur, offset, amt, zBuf)\
++                (btCOps(pCur)->Key(pCur, offset, amt, zBuf))
++#define sqliteBtreeKeyCompare(pCur, pKey, nKey, nIgnore, pRes)\
++                (btCOps(pCur)->KeyCompare(pCur, pKey, nKey, nIgnore, pRes))
++#define sqliteBtreeDataSize(pCur, pSize)  (btCOps(pCur)->DataSize(pCur, pSize))
++#define sqliteBtreeData(pCur, offset, amt, zBuf)\
++                (btCOps(pCur)->Data(pCur, offset, amt, zBuf))
++#define sqliteBtreeCloseCursor(pCur)      (btCOps(pCur)->CloseCursor(pCur))
++#define sqliteBtreeGetMeta(pBt, aMeta)    (btOps(pBt)->GetMeta(pBt, aMeta))
++#define sqliteBtreeUpdateMeta(pBt, aMeta) (btOps(pBt)->UpdateMeta(pBt, aMeta))
++#define sqliteBtreeIntegrityCheck(pBt, aRoot, nRoot)\
++                (btOps(pBt)->IntegrityCheck(pBt, aRoot, nRoot))
++#define sqliteBtreeGetFilename(pBt)       (btOps(pBt)->GetFilename(pBt))
++#define sqliteBtreeCopyFile(pBt1, pBt2)   (btOps(pBt1)->Copyfile(pBt1, pBt2))
++#define sqliteBtreePager(pBt)             (btOps(pBt)->Pager(pBt))
++
++#ifdef SQLITE_TEST
++#define sqliteBtreePageDump(pBt, pgno, recursive)\
++                (btOps(pBt)->PageDump(pBt, pgno, recursive))
++#define sqliteBtreeCursorDump(pCur, aResult)\
++                (btCOps(pCur)->CursorDump(pCur, aResult))
++int btree_native_byte_order;
++#endif /* SQLITE_TEST */
++
++
++#endif /* _BTREE_H_ */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/btree_rb.c
+@@ -0,0 +1,1488 @@
++/*
++** 2003 Feb 4
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** $Id$
++**
++** This file implements an in-core database using Red-Black balanced
++** binary trees.
++** 
++** It was contributed to SQLite by anonymous on 2003-Feb-04 23:24:49 UTC.
++*/
++#include "btree.h"
++#include "sqliteInt.h"
++#include <assert.h>
++
++/*
++** Omit this whole file if the SQLITE_OMIT_INMEMORYDB macro is
++** defined.  This allows a lot of code to be omitted for installations
++** that do not need it.
++*/
++#ifndef SQLITE_OMIT_INMEMORYDB
++
++
++typedef struct BtRbTree BtRbTree;
++typedef struct BtRbNode BtRbNode;
++typedef struct BtRollbackOp BtRollbackOp;
++typedef struct Rbtree Rbtree;
++typedef struct RbtCursor RbtCursor;
++
++/* Forward declarations */
++static BtOps sqliteRbtreeOps;
++static BtCursorOps sqliteRbtreeCursorOps;
++
++/*
++ * During each transaction (or checkpoint), a linked-list of
++ * "rollback-operations" is accumulated. If the transaction is rolled back,
++ * then the list of operations must be executed (to restore the database to
++ * it's state before the transaction started). If the transaction is to be
++ * committed, just delete the list.
++ *
++ * Each operation is represented as follows, depending on the value of eOp:
++ *
++ * ROLLBACK_INSERT  ->  Need to insert (pKey, pData) into table iTab.
++ * ROLLBACK_DELETE  ->  Need to delete the record (pKey) into table iTab.
++ * ROLLBACK_CREATE  ->  Need to create table iTab.
++ * ROLLBACK_DROP    ->  Need to drop table iTab.
++ */
++struct BtRollbackOp {
++  u8 eOp;
++  int iTab;
++  int nKey; 
++  void *pKey;
++  int nData;
++  void *pData;
++  BtRollbackOp *pNext;
++};
++
++/*
++** Legal values for BtRollbackOp.eOp:
++*/
++#define ROLLBACK_INSERT 1 /* Insert a record */
++#define ROLLBACK_DELETE 2 /* Delete a record */
++#define ROLLBACK_CREATE 3 /* Create a table */
++#define ROLLBACK_DROP   4 /* Drop a table */
++
++struct Rbtree {
++  BtOps *pOps;    /* Function table */
++  int aMetaData[SQLITE_N_BTREE_META];
++
++  int next_idx;   /* next available table index */
++  Hash tblHash;   /* All created tables, by index */
++  u8 isAnonymous; /* True if this Rbtree is to be deleted when closed */
++  u8 eTransState; /* State of this Rbtree wrt transactions */
++
++  BtRollbackOp *pTransRollback; 
++  BtRollbackOp *pCheckRollback;
++  BtRollbackOp *pCheckRollbackTail;
++};
++
++/*
++** Legal values for Rbtree.eTransState.
++*/
++#define TRANS_NONE           0  /* No transaction is in progress */
++#define TRANS_INTRANSACTION  1  /* A transaction is in progress */
++#define TRANS_INCHECKPOINT   2  /* A checkpoint is in progress  */
++#define TRANS_ROLLBACK       3  /* We are currently rolling back a checkpoint or
++                                 * transaction. */
++
++struct RbtCursor {
++  BtCursorOps *pOps;        /* Function table */
++  Rbtree    *pRbtree;
++  BtRbTree *pTree;
++  int       iTree;          /* Index of pTree in pRbtree */
++  BtRbNode *pNode;
++  RbtCursor *pShared;       /* List of all cursors on the same Rbtree */
++  u8 eSkip;                 /* Determines if next step operation is a no-op */
++  u8 wrFlag;                /* True if this cursor is open for writing */
++};
++
++/*
++** Legal values for RbtCursor.eSkip.
++*/
++#define SKIP_NONE     0   /* Always step the cursor */
++#define SKIP_NEXT     1   /* The next sqliteRbtreeNext() is a no-op */
++#define SKIP_PREV     2   /* The next sqliteRbtreePrevious() is a no-op */
++#define SKIP_INVALID  3   /* Calls to Next() and Previous() are invalid */
++
++struct BtRbTree {
++  RbtCursor *pCursors;     /* All cursors pointing to this tree */
++  BtRbNode *pHead;         /* Head of the tree, or NULL */
++};
++
++struct BtRbNode {
++  int nKey;
++  void *pKey;
++  int nData;
++  void *pData;
++  u8 isBlack;        /* true for a black node, 0 for a red node */
++  BtRbNode *pParent; /* Nodes parent node, NULL for the tree head */
++  BtRbNode *pLeft;   /* Nodes left child, or NULL */
++  BtRbNode *pRight;  /* Nodes right child, or NULL */
++
++  int nBlackHeight;  /* Only used during the red-black integrity check */
++};
++
++/* Forward declarations */
++static int memRbtreeMoveto(
++  RbtCursor* pCur,
++  const void *pKey,
++  int nKey,
++  int *pRes
++);
++static int memRbtreeClearTable(Rbtree* tree, int n);
++static int memRbtreeNext(RbtCursor* pCur, int *pRes);
++static int memRbtreeLast(RbtCursor* pCur, int *pRes);
++static int memRbtreePrevious(RbtCursor* pCur, int *pRes);
++
++
++/*
++** This routine checks all cursors that point to the same table
++** as pCur points to.  If any of those cursors were opened with
++** wrFlag==0 then this routine returns SQLITE_LOCKED.  If all
++** cursors point to the same table were opened with wrFlag==1
++** then this routine returns SQLITE_OK.
++**
++** In addition to checking for read-locks (where a read-lock 
++** means a cursor opened with wrFlag==0) this routine also NULLs
++** out the pNode field of all other cursors.
++** This is necessary because an insert 
++** or delete might change erase the node out from under
++** another cursor.
++*/
++static int checkReadLocks(RbtCursor *pCur){
++  RbtCursor *p;
++  assert( pCur->wrFlag );
++  for(p=pCur->pTree->pCursors; p; p=p->pShared){
++    if( p!=pCur ){
++      if( p->wrFlag==0 ) return SQLITE_LOCKED;
++      p->pNode = 0;
++    }
++  }
++  return SQLITE_OK;
++}
++
++/*
++ * The key-compare function for the red-black trees. Returns as follows:
++ *
++ * (key1 < key2)             -1
++ * (key1 == key2)             0 
++ * (key1 > key2)              1
++ *
++ * Keys are compared using memcmp(). If one key is an exact prefix of the
++ * other, then the shorter key is less than the longer key.
++ */
++static int key_compare(void const*pKey1, int nKey1, void const*pKey2, int nKey2)
++{
++  int mcmp = memcmp(pKey1, pKey2, (nKey1 <= nKey2)?nKey1:nKey2);
++  if( mcmp == 0){
++    if( nKey1 == nKey2 ) return 0;
++    return ((nKey1 < nKey2)?-1:1);
++  }
++  return ((mcmp>0)?1:-1);
++}
++
++/*
++ * Perform the LEFT-rotate transformation on node X of tree pTree. This
++ * transform is part of the red-black balancing code.
++ *
++ *        |                   |
++ *        X                   Y
++ *       / \                 / \
++ *      a   Y               X   c
++ *         / \             / \
++ *        b   c           a   b
++ *
++ *      BEFORE              AFTER
++ */
++static void leftRotate(BtRbTree *pTree, BtRbNode *pX)
++{
++  BtRbNode *pY;
++  BtRbNode *pb;
++  pY = pX->pRight;
++  pb = pY->pLeft;
++
++  pY->pParent = pX->pParent;
++  if( pX->pParent ){
++    if( pX->pParent->pLeft == pX ) pX->pParent->pLeft = pY;
++    else pX->pParent->pRight = pY;
++  }
++  pY->pLeft = pX;
++  pX->pParent = pY;
++  pX->pRight = pb;
++  if( pb ) pb->pParent = pX;
++  if( pTree->pHead == pX ) pTree->pHead = pY;
++}
++
++/*
++ * Perform the RIGHT-rotate transformation on node X of tree pTree. This
++ * transform is part of the red-black balancing code.
++ *
++ *        |                   |
++ *        X                   Y
++ *       / \                 / \
++ *      Y   c               a   X
++ *     / \                     / \
++ *    a   b                   b   c
++ *
++ *      BEFORE              AFTER
++ */
++static void rightRotate(BtRbTree *pTree, BtRbNode *pX)
++{
++  BtRbNode *pY;
++  BtRbNode *pb;
++  pY = pX->pLeft;
++  pb = pY->pRight;
++
++  pY->pParent = pX->pParent;
++  if( pX->pParent ){
++    if( pX->pParent->pLeft == pX ) pX->pParent->pLeft = pY;
++    else pX->pParent->pRight = pY;
++  }
++  pY->pRight = pX;
++  pX->pParent = pY;
++  pX->pLeft = pb;
++  if( pb ) pb->pParent = pX;
++  if( pTree->pHead == pX ) pTree->pHead = pY;
++}
++
++/*
++ * A string-manipulation helper function for check_redblack_tree(). If (orig ==
++ * NULL) a copy of val is returned. If (orig != NULL) then a copy of the *
++ * concatenation of orig and val is returned. The original orig is deleted
++ * (using sqliteFree()).
++ */
++static char *append_val(char * orig, char const * val){
++  char *z;
++  if( !orig ){
++    z = sqliteStrDup( val );
++  } else{
++    z = 0;
++    sqliteSetString(&z, orig, val, (char*)0);
++    sqliteFree( orig );
++  }
++  return z;
++}
++
++/*
++ * Append a string representation of the entire node to orig and return it.
++ * This is used to produce debugging information if check_redblack_tree() finds
++ * a problem with a red-black binary tree.
++ */
++static char *append_node(char * orig, BtRbNode *pNode, int indent)
++{
++  char buf[128];
++  int i;
++
++  for( i=0; i<indent; i++ ){
++      orig = append_val(orig, " ");
++  }
++
++  sprintf(buf, "%p", pNode);
++  orig = append_val(orig, buf);
++
++  if( pNode ){
++    indent += 3;
++    if( pNode->isBlack ){
++      orig = append_val(orig, " B \n");
++    }else{
++      orig = append_val(orig, " R \n");
++    }
++    orig = append_node( orig, pNode->pLeft, indent );
++    orig = append_node( orig, pNode->pRight, indent );
++  }else{
++    orig = append_val(orig, "\n");
++  }
++  return orig;
++}
++
++/*
++ * Print a representation of a node to stdout. This function is only included
++ * so you can call it from within a debugger if things get really bad.  It
++ * is not called from anyplace in the code.
++ */
++static void print_node(BtRbNode *pNode)
++{
++    char * str = append_node(0, pNode, 0);
++    printf("%s", str);
++
++    /* Suppress a warning message about print_node() being unused */
++    (void)print_node;
++}
++
++/* 
++ * Check the following properties of the red-black tree:
++ * (1) - If a node is red, both of it's children are black
++ * (2) - Each path from a given node to a leaf (NULL) node passes thru the
++ *       same number of black nodes 
++ *
++ * If there is a problem, append a description (using append_val() ) to *msg.
++ */
++static void check_redblack_tree(BtRbTree * tree, char ** msg)
++{
++  BtRbNode *pNode;
++
++  /* 0 -> came from parent 
++   * 1 -> came from left
++   * 2 -> came from right */
++  int prev_step = 0;
++
++  pNode = tree->pHead;
++  while( pNode ){
++    switch( prev_step ){
++      case 0:
++        if( pNode->pLeft ){
++          pNode = pNode->pLeft;
++        }else{ 
++          prev_step = 1;
++        }
++        break;
++      case 1:
++        if( pNode->pRight ){
++          pNode = pNode->pRight;
++          prev_step = 0;
++        }else{
++          prev_step = 2;
++        }
++        break;
++      case 2:
++        /* Check red-black property (1) */
++        if( !pNode->isBlack &&
++            ( (pNode->pLeft && !pNode->pLeft->isBlack) ||
++              (pNode->pRight && !pNode->pRight->isBlack) )
++          ){
++          char buf[128];
++          sprintf(buf, "Red node with red child at %p\n", pNode);
++          *msg = append_val(*msg, buf);
++          *msg = append_node(*msg, tree->pHead, 0);
++          *msg = append_val(*msg, "\n");
++        }
++
++        /* Check red-black property (2) */
++        { 
++          int leftHeight = 0;
++          int rightHeight = 0;
++          if( pNode->pLeft ){
++            leftHeight += pNode->pLeft->nBlackHeight;
++            leftHeight += (pNode->pLeft->isBlack?1:0);
++          }
++          if( pNode->pRight ){
++            rightHeight += pNode->pRight->nBlackHeight;
++            rightHeight += (pNode->pRight->isBlack?1:0);
++          }
++          if( leftHeight != rightHeight ){
++            char buf[128];
++            sprintf(buf, "Different black-heights at %p\n", pNode);
++            *msg = append_val(*msg, buf);
++            *msg = append_node(*msg, tree->pHead, 0);
++            *msg = append_val(*msg, "\n");
++          }
++          pNode->nBlackHeight = leftHeight;
++        }
++
++        if( pNode->pParent ){
++          if( pNode == pNode->pParent->pLeft ) prev_step = 1;
++          else prev_step = 2;
++        }
++        pNode = pNode->pParent;
++        break;
++      default: assert(0);
++    }
++  }
++} 
++
++/*
++ * Node pX has just been inserted into pTree (by code in sqliteRbtreeInsert()).
++ * It is possible that pX is a red node with a red parent, which is a violation
++ * of the red-black tree properties. This function performs rotations and 
++ * color changes to rebalance the tree
++ */
++static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX)
++{
++  /* In the first iteration of this loop, pX points to the red node just
++   * inserted in the tree. If the parent of pX exists (pX is not the root
++   * node) and is red, then the properties of the red-black tree are
++   * violated.
++   *
++   * At the start of any subsequent iterations, pX points to a red node
++   * with a red parent. In all other respects the tree is a legal red-black
++   * binary tree. */
++  while( pX != pTree->pHead && !pX->pParent->isBlack ){
++    BtRbNode *pUncle;
++    BtRbNode *pGrandparent;
++
++    /* Grandparent of pX must exist and must be black. */
++    pGrandparent = pX->pParent->pParent;
++    assert( pGrandparent );
++    assert( pGrandparent->isBlack );
++
++    /* Uncle of pX may or may not exist. */
++    if( pX->pParent == pGrandparent->pLeft ) 
++      pUncle = pGrandparent->pRight;
++    else 
++      pUncle = pGrandparent->pLeft;
++
++    /* If the uncle of pX exists and is red, we do the following:
++     *       |                 |
++     *      G(b)              G(r)
++     *      /  \              /  \        
++     *   U(r)   P(r)       U(b)  P(b)
++     *            \                \
++     *           X(r)              X(r)
++     *
++     *     BEFORE             AFTER
++     * pX is then set to G. If the parent of G is red, then the while loop
++     * will run again.  */
++    if( pUncle && !pUncle->isBlack ){
++      pGrandparent->isBlack = 0;
++      pUncle->isBlack = 1;
++      pX->pParent->isBlack = 1;
++      pX = pGrandparent;
++    }else{
++
++      if( pX->pParent == pGrandparent->pLeft ){
++        if( pX == pX->pParent->pRight ){
++          /* If pX is a right-child, do the following transform, essentially
++           * to change pX into a left-child: 
++           *       |                  | 
++           *      G(b)               G(b)
++           *      /  \               /  \        
++           *   P(r)   U(b)        X(r)  U(b)
++           *      \                /
++           *     X(r)            P(r) <-- new X
++           *
++           *     BEFORE             AFTER
++           */
++          pX = pX->pParent;
++          leftRotate(pTree, pX);
++        }
++
++        /* Do the following transform, which balances the tree :) 
++         *       |                  | 
++         *      G(b)               P(b)
++         *      /  \               /  \        
++         *   P(r)   U(b)        X(r)  G(r)
++         *    /                         \
++         *  X(r)                        U(b)
++         *
++         *     BEFORE             AFTER
++         */
++        assert( pGrandparent == pX->pParent->pParent );
++        pGrandparent->isBlack = 0;
++        pX->pParent->isBlack = 1;
++        rightRotate( pTree, pGrandparent );
++
++      }else{
++        /* This code is symetric to the illustrated case above. */
++        if( pX == pX->pParent->pLeft ){
++          pX = pX->pParent;
++          rightRotate(pTree, pX);
++        }
++        assert( pGrandparent == pX->pParent->pParent );
++        pGrandparent->isBlack = 0;
++        pX->pParent->isBlack = 1;
++        leftRotate( pTree, pGrandparent );
++      }
++    }
++  }
++  pTree->pHead->isBlack = 1;
++}
++
++/*
++ * A child of pParent, which in turn had child pX, has just been removed from 
++ * pTree (the figure below depicts the operation, Z is being removed). pParent
++ * or pX, or both may be NULL.  
++ *                |           |
++ *                P           P
++ *               / \         / \
++ *              Z           X
++ *             / \
++ *            X  nil
++ *
++ * This function is only called if Z was black. In this case the red-black tree
++ * properties have been violated, and pX has an "extra black". This function 
++ * performs rotations and color-changes to re-balance the tree.
++ */
++static 
++void do_delete_balancing(BtRbTree *pTree, BtRbNode *pX, BtRbNode *pParent)
++{
++  BtRbNode *pSib; 
++
++  /* TODO: Comment this code! */
++  while( pX != pTree->pHead && (!pX || pX->isBlack) ){
++    if( pX == pParent->pLeft ){
++      pSib = pParent->pRight;
++      if( pSib && !(pSib->isBlack) ){
++        pSib->isBlack = 1;
++        pParent->isBlack = 0;
++        leftRotate(pTree, pParent);
++        pSib = pParent->pRight;
++      }
++      if( !pSib ){
++        pX = pParent;
++      }else if( 
++          (!pSib->pLeft  || pSib->pLeft->isBlack) &&
++          (!pSib->pRight || pSib->pRight->isBlack) ) {
++        pSib->isBlack = 0;
++        pX = pParent;
++      }else{
++        if( (!pSib->pRight || pSib->pRight->isBlack) ){
++          if( pSib->pLeft ) pSib->pLeft->isBlack = 1;
++          pSib->isBlack = 0;
++          rightRotate( pTree, pSib );
++          pSib = pParent->pRight;
++        }
++        pSib->isBlack = pParent->isBlack;
++        pParent->isBlack = 1;
++        if( pSib->pRight ) pSib->pRight->isBlack = 1;
++        leftRotate(pTree, pParent);
++        pX = pTree->pHead;
++      }
++    }else{
++      pSib = pParent->pLeft;
++      if( pSib && !(pSib->isBlack) ){
++        pSib->isBlack = 1;
++        pParent->isBlack = 0;
++        rightRotate(pTree, pParent);
++        pSib = pParent->pLeft;
++      }
++      if( !pSib ){
++        pX = pParent;
++      }else if( 
++          (!pSib->pLeft  || pSib->pLeft->isBlack) &&
++          (!pSib->pRight || pSib->pRight->isBlack) ){
++        pSib->isBlack = 0;
++        pX = pParent;
++      }else{
++        if( (!pSib->pLeft || pSib->pLeft->isBlack) ){
++          if( pSib->pRight ) pSib->pRight->isBlack = 1;
++          pSib->isBlack = 0;
++          leftRotate( pTree, pSib );
++          pSib = pParent->pLeft;
++        }
++        pSib->isBlack = pParent->isBlack;
++        pParent->isBlack = 1;
++        if( pSib->pLeft ) pSib->pLeft->isBlack = 1;
++        rightRotate(pTree, pParent);
++        pX = pTree->pHead;
++      }
++    }
++    pParent = pX->pParent;
++  }
++  if( pX ) pX->isBlack = 1;
++}
++
++/*
++ * Create table n in tree pRbtree. Table n must not exist.
++ */
++static void btreeCreateTable(Rbtree* pRbtree, int n)
++{
++  BtRbTree *pNewTbl = sqliteMalloc(sizeof(BtRbTree));
++  sqliteHashInsert(&pRbtree->tblHash, 0, n, pNewTbl);
++}
++
++/*
++ * Log a single "rollback-op" for the given Rbtree. See comments for struct
++ * BtRollbackOp.
++ */
++static void btreeLogRollbackOp(Rbtree* pRbtree, BtRollbackOp *pRollbackOp)
++{
++  assert( pRbtree->eTransState == TRANS_INCHECKPOINT ||
++      pRbtree->eTransState == TRANS_INTRANSACTION );
++  if( pRbtree->eTransState == TRANS_INTRANSACTION ){
++    pRollbackOp->pNext = pRbtree->pTransRollback;
++    pRbtree->pTransRollback = pRollbackOp;
++  }
++  if( pRbtree->eTransState == TRANS_INCHECKPOINT ){
++    if( !pRbtree->pCheckRollback ){
++      pRbtree->pCheckRollbackTail = pRollbackOp;
++    }
++    pRollbackOp->pNext = pRbtree->pCheckRollback;
++    pRbtree->pCheckRollback = pRollbackOp;
++  }
++}
++
++int sqliteRbtreeOpen(
++  const char *zFilename,
++  int mode,
++  int nPg,
++  Btree **ppBtree
++){
++  Rbtree **ppRbtree = (Rbtree**)ppBtree;
++  *ppRbtree = (Rbtree *)sqliteMalloc(sizeof(Rbtree));
++  if( sqlite_malloc_failed ) goto open_no_mem;
++  sqliteHashInit(&(*ppRbtree)->tblHash, SQLITE_HASH_INT, 0);
++
++  /* Create a binary tree for the SQLITE_MASTER table at location 2 */
++  btreeCreateTable(*ppRbtree, 2);
++  if( sqlite_malloc_failed ) goto open_no_mem;
++  (*ppRbtree)->next_idx = 3;
++  (*ppRbtree)->pOps = &sqliteRbtreeOps;
++  /* Set file type to 4; this is so that "attach ':memory:' as ...."  does not
++  ** think that the database in uninitialised and refuse to attach
++  */
++  (*ppRbtree)->aMetaData[2] = 4;
++  
++  return SQLITE_OK;
++
++open_no_mem:
++  *ppBtree = 0;
++  return SQLITE_NOMEM;
++}
++
++/*
++ * Create a new table in the supplied Rbtree. Set *n to the new table number.
++ * Return SQLITE_OK if the operation is a success.
++ */
++static int memRbtreeCreateTable(Rbtree* tree, int* n)
++{
++  assert( tree->eTransState != TRANS_NONE );
++
++  *n = tree->next_idx++;
++  btreeCreateTable(tree, *n);
++  if( sqlite_malloc_failed ) return SQLITE_NOMEM;
++
++  /* Set up the rollback structure (if we are not doing this as part of a
++   * rollback) */
++  if( tree->eTransState != TRANS_ROLLBACK ){
++    BtRollbackOp *pRollbackOp = sqliteMalloc(sizeof(BtRollbackOp));
++    if( pRollbackOp==0 ) return SQLITE_NOMEM;
++    pRollbackOp->eOp = ROLLBACK_DROP;
++    pRollbackOp->iTab = *n;
++    btreeLogRollbackOp(tree, pRollbackOp);
++  }
++
++  return SQLITE_OK;
++}
++
++/*
++ * Delete table n from the supplied Rbtree. 
++ */
++static int memRbtreeDropTable(Rbtree* tree, int n)
++{
++  BtRbTree *pTree;
++  assert( tree->eTransState != TRANS_NONE );
++
++  memRbtreeClearTable(tree, n);
++  pTree = sqliteHashInsert(&tree->tblHash, 0, n, 0);
++  assert(pTree);
++  assert( pTree->pCursors==0 );
++  sqliteFree(pTree);
++
++  if( tree->eTransState != TRANS_ROLLBACK ){
++    BtRollbackOp *pRollbackOp = sqliteMalloc(sizeof(BtRollbackOp));
++    if( pRollbackOp==0 ) return SQLITE_NOMEM;
++    pRollbackOp->eOp = ROLLBACK_CREATE;
++    pRollbackOp->iTab = n;
++    btreeLogRollbackOp(tree, pRollbackOp);
++  }
++
++  return SQLITE_OK;
++}
++
++static int memRbtreeKeyCompare(RbtCursor* pCur, const void *pKey, int nKey,
++                                 int nIgnore, int *pRes)
++{
++  assert(pCur);
++
++  if( !pCur->pNode ) {
++    *pRes = -1;
++  } else {
++    if( (pCur->pNode->nKey - nIgnore) < 0 ){
++      *pRes = -1;
++    }else{
++      *pRes = key_compare(pCur->pNode->pKey, pCur->pNode->nKey-nIgnore, 
++          pKey, nKey);
++    }
++  }
++  return SQLITE_OK;
++}
++
++/*
++ * Get a new cursor for table iTable of the supplied Rbtree. The wrFlag
++ * parameter indicates that the cursor is open for writing.
++ *
++ * Note that RbtCursor.eSkip and RbtCursor.pNode both initialize to 0.
++ */
++static int memRbtreeCursor(
++  Rbtree* tree,
++  int iTable,
++  int wrFlag,
++  RbtCursor **ppCur
++){
++  RbtCursor *pCur;
++  assert(tree);
++  pCur = *ppCur = sqliteMalloc(sizeof(RbtCursor));
++  if( sqlite_malloc_failed ) return SQLITE_NOMEM;
++  pCur->pTree  = sqliteHashFind(&tree->tblHash, 0, iTable);
++  assert( pCur->pTree );
++  pCur->pRbtree = tree;
++  pCur->iTree  = iTable;
++  pCur->pOps = &sqliteRbtreeCursorOps;
++  pCur->wrFlag = wrFlag;
++  pCur->pShared = pCur->pTree->pCursors;
++  pCur->pTree->pCursors = pCur;
++
++  assert( (*ppCur)->pTree );
++  return SQLITE_OK;
++}
++
++/*
++ * Insert a new record into the Rbtree.  The key is given by (pKey,nKey)
++ * and the data is given by (pData,nData).  The cursor is used only to
++ * define what database the record should be inserted into.  The cursor
++ * is left pointing at the new record.
++ *
++ * If the key exists already in the tree, just replace the data. 
++ */
++static int memRbtreeInsert(
++  RbtCursor* pCur,
++  const void *pKey,
++  int nKey,
++  const void *pDataInput,
++  int nData
++){
++  void * pData;
++  int match;
++
++  /* It is illegal to call sqliteRbtreeInsert() if we are
++  ** not in a transaction */
++  assert( pCur->pRbtree->eTransState != TRANS_NONE );
++
++  /* Make sure some other cursor isn't trying to read this same table */
++  if( checkReadLocks(pCur) ){
++    return SQLITE_LOCKED; /* The table pCur points to has a read lock */
++  }
++
++  /* Take a copy of the input data now, in case we need it for the 
++   * replace case */
++  pData = sqliteMallocRaw(nData);
++  if( sqlite_malloc_failed ) return SQLITE_NOMEM;
++  memcpy(pData, pDataInput, nData);
++
++  /* Move the cursor to a node near the key to be inserted. If the key already
++   * exists in the table, then (match == 0). In this case we can just replace
++   * the data associated with the entry, we don't need to manipulate the tree.
++   * 
++   * If there is no exact match, then the cursor points at what would be either
++   * the predecessor (match == -1) or successor (match == 1) of the
++   * searched-for key, were it to be inserted. The new node becomes a child of
++   * this node.
++   * 
++   * The new node is initially red.
++   */
++  memRbtreeMoveto( pCur, pKey, nKey, &match);
++  if( match ){
++    BtRbNode *pNode = sqliteMalloc(sizeof(BtRbNode));
++    if( pNode==0 ) return SQLITE_NOMEM;
++    pNode->nKey = nKey;
++    pNode->pKey = sqliteMallocRaw(nKey);
++    if( sqlite_malloc_failed ) return SQLITE_NOMEM;
++    memcpy(pNode->pKey, pKey, nKey);
++    pNode->nData = nData;
++    pNode->pData = pData; 
++    if( pCur->pNode ){
++      switch( match ){
++        case -1:
++          assert( !pCur->pNode->pRight );
++          pNode->pParent = pCur->pNode;
++          pCur->pNode->pRight = pNode;
++          break;
++        case 1:
++          assert( !pCur->pNode->pLeft );
++          pNode->pParent = pCur->pNode;
++          pCur->pNode->pLeft = pNode;
++          break;
++        default:
++          assert(0);
++      }
++    }else{
++      pCur->pTree->pHead = pNode;
++    }
++
++    /* Point the cursor at the node just inserted, as per SQLite requirements */
++    pCur->pNode = pNode;
++
++    /* A new node has just been inserted, so run the balancing code */
++    do_insert_balancing(pCur->pTree, pNode);
++
++    /* Set up a rollback-op in case we have to roll this operation back */
++    if( pCur->pRbtree->eTransState != TRANS_ROLLBACK ){
++      BtRollbackOp *pOp = sqliteMalloc( sizeof(BtRollbackOp) );
++      if( pOp==0 ) return SQLITE_NOMEM;
++      pOp->eOp = ROLLBACK_DELETE;
++      pOp->iTab = pCur->iTree;
++      pOp->nKey = pNode->nKey;
++      pOp->pKey = sqliteMallocRaw( pOp->nKey );
++      if( sqlite_malloc_failed ) return SQLITE_NOMEM;
++      memcpy( pOp->pKey, pNode->pKey, pOp->nKey );
++      btreeLogRollbackOp(pCur->pRbtree, pOp);
++    }
++
++  }else{ 
++    /* No need to insert a new node in the tree, as the key already exists.
++     * Just clobber the current nodes data. */
++
++    /* Set up a rollback-op in case we have to roll this operation back */
++    if( pCur->pRbtree->eTransState != TRANS_ROLLBACK ){
++      BtRollbackOp *pOp = sqliteMalloc( sizeof(BtRollbackOp) );
++      if( pOp==0 ) return SQLITE_NOMEM;
++      pOp->iTab = pCur->iTree;
++      pOp->nKey = pCur->pNode->nKey;
++      pOp->pKey = sqliteMallocRaw( pOp->nKey );
++      if( sqlite_malloc_failed ) return SQLITE_NOMEM;
++      memcpy( pOp->pKey, pCur->pNode->pKey, pOp->nKey );
++      pOp->nData = pCur->pNode->nData;
++      pOp->pData = pCur->pNode->pData;
++      pOp->eOp = ROLLBACK_INSERT;
++      btreeLogRollbackOp(pCur->pRbtree, pOp);
++    }else{
++      sqliteFree( pCur->pNode->pData );
++    }
++
++    /* Actually clobber the nodes data */
++    pCur->pNode->pData = pData;
++    pCur->pNode->nData = nData;
++  }
++
++  return SQLITE_OK;
++}
++
++/* Move the cursor so that it points to an entry near pKey.
++** Return a success code.
++**
++**     *pRes<0      The cursor is left pointing at an entry that
++**                  is smaller than pKey or if the table is empty
++**                  and the cursor is therefore left point to nothing.
++**
++**     *pRes==0     The cursor is left pointing at an entry that
++**                  exactly matches pKey.
++**
++**     *pRes>0      The cursor is left pointing at an entry that
++**                  is larger than pKey.
++*/
++static int memRbtreeMoveto(
++  RbtCursor* pCur,
++  const void *pKey,
++  int nKey,
++  int *pRes
++){
++  BtRbNode *pTmp = 0;
++
++  pCur->pNode = pCur->pTree->pHead;
++  *pRes = -1;
++  while( pCur->pNode && *pRes ) {
++    *pRes = key_compare(pCur->pNode->pKey, pCur->pNode->nKey, pKey, nKey);
++    pTmp = pCur->pNode;
++    switch( *pRes ){
++      case 1:    /* cursor > key */
++        pCur->pNode = pCur->pNode->pLeft;
++        break;
++      case -1:   /* cursor < key */
++        pCur->pNode = pCur->pNode->pRight;
++        break;
++    }
++  } 
++
++  /* If (pCur->pNode == NULL), then we have failed to find a match. Set
++   * pCur->pNode to pTmp, which is either NULL (if the tree is empty) or the
++   * last node traversed in the search. In either case the relation ship
++   * between pTmp and the searched for key is already stored in *pRes. pTmp is
++   * either the successor or predecessor of the key we tried to move to. */
++  if( !pCur->pNode ) pCur->pNode = pTmp;
++  pCur->eSkip = SKIP_NONE;
++
++  return SQLITE_OK;
++}
++
++
++/*
++** Delete the entry that the cursor is pointing to.
++**
++** The cursor is left pointing at either the next or the previous
++** entry.  If the cursor is left pointing to the next entry, then 
++** the pCur->eSkip flag is set to SKIP_NEXT which forces the next call to 
++** sqliteRbtreeNext() to be a no-op.  That way, you can always call
++** sqliteRbtreeNext() after a delete and the cursor will be left
++** pointing to the first entry after the deleted entry.  Similarly,
++** pCur->eSkip is set to SKIP_PREV is the cursor is left pointing to
++** the entry prior to the deleted entry so that a subsequent call to
++** sqliteRbtreePrevious() will always leave the cursor pointing at the
++** entry immediately before the one that was deleted.
++*/
++static int memRbtreeDelete(RbtCursor* pCur)
++{
++  BtRbNode *pZ;      /* The one being deleted */
++  BtRbNode *pChild;  /* The child of the spliced out node */
++
++  /* It is illegal to call sqliteRbtreeDelete() if we are
++  ** not in a transaction */
++  assert( pCur->pRbtree->eTransState != TRANS_NONE );
++
++  /* Make sure some other cursor isn't trying to read this same table */
++  if( checkReadLocks(pCur) ){
++    return SQLITE_LOCKED; /* The table pCur points to has a read lock */
++  }
++
++  pZ = pCur->pNode;
++  if( !pZ ){
++    return SQLITE_OK;
++  }
++
++  /* If we are not currently doing a rollback, set up a rollback op for this 
++   * deletion */
++  if( pCur->pRbtree->eTransState != TRANS_ROLLBACK ){
++    BtRollbackOp *pOp = sqliteMalloc( sizeof(BtRollbackOp) );
++    if( pOp==0 ) return SQLITE_NOMEM;
++    pOp->iTab = pCur->iTree;
++    pOp->nKey = pZ->nKey;
++    pOp->pKey = pZ->pKey;
++    pOp->nData = pZ->nData;
++    pOp->pData = pZ->pData;
++    pOp->eOp = ROLLBACK_INSERT;
++    btreeLogRollbackOp(pCur->pRbtree, pOp);
++  }
++
++  /* First do a standard binary-tree delete (node pZ is to be deleted). How
++   * to do this depends on how many children pZ has:
++   *
++   * If pZ has no children or one child, then splice out pZ.  If pZ has two
++   * children, splice out the successor of pZ and replace the key and data of
++   * pZ with the key and data of the spliced out successor.  */
++  if( pZ->pLeft && pZ->pRight ){
++    BtRbNode *pTmp;
++    int dummy;
++    pCur->eSkip = SKIP_NONE;
++    memRbtreeNext(pCur, &dummy);
++    assert( dummy == 0 );
++    if( pCur->pRbtree->eTransState == TRANS_ROLLBACK ){
++      sqliteFree(pZ->pKey);
++      sqliteFree(pZ->pData);
++    }
++    pZ->pData = pCur->pNode->pData;
++    pZ->nData = pCur->pNode->nData;
++    pZ->pKey = pCur->pNode->pKey;
++    pZ->nKey = pCur->pNode->nKey;
++    pTmp = pZ;
++    pZ = pCur->pNode;
++    pCur->pNode = pTmp;
++    pCur->eSkip = SKIP_NEXT;
++  }else{
++    int res;
++    pCur->eSkip = SKIP_NONE;
++    memRbtreeNext(pCur, &res);
++    pCur->eSkip = SKIP_NEXT;
++    if( res ){
++      memRbtreeLast(pCur, &res);
++      memRbtreePrevious(pCur, &res);
++      pCur->eSkip = SKIP_PREV;
++    }
++    if( pCur->pRbtree->eTransState == TRANS_ROLLBACK ){
++        sqliteFree(pZ->pKey);
++        sqliteFree(pZ->pData);
++    }
++  }
++
++  /* pZ now points at the node to be spliced out. This block does the 
++   * splicing. */
++  {
++    BtRbNode **ppParentSlot = 0;
++    assert( !pZ->pLeft || !pZ->pRight ); /* pZ has at most one child */
++    pChild = ((pZ->pLeft)?pZ->pLeft:pZ->pRight);
++    if( pZ->pParent ){
++      assert( pZ == pZ->pParent->pLeft || pZ == pZ->pParent->pRight );
++      ppParentSlot = ((pZ == pZ->pParent->pLeft)
++          ?&pZ->pParent->pLeft:&pZ->pParent->pRight);
++      *ppParentSlot = pChild;
++    }else{
++      pCur->pTree->pHead = pChild;
++    }
++    if( pChild ) pChild->pParent = pZ->pParent;
++  }
++
++  /* pZ now points at the spliced out node. pChild is the only child of pZ, or
++   * NULL if pZ has no children. If pZ is black, and not the tree root, then we
++   * will have violated the "same number of black nodes in every path to a
++   * leaf" property of the red-black tree. The code in do_delete_balancing()
++   * repairs this. */
++  if( pZ->isBlack ){ 
++    do_delete_balancing(pCur->pTree, pChild, pZ->pParent);
++  }
++
++  sqliteFree(pZ);
++  return SQLITE_OK;
++}
++
++/*
++ * Empty table n of the Rbtree.
++ */
++static int memRbtreeClearTable(Rbtree* tree, int n)
++{
++  BtRbTree *pTree;
++  BtRbNode *pNode;
++
++  pTree = sqliteHashFind(&tree->tblHash, 0, n);
++  assert(pTree);
++
++  pNode = pTree->pHead;
++  while( pNode ){
++    if( pNode->pLeft ){
++      pNode = pNode->pLeft;
++    }
++    else if( pNode->pRight ){
++      pNode = pNode->pRight;
++    }
++    else {
++      BtRbNode *pTmp = pNode->pParent;
++      if( tree->eTransState == TRANS_ROLLBACK ){
++        sqliteFree( pNode->pKey );
++        sqliteFree( pNode->pData );
++      }else{
++        BtRollbackOp *pRollbackOp = sqliteMallocRaw(sizeof(BtRollbackOp));
++        if( pRollbackOp==0 ) return SQLITE_NOMEM;
++        pRollbackOp->eOp = ROLLBACK_INSERT;
++        pRollbackOp->iTab = n;
++        pRollbackOp->nKey = pNode->nKey;
++        pRollbackOp->pKey = pNode->pKey;
++        pRollbackOp->nData = pNode->nData;
++        pRollbackOp->pData = pNode->pData;
++        btreeLogRollbackOp(tree, pRollbackOp);
++      }
++      sqliteFree( pNode );
++      if( pTmp ){
++        if( pTmp->pLeft == pNode ) pTmp->pLeft = 0;
++        else if( pTmp->pRight == pNode ) pTmp->pRight = 0;
++      }
++      pNode = pTmp;
++    }
++  }
++
++  pTree->pHead = 0;
++  return SQLITE_OK;
++}
++
++static int memRbtreeFirst(RbtCursor* pCur, int *pRes)
++{
++  if( pCur->pTree->pHead ){
++    pCur->pNode = pCur->pTree->pHead;
++    while( pCur->pNode->pLeft ){
++      pCur->pNode = pCur->pNode->pLeft;
++    }
++  }
++  if( pCur->pNode ){
++    *pRes = 0;
++  }else{
++    *pRes = 1;
++  }
++  pCur->eSkip = SKIP_NONE;
++  return SQLITE_OK;
++}
++
++static int memRbtreeLast(RbtCursor* pCur, int *pRes)
++{
++  if( pCur->pTree->pHead ){
++    pCur->pNode = pCur->pTree->pHead;
++    while( pCur->pNode->pRight ){
++      pCur->pNode = pCur->pNode->pRight;
++    }
++  }
++  if( pCur->pNode ){
++    *pRes = 0;
++  }else{
++    *pRes = 1;
++  }
++  pCur->eSkip = SKIP_NONE;
++  return SQLITE_OK;
++}
++
++/*
++** Advance the cursor to the next entry in the database.  If
++** successful then set *pRes=0.  If the cursor
++** was already pointing to the last entry in the database before
++** this routine was called, then set *pRes=1.
++*/
++static int memRbtreeNext(RbtCursor* pCur, int *pRes)
++{
++  if( pCur->pNode && pCur->eSkip != SKIP_NEXT ){
++    if( pCur->pNode->pRight ){
++      pCur->pNode = pCur->pNode->pRight;
++      while( pCur->pNode->pLeft )
++        pCur->pNode = pCur->pNode->pLeft;
++    }else{
++      BtRbNode * pX = pCur->pNode;
++      pCur->pNode = pX->pParent;
++      while( pCur->pNode && (pCur->pNode->pRight == pX) ){
++        pX = pCur->pNode;
++        pCur->pNode = pX->pParent;
++      }
++    }
++  }
++  pCur->eSkip = SKIP_NONE;
++
++  if( !pCur->pNode ){
++    *pRes = 1;
++  }else{
++    *pRes = 0;
++  }
++
++  return SQLITE_OK;
++}
++
++static int memRbtreePrevious(RbtCursor* pCur, int *pRes)
++{
++  if( pCur->pNode && pCur->eSkip != SKIP_PREV ){
++    if( pCur->pNode->pLeft ){
++      pCur->pNode = pCur->pNode->pLeft;
++      while( pCur->pNode->pRight )
++        pCur->pNode = pCur->pNode->pRight;
++    }else{
++      BtRbNode * pX = pCur->pNode;
++      pCur->pNode = pX->pParent;
++      while( pCur->pNode && (pCur->pNode->pLeft == pX) ){
++        pX = pCur->pNode;
++        pCur->pNode = pX->pParent;
++      }
++    }
++  }
++  pCur->eSkip = SKIP_NONE;
++
++  if( !pCur->pNode ){
++    *pRes = 1;
++  }else{
++    *pRes = 0;
++  }
++
++  return SQLITE_OK;
++}
++
++static int memRbtreeKeySize(RbtCursor* pCur, int *pSize)
++{
++  if( pCur->pNode ){
++    *pSize = pCur->pNode->nKey;
++  }else{
++    *pSize = 0;
++  }
++  return SQLITE_OK;
++}
++
++static int memRbtreeKey(RbtCursor* pCur, int offset, int amt, char *zBuf)
++{
++  if( !pCur->pNode ) return 0;
++  if( !pCur->pNode->pKey || ((amt + offset) <= pCur->pNode->nKey) ){
++    memcpy(zBuf, ((char*)pCur->pNode->pKey)+offset, amt);
++  }else{
++    memcpy(zBuf, ((char*)pCur->pNode->pKey)+offset, pCur->pNode->nKey-offset);
++    amt = pCur->pNode->nKey-offset;
++  }
++  return amt;
++}
++
++static int memRbtreeDataSize(RbtCursor* pCur, int *pSize)
++{
++  if( pCur->pNode ){
++    *pSize = pCur->pNode->nData;
++  }else{
++    *pSize = 0;
++  }
++  return SQLITE_OK;
++}
++
++static int memRbtreeData(RbtCursor *pCur, int offset, int amt, char *zBuf)
++{
++  if( !pCur->pNode ) return 0;
++  if( (amt + offset) <= pCur->pNode->nData ){
++    memcpy(zBuf, ((char*)pCur->pNode->pData)+offset, amt);
++  }else{
++    memcpy(zBuf, ((char*)pCur->pNode->pData)+offset ,pCur->pNode->nData-offset);
++    amt = pCur->pNode->nData-offset;
++  }
++  return amt;
++}
++
++static int memRbtreeCloseCursor(RbtCursor* pCur)
++{
++  if( pCur->pTree->pCursors==pCur ){
++    pCur->pTree->pCursors = pCur->pShared;
++  }else{
++    RbtCursor *p = pCur->pTree->pCursors;
++    while( p && p->pShared!=pCur ){ p = p->pShared; }
++    assert( p!=0 );
++    if( p ){
++      p->pShared = pCur->pShared;
++    }
++  }
++  sqliteFree(pCur);
++  return SQLITE_OK;
++}
++
++static int memRbtreeGetMeta(Rbtree* tree, int* aMeta)
++{
++  memcpy( aMeta, tree->aMetaData, sizeof(int) * SQLITE_N_BTREE_META );
++  return SQLITE_OK;
++}
++
++static int memRbtreeUpdateMeta(Rbtree* tree, int* aMeta)
++{
++  memcpy( tree->aMetaData, aMeta, sizeof(int) * SQLITE_N_BTREE_META );
++  return SQLITE_OK;
++}
++
++/*
++ * Check that each table in the Rbtree meets the requirements for a red-black
++ * binary tree. If an error is found, return an explanation of the problem in 
++ * memory obtained from sqliteMalloc(). Parameters aRoot and nRoot are ignored. 
++ */
++static char *memRbtreeIntegrityCheck(Rbtree* tree, int* aRoot, int nRoot)
++{
++  char * msg = 0;
++  HashElem *p;
++
++  for(p=sqliteHashFirst(&tree->tblHash); p; p=sqliteHashNext(p)){
++    BtRbTree *pTree = sqliteHashData(p);
++    check_redblack_tree(pTree, &msg);
++  }
++
++  return msg;
++}
++
++static int memRbtreeSetCacheSize(Rbtree* tree, int sz)
++{
++  return SQLITE_OK;
++}
++
++static int memRbtreeSetSafetyLevel(Rbtree *pBt, int level){
++  return SQLITE_OK;
++}
++
++static int memRbtreeBeginTrans(Rbtree* tree)
++{
++  if( tree->eTransState != TRANS_NONE ) 
++    return SQLITE_ERROR;
++
++  assert( tree->pTransRollback == 0 );
++  tree->eTransState = TRANS_INTRANSACTION;
++  return SQLITE_OK;
++}
++
++/*
++** Delete a linked list of BtRollbackOp structures.
++*/
++static void deleteRollbackList(BtRollbackOp *pOp){
++  while( pOp ){
++    BtRollbackOp *pTmp = pOp->pNext;
++    sqliteFree(pOp->pData);
++    sqliteFree(pOp->pKey);
++    sqliteFree(pOp);
++    pOp = pTmp;
++  }
++}
++
++static int memRbtreeCommit(Rbtree* tree){
++  /* Just delete pTransRollback and pCheckRollback */
++  deleteRollbackList(tree->pCheckRollback);
++  deleteRollbackList(tree->pTransRollback);
++  tree->pTransRollback = 0;
++  tree->pCheckRollback = 0;
++  tree->pCheckRollbackTail = 0;
++  tree->eTransState = TRANS_NONE;
++  return SQLITE_OK;
++}
++
++/*
++ * Close the supplied Rbtree. Delete everything associated with it.
++ */
++static int memRbtreeClose(Rbtree* tree)
++{
++  HashElem *p;
++  memRbtreeCommit(tree);
++  while( (p=sqliteHashFirst(&tree->tblHash))!=0 ){
++    tree->eTransState = TRANS_ROLLBACK;
++    memRbtreeDropTable(tree, sqliteHashKeysize(p));
++  }
++  sqliteHashClear(&tree->tblHash);
++  sqliteFree(tree);
++  return SQLITE_OK;
++}
++
++/*
++ * Execute and delete the supplied rollback-list on pRbtree.
++ */
++static void execute_rollback_list(Rbtree *pRbtree, BtRollbackOp *pList)
++{
++  BtRollbackOp *pTmp;
++  RbtCursor cur;
++  int res;
++
++  cur.pRbtree = pRbtree;
++  cur.wrFlag = 1;
++  while( pList ){
++    switch( pList->eOp ){
++      case ROLLBACK_INSERT:
++        cur.pTree  = sqliteHashFind( &pRbtree->tblHash, 0, pList->iTab );
++        assert(cur.pTree);
++        cur.iTree  = pList->iTab;
++        cur.eSkip  = SKIP_NONE;
++        memRbtreeInsert( &cur, pList->pKey,
++            pList->nKey, pList->pData, pList->nData );
++        break;
++      case ROLLBACK_DELETE:
++        cur.pTree  = sqliteHashFind( &pRbtree->tblHash, 0, pList->iTab );
++        assert(cur.pTree);
++        cur.iTree  = pList->iTab;
++        cur.eSkip  = SKIP_NONE;
++        memRbtreeMoveto(&cur, pList->pKey, pList->nKey, &res);
++        assert(res == 0);
++        memRbtreeDelete( &cur );
++        break;
++      case ROLLBACK_CREATE:
++        btreeCreateTable(pRbtree, pList->iTab);
++        break;
++      case ROLLBACK_DROP:
++        memRbtreeDropTable(pRbtree, pList->iTab);
++        break;
++      default:
++        assert(0);
++    }
++    sqliteFree(pList->pKey);
++    sqliteFree(pList->pData);
++    pTmp = pList->pNext;
++    sqliteFree(pList);
++    pList = pTmp;
++  }
++}
++
++static int memRbtreeRollback(Rbtree* tree)
++{
++  tree->eTransState = TRANS_ROLLBACK;
++  execute_rollback_list(tree, tree->pCheckRollback);
++  execute_rollback_list(tree, tree->pTransRollback);
++  tree->pTransRollback = 0;
++  tree->pCheckRollback = 0;
++  tree->pCheckRollbackTail = 0;
++  tree->eTransState = TRANS_NONE;
++  return SQLITE_OK;
++}
++
++static int memRbtreeBeginCkpt(Rbtree* tree)
++{
++  if( tree->eTransState != TRANS_INTRANSACTION ) 
++    return SQLITE_ERROR;
++
++  assert( tree->pCheckRollback == 0 );
++  assert( tree->pCheckRollbackTail == 0 );
++  tree->eTransState = TRANS_INCHECKPOINT;
++  return SQLITE_OK;
++}
++
++static int memRbtreeCommitCkpt(Rbtree* tree)
++{
++  if( tree->eTransState == TRANS_INCHECKPOINT ){ 
++    if( tree->pCheckRollback ){
++      tree->pCheckRollbackTail->pNext = tree->pTransRollback;
++      tree->pTransRollback = tree->pCheckRollback;
++      tree->pCheckRollback = 0;
++      tree->pCheckRollbackTail = 0;
++    }
++    tree->eTransState = TRANS_INTRANSACTION;
++  }
++  return SQLITE_OK;
++}
++
++static int memRbtreeRollbackCkpt(Rbtree* tree)
++{
++  if( tree->eTransState != TRANS_INCHECKPOINT ) return SQLITE_OK;
++  tree->eTransState = TRANS_ROLLBACK;
++  execute_rollback_list(tree, tree->pCheckRollback);
++  tree->pCheckRollback = 0;
++  tree->pCheckRollbackTail = 0;
++  tree->eTransState = TRANS_INTRANSACTION;
++  return SQLITE_OK;
++}
++
++#ifdef SQLITE_TEST
++static int memRbtreePageDump(Rbtree* tree, int pgno, int rec)
++{
++  assert(!"Cannot call sqliteRbtreePageDump");
++  return SQLITE_OK;
++}
++
++static int memRbtreeCursorDump(RbtCursor* pCur, int* aRes)
++{
++  assert(!"Cannot call sqliteRbtreeCursorDump");
++  return SQLITE_OK;
++}
++#endif
++
++static struct Pager *memRbtreePager(Rbtree* tree)
++{
++  return 0;
++}
++
++/*
++** Return the full pathname of the underlying database file.
++*/
++static const char *memRbtreeGetFilename(Rbtree *pBt){
++  return 0;  /* A NULL return indicates there is no underlying file */
++}
++
++/*
++** The copy file function is not implemented for the in-memory database
++*/
++static int memRbtreeCopyFile(Rbtree *pBt, Rbtree *pBt2){
++  return SQLITE_INTERNAL;  /* Not implemented */
++}
++
++static BtOps sqliteRbtreeOps = {
++    (int(*)(Btree*)) memRbtreeClose,
++    (int(*)(Btree*,int)) memRbtreeSetCacheSize,
++    (int(*)(Btree*,int)) memRbtreeSetSafetyLevel,
++    (int(*)(Btree*)) memRbtreeBeginTrans,
++    (int(*)(Btree*)) memRbtreeCommit,
++    (int(*)(Btree*)) memRbtreeRollback,
++    (int(*)(Btree*)) memRbtreeBeginCkpt,
++    (int(*)(Btree*)) memRbtreeCommitCkpt,
++    (int(*)(Btree*)) memRbtreeRollbackCkpt,
++    (int(*)(Btree*,int*)) memRbtreeCreateTable,
++    (int(*)(Btree*,int*)) memRbtreeCreateTable,
++    (int(*)(Btree*,int)) memRbtreeDropTable,
++    (int(*)(Btree*,int)) memRbtreeClearTable,
++    (int(*)(Btree*,int,int,BtCursor**)) memRbtreeCursor,
++    (int(*)(Btree*,int*)) memRbtreeGetMeta,
++    (int(*)(Btree*,int*)) memRbtreeUpdateMeta,
++    (char*(*)(Btree*,int*,int)) memRbtreeIntegrityCheck,
++    (const char*(*)(Btree*)) memRbtreeGetFilename,
++    (int(*)(Btree*,Btree*)) memRbtreeCopyFile,
++    (struct Pager*(*)(Btree*)) memRbtreePager,
++#ifdef SQLITE_TEST
++    (int(*)(Btree*,int,int)) memRbtreePageDump,
++#endif
++};
++
++static BtCursorOps sqliteRbtreeCursorOps = {
++    (int(*)(BtCursor*,const void*,int,int*)) memRbtreeMoveto,
++    (int(*)(BtCursor*)) memRbtreeDelete,
++    (int(*)(BtCursor*,const void*,int,const void*,int)) memRbtreeInsert,
++    (int(*)(BtCursor*,int*)) memRbtreeFirst,
++    (int(*)(BtCursor*,int*)) memRbtreeLast,
++    (int(*)(BtCursor*,int*)) memRbtreeNext,
++    (int(*)(BtCursor*,int*)) memRbtreePrevious,
++    (int(*)(BtCursor*,int*)) memRbtreeKeySize,
++    (int(*)(BtCursor*,int,int,char*)) memRbtreeKey,
++    (int(*)(BtCursor*,const void*,int,int,int*)) memRbtreeKeyCompare,
++    (int(*)(BtCursor*,int*)) memRbtreeDataSize,
++    (int(*)(BtCursor*,int,int,char*)) memRbtreeData,
++    (int(*)(BtCursor*)) memRbtreeCloseCursor,
++#ifdef SQLITE_TEST
++    (int(*)(BtCursor*,int*)) memRbtreeCursorDump,
++#endif
++
++};
++
++#endif /* SQLITE_OMIT_INMEMORYDB */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/build.c
+@@ -0,0 +1,2156 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains C code routines that are called by the SQLite parser
++** when syntax rules are reduced.  The routines in this file handle the
++** following kinds of SQL syntax:
++**
++**     CREATE TABLE
++**     DROP TABLE
++**     CREATE INDEX
++**     DROP INDEX
++**     creating ID lists
++**     BEGIN TRANSACTION
++**     COMMIT
++**     ROLLBACK
++**     PRAGMA
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include <ctype.h>
++
++/*
++** This routine is called when a new SQL statement is beginning to
++** be parsed.  Check to see if the schema for the database needs
++** to be read from the SQLITE_MASTER and SQLITE_TEMP_MASTER tables.
++** If it does, then read it.
++*/
++void sqliteBeginParse(Parse *pParse, int explainFlag){
++  sqlite *db = pParse->db;
++  int i;
++  pParse->explain = explainFlag;
++  if((db->flags & SQLITE_Initialized)==0 && db->init.busy==0 ){
++    int rc = sqliteInit(db, &pParse->zErrMsg);
++    if( rc!=SQLITE_OK ){
++      pParse->rc = rc;
++      pParse->nErr++;
++    }
++  }
++  for(i=0; i<db->nDb; i++){
++    DbClearProperty(db, i, DB_Locked);
++    if( !db->aDb[i].inTrans ){
++      DbClearProperty(db, i, DB_Cookie);
++    }
++  }
++  pParse->nVar = 0;
++}
++
++/*
++** This routine is called after a single SQL statement has been
++** parsed and we want to execute the VDBE code to implement 
++** that statement.  Prior action routines should have already
++** constructed VDBE code to do the work of the SQL statement.
++** This routine just has to execute the VDBE code.
++**
++** Note that if an error occurred, it might be the case that
++** no VDBE code was generated.
++*/
++void sqliteExec(Parse *pParse){
++  sqlite *db = pParse->db;
++  Vdbe *v = pParse->pVdbe;
++
++  if( v==0 && (v = sqliteGetVdbe(pParse))!=0 ){
++    sqliteVdbeAddOp(v, OP_Halt, 0, 0);
++  }
++  if( sqlite_malloc_failed ) return;
++  if( v && pParse->nErr==0 ){
++    FILE *trace = (db->flags & SQLITE_VdbeTrace)!=0 ? stdout : 0;
++    sqliteVdbeTrace(v, trace);
++    sqliteVdbeMakeReady(v, pParse->nVar, pParse->explain);
++    pParse->rc = pParse->nErr ? SQLITE_ERROR : SQLITE_DONE;
++    pParse->colNamesSet = 0;
++  }else if( pParse->rc==SQLITE_OK ){
++    pParse->rc = SQLITE_ERROR;
++  }
++  pParse->nTab = 0;
++  pParse->nMem = 0;
++  pParse->nSet = 0;
++  pParse->nAgg = 0;
++  pParse->nVar = 0;
++}
++
++/*
++** Locate the in-memory structure that describes 
++** a particular database table given the name
++** of that table and (optionally) the name of the database
++** containing the table.  Return NULL if not found.
++**
++** If zDatabase is 0, all databases are searched for the
++** table and the first matching table is returned.  (No checking
++** for duplicate table names is done.)  The search order is
++** TEMP first, then MAIN, then any auxiliary databases added
++** using the ATTACH command.
++**
++** See also sqliteLocateTable().
++*/
++Table *sqliteFindTable(sqlite *db, const char *zName, const char *zDatabase){
++  Table *p = 0;
++  int i;
++  for(i=0; i<db->nDb; i++){
++    int j = (i<2) ? i^1 : i;   /* Search TEMP before MAIN */
++    if( zDatabase!=0 && sqliteStrICmp(zDatabase, db->aDb[j].zName) ) continue;
++    p = sqliteHashFind(&db->aDb[j].tblHash, zName, strlen(zName)+1);
++    if( p ) break;
++  }
++  return p;
++}
++
++/*
++** Locate the in-memory structure that describes 
++** a particular database table given the name
++** of that table and (optionally) the name of the database
++** containing the table.  Return NULL if not found.
++** Also leave an error message in pParse->zErrMsg.
++**
++** The difference between this routine and sqliteFindTable()
++** is that this routine leaves an error message in pParse->zErrMsg
++** where sqliteFindTable() does not.
++*/
++Table *sqliteLocateTable(Parse *pParse, const char *zName, const char *zDbase){
++  Table *p;
++
++  p = sqliteFindTable(pParse->db, zName, zDbase);
++  if( p==0 ){
++    if( zDbase ){
++      sqliteErrorMsg(pParse, "no such table: %s.%s", zDbase, zName);
++    }else if( sqliteFindTable(pParse->db, zName, 0)!=0 ){
++      sqliteErrorMsg(pParse, "table \"%s\" is not in database \"%s\"",
++         zName, zDbase);
++    }else{
++      sqliteErrorMsg(pParse, "no such table: %s", zName);
++    }
++  }
++  return p;
++}
++
++/*
++** Locate the in-memory structure that describes 
++** a particular index given the name of that index
++** and the name of the database that contains the index.
++** Return NULL if not found.
++**
++** If zDatabase is 0, all databases are searched for the
++** table and the first matching index is returned.  (No checking
++** for duplicate index names is done.)  The search order is
++** TEMP first, then MAIN, then any auxiliary databases added
++** using the ATTACH command.
++*/
++Index *sqliteFindIndex(sqlite *db, const char *zName, const char *zDb){
++  Index *p = 0;
++  int i;
++  for(i=0; i<db->nDb; i++){
++    int j = (i<2) ? i^1 : i;  /* Search TEMP before MAIN */
++    if( zDb && sqliteStrICmp(zDb, db->aDb[j].zName) ) continue;
++    p = sqliteHashFind(&db->aDb[j].idxHash, zName, strlen(zName)+1);
++    if( p ) break;
++  }
++  return p;
++}
++
++/*
++** Remove the given index from the index hash table, and free
++** its memory structures.
++**
++** The index is removed from the database hash tables but
++** it is not unlinked from the Table that it indexes.
++** Unlinking from the Table must be done by the calling function.
++*/
++static void sqliteDeleteIndex(sqlite *db, Index *p){
++  Index *pOld;
++
++  assert( db!=0 && p->zName!=0 );
++  pOld = sqliteHashInsert(&db->aDb[p->iDb].idxHash, p->zName,
++                          strlen(p->zName)+1, 0);
++  if( pOld!=0 && pOld!=p ){
++    sqliteHashInsert(&db->aDb[p->iDb].idxHash, pOld->zName,
++                     strlen(pOld->zName)+1, pOld);
++  }
++  sqliteFree(p);
++}
++
++/*
++** Unlink the given index from its table, then remove
++** the index from the index hash table and free its memory
++** structures.
++*/
++void sqliteUnlinkAndDeleteIndex(sqlite *db, Index *pIndex){
++  if( pIndex->pTable->pIndex==pIndex ){
++    pIndex->pTable->pIndex = pIndex->pNext;
++  }else{
++    Index *p;
++    for(p=pIndex->pTable->pIndex; p && p->pNext!=pIndex; p=p->pNext){}
++    if( p && p->pNext==pIndex ){
++      p->pNext = pIndex->pNext;
++    }
++  }
++  sqliteDeleteIndex(db, pIndex);
++}
++
++/*
++** Erase all schema information from the in-memory hash tables of
++** database connection.  This routine is called to reclaim memory
++** before the connection closes.  It is also called during a rollback
++** if there were schema changes during the transaction.
++**
++** If iDb<=0 then reset the internal schema tables for all database
++** files.  If iDb>=2 then reset the internal schema for only the
++** single file indicated.
++*/
++void sqliteResetInternalSchema(sqlite *db, int iDb){
++  HashElem *pElem;
++  Hash temp1;
++  Hash temp2;
++  int i, j;
++
++  assert( iDb>=0 && iDb<db->nDb );
++  db->flags &= ~SQLITE_Initialized;
++  for(i=iDb; i<db->nDb; i++){
++    Db *pDb = &db->aDb[i];
++    temp1 = pDb->tblHash;
++    temp2 = pDb->trigHash;
++    sqliteHashInit(&pDb->trigHash, SQLITE_HASH_STRING, 0);
++    sqliteHashClear(&pDb->aFKey);
++    sqliteHashClear(&pDb->idxHash);
++    for(pElem=sqliteHashFirst(&temp2); pElem; pElem=sqliteHashNext(pElem)){
++      Trigger *pTrigger = sqliteHashData(pElem);
++      sqliteDeleteTrigger(pTrigger);
++    }
++    sqliteHashClear(&temp2);
++    sqliteHashInit(&pDb->tblHash, SQLITE_HASH_STRING, 0);
++    for(pElem=sqliteHashFirst(&temp1); pElem; pElem=sqliteHashNext(pElem)){
++      Table *pTab = sqliteHashData(pElem);
++      sqliteDeleteTable(db, pTab);
++    }
++    sqliteHashClear(&temp1);
++    DbClearProperty(db, i, DB_SchemaLoaded);
++    if( iDb>0 ) return;
++  }
++  assert( iDb==0 );
++  db->flags &= ~SQLITE_InternChanges;
++
++  /* If one or more of the auxiliary database files has been closed,
++  ** then remove then from the auxiliary database list.  We take the
++  ** opportunity to do this here since we have just deleted all of the
++  ** schema hash tables and therefore do not have to make any changes
++  ** to any of those tables.
++  */
++  for(i=0; i<db->nDb; i++){
++    struct Db *pDb = &db->aDb[i];
++    if( pDb->pBt==0 ){
++      if( pDb->pAux && pDb->xFreeAux ) pDb->xFreeAux(pDb->pAux);
++      pDb->pAux = 0;
++    }
++  }
++  for(i=j=2; i<db->nDb; i++){
++    struct Db *pDb = &db->aDb[i];
++    if( pDb->pBt==0 ){
++      sqliteFree(pDb->zName);
++      pDb->zName = 0;
++      continue;
++    }
++    if( j<i ){
++      db->aDb[j] = db->aDb[i];
++    }
++    j++;
++  }
++  memset(&db->aDb[j], 0, (db->nDb-j)*sizeof(db->aDb[j]));
++  db->nDb = j;
++  if( db->nDb<=2 && db->aDb!=db->aDbStatic ){
++    memcpy(db->aDbStatic, db->aDb, 2*sizeof(db->aDb[0]));
++    sqliteFree(db->aDb);
++    db->aDb = db->aDbStatic;
++  }
++}
++
++/*
++** This routine is called whenever a rollback occurs.  If there were
++** schema changes during the transaction, then we have to reset the
++** internal hash tables and reload them from disk.
++*/
++void sqliteRollbackInternalChanges(sqlite *db){
++  if( db->flags & SQLITE_InternChanges ){
++    sqliteResetInternalSchema(db, 0);
++  }
++}
++
++/*
++** This routine is called when a commit occurs.
++*/
++void sqliteCommitInternalChanges(sqlite *db){
++  db->aDb[0].schema_cookie = db->next_cookie;
++  db->flags &= ~SQLITE_InternChanges;
++}
++
++/*
++** Remove the memory data structures associated with the given
++** Table.  No changes are made to disk by this routine.
++**
++** This routine just deletes the data structure.  It does not unlink
++** the table data structure from the hash table.  Nor does it remove
++** foreign keys from the sqlite.aFKey hash table.  But it does destroy
++** memory structures of the indices and foreign keys associated with 
++** the table.
++**
++** Indices associated with the table are unlinked from the "db"
++** data structure if db!=NULL.  If db==NULL, indices attached to
++** the table are deleted, but it is assumed they have already been
++** unlinked.
++*/
++void sqliteDeleteTable(sqlite *db, Table *pTable){
++  int i;
++  Index *pIndex, *pNext;
++  FKey *pFKey, *pNextFKey;
++
++  if( pTable==0 ) return;
++
++  /* Delete all indices associated with this table
++  */
++  for(pIndex = pTable->pIndex; pIndex; pIndex=pNext){
++    pNext = pIndex->pNext;
++    assert( pIndex->iDb==pTable->iDb || (pTable->iDb==0 && pIndex->iDb==1) );
++    sqliteDeleteIndex(db, pIndex);
++  }
++
++  /* Delete all foreign keys associated with this table.  The keys
++  ** should have already been unlinked from the db->aFKey hash table 
++  */
++  for(pFKey=pTable->pFKey; pFKey; pFKey=pNextFKey){
++    pNextFKey = pFKey->pNextFrom;
++    assert( pTable->iDb<db->nDb );
++    assert( sqliteHashFind(&db->aDb[pTable->iDb].aFKey,
++                           pFKey->zTo, strlen(pFKey->zTo)+1)!=pFKey );
++    sqliteFree(pFKey);
++  }
++
++  /* Delete the Table structure itself.
++  */
++  for(i=0; i<pTable->nCol; i++){
++    sqliteFree(pTable->aCol[i].zName);
++    sqliteFree(pTable->aCol[i].zDflt);
++    sqliteFree(pTable->aCol[i].zType);
++  }
++  sqliteFree(pTable->zName);
++  sqliteFree(pTable->aCol);
++  sqliteSelectDelete(pTable->pSelect);
++  sqliteFree(pTable);
++}
++
++/*
++** Unlink the given table from the hash tables and the delete the
++** table structure with all its indices and foreign keys.
++*/
++static void sqliteUnlinkAndDeleteTable(sqlite *db, Table *p){
++  Table *pOld;
++  FKey *pF1, *pF2;
++  int i = p->iDb;
++  assert( db!=0 );
++  pOld = sqliteHashInsert(&db->aDb[i].tblHash, p->zName, strlen(p->zName)+1, 0);
++  assert( pOld==0 || pOld==p );
++  for(pF1=p->pFKey; pF1; pF1=pF1->pNextFrom){
++    int nTo = strlen(pF1->zTo) + 1;
++    pF2 = sqliteHashFind(&db->aDb[i].aFKey, pF1->zTo, nTo);
++    if( pF2==pF1 ){
++      sqliteHashInsert(&db->aDb[i].aFKey, pF1->zTo, nTo, pF1->pNextTo);
++    }else{
++      while( pF2 && pF2->pNextTo!=pF1 ){ pF2=pF2->pNextTo; }
++      if( pF2 ){
++        pF2->pNextTo = pF1->pNextTo;
++      }
++    }
++  }
++  sqliteDeleteTable(db, p);
++}
++
++/*
++** Construct the name of a user table or index from a token.
++**
++** Space to hold the name is obtained from sqliteMalloc() and must
++** be freed by the calling function.
++*/
++char *sqliteTableNameFromToken(Token *pName){
++  char *zName = sqliteStrNDup(pName->z, pName->n);
++  sqliteDequote(zName);
++  return zName;
++}
++
++/*
++** Generate code to open the appropriate master table.  The table
++** opened will be SQLITE_MASTER for persistent tables and 
++** SQLITE_TEMP_MASTER for temporary tables.  The table is opened
++** on cursor 0.
++*/
++void sqliteOpenMasterTable(Vdbe *v, int isTemp){
++  sqliteVdbeAddOp(v, OP_Integer, isTemp, 0);
++  sqliteVdbeAddOp(v, OP_OpenWrite, 0, 2);
++}
++
++/*
++** Begin constructing a new table representation in memory.  This is
++** the first of several action routines that get called in response
++** to a CREATE TABLE statement.  In particular, this routine is called
++** after seeing tokens "CREATE" and "TABLE" and the table name.  The
++** pStart token is the CREATE and pName is the table name.  The isTemp
++** flag is true if the table should be stored in the auxiliary database
++** file instead of in the main database file.  This is normally the case
++** when the "TEMP" or "TEMPORARY" keyword occurs in between
++** CREATE and TABLE.
++**
++** The new table record is initialized and put in pParse->pNewTable.
++** As more of the CREATE TABLE statement is parsed, additional action
++** routines will be called to add more information to this record.
++** At the end of the CREATE TABLE statement, the sqliteEndTable() routine
++** is called to complete the construction of the new table record.
++*/
++void sqliteStartTable(
++  Parse *pParse,   /* Parser context */
++  Token *pStart,   /* The "CREATE" token */
++  Token *pName,    /* Name of table or view to create */
++  int isTemp,      /* True if this is a TEMP table */
++  int isView       /* True if this is a VIEW */
++){
++  Table *pTable;
++  Index *pIdx;
++  char *zName;
++  sqlite *db = pParse->db;
++  Vdbe *v;
++  int iDb;
++
++  pParse->sFirstToken = *pStart;
++  zName = sqliteTableNameFromToken(pName);
++  if( zName==0 ) return;
++  if( db->init.iDb==1 ) isTemp = 1;
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  assert( (isTemp & 1)==isTemp );
++  {
++    int code;
++    char *zDb = isTemp ? "temp" : "main";
++    if( sqliteAuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){
++      sqliteFree(zName);
++      return;
++    }
++    if( isView ){
++      if( isTemp ){
++        code = SQLITE_CREATE_TEMP_VIEW;
++      }else{
++        code = SQLITE_CREATE_VIEW;
++      }
++    }else{
++      if( isTemp ){
++        code = SQLITE_CREATE_TEMP_TABLE;
++      }else{
++        code = SQLITE_CREATE_TABLE;
++      }
++    }
++    if( sqliteAuthCheck(pParse, code, zName, 0, zDb) ){
++      sqliteFree(zName);
++      return;
++    }
++  }
++#endif
++ 
++
++  /* Before trying to create a temporary table, make sure the Btree for
++  ** holding temporary tables is open.
++  */
++  if( isTemp && db->aDb[1].pBt==0 && !pParse->explain ){
++    int rc = sqliteBtreeFactory(db, 0, 0, MAX_PAGES, &db->aDb[1].pBt);
++    if( rc!=SQLITE_OK ){
++      sqliteErrorMsg(pParse, "unable to open a temporary database "
++        "file for storing temporary tables");
++      pParse->nErr++;
++      return;
++    }
++    if( db->flags & SQLITE_InTrans ){
++      rc = sqliteBtreeBeginTrans(db->aDb[1].pBt);
++      if( rc!=SQLITE_OK ){
++        sqliteErrorMsg(pParse, "unable to get a write lock on "
++          "the temporary database file");
++        return;
++      }
++    }
++  }
++
++  /* Make sure the new table name does not collide with an existing
++  ** index or table name.  Issue an error message if it does.
++  **
++  ** If we are re-reading the sqlite_master table because of a schema
++  ** change and a new permanent table is found whose name collides with
++  ** an existing temporary table, that is not an error.
++  */
++  pTable = sqliteFindTable(db, zName, 0);
++  iDb = isTemp ? 1 : db->init.iDb;
++  if( pTable!=0 && (pTable->iDb==iDb || !db->init.busy) ){
++    sqliteErrorMsg(pParse, "table %T already exists", pName);
++    sqliteFree(zName);
++    return;
++  }
++  if( (pIdx = sqliteFindIndex(db, zName, 0))!=0 &&
++          (pIdx->iDb==0 || !db->init.busy) ){
++    sqliteErrorMsg(pParse, "there is already an index named %s", zName);
++    sqliteFree(zName);
++    return;
++  }
++  pTable = sqliteMalloc( sizeof(Table) );
++  if( pTable==0 ){
++    sqliteFree(zName);
++    return;
++  }
++  pTable->zName = zName;
++  pTable->nCol = 0;
++  pTable->aCol = 0;
++  pTable->iPKey = -1;
++  pTable->pIndex = 0;
++  pTable->iDb = iDb;
++  if( pParse->pNewTable ) sqliteDeleteTable(db, pParse->pNewTable);
++  pParse->pNewTable = pTable;
++
++  /* Begin generating the code that will insert the table record into
++  ** the SQLITE_MASTER table.  Note in particular that we must go ahead
++  ** and allocate the record number for the table entry now.  Before any
++  ** PRIMARY KEY or UNIQUE keywords are parsed.  Those keywords will cause
++  ** indices to be created and the table record must come before the 
++  ** indices.  Hence, the record number for the table must be allocated
++  ** now.
++  */
++  if( !db->init.busy && (v = sqliteGetVdbe(pParse))!=0 ){
++    sqliteBeginWriteOperation(pParse, 0, isTemp);
++    if( !isTemp ){
++      sqliteVdbeAddOp(v, OP_Integer, db->file_format, 0);
++      sqliteVdbeAddOp(v, OP_SetCookie, 0, 1);
++    }
++    sqliteOpenMasterTable(v, isTemp);
++    sqliteVdbeAddOp(v, OP_NewRecno, 0, 0);
++    sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++    sqliteVdbeAddOp(v, OP_String, 0, 0);
++    sqliteVdbeAddOp(v, OP_PutIntKey, 0, 0);
++  }
++}
++
++/*
++** Add a new column to the table currently being constructed.
++**
++** The parser calls this routine once for each column declaration
++** in a CREATE TABLE statement.  sqliteStartTable() gets called
++** first to get things going.  Then this routine is called for each
++** column.
++*/
++void sqliteAddColumn(Parse *pParse, Token *pName){
++  Table *p;
++  int i;
++  char *z = 0;
++  Column *pCol;
++  if( (p = pParse->pNewTable)==0 ) return;
++  sqliteSetNString(&z, pName->z, pName->n, 0);
++  if( z==0 ) return;
++  sqliteDequote(z);
++  for(i=0; i<p->nCol; i++){
++    if( sqliteStrICmp(z, p->aCol[i].zName)==0 ){
++      sqliteErrorMsg(pParse, "duplicate column name: %s", z);
++      sqliteFree(z);
++      return;
++    }
++  }
++  if( (p->nCol & 0x7)==0 ){
++    Column *aNew;
++    aNew = sqliteRealloc( p->aCol, (p->nCol+8)*sizeof(p->aCol[0]));
++    if( aNew==0 ) return;
++    p->aCol = aNew;
++  }
++  pCol = &p->aCol[p->nCol];
++  memset(pCol, 0, sizeof(p->aCol[0]));
++  pCol->zName = z;
++  pCol->sortOrder = SQLITE_SO_NUM;
++  p->nCol++;
++}
++
++/*
++** This routine is called by the parser while in the middle of
++** parsing a CREATE TABLE statement.  A "NOT NULL" constraint has
++** been seen on a column.  This routine sets the notNull flag on
++** the column currently under construction.
++*/
++void sqliteAddNotNull(Parse *pParse, int onError){
++  Table *p;
++  int i;
++  if( (p = pParse->pNewTable)==0 ) return;
++  i = p->nCol-1;
++  if( i>=0 ) p->aCol[i].notNull = onError;
++}
++
++/*
++** This routine is called by the parser while in the middle of
++** parsing a CREATE TABLE statement.  The pFirst token is the first
++** token in the sequence of tokens that describe the type of the
++** column currently under construction.   pLast is the last token
++** in the sequence.  Use this information to construct a string
++** that contains the typename of the column and store that string
++** in zType.
++*/ 
++void sqliteAddColumnType(Parse *pParse, Token *pFirst, Token *pLast){
++  Table *p;
++  int i, j;
++  int n;
++  char *z, **pz;
++  Column *pCol;
++  if( (p = pParse->pNewTable)==0 ) return;
++  i = p->nCol-1;
++  if( i<0 ) return;
++  pCol = &p->aCol[i];
++  pz = &pCol->zType;
++  n = pLast->n + Addr(pLast->z) - Addr(pFirst->z);
++  sqliteSetNString(pz, pFirst->z, n, 0);
++  z = *pz;
++  if( z==0 ) return;
++  for(i=j=0; z[i]; i++){
++    int c = z[i];
++    if( isspace(c) ) continue;
++    z[j++] = c;
++  }
++  z[j] = 0;
++  if( pParse->db->file_format>=4 ){
++    pCol->sortOrder = sqliteCollateType(z, n);
++  }else{
++    pCol->sortOrder = SQLITE_SO_NUM;
++  }
++}
++
++/*
++** The given token is the default value for the last column added to
++** the table currently under construction.  If "minusFlag" is true, it
++** means the value token was preceded by a minus sign.
++**
++** This routine is called by the parser while in the middle of
++** parsing a CREATE TABLE statement.
++*/
++void sqliteAddDefaultValue(Parse *pParse, Token *pVal, int minusFlag){
++  Table *p;
++  int i;
++  char **pz;
++  if( (p = pParse->pNewTable)==0 ) return;
++  i = p->nCol-1;
++  if( i<0 ) return;
++  pz = &p->aCol[i].zDflt;
++  if( minusFlag ){
++    sqliteSetNString(pz, "-", 1, pVal->z, pVal->n, 0);
++  }else{
++    sqliteSetNString(pz, pVal->z, pVal->n, 0);
++  }
++  sqliteDequote(*pz);
++}
++
++/*
++** Designate the PRIMARY KEY for the table.  pList is a list of names 
++** of columns that form the primary key.  If pList is NULL, then the
++** most recently added column of the table is the primary key.
++**
++** A table can have at most one primary key.  If the table already has
++** a primary key (and this is the second primary key) then create an
++** error.
++**
++** If the PRIMARY KEY is on a single column whose datatype is INTEGER,
++** then we will try to use that column as the row id.  (Exception:
++** For backwards compatibility with older databases, do not do this
++** if the file format version number is less than 1.)  Set the Table.iPKey
++** field of the table under construction to be the index of the
++** INTEGER PRIMARY KEY column.  Table.iPKey is set to -1 if there is
++** no INTEGER PRIMARY KEY.
++**
++** If the key is not an INTEGER PRIMARY KEY, then create a unique
++** index for the key.  No index is created for INTEGER PRIMARY KEYs.
++*/
++void sqliteAddPrimaryKey(Parse *pParse, IdList *pList, int onError){
++  Table *pTab = pParse->pNewTable;
++  char *zType = 0;
++  int iCol = -1, i;
++  if( pTab==0 ) goto primary_key_exit;
++  if( pTab->hasPrimKey ){
++    sqliteErrorMsg(pParse, 
++      "table \"%s\" has more than one primary key", pTab->zName);
++    goto primary_key_exit;
++  }
++  pTab->hasPrimKey = 1;
++  if( pList==0 ){
++    iCol = pTab->nCol - 1;
++    pTab->aCol[iCol].isPrimKey = 1;
++  }else{
++    for(i=0; i<pList->nId; i++){
++      for(iCol=0; iCol<pTab->nCol; iCol++){
++        if( sqliteStrICmp(pList->a[i].zName, pTab->aCol[iCol].zName)==0 ) break;
++      }
++      if( iCol<pTab->nCol ) pTab->aCol[iCol].isPrimKey = 1;
++    }
++    if( pList->nId>1 ) iCol = -1;
++  }
++  if( iCol>=0 && iCol<pTab->nCol ){
++    zType = pTab->aCol[iCol].zType;
++  }
++  if( pParse->db->file_format>=1 && 
++           zType && sqliteStrICmp(zType, "INTEGER")==0 ){
++    pTab->iPKey = iCol;
++    pTab->keyConf = onError;
++  }else{
++    sqliteCreateIndex(pParse, 0, 0, pList, onError, 0, 0);
++    pList = 0;
++  }
++
++primary_key_exit:
++  sqliteIdListDelete(pList);
++  return;
++}
++
++/*
++** Return the appropriate collating type given a type name.
++**
++** The collation type is text (SQLITE_SO_TEXT) if the type
++** name contains the character stream "text" or "blob" or
++** "clob".  Any other type name is collated as numeric
++** (SQLITE_SO_NUM).
++*/
++int sqliteCollateType(const char *zType, int nType){
++  int i;
++  for(i=0; i<nType-3; i++){
++    int c = *(zType++) | 0x60;
++    if( (c=='b' || c=='c') && sqliteStrNICmp(zType, "lob", 3)==0 ){
++      return SQLITE_SO_TEXT;
++    }
++    if( c=='c' && sqliteStrNICmp(zType, "har", 3)==0 ){
++      return SQLITE_SO_TEXT;
++    }
++    if( c=='t' && sqliteStrNICmp(zType, "ext", 3)==0 ){
++      return SQLITE_SO_TEXT;
++    }
++  }
++  return SQLITE_SO_NUM;
++}
++
++/*
++** This routine is called by the parser while in the middle of
++** parsing a CREATE TABLE statement.  A "COLLATE" clause has
++** been seen on a column.  This routine sets the Column.sortOrder on
++** the column currently under construction.
++*/
++void sqliteAddCollateType(Parse *pParse, int collType){
++  Table *p;
++  int i;
++  if( (p = pParse->pNewTable)==0 ) return;
++  i = p->nCol-1;
++  if( i>=0 ) p->aCol[i].sortOrder = collType;
++}
++
++/*
++** Come up with a new random value for the schema cookie.  Make sure
++** the new value is different from the old.
++**
++** The schema cookie is used to determine when the schema for the
++** database changes.  After each schema change, the cookie value
++** changes.  When a process first reads the schema it records the
++** cookie.  Thereafter, whenever it goes to access the database,
++** it checks the cookie to make sure the schema has not changed
++** since it was last read.
++**
++** This plan is not completely bullet-proof.  It is possible for
++** the schema to change multiple times and for the cookie to be
++** set back to prior value.  But schema changes are infrequent
++** and the probability of hitting the same cookie value is only
++** 1 chance in 2^32.  So we're safe enough.
++*/
++void sqliteChangeCookie(sqlite *db, Vdbe *v){
++  if( db->next_cookie==db->aDb[0].schema_cookie ){
++    unsigned char r;
++    sqliteRandomness(1, &r);
++    db->next_cookie = db->aDb[0].schema_cookie + r + 1;
++    db->flags |= SQLITE_InternChanges;
++    sqliteVdbeAddOp(v, OP_Integer, db->next_cookie, 0);
++    sqliteVdbeAddOp(v, OP_SetCookie, 0, 0);
++  }
++}
++
++/*
++** Measure the number of characters needed to output the given
++** identifier.  The number returned includes any quotes used
++** but does not include the null terminator.
++*/
++static int identLength(const char *z){
++  int n;
++  int needQuote = 0;
++  for(n=0; *z; n++, z++){
++    if( *z=='\'' ){ n++; needQuote=1; }
++  }
++  return n + needQuote*2;
++}
++
++/*
++** Write an identifier onto the end of the given string.  Add
++** quote characters as needed.
++*/
++static void identPut(char *z, int *pIdx, char *zIdent){
++  int i, j, needQuote;
++  i = *pIdx;
++  for(j=0; zIdent[j]; j++){
++    if( !isalnum(zIdent[j]) && zIdent[j]!='_' ) break;
++  }
++  needQuote =  zIdent[j]!=0 || isdigit(zIdent[0])
++                  || sqliteKeywordCode(zIdent, j)!=TK_ID;
++  if( needQuote ) z[i++] = '\'';
++  for(j=0; zIdent[j]; j++){
++    z[i++] = zIdent[j];
++    if( zIdent[j]=='\'' ) z[i++] = '\'';
++  }
++  if( needQuote ) z[i++] = '\'';
++  z[i] = 0;
++  *pIdx = i;
++}
++
++/*
++** Generate a CREATE TABLE statement appropriate for the given
++** table.  Memory to hold the text of the statement is obtained
++** from sqliteMalloc() and must be freed by the calling function.
++*/
++static char *createTableStmt(Table *p){
++  int i, k, n;
++  char *zStmt;
++  char *zSep, *zSep2, *zEnd;
++  n = 0;
++  for(i=0; i<p->nCol; i++){
++    n += identLength(p->aCol[i].zName);
++  }
++  n += identLength(p->zName);
++  if( n<40 ){
++    zSep = "";
++    zSep2 = ",";
++    zEnd = ")";
++  }else{
++    zSep = "\n  ";
++    zSep2 = ",\n  ";
++    zEnd = "\n)";
++  }
++  n += 35 + 6*p->nCol;
++  zStmt = sqliteMallocRaw( n );
++  if( zStmt==0 ) return 0;
++  strcpy(zStmt, p->iDb==1 ? "CREATE TEMP TABLE " : "CREATE TABLE ");
++  k = strlen(zStmt);
++  identPut(zStmt, &k, p->zName);
++  zStmt[k++] = '(';
++  for(i=0; i<p->nCol; i++){
++    strcpy(&zStmt[k], zSep);
++    k += strlen(&zStmt[k]);
++    zSep = zSep2;
++    identPut(zStmt, &k, p->aCol[i].zName);
++  }
++  strcpy(&zStmt[k], zEnd);
++  return zStmt;
++}
++
++/*
++** This routine is called to report the final ")" that terminates
++** a CREATE TABLE statement.
++**
++** The table structure that other action routines have been building
++** is added to the internal hash tables, assuming no errors have
++** occurred.
++**
++** An entry for the table is made in the master table on disk, unless
++** this is a temporary table or db->init.busy==1.  When db->init.busy==1
++** it means we are reading the sqlite_master table because we just
++** connected to the database or because the sqlite_master table has
++** recently changes, so the entry for this table already exists in
++** the sqlite_master table.  We do not want to create it again.
++**
++** If the pSelect argument is not NULL, it means that this routine
++** was called to create a table generated from a 
++** "CREATE TABLE ... AS SELECT ..." statement.  The column names of
++** the new table will match the result set of the SELECT.
++*/
++void sqliteEndTable(Parse *pParse, Token *pEnd, Select *pSelect){
++  Table *p;
++  sqlite *db = pParse->db;
++
++  if( (pEnd==0 && pSelect==0) || pParse->nErr || sqlite_malloc_failed ) return;
++  p = pParse->pNewTable;
++  if( p==0 ) return;
++
++  /* If the table is generated from a SELECT, then construct the
++  ** list of columns and the text of the table.
++  */
++  if( pSelect ){
++    Table *pSelTab = sqliteResultSetOfSelect(pParse, 0, pSelect);
++    if( pSelTab==0 ) return;
++    assert( p->aCol==0 );
++    p->nCol = pSelTab->nCol;
++    p->aCol = pSelTab->aCol;
++    pSelTab->nCol = 0;
++    pSelTab->aCol = 0;
++    sqliteDeleteTable(0, pSelTab);
++  }
++
++  /* If the db->init.busy is 1 it means we are reading the SQL off the
++  ** "sqlite_master" or "sqlite_temp_master" table on the disk.
++  ** So do not write to the disk again.  Extract the root page number
++  ** for the table from the db->init.newTnum field.  (The page number
++  ** should have been put there by the sqliteOpenCb routine.)
++  */
++  if( db->init.busy ){
++    p->tnum = db->init.newTnum;
++  }
++
++  /* If not initializing, then create a record for the new table
++  ** in the SQLITE_MASTER table of the database.  The record number
++  ** for the new table entry should already be on the stack.
++  **
++  ** If this is a TEMPORARY table, write the entry into the auxiliary
++  ** file instead of into the main database file.
++  */
++  if( !db->init.busy ){
++    int n;
++    Vdbe *v;
++
++    v = sqliteGetVdbe(pParse);
++    if( v==0 ) return;
++    if( p->pSelect==0 ){
++      /* A regular table */
++      sqliteVdbeOp3(v, OP_CreateTable, 0, p->iDb, (char*)&p->tnum, P3_POINTER);
++    }else{
++      /* A view */
++      sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++    }
++    p->tnum = 0;
++    sqliteVdbeAddOp(v, OP_Pull, 1, 0);
++    sqliteVdbeOp3(v, OP_String, 0, 0, p->pSelect==0?"table":"view", P3_STATIC);
++    sqliteVdbeOp3(v, OP_String, 0, 0, p->zName, 0);
++    sqliteVdbeOp3(v, OP_String, 0, 0, p->zName, 0);
++    sqliteVdbeAddOp(v, OP_Dup, 4, 0);
++    sqliteVdbeAddOp(v, OP_String, 0, 0);
++    if( pSelect ){
++      char *z = createTableStmt(p);
++      n = z ? strlen(z) : 0;
++      sqliteVdbeChangeP3(v, -1, z, n);
++      sqliteFree(z);
++    }else{
++      assert( pEnd!=0 );
++      n = Addr(pEnd->z) - Addr(pParse->sFirstToken.z) + 1;
++      sqliteVdbeChangeP3(v, -1, pParse->sFirstToken.z, n);
++    }
++    sqliteVdbeAddOp(v, OP_MakeRecord, 5, 0);
++    sqliteVdbeAddOp(v, OP_PutIntKey, 0, 0);
++    if( !p->iDb ){
++      sqliteChangeCookie(db, v);
++    }
++    sqliteVdbeAddOp(v, OP_Close, 0, 0);
++    if( pSelect ){
++      sqliteVdbeAddOp(v, OP_Integer, p->iDb, 0);
++      sqliteVdbeAddOp(v, OP_OpenWrite, 1, 0);
++      pParse->nTab = 2;
++      sqliteSelect(pParse, pSelect, SRT_Table, 1, 0, 0, 0);
++    }
++    sqliteEndWriteOperation(pParse);
++  }
++
++  /* Add the table to the in-memory representation of the database.
++  */
++  if( pParse->explain==0 && pParse->nErr==0 ){
++    Table *pOld;
++    FKey *pFKey;
++    pOld = sqliteHashInsert(&db->aDb[p->iDb].tblHash, 
++                            p->zName, strlen(p->zName)+1, p);
++    if( pOld ){
++      assert( p==pOld );  /* Malloc must have failed inside HashInsert() */
++      return;
++    }
++    for(pFKey=p->pFKey; pFKey; pFKey=pFKey->pNextFrom){
++      int nTo = strlen(pFKey->zTo) + 1;
++      pFKey->pNextTo = sqliteHashFind(&db->aDb[p->iDb].aFKey, pFKey->zTo, nTo);
++      sqliteHashInsert(&db->aDb[p->iDb].aFKey, pFKey->zTo, nTo, pFKey);
++    }
++    pParse->pNewTable = 0;
++    db->nTable++;
++    db->flags |= SQLITE_InternChanges;
++  }
++}
++
++/*
++** The parser calls this routine in order to create a new VIEW
++*/
++void sqliteCreateView(
++  Parse *pParse,     /* The parsing context */
++  Token *pBegin,     /* The CREATE token that begins the statement */
++  Token *pName,      /* The token that holds the name of the view */
++  Select *pSelect,   /* A SELECT statement that will become the new view */
++  int isTemp         /* TRUE for a TEMPORARY view */
++){
++  Table *p;
++  int n;
++  const char *z;
++  Token sEnd;
++  DbFixer sFix;
++
++  sqliteStartTable(pParse, pBegin, pName, isTemp, 1);
++  p = pParse->pNewTable;
++  if( p==0 || pParse->nErr ){
++    sqliteSelectDelete(pSelect);
++    return;
++  }
++  if( sqliteFixInit(&sFix, pParse, p->iDb, "view", pName)
++    && sqliteFixSelect(&sFix, pSelect)
++  ){
++    sqliteSelectDelete(pSelect);
++    return;
++  }
++
++  /* Make a copy of the entire SELECT statement that defines the view.
++  ** This will force all the Expr.token.z values to be dynamically
++  ** allocated rather than point to the input string - which means that
++  ** they will persist after the current sqlite_exec() call returns.
++  */
++  p->pSelect = sqliteSelectDup(pSelect);
++  sqliteSelectDelete(pSelect);
++  if( !pParse->db->init.busy ){
++    sqliteViewGetColumnNames(pParse, p);
++  }
++
++  /* Locate the end of the CREATE VIEW statement.  Make sEnd point to
++  ** the end.
++  */
++  sEnd = pParse->sLastToken;
++  if( sEnd.z[0]!=0 && sEnd.z[0]!=';' ){
++    sEnd.z += sEnd.n;
++  }
++  sEnd.n = 0;
++  n = sEnd.z - pBegin->z;
++  z = pBegin->z;
++  while( n>0 && (z[n-1]==';' || isspace(z[n-1])) ){ n--; }
++  sEnd.z = &z[n-1];
++  sEnd.n = 1;
++
++  /* Use sqliteEndTable() to add the view to the SQLITE_MASTER table */
++  sqliteEndTable(pParse, &sEnd, 0);
++  return;
++}
++
++/*
++** The Table structure pTable is really a VIEW.  Fill in the names of
++** the columns of the view in the pTable structure.  Return the number
++** of errors.  If an error is seen leave an error message in pParse->zErrMsg.
++*/
++int sqliteViewGetColumnNames(Parse *pParse, Table *pTable){
++  ExprList *pEList;
++  Select *pSel;
++  Table *pSelTab;
++  int nErr = 0;
++
++  assert( pTable );
++
++  /* A positive nCol means the columns names for this view are
++  ** already known.
++  */
++  if( pTable->nCol>0 ) return 0;
++
++  /* A negative nCol is a special marker meaning that we are currently
++  ** trying to compute the column names.  If we enter this routine with
++  ** a negative nCol, it means two or more views form a loop, like this:
++  **
++  **     CREATE VIEW one AS SELECT * FROM two;
++  **     CREATE VIEW two AS SELECT * FROM one;
++  **
++  ** Actually, this error is caught previously and so the following test
++  ** should always fail.  But we will leave it in place just to be safe.
++  */
++  if( pTable->nCol<0 ){
++    sqliteErrorMsg(pParse, "view %s is circularly defined", pTable->zName);
++    return 1;
++  }
++
++  /* If we get this far, it means we need to compute the table names.
++  */
++  assert( pTable->pSelect ); /* If nCol==0, then pTable must be a VIEW */
++  pSel = pTable->pSelect;
++
++  /* Note that the call to sqliteResultSetOfSelect() will expand any
++  ** "*" elements in this list.  But we will need to restore the list
++  ** back to its original configuration afterwards, so we save a copy of
++  ** the original in pEList.
++  */
++  pEList = pSel->pEList;
++  pSel->pEList = sqliteExprListDup(pEList);
++  if( pSel->pEList==0 ){
++    pSel->pEList = pEList;
++    return 1;  /* Malloc failed */
++  }
++  pTable->nCol = -1;
++  pSelTab = sqliteResultSetOfSelect(pParse, 0, pSel);
++  if( pSelTab ){
++    assert( pTable->aCol==0 );
++    pTable->nCol = pSelTab->nCol;
++    pTable->aCol = pSelTab->aCol;
++    pSelTab->nCol = 0;
++    pSelTab->aCol = 0;
++    sqliteDeleteTable(0, pSelTab);
++    DbSetProperty(pParse->db, pTable->iDb, DB_UnresetViews);
++  }else{
++    pTable->nCol = 0;
++    nErr++;
++  }
++  sqliteSelectUnbind(pSel);
++  sqliteExprListDelete(pSel->pEList);
++  pSel->pEList = pEList;
++  return nErr;  
++}
++
++/*
++** Clear the column names from the VIEW pTable.
++**
++** This routine is called whenever any other table or view is modified.
++** The view passed into this routine might depend directly or indirectly
++** on the modified or deleted table so we need to clear the old column
++** names so that they will be recomputed.
++*/
++static void sqliteViewResetColumnNames(Table *pTable){
++  int i;
++  Column *pCol;
++  assert( pTable!=0 && pTable->pSelect!=0 );
++  for(i=0, pCol=pTable->aCol; i<pTable->nCol; i++, pCol++){
++    sqliteFree(pCol->zName);
++    sqliteFree(pCol->zDflt);
++    sqliteFree(pCol->zType);
++  }
++  sqliteFree(pTable->aCol);
++  pTable->aCol = 0;
++  pTable->nCol = 0;
++}
++
++/*
++** Clear the column names from every VIEW in database idx.
++*/
++static void sqliteViewResetAll(sqlite *db, int idx){
++  HashElem *i;
++  if( !DbHasProperty(db, idx, DB_UnresetViews) ) return;
++  for(i=sqliteHashFirst(&db->aDb[idx].tblHash); i; i=sqliteHashNext(i)){
++    Table *pTab = sqliteHashData(i);
++    if( pTab->pSelect ){
++      sqliteViewResetColumnNames(pTab);
++    }
++  }
++  DbClearProperty(db, idx, DB_UnresetViews);
++}
++
++/*
++** Given a token, look up a table with that name.  If not found, leave
++** an error for the parser to find and return NULL.
++*/
++Table *sqliteTableFromToken(Parse *pParse, Token *pTok){
++  char *zName;
++  Table *pTab;
++  zName = sqliteTableNameFromToken(pTok);
++  if( zName==0 ) return 0;
++  pTab = sqliteFindTable(pParse->db, zName, 0);
++  sqliteFree(zName);
++  if( pTab==0 ){
++    sqliteErrorMsg(pParse, "no such table: %T", pTok);
++  }
++  return pTab;
++}
++
++/*
++** This routine is called to do the work of a DROP TABLE statement.
++** pName is the name of the table to be dropped.
++*/
++void sqliteDropTable(Parse *pParse, Token *pName, int isView){
++  Table *pTable;
++  Vdbe *v;
++  int base;
++  sqlite *db = pParse->db;
++  int iDb;
++
++  if( pParse->nErr || sqlite_malloc_failed ) return;
++  pTable = sqliteTableFromToken(pParse, pName);
++  if( pTable==0 ) return;
++  iDb = pTable->iDb;
++  assert( iDb>=0 && iDb<db->nDb );
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  {
++    int code;
++    const char *zTab = SCHEMA_TABLE(pTable->iDb);
++    const char *zDb = db->aDb[pTable->iDb].zName;
++    if( sqliteAuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb)){
++      return;
++    }
++    if( isView ){
++      if( iDb==1 ){
++        code = SQLITE_DROP_TEMP_VIEW;
++      }else{
++        code = SQLITE_DROP_VIEW;
++      }
++    }else{
++      if( iDb==1 ){
++        code = SQLITE_DROP_TEMP_TABLE;
++      }else{
++        code = SQLITE_DROP_TABLE;
++      }
++    }
++    if( sqliteAuthCheck(pParse, code, pTable->zName, 0, zDb) ){
++      return;
++    }
++    if( sqliteAuthCheck(pParse, SQLITE_DELETE, pTable->zName, 0, zDb) ){
++      return;
++    }
++  }
++#endif
++  if( pTable->readOnly ){
++    sqliteErrorMsg(pParse, "table %s may not be dropped", pTable->zName);
++    pParse->nErr++;
++    return;
++  }
++  if( isView && pTable->pSelect==0 ){
++    sqliteErrorMsg(pParse, "use DROP TABLE to delete table %s", pTable->zName);
++    return;
++  }
++  if( !isView && pTable->pSelect ){
++    sqliteErrorMsg(pParse, "use DROP VIEW to delete view %s", pTable->zName);
++    return;
++  }
++
++  /* Generate code to remove the table from the master table
++  ** on disk.
++  */
++  v = sqliteGetVdbe(pParse);
++  if( v ){
++    static VdbeOpList dropTable[] = {
++      { OP_Rewind,     0, ADDR(8),  0},
++      { OP_String,     0, 0,        0}, /* 1 */
++      { OP_MemStore,   1, 1,        0},
++      { OP_MemLoad,    1, 0,        0}, /* 3 */
++      { OP_Column,     0, 2,        0},
++      { OP_Ne,         0, ADDR(7),  0},
++      { OP_Delete,     0, 0,        0},
++      { OP_Next,       0, ADDR(3),  0}, /* 7 */
++    };
++    Index *pIdx;
++    Trigger *pTrigger;
++    sqliteBeginWriteOperation(pParse, 0, pTable->iDb);
++
++    /* Drop all triggers associated with the table being dropped */
++    pTrigger = pTable->pTrigger;
++    while( pTrigger ){
++      assert( pTrigger->iDb==pTable->iDb || pTrigger->iDb==1 );
++      sqliteDropTriggerPtr(pParse, pTrigger, 1);
++      if( pParse->explain ){
++        pTrigger = pTrigger->pNext;
++      }else{
++        pTrigger = pTable->pTrigger;
++      }
++    }
++
++    /* Drop all SQLITE_MASTER entries that refer to the table */
++    sqliteOpenMasterTable(v, pTable->iDb);
++    base = sqliteVdbeAddOpList(v, ArraySize(dropTable), dropTable);
++    sqliteVdbeChangeP3(v, base+1, pTable->zName, 0);
++
++    /* Drop all SQLITE_TEMP_MASTER entries that refer to the table */
++    if( pTable->iDb!=1 ){
++      sqliteOpenMasterTable(v, 1);
++      base = sqliteVdbeAddOpList(v, ArraySize(dropTable), dropTable);
++      sqliteVdbeChangeP3(v, base+1, pTable->zName, 0);
++    }
++
++    if( pTable->iDb==0 ){
++      sqliteChangeCookie(db, v);
++    }
++    sqliteVdbeAddOp(v, OP_Close, 0, 0);
++    if( !isView ){
++      sqliteVdbeAddOp(v, OP_Destroy, pTable->tnum, pTable->iDb);
++      for(pIdx=pTable->pIndex; pIdx; pIdx=pIdx->pNext){
++        sqliteVdbeAddOp(v, OP_Destroy, pIdx->tnum, pIdx->iDb);
++      }
++    }
++    sqliteEndWriteOperation(pParse);
++  }
++
++  /* Delete the in-memory description of the table.
++  **
++  ** Exception: if the SQL statement began with the EXPLAIN keyword,
++  ** then no changes should be made.
++  */
++  if( !pParse->explain ){
++    sqliteUnlinkAndDeleteTable(db, pTable);
++    db->flags |= SQLITE_InternChanges;
++  }
++  sqliteViewResetAll(db, iDb);
++}
++
++/*
++** This routine constructs a P3 string suitable for an OP_MakeIdxKey
++** opcode and adds that P3 string to the most recently inserted instruction
++** in the virtual machine.  The P3 string consists of a single character
++** for each column in the index pIdx of table pTab.  If the column uses
++** a numeric sort order, then the P3 string character corresponding to
++** that column is 'n'.  If the column uses a text sort order, then the
++** P3 string is 't'.  See the OP_MakeIdxKey opcode documentation for
++** additional information.  See also the sqliteAddKeyType() routine.
++*/
++void sqliteAddIdxKeyType(Vdbe *v, Index *pIdx){
++  char *zType;
++  Table *pTab;
++  int i, n;
++  assert( pIdx!=0 && pIdx->pTable!=0 );
++  pTab = pIdx->pTable;
++  n = pIdx->nColumn;
++  zType = sqliteMallocRaw( n+1 );
++  if( zType==0 ) return;
++  for(i=0; i<n; i++){
++    int iCol = pIdx->aiColumn[i];
++    assert( iCol>=0 && iCol<pTab->nCol );
++    if( (pTab->aCol[iCol].sortOrder & SQLITE_SO_TYPEMASK)==SQLITE_SO_TEXT ){
++      zType[i] = 't';
++    }else{
++      zType[i] = 'n';
++    }
++  }
++  zType[n] = 0;
++  sqliteVdbeChangeP3(v, -1, zType, n);
++  sqliteFree(zType);
++}
++
++/*
++** This routine is called to create a new foreign key on the table
++** currently under construction.  pFromCol determines which columns
++** in the current table point to the foreign key.  If pFromCol==0 then
++** connect the key to the last column inserted.  pTo is the name of
++** the table referred to.  pToCol is a list of tables in the other
++** pTo table that the foreign key points to.  flags contains all
++** information about the conflict resolution algorithms specified
++** in the ON DELETE, ON UPDATE and ON INSERT clauses.
++**
++** An FKey structure is created and added to the table currently
++** under construction in the pParse->pNewTable field.  The new FKey
++** is not linked into db->aFKey at this point - that does not happen
++** until sqliteEndTable().
++**
++** The foreign key is set for IMMEDIATE processing.  A subsequent call
++** to sqliteDeferForeignKey() might change this to DEFERRED.
++*/
++void sqliteCreateForeignKey(
++  Parse *pParse,       /* Parsing context */
++  IdList *pFromCol,    /* Columns in this table that point to other table */
++  Token *pTo,          /* Name of the other table */
++  IdList *pToCol,      /* Columns in the other table */
++  int flags            /* Conflict resolution algorithms. */
++){
++  Table *p = pParse->pNewTable;
++  int nByte;
++  int i;
++  int nCol;
++  char *z;
++  FKey *pFKey = 0;
++
++  assert( pTo!=0 );
++  if( p==0 || pParse->nErr ) goto fk_end;
++  if( pFromCol==0 ){
++    int iCol = p->nCol-1;
++    if( iCol<0 ) goto fk_end;
++    if( pToCol && pToCol->nId!=1 ){
++      sqliteErrorMsg(pParse, "foreign key on %s"
++         " should reference only one column of table %T",
++         p->aCol[iCol].zName, pTo);
++      goto fk_end;
++    }
++    nCol = 1;
++  }else if( pToCol && pToCol->nId!=pFromCol->nId ){
++    sqliteErrorMsg(pParse,
++        "number of columns in foreign key does not match the number of "
++        "columns in the referenced table");
++    goto fk_end;
++  }else{
++    nCol = pFromCol->nId;
++  }
++  nByte = sizeof(*pFKey) + nCol*sizeof(pFKey->aCol[0]) + pTo->n + 1;
++  if( pToCol ){
++    for(i=0; i<pToCol->nId; i++){
++      nByte += strlen(pToCol->a[i].zName) + 1;
++    }
++  }
++  pFKey = sqliteMalloc( nByte );
++  if( pFKey==0 ) goto fk_end;
++  pFKey->pFrom = p;
++  pFKey->pNextFrom = p->pFKey;
++  z = (char*)&pFKey[1];
++  pFKey->aCol = (struct sColMap*)z;
++  z += sizeof(struct sColMap)*nCol;
++  pFKey->zTo = z;
++  memcpy(z, pTo->z, pTo->n);
++  z[pTo->n] = 0;
++  z += pTo->n+1;
++  pFKey->pNextTo = 0;
++  pFKey->nCol = nCol;
++  if( pFromCol==0 ){
++    pFKey->aCol[0].iFrom = p->nCol-1;
++  }else{
++    for(i=0; i<nCol; i++){
++      int j;
++      for(j=0; j<p->nCol; j++){
++        if( sqliteStrICmp(p->aCol[j].zName, pFromCol->a[i].zName)==0 ){
++          pFKey->aCol[i].iFrom = j;
++          break;
++        }
++      }
++      if( j>=p->nCol ){
++        sqliteErrorMsg(pParse, 
++          "unknown column \"%s\" in foreign key definition", 
++          pFromCol->a[i].zName);
++        goto fk_end;
++      }
++    }
++  }
++  if( pToCol ){
++    for(i=0; i<nCol; i++){
++      int n = strlen(pToCol->a[i].zName);
++      pFKey->aCol[i].zCol = z;
++      memcpy(z, pToCol->a[i].zName, n);
++      z[n] = 0;
++      z += n+1;
++    }
++  }
++  pFKey->isDeferred = 0;
++  pFKey->deleteConf = flags & 0xff;
++  pFKey->updateConf = (flags >> 8 ) & 0xff;
++  pFKey->insertConf = (flags >> 16 ) & 0xff;
++
++  /* Link the foreign key to the table as the last step.
++  */
++  p->pFKey = pFKey;
++  pFKey = 0;
++
++fk_end:
++  sqliteFree(pFKey);
++  sqliteIdListDelete(pFromCol);
++  sqliteIdListDelete(pToCol);
++}
++
++/*
++** This routine is called when an INITIALLY IMMEDIATE or INITIALLY DEFERRED
++** clause is seen as part of a foreign key definition.  The isDeferred
++** parameter is 1 for INITIALLY DEFERRED and 0 for INITIALLY IMMEDIATE.
++** The behavior of the most recently created foreign key is adjusted
++** accordingly.
++*/
++void sqliteDeferForeignKey(Parse *pParse, int isDeferred){
++  Table *pTab;
++  FKey *pFKey;
++  if( (pTab = pParse->pNewTable)==0 || (pFKey = pTab->pFKey)==0 ) return;
++  pFKey->isDeferred = isDeferred;
++}
++
++/*
++** Create a new index for an SQL table.  pIndex is the name of the index 
++** and pTable is the name of the table that is to be indexed.  Both will 
++** be NULL for a primary key or an index that is created to satisfy a
++** UNIQUE constraint.  If pTable and pIndex are NULL, use pParse->pNewTable
++** as the table to be indexed.  pParse->pNewTable is a table that is
++** currently being constructed by a CREATE TABLE statement.
++**
++** pList is a list of columns to be indexed.  pList will be NULL if this
++** is a primary key or unique-constraint on the most recent column added
++** to the table currently under construction.  
++*/
++void sqliteCreateIndex(
++  Parse *pParse,   /* All information about this parse */
++  Token *pName,    /* Name of the index.  May be NULL */
++  SrcList *pTable, /* Name of the table to index.  Use pParse->pNewTable if 0 */
++  IdList *pList,   /* A list of columns to be indexed */
++  int onError,     /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
++  Token *pStart,   /* The CREATE token that begins a CREATE TABLE statement */
++  Token *pEnd      /* The ")" that closes the CREATE INDEX statement */
++){
++  Table *pTab;     /* Table to be indexed */
++  Index *pIndex;   /* The index to be created */
++  char *zName = 0;
++  int i, j;
++  Token nullId;    /* Fake token for an empty ID list */
++  DbFixer sFix;    /* For assigning database names to pTable */
++  int isTemp;      /* True for a temporary index */
++  sqlite *db = pParse->db;
++
++  if( pParse->nErr || sqlite_malloc_failed ) goto exit_create_index;
++  if( db->init.busy 
++     && sqliteFixInit(&sFix, pParse, db->init.iDb, "index", pName)
++     && sqliteFixSrcList(&sFix, pTable)
++  ){
++    goto exit_create_index;
++  }
++
++  /*
++  ** Find the table that is to be indexed.  Return early if not found.
++  */
++  if( pTable!=0 ){
++    assert( pName!=0 );
++    assert( pTable->nSrc==1 );
++    pTab =  sqliteSrcListLookup(pParse, pTable);
++  }else{
++    assert( pName==0 );
++    pTab =  pParse->pNewTable;
++  }
++  if( pTab==0 || pParse->nErr ) goto exit_create_index;
++  if( pTab->readOnly ){
++    sqliteErrorMsg(pParse, "table %s may not be indexed", pTab->zName);
++    goto exit_create_index;
++  }
++  if( pTab->iDb>=2 && db->init.busy==0 ){
++    sqliteErrorMsg(pParse, "table %s may not have indices added", pTab->zName);
++    goto exit_create_index;
++  }
++  if( pTab->pSelect ){
++    sqliteErrorMsg(pParse, "views may not be indexed");
++    goto exit_create_index;
++  }
++  isTemp = pTab->iDb==1;
++
++  /*
++  ** Find the name of the index.  Make sure there is not already another
++  ** index or table with the same name.  
++  **
++  ** Exception:  If we are reading the names of permanent indices from the
++  ** sqlite_master table (because some other process changed the schema) and
++  ** one of the index names collides with the name of a temporary table or
++  ** index, then we will continue to process this index.
++  **
++  ** If pName==0 it means that we are
++  ** dealing with a primary key or UNIQUE constraint.  We have to invent our
++  ** own name.
++  */
++  if( pName && !db->init.busy ){
++    Index *pISameName;    /* Another index with the same name */
++    Table *pTSameName;    /* A table with same name as the index */
++    zName = sqliteTableNameFromToken(pName);
++    if( zName==0 ) goto exit_create_index;
++    if( (pISameName = sqliteFindIndex(db, zName, 0))!=0 ){
++      sqliteErrorMsg(pParse, "index %s already exists", zName);
++      goto exit_create_index;
++    }
++    if( (pTSameName = sqliteFindTable(db, zName, 0))!=0 ){
++      sqliteErrorMsg(pParse, "there is already a table named %s", zName);
++      goto exit_create_index;
++    }
++  }else if( pName==0 ){
++    char zBuf[30];
++    int n;
++    Index *pLoop;
++    for(pLoop=pTab->pIndex, n=1; pLoop; pLoop=pLoop->pNext, n++){}
++    sprintf(zBuf,"%d)",n);
++    zName = 0;
++    sqliteSetString(&zName, "(", pTab->zName, " autoindex ", zBuf, (char*)0);
++    if( zName==0 ) goto exit_create_index;
++  }else{
++    zName = sqliteTableNameFromToken(pName);
++  }
++
++  /* Check for authorization to create an index.
++  */
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  {
++    const char *zDb = db->aDb[pTab->iDb].zName;
++
++    assert( pTab->iDb==db->init.iDb || isTemp );
++    if( sqliteAuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){
++      goto exit_create_index;
++    }
++    i = SQLITE_CREATE_INDEX;
++    if( isTemp ) i = SQLITE_CREATE_TEMP_INDEX;
++    if( sqliteAuthCheck(pParse, i, zName, pTab->zName, zDb) ){
++      goto exit_create_index;
++    }
++  }
++#endif
++
++  /* If pList==0, it means this routine was called to make a primary
++  ** key out of the last column added to the table under construction.
++  ** So create a fake list to simulate this.
++  */
++  if( pList==0 ){
++    nullId.z = pTab->aCol[pTab->nCol-1].zName;
++    nullId.n = strlen(nullId.z);
++    pList = sqliteIdListAppend(0, &nullId);
++    if( pList==0 ) goto exit_create_index;
++  }
++
++  /* 
++  ** Allocate the index structure. 
++  */
++  pIndex = sqliteMalloc( sizeof(Index) + strlen(zName) + 1 +
++                        sizeof(int)*pList->nId );
++  if( pIndex==0 ) goto exit_create_index;
++  pIndex->aiColumn = (int*)&pIndex[1];
++  pIndex->zName = (char*)&pIndex->aiColumn[pList->nId];
++  strcpy(pIndex->zName, zName);
++  pIndex->pTable = pTab;
++  pIndex->nColumn = pList->nId;
++  pIndex->onError = onError;
++  pIndex->autoIndex = pName==0;
++  pIndex->iDb = isTemp ? 1 : db->init.iDb;
++
++  /* Scan the names of the columns of the table to be indexed and
++  ** load the column indices into the Index structure.  Report an error
++  ** if any column is not found.
++  */
++  for(i=0; i<pList->nId; i++){
++    for(j=0; j<pTab->nCol; j++){
++      if( sqliteStrICmp(pList->a[i].zName, pTab->aCol[j].zName)==0 ) break;
++    }
++    if( j>=pTab->nCol ){
++      sqliteErrorMsg(pParse, "table %s has no column named %s",
++        pTab->zName, pList->a[i].zName);
++      sqliteFree(pIndex);
++      goto exit_create_index;
++    }
++    pIndex->aiColumn[i] = j;
++  }
++
++  /* Link the new Index structure to its table and to the other
++  ** in-memory database structures. 
++  */
++  if( !pParse->explain ){
++    Index *p;
++    p = sqliteHashInsert(&db->aDb[pIndex->iDb].idxHash, 
++                         pIndex->zName, strlen(pIndex->zName)+1, pIndex);
++    if( p ){
++      assert( p==pIndex );  /* Malloc must have failed */
++      sqliteFree(pIndex);
++      goto exit_create_index;
++    }
++    db->flags |= SQLITE_InternChanges;
++  }
++
++  /* When adding an index to the list of indices for a table, make
++  ** sure all indices labeled OE_Replace come after all those labeled
++  ** OE_Ignore.  This is necessary for the correct operation of UPDATE
++  ** and INSERT.
++  */
++  if( onError!=OE_Replace || pTab->pIndex==0
++       || pTab->pIndex->onError==OE_Replace){
++    pIndex->pNext = pTab->pIndex;
++    pTab->pIndex = pIndex;
++  }else{
++    Index *pOther = pTab->pIndex;
++    while( pOther->pNext && pOther->pNext->onError!=OE_Replace ){
++      pOther = pOther->pNext;
++    }
++    pIndex->pNext = pOther->pNext;
++    pOther->pNext = pIndex;
++  }
++
++  /* If the db->init.busy is 1 it means we are reading the SQL off the
++  ** "sqlite_master" table on the disk.  So do not write to the disk
++  ** again.  Extract the table number from the db->init.newTnum field.
++  */
++  if( db->init.busy && pTable!=0 ){
++    pIndex->tnum = db->init.newTnum;
++  }
++
++  /* If the db->init.busy is 0 then create the index on disk.  This
++  ** involves writing the index into the master table and filling in the
++  ** index with the current table contents.
++  **
++  ** The db->init.busy is 0 when the user first enters a CREATE INDEX 
++  ** command.  db->init.busy is 1 when a database is opened and 
++  ** CREATE INDEX statements are read out of the master table.  In
++  ** the latter case the index already exists on disk, which is why
++  ** we don't want to recreate it.
++  **
++  ** If pTable==0 it means this index is generated as a primary key
++  ** or UNIQUE constraint of a CREATE TABLE statement.  Since the table
++  ** has just been created, it contains no data and the index initialization
++  ** step can be skipped.
++  */
++  else if( db->init.busy==0 ){
++    int n;
++    Vdbe *v;
++    int lbl1, lbl2;
++    int i;
++    int addr;
++
++    v = sqliteGetVdbe(pParse);
++    if( v==0 ) goto exit_create_index;
++    if( pTable!=0 ){
++      sqliteBeginWriteOperation(pParse, 0, isTemp);
++      sqliteOpenMasterTable(v, isTemp);
++    }
++    sqliteVdbeAddOp(v, OP_NewRecno, 0, 0);
++    sqliteVdbeOp3(v, OP_String, 0, 0, "index", P3_STATIC);
++    sqliteVdbeOp3(v, OP_String, 0, 0, pIndex->zName, 0);
++    sqliteVdbeOp3(v, OP_String, 0, 0, pTab->zName, 0);
++    sqliteVdbeOp3(v, OP_CreateIndex, 0, isTemp,(char*)&pIndex->tnum,P3_POINTER);
++    pIndex->tnum = 0;
++    if( pTable ){
++      sqliteVdbeCode(v,
++          OP_Dup,       0,      0,
++          OP_Integer,   isTemp, 0,
++          OP_OpenWrite, 1,      0,
++      0);
++    }
++    addr = sqliteVdbeAddOp(v, OP_String, 0, 0);
++    if( pStart && pEnd ){
++      n = Addr(pEnd->z) - Addr(pStart->z) + 1;
++      sqliteVdbeChangeP3(v, addr, pStart->z, n);
++    }
++    sqliteVdbeAddOp(v, OP_MakeRecord, 5, 0);
++    sqliteVdbeAddOp(v, OP_PutIntKey, 0, 0);
++    if( pTable ){
++      sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++      sqliteVdbeOp3(v, OP_OpenRead, 2, pTab->tnum, pTab->zName, 0);
++      lbl2 = sqliteVdbeMakeLabel(v);
++      sqliteVdbeAddOp(v, OP_Rewind, 2, lbl2);
++      lbl1 = sqliteVdbeAddOp(v, OP_Recno, 2, 0);
++      for(i=0; i<pIndex->nColumn; i++){
++        int iCol = pIndex->aiColumn[i];
++        if( pTab->iPKey==iCol ){
++          sqliteVdbeAddOp(v, OP_Dup, i, 0);
++        }else{
++          sqliteVdbeAddOp(v, OP_Column, 2, iCol);
++        }
++      }
++      sqliteVdbeAddOp(v, OP_MakeIdxKey, pIndex->nColumn, 0);
++      if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIndex);
++      sqliteVdbeOp3(v, OP_IdxPut, 1, pIndex->onError!=OE_None,
++                      "indexed columns are not unique", P3_STATIC);
++      sqliteVdbeAddOp(v, OP_Next, 2, lbl1);
++      sqliteVdbeResolveLabel(v, lbl2);
++      sqliteVdbeAddOp(v, OP_Close, 2, 0);
++      sqliteVdbeAddOp(v, OP_Close, 1, 0);
++    }
++    if( pTable!=0 ){
++      if( !isTemp ){
++        sqliteChangeCookie(db, v);
++      }
++      sqliteVdbeAddOp(v, OP_Close, 0, 0);
++      sqliteEndWriteOperation(pParse);
++    }
++  }
++
++  /* Clean up before exiting */
++exit_create_index:
++  sqliteIdListDelete(pList);
++  sqliteSrcListDelete(pTable);
++  sqliteFree(zName);
++  return;
++}
++
++/*
++** This routine will drop an existing named index.  This routine
++** implements the DROP INDEX statement.
++*/
++void sqliteDropIndex(Parse *pParse, SrcList *pName){
++  Index *pIndex;
++  Vdbe *v;
++  sqlite *db = pParse->db;
++
++  if( pParse->nErr || sqlite_malloc_failed ) return;
++  assert( pName->nSrc==1 );
++  pIndex = sqliteFindIndex(db, pName->a[0].zName, pName->a[0].zDatabase);
++  if( pIndex==0 ){
++    sqliteErrorMsg(pParse, "no such index: %S", pName, 0);
++    goto exit_drop_index;
++  }
++  if( pIndex->autoIndex ){
++    sqliteErrorMsg(pParse, "index associated with UNIQUE "
++      "or PRIMARY KEY constraint cannot be dropped", 0);
++    goto exit_drop_index;
++  }
++  if( pIndex->iDb>1 ){
++    sqliteErrorMsg(pParse, "cannot alter schema of attached "
++       "databases", 0);
++    goto exit_drop_index;
++  }
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  {
++    int code = SQLITE_DROP_INDEX;
++    Table *pTab = pIndex->pTable;
++    const char *zDb = db->aDb[pIndex->iDb].zName;
++    const char *zTab = SCHEMA_TABLE(pIndex->iDb);
++    if( sqliteAuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){
++      goto exit_drop_index;
++    }
++    if( pIndex->iDb ) code = SQLITE_DROP_TEMP_INDEX;
++    if( sqliteAuthCheck(pParse, code, pIndex->zName, pTab->zName, zDb) ){
++      goto exit_drop_index;
++    }
++  }
++#endif
++
++  /* Generate code to remove the index and from the master table */
++  v = sqliteGetVdbe(pParse);
++  if( v ){
++    static VdbeOpList dropIndex[] = {
++      { OP_Rewind,     0, ADDR(9), 0}, 
++      { OP_String,     0, 0,       0}, /* 1 */
++      { OP_MemStore,   1, 1,       0},
++      { OP_MemLoad,    1, 0,       0}, /* 3 */
++      { OP_Column,     0, 1,       0},
++      { OP_Eq,         0, ADDR(8), 0},
++      { OP_Next,       0, ADDR(3), 0},
++      { OP_Goto,       0, ADDR(9), 0},
++      { OP_Delete,     0, 0,       0}, /* 8 */
++    };
++    int base;
++
++    sqliteBeginWriteOperation(pParse, 0, pIndex->iDb);
++    sqliteOpenMasterTable(v, pIndex->iDb);
++    base = sqliteVdbeAddOpList(v, ArraySize(dropIndex), dropIndex);
++    sqliteVdbeChangeP3(v, base+1, pIndex->zName, 0);
++    if( pIndex->iDb==0 ){
++      sqliteChangeCookie(db, v);
++    }
++    sqliteVdbeAddOp(v, OP_Close, 0, 0);
++    sqliteVdbeAddOp(v, OP_Destroy, pIndex->tnum, pIndex->iDb);
++    sqliteEndWriteOperation(pParse);
++  }
++
++  /* Delete the in-memory description of this index.
++  */
++  if( !pParse->explain ){
++    sqliteUnlinkAndDeleteIndex(db, pIndex);
++    db->flags |= SQLITE_InternChanges;
++  }
++
++exit_drop_index:
++  sqliteSrcListDelete(pName);
++}
++
++/*
++** Append a new element to the given IdList.  Create a new IdList if
++** need be.
++**
++** A new IdList is returned, or NULL if malloc() fails.
++*/
++IdList *sqliteIdListAppend(IdList *pList, Token *pToken){
++  if( pList==0 ){
++    pList = sqliteMalloc( sizeof(IdList) );
++    if( pList==0 ) return 0;
++    pList->nAlloc = 0;
++  }
++  if( pList->nId>=pList->nAlloc ){
++    struct IdList_item *a;
++    pList->nAlloc = pList->nAlloc*2 + 5;
++    a = sqliteRealloc(pList->a, pList->nAlloc*sizeof(pList->a[0]) );
++    if( a==0 ){
++      sqliteIdListDelete(pList);
++      return 0;
++    }
++    pList->a = a;
++  }
++  memset(&pList->a[pList->nId], 0, sizeof(pList->a[0]));
++  if( pToken ){
++    char **pz = &pList->a[pList->nId].zName;
++    sqliteSetNString(pz, pToken->z, pToken->n, 0);
++    if( *pz==0 ){
++      sqliteIdListDelete(pList);
++      return 0;
++    }else{
++      sqliteDequote(*pz);
++    }
++  }
++  pList->nId++;
++  return pList;
++}
++
++/*
++** Append a new table name to the given SrcList.  Create a new SrcList if
++** need be.  A new entry is created in the SrcList even if pToken is NULL.
++**
++** A new SrcList is returned, or NULL if malloc() fails.
++**
++** If pDatabase is not null, it means that the table has an optional
++** database name prefix.  Like this:  "database.table".  The pDatabase
++** points to the table name and the pTable points to the database name.
++** The SrcList.a[].zName field is filled with the table name which might
++** come from pTable (if pDatabase is NULL) or from pDatabase.  
++** SrcList.a[].zDatabase is filled with the database name from pTable,
++** or with NULL if no database is specified.
++**
++** In other words, if call like this:
++**
++**         sqliteSrcListAppend(A,B,0);
++**
++** Then B is a table name and the database name is unspecified.  If called
++** like this:
++**
++**         sqliteSrcListAppend(A,B,C);
++**
++** Then C is the table name and B is the database name.
++*/
++SrcList *sqliteSrcListAppend(SrcList *pList, Token *pTable, Token *pDatabase){
++  if( pList==0 ){
++    pList = sqliteMalloc( sizeof(SrcList) );
++    if( pList==0 ) return 0;
++    pList->nAlloc = 1;
++  }
++  if( pList->nSrc>=pList->nAlloc ){
++    SrcList *pNew;
++    pList->nAlloc *= 2;
++    pNew = sqliteRealloc(pList,
++               sizeof(*pList) + (pList->nAlloc-1)*sizeof(pList->a[0]) );
++    if( pNew==0 ){
++      sqliteSrcListDelete(pList);
++      return 0;
++    }
++    pList = pNew;
++  }
++  memset(&pList->a[pList->nSrc], 0, sizeof(pList->a[0]));
++  if( pDatabase && pDatabase->z==0 ){
++    pDatabase = 0;
++  }
++  if( pDatabase && pTable ){
++    Token *pTemp = pDatabase;
++    pDatabase = pTable;
++    pTable = pTemp;
++  }
++  if( pTable ){
++    char **pz = &pList->a[pList->nSrc].zName;
++    sqliteSetNString(pz, pTable->z, pTable->n, 0);
++    if( *pz==0 ){
++      sqliteSrcListDelete(pList);
++      return 0;
++    }else{
++      sqliteDequote(*pz);
++    }
++  }
++  if( pDatabase ){
++    char **pz = &pList->a[pList->nSrc].zDatabase;
++    sqliteSetNString(pz, pDatabase->z, pDatabase->n, 0);
++    if( *pz==0 ){
++      sqliteSrcListDelete(pList);
++      return 0;
++    }else{
++      sqliteDequote(*pz);
++    }
++  }
++  pList->a[pList->nSrc].iCursor = -1;
++  pList->nSrc++;
++  return pList;
++}
++
++/*
++** Assign cursors to all tables in a SrcList
++*/
++void sqliteSrcListAssignCursors(Parse *pParse, SrcList *pList){
++  int i;
++  for(i=0; i<pList->nSrc; i++){
++    if( pList->a[i].iCursor<0 ){
++      pList->a[i].iCursor = pParse->nTab++;
++    }
++  }
++}
++
++/*
++** Add an alias to the last identifier on the given identifier list.
++*/
++void sqliteSrcListAddAlias(SrcList *pList, Token *pToken){
++  if( pList && pList->nSrc>0 ){
++    int i = pList->nSrc - 1;
++    sqliteSetNString(&pList->a[i].zAlias, pToken->z, pToken->n, 0);
++    sqliteDequote(pList->a[i].zAlias);
++  }
++}
++
++/*
++** Delete an IdList.
++*/
++void sqliteIdListDelete(IdList *pList){
++  int i;
++  if( pList==0 ) return;
++  for(i=0; i<pList->nId; i++){
++    sqliteFree(pList->a[i].zName);
++  }
++  sqliteFree(pList->a);
++  sqliteFree(pList);
++}
++
++/*
++** Return the index in pList of the identifier named zId.  Return -1
++** if not found.
++*/
++int sqliteIdListIndex(IdList *pList, const char *zName){
++  int i;
++  if( pList==0 ) return -1;
++  for(i=0; i<pList->nId; i++){
++    if( sqliteStrICmp(pList->a[i].zName, zName)==0 ) return i;
++  }
++  return -1;
++}
++
++/*
++** Delete an entire SrcList including all its substructure.
++*/
++void sqliteSrcListDelete(SrcList *pList){
++  int i;
++  if( pList==0 ) return;
++  for(i=0; i<pList->nSrc; i++){
++    sqliteFree(pList->a[i].zDatabase);
++    sqliteFree(pList->a[i].zName);
++    sqliteFree(pList->a[i].zAlias);
++    if( pList->a[i].pTab && pList->a[i].pTab->isTransient ){
++      sqliteDeleteTable(0, pList->a[i].pTab);
++    }
++    sqliteSelectDelete(pList->a[i].pSelect);
++    sqliteExprDelete(pList->a[i].pOn);
++    sqliteIdListDelete(pList->a[i].pUsing);
++  }
++  sqliteFree(pList);
++}
++
++/*
++** Begin a transaction
++*/
++void sqliteBeginTransaction(Parse *pParse, int onError){
++  sqlite *db;
++
++  if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return;
++  if( pParse->nErr || sqlite_malloc_failed ) return;
++  if( sqliteAuthCheck(pParse, SQLITE_TRANSACTION, "BEGIN", 0, 0) ) return;
++  if( db->flags & SQLITE_InTrans ){
++    sqliteErrorMsg(pParse, "cannot start a transaction within a transaction");
++    return;
++  }
++  sqliteBeginWriteOperation(pParse, 0, 0);
++  if( !pParse->explain ){
++    db->flags |= SQLITE_InTrans;
++    db->onError = onError;
++  }
++}
++
++/*
++** Commit a transaction
++*/
++void sqliteCommitTransaction(Parse *pParse){
++  sqlite *db;
++
++  if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return;
++  if( pParse->nErr || sqlite_malloc_failed ) return;
++  if( sqliteAuthCheck(pParse, SQLITE_TRANSACTION, "COMMIT", 0, 0) ) return;
++  if( (db->flags & SQLITE_InTrans)==0 ){
++    sqliteErrorMsg(pParse, "cannot commit - no transaction is active");
++    return;
++  }
++  if( !pParse->explain ){
++    db->flags &= ~SQLITE_InTrans;
++  }
++  sqliteEndWriteOperation(pParse);
++  if( !pParse->explain ){
++    db->onError = OE_Default;
++  }
++}
++
++/*
++** Rollback a transaction
++*/
++void sqliteRollbackTransaction(Parse *pParse){
++  sqlite *db;
++  Vdbe *v;
++
++  if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return;
++  if( pParse->nErr || sqlite_malloc_failed ) return;
++  if( sqliteAuthCheck(pParse, SQLITE_TRANSACTION, "ROLLBACK", 0, 0) ) return;
++  if( (db->flags & SQLITE_InTrans)==0 ){
++    sqliteErrorMsg(pParse, "cannot rollback - no transaction is active");
++    return; 
++  }
++  v = sqliteGetVdbe(pParse);
++  if( v ){
++    sqliteVdbeAddOp(v, OP_Rollback, 0, 0);
++  }
++  if( !pParse->explain ){
++    db->flags &= ~SQLITE_InTrans;
++    db->onError = OE_Default;
++  }
++}
++
++/*
++** Generate VDBE code that will verify the schema cookie for all
++** named database files.
++*/
++void sqliteCodeVerifySchema(Parse *pParse, int iDb){
++  sqlite *db = pParse->db;
++  Vdbe *v = sqliteGetVdbe(pParse);
++  assert( iDb>=0 && iDb<db->nDb );
++  assert( db->aDb[iDb].pBt!=0 );
++  if( iDb!=1 && !DbHasProperty(db, iDb, DB_Cookie) ){
++    sqliteVdbeAddOp(v, OP_VerifyCookie, iDb, db->aDb[iDb].schema_cookie);
++    DbSetProperty(db, iDb, DB_Cookie);
++  }
++}
++
++/*
++** Generate VDBE code that prepares for doing an operation that
++** might change the database.
++**
++** This routine starts a new transaction if we are not already within
++** a transaction.  If we are already within a transaction, then a checkpoint
++** is set if the setCheckpoint parameter is true.  A checkpoint should
++** be set for operations that might fail (due to a constraint) part of
++** the way through and which will need to undo some writes without having to
++** rollback the whole transaction.  For operations where all constraints
++** can be checked before any changes are made to the database, it is never
++** necessary to undo a write and the checkpoint should not be set.
++**
++** Only database iDb and the temp database are made writable by this call.
++** If iDb==0, then the main and temp databases are made writable.   If
++** iDb==1 then only the temp database is made writable.  If iDb>1 then the
++** specified auxiliary database and the temp database are made writable.
++*/
++void sqliteBeginWriteOperation(Parse *pParse, int setCheckpoint, int iDb){
++  Vdbe *v;
++  sqlite *db = pParse->db;
++  if( DbHasProperty(db, iDb, DB_Locked) ) return;
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ) return;
++  if( !db->aDb[iDb].inTrans ){
++    sqliteVdbeAddOp(v, OP_Transaction, iDb, 0);
++    DbSetProperty(db, iDb, DB_Locked);
++    sqliteCodeVerifySchema(pParse, iDb);
++    if( iDb!=1 ){
++      sqliteBeginWriteOperation(pParse, setCheckpoint, 1);
++    }
++  }else if( setCheckpoint ){
++    sqliteVdbeAddOp(v, OP_Checkpoint, iDb, 0);
++    DbSetProperty(db, iDb, DB_Locked);
++  }
++}
++
++/*
++** Generate code that concludes an operation that may have changed
++** the database.  If a statement transaction was started, then emit
++** an OP_Commit that will cause the changes to be committed to disk.
++**
++** Note that checkpoints are automatically committed at the end of
++** a statement.  Note also that there can be multiple calls to 
++** sqliteBeginWriteOperation() but there should only be a single
++** call to sqliteEndWriteOperation() at the conclusion of the statement.
++*/
++void sqliteEndWriteOperation(Parse *pParse){
++  Vdbe *v;
++  sqlite *db = pParse->db;
++  if( pParse->trigStack ) return; /* if this is in a trigger */
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ) return;
++  if( db->flags & SQLITE_InTrans ){
++    /* A BEGIN has executed.  Do not commit until we see an explicit
++    ** COMMIT statement. */
++  }else{
++    sqliteVdbeAddOp(v, OP_Commit, 0, 0);
++  }
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/config_static.w32.h
+@@ -0,0 +1 @@
++#define SQLITE_PTR_SZ 4
+\ No newline at end of file
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/copy.c
+@@ -0,0 +1,110 @@
++/*
++** 2003 April 6
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code used to implement the COPY command.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++/*
++** The COPY command is for compatibility with PostgreSQL and specificially
++** for the ability to read the output of pg_dump.  The format is as
++** follows:
++**
++**    COPY table FROM file [USING DELIMITERS string]
++**
++** "table" is an existing table name.  We will read lines of code from
++** file to fill this table with data.  File might be "stdin".  The optional
++** delimiter string identifies the field separators.  The default is a tab.
++*/
++void sqliteCopy(
++  Parse *pParse,       /* The parser context */
++  SrcList *pTableName, /* The name of the table into which we will insert */
++  Token *pFilename,    /* The file from which to obtain information */
++  Token *pDelimiter,   /* Use this as the field delimiter */
++  int onError          /* What to do if a constraint fails */
++){
++  Table *pTab;
++  int i;
++  Vdbe *v;
++  int addr, end;
++  char *zFile = 0;
++  const char *zDb;
++  sqlite *db = pParse->db;
++
++
++  if( sqlite_malloc_failed  ) goto copy_cleanup;
++  assert( pTableName->nSrc==1 );
++  pTab = sqliteSrcListLookup(pParse, pTableName);
++  if( pTab==0 || sqliteIsReadOnly(pParse, pTab, 0) ) goto copy_cleanup;
++  zFile = sqliteStrNDup(pFilename->z, pFilename->n);
++  sqliteDequote(zFile);
++  assert( pTab->iDb<db->nDb );
++  zDb = db->aDb[pTab->iDb].zName;
++  if( sqliteAuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb)
++      || sqliteAuthCheck(pParse, SQLITE_COPY, pTab->zName, zFile, zDb) ){
++    goto copy_cleanup;
++  }
++  v = sqliteGetVdbe(pParse);
++  if( v ){
++    sqliteBeginWriteOperation(pParse, 1, pTab->iDb);
++    addr = sqliteVdbeOp3(v, OP_FileOpen, 0, 0, pFilename->z, pFilename->n);
++    sqliteVdbeDequoteP3(v, addr);
++    sqliteOpenTableAndIndices(pParse, pTab, 0);
++    if( db->flags & SQLITE_CountRows ){
++      sqliteVdbeAddOp(v, OP_Integer, 0, 0);  /* Initialize the row count */
++    }
++    end = sqliteVdbeMakeLabel(v);
++    addr = sqliteVdbeAddOp(v, OP_FileRead, pTab->nCol, end);
++    if( pDelimiter ){
++      sqliteVdbeChangeP3(v, addr, pDelimiter->z, pDelimiter->n);
++      sqliteVdbeDequoteP3(v, addr);
++    }else{
++      sqliteVdbeChangeP3(v, addr, "\t", 1);
++    }
++    if( pTab->iPKey>=0 ){
++      sqliteVdbeAddOp(v, OP_FileColumn, pTab->iPKey, 0);
++      sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0);
++    }else{
++      sqliteVdbeAddOp(v, OP_NewRecno, 0, 0);
++    }
++    for(i=0; i<pTab->nCol; i++){
++      if( i==pTab->iPKey ){
++        /* The integer primary key column is filled with NULL since its
++        ** value is always pulled from the record number */
++        sqliteVdbeAddOp(v, OP_String, 0, 0);
++      }else{
++        sqliteVdbeAddOp(v, OP_FileColumn, i, 0);
++      }
++    }
++    sqliteGenerateConstraintChecks(pParse, pTab, 0, 0, pTab->iPKey>=0, 
++                                   0, onError, addr);
++    sqliteCompleteInsertion(pParse, pTab, 0, 0, 0, 0, -1);
++    if( (db->flags & SQLITE_CountRows)!=0 ){
++      sqliteVdbeAddOp(v, OP_AddImm, 1, 0);  /* Increment row count */
++    }
++    sqliteVdbeAddOp(v, OP_Goto, 0, addr);
++    sqliteVdbeResolveLabel(v, end);
++    sqliteVdbeAddOp(v, OP_Noop, 0, 0);
++    sqliteEndWriteOperation(pParse);
++    if( db->flags & SQLITE_CountRows ){
++      sqliteVdbeAddOp(v, OP_ColumnName, 0, 1);
++      sqliteVdbeChangeP3(v, -1, "rows inserted", P3_STATIC);
++      sqliteVdbeAddOp(v, OP_Callback, 1, 0);
++    }
++  }
++  
++copy_cleanup:
++  sqliteSrcListDelete(pTableName);
++  sqliteFree(zFile);
++  return;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/date.c
+@@ -0,0 +1,881 @@
++/*
++** 2003 October 31
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains the C functions that implement date and time
++** functions for SQLite.  
++**
++** There is only one exported symbol in this file - the function
++** sqliteRegisterDateTimeFunctions() found at the bottom of the file.
++** All other code has file scope.
++**
++** $Id$
++**
++** NOTES:
++**
++** SQLite processes all times and dates as Julian Day numbers.  The
++** dates and times are stored as the number of days since noon
++** in Greenwich on November 24, 4714 B.C. according to the Gregorian
++** calendar system.
++**
++** 1970-01-01 00:00:00 is JD 2440587.5
++** 2000-01-01 00:00:00 is JD 2451544.5
++**
++** This implemention requires years to be expressed as a 4-digit number
++** which means that only dates between 0000-01-01 and 9999-12-31 can
++** be represented, even though julian day numbers allow a much wider
++** range of dates.
++**
++** The Gregorian calendar system is used for all dates and times,
++** even those that predate the Gregorian calendar.  Historians usually
++** use the Julian calendar for dates prior to 1582-10-15 and for some
++** dates afterwards, depending on locale.  Beware of this difference.
++**
++** The conversion algorithms are implemented based on descriptions
++** in the following text:
++**
++**      Jean Meeus
++**      Astronomical Algorithms, 2nd Edition, 1998
++**      ISBM 0-943396-61-1
++**      Willmann-Bell, Inc
++**      Richmond, Virginia (USA)
++*/
++#include "os.h"
++#include "sqliteInt.h"
++#include <ctype.h>
++#include <stdlib.h>
++#include <assert.h>
++#include <time.h>
++#ifndef PHP_WIN32
++#include "main/php_reentrancy.h"
++#endif
++
++#ifndef SQLITE_OMIT_DATETIME_FUNCS
++
++/*
++** A structure for holding a single date and time.
++*/
++typedef struct DateTime DateTime;
++struct DateTime {
++  double rJD;      /* The julian day number */
++  int Y, M, D;     /* Year, month, and day */
++  int h, m;        /* Hour and minutes */
++  int tz;          /* Timezone offset in minutes */
++  double s;        /* Seconds */
++  char validYMD;   /* True if Y,M,D are valid */
++  char validHMS;   /* True if h,m,s are valid */
++  char validJD;    /* True if rJD is valid */
++  char validTZ;    /* True if tz is valid */
++};
++
++
++/*
++** Convert zDate into one or more integers.  Additional arguments
++** come in groups of 5 as follows:
++**
++**       N       number of digits in the integer
++**       min     minimum allowed value of the integer
++**       max     maximum allowed value of the integer
++**       nextC   first character after the integer
++**       pVal    where to write the integers value.
++**
++** Conversions continue until one with nextC==0 is encountered.
++** The function returns the number of successful conversions.
++*/
++static int getDigits(const char *zDate, ...){
++  va_list ap;
++  int val;
++  int N;
++  int min;
++  int max;
++  int nextC;
++  int *pVal;
++  int cnt = 0;
++  va_start(ap, zDate);
++  do{
++    N = va_arg(ap, int);
++    min = va_arg(ap, int);
++    max = va_arg(ap, int);
++    nextC = va_arg(ap, int);
++    pVal = va_arg(ap, int*);
++    val = 0;
++    while( N-- ){
++      if( !isdigit(*zDate) ){
++        return cnt;
++      }
++      val = val*10 + *zDate - '0';
++      zDate++;
++    }
++    if( val<min || val>max || (nextC!=0 && nextC!=*zDate) ){
++      return cnt;
++    }
++    *pVal = val;
++    zDate++;
++    cnt++;
++  }while( nextC );
++  return cnt;
++}
++
++/*
++** Read text from z[] and convert into a floating point number.  Return
++** the number of digits converted.
++*/
++static int getValue(const char *z, double *pR){
++  const char *zEnd;
++  *pR = sqliteAtoF(z, &zEnd);
++  return zEnd - z;
++}
++
++/*
++** Parse a timezone extension on the end of a date-time.
++** The extension is of the form:
++**
++**        (+/-)HH:MM
++**
++** If the parse is successful, write the number of minutes
++** of change in *pnMin and return 0.  If a parser error occurs,
++** return 0.
++**
++** A missing specifier is not considered an error.
++*/
++static int parseTimezone(const char *zDate, DateTime *p){
++  int sgn = 0;
++  int nHr, nMn;
++  while( isspace(*zDate) ){ zDate++; }
++  p->tz = 0;
++  if( *zDate=='-' ){
++    sgn = -1;
++  }else if( *zDate=='+' ){
++    sgn = +1;
++  }else{
++    return *zDate!=0;
++  }
++  zDate++;
++  if( getDigits(zDate, 2, 0, 14, ':', &nHr, 2, 0, 59, 0, &nMn)!=2 ){
++    return 1;
++  }
++  zDate += 5;
++  p->tz = sgn*(nMn + nHr*60);
++  while( isspace(*zDate) ){ zDate++; }
++  return *zDate!=0;
++}
++
++/*
++** Parse times of the form HH:MM or HH:MM:SS or HH:MM:SS.FFFF.
++** The HH, MM, and SS must each be exactly 2 digits.  The
++** fractional seconds FFFF can be one or more digits.
++**
++** Return 1 if there is a parsing error and 0 on success.
++*/
++static int parseHhMmSs(const char *zDate, DateTime *p){
++  int h, m, s;
++  double ms = 0.0;
++  if( getDigits(zDate, 2, 0, 24, ':', &h, 2, 0, 59, 0, &m)!=2 ){
++    return 1;
++  }
++  zDate += 5;
++  if( *zDate==':' ){
++    zDate++;
++    if( getDigits(zDate, 2, 0, 59, 0, &s)!=1 ){
++      return 1;
++    }
++    zDate += 2;
++    if( *zDate=='.' && isdigit(zDate[1]) ){
++      double rScale = 1.0;
++      zDate++;
++      while( isdigit(*zDate) ){
++        ms = ms*10.0 + *zDate - '0';
++        rScale *= 10.0;
++        zDate++;
++      }
++      ms /= rScale;
++    }
++  }else{
++    s = 0;
++  }
++  p->validJD = 0;
++  p->validHMS = 1;
++  p->h = h;
++  p->m = m;
++  p->s = s + ms;
++  if( parseTimezone(zDate, p) ) return 1;
++  p->validTZ = p->tz!=0;
++  return 0;
++}
++
++/*
++** Convert from YYYY-MM-DD HH:MM:SS to julian day.  We always assume
++** that the YYYY-MM-DD is according to the Gregorian calendar.
++**
++** Reference:  Meeus page 61
++*/
++static void computeJD(DateTime *p){
++  int Y, M, D, A, B, X1, X2;
++
++  if( p->validJD ) return;
++  if( p->validYMD ){
++    Y = p->Y;
++    M = p->M;
++    D = p->D;
++  }else{
++    Y = 2000;  /* If no YMD specified, assume 2000-Jan-01 */
++    M = 1;
++    D = 1;
++  }
++  if( M<=2 ){
++    Y--;
++    M += 12;
++  }
++  A = Y/100;
++  B = 2 - A + (A/4);
++  X1 = 365.25*(Y+4716);
++  X2 = 30.6001*(M+1);
++  p->rJD = X1 + X2 + D + B - 1524.5;
++  p->validJD = 1;
++  p->validYMD = 0;
++  if( p->validHMS ){
++    p->rJD += (p->h*3600.0 + p->m*60.0 + p->s)/86400.0;
++    if( p->validTZ ){
++      p->rJD += p->tz*60/86400.0;
++      p->validHMS = 0;
++      p->validTZ = 0;
++    }
++  }
++}
++
++/*
++** Parse dates of the form
++**
++**     YYYY-MM-DD HH:MM:SS.FFF
++**     YYYY-MM-DD HH:MM:SS
++**     YYYY-MM-DD HH:MM
++**     YYYY-MM-DD
++**
++** Write the result into the DateTime structure and return 0
++** on success and 1 if the input string is not a well-formed
++** date.
++*/
++static int parseYyyyMmDd(const char *zDate, DateTime *p){
++  int Y, M, D, neg;
++
++  if( zDate[0]=='-' ){
++    zDate++;
++    neg = 1;
++  }else{
++    neg = 0;
++  }
++  if( getDigits(zDate,4,0,9999,'-',&Y,2,1,12,'-',&M,2,1,31,0,&D)!=3 ){
++    return 1;
++  }
++  zDate += 10;
++  while( isspace(*zDate) ){ zDate++; }
++  if( parseHhMmSs(zDate, p)==0 ){
++    /* We got the time */
++  }else if( *zDate==0 ){
++    p->validHMS = 0;
++  }else{
++    return 1;
++  }
++  p->validJD = 0;
++  p->validYMD = 1;
++  p->Y = neg ? -Y : Y;
++  p->M = M;
++  p->D = D;
++  if( p->validTZ ){
++    computeJD(p);
++  }
++  return 0;
++}
++
++/*
++** Attempt to parse the given string into a Julian Day Number.  Return
++** the number of errors.
++**
++** The following are acceptable forms for the input string:
++**
++**      YYYY-MM-DD HH:MM:SS.FFF  +/-HH:MM
++**      DDDD.DD 
++**      now
++**
++** In the first form, the +/-HH:MM is always optional.  The fractional
++** seconds extension (the ".FFF") is optional.  The seconds portion
++** (":SS.FFF") is option.  The year and date can be omitted as long
++** as there is a time string.  The time string can be omitted as long
++** as there is a year and date.
++*/
++static int parseDateOrTime(const char *zDate, DateTime *p){
++  memset(p, 0, sizeof(*p));
++  if( parseYyyyMmDd(zDate,p)==0 ){
++    return 0;
++  }else if( parseHhMmSs(zDate, p)==0 ){
++    return 0;
++  }else if( sqliteStrICmp(zDate,"now")==0){
++    double r;
++    if( sqliteOsCurrentTime(&r)==0 ){
++      p->rJD = r;
++      p->validJD = 1;
++      return 0;
++    }
++    return 1;
++  }else if( sqliteIsNumber(zDate) ){
++    p->rJD = sqliteAtoF(zDate, 0);
++    p->validJD = 1;
++    return 0;
++  }
++  return 1;
++}
++
++/*
++** Compute the Year, Month, and Day from the julian day number.
++*/
++static void computeYMD(DateTime *p){
++  int Z, A, B, C, D, E, X1;
++  if( p->validYMD ) return;
++  if( !p->validJD ){
++    p->Y = 2000;
++    p->M = 1;
++    p->D = 1;
++  }else{
++    Z = p->rJD + 0.5;
++    A = (Z - 1867216.25)/36524.25;
++    A = Z + 1 + A - (A/4);
++    B = A + 1524;
++    C = (B - 122.1)/365.25;
++    D = 365.25*C;
++    E = (B-D)/30.6001;
++    X1 = 30.6001*E;
++    p->D = B - D - X1;
++    p->M = E<14 ? E-1 : E-13;
++    p->Y = p->M>2 ? C - 4716 : C - 4715;
++  }
++  p->validYMD = 1;
++}
++
++/*
++** Compute the Hour, Minute, and Seconds from the julian day number.
++*/
++static void computeHMS(DateTime *p){
++  int Z, s;
++  if( p->validHMS ) return;
++  Z = p->rJD + 0.5;
++  s = (p->rJD + 0.5 - Z)*86400000.0 + 0.5;
++  p->s = 0.001*s;
++  s = p->s;
++  p->s -= s;
++  p->h = s/3600;
++  s -= p->h*3600;
++  p->m = s/60;
++  p->s += s - p->m*60;
++  p->validHMS = 1;
++}
++
++/*
++** Compute both YMD and HMS
++*/
++static void computeYMD_HMS(DateTime *p){
++  computeYMD(p);
++  computeHMS(p);
++}
++
++/*
++** Clear the YMD and HMS and the TZ
++*/
++static void clearYMD_HMS_TZ(DateTime *p){
++  p->validYMD = 0;
++  p->validHMS = 0;
++  p->validTZ = 0;
++}
++
++/*
++** Compute the difference (in days) between localtime and UTC (a.k.a. GMT)
++** for the time value p where p is in UTC.
++*/
++static double localtimeOffset(DateTime *p){
++  DateTime x, y;
++  time_t t;
++  struct tm *pTm, tmbuf;
++  x = *p;
++  computeYMD_HMS(&x);
++  if( x.Y<1971 || x.Y>=2038 ){
++    x.Y = 2000;
++    x.M = 1;
++    x.D = 1;
++    x.h = 0;
++    x.m = 0;
++    x.s = 0.0;
++  } else {
++    int s = x.s + 0.5;
++    x.s = s;
++  }
++  x.tz = 0;
++  x.validJD = 0;
++  computeJD(&x);
++  t = (x.rJD-2440587.5)*86400.0 + 0.5;
++  sqliteOsEnterMutex();
++  pTm = php_localtime_r(&t, &tmbuf);
++  if (!pTm) {
++	  return 0;
++  }
++  y.Y = pTm->tm_year + 1900;
++  y.M = pTm->tm_mon + 1;
++  y.D = pTm->tm_mday;
++  y.h = pTm->tm_hour;
++  y.m = pTm->tm_min;
++  y.s = pTm->tm_sec;
++  sqliteOsLeaveMutex();
++  y.validYMD = 1;
++  y.validHMS = 1;
++  y.validJD = 0;
++  y.validTZ = 0;
++  computeJD(&y);
++  return y.rJD - x.rJD;
++}
++
++/*
++** Process a modifier to a date-time stamp.  The modifiers are
++** as follows:
++**
++**     NNN days
++**     NNN hours
++**     NNN minutes
++**     NNN.NNNN seconds
++**     NNN months
++**     NNN years
++**     start of month
++**     start of year
++**     start of week
++**     start of day
++**     weekday N
++**     unixepoch
++**     localtime
++**     utc
++**
++** Return 0 on success and 1 if there is any kind of error.
++*/
++static int parseModifier(const char *zMod, DateTime *p){
++  int rc = 1;
++  int n;
++  double r;
++  char *z, zBuf[30];
++  z = zBuf;
++  for(n=0; n<sizeof(zBuf)-1 && zMod[n]; n++){
++    z[n] = tolower(zMod[n]);
++  }
++  z[n] = 0;
++  switch( z[0] ){
++    case 'l': {
++      /*    localtime
++      **
++      ** Assuming the current time value is UTC (a.k.a. GMT), shift it to
++      ** show local time.
++      */
++      if( strcmp(z, "localtime")==0 ){
++        computeJD(p);
++        p->rJD += localtimeOffset(p);
++        clearYMD_HMS_TZ(p);
++        rc = 0;
++      }
++      break;
++    }
++    case 'u': {
++      /*
++      **    unixepoch
++      **
++      ** Treat the current value of p->rJD as the number of
++      ** seconds since 1970.  Convert to a real julian day number.
++      */
++      if( strcmp(z, "unixepoch")==0 && p->validJD ){
++        p->rJD = p->rJD/86400.0 + 2440587.5;
++        clearYMD_HMS_TZ(p);
++        rc = 0;
++      }else if( strcmp(z, "utc")==0 ){
++        double c1;
++        computeJD(p);
++        c1 = localtimeOffset(p);
++        p->rJD -= c1;
++        clearYMD_HMS_TZ(p);
++        p->rJD += c1 - localtimeOffset(p);
++        rc = 0;
++      }
++      break;
++    }
++    case 'w': {
++      /*
++      **    weekday N
++      **
++      ** Move the date to the same time on the next occurrance of
++      ** weekday N where 0==Sunday, 1==Monday, and so forth.  If the
++      ** date is already on the appropriate weekday, this is a no-op.
++      */
++      if( strncmp(z, "weekday ", 8)==0 && getValue(&z[8],&r)>0
++                 && (n=r)==r && n>=0 && r<7 ){
++        int Z;
++        computeYMD_HMS(p);
++        p->validTZ = 0;
++        p->validJD = 0;
++        computeJD(p);
++        Z = p->rJD + 1.5;
++        Z %= 7;
++        if( Z>n ) Z -= 7;
++        p->rJD += n - Z;
++        clearYMD_HMS_TZ(p);
++        rc = 0;
++      }
++      break;
++    }
++    case 's': {
++      /*
++      **    start of TTTTT
++      **
++      ** Move the date backwards to the beginning of the current day,
++      ** or month or year.
++      */
++      if( strncmp(z, "start of ", 9)!=0 ) break;
++      z += 9;
++      computeYMD(p);
++      p->validHMS = 1;
++      p->h = p->m = 0;
++      p->s = 0.0;
++      p->validTZ = 0;
++      p->validJD = 0;
++      if( strcmp(z,"month")==0 ){
++        p->D = 1;
++        rc = 0;
++      }else if( strcmp(z,"year")==0 ){
++        computeYMD(p);
++        p->M = 1;
++        p->D = 1;
++        rc = 0;
++      }else if( strcmp(z,"day")==0 ){
++        rc = 0;
++      }
++      break;
++    }
++    case '+':
++    case '-':
++    case '0':
++    case '1':
++    case '2':
++    case '3':
++    case '4':
++    case '5':
++    case '6':
++    case '7':
++    case '8':
++    case '9': {
++      n = getValue(z, &r);
++      if( n<=0 ) break;
++      if( z[n]==':' ){
++        /* A modifier of the form (+|-)HH:MM:SS.FFF adds (or subtracts) the
++        ** specified number of hours, minutes, seconds, and fractional seconds
++        ** to the time.  The ".FFF" may be omitted.  The ":SS.FFF" may be
++        ** omitted.
++        */
++        const char *z2 = z;
++        DateTime tx;
++        int day;
++        if( !isdigit(*z2) ) z2++;
++        memset(&tx, 0, sizeof(tx));
++        if( parseHhMmSs(z2, &tx) ) break;
++        computeJD(&tx);
++        tx.rJD -= 0.5;
++        day = (int)tx.rJD;
++        tx.rJD -= day;
++        if( z[0]=='-' ) tx.rJD = -tx.rJD;
++        computeJD(p);
++        clearYMD_HMS_TZ(p);
++       p->rJD += tx.rJD;
++        rc = 0;
++        break;
++      }
++      z += n;
++      while( isspace(z[0]) ) z++;
++      n = strlen(z);
++      if( n>10 || n<3 ) break;
++      if( z[n-1]=='s' ){ z[n-1] = 0; n--; }
++      computeJD(p);
++      rc = 0;
++      if( n==3 && strcmp(z,"day")==0 ){
++        p->rJD += r;
++      }else if( n==4 && strcmp(z,"hour")==0 ){
++        p->rJD += r/24.0;
++      }else if( n==6 && strcmp(z,"minute")==0 ){
++        p->rJD += r/(24.0*60.0);
++      }else if( n==6 && strcmp(z,"second")==0 ){
++        p->rJD += r/(24.0*60.0*60.0);
++      }else if( n==5 && strcmp(z,"month")==0 ){
++        int x, y;
++        computeYMD_HMS(p);
++        p->M += r;
++        x = p->M>0 ? (p->M-1)/12 : (p->M-12)/12;
++        p->Y += x;
++        p->M -= x*12;
++        p->validJD = 0;
++        computeJD(p);
++        y = r;
++        if( y!=r ){
++          p->rJD += (r - y)*30.0;
++        }
++      }else if( n==4 && strcmp(z,"year")==0 ){
++        computeYMD_HMS(p);
++        p->Y += r;
++        p->validJD = 0;
++        computeJD(p);
++      }else{
++        rc = 1;
++      }
++      clearYMD_HMS_TZ(p);
++      break;
++    }
++    default: {
++      break;
++    }
++  }
++  return rc;
++}
++
++/*
++** Process time function arguments.  argv[0] is a date-time stamp.
++** argv[1] and following are modifiers.  Parse them all and write
++** the resulting time into the DateTime structure p.  Return 0
++** on success and 1 if there are any errors.
++*/
++static int isDate(int argc, const char **argv, DateTime *p){
++  int i;
++  if( argc==0 ) return 1;
++  if( argv[0]==0 || parseDateOrTime(argv[0], p) ) return 1;
++  for(i=1; i<argc; i++){
++    if( argv[i]==0 || parseModifier(argv[i], p) ) return 1;
++  }
++  return 0;
++}
++
++
++/*
++** The following routines implement the various date and time functions
++** of SQLite.
++*/
++
++/*
++**    julianday( TIMESTRING, MOD, MOD, ...)
++**
++** Return the julian day number of the date specified in the arguments
++*/
++static void juliandayFunc(sqlite_func *context, int argc, const char **argv){
++  DateTime x;
++  if( isDate(argc, argv, &x)==0 ){
++    computeJD(&x);
++    sqlite_set_result_double(context, x.rJD);
++  }
++}
++
++/*
++**    datetime( TIMESTRING, MOD, MOD, ...)
++**
++** Return YYYY-MM-DD HH:MM:SS
++*/
++static void datetimeFunc(sqlite_func *context, int argc, const char **argv){
++  DateTime x;
++  if( isDate(argc, argv, &x)==0 ){
++    char zBuf[100];
++    computeYMD_HMS(&x);
++    sprintf(zBuf, "%04d-%02d-%02d %02d:%02d:%02d",x.Y, x.M, x.D, x.h, x.m,
++           (int)(x.s));
++    sqlite_set_result_string(context, zBuf, -1);
++  }
++}
++
++/*
++**    time( TIMESTRING, MOD, MOD, ...)
++**
++** Return HH:MM:SS
++*/
++static void timeFunc(sqlite_func *context, int argc, const char **argv){
++  DateTime x;
++  if( isDate(argc, argv, &x)==0 ){
++    char zBuf[100];
++    computeHMS(&x);
++    sprintf(zBuf, "%02d:%02d:%02d", x.h, x.m, (int)x.s);
++    sqlite_set_result_string(context, zBuf, -1);
++  }
++}
++
++/*
++**    date( TIMESTRING, MOD, MOD, ...)
++**
++** Return YYYY-MM-DD
++*/
++static void dateFunc(sqlite_func *context, int argc, const char **argv){
++  DateTime x;
++  if( isDate(argc, argv, &x)==0 ){
++    char zBuf[100];
++    computeYMD(&x);
++    sprintf(zBuf, "%04d-%02d-%02d", x.Y, x.M, x.D);
++    sqlite_set_result_string(context, zBuf, -1);
++  }
++}
++
++/*
++**    strftime( FORMAT, TIMESTRING, MOD, MOD, ...)
++**
++** Return a string described by FORMAT.  Conversions as follows:
++**
++**   %d  day of month
++**   %f  ** fractional seconds  SS.SSS
++**   %H  hour 00-24
++**   %j  day of year 000-366
++**   %J  ** Julian day number
++**   %m  month 01-12
++**   %M  minute 00-59
++**   %s  seconds since 1970-01-01
++**   %S  seconds 00-59
++**   %w  day of week 0-6  sunday==0
++**   %W  week of year 00-53
++**   %Y  year 0000-9999
++**   %%  %
++*/
++static void strftimeFunc(sqlite_func *context, int argc, const char **argv){
++  DateTime x;
++  int n, i, j;
++  char *z;
++  const char *zFmt = argv[0];
++  char zBuf[100];
++  if( argv[0]==0 || isDate(argc-1, argv+1, &x) ) return;
++  for(i=0, n=1; zFmt[i]; i++, n++){
++    if( zFmt[i]=='%' ){
++      switch( zFmt[i+1] ){
++        case 'd':
++        case 'H':
++        case 'm':
++        case 'M':
++        case 'S':
++        case 'W':
++          n++;
++          /* fall thru */
++        case 'w':
++        case '%':
++          break;
++        case 'f':
++          n += 8;
++          break;
++        case 'j':
++          n += 3;
++          break;
++        case 'Y':
++          n += 8;
++          break;
++        case 's':
++        case 'J':
++          n += 50;
++          break;
++        default:
++          return;  /* ERROR.  return a NULL */
++      }
++      i++;
++    }
++  }
++  if( n<sizeof(zBuf) ){
++    z = zBuf;
++  }else{
++    z = sqliteMalloc( n );
++    if( z==0 ) return;
++  }
++  computeJD(&x);
++  computeYMD_HMS(&x);
++  for(i=j=0; zFmt[i]; i++){
++    if( zFmt[i]!='%' ){
++      z[j++] = zFmt[i];
++    }else{
++      i++;
++      switch( zFmt[i] ){
++        case 'd':  sprintf(&z[j],"%02d",x.D); j+=2; break;
++        case 'f': {
++          int s = x.s;
++          int ms = (x.s - s)*1000.0;
++          sprintf(&z[j],"%02d.%03d",s,ms);
++          j += strlen(&z[j]);
++          break;
++        }
++        case 'H':  sprintf(&z[j],"%02d",x.h); j+=2; break;
++        case 'W': /* Fall thru */
++        case 'j': {
++          int n;             /* Number of days since 1st day of year */
++          DateTime y = x;
++          y.validJD = 0;
++          y.M = 1;
++          y.D = 1;
++          computeJD(&y);
++          n = x.rJD - y.rJD;
++          if( zFmt[i]=='W' ){
++            int wd;   /* 0=Monday, 1=Tuesday, ... 6=Sunday */
++            wd = ((int)(x.rJD+0.5)) % 7;
++            sprintf(&z[j],"%02d",(n+7-wd)/7);
++            j += 2;
++          }else{
++            sprintf(&z[j],"%03d",n+1);
++            j += 3;
++          }
++          break;
++        }
++        case 'J':  sprintf(&z[j],"%.16g",x.rJD); j+=strlen(&z[j]); break;
++        case 'm':  sprintf(&z[j],"%02d",x.M); j+=2; break;
++        case 'M':  sprintf(&z[j],"%02d",x.m); j+=2; break;
++        case 's': {
++          sprintf(&z[j],"%d",(int)((x.rJD-2440587.5)*86400.0 + 0.5));
++          j += strlen(&z[j]);
++          break;
++        }
++        case 'S':  sprintf(&z[j],"%02d",(int)(x.s+0.5)); j+=2; break;
++        case 'w':  z[j++] = (((int)(x.rJD+1.5)) % 7) + '0'; break;
++        case 'Y':  sprintf(&z[j],"%04d",x.Y); j+=strlen(&z[j]); break;
++        case '%':  z[j++] = '%'; break;
++      }
++    }
++  }
++  z[j] = 0;
++  sqlite_set_result_string(context, z, -1);
++  if( z!=zBuf ){
++    sqliteFree(z);
++  }
++}
++
++
++#endif /* !defined(SQLITE_OMIT_DATETIME_FUNCS) */
++
++/*
++** This function registered all of the above C functions as SQL
++** functions.  This should be the only routine in this file with
++** external linkage.
++*/
++void sqliteRegisterDateTimeFunctions(sqlite *db){
++#ifndef SQLITE_OMIT_DATETIME_FUNCS
++  static struct {
++     char *zName;
++     int nArg;
++     int dataType;
++     void (*xFunc)(sqlite_func*,int,const char**);
++  } aFuncs[] = {
++    { "julianday", -1, SQLITE_NUMERIC, juliandayFunc   },
++    { "date",      -1, SQLITE_TEXT,    dateFunc        },
++    { "time",      -1, SQLITE_TEXT,    timeFunc        },
++    { "datetime",  -1, SQLITE_TEXT,    datetimeFunc    },
++    { "strftime",  -1, SQLITE_TEXT,    strftimeFunc    },
++  };
++  int i;
++
++  for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
++    sqlite_create_function(db, aFuncs[i].zName,
++           aFuncs[i].nArg, aFuncs[i].xFunc, 0);
++    if( aFuncs[i].xFunc ){
++      sqlite_function_type(db, aFuncs[i].zName, aFuncs[i].dataType);
++    }
++  }
++#endif
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/delete.c
+@@ -0,0 +1,393 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains C code routines that are called by the parser
++** to handle DELETE FROM statements.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++/*
++** Look up every table that is named in pSrc.  If any table is not found,
++** add an error message to pParse->zErrMsg and return NULL.  If all tables
++** are found, return a pointer to the last table.
++*/
++Table *sqliteSrcListLookup(Parse *pParse, SrcList *pSrc){
++  Table *pTab = 0;
++  int i;
++  for(i=0; i<pSrc->nSrc; i++){
++    const char *zTab = pSrc->a[i].zName;
++    const char *zDb = pSrc->a[i].zDatabase;
++    pTab = sqliteLocateTable(pParse, zTab, zDb);
++    pSrc->a[i].pTab = pTab;
++  }
++  return pTab;
++}
++
++/*
++** Check to make sure the given table is writable.  If it is not
++** writable, generate an error message and return 1.  If it is
++** writable return 0;
++*/
++int sqliteIsReadOnly(Parse *pParse, Table *pTab, int viewOk){
++  if( pTab->readOnly ){
++    sqliteErrorMsg(pParse, "table %s may not be modified", pTab->zName);
++    return 1;
++  }
++  if( !viewOk && pTab->pSelect ){
++    sqliteErrorMsg(pParse, "cannot modify %s because it is a view",pTab->zName);
++    return 1;
++  }
++  return 0;
++}
++
++/*
++** Process a DELETE FROM statement.
++*/
++void sqliteDeleteFrom(
++  Parse *pParse,         /* The parser context */
++  SrcList *pTabList,     /* The table from which we should delete things */
++  Expr *pWhere           /* The WHERE clause.  May be null */
++){
++  Vdbe *v;               /* The virtual database engine */
++  Table *pTab;           /* The table from which records will be deleted */
++  const char *zDb;       /* Name of database holding pTab */
++  int end, addr;         /* A couple addresses of generated code */
++  int i;                 /* Loop counter */
++  WhereInfo *pWInfo;     /* Information about the WHERE clause */
++  Index *pIdx;           /* For looping over indices of the table */
++  int iCur;              /* VDBE Cursor number for pTab */
++  sqlite *db;            /* Main database structure */
++  int isView;            /* True if attempting to delete from a view */
++  AuthContext sContext;  /* Authorization context */
++
++  int row_triggers_exist = 0;  /* True if any triggers exist */
++  int before_triggers;         /* True if there are BEFORE triggers */
++  int after_triggers;          /* True if there are AFTER triggers */
++  int oldIdx = -1;             /* Cursor for the OLD table of AFTER triggers */
++
++  sContext.pParse = 0;
++  if( pParse->nErr || sqlite_malloc_failed ){
++    pTabList = 0;
++    goto delete_from_cleanup;
++  }
++  db = pParse->db;
++  assert( pTabList->nSrc==1 );
++
++  /* Locate the table which we want to delete.  This table has to be
++  ** put in an SrcList structure because some of the subroutines we
++  ** will be calling are designed to work with multiple tables and expect
++  ** an SrcList* parameter instead of just a Table* parameter.
++  */
++  pTab = sqliteSrcListLookup(pParse, pTabList);
++  if( pTab==0 )  goto delete_from_cleanup;
++  before_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, 
++                         TK_DELETE, TK_BEFORE, TK_ROW, 0);
++  after_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, 
++                         TK_DELETE, TK_AFTER, TK_ROW, 0);
++  row_triggers_exist = before_triggers || after_triggers;
++  isView = pTab->pSelect!=0;
++  if( sqliteIsReadOnly(pParse, pTab, before_triggers) ){
++    goto delete_from_cleanup;
++  }
++  assert( pTab->iDb<db->nDb );
++  zDb = db->aDb[pTab->iDb].zName;
++  if( sqliteAuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0, zDb) ){
++    goto delete_from_cleanup;
++  }
++
++  /* If pTab is really a view, make sure it has been initialized.
++  */
++  if( isView && sqliteViewGetColumnNames(pParse, pTab) ){
++    goto delete_from_cleanup;
++  }
++
++  /* Allocate a cursor used to store the old.* data for a trigger.
++  */
++  if( row_triggers_exist ){ 
++    oldIdx = pParse->nTab++;
++  }
++
++  /* Resolve the column names in all the expressions.
++  */
++  assert( pTabList->nSrc==1 );
++  iCur = pTabList->a[0].iCursor = pParse->nTab++;
++  if( pWhere ){
++    if( sqliteExprResolveIds(pParse, pTabList, 0, pWhere) ){
++      goto delete_from_cleanup;
++    }
++    if( sqliteExprCheck(pParse, pWhere, 0, 0) ){
++      goto delete_from_cleanup;
++    }
++  }
++
++  /* Start the view context
++  */
++  if( isView ){
++    sqliteAuthContextPush(pParse, &sContext, pTab->zName);
++  }
++
++  /* Begin generating code.
++  */
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ){
++    goto delete_from_cleanup;
++  }
++  sqliteBeginWriteOperation(pParse, row_triggers_exist, pTab->iDb);
++
++  /* If we are trying to delete from a view, construct that view into
++  ** a temporary table.
++  */
++  if( isView ){
++    Select *pView = sqliteSelectDup(pTab->pSelect);
++    sqliteSelect(pParse, pView, SRT_TempTable, iCur, 0, 0, 0);
++    sqliteSelectDelete(pView);
++  }
++
++  /* Initialize the counter of the number of rows deleted, if
++  ** we are counting rows.
++  */
++  if( db->flags & SQLITE_CountRows ){
++    sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++  }
++
++  /* Special case: A DELETE without a WHERE clause deletes everything.
++  ** It is easier just to erase the whole table.  Note, however, that
++  ** this means that the row change count will be incorrect.
++  */
++  if( pWhere==0 && !row_triggers_exist ){
++    if( db->flags & SQLITE_CountRows ){
++      /* If counting rows deleted, just count the total number of
++      ** entries in the table. */
++      int endOfLoop = sqliteVdbeMakeLabel(v);
++      int addr;
++      if( !isView ){
++        sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++        sqliteVdbeAddOp(v, OP_OpenRead, iCur, pTab->tnum);
++      }
++      sqliteVdbeAddOp(v, OP_Rewind, iCur, sqliteVdbeCurrentAddr(v)+2);
++      addr = sqliteVdbeAddOp(v, OP_AddImm, 1, 0);
++      sqliteVdbeAddOp(v, OP_Next, iCur, addr);
++      sqliteVdbeResolveLabel(v, endOfLoop);
++      sqliteVdbeAddOp(v, OP_Close, iCur, 0);
++    }
++    if( !isView ){
++      sqliteVdbeAddOp(v, OP_Clear, pTab->tnum, pTab->iDb);
++      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++        sqliteVdbeAddOp(v, OP_Clear, pIdx->tnum, pIdx->iDb);
++      }
++    }
++  }
++
++  /* The usual case: There is a WHERE clause so we have to scan through
++  ** the table and pick which records to delete.
++  */
++  else{
++    /* Begin the database scan
++    */
++    pWInfo = sqliteWhereBegin(pParse, pTabList, pWhere, 1, 0);
++    if( pWInfo==0 ) goto delete_from_cleanup;
++
++    /* Remember the key of every item to be deleted.
++    */
++    sqliteVdbeAddOp(v, OP_ListWrite, 0, 0);
++    if( db->flags & SQLITE_CountRows ){
++      sqliteVdbeAddOp(v, OP_AddImm, 1, 0);
++    }
++
++    /* End the database scan loop.
++    */
++    sqliteWhereEnd(pWInfo);
++
++    /* Open the pseudo-table used to store OLD if there are triggers.
++    */
++    if( row_triggers_exist ){
++      sqliteVdbeAddOp(v, OP_OpenPseudo, oldIdx, 0);
++    }
++
++    /* Delete every item whose key was written to the list during the
++    ** database scan.  We have to delete items after the scan is complete
++    ** because deleting an item can change the scan order.
++    */
++    sqliteVdbeAddOp(v, OP_ListRewind, 0, 0);
++    end = sqliteVdbeMakeLabel(v);
++
++    /* This is the beginning of the delete loop when there are
++    ** row triggers.
++    */
++    if( row_triggers_exist ){
++      addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end);
++      sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++      if( !isView ){
++        sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++        sqliteVdbeAddOp(v, OP_OpenRead, iCur, pTab->tnum);
++      }
++      sqliteVdbeAddOp(v, OP_MoveTo, iCur, 0);
++
++      sqliteVdbeAddOp(v, OP_Recno, iCur, 0);
++      sqliteVdbeAddOp(v, OP_RowData, iCur, 0);
++      sqliteVdbeAddOp(v, OP_PutIntKey, oldIdx, 0);
++      if( !isView ){
++        sqliteVdbeAddOp(v, OP_Close, iCur, 0);
++      }
++
++      sqliteCodeRowTrigger(pParse, TK_DELETE, 0, TK_BEFORE, pTab, -1, 
++          oldIdx, (pParse->trigStack)?pParse->trigStack->orconf:OE_Default,
++	  addr);
++    }
++
++    if( !isView ){
++      /* Open cursors for the table we are deleting from and all its
++      ** indices.  If there are row triggers, this happens inside the
++      ** OP_ListRead loop because the cursor have to all be closed
++      ** before the trigger fires.  If there are no row triggers, the
++      ** cursors are opened only once on the outside the loop.
++      */
++      pParse->nTab = iCur + 1;
++      sqliteOpenTableAndIndices(pParse, pTab, iCur);
++
++      /* This is the beginning of the delete loop when there are no
++      ** row triggers */
++      if( !row_triggers_exist ){ 
++        addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end);
++      }
++
++      /* Delete the row */
++      sqliteGenerateRowDelete(db, v, pTab, iCur, pParse->trigStack==0);
++    }
++
++    /* If there are row triggers, close all cursors then invoke
++    ** the AFTER triggers
++    */
++    if( row_triggers_exist ){
++      if( !isView ){
++        for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
++          sqliteVdbeAddOp(v, OP_Close, iCur + i, pIdx->tnum);
++        }
++        sqliteVdbeAddOp(v, OP_Close, iCur, 0);
++      }
++      sqliteCodeRowTrigger(pParse, TK_DELETE, 0, TK_AFTER, pTab, -1, 
++          oldIdx, (pParse->trigStack)?pParse->trigStack->orconf:OE_Default,
++	  addr);
++    }
++
++    /* End of the delete loop */
++    sqliteVdbeAddOp(v, OP_Goto, 0, addr);
++    sqliteVdbeResolveLabel(v, end);
++    sqliteVdbeAddOp(v, OP_ListReset, 0, 0);
++
++    /* Close the cursors after the loop if there are no row triggers */
++    if( !row_triggers_exist ){
++      for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
++        sqliteVdbeAddOp(v, OP_Close, iCur + i, pIdx->tnum);
++      }
++      sqliteVdbeAddOp(v, OP_Close, iCur, 0);
++      pParse->nTab = iCur;
++    }
++  }
++  sqliteVdbeAddOp(v, OP_SetCounts, 0, 0);
++  sqliteEndWriteOperation(pParse);
++
++  /*
++  ** Return the number of rows that were deleted.
++  */
++  if( db->flags & SQLITE_CountRows ){
++    sqliteVdbeAddOp(v, OP_ColumnName, 0, 1);
++    sqliteVdbeChangeP3(v, -1, "rows deleted", P3_STATIC);
++    sqliteVdbeAddOp(v, OP_Callback, 1, 0);
++  }
++
++delete_from_cleanup:
++  sqliteAuthContextPop(&sContext);
++  sqliteSrcListDelete(pTabList);
++  sqliteExprDelete(pWhere);
++  return;
++}
++
++/*
++** This routine generates VDBE code that causes a single row of a
++** single table to be deleted.
++**
++** The VDBE must be in a particular state when this routine is called.
++** These are the requirements:
++**
++**   1.  A read/write cursor pointing to pTab, the table containing the row
++**       to be deleted, must be opened as cursor number "base".
++**
++**   2.  Read/write cursors for all indices of pTab must be open as
++**       cursor number base+i for the i-th index.
++**
++**   3.  The record number of the row to be deleted must be on the top
++**       of the stack.
++**
++** This routine pops the top of the stack to remove the record number
++** and then generates code to remove both the table record and all index
++** entries that point to that record.
++*/
++void sqliteGenerateRowDelete(
++  sqlite *db,        /* The database containing the index */
++  Vdbe *v,           /* Generate code into this VDBE */
++  Table *pTab,       /* Table containing the row to be deleted */
++  int iCur,          /* Cursor number for the table */
++  int count          /* Increment the row change counter */
++){
++  int addr;
++  addr = sqliteVdbeAddOp(v, OP_NotExists, iCur, 0);
++  sqliteGenerateRowIndexDelete(db, v, pTab, iCur, 0);
++  sqliteVdbeAddOp(v, OP_Delete, iCur,
++    (count?OPFLAG_NCHANGE:0) | OPFLAG_CSCHANGE);
++  sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v));
++}
++
++/*
++** This routine generates VDBE code that causes the deletion of all
++** index entries associated with a single row of a single table.
++**
++** The VDBE must be in a particular state when this routine is called.
++** These are the requirements:
++**
++**   1.  A read/write cursor pointing to pTab, the table containing the row
++**       to be deleted, must be opened as cursor number "iCur".
++**
++**   2.  Read/write cursors for all indices of pTab must be open as
++**       cursor number iCur+i for the i-th index.
++**
++**   3.  The "iCur" cursor must be pointing to the row that is to be
++**       deleted.
++*/
++void sqliteGenerateRowIndexDelete(
++  sqlite *db,        /* The database containing the index */
++  Vdbe *v,           /* Generate code into this VDBE */
++  Table *pTab,       /* Table containing the row to be deleted */
++  int iCur,          /* Cursor number for the table */
++  char *aIdxUsed     /* Only delete if aIdxUsed!=0 && aIdxUsed[i]!=0 */
++){
++  int i;
++  Index *pIdx;
++
++  for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
++    int j;
++    if( aIdxUsed!=0 && aIdxUsed[i-1]==0 ) continue;
++    sqliteVdbeAddOp(v, OP_Recno, iCur, 0);
++    for(j=0; j<pIdx->nColumn; j++){
++      int idx = pIdx->aiColumn[j];
++      if( idx==pTab->iPKey ){
++        sqliteVdbeAddOp(v, OP_Dup, j, 0);
++      }else{
++        sqliteVdbeAddOp(v, OP_Column, iCur, idx);
++      }
++    }
++    sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0);
++    if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx);
++    sqliteVdbeAddOp(v, OP_IdxDelete, iCur+i, 0);
++  }
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/encode.c
+@@ -0,0 +1,257 @@
++/*
++** 2002 April 25
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains helper routines used to translate binary data into
++** a null-terminated string (suitable for use in SQLite) and back again.
++** These are convenience routines for use by people who want to store binary
++** data in an SQLite database.  The code in this file is not used by any other
++** part of the SQLite library.
++**
++** $Id$
++*/
++#include <string.h>
++#include <assert.h>
++
++/*
++** How This Encoder Works
++**
++** The output is allowed to contain any character except 0x27 (') and
++** 0x00.  This is accomplished by using an escape character to encode
++** 0x27 and 0x00 as a two-byte sequence.  The escape character is always
++** 0x01.  An 0x00 is encoded as the two byte sequence 0x01 0x01.  The
++** 0x27 character is encoded as the two byte sequence 0x01 0x28.  Finally,
++** the escape character itself is encoded as the two-character sequence
++** 0x01 0x02.
++**
++** To summarize, the encoder works by using an escape sequences as follows:
++**
++**       0x00  ->  0x01 0x01
++**       0x01  ->  0x01 0x02
++**       0x27  ->  0x01 0x28
++**
++** If that were all the encoder did, it would work, but in certain cases
++** it could double the size of the encoded string.  For example, to
++** encode a string of 100 0x27 characters would require 100 instances of
++** the 0x01 0x03 escape sequence resulting in a 200-character output.
++** We would prefer to keep the size of the encoded string smaller than
++** this.
++**
++** To minimize the encoding size, we first add a fixed offset value to each 
++** byte in the sequence.  The addition is modulo 256.  (That is to say, if
++** the sum of the original character value and the offset exceeds 256, then
++** the higher order bits are truncated.)  The offset is chosen to minimize
++** the number of characters in the string that need to be escaped.  For
++** example, in the case above where the string was composed of 100 0x27
++** characters, the offset might be 0x01.  Each of the 0x27 characters would
++** then be converted into an 0x28 character which would not need to be
++** escaped at all and so the 100 character input string would be converted
++** into just 100 characters of output.  Actually 101 characters of output - 
++** we have to record the offset used as the first byte in the sequence so
++** that the string can be decoded.  Since the offset value is stored as
++** part of the output string and the output string is not allowed to contain
++** characters 0x00 or 0x27, the offset cannot be 0x00 or 0x27.
++**
++** Here, then, are the encoding steps:
++**
++**     (1)   Choose an offset value and make it the first character of
++**           output.
++**
++**     (2)   Copy each input character into the output buffer, one by
++**           one, adding the offset value as you copy.
++**
++**     (3)   If the value of an input character plus offset is 0x00, replace
++**           that one character by the two-character sequence 0x01 0x01.
++**           If the sum is 0x01, replace it with 0x01 0x02.  If the sum
++**           is 0x27, replace it with 0x01 0x03.
++**
++**     (4)   Put a 0x00 terminator at the end of the output.
++**
++** Decoding is obvious:
++**
++**     (5)   Copy encoded characters except the first into the decode 
++**           buffer.  Set the first encoded character aside for use as
++**           the offset in step 7 below.
++**
++**     (6)   Convert each 0x01 0x01 sequence into a single character 0x00.
++**           Convert 0x01 0x02 into 0x01.  Convert 0x01 0x28 into 0x27.
++**
++**     (7)   Subtract the offset value that was the first character of
++**           the encoded buffer from all characters in the output buffer.
++**
++** The only tricky part is step (1) - how to compute an offset value to
++** minimize the size of the output buffer.  This is accomplished by testing
++** all offset values and picking the one that results in the fewest number
++** of escapes.  To do that, we first scan the entire input and count the
++** number of occurances of each character value in the input.  Suppose
++** the number of 0x00 characters is N(0), the number of occurances of 0x01
++** is N(1), and so forth up to the number of occurances of 0xff is N(255).
++** An offset of 0 is not allowed so we don't have to test it.  The number
++** of escapes required for an offset of 1 is N(1)+N(2)+N(40).  The number
++** of escapes required for an offset of 2 is N(2)+N(3)+N(41).  And so forth.
++** In this way we find the offset that gives the minimum number of escapes,
++** and thus minimizes the length of the output string.
++*/
++
++/*
++** Encode a binary buffer "in" of size n bytes so that it contains
++** no instances of characters '\'' or '\000'.  The output is 
++** null-terminated and can be used as a string value in an INSERT
++** or UPDATE statement.  Use sqlite_decode_binary() to convert the
++** string back into its original binary.
++**
++** The result is written into a preallocated output buffer "out".
++** "out" must be able to hold at least 2 +(257*n)/254 bytes.
++** In other words, the output will be expanded by as much as 3
++** bytes for every 254 bytes of input plus 2 bytes of fixed overhead.
++** (This is approximately 2 + 1.0118*n or about a 1.2% size increase.)
++**
++** The return value is the number of characters in the encoded
++** string, excluding the "\000" terminator.
++**
++** If out==NULL then no output is generated but the routine still returns
++** the number of characters that would have been generated if out had
++** not been NULL.
++*/
++int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out){
++  int i, j, e, m;
++  unsigned char x;
++  int cnt[256];
++  if( n<=0 ){
++    if( out ){
++      out[0] = 'x';
++      out[1] = 0;
++    }
++    return 1;
++  }
++  memset(cnt, 0, sizeof(cnt));
++  for(i=n-1; i>=0; i--){ cnt[in[i]]++; }
++  m = n;
++  for(i=1; i<256; i++){
++    int sum;
++    if( i=='\'' ) continue;
++    sum = cnt[i] + cnt[(i+1)&0xff] + cnt[(i+'\'')&0xff];
++    if( sum<m ){
++      m = sum;
++      e = i;
++      if( m==0 ) break;
++    }
++  }
++  if( out==0 ){
++    return n+m+1;
++  }
++  out[0] = e;
++  j = 1;
++  for(i=0; i<n; i++){
++    x = in[i] - e;
++    if( x==0 || x==1 || x=='\''){
++      out[j++] = 1;
++      x++;
++    }
++    out[j++] = x;
++  }
++  out[j] = 0;
++  assert( j==n+m+1 );
++  return j;
++}
++
++/*
++** Decode the string "in" into binary data and write it into "out".
++** This routine reverses the encoding created by sqlite_encode_binary().
++** The output will always be a few bytes less than the input.  The number
++** of bytes of output is returned.  If the input is not a well-formed
++** encoding, -1 is returned.
++**
++** The "in" and "out" parameters may point to the same buffer in order
++** to decode a string in place.
++*/
++int sqlite_decode_binary(const unsigned char *in, unsigned char *out){
++  int i, e;
++  unsigned char c;
++  e = *(in++);
++  if (e == 0) {
++    return 0;
++  }
++  i = 0;
++  while( (c = *(in++))!=0 ){
++    if (c == 1) {
++      c = *(in++) - 1;
++    }
++    out[i++] = c + e;
++  }
++  return i;
++}
++
++#ifdef ENCODER_TEST
++#include <stdio.h>
++/*
++** The subroutines above are not tested by the usual test suite.  To test
++** these routines, compile just this one file with a -DENCODER_TEST=1 option
++** and run the result.
++*/
++int main(int argc, char **argv){
++  int i, j, n, m, nOut, nByteIn, nByteOut;
++  unsigned char in[30000];
++  unsigned char out[33000];
++
++  nByteIn = nByteOut = 0;
++  for(i=0; i<sizeof(in); i++){
++    printf("Test %d: ", i+1);
++    n = rand() % (i+1);
++    if( i%100==0 ){
++      int k;
++      for(j=k=0; j<n; j++){
++        /* if( k==0 || k=='\'' ) k++; */
++        in[j] = k;
++        k = (k+1)&0xff;
++      }
++    }else{
++      for(j=0; j<n; j++) in[j] = rand() & 0xff;
++    }
++    nByteIn += n;
++    nOut = sqlite_encode_binary(in, n, out);
++    nByteOut += nOut;
++    if( nOut!=strlen(out) ){
++      printf(" ERROR return value is %d instead of %d\n", nOut, strlen(out));
++      exit(1);
++    }
++    if( nOut!=sqlite_encode_binary(in, n, 0) ){
++      printf(" ERROR actual output size disagrees with predicted size\n");
++      exit(1);
++    }
++    m = (256*n + 1262)/253;
++    printf("size %d->%d (max %d)", n, strlen(out)+1, m);
++    if( strlen(out)+1>m ){
++      printf(" ERROR output too big\n");
++      exit(1);
++    }
++    for(j=0; out[j]; j++){
++      if( out[j]=='\'' ){
++        printf(" ERROR contains (')\n");
++        exit(1);
++      }
++    }
++    j = sqlite_decode_binary(out, out);
++    if( j!=n ){
++      printf(" ERROR decode size %d\n", j);
++      exit(1);
++    }
++    if( memcmp(in, out, n)!=0 ){
++      printf(" ERROR decode mismatch\n");
++      exit(1);
++    }
++    printf(" OK\n");
++  }
++  fprintf(stderr,"Finished.  Total encoding: %d->%d bytes\n",
++          nByteIn, nByteOut);
++  fprintf(stderr,"Avg size increase: %.3f%%\n",
++    (nByteOut-nByteIn)*100.0/(double)nByteIn);
++}
++#endif /* ENCODER_TEST */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/expr.c
+@@ -0,0 +1,1662 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains routines used for analyzing expressions and
++** for generating VDBE code that evaluates expressions in SQLite.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include <ctype.h>
++
++/*
++** Construct a new expression node and return a pointer to it.  Memory
++** for this node is obtained from sqliteMalloc().  The calling function
++** is responsible for making sure the node eventually gets freed.
++*/
++Expr *sqliteExpr(int op, Expr *pLeft, Expr *pRight, Token *pToken){
++  Expr *pNew;
++  pNew = sqliteMalloc( sizeof(Expr) );
++  if( pNew==0 ){
++    /* When malloc fails, we leak memory from pLeft and pRight */
++    return 0;
++  }
++  pNew->op = op;
++  pNew->pLeft = pLeft;
++  pNew->pRight = pRight;
++  if( pToken ){
++    assert( pToken->dyn==0 );
++    pNew->token = *pToken;
++    pNew->span = *pToken;
++  }else{
++    assert( pNew->token.dyn==0 );
++    assert( pNew->token.z==0 );
++    assert( pNew->token.n==0 );
++    if( pLeft && pRight ){
++      sqliteExprSpan(pNew, &pLeft->span, &pRight->span);
++    }else{
++      pNew->span = pNew->token;
++    }
++  }
++  return pNew;
++}
++
++/*
++** Set the Expr.span field of the given expression to span all
++** text between the two given tokens.
++*/
++void sqliteExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){
++  assert( pRight!=0 );
++  assert( pLeft!=0 );
++  /* Note: pExpr might be NULL due to a prior malloc failure */
++  if( pExpr && pRight->z && pLeft->z ){
++    if( pLeft->dyn==0 && pRight->dyn==0 ){
++      pExpr->span.z = pLeft->z;
++      pExpr->span.n = pRight->n + Addr(pRight->z) - Addr(pLeft->z);
++    }else{
++      pExpr->span.z = 0;
++    }
++  }
++}
++
++/*
++** Construct a new expression node for a function with multiple
++** arguments.
++*/
++Expr *sqliteExprFunction(ExprList *pList, Token *pToken){
++  Expr *pNew;
++  pNew = sqliteMalloc( sizeof(Expr) );
++  if( pNew==0 ){
++    /* sqliteExprListDelete(pList); // Leak pList when malloc fails */
++    return 0;
++  }
++  pNew->op = TK_FUNCTION;
++  pNew->pList = pList;
++  if( pToken ){
++    assert( pToken->dyn==0 );
++    pNew->token = *pToken;
++  }else{
++    pNew->token.z = 0;
++  }
++  pNew->span = pNew->token;
++  return pNew;
++}
++
++/*
++** Recursively delete an expression tree.
++*/
++void sqliteExprDelete(Expr *p){
++  if( p==0 ) return;
++  if( p->span.dyn ) sqliteFree((char*)p->span.z);
++  if( p->token.dyn ) sqliteFree((char*)p->token.z);
++  sqliteExprDelete(p->pLeft);
++  sqliteExprDelete(p->pRight);
++  sqliteExprListDelete(p->pList);
++  sqliteSelectDelete(p->pSelect);
++  sqliteFree(p);
++}
++
++
++/*
++** The following group of routines make deep copies of expressions,
++** expression lists, ID lists, and select statements.  The copies can
++** be deleted (by being passed to their respective ...Delete() routines)
++** without effecting the originals.
++**
++** The expression list, ID, and source lists return by sqliteExprListDup(),
++** sqliteIdListDup(), and sqliteSrcListDup() can not be further expanded 
++** by subsequent calls to sqlite*ListAppend() routines.
++**
++** Any tables that the SrcList might point to are not duplicated.
++*/
++Expr *sqliteExprDup(Expr *p){
++  Expr *pNew;
++  if( p==0 ) return 0;
++  pNew = sqliteMallocRaw( sizeof(*p) );
++  if( pNew==0 ) return 0;
++  memcpy(pNew, p, sizeof(*pNew));
++  if( p->token.z!=0 ){
++    pNew->token.z = sqliteStrNDup(p->token.z, p->token.n);
++    pNew->token.dyn = 1;
++  }else{
++    assert( pNew->token.z==0 );
++  }
++  pNew->span.z = 0;
++  pNew->pLeft = sqliteExprDup(p->pLeft);
++  pNew->pRight = sqliteExprDup(p->pRight);
++  pNew->pList = sqliteExprListDup(p->pList);
++  pNew->pSelect = sqliteSelectDup(p->pSelect);
++  return pNew;
++}
++void sqliteTokenCopy(Token *pTo, Token *pFrom){
++  if( pTo->dyn ) sqliteFree((char*)pTo->z);
++  if( pFrom->z ){
++    pTo->n = pFrom->n;
++    pTo->z = sqliteStrNDup(pFrom->z, pFrom->n);
++    pTo->dyn = 1;
++  }else{
++    pTo->z = 0;
++  }
++}
++ExprList *sqliteExprListDup(ExprList *p){
++  ExprList *pNew;
++  struct ExprList_item *pItem;
++  int i;
++  if( p==0 ) return 0;
++  pNew = sqliteMalloc( sizeof(*pNew) );
++  if( pNew==0 ) return 0;
++  pNew->nExpr = pNew->nAlloc = p->nExpr;
++  pNew->a = pItem = sqliteMalloc( p->nExpr*sizeof(p->a[0]) );
++  if( pItem==0 ){
++    sqliteFree(pNew);
++    return 0;
++  }
++  for(i=0; i<p->nExpr; i++, pItem++){
++    Expr *pNewExpr, *pOldExpr;
++    pItem->pExpr = pNewExpr = sqliteExprDup(pOldExpr = p->a[i].pExpr);
++    if( pOldExpr->span.z!=0 && pNewExpr ){
++      /* Always make a copy of the span for top-level expressions in the
++      ** expression list.  The logic in SELECT processing that determines
++      ** the names of columns in the result set needs this information */
++      sqliteTokenCopy(&pNewExpr->span, &pOldExpr->span);
++    }
++    assert( pNewExpr==0 || pNewExpr->span.z!=0 
++            || pOldExpr->span.z==0 || sqlite_malloc_failed );
++    pItem->zName = sqliteStrDup(p->a[i].zName);
++    pItem->sortOrder = p->a[i].sortOrder;
++    pItem->isAgg = p->a[i].isAgg;
++    pItem->done = 0;
++  }
++  return pNew;
++}
++SrcList *sqliteSrcListDup(SrcList *p){
++  SrcList *pNew;
++  int i;
++  int nByte;
++  if( p==0 ) return 0;
++  nByte = sizeof(*p) + (p->nSrc>0 ? sizeof(p->a[0]) * (p->nSrc-1) : 0);
++  pNew = sqliteMallocRaw( nByte );
++  if( pNew==0 ) return 0;
++  pNew->nSrc = pNew->nAlloc = p->nSrc;
++  for(i=0; i<p->nSrc; i++){
++    struct SrcList_item *pNewItem = &pNew->a[i];
++    struct SrcList_item *pOldItem = &p->a[i];
++    pNewItem->zDatabase = sqliteStrDup(pOldItem->zDatabase);
++    pNewItem->zName = sqliteStrDup(pOldItem->zName);
++    pNewItem->zAlias = sqliteStrDup(pOldItem->zAlias);
++    pNewItem->jointype = pOldItem->jointype;
++    pNewItem->iCursor = pOldItem->iCursor;
++    pNewItem->pTab = 0;
++    pNewItem->pSelect = sqliteSelectDup(pOldItem->pSelect);
++    pNewItem->pOn = sqliteExprDup(pOldItem->pOn);
++    pNewItem->pUsing = sqliteIdListDup(pOldItem->pUsing);
++  }
++  return pNew;
++}
++IdList *sqliteIdListDup(IdList *p){
++  IdList *pNew;
++  int i;
++  if( p==0 ) return 0;
++  pNew = sqliteMallocRaw( sizeof(*pNew) );
++  if( pNew==0 ) return 0;
++  pNew->nId = pNew->nAlloc = p->nId;
++  pNew->a = sqliteMallocRaw( p->nId*sizeof(p->a[0]) );
++  if( pNew->a==0 ) return 0;
++  for(i=0; i<p->nId; i++){
++    struct IdList_item *pNewItem = &pNew->a[i];
++    struct IdList_item *pOldItem = &p->a[i];
++    pNewItem->zName = sqliteStrDup(pOldItem->zName);
++    pNewItem->idx = pOldItem->idx;
++  }
++  return pNew;
++}
++Select *sqliteSelectDup(Select *p){
++  Select *pNew;
++  if( p==0 ) return 0;
++  pNew = sqliteMallocRaw( sizeof(*p) );
++  if( pNew==0 ) return 0;
++  pNew->isDistinct = p->isDistinct;
++  pNew->pEList = sqliteExprListDup(p->pEList);
++  pNew->pSrc = sqliteSrcListDup(p->pSrc);
++  pNew->pWhere = sqliteExprDup(p->pWhere);
++  pNew->pGroupBy = sqliteExprListDup(p->pGroupBy);
++  pNew->pHaving = sqliteExprDup(p->pHaving);
++  pNew->pOrderBy = sqliteExprListDup(p->pOrderBy);
++  pNew->op = p->op;
++  pNew->pPrior = sqliteSelectDup(p->pPrior);
++  pNew->nLimit = p->nLimit;
++  pNew->nOffset = p->nOffset;
++  pNew->zSelect = 0;
++  pNew->iLimit = -1;
++  pNew->iOffset = -1;
++  return pNew;
++}
++
++
++/*
++** Add a new element to the end of an expression list.  If pList is
++** initially NULL, then create a new expression list.
++*/
++ExprList *sqliteExprListAppend(ExprList *pList, Expr *pExpr, Token *pName){
++  if( pList==0 ){
++    pList = sqliteMalloc( sizeof(ExprList) );
++    if( pList==0 ){
++      /* sqliteExprDelete(pExpr); // Leak memory if malloc fails */
++      return 0;
++    }
++    assert( pList->nAlloc==0 );
++  }
++  if( pList->nAlloc<=pList->nExpr ){
++    pList->nAlloc = pList->nAlloc*2 + 4;
++    pList->a = sqliteRealloc(pList->a, pList->nAlloc*sizeof(pList->a[0]));
++    if( pList->a==0 ){
++      /* sqliteExprDelete(pExpr); // Leak memory if malloc fails */
++      pList->nExpr = pList->nAlloc = 0;
++      return pList;
++    }
++  }
++  assert( pList->a!=0 );
++  if( pExpr || pName ){
++    struct ExprList_item *pItem = &pList->a[pList->nExpr++];
++    memset(pItem, 0, sizeof(*pItem));
++    pItem->pExpr = pExpr;
++    if( pName ){
++      sqliteSetNString(&pItem->zName, pName->z, pName->n, 0);
++      sqliteDequote(pItem->zName);
++    }
++  }
++  return pList;
++}
++
++/*
++** Delete an entire expression list.
++*/
++void sqliteExprListDelete(ExprList *pList){
++  int i;
++  if( pList==0 ) return;
++  assert( pList->a!=0 || (pList->nExpr==0 && pList->nAlloc==0) );
++  assert( pList->nExpr<=pList->nAlloc );
++  for(i=0; i<pList->nExpr; i++){
++    sqliteExprDelete(pList->a[i].pExpr);
++    sqliteFree(pList->a[i].zName);
++  }
++  sqliteFree(pList->a);
++  sqliteFree(pList);
++}
++
++/*
++** Walk an expression tree.  Return 1 if the expression is constant
++** and 0 if it involves variables.
++**
++** For the purposes of this function, a double-quoted string (ex: "abc")
++** is considered a variable but a single-quoted string (ex: 'abc') is
++** a constant.
++*/
++int sqliteExprIsConstant(Expr *p){
++  switch( p->op ){
++    case TK_ID:
++    case TK_COLUMN:
++    case TK_DOT:
++    case TK_FUNCTION:
++      return 0;
++    case TK_NULL:
++    case TK_STRING:
++    case TK_INTEGER:
++    case TK_FLOAT:
++    case TK_VARIABLE:
++      return 1;
++    default: {
++      if( p->pLeft && !sqliteExprIsConstant(p->pLeft) ) return 0;
++      if( p->pRight && !sqliteExprIsConstant(p->pRight) ) return 0;
++      if( p->pList ){
++        int i;
++        for(i=0; i<p->pList->nExpr; i++){
++          if( !sqliteExprIsConstant(p->pList->a[i].pExpr) ) return 0;
++        }
++      }
++      return p->pLeft!=0 || p->pRight!=0 || (p->pList && p->pList->nExpr>0);
++    }
++  }
++  return 0;
++}
++
++/*
++** If the given expression codes a constant integer that is small enough
++** to fit in a 32-bit integer, return 1 and put the value of the integer
++** in *pValue.  If the expression is not an integer or if it is too big
++** to fit in a signed 32-bit integer, return 0 and leave *pValue unchanged.
++*/
++int sqliteExprIsInteger(Expr *p, int *pValue){
++  switch( p->op ){
++    case TK_INTEGER: {
++      if( sqliteFitsIn32Bits(p->token.z) ){
++        *pValue = atoi(p->token.z);
++        return 1;
++      }
++      break;
++    }
++    case TK_STRING: {
++      const char *z = p->token.z;
++      int n = p->token.n;
++      if( n>0 && z[0]=='-' ){ z++; n--; }
++      while( n>0 && *z && isdigit(*z) ){ z++; n--; }
++      if( n==0 && sqliteFitsIn32Bits(p->token.z) ){
++        *pValue = atoi(p->token.z);
++        return 1;
++      }
++      break;
++    }
++    case TK_UPLUS: {
++      return sqliteExprIsInteger(p->pLeft, pValue);
++    }
++    case TK_UMINUS: {
++      int v;
++      if( sqliteExprIsInteger(p->pLeft, &v) ){
++        *pValue = -v;
++        return 1;
++      }
++      break;
++    }
++    default: break;
++  }
++  return 0;
++}
++
++/*
++** Return TRUE if the given string is a row-id column name.
++*/
++int sqliteIsRowid(const char *z){
++  if( sqliteStrICmp(z, "_ROWID_")==0 ) return 1;
++  if( sqliteStrICmp(z, "ROWID")==0 ) return 1;
++  if( sqliteStrICmp(z, "OID")==0 ) return 1;
++  return 0;
++}
++
++/*
++** Given the name of a column of the form X.Y.Z or Y.Z or just Z, look up
++** that name in the set of source tables in pSrcList and make the pExpr 
++** expression node refer back to that source column.  The following changes
++** are made to pExpr:
++**
++**    pExpr->iDb           Set the index in db->aDb[] of the database holding
++**                         the table.
++**    pExpr->iTable        Set to the cursor number for the table obtained
++**                         from pSrcList.
++**    pExpr->iColumn       Set to the column number within the table.
++**    pExpr->dataType      Set to the appropriate data type for the column.
++**    pExpr->op            Set to TK_COLUMN.
++**    pExpr->pLeft         Any expression this points to is deleted
++**    pExpr->pRight        Any expression this points to is deleted.
++**
++** The pDbToken is the name of the database (the "X").  This value may be
++** NULL meaning that name is of the form Y.Z or Z.  Any available database
++** can be used.  The pTableToken is the name of the table (the "Y").  This
++** value can be NULL if pDbToken is also NULL.  If pTableToken is NULL it
++** means that the form of the name is Z and that columns from any table
++** can be used.
++**
++** If the name cannot be resolved unambiguously, leave an error message
++** in pParse and return non-zero.  Return zero on success.
++*/
++static int lookupName(
++  Parse *pParse,      /* The parsing context */
++  Token *pDbToken,     /* Name of the database containing table, or NULL */
++  Token *pTableToken,  /* Name of table containing column, or NULL */
++  Token *pColumnToken, /* Name of the column. */
++  SrcList *pSrcList,   /* List of tables used to resolve column names */
++  ExprList *pEList,    /* List of expressions used to resolve "AS" */
++  Expr *pExpr          /* Make this EXPR node point to the selected column */
++){
++  char *zDb = 0;       /* Name of the database.  The "X" in X.Y.Z */
++  char *zTab = 0;      /* Name of the table.  The "Y" in X.Y.Z or Y.Z */
++  char *zCol = 0;      /* Name of the column.  The "Z" */
++  int i, j;            /* Loop counters */
++  int cnt = 0;         /* Number of matching column names */
++  int cntTab = 0;      /* Number of matching table names */
++  sqlite *db = pParse->db;  /* The database */
++
++  assert( pColumnToken && pColumnToken->z ); /* The Z in X.Y.Z cannot be NULL */
++  if( pDbToken && pDbToken->z ){
++    zDb = sqliteStrNDup(pDbToken->z, pDbToken->n);
++    sqliteDequote(zDb);
++  }else{
++    zDb = 0;
++  }
++  if( pTableToken && pTableToken->z ){
++    zTab = sqliteStrNDup(pTableToken->z, pTableToken->n);
++    sqliteDequote(zTab);
++  }else{
++    assert( zDb==0 );
++    zTab = 0;
++  }
++  zCol = sqliteStrNDup(pColumnToken->z, pColumnToken->n);
++  sqliteDequote(zCol);
++  if( sqlite_malloc_failed ){
++    return 1;  /* Leak memory (zDb and zTab) if malloc fails */
++  }
++  assert( zTab==0 || pEList==0 );
++
++  pExpr->iTable = -1;
++  for(i=0; i<pSrcList->nSrc; i++){
++    struct SrcList_item *pItem = &pSrcList->a[i];
++    Table *pTab = pItem->pTab;
++    Column *pCol;
++
++    if( pTab==0 ) continue;
++    assert( pTab->nCol>0 );
++    if( zTab ){
++      if( pItem->zAlias ){
++        char *zTabName = pItem->zAlias;
++        if( sqliteStrICmp(zTabName, zTab)!=0 ) continue;
++      }else{
++        char *zTabName = pTab->zName;
++        if( zTabName==0 || sqliteStrICmp(zTabName, zTab)!=0 ) continue;
++        if( zDb!=0 && sqliteStrICmp(db->aDb[pTab->iDb].zName, zDb)!=0 ){
++          continue;
++        }
++      }
++    }
++    if( 0==(cntTab++) ){
++      pExpr->iTable = pItem->iCursor;
++      pExpr->iDb = pTab->iDb;
++    }
++    for(j=0, pCol=pTab->aCol; j<pTab->nCol; j++, pCol++){
++      if( sqliteStrICmp(pCol->zName, zCol)==0 ){
++        cnt++;
++        pExpr->iTable = pItem->iCursor;
++        pExpr->iDb = pTab->iDb;
++        /* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */
++        pExpr->iColumn = j==pTab->iPKey ? -1 : j;
++        pExpr->dataType = pCol->sortOrder & SQLITE_SO_TYPEMASK;
++        break;
++      }
++    }
++  }
++
++  /* If we have not already resolved the name, then maybe 
++  ** it is a new.* or old.* trigger argument reference
++  */
++  if( zDb==0 && zTab!=0 && cnt==0 && pParse->trigStack!=0 ){
++    TriggerStack *pTriggerStack = pParse->trigStack;
++    Table *pTab = 0;
++    if( pTriggerStack->newIdx != -1 && sqliteStrICmp("new", zTab) == 0 ){
++      pExpr->iTable = pTriggerStack->newIdx;
++      assert( pTriggerStack->pTab );
++      pTab = pTriggerStack->pTab;
++    }else if( pTriggerStack->oldIdx != -1 && sqliteStrICmp("old", zTab) == 0 ){
++      pExpr->iTable = pTriggerStack->oldIdx;
++      assert( pTriggerStack->pTab );
++      pTab = pTriggerStack->pTab;
++    }
++
++    if( pTab ){ 
++      int j;
++      Column *pCol = pTab->aCol;
++      
++      pExpr->iDb = pTab->iDb;
++      cntTab++;
++      for(j=0; j < pTab->nCol; j++, pCol++) {
++        if( sqliteStrICmp(pCol->zName, zCol)==0 ){
++          cnt++;
++          pExpr->iColumn = j==pTab->iPKey ? -1 : j;
++          pExpr->dataType = pCol->sortOrder & SQLITE_SO_TYPEMASK;
++          break;
++        }
++      }
++    }
++  }
++
++  /*
++  ** Perhaps the name is a reference to the ROWID
++  */
++  if( cnt==0 && cntTab==1 && sqliteIsRowid(zCol) ){
++    cnt = 1;
++    pExpr->iColumn = -1;
++    pExpr->dataType = SQLITE_SO_NUM;
++  }
++
++  /*
++  ** If the input is of the form Z (not Y.Z or X.Y.Z) then the name Z
++  ** might refer to an result-set alias.  This happens, for example, when
++  ** we are resolving names in the WHERE clause of the following command:
++  **
++  **     SELECT a+b AS x FROM table WHERE x<10;
++  **
++  ** In cases like this, replace pExpr with a copy of the expression that
++  ** forms the result set entry ("a+b" in the example) and return immediately.
++  ** Note that the expression in the result set should have already been
++  ** resolved by the time the WHERE clause is resolved.
++  */
++  if( cnt==0 && pEList!=0 ){
++    for(j=0; j<pEList->nExpr; j++){
++      char *zAs = pEList->a[j].zName;
++      if( zAs!=0 && sqliteStrICmp(zAs, zCol)==0 ){
++        assert( pExpr->pLeft==0 && pExpr->pRight==0 );
++        pExpr->op = TK_AS;
++        pExpr->iColumn = j;
++        pExpr->pLeft = sqliteExprDup(pEList->a[j].pExpr);
++        sqliteFree(zCol);
++        assert( zTab==0 && zDb==0 );
++        return 0;
++      }
++    } 
++  }
++
++  /*
++  ** If X and Y are NULL (in other words if only the column name Z is
++  ** supplied) and the value of Z is enclosed in double-quotes, then
++  ** Z is a string literal if it doesn't match any column names.  In that
++  ** case, we need to return right away and not make any changes to
++  ** pExpr.
++  */
++  if( cnt==0 && zTab==0 && pColumnToken->z[0]=='"' ){
++    sqliteFree(zCol);
++    return 0;
++  }
++
++  /*
++  ** cnt==0 means there was not match.  cnt>1 means there were two or
++  ** more matches.  Either way, we have an error.
++  */
++  if( cnt!=1 ){
++    char *z = 0;
++    char *zErr;
++    zErr = cnt==0 ? "no such column: %s" : "ambiguous column name: %s";
++    if( zDb ){
++      sqliteSetString(&z, zDb, ".", zTab, ".", zCol, 0);
++    }else if( zTab ){
++      sqliteSetString(&z, zTab, ".", zCol, 0);
++    }else{
++      z = sqliteStrDup(zCol);
++    }
++    sqliteErrorMsg(pParse, zErr, z);
++    sqliteFree(z);
++  }
++
++  /* Clean up and return
++  */
++  sqliteFree(zDb);
++  sqliteFree(zTab);
++  sqliteFree(zCol);
++  sqliteExprDelete(pExpr->pLeft);
++  pExpr->pLeft = 0;
++  sqliteExprDelete(pExpr->pRight);
++  pExpr->pRight = 0;
++  pExpr->op = TK_COLUMN;
++  sqliteAuthRead(pParse, pExpr, pSrcList);
++  return cnt!=1;
++}
++
++/*
++** This routine walks an expression tree and resolves references to
++** table columns.  Nodes of the form ID.ID or ID resolve into an
++** index to the table in the table list and a column offset.  The 
++** Expr.opcode for such nodes is changed to TK_COLUMN.  The Expr.iTable
++** value is changed to the index of the referenced table in pTabList
++** plus the "base" value.  The base value will ultimately become the
++** VDBE cursor number for a cursor that is pointing into the referenced
++** table.  The Expr.iColumn value is changed to the index of the column 
++** of the referenced table.  The Expr.iColumn value for the special
++** ROWID column is -1.  Any INTEGER PRIMARY KEY column is tried as an
++** alias for ROWID.
++**
++** We also check for instances of the IN operator.  IN comes in two
++** forms:
++**
++**           expr IN (exprlist)
++** and
++**           expr IN (SELECT ...)
++**
++** The first form is handled by creating a set holding the list
++** of allowed values.  The second form causes the SELECT to generate 
++** a temporary table.
++**
++** This routine also looks for scalar SELECTs that are part of an expression.
++** If it finds any, it generates code to write the value of that select
++** into a memory cell.
++**
++** Unknown columns or tables provoke an error.  The function returns
++** the number of errors seen and leaves an error message on pParse->zErrMsg.
++*/
++int sqliteExprResolveIds(
++  Parse *pParse,     /* The parser context */
++  SrcList *pSrcList, /* List of tables used to resolve column names */
++  ExprList *pEList,  /* List of expressions used to resolve "AS" */
++  Expr *pExpr        /* The expression to be analyzed. */
++){
++  int i;
++
++  if( pExpr==0 || pSrcList==0 ) return 0;
++  for(i=0; i<pSrcList->nSrc; i++){
++    assert( pSrcList->a[i].iCursor>=0 && pSrcList->a[i].iCursor<pParse->nTab );
++  }
++  switch( pExpr->op ){
++    /* Double-quoted strings (ex: "abc") are used as identifiers if
++    ** possible.  Otherwise they remain as strings.  Single-quoted
++    ** strings (ex: 'abc') are always string literals.
++    */
++    case TK_STRING: {
++      if( pExpr->token.z[0]=='\'' ) break;
++      /* Fall thru into the TK_ID case if this is a double-quoted string */
++    }
++    /* A lone identifier is the name of a columnd.
++    */
++    case TK_ID: {
++      if( lookupName(pParse, 0, 0, &pExpr->token, pSrcList, pEList, pExpr) ){
++        return 1;
++      }
++      break; 
++    }
++  
++    /* A table name and column name:     ID.ID
++    ** Or a database, table and column:  ID.ID.ID
++    */
++    case TK_DOT: {
++      Token *pColumn;
++      Token *pTable;
++      Token *pDb;
++      Expr *pRight;
++
++      pRight = pExpr->pRight;
++      if( pRight->op==TK_ID ){
++        pDb = 0;
++        pTable = &pExpr->pLeft->token;
++        pColumn = &pRight->token;
++      }else{
++        assert( pRight->op==TK_DOT );
++        pDb = &pExpr->pLeft->token;
++        pTable = &pRight->pLeft->token;
++        pColumn = &pRight->pRight->token;
++      }
++      if( lookupName(pParse, pDb, pTable, pColumn, pSrcList, 0, pExpr) ){
++        return 1;
++      }
++      break;
++    }
++
++    case TK_IN: {
++      Vdbe *v = sqliteGetVdbe(pParse);
++      if( v==0 ) return 1;
++      if( sqliteExprResolveIds(pParse, pSrcList, pEList, pExpr->pLeft) ){
++        return 1;
++      }
++      if( pExpr->pSelect ){
++        /* Case 1:     expr IN (SELECT ...)
++        **
++        ** Generate code to write the results of the select into a temporary
++        ** table.  The cursor number of the temporary table has already
++        ** been put in iTable by sqliteExprResolveInSelect().
++        */
++        pExpr->iTable = pParse->nTab++;
++        sqliteVdbeAddOp(v, OP_OpenTemp, pExpr->iTable, 1);
++        sqliteSelect(pParse, pExpr->pSelect, SRT_Set, pExpr->iTable, 0,0,0);
++      }else if( pExpr->pList ){
++        /* Case 2:     expr IN (exprlist)
++        **
++        ** Create a set to put the exprlist values in.  The Set id is stored
++        ** in iTable.
++        */
++        int i, iSet;
++        for(i=0; i<pExpr->pList->nExpr; i++){
++          Expr *pE2 = pExpr->pList->a[i].pExpr;
++          if( !sqliteExprIsConstant(pE2) ){
++            sqliteErrorMsg(pParse,
++              "right-hand side of IN operator must be constant");
++            return 1;
++          }
++          if( sqliteExprCheck(pParse, pE2, 0, 0) ){
++            return 1;
++          }
++        }
++        iSet = pExpr->iTable = pParse->nSet++;
++        for(i=0; i<pExpr->pList->nExpr; i++){
++          Expr *pE2 = pExpr->pList->a[i].pExpr;
++          switch( pE2->op ){
++            case TK_FLOAT:
++            case TK_INTEGER:
++            case TK_STRING: {
++              int addr;
++              assert( pE2->token.z );
++              addr = sqliteVdbeOp3(v, OP_SetInsert, iSet, 0,
++                                  pE2->token.z, pE2->token.n);
++              sqliteVdbeDequoteP3(v, addr);
++              break;
++            }
++            default: {
++              sqliteExprCode(pParse, pE2);
++              sqliteVdbeAddOp(v, OP_SetInsert, iSet, 0);
++              break;
++            }
++          }
++        }
++      }
++      break;
++    }
++
++    case TK_SELECT: {
++      /* This has to be a scalar SELECT.  Generate code to put the
++      ** value of this select in a memory cell and record the number
++      ** of the memory cell in iColumn.
++      */
++      pExpr->iColumn = pParse->nMem++;
++      if( sqliteSelect(pParse, pExpr->pSelect, SRT_Mem, pExpr->iColumn,0,0,0) ){
++        return 1;
++      }
++      break;
++    }
++
++    /* For all else, just recursively walk the tree */
++    default: {
++      if( pExpr->pLeft
++      && sqliteExprResolveIds(pParse, pSrcList, pEList, pExpr->pLeft) ){
++        return 1;
++      }
++      if( pExpr->pRight 
++      && sqliteExprResolveIds(pParse, pSrcList, pEList, pExpr->pRight) ){
++        return 1;
++      }
++      if( pExpr->pList ){
++        int i;
++        ExprList *pList = pExpr->pList;
++        for(i=0; i<pList->nExpr; i++){
++          Expr *pArg = pList->a[i].pExpr;
++          if( sqliteExprResolveIds(pParse, pSrcList, pEList, pArg) ){
++            return 1;
++          }
++        }
++      }
++    }
++  }
++  return 0;
++}
++
++/*
++** pExpr is a node that defines a function of some kind.  It might
++** be a syntactic function like "count(x)" or it might be a function
++** that implements an operator, like "a LIKE b".  
++**
++** This routine makes *pzName point to the name of the function and 
++** *pnName hold the number of characters in the function name.
++*/
++static void getFunctionName(Expr *pExpr, const char **pzName, int *pnName){
++  switch( pExpr->op ){
++    case TK_FUNCTION: {
++      *pzName = pExpr->token.z;
++      *pnName = pExpr->token.n;
++      break;
++    }
++    case TK_LIKE: {
++      *pzName = "like";
++      *pnName = 4;
++      break;
++    }
++    case TK_GLOB: {
++      *pzName = "glob";
++      *pnName = 4;
++      break;
++    }
++    default: {
++      *pzName = "can't happen";
++      *pnName = 12;
++      break;
++    }
++  }
++}
++
++/*
++** Error check the functions in an expression.  Make sure all
++** function names are recognized and all functions have the correct
++** number of arguments.  Leave an error message in pParse->zErrMsg
++** if anything is amiss.  Return the number of errors.
++**
++** if pIsAgg is not null and this expression is an aggregate function
++** (like count(*) or max(value)) then write a 1 into *pIsAgg.
++*/
++int sqliteExprCheck(Parse *pParse, Expr *pExpr, int allowAgg, int *pIsAgg){
++  int nErr = 0;
++  if( pExpr==0 ) return 0;
++  switch( pExpr->op ){
++    case TK_GLOB:
++    case TK_LIKE:
++    case TK_FUNCTION: {
++      int n = pExpr->pList ? pExpr->pList->nExpr : 0;  /* Number of arguments */
++      int no_such_func = 0;       /* True if no such function exists */
++      int wrong_num_args = 0;     /* True if wrong number of arguments */
++      int is_agg = 0;             /* True if is an aggregate function */
++      int i;
++      int nId;                    /* Number of characters in function name */
++      const char *zId;            /* The function name. */
++      FuncDef *pDef;
++
++      getFunctionName(pExpr, &zId, &nId);
++      pDef = sqliteFindFunction(pParse->db, zId, nId, n, 0);
++      if( pDef==0 ){
++        pDef = sqliteFindFunction(pParse->db, zId, nId, -1, 0);
++        if( pDef==0 ){
++          no_such_func = 1;
++        }else{
++          wrong_num_args = 1;
++        }
++      }else{
++        is_agg = pDef->xFunc==0;
++      }
++      if( is_agg && !allowAgg ){
++        sqliteErrorMsg(pParse, "misuse of aggregate function %.*s()", nId, zId);
++        nErr++;
++        is_agg = 0;
++      }else if( no_such_func ){
++        sqliteErrorMsg(pParse, "no such function: %.*s", nId, zId);
++        nErr++;
++      }else if( wrong_num_args ){
++        sqliteErrorMsg(pParse,"wrong number of arguments to function %.*s()",
++             nId, zId);
++        nErr++;
++      }
++      if( is_agg ){
++        pExpr->op = TK_AGG_FUNCTION;
++        if( pIsAgg ) *pIsAgg = 1;
++      }
++      for(i=0; nErr==0 && i<n; i++){
++        nErr = sqliteExprCheck(pParse, pExpr->pList->a[i].pExpr,
++                               allowAgg && !is_agg, pIsAgg);
++      }
++      if( pDef==0 ){
++        /* Already reported an error */
++      }else if( pDef->dataType>=0 ){
++        if( pDef->dataType<n ){
++          pExpr->dataType = 
++             sqliteExprType(pExpr->pList->a[pDef->dataType].pExpr);
++        }else{
++          pExpr->dataType = SQLITE_SO_NUM;
++        }
++      }else if( pDef->dataType==SQLITE_ARGS ){
++        pDef->dataType = SQLITE_SO_TEXT;
++        for(i=0; i<n; i++){
++          if( sqliteExprType(pExpr->pList->a[i].pExpr)==SQLITE_SO_NUM ){
++            pExpr->dataType = SQLITE_SO_NUM;
++            break;
++          }
++        }
++      }else if( pDef->dataType==SQLITE_NUMERIC ){
++        pExpr->dataType = SQLITE_SO_NUM;
++      }else{
++        pExpr->dataType = SQLITE_SO_TEXT;
++      }
++    }
++    default: {
++      if( pExpr->pLeft ){
++        nErr = sqliteExprCheck(pParse, pExpr->pLeft, allowAgg, pIsAgg);
++      }
++      if( nErr==0 && pExpr->pRight ){
++        nErr = sqliteExprCheck(pParse, pExpr->pRight, allowAgg, pIsAgg);
++      }
++      if( nErr==0 && pExpr->pList ){
++        int n = pExpr->pList->nExpr;
++        int i;
++        for(i=0; nErr==0 && i<n; i++){
++          Expr *pE2 = pExpr->pList->a[i].pExpr;
++          nErr = sqliteExprCheck(pParse, pE2, allowAgg, pIsAgg);
++        }
++      }
++      break;
++    }
++  }
++  return nErr;
++}
++
++/*
++** Return either SQLITE_SO_NUM or SQLITE_SO_TEXT to indicate whether the
++** given expression should sort as numeric values or as text.
++**
++** The sqliteExprResolveIds() and sqliteExprCheck() routines must have
++** both been called on the expression before it is passed to this routine.
++*/
++int sqliteExprType(Expr *p){
++  if( p==0 ) return SQLITE_SO_NUM;
++  while( p ) switch( p->op ){
++    case TK_PLUS:
++    case TK_MINUS:
++    case TK_STAR:
++    case TK_SLASH:
++    case TK_AND:
++    case TK_OR:
++    case TK_ISNULL:
++    case TK_NOTNULL:
++    case TK_NOT:
++    case TK_UMINUS:
++    case TK_UPLUS:
++    case TK_BITAND:
++    case TK_BITOR:
++    case TK_BITNOT:
++    case TK_LSHIFT:
++    case TK_RSHIFT:
++    case TK_REM:
++    case TK_INTEGER:
++    case TK_FLOAT:
++    case TK_IN:
++    case TK_BETWEEN:
++    case TK_GLOB:
++    case TK_LIKE:
++      return SQLITE_SO_NUM;
++
++    case TK_STRING:
++    case TK_NULL:
++    case TK_CONCAT:
++    case TK_VARIABLE:
++      return SQLITE_SO_TEXT;
++
++    case TK_LT:
++    case TK_LE:
++    case TK_GT:
++    case TK_GE:
++    case TK_NE:
++    case TK_EQ:
++      if( sqliteExprType(p->pLeft)==SQLITE_SO_NUM ){
++        return SQLITE_SO_NUM;
++      }
++      p = p->pRight;
++      break;
++
++    case TK_AS:
++      p = p->pLeft;
++      break;
++
++    case TK_COLUMN:
++    case TK_FUNCTION:
++    case TK_AGG_FUNCTION:
++      return p->dataType;
++
++    case TK_SELECT:
++      assert( p->pSelect );
++      assert( p->pSelect->pEList );
++      assert( p->pSelect->pEList->nExpr>0 );
++      p = p->pSelect->pEList->a[0].pExpr;
++      break;
++
++    case TK_CASE: {
++      if( p->pRight && sqliteExprType(p->pRight)==SQLITE_SO_NUM ){
++        return SQLITE_SO_NUM;
++      }
++      if( p->pList ){
++        int i;
++        ExprList *pList = p->pList;
++        for(i=1; i<pList->nExpr; i+=2){
++          if( sqliteExprType(pList->a[i].pExpr)==SQLITE_SO_NUM ){
++            return SQLITE_SO_NUM;
++          }
++        }
++      }
++      return SQLITE_SO_TEXT;
++    }
++
++    default:
++      assert( p->op==TK_ABORT );  /* Can't Happen */
++      break;
++  }
++  return SQLITE_SO_NUM;
++}
++
++/*
++** Generate code into the current Vdbe to evaluate the given
++** expression and leave the result on the top of stack.
++*/
++void sqliteExprCode(Parse *pParse, Expr *pExpr){
++  Vdbe *v = pParse->pVdbe;
++  int op;
++  if( v==0 || pExpr==0 ) return;
++  switch( pExpr->op ){
++    case TK_PLUS:     op = OP_Add;      break;
++    case TK_MINUS:    op = OP_Subtract; break;
++    case TK_STAR:     op = OP_Multiply; break;
++    case TK_SLASH:    op = OP_Divide;   break;
++    case TK_AND:      op = OP_And;      break;
++    case TK_OR:       op = OP_Or;       break;
++    case TK_LT:       op = OP_Lt;       break;
++    case TK_LE:       op = OP_Le;       break;
++    case TK_GT:       op = OP_Gt;       break;
++    case TK_GE:       op = OP_Ge;       break;
++    case TK_NE:       op = OP_Ne;       break;
++    case TK_EQ:       op = OP_Eq;       break;
++    case TK_ISNULL:   op = OP_IsNull;   break;
++    case TK_NOTNULL:  op = OP_NotNull;  break;
++    case TK_NOT:      op = OP_Not;      break;
++    case TK_UMINUS:   op = OP_Negative; break;
++    case TK_BITAND:   op = OP_BitAnd;   break;
++    case TK_BITOR:    op = OP_BitOr;    break;
++    case TK_BITNOT:   op = OP_BitNot;   break;
++    case TK_LSHIFT:   op = OP_ShiftLeft;  break;
++    case TK_RSHIFT:   op = OP_ShiftRight; break;
++    case TK_REM:      op = OP_Remainder;  break;
++    default: break;
++  }
++  switch( pExpr->op ){
++    case TK_COLUMN: {
++      if( pParse->useAgg ){
++        sqliteVdbeAddOp(v, OP_AggGet, 0, pExpr->iAgg);
++      }else if( pExpr->iColumn>=0 ){
++        sqliteVdbeAddOp(v, OP_Column, pExpr->iTable, pExpr->iColumn);
++      }else{
++        sqliteVdbeAddOp(v, OP_Recno, pExpr->iTable, 0);
++      }
++      break;
++    }
++    case TK_STRING:
++    case TK_FLOAT:
++    case TK_INTEGER: {
++      if( pExpr->op==TK_INTEGER && sqliteFitsIn32Bits(pExpr->token.z) ){
++        sqliteVdbeAddOp(v, OP_Integer, atoi(pExpr->token.z), 0);
++      }else{
++        sqliteVdbeAddOp(v, OP_String, 0, 0);
++      }
++      assert( pExpr->token.z );
++      sqliteVdbeChangeP3(v, -1, pExpr->token.z, pExpr->token.n);
++      sqliteVdbeDequoteP3(v, -1);
++      break;
++    }
++    case TK_NULL: {
++      sqliteVdbeAddOp(v, OP_String, 0, 0);
++      break;
++    }
++    case TK_VARIABLE: {
++      sqliteVdbeAddOp(v, OP_Variable, pExpr->iTable, 0);
++      break;
++    }
++    case TK_LT:
++    case TK_LE:
++    case TK_GT:
++    case TK_GE:
++    case TK_NE:
++    case TK_EQ: {
++      if( pParse->db->file_format>=4 && sqliteExprType(pExpr)==SQLITE_SO_TEXT ){
++        op += 6;  /* Convert numeric opcodes to text opcodes */
++      }
++      /* Fall through into the next case */
++    }
++    case TK_AND:
++    case TK_OR:
++    case TK_PLUS:
++    case TK_STAR:
++    case TK_MINUS:
++    case TK_REM:
++    case TK_BITAND:
++    case TK_BITOR:
++    case TK_SLASH: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteExprCode(pParse, pExpr->pRight);
++      sqliteVdbeAddOp(v, op, 0, 0);
++      break;
++    }
++    case TK_LSHIFT:
++    case TK_RSHIFT: {
++      sqliteExprCode(pParse, pExpr->pRight);
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteVdbeAddOp(v, op, 0, 0);
++      break;
++    }
++    case TK_CONCAT: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteExprCode(pParse, pExpr->pRight);
++      sqliteVdbeAddOp(v, OP_Concat, 2, 0);
++      break;
++    }
++    case TK_UMINUS: {
++      assert( pExpr->pLeft );
++      if( pExpr->pLeft->op==TK_FLOAT || pExpr->pLeft->op==TK_INTEGER ){
++        Token *p = &pExpr->pLeft->token;
++        char *z = sqliteMalloc( p->n + 2 );
++        sprintf(z, "-%.*s", p->n, p->z);
++        if( pExpr->pLeft->op==TK_INTEGER && sqliteFitsIn32Bits(z) ){
++          sqliteVdbeAddOp(v, OP_Integer, atoi(z), 0);
++        }else{
++          sqliteVdbeAddOp(v, OP_String, 0, 0);
++        }
++        sqliteVdbeChangeP3(v, -1, z, p->n+1);
++        sqliteFree(z);
++        break;
++      }
++      /* Fall through into TK_NOT */
++    }
++    case TK_BITNOT:
++    case TK_NOT: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteVdbeAddOp(v, op, 0, 0);
++      break;
++    }
++    case TK_ISNULL:
++    case TK_NOTNULL: {
++      int dest;
++      sqliteVdbeAddOp(v, OP_Integer, 1, 0);
++      sqliteExprCode(pParse, pExpr->pLeft);
++      dest = sqliteVdbeCurrentAddr(v) + 2;
++      sqliteVdbeAddOp(v, op, 1, dest);
++      sqliteVdbeAddOp(v, OP_AddImm, -1, 0);
++      break;
++    }
++    case TK_AGG_FUNCTION: {
++      sqliteVdbeAddOp(v, OP_AggGet, 0, pExpr->iAgg);
++      break;
++    }
++    case TK_GLOB:
++    case TK_LIKE:
++    case TK_FUNCTION: {
++      ExprList *pList = pExpr->pList;
++      int nExpr = pList ? pList->nExpr : 0;
++      FuncDef *pDef;
++      int nId;
++      const char *zId;
++      getFunctionName(pExpr, &zId, &nId);
++      pDef = sqliteFindFunction(pParse->db, zId, nId, nExpr, 0);
++      assert( pDef!=0 );
++      nExpr = sqliteExprCodeExprList(pParse, pList, pDef->includeTypes);
++      sqliteVdbeOp3(v, OP_Function, nExpr, 0, (char*)pDef, P3_POINTER);
++      break;
++    }
++    case TK_SELECT: {
++      sqliteVdbeAddOp(v, OP_MemLoad, pExpr->iColumn, 0);
++      break;
++    }
++    case TK_IN: {
++      int addr;
++      sqliteVdbeAddOp(v, OP_Integer, 1, 0);
++      sqliteExprCode(pParse, pExpr->pLeft);
++      addr = sqliteVdbeCurrentAddr(v);
++      sqliteVdbeAddOp(v, OP_NotNull, -1, addr+4);
++      sqliteVdbeAddOp(v, OP_Pop, 2, 0);
++      sqliteVdbeAddOp(v, OP_String, 0, 0);
++      sqliteVdbeAddOp(v, OP_Goto, 0, addr+6);
++      if( pExpr->pSelect ){
++        sqliteVdbeAddOp(v, OP_Found, pExpr->iTable, addr+6);
++      }else{
++        sqliteVdbeAddOp(v, OP_SetFound, pExpr->iTable, addr+6);
++      }
++      sqliteVdbeAddOp(v, OP_AddImm, -1, 0);
++      break;
++    }
++    case TK_BETWEEN: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++      sqliteExprCode(pParse, pExpr->pList->a[0].pExpr);
++      sqliteVdbeAddOp(v, OP_Ge, 0, 0);
++      sqliteVdbeAddOp(v, OP_Pull, 1, 0);
++      sqliteExprCode(pParse, pExpr->pList->a[1].pExpr);
++      sqliteVdbeAddOp(v, OP_Le, 0, 0);
++      sqliteVdbeAddOp(v, OP_And, 0, 0);
++      break;
++    }
++    case TK_UPLUS:
++    case TK_AS: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      break;
++    }
++    case TK_CASE: {
++      int expr_end_label;
++      int jumpInst;
++      int addr;
++      int nExpr;
++      int i;
++
++      assert(pExpr->pList);
++      assert((pExpr->pList->nExpr % 2) == 0);
++      assert(pExpr->pList->nExpr > 0);
++      nExpr = pExpr->pList->nExpr;
++      expr_end_label = sqliteVdbeMakeLabel(v);
++      if( pExpr->pLeft ){
++        sqliteExprCode(pParse, pExpr->pLeft);
++      }
++      for(i=0; i<nExpr; i=i+2){
++        sqliteExprCode(pParse, pExpr->pList->a[i].pExpr);
++        if( pExpr->pLeft ){
++          sqliteVdbeAddOp(v, OP_Dup, 1, 1);
++          jumpInst = sqliteVdbeAddOp(v, OP_Ne, 1, 0);
++          sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++        }else{
++          jumpInst = sqliteVdbeAddOp(v, OP_IfNot, 1, 0);
++        }
++        sqliteExprCode(pParse, pExpr->pList->a[i+1].pExpr);
++        sqliteVdbeAddOp(v, OP_Goto, 0, expr_end_label);
++        addr = sqliteVdbeCurrentAddr(v);
++        sqliteVdbeChangeP2(v, jumpInst, addr);
++      }
++      if( pExpr->pLeft ){
++        sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      }
++      if( pExpr->pRight ){
++        sqliteExprCode(pParse, pExpr->pRight);
++      }else{
++        sqliteVdbeAddOp(v, OP_String, 0, 0);
++      }
++      sqliteVdbeResolveLabel(v, expr_end_label);
++      break;
++    }
++    case TK_RAISE: {
++      if( !pParse->trigStack ){
++        sqliteErrorMsg(pParse,
++                       "RAISE() may only be used within a trigger-program");
++        pParse->nErr++;
++	return;
++      }
++      if( pExpr->iColumn == OE_Rollback ||
++	  pExpr->iColumn == OE_Abort ||
++	  pExpr->iColumn == OE_Fail ){
++	  sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn,
++                           pExpr->token.z, pExpr->token.n);
++	  sqliteVdbeDequoteP3(v, -1);
++      } else {
++	  assert( pExpr->iColumn == OE_Ignore );
++	  sqliteVdbeOp3(v, OP_Goto, 0, pParse->trigStack->ignoreJump,
++                           "(IGNORE jump)", 0);
++      }
++    }
++    break;
++  }
++}
++
++/*
++** Generate code that pushes the value of every element of the given
++** expression list onto the stack.  If the includeTypes flag is true,
++** then also push a string that is the datatype of each element onto
++** the stack after the value.
++**
++** Return the number of elements pushed onto the stack.
++*/
++int sqliteExprCodeExprList(
++  Parse *pParse,     /* Parsing context */
++  ExprList *pList,   /* The expression list to be coded */
++  int includeTypes   /* TRUE to put datatypes on the stack too */
++){
++  struct ExprList_item *pItem;
++  int i, n;
++  Vdbe *v;
++  if( pList==0 ) return 0;
++  v = sqliteGetVdbe(pParse);
++  n = pList->nExpr;
++  for(pItem=pList->a, i=0; i<n; i++, pItem++){
++    sqliteExprCode(pParse, pItem->pExpr);
++    if( includeTypes ){
++      sqliteVdbeOp3(v, OP_String, 0, 0, 
++         sqliteExprType(pItem->pExpr)==SQLITE_SO_NUM ? "numeric" : "text",
++         P3_STATIC);
++    }
++  }
++  return includeTypes ? n*2 : n;
++}
++
++/*
++** Generate code for a boolean expression such that a jump is made
++** to the label "dest" if the expression is true but execution
++** continues straight thru if the expression is false.
++**
++** If the expression evaluates to NULL (neither true nor false), then
++** take the jump if the jumpIfNull flag is true.
++*/
++void sqliteExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
++  Vdbe *v = pParse->pVdbe;
++  int op = 0;
++  if( v==0 || pExpr==0 ) return;
++  switch( pExpr->op ){
++    case TK_LT:       op = OP_Lt;       break;
++    case TK_LE:       op = OP_Le;       break;
++    case TK_GT:       op = OP_Gt;       break;
++    case TK_GE:       op = OP_Ge;       break;
++    case TK_NE:       op = OP_Ne;       break;
++    case TK_EQ:       op = OP_Eq;       break;
++    case TK_ISNULL:   op = OP_IsNull;   break;
++    case TK_NOTNULL:  op = OP_NotNull;  break;
++    default:  break;
++  }
++  switch( pExpr->op ){
++    case TK_AND: {
++      int d2 = sqliteVdbeMakeLabel(v);
++      sqliteExprIfFalse(pParse, pExpr->pLeft, d2, !jumpIfNull);
++      sqliteExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
++      sqliteVdbeResolveLabel(v, d2);
++      break;
++    }
++    case TK_OR: {
++      sqliteExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
++      sqliteExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
++      break;
++    }
++    case TK_NOT: {
++      sqliteExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
++      break;
++    }
++    case TK_LT:
++    case TK_LE:
++    case TK_GT:
++    case TK_GE:
++    case TK_NE:
++    case TK_EQ: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteExprCode(pParse, pExpr->pRight);
++      if( pParse->db->file_format>=4 && sqliteExprType(pExpr)==SQLITE_SO_TEXT ){
++        op += 6;  /* Convert numeric opcodes to text opcodes */
++      }
++      sqliteVdbeAddOp(v, op, jumpIfNull, dest);
++      break;
++    }
++    case TK_ISNULL:
++    case TK_NOTNULL: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteVdbeAddOp(v, op, 1, dest);
++      break;
++    }
++    case TK_IN: {
++      int addr;
++      sqliteExprCode(pParse, pExpr->pLeft);
++      addr = sqliteVdbeCurrentAddr(v);
++      sqliteVdbeAddOp(v, OP_NotNull, -1, addr+3);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      sqliteVdbeAddOp(v, OP_Goto, 0, jumpIfNull ? dest : addr+4);
++      if( pExpr->pSelect ){
++        sqliteVdbeAddOp(v, OP_Found, pExpr->iTable, dest);
++      }else{
++        sqliteVdbeAddOp(v, OP_SetFound, pExpr->iTable, dest);
++      }
++      break;
++    }
++    case TK_BETWEEN: {
++      int addr;
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++      sqliteExprCode(pParse, pExpr->pList->a[0].pExpr);
++      addr = sqliteVdbeAddOp(v, OP_Lt, !jumpIfNull, 0);
++      sqliteExprCode(pParse, pExpr->pList->a[1].pExpr);
++      sqliteVdbeAddOp(v, OP_Le, jumpIfNull, dest);
++      sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++      sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v));
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      break;
++    }
++    default: {
++      sqliteExprCode(pParse, pExpr);
++      sqliteVdbeAddOp(v, OP_If, jumpIfNull, dest);
++      break;
++    }
++  }
++}
++
++/*
++** Generate code for a boolean expression such that a jump is made
++** to the label "dest" if the expression is false but execution
++** continues straight thru if the expression is true.
++**
++** If the expression evaluates to NULL (neither true nor false) then
++** jump if jumpIfNull is true or fall through if jumpIfNull is false.
++*/
++void sqliteExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
++  Vdbe *v = pParse->pVdbe;
++  int op = 0;
++  if( v==0 || pExpr==0 ) return;
++  switch( pExpr->op ){
++    case TK_LT:       op = OP_Ge;       break;
++    case TK_LE:       op = OP_Gt;       break;
++    case TK_GT:       op = OP_Le;       break;
++    case TK_GE:       op = OP_Lt;       break;
++    case TK_NE:       op = OP_Eq;       break;
++    case TK_EQ:       op = OP_Ne;       break;
++    case TK_ISNULL:   op = OP_NotNull;  break;
++    case TK_NOTNULL:  op = OP_IsNull;   break;
++    default:  break;
++  }
++  switch( pExpr->op ){
++    case TK_AND: {
++      sqliteExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
++      sqliteExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
++      break;
++    }
++    case TK_OR: {
++      int d2 = sqliteVdbeMakeLabel(v);
++      sqliteExprIfTrue(pParse, pExpr->pLeft, d2, !jumpIfNull);
++      sqliteExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
++      sqliteVdbeResolveLabel(v, d2);
++      break;
++    }
++    case TK_NOT: {
++      sqliteExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
++      break;
++    }
++    case TK_LT:
++    case TK_LE:
++    case TK_GT:
++    case TK_GE:
++    case TK_NE:
++    case TK_EQ: {
++      if( pParse->db->file_format>=4 && sqliteExprType(pExpr)==SQLITE_SO_TEXT ){
++        /* Convert numeric comparison opcodes into text comparison opcodes.
++        ** This step depends on the fact that the text comparision opcodes are
++        ** always 6 greater than their corresponding numeric comparison
++        ** opcodes.
++        */
++        assert( OP_Eq+6 == OP_StrEq );
++        op += 6;
++      }
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteExprCode(pParse, pExpr->pRight);
++      sqliteVdbeAddOp(v, op, jumpIfNull, dest);
++      break;
++    }
++    case TK_ISNULL:
++    case TK_NOTNULL: {
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteVdbeAddOp(v, op, 1, dest);
++      break;
++    }
++    case TK_IN: {
++      int addr;
++      sqliteExprCode(pParse, pExpr->pLeft);
++      addr = sqliteVdbeCurrentAddr(v);
++      sqliteVdbeAddOp(v, OP_NotNull, -1, addr+3);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      sqliteVdbeAddOp(v, OP_Goto, 0, jumpIfNull ? dest : addr+4);
++      if( pExpr->pSelect ){
++        sqliteVdbeAddOp(v, OP_NotFound, pExpr->iTable, dest);
++      }else{
++        sqliteVdbeAddOp(v, OP_SetNotFound, pExpr->iTable, dest);
++      }
++      break;
++    }
++    case TK_BETWEEN: {
++      int addr;
++      sqliteExprCode(pParse, pExpr->pLeft);
++      sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++      sqliteExprCode(pParse, pExpr->pList->a[0].pExpr);
++      addr = sqliteVdbeCurrentAddr(v);
++      sqliteVdbeAddOp(v, OP_Ge, !jumpIfNull, addr+3);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      sqliteVdbeAddOp(v, OP_Goto, 0, dest);
++      sqliteExprCode(pParse, pExpr->pList->a[1].pExpr);
++      sqliteVdbeAddOp(v, OP_Gt, jumpIfNull, dest);
++      break;
++    }
++    default: {
++      sqliteExprCode(pParse, pExpr);
++      sqliteVdbeAddOp(v, OP_IfNot, jumpIfNull, dest);
++      break;
++    }
++  }
++}
++
++/*
++** Do a deep comparison of two expression trees.  Return TRUE (non-zero)
++** if they are identical and return FALSE if they differ in any way.
++*/
++int sqliteExprCompare(Expr *pA, Expr *pB){
++  int i;
++  if( pA==0 ){
++    return pB==0;
++  }else if( pB==0 ){
++    return 0;
++  }
++  if( pA->op!=pB->op ) return 0;
++  if( !sqliteExprCompare(pA->pLeft, pB->pLeft) ) return 0;
++  if( !sqliteExprCompare(pA->pRight, pB->pRight) ) return 0;
++  if( pA->pList ){
++    if( pB->pList==0 ) return 0;
++    if( pA->pList->nExpr!=pB->pList->nExpr ) return 0;
++    for(i=0; i<pA->pList->nExpr; i++){
++      if( !sqliteExprCompare(pA->pList->a[i].pExpr, pB->pList->a[i].pExpr) ){
++        return 0;
++      }
++    }
++  }else if( pB->pList ){
++    return 0;
++  }
++  if( pA->pSelect || pB->pSelect ) return 0;
++  if( pA->iTable!=pB->iTable || pA->iColumn!=pB->iColumn ) return 0;
++  if( pA->token.z ){
++    if( pB->token.z==0 ) return 0;
++    if( pB->token.n!=pA->token.n ) return 0;
++    if( sqliteStrNICmp(pA->token.z, pB->token.z, pB->token.n)!=0 ) return 0;
++  }
++  return 1;
++}
++
++/*
++** Add a new element to the pParse->aAgg[] array and return its index.
++*/
++static int appendAggInfo(Parse *pParse){
++  if( (pParse->nAgg & 0x7)==0 ){
++    int amt = pParse->nAgg + 8;
++    AggExpr *aAgg = sqliteRealloc(pParse->aAgg, amt*sizeof(pParse->aAgg[0]));
++    if( aAgg==0 ){
++      return -1;
++    }
++    pParse->aAgg = aAgg;
++  }
++  memset(&pParse->aAgg[pParse->nAgg], 0, sizeof(pParse->aAgg[0]));
++  return pParse->nAgg++;
++}
++
++/*
++** Analyze the given expression looking for aggregate functions and
++** for variables that need to be added to the pParse->aAgg[] array.
++** Make additional entries to the pParse->aAgg[] array as necessary.
++**
++** This routine should only be called after the expression has been
++** analyzed by sqliteExprResolveIds() and sqliteExprCheck().
++**
++** If errors are seen, leave an error message in zErrMsg and return
++** the number of errors.
++*/
++int sqliteExprAnalyzeAggregates(Parse *pParse, Expr *pExpr){
++  int i;
++  AggExpr *aAgg;
++  int nErr = 0;
++
++  if( pExpr==0 ) return 0;
++  switch( pExpr->op ){
++    case TK_COLUMN: {
++      aAgg = pParse->aAgg;
++      for(i=0; i<pParse->nAgg; i++){
++        if( aAgg[i].isAgg ) continue;
++        if( aAgg[i].pExpr->iTable==pExpr->iTable
++         && aAgg[i].pExpr->iColumn==pExpr->iColumn ){
++          break;
++        }
++      }
++      if( i>=pParse->nAgg ){
++        i = appendAggInfo(pParse);
++        if( i<0 ) return 1;
++        pParse->aAgg[i].isAgg = 0;
++        pParse->aAgg[i].pExpr = pExpr;
++      }
++      pExpr->iAgg = i;
++      break;
++    }
++    case TK_AGG_FUNCTION: {
++      aAgg = pParse->aAgg;
++      for(i=0; i<pParse->nAgg; i++){
++        if( !aAgg[i].isAgg ) continue;
++        if( sqliteExprCompare(aAgg[i].pExpr, pExpr) ){
++          break;
++        }
++      }
++      if( i>=pParse->nAgg ){
++        i = appendAggInfo(pParse);
++        if( i<0 ) return 1;
++        pParse->aAgg[i].isAgg = 1;
++        pParse->aAgg[i].pExpr = pExpr;
++        pParse->aAgg[i].pFunc = sqliteFindFunction(pParse->db,
++             pExpr->token.z, pExpr->token.n,
++             pExpr->pList ? pExpr->pList->nExpr : 0, 0);
++      }
++      pExpr->iAgg = i;
++      break;
++    }
++    default: {
++      if( pExpr->pLeft ){
++        nErr = sqliteExprAnalyzeAggregates(pParse, pExpr->pLeft);
++      }
++      if( nErr==0 && pExpr->pRight ){
++        nErr = sqliteExprAnalyzeAggregates(pParse, pExpr->pRight);
++      }
++      if( nErr==0 && pExpr->pList ){
++        int n = pExpr->pList->nExpr;
++        int i;
++        for(i=0; nErr==0 && i<n; i++){
++          nErr = sqliteExprAnalyzeAggregates(pParse, pExpr->pList->a[i].pExpr);
++        }
++      }
++      break;
++    }
++  }
++  return nErr;
++}
++
++/*
++** Locate a user function given a name and a number of arguments.
++** Return a pointer to the FuncDef structure that defines that
++** function, or return NULL if the function does not exist.
++**
++** If the createFlag argument is true, then a new (blank) FuncDef
++** structure is created and liked into the "db" structure if a
++** no matching function previously existed.  When createFlag is true
++** and the nArg parameter is -1, then only a function that accepts
++** any number of arguments will be returned.
++**
++** If createFlag is false and nArg is -1, then the first valid
++** function found is returned.  A function is valid if either xFunc
++** or xStep is non-zero.
++*/
++FuncDef *sqliteFindFunction(
++  sqlite *db,        /* An open database */
++  const char *zName, /* Name of the function.  Not null-terminated */
++  int nName,         /* Number of characters in the name */
++  int nArg,          /* Number of arguments.  -1 means any number */
++  int createFlag     /* Create new entry if true and does not otherwise exist */
++){
++  FuncDef *pFirst, *p, *pMaybe;
++  pFirst = p = (FuncDef*)sqliteHashFind(&db->aFunc, zName, nName);
++  if( p && !createFlag && nArg<0 ){
++    while( p && p->xFunc==0 && p->xStep==0 ){ p = p->pNext; }
++    return p;
++  }
++  pMaybe = 0;
++  while( p && p->nArg!=nArg ){
++    if( p->nArg<0 && !createFlag && (p->xFunc || p->xStep) ) pMaybe = p;
++    p = p->pNext;
++  }
++  if( p && !createFlag && p->xFunc==0 && p->xStep==0 ){
++    return 0;
++  }
++  if( p==0 && pMaybe ){
++    assert( createFlag==0 );
++    return pMaybe;
++  }
++  if( p==0 && createFlag && (p = sqliteMalloc(sizeof(*p)))!=0 ){
++    p->nArg = nArg;
++    p->pNext = pFirst;
++    p->dataType = pFirst ? pFirst->dataType : SQLITE_NUMERIC;
++    sqliteHashInsert(&db->aFunc, zName, nName, (void*)p);
++  }
++  return p;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/func.c
+@@ -0,0 +1,658 @@
++/*
++** 2002 February 23
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains the C functions that implement various SQL
++** functions of SQLite.  
++**
++** There is only one exported symbol in this file - the function
++** sqliteRegisterBuildinFunctions() found at the bottom of the file.
++** All other code has file scope.
++**
++** $Id$
++*/
++#include <ctype.h>
++#include <math.h>
++#include <stdlib.h>
++#include <assert.h>
++#include "sqliteInt.h"
++#include "os.h"
++
++/*
++** Implementation of the non-aggregate min() and max() functions
++*/
++static void minmaxFunc(sqlite_func *context, int argc, const char **argv){
++  const char *zBest; 
++  int i;
++  int (*xCompare)(const char*, const char*);
++  int mask;    /* 0 for min() or 0xffffffff for max() */
++
++  if( argc==0 ) return;
++  mask = (int)sqlite_user_data(context);
++  zBest = argv[0];
++  if( zBest==0 ) return;
++  if( argv[1][0]=='n' ){
++    xCompare = sqliteCompare;
++  }else{
++    xCompare = strcmp;
++  }
++  for(i=2; i<argc; i+=2){
++    if( argv[i]==0 ) return;
++    if( (xCompare(argv[i], zBest)^mask)<0 ){
++      zBest = argv[i];
++    }
++  }
++  sqlite_set_result_string(context, zBest, -1);
++}
++
++/*
++** Return the type of the argument.
++*/
++static void typeofFunc(sqlite_func *context, int argc, const char **argv){
++  assert( argc==2 );
++  sqlite_set_result_string(context, argv[1], -1);
++}
++
++/*
++** Implementation of the length() function
++*/
++static void lengthFunc(sqlite_func *context, int argc, const char **argv){
++  const char *z;
++  int len;
++
++  assert( argc==1 );
++  z = argv[0];
++  if( z==0 ) return;
++#ifdef SQLITE_UTF8
++  for(len=0; *z; z++){ if( (0xc0&*z)!=0x80 ) len++; }
++#else
++  len = strlen(z);
++#endif
++  sqlite_set_result_int(context, len);
++}
++
++/*
++** Implementation of the abs() function
++*/
++static void absFunc(sqlite_func *context, int argc, const char **argv){
++  const char *z;
++  assert( argc==1 );
++  z = argv[0];
++  if( z==0 ) return;
++  if( z[0]=='-' && isdigit(z[1]) ) z++;
++  sqlite_set_result_string(context, z, -1);
++}
++
++/*
++** Implementation of the substr() function
++*/
++static void substrFunc(sqlite_func *context, int argc, const char **argv){
++  const char *z;
++#ifdef SQLITE_UTF8
++  const char *z2;
++  int i;
++#endif
++  int p1, p2, len;
++  assert( argc==3 );
++  z = argv[0];
++  if( z==0 ) return;
++  p1 = atoi(argv[1]?argv[1]:0);
++  p2 = atoi(argv[2]?argv[2]:0);
++#ifdef SQLITE_UTF8
++  for(len=0, z2=z; *z2; z2++){ if( (0xc0&*z2)!=0x80 ) len++; }
++#else
++  len = strlen(z);
++#endif
++  if( p1<0 ){
++    p1 += len;
++    if( p1<0 ){
++      p2 += p1;
++      p1 = 0;
++    }
++  }else if( p1>0 ){
++    p1--;
++  }
++  if( p1+p2>len ){
++    p2 = len-p1;
++  }
++#ifdef SQLITE_UTF8
++  for(i=0; i<p1 && z[i]; i++){
++    if( (z[i]&0xc0)==0x80 ) p1++;
++  }
++  while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p1++; }
++  for(; i<p1+p2 && z[i]; i++){
++    if( (z[i]&0xc0)==0x80 ) p2++;
++  }
++  while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p2++; }
++#endif
++  if( p2<0 ) p2 = 0;
++  sqlite_set_result_string(context, &z[p1], p2);
++}
++
++/*
++** Implementation of the round() function
++*/
++static void roundFunc(sqlite_func *context, int argc, const char **argv){
++  int n;
++  double r;
++  char zBuf[100];
++  assert( argc==1 || argc==2 );
++  if( argv[0]==0 || (argc==2 && argv[1]==0) ) return;
++  n = argc==2 ? atoi(argv[1]) : 0;
++  if( n>30 ) n = 30;
++  if( n<0 ) n = 0;
++  r = sqliteAtoF(argv[0], 0);
++  sprintf(zBuf,"%.*f",n,r);
++  sqlite_set_result_string(context, zBuf, -1);
++}
++
++/*
++** Implementation of the upper() and lower() SQL functions.
++*/
++static void upperFunc(sqlite_func *context, int argc, const char **argv){
++  unsigned char *z;
++  int i;
++  if( argc<1 || argv[0]==0 ) return;
++  z = (unsigned char*)sqlite_set_result_string(context, argv[0], -1);
++  if( z==0 ) return;
++  for(i=0; z[i]; i++){
++    if( islower(z[i]) ) z[i] = toupper(z[i]);
++  }
++}
++static void lowerFunc(sqlite_func *context, int argc, const char **argv){
++  unsigned char *z;
++  int i;
++  if( argc<1 || argv[0]==0 ) return;
++  z = (unsigned char*)sqlite_set_result_string(context, argv[0], -1);
++  if( z==0 ) return;
++  for(i=0; z[i]; i++){
++    if( isupper(z[i]) ) z[i] = tolower(z[i]);
++  }
++}
++
++/*
++** Implementation of the IFNULL(), NVL(), and COALESCE() functions.  
++** All three do the same thing.  They return the first non-NULL
++** argument.
++*/
++static void ifnullFunc(sqlite_func *context, int argc, const char **argv){
++  int i;
++  for(i=0; i<argc; i++){
++    if( argv[i] ){
++      sqlite_set_result_string(context, argv[i], -1);
++      break;
++    }
++  }
++}
++
++/*
++** Implementation of random().  Return a random integer.  
++*/
++static void randomFunc(sqlite_func *context, int argc, const char **argv){
++  int r;
++  sqliteRandomness(sizeof(r), &r);
++  sqlite_set_result_int(context, r);
++}
++
++/*
++** Implementation of the last_insert_rowid() SQL function.  The return
++** value is the same as the sqlite_last_insert_rowid() API function.
++*/
++static void last_insert_rowid(sqlite_func *context, int arg, const char **argv){
++  sqlite *db = sqlite_user_data(context);
++  sqlite_set_result_int(context, sqlite_last_insert_rowid(db));
++}
++
++/*
++** Implementation of the change_count() SQL function.  The return
++** value is the same as the sqlite_changes() API function.
++*/
++static void change_count(sqlite_func *context, int arg, const char **argv){
++  sqlite *db = sqlite_user_data(context);
++  sqlite_set_result_int(context, sqlite_changes(db));
++}
++
++/*
++** Implementation of the last_statement_change_count() SQL function.  The
++** return value is the same as the sqlite_last_statement_changes() API function.
++*/
++static void last_statement_change_count(sqlite_func *context, int arg,
++                                        const char **argv){
++  sqlite *db = sqlite_user_data(context);
++  sqlite_set_result_int(context, sqlite_last_statement_changes(db));
++}
++
++/*
++** Implementation of the like() SQL function.  This function implements
++** the build-in LIKE operator.  The first argument to the function is the
++** string and the second argument is the pattern.  So, the SQL statements:
++**
++**       A LIKE B
++**
++** is implemented as like(A,B).
++*/
++static void likeFunc(sqlite_func *context, int arg, const char **argv){
++  if( argv[0]==0 || argv[1]==0 ) return;
++  sqlite_set_result_int(context, 
++    sqliteLikeCompare((const unsigned char*)argv[0],
++                      (const unsigned char*)argv[1]));
++}
++
++/*
++** Implementation of the glob() SQL function.  This function implements
++** the build-in GLOB operator.  The first argument to the function is the
++** string and the second argument is the pattern.  So, the SQL statements:
++**
++**       A GLOB B
++**
++** is implemented as glob(A,B).
++*/
++static void globFunc(sqlite_func *context, int arg, const char **argv){
++  if( argv[0]==0 || argv[1]==0 ) return;
++  sqlite_set_result_int(context,
++    sqliteGlobCompare((const unsigned char*)argv[0],
++                      (const unsigned char*)argv[1]));
++}
++
++/*
++** Implementation of the NULLIF(x,y) function.  The result is the first
++** argument if the arguments are different.  The result is NULL if the
++** arguments are equal to each other.
++*/
++static void nullifFunc(sqlite_func *context, int argc, const char **argv){
++  if( argv[0]!=0 && sqliteCompare(argv[0],argv[1])!=0 ){
++    sqlite_set_result_string(context, argv[0], -1);
++  }
++}
++
++/*
++** Implementation of the VERSION(*) function.  The result is the version
++** of the SQLite library that is running.
++*/
++static void versionFunc(sqlite_func *context, int argc, const char **argv){
++  sqlite_set_result_string(context, sqlite_version, -1);
++}
++
++/*
++** EXPERIMENTAL - This is not an official function.  The interface may
++** change.  This function may disappear.  Do not write code that depends
++** on this function.
++**
++** Implementation of the QUOTE() function.  This function takes a single
++** argument.  If the argument is numeric, the return value is the same as
++** the argument.  If the argument is NULL, the return value is the string
++** "NULL".  Otherwise, the argument is enclosed in single quotes with
++** single-quote escapes.
++*/
++static void quoteFunc(sqlite_func *context, int argc, const char **argv){
++  if( argc<1 ) return;
++  if( argv[0]==0 ){
++    sqlite_set_result_string(context, "NULL", 4);
++  }else if( sqliteIsNumber(argv[0]) ){
++    sqlite_set_result_string(context, argv[0], -1);
++  }else{
++    int i,j,n;
++    char *z;
++    for(i=n=0; argv[0][i]; i++){ if( argv[0][i]=='\'' ) n++; }
++    z = sqliteMalloc( i+n+3 );
++    if( z==0 ) return;
++    z[0] = '\'';
++    for(i=0, j=1; argv[0][i]; i++){
++      z[j++] = argv[0][i];
++      if( argv[0][i]=='\'' ){
++        z[j++] = '\'';
++      }
++    }
++    z[j++] = '\'';
++    z[j] = 0;
++    sqlite_set_result_string(context, z, j);
++    sqliteFree(z);
++  }
++}
++
++#ifdef SQLITE_SOUNDEX
++/*
++** Compute the soundex encoding of a word.
++*/
++static void soundexFunc(sqlite_func *context, int argc, const char **argv){
++  char zResult[8];
++  const char *zIn;
++  int i, j;
++  static const unsigned char iCode[] = {
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++    0, 0, 1, 2, 3, 0, 1, 2, 0, 0, 2, 2, 4, 5, 5, 0,
++    1, 2, 6, 2, 3, 0, 1, 0, 2, 0, 2, 0, 0, 0, 0, 0,
++    0, 0, 1, 2, 3, 0, 1, 2, 0, 0, 2, 2, 4, 5, 5, 0,
++    1, 2, 6, 2, 3, 0, 1, 0, 2, 0, 2, 0, 0, 0, 0, 0,
++  };
++  assert( argc==1 );
++  zIn = argv[0];
++  for(i=0; zIn[i] && !isalpha(zIn[i]); i++){}
++  if( zIn[i] ){
++    zResult[0] = toupper(zIn[i]);
++    for(j=1; j<4 && zIn[i]; i++){
++      int code = iCode[zIn[i]&0x7f];
++      if( code>0 ){
++        zResult[j++] = code + '0';
++      }
++    }
++    while( j<4 ){
++      zResult[j++] = '0';
++    }
++    zResult[j] = 0;
++    sqlite_set_result_string(context, zResult, 4);
++  }else{
++    sqlite_set_result_string(context, "?000", 4);
++  }
++}
++#endif
++
++#ifdef SQLITE_TEST
++/*
++** This function generates a string of random characters.  Used for
++** generating test data.
++*/
++static void randStr(sqlite_func *context, int argc, const char **argv){
++  static const unsigned char zSrc[] = 
++     "abcdefghijklmnopqrstuvwxyz"
++     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
++     "0123456789"
++     ".-!,:*^+=_|?/<> ";
++  int iMin, iMax, n, r, i;
++  unsigned char zBuf[1000];
++  if( argc>=1 ){
++    iMin = atoi(argv[0]);
++    if( iMin<0 ) iMin = 0;
++    if( iMin>=sizeof(zBuf) ) iMin = sizeof(zBuf)-1;
++  }else{
++    iMin = 1;
++  }
++  if( argc>=2 ){
++    iMax = atoi(argv[1]);
++    if( iMax<iMin ) iMax = iMin;
++    if( iMax>=sizeof(zBuf) ) iMax = sizeof(zBuf)-1;
++  }else{
++    iMax = 50;
++  }
++  n = iMin;
++  if( iMax>iMin ){
++    sqliteRandomness(sizeof(r), &r);
++    r &= 0x7fffffff;
++    n += r%(iMax + 1 - iMin);
++  }
++  assert( n<sizeof(zBuf) );
++  sqliteRandomness(n, zBuf);
++  for(i=0; i<n; i++){
++    zBuf[i] = zSrc[zBuf[i]%(sizeof(zSrc)-1)];
++  }
++  zBuf[n] = 0;
++  sqlite_set_result_string(context, zBuf, n);
++}
++#endif
++
++/*
++** An instance of the following structure holds the context of a
++** sum() or avg() aggregate computation.
++*/
++typedef struct SumCtx SumCtx;
++struct SumCtx {
++  double sum;     /* Sum of terms */
++  int cnt;        /* Number of elements summed */
++};
++
++/*
++** Routines used to compute the sum or average.
++*/
++static void sumStep(sqlite_func *context, int argc, const char **argv){
++  SumCtx *p;
++  if( argc<1 ) return;
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  if( p && argv[0] ){
++    p->sum += sqliteAtoF(argv[0], 0);
++    p->cnt++;
++  }
++}
++static void sumFinalize(sqlite_func *context){
++  SumCtx *p;
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  sqlite_set_result_double(context, p ? p->sum : 0.0);
++}
++static void avgFinalize(sqlite_func *context){
++  SumCtx *p;
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  if( p && p->cnt>0 ){
++    sqlite_set_result_double(context, p->sum/(double)p->cnt);
++  }
++}
++
++/*
++** An instance of the following structure holds the context of a
++** variance or standard deviation computation.
++*/
++typedef struct StdDevCtx StdDevCtx;
++struct StdDevCtx {
++  double sum;     /* Sum of terms */
++  double sum2;    /* Sum of the squares of terms */
++  int cnt;        /* Number of terms counted */
++};
++
++#if 0   /* Omit because math library is required */
++/*
++** Routines used to compute the standard deviation as an aggregate.
++*/
++static void stdDevStep(sqlite_func *context, int argc, const char **argv){
++  StdDevCtx *p;
++  double x;
++  if( argc<1 ) return;
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  if( p && argv[0] ){
++    x = sqliteAtoF(argv[0], 0);
++    p->sum += x;
++    p->sum2 += x*x;
++    p->cnt++;
++  }
++}
++static void stdDevFinalize(sqlite_func *context){
++  double rN = sqlite_aggregate_count(context);
++  StdDevCtx *p = sqlite_aggregate_context(context, sizeof(*p));
++  if( p && p->cnt>1 ){
++    double rCnt = cnt;
++    sqlite_set_result_double(context, 
++       sqrt((p->sum2 - p->sum*p->sum/rCnt)/(rCnt-1.0)));
++  }
++}
++#endif
++
++/*
++** The following structure keeps track of state information for the
++** count() aggregate function.
++*/
++typedef struct CountCtx CountCtx;
++struct CountCtx {
++  int n;
++};
++
++/*
++** Routines to implement the count() aggregate function.
++*/
++static void countStep(sqlite_func *context, int argc, const char **argv){
++  CountCtx *p;
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  if( (argc==0 || argv[0]) && p ){
++    p->n++;
++  }
++}   
++static void countFinalize(sqlite_func *context){
++  CountCtx *p;
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  sqlite_set_result_int(context, p ? p->n : 0);
++}
++
++/*
++** This function tracks state information for the min() and max()
++** aggregate functions.
++*/
++typedef struct MinMaxCtx MinMaxCtx;
++struct MinMaxCtx {
++  char *z;         /* The best so far */
++  char zBuf[28];   /* Space that can be used for storage */
++};
++
++/*
++** Routines to implement min() and max() aggregate functions.
++*/
++static void minmaxStep(sqlite_func *context, int argc, const char **argv){
++  MinMaxCtx *p;
++  int (*xCompare)(const char*, const char*);
++  int mask;    /* 0 for min() or 0xffffffff for max() */
++
++  assert( argc==2 );
++  if( argv[0]==0 ) return;  /* Ignore NULL values */
++  if( argv[1][0]=='n' ){
++    xCompare = sqliteCompare;
++  }else{
++    xCompare = strcmp;
++  }
++  mask = (int)sqlite_user_data(context);
++  assert( mask==0 || mask==-1 );
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  if( p==0 || argc<1 ) return;
++  if( p->z==0 || (xCompare(argv[0],p->z)^mask)<0 ){
++    int len;
++    if( p->zBuf[0] ){
++      sqliteFree(p->z);
++    }
++    len = strlen(argv[0]);
++    if( len < sizeof(p->zBuf)-1 ){
++      p->z = &p->zBuf[1];
++      p->zBuf[0] = 0;
++    }else{
++      p->z = sqliteMalloc( len+1 );
++      p->zBuf[0] = 1;
++      if( p->z==0 ) return;
++    }
++    strcpy(p->z, argv[0]);
++  }
++}
++static void minMaxFinalize(sqlite_func *context){
++  MinMaxCtx *p;
++  p = sqlite_aggregate_context(context, sizeof(*p));
++  if( p && p->z && p->zBuf[0]<2 ){
++    sqlite_set_result_string(context, p->z, strlen(p->z));
++  }
++  if( p && p->zBuf[0] ){
++    sqliteFree(p->z);
++  }
++}
++
++/*
++** This function registered all of the above C functions as SQL
++** functions.  This should be the only routine in this file with
++** external linkage.
++*/
++void sqliteRegisterBuiltinFunctions(sqlite *db){
++  static struct {
++     char *zName;
++     signed char nArg;
++     signed char dataType;
++     u8 argType;               /* 0: none.  1: db  2: (-1) */
++     void (*xFunc)(sqlite_func*,int,const char**);
++  } aFuncs[] = {
++    { "min",       -1, SQLITE_ARGS,    0, minmaxFunc },
++    { "min",        0, 0,              0, 0          },
++    { "max",       -1, SQLITE_ARGS,    2, minmaxFunc },
++    { "max",        0, 0,              2, 0          },
++    { "typeof",     1, SQLITE_TEXT,    0, typeofFunc },
++    { "length",     1, SQLITE_NUMERIC, 0, lengthFunc },
++    { "substr",     3, SQLITE_TEXT,    0, substrFunc },
++    { "abs",        1, SQLITE_NUMERIC, 0, absFunc    },
++    { "round",      1, SQLITE_NUMERIC, 0, roundFunc  },
++    { "round",      2, SQLITE_NUMERIC, 0, roundFunc  },
++    { "upper",      1, SQLITE_TEXT,    0, upperFunc  },
++    { "lower",      1, SQLITE_TEXT,    0, lowerFunc  },
++    { "coalesce",  -1, SQLITE_ARGS,    0, ifnullFunc },
++    { "coalesce",   0, 0,              0, 0          },
++    { "coalesce",   1, 0,              0, 0          },
++    { "ifnull",     2, SQLITE_ARGS,    0, ifnullFunc },
++    { "random",    -1, SQLITE_NUMERIC, 0, randomFunc },
++    { "like",       2, SQLITE_NUMERIC, 0, likeFunc   },
++    { "glob",       2, SQLITE_NUMERIC, 0, globFunc   },
++    { "nullif",     2, SQLITE_ARGS,    0, nullifFunc },
++    { "sqlite_version",0,SQLITE_TEXT,  0, versionFunc},
++    { "quote",      1, SQLITE_ARGS,    0, quoteFunc  },
++    { "last_insert_rowid", 0, SQLITE_NUMERIC, 1, last_insert_rowid },
++    { "change_count",      0, SQLITE_NUMERIC, 1, change_count      },
++    { "last_statement_change_count",
++                           0, SQLITE_NUMERIC, 1, last_statement_change_count },
++#ifdef SQLITE_SOUNDEX
++    { "soundex",    1, SQLITE_TEXT,    0, soundexFunc},
++#endif
++#ifdef SQLITE_TEST
++    { "randstr",    2, SQLITE_TEXT,    0, randStr    },
++#endif
++  };
++  static struct {
++    char *zName;
++    signed char nArg;
++    signed char dataType;
++    u8 argType;
++    void (*xStep)(sqlite_func*,int,const char**);
++    void (*xFinalize)(sqlite_func*);
++  } aAggs[] = {
++    { "min",    1, 0,              0, minmaxStep,   minMaxFinalize },
++    { "max",    1, 0,              2, minmaxStep,   minMaxFinalize },
++    { "sum",    1, SQLITE_NUMERIC, 0, sumStep,      sumFinalize    },
++    { "avg",    1, SQLITE_NUMERIC, 0, sumStep,      avgFinalize    },
++    { "count",  0, SQLITE_NUMERIC, 0, countStep,    countFinalize  },
++    { "count",  1, SQLITE_NUMERIC, 0, countStep,    countFinalize  },
++#if 0
++    { "stddev", 1, SQLITE_NUMERIC, 0, stdDevStep,   stdDevFinalize },
++#endif
++  };
++  static const char *azTypeFuncs[] = { "min", "max", "typeof" };
++  int i;
++
++  for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
++    void *pArg;
++    switch( aFuncs[i].argType ){
++      case 0:  pArg = 0;           break;
++      case 1:  pArg = db;          break;
++      case 2:  pArg = (void*)(-1); break;
++    }
++    sqlite_create_function(db, aFuncs[i].zName,
++           aFuncs[i].nArg, aFuncs[i].xFunc, pArg);
++    if( aFuncs[i].xFunc ){
++      sqlite_function_type(db, aFuncs[i].zName, aFuncs[i].dataType);
++    }
++  }
++  for(i=0; i<sizeof(aAggs)/sizeof(aAggs[0]); i++){
++    void *pArg;
++    switch( aAggs[i].argType ){
++      case 0:  pArg = 0;           break;
++      case 1:  pArg = db;          break;
++      case 2:  pArg = (void*)(-1); break;
++    }
++    sqlite_create_aggregate(db, aAggs[i].zName,
++           aAggs[i].nArg, aAggs[i].xStep, aAggs[i].xFinalize, pArg);
++    sqlite_function_type(db, aAggs[i].zName, aAggs[i].dataType);
++  }
++  for(i=0; i<sizeof(azTypeFuncs)/sizeof(azTypeFuncs[0]); i++){
++    int n = strlen(azTypeFuncs[i]);
++    FuncDef *p = sqliteHashFind(&db->aFunc, azTypeFuncs[i], n);
++    while( p ){
++      p->includeTypes = 1;
++      p = p->pNext;
++    }
++  }
++  sqliteRegisterDateTimeFunctions(db);
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/hash.c
+@@ -0,0 +1,356 @@
++/*
++** 2001 September 22
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This is the implementation of generic hash-tables
++** used in SQLite.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include <assert.h>
++
++/* Turn bulk memory into a hash table object by initializing the
++** fields of the Hash structure.
++**
++** "new" is a pointer to the hash table that is to be initialized.
++** keyClass is one of the constants SQLITE_HASH_INT, SQLITE_HASH_POINTER,
++** SQLITE_HASH_BINARY, or SQLITE_HASH_STRING.  The value of keyClass 
++** determines what kind of key the hash table will use.  "copyKey" is
++** true if the hash table should make its own private copy of keys and
++** false if it should just use the supplied pointer.  CopyKey only makes
++** sense for SQLITE_HASH_STRING and SQLITE_HASH_BINARY and is ignored
++** for other key classes.
++*/
++void sqliteHashInit(Hash *new, int keyClass, int copyKey){
++  assert( new!=0 );
++  assert( keyClass>=SQLITE_HASH_INT && keyClass<=SQLITE_HASH_BINARY );
++  new->keyClass = keyClass;
++  new->copyKey = copyKey &&
++                (keyClass==SQLITE_HASH_STRING || keyClass==SQLITE_HASH_BINARY);
++  new->first = 0;
++  new->count = 0;
++  new->htsize = 0;
++  new->ht = 0;
++}
++
++/* Remove all entries from a hash table.  Reclaim all memory.
++** Call this routine to delete a hash table or to reset a hash table
++** to the empty state.
++*/
++void sqliteHashClear(Hash *pH){
++  HashElem *elem;         /* For looping over all elements of the table */
++
++  assert( pH!=0 );
++  elem = pH->first;
++  pH->first = 0;
++  if( pH->ht ) sqliteFree(pH->ht);
++  pH->ht = 0;
++  pH->htsize = 0;
++  while( elem ){
++    HashElem *next_elem = elem->next;
++    if( pH->copyKey && elem->pKey ){
++      sqliteFree(elem->pKey);
++    }
++    sqliteFree(elem);
++    elem = next_elem;
++  }
++  pH->count = 0;
++}
++
++/*
++** Hash and comparison functions when the mode is SQLITE_HASH_INT
++*/
++static int intHash(const void *pKey, int nKey){
++  return nKey ^ (nKey<<8) ^ (nKey>>8);
++}
++static int intCompare(const void *pKey1, int n1, const void *pKey2, int n2){
++  return n2 - n1;
++}
++
++#if 0 /* NOT USED */
++/*
++** Hash and comparison functions when the mode is SQLITE_HASH_POINTER
++*/
++static int ptrHash(const void *pKey, int nKey){
++  uptr x = Addr(pKey);
++  return x ^ (x<<8) ^ (x>>8);
++}
++static int ptrCompare(const void *pKey1, int n1, const void *pKey2, int n2){
++  if( pKey1==pKey2 ) return 0;
++  if( pKey1<pKey2 ) return -1;
++  return 1;
++}
++#endif
++
++/*
++** Hash and comparison functions when the mode is SQLITE_HASH_STRING
++*/
++static int strHash(const void *pKey, int nKey){
++  return sqliteHashNoCase((const char*)pKey, nKey); 
++}
++static int strCompare(const void *pKey1, int n1, const void *pKey2, int n2){
++  if( n1!=n2 ) return n2-n1;
++  return sqliteStrNICmp((const char*)pKey1,(const char*)pKey2,n1);
++}
++
++/*
++** Hash and comparison functions when the mode is SQLITE_HASH_BINARY
++*/
++static int binHash(const void *pKey, int nKey){
++  int h = 0;
++  const char *z = (const char *)pKey;
++  while( nKey-- > 0 ){
++    h = (h<<3) ^ h ^ *(z++);
++  }
++  return h & 0x7fffffff;
++}
++static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){
++  if( n1!=n2 ) return n2-n1;
++  return memcmp(pKey1,pKey2,n1);
++}
++
++/*
++** Return a pointer to the appropriate hash function given the key class.
++**
++** The C syntax in this function definition may be unfamilar to some 
++** programmers, so we provide the following additional explanation:
++**
++** The name of the function is "hashFunction".  The function takes a
++** single parameter "keyClass".  The return value of hashFunction()
++** is a pointer to another function.  Specifically, the return value
++** of hashFunction() is a pointer to a function that takes two parameters
++** with types "const void*" and "int" and returns an "int".
++*/
++static int (*hashFunction(int keyClass))(const void*,int){
++  switch( keyClass ){
++    case SQLITE_HASH_INT:     return &intHash;
++    /* case SQLITE_HASH_POINTER: return &ptrHash; // NOT USED */
++    case SQLITE_HASH_STRING:  return &strHash;
++    case SQLITE_HASH_BINARY:  return &binHash;;
++    default: break;
++  }
++  return 0;
++}
++
++/*
++** Return a pointer to the appropriate hash function given the key class.
++**
++** For help in interpreted the obscure C code in the function definition,
++** see the header comment on the previous function.
++*/
++static int (*compareFunction(int keyClass))(const void*,int,const void*,int){
++  switch( keyClass ){
++    case SQLITE_HASH_INT:     return &intCompare;
++    /* case SQLITE_HASH_POINTER: return &ptrCompare; // NOT USED */
++    case SQLITE_HASH_STRING:  return &strCompare;
++    case SQLITE_HASH_BINARY:  return &binCompare;
++    default: break;
++  }
++  return 0;
++}
++
++
++/* Resize the hash table so that it cantains "new_size" buckets.
++** "new_size" must be a power of 2.  The hash table might fail 
++** to resize if sqliteMalloc() fails.
++*/
++static void rehash(Hash *pH, int new_size){
++  struct _ht *new_ht;            /* The new hash table */
++  HashElem *elem, *next_elem;    /* For looping over existing elements */
++  HashElem *x;                   /* Element being copied to new hash table */
++  int (*xHash)(const void*,int); /* The hash function */
++
++  assert( (new_size & (new_size-1))==0 );
++  new_ht = (struct _ht *)sqliteMalloc( new_size*sizeof(struct _ht) );
++  if( new_ht==0 ) return;
++  if( pH->ht ) sqliteFree(pH->ht);
++  pH->ht = new_ht;
++  pH->htsize = new_size;
++  xHash = hashFunction(pH->keyClass);
++  for(elem=pH->first, pH->first=0; elem; elem = next_elem){
++    int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
++    next_elem = elem->next;
++    x = new_ht[h].chain;
++    if( x ){
++      elem->next = x;
++      elem->prev = x->prev;
++      if( x->prev ) x->prev->next = elem;
++      else          pH->first = elem;
++      x->prev = elem;
++    }else{
++      elem->next = pH->first;
++      if( pH->first ) pH->first->prev = elem;
++      elem->prev = 0;
++      pH->first = elem;
++    }
++    new_ht[h].chain = elem;
++    new_ht[h].count++;
++  }
++}
++
++/* This function (for internal use only) locates an element in an
++** hash table that matches the given key.  The hash for this key has
++** already been computed and is passed as the 4th parameter.
++*/
++static HashElem *findElementGivenHash(
++  const Hash *pH,     /* The pH to be searched */
++  const void *pKey,   /* The key we are searching for */
++  int nKey,
++  int h               /* The hash for this key. */
++){
++  HashElem *elem;                /* Used to loop thru the element list */
++  int count;                     /* Number of elements left to test */
++  int (*xCompare)(const void*,int,const void*,int);  /* comparison function */
++
++  if( pH->ht ){
++    elem = pH->ht[h].chain;
++    count = pH->ht[h].count;
++    xCompare = compareFunction(pH->keyClass);
++    while( count-- && elem ){
++      if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){ 
++        return elem;
++      }
++      elem = elem->next;
++    }
++  }
++  return 0;
++}
++
++/* Remove a single entry from the hash table given a pointer to that
++** element and a hash on the element's key.
++*/
++static void removeElementGivenHash(
++  Hash *pH,         /* The pH containing "elem" */
++  HashElem* elem,   /* The element to be removed from the pH */
++  int h             /* Hash value for the element */
++){
++  if( elem->prev ){
++    elem->prev->next = elem->next; 
++  }else{
++    pH->first = elem->next;
++  }
++  if( elem->next ){
++    elem->next->prev = elem->prev;
++  }
++  if( pH->ht[h].chain==elem ){
++    pH->ht[h].chain = elem->next;
++  }
++  pH->ht[h].count--;
++  if( pH->ht[h].count<=0 ){
++    pH->ht[h].chain = 0;
++  }
++  if( pH->copyKey && elem->pKey ){
++    sqliteFree(elem->pKey);
++  }
++  sqliteFree( elem );
++  pH->count--;
++}
++
++/* Attempt to locate an element of the hash table pH with a key
++** that matches pKey,nKey.  Return the data for this element if it is
++** found, or NULL if there is no match.
++*/
++void *sqliteHashFind(const Hash *pH, const void *pKey, int nKey){
++  int h;             /* A hash on key */
++  HashElem *elem;    /* The element that matches key */
++  int (*xHash)(const void*,int);  /* The hash function */
++
++  if( pH==0 || pH->ht==0 ) return 0;
++  xHash = hashFunction(pH->keyClass);
++  assert( xHash!=0 );
++  h = (*xHash)(pKey,nKey);
++  assert( (pH->htsize & (pH->htsize-1))==0 );
++  elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1));
++  return elem ? elem->data : 0;
++}
++
++/* Insert an element into the hash table pH.  The key is pKey,nKey
++** and the data is "data".
++**
++** If no element exists with a matching key, then a new
++** element is created.  A copy of the key is made if the copyKey
++** flag is set.  NULL is returned.
++**
++** If another element already exists with the same key, then the
++** new data replaces the old data and the old data is returned.
++** The key is not copied in this instance.  If a malloc fails, then
++** the new data is returned and the hash table is unchanged.
++**
++** If the "data" parameter to this function is NULL, then the
++** element corresponding to "key" is removed from the hash table.
++*/
++void *sqliteHashInsert(Hash *pH, const void *pKey, int nKey, void *data){
++  int hraw;             /* Raw hash value of the key */
++  int h;                /* the hash of the key modulo hash table size */
++  HashElem *elem;       /* Used to loop thru the element list */
++  HashElem *new_elem;   /* New element added to the pH */
++  int (*xHash)(const void*,int);  /* The hash function */
++
++  assert( pH!=0 );
++  xHash = hashFunction(pH->keyClass);
++  assert( xHash!=0 );
++  hraw = (*xHash)(pKey, nKey);
++  assert( (pH->htsize & (pH->htsize-1))==0 );
++  h = hraw & (pH->htsize-1);
++  elem = findElementGivenHash(pH,pKey,nKey,h);
++  if( elem ){
++    void *old_data = elem->data;
++    if( data==0 ){
++      removeElementGivenHash(pH,elem,h);
++    }else{
++      elem->data = data;
++    }
++    return old_data;
++  }
++  if( data==0 ) return 0;
++  new_elem = (HashElem*)sqliteMalloc( sizeof(HashElem) );
++  if( new_elem==0 ) return data;
++  if( pH->copyKey && pKey!=0 ){
++    new_elem->pKey = sqliteMallocRaw( nKey );
++    if( new_elem->pKey==0 ){
++      sqliteFree(new_elem);
++      return data;
++    }
++    memcpy((void*)new_elem->pKey, pKey, nKey);
++  }else{
++    new_elem->pKey = (void*)pKey;
++  }
++  new_elem->nKey = nKey;
++  pH->count++;
++  if( pH->htsize==0 ) rehash(pH,8);
++  if( pH->htsize==0 ){
++    pH->count = 0;
++    sqliteFree(new_elem);
++    return data;
++  }
++  if( pH->count > pH->htsize ){
++    rehash(pH,pH->htsize*2);
++  }
++  assert( (pH->htsize & (pH->htsize-1))==0 );
++  h = hraw & (pH->htsize-1);
++  elem = pH->ht[h].chain;
++  if( elem ){
++    new_elem->next = elem;
++    new_elem->prev = elem->prev;
++    if( elem->prev ){ elem->prev->next = new_elem; }
++    else            { pH->first = new_elem; }
++    elem->prev = new_elem;
++  }else{
++    new_elem->next = pH->first;
++    new_elem->prev = 0;
++    if( pH->first ){ pH->first->prev = new_elem; }
++    pH->first = new_elem;
++  }
++  pH->ht[h].count++;
++  pH->ht[h].chain = new_elem;
++  new_elem->data = data;
++  return 0;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/hash.h
+@@ -0,0 +1,109 @@
++/*
++** 2001 September 22
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This is the header file for the generic hash-table implemenation
++** used in SQLite.
++**
++** $Id$
++*/
++#ifndef _SQLITE_HASH_H_
++#define _SQLITE_HASH_H_
++
++/* Forward declarations of structures. */
++typedef struct Hash Hash;
++typedef struct HashElem HashElem;
++
++/* A complete hash table is an instance of the following structure.
++** The internals of this structure are intended to be opaque -- client
++** code should not attempt to access or modify the fields of this structure
++** directly.  Change this structure only by using the routines below.
++** However, many of the "procedures" and "functions" for modifying and
++** accessing this structure are really macros, so we can't really make
++** this structure opaque.
++*/
++struct Hash {
++  char keyClass;          /* SQLITE_HASH_INT, _POINTER, _STRING, _BINARY */
++  char copyKey;           /* True if copy of key made on insert */
++  int count;              /* Number of entries in this table */
++  HashElem *first;        /* The first element of the array */
++  int htsize;             /* Number of buckets in the hash table */
++  struct _ht {            /* the hash table */
++    int count;               /* Number of entries with this hash */
++    HashElem *chain;         /* Pointer to first entry with this hash */
++  } *ht;
++};
++
++/* Each element in the hash table is an instance of the following 
++** structure.  All elements are stored on a single doubly-linked list.
++**
++** Again, this structure is intended to be opaque, but it can't really
++** be opaque because it is used by macros.
++*/
++struct HashElem {
++  HashElem *next, *prev;   /* Next and previous elements in the table */
++  void *data;              /* Data associated with this element */
++  void *pKey; int nKey;    /* Key associated with this element */
++};
++
++/*
++** There are 4 different modes of operation for a hash table:
++**
++**   SQLITE_HASH_INT         nKey is used as the key and pKey is ignored.
++**
++**   SQLITE_HASH_POINTER     pKey is used as the key and nKey is ignored.
++**
++**   SQLITE_HASH_STRING      pKey points to a string that is nKey bytes long
++**                           (including the null-terminator, if any).  Case
++**                           is ignored in comparisons.
++**
++**   SQLITE_HASH_BINARY      pKey points to binary data nKey bytes long. 
++**                           memcmp() is used to compare keys.
++**
++** A copy of the key is made for SQLITE_HASH_STRING and SQLITE_HASH_BINARY
++** if the copyKey parameter to HashInit is 1.  
++*/
++#define SQLITE_HASH_INT       1
++/* #define SQLITE_HASH_POINTER   2 // NOT USED */
++#define SQLITE_HASH_STRING    3
++#define SQLITE_HASH_BINARY    4
++
++/*
++** Access routines.  To delete, insert a NULL pointer.
++*/
++void sqliteHashInit(Hash*, int keytype, int copyKey);
++void *sqliteHashInsert(Hash*, const void *pKey, int nKey, void *pData);
++void *sqliteHashFind(const Hash*, const void *pKey, int nKey);
++void sqliteHashClear(Hash*);
++
++/*
++** Macros for looping over all elements of a hash table.  The idiom is
++** like this:
++**
++**   Hash h;
++**   HashElem *p;
++**   ...
++**   for(p=sqliteHashFirst(&h); p; p=sqliteHashNext(p)){
++**     SomeStructure *pData = sqliteHashData(p);
++**     // do something with pData
++**   }
++*/
++#define sqliteHashFirst(H)  ((H)->first)
++#define sqliteHashNext(E)   ((E)->next)
++#define sqliteHashData(E)   ((E)->data)
++#define sqliteHashKey(E)    ((E)->pKey)
++#define sqliteHashKeysize(E) ((E)->nKey)
++
++/*
++** Number of entries in a hash table
++*/
++#define sqliteHashCount(H)  ((H)->count)
++
++#endif /* _SQLITE_HASH_H_ */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/insert.c
+@@ -0,0 +1,919 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains C code routines that are called by the parser
++** to handle INSERT statements in SQLite.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++/*
++** This routine is call to handle SQL of the following forms:
++**
++**    insert into TABLE (IDLIST) values(EXPRLIST)
++**    insert into TABLE (IDLIST) select
++**
++** The IDLIST following the table name is always optional.  If omitted,
++** then a list of all columns for the table is substituted.  The IDLIST
++** appears in the pColumn parameter.  pColumn is NULL if IDLIST is omitted.
++**
++** The pList parameter holds EXPRLIST in the first form of the INSERT
++** statement above, and pSelect is NULL.  For the second form, pList is
++** NULL and pSelect is a pointer to the select statement used to generate
++** data for the insert.
++**
++** The code generated follows one of three templates.  For a simple
++** select with data coming from a VALUES clause, the code executes
++** once straight down through.  The template looks like this:
++**
++**         open write cursor to <table> and its indices
++**         puts VALUES clause expressions onto the stack
++**         write the resulting record into <table>
++**         cleanup
++**
++** If the statement is of the form
++**
++**   INSERT INTO <table> SELECT ...
++**
++** And the SELECT clause does not read from <table> at any time, then
++** the generated code follows this template:
++**
++**         goto B
++**      A: setup for the SELECT
++**         loop over the tables in the SELECT
++**           gosub C
++**         end loop
++**         cleanup after the SELECT
++**         goto D
++**      B: open write cursor to <table> and its indices
++**         goto A
++**      C: insert the select result into <table>
++**         return
++**      D: cleanup
++**
++** The third template is used if the insert statement takes its
++** values from a SELECT but the data is being inserted into a table
++** that is also read as part of the SELECT.  In the third form,
++** we have to use a intermediate table to store the results of
++** the select.  The template is like this:
++**
++**         goto B
++**      A: setup for the SELECT
++**         loop over the tables in the SELECT
++**           gosub C
++**         end loop
++**         cleanup after the SELECT
++**         goto D
++**      C: insert the select result into the intermediate table
++**         return
++**      B: open a cursor to an intermediate table
++**         goto A
++**      D: open write cursor to <table> and its indices
++**         loop over the intermediate table
++**           transfer values form intermediate table into <table>
++**         end the loop
++**         cleanup
++*/
++void sqliteInsert(
++  Parse *pParse,        /* Parser context */
++  SrcList *pTabList,    /* Name of table into which we are inserting */
++  ExprList *pList,      /* List of values to be inserted */
++  Select *pSelect,      /* A SELECT statement to use as the data source */
++  IdList *pColumn,      /* Column names corresponding to IDLIST. */
++  int onError           /* How to handle constraint errors */
++){
++  Table *pTab;          /* The table to insert into */
++  char *zTab;           /* Name of the table into which we are inserting */
++  const char *zDb;      /* Name of the database holding this table */
++  int i, j, idx;        /* Loop counters */
++  Vdbe *v;              /* Generate code into this virtual machine */
++  Index *pIdx;          /* For looping over indices of the table */
++  int nColumn;          /* Number of columns in the data */
++  int base;             /* VDBE Cursor number for pTab */
++  int iCont, iBreak;    /* Beginning and end of the loop over srcTab */
++  sqlite *db;           /* The main database structure */
++  int keyColumn = -1;   /* Column that is the INTEGER PRIMARY KEY */
++  int endOfLoop;        /* Label for the end of the insertion loop */
++  int useTempTable;     /* Store SELECT results in intermediate table */
++  int srcTab;           /* Data comes from this temporary cursor if >=0 */
++  int iSelectLoop;      /* Address of code that implements the SELECT */
++  int iCleanup;         /* Address of the cleanup code */
++  int iInsertBlock;     /* Address of the subroutine used to insert data */
++  int iCntMem;          /* Memory cell used for the row counter */
++  int isView;           /* True if attempting to insert into a view */
++
++  int row_triggers_exist = 0; /* True if there are FOR EACH ROW triggers */
++  int before_triggers;        /* True if there are BEFORE triggers */
++  int after_triggers;         /* True if there are AFTER triggers */
++  int newIdx = -1;            /* Cursor for the NEW table */
++
++  if( pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup;
++  db = pParse->db;
++
++  /* Locate the table into which we will be inserting new information.
++  */
++  assert( pTabList->nSrc==1 );
++  zTab = pTabList->a[0].zName;
++  if( zTab==0 ) goto insert_cleanup;
++  pTab = sqliteSrcListLookup(pParse, pTabList);
++  if( pTab==0 ){
++    goto insert_cleanup;
++  }
++  assert( pTab->iDb<db->nDb );
++  zDb = db->aDb[pTab->iDb].zName;
++  if( sqliteAuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb) ){
++    goto insert_cleanup;
++  }
++
++  /* Ensure that:
++  *  (a) the table is not read-only, 
++  *  (b) that if it is a view then ON INSERT triggers exist
++  */
++  before_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT, 
++                                       TK_BEFORE, TK_ROW, 0);
++  after_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT,
++                                       TK_AFTER, TK_ROW, 0);
++  row_triggers_exist = before_triggers || after_triggers;
++  isView = pTab->pSelect!=0;
++  if( sqliteIsReadOnly(pParse, pTab, before_triggers) ){
++    goto insert_cleanup;
++  }
++  if( pTab==0 ) goto insert_cleanup;
++
++  /* If pTab is really a view, make sure it has been initialized.
++  */
++  if( isView && sqliteViewGetColumnNames(pParse, pTab) ){
++    goto insert_cleanup;
++  }
++
++  /* Allocate a VDBE
++  */
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ) goto insert_cleanup;
++  sqliteBeginWriteOperation(pParse, pSelect || row_triggers_exist, pTab->iDb);
++
++  /* if there are row triggers, allocate a temp table for new.* references. */
++  if( row_triggers_exist ){
++    newIdx = pParse->nTab++;
++  }
++
++  /* Figure out how many columns of data are supplied.  If the data
++  ** is coming from a SELECT statement, then this step also generates
++  ** all the code to implement the SELECT statement and invoke a subroutine
++  ** to process each row of the result. (Template 2.) If the SELECT
++  ** statement uses the the table that is being inserted into, then the
++  ** subroutine is also coded here.  That subroutine stores the SELECT
++  ** results in a temporary table. (Template 3.)
++  */
++  if( pSelect ){
++    /* Data is coming from a SELECT.  Generate code to implement that SELECT
++    */
++    int rc, iInitCode;
++    iInitCode = sqliteVdbeAddOp(v, OP_Goto, 0, 0);
++    iSelectLoop = sqliteVdbeCurrentAddr(v);
++    iInsertBlock = sqliteVdbeMakeLabel(v);
++    rc = sqliteSelect(pParse, pSelect, SRT_Subroutine, iInsertBlock, 0,0,0);
++    if( rc || pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup;
++    iCleanup = sqliteVdbeMakeLabel(v);
++    sqliteVdbeAddOp(v, OP_Goto, 0, iCleanup);
++    assert( pSelect->pEList );
++    nColumn = pSelect->pEList->nExpr;
++
++    /* Set useTempTable to TRUE if the result of the SELECT statement
++    ** should be written into a temporary table.  Set to FALSE if each
++    ** row of the SELECT can be written directly into the result table.
++    **
++    ** A temp table must be used if the table being updated is also one
++    ** of the tables being read by the SELECT statement.  Also use a 
++    ** temp table in the case of row triggers.
++    */
++    if( row_triggers_exist ){
++      useTempTable = 1;
++    }else{
++      int addr = sqliteVdbeFindOp(v, OP_OpenRead, pTab->tnum);
++      useTempTable = 0;
++      if( addr>0 ){
++        VdbeOp *pOp = sqliteVdbeGetOp(v, addr-2);
++        if( pOp->opcode==OP_Integer && pOp->p1==pTab->iDb ){
++          useTempTable = 1;
++        }
++      }
++    }
++
++    if( useTempTable ){
++      /* Generate the subroutine that SELECT calls to process each row of
++      ** the result.  Store the result in a temporary table
++      */
++      srcTab = pParse->nTab++;
++      sqliteVdbeResolveLabel(v, iInsertBlock);
++      sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0);
++      sqliteVdbeAddOp(v, OP_NewRecno, srcTab, 0);
++      sqliteVdbeAddOp(v, OP_Pull, 1, 0);
++      sqliteVdbeAddOp(v, OP_PutIntKey, srcTab, 0);
++      sqliteVdbeAddOp(v, OP_Return, 0, 0);
++
++      /* The following code runs first because the GOTO at the very top
++      ** of the program jumps to it.  Create the temporary table, then jump
++      ** back up and execute the SELECT code above.
++      */
++      sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v));
++      sqliteVdbeAddOp(v, OP_OpenTemp, srcTab, 0);
++      sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop);
++      sqliteVdbeResolveLabel(v, iCleanup);
++    }else{
++      sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v));
++    }
++  }else{
++    /* This is the case if the data for the INSERT is coming from a VALUES
++    ** clause
++    */
++    SrcList dummy;
++    assert( pList!=0 );
++    srcTab = -1;
++    useTempTable = 0;
++    assert( pList );
++    nColumn = pList->nExpr;
++    dummy.nSrc = 0;
++    for(i=0; i<nColumn; i++){
++      if( sqliteExprResolveIds(pParse, &dummy, 0, pList->a[i].pExpr) ){
++        goto insert_cleanup;
++      }
++      if( sqliteExprCheck(pParse, pList->a[i].pExpr, 0, 0) ){
++        goto insert_cleanup;
++      }
++    }
++  }
++
++  /* Make sure the number of columns in the source data matches the number
++  ** of columns to be inserted into the table.
++  */
++  if( pColumn==0 && nColumn!=pTab->nCol ){
++    sqliteErrorMsg(pParse, 
++       "table %S has %d columns but %d values were supplied",
++       pTabList, 0, pTab->nCol, nColumn);
++    goto insert_cleanup;
++  }
++  if( pColumn!=0 && nColumn!=pColumn->nId ){
++    sqliteErrorMsg(pParse, "%d values for %d columns", nColumn, pColumn->nId);
++    goto insert_cleanup;
++  }
++
++  /* If the INSERT statement included an IDLIST term, then make sure
++  ** all elements of the IDLIST really are columns of the table and 
++  ** remember the column indices.
++  **
++  ** If the table has an INTEGER PRIMARY KEY column and that column
++  ** is named in the IDLIST, then record in the keyColumn variable
++  ** the index into IDLIST of the primary key column.  keyColumn is
++  ** the index of the primary key as it appears in IDLIST, not as
++  ** is appears in the original table.  (The index of the primary
++  ** key in the original table is pTab->iPKey.)
++  */
++  if( pColumn ){
++    for(i=0; i<pColumn->nId; i++){
++      pColumn->a[i].idx = -1;
++    }
++    for(i=0; i<pColumn->nId; i++){
++      for(j=0; j<pTab->nCol; j++){
++        if( sqliteStrICmp(pColumn->a[i].zName, pTab->aCol[j].zName)==0 ){
++          pColumn->a[i].idx = j;
++          if( j==pTab->iPKey ){
++            keyColumn = i;
++          }
++          break;
++        }
++      }
++      if( j>=pTab->nCol ){
++        if( sqliteIsRowid(pColumn->a[i].zName) ){
++          keyColumn = i;
++        }else{
++          sqliteErrorMsg(pParse, "table %S has no column named %s",
++              pTabList, 0, pColumn->a[i].zName);
++          pParse->nErr++;
++          goto insert_cleanup;
++        }
++      }
++    }
++  }
++
++  /* If there is no IDLIST term but the table has an integer primary
++  ** key, the set the keyColumn variable to the primary key column index
++  ** in the original table definition.
++  */
++  if( pColumn==0 ){
++    keyColumn = pTab->iPKey;
++  }
++
++  /* Open the temp table for FOR EACH ROW triggers
++  */
++  if( row_triggers_exist ){
++    sqliteVdbeAddOp(v, OP_OpenPseudo, newIdx, 0);
++  }
++    
++  /* Initialize the count of rows to be inserted
++  */
++  if( db->flags & SQLITE_CountRows ){
++    iCntMem = pParse->nMem++;
++    sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++    sqliteVdbeAddOp(v, OP_MemStore, iCntMem, 1);
++  }
++
++  /* Open tables and indices if there are no row triggers */
++  if( !row_triggers_exist ){
++    base = pParse->nTab;
++    idx = sqliteOpenTableAndIndices(pParse, pTab, base);
++    pParse->nTab += idx;
++  }
++
++  /* If the data source is a temporary table, then we have to create
++  ** a loop because there might be multiple rows of data.  If the data
++  ** source is a subroutine call from the SELECT statement, then we need
++  ** to launch the SELECT statement processing.
++  */
++  if( useTempTable ){
++    iBreak = sqliteVdbeMakeLabel(v);
++    sqliteVdbeAddOp(v, OP_Rewind, srcTab, iBreak);
++    iCont = sqliteVdbeCurrentAddr(v);
++  }else if( pSelect ){
++    sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop);
++    sqliteVdbeResolveLabel(v, iInsertBlock);
++  }
++
++  /* Run the BEFORE and INSTEAD OF triggers, if there are any
++  */
++  endOfLoop = sqliteVdbeMakeLabel(v);
++  if( before_triggers ){
++
++    /* build the NEW.* reference row.  Note that if there is an INTEGER
++    ** PRIMARY KEY into which a NULL is being inserted, that NULL will be
++    ** translated into a unique ID for the row.  But on a BEFORE trigger,
++    ** we do not know what the unique ID will be (because the insert has
++    ** not happened yet) so we substitute a rowid of -1
++    */
++    if( keyColumn<0 ){
++      sqliteVdbeAddOp(v, OP_Integer, -1, 0);
++    }else if( useTempTable ){
++      sqliteVdbeAddOp(v, OP_Column, srcTab, keyColumn);
++    }else if( pSelect ){
++      sqliteVdbeAddOp(v, OP_Dup, nColumn - keyColumn - 1, 1);
++    }else{
++      sqliteExprCode(pParse, pList->a[keyColumn].pExpr);
++      sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      sqliteVdbeAddOp(v, OP_Integer, -1, 0);
++      sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0);
++    }
++
++    /* Create the new column data
++    */
++    for(i=0; i<pTab->nCol; i++){
++      if( pColumn==0 ){
++        j = i;
++      }else{
++        for(j=0; j<pColumn->nId; j++){
++          if( pColumn->a[j].idx==i ) break;
++        }
++      }
++      if( pColumn && j>=pColumn->nId ){
++        sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC);
++      }else if( useTempTable ){
++        sqliteVdbeAddOp(v, OP_Column, srcTab, j); 
++      }else if( pSelect ){
++        sqliteVdbeAddOp(v, OP_Dup, nColumn-j-1, 1);
++      }else{
++        sqliteExprCode(pParse, pList->a[j].pExpr);
++      }
++    }
++    sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0);
++    sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0);
++
++    /* Fire BEFORE or INSTEAD OF triggers */
++    if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_BEFORE, pTab, 
++        newIdx, -1, onError, endOfLoop) ){
++      goto insert_cleanup;
++    }
++  }
++
++  /* If any triggers exists, the opening of tables and indices is deferred
++  ** until now.
++  */
++  if( row_triggers_exist && !isView ){
++    base = pParse->nTab;
++    idx = sqliteOpenTableAndIndices(pParse, pTab, base);
++    pParse->nTab += idx;
++  }
++
++  /* Push the record number for the new entry onto the stack.  The
++  ** record number is a randomly generate integer created by NewRecno
++  ** except when the table has an INTEGER PRIMARY KEY column, in which
++  ** case the record number is the same as that column. 
++  */
++  if( !isView ){
++    if( keyColumn>=0 ){
++      if( useTempTable ){
++        sqliteVdbeAddOp(v, OP_Column, srcTab, keyColumn);
++      }else if( pSelect ){
++        sqliteVdbeAddOp(v, OP_Dup, nColumn - keyColumn - 1, 1);
++      }else{
++        sqliteExprCode(pParse, pList->a[keyColumn].pExpr);
++      }
++      /* If the PRIMARY KEY expression is NULL, then use OP_NewRecno
++      ** to generate a unique primary key value.
++      */
++      sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      sqliteVdbeAddOp(v, OP_NewRecno, base, 0);
++      sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0);
++    }else{
++      sqliteVdbeAddOp(v, OP_NewRecno, base, 0);
++    }
++
++    /* Push onto the stack, data for all columns of the new entry, beginning
++    ** with the first column.
++    */
++    for(i=0; i<pTab->nCol; i++){
++      if( i==pTab->iPKey ){
++        /* The value of the INTEGER PRIMARY KEY column is always a NULL.
++        ** Whenever this column is read, the record number will be substituted
++        ** in its place.  So will fill this column with a NULL to avoid
++        ** taking up data space with information that will never be used. */
++        sqliteVdbeAddOp(v, OP_String, 0, 0);
++        continue;
++      }
++      if( pColumn==0 ){
++        j = i;
++      }else{
++        for(j=0; j<pColumn->nId; j++){
++          if( pColumn->a[j].idx==i ) break;
++        }
++      }
++      if( pColumn && j>=pColumn->nId ){
++        sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC);
++      }else if( useTempTable ){
++        sqliteVdbeAddOp(v, OP_Column, srcTab, j); 
++      }else if( pSelect ){
++        sqliteVdbeAddOp(v, OP_Dup, i+nColumn-j, 1);
++      }else{
++        sqliteExprCode(pParse, pList->a[j].pExpr);
++      }
++    }
++
++    /* Generate code to check constraints and generate index keys and
++    ** do the insertion.
++    */
++    sqliteGenerateConstraintChecks(pParse, pTab, base, 0, keyColumn>=0,
++                                   0, onError, endOfLoop);
++    sqliteCompleteInsertion(pParse, pTab, base, 0,0,0,
++                            after_triggers ? newIdx : -1);
++  }
++
++  /* Update the count of rows that are inserted
++  */
++  if( (db->flags & SQLITE_CountRows)!=0 ){
++    sqliteVdbeAddOp(v, OP_MemIncr, iCntMem, 0);
++  }
++
++  if( row_triggers_exist ){
++    /* Close all tables opened */
++    if( !isView ){
++      sqliteVdbeAddOp(v, OP_Close, base, 0);
++      for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
++        sqliteVdbeAddOp(v, OP_Close, idx+base, 0);
++      }
++    }
++
++    /* Code AFTER triggers */
++    if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_AFTER, pTab, newIdx, -1, 
++          onError, endOfLoop) ){
++      goto insert_cleanup;
++    }
++  }
++
++  /* The bottom of the loop, if the data source is a SELECT statement
++  */
++  sqliteVdbeResolveLabel(v, endOfLoop);
++  if( useTempTable ){
++    sqliteVdbeAddOp(v, OP_Next, srcTab, iCont);
++    sqliteVdbeResolveLabel(v, iBreak);
++    sqliteVdbeAddOp(v, OP_Close, srcTab, 0);
++  }else if( pSelect ){
++    sqliteVdbeAddOp(v, OP_Pop, nColumn, 0);
++    sqliteVdbeAddOp(v, OP_Return, 0, 0);
++    sqliteVdbeResolveLabel(v, iCleanup);
++  }
++
++  if( !row_triggers_exist ){
++    /* Close all tables opened */
++    sqliteVdbeAddOp(v, OP_Close, base, 0);
++    for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
++      sqliteVdbeAddOp(v, OP_Close, idx+base, 0);
++    }
++  }
++
++  sqliteVdbeAddOp(v, OP_SetCounts, 0, 0);
++  sqliteEndWriteOperation(pParse);
++
++  /*
++  ** Return the number of rows inserted.
++  */
++  if( db->flags & SQLITE_CountRows ){
++    sqliteVdbeOp3(v, OP_ColumnName, 0, 1, "rows inserted", P3_STATIC);
++    sqliteVdbeAddOp(v, OP_MemLoad, iCntMem, 0);
++    sqliteVdbeAddOp(v, OP_Callback, 1, 0);
++  }
++
++insert_cleanup:
++  sqliteSrcListDelete(pTabList);
++  if( pList ) sqliteExprListDelete(pList);
++  if( pSelect ) sqliteSelectDelete(pSelect);
++  sqliteIdListDelete(pColumn);
++}
++
++/*
++** Generate code to do a constraint check prior to an INSERT or an UPDATE.
++**
++** When this routine is called, the stack contains (from bottom to top)
++** the following values:
++**
++**    1.  The recno of the row to be updated before the update.  This
++**        value is omitted unless we are doing an UPDATE that involves a
++**        change to the record number.
++**
++**    2.  The recno of the row after the update.
++**
++**    3.  The data in the first column of the entry after the update.
++**
++**    i.  Data from middle columns...
++**
++**    N.  The data in the last column of the entry after the update.
++**
++** The old recno shown as entry (1) above is omitted unless both isUpdate
++** and recnoChng are 1.  isUpdate is true for UPDATEs and false for
++** INSERTs and recnoChng is true if the record number is being changed.
++**
++** The code generated by this routine pushes additional entries onto
++** the stack which are the keys for new index entries for the new record.
++** The order of index keys is the same as the order of the indices on
++** the pTable->pIndex list.  A key is only created for index i if 
++** aIdxUsed!=0 and aIdxUsed[i]!=0.
++**
++** This routine also generates code to check constraints.  NOT NULL,
++** CHECK, and UNIQUE constraints are all checked.  If a constraint fails,
++** then the appropriate action is performed.  There are five possible
++** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE.
++**
++**  Constraint type  Action       What Happens
++**  ---------------  ----------   ----------------------------------------
++**  any              ROLLBACK     The current transaction is rolled back and
++**                                sqlite_exec() returns immediately with a
++**                                return code of SQLITE_CONSTRAINT.
++**
++**  any              ABORT        Back out changes from the current command
++**                                only (do not do a complete rollback) then
++**                                cause sqlite_exec() to return immediately
++**                                with SQLITE_CONSTRAINT.
++**
++**  any              FAIL         Sqlite_exec() returns immediately with a
++**                                return code of SQLITE_CONSTRAINT.  The
++**                                transaction is not rolled back and any
++**                                prior changes are retained.
++**
++**  any              IGNORE       The record number and data is popped from
++**                                the stack and there is an immediate jump
++**                                to label ignoreDest.
++**
++**  NOT NULL         REPLACE      The NULL value is replace by the default
++**                                value for that column.  If the default value
++**                                is NULL, the action is the same as ABORT.
++**
++**  UNIQUE           REPLACE      The other row that conflicts with the row
++**                                being inserted is removed.
++**
++**  CHECK            REPLACE      Illegal.  The results in an exception.
++**
++** Which action to take is determined by the overrideError parameter.
++** Or if overrideError==OE_Default, then the pParse->onError parameter
++** is used.  Or if pParse->onError==OE_Default then the onError value
++** for the constraint is used.
++**
++** The calling routine must open a read/write cursor for pTab with
++** cursor number "base".  All indices of pTab must also have open
++** read/write cursors with cursor number base+i for the i-th cursor.
++** Except, if there is no possibility of a REPLACE action then
++** cursors do not need to be open for indices where aIdxUsed[i]==0.
++**
++** If the isUpdate flag is true, it means that the "base" cursor is
++** initially pointing to an entry that is being updated.  The isUpdate
++** flag causes extra code to be generated so that the "base" cursor
++** is still pointing at the same entry after the routine returns.
++** Without the isUpdate flag, the "base" cursor might be moved.
++*/
++void sqliteGenerateConstraintChecks(
++  Parse *pParse,      /* The parser context */
++  Table *pTab,        /* the table into which we are inserting */
++  int base,           /* Index of a read/write cursor pointing at pTab */
++  char *aIdxUsed,     /* Which indices are used.  NULL means all are used */
++  int recnoChng,      /* True if the record number will change */
++  int isUpdate,       /* True for UPDATE, False for INSERT */
++  int overrideError,  /* Override onError to this if not OE_Default */
++  int ignoreDest      /* Jump to this label on an OE_Ignore resolution */
++){
++  int i;
++  Vdbe *v;
++  int nCol;
++  int onError;
++  int addr;
++  int extra;
++  int iCur;
++  Index *pIdx;
++  int seenReplace = 0;
++  int jumpInst1, jumpInst2;
++  int contAddr;
++  int hasTwoRecnos = (isUpdate && recnoChng);
++
++  v = sqliteGetVdbe(pParse);
++  assert( v!=0 );
++  assert( pTab->pSelect==0 );  /* This table is not a VIEW */
++  nCol = pTab->nCol;
++
++  /* Test all NOT NULL constraints.
++  */
++  for(i=0; i<nCol; i++){
++    if( i==pTab->iPKey ){
++      continue;
++    }
++    onError = pTab->aCol[i].notNull;
++    if( onError==OE_None ) continue;
++    if( overrideError!=OE_Default ){
++      onError = overrideError;
++    }else if( pParse->db->onError!=OE_Default ){
++      onError = pParse->db->onError;
++    }else if( onError==OE_Default ){
++      onError = OE_Abort;
++    }
++    if( onError==OE_Replace && pTab->aCol[i].zDflt==0 ){
++      onError = OE_Abort;
++    }
++    sqliteVdbeAddOp(v, OP_Dup, nCol-1-i, 1);
++    addr = sqliteVdbeAddOp(v, OP_NotNull, 1, 0);
++    switch( onError ){
++      case OE_Rollback:
++      case OE_Abort:
++      case OE_Fail: {
++        char *zMsg = 0;
++        sqliteVdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError);
++        sqliteSetString(&zMsg, pTab->zName, ".", pTab->aCol[i].zName,
++                        " may not be NULL", (char*)0);
++        sqliteVdbeChangeP3(v, -1, zMsg, P3_DYNAMIC);
++        break;
++      }
++      case OE_Ignore: {
++        sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0);
++        sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest);
++        break;
++      }
++      case OE_Replace: {
++        sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC);
++        sqliteVdbeAddOp(v, OP_Push, nCol-i, 0);
++        break;
++      }
++      default: assert(0);
++    }
++    sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v));
++  }
++
++  /* Test all CHECK constraints
++  */
++  /**** TBD ****/
++
++  /* If we have an INTEGER PRIMARY KEY, make sure the primary key
++  ** of the new record does not previously exist.  Except, if this
++  ** is an UPDATE and the primary key is not changing, that is OK.
++  */
++  if( recnoChng ){
++    onError = pTab->keyConf;
++    if( overrideError!=OE_Default ){
++      onError = overrideError;
++    }else if( pParse->db->onError!=OE_Default ){
++      onError = pParse->db->onError;
++    }else if( onError==OE_Default ){
++      onError = OE_Abort;
++    }
++    
++    if( isUpdate ){
++      sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1);
++      sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1);
++      jumpInst1 = sqliteVdbeAddOp(v, OP_Eq, 0, 0);
++    }
++    sqliteVdbeAddOp(v, OP_Dup, nCol, 1);
++    jumpInst2 = sqliteVdbeAddOp(v, OP_NotExists, base, 0);
++    switch( onError ){
++      default: {
++        onError = OE_Abort;
++        /* Fall thru into the next case */
++      }
++      case OE_Rollback:
++      case OE_Abort:
++      case OE_Fail: {
++        sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError,
++                         "PRIMARY KEY must be unique", P3_STATIC);
++        break;
++      }
++      case OE_Replace: {
++        sqliteGenerateRowIndexDelete(pParse->db, v, pTab, base, 0);
++        if( isUpdate ){
++          sqliteVdbeAddOp(v, OP_Dup, nCol+hasTwoRecnos, 1);
++          sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
++        }
++        seenReplace = 1;
++        break;
++      }
++      case OE_Ignore: {
++        assert( seenReplace==0 );
++        sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0);
++        sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest);
++        break;
++      }
++    }
++    contAddr = sqliteVdbeCurrentAddr(v);
++    sqliteVdbeChangeP2(v, jumpInst2, contAddr);
++    if( isUpdate ){
++      sqliteVdbeChangeP2(v, jumpInst1, contAddr);
++      sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1);
++      sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
++    }
++  }
++
++  /* Test all UNIQUE constraints by creating entries for each UNIQUE
++  ** index and making sure that duplicate entries do not already exist.
++  ** Add the new records to the indices as we go.
++  */
++  extra = -1;
++  for(iCur=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, iCur++){
++    if( aIdxUsed && aIdxUsed[iCur]==0 ) continue;  /* Skip unused indices */
++    extra++;
++
++    /* Create a key for accessing the index entry */
++    sqliteVdbeAddOp(v, OP_Dup, nCol+extra, 1);
++    for(i=0; i<pIdx->nColumn; i++){
++      int idx = pIdx->aiColumn[i];
++      if( idx==pTab->iPKey ){
++        sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol+1, 1);
++      }else{
++        sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol-idx, 1);
++      }
++    }
++    jumpInst1 = sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0);
++    if( pParse->db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx);
++
++    /* Find out what action to take in case there is an indexing conflict */
++    onError = pIdx->onError;
++    if( onError==OE_None ) continue;  /* pIdx is not a UNIQUE index */
++    if( overrideError!=OE_Default ){
++      onError = overrideError;
++    }else if( pParse->db->onError!=OE_Default ){
++      onError = pParse->db->onError;
++    }else if( onError==OE_Default ){
++      onError = OE_Abort;
++    }
++    if( seenReplace ){
++      if( onError==OE_Ignore ) onError = OE_Replace;
++      else if( onError==OE_Fail ) onError = OE_Abort;
++    }
++    
++
++    /* Check to see if the new index entry will be unique */
++    sqliteVdbeAddOp(v, OP_Dup, extra+nCol+1+hasTwoRecnos, 1);
++    jumpInst2 = sqliteVdbeAddOp(v, OP_IsUnique, base+iCur+1, 0);
++
++    /* Generate code that executes if the new index entry is not unique */
++    switch( onError ){
++      case OE_Rollback:
++      case OE_Abort:
++      case OE_Fail: {
++        int j, n1, n2;
++        char zErrMsg[200];
++        strcpy(zErrMsg, pIdx->nColumn>1 ? "columns " : "column ");
++        n1 = strlen(zErrMsg);
++        for(j=0; j<pIdx->nColumn && n1<sizeof(zErrMsg)-30; j++){
++          char *zCol = pTab->aCol[pIdx->aiColumn[j]].zName;
++          n2 = strlen(zCol);
++          if( j>0 ){
++            strcpy(&zErrMsg[n1], ", ");
++            n1 += 2;
++          }
++          if( n1+n2>sizeof(zErrMsg)-30 ){
++            strcpy(&zErrMsg[n1], "...");
++            n1 += 3;
++            break;
++          }else{
++            strcpy(&zErrMsg[n1], zCol);
++            n1 += n2;
++          }
++        }
++        strcpy(&zErrMsg[n1], 
++            pIdx->nColumn>1 ? " are not unique" : " is not unique");
++        sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, zErrMsg, 0);
++        break;
++      }
++      case OE_Ignore: {
++        assert( seenReplace==0 );
++        sqliteVdbeAddOp(v, OP_Pop, nCol+extra+3+hasTwoRecnos, 0);
++        sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest);
++        break;
++      }
++      case OE_Replace: {
++        sqliteGenerateRowDelete(pParse->db, v, pTab, base, 0);
++        if( isUpdate ){
++          sqliteVdbeAddOp(v, OP_Dup, nCol+extra+1+hasTwoRecnos, 1);
++          sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
++        }
++        seenReplace = 1;
++        break;
++      }
++      default: assert(0);
++    }
++    contAddr = sqliteVdbeCurrentAddr(v);
++#if NULL_DISTINCT_FOR_UNIQUE
++    sqliteVdbeChangeP2(v, jumpInst1, contAddr);
++#endif
++    sqliteVdbeChangeP2(v, jumpInst2, contAddr);
++  }
++}
++
++/*
++** This routine generates code to finish the INSERT or UPDATE operation
++** that was started by a prior call to sqliteGenerateConstraintChecks.
++** The stack must contain keys for all active indices followed by data
++** and the recno for the new entry.  This routine creates the new
++** entries in all indices and in the main table.
++**
++** The arguments to this routine should be the same as the first six
++** arguments to sqliteGenerateConstraintChecks.
++*/
++void sqliteCompleteInsertion(
++  Parse *pParse,      /* The parser context */
++  Table *pTab,        /* the table into which we are inserting */
++  int base,           /* Index of a read/write cursor pointing at pTab */
++  char *aIdxUsed,     /* Which indices are used.  NULL means all are used */
++  int recnoChng,      /* True if the record number will change */
++  int isUpdate,       /* True for UPDATE, False for INSERT */
++  int newIdx          /* Index of NEW table for triggers.  -1 if none */
++){
++  int i;
++  Vdbe *v;
++  int nIdx;
++  Index *pIdx;
++
++  v = sqliteGetVdbe(pParse);
++  assert( v!=0 );
++  assert( pTab->pSelect==0 );  /* This table is not a VIEW */
++  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){}
++  for(i=nIdx-1; i>=0; i--){
++    if( aIdxUsed && aIdxUsed[i]==0 ) continue;
++    sqliteVdbeAddOp(v, OP_IdxPut, base+i+1, 0);
++  }
++  sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0);
++  if( newIdx>=0 ){
++    sqliteVdbeAddOp(v, OP_Dup, 1, 0);
++    sqliteVdbeAddOp(v, OP_Dup, 1, 0);
++    sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0);
++  }
++  sqliteVdbeAddOp(v, OP_PutIntKey, base,
++    (pParse->trigStack?0:OPFLAG_NCHANGE) |
++    (isUpdate?0:OPFLAG_LASTROWID) | OPFLAG_CSCHANGE);
++  if( isUpdate && recnoChng ){
++    sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++  }
++}
++
++/*
++** Generate code that will open write cursors for a table and for all
++** indices of that table.  The "base" parameter is the cursor number used
++** for the table.  Indices are opened on subsequent cursors.
++**
++** Return the total number of cursors opened.  This is always at least
++** 1 (for the main table) plus more for each cursor.
++*/
++int sqliteOpenTableAndIndices(Parse *pParse, Table *pTab, int base){
++  int i;
++  Index *pIdx;
++  Vdbe *v = sqliteGetVdbe(pParse);
++  assert( v!=0 );
++  sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++  sqliteVdbeOp3(v, OP_OpenWrite, base, pTab->tnum, pTab->zName, P3_STATIC);
++  for(i=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
++    sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0);
++    sqliteVdbeOp3(v, OP_OpenWrite, i+base, pIdx->tnum, pIdx->zName, P3_STATIC);
++  }
++  return i;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/libsqlite.dsp
+@@ -0,0 +1,353 @@
++# Microsoft Developer Studio Project File - Name="libsqlite" - Package Owner=<4>
++# Microsoft Developer Studio Generated Build File, Format Version 6.00
++# ** DO NOT EDIT **
++
++# TARGTYPE "Win32 (x86) Static Library" 0x0104
++
++CFG=libsqlite - Win32 Debug_TS
++!MESSAGE This is not a valid makefile. To build this project using NMAKE,
++!MESSAGE use the Export Makefile command and run
++!MESSAGE 
++!MESSAGE NMAKE /f "libsqlite.mak".
++!MESSAGE 
++!MESSAGE You can specify a configuration when running NMAKE
++!MESSAGE by defining the macro CFG on the command line. For example:
++!MESSAGE 
++!MESSAGE NMAKE /f "libsqlite.mak" CFG="libsqlite - Win32 Debug_TS"
++!MESSAGE 
++!MESSAGE Possible choices for configuration are:
++!MESSAGE 
++!MESSAGE "libsqlite - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
++!MESSAGE "libsqlite - Win32 Release_TS" (based on "Win32 (x86) Static Library")
++!MESSAGE "libsqlite - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
++!MESSAGE 
++
++# Begin Project
++# PROP AllowPerConfigDependencies 0
++# PROP Scc_ProjName ""
++# PROP Scc_LocalPath ""
++CPP=cl.exe
++RSC=rc.exe
++
++!IF  "$(CFG)" == "libsqlite - Win32 Debug_TS"
++
++# PROP BASE Use_MFC 0
++# PROP BASE Use_Debug_Libraries 1
++# PROP BASE Output_Dir "Debug_TS"
++# PROP BASE Intermediate_Dir "Debug_TS"
++# PROP BASE Target_Dir ""
++# PROP Use_MFC 0
++# PROP Use_Debug_Libraries 1
++# PROP Output_Dir "..\..\Debug_TS"
++# PROP Intermediate_Dir "..\..\Debug_TS"
++# PROP Target_Dir ""
++# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
++# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /GZ /c
++# ADD BASE RSC /l 0x406 /d "_DEBUG"
++# ADD RSC /l 0x406 /d "_DEBUG"
++BSC32=bscmake.exe
++# ADD BASE BSC32 /nologo
++# ADD BSC32 /nologo
++LIB32=link.exe -lib
++# ADD BASE LIB32 /nologo
++# ADD LIB32 /nologo
++
++!ELSEIF  "$(CFG)" == "libsqlite - Win32 Release_TS"
++
++# PROP BASE Use_MFC 0
++# PROP BASE Use_Debug_Libraries 0
++# PROP BASE Output_Dir "Release_TS"
++# PROP BASE Intermediate_Dir "Release_TS"
++# PROP BASE Target_Dir ""
++# PROP Use_MFC 0
++# PROP Use_Debug_Libraries 0
++# PROP Output_Dir "..\..\Release_TS"
++# PROP Intermediate_Dir "..\..\Release_TS"
++# PROP Target_Dir ""
++# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
++# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c
++# ADD BASE RSC /l 0x406 /d "NDEBUG"
++# ADD RSC /l 0x406 /d "NDEBUG"
++BSC32=bscmake.exe
++# ADD BASE BSC32 /nologo
++# ADD BSC32 /nologo
++LIB32=link.exe -lib
++# ADD BASE LIB32 /nologo
++# ADD LIB32 /nologo
++
++!ELSEIF  "$(CFG)" == "libsqlite - Win32 Release_TSDbg"
++
++# PROP BASE Use_MFC 0
++# PROP BASE Use_Debug_Libraries 0
++# PROP BASE Output_Dir "libsqlite___Win32_Release_TSDbg"
++# PROP BASE Intermediate_Dir "libsqlite___Win32_Release_TSDbg"
++# PROP BASE Target_Dir ""
++# PROP Use_MFC 0
++# PROP Use_Debug_Libraries 0
++# PROP Output_Dir "..\..\Release_TSDbg"
++# PROP Intermediate_Dir "..\..\Release_TSDbg"
++# PROP Target_Dir ""
++# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c
++# ADD CPP /nologo /MD /W3 /GX /Zi /Od /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c
++# ADD BASE RSC /l 0x406 /d "NDEBUG"
++# ADD RSC /l 0x406 /d "NDEBUG"
++BSC32=bscmake.exe
++# ADD BASE BSC32 /nologo
++# ADD BSC32 /nologo
++LIB32=link.exe -lib
++# ADD BASE LIB32 /nologo /out:"Release_TS\libsqlite.lib"
++# ADD LIB32 /nologo
++
++!ENDIF 
++
++# Begin Target
++
++# Name "libsqlite - Win32 Debug_TS"
++# Name "libsqlite - Win32 Release_TS"
++# Name "libsqlite - Win32 Release_TSDbg"
++# Begin Group "Source Files"
++
++# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
++# Begin Source File
++
++SOURCE=attach.c
++# End Source File
++# Begin Source File
++
++SOURCE=auth.c
++# End Source File
++# Begin Source File
++
++SOURCE=btree.c
++# End Source File
++# Begin Source File
++
++SOURCE=btree_rb.c
++# End Source File
++# Begin Source File
++
++SOURCE=build.c
++# End Source File
++# Begin Source File
++
++SOURCE=copy.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\date.c
++# End Source File
++# Begin Source File
++
++SOURCE=delete.c
++# End Source File
++# Begin Source File
++
++SOURCE=encode.c
++# End Source File
++# Begin Source File
++
++SOURCE=expr.c
++# End Source File
++# Begin Source File
++
++SOURCE=func.c
++# End Source File
++# Begin Source File
++
++SOURCE=hash.c
++# End Source File
++# Begin Source File
++
++SOURCE=insert.c
++# End Source File
++# Begin Source File
++
++SOURCE=main.c
++# End Source File
++# Begin Source File
++
++SOURCE=opcodes.c
++# End Source File
++# Begin Source File
++
++SOURCE=os.c
++# End Source File
++# Begin Source File
++
++SOURCE=pager.c
++# End Source File
++# Begin Source File
++
++SOURCE=parse.c
++# End Source File
++# Begin Source File
++
++SOURCE=pragma.c
++# End Source File
++# Begin Source File
++
++SOURCE=printf.c
++# End Source File
++# Begin Source File
++
++SOURCE=random.c
++# End Source File
++# Begin Source File
++
++SOURCE=select.c
++# End Source File
++# Begin Source File
++
++SOURCE=table.c
++# End Source File
++# Begin Source File
++
++SOURCE=tokenize.c
++# End Source File
++# Begin Source File
++
++SOURCE=trigger.c
++# End Source File
++# Begin Source File
++
++SOURCE=update.c
++# End Source File
++# Begin Source File
++
++SOURCE=util.c
++# End Source File
++# Begin Source File
++
++SOURCE=vacuum.c
++# End Source File
++# Begin Source File
++
++SOURCE=vdbe.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\vdbeaux.c
++# End Source File
++# Begin Source File
++
++SOURCE=where.c
++# End Source File
++# End Group
++# Begin Group "Header Files"
++
++# PROP Default_Filter "h;hpp;hxx;hm;inl"
++# Begin Source File
++
++SOURCE=btree.h
++# End Source File
++# Begin Source File
++
++SOURCE=config_static.w32.h
++
++!IF  "$(CFG)" == "libsqlite - Win32 Debug_TS"
++
++# Begin Custom Build
++InputDir=.
++InputPath=config_static.w32.h
++
++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\config.h
++
++# End Custom Build
++
++!ELSEIF  "$(CFG)" == "libsqlite - Win32 Release_TS"
++
++# Begin Custom Build
++InputDir=.
++InputPath=config_static.w32.h
++
++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\config.h
++
++# End Custom Build
++
++!ELSEIF  "$(CFG)" == "libsqlite - Win32 Release_TSDbg"
++
++# Begin Custom Build
++InputDir=.
++InputPath=config_static.w32.h
++
++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\config.h
++
++# End Custom Build
++
++!ENDIF 
++
++# End Source File
++# Begin Source File
++
++SOURCE=hash.h
++# End Source File
++# Begin Source File
++
++SOURCE=opcodes.h
++# End Source File
++# Begin Source File
++
++SOURCE=os.h
++# End Source File
++# Begin Source File
++
++SOURCE=pager.h
++# End Source File
++# Begin Source File
++
++SOURCE=parse.h
++# End Source File
++# Begin Source File
++
++SOURCE=sqlite.w32.h
++
++!IF  "$(CFG)" == "libsqlite - Win32 Debug_TS"
++
++# Begin Custom Build
++InputDir=.
++InputPath=sqlite.w32.h
++
++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\sqlite.h
++
++# End Custom Build
++
++!ELSEIF  "$(CFG)" == "libsqlite - Win32 Release_TS"
++
++# Begin Custom Build
++InputDir=.
++InputPath=sqlite.w32.h
++
++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\sqlite.h
++
++# End Custom Build
++
++!ELSEIF  "$(CFG)" == "libsqlite - Win32 Release_TSDbg"
++
++# Begin Custom Build
++InputDir=.
++InputPath=sqlite.w32.h
++
++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\sqlite.h
++
++# End Custom Build
++
++!ENDIF 
++
++# End Source File
++# Begin Source File
++
++SOURCE=sqliteInt.h
++# End Source File
++# Begin Source File
++
++SOURCE=vdbe.h
++# End Source File
++# End Group
++# End Target
++# End Project
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/main.c
+@@ -0,0 +1,1143 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** Main file for the SQLite library.  The routines in this file
++** implement the programmer interface to the library.  Routines in
++** other files are for internal use by SQLite and should not be
++** accessed by users of the library.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include "os.h"
++#include <ctype.h>
++
++/*
++** A pointer to this structure is used to communicate information
++** from sqliteInit into the sqliteInitCallback.
++*/
++typedef struct {
++  sqlite *db;         /* The database being initialized */
++  char **pzErrMsg;    /* Error message stored here */
++} InitData;
++
++/*
++** Fill the InitData structure with an error message that indicates
++** that the database is corrupt.
++*/
++static void corruptSchema(InitData *pData, const char *zExtra){
++  sqliteSetString(pData->pzErrMsg, "malformed database schema",
++     zExtra!=0 && zExtra[0]!=0 ? " - " : (char*)0, zExtra, (char*)0);
++}
++
++/*
++** This is the callback routine for the code that initializes the
++** database.  See sqliteInit() below for additional information.
++**
++** Each callback contains the following information:
++**
++**     argv[0] = "file-format" or "schema-cookie" or "table" or "index"
++**     argv[1] = table or index name or meta statement type.
++**     argv[2] = root page number for table or index.  NULL for meta.
++**     argv[3] = SQL text for a CREATE TABLE or CREATE INDEX statement.
++**     argv[4] = "1" for temporary files, "0" for main database, "2" or more
++**               for auxiliary database files.
++**
++*/
++static
++int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){
++  InitData *pData = (InitData*)pInit;
++  int nErr = 0;
++
++  assert( argc==5 );
++  if( argv==0 ) return 0;   /* Might happen if EMPTY_RESULT_CALLBACKS are on */
++  if( argv[0]==0 ){
++    corruptSchema(pData, 0);
++    return 1;
++  }
++  switch( argv[0][0] ){
++    case 'v':
++    case 'i':
++    case 't': {  /* CREATE TABLE, CREATE INDEX, or CREATE VIEW statements */
++      sqlite *db = pData->db;
++      if( argv[2]==0 || argv[4]==0 ){
++        corruptSchema(pData, 0);
++        return 1;
++      }
++      if( argv[3] && argv[3][0] ){
++        /* Call the parser to process a CREATE TABLE, INDEX or VIEW.
++        ** But because db->init.busy is set to 1, no VDBE code is generated
++        ** or executed.  All the parser does is build the internal data
++        ** structures that describe the table, index, or view.
++        */
++        char *zErr;
++        assert( db->init.busy );
++        db->init.iDb = atoi(argv[4]);
++        assert( db->init.iDb>=0 && db->init.iDb<db->nDb );
++        db->init.newTnum = atoi(argv[2]);
++        if( sqlite_exec(db, argv[3], 0, 0, &zErr) ){
++          corruptSchema(pData, zErr);
++          sqlite_freemem(zErr);
++        }
++        db->init.iDb = 0;
++      }else{
++        /* If the SQL column is blank it means this is an index that
++        ** was created to be the PRIMARY KEY or to fulfill a UNIQUE
++        ** constraint for a CREATE TABLE.  The index should have already
++        ** been created when we processed the CREATE TABLE.  All we have
++        ** to do here is record the root page number for that index.
++        */
++        int iDb;
++        Index *pIndex;
++
++        iDb = atoi(argv[4]);
++        assert( iDb>=0 && iDb<db->nDb );
++        pIndex = sqliteFindIndex(db, argv[1], db->aDb[iDb].zName);
++        if( pIndex==0 || pIndex->tnum!=0 ){
++          /* This can occur if there exists an index on a TEMP table which
++          ** has the same name as another index on a permanent index.  Since
++          ** the permanent table is hidden by the TEMP table, we can also
++          ** safely ignore the index on the permanent table.
++          */
++          /* Do Nothing */;
++        }else{
++          pIndex->tnum = atoi(argv[2]);
++        }
++      }
++      break;
++    }
++    default: {
++      /* This can not happen! */
++      nErr = 1;
++      assert( nErr==0 );
++    }
++  }
++  return nErr;
++}
++
++/*
++** This is a callback procedure used to reconstruct a table.  The
++** name of the table to be reconstructed is passed in as argv[0].
++**
++** This routine is used to automatically upgrade a database from
++** format version 1 or 2 to version 3.  The correct operation of
++** this routine relys on the fact that no indices are used when
++** copying a table out to a temporary file.
++**
++** The change from version 2 to version 3 occurred between SQLite
++** version 2.5.6 and 2.6.0 on 2002-July-18.  
++*/
++static
++int upgrade_3_callback(void *pInit, int argc, char **argv, char **NotUsed){
++  InitData *pData = (InitData*)pInit;
++  int rc;
++  Table *pTab;
++  Trigger *pTrig;
++  char *zErr = 0;
++
++  pTab = sqliteFindTable(pData->db, argv[0], 0);
++  assert( pTab!=0 );
++  assert( sqliteStrICmp(pTab->zName, argv[0])==0 );
++  if( pTab ){
++    pTrig = pTab->pTrigger;
++    pTab->pTrigger = 0;  /* Disable all triggers before rebuilding the table */
++  }
++  rc = sqlite_exec_printf(pData->db,
++    "CREATE TEMP TABLE sqlite_x AS SELECT * FROM '%q'; "
++    "DELETE FROM '%q'; "
++    "INSERT INTO '%q' SELECT * FROM sqlite_x; "
++    "DROP TABLE sqlite_x;",
++    0, 0, &zErr, argv[0], argv[0], argv[0]);
++  if( zErr ){
++    if( *pData->pzErrMsg ) sqlite_freemem(*pData->pzErrMsg);
++    *pData->pzErrMsg = zErr;
++  }
++
++  /* If an error occurred in the SQL above, then the transaction will
++  ** rollback which will delete the internal symbol tables.  This will
++  ** cause the structure that pTab points to be deleted.  In case that
++  ** happened, we need to refetch pTab.
++  */
++  pTab = sqliteFindTable(pData->db, argv[0], 0);
++  if( pTab ){
++    assert( sqliteStrICmp(pTab->zName, argv[0])==0 );
++    pTab->pTrigger = pTrig;  /* Re-enable triggers */
++  }
++  return rc!=SQLITE_OK;
++}
++
++
++
++/*
++** Attempt to read the database schema and initialize internal
++** data structures for a single database file.  The index of the
++** database file is given by iDb.  iDb==0 is used for the main
++** database.  iDb==1 should never be used.  iDb>=2 is used for
++** auxiliary databases.  Return one of the SQLITE_ error codes to
++** indicate success or failure.
++*/
++static int sqliteInitOne(sqlite *db, int iDb, char **pzErrMsg){
++  int rc;
++  BtCursor *curMain;
++  int size;
++  Table *pTab;
++  char const *azArg[6];
++  char zDbNum[30];
++  int meta[SQLITE_N_BTREE_META];
++  InitData initData;
++  char const *zMasterSchema;
++  char const *zMasterName;
++  char *zSql = 0;
++
++  /*
++  ** The master database table has a structure like this
++  */
++  static char master_schema[] = 
++     "CREATE TABLE sqlite_master(\n"
++     "  type text,\n"
++     "  name text,\n"
++     "  tbl_name text,\n"
++     "  rootpage integer,\n"
++     "  sql text\n"
++     ")"
++  ;
++  static char temp_master_schema[] = 
++     "CREATE TEMP TABLE sqlite_temp_master(\n"
++     "  type text,\n"
++     "  name text,\n"
++     "  tbl_name text,\n"
++     "  rootpage integer,\n"
++     "  sql text\n"
++     ")"
++  ;
++
++  assert( iDb>=0 && iDb<db->nDb );
++
++  /* zMasterSchema and zInitScript are set to point at the master schema
++  ** and initialisation script appropriate for the database being
++  ** initialised. zMasterName is the name of the master table.
++  */
++  if( iDb==1 ){
++    zMasterSchema = temp_master_schema;
++    zMasterName = TEMP_MASTER_NAME;
++  }else{
++    zMasterSchema = master_schema;
++    zMasterName = MASTER_NAME;
++  }
++
++  /* Construct the schema table.
++  */
++  sqliteSafetyOff(db);
++  azArg[0] = "table";
++  azArg[1] = zMasterName;
++  azArg[2] = "2";
++  azArg[3] = zMasterSchema;
++  sprintf(zDbNum, "%d", iDb);
++  azArg[4] = zDbNum;
++  azArg[5] = 0;
++  initData.db = db;
++  initData.pzErrMsg = pzErrMsg;
++  sqliteInitCallback(&initData, 5, (char **)azArg, 0);
++  pTab = sqliteFindTable(db, zMasterName, db->aDb[iDb].zName);
++  if( pTab ){
++    pTab->readOnly = 1;
++  }else{
++    return SQLITE_NOMEM;
++  }
++  sqliteSafetyOn(db);
++
++  /* Create a cursor to hold the database open
++  */
++  if( db->aDb[iDb].pBt==0 ) return SQLITE_OK;
++  rc = sqliteBtreeCursor(db->aDb[iDb].pBt, 2, 0, &curMain);
++  if( rc ){
++    sqliteSetString(pzErrMsg, sqlite_error_string(rc), (char*)0);
++    return rc;
++  }
++
++  /* Get the database meta information
++  */
++  rc = sqliteBtreeGetMeta(db->aDb[iDb].pBt, meta);
++  if( rc ){
++    sqliteSetString(pzErrMsg, sqlite_error_string(rc), (char*)0);
++    sqliteBtreeCloseCursor(curMain);
++    return rc;
++  }
++  db->aDb[iDb].schema_cookie = meta[1];
++  if( iDb==0 ){
++    db->next_cookie = meta[1];
++    db->file_format = meta[2];
++    size = meta[3];
++    if( size==0 ){ size = MAX_PAGES; }
++    db->cache_size = size;
++    db->safety_level = meta[4];
++    if( meta[6]>0 && meta[6]<=2 && db->temp_store==0 ){
++      db->temp_store = meta[6];
++    }
++    if( db->safety_level==0 ) db->safety_level = 2;
++
++    /*
++    **  file_format==1    Version 2.1.0.
++    **  file_format==2    Version 2.2.0. Add support for INTEGER PRIMARY KEY.
++    **  file_format==3    Version 2.6.0. Fix empty-string index bug.
++    **  file_format==4    Version 2.7.0. Add support for separate numeric and
++    **                    text datatypes.
++    */
++    if( db->file_format==0 ){
++      /* This happens if the database was initially empty */
++      db->file_format = 4;
++    }else if( db->file_format>4 ){
++      sqliteBtreeCloseCursor(curMain);
++      sqliteSetString(pzErrMsg, "unsupported file format", (char*)0);
++      return SQLITE_ERROR;
++    }
++  }else if( iDb!=1 && (db->file_format!=meta[2] || db->file_format<4) ){
++    assert( db->file_format>=4 );
++    if( meta[2]==0 ){
++      sqliteSetString(pzErrMsg, "cannot attach empty database: ",
++         db->aDb[iDb].zName, (char*)0);
++    }else{
++      sqliteSetString(pzErrMsg, "incompatible file format in auxiliary "
++         "database: ", db->aDb[iDb].zName, (char*)0);
++    }
++    sqliteBtreeClose(db->aDb[iDb].pBt);
++    db->aDb[iDb].pBt = 0;
++    return SQLITE_FORMAT;
++  }
++  sqliteBtreeSetCacheSize(db->aDb[iDb].pBt, db->cache_size);
++  sqliteBtreeSetSafetyLevel(db->aDb[iDb].pBt, meta[4]==0 ? 2 : meta[4]);
++
++  /* Read the schema information out of the schema tables
++  */
++  assert( db->init.busy );
++  sqliteSafetyOff(db);
++
++  /* The following SQL will read the schema from the master tables.
++  ** The first version works with SQLite file formats 2 or greater.
++  ** The second version is for format 1 files.
++  **
++  ** Beginning with file format 2, the rowid for new table entries
++  ** (including entries in sqlite_master) is an increasing integer.
++  ** So for file format 2 and later, we can play back sqlite_master
++  ** and all the CREATE statements will appear in the right order.
++  ** But with file format 1, table entries were random and so we
++  ** have to make sure the CREATE TABLEs occur before their corresponding
++  ** CREATE INDEXs.  (We don't have to deal with CREATE VIEW or
++  ** CREATE TRIGGER in file format 1 because those constructs did
++  ** not exist then.) 
++  */
++  if( db->file_format>=2 ){
++    sqliteSetString(&zSql, 
++        "SELECT type, name, rootpage, sql, ", zDbNum, " FROM \"",
++       db->aDb[iDb].zName, "\".", zMasterName, (char*)0);
++  }else{
++    sqliteSetString(&zSql, 
++        "SELECT type, name, rootpage, sql, ", zDbNum, " FROM \"",
++       db->aDb[iDb].zName, "\".", zMasterName, 
++       " WHERE type IN ('table', 'index')"
++       " ORDER BY CASE type WHEN 'table' THEN 0 ELSE 1 END", (char*)0);
++  }
++  rc = sqlite_exec(db, zSql, sqliteInitCallback, &initData, 0);
++
++  sqliteFree(zSql);
++  sqliteSafetyOn(db);
++  sqliteBtreeCloseCursor(curMain);
++  if( sqlite_malloc_failed ){
++    sqliteSetString(pzErrMsg, "out of memory", (char*)0);
++    rc = SQLITE_NOMEM;
++    sqliteResetInternalSchema(db, 0);
++  }
++  if( rc==SQLITE_OK ){
++    DbSetProperty(db, iDb, DB_SchemaLoaded);
++  }else{
++    sqliteResetInternalSchema(db, iDb);
++  }
++  return rc;
++}
++
++/*
++** Initialize all database files - the main database file, the file
++** used to store temporary tables, and any additional database files
++** created using ATTACH statements.  Return a success code.  If an
++** error occurs, write an error message into *pzErrMsg.
++**
++** After the database is initialized, the SQLITE_Initialized
++** bit is set in the flags field of the sqlite structure.  An
++** attempt is made to initialize the database as soon as it
++** is opened.  If that fails (perhaps because another process
++** has the sqlite_master table locked) than another attempt
++** is made the first time the database is accessed.
++*/
++int sqliteInit(sqlite *db, char **pzErrMsg){
++  int i, rc;
++  
++  if( db->init.busy ) return SQLITE_OK;
++  assert( (db->flags & SQLITE_Initialized)==0 );
++  rc = SQLITE_OK;
++  db->init.busy = 1;
++  for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
++    if( DbHasProperty(db, i, DB_SchemaLoaded) || i==1 ) continue;
++    rc = sqliteInitOne(db, i, pzErrMsg);
++    if( rc ){
++      sqliteResetInternalSchema(db, i);
++    }
++  }
++
++  /* Once all the other databases have been initialised, load the schema
++  ** for the TEMP database. This is loaded last, as the TEMP database
++  ** schema may contain references to objects in other databases.
++  */
++  if( rc==SQLITE_OK && db->nDb>1 && !DbHasProperty(db, 1, DB_SchemaLoaded) ){
++    rc = sqliteInitOne(db, 1, pzErrMsg);
++    if( rc ){
++      sqliteResetInternalSchema(db, 1);
++    }
++  }
++
++  db->init.busy = 0;
++  if( rc==SQLITE_OK ){
++    db->flags |= SQLITE_Initialized;
++    sqliteCommitInternalChanges(db);
++  }
++
++  /* If the database is in formats 1 or 2, then upgrade it to
++  ** version 3.  This will reconstruct all indices.  If the
++  ** upgrade fails for any reason (ex: out of disk space, database
++  ** is read only, interrupt received, etc.) then fail the init.
++  */
++  if( rc==SQLITE_OK && db->file_format<3 ){
++    char *zErr = 0;
++    InitData initData;
++    int meta[SQLITE_N_BTREE_META];
++
++    db->magic = SQLITE_MAGIC_OPEN;
++    initData.db = db;
++    initData.pzErrMsg = &zErr;
++    db->file_format = 3;
++    rc = sqlite_exec(db,
++      "BEGIN; SELECT name FROM sqlite_master WHERE type='table';",
++      upgrade_3_callback,
++      &initData,
++      &zErr);
++    if( rc==SQLITE_OK ){
++      sqliteBtreeGetMeta(db->aDb[0].pBt, meta);
++      meta[2] = 4;
++      sqliteBtreeUpdateMeta(db->aDb[0].pBt, meta);
++      sqlite_exec(db, "COMMIT", 0, 0, 0);
++    }
++    if( rc!=SQLITE_OK ){
++      sqliteSetString(pzErrMsg, 
++        "unable to upgrade database to the version 2.6 format",
++        zErr ? ": " : 0, zErr, (char*)0);
++    }
++    sqlite_freemem(zErr);
++  }
++
++  if( rc!=SQLITE_OK ){
++    db->flags &= ~SQLITE_Initialized;
++  }
++  return rc;
++}
++
++/*
++** The version of the library
++*/
++const char rcsid[] = "@(#) \044Id: SQLite version " SQLITE_VERSION " $";
++const char sqlite_version[] = SQLITE_VERSION;
++
++/*
++** Does the library expect data to be encoded as UTF-8 or iso8859?  The
++** following global constant always lets us know.
++*/
++#ifdef SQLITE_UTF8
++const char sqlite_encoding[] = "UTF-8";
++#else
++const char sqlite_encoding[] = "iso8859";
++#endif
++
++/*
++** Open a new SQLite database.  Construct an "sqlite" structure to define
++** the state of this database and return a pointer to that structure.
++**
++** An attempt is made to initialize the in-memory data structures that
++** hold the database schema.  But if this fails (because the schema file
++** is locked) then that step is deferred until the first call to
++** sqlite_exec().
++*/
++sqlite *sqlite_open(const char *zFilename, int mode, char **pzErrMsg){
++  sqlite *db;
++  int rc, i;
++
++  /* Allocate the sqlite data structure */
++  db = sqliteMalloc( sizeof(sqlite) );
++  if( pzErrMsg ) *pzErrMsg = 0;
++  if( db==0 ) goto no_mem_on_open;
++  db->onError = OE_Default;
++  db->priorNewRowid = 0;
++  db->magic = SQLITE_MAGIC_BUSY;
++  db->nDb = 2;
++  db->aDb = db->aDbStatic;
++  /* db->flags |= SQLITE_ShortColNames; */
++  sqliteHashInit(&db->aFunc, SQLITE_HASH_STRING, 1);
++  for(i=0; i<db->nDb; i++){
++    sqliteHashInit(&db->aDb[i].tblHash, SQLITE_HASH_STRING, 0);
++    sqliteHashInit(&db->aDb[i].idxHash, SQLITE_HASH_STRING, 0);
++    sqliteHashInit(&db->aDb[i].trigHash, SQLITE_HASH_STRING, 0);
++    sqliteHashInit(&db->aDb[i].aFKey, SQLITE_HASH_STRING, 1);
++  }
++  
++  /* Open the backend database driver */
++  if( zFilename[0]==':' && strcmp(zFilename,":memory:")==0 ){
++    db->temp_store = 2;
++  }
++  rc = sqliteBtreeFactory(db, zFilename, 0, MAX_PAGES, &db->aDb[0].pBt);
++  if( rc!=SQLITE_OK ){
++    switch( rc ){
++      default: {
++        sqliteSetString(pzErrMsg, "unable to open database: ",
++           zFilename, (char*)0);
++      }
++    }
++    sqliteFree(db);
++    sqliteStrRealloc(pzErrMsg);
++    return 0;
++  }
++  db->aDb[0].zName = "main";
++  db->aDb[1].zName = "temp";
++
++  /* Attempt to read the schema */
++  sqliteRegisterBuiltinFunctions(db);
++  rc = sqliteInit(db, pzErrMsg);
++  db->magic = SQLITE_MAGIC_OPEN;
++  if( sqlite_malloc_failed ){
++    sqlite_close(db);
++    goto no_mem_on_open;
++  }else if( rc!=SQLITE_OK && rc!=SQLITE_BUSY ){
++    sqlite_close(db);
++    sqliteStrRealloc(pzErrMsg);
++    return 0;
++  }else if( pzErrMsg ){
++    sqliteFree(*pzErrMsg);
++    *pzErrMsg = 0;
++  }
++
++  /* Return a pointer to the newly opened database structure */
++  return db;
++
++no_mem_on_open:
++  sqliteSetString(pzErrMsg, "out of memory", (char*)0);
++  sqliteStrRealloc(pzErrMsg);
++  return 0;
++}
++
++/*
++** Return the ROWID of the most recent insert
++*/
++int sqlite_last_insert_rowid(sqlite *db){
++  return db->lastRowid;
++}
++
++/*
++** Return the number of changes in the most recent call to sqlite_exec().
++*/
++int sqlite_changes(sqlite *db){
++  return db->nChange;
++}
++
++/*
++** Return the number of changes produced by the last INSERT, UPDATE, or
++** DELETE statement to complete execution. The count does not include
++** changes due to SQL statements executed in trigger programs that were
++** triggered by that statement
++*/
++int sqlite_last_statement_changes(sqlite *db){
++  return db->lsChange;
++}
++
++/*
++** Close an existing SQLite database
++*/
++void sqlite_close(sqlite *db){
++  HashElem *i;
++  int j;
++  db->want_to_close = 1;
++  if( sqliteSafetyCheck(db) || sqliteSafetyOn(db) ){
++    /* printf("DID NOT CLOSE\n"); fflush(stdout); */
++    return;
++  }
++  db->magic = SQLITE_MAGIC_CLOSED;
++  for(j=0; j<db->nDb; j++){
++    struct Db *pDb = &db->aDb[j];
++    if( pDb->pBt ){
++      sqliteBtreeClose(pDb->pBt);
++      pDb->pBt = 0;
++    }
++  }
++  sqliteResetInternalSchema(db, 0);
++  assert( db->nDb<=2 );
++  assert( db->aDb==db->aDbStatic );
++  for(i=sqliteHashFirst(&db->aFunc); i; i=sqliteHashNext(i)){
++    FuncDef *pFunc, *pNext;
++    for(pFunc = (FuncDef*)sqliteHashData(i); pFunc; pFunc=pNext){
++      pNext = pFunc->pNext;
++      sqliteFree(pFunc);
++    }
++  }
++  sqliteHashClear(&db->aFunc);
++  sqliteFree(db);
++}
++
++/*
++** Rollback all database files.
++*/
++void sqliteRollbackAll(sqlite *db){
++  int i;
++  for(i=0; i<db->nDb; i++){
++    if( db->aDb[i].pBt ){
++      sqliteBtreeRollback(db->aDb[i].pBt);
++      db->aDb[i].inTrans = 0;
++    }
++  }
++  sqliteResetInternalSchema(db, 0);
++  /* sqliteRollbackInternalChanges(db); */
++}
++
++/*
++** Execute SQL code.  Return one of the SQLITE_ success/failure
++** codes.  Also write an error message into memory obtained from
++** malloc() and make *pzErrMsg point to that message.
++**
++** If the SQL is a query, then for each row in the query result
++** the xCallback() function is called.  pArg becomes the first
++** argument to xCallback().  If xCallback=NULL then no callback
++** is invoked, even for queries.
++*/
++int sqlite_exec(
++  sqlite *db,                 /* The database on which the SQL executes */
++  const char *zSql,           /* The SQL to be executed */
++  sqlite_callback xCallback,  /* Invoke this callback routine */
++  void *pArg,                 /* First argument to xCallback() */
++  char **pzErrMsg             /* Write error messages here */
++){
++  int rc = SQLITE_OK;
++  const char *zLeftover;
++  sqlite_vm *pVm;
++  int nRetry = 0;
++  int nChange = 0;
++  int nCallback;
++
++  if( zSql==0 ) return SQLITE_OK;
++  while( rc==SQLITE_OK && zSql[0] ){
++    pVm = 0;
++    rc = sqlite_compile(db, zSql, &zLeftover, &pVm, pzErrMsg);
++    if( rc!=SQLITE_OK ){
++      assert( pVm==0 || sqlite_malloc_failed );
++      return rc;
++    }
++    if( pVm==0 ){
++      /* This happens if the zSql input contained only whitespace */
++      break;
++    }
++    db->nChange += nChange;
++    nCallback = 0;
++    while(1){
++      int nArg;
++      char **azArg, **azCol;
++      rc = sqlite_step(pVm, &nArg, (const char***)&azArg,(const char***)&azCol);
++      if( rc==SQLITE_ROW ){
++        if( xCallback!=0 && xCallback(pArg, nArg, azArg, azCol) ){
++          sqlite_finalize(pVm, 0);
++          return SQLITE_ABORT;
++        }
++        nCallback++;
++      }else{
++        if( rc==SQLITE_DONE && nCallback==0
++          && (db->flags & SQLITE_NullCallback)!=0 && xCallback!=0 ){
++          xCallback(pArg, nArg, azArg, azCol);
++        }
++        rc = sqlite_finalize(pVm, pzErrMsg);
++        if( rc==SQLITE_SCHEMA && nRetry<2 ){
++          nRetry++;
++          rc = SQLITE_OK;
++          break;
++        }
++        if( db->pVdbe==0 ){
++          nChange = db->nChange;
++        }
++        nRetry = 0;
++        zSql = zLeftover;
++        while( isspace(zSql[0]) ) zSql++;
++        break;
++      }
++    }
++  }
++  return rc;
++}
++
++
++/*
++** Compile a single statement of SQL into a virtual machine.  Return one
++** of the SQLITE_ success/failure codes.  Also write an error message into
++** memory obtained from malloc() and make *pzErrMsg point to that message.
++*/
++int sqlite_compile(
++  sqlite *db,                 /* The database on which the SQL executes */
++  const char *zSql,           /* The SQL to be executed */
++  const char **pzTail,        /* OUT: Next statement after the first */
++  sqlite_vm **ppVm,           /* OUT: The virtual machine */
++  char **pzErrMsg             /* OUT: Write error messages here */
++){
++  Parse sParse;
++
++  if( pzErrMsg ) *pzErrMsg = 0;
++  if( sqliteSafetyOn(db) ) goto exec_misuse;
++  if( !db->init.busy ){
++    if( (db->flags & SQLITE_Initialized)==0 ){
++      int rc, cnt = 1;
++      while( (rc = sqliteInit(db, pzErrMsg))==SQLITE_BUSY
++         && db->xBusyCallback
++         && db->xBusyCallback(db->pBusyArg, "", cnt++)!=0 ){}
++      if( rc!=SQLITE_OK ){
++        sqliteStrRealloc(pzErrMsg);
++        sqliteSafetyOff(db);
++        return rc;
++      }
++      if( pzErrMsg ){
++        sqliteFree(*pzErrMsg);
++        *pzErrMsg = 0;
++      }
++    }
++    if( db->file_format<3 ){
++      sqliteSafetyOff(db);
++      sqliteSetString(pzErrMsg, "obsolete database file format", (char*)0);
++      return SQLITE_ERROR;
++    }
++  }
++  assert( (db->flags & SQLITE_Initialized)!=0 || db->init.busy );
++  if( db->pVdbe==0 ){ db->nChange = 0; }
++  memset(&sParse, 0, sizeof(sParse));
++  sParse.db = db;
++  sqliteRunParser(&sParse, zSql, pzErrMsg);
++  if( db->xTrace && !db->init.busy ){
++    /* Trace only the statment that was compiled.
++    ** Make a copy of that part of the SQL string since zSQL is const
++    ** and we must pass a zero terminated string to the trace function
++    ** The copy is unnecessary if the tail pointer is pointing at the
++    ** beginnig or end of the SQL string.
++    */
++    if( sParse.zTail && sParse.zTail!=zSql && *sParse.zTail ){
++      char *tmpSql = sqliteStrNDup(zSql, sParse.zTail - zSql);
++      if( tmpSql ){
++        db->xTrace(db->pTraceArg, tmpSql);
++        free(tmpSql);
++      }else{
++        /* If a memory error occurred during the copy,
++        ** trace entire SQL string and fall through to the
++        ** sqlite_malloc_failed test to report the error.
++        */
++        db->xTrace(db->pTraceArg, zSql); 
++      }
++    }else{
++      db->xTrace(db->pTraceArg, zSql); 
++    }
++  }
++  if( sqlite_malloc_failed ){
++    sqliteSetString(pzErrMsg, "out of memory", (char*)0);
++    sParse.rc = SQLITE_NOMEM;
++    sqliteRollbackAll(db);
++    sqliteResetInternalSchema(db, 0);
++    db->flags &= ~SQLITE_InTrans;
++  }
++  if( sParse.rc==SQLITE_DONE ) sParse.rc = SQLITE_OK;
++  if( sParse.rc!=SQLITE_OK && pzErrMsg && *pzErrMsg==0 ){
++    sqliteSetString(pzErrMsg, sqlite_error_string(sParse.rc), (char*)0);
++  }
++  sqliteStrRealloc(pzErrMsg);
++  if( sParse.rc==SQLITE_SCHEMA ){
++    sqliteResetInternalSchema(db, 0);
++  }
++  assert( ppVm );
++  *ppVm = (sqlite_vm*)sParse.pVdbe;
++  if( pzTail ) *pzTail = sParse.zTail;
++  if( sqliteSafetyOff(db) ) goto exec_misuse;
++  return sParse.rc;
++
++exec_misuse:
++  if( pzErrMsg ){
++    *pzErrMsg = 0;
++    sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), (char*)0);
++    sqliteStrRealloc(pzErrMsg);
++  }
++  return SQLITE_MISUSE;
++}
++
++
++/*
++** The following routine destroys a virtual machine that is created by
++** the sqlite_compile() routine.
++**
++** The integer returned is an SQLITE_ success/failure code that describes
++** the result of executing the virtual machine.  An error message is
++** written into memory obtained from malloc and *pzErrMsg is made to
++** point to that error if pzErrMsg is not NULL.  The calling routine
++** should use sqlite_freemem() to delete the message when it has finished
++** with it.
++*/
++int sqlite_finalize(
++  sqlite_vm *pVm,            /* The virtual machine to be destroyed */
++  char **pzErrMsg            /* OUT: Write error messages here */
++){
++  int rc = sqliteVdbeFinalize((Vdbe*)pVm, pzErrMsg);
++  sqliteStrRealloc(pzErrMsg);
++  return rc;
++}
++
++/*
++** Terminate the current execution of a virtual machine then
++** reset the virtual machine back to its starting state so that it
++** can be reused.  Any error message resulting from the prior execution
++** is written into *pzErrMsg.  A success code from the prior execution
++** is returned.
++*/
++int sqlite_reset(
++  sqlite_vm *pVm,            /* The virtual machine to be destroyed */
++  char **pzErrMsg            /* OUT: Write error messages here */
++){
++  int rc = sqliteVdbeReset((Vdbe*)pVm, pzErrMsg);
++  sqliteVdbeMakeReady((Vdbe*)pVm, -1, 0);
++  sqliteStrRealloc(pzErrMsg);
++  return rc;
++}
++
++/*
++** Return a static string that describes the kind of error specified in the
++** argument.
++*/
++const char *sqlite_error_string(int rc){
++  const char *z;
++  switch( rc ){
++    case SQLITE_OK:         z = "not an error";                          break;
++    case SQLITE_ERROR:      z = "SQL logic error or missing database";   break;
++    case SQLITE_INTERNAL:   z = "internal SQLite implementation flaw";   break;
++    case SQLITE_PERM:       z = "access permission denied";              break;
++    case SQLITE_ABORT:      z = "callback requested query abort";        break;
++    case SQLITE_BUSY:       z = "database is locked";                    break;
++    case SQLITE_LOCKED:     z = "database table is locked";              break;
++    case SQLITE_NOMEM:      z = "out of memory";                         break;
++    case SQLITE_READONLY:   z = "attempt to write a readonly database";  break;
++    case SQLITE_INTERRUPT:  z = "interrupted";                           break;
++    case SQLITE_IOERR:      z = "disk I/O error";                        break;
++    case SQLITE_CORRUPT:    z = "database disk image is malformed";      break;
++    case SQLITE_NOTFOUND:   z = "table or record not found";             break;
++    case SQLITE_FULL:       z = "database is full";                      break;
++    case SQLITE_CANTOPEN:   z = "unable to open database file";          break;
++    case SQLITE_PROTOCOL:   z = "database locking protocol failure";     break;
++    case SQLITE_EMPTY:      z = "table contains no data";                break;
++    case SQLITE_SCHEMA:     z = "database schema has changed";           break;
++    case SQLITE_TOOBIG:     z = "too much data for one table row";       break;
++    case SQLITE_CONSTRAINT: z = "constraint failed";                     break;
++    case SQLITE_MISMATCH:   z = "datatype mismatch";                     break;
++    case SQLITE_MISUSE:     z = "library routine called out of sequence";break;
++    case SQLITE_NOLFS:      z = "kernel lacks large file support";       break;
++    case SQLITE_AUTH:       z = "authorization denied";                  break;
++    case SQLITE_FORMAT:     z = "auxiliary database format error";       break;
++    case SQLITE_RANGE:      z = "bind index out of range";               break;
++    case SQLITE_NOTADB:     z = "file is encrypted or is not a database";break;
++    default:                z = "unknown error";                         break;
++  }
++  return z;
++}
++
++/*
++** This routine implements a busy callback that sleeps and tries
++** again until a timeout value is reached.  The timeout value is
++** an integer number of milliseconds passed in as the first
++** argument.
++*/
++static int sqliteDefaultBusyCallback(
++ void *Timeout,           /* Maximum amount of time to wait */
++ const char *NotUsed,     /* The name of the table that is busy */
++ int count                /* Number of times table has been busy */
++){
++#if SQLITE_MIN_SLEEP_MS==1
++  static const char delays[] =
++     { 1, 2, 5, 10, 15, 20, 25, 25,  25,  50,  50,  50, 100};
++  static const short int totals[] =
++     { 0, 1, 3,  8, 18, 33, 53, 78, 103, 128, 178, 228, 287};
++# define NDELAY (sizeof(delays)/sizeof(delays[0]))
++  int timeout = (int)(long)Timeout;
++  int delay, prior;
++
++  if( count <= NDELAY ){
++    delay = delays[count-1];
++    prior = totals[count-1];
++  }else{
++    delay = delays[NDELAY-1];
++    prior = totals[NDELAY-1] + delay*(count-NDELAY-1);
++  }
++  if( prior + delay > timeout ){
++    delay = timeout - prior;
++    if( delay<=0 ) return 0;
++  }
++  sqliteOsSleep(delay);
++  return 1;
++#else
++  int timeout = (int)(long)Timeout;
++  if( (count+1)*1000 > timeout ){
++    return 0;
++  }
++  sqliteOsSleep(1000);
++  return 1;
++#endif
++}
++
++/*
++** This routine sets the busy callback for an Sqlite database to the
++** given callback function with the given argument.
++*/
++void sqlite_busy_handler(
++  sqlite *db,
++  int (*xBusy)(void*,const char*,int),
++  void *pArg
++){
++  db->xBusyCallback = xBusy;
++  db->pBusyArg = pArg;
++}
++
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++/*
++** This routine sets the progress callback for an Sqlite database to the
++** given callback function with the given argument. The progress callback will
++** be invoked every nOps opcodes.
++*/
++void sqlite_progress_handler(
++  sqlite *db, 
++  int nOps,
++  int (*xProgress)(void*), 
++  void *pArg
++){
++  if( nOps>0 ){
++    db->xProgress = xProgress;
++    db->nProgressOps = nOps;
++    db->pProgressArg = pArg;
++  }else{
++    db->xProgress = 0;
++    db->nProgressOps = 0;
++    db->pProgressArg = 0;
++  }
++}
++#endif
++
++
++/*
++** This routine installs a default busy handler that waits for the
++** specified number of milliseconds before returning 0.
++*/
++void sqlite_busy_timeout(sqlite *db, int ms){
++  if( ms>0 ){
++    sqlite_busy_handler(db, sqliteDefaultBusyCallback, (void*)(long)ms);
++  }else{
++    sqlite_busy_handler(db, 0, 0);
++  }
++}
++
++/*
++** Cause any pending operation to stop at its earliest opportunity.
++*/
++void sqlite_interrupt(sqlite *db){
++  db->flags |= SQLITE_Interrupt;
++}
++
++/*
++** Windows systems should call this routine to free memory that
++** is returned in the in the errmsg parameter of sqlite_open() when
++** SQLite is a DLL.  For some reason, it does not work to call free()
++** directly.
++**
++** Note that we need to call free() not sqliteFree() here, since every
++** string that is exported from SQLite should have already passed through
++** sqliteStrRealloc().
++*/
++void sqlite_freemem(void *p){ free(p); }
++
++/*
++** Windows systems need functions to call to return the sqlite_version
++** and sqlite_encoding strings since they are unable to access constants
++** within DLLs.
++*/
++const char *sqlite_libversion(void){ return sqlite_version; }
++const char *sqlite_libencoding(void){ return sqlite_encoding; }
++
++/*
++** Create new user-defined functions.  The sqlite_create_function()
++** routine creates a regular function and sqlite_create_aggregate()
++** creates an aggregate function.
++**
++** Passing a NULL xFunc argument or NULL xStep and xFinalize arguments
++** disables the function.  Calling sqlite_create_function() with the
++** same name and number of arguments as a prior call to
++** sqlite_create_aggregate() disables the prior call to
++** sqlite_create_aggregate(), and vice versa.
++**
++** If nArg is -1 it means that this function will accept any number
++** of arguments, including 0.  The maximum allowed value of nArg is 127.
++*/
++int sqlite_create_function(
++  sqlite *db,          /* Add the function to this database connection */
++  const char *zName,   /* Name of the function to add */
++  int nArg,            /* Number of arguments */
++  void (*xFunc)(sqlite_func*,int,const char**),  /* The implementation */
++  void *pUserData      /* User data */
++){
++  FuncDef *p;
++  int nName;
++  if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1;
++  if( nArg<-1 || nArg>127 ) return 1;
++  nName = strlen(zName);
++  if( nName>255 ) return 1;
++  p = sqliteFindFunction(db, zName, nName, nArg, 1);
++  if( p==0 ) return 1;
++  p->xFunc = xFunc;
++  p->xStep = 0;
++  p->xFinalize = 0;
++  p->pUserData = pUserData;
++  return 0;
++}
++int sqlite_create_aggregate(
++  sqlite *db,          /* Add the function to this database connection */
++  const char *zName,   /* Name of the function to add */
++  int nArg,            /* Number of arguments */
++  void (*xStep)(sqlite_func*,int,const char**), /* The step function */
++  void (*xFinalize)(sqlite_func*),              /* The finalizer */
++  void *pUserData      /* User data */
++){
++  FuncDef *p;
++  int nName;
++  if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1;
++  if( nArg<-1 || nArg>127 ) return 1;
++  nName = strlen(zName);
++  if( nName>255 ) return 1;
++  p = sqliteFindFunction(db, zName, nName, nArg, 1);
++  if( p==0 ) return 1;
++  p->xFunc = 0;
++  p->xStep = xStep;
++  p->xFinalize = xFinalize;
++  p->pUserData = pUserData;
++  return 0;
++}
++
++/*
++** Change the datatype for all functions with a given name.  See the
++** header comment for the prototype of this function in sqlite.h for
++** additional information.
++*/
++int sqlite_function_type(sqlite *db, const char *zName, int dataType){
++  FuncDef *p = (FuncDef*)sqliteHashFind(&db->aFunc, zName, strlen(zName));
++  while( p ){
++    p->dataType = dataType; 
++    p = p->pNext;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Register a trace function.  The pArg from the previously registered trace
++** is returned.  
++**
++** A NULL trace function means that no tracing is executes.  A non-NULL
++** trace is a pointer to a function that is invoked at the start of each
++** sqlite_exec().
++*/
++void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){
++  void *pOld = db->pTraceArg;
++  db->xTrace = xTrace;
++  db->pTraceArg = pArg;
++  return pOld;
++}
++
++/*** EXPERIMENTAL ***
++**
++** Register a function to be invoked when a transaction comments.
++** If either function returns non-zero, then the commit becomes a
++** rollback.
++*/
++void *sqlite_commit_hook(
++  sqlite *db,               /* Attach the hook to this database */
++  int (*xCallback)(void*),  /* Function to invoke on each commit */
++  void *pArg                /* Argument to the function */
++){
++  void *pOld = db->pCommitArg;
++  db->xCommitCallback = xCallback;
++  db->pCommitArg = pArg;
++  return pOld;
++}
++
++
++/*
++** This routine is called to create a connection to a database BTree
++** driver.  If zFilename is the name of a file, then that file is
++** opened and used.  If zFilename is the magic name ":memory:" then
++** the database is stored in memory (and is thus forgotten as soon as
++** the connection is closed.)  If zFilename is NULL then the database
++** is for temporary use only and is deleted as soon as the connection
++** is closed.
++**
++** A temporary database can be either a disk file (that is automatically
++** deleted when the file is closed) or a set of red-black trees held in memory,
++** depending on the values of the TEMP_STORE compile-time macro and the
++** db->temp_store variable, according to the following chart:
++**
++**       TEMP_STORE     db->temp_store     Location of temporary database
++**       ----------     --------------     ------------------------------
++**           0               any             file
++**           1                1              file
++**           1                2              memory
++**           1                0              file
++**           2                1              file
++**           2                2              memory
++**           2                0              memory
++**           3               any             memory
++*/
++int sqliteBtreeFactory(
++  const sqlite *db,	    /* Main database when opening aux otherwise 0 */
++  const char *zFilename,    /* Name of the file containing the BTree database */
++  int omitJournal,          /* if TRUE then do not journal this file */
++  int nCache,               /* How many pages in the page cache */
++  Btree **ppBtree){         /* Pointer to new Btree object written here */
++
++  assert( ppBtree != 0);
++
++#ifndef SQLITE_OMIT_INMEMORYDB
++  if( zFilename==0 ){
++    if (TEMP_STORE == 0) {
++      /* Always use file based temporary DB */
++      return sqliteBtreeOpen(0, omitJournal, nCache, ppBtree);
++    } else if (TEMP_STORE == 1 || TEMP_STORE == 2) {
++      /* Switch depending on compile-time and/or runtime settings. */
++      int location = db->temp_store==0 ? TEMP_STORE : db->temp_store;
++
++      if (location == 1) {
++        return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree);
++      } else {
++        return sqliteRbtreeOpen(0, 0, 0, ppBtree);
++      }
++    } else {
++      /* Always use in-core DB */
++      return sqliteRbtreeOpen(0, 0, 0, ppBtree);
++    }
++  }else if( zFilename[0]==':' && strcmp(zFilename,":memory:")==0 ){
++    return sqliteRbtreeOpen(0, 0, 0, ppBtree);
++  }else
++#endif
++  {
++    return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree);
++  }
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/opcodes.c
+@@ -0,0 +1,140 @@
++/* Automatically generated file.  Do not edit */
++char *sqliteOpcodeNames[] = { "???", 
++  "Goto", 
++  "Gosub", 
++  "Return", 
++  "Halt", 
++  "Integer", 
++  "String", 
++  "Variable", 
++  "Pop", 
++  "Dup", 
++  "Pull", 
++  "Push", 
++  "ColumnName", 
++  "Callback", 
++  "Concat", 
++  "Add", 
++  "Subtract", 
++  "Multiply", 
++  "Divide", 
++  "Remainder", 
++  "Function", 
++  "BitAnd", 
++  "BitOr", 
++  "ShiftLeft", 
++  "ShiftRight", 
++  "AddImm", 
++  "ForceInt", 
++  "MustBeInt", 
++  "Eq", 
++  "Ne", 
++  "Lt", 
++  "Le", 
++  "Gt", 
++  "Ge", 
++  "StrEq", 
++  "StrNe", 
++  "StrLt", 
++  "StrLe", 
++  "StrGt", 
++  "StrGe", 
++  "And", 
++  "Or", 
++  "Negative", 
++  "AbsValue", 
++  "Not", 
++  "BitNot", 
++  "Noop", 
++  "If", 
++  "IfNot", 
++  "IsNull", 
++  "NotNull", 
++  "MakeRecord", 
++  "MakeIdxKey", 
++  "MakeKey", 
++  "IncrKey", 
++  "Checkpoint", 
++  "Transaction", 
++  "Commit", 
++  "Rollback", 
++  "ReadCookie", 
++  "SetCookie", 
++  "VerifyCookie", 
++  "OpenRead", 
++  "OpenWrite", 
++  "OpenTemp", 
++  "OpenPseudo", 
++  "Close", 
++  "MoveLt", 
++  "MoveTo", 
++  "Distinct", 
++  "NotFound", 
++  "Found", 
++  "IsUnique", 
++  "NotExists", 
++  "NewRecno", 
++  "PutIntKey", 
++  "PutStrKey", 
++  "Delete", 
++  "SetCounts", 
++  "KeyAsData", 
++  "RowKey", 
++  "RowData", 
++  "Column", 
++  "Recno", 
++  "FullKey", 
++  "NullRow", 
++  "Last", 
++  "Rewind", 
++  "Prev", 
++  "Next", 
++  "IdxPut", 
++  "IdxDelete", 
++  "IdxRecno", 
++  "IdxLT", 
++  "IdxGT", 
++  "IdxGE", 
++  "IdxIsNull", 
++  "Destroy", 
++  "Clear", 
++  "CreateIndex", 
++  "CreateTable", 
++  "IntegrityCk", 
++  "ListWrite", 
++  "ListRewind", 
++  "ListRead", 
++  "ListReset", 
++  "ListPush", 
++  "ListPop", 
++  "ContextPush", 
++  "ContextPop", 
++  "SortPut", 
++  "SortMakeRec", 
++  "SortMakeKey", 
++  "Sort", 
++  "SortNext", 
++  "SortCallback", 
++  "SortReset", 
++  "FileOpen", 
++  "FileRead", 
++  "FileColumn", 
++  "MemStore", 
++  "MemLoad", 
++  "MemIncr", 
++  "AggReset", 
++  "AggInit", 
++  "AggFunc", 
++  "AggFocus", 
++  "AggSet", 
++  "AggGet", 
++  "AggNext", 
++  "SetInsert", 
++  "SetFound", 
++  "SetNotFound", 
++  "SetFirst", 
++  "SetNext", 
++  "Vacuum", 
++  "StackDepth", 
++  "StackReset", 
++};
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/opcodes.h
+@@ -0,0 +1,138 @@
++/* Automatically generated file.  Do not edit */
++#define OP_Goto                          1
++#define OP_Gosub                         2
++#define OP_Return                        3
++#define OP_Halt                          4
++#define OP_Integer                       5
++#define OP_String                        6
++#define OP_Variable                      7
++#define OP_Pop                           8
++#define OP_Dup                           9
++#define OP_Pull                         10
++#define OP_Push                         11
++#define OP_ColumnName                   12
++#define OP_Callback                     13
++#define OP_Concat                       14
++#define OP_Add                          15
++#define OP_Subtract                     16
++#define OP_Multiply                     17
++#define OP_Divide                       18
++#define OP_Remainder                    19
++#define OP_Function                     20
++#define OP_BitAnd                       21
++#define OP_BitOr                        22
++#define OP_ShiftLeft                    23
++#define OP_ShiftRight                   24
++#define OP_AddImm                       25
++#define OP_ForceInt                     26
++#define OP_MustBeInt                    27
++#define OP_Eq                           28
++#define OP_Ne                           29
++#define OP_Lt                           30
++#define OP_Le                           31
++#define OP_Gt                           32
++#define OP_Ge                           33
++#define OP_StrEq                        34
++#define OP_StrNe                        35
++#define OP_StrLt                        36
++#define OP_StrLe                        37
++#define OP_StrGt                        38
++#define OP_StrGe                        39
++#define OP_And                          40
++#define OP_Or                           41
++#define OP_Negative                     42
++#define OP_AbsValue                     43
++#define OP_Not                          44
++#define OP_BitNot                       45
++#define OP_Noop                         46
++#define OP_If                           47
++#define OP_IfNot                        48
++#define OP_IsNull                       49
++#define OP_NotNull                      50
++#define OP_MakeRecord                   51
++#define OP_MakeIdxKey                   52
++#define OP_MakeKey                      53
++#define OP_IncrKey                      54
++#define OP_Checkpoint                   55
++#define OP_Transaction                  56
++#define OP_Commit                       57
++#define OP_Rollback                     58
++#define OP_ReadCookie                   59
++#define OP_SetCookie                    60
++#define OP_VerifyCookie                 61
++#define OP_OpenRead                     62
++#define OP_OpenWrite                    63
++#define OP_OpenTemp                     64
++#define OP_OpenPseudo                   65
++#define OP_Close                        66
++#define OP_MoveLt                       67
++#define OP_MoveTo                       68
++#define OP_Distinct                     69
++#define OP_NotFound                     70
++#define OP_Found                        71
++#define OP_IsUnique                     72
++#define OP_NotExists                    73
++#define OP_NewRecno                     74
++#define OP_PutIntKey                    75
++#define OP_PutStrKey                    76
++#define OP_Delete                       77
++#define OP_SetCounts                    78
++#define OP_KeyAsData                    79
++#define OP_RowKey                       80
++#define OP_RowData                      81
++#define OP_Column                       82
++#define OP_Recno                        83
++#define OP_FullKey                      84
++#define OP_NullRow                      85
++#define OP_Last                         86
++#define OP_Rewind                       87
++#define OP_Prev                         88
++#define OP_Next                         89
++#define OP_IdxPut                       90
++#define OP_IdxDelete                    91
++#define OP_IdxRecno                     92
++#define OP_IdxLT                        93
++#define OP_IdxGT                        94
++#define OP_IdxGE                        95
++#define OP_IdxIsNull                    96
++#define OP_Destroy                      97
++#define OP_Clear                        98
++#define OP_CreateIndex                  99
++#define OP_CreateTable                 100
++#define OP_IntegrityCk                 101
++#define OP_ListWrite                   102
++#define OP_ListRewind                  103
++#define OP_ListRead                    104
++#define OP_ListReset                   105
++#define OP_ListPush                    106
++#define OP_ListPop                     107
++#define OP_ContextPush                 108
++#define OP_ContextPop                  109
++#define OP_SortPut                     110
++#define OP_SortMakeRec                 111
++#define OP_SortMakeKey                 112
++#define OP_Sort                        113
++#define OP_SortNext                    114
++#define OP_SortCallback                115
++#define OP_SortReset                   116
++#define OP_FileOpen                    117
++#define OP_FileRead                    118
++#define OP_FileColumn                  119
++#define OP_MemStore                    120
++#define OP_MemLoad                     121
++#define OP_MemIncr                     122
++#define OP_AggReset                    123
++#define OP_AggInit                     124
++#define OP_AggFunc                     125
++#define OP_AggFocus                    126
++#define OP_AggSet                      127
++#define OP_AggGet                      128
++#define OP_AggNext                     129
++#define OP_SetInsert                   130
++#define OP_SetFound                    131
++#define OP_SetNotFound                 132
++#define OP_SetFirst                    133
++#define OP_SetNext                     134
++#define OP_Vacuum                      135
++#define OP_StackDepth                  136
++#define OP_StackReset                  137
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/os.c
+@@ -0,0 +1,1850 @@
++/*
++** 2001 September 16
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This file contains code that is specific to particular operating
++** systems.  The purpose of this file is to provide a uniform abstraction
++** on which the rest of SQLite can operate.
++*/
++#include "os.h"          /* Must be first to enable large file support */
++#include "sqliteInt.h"
++
++#if OS_UNIX
++# include <time.h>
++# include <errno.h>
++# include <unistd.h>
++# ifndef O_LARGEFILE
++#  define O_LARGEFILE 0
++# endif
++# ifdef SQLITE_DISABLE_LFS
++#  undef O_LARGEFILE
++#  define O_LARGEFILE 0
++# endif
++# ifndef O_NOFOLLOW
++#  define O_NOFOLLOW 0
++# endif
++# ifndef O_BINARY
++#  define O_BINARY 0
++# endif
++#endif
++
++
++#if OS_WIN
++# include <winbase.h>
++#endif
++
++#if OS_MAC
++# include <extras.h>
++# include <path2fss.h>
++# include <TextUtils.h>
++# include <FinderRegistry.h>
++# include <Folders.h>
++# include <Timer.h>
++# include <OSUtils.h>
++#endif
++
++/*
++** The DJGPP compiler environment looks mostly like Unix, but it
++** lacks the fcntl() system call.  So redefine fcntl() to be something
++** that always succeeds.  This means that locking does not occur under
++** DJGPP.  But its DOS - what did you expect?
++*/
++#ifdef __DJGPP__
++# define fcntl(A,B,C) 0
++#endif
++
++/*
++** Macros used to determine whether or not to use threads.  The
++** SQLITE_UNIX_THREADS macro is defined if we are synchronizing for
++** Posix threads and SQLITE_W32_THREADS is defined if we are
++** synchronizing using Win32 threads.
++*/
++#if OS_UNIX && defined(THREADSAFE) && THREADSAFE
++# include <pthread.h>
++# define SQLITE_UNIX_THREADS 1
++#endif
++#if OS_WIN && defined(THREADSAFE) && THREADSAFE
++# define SQLITE_W32_THREADS 1
++#endif
++#if OS_MAC && defined(THREADSAFE) && THREADSAFE
++# include <Multiprocessing.h>
++# define SQLITE_MACOS_MULTITASKING 1
++#endif
++
++/*
++** Macros for performance tracing.  Normally turned off
++*/
++#if 0
++static int last_page = 0;
++__inline__ unsigned long long int hwtime(void){
++  unsigned long long int x;
++  __asm__("rdtsc\n\t"
++          "mov %%edx, %%ecx\n\t"
++          :"=A" (x));
++  return x;
++}
++static unsigned long long int g_start;
++static unsigned int elapse;
++#define TIMER_START       g_start=hwtime()
++#define TIMER_END         elapse=hwtime()-g_start
++#define SEEK(X)           last_page=(X)
++#define TRACE1(X)         fprintf(stderr,X)
++#define TRACE2(X,Y)       fprintf(stderr,X,Y)
++#define TRACE3(X,Y,Z)     fprintf(stderr,X,Y,Z)
++#define TRACE4(X,Y,Z,A)   fprintf(stderr,X,Y,Z,A)
++#define TRACE5(X,Y,Z,A,B) fprintf(stderr,X,Y,Z,A,B)
++#else
++#define TIMER_START
++#define TIMER_END
++#define SEEK(X)
++#define TRACE1(X)
++#define TRACE2(X,Y)
++#define TRACE3(X,Y,Z)
++#define TRACE4(X,Y,Z,A)
++#define TRACE5(X,Y,Z,A,B)
++#endif
++
++
++#if OS_UNIX
++/*
++** Here is the dirt on POSIX advisory locks:  ANSI STD 1003.1 (1996)
++** section 6.5.2.2 lines 483 through 490 specify that when a process
++** sets or clears a lock, that operation overrides any prior locks set
++** by the same process.  It does not explicitly say so, but this implies
++** that it overrides locks set by the same process using a different
++** file descriptor.  Consider this test case:
++**
++**       int fd1 = open("./file1", O_RDWR|O_CREAT, 0644);
++**       int fd2 = open("./file2", O_RDWR|O_CREAT, 0644);
++**
++** Suppose ./file1 and ./file2 are really the same file (because
++** one is a hard or symbolic link to the other) then if you set
++** an exclusive lock on fd1, then try to get an exclusive lock
++** on fd2, it works.  I would have expected the second lock to
++** fail since there was already a lock on the file due to fd1.
++** But not so.  Since both locks came from the same process, the
++** second overrides the first, even though they were on different
++** file descriptors opened on different file names.
++**
++** Bummer.  If you ask me, this is broken.  Badly broken.  It means
++** that we cannot use POSIX locks to synchronize file access among
++** competing threads of the same process.  POSIX locks will work fine
++** to synchronize access for threads in separate processes, but not
++** threads within the same process.
++**
++** To work around the problem, SQLite has to manage file locks internally
++** on its own.  Whenever a new database is opened, we have to find the
++** specific inode of the database file (the inode is determined by the
++** st_dev and st_ino fields of the stat structure that fstat() fills in)
++** and check for locks already existing on that inode.  When locks are
++** created or removed, we have to look at our own internal record of the
++** locks to see if another thread has previously set a lock on that same
++** inode.
++**
++** The OsFile structure for POSIX is no longer just an integer file
++** descriptor.  It is now a structure that holds the integer file
++** descriptor and a pointer to a structure that describes the internal
++** locks on the corresponding inode.  There is one locking structure
++** per inode, so if the same inode is opened twice, both OsFile structures
++** point to the same locking structure.  The locking structure keeps
++** a reference count (so we will know when to delete it) and a "cnt"
++** field that tells us its internal lock status.  cnt==0 means the
++** file is unlocked.  cnt==-1 means the file has an exclusive lock.
++** cnt>0 means there are cnt shared locks on the file.
++**
++** Any attempt to lock or unlock a file first checks the locking
++** structure.  The fcntl() system call is only invoked to set a 
++** POSIX lock if the internal lock structure transitions between
++** a locked and an unlocked state.
++**
++** 2004-Jan-11:
++** More recent discoveries about POSIX advisory locks.  (The more
++** I discover, the more I realize the a POSIX advisory locks are
++** an abomination.)
++**
++** If you close a file descriptor that points to a file that has locks,
++** all locks on that file that are owned by the current process are
++** released.  To work around this problem, each OsFile structure contains
++** a pointer to an openCnt structure.  There is one openCnt structure
++** per open inode, which means that multiple OsFiles can point to a single
++** openCnt.  When an attempt is made to close an OsFile, if there are
++** other OsFiles open on the same inode that are holding locks, the call
++** to close() the file descriptor is deferred until all of the locks clear.
++** The openCnt structure keeps a list of file descriptors that need to
++** be closed and that list is walked (and cleared) when the last lock
++** clears.
++**
++** First, under Linux threads, because each thread has a separate
++** process ID, lock operations in one thread do not override locks
++** to the same file in other threads.  Linux threads behave like
++** separate processes in this respect.  But, if you close a file
++** descriptor in linux threads, all locks are cleared, even locks
++** on other threads and even though the other threads have different
++** process IDs.  Linux threads is inconsistent in this respect.
++** (I'm beginning to think that linux threads is an abomination too.)
++** The consequence of this all is that the hash table for the lockInfo
++** structure has to include the process id as part of its key because
++** locks in different threads are treated as distinct.  But the 
++** openCnt structure should not include the process id in its
++** key because close() clears lock on all threads, not just the current
++** thread.  Were it not for this goofiness in linux threads, we could
++** combine the lockInfo and openCnt structures into a single structure.
++*/
++
++/*
++** An instance of the following structure serves as the key used
++** to locate a particular lockInfo structure given its inode.  Note
++** that we have to include the process ID as part of the key.  On some
++** threading implementations (ex: linux), each thread has a separate
++** process ID.
++*/
++struct lockKey {
++  dev_t dev;   /* Device number */
++  ino_t ino;   /* Inode number */
++  pid_t pid;   /* Process ID */
++};
++
++/*
++** An instance of the following structure is allocated for each open
++** inode on each thread with a different process ID.  (Threads have
++** different process IDs on linux, but not on most other unixes.)
++**
++** A single inode can have multiple file descriptors, so each OsFile
++** structure contains a pointer to an instance of this object and this
++** object keeps a count of the number of OsFiles pointing to it.
++*/
++struct lockInfo {
++  struct lockKey key;  /* The lookup key */
++  int cnt;             /* 0: unlocked.  -1: write lock.  1...: read lock. */
++  int nRef;            /* Number of pointers to this structure */
++};
++
++/*
++** An instance of the following structure serves as the key used
++** to locate a particular openCnt structure given its inode.  This
++** is the same as the lockKey except that the process ID is omitted.
++*/
++struct openKey {
++  dev_t dev;   /* Device number */
++  ino_t ino;   /* Inode number */
++};
++
++/*
++** An instance of the following structure is allocated for each open
++** inode.  This structure keeps track of the number of locks on that
++** inode.  If a close is attempted against an inode that is holding
++** locks, the close is deferred until all locks clear by adding the
++** file descriptor to be closed to the pending list.
++*/
++struct openCnt {
++  struct openKey key;   /* The lookup key */
++  int nRef;             /* Number of pointers to this structure */
++  int nLock;            /* Number of outstanding locks */
++  int nPending;         /* Number of pending close() operations */
++  int *aPending;        /* Malloced space holding fd's awaiting a close() */
++};
++
++/* 
++** These hash table maps inodes and process IDs into lockInfo and openCnt
++** structures.  Access to these hash tables must be protected by a mutex.
++*/
++static Hash lockHash = { SQLITE_HASH_BINARY, 0, 0, 0, 0, 0 };
++static Hash openHash = { SQLITE_HASH_BINARY, 0, 0, 0, 0, 0 };
++
++/*
++** Release a lockInfo structure previously allocated by findLockInfo().
++*/
++static void releaseLockInfo(struct lockInfo *pLock){
++  pLock->nRef--;
++  if( pLock->nRef==0 ){
++    sqliteHashInsert(&lockHash, &pLock->key, sizeof(pLock->key), 0);
++    sqliteFree(pLock);
++  }
++}
++
++/*
++** Release a openCnt structure previously allocated by findLockInfo().
++*/
++static void releaseOpenCnt(struct openCnt *pOpen){
++  pOpen->nRef--;
++  if( pOpen->nRef==0 ){
++    sqliteHashInsert(&openHash, &pOpen->key, sizeof(pOpen->key), 0);
++    sqliteFree(pOpen->aPending);
++    sqliteFree(pOpen);
++  }
++}
++
++/*
++** Given a file descriptor, locate lockInfo and openCnt structures that
++** describes that file descriptor.  Create a new ones if necessary.  The
++** return values might be unset if an error occurs.
++**
++** Return the number of errors.
++*/
++int findLockInfo(
++  int fd,                      /* The file descriptor used in the key */
++  struct lockInfo **ppLock,    /* Return the lockInfo structure here */
++  struct openCnt **ppOpen   /* Return the openCnt structure here */
++){
++  int rc;
++  struct lockKey key1;
++  struct openKey key2;
++  struct stat statbuf;
++  struct lockInfo *pLock;
++  struct openCnt *pOpen;
++  rc = fstat(fd, &statbuf);
++  if( rc!=0 ) return 1;
++  memset(&key1, 0, sizeof(key1));
++  key1.dev = statbuf.st_dev;
++  key1.ino = statbuf.st_ino;
++  key1.pid = getpid();
++  memset(&key2, 0, sizeof(key2));
++  key2.dev = statbuf.st_dev;
++  key2.ino = statbuf.st_ino;
++  pLock = (struct lockInfo*)sqliteHashFind(&lockHash, &key1, sizeof(key1));
++  if( pLock==0 ){
++    struct lockInfo *pOld;
++    pLock = sqliteMallocRaw( sizeof(*pLock) );
++    if( pLock==0 ) return 1;
++    pLock->key = key1;
++    pLock->nRef = 1;
++    pLock->cnt = 0;
++    pOld = sqliteHashInsert(&lockHash, &pLock->key, sizeof(key1), pLock);
++    if( pOld!=0 ){
++      assert( pOld==pLock );
++      sqliteFree(pLock);
++      return 1;
++    }
++  }else{
++    pLock->nRef++;
++  }
++  *ppLock = pLock;
++  pOpen = (struct openCnt*)sqliteHashFind(&openHash, &key2, sizeof(key2));
++  if( pOpen==0 ){
++    struct openCnt *pOld;
++    pOpen = sqliteMallocRaw( sizeof(*pOpen) );
++    if( pOpen==0 ){
++      releaseLockInfo(pLock);
++      return 1;
++    }
++    pOpen->key = key2;
++    pOpen->nRef = 1;
++    pOpen->nLock = 0;
++    pOpen->nPending = 0;
++    pOpen->aPending = 0;
++    pOld = sqliteHashInsert(&openHash, &pOpen->key, sizeof(key2), pOpen);
++    if( pOld!=0 ){
++      assert( pOld==pOpen );
++      sqliteFree(pOpen);
++      releaseLockInfo(pLock);
++      return 1;
++    }
++  }else{
++    pOpen->nRef++;
++  }
++  *ppOpen = pOpen;
++  return 0;
++}
++
++#endif  /** POSIX advisory lock work-around **/
++
++/*
++** If we compile with the SQLITE_TEST macro set, then the following block
++** of code will give us the ability to simulate a disk I/O error.  This
++** is used for testing the I/O recovery logic.
++*/
++#ifdef SQLITE_TEST
++int sqlite_io_error_pending = 0;
++#define SimulateIOError(A)  \
++   if( sqlite_io_error_pending ) \
++     if( sqlite_io_error_pending-- == 1 ){ local_ioerr(); return A; }
++static void local_ioerr(){
++  sqlite_io_error_pending = 0;  /* Really just a place to set a breakpoint */
++}
++#else
++#define SimulateIOError(A)
++#endif
++
++/*
++** When testing, keep a count of the number of open files.
++*/
++#ifdef SQLITE_TEST
++int sqlite_open_file_count = 0;
++#define OpenCounter(X)  sqlite_open_file_count+=(X)
++#else
++#define OpenCounter(X)
++#endif
++
++
++/*
++** Delete the named file
++*/
++int sqliteOsDelete(const char *zFilename){
++#if OS_UNIX
++  unlink(zFilename);
++#endif
++#if OS_WIN
++  DeleteFile(zFilename);
++#endif
++#if OS_MAC
++  unlink(zFilename);
++#endif
++  return SQLITE_OK;
++}
++
++/*
++** Return TRUE if the named file exists.
++*/
++int sqliteOsFileExists(const char *zFilename){
++#if OS_UNIX
++  return access(zFilename, 0)==0;
++#endif
++#if OS_WIN
++  return GetFileAttributes(zFilename) != 0xffffffff;
++#endif
++#if OS_MAC
++  return access(zFilename, 0)==0;
++#endif
++}
++
++
++#if 0 /* NOT USED */
++/*
++** Change the name of an existing file.
++*/
++int sqliteOsFileRename(const char *zOldName, const char *zNewName){
++#if OS_UNIX
++  if( link(zOldName, zNewName) ){
++    return SQLITE_ERROR;
++  }
++  unlink(zOldName);
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  if( !MoveFile(zOldName, zNewName) ){
++    return SQLITE_ERROR;
++  }
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++  /**** FIX ME ***/
++  return SQLITE_ERROR;
++#endif
++}
++#endif /* NOT USED */
++
++/*
++** Attempt to open a file for both reading and writing.  If that
++** fails, try opening it read-only.  If the file does not exist,
++** try to create it.
++**
++** On success, a handle for the open file is written to *id
++** and *pReadonly is set to 0 if the file was opened for reading and
++** writing or 1 if the file was opened read-only.  The function returns
++** SQLITE_OK.
++**
++** On failure, the function returns SQLITE_CANTOPEN and leaves
++** *id and *pReadonly unchanged.
++*/
++int sqliteOsOpenReadWrite(
++  const char *zFilename,
++  OsFile *id,
++  int *pReadonly
++){
++#if OS_UNIX
++  int rc;
++  id->dirfd = -1;
++  id->fd = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY, 0644);
++  if( id->fd<0 ){
++#ifdef EISDIR
++    if( errno==EISDIR ){
++      return SQLITE_CANTOPEN;
++    }
++#endif
++    id->fd = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY);
++    if( id->fd<0 ){
++      return SQLITE_CANTOPEN; 
++    }
++    *pReadonly = 1;
++  }else{
++    *pReadonly = 0;
++  }
++  sqliteOsEnterMutex();
++  rc = findLockInfo(id->fd, &id->pLock, &id->pOpen);
++  sqliteOsLeaveMutex();
++  if( rc ){
++    close(id->fd);
++    return SQLITE_NOMEM;
++  }
++  id->locked = 0;
++  TRACE3("OPEN    %-3d %s\n", id->fd, zFilename);
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  HANDLE h = CreateFile(zFilename,
++     GENERIC_READ | GENERIC_WRITE,
++     FILE_SHARE_READ | FILE_SHARE_WRITE,
++     NULL,
++     OPEN_ALWAYS,
++     FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
++     NULL
++  );
++  if( h==INVALID_HANDLE_VALUE ){
++    h = CreateFile(zFilename,
++       GENERIC_READ,
++       FILE_SHARE_READ,
++       NULL,
++       OPEN_ALWAYS,
++       FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
++       NULL
++    );
++    if( h==INVALID_HANDLE_VALUE ){
++      return SQLITE_CANTOPEN;
++    }
++    *pReadonly = 1;
++  }else{
++    *pReadonly = 0;
++  }
++  id->h = h;
++  id->locked = 0;
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++  FSSpec fsSpec;
++# ifdef _LARGE_FILE
++  HFSUniStr255 dfName;
++  FSRef fsRef;
++  if( __path2fss(zFilename, &fsSpec) != noErr ){
++    if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
++      return SQLITE_CANTOPEN;
++  }
++  if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
++    return SQLITE_CANTOPEN;
++  FSGetDataForkName(&dfName);
++  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
++                 fsRdWrShPerm, &(id->refNum)) != noErr ){
++    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
++                   fsRdWrPerm, &(id->refNum)) != noErr ){
++      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
++                   fsRdPerm, &(id->refNum)) != noErr )
++        return SQLITE_CANTOPEN;
++      else
++        *pReadonly = 1;
++    } else
++      *pReadonly = 0;
++  } else
++    *pReadonly = 0;
++# else
++  __path2fss(zFilename, &fsSpec);
++  if( !sqliteOsFileExists(zFilename) ){
++    if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
++      return SQLITE_CANTOPEN;
++  }
++  if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNum)) != noErr ){
++    if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ){
++      if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr )
++        return SQLITE_CANTOPEN;
++      else
++        *pReadonly = 1;
++    } else
++      *pReadonly = 0;
++  } else
++    *pReadonly = 0;
++# endif
++  if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){
++    id->refNumRF = -1;
++  }
++  id->locked = 0;
++  id->delOnClose = 0;
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++}
++
++
++/*
++** Attempt to open a new file for exclusive access by this process.
++** The file will be opened for both reading and writing.  To avoid
++** a potential security problem, we do not allow the file to have
++** previously existed.  Nor do we allow the file to be a symbolic
++** link.
++**
++** If delFlag is true, then make arrangements to automatically delete
++** the file when it is closed.
++**
++** On success, write the file handle into *id and return SQLITE_OK.
++**
++** On failure, return SQLITE_CANTOPEN.
++*/
++int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
++#if OS_UNIX
++  int rc;
++  if( access(zFilename, 0)==0 ){
++    return SQLITE_CANTOPEN;
++  }
++  id->dirfd = -1;
++  id->fd = open(zFilename,
++                O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW|O_LARGEFILE|O_BINARY, 0600);
++  if( id->fd<0 ){
++    return SQLITE_CANTOPEN;
++  }
++  sqliteOsEnterMutex();
++  rc = findLockInfo(id->fd, &id->pLock, &id->pOpen);
++  sqliteOsLeaveMutex();
++  if( rc ){
++    close(id->fd);
++    unlink(zFilename);
++    return SQLITE_NOMEM;
++  }
++  id->locked = 0;
++  if( delFlag ){
++    unlink(zFilename);
++  }
++  TRACE3("OPEN-EX %-3d %s\n", id->fd, zFilename);
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  HANDLE h;
++  int fileflags;
++  if( delFlag ){
++    fileflags = FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_RANDOM_ACCESS 
++                     | FILE_FLAG_DELETE_ON_CLOSE;
++  }else{
++    fileflags = FILE_FLAG_RANDOM_ACCESS;
++  }
++  h = CreateFile(zFilename,
++     GENERIC_READ | GENERIC_WRITE,
++     0,
++     NULL,
++     CREATE_ALWAYS,
++     fileflags,
++     NULL
++  );
++  if( h==INVALID_HANDLE_VALUE ){
++    return SQLITE_CANTOPEN;
++  }
++  id->h = h;
++  id->locked = 0;
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++  FSSpec fsSpec;
++# ifdef _LARGE_FILE
++  HFSUniStr255 dfName;
++  FSRef fsRef;
++  __path2fss(zFilename, &fsSpec);
++  if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
++    return SQLITE_CANTOPEN;
++  if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
++    return SQLITE_CANTOPEN;
++  FSGetDataForkName(&dfName);
++  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
++                 fsRdWrPerm, &(id->refNum)) != noErr )
++    return SQLITE_CANTOPEN;
++# else
++  __path2fss(zFilename, &fsSpec);
++  if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
++    return SQLITE_CANTOPEN;
++  if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr )
++    return SQLITE_CANTOPEN;
++# endif
++  id->refNumRF = -1;
++  id->locked = 0;
++  id->delOnClose = delFlag;
++  if (delFlag)
++    id->pathToDel = sqliteOsFullPathname(zFilename);
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++}
++
++/*
++** Attempt to open a new file for read-only access.
++**
++** On success, write the file handle into *id and return SQLITE_OK.
++**
++** On failure, return SQLITE_CANTOPEN.
++*/
++int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){
++#if OS_UNIX
++  int rc;
++  id->dirfd = -1;
++  id->fd = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY);
++  if( id->fd<0 ){
++    return SQLITE_CANTOPEN;
++  }
++  sqliteOsEnterMutex();
++  rc = findLockInfo(id->fd, &id->pLock, &id->pOpen);
++  sqliteOsLeaveMutex();
++  if( rc ){
++    close(id->fd);
++    return SQLITE_NOMEM;
++  }
++  id->locked = 0;
++  TRACE3("OPEN-RO %-3d %s\n", id->fd, zFilename);
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  HANDLE h = CreateFile(zFilename,
++     GENERIC_READ,
++     0,
++     NULL,
++     OPEN_EXISTING,
++     FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
++     NULL
++  );
++  if( h==INVALID_HANDLE_VALUE ){
++    return SQLITE_CANTOPEN;
++  }
++  id->h = h;
++  id->locked = 0;
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++  FSSpec fsSpec;
++# ifdef _LARGE_FILE
++  HFSUniStr255 dfName;
++  FSRef fsRef;
++  if( __path2fss(zFilename, &fsSpec) != noErr )
++    return SQLITE_CANTOPEN;
++  if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
++    return SQLITE_CANTOPEN;
++  FSGetDataForkName(&dfName);
++  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
++                 fsRdPerm, &(id->refNum)) != noErr )
++    return SQLITE_CANTOPEN;
++# else
++  __path2fss(zFilename, &fsSpec);
++  if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr )
++    return SQLITE_CANTOPEN;
++# endif
++  if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){
++    id->refNumRF = -1;
++  }
++  id->locked = 0;
++  id->delOnClose = 0;
++  OpenCounter(+1);
++  return SQLITE_OK;
++#endif
++}
++
++/*
++** Attempt to open a file descriptor for the directory that contains a
++** file.  This file descriptor can be used to fsync() the directory
++** in order to make sure the creation of a new file is actually written
++** to disk.
++**
++** This routine is only meaningful for Unix.  It is a no-op under
++** windows since windows does not support hard links.
++**
++** On success, a handle for a previously open file is at *id is
++** updated with the new directory file descriptor and SQLITE_OK is
++** returned.
++**
++** On failure, the function returns SQLITE_CANTOPEN and leaves
++** *id unchanged.
++*/
++int sqliteOsOpenDirectory(
++  const char *zDirname,
++  OsFile *id
++){
++#if OS_UNIX
++  if( id->fd<0 ){
++    /* Do not open the directory if the corresponding file is not already
++    ** open. */
++    return SQLITE_CANTOPEN;
++  }
++  assert( id->dirfd<0 );
++  id->dirfd = open(zDirname, O_RDONLY|O_BINARY, 0644);
++  if( id->dirfd<0 ){
++    return SQLITE_CANTOPEN; 
++  }
++  TRACE3("OPENDIR %-3d %s\n", id->dirfd, zDirname);
++#endif
++  return SQLITE_OK;
++}
++
++/*
++** If the following global variable points to a string which is the
++** name of a directory, then that directory will be used to store
++** temporary files.
++*/
++const char *sqlite_temp_directory = 0;
++
++/*
++** Create a temporary file name in zBuf.  zBuf must be big enough to
++** hold at least SQLITE_TEMPNAME_SIZE characters.
++*/
++int sqliteOsTempFileName(char *zBuf){
++#if OS_UNIX
++  static const char *azDirs[] = {
++     0,
++     "/var/tmp",
++     "/usr/tmp",
++     "/tmp",
++     ".",
++  };
++  static unsigned char zChars[] =
++    "abcdefghijklmnopqrstuvwxyz"
++    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
++    "0123456789";
++  int i, j;
++  struct stat buf;
++  const char *zDir = ".";
++  azDirs[0] = sqlite_temp_directory;
++  for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); i++){
++    if( azDirs[i]==0 ) continue;
++    if( stat(azDirs[i], &buf) ) continue;
++    if( !S_ISDIR(buf.st_mode) ) continue;
++    if( access(azDirs[i], 07) ) continue;
++    zDir = azDirs[i];
++    break;
++  }
++  do{
++    sprintf(zBuf, "%s/"TEMP_FILE_PREFIX, zDir);
++    j = strlen(zBuf);
++    sqliteRandomness(15, &zBuf[j]);
++    for(i=0; i<15; i++, j++){
++      zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
++    }
++    zBuf[j] = 0;
++  }while( access(zBuf,0)==0 );
++#endif
++#if OS_WIN
++  static char zChars[] =
++    "abcdefghijklmnopqrstuvwxyz"
++    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
++    "0123456789";
++  int i, j;
++  const char *zDir;
++  char zTempPath[SQLITE_TEMPNAME_SIZE];
++  if( sqlite_temp_directory==0 ){
++    GetTempPath(SQLITE_TEMPNAME_SIZE-30, zTempPath);
++    for(i=strlen(zTempPath); i>0 && zTempPath[i-1]=='\\'; i--){}
++    zTempPath[i] = 0;
++    zDir = zTempPath;
++  }else{
++    zDir = sqlite_temp_directory;
++  }
++  for(;;){
++    sprintf(zBuf, "%s\\"TEMP_FILE_PREFIX, zDir);
++    j = strlen(zBuf);
++    sqliteRandomness(15, &zBuf[j]);
++    for(i=0; i<15; i++, j++){
++      zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
++    }
++    zBuf[j] = 0;
++    if( !sqliteOsFileExists(zBuf) ) break;
++  }
++#endif
++#if OS_MAC
++  static char zChars[] =
++    "abcdefghijklmnopqrstuvwxyz"
++    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
++    "0123456789";
++  int i, j;
++  char *zDir;
++  char zTempPath[SQLITE_TEMPNAME_SIZE];
++  char zdirName[32];
++  CInfoPBRec infoRec;
++  Str31 dirName;
++  memset(&infoRec, 0, sizeof(infoRec));
++  memset(zTempPath, 0, SQLITE_TEMPNAME_SIZE);
++  if( sqlite_temp_directory!=0 ){
++    zDir = sqlite_temp_directory;
++  }else if( FindFolder(kOnSystemDisk, kTemporaryFolderType,  kCreateFolder,
++       &(infoRec.dirInfo.ioVRefNum), &(infoRec.dirInfo.ioDrParID)) == noErr ){
++    infoRec.dirInfo.ioNamePtr = dirName;
++    do{
++      infoRec.dirInfo.ioFDirIndex = -1;
++      infoRec.dirInfo.ioDrDirID = infoRec.dirInfo.ioDrParID;
++      if( PBGetCatInfoSync(&infoRec) == noErr ){
++        CopyPascalStringToC(dirName, zdirName);
++        i = strlen(zdirName);
++        memmove(&(zTempPath[i+1]), zTempPath, strlen(zTempPath));
++        strcpy(zTempPath, zdirName);
++        zTempPath[i] = ':';
++      }else{
++        *zTempPath = 0;
++        break;
++      }
++    } while( infoRec.dirInfo.ioDrDirID != fsRtDirID );
++    zDir = zTempPath;
++  }
++  if( zDir[0]==0 ){
++    getcwd(zTempPath, SQLITE_TEMPNAME_SIZE-24);
++    zDir = zTempPath;
++  }
++  for(;;){
++    sprintf(zBuf, "%s"TEMP_FILE_PREFIX, zDir);
++    j = strlen(zBuf);
++    sqliteRandomness(15, &zBuf[j]);
++    for(i=0; i<15; i++, j++){
++      zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
++    }
++    zBuf[j] = 0;
++    if( !sqliteOsFileExists(zBuf) ) break;
++  }
++#endif
++  return SQLITE_OK; 
++}
++
++/*
++** Close a file.
++*/
++int sqliteOsClose(OsFile *id){
++#if OS_UNIX
++  sqliteOsUnlock(id);
++  if( id->dirfd>=0 ) close(id->dirfd);
++  id->dirfd = -1;
++  sqliteOsEnterMutex();
++  if( id->pOpen->nLock ){
++    /* If there are outstanding locks, do not actually close the file just
++    ** yet because that would clear those locks.  Instead, add the file
++    ** descriptor to pOpen->aPending.  It will be automatically closed when
++    ** the last lock is cleared.
++    */
++    int *aNew;
++    struct openCnt *pOpen = id->pOpen;
++    pOpen->nPending++;
++    aNew = sqliteRealloc( pOpen->aPending, pOpen->nPending*sizeof(int) );
++    if( aNew==0 ){
++      /* If a malloc fails, just leak the file descriptor */
++    }else{
++      pOpen->aPending = aNew;
++      pOpen->aPending[pOpen->nPending-1] = id->fd;
++    }
++  }else{
++    /* There are no outstanding locks so we can close the file immediately */
++    close(id->fd);
++  }
++  releaseLockInfo(id->pLock);
++  releaseOpenCnt(id->pOpen);
++  sqliteOsLeaveMutex();
++  TRACE2("CLOSE   %-3d\n", id->fd);
++  OpenCounter(-1);
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  CloseHandle(id->h);
++  OpenCounter(-1);
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++  if( id->refNumRF!=-1 )
++    FSClose(id->refNumRF);
++# ifdef _LARGE_FILE
++  FSCloseFork(id->refNum);
++# else
++  FSClose(id->refNum);
++# endif
++  if( id->delOnClose ){
++    unlink(id->pathToDel);
++    sqliteFree(id->pathToDel);
++  }
++  OpenCounter(-1);
++  return SQLITE_OK;
++#endif
++}
++
++/*
++** Read data from a file into a buffer.  Return SQLITE_OK if all
++** bytes were read successfully and SQLITE_IOERR if anything goes
++** wrong.
++*/
++int sqliteOsRead(OsFile *id, void *pBuf, int amt){
++#if OS_UNIX
++  int got;
++  SimulateIOError(SQLITE_IOERR);
++  TIMER_START;
++  got = read(id->fd, pBuf, amt);
++  TIMER_END;
++  TRACE4("READ    %-3d %7d %d\n", id->fd, last_page, elapse);
++  SEEK(0);
++  /* if( got<0 ) got = 0; */
++  if( got==amt ){
++    return SQLITE_OK;
++  }else{
++    return SQLITE_IOERR;
++  }
++#endif
++#if OS_WIN
++  DWORD got;
++  SimulateIOError(SQLITE_IOERR);
++  TRACE2("READ %d\n", last_page);
++  if( !ReadFile(id->h, pBuf, amt, &got, 0) ){
++    got = 0;
++  }
++  if( got==(DWORD)amt ){
++    return SQLITE_OK;
++  }else{
++    return SQLITE_IOERR;
++  }
++#endif
++#if OS_MAC
++  int got;
++  SimulateIOError(SQLITE_IOERR);
++  TRACE2("READ %d\n", last_page);
++# ifdef _LARGE_FILE
++  FSReadFork(id->refNum, fsAtMark, 0, (ByteCount)amt, pBuf, (ByteCount*)&got);
++# else
++  got = amt;
++  FSRead(id->refNum, &got, pBuf);
++# endif
++  if( got==amt ){
++    return SQLITE_OK;
++  }else{
++    return SQLITE_IOERR;
++  }
++#endif
++}
++
++/*
++** Write data from a buffer into a file.  Return SQLITE_OK on success
++** or some other error code on failure.
++*/
++int sqliteOsWrite(OsFile *id, const void *pBuf, int amt){
++#if OS_UNIX
++  int wrote = 0;
++  SimulateIOError(SQLITE_IOERR);
++  TIMER_START;
++  while( amt>0 && (wrote = write(id->fd, pBuf, amt))>0 ){
++    amt -= wrote;
++    pBuf = &((char*)pBuf)[wrote];
++  }
++  TIMER_END;
++  TRACE4("WRITE   %-3d %7d %d\n", id->fd, last_page, elapse);
++  SEEK(0);
++  if( amt>0 ){
++    return SQLITE_FULL;
++  }
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  int rc;
++  DWORD wrote;
++  SimulateIOError(SQLITE_IOERR);
++  TRACE2("WRITE %d\n", last_page);
++  while( amt>0 && (rc = WriteFile(id->h, pBuf, amt, &wrote, 0))!=0 && wrote>0 ){
++    amt -= wrote;
++    pBuf = &((char*)pBuf)[wrote];
++  }
++  if( !rc || amt>(int)wrote ){
++    return SQLITE_FULL;
++  }
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++  OSErr oserr;
++  int wrote = 0;
++  SimulateIOError(SQLITE_IOERR);
++  TRACE2("WRITE %d\n", last_page);
++  while( amt>0 ){
++# ifdef _LARGE_FILE
++    oserr = FSWriteFork(id->refNum, fsAtMark, 0,
++                        (ByteCount)amt, pBuf, (ByteCount*)&wrote);
++# else
++    wrote = amt;
++    oserr = FSWrite(id->refNum, &wrote, pBuf);
++# endif
++    if( wrote == 0 || oserr != noErr)
++      break;
++    amt -= wrote;
++    pBuf = &((char*)pBuf)[wrote];
++  }
++  if( oserr != noErr || amt>wrote ){
++    return SQLITE_FULL;
++  }
++  return SQLITE_OK;
++#endif
++}
++
++/*
++** Move the read/write pointer in a file.
++*/
++int sqliteOsSeek(OsFile *id, off_t offset){
++  SEEK(offset/1024 + 1);
++#if OS_UNIX
++  lseek(id->fd, offset, SEEK_SET);
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  {
++    LONG upperBits = offset>>32;
++    LONG lowerBits = offset & 0xffffffff;
++    DWORD rc;
++    rc = SetFilePointer(id->h, lowerBits, &upperBits, FILE_BEGIN);
++    /* TRACE3("SEEK rc=0x%x upper=0x%x\n", rc, upperBits); */
++  }
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++  {
++    off_t curSize;
++    if( sqliteOsFileSize(id, &curSize) != SQLITE_OK ){
++      return SQLITE_IOERR;
++    }
++    if( offset >= curSize ){
++      if( sqliteOsTruncate(id, offset+1) != SQLITE_OK ){
++        return SQLITE_IOERR;
++      }
++    }
++# ifdef _LARGE_FILE
++    if( FSSetForkPosition(id->refNum, fsFromStart, offset) != noErr ){
++# else
++    if( SetFPos(id->refNum, fsFromStart, offset) != noErr ){
++# endif
++      return SQLITE_IOERR;
++    }else{
++      return SQLITE_OK;
++    }
++  }
++#endif
++}
++
++#ifdef SQLITE_NOSYNC
++# define fsync(X) 0
++#endif
++
++/*
++** Make sure all writes to a particular file are committed to disk.
++**
++** Under Unix, also make sure that the directory entry for the file
++** has been created by fsync-ing the directory that contains the file.
++** If we do not do this and we encounter a power failure, the directory
++** entry for the journal might not exist after we reboot.  The next
++** SQLite to access the file will not know that the journal exists (because
++** the directory entry for the journal was never created) and the transaction
++** will not roll back - possibly leading to database corruption.
++*/
++int sqliteOsSync(OsFile *id){
++#if OS_UNIX
++  SimulateIOError(SQLITE_IOERR);
++  TRACE2("SYNC    %-3d\n", id->fd);
++  if( fsync(id->fd) ){
++    return SQLITE_IOERR;
++  }else{
++    if( id->dirfd>=0 ){
++      TRACE2("DIRSYNC %-3d\n", id->dirfd);
++      fsync(id->dirfd);
++      close(id->dirfd);  /* Only need to sync once, so close the directory */
++      id->dirfd = -1;    /* when we are done. */
++    }
++    return SQLITE_OK;
++  }
++#endif
++#if OS_WIN
++  if( FlushFileBuffers(id->h) ){
++    return SQLITE_OK;
++  }else{
++    return SQLITE_IOERR;
++  }
++#endif
++#if OS_MAC
++# ifdef _LARGE_FILE
++  if( FSFlushFork(id->refNum) != noErr ){
++# else
++  ParamBlockRec params;
++  memset(&params, 0, sizeof(ParamBlockRec));
++  params.ioParam.ioRefNum = id->refNum;
++  if( PBFlushFileSync(&params) != noErr ){
++# endif
++    return SQLITE_IOERR;
++  }else{
++    return SQLITE_OK;
++  }
++#endif
++}
++
++/*
++** Truncate an open file to a specified size
++*/
++int sqliteOsTruncate(OsFile *id, off_t nByte){
++  SimulateIOError(SQLITE_IOERR);
++#if OS_UNIX
++  return ftruncate(id->fd, nByte)==0 ? SQLITE_OK : SQLITE_IOERR;
++#endif
++#if OS_WIN
++  {
++    LONG upperBits = nByte>>32;
++    SetFilePointer(id->h, nByte, &upperBits, FILE_BEGIN);
++    SetEndOfFile(id->h);
++  }
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++# ifdef _LARGE_FILE
++  if( FSSetForkSize(id->refNum, fsFromStart, nByte) != noErr){
++# else
++  if( SetEOF(id->refNum, nByte) != noErr ){
++# endif
++    return SQLITE_IOERR;
++  }else{
++    return SQLITE_OK;
++  }
++#endif
++}
++
++/*
++** Determine the current size of a file in bytes
++*/
++int sqliteOsFileSize(OsFile *id, off_t *pSize){
++#if OS_UNIX
++  struct stat buf;
++  SimulateIOError(SQLITE_IOERR);
++  if( fstat(id->fd, &buf)!=0 ){
++    return SQLITE_IOERR;
++  }
++  *pSize = buf.st_size;
++  return SQLITE_OK;
++#endif
++#if OS_WIN
++  DWORD upperBits, lowerBits;
++  SimulateIOError(SQLITE_IOERR);
++  lowerBits = GetFileSize(id->h, &upperBits);
++  *pSize = (((off_t)upperBits)<<32) + lowerBits;
++  return SQLITE_OK;
++#endif
++#if OS_MAC
++# ifdef _LARGE_FILE
++  if( FSGetForkSize(id->refNum, pSize) != noErr){
++# else
++  if( GetEOF(id->refNum, pSize) != noErr ){
++# endif
++    return SQLITE_IOERR;
++  }else{
++    return SQLITE_OK;
++  }
++#endif
++}
++
++#if OS_WIN
++/*
++** Return true (non-zero) if we are running under WinNT, Win2K or WinXP.
++** Return false (zero) for Win95, Win98, or WinME.
++**
++** Here is an interesting observation:  Win95, Win98, and WinME lack
++** the LockFileEx() API.  But we can still statically link against that
++** API as long as we don't call it win running Win95/98/ME.  A call to
++** this routine is used to determine if the host is Win95/98/ME or
++** WinNT/2K/XP so that we will know whether or not we can safely call
++** the LockFileEx() API.
++*/
++int isNT(void){
++  static int osType = 0;   /* 0=unknown 1=win95 2=winNT */
++  if( osType==0 ){
++    OSVERSIONINFO sInfo;
++    sInfo.dwOSVersionInfoSize = sizeof(sInfo);
++    GetVersionEx(&sInfo);
++    osType = sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT ? 2 : 1;
++  }
++  return osType==2;
++}
++#endif
++
++/*
++** Windows file locking notes:  [similar issues apply to MacOS]
++**
++** We cannot use LockFileEx() or UnlockFileEx() on Win95/98/ME because
++** those functions are not available.  So we use only LockFile() and
++** UnlockFile().
++**
++** LockFile() prevents not just writing but also reading by other processes.
++** (This is a design error on the part of Windows, but there is nothing
++** we can do about that.)  So the region used for locking is at the
++** end of the file where it is unlikely to ever interfere with an
++** actual read attempt.
++**
++** A database read lock is obtained by locking a single randomly-chosen 
++** byte out of a specific range of bytes. The lock byte is obtained at 
++** random so two separate readers can probably access the file at the 
++** same time, unless they are unlucky and choose the same lock byte.
++** A database write lock is obtained by locking all bytes in the range.
++** There can only be one writer.
++**
++** A lock is obtained on the first byte of the lock range before acquiring
++** either a read lock or a write lock.  This prevents two processes from
++** attempting to get a lock at a same time.  The semantics of 
++** sqliteOsReadLock() require that if there is already a write lock, that
++** lock is converted into a read lock atomically.  The lock on the first
++** byte allows us to drop the old write lock and get the read lock without
++** another process jumping into the middle and messing us up.  The same
++** argument applies to sqliteOsWriteLock().
++**
++** On WinNT/2K/XP systems, LockFileEx() and UnlockFileEx() are available,
++** which means we can use reader/writer locks.  When reader writer locks
++** are used, the lock is placed on the same range of bytes that is used
++** for probabilistic locking in Win95/98/ME.  Hence, the locking scheme
++** will support two or more Win95 readers or two or more WinNT readers.
++** But a single Win95 reader will lock out all WinNT readers and a single
++** WinNT reader will lock out all other Win95 readers.
++**
++** Note: On MacOS we use the resource fork for locking.
++**
++** The following #defines specify the range of bytes used for locking.
++** N_LOCKBYTE is the number of bytes available for doing the locking.
++** The first byte used to hold the lock while the lock is changing does
++** not count toward this number.  FIRST_LOCKBYTE is the address of
++** the first byte in the range of bytes used for locking.
++*/
++#define N_LOCKBYTE       10239
++#if OS_MAC
++# define FIRST_LOCKBYTE   (0x000fffff - N_LOCKBYTE)
++#else
++# define FIRST_LOCKBYTE   (0xffffffff - N_LOCKBYTE)
++#endif
++
++/*
++** Change the status of the lock on the file "id" to be a readlock.
++** If the file was write locked, then this reduces the lock to a read.
++** If the file was read locked, then this acquires a new read lock.
++**
++** Return SQLITE_OK on success and SQLITE_BUSY on failure.  If this
++** library was compiled with large file support (LFS) but LFS is not
++** available on the host, then an SQLITE_NOLFS is returned.
++*/
++int sqliteOsReadLock(OsFile *id){
++#if OS_UNIX
++  int rc;
++  sqliteOsEnterMutex();
++  if( id->pLock->cnt>0 ){
++    if( !id->locked ){
++      id->pLock->cnt++;
++      id->locked = 1;
++      id->pOpen->nLock++;
++    }
++    rc = SQLITE_OK;
++  }else if( id->locked || id->pLock->cnt==0 ){
++    struct flock lock;
++    int s;
++    lock.l_type = F_RDLCK;
++    lock.l_whence = SEEK_SET;
++    lock.l_start = lock.l_len = 0L;
++    s = fcntl(id->fd, F_SETLK, &lock);
++    if( s!=0 ){
++      rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
++    }else{
++      rc = SQLITE_OK;
++      if( !id->locked ){
++        id->pOpen->nLock++;
++        id->locked = 1;
++      }
++      id->pLock->cnt = 1;
++    }
++  }else{
++    rc = SQLITE_BUSY;
++  }
++  sqliteOsLeaveMutex();
++  return rc;
++#endif
++#if OS_WIN
++  int rc;
++  if( id->locked>0 ){
++    rc = SQLITE_OK;
++  }else{
++    int lk;
++    int res;
++    int cnt = 100;
++    sqliteRandomness(sizeof(lk), &lk);
++    lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1;
++    while( cnt-->0 && (res = LockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0))==0 ){
++      Sleep(1);
++    }
++    if( res ){
++      UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0);
++      if( isNT() ){
++        OVERLAPPED ovlp;
++        ovlp.Offset = FIRST_LOCKBYTE+1;
++        ovlp.OffsetHigh = 0;
++        ovlp.hEvent = 0;
++        res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 
++                          0, N_LOCKBYTE, 0, &ovlp);
++      }else{
++        res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0);
++      }
++      UnlockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0);
++    }
++    if( res ){
++      id->locked = lk;
++      rc = SQLITE_OK;
++    }else{
++      rc = SQLITE_BUSY;
++    }
++  }
++  return rc;
++#endif
++#if OS_MAC
++  int rc;
++  if( id->locked>0 || id->refNumRF == -1 ){
++    rc = SQLITE_OK;
++  }else{
++    int lk;
++    OSErr res;
++    int cnt = 5;
++    ParamBlockRec params;
++    sqliteRandomness(sizeof(lk), &lk);
++    lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1;
++    memset(&params, 0, sizeof(params));
++    params.ioParam.ioRefNum = id->refNumRF;
++    params.ioParam.ioPosMode = fsFromStart;
++    params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
++    params.ioParam.ioReqCount = 1;
++    while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
++      UInt32 finalTicks;
++      Delay(1, &finalTicks); /* 1/60 sec */
++    }
++    if( res == noErr ){
++      params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
++      params.ioParam.ioReqCount = N_LOCKBYTE;
++      PBUnlockRangeSync(&params);
++      params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk;
++      params.ioParam.ioReqCount = 1;
++      res = PBLockRangeSync(&params);
++      params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
++      params.ioParam.ioReqCount = 1;
++      PBUnlockRangeSync(&params);
++    }
++    if( res == noErr ){
++      id->locked = lk;
++      rc = SQLITE_OK;
++    }else{
++      rc = SQLITE_BUSY;
++    }
++  }
++  return rc;
++#endif
++}
++
++/*
++** Change the lock status to be an exclusive or write lock.  Return
++** SQLITE_OK on success and SQLITE_BUSY on a failure.  If this
++** library was compiled with large file support (LFS) but LFS is not
++** available on the host, then an SQLITE_NOLFS is returned.
++*/
++int sqliteOsWriteLock(OsFile *id){
++#if OS_UNIX
++  int rc;
++  sqliteOsEnterMutex();
++  if( id->pLock->cnt==0 || (id->pLock->cnt==1 && id->locked==1) ){
++    struct flock lock;
++    int s;
++    lock.l_type = F_WRLCK;
++    lock.l_whence = SEEK_SET;
++    lock.l_start = lock.l_len = 0L;
++    s = fcntl(id->fd, F_SETLK, &lock);
++    if( s!=0 ){
++      rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
++    }else{
++      rc = SQLITE_OK;
++      if( !id->locked ){
++        id->pOpen->nLock++;
++        id->locked = 1;
++      }
++      id->pLock->cnt = -1;
++    }
++  }else{
++    rc = SQLITE_BUSY;
++  }
++  sqliteOsLeaveMutex();
++  return rc;
++#endif
++#if OS_WIN
++  int rc;
++  if( id->locked<0 ){
++    rc = SQLITE_OK;
++  }else{
++    int res;
++    int cnt = 100;
++    while( cnt-->0 && (res = LockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0))==0 ){
++      Sleep(1);
++    }
++    if( res ){
++      if( id->locked>0 ){
++        if( isNT() ){
++          UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0);
++        }else{
++          res = UnlockFile(id->h, FIRST_LOCKBYTE + id->locked, 0, 1, 0);
++        }
++      }
++      if( res ){
++        res = LockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0);
++      }else{
++        res = 0;
++      }
++      UnlockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0);
++    }
++    if( res ){
++      id->locked = -1;
++      rc = SQLITE_OK;
++    }else{
++      rc = SQLITE_BUSY;
++    }
++  }
++  return rc;
++#endif
++#if OS_MAC
++  int rc;
++  if( id->locked<0 || id->refNumRF == -1 ){
++    rc = SQLITE_OK;
++  }else{
++    OSErr res;
++    int cnt = 5;
++    ParamBlockRec params;
++    memset(&params, 0, sizeof(params));
++    params.ioParam.ioRefNum = id->refNumRF;
++    params.ioParam.ioPosMode = fsFromStart;
++    params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
++    params.ioParam.ioReqCount = 1;
++    while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
++      UInt32 finalTicks;
++      Delay(1, &finalTicks); /* 1/60 sec */
++    }
++    if( res == noErr ){
++      params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked;
++      params.ioParam.ioReqCount = 1;
++      if( id->locked==0 
++            || PBUnlockRangeSync(&params)==noErr ){
++        params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
++        params.ioParam.ioReqCount = N_LOCKBYTE;
++        res = PBLockRangeSync(&params);
++      }else{
++        res = afpRangeNotLocked;
++      }
++      params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
++      params.ioParam.ioReqCount = 1;
++      PBUnlockRangeSync(&params);
++    }
++    if( res == noErr ){
++      id->locked = -1;
++      rc = SQLITE_OK;
++    }else{
++      rc = SQLITE_BUSY;
++    }
++  }
++  return rc;
++#endif
++}
++
++/*
++** Unlock the given file descriptor.  If the file descriptor was
++** not previously locked, then this routine is a no-op.  If this
++** library was compiled with large file support (LFS) but LFS is not
++** available on the host, then an SQLITE_NOLFS is returned.
++*/
++int sqliteOsUnlock(OsFile *id){
++#if OS_UNIX
++  int rc;
++  if( !id->locked ) return SQLITE_OK;
++  sqliteOsEnterMutex();
++  assert( id->pLock->cnt!=0 );
++  if( id->pLock->cnt>1 ){
++    id->pLock->cnt--;
++    rc = SQLITE_OK;
++  }else{
++    struct flock lock;
++    int s;
++    lock.l_type = F_UNLCK;
++    lock.l_whence = SEEK_SET;
++    lock.l_start = lock.l_len = 0L;
++    s = fcntl(id->fd, F_SETLK, &lock);
++    if( s!=0 ){
++      rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY;
++    }else{
++      rc = SQLITE_OK;
++      id->pLock->cnt = 0;
++    }
++  }
++  if( rc==SQLITE_OK ){
++    /* Decrement the count of locks against this same file.  When the
++    ** count reaches zero, close any other file descriptors whose close
++    ** was deferred because of outstanding locks.
++    */
++    struct openCnt *pOpen = id->pOpen;
++    pOpen->nLock--;
++    assert( pOpen->nLock>=0 );
++    if( pOpen->nLock==0 && pOpen->nPending>0 ){
++      int i;
++      for(i=0; i<pOpen->nPending; i++){
++        close(pOpen->aPending[i]);
++      }
++      sqliteFree(pOpen->aPending);
++      pOpen->nPending = 0;
++      pOpen->aPending = 0;
++    }
++  }
++  sqliteOsLeaveMutex();
++  id->locked = 0;
++  return rc;
++#endif
++#if OS_WIN
++  int rc;
++  if( id->locked==0 ){
++    rc = SQLITE_OK;
++  }else if( isNT() || id->locked<0 ){
++    UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0);
++    rc = SQLITE_OK;
++    id->locked = 0;
++  }else{
++    UnlockFile(id->h, FIRST_LOCKBYTE+id->locked, 0, 1, 0);
++    rc = SQLITE_OK;
++    id->locked = 0;
++  }
++  return rc;
++#endif
++#if OS_MAC
++  int rc;
++  ParamBlockRec params;
++  memset(&params, 0, sizeof(params));
++  params.ioParam.ioRefNum = id->refNumRF;
++  params.ioParam.ioPosMode = fsFromStart;
++  if( id->locked==0 || id->refNumRF == -1 ){
++    rc = SQLITE_OK;
++  }else if( id->locked<0 ){
++    params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
++    params.ioParam.ioReqCount = N_LOCKBYTE;
++    PBUnlockRangeSync(&params);
++    rc = SQLITE_OK;
++    id->locked = 0;
++  }else{
++    params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked;
++    params.ioParam.ioReqCount = 1;
++    PBUnlockRangeSync(&params);
++    rc = SQLITE_OK;
++    id->locked = 0;
++  }
++  return rc;
++#endif
++}
++
++/*
++** Get information to seed the random number generator.  The seed
++** is written into the buffer zBuf[256].  The calling function must
++** supply a sufficiently large buffer.
++*/
++int sqliteOsRandomSeed(char *zBuf){
++  /* We have to initialize zBuf to prevent valgrind from reporting
++  ** errors.  The reports issued by valgrind are incorrect - we would
++  ** prefer that the randomness be increased by making use of the
++  ** uninitialized space in zBuf - but valgrind errors tend to worry
++  ** some users.  Rather than argue, it seems easier just to initialize
++  ** the whole array and silence valgrind, even if that means less randomness
++  ** in the random seed.
++  **
++  ** When testing, initializing zBuf[] to zero is all we do.  That means
++  ** that we always use the same random number sequence.* This makes the
++  ** tests repeatable.
++  */
++  memset(zBuf, 0, 256);
++#if OS_UNIX && !defined(SQLITE_TEST)
++  {
++    int pid;
++    time((time_t*)zBuf);
++    pid = getpid();
++    memcpy(&zBuf[sizeof(time_t)], &pid, sizeof(pid));
++  }
++#endif
++#if OS_WIN && !defined(SQLITE_TEST)
++  GetSystemTime((LPSYSTEMTIME)zBuf);
++#endif
++#if OS_MAC
++  {
++    int pid;
++    Microseconds((UnsignedWide*)zBuf);
++    pid = getpid();
++    memcpy(&zBuf[sizeof(UnsignedWide)], &pid, sizeof(pid));
++  }
++#endif
++  return SQLITE_OK;
++}
++
++/*
++** Sleep for a little while.  Return the amount of time slept.
++*/
++int sqliteOsSleep(int ms){
++#if OS_UNIX
++#if defined(HAVE_USLEEP) && HAVE_USLEEP
++  usleep(ms*1000);
++  return ms;
++#else
++  sleep((ms+999)/1000);
++  return 1000*((ms+999)/1000);
++#endif
++#endif
++#if OS_WIN
++  Sleep(ms);
++  return ms;
++#endif
++#if OS_MAC
++  UInt32 finalTicks;
++  UInt32 ticks = (((UInt32)ms+16)*3)/50;  /* 1/60 sec per tick */
++  Delay(ticks, &finalTicks);
++  return (int)((ticks*50)/3);
++#endif
++}
++
++/*
++** Static variables used for thread synchronization
++*/
++static int inMutex = 0;
++#ifdef SQLITE_UNIX_THREADS
++  static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
++#endif
++#ifdef SQLITE_W32_THREADS
++  static CRITICAL_SECTION cs;
++#endif
++#ifdef SQLITE_MACOS_MULTITASKING
++  static MPCriticalRegionID criticalRegion;
++#endif
++
++/*
++** The following pair of routine implement mutual exclusion for
++** multi-threaded processes.  Only a single thread is allowed to
++** executed code that is surrounded by EnterMutex() and LeaveMutex().
++**
++** SQLite uses only a single Mutex.  There is not much critical
++** code and what little there is executes quickly and without blocking.
++*/
++void sqliteOsEnterMutex(){
++#ifdef SQLITE_UNIX_THREADS
++  pthread_mutex_lock(&mutex);
++#endif
++#ifdef SQLITE_W32_THREADS
++  static int isInit = 0;
++  while( !isInit ){
++    static long lock = 0;
++    if( InterlockedIncrement(&lock)==1 ){
++      InitializeCriticalSection(&cs);
++      isInit = 1;
++    }else{
++      Sleep(1);
++    }
++  }
++  EnterCriticalSection(&cs);
++#endif
++#ifdef SQLITE_MACOS_MULTITASKING
++  static volatile int notInit = 1;
++  if( notInit ){
++    if( notInit == 2 ) /* as close as you can get to thread safe init */
++      MPYield();
++    else{
++      notInit = 2;
++      MPCreateCriticalRegion(&criticalRegion);
++      notInit = 0;
++    }
++  }
++  MPEnterCriticalRegion(criticalRegion, kDurationForever);
++#endif
++  assert( !inMutex );
++  inMutex = 1;
++}
++void sqliteOsLeaveMutex(){
++  assert( inMutex );
++  inMutex = 0;
++#ifdef SQLITE_UNIX_THREADS
++  pthread_mutex_unlock(&mutex);
++#endif
++#ifdef SQLITE_W32_THREADS
++  LeaveCriticalSection(&cs);
++#endif
++#ifdef SQLITE_MACOS_MULTITASKING
++  MPExitCriticalRegion(criticalRegion);
++#endif
++}
++
++/*
++** Turn a relative pathname into a full pathname.  Return a pointer
++** to the full pathname stored in space obtained from sqliteMalloc().
++** The calling function is responsible for freeing this space once it
++** is no longer needed.
++*/
++char *sqliteOsFullPathname(const char *zRelative){
++#if OS_UNIX
++  char *zFull = 0;
++  if( zRelative[0]=='/' ){
++    sqliteSetString(&zFull, zRelative, (char*)0);
++  }else{
++    char zBuf[5000];
++    zBuf[0] = 0;
++    sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), "/", zRelative,
++                    (char*)0);
++  }
++  return zFull;
++#endif
++#if OS_WIN
++  char *zNotUsed;
++  char *zFull;
++  int nByte;
++  nByte = GetFullPathName(zRelative, 0, 0, &zNotUsed) + 1;
++  zFull = sqliteMalloc( nByte );
++  if( zFull==0 ) return 0;
++  GetFullPathName(zRelative, nByte, zFull, &zNotUsed);
++  return zFull;
++#endif
++#if OS_MAC
++  char *zFull = 0;
++  if( zRelative[0]==':' ){
++    char zBuf[_MAX_PATH+1];
++    sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), &(zRelative[1]),
++                    (char*)0);
++  }else{
++    if( strchr(zRelative, ':') ){
++      sqliteSetString(&zFull, zRelative, (char*)0);
++    }else{
++    char zBuf[_MAX_PATH+1];
++      sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), zRelative, (char*)0);
++    }
++  }
++  return zFull;
++#endif
++}
++
++/*
++** The following variable, if set to a non-zero value, becomes the result
++** returned from sqliteOsCurrentTime().  This is used for testing.
++*/
++#ifdef SQLITE_TEST
++int sqlite_current_time = 0;
++#endif
++
++/*
++** Find the current time (in Universal Coordinated Time).  Write the
++** current time and date as a Julian Day number into *prNow and
++** return 0.  Return 1 if the time and date cannot be found.
++*/
++int sqliteOsCurrentTime(double *prNow){
++#if OS_UNIX
++  time_t t;
++  time(&t);
++  *prNow = t/86400.0 + 2440587.5;
++#endif
++#if OS_WIN
++  FILETIME ft;
++  /* FILETIME structure is a 64-bit value representing the number of 
++     100-nanosecond intervals since January 1, 1601 (= JD 2305813.5). 
++  */
++  double now;
++  GetSystemTimeAsFileTime( &ft );
++  now = ((double)ft.dwHighDateTime) * 4294967296.0; 
++  *prNow = (now + ft.dwLowDateTime)/864000000000.0 + 2305813.5;
++#endif
++#ifdef SQLITE_TEST
++  if( sqlite_current_time ){
++    *prNow = sqlite_current_time/86400.0 + 2440587.5;
++  }
++#endif
++  return 0;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/os.h
+@@ -0,0 +1,191 @@
++/*
++** 2001 September 16
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++******************************************************************************
++**
++** This header file (together with is companion C source-code file
++** "os.c") attempt to abstract the underlying operating system so that
++** the SQLite library will work on both POSIX and windows systems.
++*/
++#ifndef _SQLITE_OS_H_
++#define _SQLITE_OS_H_
++
++/*
++** Helpful hint:  To get this to compile on HP/UX, add -D_INCLUDE_POSIX_SOURCE
++** to the compiler command line.
++*/
++
++/*
++** These #defines should enable >2GB file support on Posix if the
++** underlying operating system supports it.  If the OS lacks
++** large file support, or if the OS is windows, these should be no-ops.
++**
++** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
++** on the compiler command line.  This is necessary if you are compiling
++** on a recent machine (ex: RedHat 7.2) but you want your code to work
++** on an older machine (ex: RedHat 6.0).  If you compile on RedHat 7.2
++** without this option, LFS is enable.  But LFS does not exist in the kernel
++** in RedHat 6.0, so the code won't work.  Hence, for maximum binary
++** portability you should omit LFS.
++**
++** Similar is true for MacOS.  LFS is only supported on MacOS 9 and later.
++*/
++#ifndef SQLITE_DISABLE_LFS
++# define _LARGE_FILE       1
++# ifndef _FILE_OFFSET_BITS
++#   define _FILE_OFFSET_BITS 64
++# endif
++# define _LARGEFILE_SOURCE 1
++#endif
++
++/*
++** Temporary files are named starting with this prefix followed by 16 random
++** alphanumeric characters, and no file extension. They are stored in the
++** OS's standard temporary file directory, and are deleted prior to exit.
++** If sqlite is being embedded in another program, you may wish to change the
++** prefix to reflect your program's name, so that if your program exits
++** prematurely, old temporary files can be easily identified. This can be done
++** using -DTEMP_FILE_PREFIX=myprefix_ on the compiler command line.
++*/
++#ifndef TEMP_FILE_PREFIX
++# define TEMP_FILE_PREFIX "sqlite_"
++#endif
++
++/*
++** Figure out if we are dealing with Unix, Windows or MacOS.
++**
++** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix.
++**      The MacOS build is designed to use CodeWarrior (tested with v8)
++*/
++#ifndef OS_UNIX
++# ifndef OS_WIN
++#  ifndef OS_MAC
++#    if defined(__MACOS__)
++#      define OS_MAC 1
++#      define OS_WIN 0
++#      define OS_UNIX 0
++#    elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
++#      define OS_MAC 0
++#      define OS_WIN 1
++#      define OS_UNIX 0
++#    else
++#      define OS_MAC 0
++#      define OS_WIN 0
++#      define OS_UNIX 1
++#    endif
++#  else
++#    define OS_WIN 0
++#    define OS_UNIX 0
++#  endif
++# else
++#  define OS_MAC 0
++#  define OS_UNIX 0
++# endif
++#else
++# define OS_MAC 0
++# ifndef OS_WIN
++#  define OS_WIN 0
++# endif
++#endif
++
++/*
++** A handle for an open file is stored in an OsFile object.
++*/
++#if OS_UNIX
++# include <sys/types.h>
++# include <sys/stat.h>
++# include <fcntl.h>
++# include <unistd.h>
++  typedef struct OsFile OsFile;
++  struct OsFile {
++    struct openCnt *pOpen;    /* Info about all open fd's on this inode */
++    struct lockInfo *pLock;   /* Info about locks on this inode */
++    int fd;                   /* The file descriptor */
++    int locked;               /* True if this instance holds the lock */
++    int dirfd;                /* File descriptor for the directory */
++  };
++# define SQLITE_TEMPNAME_SIZE 200
++# if defined(HAVE_USLEEP) && HAVE_USLEEP
++#  define SQLITE_MIN_SLEEP_MS 1
++# else
++#  define SQLITE_MIN_SLEEP_MS 1000
++# endif
++#endif
++
++#if OS_WIN
++#include <windows.h>
++#include <winbase.h>
++  typedef struct OsFile OsFile;
++  struct OsFile {
++    HANDLE h;               /* Handle for accessing the file */
++    int locked;             /* 0: unlocked, <0: write lock, >0: read lock */
++  };
++# if defined(_MSC_VER) || defined(__BORLANDC__)
++    typedef __int64 off_t;
++# else
++#  if !defined(_CYGWIN_TYPES_H)
++     typedef long long off_t;
++#    if defined(__MINGW32__)
++#      define	_OFF_T_
++#    endif
++#  endif
++# endif
++# define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)
++# define SQLITE_MIN_SLEEP_MS 1
++#endif
++
++#if OS_MAC
++# include <unistd.h>
++# include <Files.h>
++  typedef struct OsFile OsFile;
++  struct OsFile {
++    SInt16 refNum;           /* Data fork/file reference number */
++    SInt16 refNumRF;         /* Resource fork reference number (for locking) */
++    int locked;              /* 0: unlocked, <0: write lock, >0: read lock */
++    int delOnClose;          /* True if file is to be deleted on close */
++    char *pathToDel;         /* Name of file to delete on close */
++  };
++# ifdef _LARGE_FILE
++    typedef SInt64 off_t;
++# else
++    typedef SInt32 off_t;
++# endif
++# define SQLITE_TEMPNAME_SIZE _MAX_PATH
++# define SQLITE_MIN_SLEEP_MS 17
++#endif
++
++int sqliteOsDelete(const char*);
++int sqliteOsFileExists(const char*);
++int sqliteOsFileRename(const char*, const char*);
++int sqliteOsOpenReadWrite(const char*, OsFile*, int*);
++int sqliteOsOpenExclusive(const char*, OsFile*, int);
++int sqliteOsOpenReadOnly(const char*, OsFile*);
++int sqliteOsOpenDirectory(const char*, OsFile*);
++int sqliteOsTempFileName(char*);
++int sqliteOsClose(OsFile*);
++int sqliteOsRead(OsFile*, void*, int amt);
++int sqliteOsWrite(OsFile*, const void*, int amt);
++int sqliteOsSeek(OsFile*, off_t offset);
++int sqliteOsSync(OsFile*);
++int sqliteOsTruncate(OsFile*, off_t size);
++int sqliteOsFileSize(OsFile*, off_t *pSize);
++int sqliteOsReadLock(OsFile*);
++int sqliteOsWriteLock(OsFile*);
++int sqliteOsUnlock(OsFile*);
++int sqliteOsRandomSeed(char*);
++int sqliteOsSleep(int ms);
++int sqliteOsCurrentTime(double*);
++void sqliteOsEnterMutex(void);
++void sqliteOsLeaveMutex(void);
++char *sqliteOsFullPathname(const char*);
++
++
++
++#endif /* _SQLITE_OS_H_ */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/pager.c
+@@ -0,0 +1,2220 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This is the implementation of the page cache subsystem or "pager".
++** 
++** The pager is used to access a database disk file.  It implements
++** atomic commit and rollback through the use of a journal file that
++** is separate from the database file.  The pager also implements file
++** locking to prevent two processes from writing the same database
++** file simultaneously, or one process from reading the database while
++** another is writing.
++**
++** @(#) $Id$
++*/
++#include "os.h"         /* Must be first to enable large file support */
++#include "sqliteInt.h"
++#include "pager.h"
++#include <assert.h>
++#include <string.h>
++
++/*
++** Macros for troubleshooting.  Normally turned off
++*/
++#if 0
++static Pager *mainPager = 0;
++#define SET_PAGER(X)  if( mainPager==0 ) mainPager = (X)
++#define CLR_PAGER(X)  if( mainPager==(X) ) mainPager = 0
++#define TRACE1(X)     if( pPager==mainPager ) fprintf(stderr,X)
++#define TRACE2(X,Y)   if( pPager==mainPager ) fprintf(stderr,X,Y)
++#define TRACE3(X,Y,Z) if( pPager==mainPager ) fprintf(stderr,X,Y,Z)
++#else
++#define SET_PAGER(X)
++#define CLR_PAGER(X)
++#define TRACE1(X)
++#define TRACE2(X,Y)
++#define TRACE3(X,Y,Z)
++#endif
++
++
++/*
++** The page cache as a whole is always in one of the following
++** states:
++**
++**   SQLITE_UNLOCK       The page cache is not currently reading or 
++**                       writing the database file.  There is no
++**                       data held in memory.  This is the initial
++**                       state.
++**
++**   SQLITE_READLOCK     The page cache is reading the database.
++**                       Writing is not permitted.  There can be
++**                       multiple readers accessing the same database
++**                       file at the same time.
++**
++**   SQLITE_WRITELOCK    The page cache is writing the database.
++**                       Access is exclusive.  No other processes or
++**                       threads can be reading or writing while one
++**                       process is writing.
++**
++** The page cache comes up in SQLITE_UNLOCK.  The first time a
++** sqlite_page_get() occurs, the state transitions to SQLITE_READLOCK.
++** After all pages have been released using sqlite_page_unref(),
++** the state transitions back to SQLITE_UNLOCK.  The first time
++** that sqlite_page_write() is called, the state transitions to
++** SQLITE_WRITELOCK.  (Note that sqlite_page_write() can only be
++** called on an outstanding page which means that the pager must
++** be in SQLITE_READLOCK before it transitions to SQLITE_WRITELOCK.)
++** The sqlite_page_rollback() and sqlite_page_commit() functions 
++** transition the state from SQLITE_WRITELOCK back to SQLITE_READLOCK.
++*/
++#define SQLITE_UNLOCK      0
++#define SQLITE_READLOCK    1
++#define SQLITE_WRITELOCK   2
++
++
++/*
++** Each in-memory image of a page begins with the following header.
++** This header is only visible to this pager module.  The client
++** code that calls pager sees only the data that follows the header.
++**
++** Client code should call sqlitepager_write() on a page prior to making
++** any modifications to that page.  The first time sqlitepager_write()
++** is called, the original page contents are written into the rollback
++** journal and PgHdr.inJournal and PgHdr.needSync are set.  Later, once
++** the journal page has made it onto the disk surface, PgHdr.needSync
++** is cleared.  The modified page cannot be written back into the original
++** database file until the journal pages has been synced to disk and the
++** PgHdr.needSync has been cleared.
++**
++** The PgHdr.dirty flag is set when sqlitepager_write() is called and
++** is cleared again when the page content is written back to the original
++** database file.
++*/
++typedef struct PgHdr PgHdr;
++struct PgHdr {
++  Pager *pPager;                 /* The pager to which this page belongs */
++  Pgno pgno;                     /* The page number for this page */
++  PgHdr *pNextHash, *pPrevHash;  /* Hash collision chain for PgHdr.pgno */
++  int nRef;                      /* Number of users of this page */
++  PgHdr *pNextFree, *pPrevFree;  /* Freelist of pages where nRef==0 */
++  PgHdr *pNextAll, *pPrevAll;    /* A list of all pages */
++  PgHdr *pNextCkpt, *pPrevCkpt;  /* List of pages in the checkpoint journal */
++  u8 inJournal;                  /* TRUE if has been written to journal */
++  u8 inCkpt;                     /* TRUE if written to the checkpoint journal */
++  u8 dirty;                      /* TRUE if we need to write back changes */
++  u8 needSync;                   /* Sync journal before writing this page */
++  u8 alwaysRollback;             /* Disable dont_rollback() for this page */
++  PgHdr *pDirty;                 /* Dirty pages sorted by PgHdr.pgno */
++  /* SQLITE_PAGE_SIZE bytes of page data follow this header */
++  /* Pager.nExtra bytes of local data follow the page data */
++};
++
++
++/*
++** A macro used for invoking the codec if there is one
++*/
++#ifdef SQLITE_HAS_CODEC
++# define CODEC(P,D,N,X) if( P->xCodec ){ P->xCodec(P->pCodecArg,D,N,X); }
++#else
++# define CODEC(P,D,N,X)
++#endif
++
++/*
++** Convert a pointer to a PgHdr into a pointer to its data
++** and back again.
++*/
++#define PGHDR_TO_DATA(P)  ((void*)(&(P)[1]))
++#define DATA_TO_PGHDR(D)  (&((PgHdr*)(D))[-1])
++#define PGHDR_TO_EXTRA(P) ((void*)&((char*)(&(P)[1]))[SQLITE_PAGE_SIZE])
++
++/*
++** How big to make the hash table used for locating in-memory pages
++** by page number.
++*/
++#define N_PG_HASH 2048
++
++/*
++** Hash a page number
++*/
++#define pager_hash(PN)  ((PN)&(N_PG_HASH-1))
++
++/*
++** A open page cache is an instance of the following structure.
++*/
++struct Pager {
++  char *zFilename;            /* Name of the database file */
++  char *zJournal;             /* Name of the journal file */
++  char *zDirectory;           /* Directory hold database and journal files */
++  OsFile fd, jfd;             /* File descriptors for database and journal */
++  OsFile cpfd;                /* File descriptor for the checkpoint journal */
++  int dbSize;                 /* Number of pages in the file */
++  int origDbSize;             /* dbSize before the current change */
++  int ckptSize;               /* Size of database (in pages) at ckpt_begin() */
++  off_t ckptJSize;            /* Size of journal at ckpt_begin() */
++  int nRec;                   /* Number of pages written to the journal */
++  u32 cksumInit;              /* Quasi-random value added to every checksum */
++  int ckptNRec;               /* Number of records in the checkpoint journal */
++  int nExtra;                 /* Add this many bytes to each in-memory page */
++  void (*xDestructor)(void*); /* Call this routine when freeing pages */
++  int nPage;                  /* Total number of in-memory pages */
++  int nRef;                   /* Number of in-memory pages with PgHdr.nRef>0 */
++  int mxPage;                 /* Maximum number of pages to hold in cache */
++  int nHit, nMiss, nOvfl;     /* Cache hits, missing, and LRU overflows */
++  void (*xCodec)(void*,void*,Pgno,int); /* Routine for en/decoding data */
++  void *pCodecArg;            /* First argument to xCodec() */
++  u8 journalOpen;             /* True if journal file descriptors is valid */
++  u8 journalStarted;          /* True if header of journal is synced */
++  u8 useJournal;              /* Use a rollback journal on this file */
++  u8 ckptOpen;                /* True if the checkpoint journal is open */
++  u8 ckptInUse;               /* True we are in a checkpoint */
++  u8 ckptAutoopen;            /* Open ckpt journal when main journal is opened*/
++  u8 noSync;                  /* Do not sync the journal if true */
++  u8 fullSync;                /* Do extra syncs of the journal for robustness */
++  u8 state;                   /* SQLITE_UNLOCK, _READLOCK or _WRITELOCK */
++  u8 errMask;                 /* One of several kinds of errors */
++  u8 tempFile;                /* zFilename is a temporary file */
++  u8 readOnly;                /* True for a read-only database */
++  u8 needSync;                /* True if an fsync() is needed on the journal */
++  u8 dirtyFile;               /* True if database file has changed in any way */
++  u8 alwaysRollback;          /* Disable dont_rollback() for all pages */
++  u8 *aInJournal;             /* One bit for each page in the database file */
++  u8 *aInCkpt;                /* One bit for each page in the database */
++  PgHdr *pFirst, *pLast;      /* List of free pages */
++  PgHdr *pFirstSynced;        /* First free page with PgHdr.needSync==0 */
++  PgHdr *pAll;                /* List of all pages */
++  PgHdr *pCkpt;               /* List of pages in the checkpoint journal */
++  PgHdr *aHash[N_PG_HASH];    /* Hash table to map page number of PgHdr */
++};
++
++/*
++** These are bits that can be set in Pager.errMask.
++*/
++#define PAGER_ERR_FULL     0x01  /* a write() failed */
++#define PAGER_ERR_MEM      0x02  /* malloc() failed */
++#define PAGER_ERR_LOCK     0x04  /* error in the locking protocol */
++#define PAGER_ERR_CORRUPT  0x08  /* database or journal corruption */
++#define PAGER_ERR_DISK     0x10  /* general disk I/O error - bad hard drive? */
++
++/*
++** The journal file contains page records in the following
++** format.
++**
++** Actually, this structure is the complete page record for pager
++** formats less than 3.  Beginning with format 3, this record is surrounded
++** by two checksums.
++*/
++typedef struct PageRecord PageRecord;
++struct PageRecord {
++  Pgno pgno;                      /* The page number */
++  char aData[SQLITE_PAGE_SIZE];   /* Original data for page pgno */
++};
++
++/*
++** Journal files begin with the following magic string.  The data
++** was obtained from /dev/random.  It is used only as a sanity check.
++**
++** There are three journal formats (so far). The 1st journal format writes
++** 32-bit integers in the byte-order of the host machine.  New
++** formats writes integers as big-endian.  All new journals use the
++** new format, but we have to be able to read an older journal in order
++** to rollback journals created by older versions of the library.
++**
++** The 3rd journal format (added for 2.8.0) adds additional sanity
++** checking information to the journal.  If the power fails while the
++** journal is being written, semi-random garbage data might appear in
++** the journal file after power is restored.  If an attempt is then made
++** to roll the journal back, the database could be corrupted.  The additional
++** sanity checking data is an attempt to discover the garbage in the
++** journal and ignore it.
++**
++** The sanity checking information for the 3rd journal format consists
++** of a 32-bit checksum on each page of data.  The checksum covers both
++** the page number and the SQLITE_PAGE_SIZE bytes of data for the page.
++** This cksum is initialized to a 32-bit random value that appears in the
++** journal file right after the header.  The random initializer is important,
++** because garbage data that appears at the end of a journal is likely
++** data that was once in other files that have now been deleted.  If the
++** garbage data came from an obsolete journal file, the checksums might
++** be correct.  But by initializing the checksum to random value which
++** is different for every journal, we minimize that risk.
++*/
++static const unsigned char aJournalMagic1[] = {
++  0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd4,
++};
++static const unsigned char aJournalMagic2[] = {
++  0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd5,
++};
++static const unsigned char aJournalMagic3[] = {
++  0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd6,
++};
++#define JOURNAL_FORMAT_1 1
++#define JOURNAL_FORMAT_2 2
++#define JOURNAL_FORMAT_3 3
++
++/*
++** The following integer determines what format to use when creating
++** new primary journal files.  By default we always use format 3.
++** When testing, we can set this value to older journal formats in order to
++** make sure that newer versions of the library are able to rollback older
++** journal files.
++**
++** Note that checkpoint journals always use format 2 and omit the header.
++*/
++#ifdef SQLITE_TEST
++int journal_format = 3;
++#else
++# define journal_format 3
++#endif
++
++/*
++** The size of the header and of each page in the journal varies according
++** to which journal format is being used.  The following macros figure out
++** the sizes based on format numbers.
++*/
++#define JOURNAL_HDR_SZ(X) \
++   (sizeof(aJournalMagic1) + sizeof(Pgno) + ((X)>=3)*2*sizeof(u32))
++#define JOURNAL_PG_SZ(X) \
++   (SQLITE_PAGE_SIZE + sizeof(Pgno) + ((X)>=3)*sizeof(u32))
++
++/*
++** Enable reference count tracking here:
++*/
++#ifdef SQLITE_TEST
++  int pager_refinfo_enable = 0;
++  static void pager_refinfo(PgHdr *p){
++    static int cnt = 0;
++    if( !pager_refinfo_enable ) return;
++    printf(
++       "REFCNT: %4d addr=0x%08x nRef=%d\n",
++       p->pgno, (int)PGHDR_TO_DATA(p), p->nRef
++    );
++    cnt++;   /* Something to set a breakpoint on */
++  }
++# define REFINFO(X)  pager_refinfo(X)
++#else
++# define REFINFO(X)
++#endif
++
++/*
++** Read a 32-bit integer from the given file descriptor.  Store the integer
++** that is read in *pRes.  Return SQLITE_OK if everything worked, or an
++** error code is something goes wrong.
++**
++** If the journal format is 2 or 3, read a big-endian integer.  If the
++** journal format is 1, read an integer in the native byte-order of the
++** host machine.
++*/
++static int read32bits(int format, OsFile *fd, u32 *pRes){
++  u32 res;
++  int rc;
++  rc = sqliteOsRead(fd, &res, sizeof(res));
++  if( rc==SQLITE_OK && format>JOURNAL_FORMAT_1 ){
++    unsigned char ac[4];
++    memcpy(ac, &res, 4);
++    res = (ac[0]<<24) | (ac[1]<<16) | (ac[2]<<8) | ac[3];
++  }
++  *pRes = res;
++  return rc;
++}
++
++/*
++** Write a 32-bit integer into the given file descriptor.  Return SQLITE_OK
++** on success or an error code is something goes wrong.
++**
++** If the journal format is 2 or 3, write the integer as 4 big-endian
++** bytes.  If the journal format is 1, write the integer in the native
++** byte order.  In normal operation, only formats 2 and 3 are used.
++** Journal format 1 is only used for testing.
++*/
++static int write32bits(OsFile *fd, u32 val){
++  unsigned char ac[4];
++  if( journal_format<=1 ){
++    return sqliteOsWrite(fd, &val, 4);
++  }
++  ac[0] = (val>>24) & 0xff;
++  ac[1] = (val>>16) & 0xff;
++  ac[2] = (val>>8) & 0xff;
++  ac[3] = val & 0xff;
++  return sqliteOsWrite(fd, ac, 4);
++}
++
++/*
++** Write a 32-bit integer into a page header right before the
++** page data.  This will overwrite the PgHdr.pDirty pointer.
++**
++** The integer is big-endian for formats 2 and 3 and native byte order
++** for journal format 1.
++*/
++static void store32bits(u32 val, PgHdr *p, int offset){
++  unsigned char *ac;
++  ac = &((unsigned char*)PGHDR_TO_DATA(p))[offset];
++  if( journal_format<=1 ){
++    memcpy(ac, &val, 4);
++  }else{
++    ac[0] = (val>>24) & 0xff;
++    ac[1] = (val>>16) & 0xff;
++    ac[2] = (val>>8) & 0xff;
++    ac[3] = val & 0xff;
++  }
++}
++
++
++/*
++** Convert the bits in the pPager->errMask into an approprate
++** return code.
++*/
++static int pager_errcode(Pager *pPager){
++  int rc = SQLITE_OK;
++  if( pPager->errMask & PAGER_ERR_LOCK )    rc = SQLITE_PROTOCOL;
++  if( pPager->errMask & PAGER_ERR_DISK )    rc = SQLITE_IOERR;
++  if( pPager->errMask & PAGER_ERR_FULL )    rc = SQLITE_FULL;
++  if( pPager->errMask & PAGER_ERR_MEM )     rc = SQLITE_NOMEM;
++  if( pPager->errMask & PAGER_ERR_CORRUPT ) rc = SQLITE_CORRUPT;
++  return rc;
++}
++
++/*
++** Add or remove a page from the list of all pages that are in the
++** checkpoint journal.
++**
++** The Pager keeps a separate list of pages that are currently in
++** the checkpoint journal.  This helps the sqlitepager_ckpt_commit()
++** routine run MUCH faster for the common case where there are many
++** pages in memory but only a few are in the checkpoint journal.
++*/
++static void page_add_to_ckpt_list(PgHdr *pPg){
++  Pager *pPager = pPg->pPager;
++  if( pPg->inCkpt ) return;
++  assert( pPg->pPrevCkpt==0 && pPg->pNextCkpt==0 );
++  pPg->pPrevCkpt = 0;
++  if( pPager->pCkpt ){
++    pPager->pCkpt->pPrevCkpt = pPg;
++  }
++  pPg->pNextCkpt = pPager->pCkpt;
++  pPager->pCkpt = pPg;
++  pPg->inCkpt = 1;
++}
++static void page_remove_from_ckpt_list(PgHdr *pPg){
++  if( !pPg->inCkpt ) return;
++  if( pPg->pPrevCkpt ){
++    assert( pPg->pPrevCkpt->pNextCkpt==pPg );
++    pPg->pPrevCkpt->pNextCkpt = pPg->pNextCkpt;
++  }else{
++    assert( pPg->pPager->pCkpt==pPg );
++    pPg->pPager->pCkpt = pPg->pNextCkpt;
++  }
++  if( pPg->pNextCkpt ){
++    assert( pPg->pNextCkpt->pPrevCkpt==pPg );
++    pPg->pNextCkpt->pPrevCkpt = pPg->pPrevCkpt;
++  }
++  pPg->pNextCkpt = 0;
++  pPg->pPrevCkpt = 0;
++  pPg->inCkpt = 0;
++}
++
++/*
++** Find a page in the hash table given its page number.  Return
++** a pointer to the page or NULL if not found.
++*/
++static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
++  PgHdr *p = pPager->aHash[pager_hash(pgno)];
++  while( p && p->pgno!=pgno ){
++    p = p->pNextHash;
++  }
++  return p;
++}
++
++/*
++** Unlock the database and clear the in-memory cache.  This routine
++** sets the state of the pager back to what it was when it was first
++** opened.  Any outstanding pages are invalidated and subsequent attempts
++** to access those pages will likely result in a coredump.
++*/
++static void pager_reset(Pager *pPager){
++  PgHdr *pPg, *pNext;
++  for(pPg=pPager->pAll; pPg; pPg=pNext){
++    pNext = pPg->pNextAll;
++    sqliteFree(pPg);
++  }
++  pPager->pFirst = 0;
++  pPager->pFirstSynced = 0;
++  pPager->pLast = 0;
++  pPager->pAll = 0;
++  memset(pPager->aHash, 0, sizeof(pPager->aHash));
++  pPager->nPage = 0;
++  if( pPager->state>=SQLITE_WRITELOCK ){
++    sqlitepager_rollback(pPager);
++  }
++  sqliteOsUnlock(&pPager->fd);
++  pPager->state = SQLITE_UNLOCK;
++  pPager->dbSize = -1;
++  pPager->nRef = 0;
++  assert( pPager->journalOpen==0 );
++}
++
++/*
++** When this routine is called, the pager has the journal file open and
++** a write lock on the database.  This routine releases the database
++** write lock and acquires a read lock in its place.  The journal file
++** is deleted and closed.
++**
++** TODO: Consider keeping the journal file open for temporary databases.
++** This might give a performance improvement on windows where opening
++** a file is an expensive operation.
++*/
++static int pager_unwritelock(Pager *pPager){
++  int rc;
++  PgHdr *pPg;
++  if( pPager->state<SQLITE_WRITELOCK ) return SQLITE_OK;
++  sqlitepager_ckpt_commit(pPager);
++  if( pPager->ckptOpen ){
++    sqliteOsClose(&pPager->cpfd);
++    pPager->ckptOpen = 0;
++  }
++  if( pPager->journalOpen ){
++    sqliteOsClose(&pPager->jfd);
++    pPager->journalOpen = 0;
++    sqliteOsDelete(pPager->zJournal);
++    sqliteFree( pPager->aInJournal );
++    pPager->aInJournal = 0;
++    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
++      pPg->inJournal = 0;
++      pPg->dirty = 0;
++      pPg->needSync = 0;
++    }
++  }else{
++    assert( pPager->dirtyFile==0 || pPager->useJournal==0 );
++  }
++  rc = sqliteOsReadLock(&pPager->fd);
++  if( rc==SQLITE_OK ){
++    pPager->state = SQLITE_READLOCK;
++  }else{
++    /* This can only happen if a process does a BEGIN, then forks and the
++    ** child process does the COMMIT.  Because of the semantics of unix
++    ** file locking, the unlock will fail.
++    */
++    pPager->state = SQLITE_UNLOCK;
++  }
++  return rc;
++}
++
++/*
++** Compute and return a checksum for the page of data.
++**
++** This is not a real checksum.  It is really just the sum of the 
++** random initial value and the page number.  We considered do a checksum
++** of the database, but that was found to be too slow.
++*/
++static u32 pager_cksum(Pager *pPager, Pgno pgno, const char *aData){
++  u32 cksum = pPager->cksumInit + pgno;
++  return cksum;
++}
++
++/*
++** Read a single page from the journal file opened on file descriptor
++** jfd.  Playback this one page.
++**
++** There are three different journal formats.  The format parameter determines
++** which format is used by the journal that is played back.
++*/
++static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){
++  int rc;
++  PgHdr *pPg;              /* An existing page in the cache */
++  PageRecord pgRec;
++  u32 cksum;
++
++  rc = read32bits(format, jfd, &pgRec.pgno);
++  if( rc!=SQLITE_OK ) return rc;
++  rc = sqliteOsRead(jfd, &pgRec.aData, sizeof(pgRec.aData));
++  if( rc!=SQLITE_OK ) return rc;
++
++  /* Sanity checking on the page.  This is more important that I originally
++  ** thought.  If a power failure occurs while the journal is being written,
++  ** it could cause invalid data to be written into the journal.  We need to
++  ** detect this invalid data (with high probability) and ignore it.
++  */
++  if( pgRec.pgno==0 ){
++    return SQLITE_DONE;
++  }
++  if( pgRec.pgno>(unsigned)pPager->dbSize ){
++    return SQLITE_OK;
++  }
++  if( format>=JOURNAL_FORMAT_3 ){
++    rc = read32bits(format, jfd, &cksum);
++    if( rc ) return rc;
++    if( pager_cksum(pPager, pgRec.pgno, pgRec.aData)!=cksum ){
++      return SQLITE_DONE;
++    }
++  }
++
++  /* Playback the page.  Update the in-memory copy of the page
++  ** at the same time, if there is one.
++  */
++  pPg = pager_lookup(pPager, pgRec.pgno);
++  TRACE2("PLAYBACK %d\n", pgRec.pgno);
++  sqliteOsSeek(&pPager->fd, (pgRec.pgno-1)*(off_t)SQLITE_PAGE_SIZE);
++  rc = sqliteOsWrite(&pPager->fd, pgRec.aData, SQLITE_PAGE_SIZE);
++  if( pPg ){
++    /* No page should ever be rolled back that is in use, except for page
++    ** 1 which is held in use in order to keep the lock on the database
++    ** active.
++    */
++    assert( pPg->nRef==0 || pPg->pgno==1 );
++    memcpy(PGHDR_TO_DATA(pPg), pgRec.aData, SQLITE_PAGE_SIZE);
++    memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra);
++    pPg->dirty = 0;
++    pPg->needSync = 0;
++    CODEC(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3);
++  }
++  return rc;
++}
++
++/*
++** Playback the journal and thus restore the database file to
++** the state it was in before we started making changes.  
++**
++** The journal file format is as follows: 
++**
++**    *  8 byte prefix.  One of the aJournalMagic123 vectors defined
++**       above.  The format of the journal file is determined by which
++**       of the three prefix vectors is seen.
++**    *  4 byte big-endian integer which is the number of valid page records
++**       in the journal.  If this value is 0xffffffff, then compute the
++**       number of page records from the journal size.  This field appears
++**       in format 3 only.
++**    *  4 byte big-endian integer which is the initial value for the 
++**       sanity checksum.  This field appears in format 3 only.
++**    *  4 byte integer which is the number of pages to truncate the
++**       database to during a rollback.
++**    *  Zero or more pages instances, each as follows:
++**        +  4 byte page number.
++**        +  SQLITE_PAGE_SIZE bytes of data.
++**        +  4 byte checksum (format 3 only)
++**
++** When we speak of the journal header, we mean the first 4 bullets above.
++** Each entry in the journal is an instance of the 5th bullet.  Note that
++** bullets 2 and 3 only appear in format-3 journals.
++**
++** Call the value from the second bullet "nRec".  nRec is the number of
++** valid page entries in the journal.  In most cases, you can compute the
++** value of nRec from the size of the journal file.  But if a power
++** failure occurred while the journal was being written, it could be the
++** case that the size of the journal file had already been increased but
++** the extra entries had not yet made it safely to disk.  In such a case,
++** the value of nRec computed from the file size would be too large.  For
++** that reason, we always use the nRec value in the header.
++**
++** If the nRec value is 0xffffffff it means that nRec should be computed
++** from the file size.  This value is used when the user selects the
++** no-sync option for the journal.  A power failure could lead to corruption
++** in this case.  But for things like temporary table (which will be
++** deleted when the power is restored) we don't care.  
++**
++** Journal formats 1 and 2 do not have an nRec value in the header so we
++** have to compute nRec from the file size.  This has risks (as described
++** above) which is why all persistent tables have been changed to use
++** format 3.
++**
++** If the file opened as the journal file is not a well-formed
++** journal file then the database will likely already be
++** corrupted, so the PAGER_ERR_CORRUPT bit is set in pPager->errMask
++** and SQLITE_CORRUPT is returned.  If it all works, then this routine
++** returns SQLITE_OK.
++*/
++static int pager_playback(Pager *pPager, int useJournalSize){
++  off_t szJ;               /* Size of the journal file in bytes */
++  int nRec;                /* Number of Records in the journal */
++  int i;                   /* Loop counter */
++  Pgno mxPg = 0;           /* Size of the original file in pages */
++  int format;              /* Format of the journal file. */
++  unsigned char aMagic[sizeof(aJournalMagic1)];
++  int rc;
++
++  /* Figure out how many records are in the journal.  Abort early if
++  ** the journal is empty.
++  */
++  assert( pPager->journalOpen );
++  sqliteOsSeek(&pPager->jfd, 0);
++  rc = sqliteOsFileSize(&pPager->jfd, &szJ);
++  if( rc!=SQLITE_OK ){
++    goto end_playback;
++  }
++
++  /* If the journal file is too small to contain a complete header,
++  ** it must mean that the process that created the journal was just
++  ** beginning to write the journal file when it died.  In that case,
++  ** the database file should have still been completely unchanged.
++  ** Nothing needs to be rolled back.  We can safely ignore this journal.
++  */
++  if( szJ < sizeof(aMagic)+sizeof(Pgno) ){
++    goto end_playback;
++  }
++
++  /* Read the beginning of the journal and truncate the
++  ** database file back to its original size.
++  */
++  rc = sqliteOsRead(&pPager->jfd, aMagic, sizeof(aMagic));
++  if( rc!=SQLITE_OK ){
++    rc = SQLITE_PROTOCOL;
++    goto end_playback;
++  }
++  if( memcmp(aMagic, aJournalMagic3, sizeof(aMagic))==0 ){
++    format = JOURNAL_FORMAT_3;
++  }else if( memcmp(aMagic, aJournalMagic2, sizeof(aMagic))==0 ){
++    format = JOURNAL_FORMAT_2;
++  }else if( memcmp(aMagic, aJournalMagic1, sizeof(aMagic))==0 ){
++    format = JOURNAL_FORMAT_1;
++  }else{
++    rc = SQLITE_PROTOCOL;
++    goto end_playback;
++  }
++  if( format>=JOURNAL_FORMAT_3 ){
++    if( szJ < sizeof(aMagic) + 3*sizeof(u32) ){
++      /* Ignore the journal if it is too small to contain a complete
++      ** header.  We already did this test once above, but at the prior
++      ** test, we did not know the journal format and so we had to assume
++      ** the smallest possible header.  Now we know the header is bigger
++      ** than the minimum so we test again.
++      */
++      goto end_playback;
++    }
++    rc = read32bits(format, &pPager->jfd, (u32*)&nRec);
++    if( rc ) goto end_playback;
++    rc = read32bits(format, &pPager->jfd, &pPager->cksumInit);
++    if( rc ) goto end_playback;
++    if( nRec==0xffffffff || useJournalSize ){
++      nRec = (szJ - JOURNAL_HDR_SZ(3))/JOURNAL_PG_SZ(3);
++    }
++  }else{
++    nRec = (szJ - JOURNAL_HDR_SZ(2))/JOURNAL_PG_SZ(2);
++    assert( nRec*JOURNAL_PG_SZ(2)+JOURNAL_HDR_SZ(2)==szJ );
++  }
++  rc = read32bits(format, &pPager->jfd, &mxPg);
++  if( rc!=SQLITE_OK ){
++    goto end_playback;
++  }
++  assert( pPager->origDbSize==0 || pPager->origDbSize==mxPg );
++  rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)mxPg);
++  if( rc!=SQLITE_OK ){
++    goto end_playback;
++  }
++  pPager->dbSize = mxPg;
++  
++  /* Copy original pages out of the journal and back into the database file.
++  */
++  for(i=0; i<nRec; i++){
++    rc = pager_playback_one_page(pPager, &pPager->jfd, format);
++    if( rc!=SQLITE_OK ){
++      if( rc==SQLITE_DONE ){
++        rc = SQLITE_OK;
++      }
++      break;
++    }
++  }
++
++  /* Pages that have been written to the journal but never synced
++  ** where not restored by the loop above.  We have to restore those
++  ** pages by reading them back from the original database.
++  */
++  if( rc==SQLITE_OK ){
++    PgHdr *pPg;
++    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
++      char zBuf[SQLITE_PAGE_SIZE];
++      if( !pPg->dirty ) continue;
++      if( (int)pPg->pgno <= pPager->origDbSize ){
++        sqliteOsSeek(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)(pPg->pgno-1));
++        rc = sqliteOsRead(&pPager->fd, zBuf, SQLITE_PAGE_SIZE);
++        TRACE2("REFETCH %d\n", pPg->pgno);
++        CODEC(pPager, zBuf, pPg->pgno, 2);
++        if( rc ) break;
++      }else{
++        memset(zBuf, 0, SQLITE_PAGE_SIZE);
++      }
++      if( pPg->nRef==0 || memcmp(zBuf, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE) ){
++        memcpy(PGHDR_TO_DATA(pPg), zBuf, SQLITE_PAGE_SIZE);
++        memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra);
++      }
++      pPg->needSync = 0;
++      pPg->dirty = 0;
++    }
++  }
++
++end_playback:
++  if( rc!=SQLITE_OK ){
++    pager_unwritelock(pPager);
++    pPager->errMask |= PAGER_ERR_CORRUPT;
++    rc = SQLITE_CORRUPT;
++  }else{
++    rc = pager_unwritelock(pPager);
++  }
++  return rc;
++}
++
++/*
++** Playback the checkpoint journal.
++**
++** This is similar to playing back the transaction journal but with
++** a few extra twists.
++**
++**    (1)  The number of pages in the database file at the start of
++**         the checkpoint is stored in pPager->ckptSize, not in the
++**         journal file itself.
++**
++**    (2)  In addition to playing back the checkpoint journal, also
++**         playback all pages of the transaction journal beginning
++**         at offset pPager->ckptJSize.
++*/
++static int pager_ckpt_playback(Pager *pPager){
++  off_t szJ;               /* Size of the full journal */
++  int nRec;                /* Number of Records */
++  int i;                   /* Loop counter */
++  int rc;
++
++  /* Truncate the database back to its original size.
++  */
++  rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)pPager->ckptSize);
++  pPager->dbSize = pPager->ckptSize;
++
++  /* Figure out how many records are in the checkpoint journal.
++  */
++  assert( pPager->ckptInUse && pPager->journalOpen );
++  sqliteOsSeek(&pPager->cpfd, 0);
++  nRec = pPager->ckptNRec;
++  
++  /* Copy original pages out of the checkpoint journal and back into the
++  ** database file.  Note that the checkpoint journal always uses format
++  ** 2 instead of format 3 since it does not need to be concerned with
++  ** power failures corrupting the journal and can thus omit the checksums.
++  */
++  for(i=nRec-1; i>=0; i--){
++    rc = pager_playback_one_page(pPager, &pPager->cpfd, 2);
++    assert( rc!=SQLITE_DONE );
++    if( rc!=SQLITE_OK ) goto end_ckpt_playback;
++  }
++
++  /* Figure out how many pages need to be copied out of the transaction
++  ** journal.
++  */
++  rc = sqliteOsSeek(&pPager->jfd, pPager->ckptJSize);
++  if( rc!=SQLITE_OK ){
++    goto end_ckpt_playback;
++  }
++  rc = sqliteOsFileSize(&pPager->jfd, &szJ);
++  if( rc!=SQLITE_OK ){
++    goto end_ckpt_playback;
++  }
++  nRec = (szJ - pPager->ckptJSize)/JOURNAL_PG_SZ(journal_format);
++  for(i=nRec-1; i>=0; i--){
++    rc = pager_playback_one_page(pPager, &pPager->jfd, journal_format);
++    if( rc!=SQLITE_OK ){
++      assert( rc!=SQLITE_DONE );
++      goto end_ckpt_playback;
++    }
++  }
++  
++end_ckpt_playback:
++  if( rc!=SQLITE_OK ){
++    pPager->errMask |= PAGER_ERR_CORRUPT;
++    rc = SQLITE_CORRUPT;
++  }
++  return rc;
++}
++
++/*
++** Change the maximum number of in-memory pages that are allowed.
++**
++** The maximum number is the absolute value of the mxPage parameter.
++** If mxPage is negative, the noSync flag is also set.  noSync bypasses
++** calls to sqliteOsSync().  The pager runs much faster with noSync on,
++** but if the operating system crashes or there is an abrupt power 
++** failure, the database file might be left in an inconsistent and
++** unrepairable state.  
++*/
++void sqlitepager_set_cachesize(Pager *pPager, int mxPage){
++  if( mxPage>=0 ){
++    pPager->noSync = pPager->tempFile;
++    if( pPager->noSync==0 ) pPager->needSync = 0;
++  }else{
++    pPager->noSync = 1;
++    mxPage = -mxPage;
++  }
++  if( mxPage>10 ){
++    pPager->mxPage = mxPage;
++  }
++}
++
++/*
++** Adjust the robustness of the database to damage due to OS crashes
++** or power failures by changing the number of syncs()s when writing
++** the rollback journal.  There are three levels:
++**
++**    OFF       sqliteOsSync() is never called.  This is the default
++**              for temporary and transient files.
++**
++**    NORMAL    The journal is synced once before writes begin on the
++**              database.  This is normally adequate protection, but
++**              it is theoretically possible, though very unlikely,
++**              that an inopertune power failure could leave the journal
++**              in a state which would cause damage to the database
++**              when it is rolled back.
++**
++**    FULL      The journal is synced twice before writes begin on the
++**              database (with some additional information - the nRec field
++**              of the journal header - being written in between the two
++**              syncs).  If we assume that writing a
++**              single disk sector is atomic, then this mode provides
++**              assurance that the journal will not be corrupted to the
++**              point of causing damage to the database during rollback.
++**
++** Numeric values associated with these states are OFF==1, NORMAL=2,
++** and FULL=3.
++*/
++void sqlitepager_set_safety_level(Pager *pPager, int level){
++  pPager->noSync =  level==1 || pPager->tempFile;
++  pPager->fullSync = level==3 && !pPager->tempFile;
++  if( pPager->noSync==0 ) pPager->needSync = 0;
++}
++
++/*
++** Open a temporary file.  Write the name of the file into zName
++** (zName must be at least SQLITE_TEMPNAME_SIZE bytes long.)  Write
++** the file descriptor into *fd.  Return SQLITE_OK on success or some
++** other error code if we fail.
++**
++** The OS will automatically delete the temporary file when it is
++** closed.
++*/
++static int sqlitepager_opentemp(char *zFile, OsFile *fd){
++  int cnt = 8;
++  int rc;
++  do{
++    cnt--;
++    sqliteOsTempFileName(zFile);
++    rc = sqliteOsOpenExclusive(zFile, fd, 1);
++  }while( cnt>0 && rc!=SQLITE_OK );
++  return rc;
++}
++
++/*
++** Create a new page cache and put a pointer to the page cache in *ppPager.
++** The file to be cached need not exist.  The file is not locked until
++** the first call to sqlitepager_get() and is only held open until the
++** last page is released using sqlitepager_unref().
++**
++** If zFilename is NULL then a randomly-named temporary file is created
++** and used as the file to be cached.  The file will be deleted
++** automatically when it is closed.
++*/
++int sqlitepager_open(
++  Pager **ppPager,         /* Return the Pager structure here */
++  const char *zFilename,   /* Name of the database file to open */
++  int mxPage,              /* Max number of in-memory cache pages */
++  int nExtra,              /* Extra bytes append to each in-memory page */
++  int useJournal           /* TRUE to use a rollback journal on this file */
++){
++  Pager *pPager;
++  char *zFullPathname;
++  int nameLen;
++  OsFile fd;
++  int rc, i;
++  int tempFile;
++  int readOnly = 0;
++  char zTemp[SQLITE_TEMPNAME_SIZE];
++
++  *ppPager = 0;
++  if( sqlite_malloc_failed ){
++    return SQLITE_NOMEM;
++  }
++  if( zFilename && zFilename[0] ){
++    zFullPathname = sqliteOsFullPathname(zFilename);
++    rc = sqliteOsOpenReadWrite(zFullPathname, &fd, &readOnly);
++    tempFile = 0;
++  }else{
++    rc = sqlitepager_opentemp(zTemp, &fd);
++    zFilename = zTemp;
++    zFullPathname = sqliteOsFullPathname(zFilename);
++    tempFile = 1;
++  }
++  if( sqlite_malloc_failed ){
++    return SQLITE_NOMEM;
++  }
++  if( rc!=SQLITE_OK ){
++    sqliteFree(zFullPathname);
++    return SQLITE_CANTOPEN;
++  }
++  nameLen = strlen(zFullPathname);
++  pPager = sqliteMalloc( sizeof(*pPager) + nameLen*3 + 30 );
++  if( pPager==0 ){
++    sqliteOsClose(&fd);
++    sqliteFree(zFullPathname);
++    return SQLITE_NOMEM;
++  }
++  SET_PAGER(pPager);
++  pPager->zFilename = (char*)&pPager[1];
++  pPager->zDirectory = &pPager->zFilename[nameLen+1];
++  pPager->zJournal = &pPager->zDirectory[nameLen+1];
++  strcpy(pPager->zFilename, zFullPathname);
++  strcpy(pPager->zDirectory, zFullPathname);
++  for(i=nameLen; i>0 && pPager->zDirectory[i-1]!='/'; i--){}
++  if( i>0 ) pPager->zDirectory[i-1] = 0;
++  strcpy(pPager->zJournal, zFullPathname);
++  sqliteFree(zFullPathname);
++  strcpy(&pPager->zJournal[nameLen], "-journal");
++  pPager->fd = fd;
++  pPager->journalOpen = 0;
++  pPager->useJournal = useJournal;
++  pPager->ckptOpen = 0;
++  pPager->ckptInUse = 0;
++  pPager->nRef = 0;
++  pPager->dbSize = -1;
++  pPager->ckptSize = 0;
++  pPager->ckptJSize = 0;
++  pPager->nPage = 0;
++  pPager->mxPage = mxPage>5 ? mxPage : 10;
++  pPager->state = SQLITE_UNLOCK;
++  pPager->errMask = 0;
++  pPager->tempFile = tempFile;
++  pPager->readOnly = readOnly;
++  pPager->needSync = 0;
++  pPager->noSync = pPager->tempFile || !useJournal;
++  pPager->pFirst = 0;
++  pPager->pFirstSynced = 0;
++  pPager->pLast = 0;
++  pPager->nExtra = nExtra;
++  memset(pPager->aHash, 0, sizeof(pPager->aHash));
++  *ppPager = pPager;
++  return SQLITE_OK;
++}
++
++/*
++** Set the destructor for this pager.  If not NULL, the destructor is called
++** when the reference count on each page reaches zero.  The destructor can
++** be used to clean up information in the extra segment appended to each page.
++**
++** The destructor is not called as a result sqlitepager_close().  
++** Destructors are only called by sqlitepager_unref().
++*/
++void sqlitepager_set_destructor(Pager *pPager, void (*xDesc)(void*)){
++  pPager->xDestructor = xDesc;
++}
++
++/*
++** Return the total number of pages in the disk file associated with
++** pPager.
++*/
++int sqlitepager_pagecount(Pager *pPager){
++  off_t n;
++  assert( pPager!=0 );
++  if( pPager->dbSize>=0 ){
++    return pPager->dbSize;
++  }
++  if( sqliteOsFileSize(&pPager->fd, &n)!=SQLITE_OK ){
++    pPager->errMask |= PAGER_ERR_DISK;
++    return 0;
++  }
++  n /= SQLITE_PAGE_SIZE;
++  if( pPager->state!=SQLITE_UNLOCK ){
++    pPager->dbSize = n;
++  }
++  return n;
++}
++
++/*
++** Forward declaration
++*/
++static int syncJournal(Pager*);
++
++/*
++** Truncate the file to the number of pages specified.
++*/
++int sqlitepager_truncate(Pager *pPager, Pgno nPage){
++  int rc;
++  if( pPager->dbSize<0 ){
++    sqlitepager_pagecount(pPager);
++  }
++  if( pPager->errMask!=0 ){
++    rc = pager_errcode(pPager);
++    return rc;
++  }
++  if( nPage>=(unsigned)pPager->dbSize ){
++    return SQLITE_OK;
++  }
++  syncJournal(pPager);
++  rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)nPage);
++  if( rc==SQLITE_OK ){
++    pPager->dbSize = nPage;
++  }
++  return rc;
++}
++
++/*
++** Shutdown the page cache.  Free all memory and close all files.
++**
++** If a transaction was in progress when this routine is called, that
++** transaction is rolled back.  All outstanding pages are invalidated
++** and their memory is freed.  Any attempt to use a page associated
++** with this page cache after this function returns will likely
++** result in a coredump.
++*/
++int sqlitepager_close(Pager *pPager){
++  PgHdr *pPg, *pNext;
++  switch( pPager->state ){
++    case SQLITE_WRITELOCK: {
++      sqlitepager_rollback(pPager);
++      sqliteOsUnlock(&pPager->fd);
++      assert( pPager->journalOpen==0 );
++      break;
++    }
++    case SQLITE_READLOCK: {
++      sqliteOsUnlock(&pPager->fd);
++      break;
++    }
++    default: {
++      /* Do nothing */
++      break;
++    }
++  }
++  for(pPg=pPager->pAll; pPg; pPg=pNext){
++    pNext = pPg->pNextAll;
++    sqliteFree(pPg);
++  }
++  sqliteOsClose(&pPager->fd);
++  assert( pPager->journalOpen==0 );
++  /* Temp files are automatically deleted by the OS
++  ** if( pPager->tempFile ){
++  **   sqliteOsDelete(pPager->zFilename);
++  ** }
++  */
++  CLR_PAGER(pPager);
++  if( pPager->zFilename!=(char*)&pPager[1] ){
++    assert( 0 );  /* Cannot happen */
++    sqliteFree(pPager->zFilename);
++    sqliteFree(pPager->zJournal);
++    sqliteFree(pPager->zDirectory);
++  }
++  sqliteFree(pPager);
++  return SQLITE_OK;
++}
++
++/*
++** Return the page number for the given page data.
++*/
++Pgno sqlitepager_pagenumber(void *pData){
++  PgHdr *p = DATA_TO_PGHDR(pData);
++  return p->pgno;
++}
++
++/*
++** Increment the reference count for a page.  If the page is
++** currently on the freelist (the reference count is zero) then
++** remove it from the freelist.
++*/
++#define page_ref(P)   ((P)->nRef==0?_page_ref(P):(void)(P)->nRef++)
++static void _page_ref(PgHdr *pPg){
++  if( pPg->nRef==0 ){
++    /* The page is currently on the freelist.  Remove it. */
++    if( pPg==pPg->pPager->pFirstSynced ){
++      PgHdr *p = pPg->pNextFree;
++      while( p && p->needSync ){ p = p->pNextFree; }
++      pPg->pPager->pFirstSynced = p;
++    }
++    if( pPg->pPrevFree ){
++      pPg->pPrevFree->pNextFree = pPg->pNextFree;
++    }else{
++      pPg->pPager->pFirst = pPg->pNextFree;
++    }
++    if( pPg->pNextFree ){
++      pPg->pNextFree->pPrevFree = pPg->pPrevFree;
++    }else{
++      pPg->pPager->pLast = pPg->pPrevFree;
++    }
++    pPg->pPager->nRef++;
++  }
++  pPg->nRef++;
++  REFINFO(pPg);
++}
++
++/*
++** Increment the reference count for a page.  The input pointer is
++** a reference to the page data.
++*/
++int sqlitepager_ref(void *pData){
++  PgHdr *pPg = DATA_TO_PGHDR(pData);
++  page_ref(pPg);
++  return SQLITE_OK;
++}
++
++/*
++** Sync the journal.  In other words, make sure all the pages that have
++** been written to the journal have actually reached the surface of the
++** disk.  It is not safe to modify the original database file until after
++** the journal has been synced.  If the original database is modified before
++** the journal is synced and a power failure occurs, the unsynced journal
++** data would be lost and we would be unable to completely rollback the
++** database changes.  Database corruption would occur.
++** 
++** This routine also updates the nRec field in the header of the journal.
++** (See comments on the pager_playback() routine for additional information.)
++** If the sync mode is FULL, two syncs will occur.  First the whole journal
++** is synced, then the nRec field is updated, then a second sync occurs.
++**
++** For temporary databases, we do not care if we are able to rollback
++** after a power failure, so sync occurs.
++**
++** This routine clears the needSync field of every page current held in
++** memory.
++*/
++static int syncJournal(Pager *pPager){
++  PgHdr *pPg;
++  int rc = SQLITE_OK;
++
++  /* Sync the journal before modifying the main database
++  ** (assuming there is a journal and it needs to be synced.)
++  */
++  if( pPager->needSync ){
++    if( !pPager->tempFile ){
++      assert( pPager->journalOpen );
++      /* assert( !pPager->noSync ); // noSync might be set if synchronous
++      ** was turned off after the transaction was started.  Ticket #615 */
++#ifndef NDEBUG
++      {
++        /* Make sure the pPager->nRec counter we are keeping agrees
++        ** with the nRec computed from the size of the journal file.
++        */
++        off_t hdrSz, pgSz, jSz;
++        hdrSz = JOURNAL_HDR_SZ(journal_format);
++        pgSz = JOURNAL_PG_SZ(journal_format);
++        rc = sqliteOsFileSize(&pPager->jfd, &jSz);
++        if( rc!=0 ) return rc;
++        assert( pPager->nRec*pgSz+hdrSz==jSz );
++      }
++#endif
++      if( journal_format>=3 ){
++        /* Write the nRec value into the journal file header */
++        off_t szJ;
++        if( pPager->fullSync ){
++          TRACE1("SYNC\n");
++          rc = sqliteOsSync(&pPager->jfd);
++          if( rc!=0 ) return rc;
++        }
++        sqliteOsSeek(&pPager->jfd, sizeof(aJournalMagic1));
++        rc = write32bits(&pPager->jfd, pPager->nRec);
++        if( rc ) return rc;
++        szJ = JOURNAL_HDR_SZ(journal_format) +
++                 pPager->nRec*JOURNAL_PG_SZ(journal_format);
++        sqliteOsSeek(&pPager->jfd, szJ);
++      }
++      TRACE1("SYNC\n");
++      rc = sqliteOsSync(&pPager->jfd);
++      if( rc!=0 ) return rc;
++      pPager->journalStarted = 1;
++    }
++    pPager->needSync = 0;
++
++    /* Erase the needSync flag from every page.
++    */
++    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
++      pPg->needSync = 0;
++    }
++    pPager->pFirstSynced = pPager->pFirst;
++  }
++
++#ifndef NDEBUG
++  /* If the Pager.needSync flag is clear then the PgHdr.needSync
++  ** flag must also be clear for all pages.  Verify that this
++  ** invariant is true.
++  */
++  else{
++    for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
++      assert( pPg->needSync==0 );
++    }
++    assert( pPager->pFirstSynced==pPager->pFirst );
++  }
++#endif
++
++  return rc;
++}
++
++/*
++** Given a list of pages (connected by the PgHdr.pDirty pointer) write
++** every one of those pages out to the database file and mark them all
++** as clean.
++*/
++static int pager_write_pagelist(PgHdr *pList){
++  Pager *pPager;
++  int rc;
++
++  if( pList==0 ) return SQLITE_OK;
++  pPager = pList->pPager;
++  while( pList ){
++    assert( pList->dirty );
++    sqliteOsSeek(&pPager->fd, (pList->pgno-1)*(off_t)SQLITE_PAGE_SIZE);
++    CODEC(pPager, PGHDR_TO_DATA(pList), pList->pgno, 6);
++    TRACE2("STORE %d\n", pList->pgno);
++    rc = sqliteOsWrite(&pPager->fd, PGHDR_TO_DATA(pList), SQLITE_PAGE_SIZE);
++    CODEC(pPager, PGHDR_TO_DATA(pList), pList->pgno, 0);
++    if( rc ) return rc;
++    pList->dirty = 0;
++    pList = pList->pDirty;
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Collect every dirty page into a dirty list and
++** return a pointer to the head of that list.  All pages are
++** collected even if they are still in use.
++*/
++static PgHdr *pager_get_all_dirty_pages(Pager *pPager){
++  PgHdr *p, *pList;
++  pList = 0;
++  for(p=pPager->pAll; p; p=p->pNextAll){
++    if( p->dirty ){
++      p->pDirty = pList;
++      pList = p;
++    }
++  }
++  return pList;
++}
++
++/*
++** Acquire a page.
++**
++** A read lock on the disk file is obtained when the first page is acquired. 
++** This read lock is dropped when the last page is released.
++**
++** A _get works for any page number greater than 0.  If the database
++** file is smaller than the requested page, then no actual disk
++** read occurs and the memory image of the page is initialized to
++** all zeros.  The extra data appended to a page is always initialized
++** to zeros the first time a page is loaded into memory.
++**
++** The acquisition might fail for several reasons.  In all cases,
++** an appropriate error code is returned and *ppPage is set to NULL.
++**
++** See also sqlitepager_lookup().  Both this routine and _lookup() attempt
++** to find a page in the in-memory cache first.  If the page is not already
++** in memory, this routine goes to disk to read it in whereas _lookup()
++** just returns 0.  This routine acquires a read-lock the first time it
++** has to go to disk, and could also playback an old journal if necessary.
++** Since _lookup() never goes to disk, it never has to deal with locks
++** or journal files.
++*/
++int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){
++  PgHdr *pPg;
++  int rc;
++
++  /* Make sure we have not hit any critical errors.
++  */ 
++  assert( pPager!=0 );
++  assert( pgno!=0 );
++  *ppPage = 0;
++  if( pPager->errMask & ~(PAGER_ERR_FULL) ){
++    return pager_errcode(pPager);
++  }
++
++  /* If this is the first page accessed, then get a read lock
++  ** on the database file.
++  */
++  if( pPager->nRef==0 ){
++    rc = sqliteOsReadLock(&pPager->fd);
++    if( rc!=SQLITE_OK ){
++      return rc;
++    }
++    pPager->state = SQLITE_READLOCK;
++
++    /* If a journal file exists, try to play it back.
++    */
++    if( pPager->useJournal && sqliteOsFileExists(pPager->zJournal) ){
++       int rc;
++
++       /* Get a write lock on the database
++       */
++       rc = sqliteOsWriteLock(&pPager->fd);
++       if( rc!=SQLITE_OK ){
++         if( sqliteOsUnlock(&pPager->fd)!=SQLITE_OK ){
++           /* This should never happen! */
++           rc = SQLITE_INTERNAL;
++         }
++         return rc;
++       }
++       pPager->state = SQLITE_WRITELOCK;
++
++       /* Open the journal for reading only.  Return SQLITE_BUSY if
++       ** we are unable to open the journal file. 
++       **
++       ** The journal file does not need to be locked itself.  The
++       ** journal file is never open unless the main database file holds
++       ** a write lock, so there is never any chance of two or more
++       ** processes opening the journal at the same time.
++       */
++       rc = sqliteOsOpenReadOnly(pPager->zJournal, &pPager->jfd);
++       if( rc!=SQLITE_OK ){
++         rc = sqliteOsUnlock(&pPager->fd);
++         assert( rc==SQLITE_OK );
++         return SQLITE_BUSY;
++       }
++       pPager->journalOpen = 1;
++       pPager->journalStarted = 0;
++
++       /* Playback and delete the journal.  Drop the database write
++       ** lock and reacquire the read lock.
++       */
++       rc = pager_playback(pPager, 0);
++       if( rc!=SQLITE_OK ){
++         return rc;
++       }
++    }
++    pPg = 0;
++  }else{
++    /* Search for page in cache */
++    pPg = pager_lookup(pPager, pgno);
++  }
++  if( pPg==0 ){
++    /* The requested page is not in the page cache. */
++    int h;
++    pPager->nMiss++;
++    if( pPager->nPage<pPager->mxPage || pPager->pFirst==0 ){
++      /* Create a new page */
++      pPg = sqliteMallocRaw( sizeof(*pPg) + SQLITE_PAGE_SIZE 
++                              + sizeof(u32) + pPager->nExtra );
++      if( pPg==0 ){
++        pager_unwritelock(pPager);
++        pPager->errMask |= PAGER_ERR_MEM;
++        return SQLITE_NOMEM;
++      }
++      memset(pPg, 0, sizeof(*pPg));
++      pPg->pPager = pPager;
++      pPg->pNextAll = pPager->pAll;
++      if( pPager->pAll ){
++        pPager->pAll->pPrevAll = pPg;
++      }
++      pPg->pPrevAll = 0;
++      pPager->pAll = pPg;
++      pPager->nPage++;
++    }else{
++      /* Find a page to recycle.  Try to locate a page that does not
++      ** require us to do an fsync() on the journal.
++      */
++      pPg = pPager->pFirstSynced;
++
++      /* If we could not find a page that does not require an fsync()
++      ** on the journal file then fsync the journal file.  This is a
++      ** very slow operation, so we work hard to avoid it.  But sometimes
++      ** it can't be helped.
++      */
++      if( pPg==0 ){
++        int rc = syncJournal(pPager);
++        if( rc!=0 ){
++          sqlitepager_rollback(pPager);
++          return SQLITE_IOERR;
++        }
++        pPg = pPager->pFirst;
++      }
++      assert( pPg->nRef==0 );
++
++      /* Write the page to the database file if it is dirty.
++      */
++      if( pPg->dirty ){
++        assert( pPg->needSync==0 );
++        pPg->pDirty = 0;
++        rc = pager_write_pagelist( pPg );
++        if( rc!=SQLITE_OK ){
++          sqlitepager_rollback(pPager);
++          return SQLITE_IOERR;
++        }
++      }
++      assert( pPg->dirty==0 );
++
++      /* If the page we are recycling is marked as alwaysRollback, then
++      ** set the global alwaysRollback flag, thus disabling the
++      ** sqlite_dont_rollback() optimization for the rest of this transaction.
++      ** It is necessary to do this because the page marked alwaysRollback
++      ** might be reloaded at a later time but at that point we won't remember
++      ** that is was marked alwaysRollback.  This means that all pages must
++      ** be marked as alwaysRollback from here on out.
++      */
++      if( pPg->alwaysRollback ){
++        pPager->alwaysRollback = 1;
++      }
++
++      /* Unlink the old page from the free list and the hash table
++      */
++      if( pPg==pPager->pFirstSynced ){
++        PgHdr *p = pPg->pNextFree;
++        while( p && p->needSync ){ p = p->pNextFree; }
++        pPager->pFirstSynced = p;
++      }
++      if( pPg->pPrevFree ){
++        pPg->pPrevFree->pNextFree = pPg->pNextFree;
++      }else{
++        assert( pPager->pFirst==pPg );
++        pPager->pFirst = pPg->pNextFree;
++      }
++      if( pPg->pNextFree ){
++        pPg->pNextFree->pPrevFree = pPg->pPrevFree;
++      }else{
++        assert( pPager->pLast==pPg );
++        pPager->pLast = pPg->pPrevFree;
++      }
++      pPg->pNextFree = pPg->pPrevFree = 0;
++      if( pPg->pNextHash ){
++        pPg->pNextHash->pPrevHash = pPg->pPrevHash;
++      }
++      if( pPg->pPrevHash ){
++        pPg->pPrevHash->pNextHash = pPg->pNextHash;
++      }else{
++        h = pager_hash(pPg->pgno);
++        assert( pPager->aHash[h]==pPg );
++        pPager->aHash[h] = pPg->pNextHash;
++      }
++      pPg->pNextHash = pPg->pPrevHash = 0;
++      pPager->nOvfl++;
++    }
++    pPg->pgno = pgno;
++    if( pPager->aInJournal && (int)pgno<=pPager->origDbSize ){
++      sqliteCheckMemory(pPager->aInJournal, pgno/8);
++      assert( pPager->journalOpen );
++      pPg->inJournal = (pPager->aInJournal[pgno/8] & (1<<(pgno&7)))!=0;
++      pPg->needSync = 0;
++    }else{
++      pPg->inJournal = 0;
++      pPg->needSync = 0;
++    }
++    if( pPager->aInCkpt && (int)pgno<=pPager->ckptSize
++             && (pPager->aInCkpt[pgno/8] & (1<<(pgno&7)))!=0 ){
++      page_add_to_ckpt_list(pPg);
++    }else{
++      page_remove_from_ckpt_list(pPg);
++    }
++    pPg->dirty = 0;
++    pPg->nRef = 1;
++    REFINFO(pPg);
++    pPager->nRef++;
++    h = pager_hash(pgno);
++    pPg->pNextHash = pPager->aHash[h];
++    pPager->aHash[h] = pPg;
++    if( pPg->pNextHash ){
++      assert( pPg->pNextHash->pPrevHash==0 );
++      pPg->pNextHash->pPrevHash = pPg;
++    }
++    if( pPager->nExtra>0 ){
++      memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra);
++    }
++    if( pPager->dbSize<0 ) sqlitepager_pagecount(pPager);
++    if( pPager->errMask!=0 ){
++      sqlitepager_unref(PGHDR_TO_DATA(pPg));
++      rc = pager_errcode(pPager);
++      return rc;
++    }
++    if( pPager->dbSize<(int)pgno ){
++      memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE);
++    }else{
++      int rc;
++      sqliteOsSeek(&pPager->fd, (pgno-1)*(off_t)SQLITE_PAGE_SIZE);
++      rc = sqliteOsRead(&pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE);
++      TRACE2("FETCH %d\n", pPg->pgno);
++      CODEC(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3);
++      if( rc!=SQLITE_OK ){
++        off_t fileSize;
++        if( sqliteOsFileSize(&pPager->fd,&fileSize)!=SQLITE_OK
++               || fileSize>=pgno*SQLITE_PAGE_SIZE ){
++          sqlitepager_unref(PGHDR_TO_DATA(pPg));
++          return rc;
++        }else{
++          memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE);
++        }
++      }
++    }
++  }else{
++    /* The requested page is in the page cache. */
++    pPager->nHit++;
++    page_ref(pPg);
++  }
++  *ppPage = PGHDR_TO_DATA(pPg);
++  return SQLITE_OK;
++}
++
++/*
++** Acquire a page if it is already in the in-memory cache.  Do
++** not read the page from disk.  Return a pointer to the page,
++** or 0 if the page is not in cache.
++**
++** See also sqlitepager_get().  The difference between this routine
++** and sqlitepager_get() is that _get() will go to the disk and read
++** in the page if the page is not already in cache.  This routine
++** returns NULL if the page is not in cache or if a disk I/O error 
++** has ever happened.
++*/
++void *sqlitepager_lookup(Pager *pPager, Pgno pgno){
++  PgHdr *pPg;
++
++  assert( pPager!=0 );
++  assert( pgno!=0 );
++  if( pPager->errMask & ~(PAGER_ERR_FULL) ){
++    return 0;
++  }
++  /* if( pPager->nRef==0 ){
++  **  return 0;
++  ** }
++  */
++  pPg = pager_lookup(pPager, pgno);
++  if( pPg==0 ) return 0;
++  page_ref(pPg);
++  return PGHDR_TO_DATA(pPg);
++}
++
++/*
++** Release a page.
++**
++** If the number of references to the page drop to zero, then the
++** page is added to the LRU list.  When all references to all pages
++** are released, a rollback occurs and the lock on the database is
++** removed.
++*/
++int sqlitepager_unref(void *pData){
++  PgHdr *pPg;
++
++  /* Decrement the reference count for this page
++  */
++  pPg = DATA_TO_PGHDR(pData);
++  assert( pPg->nRef>0 );
++  pPg->nRef--;
++  REFINFO(pPg);
++
++  /* When the number of references to a page reach 0, call the
++  ** destructor and add the page to the freelist.
++  */
++  if( pPg->nRef==0 ){
++    Pager *pPager;
++    pPager = pPg->pPager;
++    pPg->pNextFree = 0;
++    pPg->pPrevFree = pPager->pLast;
++    pPager->pLast = pPg;
++    if( pPg->pPrevFree ){
++      pPg->pPrevFree->pNextFree = pPg;
++    }else{
++      pPager->pFirst = pPg;
++    }
++    if( pPg->needSync==0 && pPager->pFirstSynced==0 ){
++      pPager->pFirstSynced = pPg;
++    }
++    if( pPager->xDestructor ){
++      pPager->xDestructor(pData);
++    }
++  
++    /* When all pages reach the freelist, drop the read lock from
++    ** the database file.
++    */
++    pPager->nRef--;
++    assert( pPager->nRef>=0 );
++    if( pPager->nRef==0 ){
++      pager_reset(pPager);
++    }
++  }
++  return SQLITE_OK;
++}
++
++/*
++** Create a journal file for pPager.  There should already be a write
++** lock on the database file when this routine is called.
++**
++** Return SQLITE_OK if everything.  Return an error code and release the
++** write lock if anything goes wrong.
++*/
++static int pager_open_journal(Pager *pPager){
++  int rc;
++  assert( pPager->state==SQLITE_WRITELOCK );
++  assert( pPager->journalOpen==0 );
++  assert( pPager->useJournal );
++  sqlitepager_pagecount(pPager);
++  pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 );
++  if( pPager->aInJournal==0 ){
++    sqliteOsReadLock(&pPager->fd);
++    pPager->state = SQLITE_READLOCK;
++    return SQLITE_NOMEM;
++  }
++  rc = sqliteOsOpenExclusive(pPager->zJournal, &pPager->jfd,pPager->tempFile);
++  if( rc!=SQLITE_OK ){
++    sqliteFree(pPager->aInJournal);
++    pPager->aInJournal = 0;
++    sqliteOsReadLock(&pPager->fd);
++    pPager->state = SQLITE_READLOCK;
++    return SQLITE_CANTOPEN;
++  }
++  sqliteOsOpenDirectory(pPager->zDirectory, &pPager->jfd);
++  pPager->journalOpen = 1;
++  pPager->journalStarted = 0;
++  pPager->needSync = 0;
++  pPager->alwaysRollback = 0;
++  pPager->nRec = 0;
++  if( pPager->errMask!=0 ){
++    rc = pager_errcode(pPager);
++    return rc;
++  }
++  pPager->origDbSize = pPager->dbSize;
++  if( journal_format==JOURNAL_FORMAT_3 ){
++    rc = sqliteOsWrite(&pPager->jfd, aJournalMagic3, sizeof(aJournalMagic3));
++    if( rc==SQLITE_OK ){
++      rc = write32bits(&pPager->jfd, pPager->noSync ? 0xffffffff : 0);
++    }
++    if( rc==SQLITE_OK ){
++      sqliteRandomness(sizeof(pPager->cksumInit), &pPager->cksumInit);
++      rc = write32bits(&pPager->jfd, pPager->cksumInit);
++    }
++  }else if( journal_format==JOURNAL_FORMAT_2 ){
++    rc = sqliteOsWrite(&pPager->jfd, aJournalMagic2, sizeof(aJournalMagic2));
++  }else{
++    assert( journal_format==JOURNAL_FORMAT_1 );
++    rc = sqliteOsWrite(&pPager->jfd, aJournalMagic1, sizeof(aJournalMagic1));
++  }
++  if( rc==SQLITE_OK ){
++    rc = write32bits(&pPager->jfd, pPager->dbSize);
++  }
++  if( pPager->ckptAutoopen && rc==SQLITE_OK ){
++    rc = sqlitepager_ckpt_begin(pPager);
++  }
++  if( rc!=SQLITE_OK ){
++    rc = pager_unwritelock(pPager);
++    if( rc==SQLITE_OK ){
++      rc = SQLITE_FULL;
++    }
++  }
++  return rc;  
++}
++
++/*
++** Acquire a write-lock on the database.  The lock is removed when
++** the any of the following happen:
++**
++**   *  sqlitepager_commit() is called.
++**   *  sqlitepager_rollback() is called.
++**   *  sqlitepager_close() is called.
++**   *  sqlitepager_unref() is called to on every outstanding page.
++**
++** The parameter to this routine is a pointer to any open page of the
++** database file.  Nothing changes about the page - it is used merely
++** to acquire a pointer to the Pager structure and as proof that there
++** is already a read-lock on the database.
++**
++** A journal file is opened if this is not a temporary file.  For
++** temporary files, the opening of the journal file is deferred until
++** there is an actual need to write to the journal.
++**
++** If the database is already write-locked, this routine is a no-op.
++*/
++int sqlitepager_begin(void *pData){
++  PgHdr *pPg = DATA_TO_PGHDR(pData);
++  Pager *pPager = pPg->pPager;
++  int rc = SQLITE_OK;
++  assert( pPg->nRef>0 );
++  assert( pPager->state!=SQLITE_UNLOCK );
++  if( pPager->state==SQLITE_READLOCK ){
++    assert( pPager->aInJournal==0 );
++    rc = sqliteOsWriteLock(&pPager->fd);
++    if( rc!=SQLITE_OK ){
++      return rc;
++    }
++    pPager->state = SQLITE_WRITELOCK;
++    pPager->dirtyFile = 0;
++    TRACE1("TRANSACTION\n");
++    if( pPager->useJournal && !pPager->tempFile ){
++      rc = pager_open_journal(pPager);
++    }
++  }
++  return rc;
++}
++
++/*
++** Mark a data page as writeable.  The page is written into the journal 
++** if it is not there already.  This routine must be called before making
++** changes to a page.
++**
++** The first time this routine is called, the pager creates a new
++** journal and acquires a write lock on the database.  If the write
++** lock could not be acquired, this routine returns SQLITE_BUSY.  The
++** calling routine must check for that return value and be careful not to
++** change any page data until this routine returns SQLITE_OK.
++**
++** If the journal file could not be written because the disk is full,
++** then this routine returns SQLITE_FULL and does an immediate rollback.
++** All subsequent write attempts also return SQLITE_FULL until there
++** is a call to sqlitepager_commit() or sqlitepager_rollback() to
++** reset.
++*/
++int sqlitepager_write(void *pData){
++  PgHdr *pPg = DATA_TO_PGHDR(pData);
++  Pager *pPager = pPg->pPager;
++  int rc = SQLITE_OK;
++
++  /* Check for errors
++  */
++  if( pPager->errMask ){ 
++    return pager_errcode(pPager);
++  }
++  if( pPager->readOnly ){
++    return SQLITE_PERM;
++  }
++
++  /* Mark the page as dirty.  If the page has already been written
++  ** to the journal then we can return right away.
++  */
++  pPg->dirty = 1;
++  if( pPg->inJournal && (pPg->inCkpt || pPager->ckptInUse==0) ){
++    pPager->dirtyFile = 1;
++    return SQLITE_OK;
++  }
++
++  /* If we get this far, it means that the page needs to be
++  ** written to the transaction journal or the ckeckpoint journal
++  ** or both.
++  **
++  ** First check to see that the transaction journal exists and
++  ** create it if it does not.
++  */
++  assert( pPager->state!=SQLITE_UNLOCK );
++  rc = sqlitepager_begin(pData);
++  if( rc!=SQLITE_OK ){
++    return rc;
++  }
++  assert( pPager->state==SQLITE_WRITELOCK );
++  if( !pPager->journalOpen && pPager->useJournal ){
++    rc = pager_open_journal(pPager);
++    if( rc!=SQLITE_OK ) return rc;
++  }
++  assert( pPager->journalOpen || !pPager->useJournal );
++  pPager->dirtyFile = 1;
++
++  /* The transaction journal now exists and we have a write lock on the
++  ** main database file.  Write the current page to the transaction 
++  ** journal if it is not there already.
++  */
++  if( !pPg->inJournal && pPager->useJournal ){
++    if( (int)pPg->pgno <= pPager->origDbSize ){
++      int szPg;
++      u32 saved;
++      if( journal_format>=JOURNAL_FORMAT_3 ){
++        u32 cksum = pager_cksum(pPager, pPg->pgno, pData);
++        saved = *(u32*)PGHDR_TO_EXTRA(pPg);
++        store32bits(cksum, pPg, SQLITE_PAGE_SIZE);
++        szPg = SQLITE_PAGE_SIZE+8;
++      }else{
++        szPg = SQLITE_PAGE_SIZE+4;
++      }
++      store32bits(pPg->pgno, pPg, -4);
++      CODEC(pPager, pData, pPg->pgno, 7);
++      rc = sqliteOsWrite(&pPager->jfd, &((char*)pData)[-4], szPg);
++      TRACE3("JOURNAL %d %d\n", pPg->pgno, pPg->needSync);
++      CODEC(pPager, pData, pPg->pgno, 0);
++      if( journal_format>=JOURNAL_FORMAT_3 ){
++        *(u32*)PGHDR_TO_EXTRA(pPg) = saved;
++      }
++      if( rc!=SQLITE_OK ){
++        sqlitepager_rollback(pPager);
++        pPager->errMask |= PAGER_ERR_FULL;
++        return rc;
++      }
++      pPager->nRec++;
++      assert( pPager->aInJournal!=0 );
++      pPager->aInJournal[pPg->pgno/8] |= 1<<(pPg->pgno&7);
++      pPg->needSync = !pPager->noSync;
++      pPg->inJournal = 1;
++      if( pPager->ckptInUse ){
++        pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7);
++        page_add_to_ckpt_list(pPg);
++      }
++    }else{
++      pPg->needSync = !pPager->journalStarted && !pPager->noSync;
++      TRACE3("APPEND %d %d\n", pPg->pgno, pPg->needSync);
++    }
++    if( pPg->needSync ){
++      pPager->needSync = 1;
++    }
++  }
++
++  /* If the checkpoint journal is open and the page is not in it,
++  ** then write the current page to the checkpoint journal.  Note that
++  ** the checkpoint journal always uses the simplier format 2 that lacks
++  ** checksums.  The header is also omitted from the checkpoint journal.
++  */
++  if( pPager->ckptInUse && !pPg->inCkpt && (int)pPg->pgno<=pPager->ckptSize ){
++    assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize );
++    store32bits(pPg->pgno, pPg, -4);
++    CODEC(pPager, pData, pPg->pgno, 7);
++    rc = sqliteOsWrite(&pPager->cpfd, &((char*)pData)[-4], SQLITE_PAGE_SIZE+4);
++    TRACE2("CKPT-JOURNAL %d\n", pPg->pgno);
++    CODEC(pPager, pData, pPg->pgno, 0);
++    if( rc!=SQLITE_OK ){
++      sqlitepager_rollback(pPager);
++      pPager->errMask |= PAGER_ERR_FULL;
++      return rc;
++    }
++    pPager->ckptNRec++;
++    assert( pPager->aInCkpt!=0 );
++    pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7);
++    page_add_to_ckpt_list(pPg);
++  }
++
++  /* Update the database size and return.
++  */
++  if( pPager->dbSize<(int)pPg->pgno ){
++    pPager->dbSize = pPg->pgno;
++  }
++  return rc;
++}
++
++/*
++** Return TRUE if the page given in the argument was previously passed
++** to sqlitepager_write().  In other words, return TRUE if it is ok
++** to change the content of the page.
++*/
++int sqlitepager_iswriteable(void *pData){
++  PgHdr *pPg = DATA_TO_PGHDR(pData);
++  return pPg->dirty;
++}
++
++/*
++** Replace the content of a single page with the information in the third
++** argument.
++*/
++int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void *pData){
++  void *pPage;
++  int rc;
++
++  rc = sqlitepager_get(pPager, pgno, &pPage);
++  if( rc==SQLITE_OK ){
++    rc = sqlitepager_write(pPage);
++    if( rc==SQLITE_OK ){
++      memcpy(pPage, pData, SQLITE_PAGE_SIZE);
++    }
++    sqlitepager_unref(pPage);
++  }
++  return rc;
++}
++
++/*
++** A call to this routine tells the pager that it is not necessary to
++** write the information on page "pgno" back to the disk, even though
++** that page might be marked as dirty.
++**
++** The overlying software layer calls this routine when all of the data
++** on the given page is unused.  The pager marks the page as clean so
++** that it does not get written to disk.
++**
++** Tests show that this optimization, together with the
++** sqlitepager_dont_rollback() below, more than double the speed
++** of large INSERT operations and quadruple the speed of large DELETEs.
++**
++** When this routine is called, set the alwaysRollback flag to true.
++** Subsequent calls to sqlitepager_dont_rollback() for the same page
++** will thereafter be ignored.  This is necessary to avoid a problem
++** where a page with data is added to the freelist during one part of
++** a transaction then removed from the freelist during a later part
++** of the same transaction and reused for some other purpose.  When it
++** is first added to the freelist, this routine is called.  When reused,
++** the dont_rollback() routine is called.  But because the page contains
++** critical data, we still need to be sure it gets rolled back in spite
++** of the dont_rollback() call.
++*/
++void sqlitepager_dont_write(Pager *pPager, Pgno pgno){
++  PgHdr *pPg;
++
++  pPg = pager_lookup(pPager, pgno);
++  pPg->alwaysRollback = 1;
++  if( pPg && pPg->dirty && !pPager->ckptInUse ){
++    if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize<pPager->dbSize ){
++      /* If this pages is the last page in the file and the file has grown
++      ** during the current transaction, then do NOT mark the page as clean.
++      ** When the database file grows, we must make sure that the last page
++      ** gets written at least once so that the disk file will be the correct
++      ** size. If you do not write this page and the size of the file
++      ** on the disk ends up being too small, that can lead to database
++      ** corruption during the next transaction.
++      */
++    }else{
++      TRACE2("DONT_WRITE %d\n", pgno);
++      pPg->dirty = 0;
++    }
++  }
++}
++
++/*
++** A call to this routine tells the pager that if a rollback occurs,
++** it is not necessary to restore the data on the given page.  This
++** means that the pager does not have to record the given page in the
++** rollback journal.
++*/
++void sqlitepager_dont_rollback(void *pData){
++  PgHdr *pPg = DATA_TO_PGHDR(pData);
++  Pager *pPager = pPg->pPager;
++
++  if( pPager->state!=SQLITE_WRITELOCK || pPager->journalOpen==0 ) return;
++  if( pPg->alwaysRollback || pPager->alwaysRollback ) return;
++  if( !pPg->inJournal && (int)pPg->pgno <= pPager->origDbSize ){
++    assert( pPager->aInJournal!=0 );
++    pPager->aInJournal[pPg->pgno/8] |= 1<<(pPg->pgno&7);
++    pPg->inJournal = 1;
++    if( pPager->ckptInUse ){
++      pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7);
++      page_add_to_ckpt_list(pPg);
++    }
++    TRACE2("DONT_ROLLBACK %d\n", pPg->pgno);
++  }
++  if( pPager->ckptInUse && !pPg->inCkpt && (int)pPg->pgno<=pPager->ckptSize ){
++    assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize );
++    assert( pPager->aInCkpt!=0 );
++    pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7);
++    page_add_to_ckpt_list(pPg);
++  }
++}
++
++/*
++** Commit all changes to the database and release the write lock.
++**
++** If the commit fails for any reason, a rollback attempt is made
++** and an error code is returned.  If the commit worked, SQLITE_OK
++** is returned.
++*/
++int sqlitepager_commit(Pager *pPager){
++  int rc;
++  PgHdr *pPg;
++
++  if( pPager->errMask==PAGER_ERR_FULL ){
++    rc = sqlitepager_rollback(pPager);
++    if( rc==SQLITE_OK ){
++      rc = SQLITE_FULL;
++    }
++    return rc;
++  }
++  if( pPager->errMask!=0 ){
++    rc = pager_errcode(pPager);
++    return rc;
++  }
++  if( pPager->state!=SQLITE_WRITELOCK ){
++    return SQLITE_ERROR;
++  }
++  TRACE1("COMMIT\n");
++  if( pPager->dirtyFile==0 ){
++    /* Exit early (without doing the time-consuming sqliteOsSync() calls)
++    ** if there have been no changes to the database file. */
++    assert( pPager->needSync==0 );
++    rc = pager_unwritelock(pPager);
++    pPager->dbSize = -1;
++    return rc;
++  }
++  assert( pPager->journalOpen );
++  rc = syncJournal(pPager);
++  if( rc!=SQLITE_OK ){
++    goto commit_abort;
++  }
++  pPg = pager_get_all_dirty_pages(pPager);
++  if( pPg ){
++    rc = pager_write_pagelist(pPg);
++    if( rc || (!pPager->noSync && sqliteOsSync(&pPager->fd)!=SQLITE_OK) ){
++      goto commit_abort;
++    }
++  }
++  rc = pager_unwritelock(pPager);
++  pPager->dbSize = -1;
++  return rc;
++
++  /* Jump here if anything goes wrong during the commit process.
++  */
++commit_abort:
++  rc = sqlitepager_rollback(pPager);
++  if( rc==SQLITE_OK ){
++    rc = SQLITE_FULL;
++  }
++  return rc;
++}
++
++/*
++** Rollback all changes.  The database falls back to read-only mode.
++** All in-memory cache pages revert to their original data contents.
++** The journal is deleted.
++**
++** This routine cannot fail unless some other process is not following
++** the correct locking protocol (SQLITE_PROTOCOL) or unless some other
++** process is writing trash into the journal file (SQLITE_CORRUPT) or
++** unless a prior malloc() failed (SQLITE_NOMEM).  Appropriate error
++** codes are returned for all these occasions.  Otherwise,
++** SQLITE_OK is returned.
++*/
++int sqlitepager_rollback(Pager *pPager){
++  int rc;
++  TRACE1("ROLLBACK\n");
++  if( !pPager->dirtyFile || !pPager->journalOpen ){
++    rc = pager_unwritelock(pPager);
++    pPager->dbSize = -1;
++    return rc;
++  }
++
++  if( pPager->errMask!=0 && pPager->errMask!=PAGER_ERR_FULL ){
++    if( pPager->state>=SQLITE_WRITELOCK ){
++      pager_playback(pPager, 1);
++    }
++    return pager_errcode(pPager);
++  }
++  if( pPager->state!=SQLITE_WRITELOCK ){
++    return SQLITE_OK;
++  }
++  rc = pager_playback(pPager, 1);
++  if( rc!=SQLITE_OK ){
++    rc = SQLITE_CORRUPT;
++    pPager->errMask |= PAGER_ERR_CORRUPT;
++  }
++  pPager->dbSize = -1;
++  return rc;
++}
++
++/*
++** Return TRUE if the database file is opened read-only.  Return FALSE
++** if the database is (in theory) writable.
++*/
++int sqlitepager_isreadonly(Pager *pPager){
++  return pPager->readOnly;
++}
++
++/*
++** This routine is used for testing and analysis only.
++*/
++int *sqlitepager_stats(Pager *pPager){
++  static int a[9];
++  a[0] = pPager->nRef;
++  a[1] = pPager->nPage;
++  a[2] = pPager->mxPage;
++  a[3] = pPager->dbSize;
++  a[4] = pPager->state;
++  a[5] = pPager->errMask;
++  a[6] = pPager->nHit;
++  a[7] = pPager->nMiss;
++  a[8] = pPager->nOvfl;
++  return a;
++}
++
++/*
++** Set the checkpoint.
++**
++** This routine should be called with the transaction journal already
++** open.  A new checkpoint journal is created that can be used to rollback
++** changes of a single SQL command within a larger transaction.
++*/
++int sqlitepager_ckpt_begin(Pager *pPager){
++  int rc;
++  char zTemp[SQLITE_TEMPNAME_SIZE];
++  if( !pPager->journalOpen ){
++    pPager->ckptAutoopen = 1;
++    return SQLITE_OK;
++  }
++  assert( pPager->journalOpen );
++  assert( !pPager->ckptInUse );
++  pPager->aInCkpt = sqliteMalloc( pPager->dbSize/8 + 1 );
++  if( pPager->aInCkpt==0 ){
++    sqliteOsReadLock(&pPager->fd);
++    return SQLITE_NOMEM;
++  }
++#ifndef NDEBUG
++  rc = sqliteOsFileSize(&pPager->jfd, &pPager->ckptJSize);
++  if( rc ) goto ckpt_begin_failed;
++  assert( pPager->ckptJSize == 
++    pPager->nRec*JOURNAL_PG_SZ(journal_format)+JOURNAL_HDR_SZ(journal_format) );
++#endif
++  pPager->ckptJSize = pPager->nRec*JOURNAL_PG_SZ(journal_format)
++                         + JOURNAL_HDR_SZ(journal_format);
++  pPager->ckptSize = pPager->dbSize;
++  if( !pPager->ckptOpen ){
++    rc = sqlitepager_opentemp(zTemp, &pPager->cpfd);
++    if( rc ) goto ckpt_begin_failed;
++    pPager->ckptOpen = 1;
++    pPager->ckptNRec = 0;
++  }
++  pPager->ckptInUse = 1;
++  return SQLITE_OK;
++ 
++ckpt_begin_failed:
++  if( pPager->aInCkpt ){
++    sqliteFree(pPager->aInCkpt);
++    pPager->aInCkpt = 0;
++  }
++  return rc;
++}
++
++/*
++** Commit a checkpoint.
++*/
++int sqlitepager_ckpt_commit(Pager *pPager){
++  if( pPager->ckptInUse ){
++    PgHdr *pPg, *pNext;
++    sqliteOsSeek(&pPager->cpfd, 0);
++    /* sqliteOsTruncate(&pPager->cpfd, 0); */
++    pPager->ckptNRec = 0;
++    pPager->ckptInUse = 0;
++    sqliteFree( pPager->aInCkpt );
++    pPager->aInCkpt = 0;
++    for(pPg=pPager->pCkpt; pPg; pPg=pNext){
++      pNext = pPg->pNextCkpt;
++      assert( pPg->inCkpt );
++      pPg->inCkpt = 0;
++      pPg->pPrevCkpt = pPg->pNextCkpt = 0;
++    }
++    pPager->pCkpt = 0;
++  }
++  pPager->ckptAutoopen = 0;
++  return SQLITE_OK;
++}
++
++/*
++** Rollback a checkpoint.
++*/
++int sqlitepager_ckpt_rollback(Pager *pPager){
++  int rc;
++  if( pPager->ckptInUse ){
++    rc = pager_ckpt_playback(pPager);
++    sqlitepager_ckpt_commit(pPager);
++  }else{
++    rc = SQLITE_OK;
++  }
++  pPager->ckptAutoopen = 0;
++  return rc;
++}
++
++/*
++** Return the full pathname of the database file.
++*/
++const char *sqlitepager_filename(Pager *pPager){
++  return pPager->zFilename;
++}
++
++/*
++** Set the codec for this pager
++*/
++void sqlitepager_set_codec(
++  Pager *pPager,
++  void (*xCodec)(void*,void*,Pgno,int),
++  void *pCodecArg
++){
++  pPager->xCodec = xCodec;
++  pPager->pCodecArg = pCodecArg;
++}
++
++#ifdef SQLITE_TEST
++/*
++** Print a listing of all referenced pages and their ref count.
++*/
++void sqlitepager_refdump(Pager *pPager){
++  PgHdr *pPg;
++  for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){
++    if( pPg->nRef<=0 ) continue;
++    printf("PAGE %3d addr=0x%08x nRef=%d\n", 
++       pPg->pgno, (int)PGHDR_TO_DATA(pPg), pPg->nRef);
++  }
++}
++#endif
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/pager.h
+@@ -0,0 +1,107 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This header file defines the interface that the sqlite page cache
++** subsystem.  The page cache subsystem reads and writes a file a page
++** at a time and provides a journal for rollback.
++**
++** @(#) $Id$
++*/
++
++/*
++** The size of one page
++**
++** You can change this value to another (reasonable) value you want.
++** It need not be a power of two, though the interface to the disk
++** will likely be faster if it is.
++**
++** Experiments show that a page size of 1024 gives the best speed
++** for common usages.  The speed differences for different sizes
++** such as 512, 2048, 4096, an so forth, is minimal.  Note, however,
++** that changing the page size results in a completely imcompatible
++** file format.
++*/
++#ifndef SQLITE_PAGE_SIZE
++#define SQLITE_PAGE_SIZE 1024
++#endif
++
++/*
++** Number of extra bytes of data allocated at the end of each page and
++** stored on disk but not used by the higher level btree layer.  Changing
++** this value results in a completely incompatible file format.
++*/
++#ifndef SQLITE_PAGE_RESERVE
++#define SQLITE_PAGE_RESERVE 0
++#endif
++
++/*
++** The total number of usable bytes stored on disk for each page.
++** The usable bytes come at the beginning of the page and the reserve
++** bytes come at the end.
++*/
++#define SQLITE_USABLE_SIZE (SQLITE_PAGE_SIZE-SQLITE_PAGE_RESERVE)
++
++/*
++** Maximum number of pages in one database.  (This is a limitation of
++** imposed by 4GB files size limits.)
++*/
++#define SQLITE_MAX_PAGE 1073741823
++
++/*
++** The type used to represent a page number.  The first page in a file
++** is called page 1.  0 is used to represent "not a page".
++*/
++typedef unsigned int Pgno;
++
++/*
++** Each open file is managed by a separate instance of the "Pager" structure.
++*/
++typedef struct Pager Pager;
++
++/*
++** See source code comments for a detailed description of the following
++** routines:
++*/
++int sqlitepager_open(Pager **ppPager, const char *zFilename,
++                     int nPage, int nExtra, int useJournal);
++void sqlitepager_set_destructor(Pager*, void(*)(void*));
++void sqlitepager_set_cachesize(Pager*, int);
++int sqlitepager_close(Pager *pPager);
++int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage);
++void *sqlitepager_lookup(Pager *pPager, Pgno pgno);
++int sqlitepager_ref(void*);
++int sqlitepager_unref(void*);
++Pgno sqlitepager_pagenumber(void*);
++int sqlitepager_write(void*);
++int sqlitepager_iswriteable(void*);
++int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void*);
++int sqlitepager_pagecount(Pager*);
++int sqlitepager_truncate(Pager*,Pgno);
++int sqlitepager_begin(void*);
++int sqlitepager_commit(Pager*);
++int sqlitepager_rollback(Pager*);
++int sqlitepager_isreadonly(Pager*);
++int sqlitepager_ckpt_begin(Pager*);
++int sqlitepager_ckpt_commit(Pager*);
++int sqlitepager_ckpt_rollback(Pager*);
++void sqlitepager_dont_rollback(void*);
++void sqlitepager_dont_write(Pager*, Pgno);
++int *sqlitepager_stats(Pager*);
++void sqlitepager_set_safety_level(Pager*,int);
++const char *sqlitepager_filename(Pager*);
++int sqlitepager_rename(Pager*, const char *zNewName);
++void sqlitepager_set_codec(Pager*,void(*)(void*,void*,Pgno,int),void*);
++
++#ifdef SQLITE_TEST
++void sqlitepager_refdump(Pager*);
++int pager_refinfo_enable;
++int journal_format;
++#endif
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/parse.c
+@@ -0,0 +1,3355 @@
++/* Driver template for the LEMON parser generator.
++** The author disclaims copyright to this source code.
++*/
++/* First off, code is included that follows the "include" declaration
++** in the input grammar file. */
++#include <stdio.h>
++#line 33 "ext/sqlite/libsqlite/src/parse.y"
++
++#include "sqliteInt.h"
++#include "parse.h"
++
++/*
++** An instance of this structure holds information about the
++** LIMIT clause of a SELECT statement.
++*/
++struct LimitVal {
++  int limit;    /* The LIMIT value.  -1 if there is no limit */
++  int offset;   /* The OFFSET.  0 if there is none */
++};
++
++/*
++** An instance of the following structure describes the event of a
++** TRIGGER.  "a" is the event type, one of TK_UPDATE, TK_INSERT,
++** TK_DELETE, or TK_INSTEAD.  If the event is of the form
++**
++**      UPDATE ON (a,b,c)
++**
++** Then the "b" IdList records the list "a,b,c".
++*/
++struct TrigEvent { int a; IdList * b; };
++
++#line 33 "ext/sqlite/libsqlite/src/parse.c"
++/* Next is all token values, in a form suitable for use by makeheaders.
++** This section will be null unless lemon is run with the -m switch.
++*/
++/* 
++** These constants (all generated automatically by the parser generator)
++** specify the various kinds of tokens (terminals) that the parser
++** understands. 
++**
++** Each symbol here is a terminal symbol in the grammar.
++*/
++/* Make sure the INTERFACE macro is defined.
++*/
++#ifndef INTERFACE
++# define INTERFACE 1
++#endif
++/* The next thing included is series of defines which control
++** various aspects of the generated parser.
++**    YYCODETYPE         is the data type used for storing terminal
++**                       and nonterminal numbers.  "unsigned char" is
++**                       used if there are fewer than 250 terminals
++**                       and nonterminals.  "int" is used otherwise.
++**    YYNOCODE           is a number of type YYCODETYPE which corresponds
++**                       to no legal terminal or nonterminal number.  This
++**                       number is used to fill in empty slots of the hash 
++**                       table.
++**    YYFALLBACK         If defined, this indicates that one or more tokens
++**                       have fall-back values which should be used if the
++**                       original value of the token will not parse.
++**    YYACTIONTYPE       is the data type used for storing terminal
++**                       and nonterminal numbers.  "unsigned char" is
++**                       used if there are fewer than 250 rules and
++**                       states combined.  "int" is used otherwise.
++**    sqliteParserTOKENTYPE     is the data type used for minor tokens given 
++**                       directly to the parser from the tokenizer.
++**    YYMINORTYPE        is the data type used for all minor tokens.
++**                       This is typically a union of many types, one of
++**                       which is sqliteParserTOKENTYPE.  The entry in the union
++**                       for base tokens is called "yy0".
++**    YYSTACKDEPTH       is the maximum depth of the parser's stack.  If
++**                       zero the stack is dynamically sized using realloc()
++**    sqliteParserARG_SDECL     A static variable declaration for the %extra_argument
++**    sqliteParserARG_PDECL     A parameter declaration for the %extra_argument
++**    sqliteParserARG_STORE     Code to store %extra_argument into yypParser
++**    sqliteParserARG_FETCH     Code to extract %extra_argument from yypParser
++**    YYNSTATE           the combined number of states.
++**    YYNRULE            the number of rules in the grammar
++**    YYERRORSYMBOL      is the code number of the error symbol.  If not
++**                       defined, then do no error processing.
++*/
++#define YYCODETYPE unsigned char
++#define YYNOCODE 221
++#define YYACTIONTYPE unsigned short int
++#define sqliteParserTOKENTYPE Token
++typedef union {
++  int yyinit;
++  sqliteParserTOKENTYPE yy0;
++  TriggerStep * yy19;
++  struct LimitVal yy124;
++  Select* yy179;
++  Expr * yy182;
++  Expr* yy242;
++  struct TrigEvent yy290;
++  SrcList* yy307;
++  IdList* yy320;
++  ExprList* yy322;
++  int yy372;
++  struct {int value; int mask;} yy407;
++} YYMINORTYPE;
++#ifndef YYSTACKDEPTH
++#define YYSTACKDEPTH 100
++#endif
++#define sqliteParserARG_SDECL Parse *pParse;
++#define sqliteParserARG_PDECL ,Parse *pParse
++#define sqliteParserARG_FETCH Parse *pParse = yypParser->pParse
++#define sqliteParserARG_STORE yypParser->pParse = pParse
++#define YYNSTATE 563
++#define YYNRULE 293
++#define YYFALLBACK 1
++#define YY_NO_ACTION      (YYNSTATE+YYNRULE+2)
++#define YY_ACCEPT_ACTION  (YYNSTATE+YYNRULE+1)
++#define YY_ERROR_ACTION   (YYNSTATE+YYNRULE)
++
++/* The yyzerominor constant is used to initialize instances of
++** YYMINORTYPE objects to zero. */
++static const YYMINORTYPE yyzerominor = { 0 };
++
++/* Define the yytestcase() macro to be a no-op if is not already defined
++** otherwise.
++**
++** Applications can choose to define yytestcase() in the %include section
++** to a macro that can assist in verifying code coverage.  For production
++** code the yytestcase() macro should be turned off.  But it is useful
++** for testing.
++*/
++#ifndef yytestcase
++# define yytestcase(X)
++#endif
++
++
++/* Next are the tables used to determine what action to take based on the
++** current state and lookahead token.  These tables are used to implement
++** functions that take a state number and lookahead value and return an
++** action integer.  
++**
++** Suppose the action integer is N.  Then the action is determined as
++** follows
++**
++**   0 <= N < YYNSTATE                  Shift N.  That is, push the lookahead
++**                                      token onto the stack and goto state N.
++**
++**   YYNSTATE <= N < YYNSTATE+YYNRULE   Reduce by rule N-YYNSTATE.
++**
++**   N == YYNSTATE+YYNRULE              A syntax error has occurred.
++**
++**   N == YYNSTATE+YYNRULE+1            The parser accepts its input.
++**
++**   N == YYNSTATE+YYNRULE+2            No such action.  Denotes unused
++**                                      slots in the yy_action[] table.
++**
++** The action table is constructed as a single large table named yy_action[].
++** Given state S and lookahead X, the action is computed as
++**
++**      yy_action[ yy_shift_ofst[S] + X ]
++**
++** If the index value yy_shift_ofst[S]+X is out of range or if the value
++** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X or if yy_shift_ofst[S]
++** is equal to YY_SHIFT_USE_DFLT, it means that the action is not in the table
++** and that yy_default[S] should be used instead.  
++**
++** The formula above is for computing the action when the lookahead is
++** a terminal symbol.  If the lookahead is a non-terminal (as occurs after
++** a reduce action) then the yy_reduce_ofst[] array is used in place of
++** the yy_shift_ofst[] array and YY_REDUCE_USE_DFLT is used in place of
++** YY_SHIFT_USE_DFLT.
++**
++** The following are the tables generated in this section:
++**
++**  yy_action[]        A single table containing all actions.
++**  yy_lookahead[]     A table containing the lookahead for each entry in
++**                     yy_action.  Used to detect hash collisions.
++**  yy_shift_ofst[]    For each state, the offset into yy_action for
++**                     shifting terminals.
++**  yy_reduce_ofst[]   For each state, the offset into yy_action for
++**                     shifting non-terminals after a reduce.
++**  yy_default[]       Default action for each state.
++*/
++#define YY_ACTTAB_COUNT (1090)
++static const YYACTIONTYPE yy_action[] = {
++ /*     0 */   186,  561,  483,   69,   67,   70,   68,   64,   63,   62,
++ /*    10 */    61,   58,   57,   56,   55,   54,   53,  181,  180,  179,
++ /*    20 */   514,  421,  334,  420,  468,  515,   64,   63,   62,   61,
++ /*    30 */    58,   57,   56,   55,   54,   53,    9,  423,  422,   71,
++ /*    40 */    72,  129,   65,   66,  513,  510,  305,   52,  138,   69,
++ /*    50 */    67,   70,   68,   64,   63,   62,   61,   58,   57,   56,
++ /*    60 */    55,   54,   53,  448,  469,  175,  482,  514,  470,  344,
++ /*    70 */   342,   36,  515,   58,   57,   56,   55,   54,   53,    8,
++ /*    80 */   341,  281,  285,  307,  437,  178,   71,   72,  129,   65,
++ /*    90 */    66,  513,  510,  305,   52,  138,   69,   67,   70,   68,
++ /*   100 */    64,   63,   62,   61,   58,   57,   56,   55,   54,   53,
++ /*   110 */   130,  362,  360,  508,  507,  267,  551,  436,  298,  297,
++ /*   120 */   369,  368,   50,  128,  543,   29,  266,  449,  537,  447,
++ /*   130 */   591,  528,  442,  441,  187,  132,  514,  536,   47,   48,
++ /*   140 */   472,  515,  122,  427,  331,  409,   49,  371,  370,  518,
++ /*   150 */   328,  363,  517,  520,   45,   71,   72,  129,   65,   66,
++ /*   160 */   513,  510,  305,   52,  138,   69,   67,   70,   68,   64,
++ /*   170 */    63,   62,   61,   58,   57,   56,   55,   54,   53,  185,
++ /*   180 */   550,  549,  512,  175,  467,  516,   18,  344,  342,   36,
++ /*   190 */   544,  175,  320,  230,  231,  344,  342,   36,  341,   56,
++ /*   200 */    55,   54,   53,  212,  531,  514,  341,  551,    3,  213,
++ /*   210 */   515,    2,  551,   73,    7,  551,  184,  132,  551,  172,
++ /*   220 */   551,  309,  348,   42,   71,   72,  129,   65,   66,  513,
++ /*   230 */   510,  305,   52,  138,   69,   67,   70,   68,   64,   63,
++ /*   240 */    62,   61,   58,   57,   56,   55,   54,   53,  243,  197,
++ /*   250 */   282,  358,  268,  373,  264,  372,  183,  241,  436,  169,
++ /*   260 */   356,  171,  269,  240,  471,  426,   29,  446,  506,  514,
++ /*   270 */   445,  550,  549,  494,  515,  354,  550,  549,  359,  550,
++ /*   280 */   549,  144,  550,  549,  550,  549,  592,  309,   71,   72,
++ /*   290 */   129,   65,   66,  513,  510,  305,   52,  138,   69,   67,
++ /*   300 */    70,   68,   64,   63,   62,   61,   58,   57,   56,   55,
++ /*   310 */    54,   53,  514,  857,   82,  377,    1,  515,  268,  373,
++ /*   320 */   264,  372,  183,  241,  362,   12,  508,  507,  500,  240,
++ /*   330 */    17,   71,   72,  129,   65,   66,  513,  510,  305,   52,
++ /*   340 */   138,   69,   67,   70,   68,   64,   63,   62,   61,   58,
++ /*   350 */    57,   56,   55,   54,   53,  362,  182,  508,  507,  514,
++ /*   360 */   362,  527,  508,  507,  515,  563,  429,  463,  182,  444,
++ /*   370 */   375,  338,  443,  430,  379,  378,  593,  156,   71,   72,
++ /*   380 */   129,   65,   66,  513,  510,  305,   52,  138,   69,   67,
++ /*   390 */    70,   68,   64,   63,   62,   61,   58,   57,   56,   55,
++ /*   400 */    54,   53,  514,  526,  542,  450,  534,  515,  286,  493,
++ /*   410 */   453,   17,  478,  240,   80,   11,  533,  153,  194,  155,
++ /*   420 */   286,   71,   51,  129,   65,   66,  513,  510,  305,   52,
++ /*   430 */   138,   69,   67,   70,   68,   64,   63,   62,   61,   58,
++ /*   440 */    57,   56,   55,   54,   53,  514,  195,  466,  160,   17,
++ /*   450 */   515,  454,  490,   80,  459,  440,  460,  176,  239,  238,
++ /*   460 */    80,   80,  562,    1,   71,   40,  129,   65,   66,  513,
++ /*   470 */   510,  305,   52,  138,   69,   67,   70,   68,   64,   63,
++ /*   480 */    62,   61,   58,   57,   56,   55,   54,   53,  514,  365,
++ /*   490 */   154,   19,  339,  515,   80,  232,  405,   80,  165,  404,
++ /*   500 */   193,   32,  396,   13,   32,   86,  414,  108,   72,  129,
++ /*   510 */    65,   66,  513,  510,  305,   52,  138,   69,   67,   70,
++ /*   520 */    68,   64,   63,   62,   61,   58,   57,   56,   55,   54,
++ /*   530 */    53,  514,  551,  365,  483,  192,  515,  488,  323,  207,
++ /*   540 */   366,  249,  177,  186,   87,  483,  483,   46,   38,   44,
++ /*   550 */   458,  108,  129,   65,   66,  513,  510,  305,   52,  138,
++ /*   560 */    69,   67,   70,   68,   64,   63,   62,   61,   58,   57,
++ /*   570 */    56,   55,   54,   53,  274,  457,  272,  271,  270,   23,
++ /*   580 */     8,  551,  211,  412,  307,  257,  365,  385,  201,   31,
++ /*   590 */   217,  388,  141,  205,  387,  219,  550,  549,  482,  511,
++ /*   600 */   215,  376,  560,  134,   90,  477,  214,  514,  392,  482,
++ /*   610 */   482,  152,  515,  360,  203,  212,  409,  531,  800,  284,
++ /*   620 */   365,  145,  505,   50,  300,  365,  365,  173,  321,  212,
++ /*   630 */   487,  137,  135,    8,   41,  136,  531,  307,   93,   47,
++ /*   640 */    48,  346,  316,  106,  106,  550,  549,   49,  371,  370,
++ /*   650 */   518,  509,  531,  517,  520,  504,  531,  531,  162,  495,
++ /*   660 */   170,  317,  503,  319,  223,  231,  360,  551,  502,  283,
++ /*   670 */   162,  207,  557,  486,  212,  191,   50,   10,  289,  304,
++ /*   680 */   303,  556,  207,  531,    8,  531,  516,   18,  307,  498,
++ /*   690 */   498,  189,   47,   48,  393,  531,  555,   28,  302,  554,
++ /*   700 */    49,  371,  370,  518,  484,  480,  517,  520,  322,  299,
++ /*   710 */   553,  418,  365,  323,   17,  365,  365,  360,  416,  207,
++ /*   720 */   322,  417,  207,  418,  327,  212,  480,   50,  207,  326,
++ /*   730 */   106,  550,  549,  106,  105,  247,  407,  475,  332,  516,
++ /*   740 */    18,  326,  365,   47,   48,  207,  295,  365,  475,  294,
++ /*   750 */   158,   49,  371,  370,  518,  293,  473,  517,  520,  485,
++ /*   760 */   106,  391,  390,  202,  148,   93,  351,  480,  204,  301,
++ /*   770 */   333,  190,  291,  541,   60,  531,  498,  252,  453,  498,
++ /*   780 */   365,  365,  290,  365,  501,  475,  365,   79,  475,  531,
++ /*   790 */   516,   18,  379,  378,  475,  365,  465,  245,   89,  112,
++ /*   800 */   365,  109,  365,  131,  121,  288,  499,  365,  365,  439,
++ /*   810 */   365,  475,  365,  120,  365,  365,  343,  365,  119,  365,
++ /*   820 */   118,  365,  365,  365,  365,  117,  116,  365,  126,  365,
++ /*   830 */   125,  365,  124,  123,  365,  115,  365,  114,  431,  140,
++ /*   840 */   139,  255,  254,  365,  365,  253,  365,  280,  365,  107,
++ /*   850 */   365,  365,  113,  365,  111,   26,  365,  365,  365,  365,
++ /*   860 */   365,  279,  278,  365,  277,  365,   92,  365,  104,  103,
++ /*   870 */   365,   91,  365,  365,  102,  101,  110,  100,   99,  347,
++ /*   880 */    25,   98,  340,   30,   24,   97,  266,  174,   96,   85,
++ /*   890 */    95,   94,  166,  292,   78,  165,  415,   14,  163,   60,
++ /*   900 */   164,   22,    6,  408,    5,   77,   34,   33,  159,   16,
++ /*   910 */   157,  151,   75,  149,   15,  146,  313,  312,  395,  384,
++ /*   920 */   143,   20,   60,  206,   21,  273,  198,  559,  375,  548,
++ /*   930 */   547,  546,  374,    4,  540,  539,  538,  308,  535,  532,
++ /*   940 */   530,  212,  261,   38,  260,  352,  259,   39,  258,  367,
++ /*   950 */   529,  196,  210,  256,  521,  522,   53,   53,  209,   43,
++ /*   960 */   496,  188,  492,  208,  256,   81,  246,   37,  479,  349,
++ /*   970 */   244,   37,  474,  464,  276,   27,  452,  451,  433,  432,
++ /*   980 */   275,  235,  234,  335,  424,   35,  329,  413,  410,  127,
++ /*   990 */   161,   84,   76,  403,   38,  400,  188,  399,  224,  398,
++ /*  1000 */    38,  150,  318,  220,   83,  147,  315,  200,  381,  383,
++ /*  1010 */   199,  142,  545,  265,   88,  262,  523,  361,  491,  476,
++ /*  1020 */   463,  406,  397,  287,  389,  386,  310,  382,  552,   74,
++ /*  1030 */   306,  525,  524,  364,  519,  357,  355,  353,  497,  489,
++ /*  1040 */   481,  263,  242,  462,  461,  456,  455,  438,  296,  345,
++ /*  1050 */   434,  237,  425,  337,  168,  167,  336,  236,  419,  330,
++ /*  1060 */   233,  325,  324,  229,  228,  402,  401,  227,  226,  225,
++ /*  1070 */   222,  221,  218,  314,  394,  311,  216,  380,  251,  250,
++ /*  1080 */   133,  350,  248,  364,  558,   59,  435,  411,  428,  212,
++};
++static const YYCODETYPE yy_lookahead[] = {
++ /*     0 */    21,    9,   23,   70,   71,   72,   73,   74,   75,   76,
++ /*    10 */    77,   78,   79,   80,   81,   82,   83,  100,  101,  102,
++ /*    20 */    41,  100,  101,  102,   20,   46,   74,   75,   76,   77,
++ /*    30 */    78,   79,   80,   81,   82,   83,   19,   55,   56,   60,
++ /*    40 */    61,   62,   63,   64,   65,   66,   67,   68,   69,   70,
++ /*    50 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
++ /*    60 */    81,   82,   83,   23,  108,   90,   87,   41,  112,   94,
++ /*    70 */    95,   96,   46,   78,   79,   80,   81,   82,   83,   19,
++ /*    80 */   105,  149,  143,   23,  152,  153,   60,   61,   62,   63,
++ /*    90 */    64,   65,   66,   67,   68,   69,   70,   71,   72,   73,
++ /*   100 */    74,   75,   76,   77,   78,   79,   80,   81,   82,   83,
++ /*   110 */    31,  107,   52,  109,  110,   93,   23,  140,   78,   79,
++ /*   120 */    78,   79,   62,   22,  147,  148,  104,   87,   34,   89,
++ /*   130 */   113,   89,   92,   93,  183,  184,   41,   43,   78,   79,
++ /*   140 */    80,   46,  165,  166,  205,   53,   86,   87,   88,   89,
++ /*   150 */   211,   62,   92,   93,  128,   60,   61,   62,   63,   64,
++ /*   160 */    65,   66,   67,   68,   69,   70,   71,   72,   73,   74,
++ /*   170 */    75,   76,   77,   78,   79,   80,   81,   82,   83,  146,
++ /*   180 */    87,   88,   93,   90,   20,  125,  126,   94,   95,   96,
++ /*   190 */    20,   90,  100,  101,  102,   94,   95,   96,  105,   80,
++ /*   200 */    81,   82,   83,  111,  171,   41,  105,   23,   19,   48,
++ /*   210 */    46,   19,   23,   19,   19,   23,  183,  184,   23,   17,
++ /*   220 */    23,   62,  189,  128,   60,   61,   62,   63,   64,   65,
++ /*   230 */    66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
++ /*   240 */    76,   77,   78,   79,   80,   81,   82,   83,   20,   90,
++ /*   250 */    91,   15,   93,   94,   95,   96,   97,   98,  140,   57,
++ /*   260 */    24,   59,  144,  104,   80,  147,  148,   89,   20,   41,
++ /*   270 */    92,   87,   88,   20,   46,   39,   87,   88,   42,   87,
++ /*   280 */    88,   19,   87,   88,   87,   88,  113,   62,   60,   61,
++ /*   290 */    62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
++ /*   300 */    72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
++ /*   310 */    82,   83,   41,  132,  133,  134,  135,   46,   93,   94,
++ /*   320 */    95,   96,   97,   98,  107,   63,  109,  110,   20,  104,
++ /*   330 */    22,   60,   61,   62,   63,   64,   65,   66,   67,   68,
++ /*   340 */    69,   70,   71,   72,   73,   74,   75,   76,   77,   78,
++ /*   350 */    79,   80,   81,   82,   83,  107,   47,  109,  110,   41,
++ /*   360 */   107,   89,  109,  110,   46,    0,  161,  162,   47,   89,
++ /*   370 */    99,   62,   92,  168,    9,   10,  113,   17,   60,   61,
++ /*   380 */    62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
++ /*   390 */    72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
++ /*   400 */    82,   83,   41,   89,  155,  156,   26,   46,   99,   20,
++ /*   410 */   161,   22,   20,  104,   22,  118,   36,   57,   22,   59,
++ /*   420 */    99,   60,   61,   62,   63,   64,   65,   66,   67,   68,
++ /*   430 */    69,   70,   71,   72,   73,   74,   75,   76,   77,   78,
++ /*   440 */    79,   80,   81,   82,   83,   41,   50,   20,   22,   22,
++ /*   450 */    46,   20,   22,   22,   91,   20,   93,   22,   20,   20,
++ /*   460 */    22,   22,  134,  135,   60,   61,   62,   63,   64,   65,
++ /*   470 */    66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
++ /*   480 */    76,   77,   78,   79,   80,   81,   82,   83,   41,  140,
++ /*   490 */   130,   22,   20,   46,   22,   20,   20,   22,   22,   20,
++ /*   500 */   113,   22,   20,   19,   22,   21,   18,  158,   61,   62,
++ /*   510 */    63,   64,   65,   66,   67,   68,   69,   70,   71,   72,
++ /*   520 */    73,   74,   75,   76,   77,   78,   79,   80,   81,   82,
++ /*   530 */    83,   41,   23,  140,   23,  113,   46,   22,  140,  140,
++ /*   540 */   191,  192,   19,   21,  114,   23,   23,  127,  122,  129,
++ /*   550 */    29,  158,   62,   63,   64,   65,   66,   67,   68,   69,
++ /*   560 */    70,   71,   72,   73,   74,   75,   76,   77,   78,   79,
++ /*   570 */    80,   81,   82,   83,   11,   54,   13,   14,   15,   16,
++ /*   580 */    19,   23,  174,   95,   23,  192,  140,   78,   79,  181,
++ /*   590 */    27,   89,  146,  195,   92,   32,   87,   88,   87,   93,
++ /*   600 */    37,  136,  137,   88,  158,  206,  141,   41,   99,   87,
++ /*   610 */    87,  146,   46,   52,   51,  111,   53,  171,  130,   19,
++ /*   620 */   140,   58,   14,   62,  103,  140,  140,  146,  124,  111,
++ /*   630 */   115,  146,  146,   19,   68,   69,  171,   23,  158,   78,
++ /*   640 */    79,   80,  124,  158,  158,   87,   88,   86,   87,   88,
++ /*   650 */    89,  108,  171,   92,   93,   20,  171,  171,  146,   93,
++ /*   660 */   146,  196,   20,  100,  101,  102,   52,   23,   20,  106,
++ /*   670 */   146,  140,   15,  115,  111,   22,   62,  118,  198,  194,
++ /*   680 */   194,   24,  140,  171,   19,  171,  125,  126,   23,  204,
++ /*   690 */   204,   22,   78,   79,  140,  171,   39,   19,  167,   42,
++ /*   700 */    86,   87,   88,   89,  115,  152,   92,   93,  196,  167,
++ /*   710 */    53,  140,  140,  140,   22,  140,  140,   52,   25,  140,
++ /*   720 */   196,   28,  140,  140,  212,  111,  152,   62,  140,  217,
++ /*   730 */   158,   87,   88,  158,  158,  182,  212,  206,   45,  125,
++ /*   740 */   126,  217,  140,   78,   79,  140,  167,  140,  206,  167,
++ /*   750 */   146,   86,   87,   88,   89,  167,  182,   92,   93,  115,
++ /*   760 */   158,  207,  208,  209,  146,  158,  194,  152,  195,  194,
++ /*   770 */   199,   22,  167,  156,  200,  171,  204,  201,  161,  204,
++ /*   780 */   140,  140,  199,  140,   20,  206,  140,   20,  206,  171,
++ /*   790 */   125,  126,    9,   10,  206,  140,   20,  182,  158,  158,
++ /*   800 */   140,  158,  140,  113,  158,  198,  204,  140,  140,   20,
++ /*   810 */   140,  206,  140,  158,  140,  140,   48,  140,  158,  140,
++ /*   820 */   158,  140,  140,  140,  140,  158,  158,  140,  158,  140,
++ /*   830 */   158,  140,  158,  158,  140,  158,  140,  158,  139,  158,
++ /*   840 */   158,  158,  158,  140,  140,  158,  140,  158,  140,  158,
++ /*   850 */   140,  140,  158,  140,  158,   19,  140,  140,  140,  140,
++ /*   860 */   140,  158,  158,  140,  158,  140,  158,  140,  158,  158,
++ /*   870 */   140,  158,  140,  140,  158,  158,  158,  158,  158,  140,
++ /*   880 */    19,  158,   48,  158,   19,  158,  104,   97,  158,   21,
++ /*   890 */   158,  158,   99,   38,   49,   22,   49,  158,   99,  200,
++ /*   900 */   130,   19,   11,   14,    9,  103,   63,   63,  123,   19,
++ /*   910 */   114,  114,  103,  123,   19,  114,  116,   35,   87,   20,
++ /*   920 */    21,  150,  200,  160,  160,  138,   12,  139,   99,  138,
++ /*   930 */   138,  138,  145,   22,  139,  139,  164,   44,  139,  139,
++ /*   940 */   171,  111,  176,  122,  177,  119,  178,  120,  179,  117,
++ /*   950 */   180,  121,  193,   98,  151,   23,   83,   83,  202,  127,
++ /*   960 */   186,  113,  186,  193,   98,  186,  187,   99,  188,  116,
++ /*   970 */   187,   99,  188,  139,  159,   19,  151,  164,  139,  139,
++ /*   980 */   159,  186,  215,   40,  216,  127,  186,  139,  169,   60,
++ /*   990 */   169,  197,   19,  176,  122,  186,  113,  186,  186,  176,
++ /*  1000 */   122,  169,  186,  186,  197,  169,  186,  218,   33,  219,
++ /*  1010 */   116,  218,  142,  157,  173,  175,  157,  203,  157,  157,
++ /*  1020 */   162,  176,  176,  152,  210,  210,  152,  152,  140,  140,
++ /*  1030 */   154,  154,  154,  140,  140,  140,  140,  140,  140,  185,
++ /*  1040 */   140,  172,  140,  140,  163,  163,  163,  152,  154,  154,
++ /*  1050 */   140,  140,  140,  140,  140,  213,  214,  140,  140,  140,
++ /*  1060 */   140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
++ /*  1070 */   140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
++ /*  1080 */   140,  140,  140,  140,  170,  200,  166,  170,  166,  111,
++};
++#define YY_SHIFT_USE_DFLT (-84)
++#define YY_SHIFT_COUNT (376)
++#define YY_SHIFT_MIN   (-83)
++#define YY_SHIFT_MAX   (978)
++static const short yy_shift_ofst[] = {
++ /*     0 */   783,  563,  614,  614,   93,   92,   92,  978,  614,  561,
++ /*    10 */   665,  665,  509,  197,  -21,  665,  665,  665,  665,  665,
++ /*    20 */   159,  309,  197,  488,  197,  197,  197,  197,  197,  511,
++ /*    30 */   271,   60,  665,  665,  665,  665,  665,  665,  665,  665,
++ /*    40 */   665,  665,  665,  665,  665,  665,  665,  665,  665,  665,
++ /*    50 */   665,  665,  665,  665,  665,  665,  665,  665,  665,  665,
++ /*    60 */   665,  665,  665,  665,  665,  665,  665,  665,  665,  665,
++ /*    70 */   665,  665,  665,  665,  225,  197,  197,  197,  197,  522,
++ /*    80 */   197,  522,  365,  518,  504,  978,  978,  -84,  -84,  228,
++ /*    90 */   164,   95,   26,  318,  318,  318,  318,  318,  318,  318,
++ /*   100 */   318,  404,  318,  318,  318,  318,  318,  361,  318,  447,
++ /*   110 */   490,  490,  490,  -67,  -67,  -67,  -67,  -67,  -48,  -48,
++ /*   120 */   -48,  -48,  101,   -5,   -5,   -5,   -5,  657,  -25,  566,
++ /*   130 */   657,  184,  195,  644,  558,  253,  192,  248,  189,  119,
++ /*   140 */   119,    4,  197,  197,  197,  197,  197,  197,  217,  197,
++ /*   150 */   197,  197,  217,  197,  197,  197,  197,  197,  217,  197,
++ /*   160 */   197,  197,  217,  197,  197,  197,  197,  -79,  693,  197,
++ /*   170 */   217,  197,  197,  217,  197,  197,   42,   42,  523,  521,
++ /*   180 */   521,  521,  197,  197,  515,  217,  197,  515,  197,  197,
++ /*   190 */   197,  197,  197,  197,   42,   42,   42,  197,  197,  511,
++ /*   200 */   511,  502,  502,  511,  426,  426,  321,  380,  380,  420,
++ /*   210 */   380,  430,  -44,  380,  484,  975,  894,  975,  883,  929,
++ /*   220 */   973,  883,  883,  929,  878,  883,  883,  883,  872,  973,
++ /*   230 */   929,  929,  829,  848,  858,  943,  848,  956,  829,  829,
++ /*   240 */   893,  932,  956,  829,  853,  872,  853,  868,  848,  866,
++ /*   250 */   848,  848,  832,  874,  874,  873,  932,  855,  830,  832,
++ /*   260 */   827,  826,  821,  830,  829,  829,  893,  829,  829,  911,
++ /*   270 */   914,  914,  914,  829,  914,  -84,  -84,  -84,  -84,  -84,
++ /*   280 */   -84,  -84,   40,  360,  236,  202,  -83,  262,  482,  479,
++ /*   290 */   476,  475,  -18,  472,  439,  438,  435,  280,  178,  431,
++ /*   300 */   363,  427,  392,  389,  308,   89,  396,   17,   94,   22,
++ /*   310 */   899,  899,  831,  882,  800,  801,  895,  790,  809,  797,
++ /*   320 */   796,  890,  785,  844,  843,  802,  895,  889,  891,  882,
++ /*   330 */   799,  770,  847,  873,  845,  855,  793,  868,  782,  790,
++ /*   340 */   865,  834,  861,  836,  768,  789,  776,  690,  767,  678,
++ /*   350 */   589,  692,  559,  764,  669,  648,  749,  642,  653,  635,
++ /*   360 */   600,  608,  543,  506,  422,  387,  469,  297,  314,  272,
++ /*   370 */   263,  173,  194,  161,  170,   79,   -8,
++};
++#define YY_REDUCE_USE_DFLT (-69)
++#define YY_REDUCE_COUNT (281)
++#define YY_REDUCE_MIN   (-68)
++#define YY_REDUCE_MAX   (943)
++static const short yy_reduce_ofst[] = {
++ /*     0 */   181,  465,  486,  485,  -23,  524,  512,   33,  446,  575,
++ /*    10 */   572,  349,  554,  118,  574,  607,  480,  602,  576,  393,
++ /*    20 */   249,  205,  605,  -61,  588,  582,  579,  542,  531,  -68,
++ /*    30 */   699,  739,  733,  732,  730,  727,  725,  723,  720,  719,
++ /*    40 */   718,  717,  716,  713,  711,  710,  708,  706,  704,  703,
++ /*    50 */   696,  694,  691,  689,  687,  684,  683,  682,  681,  679,
++ /*    60 */   677,  675,  674,  672,  670,  668,  667,  662,  660,  655,
++ /*    70 */   646,  643,  641,  640,  617,  573,  583,  398,  571,  615,
++ /*    80 */   399,  553,  328,  618,  604,  514,  481,  -49,  408,  722,
++ /*    90 */   722,  722,  722,  722,  722,  722,  722,  722,  722,  722,
++ /*   100 */   722,  722,  722,  722,  722,  722,  722,  722,  722,  722,
++ /*   110 */   722,  722,  722,  722,  722,  722,  722,  722,  722,  722,
++ /*   120 */   722,  722,  922,  722,  722,  722,  722,  917,  920,  885,
++ /*   130 */   914,  943,  942,  941,  940,  869,  939,  869,  938,  722,
++ /*   140 */   722,  869,  937,  936,  935,  934,  933,  932,  869,  931,
++ /*   150 */   930,  929,  869,  928,  927,  926,  925,  924,  869,  923,
++ /*   160 */   922,  921,  869,  920,  919,  918,  917,  842,  842,  914,
++ /*   170 */   869,  913,  912,  869,  911,  910,  895,  894,  895,  883,
++ /*   180 */   882,  881,  903,  902,  854,  869,  900,  854,  898,  897,
++ /*   190 */   896,  895,  894,  893,  878,  877,  876,  889,  888,  875,
++ /*   200 */   874,  815,  814,  871,  846,  845,  858,  862,  861,  814,
++ /*   210 */   859,  840,  841,  856,  870,  793,  790,  789,  820,  836,
++ /*   220 */   807,  817,  816,  832,  823,  812,  811,  809,  817,  794,
++ /*   230 */   821,  819,  848,  800,  768,  767,  795,  821,  840,  839,
++ /*   240 */   813,  825,  815,  834,  784,  783,  780,  779,  779,  770,
++ /*   250 */   776,  774,  756,  722,  722,  722,  803,  759,  770,  769,
++ /*   260 */   768,  767,  766,  769,  800,  799,  772,  796,  795,  787,
++ /*   270 */   793,  792,  791,  788,  787,  764,  763,  722,  722,  722,
++ /*   280 */   722,  771,
++};
++static const YYACTIONTYPE yy_default[] = {
++ /*     0 */   570,  856,  797,  797,  856,  839,  839,  685,  856,  797,
++ /*    10 */   797,  856,  822,  856,  681,  856,  856,  797,  793,  856,
++ /*    20 */   586,  649,  856,  581,  856,  856,  856,  856,  856,  594,
++ /*    30 */   651,  856,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*    40 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*    50 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*    60 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*    70 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  681,
++ /*    80 */   856,  681,  570,  856,  856,  856,  856,  685,  675,  856,
++ /*    90 */   856,  856,  856,  730,  729,  724,  723,  837,  697,  721,
++ /*   100 */   714,  856,  789,  790,  788,  792,  796,  856,  705,  748,
++ /*   110 */   780,  774,  747,  779,  760,  759,  754,  753,  752,  751,
++ /*   120 */   750,  749,  640,  758,  757,  756,  755,  856,  856,  856,
++ /*   130 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  764,
++ /*   140 */   763,  856,  856,  856,  856,  809,  856,  856,  726,  856,
++ /*   150 */   856,  856,  663,  856,  856,  856,  856,  856,  842,  856,
++ /*   160 */   856,  856,  844,  856,  856,  856,  856,  856,  828,  856,
++ /*   170 */   661,  856,  856,  583,  856,  856,  856,  856,  595,  856,
++ /*   180 */   856,  856,  856,  856,  689,  688,  856,  683,  856,  856,
++ /*   190 */   856,  856,  856,  856,  856,  856,  856,  856,  573,  856,
++ /*   200 */   856,  856,  856,  856,  720,  720,  621,  708,  708,  791,
++ /*   210 */   708,  682,  673,  708,  856,  854,  852,  854,  690,  653,
++ /*   220 */   731,  690,  690,  653,  720,  690,  690,  690,  720,  731,
++ /*   230 */   653,  653,  651,  690,  836,  833,  690,  801,  651,  651,
++ /*   240 */   636,  856,  801,  651,  700,  698,  700,  698,  690,  709,
++ /*   250 */   690,  690,  856,  767,  766,  765,  856,  709,  715,  701,
++ /*   260 */   713,  711,  720,  856,  651,  651,  636,  651,  651,  639,
++ /*   270 */   572,  572,  572,  651,  572,  624,  624,  777,  776,  775,
++ /*   280 */   768,  604,  856,  856,  856,  856,  856,  816,  856,  856,
++ /*   290 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*   300 */   856,  856,  856,  856,  856,  856,  716,  737,  856,  856,
++ /*   310 */   856,  856,  856,  856,  808,  856,  856,  856,  856,  856,
++ /*   320 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*   330 */   856,  856,  856,  832,  831,  856,  856,  856,  856,  856,
++ /*   340 */   856,  856,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*   350 */   856,  712,  856,  856,  856,  856,  856,  856,  856,  856,
++ /*   360 */   856,  856,  666,  856,  739,  856,  702,  856,  856,  856,
++ /*   370 */   738,  743,  856,  856,  856,  856,  856,  565,  569,  567,
++ /*   380 */   855,  853,  851,  850,  815,  821,  818,  820,  819,  817,
++ /*   390 */   814,  813,  812,  811,  810,  807,  725,  722,  719,  849,
++ /*   400 */   806,  662,  660,  843,  841,  732,  840,  838,  823,  728,
++ /*   410 */   727,  654,  799,  798,  580,  827,  826,  825,  734,  733,
++ /*   420 */   830,  829,  835,  834,  824,  579,  585,  643,  642,  650,
++ /*   430 */   648,  647,  646,  645,  644,  641,  587,  598,  599,  597,
++ /*   440 */   596,  615,  612,  614,  611,  613,  610,  609,  608,  607,
++ /*   450 */   606,  635,  623,  622,  802,  629,  628,  633,  632,  631,
++ /*   460 */   630,  627,  626,  625,  620,  746,  745,  735,  778,  672,
++ /*   470 */   671,  678,  677,  676,  687,  804,  805,  803,  699,  686,
++ /*   480 */   680,  679,  590,  589,  696,  695,  694,  693,  692,  684,
++ /*   490 */   674,  704,  786,  783,  784,  772,  785,  691,  795,  794,
++ /*   500 */   781,  848,  847,  846,  845,  787,  782,  669,  668,  667,
++ /*   510 */   771,  773,  770,  769,  762,  761,  744,  742,  741,  740,
++ /*   520 */   736,  710,  588,  703,  718,  717,  602,  601,  600,  670,
++ /*   530 */   665,  664,  619,  707,  706,  618,  638,  637,  634,  617,
++ /*   540 */   616,  605,  603,  584,  582,  578,  577,  576,  575,  593,
++ /*   550 */   592,  591,  574,  659,  658,  657,  656,  655,  652,  571,
++ /*   560 */   568,  566,  564,
++};
++
++/* The next table maps tokens into fallback tokens.  If a construct
++** like the following:
++** 
++**      %fallback ID X Y Z.
++**
++** appears in the grammar, then ID becomes a fallback token for X, Y,
++** and Z.  Whenever one of the tokens X, Y, or Z is input to the parser
++** but it does not parse, the type of the token is changed to ID and
++** the parse is retried before an error is thrown.
++*/
++#ifdef YYFALLBACK
++static const YYCODETYPE yyFallback[] = {
++    0,  /*          $ => nothing */
++    0,  /* END_OF_FILE => nothing */
++    0,  /*    ILLEGAL => nothing */
++    0,  /*      SPACE => nothing */
++    0,  /* UNCLOSED_STRING => nothing */
++    0,  /*    COMMENT => nothing */
++    0,  /*   FUNCTION => nothing */
++    0,  /*     COLUMN => nothing */
++    0,  /* AGG_FUNCTION => nothing */
++    0,  /*       SEMI => nothing */
++   23,  /*    EXPLAIN => ID */
++   23,  /*      BEGIN => ID */
++    0,  /* TRANSACTION => nothing */
++    0,  /*     COMMIT => nothing */
++   23,  /*        END => ID */
++    0,  /*   ROLLBACK => nothing */
++    0,  /*     CREATE => nothing */
++    0,  /*      TABLE => nothing */
++   23,  /*       TEMP => ID */
++    0,  /*         LP => nothing */
++    0,  /*         RP => nothing */
++    0,  /*         AS => nothing */
++    0,  /*      COMMA => nothing */
++    0,  /*         ID => nothing */
++   23,  /*      ABORT => ID */
++   23,  /*      AFTER => ID */
++   23,  /*        ASC => ID */
++   23,  /*     ATTACH => ID */
++   23,  /*     BEFORE => ID */
++   23,  /*    CASCADE => ID */
++   23,  /*    CLUSTER => ID */
++   23,  /*   CONFLICT => ID */
++   23,  /*       COPY => ID */
++   23,  /*   DATABASE => ID */
++   23,  /*   DEFERRED => ID */
++   23,  /* DELIMITERS => ID */
++   23,  /*       DESC => ID */
++   23,  /*     DETACH => ID */
++   23,  /*       EACH => ID */
++   23,  /*       FAIL => ID */
++   23,  /*        FOR => ID */
++   23,  /*       GLOB => ID */
++   23,  /*     IGNORE => ID */
++   23,  /*  IMMEDIATE => ID */
++   23,  /*  INITIALLY => ID */
++   23,  /*    INSTEAD => ID */
++   23,  /*       LIKE => ID */
++   23,  /*      MATCH => ID */
++   23,  /*        KEY => ID */
++   23,  /*         OF => ID */
++   23,  /*     OFFSET => ID */
++   23,  /*     PRAGMA => ID */
++   23,  /*      RAISE => ID */
++   23,  /*    REPLACE => ID */
++   23,  /*   RESTRICT => ID */
++   23,  /*        ROW => ID */
++   23,  /*  STATEMENT => ID */
++   23,  /*    TRIGGER => ID */
++   23,  /*     VACUUM => ID */
++   23,  /*       VIEW => ID */
++};
++#endif /* YYFALLBACK */
++
++/* The following structure represents a single element of the
++** parser's stack.  Information stored includes:
++**
++**   +  The state number for the parser at this level of the stack.
++**
++**   +  The value of the token stored at this level of the stack.
++**      (In other words, the "major" token.)
++**
++**   +  The semantic value stored at this level of the stack.  This is
++**      the information used by the action routines in the grammar.
++**      It is sometimes called the "minor" token.
++*/
++struct yyStackEntry {
++  YYACTIONTYPE stateno;  /* The state-number */
++  YYCODETYPE major;      /* The major token value.  This is the code
++                         ** number for the token at this stack level */
++  YYMINORTYPE minor;     /* The user-supplied minor token value.  This
++                         ** is the value of the token  */
++};
++typedef struct yyStackEntry yyStackEntry;
++
++/* The state of the parser is completely contained in an instance of
++** the following structure */
++struct yyParser {
++  int yyidx;                    /* Index of top element in stack */
++#ifdef YYTRACKMAXSTACKDEPTH
++  int yyidxMax;                 /* Maximum value of yyidx */
++#endif
++  int yyerrcnt;                 /* Shifts left before out of the error */
++  sqliteParserARG_SDECL                /* A place to hold %extra_argument */
++#if YYSTACKDEPTH<=0
++  int yystksz;                  /* Current side of the stack */
++  yyStackEntry *yystack;        /* The parser's stack */
++#else
++  yyStackEntry yystack[YYSTACKDEPTH];  /* The parser's stack */
++#endif
++};
++typedef struct yyParser yyParser;
++
++#ifndef NDEBUG
++#include <stdio.h>
++static FILE *yyTraceFILE = 0;
++static char *yyTracePrompt = 0;
++#endif /* NDEBUG */
++
++#ifndef NDEBUG
++/* 
++** Turn parser tracing on by giving a stream to which to write the trace
++** and a prompt to preface each trace message.  Tracing is turned off
++** by making either argument NULL 
++**
++** Inputs:
++** <ul>
++** <li> A FILE* to which trace output should be written.
++**      If NULL, then tracing is turned off.
++** <li> A prefix string written at the beginning of every
++**      line of trace output.  If NULL, then tracing is
++**      turned off.
++** </ul>
++**
++** Outputs:
++** None.
++*/
++void sqliteParserTrace(FILE *TraceFILE, char *zTracePrompt){
++  yyTraceFILE = TraceFILE;
++  yyTracePrompt = zTracePrompt;
++  if( yyTraceFILE==0 ) yyTracePrompt = 0;
++  else if( yyTracePrompt==0 ) yyTraceFILE = 0;
++}
++#endif /* NDEBUG */
++
++#ifndef NDEBUG
++/* For tracing shifts, the names of all terminals and nonterminals
++** are required.  The following table supplies these names */
++static const char *const yyTokenName[] = { 
++  "$",             "END_OF_FILE",   "ILLEGAL",       "SPACE",       
++  "UNCLOSED_STRING",  "COMMENT",       "FUNCTION",      "COLUMN",      
++  "AGG_FUNCTION",  "SEMI",          "EXPLAIN",       "BEGIN",       
++  "TRANSACTION",   "COMMIT",        "END",           "ROLLBACK",    
++  "CREATE",        "TABLE",         "TEMP",          "LP",          
++  "RP",            "AS",            "COMMA",         "ID",          
++  "ABORT",         "AFTER",         "ASC",           "ATTACH",      
++  "BEFORE",        "CASCADE",       "CLUSTER",       "CONFLICT",    
++  "COPY",          "DATABASE",      "DEFERRED",      "DELIMITERS",  
++  "DESC",          "DETACH",        "EACH",          "FAIL",        
++  "FOR",           "GLOB",          "IGNORE",        "IMMEDIATE",   
++  "INITIALLY",     "INSTEAD",       "LIKE",          "MATCH",       
++  "KEY",           "OF",            "OFFSET",        "PRAGMA",      
++  "RAISE",         "REPLACE",       "RESTRICT",      "ROW",         
++  "STATEMENT",     "TRIGGER",       "VACUUM",        "VIEW",        
++  "OR",            "AND",           "NOT",           "EQ",          
++  "NE",            "ISNULL",        "NOTNULL",       "IS",          
++  "BETWEEN",       "IN",            "GT",            "GE",          
++  "LT",            "LE",            "BITAND",        "BITOR",       
++  "LSHIFT",        "RSHIFT",        "PLUS",          "MINUS",       
++  "STAR",          "SLASH",         "REM",           "CONCAT",      
++  "UMINUS",        "UPLUS",         "BITNOT",        "STRING",      
++  "JOIN_KW",       "INTEGER",       "CONSTRAINT",    "DEFAULT",     
++  "FLOAT",         "NULL",          "PRIMARY",       "UNIQUE",      
++  "CHECK",         "REFERENCES",    "COLLATE",       "ON",          
++  "DELETE",        "UPDATE",        "INSERT",        "SET",         
++  "DEFERRABLE",    "FOREIGN",       "DROP",          "UNION",       
++  "ALL",           "INTERSECT",     "EXCEPT",        "SELECT",      
++  "DISTINCT",      "DOT",           "FROM",          "JOIN",        
++  "USING",         "ORDER",         "BY",            "GROUP",       
++  "HAVING",        "LIMIT",         "WHERE",         "INTO",        
++  "VALUES",        "VARIABLE",      "CASE",          "WHEN",        
++  "THEN",          "ELSE",          "INDEX",         "error",       
++  "input",         "cmdlist",       "ecmd",          "explain",     
++  "cmdx",          "cmd",           "trans_opt",     "onconf",      
++  "nm",            "create_table",  "create_table_args",  "temp",        
++  "columnlist",    "conslist_opt",  "select",        "column",      
++  "columnid",      "type",          "carglist",      "id",          
++  "ids",           "typename",      "signed",        "carg",        
++  "ccons",         "sortorder",     "expr",          "idxlist_opt", 
++  "refargs",       "defer_subclause",  "refarg",        "refact",      
++  "init_deferred_pred_opt",  "conslist",      "tcons",         "idxlist",     
++  "defer_subclause_opt",  "orconf",        "resolvetype",   "oneselect",   
++  "multiselect_op",  "distinct",      "selcollist",    "from",        
++  "where_opt",     "groupby_opt",   "having_opt",    "orderby_opt", 
++  "limit_opt",     "sclp",          "as",            "seltablist",  
++  "stl_prefix",    "joinop",        "dbnm",          "on_opt",      
++  "using_opt",     "seltablist_paren",  "joinop2",       "sortlist",    
++  "sortitem",      "collate",       "exprlist",      "setlist",     
++  "insert_cmd",    "inscollist_opt",  "itemlist",      "inscollist",  
++  "likeop",        "case_operand",  "case_exprlist",  "case_else",   
++  "expritem",      "uniqueflag",    "idxitem",       "plus_num",    
++  "minus_num",     "plus_opt",      "number",        "trigger_decl",
++  "trigger_cmd_list",  "trigger_time",  "trigger_event",  "foreach_clause",
++  "when_clause",   "trigger_cmd",   "database_kw_opt",  "key_opt",     
++};
++#endif /* NDEBUG */
++
++#ifndef NDEBUG
++/* For tracing reduce actions, the names of all rules are required.
++*/
++static const char *const yyRuleName[] = {
++ /*   0 */ "input ::= cmdlist",
++ /*   1 */ "cmdlist ::= cmdlist ecmd",
++ /*   2 */ "cmdlist ::= ecmd",
++ /*   3 */ "ecmd ::= explain cmdx SEMI",
++ /*   4 */ "ecmd ::= SEMI",
++ /*   5 */ "cmdx ::= cmd",
++ /*   6 */ "explain ::= EXPLAIN",
++ /*   7 */ "explain ::=",
++ /*   8 */ "cmd ::= BEGIN trans_opt onconf",
++ /*   9 */ "trans_opt ::=",
++ /*  10 */ "trans_opt ::= TRANSACTION",
++ /*  11 */ "trans_opt ::= TRANSACTION nm",
++ /*  12 */ "cmd ::= COMMIT trans_opt",
++ /*  13 */ "cmd ::= END trans_opt",
++ /*  14 */ "cmd ::= ROLLBACK trans_opt",
++ /*  15 */ "cmd ::= create_table create_table_args",
++ /*  16 */ "create_table ::= CREATE temp TABLE nm",
++ /*  17 */ "temp ::= TEMP",
++ /*  18 */ "temp ::=",
++ /*  19 */ "create_table_args ::= LP columnlist conslist_opt RP",
++ /*  20 */ "create_table_args ::= AS select",
++ /*  21 */ "columnlist ::= columnlist COMMA column",
++ /*  22 */ "columnlist ::= column",
++ /*  23 */ "column ::= columnid type carglist",
++ /*  24 */ "columnid ::= nm",
++ /*  25 */ "id ::= ID",
++ /*  26 */ "ids ::= ID",
++ /*  27 */ "ids ::= STRING",
++ /*  28 */ "nm ::= ID",
++ /*  29 */ "nm ::= STRING",
++ /*  30 */ "nm ::= JOIN_KW",
++ /*  31 */ "type ::=",
++ /*  32 */ "type ::= typename",
++ /*  33 */ "type ::= typename LP signed RP",
++ /*  34 */ "type ::= typename LP signed COMMA signed RP",
++ /*  35 */ "typename ::= ids",
++ /*  36 */ "typename ::= typename ids",
++ /*  37 */ "signed ::= INTEGER",
++ /*  38 */ "signed ::= PLUS INTEGER",
++ /*  39 */ "signed ::= MINUS INTEGER",
++ /*  40 */ "carglist ::= carglist carg",
++ /*  41 */ "carglist ::=",
++ /*  42 */ "carg ::= CONSTRAINT nm ccons",
++ /*  43 */ "carg ::= ccons",
++ /*  44 */ "carg ::= DEFAULT STRING",
++ /*  45 */ "carg ::= DEFAULT ID",
++ /*  46 */ "carg ::= DEFAULT INTEGER",
++ /*  47 */ "carg ::= DEFAULT PLUS INTEGER",
++ /*  48 */ "carg ::= DEFAULT MINUS INTEGER",
++ /*  49 */ "carg ::= DEFAULT FLOAT",
++ /*  50 */ "carg ::= DEFAULT PLUS FLOAT",
++ /*  51 */ "carg ::= DEFAULT MINUS FLOAT",
++ /*  52 */ "carg ::= DEFAULT NULL",
++ /*  53 */ "ccons ::= NULL onconf",
++ /*  54 */ "ccons ::= NOT NULL onconf",
++ /*  55 */ "ccons ::= PRIMARY KEY sortorder onconf",
++ /*  56 */ "ccons ::= UNIQUE onconf",
++ /*  57 */ "ccons ::= CHECK LP expr RP onconf",
++ /*  58 */ "ccons ::= REFERENCES nm idxlist_opt refargs",
++ /*  59 */ "ccons ::= defer_subclause",
++ /*  60 */ "ccons ::= COLLATE id",
++ /*  61 */ "refargs ::=",
++ /*  62 */ "refargs ::= refargs refarg",
++ /*  63 */ "refarg ::= MATCH nm",
++ /*  64 */ "refarg ::= ON DELETE refact",
++ /*  65 */ "refarg ::= ON UPDATE refact",
++ /*  66 */ "refarg ::= ON INSERT refact",
++ /*  67 */ "refact ::= SET NULL",
++ /*  68 */ "refact ::= SET DEFAULT",
++ /*  69 */ "refact ::= CASCADE",
++ /*  70 */ "refact ::= RESTRICT",
++ /*  71 */ "defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt",
++ /*  72 */ "defer_subclause ::= DEFERRABLE init_deferred_pred_opt",
++ /*  73 */ "init_deferred_pred_opt ::=",
++ /*  74 */ "init_deferred_pred_opt ::= INITIALLY DEFERRED",
++ /*  75 */ "init_deferred_pred_opt ::= INITIALLY IMMEDIATE",
++ /*  76 */ "conslist_opt ::=",
++ /*  77 */ "conslist_opt ::= COMMA conslist",
++ /*  78 */ "conslist ::= conslist COMMA tcons",
++ /*  79 */ "conslist ::= conslist tcons",
++ /*  80 */ "conslist ::= tcons",
++ /*  81 */ "tcons ::= CONSTRAINT nm",
++ /*  82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf",
++ /*  83 */ "tcons ::= UNIQUE LP idxlist RP onconf",
++ /*  84 */ "tcons ::= CHECK expr onconf",
++ /*  85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt",
++ /*  86 */ "defer_subclause_opt ::=",
++ /*  87 */ "defer_subclause_opt ::= defer_subclause",
++ /*  88 */ "onconf ::=",
++ /*  89 */ "onconf ::= ON CONFLICT resolvetype",
++ /*  90 */ "orconf ::=",
++ /*  91 */ "orconf ::= OR resolvetype",
++ /*  92 */ "resolvetype ::= ROLLBACK",
++ /*  93 */ "resolvetype ::= ABORT",
++ /*  94 */ "resolvetype ::= FAIL",
++ /*  95 */ "resolvetype ::= IGNORE",
++ /*  96 */ "resolvetype ::= REPLACE",
++ /*  97 */ "cmd ::= DROP TABLE nm",
++ /*  98 */ "cmd ::= CREATE temp VIEW nm AS select",
++ /*  99 */ "cmd ::= DROP VIEW nm",
++ /* 100 */ "cmd ::= select",
++ /* 101 */ "select ::= oneselect",
++ /* 102 */ "select ::= select multiselect_op oneselect",
++ /* 103 */ "multiselect_op ::= UNION",
++ /* 104 */ "multiselect_op ::= UNION ALL",
++ /* 105 */ "multiselect_op ::= INTERSECT",
++ /* 106 */ "multiselect_op ::= EXCEPT",
++ /* 107 */ "oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt",
++ /* 108 */ "distinct ::= DISTINCT",
++ /* 109 */ "distinct ::= ALL",
++ /* 110 */ "distinct ::=",
++ /* 111 */ "sclp ::= selcollist COMMA",
++ /* 112 */ "sclp ::=",
++ /* 113 */ "selcollist ::= sclp expr as",
++ /* 114 */ "selcollist ::= sclp STAR",
++ /* 115 */ "selcollist ::= sclp nm DOT STAR",
++ /* 116 */ "as ::= AS nm",
++ /* 117 */ "as ::= ids",
++ /* 118 */ "as ::=",
++ /* 119 */ "from ::=",
++ /* 120 */ "from ::= FROM seltablist",
++ /* 121 */ "stl_prefix ::= seltablist joinop",
++ /* 122 */ "stl_prefix ::=",
++ /* 123 */ "seltablist ::= stl_prefix nm dbnm as on_opt using_opt",
++ /* 124 */ "seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt",
++ /* 125 */ "seltablist_paren ::= select",
++ /* 126 */ "seltablist_paren ::= seltablist",
++ /* 127 */ "dbnm ::=",
++ /* 128 */ "dbnm ::= DOT nm",
++ /* 129 */ "joinop ::= COMMA",
++ /* 130 */ "joinop ::= JOIN",
++ /* 131 */ "joinop ::= JOIN_KW JOIN",
++ /* 132 */ "joinop ::= JOIN_KW nm JOIN",
++ /* 133 */ "joinop ::= JOIN_KW nm nm JOIN",
++ /* 134 */ "on_opt ::= ON expr",
++ /* 135 */ "on_opt ::=",
++ /* 136 */ "using_opt ::= USING LP idxlist RP",
++ /* 137 */ "using_opt ::=",
++ /* 138 */ "orderby_opt ::=",
++ /* 139 */ "orderby_opt ::= ORDER BY sortlist",
++ /* 140 */ "sortlist ::= sortlist COMMA sortitem collate sortorder",
++ /* 141 */ "sortlist ::= sortitem collate sortorder",
++ /* 142 */ "sortitem ::= expr",
++ /* 143 */ "sortorder ::= ASC",
++ /* 144 */ "sortorder ::= DESC",
++ /* 145 */ "sortorder ::=",
++ /* 146 */ "collate ::=",
++ /* 147 */ "collate ::= COLLATE id",
++ /* 148 */ "groupby_opt ::=",
++ /* 149 */ "groupby_opt ::= GROUP BY exprlist",
++ /* 150 */ "having_opt ::=",
++ /* 151 */ "having_opt ::= HAVING expr",
++ /* 152 */ "limit_opt ::=",
++ /* 153 */ "limit_opt ::= LIMIT signed",
++ /* 154 */ "limit_opt ::= LIMIT signed OFFSET signed",
++ /* 155 */ "limit_opt ::= LIMIT signed COMMA signed",
++ /* 156 */ "cmd ::= DELETE FROM nm dbnm where_opt",
++ /* 157 */ "where_opt ::=",
++ /* 158 */ "where_opt ::= WHERE expr",
++ /* 159 */ "cmd ::= UPDATE orconf nm dbnm SET setlist where_opt",
++ /* 160 */ "setlist ::= setlist COMMA nm EQ expr",
++ /* 161 */ "setlist ::= nm EQ expr",
++ /* 162 */ "cmd ::= insert_cmd INTO nm dbnm inscollist_opt VALUES LP itemlist RP",
++ /* 163 */ "cmd ::= insert_cmd INTO nm dbnm inscollist_opt select",
++ /* 164 */ "insert_cmd ::= INSERT orconf",
++ /* 165 */ "insert_cmd ::= REPLACE",
++ /* 166 */ "itemlist ::= itemlist COMMA expr",
++ /* 167 */ "itemlist ::= expr",
++ /* 168 */ "inscollist_opt ::=",
++ /* 169 */ "inscollist_opt ::= LP inscollist RP",
++ /* 170 */ "inscollist ::= inscollist COMMA nm",
++ /* 171 */ "inscollist ::= nm",
++ /* 172 */ "expr ::= LP expr RP",
++ /* 173 */ "expr ::= NULL",
++ /* 174 */ "expr ::= ID",
++ /* 175 */ "expr ::= JOIN_KW",
++ /* 176 */ "expr ::= nm DOT nm",
++ /* 177 */ "expr ::= nm DOT nm DOT nm",
++ /* 178 */ "expr ::= INTEGER",
++ /* 179 */ "expr ::= FLOAT",
++ /* 180 */ "expr ::= STRING",
++ /* 181 */ "expr ::= VARIABLE",
++ /* 182 */ "expr ::= ID LP exprlist RP",
++ /* 183 */ "expr ::= ID LP STAR RP",
++ /* 184 */ "expr ::= expr AND expr",
++ /* 185 */ "expr ::= expr OR expr",
++ /* 186 */ "expr ::= expr LT expr",
++ /* 187 */ "expr ::= expr GT expr",
++ /* 188 */ "expr ::= expr LE expr",
++ /* 189 */ "expr ::= expr GE expr",
++ /* 190 */ "expr ::= expr NE expr",
++ /* 191 */ "expr ::= expr EQ expr",
++ /* 192 */ "expr ::= expr BITAND expr",
++ /* 193 */ "expr ::= expr BITOR expr",
++ /* 194 */ "expr ::= expr LSHIFT expr",
++ /* 195 */ "expr ::= expr RSHIFT expr",
++ /* 196 */ "expr ::= expr likeop expr",
++ /* 197 */ "expr ::= expr NOT likeop expr",
++ /* 198 */ "likeop ::= LIKE",
++ /* 199 */ "likeop ::= GLOB",
++ /* 200 */ "expr ::= expr PLUS expr",
++ /* 201 */ "expr ::= expr MINUS expr",
++ /* 202 */ "expr ::= expr STAR expr",
++ /* 203 */ "expr ::= expr SLASH expr",
++ /* 204 */ "expr ::= expr REM expr",
++ /* 205 */ "expr ::= expr CONCAT expr",
++ /* 206 */ "expr ::= expr ISNULL",
++ /* 207 */ "expr ::= expr IS NULL",
++ /* 208 */ "expr ::= expr NOTNULL",
++ /* 209 */ "expr ::= expr NOT NULL",
++ /* 210 */ "expr ::= expr IS NOT NULL",
++ /* 211 */ "expr ::= NOT expr",
++ /* 212 */ "expr ::= BITNOT expr",
++ /* 213 */ "expr ::= MINUS expr",
++ /* 214 */ "expr ::= PLUS expr",
++ /* 215 */ "expr ::= LP select RP",
++ /* 216 */ "expr ::= expr BETWEEN expr AND expr",
++ /* 217 */ "expr ::= expr NOT BETWEEN expr AND expr",
++ /* 218 */ "expr ::= expr IN LP exprlist RP",
++ /* 219 */ "expr ::= expr IN LP select RP",
++ /* 220 */ "expr ::= expr NOT IN LP exprlist RP",
++ /* 221 */ "expr ::= expr NOT IN LP select RP",
++ /* 222 */ "expr ::= expr IN nm dbnm",
++ /* 223 */ "expr ::= expr NOT IN nm dbnm",
++ /* 224 */ "expr ::= CASE case_operand case_exprlist case_else END",
++ /* 225 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr",
++ /* 226 */ "case_exprlist ::= WHEN expr THEN expr",
++ /* 227 */ "case_else ::= ELSE expr",
++ /* 228 */ "case_else ::=",
++ /* 229 */ "case_operand ::= expr",
++ /* 230 */ "case_operand ::=",
++ /* 231 */ "exprlist ::= exprlist COMMA expritem",
++ /* 232 */ "exprlist ::= expritem",
++ /* 233 */ "expritem ::= expr",
++ /* 234 */ "expritem ::=",
++ /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf",
++ /* 236 */ "uniqueflag ::= UNIQUE",
++ /* 237 */ "uniqueflag ::=",
++ /* 238 */ "idxlist_opt ::=",
++ /* 239 */ "idxlist_opt ::= LP idxlist RP",
++ /* 240 */ "idxlist ::= idxlist COMMA idxitem",
++ /* 241 */ "idxlist ::= idxitem",
++ /* 242 */ "idxitem ::= nm sortorder",
++ /* 243 */ "cmd ::= DROP INDEX nm dbnm",
++ /* 244 */ "cmd ::= COPY orconf nm dbnm FROM nm USING DELIMITERS STRING",
++ /* 245 */ "cmd ::= COPY orconf nm dbnm FROM nm",
++ /* 246 */ "cmd ::= VACUUM",
++ /* 247 */ "cmd ::= VACUUM nm",
++ /* 248 */ "cmd ::= PRAGMA ids EQ nm",
++ /* 249 */ "cmd ::= PRAGMA ids EQ ON",
++ /* 250 */ "cmd ::= PRAGMA ids EQ plus_num",
++ /* 251 */ "cmd ::= PRAGMA ids EQ minus_num",
++ /* 252 */ "cmd ::= PRAGMA ids LP nm RP",
++ /* 253 */ "cmd ::= PRAGMA ids",
++ /* 254 */ "plus_num ::= plus_opt number",
++ /* 255 */ "minus_num ::= MINUS number",
++ /* 256 */ "number ::= INTEGER",
++ /* 257 */ "number ::= FLOAT",
++ /* 258 */ "plus_opt ::= PLUS",
++ /* 259 */ "plus_opt ::=",
++ /* 260 */ "cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END",
++ /* 261 */ "trigger_decl ::= temp TRIGGER nm trigger_time trigger_event ON nm dbnm foreach_clause when_clause",
++ /* 262 */ "trigger_time ::= BEFORE",
++ /* 263 */ "trigger_time ::= AFTER",
++ /* 264 */ "trigger_time ::= INSTEAD OF",
++ /* 265 */ "trigger_time ::=",
++ /* 266 */ "trigger_event ::= DELETE",
++ /* 267 */ "trigger_event ::= INSERT",
++ /* 268 */ "trigger_event ::= UPDATE",
++ /* 269 */ "trigger_event ::= UPDATE OF inscollist",
++ /* 270 */ "foreach_clause ::=",
++ /* 271 */ "foreach_clause ::= FOR EACH ROW",
++ /* 272 */ "foreach_clause ::= FOR EACH STATEMENT",
++ /* 273 */ "when_clause ::=",
++ /* 274 */ "when_clause ::= WHEN expr",
++ /* 275 */ "trigger_cmd_list ::= trigger_cmd SEMI trigger_cmd_list",
++ /* 276 */ "trigger_cmd_list ::=",
++ /* 277 */ "trigger_cmd ::= UPDATE orconf nm SET setlist where_opt",
++ /* 278 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP",
++ /* 279 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt select",
++ /* 280 */ "trigger_cmd ::= DELETE FROM nm where_opt",
++ /* 281 */ "trigger_cmd ::= select",
++ /* 282 */ "expr ::= RAISE LP IGNORE RP",
++ /* 283 */ "expr ::= RAISE LP ROLLBACK COMMA nm RP",
++ /* 284 */ "expr ::= RAISE LP ABORT COMMA nm RP",
++ /* 285 */ "expr ::= RAISE LP FAIL COMMA nm RP",
++ /* 286 */ "cmd ::= DROP TRIGGER nm dbnm",
++ /* 287 */ "cmd ::= ATTACH database_kw_opt ids AS nm key_opt",
++ /* 288 */ "key_opt ::= USING ids",
++ /* 289 */ "key_opt ::=",
++ /* 290 */ "database_kw_opt ::= DATABASE",
++ /* 291 */ "database_kw_opt ::=",
++ /* 292 */ "cmd ::= DETACH database_kw_opt nm",
++};
++#endif /* NDEBUG */
++
++
++#if YYSTACKDEPTH<=0
++/*
++** Try to increase the size of the parser stack.
++*/
++static void yyGrowStack(yyParser *p){
++  int newSize;
++  yyStackEntry *pNew;
++
++  newSize = p->yystksz*2 + 100;
++  pNew = realloc(p->yystack, newSize*sizeof(pNew[0]));
++  if( pNew ){
++    p->yystack = pNew;
++    p->yystksz = newSize;
++#ifndef NDEBUG
++    if( yyTraceFILE ){
++      fprintf(yyTraceFILE,"%sStack grows to %d entries!\n",
++              yyTracePrompt, p->yystksz);
++    }
++#endif
++  }
++}
++#endif
++
++/* 
++** This function allocates a new parser.
++** The only argument is a pointer to a function which works like
++** malloc.
++**
++** Inputs:
++** A pointer to the function used to allocate memory.
++**
++** Outputs:
++** A pointer to a parser.  This pointer is used in subsequent calls
++** to sqliteParser and sqliteParserFree.
++*/
++void *sqliteParserAlloc(void *(*mallocProc)(size_t)){
++  yyParser *pParser;
++  pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) );
++  if( pParser ){
++    pParser->yyidx = -1;
++#ifdef YYTRACKMAXSTACKDEPTH
++    pParser->yyidxMax = 0;
++#endif
++#if YYSTACKDEPTH<=0
++    pParser->yystack = NULL;
++    pParser->yystksz = 0;
++    yyGrowStack(pParser);
++#endif
++  }
++  return pParser;
++}
++
++/* The following function deletes the value associated with a
++** symbol.  The symbol can be either a terminal or nonterminal.
++** "yymajor" is the symbol code, and "yypminor" is a pointer to
++** the value.
++*/
++static void yy_destructor(
++  yyParser *yypParser,    /* The parser */
++  YYCODETYPE yymajor,     /* Type code for object to destroy */
++  YYMINORTYPE *yypminor   /* The object to be destroyed */
++){
++  sqliteParserARG_FETCH;
++  switch( yymajor ){
++    /* Here is inserted the actions which take place when a
++    ** terminal or non-terminal is destroyed.  This can happen
++    ** when the symbol is popped from the stack during a
++    ** reduce or during error processing or when a parser is 
++    ** being destroyed before it is finished parsing.
++    **
++    ** Note: during a reduce, the only symbols destroyed are those
++    ** which appear on the RHS of the rule, but which are not used
++    ** inside the C code.
++    */
++    case 146: /* select */
++    case 171: /* oneselect */
++    case 189: /* seltablist_paren */
++{
++#line 286 "ext/sqlite/libsqlite/src/parse.y"
++sqliteSelectDelete((yypminor->yy179));
++#line 1131 "ext/sqlite/libsqlite/src/parse.c"
++}
++      break;
++    case 158: /* expr */
++    case 176: /* where_opt */
++    case 178: /* having_opt */
++    case 187: /* on_opt */
++    case 192: /* sortitem */
++    case 204: /* expritem */
++{
++#line 533 "ext/sqlite/libsqlite/src/parse.y"
++sqliteExprDelete((yypminor->yy242));
++#line 1143 "ext/sqlite/libsqlite/src/parse.c"
++}
++      break;
++    case 159: /* idxlist_opt */
++    case 167: /* idxlist */
++    case 188: /* using_opt */
++    case 197: /* inscollist_opt */
++    case 199: /* inscollist */
++{
++#line 746 "ext/sqlite/libsqlite/src/parse.y"
++sqliteIdListDelete((yypminor->yy320));
++#line 1154 "ext/sqlite/libsqlite/src/parse.c"
++}
++      break;
++    case 174: /* selcollist */
++    case 177: /* groupby_opt */
++    case 179: /* orderby_opt */
++    case 181: /* sclp */
++    case 191: /* sortlist */
++    case 194: /* exprlist */
++    case 195: /* setlist */
++    case 198: /* itemlist */
++    case 202: /* case_exprlist */
++{
++#line 322 "ext/sqlite/libsqlite/src/parse.y"
++sqliteExprListDelete((yypminor->yy322));
++#line 1169 "ext/sqlite/libsqlite/src/parse.c"
++}
++      break;
++    case 175: /* from */
++    case 183: /* seltablist */
++    case 184: /* stl_prefix */
++{
++#line 353 "ext/sqlite/libsqlite/src/parse.y"
++sqliteSrcListDelete((yypminor->yy307));
++#line 1178 "ext/sqlite/libsqlite/src/parse.c"
++}
++      break;
++    case 212: /* trigger_cmd_list */
++    case 217: /* trigger_cmd */
++{
++#line 828 "ext/sqlite/libsqlite/src/parse.y"
++sqliteDeleteTriggerStep((yypminor->yy19));
++#line 1186 "ext/sqlite/libsqlite/src/parse.c"
++}
++      break;
++    case 214: /* trigger_event */
++{
++#line 812 "ext/sqlite/libsqlite/src/parse.y"
++sqliteIdListDelete((yypminor->yy290).b);
++#line 1193 "ext/sqlite/libsqlite/src/parse.c"
++}
++      break;
++    default:  break;   /* If no destructor action specified: do nothing */
++  }
++}
++
++/*
++** Pop the parser's stack once.
++**
++** If there is a destructor routine associated with the token which
++** is popped from the stack, then call it.
++**
++** Return the major token number for the symbol popped.
++*/
++static int yy_pop_parser_stack(yyParser *pParser){
++  YYCODETYPE yymajor;
++  yyStackEntry *yytos = &pParser->yystack[pParser->yyidx];
++
++  if( pParser->yyidx<0 ) return 0;
++#ifndef NDEBUG
++  if( yyTraceFILE && pParser->yyidx>=0 ){
++    fprintf(yyTraceFILE,"%sPopping %s\n",
++      yyTracePrompt,
++      yyTokenName[yytos->major]);
++  }
++#endif
++  yymajor = yytos->major;
++  yy_destructor(pParser, yymajor, &yytos->minor);
++  pParser->yyidx--;
++  return yymajor;
++}
++
++/* 
++** Deallocate and destroy a parser.  Destructors are all called for
++** all stack elements before shutting the parser down.
++**
++** Inputs:
++** <ul>
++** <li>  A pointer to the parser.  This should be a pointer
++**       obtained from sqliteParserAlloc.
++** <li>  A pointer to a function used to reclaim memory obtained
++**       from malloc.
++** </ul>
++*/
++void sqliteParserFree(
++  void *p,                    /* The parser to be deleted */
++  void (*freeProc)(void*)     /* Function used to reclaim memory */
++){
++  yyParser *pParser = (yyParser*)p;
++  if( pParser==0 ) return;
++  while( pParser->yyidx>=0 ) yy_pop_parser_stack(pParser);
++#if YYSTACKDEPTH<=0
++  free(pParser->yystack);
++#endif
++  (*freeProc)((void*)pParser);
++}
++
++/*
++** Return the peak depth of the stack for a parser.
++*/
++#ifdef YYTRACKMAXSTACKDEPTH
++int sqliteParserStackPeak(void *p){
++  yyParser *pParser = (yyParser*)p;
++  return pParser->yyidxMax;
++}
++#endif
++
++/*
++** Find the appropriate action for a parser given the terminal
++** look-ahead token iLookAhead.
++**
++** If the look-ahead token is YYNOCODE, then check to see if the action is
++** independent of the look-ahead.  If it is, return the action, otherwise
++** return YY_NO_ACTION.
++*/
++static int yy_find_shift_action(
++  yyParser *pParser,        /* The parser */
++  YYCODETYPE iLookAhead     /* The look-ahead token */
++){
++  int i;
++  int stateno = pParser->yystack[pParser->yyidx].stateno;
++ 
++  if( stateno>YY_SHIFT_COUNT
++   || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){
++    return yy_default[stateno];
++  }
++  assert( iLookAhead!=YYNOCODE );
++  i += iLookAhead;
++  if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){
++    if( iLookAhead>0 ){
++#ifdef YYFALLBACK
++      YYCODETYPE iFallback;            /* Fallback token */
++      if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0])
++             && (iFallback = yyFallback[iLookAhead])!=0 ){
++#ifndef NDEBUG
++        if( yyTraceFILE ){
++          fprintf(yyTraceFILE, "%sFALLBACK %s => %s\n",
++             yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]);
++        }
++#endif
++        return yy_find_shift_action(pParser, iFallback);
++      }
++#endif
++#ifdef YYWILDCARD
++      {
++        int j = i - iLookAhead + YYWILDCARD;
++        if( 
++#if YY_SHIFT_MIN+YYWILDCARD<0
++          j>=0 &&
++#endif
++#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT
++          j<YY_ACTTAB_COUNT &&
++#endif
++          yy_lookahead[j]==YYWILDCARD
++        ){
++#ifndef NDEBUG
++          if( yyTraceFILE ){
++            fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
++               yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]);
++          }
++#endif /* NDEBUG */
++          return yy_action[j];
++        }
++      }
++#endif /* YYWILDCARD */
++    }
++    return yy_default[stateno];
++  }else{
++    return yy_action[i];
++  }
++}
++
++/*
++** Find the appropriate action for a parser given the non-terminal
++** look-ahead token iLookAhead.
++**
++** If the look-ahead token is YYNOCODE, then check to see if the action is
++** independent of the look-ahead.  If it is, return the action, otherwise
++** return YY_NO_ACTION.
++*/
++static int yy_find_reduce_action(
++  int stateno,              /* Current state number */
++  YYCODETYPE iLookAhead     /* The look-ahead token */
++){
++  int i;
++#ifdef YYERRORSYMBOL
++  if( stateno>YY_REDUCE_COUNT ){
++    return yy_default[stateno];
++  }
++#else
++  assert( stateno<=YY_REDUCE_COUNT );
++#endif
++  i = yy_reduce_ofst[stateno];
++  assert( i!=YY_REDUCE_USE_DFLT );
++  assert( iLookAhead!=YYNOCODE );
++  i += iLookAhead;
++#ifdef YYERRORSYMBOL
++  if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){
++    return yy_default[stateno];
++  }
++#else
++  assert( i>=0 && i<YY_ACTTAB_COUNT );
++  assert( yy_lookahead[i]==iLookAhead );
++#endif
++  return yy_action[i];
++}
++
++/*
++** The following routine is called if the stack overflows.
++*/
++static void yyStackOverflow(yyParser *yypParser, YYMINORTYPE *yypMinor){
++   sqliteParserARG_FETCH;
++   yypParser->yyidx--;
++#ifndef NDEBUG
++   if( yyTraceFILE ){
++     fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt);
++   }
++#endif
++   while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
++   /* Here code is inserted which will execute if the parser
++   ** stack every overflows */
++   sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument var */
++}
++
++/*
++** Perform a shift action.
++*/
++static void yy_shift(
++  yyParser *yypParser,          /* The parser to be shifted */
++  int yyNewState,               /* The new state to shift in */
++  int yyMajor,                  /* The major token to shift in */
++  YYMINORTYPE *yypMinor         /* Pointer to the minor token to shift in */
++){
++  yyStackEntry *yytos;
++  yypParser->yyidx++;
++#ifdef YYTRACKMAXSTACKDEPTH
++  if( yypParser->yyidx>yypParser->yyidxMax ){
++    yypParser->yyidxMax = yypParser->yyidx;
++  }
++#endif
++#if YYSTACKDEPTH>0 
++  if( yypParser->yyidx>=YYSTACKDEPTH ){
++    yyStackOverflow(yypParser, yypMinor);
++    return;
++  }
++#else
++  if( yypParser->yyidx>=yypParser->yystksz ){
++    yyGrowStack(yypParser);
++    if( yypParser->yyidx>=yypParser->yystksz ){
++      yyStackOverflow(yypParser, yypMinor);
++      return;
++    }
++  }
++#endif
++  yytos = &yypParser->yystack[yypParser->yyidx];
++  yytos->stateno = (YYACTIONTYPE)yyNewState;
++  yytos->major = (YYCODETYPE)yyMajor;
++  yytos->minor = *yypMinor;
++#ifndef NDEBUG
++  if( yyTraceFILE && yypParser->yyidx>0 ){
++    int i;
++    fprintf(yyTraceFILE,"%sShift %d\n",yyTracePrompt,yyNewState);
++    fprintf(yyTraceFILE,"%sStack:",yyTracePrompt);
++    for(i=1; i<=yypParser->yyidx; i++)
++      fprintf(yyTraceFILE," %s",yyTokenName[yypParser->yystack[i].major]);
++    fprintf(yyTraceFILE,"\n");
++  }
++#endif
++}
++
++/* The following table contains information about every rule that
++** is used during the reduce.
++*/
++static const struct {
++  YYCODETYPE lhs;         /* Symbol on the left-hand side of the rule */
++  unsigned char nrhs;     /* Number of right-hand side symbols in the rule */
++} yyRuleInfo[] = {
++  { 132, 1 },
++  { 133, 2 },
++  { 133, 1 },
++  { 134, 3 },
++  { 134, 1 },
++  { 136, 1 },
++  { 135, 1 },
++  { 135, 0 },
++  { 137, 3 },
++  { 138, 0 },
++  { 138, 1 },
++  { 138, 2 },
++  { 137, 2 },
++  { 137, 2 },
++  { 137, 2 },
++  { 137, 2 },
++  { 141, 4 },
++  { 143, 1 },
++  { 143, 0 },
++  { 142, 4 },
++  { 142, 2 },
++  { 144, 3 },
++  { 144, 1 },
++  { 147, 3 },
++  { 148, 1 },
++  { 151, 1 },
++  { 152, 1 },
++  { 152, 1 },
++  { 140, 1 },
++  { 140, 1 },
++  { 140, 1 },
++  { 149, 0 },
++  { 149, 1 },
++  { 149, 4 },
++  { 149, 6 },
++  { 153, 1 },
++  { 153, 2 },
++  { 154, 1 },
++  { 154, 2 },
++  { 154, 2 },
++  { 150, 2 },
++  { 150, 0 },
++  { 155, 3 },
++  { 155, 1 },
++  { 155, 2 },
++  { 155, 2 },
++  { 155, 2 },
++  { 155, 3 },
++  { 155, 3 },
++  { 155, 2 },
++  { 155, 3 },
++  { 155, 3 },
++  { 155, 2 },
++  { 156, 2 },
++  { 156, 3 },
++  { 156, 4 },
++  { 156, 2 },
++  { 156, 5 },
++  { 156, 4 },
++  { 156, 1 },
++  { 156, 2 },
++  { 160, 0 },
++  { 160, 2 },
++  { 162, 2 },
++  { 162, 3 },
++  { 162, 3 },
++  { 162, 3 },
++  { 163, 2 },
++  { 163, 2 },
++  { 163, 1 },
++  { 163, 1 },
++  { 161, 3 },
++  { 161, 2 },
++  { 164, 0 },
++  { 164, 2 },
++  { 164, 2 },
++  { 145, 0 },
++  { 145, 2 },
++  { 165, 3 },
++  { 165, 2 },
++  { 165, 1 },
++  { 166, 2 },
++  { 166, 6 },
++  { 166, 5 },
++  { 166, 3 },
++  { 166, 10 },
++  { 168, 0 },
++  { 168, 1 },
++  { 139, 0 },
++  { 139, 3 },
++  { 169, 0 },
++  { 169, 2 },
++  { 170, 1 },
++  { 170, 1 },
++  { 170, 1 },
++  { 170, 1 },
++  { 170, 1 },
++  { 137, 3 },
++  { 137, 6 },
++  { 137, 3 },
++  { 137, 1 },
++  { 146, 1 },
++  { 146, 3 },
++  { 172, 1 },
++  { 172, 2 },
++  { 172, 1 },
++  { 172, 1 },
++  { 171, 9 },
++  { 173, 1 },
++  { 173, 1 },
++  { 173, 0 },
++  { 181, 2 },
++  { 181, 0 },
++  { 174, 3 },
++  { 174, 2 },
++  { 174, 4 },
++  { 182, 2 },
++  { 182, 1 },
++  { 182, 0 },
++  { 175, 0 },
++  { 175, 2 },
++  { 184, 2 },
++  { 184, 0 },
++  { 183, 6 },
++  { 183, 7 },
++  { 189, 1 },
++  { 189, 1 },
++  { 186, 0 },
++  { 186, 2 },
++  { 185, 1 },
++  { 185, 1 },
++  { 185, 2 },
++  { 185, 3 },
++  { 185, 4 },
++  { 187, 2 },
++  { 187, 0 },
++  { 188, 4 },
++  { 188, 0 },
++  { 179, 0 },
++  { 179, 3 },
++  { 191, 5 },
++  { 191, 3 },
++  { 192, 1 },
++  { 157, 1 },
++  { 157, 1 },
++  { 157, 0 },
++  { 193, 0 },
++  { 193, 2 },
++  { 177, 0 },
++  { 177, 3 },
++  { 178, 0 },
++  { 178, 2 },
++  { 180, 0 },
++  { 180, 2 },
++  { 180, 4 },
++  { 180, 4 },
++  { 137, 5 },
++  { 176, 0 },
++  { 176, 2 },
++  { 137, 7 },
++  { 195, 5 },
++  { 195, 3 },
++  { 137, 9 },
++  { 137, 6 },
++  { 196, 2 },
++  { 196, 1 },
++  { 198, 3 },
++  { 198, 1 },
++  { 197, 0 },
++  { 197, 3 },
++  { 199, 3 },
++  { 199, 1 },
++  { 158, 3 },
++  { 158, 1 },
++  { 158, 1 },
++  { 158, 1 },
++  { 158, 3 },
++  { 158, 5 },
++  { 158, 1 },
++  { 158, 1 },
++  { 158, 1 },
++  { 158, 1 },
++  { 158, 4 },
++  { 158, 4 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 4 },
++  { 200, 1 },
++  { 200, 1 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 3 },
++  { 158, 2 },
++  { 158, 3 },
++  { 158, 2 },
++  { 158, 3 },
++  { 158, 4 },
++  { 158, 2 },
++  { 158, 2 },
++  { 158, 2 },
++  { 158, 2 },
++  { 158, 3 },
++  { 158, 5 },
++  { 158, 6 },
++  { 158, 5 },
++  { 158, 5 },
++  { 158, 6 },
++  { 158, 6 },
++  { 158, 4 },
++  { 158, 5 },
++  { 158, 5 },
++  { 202, 5 },
++  { 202, 4 },
++  { 203, 2 },
++  { 203, 0 },
++  { 201, 1 },
++  { 201, 0 },
++  { 194, 3 },
++  { 194, 1 },
++  { 204, 1 },
++  { 204, 0 },
++  { 137, 11 },
++  { 205, 1 },
++  { 205, 0 },
++  { 159, 0 },
++  { 159, 3 },
++  { 167, 3 },
++  { 167, 1 },
++  { 206, 2 },
++  { 137, 4 },
++  { 137, 9 },
++  { 137, 6 },
++  { 137, 1 },
++  { 137, 2 },
++  { 137, 4 },
++  { 137, 4 },
++  { 137, 4 },
++  { 137, 4 },
++  { 137, 5 },
++  { 137, 2 },
++  { 207, 2 },
++  { 208, 2 },
++  { 210, 1 },
++  { 210, 1 },
++  { 209, 1 },
++  { 209, 0 },
++  { 137, 5 },
++  { 211, 10 },
++  { 213, 1 },
++  { 213, 1 },
++  { 213, 2 },
++  { 213, 0 },
++  { 214, 1 },
++  { 214, 1 },
++  { 214, 1 },
++  { 214, 3 },
++  { 215, 0 },
++  { 215, 3 },
++  { 215, 3 },
++  { 216, 0 },
++  { 216, 2 },
++  { 212, 3 },
++  { 212, 0 },
++  { 217, 6 },
++  { 217, 8 },
++  { 217, 5 },
++  { 217, 4 },
++  { 217, 1 },
++  { 158, 4 },
++  { 158, 6 },
++  { 158, 6 },
++  { 158, 6 },
++  { 137, 4 },
++  { 137, 6 },
++  { 219, 2 },
++  { 219, 0 },
++  { 218, 1 },
++  { 218, 0 },
++  { 137, 3 },
++};
++
++static void yy_accept(yyParser*);  /* Forward Declaration */
++
++/*
++** Perform a reduce action and the shift that must immediately
++** follow the reduce.
++*/
++static void yy_reduce(
++  yyParser *yypParser,         /* The parser */
++  int yyruleno                 /* Number of the rule by which to reduce */
++){
++  int yygoto;                     /* The next state */
++  int yyact;                      /* The next action */
++  YYMINORTYPE yygotominor;        /* The LHS of the rule reduced */
++  yyStackEntry *yymsp;            /* The top of the parser's stack */
++  int yysize;                     /* Amount to pop the stack */
++  sqliteParserARG_FETCH;
++  yymsp = &yypParser->yystack[yypParser->yyidx];
++#ifndef NDEBUG
++  if( yyTraceFILE && yyruleno>=0 
++        && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){
++    fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt,
++      yyRuleName[yyruleno]);
++  }
++#endif /* NDEBUG */
++
++  /* Silence complaints from purify about yygotominor being uninitialized
++  ** in some cases when it is copied into the stack after the following
++  ** switch.  yygotominor is uninitialized when a rule reduces that does
++  ** not set the value of its left-hand side nonterminal.  Leaving the
++  ** value of the nonterminal uninitialized is utterly harmless as long
++  ** as the value is never used.  So really the only thing this code
++  ** accomplishes is to quieten purify.  
++  **
++  ** 2007-01-16:  The wireshark project (www.wireshark.org) reports that
++  ** without this code, their parser segfaults.  I'm not sure what there
++  ** parser is doing to make this happen.  This is the second bug report
++  ** from wireshark this week.  Clearly they are stressing Lemon in ways
++  ** that it has not been previously stressed...  (SQLite ticket #2172)
++  */
++  /*memset(&yygotominor, 0, sizeof(yygotominor));*/
++  yygotominor = yyzerominor;
++
++
++  switch( yyruleno ){
++  /* Beginning here are the reduction cases.  A typical example
++  ** follows:
++  **   case 0:
++  **  #line <lineno> <grammarfile>
++  **     { ... }           // User supplied code
++  **  #line <lineno> <thisfile>
++  **     break;
++  */
++      case 5: /* cmdx ::= cmd */
++#line 72 "ext/sqlite/libsqlite/src/parse.y"
++{ sqliteExec(pParse); }
++#line 1781 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 6: /* explain ::= EXPLAIN */
++#line 73 "ext/sqlite/libsqlite/src/parse.y"
++{ sqliteBeginParse(pParse, 1); }
++#line 1786 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 7: /* explain ::= */
++#line 74 "ext/sqlite/libsqlite/src/parse.y"
++{ sqliteBeginParse(pParse, 0); }
++#line 1791 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 8: /* cmd ::= BEGIN trans_opt onconf */
++#line 79 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteBeginTransaction(pParse,yymsp[0].minor.yy372);}
++#line 1796 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 12: /* cmd ::= COMMIT trans_opt */
++      case 13: /* cmd ::= END trans_opt */ yytestcase(yyruleno==13);
++#line 83 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteCommitTransaction(pParse);}
++#line 1802 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 14: /* cmd ::= ROLLBACK trans_opt */
++#line 85 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteRollbackTransaction(pParse);}
++#line 1807 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 16: /* create_table ::= CREATE temp TABLE nm */
++#line 90 "ext/sqlite/libsqlite/src/parse.y"
++{
++   sqliteStartTable(pParse,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0,yymsp[-2].minor.yy372,0);
++}
++#line 1814 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 17: /* temp ::= TEMP */
++      case 74: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */ yytestcase(yyruleno==74);
++      case 108: /* distinct ::= DISTINCT */ yytestcase(yyruleno==108);
++#line 94 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = 1;}
++#line 1821 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 18: /* temp ::= */
++      case 73: /* init_deferred_pred_opt ::= */ yytestcase(yyruleno==73);
++      case 75: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */ yytestcase(yyruleno==75);
++      case 86: /* defer_subclause_opt ::= */ yytestcase(yyruleno==86);
++      case 109: /* distinct ::= ALL */ yytestcase(yyruleno==109);
++      case 110: /* distinct ::= */ yytestcase(yyruleno==110);
++#line 95 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = 0;}
++#line 1831 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 19: /* create_table_args ::= LP columnlist conslist_opt RP */
++#line 96 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteEndTable(pParse,&yymsp[0].minor.yy0,0);
++}
++#line 1838 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 20: /* create_table_args ::= AS select */
++#line 99 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteEndTable(pParse,0,yymsp[0].minor.yy179);
++  sqliteSelectDelete(yymsp[0].minor.yy179);
++}
++#line 1846 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 24: /* columnid ::= nm */
++#line 111 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddColumn(pParse,&yymsp[0].minor.yy0);}
++#line 1851 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 25: /* id ::= ID */
++      case 26: /* ids ::= ID */ yytestcase(yyruleno==26);
++      case 27: /* ids ::= STRING */ yytestcase(yyruleno==27);
++      case 28: /* nm ::= ID */ yytestcase(yyruleno==28);
++      case 29: /* nm ::= STRING */ yytestcase(yyruleno==29);
++      case 30: /* nm ::= JOIN_KW */ yytestcase(yyruleno==30);
++      case 35: /* typename ::= ids */ yytestcase(yyruleno==35);
++      case 128: /* dbnm ::= DOT nm */ yytestcase(yyruleno==128);
++      case 254: /* plus_num ::= plus_opt number */ yytestcase(yyruleno==254);
++      case 255: /* minus_num ::= MINUS number */ yytestcase(yyruleno==255);
++      case 256: /* number ::= INTEGER */ yytestcase(yyruleno==256);
++      case 257: /* number ::= FLOAT */ yytestcase(yyruleno==257);
++#line 117 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy0 = yymsp[0].minor.yy0;}
++#line 1867 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 32: /* type ::= typename */
++#line 160 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddColumnType(pParse,&yymsp[0].minor.yy0,&yymsp[0].minor.yy0);}
++#line 1872 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 33: /* type ::= typename LP signed RP */
++#line 161 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddColumnType(pParse,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);}
++#line 1877 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 34: /* type ::= typename LP signed COMMA signed RP */
++#line 163 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddColumnType(pParse,&yymsp[-5].minor.yy0,&yymsp[0].minor.yy0);}
++#line 1882 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 36: /* typename ::= typename ids */
++      case 242: /* idxitem ::= nm sortorder */ yytestcase(yyruleno==242);
++#line 166 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy0 = yymsp[-1].minor.yy0;}
++#line 1888 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 37: /* signed ::= INTEGER */
++      case 38: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==38);
++#line 168 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = atoi(yymsp[0].minor.yy0.z); }
++#line 1894 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 39: /* signed ::= MINUS INTEGER */
++#line 170 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = -atoi(yymsp[0].minor.yy0.z); }
++#line 1899 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 44: /* carg ::= DEFAULT STRING */
++      case 45: /* carg ::= DEFAULT ID */ yytestcase(yyruleno==45);
++      case 46: /* carg ::= DEFAULT INTEGER */ yytestcase(yyruleno==46);
++      case 47: /* carg ::= DEFAULT PLUS INTEGER */ yytestcase(yyruleno==47);
++      case 49: /* carg ::= DEFAULT FLOAT */ yytestcase(yyruleno==49);
++      case 50: /* carg ::= DEFAULT PLUS FLOAT */ yytestcase(yyruleno==50);
++#line 175 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddDefaultValue(pParse,&yymsp[0].minor.yy0,0);}
++#line 1909 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 48: /* carg ::= DEFAULT MINUS INTEGER */
++      case 51: /* carg ::= DEFAULT MINUS FLOAT */ yytestcase(yyruleno==51);
++#line 179 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddDefaultValue(pParse,&yymsp[0].minor.yy0,1);}
++#line 1915 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 54: /* ccons ::= NOT NULL onconf */
++#line 189 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddNotNull(pParse, yymsp[0].minor.yy372);}
++#line 1920 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 55: /* ccons ::= PRIMARY KEY sortorder onconf */
++#line 190 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddPrimaryKey(pParse,0,yymsp[0].minor.yy372);}
++#line 1925 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 56: /* ccons ::= UNIQUE onconf */
++#line 191 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);}
++#line 1930 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 57: /* ccons ::= CHECK LP expr RP onconf */
++#line 192 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yy_destructor(yypParser,158,&yymsp[-2].minor);
++}
++#line 1937 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 58: /* ccons ::= REFERENCES nm idxlist_opt refargs */
++#line 194 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteCreateForeignKey(pParse,0,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy320,yymsp[0].minor.yy372);}
++#line 1942 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 59: /* ccons ::= defer_subclause */
++#line 195 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteDeferForeignKey(pParse,yymsp[0].minor.yy372);}
++#line 1947 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 60: /* ccons ::= COLLATE id */
++#line 196 "ext/sqlite/libsqlite/src/parse.y"
++{
++   sqliteAddCollateType(pParse, sqliteCollateType(yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n));
++}
++#line 1954 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 61: /* refargs ::= */
++#line 206 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Restrict * 0x010101; }
++#line 1959 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 62: /* refargs ::= refargs refarg */
++#line 207 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.mask) | yymsp[0].minor.yy407.value; }
++#line 1964 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 63: /* refarg ::= MATCH nm */
++#line 209 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy407.value = 0;     yygotominor.yy407.mask = 0x000000; }
++#line 1969 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 64: /* refarg ::= ON DELETE refact */
++#line 210 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy407.value = yymsp[0].minor.yy372;     yygotominor.yy407.mask = 0x0000ff; }
++#line 1974 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 65: /* refarg ::= ON UPDATE refact */
++#line 211 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8;  yygotominor.yy407.mask = 0x00ff00; }
++#line 1979 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 66: /* refarg ::= ON INSERT refact */
++#line 212 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.mask = 0xff0000; }
++#line 1984 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 67: /* refact ::= SET NULL */
++#line 214 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_SetNull; }
++#line 1989 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 68: /* refact ::= SET DEFAULT */
++#line 215 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_SetDflt; }
++#line 1994 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 69: /* refact ::= CASCADE */
++#line 216 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Cascade; }
++#line 1999 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 70: /* refact ::= RESTRICT */
++#line 217 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Restrict; }
++#line 2004 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 71: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */
++      case 72: /* defer_subclause ::= DEFERRABLE init_deferred_pred_opt */ yytestcase(yyruleno==72);
++      case 87: /* defer_subclause_opt ::= defer_subclause */ yytestcase(yyruleno==87);
++      case 164: /* insert_cmd ::= INSERT orconf */ yytestcase(yyruleno==164);
++#line 219 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = yymsp[0].minor.yy372;}
++#line 2012 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 82: /* tcons ::= PRIMARY KEY LP idxlist RP onconf */
++#line 236 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteAddPrimaryKey(pParse,yymsp[-2].minor.yy320,yymsp[0].minor.yy372);}
++#line 2017 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 83: /* tcons ::= UNIQUE LP idxlist RP onconf */
++#line 238 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);}
++#line 2022 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 84: /* tcons ::= CHECK expr onconf */
++#line 239 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yy_destructor(yypParser,158,&yymsp[-1].minor);
++}
++#line 2029 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 85: /* tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt */
++#line 241 "ext/sqlite/libsqlite/src/parse.y"
++{
++    sqliteCreateForeignKey(pParse, yymsp[-6].minor.yy320, &yymsp[-3].minor.yy0, yymsp[-2].minor.yy320, yymsp[-1].minor.yy372);
++    sqliteDeferForeignKey(pParse, yymsp[0].minor.yy372);
++}
++#line 2037 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 88: /* onconf ::= */
++      case 90: /* orconf ::= */ yytestcase(yyruleno==90);
++#line 255 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Default; }
++#line 2043 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 89: /* onconf ::= ON CONFLICT resolvetype */
++      case 91: /* orconf ::= OR resolvetype */ yytestcase(yyruleno==91);
++#line 256 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = yymsp[0].minor.yy372; }
++#line 2049 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 92: /* resolvetype ::= ROLLBACK */
++#line 259 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Rollback; }
++#line 2054 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 93: /* resolvetype ::= ABORT */
++      case 236: /* uniqueflag ::= UNIQUE */ yytestcase(yyruleno==236);
++#line 260 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Abort; }
++#line 2060 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 94: /* resolvetype ::= FAIL */
++#line 261 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Fail; }
++#line 2065 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 95: /* resolvetype ::= IGNORE */
++#line 262 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Ignore; }
++#line 2070 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 96: /* resolvetype ::= REPLACE */
++#line 263 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_Replace; }
++#line 2075 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 97: /* cmd ::= DROP TABLE nm */
++#line 267 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteDropTable(pParse,&yymsp[0].minor.yy0,0);}
++#line 2080 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 98: /* cmd ::= CREATE temp VIEW nm AS select */
++#line 271 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteCreateView(pParse, &yymsp[-5].minor.yy0, &yymsp[-2].minor.yy0, yymsp[0].minor.yy179, yymsp[-4].minor.yy372);
++}
++#line 2087 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 99: /* cmd ::= DROP VIEW nm */
++#line 274 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteDropTable(pParse, &yymsp[0].minor.yy0, 1);
++}
++#line 2094 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 100: /* cmd ::= select */
++#line 280 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteSelect(pParse, yymsp[0].minor.yy179, SRT_Callback, 0, 0, 0, 0);
++  sqliteSelectDelete(yymsp[0].minor.yy179);
++}
++#line 2102 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 101: /* select ::= oneselect */
++      case 125: /* seltablist_paren ::= select */ yytestcase(yyruleno==125);
++#line 290 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy179 = yymsp[0].minor.yy179;}
++#line 2108 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 102: /* select ::= select multiselect_op oneselect */
++#line 291 "ext/sqlite/libsqlite/src/parse.y"
++{
++  if( yymsp[0].minor.yy179 ){
++    yymsp[0].minor.yy179->op = yymsp[-1].minor.yy372;
++    yymsp[0].minor.yy179->pPrior = yymsp[-2].minor.yy179;
++  }
++  yygotominor.yy179 = yymsp[0].minor.yy179;
++}
++#line 2119 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 103: /* multiselect_op ::= UNION */
++#line 299 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = TK_UNION;}
++#line 2124 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 104: /* multiselect_op ::= UNION ALL */
++#line 300 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = TK_ALL;}
++#line 2129 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 105: /* multiselect_op ::= INTERSECT */
++#line 301 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = TK_INTERSECT;}
++#line 2134 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 106: /* multiselect_op ::= EXCEPT */
++#line 302 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = TK_EXCEPT;}
++#line 2139 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 107: /* oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt */
++#line 304 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy179 = sqliteSelectNew(yymsp[-6].minor.yy322,yymsp[-5].minor.yy307,yymsp[-4].minor.yy242,yymsp[-3].minor.yy322,yymsp[-2].minor.yy242,yymsp[-1].minor.yy322,yymsp[-7].minor.yy372,yymsp[0].minor.yy124.limit,yymsp[0].minor.yy124.offset);
++}
++#line 2146 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 111: /* sclp ::= selcollist COMMA */
++#line 325 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy322 = yymsp[-1].minor.yy322;}
++#line 2151 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 112: /* sclp ::= */
++      case 138: /* orderby_opt ::= */ yytestcase(yyruleno==138);
++      case 148: /* groupby_opt ::= */ yytestcase(yyruleno==148);
++#line 326 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy322 = 0;}
++#line 2158 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 113: /* selcollist ::= sclp expr as */
++#line 327 "ext/sqlite/libsqlite/src/parse.y"
++{
++   yygotominor.yy322 = sqliteExprListAppend(yymsp[-2].minor.yy322,yymsp[-1].minor.yy242,yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
++}
++#line 2165 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 114: /* selcollist ::= sclp STAR */
++#line 330 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy322 = sqliteExprListAppend(yymsp[-1].minor.yy322, sqliteExpr(TK_ALL, 0, 0, 0), 0);
++}
++#line 2172 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 115: /* selcollist ::= sclp nm DOT STAR */
++#line 333 "ext/sqlite/libsqlite/src/parse.y"
++{
++  Expr *pRight = sqliteExpr(TK_ALL, 0, 0, 0);
++  Expr *pLeft = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0);
++  yygotominor.yy322 = sqliteExprListAppend(yymsp[-3].minor.yy322, sqliteExpr(TK_DOT, pLeft, pRight, 0), 0);
++}
++#line 2181 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 116: /* as ::= AS nm */
++      case 117: /* as ::= ids */ yytestcase(yyruleno==117);
++      case 288: /* key_opt ::= USING ids */ yytestcase(yyruleno==288);
++#line 343 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy0 = yymsp[0].minor.yy0; }
++#line 2188 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 118: /* as ::= */
++#line 345 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy0.n = 0; }
++#line 2193 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 119: /* from ::= */
++#line 357 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy307 = sqliteMalloc(sizeof(*yygotominor.yy307));}
++#line 2198 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 120: /* from ::= FROM seltablist */
++#line 358 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy307 = yymsp[0].minor.yy307;}
++#line 2203 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 121: /* stl_prefix ::= seltablist joinop */
++#line 363 "ext/sqlite/libsqlite/src/parse.y"
++{
++   yygotominor.yy307 = yymsp[-1].minor.yy307;
++   if( yygotominor.yy307 && yygotominor.yy307->nSrc>0 ) yygotominor.yy307->a[yygotominor.yy307->nSrc-1].jointype = yymsp[0].minor.yy372;
++}
++#line 2211 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 122: /* stl_prefix ::= */
++#line 367 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy307 = 0;}
++#line 2216 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 123: /* seltablist ::= stl_prefix nm dbnm as on_opt using_opt */
++#line 368 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy307 = sqliteSrcListAppend(yymsp[-5].minor.yy307,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0);
++  if( yymsp[-2].minor.yy0.n ) sqliteSrcListAddAlias(yygotominor.yy307,&yymsp[-2].minor.yy0);
++  if( yymsp[-1].minor.yy242 ){
++    if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pOn = yymsp[-1].minor.yy242; }
++    else { sqliteExprDelete(yymsp[-1].minor.yy242); }
++  }
++  if( yymsp[0].minor.yy320 ){
++    if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pUsing = yymsp[0].minor.yy320; }
++    else { sqliteIdListDelete(yymsp[0].minor.yy320); }
++  }
++}
++#line 2232 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 124: /* seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt */
++#line 381 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy307 = sqliteSrcListAppend(yymsp[-6].minor.yy307,0,0);
++  yygotominor.yy307->a[yygotominor.yy307->nSrc-1].pSelect = yymsp[-4].minor.yy179;
++  if( yymsp[-2].minor.yy0.n ) sqliteSrcListAddAlias(yygotominor.yy307,&yymsp[-2].minor.yy0);
++  if( yymsp[-1].minor.yy242 ){
++    if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pOn = yymsp[-1].minor.yy242; }
++    else { sqliteExprDelete(yymsp[-1].minor.yy242); }
++  }
++  if( yymsp[0].minor.yy320 ){
++    if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pUsing = yymsp[0].minor.yy320; }
++    else { sqliteIdListDelete(yymsp[0].minor.yy320); }
++  }
++}
++#line 2249 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 126: /* seltablist_paren ::= seltablist */
++#line 402 "ext/sqlite/libsqlite/src/parse.y"
++{
++   yygotominor.yy179 = sqliteSelectNew(0,yymsp[0].minor.yy307,0,0,0,0,0,-1,0);
++}
++#line 2256 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 127: /* dbnm ::= */
++#line 407 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy0.z=0; yygotominor.yy0.n=0;}
++#line 2261 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 129: /* joinop ::= COMMA */
++      case 130: /* joinop ::= JOIN */ yytestcase(yyruleno==130);
++#line 412 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = JT_INNER; }
++#line 2267 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 131: /* joinop ::= JOIN_KW JOIN */
++#line 414 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-1].minor.yy0,0,0); }
++#line 2272 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 132: /* joinop ::= JOIN_KW nm JOIN */
++#line 415 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0,0); }
++#line 2277 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 133: /* joinop ::= JOIN_KW nm nm JOIN */
++#line 417 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0); }
++#line 2282 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 134: /* on_opt ::= ON expr */
++      case 142: /* sortitem ::= expr */ yytestcase(yyruleno==142);
++      case 151: /* having_opt ::= HAVING expr */ yytestcase(yyruleno==151);
++      case 158: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==158);
++      case 227: /* case_else ::= ELSE expr */ yytestcase(yyruleno==227);
++      case 229: /* case_operand ::= expr */ yytestcase(yyruleno==229);
++      case 233: /* expritem ::= expr */ yytestcase(yyruleno==233);
++#line 421 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = yymsp[0].minor.yy242;}
++#line 2293 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 135: /* on_opt ::= */
++      case 150: /* having_opt ::= */ yytestcase(yyruleno==150);
++      case 157: /* where_opt ::= */ yytestcase(yyruleno==157);
++      case 228: /* case_else ::= */ yytestcase(yyruleno==228);
++      case 230: /* case_operand ::= */ yytestcase(yyruleno==230);
++      case 234: /* expritem ::= */ yytestcase(yyruleno==234);
++#line 422 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = 0;}
++#line 2303 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 136: /* using_opt ::= USING LP idxlist RP */
++      case 169: /* inscollist_opt ::= LP inscollist RP */ yytestcase(yyruleno==169);
++      case 239: /* idxlist_opt ::= LP idxlist RP */ yytestcase(yyruleno==239);
++#line 426 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy320 = yymsp[-1].minor.yy320;}
++#line 2310 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 137: /* using_opt ::= */
++      case 168: /* inscollist_opt ::= */ yytestcase(yyruleno==168);
++      case 238: /* idxlist_opt ::= */ yytestcase(yyruleno==238);
++#line 427 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy320 = 0;}
++#line 2317 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 139: /* orderby_opt ::= ORDER BY sortlist */
++      case 149: /* groupby_opt ::= GROUP BY exprlist */ yytestcase(yyruleno==149);
++#line 438 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy322 = yymsp[0].minor.yy322;}
++#line 2323 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 140: /* sortlist ::= sortlist COMMA sortitem collate sortorder */
++#line 439 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322,yymsp[-2].minor.yy242,0);
++  if( yygotominor.yy322 ) yygotominor.yy322->a[yygotominor.yy322->nExpr-1].sortOrder = yymsp[-1].minor.yy372+yymsp[0].minor.yy372;
++}
++#line 2331 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 141: /* sortlist ::= sortitem collate sortorder */
++#line 443 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy322 = sqliteExprListAppend(0,yymsp[-2].minor.yy242,0);
++  if( yygotominor.yy322 ) yygotominor.yy322->a[0].sortOrder = yymsp[-1].minor.yy372+yymsp[0].minor.yy372;
++}
++#line 2339 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 143: /* sortorder ::= ASC */
++      case 145: /* sortorder ::= */ yytestcase(yyruleno==145);
++#line 452 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = SQLITE_SO_ASC;}
++#line 2345 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 144: /* sortorder ::= DESC */
++#line 453 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = SQLITE_SO_DESC;}
++#line 2350 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 146: /* collate ::= */
++#line 455 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = SQLITE_SO_UNK;}
++#line 2355 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 147: /* collate ::= COLLATE id */
++#line 456 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = sqliteCollateType(yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n);}
++#line 2360 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 152: /* limit_opt ::= */
++#line 469 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy124.limit = -1; yygotominor.yy124.offset = 0;}
++#line 2365 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 153: /* limit_opt ::= LIMIT signed */
++#line 470 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy124.limit = yymsp[0].minor.yy372; yygotominor.yy124.offset = 0;}
++#line 2370 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 154: /* limit_opt ::= LIMIT signed OFFSET signed */
++#line 472 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy124.limit = yymsp[-2].minor.yy372; yygotominor.yy124.offset = yymsp[0].minor.yy372;}
++#line 2375 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 155: /* limit_opt ::= LIMIT signed COMMA signed */
++#line 474 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy124.limit = yymsp[0].minor.yy372; yygotominor.yy124.offset = yymsp[-2].minor.yy372;}
++#line 2380 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 156: /* cmd ::= DELETE FROM nm dbnm where_opt */
++#line 478 "ext/sqlite/libsqlite/src/parse.y"
++{
++   sqliteDeleteFrom(pParse, sqliteSrcListAppend(0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0), yymsp[0].minor.yy242);
++}
++#line 2387 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 159: /* cmd ::= UPDATE orconf nm dbnm SET setlist where_opt */
++#line 494 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteUpdate(pParse,sqliteSrcListAppend(0,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0),yymsp[-1].minor.yy322,yymsp[0].minor.yy242,yymsp[-5].minor.yy372);}
++#line 2392 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 160: /* setlist ::= setlist COMMA nm EQ expr */
++#line 497 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322,yymsp[0].minor.yy242,&yymsp[-2].minor.yy0);}
++#line 2397 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 161: /* setlist ::= nm EQ expr */
++#line 498 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy322 = sqliteExprListAppend(0,yymsp[0].minor.yy242,&yymsp[-2].minor.yy0);}
++#line 2402 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 162: /* cmd ::= insert_cmd INTO nm dbnm inscollist_opt VALUES LP itemlist RP */
++#line 504 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteInsert(pParse, sqliteSrcListAppend(0,&yymsp[-6].minor.yy0,&yymsp[-5].minor.yy0), yymsp[-1].minor.yy322, 0, yymsp[-4].minor.yy320, yymsp[-8].minor.yy372);}
++#line 2407 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 163: /* cmd ::= insert_cmd INTO nm dbnm inscollist_opt select */
++#line 506 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteInsert(pParse, sqliteSrcListAppend(0,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0), 0, yymsp[0].minor.yy179, yymsp[-1].minor.yy320, yymsp[-5].minor.yy372);}
++#line 2412 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 165: /* insert_cmd ::= REPLACE */
++#line 510 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = OE_Replace;}
++#line 2417 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 166: /* itemlist ::= itemlist COMMA expr */
++      case 231: /* exprlist ::= exprlist COMMA expritem */ yytestcase(yyruleno==231);
++#line 516 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy322 = sqliteExprListAppend(yymsp[-2].minor.yy322,yymsp[0].minor.yy242,0);}
++#line 2423 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 167: /* itemlist ::= expr */
++      case 232: /* exprlist ::= expritem */ yytestcase(yyruleno==232);
++#line 517 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy322 = sqliteExprListAppend(0,yymsp[0].minor.yy242,0);}
++#line 2429 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 170: /* inscollist ::= inscollist COMMA nm */
++      case 240: /* idxlist ::= idxlist COMMA idxitem */ yytestcase(yyruleno==240);
++#line 526 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy320 = sqliteIdListAppend(yymsp[-2].minor.yy320,&yymsp[0].minor.yy0);}
++#line 2435 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 171: /* inscollist ::= nm */
++      case 241: /* idxlist ::= idxitem */ yytestcase(yyruleno==241);
++#line 527 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy320 = sqliteIdListAppend(0,&yymsp[0].minor.yy0);}
++#line 2441 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 172: /* expr ::= LP expr RP */
++#line 535 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = yymsp[-1].minor.yy242; sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); }
++#line 2446 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 173: /* expr ::= NULL */
++#line 536 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_NULL, 0, 0, &yymsp[0].minor.yy0);}
++#line 2451 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 174: /* expr ::= ID */
++      case 175: /* expr ::= JOIN_KW */ yytestcase(yyruleno==175);
++#line 537 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0);}
++#line 2457 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 176: /* expr ::= nm DOT nm */
++#line 539 "ext/sqlite/libsqlite/src/parse.y"
++{
++  Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0);
++  Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0);
++  yygotominor.yy242 = sqliteExpr(TK_DOT, temp1, temp2, 0);
++}
++#line 2466 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 177: /* expr ::= nm DOT nm DOT nm */
++#line 544 "ext/sqlite/libsqlite/src/parse.y"
++{
++  Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &yymsp[-4].minor.yy0);
++  Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0);
++  Expr *temp3 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0);
++  Expr *temp4 = sqliteExpr(TK_DOT, temp2, temp3, 0);
++  yygotominor.yy242 = sqliteExpr(TK_DOT, temp1, temp4, 0);
++}
++#line 2477 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 178: /* expr ::= INTEGER */
++#line 551 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_INTEGER, 0, 0, &yymsp[0].minor.yy0);}
++#line 2482 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 179: /* expr ::= FLOAT */
++#line 552 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_FLOAT, 0, 0, &yymsp[0].minor.yy0);}
++#line 2487 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 180: /* expr ::= STRING */
++#line 553 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_STRING, 0, 0, &yymsp[0].minor.yy0);}
++#line 2492 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 181: /* expr ::= VARIABLE */
++#line 554 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_VARIABLE, 0, 0, &yymsp[0].minor.yy0);
++  if( yygotominor.yy242 ) yygotominor.yy242->iTable = ++pParse->nVar;
++}
++#line 2500 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 182: /* expr ::= ID LP exprlist RP */
++#line 558 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExprFunction(yymsp[-1].minor.yy322, &yymsp[-3].minor.yy0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
++}
++#line 2508 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 183: /* expr ::= ID LP STAR RP */
++#line 562 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExprFunction(0, &yymsp[-3].minor.yy0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
++}
++#line 2516 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 184: /* expr ::= expr AND expr */
++#line 566 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_AND, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2521 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 185: /* expr ::= expr OR expr */
++#line 567 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_OR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2526 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 186: /* expr ::= expr LT expr */
++#line 568 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_LT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2531 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 187: /* expr ::= expr GT expr */
++#line 569 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_GT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2536 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 188: /* expr ::= expr LE expr */
++#line 570 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_LE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2541 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 189: /* expr ::= expr GE expr */
++#line 571 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_GE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2546 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 190: /* expr ::= expr NE expr */
++#line 572 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_NE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2551 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 191: /* expr ::= expr EQ expr */
++#line 573 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_EQ, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2556 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 192: /* expr ::= expr BITAND expr */
++#line 574 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_BITAND, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2561 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 193: /* expr ::= expr BITOR expr */
++#line 575 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_BITOR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2566 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 194: /* expr ::= expr LSHIFT expr */
++#line 576 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_LSHIFT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2571 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 195: /* expr ::= expr RSHIFT expr */
++#line 577 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_RSHIFT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2576 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 196: /* expr ::= expr likeop expr */
++#line 578 "ext/sqlite/libsqlite/src/parse.y"
++{
++  ExprList *pList = sqliteExprListAppend(0, yymsp[0].minor.yy242, 0);
++  pList = sqliteExprListAppend(pList, yymsp[-2].minor.yy242, 0);
++  yygotominor.yy242 = sqliteExprFunction(pList, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->op = yymsp[-1].minor.yy372;
++  sqliteExprSpan(yygotominor.yy242, &yymsp[-2].minor.yy242->span, &yymsp[0].minor.yy242->span);
++}
++#line 2587 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 197: /* expr ::= expr NOT likeop expr */
++#line 585 "ext/sqlite/libsqlite/src/parse.y"
++{
++  ExprList *pList = sqliteExprListAppend(0, yymsp[0].minor.yy242, 0);
++  pList = sqliteExprListAppend(pList, yymsp[-3].minor.yy242, 0);
++  yygotominor.yy242 = sqliteExprFunction(pList, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->op = yymsp[-1].minor.yy372;
++  yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,&yymsp[0].minor.yy242->span);
++}
++#line 2599 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 198: /* likeop ::= LIKE */
++#line 594 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = TK_LIKE;}
++#line 2604 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 199: /* likeop ::= GLOB */
++#line 595 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy372 = TK_GLOB;}
++#line 2609 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 200: /* expr ::= expr PLUS expr */
++#line 596 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_PLUS, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2614 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 201: /* expr ::= expr MINUS expr */
++#line 597 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_MINUS, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2619 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 202: /* expr ::= expr STAR expr */
++#line 598 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_STAR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2624 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 203: /* expr ::= expr SLASH expr */
++#line 599 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_SLASH, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2629 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 204: /* expr ::= expr REM expr */
++#line 600 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_REM, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2634 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 205: /* expr ::= expr CONCAT expr */
++#line 601 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy242 = sqliteExpr(TK_CONCAT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);}
++#line 2639 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 206: /* expr ::= expr ISNULL */
++#line 602 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_ISNULL, yymsp[-1].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2647 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 207: /* expr ::= expr IS NULL */
++#line 606 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_ISNULL, yymsp[-2].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2655 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 208: /* expr ::= expr NOTNULL */
++#line 610 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-1].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2663 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 209: /* expr ::= expr NOT NULL */
++#line 614 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-2].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2671 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 210: /* expr ::= expr IS NOT NULL */
++#line 618 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-3].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2679 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 211: /* expr ::= NOT expr */
++#line 622 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_NOT, yymsp[0].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span);
++}
++#line 2687 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 212: /* expr ::= BITNOT expr */
++#line 626 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_BITNOT, yymsp[0].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span);
++}
++#line 2695 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 213: /* expr ::= MINUS expr */
++#line 630 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_UMINUS, yymsp[0].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span);
++}
++#line 2703 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 214: /* expr ::= PLUS expr */
++#line 634 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_UPLUS, yymsp[0].minor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span);
++}
++#line 2711 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 215: /* expr ::= LP select RP */
++#line 638 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_SELECT, 0, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179;
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
++}
++#line 2720 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 216: /* expr ::= expr BETWEEN expr AND expr */
++#line 643 "ext/sqlite/libsqlite/src/parse.y"
++{
++  ExprList *pList = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0);
++  pList = sqliteExprListAppend(pList, yymsp[0].minor.yy242, 0);
++  yygotominor.yy242 = sqliteExpr(TK_BETWEEN, yymsp[-4].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pList = pList;
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy242->span);
++}
++#line 2731 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 217: /* expr ::= expr NOT BETWEEN expr AND expr */
++#line 650 "ext/sqlite/libsqlite/src/parse.y"
++{
++  ExprList *pList = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0);
++  pList = sqliteExprListAppend(pList, yymsp[0].minor.yy242, 0);
++  yygotominor.yy242 = sqliteExpr(TK_BETWEEN, yymsp[-5].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pList = pList;
++  yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy242->span);
++}
++#line 2743 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 218: /* expr ::= expr IN LP exprlist RP */
++#line 658 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-1].minor.yy322;
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2752 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 219: /* expr ::= expr IN LP select RP */
++#line 663 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179;
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2761 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 220: /* expr ::= expr NOT IN LP exprlist RP */
++#line 668 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-5].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-1].minor.yy322;
++  yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2771 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 221: /* expr ::= expr NOT IN LP select RP */
++#line 674 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-5].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179;
++  yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy0);
++}
++#line 2781 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 222: /* expr ::= expr IN nm dbnm */
++#line 680 "ext/sqlite/libsqlite/src/parse.y"
++{
++  SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);
++  yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-3].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,yymsp[0].minor.yy0.z?&yymsp[0].minor.yy0:&yymsp[-1].minor.yy0);
++}
++#line 2791 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 223: /* expr ::= expr NOT IN nm dbnm */
++#line 686 "ext/sqlite/libsqlite/src/parse.y"
++{
++  SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);
++  yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0);
++  yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0);
++  sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,yymsp[0].minor.yy0.z?&yymsp[0].minor.yy0:&yymsp[-1].minor.yy0);
++}
++#line 2802 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 224: /* expr ::= CASE case_operand case_exprlist case_else END */
++#line 696 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_CASE, yymsp[-3].minor.yy242, yymsp[-1].minor.yy242, 0);
++  if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-2].minor.yy322;
++  sqliteExprSpan(yygotominor.yy242, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0);
++}
++#line 2811 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 225: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */
++#line 703 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322, yymsp[-2].minor.yy242, 0);
++  yygotominor.yy322 = sqliteExprListAppend(yygotominor.yy322, yymsp[0].minor.yy242, 0);
++}
++#line 2819 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 226: /* case_exprlist ::= WHEN expr THEN expr */
++#line 707 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy322 = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0);
++  yygotominor.yy322 = sqliteExprListAppend(yygotominor.yy322, yymsp[0].minor.yy242, 0);
++}
++#line 2827 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 235: /* cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf */
++#line 732 "ext/sqlite/libsqlite/src/parse.y"
++{
++  SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-5].minor.yy0, &yymsp[-4].minor.yy0);
++  if( yymsp[-9].minor.yy372!=OE_None ) yymsp[-9].minor.yy372 = yymsp[0].minor.yy372;
++  if( yymsp[-9].minor.yy372==OE_Default) yymsp[-9].minor.yy372 = OE_Abort;
++  sqliteCreateIndex(pParse, &yymsp[-7].minor.yy0, pSrc, yymsp[-2].minor.yy320, yymsp[-9].minor.yy372, &yymsp[-10].minor.yy0, &yymsp[-1].minor.yy0);
++}
++#line 2837 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 237: /* uniqueflag ::= */
++#line 741 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = OE_None; }
++#line 2842 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 243: /* cmd ::= DROP INDEX nm dbnm */
++#line 758 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteDropIndex(pParse, sqliteSrcListAppend(0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0));
++}
++#line 2849 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 244: /* cmd ::= COPY orconf nm dbnm FROM nm USING DELIMITERS STRING */
++#line 766 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteCopy(pParse,sqliteSrcListAppend(0,&yymsp[-6].minor.yy0,&yymsp[-5].minor.yy0),&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0,yymsp[-7].minor.yy372);}
++#line 2854 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 245: /* cmd ::= COPY orconf nm dbnm FROM nm */
++#line 768 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteCopy(pParse,sqliteSrcListAppend(0,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0),&yymsp[0].minor.yy0,0,yymsp[-4].minor.yy372);}
++#line 2859 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 246: /* cmd ::= VACUUM */
++#line 772 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteVacuum(pParse,0);}
++#line 2864 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 247: /* cmd ::= VACUUM nm */
++#line 773 "ext/sqlite/libsqlite/src/parse.y"
++{sqliteVacuum(pParse,&yymsp[0].minor.yy0);}
++#line 2869 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 248: /* cmd ::= PRAGMA ids EQ nm */
++      case 249: /* cmd ::= PRAGMA ids EQ ON */ yytestcase(yyruleno==249);
++      case 250: /* cmd ::= PRAGMA ids EQ plus_num */ yytestcase(yyruleno==250);
++#line 777 "ext/sqlite/libsqlite/src/parse.y"
++{sqlitePragma(pParse,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,0);}
++#line 2876 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 251: /* cmd ::= PRAGMA ids EQ minus_num */
++#line 780 "ext/sqlite/libsqlite/src/parse.y"
++{sqlitePragma(pParse,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,1);}
++#line 2881 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 252: /* cmd ::= PRAGMA ids LP nm RP */
++#line 781 "ext/sqlite/libsqlite/src/parse.y"
++{sqlitePragma(pParse,&yymsp[-3].minor.yy0,&yymsp[-1].minor.yy0,0);}
++#line 2886 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 253: /* cmd ::= PRAGMA ids */
++#line 782 "ext/sqlite/libsqlite/src/parse.y"
++{sqlitePragma(pParse,&yymsp[0].minor.yy0,&yymsp[0].minor.yy0,0);}
++#line 2891 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 260: /* cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END */
++#line 792 "ext/sqlite/libsqlite/src/parse.y"
++{
++  Token all;
++  all.z = yymsp[-4].minor.yy0.z;
++  all.n = (yymsp[0].minor.yy0.z - yymsp[-4].minor.yy0.z) + yymsp[0].minor.yy0.n;
++  sqliteFinishTrigger(pParse, yymsp[-1].minor.yy19, &all);
++}
++#line 2901 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 261: /* trigger_decl ::= temp TRIGGER nm trigger_time trigger_event ON nm dbnm foreach_clause when_clause */
++#line 800 "ext/sqlite/libsqlite/src/parse.y"
++{
++  SrcList *pTab = sqliteSrcListAppend(0, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0);
++  sqliteBeginTrigger(pParse, &yymsp[-7].minor.yy0, yymsp[-6].minor.yy372, yymsp[-5].minor.yy290.a, yymsp[-5].minor.yy290.b, pTab, yymsp[-1].minor.yy372, yymsp[0].minor.yy182, yymsp[-9].minor.yy372);
++}
++#line 2909 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 262: /* trigger_time ::= BEFORE */
++      case 265: /* trigger_time ::= */ yytestcase(yyruleno==265);
++#line 806 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = TK_BEFORE; }
++#line 2915 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 263: /* trigger_time ::= AFTER */
++#line 807 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = TK_AFTER;  }
++#line 2920 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 264: /* trigger_time ::= INSTEAD OF */
++#line 808 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = TK_INSTEAD;}
++#line 2925 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 266: /* trigger_event ::= DELETE */
++#line 813 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy290.a = TK_DELETE; yygotominor.yy290.b = 0; }
++#line 2930 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 267: /* trigger_event ::= INSERT */
++#line 814 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy290.a = TK_INSERT; yygotominor.yy290.b = 0; }
++#line 2935 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 268: /* trigger_event ::= UPDATE */
++#line 815 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy290.a = TK_UPDATE; yygotominor.yy290.b = 0;}
++#line 2940 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 269: /* trigger_event ::= UPDATE OF inscollist */
++#line 816 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy290.a = TK_UPDATE; yygotominor.yy290.b = yymsp[0].minor.yy320; }
++#line 2945 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 270: /* foreach_clause ::= */
++      case 271: /* foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==271);
++#line 819 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = TK_ROW; }
++#line 2951 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 272: /* foreach_clause ::= FOR EACH STATEMENT */
++#line 821 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy372 = TK_STATEMENT; }
++#line 2956 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 273: /* when_clause ::= */
++#line 824 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy182 = 0; }
++#line 2961 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 274: /* when_clause ::= WHEN expr */
++#line 825 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy182 = yymsp[0].minor.yy242; }
++#line 2966 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 275: /* trigger_cmd_list ::= trigger_cmd SEMI trigger_cmd_list */
++#line 829 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yymsp[-2].minor.yy19->pNext = yymsp[0].minor.yy19;
++  yygotominor.yy19 = yymsp[-2].minor.yy19;
++}
++#line 2974 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 276: /* trigger_cmd_list ::= */
++#line 833 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy19 = 0; }
++#line 2979 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 277: /* trigger_cmd ::= UPDATE orconf nm SET setlist where_opt */
++#line 839 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy19 = sqliteTriggerUpdateStep(&yymsp[-3].minor.yy0, yymsp[-1].minor.yy322, yymsp[0].minor.yy242, yymsp[-4].minor.yy372); }
++#line 2984 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 278: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP */
++#line 844 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy19 = sqliteTriggerInsertStep(&yymsp[-5].minor.yy0, yymsp[-4].minor.yy320, yymsp[-1].minor.yy322, 0, yymsp[-7].minor.yy372);}
++#line 2989 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 279: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt select */
++#line 847 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy19 = sqliteTriggerInsertStep(&yymsp[-2].minor.yy0, yymsp[-1].minor.yy320, 0, yymsp[0].minor.yy179, yymsp[-4].minor.yy372);}
++#line 2994 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 280: /* trigger_cmd ::= DELETE FROM nm where_opt */
++#line 851 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy19 = sqliteTriggerDeleteStep(&yymsp[-1].minor.yy0, yymsp[0].minor.yy242);}
++#line 2999 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 281: /* trigger_cmd ::= select */
++#line 854 "ext/sqlite/libsqlite/src/parse.y"
++{yygotominor.yy19 = sqliteTriggerSelectStep(yymsp[0].minor.yy179); }
++#line 3004 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 282: /* expr ::= RAISE LP IGNORE RP */
++#line 857 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, 0); 
++  yygotominor.yy242->iColumn = OE_Ignore;
++  sqliteExprSpan(yygotominor.yy242, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
++}
++#line 3013 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 283: /* expr ::= RAISE LP ROLLBACK COMMA nm RP */
++#line 862 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); 
++  yygotominor.yy242->iColumn = OE_Rollback;
++  sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0);
++}
++#line 3022 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 284: /* expr ::= RAISE LP ABORT COMMA nm RP */
++#line 867 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); 
++  yygotominor.yy242->iColumn = OE_Abort;
++  sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0);
++}
++#line 3031 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 285: /* expr ::= RAISE LP FAIL COMMA nm RP */
++#line 872 "ext/sqlite/libsqlite/src/parse.y"
++{
++  yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); 
++  yygotominor.yy242->iColumn = OE_Fail;
++  sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0);
++}
++#line 3040 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 286: /* cmd ::= DROP TRIGGER nm dbnm */
++#line 879 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteDropTrigger(pParse,sqliteSrcListAppend(0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0));
++}
++#line 3047 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 287: /* cmd ::= ATTACH database_kw_opt ids AS nm key_opt */
++#line 884 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteAttach(pParse, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);
++}
++#line 3054 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 289: /* key_opt ::= */
++#line 889 "ext/sqlite/libsqlite/src/parse.y"
++{ yygotominor.yy0.z = 0; yygotominor.yy0.n = 0; }
++#line 3059 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      case 292: /* cmd ::= DETACH database_kw_opt nm */
++#line 895 "ext/sqlite/libsqlite/src/parse.y"
++{
++  sqliteDetach(pParse, &yymsp[0].minor.yy0);
++}
++#line 3066 "ext/sqlite/libsqlite/src/parse.c"
++        break;
++      default:
++      /* (0) input ::= cmdlist */ yytestcase(yyruleno==0);
++      /* (1) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==1);
++      /* (2) cmdlist ::= ecmd */ yytestcase(yyruleno==2);
++      /* (3) ecmd ::= explain cmdx SEMI */ yytestcase(yyruleno==3);
++      /* (4) ecmd ::= SEMI */ yytestcase(yyruleno==4);
++      /* (9) trans_opt ::= */ yytestcase(yyruleno==9);
++      /* (10) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==10);
++      /* (11) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==11);
++      /* (15) cmd ::= create_table create_table_args */ yytestcase(yyruleno==15);
++      /* (21) columnlist ::= columnlist COMMA column */ yytestcase(yyruleno==21);
++      /* (22) columnlist ::= column */ yytestcase(yyruleno==22);
++      /* (23) column ::= columnid type carglist */ yytestcase(yyruleno==23);
++      /* (31) type ::= */ yytestcase(yyruleno==31);
++      /* (40) carglist ::= carglist carg */ yytestcase(yyruleno==40);
++      /* (41) carglist ::= */ yytestcase(yyruleno==41);
++      /* (42) carg ::= CONSTRAINT nm ccons */ yytestcase(yyruleno==42);
++      /* (43) carg ::= ccons */ yytestcase(yyruleno==43);
++      /* (52) carg ::= DEFAULT NULL */ yytestcase(yyruleno==52);
++      /* (53) ccons ::= NULL onconf */ yytestcase(yyruleno==53);
++      /* (76) conslist_opt ::= */ yytestcase(yyruleno==76);
++      /* (77) conslist_opt ::= COMMA conslist */ yytestcase(yyruleno==77);
++      /* (78) conslist ::= conslist COMMA tcons */ yytestcase(yyruleno==78);
++      /* (79) conslist ::= conslist tcons */ yytestcase(yyruleno==79);
++      /* (80) conslist ::= tcons */ yytestcase(yyruleno==80);
++      /* (81) tcons ::= CONSTRAINT nm */ yytestcase(yyruleno==81);
++      /* (258) plus_opt ::= PLUS */ yytestcase(yyruleno==258);
++      /* (259) plus_opt ::= */ yytestcase(yyruleno==259);
++      /* (290) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==290);
++      /* (291) database_kw_opt ::= */ yytestcase(yyruleno==291);
++        break;
++  };
++  yygoto = yyRuleInfo[yyruleno].lhs;
++  yysize = yyRuleInfo[yyruleno].nrhs;
++  yypParser->yyidx -= yysize;
++  yyact = yy_find_reduce_action(yymsp[-yysize].stateno,(YYCODETYPE)yygoto);
++  if( yyact < YYNSTATE ){
++#ifdef NDEBUG
++    /* If we are not debugging and the reduce action popped at least
++    ** one element off the stack, then we can push the new element back
++    ** onto the stack here, and skip the stack overflow test in yy_shift().
++    ** That gives a significant speed improvement. */
++    if( yysize ){
++      yypParser->yyidx++;
++      yymsp -= yysize-1;
++      yymsp->stateno = (YYACTIONTYPE)yyact;
++      yymsp->major = (YYCODETYPE)yygoto;
++      yymsp->minor = yygotominor;
++    }else
++#endif
++    {
++      yy_shift(yypParser,yyact,yygoto,&yygotominor);
++    }
++  }else{
++    assert( yyact == YYNSTATE + YYNRULE + 1 );
++    yy_accept(yypParser);
++  }
++}
++
++/*
++** The following code executes when the parse fails
++*/
++#ifndef YYNOERRORRECOVERY
++static void yy_parse_failed(
++  yyParser *yypParser           /* The parser */
++){
++  sqliteParserARG_FETCH;
++#ifndef NDEBUG
++  if( yyTraceFILE ){
++    fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt);
++  }
++#endif
++  while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
++  /* Here code is inserted which will be executed whenever the
++  ** parser fails */
++  sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
++}
++#endif /* YYNOERRORRECOVERY */
++
++/*
++** The following code executes when a syntax error first occurs.
++*/
++static void yy_syntax_error(
++  yyParser *yypParser,           /* The parser */
++  int yymajor,                   /* The major type of the error token */
++  YYMINORTYPE yyminor            /* The minor type of the error token */
++){
++  sqliteParserARG_FETCH;
++#define TOKEN (yyminor.yy0)
++#line 23 "ext/sqlite/libsqlite/src/parse.y"
++
++  if( pParse->zErrMsg==0 ){
++    if( TOKEN.z[0] ){
++      sqliteErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN);
++    }else{
++      sqliteErrorMsg(pParse, "incomplete SQL statement");
++    }
++  }
++#line 3166 "ext/sqlite/libsqlite/src/parse.c"
++  sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
++}
++
++/*
++** The following is executed when the parser accepts
++*/
++static void yy_accept(
++  yyParser *yypParser           /* The parser */
++){
++  sqliteParserARG_FETCH;
++#ifndef NDEBUG
++  if( yyTraceFILE ){
++    fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt);
++  }
++#endif
++  while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
++  /* Here code is inserted which will be executed whenever the
++  ** parser accepts */
++  sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
++}
++
++/* The main parser program.
++** The first argument is a pointer to a structure obtained from
++** "sqliteParserAlloc" which describes the current state of the parser.
++** The second argument is the major token number.  The third is
++** the minor token.  The fourth optional argument is whatever the
++** user wants (and specified in the grammar) and is available for
++** use by the action routines.
++**
++** Inputs:
++** <ul>
++** <li> A pointer to the parser (an opaque structure.)
++** <li> The major token number.
++** <li> The minor token number.
++** <li> An option argument of a grammar-specified type.
++** </ul>
++**
++** Outputs:
++** None.
++*/
++void sqliteParser(
++  void *yyp,                   /* The parser */
++  int yymajor,                 /* The major token code number */
++  sqliteParserTOKENTYPE yyminor       /* The value for the token */
++  sqliteParserARG_PDECL               /* Optional %extra_argument parameter */
++){
++  YYMINORTYPE yyminorunion;
++  int yyact;            /* The parser action. */
++  int yyendofinput;     /* True if we are at the end of input */
++#ifdef YYERRORSYMBOL
++  int yyerrorhit = 0;   /* True if yymajor has invoked an error */
++#endif
++  yyParser *yypParser;  /* The parser */
++
++  /* (re)initialize the parser, if necessary */
++  yypParser = (yyParser*)yyp;
++  if( yypParser->yyidx<0 ){
++#if YYSTACKDEPTH<=0
++    if( yypParser->yystksz <=0 ){
++      /*memset(&yyminorunion, 0, sizeof(yyminorunion));*/
++      yyminorunion = yyzerominor;
++      yyStackOverflow(yypParser, &yyminorunion);
++      return;
++    }
++#endif
++    yypParser->yyidx = 0;
++    yypParser->yyerrcnt = -1;
++    yypParser->yystack[0].stateno = 0;
++    yypParser->yystack[0].major = 0;
++  }
++  yyminorunion.yy0 = yyminor;
++  yyendofinput = (yymajor==0);
++  sqliteParserARG_STORE;
++
++#ifndef NDEBUG
++  if( yyTraceFILE ){
++    fprintf(yyTraceFILE,"%sInput %s\n",yyTracePrompt,yyTokenName[yymajor]);
++  }
++#endif
++
++  do{
++    yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor);
++    if( yyact<YYNSTATE ){
++      assert( !yyendofinput );  /* Impossible to shift the $ token */
++      yy_shift(yypParser,yyact,yymajor,&yyminorunion);
++      yypParser->yyerrcnt--;
++      yymajor = YYNOCODE;
++    }else if( yyact < YYNSTATE + YYNRULE ){
++      yy_reduce(yypParser,yyact-YYNSTATE);
++    }else{
++      assert( yyact == YY_ERROR_ACTION );
++#ifdef YYERRORSYMBOL
++      int yymx;
++#endif
++#ifndef NDEBUG
++      if( yyTraceFILE ){
++        fprintf(yyTraceFILE,"%sSyntax Error!\n",yyTracePrompt);
++      }
++#endif
++#ifdef YYERRORSYMBOL
++      /* A syntax error has occurred.
++      ** The response to an error depends upon whether or not the
++      ** grammar defines an error token "ERROR".  
++      **
++      ** This is what we do if the grammar does define ERROR:
++      **
++      **  * Call the %syntax_error function.
++      **
++      **  * Begin popping the stack until we enter a state where
++      **    it is legal to shift the error symbol, then shift
++      **    the error symbol.
++      **
++      **  * Set the error count to three.
++      **
++      **  * Begin accepting and shifting new tokens.  No new error
++      **    processing will occur until three tokens have been
++      **    shifted successfully.
++      **
++      */
++      if( yypParser->yyerrcnt<0 ){
++        yy_syntax_error(yypParser,yymajor,yyminorunion);
++      }
++      yymx = yypParser->yystack[yypParser->yyidx].major;
++      if( yymx==YYERRORSYMBOL || yyerrorhit ){
++#ifndef NDEBUG
++        if( yyTraceFILE ){
++          fprintf(yyTraceFILE,"%sDiscard input token %s\n",
++             yyTracePrompt,yyTokenName[yymajor]);
++        }
++#endif
++        yy_destructor(yypParser, (YYCODETYPE)yymajor,&yyminorunion);
++        yymajor = YYNOCODE;
++      }else{
++         while(
++          yypParser->yyidx >= 0 &&
++          yymx != YYERRORSYMBOL &&
++          (yyact = yy_find_reduce_action(
++                        yypParser->yystack[yypParser->yyidx].stateno,
++                        YYERRORSYMBOL)) >= YYNSTATE
++        ){
++          yy_pop_parser_stack(yypParser);
++        }
++        if( yypParser->yyidx < 0 || yymajor==0 ){
++          yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
++          yy_parse_failed(yypParser);
++          yymajor = YYNOCODE;
++        }else if( yymx!=YYERRORSYMBOL ){
++          YYMINORTYPE u2;
++          u2.YYERRSYMDT = 0;
++          yy_shift(yypParser,yyact,YYERRORSYMBOL,&u2);
++        }
++      }
++      yypParser->yyerrcnt = 3;
++      yyerrorhit = 1;
++#elif defined(YYNOERRORRECOVERY)
++      /* If the YYNOERRORRECOVERY macro is defined, then do not attempt to
++      ** do any kind of error recovery.  Instead, simply invoke the syntax
++      ** error routine and continue going as if nothing had happened.
++      **
++      ** Applications can set this macro (for example inside %include) if
++      ** they intend to abandon the parse upon the first syntax error seen.
++      */
++      yy_syntax_error(yypParser,yymajor,yyminorunion);
++      yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
++      yymajor = YYNOCODE;
++      
++#else  /* YYERRORSYMBOL is not defined */
++      /* This is what we do if the grammar does not define ERROR:
++      **
++      **  * Report an error message, and throw away the input token.
++      **
++      **  * If the input token is $, then fail the parse.
++      **
++      ** As before, subsequent error messages are suppressed until
++      ** three input tokens have been successfully shifted.
++      */
++      if( yypParser->yyerrcnt<=0 ){
++        yy_syntax_error(yypParser,yymajor,yyminorunion);
++      }
++      yypParser->yyerrcnt = 3;
++      yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
++      if( yyendofinput ){
++        yy_parse_failed(yypParser);
++      }
++      yymajor = YYNOCODE;
++#endif
++    }
++  }while( yymajor!=YYNOCODE && yypParser->yyidx>=0 );
++  return;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/parse.h
+@@ -0,0 +1,130 @@
++#define TK_END_OF_FILE                     1
++#define TK_ILLEGAL                         2
++#define TK_SPACE                           3
++#define TK_UNCLOSED_STRING                 4
++#define TK_COMMENT                         5
++#define TK_FUNCTION                        6
++#define TK_COLUMN                          7
++#define TK_AGG_FUNCTION                    8
++#define TK_SEMI                            9
++#define TK_EXPLAIN                        10
++#define TK_BEGIN                          11
++#define TK_TRANSACTION                    12
++#define TK_COMMIT                         13
++#define TK_END                            14
++#define TK_ROLLBACK                       15
++#define TK_CREATE                         16
++#define TK_TABLE                          17
++#define TK_TEMP                           18
++#define TK_LP                             19
++#define TK_RP                             20
++#define TK_AS                             21
++#define TK_COMMA                          22
++#define TK_ID                             23
++#define TK_ABORT                          24
++#define TK_AFTER                          25
++#define TK_ASC                            26
++#define TK_ATTACH                         27
++#define TK_BEFORE                         28
++#define TK_CASCADE                        29
++#define TK_CLUSTER                        30
++#define TK_CONFLICT                       31
++#define TK_COPY                           32
++#define TK_DATABASE                       33
++#define TK_DEFERRED                       34
++#define TK_DELIMITERS                     35
++#define TK_DESC                           36
++#define TK_DETACH                         37
++#define TK_EACH                           38
++#define TK_FAIL                           39
++#define TK_FOR                            40
++#define TK_GLOB                           41
++#define TK_IGNORE                         42
++#define TK_IMMEDIATE                      43
++#define TK_INITIALLY                      44
++#define TK_INSTEAD                        45
++#define TK_LIKE                           46
++#define TK_MATCH                          47
++#define TK_KEY                            48
++#define TK_OF                             49
++#define TK_OFFSET                         50
++#define TK_PRAGMA                         51
++#define TK_RAISE                          52
++#define TK_REPLACE                        53
++#define TK_RESTRICT                       54
++#define TK_ROW                            55
++#define TK_STATEMENT                      56
++#define TK_TRIGGER                        57
++#define TK_VACUUM                         58
++#define TK_VIEW                           59
++#define TK_OR                             60
++#define TK_AND                            61
++#define TK_NOT                            62
++#define TK_EQ                             63
++#define TK_NE                             64
++#define TK_ISNULL                         65
++#define TK_NOTNULL                        66
++#define TK_IS                             67
++#define TK_BETWEEN                        68
++#define TK_IN                             69
++#define TK_GT                             70
++#define TK_GE                             71
++#define TK_LT                             72
++#define TK_LE                             73
++#define TK_BITAND                         74
++#define TK_BITOR                          75
++#define TK_LSHIFT                         76
++#define TK_RSHIFT                         77
++#define TK_PLUS                           78
++#define TK_MINUS                          79
++#define TK_STAR                           80
++#define TK_SLASH                          81
++#define TK_REM                            82
++#define TK_CONCAT                         83
++#define TK_UMINUS                         84
++#define TK_UPLUS                          85
++#define TK_BITNOT                         86
++#define TK_STRING                         87
++#define TK_JOIN_KW                        88
++#define TK_INTEGER                        89
++#define TK_CONSTRAINT                     90
++#define TK_DEFAULT                        91
++#define TK_FLOAT                          92
++#define TK_NULL                           93
++#define TK_PRIMARY                        94
++#define TK_UNIQUE                         95
++#define TK_CHECK                          96
++#define TK_REFERENCES                     97
++#define TK_COLLATE                        98
++#define TK_ON                             99
++#define TK_DELETE                         100
++#define TK_UPDATE                         101
++#define TK_INSERT                         102
++#define TK_SET                            103
++#define TK_DEFERRABLE                     104
++#define TK_FOREIGN                        105
++#define TK_DROP                           106
++#define TK_UNION                          107
++#define TK_ALL                            108
++#define TK_INTERSECT                      109
++#define TK_EXCEPT                         110
++#define TK_SELECT                         111
++#define TK_DISTINCT                       112
++#define TK_DOT                            113
++#define TK_FROM                           114
++#define TK_JOIN                           115
++#define TK_USING                          116
++#define TK_ORDER                          117
++#define TK_BY                             118
++#define TK_GROUP                          119
++#define TK_HAVING                         120
++#define TK_LIMIT                          121
++#define TK_WHERE                          122
++#define TK_INTO                           123
++#define TK_VALUES                         124
++#define TK_VARIABLE                       125
++#define TK_CASE                           126
++#define TK_WHEN                           127
++#define TK_THEN                           128
++#define TK_ELSE                           129
++#define TK_INDEX                          130
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/parse.y
+@@ -0,0 +1,897 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains SQLite's grammar for SQL.  Process this file
++** using the lemon parser generator to generate C code that runs
++** the parser.  Lemon will also generate a header file containing
++** numeric codes for all of the tokens.
++**
++** @(#) $Id$
++*/
++%token_prefix TK_
++%token_type {Token}
++%default_type {Token}
++%extra_argument {Parse *pParse}
++%syntax_error {
++  if( pParse->zErrMsg==0 ){
++    if( TOKEN.z[0] ){
++      sqliteErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN);
++    }else{
++      sqliteErrorMsg(pParse, "incomplete SQL statement");
++    }
++  }
++}
++%name sqliteParser
++%include {
++#include "sqliteInt.h"
++#include "parse.h"
++
++/*
++** An instance of this structure holds information about the
++** LIMIT clause of a SELECT statement.
++*/
++struct LimitVal {
++  int limit;    /* The LIMIT value.  -1 if there is no limit */
++  int offset;   /* The OFFSET.  0 if there is none */
++};
++
++/*
++** An instance of the following structure describes the event of a
++** TRIGGER.  "a" is the event type, one of TK_UPDATE, TK_INSERT,
++** TK_DELETE, or TK_INSTEAD.  If the event is of the form
++**
++**      UPDATE ON (a,b,c)
++**
++** Then the "b" IdList records the list "a,b,c".
++*/
++struct TrigEvent { int a; IdList * b; };
++
++} // end %include
++
++// These are extra tokens used by the lexer but never seen by the
++// parser.  We put them in a rule so that the parser generator will
++// add them to the parse.h output file.
++//
++%nonassoc END_OF_FILE ILLEGAL SPACE UNCLOSED_STRING COMMENT FUNCTION
++          COLUMN AGG_FUNCTION.
++
++// Input is a single SQL command
++input ::= cmdlist.
++cmdlist ::= cmdlist ecmd.
++cmdlist ::= ecmd.
++ecmd ::= explain cmdx SEMI.
++ecmd ::= SEMI.
++cmdx ::= cmd.           { sqliteExec(pParse); }
++explain ::= EXPLAIN.    { sqliteBeginParse(pParse, 1); }
++explain ::= .           { sqliteBeginParse(pParse, 0); }
++
++///////////////////// Begin and end transactions. ////////////////////////////
++//
++
++cmd ::= BEGIN trans_opt onconf(R).  {sqliteBeginTransaction(pParse,R);}
++trans_opt ::= .
++trans_opt ::= TRANSACTION.
++trans_opt ::= TRANSACTION nm.
++cmd ::= COMMIT trans_opt.      {sqliteCommitTransaction(pParse);}
++cmd ::= END trans_opt.         {sqliteCommitTransaction(pParse);}
++cmd ::= ROLLBACK trans_opt.    {sqliteRollbackTransaction(pParse);}
++
++///////////////////// The CREATE TABLE statement ////////////////////////////
++//
++cmd ::= create_table create_table_args.
++create_table ::= CREATE(X) temp(T) TABLE nm(Y). {
++   sqliteStartTable(pParse,&X,&Y,T,0);
++}
++%type temp {int}
++temp(A) ::= TEMP.  {A = 1;}
++temp(A) ::= .      {A = 0;}
++create_table_args ::= LP columnlist conslist_opt RP(X). {
++  sqliteEndTable(pParse,&X,0);
++}
++create_table_args ::= AS select(S). {
++  sqliteEndTable(pParse,0,S);
++  sqliteSelectDelete(S);
++}
++columnlist ::= columnlist COMMA column.
++columnlist ::= column.
++
++// About the only information used for a column is the name of the
++// column.  The type is always just "text".  But the code will accept
++// an elaborate typename.  Perhaps someday we'll do something with it.
++//
++column ::= columnid type carglist. 
++columnid ::= nm(X).                {sqliteAddColumn(pParse,&X);}
++
++// An IDENTIFIER can be a generic identifier, or one of several
++// keywords.  Any non-standard keyword can also be an identifier.
++//
++%type id {Token}
++id(A) ::= ID(X).         {A = X;}
++
++// The following directive causes tokens ABORT, AFTER, ASC, etc. to
++// fallback to ID if they will not parse as their original value.
++// This obviates the need for the "id" nonterminal.
++//
++%fallback ID
++  ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT
++  COPY DATABASE DEFERRED DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR
++  GLOB IGNORE IMMEDIATE INITIALLY INSTEAD LIKE MATCH KEY
++  OF OFFSET PRAGMA RAISE REPLACE RESTRICT ROW STATEMENT
++  TEMP TRIGGER VACUUM VIEW.
++
++// Define operator precedence early so that this is the first occurance
++// of the operator tokens in the grammer.  Keeping the operators together
++// causes them to be assigned integer values that are close together,
++// which keeps parser tables smaller.
++//
++%left OR.
++%left AND.
++%right NOT.
++%left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN.
++%left GT GE LT LE.
++%left BITAND BITOR LSHIFT RSHIFT.
++%left PLUS MINUS.
++%left STAR SLASH REM.
++%left CONCAT.
++%right UMINUS UPLUS BITNOT.
++
++// And "ids" is an identifer-or-string.
++//
++%type ids {Token}
++ids(A) ::= ID(X).        {A = X;}
++ids(A) ::= STRING(X).    {A = X;}
++
++// The name of a column or table can be any of the following:
++//
++%type nm {Token}
++nm(A) ::= ID(X).         {A = X;}
++nm(A) ::= STRING(X).     {A = X;}
++nm(A) ::= JOIN_KW(X).    {A = X;}
++
++type ::= .
++type ::= typename(X).                    {sqliteAddColumnType(pParse,&X,&X);}
++type ::= typename(X) LP signed RP(Y).    {sqliteAddColumnType(pParse,&X,&Y);}
++type ::= typename(X) LP signed COMMA signed RP(Y).
++                                         {sqliteAddColumnType(pParse,&X,&Y);}
++%type typename {Token}
++typename(A) ::= ids(X).           {A = X;}
++typename(A) ::= typename(X) ids.  {A = X;}
++%type signed {int}
++signed(A) ::= INTEGER(X).         { A = atoi(X.z); }
++signed(A) ::= PLUS INTEGER(X).    { A = atoi(X.z); }
++signed(A) ::= MINUS INTEGER(X).   { A = -atoi(X.z); }
++carglist ::= carglist carg.
++carglist ::= .
++carg ::= CONSTRAINT nm ccons.
++carg ::= ccons.
++carg ::= DEFAULT STRING(X).          {sqliteAddDefaultValue(pParse,&X,0);}
++carg ::= DEFAULT ID(X).              {sqliteAddDefaultValue(pParse,&X,0);}
++carg ::= DEFAULT INTEGER(X).         {sqliteAddDefaultValue(pParse,&X,0);}
++carg ::= DEFAULT PLUS INTEGER(X).    {sqliteAddDefaultValue(pParse,&X,0);}
++carg ::= DEFAULT MINUS INTEGER(X).   {sqliteAddDefaultValue(pParse,&X,1);}
++carg ::= DEFAULT FLOAT(X).           {sqliteAddDefaultValue(pParse,&X,0);}
++carg ::= DEFAULT PLUS FLOAT(X).      {sqliteAddDefaultValue(pParse,&X,0);}
++carg ::= DEFAULT MINUS FLOAT(X).     {sqliteAddDefaultValue(pParse,&X,1);}
++carg ::= DEFAULT NULL. 
++
++// In addition to the type name, we also care about the primary key and
++// UNIQUE constraints.
++//
++ccons ::= NULL onconf.
++ccons ::= NOT NULL onconf(R).               {sqliteAddNotNull(pParse, R);}
++ccons ::= PRIMARY KEY sortorder onconf(R).  {sqliteAddPrimaryKey(pParse,0,R);}
++ccons ::= UNIQUE onconf(R).           {sqliteCreateIndex(pParse,0,0,0,R,0,0);}
++ccons ::= CHECK LP expr RP onconf.
++ccons ::= REFERENCES nm(T) idxlist_opt(TA) refargs(R).
++                                {sqliteCreateForeignKey(pParse,0,&T,TA,R);}
++ccons ::= defer_subclause(D).   {sqliteDeferForeignKey(pParse,D);}
++ccons ::= COLLATE id(C).  {
++   sqliteAddCollateType(pParse, sqliteCollateType(C.z, C.n));
++}
++
++// The next group of rules parses the arguments to a REFERENCES clause
++// that determine if the referential integrity checking is deferred or
++// or immediate and which determine what action to take if a ref-integ
++// check fails.
++//
++%type refargs {int}
++refargs(A) ::= .                     { A = OE_Restrict * 0x010101; }
++refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; }
++%type refarg {struct {int value; int mask;}}
++refarg(A) ::= MATCH nm.              { A.value = 0;     A.mask = 0x000000; }
++refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.mask = 0x0000ff; }
++refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.mask = 0x00ff00; }
++refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.mask = 0xff0000; }
++%type refact {int}
++refact(A) ::= SET NULL.              { A = OE_SetNull; }
++refact(A) ::= SET DEFAULT.           { A = OE_SetDflt; }
++refact(A) ::= CASCADE.               { A = OE_Cascade; }
++refact(A) ::= RESTRICT.              { A = OE_Restrict; }
++%type defer_subclause {int}
++defer_subclause(A) ::= NOT DEFERRABLE init_deferred_pred_opt(X).  {A = X;}
++defer_subclause(A) ::= DEFERRABLE init_deferred_pred_opt(X).      {A = X;}
++%type init_deferred_pred_opt {int}
++init_deferred_pred_opt(A) ::= .                       {A = 0;}
++init_deferred_pred_opt(A) ::= INITIALLY DEFERRED.     {A = 1;}
++init_deferred_pred_opt(A) ::= INITIALLY IMMEDIATE.    {A = 0;}
++
++// For the time being, the only constraint we care about is the primary
++// key and UNIQUE.  Both create indices.
++//
++conslist_opt ::= .
++conslist_opt ::= COMMA conslist.
++conslist ::= conslist COMMA tcons.
++conslist ::= conslist tcons.
++conslist ::= tcons.
++tcons ::= CONSTRAINT nm.
++tcons ::= PRIMARY KEY LP idxlist(X) RP onconf(R).
++                                             {sqliteAddPrimaryKey(pParse,X,R);}
++tcons ::= UNIQUE LP idxlist(X) RP onconf(R).
++                                       {sqliteCreateIndex(pParse,0,0,X,R,0,0);}
++tcons ::= CHECK expr onconf.
++tcons ::= FOREIGN KEY LP idxlist(FA) RP
++          REFERENCES nm(T) idxlist_opt(TA) refargs(R) defer_subclause_opt(D). {
++    sqliteCreateForeignKey(pParse, FA, &T, TA, R);
++    sqliteDeferForeignKey(pParse, D);
++}
++%type defer_subclause_opt {int}
++defer_subclause_opt(A) ::= .                    {A = 0;}
++defer_subclause_opt(A) ::= defer_subclause(X).  {A = X;}
++
++// The following is a non-standard extension that allows us to declare the
++// default behavior when there is a constraint conflict.
++//
++%type onconf {int}
++%type orconf {int}
++%type resolvetype {int}
++onconf(A) ::= .                              { A = OE_Default; }
++onconf(A) ::= ON CONFLICT resolvetype(X).    { A = X; }
++orconf(A) ::= .                              { A = OE_Default; }
++orconf(A) ::= OR resolvetype(X).             { A = X; }
++resolvetype(A) ::= ROLLBACK.                 { A = OE_Rollback; }
++resolvetype(A) ::= ABORT.                    { A = OE_Abort; }
++resolvetype(A) ::= FAIL.                     { A = OE_Fail; }
++resolvetype(A) ::= IGNORE.                   { A = OE_Ignore; }
++resolvetype(A) ::= REPLACE.                  { A = OE_Replace; }
++
++////////////////////////// The DROP TABLE /////////////////////////////////////
++//
++cmd ::= DROP TABLE nm(X).          {sqliteDropTable(pParse,&X,0);}
++
++///////////////////// The CREATE VIEW statement /////////////////////////////
++//
++cmd ::= CREATE(X) temp(T) VIEW nm(Y) AS select(S). {
++  sqliteCreateView(pParse, &X, &Y, S, T);
++}
++cmd ::= DROP VIEW nm(X). {
++  sqliteDropTable(pParse, &X, 1);
++}
++
++//////////////////////// The SELECT statement /////////////////////////////////
++//
++cmd ::= select(X).  {
++  sqliteSelect(pParse, X, SRT_Callback, 0, 0, 0, 0);
++  sqliteSelectDelete(X);
++}
++
++%type select {Select*}
++%destructor select {sqliteSelectDelete($$);}
++%type oneselect {Select*}
++%destructor oneselect {sqliteSelectDelete($$);}
++
++select(A) ::= oneselect(X).                      {A = X;}
++select(A) ::= select(X) multiselect_op(Y) oneselect(Z).  {
++  if( Z ){
++    Z->op = Y;
++    Z->pPrior = X;
++  }
++  A = Z;
++}
++%type multiselect_op {int}
++multiselect_op(A) ::= UNION.      {A = TK_UNION;}
++multiselect_op(A) ::= UNION ALL.  {A = TK_ALL;}
++multiselect_op(A) ::= INTERSECT.  {A = TK_INTERSECT;}
++multiselect_op(A) ::= EXCEPT.     {A = TK_EXCEPT;}
++oneselect(A) ::= SELECT distinct(D) selcollist(W) from(X) where_opt(Y)
++                 groupby_opt(P) having_opt(Q) orderby_opt(Z) limit_opt(L). {
++  A = sqliteSelectNew(W,X,Y,P,Q,Z,D,L.limit,L.offset);
++}
++
++// The "distinct" nonterminal is true (1) if the DISTINCT keyword is
++// present and false (0) if it is not.
++//
++%type distinct {int}
++distinct(A) ::= DISTINCT.   {A = 1;}
++distinct(A) ::= ALL.        {A = 0;}
++distinct(A) ::= .           {A = 0;}
++
++// selcollist is a list of expressions that are to become the return
++// values of the SELECT statement.  The "*" in statements like
++// "SELECT * FROM ..." is encoded as a special expression with an
++// opcode of TK_ALL.
++//
++%type selcollist {ExprList*}
++%destructor selcollist {sqliteExprListDelete($$);}
++%type sclp {ExprList*}
++%destructor sclp {sqliteExprListDelete($$);}
++sclp(A) ::= selcollist(X) COMMA.             {A = X;}
++sclp(A) ::= .                                {A = 0;}
++selcollist(A) ::= sclp(P) expr(X) as(Y).     {
++   A = sqliteExprListAppend(P,X,Y.n?&Y:0);
++}
++selcollist(A) ::= sclp(P) STAR. {
++  A = sqliteExprListAppend(P, sqliteExpr(TK_ALL, 0, 0, 0), 0);
++}
++selcollist(A) ::= sclp(P) nm(X) DOT STAR. {
++  Expr *pRight = sqliteExpr(TK_ALL, 0, 0, 0);
++  Expr *pLeft = sqliteExpr(TK_ID, 0, 0, &X);
++  A = sqliteExprListAppend(P, sqliteExpr(TK_DOT, pLeft, pRight, 0), 0);
++}
++
++// An option "AS <id>" phrase that can follow one of the expressions that
++// define the result set, or one of the tables in the FROM clause.
++//
++%type as {Token}
++as(X) ::= AS nm(Y).    { X = Y; }
++as(X) ::= ids(Y).      { X = Y; }
++as(X) ::= .            { X.n = 0; }
++
++
++%type seltablist {SrcList*}
++%destructor seltablist {sqliteSrcListDelete($$);}
++%type stl_prefix {SrcList*}
++%destructor stl_prefix {sqliteSrcListDelete($$);}
++%type from {SrcList*}
++%destructor from {sqliteSrcListDelete($$);}
++
++// A complete FROM clause.
++//
++from(A) ::= .                                 {A = sqliteMalloc(sizeof(*A));}
++from(A) ::= FROM seltablist(X).               {A = X;}
++
++// "seltablist" is a "Select Table List" - the content of the FROM clause
++// in a SELECT statement.  "stl_prefix" is a prefix of this list.
++//
++stl_prefix(A) ::= seltablist(X) joinop(Y).    {
++   A = X;
++   if( A && A->nSrc>0 ) A->a[A->nSrc-1].jointype = Y;
++}
++stl_prefix(A) ::= .                           {A = 0;}
++seltablist(A) ::= stl_prefix(X) nm(Y) dbnm(D) as(Z) on_opt(N) using_opt(U). {
++  A = sqliteSrcListAppend(X,&Y,&D);
++  if( Z.n ) sqliteSrcListAddAlias(A,&Z);
++  if( N ){
++    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; }
++    else { sqliteExprDelete(N); }
++  }
++  if( U ){
++    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; }
++    else { sqliteIdListDelete(U); }
++  }
++}
++seltablist(A) ::= stl_prefix(X) LP seltablist_paren(S) RP
++                  as(Z) on_opt(N) using_opt(U). {
++  A = sqliteSrcListAppend(X,0,0);
++  A->a[A->nSrc-1].pSelect = S;
++  if( Z.n ) sqliteSrcListAddAlias(A,&Z);
++  if( N ){
++    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; }
++    else { sqliteExprDelete(N); }
++  }
++  if( U ){
++    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; }
++    else { sqliteIdListDelete(U); }
++  }
++}
++
++// A seltablist_paren nonterminal represents anything in a FROM that
++// is contained inside parentheses.  This can be either a subquery or
++// a grouping of table and subqueries.
++//
++%type seltablist_paren {Select*}
++%destructor seltablist_paren {sqliteSelectDelete($$);}
++seltablist_paren(A) ::= select(S).      {A = S;}
++seltablist_paren(A) ::= seltablist(F).  {
++   A = sqliteSelectNew(0,F,0,0,0,0,0,-1,0);
++}
++
++%type dbnm {Token}
++dbnm(A) ::= .          {A.z=0; A.n=0;}
++dbnm(A) ::= DOT nm(X). {A = X;}
++
++%type joinop {int}
++%type joinop2 {int}
++joinop(X) ::= COMMA.                   { X = JT_INNER; }
++joinop(X) ::= JOIN.                    { X = JT_INNER; }
++joinop(X) ::= JOIN_KW(A) JOIN.         { X = sqliteJoinType(pParse,&A,0,0); }
++joinop(X) ::= JOIN_KW(A) nm(B) JOIN.   { X = sqliteJoinType(pParse,&A,&B,0); }
++joinop(X) ::= JOIN_KW(A) nm(B) nm(C) JOIN.
++                                       { X = sqliteJoinType(pParse,&A,&B,&C); }
++
++%type on_opt {Expr*}
++%destructor on_opt {sqliteExprDelete($$);}
++on_opt(N) ::= ON expr(E).   {N = E;}
++on_opt(N) ::= .             {N = 0;}
++
++%type using_opt {IdList*}
++%destructor using_opt {sqliteIdListDelete($$);}
++using_opt(U) ::= USING LP idxlist(L) RP.  {U = L;}
++using_opt(U) ::= .                        {U = 0;}
++
++
++%type orderby_opt {ExprList*}
++%destructor orderby_opt {sqliteExprListDelete($$);}
++%type sortlist {ExprList*}
++%destructor sortlist {sqliteExprListDelete($$);}
++%type sortitem {Expr*}
++%destructor sortitem {sqliteExprDelete($$);}
++
++orderby_opt(A) ::= .                          {A = 0;}
++orderby_opt(A) ::= ORDER BY sortlist(X).      {A = X;}
++sortlist(A) ::= sortlist(X) COMMA sortitem(Y) collate(C) sortorder(Z). {
++  A = sqliteExprListAppend(X,Y,0);
++  if( A ) A->a[A->nExpr-1].sortOrder = C+Z;
++}
++sortlist(A) ::= sortitem(Y) collate(C) sortorder(Z). {
++  A = sqliteExprListAppend(0,Y,0);
++  if( A ) A->a[0].sortOrder = C+Z;
++}
++sortitem(A) ::= expr(X).   {A = X;}
++
++%type sortorder {int}
++%type collate {int}
++
++sortorder(A) ::= ASC.           {A = SQLITE_SO_ASC;}
++sortorder(A) ::= DESC.          {A = SQLITE_SO_DESC;}
++sortorder(A) ::= .              {A = SQLITE_SO_ASC;}
++collate(C) ::= .                {C = SQLITE_SO_UNK;}
++collate(C) ::= COLLATE id(X).   {C = sqliteCollateType(X.z, X.n);}
++
++%type groupby_opt {ExprList*}
++%destructor groupby_opt {sqliteExprListDelete($$);}
++groupby_opt(A) ::= .                      {A = 0;}
++groupby_opt(A) ::= GROUP BY exprlist(X).  {A = X;}
++
++%type having_opt {Expr*}
++%destructor having_opt {sqliteExprDelete($$);}
++having_opt(A) ::= .                {A = 0;}
++having_opt(A) ::= HAVING expr(X).  {A = X;}
++
++%type limit_opt {struct LimitVal}
++limit_opt(A) ::= .                     {A.limit = -1; A.offset = 0;}
++limit_opt(A) ::= LIMIT signed(X).      {A.limit = X; A.offset = 0;}
++limit_opt(A) ::= LIMIT signed(X) OFFSET signed(Y). 
++                                       {A.limit = X; A.offset = Y;}
++limit_opt(A) ::= LIMIT signed(X) COMMA signed(Y). 
++                                       {A.limit = Y; A.offset = X;}
++
++/////////////////////////// The DELETE statement /////////////////////////////
++//
++cmd ::= DELETE FROM nm(X) dbnm(D) where_opt(Y). {
++   sqliteDeleteFrom(pParse, sqliteSrcListAppend(0,&X,&D), Y);
++}
++
++%type where_opt {Expr*}
++%destructor where_opt {sqliteExprDelete($$);}
++
++where_opt(A) ::= .                    {A = 0;}
++where_opt(A) ::= WHERE expr(X).       {A = X;}
++
++%type setlist {ExprList*}
++%destructor setlist {sqliteExprListDelete($$);}
++
++////////////////////////// The UPDATE command ////////////////////////////////
++//
++cmd ::= UPDATE orconf(R) nm(X) dbnm(D) SET setlist(Y) where_opt(Z).
++    {sqliteUpdate(pParse,sqliteSrcListAppend(0,&X,&D),Y,Z,R);}
++
++setlist(A) ::= setlist(Z) COMMA nm(X) EQ expr(Y).
++    {A = sqliteExprListAppend(Z,Y,&X);}
++setlist(A) ::= nm(X) EQ expr(Y).   {A = sqliteExprListAppend(0,Y,&X);}
++
++////////////////////////// The INSERT command /////////////////////////////////
++//
++cmd ::= insert_cmd(R) INTO nm(X) dbnm(D) inscollist_opt(F) 
++        VALUES LP itemlist(Y) RP.
++            {sqliteInsert(pParse, sqliteSrcListAppend(0,&X,&D), Y, 0, F, R);}
++cmd ::= insert_cmd(R) INTO nm(X) dbnm(D) inscollist_opt(F) select(S).
++            {sqliteInsert(pParse, sqliteSrcListAppend(0,&X,&D), 0, S, F, R);}
++
++%type insert_cmd {int}
++insert_cmd(A) ::= INSERT orconf(R).   {A = R;}
++insert_cmd(A) ::= REPLACE.            {A = OE_Replace;}
++
++
++%type itemlist {ExprList*}
++%destructor itemlist {sqliteExprListDelete($$);}
++
++itemlist(A) ::= itemlist(X) COMMA expr(Y).  {A = sqliteExprListAppend(X,Y,0);}
++itemlist(A) ::= expr(X).                    {A = sqliteExprListAppend(0,X,0);}
++
++%type inscollist_opt {IdList*}
++%destructor inscollist_opt {sqliteIdListDelete($$);}
++%type inscollist {IdList*}
++%destructor inscollist {sqliteIdListDelete($$);}
++
++inscollist_opt(A) ::= .                       {A = 0;}
++inscollist_opt(A) ::= LP inscollist(X) RP.    {A = X;}
++inscollist(A) ::= inscollist(X) COMMA nm(Y).  {A = sqliteIdListAppend(X,&Y);}
++inscollist(A) ::= nm(Y).                      {A = sqliteIdListAppend(0,&Y);}
++
++/////////////////////////// Expression Processing /////////////////////////////
++//
++
++%type expr {Expr*}
++%destructor expr {sqliteExprDelete($$);}
++
++expr(A) ::= LP(B) expr(X) RP(E). {A = X; sqliteExprSpan(A,&B,&E); }
++expr(A) ::= NULL(X).             {A = sqliteExpr(TK_NULL, 0, 0, &X);}
++expr(A) ::= ID(X).               {A = sqliteExpr(TK_ID, 0, 0, &X);}
++expr(A) ::= JOIN_KW(X).          {A = sqliteExpr(TK_ID, 0, 0, &X);}
++expr(A) ::= nm(X) DOT nm(Y). {
++  Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &X);
++  Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &Y);
++  A = sqliteExpr(TK_DOT, temp1, temp2, 0);
++}
++expr(A) ::= nm(X) DOT nm(Y) DOT nm(Z). {
++  Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &X);
++  Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &Y);
++  Expr *temp3 = sqliteExpr(TK_ID, 0, 0, &Z);
++  Expr *temp4 = sqliteExpr(TK_DOT, temp2, temp3, 0);
++  A = sqliteExpr(TK_DOT, temp1, temp4, 0);
++}
++expr(A) ::= INTEGER(X).      {A = sqliteExpr(TK_INTEGER, 0, 0, &X);}
++expr(A) ::= FLOAT(X).        {A = sqliteExpr(TK_FLOAT, 0, 0, &X);}
++expr(A) ::= STRING(X).       {A = sqliteExpr(TK_STRING, 0, 0, &X);}
++expr(A) ::= VARIABLE(X).     {
++  A = sqliteExpr(TK_VARIABLE, 0, 0, &X);
++  if( A ) A->iTable = ++pParse->nVar;
++}
++expr(A) ::= ID(X) LP exprlist(Y) RP(E). {
++  A = sqliteExprFunction(Y, &X);
++  sqliteExprSpan(A,&X,&E);
++}
++expr(A) ::= ID(X) LP STAR RP(E). {
++  A = sqliteExprFunction(0, &X);
++  sqliteExprSpan(A,&X,&E);
++}
++expr(A) ::= expr(X) AND expr(Y).   {A = sqliteExpr(TK_AND, X, Y, 0);}
++expr(A) ::= expr(X) OR expr(Y).    {A = sqliteExpr(TK_OR, X, Y, 0);}
++expr(A) ::= expr(X) LT expr(Y).    {A = sqliteExpr(TK_LT, X, Y, 0);}
++expr(A) ::= expr(X) GT expr(Y).    {A = sqliteExpr(TK_GT, X, Y, 0);}
++expr(A) ::= expr(X) LE expr(Y).    {A = sqliteExpr(TK_LE, X, Y, 0);}
++expr(A) ::= expr(X) GE expr(Y).    {A = sqliteExpr(TK_GE, X, Y, 0);}
++expr(A) ::= expr(X) NE expr(Y).    {A = sqliteExpr(TK_NE, X, Y, 0);}
++expr(A) ::= expr(X) EQ expr(Y).    {A = sqliteExpr(TK_EQ, X, Y, 0);}
++expr(A) ::= expr(X) BITAND expr(Y). {A = sqliteExpr(TK_BITAND, X, Y, 0);}
++expr(A) ::= expr(X) BITOR expr(Y).  {A = sqliteExpr(TK_BITOR, X, Y, 0);}
++expr(A) ::= expr(X) LSHIFT expr(Y). {A = sqliteExpr(TK_LSHIFT, X, Y, 0);}
++expr(A) ::= expr(X) RSHIFT expr(Y). {A = sqliteExpr(TK_RSHIFT, X, Y, 0);}
++expr(A) ::= expr(X) likeop(OP) expr(Y).  [LIKE]  {
++  ExprList *pList = sqliteExprListAppend(0, Y, 0);
++  pList = sqliteExprListAppend(pList, X, 0);
++  A = sqliteExprFunction(pList, 0);
++  if( A ) A->op = OP;
++  sqliteExprSpan(A, &X->span, &Y->span);
++}
++expr(A) ::= expr(X) NOT likeop(OP) expr(Y). [LIKE] {
++  ExprList *pList = sqliteExprListAppend(0, Y, 0);
++  pList = sqliteExprListAppend(pList, X, 0);
++  A = sqliteExprFunction(pList, 0);
++  if( A ) A->op = OP;
++  A = sqliteExpr(TK_NOT, A, 0, 0);
++  sqliteExprSpan(A,&X->span,&Y->span);
++}
++%type likeop {int}
++likeop(A) ::= LIKE. {A = TK_LIKE;}
++likeop(A) ::= GLOB. {A = TK_GLOB;}
++expr(A) ::= expr(X) PLUS expr(Y).  {A = sqliteExpr(TK_PLUS, X, Y, 0);}
++expr(A) ::= expr(X) MINUS expr(Y). {A = sqliteExpr(TK_MINUS, X, Y, 0);}
++expr(A) ::= expr(X) STAR expr(Y).  {A = sqliteExpr(TK_STAR, X, Y, 0);}
++expr(A) ::= expr(X) SLASH expr(Y). {A = sqliteExpr(TK_SLASH, X, Y, 0);}
++expr(A) ::= expr(X) REM expr(Y).   {A = sqliteExpr(TK_REM, X, Y, 0);}
++expr(A) ::= expr(X) CONCAT expr(Y). {A = sqliteExpr(TK_CONCAT, X, Y, 0);}
++expr(A) ::= expr(X) ISNULL(E). {
++  A = sqliteExpr(TK_ISNULL, X, 0, 0);
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) IS NULL(E). {
++  A = sqliteExpr(TK_ISNULL, X, 0, 0);
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) NOTNULL(E). {
++  A = sqliteExpr(TK_NOTNULL, X, 0, 0);
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) NOT NULL(E). {
++  A = sqliteExpr(TK_NOTNULL, X, 0, 0);
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) IS NOT NULL(E). {
++  A = sqliteExpr(TK_NOTNULL, X, 0, 0);
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= NOT(B) expr(X). {
++  A = sqliteExpr(TK_NOT, X, 0, 0);
++  sqliteExprSpan(A,&B,&X->span);
++}
++expr(A) ::= BITNOT(B) expr(X). {
++  A = sqliteExpr(TK_BITNOT, X, 0, 0);
++  sqliteExprSpan(A,&B,&X->span);
++}
++expr(A) ::= MINUS(B) expr(X). [UMINUS] {
++  A = sqliteExpr(TK_UMINUS, X, 0, 0);
++  sqliteExprSpan(A,&B,&X->span);
++}
++expr(A) ::= PLUS(B) expr(X). [UPLUS] {
++  A = sqliteExpr(TK_UPLUS, X, 0, 0);
++  sqliteExprSpan(A,&B,&X->span);
++}
++expr(A) ::= LP(B) select(X) RP(E). {
++  A = sqliteExpr(TK_SELECT, 0, 0, 0);
++  if( A ) A->pSelect = X;
++  sqliteExprSpan(A,&B,&E);
++}
++expr(A) ::= expr(W) BETWEEN expr(X) AND expr(Y). {
++  ExprList *pList = sqliteExprListAppend(0, X, 0);
++  pList = sqliteExprListAppend(pList, Y, 0);
++  A = sqliteExpr(TK_BETWEEN, W, 0, 0);
++  if( A ) A->pList = pList;
++  sqliteExprSpan(A,&W->span,&Y->span);
++}
++expr(A) ::= expr(W) NOT BETWEEN expr(X) AND expr(Y). {
++  ExprList *pList = sqliteExprListAppend(0, X, 0);
++  pList = sqliteExprListAppend(pList, Y, 0);
++  A = sqliteExpr(TK_BETWEEN, W, 0, 0);
++  if( A ) A->pList = pList;
++  A = sqliteExpr(TK_NOT, A, 0, 0);
++  sqliteExprSpan(A,&W->span,&Y->span);
++}
++expr(A) ::= expr(X) IN LP exprlist(Y) RP(E).  {
++  A = sqliteExpr(TK_IN, X, 0, 0);
++  if( A ) A->pList = Y;
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) IN LP select(Y) RP(E).  {
++  A = sqliteExpr(TK_IN, X, 0, 0);
++  if( A ) A->pSelect = Y;
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) NOT IN LP exprlist(Y) RP(E).  {
++  A = sqliteExpr(TK_IN, X, 0, 0);
++  if( A ) A->pList = Y;
++  A = sqliteExpr(TK_NOT, A, 0, 0);
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) NOT IN LP select(Y) RP(E).  {
++  A = sqliteExpr(TK_IN, X, 0, 0);
++  if( A ) A->pSelect = Y;
++  A = sqliteExpr(TK_NOT, A, 0, 0);
++  sqliteExprSpan(A,&X->span,&E);
++}
++expr(A) ::= expr(X) IN nm(Y) dbnm(D). {
++  SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D);
++  A = sqliteExpr(TK_IN, X, 0, 0);
++  if( A ) A->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0);
++  sqliteExprSpan(A,&X->span,D.z?&D:&Y);
++}
++expr(A) ::= expr(X) NOT IN nm(Y) dbnm(D). {
++  SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D);
++  A = sqliteExpr(TK_IN, X, 0, 0);
++  if( A ) A->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0);
++  A = sqliteExpr(TK_NOT, A, 0, 0);
++  sqliteExprSpan(A,&X->span,D.z?&D:&Y);
++}
++
++
++/* CASE expressions */
++expr(A) ::= CASE(C) case_operand(X) case_exprlist(Y) case_else(Z) END(E). {
++  A = sqliteExpr(TK_CASE, X, Z, 0);
++  if( A ) A->pList = Y;
++  sqliteExprSpan(A, &C, &E);
++}
++%type case_exprlist {ExprList*}
++%destructor case_exprlist {sqliteExprListDelete($$);}
++case_exprlist(A) ::= case_exprlist(X) WHEN expr(Y) THEN expr(Z). {
++  A = sqliteExprListAppend(X, Y, 0);
++  A = sqliteExprListAppend(A, Z, 0);
++}
++case_exprlist(A) ::= WHEN expr(Y) THEN expr(Z). {
++  A = sqliteExprListAppend(0, Y, 0);
++  A = sqliteExprListAppend(A, Z, 0);
++}
++%type case_else {Expr*}
++case_else(A) ::=  ELSE expr(X).         {A = X;}
++case_else(A) ::=  .                     {A = 0;} 
++%type case_operand {Expr*}
++case_operand(A) ::= expr(X).            {A = X;} 
++case_operand(A) ::= .                   {A = 0;} 
++
++%type exprlist {ExprList*}
++%destructor exprlist {sqliteExprListDelete($$);}
++%type expritem {Expr*}
++%destructor expritem {sqliteExprDelete($$);}
++
++exprlist(A) ::= exprlist(X) COMMA expritem(Y). 
++   {A = sqliteExprListAppend(X,Y,0);}
++exprlist(A) ::= expritem(X).            {A = sqliteExprListAppend(0,X,0);}
++expritem(A) ::= expr(X).                {A = X;}
++expritem(A) ::= .                       {A = 0;}
++
++///////////////////////////// The CREATE INDEX command ///////////////////////
++//
++cmd ::= CREATE(S) uniqueflag(U) INDEX nm(X)
++        ON nm(Y) dbnm(D) LP idxlist(Z) RP(E) onconf(R). {
++  SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D);
++  if( U!=OE_None ) U = R;
++  if( U==OE_Default) U = OE_Abort;
++  sqliteCreateIndex(pParse, &X, pSrc, Z, U, &S, &E);
++}
++
++%type uniqueflag {int}
++uniqueflag(A) ::= UNIQUE.  { A = OE_Abort; }
++uniqueflag(A) ::= .        { A = OE_None; }
++
++%type idxlist {IdList*}
++%destructor idxlist {sqliteIdListDelete($$);}
++%type idxlist_opt {IdList*}
++%destructor idxlist_opt {sqliteIdListDelete($$);}
++%type idxitem {Token}
++
++idxlist_opt(A) ::= .                         {A = 0;}
++idxlist_opt(A) ::= LP idxlist(X) RP.         {A = X;}
++idxlist(A) ::= idxlist(X) COMMA idxitem(Y).  {A = sqliteIdListAppend(X,&Y);}
++idxlist(A) ::= idxitem(Y).                   {A = sqliteIdListAppend(0,&Y);}
++idxitem(A) ::= nm(X) sortorder.              {A = X;}
++
++///////////////////////////// The DROP INDEX command /////////////////////////
++//
++
++cmd ::= DROP INDEX nm(X) dbnm(Y).   {
++  sqliteDropIndex(pParse, sqliteSrcListAppend(0,&X,&Y));
++}
++
++
++///////////////////////////// The COPY command ///////////////////////////////
++//
++cmd ::= COPY orconf(R) nm(X) dbnm(D) FROM nm(Y) USING DELIMITERS STRING(Z).
++    {sqliteCopy(pParse,sqliteSrcListAppend(0,&X,&D),&Y,&Z,R);}
++cmd ::= COPY orconf(R) nm(X) dbnm(D) FROM nm(Y).
++    {sqliteCopy(pParse,sqliteSrcListAppend(0,&X,&D),&Y,0,R);}
++
++///////////////////////////// The VACUUM command /////////////////////////////
++//
++cmd ::= VACUUM.                {sqliteVacuum(pParse,0);}
++cmd ::= VACUUM nm(X).         {sqliteVacuum(pParse,&X);}
++
++///////////////////////////// The PRAGMA command /////////////////////////////
++//
++cmd ::= PRAGMA ids(X) EQ nm(Y).         {sqlitePragma(pParse,&X,&Y,0);}
++cmd ::= PRAGMA ids(X) EQ ON(Y).          {sqlitePragma(pParse,&X,&Y,0);}
++cmd ::= PRAGMA ids(X) EQ plus_num(Y).    {sqlitePragma(pParse,&X,&Y,0);}
++cmd ::= PRAGMA ids(X) EQ minus_num(Y).   {sqlitePragma(pParse,&X,&Y,1);}
++cmd ::= PRAGMA ids(X) LP nm(Y) RP.      {sqlitePragma(pParse,&X,&Y,0);}
++cmd ::= PRAGMA ids(X).                   {sqlitePragma(pParse,&X,&X,0);}
++plus_num(A) ::= plus_opt number(X).   {A = X;}
++minus_num(A) ::= MINUS number(X).     {A = X;}
++number(A) ::= INTEGER(X).  {A = X;}
++number(A) ::= FLOAT(X).    {A = X;}
++plus_opt ::= PLUS.
++plus_opt ::= .
++
++//////////////////////////// The CREATE TRIGGER command /////////////////////
++
++cmd ::= CREATE(A) trigger_decl BEGIN trigger_cmd_list(S) END(Z). {
++  Token all;
++  all.z = A.z;
++  all.n = (Z.z - A.z) + Z.n;
++  sqliteFinishTrigger(pParse, S, &all);
++}
++
++trigger_decl ::= temp(T) TRIGGER nm(B) trigger_time(C) trigger_event(D)
++                 ON nm(E) dbnm(DB) foreach_clause(F) when_clause(G). {
++  SrcList *pTab = sqliteSrcListAppend(0, &E, &DB);
++  sqliteBeginTrigger(pParse, &B, C, D.a, D.b, pTab, F, G, T);
++}
++
++%type trigger_time  {int}
++trigger_time(A) ::= BEFORE.      { A = TK_BEFORE; }
++trigger_time(A) ::= AFTER.       { A = TK_AFTER;  }
++trigger_time(A) ::= INSTEAD OF.  { A = TK_INSTEAD;}
++trigger_time(A) ::= .            { A = TK_BEFORE; }
++
++%type trigger_event {struct TrigEvent}
++%destructor trigger_event {sqliteIdListDelete($$.b);}
++trigger_event(A) ::= DELETE. { A.a = TK_DELETE; A.b = 0; }
++trigger_event(A) ::= INSERT. { A.a = TK_INSERT; A.b = 0; }
++trigger_event(A) ::= UPDATE. { A.a = TK_UPDATE; A.b = 0;}
++trigger_event(A) ::= UPDATE OF inscollist(X). {A.a = TK_UPDATE; A.b = X; }
++
++%type foreach_clause {int}
++foreach_clause(A) ::= .                   { A = TK_ROW; }
++foreach_clause(A) ::= FOR EACH ROW.       { A = TK_ROW; }
++foreach_clause(A) ::= FOR EACH STATEMENT. { A = TK_STATEMENT; }
++
++%type when_clause {Expr *}
++when_clause(A) ::= .             { A = 0; }
++when_clause(A) ::= WHEN expr(X). { A = X; }
++
++%type trigger_cmd_list {TriggerStep *}
++%destructor trigger_cmd_list {sqliteDeleteTriggerStep($$);}
++trigger_cmd_list(A) ::= trigger_cmd(X) SEMI trigger_cmd_list(Y). {
++  X->pNext = Y;
++  A = X;
++}
++trigger_cmd_list(A) ::= . { A = 0; }
++
++%type trigger_cmd {TriggerStep *}
++%destructor trigger_cmd {sqliteDeleteTriggerStep($$);}
++// UPDATE 
++trigger_cmd(A) ::= UPDATE orconf(R) nm(X) SET setlist(Y) where_opt(Z).  
++               { A = sqliteTriggerUpdateStep(&X, Y, Z, R); }
++
++// INSERT
++trigger_cmd(A) ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) 
++  VALUES LP itemlist(Y) RP.  
++{A = sqliteTriggerInsertStep(&X, F, Y, 0, R);}
++
++trigger_cmd(A) ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) select(S).
++               {A = sqliteTriggerInsertStep(&X, F, 0, S, R);}
++
++// DELETE
++trigger_cmd(A) ::= DELETE FROM nm(X) where_opt(Y).
++               {A = sqliteTriggerDeleteStep(&X, Y);}
++
++// SELECT
++trigger_cmd(A) ::= select(X).  {A = sqliteTriggerSelectStep(X); }
++
++// The special RAISE expression that may occur in trigger programs
++expr(A) ::= RAISE(X) LP IGNORE RP(Y).  {
++  A = sqliteExpr(TK_RAISE, 0, 0, 0); 
++  A->iColumn = OE_Ignore;
++  sqliteExprSpan(A, &X, &Y);
++}
++expr(A) ::= RAISE(X) LP ROLLBACK COMMA nm(Z) RP(Y).  {
++  A = sqliteExpr(TK_RAISE, 0, 0, &Z); 
++  A->iColumn = OE_Rollback;
++  sqliteExprSpan(A, &X, &Y);
++}
++expr(A) ::= RAISE(X) LP ABORT COMMA nm(Z) RP(Y).  {
++  A = sqliteExpr(TK_RAISE, 0, 0, &Z); 
++  A->iColumn = OE_Abort;
++  sqliteExprSpan(A, &X, &Y);
++}
++expr(A) ::= RAISE(X) LP FAIL COMMA nm(Z) RP(Y).  {
++  A = sqliteExpr(TK_RAISE, 0, 0, &Z); 
++  A->iColumn = OE_Fail;
++  sqliteExprSpan(A, &X, &Y);
++}
++
++////////////////////////  DROP TRIGGER statement //////////////////////////////
++cmd ::= DROP TRIGGER nm(X) dbnm(D). {
++  sqliteDropTrigger(pParse,sqliteSrcListAppend(0,&X,&D));
++}
++
++//////////////////////// ATTACH DATABASE file AS name /////////////////////////
++cmd ::= ATTACH database_kw_opt ids(F) AS nm(D) key_opt(K). {
++  sqliteAttach(pParse, &F, &D, &K);
++}
++%type key_opt {Token}
++key_opt(A) ::= USING ids(X).  { A = X; }
++key_opt(A) ::= .              { A.z = 0; A.n = 0; }
++
++database_kw_opt ::= DATABASE.
++database_kw_opt ::= .
++
++//////////////////////// DETACH DATABASE name /////////////////////////////////
++cmd ::= DETACH database_kw_opt nm(D). {
++  sqliteDetach(pParse, &D);
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/pragma.c
+@@ -0,0 +1,712 @@
++/*
++** 2003 April 6
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code used to implement the PRAGMA command.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include <ctype.h>
++
++/*
++** Interpret the given string as a boolean value.
++*/
++static int getBoolean(const char *z){
++  static char *azTrue[] = { "yes", "on", "true" };
++  int i;
++  if( z[0]==0 ) return 0;
++  if( isdigit(z[0]) || (z[0]=='-' && isdigit(z[1])) ){
++    return atoi(z);
++  }
++  for(i=0; i<sizeof(azTrue)/sizeof(azTrue[0]); i++){
++    if( sqliteStrICmp(z,azTrue[i])==0 ) return 1;
++  }
++  return 0;
++}
++
++/*
++** Interpret the given string as a safety level.  Return 0 for OFF,
++** 1 for ON or NORMAL and 2 for FULL.  Return 1 for an empty or 
++** unrecognized string argument.
++**
++** Note that the values returned are one less that the values that
++** should be passed into sqliteBtreeSetSafetyLevel().  The is done
++** to support legacy SQL code.  The safety level used to be boolean
++** and older scripts may have used numbers 0 for OFF and 1 for ON.
++*/
++static int getSafetyLevel(char *z){
++  static const struct {
++    const char *zWord;
++    int val;
++  } aKey[] = {
++    { "no",    0 },
++    { "off",   0 },
++    { "false", 0 },
++    { "yes",   1 },
++    { "on",    1 },
++    { "true",  1 },
++    { "full",  2 },
++  };
++  int i;
++  if( z[0]==0 ) return 1;
++  if( isdigit(z[0]) || (z[0]=='-' && isdigit(z[1])) ){
++    return atoi(z);
++  }
++  for(i=0; i<sizeof(aKey)/sizeof(aKey[0]); i++){
++    if( sqliteStrICmp(z,aKey[i].zWord)==0 ) return aKey[i].val;
++  }
++  return 1;
++}
++
++/*
++** Interpret the given string as a temp db location. Return 1 for file
++** backed temporary databases, 2 for the Red-Black tree in memory database
++** and 0 to use the compile-time default.
++*/
++static int getTempStore(const char *z){
++  if( z[0]>='0' && z[0]<='2' ){
++    return z[0] - '0';
++  }else if( sqliteStrICmp(z, "file")==0 ){
++    return 1;
++  }else if( sqliteStrICmp(z, "memory")==0 ){
++    return 2;
++  }else{
++    return 0;
++  }
++}
++
++/*
++** If the TEMP database is open, close it and mark the database schema
++** as needing reloading.  This must be done when using the TEMP_STORE
++** or DEFAULT_TEMP_STORE pragmas.
++*/
++static int changeTempStorage(Parse *pParse, const char *zStorageType){
++  int ts = getTempStore(zStorageType);
++  sqlite *db = pParse->db;
++  if( db->temp_store==ts ) return SQLITE_OK;
++  if( db->aDb[1].pBt!=0 ){
++    if( db->flags & SQLITE_InTrans ){
++      sqliteErrorMsg(pParse, "temporary storage cannot be changed "
++        "from within a transaction");
++      return SQLITE_ERROR;
++    }
++    sqliteBtreeClose(db->aDb[1].pBt);
++    db->aDb[1].pBt = 0;
++    sqliteResetInternalSchema(db, 0);
++  }
++  db->temp_store = ts;
++  return SQLITE_OK;
++}
++
++/*
++** Check to see if zRight and zLeft refer to a pragma that queries
++** or changes one of the flags in db->flags.  Return 1 if so and 0 if not.
++** Also, implement the pragma.
++*/
++static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
++  static const struct {
++    const char *zName;  /* Name of the pragma */
++    int mask;           /* Mask for the db->flags value */
++  } aPragma[] = {
++    { "vdbe_trace",               SQLITE_VdbeTrace     },
++    { "full_column_names",        SQLITE_FullColNames  },
++    { "short_column_names",       SQLITE_ShortColNames },
++    { "show_datatypes",           SQLITE_ReportTypes   },
++    { "count_changes",            SQLITE_CountRows     },
++    { "empty_result_callbacks",   SQLITE_NullCallback  },
++  };
++  int i;
++  for(i=0; i<sizeof(aPragma)/sizeof(aPragma[0]); i++){
++    if( sqliteStrICmp(zLeft, aPragma[i].zName)==0 ){
++      sqlite *db = pParse->db;
++      Vdbe *v;
++      if( strcmp(zLeft,zRight)==0 && (v = sqliteGetVdbe(pParse))!=0 ){
++        sqliteVdbeOp3(v, OP_ColumnName, 0, 1, aPragma[i].zName, P3_STATIC);
++        sqliteVdbeOp3(v, OP_ColumnName, 1, 0, "boolean", P3_STATIC);
++        sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].mask)!=0, 0,
++                          OP_Callback, 1, 0,
++                          0);
++      }else if( getBoolean(zRight) ){
++        db->flags |= aPragma[i].mask;
++      }else{
++        db->flags &= ~aPragma[i].mask;
++      }
++      return 1;
++    }
++  }
++  return 0;
++}
++
++/*
++** Process a pragma statement.  
++**
++** Pragmas are of this form:
++**
++**      PRAGMA id = value
++**
++** The identifier might also be a string.  The value is a string, and
++** identifier, or a number.  If minusFlag is true, then the value is
++** a number that was preceded by a minus sign.
++*/
++void sqlitePragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){
++  char *zLeft = 0;
++  char *zRight = 0;
++  sqlite *db = pParse->db;
++  Vdbe *v = sqliteGetVdbe(pParse);
++  if( v==0 ) return;
++
++  zLeft = sqliteStrNDup(pLeft->z, pLeft->n);
++  sqliteDequote(zLeft);
++  if( minusFlag ){
++    zRight = 0;
++    sqliteSetNString(&zRight, "-", 1, pRight->z, pRight->n, 0);
++  }else{
++    zRight = sqliteStrNDup(pRight->z, pRight->n);
++    sqliteDequote(zRight);
++  }
++  if( sqliteAuthCheck(pParse, SQLITE_PRAGMA, zLeft, zRight, 0) ){
++    sqliteFree(zLeft);
++    sqliteFree(zRight);
++    return;
++  }
++ 
++  /*
++  **  PRAGMA default_cache_size
++  **  PRAGMA default_cache_size=N
++  **
++  ** The first form reports the current persistent setting for the
++  ** page cache size.  The value returned is the maximum number of
++  ** pages in the page cache.  The second form sets both the current
++  ** page cache size value and the persistent page cache size value
++  ** stored in the database file.
++  **
++  ** The default cache size is stored in meta-value 2 of page 1 of the
++  ** database file.  The cache size is actually the absolute value of
++  ** this memory location.  The sign of meta-value 2 determines the
++  ** synchronous setting.  A negative value means synchronous is off
++  ** and a positive value means synchronous is on.
++  */
++  if( sqliteStrICmp(zLeft,"default_cache_size")==0 ){
++    static VdbeOpList getCacheSize[] = {
++      { OP_ReadCookie,  0, 2,        0},
++      { OP_AbsValue,    0, 0,        0},
++      { OP_Dup,         0, 0,        0},
++      { OP_Integer,     0, 0,        0},
++      { OP_Ne,          0, 6,        0},
++      { OP_Integer,     0, 0,        0},  /* 5 */
++      { OP_ColumnName,  0, 1,        "cache_size"},
++      { OP_Callback,    1, 0,        0},
++    };
++    int addr;
++    if( pRight->z==pLeft->z ){
++      addr = sqliteVdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize);
++      sqliteVdbeChangeP1(v, addr+5, MAX_PAGES);
++    }else{
++      int size = atoi(zRight);
++      if( size<0 ) size = -size;
++      sqliteBeginWriteOperation(pParse, 0, 0);
++      sqliteVdbeAddOp(v, OP_Integer, size, 0);
++      sqliteVdbeAddOp(v, OP_ReadCookie, 0, 2);
++      addr = sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++      sqliteVdbeAddOp(v, OP_Ge, 0, addr+3);
++      sqliteVdbeAddOp(v, OP_Negative, 0, 0);
++      sqliteVdbeAddOp(v, OP_SetCookie, 0, 2);
++      sqliteEndWriteOperation(pParse);
++      db->cache_size = db->cache_size<0 ? -size : size;
++      sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size);
++    }
++  }else
++
++  /*
++  **  PRAGMA cache_size
++  **  PRAGMA cache_size=N
++  **
++  ** The first form reports the current local setting for the
++  ** page cache size.  The local setting can be different from
++  ** the persistent cache size value that is stored in the database
++  ** file itself.  The value returned is the maximum number of
++  ** pages in the page cache.  The second form sets the local
++  ** page cache size value.  It does not change the persistent
++  ** cache size stored on the disk so the cache size will revert
++  ** to its default value when the database is closed and reopened.
++  ** N should be a positive integer.
++  */
++  if( sqliteStrICmp(zLeft,"cache_size")==0 ){
++    static VdbeOpList getCacheSize[] = {
++      { OP_ColumnName,  0, 1,        "cache_size"},
++      { OP_Callback,    1, 0,        0},
++    };
++    if( pRight->z==pLeft->z ){
++      int size = db->cache_size;;
++      if( size<0 ) size = -size;
++      sqliteVdbeAddOp(v, OP_Integer, size, 0);
++      sqliteVdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize);
++    }else{
++      int size = atoi(zRight);
++      if( size<0 ) size = -size;
++      if( db->cache_size<0 ) size = -size;
++      db->cache_size = size;
++      sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size);
++    }
++  }else
++
++  /*
++  **  PRAGMA default_synchronous
++  **  PRAGMA default_synchronous=ON|OFF|NORMAL|FULL
++  **
++  ** The first form returns the persistent value of the "synchronous" setting
++  ** that is stored in the database.  This is the synchronous setting that
++  ** is used whenever the database is opened unless overridden by a separate
++  ** "synchronous" pragma.  The second form changes the persistent and the
++  ** local synchronous setting to the value given.
++  **
++  ** If synchronous is OFF, SQLite does not attempt any fsync() systems calls
++  ** to make sure data is committed to disk.  Write operations are very fast,
++  ** but a power failure can leave the database in an inconsistent state.
++  ** If synchronous is ON or NORMAL, SQLite will do an fsync() system call to
++  ** make sure data is being written to disk.  The risk of corruption due to
++  ** a power loss in this mode is negligible but non-zero.  If synchronous
++  ** is FULL, extra fsync()s occur to reduce the risk of corruption to near
++  ** zero, but with a write performance penalty.  The default mode is NORMAL.
++  */
++  if( sqliteStrICmp(zLeft,"default_synchronous")==0 ){
++    static VdbeOpList getSync[] = {
++      { OP_ColumnName,  0, 1,        "synchronous"},
++      { OP_ReadCookie,  0, 3,        0},
++      { OP_Dup,         0, 0,        0},
++      { OP_If,          0, 0,        0},  /* 3 */
++      { OP_ReadCookie,  0, 2,        0},
++      { OP_Integer,     0, 0,        0},
++      { OP_Lt,          0, 5,        0},
++      { OP_AddImm,      1, 0,        0},
++      { OP_Callback,    1, 0,        0},
++      { OP_Halt,        0, 0,        0},
++      { OP_AddImm,     -1, 0,        0},  /* 10 */
++      { OP_Callback,    1, 0,        0}
++    };
++    if( pRight->z==pLeft->z ){
++      int addr = sqliteVdbeAddOpList(v, ArraySize(getSync), getSync);
++      sqliteVdbeChangeP2(v, addr+3, addr+10);
++    }else{
++      int addr;
++      int size = db->cache_size;
++      if( size<0 ) size = -size;
++      sqliteBeginWriteOperation(pParse, 0, 0);
++      sqliteVdbeAddOp(v, OP_ReadCookie, 0, 2);
++      sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++      addr = sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++      sqliteVdbeAddOp(v, OP_Ne, 0, addr+3);
++      sqliteVdbeAddOp(v, OP_AddImm, MAX_PAGES, 0);
++      sqliteVdbeAddOp(v, OP_AbsValue, 0, 0);
++      db->safety_level = getSafetyLevel(zRight)+1;
++      if( db->safety_level==1 ){
++        sqliteVdbeAddOp(v, OP_Negative, 0, 0);
++        size = -size;
++      }
++      sqliteVdbeAddOp(v, OP_SetCookie, 0, 2);
++      sqliteVdbeAddOp(v, OP_Integer, db->safety_level, 0);
++      sqliteVdbeAddOp(v, OP_SetCookie, 0, 3);
++      sqliteEndWriteOperation(pParse);
++      db->cache_size = size;
++      sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size);
++      sqliteBtreeSetSafetyLevel(db->aDb[0].pBt, db->safety_level);
++    }
++  }else
++
++  /*
++  **   PRAGMA synchronous
++  **   PRAGMA synchronous=OFF|ON|NORMAL|FULL
++  **
++  ** Return or set the local value of the synchronous flag.  Changing
++  ** the local value does not make changes to the disk file and the
++  ** default value will be restored the next time the database is
++  ** opened.
++  */
++  if( sqliteStrICmp(zLeft,"synchronous")==0 ){
++    static VdbeOpList getSync[] = {
++      { OP_ColumnName,  0, 1,        "synchronous"},
++      { OP_Callback,    1, 0,        0},
++    };
++    if( pRight->z==pLeft->z ){
++      sqliteVdbeAddOp(v, OP_Integer, db->safety_level-1, 0);
++      sqliteVdbeAddOpList(v, ArraySize(getSync), getSync);
++    }else{
++      int size = db->cache_size;
++      if( size<0 ) size = -size;
++      db->safety_level = getSafetyLevel(zRight)+1;
++      if( db->safety_level==1 ) size = -size;
++      db->cache_size = size;
++      sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size);
++      sqliteBtreeSetSafetyLevel(db->aDb[0].pBt, db->safety_level);
++    }
++  }else
++
++#ifndef NDEBUG
++  if( sqliteStrICmp(zLeft, "trigger_overhead_test")==0 ){
++    if( getBoolean(zRight) ){
++      always_code_trigger_setup = 1;
++    }else{
++      always_code_trigger_setup = 0;
++    }
++  }else
++#endif
++
++  if( flagPragma(pParse, zLeft, zRight) ){
++    /* The flagPragma() call also generates any necessary code */
++  }else
++
++  if( sqliteStrICmp(zLeft, "table_info")==0 ){
++    Table *pTab;
++    pTab = sqliteFindTable(db, zRight, 0);
++    if( pTab ){
++      static VdbeOpList tableInfoPreface[] = {
++        { OP_ColumnName,  0, 0,       "cid"},
++        { OP_ColumnName,  1, 0,       "name"},
++        { OP_ColumnName,  2, 0,       "type"},
++        { OP_ColumnName,  3, 0,       "notnull"},
++        { OP_ColumnName,  4, 0,       "dflt_value"},
++        { OP_ColumnName,  5, 1,       "pk"},
++      };
++      int i;
++      sqliteVdbeAddOpList(v, ArraySize(tableInfoPreface), tableInfoPreface);
++      sqliteViewGetColumnNames(pParse, pTab);
++      for(i=0; i<pTab->nCol; i++){
++        sqliteVdbeAddOp(v, OP_Integer, i, 0);
++        sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zName, 0);
++        sqliteVdbeOp3(v, OP_String, 0, 0,
++           pTab->aCol[i].zType ? pTab->aCol[i].zType : "numeric", 0);
++        sqliteVdbeAddOp(v, OP_Integer, pTab->aCol[i].notNull, 0);
++        sqliteVdbeOp3(v, OP_String, 0, 0,
++           pTab->aCol[i].zDflt, P3_STATIC);
++        sqliteVdbeAddOp(v, OP_Integer, pTab->aCol[i].isPrimKey, 0);
++        sqliteVdbeAddOp(v, OP_Callback, 6, 0);
++      }
++    }
++  }else
++
++  if( sqliteStrICmp(zLeft, "index_info")==0 ){
++    Index *pIdx;
++    Table *pTab;
++    pIdx = sqliteFindIndex(db, zRight, 0);
++    if( pIdx ){
++      static VdbeOpList tableInfoPreface[] = {
++        { OP_ColumnName,  0, 0,       "seqno"},
++        { OP_ColumnName,  1, 0,       "cid"},
++        { OP_ColumnName,  2, 1,       "name"},
++      };
++      int i;
++      pTab = pIdx->pTable;
++      sqliteVdbeAddOpList(v, ArraySize(tableInfoPreface), tableInfoPreface);
++      for(i=0; i<pIdx->nColumn; i++){
++        int cnum = pIdx->aiColumn[i];
++        sqliteVdbeAddOp(v, OP_Integer, i, 0);
++        sqliteVdbeAddOp(v, OP_Integer, cnum, 0);
++        assert( pTab->nCol>cnum );
++        sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[cnum].zName, 0);
++        sqliteVdbeAddOp(v, OP_Callback, 3, 0);
++      }
++    }
++  }else
++
++  if( sqliteStrICmp(zLeft, "index_list")==0 ){
++    Index *pIdx;
++    Table *pTab;
++    pTab = sqliteFindTable(db, zRight, 0);
++    if( pTab ){
++      v = sqliteGetVdbe(pParse);
++      pIdx = pTab->pIndex;
++    }
++    if( pTab && pIdx ){
++      int i = 0; 
++      static VdbeOpList indexListPreface[] = {
++        { OP_ColumnName,  0, 0,       "seq"},
++        { OP_ColumnName,  1, 0,       "name"},
++        { OP_ColumnName,  2, 1,       "unique"},
++      };
++
++      sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface);
++      while(pIdx){
++        sqliteVdbeAddOp(v, OP_Integer, i, 0);
++        sqliteVdbeOp3(v, OP_String, 0, 0, pIdx->zName, 0);
++        sqliteVdbeAddOp(v, OP_Integer, pIdx->onError!=OE_None, 0);
++        sqliteVdbeAddOp(v, OP_Callback, 3, 0);
++        ++i;
++        pIdx = pIdx->pNext;
++      }
++    }
++  }else
++
++  if( sqliteStrICmp(zLeft, "foreign_key_list")==0 ){
++    FKey *pFK;
++    Table *pTab;
++    pTab = sqliteFindTable(db, zRight, 0);
++    if( pTab ){
++      v = sqliteGetVdbe(pParse);
++      pFK = pTab->pFKey;
++    }
++    if( pTab && pFK ){
++      int i = 0; 
++      static VdbeOpList indexListPreface[] = {
++        { OP_ColumnName,  0, 0,       "id"},
++        { OP_ColumnName,  1, 0,       "seq"},
++        { OP_ColumnName,  2, 0,       "table"},
++        { OP_ColumnName,  3, 0,       "from"},
++        { OP_ColumnName,  4, 1,       "to"},
++      };
++
++      sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface);
++      while(pFK){
++        int j;
++        for(j=0; j<pFK->nCol; j++){
++          sqliteVdbeAddOp(v, OP_Integer, i, 0);
++          sqliteVdbeAddOp(v, OP_Integer, j, 0);
++          sqliteVdbeOp3(v, OP_String, 0, 0, pFK->zTo, 0);
++          sqliteVdbeOp3(v, OP_String, 0, 0,
++                           pTab->aCol[pFK->aCol[j].iFrom].zName, 0);
++          sqliteVdbeOp3(v, OP_String, 0, 0, pFK->aCol[j].zCol, 0);
++          sqliteVdbeAddOp(v, OP_Callback, 5, 0);
++        }
++        ++i;
++        pFK = pFK->pNextFrom;
++      }
++    }
++  }else
++
++  if( sqliteStrICmp(zLeft, "database_list")==0 ){
++    int i;
++    static VdbeOpList indexListPreface[] = {
++      { OP_ColumnName,  0, 0,       "seq"},
++      { OP_ColumnName,  1, 0,       "name"},
++      { OP_ColumnName,  2, 1,       "file"},
++    };
++
++    sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface);
++    for(i=0; i<db->nDb; i++){
++      if( db->aDb[i].pBt==0 ) continue;
++      assert( db->aDb[i].zName!=0 );
++      sqliteVdbeAddOp(v, OP_Integer, i, 0);
++      sqliteVdbeOp3(v, OP_String, 0, 0, db->aDb[i].zName, 0);
++      sqliteVdbeOp3(v, OP_String, 0, 0,
++           sqliteBtreeGetFilename(db->aDb[i].pBt), 0);
++      sqliteVdbeAddOp(v, OP_Callback, 3, 0);
++    }
++  }else
++
++
++  /*
++  **   PRAGMA temp_store
++  **   PRAGMA temp_store = "default"|"memory"|"file"
++  **
++  ** Return or set the local value of the temp_store flag.  Changing
++  ** the local value does not make changes to the disk file and the default
++  ** value will be restored the next time the database is opened.
++  **
++  ** Note that it is possible for the library compile-time options to
++  ** override this setting
++  */
++  if( sqliteStrICmp(zLeft, "temp_store")==0 ){
++    static VdbeOpList getTmpDbLoc[] = {
++      { OP_ColumnName,  0, 1,        "temp_store"},
++      { OP_Callback,    1, 0,        0},
++    };
++    if( pRight->z==pLeft->z ){
++      sqliteVdbeAddOp(v, OP_Integer, db->temp_store, 0);
++      sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc);
++    }else{
++      changeTempStorage(pParse, zRight);
++    }
++  }else
++
++  /*
++  **   PRAGMA default_temp_store
++  **   PRAGMA default_temp_store = "default"|"memory"|"file"
++  **
++  ** Return or set the value of the persistent temp_store flag.  Any
++  ** change does not take effect until the next time the database is
++  ** opened.
++  **
++  ** Note that it is possible for the library compile-time options to
++  ** override this setting
++  */
++  if( sqliteStrICmp(zLeft, "default_temp_store")==0 ){
++    static VdbeOpList getTmpDbLoc[] = {
++      { OP_ColumnName,  0, 1,        "temp_store"},
++      { OP_ReadCookie,  0, 5,        0},
++      { OP_Callback,    1, 0,        0}};
++    if( pRight->z==pLeft->z ){
++      sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc);
++    }else{
++      sqliteBeginWriteOperation(pParse, 0, 0);
++      sqliteVdbeAddOp(v, OP_Integer, getTempStore(zRight), 0);
++      sqliteVdbeAddOp(v, OP_SetCookie, 0, 5);
++      sqliteEndWriteOperation(pParse);
++    }
++  }else
++
++#ifndef NDEBUG
++  if( sqliteStrICmp(zLeft, "parser_trace")==0 ){
++    extern void sqliteParserTrace(FILE*, char *);
++    if( getBoolean(zRight) ){
++      sqliteParserTrace(stdout, "parser: ");
++    }else{
++      sqliteParserTrace(0, 0);
++    }
++  }else
++#endif
++
++  if( sqliteStrICmp(zLeft, "integrity_check")==0 ){
++    int i, j, addr;
++
++    /* Code that initializes the integrity check program.  Set the
++    ** error count 0
++    */
++    static VdbeOpList initCode[] = {
++      { OP_Integer,     0, 0,        0},
++      { OP_MemStore,    0, 1,        0},
++      { OP_ColumnName,  0, 1,        "integrity_check"},
++    };
++
++    /* Code to do an BTree integrity check on a single database file.
++    */
++    static VdbeOpList checkDb[] = {
++      { OP_SetInsert,   0, 0,        "2"},
++      { OP_Integer,     0, 0,        0},    /* 1 */
++      { OP_OpenRead,    0, 2,        0},
++      { OP_Rewind,      0, 7,        0},    /* 3 */
++      { OP_Column,      0, 3,        0},    /* 4 */
++      { OP_SetInsert,   0, 0,        0},
++      { OP_Next,        0, 4,        0},    /* 6 */
++      { OP_IntegrityCk, 0, 0,        0},    /* 7 */
++      { OP_Dup,         0, 1,        0},
++      { OP_String,      0, 0,        "ok"},
++      { OP_StrEq,       0, 12,       0},    /* 10 */
++      { OP_MemIncr,     0, 0,        0},
++      { OP_String,      0, 0,        "*** in database "},
++      { OP_String,      0, 0,        0},    /* 13 */
++      { OP_String,      0, 0,        " ***\n"},
++      { OP_Pull,        3, 0,        0},
++      { OP_Concat,      4, 1,        0},
++      { OP_Callback,    1, 0,        0},
++    };
++
++    /* Code that appears at the end of the integrity check.  If no error
++    ** messages have been generated, output OK.  Otherwise output the
++    ** error message
++    */
++    static VdbeOpList endCode[] = {
++      { OP_MemLoad,     0, 0,        0},
++      { OP_Integer,     0, 0,        0},
++      { OP_Ne,          0, 0,        0},    /* 2 */
++      { OP_String,      0, 0,        "ok"},
++      { OP_Callback,    1, 0,        0},
++    };
++
++    /* Initialize the VDBE program */
++    sqliteVdbeAddOpList(v, ArraySize(initCode), initCode);
++
++    /* Do an integrity check on each database file */
++    for(i=0; i<db->nDb; i++){
++      HashElem *x;
++
++      /* Do an integrity check of the B-Tree
++      */
++      addr = sqliteVdbeAddOpList(v, ArraySize(checkDb), checkDb);
++      sqliteVdbeChangeP1(v, addr+1, i);
++      sqliteVdbeChangeP2(v, addr+3, addr+7);
++      sqliteVdbeChangeP2(v, addr+6, addr+4);
++      sqliteVdbeChangeP2(v, addr+7, i);
++      sqliteVdbeChangeP2(v, addr+10, addr+ArraySize(checkDb));
++      sqliteVdbeChangeP3(v, addr+13, db->aDb[i].zName, P3_STATIC);
++
++      /* Make sure all the indices are constructed correctly.
++      */
++      sqliteCodeVerifySchema(pParse, i);
++      for(x=sqliteHashFirst(&db->aDb[i].tblHash); x; x=sqliteHashNext(x)){
++        Table *pTab = sqliteHashData(x);
++        Index *pIdx;
++        int loopTop;
++
++        if( pTab->pIndex==0 ) continue;
++        sqliteVdbeAddOp(v, OP_Integer, i, 0);
++        sqliteVdbeOp3(v, OP_OpenRead, 1, pTab->tnum, pTab->zName, 0);
++        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
++          if( pIdx->tnum==0 ) continue;
++          sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0);
++          sqliteVdbeOp3(v, OP_OpenRead, j+2, pIdx->tnum, pIdx->zName, 0);
++        }
++        sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++        sqliteVdbeAddOp(v, OP_MemStore, 1, 1);
++        loopTop = sqliteVdbeAddOp(v, OP_Rewind, 1, 0);
++        sqliteVdbeAddOp(v, OP_MemIncr, 1, 0);
++        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
++          int k, jmp2;
++          static VdbeOpList idxErr[] = {
++            { OP_MemIncr,     0,  0,  0},
++            { OP_String,      0,  0,  "rowid "},
++            { OP_Recno,       1,  0,  0},
++            { OP_String,      0,  0,  " missing from index "},
++            { OP_String,      0,  0,  0},    /* 4 */
++            { OP_Concat,      4,  0,  0},
++            { OP_Callback,    1,  0,  0},
++          };
++          sqliteVdbeAddOp(v, OP_Recno, 1, 0);
++          for(k=0; k<pIdx->nColumn; k++){
++            int idx = pIdx->aiColumn[k];
++            if( idx==pTab->iPKey ){
++              sqliteVdbeAddOp(v, OP_Recno, 1, 0);
++            }else{
++              sqliteVdbeAddOp(v, OP_Column, 1, idx);
++            }
++          }
++          sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0);
++          if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx);
++          jmp2 = sqliteVdbeAddOp(v, OP_Found, j+2, 0);
++          addr = sqliteVdbeAddOpList(v, ArraySize(idxErr), idxErr);
++          sqliteVdbeChangeP3(v, addr+4, pIdx->zName, P3_STATIC);
++          sqliteVdbeChangeP2(v, jmp2, sqliteVdbeCurrentAddr(v));
++        }
++        sqliteVdbeAddOp(v, OP_Next, 1, loopTop+1);
++        sqliteVdbeChangeP2(v, loopTop, sqliteVdbeCurrentAddr(v));
++        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
++          static VdbeOpList cntIdx[] = {
++             { OP_Integer,      0,  0,  0},
++             { OP_MemStore,     2,  1,  0},
++             { OP_Rewind,       0,  0,  0},  /* 2 */
++             { OP_MemIncr,      2,  0,  0},
++             { OP_Next,         0,  0,  0},  /* 4 */
++             { OP_MemLoad,      1,  0,  0},
++             { OP_MemLoad,      2,  0,  0},
++             { OP_Eq,           0,  0,  0},  /* 7 */
++             { OP_MemIncr,      0,  0,  0},
++             { OP_String,       0,  0,  "wrong # of entries in index "},
++             { OP_String,       0,  0,  0},  /* 10 */
++             { OP_Concat,       2,  0,  0},
++             { OP_Callback,     1,  0,  0},
++          };
++          if( pIdx->tnum==0 ) continue;
++          addr = sqliteVdbeAddOpList(v, ArraySize(cntIdx), cntIdx);
++          sqliteVdbeChangeP1(v, addr+2, j+2);
++          sqliteVdbeChangeP2(v, addr+2, addr+5);
++          sqliteVdbeChangeP1(v, addr+4, j+2);
++          sqliteVdbeChangeP2(v, addr+4, addr+3);
++          sqliteVdbeChangeP2(v, addr+7, addr+ArraySize(cntIdx));
++          sqliteVdbeChangeP3(v, addr+10, pIdx->zName, P3_STATIC);
++        }
++      } 
++    }
++    addr = sqliteVdbeAddOpList(v, ArraySize(endCode), endCode);
++    sqliteVdbeChangeP2(v, addr+2, addr+ArraySize(endCode));
++  }else
++
++  {}
++  sqliteFree(zLeft);
++  sqliteFree(zRight);
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/printf.c
+@@ -0,0 +1,858 @@
++/*
++** The "printf" code that follows dates from the 1980's.  It is in
++** the public domain.  The original comments are included here for
++** completeness.  They are very out-of-date but might be useful as
++** an historical reference.  Most of the "enhancements" have been backed
++** out so that the functionality is now the same as standard printf().
++**
++**************************************************************************
++**
++** The following modules is an enhanced replacement for the "printf" subroutines
++** found in the standard C library.  The following enhancements are
++** supported:
++**
++**      +  Additional functions.  The standard set of "printf" functions
++**         includes printf, fprintf, sprintf, vprintf, vfprintf, and
++**         vsprintf.  This module adds the following:
++**
++**           *  snprintf -- Works like sprintf, but has an extra argument
++**                          which is the size of the buffer written to.
++**
++**           *  mprintf --  Similar to sprintf.  Writes output to memory
++**                          obtained from malloc.
++**
++**           *  xprintf --  Calls a function to dispose of output.
++**
++**           *  nprintf --  No output, but returns the number of characters
++**                          that would have been output by printf.
++**
++**           *  A v- version (ex: vsnprintf) of every function is also
++**              supplied.
++**
++**      +  A few extensions to the formatting notation are supported:
++**
++**           *  The "=" flag (similar to "-") causes the output to be
++**              be centered in the appropriately sized field.
++**
++**           *  The %b field outputs an integer in binary notation.
++**
++**           *  The %c field now accepts a precision.  The character output
++**              is repeated by the number of times the precision specifies.
++**
++**           *  The %' field works like %c, but takes as its character the
++**              next character of the format string, instead of the next
++**              argument.  For example,  printf("%.78'-")  prints 78 minus
++**              signs, the same as  printf("%.78c",'-').
++**
++**      +  When compiled using GCC on a SPARC, this version of printf is
++**         faster than the library printf for SUN OS 4.1.
++**
++**      +  All functions are fully reentrant.
++**
++*/
++#include "sqliteInt.h"
++
++/*
++** Conversion types fall into various categories as defined by the
++** following enumeration.
++*/
++#define etRADIX       1 /* Integer types.  %d, %x, %o, and so forth */
++#define etFLOAT       2 /* Floating point.  %f */
++#define etEXP         3 /* Exponentional notation. %e and %E */
++#define etGENERIC     4 /* Floating or exponential, depending on exponent. %g */
++#define etSIZE        5 /* Return number of characters processed so far. %n */
++#define etSTRING      6 /* Strings. %s */
++#define etDYNSTRING   7 /* Dynamically allocated strings. %z */
++#define etPERCENT     8 /* Percent symbol. %% */
++#define etCHARX       9 /* Characters. %c */
++#define etERROR      10 /* Used to indicate no such conversion type */
++/* The rest are extensions, not normally found in printf() */
++#define etCHARLIT    11 /* Literal characters.  %' */
++#define etSQLESCAPE  12 /* Strings with '\'' doubled.  %q */
++#define etSQLESCAPE2 13 /* Strings with '\'' doubled and enclosed in '',
++                          NULL pointers replaced by SQL NULL.  %Q */
++#define etTOKEN      14 /* a pointer to a Token structure */
++#define etSRCLIST    15 /* a pointer to a SrcList */
++
++
++/*
++** An "etByte" is an 8-bit unsigned value.
++*/
++typedef unsigned char etByte;
++
++/*
++** Each builtin conversion character (ex: the 'd' in "%d") is described
++** by an instance of the following structure
++*/
++typedef struct et_info {   /* Information about each format field */
++  char fmttype;            /* The format field code letter */
++  etByte base;             /* The base for radix conversion */
++  etByte flags;            /* One or more of FLAG_ constants below */
++  etByte type;             /* Conversion paradigm */
++  char *charset;           /* The character set for conversion */
++  char *prefix;            /* Prefix on non-zero values in alt format */
++} et_info;
++
++/*
++** Allowed values for et_info.flags
++*/
++#define FLAG_SIGNED  1     /* True if the value to convert is signed */
++#define FLAG_INTERN  2     /* True if for internal use only */
++
++
++/*
++** The following table is searched linearly, so it is good to put the
++** most frequently used conversion types first.
++*/
++static et_info fmtinfo[] = {
++  {  'd', 10, 1, etRADIX,      "0123456789",       0    },
++  {  's',  0, 0, etSTRING,     0,                  0    },
++  {  'z',  0, 2, etDYNSTRING,  0,                  0    },
++  {  'q',  0, 0, etSQLESCAPE,  0,                  0    },
++  {  'Q',  0, 0, etSQLESCAPE2, 0,                  0    },
++  {  'c',  0, 0, etCHARX,      0,                  0    },
++  {  'o',  8, 0, etRADIX,      "01234567",         "0"  },
++  {  'u', 10, 0, etRADIX,      "0123456789",       0    },
++  {  'x', 16, 0, etRADIX,      "0123456789abcdef", "x0" },
++  {  'X', 16, 0, etRADIX,      "0123456789ABCDEF", "X0" },
++  {  'f',  0, 1, etFLOAT,      0,                  0    },
++  {  'e',  0, 1, etEXP,        "e",                0    },
++  {  'E',  0, 1, etEXP,        "E",                0    },
++  {  'g',  0, 1, etGENERIC,    "e",                0    },
++  {  'G',  0, 1, etGENERIC,    "E",                0    },
++  {  'i', 10, 1, etRADIX,      "0123456789",       0    },
++  {  'n',  0, 0, etSIZE,       0,                  0    },
++  {  '%',  0, 0, etPERCENT,    0,                  0    },
++  {  'p', 10, 0, etRADIX,      "0123456789",       0    },
++  {  'T',  0, 2, etTOKEN,      0,                  0    },
++  {  'S',  0, 2, etSRCLIST,    0,                  0    },
++};
++#define etNINFO  (sizeof(fmtinfo)/sizeof(fmtinfo[0]))
++
++/*
++** If NOFLOATINGPOINT is defined, then none of the floating point
++** conversions will work.
++*/
++#ifndef etNOFLOATINGPOINT
++/*
++** "*val" is a double such that 0.1 <= *val < 10.0
++** Return the ascii code for the leading digit of *val, then
++** multiply "*val" by 10.0 to renormalize.
++**
++** Example:
++**     input:     *val = 3.14159
++**     output:    *val = 1.4159    function return = '3'
++**
++** The counter *cnt is incremented each time.  After counter exceeds
++** 16 (the number of significant digits in a 64-bit float) '0' is
++** always returned.
++*/
++static int et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){
++  int digit;
++  LONGDOUBLE_TYPE d;
++  if( (*cnt)++ >= 16 ) return '0';
++  digit = (int)*val;
++  d = digit;
++  digit += '0';
++  *val = (*val - d)*10.0;
++  return digit;
++}
++#endif
++
++#define etBUFSIZE 1000  /* Size of the output buffer */
++
++/*
++** The root program.  All variations call this core.
++**
++** INPUTS:
++**   func   This is a pointer to a function taking three arguments
++**            1. A pointer to anything.  Same as the "arg" parameter.
++**            2. A pointer to the list of characters to be output
++**               (Note, this list is NOT null terminated.)
++**            3. An integer number of characters to be output.
++**               (Note: This number might be zero.)
++**
++**   arg    This is the pointer to anything which will be passed as the
++**          first argument to "func".  Use it for whatever you like.
++**
++**   fmt    This is the format string, as in the usual print.
++**
++**   ap     This is a pointer to a list of arguments.  Same as in
++**          vfprint.
++**
++** OUTPUTS:
++**          The return value is the total number of characters sent to
++**          the function "func".  Returns -1 on a error.
++**
++** Note that the order in which automatic variables are declared below
++** seems to make a big difference in determining how fast this beast
++** will run.
++*/
++static int vxprintf(
++  void (*func)(void*,const char*,int),     /* Consumer of text */
++  void *arg,                         /* First argument to the consumer */
++  int useExtended,                   /* Allow extended %-conversions */
++  const char *fmt,                   /* Format string */
++  va_list ap                         /* arguments */
++){
++  int c;                     /* Next character in the format string */
++  char *bufpt;               /* Pointer to the conversion buffer */
++  int precision;             /* Precision of the current field */
++  int length;                /* Length of the field */
++  int idx;                   /* A general purpose loop counter */
++  int count;                 /* Total number of characters output */
++  int width;                 /* Width of the current field */
++  etByte flag_leftjustify;   /* True if "-" flag is present */
++  etByte flag_plussign;      /* True if "+" flag is present */
++  etByte flag_blanksign;     /* True if " " flag is present */
++  etByte flag_alternateform; /* True if "#" flag is present */
++  etByte flag_zeropad;       /* True if field width constant starts with zero */
++  etByte flag_long;          /* True if "l" flag is present */
++  unsigned long longvalue;   /* Value for integer types */
++  LONGDOUBLE_TYPE realvalue; /* Value for real types */
++  et_info *infop;            /* Pointer to the appropriate info structure */
++  char buf[etBUFSIZE];       /* Conversion buffer */
++  char prefix;               /* Prefix character.  "+" or "-" or " " or '\0'. */
++  etByte errorflag = 0;      /* True if an error is encountered */
++  etByte xtype;              /* Conversion paradigm */
++  char *zExtra;              /* Extra memory used for etTCLESCAPE conversions */
++  static char spaces[] = "                                                  ";
++#define etSPACESIZE (sizeof(spaces)-1)
++#ifndef etNOFLOATINGPOINT
++  int  exp;                  /* exponent of real numbers */
++  double rounder;            /* Used for rounding floating point values */
++  etByte flag_dp;            /* True if decimal point should be shown */
++  etByte flag_rtz;           /* True if trailing zeros should be removed */
++  etByte flag_exp;           /* True to force display of the exponent */
++  int nsd;                   /* Number of significant digits returned */
++#endif
++
++  func(arg,"",0);
++  count = length = 0;
++  bufpt = 0;
++  for(; (c=(*fmt))!=0; ++fmt){
++    if( c!='%' ){
++      int amt;
++      bufpt = (char *)fmt;
++      amt = 1;
++      while( (c=(*++fmt))!='%' && c!=0 ) amt++;
++      (*func)(arg,bufpt,amt);
++      count += amt;
++      if( c==0 ) break;
++    }
++    if( (c=(*++fmt))==0 ){
++      errorflag = 1;
++      (*func)(arg,"%",1);
++      count++;
++      break;
++    }
++    /* Find out what flags are present */
++    flag_leftjustify = flag_plussign = flag_blanksign = 
++     flag_alternateform = flag_zeropad = 0;
++    do{
++      switch( c ){
++        case '-':   flag_leftjustify = 1;     c = 0;   break;
++        case '+':   flag_plussign = 1;        c = 0;   break;
++        case ' ':   flag_blanksign = 1;       c = 0;   break;
++        case '#':   flag_alternateform = 1;   c = 0;   break;
++        case '0':   flag_zeropad = 1;         c = 0;   break;
++        default:                                       break;
++      }
++    }while( c==0 && (c=(*++fmt))!=0 );
++    /* Get the field width */
++    width = 0;
++    if( c=='*' ){
++      width = va_arg(ap,int);
++      if( width<0 ){
++        flag_leftjustify = 1;
++        width = -width;
++      }
++      c = *++fmt;
++    }else{
++      while( c>='0' && c<='9' ){
++        width = width*10 + c - '0';
++        c = *++fmt;
++      }
++    }
++    if( width > etBUFSIZE-10 ){
++      width = etBUFSIZE-10;
++    }
++    /* Get the precision */
++    if( c=='.' ){
++      precision = 0;
++      c = *++fmt;
++      if( c=='*' ){
++        precision = va_arg(ap,int);
++        if( precision<0 ) precision = -precision;
++        c = *++fmt;
++      }else{
++        while( c>='0' && c<='9' ){
++          precision = precision*10 + c - '0';
++          c = *++fmt;
++        }
++      }
++      /* Limit the precision to prevent overflowing buf[] during conversion */
++      if( precision>etBUFSIZE-40 ) precision = etBUFSIZE-40;
++    }else{
++      precision = -1;
++    }
++    /* Get the conversion type modifier */
++    if( c=='l' ){
++      flag_long = 1;
++      c = *++fmt;
++    }else{
++      flag_long = 0;
++    }
++    /* Fetch the info entry for the field */
++    infop = 0;
++    xtype = etERROR;
++    for(idx=0; idx<etNINFO; idx++){
++      if( c==fmtinfo[idx].fmttype ){
++        infop = &fmtinfo[idx];
++        if( useExtended || (infop->flags & FLAG_INTERN)==0 ){
++          xtype = infop->type;
++        }
++        break;
++      }
++    }
++    zExtra = 0;
++
++    /*
++    ** At this point, variables are initialized as follows:
++    **
++    **   flag_alternateform          TRUE if a '#' is present.
++    **   flag_plussign               TRUE if a '+' is present.
++    **   flag_leftjustify            TRUE if a '-' is present or if the
++    **                               field width was negative.
++    **   flag_zeropad                TRUE if the width began with 0.
++    **   flag_long                   TRUE if the letter 'l' (ell) prefixed
++    **                               the conversion character.
++    **   flag_blanksign              TRUE if a ' ' is present.
++    **   width                       The specified field width.  This is
++    **                               always non-negative.  Zero is the default.
++    **   precision                   The specified precision.  The default
++    **                               is -1.
++    **   xtype                       The class of the conversion.
++    **   infop                       Pointer to the appropriate info struct.
++    */
++    switch( xtype ){
++      case etRADIX:
++        if( flag_long )  longvalue = va_arg(ap,long);
++        else             longvalue = va_arg(ap,int);
++#if 1
++        /* For the format %#x, the value zero is printed "0" not "0x0".
++        ** I think this is stupid. */
++        if( longvalue==0 ) flag_alternateform = 0;
++#else
++        /* More sensible: turn off the prefix for octal (to prevent "00"),
++        ** but leave the prefix for hex. */
++        if( longvalue==0 && infop->base==8 ) flag_alternateform = 0;
++#endif
++        if( infop->flags & FLAG_SIGNED ){
++          if( *(long*)&longvalue<0 ){
++            longvalue = -*(long*)&longvalue;
++            prefix = '-';
++          }else if( flag_plussign )  prefix = '+';
++          else if( flag_blanksign )  prefix = ' ';
++          else                       prefix = 0;
++        }else                        prefix = 0;
++        if( flag_zeropad && precision<width-(prefix!=0) ){
++          precision = width-(prefix!=0);
++        }
++        bufpt = &buf[etBUFSIZE-1];
++        {
++          register char *cset;      /* Use registers for speed */
++          register int base;
++          cset = infop->charset;
++          base = infop->base;
++          do{                                           /* Convert to ascii */
++            *(--bufpt) = cset[longvalue%base];
++            longvalue = longvalue/base;
++          }while( longvalue>0 );
++        }
++        length = &buf[etBUFSIZE-1]-bufpt;
++        for(idx=precision-length; idx>0; idx--){
++          *(--bufpt) = '0';                             /* Zero pad */
++        }
++        if( prefix ) *(--bufpt) = prefix;               /* Add sign */
++        if( flag_alternateform && infop->prefix ){      /* Add "0" or "0x" */
++          char *pre, x;
++          pre = infop->prefix;
++          if( *bufpt!=pre[0] ){
++            for(pre=infop->prefix; (x=(*pre))!=0; pre++) *(--bufpt) = x;
++          }
++        }
++        length = &buf[etBUFSIZE-1]-bufpt;
++        break;
++      case etFLOAT:
++      case etEXP:
++      case etGENERIC:
++        realvalue = va_arg(ap,double);
++#ifndef etNOFLOATINGPOINT
++        if( precision<0 ) precision = 6;         /* Set default precision */
++        if( precision>etBUFSIZE-10 ) precision = etBUFSIZE-10;
++        if( realvalue<0.0 ){
++          realvalue = -realvalue;
++          prefix = '-';
++        }else{
++          if( flag_plussign )          prefix = '+';
++          else if( flag_blanksign )    prefix = ' ';
++          else                         prefix = 0;
++        }
++        if( infop->type==etGENERIC && precision>0 ) precision--;
++        rounder = 0.0;
++#if 0
++        /* Rounding works like BSD when the constant 0.4999 is used.  Wierd! */
++        for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
++#else
++        /* It makes more sense to use 0.5 */
++        for(idx=precision, rounder=0.5; idx>0; idx--, rounder*=0.1);
++#endif
++        if( infop->type==etFLOAT ) realvalue += rounder;
++        /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
++        exp = 0;
++        if( realvalue>0.0 ){
++          while( realvalue>=1e8 && exp<=350 ){ realvalue *= 1e-8; exp+=8; }
++          while( realvalue>=10.0 && exp<=350 ){ realvalue *= 0.1; exp++; }
++          while( realvalue<1e-8 && exp>=-350 ){ realvalue *= 1e8; exp-=8; }
++          while( realvalue<1.0 && exp>=-350 ){ realvalue *= 10.0; exp--; }
++          if( exp>350 || exp<-350 ){
++            bufpt = "NaN";
++            length = 3;
++            break;
++          }
++        }
++        bufpt = buf;
++        /*
++        ** If the field type is etGENERIC, then convert to either etEXP
++        ** or etFLOAT, as appropriate.
++        */
++        flag_exp = xtype==etEXP;
++        if( xtype!=etFLOAT ){
++          realvalue += rounder;
++          if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
++        }
++        if( xtype==etGENERIC ){
++          flag_rtz = !flag_alternateform;
++          if( exp<-4 || exp>precision ){
++            xtype = etEXP;
++          }else{
++            precision = precision - exp;
++            xtype = etFLOAT;
++          }
++        }else{
++          flag_rtz = 0;
++        }
++        /*
++        ** The "exp+precision" test causes output to be of type etEXP if
++        ** the precision is too large to fit in buf[].
++        */
++        nsd = 0;
++        if( xtype==etFLOAT && exp+precision<etBUFSIZE-30 ){
++          flag_dp = (precision>0 || flag_alternateform);
++          if( prefix ) *(bufpt++) = prefix;         /* Sign */
++          if( exp<0 )  *(bufpt++) = '0';            /* Digits before "." */
++          else for(; exp>=0; exp--) *(bufpt++) = et_getdigit(&realvalue,&nsd);
++          if( flag_dp ) *(bufpt++) = '.';           /* The decimal point */
++          for(exp++; exp<0 && precision>0; precision--, exp++){
++            *(bufpt++) = '0';
++          }
++          while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd);
++          *(bufpt--) = 0;                           /* Null terminate */
++          if( flag_rtz && flag_dp ){     /* Remove trailing zeros and "." */
++            while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0;
++            if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0;
++          }
++          bufpt++;                            /* point to next free slot */
++        }else{    /* etEXP or etGENERIC */
++          flag_dp = (precision>0 || flag_alternateform);
++          if( prefix ) *(bufpt++) = prefix;   /* Sign */
++          *(bufpt++) = et_getdigit(&realvalue,&nsd);  /* First digit */
++          if( flag_dp ) *(bufpt++) = '.';     /* Decimal point */
++          while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd);
++          bufpt--;                            /* point to last digit */
++          if( flag_rtz && flag_dp ){          /* Remove tail zeros */
++            while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0;
++            if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0;
++          }
++          bufpt++;                            /* point to next free slot */
++          if( exp || flag_exp ){
++            *(bufpt++) = infop->charset[0];
++            if( exp<0 ){ *(bufpt++) = '-'; exp = -exp; } /* sign of exp */
++            else       { *(bufpt++) = '+'; }
++            if( exp>=100 ){
++              *(bufpt++) = (exp/100)+'0';                /* 100's digit */
++              exp %= 100;
++            }
++            *(bufpt++) = exp/10+'0';                     /* 10's digit */
++            *(bufpt++) = exp%10+'0';                     /* 1's digit */
++          }
++        }
++        /* The converted number is in buf[] and zero terminated. Output it.
++        ** Note that the number is in the usual order, not reversed as with
++        ** integer conversions. */
++        length = bufpt-buf;
++        bufpt = buf;
++
++        /* Special case:  Add leading zeros if the flag_zeropad flag is
++        ** set and we are not left justified */
++        if( flag_zeropad && !flag_leftjustify && length < width){
++          int i;
++          int nPad = width - length;
++          for(i=width; i>=nPad; i--){
++            bufpt[i] = bufpt[i-nPad];
++          }
++          i = prefix!=0;
++          while( nPad-- ) bufpt[i++] = '0';
++          length = width;
++        }
++#endif
++        break;
++      case etSIZE:
++        *(va_arg(ap,int*)) = count;
++        length = width = 0;
++        break;
++      case etPERCENT:
++        buf[0] = '%';
++        bufpt = buf;
++        length = 1;
++        break;
++      case etCHARLIT:
++      case etCHARX:
++        c = buf[0] = (xtype==etCHARX ? va_arg(ap,int) : *++fmt);
++        if( precision>=0 ){
++          for(idx=1; idx<precision; idx++) buf[idx] = c;
++          length = precision;
++        }else{
++          length =1;
++        }
++        bufpt = buf;
++        break;
++      case etSTRING:
++      case etDYNSTRING:
++        bufpt = va_arg(ap,char*);
++        if( bufpt==0 ){
++          bufpt = "";
++        }else if( xtype==etDYNSTRING ){
++          zExtra = bufpt;
++        }
++        length = strlen(bufpt);
++        if( precision>=0 && precision<length ) length = precision;
++        break;
++      case etSQLESCAPE:
++      case etSQLESCAPE2:
++        {
++          int i, j, n, c, isnull;
++          char *arg = va_arg(ap,char*);
++          isnull = arg==0;
++          if( isnull ) arg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
++          for(i=n=0; (c=arg[i])!=0; i++){
++            if( c=='\'' )  n++;
++          }
++          n += i + 1 + ((!isnull && xtype==etSQLESCAPE2) ? 2 : 0);
++          if( n>etBUFSIZE ){
++            bufpt = zExtra = sqliteMalloc( n );
++            if( bufpt==0 ) return -1;
++          }else{
++            bufpt = buf;
++          }
++          j = 0;
++          if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\'';
++          for(i=0; (c=arg[i])!=0; i++){
++            bufpt[j++] = c;
++            if( c=='\'' ) bufpt[j++] = c;
++          }
++          if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\'';
++          bufpt[j] = 0;
++          length = j;
++          if( precision>=0 && precision<length ) length = precision;
++        }
++        break;
++      case etTOKEN: {
++        Token *pToken = va_arg(ap, Token*);
++        (*func)(arg, pToken->z, pToken->n);
++        length = width = 0;
++        break;
++      }
++      case etSRCLIST: {
++        SrcList *pSrc = va_arg(ap, SrcList*);
++        int k = va_arg(ap, int);
++        struct SrcList_item *pItem = &pSrc->a[k];
++        assert( k>=0 && k<pSrc->nSrc );
++        if( pItem->zDatabase && pItem->zDatabase[0] ){
++          (*func)(arg, pItem->zDatabase, strlen(pItem->zDatabase));
++          (*func)(arg, ".", 1);
++        }
++        (*func)(arg, pItem->zName, strlen(pItem->zName));
++        length = width = 0;
++        break;
++      }
++      case etERROR:
++        buf[0] = '%';
++        buf[1] = c;
++        errorflag = 0;
++        idx = 1+(c!=0);
++        (*func)(arg,"%",idx);
++        count += idx;
++        if( c==0 ) fmt--;
++        break;
++    }/* End switch over the format type */
++    /*
++    ** The text of the conversion is pointed to by "bufpt" and is
++    ** "length" characters long.  The field width is "width".  Do
++    ** the output.
++    */
++    if( !flag_leftjustify ){
++      register int nspace;
++      nspace = width-length;
++      if( nspace>0 ){
++        count += nspace;
++        while( nspace>=etSPACESIZE ){
++          (*func)(arg,spaces,etSPACESIZE);
++          nspace -= etSPACESIZE;
++        }
++        if( nspace>0 ) (*func)(arg,spaces,nspace);
++      }
++    }
++    if( length>0 ){
++      (*func)(arg,bufpt,length);
++      count += length;
++    }
++    if( flag_leftjustify ){
++      register int nspace;
++      nspace = width-length;
++      if( nspace>0 ){
++        count += nspace;
++        while( nspace>=etSPACESIZE ){
++          (*func)(arg,spaces,etSPACESIZE);
++          nspace -= etSPACESIZE;
++        }
++        if( nspace>0 ) (*func)(arg,spaces,nspace);
++      }
++    }
++    if( zExtra ){
++      sqliteFree(zExtra);
++    }
++  }/* End for loop over the format string */
++  return errorflag ? -1 : count;
++} /* End of function */
++
++
++/* This structure is used to store state information about the
++** write to memory that is currently in progress.
++*/
++struct sgMprintf {
++  char *zBase;     /* A base allocation */
++  char *zText;     /* The string collected so far */
++  int  nChar;      /* Length of the string so far */
++  int  nTotal;     /* Output size if unconstrained */
++  int  nAlloc;     /* Amount of space allocated in zText */
++  void *(*xRealloc)(void*,int);  /* Function used to realloc memory */
++};
++
++/* 
++** This function implements the callback from vxprintf. 
++**
++** This routine add nNewChar characters of text in zNewText to
++** the sgMprintf structure pointed to by "arg".
++*/
++static void mout(void *arg, const char *zNewText, int nNewChar){
++  struct sgMprintf *pM = (struct sgMprintf*)arg;
++  pM->nTotal += nNewChar;
++  if( pM->nChar + nNewChar + 1 > pM->nAlloc ){
++    if( pM->xRealloc==0 ){
++      nNewChar =  pM->nAlloc - pM->nChar - 1;
++    }else{
++      pM->nAlloc = pM->nChar + nNewChar*2 + 1;
++      if( pM->zText==pM->zBase ){
++        pM->zText = pM->xRealloc(0, pM->nAlloc);
++        if( pM->zText && pM->nChar ){
++          memcpy(pM->zText, pM->zBase, pM->nChar);
++        }
++      }else{
++        pM->zText = pM->xRealloc(pM->zText, pM->nAlloc);
++      }
++    }
++  }
++  if( pM->zText ){
++    if( nNewChar>0 ){
++      memcpy(&pM->zText[pM->nChar], zNewText, nNewChar);
++      pM->nChar += nNewChar;
++    }
++    pM->zText[pM->nChar] = 0;
++  }
++}
++
++/*
++** This routine is a wrapper around xprintf() that invokes mout() as
++** the consumer.  
++*/
++static char *base_vprintf(
++  void *(*xRealloc)(void*,int),   /* Routine to realloc memory. May be NULL */
++  int useInternal,                /* Use internal %-conversions if true */
++  char *zInitBuf,                 /* Initially write here, before mallocing */
++  int nInitBuf,                   /* Size of zInitBuf[] */
++  const char *zFormat,            /* format string */
++  va_list ap                      /* arguments */
++){
++  struct sgMprintf sM;
++  sM.zBase = sM.zText = zInitBuf;
++  sM.nChar = sM.nTotal = 0;
++  sM.nAlloc = nInitBuf;
++  sM.xRealloc = xRealloc;
++  vxprintf(mout, &sM, useInternal, zFormat, ap);
++  if( xRealloc ){
++    if( sM.zText==sM.zBase ){
++      sM.zText = xRealloc(0, sM.nChar+1);
++      memcpy(sM.zText, sM.zBase, sM.nChar+1);
++    }else if( sM.nAlloc>sM.nChar+10 ){
++      sM.zText = xRealloc(sM.zText, sM.nChar+1);
++    }
++  }
++  return sM.zText;
++}
++
++/*
++** Realloc that is a real function, not a macro.
++*/
++static void *printf_realloc(void *old, int size){
++  return sqliteRealloc(old,size);
++}
++
++/*
++** Print into memory obtained from sqliteMalloc().  Use the internal
++** %-conversion extensions.
++*/
++char *sqliteVMPrintf(const char *zFormat, va_list ap){
++  char zBase[1000];
++  return base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap);
++}
++
++/*
++** Print into memory obtained from sqliteMalloc().  Use the internal
++** %-conversion extensions.
++*/
++char *sqliteMPrintf(const char *zFormat, ...){
++  va_list ap;
++  char *z;
++  char zBase[1000];
++  va_start(ap, zFormat);
++  z = base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap);
++  va_end(ap);
++  return z;
++}
++
++/*
++** Print into memory obtained from malloc().  Do not use the internal
++** %-conversion extensions.  This routine is for use by external users.
++*/
++char *sqlite_mprintf(const char *zFormat, ...){
++  va_list ap;
++  char *z;
++  char zBuf[200];
++
++  va_start(ap,zFormat);
++  z = base_vprintf((void*(*)(void*,int))realloc, 0, 
++                   zBuf, sizeof(zBuf), zFormat, ap);
++  va_end(ap);
++  return z;
++}
++
++/* This is the varargs version of sqlite_mprintf.  
++*/
++char *sqlite_vmprintf(const char *zFormat, va_list ap){
++  char zBuf[200];
++  return base_vprintf((void*(*)(void*,int))realloc, 0,
++                      zBuf, sizeof(zBuf), zFormat, ap);
++}
++
++/*
++** sqlite_snprintf() works like snprintf() except that it ignores the
++** current locale settings.  This is important for SQLite because we
++** are not able to use a "," as the decimal point in place of "." as
++** specified by some locales.
++*/
++char *sqlite_snprintf(int n, char *zBuf, const char *zFormat, ...){
++  char *z;
++  va_list ap;
++
++  va_start(ap,zFormat);
++  z = base_vprintf(0, 0, zBuf, n, zFormat, ap);
++  va_end(ap);
++  return z;
++}
++
++/*
++** The following four routines implement the varargs versions of the
++** sqlite_exec() and sqlite_get_table() interfaces.  See the sqlite.h
++** header files for a more detailed description of how these interfaces
++** work.
++**
++** These routines are all just simple wrappers.
++*/
++int sqlite_exec_printf(
++  sqlite *db,                   /* An open database */
++  const char *sqlFormat,        /* printf-style format string for the SQL */
++  sqlite_callback xCallback,    /* Callback function */
++  void *pArg,                   /* 1st argument to callback function */
++  char **errmsg,                /* Error msg written here */
++  ...                           /* Arguments to the format string. */
++){
++  va_list ap;
++  int rc;
++
++  va_start(ap, errmsg);
++  rc = sqlite_exec_vprintf(db, sqlFormat, xCallback, pArg, errmsg, ap);
++  va_end(ap);
++  return rc;
++}
++int sqlite_exec_vprintf(
++  sqlite *db,                   /* An open database */
++  const char *sqlFormat,        /* printf-style format string for the SQL */
++  sqlite_callback xCallback,    /* Callback function */
++  void *pArg,                   /* 1st argument to callback function */
++  char **errmsg,                /* Error msg written here */
++  va_list ap                    /* Arguments to the format string. */
++){
++  char *zSql;
++  int rc;
++
++  zSql = sqlite_vmprintf(sqlFormat, ap);
++  rc = sqlite_exec(db, zSql, xCallback, pArg, errmsg);
++  free(zSql);
++  return rc;
++}
++int sqlite_get_table_printf(
++  sqlite *db,            /* An open database */
++  const char *sqlFormat, /* printf-style format string for the SQL */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncol,             /* Number of result columns written here */
++  char **errmsg,         /* Error msg written here */
++  ...                    /* Arguments to the format string */
++){
++  va_list ap;
++  int rc;
++
++  va_start(ap, errmsg);
++  rc = sqlite_get_table_vprintf(db, sqlFormat, resultp, nrow, ncol, errmsg, ap);
++  va_end(ap);
++  return rc;
++}
++int sqlite_get_table_vprintf(
++  sqlite *db,            /* An open database */
++  const char *sqlFormat, /* printf-style format string for the SQL */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncolumn,          /* Number of result columns written here */
++  char **errmsg,         /* Error msg written here */
++  va_list ap             /* Arguments to the format string */
++){
++  char *zSql;
++  int rc;
++
++  zSql = sqlite_vmprintf(sqlFormat, ap);
++  rc = sqlite_get_table(db, zSql, resultp, nrow, ncolumn, errmsg);
++  free(zSql);
++  return rc;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/random.c
+@@ -0,0 +1,97 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code to implement a pseudo-random number
++** generator (PRNG) for SQLite.
++**
++** Random numbers are used by some of the database backends in order
++** to generate random integer keys for tables or random filenames.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include "os.h"
++
++
++/*
++** Get a single 8-bit random value from the RC4 PRNG.  The Mutex
++** must be held while executing this routine.
++**
++** Why not just use a library random generator like lrand48() for this?
++** Because the OP_NewRecno opcode in the VDBE depends on having a very
++** good source of random numbers.  The lrand48() library function may
++** well be good enough.  But maybe not.  Or maybe lrand48() has some
++** subtle problems on some systems that could cause problems.  It is hard
++** to know.  To minimize the risk of problems due to bad lrand48()
++** implementations, SQLite uses this random number generator based
++** on RC4, which we know works very well.
++*/
++static int randomByte(){
++  unsigned char t;
++
++  /* All threads share a single random number generator.
++  ** This structure is the current state of the generator.
++  */
++  static struct {
++    unsigned char isInit;          /* True if initialized */
++    unsigned char i, j;            /* State variables */
++    unsigned char s[256];          /* State variables */
++  } prng;
++
++  /* Initialize the state of the random number generator once,
++  ** the first time this routine is called.  The seed value does
++  ** not need to contain a lot of randomness since we are not
++  ** trying to do secure encryption or anything like that...
++  **
++  ** Nothing in this file or anywhere else in SQLite does any kind of
++  ** encryption.  The RC4 algorithm is being used as a PRNG (pseudo-random
++  ** number generator) not as an encryption device.
++  */
++  if( !prng.isInit ){
++    int i;
++    char k[256];
++    prng.j = 0;
++    prng.i = 0;
++    sqliteOsRandomSeed(k);
++    for(i=0; i<256; i++){
++      prng.s[i] = i;
++    }
++    for(i=0; i<256; i++){
++      prng.j += prng.s[i] + k[i];
++      t = prng.s[prng.j];
++      prng.s[prng.j] = prng.s[i];
++      prng.s[i] = t;
++    }
++    prng.isInit = 1;
++  }
++
++  /* Generate and return single random byte
++  */
++  prng.i++;
++  t = prng.s[prng.i];
++  prng.j += t;
++  prng.s[prng.i] = prng.s[prng.j];
++  prng.s[prng.j] = t;
++  t += prng.s[prng.i];
++  return prng.s[t];
++}
++
++/*
++** Return N random bytes.
++*/
++void sqliteRandomness(int N, void *pBuf){
++  unsigned char *zBuf = pBuf;
++  sqliteOsEnterMutex();
++  while( N-- ){
++    *(zBuf++) = randomByte();
++  }
++  sqliteOsLeaveMutex();
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/select.c
+@@ -0,0 +1,2434 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains C code routines that are called by the parser
++** to handle SELECT statements in SQLite.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++
++/*
++** Allocate a new Select structure and return a pointer to that
++** structure.
++*/
++Select *sqliteSelectNew(
++  ExprList *pEList,     /* which columns to include in the result */
++  SrcList *pSrc,        /* the FROM clause -- which tables to scan */
++  Expr *pWhere,         /* the WHERE clause */
++  ExprList *pGroupBy,   /* the GROUP BY clause */
++  Expr *pHaving,        /* the HAVING clause */
++  ExprList *pOrderBy,   /* the ORDER BY clause */
++  int isDistinct,       /* true if the DISTINCT keyword is present */
++  int nLimit,           /* LIMIT value.  -1 means not used */
++  int nOffset           /* OFFSET value.  0 means no offset */
++){
++  Select *pNew;
++  pNew = sqliteMalloc( sizeof(*pNew) );
++  if( pNew==0 ){
++    sqliteExprListDelete(pEList);
++    sqliteSrcListDelete(pSrc);
++    sqliteExprDelete(pWhere);
++    sqliteExprListDelete(pGroupBy);
++    sqliteExprDelete(pHaving);
++    sqliteExprListDelete(pOrderBy);
++  }else{
++    if( pEList==0 ){
++      pEList = sqliteExprListAppend(0, sqliteExpr(TK_ALL,0,0,0), 0);
++    }
++    pNew->pEList = pEList;
++    pNew->pSrc = pSrc;
++    pNew->pWhere = pWhere;
++    pNew->pGroupBy = pGroupBy;
++    pNew->pHaving = pHaving;
++    pNew->pOrderBy = pOrderBy;
++    pNew->isDistinct = isDistinct;
++    pNew->op = TK_SELECT;
++    pNew->nLimit = nLimit;
++    pNew->nOffset = nOffset;
++    pNew->iLimit = -1;
++    pNew->iOffset = -1;
++  }
++  return pNew;
++}
++
++/*
++** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the
++** type of join.  Return an integer constant that expresses that type
++** in terms of the following bit values:
++**
++**     JT_INNER
++**     JT_OUTER
++**     JT_NATURAL
++**     JT_LEFT
++**     JT_RIGHT
++**
++** A full outer join is the combination of JT_LEFT and JT_RIGHT.
++**
++** If an illegal or unsupported join type is seen, then still return
++** a join type, but put an error in the pParse structure.
++*/
++int sqliteJoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){
++  int jointype = 0;
++  Token *apAll[3];
++  Token *p;
++  static struct {
++    const char *zKeyword;
++    int nChar;
++    int code;
++  } keywords[] = {
++    { "natural", 7, JT_NATURAL },
++    { "left",    4, JT_LEFT|JT_OUTER },
++    { "right",   5, JT_RIGHT|JT_OUTER },
++    { "full",    4, JT_LEFT|JT_RIGHT|JT_OUTER },
++    { "outer",   5, JT_OUTER },
++    { "inner",   5, JT_INNER },
++    { "cross",   5, JT_INNER },
++  };
++  int i, j;
++  apAll[0] = pA;
++  apAll[1] = pB;
++  apAll[2] = pC;
++  for(i=0; i<3 && apAll[i]; i++){
++    p = apAll[i];
++    for(j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++){
++      if( p->n==keywords[j].nChar 
++          && sqliteStrNICmp(p->z, keywords[j].zKeyword, p->n)==0 ){
++        jointype |= keywords[j].code;
++        break;
++      }
++    }
++    if( j>=sizeof(keywords)/sizeof(keywords[0]) ){
++      jointype |= JT_ERROR;
++      break;
++    }
++  }
++  if(
++     (jointype & (JT_INNER|JT_OUTER))==(JT_INNER|JT_OUTER) ||
++     (jointype & JT_ERROR)!=0
++  ){
++    static Token dummy = { 0, 0 };
++    char *zSp1 = " ", *zSp2 = " ";
++    if( pB==0 ){ pB = &dummy; zSp1 = 0; }
++    if( pC==0 ){ pC = &dummy; zSp2 = 0; }
++    sqliteSetNString(&pParse->zErrMsg, "unknown or unsupported join type: ", 0,
++       pA->z, pA->n, zSp1, 1, pB->z, pB->n, zSp2, 1, pC->z, pC->n, 0);
++    pParse->nErr++;
++    jointype = JT_INNER;
++  }else if( jointype & JT_RIGHT ){
++    sqliteErrorMsg(pParse, 
++      "RIGHT and FULL OUTER JOINs are not currently supported");
++    jointype = JT_INNER;
++  }
++  return jointype;
++}
++
++/*
++** Return the index of a column in a table.  Return -1 if the column
++** is not contained in the table.
++*/
++static int columnIndex(Table *pTab, const char *zCol){
++  int i;
++  for(i=0; i<pTab->nCol; i++){
++    if( sqliteStrICmp(pTab->aCol[i].zName, zCol)==0 ) return i;
++  }
++  return -1;
++}
++
++/*
++** Add a term to the WHERE expression in *ppExpr that requires the
++** zCol column to be equal in the two tables pTab1 and pTab2.
++*/
++static void addWhereTerm(
++  const char *zCol,        /* Name of the column */
++  const Table *pTab1,      /* First table */
++  const Table *pTab2,      /* Second table */
++  Expr **ppExpr            /* Add the equality term to this expression */
++){
++  Token dummy;
++  Expr *pE1a, *pE1b, *pE1c;
++  Expr *pE2a, *pE2b, *pE2c;
++  Expr *pE;
++
++  dummy.z = zCol;
++  dummy.n = strlen(zCol);
++  dummy.dyn = 0;
++  pE1a = sqliteExpr(TK_ID, 0, 0, &dummy);
++  pE2a = sqliteExpr(TK_ID, 0, 0, &dummy);
++  dummy.z = pTab1->zName;
++  dummy.n = strlen(dummy.z);
++  pE1b = sqliteExpr(TK_ID, 0, 0, &dummy);
++  dummy.z = pTab2->zName;
++  dummy.n = strlen(dummy.z);
++  pE2b = sqliteExpr(TK_ID, 0, 0, &dummy);
++  pE1c = sqliteExpr(TK_DOT, pE1b, pE1a, 0);
++  pE2c = sqliteExpr(TK_DOT, pE2b, pE2a, 0);
++  pE = sqliteExpr(TK_EQ, pE1c, pE2c, 0);
++  ExprSetProperty(pE, EP_FromJoin);
++  if( *ppExpr ){
++    *ppExpr = sqliteExpr(TK_AND, *ppExpr, pE, 0);
++  }else{
++    *ppExpr = pE;
++  }
++}
++
++/*
++** Set the EP_FromJoin property on all terms of the given expression.
++**
++** The EP_FromJoin property is used on terms of an expression to tell
++** the LEFT OUTER JOIN processing logic that this term is part of the
++** join restriction specified in the ON or USING clause and not a part
++** of the more general WHERE clause.  These terms are moved over to the
++** WHERE clause during join processing but we need to remember that they
++** originated in the ON or USING clause.
++*/
++static void setJoinExpr(Expr *p){
++  while( p ){
++    ExprSetProperty(p, EP_FromJoin);
++    setJoinExpr(p->pLeft);
++    p = p->pRight;
++  } 
++}
++
++/*
++** This routine processes the join information for a SELECT statement.
++** ON and USING clauses are converted into extra terms of the WHERE clause.
++** NATURAL joins also create extra WHERE clause terms.
++**
++** This routine returns the number of errors encountered.
++*/
++static int sqliteProcessJoin(Parse *pParse, Select *p){
++  SrcList *pSrc;
++  int i, j;
++  pSrc = p->pSrc;
++  for(i=0; i<pSrc->nSrc-1; i++){
++    struct SrcList_item *pTerm = &pSrc->a[i];
++    struct SrcList_item *pOther = &pSrc->a[i+1];
++
++    if( pTerm->pTab==0 || pOther->pTab==0 ) continue;
++
++    /* When the NATURAL keyword is present, add WHERE clause terms for
++    ** every column that the two tables have in common.
++    */
++    if( pTerm->jointype & JT_NATURAL ){
++      Table *pTab;
++      if( pTerm->pOn || pTerm->pUsing ){
++        sqliteErrorMsg(pParse, "a NATURAL join may not have "
++           "an ON or USING clause", 0);
++        return 1;
++      }
++      pTab = pTerm->pTab;
++      for(j=0; j<pTab->nCol; j++){
++        if( columnIndex(pOther->pTab, pTab->aCol[j].zName)>=0 ){
++          addWhereTerm(pTab->aCol[j].zName, pTab, pOther->pTab, &p->pWhere);
++        }
++      }
++    }
++
++    /* Disallow both ON and USING clauses in the same join
++    */
++    if( pTerm->pOn && pTerm->pUsing ){
++      sqliteErrorMsg(pParse, "cannot have both ON and USING "
++        "clauses in the same join");
++      return 1;
++    }
++
++    /* Add the ON clause to the end of the WHERE clause, connected by
++    ** and AND operator.
++    */
++    if( pTerm->pOn ){
++      setJoinExpr(pTerm->pOn);
++      if( p->pWhere==0 ){
++        p->pWhere = pTerm->pOn;
++      }else{
++        p->pWhere = sqliteExpr(TK_AND, p->pWhere, pTerm->pOn, 0);
++      }
++      pTerm->pOn = 0;
++    }
++
++    /* Create extra terms on the WHERE clause for each column named
++    ** in the USING clause.  Example: If the two tables to be joined are 
++    ** A and B and the USING clause names X, Y, and Z, then add this
++    ** to the WHERE clause:    A.X=B.X AND A.Y=B.Y AND A.Z=B.Z
++    ** Report an error if any column mentioned in the USING clause is
++    ** not contained in both tables to be joined.
++    */
++    if( pTerm->pUsing ){
++      IdList *pList;
++      int j;
++      assert( i<pSrc->nSrc-1 );
++      pList = pTerm->pUsing;
++      for(j=0; j<pList->nId; j++){
++        if( columnIndex(pTerm->pTab, pList->a[j].zName)<0 ||
++            columnIndex(pOther->pTab, pList->a[j].zName)<0 ){
++          sqliteErrorMsg(pParse, "cannot join using column %s - column "
++            "not present in both tables", pList->a[j].zName);
++          return 1;
++        }
++        addWhereTerm(pList->a[j].zName, pTerm->pTab, pOther->pTab, &p->pWhere);
++      }
++    }
++  }
++  return 0;
++}
++
++/*
++** Delete the given Select structure and all of its substructures.
++*/
++void sqliteSelectDelete(Select *p){
++  if( p==0 ) return;
++  sqliteExprListDelete(p->pEList);
++  sqliteSrcListDelete(p->pSrc);
++  sqliteExprDelete(p->pWhere);
++  sqliteExprListDelete(p->pGroupBy);
++  sqliteExprDelete(p->pHaving);
++  sqliteExprListDelete(p->pOrderBy);
++  sqliteSelectDelete(p->pPrior);
++  sqliteFree(p->zSelect);
++  sqliteFree(p);
++}
++
++/*
++** Delete the aggregate information from the parse structure.
++*/
++static void sqliteAggregateInfoReset(Parse *pParse){
++  sqliteFree(pParse->aAgg);
++  pParse->aAgg = 0;
++  pParse->nAgg = 0;
++  pParse->useAgg = 0;
++}
++
++/*
++** Insert code into "v" that will push the record on the top of the
++** stack into the sorter.
++*/
++static void pushOntoSorter(Parse *pParse, Vdbe *v, ExprList *pOrderBy){
++  char *zSortOrder;
++  int i;
++  zSortOrder = sqliteMalloc( pOrderBy->nExpr + 1 );
++  if( zSortOrder==0 ) return;
++  for(i=0; i<pOrderBy->nExpr; i++){
++    int order = pOrderBy->a[i].sortOrder;
++    int type;
++    int c;
++    if( (order & SQLITE_SO_TYPEMASK)==SQLITE_SO_TEXT ){
++      type = SQLITE_SO_TEXT;
++    }else if( (order & SQLITE_SO_TYPEMASK)==SQLITE_SO_NUM ){
++      type = SQLITE_SO_NUM;
++    }else if( pParse->db->file_format>=4 ){
++      type = sqliteExprType(pOrderBy->a[i].pExpr);
++    }else{
++      type = SQLITE_SO_NUM;
++    }
++    if( (order & SQLITE_SO_DIRMASK)==SQLITE_SO_ASC ){
++      c = type==SQLITE_SO_TEXT ? 'A' : '+';
++    }else{
++      c = type==SQLITE_SO_TEXT ? 'D' : '-';
++    }
++    zSortOrder[i] = c;
++    sqliteExprCode(pParse, pOrderBy->a[i].pExpr);
++  }
++  zSortOrder[pOrderBy->nExpr] = 0;
++  sqliteVdbeOp3(v, OP_SortMakeKey, pOrderBy->nExpr, 0, zSortOrder, P3_DYNAMIC);
++  sqliteVdbeAddOp(v, OP_SortPut, 0, 0);
++}
++
++/*
++** This routine adds a P3 argument to the last VDBE opcode that was
++** inserted. The P3 argument added is a string suitable for the 
++** OP_MakeKey or OP_MakeIdxKey opcodes.  The string consists of
++** characters 't' or 'n' depending on whether or not the various
++** fields of the key to be generated should be treated as numeric
++** or as text.  See the OP_MakeKey and OP_MakeIdxKey opcode
++** documentation for additional information about the P3 string.
++** See also the sqliteAddIdxKeyType() routine.
++*/
++void sqliteAddKeyType(Vdbe *v, ExprList *pEList){
++  int nColumn = pEList->nExpr;
++  char *zType = sqliteMalloc( nColumn+1 );
++  int i;
++  if( zType==0 ) return;
++  for(i=0; i<nColumn; i++){
++    zType[i] = sqliteExprType(pEList->a[i].pExpr)==SQLITE_SO_NUM ? 'n' : 't';
++  }
++  zType[i] = 0;
++  sqliteVdbeChangeP3(v, -1, zType, P3_DYNAMIC);
++}
++
++/*
++** Add code to implement the OFFSET and LIMIT
++*/
++static void codeLimiter(
++  Vdbe *v,          /* Generate code into this VM */
++  Select *p,        /* The SELECT statement being coded */
++  int iContinue,    /* Jump here to skip the current record */
++  int iBreak,       /* Jump here to end the loop */
++  int nPop          /* Number of times to pop stack when jumping */
++){
++  if( p->iOffset>=0 ){
++    int addr = sqliteVdbeCurrentAddr(v) + 2;
++    if( nPop>0 ) addr++;
++    sqliteVdbeAddOp(v, OP_MemIncr, p->iOffset, addr);
++    if( nPop>0 ){
++      sqliteVdbeAddOp(v, OP_Pop, nPop, 0);
++    }
++    sqliteVdbeAddOp(v, OP_Goto, 0, iContinue);
++  }
++  if( p->iLimit>=0 ){
++    sqliteVdbeAddOp(v, OP_MemIncr, p->iLimit, iBreak);
++  }
++}
++
++/*
++** This routine generates the code for the inside of the inner loop
++** of a SELECT.
++**
++** If srcTab and nColumn are both zero, then the pEList expressions
++** are evaluated in order to get the data for this row.  If nColumn>0
++** then data is pulled from srcTab and pEList is used only to get the
++** datatypes for each column.
++*/
++static int selectInnerLoop(
++  Parse *pParse,          /* The parser context */
++  Select *p,              /* The complete select statement being coded */
++  ExprList *pEList,       /* List of values being extracted */
++  int srcTab,             /* Pull data from this table */
++  int nColumn,            /* Number of columns in the source table */
++  ExprList *pOrderBy,     /* If not NULL, sort results using this key */
++  int distinct,           /* If >=0, make sure results are distinct */
++  int eDest,              /* How to dispose of the results */
++  int iParm,              /* An argument to the disposal method */
++  int iContinue,          /* Jump here to continue with next row */
++  int iBreak              /* Jump here to break out of the inner loop */
++){
++  Vdbe *v = pParse->pVdbe;
++  int i;
++  int hasDistinct;        /* True if the DISTINCT keyword is present */
++
++  if( v==0 ) return 0;
++  assert( pEList!=0 );
++
++  /* If there was a LIMIT clause on the SELECT statement, then do the check
++  ** to see if this row should be output.
++  */
++  hasDistinct = distinct>=0 && pEList && pEList->nExpr>0;
++  if( pOrderBy==0 && !hasDistinct ){
++    codeLimiter(v, p, iContinue, iBreak, 0);
++  }
++
++  /* Pull the requested columns.
++  */
++  if( nColumn>0 ){
++    for(i=0; i<nColumn; i++){
++      sqliteVdbeAddOp(v, OP_Column, srcTab, i);
++    }
++  }else{
++    nColumn = pEList->nExpr;
++    for(i=0; i<pEList->nExpr; i++){
++      sqliteExprCode(pParse, pEList->a[i].pExpr);
++    }
++  }
++
++  /* If the DISTINCT keyword was present on the SELECT statement
++  ** and this row has been seen before, then do not make this row
++  ** part of the result.
++  */
++  if( hasDistinct ){
++#if NULL_ALWAYS_DISTINCT
++    sqliteVdbeAddOp(v, OP_IsNull, -pEList->nExpr, sqliteVdbeCurrentAddr(v)+7);
++#endif
++    sqliteVdbeAddOp(v, OP_MakeKey, pEList->nExpr, 1);
++    if( pParse->db->file_format>=4 ) sqliteAddKeyType(v, pEList);
++    sqliteVdbeAddOp(v, OP_Distinct, distinct, sqliteVdbeCurrentAddr(v)+3);
++    sqliteVdbeAddOp(v, OP_Pop, pEList->nExpr+1, 0);
++    sqliteVdbeAddOp(v, OP_Goto, 0, iContinue);
++    sqliteVdbeAddOp(v, OP_String, 0, 0);
++    sqliteVdbeAddOp(v, OP_PutStrKey, distinct, 0);
++    if( pOrderBy==0 ){
++      codeLimiter(v, p, iContinue, iBreak, nColumn);
++    }
++  }
++
++  switch( eDest ){
++    /* In this mode, write each query result to the key of the temporary
++    ** table iParm.
++    */
++    case SRT_Union: {
++      sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT);
++      sqliteVdbeAddOp(v, OP_String, 0, 0);
++      sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0);
++      break;
++    }
++
++    /* Store the result as data using a unique key.
++    */
++    case SRT_Table:
++    case SRT_TempTable: {
++      sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0);
++      if( pOrderBy ){
++        pushOntoSorter(pParse, v, pOrderBy);
++      }else{
++        sqliteVdbeAddOp(v, OP_NewRecno, iParm, 0);
++        sqliteVdbeAddOp(v, OP_Pull, 1, 0);
++        sqliteVdbeAddOp(v, OP_PutIntKey, iParm, 0);
++      }
++      break;
++    }
++
++    /* Construct a record from the query result, but instead of
++    ** saving that record, use it as a key to delete elements from
++    ** the temporary table iParm.
++    */
++    case SRT_Except: {
++      int addr;
++      addr = sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT);
++      sqliteVdbeAddOp(v, OP_NotFound, iParm, addr+3);
++      sqliteVdbeAddOp(v, OP_Delete, iParm, 0);
++      break;
++    }
++
++    /* If we are creating a set for an "expr IN (SELECT ...)" construct,
++    ** then there should be a single item on the stack.  Write this
++    ** item into the set table with bogus data.
++    */
++    case SRT_Set: {
++      int addr1 = sqliteVdbeCurrentAddr(v);
++      int addr2;
++      assert( nColumn==1 );
++      sqliteVdbeAddOp(v, OP_NotNull, -1, addr1+3);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      addr2 = sqliteVdbeAddOp(v, OP_Goto, 0, 0);
++      if( pOrderBy ){
++        pushOntoSorter(pParse, v, pOrderBy);
++      }else{
++        sqliteVdbeAddOp(v, OP_String, 0, 0);
++        sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0);
++      }
++      sqliteVdbeChangeP2(v, addr2, sqliteVdbeCurrentAddr(v));
++      break;
++    }
++
++    /* If this is a scalar select that is part of an expression, then
++    ** store the results in the appropriate memory cell and break out
++    ** of the scan loop.
++    */
++    case SRT_Mem: {
++      assert( nColumn==1 );
++      if( pOrderBy ){
++        pushOntoSorter(pParse, v, pOrderBy);
++      }else{
++        sqliteVdbeAddOp(v, OP_MemStore, iParm, 1);
++        sqliteVdbeAddOp(v, OP_Goto, 0, iBreak);
++      }
++      break;
++    }
++
++    /* Send the data to the callback function.
++    */
++    case SRT_Callback:
++    case SRT_Sorter: {
++      if( pOrderBy ){
++        sqliteVdbeAddOp(v, OP_SortMakeRec, nColumn, 0);
++        pushOntoSorter(pParse, v, pOrderBy);
++      }else{
++        assert( eDest==SRT_Callback );
++        sqliteVdbeAddOp(v, OP_Callback, nColumn, 0);
++      }
++      break;
++    }
++
++    /* Invoke a subroutine to handle the results.  The subroutine itself
++    ** is responsible for popping the results off of the stack.
++    */
++    case SRT_Subroutine: {
++      if( pOrderBy ){
++        sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0);
++        pushOntoSorter(pParse, v, pOrderBy);
++      }else{
++        sqliteVdbeAddOp(v, OP_Gosub, 0, iParm);
++      }
++      break;
++    }
++
++    /* Discard the results.  This is used for SELECT statements inside
++    ** the body of a TRIGGER.  The purpose of such selects is to call
++    ** user-defined functions that have side effects.  We do not care
++    ** about the actual results of the select.
++    */
++    default: {
++      assert( eDest==SRT_Discard );
++      sqliteVdbeAddOp(v, OP_Pop, nColumn, 0);
++      break;
++    }
++  }
++  return 0;
++}
++
++/*
++** If the inner loop was generated using a non-null pOrderBy argument,
++** then the results were placed in a sorter.  After the loop is terminated
++** we need to run the sorter and output the results.  The following
++** routine generates the code needed to do that.
++*/
++static void generateSortTail(
++  Select *p,       /* The SELECT statement */
++  Vdbe *v,         /* Generate code into this VDBE */
++  int nColumn,     /* Number of columns of data */
++  int eDest,       /* Write the sorted results here */
++  int iParm        /* Optional parameter associated with eDest */
++){
++  int end1 = sqliteVdbeMakeLabel(v);
++  int end2 = sqliteVdbeMakeLabel(v);
++  int addr;
++  if( eDest==SRT_Sorter ) return;
++  sqliteVdbeAddOp(v, OP_Sort, 0, 0);
++  addr = sqliteVdbeAddOp(v, OP_SortNext, 0, end1);
++  codeLimiter(v, p, addr, end2, 1);
++  switch( eDest ){
++    case SRT_Callback: {
++      sqliteVdbeAddOp(v, OP_SortCallback, nColumn, 0);
++      break;
++    }
++    case SRT_Table:
++    case SRT_TempTable: {
++      sqliteVdbeAddOp(v, OP_NewRecno, iParm, 0);
++      sqliteVdbeAddOp(v, OP_Pull, 1, 0);
++      sqliteVdbeAddOp(v, OP_PutIntKey, iParm, 0);
++      break;
++    }
++    case SRT_Set: {
++      assert( nColumn==1 );
++      sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      sqliteVdbeAddOp(v, OP_Goto, 0, sqliteVdbeCurrentAddr(v)+3);
++      sqliteVdbeAddOp(v, OP_String, 0, 0);
++      sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0);
++      break;
++    }
++    case SRT_Mem: {
++      assert( nColumn==1 );
++      sqliteVdbeAddOp(v, OP_MemStore, iParm, 1);
++      sqliteVdbeAddOp(v, OP_Goto, 0, end1);
++      break;
++    }
++    case SRT_Subroutine: {
++      int i;
++      for(i=0; i<nColumn; i++){
++        sqliteVdbeAddOp(v, OP_Column, -1-i, i);
++      }
++      sqliteVdbeAddOp(v, OP_Gosub, 0, iParm);
++      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++      break;
++    }
++    default: {
++      /* Do nothing */
++      break;
++    }
++  }
++  sqliteVdbeAddOp(v, OP_Goto, 0, addr);
++  sqliteVdbeResolveLabel(v, end2);
++  sqliteVdbeAddOp(v, OP_Pop, 1, 0);
++  sqliteVdbeResolveLabel(v, end1);
++  sqliteVdbeAddOp(v, OP_SortReset, 0, 0);
++}
++
++/*
++** Generate code that will tell the VDBE the datatypes of
++** columns in the result set.
++**
++** This routine only generates code if the "PRAGMA show_datatypes=on"
++** has been executed.  The datatypes are reported out in the azCol
++** parameter to the callback function.  The first N azCol[] entries
++** are the names of the columns, and the second N entries are the
++** datatypes for the columns.
++**
++** The "datatype" for a result that is a column of a type is the
++** datatype definition extracted from the CREATE TABLE statement.
++** The datatype for an expression is either TEXT or NUMERIC.  The
++** datatype for a ROWID field is INTEGER.
++*/
++static void generateColumnTypes(
++  Parse *pParse,      /* Parser context */
++  SrcList *pTabList,  /* List of tables */
++  ExprList *pEList    /* Expressions defining the result set */
++){
++  Vdbe *v = pParse->pVdbe;
++  int i, j;
++  for(i=0; i<pEList->nExpr; i++){
++    Expr *p = pEList->a[i].pExpr;
++    char *zType = 0;
++    if( p==0 ) continue;
++    if( p->op==TK_COLUMN && pTabList ){
++      Table *pTab;
++      int iCol = p->iColumn;
++      for(j=0; j<pTabList->nSrc && pTabList->a[j].iCursor!=p->iTable; j++){}
++      assert( j<pTabList->nSrc );
++      pTab = pTabList->a[j].pTab;
++      if( iCol<0 ) iCol = pTab->iPKey;
++      assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
++      if( iCol<0 ){
++        zType = "INTEGER";
++      }else{
++        zType = pTab->aCol[iCol].zType;
++      }
++    }else{
++      if( sqliteExprType(p)==SQLITE_SO_TEXT ){
++        zType = "TEXT";
++      }else{
++        zType = "NUMERIC";
++      }
++    }
++    sqliteVdbeOp3(v, OP_ColumnName, i + pEList->nExpr, 0, zType, 0);
++  }
++}
++
++/*
++** Generate code that will tell the VDBE the names of columns
++** in the result set.  This information is used to provide the
++** azCol[] values in the callback.
++*/
++static void generateColumnNames(
++  Parse *pParse,      /* Parser context */
++  SrcList *pTabList,  /* List of tables */
++  ExprList *pEList    /* Expressions defining the result set */
++){
++  Vdbe *v = pParse->pVdbe;
++  int i, j;
++  sqlite *db = pParse->db;
++  int fullNames, shortNames;
++
++  assert( v!=0 );
++  if( pParse->colNamesSet || v==0 || sqlite_malloc_failed ) return;
++  pParse->colNamesSet = 1;
++  fullNames = (db->flags & SQLITE_FullColNames)!=0;
++  shortNames = (db->flags & SQLITE_ShortColNames)!=0;
++  for(i=0; i<pEList->nExpr; i++){
++    Expr *p;
++    int p2 = i==pEList->nExpr-1;
++    p = pEList->a[i].pExpr;
++    if( p==0 ) continue;
++    if( pEList->a[i].zName ){
++      char *zName = pEList->a[i].zName;
++      sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, 0);
++      continue;
++    }
++    if( p->op==TK_COLUMN && pTabList ){
++      Table *pTab;
++      char *zCol;
++      int iCol = p->iColumn;
++      for(j=0; j<pTabList->nSrc && pTabList->a[j].iCursor!=p->iTable; j++){}
++      assert( j<pTabList->nSrc );
++      pTab = pTabList->a[j].pTab;
++      if( iCol<0 ) iCol = pTab->iPKey;
++      assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
++      if( iCol<0 ){
++        zCol = "_ROWID_";
++      }else{
++        zCol = pTab->aCol[iCol].zName;
++      }
++      if( !shortNames && !fullNames && p->span.z && p->span.z[0] ){
++        int addr = sqliteVdbeOp3(v,OP_ColumnName, i, p2, p->span.z, p->span.n);
++        sqliteVdbeCompressSpace(v, addr);
++      }else if( fullNames || (!shortNames && pTabList->nSrc>1) ){
++        char *zName = 0;
++        char *zTab;
++ 
++        zTab = pTabList->a[j].zAlias;
++        if( fullNames || zTab==0 ) zTab = pTab->zName;
++        sqliteSetString(&zName, zTab, ".", zCol, 0);
++        sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, P3_DYNAMIC);
++      }else{
++        sqliteVdbeOp3(v, OP_ColumnName, i, p2, zCol, 0);
++      }
++    }else if( p->span.z && p->span.z[0] ){
++      int addr = sqliteVdbeOp3(v,OP_ColumnName, i, p2, p->span.z, p->span.n);
++      sqliteVdbeCompressSpace(v, addr);
++    }else{
++      char zName[30];
++      assert( p->op!=TK_COLUMN || pTabList==0 );
++      sprintf(zName, "column%d", i+1);
++      sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, 0);
++    }
++  }
++}
++
++/*
++** Name of the connection operator, used for error messages.
++*/
++static const char *selectOpName(int id){
++  char *z;
++  switch( id ){
++    case TK_ALL:       z = "UNION ALL";   break;
++    case TK_INTERSECT: z = "INTERSECT";   break;
++    case TK_EXCEPT:    z = "EXCEPT";      break;
++    default:           z = "UNION";       break;
++  }
++  return z;
++}
++
++/*
++** Forward declaration
++*/
++static int fillInColumnList(Parse*, Select*);
++
++/*
++** Given a SELECT statement, generate a Table structure that describes
++** the result set of that SELECT.
++*/
++Table *sqliteResultSetOfSelect(Parse *pParse, char *zTabName, Select *pSelect){
++  Table *pTab;
++  int i, j;
++  ExprList *pEList;
++  Column *aCol;
++
++  if( fillInColumnList(pParse, pSelect) ){
++    return 0;
++  }
++  pTab = sqliteMalloc( sizeof(Table) );
++  if( pTab==0 ){
++    return 0;
++  }
++  pTab->zName = zTabName ? sqliteStrDup(zTabName) : 0;
++  pEList = pSelect->pEList;
++  pTab->nCol = pEList->nExpr;
++  assert( pTab->nCol>0 );
++  pTab->aCol = aCol = sqliteMalloc( sizeof(pTab->aCol[0])*pTab->nCol );
++  for(i=0; i<pTab->nCol; i++){
++    Expr *p, *pR;
++    if( pEList->a[i].zName ){
++      aCol[i].zName = sqliteStrDup(pEList->a[i].zName);
++    }else if( (p=pEList->a[i].pExpr)->op==TK_DOT 
++               && (pR=p->pRight)!=0 && pR->token.z && pR->token.z[0] ){
++      int cnt;
++      sqliteSetNString(&aCol[i].zName, pR->token.z, pR->token.n, 0);
++      for(j=cnt=0; j<i; j++){
++        if( sqliteStrICmp(aCol[j].zName, aCol[i].zName)==0 ){
++          int n;
++          char zBuf[30];
++          sprintf(zBuf,"_%d",++cnt);
++          n = strlen(zBuf);
++          sqliteSetNString(&aCol[i].zName, pR->token.z, pR->token.n, zBuf, n,0);
++          j = -1;
++        }
++      }
++    }else if( p->span.z && p->span.z[0] ){
++      sqliteSetNString(&pTab->aCol[i].zName, p->span.z, p->span.n, 0);
++    }else{
++      char zBuf[30];
++      sprintf(zBuf, "column%d", i+1);
++      aCol[i].zName = sqliteStrDup(zBuf);
++    }
++    sqliteDequote(aCol[i].zName);
++  }
++  pTab->iPKey = -1;
++  return pTab;
++}
++
++/*
++** For the given SELECT statement, do three things.
++**
++**    (1)  Fill in the pTabList->a[].pTab fields in the SrcList that 
++**         defines the set of tables that should be scanned.  For views,
++**         fill pTabList->a[].pSelect with a copy of the SELECT statement
++**         that implements the view.  A copy is made of the view's SELECT
++**         statement so that we can freely modify or delete that statement
++**         without worrying about messing up the presistent representation
++**         of the view.
++**
++**    (2)  Add terms to the WHERE clause to accomodate the NATURAL keyword
++**         on joins and the ON and USING clause of joins.
++**
++**    (3)  Scan the list of columns in the result set (pEList) looking
++**         for instances of the "*" operator or the TABLE.* operator.
++**         If found, expand each "*" to be every column in every table
++**         and TABLE.* to be every column in TABLE.
++**
++** Return 0 on success.  If there are problems, leave an error message
++** in pParse and return non-zero.
++*/
++static int fillInColumnList(Parse *pParse, Select *p){
++  int i, j, k, rc;
++  SrcList *pTabList;
++  ExprList *pEList;
++  Table *pTab;
++
++  if( p==0 || p->pSrc==0 ) return 1;
++  pTabList = p->pSrc;
++  pEList = p->pEList;
++
++  /* Look up every table in the table list.
++  */
++  for(i=0; i<pTabList->nSrc; i++){
++    if( pTabList->a[i].pTab ){
++      /* This routine has run before!  No need to continue */
++      return 0;
++    }
++    if( pTabList->a[i].zName==0 ){
++      /* A sub-query in the FROM clause of a SELECT */
++      assert( pTabList->a[i].pSelect!=0 );
++      if( pTabList->a[i].zAlias==0 ){
++        char zFakeName[60];
++        sprintf(zFakeName, "sqlite_subquery_%p_",
++           (void*)pTabList->a[i].pSelect);
++        sqliteSetString(&pTabList->a[i].zAlias, zFakeName, 0);
++      }
++      pTabList->a[i].pTab = pTab = 
++        sqliteResultSetOfSelect(pParse, pTabList->a[i].zAlias,
++                                        pTabList->a[i].pSelect);
++      if( pTab==0 ){
++        return 1;
++      }
++      /* The isTransient flag indicates that the Table structure has been
++      ** dynamically allocated and may be freed at any time.  In other words,
++      ** pTab is not pointing to a persistent table structure that defines
++      ** part of the schema. */
++      pTab->isTransient = 1;
++    }else{
++      /* An ordinary table or view name in the FROM clause */
++      pTabList->a[i].pTab = pTab = 
++        sqliteLocateTable(pParse,pTabList->a[i].zName,pTabList->a[i].zDatabase);
++      if( pTab==0 ){
++        return 1;
++      }
++      if( pTab->pSelect ){
++        /* We reach here if the named table is a really a view */
++        if( sqliteViewGetColumnNames(pParse, pTab) ){
++          return 1;
++        }
++        /* If pTabList->a[i].pSelect!=0 it means we are dealing with a
++        ** view within a view.  The SELECT structure has already been
++        ** copied by the outer view so we can skip the copy step here
++        ** in the inner view.
++        */
++        if( pTabList->a[i].pSelect==0 ){
++          pTabList->a[i].pSelect = sqliteSelectDup(pTab->pSelect);
++        }
++      }
++    }
++  }
++
++  /* Process NATURAL keywords, and ON and USING clauses of joins.
++  */
++  if( sqliteProcessJoin(pParse, p) ) return 1;
++
++  /* For every "*" that occurs in the column list, insert the names of
++  ** all columns in all tables.  And for every TABLE.* insert the names
++  ** of all columns in TABLE.  The parser inserted a special expression
++  ** with the TK_ALL operator for each "*" that it found in the column list.
++  ** The following code just has to locate the TK_ALL expressions and expand
++  ** each one to the list of all columns in all tables.
++  **
++  ** The first loop just checks to see if there are any "*" operators
++  ** that need expanding.
++  */
++  for(k=0; k<pEList->nExpr; k++){
++    Expr *pE = pEList->a[k].pExpr;
++    if( pE->op==TK_ALL ) break;
++    if( pE->op==TK_DOT && pE->pRight && pE->pRight->op==TK_ALL
++         && pE->pLeft && pE->pLeft->op==TK_ID ) break;
++  }
++  rc = 0;
++  if( k<pEList->nExpr ){
++    /*
++    ** If we get here it means the result set contains one or more "*"
++    ** operators that need to be expanded.  Loop through each expression
++    ** in the result set and expand them one by one.
++    */
++    struct ExprList_item *a = pEList->a;
++    ExprList *pNew = 0;
++    for(k=0; k<pEList->nExpr; k++){
++      Expr *pE = a[k].pExpr;
++      if( pE->op!=TK_ALL &&
++           (pE->op!=TK_DOT || pE->pRight==0 || pE->pRight->op!=TK_ALL) ){
++        /* This particular expression does not need to be expanded.
++        */
++        pNew = sqliteExprListAppend(pNew, a[k].pExpr, 0);
++        pNew->a[pNew->nExpr-1].zName = a[k].zName;
++        a[k].pExpr = 0;
++        a[k].zName = 0;
++      }else{
++        /* This expression is a "*" or a "TABLE.*" and needs to be
++        ** expanded. */
++        int tableSeen = 0;      /* Set to 1 when TABLE matches */
++        char *zTName;           /* text of name of TABLE */
++        if( pE->op==TK_DOT && pE->pLeft ){
++          zTName = sqliteTableNameFromToken(&pE->pLeft->token);
++        }else{
++          zTName = 0;
++        }
++        for(i=0; i<pTabList->nSrc; i++){
++          Table *pTab = pTabList->a[i].pTab;
++          char *zTabName = pTabList->a[i].zAlias;
++          if( zTabName==0 || zTabName[0]==0 ){ 
++            zTabName = pTab->zName;
++          }
++          if( zTName && (zTabName==0 || zTabName[0]==0 || 
++                 sqliteStrICmp(zTName, zTabName)!=0) ){
++            continue;
++          }
++          tableSeen = 1;
++          for(j=0; j<pTab->nCol; j++){
++            Expr *pExpr, *pLeft, *pRight;
++            char *zName = pTab->aCol[j].zName;
++
++            if( i>0 && (pTabList->a[i-1].jointype & JT_NATURAL)!=0 &&
++                columnIndex(pTabList->a[i-1].pTab, zName)>=0 ){
++              /* In a NATURAL join, omit the join columns from the 
++              ** table on the right */
++              continue;
++            }
++            if( i>0 && sqliteIdListIndex(pTabList->a[i-1].pUsing, zName)>=0 ){
++              /* In a join with a USING clause, omit columns in the
++              ** using clause from the table on the right. */
++              continue;
++            }
++            pRight = sqliteExpr(TK_ID, 0, 0, 0);
++            if( pRight==0 ) break;
++            pRight->token.z = zName;
++            pRight->token.n = strlen(zName);
++            pRight->token.dyn = 0;
++            if( zTabName && pTabList->nSrc>1 ){
++              pLeft = sqliteExpr(TK_ID, 0, 0, 0);
++              pExpr = sqliteExpr(TK_DOT, pLeft, pRight, 0);
++              if( pExpr==0 ) break;
++              pLeft->token.z = zTabName;
++              pLeft->token.n = strlen(zTabName);
++              pLeft->token.dyn = 0;
++              sqliteSetString((char**)&pExpr->span.z, zTabName, ".", zName, 0);
++              pExpr->span.n = strlen(pExpr->span.z);
++              pExpr->span.dyn = 1;
++              pExpr->token.z = 0;
++              pExpr->token.n = 0;
++              pExpr->token.dyn = 0;
++            }else{
++              pExpr = pRight;
++              pExpr->span = pExpr->token;
++            }
++            pNew = sqliteExprListAppend(pNew, pExpr, 0);
++          }
++        }
++        if( !tableSeen ){
++          if( zTName ){
++            sqliteErrorMsg(pParse, "no such table: %s", zTName);
++          }else{
++            sqliteErrorMsg(pParse, "no tables specified");
++          }
++          rc = 1;
++        }
++        sqliteFree(zTName);
++      }
++    }
++    sqliteExprListDelete(pEList);
++    p->pEList = pNew;
++  }
++  return rc;
++}
++
++/*
++** This routine recursively unlinks the Select.pSrc.a[].pTab pointers
++** in a select structure.  It just sets the pointers to NULL.  This
++** routine is recursive in the sense that if the Select.pSrc.a[].pSelect
++** pointer is not NULL, this routine is called recursively on that pointer.
++**
++** This routine is called on the Select structure that defines a
++** VIEW in order to undo any bindings to tables.  This is necessary
++** because those tables might be DROPed by a subsequent SQL command.
++** If the bindings are not removed, then the Select.pSrc->a[].pTab field
++** will be left pointing to a deallocated Table structure after the
++** DROP and a coredump will occur the next time the VIEW is used.
++*/
++void sqliteSelectUnbind(Select *p){
++  int i;
++  SrcList *pSrc = p->pSrc;
++  Table *pTab;
++  if( p==0 ) return;
++  for(i=0; i<pSrc->nSrc; i++){
++    if( (pTab = pSrc->a[i].pTab)!=0 ){
++      if( pTab->isTransient ){
++        sqliteDeleteTable(0, pTab);
++      }
++      pSrc->a[i].pTab = 0;
++      if( pSrc->a[i].pSelect ){
++        sqliteSelectUnbind(pSrc->a[i].pSelect);
++      }
++    }
++  }
++}
++
++/*
++** This routine associates entries in an ORDER BY expression list with
++** columns in a result.  For each ORDER BY expression, the opcode of
++** the top-level node is changed to TK_COLUMN and the iColumn value of
++** the top-level node is filled in with column number and the iTable
++** value of the top-level node is filled with iTable parameter.
++**
++** If there are prior SELECT clauses, they are processed first.  A match
++** in an earlier SELECT takes precedence over a later SELECT.
++**
++** Any entry that does not match is flagged as an error.  The number
++** of errors is returned.
++**
++** This routine does NOT correctly initialize the Expr.dataType  field
++** of the ORDER BY expressions.  The multiSelectSortOrder() routine
++** must be called to do that after the individual select statements
++** have all been analyzed.  This routine is unable to compute Expr.dataType
++** because it must be called before the individual select statements
++** have been analyzed.
++*/
++static int matchOrderbyToColumn(
++  Parse *pParse,          /* A place to leave error messages */
++  Select *pSelect,        /* Match to result columns of this SELECT */
++  ExprList *pOrderBy,     /* The ORDER BY values to match against columns */
++  int iTable,             /* Insert this value in iTable */
++  int mustComplete        /* If TRUE all ORDER BYs must match */
++){
++  int nErr = 0;
++  int i, j;
++  ExprList *pEList;
++
++  if( pSelect==0 || pOrderBy==0 ) return 1;
++  if( mustComplete ){
++    for(i=0; i<pOrderBy->nExpr; i++){ pOrderBy->a[i].done = 0; }
++  }
++  if( fillInColumnList(pParse, pSelect) ){
++    return 1;
++  }
++  if( pSelect->pPrior ){
++    if( matchOrderbyToColumn(pParse, pSelect->pPrior, pOrderBy, iTable, 0) ){
++      return 1;
++    }
++  }
++  pEList = pSelect->pEList;
++  for(i=0; i<pOrderBy->nExpr; i++){
++    Expr *pE = pOrderBy->a[i].pExpr;
++    int iCol = -1;
++    if( pOrderBy->a[i].done ) continue;
++    if( sqliteExprIsInteger(pE, &iCol) ){
++      if( iCol<=0 || iCol>pEList->nExpr ){
++        sqliteErrorMsg(pParse,
++          "ORDER BY position %d should be between 1 and %d",
++          iCol, pEList->nExpr);
++        nErr++;
++        break;
++      }
++      if( !mustComplete ) continue;
++      iCol--;
++    }
++    for(j=0; iCol<0 && j<pEList->nExpr; j++){
++      if( pEList->a[j].zName && (pE->op==TK_ID || pE->op==TK_STRING) ){
++        char *zName, *zLabel;
++        zName = pEList->a[j].zName;
++        assert( pE->token.z );
++        zLabel = sqliteStrNDup(pE->token.z, pE->token.n);
++        sqliteDequote(zLabel);
++        if( sqliteStrICmp(zName, zLabel)==0 ){ 
++          iCol = j;
++        }
++        sqliteFree(zLabel);
++      }
++      if( iCol<0 && sqliteExprCompare(pE, pEList->a[j].pExpr) ){
++        iCol = j;
++      }
++    }
++    if( iCol>=0 ){
++      pE->op = TK_COLUMN;
++      pE->iColumn = iCol;
++      pE->iTable = iTable;
++      pOrderBy->a[i].done = 1;
++    }
++    if( iCol<0 && mustComplete ){
++      sqliteErrorMsg(pParse,
++        "ORDER BY term number %d does not match any result column", i+1);
++      nErr++;
++      break;
++    }
++  }
++  return nErr;  
++}
++
++/*
++** Get a VDBE for the given parser context.  Create a new one if necessary.
++** If an error occurs, return NULL and leave a message in pParse.
++*/
++Vdbe *sqliteGetVdbe(Parse *pParse){
++  Vdbe *v = pParse->pVdbe;
++  if( v==0 ){
++    v = pParse->pVdbe = sqliteVdbeCreate(pParse->db);
++  }
++  return v;
++}
++
++/*
++** This routine sets the Expr.dataType field on all elements of
++** the pOrderBy expression list.  The pOrderBy list will have been
++** set up by matchOrderbyToColumn().  Hence each expression has
++** a TK_COLUMN as its root node.  The Expr.iColumn refers to a 
++** column in the result set.   The datatype is set to SQLITE_SO_TEXT
++** if the corresponding column in p and every SELECT to the left of
++** p has a datatype of SQLITE_SO_TEXT.  If the cooressponding column
++** in p or any of the left SELECTs is SQLITE_SO_NUM, then the datatype
++** of the order-by expression is set to SQLITE_SO_NUM.
++**
++** Examples:
++**
++**     CREATE TABLE one(a INTEGER, b TEXT);
++**     CREATE TABLE two(c VARCHAR(5), d FLOAT);
++**
++**     SELECT b, b FROM one UNION SELECT d, c FROM two ORDER BY 1, 2;
++**
++** The primary sort key will use SQLITE_SO_NUM because the "d" in
++** the second SELECT is numeric.  The 1st column of the first SELECT
++** is text but that does not matter because a numeric always overrides
++** a text.
++**
++** The secondary key will use the SQLITE_SO_TEXT sort order because
++** both the (second) "b" in the first SELECT and the "c" in the second
++** SELECT have a datatype of text.
++*/ 
++static void multiSelectSortOrder(Select *p, ExprList *pOrderBy){
++  int i;
++  ExprList *pEList;
++  if( pOrderBy==0 ) return;
++  if( p==0 ){
++    for(i=0; i<pOrderBy->nExpr; i++){
++      pOrderBy->a[i].pExpr->dataType = SQLITE_SO_TEXT;
++    }
++    return;
++  }
++  multiSelectSortOrder(p->pPrior, pOrderBy);
++  pEList = p->pEList;
++  for(i=0; i<pOrderBy->nExpr; i++){
++    Expr *pE = pOrderBy->a[i].pExpr;
++    if( pE->dataType==SQLITE_SO_NUM ) continue;
++    assert( pE->iColumn>=0 );
++    if( pEList->nExpr>pE->iColumn ){
++      pE->dataType = sqliteExprType(pEList->a[pE->iColumn].pExpr);
++    }
++  }
++}
++
++/*
++** Compute the iLimit and iOffset fields of the SELECT based on the
++** nLimit and nOffset fields.  nLimit and nOffset hold the integers
++** that appear in the original SQL statement after the LIMIT and OFFSET
++** keywords.  Or that hold -1 and 0 if those keywords are omitted.
++** iLimit and iOffset are the integer memory register numbers for
++** counters used to compute the limit and offset.  If there is no
++** limit and/or offset, then iLimit and iOffset are negative.
++**
++** This routine changes the values if iLimit and iOffset only if
++** a limit or offset is defined by nLimit and nOffset.  iLimit and
++** iOffset should have been preset to appropriate default values
++** (usually but not always -1) prior to calling this routine.
++** Only if nLimit>=0 or nOffset>0 do the limit registers get
++** redefined.  The UNION ALL operator uses this property to force
++** the reuse of the same limit and offset registers across multiple
++** SELECT statements.
++*/
++static void computeLimitRegisters(Parse *pParse, Select *p){
++  /* 
++  ** If the comparison is p->nLimit>0 then "LIMIT 0" shows
++  ** all rows.  It is the same as no limit. If the comparision is
++  ** p->nLimit>=0 then "LIMIT 0" show no rows at all.
++  ** "LIMIT -1" always shows all rows.  There is some
++  ** contraversy about what the correct behavior should be.
++  ** The current implementation interprets "LIMIT 0" to mean
++  ** no rows.
++  */
++  if( p->nLimit>=0 ){
++    int iMem = pParse->nMem++;
++    Vdbe *v = sqliteGetVdbe(pParse);
++    if( v==0 ) return;
++    sqliteVdbeAddOp(v, OP_Integer, -p->nLimit, 0);
++    sqliteVdbeAddOp(v, OP_MemStore, iMem, 1);
++    p->iLimit = iMem;
++  }
++  if( p->nOffset>0 ){
++    int iMem = pParse->nMem++;
++    Vdbe *v = sqliteGetVdbe(pParse);
++    if( v==0 ) return;
++    sqliteVdbeAddOp(v, OP_Integer, -p->nOffset, 0);
++    sqliteVdbeAddOp(v, OP_MemStore, iMem, 1);
++    p->iOffset = iMem;
++  }
++}
++
++/*
++** This routine is called to process a query that is really the union
++** or intersection of two or more separate queries.
++**
++** "p" points to the right-most of the two queries.  the query on the
++** left is p->pPrior.  The left query could also be a compound query
++** in which case this routine will be called recursively. 
++**
++** The results of the total query are to be written into a destination
++** of type eDest with parameter iParm.
++**
++** Example 1:  Consider a three-way compound SQL statement.
++**
++**     SELECT a FROM t1 UNION SELECT b FROM t2 UNION SELECT c FROM t3
++**
++** This statement is parsed up as follows:
++**
++**     SELECT c FROM t3
++**      |
++**      `----->  SELECT b FROM t2
++**                |
++**                `------>  SELECT a FROM t1
++**
++** The arrows in the diagram above represent the Select.pPrior pointer.
++** So if this routine is called with p equal to the t3 query, then
++** pPrior will be the t2 query.  p->op will be TK_UNION in this case.
++**
++** Notice that because of the way SQLite parses compound SELECTs, the
++** individual selects always group from left to right.
++*/
++static int multiSelect(Parse *pParse, Select *p, int eDest, int iParm){
++  int rc;             /* Success code from a subroutine */
++  Select *pPrior;     /* Another SELECT immediately to our left */
++  Vdbe *v;            /* Generate code to this VDBE */
++
++  /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs.  Only
++  ** the last SELECT in the series may have an ORDER BY or LIMIT.
++  */
++  if( p==0 || p->pPrior==0 ) return 1;
++  pPrior = p->pPrior;
++  if( pPrior->pOrderBy ){
++    sqliteErrorMsg(pParse,"ORDER BY clause should come after %s not before",
++      selectOpName(p->op));
++    return 1;
++  }
++  if( pPrior->nLimit>=0 || pPrior->nOffset>0 ){
++    sqliteErrorMsg(pParse,"LIMIT clause should come after %s not before",
++      selectOpName(p->op));
++    return 1;
++  }
++
++  /* Make sure we have a valid query engine.  If not, create a new one.
++  */
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ) return 1;
++
++  /* Create the destination temporary table if necessary
++  */
++  if( eDest==SRT_TempTable ){
++    sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0);
++    eDest = SRT_Table;
++  }
++
++  /* Generate code for the left and right SELECT statements.
++  */
++  switch( p->op ){
++    case TK_ALL: {
++      if( p->pOrderBy==0 ){
++        pPrior->nLimit = p->nLimit;
++        pPrior->nOffset = p->nOffset;
++        rc = sqliteSelect(pParse, pPrior, eDest, iParm, 0, 0, 0);
++        if( rc ) return rc;
++        p->pPrior = 0;
++        p->iLimit = pPrior->iLimit;
++        p->iOffset = pPrior->iOffset;
++        p->nLimit = -1;
++        p->nOffset = 0;
++        rc = sqliteSelect(pParse, p, eDest, iParm, 0, 0, 0);
++        p->pPrior = pPrior;
++        if( rc ) return rc;
++        break;
++      }
++      /* For UNION ALL ... ORDER BY fall through to the next case */
++    }
++    case TK_EXCEPT:
++    case TK_UNION: {
++      int unionTab;    /* Cursor number of the temporary table holding result */
++      int op;          /* One of the SRT_ operations to apply to self */
++      int priorOp;     /* The SRT_ operation to apply to prior selects */
++      int nLimit, nOffset; /* Saved values of p->nLimit and p->nOffset */
++      ExprList *pOrderBy;  /* The ORDER BY clause for the right SELECT */
++
++      priorOp = p->op==TK_ALL ? SRT_Table : SRT_Union;
++      if( eDest==priorOp && p->pOrderBy==0 && p->nLimit<0 && p->nOffset==0 ){
++        /* We can reuse a temporary table generated by a SELECT to our
++        ** right.
++        */
++        unionTab = iParm;
++      }else{
++        /* We will need to create our own temporary table to hold the
++        ** intermediate results.
++        */
++        unionTab = pParse->nTab++;
++        if( p->pOrderBy 
++        && matchOrderbyToColumn(pParse, p, p->pOrderBy, unionTab, 1) ){
++          return 1;
++        }
++        if( p->op!=TK_ALL ){
++          sqliteVdbeAddOp(v, OP_OpenTemp, unionTab, 1);
++          sqliteVdbeAddOp(v, OP_KeyAsData, unionTab, 1);
++        }else{
++          sqliteVdbeAddOp(v, OP_OpenTemp, unionTab, 0);
++        }
++      }
++
++      /* Code the SELECT statements to our left
++      */
++      rc = sqliteSelect(pParse, pPrior, priorOp, unionTab, 0, 0, 0);
++      if( rc ) return rc;
++
++      /* Code the current SELECT statement
++      */
++      switch( p->op ){
++         case TK_EXCEPT:  op = SRT_Except;   break;
++         case TK_UNION:   op = SRT_Union;    break;
++         case TK_ALL:     op = SRT_Table;    break;
++      }
++      p->pPrior = 0;
++      pOrderBy = p->pOrderBy;
++      p->pOrderBy = 0;
++      nLimit = p->nLimit;
++      p->nLimit = -1;
++      nOffset = p->nOffset;
++      p->nOffset = 0;
++      rc = sqliteSelect(pParse, p, op, unionTab, 0, 0, 0);
++      p->pPrior = pPrior;
++      p->pOrderBy = pOrderBy;
++      p->nLimit = nLimit;
++      p->nOffset = nOffset;
++      if( rc ) return rc;
++
++      /* Convert the data in the temporary table into whatever form
++      ** it is that we currently need.
++      */      
++      if( eDest!=priorOp || unionTab!=iParm ){
++        int iCont, iBreak, iStart;
++        assert( p->pEList );
++        if( eDest==SRT_Callback ){
++          generateColumnNames(pParse, 0, p->pEList);
++          generateColumnTypes(pParse, p->pSrc, p->pEList);
++        }
++        iBreak = sqliteVdbeMakeLabel(v);
++        iCont = sqliteVdbeMakeLabel(v);
++        sqliteVdbeAddOp(v, OP_Rewind, unionTab, iBreak);
++        computeLimitRegisters(pParse, p);
++        iStart = sqliteVdbeCurrentAddr(v);
++        multiSelectSortOrder(p, p->pOrderBy);
++        rc = selectInnerLoop(pParse, p, p->pEList, unionTab, p->pEList->nExpr,
++                             p->pOrderBy, -1, eDest, iParm, 
++                             iCont, iBreak);
++        if( rc ) return 1;
++        sqliteVdbeResolveLabel(v, iCont);
++        sqliteVdbeAddOp(v, OP_Next, unionTab, iStart);
++        sqliteVdbeResolveLabel(v, iBreak);
++        sqliteVdbeAddOp(v, OP_Close, unionTab, 0);
++        if( p->pOrderBy ){
++          generateSortTail(p, v, p->pEList->nExpr, eDest, iParm);
++        }
++      }
++      break;
++    }
++    case TK_INTERSECT: {
++      int tab1, tab2;
++      int iCont, iBreak, iStart;
++      int nLimit, nOffset;
++
++      /* INTERSECT is different from the others since it requires
++      ** two temporary tables.  Hence it has its own case.  Begin
++      ** by allocating the tables we will need.
++      */
++      tab1 = pParse->nTab++;
++      tab2 = pParse->nTab++;
++      if( p->pOrderBy && matchOrderbyToColumn(pParse,p,p->pOrderBy,tab1,1) ){
++        return 1;
++      }
++      sqliteVdbeAddOp(v, OP_OpenTemp, tab1, 1);
++      sqliteVdbeAddOp(v, OP_KeyAsData, tab1, 1);
++
++      /* Code the SELECTs to our left into temporary table "tab1".
++      */
++      rc = sqliteSelect(pParse, pPrior, SRT_Union, tab1, 0, 0, 0);
++      if( rc ) return rc;
++
++      /* Code the current SELECT into temporary table "tab2"
++      */
++      sqliteVdbeAddOp(v, OP_OpenTemp, tab2, 1);
++      sqliteVdbeAddOp(v, OP_KeyAsData, tab2, 1);
++      p->pPrior = 0;
++      nLimit = p->nLimit;
++      p->nLimit = -1;
++      nOffset = p->nOffset;
++      p->nOffset = 0;
++      rc = sqliteSelect(pParse, p, SRT_Union, tab2, 0, 0, 0);
++      p->pPrior = pPrior;
++      p->nLimit = nLimit;
++      p->nOffset = nOffset;
++      if( rc ) return rc;
++
++      /* Generate code to take the intersection of the two temporary
++      ** tables.
++      */
++      assert( p->pEList );
++      if( eDest==SRT_Callback ){
++        generateColumnNames(pParse, 0, p->pEList);
++        generateColumnTypes(pParse, p->pSrc, p->pEList);
++      }
++      iBreak = sqliteVdbeMakeLabel(v);
++      iCont = sqliteVdbeMakeLabel(v);
++      sqliteVdbeAddOp(v, OP_Rewind, tab1, iBreak);
++      computeLimitRegisters(pParse, p);
++      iStart = sqliteVdbeAddOp(v, OP_FullKey, tab1, 0);
++      sqliteVdbeAddOp(v, OP_NotFound, tab2, iCont);
++      multiSelectSortOrder(p, p->pOrderBy);
++      rc = selectInnerLoop(pParse, p, p->pEList, tab1, p->pEList->nExpr,
++                             p->pOrderBy, -1, eDest, iParm, 
++                             iCont, iBreak);
++      if( rc ) return 1;
++      sqliteVdbeResolveLabel(v, iCont);
++      sqliteVdbeAddOp(v, OP_Next, tab1, iStart);
++      sqliteVdbeResolveLabel(v, iBreak);
++      sqliteVdbeAddOp(v, OP_Close, tab2, 0);
++      sqliteVdbeAddOp(v, OP_Close, tab1, 0);
++      if( p->pOrderBy ){
++        generateSortTail(p, v, p->pEList->nExpr, eDest, iParm);
++      }
++      break;
++    }
++  }
++  assert( p->pEList && pPrior->pEList );
++  if( p->pEList->nExpr!=pPrior->pEList->nExpr ){
++    sqliteErrorMsg(pParse, "SELECTs to the left and right of %s"
++      " do not have the same number of result columns", selectOpName(p->op));
++    return 1;
++  }
++  return 0;
++}
++
++/*
++** Scan through the expression pExpr.  Replace every reference to
++** a column in table number iTable with a copy of the iColumn-th
++** entry in pEList.  (But leave references to the ROWID column 
++** unchanged.)
++**
++** This routine is part of the flattening procedure.  A subquery
++** whose result set is defined by pEList appears as entry in the
++** FROM clause of a SELECT such that the VDBE cursor assigned to that
++** FORM clause entry is iTable.  This routine make the necessary 
++** changes to pExpr so that it refers directly to the source table
++** of the subquery rather the result set of the subquery.
++*/
++static void substExprList(ExprList*,int,ExprList*);  /* Forward Decl */
++static void substExpr(Expr *pExpr, int iTable, ExprList *pEList){
++  if( pExpr==0 ) return;
++  if( pExpr->op==TK_COLUMN && pExpr->iTable==iTable ){
++    if( pExpr->iColumn<0 ){
++      pExpr->op = TK_NULL;
++    }else{
++      Expr *pNew;
++      assert( pEList!=0 && pExpr->iColumn<pEList->nExpr );
++      assert( pExpr->pLeft==0 && pExpr->pRight==0 && pExpr->pList==0 );
++      pNew = pEList->a[pExpr->iColumn].pExpr;
++      assert( pNew!=0 );
++      pExpr->op = pNew->op;
++      pExpr->dataType = pNew->dataType;
++      assert( pExpr->pLeft==0 );
++      pExpr->pLeft = sqliteExprDup(pNew->pLeft);
++      assert( pExpr->pRight==0 );
++      pExpr->pRight = sqliteExprDup(pNew->pRight);
++      assert( pExpr->pList==0 );
++      pExpr->pList = sqliteExprListDup(pNew->pList);
++      pExpr->iTable = pNew->iTable;
++      pExpr->iColumn = pNew->iColumn;
++      pExpr->iAgg = pNew->iAgg;
++      sqliteTokenCopy(&pExpr->token, &pNew->token);
++      sqliteTokenCopy(&pExpr->span, &pNew->span);
++    }
++  }else{
++    substExpr(pExpr->pLeft, iTable, pEList);
++    substExpr(pExpr->pRight, iTable, pEList);
++    substExprList(pExpr->pList, iTable, pEList);
++  }
++}
++static void 
++substExprList(ExprList *pList, int iTable, ExprList *pEList){
++  int i;
++  if( pList==0 ) return;
++  for(i=0; i<pList->nExpr; i++){
++    substExpr(pList->a[i].pExpr, iTable, pEList);
++  }
++}
++
++/*
++** This routine attempts to flatten subqueries in order to speed
++** execution.  It returns 1 if it makes changes and 0 if no flattening
++** occurs.
++**
++** To understand the concept of flattening, consider the following
++** query:
++**
++**     SELECT a FROM (SELECT x+y AS a FROM t1 WHERE z<100) WHERE a>5
++**
++** The default way of implementing this query is to execute the
++** subquery first and store the results in a temporary table, then
++** run the outer query on that temporary table.  This requires two
++** passes over the data.  Furthermore, because the temporary table
++** has no indices, the WHERE clause on the outer query cannot be
++** optimized.
++**
++** This routine attempts to rewrite queries such as the above into
++** a single flat select, like this:
++**
++**     SELECT x+y AS a FROM t1 WHERE z<100 AND a>5
++**
++** The code generated for this simpification gives the same result
++** but only has to scan the data once.  And because indices might 
++** exist on the table t1, a complete scan of the data might be
++** avoided.
++**
++** Flattening is only attempted if all of the following are true:
++**
++**   (1)  The subquery and the outer query do not both use aggregates.
++**
++**   (2)  The subquery is not an aggregate or the outer query is not a join.
++**
++**   (3)  The subquery is not the right operand of a left outer join, or
++**        the subquery is not itself a join.  (Ticket #306)
++**
++**   (4)  The subquery is not DISTINCT or the outer query is not a join.
++**
++**   (5)  The subquery is not DISTINCT or the outer query does not use
++**        aggregates.
++**
++**   (6)  The subquery does not use aggregates or the outer query is not
++**        DISTINCT.
++**
++**   (7)  The subquery has a FROM clause.
++**
++**   (8)  The subquery does not use LIMIT or the outer query is not a join.
++**
++**   (9)  The subquery does not use LIMIT or the outer query does not use
++**        aggregates.
++**
++**  (10)  The subquery does not use aggregates or the outer query does not
++**        use LIMIT.
++**
++**  (11)  The subquery and the outer query do not both have ORDER BY clauses.
++**
++**  (12)  The subquery is not the right term of a LEFT OUTER JOIN or the
++**        subquery has no WHERE clause.  (added by ticket #350)
++**
++** In this routine, the "p" parameter is a pointer to the outer query.
++** The subquery is p->pSrc->a[iFrom].  isAgg is true if the outer query
++** uses aggregates and subqueryIsAgg is true if the subquery uses aggregates.
++**
++** If flattening is not attempted, this routine is a no-op and returns 0.
++** If flattening is attempted this routine returns 1.
++**
++** All of the expression analysis must occur on both the outer query and
++** the subquery before this routine runs.
++*/
++static int flattenSubquery(
++  Parse *pParse,       /* The parsing context */
++  Select *p,           /* The parent or outer SELECT statement */
++  int iFrom,           /* Index in p->pSrc->a[] of the inner subquery */
++  int isAgg,           /* True if outer SELECT uses aggregate functions */
++  int subqueryIsAgg    /* True if the subquery uses aggregate functions */
++){
++  Select *pSub;       /* The inner query or "subquery" */
++  SrcList *pSrc;      /* The FROM clause of the outer query */
++  SrcList *pSubSrc;   /* The FROM clause of the subquery */
++  ExprList *pList;    /* The result set of the outer query */
++  int iParent;        /* VDBE cursor number of the pSub result set temp table */
++  int i;
++  Expr *pWhere;
++
++  /* Check to see if flattening is permitted.  Return 0 if not.
++  */
++  if( p==0 ) return 0;
++  pSrc = p->pSrc;
++  assert( pSrc && iFrom>=0 && iFrom<pSrc->nSrc );
++  pSub = pSrc->a[iFrom].pSelect;
++  assert( pSub!=0 );
++  if( isAgg && subqueryIsAgg ) return 0;
++  if( subqueryIsAgg && pSrc->nSrc>1 ) return 0;
++  pSubSrc = pSub->pSrc;
++  assert( pSubSrc );
++  if( pSubSrc->nSrc==0 ) return 0;
++  if( (pSub->isDistinct || pSub->nLimit>=0) &&  (pSrc->nSrc>1 || isAgg) ){
++     return 0;
++  }
++  if( (p->isDistinct || p->nLimit>=0) && subqueryIsAgg ) return 0;
++  if( p->pOrderBy && pSub->pOrderBy ) return 0;
++
++  /* Restriction 3:  If the subquery is a join, make sure the subquery is 
++  ** not used as the right operand of an outer join.  Examples of why this
++  ** is not allowed:
++  **
++  **         t1 LEFT OUTER JOIN (t2 JOIN t3)
++  **
++  ** If we flatten the above, we would get
++  **
++  **         (t1 LEFT OUTER JOIN t2) JOIN t3
++  **
++  ** which is not at all the same thing.
++  */
++  if( pSubSrc->nSrc>1 && iFrom>0 && (pSrc->a[iFrom-1].jointype & JT_OUTER)!=0 ){
++    return 0;
++  }
++
++  /* Restriction 12:  If the subquery is the right operand of a left outer
++  ** join, make sure the subquery has no WHERE clause.
++  ** An examples of why this is not allowed:
++  **
++  **         t1 LEFT OUTER JOIN (SELECT * FROM t2 WHERE t2.x>0)
++  **
++  ** If we flatten the above, we would get
++  **
++  **         (t1 LEFT OUTER JOIN t2) WHERE t2.x>0
++  **
++  ** But the t2.x>0 test will always fail on a NULL row of t2, which
++  ** effectively converts the OUTER JOIN into an INNER JOIN.
++  */
++  if( iFrom>0 && (pSrc->a[iFrom-1].jointype & JT_OUTER)!=0 
++      && pSub->pWhere!=0 ){
++    return 0;
++  }
++
++  /* If we reach this point, it means flattening is permitted for the
++  ** iFrom-th entry of the FROM clause in the outer query.
++  */
++
++  /* Move all of the FROM elements of the subquery into the
++  ** the FROM clause of the outer query.  Before doing this, remember
++  ** the cursor number for the original outer query FROM element in
++  ** iParent.  The iParent cursor will never be used.  Subsequent code
++  ** will scan expressions looking for iParent references and replace
++  ** those references with expressions that resolve to the subquery FROM
++  ** elements we are now copying in.
++  */
++  iParent = pSrc->a[iFrom].iCursor;
++  {
++    int nSubSrc = pSubSrc->nSrc;
++    int jointype = pSrc->a[iFrom].jointype;
++
++    if( pSrc->a[iFrom].pTab && pSrc->a[iFrom].pTab->isTransient ){
++      sqliteDeleteTable(0, pSrc->a[iFrom].pTab);
++    }
++    sqliteFree(pSrc->a[iFrom].zDatabase);
++    sqliteFree(pSrc->a[iFrom].zName);
++    sqliteFree(pSrc->a[iFrom].zAlias);
++    if( nSubSrc>1 ){
++      int extra = nSubSrc - 1;
++      for(i=1; i<nSubSrc; i++){
++        pSrc = sqliteSrcListAppend(pSrc, 0, 0);
++      }
++      p->pSrc = pSrc;
++      for(i=pSrc->nSrc-1; i-extra>=iFrom; i--){
++        pSrc->a[i] = pSrc->a[i-extra];
++      }
++    }
++    for(i=0; i<nSubSrc; i++){
++      pSrc->a[i+iFrom] = pSubSrc->a[i];
++      memset(&pSubSrc->a[i], 0, sizeof(pSubSrc->a[i]));
++    }
++    pSrc->a[iFrom+nSubSrc-1].jointype = jointype;
++  }
++
++  /* Now begin substituting subquery result set expressions for 
++  ** references to the iParent in the outer query.
++  ** 
++  ** Example:
++  **
++  **   SELECT a+5, b*10 FROM (SELECT x*3 AS a, y+10 AS b FROM t1) WHERE a>b;
++  **   \                     \_____________ subquery __________/          /
++  **    \_____________________ outer query ______________________________/
++  **
++  ** We look at every expression in the outer query and every place we see
++  ** "a" we substitute "x*3" and every place we see "b" we substitute "y+10".
++  */
++  substExprList(p->pEList, iParent, pSub->pEList);
++  pList = p->pEList;
++  for(i=0; i<pList->nExpr; i++){
++    Expr *pExpr;
++    if( pList->a[i].zName==0 && (pExpr = pList->a[i].pExpr)->span.z!=0 ){
++      pList->a[i].zName = sqliteStrNDup(pExpr->span.z, pExpr->span.n);
++    }
++  }
++  if( isAgg ){
++    substExprList(p->pGroupBy, iParent, pSub->pEList);
++    substExpr(p->pHaving, iParent, pSub->pEList);
++  }
++  if( pSub->pOrderBy ){
++    assert( p->pOrderBy==0 );
++    p->pOrderBy = pSub->pOrderBy;
++    pSub->pOrderBy = 0;
++  }else if( p->pOrderBy ){
++    substExprList(p->pOrderBy, iParent, pSub->pEList);
++  }
++  if( pSub->pWhere ){
++    pWhere = sqliteExprDup(pSub->pWhere);
++  }else{
++    pWhere = 0;
++  }
++  if( subqueryIsAgg ){
++    assert( p->pHaving==0 );
++    p->pHaving = p->pWhere;
++    p->pWhere = pWhere;
++    substExpr(p->pHaving, iParent, pSub->pEList);
++    if( pSub->pHaving ){
++      Expr *pHaving = sqliteExprDup(pSub->pHaving);
++      if( p->pHaving ){
++        p->pHaving = sqliteExpr(TK_AND, p->pHaving, pHaving, 0);
++      }else{
++        p->pHaving = pHaving;
++      }
++    }
++    assert( p->pGroupBy==0 );
++    p->pGroupBy = sqliteExprListDup(pSub->pGroupBy);
++  }else if( p->pWhere==0 ){
++    p->pWhere = pWhere;
++  }else{
++    substExpr(p->pWhere, iParent, pSub->pEList);
++    if( pWhere ){
++      p->pWhere = sqliteExpr(TK_AND, p->pWhere, pWhere, 0);
++    }
++  }
++
++  /* The flattened query is distinct if either the inner or the
++  ** outer query is distinct. 
++  */
++  p->isDistinct = p->isDistinct || pSub->isDistinct;
++
++  /* Transfer the limit expression from the subquery to the outer
++  ** query.
++  */
++  if( pSub->nLimit>=0 ){
++    if( p->nLimit<0 ){
++      p->nLimit = pSub->nLimit;
++    }else if( p->nLimit+p->nOffset > pSub->nLimit+pSub->nOffset ){
++      p->nLimit = pSub->nLimit + pSub->nOffset - p->nOffset;
++    }
++  }
++  p->nOffset += pSub->nOffset;
++
++  /* Finially, delete what is left of the subquery and return
++  ** success.
++  */
++  sqliteSelectDelete(pSub);
++  return 1;
++}
++
++/*
++** Analyze the SELECT statement passed in as an argument to see if it
++** is a simple min() or max() query.  If it is and this query can be
++** satisfied using a single seek to the beginning or end of an index,
++** then generate the code for this SELECT and return 1.  If this is not a 
++** simple min() or max() query, then return 0;
++**
++** A simply min() or max() query looks like this:
++**
++**    SELECT min(a) FROM table;
++**    SELECT max(a) FROM table;
++**
++** The query may have only a single table in its FROM argument.  There
++** can be no GROUP BY or HAVING or WHERE clauses.  The result set must
++** be the min() or max() of a single column of the table.  The column
++** in the min() or max() function must be indexed.
++**
++** The parameters to this routine are the same as for sqliteSelect().
++** See the header comment on that routine for additional information.
++*/
++static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
++  Expr *pExpr;
++  int iCol;
++  Table *pTab;
++  Index *pIdx;
++  int base;
++  Vdbe *v;
++  int seekOp;
++  int cont;
++  ExprList *pEList, *pList, eList;
++  struct ExprList_item eListItem;
++  SrcList *pSrc;
++  
++
++  /* Check to see if this query is a simple min() or max() query.  Return
++  ** zero if it is  not.
++  */
++  if( p->pGroupBy || p->pHaving || p->pWhere ) return 0;
++  pSrc = p->pSrc;
++  if( pSrc->nSrc!=1 ) return 0;
++  pEList = p->pEList;
++  if( pEList->nExpr!=1 ) return 0;
++  pExpr = pEList->a[0].pExpr;
++  if( pExpr->op!=TK_AGG_FUNCTION ) return 0;
++  pList = pExpr->pList;
++  if( pList==0 || pList->nExpr!=1 ) return 0;
++  if( pExpr->token.n!=3 ) return 0;
++  if( sqliteStrNICmp(pExpr->token.z,"min",3)==0 ){
++    seekOp = OP_Rewind;
++  }else if( sqliteStrNICmp(pExpr->token.z,"max",3)==0 ){
++    seekOp = OP_Last;
++  }else{
++    return 0;
++  }
++  pExpr = pList->a[0].pExpr;
++  if( pExpr->op!=TK_COLUMN ) return 0;
++  iCol = pExpr->iColumn;
++  pTab = pSrc->a[0].pTab;
++
++  /* If we get to here, it means the query is of the correct form.
++  ** Check to make sure we have an index and make pIdx point to the
++  ** appropriate index.  If the min() or max() is on an INTEGER PRIMARY
++  ** key column, no index is necessary so set pIdx to NULL.  If no
++  ** usable index is found, return 0.
++  */
++  if( iCol<0 ){
++    pIdx = 0;
++  }else{
++    for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++      assert( pIdx->nColumn>=1 );
++      if( pIdx->aiColumn[0]==iCol ) break;
++    }
++    if( pIdx==0 ) return 0;
++  }
++
++  /* Identify column types if we will be using the callback.  This
++  ** step is skipped if the output is going to a table or a memory cell.
++  ** The column names have already been generated in the calling function.
++  */
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ) return 0;
++  if( eDest==SRT_Callback ){
++    generateColumnTypes(pParse, p->pSrc, p->pEList);
++  }
++
++  /* If the output is destined for a temporary table, open that table.
++  */
++  if( eDest==SRT_TempTable ){
++    sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0);
++  }
++
++  /* Generating code to find the min or the max.  Basically all we have
++  ** to do is find the first or the last entry in the chosen index.  If
++  ** the min() or max() is on the INTEGER PRIMARY KEY, then find the first
++  ** or last entry in the main table.
++  */
++  sqliteCodeVerifySchema(pParse, pTab->iDb);
++  base = pSrc->a[0].iCursor;
++  computeLimitRegisters(pParse, p);
++  if( pSrc->a[0].pSelect==0 ){
++    sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++    sqliteVdbeOp3(v, OP_OpenRead, base, pTab->tnum, pTab->zName, 0);
++  }
++  cont = sqliteVdbeMakeLabel(v);
++  if( pIdx==0 ){
++    sqliteVdbeAddOp(v, seekOp, base, 0);
++  }else{
++    sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0);
++    sqliteVdbeOp3(v, OP_OpenRead, base+1, pIdx->tnum, pIdx->zName, P3_STATIC);
++    if( seekOp==OP_Rewind ){
++      sqliteVdbeAddOp(v, OP_String, 0, 0);
++      sqliteVdbeAddOp(v, OP_MakeKey, 1, 0);
++      sqliteVdbeAddOp(v, OP_IncrKey, 0, 0);
++      seekOp = OP_MoveTo;
++    }
++    sqliteVdbeAddOp(v, seekOp, base+1, 0);
++    sqliteVdbeAddOp(v, OP_IdxRecno, base+1, 0);
++    sqliteVdbeAddOp(v, OP_Close, base+1, 0);
++    sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
++  }
++  eList.nExpr = 1;
++  memset(&eListItem, 0, sizeof(eListItem));
++  eList.a = &eListItem;
++  eList.a[0].pExpr = pExpr;
++  selectInnerLoop(pParse, p, &eList, 0, 0, 0, -1, eDest, iParm, cont, cont);
++  sqliteVdbeResolveLabel(v, cont);
++  sqliteVdbeAddOp(v, OP_Close, base, 0);
++  
++  return 1;
++}
++
++/*
++** Generate code for the given SELECT statement.
++**
++** The results are distributed in various ways depending on the
++** value of eDest and iParm.
++**
++**     eDest Value       Result
++**     ------------    -------------------------------------------
++**     SRT_Callback    Invoke the callback for each row of the result.
++**
++**     SRT_Mem         Store first result in memory cell iParm
++**
++**     SRT_Set         Store results as keys of a table with cursor iParm
++**
++**     SRT_Union       Store results as a key in a temporary table iParm
++**
++**     SRT_Except      Remove results from the temporary table iParm.
++**
++**     SRT_Table       Store results in temporary table iParm
++**
++** The table above is incomplete.  Additional eDist value have be added
++** since this comment was written.  See the selectInnerLoop() function for
++** a complete listing of the allowed values of eDest and their meanings.
++**
++** This routine returns the number of errors.  If any errors are
++** encountered, then an appropriate error message is left in
++** pParse->zErrMsg.
++**
++** This routine does NOT free the Select structure passed in.  The
++** calling function needs to do that.
++**
++** The pParent, parentTab, and *pParentAgg fields are filled in if this
++** SELECT is a subquery.  This routine may try to combine this SELECT
++** with its parent to form a single flat query.  In so doing, it might
++** change the parent query from a non-aggregate to an aggregate query.
++** For that reason, the pParentAgg flag is passed as a pointer, so it
++** can be changed.
++**
++** Example 1:   The meaning of the pParent parameter.
++**
++**    SELECT * FROM t1 JOIN (SELECT x, count(*) FROM t2) JOIN t3;
++**    \                      \_______ subquery _______/        /
++**     \                                                      /
++**      \____________________ outer query ___________________/
++**
++** This routine is called for the outer query first.   For that call,
++** pParent will be NULL.  During the processing of the outer query, this 
++** routine is called recursively to handle the subquery.  For the recursive
++** call, pParent will point to the outer query.  Because the subquery is
++** the second element in a three-way join, the parentTab parameter will
++** be 1 (the 2nd value of a 0-indexed array.)
++*/
++int sqliteSelect(
++  Parse *pParse,         /* The parser context */
++  Select *p,             /* The SELECT statement being coded. */
++  int eDest,             /* How to dispose of the results */
++  int iParm,             /* A parameter used by the eDest disposal method */
++  Select *pParent,       /* Another SELECT for which this is a sub-query */
++  int parentTab,         /* Index in pParent->pSrc of this query */
++  int *pParentAgg        /* True if pParent uses aggregate functions */
++){
++  int i;
++  WhereInfo *pWInfo;
++  Vdbe *v;
++  int isAgg = 0;         /* True for select lists like "count(*)" */
++  ExprList *pEList;      /* List of columns to extract. */
++  SrcList *pTabList;     /* List of tables to select from */
++  Expr *pWhere;          /* The WHERE clause.  May be NULL */
++  ExprList *pOrderBy;    /* The ORDER BY clause.  May be NULL */
++  ExprList *pGroupBy;    /* The GROUP BY clause.  May be NULL */
++  Expr *pHaving;         /* The HAVING clause.  May be NULL */
++  int isDistinct;        /* True if the DISTINCT keyword is present */
++  int distinct;          /* Table to use for the distinct set */
++  int rc = 1;            /* Value to return from this function */
++
++  if( sqlite_malloc_failed || pParse->nErr || p==0 ) return 1;
++  if( sqliteAuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
++
++  /* If there is are a sequence of queries, do the earlier ones first.
++  */
++  if( p->pPrior ){
++    return multiSelect(pParse, p, eDest, iParm);
++  }
++
++  /* Make local copies of the parameters for this query.
++  */
++  pTabList = p->pSrc;
++  pWhere = p->pWhere;
++  pOrderBy = p->pOrderBy;
++  pGroupBy = p->pGroupBy;
++  pHaving = p->pHaving;
++  isDistinct = p->isDistinct;
++
++  /* Allocate VDBE cursors for each table in the FROM clause
++  */
++  sqliteSrcListAssignCursors(pParse, pTabList);
++
++  /* 
++  ** Do not even attempt to generate any code if we have already seen
++  ** errors before this routine starts.
++  */
++  if( pParse->nErr>0 ) goto select_end;
++
++  /* Expand any "*" terms in the result set.  (For example the "*" in
++  ** "SELECT * FROM t1")  The fillInColumnlist() routine also does some
++  ** other housekeeping - see the header comment for details.
++  */
++  if( fillInColumnList(pParse, p) ){
++    goto select_end;
++  }
++  pWhere = p->pWhere;
++  pEList = p->pEList;
++  if( pEList==0 ) goto select_end;
++
++  /* If writing to memory or generating a set
++  ** only a single column may be output.
++  */
++  if( (eDest==SRT_Mem || eDest==SRT_Set) && pEList->nExpr>1 ){
++    sqliteErrorMsg(pParse, "only a single result allowed for "
++       "a SELECT that is part of an expression");
++    goto select_end;
++  }
++
++  /* ORDER BY is ignored for some destinations.
++  */
++  switch( eDest ){
++    case SRT_Union:
++    case SRT_Except:
++    case SRT_Discard:
++      pOrderBy = 0;
++      break;
++    default:
++      break;
++  }
++
++  /* At this point, we should have allocated all the cursors that we
++  ** need to handle subquerys and temporary tables.  
++  **
++  ** Resolve the column names and do a semantics check on all the expressions.
++  */
++  for(i=0; i<pEList->nExpr; i++){
++    if( sqliteExprResolveIds(pParse, pTabList, 0, pEList->a[i].pExpr) ){
++      goto select_end;
++    }
++    if( sqliteExprCheck(pParse, pEList->a[i].pExpr, 1, &isAgg) ){
++      goto select_end;
++    }
++  }
++  if( pWhere ){
++    if( sqliteExprResolveIds(pParse, pTabList, pEList, pWhere) ){
++      goto select_end;
++    }
++    if( sqliteExprCheck(pParse, pWhere, 0, 0) ){
++      goto select_end;
++    }
++  }
++  if( pHaving ){
++    if( pGroupBy==0 ){
++      sqliteErrorMsg(pParse, "a GROUP BY clause is required before HAVING");
++      goto select_end;
++    }
++    if( sqliteExprResolveIds(pParse, pTabList, pEList, pHaving) ){
++      goto select_end;
++    }
++    if( sqliteExprCheck(pParse, pHaving, 1, &isAgg) ){
++      goto select_end;
++    }
++  }
++  if( pOrderBy ){
++    for(i=0; i<pOrderBy->nExpr; i++){
++      int iCol;
++      Expr *pE = pOrderBy->a[i].pExpr;
++      if( sqliteExprIsInteger(pE, &iCol) && iCol>0 && iCol<=pEList->nExpr ){
++        sqliteExprDelete(pE);
++        pE = pOrderBy->a[i].pExpr = sqliteExprDup(pEList->a[iCol-1].pExpr);
++      }
++      if( sqliteExprResolveIds(pParse, pTabList, pEList, pE) ){
++        goto select_end;
++      }
++      if( sqliteExprCheck(pParse, pE, isAgg, 0) ){
++        goto select_end;
++      }
++      if( sqliteExprIsConstant(pE) ){
++        if( sqliteExprIsInteger(pE, &iCol)==0 ){
++          sqliteErrorMsg(pParse,
++             "ORDER BY terms must not be non-integer constants");
++          goto select_end;
++        }else if( iCol<=0 || iCol>pEList->nExpr ){
++          sqliteErrorMsg(pParse, 
++             "ORDER BY column number %d out of range - should be "
++             "between 1 and %d", iCol, pEList->nExpr);
++          goto select_end;
++        }
++      }
++    }
++  }
++  if( pGroupBy ){
++    for(i=0; i<pGroupBy->nExpr; i++){
++      int iCol;
++      Expr *pE = pGroupBy->a[i].pExpr;
++      if( sqliteExprIsInteger(pE, &iCol) && iCol>0 && iCol<=pEList->nExpr ){
++        sqliteExprDelete(pE);
++        pE = pGroupBy->a[i].pExpr = sqliteExprDup(pEList->a[iCol-1].pExpr);
++      }
++      if( sqliteExprResolveIds(pParse, pTabList, pEList, pE) ){
++        goto select_end;
++      }
++      if( sqliteExprCheck(pParse, pE, isAgg, 0) ){
++        goto select_end;
++      }
++      if( sqliteExprIsConstant(pE) ){
++        if( sqliteExprIsInteger(pE, &iCol)==0 ){
++          sqliteErrorMsg(pParse,
++            "GROUP BY terms must not be non-integer constants");
++          goto select_end;
++        }else if( iCol<=0 || iCol>pEList->nExpr ){
++          sqliteErrorMsg(pParse,
++             "GROUP BY column number %d out of range - should be "
++             "between 1 and %d", iCol, pEList->nExpr);
++          goto select_end;
++        }
++      }
++    }
++  }
++
++  /* Begin generating code.
++  */
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ) goto select_end;
++
++  /* Identify column names if we will be using them in a callback.  This
++  ** step is skipped if the output is going to some other destination.
++  */
++  if( eDest==SRT_Callback ){
++    generateColumnNames(pParse, pTabList, pEList);
++  }
++
++  /* Generate code for all sub-queries in the FROM clause
++  */
++  for(i=0; i<pTabList->nSrc; i++){
++    const char *zSavedAuthContext;
++    int needRestoreContext;
++
++    if( pTabList->a[i].pSelect==0 ) continue;
++    if( pTabList->a[i].zName!=0 ){
++      zSavedAuthContext = pParse->zAuthContext;
++      pParse->zAuthContext = pTabList->a[i].zName;
++      needRestoreContext = 1;
++    }else{
++      needRestoreContext = 0;
++    }
++    sqliteSelect(pParse, pTabList->a[i].pSelect, SRT_TempTable, 
++                 pTabList->a[i].iCursor, p, i, &isAgg);
++    if( needRestoreContext ){
++      pParse->zAuthContext = zSavedAuthContext;
++    }
++    pTabList = p->pSrc;
++    pWhere = p->pWhere;
++    if( eDest!=SRT_Union && eDest!=SRT_Except && eDest!=SRT_Discard ){
++      pOrderBy = p->pOrderBy;
++    }
++    pGroupBy = p->pGroupBy;
++    pHaving = p->pHaving;
++    isDistinct = p->isDistinct;
++  }
++
++  /* Check for the special case of a min() or max() function by itself
++  ** in the result set.
++  */
++  if( simpleMinMaxQuery(pParse, p, eDest, iParm) ){
++    rc = 0;
++    goto select_end;
++  }
++
++  /* Check to see if this is a subquery that can be "flattened" into its parent.
++  ** If flattening is a possiblity, do so and return immediately.  
++  */
++  if( pParent && pParentAgg &&
++      flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){
++    if( isAgg ) *pParentAgg = 1;
++    return rc;
++  }
++
++  /* Set the limiter.
++  */
++  computeLimitRegisters(pParse, p);
++
++  /* Identify column types if we will be using a callback.  This
++  ** step is skipped if the output is going to a destination other
++  ** than a callback.
++  **
++  ** We have to do this separately from the creation of column names
++  ** above because if the pTabList contains views then they will not
++  ** have been resolved and we will not know the column types until
++  ** now.
++  */
++  if( eDest==SRT_Callback ){
++    generateColumnTypes(pParse, pTabList, pEList);
++  }
++
++  /* If the output is destined for a temporary table, open that table.
++  */
++  if( eDest==SRT_TempTable ){
++    sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0);
++  }
++
++  /* Do an analysis of aggregate expressions.
++  */
++  sqliteAggregateInfoReset(pParse);
++  if( isAgg || pGroupBy ){
++    assert( pParse->nAgg==0 );
++    isAgg = 1;
++    for(i=0; i<pEList->nExpr; i++){
++      if( sqliteExprAnalyzeAggregates(pParse, pEList->a[i].pExpr) ){
++        goto select_end;
++      }
++    }
++    if( pGroupBy ){
++      for(i=0; i<pGroupBy->nExpr; i++){
++        if( sqliteExprAnalyzeAggregates(pParse, pGroupBy->a[i].pExpr) ){
++          goto select_end;
++        }
++      }
++    }
++    if( pHaving && sqliteExprAnalyzeAggregates(pParse, pHaving) ){
++      goto select_end;
++    }
++    if( pOrderBy ){
++      for(i=0; i<pOrderBy->nExpr; i++){
++        if( sqliteExprAnalyzeAggregates(pParse, pOrderBy->a[i].pExpr) ){
++          goto select_end;
++        }
++      }
++    }
++  }
++
++  /* Reset the aggregator
++  */
++  if( isAgg ){
++    sqliteVdbeAddOp(v, OP_AggReset, 0, pParse->nAgg);
++    for(i=0; i<pParse->nAgg; i++){
++      FuncDef *pFunc;
++      if( (pFunc = pParse->aAgg[i].pFunc)!=0 && pFunc->xFinalize!=0 ){
++        sqliteVdbeOp3(v, OP_AggInit, 0, i, (char*)pFunc, P3_POINTER);
++      }
++    }
++    if( pGroupBy==0 ){
++      sqliteVdbeAddOp(v, OP_String, 0, 0);
++      sqliteVdbeAddOp(v, OP_AggFocus, 0, 0);
++    }
++  }
++
++  /* Initialize the memory cell to NULL
++  */
++  if( eDest==SRT_Mem ){
++    sqliteVdbeAddOp(v, OP_String, 0, 0);
++    sqliteVdbeAddOp(v, OP_MemStore, iParm, 1);
++  }
++
++  /* Open a temporary table to use for the distinct set.
++  */
++  if( isDistinct ){
++    distinct = pParse->nTab++;
++    sqliteVdbeAddOp(v, OP_OpenTemp, distinct, 1);
++  }else{
++    distinct = -1;
++  }
++
++  /* Begin the database scan
++  */
++  pWInfo = sqliteWhereBegin(pParse, pTabList, pWhere, 0, 
++                            pGroupBy ? 0 : &pOrderBy);
++  if( pWInfo==0 ) goto select_end;
++
++  /* Use the standard inner loop if we are not dealing with
++  ** aggregates
++  */
++  if( !isAgg ){
++    if( selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, distinct, eDest,
++                    iParm, pWInfo->iContinue, pWInfo->iBreak) ){
++       goto select_end;
++    }
++  }
++
++  /* If we are dealing with aggregates, then do the special aggregate
++  ** processing.  
++  */
++  else{
++    AggExpr *pAgg;
++    if( pGroupBy ){
++      int lbl1;
++      for(i=0; i<pGroupBy->nExpr; i++){
++        sqliteExprCode(pParse, pGroupBy->a[i].pExpr);
++      }
++      sqliteVdbeAddOp(v, OP_MakeKey, pGroupBy->nExpr, 0);
++      if( pParse->db->file_format>=4 ) sqliteAddKeyType(v, pGroupBy);
++      lbl1 = sqliteVdbeMakeLabel(v);
++      sqliteVdbeAddOp(v, OP_AggFocus, 0, lbl1);
++      for(i=0, pAgg=pParse->aAgg; i<pParse->nAgg; i++, pAgg++){
++        if( pAgg->isAgg ) continue;
++        sqliteExprCode(pParse, pAgg->pExpr);
++        sqliteVdbeAddOp(v, OP_AggSet, 0, i);
++      }
++      sqliteVdbeResolveLabel(v, lbl1);
++    }
++    for(i=0, pAgg=pParse->aAgg; i<pParse->nAgg; i++, pAgg++){
++      Expr *pE;
++      int nExpr;
++      FuncDef *pDef;
++      if( !pAgg->isAgg ) continue;
++      assert( pAgg->pFunc!=0 );
++      assert( pAgg->pFunc->xStep!=0 );
++      pDef = pAgg->pFunc;
++      pE = pAgg->pExpr;
++      assert( pE!=0 );
++      assert( pE->op==TK_AGG_FUNCTION );
++      nExpr = sqliteExprCodeExprList(pParse, pE->pList, pDef->includeTypes);
++      sqliteVdbeAddOp(v, OP_Integer, i, 0);
++      sqliteVdbeOp3(v, OP_AggFunc, 0, nExpr, (char*)pDef, P3_POINTER);
++    }
++  }
++
++  /* End the database scan loop.
++  */
++  sqliteWhereEnd(pWInfo);
++
++  /* If we are processing aggregates, we need to set up a second loop
++  ** over all of the aggregate values and process them.
++  */
++  if( isAgg ){
++    int endagg = sqliteVdbeMakeLabel(v);
++    int startagg;
++    startagg = sqliteVdbeAddOp(v, OP_AggNext, 0, endagg);
++    pParse->useAgg = 1;
++    if( pHaving ){
++      sqliteExprIfFalse(pParse, pHaving, startagg, 1);
++    }
++    if( selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, distinct, eDest,
++                    iParm, startagg, endagg) ){
++      goto select_end;
++    }
++    sqliteVdbeAddOp(v, OP_Goto, 0, startagg);
++    sqliteVdbeResolveLabel(v, endagg);
++    sqliteVdbeAddOp(v, OP_Noop, 0, 0);
++    pParse->useAgg = 0;
++  }
++
++  /* If there is an ORDER BY clause, then we need to sort the results
++  ** and send them to the callback one by one.
++  */
++  if( pOrderBy ){
++    generateSortTail(p, v, pEList->nExpr, eDest, iParm);
++  }
++
++  /* If this was a subquery, we have now converted the subquery into a
++  ** temporary table.  So delete the subquery structure from the parent
++  ** to prevent this subquery from being evaluated again and to force the
++  ** the use of the temporary table.
++  */
++  if( pParent ){
++    assert( pParent->pSrc->nSrc>parentTab );
++    assert( pParent->pSrc->a[parentTab].pSelect==p );
++    sqliteSelectDelete(p);
++    pParent->pSrc->a[parentTab].pSelect = 0;
++  }
++
++  /* The SELECT was successfully coded.   Set the return code to 0
++  ** to indicate no errors.
++  */
++  rc = 0;
++
++  /* Control jumps to here if an error is encountered above, or upon
++  ** successful coding of the SELECT.
++  */
++select_end:
++  sqliteAggregateInfoReset(pParse);
++  return rc;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/sqlite_config.w32.h
+@@ -0,0 +1,8 @@
++#include "config.w32.h"
++#if ZTS
++# define THREADSAFE 1
++#endif
++#if !ZEND_DEBUG && !defined(NDEBUG)
++# define NDEBUG
++#endif
++#define SQLITE_PTR_SZ 4
+\ No newline at end of file
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/sqlite.h.in
+@@ -0,0 +1,886 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This header file defines the interface that the SQLite library
++** presents to client programs.
++**
++** @(#) $Id$
++*/
++#ifndef _SQLITE_H_
++#define _SQLITE_H_
++#include <stdarg.h>     /* Needed for the definition of va_list */
++
++/*
++** Make sure we can call this stuff from C++.
++*/
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++** The version of the SQLite library.
++*/
++#ifdef SQLITE_VERSION
++# undef SQLITE_VERSION
++#else
++# define SQLITE_VERSION         "--VERS--"
++#endif
++
++/*
++** The version string is also compiled into the library so that a program
++** can check to make sure that the lib*.a file and the *.h file are from
++** the same version.
++*/
++extern const char sqlite_version[];
++
++/*
++** The SQLITE_UTF8 macro is defined if the library expects to see
++** UTF-8 encoded data.  The SQLITE_ISO8859 macro is defined if the
++** iso8859 encoded should be used.
++*/
++#define SQLITE_--ENCODING-- 1
++
++/*
++** The following constant holds one of two strings, "UTF-8" or "iso8859",
++** depending on which character encoding the SQLite library expects to
++** see.  The character encoding makes a difference for the LIKE and GLOB
++** operators and for the LENGTH() and SUBSTR() functions.
++*/
++extern const char sqlite_encoding[];
++
++/*
++** Each open sqlite database is represented by an instance of the
++** following opaque structure.
++*/
++typedef struct sqlite sqlite;
++
++/*
++** A function to open a new sqlite database.  
++**
++** If the database does not exist and mode indicates write
++** permission, then a new database is created.  If the database
++** does not exist and mode does not indicate write permission,
++** then the open fails, an error message generated (if errmsg!=0)
++** and the function returns 0.
++** 
++** If mode does not indicates user write permission, then the 
++** database is opened read-only.
++**
++** The Truth:  As currently implemented, all databases are opened
++** for writing all the time.  Maybe someday we will provide the
++** ability to open a database readonly.  The mode parameters is
++** provided in anticipation of that enhancement.
++*/
++sqlite *sqlite_open(const char *filename, int mode, char **errmsg);
++
++/*
++** A function to close the database.
++**
++** Call this function with a pointer to a structure that was previously
++** returned from sqlite_open() and the corresponding database will by closed.
++*/
++void sqlite_close(sqlite *);
++
++/*
++** The type for a callback function.
++*/
++typedef int (*sqlite_callback)(void*,int,char**, char**);
++
++/*
++** A function to executes one or more statements of SQL.
++**
++** If one or more of the SQL statements are queries, then
++** the callback function specified by the 3rd parameter is
++** invoked once for each row of the query result.  This callback
++** should normally return 0.  If the callback returns a non-zero
++** value then the query is aborted, all subsequent SQL statements
++** are skipped and the sqlite_exec() function returns the SQLITE_ABORT.
++**
++** The 4th parameter is an arbitrary pointer that is passed
++** to the callback function as its first parameter.
++**
++** The 2nd parameter to the callback function is the number of
++** columns in the query result.  The 3rd parameter to the callback
++** is an array of strings holding the values for each column.
++** The 4th parameter to the callback is an array of strings holding
++** the names of each column.
++**
++** The callback function may be NULL, even for queries.  A NULL
++** callback is not an error.  It just means that no callback
++** will be invoked.
++**
++** If an error occurs while parsing or evaluating the SQL (but
++** not while executing the callback) then an appropriate error
++** message is written into memory obtained from malloc() and
++** *errmsg is made to point to that message.  The calling function
++** is responsible for freeing the memory that holds the error
++** message.   Use sqlite_freemem() for this.  If errmsg==NULL,
++** then no error message is ever written.
++**
++** The return value is is SQLITE_OK if there are no errors and
++** some other return code if there is an error.  The particular
++** return value depends on the type of error. 
++**
++** If the query could not be executed because a database file is
++** locked or busy, then this function returns SQLITE_BUSY.  (This
++** behavior can be modified somewhat using the sqlite_busy_handler()
++** and sqlite_busy_timeout() functions below.)
++*/
++int sqlite_exec(
++  sqlite*,                      /* An open database */
++  const char *sql,              /* SQL to be executed */
++  sqlite_callback,              /* Callback function */
++  void *,                       /* 1st argument to callback function */
++  char **errmsg                 /* Error msg written here */
++);
++
++/*
++** Return values for sqlite_exec() and sqlite_step()
++*/
++#define SQLITE_OK           0   /* Successful result */
++#define SQLITE_ERROR        1   /* SQL error or missing database */
++#define SQLITE_INTERNAL     2   /* An internal logic error in SQLite */
++#define SQLITE_PERM         3   /* Access permission denied */
++#define SQLITE_ABORT        4   /* Callback routine requested an abort */
++#define SQLITE_BUSY         5   /* The database file is locked */
++#define SQLITE_LOCKED       6   /* A table in the database is locked */
++#define SQLITE_NOMEM        7   /* A malloc() failed */
++#define SQLITE_READONLY     8   /* Attempt to write a readonly database */
++#define SQLITE_INTERRUPT    9   /* Operation terminated by sqlite_interrupt() */
++#define SQLITE_IOERR       10   /* Some kind of disk I/O error occurred */
++#define SQLITE_CORRUPT     11   /* The database disk image is malformed */
++#define SQLITE_NOTFOUND    12   /* (Internal Only) Table or record not found */
++#define SQLITE_FULL        13   /* Insertion failed because database is full */
++#define SQLITE_CANTOPEN    14   /* Unable to open the database file */
++#define SQLITE_PROTOCOL    15   /* Database lock protocol error */
++#define SQLITE_EMPTY       16   /* (Internal Only) Database table is empty */
++#define SQLITE_SCHEMA      17   /* The database schema changed */
++#define SQLITE_TOOBIG      18   /* Too much data for one row of a table */
++#define SQLITE_CONSTRAINT  19   /* Abort due to contraint violation */
++#define SQLITE_MISMATCH    20   /* Data type mismatch */
++#define SQLITE_MISUSE      21   /* Library used incorrectly */
++#define SQLITE_NOLFS       22   /* Uses OS features not supported on host */
++#define SQLITE_AUTH        23   /* Authorization denied */
++#define SQLITE_FORMAT      24   /* Auxiliary database format error */
++#define SQLITE_RANGE       25   /* 2nd parameter to sqlite_bind out of range */
++#define SQLITE_NOTADB      26   /* File opened that is not a database file */
++#define SQLITE_ROW         100  /* sqlite_step() has another row ready */
++#define SQLITE_DONE        101  /* sqlite_step() has finished executing */
++
++/*
++** Each entry in an SQLite table has a unique integer key.  (The key is
++** the value of the INTEGER PRIMARY KEY column if there is such a column,
++** otherwise the key is generated at random.  The unique key is always
++** available as the ROWID, OID, or _ROWID_ column.)  The following routine
++** returns the integer key of the most recent insert in the database.
++**
++** This function is similar to the mysql_insert_id() function from MySQL.
++*/
++int sqlite_last_insert_rowid(sqlite*);
++
++/*
++** This function returns the number of database rows that were changed
++** (or inserted or deleted) by the most recent called sqlite_exec().
++**
++** All changes are counted, even if they were later undone by a
++** ROLLBACK or ABORT.  Except, changes associated with creating and
++** dropping tables are not counted.
++**
++** If a callback invokes sqlite_exec() recursively, then the changes
++** in the inner, recursive call are counted together with the changes
++** in the outer call.
++**
++** SQLite implements the command "DELETE FROM table" without a WHERE clause
++** by dropping and recreating the table.  (This is much faster than going
++** through and deleting individual elements form the table.)  Because of
++** this optimization, the change count for "DELETE FROM table" will be
++** zero regardless of the number of elements that were originally in the
++** table. To get an accurate count of the number of rows deleted, use
++** "DELETE FROM table WHERE 1" instead.
++*/
++int sqlite_changes(sqlite*);
++
++/*
++** This function returns the number of database rows that were changed
++** by the last INSERT, UPDATE, or DELETE statment executed by sqlite_exec(),
++** or by the last VM to run to completion. The change count is not updated
++** by SQL statements other than INSERT, UPDATE or DELETE.
++**
++** Changes are counted, even if they are later undone by a ROLLBACK or
++** ABORT. Changes associated with trigger programs that execute as a
++** result of the INSERT, UPDATE, or DELETE statement are not counted.
++**
++** If a callback invokes sqlite_exec() recursively, then the changes
++** in the inner, recursive call are counted together with the changes
++** in the outer call.
++**
++** SQLite implements the command "DELETE FROM table" without a WHERE clause
++** by dropping and recreating the table.  (This is much faster than going
++** through and deleting individual elements form the table.)  Because of
++** this optimization, the change count for "DELETE FROM table" will be
++** zero regardless of the number of elements that were originally in the
++** table. To get an accurate count of the number of rows deleted, use
++** "DELETE FROM table WHERE 1" instead.
++**
++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
++*/
++int sqlite_last_statement_changes(sqlite*);
++
++/* If the parameter to this routine is one of the return value constants
++** defined above, then this routine returns a constant text string which
++** descripts (in English) the meaning of the return value.
++*/
++const char *sqlite_error_string(int);
++#define sqliteErrStr sqlite_error_string  /* Legacy. Do not use in new code. */
++
++/* This function causes any pending database operation to abort and
++** return at its earliest opportunity.  This routine is typically
++** called in response to a user action such as pressing "Cancel"
++** or Ctrl-C where the user wants a long query operation to halt
++** immediately.
++*/
++void sqlite_interrupt(sqlite*);
++
++
++/* This function returns true if the given input string comprises
++** one or more complete SQL statements.
++**
++** The algorithm is simple.  If the last token other than spaces
++** and comments is a semicolon, then return true.  otherwise return
++** false.
++*/
++int sqlite_complete(const char *sql);
++
++/*
++** This routine identifies a callback function that is invoked
++** whenever an attempt is made to open a database table that is
++** currently locked by another process or thread.  If the busy callback
++** is NULL, then sqlite_exec() returns SQLITE_BUSY immediately if
++** it finds a locked table.  If the busy callback is not NULL, then
++** sqlite_exec() invokes the callback with three arguments.  The
++** second argument is the name of the locked table and the third
++** argument is the number of times the table has been busy.  If the
++** busy callback returns 0, then sqlite_exec() immediately returns
++** SQLITE_BUSY.  If the callback returns non-zero, then sqlite_exec()
++** tries to open the table again and the cycle repeats.
++**
++** The default busy callback is NULL.
++**
++** Sqlite is re-entrant, so the busy handler may start a new query. 
++** (It is not clear why anyone would every want to do this, but it
++** is allowed, in theory.)  But the busy handler may not close the
++** database.  Closing the database from a busy handler will delete 
++** data structures out from under the executing query and will 
++** probably result in a coredump.
++*/
++void sqlite_busy_handler(sqlite*, int(*)(void*,const char*,int), void*);
++
++/*
++** This routine sets a busy handler that sleeps for a while when a
++** table is locked.  The handler will sleep multiple times until 
++** at least "ms" milleseconds of sleeping have been done.  After
++** "ms" milleseconds of sleeping, the handler returns 0 which
++** causes sqlite_exec() to return SQLITE_BUSY.
++**
++** Calling this routine with an argument less than or equal to zero
++** turns off all busy handlers.
++*/
++void sqlite_busy_timeout(sqlite*, int ms);
++
++/*
++** This next routine is really just a wrapper around sqlite_exec().
++** Instead of invoking a user-supplied callback for each row of the
++** result, this routine remembers each row of the result in memory
++** obtained from malloc(), then returns all of the result after the
++** query has finished. 
++**
++** As an example, suppose the query result where this table:
++**
++**        Name        | Age
++**        -----------------------
++**        Alice       | 43
++**        Bob         | 28
++**        Cindy       | 21
++**
++** If the 3rd argument were &azResult then after the function returns
++** azResult will contain the following data:
++**
++**        azResult[0] = "Name";
++**        azResult[1] = "Age";
++**        azResult[2] = "Alice";
++**        azResult[3] = "43";
++**        azResult[4] = "Bob";
++**        azResult[5] = "28";
++**        azResult[6] = "Cindy";
++**        azResult[7] = "21";
++**
++** Notice that there is an extra row of data containing the column
++** headers.  But the *nrow return value is still 3.  *ncolumn is
++** set to 2.  In general, the number of values inserted into azResult
++** will be ((*nrow) + 1)*(*ncolumn).
++**
++** After the calling function has finished using the result, it should 
++** pass the result data pointer to sqlite_free_table() in order to 
++** release the memory that was malloc-ed.  Because of the way the 
++** malloc() happens, the calling function must not try to call 
++** malloc() directly.  Only sqlite_free_table() is able to release 
++** the memory properly and safely.
++**
++** The return value of this routine is the same as from sqlite_exec().
++*/
++int sqlite_get_table(
++  sqlite*,               /* An open database */
++  const char *sql,       /* SQL to be executed */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncolumn,          /* Number of result columns written here */
++  char **errmsg          /* Error msg written here */
++);
++
++/*
++** Call this routine to free the memory that sqlite_get_table() allocated.
++*/
++void sqlite_free_table(char **result);
++
++/*
++** The following routines are wrappers around sqlite_exec() and
++** sqlite_get_table().  The only difference between the routines that
++** follow and the originals is that the second argument to the 
++** routines that follow is really a printf()-style format
++** string describing the SQL to be executed.  Arguments to the format
++** string appear at the end of the argument list.
++**
++** All of the usual printf formatting options apply.  In addition, there
++** is a "%q" option.  %q works like %s in that it substitutes a null-terminated
++** string from the argument list.  But %q also doubles every '\'' character.
++** %q is designed for use inside a string literal.  By doubling each '\''
++** character it escapes that character and allows it to be inserted into
++** the string.
++**
++** For example, so some string variable contains text as follows:
++**
++**      char *zText = "It's a happy day!";
++**
++** We can use this text in an SQL statement as follows:
++**
++**      sqlite_exec_printf(db, "INSERT INTO table VALUES('%q')",
++**          callback1, 0, 0, zText);
++**
++** Because the %q format string is used, the '\'' character in zText
++** is escaped and the SQL generated is as follows:
++**
++**      INSERT INTO table1 VALUES('It''s a happy day!')
++**
++** This is correct.  Had we used %s instead of %q, the generated SQL
++** would have looked like this:
++**
++**      INSERT INTO table1 VALUES('It's a happy day!');
++**
++** This second example is an SQL syntax error.  As a general rule you
++** should always use %q instead of %s when inserting text into a string 
++** literal.
++*/
++int sqlite_exec_printf(
++  sqlite*,                      /* An open database */
++  const char *sqlFormat,        /* printf-style format string for the SQL */
++  sqlite_callback,              /* Callback function */
++  void *,                       /* 1st argument to callback function */
++  char **errmsg,                /* Error msg written here */
++  ...                           /* Arguments to the format string. */
++);
++int sqlite_exec_vprintf(
++  sqlite*,                      /* An open database */
++  const char *sqlFormat,        /* printf-style format string for the SQL */
++  sqlite_callback,              /* Callback function */
++  void *,                       /* 1st argument to callback function */
++  char **errmsg,                /* Error msg written here */
++  va_list ap                    /* Arguments to the format string. */
++);
++int sqlite_get_table_printf(
++  sqlite*,               /* An open database */
++  const char *sqlFormat, /* printf-style format string for the SQL */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncolumn,          /* Number of result columns written here */
++  char **errmsg,         /* Error msg written here */
++  ...                    /* Arguments to the format string */
++);
++int sqlite_get_table_vprintf(
++  sqlite*,               /* An open database */
++  const char *sqlFormat, /* printf-style format string for the SQL */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncolumn,          /* Number of result columns written here */
++  char **errmsg,         /* Error msg written here */
++  va_list ap             /* Arguments to the format string */
++);
++char *sqlite_mprintf(const char*,...);
++char *sqlite_vmprintf(const char*, va_list);
++
++/*
++** Windows systems should call this routine to free memory that
++** is returned in the in the errmsg parameter of sqlite_open() when
++** SQLite is a DLL.  For some reason, it does not work to call free()
++** directly.
++*/
++void sqlite_freemem(void *p);
++
++/*
++** Windows systems need functions to call to return the sqlite_version
++** and sqlite_encoding strings.
++*/
++const char *sqlite_libversion(void);
++const char *sqlite_libencoding(void);
++
++/*
++** A pointer to the following structure is used to communicate with
++** the implementations of user-defined functions.
++*/
++typedef struct sqlite_func sqlite_func;
++
++/*
++** Use the following routines to create new user-defined functions.  See
++** the documentation for details.
++*/
++int sqlite_create_function(
++  sqlite*,                  /* Database where the new function is registered */
++  const char *zName,        /* Name of the new function */
++  int nArg,                 /* Number of arguments.  -1 means any number */
++  void (*xFunc)(sqlite_func*,int,const char**),  /* C code to implement */
++  void *pUserData           /* Available via the sqlite_user_data() call */
++);
++int sqlite_create_aggregate(
++  sqlite*,                  /* Database where the new function is registered */
++  const char *zName,        /* Name of the function */
++  int nArg,                 /* Number of arguments */
++  void (*xStep)(sqlite_func*,int,const char**), /* Called for each row */
++  void (*xFinalize)(sqlite_func*),       /* Called once to get final result */
++  void *pUserData           /* Available via the sqlite_user_data() call */
++);
++
++/*
++** Use the following routine to define the datatype returned by a
++** user-defined function.  The second argument can be one of the
++** constants SQLITE_NUMERIC, SQLITE_TEXT, or SQLITE_ARGS or it
++** can be an integer greater than or equal to zero.  When the datatype
++** parameter is non-negative, the type of the result will be the
++** same as the datatype-th argument.  If datatype==SQLITE_NUMERIC
++** then the result is always numeric.  If datatype==SQLITE_TEXT then
++** the result is always text.  If datatype==SQLITE_ARGS then the result
++** is numeric if any argument is numeric and is text otherwise.
++*/
++int sqlite_function_type(
++  sqlite *db,               /* The database there the function is registered */
++  const char *zName,        /* Name of the function */
++  int datatype              /* The datatype for this function */
++);
++#define SQLITE_NUMERIC     (-1)
++/* #define SQLITE_TEXT     (-2)  // See below */
++#define SQLITE_ARGS        (-3)
++
++/*
++** SQLite version 3 defines SQLITE_TEXT differently.  To allow both
++** version 2 and version 3 to be included, undefine them both if a
++** conflict is seen.  Define SQLITE2_TEXT to be the version 2 value.
++*/
++#ifdef SQLITE_TEXT
++# undef SQLITE_TEXT
++#else
++# define SQLITE_TEXT     (-2)
++#endif
++#define SQLITE2_TEXT     (-2)
++
++
++
++/*
++** The user function implementations call one of the following four routines
++** in order to return their results.  The first parameter to each of these
++** routines is a copy of the first argument to xFunc() or xFinialize().
++** The second parameter to these routines is the result to be returned.
++** A NULL can be passed as the second parameter to sqlite_set_result_string()
++** in order to return a NULL result.
++**
++** The 3rd argument to _string and _error is the number of characters to
++** take from the string.  If this argument is negative, then all characters
++** up to and including the first '\000' are used.
++**
++** The sqlite_set_result_string() function allocates a buffer to hold the
++** result and returns a pointer to this buffer.  The calling routine
++** (that is, the implmentation of a user function) can alter the content
++** of this buffer if desired.
++*/
++char *sqlite_set_result_string(sqlite_func*,const char*,int);
++void sqlite_set_result_int(sqlite_func*,int);
++void sqlite_set_result_double(sqlite_func*,double);
++void sqlite_set_result_error(sqlite_func*,const char*,int);
++
++/*
++** The pUserData parameter to the sqlite_create_function() and
++** sqlite_create_aggregate() routines used to register user functions
++** is available to the implementation of the function using this
++** call.
++*/
++void *sqlite_user_data(sqlite_func*);
++
++/*
++** Aggregate functions use the following routine to allocate
++** a structure for storing their state.  The first time this routine
++** is called for a particular aggregate, a new structure of size nBytes
++** is allocated, zeroed, and returned.  On subsequent calls (for the
++** same aggregate instance) the same buffer is returned.  The implementation
++** of the aggregate can use the returned buffer to accumulate data.
++**
++** The buffer allocated is freed automatically be SQLite.
++*/
++void *sqlite_aggregate_context(sqlite_func*, int nBytes);
++
++/*
++** The next routine returns the number of calls to xStep for a particular
++** aggregate function instance.  The current call to xStep counts so this
++** routine always returns at least 1.
++*/
++int sqlite_aggregate_count(sqlite_func*);
++
++/*
++** This routine registers a callback with the SQLite library.  The
++** callback is invoked (at compile-time, not at run-time) for each
++** attempt to access a column of a table in the database.  The callback
++** returns SQLITE_OK if access is allowed, SQLITE_DENY if the entire
++** SQL statement should be aborted with an error and SQLITE_IGNORE
++** if the column should be treated as a NULL value.
++*/
++int sqlite_set_authorizer(
++  sqlite*,
++  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
++  void *pUserData
++);
++
++/*
++** The second parameter to the access authorization function above will
++** be one of the values below.  These values signify what kind of operation
++** is to be authorized.  The 3rd and 4th parameters to the authorization
++** function will be parameters or NULL depending on which of the following
++** codes is used as the second parameter.  The 5th parameter is the name
++** of the database ("main", "temp", etc.) if applicable.  The 6th parameter
++** is the name of the inner-most trigger or view that is responsible for
++** the access attempt or NULL if this access attempt is directly from 
++** input SQL code.
++**
++**                                          Arg-3           Arg-4
++*/
++#define SQLITE_COPY                  0   /* Table Name      File Name       */
++#define SQLITE_CREATE_INDEX          1   /* Index Name      Table Name      */
++#define SQLITE_CREATE_TABLE          2   /* Table Name      NULL            */
++#define SQLITE_CREATE_TEMP_INDEX     3   /* Index Name      Table Name      */
++#define SQLITE_CREATE_TEMP_TABLE     4   /* Table Name      NULL            */
++#define SQLITE_CREATE_TEMP_TRIGGER   5   /* Trigger Name    Table Name      */
++#define SQLITE_CREATE_TEMP_VIEW      6   /* View Name       NULL            */
++#define SQLITE_CREATE_TRIGGER        7   /* Trigger Name    Table Name      */
++#define SQLITE_CREATE_VIEW           8   /* View Name       NULL            */
++#define SQLITE_DELETE                9   /* Table Name      NULL            */
++#define SQLITE_DROP_INDEX           10   /* Index Name      Table Name      */
++#define SQLITE_DROP_TABLE           11   /* Table Name      NULL            */
++#define SQLITE_DROP_TEMP_INDEX      12   /* Index Name      Table Name      */
++#define SQLITE_DROP_TEMP_TABLE      13   /* Table Name      NULL            */
++#define SQLITE_DROP_TEMP_TRIGGER    14   /* Trigger Name    Table Name      */
++#define SQLITE_DROP_TEMP_VIEW       15   /* View Name       NULL            */
++#define SQLITE_DROP_TRIGGER         16   /* Trigger Name    Table Name      */
++#define SQLITE_DROP_VIEW            17   /* View Name       NULL            */
++#define SQLITE_INSERT               18   /* Table Name      NULL            */
++#define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
++#define SQLITE_READ                 20   /* Table Name      Column Name     */
++#define SQLITE_SELECT               21   /* NULL            NULL            */
++#define SQLITE_TRANSACTION          22   /* NULL            NULL            */
++#define SQLITE_UPDATE               23   /* Table Name      Column Name     */
++#define SQLITE_ATTACH               24   /* Filename        NULL            */
++#define SQLITE_DETACH               25   /* Database Name   NULL            */
++
++
++/*
++** The return value of the authorization function should be one of the
++** following constants:
++*/
++/* #define SQLITE_OK  0   // Allow access (This is actually defined above) */
++#define SQLITE_DENY   1   /* Abort the SQL statement with an error */
++#define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
++
++/*
++** Register a function that is called at every invocation of sqlite_exec()
++** or sqlite_compile().  This function can be used (for example) to generate
++** a log file of all SQL executed against a database.
++*/
++void *sqlite_trace(sqlite*, void(*xTrace)(void*,const char*), void*);
++
++/*** The Callback-Free API
++** 
++** The following routines implement a new way to access SQLite that does not
++** involve the use of callbacks.
++**
++** An sqlite_vm is an opaque object that represents a single SQL statement
++** that is ready to be executed.
++*/
++typedef struct sqlite_vm sqlite_vm;
++
++/*
++** To execute an SQLite query without the use of callbacks, you first have
++** to compile the SQL using this routine.  The 1st parameter "db" is a pointer
++** to an sqlite object obtained from sqlite_open().  The 2nd parameter
++** "zSql" is the text of the SQL to be compiled.   The remaining parameters
++** are all outputs.
++**
++** *pzTail is made to point to the first character past the end of the first
++** SQL statement in zSql.  This routine only compiles the first statement
++** in zSql, so *pzTail is left pointing to what remains uncompiled.
++**
++** *ppVm is left pointing to a "virtual machine" that can be used to execute
++** the compiled statement.  Or if there is an error, *ppVm may be set to NULL.
++** If the input text contained no SQL (if the input is and empty string or
++** a comment) then *ppVm is set to NULL.
++**
++** If any errors are detected during compilation, an error message is written
++** into space obtained from malloc() and *pzErrMsg is made to point to that
++** error message.  The calling routine is responsible for freeing the text
++** of this message when it has finished with it.  Use sqlite_freemem() to
++** free the message.  pzErrMsg may be NULL in which case no error message
++** will be generated.
++**
++** On success, SQLITE_OK is returned.  Otherwise and error code is returned.
++*/
++int sqlite_compile(
++  sqlite *db,                   /* The open database */
++  const char *zSql,             /* SQL statement to be compiled */
++  const char **pzTail,          /* OUT: uncompiled tail of zSql */
++  sqlite_vm **ppVm,             /* OUT: the virtual machine to execute zSql */
++  char **pzErrmsg               /* OUT: Error message. */
++);
++
++/*
++** After an SQL statement has been compiled, it is handed to this routine
++** to be executed.  This routine executes the statement as far as it can
++** go then returns.  The return value will be one of SQLITE_DONE,
++** SQLITE_ERROR, SQLITE_BUSY, SQLITE_ROW, or SQLITE_MISUSE.
++**
++** SQLITE_DONE means that the execute of the SQL statement is complete
++** an no errors have occurred.  sqlite_step() should not be called again
++** for the same virtual machine.  *pN is set to the number of columns in
++** the result set and *pazColName is set to an array of strings that
++** describe the column names and datatypes.  The name of the i-th column
++** is (*pazColName)[i] and the datatype of the i-th column is
++** (*pazColName)[i+*pN].  *pazValue is set to NULL.
++**
++** SQLITE_ERROR means that the virtual machine encountered a run-time
++** error.  sqlite_step() should not be called again for the same
++** virtual machine.  *pN is set to 0 and *pazColName and *pazValue are set
++** to NULL.  Use sqlite_finalize() to obtain the specific error code
++** and the error message text for the error.
++**
++** SQLITE_BUSY means that an attempt to open the database failed because
++** another thread or process is holding a lock.  The calling routine
++** can try again to open the database by calling sqlite_step() again.
++** The return code will only be SQLITE_BUSY if no busy handler is registered
++** using the sqlite_busy_handler() or sqlite_busy_timeout() routines.  If
++** a busy handler callback has been registered but returns 0, then this
++** routine will return SQLITE_ERROR and sqltie_finalize() will return
++** SQLITE_BUSY when it is called.
++**
++** SQLITE_ROW means that a single row of the result is now available.
++** The data is contained in *pazValue.  The value of the i-th column is
++** (*azValue)[i].  *pN and *pazColName are set as described in SQLITE_DONE.
++** Invoke sqlite_step() again to advance to the next row.
++**
++** SQLITE_MISUSE is returned if sqlite_step() is called incorrectly.
++** For example, if you call sqlite_step() after the virtual machine
++** has halted (after a prior call to sqlite_step() has returned SQLITE_DONE)
++** or if you call sqlite_step() with an incorrectly initialized virtual
++** machine or a virtual machine that has been deleted or that is associated
++** with an sqlite structure that has been closed.
++*/
++int sqlite_step(
++  sqlite_vm *pVm,              /* The virtual machine to execute */
++  int *pN,                     /* OUT: Number of columns in result */
++  const char ***pazValue,      /* OUT: Column data */
++  const char ***pazColName     /* OUT: Column names and datatypes */
++);
++
++/*
++** This routine is called to delete a virtual machine after it has finished
++** executing.  The return value is the result code.  SQLITE_OK is returned
++** if the statement executed successfully and some other value is returned if
++** there was any kind of error.  If an error occurred and pzErrMsg is not
++** NULL, then an error message is written into memory obtained from malloc()
++** and *pzErrMsg is made to point to that error message.  The calling routine
++** should use sqlite_freemem() to delete this message when it has finished
++** with it.
++**
++** This routine can be called at any point during the execution of the
++** virtual machine.  If the virtual machine has not completed execution
++** when this routine is called, that is like encountering an error or
++** an interrupt.  (See sqlite_interrupt().)  Incomplete updates may be
++** rolled back and transactions cancelled,  depending on the circumstances,
++** and the result code returned will be SQLITE_ABORT.
++*/
++int sqlite_finalize(sqlite_vm*, char **pzErrMsg);
++
++/*
++** This routine deletes the virtual machine, writes any error message to
++** *pzErrMsg and returns an SQLite return code in the same way as the
++** sqlite_finalize() function.
++**
++** Additionally, if ppVm is not NULL, *ppVm is left pointing to a new virtual
++** machine loaded with the compiled version of the original query ready for
++** execution.
++**
++** If sqlite_reset() returns SQLITE_SCHEMA, then *ppVm is set to NULL.
++**
++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
++*/
++int sqlite_reset(sqlite_vm*, char **pzErrMsg);
++
++/*
++** If the SQL that was handed to sqlite_compile contains variables that
++** are represeted in the SQL text by a question mark ('?').  This routine
++** is used to assign values to those variables.
++**
++** The first parameter is a virtual machine obtained from sqlite_compile().
++** The 2nd "idx" parameter determines which variable in the SQL statement
++** to bind the value to.  The left most '?' is 1.  The 3rd parameter is
++** the value to assign to that variable.  The 4th parameter is the number
++** of bytes in the value, including the terminating \000 for strings.
++** Finally, the 5th "copy" parameter is TRUE if SQLite should make its
++** own private copy of this value, or false if the space that the 3rd
++** parameter points to will be unchanging and can be used directly by
++** SQLite.
++**
++** Unbound variables are treated as having a value of NULL.  To explicitly
++** set a variable to NULL, call this routine with the 3rd parameter as a
++** NULL pointer.
++**
++** If the 4th "len" parameter is -1, then strlen() is used to find the
++** length.
++**
++** This routine can only be called immediately after sqlite_compile()
++** or sqlite_reset() and before any calls to sqlite_step().
++**
++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
++*/
++int sqlite_bind(sqlite_vm*, int idx, const char *value, int len, int copy);
++
++/*
++** This routine configures a callback function - the progress callback - that
++** is invoked periodically during long running calls to sqlite_exec(),
++** sqlite_step() and sqlite_get_table(). An example use for this API is to keep
++** a GUI updated during a large query.
++**
++** The progress callback is invoked once for every N virtual machine opcodes,
++** where N is the second argument to this function. The progress callback
++** itself is identified by the third argument to this function. The fourth
++** argument to this function is a void pointer passed to the progress callback
++** function each time it is invoked.
++**
++** If a call to sqlite_exec(), sqlite_step() or sqlite_get_table() results 
++** in less than N opcodes being executed, then the progress callback is not
++** invoked.
++** 
++** Calling this routine overwrites any previously installed progress callback.
++** To remove the progress callback altogether, pass NULL as the third
++** argument to this function.
++**
++** If the progress callback returns a result other than 0, then the current 
++** query is immediately terminated and any database changes rolled back. If the
++** query was part of a larger transaction, then the transaction is not rolled
++** back and remains active. The sqlite_exec() call returns SQLITE_ABORT. 
++**
++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
++*/
++void sqlite_progress_handler(sqlite*, int, int(*)(void*), void*);
++
++/*
++** Register a callback function to be invoked whenever a new transaction
++** is committed.  The pArg argument is passed through to the callback.
++** callback.  If the callback function returns non-zero, then the commit
++** is converted into a rollback.
++**
++** If another function was previously registered, its pArg value is returned.
++** Otherwise NULL is returned.
++**
++** Registering a NULL function disables the callback.
++**
++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
++*/
++void *sqlite_commit_hook(sqlite*, int(*)(void*), void*);
++
++/*
++** Open an encrypted SQLite database.  If pKey==0 or nKey==0, this routine
++** is the same as sqlite_open().
++**
++** The code to implement this API is not available in the public release
++** of SQLite.
++*/
++sqlite *sqlite_open_encrypted(
++  const char *zFilename,   /* Name of the encrypted database */
++  const void *pKey,        /* Pointer to the key */
++  int nKey,                /* Number of bytes in the key */
++  int *pErrcode,           /* Write error code here */
++  char **pzErrmsg          /* Write error message here */
++);
++
++/*
++** Change the key on an open database.  If the current database is not
++** encrypted, this routine will encrypt it.  If pNew==0 or nNew==0, the
++** database is decrypted.
++**
++** The code to implement this API is not available in the public release
++** of SQLite.
++*/
++int sqlite_rekey(
++  sqlite *db,                    /* Database to be rekeyed */
++  const void *pKey, int nKey     /* The new key */
++);
++
++/*
++** Encode a binary buffer "in" of size n bytes so that it contains
++** no instances of characters '\'' or '\000'.  The output is 
++** null-terminated and can be used as a string value in an INSERT
++** or UPDATE statement.  Use sqlite_decode_binary() to convert the
++** string back into its original binary.
++**
++** The result is written into a preallocated output buffer "out".
++** "out" must be able to hold at least 2 +(257*n)/254 bytes.
++** In other words, the output will be expanded by as much as 3
++** bytes for every 254 bytes of input plus 2 bytes of fixed overhead.
++** (This is approximately 2 + 1.0118*n or about a 1.2% size increase.)
++**
++** The return value is the number of characters in the encoded
++** string, excluding the "\000" terminator.
++**
++** If out==NULL then no output is generated but the routine still returns
++** the number of characters that would have been generated if out had
++** not been NULL.
++*/
++int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out);
++
++/*
++** Decode the string "in" into binary data and write it into "out".
++** This routine reverses the encoding created by sqlite_encode_binary().
++** The output will always be a few bytes less than the input.  The number
++** of bytes of output is returned.  If the input is not a well-formed
++** encoding, -1 is returned.
++**
++** The "in" and "out" parameters may point to the same buffer in order
++** to decode a string in place.
++*/
++int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
++
++#ifdef __cplusplus
++}  /* End of the 'extern "C"' block */
++#endif
++
++#endif /* _SQLITE_H_ */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/sqliteInt.h
+@@ -0,0 +1,1270 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** Internal interface definitions for SQLite.
++**
++** @(#) $Id$
++*/
++#include "config.h"
++#include "sqlite.h"
++#include "hash.h"
++#include "parse.h"
++#include "btree.h"
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <assert.h>
++
++/*
++** The maximum number of in-memory pages to use for the main database
++** table and for temporary tables.
++*/
++#define MAX_PAGES   2000
++#define TEMP_PAGES   500
++
++/*
++** If the following macro is set to 1, then NULL values are considered
++** distinct for the SELECT DISTINCT statement and for UNION or EXCEPT
++** compound queries.  No other SQL database engine (among those tested) 
++** works this way except for OCELOT.  But the SQL92 spec implies that
++** this is how things should work.
++**
++** If the following macro is set to 0, then NULLs are indistinct for
++** SELECT DISTINCT and for UNION.
++*/
++#define NULL_ALWAYS_DISTINCT 0
++
++/*
++** If the following macro is set to 1, then NULL values are considered
++** distinct when determining whether or not two entries are the same
++** in a UNIQUE index.  This is the way PostgreSQL, Oracle, DB2, MySQL,
++** OCELOT, and Firebird all work.  The SQL92 spec explicitly says this
++** is the way things are suppose to work.
++**
++** If the following macro is set to 0, the NULLs are indistinct for
++** a UNIQUE index.  In this mode, you can only have a single NULL entry
++** for a column declared UNIQUE.  This is the way Informix and SQL Server
++** work.
++*/
++#define NULL_DISTINCT_FOR_UNIQUE 1
++
++/*
++** The maximum number of attached databases.  This must be at least 2
++** in order to support the main database file (0) and the file used to
++** hold temporary tables (1).  And it must be less than 256 because
++** an unsigned character is used to stored the database index.
++*/
++#define MAX_ATTACHED 10
++
++/*
++** The next macro is used to determine where TEMP tables and indices
++** are stored.  Possible values:
++**
++**   0    Always use a temporary files
++**   1    Use a file unless overridden by "PRAGMA temp_store"
++**   2    Use memory unless overridden by "PRAGMA temp_store"
++**   3    Always use memory
++*/
++#ifndef TEMP_STORE
++# define TEMP_STORE 1
++#endif
++
++/*
++** When building SQLite for embedded systems where memory is scarce,
++** you can define one or more of the following macros to omit extra
++** features of the library and thus keep the size of the library to
++** a minimum.
++*/
++/* #define SQLITE_OMIT_AUTHORIZATION  1 */
++/* #define SQLITE_OMIT_INMEMORYDB     1 */
++/* #define SQLITE_OMIT_VACUUM         1 */
++/* #define SQLITE_OMIT_DATETIME_FUNCS 1 */
++/* #define SQLITE_OMIT_PROGRESS_CALLBACK 1 */
++
++/*
++** Integers of known sizes.  These typedefs might change for architectures
++** where the sizes very.  Preprocessor macros are available so that the
++** types can be conveniently redefined at compile-type.  Like this:
++**
++**         cc '-DUINTPTR_TYPE=long long int' ...
++*/
++#ifndef UINT32_TYPE
++# define UINT32_TYPE unsigned int
++#endif
++#ifndef UINT16_TYPE
++# define UINT16_TYPE unsigned short int
++#endif
++#ifndef INT16_TYPE
++# define INT16_TYPE short int
++#endif
++#ifndef UINT8_TYPE
++# define UINT8_TYPE unsigned char
++#endif
++#ifndef INT8_TYPE
++# define INT8_TYPE signed char
++#endif
++#ifndef INTPTR_TYPE
++# if SQLITE_PTR_SZ==4
++#   define INTPTR_TYPE int
++# else
++#   define INTPTR_TYPE long long
++# endif
++#endif
++typedef UINT32_TYPE u32;           /* 4-byte unsigned integer */
++typedef UINT16_TYPE u16;           /* 2-byte unsigned integer */
++typedef INT16_TYPE i16;            /* 2-byte signed integer */
++typedef UINT8_TYPE u8;             /* 1-byte unsigned integer */
++typedef UINT8_TYPE i8;             /* 1-byte signed integer */
++typedef INTPTR_TYPE ptr;           /* Big enough to hold a pointer */
++typedef unsigned INTPTR_TYPE uptr; /* Big enough to hold a pointer */
++
++/*
++** Defer sourcing vdbe.h until after the "u8" typedef is defined.
++*/
++#include "vdbe.h"
++
++/*
++** Most C compilers these days recognize "long double", don't they?
++** Just in case we encounter one that does not, we will create a macro
++** for long double so that it can be easily changed to just "double".
++*/
++#ifndef LONGDOUBLE_TYPE
++# define LONGDOUBLE_TYPE long double
++#endif
++
++/*
++** This macro casts a pointer to an integer.  Useful for doing
++** pointer arithmetic.
++*/
++#define Addr(X)  ((uptr)X)
++
++/*
++** The maximum number of bytes of data that can be put into a single
++** row of a single table.  The upper bound on this limit is 16777215
++** bytes (or 16MB-1).  We have arbitrarily set the limit to just 1MB
++** here because the overflow page chain is inefficient for really big
++** records and we want to discourage people from thinking that 
++** multi-megabyte records are OK.  If your needs are different, you can
++** change this define and recompile to increase or decrease the record
++** size.
++**
++** The 16777198 is computed as follows:  238 bytes of payload on the
++** original pages plus 16448 overflow pages each holding 1020 bytes of
++** data.
++*/
++#define MAX_BYTES_PER_ROW  1048576
++/* #define MAX_BYTES_PER_ROW 16777198 */
++
++/*
++** If memory allocation problems are found, recompile with
++**
++**      -DMEMORY_DEBUG=1
++**
++** to enable some sanity checking on malloc() and free().  To
++** check for memory leaks, recompile with
++**
++**      -DMEMORY_DEBUG=2
++**
++** and a line of text will be written to standard error for
++** each malloc() and free().  This output can be analyzed
++** by an AWK script to determine if there are any leaks.
++*/
++#ifdef MEMORY_DEBUG
++# define sqliteMalloc(X)    sqliteMalloc_(X,1,__FILE__,__LINE__)
++# define sqliteMallocRaw(X) sqliteMalloc_(X,0,__FILE__,__LINE__)
++# define sqliteFree(X)      sqliteFree_(X,__FILE__,__LINE__)
++# define sqliteRealloc(X,Y) sqliteRealloc_(X,Y,__FILE__,__LINE__)
++# define sqliteStrDup(X)    sqliteStrDup_(X,__FILE__,__LINE__)
++# define sqliteStrNDup(X,Y) sqliteStrNDup_(X,Y,__FILE__,__LINE__)
++  void sqliteStrRealloc(char**);
++#else
++# define sqliteRealloc_(X,Y) sqliteRealloc(X,Y)
++# define sqliteStrRealloc(X)
++#endif
++
++/*
++** This variable gets set if malloc() ever fails.  After it gets set,
++** the SQLite library shuts down permanently.
++*/
++extern int sqlite_malloc_failed;
++
++/*
++** The following global variables are used for testing and debugging
++** only.  They only work if MEMORY_DEBUG is defined.
++*/
++#ifdef MEMORY_DEBUG
++extern int sqlite_nMalloc;       /* Number of sqliteMalloc() calls */
++extern int sqlite_nFree;         /* Number of sqliteFree() calls */
++extern int sqlite_iMallocFail;   /* Fail sqliteMalloc() after this many calls */
++#endif
++
++/*
++** Name of the master database table.  The master database table
++** is a special table that holds the names and attributes of all
++** user tables and indices.
++*/
++#define MASTER_NAME       "sqlite_master"
++#define TEMP_MASTER_NAME  "sqlite_temp_master"
++
++/*
++** The name of the schema table.
++*/
++#define SCHEMA_TABLE(x)  (x?TEMP_MASTER_NAME:MASTER_NAME)
++
++/*
++** A convenience macro that returns the number of elements in
++** an array.
++*/
++#define ArraySize(X)    (sizeof(X)/sizeof(X[0]))
++
++/*
++** Forward references to structures
++*/
++typedef struct Column Column;
++typedef struct Table Table;
++typedef struct Index Index;
++typedef struct Instruction Instruction;
++typedef struct Expr Expr;
++typedef struct ExprList ExprList;
++typedef struct Parse Parse;
++typedef struct Token Token;
++typedef struct IdList IdList;
++typedef struct SrcList SrcList;
++typedef struct WhereInfo WhereInfo;
++typedef struct WhereLevel WhereLevel;
++typedef struct Select Select;
++typedef struct AggExpr AggExpr;
++typedef struct FuncDef FuncDef;
++typedef struct Trigger Trigger;
++typedef struct TriggerStep TriggerStep;
++typedef struct TriggerStack TriggerStack;
++typedef struct FKey FKey;
++typedef struct Db Db;
++typedef struct AuthContext AuthContext;
++
++/*
++** Each database file to be accessed by the system is an instance
++** of the following structure.  There are normally two of these structures
++** in the sqlite.aDb[] array.  aDb[0] is the main database file and
++** aDb[1] is the database file used to hold temporary tables.  Additional
++** databases may be attached.
++*/
++struct Db {
++  char *zName;         /* Name of this database */
++  Btree *pBt;          /* The B*Tree structure for this database file */
++  int schema_cookie;   /* Database schema version number for this file */
++  Hash tblHash;        /* All tables indexed by name */
++  Hash idxHash;        /* All (named) indices indexed by name */
++  Hash trigHash;       /* All triggers indexed by name */
++  Hash aFKey;          /* Foreign keys indexed by to-table */
++  u8 inTrans;          /* 0: not writable.  1: Transaction.  2: Checkpoint */
++  u16 flags;           /* Flags associated with this database */
++  void *pAux;          /* Auxiliary data.  Usually NULL */
++  void (*xFreeAux)(void*);  /* Routine to free pAux */
++};
++
++/*
++** These macros can be used to test, set, or clear bits in the 
++** Db.flags field.
++*/
++#define DbHasProperty(D,I,P)     (((D)->aDb[I].flags&(P))==(P))
++#define DbHasAnyProperty(D,I,P)  (((D)->aDb[I].flags&(P))!=0)
++#define DbSetProperty(D,I,P)     (D)->aDb[I].flags|=(P)
++#define DbClearProperty(D,I,P)   (D)->aDb[I].flags&=~(P)
++
++/*
++** Allowed values for the DB.flags field.
++**
++** The DB_Locked flag is set when the first OP_Transaction or OP_Checkpoint
++** opcode is emitted for a database.  This prevents multiple occurances
++** of those opcodes for the same database in the same program.  Similarly,
++** the DB_Cookie flag is set when the OP_VerifyCookie opcode is emitted,
++** and prevents duplicate OP_VerifyCookies from taking up space and slowing
++** down execution.
++**
++** The DB_SchemaLoaded flag is set after the database schema has been
++** read into internal hash tables.
++**
++** DB_UnresetViews means that one or more views have column names that
++** have been filled out.  If the schema changes, these column names might
++** changes and so the view will need to be reset.
++*/
++#define DB_Locked          0x0001  /* OP_Transaction opcode has been emitted */
++#define DB_Cookie          0x0002  /* OP_VerifyCookie opcode has been emiited */
++#define DB_SchemaLoaded    0x0004  /* The schema has been loaded */
++#define DB_UnresetViews    0x0008  /* Some views have defined column names */
++
++
++/*
++** Each database is an instance of the following structure.
++**
++** The sqlite.file_format is initialized by the database file
++** and helps determines how the data in the database file is
++** represented.  This field allows newer versions of the library
++** to read and write older databases.  The various file formats
++** are as follows:
++**
++**     file_format==1    Version 2.1.0.
++**     file_format==2    Version 2.2.0. Add support for INTEGER PRIMARY KEY.
++**     file_format==3    Version 2.6.0. Fix empty-string index bug.
++**     file_format==4    Version 2.7.0. Add support for separate numeric and
++**                       text datatypes.
++**
++** The sqlite.temp_store determines where temporary database files
++** are stored.  If 1, then a file is created to hold those tables.  If
++** 2, then they are held in memory.  0 means use the default value in
++** the TEMP_STORE macro.
++**
++** The sqlite.lastRowid records the last insert rowid generated by an
++** insert statement.  Inserts on views do not affect its value.  Each
++** trigger has its own context, so that lastRowid can be updated inside
++** triggers as usual.  The previous value will be restored once the trigger
++** exits.  Upon entering a before or instead of trigger, lastRowid is no
++** longer (since after version 2.8.12) reset to -1.
++**
++** The sqlite.nChange does not count changes within triggers and keeps no
++** context.  It is reset at start of sqlite_exec.
++** The sqlite.lsChange represents the number of changes made by the last
++** insert, update, or delete statement.  It remains constant throughout the
++** length of a statement and is then updated by OP_SetCounts.  It keeps a
++** context stack just like lastRowid so that the count of changes
++** within a trigger is not seen outside the trigger.  Changes to views do not
++** affect the value of lsChange.
++** The sqlite.csChange keeps track of the number of current changes (since
++** the last statement) and is used to update sqlite_lsChange.
++*/
++struct sqlite {
++  int nDb;                      /* Number of backends currently in use */
++  Db *aDb;                      /* All backends */
++  Db aDbStatic[2];              /* Static space for the 2 default backends */
++  int flags;                    /* Miscellanous flags. See below */
++  u8 file_format;               /* What file format version is this database? */
++  u8 safety_level;              /* How aggressive at synching data to disk */
++  u8 want_to_close;             /* Close after all VDBEs are deallocated */
++  u8 temp_store;                /* 1=file, 2=memory, 0=compile-time default */
++  u8 onError;                   /* Default conflict algorithm */
++  int next_cookie;              /* Next value of aDb[0].schema_cookie */
++  int cache_size;               /* Number of pages to use in the cache */
++  int nTable;                   /* Number of tables in the database */
++  void *pBusyArg;               /* 1st Argument to the busy callback */
++  int (*xBusyCallback)(void *,const char*,int);  /* The busy callback */
++  void *pCommitArg;             /* Argument to xCommitCallback() */   
++  int (*xCommitCallback)(void*);/* Invoked at every commit. */
++  Hash aFunc;                   /* All functions that can be in SQL exprs */
++  int lastRowid;                /* ROWID of most recent insert (see above) */
++  int priorNewRowid;            /* Last randomly generated ROWID */
++  int magic;                    /* Magic number for detect library misuse */
++  int nChange;                  /* Number of rows changed (see above) */
++  int lsChange;                 /* Last statement change count (see above) */
++  int csChange;                 /* Current statement change count (see above) */
++  struct sqliteInitInfo {       /* Information used during initialization */
++    int iDb;                       /* When back is being initialized */
++    int newTnum;                   /* Rootpage of table being initialized */
++    u8 busy;                       /* TRUE if currently initializing */
++  } init;
++  struct Vdbe *pVdbe;           /* List of active virtual machines */
++  void (*xTrace)(void*,const char*);     /* Trace function */
++  void *pTraceArg;                       /* Argument to the trace function */
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
++                                /* Access authorization function */
++  void *pAuthArg;               /* 1st argument to the access auth function */
++#endif
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++  int (*xProgress)(void *);     /* The progress callback */
++  void *pProgressArg;           /* Argument to the progress callback */
++  int nProgressOps;             /* Number of opcodes for progress callback */
++#endif
++};
++
++/*
++** Possible values for the sqlite.flags and or Db.flags fields.
++**
++** On sqlite.flags, the SQLITE_InTrans value means that we have
++** executed a BEGIN.  On Db.flags, SQLITE_InTrans means a statement
++** transaction is active on that particular database file.
++*/
++#define SQLITE_VdbeTrace      0x00000001  /* True to trace VDBE execution */
++#define SQLITE_Initialized    0x00000002  /* True after initialization */
++#define SQLITE_Interrupt      0x00000004  /* Cancel current operation */
++#define SQLITE_InTrans        0x00000008  /* True if in a transaction */
++#define SQLITE_InternChanges  0x00000010  /* Uncommitted Hash table changes */
++#define SQLITE_FullColNames   0x00000020  /* Show full column names on SELECT */
++#define SQLITE_ShortColNames  0x00000040  /* Show short columns names */
++#define SQLITE_CountRows      0x00000080  /* Count rows changed by INSERT, */
++                                          /*   DELETE, or UPDATE and return */
++                                          /*   the count using a callback. */
++#define SQLITE_NullCallback   0x00000100  /* Invoke the callback once if the */
++                                          /*   result set is empty */
++#define SQLITE_ReportTypes    0x00000200  /* Include information on datatypes */
++                                          /*   in 4th argument of callback */
++
++/*
++** Possible values for the sqlite.magic field.
++** The numbers are obtained at random and have no special meaning, other
++** than being distinct from one another.
++*/
++#define SQLITE_MAGIC_OPEN     0xa029a697  /* Database is open */
++#define SQLITE_MAGIC_CLOSED   0x9f3c2d33  /* Database is closed */
++#define SQLITE_MAGIC_BUSY     0xf03b7906  /* Database currently in use */
++#define SQLITE_MAGIC_ERROR    0xb5357930  /* An SQLITE_MISUSE error occurred */
++
++/*
++** Each SQL function is defined by an instance of the following
++** structure.  A pointer to this structure is stored in the sqlite.aFunc
++** hash table.  When multiple functions have the same name, the hash table
++** points to a linked list of these structures.
++*/
++struct FuncDef {
++  void (*xFunc)(sqlite_func*,int,const char**);  /* Regular function */
++  void (*xStep)(sqlite_func*,int,const char**);  /* Aggregate function step */
++  void (*xFinalize)(sqlite_func*);           /* Aggregate function finializer */
++  signed char nArg;         /* Number of arguments.  -1 means unlimited */
++  signed char dataType;     /* Arg that determines datatype.  -1=NUMERIC, */
++                            /* -2=TEXT. -3=SQLITE_ARGS */
++  u8 includeTypes;          /* Add datatypes to args of xFunc and xStep */
++  void *pUserData;          /* User data parameter */
++  FuncDef *pNext;           /* Next function with same name */
++};
++
++/*
++** information about each column of an SQL table is held in an instance
++** of this structure.
++*/
++struct Column {
++  char *zName;     /* Name of this column */
++  char *zDflt;     /* Default value of this column */
++  char *zType;     /* Data type for this column */
++  u8 notNull;      /* True if there is a NOT NULL constraint */
++  u8 isPrimKey;    /* True if this column is part of the PRIMARY KEY */
++  u8 sortOrder;    /* Some combination of SQLITE_SO_... values */
++  u8 dottedName;   /* True if zName contains a "." character */
++};
++
++/*
++** The allowed sort orders.
++**
++** The TEXT and NUM values use bits that do not overlap with DESC and ASC.
++** That way the two can be combined into a single number.
++*/
++#define SQLITE_SO_UNK       0  /* Use the default collating type.  (SCT_NUM) */
++#define SQLITE_SO_TEXT      2  /* Sort using memcmp() */
++#define SQLITE_SO_NUM       4  /* Sort using sqliteCompare() */
++#define SQLITE_SO_TYPEMASK  6  /* Mask to extract the collating sequence */
++#define SQLITE_SO_ASC       0  /* Sort in ascending order */
++#define SQLITE_SO_DESC      1  /* Sort in descending order */
++#define SQLITE_SO_DIRMASK   1  /* Mask to extract the sort direction */
++
++/*
++** Each SQL table is represented in memory by an instance of the
++** following structure.
++**
++** Table.zName is the name of the table.  The case of the original
++** CREATE TABLE statement is stored, but case is not significant for
++** comparisons.
++**
++** Table.nCol is the number of columns in this table.  Table.aCol is a
++** pointer to an array of Column structures, one for each column.
++**
++** If the table has an INTEGER PRIMARY KEY, then Table.iPKey is the index of
++** the column that is that key.   Otherwise Table.iPKey is negative.  Note
++** that the datatype of the PRIMARY KEY must be INTEGER for this field to
++** be set.  An INTEGER PRIMARY KEY is used as the rowid for each row of
++** the table.  If a table has no INTEGER PRIMARY KEY, then a random rowid
++** is generated for each row of the table.  Table.hasPrimKey is true if
++** the table has any PRIMARY KEY, INTEGER or otherwise.
++**
++** Table.tnum is the page number for the root BTree page of the table in the
++** database file.  If Table.iDb is the index of the database table backend
++** in sqlite.aDb[].  0 is for the main database and 1 is for the file that
++** holds temporary tables and indices.  If Table.isTransient
++** is true, then the table is stored in a file that is automatically deleted
++** when the VDBE cursor to the table is closed.  In this case Table.tnum 
++** refers VDBE cursor number that holds the table open, not to the root
++** page number.  Transient tables are used to hold the results of a
++** sub-query that appears instead of a real table name in the FROM clause 
++** of a SELECT statement.
++*/
++struct Table {
++  char *zName;     /* Name of the table */
++  int nCol;        /* Number of columns in this table */
++  Column *aCol;    /* Information about each column */
++  int iPKey;       /* If not less then 0, use aCol[iPKey] as the primary key */
++  Index *pIndex;   /* List of SQL indexes on this table. */
++  int tnum;        /* Root BTree node for this table (see note above) */
++  Select *pSelect; /* NULL for tables.  Points to definition if a view. */
++  u8 readOnly;     /* True if this table should not be written by the user */
++  u8 iDb;          /* Index into sqlite.aDb[] of the backend for this table */
++  u8 isTransient;  /* True if automatically deleted when VDBE finishes */
++  u8 hasPrimKey;   /* True if there exists a primary key */
++  u8 keyConf;      /* What to do in case of uniqueness conflict on iPKey */
++  Trigger *pTrigger; /* List of SQL triggers on this table */
++  FKey *pFKey;       /* Linked list of all foreign keys in this table */
++};
++
++/*
++** Each foreign key constraint is an instance of the following structure.
++**
++** A foreign key is associated with two tables.  The "from" table is
++** the table that contains the REFERENCES clause that creates the foreign
++** key.  The "to" table is the table that is named in the REFERENCES clause.
++** Consider this example:
++**
++**     CREATE TABLE ex1(
++**       a INTEGER PRIMARY KEY,
++**       b INTEGER CONSTRAINT fk1 REFERENCES ex2(x)
++**     );
++**
++** For foreign key "fk1", the from-table is "ex1" and the to-table is "ex2".
++**
++** Each REFERENCES clause generates an instance of the following structure
++** which is attached to the from-table.  The to-table need not exist when
++** the from-table is created.  The existance of the to-table is not checked
++** until an attempt is made to insert data into the from-table.
++**
++** The sqlite.aFKey hash table stores pointers to this structure
++** given the name of a to-table.  For each to-table, all foreign keys
++** associated with that table are on a linked list using the FKey.pNextTo
++** field.
++*/
++struct FKey {
++  Table *pFrom;     /* The table that constains the REFERENCES clause */
++  FKey *pNextFrom;  /* Next foreign key in pFrom */
++  char *zTo;        /* Name of table that the key points to */
++  FKey *pNextTo;    /* Next foreign key that points to zTo */
++  int nCol;         /* Number of columns in this key */
++  struct sColMap {  /* Mapping of columns in pFrom to columns in zTo */
++    int iFrom;         /* Index of column in pFrom */
++    char *zCol;        /* Name of column in zTo.  If 0 use PRIMARY KEY */
++  } *aCol;          /* One entry for each of nCol column s */
++  u8 isDeferred;    /* True if constraint checking is deferred till COMMIT */
++  u8 updateConf;    /* How to resolve conflicts that occur on UPDATE */
++  u8 deleteConf;    /* How to resolve conflicts that occur on DELETE */
++  u8 insertConf;    /* How to resolve conflicts that occur on INSERT */
++};
++
++/*
++** SQLite supports many different ways to resolve a contraint
++** error.  ROLLBACK processing means that a constraint violation
++** causes the operation in process to fail and for the current transaction
++** to be rolled back.  ABORT processing means the operation in process
++** fails and any prior changes from that one operation are backed out,
++** but the transaction is not rolled back.  FAIL processing means that
++** the operation in progress stops and returns an error code.  But prior
++** changes due to the same operation are not backed out and no rollback
++** occurs.  IGNORE means that the particular row that caused the constraint
++** error is not inserted or updated.  Processing continues and no error
++** is returned.  REPLACE means that preexisting database rows that caused
++** a UNIQUE constraint violation are removed so that the new insert or
++** update can proceed.  Processing continues and no error is reported.
++**
++** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys.
++** RESTRICT is the same as ABORT for IMMEDIATE foreign keys and the
++** same as ROLLBACK for DEFERRED keys.  SETNULL means that the foreign
++** key is set to NULL.  CASCADE means that a DELETE or UPDATE of the
++** referenced table row is propagated into the row that holds the
++** foreign key.
++** 
++** The following symbolic values are used to record which type
++** of action to take.
++*/
++#define OE_None     0   /* There is no constraint to check */
++#define OE_Rollback 1   /* Fail the operation and rollback the transaction */
++#define OE_Abort    2   /* Back out changes but do no rollback transaction */
++#define OE_Fail     3   /* Stop the operation but leave all prior changes */
++#define OE_Ignore   4   /* Ignore the error. Do not do the INSERT or UPDATE */
++#define OE_Replace  5   /* Delete existing record, then do INSERT or UPDATE */
++
++#define OE_Restrict 6   /* OE_Abort for IMMEDIATE, OE_Rollback for DEFERRED */
++#define OE_SetNull  7   /* Set the foreign key value to NULL */
++#define OE_SetDflt  8   /* Set the foreign key value to its default */
++#define OE_Cascade  9   /* Cascade the changes */
++
++#define OE_Default  99  /* Do whatever the default action is */
++
++/*
++** Each SQL index is represented in memory by an
++** instance of the following structure.
++**
++** The columns of the table that are to be indexed are described
++** by the aiColumn[] field of this structure.  For example, suppose
++** we have the following table and index:
++**
++**     CREATE TABLE Ex1(c1 int, c2 int, c3 text);
++**     CREATE INDEX Ex2 ON Ex1(c3,c1);
++**
++** In the Table structure describing Ex1, nCol==3 because there are
++** three columns in the table.  In the Index structure describing
++** Ex2, nColumn==2 since 2 of the 3 columns of Ex1 are indexed.
++** The value of aiColumn is {2, 0}.  aiColumn[0]==2 because the 
++** first column to be indexed (c3) has an index of 2 in Ex1.aCol[].
++** The second column to be indexed (c1) has an index of 0 in
++** Ex1.aCol[], hence Ex2.aiColumn[1]==0.
++**
++** The Index.onError field determines whether or not the indexed columns
++** must be unique and what to do if they are not.  When Index.onError=OE_None,
++** it means this is not a unique index.  Otherwise it is a unique index
++** and the value of Index.onError indicate the which conflict resolution 
++** algorithm to employ whenever an attempt is made to insert a non-unique
++** element.
++*/
++struct Index {
++  char *zName;     /* Name of this index */
++  int nColumn;     /* Number of columns in the table used by this index */
++  int *aiColumn;   /* Which columns are used by this index.  1st is 0 */
++  Table *pTable;   /* The SQL table being indexed */
++  int tnum;        /* Page containing root of this index in database file */
++  u8 onError;      /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
++  u8 autoIndex;    /* True if is automatically created (ex: by UNIQUE) */
++  u8 iDb;          /* Index in sqlite.aDb[] of where this index is stored */
++  Index *pNext;    /* The next index associated with the same table */
++};
++
++/*
++** Each token coming out of the lexer is an instance of
++** this structure.  Tokens are also used as part of an expression.
++**
++** Note if Token.z==0 then Token.dyn and Token.n are undefined and
++** may contain random values.  Do not make any assuptions about Token.dyn
++** and Token.n when Token.z==0.
++*/
++struct Token {
++  const char *z;      /* Text of the token.  Not NULL-terminated! */
++  unsigned dyn  : 1;  /* True for malloced memory, false for static */
++  unsigned n    : 31; /* Number of characters in this token */
++};
++
++/*
++** Each node of an expression in the parse tree is an instance
++** of this structure.
++**
++** Expr.op is the opcode.  The integer parser token codes are reused
++** as opcodes here.  For example, the parser defines TK_GE to be an integer
++** code representing the ">=" operator.  This same integer code is reused
++** to represent the greater-than-or-equal-to operator in the expression
++** tree.
++**
++** Expr.pRight and Expr.pLeft are subexpressions.  Expr.pList is a list
++** of argument if the expression is a function.
++**
++** Expr.token is the operator token for this node.  For some expressions
++** that have subexpressions, Expr.token can be the complete text that gave
++** rise to the Expr.  In the latter case, the token is marked as being
++** a compound token.
++**
++** An expression of the form ID or ID.ID refers to a column in a table.
++** For such expressions, Expr.op is set to TK_COLUMN and Expr.iTable is
++** the integer cursor number of a VDBE cursor pointing to that table and
++** Expr.iColumn is the column number for the specific column.  If the
++** expression is used as a result in an aggregate SELECT, then the
++** value is also stored in the Expr.iAgg column in the aggregate so that
++** it can be accessed after all aggregates are computed.
++**
++** If the expression is a function, the Expr.iTable is an integer code
++** representing which function.  If the expression is an unbound variable
++** marker (a question mark character '?' in the original SQL) then the
++** Expr.iTable holds the index number for that variable.
++**
++** The Expr.pSelect field points to a SELECT statement.  The SELECT might
++** be the right operand of an IN operator.  Or, if a scalar SELECT appears
++** in an expression the opcode is TK_SELECT and Expr.pSelect is the only
++** operand.
++*/
++struct Expr {
++  u8 op;                 /* Operation performed by this node */
++  u8 dataType;           /* Either SQLITE_SO_TEXT or SQLITE_SO_NUM */
++  u8 iDb;                /* Database referenced by this expression */
++  u8 flags;              /* Various flags.  See below */
++  Expr *pLeft, *pRight;  /* Left and right subnodes */
++  ExprList *pList;       /* A list of expressions used as function arguments
++                         ** or in "<expr> IN (<expr-list)" */
++  Token token;           /* An operand token */
++  Token span;            /* Complete text of the expression */
++  int iTable, iColumn;   /* When op==TK_COLUMN, then this expr node means the
++                         ** iColumn-th field of the iTable-th table. */
++  int iAgg;              /* When op==TK_COLUMN and pParse->useAgg==TRUE, pull
++                         ** result from the iAgg-th element of the aggregator */
++  Select *pSelect;       /* When the expression is a sub-select.  Also the
++                         ** right side of "<expr> IN (<select>)" */
++};
++
++/*
++** The following are the meanings of bits in the Expr.flags field.
++*/
++#define EP_FromJoin     0x0001  /* Originated in ON or USING clause of a join */
++
++/*
++** These macros can be used to test, set, or clear bits in the 
++** Expr.flags field.
++*/
++#define ExprHasProperty(E,P)     (((E)->flags&(P))==(P))
++#define ExprHasAnyProperty(E,P)  (((E)->flags&(P))!=0)
++#define ExprSetProperty(E,P)     (E)->flags|=(P)
++#define ExprClearProperty(E,P)   (E)->flags&=~(P)
++
++/*
++** A list of expressions.  Each expression may optionally have a
++** name.  An expr/name combination can be used in several ways, such
++** as the list of "expr AS ID" fields following a "SELECT" or in the
++** list of "ID = expr" items in an UPDATE.  A list of expressions can
++** also be used as the argument to a function, in which case the a.zName
++** field is not used.
++*/
++struct ExprList {
++  int nExpr;             /* Number of expressions on the list */
++  int nAlloc;            /* Number of entries allocated below */
++  struct ExprList_item {
++    Expr *pExpr;           /* The list of expressions */
++    char *zName;           /* Token associated with this expression */
++    u8 sortOrder;          /* 1 for DESC or 0 for ASC */
++    u8 isAgg;              /* True if this is an aggregate like count(*) */
++    u8 done;               /* A flag to indicate when processing is finished */
++  } *a;                  /* One entry for each expression */
++};
++
++/*
++** An instance of this structure can hold a simple list of identifiers,
++** such as the list "a,b,c" in the following statements:
++**
++**      INSERT INTO t(a,b,c) VALUES ...;
++**      CREATE INDEX idx ON t(a,b,c);
++**      CREATE TRIGGER trig BEFORE UPDATE ON t(a,b,c) ...;
++**
++** The IdList.a.idx field is used when the IdList represents the list of
++** column names after a table name in an INSERT statement.  In the statement
++**
++**     INSERT INTO t(a,b,c) ...
++**
++** If "a" is the k-th column of table "t", then IdList.a[0].idx==k.
++*/
++struct IdList {
++  int nId;         /* Number of identifiers on the list */
++  int nAlloc;      /* Number of entries allocated for a[] below */
++  struct IdList_item {
++    char *zName;      /* Name of the identifier */
++    int idx;          /* Index in some Table.aCol[] of a column named zName */
++  } *a;
++};
++
++/*
++** The following structure describes the FROM clause of a SELECT statement.
++** Each table or subquery in the FROM clause is a separate element of
++** the SrcList.a[] array.
++**
++** With the addition of multiple database support, the following structure
++** can also be used to describe a particular table such as the table that
++** is modified by an INSERT, DELETE, or UPDATE statement.  In standard SQL,
++** such a table must be a simple name: ID.  But in SQLite, the table can
++** now be identified by a database name, a dot, then the table name: ID.ID.
++*/
++struct SrcList {
++  i16 nSrc;        /* Number of tables or subqueries in the FROM clause */
++  i16 nAlloc;      /* Number of entries allocated in a[] below */
++  struct SrcList_item {
++    char *zDatabase;  /* Name of database holding this table */
++    char *zName;      /* Name of the table */
++    char *zAlias;     /* The "B" part of a "A AS B" phrase.  zName is the "A" */
++    Table *pTab;      /* An SQL table corresponding to zName */
++    Select *pSelect;  /* A SELECT statement used in place of a table name */
++    int jointype;     /* Type of join between this table and the next */
++    int iCursor;      /* The VDBE cursor number used to access this table */
++    Expr *pOn;        /* The ON clause of a join */
++    IdList *pUsing;   /* The USING clause of a join */
++  } a[1];             /* One entry for each identifier on the list */
++};
++
++/*
++** Permitted values of the SrcList.a.jointype field
++*/
++#define JT_INNER     0x0001    /* Any kind of inner or cross join */
++#define JT_NATURAL   0x0002    /* True for a "natural" join */
++#define JT_LEFT      0x0004    /* Left outer join */
++#define JT_RIGHT     0x0008    /* Right outer join */
++#define JT_OUTER     0x0010    /* The "OUTER" keyword is present */
++#define JT_ERROR     0x0020    /* unknown or unsupported join type */
++
++/*
++** For each nested loop in a WHERE clause implementation, the WhereInfo
++** structure contains a single instance of this structure.  This structure
++** is intended to be private the the where.c module and should not be
++** access or modified by other modules.
++*/
++struct WhereLevel {
++  int iMem;            /* Memory cell used by this level */
++  Index *pIdx;         /* Index used */
++  int iCur;            /* Cursor number used for this index */
++  int score;           /* How well this indexed scored */
++  int brk;             /* Jump here to break out of the loop */
++  int cont;            /* Jump here to continue with the next loop cycle */
++  int op, p1, p2;      /* Opcode used to terminate the loop */
++  int iLeftJoin;       /* Memory cell used to implement LEFT OUTER JOIN */
++  int top;             /* First instruction of interior of the loop */
++  int inOp, inP1, inP2;/* Opcode used to implement an IN operator */
++  int bRev;            /* Do the scan in the reverse direction */
++};
++
++/*
++** The WHERE clause processing routine has two halves.  The
++** first part does the start of the WHERE loop and the second
++** half does the tail of the WHERE loop.  An instance of
++** this structure is returned by the first half and passed
++** into the second half to give some continuity.
++*/
++struct WhereInfo {
++  Parse *pParse;
++  SrcList *pTabList;   /* List of tables in the join */
++  int iContinue;       /* Jump here to continue with next record */
++  int iBreak;          /* Jump here to break out of the loop */
++  int nLevel;          /* Number of nested loop */
++  int savedNTab;       /* Value of pParse->nTab before WhereBegin() */
++  int peakNTab;        /* Value of pParse->nTab after WhereBegin() */
++  WhereLevel a[1];     /* Information about each nest loop in the WHERE */
++};
++
++/*
++** An instance of the following structure contains all information
++** needed to generate code for a single SELECT statement.
++**
++** The zSelect field is used when the Select structure must be persistent.
++** Normally, the expression tree points to tokens in the original input
++** string that encodes the select.  But if the Select structure must live
++** longer than its input string (for example when it is used to describe
++** a VIEW) we have to make a copy of the input string so that the nodes
++** of the expression tree will have something to point to.  zSelect is used
++** to hold that copy.
++**
++** nLimit is set to -1 if there is no LIMIT clause.  nOffset is set to 0.
++** If there is a LIMIT clause, the parser sets nLimit to the value of the
++** limit and nOffset to the value of the offset (or 0 if there is not
++** offset).  But later on, nLimit and nOffset become the memory locations
++** in the VDBE that record the limit and offset counters.
++*/
++struct Select {
++  ExprList *pEList;      /* The fields of the result */
++  u8 op;                 /* One of: TK_UNION TK_ALL TK_INTERSECT TK_EXCEPT */
++  u8 isDistinct;         /* True if the DISTINCT keyword is present */
++  SrcList *pSrc;         /* The FROM clause */
++  Expr *pWhere;          /* The WHERE clause */
++  ExprList *pGroupBy;    /* The GROUP BY clause */
++  Expr *pHaving;         /* The HAVING clause */
++  ExprList *pOrderBy;    /* The ORDER BY clause */
++  Select *pPrior;        /* Prior select in a compound select statement */
++  int nLimit, nOffset;   /* LIMIT and OFFSET values.  -1 means not used */
++  int iLimit, iOffset;   /* Memory registers holding LIMIT & OFFSET counters */
++  char *zSelect;         /* Complete text of the SELECT command */
++};
++
++/*
++** The results of a select can be distributed in several ways.
++*/
++#define SRT_Callback     1  /* Invoke a callback with each row of result */
++#define SRT_Mem          2  /* Store result in a memory cell */
++#define SRT_Set          3  /* Store result as unique keys in a table */
++#define SRT_Union        5  /* Store result as keys in a table */
++#define SRT_Except       6  /* Remove result from a UNION table */
++#define SRT_Table        7  /* Store result as data with a unique key */
++#define SRT_TempTable    8  /* Store result in a trasient table */
++#define SRT_Discard      9  /* Do not save the results anywhere */
++#define SRT_Sorter      10  /* Store results in the sorter */
++#define SRT_Subroutine  11  /* Call a subroutine to handle results */
++
++/*
++** When a SELECT uses aggregate functions (like "count(*)" or "avg(f1)")
++** we have to do some additional analysis of expressions.  An instance
++** of the following structure holds information about a single subexpression
++** somewhere in the SELECT statement.  An array of these structures holds
++** all the information we need to generate code for aggregate
++** expressions.
++**
++** Note that when analyzing a SELECT containing aggregates, both
++** non-aggregate field variables and aggregate functions are stored
++** in the AggExpr array of the Parser structure.
++**
++** The pExpr field points to an expression that is part of either the
++** field list, the GROUP BY clause, the HAVING clause or the ORDER BY
++** clause.  The expression will be freed when those clauses are cleaned
++** up.  Do not try to delete the expression attached to AggExpr.pExpr.
++**
++** If AggExpr.pExpr==0, that means the expression is "count(*)".
++*/
++struct AggExpr {
++  int isAgg;        /* if TRUE contains an aggregate function */
++  Expr *pExpr;      /* The expression */
++  FuncDef *pFunc;   /* Information about the aggregate function */
++};
++
++/*
++** An SQL parser context.  A copy of this structure is passed through
++** the parser and down into all the parser action routine in order to
++** carry around information that is global to the entire parse.
++*/
++struct Parse {
++  sqlite *db;          /* The main database structure */
++  int rc;              /* Return code from execution */
++  char *zErrMsg;       /* An error message */
++  Token sErrToken;     /* The token at which the error occurred */
++  Token sFirstToken;   /* The first token parsed */
++  Token sLastToken;    /* The last token parsed */
++  const char *zTail;   /* All SQL text past the last semicolon parsed */
++  Table *pNewTable;    /* A table being constructed by CREATE TABLE */
++  Vdbe *pVdbe;         /* An engine for executing database bytecode */
++  u8 colNamesSet;      /* TRUE after OP_ColumnName has been issued to pVdbe */
++  u8 explain;          /* True if the EXPLAIN flag is found on the query */
++  u8 nameClash;        /* A permanent table name clashes with temp table name */
++  u8 useAgg;           /* If true, extract field values from the aggregator
++                       ** while generating expressions.  Normally false */
++  int nErr;            /* Number of errors seen */
++  int nTab;            /* Number of previously allocated VDBE cursors */
++  int nMem;            /* Number of memory cells used so far */
++  int nSet;            /* Number of sets used so far */
++  int nAgg;            /* Number of aggregate expressions */
++  int nVar;            /* Number of '?' variables seen in the SQL so far */
++  AggExpr *aAgg;       /* An array of aggregate expressions */
++  const char *zAuthContext; /* The 6th parameter to db->xAuth callbacks */
++  Trigger *pNewTrigger;     /* Trigger under construct by a CREATE TRIGGER */
++  TriggerStack *trigStack;  /* Trigger actions being coded */
++};
++
++/*
++** An instance of the following structure can be declared on a stack and used
++** to save the Parse.zAuthContext value so that it can be restored later.
++*/
++struct AuthContext {
++  const char *zAuthContext;   /* Put saved Parse.zAuthContext here */
++  Parse *pParse;              /* The Parse structure */
++};
++
++/*
++** Bitfield flags for P2 value in OP_PutIntKey and OP_Delete
++*/
++#define OPFLAG_NCHANGE   1    /* Set to update db->nChange */
++#define OPFLAG_LASTROWID 2    /* Set to update db->lastRowid */
++#define OPFLAG_CSCHANGE  4    /* Set to update db->csChange */
++
++/*
++ * Each trigger present in the database schema is stored as an instance of
++ * struct Trigger. 
++ *
++ * Pointers to instances of struct Trigger are stored in two ways.
++ * 1. In the "trigHash" hash table (part of the sqlite* that represents the 
++ *    database). This allows Trigger structures to be retrieved by name.
++ * 2. All triggers associated with a single table form a linked list, using the
++ *    pNext member of struct Trigger. A pointer to the first element of the
++ *    linked list is stored as the "pTrigger" member of the associated
++ *    struct Table.
++ *
++ * The "step_list" member points to the first element of a linked list
++ * containing the SQL statements specified as the trigger program.
++ */
++struct Trigger {
++  char *name;             /* The name of the trigger                        */
++  char *table;            /* The table or view to which the trigger applies */
++  u8 iDb;                 /* Database containing this trigger               */
++  u8 iTabDb;              /* Database containing Trigger.table              */
++  u8 op;                  /* One of TK_DELETE, TK_UPDATE, TK_INSERT         */
++  u8 tr_tm;               /* One of TK_BEFORE, TK_AFTER */
++  Expr *pWhen;            /* The WHEN clause of the expresion (may be NULL) */
++  IdList *pColumns;       /* If this is an UPDATE OF <column-list> trigger,
++                             the <column-list> is stored here */
++  int foreach;            /* One of TK_ROW or TK_STATEMENT */
++  Token nameToken;        /* Token containing zName. Use during parsing only */
++
++  TriggerStep *step_list; /* Link list of trigger program steps             */
++  Trigger *pNext;         /* Next trigger associated with the table */
++};
++
++/*
++ * An instance of struct TriggerStep is used to store a single SQL statement
++ * that is a part of a trigger-program. 
++ *
++ * Instances of struct TriggerStep are stored in a singly linked list (linked
++ * using the "pNext" member) referenced by the "step_list" member of the 
++ * associated struct Trigger instance. The first element of the linked list is
++ * the first step of the trigger-program.
++ * 
++ * The "op" member indicates whether this is a "DELETE", "INSERT", "UPDATE" or
++ * "SELECT" statement. The meanings of the other members is determined by the 
++ * value of "op" as follows:
++ *
++ * (op == TK_INSERT)
++ * orconf    -> stores the ON CONFLICT algorithm
++ * pSelect   -> If this is an INSERT INTO ... SELECT ... statement, then
++ *              this stores a pointer to the SELECT statement. Otherwise NULL.
++ * target    -> A token holding the name of the table to insert into.
++ * pExprList -> If this is an INSERT INTO ... VALUES ... statement, then
++ *              this stores values to be inserted. Otherwise NULL.
++ * pIdList   -> If this is an INSERT INTO ... (<column-names>) VALUES ... 
++ *              statement, then this stores the column-names to be
++ *              inserted into.
++ *
++ * (op == TK_DELETE)
++ * target    -> A token holding the name of the table to delete from.
++ * pWhere    -> The WHERE clause of the DELETE statement if one is specified.
++ *              Otherwise NULL.
++ * 
++ * (op == TK_UPDATE)
++ * target    -> A token holding the name of the table to update rows of.
++ * pWhere    -> The WHERE clause of the UPDATE statement if one is specified.
++ *              Otherwise NULL.
++ * pExprList -> A list of the columns to update and the expressions to update
++ *              them to. See sqliteUpdate() documentation of "pChanges"
++ *              argument.
++ * 
++ */
++struct TriggerStep {
++  int op;              /* One of TK_DELETE, TK_UPDATE, TK_INSERT, TK_SELECT */
++  int orconf;          /* OE_Rollback etc. */
++  Trigger *pTrig;      /* The trigger that this step is a part of */
++
++  Select *pSelect;     /* Valid for SELECT and sometimes 
++			  INSERT steps (when pExprList == 0) */
++  Token target;        /* Valid for DELETE, UPDATE, INSERT steps */
++  Expr *pWhere;        /* Valid for DELETE, UPDATE steps */
++  ExprList *pExprList; /* Valid for UPDATE statements and sometimes 
++			   INSERT steps (when pSelect == 0)         */
++  IdList *pIdList;     /* Valid for INSERT statements only */
++
++  TriggerStep * pNext; /* Next in the link-list */
++};
++
++/*
++ * An instance of struct TriggerStack stores information required during code
++ * generation of a single trigger program. While the trigger program is being
++ * coded, its associated TriggerStack instance is pointed to by the
++ * "pTriggerStack" member of the Parse structure.
++ *
++ * The pTab member points to the table that triggers are being coded on. The 
++ * newIdx member contains the index of the vdbe cursor that points at the temp
++ * table that stores the new.* references. If new.* references are not valid
++ * for the trigger being coded (for example an ON DELETE trigger), then newIdx
++ * is set to -1. The oldIdx member is analogous to newIdx, for old.* references.
++ *
++ * The ON CONFLICT policy to be used for the trigger program steps is stored 
++ * as the orconf member. If this is OE_Default, then the ON CONFLICT clause 
++ * specified for individual triggers steps is used.
++ *
++ * struct TriggerStack has a "pNext" member, to allow linked lists to be
++ * constructed. When coding nested triggers (triggers fired by other triggers)
++ * each nested trigger stores its parent trigger's TriggerStack as the "pNext" 
++ * pointer. Once the nested trigger has been coded, the pNext value is restored
++ * to the pTriggerStack member of the Parse stucture and coding of the parent
++ * trigger continues.
++ *
++ * Before a nested trigger is coded, the linked list pointed to by the 
++ * pTriggerStack is scanned to ensure that the trigger is not about to be coded
++ * recursively. If this condition is detected, the nested trigger is not coded.
++ */
++struct TriggerStack {
++  Table *pTab;         /* Table that triggers are currently being coded on */
++  int newIdx;          /* Index of vdbe cursor to "new" temp table */
++  int oldIdx;          /* Index of vdbe cursor to "old" temp table */
++  int orconf;          /* Current orconf policy */
++  int ignoreJump;      /* where to jump to for a RAISE(IGNORE) */
++  Trigger *pTrigger;   /* The trigger currently being coded */
++  TriggerStack *pNext; /* Next trigger down on the trigger stack */
++};
++
++/*
++** The following structure contains information used by the sqliteFix...
++** routines as they walk the parse tree to make database references
++** explicit.  
++*/
++typedef struct DbFixer DbFixer;
++struct DbFixer {
++  Parse *pParse;      /* The parsing context.  Error messages written here */
++  const char *zDb;    /* Make sure all objects are contained in this database */
++  const char *zType;  /* Type of the container - used for error messages */
++  const Token *pName; /* Name of the container - used for error messages */
++};
++
++/*
++ * This global flag is set for performance testing of triggers. When it is set
++ * SQLite will perform the overhead of building new and old trigger references 
++ * even when no triggers exist
++ */
++extern int always_code_trigger_setup;
++
++/*
++** Internal function prototypes
++*/
++int sqliteStrICmp(const char *, const char *);
++int sqliteStrNICmp(const char *, const char *, int);
++int sqliteHashNoCase(const char *, int);
++int sqliteIsNumber(const char*);
++int sqliteCompare(const char *, const char *);
++int sqliteSortCompare(const char *, const char *);
++void sqliteRealToSortable(double r, char *);
++#ifdef MEMORY_DEBUG
++  void *sqliteMalloc_(int,int,char*,int);
++  void sqliteFree_(void*,char*,int);
++  void *sqliteRealloc_(void*,int,char*,int);
++  char *sqliteStrDup_(const char*,char*,int);
++  char *sqliteStrNDup_(const char*, int,char*,int);
++  void sqliteCheckMemory(void*,int);
++#else
++  void *sqliteMalloc(int);
++  void *sqliteMallocRaw(int);
++  void sqliteFree(void*);
++  void *sqliteRealloc(void*,int);
++  char *sqliteStrDup(const char*);
++  char *sqliteStrNDup(const char*, int);
++# define sqliteCheckMemory(a,b)
++#endif
++char *sqliteMPrintf(const char*, ...);
++char *sqliteVMPrintf(const char*, va_list);
++void sqliteSetString(char **, ...);
++void sqliteSetNString(char **, ...);
++void sqliteErrorMsg(Parse*, const char*, ...);
++void sqliteDequote(char*);
++int sqliteKeywordCode(const char*, int);
++int sqliteRunParser(Parse*, const char*, char **);
++void sqliteExec(Parse*);
++Expr *sqliteExpr(int, Expr*, Expr*, Token*);
++void sqliteExprSpan(Expr*,Token*,Token*);
++Expr *sqliteExprFunction(ExprList*, Token*);
++void sqliteExprDelete(Expr*);
++ExprList *sqliteExprListAppend(ExprList*,Expr*,Token*);
++void sqliteExprListDelete(ExprList*);
++int sqliteInit(sqlite*, char**);
++void sqlitePragma(Parse*,Token*,Token*,int);
++void sqliteResetInternalSchema(sqlite*, int);
++void sqliteBeginParse(Parse*,int);
++void sqliteRollbackInternalChanges(sqlite*);
++void sqliteCommitInternalChanges(sqlite*);
++Table *sqliteResultSetOfSelect(Parse*,char*,Select*);
++void sqliteOpenMasterTable(Vdbe *v, int);
++void sqliteStartTable(Parse*,Token*,Token*,int,int);
++void sqliteAddColumn(Parse*,Token*);
++void sqliteAddNotNull(Parse*, int);
++void sqliteAddPrimaryKey(Parse*, IdList*, int);
++void sqliteAddColumnType(Parse*,Token*,Token*);
++void sqliteAddDefaultValue(Parse*,Token*,int);
++int sqliteCollateType(const char*, int);
++void sqliteAddCollateType(Parse*, int);
++void sqliteEndTable(Parse*,Token*,Select*);
++void sqliteCreateView(Parse*,Token*,Token*,Select*,int);
++int sqliteViewGetColumnNames(Parse*,Table*);
++void sqliteDropTable(Parse*, Token*, int);
++void sqliteDeleteTable(sqlite*, Table*);
++void sqliteInsert(Parse*, SrcList*, ExprList*, Select*, IdList*, int);
++IdList *sqliteIdListAppend(IdList*, Token*);
++int sqliteIdListIndex(IdList*,const char*);
++SrcList *sqliteSrcListAppend(SrcList*, Token*, Token*);
++void sqliteSrcListAddAlias(SrcList*, Token*);
++void sqliteSrcListAssignCursors(Parse*, SrcList*);
++void sqliteIdListDelete(IdList*);
++void sqliteSrcListDelete(SrcList*);
++void sqliteCreateIndex(Parse*,Token*,SrcList*,IdList*,int,Token*,Token*);
++void sqliteDropIndex(Parse*, SrcList*);
++void sqliteAddKeyType(Vdbe*, ExprList*);
++void sqliteAddIdxKeyType(Vdbe*, Index*);
++int sqliteSelect(Parse*, Select*, int, int, Select*, int, int*);
++Select *sqliteSelectNew(ExprList*,SrcList*,Expr*,ExprList*,Expr*,ExprList*,
++                        int,int,int);
++void sqliteSelectDelete(Select*);
++void sqliteSelectUnbind(Select*);
++Table *sqliteSrcListLookup(Parse*, SrcList*);
++int sqliteIsReadOnly(Parse*, Table*, int);
++void sqliteDeleteFrom(Parse*, SrcList*, Expr*);
++void sqliteUpdate(Parse*, SrcList*, ExprList*, Expr*, int);
++WhereInfo *sqliteWhereBegin(Parse*, SrcList*, Expr*, int, ExprList**);
++void sqliteWhereEnd(WhereInfo*);
++void sqliteExprCode(Parse*, Expr*);
++int sqliteExprCodeExprList(Parse*, ExprList*, int);
++void sqliteExprIfTrue(Parse*, Expr*, int, int);
++void sqliteExprIfFalse(Parse*, Expr*, int, int);
++Table *sqliteFindTable(sqlite*,const char*, const char*);
++Table *sqliteLocateTable(Parse*,const char*, const char*);
++Index *sqliteFindIndex(sqlite*,const char*, const char*);
++void sqliteUnlinkAndDeleteIndex(sqlite*,Index*);
++void sqliteCopy(Parse*, SrcList*, Token*, Token*, int);
++void sqliteVacuum(Parse*, Token*);
++int sqliteRunVacuum(char**, sqlite*);
++int sqliteGlobCompare(const unsigned char*,const unsigned char*);
++int sqliteLikeCompare(const unsigned char*,const unsigned char*);
++char *sqliteTableNameFromToken(Token*);
++int sqliteExprCheck(Parse*, Expr*, int, int*);
++int sqliteExprType(Expr*);
++int sqliteExprCompare(Expr*, Expr*);
++int sqliteFuncId(Token*);
++int sqliteExprResolveIds(Parse*, SrcList*, ExprList*, Expr*);
++int sqliteExprAnalyzeAggregates(Parse*, Expr*);
++Vdbe *sqliteGetVdbe(Parse*);
++void sqliteRandomness(int, void*);
++void sqliteRollbackAll(sqlite*);
++void sqliteCodeVerifySchema(Parse*, int);
++void sqliteBeginTransaction(Parse*, int);
++void sqliteCommitTransaction(Parse*);
++void sqliteRollbackTransaction(Parse*);
++int sqliteExprIsConstant(Expr*);
++int sqliteExprIsInteger(Expr*, int*);
++int sqliteIsRowid(const char*);
++void sqliteGenerateRowDelete(sqlite*, Vdbe*, Table*, int, int);
++void sqliteGenerateRowIndexDelete(sqlite*, Vdbe*, Table*, int, char*);
++void sqliteGenerateConstraintChecks(Parse*,Table*,int,char*,int,int,int,int);
++void sqliteCompleteInsertion(Parse*, Table*, int, char*, int, int, int);
++int sqliteOpenTableAndIndices(Parse*, Table*, int);
++void sqliteBeginWriteOperation(Parse*, int, int);
++void sqliteEndWriteOperation(Parse*);
++Expr *sqliteExprDup(Expr*);
++void sqliteTokenCopy(Token*, Token*);
++ExprList *sqliteExprListDup(ExprList*);
++SrcList *sqliteSrcListDup(SrcList*);
++IdList *sqliteIdListDup(IdList*);
++Select *sqliteSelectDup(Select*);
++FuncDef *sqliteFindFunction(sqlite*,const char*,int,int,int);
++void sqliteRegisterBuiltinFunctions(sqlite*);
++void sqliteRegisterDateTimeFunctions(sqlite*);
++int sqliteSafetyOn(sqlite*);
++int sqliteSafetyOff(sqlite*);
++int sqliteSafetyCheck(sqlite*);
++void sqliteChangeCookie(sqlite*, Vdbe*);
++void sqliteBeginTrigger(Parse*, Token*,int,int,IdList*,SrcList*,int,Expr*,int);
++void sqliteFinishTrigger(Parse*, TriggerStep*, Token*);
++void sqliteDropTrigger(Parse*, SrcList*);
++void sqliteDropTriggerPtr(Parse*, Trigger*, int);
++int sqliteTriggersExist(Parse* , Trigger* , int , int , int, ExprList*);
++int sqliteCodeRowTrigger(Parse*, int, ExprList*, int, Table *, int, int, 
++                         int, int);
++void sqliteViewTriggers(Parse*, Table*, Expr*, int, ExprList*);
++void sqliteDeleteTriggerStep(TriggerStep*);
++TriggerStep *sqliteTriggerSelectStep(Select*);
++TriggerStep *sqliteTriggerInsertStep(Token*, IdList*, ExprList*, Select*, int);
++TriggerStep *sqliteTriggerUpdateStep(Token*, ExprList*, Expr*, int);
++TriggerStep *sqliteTriggerDeleteStep(Token*, Expr*);
++void sqliteDeleteTrigger(Trigger*);
++int sqliteJoinType(Parse*, Token*, Token*, Token*);
++void sqliteCreateForeignKey(Parse*, IdList*, Token*, IdList*, int);
++void sqliteDeferForeignKey(Parse*, int);
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  void sqliteAuthRead(Parse*,Expr*,SrcList*);
++  int sqliteAuthCheck(Parse*,int, const char*, const char*, const char*);
++  void sqliteAuthContextPush(Parse*, AuthContext*, const char*);
++  void sqliteAuthContextPop(AuthContext*);
++#else
++# define sqliteAuthRead(a,b,c)
++# define sqliteAuthCheck(a,b,c,d,e)    SQLITE_OK
++# define sqliteAuthContextPush(a,b,c)
++# define sqliteAuthContextPop(a)  ((void)(a))
++#endif
++void sqliteAttach(Parse*, Token*, Token*, Token*);
++void sqliteDetach(Parse*, Token*);
++int sqliteBtreeFactory(const sqlite *db, const char *zFilename,
++                       int mode, int nPg, Btree **ppBtree);
++int sqliteFixInit(DbFixer*, Parse*, int, const char*, const Token*);
++int sqliteFixSrcList(DbFixer*, SrcList*);
++int sqliteFixSelect(DbFixer*, Select*);
++int sqliteFixExpr(DbFixer*, Expr*);
++int sqliteFixExprList(DbFixer*, ExprList*);
++int sqliteFixTriggerStep(DbFixer*, TriggerStep*);
++double sqliteAtoF(const char *z, const char **);
++char *sqlite_snprintf(int,char*,const char*,...);
++int sqliteFitsIn32Bits(const char *);
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/sqlite.w32.h
+@@ -0,0 +1,764 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This header file defines the interface that the SQLite library
++** presents to client programs.
++**
++** @(#) $Id$
++*/
++#ifndef _SQLITE_H_
++#define _SQLITE_H_
++#include <stdarg.h>     /* Needed for the definition of va_list */
++
++/*
++** Make sure we can call this stuff from C++.
++*/
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++** The version of the SQLite library.
++*/
++#define SQLITE_VERSION         "2.8.17"
++
++/*
++** The version string is also compiled into the library so that a program
++** can check to make sure that the lib*.a file and the *.h file are from
++** the same version.
++*/
++extern const char sqlite_version[];
++
++/*
++** The SQLITE_UTF8 macro is defined if the library expects to see
++** UTF-8 encoded data.  The SQLITE_ISO8859 macro is defined if the
++** iso8859 encoded should be used.
++*/
++#define SQLITE_ISO8859 1
++
++/*
++** The following constant holds one of two strings, "UTF-8" or "iso8859",
++** depending on which character encoding the SQLite library expects to
++** see.  The character encoding makes a difference for the LIKE and GLOB
++** operators and for the LENGTH() and SUBSTR() functions.
++*/
++extern const char sqlite_encoding[];
++
++/*
++** Each open sqlite database is represented by an instance of the
++** following opaque structure.
++*/
++typedef struct sqlite sqlite;
++
++/*
++** A function to open a new sqlite database.  
++**
++** If the database does not exist and mode indicates write
++** permission, then a new database is created.  If the database
++** does not exist and mode does not indicate write permission,
++** then the open fails, an error message generated (if errmsg!=0)
++** and the function returns 0.
++** 
++** If mode does not indicates user write permission, then the 
++** database is opened read-only.
++**
++** The Truth:  As currently implemented, all databases are opened
++** for writing all the time.  Maybe someday we will provide the
++** ability to open a database readonly.  The mode parameters is
++** provided in anticipation of that enhancement.
++*/
++sqlite *sqlite_open(const char *filename, int mode, char **errmsg);
++
++/*
++** A function to close the database.
++**
++** Call this function with a pointer to a structure that was previously
++** returned from sqlite_open() and the corresponding database will by closed.
++*/
++void sqlite_close(sqlite *);
++
++/*
++** The type for a callback function.
++*/
++typedef int (*sqlite_callback)(void*,int,char**, char**);
++
++/*
++** A function to executes one or more statements of SQL.
++**
++** If one or more of the SQL statements are queries, then
++** the callback function specified by the 3rd parameter is
++** invoked once for each row of the query result.  This callback
++** should normally return 0.  If the callback returns a non-zero
++** value then the query is aborted, all subsequent SQL statements
++** are skipped and the sqlite_exec() function returns the SQLITE_ABORT.
++**
++** The 4th parameter is an arbitrary pointer that is passed
++** to the callback function as its first parameter.
++**
++** The 2nd parameter to the callback function is the number of
++** columns in the query result.  The 3rd parameter to the callback
++** is an array of strings holding the values for each column.
++** The 4th parameter to the callback is an array of strings holding
++** the names of each column.
++**
++** The callback function may be NULL, even for queries.  A NULL
++** callback is not an error.  It just means that no callback
++** will be invoked.
++**
++** If an error occurs while parsing or evaluating the SQL (but
++** not while executing the callback) then an appropriate error
++** message is written into memory obtained from malloc() and
++** *errmsg is made to point to that message.  The calling function
++** is responsible for freeing the memory that holds the error
++** message.   Use sqlite_freemem() for this.  If errmsg==NULL,
++** then no error message is ever written.
++**
++** The return value is is SQLITE_OK if there are no errors and
++** some other return code if there is an error.  The particular
++** return value depends on the type of error. 
++**
++** If the query could not be executed because a database file is
++** locked or busy, then this function returns SQLITE_BUSY.  (This
++** behavior can be modified somewhat using the sqlite_busy_handler()
++** and sqlite_busy_timeout() functions below.)
++*/
++int sqlite_exec(
++  sqlite*,                      /* An open database */
++  const char *sql,              /* SQL to be executed */
++  sqlite_callback,              /* Callback function */
++  void *,                       /* 1st argument to callback function */
++  char **errmsg                 /* Error msg written here */
++);
++
++/*
++** Return values for sqlite_exec() and sqlite_step()
++*/
++#define SQLITE_OK           0   /* Successful result */
++#define SQLITE_ERROR        1   /* SQL error or missing database */
++#define SQLITE_INTERNAL     2   /* An internal logic error in SQLite */
++#define SQLITE_PERM         3   /* Access permission denied */
++#define SQLITE_ABORT        4   /* Callback routine requested an abort */
++#define SQLITE_BUSY         5   /* The database file is locked */
++#define SQLITE_LOCKED       6   /* A table in the database is locked */
++#define SQLITE_NOMEM        7   /* A malloc() failed */
++#define SQLITE_READONLY     8   /* Attempt to write a readonly database */
++#define SQLITE_INTERRUPT    9   /* Operation terminated by sqlite_interrupt() */
++#define SQLITE_IOERR       10   /* Some kind of disk I/O error occurred */
++#define SQLITE_CORRUPT     11   /* The database disk image is malformed */
++#define SQLITE_NOTFOUND    12   /* (Internal Only) Table or record not found */
++#define SQLITE_FULL        13   /* Insertion failed because database is full */
++#define SQLITE_CANTOPEN    14   /* Unable to open the database file */
++#define SQLITE_PROTOCOL    15   /* Database lock protocol error */
++#define SQLITE_EMPTY       16   /* (Internal Only) Database table is empty */
++#define SQLITE_SCHEMA      17   /* The database schema changed */
++#define SQLITE_TOOBIG      18   /* Too much data for one row of a table */
++#define SQLITE_CONSTRAINT  19   /* Abort due to contraint violation */
++#define SQLITE_MISMATCH    20   /* Data type mismatch */
++#define SQLITE_MISUSE      21   /* Library used incorrectly */
++#define SQLITE_NOLFS       22   /* Uses OS features not supported on host */
++#define SQLITE_AUTH        23   /* Authorization denied */
++#define SQLITE_FORMAT      24   /* Auxiliary database format error */
++#define SQLITE_RANGE       25   /* 2nd parameter to sqlite_bind out of range */
++#define SQLITE_NOTADB      26   /* File opened that is not a database file */
++#define SQLITE_ROW         100  /* sqlite_step() has another row ready */
++#define SQLITE_DONE        101  /* sqlite_step() has finished executing */
++
++/*
++** Each entry in an SQLite table has a unique integer key.  (The key is
++** the value of the INTEGER PRIMARY KEY column if there is such a column,
++** otherwise the key is generated at random.  The unique key is always
++** available as the ROWID, OID, or _ROWID_ column.)  The following routine
++** returns the integer key of the most recent insert in the database.
++**
++** This function is similar to the mysql_insert_id() function from MySQL.
++*/
++int sqlite_last_insert_rowid(sqlite*);
++
++/*
++** This function returns the number of database rows that were changed
++** (or inserted or deleted) by the most recent called sqlite_exec().
++**
++** All changes are counted, even if they were later undone by a
++** ROLLBACK or ABORT.  Except, changes associated with creating and
++** dropping tables are not counted.
++**
++** If a callback invokes sqlite_exec() recursively, then the changes
++** in the inner, recursive call are counted together with the changes
++** in the outer call.
++**
++** SQLite implements the command "DELETE FROM table" without a WHERE clause
++** by dropping and recreating the table.  (This is much faster than going
++** through and deleting individual elements form the table.)  Because of
++** this optimization, the change count for "DELETE FROM table" will be
++** zero regardless of the number of elements that were originally in the
++** table. To get an accurate count of the number of rows deleted, use
++** "DELETE FROM table WHERE 1" instead.
++*/
++int sqlite_changes(sqlite*);
++
++/* If the parameter to this routine is one of the return value constants
++** defined above, then this routine returns a constant text string which
++** descripts (in English) the meaning of the return value.
++*/
++const char *sqlite_error_string(int);
++#define sqliteErrStr sqlite_error_string  /* Legacy. Do not use in new code. */
++
++/* This function causes any pending database operation to abort and
++** return at its earliest opportunity.  This routine is typically
++** called in response to a user action such as pressing "Cancel"
++** or Ctrl-C where the user wants a long query operation to halt
++** immediately.
++*/
++void sqlite_interrupt(sqlite*);
++
++
++/* This function returns true if the given input string comprises
++** one or more complete SQL statements.
++**
++** The algorithm is simple.  If the last token other than spaces
++** and comments is a semicolon, then return true.  otherwise return
++** false.
++*/
++int sqlite_complete(const char *sql);
++
++/*
++** This routine identifies a callback function that is invoked
++** whenever an attempt is made to open a database table that is
++** currently locked by another process or thread.  If the busy callback
++** is NULL, then sqlite_exec() returns SQLITE_BUSY immediately if
++** it finds a locked table.  If the busy callback is not NULL, then
++** sqlite_exec() invokes the callback with three arguments.  The
++** second argument is the name of the locked table and the third
++** argument is the number of times the table has been busy.  If the
++** busy callback returns 0, then sqlite_exec() immediately returns
++** SQLITE_BUSY.  If the callback returns non-zero, then sqlite_exec()
++** tries to open the table again and the cycle repeats.
++**
++** The default busy callback is NULL.
++**
++** Sqlite is re-entrant, so the busy handler may start a new query. 
++** (It is not clear why anyone would every want to do this, but it
++** is allowed, in theory.)  But the busy handler may not close the
++** database.  Closing the database from a busy handler will delete 
++** data structures out from under the executing query and will 
++** probably result in a coredump.
++*/
++void sqlite_busy_handler(sqlite*, int(*)(void*,const char*,int), void*);
++
++/*
++** This routine sets a busy handler that sleeps for a while when a
++** table is locked.  The handler will sleep multiple times until 
++** at least "ms" milleseconds of sleeping have been done.  After
++** "ms" milleseconds of sleeping, the handler returns 0 which
++** causes sqlite_exec() to return SQLITE_BUSY.
++**
++** Calling this routine with an argument less than or equal to zero
++** turns off all busy handlers.
++*/
++void sqlite_busy_timeout(sqlite*, int ms);
++
++/*
++** This next routine is really just a wrapper around sqlite_exec().
++** Instead of invoking a user-supplied callback for each row of the
++** result, this routine remembers each row of the result in memory
++** obtained from malloc(), then returns all of the result after the
++** query has finished. 
++**
++** As an example, suppose the query result where this table:
++**
++**        Name        | Age
++**        -----------------------
++**        Alice       | 43
++**        Bob         | 28
++**        Cindy       | 21
++**
++** If the 3rd argument were &azResult then after the function returns
++** azResult will contain the following data:
++**
++**        azResult[0] = "Name";
++**        azResult[1] = "Age";
++**        azResult[2] = "Alice";
++**        azResult[3] = "43";
++**        azResult[4] = "Bob";
++**        azResult[5] = "28";
++**        azResult[6] = "Cindy";
++**        azResult[7] = "21";
++**
++** Notice that there is an extra row of data containing the column
++** headers.  But the *nrow return value is still 3.  *ncolumn is
++** set to 2.  In general, the number of values inserted into azResult
++** will be ((*nrow) + 1)*(*ncolumn).
++**
++** After the calling function has finished using the result, it should 
++** pass the result data pointer to sqlite_free_table() in order to 
++** release the memory that was malloc-ed.  Because of the way the 
++** malloc() happens, the calling function must not try to call 
++** malloc() directly.  Only sqlite_free_table() is able to release 
++** the memory properly and safely.
++**
++** The return value of this routine is the same as from sqlite_exec().
++*/
++int sqlite_get_table(
++  sqlite*,               /* An open database */
++  const char *sql,       /* SQL to be executed */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncolumn,          /* Number of result columns written here */
++  char **errmsg          /* Error msg written here */
++);
++
++/*
++** Call this routine to free the memory that sqlite_get_table() allocated.
++*/
++void sqlite_free_table(char **result);
++
++/*
++** The following routines are wrappers around sqlite_exec() and
++** sqlite_get_table().  The only difference between the routines that
++** follow and the originals is that the second argument to the 
++** routines that follow is really a printf()-style format
++** string describing the SQL to be executed.  Arguments to the format
++** string appear at the end of the argument list.
++**
++** All of the usual printf formatting options apply.  In addition, there
++** is a "%q" option.  %q works like %s in that it substitutes a null-terminated
++** string from the argument list.  But %q also doubles every '\'' character.
++** %q is designed for use inside a string literal.  By doubling each '\''
++** character it escapes that character and allows it to be inserted into
++** the string.
++**
++** For example, so some string variable contains text as follows:
++**
++**      char *zText = "It's a happy day!";
++**
++** We can use this text in an SQL statement as follows:
++**
++**      sqlite_exec_printf(db, "INSERT INTO table VALUES('%q')",
++**          callback1, 0, 0, zText);
++**
++** Because the %q format string is used, the '\'' character in zText
++** is escaped and the SQL generated is as follows:
++**
++**      INSERT INTO table1 VALUES('It''s a happy day!')
++**
++** This is correct.  Had we used %s instead of %q, the generated SQL
++** would have looked like this:
++**
++**      INSERT INTO table1 VALUES('It's a happy day!');
++**
++** This second example is an SQL syntax error.  As a general rule you
++** should always use %q instead of %s when inserting text into a string 
++** literal.
++*/
++int sqlite_exec_printf(
++  sqlite*,                      /* An open database */
++  const char *sqlFormat,        /* printf-style format string for the SQL */
++  sqlite_callback,              /* Callback function */
++  void *,                       /* 1st argument to callback function */
++  char **errmsg,                /* Error msg written here */
++  ...                           /* Arguments to the format string. */
++);
++int sqlite_exec_vprintf(
++  sqlite*,                      /* An open database */
++  const char *sqlFormat,        /* printf-style format string for the SQL */
++  sqlite_callback,              /* Callback function */
++  void *,                       /* 1st argument to callback function */
++  char **errmsg,                /* Error msg written here */
++  va_list ap                    /* Arguments to the format string. */
++);
++int sqlite_get_table_printf(
++  sqlite*,               /* An open database */
++  const char *sqlFormat, /* printf-style format string for the SQL */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncolumn,          /* Number of result columns written here */
++  char **errmsg,         /* Error msg written here */
++  ...                    /* Arguments to the format string */
++);
++int sqlite_get_table_vprintf(
++  sqlite*,               /* An open database */
++  const char *sqlFormat, /* printf-style format string for the SQL */
++  char ***resultp,       /* Result written to a char *[]  that this points to */
++  int *nrow,             /* Number of result rows written here */
++  int *ncolumn,          /* Number of result columns written here */
++  char **errmsg,         /* Error msg written here */
++  va_list ap             /* Arguments to the format string */
++);
++char *sqlite_mprintf(const char*,...);
++char *sqlite_vmprintf(const char*, va_list);
++
++/*
++** Windows systems should call this routine to free memory that
++** is returned in the in the errmsg parameter of sqlite_open() when
++** SQLite is a DLL.  For some reason, it does not work to call free()
++** directly.
++*/
++void sqlite_freemem(void *p);
++
++/*
++** Windows systems need functions to call to return the sqlite_version
++** and sqlite_encoding strings.
++*/
++const char *sqlite_libversion(void);
++const char *sqlite_libencoding(void);
++
++/*
++** A pointer to the following structure is used to communicate with
++** the implementations of user-defined functions.
++*/
++typedef struct sqlite_func sqlite_func;
++
++/*
++** Use the following routines to create new user-defined functions.  See
++** the documentation for details.
++*/
++int sqlite_create_function(
++  sqlite*,                  /* Database where the new function is registered */
++  const char *zName,        /* Name of the new function */
++  int nArg,                 /* Number of arguments.  -1 means any number */
++  void (*xFunc)(sqlite_func*,int,const char**),  /* C code to implement */
++  void *pUserData           /* Available via the sqlite_user_data() call */
++);
++int sqlite_create_aggregate(
++  sqlite*,                  /* Database where the new function is registered */
++  const char *zName,        /* Name of the function */
++  int nArg,                 /* Number of arguments */
++  void (*xStep)(sqlite_func*,int,const char**), /* Called for each row */
++  void (*xFinalize)(sqlite_func*),       /* Called once to get final result */
++  void *pUserData           /* Available via the sqlite_user_data() call */
++);
++
++/*
++** Use the following routine to define the datatype returned by a
++** user-defined function.  The second argument can be one of the
++** constants SQLITE_NUMERIC, SQLITE_TEXT, or SQLITE_ARGS or it
++** can be an integer greater than or equal to zero.  The datatype
++** will be numeric or text (the only two types supported) if the
++** argument is SQLITE_NUMERIC or SQLITE_TEXT.  If the argument is
++** SQLITE_ARGS, then the datatype is numeric if any argument to the
++** function is numeric and is text otherwise.  If the second argument
++** is an integer, then the datatype of the result is the same as the
++** parameter to the function that corresponds to that integer.
++*/
++int sqlite_function_type(
++  sqlite *db,               /* The database there the function is registered */
++  const char *zName,        /* Name of the function */
++  int datatype              /* The datatype for this function */
++);
++#define SQLITE_NUMERIC     (-1)
++#define SQLITE_TEXT        (-2)
++#define SQLITE_ARGS        (-3)
++
++/*
++** The user function implementations call one of the following four routines
++** in order to return their results.  The first parameter to each of these
++** routines is a copy of the first argument to xFunc() or xFinialize().
++** The second parameter to these routines is the result to be returned.
++** A NULL can be passed as the second parameter to sqlite_set_result_string()
++** in order to return a NULL result.
++**
++** The 3rd argument to _string and _error is the number of characters to
++** take from the string.  If this argument is negative, then all characters
++** up to and including the first '\000' are used.
++**
++** The sqlite_set_result_string() function allocates a buffer to hold the
++** result and returns a pointer to this buffer.  The calling routine
++** (that is, the implmentation of a user function) can alter the content
++** of this buffer if desired.
++*/
++char *sqlite_set_result_string(sqlite_func*,const char*,int);
++void sqlite_set_result_int(sqlite_func*,int);
++void sqlite_set_result_double(sqlite_func*,double);
++void sqlite_set_result_error(sqlite_func*,const char*,int);
++
++/*
++** The pUserData parameter to the sqlite_create_function() and
++** sqlite_create_aggregate() routines used to register user functions
++** is available to the implementation of the function using this
++** call.
++*/
++void *sqlite_user_data(sqlite_func*);
++
++/*
++** Aggregate functions use the following routine to allocate
++** a structure for storing their state.  The first time this routine
++** is called for a particular aggregate, a new structure of size nBytes
++** is allocated, zeroed, and returned.  On subsequent calls (for the
++** same aggregate instance) the same buffer is returned.  The implementation
++** of the aggregate can use the returned buffer to accumulate data.
++**
++** The buffer allocated is freed automatically be SQLite.
++*/
++void *sqlite_aggregate_context(sqlite_func*, int nBytes);
++
++/*
++** The next routine returns the number of calls to xStep for a particular
++** aggregate function instance.  The current call to xStep counts so this
++** routine always returns at least 1.
++*/
++int sqlite_aggregate_count(sqlite_func*);
++
++/*
++** This routine registers a callback with the SQLite library.  The
++** callback is invoked (at compile-time, not at run-time) for each
++** attempt to access a column of a table in the database.  The callback
++** returns SQLITE_OK if access is allowed, SQLITE_DENY if the entire
++** SQL statement should be aborted with an error and SQLITE_IGNORE
++** if the column should be treated as a NULL value.
++*/
++int sqlite_set_authorizer(
++  sqlite*,
++  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
++  void *pUserData
++);
++
++/*
++** The second parameter to the access authorization function above will
++** be one of the values below.  These values signify what kind of operation
++** is to be authorized.  The 3rd and 4th parameters to the authorization
++** function will be parameters or NULL depending on which of the following
++** codes is used as the second parameter.  The 5th parameter is the name
++** of the database ("main", "temp", etc.) if applicable.  The 6th parameter
++** is the name of the inner-most trigger or view that is responsible for
++** the access attempt or NULL if this access attempt is directly from 
++** input SQL code.
++**
++**                                          Arg-3           Arg-4
++*/
++#define SQLITE_COPY                  0   /* Table Name      File Name       */
++#define SQLITE_CREATE_INDEX          1   /* Index Name      Table Name      */
++#define SQLITE_CREATE_TABLE          2   /* Table Name      NULL            */
++#define SQLITE_CREATE_TEMP_INDEX     3   /* Index Name      Table Name      */
++#define SQLITE_CREATE_TEMP_TABLE     4   /* Table Name      NULL            */
++#define SQLITE_CREATE_TEMP_TRIGGER   5   /* Trigger Name    Table Name      */
++#define SQLITE_CREATE_TEMP_VIEW      6   /* View Name       NULL            */
++#define SQLITE_CREATE_TRIGGER        7   /* Trigger Name    Table Name      */
++#define SQLITE_CREATE_VIEW           8   /* View Name       NULL            */
++#define SQLITE_DELETE                9   /* Table Name      NULL            */
++#define SQLITE_DROP_INDEX           10   /* Index Name      Table Name      */
++#define SQLITE_DROP_TABLE           11   /* Table Name      NULL            */
++#define SQLITE_DROP_TEMP_INDEX      12   /* Index Name      Table Name      */
++#define SQLITE_DROP_TEMP_TABLE      13   /* Table Name      NULL            */
++#define SQLITE_DROP_TEMP_TRIGGER    14   /* Trigger Name    Table Name      */
++#define SQLITE_DROP_TEMP_VIEW       15   /* View Name       NULL            */
++#define SQLITE_DROP_TRIGGER         16   /* Trigger Name    Table Name      */
++#define SQLITE_DROP_VIEW            17   /* View Name       NULL            */
++#define SQLITE_INSERT               18   /* Table Name      NULL            */
++#define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
++#define SQLITE_READ                 20   /* Table Name      Column Name     */
++#define SQLITE_SELECT               21   /* NULL            NULL            */
++#define SQLITE_TRANSACTION          22   /* NULL            NULL            */
++#define SQLITE_UPDATE               23   /* Table Name      Column Name     */
++#define SQLITE_ATTACH               24   /* Filename        NULL            */
++#define SQLITE_DETACH               25   /* Database Name   NULL            */
++
++
++/*
++** The return value of the authorization function should be one of the
++** following constants:
++*/
++/* #define SQLITE_OK  0   // Allow access (This is actually defined above) */
++#define SQLITE_DENY   1   /* Abort the SQL statement with an error */
++#define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
++
++/*
++** Register a function that is called at every invocation of sqlite_exec()
++** or sqlite_compile().  This function can be used (for example) to generate
++** a log file of all SQL executed against a database.
++*/
++void *sqlite_trace(sqlite*, void(*xTrace)(void*,const char*), void*);
++
++/*** The Callback-Free API
++** 
++** The following routines implement a new way to access SQLite that does not
++** involve the use of callbacks.
++**
++** An sqlite_vm is an opaque object that represents a single SQL statement
++** that is ready to be executed.
++*/
++typedef struct sqlite_vm sqlite_vm;
++
++/*
++** To execute an SQLite query without the use of callbacks, you first have
++** to compile the SQL using this routine.  The 1st parameter "db" is a pointer
++** to an sqlite object obtained from sqlite_open().  The 2nd parameter
++** "zSql" is the text of the SQL to be compiled.   The remaining parameters
++** are all outputs.
++**
++** *pzTail is made to point to the first character past the end of the first
++** SQL statement in zSql.  This routine only compiles the first statement
++** in zSql, so *pzTail is left pointing to what remains uncompiled.
++**
++** *ppVm is left pointing to a "virtual machine" that can be used to execute
++** the compiled statement.  Or if there is an error, *ppVm may be set to NULL.
++** If the input text contained no SQL (if the input is and empty string or
++** a comment) then *ppVm is set to NULL.
++**
++** If any errors are detected during compilation, an error message is written
++** into space obtained from malloc() and *pzErrMsg is made to point to that
++** error message.  The calling routine is responsible for freeing the text
++** of this message when it has finished with it.  Use sqlite_freemem() to
++** free the message.  pzErrMsg may be NULL in which case no error message
++** will be generated.
++**
++** On success, SQLITE_OK is returned.  Otherwise and error code is returned.
++*/
++int sqlite_compile(
++  sqlite *db,                   /* The open database */
++  const char *zSql,             /* SQL statement to be compiled */
++  const char **pzTail,          /* OUT: uncompiled tail of zSql */
++  sqlite_vm **ppVm,             /* OUT: the virtual machine to execute zSql */
++  char **pzErrmsg               /* OUT: Error message. */
++);
++
++/*
++** After an SQL statement has been compiled, it is handed to this routine
++** to be executed.  This routine executes the statement as far as it can
++** go then returns.  The return value will be one of SQLITE_DONE,
++** SQLITE_ERROR, SQLITE_BUSY, SQLITE_ROW, or SQLITE_MISUSE.
++**
++** SQLITE_DONE means that the execute of the SQL statement is complete
++** an no errors have occurred.  sqlite_step() should not be called again
++** for the same virtual machine.  *pN is set to the number of columns in
++** the result set and *pazColName is set to an array of strings that
++** describe the column names and datatypes.  The name of the i-th column
++** is (*pazColName)[i] and the datatype of the i-th column is
++** (*pazColName)[i+*pN].  *pazValue is set to NULL.
++**
++** SQLITE_ERROR means that the virtual machine encountered a run-time
++** error.  sqlite_step() should not be called again for the same
++** virtual machine.  *pN is set to 0 and *pazColName and *pazValue are set
++** to NULL.  Use sqlite_finalize() to obtain the specific error code
++** and the error message text for the error.
++**
++** SQLITE_BUSY means that an attempt to open the database failed because
++** another thread or process is holding a lock.  The calling routine
++** can try again to open the database by calling sqlite_step() again.
++** The return code will only be SQLITE_BUSY if no busy handler is registered
++** using the sqlite_busy_handler() or sqlite_busy_timeout() routines.  If
++** a busy handler callback has been registered but returns 0, then this
++** routine will return SQLITE_ERROR and sqltie_finalize() will return
++** SQLITE_BUSY when it is called.
++**
++** SQLITE_ROW means that a single row of the result is now available.
++** The data is contained in *pazValue.  The value of the i-th column is
++** (*azValue)[i].  *pN and *pazColName are set as described in SQLITE_DONE.
++** Invoke sqlite_step() again to advance to the next row.
++**
++** SQLITE_MISUSE is returned if sqlite_step() is called incorrectly.
++** For example, if you call sqlite_step() after the virtual machine
++** has halted (after a prior call to sqlite_step() has returned SQLITE_DONE)
++** or if you call sqlite_step() with an incorrectly initialized virtual
++** machine or a virtual machine that has been deleted or that is associated
++** with an sqlite structure that has been closed.
++*/
++int sqlite_step(
++  sqlite_vm *pVm,              /* The virtual machine to execute */
++  int *pN,                     /* OUT: Number of columns in result */
++  const char ***pazValue,      /* OUT: Column data */
++  const char ***pazColName     /* OUT: Column names and datatypes */
++);
++
++/*
++** This routine is called to delete a virtual machine after it has finished
++** executing.  The return value is the result code.  SQLITE_OK is returned
++** if the statement executed successfully and some other value is returned if
++** there was any kind of error.  If an error occurred and pzErrMsg is not
++** NULL, then an error message is written into memory obtained from malloc()
++** and *pzErrMsg is made to point to that error message.  The calling routine
++** should use sqlite_freemem() to delete this message when it has finished
++** with it.
++**
++** This routine can be called at any point during the execution of the
++** virtual machine.  If the virtual machine has not completed execution
++** when this routine is called, that is like encountering an error or
++** an interrupt.  (See sqlite_interrupt().)  Incomplete updates may be
++** rolled back and transactions cancelled,  depending on the circumstances,
++** and the result code returned will be SQLITE_ABORT.
++*/
++int sqlite_finalize(sqlite_vm*, char **pzErrMsg);
++
++/*
++** This routine deletes the virtual machine, writes any error message to
++** *pzErrMsg and returns an SQLite return code in the same way as the
++** sqlite_finalize() function.
++**
++** Additionally, if ppVm is not NULL, *ppVm is left pointing to a new virtual
++** machine loaded with the compiled version of the original query ready for
++** execution.
++**
++** If sqlite_reset() returns SQLITE_SCHEMA, then *ppVm is set to NULL.
++**
++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
++*/
++int sqlite_reset(sqlite_vm*, char **pzErrMsg);
++
++/*
++** If the SQL that was handed to sqlite_compile contains variables that
++** are represeted in the SQL text by a question mark ('?').  This routine
++** is used to assign values to those variables.
++**
++** The first parameter is a virtual machine obtained from sqlite_compile().
++** The 2nd "idx" parameter determines which variable in the SQL statement
++** to bind the value to.  The left most '?' is 1.  The 3rd parameter is
++** the value to assign to that variable.  The 4th parameter is the number
++** of bytes in the value, including the terminating \000 for strings.
++** Finally, the 5th "copy" parameter is TRUE if SQLite should make its
++** own private copy of this value, or false if the space that the 3rd
++** parameter points to will be unchanging and can be used directly by
++** SQLite.
++**
++** Unbound variables are treated as having a value of NULL.  To explicitly
++** set a variable to NULL, call this routine with the 3rd parameter as a
++** NULL pointer.
++**
++** If the 4th "len" parameter is -1, then strlen() is used to find the
++** length.
++**
++** This routine can only be called immediately after sqlite_compile()
++** or sqlite_reset() and before any calls to sqlite_step().
++**
++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
++*/
++int sqlite_bind(sqlite_vm*, int idx, const char *value, int len, int copy);
++
++/*
++** This routine configures a callback function - the progress callback - that
++** is invoked periodically during long running calls to sqlite_exec(),
++** sqlite_step() and sqlite_get_table(). An example use for this API is to keep
++** a GUI updated during a large query.
++**
++** The progress callback is invoked once for every N virtual machine opcodes,
++** where N is the second argument to this function. The progress callback
++** itself is identified by the third argument to this function. The fourth
++** argument to this function is a void pointer passed to the progress callback
++** function each time it is invoked.
++**
++** If a call to sqlite_exec(), sqlite_step() or sqlite_get_table() results 
++** in less than N opcodes being executed, then the progress callback is not
++** invoked.
++** 
++** Calling this routine overwrites any previously installed progress callback.
++** To remove the progress callback altogether, pass NULL as the third
++** argument to this function.
++**
++** If the progress callback returns a result other than 0, then the current 
++** query is immediately terminated and any database changes rolled back. If the
++** query was part of a larger transaction, then the transaction is not rolled
++** back and remains active. The sqlite_exec() call returns SQLITE_ABORT. 
++*/
++void sqlite_progress_handler(sqlite*, int, int(*)(void*), void*);
++
++#ifdef __cplusplus
++}  /* End of the 'extern "C"' block */
++#endif
++
++#endif /* _SQLITE_H_ */
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/table.c
+@@ -0,0 +1,203 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains the sqlite_get_table() and sqlite_free_table()
++** interface routines.  These are just wrappers around the main
++** interface routine of sqlite_exec().
++**
++** These routines are in a separate files so that they will not be linked
++** if they are not used.
++*/
++#include <stdlib.h>
++#include <string.h>
++#include "sqliteInt.h"
++
++/*
++** This structure is used to pass data from sqlite_get_table() through
++** to the callback function is uses to build the result.
++*/
++typedef struct TabResult {
++  char **azResult;
++  char *zErrMsg;
++  int nResult;
++  int nAlloc;
++  int nRow;
++  int nColumn;
++  long nData;
++  int rc;
++} TabResult;
++
++/*
++** This routine is called once for each row in the result table.  Its job
++** is to fill in the TabResult structure appropriately, allocating new
++** memory as necessary.
++*/
++static int sqlite_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
++  TabResult *p = (TabResult*)pArg;
++  int need;
++  int i;
++  char *z;
++
++  /* Make sure there is enough space in p->azResult to hold everything
++  ** we need to remember from this invocation of the callback.
++  */
++  if( p->nRow==0 && argv!=0 ){
++    need = nCol*2;
++  }else{
++    need = nCol;
++  }
++  if( p->nData + need >= p->nAlloc ){
++    char **azNew;
++    p->nAlloc = p->nAlloc*2 + need + 1;
++    azNew = realloc( p->azResult, sizeof(char*)*p->nAlloc );
++    if( azNew==0 ){
++      p->rc = SQLITE_NOMEM;
++      return 1;
++    }
++    p->azResult = azNew;
++  }
++
++  /* If this is the first row, then generate an extra row containing
++  ** the names of all columns.
++  */
++  if( p->nRow==0 ){
++    p->nColumn = nCol;
++    for(i=0; i<nCol; i++){
++      if( colv[i]==0 ){
++        z = 0;
++      }else{
++        z = malloc( strlen(colv[i])+1 );
++        if( z==0 ){
++          p->rc = SQLITE_NOMEM;
++          return 1;
++        }
++        strcpy(z, colv[i]);
++      }
++      p->azResult[p->nData++] = z;
++    }
++  }else if( p->nColumn!=nCol ){
++    sqliteSetString(&p->zErrMsg,
++       "sqlite_get_table() called with two or more incompatible queries",
++       (char*)0);
++    p->rc = SQLITE_ERROR;
++    return 1;
++  }
++
++  /* Copy over the row data
++  */
++  if( argv!=0 ){
++    for(i=0; i<nCol; i++){
++      if( argv[i]==0 ){
++        z = 0;
++      }else{
++        z = malloc( strlen(argv[i])+1 );
++        if( z==0 ){
++          p->rc = SQLITE_NOMEM;
++          return 1;
++        }
++        strcpy(z, argv[i]);
++      }
++      p->azResult[p->nData++] = z;
++    }
++    p->nRow++;
++  }
++  return 0;
++}
++
++/*
++** Query the database.  But instead of invoking a callback for each row,
++** malloc() for space to hold the result and return the entire results
++** at the conclusion of the call.
++**
++** The result that is written to ***pazResult is held in memory obtained
++** from malloc().  But the caller cannot free this memory directly.  
++** Instead, the entire table should be passed to sqlite_free_table() when
++** the calling procedure is finished using it.
++*/
++int sqlite_get_table(
++  sqlite *db,                 /* The database on which the SQL executes */
++  const char *zSql,           /* The SQL to be executed */
++  char ***pazResult,          /* Write the result table here */
++  int *pnRow,                 /* Write the number of rows in the result here */
++  int *pnColumn,              /* Write the number of columns of result here */
++  char **pzErrMsg             /* Write error messages here */
++){
++  int rc;
++  TabResult res;
++  if( pazResult==0 ){ return SQLITE_ERROR; }
++  *pazResult = 0;
++  if( pnColumn ) *pnColumn = 0;
++  if( pnRow ) *pnRow = 0;
++  res.zErrMsg = 0;
++  res.nResult = 0;
++  res.nRow = 0;
++  res.nColumn = 0;
++  res.nData = 1;
++  res.nAlloc = 20;
++  res.rc = SQLITE_OK;
++  res.azResult = malloc( sizeof(char*)*res.nAlloc );
++  if( res.azResult==0 ){
++    return SQLITE_NOMEM;
++  }
++  res.azResult[0] = 0;
++  rc = sqlite_exec(db, zSql, sqlite_get_table_cb, &res, pzErrMsg);
++  if( res.azResult ){
++    res.azResult[0] = (char*)res.nData;
++  }
++  if( rc==SQLITE_ABORT ){
++    sqlite_free_table(&res.azResult[1]);
++    if( res.zErrMsg ){
++      if( pzErrMsg ){
++        free(*pzErrMsg);
++        *pzErrMsg = res.zErrMsg;
++        sqliteStrRealloc(pzErrMsg);
++      }else{
++        sqliteFree(res.zErrMsg);
++      }
++    }
++    return res.rc;
++  }
++  sqliteFree(res.zErrMsg);
++  if( rc!=SQLITE_OK ){
++    sqlite_free_table(&res.azResult[1]);
++    return rc;
++  }
++  if( res.nAlloc>res.nData ){
++    char **azNew;
++    azNew = realloc( res.azResult, sizeof(char*)*(res.nData+1) );
++    if( azNew==0 ){
++      sqlite_free_table(&res.azResult[1]);
++      return SQLITE_NOMEM;
++    }
++    res.nAlloc = res.nData+1;
++    res.azResult = azNew;
++  }
++  *pazResult = &res.azResult[1];
++  if( pnColumn ) *pnColumn = res.nColumn;
++  if( pnRow ) *pnRow = res.nRow;
++  return rc;
++}
++
++/*
++** This routine frees the space the sqlite_get_table() malloced.
++*/
++void sqlite_free_table(
++  char **azResult             /* Result returned from from sqlite_get_table() */
++){
++  if( azResult ){
++    int i, n;
++    azResult--;
++    if( azResult==0 ) return;
++    n = (int)(long)azResult[0];
++    for(i=1; i<n; i++){ if( azResult[i] ) free(azResult[i]); }
++    free(azResult);
++  }
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/tokenize.c
+@@ -0,0 +1,679 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** An tokenizer for SQL
++**
++** This file contains C code that splits an SQL input string up into
++** individual tokens and sends those tokens one-by-one over to the
++** parser for analysis.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include "os.h"
++#include <ctype.h>
++#include <stdlib.h>
++
++/*
++** All the keywords of the SQL language are stored as in a hash
++** table composed of instances of the following structure.
++*/
++typedef struct Keyword Keyword;
++struct Keyword {
++  char *zName;             /* The keyword name */
++  u8 tokenType;            /* Token value for this keyword */
++  u8 len;                  /* Length of this keyword */
++  u8 iNext;                /* Index in aKeywordTable[] of next with same hash */
++};
++
++/*
++** These are the keywords
++*/
++static Keyword aKeywordTable[] = {
++  { "ABORT",             TK_ABORT,        },
++  { "AFTER",             TK_AFTER,        },
++  { "ALL",               TK_ALL,          },
++  { "AND",               TK_AND,          },
++  { "AS",                TK_AS,           },
++  { "ASC",               TK_ASC,          },
++  { "ATTACH",            TK_ATTACH,       },
++  { "BEFORE",            TK_BEFORE,       },
++  { "BEGIN",             TK_BEGIN,        },
++  { "BETWEEN",           TK_BETWEEN,      },
++  { "BY",                TK_BY,           },
++  { "CASCADE",           TK_CASCADE,      },
++  { "CASE",              TK_CASE,         },
++  { "CHECK",             TK_CHECK,        },
++  { "CLUSTER",           TK_CLUSTER,      },
++  { "COLLATE",           TK_COLLATE,      },
++  { "COMMIT",            TK_COMMIT,       },
++  { "CONFLICT",          TK_CONFLICT,     },
++  { "CONSTRAINT",        TK_CONSTRAINT,   },
++  { "COPY",              TK_COPY,         },
++  { "CREATE",            TK_CREATE,       },
++  { "CROSS",             TK_JOIN_KW,      },
++  { "DATABASE",          TK_DATABASE,     },
++  { "DEFAULT",           TK_DEFAULT,      },
++  { "DEFERRED",          TK_DEFERRED,     },
++  { "DEFERRABLE",        TK_DEFERRABLE,   },
++  { "DELETE",            TK_DELETE,       },
++  { "DELIMITERS",        TK_DELIMITERS,   },
++  { "DESC",              TK_DESC,         },
++  { "DETACH",            TK_DETACH,       },
++  { "DISTINCT",          TK_DISTINCT,     },
++  { "DROP",              TK_DROP,         },
++  { "END",               TK_END,          },
++  { "EACH",              TK_EACH,         },
++  { "ELSE",              TK_ELSE,         },
++  { "EXCEPT",            TK_EXCEPT,       },
++  { "EXPLAIN",           TK_EXPLAIN,      },
++  { "FAIL",              TK_FAIL,         },
++  { "FOR",               TK_FOR,          },
++  { "FOREIGN",           TK_FOREIGN,      },
++  { "FROM",              TK_FROM,         },
++  { "FULL",              TK_JOIN_KW,      },
++  { "GLOB",              TK_GLOB,         },
++  { "GROUP",             TK_GROUP,        },
++  { "HAVING",            TK_HAVING,       },
++  { "IGNORE",            TK_IGNORE,       },
++  { "IMMEDIATE",         TK_IMMEDIATE,    },
++  { "IN",                TK_IN,           },
++  { "INDEX",             TK_INDEX,        },
++  { "INITIALLY",         TK_INITIALLY,    },
++  { "INNER",             TK_JOIN_KW,      },
++  { "INSERT",            TK_INSERT,       },
++  { "INSTEAD",           TK_INSTEAD,      },
++  { "INTERSECT",         TK_INTERSECT,    },
++  { "INTO",              TK_INTO,         },
++  { "IS",                TK_IS,           },
++  { "ISNULL",            TK_ISNULL,       },
++  { "JOIN",              TK_JOIN,         },
++  { "KEY",               TK_KEY,          },
++  { "LEFT",              TK_JOIN_KW,      },
++  { "LIKE",              TK_LIKE,         },
++  { "LIMIT",             TK_LIMIT,        },
++  { "MATCH",             TK_MATCH,        },
++  { "NATURAL",           TK_JOIN_KW,      },
++  { "NOT",               TK_NOT,          },
++  { "NOTNULL",           TK_NOTNULL,      },
++  { "NULL",              TK_NULL,         },
++  { "OF",                TK_OF,           },
++  { "OFFSET",            TK_OFFSET,       },
++  { "ON",                TK_ON,           },
++  { "OR",                TK_OR,           },
++  { "ORDER",             TK_ORDER,        },
++  { "OUTER",             TK_JOIN_KW,      },
++  { "PRAGMA",            TK_PRAGMA,       },
++  { "PRIMARY",           TK_PRIMARY,      },
++  { "RAISE",             TK_RAISE,        },
++  { "REFERENCES",        TK_REFERENCES,   },
++  { "REPLACE",           TK_REPLACE,      },
++  { "RESTRICT",          TK_RESTRICT,     },
++  { "RIGHT",             TK_JOIN_KW,      },
++  { "ROLLBACK",          TK_ROLLBACK,     },
++  { "ROW",               TK_ROW,          },
++  { "SELECT",            TK_SELECT,       },
++  { "SET",               TK_SET,          },
++  { "STATEMENT",         TK_STATEMENT,    },
++  { "TABLE",             TK_TABLE,        },
++  { "TEMP",              TK_TEMP,         },
++  { "TEMPORARY",         TK_TEMP,         },
++  { "THEN",              TK_THEN,         },
++  { "TRANSACTION",       TK_TRANSACTION,  },
++  { "TRIGGER",           TK_TRIGGER,      },
++  { "UNION",             TK_UNION,        },
++  { "UNIQUE",            TK_UNIQUE,       },
++  { "UPDATE",            TK_UPDATE,       },
++  { "USING",             TK_USING,        },
++  { "VACUUM",            TK_VACUUM,       },
++  { "VALUES",            TK_VALUES,       },
++  { "VIEW",              TK_VIEW,         },
++  { "WHEN",              TK_WHEN,         },
++  { "WHERE",             TK_WHERE,        },
++};
++
++/*
++** This is the hash table
++*/
++#define KEY_HASH_SIZE 101
++static u8 aiHashTable[KEY_HASH_SIZE];
++
++
++/*
++** This function looks up an identifier to determine if it is a
++** keyword.  If it is a keyword, the token code of that keyword is 
++** returned.  If the input is not a keyword, TK_ID is returned.
++*/
++int sqliteKeywordCode(const char *z, int n){
++  int h, i;
++  Keyword *p;
++  static char needInit = 1;
++  if( needInit ){
++    /* Initialize the keyword hash table */
++    sqliteOsEnterMutex();
++    if( needInit ){
++      int nk;
++      nk = sizeof(aKeywordTable)/sizeof(aKeywordTable[0]);
++      for(i=0; i<nk; i++){
++        aKeywordTable[i].len = strlen(aKeywordTable[i].zName);
++        h = sqliteHashNoCase(aKeywordTable[i].zName, aKeywordTable[i].len);
++        h %= KEY_HASH_SIZE;
++        aKeywordTable[i].iNext = aiHashTable[h];
++        aiHashTable[h] = i+1;
++      }
++      needInit = 0;
++    }
++    sqliteOsLeaveMutex();
++  }
++  h = sqliteHashNoCase(z, n) % KEY_HASH_SIZE;
++  for(i=aiHashTable[h]; i; i=p->iNext){
++    p = &aKeywordTable[i-1];
++    if( p->len==n && sqliteStrNICmp(p->zName, z, n)==0 ){
++      return p->tokenType;
++    }
++  }
++  return TK_ID;
++}
++
++
++/*
++** If X is a character that can be used in an identifier and
++** X&0x80==0 then isIdChar[X] will be 1.  If X&0x80==0x80 then
++** X is always an identifier character.  (Hence all UTF-8
++** characters can be part of an identifier).  isIdChar[X] will
++** be 0 for every character in the lower 128 ASCII characters
++** that cannot be used as part of an identifier.
++**
++** In this implementation, an identifier can be a string of
++** alphabetic characters, digits, and "_" plus any character
++** with the high-order bit set.  The latter rule means that
++** any sequence of UTF-8 characters or characters taken from
++** an extended ISO8859 character set can form an identifier.
++*/
++static const char isIdChar[] = {
++/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 0x */
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 1x */
++    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 2x */
++    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,  /* 3x */
++    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 4x */
++    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,  /* 5x */
++    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* 6x */
++    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,  /* 7x */
++};
++
++
++/*
++** Return the length of the token that begins at z[0]. 
++** Store the token type in *tokenType before returning.
++*/
++static int sqliteGetToken(const unsigned char *z, int *tokenType){
++  int i;
++  switch( *z ){
++    case ' ': case '\t': case '\n': case '\f': case '\r': {
++      for(i=1; isspace(z[i]); i++){}
++      *tokenType = TK_SPACE;
++      return i;
++    }
++    case '-': {
++      if( z[1]=='-' ){
++        for(i=2; z[i] && z[i]!='\n'; i++){}
++        *tokenType = TK_COMMENT;
++        return i;
++      }
++      *tokenType = TK_MINUS;
++      return 1;
++    }
++    case '(': {
++      *tokenType = TK_LP;
++      return 1;
++    }
++    case ')': {
++      *tokenType = TK_RP;
++      return 1;
++    }
++    case ';': {
++      *tokenType = TK_SEMI;
++      return 1;
++    }
++    case '+': {
++      *tokenType = TK_PLUS;
++      return 1;
++    }
++    case '*': {
++      *tokenType = TK_STAR;
++      return 1;
++    }
++    case '/': {
++      if( z[1]!='*' || z[2]==0 ){
++        *tokenType = TK_SLASH;
++        return 1;
++      }
++      for(i=3; z[i] && (z[i]!='/' || z[i-1]!='*'); i++){}
++      if( z[i] ) i++;
++      *tokenType = TK_COMMENT;
++      return i;
++    }
++    case '%': {
++      *tokenType = TK_REM;
++      return 1;
++    }
++    case '=': {
++      *tokenType = TK_EQ;
++      return 1 + (z[1]=='=');
++    }
++    case '<': {
++      if( z[1]=='=' ){
++        *tokenType = TK_LE;
++        return 2;
++      }else if( z[1]=='>' ){
++        *tokenType = TK_NE;
++        return 2;
++      }else if( z[1]=='<' ){
++        *tokenType = TK_LSHIFT;
++        return 2;
++      }else{
++        *tokenType = TK_LT;
++        return 1;
++      }
++    }
++    case '>': {
++      if( z[1]=='=' ){
++        *tokenType = TK_GE;
++        return 2;
++      }else if( z[1]=='>' ){
++        *tokenType = TK_RSHIFT;
++        return 2;
++      }else{
++        *tokenType = TK_GT;
++        return 1;
++      }
++    }
++    case '!': {
++      if( z[1]!='=' ){
++        *tokenType = TK_ILLEGAL;
++        return 2;
++      }else{
++        *tokenType = TK_NE;
++        return 2;
++      }
++    }
++    case '|': {
++      if( z[1]!='|' ){
++        *tokenType = TK_BITOR;
++        return 1;
++      }else{
++        *tokenType = TK_CONCAT;
++        return 2;
++      }
++    }
++    case ',': {
++      *tokenType = TK_COMMA;
++      return 1;
++    }
++    case '&': {
++      *tokenType = TK_BITAND;
++      return 1;
++    }
++    case '~': {
++      *tokenType = TK_BITNOT;
++      return 1;
++    }
++    case '\'': case '"': {
++      int delim = z[0];
++      for(i=1; z[i]; i++){
++        if( z[i]==delim ){
++          if( z[i+1]==delim ){
++            i++;
++          }else{
++            break;
++          }
++        }
++      }
++      if( z[i] ) i++;
++      *tokenType = TK_STRING;
++      return i;
++    }
++    case '.': {
++      *tokenType = TK_DOT;
++      return 1;
++    }
++    case '0': case '1': case '2': case '3': case '4':
++    case '5': case '6': case '7': case '8': case '9': {
++      *tokenType = TK_INTEGER;
++      for(i=1; isdigit(z[i]); i++){}
++      if( z[i]=='.' && isdigit(z[i+1]) ){
++        i += 2;
++        while( isdigit(z[i]) ){ i++; }
++        *tokenType = TK_FLOAT;
++      }
++      if( (z[i]=='e' || z[i]=='E') &&
++           ( isdigit(z[i+1]) 
++            || ((z[i+1]=='+' || z[i+1]=='-') && isdigit(z[i+2]))
++           )
++      ){
++        i += 2;
++        while( isdigit(z[i]) ){ i++; }
++        *tokenType = TK_FLOAT;
++      }
++      return i;
++    }
++    case '[': {
++      for(i=1; z[i] && z[i-1]!=']'; i++){}
++      *tokenType = TK_ID;
++      return i;
++    }
++    case '?': {
++      *tokenType = TK_VARIABLE;
++      return 1;
++    }
++    default: {
++      if( (*z&0x80)==0 && !isIdChar[*z] ){
++        break;
++      }
++      for(i=1; (z[i]&0x80)!=0 || isIdChar[z[i]]; i++){}
++      *tokenType = sqliteKeywordCode((char*)z, i);
++      return i;
++    }
++  }
++  *tokenType = TK_ILLEGAL;
++  return 1;
++}
++
++/*
++** Run the parser on the given SQL string.  The parser structure is
++** passed in.  An SQLITE_ status code is returned.  If an error occurs
++** and pzErrMsg!=NULL then an error message might be written into 
++** memory obtained from malloc() and *pzErrMsg made to point to that
++** error message.  Or maybe not.
++*/
++int sqliteRunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
++  int nErr = 0;
++  int i;
++  void *pEngine;
++  int tokenType;
++  int lastTokenParsed = -1;
++  sqlite *db = pParse->db;
++  extern void *sqliteParserAlloc(void*(*)(int));
++  extern void sqliteParserFree(void*, void(*)(void*));
++  extern int sqliteParser(void*, int, Token, Parse*);
++
++  db->flags &= ~SQLITE_Interrupt;
++  pParse->rc = SQLITE_OK;
++  i = 0;
++  pEngine = sqliteParserAlloc((void*(*)(int))malloc);
++  if( pEngine==0 ){
++    sqliteSetString(pzErrMsg, "out of memory", (char*)0);
++    return 1;
++  }
++  pParse->sLastToken.dyn = 0;
++  pParse->zTail = zSql;
++  while( sqlite_malloc_failed==0 && zSql[i]!=0 ){
++    assert( i>=0 );
++    pParse->sLastToken.z = &zSql[i];
++    assert( pParse->sLastToken.dyn==0 );
++    pParse->sLastToken.n = sqliteGetToken((unsigned char*)&zSql[i], &tokenType);
++    i += pParse->sLastToken.n;
++    switch( tokenType ){
++      case TK_SPACE:
++      case TK_COMMENT: {
++        if( (db->flags & SQLITE_Interrupt)!=0 ){
++          pParse->rc = SQLITE_INTERRUPT;
++          sqliteSetString(pzErrMsg, "interrupt", (char*)0);
++          goto abort_parse;
++        }
++        break;
++      }
++      case TK_ILLEGAL: {
++        sqliteSetNString(pzErrMsg, "unrecognized token: \"", -1, 
++           pParse->sLastToken.z, pParse->sLastToken.n, "\"", 1, 0);
++        nErr++;
++        goto abort_parse;
++      }
++      case TK_SEMI: {
++        pParse->zTail = &zSql[i];
++        /* Fall thru into the default case */
++      }
++      default: {
++        sqliteParser(pEngine, tokenType, pParse->sLastToken, pParse);
++        lastTokenParsed = tokenType;
++        if( pParse->rc!=SQLITE_OK ){
++          goto abort_parse;
++        }
++        break;
++      }
++    }
++  }
++abort_parse:
++  if( zSql[i]==0 && nErr==0 && pParse->rc==SQLITE_OK ){
++    if( lastTokenParsed!=TK_SEMI ){
++      sqliteParser(pEngine, TK_SEMI, pParse->sLastToken, pParse);
++      pParse->zTail = &zSql[i];
++    }
++    sqliteParser(pEngine, 0, pParse->sLastToken, pParse);
++  }
++  sqliteParserFree(pEngine, free);
++  if( pParse->rc!=SQLITE_OK && pParse->rc!=SQLITE_DONE && pParse->zErrMsg==0 ){
++    sqliteSetString(&pParse->zErrMsg, sqlite_error_string(pParse->rc),
++                    (char*)0);
++  }
++  if( pParse->zErrMsg ){
++    if( pzErrMsg && *pzErrMsg==0 ){
++      *pzErrMsg = pParse->zErrMsg;
++    }else{
++      sqliteFree(pParse->zErrMsg);
++    }
++    pParse->zErrMsg = 0;
++    if( !nErr ) nErr++;
++  }
++  if( pParse->pVdbe && pParse->nErr>0 ){
++    sqliteVdbeDelete(pParse->pVdbe);
++    pParse->pVdbe = 0;
++  }
++  if( pParse->pNewTable ){
++    sqliteDeleteTable(pParse->db, pParse->pNewTable);
++    pParse->pNewTable = 0;
++  }
++  if( pParse->pNewTrigger ){
++    sqliteDeleteTrigger(pParse->pNewTrigger);
++    pParse->pNewTrigger = 0;
++  }
++  if( nErr>0 && (pParse->rc==SQLITE_OK || pParse->rc==SQLITE_DONE) ){
++    pParse->rc = SQLITE_ERROR;
++  }
++  return nErr;
++}
++
++/*
++** Token types used by the sqlite_complete() routine.  See the header
++** comments on that procedure for additional information.
++*/
++#define tkEXPLAIN 0
++#define tkCREATE  1
++#define tkTEMP    2
++#define tkTRIGGER 3
++#define tkEND     4
++#define tkSEMI    5
++#define tkWS      6
++#define tkOTHER   7
++
++/*
++** Return TRUE if the given SQL string ends in a semicolon.
++**
++** Special handling is require for CREATE TRIGGER statements.
++** Whenever the CREATE TRIGGER keywords are seen, the statement
++** must end with ";END;".
++**
++** This implementation uses a state machine with 7 states:
++**
++**   (0) START     At the beginning or end of an SQL statement.  This routine
++**                 returns 1 if it ends in the START state and 0 if it ends
++**                 in any other state.
++**
++**   (1) EXPLAIN   The keyword EXPLAIN has been seen at the beginning of 
++**                 a statement.
++**
++**   (2) CREATE    The keyword CREATE has been seen at the beginning of a
++**                 statement, possibly preceeded by EXPLAIN and/or followed by
++**                 TEMP or TEMPORARY
++**
++**   (3) NORMAL    We are in the middle of statement which ends with a single
++**                 semicolon.
++**
++**   (4) TRIGGER   We are in the middle of a trigger definition that must be
++**                 ended by a semicolon, the keyword END, and another semicolon.
++**
++**   (5) SEMI      We've seen the first semicolon in the ";END;" that occurs at
++**                 the end of a trigger definition.
++**
++**   (6) END       We've seen the ";END" of the ";END;" that occurs at the end
++**                 of a trigger difinition.
++**
++** Transitions between states above are determined by tokens extracted
++** from the input.  The following tokens are significant:
++**
++**   (0) tkEXPLAIN   The "explain" keyword.
++**   (1) tkCREATE    The "create" keyword.
++**   (2) tkTEMP      The "temp" or "temporary" keyword.
++**   (3) tkTRIGGER   The "trigger" keyword.
++**   (4) tkEND       The "end" keyword.
++**   (5) tkSEMI      A semicolon.
++**   (6) tkWS        Whitespace
++**   (7) tkOTHER     Any other SQL token.
++**
++** Whitespace never causes a state transition and is always ignored.
++*/
++int sqlite_complete(const char *zSql){
++  u8 state = 0;   /* Current state, using numbers defined in header comment */
++  u8 token;       /* Value of the next token */
++
++  /* The following matrix defines the transition from one state to another
++  ** according to what token is seen.  trans[state][token] returns the
++  ** next state.
++  */
++  static const u8 trans[7][8] = {
++                     /* Token:                                                */
++     /* State:       **  EXPLAIN  CREATE  TEMP  TRIGGER  END  SEMI  WS  OTHER */
++     /* 0   START: */ {       1,      2,    3,       3,   3,    0,  0,     3, },
++     /* 1 EXPLAIN: */ {       3,      2,    3,       3,   3,    0,  1,     3, },
++     /* 2  CREATE: */ {       3,      3,    2,       4,   3,    0,  2,     3, },
++     /* 3  NORMAL: */ {       3,      3,    3,       3,   3,    0,  3,     3, },
++     /* 4 TRIGGER: */ {       4,      4,    4,       4,   4,    5,  4,     4, },
++     /* 5    SEMI: */ {       4,      4,    4,       4,   6,    5,  5,     4, },
++     /* 6     END: */ {       4,      4,    4,       4,   4,    0,  6,     4, },
++  };
++
++  while( *zSql ){
++    switch( *zSql ){
++      case ';': {  /* A semicolon */
++        token = tkSEMI;
++        break;
++      }
++      case ' ':
++      case '\r':
++      case '\t':
++      case '\n':
++      case '\f': {  /* White space is ignored */
++        token = tkWS;
++        break;
++      }
++      case '/': {   /* C-style comments */
++        if( zSql[1]!='*' ){
++          token = tkOTHER;
++          break;
++        }
++        zSql += 2;
++        while( zSql[0] && (zSql[0]!='*' || zSql[1]!='/') ){ zSql++; }
++        if( zSql[0]==0 ) return 0;
++        zSql++;
++        token = tkWS;
++        break;
++      }
++      case '-': {   /* SQL-style comments from "--" to end of line */
++        if( zSql[1]!='-' ){
++          token = tkOTHER;
++          break;
++        }
++        while( *zSql && *zSql!='\n' ){ zSql++; }
++        if( *zSql==0 ) return state==0;
++        token = tkWS;
++        break;
++      }
++      case '[': {   /* Microsoft-style identifiers in [...] */
++        zSql++;
++        while( *zSql && *zSql!=']' ){ zSql++; }
++        if( *zSql==0 ) return 0;
++        token = tkOTHER;
++        break;
++      }
++      case '"':     /* single- and double-quoted strings */
++      case '\'': {
++        int c = *zSql;
++        zSql++;
++        while( *zSql && *zSql!=c ){ zSql++; }
++        if( *zSql==0 ) return 0;
++        token = tkOTHER;
++        break;
++      }
++      default: {
++        if( isIdChar[(u8)*zSql] ){
++          /* Keywords and unquoted identifiers */
++          int nId;
++          for(nId=1; isIdChar[(u8)zSql[nId]]; nId++){}
++          switch( *zSql ){
++            case 'c': case 'C': {
++              if( nId==6 && sqliteStrNICmp(zSql, "create", 6)==0 ){
++                token = tkCREATE;
++              }else{
++                token = tkOTHER;
++              }
++              break;
++            }
++            case 't': case 'T': {
++              if( nId==7 && sqliteStrNICmp(zSql, "trigger", 7)==0 ){
++                token = tkTRIGGER;
++              }else if( nId==4 && sqliteStrNICmp(zSql, "temp", 4)==0 ){
++                token = tkTEMP;
++              }else if( nId==9 && sqliteStrNICmp(zSql, "temporary", 9)==0 ){
++                token = tkTEMP;
++              }else{
++                token = tkOTHER;
++              }
++              break;
++            }
++            case 'e':  case 'E': {
++              if( nId==3 && sqliteStrNICmp(zSql, "end", 3)==0 ){
++                token = tkEND;
++              }else if( nId==7 && sqliteStrNICmp(zSql, "explain", 7)==0 ){
++                token = tkEXPLAIN;
++              }else{
++                token = tkOTHER;
++              }
++              break;
++            }
++            default: {
++              token = tkOTHER;
++              break;
++            }
++          }
++          zSql += nId-1;
++        }else{
++          /* Operators and special symbols */
++          token = tkOTHER;
++        }
++        break;
++      }
++    }
++    state = trans[state][token];
++    zSql++;
++  }
++  return state==0;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/trigger.c
+@@ -0,0 +1,764 @@
++/*
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++*
++*/
++#include "sqliteInt.h"
++
++/*
++** Delete a linked list of TriggerStep structures.
++*/
++void sqliteDeleteTriggerStep(TriggerStep *pTriggerStep){
++  while( pTriggerStep ){
++    TriggerStep * pTmp = pTriggerStep;
++    pTriggerStep = pTriggerStep->pNext;
++
++    if( pTmp->target.dyn ) sqliteFree((char*)pTmp->target.z);
++    sqliteExprDelete(pTmp->pWhere);
++    sqliteExprListDelete(pTmp->pExprList);
++    sqliteSelectDelete(pTmp->pSelect);
++    sqliteIdListDelete(pTmp->pIdList);
++
++    sqliteFree(pTmp);
++  }
++}
++
++/*
++** This is called by the parser when it sees a CREATE TRIGGER statement
++** up to the point of the BEGIN before the trigger actions.  A Trigger
++** structure is generated based on the information available and stored
++** in pParse->pNewTrigger.  After the trigger actions have been parsed, the
++** sqliteFinishTrigger() function is called to complete the trigger
++** construction process.
++*/
++void sqliteBeginTrigger(
++  Parse *pParse,      /* The parse context of the CREATE TRIGGER statement */
++  Token *pName,       /* The name of the trigger */
++  int tr_tm,          /* One of TK_BEFORE, TK_AFTER, TK_INSTEAD */
++  int op,             /* One of TK_INSERT, TK_UPDATE, TK_DELETE */
++  IdList *pColumns,   /* column list if this is an UPDATE OF trigger */
++  SrcList *pTableName,/* The name of the table/view the trigger applies to */
++  int foreach,        /* One of TK_ROW or TK_STATEMENT */
++  Expr *pWhen,        /* WHEN clause */
++  int isTemp          /* True if the TEMPORARY keyword is present */
++){
++  Trigger *nt;
++  Table   *tab;
++  char *zName = 0;        /* Name of the trigger */
++  sqlite *db = pParse->db;
++  int iDb;                /* When database to store the trigger in */
++  DbFixer sFix;
++
++  /* Check that: 
++  ** 1. the trigger name does not already exist.
++  ** 2. the table (or view) does exist in the same database as the trigger.
++  ** 3. that we are not trying to create a trigger on the sqlite_master table
++  ** 4. That we are not trying to create an INSTEAD OF trigger on a table.
++  ** 5. That we are not trying to create a BEFORE or AFTER trigger on a view.
++  */
++  if( sqlite_malloc_failed ) goto trigger_cleanup;
++  assert( pTableName->nSrc==1 );
++  if( db->init.busy
++   && sqliteFixInit(&sFix, pParse, db->init.iDb, "trigger", pName)
++   && sqliteFixSrcList(&sFix, pTableName)
++  ){
++    goto trigger_cleanup;
++  }
++  tab = sqliteSrcListLookup(pParse, pTableName);
++  if( !tab ){
++    goto trigger_cleanup;
++  }
++  iDb = isTemp ? 1 : tab->iDb;
++  if( iDb>=2 && !db->init.busy ){
++    sqliteErrorMsg(pParse, "triggers may not be added to auxiliary "
++       "database %s", db->aDb[tab->iDb].zName);
++    goto trigger_cleanup;
++  }
++
++  zName = sqliteStrNDup(pName->z, pName->n);
++  sqliteDequote(zName);
++  if( sqliteHashFind(&(db->aDb[iDb].trigHash), zName,pName->n+1) ){
++    sqliteErrorMsg(pParse, "trigger %T already exists", pName);
++    goto trigger_cleanup;
++  }
++  if( sqliteStrNICmp(tab->zName, "sqlite_", 7)==0 ){
++    sqliteErrorMsg(pParse, "cannot create trigger on system table");
++    pParse->nErr++;
++    goto trigger_cleanup;
++  }
++  if( tab->pSelect && tr_tm != TK_INSTEAD ){
++    sqliteErrorMsg(pParse, "cannot create %s trigger on view: %S", 
++        (tr_tm == TK_BEFORE)?"BEFORE":"AFTER", pTableName, 0);
++    goto trigger_cleanup;
++  }
++  if( !tab->pSelect && tr_tm == TK_INSTEAD ){
++    sqliteErrorMsg(pParse, "cannot create INSTEAD OF"
++        " trigger on table: %S", pTableName, 0);
++    goto trigger_cleanup;
++  }
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  {
++    int code = SQLITE_CREATE_TRIGGER;
++    const char *zDb = db->aDb[tab->iDb].zName;
++    const char *zDbTrig = isTemp ? db->aDb[1].zName : zDb;
++    if( tab->iDb==1 || isTemp ) code = SQLITE_CREATE_TEMP_TRIGGER;
++    if( sqliteAuthCheck(pParse, code, zName, tab->zName, zDbTrig) ){
++      goto trigger_cleanup;
++    }
++    if( sqliteAuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(tab->iDb), 0, zDb)){
++      goto trigger_cleanup;
++    }
++  }
++#endif
++
++  /* INSTEAD OF triggers can only appear on views and BEGIN triggers
++  ** cannot appear on views.  So we might as well translate every
++  ** INSTEAD OF trigger into a BEFORE trigger.  It simplifies code
++  ** elsewhere.
++  */
++  if (tr_tm == TK_INSTEAD){
++    tr_tm = TK_BEFORE;
++  }
++
++  /* Build the Trigger object */
++  nt = (Trigger*)sqliteMalloc(sizeof(Trigger));
++  if( nt==0 ) goto trigger_cleanup;
++  nt->name = zName;
++  zName = 0;
++  nt->table = sqliteStrDup(pTableName->a[0].zName);
++  if( sqlite_malloc_failed ) goto trigger_cleanup;
++  nt->iDb = iDb;
++  nt->iTabDb = tab->iDb;
++  nt->op = op;
++  nt->tr_tm = tr_tm;
++  nt->pWhen = sqliteExprDup(pWhen);
++  nt->pColumns = sqliteIdListDup(pColumns);
++  nt->foreach = foreach;
++  sqliteTokenCopy(&nt->nameToken,pName);
++  assert( pParse->pNewTrigger==0 );
++  pParse->pNewTrigger = nt;
++
++trigger_cleanup:
++  sqliteFree(zName);
++  sqliteSrcListDelete(pTableName);
++  sqliteIdListDelete(pColumns);
++  sqliteExprDelete(pWhen);
++}
++
++/*
++** This routine is called after all of the trigger actions have been parsed
++** in order to complete the process of building the trigger.
++*/
++void sqliteFinishTrigger(
++  Parse *pParse,          /* Parser context */
++  TriggerStep *pStepList, /* The triggered program */
++  Token *pAll             /* Token that describes the complete CREATE TRIGGER */
++){
++  Trigger *nt = 0;          /* The trigger whose construction is finishing up */
++  sqlite *db = pParse->db;  /* The database */
++  DbFixer sFix;
++
++  if( pParse->nErr || pParse->pNewTrigger==0 ) goto triggerfinish_cleanup;
++  nt = pParse->pNewTrigger;
++  pParse->pNewTrigger = 0;
++  nt->step_list = pStepList;
++  while( pStepList ){
++    pStepList->pTrig = nt;
++    pStepList = pStepList->pNext;
++  }
++  if( sqliteFixInit(&sFix, pParse, nt->iDb, "trigger", &nt->nameToken) 
++          && sqliteFixTriggerStep(&sFix, nt->step_list) ){
++    goto triggerfinish_cleanup;
++  }
++
++  /* if we are not initializing, and this trigger is not on a TEMP table, 
++  ** build the sqlite_master entry
++  */
++  if( !db->init.busy ){
++    static VdbeOpList insertTrig[] = {
++      { OP_NewRecno,   0, 0,  0          },
++      { OP_String,     0, 0,  "trigger"  },
++      { OP_String,     0, 0,  0          },  /* 2: trigger name */
++      { OP_String,     0, 0,  0          },  /* 3: table name */
++      { OP_Integer,    0, 0,  0          },
++      { OP_String,     0, 0,  0          },  /* 5: SQL */
++      { OP_MakeRecord, 5, 0,  0          },
++      { OP_PutIntKey,  0, 0,  0          },
++    };
++    int addr;
++    Vdbe *v;
++
++    /* Make an entry in the sqlite_master table */
++    v = sqliteGetVdbe(pParse);
++    if( v==0 ) goto triggerfinish_cleanup;
++    sqliteBeginWriteOperation(pParse, 0, 0);
++    sqliteOpenMasterTable(v, nt->iDb);
++    addr = sqliteVdbeAddOpList(v, ArraySize(insertTrig), insertTrig);
++    sqliteVdbeChangeP3(v, addr+2, nt->name, 0); 
++    sqliteVdbeChangeP3(v, addr+3, nt->table, 0); 
++    sqliteVdbeChangeP3(v, addr+5, pAll->z, pAll->n);
++    if( nt->iDb==0 ){
++      sqliteChangeCookie(db, v);
++    }
++    sqliteVdbeAddOp(v, OP_Close, 0, 0);
++    sqliteEndWriteOperation(pParse);
++  }
++
++  if( !pParse->explain ){
++    Table *pTab;
++    sqliteHashInsert(&db->aDb[nt->iDb].trigHash, 
++                     nt->name, strlen(nt->name)+1, nt);
++    pTab = sqliteLocateTable(pParse, nt->table, db->aDb[nt->iTabDb].zName);
++    assert( pTab!=0 );
++    nt->pNext = pTab->pTrigger;
++    pTab->pTrigger = nt;
++    nt = 0;
++  }
++
++triggerfinish_cleanup:
++  sqliteDeleteTrigger(nt);
++  sqliteDeleteTrigger(pParse->pNewTrigger);
++  pParse->pNewTrigger = 0;
++  sqliteDeleteTriggerStep(pStepList);
++}
++
++/*
++** Make a copy of all components of the given trigger step.  This has
++** the effect of copying all Expr.token.z values into memory obtained
++** from sqliteMalloc().  As initially created, the Expr.token.z values
++** all point to the input string that was fed to the parser.  But that
++** string is ephemeral - it will go away as soon as the sqlite_exec()
++** call that started the parser exits.  This routine makes a persistent
++** copy of all the Expr.token.z strings so that the TriggerStep structure
++** will be valid even after the sqlite_exec() call returns.
++*/
++static void sqlitePersistTriggerStep(TriggerStep *p){
++  if( p->target.z ){
++    p->target.z = sqliteStrNDup(p->target.z, p->target.n);
++    p->target.dyn = 1;
++  }
++  if( p->pSelect ){
++    Select *pNew = sqliteSelectDup(p->pSelect);
++    sqliteSelectDelete(p->pSelect);
++    p->pSelect = pNew;
++  }
++  if( p->pWhere ){
++    Expr *pNew = sqliteExprDup(p->pWhere);
++    sqliteExprDelete(p->pWhere);
++    p->pWhere = pNew;
++  }
++  if( p->pExprList ){
++    ExprList *pNew = sqliteExprListDup(p->pExprList);
++    sqliteExprListDelete(p->pExprList);
++    p->pExprList = pNew;
++  }
++  if( p->pIdList ){
++    IdList *pNew = sqliteIdListDup(p->pIdList);
++    sqliteIdListDelete(p->pIdList);
++    p->pIdList = pNew;
++  }
++}
++
++/*
++** Turn a SELECT statement (that the pSelect parameter points to) into
++** a trigger step.  Return a pointer to a TriggerStep structure.
++**
++** The parser calls this routine when it finds a SELECT statement in
++** body of a TRIGGER.  
++*/
++TriggerStep *sqliteTriggerSelectStep(Select *pSelect){
++  TriggerStep *pTriggerStep = sqliteMalloc(sizeof(TriggerStep));
++  if( pTriggerStep==0 ) return 0;
++
++  pTriggerStep->op = TK_SELECT;
++  pTriggerStep->pSelect = pSelect;
++  pTriggerStep->orconf = OE_Default;
++  sqlitePersistTriggerStep(pTriggerStep);
++
++  return pTriggerStep;
++}
++
++/*
++** Build a trigger step out of an INSERT statement.  Return a pointer
++** to the new trigger step.
++**
++** The parser calls this routine when it sees an INSERT inside the
++** body of a trigger.
++*/
++TriggerStep *sqliteTriggerInsertStep(
++  Token *pTableName,  /* Name of the table into which we insert */
++  IdList *pColumn,    /* List of columns in pTableName to insert into */
++  ExprList *pEList,   /* The VALUE clause: a list of values to be inserted */
++  Select *pSelect,    /* A SELECT statement that supplies values */
++  int orconf          /* The conflict algorithm (OE_Abort, OE_Replace, etc.) */
++){
++  TriggerStep *pTriggerStep = sqliteMalloc(sizeof(TriggerStep));
++  if( pTriggerStep==0 ) return 0;
++
++  assert(pEList == 0 || pSelect == 0);
++  assert(pEList != 0 || pSelect != 0);
++
++  pTriggerStep->op = TK_INSERT;
++  pTriggerStep->pSelect = pSelect;
++  pTriggerStep->target  = *pTableName;
++  pTriggerStep->pIdList = pColumn;
++  pTriggerStep->pExprList = pEList;
++  pTriggerStep->orconf = orconf;
++  sqlitePersistTriggerStep(pTriggerStep);
++
++  return pTriggerStep;
++}
++
++/*
++** Construct a trigger step that implements an UPDATE statement and return
++** a pointer to that trigger step.  The parser calls this routine when it
++** sees an UPDATE statement inside the body of a CREATE TRIGGER.
++*/
++TriggerStep *sqliteTriggerUpdateStep(
++  Token *pTableName,   /* Name of the table to be updated */
++  ExprList *pEList,    /* The SET clause: list of column and new values */
++  Expr *pWhere,        /* The WHERE clause */
++  int orconf           /* The conflict algorithm. (OE_Abort, OE_Ignore, etc) */
++){
++  TriggerStep *pTriggerStep = sqliteMalloc(sizeof(TriggerStep));
++  if( pTriggerStep==0 ) return 0;
++
++  pTriggerStep->op = TK_UPDATE;
++  pTriggerStep->target  = *pTableName;
++  pTriggerStep->pExprList = pEList;
++  pTriggerStep->pWhere = pWhere;
++  pTriggerStep->orconf = orconf;
++  sqlitePersistTriggerStep(pTriggerStep);
++
++  return pTriggerStep;
++}
++
++/*
++** Construct a trigger step that implements a DELETE statement and return
++** a pointer to that trigger step.  The parser calls this routine when it
++** sees a DELETE statement inside the body of a CREATE TRIGGER.
++*/
++TriggerStep *sqliteTriggerDeleteStep(Token *pTableName, Expr *pWhere){
++  TriggerStep *pTriggerStep = sqliteMalloc(sizeof(TriggerStep));
++  if( pTriggerStep==0 ) return 0;
++
++  pTriggerStep->op = TK_DELETE;
++  pTriggerStep->target  = *pTableName;
++  pTriggerStep->pWhere = pWhere;
++  pTriggerStep->orconf = OE_Default;
++  sqlitePersistTriggerStep(pTriggerStep);
++
++  return pTriggerStep;
++}
++
++/* 
++** Recursively delete a Trigger structure
++*/
++void sqliteDeleteTrigger(Trigger *pTrigger){
++  if( pTrigger==0 ) return;
++  sqliteDeleteTriggerStep(pTrigger->step_list);
++  sqliteFree(pTrigger->name);
++  sqliteFree(pTrigger->table);
++  sqliteExprDelete(pTrigger->pWhen);
++  sqliteIdListDelete(pTrigger->pColumns);
++  if( pTrigger->nameToken.dyn ) sqliteFree((char*)pTrigger->nameToken.z);
++  sqliteFree(pTrigger);
++}
++
++/*
++ * This function is called to drop a trigger from the database schema. 
++ *
++ * This may be called directly from the parser and therefore identifies
++ * the trigger by name.  The sqliteDropTriggerPtr() routine does the
++ * same job as this routine except it take a spointer to the trigger
++ * instead of the trigger name.
++ *
++ * Note that this function does not delete the trigger entirely. Instead it
++ * removes it from the internal schema and places it in the trigDrop hash 
++ * table. This is so that the trigger can be restored into the database schema
++ * if the transaction is rolled back.
++ */
++void sqliteDropTrigger(Parse *pParse, SrcList *pName){
++  Trigger *pTrigger;
++  int i;
++  const char *zDb;
++  const char *zName;
++  int nName;
++  sqlite *db = pParse->db;
++
++  if( sqlite_malloc_failed ) goto drop_trigger_cleanup;
++  assert( pName->nSrc==1 );
++  zDb = pName->a[0].zDatabase;
++  zName = pName->a[0].zName;
++  nName = strlen(zName);
++  for(i=0; i<db->nDb; i++){
++    int j = (i<2) ? i^1 : i;  /* Search TEMP before MAIN */
++    if( zDb && sqliteStrICmp(db->aDb[j].zName, zDb) ) continue;
++    pTrigger = sqliteHashFind(&(db->aDb[j].trigHash), zName, nName+1);
++    if( pTrigger ) break;
++  }
++  if( !pTrigger ){
++    sqliteErrorMsg(pParse, "no such trigger: %S", pName, 0);
++    goto drop_trigger_cleanup;
++  }
++  sqliteDropTriggerPtr(pParse, pTrigger, 0);
++
++drop_trigger_cleanup:
++  sqliteSrcListDelete(pName);
++}
++
++/*
++** Drop a trigger given a pointer to that trigger.  If nested is false,
++** then also generate code to remove the trigger from the SQLITE_MASTER
++** table.
++*/
++void sqliteDropTriggerPtr(Parse *pParse, Trigger *pTrigger, int nested){
++  Table   *pTable;
++  Vdbe *v;
++  sqlite *db = pParse->db;
++
++  assert( pTrigger->iDb<db->nDb );
++  if( pTrigger->iDb>=2 ){
++    sqliteErrorMsg(pParse, "triggers may not be removed from "
++       "auxiliary database %s", db->aDb[pTrigger->iDb].zName);
++    return;
++  }
++  pTable = sqliteFindTable(db, pTrigger->table,db->aDb[pTrigger->iTabDb].zName);
++  assert(pTable);
++  assert( pTable->iDb==pTrigger->iDb || pTrigger->iDb==1 );
++#ifndef SQLITE_OMIT_AUTHORIZATION
++  {
++    int code = SQLITE_DROP_TRIGGER;
++    const char *zDb = db->aDb[pTrigger->iDb].zName;
++    const char *zTab = SCHEMA_TABLE(pTrigger->iDb);
++    if( pTrigger->iDb ) code = SQLITE_DROP_TEMP_TRIGGER;
++    if( sqliteAuthCheck(pParse, code, pTrigger->name, pTable->zName, zDb) ||
++      sqliteAuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){
++      return;
++    }
++  }
++#endif
++
++  /* Generate code to destroy the database record of the trigger.
++  */
++  if( pTable!=0 && !nested && (v = sqliteGetVdbe(pParse))!=0 ){
++    int base;
++    static VdbeOpList dropTrigger[] = {
++      { OP_Rewind,     0, ADDR(9),  0},
++      { OP_String,     0, 0,        0}, /* 1 */
++      { OP_Column,     0, 1,        0},
++      { OP_Ne,         0, ADDR(8),  0},
++      { OP_String,     0, 0,        "trigger"},
++      { OP_Column,     0, 0,        0},
++      { OP_Ne,         0, ADDR(8),  0},
++      { OP_Delete,     0, 0,        0},
++      { OP_Next,       0, ADDR(1),  0}, /* 8 */
++    };
++
++    sqliteBeginWriteOperation(pParse, 0, 0);
++    sqliteOpenMasterTable(v, pTrigger->iDb);
++    base = sqliteVdbeAddOpList(v,  ArraySize(dropTrigger), dropTrigger);
++    sqliteVdbeChangeP3(v, base+1, pTrigger->name, 0);
++    if( pTrigger->iDb==0 ){
++      sqliteChangeCookie(db, v);
++    }
++    sqliteVdbeAddOp(v, OP_Close, 0, 0);
++    sqliteEndWriteOperation(pParse);
++  }
++
++  /*
++   * If this is not an "explain", then delete the trigger structure.
++   */
++  if( !pParse->explain ){
++    const char *zName = pTrigger->name;
++    int nName = strlen(zName);
++    if( pTable->pTrigger == pTrigger ){
++      pTable->pTrigger = pTrigger->pNext;
++    }else{
++      Trigger *cc = pTable->pTrigger;
++      while( cc ){ 
++        if( cc->pNext == pTrigger ){
++          cc->pNext = cc->pNext->pNext;
++          break;
++        }
++        cc = cc->pNext;
++      }
++      assert(cc);
++    }
++    sqliteHashInsert(&(db->aDb[pTrigger->iDb].trigHash), zName, nName+1, 0);
++    sqliteDeleteTrigger(pTrigger);
++  }
++}
++
++/*
++** pEList is the SET clause of an UPDATE statement.  Each entry
++** in pEList is of the format <id>=<expr>.  If any of the entries
++** in pEList have an <id> which matches an identifier in pIdList,
++** then return TRUE.  If pIdList==NULL, then it is considered a
++** wildcard that matches anything.  Likewise if pEList==NULL then
++** it matches anything so always return true.  Return false only
++** if there is no match.
++*/
++static int checkColumnOverLap(IdList *pIdList, ExprList *pEList){
++  int e;
++  if( !pIdList || !pEList ) return 1;
++  for(e=0; e<pEList->nExpr; e++){
++    if( sqliteIdListIndex(pIdList, pEList->a[e].zName)>=0 ) return 1;
++  }
++  return 0; 
++}
++
++/* A global variable that is TRUE if we should always set up temp tables for
++ * for triggers, even if there are no triggers to code. This is used to test 
++ * how much overhead the triggers algorithm is causing.
++ *
++ * This flag can be set or cleared using the "trigger_overhead_test" pragma.
++ * The pragma is not documented since it is not really part of the interface
++ * to SQLite, just the test procedure.
++*/
++int always_code_trigger_setup = 0;
++
++/*
++ * Returns true if a trigger matching op, tr_tm and foreach that is NOT already
++ * on the Parse objects trigger-stack (to prevent recursive trigger firing) is
++ * found in the list specified as pTrigger.
++ */
++int sqliteTriggersExist(
++  Parse *pParse,          /* Used to check for recursive triggers */
++  Trigger *pTrigger,      /* A list of triggers associated with a table */
++  int op,                 /* one of TK_DELETE, TK_INSERT, TK_UPDATE */
++  int tr_tm,              /* one of TK_BEFORE, TK_AFTER */
++  int foreach,            /* one of TK_ROW or TK_STATEMENT */
++  ExprList *pChanges      /* Columns that change in an UPDATE statement */
++){
++  Trigger * pTriggerCursor;
++
++  if( always_code_trigger_setup ){
++    return 1;
++  }
++
++  pTriggerCursor = pTrigger;
++  while( pTriggerCursor ){
++    if( pTriggerCursor->op == op && 
++	pTriggerCursor->tr_tm == tr_tm && 
++	pTriggerCursor->foreach == foreach &&
++	checkColumnOverLap(pTriggerCursor->pColumns, pChanges) ){
++      TriggerStack * ss;
++      ss = pParse->trigStack;
++      while( ss && ss->pTrigger != pTrigger ){
++	ss = ss->pNext;
++      }
++      if( !ss )return 1;
++    }
++    pTriggerCursor = pTriggerCursor->pNext;
++  }
++
++  return 0;
++}
++
++/*
++** Convert the pStep->target token into a SrcList and return a pointer
++** to that SrcList.
++**
++** This routine adds a specific database name, if needed, to the target when
++** forming the SrcList.  This prevents a trigger in one database from
++** referring to a target in another database.  An exception is when the
++** trigger is in TEMP in which case it can refer to any other database it
++** wants.
++*/
++static SrcList *targetSrcList(
++  Parse *pParse,       /* The parsing context */
++  TriggerStep *pStep   /* The trigger containing the target token */
++){
++  Token sDb;           /* Dummy database name token */
++  int iDb;             /* Index of the database to use */
++  SrcList *pSrc;       /* SrcList to be returned */
++
++  iDb = pStep->pTrig->iDb;
++  if( iDb==0 || iDb>=2 ){
++    assert( iDb<pParse->db->nDb );
++    sDb.z = pParse->db->aDb[iDb].zName;
++    sDb.n = strlen(sDb.z);
++    pSrc = sqliteSrcListAppend(0, &sDb, &pStep->target);
++  } else {
++    pSrc = sqliteSrcListAppend(0, &pStep->target, 0);
++  }
++  return pSrc;
++}
++
++/*
++** Generate VDBE code for zero or more statements inside the body of a
++** trigger.  
++*/
++static int codeTriggerProgram(
++  Parse *pParse,            /* The parser context */
++  TriggerStep *pStepList,   /* List of statements inside the trigger body */
++  int orconfin              /* Conflict algorithm. (OE_Abort, etc) */  
++){
++  TriggerStep * pTriggerStep = pStepList;
++  int orconf;
++
++  while( pTriggerStep ){
++    int saveNTab = pParse->nTab;
++ 
++    orconf = (orconfin == OE_Default)?pTriggerStep->orconf:orconfin;
++    pParse->trigStack->orconf = orconf;
++    switch( pTriggerStep->op ){
++      case TK_SELECT: {
++	Select * ss = sqliteSelectDup(pTriggerStep->pSelect);		  
++	assert(ss);
++	assert(ss->pSrc);
++	sqliteSelect(pParse, ss, SRT_Discard, 0, 0, 0, 0);
++	sqliteSelectDelete(ss);
++	break;
++      }
++      case TK_UPDATE: {
++        SrcList *pSrc;
++        pSrc = targetSrcList(pParse, pTriggerStep);
++        sqliteVdbeAddOp(pParse->pVdbe, OP_ListPush, 0, 0);
++        sqliteUpdate(pParse, pSrc,
++		sqliteExprListDup(pTriggerStep->pExprList), 
++		sqliteExprDup(pTriggerStep->pWhere), orconf);
++        sqliteVdbeAddOp(pParse->pVdbe, OP_ListPop, 0, 0);
++        break;
++      }
++      case TK_INSERT: {
++        SrcList *pSrc;
++        pSrc = targetSrcList(pParse, pTriggerStep);
++        sqliteInsert(pParse, pSrc,
++          sqliteExprListDup(pTriggerStep->pExprList), 
++          sqliteSelectDup(pTriggerStep->pSelect), 
++          sqliteIdListDup(pTriggerStep->pIdList), orconf);
++        break;
++      }
++      case TK_DELETE: {
++        SrcList *pSrc;
++        sqliteVdbeAddOp(pParse->pVdbe, OP_ListPush, 0, 0);
++        pSrc = targetSrcList(pParse, pTriggerStep);
++        sqliteDeleteFrom(pParse, pSrc, sqliteExprDup(pTriggerStep->pWhere));
++        sqliteVdbeAddOp(pParse->pVdbe, OP_ListPop, 0, 0);
++        break;
++      }
++      default:
++        assert(0);
++    } 
++    pParse->nTab = saveNTab;
++    pTriggerStep = pTriggerStep->pNext;
++  }
++
++  return 0;
++}
++
++/*
++** This is called to code FOR EACH ROW triggers.
++**
++** When the code that this function generates is executed, the following 
++** must be true:
++**
++** 1. No cursors may be open in the main database.  (But newIdx and oldIdx
++**    can be indices of cursors in temporary tables.  See below.)
++**
++** 2. If the triggers being coded are ON INSERT or ON UPDATE triggers, then
++**    a temporary vdbe cursor (index newIdx) must be open and pointing at
++**    a row containing values to be substituted for new.* expressions in the
++**    trigger program(s).
++**
++** 3. If the triggers being coded are ON DELETE or ON UPDATE triggers, then
++**    a temporary vdbe cursor (index oldIdx) must be open and pointing at
++**    a row containing values to be substituted for old.* expressions in the
++**    trigger program(s).
++**
++*/
++int sqliteCodeRowTrigger(
++  Parse *pParse,       /* Parse context */
++  int op,              /* One of TK_UPDATE, TK_INSERT, TK_DELETE */
++  ExprList *pChanges,  /* Changes list for any UPDATE OF triggers */
++  int tr_tm,           /* One of TK_BEFORE, TK_AFTER */
++  Table *pTab,         /* The table to code triggers from */
++  int newIdx,          /* The indice of the "new" row to access */
++  int oldIdx,          /* The indice of the "old" row to access */
++  int orconf,          /* ON CONFLICT policy */
++  int ignoreJump       /* Instruction to jump to for RAISE(IGNORE) */
++){
++  Trigger * pTrigger;
++  TriggerStack * pTriggerStack;
++
++  assert(op == TK_UPDATE || op == TK_INSERT || op == TK_DELETE);
++  assert(tr_tm == TK_BEFORE || tr_tm == TK_AFTER );
++
++  assert(newIdx != -1 || oldIdx != -1);
++
++  pTrigger = pTab->pTrigger;
++  while( pTrigger ){
++    int fire_this = 0;
++
++    /* determine whether we should code this trigger */
++    if( pTrigger->op == op && pTrigger->tr_tm == tr_tm && 
++        pTrigger->foreach == TK_ROW ){
++      fire_this = 1;
++      pTriggerStack = pParse->trigStack;
++      while( pTriggerStack ){
++        if( pTriggerStack->pTrigger == pTrigger ){
++	  fire_this = 0;
++	}
++        pTriggerStack = pTriggerStack->pNext;
++      }
++      if( op == TK_UPDATE && pTrigger->pColumns &&
++          !checkColumnOverLap(pTrigger->pColumns, pChanges) ){
++        fire_this = 0;
++      }
++    }
++
++    if( fire_this && (pTriggerStack = sqliteMalloc(sizeof(TriggerStack)))!=0 ){
++      int endTrigger;
++      SrcList dummyTablist;
++      Expr * whenExpr;
++      AuthContext sContext;
++
++      dummyTablist.nSrc = 0;
++
++      /* Push an entry on to the trigger stack */
++      pTriggerStack->pTrigger = pTrigger;
++      pTriggerStack->newIdx = newIdx;
++      pTriggerStack->oldIdx = oldIdx;
++      pTriggerStack->pTab = pTab;
++      pTriggerStack->pNext = pParse->trigStack;
++      pTriggerStack->ignoreJump = ignoreJump;
++      pParse->trigStack = pTriggerStack;
++      sqliteAuthContextPush(pParse, &sContext, pTrigger->name);
++
++      /* code the WHEN clause */
++      endTrigger = sqliteVdbeMakeLabel(pParse->pVdbe);
++      whenExpr = sqliteExprDup(pTrigger->pWhen);
++      if( sqliteExprResolveIds(pParse, &dummyTablist, 0, whenExpr) ){
++        pParse->trigStack = pParse->trigStack->pNext;
++        sqliteFree(pTriggerStack);
++        sqliteExprDelete(whenExpr);
++        return 1;
++      }
++      sqliteExprIfFalse(pParse, whenExpr, endTrigger, 1);
++      sqliteExprDelete(whenExpr);
++
++      sqliteVdbeAddOp(pParse->pVdbe, OP_ContextPush, 0, 0);
++      codeTriggerProgram(pParse, pTrigger->step_list, orconf); 
++      sqliteVdbeAddOp(pParse->pVdbe, OP_ContextPop, 0, 0);
++
++      /* Pop the entry off the trigger stack */
++      pParse->trigStack = pParse->trigStack->pNext;
++      sqliteAuthContextPop(&sContext);
++      sqliteFree(pTriggerStack);
++
++      sqliteVdbeResolveLabel(pParse->pVdbe, endTrigger);
++    }
++    pTrigger = pTrigger->pNext;
++  }
++
++  return 0;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/update.c
+@@ -0,0 +1,459 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains C code routines that are called by the parser
++** to handle UPDATE statements.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++/*
++** Process an UPDATE statement.
++**
++**   UPDATE OR IGNORE table_wxyz SET a=b, c=d WHERE e<5 AND f NOT NULL;
++**          \_______/ \________/     \______/       \________________/
++*            onError   pTabList      pChanges             pWhere
++*/
++void sqliteUpdate(
++  Parse *pParse,         /* The parser context */
++  SrcList *pTabList,     /* The table in which we should change things */
++  ExprList *pChanges,    /* Things to be changed */
++  Expr *pWhere,          /* The WHERE clause.  May be null */
++  int onError            /* How to handle constraint errors */
++){
++  int i, j;              /* Loop counters */
++  Table *pTab;           /* The table to be updated */
++  int loopStart;         /* VDBE instruction address of the start of the loop */
++  int jumpInst;          /* Addr of VDBE instruction to jump out of loop */
++  WhereInfo *pWInfo;     /* Information about the WHERE clause */
++  Vdbe *v;               /* The virtual database engine */
++  Index *pIdx;           /* For looping over indices */
++  int nIdx;              /* Number of indices that need updating */
++  int nIdxTotal;         /* Total number of indices */
++  int iCur;              /* VDBE Cursor number of pTab */
++  sqlite *db;            /* The database structure */
++  Index **apIdx = 0;     /* An array of indices that need updating too */
++  char *aIdxUsed = 0;    /* aIdxUsed[i]==1 if the i-th index is used */
++  int *aXRef = 0;        /* aXRef[i] is the index in pChanges->a[] of the
++                         ** an expression for the i-th column of the table.
++                         ** aXRef[i]==-1 if the i-th column is not changed. */
++  int chngRecno;         /* True if the record number is being changed */
++  Expr *pRecnoExpr;      /* Expression defining the new record number */
++  int openAll;           /* True if all indices need to be opened */
++  int isView;            /* Trying to update a view */
++  int iStackDepth;       /* Index of memory cell holding stack depth */
++  AuthContext sContext;  /* The authorization context */
++
++  int before_triggers;         /* True if there are any BEFORE triggers */
++  int after_triggers;          /* True if there are any AFTER triggers */
++  int row_triggers_exist = 0;  /* True if any row triggers exist */
++
++  int newIdx      = -1;  /* index of trigger "new" temp table       */
++  int oldIdx      = -1;  /* index of trigger "old" temp table       */
++
++  sContext.pParse = 0;
++  if( pParse->nErr || sqlite_malloc_failed ) goto update_cleanup;
++  db = pParse->db;
++  assert( pTabList->nSrc==1 );
++  iStackDepth = pParse->nMem++;
++
++  /* Locate the table which we want to update. 
++  */
++  pTab = sqliteSrcListLookup(pParse, pTabList);
++  if( pTab==0 ) goto update_cleanup;
++  before_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, 
++            TK_UPDATE, TK_BEFORE, TK_ROW, pChanges);
++  after_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, 
++            TK_UPDATE, TK_AFTER, TK_ROW, pChanges);
++  row_triggers_exist = before_triggers || after_triggers;
++  isView = pTab->pSelect!=0;
++  if( sqliteIsReadOnly(pParse, pTab, before_triggers) ){
++    goto update_cleanup;
++  }
++  if( isView ){
++    if( sqliteViewGetColumnNames(pParse, pTab) ){
++      goto update_cleanup;
++    }
++  }
++  aXRef = sqliteMalloc( sizeof(int) * pTab->nCol );
++  if( aXRef==0 ) goto update_cleanup;
++  for(i=0; i<pTab->nCol; i++) aXRef[i] = -1;
++
++  /* If there are FOR EACH ROW triggers, allocate cursors for the
++  ** special OLD and NEW tables
++  */
++  if( row_triggers_exist ){
++    newIdx = pParse->nTab++;
++    oldIdx = pParse->nTab++;
++  }
++
++  /* Allocate a cursors for the main database table and for all indices.
++  ** The index cursors might not be used, but if they are used they
++  ** need to occur right after the database cursor.  So go ahead and
++  ** allocate enough space, just in case.
++  */
++  pTabList->a[0].iCursor = iCur = pParse->nTab++;
++  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++    pParse->nTab++;
++  }
++
++  /* Resolve the column names in all the expressions of the
++  ** of the UPDATE statement.  Also find the column index
++  ** for each column to be updated in the pChanges array.  For each
++  ** column to be updated, make sure we have authorization to change
++  ** that column.
++  */
++  chngRecno = 0;
++  for(i=0; i<pChanges->nExpr; i++){
++    if( sqliteExprResolveIds(pParse, pTabList, 0, pChanges->a[i].pExpr) ){
++      goto update_cleanup;
++    }
++    if( sqliteExprCheck(pParse, pChanges->a[i].pExpr, 0, 0) ){
++      goto update_cleanup;
++    }
++    for(j=0; j<pTab->nCol; j++){
++      if( sqliteStrICmp(pTab->aCol[j].zName, pChanges->a[i].zName)==0 ){
++        if( j==pTab->iPKey ){
++          chngRecno = 1;
++          pRecnoExpr = pChanges->a[i].pExpr;
++        }
++        aXRef[j] = i;
++        break;
++      }
++    }
++    if( j>=pTab->nCol ){
++      if( sqliteIsRowid(pChanges->a[i].zName) ){
++        chngRecno = 1;
++        pRecnoExpr = pChanges->a[i].pExpr;
++      }else{
++        sqliteErrorMsg(pParse, "no such column: %s", pChanges->a[i].zName);
++        goto update_cleanup;
++      }
++    }
++#ifndef SQLITE_OMIT_AUTHORIZATION
++    {
++      int rc;
++      rc = sqliteAuthCheck(pParse, SQLITE_UPDATE, pTab->zName,
++                           pTab->aCol[j].zName, db->aDb[pTab->iDb].zName);
++      if( rc==SQLITE_DENY ){
++        goto update_cleanup;
++      }else if( rc==SQLITE_IGNORE ){
++        aXRef[j] = -1;
++      }
++    }
++#endif
++  }
++
++  /* Allocate memory for the array apIdx[] and fill it with pointers to every
++  ** index that needs to be updated.  Indices only need updating if their
++  ** key includes one of the columns named in pChanges or if the record
++  ** number of the original table entry is changing.
++  */
++  for(nIdx=nIdxTotal=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdxTotal++){
++    if( chngRecno ){
++      i = 0;
++    }else {
++      for(i=0; i<pIdx->nColumn; i++){
++        if( aXRef[pIdx->aiColumn[i]]>=0 ) break;
++      }
++    }
++    if( i<pIdx->nColumn ) nIdx++;
++  }
++  if( nIdxTotal>0 ){
++    apIdx = sqliteMalloc( sizeof(Index*) * nIdx + nIdxTotal );
++    if( apIdx==0 ) goto update_cleanup;
++    aIdxUsed = (char*)&apIdx[nIdx];
++  }
++  for(nIdx=j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
++    if( chngRecno ){
++      i = 0;
++    }else{
++      for(i=0; i<pIdx->nColumn; i++){
++        if( aXRef[pIdx->aiColumn[i]]>=0 ) break;
++      }
++    }
++    if( i<pIdx->nColumn ){
++      apIdx[nIdx++] = pIdx;
++      aIdxUsed[j] = 1;
++    }else{
++      aIdxUsed[j] = 0;
++    }
++  }
++
++  /* Resolve the column names in all the expressions in the
++  ** WHERE clause.
++  */
++  if( pWhere ){
++    if( sqliteExprResolveIds(pParse, pTabList, 0, pWhere) ){
++      goto update_cleanup;
++    }
++    if( sqliteExprCheck(pParse, pWhere, 0, 0) ){
++      goto update_cleanup;
++    }
++  }
++
++  /* Start the view context
++  */
++  if( isView ){
++    sqliteAuthContextPush(pParse, &sContext, pTab->zName);
++  }
++
++  /* Begin generating code.
++  */
++  v = sqliteGetVdbe(pParse);
++  if( v==0 ) goto update_cleanup;
++  sqliteBeginWriteOperation(pParse, 1, pTab->iDb);
++
++  /* If we are trying to update a view, construct that view into
++  ** a temporary table.
++  */
++  if( isView ){
++    Select *pView;
++    pView = sqliteSelectDup(pTab->pSelect);
++    sqliteSelect(pParse, pView, SRT_TempTable, iCur, 0, 0, 0);
++    sqliteSelectDelete(pView);
++  }
++
++  /* Begin the database scan
++  */
++  pWInfo = sqliteWhereBegin(pParse, pTabList, pWhere, 1, 0);
++  if( pWInfo==0 ) goto update_cleanup;
++
++  /* Remember the index of every item to be updated.
++  */
++  sqliteVdbeAddOp(v, OP_ListWrite, 0, 0);
++
++  /* End the database scan loop.
++  */
++  sqliteWhereEnd(pWInfo);
++
++  /* Initialize the count of updated rows
++  */
++  if( db->flags & SQLITE_CountRows && !pParse->trigStack ){
++    sqliteVdbeAddOp(v, OP_Integer, 0, 0);
++  }
++
++  if( row_triggers_exist ){
++    /* Create pseudo-tables for NEW and OLD
++    */
++    sqliteVdbeAddOp(v, OP_OpenPseudo, oldIdx, 0);
++    sqliteVdbeAddOp(v, OP_OpenPseudo, newIdx, 0);
++
++    /* The top of the update loop for when there are triggers.
++    */
++    sqliteVdbeAddOp(v, OP_ListRewind, 0, 0);
++    sqliteVdbeAddOp(v, OP_StackDepth, 0, 0);
++    sqliteVdbeAddOp(v, OP_MemStore, iStackDepth, 1);
++    loopStart = sqliteVdbeAddOp(v, OP_MemLoad, iStackDepth, 0);
++    sqliteVdbeAddOp(v, OP_StackReset, 0, 0);
++    jumpInst = sqliteVdbeAddOp(v, OP_ListRead, 0, 0);
++    sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++
++    /* Open a cursor and make it point to the record that is
++    ** being updated.
++    */
++    sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++    if( !isView ){
++      sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++      sqliteVdbeAddOp(v, OP_OpenRead, iCur, pTab->tnum);
++    }
++    sqliteVdbeAddOp(v, OP_MoveTo, iCur, 0);
++
++    /* Generate the OLD table
++    */
++    sqliteVdbeAddOp(v, OP_Recno, iCur, 0);
++    sqliteVdbeAddOp(v, OP_RowData, iCur, 0);
++    sqliteVdbeAddOp(v, OP_PutIntKey, oldIdx, 0);
++
++    /* Generate the NEW table
++    */
++    if( chngRecno ){
++      sqliteExprCode(pParse, pRecnoExpr);
++    }else{
++      sqliteVdbeAddOp(v, OP_Recno, iCur, 0);
++    }
++    for(i=0; i<pTab->nCol; i++){
++      if( i==pTab->iPKey ){
++        sqliteVdbeAddOp(v, OP_String, 0, 0);
++        continue;
++      }
++      j = aXRef[i];
++      if( j<0 ){
++        sqliteVdbeAddOp(v, OP_Column, iCur, i);
++      }else{
++        sqliteExprCode(pParse, pChanges->a[j].pExpr);
++      }
++    }
++    sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0);
++    sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0);
++    if( !isView ){
++      sqliteVdbeAddOp(v, OP_Close, iCur, 0);
++    }
++
++    /* Fire the BEFORE and INSTEAD OF triggers
++    */
++    if( sqliteCodeRowTrigger(pParse, TK_UPDATE, pChanges, TK_BEFORE, pTab, 
++          newIdx, oldIdx, onError, loopStart) ){
++      goto update_cleanup;
++    }
++  }
++
++  if( !isView ){
++    /* 
++    ** Open every index that needs updating.  Note that if any
++    ** index could potentially invoke a REPLACE conflict resolution 
++    ** action, then we need to open all indices because we might need
++    ** to be deleting some records.
++    */
++    sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++    sqliteVdbeAddOp(v, OP_OpenWrite, iCur, pTab->tnum);
++    if( onError==OE_Replace ){
++      openAll = 1;
++    }else{
++      openAll = 0;
++      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++        if( pIdx->onError==OE_Replace ){
++          openAll = 1;
++          break;
++        }
++      }
++    }
++    for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
++      if( openAll || aIdxUsed[i] ){
++        sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0);
++        sqliteVdbeAddOp(v, OP_OpenWrite, iCur+i+1, pIdx->tnum);
++        assert( pParse->nTab>iCur+i+1 );
++      }
++    }
++
++    /* Loop over every record that needs updating.  We have to load
++    ** the old data for each record to be updated because some columns
++    ** might not change and we will need to copy the old value.
++    ** Also, the old data is needed to delete the old index entires.
++    ** So make the cursor point at the old record.
++    */
++    if( !row_triggers_exist ){
++      sqliteVdbeAddOp(v, OP_ListRewind, 0, 0);
++      jumpInst = loopStart = sqliteVdbeAddOp(v, OP_ListRead, 0, 0);
++      sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++    }
++    sqliteVdbeAddOp(v, OP_NotExists, iCur, loopStart);
++
++    /* If the record number will change, push the record number as it
++    ** will be after the update. (The old record number is currently
++    ** on top of the stack.)
++    */
++    if( chngRecno ){
++      sqliteExprCode(pParse, pRecnoExpr);
++      sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0);
++    }
++
++    /* Compute new data for this record.  
++    */
++    for(i=0; i<pTab->nCol; i++){
++      if( i==pTab->iPKey ){
++        sqliteVdbeAddOp(v, OP_String, 0, 0);
++        continue;
++      }
++      j = aXRef[i];
++      if( j<0 ){
++        sqliteVdbeAddOp(v, OP_Column, iCur, i);
++      }else{
++        sqliteExprCode(pParse, pChanges->a[j].pExpr);
++      }
++    }
++
++    /* Do constraint checks
++    */
++    sqliteGenerateConstraintChecks(pParse, pTab, iCur, aIdxUsed, chngRecno, 1,
++                                   onError, loopStart);
++
++    /* Delete the old indices for the current record.
++    */
++    sqliteGenerateRowIndexDelete(db, v, pTab, iCur, aIdxUsed);
++
++    /* If changing the record number, delete the old record.
++    */
++    if( chngRecno ){
++      sqliteVdbeAddOp(v, OP_Delete, iCur, 0);
++    }
++
++    /* Create the new index entries and the new record.
++    */
++    sqliteCompleteInsertion(pParse, pTab, iCur, aIdxUsed, chngRecno, 1, -1);
++  }
++
++  /* Increment the row counter 
++  */
++  if( db->flags & SQLITE_CountRows && !pParse->trigStack){
++    sqliteVdbeAddOp(v, OP_AddImm, 1, 0);
++  }
++
++  /* If there are triggers, close all the cursors after each iteration
++  ** through the loop.  The fire the after triggers.
++  */
++  if( row_triggers_exist ){
++    if( !isView ){
++      for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
++        if( openAll || aIdxUsed[i] )
++          sqliteVdbeAddOp(v, OP_Close, iCur+i+1, 0);
++      }
++      sqliteVdbeAddOp(v, OP_Close, iCur, 0);
++      pParse->nTab = iCur;
++    }
++    if( sqliteCodeRowTrigger(pParse, TK_UPDATE, pChanges, TK_AFTER, pTab, 
++          newIdx, oldIdx, onError, loopStart) ){
++      goto update_cleanup;
++    }
++  }
++
++  /* Repeat the above with the next record to be updated, until
++  ** all record selected by the WHERE clause have been updated.
++  */
++  sqliteVdbeAddOp(v, OP_Goto, 0, loopStart);
++  sqliteVdbeChangeP2(v, jumpInst, sqliteVdbeCurrentAddr(v));
++  sqliteVdbeAddOp(v, OP_ListReset, 0, 0);
++
++  /* Close all tables if there were no FOR EACH ROW triggers */
++  if( !row_triggers_exist ){
++    for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
++      if( openAll || aIdxUsed[i] ){
++        sqliteVdbeAddOp(v, OP_Close, iCur+i+1, 0);
++      }
++    }
++    sqliteVdbeAddOp(v, OP_Close, iCur, 0);
++    pParse->nTab = iCur;
++  }else{
++    sqliteVdbeAddOp(v, OP_Close, newIdx, 0);
++    sqliteVdbeAddOp(v, OP_Close, oldIdx, 0);
++  }
++
++  sqliteVdbeAddOp(v, OP_SetCounts, 0, 0);
++  sqliteEndWriteOperation(pParse);
++
++  /*
++  ** Return the number of rows that were changed.
++  */
++  if( db->flags & SQLITE_CountRows && !pParse->trigStack ){
++    sqliteVdbeOp3(v, OP_ColumnName, 0, 1, "rows updated", P3_STATIC);
++    sqliteVdbeAddOp(v, OP_Callback, 1, 0);
++  }
++
++update_cleanup:
++  sqliteAuthContextPop(&sContext);
++  sqliteFree(apIdx);
++  sqliteFree(aXRef);
++  sqliteSrcListDelete(pTabList);
++  sqliteExprListDelete(pChanges);
++  sqliteExprDelete(pWhere);
++  return;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/util.c
+@@ -0,0 +1,1134 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** Utility functions used throughout sqlite.
++**
++** This file contains functions for allocating memory, comparing
++** strings, and stuff like that.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include <stdarg.h>
++#include <ctype.h>
++
++/*
++** If malloc() ever fails, this global variable gets set to 1.
++** This causes the library to abort and never again function.
++*/
++int sqlite_malloc_failed = 0;
++
++/*
++** If MEMORY_DEBUG is defined, then use versions of malloc() and
++** free() that track memory usage and check for buffer overruns.
++*/
++#ifdef MEMORY_DEBUG
++
++/*
++** For keeping track of the number of mallocs and frees.   This
++** is used to check for memory leaks.
++*/
++int sqlite_nMalloc;         /* Number of sqliteMalloc() calls */
++int sqlite_nFree;           /* Number of sqliteFree() calls */
++int sqlite_iMallocFail;     /* Fail sqliteMalloc() after this many calls */
++#if MEMORY_DEBUG>1
++static int memcnt = 0;
++#endif
++
++/*
++** Number of 32-bit guard words
++*/
++#define N_GUARD 1
++
++/*
++** Allocate new memory and set it to zero.  Return NULL if
++** no memory is available.
++*/
++void *sqliteMalloc_(int n, int bZero, char *zFile, int line){
++  void *p;
++  int *pi;
++  int i, k;
++  if( sqlite_iMallocFail>=0 ){
++    sqlite_iMallocFail--;
++    if( sqlite_iMallocFail==0 ){
++      sqlite_malloc_failed++;
++#if MEMORY_DEBUG>1
++      fprintf(stderr,"**** failed to allocate %d bytes at %s:%d\n",
++              n, zFile,line);
++#endif
++      sqlite_iMallocFail--;
++      return 0;
++    }
++  }
++  if( n==0 ) return 0;
++  k = (n+sizeof(int)-1)/sizeof(int);
++  pi = malloc( (N_GUARD*2+1+k)*sizeof(int));
++  if( pi==0 ){
++    sqlite_malloc_failed++;
++    return 0;
++  }
++  sqlite_nMalloc++;
++  for(i=0; i<N_GUARD; i++) pi[i] = 0xdead1122;
++  pi[N_GUARD] = n;
++  for(i=0; i<N_GUARD; i++) pi[k+1+N_GUARD+i] = 0xdead3344;
++  p = &pi[N_GUARD+1];
++  memset(p, bZero==0, n);
++#if MEMORY_DEBUG>1
++  fprintf(stderr,"%06d malloc %d bytes at 0x%x from %s:%d\n",
++      ++memcnt, n, (int)p, zFile,line);
++#endif
++  return p;
++}
++
++/*
++** Check to see if the given pointer was obtained from sqliteMalloc()
++** and is able to hold at least N bytes.  Raise an exception if this
++** is not the case.
++**
++** This routine is used for testing purposes only.
++*/
++void sqliteCheckMemory(void *p, int N){
++  int *pi = p;
++  int n, i, k;
++  pi -= N_GUARD+1;
++  for(i=0; i<N_GUARD; i++){
++    assert( pi[i]==0xdead1122 );
++  }
++  n = pi[N_GUARD];
++  assert( N>=0 && N<n );
++  k = (n+sizeof(int)-1)/sizeof(int);
++  for(i=0; i<N_GUARD; i++){
++    assert( pi[k+N_GUARD+1+i]==0xdead3344 );
++  }
++}
++
++/*
++** Free memory previously obtained from sqliteMalloc()
++*/
++void sqliteFree_(void *p, char *zFile, int line){
++  if( p ){
++    int *pi, i, k, n;
++    pi = p;
++    pi -= N_GUARD+1;
++    sqlite_nFree++;
++    for(i=0; i<N_GUARD; i++){
++      if( pi[i]!=0xdead1122 ){
++        fprintf(stderr,"Low-end memory corruption at 0x%x\n", (int)p);
++        return;
++      }
++    }
++    n = pi[N_GUARD];
++    k = (n+sizeof(int)-1)/sizeof(int);
++    for(i=0; i<N_GUARD; i++){
++      if( pi[k+N_GUARD+1+i]!=0xdead3344 ){
++        fprintf(stderr,"High-end memory corruption at 0x%x\n", (int)p);
++        return;
++      }
++    }
++    memset(pi, 0xff, (k+N_GUARD*2+1)*sizeof(int));
++#if MEMORY_DEBUG>1
++    fprintf(stderr,"%06d free %d bytes at 0x%x from %s:%d\n",
++         ++memcnt, n, (int)p, zFile,line);
++#endif
++    free(pi);
++  }
++}
++
++/*
++** Resize a prior allocation.  If p==0, then this routine
++** works just like sqliteMalloc().  If n==0, then this routine
++** works just like sqliteFree().
++*/
++void *sqliteRealloc_(void *oldP, int n, char *zFile, int line){
++  int *oldPi, *pi, i, k, oldN, oldK;
++  void *p;
++  if( oldP==0 ){
++    return sqliteMalloc_(n,1,zFile,line);
++  }
++  if( n==0 ){
++    sqliteFree_(oldP,zFile,line);
++    return 0;
++  }
++  oldPi = oldP;
++  oldPi -= N_GUARD+1;
++  if( oldPi[0]!=0xdead1122 ){
++    fprintf(stderr,"Low-end memory corruption in realloc at 0x%x\n", (int)oldP);
++    return 0;
++  }
++  oldN = oldPi[N_GUARD];
++  oldK = (oldN+sizeof(int)-1)/sizeof(int);
++  for(i=0; i<N_GUARD; i++){
++    if( oldPi[oldK+N_GUARD+1+i]!=0xdead3344 ){
++      fprintf(stderr,"High-end memory corruption in realloc at 0x%x\n",
++              (int)oldP);
++      return 0;
++    }
++  }
++  k = (n + sizeof(int) - 1)/sizeof(int);
++  pi = malloc( (k+N_GUARD*2+1)*sizeof(int) );
++  if( pi==0 ){
++    sqlite_malloc_failed++;
++    return 0;
++  }
++  for(i=0; i<N_GUARD; i++) pi[i] = 0xdead1122;
++  pi[N_GUARD] = n;
++  for(i=0; i<N_GUARD; i++) pi[k+N_GUARD+1+i] = 0xdead3344;
++  p = &pi[N_GUARD+1];
++  memcpy(p, oldP, n>oldN ? oldN : n);
++  if( n>oldN ){
++    memset(&((char*)p)[oldN], 0, n-oldN);
++  }
++  memset(oldPi, 0xab, (oldK+N_GUARD+2)*sizeof(int));
++  free(oldPi);
++#if MEMORY_DEBUG>1
++  fprintf(stderr,"%06d realloc %d to %d bytes at 0x%x to 0x%x at %s:%d\n",
++    ++memcnt, oldN, n, (int)oldP, (int)p, zFile, line);
++#endif
++  return p;
++}
++
++/*
++** Make a duplicate of a string into memory obtained from malloc()
++** Free the original string using sqliteFree().
++**
++** This routine is called on all strings that are passed outside of
++** the SQLite library.  That way clients can free the string using free()
++** rather than having to call sqliteFree().
++*/
++void sqliteStrRealloc(char **pz){
++  char *zNew;
++  if( pz==0 || *pz==0 ) return;
++  zNew = malloc( strlen(*pz) + 1 );
++  if( zNew==0 ){
++    sqlite_malloc_failed++;
++    sqliteFree(*pz);
++    *pz = 0;
++  }
++  strcpy(zNew, *pz);
++  sqliteFree(*pz);
++  *pz = zNew;
++}
++
++/*
++** Make a copy of a string in memory obtained from sqliteMalloc()
++*/
++char *sqliteStrDup_(const char *z, char *zFile, int line){
++  char *zNew;
++  if( z==0 ) return 0;
++  zNew = sqliteMalloc_(strlen(z)+1, 0, zFile, line);
++  if( zNew ) strcpy(zNew, z);
++  return zNew;
++}
++char *sqliteStrNDup_(const char *z, int n, char *zFile, int line){
++  char *zNew;
++  if( z==0 ) return 0;
++  zNew = sqliteMalloc_(n+1, 0, zFile, line);
++  if( zNew ){
++    memcpy(zNew, z, n);
++    zNew[n] = 0;
++  }
++  return zNew;
++}
++#endif /* MEMORY_DEBUG */
++
++/*
++** The following versions of malloc() and free() are for use in a
++** normal build.
++*/
++#if !defined(MEMORY_DEBUG)
++
++/*
++** Allocate new memory and set it to zero.  Return NULL if
++** no memory is available.  See also sqliteMallocRaw().
++*/
++void *sqliteMalloc(int n){
++  void *p;
++  if( (p = malloc(n))==0 ){
++    if( n>0 ) sqlite_malloc_failed++;
++  }else{
++    memset(p, 0, n);
++  }
++  return p;
++}
++
++/*
++** Allocate new memory but do not set it to zero.  Return NULL if
++** no memory is available.  See also sqliteMalloc().
++*/
++void *sqliteMallocRaw(int n){
++  void *p;
++  if( (p = malloc(n))==0 ){
++    if( n>0 ) sqlite_malloc_failed++;
++  }
++  return p;
++}
++
++/*
++** Free memory previously obtained from sqliteMalloc()
++*/
++void sqliteFree(void *p){
++  if( p ){
++    free(p);
++  }
++}
++
++/*
++** Resize a prior allocation.  If p==0, then this routine
++** works just like sqliteMalloc().  If n==0, then this routine
++** works just like sqliteFree().
++*/
++void *sqliteRealloc(void *p, int n){
++  void *p2;
++  if( p==0 ){
++    return sqliteMalloc(n);
++  }
++  if( n==0 ){
++    sqliteFree(p);
++    return 0;
++  }
++  p2 = realloc(p, n);
++  if( p2==0 ){
++    sqlite_malloc_failed++;
++  }
++  return p2;
++}
++
++/*
++** Make a copy of a string in memory obtained from sqliteMalloc()
++*/
++char *sqliteStrDup(const char *z){
++  char *zNew;
++  if( z==0 ) return 0;
++  zNew = sqliteMallocRaw(strlen(z)+1);
++  if( zNew ) strcpy(zNew, z);
++  return zNew;
++}
++char *sqliteStrNDup(const char *z, int n){
++  char *zNew;
++  if( z==0 ) return 0;
++  zNew = sqliteMallocRaw(n+1);
++  if( zNew ){
++    memcpy(zNew, z, n);
++    zNew[n] = 0;
++  }
++  return zNew;
++}
++#endif /* !defined(MEMORY_DEBUG) */
++
++/*
++** Create a string from the 2nd and subsequent arguments (up to the
++** first NULL argument), store the string in memory obtained from
++** sqliteMalloc() and make the pointer indicated by the 1st argument
++** point to that string.  The 1st argument must either be NULL or 
++** point to memory obtained from sqliteMalloc().
++*/
++void sqliteSetString(char **pz, ...){
++  va_list ap;
++  int nByte;
++  const char *z;
++  char *zResult;
++
++  if( pz==0 ) return;
++  nByte = 1;
++  va_start(ap, pz);
++  while( (z = va_arg(ap, const char*))!=0 ){
++    nByte += strlen(z);
++  }
++  va_end(ap);
++  sqliteFree(*pz);
++  *pz = zResult = sqliteMallocRaw( nByte );
++  if( zResult==0 ){
++    return;
++  }
++  *zResult = 0;
++  va_start(ap, pz);
++  while( (z = va_arg(ap, const char*))!=0 ){
++    strcpy(zResult, z);
++    zResult += strlen(zResult);
++  }
++  va_end(ap);
++#ifdef MEMORY_DEBUG
++#if MEMORY_DEBUG>1
++  fprintf(stderr,"string at 0x%x is %s\n", (int)*pz, *pz);
++#endif
++#endif
++}
++
++/*
++** Works like sqliteSetString, but each string is now followed by
++** a length integer which specifies how much of the source string 
++** to copy (in bytes).  -1 means use the whole string.  The 1st 
++** argument must either be NULL or point to memory obtained from 
++** sqliteMalloc().
++*/
++void sqliteSetNString(char **pz, ...){
++  va_list ap;
++  int nByte;
++  const char *z;
++  char *zResult;
++  int n;
++
++  if( pz==0 ) return;
++  nByte = 0;
++  va_start(ap, pz);
++  while( (z = va_arg(ap, const char*))!=0 ){
++    n = va_arg(ap, int);
++    if( n<=0 ) n = strlen(z);
++    nByte += n;
++  }
++  va_end(ap);
++  sqliteFree(*pz);
++  *pz = zResult = sqliteMallocRaw( nByte + 1 );
++  if( zResult==0 ) return;
++  va_start(ap, pz);
++  while( (z = va_arg(ap, const char*))!=0 ){
++    n = va_arg(ap, int);
++    if( n<=0 ) n = strlen(z);
++    strncpy(zResult, z, n);
++    zResult += n;
++  }
++  *zResult = 0;
++#ifdef MEMORY_DEBUG
++#if MEMORY_DEBUG>1
++  fprintf(stderr,"string at 0x%x is %s\n", (int)*pz, *pz);
++#endif
++#endif
++  va_end(ap);
++}
++
++/*
++** Add an error message to pParse->zErrMsg and increment pParse->nErr.
++** The following formatting characters are allowed:
++**
++**      %s      Insert a string
++**      %z      A string that should be freed after use
++**      %d      Insert an integer
++**      %T      Insert a token
++**      %S      Insert the first element of a SrcList
++*/
++void sqliteErrorMsg(Parse *pParse, const char *zFormat, ...){
++  va_list ap;
++  pParse->nErr++;
++  sqliteFree(pParse->zErrMsg);
++  va_start(ap, zFormat);
++  pParse->zErrMsg = sqliteVMPrintf(zFormat, ap);
++  va_end(ap);
++}
++
++/*
++** Convert an SQL-style quoted string into a normal string by removing
++** the quote characters.  The conversion is done in-place.  If the
++** input does not begin with a quote character, then this routine
++** is a no-op.
++**
++** 2002-Feb-14: This routine is extended to remove MS-Access style
++** brackets from around identifers.  For example:  "[a-b-c]" becomes
++** "a-b-c".
++*/
++void sqliteDequote(char *z){
++  int quote;
++  int i, j;
++  if( z==0 ) return;
++  quote = z[0];
++  switch( quote ){
++    case '\'':  break;
++    case '"':   break;
++    case '[':   quote = ']';  break;
++    default:    return;
++  }
++  for(i=1, j=0; z[i]; i++){
++    if( z[i]==quote ){
++      if( z[i+1]==quote ){
++        z[j++] = quote;
++        i++;
++      }else{
++        z[j++] = 0;
++        break;
++      }
++    }else{
++      z[j++] = z[i];
++    }
++  }
++}
++
++/* An array to map all upper-case characters into their corresponding
++** lower-case character. 
++*/
++static unsigned char UpperToLower[] = {
++      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17,
++     18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
++     36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
++     54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 97, 98, 99,100,101,102,103,
++    104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,
++    122, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,103,104,105,106,107,
++    108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,
++    126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
++    144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,
++    162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,
++    180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,
++    198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,
++    216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,
++    234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,
++    252,253,254,255
++};
++
++/*
++** This function computes a hash on the name of a keyword.
++** Case is not significant.
++*/
++int sqliteHashNoCase(const char *z, int n){
++  int h = 0;
++  if( n<=0 ) n = strlen(z);
++  while( n > 0  ){
++    h = (h<<3) ^ h ^ UpperToLower[(unsigned char)*z++];
++    n--;
++  }
++  return h & 0x7fffffff;
++}
++
++/*
++** Some systems have stricmp().  Others have strcasecmp().  Because
++** there is no consistency, we will define our own.
++*/
++int sqliteStrICmp(const char *zLeft, const char *zRight){
++  register unsigned char *a, *b;
++  a = (unsigned char *)zLeft;
++  b = (unsigned char *)zRight;
++  while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
++  return UpperToLower[*a] - UpperToLower[*b];
++}
++int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){
++  register unsigned char *a, *b;
++  a = (unsigned char *)zLeft;
++  b = (unsigned char *)zRight;
++  while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
++  return N<0 ? 0 : UpperToLower[*a] - UpperToLower[*b];
++}
++
++/*
++** Return TRUE if z is a pure numeric string.  Return FALSE if the
++** string contains any character which is not part of a number.
++**
++** Am empty string is considered non-numeric.
++*/
++int sqliteIsNumber(const char *z){
++  if( *z=='-' || *z=='+' ) z++;
++  if( !isdigit(*z) ){
++    return 0;
++  }
++  z++;
++  while( isdigit(*z) ){ z++; }
++  if( *z=='.' ){
++    z++;
++    if( !isdigit(*z) ) return 0;
++    while( isdigit(*z) ){ z++; }
++  }
++  if( *z=='e' || *z=='E' ){
++    z++;
++    if( *z=='+' || *z=='-' ) z++;
++    if( !isdigit(*z) ) return 0;
++    while( isdigit(*z) ){ z++; }
++  }
++  return *z==0;
++}
++
++/*
++** The string z[] is an ascii representation of a real number.
++** Convert this string to a double.
++**
++** This routine assumes that z[] really is a valid number.  If it
++** is not, the result is undefined.
++**
++** This routine is used instead of the library atof() function because
++** the library atof() might want to use "," as the decimal point instead
++** of "." depending on how locale is set.  But that would cause problems
++** for SQL.  So this routine always uses "." regardless of locale.
++*/
++double sqliteAtoF(const char *z, const char **pzEnd){
++  int sign = 1;
++  LONGDOUBLE_TYPE v1 = 0.0;
++  if( *z=='-' ){
++    sign = -1;
++    z++;
++  }else if( *z=='+' ){
++    z++;
++  }
++  while( isdigit(*z) ){
++    v1 = v1*10.0 + (*z - '0');
++    z++;
++  }
++  if( *z=='.' ){
++    LONGDOUBLE_TYPE divisor = 1.0;
++    z++;
++    while( isdigit(*z) ){
++      v1 = v1*10.0 + (*z - '0');
++      divisor *= 10.0;
++      z++;
++    }
++    v1 /= divisor;
++  }
++  if( *z=='e' || *z=='E' ){
++    int esign = 1;
++    int eval = 0;
++    LONGDOUBLE_TYPE scale = 1.0;
++    z++;
++    if( *z=='-' ){
++      esign = -1;
++      z++;
++    }else if( *z=='+' ){
++      z++;
++    }
++    while( isdigit(*z) ){
++      eval = eval*10 + *z - '0';
++      z++;
++    }
++    while( eval>=64 ){ scale *= 1.0e+64; eval -= 64; }
++    while( eval>=16 ){ scale *= 1.0e+16; eval -= 16; }
++    while( eval>=4 ){ scale *= 1.0e+4; eval -= 4; }
++    while( eval>=1 ){ scale *= 1.0e+1; eval -= 1; }
++    if( esign<0 ){
++      v1 /= scale;
++    }else{
++      v1 *= scale;
++    }
++  }
++  if( pzEnd ) *pzEnd = z;
++  return sign<0 ? -v1 : v1;
++}
++
++/*
++** The string zNum represents an integer.  There might be some other
++** information following the integer too, but that part is ignored.
++** If the integer that the prefix of zNum represents will fit in a
++** 32-bit signed integer, return TRUE.  Otherwise return FALSE.
++**
++** This routine returns FALSE for the string -2147483648 even that
++** that number will, in theory fit in a 32-bit integer.  But positive
++** 2147483648 will not fit in 32 bits.  So it seems safer to return
++** false.
++*/
++int sqliteFitsIn32Bits(const char *zNum){
++  int i, c;
++  if( *zNum=='-' || *zNum=='+' ) zNum++;
++  for(i=0; (c=zNum[i])>='0' && c<='9'; i++){}
++  return i<10 || (i==10 && memcmp(zNum,"2147483647",10)<=0);
++}
++
++/* This comparison routine is what we use for comparison operations
++** between numeric values in an SQL expression.  "Numeric" is a little
++** bit misleading here.  What we mean is that the strings have a
++** type of "numeric" from the point of view of SQL.  The strings
++** do not necessarily contain numbers.  They could contain text.
++**
++** If the input strings both look like actual numbers then they
++** compare in numerical order.  Numerical strings are always less 
++** than non-numeric strings so if one input string looks like a
++** number and the other does not, then the one that looks like
++** a number is the smaller.  Non-numeric strings compare in 
++** lexigraphical order (the same order as strcmp()).
++*/
++int sqliteCompare(const char *atext, const char *btext){
++  int result;
++  int isNumA, isNumB;
++  if( atext==0 ){
++    return -1;
++  }else if( btext==0 ){
++    return 1;
++  }
++  isNumA = sqliteIsNumber(atext);
++  isNumB = sqliteIsNumber(btext);
++  if( isNumA ){
++    if( !isNumB ){
++      result = -1;
++    }else{
++      double rA, rB;
++      rA = sqliteAtoF(atext, 0);
++      rB = sqliteAtoF(btext, 0);
++      if( rA<rB ){
++        result = -1;
++      }else if( rA>rB ){
++        result = +1;
++      }else{
++        result = 0;
++      }
++    }
++  }else if( isNumB ){
++    result = +1;
++  }else {
++    result = strcmp(atext, btext);
++  }
++  return result; 
++}
++
++/*
++** This routine is used for sorting.  Each key is a list of one or more
++** null-terminated elements.  The list is terminated by two nulls in
++** a row.  For example, the following text is a key with three elements
++**
++**            Aone\000Dtwo\000Athree\000\000
++**
++** All elements begin with one of the characters "+-AD" and end with "\000"
++** with zero or more text elements in between.  Except, NULL elements
++** consist of the special two-character sequence "N\000".
++**
++** Both arguments will have the same number of elements.  This routine
++** returns negative, zero, or positive if the first argument is less
++** than, equal to, or greater than the first.  (Result is a-b).
++**
++** Each element begins with one of the characters "+", "-", "A", "D".
++** This character determines the sort order and collating sequence:
++**
++**     +      Sort numerically in ascending order
++**     -      Sort numerically in descending order
++**     A      Sort as strings in ascending order
++**     D      Sort as strings in descending order.
++**
++** For the "+" and "-" sorting, pure numeric strings (strings for which the
++** isNum() function above returns TRUE) always compare less than strings
++** that are not pure numerics.  Non-numeric strings compare in memcmp()
++** order.  This is the same sort order as the sqliteCompare() function
++** above generates.
++**
++** The last point is a change from version 2.6.3 to version 2.7.0.  In
++** version 2.6.3 and earlier, substrings of digits compare in numerical 
++** and case was used only to break a tie.
++**
++** Elements that begin with 'A' or 'D' compare in memcmp() order regardless
++** of whether or not they look like a number.
++**
++** Note that the sort order imposed by the rules above is the same
++** from the ordering defined by the "<", "<=", ">", and ">=" operators
++** of expressions and for indices.  This was not the case for version
++** 2.6.3 and earlier.
++*/
++int sqliteSortCompare(const char *a, const char *b){
++  int res = 0;
++  int isNumA, isNumB;
++  int dir = 0;
++
++  while( res==0 && *a && *b ){
++    if( a[0]=='N' || b[0]=='N' ){
++      if( a[0]==b[0] ){
++        a += 2;
++        b += 2;
++        continue;
++      }
++      if( a[0]=='N' ){
++        dir = b[0];
++        res = -1;
++      }else{
++        dir = a[0];
++        res = +1;
++      }
++      break;
++    }
++    assert( a[0]==b[0] );
++    if( (dir=a[0])=='A' || a[0]=='D' ){
++      res = strcmp(&a[1],&b[1]);
++      if( res ) break;
++    }else{
++      isNumA = sqliteIsNumber(&a[1]);
++      isNumB = sqliteIsNumber(&b[1]);
++      if( isNumA ){
++        double rA, rB;
++        if( !isNumB ){
++          res = -1;
++          break;
++        }
++        rA = sqliteAtoF(&a[1], 0);
++        rB = sqliteAtoF(&b[1], 0);
++        if( rA<rB ){
++          res = -1;
++          break;
++        }
++        if( rA>rB ){
++          res = +1;
++          break;
++        }
++      }else if( isNumB ){
++        res = +1;
++        break;
++      }else{
++        res = strcmp(&a[1],&b[1]);
++        if( res ) break;
++      }
++    }
++    a += strlen(&a[1]) + 2;
++    b += strlen(&b[1]) + 2;
++  }
++  if( dir=='-' || dir=='D' ) res = -res;
++  return res;
++}
++
++/*
++** Some powers of 64.  These constants are needed in the
++** sqliteRealToSortable() routine below.
++*/
++#define _64e3  (64.0 * 64.0 * 64.0)
++#define _64e4  (64.0 * 64.0 * 64.0 * 64.0)
++#define _64e15 (_64e3 * _64e4 * _64e4 * _64e4)
++#define _64e16 (_64e4 * _64e4 * _64e4 * _64e4)
++#define _64e63 (_64e15 * _64e16 * _64e16 * _64e16)
++#define _64e64 (_64e16 * _64e16 * _64e16 * _64e16)
++
++/*
++** The following procedure converts a double-precision floating point
++** number into a string.  The resulting string has the property that
++** two such strings comparied using strcmp() or memcmp() will give the
++** same results as a numeric comparison of the original floating point
++** numbers.
++**
++** This routine is used to generate database keys from floating point
++** numbers such that the keys sort in the same order as the original
++** floating point numbers even though the keys are compared using
++** memcmp().
++**
++** The calling function should have allocated at least 14 characters
++** of space for the buffer z[].
++*/
++void sqliteRealToSortable(double r, char *z){
++  int neg;
++  int exp;
++  int cnt = 0;
++
++  /* This array maps integers between 0 and 63 into base-64 digits.
++  ** The digits must be chosen such at their ASCII codes are increasing.
++  ** This means we can not use the traditional base-64 digit set. */
++  static const char zDigit[] = 
++     "0123456789"
++     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
++     "abcdefghijklmnopqrstuvwxyz"
++     "|~";
++  if( r<0.0 ){
++    neg = 1;
++    r = -r;
++    *z++ = '-';
++  } else {
++    neg = 0;
++    *z++ = '0';
++  }
++  exp = 0;
++
++  if( r==0.0 ){
++    exp = -1024;
++  }else if( r<(0.5/64.0) ){
++    while( r < 0.5/_64e64 && exp > -961  ){ r *= _64e64;  exp -= 64; }
++    while( r < 0.5/_64e16 && exp > -1009 ){ r *= _64e16;  exp -= 16; }
++    while( r < 0.5/_64e4  && exp > -1021 ){ r *= _64e4;   exp -= 4; }
++    while( r < 0.5/64.0   && exp > -1024 ){ r *= 64.0;    exp -= 1; }
++  }else if( r>=0.5 ){
++    while( r >= 0.5*_64e63 && exp < 960  ){ r *= 1.0/_64e64; exp += 64; }
++    while( r >= 0.5*_64e15 && exp < 1008 ){ r *= 1.0/_64e16; exp += 16; }
++    while( r >= 0.5*_64e3  && exp < 1020 ){ r *= 1.0/_64e4;  exp += 4; }
++    while( r >= 0.5        && exp < 1023 ){ r *= 1.0/64.0;   exp += 1; }
++  }
++  if( neg ){
++    exp = -exp;
++    r = -r;
++  }
++  exp += 1024;
++  r += 0.5;
++  if( exp<0 ) return;
++  if( exp>=2048 || r>=1.0 ){
++    strcpy(z, "~~~~~~~~~~~~");
++    return;
++  }
++  *z++ = zDigit[(exp>>6)&0x3f];
++  *z++ = zDigit[exp & 0x3f];
++  while( r>0.0 && cnt<10 ){
++    int digit;
++    r *= 64.0;
++    digit = (int)r;
++    assert( digit>=0 && digit<64 );
++    *z++ = zDigit[digit & 0x3f];
++    r -= digit;
++    cnt++;
++  }
++  *z = 0;
++}
++
++#ifdef SQLITE_UTF8
++/*
++** X is a pointer to the first byte of a UTF-8 character.  Increment
++** X so that it points to the next character.  This only works right
++** if X points to a well-formed UTF-8 string.
++*/
++#define sqliteNextChar(X)  while( (0xc0&*++(X))==0x80 ){}
++#define sqliteCharVal(X)   sqlite_utf8_to_int(X)
++
++#else /* !defined(SQLITE_UTF8) */
++/*
++** For iso8859 encoding, the next character is just the next byte.
++*/
++#define sqliteNextChar(X)  (++(X));
++#define sqliteCharVal(X)   ((int)*(X))
++
++#endif /* defined(SQLITE_UTF8) */
++
++
++#ifdef SQLITE_UTF8
++/*
++** Convert the UTF-8 character to which z points into a 31-bit
++** UCS character.  This only works right if z points to a well-formed
++** UTF-8 string.
++*/
++static int sqlite_utf8_to_int(const unsigned char *z){
++  int c;
++  static const int initVal[] = {
++      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
++     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
++     30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
++     45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
++     60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
++     75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
++     90,  91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104,
++    105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
++    120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
++    135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
++    150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
++    165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
++    180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,   0,   1,   2,
++      3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,  16,  17,
++     18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,   0,
++      1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
++      0,   1,   2,   3,   4,   5,   6,   7,   0,   1,   2,   3,   0,   1, 254,
++    255,
++  };
++  c = initVal[*(z++)];
++  while( (0xc0&*z)==0x80 ){
++    c = (c<<6) | (0x3f&*(z++));
++  }
++  return c;
++}
++#endif
++
++/*
++** Compare two UTF-8 strings for equality where the first string can
++** potentially be a "glob" expression.  Return true (1) if they
++** are the same and false (0) if they are different.
++**
++** Globbing rules:
++**
++**      '*'       Matches any sequence of zero or more characters.
++**
++**      '?'       Matches exactly one character.
++**
++**     [...]      Matches one character from the enclosed list of
++**                characters.
++**
++**     [^...]     Matches one character not in the enclosed list.
++**
++** With the [...] and [^...] matching, a ']' character can be included
++** in the list by making it the first character after '[' or '^'.  A
++** range of characters can be specified using '-'.  Example:
++** "[a-z]" matches any single lower-case letter.  To match a '-', make
++** it the last character in the list.
++**
++** This routine is usually quick, but can be N**2 in the worst case.
++**
++** Hints: to match '*' or '?', put them in "[]".  Like this:
++**
++**         abc[*]xyz        Matches "abc*xyz" only
++*/
++int 
++sqliteGlobCompare(const unsigned char *zPattern, const unsigned char *zString){
++  register int c;
++  int invert;
++  int seen;
++  int c2;
++
++  while( (c = *zPattern)!=0 ){
++    switch( c ){
++      case '*':
++        while( (c=zPattern[1]) == '*' || c == '?' ){
++          if( c=='?' ){
++            if( *zString==0 ) return 0;
++            sqliteNextChar(zString);
++          }
++          zPattern++;
++        }
++        if( c==0 ) return 1;
++        if( c=='[' ){
++          while( *zString && sqliteGlobCompare(&zPattern[1],zString)==0 ){
++            sqliteNextChar(zString);
++          }
++          return *zString!=0;
++        }else{
++          while( (c2 = *zString)!=0 ){
++            while( c2 != 0 && c2 != c ){ c2 = *++zString; }
++            if( c2==0 ) return 0;
++            if( sqliteGlobCompare(&zPattern[1],zString) ) return 1;
++            sqliteNextChar(zString);
++          }
++          return 0;
++        }
++      case '?': {
++        if( *zString==0 ) return 0;
++        sqliteNextChar(zString);
++        zPattern++;
++        break;
++      }
++      case '[': {
++        int prior_c = 0;
++        seen = 0;
++        invert = 0;
++        c = sqliteCharVal(zString);
++        if( c==0 ) return 0;
++        c2 = *++zPattern;
++        if( c2=='^' ){ invert = 1; c2 = *++zPattern; }
++        if( c2==']' ){
++          if( c==']' ) seen = 1;
++          c2 = *++zPattern;
++        }
++        while( (c2 = sqliteCharVal(zPattern))!=0 && c2!=']' ){
++          if( c2=='-' && zPattern[1]!=']' && zPattern[1]!=0 && prior_c>0 ){
++            zPattern++;
++            c2 = sqliteCharVal(zPattern);
++            if( c>=prior_c && c<=c2 ) seen = 1;
++            prior_c = 0;
++          }else if( c==c2 ){
++            seen = 1;
++            prior_c = c2;
++          }else{
++            prior_c = c2;
++          }
++          sqliteNextChar(zPattern);
++        }
++        if( c2==0 || (seen ^ invert)==0 ) return 0;
++        sqliteNextChar(zString);
++        zPattern++;
++        break;
++      }
++      default: {
++        if( c != *zString ) return 0;
++        zPattern++;
++        zString++;
++        break;
++      }
++    }
++  }
++  return *zString==0;
++}
++
++/*
++** Compare two UTF-8 strings for equality using the "LIKE" operator of
++** SQL.  The '%' character matches any sequence of 0 or more
++** characters and '_' matches any single character.  Case is
++** not significant.
++**
++** This routine is just an adaptation of the sqliteGlobCompare()
++** routine above.
++*/
++int 
++sqliteLikeCompare(const unsigned char *zPattern, const unsigned char *zString){
++  register int c;
++  int c2;
++
++  while( (c = UpperToLower[*zPattern])!=0 ){
++    switch( c ){
++      case '%': {
++        while( (c=zPattern[1]) == '%' || c == '_' ){
++          if( c=='_' ){
++            if( *zString==0 ) return 0;
++            sqliteNextChar(zString);
++          }
++          zPattern++;
++        }
++        if( c==0 ) return 1;
++        c = UpperToLower[c];
++        while( (c2=UpperToLower[*zString])!=0 ){
++          while( c2 != 0 && c2 != c ){ c2 = UpperToLower[*++zString]; }
++          if( c2==0 ) return 0;
++          if( sqliteLikeCompare(&zPattern[1],zString) ) return 1;
++          sqliteNextChar(zString);
++        }
++        return 0;
++      }
++      case '_': {
++        if( *zString==0 ) return 0;
++        sqliteNextChar(zString);
++        zPattern++;
++        break;
++      }
++      default: {
++        if( c != UpperToLower[*zString] ) return 0;
++        zPattern++;
++        zString++;
++        break;
++      }
++    }
++  }
++  return *zString==0;
++}
++
++/*
++** Change the sqlite.magic from SQLITE_MAGIC_OPEN to SQLITE_MAGIC_BUSY.
++** Return an error (non-zero) if the magic was not SQLITE_MAGIC_OPEN
++** when this routine is called.
++**
++** This routine is a attempt to detect if two threads use the
++** same sqlite* pointer at the same time.  There is a race 
++** condition so it is possible that the error is not detected.
++** But usually the problem will be seen.  The result will be an
++** error which can be used to debug the application that is
++** using SQLite incorrectly.
++**
++** Ticket #202:  If db->magic is not a valid open value, take care not
++** to modify the db structure at all.  It could be that db is a stale
++** pointer.  In other words, it could be that there has been a prior
++** call to sqlite_close(db) and db has been deallocated.  And we do
++** not want to write into deallocated memory.
++*/
++int sqliteSafetyOn(sqlite *db){
++  if( db->magic==SQLITE_MAGIC_OPEN ){
++    db->magic = SQLITE_MAGIC_BUSY;
++    return 0;
++  }else if( db->magic==SQLITE_MAGIC_BUSY || db->magic==SQLITE_MAGIC_ERROR
++             || db->want_to_close ){
++    db->magic = SQLITE_MAGIC_ERROR;
++    db->flags |= SQLITE_Interrupt;
++  }
++  return 1;
++}
++
++/*
++** Change the magic from SQLITE_MAGIC_BUSY to SQLITE_MAGIC_OPEN.
++** Return an error (non-zero) if the magic was not SQLITE_MAGIC_BUSY
++** when this routine is called.
++*/
++int sqliteSafetyOff(sqlite *db){
++  if( db->magic==SQLITE_MAGIC_BUSY ){
++    db->magic = SQLITE_MAGIC_OPEN;
++    return 0;
++  }else if( db->magic==SQLITE_MAGIC_OPEN || db->magic==SQLITE_MAGIC_ERROR
++             || db->want_to_close ){
++    db->magic = SQLITE_MAGIC_ERROR;
++    db->flags |= SQLITE_Interrupt;
++  }
++  return 1;
++}
++
++/*
++** Check to make sure we are not currently executing an sqlite_exec().
++** If we are currently in an sqlite_exec(), return true and set
++** sqlite.magic to SQLITE_MAGIC_ERROR.  This will cause a complete
++** shutdown of the database.
++**
++** This routine is used to try to detect when API routines are called
++** at the wrong time or in the wrong sequence.
++*/
++int sqliteSafetyCheck(sqlite *db){
++  if( db->pVdbe!=0 ){
++    db->magic = SQLITE_MAGIC_ERROR;
++    return 1;
++  }
++  return 0;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/vacuum.c
+@@ -0,0 +1,305 @@
++/*
++** 2003 April 6
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code used to implement the VACUUM command.
++**
++** Most of the code in this file may be omitted by defining the
++** SQLITE_OMIT_VACUUM macro.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include "os.h"
++
++/*
++** A structure for holding a dynamic string - a string that can grow
++** without bound. 
++*/
++typedef struct dynStr dynStr;
++struct dynStr {
++  char *z;        /* Text of the string in space obtained from sqliteMalloc() */
++  int nAlloc;     /* Amount of space allocated to z[] */
++  int nUsed;      /* Next unused slot in z[] */
++};
++
++/*
++** A structure that holds the vacuum context
++*/
++typedef struct vacuumStruct vacuumStruct;
++struct vacuumStruct {
++  sqlite *dbOld;       /* Original database */
++  sqlite *dbNew;       /* New database */
++  char **pzErrMsg;     /* Write errors here */
++  int rc;              /* Set to non-zero on an error */
++  const char *zTable;  /* Name of a table being copied */
++  const char *zPragma; /* Pragma to execute with results */
++  dynStr s1, s2;       /* Two dynamic strings */
++};
++
++#if !defined(SQLITE_OMIT_VACUUM) || SQLITE_OMIT_VACUUM
++/*
++** Append text to a dynamic string
++*/
++static void appendText(dynStr *p, const char *zText, int nText){
++  if( nText<0 ) nText = strlen(zText);
++  if( p->z==0 || p->nUsed + nText + 1 >= p->nAlloc ){
++    char *zNew;
++    p->nAlloc = p->nUsed + nText + 1000;
++    zNew = sqliteRealloc(p->z, p->nAlloc);
++    if( zNew==0 ){
++      sqliteFree(p->z);
++      memset(p, 0, sizeof(*p));
++      return;
++    }
++    p->z = zNew;
++  }
++  memcpy(&p->z[p->nUsed], zText, nText+1);
++  p->nUsed += nText;
++}
++
++/*
++** Append text to a dynamic string, having first put the text in quotes.
++*/
++static void appendQuoted(dynStr *p, const char *zText){
++  int i, j;
++  appendText(p, "'", 1);
++  for(i=j=0; zText[i]; i++){
++    if( zText[i]=='\'' ){
++      appendText(p, &zText[j], i-j+1);
++      j = i + 1;
++      appendText(p, "'", 1);
++    }
++  }
++  if( j<i ){
++    appendText(p, &zText[j], i-j);
++  }
++  appendText(p, "'", 1);
++}
++
++/*
++** Execute statements of SQL.  If an error occurs, write the error
++** message into *pzErrMsg and return non-zero.
++*/
++static int execsql(char **pzErrMsg, sqlite *db, const char *zSql){ 
++  char *zErrMsg = 0;
++  int rc;
++
++  /* printf("***** executing *****\n%s\n", zSql); */
++  rc = sqlite_exec(db, zSql, 0, 0, &zErrMsg);
++  if( zErrMsg ){
++    sqliteSetString(pzErrMsg, zErrMsg, (char*)0);
++    sqlite_freemem(zErrMsg);
++  }
++  return rc;
++}
++
++/*
++** This is the second stage callback.  Each invocation contains all the
++** data for a single row of a single table in the original database.  This
++** routine must write that information into the new database.
++*/
++static int vacuumCallback2(void *pArg, int argc, char **argv, char **NotUsed){
++  vacuumStruct *p = (vacuumStruct*)pArg;
++  const char *zSep = "(";
++  int i;
++
++  if( argv==0 ) return 0;
++  p->s2.nUsed = 0;
++  appendText(&p->s2, "INSERT INTO ", -1);
++  appendQuoted(&p->s2, p->zTable);
++  appendText(&p->s2, " VALUES", -1);
++  for(i=0; i<argc; i++){
++    appendText(&p->s2, zSep, 1);
++    zSep = ",";
++    if( argv[i]==0 ){
++      appendText(&p->s2, "NULL", 4);
++    }else{
++      appendQuoted(&p->s2, argv[i]);
++    }
++  }
++  appendText(&p->s2,")", 1);
++  p->rc = execsql(p->pzErrMsg, p->dbNew, p->s2.z);
++  return p->rc;
++}
++
++/*
++** This is the first stage callback.  Each invocation contains three
++** arguments where are taken from the SQLITE_MASTER table of the original
++** database:  (1) the entry type, (2) the entry name, and (3) the SQL for
++** the entry.  In all cases, execute the SQL of the third argument.
++** For tables, run a query to select all entries in that table and 
++** transfer them to the second-stage callback.
++*/
++static int vacuumCallback1(void *pArg, int argc, char **argv, char **NotUsed){
++  vacuumStruct *p = (vacuumStruct*)pArg;
++  int rc = 0;
++  assert( argc==3 );
++  if( argv==0 ) return 0;
++  assert( argv[0]!=0 );
++  assert( argv[1]!=0 );
++  assert( argv[2]!=0 );
++  rc = execsql(p->pzErrMsg, p->dbNew, argv[2]);
++  if( rc==SQLITE_OK && strcmp(argv[0],"table")==0 ){
++    char *zErrMsg = 0;
++    p->s1.nUsed = 0;
++    appendText(&p->s1, "SELECT * FROM ", -1);
++    appendQuoted(&p->s1, argv[1]);
++    p->zTable = argv[1];
++    rc = sqlite_exec(p->dbOld, p->s1.z, vacuumCallback2, p, &zErrMsg);
++    if( zErrMsg ){
++      sqliteSetString(p->pzErrMsg, zErrMsg, (char*)0);
++      sqlite_freemem(zErrMsg);
++    }
++  }
++  if( rc!=SQLITE_ABORT ) p->rc = rc;
++  return rc;
++}
++
++/*
++** Generate a random name of 20 character in length.
++*/
++static void randomName(unsigned char *zBuf){
++  static const unsigned char zChars[] =
++    "abcdefghijklmnopqrstuvwxyz"
++    "0123456789";
++  int i;
++  sqliteRandomness(20, zBuf);
++  for(i=0; i<20; i++){
++    zBuf[i] = zChars[ zBuf[i]%(sizeof(zChars)-1) ];
++  }
++}
++#endif
++
++/*
++** The non-standard VACUUM command is used to clean up the database,
++** collapse free space, etc.  It is modelled after the VACUUM command
++** in PostgreSQL.
++**
++** In version 1.0.x of SQLite, the VACUUM command would call
++** gdbm_reorganize() on all the database tables.  But beginning
++** with 2.0.0, SQLite no longer uses GDBM so this command has
++** become a no-op.
++*/
++void sqliteVacuum(Parse *pParse, Token *pTableName){
++  Vdbe *v = sqliteGetVdbe(pParse);
++  sqliteVdbeAddOp(v, OP_Vacuum, 0, 0);
++  return;
++}
++
++/*
++** This routine implements the OP_Vacuum opcode of the VDBE.
++*/
++int sqliteRunVacuum(char **pzErrMsg, sqlite *db){
++#if !defined(SQLITE_OMIT_VACUUM) || SQLITE_OMIT_VACUUM
++  const char *zFilename;  /* full pathname of the database file */
++  int nFilename;          /* number of characters  in zFilename[] */
++  char *zTemp = 0;        /* a temporary file in same directory as zFilename */
++  sqlite *dbNew = 0;      /* The new vacuumed database */
++  int rc = SQLITE_OK;     /* Return code from service routines */
++  int i;                  /* Loop counter */
++  char *zErrMsg;          /* Error message */
++  vacuumStruct sVac;      /* Information passed to callbacks */
++
++  if( db->flags & SQLITE_InTrans ){
++    sqliteSetString(pzErrMsg, "cannot VACUUM from within a transaction", 
++       (char*)0);
++    return SQLITE_ERROR;
++  }
++  if( db->flags & SQLITE_Interrupt ){
++    return SQLITE_INTERRUPT;
++  }
++  memset(&sVac, 0, sizeof(sVac));
++
++  /* Get the full pathname of the database file and create two
++  ** temporary filenames in the same directory as the original file.
++  */
++  zFilename = sqliteBtreeGetFilename(db->aDb[0].pBt);
++  if( zFilename==0 ){
++    /* This only happens with the in-memory database.  VACUUM is a no-op
++    ** there, so just return */
++    return SQLITE_OK;
++  }
++  nFilename = strlen(zFilename);
++  zTemp = sqliteMalloc( nFilename+100 );
++  if( zTemp==0 ) return SQLITE_NOMEM;
++  strcpy(zTemp, zFilename);
++  for(i=0; i<10; i++){
++    zTemp[nFilename] = '-';
++    randomName((unsigned char*)&zTemp[nFilename+1]);
++    if( !sqliteOsFileExists(zTemp) ) break;
++  }
++  if( i>=10 ){
++    sqliteSetString(pzErrMsg, "unable to create a temporary database file "
++       "in the same directory as the original database", (char*)0);
++    goto end_of_vacuum;
++  }
++
++  
++  dbNew = sqlite_open(zTemp, 0, &zErrMsg);
++  if( dbNew==0 ){
++    sqliteSetString(pzErrMsg, "unable to open a temporary database at ",
++       zTemp, " - ", zErrMsg, (char*)0);
++    goto end_of_vacuum;
++  }
++  if( (rc = execsql(pzErrMsg, db, "BEGIN"))!=0 ) goto end_of_vacuum;
++  if( (rc = execsql(pzErrMsg, dbNew, "PRAGMA synchronous=off; BEGIN"))!=0 ){
++    goto end_of_vacuum;
++  }
++  
++  sVac.dbOld = db;
++  sVac.dbNew = dbNew;
++  sVac.pzErrMsg = pzErrMsg;
++  if( rc==SQLITE_OK ){
++    rc = sqlite_exec(db, 
++      "SELECT type, name, sql FROM sqlite_master "
++      "WHERE sql NOT NULL AND type!='view' "
++      "UNION ALL "
++      "SELECT type, name, sql FROM sqlite_master "
++      "WHERE sql NOT NULL AND type=='view'",
++      vacuumCallback1, &sVac, &zErrMsg);
++  }
++  if( rc==SQLITE_OK ){
++    int meta1[SQLITE_N_BTREE_META];
++    int meta2[SQLITE_N_BTREE_META];
++    sqliteBtreeGetMeta(db->aDb[0].pBt, meta1);
++    sqliteBtreeGetMeta(dbNew->aDb[0].pBt, meta2);
++    meta2[1] = meta1[1]+1;
++    meta2[3] = meta1[3];
++    meta2[4] = meta1[4];
++    meta2[6] = meta1[6];
++    rc = sqliteBtreeUpdateMeta(dbNew->aDb[0].pBt, meta2);
++  }
++  if( rc==SQLITE_OK ){
++    rc = sqliteBtreeCopyFile(db->aDb[0].pBt, dbNew->aDb[0].pBt);
++    sqlite_exec(db, "COMMIT", 0, 0, 0);
++    sqliteResetInternalSchema(db, 0);
++  }
++
++end_of_vacuum:
++  if( rc && zErrMsg!=0 ){
++    sqliteSetString(pzErrMsg, "unable to vacuum database - ", 
++       zErrMsg, (char*)0);
++  }
++  sqlite_exec(db, "ROLLBACK", 0, 0, 0);
++  if( (dbNew && (dbNew->flags & SQLITE_Interrupt)) 
++         || (db->flags & SQLITE_Interrupt) ){
++    rc = SQLITE_INTERRUPT;
++  }
++  if( dbNew ) sqlite_close(dbNew);
++  sqliteOsDelete(zTemp);
++  sqliteFree(zTemp);
++  sqliteFree(sVac.s1.z);
++  sqliteFree(sVac.s2.z);
++  if( zErrMsg ) sqlite_freemem(zErrMsg);
++  if( rc==SQLITE_ABORT && sVac.rc!=SQLITE_INTERRUPT ) sVac.rc = SQLITE_ERROR;
++  return sVac.rc;
++#endif
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/vdbeaux.c
+@@ -0,0 +1,1061 @@
++/*
++** 2003 September 6
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This file contains code used for creating, destroying, and populating
++** a VDBE (or an "sqlite_vm" as it is known to the outside world.)  Prior
++** to version 2.8.7, all this code was combined into the vdbe.c source file.
++** But that file was getting too big so this subroutines were split out.
++*/
++#include "sqliteInt.h"
++#include "os.h"
++#include <ctype.h>
++#include "vdbeInt.h"
++
++
++/*
++** When debugging the code generator in a symbolic debugger, one can
++** set the sqlite_vdbe_addop_trace to 1 and all opcodes will be printed
++** as they are added to the instruction stream.
++*/
++#ifndef NDEBUG
++int sqlite_vdbe_addop_trace = 0;
++#endif
++
++
++/*
++** Create a new virtual database engine.
++*/
++Vdbe *sqliteVdbeCreate(sqlite *db){
++  Vdbe *p;
++  p = sqliteMalloc( sizeof(Vdbe) );
++  if( p==0 ) return 0;
++  p->db = db;
++  if( db->pVdbe ){
++    db->pVdbe->pPrev = p;
++  }
++  p->pNext = db->pVdbe;
++  p->pPrev = 0;
++  db->pVdbe = p;
++  p->magic = VDBE_MAGIC_INIT;
++  return p;
++}
++
++/*
++** Turn tracing on or off
++*/
++void sqliteVdbeTrace(Vdbe *p, FILE *trace){
++  p->trace = trace;
++}
++
++/*
++** Add a new instruction to the list of instructions current in the
++** VDBE.  Return the address of the new instruction.
++**
++** Parameters:
++**
++**    p               Pointer to the VDBE
++**
++**    op              The opcode for this instruction
++**
++**    p1, p2          First two of the three possible operands.
++**
++** Use the sqliteVdbeResolveLabel() function to fix an address and
++** the sqliteVdbeChangeP3() function to change the value of the P3
++** operand.
++*/
++int sqliteVdbeAddOp(Vdbe *p, int op, int p1, int p2){
++  int i;
++  VdbeOp *pOp;
++
++  i = p->nOp;
++  p->nOp++;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( i>=p->nOpAlloc ){
++    int oldSize = p->nOpAlloc;
++    Op *aNew;
++    p->nOpAlloc = p->nOpAlloc*2 + 100;
++    aNew = sqliteRealloc(p->aOp, p->nOpAlloc*sizeof(Op));
++    if( aNew==0 ){
++      p->nOpAlloc = oldSize;
++      return 0;
++    }
++    p->aOp = aNew;
++    memset(&p->aOp[oldSize], 0, (p->nOpAlloc-oldSize)*sizeof(Op));
++  }
++  pOp = &p->aOp[i];
++  pOp->opcode = op;
++  pOp->p1 = p1;
++  if( p2<0 && (-1-p2)<p->nLabel && p->aLabel[-1-p2]>=0 ){
++    p2 = p->aLabel[-1-p2];
++  }
++  pOp->p2 = p2;
++  pOp->p3 = 0;
++  pOp->p3type = P3_NOTUSED;
++#ifndef NDEBUG
++  if( sqlite_vdbe_addop_trace ) sqliteVdbePrintOp(0, i, &p->aOp[i]);
++#endif
++  return i;
++}
++
++/*
++** Add an opcode that includes the p3 value.
++*/
++int sqliteVdbeOp3(Vdbe *p, int op, int p1, int p2, const char *zP3, int p3type){
++  int addr = sqliteVdbeAddOp(p, op, p1, p2);
++  sqliteVdbeChangeP3(p, addr, zP3, p3type);
++  return addr;
++}
++
++/*
++** Add multiple opcodes.  The list is terminated by an opcode of 0.
++*/
++int sqliteVdbeCode(Vdbe *p, ...){
++  int addr;
++  va_list ap;
++  int opcode, p1, p2;
++  va_start(ap, p);
++  addr = p->nOp;
++  while( (opcode = va_arg(ap,int))!=0 ){
++    p1 = va_arg(ap,int);
++    p2 = va_arg(ap,int);
++    sqliteVdbeAddOp(p, opcode, p1, p2);
++  }
++  va_end(ap);
++  return addr;
++}
++
++
++
++/*
++** Create a new symbolic label for an instruction that has yet to be
++** coded.  The symbolic label is really just a negative number.  The
++** label can be used as the P2 value of an operation.  Later, when
++** the label is resolved to a specific address, the VDBE will scan
++** through its operation list and change all values of P2 which match
++** the label into the resolved address.
++**
++** The VDBE knows that a P2 value is a label because labels are
++** always negative and P2 values are suppose to be non-negative.
++** Hence, a negative P2 value is a label that has yet to be resolved.
++*/
++int sqliteVdbeMakeLabel(Vdbe *p){
++  int i;
++  i = p->nLabel++;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( i>=p->nLabelAlloc ){
++    int *aNew;
++    p->nLabelAlloc = p->nLabelAlloc*2 + 10;
++    aNew = sqliteRealloc( p->aLabel, p->nLabelAlloc*sizeof(p->aLabel[0]));
++    if( aNew==0 ){
++      sqliteFree(p->aLabel);
++    }
++    p->aLabel = aNew;
++  }
++  if( p->aLabel==0 ){
++    p->nLabel = 0;
++    p->nLabelAlloc = 0;
++    return 0;
++  }
++  p->aLabel[i] = -1;
++  return -1-i;
++}
++
++/*
++** Resolve label "x" to be the address of the next instruction to
++** be inserted.  The parameter "x" must have been obtained from
++** a prior call to sqliteVdbeMakeLabel().
++*/
++void sqliteVdbeResolveLabel(Vdbe *p, int x){
++  int j;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( x<0 && (-x)<=p->nLabel && p->aOp ){
++    if( p->aLabel[-1-x]==p->nOp ) return;
++    assert( p->aLabel[-1-x]<0 );
++    p->aLabel[-1-x] = p->nOp;
++    for(j=0; j<p->nOp; j++){
++      if( p->aOp[j].p2==x ) p->aOp[j].p2 = p->nOp;
++    }
++  }
++}
++
++/*
++** Return the address of the next instruction to be inserted.
++*/
++int sqliteVdbeCurrentAddr(Vdbe *p){
++  assert( p->magic==VDBE_MAGIC_INIT );
++  return p->nOp;
++}
++
++/*
++** Add a whole list of operations to the operation stack.  Return the
++** address of the first operation added.
++*/
++int sqliteVdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp){
++  int addr;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( p->nOp + nOp >= p->nOpAlloc ){
++    int oldSize = p->nOpAlloc;
++    Op *aNew;
++    p->nOpAlloc = p->nOpAlloc*2 + nOp + 10;
++    aNew = sqliteRealloc(p->aOp, p->nOpAlloc*sizeof(Op));
++    if( aNew==0 ){
++      p->nOpAlloc = oldSize;
++      return 0;
++    }
++    p->aOp = aNew;
++    memset(&p->aOp[oldSize], 0, (p->nOpAlloc-oldSize)*sizeof(Op));
++  }
++  addr = p->nOp;
++  if( nOp>0 ){
++    int i;
++    VdbeOpList const *pIn = aOp;
++    for(i=0; i<nOp; i++, pIn++){
++      int p2 = pIn->p2;
++      VdbeOp *pOut = &p->aOp[i+addr];
++      pOut->opcode = pIn->opcode;
++      pOut->p1 = pIn->p1;
++      pOut->p2 = p2<0 ? addr + ADDR(p2) : p2;
++      pOut->p3 = pIn->p3;
++      pOut->p3type = pIn->p3 ? P3_STATIC : P3_NOTUSED;
++#ifndef NDEBUG
++      if( sqlite_vdbe_addop_trace ){
++        sqliteVdbePrintOp(0, i+addr, &p->aOp[i+addr]);
++      }
++#endif
++    }
++    p->nOp += nOp;
++  }
++  return addr;
++}
++
++/*
++** Change the value of the P1 operand for a specific instruction.
++** This routine is useful when a large program is loaded from a
++** static array using sqliteVdbeAddOpList but we want to make a
++** few minor changes to the program.
++*/
++void sqliteVdbeChangeP1(Vdbe *p, int addr, int val){
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( p && addr>=0 && p->nOp>addr && p->aOp ){
++    p->aOp[addr].p1 = val;
++  }
++}
++
++/*
++** Change the value of the P2 operand for a specific instruction.
++** This routine is useful for setting a jump destination.
++*/
++void sqliteVdbeChangeP2(Vdbe *p, int addr, int val){
++  assert( val>=0 );
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( p && addr>=0 && p->nOp>addr && p->aOp ){
++    p->aOp[addr].p2 = val;
++  }
++}
++
++/*
++** Change the value of the P3 operand for a specific instruction.
++** This routine is useful when a large program is loaded from a
++** static array using sqliteVdbeAddOpList but we want to make a
++** few minor changes to the program.
++**
++** If n>=0 then the P3 operand is dynamic, meaning that a copy of
++** the string is made into memory obtained from sqliteMalloc().
++** A value of n==0 means copy bytes of zP3 up to and including the
++** first null byte.  If n>0 then copy n+1 bytes of zP3.
++**
++** If n==P3_STATIC  it means that zP3 is a pointer to a constant static
++** string and we can just copy the pointer.  n==P3_POINTER means zP3 is
++** a pointer to some object other than a string.
++**
++** If addr<0 then change P3 on the most recently inserted instruction.
++*/
++void sqliteVdbeChangeP3(Vdbe *p, int addr, const char *zP3, int n){
++  Op *pOp;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( p==0 || p->aOp==0 ) return;
++  if( addr<0 || addr>=p->nOp ){
++    addr = p->nOp - 1;
++    if( addr<0 ) return;
++  }
++  pOp = &p->aOp[addr];
++  if( pOp->p3 && pOp->p3type==P3_DYNAMIC ){
++    sqliteFree(pOp->p3);
++    pOp->p3 = 0;
++  }
++  if( zP3==0 ){
++    pOp->p3 = 0;
++    pOp->p3type = P3_NOTUSED;
++  }else if( n<0 ){
++    pOp->p3 = (char*)zP3;
++    pOp->p3type = n;
++  }else{
++    sqliteSetNString(&pOp->p3, zP3, n, 0);
++    pOp->p3type = P3_DYNAMIC;
++  }
++}
++
++/*
++** If the P3 operand to the specified instruction appears
++** to be a quoted string token, then this procedure removes 
++** the quotes.
++**
++** The quoting operator can be either a grave ascent (ASCII 0x27)
++** or a double quote character (ASCII 0x22).  Two quotes in a row
++** resolve to be a single actual quote character within the string.
++*/
++void sqliteVdbeDequoteP3(Vdbe *p, int addr){
++  Op *pOp;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( p->aOp==0 ) return;
++  if( addr<0 || addr>=p->nOp ){
++    addr = p->nOp - 1;
++    if( addr<0 ) return;
++  }
++  pOp = &p->aOp[addr];
++  if( pOp->p3==0 || pOp->p3[0]==0 ) return;
++  if( pOp->p3type==P3_POINTER ) return;
++  if( pOp->p3type!=P3_DYNAMIC ){
++    pOp->p3 = sqliteStrDup(pOp->p3);
++    pOp->p3type = P3_DYNAMIC;
++  }
++  sqliteDequote(pOp->p3);
++}
++
++/*
++** On the P3 argument of the given instruction, change all
++** strings of whitespace characters into a single space and
++** delete leading and trailing whitespace.
++*/
++void sqliteVdbeCompressSpace(Vdbe *p, int addr){
++  unsigned char *z;
++  int i, j;
++  Op *pOp;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  if( p->aOp==0 || addr<0 || addr>=p->nOp ) return;
++  pOp = &p->aOp[addr];
++  if( pOp->p3type==P3_POINTER ){
++    return;
++  }
++  if( pOp->p3type!=P3_DYNAMIC ){
++    pOp->p3 = sqliteStrDup(pOp->p3);
++    pOp->p3type = P3_DYNAMIC;
++  }
++  z = (unsigned char*)pOp->p3;
++  if( z==0 ) return;
++  i = j = 0;
++  while( isspace(z[i]) ){ i++; }
++  while( z[i] ){
++    if( isspace(z[i]) ){
++      z[j++] = ' ';
++      while( isspace(z[++i]) ){}
++    }else{
++      z[j++] = z[i++];
++    }
++  }
++  while( j>0 && isspace(z[j-1]) ){ j--; }
++  z[j] = 0;
++}
++
++/*
++** Search for the current program for the given opcode and P2
++** value.  Return the address plus 1 if found and 0 if not found.
++*/
++int sqliteVdbeFindOp(Vdbe *p, int op, int p2){
++  int i;
++  assert( p->magic==VDBE_MAGIC_INIT );
++  for(i=0; i<p->nOp; i++){
++    if( p->aOp[i].opcode==op && p->aOp[i].p2==p2 ) return i+1;
++  }
++  return 0;
++}
++
++/*
++** Return the opcode for a given address.
++*/
++VdbeOp *sqliteVdbeGetOp(Vdbe *p, int addr){
++  assert( p->magic==VDBE_MAGIC_INIT );
++  assert( addr>=0 && addr<p->nOp );
++  return &p->aOp[addr];
++}
++
++/*
++** The following group or routines are employed by installable functions
++** to return their results.
++**
++** The sqlite_set_result_string() routine can be used to return a string
++** value or to return a NULL.  To return a NULL, pass in NULL for zResult.
++** A copy is made of the string before this routine returns so it is safe
++** to pass in an ephemeral string.
++**
++** sqlite_set_result_error() works like sqlite_set_result_string() except
++** that it signals a fatal error.  The string argument, if any, is the
++** error message.  If the argument is NULL a generic substitute error message
++** is used.
++**
++** The sqlite_set_result_int() and sqlite_set_result_double() set the return
++** value of the user function to an integer or a double.
++**
++** These routines are defined here in vdbe.c because they depend on knowing
++** the internals of the sqlite_func structure which is only defined in 
++** this source file.
++*/
++char *sqlite_set_result_string(sqlite_func *p, const char *zResult, int n){
++  assert( !p->isStep );
++  if( p->s.flags & MEM_Dyn ){
++    sqliteFree(p->s.z);
++  }
++  if( zResult==0 ){
++    p->s.flags = MEM_Null;
++    n = 0;
++    p->s.z = 0;
++    p->s.n = 0;
++  }else{
++    if( n<0 ) n = strlen(zResult);
++    if( n<NBFS-1 ){
++      memcpy(p->s.zShort, zResult, n);
++      p->s.zShort[n] = 0;
++      p->s.flags = MEM_Str | MEM_Short;
++      p->s.z = p->s.zShort;
++    }else{
++      p->s.z = sqliteMallocRaw( n+1 );
++      if( p->s.z ){
++        memcpy(p->s.z, zResult, n);
++        p->s.z[n] = 0;
++      }
++      p->s.flags = MEM_Str | MEM_Dyn;
++    }
++    p->s.n = n+1;
++  }
++  return p->s.z;
++}
++void sqlite_set_result_int(sqlite_func *p, int iResult){
++  assert( !p->isStep );
++  if( p->s.flags & MEM_Dyn ){
++    sqliteFree(p->s.z);
++  }
++  p->s.i = iResult;
++  p->s.flags = MEM_Int;
++}
++void sqlite_set_result_double(sqlite_func *p, double rResult){
++  assert( !p->isStep );
++  if( p->s.flags & MEM_Dyn ){
++    sqliteFree(p->s.z);
++  }
++  p->s.r = rResult;
++  p->s.flags = MEM_Real;
++}
++void sqlite_set_result_error(sqlite_func *p, const char *zMsg, int n){
++  assert( !p->isStep );
++  sqlite_set_result_string(p, zMsg, n);
++  p->isError = 1;
++}
++
++/*
++** Extract the user data from a sqlite_func structure and return a
++** pointer to it.
++*/
++void *sqlite_user_data(sqlite_func *p){
++  assert( p && p->pFunc );
++  return p->pFunc->pUserData;
++}
++
++/*
++** Allocate or return the aggregate context for a user function.  A new
++** context is allocated on the first call.  Subsequent calls return the
++** same context that was returned on prior calls.
++**
++** This routine is defined here in vdbe.c because it depends on knowing
++** the internals of the sqlite_func structure which is only defined in
++** this source file.
++*/
++void *sqlite_aggregate_context(sqlite_func *p, int nByte){
++  assert( p && p->pFunc && p->pFunc->xStep );
++  if( p->pAgg==0 ){
++    if( nByte<=NBFS ){
++      p->pAgg = (void*)p->s.z;
++      memset(p->pAgg, 0, nByte);
++    }else{
++      p->pAgg = sqliteMalloc( nByte );
++    }
++  }
++  return p->pAgg;
++}
++
++/*
++** Return the number of times the Step function of a aggregate has been 
++** called.
++**
++** This routine is defined here in vdbe.c because it depends on knowing
++** the internals of the sqlite_func structure which is only defined in
++** this source file.
++*/
++int sqlite_aggregate_count(sqlite_func *p){
++  assert( p && p->pFunc && p->pFunc->xStep );
++  return p->cnt;
++}
++
++#if !defined(NDEBUG) || defined(VDBE_PROFILE)
++/*
++** Print a single opcode.  This routine is used for debugging only.
++*/
++void sqliteVdbePrintOp(FILE *pOut, int pc, Op *pOp){
++  char *zP3;
++  char zPtr[40];
++  if( pOp->p3type==P3_POINTER ){
++    sprintf(zPtr, "ptr(%#lx)", (long)pOp->p3);
++    zP3 = zPtr;
++  }else{
++    zP3 = pOp->p3;
++  }
++  if( pOut==0 ) pOut = stdout;
++  fprintf(pOut,"%4d %-12s %4d %4d %s\n",
++      pc, sqliteOpcodeNames[pOp->opcode], pOp->p1, pOp->p2, zP3 ? zP3 : "");
++  fflush(pOut);
++}
++#endif
++
++/*
++** Give a listing of the program in the virtual machine.
++**
++** The interface is the same as sqliteVdbeExec().  But instead of
++** running the code, it invokes the callback once for each instruction.
++** This feature is used to implement "EXPLAIN".
++*/
++int sqliteVdbeList(
++  Vdbe *p                   /* The VDBE */
++){
++  sqlite *db = p->db;
++  int i;
++  int rc = SQLITE_OK;
++  static char *azColumnNames[] = {
++     "addr", "opcode", "p1",  "p2",  "p3", 
++     "int",  "text",   "int", "int", "text",
++     0
++  };
++
++  assert( p->popStack==0 );
++  assert( p->explain );
++  p->azColName = azColumnNames;
++  p->azResColumn = p->zArgv;
++  for(i=0; i<5; i++) p->zArgv[i] = p->aStack[i].zShort;
++  i = p->pc;
++  if( i>=p->nOp ){
++    p->rc = SQLITE_OK;
++    rc = SQLITE_DONE;
++  }else if( db->flags & SQLITE_Interrupt ){
++    db->flags &= ~SQLITE_Interrupt;
++    if( db->magic!=SQLITE_MAGIC_BUSY ){
++      p->rc = SQLITE_MISUSE;
++    }else{
++      p->rc = SQLITE_INTERRUPT;
++    }
++    rc = SQLITE_ERROR;
++    sqliteSetString(&p->zErrMsg, sqlite_error_string(p->rc), (char*)0);
++  }else{
++    sprintf(p->zArgv[0],"%d",i);
++    sprintf(p->zArgv[2],"%d", p->aOp[i].p1);
++    sprintf(p->zArgv[3],"%d", p->aOp[i].p2);
++    if( p->aOp[i].p3type==P3_POINTER ){
++      sprintf(p->aStack[4].zShort, "ptr(%#lx)", (long)p->aOp[i].p3);
++      p->zArgv[4] = p->aStack[4].zShort;
++    }else{
++      p->zArgv[4] = p->aOp[i].p3;
++    }
++    p->zArgv[1] = sqliteOpcodeNames[p->aOp[i].opcode];
++    p->pc = i+1;
++    p->azResColumn = p->zArgv;
++    p->nResColumn = 5;
++    p->rc = SQLITE_OK;
++    rc = SQLITE_ROW;
++  }
++  return rc;
++}
++
++/*
++** Prepare a virtual machine for execution.  This involves things such
++** as allocating stack space and initializing the program counter.
++** After the VDBE has be prepped, it can be executed by one or more
++** calls to sqliteVdbeExec().  
++*/
++void sqliteVdbeMakeReady(
++  Vdbe *p,                       /* The VDBE */
++  int nVar,                      /* Number of '?' see in the SQL statement */
++  int isExplain                  /* True if the EXPLAIN keywords is present */
++){
++  int n;
++
++  assert( p!=0 );
++  assert( p->magic==VDBE_MAGIC_INIT );
++
++  /* Add a HALT instruction to the very end of the program.
++  */
++  if( p->nOp==0 || (p->aOp && p->aOp[p->nOp-1].opcode!=OP_Halt) ){
++    sqliteVdbeAddOp(p, OP_Halt, 0, 0);
++  }
++
++  /* No instruction ever pushes more than a single element onto the
++  ** stack.  And the stack never grows on successive executions of the
++  ** same loop.  So the total number of instructions is an upper bound
++  ** on the maximum stack depth required.
++  **
++  ** Allocation all the stack space we will ever need.
++  */
++  if( p->aStack==0 ){
++    p->nVar = nVar;
++    assert( nVar>=0 );
++    n = isExplain ? 10 : p->nOp;
++    p->aStack = sqliteMalloc(
++      n*(sizeof(p->aStack[0]) + 2*sizeof(char*))     /* aStack and zArgv */
++        + p->nVar*(sizeof(char*)+sizeof(int)+1)    /* azVar, anVar, abVar */
++    );
++    p->zArgv = (char**)&p->aStack[n];
++    p->azColName = (char**)&p->zArgv[n];
++    p->azVar = (char**)&p->azColName[n];
++    p->anVar = (int*)&p->azVar[p->nVar];
++    p->abVar = (u8*)&p->anVar[p->nVar];
++  }
++
++  sqliteHashInit(&p->agg.hash, SQLITE_HASH_BINARY, 0);
++  p->agg.pSearch = 0;
++#ifdef MEMORY_DEBUG
++  if( sqliteOsFileExists("vdbe_trace") ){
++    p->trace = stdout;
++  }
++#endif
++  p->pTos = &p->aStack[-1];
++  p->pc = 0;
++  p->rc = SQLITE_OK;
++  p->uniqueCnt = 0;
++  p->returnDepth = 0;
++  p->errorAction = OE_Abort;
++  p->undoTransOnError = 0;
++  p->popStack =  0;
++  p->explain |= isExplain;
++  p->magic = VDBE_MAGIC_RUN;
++#ifdef VDBE_PROFILE
++  {
++    int i;
++    for(i=0; i<p->nOp; i++){
++      p->aOp[i].cnt = 0;
++      p->aOp[i].cycles = 0;
++    }
++  }
++#endif
++}
++
++
++/*
++** Remove any elements that remain on the sorter for the VDBE given.
++*/
++void sqliteVdbeSorterReset(Vdbe *p){
++  while( p->pSort ){
++    Sorter *pSorter = p->pSort;
++    p->pSort = pSorter->pNext;
++    sqliteFree(pSorter->zKey);
++    sqliteFree(pSorter->pData);
++    sqliteFree(pSorter);
++  }
++}
++
++/*
++** Reset an Agg structure.  Delete all its contents. 
++**
++** For installable aggregate functions, if the step function has been
++** called, make sure the finalizer function has also been called.  The
++** finalizer might need to free memory that was allocated as part of its
++** private context.  If the finalizer has not been called yet, call it
++** now.
++*/
++void sqliteVdbeAggReset(Agg *pAgg){
++  int i;
++  HashElem *p;
++  for(p = sqliteHashFirst(&pAgg->hash); p; p = sqliteHashNext(p)){
++    AggElem *pElem = sqliteHashData(p);
++    assert( pAgg->apFunc!=0 );
++    for(i=0; i<pAgg->nMem; i++){
++      Mem *pMem = &pElem->aMem[i];
++      if( pAgg->apFunc[i] && (pMem->flags & MEM_AggCtx)!=0 ){
++        sqlite_func ctx;
++        ctx.pFunc = pAgg->apFunc[i];
++        ctx.s.flags = MEM_Null;
++        ctx.pAgg = pMem->z;
++        ctx.cnt = pMem->i;
++        ctx.isStep = 0;
++        ctx.isError = 0;
++        (*pAgg->apFunc[i]->xFinalize)(&ctx);
++        if( pMem->z!=0 && pMem->z!=pMem->zShort ){
++          sqliteFree(pMem->z);
++        }
++        if( ctx.s.flags & MEM_Dyn ){
++          sqliteFree(ctx.s.z);
++        }
++      }else if( pMem->flags & MEM_Dyn ){
++        sqliteFree(pMem->z);
++      }
++    }
++    sqliteFree(pElem);
++  }
++  sqliteHashClear(&pAgg->hash);
++  sqliteFree(pAgg->apFunc);
++  pAgg->apFunc = 0;
++  pAgg->pCurrent = 0;
++  pAgg->pSearch = 0;
++  pAgg->nMem = 0;
++}
++
++/*
++** Delete a keylist
++*/
++void sqliteVdbeKeylistFree(Keylist *p){
++  while( p ){
++    Keylist *pNext = p->pNext;
++    sqliteFree(p);
++    p = pNext;
++  }
++}
++
++/*
++** Close a cursor and release all the resources that cursor happens
++** to hold.
++*/
++void sqliteVdbeCleanupCursor(Cursor *pCx){
++  if( pCx->pCursor ){
++    sqliteBtreeCloseCursor(pCx->pCursor);
++  }
++  if( pCx->pBt ){
++    sqliteBtreeClose(pCx->pBt);
++  }
++  sqliteFree(pCx->pData);
++  memset(pCx, 0, sizeof(Cursor));
++}
++
++/*
++** Close all cursors
++*/
++static void closeAllCursors(Vdbe *p){
++  int i;
++  for(i=0; i<p->nCursor; i++){
++    sqliteVdbeCleanupCursor(&p->aCsr[i]);
++  }
++  sqliteFree(p->aCsr);
++  p->aCsr = 0;
++  p->nCursor = 0;
++}
++
++/*
++** Clean up the VM after execution.
++**
++** This routine will automatically close any cursors, lists, and/or
++** sorters that were left open.  It also deletes the values of
++** variables in the azVariable[] array.
++*/
++static void Cleanup(Vdbe *p){
++  int i;
++  if( p->aStack ){
++    Mem *pTos = p->pTos;
++    while( pTos>=p->aStack ){
++      if( pTos->flags & MEM_Dyn ){
++        sqliteFree(pTos->z);
++      }
++      pTos--;
++    }
++    p->pTos = pTos;
++  }
++  closeAllCursors(p);
++  if( p->aMem ){
++    for(i=0; i<p->nMem; i++){
++      if( p->aMem[i].flags & MEM_Dyn ){
++        sqliteFree(p->aMem[i].z);
++      }
++    }
++  }
++  sqliteFree(p->aMem);
++  p->aMem = 0;
++  p->nMem = 0;
++  if( p->pList ){
++    sqliteVdbeKeylistFree(p->pList);
++    p->pList = 0;
++  }
++  sqliteVdbeSorterReset(p);
++  if( p->pFile ){
++    if( p->pFile!=stdin ) fclose(p->pFile);
++    p->pFile = 0;
++  }
++  if( p->azField ){
++    sqliteFree(p->azField);
++    p->azField = 0;
++  }
++  p->nField = 0;
++  if( p->zLine ){
++    sqliteFree(p->zLine);
++    p->zLine = 0;
++  }
++  p->nLineAlloc = 0;
++  sqliteVdbeAggReset(&p->agg);
++  if( p->aSet ){
++    for(i=0; i<p->nSet; i++){
++      sqliteHashClear(&p->aSet[i].hash);
++    }
++  }
++  sqliteFree(p->aSet);
++  p->aSet = 0;
++  p->nSet = 0;
++  if( p->keylistStack ){
++    int ii;
++    for(ii = 0; ii < p->keylistStackDepth; ii++){
++      sqliteVdbeKeylistFree(p->keylistStack[ii]);
++    }
++    sqliteFree(p->keylistStack);
++    p->keylistStackDepth = 0;
++    p->keylistStack = 0;
++  }
++  sqliteFree(p->contextStack);
++  p->contextStack = 0;
++  sqliteFree(p->zErrMsg);
++  p->zErrMsg = 0;
++}
++
++/*
++** Clean up a VDBE after execution but do not delete the VDBE just yet.
++** Write any error messages into *pzErrMsg.  Return the result code.
++**
++** After this routine is run, the VDBE should be ready to be executed
++** again.
++*/
++int sqliteVdbeReset(Vdbe *p, char **pzErrMsg){
++  sqlite *db = p->db;
++  int i;
++
++  if( p->magic!=VDBE_MAGIC_RUN && p->magic!=VDBE_MAGIC_HALT ){
++    sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), (char*)0);
++    return SQLITE_MISUSE;
++  }
++  if( p->zErrMsg ){
++    if( pzErrMsg && *pzErrMsg==0 ){
++      *pzErrMsg = p->zErrMsg;
++    }else{
++      sqliteFree(p->zErrMsg);
++    }
++    p->zErrMsg = 0;
++  }else if( p->rc ){
++    sqliteSetString(pzErrMsg, sqlite_error_string(p->rc), (char*)0);
++  }
++  Cleanup(p);
++  if( p->rc!=SQLITE_OK ){
++    switch( p->errorAction ){
++      case OE_Abort: {
++        if( !p->undoTransOnError ){
++          for(i=0; i<db->nDb; i++){
++            if( db->aDb[i].pBt ){
++              sqliteBtreeRollbackCkpt(db->aDb[i].pBt);
++            }
++          }
++          break;
++        }
++        /* Fall through to ROLLBACK */
++      }
++      case OE_Rollback: {
++        sqliteRollbackAll(db);
++        db->flags &= ~SQLITE_InTrans;
++        db->onError = OE_Default;
++        break;
++      }
++      default: {
++        if( p->undoTransOnError ){
++          sqliteRollbackAll(db);
++          db->flags &= ~SQLITE_InTrans;
++          db->onError = OE_Default;
++        }
++        break;
++      }
++    }
++    sqliteRollbackInternalChanges(db);
++  }
++  for(i=0; i<db->nDb; i++){
++    if( db->aDb[i].pBt && db->aDb[i].inTrans==2 ){
++      sqliteBtreeCommitCkpt(db->aDb[i].pBt);
++      db->aDb[i].inTrans = 1;
++    }
++  }
++  assert( p->pTos<&p->aStack[p->pc] || sqlite_malloc_failed==1 );
++#ifdef VDBE_PROFILE
++  {
++    FILE *out = fopen("vdbe_profile.out", "a");
++    if( out ){
++      int i;
++      fprintf(out, "---- ");
++      for(i=0; i<p->nOp; i++){
++        fprintf(out, "%02x", p->aOp[i].opcode);
++      }
++      fprintf(out, "\n");
++      for(i=0; i<p->nOp; i++){
++        fprintf(out, "%6d %10lld %8lld ",
++           p->aOp[i].cnt,
++           p->aOp[i].cycles,
++           p->aOp[i].cnt>0 ? p->aOp[i].cycles/p->aOp[i].cnt : 0
++        );
++        sqliteVdbePrintOp(out, i, &p->aOp[i]);
++      }
++      fclose(out);
++    }
++  }
++#endif
++  p->magic = VDBE_MAGIC_INIT;
++  return p->rc;
++}
++
++/*
++** Clean up and delete a VDBE after execution.  Return an integer which is
++** the result code.  Write any error message text into *pzErrMsg.
++*/
++int sqliteVdbeFinalize(Vdbe *p, char **pzErrMsg){
++  int rc;
++  sqlite *db;
++
++  if( p->magic!=VDBE_MAGIC_RUN && p->magic!=VDBE_MAGIC_HALT ){
++    sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), (char*)0);
++    return SQLITE_MISUSE;
++  }
++  db = p->db;
++  rc = sqliteVdbeReset(p, pzErrMsg);
++  sqliteVdbeDelete(p);
++  if( db->want_to_close && db->pVdbe==0 ){
++    sqlite_close(db);
++  }
++  if( rc==SQLITE_SCHEMA ){
++    sqliteResetInternalSchema(db, 0);
++  }
++  return rc;
++}
++
++/*
++** Set the values of all variables.  Variable $1 in the original SQL will
++** be the string azValue[0].  $2 will have the value azValue[1].  And
++** so forth.  If a value is out of range (for example $3 when nValue==2)
++** then its value will be NULL.
++**
++** This routine overrides any prior call.
++*/
++int sqlite_bind(sqlite_vm *pVm, int i, const char *zVal, int len, int copy){
++  Vdbe *p = (Vdbe*)pVm;
++  if( p->magic!=VDBE_MAGIC_RUN || p->pc!=0 ){
++    return SQLITE_MISUSE;
++  }
++  if( i<1 || i>p->nVar ){
++    return SQLITE_RANGE;
++  }
++  i--;
++  if( p->abVar[i] ){
++    sqliteFree(p->azVar[i]);
++  }
++  if( zVal==0 ){
++    copy = 0;
++    len = 0;
++  }
++  if( len<0 ){
++    len = strlen(zVal)+1;
++  }
++  if( copy ){
++    p->azVar[i] = sqliteMalloc( len );
++    if( p->azVar[i] ) memcpy(p->azVar[i], zVal, len);
++  }else{
++    p->azVar[i] = (char*)zVal;
++  }
++  p->abVar[i] = copy;
++  p->anVar[i] = len;
++  return SQLITE_OK;
++}
++
++
++/*
++** Delete an entire VDBE.
++*/
++void sqliteVdbeDelete(Vdbe *p){
++  int i;
++  if( p==0 ) return;
++  Cleanup(p);
++  if( p->pPrev ){
++    p->pPrev->pNext = p->pNext;
++  }else{
++    assert( p->db->pVdbe==p );
++    p->db->pVdbe = p->pNext;
++  }
++  if( p->pNext ){
++    p->pNext->pPrev = p->pPrev;
++  }
++  p->pPrev = p->pNext = 0;
++  if( p->nOpAlloc==0 ){
++    p->aOp = 0;
++    p->nOp = 0;
++  }
++  for(i=0; i<p->nOp; i++){
++    if( p->aOp[i].p3type==P3_DYNAMIC ){
++      sqliteFree(p->aOp[i].p3);
++    }
++  }
++  for(i=0; i<p->nVar; i++){
++    if( p->abVar[i] ) sqliteFree(p->azVar[i]);
++  }
++  sqliteFree(p->aOp);
++  sqliteFree(p->aLabel);
++  sqliteFree(p->aStack);
++  p->magic = VDBE_MAGIC_DEAD;
++  sqliteFree(p);
++}
++
++/*
++** Convert an integer in between the native integer format and
++** the bigEndian format used as the record number for tables.
++**
++** The bigEndian format (most significant byte first) is used for
++** record numbers so that records will sort into the correct order
++** even though memcmp() is used to compare the keys.  On machines
++** whose native integer format is little endian (ex: i486) the
++** order of bytes is reversed.  On native big-endian machines
++** (ex: Alpha, Sparc, Motorola) the byte order is the same.
++**
++** This function is its own inverse.  In other words
++**
++**         X == byteSwap(byteSwap(X))
++*/
++int sqliteVdbeByteSwap(int x){
++  union {
++     char zBuf[sizeof(int)];
++     int i;
++  } ux;
++  ux.zBuf[3] = x&0xff;
++  ux.zBuf[2] = (x>>8)&0xff;
++  ux.zBuf[1] = (x>>16)&0xff;
++  ux.zBuf[0] = (x>>24)&0xff;
++  return ux.i;
++}
++
++/*
++** If a MoveTo operation is pending on the given cursor, then do that
++** MoveTo now.  Return an error code.  If no MoveTo is pending, this
++** routine does nothing and returns SQLITE_OK.
++*/
++int sqliteVdbeCursorMoveto(Cursor *p){
++  if( p->deferredMoveto ){
++    int res;
++    extern int sqlite_search_count;
++    sqliteBtreeMoveto(p->pCursor, (char*)&p->movetoTarget, sizeof(int), &res);
++    p->lastRecno = keyToInt(p->movetoTarget);
++    p->recnoIsValid = res==0;
++    if( res<0 ){
++      sqliteBtreeNext(p->pCursor, &res);
++    }
++    sqlite_search_count++;
++    p->deferredMoveto = 0;
++  }
++  return SQLITE_OK;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/vdbe.c
+@@ -0,0 +1,4921 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** The code in this file implements execution method of the 
++** Virtual Database Engine (VDBE).  A separate file ("vdbeaux.c")
++** handles housekeeping details such as creating and deleting
++** VDBE instances.  This file is solely interested in executing
++** the VDBE program.
++**
++** In the external interface, an "sqlite_vm*" is an opaque pointer
++** to a VDBE.
++**
++** The SQL parser generates a program which is then executed by
++** the VDBE to do the work of the SQL statement.  VDBE programs are 
++** similar in form to assembly language.  The program consists of
++** a linear sequence of operations.  Each operation has an opcode 
++** and 3 operands.  Operands P1 and P2 are integers.  Operand P3 
++** is a null-terminated string.   The P2 operand must be non-negative.
++** Opcodes will typically ignore one or more operands.  Many opcodes
++** ignore all three operands.
++**
++** Computation results are stored on a stack.  Each entry on the
++** stack is either an integer, a null-terminated string, a floating point
++** number, or the SQL "NULL" value.  An inplicit conversion from one
++** type to the other occurs as necessary.
++** 
++** Most of the code in this file is taken up by the sqliteVdbeExec()
++** function which does the work of interpreting a VDBE program.
++** But other routines are also provided to help in building up
++** a program instruction by instruction.
++**
++** Various scripts scan this source file in order to generate HTML
++** documentation, headers files, or other derived files.  The formatting
++** of the code in this file is, therefore, important.  See other comments
++** in this file for details.  If in doubt, do not deviate from existing
++** commenting and indentation practices when changing or adding code.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++#include "os.h"
++#include <ctype.h>
++#include "vdbeInt.h"
++
++/*
++** The following global variable is incremented every time a cursor
++** moves, either by the OP_MoveTo or the OP_Next opcode.  The test
++** procedures use this information to make sure that indices are
++** working correctly.  This variable has no function other than to
++** help verify the correct operation of the library.
++*/
++int sqlite_search_count = 0;
++
++/*
++** When this global variable is positive, it gets decremented once before
++** each instruction in the VDBE.  When reaches zero, the SQLITE_Interrupt
++** of the db.flags field is set in order to simulate an interrupt.
++**
++** This facility is used for testing purposes only.  It does not function
++** in an ordinary build.
++*/
++int sqlite_interrupt_count = 0;
++
++/*
++** Advance the virtual machine to the next output row.
++**
++** The return vale will be either SQLITE_BUSY, SQLITE_DONE, 
++** SQLITE_ROW, SQLITE_ERROR, or SQLITE_MISUSE.
++**
++** SQLITE_BUSY means that the virtual machine attempted to open
++** a locked database and there is no busy callback registered.
++** Call sqlite_step() again to retry the open.  *pN is set to 0
++** and *pazColName and *pazValue are both set to NULL.
++**
++** SQLITE_DONE means that the virtual machine has finished
++** executing.  sqlite_step() should not be called again on this
++** virtual machine.  *pN and *pazColName are set appropriately
++** but *pazValue is set to NULL.
++**
++** SQLITE_ROW means that the virtual machine has generated another
++** row of the result set.  *pN is set to the number of columns in
++** the row.  *pazColName is set to the names of the columns followed
++** by the column datatypes.  *pazValue is set to the values of each
++** column in the row.  The value of the i-th column is (*pazValue)[i].
++** The name of the i-th column is (*pazColName)[i] and the datatype
++** of the i-th column is (*pazColName)[i+*pN].
++**
++** SQLITE_ERROR means that a run-time error (such as a constraint
++** violation) has occurred.  The details of the error will be returned
++** by the next call to sqlite_finalize().  sqlite_step() should not
++** be called again on the VM.
++**
++** SQLITE_MISUSE means that the this routine was called inappropriately.
++** Perhaps it was called on a virtual machine that had already been
++** finalized or on one that had previously returned SQLITE_ERROR or
++** SQLITE_DONE.  Or it could be the case the the same database connection
++** is being used simulataneously by two or more threads.
++*/
++int sqlite_step(
++  sqlite_vm *pVm,              /* The virtual machine to execute */
++  int *pN,                     /* OUT: Number of columns in result */
++  const char ***pazValue,      /* OUT: Column data */
++  const char ***pazColName     /* OUT: Column names and datatypes */
++){
++  Vdbe *p = (Vdbe*)pVm;
++  sqlite *db;
++  int rc;
++
++  if( !p || p->magic!=VDBE_MAGIC_RUN ){
++    return SQLITE_MISUSE;
++  }
++  db = p->db;
++  if( sqliteSafetyOn(db) ){
++    p->rc = SQLITE_MISUSE;
++    return SQLITE_MISUSE;
++  }
++  if( p->explain ){
++    rc = sqliteVdbeList(p);
++  }else{
++    rc = sqliteVdbeExec(p);
++  }
++  if( rc==SQLITE_DONE || rc==SQLITE_ROW ){
++    if( pazColName ) *pazColName = (const char**)p->azColName;
++    if( pN ) *pN = p->nResColumn;
++  }else{
++    if( pazColName) *pazColName = 0;
++    if( pN ) *pN = 0;
++  }
++  if( pazValue ){
++    if( rc==SQLITE_ROW ){
++      *pazValue = (const char**)p->azResColumn;
++    }else{
++      *pazValue = 0;
++    }
++  }
++  if( sqliteSafetyOff(db) ){
++    return SQLITE_MISUSE;
++  }
++  return rc;
++}
++
++/*
++** Insert a new aggregate element and make it the element that
++** has focus.
++**
++** Return 0 on success and 1 if memory is exhausted.
++*/
++static int AggInsert(Agg *p, char *zKey, int nKey){
++  AggElem *pElem, *pOld;
++  int i;
++  Mem *pMem;
++  pElem = sqliteMalloc( sizeof(AggElem) + nKey +
++                        (p->nMem-1)*sizeof(pElem->aMem[0]) );
++  if( pElem==0 ) return 1;
++  pElem->zKey = (char*)&pElem->aMem[p->nMem];
++  memcpy(pElem->zKey, zKey, nKey);
++  pElem->nKey = nKey;
++  pOld = sqliteHashInsert(&p->hash, pElem->zKey, pElem->nKey, pElem);
++  if( pOld!=0 ){
++    assert( pOld==pElem );  /* Malloc failed on insert */
++    sqliteFree(pOld);
++    return 0;
++  }
++  for(i=0, pMem=pElem->aMem; i<p->nMem; i++, pMem++){
++    pMem->flags = MEM_Null;
++  }
++  p->pCurrent = pElem;
++  return 0;
++}
++
++/*
++** Get the AggElem currently in focus
++*/
++#define AggInFocus(P)   ((P).pCurrent ? (P).pCurrent : _AggInFocus(&(P)))
++static AggElem *_AggInFocus(Agg *p){
++  HashElem *pElem = sqliteHashFirst(&p->hash);
++  if( pElem==0 ){
++    AggInsert(p,"",1);
++    pElem = sqliteHashFirst(&p->hash);
++  }
++  return pElem ? sqliteHashData(pElem) : 0;
++}
++
++/*
++** Convert the given stack entity into a string if it isn't one
++** already.
++*/
++#define Stringify(P) if(((P)->flags & MEM_Str)==0){hardStringify(P);}
++static int hardStringify(Mem *pStack){
++  int fg = pStack->flags;
++  if( fg & MEM_Real ){
++    sqlite_snprintf(sizeof(pStack->zShort),pStack->zShort,"%.15g",pStack->r);
++  }else if( fg & MEM_Int ){
++    sqlite_snprintf(sizeof(pStack->zShort),pStack->zShort,"%d",pStack->i);
++  }else{
++    pStack->zShort[0] = 0;
++  }
++  pStack->z = pStack->zShort;
++  pStack->n = strlen(pStack->zShort)+1;
++  pStack->flags = MEM_Str | MEM_Short;
++  return 0;
++}
++
++/*
++** Convert the given stack entity into a string that has been obtained
++** from sqliteMalloc().  This is different from Stringify() above in that
++** Stringify() will use the NBFS bytes of static string space if the string
++** will fit but this routine always mallocs for space.
++** Return non-zero if we run out of memory.
++*/
++#define Dynamicify(P) (((P)->flags & MEM_Dyn)==0 ? hardDynamicify(P):0)
++static int hardDynamicify(Mem *pStack){
++  int fg = pStack->flags;
++  char *z;
++  if( (fg & MEM_Str)==0 ){
++    hardStringify(pStack);
++  }
++  assert( (fg & MEM_Dyn)==0 );
++  z = sqliteMallocRaw( pStack->n );
++  if( z==0 ) return 1;
++  memcpy(z, pStack->z, pStack->n);
++  pStack->z = z;
++  pStack->flags |= MEM_Dyn;
++  return 0;
++}
++
++/*
++** An ephemeral string value (signified by the MEM_Ephem flag) contains
++** a pointer to a dynamically allocated string where some other entity
++** is responsible for deallocating that string.  Because the stack entry
++** does not control the string, it might be deleted without the stack
++** entry knowing it.
++**
++** This routine converts an ephemeral string into a dynamically allocated
++** string that the stack entry itself controls.  In other words, it
++** converts an MEM_Ephem string into an MEM_Dyn string.
++*/
++#define Deephemeralize(P) \
++   if( ((P)->flags&MEM_Ephem)!=0 && hardDeephem(P) ){ goto no_mem;}
++static int hardDeephem(Mem *pStack){
++  char *z;
++  assert( (pStack->flags & MEM_Ephem)!=0 );
++  z = sqliteMallocRaw( pStack->n );
++  if( z==0 ) return 1;
++  memcpy(z, pStack->z, pStack->n);
++  pStack->z = z;
++  pStack->flags &= ~MEM_Ephem;
++  pStack->flags |= MEM_Dyn;
++  return 0;
++}
++
++/*
++** Release the memory associated with the given stack level.  This
++** leaves the Mem.flags field in an inconsistent state.
++*/
++#define Release(P) if((P)->flags&MEM_Dyn){ sqliteFree((P)->z); }
++
++/*
++** Pop the stack N times.
++*/
++static void popStack(Mem **ppTos, int N){
++  Mem *pTos = *ppTos;
++  while( N>0 ){
++    N--;
++    Release(pTos);
++    pTos--;
++  }
++  *ppTos = pTos;
++}
++
++/*
++** Return TRUE if zNum is a 32-bit signed integer and write
++** the value of the integer into *pNum.  If zNum is not an integer
++** or is an integer that is too large to be expressed with just 32
++** bits, then return false.
++**
++** Under Linux (RedHat 7.2) this routine is much faster than atoi()
++** for converting strings into integers.
++*/
++static int toInt(const char *zNum, int *pNum){
++  int v = 0;
++  int neg;
++  int i, c;
++  if( *zNum=='-' ){
++    neg = 1;
++    zNum++;
++  }else if( *zNum=='+' ){
++    neg = 0;
++    zNum++;
++  }else{
++    neg = 0;
++  }
++  for(i=0; (c=zNum[i])>='0' && c<='9'; i++){
++    v = v*10 + c - '0';
++  }
++  *pNum = neg ? -v : v;
++  return c==0 && i>0 && (i<10 || (i==10 && memcmp(zNum,"2147483647",10)<=0));
++}
++
++/*
++** Convert the given stack entity into a integer if it isn't one
++** already.
++**
++** Any prior string or real representation is invalidated.  
++** NULLs are converted into 0.
++*/
++#define Integerify(P) if(((P)->flags&MEM_Int)==0){ hardIntegerify(P); }
++static void hardIntegerify(Mem *pStack){
++  if( pStack->flags & MEM_Real ){
++    pStack->i = (int)pStack->r;
++    Release(pStack);
++  }else if( pStack->flags & MEM_Str ){
++    toInt(pStack->z, &pStack->i);
++    Release(pStack);
++  }else{
++    pStack->i = 0;
++  }
++  pStack->flags = MEM_Int;
++}
++
++/*
++** Get a valid Real representation for the given stack element.
++**
++** Any prior string or integer representation is retained.
++** NULLs are converted into 0.0.
++*/
++#define Realify(P) if(((P)->flags&MEM_Real)==0){ hardRealify(P); }
++static void hardRealify(Mem *pStack){
++  if( pStack->flags & MEM_Str ){
++    pStack->r = sqliteAtoF(pStack->z, 0);
++  }else if( pStack->flags & MEM_Int ){
++    pStack->r = pStack->i;
++  }else{
++    pStack->r = 0.0;
++  }
++  pStack->flags |= MEM_Real;
++}
++
++/*
++** The parameters are pointers to the head of two sorted lists
++** of Sorter structures.  Merge these two lists together and return
++** a single sorted list.  This routine forms the core of the merge-sort
++** algorithm.
++**
++** In the case of a tie, left sorts in front of right.
++*/
++static Sorter *Merge(Sorter *pLeft, Sorter *pRight){
++  Sorter sHead;
++  Sorter *pTail;
++  pTail = &sHead;
++  pTail->pNext = 0;
++  while( pLeft && pRight ){
++    int c = sqliteSortCompare(pLeft->zKey, pRight->zKey);
++    if( c<=0 ){
++      pTail->pNext = pLeft;
++      pLeft = pLeft->pNext;
++    }else{
++      pTail->pNext = pRight;
++      pRight = pRight->pNext;
++    }
++    pTail = pTail->pNext;
++  }
++  if( pLeft ){
++    pTail->pNext = pLeft;
++  }else if( pRight ){
++    pTail->pNext = pRight;
++  }
++  return sHead.pNext;
++}
++
++/*
++** The following routine works like a replacement for the standard
++** library routine fgets().  The difference is in how end-of-line (EOL)
++** is handled.  Standard fgets() uses LF for EOL under unix, CRLF
++** under windows, and CR under mac.  This routine accepts any of these
++** character sequences as an EOL mark.  The EOL mark is replaced by
++** a single LF character in zBuf.
++*/
++static char *vdbe_fgets(char *zBuf, int nBuf, FILE *in){
++  int i, c;
++  for(i=0; i<nBuf-1 && (c=getc(in))!=EOF; i++){
++    zBuf[i] = c;
++    if( c=='\r' || c=='\n' ){
++      if( c=='\r' ){
++        zBuf[i] = '\n';
++        c = getc(in);
++        if( c!=EOF && c!='\n' ) ungetc(c, in);
++      }
++      i++;
++      break;
++    }
++  }
++  zBuf[i]  = 0;
++  return i>0 ? zBuf : 0;
++}
++
++/*
++** Make sure there is space in the Vdbe structure to hold at least
++** mxCursor cursors.  If there is not currently enough space, then
++** allocate more.
++**
++** If a memory allocation error occurs, return 1.  Return 0 if
++** everything works.
++*/
++static int expandCursorArraySize(Vdbe *p, int mxCursor){
++  if( mxCursor>=p->nCursor ){
++    Cursor *aCsr = sqliteRealloc( p->aCsr, (mxCursor+1)*sizeof(Cursor) );
++    if( aCsr==0 ) return 1;
++    p->aCsr = aCsr;
++    memset(&p->aCsr[p->nCursor], 0, sizeof(Cursor)*(mxCursor+1-p->nCursor));
++    p->nCursor = mxCursor+1;
++  }
++  return 0;
++}
++
++#ifdef VDBE_PROFILE
++/*
++** The following routine only works on pentium-class processors.
++** It uses the RDTSC opcode to read cycle count value out of the
++** processor and returns that value.  This can be used for high-res
++** profiling.
++*/
++__inline__ unsigned long long int hwtime(void){
++  unsigned long long int x;
++  __asm__("rdtsc\n\t"
++          "mov %%edx, %%ecx\n\t"
++          :"=A" (x));
++  return x;
++}
++#endif
++
++/*
++** The CHECK_FOR_INTERRUPT macro defined here looks to see if the
++** sqlite_interrupt() routine has been called.  If it has been, then
++** processing of the VDBE program is interrupted.
++**
++** This macro added to every instruction that does a jump in order to
++** implement a loop.  This test used to be on every single instruction,
++** but that meant we more testing that we needed.  By only testing the
++** flag on jump instructions, we get a (small) speed improvement.
++*/
++#define CHECK_FOR_INTERRUPT \
++   if( db->flags & SQLITE_Interrupt ) goto abort_due_to_interrupt;
++
++
++/*
++** Execute as much of a VDBE program as we can then return.
++**
++** sqliteVdbeMakeReady() must be called before this routine in order to
++** close the program with a final OP_Halt and to set up the callbacks
++** and the error message pointer.
++**
++** Whenever a row or result data is available, this routine will either
++** invoke the result callback (if there is one) or return with
++** SQLITE_ROW.
++**
++** If an attempt is made to open a locked database, then this routine
++** will either invoke the busy callback (if there is one) or it will
++** return SQLITE_BUSY.
++**
++** If an error occurs, an error message is written to memory obtained
++** from sqliteMalloc() and p->zErrMsg is made to point to that memory.
++** The error code is stored in p->rc and this routine returns SQLITE_ERROR.
++**
++** If the callback ever returns non-zero, then the program exits
++** immediately.  There will be no error message but the p->rc field is
++** set to SQLITE_ABORT and this routine will return SQLITE_ERROR.
++**
++** A memory allocation error causes p->rc to be set to SQLITE_NOMEM and this
++** routine to return SQLITE_ERROR.
++**
++** Other fatal errors return SQLITE_ERROR.
++**
++** After this routine has finished, sqliteVdbeFinalize() should be
++** used to clean up the mess that was left behind.
++*/
++int sqliteVdbeExec(
++  Vdbe *p                    /* The VDBE */
++){
++  int pc;                    /* The program counter */
++  Op *pOp;                   /* Current operation */
++  int rc = SQLITE_OK;        /* Value to return */
++  sqlite *db = p->db;        /* The database */
++  Mem *pTos;                 /* Top entry in the operand stack */
++  char zBuf[100];            /* Space to sprintf() an integer */
++#ifdef VDBE_PROFILE
++  unsigned long long start;  /* CPU clock count at start of opcode */
++  int origPc;                /* Program counter at start of opcode */
++#endif
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++  int nProgressOps = 0;      /* Opcodes executed since progress callback. */
++#endif
++
++  if( p->magic!=VDBE_MAGIC_RUN ) return SQLITE_MISUSE;
++  assert( db->magic==SQLITE_MAGIC_BUSY );
++  assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY );
++  p->rc = SQLITE_OK;
++  assert( p->explain==0 );
++  if( sqlite_malloc_failed ) goto no_mem;
++  pTos = p->pTos;
++  if( p->popStack ){
++    popStack(&pTos, p->popStack);
++    p->popStack = 0;
++  }
++  CHECK_FOR_INTERRUPT;
++  for(pc=p->pc; rc==SQLITE_OK; pc++){
++    assert( pc>=0 && pc<p->nOp );
++    assert( pTos<=&p->aStack[pc] );
++#ifdef VDBE_PROFILE
++    origPc = pc;
++    start = hwtime();
++#endif
++    pOp = &p->aOp[pc];
++
++    /* Only allow tracing if NDEBUG is not defined.
++    */
++#ifndef NDEBUG
++    if( p->trace ){
++      sqliteVdbePrintOp(p->trace, pc, pOp);
++    }
++#endif
++
++    /* Check to see if we need to simulate an interrupt.  This only happens
++    ** if we have a special test build.
++    */
++#ifdef SQLITE_TEST
++    if( sqlite_interrupt_count>0 ){
++      sqlite_interrupt_count--;
++      if( sqlite_interrupt_count==0 ){
++        sqlite_interrupt(db);
++      }
++    }
++#endif
++
++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
++    /* Call the progress callback if it is configured and the required number
++    ** of VDBE ops have been executed (either since this invocation of
++    ** sqliteVdbeExec() or since last time the progress callback was called).
++    ** If the progress callback returns non-zero, exit the virtual machine with
++    ** a return code SQLITE_ABORT.
++    */
++    if( db->xProgress ){
++      if( db->nProgressOps==nProgressOps ){
++        if( db->xProgress(db->pProgressArg)!=0 ){
++          rc = SQLITE_ABORT;
++          continue; /* skip to the next iteration of the for loop */
++        }
++        nProgressOps = 0;
++      }
++      nProgressOps++;
++    }
++#endif
++
++    switch( pOp->opcode ){
++
++/*****************************************************************************
++** What follows is a massive switch statement where each case implements a
++** separate instruction in the virtual machine.  If we follow the usual
++** indentation conventions, each case should be indented by 6 spaces.  But
++** that is a lot of wasted space on the left margin.  So the code within
++** the switch statement will break with convention and be flush-left. Another
++** big comment (similar to this one) will mark the point in the code where
++** we transition back to normal indentation.
++**
++** The formatting of each case is important.  The makefile for SQLite
++** generates two C files "opcodes.h" and "opcodes.c" by scanning this
++** file looking for lines that begin with "case OP_".  The opcodes.h files
++** will be filled with #defines that give unique integer values to each
++** opcode and the opcodes.c file is filled with an array of strings where
++** each string is the symbolic name for the corresponding opcode.
++**
++** Documentation about VDBE opcodes is generated by scanning this file
++** for lines of that contain "Opcode:".  That line and all subsequent
++** comment lines are used in the generation of the opcode.html documentation
++** file.
++**
++** SUMMARY:
++**
++**     Formatting is important to scripts that scan this file.
++**     Do not deviate from the formatting style currently in use.
++**
++*****************************************************************************/
++
++/* Opcode:  Goto * P2 *
++**
++** An unconditional jump to address P2.
++** The next instruction executed will be 
++** the one at index P2 from the beginning of
++** the program.
++*/
++case OP_Goto: {
++  CHECK_FOR_INTERRUPT;
++  pc = pOp->p2 - 1;
++  break;
++}
++
++/* Opcode:  Gosub * P2 *
++**
++** Push the current address plus 1 onto the return address stack
++** and then jump to address P2.
++**
++** The return address stack is of limited depth.  If too many
++** OP_Gosub operations occur without intervening OP_Returns, then
++** the return address stack will fill up and processing will abort
++** with a fatal error.
++*/
++case OP_Gosub: {
++  if( p->returnDepth>=sizeof(p->returnStack)/sizeof(p->returnStack[0]) ){
++    sqliteSetString(&p->zErrMsg, "return address stack overflow", (char*)0);
++    p->rc = SQLITE_INTERNAL;
++    return SQLITE_ERROR;
++  }
++  p->returnStack[p->returnDepth++] = pc+1;
++  pc = pOp->p2 - 1;
++  break;
++}
++
++/* Opcode:  Return * * *
++**
++** Jump immediately to the next instruction after the last unreturned
++** OP_Gosub.  If an OP_Return has occurred for all OP_Gosubs, then
++** processing aborts with a fatal error.
++*/
++case OP_Return: {
++  if( p->returnDepth<=0 ){
++    sqliteSetString(&p->zErrMsg, "return address stack underflow", (char*)0);
++    p->rc = SQLITE_INTERNAL;
++    return SQLITE_ERROR;
++  }
++  p->returnDepth--;
++  pc = p->returnStack[p->returnDepth] - 1;
++  break;
++}
++
++/* Opcode:  Halt P1 P2 *
++**
++** Exit immediately.  All open cursors, Lists, Sorts, etc are closed
++** automatically.
++**
++** P1 is the result code returned by sqlite_exec().  For a normal
++** halt, this should be SQLITE_OK (0).  For errors, it can be some
++** other value.  If P1!=0 then P2 will determine whether or not to
++** rollback the current transaction.  Do not rollback if P2==OE_Fail.
++** Do the rollback if P2==OE_Rollback.  If P2==OE_Abort, then back
++** out all changes that have occurred during this execution of the
++** VDBE, but do not rollback the transaction. 
++**
++** There is an implied "Halt 0 0 0" instruction inserted at the very end of
++** every program.  So a jump past the last instruction of the program
++** is the same as executing Halt.
++*/
++case OP_Halt: {
++  p->magic = VDBE_MAGIC_HALT;
++  p->pTos = pTos;
++  if( pOp->p1!=SQLITE_OK ){
++    p->rc = pOp->p1;
++    p->errorAction = pOp->p2;
++    if( pOp->p3 ){
++      sqliteSetString(&p->zErrMsg, pOp->p3, (char*)0);
++    }
++    return SQLITE_ERROR;
++  }else{
++    p->rc = SQLITE_OK;
++    return SQLITE_DONE;
++  }
++}
++
++/* Opcode: Integer P1 * P3
++**
++** The integer value P1 is pushed onto the stack.  If P3 is not zero
++** then it is assumed to be a string representation of the same integer.
++*/
++case OP_Integer: {
++  pTos++;
++  pTos->i = pOp->p1;
++  pTos->flags = MEM_Int;
++  if( pOp->p3 ){
++    pTos->z = pOp->p3;
++    pTos->flags |= MEM_Str | MEM_Static;
++    pTos->n = strlen(pOp->p3)+1;
++  }
++  break;
++}
++
++/* Opcode: String * * P3
++**
++** The string value P3 is pushed onto the stack.  If P3==0 then a
++** NULL is pushed onto the stack.
++*/
++case OP_String: {
++  char *z = pOp->p3;
++  pTos++;
++  if( z==0 ){
++    pTos->flags = MEM_Null;
++  }else{
++    pTos->z = z;
++    pTos->n = strlen(z) + 1;
++    pTos->flags = MEM_Str | MEM_Static;
++  }
++  break;
++}
++
++/* Opcode: Variable P1 * *
++**
++** Push the value of variable P1 onto the stack.  A variable is
++** an unknown in the original SQL string as handed to sqlite_compile().
++** Any occurance of the '?' character in the original SQL is considered
++** a variable.  Variables in the SQL string are number from left to
++** right beginning with 1.  The values of variables are set using the
++** sqlite_bind() API.
++*/
++case OP_Variable: {
++  int j = pOp->p1 - 1;
++  pTos++;
++  if( j>=0 && j<p->nVar && p->azVar[j]!=0 ){
++    pTos->z = p->azVar[j];
++    pTos->n = p->anVar[j];
++    pTos->flags = MEM_Str | MEM_Static;
++  }else{
++    pTos->flags = MEM_Null;
++  }
++  break;
++}
++
++/* Opcode: Pop P1 * *
++**
++** P1 elements are popped off of the top of stack and discarded.
++*/
++case OP_Pop: {
++  assert( pOp->p1>=0 );
++  popStack(&pTos, pOp->p1);
++  assert( pTos>=&p->aStack[-1] );
++  break;
++}
++
++/* Opcode: Dup P1 P2 *
++**
++** A copy of the P1-th element of the stack 
++** is made and pushed onto the top of the stack.
++** The top of the stack is element 0.  So the
++** instruction "Dup 0 0 0" will make a copy of the
++** top of the stack.
++**
++** If the content of the P1-th element is a dynamically
++** allocated string, then a new copy of that string
++** is made if P2==0.  If P2!=0, then just a pointer
++** to the string is copied.
++**
++** Also see the Pull instruction.
++*/
++case OP_Dup: {
++  Mem *pFrom = &pTos[-pOp->p1];
++  assert( pFrom<=pTos && pFrom>=p->aStack );
++  pTos++;
++  memcpy(pTos, pFrom, sizeof(*pFrom)-NBFS);
++  if( pTos->flags & MEM_Str ){
++    if( pOp->p2 && (pTos->flags & (MEM_Dyn|MEM_Ephem)) ){
++      pTos->flags &= ~MEM_Dyn;
++      pTos->flags |= MEM_Ephem;
++    }else if( pTos->flags & MEM_Short ){
++      memcpy(pTos->zShort, pFrom->zShort, pTos->n);
++      pTos->z = pTos->zShort;
++    }else if( (pTos->flags & MEM_Static)==0 ){
++      pTos->z = sqliteMallocRaw(pFrom->n);
++      if( sqlite_malloc_failed ) goto no_mem;
++      memcpy(pTos->z, pFrom->z, pFrom->n);
++      pTos->flags &= ~(MEM_Static|MEM_Ephem|MEM_Short);
++      pTos->flags |= MEM_Dyn;
++    }
++  }
++  break;
++}
++
++/* Opcode: Pull P1 * *
++**
++** The P1-th element is removed from its current location on 
++** the stack and pushed back on top of the stack.  The
++** top of the stack is element 0, so "Pull 0 0 0" is
++** a no-op.  "Pull 1 0 0" swaps the top two elements of
++** the stack.
++**
++** See also the Dup instruction.
++*/
++case OP_Pull: {
++  Mem *pFrom = &pTos[-pOp->p1];
++  int i;
++  Mem ts;
++
++  ts = *pFrom;
++  Deephemeralize(pTos);
++  for(i=0; i<pOp->p1; i++, pFrom++){
++    Deephemeralize(&pFrom[1]);
++    *pFrom = pFrom[1];
++    assert( (pFrom->flags & MEM_Ephem)==0 );
++    if( pFrom->flags & MEM_Short ){
++      assert( pFrom->flags & MEM_Str );
++      assert( pFrom->z==pFrom[1].zShort );
++      pFrom->z = pFrom->zShort;
++    }
++  }
++  *pTos = ts;
++  if( pTos->flags & MEM_Short ){
++    assert( pTos->flags & MEM_Str );
++    assert( pTos->z==pTos[-pOp->p1].zShort );
++    pTos->z = pTos->zShort;
++  }
++  break;
++}
++
++/* Opcode: Push P1 * *
++**
++** Overwrite the value of the P1-th element down on the
++** stack (P1==0 is the top of the stack) with the value
++** of the top of the stack.  Then pop the top of the stack.
++*/
++case OP_Push: {
++  Mem *pTo = &pTos[-pOp->p1];
++
++  assert( pTo>=p->aStack );
++  Deephemeralize(pTos);
++  Release(pTo);
++  *pTo = *pTos;
++  if( pTo->flags & MEM_Short ){
++    assert( pTo->z==pTos->zShort );
++    pTo->z = pTo->zShort;
++  }
++  pTos--;
++  break;
++}
++
++
++/* Opcode: ColumnName P1 P2 P3
++**
++** P3 becomes the P1-th column name (first is 0).  An array of pointers
++** to all column names is passed as the 4th parameter to the callback.
++** If P2==1 then this is the last column in the result set and thus the
++** number of columns in the result set will be P1.  There must be at least
++** one OP_ColumnName with a P2==1 before invoking OP_Callback and the
++** number of columns specified in OP_Callback must one more than the P1
++** value of the OP_ColumnName that has P2==1.
++*/
++case OP_ColumnName: {
++  assert( pOp->p1>=0 && pOp->p1<p->nOp );
++  p->azColName[pOp->p1] = pOp->p3;
++  p->nCallback = 0;
++  if( pOp->p2 ) p->nResColumn = pOp->p1+1;
++  break;
++}
++
++/* Opcode: Callback P1 * *
++**
++** Pop P1 values off the stack and form them into an array.  Then
++** invoke the callback function using the newly formed array as the
++** 3rd parameter.
++*/
++case OP_Callback: {
++  int i;
++  char **azArgv = p->zArgv;
++  Mem *pCol;
++
++  pCol = &pTos[1-pOp->p1];
++  assert( pCol>=p->aStack );
++  for(i=0; i<pOp->p1; i++, pCol++){
++    if( pCol->flags & MEM_Null ){
++      azArgv[i] = 0;
++    }else{
++      Stringify(pCol);
++      azArgv[i] = pCol->z;
++    }
++  }
++  azArgv[i] = 0;
++  p->nCallback++;
++  p->azResColumn = azArgv;
++  assert( p->nResColumn==pOp->p1 );
++  p->popStack = pOp->p1;
++  p->pc = pc + 1;
++  p->pTos = pTos;
++  return SQLITE_ROW;
++}
++
++/* Opcode: Concat P1 P2 P3
++**
++** Look at the first P1 elements of the stack.  Append them all 
++** together with the lowest element first.  Use P3 as a separator.  
++** Put the result on the top of the stack.  The original P1 elements
++** are popped from the stack if P2==0 and retained if P2==1.  If
++** any element of the stack is NULL, then the result is NULL.
++**
++** If P3 is NULL, then use no separator.  When P1==1, this routine
++** makes a copy of the top stack element into memory obtained
++** from sqliteMalloc().
++*/
++case OP_Concat: {
++  char *zNew;
++  int nByte;
++  int nField;
++  int i, j;
++  char *zSep;
++  int nSep;
++  Mem *pTerm;
++
++  nField = pOp->p1;
++  zSep = pOp->p3;
++  if( zSep==0 ) zSep = "";
++  nSep = strlen(zSep);
++  assert( &pTos[1-nField] >= p->aStack );
++  nByte = 1 - nSep;
++  pTerm = &pTos[1-nField];
++  for(i=0; i<nField; i++, pTerm++){
++    if( pTerm->flags & MEM_Null ){
++      nByte = -1;
++      break;
++    }else{
++      Stringify(pTerm);
++      nByte += pTerm->n - 1 + nSep;
++    }
++  }
++  if( nByte<0 ){
++    if( pOp->p2==0 ){
++      popStack(&pTos, nField);
++    }
++    pTos++;
++    pTos->flags = MEM_Null;
++    break;
++  }
++  zNew = sqliteMallocRaw( nByte );
++  if( zNew==0 ) goto no_mem;
++  j = 0;
++  pTerm = &pTos[1-nField];
++  for(i=j=0; i<nField; i++, pTerm++){
++    assert( pTerm->flags & MEM_Str );
++    memcpy(&zNew[j], pTerm->z, pTerm->n-1);
++    j += pTerm->n-1;
++    if( nSep>0 && i<nField-1 ){
++      memcpy(&zNew[j], zSep, nSep);
++      j += nSep;
++    }
++  }
++  zNew[j] = 0;
++  if( pOp->p2==0 ){
++    popStack(&pTos, nField);
++  }
++  pTos++;
++  pTos->n = nByte;
++  pTos->flags = MEM_Str|MEM_Dyn;
++  pTos->z = zNew;
++  break;
++}
++
++/* Opcode: Add * * *
++**
++** Pop the top two elements from the stack, add them together,
++** and push the result back onto the stack.  If either element
++** is a string then it is converted to a double using the atof()
++** function before the addition.
++** If either operand is NULL, the result is NULL.
++*/
++/* Opcode: Multiply * * *
++**
++** Pop the top two elements from the stack, multiply them together,
++** and push the result back onto the stack.  If either element
++** is a string then it is converted to a double using the atof()
++** function before the multiplication.
++** If either operand is NULL, the result is NULL.
++*/
++/* Opcode: Subtract * * *
++**
++** Pop the top two elements from the stack, subtract the
++** first (what was on top of the stack) from the second (the
++** next on stack)
++** and push the result back onto the stack.  If either element
++** is a string then it is converted to a double using the atof()
++** function before the subtraction.
++** If either operand is NULL, the result is NULL.
++*/
++/* Opcode: Divide * * *
++**
++** Pop the top two elements from the stack, divide the
++** first (what was on top of the stack) from the second (the
++** next on stack)
++** and push the result back onto the stack.  If either element
++** is a string then it is converted to a double using the atof()
++** function before the division.  Division by zero returns NULL.
++** If either operand is NULL, the result is NULL.
++*/
++/* Opcode: Remainder * * *
++**
++** Pop the top two elements from the stack, divide the
++** first (what was on top of the stack) from the second (the
++** next on stack)
++** and push the remainder after division onto the stack.  If either element
++** is a string then it is converted to a double using the atof()
++** function before the division.  Division by zero returns NULL.
++** If either operand is NULL, the result is NULL.
++*/
++case OP_Add:
++case OP_Subtract:
++case OP_Multiply:
++case OP_Divide:
++case OP_Remainder: {
++  Mem *pNos = &pTos[-1];
++  assert( pNos>=p->aStack );
++  if( ((pTos->flags | pNos->flags) & MEM_Null)!=0 ){
++    Release(pTos);
++    pTos--;
++    Release(pTos);
++    pTos->flags = MEM_Null;
++  }else if( (pTos->flags & pNos->flags & MEM_Int)==MEM_Int ){
++    int a, b;
++    a = pTos->i;
++    b = pNos->i;
++    switch( pOp->opcode ){
++      case OP_Add:         b += a;       break;
++      case OP_Subtract:    b -= a;       break;
++      case OP_Multiply:    b *= a;       break;
++      case OP_Divide: {
++        if( a==0 ) goto divide_by_zero;
++        b /= a;
++        break;
++      }
++      default: {
++        if( a==0 ) goto divide_by_zero;
++        b %= a;
++        break;
++      }
++    }
++    Release(pTos);
++    pTos--;
++    Release(pTos);
++    pTos->i = b;
++    pTos->flags = MEM_Int;
++  }else{
++    double a, b;
++    Realify(pTos);
++    Realify(pNos);
++    a = pTos->r;
++    b = pNos->r;
++    switch( pOp->opcode ){
++      case OP_Add:         b += a;       break;
++      case OP_Subtract:    b -= a;       break;
++      case OP_Multiply:    b *= a;       break;
++      case OP_Divide: {
++        if( a==0.0 ) goto divide_by_zero;
++        b /= a;
++        break;
++      }
++      default: {
++        int ia = (int)a;
++        int ib = (int)b;
++        if( ia==0.0 ) goto divide_by_zero;
++        b = ib % ia;
++        break;
++      }
++    }
++    Release(pTos);
++    pTos--;
++    Release(pTos);
++    pTos->r = b;
++    pTos->flags = MEM_Real;
++  }
++  break;
++
++divide_by_zero:
++  Release(pTos);
++  pTos--;
++  Release(pTos);
++  pTos->flags = MEM_Null;
++  break;
++}
++
++/* Opcode: Function P1 * P3
++**
++** Invoke a user function (P3 is a pointer to a Function structure that
++** defines the function) with P1 string arguments taken from the stack.
++** Pop all arguments from the stack and push back the result.
++**
++** See also: AggFunc
++*/
++case OP_Function: {
++  int n, i;
++  Mem *pArg;
++  char **azArgv;
++  sqlite_func ctx;
++
++  n = pOp->p1;
++  pArg = &pTos[1-n];
++  azArgv = p->zArgv;
++  for(i=0; i<n; i++, pArg++){
++    if( pArg->flags & MEM_Null ){
++      azArgv[i] = 0;
++    }else{
++      Stringify(pArg);
++      azArgv[i] = pArg->z;
++    }
++  }
++  ctx.pFunc = (FuncDef*)pOp->p3;
++  ctx.s.flags = MEM_Null;
++  ctx.s.z = 0;
++  ctx.isError = 0;
++  ctx.isStep = 0;
++  if( sqliteSafetyOff(db) ) goto abort_due_to_misuse;
++  (*ctx.pFunc->xFunc)(&ctx, n, (const char**)azArgv);
++  if( sqliteSafetyOn(db) ) goto abort_due_to_misuse;
++  popStack(&pTos, n);
++  pTos++;
++  *pTos = ctx.s;
++  if( pTos->flags & MEM_Short ){
++    pTos->z = pTos->zShort;
++  }
++  if( ctx.isError ){
++    sqliteSetString(&p->zErrMsg, 
++       (pTos->flags & MEM_Str)!=0 ? pTos->z : "user function error", (char*)0);
++    rc = SQLITE_ERROR;
++  }
++  break;
++}
++
++/* Opcode: BitAnd * * *
++**
++** Pop the top two elements from the stack.  Convert both elements
++** to integers.  Push back onto the stack the bit-wise AND of the
++** two elements.
++** If either operand is NULL, the result is NULL.
++*/
++/* Opcode: BitOr * * *
++**
++** Pop the top two elements from the stack.  Convert both elements
++** to integers.  Push back onto the stack the bit-wise OR of the
++** two elements.
++** If either operand is NULL, the result is NULL.
++*/
++/* Opcode: ShiftLeft * * *
++**
++** Pop the top two elements from the stack.  Convert both elements
++** to integers.  Push back onto the stack the top element shifted
++** left by N bits where N is the second element on the stack.
++** If either operand is NULL, the result is NULL.
++*/
++/* Opcode: ShiftRight * * *
++**
++** Pop the top two elements from the stack.  Convert both elements
++** to integers.  Push back onto the stack the top element shifted
++** right by N bits where N is the second element on the stack.
++** If either operand is NULL, the result is NULL.
++*/
++case OP_BitAnd:
++case OP_BitOr:
++case OP_ShiftLeft:
++case OP_ShiftRight: {
++  Mem *pNos = &pTos[-1];
++  int a, b;
++
++  assert( pNos>=p->aStack );
++  if( (pTos->flags | pNos->flags) & MEM_Null ){
++    popStack(&pTos, 2);
++    pTos++;
++    pTos->flags = MEM_Null;
++    break;
++  }
++  Integerify(pTos);
++  Integerify(pNos);
++  a = pTos->i;
++  b = pNos->i;
++  switch( pOp->opcode ){
++    case OP_BitAnd:      a &= b;     break;
++    case OP_BitOr:       a |= b;     break;
++    case OP_ShiftLeft:   a <<= b;    break;
++    case OP_ShiftRight:  a >>= b;    break;
++    default:   /* CANT HAPPEN */     break;
++  }
++  assert( (pTos->flags & MEM_Dyn)==0 );
++  assert( (pNos->flags & MEM_Dyn)==0 );
++  pTos--;
++  Release(pTos);
++  pTos->i = a;
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: AddImm  P1 * *
++** 
++** Add the value P1 to whatever is on top of the stack.  The result
++** is always an integer.
++**
++** To force the top of the stack to be an integer, just add 0.
++*/
++case OP_AddImm: {
++  assert( pTos>=p->aStack );
++  Integerify(pTos);
++  pTos->i += pOp->p1;
++  break;
++}
++
++/* Opcode: ForceInt P1 P2 *
++**
++** Convert the top of the stack into an integer.  If the current top of
++** the stack is not numeric (meaning that is is a NULL or a string that
++** does not look like an integer or floating point number) then pop the
++** stack and jump to P2.  If the top of the stack is numeric then
++** convert it into the least integer that is greater than or equal to its
++** current value if P1==0, or to the least integer that is strictly
++** greater than its current value if P1==1.
++*/
++case OP_ForceInt: {
++  int v;
++  assert( pTos>=p->aStack );
++  if( (pTos->flags & (MEM_Int|MEM_Real))==0
++         && ((pTos->flags & MEM_Str)==0 || sqliteIsNumber(pTos->z)==0) ){
++    Release(pTos);
++    pTos--;
++    pc = pOp->p2 - 1;
++    break;
++  }
++  if( pTos->flags & MEM_Int ){
++    v = pTos->i + (pOp->p1!=0);
++  }else{
++    Realify(pTos);
++    v = (int)pTos->r;
++    if( pTos->r>(double)v ) v++;
++    if( pOp->p1 && pTos->r==(double)v ) v++;
++  }
++  Release(pTos);
++  pTos->i = v;
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: MustBeInt P1 P2 *
++** 
++** Force the top of the stack to be an integer.  If the top of the
++** stack is not an integer and cannot be converted into an integer
++** with out data loss, then jump immediately to P2, or if P2==0
++** raise an SQLITE_MISMATCH exception.
++**
++** If the top of the stack is not an integer and P2 is not zero and
++** P1 is 1, then the stack is popped.  In all other cases, the depth
++** of the stack is unchanged.
++*/
++case OP_MustBeInt: {
++  assert( pTos>=p->aStack );
++  if( pTos->flags & MEM_Int ){
++    /* Do nothing */
++  }else if( pTos->flags & MEM_Real ){
++    int i = (int)pTos->r;
++    double r = (double)i;
++    if( r!=pTos->r ){
++      goto mismatch;
++    }
++    pTos->i = i;
++  }else if( pTos->flags & MEM_Str ){
++    int v;
++    if( !toInt(pTos->z, &v) ){
++      double r;
++      if( !sqliteIsNumber(pTos->z) ){
++        goto mismatch;
++      }
++      Realify(pTos);
++      v = (int)pTos->r;
++      r = (double)v;
++      if( r!=pTos->r ){
++        goto mismatch;
++      }
++    }
++    pTos->i = v;
++  }else{
++    goto mismatch;
++  }
++  Release(pTos);
++  pTos->flags = MEM_Int;
++  break;
++
++mismatch:
++  if( pOp->p2==0 ){
++    rc = SQLITE_MISMATCH;
++    goto abort_due_to_error;
++  }else{
++    if( pOp->p1 ) popStack(&pTos, 1);
++    pc = pOp->p2 - 1;
++  }
++  break;
++}
++
++/* Opcode: Eq P1 P2 *
++**
++** Pop the top two elements from the stack.  If they are equal, then
++** jump to instruction P2.  Otherwise, continue to the next instruction.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** If both values are numeric, they are converted to doubles using atof()
++** and compared for equality that way.  Otherwise the strcmp() library
++** routine is used for the comparison.  For a pure text comparison
++** use OP_StrEq.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: Ne P1 P2 *
++**
++** Pop the top two elements from the stack.  If they are not equal, then
++** jump to instruction P2.  Otherwise, continue to the next instruction.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** If both values are numeric, they are converted to doubles using atof()
++** and compared in that format.  Otherwise the strcmp() library
++** routine is used for the comparison.  For a pure text comparison
++** use OP_StrNe.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: Lt P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the
++** next on stack) is less than the first (the top of stack), then
++** jump to instruction P2.  Otherwise, continue to the next instruction.
++** In other words, jump if NOS<TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** If both values are numeric, they are converted to doubles using atof()
++** and compared in that format.  Numeric values are always less than
++** non-numeric values.  If both operands are non-numeric, the strcmp() library
++** routine is used for the comparison.  For a pure text comparison
++** use OP_StrLt.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: Le P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the
++** next on stack) is less than or equal to the first (the top of stack),
++** then jump to instruction P2. In other words, jump if NOS<=TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** If both values are numeric, they are converted to doubles using atof()
++** and compared in that format.  Numeric values are always less than
++** non-numeric values.  If both operands are non-numeric, the strcmp() library
++** routine is used for the comparison.  For a pure text comparison
++** use OP_StrLe.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: Gt P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the
++** next on stack) is greater than the first (the top of stack),
++** then jump to instruction P2. In other words, jump if NOS>TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** If both values are numeric, they are converted to doubles using atof()
++** and compared in that format.  Numeric values are always less than
++** non-numeric values.  If both operands are non-numeric, the strcmp() library
++** routine is used for the comparison.  For a pure text comparison
++** use OP_StrGt.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: Ge P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the next
++** on stack) is greater than or equal to the first (the top of stack),
++** then jump to instruction P2. In other words, jump if NOS>=TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** If both values are numeric, they are converted to doubles using atof()
++** and compared in that format.  Numeric values are always less than
++** non-numeric values.  If both operands are non-numeric, the strcmp() library
++** routine is used for the comparison.  For a pure text comparison
++** use OP_StrGe.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++case OP_Eq:
++case OP_Ne:
++case OP_Lt:
++case OP_Le:
++case OP_Gt:
++case OP_Ge: {
++  Mem *pNos = &pTos[-1];
++  int c, v;
++  int ft, fn;
++  assert( pNos>=p->aStack );
++  ft = pTos->flags;
++  fn = pNos->flags;
++  if( (ft | fn) & MEM_Null ){
++    popStack(&pTos, 2);
++    if( pOp->p2 ){
++      if( pOp->p1 ) pc = pOp->p2-1;
++    }else{
++      pTos++;
++      pTos->flags = MEM_Null;
++    }
++    break;
++  }else if( (ft & fn & MEM_Int)==MEM_Int ){
++    c = pNos->i - pTos->i;
++  }else if( (ft & MEM_Int)!=0 && (fn & MEM_Str)!=0 && toInt(pNos->z,&v) ){
++    c = v - pTos->i;
++  }else if( (fn & MEM_Int)!=0 && (ft & MEM_Str)!=0 && toInt(pTos->z,&v) ){
++    c = pNos->i - v;
++  }else{
++    Stringify(pTos);
++    Stringify(pNos);
++    c = sqliteCompare(pNos->z, pTos->z);
++  }
++  switch( pOp->opcode ){
++    case OP_Eq:    c = c==0;     break;
++    case OP_Ne:    c = c!=0;     break;
++    case OP_Lt:    c = c<0;      break;
++    case OP_Le:    c = c<=0;     break;
++    case OP_Gt:    c = c>0;      break;
++    default:       c = c>=0;     break;
++  }
++  popStack(&pTos, 2);
++  if( pOp->p2 ){
++    if( c ) pc = pOp->p2-1;
++  }else{
++    pTos++;
++    pTos->i = c;
++    pTos->flags = MEM_Int;
++  }
++  break;
++}
++/* INSERT NO CODE HERE!
++**
++** The opcode numbers are extracted from this source file by doing
++**
++**    grep '^case OP_' vdbe.c | ... >opcodes.h
++**
++** The opcodes are numbered in the order that they appear in this file.
++** But in order for the expression generating code to work right, the
++** string comparison operators that follow must be numbered exactly 6
++** greater than the numeric comparison opcodes above.  So no other
++** cases can appear between the two.
++*/
++/* Opcode: StrEq P1 P2 *
++**
++** Pop the top two elements from the stack.  If they are equal, then
++** jump to instruction P2.  Otherwise, continue to the next instruction.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** The strcmp() library routine is used for the comparison.  For a
++** numeric comparison, use OP_Eq.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: StrNe P1 P2 *
++**
++** Pop the top two elements from the stack.  If they are not equal, then
++** jump to instruction P2.  Otherwise, continue to the next instruction.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** The strcmp() library routine is used for the comparison.  For a
++** numeric comparison, use OP_Ne.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: StrLt P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the
++** next on stack) is less than the first (the top of stack), then
++** jump to instruction P2.  Otherwise, continue to the next instruction.
++** In other words, jump if NOS<TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** The strcmp() library routine is used for the comparison.  For a
++** numeric comparison, use OP_Lt.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: StrLe P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the
++** next on stack) is less than or equal to the first (the top of stack),
++** then jump to instruction P2. In other words, jump if NOS<=TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** The strcmp() library routine is used for the comparison.  For a
++** numeric comparison, use OP_Le.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: StrGt P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the
++** next on stack) is greater than the first (the top of stack),
++** then jump to instruction P2. In other words, jump if NOS>TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** The strcmp() library routine is used for the comparison.  For a
++** numeric comparison, use OP_Gt.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++/* Opcode: StrGe P1 P2 *
++**
++** Pop the top two elements from the stack.  If second element (the next
++** on stack) is greater than or equal to the first (the top of stack),
++** then jump to instruction P2. In other words, jump if NOS>=TOS.
++**
++** If either operand is NULL (and thus if the result is unknown) then
++** take the jump if P1 is true.
++**
++** The strcmp() library routine is used for the comparison.  For a
++** numeric comparison, use OP_Ge.
++**
++** If P2 is zero, do not jump.  Instead, push an integer 1 onto the
++** stack if the jump would have been taken, or a 0 if not.  Push a
++** NULL if either operand was NULL.
++*/
++case OP_StrEq:
++case OP_StrNe:
++case OP_StrLt:
++case OP_StrLe:
++case OP_StrGt:
++case OP_StrGe: {
++  Mem *pNos = &pTos[-1];
++  int c;
++  assert( pNos>=p->aStack );
++  if( (pNos->flags | pTos->flags) & MEM_Null ){
++    popStack(&pTos, 2);
++    if( pOp->p2 ){
++      if( pOp->p1 ) pc = pOp->p2-1;
++    }else{
++      pTos++;
++      pTos->flags = MEM_Null;
++    }
++    break;
++  }else{
++    Stringify(pTos);
++    Stringify(pNos);
++    c = strcmp(pNos->z, pTos->z);
++  }
++  /* The asserts on each case of the following switch are there to verify
++  ** that string comparison opcodes are always exactly 6 greater than the
++  ** corresponding numeric comparison opcodes.  The code generator depends
++  ** on this fact.
++  */
++  switch( pOp->opcode ){
++    case OP_StrEq:    c = c==0;    assert( pOp->opcode-6==OP_Eq );   break;
++    case OP_StrNe:    c = c!=0;    assert( pOp->opcode-6==OP_Ne );   break;
++    case OP_StrLt:    c = c<0;     assert( pOp->opcode-6==OP_Lt );   break;
++    case OP_StrLe:    c = c<=0;    assert( pOp->opcode-6==OP_Le );   break;
++    case OP_StrGt:    c = c>0;     assert( pOp->opcode-6==OP_Gt );   break;
++    default:          c = c>=0;    assert( pOp->opcode-6==OP_Ge );   break;
++  }
++  popStack(&pTos, 2);
++  if( pOp->p2 ){
++    if( c ) pc = pOp->p2-1;
++  }else{
++    pTos++;
++    pTos->flags = MEM_Int;
++    pTos->i = c;
++  }
++  break;
++}
++
++/* Opcode: And * * *
++**
++** Pop two values off the stack.  Take the logical AND of the
++** two values and push the resulting boolean value back onto the
++** stack. 
++*/
++/* Opcode: Or * * *
++**
++** Pop two values off the stack.  Take the logical OR of the
++** two values and push the resulting boolean value back onto the
++** stack. 
++*/
++case OP_And:
++case OP_Or: {
++  Mem *pNos = &pTos[-1];
++  int v1, v2;    /* 0==TRUE, 1==FALSE, 2==UNKNOWN or NULL */
++
++  assert( pNos>=p->aStack );
++  if( pTos->flags & MEM_Null ){
++    v1 = 2;
++  }else{
++    Integerify(pTos);
++    v1 = pTos->i==0;
++  }
++  if( pNos->flags & MEM_Null ){
++    v2 = 2;
++  }else{
++    Integerify(pNos);
++    v2 = pNos->i==0;
++  }
++  if( pOp->opcode==OP_And ){
++    static const unsigned char and_logic[] = { 0, 1, 2, 1, 1, 1, 2, 1, 2 };
++    v1 = and_logic[v1*3+v2];
++  }else{
++    static const unsigned char or_logic[] = { 0, 0, 0, 0, 1, 2, 0, 2, 2 };
++    v1 = or_logic[v1*3+v2];
++  }
++  popStack(&pTos, 2);
++  pTos++;
++  if( v1==2 ){
++    pTos->flags = MEM_Null;
++  }else{
++    pTos->i = v1==0;
++    pTos->flags = MEM_Int;
++  }
++  break;
++}
++
++/* Opcode: Negative * * *
++**
++** Treat the top of the stack as a numeric quantity.  Replace it
++** with its additive inverse.  If the top of the stack is NULL
++** its value is unchanged.
++*/
++/* Opcode: AbsValue * * *
++**
++** Treat the top of the stack as a numeric quantity.  Replace it
++** with its absolute value. If the top of the stack is NULL
++** its value is unchanged.
++*/
++case OP_Negative:
++case OP_AbsValue: {
++  assert( pTos>=p->aStack );
++  if( pTos->flags & MEM_Real ){
++    Release(pTos);
++    if( pOp->opcode==OP_Negative || pTos->r<0.0 ){
++      pTos->r = -pTos->r;
++    }
++    pTos->flags = MEM_Real;
++  }else if( pTos->flags & MEM_Int ){
++    Release(pTos);
++    if( pOp->opcode==OP_Negative || pTos->i<0 ){
++      pTos->i = -pTos->i;
++    }
++    pTos->flags = MEM_Int;
++  }else if( pTos->flags & MEM_Null ){
++    /* Do nothing */
++  }else{
++    Realify(pTos);
++    Release(pTos);
++    if( pOp->opcode==OP_Negative || pTos->r<0.0 ){
++      pTos->r = -pTos->r;
++    }
++    pTos->flags = MEM_Real;
++  }
++  break;
++}
++
++/* Opcode: Not * * *
++**
++** Interpret the top of the stack as a boolean value.  Replace it
++** with its complement.  If the top of the stack is NULL its value
++** is unchanged.
++*/
++case OP_Not: {
++  assert( pTos>=p->aStack );
++  if( pTos->flags & MEM_Null ) break;  /* Do nothing to NULLs */
++  Integerify(pTos);
++  Release(pTos);
++  pTos->i = !pTos->i;
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: BitNot * * *
++**
++** Interpret the top of the stack as an value.  Replace it
++** with its ones-complement.  If the top of the stack is NULL its
++** value is unchanged.
++*/
++case OP_BitNot: {
++  assert( pTos>=p->aStack );
++  if( pTos->flags & MEM_Null ) break;  /* Do nothing to NULLs */
++  Integerify(pTos);
++  Release(pTos);
++  pTos->i = ~pTos->i;
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: Noop * * *
++**
++** Do nothing.  This instruction is often useful as a jump
++** destination.
++*/
++case OP_Noop: {
++  break;
++}
++
++/* Opcode: If P1 P2 *
++**
++** Pop a single boolean from the stack.  If the boolean popped is
++** true, then jump to p2.  Otherwise continue to the next instruction.
++** An integer is false if zero and true otherwise.  A string is
++** false if it has zero length and true otherwise.
++**
++** If the value popped of the stack is NULL, then take the jump if P1
++** is true and fall through if P1 is false.
++*/
++/* Opcode: IfNot P1 P2 *
++**
++** Pop a single boolean from the stack.  If the boolean popped is
++** false, then jump to p2.  Otherwise continue to the next instruction.
++** An integer is false if zero and true otherwise.  A string is
++** false if it has zero length and true otherwise.
++**
++** If the value popped of the stack is NULL, then take the jump if P1
++** is true and fall through if P1 is false.
++*/
++case OP_If:
++case OP_IfNot: {
++  int c;
++  assert( pTos>=p->aStack );
++  if( pTos->flags & MEM_Null ){
++    c = pOp->p1;
++  }else{
++    Integerify(pTos);
++    c = pTos->i;
++    if( pOp->opcode==OP_IfNot ) c = !c;
++  }
++  assert( (pTos->flags & MEM_Dyn)==0 );
++  pTos--;
++  if( c ) pc = pOp->p2-1;
++  break;
++}
++
++/* Opcode: IsNull P1 P2 *
++**
++** If any of the top abs(P1) values on the stack are NULL, then jump
++** to P2.  Pop the stack P1 times if P1>0.   If P1<0 leave the stack
++** unchanged.
++*/
++case OP_IsNull: {
++  int i, cnt;
++  Mem *pTerm;
++  cnt = pOp->p1;
++  if( cnt<0 ) cnt = -cnt;
++  pTerm = &pTos[1-cnt];
++  assert( pTerm>=p->aStack );
++  for(i=0; i<cnt; i++, pTerm++){
++    if( pTerm->flags & MEM_Null ){
++      pc = pOp->p2-1;
++      break;
++    }
++  }
++  if( pOp->p1>0 ) popStack(&pTos, cnt);
++  break;
++}
++
++/* Opcode: NotNull P1 P2 *
++**
++** Jump to P2 if the top P1 values on the stack are all not NULL.  Pop the
++** stack if P1 times if P1 is greater than zero.  If P1 is less than
++** zero then leave the stack unchanged.
++*/
++case OP_NotNull: {
++  int i, cnt;
++  cnt = pOp->p1;
++  if( cnt<0 ) cnt = -cnt;
++  assert( &pTos[1-cnt] >= p->aStack );
++  for(i=0; i<cnt && (pTos[1+i-cnt].flags & MEM_Null)==0; i++){}
++  if( i>=cnt ) pc = pOp->p2-1;
++  if( pOp->p1>0 ) popStack(&pTos, cnt);
++  break;
++}
++
++/* Opcode: MakeRecord P1 P2 *
++**
++** Convert the top P1 entries of the stack into a single entry
++** suitable for use as a data record in a database table.  The
++** details of the format are irrelavant as long as the OP_Column
++** opcode can decode the record later.  Refer to source code
++** comments for the details of the record format.
++**
++** If P2 is true (non-zero) and one or more of the P1 entries
++** that go into building the record is NULL, then add some extra
++** bytes to the record to make it distinct for other entries created
++** during the same run of the VDBE.  The extra bytes added are a
++** counter that is reset with each run of the VDBE, so records
++** created this way will not necessarily be distinct across runs.
++** But they should be distinct for transient tables (created using
++** OP_OpenTemp) which is what they are intended for.
++**
++** (Later:) The P2==1 option was intended to make NULLs distinct
++** for the UNION operator.  But I have since discovered that NULLs
++** are indistinct for UNION.  So this option is never used.
++*/
++case OP_MakeRecord: {
++  char *zNewRecord;
++  int nByte;
++  int nField;
++  int i, j;
++  int idxWidth;
++  u32 addr;
++  Mem *pRec;
++  int addUnique = 0;   /* True to cause bytes to be added to make the
++                       ** generated record distinct */
++  char zTemp[NBFS];    /* Temp space for small records */
++
++  /* Assuming the record contains N fields, the record format looks
++  ** like this:
++  **
++  **   -------------------------------------------------------------------
++  **   | idx0 | idx1 | ... | idx(N-1) | idx(N) | data0 | ... | data(N-1) |
++  **   -------------------------------------------------------------------
++  **
++  ** All data fields are converted to strings before being stored and
++  ** are stored with their null terminators.  NULL entries omit the
++  ** null terminator.  Thus an empty string uses 1 byte and a NULL uses
++  ** zero bytes.  Data(0) is taken from the lowest element of the stack
++  ** and data(N-1) is the top of the stack.
++  **
++  ** Each of the idx() entries is either 1, 2, or 3 bytes depending on
++  ** how big the total record is.  Idx(0) contains the offset to the start
++  ** of data(0).  Idx(k) contains the offset to the start of data(k).
++  ** Idx(N) contains the total number of bytes in the record.
++  */
++  nField = pOp->p1;
++  pRec = &pTos[1-nField];
++  assert( pRec>=p->aStack );
++  nByte = 0;
++  for(i=0; i<nField; i++, pRec++){
++    if( pRec->flags & MEM_Null ){
++      addUnique = pOp->p2;
++    }else{
++      Stringify(pRec);
++      nByte += pRec->n;
++    }
++  }
++  if( addUnique ) nByte += sizeof(p->uniqueCnt);
++  if( nByte + nField + 1 < 256 ){
++    idxWidth = 1;
++  }else if( nByte + 2*nField + 2 < 65536 ){
++    idxWidth = 2;
++  }else{
++    idxWidth = 3;
++  }
++  nByte += idxWidth*(nField + 1);
++  if( nByte>MAX_BYTES_PER_ROW ){
++    rc = SQLITE_TOOBIG;
++    goto abort_due_to_error;
++  }
++  if( nByte<=NBFS ){
++    zNewRecord = zTemp;
++  }else{
++    zNewRecord = sqliteMallocRaw( nByte );
++    if( zNewRecord==0 ) goto no_mem;
++  }
++  j = 0;
++  addr = idxWidth*(nField+1) + addUnique*sizeof(p->uniqueCnt);
++  for(i=0, pRec=&pTos[1-nField]; i<nField; i++, pRec++){
++    zNewRecord[j++] = addr & 0xff;
++    if( idxWidth>1 ){
++      zNewRecord[j++] = (addr>>8)&0xff;
++      if( idxWidth>2 ){
++        zNewRecord[j++] = (addr>>16)&0xff;
++      }
++    }
++    if( (pRec->flags & MEM_Null)==0 ){
++      addr += pRec->n;
++    }
++  }
++  zNewRecord[j++] = addr & 0xff;
++  if( idxWidth>1 ){
++    zNewRecord[j++] = (addr>>8)&0xff;
++    if( idxWidth>2 ){
++      zNewRecord[j++] = (addr>>16)&0xff;
++    }
++  }
++  if( addUnique ){
++    memcpy(&zNewRecord[j], &p->uniqueCnt, sizeof(p->uniqueCnt));
++    p->uniqueCnt++;
++    j += sizeof(p->uniqueCnt);
++  }
++  for(i=0, pRec=&pTos[1-nField]; i<nField; i++, pRec++){
++    if( (pRec->flags & MEM_Null)==0 ){
++      memcpy(&zNewRecord[j], pRec->z, pRec->n);
++      j += pRec->n;
++    }
++  }
++  popStack(&pTos, nField);
++  pTos++;
++  pTos->n = nByte;
++  if( nByte<=NBFS ){
++    assert( zNewRecord==zTemp );
++    memcpy(pTos->zShort, zTemp, nByte);
++    pTos->z = pTos->zShort;
++    pTos->flags = MEM_Str | MEM_Short;
++  }else{
++    assert( zNewRecord!=zTemp );
++    pTos->z = zNewRecord;
++    pTos->flags = MEM_Str | MEM_Dyn;
++  }
++  break;
++}
++
++/* Opcode: MakeKey P1 P2 P3
++**
++** Convert the top P1 entries of the stack into a single entry suitable
++** for use as the key in an index.  The top P1 records are
++** converted to strings and merged.  The null-terminators 
++** are retained and used as separators.
++** The lowest entry in the stack is the first field and the top of the
++** stack becomes the last.
++**
++** If P2 is not zero, then the original entries remain on the stack
++** and the new key is pushed on top.  If P2 is zero, the original
++** data is popped off the stack first then the new key is pushed
++** back in its place.
++**
++** P3 is a string that is P1 characters long.  Each character is either
++** an 'n' or a 't' to indicates if the argument should be intepreted as
++** numeric or text type.  The first character of P3 corresponds to the
++** lowest element on the stack.  If P3 is NULL then all arguments are
++** assumed to be of the numeric type.
++**
++** The type makes a difference in that text-type fields may not be 
++** introduced by 'b' (as described in the next paragraph).  The
++** first character of a text-type field must be either 'a' (if it is NULL)
++** or 'c'.  Numeric fields will be introduced by 'b' if their content
++** looks like a well-formed number.  Otherwise the 'a' or 'c' will be
++** used.
++**
++** The key is a concatenation of fields.  Each field is terminated by
++** a single 0x00 character.  A NULL field is introduced by an 'a' and
++** is followed immediately by its 0x00 terminator.  A numeric field is
++** introduced by a single character 'b' and is followed by a sequence
++** of characters that represent the number such that a comparison of
++** the character string using memcpy() sorts the numbers in numerical
++** order.  The character strings for numbers are generated using the
++** sqliteRealToSortable() function.  A text field is introduced by a
++** 'c' character and is followed by the exact text of the field.  The
++** use of an 'a', 'b', or 'c' character at the beginning of each field
++** guarantees that NULLs sort before numbers and that numbers sort
++** before text.  0x00 characters do not occur except as separators
++** between fields.
++**
++** See also: MakeIdxKey, SortMakeKey
++*/
++/* Opcode: MakeIdxKey P1 P2 P3
++**
++** Convert the top P1 entries of the stack into a single entry suitable
++** for use as the key in an index.  In addition, take one additional integer
++** off of the stack, treat that integer as a four-byte record number, and
++** append the four bytes to the key.  Thus a total of P1+1 entries are
++** popped from the stack for this instruction and a single entry is pushed
++** back.  The first P1 entries that are popped are strings and the last
++** entry (the lowest on the stack) is an integer record number.
++**
++** The converstion of the first P1 string entries occurs just like in
++** MakeKey.  Each entry is separated from the others by a null.
++** The entire concatenation is null-terminated.  The lowest entry
++** in the stack is the first field and the top of the stack becomes the
++** last.
++**
++** If P2 is not zero and one or more of the P1 entries that go into the
++** generated key is NULL, then jump to P2 after the new key has been
++** pushed on the stack.  In other words, jump to P2 if the key is
++** guaranteed to be unique.  This jump can be used to skip a subsequent
++** uniqueness test.
++**
++** P3 is a string that is P1 characters long.  Each character is either
++** an 'n' or a 't' to indicates if the argument should be numeric or
++** text.  The first character corresponds to the lowest element on the
++** stack.  If P3 is null then all arguments are assumed to be numeric.
++**
++** See also:  MakeKey, SortMakeKey
++*/
++case OP_MakeIdxKey:
++case OP_MakeKey: {
++  char *zNewKey;
++  int nByte;
++  int nField;
++  int addRowid;
++  int i, j;
++  int containsNull = 0;
++  Mem *pRec;
++  char zTemp[NBFS];
++
++  addRowid = pOp->opcode==OP_MakeIdxKey;
++  nField = pOp->p1;
++  pRec = &pTos[1-nField];
++  assert( pRec>=p->aStack );
++  nByte = 0;
++  for(j=0, i=0; i<nField; i++, j++, pRec++){
++    int flags = pRec->flags;
++    int len;
++    char *z;
++    if( flags & MEM_Null ){
++      nByte += 2;
++      containsNull = 1;
++    }else if( pOp->p3 && pOp->p3[j]=='t' ){
++      Stringify(pRec);
++      pRec->flags &= ~(MEM_Int|MEM_Real);
++      nByte += pRec->n+1;
++    }else if( (flags & (MEM_Real|MEM_Int))!=0 || sqliteIsNumber(pRec->z) ){
++      if( (flags & (MEM_Real|MEM_Int))==MEM_Int ){
++        pRec->r = pRec->i;
++      }else if( (flags & (MEM_Real|MEM_Int))==0 ){
++        pRec->r = sqliteAtoF(pRec->z, 0);
++      }
++      Release(pRec);
++      z = pRec->zShort;
++      sqliteRealToSortable(pRec->r, z);
++      len = strlen(z);
++      pRec->z = 0;
++      pRec->flags = MEM_Real;
++      pRec->n = len+1;
++      nByte += pRec->n+1;
++    }else{
++      nByte += pRec->n+1;
++    }
++  }
++  if( nByte+sizeof(u32)>MAX_BYTES_PER_ROW ){
++    rc = SQLITE_TOOBIG;
++    goto abort_due_to_error;
++  }
++  if( addRowid ) nByte += sizeof(u32);
++  if( nByte<=NBFS ){
++    zNewKey = zTemp;
++  }else{
++    zNewKey = sqliteMallocRaw( nByte );
++    if( zNewKey==0 ) goto no_mem;
++  }
++  j = 0;
++  pRec = &pTos[1-nField];
++  for(i=0; i<nField; i++, pRec++){
++    if( pRec->flags & MEM_Null ){
++      zNewKey[j++] = 'a';
++      zNewKey[j++] = 0;
++    }else if( pRec->flags==MEM_Real ){
++      zNewKey[j++] = 'b';
++      memcpy(&zNewKey[j], pRec->zShort, pRec->n);
++      j += pRec->n;
++    }else{
++      assert( pRec->flags & MEM_Str );
++      zNewKey[j++] = 'c';
++      memcpy(&zNewKey[j], pRec->z, pRec->n);
++      j += pRec->n;
++    }
++  }
++  if( addRowid ){
++    u32 iKey;
++    pRec = &pTos[-nField];
++    assert( pRec>=p->aStack );
++    Integerify(pRec);
++    iKey = intToKey(pRec->i);
++    memcpy(&zNewKey[j], &iKey, sizeof(u32));
++    popStack(&pTos, nField+1);
++    if( pOp->p2 && containsNull ) pc = pOp->p2 - 1;
++  }else{
++    if( pOp->p2==0 ) popStack(&pTos, nField);
++  }
++  pTos++;
++  pTos->n = nByte;
++  if( nByte<=NBFS ){
++    assert( zNewKey==zTemp );
++    pTos->z = pTos->zShort;
++    memcpy(pTos->zShort, zTemp, nByte);
++    pTos->flags = MEM_Str | MEM_Short;
++  }else{
++    pTos->z = zNewKey;
++    pTos->flags = MEM_Str | MEM_Dyn;
++  }
++  break;
++}
++
++/* Opcode: IncrKey * * *
++**
++** The top of the stack should contain an index key generated by
++** The MakeKey opcode.  This routine increases the least significant
++** byte of that key by one.  This is used so that the MoveTo opcode
++** will move to the first entry greater than the key rather than to
++** the key itself.
++*/
++case OP_IncrKey: {
++  assert( pTos>=p->aStack );
++  /* The IncrKey opcode is only applied to keys generated by
++  ** MakeKey or MakeIdxKey and the results of those operands
++  ** are always dynamic strings or zShort[] strings.  So we
++  ** are always free to modify the string in place.
++  */
++  assert( pTos->flags & (MEM_Dyn|MEM_Short) );
++  pTos->z[pTos->n-1]++;
++  break;
++}
++
++/* Opcode: Checkpoint P1 * *
++**
++** Begin a checkpoint.  A checkpoint is the beginning of a operation that
++** is part of a larger transaction but which might need to be rolled back
++** itself without effecting the containing transaction.  A checkpoint will
++** be automatically committed or rollback when the VDBE halts.
++**
++** The checkpoint is begun on the database file with index P1.  The main
++** database file has an index of 0 and the file used for temporary tables
++** has an index of 1.
++*/
++case OP_Checkpoint: {
++  int i = pOp->p1;
++  if( i>=0 && i<db->nDb && db->aDb[i].pBt && db->aDb[i].inTrans==1 ){
++    rc = sqliteBtreeBeginCkpt(db->aDb[i].pBt);
++    if( rc==SQLITE_OK ) db->aDb[i].inTrans = 2;
++  }
++  break;
++}
++
++/* Opcode: Transaction P1 * *
++**
++** Begin a transaction.  The transaction ends when a Commit or Rollback
++** opcode is encountered.  Depending on the ON CONFLICT setting, the
++** transaction might also be rolled back if an error is encountered.
++**
++** P1 is the index of the database file on which the transaction is
++** started.  Index 0 is the main database file and index 1 is the
++** file used for temporary tables.
++**
++** A write lock is obtained on the database file when a transaction is
++** started.  No other process can read or write the file while the
++** transaction is underway.  Starting a transaction also creates a
++** rollback journal.  A transaction must be started before any changes
++** can be made to the database.
++*/
++case OP_Transaction: {
++  int busy = 1;
++  int i = pOp->p1;
++  assert( i>=0 && i<db->nDb );
++  if( db->aDb[i].inTrans ) break;
++  while( db->aDb[i].pBt!=0 && busy ){
++    rc = sqliteBtreeBeginTrans(db->aDb[i].pBt);
++    switch( rc ){
++      case SQLITE_BUSY: {
++        if( db->xBusyCallback==0 ){
++          p->pc = pc;
++          p->undoTransOnError = 1;
++          p->rc = SQLITE_BUSY;
++          p->pTos = pTos;
++          return SQLITE_BUSY;
++        }else if( (*db->xBusyCallback)(db->pBusyArg, "", busy++)==0 ){
++          sqliteSetString(&p->zErrMsg, sqlite_error_string(rc), (char*)0);
++          busy = 0;
++        }
++        break;
++      }
++      case SQLITE_READONLY: {
++        rc = SQLITE_OK;
++        /* Fall thru into the next case */
++      }
++      case SQLITE_OK: {
++        p->inTempTrans = 0;
++        busy = 0;
++        break;
++      }
++      default: {
++        goto abort_due_to_error;
++      }
++    }
++  }
++  db->aDb[i].inTrans = 1;
++  p->undoTransOnError = 1;
++  break;
++}
++
++/* Opcode: Commit * * *
++**
++** Cause all modifications to the database that have been made since the
++** last Transaction to actually take effect.  No additional modifications
++** are allowed until another transaction is started.  The Commit instruction
++** deletes the journal file and releases the write lock on the database.
++** A read lock continues to be held if there are still cursors open.
++*/
++case OP_Commit: {
++  int i;
++  if( db->xCommitCallback!=0 ){
++    if( sqliteSafetyOff(db) ) goto abort_due_to_misuse; 
++    if( db->xCommitCallback(db->pCommitArg)!=0 ){
++      rc = SQLITE_CONSTRAINT;
++    }
++    if( sqliteSafetyOn(db) ) goto abort_due_to_misuse;
++  }
++  for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
++    if( db->aDb[i].inTrans ){
++      rc = sqliteBtreeCommit(db->aDb[i].pBt);
++      db->aDb[i].inTrans = 0;
++    }
++  }
++  if( rc==SQLITE_OK ){
++    sqliteCommitInternalChanges(db);
++  }else{
++    sqliteRollbackAll(db);
++  }
++  break;
++}
++
++/* Opcode: Rollback P1 * *
++**
++** Cause all modifications to the database that have been made since the
++** last Transaction to be undone. The database is restored to its state
++** before the Transaction opcode was executed.  No additional modifications
++** are allowed until another transaction is started.
++**
++** P1 is the index of the database file that is committed.  An index of 0
++** is used for the main database and an index of 1 is used for the file used
++** to hold temporary tables.
++**
++** This instruction automatically closes all cursors and releases both
++** the read and write locks on the indicated database.
++*/
++case OP_Rollback: {
++  sqliteRollbackAll(db);
++  break;
++}
++
++/* Opcode: ReadCookie P1 P2 *
++**
++** Read cookie number P2 from database P1 and push it onto the stack.
++** P2==0 is the schema version.  P2==1 is the database format.
++** P2==2 is the recommended pager cache size, and so forth.  P1==0 is
++** the main database file and P1==1 is the database file used to store
++** temporary tables.
++**
++** There must be a read-lock on the database (either a transaction
++** must be started or there must be an open cursor) before
++** executing this instruction.
++*/
++case OP_ReadCookie: {
++  int aMeta[SQLITE_N_BTREE_META];
++  assert( pOp->p2<SQLITE_N_BTREE_META );
++  assert( pOp->p1>=0 && pOp->p1<db->nDb );
++  assert( db->aDb[pOp->p1].pBt!=0 );
++  rc = sqliteBtreeGetMeta(db->aDb[pOp->p1].pBt, aMeta);
++  pTos++;
++  pTos->i = aMeta[1+pOp->p2];
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: SetCookie P1 P2 *
++**
++** Write the top of the stack into cookie number P2 of database P1.
++** P2==0 is the schema version.  P2==1 is the database format.
++** P2==2 is the recommended pager cache size, and so forth.  P1==0 is
++** the main database file and P1==1 is the database file used to store
++** temporary tables.
++**
++** A transaction must be started before executing this opcode.
++*/
++case OP_SetCookie: {
++  int aMeta[SQLITE_N_BTREE_META];
++  assert( pOp->p2<SQLITE_N_BTREE_META );
++  assert( pOp->p1>=0 && pOp->p1<db->nDb );
++  assert( db->aDb[pOp->p1].pBt!=0 );
++  assert( pTos>=p->aStack );
++  Integerify(pTos)
++  rc = sqliteBtreeGetMeta(db->aDb[pOp->p1].pBt, aMeta);
++  if( rc==SQLITE_OK ){
++    aMeta[1+pOp->p2] = pTos->i;
++    rc = sqliteBtreeUpdateMeta(db->aDb[pOp->p1].pBt, aMeta);
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: VerifyCookie P1 P2 *
++**
++** Check the value of global database parameter number 0 (the
++** schema version) and make sure it is equal to P2.  
++** P1 is the database number which is 0 for the main database file
++** and 1 for the file holding temporary tables and some higher number
++** for auxiliary databases.
++**
++** The cookie changes its value whenever the database schema changes.
++** This operation is used to detect when that the cookie has changed
++** and that the current process needs to reread the schema.
++**
++** Either a transaction needs to have been started or an OP_Open needs
++** to be executed (to establish a read lock) before this opcode is
++** invoked.
++*/
++case OP_VerifyCookie: {
++  int aMeta[SQLITE_N_BTREE_META];
++  assert( pOp->p1>=0 && pOp->p1<db->nDb );
++  rc = sqliteBtreeGetMeta(db->aDb[pOp->p1].pBt, aMeta);
++  if( rc==SQLITE_OK && aMeta[1]!=pOp->p2 ){
++    sqliteSetString(&p->zErrMsg, "database schema has changed", (char*)0);
++    rc = SQLITE_SCHEMA;
++  }
++  break;
++}
++
++/* Opcode: OpenRead P1 P2 P3
++**
++** Open a read-only cursor for the database table whose root page is
++** P2 in a database file.  The database file is determined by an 
++** integer from the top of the stack.  0 means the main database and
++** 1 means the database used for temporary tables.  Give the new 
++** cursor an identifier of P1.  The P1 values need not be contiguous
++** but all P1 values should be small integers.  It is an error for
++** P1 to be negative.
++**
++** If P2==0 then take the root page number from the next of the stack.
++**
++** There will be a read lock on the database whenever there is an
++** open cursor.  If the database was unlocked prior to this instruction
++** then a read lock is acquired as part of this instruction.  A read
++** lock allows other processes to read the database but prohibits
++** any other process from modifying the database.  The read lock is
++** released when all cursors are closed.  If this instruction attempts
++** to get a read lock but fails, the script terminates with an
++** SQLITE_BUSY error code.
++**
++** The P3 value is the name of the table or index being opened.
++** The P3 value is not actually used by this opcode and may be
++** omitted.  But the code generator usually inserts the index or
++** table name into P3 to make the code easier to read.
++**
++** See also OpenWrite.
++*/
++/* Opcode: OpenWrite P1 P2 P3
++**
++** Open a read/write cursor named P1 on the table or index whose root
++** page is P2.  If P2==0 then take the root page number from the stack.
++**
++** The P3 value is the name of the table or index being opened.
++** The P3 value is not actually used by this opcode and may be
++** omitted.  But the code generator usually inserts the index or
++** table name into P3 to make the code easier to read.
++**
++** This instruction works just like OpenRead except that it opens the cursor
++** in read/write mode.  For a given table, there can be one or more read-only
++** cursors or a single read/write cursor but not both.
++**
++** See also OpenRead.
++*/
++case OP_OpenRead:
++case OP_OpenWrite: {
++  int busy = 0;
++  int i = pOp->p1;
++  int p2 = pOp->p2;
++  int wrFlag;
++  Btree *pX;
++  int iDb;
++  
++  assert( pTos>=p->aStack );
++  Integerify(pTos);
++  iDb = pTos->i;
++  pTos--;
++  assert( iDb>=0 && iDb<db->nDb );
++  pX = db->aDb[iDb].pBt;
++  assert( pX!=0 );
++  wrFlag = pOp->opcode==OP_OpenWrite;
++  if( p2<=0 ){
++    assert( pTos>=p->aStack );
++    Integerify(pTos);
++    p2 = pTos->i;
++    pTos--;
++    if( p2<2 ){
++      sqliteSetString(&p->zErrMsg, "root page number less than 2", (char*)0);
++      rc = SQLITE_INTERNAL;
++      break;
++    }
++  }
++  assert( i>=0 );
++  if( expandCursorArraySize(p, i) ) goto no_mem;
++  sqliteVdbeCleanupCursor(&p->aCsr[i]);
++  memset(&p->aCsr[i], 0, sizeof(Cursor));
++  p->aCsr[i].nullRow = 1;
++  if( pX==0 ) break;
++  do{
++    rc = sqliteBtreeCursor(pX, p2, wrFlag, &p->aCsr[i].pCursor);
++    switch( rc ){
++      case SQLITE_BUSY: {
++        if( db->xBusyCallback==0 ){
++          p->pc = pc;
++          p->rc = SQLITE_BUSY;
++          p->pTos = &pTos[1 + (pOp->p2<=0)]; /* Operands must remain on stack */
++          return SQLITE_BUSY;
++        }else if( (*db->xBusyCallback)(db->pBusyArg, pOp->p3, ++busy)==0 ){
++          sqliteSetString(&p->zErrMsg, sqlite_error_string(rc), (char*)0);
++          busy = 0;
++        }
++        break;
++      }
++      case SQLITE_OK: {
++        busy = 0;
++        break;
++      }
++      default: {
++        goto abort_due_to_error;
++      }
++    }
++  }while( busy );
++  break;
++}
++
++/* Opcode: OpenTemp P1 P2 *
++**
++** Open a new cursor to a transient table.
++** The transient cursor is always opened read/write even if 
++** the main database is read-only.  The transient table is deleted
++** automatically when the cursor is closed.
++**
++** The cursor points to a BTree table if P2==0 and to a BTree index
++** if P2==1.  A BTree table must have an integer key and can have arbitrary
++** data.  A BTree index has no data but can have an arbitrary key.
++**
++** This opcode is used for tables that exist for the duration of a single
++** SQL statement only.  Tables created using CREATE TEMPORARY TABLE
++** are opened using OP_OpenRead or OP_OpenWrite.  "Temporary" in the
++** context of this opcode means for the duration of a single SQL statement
++** whereas "Temporary" in the context of CREATE TABLE means for the duration
++** of the connection to the database.  Same word; different meanings.
++*/
++case OP_OpenTemp: {
++  int i = pOp->p1;
++  Cursor *pCx;
++  assert( i>=0 );
++  if( expandCursorArraySize(p, i) ) goto no_mem;
++  pCx = &p->aCsr[i];
++  sqliteVdbeCleanupCursor(pCx);
++  memset(pCx, 0, sizeof(*pCx));
++  pCx->nullRow = 1;
++  rc = sqliteBtreeFactory(db, 0, 1, TEMP_PAGES, &pCx->pBt);
++
++  if( rc==SQLITE_OK ){
++    rc = sqliteBtreeBeginTrans(pCx->pBt);
++  }
++  if( rc==SQLITE_OK ){
++    if( pOp->p2 ){
++      int pgno;
++      rc = sqliteBtreeCreateIndex(pCx->pBt, &pgno);
++      if( rc==SQLITE_OK ){
++        rc = sqliteBtreeCursor(pCx->pBt, pgno, 1, &pCx->pCursor);
++      }
++    }else{
++      rc = sqliteBtreeCursor(pCx->pBt, 2, 1, &pCx->pCursor);
++    }
++  }
++  break;
++}
++
++/* Opcode: OpenPseudo P1 * *
++**
++** Open a new cursor that points to a fake table that contains a single
++** row of data.  Any attempt to write a second row of data causes the
++** first row to be deleted.  All data is deleted when the cursor is
++** closed.
++**
++** A pseudo-table created by this opcode is useful for holding the
++** NEW or OLD tables in a trigger.
++*/
++case OP_OpenPseudo: {
++  int i = pOp->p1;
++  Cursor *pCx;
++  assert( i>=0 );
++  if( expandCursorArraySize(p, i) ) goto no_mem;
++  pCx = &p->aCsr[i];
++  sqliteVdbeCleanupCursor(pCx);
++  memset(pCx, 0, sizeof(*pCx));
++  pCx->nullRow = 1;
++  pCx->pseudoTable = 1;
++  break;
++}
++
++/* Opcode: Close P1 * *
++**
++** Close a cursor previously opened as P1.  If P1 is not
++** currently open, this instruction is a no-op.
++*/
++case OP_Close: {
++  int i = pOp->p1;
++  if( i>=0 && i<p->nCursor ){
++    sqliteVdbeCleanupCursor(&p->aCsr[i]);
++  }
++  break;
++}
++
++/* Opcode: MoveTo P1 P2 *
++**
++** Pop the top of the stack and use its value as a key.  Reposition
++** cursor P1 so that it points to an entry with a matching key.  If
++** the table contains no record with a matching key, then the cursor
++** is left pointing at the first record that is greater than the key.
++** If there are no records greater than the key and P2 is not zero,
++** then an immediate jump to P2 is made.
++**
++** See also: Found, NotFound, Distinct, MoveLt
++*/
++/* Opcode: MoveLt P1 P2 *
++**
++** Pop the top of the stack and use its value as a key.  Reposition
++** cursor P1 so that it points to the entry with the largest key that is
++** less than the key popped from the stack.
++** If there are no records less than than the key and P2
++** is not zero then an immediate jump to P2 is made.
++**
++** See also: MoveTo
++*/
++case OP_MoveLt:
++case OP_MoveTo: {
++  int i = pOp->p1;
++  Cursor *pC;
++
++  assert( pTos>=p->aStack );
++  assert( i>=0 && i<p->nCursor );
++  pC = &p->aCsr[i];
++  if( pC->pCursor!=0 ){
++    int res, oc;
++    pC->nullRow = 0;
++    if( pTos->flags & MEM_Int ){
++      int iKey = intToKey(pTos->i);
++      if( pOp->p2==0 && pOp->opcode==OP_MoveTo ){
++        pC->movetoTarget = iKey;
++        pC->deferredMoveto = 1;
++        Release(pTos);
++        pTos--;
++        break;
++      }
++      sqliteBtreeMoveto(pC->pCursor, (char*)&iKey, sizeof(int), &res);
++      pC->lastRecno = pTos->i;
++      pC->recnoIsValid = res==0;
++    }else{
++      Stringify(pTos);
++      sqliteBtreeMoveto(pC->pCursor, pTos->z, pTos->n, &res);
++      pC->recnoIsValid = 0;
++    }
++    pC->deferredMoveto = 0;
++    sqlite_search_count++;
++    oc = pOp->opcode;
++    if( oc==OP_MoveTo && res<0 ){
++      sqliteBtreeNext(pC->pCursor, &res);
++      pC->recnoIsValid = 0;
++      if( res && pOp->p2>0 ){
++        pc = pOp->p2 - 1;
++      }
++    }else if( oc==OP_MoveLt ){
++      if( res>=0 ){
++        sqliteBtreePrevious(pC->pCursor, &res);
++        pC->recnoIsValid = 0;
++      }else{
++        /* res might be negative because the table is empty.  Check to
++        ** see if this is the case.
++        */
++        int keysize;
++        res = sqliteBtreeKeySize(pC->pCursor,&keysize)!=0 || keysize==0;
++      }
++      if( res && pOp->p2>0 ){
++        pc = pOp->p2 - 1;
++      }
++    }
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: Distinct P1 P2 *
++**
++** Use the top of the stack as a string key.  If a record with that key does
++** not exist in the table of cursor P1, then jump to P2.  If the record
++** does already exist, then fall thru.  The cursor is left pointing
++** at the record if it exists. The key is not popped from the stack.
++**
++** This operation is similar to NotFound except that this operation
++** does not pop the key from the stack.
++**
++** See also: Found, NotFound, MoveTo, IsUnique, NotExists
++*/
++/* Opcode: Found P1 P2 *
++**
++** Use the top of the stack as a string key.  If a record with that key
++** does exist in table of P1, then jump to P2.  If the record
++** does not exist, then fall thru.  The cursor is left pointing
++** to the record if it exists.  The key is popped from the stack.
++**
++** See also: Distinct, NotFound, MoveTo, IsUnique, NotExists
++*/
++/* Opcode: NotFound P1 P2 *
++**
++** Use the top of the stack as a string key.  If a record with that key
++** does not exist in table of P1, then jump to P2.  If the record
++** does exist, then fall thru.  The cursor is left pointing to the
++** record if it exists.  The key is popped from the stack.
++**
++** The difference between this operation and Distinct is that
++** Distinct does not pop the key from the stack.
++**
++** See also: Distinct, Found, MoveTo, NotExists, IsUnique
++*/
++case OP_Distinct:
++case OP_NotFound:
++case OP_Found: {
++  int i = pOp->p1;
++  int alreadyExists = 0;
++  Cursor *pC;
++  assert( pTos>=p->aStack );
++  assert( i>=0 && i<p->nCursor );
++  if( (pC = &p->aCsr[i])->pCursor!=0 ){
++    int res, rx;
++    Stringify(pTos);
++    rx = sqliteBtreeMoveto(pC->pCursor, pTos->z, pTos->n, &res);
++    alreadyExists = rx==SQLITE_OK && res==0;
++    pC->deferredMoveto = 0;
++  }
++  if( pOp->opcode==OP_Found ){
++    if( alreadyExists ) pc = pOp->p2 - 1;
++  }else{
++    if( !alreadyExists ) pc = pOp->p2 - 1;
++  }
++  if( pOp->opcode!=OP_Distinct ){
++    Release(pTos);
++    pTos--;
++  }
++  break;
++}
++
++/* Opcode: IsUnique P1 P2 *
++**
++** The top of the stack is an integer record number.  Call this
++** record number R.  The next on the stack is an index key created
++** using MakeIdxKey.  Call it K.  This instruction pops R from the
++** stack but it leaves K unchanged.
++**
++** P1 is an index.  So all but the last four bytes of K are an
++** index string.  The last four bytes of K are a record number.
++**
++** This instruction asks if there is an entry in P1 where the
++** index string matches K but the record number is different
++** from R.  If there is no such entry, then there is an immediate
++** jump to P2.  If any entry does exist where the index string
++** matches K but the record number is not R, then the record
++** number for that entry is pushed onto the stack and control
++** falls through to the next instruction.
++**
++** See also: Distinct, NotFound, NotExists, Found
++*/
++case OP_IsUnique: {
++  int i = pOp->p1;
++  Mem *pNos = &pTos[-1];
++  BtCursor *pCrsr;
++  int R;
++
++  /* Pop the value R off the top of the stack
++  */
++  assert( pNos>=p->aStack );
++  Integerify(pTos);
++  R = pTos->i;
++  pTos--;
++  assert( i>=0 && i<=p->nCursor );
++  if( (pCrsr = p->aCsr[i].pCursor)!=0 ){
++    int res, rc;
++    int v;         /* The record number on the P1 entry that matches K */
++    char *zKey;    /* The value of K */
++    int nKey;      /* Number of bytes in K */
++
++    /* Make sure K is a string and make zKey point to K
++    */
++    Stringify(pNos);
++    zKey = pNos->z;
++    nKey = pNos->n;
++    assert( nKey >= 4 );
++
++    /* Search for an entry in P1 where all but the last four bytes match K.
++    ** If there is no such entry, jump immediately to P2.
++    */
++    assert( p->aCsr[i].deferredMoveto==0 );
++    rc = sqliteBtreeMoveto(pCrsr, zKey, nKey-4, &res);
++    if( rc!=SQLITE_OK ) goto abort_due_to_error;
++    if( res<0 ){
++      rc = sqliteBtreeNext(pCrsr, &res);
++      if( res ){
++        pc = pOp->p2 - 1;
++        break;
++      }
++    }
++    rc = sqliteBtreeKeyCompare(pCrsr, zKey, nKey-4, 4, &res);
++    if( rc!=SQLITE_OK ) goto abort_due_to_error;
++    if( res>0 ){
++      pc = pOp->p2 - 1;
++      break;
++    }
++
++    /* At this point, pCrsr is pointing to an entry in P1 where all but
++    ** the last for bytes of the key match K.  Check to see if the last
++    ** four bytes of the key are different from R.  If the last four
++    ** bytes equal R then jump immediately to P2.
++    */
++    sqliteBtreeKey(pCrsr, nKey - 4, 4, (char*)&v);
++    v = keyToInt(v);
++    if( v==R ){
++      pc = pOp->p2 - 1;
++      break;
++    }
++
++    /* The last four bytes of the key are different from R.  Convert the
++    ** last four bytes of the key into an integer and push it onto the
++    ** stack.  (These bytes are the record number of an entry that
++    ** violates a UNIQUE constraint.)
++    */
++    pTos++;
++    pTos->i = v;
++    pTos->flags = MEM_Int;
++  }
++  break;
++}
++
++/* Opcode: NotExists P1 P2 *
++**
++** Use the top of the stack as a integer key.  If a record with that key
++** does not exist in table of P1, then jump to P2.  If the record
++** does exist, then fall thru.  The cursor is left pointing to the
++** record if it exists.  The integer key is popped from the stack.
++**
++** The difference between this operation and NotFound is that this
++** operation assumes the key is an integer and NotFound assumes it
++** is a string.
++**
++** See also: Distinct, Found, MoveTo, NotFound, IsUnique
++*/
++case OP_NotExists: {
++  int i = pOp->p1;
++  BtCursor *pCrsr;
++  assert( pTos>=p->aStack );
++  assert( i>=0 && i<p->nCursor );
++  if( (pCrsr = p->aCsr[i].pCursor)!=0 ){
++    int res, rx, iKey;
++    assert( pTos->flags & MEM_Int );
++    iKey = intToKey(pTos->i);
++    rx = sqliteBtreeMoveto(pCrsr, (char*)&iKey, sizeof(int), &res);
++    p->aCsr[i].lastRecno = pTos->i;
++    p->aCsr[i].recnoIsValid = res==0;
++    p->aCsr[i].nullRow = 0;
++    if( rx!=SQLITE_OK || res!=0 ){
++      pc = pOp->p2 - 1;
++      p->aCsr[i].recnoIsValid = 0;
++    }
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: NewRecno P1 * *
++**
++** Get a new integer record number used as the key to a table.
++** The record number is not previously used as a key in the database
++** table that cursor P1 points to.  The new record number is pushed 
++** onto the stack.
++*/
++case OP_NewRecno: {
++  int i = pOp->p1;
++  int v = 0;
++  Cursor *pC;
++  assert( i>=0 && i<p->nCursor );
++  if( (pC = &p->aCsr[i])->pCursor==0 ){
++    v = 0;
++  }else{
++    /* The next rowid or record number (different terms for the same
++    ** thing) is obtained in a two-step algorithm.
++    **
++    ** First we attempt to find the largest existing rowid and add one
++    ** to that.  But if the largest existing rowid is already the maximum
++    ** positive integer, we have to fall through to the second
++    ** probabilistic algorithm
++    **
++    ** The second algorithm is to select a rowid at random and see if
++    ** it already exists in the table.  If it does not exist, we have
++    ** succeeded.  If the random rowid does exist, we select a new one
++    ** and try again, up to 1000 times.
++    **
++    ** For a table with less than 2 billion entries, the probability
++    ** of not finding a unused rowid is about 1.0e-300.  This is a 
++    ** non-zero probability, but it is still vanishingly small and should
++    ** never cause a problem.  You are much, much more likely to have a
++    ** hardware failure than for this algorithm to fail.
++    **
++    ** The analysis in the previous paragraph assumes that you have a good
++    ** source of random numbers.  Is a library function like lrand48()
++    ** good enough?  Maybe. Maybe not. It's hard to know whether there
++    ** might be subtle bugs is some implementations of lrand48() that
++    ** could cause problems. To avoid uncertainty, SQLite uses its own 
++    ** random number generator based on the RC4 algorithm.
++    **
++    ** To promote locality of reference for repetitive inserts, the
++    ** first few attempts at chosing a random rowid pick values just a little
++    ** larger than the previous rowid.  This has been shown experimentally
++    ** to double the speed of the COPY operation.
++    */
++    int res, rx, cnt, x;
++    cnt = 0;
++    if( !pC->useRandomRowid ){
++      if( pC->nextRowidValid ){
++        v = pC->nextRowid;
++      }else{
++        rx = sqliteBtreeLast(pC->pCursor, &res);
++        if( res ){
++          v = 1;
++        }else{
++          sqliteBtreeKey(pC->pCursor, 0, sizeof(v), (void*)&v);
++          v = keyToInt(v);
++          if( v==0x7fffffff ){
++            pC->useRandomRowid = 1;
++          }else{
++            v++;
++          }
++        }
++      }
++      if( v<0x7fffffff ){
++        pC->nextRowidValid = 1;
++        pC->nextRowid = v+1;
++      }else{
++        pC->nextRowidValid = 0;
++      }
++    }
++    if( pC->useRandomRowid ){
++      v = db->priorNewRowid;
++      cnt = 0;
++      do{
++        if( v==0 || cnt>2 ){
++          sqliteRandomness(sizeof(v), &v);
++          if( cnt<5 ) v &= 0xffffff;
++        }else{
++          unsigned char r;
++          sqliteRandomness(1, &r);
++          v += r + 1;
++        }
++        if( v==0 ) continue;
++        x = intToKey(v);
++        rx = sqliteBtreeMoveto(pC->pCursor, &x, sizeof(int), &res);
++        cnt++;
++      }while( cnt<1000 && rx==SQLITE_OK && res==0 );
++      db->priorNewRowid = v;
++      if( rx==SQLITE_OK && res==0 ){
++        rc = SQLITE_FULL;
++        goto abort_due_to_error;
++      }
++    }
++    pC->recnoIsValid = 0;
++    pC->deferredMoveto = 0;
++  }
++  pTos++;
++  pTos->i = v;
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: PutIntKey P1 P2 *
++**
++** Write an entry into the table of cursor P1.  A new entry is
++** created if it doesn't already exist or the data for an existing
++** entry is overwritten.  The data is the value on the top of the
++** stack.  The key is the next value down on the stack.  The key must
++** be an integer.  The stack is popped twice by this instruction.
++**
++** If the OPFLAG_NCHANGE flag of P2 is set, then the row change count is
++** incremented (otherwise not).  If the OPFLAG_CSCHANGE flag is set,
++** then the current statement change count is incremented (otherwise not).
++** If the OPFLAG_LASTROWID flag of P2 is set, then rowid is
++** stored for subsequent return by the sqlite_last_insert_rowid() function
++** (otherwise it's unmodified).
++*/
++/* Opcode: PutStrKey P1 * *
++**
++** Write an entry into the table of cursor P1.  A new entry is
++** created if it doesn't already exist or the data for an existing
++** entry is overwritten.  The data is the value on the top of the
++** stack.  The key is the next value down on the stack.  The key must
++** be a string.  The stack is popped twice by this instruction.
++**
++** P1 may not be a pseudo-table opened using the OpenPseudo opcode.
++*/
++case OP_PutIntKey:
++case OP_PutStrKey: {
++  Mem *pNos = &pTos[-1];
++  int i = pOp->p1;
++  Cursor *pC;
++  assert( pNos>=p->aStack );
++  assert( i>=0 && i<p->nCursor );
++  if( ((pC = &p->aCsr[i])->pCursor!=0 || pC->pseudoTable) ){
++    char *zKey;
++    int nKey, iKey;
++    if( pOp->opcode==OP_PutStrKey ){
++      Stringify(pNos);
++      nKey = pNos->n;
++      zKey = pNos->z;
++    }else{
++      assert( pNos->flags & MEM_Int );
++      nKey = sizeof(int);
++      iKey = intToKey(pNos->i);
++      zKey = (char*)&iKey;
++      if( pOp->p2 & OPFLAG_NCHANGE ) db->nChange++;
++      if( pOp->p2 & OPFLAG_LASTROWID ) db->lastRowid = pNos->i;
++      if( pOp->p2 & OPFLAG_CSCHANGE ) db->csChange++;
++      if( pC->nextRowidValid && pTos->i>=pC->nextRowid ){
++        pC->nextRowidValid = 0;
++      }
++    }
++    if( pTos->flags & MEM_Null ){
++      pTos->z = 0;
++      pTos->n = 0;
++    }else{
++      assert( pTos->flags & MEM_Str );
++    }
++    if( pC->pseudoTable ){
++      /* PutStrKey does not work for pseudo-tables.
++      ** The following assert makes sure we are not trying to use
++      ** PutStrKey on a pseudo-table
++      */
++      assert( pOp->opcode==OP_PutIntKey );
++      sqliteFree(pC->pData);
++      pC->iKey = iKey;
++      pC->nData = pTos->n;
++      if( pTos->flags & MEM_Dyn ){
++        pC->pData = pTos->z;
++        pTos->flags = MEM_Null;
++      }else{
++        pC->pData = sqliteMallocRaw( pC->nData );
++        if( pC->pData ){
++          memcpy(pC->pData, pTos->z, pC->nData);
++        }
++      }
++      pC->nullRow = 0;
++    }else{
++      rc = sqliteBtreeInsert(pC->pCursor, zKey, nKey, pTos->z, pTos->n);
++    }
++    pC->recnoIsValid = 0;
++    pC->deferredMoveto = 0;
++  }
++  popStack(&pTos, 2);
++  break;
++}
++
++/* Opcode: Delete P1 P2 *
++**
++** Delete the record at which the P1 cursor is currently pointing.
++**
++** The cursor will be left pointing at either the next or the previous
++** record in the table. If it is left pointing at the next record, then
++** the next Next instruction will be a no-op.  Hence it is OK to delete
++** a record from within an Next loop.
++**
++** If the OPFLAG_NCHANGE flag of P2 is set, then the row change count is
++** incremented (otherwise not).  If OPFLAG_CSCHANGE flag is set,
++** then the current statement change count is incremented (otherwise not).
++**
++** If P1 is a pseudo-table, then this instruction is a no-op.
++*/
++case OP_Delete: {
++  int i = pOp->p1;
++  Cursor *pC;
++  assert( i>=0 && i<p->nCursor );
++  pC = &p->aCsr[i];
++  if( pC->pCursor!=0 ){
++    sqliteVdbeCursorMoveto(pC);
++    rc = sqliteBtreeDelete(pC->pCursor);
++    pC->nextRowidValid = 0;
++  }
++  if( pOp->p2 & OPFLAG_NCHANGE ) db->nChange++;
++  if( pOp->p2 & OPFLAG_CSCHANGE ) db->csChange++;
++  break;
++}
++
++/* Opcode: SetCounts * * *
++**
++** Called at end of statement.  Updates lsChange (last statement change count)
++** and resets csChange (current statement change count) to 0.
++*/
++case OP_SetCounts: {
++  db->lsChange=db->csChange;
++  db->csChange=0;
++  break;
++}
++
++/* Opcode: KeyAsData P1 P2 *
++**
++** Turn the key-as-data mode for cursor P1 either on (if P2==1) or
++** off (if P2==0).  In key-as-data mode, the OP_Column opcode pulls
++** data off of the key rather than the data.  This is used for
++** processing compound selects.
++*/
++case OP_KeyAsData: {
++  int i = pOp->p1;
++  assert( i>=0 && i<p->nCursor );
++  p->aCsr[i].keyAsData = pOp->p2;
++  break;
++}
++
++/* Opcode: RowData P1 * *
++**
++** Push onto the stack the complete row data for cursor P1.
++** There is no interpretation of the data.  It is just copied
++** onto the stack exactly as it is found in the database file.
++**
++** If the cursor is not pointing to a valid row, a NULL is pushed
++** onto the stack.
++*/
++/* Opcode: RowKey P1 * *
++**
++** Push onto the stack the complete row key for cursor P1.
++** There is no interpretation of the key.  It is just copied
++** onto the stack exactly as it is found in the database file.
++**
++** If the cursor is not pointing to a valid row, a NULL is pushed
++** onto the stack.
++*/
++case OP_RowKey:
++case OP_RowData: {
++  int i = pOp->p1;
++  Cursor *pC;
++  int n;
++
++  pTos++;
++  assert( i>=0 && i<p->nCursor );
++  pC = &p->aCsr[i];
++  if( pC->nullRow ){
++    pTos->flags = MEM_Null;
++  }else if( pC->pCursor!=0 ){
++    BtCursor *pCrsr = pC->pCursor;
++    sqliteVdbeCursorMoveto(pC);
++    if( pC->nullRow ){
++      pTos->flags = MEM_Null;
++      break;
++    }else if( pC->keyAsData || pOp->opcode==OP_RowKey ){
++      sqliteBtreeKeySize(pCrsr, &n);
++    }else{
++      sqliteBtreeDataSize(pCrsr, &n);
++    }
++    pTos->n = n;
++    if( n<=NBFS ){
++      pTos->flags = MEM_Str | MEM_Short;
++      pTos->z = pTos->zShort;
++    }else{
++      char *z = sqliteMallocRaw( n );
++      if( z==0 ) goto no_mem;
++      pTos->flags = MEM_Str | MEM_Dyn;
++      pTos->z = z;
++    }
++    if( pC->keyAsData || pOp->opcode==OP_RowKey ){
++      sqliteBtreeKey(pCrsr, 0, n, pTos->z);
++    }else{
++      sqliteBtreeData(pCrsr, 0, n, pTos->z);
++    }
++  }else if( pC->pseudoTable ){
++    pTos->n = pC->nData;
++    pTos->z = pC->pData;
++    pTos->flags = MEM_Str|MEM_Ephem;
++  }else{
++    pTos->flags = MEM_Null;
++  }
++  break;
++}
++
++/* Opcode: Column P1 P2 *
++**
++** Interpret the data that cursor P1 points to as
++** a structure built using the MakeRecord instruction.
++** (See the MakeRecord opcode for additional information about
++** the format of the data.)
++** Push onto the stack the value of the P2-th column contained
++** in the data.
++**
++** If the KeyAsData opcode has previously executed on this cursor,
++** then the field might be extracted from the key rather than the
++** data.
++**
++** If P1 is negative, then the record is stored on the stack rather
++** than in a table.  For P1==-1, the top of the stack is used.
++** For P1==-2, the next on the stack is used.  And so forth.  The
++** value pushed is always just a pointer into the record which is
++** stored further down on the stack.  The column value is not copied.
++*/
++case OP_Column: {
++  int amt, offset, end, payloadSize;
++  int i = pOp->p1;
++  int p2 = pOp->p2;
++  Cursor *pC;
++  char *zRec;
++  BtCursor *pCrsr;
++  int idxWidth;
++  unsigned char aHdr[10];
++
++  assert( i<p->nCursor );
++  pTos++;
++  if( i<0 ){
++    assert( &pTos[i]>=p->aStack );
++    assert( pTos[i].flags & MEM_Str );
++    zRec = pTos[i].z;
++    payloadSize = pTos[i].n;
++  }else if( (pC = &p->aCsr[i])->pCursor!=0 ){
++    sqliteVdbeCursorMoveto(pC);
++    zRec = 0;
++    pCrsr = pC->pCursor;
++    if( pC->nullRow ){
++      payloadSize = 0;
++    }else if( pC->keyAsData ){
++      sqliteBtreeKeySize(pCrsr, &payloadSize);
++    }else{
++      sqliteBtreeDataSize(pCrsr, &payloadSize);
++    }
++  }else if( pC->pseudoTable ){
++    payloadSize = pC->nData;
++    zRec = pC->pData;
++    assert( payloadSize==0 || zRec!=0 );
++  }else{
++    payloadSize = 0;
++  }
++
++  /* Figure out how many bytes in the column data and where the column
++  ** data begins.
++  */
++  if( payloadSize==0 ){
++    pTos->flags = MEM_Null;
++    break;
++  }else if( payloadSize<256 ){
++    idxWidth = 1;
++  }else if( payloadSize<65536 ){
++    idxWidth = 2;
++  }else{
++    idxWidth = 3;
++  }
++
++  /* Figure out where the requested column is stored and how big it is.
++  */
++  if( payloadSize < idxWidth*(p2+1) ){
++    rc = SQLITE_CORRUPT;
++    goto abort_due_to_error;
++  }
++  if( zRec ){
++    memcpy(aHdr, &zRec[idxWidth*p2], idxWidth*2);
++  }else if( pC->keyAsData ){
++    sqliteBtreeKey(pCrsr, idxWidth*p2, idxWidth*2, (char*)aHdr);
++  }else{
++    sqliteBtreeData(pCrsr, idxWidth*p2, idxWidth*2, (char*)aHdr);
++  }
++  offset = aHdr[0];
++  end = aHdr[idxWidth];
++  if( idxWidth>1 ){
++    offset |= aHdr[1]<<8;
++    end |= aHdr[idxWidth+1]<<8;
++    if( idxWidth>2 ){
++      offset |= aHdr[2]<<16;
++      end |= aHdr[idxWidth+2]<<16;
++    }
++  }
++  amt = end - offset;
++  if( amt<0 || offset<0 || end>payloadSize ){
++    rc = SQLITE_CORRUPT;
++    goto abort_due_to_error;
++  }
++
++  /* amt and offset now hold the offset to the start of data and the
++  ** amount of data.  Go get the data and put it on the stack.
++  */
++  pTos->n = amt;
++  if( amt==0 ){
++    pTos->flags = MEM_Null;
++  }else if( zRec ){
++    pTos->flags = MEM_Str | MEM_Ephem;
++    pTos->z = &zRec[offset];
++  }else{
++    if( amt<=NBFS ){
++      pTos->flags = MEM_Str | MEM_Short;
++      pTos->z = pTos->zShort;
++    }else{
++      char *z = sqliteMallocRaw( amt );
++      if( z==0 ) goto no_mem;
++      pTos->flags = MEM_Str | MEM_Dyn;
++      pTos->z = z;
++    }
++    if( pC->keyAsData ){
++      sqliteBtreeKey(pCrsr, offset, amt, pTos->z);
++    }else{
++      sqliteBtreeData(pCrsr, offset, amt, pTos->z);
++    }
++  }
++  break;
++}
++
++/* Opcode: Recno P1 * *
++**
++** Push onto the stack an integer which is the first 4 bytes of the
++** the key to the current entry in a sequential scan of the database
++** file P1.  The sequential scan should have been started using the 
++** Next opcode.
++*/
++case OP_Recno: {
++  int i = pOp->p1;
++  Cursor *pC;
++  int v;
++
++  assert( i>=0 && i<p->nCursor );
++  pC = &p->aCsr[i];
++  sqliteVdbeCursorMoveto(pC);
++  pTos++;
++  if( pC->recnoIsValid ){
++    v = pC->lastRecno;
++  }else if( pC->pseudoTable ){
++    v = keyToInt(pC->iKey);
++  }else if( pC->nullRow || pC->pCursor==0 ){
++    pTos->flags = MEM_Null;
++    break;
++  }else{
++    assert( pC->pCursor!=0 );
++    sqliteBtreeKey(pC->pCursor, 0, sizeof(u32), (char*)&v);
++    v = keyToInt(v);
++  }
++  pTos->i = v;
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: FullKey P1 * *
++**
++** Extract the complete key from the record that cursor P1 is currently
++** pointing to and push the key onto the stack as a string.
++**
++** Compare this opcode to Recno.  The Recno opcode extracts the first
++** 4 bytes of the key and pushes those bytes onto the stack as an
++** integer.  This instruction pushes the entire key as a string.
++**
++** This opcode may not be used on a pseudo-table.
++*/
++case OP_FullKey: {
++  int i = pOp->p1;
++  BtCursor *pCrsr;
++
++  assert( p->aCsr[i].keyAsData );
++  assert( !p->aCsr[i].pseudoTable );
++  assert( i>=0 && i<p->nCursor );
++  pTos++;
++  if( (pCrsr = p->aCsr[i].pCursor)!=0 ){
++    int amt;
++    char *z;
++
++    sqliteVdbeCursorMoveto(&p->aCsr[i]);
++    sqliteBtreeKeySize(pCrsr, &amt);
++    if( amt<=0 ){
++      rc = SQLITE_CORRUPT;
++      goto abort_due_to_error;
++    }
++    if( amt>NBFS ){
++      z = sqliteMallocRaw( amt );
++      if( z==0 ) goto no_mem;
++      pTos->flags = MEM_Str | MEM_Dyn;
++    }else{
++      z = pTos->zShort;
++      pTos->flags = MEM_Str | MEM_Short;
++    }
++    sqliteBtreeKey(pCrsr, 0, amt, z);
++    pTos->z = z;
++    pTos->n = amt;
++  }
++  break;
++}
++
++/* Opcode: NullRow P1 * *
++**
++** Move the cursor P1 to a null row.  Any OP_Column operations
++** that occur while the cursor is on the null row will always push 
++** a NULL onto the stack.
++*/
++case OP_NullRow: {
++  int i = pOp->p1;
++
++  assert( i>=0 && i<p->nCursor );
++  p->aCsr[i].nullRow = 1;
++  p->aCsr[i].recnoIsValid = 0;
++  break;
++}
++
++/* Opcode: Last P1 P2 *
++**
++** The next use of the Recno or Column or Next instruction for P1 
++** will refer to the last entry in the database table or index.
++** If the table or index is empty and P2>0, then jump immediately to P2.
++** If P2 is 0 or if the table or index is not empty, fall through
++** to the following instruction.
++*/
++case OP_Last: {
++  int i = pOp->p1;
++  Cursor *pC;
++  BtCursor *pCrsr;
++
++  assert( i>=0 && i<p->nCursor );
++  pC = &p->aCsr[i];
++  if( (pCrsr = pC->pCursor)!=0 ){
++    int res;
++    rc = sqliteBtreeLast(pCrsr, &res);
++    pC->nullRow = res;
++    pC->deferredMoveto = 0;
++    if( res && pOp->p2>0 ){
++      pc = pOp->p2 - 1;
++    }
++  }else{
++    pC->nullRow = 0;
++  }
++  break;
++}
++
++/* Opcode: Rewind P1 P2 *
++**
++** The next use of the Recno or Column or Next instruction for P1 
++** will refer to the first entry in the database table or index.
++** If the table or index is empty and P2>0, then jump immediately to P2.
++** If P2 is 0 or if the table or index is not empty, fall through
++** to the following instruction.
++*/
++case OP_Rewind: {
++  int i = pOp->p1;
++  Cursor *pC;
++  BtCursor *pCrsr;
++
++  assert( i>=0 && i<p->nCursor );
++  pC = &p->aCsr[i];
++  if( (pCrsr = pC->pCursor)!=0 ){
++    int res;
++    rc = sqliteBtreeFirst(pCrsr, &res);
++    pC->atFirst = res==0;
++    pC->nullRow = res;
++    pC->deferredMoveto = 0;
++    if( res && pOp->p2>0 ){
++      pc = pOp->p2 - 1;
++    }
++  }else{
++    pC->nullRow = 0;
++  }
++  break;
++}
++
++/* Opcode: Next P1 P2 *
++**
++** Advance cursor P1 so that it points to the next key/data pair in its
++** table or index.  If there are no more key/value pairs then fall through
++** to the following instruction.  But if the cursor advance was successful,
++** jump immediately to P2.
++**
++** See also: Prev
++*/
++/* Opcode: Prev P1 P2 *
++**
++** Back up cursor P1 so that it points to the previous key/data pair in its
++** table or index.  If there is no previous key/value pairs then fall through
++** to the following instruction.  But if the cursor backup was successful,
++** jump immediately to P2.
++*/
++case OP_Prev:
++case OP_Next: {
++  Cursor *pC;
++  BtCursor *pCrsr;
++
++  CHECK_FOR_INTERRUPT;
++  assert( pOp->p1>=0 && pOp->p1<p->nCursor );
++  pC = &p->aCsr[pOp->p1];
++  if( (pCrsr = pC->pCursor)!=0 ){
++    int res;
++    if( pC->nullRow ){
++      res = 1;
++    }else{
++      assert( pC->deferredMoveto==0 );
++      rc = pOp->opcode==OP_Next ? sqliteBtreeNext(pCrsr, &res) :
++                                  sqliteBtreePrevious(pCrsr, &res);
++      pC->nullRow = res;
++    }
++    if( res==0 ){
++      pc = pOp->p2 - 1;
++      sqlite_search_count++;
++    }
++  }else{
++    pC->nullRow = 1;
++  }
++  pC->recnoIsValid = 0;
++  break;
++}
++
++/* Opcode: IdxPut P1 P2 P3
++**
++** The top of the stack holds a SQL index key made using the
++** MakeIdxKey instruction.  This opcode writes that key into the
++** index P1.  Data for the entry is nil.
++**
++** If P2==1, then the key must be unique.  If the key is not unique,
++** the program aborts with a SQLITE_CONSTRAINT error and the database
++** is rolled back.  If P3 is not null, then it becomes part of the
++** error message returned with the SQLITE_CONSTRAINT.
++*/
++case OP_IdxPut: {
++  int i = pOp->p1;
++  BtCursor *pCrsr;
++  assert( pTos>=p->aStack );
++  assert( i>=0 && i<p->nCursor );
++  assert( pTos->flags & MEM_Str );
++  if( (pCrsr = p->aCsr[i].pCursor)!=0 ){
++    int nKey = pTos->n;
++    const char *zKey = pTos->z;
++    if( pOp->p2 ){
++      int res, n;
++      assert( nKey >= 4 );
++      rc = sqliteBtreeMoveto(pCrsr, zKey, nKey-4, &res);
++      if( rc!=SQLITE_OK ) goto abort_due_to_error;
++      while( res!=0 ){
++        int c;
++        sqliteBtreeKeySize(pCrsr, &n);
++        if( n==nKey
++           && sqliteBtreeKeyCompare(pCrsr, zKey, nKey-4, 4, &c)==SQLITE_OK
++           && c==0
++        ){
++          rc = SQLITE_CONSTRAINT;
++          if( pOp->p3 && pOp->p3[0] ){
++            sqliteSetString(&p->zErrMsg, pOp->p3, (char*)0);
++          }
++          goto abort_due_to_error;
++        }
++        if( res<0 ){
++          sqliteBtreeNext(pCrsr, &res);
++          res = +1;
++        }else{
++          break;
++        }
++      }
++    }
++    rc = sqliteBtreeInsert(pCrsr, zKey, nKey, "", 0);
++    assert( p->aCsr[i].deferredMoveto==0 );
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: IdxDelete P1 * *
++**
++** The top of the stack is an index key built using the MakeIdxKey opcode.
++** This opcode removes that entry from the index.
++*/
++case OP_IdxDelete: {
++  int i = pOp->p1;
++  BtCursor *pCrsr;
++  assert( pTos>=p->aStack );
++  assert( pTos->flags & MEM_Str );
++  assert( i>=0 && i<p->nCursor );
++  if( (pCrsr = p->aCsr[i].pCursor)!=0 ){
++    int rx, res;
++    rx = sqliteBtreeMoveto(pCrsr, pTos->z, pTos->n, &res);
++    if( rx==SQLITE_OK && res==0 ){
++      rc = sqliteBtreeDelete(pCrsr);
++    }
++    assert( p->aCsr[i].deferredMoveto==0 );
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: IdxRecno P1 * *
++**
++** Push onto the stack an integer which is the last 4 bytes of the
++** the key to the current entry in index P1.  These 4 bytes should
++** be the record number of the table entry to which this index entry
++** points.
++**
++** See also: Recno, MakeIdxKey.
++*/
++case OP_IdxRecno: {
++  int i = pOp->p1;
++  BtCursor *pCrsr;
++
++  assert( i>=0 && i<p->nCursor );
++  pTos++;
++  if( (pCrsr = p->aCsr[i].pCursor)!=0 ){
++    int v;
++    int sz;
++    assert( p->aCsr[i].deferredMoveto==0 );
++    sqliteBtreeKeySize(pCrsr, &sz);
++    if( sz<sizeof(u32) ){
++      pTos->flags = MEM_Null;
++    }else{
++      sqliteBtreeKey(pCrsr, sz - sizeof(u32), sizeof(u32), (char*)&v);
++      v = keyToInt(v);
++      pTos->i = v;
++      pTos->flags = MEM_Int;
++    }
++  }else{
++    pTos->flags = MEM_Null;
++  }
++  break;
++}
++
++/* Opcode: IdxGT P1 P2 *
++**
++** Compare the top of the stack against the key on the index entry that
++** cursor P1 is currently pointing to.  Ignore the last 4 bytes of the
++** index entry.  If the index entry is greater than the top of the stack
++** then jump to P2.  Otherwise fall through to the next instruction.
++** In either case, the stack is popped once.
++*/
++/* Opcode: IdxGE P1 P2 *
++**
++** Compare the top of the stack against the key on the index entry that
++** cursor P1 is currently pointing to.  Ignore the last 4 bytes of the
++** index entry.  If the index entry is greater than or equal to 
++** the top of the stack
++** then jump to P2.  Otherwise fall through to the next instruction.
++** In either case, the stack is popped once.
++*/
++/* Opcode: IdxLT P1 P2 *
++**
++** Compare the top of the stack against the key on the index entry that
++** cursor P1 is currently pointing to.  Ignore the last 4 bytes of the
++** index entry.  If the index entry is less than the top of the stack
++** then jump to P2.  Otherwise fall through to the next instruction.
++** In either case, the stack is popped once.
++*/
++case OP_IdxLT:
++case OP_IdxGT:
++case OP_IdxGE: {
++  int i= pOp->p1;
++  BtCursor *pCrsr;
++
++  assert( i>=0 && i<p->nCursor );
++  assert( pTos>=p->aStack );
++  if( (pCrsr = p->aCsr[i].pCursor)!=0 ){
++    int res, rc;
++ 
++    Stringify(pTos);
++    assert( p->aCsr[i].deferredMoveto==0 );
++    rc = sqliteBtreeKeyCompare(pCrsr, pTos->z, pTos->n, 4, &res);
++    if( rc!=SQLITE_OK ){
++      break;
++    }
++    if( pOp->opcode==OP_IdxLT ){
++      res = -res;
++    }else if( pOp->opcode==OP_IdxGE ){
++      res++;
++    }
++    if( res>0 ){
++      pc = pOp->p2 - 1 ;
++    }
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: IdxIsNull P1 P2 *
++**
++** The top of the stack contains an index entry such as might be generated
++** by the MakeIdxKey opcode.  This routine looks at the first P1 fields of
++** that key.  If any of the first P1 fields are NULL, then a jump is made
++** to address P2.  Otherwise we fall straight through.
++**
++** The index entry is always popped from the stack.
++*/
++case OP_IdxIsNull: {
++  int i = pOp->p1;
++  int k, n;
++  const char *z;
++
++  assert( pTos>=p->aStack );
++  assert( pTos->flags & MEM_Str );
++  z = pTos->z;
++  n = pTos->n;
++  for(k=0; k<n && i>0; i--){
++    if( z[k]=='a' ){
++      pc = pOp->p2-1;
++      break;
++    }
++    while( k<n && z[k] ){ k++; }
++    k++;
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: Destroy P1 P2 *
++**
++** Delete an entire database table or index whose root page in the database
++** file is given by P1.
++**
++** The table being destroyed is in the main database file if P2==0.  If
++** P2==1 then the table to be clear is in the auxiliary database file
++** that is used to store tables create using CREATE TEMPORARY TABLE.
++**
++** See also: Clear
++*/
++case OP_Destroy: {
++  rc = sqliteBtreeDropTable(db->aDb[pOp->p2].pBt, pOp->p1);
++  break;
++}
++
++/* Opcode: Clear P1 P2 *
++**
++** Delete all contents of the database table or index whose root page
++** in the database file is given by P1.  But, unlike Destroy, do not
++** remove the table or index from the database file.
++**
++** The table being clear is in the main database file if P2==0.  If
++** P2==1 then the table to be clear is in the auxiliary database file
++** that is used to store tables create using CREATE TEMPORARY TABLE.
++**
++** See also: Destroy
++*/
++case OP_Clear: {
++  rc = sqliteBtreeClearTable(db->aDb[pOp->p2].pBt, pOp->p1);
++  break;
++}
++
++/* Opcode: CreateTable * P2 P3
++**
++** Allocate a new table in the main database file if P2==0 or in the
++** auxiliary database file if P2==1.  Push the page number
++** for the root page of the new table onto the stack.
++**
++** The root page number is also written to a memory location that P3
++** points to.  This is the mechanism is used to write the root page
++** number into the parser's internal data structures that describe the
++** new table.
++**
++** The difference between a table and an index is this:  A table must
++** have a 4-byte integer key and can have arbitrary data.  An index
++** has an arbitrary key but no data.
++**
++** See also: CreateIndex
++*/
++/* Opcode: CreateIndex * P2 P3
++**
++** Allocate a new index in the main database file if P2==0 or in the
++** auxiliary database file if P2==1.  Push the page number of the
++** root page of the new index onto the stack.
++**
++** See documentation on OP_CreateTable for additional information.
++*/
++case OP_CreateIndex:
++case OP_CreateTable: {
++  int pgno;
++  assert( pOp->p3!=0 && pOp->p3type==P3_POINTER );
++  assert( pOp->p2>=0 && pOp->p2<db->nDb );
++  assert( db->aDb[pOp->p2].pBt!=0 );
++  if( pOp->opcode==OP_CreateTable ){
++    rc = sqliteBtreeCreateTable(db->aDb[pOp->p2].pBt, &pgno);
++  }else{
++    rc = sqliteBtreeCreateIndex(db->aDb[pOp->p2].pBt, &pgno);
++  }
++  pTos++;
++  if( rc==SQLITE_OK ){
++    pTos->i = pgno;
++    pTos->flags = MEM_Int;
++    *(u32*)pOp->p3 = pgno;
++    pOp->p3 = 0;
++  }else{
++    pTos->flags = MEM_Null;
++  }
++  break;
++}
++
++/* Opcode: IntegrityCk P1 P2 *
++**
++** Do an analysis of the currently open database.  Push onto the
++** stack the text of an error message describing any problems.
++** If there are no errors, push a "ok" onto the stack.
++**
++** P1 is the index of a set that contains the root page numbers
++** for all tables and indices in the main database file.  The set
++** is cleared by this opcode.  In other words, after this opcode
++** has executed, the set will be empty.
++**
++** If P2 is not zero, the check is done on the auxiliary database
++** file, not the main database file.
++**
++** This opcode is used for testing purposes only.
++*/
++case OP_IntegrityCk: {
++  int nRoot;
++  int *aRoot;
++  int iSet = pOp->p1;
++  Set *pSet;
++  int j;
++  HashElem *i;
++  char *z;
++
++  assert( iSet>=0 && iSet<p->nSet );
++  pTos++;
++  pSet = &p->aSet[iSet];
++  nRoot = sqliteHashCount(&pSet->hash);
++  aRoot = sqliteMallocRaw( sizeof(int)*(nRoot+1) );
++  if( aRoot==0 ) goto no_mem;
++  for(j=0, i=sqliteHashFirst(&pSet->hash); i; i=sqliteHashNext(i), j++){
++    toInt((char*)sqliteHashKey(i), &aRoot[j]);
++  }
++  aRoot[j] = 0;
++  sqliteHashClear(&pSet->hash);
++  pSet->prev = 0;
++  z = sqliteBtreeIntegrityCheck(db->aDb[pOp->p2].pBt, aRoot, nRoot);
++  if( z==0 || z[0]==0 ){
++    if( z ) sqliteFree(z);
++    pTos->z = "ok";
++    pTos->n = 3;
++    pTos->flags = MEM_Str | MEM_Static;
++  }else{
++    pTos->z = z;
++    pTos->n = strlen(z) + 1;
++    pTos->flags = MEM_Str | MEM_Dyn;
++  }
++  sqliteFree(aRoot);
++  break;
++}
++
++/* Opcode: ListWrite * * *
++**
++** Write the integer on the top of the stack
++** into the temporary storage list.
++*/
++case OP_ListWrite: {
++  Keylist *pKeylist;
++  assert( pTos>=p->aStack );
++  pKeylist = p->pList;
++  if( pKeylist==0 || pKeylist->nUsed>=pKeylist->nKey ){
++    pKeylist = sqliteMallocRaw( sizeof(Keylist)+999*sizeof(pKeylist->aKey[0]) );
++    if( pKeylist==0 ) goto no_mem;
++    pKeylist->nKey = 1000;
++    pKeylist->nRead = 0;
++    pKeylist->nUsed = 0;
++    pKeylist->pNext = p->pList;
++    p->pList = pKeylist;
++  }
++  Integerify(pTos);
++  pKeylist->aKey[pKeylist->nUsed++] = pTos->i;
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: ListRewind * * *
++**
++** Rewind the temporary buffer back to the beginning.
++*/
++case OP_ListRewind: {
++  /* What this opcode codes, really, is reverse the order of the
++  ** linked list of Keylist structures so that they are read out
++  ** in the same order that they were read in. */
++  Keylist *pRev, *pTop;
++  pRev = 0;
++  while( p->pList ){
++    pTop = p->pList;
++    p->pList = pTop->pNext;
++    pTop->pNext = pRev;
++    pRev = pTop;
++  }
++  p->pList = pRev;
++  break;
++}
++
++/* Opcode: ListRead * P2 *
++**
++** Attempt to read an integer from the temporary storage buffer
++** and push it onto the stack.  If the storage buffer is empty, 
++** push nothing but instead jump to P2.
++*/
++case OP_ListRead: {
++  Keylist *pKeylist;
++  CHECK_FOR_INTERRUPT;
++  pKeylist = p->pList;
++  if( pKeylist!=0 ){
++    assert( pKeylist->nRead>=0 );
++    assert( pKeylist->nRead<pKeylist->nUsed );
++    assert( pKeylist->nRead<pKeylist->nKey );
++    pTos++;
++    pTos->i = pKeylist->aKey[pKeylist->nRead++];
++    pTos->flags = MEM_Int;
++    if( pKeylist->nRead>=pKeylist->nUsed ){
++      p->pList = pKeylist->pNext;
++      sqliteFree(pKeylist);
++    }
++  }else{
++    pc = pOp->p2 - 1;
++  }
++  break;
++}
++
++/* Opcode: ListReset * * *
++**
++** Reset the temporary storage buffer so that it holds nothing.
++*/
++case OP_ListReset: {
++  if( p->pList ){
++    sqliteVdbeKeylistFree(p->pList);
++    p->pList = 0;
++  }
++  break;
++}
++
++/* Opcode: ListPush * * * 
++**
++** Save the current Vdbe list such that it can be restored by a ListPop
++** opcode. The list is empty after this is executed.
++*/
++case OP_ListPush: {
++  p->keylistStackDepth++;
++  assert(p->keylistStackDepth > 0);
++  p->keylistStack = sqliteRealloc(p->keylistStack, 
++          sizeof(Keylist *) * p->keylistStackDepth);
++  if( p->keylistStack==0 ) goto no_mem;
++  p->keylistStack[p->keylistStackDepth - 1] = p->pList;
++  p->pList = 0;
++  break;
++}
++
++/* Opcode: ListPop * * * 
++**
++** Restore the Vdbe list to the state it was in when ListPush was last
++** executed.
++*/
++case OP_ListPop: {
++  assert(p->keylistStackDepth > 0);
++  p->keylistStackDepth--;
++  sqliteVdbeKeylistFree(p->pList);
++  p->pList = p->keylistStack[p->keylistStackDepth];
++  p->keylistStack[p->keylistStackDepth] = 0;
++  if( p->keylistStackDepth == 0 ){
++    sqliteFree(p->keylistStack);
++    p->keylistStack = 0;
++  }
++  break;
++}
++
++/* Opcode: ContextPush * * * 
++**
++** Save the current Vdbe context such that it can be restored by a ContextPop
++** opcode. The context stores the last insert row id, the last statement change
++** count, and the current statement change count.
++*/
++case OP_ContextPush: {
++  p->contextStackDepth++;
++  assert(p->contextStackDepth > 0);
++  p->contextStack = sqliteRealloc(p->contextStack, 
++          sizeof(Context) * p->contextStackDepth);
++  if( p->contextStack==0 ) goto no_mem;
++  p->contextStack[p->contextStackDepth - 1].lastRowid = p->db->lastRowid;
++  p->contextStack[p->contextStackDepth - 1].lsChange = p->db->lsChange;
++  p->contextStack[p->contextStackDepth - 1].csChange = p->db->csChange;
++  break;
++}
++
++/* Opcode: ContextPop * * * 
++**
++** Restore the Vdbe context to the state it was in when contextPush was last
++** executed. The context stores the last insert row id, the last statement
++** change count, and the current statement change count.
++*/
++case OP_ContextPop: {
++  assert(p->contextStackDepth > 0);
++  p->contextStackDepth--;
++  p->db->lastRowid = p->contextStack[p->contextStackDepth].lastRowid;
++  p->db->lsChange = p->contextStack[p->contextStackDepth].lsChange;
++  p->db->csChange = p->contextStack[p->contextStackDepth].csChange;
++  if( p->contextStackDepth == 0 ){
++    sqliteFree(p->contextStack);
++    p->contextStack = 0;
++  }
++  break;
++}
++
++/* Opcode: SortPut * * *
++**
++** The TOS is the key and the NOS is the data.  Pop both from the stack
++** and put them on the sorter.  The key and data should have been
++** made using SortMakeKey and SortMakeRec, respectively.
++*/
++case OP_SortPut: {
++  Mem *pNos = &pTos[-1];
++  Sorter *pSorter;
++  assert( pNos>=p->aStack );
++  if( Dynamicify(pTos) || Dynamicify(pNos) ) goto no_mem;
++  pSorter = sqliteMallocRaw( sizeof(Sorter) );
++  if( pSorter==0 ) goto no_mem;
++  pSorter->pNext = p->pSort;
++  p->pSort = pSorter;
++  assert( pTos->flags & MEM_Dyn );
++  pSorter->nKey = pTos->n;
++  pSorter->zKey = pTos->z;
++  assert( pNos->flags & MEM_Dyn );
++  pSorter->nData = pNos->n;
++  pSorter->pData = pNos->z;
++  pTos -= 2;
++  break;
++}
++
++/* Opcode: SortMakeRec P1 * *
++**
++** The top P1 elements are the arguments to a callback.  Form these
++** elements into a single data entry that can be stored on a sorter
++** using SortPut and later fed to a callback using SortCallback.
++*/
++case OP_SortMakeRec: {
++  char *z;
++  char **azArg;
++  int nByte;
++  int nField;
++  int i;
++  Mem *pRec;
++
++  nField = pOp->p1;
++  pRec = &pTos[1-nField];
++  assert( pRec>=p->aStack );
++  nByte = 0;
++  for(i=0; i<nField; i++, pRec++){
++    if( (pRec->flags & MEM_Null)==0 ){
++      Stringify(pRec);
++      nByte += pRec->n;
++    }
++  }
++  nByte += sizeof(char*)*(nField+1);
++  azArg = sqliteMallocRaw( nByte );
++  if( azArg==0 ) goto no_mem;
++  z = (char*)&azArg[nField+1];
++  for(pRec=&pTos[1-nField], i=0; i<nField; i++, pRec++){
++    if( pRec->flags & MEM_Null ){
++      azArg[i] = 0;
++    }else{
++      azArg[i] = z;
++      memcpy(z, pRec->z, pRec->n);
++      z += pRec->n;
++    }
++  }
++  popStack(&pTos, nField);
++  pTos++;
++  pTos->n = nByte;
++  pTos->z = (char*)azArg;
++  pTos->flags = MEM_Str | MEM_Dyn;
++  break;
++}
++
++/* Opcode: SortMakeKey * * P3
++**
++** Convert the top few entries of the stack into a sort key.  The
++** number of stack entries consumed is the number of characters in 
++** the string P3.  One character from P3 is prepended to each entry.
++** The first character of P3 is prepended to the element lowest in
++** the stack and the last character of P3 is prepended to the top of
++** the stack.  All stack entries are separated by a \000 character
++** in the result.  The whole key is terminated by two \000 characters
++** in a row.
++**
++** "N" is substituted in place of the P3 character for NULL values.
++**
++** See also the MakeKey and MakeIdxKey opcodes.
++*/
++case OP_SortMakeKey: {
++  char *zNewKey;
++  int nByte;
++  int nField;
++  int i, j, k;
++  Mem *pRec;
++
++  nField = strlen(pOp->p3);
++  pRec = &pTos[1-nField];
++  nByte = 1;
++  for(i=0; i<nField; i++, pRec++){
++    if( pRec->flags & MEM_Null ){
++      nByte += 2;
++    }else{
++      Stringify(pRec);
++      nByte += pRec->n+2;
++    }
++  }
++  zNewKey = sqliteMallocRaw( nByte );
++  if( zNewKey==0 ) goto no_mem;
++  j = 0;
++  k = 0;
++  for(pRec=&pTos[1-nField], i=0; i<nField; i++, pRec++){
++    if( pRec->flags & MEM_Null ){
++      zNewKey[j++] = 'N';
++      zNewKey[j++] = 0;
++      k++;
++    }else{
++      zNewKey[j++] = pOp->p3[k++];
++      memcpy(&zNewKey[j], pRec->z, pRec->n-1);
++      j += pRec->n-1;
++      zNewKey[j++] = 0;
++    }
++  }
++  zNewKey[j] = 0;
++  assert( j<nByte );
++  popStack(&pTos, nField);
++  pTos++;
++  pTos->n = nByte;
++  pTos->flags = MEM_Str|MEM_Dyn;
++  pTos->z = zNewKey;
++  break;
++}
++
++/* Opcode: Sort * * *
++**
++** Sort all elements on the sorter.  The algorithm is a
++** mergesort.
++*/
++case OP_Sort: {
++  int i;
++  Sorter *pElem;
++  Sorter *apSorter[NSORT];
++  for(i=0; i<NSORT; i++){
++    apSorter[i] = 0;
++  }
++  while( p->pSort ){
++    pElem = p->pSort;
++    p->pSort = pElem->pNext;
++    pElem->pNext = 0;
++    for(i=0; i<NSORT-1; i++){
++    if( apSorter[i]==0 ){
++        apSorter[i] = pElem;
++        break;
++      }else{
++        pElem = Merge(apSorter[i], pElem);
++        apSorter[i] = 0;
++      }
++    }
++    if( i>=NSORT-1 ){
++      apSorter[NSORT-1] = Merge(apSorter[NSORT-1],pElem);
++    }
++  }
++  pElem = 0;
++  for(i=0; i<NSORT; i++){
++    pElem = Merge(apSorter[i], pElem);
++  }
++  p->pSort = pElem;
++  break;
++}
++
++/* Opcode: SortNext * P2 *
++**
++** Push the data for the topmost element in the sorter onto the
++** stack, then remove the element from the sorter.  If the sorter
++** is empty, push nothing on the stack and instead jump immediately 
++** to instruction P2.
++*/
++case OP_SortNext: {
++  Sorter *pSorter = p->pSort;
++  CHECK_FOR_INTERRUPT;
++  if( pSorter!=0 ){
++    p->pSort = pSorter->pNext;
++    pTos++;
++    pTos->z = pSorter->pData;
++    pTos->n = pSorter->nData;
++    pTos->flags = MEM_Str|MEM_Dyn;
++    sqliteFree(pSorter->zKey);
++    sqliteFree(pSorter);
++  }else{
++    pc = pOp->p2 - 1;
++  }
++  break;
++}
++
++/* Opcode: SortCallback P1 * *
++**
++** The top of the stack contains a callback record built using
++** the SortMakeRec operation with the same P1 value as this
++** instruction.  Pop this record from the stack and invoke the
++** callback on it.
++*/
++case OP_SortCallback: {
++  assert( pTos>=p->aStack );
++  assert( pTos->flags & MEM_Str );
++  p->nCallback++;
++  p->pc = pc+1;
++  p->azResColumn = (char**)pTos->z;
++  assert( p->nResColumn==pOp->p1 );
++  p->popStack = 1;
++  p->pTos = pTos;
++  return SQLITE_ROW;
++}
++
++/* Opcode: SortReset * * *
++**
++** Remove any elements that remain on the sorter.
++*/
++case OP_SortReset: {
++  sqliteVdbeSorterReset(p);
++  break;
++}
++
++/* Opcode: FileOpen * * P3
++**
++** Open the file named by P3 for reading using the FileRead opcode.
++** If P3 is "stdin" then open standard input for reading.
++*/
++case OP_FileOpen: {
++  assert( pOp->p3!=0 );
++  if( p->pFile ){
++    if( p->pFile!=stdin ) fclose(p->pFile);
++    p->pFile = 0;
++  }
++  if( sqliteStrICmp(pOp->p3,"stdin")==0 ){
++    p->pFile = stdin;
++  }else{
++    p->pFile = fopen(pOp->p3, "r");
++  }
++  if( p->pFile==0 ){
++    sqliteSetString(&p->zErrMsg,"unable to open file: ", pOp->p3, (char*)0);
++    rc = SQLITE_ERROR;
++  }
++  break;
++}
++
++/* Opcode: FileRead P1 P2 P3
++**
++** Read a single line of input from the open file (the file opened using
++** FileOpen).  If we reach end-of-file, jump immediately to P2.  If
++** we are able to get another line, split the line apart using P3 as
++** a delimiter.  There should be P1 fields.  If the input line contains
++** more than P1 fields, ignore the excess.  If the input line contains
++** fewer than P1 fields, assume the remaining fields contain NULLs.
++**
++** Input ends if a line consists of just "\.".  A field containing only
++** "\N" is a null field.  The backslash \ character can be used be used
++** to escape newlines or the delimiter.
++*/
++case OP_FileRead: {
++  int n, eol, nField, i, c, nDelim;
++  char *zDelim, *z;
++  CHECK_FOR_INTERRUPT;
++  if( p->pFile==0 ) goto fileread_jump;
++  nField = pOp->p1;
++  if( nField<=0 ) goto fileread_jump;
++  if( nField!=p->nField || p->azField==0 ){
++    char **azField = sqliteRealloc(p->azField, sizeof(char*)*nField+1);
++    if( azField==0 ){ goto no_mem; }
++    p->azField = azField;
++    p->nField = nField;
++  }
++  n = 0;
++  eol = 0;
++  while( eol==0 ){
++    if( p->zLine==0 || n+200>p->nLineAlloc ){
++      char *zLine;
++      p->nLineAlloc = p->nLineAlloc*2 + 300;
++      zLine = sqliteRealloc(p->zLine, p->nLineAlloc);
++      if( zLine==0 ){
++        p->nLineAlloc = 0;
++        sqliteFree(p->zLine);
++        p->zLine = 0;
++        goto no_mem;
++      }
++      p->zLine = zLine;
++    }
++    if( vdbe_fgets(&p->zLine[n], p->nLineAlloc-n, p->pFile)==0 ){
++      eol = 1;
++      p->zLine[n] = 0;
++    }else{
++      int c;
++      while( (c = p->zLine[n])!=0 ){
++        if( c=='\\' ){
++          if( p->zLine[n+1]==0 ) break;
++          n += 2;
++        }else if( c=='\n' ){
++          p->zLine[n] = 0;
++          eol = 1;
++          break;
++        }else{
++          n++;
++        }
++      }
++    }
++  }
++  if( n==0 ) goto fileread_jump;
++  z = p->zLine;
++  if( z[0]=='\\' && z[1]=='.' && z[2]==0 ){
++    goto fileread_jump;
++  }
++  zDelim = pOp->p3;
++  if( zDelim==0 ) zDelim = "\t";
++  c = zDelim[0];
++  nDelim = strlen(zDelim);
++  p->azField[0] = z;
++  for(i=1; *z!=0 && i<=nField; i++){
++    int from, to;
++    from = to = 0;
++    if( z[0]=='\\' && z[1]=='N' 
++       && (z[2]==0 || strncmp(&z[2],zDelim,nDelim)==0) ){
++      if( i<=nField ) p->azField[i-1] = 0;
++      z += 2 + nDelim;
++      if( i<nField ) p->azField[i] = z;
++      continue;
++    }
++    while( z[from] ){
++      if( z[from]=='\\' && z[from+1]!=0 ){
++        int tx = z[from+1];
++        switch( tx ){
++          case 'b':  tx = '\b'; break;
++          case 'f':  tx = '\f'; break;
++          case 'n':  tx = '\n'; break;
++          case 'r':  tx = '\r'; break;
++          case 't':  tx = '\t'; break;
++          case 'v':  tx = '\v'; break;
++          default:   break;
++        }
++        z[to++] = tx;
++        from += 2;
++        continue;
++      }
++      if( z[from]==c && strncmp(&z[from],zDelim,nDelim)==0 ) break;
++      z[to++] = z[from++];
++    }
++    if( z[from] ){
++      z[to] = 0;
++      z += from + nDelim;
++      if( i<nField ) p->azField[i] = z;
++    }else{
++      z[to] = 0;
++      z = "";
++    }
++  }
++  while( i<nField ){
++    p->azField[i++] = 0;
++  }
++  break;
++
++  /* If we reach end-of-file, or if anything goes wrong, jump here.
++  ** This code will cause a jump to P2 */
++fileread_jump:
++  pc = pOp->p2 - 1;
++  break;
++}
++
++/* Opcode: FileColumn P1 * *
++**
++** Push onto the stack the P1-th column of the most recently read line
++** from the input file.
++*/
++case OP_FileColumn: {
++  int i = pOp->p1;
++  char *z;
++  assert( i>=0 && i<p->nField );
++  if( p->azField ){
++    z = p->azField[i];
++  }else{
++    z = 0;
++  }
++  pTos++;
++  if( z ){
++    pTos->n = strlen(z) + 1;
++    pTos->z = z;
++    pTos->flags = MEM_Str | MEM_Ephem;
++  }else{
++    pTos->flags = MEM_Null;
++  }
++  break;
++}
++
++/* Opcode: MemStore P1 P2 *
++**
++** Write the top of the stack into memory location P1.
++** P1 should be a small integer since space is allocated
++** for all memory locations between 0 and P1 inclusive.
++**
++** After the data is stored in the memory location, the
++** stack is popped once if P2 is 1.  If P2 is zero, then
++** the original data remains on the stack.
++*/
++case OP_MemStore: {
++  int i = pOp->p1;
++  Mem *pMem;
++  assert( pTos>=p->aStack );
++  if( i>=p->nMem ){
++    int nOld = p->nMem;
++    Mem *aMem;
++    p->nMem = i + 5;
++    aMem = sqliteRealloc(p->aMem, p->nMem*sizeof(p->aMem[0]));
++    if( aMem==0 ) goto no_mem;
++    if( aMem!=p->aMem ){
++      int j;
++      for(j=0; j<nOld; j++){
++        if( aMem[j].flags & MEM_Short ){
++          aMem[j].z = aMem[j].zShort;
++        }
++      }
++    }
++    p->aMem = aMem;
++    if( nOld<p->nMem ){
++      memset(&p->aMem[nOld], 0, sizeof(p->aMem[0])*(p->nMem-nOld));
++    }
++  }
++  Deephemeralize(pTos);
++  pMem = &p->aMem[i];
++  Release(pMem);
++  *pMem = *pTos;
++  if( pMem->flags & MEM_Dyn ){
++    if( pOp->p2 ){
++      pTos->flags = MEM_Null;
++    }else{
++      pMem->z = sqliteMallocRaw( pMem->n );
++      if( pMem->z==0 ) goto no_mem;
++      memcpy(pMem->z, pTos->z, pMem->n);
++    }
++  }else if( pMem->flags & MEM_Short ){
++    pMem->z = pMem->zShort;
++  }
++  if( pOp->p2 ){
++    Release(pTos);
++    pTos--;
++  }
++  break;
++}
++
++/* Opcode: MemLoad P1 * *
++**
++** Push a copy of the value in memory location P1 onto the stack.
++**
++** If the value is a string, then the value pushed is a pointer to
++** the string that is stored in the memory location.  If the memory
++** location is subsequently changed (using OP_MemStore) then the
++** value pushed onto the stack will change too.
++*/
++case OP_MemLoad: {
++  int i = pOp->p1;
++  assert( i>=0 && i<p->nMem );
++  pTos++;
++  memcpy(pTos, &p->aMem[i], sizeof(pTos[0])-NBFS);;
++  if( pTos->flags & MEM_Str ){
++    pTos->flags |= MEM_Ephem;
++    pTos->flags &= ~(MEM_Dyn|MEM_Static|MEM_Short);
++  }
++  break;
++}
++
++/* Opcode: MemIncr P1 P2 *
++**
++** Increment the integer valued memory cell P1 by 1.  If P2 is not zero
++** and the result after the increment is greater than zero, then jump
++** to P2.
++**
++** This instruction throws an error if the memory cell is not initially
++** an integer.
++*/
++case OP_MemIncr: {
++  int i = pOp->p1;
++  Mem *pMem;
++  assert( i>=0 && i<p->nMem );
++  pMem = &p->aMem[i];
++  assert( pMem->flags==MEM_Int );
++  pMem->i++;
++  if( pOp->p2>0 && pMem->i>0 ){
++     pc = pOp->p2 - 1;
++  }
++  break;
++}
++
++/* Opcode: AggReset * P2 *
++**
++** Reset the aggregator so that it no longer contains any data.
++** Future aggregator elements will contain P2 values each.
++*/
++case OP_AggReset: {
++  sqliteVdbeAggReset(&p->agg);
++  p->agg.nMem = pOp->p2;
++  p->agg.apFunc = sqliteMalloc( p->agg.nMem*sizeof(p->agg.apFunc[0]) );
++  if( p->agg.apFunc==0 ) goto no_mem;
++  break;
++}
++
++/* Opcode: AggInit * P2 P3
++**
++** Initialize the function parameters for an aggregate function.
++** The aggregate will operate out of aggregate column P2.
++** P3 is a pointer to the FuncDef structure for the function.
++*/
++case OP_AggInit: {
++  int i = pOp->p2;
++  assert( i>=0 && i<p->agg.nMem );
++  p->agg.apFunc[i] = (FuncDef*)pOp->p3;
++  break;
++}
++
++/* Opcode: AggFunc * P2 P3
++**
++** Execute the step function for an aggregate.  The
++** function has P2 arguments.  P3 is a pointer to the FuncDef
++** structure that specifies the function.
++**
++** The top of the stack must be an integer which is the index of
++** the aggregate column that corresponds to this aggregate function.
++** Ideally, this index would be another parameter, but there are
++** no free parameters left.  The integer is popped from the stack.
++*/
++case OP_AggFunc: {
++  int n = pOp->p2;
++  int i;
++  Mem *pMem, *pRec;
++  char **azArgv = p->zArgv;
++  sqlite_func ctx;
++
++  assert( n>=0 );
++  assert( pTos->flags==MEM_Int );
++  pRec = &pTos[-n];
++  assert( pRec>=p->aStack );
++  for(i=0; i<n; i++, pRec++){
++    if( pRec->flags & MEM_Null ){
++      azArgv[i] = 0;
++    }else{
++      Stringify(pRec);
++      azArgv[i] = pRec->z;
++    }
++  }
++  i = pTos->i;
++  assert( i>=0 && i<p->agg.nMem );
++  ctx.pFunc = (FuncDef*)pOp->p3;
++  pMem = &p->agg.pCurrent->aMem[i];
++  ctx.s.z = pMem->zShort;  /* Space used for small aggregate contexts */
++  ctx.pAgg = pMem->z;
++  ctx.cnt = ++pMem->i;
++  ctx.isError = 0;
++  ctx.isStep = 1;
++  (ctx.pFunc->xStep)(&ctx, n, (const char**)azArgv);
++  pMem->z = ctx.pAgg;
++  pMem->flags = MEM_AggCtx;
++  popStack(&pTos, n+1);
++  if( ctx.isError ){
++    rc = SQLITE_ERROR;
++  }
++  break;
++}
++
++/* Opcode: AggFocus * P2 *
++**
++** Pop the top of the stack and use that as an aggregator key.  If
++** an aggregator with that same key already exists, then make the
++** aggregator the current aggregator and jump to P2.  If no aggregator
++** with the given key exists, create one and make it current but
++** do not jump.
++**
++** The order of aggregator opcodes is important.  The order is:
++** AggReset AggFocus AggNext.  In other words, you must execute
++** AggReset first, then zero or more AggFocus operations, then
++** zero or more AggNext operations.  You must not execute an AggFocus
++** in between an AggNext and an AggReset.
++*/
++case OP_AggFocus: {
++  AggElem *pElem;
++  char *zKey;
++  int nKey;
++
++  assert( pTos>=p->aStack );
++  Stringify(pTos);
++  zKey = pTos->z;
++  nKey = pTos->n;
++  pElem = sqliteHashFind(&p->agg.hash, zKey, nKey);
++  if( pElem ){
++    p->agg.pCurrent = pElem;
++    pc = pOp->p2 - 1;
++  }else{
++    AggInsert(&p->agg, zKey, nKey);
++    if( sqlite_malloc_failed ) goto no_mem;
++  }
++  Release(pTos);
++  pTos--;
++  break; 
++}
++
++/* Opcode: AggSet * P2 *
++**
++** Move the top of the stack into the P2-th field of the current
++** aggregate.  String values are duplicated into new memory.
++*/
++case OP_AggSet: {
++  AggElem *pFocus = AggInFocus(p->agg);
++  Mem *pMem;
++  int i = pOp->p2;
++  assert( pTos>=p->aStack );
++  if( pFocus==0 ) goto no_mem;
++  assert( i>=0 && i<p->agg.nMem );
++  Deephemeralize(pTos);
++  pMem = &pFocus->aMem[i];
++  Release(pMem);
++  *pMem = *pTos;
++  if( pMem->flags & MEM_Dyn ){
++    pTos->flags = MEM_Null;
++  }else if( pMem->flags & MEM_Short ){
++    pMem->z = pMem->zShort;
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: AggGet * P2 *
++**
++** Push a new entry onto the stack which is a copy of the P2-th field
++** of the current aggregate.  Strings are not duplicated so
++** string values will be ephemeral.
++*/
++case OP_AggGet: {
++  AggElem *pFocus = AggInFocus(p->agg);
++  Mem *pMem;
++  int i = pOp->p2;
++  if( pFocus==0 ) goto no_mem;
++  assert( i>=0 && i<p->agg.nMem );
++  pTos++;
++  pMem = &pFocus->aMem[i];
++  *pTos = *pMem;
++  if( pTos->flags & MEM_Str ){
++    pTos->flags &= ~(MEM_Dyn|MEM_Static|MEM_Short);
++    pTos->flags |= MEM_Ephem;
++  }
++  if( pTos->flags & MEM_AggCtx ){
++    Release(pTos);
++    pTos->flags = MEM_Null;
++  }
++  break;
++}
++
++/* Opcode: AggNext * P2 *
++**
++** Make the next aggregate value the current aggregate.  The prior
++** aggregate is deleted.  If all aggregate values have been consumed,
++** jump to P2.
++**
++** The order of aggregator opcodes is important.  The order is:
++** AggReset AggFocus AggNext.  In other words, you must execute
++** AggReset first, then zero or more AggFocus operations, then
++** zero or more AggNext operations.  You must not execute an AggFocus
++** in between an AggNext and an AggReset.
++*/
++case OP_AggNext: {
++  CHECK_FOR_INTERRUPT;
++  if( p->agg.pSearch==0 ){
++    p->agg.pSearch = sqliteHashFirst(&p->agg.hash);
++  }else{
++    p->agg.pSearch = sqliteHashNext(p->agg.pSearch);
++  }
++  if( p->agg.pSearch==0 ){
++    pc = pOp->p2 - 1;
++  } else {
++    int i;
++    sqlite_func ctx;
++    Mem *aMem;
++    p->agg.pCurrent = sqliteHashData(p->agg.pSearch);
++    aMem = p->agg.pCurrent->aMem;
++    for(i=0; i<p->agg.nMem; i++){
++      int freeCtx;
++      if( p->agg.apFunc[i]==0 ) continue;
++      if( p->agg.apFunc[i]->xFinalize==0 ) continue;
++      ctx.s.flags = MEM_Null;
++      ctx.s.z = aMem[i].zShort;
++      ctx.pAgg = (void*)aMem[i].z;
++      freeCtx = aMem[i].z && aMem[i].z!=aMem[i].zShort;
++      ctx.cnt = aMem[i].i;
++      ctx.isStep = 0;
++      ctx.pFunc = p->agg.apFunc[i];
++      (*p->agg.apFunc[i]->xFinalize)(&ctx);
++      if( freeCtx ){
++        sqliteFree( aMem[i].z );
++      }
++      aMem[i] = ctx.s;
++      if( aMem[i].flags & MEM_Short ){
++        aMem[i].z = aMem[i].zShort;
++      }
++    }
++  }
++  break;
++}
++
++/* Opcode: SetInsert P1 * P3
++**
++** If Set P1 does not exist then create it.  Then insert value
++** P3 into that set.  If P3 is NULL, then insert the top of the
++** stack into the set.
++*/
++case OP_SetInsert: {
++  int i = pOp->p1;
++  if( p->nSet<=i ){
++    int k;
++    Set *aSet = sqliteRealloc(p->aSet, (i+1)*sizeof(p->aSet[0]) );
++    if( aSet==0 ) goto no_mem;
++    p->aSet = aSet;
++    for(k=p->nSet; k<=i; k++){
++      sqliteHashInit(&p->aSet[k].hash, SQLITE_HASH_BINARY, 1);
++    }
++    p->nSet = i+1;
++  }
++  if( pOp->p3 ){
++    sqliteHashInsert(&p->aSet[i].hash, pOp->p3, strlen(pOp->p3)+1, p);
++  }else{
++    assert( pTos>=p->aStack );
++    Stringify(pTos);
++    sqliteHashInsert(&p->aSet[i].hash, pTos->z, pTos->n, p);
++    Release(pTos);
++    pTos--;
++  }
++  if( sqlite_malloc_failed ) goto no_mem;
++  break;
++}
++
++/* Opcode: SetFound P1 P2 *
++**
++** Pop the stack once and compare the value popped off with the
++** contents of set P1.  If the element popped exists in set P1,
++** then jump to P2.  Otherwise fall through.
++*/
++case OP_SetFound: {
++  int i = pOp->p1;
++  assert( pTos>=p->aStack );
++  Stringify(pTos);
++  if( i>=0 && i<p->nSet && sqliteHashFind(&p->aSet[i].hash, pTos->z, pTos->n)){
++    pc = pOp->p2 - 1;
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: SetNotFound P1 P2 *
++**
++** Pop the stack once and compare the value popped off with the
++** contents of set P1.  If the element popped does not exists in 
++** set P1, then jump to P2.  Otherwise fall through.
++*/
++case OP_SetNotFound: {
++  int i = pOp->p1;
++  assert( pTos>=p->aStack );
++  Stringify(pTos);
++  if( i<0 || i>=p->nSet ||
++       sqliteHashFind(&p->aSet[i].hash, pTos->z, pTos->n)==0 ){
++    pc = pOp->p2 - 1;
++  }
++  Release(pTos);
++  pTos--;
++  break;
++}
++
++/* Opcode: SetFirst P1 P2 *
++**
++** Read the first element from set P1 and push it onto the stack.  If the
++** set is empty, push nothing and jump immediately to P2.  This opcode is
++** used in combination with OP_SetNext to loop over all elements of a set.
++*/
++/* Opcode: SetNext P1 P2 *
++**
++** Read the next element from set P1 and push it onto the stack.  If there
++** are no more elements in the set, do not do the push and fall through.
++** Otherwise, jump to P2 after pushing the next set element.
++*/
++case OP_SetFirst: 
++case OP_SetNext: {
++  Set *pSet;
++  CHECK_FOR_INTERRUPT;
++  if( pOp->p1<0 || pOp->p1>=p->nSet ){
++    if( pOp->opcode==OP_SetFirst ) pc = pOp->p2 - 1;
++    break;
++  }
++  pSet = &p->aSet[pOp->p1];
++  if( pOp->opcode==OP_SetFirst ){
++    pSet->prev = sqliteHashFirst(&pSet->hash);
++    if( pSet->prev==0 ){
++      pc = pOp->p2 - 1;
++      break;
++    }
++  }else{
++    if( pSet->prev ){
++      pSet->prev = sqliteHashNext(pSet->prev);
++    }
++    if( pSet->prev==0 ){
++      break;
++    }else{
++      pc = pOp->p2 - 1;
++    }
++  }
++  pTos++;
++  pTos->z = sqliteHashKey(pSet->prev);
++  pTos->n = sqliteHashKeysize(pSet->prev);
++  pTos->flags = MEM_Str | MEM_Ephem;
++  break;
++}
++
++/* Opcode: Vacuum * * *
++**
++** Vacuum the entire database.  This opcode will cause other virtual
++** machines to be created and run.  It may not be called from within
++** a transaction.
++*/
++case OP_Vacuum: {
++  if( sqliteSafetyOff(db) ) goto abort_due_to_misuse; 
++  rc = sqliteRunVacuum(&p->zErrMsg, db);
++  if( sqliteSafetyOn(db) ) goto abort_due_to_misuse;
++  break;
++}
++
++/* Opcode: StackDepth * * *
++**
++** Push an integer onto the stack which is the depth of the stack prior
++** to that integer being pushed.
++*/
++case OP_StackDepth: {
++  int depth = (&pTos[1]) - p->aStack;
++  pTos++;
++  pTos->i = depth;
++  pTos->flags = MEM_Int;
++  break;
++}
++
++/* Opcode: StackReset * * *
++**
++** Pop a single integer off of the stack.  Then pop the stack
++** as many times as necessary to get the depth of the stack down
++** to the value of the integer that was popped.
++*/
++case OP_StackReset: {
++  int depth, goal;
++  assert( pTos>=p->aStack );
++  Integerify(pTos);
++  goal = pTos->i;
++  depth = (&pTos[1]) - p->aStack;
++  assert( goal<depth );
++  popStack(&pTos, depth-goal);
++  break;
++}
++
++/* An other opcode is illegal...
++*/
++default: {
++  sqlite_snprintf(sizeof(zBuf),zBuf,"%d",pOp->opcode);
++  sqliteSetString(&p->zErrMsg, "unknown opcode ", zBuf, (char*)0);
++  rc = SQLITE_INTERNAL;
++  break;
++}
++
++/*****************************************************************************
++** The cases of the switch statement above this line should all be indented
++** by 6 spaces.  But the left-most 6 spaces have been removed to improve the
++** readability.  From this point on down, the normal indentation rules are
++** restored.
++*****************************************************************************/
++    }
++
++#ifdef VDBE_PROFILE
++    {
++      long long elapse = hwtime() - start;
++      pOp->cycles += elapse;
++      pOp->cnt++;
++#if 0
++        fprintf(stdout, "%10lld ", elapse);
++        sqliteVdbePrintOp(stdout, origPc, &p->aOp[origPc]);
++#endif
++    }
++#endif
++
++    /* The following code adds nothing to the actual functionality
++    ** of the program.  It is only here for testing and debugging.
++    ** On the other hand, it does burn CPU cycles every time through
++    ** the evaluator loop.  So we can leave it out when NDEBUG is defined.
++    */
++#ifndef NDEBUG
++    /* Sanity checking on the top element of the stack */
++    if( pTos>=p->aStack ){
++      assert( pTos->flags!=0 );  /* Must define some type */
++      if( pTos->flags & MEM_Str ){
++        int x = pTos->flags & (MEM_Static|MEM_Dyn|MEM_Ephem|MEM_Short);
++        assert( x!=0 );            /* Strings must define a string subtype */
++        assert( (x & (x-1))==0 );  /* Only one string subtype can be defined */
++        assert( pTos->z!=0 );      /* Strings must have a value */
++        /* Mem.z points to Mem.zShort iff the subtype is MEM_Short */
++        assert( (pTos->flags & MEM_Short)==0 || pTos->z==pTos->zShort );
++        assert( (pTos->flags & MEM_Short)!=0 || pTos->z!=pTos->zShort );
++      }else{
++        /* Cannot define a string subtype for non-string objects */
++        assert( (pTos->flags & (MEM_Static|MEM_Dyn|MEM_Ephem|MEM_Short))==0 );
++      }
++      /* MEM_Null excludes all other types */
++      assert( pTos->flags==MEM_Null || (pTos->flags&MEM_Null)==0 );
++    }
++    if( pc<-1 || pc>=p->nOp ){
++      sqliteSetString(&p->zErrMsg, "jump destination out of range", (char*)0);
++      rc = SQLITE_INTERNAL;
++    }
++    if( p->trace && pTos>=p->aStack ){
++      int i;
++      fprintf(p->trace, "Stack:");
++      for(i=0; i>-5 && &pTos[i]>=p->aStack; i--){
++        if( pTos[i].flags & MEM_Null ){
++          fprintf(p->trace, " NULL");
++        }else if( (pTos[i].flags & (MEM_Int|MEM_Str))==(MEM_Int|MEM_Str) ){
++          fprintf(p->trace, " si:%d", pTos[i].i);
++        }else if( pTos[i].flags & MEM_Int ){
++          fprintf(p->trace, " i:%d", pTos[i].i);
++        }else if( pTos[i].flags & MEM_Real ){
++          fprintf(p->trace, " r:%g", pTos[i].r);
++        }else if( pTos[i].flags & MEM_Str ){
++          int j, k;
++          char zBuf[100];
++          zBuf[0] = ' ';
++          if( pTos[i].flags & MEM_Dyn ){
++            zBuf[1] = 'z';
++            assert( (pTos[i].flags & (MEM_Static|MEM_Ephem))==0 );
++          }else if( pTos[i].flags & MEM_Static ){
++            zBuf[1] = 't';
++            assert( (pTos[i].flags & (MEM_Dyn|MEM_Ephem))==0 );
++          }else if( pTos[i].flags & MEM_Ephem ){
++            zBuf[1] = 'e';
++            assert( (pTos[i].flags & (MEM_Static|MEM_Dyn))==0 );
++          }else{
++            zBuf[1] = 's';
++          }
++          zBuf[2] = '[';
++          k = 3;
++          for(j=0; j<20 && j<pTos[i].n; j++){
++            int c = pTos[i].z[j];
++            if( c==0 && j==pTos[i].n-1 ) break;
++            if( isprint(c) && !isspace(c) ){
++              zBuf[k++] = c;
++            }else{
++              zBuf[k++] = '.';
++            }
++          }
++          zBuf[k++] = ']';
++          zBuf[k++] = 0;
++          fprintf(p->trace, "%s", zBuf);
++        }else{
++          fprintf(p->trace, " ???");
++        }
++      }
++      if( rc!=0 ) fprintf(p->trace," rc=%d",rc);
++      fprintf(p->trace,"\n");
++    }
++#endif
++  }  /* The end of the for(;;) loop the loops through opcodes */
++
++  /* If we reach this point, it means that execution is finished.
++  */
++vdbe_halt:
++  CHECK_FOR_INTERRUPT
++  if( rc ){
++    p->rc = rc;
++    rc = SQLITE_ERROR;
++  }else{
++    rc = SQLITE_DONE;
++  }
++  p->magic = VDBE_MAGIC_HALT;
++  p->pTos = pTos;
++  return rc;
++
++  /* Jump to here if a malloc() fails.  It's hard to get a malloc()
++  ** to fail on a modern VM computer, so this code is untested.
++  */
++no_mem:
++  sqliteSetString(&p->zErrMsg, "out of memory", (char*)0);
++  rc = SQLITE_NOMEM;
++  goto vdbe_halt;
++
++  /* Jump to here for an SQLITE_MISUSE error.
++  */
++abort_due_to_misuse:
++  rc = SQLITE_MISUSE;
++  /* Fall thru into abort_due_to_error */
++
++  /* Jump to here for any other kind of fatal error.  The "rc" variable
++  ** should hold the error number.
++  */
++abort_due_to_error:
++  if( p->zErrMsg==0 ){
++    if( sqlite_malloc_failed ) rc = SQLITE_NOMEM;
++    sqliteSetString(&p->zErrMsg, sqlite_error_string(rc), (char*)0);
++  }
++  goto vdbe_halt;
++
++  /* Jump to here if the sqlite_interrupt() API sets the interrupt
++  ** flag.
++  */
++abort_due_to_interrupt:
++  assert( db->flags & SQLITE_Interrupt );
++  db->flags &= ~SQLITE_Interrupt;
++  if( db->magic!=SQLITE_MAGIC_BUSY ){
++    rc = SQLITE_MISUSE;
++  }else{
++    rc = SQLITE_INTERRUPT;
++  }
++  sqliteSetString(&p->zErrMsg, sqlite_error_string(rc), (char*)0);
++  goto vdbe_halt;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/vdbe.h
+@@ -0,0 +1,112 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** Header file for the Virtual DataBase Engine (VDBE)
++**
++** This header defines the interface to the virtual database engine
++** or VDBE.  The VDBE implements an abstract machine that runs a
++** simple program to access and modify the underlying database.
++**
++** $Id$
++*/
++#ifndef _SQLITE_VDBE_H_
++#define _SQLITE_VDBE_H_
++#include <stdio.h>
++
++/*
++** A single VDBE is an opaque structure named "Vdbe".  Only routines
++** in the source file sqliteVdbe.c are allowed to see the insides
++** of this structure.
++*/
++typedef struct Vdbe Vdbe;
++
++/*
++** A single instruction of the virtual machine has an opcode
++** and as many as three operands.  The instruction is recorded
++** as an instance of the following structure:
++*/
++struct VdbeOp {
++  u8 opcode;          /* What operation to perform */
++  int p1;             /* First operand */
++  int p2;             /* Second parameter (often the jump destination) */
++  char *p3;           /* Third parameter */
++  int p3type;         /* P3_STATIC, P3_DYNAMIC or P3_POINTER */
++#ifdef VDBE_PROFILE
++  int cnt;            /* Number of times this instruction was executed */
++  long long cycles;   /* Total time spend executing this instruction */
++#endif
++};
++typedef struct VdbeOp VdbeOp;
++
++/*
++** A smaller version of VdbeOp used for the VdbeAddOpList() function because
++** it takes up less space.
++*/
++struct VdbeOpList {
++  u8 opcode;          /* What operation to perform */
++  signed char p1;     /* First operand */
++  short int p2;       /* Second parameter (often the jump destination) */
++  char *p3;           /* Third parameter */
++};
++typedef struct VdbeOpList VdbeOpList;
++
++/*
++** Allowed values of VdbeOp.p3type
++*/
++#define P3_NOTUSED    0   /* The P3 parameter is not used */
++#define P3_DYNAMIC  (-1)  /* Pointer to a string obtained from sqliteMalloc() */
++#define P3_STATIC   (-2)  /* Pointer to a static string */
++#define P3_POINTER  (-3)  /* P3 is a pointer to some structure or object */
++
++/*
++** The following macro converts a relative address in the p2 field
++** of a VdbeOp structure into a negative number so that 
++** sqliteVdbeAddOpList() knows that the address is relative.  Calling
++** the macro again restores the address.
++*/
++#define ADDR(X)  (-1-(X))
++
++/*
++** The makefile scans the vdbe.c source file and creates the "opcodes.h"
++** header file that defines a number for each opcode used by the VDBE.
++*/
++#include "opcodes.h"
++
++/*
++** Prototypes for the VDBE interface.  See comments on the implementation
++** for a description of what each of these routines does.
++*/
++Vdbe *sqliteVdbeCreate(sqlite*);
++void sqliteVdbeCreateCallback(Vdbe*, int*);
++int sqliteVdbeAddOp(Vdbe*,int,int,int);
++int sqliteVdbeOp3(Vdbe*,int,int,int,const char *zP3,int);
++int sqliteVdbeCode(Vdbe*,...);
++int sqliteVdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp);
++void sqliteVdbeChangeP1(Vdbe*, int addr, int P1);
++void sqliteVdbeChangeP2(Vdbe*, int addr, int P2);
++void sqliteVdbeChangeP3(Vdbe*, int addr, const char *zP1, int N);
++void sqliteVdbeDequoteP3(Vdbe*, int addr);
++int sqliteVdbeFindOp(Vdbe*, int, int);
++VdbeOp *sqliteVdbeGetOp(Vdbe*, int);
++int sqliteVdbeMakeLabel(Vdbe*);
++void sqliteVdbeDelete(Vdbe*);
++void sqliteVdbeMakeReady(Vdbe*,int,int);
++int sqliteVdbeExec(Vdbe*);
++int sqliteVdbeList(Vdbe*);
++int sqliteVdbeFinalize(Vdbe*,char**);
++void sqliteVdbeResolveLabel(Vdbe*, int);
++int sqliteVdbeCurrentAddr(Vdbe*);
++void sqliteVdbeTrace(Vdbe*,FILE*);
++void sqliteVdbeCompressSpace(Vdbe*,int);
++int sqliteVdbeReset(Vdbe*,char **);
++int sqliteVdbeSetVariables(Vdbe*,int,const char**);
++
++#endif
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/vdbeInt.h
+@@ -0,0 +1,303 @@
++/*
++** 2003 September 6
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This is the header file for information that is private to the
++** VDBE.  This information used to all be at the top of the single
++** source code file "vdbe.c".  When that file became too big (over
++** 6000 lines long) it was split up into several smaller files and
++** this header information was factored out.
++*/
++
++/*
++** When converting from the native format to the key format and back
++** again, in addition to changing the byte order we invert the high-order
++** bit of the most significant byte.  This causes negative numbers to
++** sort before positive numbers in the memcmp() function.
++*/
++#define keyToInt(X)   (sqliteVdbeByteSwap(X) ^ 0x80000000)
++#define intToKey(X)   (sqliteVdbeByteSwap((X) ^ 0x80000000))
++
++/*
++** The makefile scans this source file and creates the following
++** array of string constants which are the names of all VDBE opcodes.
++** This array is defined in a separate source code file named opcode.c
++** which is automatically generated by the makefile.
++*/
++extern char *sqliteOpcodeNames[];
++
++/*
++** SQL is translated into a sequence of instructions to be
++** executed by a virtual machine.  Each instruction is an instance
++** of the following structure.
++*/
++typedef struct VdbeOp Op;
++
++/*
++** Boolean values
++*/
++typedef unsigned char Bool;
++
++/*
++** A cursor is a pointer into a single BTree within a database file.
++** The cursor can seek to a BTree entry with a particular key, or
++** loop over all entries of the Btree.  You can also insert new BTree
++** entries or retrieve the key or data from the entry that the cursor
++** is currently pointing to.
++** 
++** Every cursor that the virtual machine has open is represented by an
++** instance of the following structure.
++**
++** If the Cursor.isTriggerRow flag is set it means that this cursor is
++** really a single row that represents the NEW or OLD pseudo-table of
++** a row trigger.  The data for the row is stored in Cursor.pData and
++** the rowid is in Cursor.iKey.
++*/
++struct Cursor {
++  BtCursor *pCursor;    /* The cursor structure of the backend */
++  int lastRecno;        /* Last recno from a Next or NextIdx operation */
++  int nextRowid;        /* Next rowid returned by OP_NewRowid */
++  Bool recnoIsValid;    /* True if lastRecno is valid */
++  Bool keyAsData;       /* The OP_Column command works on key instead of data */
++  Bool atFirst;         /* True if pointing to first entry */
++  Bool useRandomRowid;  /* Generate new record numbers semi-randomly */
++  Bool nullRow;         /* True if pointing to a row with no data */
++  Bool nextRowidValid;  /* True if the nextRowid field is valid */
++  Bool pseudoTable;     /* This is a NEW or OLD pseudo-tables of a trigger */
++  Bool deferredMoveto;  /* A call to sqliteBtreeMoveto() is needed */
++  int movetoTarget;     /* Argument to the deferred sqliteBtreeMoveto() */
++  Btree *pBt;           /* Separate file holding temporary table */
++  int nData;            /* Number of bytes in pData */
++  char *pData;          /* Data for a NEW or OLD pseudo-table */
++  int iKey;             /* Key for the NEW or OLD pseudo-table row */
++};
++typedef struct Cursor Cursor;
++
++/*
++** A sorter builds a list of elements to be sorted.  Each element of
++** the list is an instance of the following structure.
++*/
++typedef struct Sorter Sorter;
++struct Sorter {
++  int nKey;           /* Number of bytes in the key */
++  char *zKey;         /* The key by which we will sort */
++  int nData;          /* Number of bytes in the data */
++  char *pData;        /* The data associated with this key */
++  Sorter *pNext;      /* Next in the list */
++};
++
++/* 
++** Number of buckets used for merge-sort.  
++*/
++#define NSORT 30
++
++/*
++** Number of bytes of string storage space available to each stack
++** layer without having to malloc.  NBFS is short for Number of Bytes
++** For Strings.
++*/
++#define NBFS 32
++
++/*
++** A single level of the stack or a single memory cell
++** is an instance of the following structure. 
++*/
++struct Mem {
++  int i;              /* Integer value */
++  int n;              /* Number of characters in string value, including '\0' */
++  int flags;          /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */
++  double r;           /* Real value */
++  char *z;            /* String value */
++  char zShort[NBFS];  /* Space for short strings */
++};
++typedef struct Mem Mem;
++
++/*
++** Allowed values for Mem.flags
++*/
++#define MEM_Null      0x0001   /* Value is NULL */
++#define MEM_Str       0x0002   /* Value is a string */
++#define MEM_Int       0x0004   /* Value is an integer */
++#define MEM_Real      0x0008   /* Value is a real number */
++#define MEM_Dyn       0x0010   /* Need to call sqliteFree() on Mem.z */
++#define MEM_Static    0x0020   /* Mem.z points to a static string */
++#define MEM_Ephem     0x0040   /* Mem.z points to an ephemeral string */
++#define MEM_Short     0x0080   /* Mem.z points to Mem.zShort */
++
++/* The following MEM_ value appears only in AggElem.aMem.s.flag fields.
++** It indicates that the corresponding AggElem.aMem.z points to a
++** aggregate function context that needs to be finalized.
++*/
++#define MEM_AggCtx    0x0100   /* Mem.z points to an agg function context */
++
++/*
++** The "context" argument for a installable function.  A pointer to an
++** instance of this structure is the first argument to the routines used
++** implement the SQL functions.
++**
++** There is a typedef for this structure in sqlite.h.  So all routines,
++** even the public interface to SQLite, can use a pointer to this structure.
++** But this file is the only place where the internal details of this
++** structure are known.
++**
++** This structure is defined inside of vdbe.c because it uses substructures
++** (Mem) which are only defined there.
++*/
++struct sqlite_func {
++  FuncDef *pFunc;   /* Pointer to function information.  MUST BE FIRST */
++  Mem s;            /* The return value is stored here */
++  void *pAgg;       /* Aggregate context */
++  u8 isError;       /* Set to true for an error */
++  u8 isStep;        /* Current in the step function */
++  int cnt;          /* Number of times that the step function has been called */
++};
++
++/*
++** An Agg structure describes an Aggregator.  Each Agg consists of
++** zero or more Aggregator elements (AggElem).  Each AggElem contains
++** a key and one or more values.  The values are used in processing
++** aggregate functions in a SELECT.  The key is used to implement
++** the GROUP BY clause of a select.
++*/
++typedef struct Agg Agg;
++typedef struct AggElem AggElem;
++struct Agg {
++  int nMem;            /* Number of values stored in each AggElem */
++  AggElem *pCurrent;   /* The AggElem currently in focus */
++  HashElem *pSearch;   /* The hash element for pCurrent */
++  Hash hash;           /* Hash table of all aggregate elements */
++  FuncDef **apFunc;    /* Information about aggregate functions */
++};
++struct AggElem {
++  char *zKey;          /* The key to this AggElem */
++  int nKey;            /* Number of bytes in the key, including '\0' at end */
++  Mem aMem[1];         /* The values for this AggElem */
++};
++
++/*
++** A Set structure is used for quick testing to see if a value
++** is part of a small set.  Sets are used to implement code like
++** this:
++**            x.y IN ('hi','hoo','hum')
++*/
++typedef struct Set Set;
++struct Set {
++  Hash hash;             /* A set is just a hash table */
++  HashElem *prev;        /* Previously accessed hash elemen */
++};
++
++/*
++** A Keylist is a bunch of keys into a table.  The keylist can
++** grow without bound.  The keylist stores the ROWIDs of database
++** records that need to be deleted or updated.
++*/
++typedef struct Keylist Keylist;
++struct Keylist {
++  int nKey;         /* Number of slots in aKey[] */
++  int nUsed;        /* Next unwritten slot in aKey[] */
++  int nRead;        /* Next unread slot in aKey[] */
++  Keylist *pNext;   /* Next block of keys */
++  int aKey[1];      /* One or more keys.  Extra space allocated as needed */
++};
++
++/*
++** A Context stores the last insert rowid, the last statement change count,
++** and the current statement change count (i.e. changes since last statement).
++** Elements of Context structure type make up the ContextStack, which is
++** updated by the ContextPush and ContextPop opcodes (used by triggers)
++*/
++typedef struct Context Context;
++struct Context {
++  int lastRowid;    /* Last insert rowid (from db->lastRowid) */
++  int lsChange;     /* Last statement change count (from db->lsChange) */
++  int csChange;     /* Current statement change count (from db->csChange) */
++};
++
++/*
++** An instance of the virtual machine.  This structure contains the complete
++** state of the virtual machine.
++**
++** The "sqlite_vm" structure pointer that is returned by sqlite_compile()
++** is really a pointer to an instance of this structure.
++*/
++struct Vdbe {
++  sqlite *db;         /* The whole database */
++  Vdbe *pPrev,*pNext; /* Linked list of VDBEs with the same Vdbe.db */
++  FILE *trace;        /* Write an execution trace here, if not NULL */
++  int nOp;            /* Number of instructions in the program */
++  int nOpAlloc;       /* Number of slots allocated for aOp[] */
++  Op *aOp;            /* Space to hold the virtual machine's program */
++  int nLabel;         /* Number of labels used */
++  int nLabelAlloc;    /* Number of slots allocated in aLabel[] */
++  int *aLabel;        /* Space to hold the labels */
++  Mem *aStack;        /* The operand stack, except string values */
++  Mem *pTos;          /* Top entry in the operand stack */
++  char **zArgv;       /* Text values used by the callback */
++  char **azColName;   /* Becomes the 4th parameter to callbacks */
++  int nCursor;        /* Number of slots in aCsr[] */
++  Cursor *aCsr;       /* One element of this array for each open cursor */
++  Sorter *pSort;      /* A linked list of objects to be sorted */
++  FILE *pFile;        /* At most one open file handler */
++  int nField;         /* Number of file fields */
++  char **azField;     /* Data for each file field */
++  int nVar;           /* Number of entries in azVariable[] */
++  char **azVar;       /* Values for the OP_Variable opcode */
++  int *anVar;         /* Length of each value in azVariable[] */
++  u8 *abVar;          /* TRUE if azVariable[i] needs to be sqliteFree()ed */
++  char *zLine;            /* A single line from the input file */
++  int nLineAlloc;         /* Number of spaces allocated for zLine */
++  int magic;              /* Magic number for sanity checking */
++  int nMem;               /* Number of memory locations currently allocated */
++  Mem *aMem;              /* The memory locations */
++  Agg agg;                /* Aggregate information */
++  int nSet;               /* Number of sets allocated */
++  Set *aSet;              /* An array of sets */
++  int nCallback;          /* Number of callbacks invoked so far */
++  Keylist *pList;         /* A list of ROWIDs */
++  int keylistStackDepth;  /* The size of the "keylist" stack */
++  Keylist **keylistStack; /* The stack used by opcodes ListPush & ListPop */
++  int contextStackDepth;  /* The size of the "context" stack */
++  Context *contextStack;  /* Stack used by opcodes ContextPush & ContextPop*/
++  int pc;                 /* The program counter */
++  int rc;                 /* Value to return */
++  unsigned uniqueCnt;     /* Used by OP_MakeRecord when P2!=0 */
++  int errorAction;        /* Recovery action to do in case of an error */
++  int undoTransOnError;   /* If error, either ROLLBACK or COMMIT */
++  int inTempTrans;        /* True if temp database is transactioned */
++  int returnStack[100];   /* Return address stack for OP_Gosub & OP_Return */
++  int returnDepth;        /* Next unused element in returnStack[] */
++  int nResColumn;         /* Number of columns in one row of the result set */
++  char **azResColumn;     /* Values for one row of result */ 
++  int popStack;           /* Pop the stack this much on entry to VdbeExec() */
++  char *zErrMsg;          /* Error message written here */
++  u8 explain;             /* True if EXPLAIN present on SQL command */
++};
++
++/*
++** The following are allowed values for Vdbe.magic
++*/
++#define VDBE_MAGIC_INIT     0x26bceaa5    /* Building a VDBE program */
++#define VDBE_MAGIC_RUN      0xbdf20da3    /* VDBE is ready to execute */
++#define VDBE_MAGIC_HALT     0x519c2973    /* VDBE has completed execution */
++#define VDBE_MAGIC_DEAD     0xb606c3c8    /* The VDBE has been deallocated */
++
++/*
++** Function prototypes
++*/
++void sqliteVdbeCleanupCursor(Cursor*);
++void sqliteVdbeSorterReset(Vdbe*);
++void sqliteVdbeAggReset(Agg*);
++void sqliteVdbeKeylistFree(Keylist*);
++void sqliteVdbePopStack(Vdbe*,int);
++int sqliteVdbeCursorMoveto(Cursor*);
++int sqliteVdbeByteSwap(int);
++#if !defined(NDEBUG) || defined(VDBE_PROFILE)
++void sqliteVdbePrintOp(FILE*, int, Op*);
++#endif
+--- /dev/null
++++ b/ext/sqlite/libsqlite/src/where.c
+@@ -0,0 +1,1235 @@
++/*
++** 2001 September 15
++**
++** The author disclaims copyright to this source code.  In place of
++** a legal notice, here is a blessing:
++**
++**    May you do good and not evil.
++**    May you find forgiveness for yourself and forgive others.
++**    May you share freely, never taking more than you give.
++**
++*************************************************************************
++** This module contains C code that generates VDBE code used to process
++** the WHERE clause of SQL statements.
++**
++** $Id$
++*/
++#include "sqliteInt.h"
++
++/*
++** The query generator uses an array of instances of this structure to
++** help it analyze the subexpressions of the WHERE clause.  Each WHERE
++** clause subexpression is separated from the others by an AND operator.
++*/
++typedef struct ExprInfo ExprInfo;
++struct ExprInfo {
++  Expr *p;                /* Pointer to the subexpression */
++  u8 indexable;           /* True if this subexprssion is usable by an index */
++  short int idxLeft;      /* p->pLeft is a column in this table number. -1 if
++                          ** p->pLeft is not the column of any table */
++  short int idxRight;     /* p->pRight is a column in this table number. -1 if
++                          ** p->pRight is not the column of any table */
++  unsigned prereqLeft;    /* Bitmask of tables referenced by p->pLeft */
++  unsigned prereqRight;   /* Bitmask of tables referenced by p->pRight */
++  unsigned prereqAll;     /* Bitmask of tables referenced by p */
++};
++
++/*
++** An instance of the following structure keeps track of a mapping
++** between VDBE cursor numbers and bitmasks.  The VDBE cursor numbers
++** are small integers contained in SrcList_item.iCursor and Expr.iTable
++** fields.  For any given WHERE clause, we want to track which cursors
++** are being used, so we assign a single bit in a 32-bit word to track
++** that cursor.  Then a 32-bit integer is able to show the set of all
++** cursors being used.
++*/
++typedef struct ExprMaskSet ExprMaskSet;
++struct ExprMaskSet {
++  int n;          /* Number of assigned cursor values */
++  int ix[31];     /* Cursor assigned to each bit */
++};
++
++/*
++** Determine the number of elements in an array.
++*/
++#define ARRAYSIZE(X)  (sizeof(X)/sizeof(X[0]))
++
++/*
++** This routine is used to divide the WHERE expression into subexpressions
++** separated by the AND operator.
++**
++** aSlot[] is an array of subexpressions structures.
++** There are nSlot spaces left in this array.  This routine attempts to
++** split pExpr into subexpressions and fills aSlot[] with those subexpressions.
++** The return value is the number of slots filled.
++*/
++static int exprSplit(int nSlot, ExprInfo *aSlot, Expr *pExpr){
++  int cnt = 0;
++  if( pExpr==0 || nSlot<1 ) return 0;
++  if( nSlot==1 || pExpr->op!=TK_AND ){
++    aSlot[0].p = pExpr;
++    return 1;
++  }
++  if( pExpr->pLeft->op!=TK_AND ){
++    aSlot[0].p = pExpr->pLeft;
++    cnt = 1 + exprSplit(nSlot-1, &aSlot[1], pExpr->pRight);
++  }else{
++    cnt = exprSplit(nSlot, aSlot, pExpr->pLeft);
++    cnt += exprSplit(nSlot-cnt, &aSlot[cnt], pExpr->pRight);
++  }
++  return cnt;
++}
++
++/*
++** Initialize an expression mask set
++*/
++#define initMaskSet(P)  memset(P, 0, sizeof(*P))
++
++/*
++** Return the bitmask for the given cursor.  Assign a new bitmask
++** if this is the first time the cursor has been seen.
++*/
++static int getMask(ExprMaskSet *pMaskSet, int iCursor){
++  int i;
++  for(i=0; i<pMaskSet->n; i++){
++    if( pMaskSet->ix[i]==iCursor ) return 1<<i;
++  }
++  if( i==pMaskSet->n && i<ARRAYSIZE(pMaskSet->ix) ){
++    pMaskSet->n++;
++    pMaskSet->ix[i] = iCursor;
++    return 1<<i;
++  }
++  return 0;
++}
++
++/*
++** Destroy an expression mask set
++*/
++#define freeMaskSet(P)   /* NO-OP */
++
++/*
++** This routine walks (recursively) an expression tree and generates
++** a bitmask indicating which tables are used in that expression
++** tree.
++**
++** In order for this routine to work, the calling function must have
++** previously invoked sqliteExprResolveIds() on the expression.  See
++** the header comment on that routine for additional information.
++** The sqliteExprResolveIds() routines looks for column names and
++** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
++** the VDBE cursor number of the table.
++*/
++static int exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
++  unsigned int mask = 0;
++  if( p==0 ) return 0;
++  if( p->op==TK_COLUMN ){
++    mask = getMask(pMaskSet, p->iTable);
++    if( mask==0 ) mask = -1;
++    return mask;
++  }
++  if( p->pRight ){
++    mask = exprTableUsage(pMaskSet, p->pRight);
++  }
++  if( p->pLeft ){
++    mask |= exprTableUsage(pMaskSet, p->pLeft);
++  }
++  if( p->pList ){
++    int i;
++    for(i=0; i<p->pList->nExpr; i++){
++      mask |= exprTableUsage(pMaskSet, p->pList->a[i].pExpr);
++    }
++  }
++  return mask;
++}
++
++/*
++** Return TRUE if the given operator is one of the operators that is
++** allowed for an indexable WHERE clause.  The allowed operators are
++** "=", "<", ">", "<=", ">=", and "IN".
++*/
++static int allowedOp(int op){
++  switch( op ){
++    case TK_LT:
++    case TK_LE:
++    case TK_GT:
++    case TK_GE:
++    case TK_EQ:
++    case TK_IN:
++      return 1;
++    default:
++      return 0;
++  }
++}
++
++/*
++** The input to this routine is an ExprInfo structure with only the
++** "p" field filled in.  The job of this routine is to analyze the
++** subexpression and populate all the other fields of the ExprInfo
++** structure.
++*/
++static void exprAnalyze(ExprMaskSet *pMaskSet, ExprInfo *pInfo){
++  Expr *pExpr = pInfo->p;
++  pInfo->prereqLeft = exprTableUsage(pMaskSet, pExpr->pLeft);
++  pInfo->prereqRight = exprTableUsage(pMaskSet, pExpr->pRight);
++  pInfo->prereqAll = exprTableUsage(pMaskSet, pExpr);
++  pInfo->indexable = 0;
++  pInfo->idxLeft = -1;
++  pInfo->idxRight = -1;
++  if( allowedOp(pExpr->op) && (pInfo->prereqRight & pInfo->prereqLeft)==0 ){
++    if( pExpr->pRight && pExpr->pRight->op==TK_COLUMN ){
++      pInfo->idxRight = pExpr->pRight->iTable;
++      pInfo->indexable = 1;
++    }
++    if( pExpr->pLeft->op==TK_COLUMN ){
++      pInfo->idxLeft = pExpr->pLeft->iTable;
++      pInfo->indexable = 1;
++    }
++  }
++}
++
++/*
++** pOrderBy is an ORDER BY clause from a SELECT statement.  pTab is the
++** left-most table in the FROM clause of that same SELECT statement and
++** the table has a cursor number of "base".
++**
++** This routine attempts to find an index for pTab that generates the
++** correct record sequence for the given ORDER BY clause.  The return value
++** is a pointer to an index that does the job.  NULL is returned if the
++** table has no index that will generate the correct sort order.
++**
++** If there are two or more indices that generate the correct sort order
++** and pPreferredIdx is one of those indices, then return pPreferredIdx.
++**
++** nEqCol is the number of columns of pPreferredIdx that are used as
++** equality constraints.  Any index returned must have exactly this same
++** set of columns.  The ORDER BY clause only matches index columns beyond the
++** the first nEqCol columns.
++**
++** All terms of the ORDER BY clause must be either ASC or DESC.  The
++** *pbRev value is set to 1 if the ORDER BY clause is all DESC and it is
++** set to 0 if the ORDER BY clause is all ASC.
++*/
++static Index *findSortingIndex(
++  Table *pTab,            /* The table to be sorted */
++  int base,               /* Cursor number for pTab */
++  ExprList *pOrderBy,     /* The ORDER BY clause */
++  Index *pPreferredIdx,   /* Use this index, if possible and not NULL */
++  int nEqCol,             /* Number of index columns used with == constraints */
++  int *pbRev              /* Set to 1 if ORDER BY is DESC */
++){
++  int i, j;
++  Index *pMatch;
++  Index *pIdx;
++  int sortOrder;
++
++  assert( pOrderBy!=0 );
++  assert( pOrderBy->nExpr>0 );
++  sortOrder = pOrderBy->a[0].sortOrder & SQLITE_SO_DIRMASK;
++  for(i=0; i<pOrderBy->nExpr; i++){
++    Expr *p;
++    if( (pOrderBy->a[i].sortOrder & SQLITE_SO_DIRMASK)!=sortOrder ){
++      /* Indices can only be used if all ORDER BY terms are either
++      ** DESC or ASC.  Indices cannot be used on a mixture. */
++      return 0;
++    }
++    if( (pOrderBy->a[i].sortOrder & SQLITE_SO_TYPEMASK)!=SQLITE_SO_UNK ){
++      /* Do not sort by index if there is a COLLATE clause */
++      return 0;
++    }
++    p = pOrderBy->a[i].pExpr;
++    if( p->op!=TK_COLUMN || p->iTable!=base ){
++      /* Can not use an index sort on anything that is not a column in the
++      ** left-most table of the FROM clause */
++      return 0;
++    }
++  }
++  
++  /* If we get this far, it means the ORDER BY clause consists only of
++  ** ascending columns in the left-most table of the FROM clause.  Now
++  ** check for a matching index.
++  */
++  pMatch = 0;
++  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++    int nExpr = pOrderBy->nExpr;
++    if( pIdx->nColumn < nEqCol || pIdx->nColumn < nExpr ) continue;
++    for(i=j=0; i<nEqCol; i++){
++      if( pPreferredIdx->aiColumn[i]!=pIdx->aiColumn[i] ) break;
++      if( j<nExpr && pOrderBy->a[j].pExpr->iColumn==pIdx->aiColumn[i] ){ j++; }
++    }
++    if( i<nEqCol ) continue;
++    for(i=0; i+j<nExpr; i++){
++      if( pOrderBy->a[i+j].pExpr->iColumn!=pIdx->aiColumn[i+nEqCol] ) break;
++    }
++    if( i+j>=nExpr ){
++      pMatch = pIdx;
++      if( pIdx==pPreferredIdx ) break;
++    }
++  }
++  if( pMatch && pbRev ){
++    *pbRev = sortOrder==SQLITE_SO_DESC;
++  }
++  return pMatch;
++}
++
++/*
++** Disable a term in the WHERE clause.  Except, do not disable the term
++** if it controls a LEFT OUTER JOIN and it did not originate in the ON
++** or USING clause of that join.
++**
++** Consider the term t2.z='ok' in the following queries:
++**
++**   (1)  SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.x WHERE t2.z='ok'
++**   (2)  SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.x AND t2.z='ok'
++**   (3)  SELECT * FROM t1, t2 WHERE t1.a=t2.x AND t2.z='ok'
++**
++** The t2.z='ok' is disabled in the in (2) because it did not originate
++** in the ON clause.  The term is disabled in (3) because it is not part
++** of a LEFT OUTER JOIN.  In (1), the term is not disabled.
++**
++** Disabling a term causes that term to not be tested in the inner loop
++** of the join.  Disabling is an optimization.  We would get the correct
++** results if nothing were ever disabled, but joins might run a little
++** slower.  The trick is to disable as much as we can without disabling
++** too much.  If we disabled in (1), we'd get the wrong answer.
++** See ticket #813.
++*/
++static void disableTerm(WhereLevel *pLevel, Expr **ppExpr){
++  Expr *pExpr = *ppExpr;
++  if( pLevel->iLeftJoin==0 || ExprHasProperty(pExpr, EP_FromJoin) ){
++    *ppExpr = 0;
++  }
++}
++
++/*
++** Generate the beginning of the loop used for WHERE clause processing.
++** The return value is a pointer to an (opaque) structure that contains
++** information needed to terminate the loop.  Later, the calling routine
++** should invoke sqliteWhereEnd() with the return value of this function
++** in order to complete the WHERE clause processing.
++**
++** If an error occurs, this routine returns NULL.
++**
++** The basic idea is to do a nested loop, one loop for each table in
++** the FROM clause of a select.  (INSERT and UPDATE statements are the
++** same as a SELECT with only a single table in the FROM clause.)  For
++** example, if the SQL is this:
++**
++**       SELECT * FROM t1, t2, t3 WHERE ...;
++**
++** Then the code generated is conceptually like the following:
++**
++**      foreach row1 in t1 do       \    Code generated
++**        foreach row2 in t2 do      |-- by sqliteWhereBegin()
++**          foreach row3 in t3 do   /
++**            ...
++**          end                     \    Code generated
++**        end                        |-- by sqliteWhereEnd()
++**      end                         /
++**
++** There are Btree cursors associated with each table.  t1 uses cursor
++** number pTabList->a[0].iCursor.  t2 uses the cursor pTabList->a[1].iCursor.
++** And so forth.  This routine generates code to open those VDBE cursors
++** and sqliteWhereEnd() generates the code to close them.
++**
++** If the WHERE clause is empty, the foreach loops must each scan their
++** entire tables.  Thus a three-way join is an O(N^3) operation.  But if
++** the tables have indices and there are terms in the WHERE clause that
++** refer to those indices, a complete table scan can be avoided and the
++** code will run much faster.  Most of the work of this routine is checking
++** to see if there are indices that can be used to speed up the loop.
++**
++** Terms of the WHERE clause are also used to limit which rows actually
++** make it to the "..." in the middle of the loop.  After each "foreach",
++** terms of the WHERE clause that use only terms in that loop and outer
++** loops are evaluated and if false a jump is made around all subsequent
++** inner loops (or around the "..." if the test occurs within the inner-
++** most loop)
++**
++** OUTER JOINS
++**
++** An outer join of tables t1 and t2 is conceptally coded as follows:
++**
++**    foreach row1 in t1 do
++**      flag = 0
++**      foreach row2 in t2 do
++**        start:
++**          ...
++**          flag = 1
++**      end
++**      if flag==0 then
++**        move the row2 cursor to a null row
++**        goto start
++**      fi
++**    end
++**
++** ORDER BY CLAUSE PROCESSING
++**
++** *ppOrderBy is a pointer to the ORDER BY clause of a SELECT statement,
++** if there is one.  If there is no ORDER BY clause or if this routine
++** is called from an UPDATE or DELETE statement, then ppOrderBy is NULL.
++**
++** If an index can be used so that the natural output order of the table
++** scan is correct for the ORDER BY clause, then that index is used and
++** *ppOrderBy is set to NULL.  This is an optimization that prevents an
++** unnecessary sort of the result set if an index appropriate for the
++** ORDER BY clause already exists.
++**
++** If the where clause loops cannot be arranged to provide the correct
++** output order, then the *ppOrderBy is unchanged.
++*/
++WhereInfo *sqliteWhereBegin(
++  Parse *pParse,       /* The parser context */
++  SrcList *pTabList,   /* A list of all tables to be scanned */
++  Expr *pWhere,        /* The WHERE clause */
++  int pushKey,         /* If TRUE, leave the table key on the stack */
++  ExprList **ppOrderBy /* An ORDER BY clause, or NULL */
++){
++  int i;                     /* Loop counter */
++  WhereInfo *pWInfo;         /* Will become the return value of this function */
++  Vdbe *v = pParse->pVdbe;   /* The virtual database engine */
++  int brk, cont = 0;         /* Addresses used during code generation */
++  int nExpr;           /* Number of subexpressions in the WHERE clause */
++  int loopMask;        /* One bit set for each outer loop */
++  int haveKey;         /* True if KEY is on the stack */
++  ExprMaskSet maskSet; /* The expression mask set */
++  int iDirectEq[32];   /* Term of the form ROWID==X for the N-th table */
++  int iDirectLt[32];   /* Term of the form ROWID<X or ROWID<=X */
++  int iDirectGt[32];   /* Term of the form ROWID>X or ROWID>=X */
++  ExprInfo aExpr[101]; /* The WHERE clause is divided into these expressions */
++
++  /* pushKey is only allowed if there is a single table (as in an INSERT or
++  ** UPDATE statement)
++  */
++  assert( pushKey==0 || pTabList->nSrc==1 );
++
++  /* Split the WHERE clause into separate subexpressions where each
++  ** subexpression is separated by an AND operator.  If the aExpr[]
++  ** array fills up, the last entry might point to an expression which
++  ** contains additional unfactored AND operators.
++  */
++  initMaskSet(&maskSet);
++  memset(aExpr, 0, sizeof(aExpr));
++  nExpr = exprSplit(ARRAYSIZE(aExpr), aExpr, pWhere);
++  if( nExpr==ARRAYSIZE(aExpr) ){
++    sqliteErrorMsg(pParse, "WHERE clause too complex - no more "
++       "than %d terms allowed", (int)ARRAYSIZE(aExpr)-1);
++    return 0;
++  }
++  
++  /* Allocate and initialize the WhereInfo structure that will become the
++  ** return value.
++  */
++  pWInfo = sqliteMalloc( sizeof(WhereInfo) + pTabList->nSrc*sizeof(WhereLevel));
++  if( sqlite_malloc_failed ){
++    sqliteFree(pWInfo);
++    return 0;
++  }
++  pWInfo->pParse = pParse;
++  pWInfo->pTabList = pTabList;
++  pWInfo->peakNTab = pWInfo->savedNTab = pParse->nTab;
++  pWInfo->iBreak = sqliteVdbeMakeLabel(v);
++
++  /* Special case: a WHERE clause that is constant.  Evaluate the
++  ** expression and either jump over all of the code or fall thru.
++  */
++  if( pWhere && (pTabList->nSrc==0 || sqliteExprIsConstant(pWhere)) ){
++    sqliteExprIfFalse(pParse, pWhere, pWInfo->iBreak, 1);
++    pWhere = 0;
++  }
++
++  /* Analyze all of the subexpressions.
++  */
++  for(i=0; i<nExpr; i++){
++    exprAnalyze(&maskSet, &aExpr[i]);
++
++    /* If we are executing a trigger body, remove all references to
++    ** new.* and old.* tables from the prerequisite masks.
++    */
++    if( pParse->trigStack ){
++      int x;
++      if( (x = pParse->trigStack->newIdx) >= 0 ){
++        int mask = ~getMask(&maskSet, x);
++        aExpr[i].prereqRight &= mask;
++        aExpr[i].prereqLeft &= mask;
++        aExpr[i].prereqAll &= mask;
++      }
++      if( (x = pParse->trigStack->oldIdx) >= 0 ){
++        int mask = ~getMask(&maskSet, x);
++        aExpr[i].prereqRight &= mask;
++        aExpr[i].prereqLeft &= mask;
++        aExpr[i].prereqAll &= mask;
++      }
++    }
++  }
++
++  /* Figure out what index to use (if any) for each nested loop.
++  ** Make pWInfo->a[i].pIdx point to the index to use for the i-th nested
++  ** loop where i==0 is the outer loop and i==pTabList->nSrc-1 is the inner
++  ** loop. 
++  **
++  ** If terms exist that use the ROWID of any table, then set the
++  ** iDirectEq[], iDirectLt[], or iDirectGt[] elements for that table
++  ** to the index of the term containing the ROWID.  We always prefer
++  ** to use a ROWID which can directly access a table rather than an
++  ** index which requires reading an index first to get the rowid then
++  ** doing a second read of the actual database table.
++  **
++  ** Actually, if there are more than 32 tables in the join, only the
++  ** first 32 tables are candidates for indices.  This is (again) due
++  ** to the limit of 32 bits in an integer bitmask.
++  */
++  loopMask = 0;
++  for(i=0; i<pTabList->nSrc && i<ARRAYSIZE(iDirectEq); i++){
++    int j;
++    int iCur = pTabList->a[i].iCursor;    /* The cursor for this table */
++    int mask = getMask(&maskSet, iCur);   /* Cursor mask for this table */
++    Table *pTab = pTabList->a[i].pTab;
++    Index *pIdx;
++    Index *pBestIdx = 0;
++    int bestScore = 0;
++
++    /* Check to see if there is an expression that uses only the
++    ** ROWID field of this table.  For terms of the form ROWID==expr
++    ** set iDirectEq[i] to the index of the term.  For terms of the
++    ** form ROWID<expr or ROWID<=expr set iDirectLt[i] to the term index.
++    ** For terms like ROWID>expr or ROWID>=expr set iDirectGt[i].
++    **
++    ** (Added:) Treat ROWID IN expr like ROWID=expr.
++    */
++    pWInfo->a[i].iCur = -1;
++    iDirectEq[i] = -1;
++    iDirectLt[i] = -1;
++    iDirectGt[i] = -1;
++    for(j=0; j<nExpr; j++){
++      if( aExpr[j].idxLeft==iCur && aExpr[j].p->pLeft->iColumn<0
++            && (aExpr[j].prereqRight & loopMask)==aExpr[j].prereqRight ){
++        switch( aExpr[j].p->op ){
++          case TK_IN:
++          case TK_EQ: iDirectEq[i] = j; break;
++          case TK_LE:
++          case TK_LT: iDirectLt[i] = j; break;
++          case TK_GE:
++          case TK_GT: iDirectGt[i] = j;  break;
++        }
++      }
++      if( aExpr[j].idxRight==iCur && aExpr[j].p->pRight->iColumn<0
++            && (aExpr[j].prereqLeft & loopMask)==aExpr[j].prereqLeft ){
++        switch( aExpr[j].p->op ){
++          case TK_EQ: iDirectEq[i] = j;  break;
++          case TK_LE:
++          case TK_LT: iDirectGt[i] = j;  break;
++          case TK_GE:
++          case TK_GT: iDirectLt[i] = j;  break;
++        }
++      }
++    }
++    if( iDirectEq[i]>=0 ){
++      loopMask |= mask;
++      pWInfo->a[i].pIdx = 0;
++      continue;
++    }
++
++    /* Do a search for usable indices.  Leave pBestIdx pointing to
++    ** the "best" index.  pBestIdx is left set to NULL if no indices
++    ** are usable.
++    **
++    ** The best index is determined as follows.  For each of the
++    ** left-most terms that is fixed by an equality operator, add
++    ** 8 to the score.  The right-most term of the index may be
++    ** constrained by an inequality.  Add 1 if for an "x<..." constraint
++    ** and add 2 for an "x>..." constraint.  Chose the index that
++    ** gives the best score.
++    **
++    ** This scoring system is designed so that the score can later be
++    ** used to determine how the index is used.  If the score&7 is 0
++    ** then all constraints are equalities.  If score&1 is not 0 then
++    ** there is an inequality used as a termination key.  (ex: "x<...")
++    ** If score&2 is not 0 then there is an inequality used as the
++    ** start key.  (ex: "x>...").  A score or 4 is the special case
++    ** of an IN operator constraint.  (ex:  "x IN ...").
++    **
++    ** The IN operator (as in "<expr> IN (...)") is treated the same as
++    ** an equality comparison except that it can only be used on the
++    ** left-most column of an index and other terms of the WHERE clause
++    ** cannot be used in conjunction with the IN operator to help satisfy
++    ** other columns of the index.
++    */
++    for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
++      int eqMask = 0;  /* Index columns covered by an x=... term */
++      int ltMask = 0;  /* Index columns covered by an x<... term */
++      int gtMask = 0;  /* Index columns covered by an x>... term */
++      int inMask = 0;  /* Index columns covered by an x IN .. term */
++      int nEq, m, score;
++
++      if( pIdx->nColumn>32 ) continue;  /* Ignore indices too many columns */
++      for(j=0; j<nExpr; j++){
++        if( aExpr[j].idxLeft==iCur 
++             && (aExpr[j].prereqRight & loopMask)==aExpr[j].prereqRight ){
++          int iColumn = aExpr[j].p->pLeft->iColumn;
++          int k;
++          for(k=0; k<pIdx->nColumn; k++){
++            if( pIdx->aiColumn[k]==iColumn ){
++              switch( aExpr[j].p->op ){
++                case TK_IN: {
++                  if( k==0 ) inMask |= 1;
++                  break;
++                }
++                case TK_EQ: {
++                  eqMask |= 1<<k;
++                  break;
++                }
++                case TK_LE:
++                case TK_LT: {
++                  ltMask |= 1<<k;
++                  break;
++                }
++                case TK_GE:
++                case TK_GT: {
++                  gtMask |= 1<<k;
++                  break;
++                }
++                default: {
++                  /* CANT_HAPPEN */
++                  assert( 0 );
++                  break;
++                }
++              }
++              break;
++            }
++          }
++        }
++        if( aExpr[j].idxRight==iCur 
++             && (aExpr[j].prereqLeft & loopMask)==aExpr[j].prereqLeft ){
++          int iColumn = aExpr[j].p->pRight->iColumn;
++          int k;
++          for(k=0; k<pIdx->nColumn; k++){
++            if( pIdx->aiColumn[k]==iColumn ){
++              switch( aExpr[j].p->op ){
++                case TK_EQ: {
++                  eqMask |= 1<<k;
++                  break;
++                }
++                case TK_LE:
++                case TK_LT: {
++                  gtMask |= 1<<k;
++                  break;
++                }
++                case TK_GE:
++                case TK_GT: {
++                  ltMask |= 1<<k;
++                  break;
++                }
++                default: {
++                  /* CANT_HAPPEN */
++                  assert( 0 );
++                  break;
++                }
++              }
++              break;
++            }
++          }
++        }
++      }
++
++      /* The following loop ends with nEq set to the number of columns
++      ** on the left of the index with == constraints.
++      */
++      for(nEq=0; nEq<pIdx->nColumn; nEq++){
++        m = (1<<(nEq+1))-1;
++        if( (m & eqMask)!=m ) break;
++      }
++      score = nEq*8;   /* Base score is 8 times number of == constraints */
++      m = 1<<nEq;
++      if( m & ltMask ) score++;    /* Increase score for a < constraint */
++      if( m & gtMask ) score+=2;   /* Increase score for a > constraint */
++      if( score==0 && inMask ) score = 4;  /* Default score for IN constraint */
++      if( score>bestScore ){
++        pBestIdx = pIdx;
++        bestScore = score;
++      }
++    }
++    pWInfo->a[i].pIdx = pBestIdx;
++    pWInfo->a[i].score = bestScore;
++    pWInfo->a[i].bRev = 0;
++    loopMask |= mask;
++    if( pBestIdx ){
++      pWInfo->a[i].iCur = pParse->nTab++;
++      pWInfo->peakNTab = pParse->nTab;
++    }
++  }
++
++  /* Check to see if the ORDER BY clause is or can be satisfied by the
++  ** use of an index on the first table.
++  */
++  if( ppOrderBy && *ppOrderBy && pTabList->nSrc>0 ){
++     Index *pSortIdx;
++     Index *pIdx;
++     Table *pTab;
++     int bRev = 0;
++
++     pTab = pTabList->a[0].pTab;
++     pIdx = pWInfo->a[0].pIdx;
++     if( pIdx && pWInfo->a[0].score==4 ){
++       /* If there is already an IN index on the left-most table,
++       ** it will not give the correct sort order.
++       ** So, pretend that no suitable index is found.
++       */
++       pSortIdx = 0;
++     }else if( iDirectEq[0]>=0 || iDirectLt[0]>=0 || iDirectGt[0]>=0 ){
++       /* If the left-most column is accessed using its ROWID, then do
++       ** not try to sort by index.
++       */
++       pSortIdx = 0;
++     }else{
++       int nEqCol = (pWInfo->a[0].score+4)/8;
++       pSortIdx = findSortingIndex(pTab, pTabList->a[0].iCursor, 
++                                   *ppOrderBy, pIdx, nEqCol, &bRev);
++     }
++     if( pSortIdx && (pIdx==0 || pIdx==pSortIdx) ){
++       if( pIdx==0 ){
++         pWInfo->a[0].pIdx = pSortIdx;
++         pWInfo->a[0].iCur = pParse->nTab++;
++         pWInfo->peakNTab = pParse->nTab;
++       }
++       pWInfo->a[0].bRev = bRev;
++       *ppOrderBy = 0;
++     }
++  }
++
++  /* Open all tables in the pTabList and all indices used by those tables.
++  */
++  for(i=0; i<pTabList->nSrc; i++){
++    Table *pTab;
++    Index *pIx;
++
++    pTab = pTabList->a[i].pTab;
++    if( pTab->isTransient || pTab->pSelect ) continue;
++    sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0);
++    sqliteVdbeOp3(v, OP_OpenRead, pTabList->a[i].iCursor, pTab->tnum,
++                     pTab->zName, P3_STATIC);
++    sqliteCodeVerifySchema(pParse, pTab->iDb);
++    if( (pIx = pWInfo->a[i].pIdx)!=0 ){
++      sqliteVdbeAddOp(v, OP_Integer, pIx->iDb, 0);
++      sqliteVdbeOp3(v, OP_OpenRead, pWInfo->a[i].iCur, pIx->tnum, pIx->zName,0);
++    }
++  }
++
++  /* Generate the code to do the search
++  */
++  loopMask = 0;
++  for(i=0; i<pTabList->nSrc; i++){
++    int j, k;
++    int iCur = pTabList->a[i].iCursor;
++    Index *pIdx;
++    WhereLevel *pLevel = &pWInfo->a[i];
++
++    /* If this is the right table of a LEFT OUTER JOIN, allocate and
++    ** initialize a memory cell that records if this table matches any
++    ** row of the left table of the join.
++    */
++    if( i>0 && (pTabList->a[i-1].jointype & JT_LEFT)!=0 ){
++      if( !pParse->nMem ) pParse->nMem++;
++      pLevel->iLeftJoin = pParse->nMem++;
++      sqliteVdbeAddOp(v, OP_String, 0, 0);
++      sqliteVdbeAddOp(v, OP_MemStore, pLevel->iLeftJoin, 1);
++    }
++
++    pIdx = pLevel->pIdx;
++    pLevel->inOp = OP_Noop;
++    if( i<ARRAYSIZE(iDirectEq) && iDirectEq[i]>=0 ){
++      /* Case 1:  We can directly reference a single row using an
++      **          equality comparison against the ROWID field.  Or
++      **          we reference multiple rows using a "rowid IN (...)"
++      **          construct.
++      */
++      k = iDirectEq[i];
++      assert( k<nExpr );
++      assert( aExpr[k].p!=0 );
++      assert( aExpr[k].idxLeft==iCur || aExpr[k].idxRight==iCur );
++      brk = pLevel->brk = sqliteVdbeMakeLabel(v);
++      if( aExpr[k].idxLeft==iCur ){
++        Expr *pX = aExpr[k].p;
++        if( pX->op!=TK_IN ){
++          sqliteExprCode(pParse, aExpr[k].p->pRight);
++        }else if( pX->pList ){
++          sqliteVdbeAddOp(v, OP_SetFirst, pX->iTable, brk);
++          pLevel->inOp = OP_SetNext;
++          pLevel->inP1 = pX->iTable;
++          pLevel->inP2 = sqliteVdbeCurrentAddr(v);
++        }else{
++          assert( pX->pSelect );
++          sqliteVdbeAddOp(v, OP_Rewind, pX->iTable, brk);
++          sqliteVdbeAddOp(v, OP_KeyAsData, pX->iTable, 1);
++          pLevel->inP2 = sqliteVdbeAddOp(v, OP_FullKey, pX->iTable, 0);
++          pLevel->inOp = OP_Next;
++          pLevel->inP1 = pX->iTable;
++        }
++      }else{
++        sqliteExprCode(pParse, aExpr[k].p->pLeft);
++      }
++      disableTerm(pLevel, &aExpr[k].p);
++      cont = pLevel->cont = sqliteVdbeMakeLabel(v);
++      sqliteVdbeAddOp(v, OP_MustBeInt, 1, brk);
++      haveKey = 0;
++      sqliteVdbeAddOp(v, OP_NotExists, iCur, brk);
++      pLevel->op = OP_Noop;
++    }else if( pIdx!=0 && pLevel->score>0 && pLevel->score%4==0 ){
++      /* Case 2:  There is an index and all terms of the WHERE clause that
++      **          refer to the index use the "==" or "IN" operators.
++      */
++      int start;
++      int testOp;
++      int nColumn = (pLevel->score+4)/8;
++      brk = pLevel->brk = sqliteVdbeMakeLabel(v);
++      for(j=0; j<nColumn; j++){
++        for(k=0; k<nExpr; k++){
++          Expr *pX = aExpr[k].p;
++          if( pX==0 ) continue;
++          if( aExpr[k].idxLeft==iCur
++             && (aExpr[k].prereqRight & loopMask)==aExpr[k].prereqRight 
++             && pX->pLeft->iColumn==pIdx->aiColumn[j]
++          ){
++            if( pX->op==TK_EQ ){
++              sqliteExprCode(pParse, pX->pRight);
++              disableTerm(pLevel, &aExpr[k].p);
++              break;
++            }
++            if( pX->op==TK_IN && nColumn==1 ){
++              if( pX->pList ){
++                sqliteVdbeAddOp(v, OP_SetFirst, pX->iTable, brk);
++                pLevel->inOp = OP_SetNext;
++                pLevel->inP1 = pX->iTable;
++                pLevel->inP2 = sqliteVdbeCurrentAddr(v);
++              }else{
++                assert( pX->pSelect );
++                sqliteVdbeAddOp(v, OP_Rewind, pX->iTable, brk);
++                sqliteVdbeAddOp(v, OP_KeyAsData, pX->iTable, 1);
++                pLevel->inP2 = sqliteVdbeAddOp(v, OP_FullKey, pX->iTable, 0);
++                pLevel->inOp = OP_Next;
++                pLevel->inP1 = pX->iTable;
++              }
++              disableTerm(pLevel, &aExpr[k].p);
++              break;
++            }
++          }
++          if( aExpr[k].idxRight==iCur
++             && aExpr[k].p->op==TK_EQ
++             && (aExpr[k].prereqLeft & loopMask)==aExpr[k].prereqLeft
++             && aExpr[k].p->pRight->iColumn==pIdx->aiColumn[j]
++          ){
++            sqliteExprCode(pParse, aExpr[k].p->pLeft);
++            disableTerm(pLevel, &aExpr[k].p);
++            break;
++          }
++        }
++      }
++      pLevel->iMem = pParse->nMem++;
++      cont = pLevel->cont = sqliteVdbeMakeLabel(v);
++      sqliteVdbeAddOp(v, OP_NotNull, -nColumn, sqliteVdbeCurrentAddr(v)+3);
++      sqliteVdbeAddOp(v, OP_Pop, nColumn, 0);
++      sqliteVdbeAddOp(v, OP_Goto, 0, brk);
++      sqliteVdbeAddOp(v, OP_MakeKey, nColumn, 0);
++      sqliteAddIdxKeyType(v, pIdx);
++      if( nColumn==pIdx->nColumn || pLevel->bRev ){
++        sqliteVdbeAddOp(v, OP_MemStore, pLevel->iMem, 0);
++        testOp = OP_IdxGT;
++      }else{
++        sqliteVdbeAddOp(v, OP_Dup, 0, 0);
++        sqliteVdbeAddOp(v, OP_IncrKey, 0, 0);
++        sqliteVdbeAddOp(v, OP_MemStore, pLevel->iMem, 1);
++        testOp = OP_IdxGE;
++      }
++      if( pLevel->bRev ){
++        /* Scan in reverse order */
++        sqliteVdbeAddOp(v, OP_IncrKey, 0, 0);
++        sqliteVdbeAddOp(v, OP_MoveLt, pLevel->iCur, brk);
++        start = sqliteVdbeAddOp(v, OP_MemLoad, pLevel->iMem, 0);
++        sqliteVdbeAddOp(v, OP_IdxLT, pLevel->iCur, brk);
++        pLevel->op = OP_Prev;
++      }else{
++        /* Scan in the forward order */
++        sqliteVdbeAddOp(v, OP_MoveTo, pLevel->iCur, brk);
++        start = sqliteVdbeAddOp(v, OP_MemLoad, pLevel->iMem, 0);
++        sqliteVdbeAddOp(v, testOp, pLevel->iCur, brk);
++        pLevel->op = OP_Next;
++      }
++      sqliteVdbeAddOp(v, OP_RowKey, pLevel->iCur, 0);
++      sqliteVdbeAddOp(v, OP_IdxIsNull, nColumn, cont);
++      sqliteVdbeAddOp(v, OP_IdxRecno, pLevel->iCur, 0);
++      if( i==pTabList->nSrc-1 && pushKey ){
++        haveKey = 1;
++      }else{
++        sqliteVdbeAddOp(v, OP_MoveTo, iCur, 0);
++        haveKey = 0;
++      }
++      pLevel->p1 = pLevel->iCur;
++      pLevel->p2 = start;
++    }else if( i<ARRAYSIZE(iDirectLt) && (iDirectLt[i]>=0 || iDirectGt[i]>=0) ){
++      /* Case 3:  We have an inequality comparison against the ROWID field.
++      */
++      int testOp = OP_Noop;
++      int start;
++
++      brk = pLevel->brk = sqliteVdbeMakeLabel(v);
++      cont = pLevel->cont = sqliteVdbeMakeLabel(v);
++      if( iDirectGt[i]>=0 ){
++        k = iDirectGt[i];
++        assert( k<nExpr );
++        assert( aExpr[k].p!=0 );
++        assert( aExpr[k].idxLeft==iCur || aExpr[k].idxRight==iCur );
++        if( aExpr[k].idxLeft==iCur ){
++          sqliteExprCode(pParse, aExpr[k].p->pRight);
++        }else{
++          sqliteExprCode(pParse, aExpr[k].p->pLeft);
++        }
++        sqliteVdbeAddOp(v, OP_ForceInt,
++          aExpr[k].p->op==TK_LT || aExpr[k].p->op==TK_GT, brk);
++        sqliteVdbeAddOp(v, OP_MoveTo, iCur, brk);
++        disableTerm(pLevel, &aExpr[k].p);
++      }else{
++        sqliteVdbeAddOp(v, OP_Rewind, iCur, brk);
++      }
++      if( iDirectLt[i]>=0 ){
++        k = iDirectLt[i];
++        assert( k<nExpr );
++        assert( aExpr[k].p!=0 );
++        assert( aExpr[k].idxLeft==iCur || aExpr[k].idxRight==iCur );
++        if( aExpr[k].idxLeft==iCur ){
++          sqliteExprCode(pParse, aExpr[k].p->pRight);
++        }else{
++          sqliteExprCode(pParse, aExpr[k].p->pLeft);
++        }
++        /* sqliteVdbeAddOp(v, OP_MustBeInt, 0, sqliteVdbeCurrentAddr(v)+1); */
++        pLevel->iMem = pParse->nMem++;
++        sqliteVdbeAddOp(v, OP_MemStore, pLevel->iMem, 1);
++        if( aExpr[k].p->op==TK_LT || aExpr[k].p->op==TK_GT ){
++          testOp = OP_Ge;
++        }else{
++          testOp = OP_Gt;
++        }
++        disableTerm(pLevel, &aExpr[k].p);
++      }
++      start = sqliteVdbeCurrentAddr(v);
++      pLevel->op = OP_Next;
++      pLevel->p1 = iCur;
++      pLevel->p2 = start;
++      if( testOp!=OP_Noop ){
++        sqliteVdbeAddOp(v, OP_Recno, iCur, 0);
++        sqliteVdbeAddOp(v, OP_MemLoad, pLevel->iMem, 0);
++        sqliteVdbeAddOp(v, testOp, 0, brk);
++      }
++      haveKey = 0;
++    }else if( pIdx==0 ){
++      /* Case 4:  There is no usable index.  We must do a complete
++      **          scan of the entire database table.
++      */
++      int start;
++
++      brk = pLevel->brk = sqliteVdbeMakeLabel(v);
++      cont = pLevel->cont = sqliteVdbeMakeLabel(v);
++      sqliteVdbeAddOp(v, OP_Rewind, iCur, brk);
++      start = sqliteVdbeCurrentAddr(v);
++      pLevel->op = OP_Next;
++      pLevel->p1 = iCur;
++      pLevel->p2 = start;
++      haveKey = 0;
++    }else{
++      /* Case 5: The WHERE clause term that refers to the right-most
++      **         column of the index is an inequality.  For example, if
++      **         the index is on (x,y,z) and the WHERE clause is of the
++      **         form "x=5 AND y<10" then this case is used.  Only the
++      **         right-most column can be an inequality - the rest must
++      **         use the "==" operator.
++      **
++      **         This case is also used when there are no WHERE clause
++      **         constraints but an index is selected anyway, in order
++      **         to force the output order to conform to an ORDER BY.
++      */
++      int score = pLevel->score;
++      int nEqColumn = score/8;
++      int start;
++      int leFlag, geFlag;
++      int testOp;
++
++      /* Evaluate the equality constraints
++      */
++      for(j=0; j<nEqColumn; j++){
++        for(k=0; k<nExpr; k++){
++          if( aExpr[k].p==0 ) continue;
++          if( aExpr[k].idxLeft==iCur
++             && aExpr[k].p->op==TK_EQ
++             && (aExpr[k].prereqRight & loopMask)==aExpr[k].prereqRight 
++             && aExpr[k].p->pLeft->iColumn==pIdx->aiColumn[j]
++          ){
++            sqliteExprCode(pParse, aExpr[k].p->pRight);
++            disableTerm(pLevel, &aExpr[k].p);
++            break;
++          }
++          if( aExpr[k].idxRight==iCur
++             && aExpr[k].p->op==TK_EQ
++             && (aExpr[k].prereqLeft & loopMask)==aExpr[k].prereqLeft
++             && aExpr[k].p->pRight->iColumn==pIdx->aiColumn[j]
++          ){
++            sqliteExprCode(pParse, aExpr[k].p->pLeft);
++            disableTerm(pLevel, &aExpr[k].p);
++            break;
++          }
++        }
++      }
++
++      /* Duplicate the equality term values because they will all be
++      ** used twice: once to make the termination key and once to make the
++      ** start key.
++      */
++      for(j=0; j<nEqColumn; j++){
++        sqliteVdbeAddOp(v, OP_Dup, nEqColumn-1, 0);
++      }
++
++      /* Labels for the beginning and end of the loop
++      */
++      cont = pLevel->cont = sqliteVdbeMakeLabel(v);
++      brk = pLevel->brk = sqliteVdbeMakeLabel(v);
++
++      /* Generate the termination key.  This is the key value that
++      ** will end the search.  There is no termination key if there
++      ** are no equality terms and no "X<..." term.
++      **
++      ** 2002-Dec-04: On a reverse-order scan, the so-called "termination"
++      ** key computed here really ends up being the start key.
++      */
++      if( (score & 1)!=0 ){
++        for(k=0; k<nExpr; k++){
++          Expr *pExpr = aExpr[k].p;
++          if( pExpr==0 ) continue;
++          if( aExpr[k].idxLeft==iCur
++             && (pExpr->op==TK_LT || pExpr->op==TK_LE)
++             && (aExpr[k].prereqRight & loopMask)==aExpr[k].prereqRight 
++             && pExpr->pLeft->iColumn==pIdx->aiColumn[j]
++          ){
++            sqliteExprCode(pParse, pExpr->pRight);
++            leFlag = pExpr->op==TK_LE;
++            disableTerm(pLevel, &aExpr[k].p);
++            break;
++          }
++          if( aExpr[k].idxRight==iCur
++             && (pExpr->op==TK_GT || pExpr->op==TK_GE)
++             && (aExpr[k].prereqLeft & loopMask)==aExpr[k].prereqLeft
++             && pExpr->pRight->iColumn==pIdx->aiColumn[j]
++          ){
++            sqliteExprCode(pParse, pExpr->pLeft);
++            leFlag = pExpr->op==TK_GE;
++            disableTerm(pLevel, &aExpr[k].p);
++            break;
++          }
++        }
++        testOp = OP_IdxGE;
++      }else{
++        testOp = nEqColumn>0 ? OP_IdxGE : OP_Noop;
++        leFlag = 1;
++      }
++      if( testOp!=OP_Noop ){
++        int nCol = nEqColumn + (score & 1);
++        pLevel->iMem = pParse->nMem++;
++        sqliteVdbeAddOp(v, OP_NotNull, -nCol, sqliteVdbeCurrentAddr(v)+3);
++        sqliteVdbeAddOp(v, OP_Pop, nCol, 0);
++        sqliteVdbeAddOp(v, OP_Goto, 0, brk);
++        sqliteVdbeAddOp(v, OP_MakeKey, nCol, 0);
++        sqliteAddIdxKeyType(v, pIdx);
++        if( leFlag ){
++          sqliteVdbeAddOp(v, OP_IncrKey, 0, 0);
++        }
++        if( pLevel->bRev ){
++          sqliteVdbeAddOp(v, OP_MoveLt, pLevel->iCur, brk);
++        }else{
++          sqliteVdbeAddOp(v, OP_MemStore, pLevel->iMem, 1);
++        }
++      }else if( pLevel->bRev ){
++        sqliteVdbeAddOp(v, OP_Last, pLevel->iCur, brk);
++      }
++
++      /* Generate the start key.  This is the key that defines the lower
++      ** bound on the search.  There is no start key if there are no
++      ** equality terms and if there is no "X>..." term.  In
++      ** that case, generate a "Rewind" instruction in place of the
++      ** start key search.
++      **
++      ** 2002-Dec-04: In the case of a reverse-order search, the so-called
++      ** "start" key really ends up being used as the termination key.
++      */
++      if( (score & 2)!=0 ){
++        for(k=0; k<nExpr; k++){
++          Expr *pExpr = aExpr[k].p;
++          if( pExpr==0 ) continue;
++          if( aExpr[k].idxLeft==iCur
++             && (pExpr->op==TK_GT || pExpr->op==TK_GE)
++             && (aExpr[k].prereqRight & loopMask)==aExpr[k].prereqRight 
++             && pExpr->pLeft->iColumn==pIdx->aiColumn[j]
++          ){
++            sqliteExprCode(pParse, pExpr->pRight);
++            geFlag = pExpr->op==TK_GE;
++            disableTerm(pLevel, &aExpr[k].p);
++            break;
++          }
++          if( aExpr[k].idxRight==iCur
++             && (pExpr->op==TK_LT || pExpr->op==TK_LE)
++             && (aExpr[k].prereqLeft & loopMask)==aExpr[k].prereqLeft
++             && pExpr->pRight->iColumn==pIdx->aiColumn[j]
++          ){
++            sqliteExprCode(pParse, pExpr->pLeft);
++            geFlag = pExpr->op==TK_LE;
++            disableTerm(pLevel, &aExpr[k].p);
++            break;
++          }
++        }
++      }else{
++        geFlag = 1;
++      }
++      if( nEqColumn>0 || (score&2)!=0 ){
++        int nCol = nEqColumn + ((score&2)!=0);
++        sqliteVdbeAddOp(v, OP_NotNull, -nCol, sqliteVdbeCurrentAddr(v)+3);
++        sqliteVdbeAddOp(v, OP_Pop, nCol, 0);
++        sqliteVdbeAddOp(v, OP_Goto, 0, brk);
++        sqliteVdbeAddOp(v, OP_MakeKey, nCol, 0);
++        sqliteAddIdxKeyType(v, pIdx);
++        if( !geFlag ){
++          sqliteVdbeAddOp(v, OP_IncrKey, 0, 0);
++        }
++        if( pLevel->bRev ){
++          pLevel->iMem = pParse->nMem++;
++          sqliteVdbeAddOp(v, OP_MemStore, pLevel->iMem, 1);
++          testOp = OP_IdxLT;
++        }else{
++          sqliteVdbeAddOp(v, OP_MoveTo, pLevel->iCur, brk);
++        }
++      }else if( pLevel->bRev ){
++        testOp = OP_Noop;
++      }else{
++        sqliteVdbeAddOp(v, OP_Rewind, pLevel->iCur, brk);
++      }
++
++      /* Generate the the top of the loop.  If there is a termination
++      ** key we have to test for that key and abort at the top of the
++      ** loop.
++      */
++      start = sqliteVdbeCurrentAddr(v);
++      if( testOp!=OP_Noop ){
++        sqliteVdbeAddOp(v, OP_MemLoad, pLevel->iMem, 0);
++        sqliteVdbeAddOp(v, testOp, pLevel->iCur, brk);
++      }
++      sqliteVdbeAddOp(v, OP_RowKey, pLevel->iCur, 0);
++      sqliteVdbeAddOp(v, OP_IdxIsNull, nEqColumn + (score & 1), cont);
++      sqliteVdbeAddOp(v, OP_IdxRecno, pLevel->iCur, 0);
++      if( i==pTabList->nSrc-1 && pushKey ){
++        haveKey = 1;
++      }else{
++        sqliteVdbeAddOp(v, OP_MoveTo, iCur, 0);
++        haveKey = 0;
++      }
++
++      /* Record the instruction used to terminate the loop.
++      */
++      pLevel->op = pLevel->bRev ? OP_Prev : OP_Next;
++      pLevel->p1 = pLevel->iCur;
++      pLevel->p2 = start;
++    }
++    loopMask |= getMask(&maskSet, iCur);
++
++    /* Insert code to test every subexpression that can be completely
++    ** computed using the current set of tables.
++    */
++    for(j=0; j<nExpr; j++){
++      if( aExpr[j].p==0 ) continue;
++      if( (aExpr[j].prereqAll & loopMask)!=aExpr[j].prereqAll ) continue;
++      if( pLevel->iLeftJoin && !ExprHasProperty(aExpr[j].p,EP_FromJoin) ){
++        continue;
++      }
++      if( haveKey ){
++        haveKey = 0;
++        sqliteVdbeAddOp(v, OP_MoveTo, iCur, 0);
++      }
++      sqliteExprIfFalse(pParse, aExpr[j].p, cont, 1);
++      aExpr[j].p = 0;
++    }
++    brk = cont;
++
++    /* For a LEFT OUTER JOIN, generate code that will record the fact that
++    ** at least one row of the right table has matched the left table.  
++    */
++    if( pLevel->iLeftJoin ){
++      pLevel->top = sqliteVdbeCurrentAddr(v);
++      sqliteVdbeAddOp(v, OP_Integer, 1, 0);
++      sqliteVdbeAddOp(v, OP_MemStore, pLevel->iLeftJoin, 1);
++      for(j=0; j<nExpr; j++){
++        if( aExpr[j].p==0 ) continue;
++        if( (aExpr[j].prereqAll & loopMask)!=aExpr[j].prereqAll ) continue;
++        if( haveKey ){
++          /* Cannot happen.  "haveKey" can only be true if pushKey is true
++          ** an pushKey can only be true for DELETE and UPDATE and there are
++          ** no outer joins with DELETE and UPDATE.
++          */
++          haveKey = 0;
++          sqliteVdbeAddOp(v, OP_MoveTo, iCur, 0);
++        }
++        sqliteExprIfFalse(pParse, aExpr[j].p, cont, 1);
++        aExpr[j].p = 0;
++      }
++    }
++  }
++  pWInfo->iContinue = cont;
++  if( pushKey && !haveKey ){
++    sqliteVdbeAddOp(v, OP_Recno, pTabList->a[0].iCursor, 0);
++  }
++  freeMaskSet(&maskSet);
++  return pWInfo;
++}
++
++/*
++** Generate the end of the WHERE loop.  See comments on 
++** sqliteWhereBegin() for additional information.
++*/
++void sqliteWhereEnd(WhereInfo *pWInfo){
++  Vdbe *v = pWInfo->pParse->pVdbe;
++  int i;
++  WhereLevel *pLevel;
++  SrcList *pTabList = pWInfo->pTabList;
++
++  for(i=pTabList->nSrc-1; i>=0; i--){
++    pLevel = &pWInfo->a[i];
++    sqliteVdbeResolveLabel(v, pLevel->cont);
++    if( pLevel->op!=OP_Noop ){
++      sqliteVdbeAddOp(v, pLevel->op, pLevel->p1, pLevel->p2);
++    }
++    sqliteVdbeResolveLabel(v, pLevel->brk);
++    if( pLevel->inOp!=OP_Noop ){
++      sqliteVdbeAddOp(v, pLevel->inOp, pLevel->inP1, pLevel->inP2);
++    }
++    if( pLevel->iLeftJoin ){
++      int addr;
++      addr = sqliteVdbeAddOp(v, OP_MemLoad, pLevel->iLeftJoin, 0);
++      sqliteVdbeAddOp(v, OP_NotNull, 1, addr+4 + (pLevel->iCur>=0));
++      sqliteVdbeAddOp(v, OP_NullRow, pTabList->a[i].iCursor, 0);
++      if( pLevel->iCur>=0 ){
++        sqliteVdbeAddOp(v, OP_NullRow, pLevel->iCur, 0);
++      }
++      sqliteVdbeAddOp(v, OP_Goto, 0, pLevel->top);
++    }
++  }
++  sqliteVdbeResolveLabel(v, pWInfo->iBreak);
++  for(i=0; i<pTabList->nSrc; i++){
++    Table *pTab = pTabList->a[i].pTab;
++    assert( pTab!=0 );
++    if( pTab->isTransient || pTab->pSelect ) continue;
++    pLevel = &pWInfo->a[i];
++    sqliteVdbeAddOp(v, OP_Close, pTabList->a[i].iCursor, 0);
++    if( pLevel->pIdx!=0 ){
++      sqliteVdbeAddOp(v, OP_Close, pLevel->iCur, 0);
++    }
++  }
++#if 0  /* Never reuse a cursor */
++  if( pWInfo->pParse->nTab==pWInfo->peakNTab ){
++    pWInfo->pParse->nTab = pWInfo->savedNTab;
++  }
++#endif
++  sqliteFree(pWInfo);
++  return;
++}
+--- /dev/null
++++ b/ext/sqlite/libsqlite/VERSION
+@@ -0,0 +1 @@
++2.8.17
+--- /dev/null
++++ b/ext/sqlite/Makefile.frag
+@@ -0,0 +1,2 @@
++$(srcdir)/libsqlite/src/parse.c: $(srcdir)/libsqlite/src/parse.y
++	@$(LEMON) $(srcdir)/libsqlite/src/parse.y 
+--- /dev/null
++++ b/ext/sqlite/package.xml
+@@ -0,0 +1,136 @@
++<?xml version="1.0" encoding="ISO-8859-1" ?>
++<!DOCTYPE package SYSTEM "../pear/package.dtd">
++<package>
++ <name>SQLite</name>
++ <summary>SQLite database bindings</summary>
++ <maintainers>
++  <maintainer>
++   <user>wez</user>
++   <name>Wez Furlong</name>
++   <email>wez@php.net</email>
++   <role>lead</role>
++  </maintainer>
++  <maintainer>
++   <user>tal</user>
++   <name>Tal Peer</name>
++   <email>tal@php.net</email>
++   <role>developer</role>
++  </maintainer>
++  <maintainer>
++   <user>helly</user>
++   <name>Marcus Börger</name>
++   <email>helly@php.net</email>
++   <role>lead</role>
++  </maintainer>
++  <maintainer>
++   <user>iliaa</user>
++   <name>Ilia Alshanetsky</name>
++   <email>ilia@php.net</email>
++   <role>developer</role>
++  </maintainer>
++ </maintainers>
++ <description>
++SQLite is a C library that implements an embeddable SQL database engine.
++Programs that link with the SQLite library can have SQL database access
++without running a separate RDBMS process.
++This extension allows you to access SQLite databases from within PHP.
++
++Windows binary available from:
++http://snaps.php.net/win32/PECL_STABLE/php_sqlite.dll
++ </description>
++ <license>PHP</license>
++ <release>
++  <state>stable</state>
++  <version>2.0-dev</version>
++  <date>TBA</date>
++  <notes>
++   Added:
++   OO API (Marcus).
++  </notes>
++  <filelist>
++   <file role="src" name="config.m4"/>
++   <file role="src" name="config.w32"/>
++   <file role="src" name="sqlite.c"/>
++   <file role="src" name="sqlite.dsp"/>
++   <file role="src" name="php_sqlite.h"/>
++   <file role="src" name="php_sqlite.def"/>
++   <file role="doc" name="CREDITS"/>
++   <file role="doc" name="README"/>
++   <file role="doc" name="TODO"/>
++   <file role="doc" name="sqlite.php"/>
++   <file role="test" name="tests/sqlite_001.phpt"/>
++   <file role="test" name="tests/sqlite_002.phpt"/>
++   <file role="test" name="tests/sqlite_003.phpt"/>
++   <file role="test" name="tests/sqlite_004.phpt"/>
++   <file role="test" name="tests/sqlite_005.phpt"/>
++   <file role="test" name="tests/sqlite_006.phpt"/>
++   <file role="test" name="tests/sqlite_007.phpt"/>
++   <file role="test" name="tests/sqlite_008.phpt"/>
++   <file role="test" name="tests/sqlite_009.phpt"/>
++   <file role="test" name="tests/sqlite_010.phpt"/>
++   <file role="test" name="tests/sqlite_011.phpt"/>
++   <file role="test" name="tests/sqlite_012.phpt"/>
++   <file role="test" name="tests/sqlite_013.phpt"/>
++   <file role="test" name="tests/sqlite_014.phpt"/>
++   <file role="test" name="tests/sqlite_015.phpt"/>
++   <file role="test" name="tests/sqlite_016.phpt"/>
++   <file role="test" name="tests/sqlite_017.phpt"/>
++   <file role="test" name="tests/blankdb.inc"/>
++
++   <dir name="libsqlite">
++    <file role="doc" name="README"/>
++    <file role="src" name="VERSION"/>
++
++    <dir name="src">
++     <file role="src" name="attach.c"/>
++     <file role="src" name="auth.c"/>
++     <file role="src" name="btree.c"/>
++     <file role="src" name="btree_rb.c"/>
++     <file role="src" name="build.c"/>
++     <file role="src" name="copy.c"/>
++     <file role="src" name="delete.c"/>
++     <file role="src" name="encode.c"/>
++     <file role="src" name="expr.c"/>
++     <file role="src" name="func.c"/>
++     <file role="src" name="hash.c"/>
++     <file role="src" name="insert.c"/>
++     <file role="src" name="main.c"/>
++     <file role="src" name="opcodes.c"/>
++     <file role="src" name="os.c"/>
++     <file role="src" name="pager.c"/>
++     <file role="src" name="parse.c"/>
++     <file role="src" name="parse.y"/>
++     <file role="src" name="pragma.c"/>
++     <file role="src" name="printf.c"/>
++     <file role="src" name="random.c"/>
++     <file role="src" name="select.c"/>
++     <file role="src" name="table.c"/>
++     <file role="src" name="tokenize.c"/>
++     <file role="src" name="trigger.c"/>
++     <file role="src" name="update.c"/>
++     <file role="src" name="util.c"/>
++     <file role="src" name="vacuum.c"/>
++     <file role="src" name="vdbe.c"/>
++     <file role="src" name="where.c"/>
++     <file role="src" name="btree.h"/>
++     <file role="src" name="hash.h"/>
++     <file role="src" name="opcodes.h"/>
++     <file role="src" name="os.h"/>
++     <file role="src" name="pager.h"/>
++     <file role="src" name="parse.h"/>
++     <file role="src" name="sqlite_config.w32.h"/>
++     <file role="src" name="sqlite.h.in"/>
++     <file role="src" name="sqliteInt.h"/>
++     <file role="src" name="sqlite.w32.h"/>
++     <file role="src" name="vdbe.h"/>
++    </dir>
++   </dir>
++  </filelist>
++  <deps>
++   <dep type="php" rel="ge" version="5" />
++  </deps>
++ </release>
++</package>
++<!--
++vim:et:ts=1:sw=1
++-->
+--- /dev/null
++++ b/ext/sqlite/pdo_sqlite2.c
+@@ -0,0 +1,638 @@
++/*
++  +----------------------------------------------------------------------+
++  | PHP Version 5                                                        |
++  +----------------------------------------------------------------------+
++  | Copyright (c) 1997-2012 The PHP Group                                |
++  +----------------------------------------------------------------------+
++  | This source file is subject to version 3.01 of the PHP license,      |
++  | that is bundled with this package in the file LICENSE, and is        |
++  | available through the world-wide-web at the following url:           |
++  | http://www.php.net/license/3_01.txt                                  |
++  | If you did not receive a copy of the PHP license and are unable to   |
++  | obtain it through the world-wide-web, please send a note to          |
++  | license@php.net so we can mail you a copy immediately.               |
++  +----------------------------------------------------------------------+
++  | Author: Wez Furlong <wez@php.net>                                    |
++  +----------------------------------------------------------------------+
++*/
++
++/* $Id$ */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++#include "php.h"
++
++#ifdef PHP_SQLITE2_HAVE_PDO
++#include "sqlite.h"
++#include "pdo/php_pdo.h"
++#include "pdo/php_pdo_driver.h"
++#include "zend_exceptions.h"
++
++#define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const unsigned char *)in, n, (unsigned char *)out)
++#define php_sqlite_decode_binary(in, out)    sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out)
++
++
++typedef struct {
++	const char *file;
++	int line;
++	unsigned int errcode;
++	char *errmsg;
++} pdo_sqlite2_error_info;
++
++typedef struct {
++	sqlite *db;
++	pdo_sqlite2_error_info einfo;
++} pdo_sqlite2_db_handle;
++
++typedef struct {
++	pdo_sqlite2_db_handle 	*H;
++	sqlite_vm *vm;
++	const char **rowdata, **colnames;
++	int ncols;
++	unsigned pre_fetched:1;
++	unsigned done:1;
++	pdo_sqlite2_error_info einfo;
++} pdo_sqlite2_stmt;
++
++extern int _pdo_sqlite2_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, char *errmsg, const char *file, int line TSRMLS_DC);
++#define pdo_sqlite2_error(msg, s) _pdo_sqlite2_error(s, NULL, msg, __FILE__, __LINE__ TSRMLS_CC)
++#define pdo_sqlite2_error_stmt(msg, s) _pdo_sqlite2_error(stmt->dbh, stmt, msg, __FILE__, __LINE__ TSRMLS_CC)
++
++extern struct pdo_stmt_methods sqlite2_stmt_methods;
++
++static int pdo_sqlite2_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC)
++{
++	pdo_sqlite2_stmt *S = (pdo_sqlite2_stmt*)stmt->driver_data;
++
++	if (S->vm) {
++		char *errmsg = NULL;
++		sqlite_finalize(S->vm, &errmsg);
++		if (errmsg) {
++			sqlite_freemem(errmsg);
++		}
++		S->vm = NULL;
++	}
++	if (S->einfo.errmsg) {
++		pefree(S->einfo.errmsg, stmt->dbh->is_persistent);
++	}
++	efree(S);
++	return 1;
++}
++
++static int pdo_sqlite2_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
++{
++	pdo_sqlite2_stmt *S = (pdo_sqlite2_stmt*)stmt->driver_data;
++	char *errmsg = NULL;
++	const char *tail;
++
++	if (stmt->executed && !S->done) {
++		sqlite_finalize(S->vm, &errmsg);
++		pdo_sqlite2_error_stmt(errmsg, stmt);
++		errmsg = NULL;
++		S->vm = NULL;
++	}
++
++	S->einfo.errcode = sqlite_compile(S->H->db, stmt->active_query_string, &tail, &S->vm, &errmsg);
++	if (S->einfo.errcode != SQLITE_OK) {
++		pdo_sqlite2_error_stmt(errmsg, stmt);
++		return 0;
++	}
++
++	S->done = 0;
++	S->einfo.errcode = sqlite_step(S->vm, &S->ncols, &S->rowdata, &S->colnames);
++	switch (S->einfo.errcode) {
++		case SQLITE_ROW:
++			S->pre_fetched = 1;
++			stmt->column_count = S->ncols;
++			return 1;
++
++		case SQLITE_DONE:
++			stmt->column_count = S->ncols;
++			stmt->row_count = sqlite_changes(S->H->db);
++			S->einfo.errcode = sqlite_reset(S->vm, &errmsg);
++			if (S->einfo.errcode != SQLITE_OK) {
++				pdo_sqlite2_error_stmt(errmsg, stmt);
++			}
++			S->done = 1;
++			return 1;
++
++		case SQLITE_ERROR:
++		case SQLITE_MISUSE:
++		case SQLITE_BUSY:
++		default:
++			pdo_sqlite2_error_stmt(errmsg, stmt);
++			return 0;
++	}
++}
++
++static int pdo_sqlite2_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *param,
++		enum pdo_param_event event_type TSRMLS_DC)
++{
++	return 1;
++}
++
++static int pdo_sqlite2_stmt_fetch(pdo_stmt_t *stmt,
++	enum pdo_fetch_orientation ori, long offset TSRMLS_DC)
++{
++	pdo_sqlite2_stmt *S = (pdo_sqlite2_stmt*)stmt->driver_data;
++	char *errmsg = NULL;
++
++	if (!S->vm) {
++		return 0;	
++	}
++	if (S->pre_fetched) {
++		S->pre_fetched = 0;
++		return 1;
++	}
++	if (S->done) {
++		return 0;
++	}
++
++	S->einfo.errcode = sqlite_step(S->vm, &S->ncols, &S->rowdata, &S->colnames);
++	switch (S->einfo.errcode) {
++		case SQLITE_ROW:
++			return 1;
++
++		case SQLITE_DONE:
++			S->done = 1;
++			S->einfo.errcode = sqlite_reset(S->vm, &errmsg);
++			if (S->einfo.errcode != SQLITE_OK) {
++				pdo_sqlite2_error_stmt(errmsg, stmt);
++				errmsg = NULL;
++			}
++			return 0;
++
++		default:
++			pdo_sqlite2_error_stmt(errmsg, stmt);
++			return 0;
++	}
++}
++
++static int pdo_sqlite2_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
++{
++	pdo_sqlite2_stmt *S = (pdo_sqlite2_stmt*)stmt->driver_data;
++
++	if(colno >= S->ncols) {
++		/* error invalid column */
++		pdo_sqlite2_error_stmt(NULL, stmt);
++		return 0;
++	}
++
++	stmt->columns[colno].name = estrdup(S->colnames[colno]);
++	stmt->columns[colno].namelen = strlen(stmt->columns[colno].name);
++	stmt->columns[colno].maxlen = 0xffffffff;
++	stmt->columns[colno].precision = 0;
++	stmt->columns[colno].param_type = PDO_PARAM_STR;
++
++	return 1;
++}
++
++static int pdo_sqlite2_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned long *len, int *caller_frees TSRMLS_DC)
++{
++	pdo_sqlite2_stmt *S = (pdo_sqlite2_stmt*)stmt->driver_data;
++	if (!S->vm) {
++		return 0;
++	}
++	if(colno >= S->ncols) {
++		/* error invalid column */
++		pdo_sqlite2_error_stmt(NULL, stmt);
++		return 0;
++	}
++	if (S->rowdata[colno]) {
++		if (S->rowdata[colno][0] == '\x01') {
++			/* encoded */
++			*caller_frees = 1;
++			*ptr = emalloc(strlen(S->rowdata[colno]));
++			*len = php_sqlite_decode_binary(S->rowdata[colno]+1, *ptr);
++			(*(char**)ptr)[*len] = '\0';
++		} else {
++			*ptr = (char*)S->rowdata[colno];
++			*len = strlen(*ptr);
++		}
++	} else {
++		*ptr = NULL;
++		*len = 0;
++	}
++	return 1;
++}
++
++struct pdo_stmt_methods sqlite2_stmt_methods = {
++	pdo_sqlite2_stmt_dtor,
++	pdo_sqlite2_stmt_execute,
++	pdo_sqlite2_stmt_fetch,
++	pdo_sqlite2_stmt_describe,
++	pdo_sqlite2_stmt_get_col,
++	pdo_sqlite2_stmt_param_hook,
++	NULL, /* set_attr */
++	NULL, /* get_attr */
++	NULL
++};
++
++
++int _pdo_sqlite2_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, char *errmsg, const char *file, int line TSRMLS_DC) /* {{{ */
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	pdo_error_type *pdo_err = stmt ? &stmt->error_code : &dbh->error_code;
++	pdo_sqlite2_error_info *einfo = &H->einfo;
++	pdo_sqlite2_stmt *S;
++
++	if (stmt) {
++		S = stmt->driver_data;
++		einfo = &S->einfo;
++	}
++
++	einfo->file = file;
++	einfo->line = line;
++
++	if (einfo->errmsg) {
++		pefree(einfo->errmsg, dbh->is_persistent);
++		einfo->errmsg = NULL;
++	}
++
++	if (einfo->errcode != SQLITE_OK) {
++		if (errmsg) {
++			einfo->errmsg = pestrdup(errmsg, dbh->is_persistent);
++			sqlite_freemem(errmsg);
++		} else {
++			einfo->errmsg = pestrdup(sqlite_error_string(einfo->errcode), dbh->is_persistent);
++		}
++	} else { /* no error */
++		strcpy(*pdo_err, PDO_ERR_NONE);
++		return 0;
++	}
++	switch (einfo->errcode) {
++		case SQLITE_NOTFOUND:
++			strcpy(*pdo_err, "42S02");
++			break;	
++
++		case SQLITE_INTERRUPT:
++			strcpy(*pdo_err, "01002");
++			break;
++
++		case SQLITE_NOLFS:
++			strcpy(*pdo_err, "HYC00");
++			break;
++
++		case SQLITE_TOOBIG:
++			strcpy(*pdo_err, "22001");
++			break;
++
++		case SQLITE_CONSTRAINT:
++			strcpy(*pdo_err, "23000");
++			break;
++
++		case SQLITE_ERROR:
++		default:
++			strcpy(*pdo_err, "HY000");
++			break;
++	}
++
++	if (!dbh->methods) {
++		zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, "SQLSTATE[%s] [%d] %s",
++				*pdo_err, einfo->errcode, einfo->errmsg);
++	}
++
++	return einfo->errcode;
++}
++/* }}} */
++
++static int pdo_sqlite2_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	pdo_sqlite2_error_info *einfo = &H->einfo;
++	pdo_sqlite2_stmt *S;
++
++	if (stmt) {
++		S = stmt->driver_data;
++		einfo = &S->einfo;
++	}
++
++	if (einfo->errcode) {
++		add_next_index_long(info, einfo->errcode);
++		if (einfo->errmsg) {
++			add_next_index_string(info, einfo->errmsg, 1);
++		}
++	}
++
++	return 1;
++}
++
++static int sqlite2_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	
++	if (H) {
++		if (H->db) {
++			sqlite_close(H->db);
++			H->db = NULL;
++		}
++		if (H->einfo.errmsg) {
++			pefree(H->einfo.errmsg, dbh->is_persistent);
++			H->einfo.errmsg = NULL;
++		}
++		pefree(H, dbh->is_persistent);
++		dbh->driver_data = NULL;
++	}
++	return 0;
++}
++/* }}} */
++
++static int sqlite2_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pdo_stmt_t *stmt, zval *driver_options TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	pdo_sqlite2_stmt *S = ecalloc(1, sizeof(pdo_sqlite2_stmt));
++
++	S->H = H;
++	stmt->driver_data = S;
++	stmt->methods = &sqlite2_stmt_methods;
++	stmt->supports_placeholders = PDO_PLACEHOLDER_NONE;
++
++	if (PDO_CURSOR_FWDONLY != pdo_attr_lval(driver_options, PDO_ATTR_CURSOR, PDO_CURSOR_FWDONLY TSRMLS_CC)) {
++		H->einfo.errcode = SQLITE_ERROR;
++		pdo_sqlite2_error(NULL, dbh);
++		return 0;
++	}
++
++	return 1;
++}
++
++static long sqlite2_handle_doer(pdo_dbh_t *dbh, const char *sql, long sql_len TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	char *errmsg = NULL;
++
++	if ((H->einfo.errcode = sqlite_exec(H->db, sql, NULL, NULL, &errmsg)) != SQLITE_OK) {
++		pdo_sqlite2_error(errmsg, dbh);
++		return -1;
++	} else {
++		return sqlite_changes(H->db);
++	}
++}
++
++static char *pdo_sqlite2_last_insert_id(pdo_dbh_t *dbh, const char *name, unsigned int *len TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	char *id;
++	
++	id = php_pdo_int64_to_str(sqlite_last_insert_rowid(H->db) TSRMLS_CC);
++	*len = strlen(id);
++	return id;
++}
++
++static int sqlite2_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquotedlen, char **quoted, int *quotedlen, enum pdo_param_type paramtype  TSRMLS_DC)
++{
++	char *ret;
++
++	if (unquotedlen && (unquoted[0] == '\x01' || memchr(unquoted, '\0', unquotedlen) != NULL)) {
++		/* binary string */
++		int len;
++		ret = safe_emalloc(1 + unquotedlen / 254, 257, 5);
++		ret[0] = '\'';
++		ret[1] = '\x01';
++		len = php_sqlite_encode_binary(unquoted, unquotedlen, ret+2);
++		ret[len + 2] = '\'';
++		ret[len + 3] = '\0';
++		*quoted = ret;
++		*quotedlen = len + 3;
++		/* fprintf(stderr, "Quoting:%d:%.*s:\n", *quotedlen, *quotedlen, *quoted); */
++		return 1;
++	} else if (unquotedlen) {
++		ret = sqlite_mprintf("'%q'", unquoted);
++		if (ret) {
++			*quoted = estrdup(ret);
++			*quotedlen = strlen(ret);
++			sqlite_freemem(ret);
++			return 1;
++		}
++		return 0;
++	} else {
++		*quoted = estrdup("''");
++		*quotedlen = 2;
++		return 1;
++	}
++}
++
++static int sqlite2_handle_begin(pdo_dbh_t *dbh TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	char *errmsg = NULL;
++
++	if (sqlite_exec(H->db, "BEGIN", NULL, NULL, &errmsg) != SQLITE_OK) {
++		pdo_sqlite2_error(errmsg, dbh);
++		return 0;
++	}
++	return 1;
++}
++
++static int sqlite2_handle_commit(pdo_dbh_t *dbh TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	char *errmsg = NULL;
++
++	if (sqlite_exec(H->db, "COMMIT", NULL, NULL, &errmsg) != SQLITE_OK) {
++		pdo_sqlite2_error(errmsg, dbh);
++		return 0;
++	}
++	return 1;
++}
++
++static int sqlite2_handle_rollback(pdo_dbh_t *dbh TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++	char *errmsg = NULL;
++
++	if (sqlite_exec(H->db, "ROLLBACK", NULL, NULL, &errmsg) != SQLITE_OK) {
++		pdo_sqlite2_error(errmsg, dbh);
++		return 0;
++	}
++	return 1;
++}
++
++static int pdo_sqlite2_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_value TSRMLS_DC)
++{
++	switch (attr) {
++		case PDO_ATTR_CLIENT_VERSION:
++		case PDO_ATTR_SERVER_VERSION:
++			ZVAL_STRING(return_value, (char *)sqlite_libversion(), 1);
++			break;
++		
++		default:
++			return 0;	
++	}
++
++	return 1;
++}
++
++static int pdo_sqlite2_set_attr(pdo_dbh_t *dbh, long attr, zval *val TSRMLS_DC)
++{
++	pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
++
++	switch (attr) {
++		case PDO_ATTR_TIMEOUT:
++			convert_to_long(val);
++			sqlite_busy_timeout(H->db, Z_LVAL_P(val) * 1000);
++			return 1;
++	}
++	return 0;
++}
++
++static PHP_FUNCTION(sqlite2_create_function)
++{
++	/* TODO: implement this stuff */
++}
++
++static const zend_function_entry dbh_methods[] = {
++	PHP_FE(sqlite2_create_function, NULL)
++	{NULL, NULL, NULL}
++};
++
++static const zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
++{
++	switch (kind) {
++		case PDO_DBH_DRIVER_METHOD_KIND_DBH:
++			return dbh_methods;
++
++		default:
++			return NULL;
++	}
++}
++
++static struct pdo_dbh_methods sqlite2_methods = {
++	sqlite2_handle_closer,
++	sqlite2_handle_preparer,
++	sqlite2_handle_doer,
++	sqlite2_handle_quoter,
++	sqlite2_handle_begin,
++	sqlite2_handle_commit,
++	sqlite2_handle_rollback,
++	pdo_sqlite2_set_attr,
++	pdo_sqlite2_last_insert_id,
++	pdo_sqlite2_fetch_error_func,
++	pdo_sqlite2_get_attribute,
++	NULL,	/* check_liveness: not needed */
++	get_driver_methods
++};
++
++static char *make_filename_safe(const char *filename TSRMLS_DC)
++{
++	if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) {
++		char *fullpath = expand_filepath(filename, NULL TSRMLS_CC);
++
++		if (!fullpath) {
++			return NULL;
++		}
++
++		if (PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
++			efree(fullpath);
++			return NULL;
++		}
++
++		if (php_check_open_basedir(fullpath TSRMLS_CC)) {
++			efree(fullpath);
++			return NULL;
++		}
++		return fullpath;
++	}
++	return estrdup(filename);
++}
++
++static int authorizer(void *autharg, int access_type, const char *arg3, const char *arg4,
++		const char *arg5, const char *arg6)
++{
++	char *filename;
++	switch (access_type) {
++		case SQLITE_COPY: {
++			TSRMLS_FETCH();
++			filename = make_filename_safe(arg4 TSRMLS_CC);
++			if (!filename) {
++				return SQLITE_DENY;
++			}
++			efree(filename);
++			return SQLITE_OK;
++		}
++
++		case SQLITE_ATTACH: {
++			TSRMLS_FETCH();
++			filename = make_filename_safe(arg3 TSRMLS_CC);
++			if (!filename) {
++				return SQLITE_DENY;
++			}
++			efree(filename);
++			return SQLITE_OK;
++		}
++
++		default:
++			/* access allowed */
++			return SQLITE_OK;
++	}
++}
++
++static int pdo_sqlite2_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */
++{
++	pdo_sqlite2_db_handle *H;
++	int ret = 0;
++	long timeout = 60;
++	char *filename;
++	char *errmsg = NULL;
++
++	H = pecalloc(1, sizeof(pdo_sqlite2_db_handle), dbh->is_persistent);
++
++	H->einfo.errcode = 0;
++	H->einfo.errmsg = NULL;
++	dbh->driver_data = H;
++
++	filename = make_filename_safe(dbh->data_source TSRMLS_CC);
++
++	if (!filename) {
++		zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
++				"safe_mode/open_basedir prohibits opening %s",
++				dbh->data_source);
++		goto cleanup;
++	}
++
++	H->db = sqlite_open(filename, 0666, &errmsg);
++	efree(filename);
++
++	if (!H->db) {
++		H->einfo.errcode = SQLITE_ERROR;
++		pdo_sqlite2_error(errmsg, dbh);
++		goto cleanup;
++	}
++
++	sqlite_set_authorizer(H->db, authorizer, NULL);
++
++	if (driver_options) {
++		timeout = pdo_attr_lval(driver_options, PDO_ATTR_TIMEOUT, timeout TSRMLS_CC);
++	}
++	sqlite_busy_timeout(H->db, timeout * 1000);
++
++	dbh->alloc_own_columns = 1;
++	dbh->max_escaped_char_length = 2;
++
++	ret = 1;
++
++cleanup:
++	dbh->methods = &sqlite2_methods;
++
++	return ret;
++}
++/* }}} */
++
++pdo_driver_t pdo_sqlite2_driver = {
++	PDO_DRIVER_HEADER(sqlite2),
++	pdo_sqlite2_handle_factory
++};
++
++
++
++#endif
++
++
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: noet sw=4 ts=4 fdm=marker
++ * vim<600: noet sw=4 ts=4
++ */
+--- /dev/null
++++ b/ext/sqlite/php_sqlite.def
+@@ -0,0 +1,43 @@
++EXPORTS
++sqlite_open
++sqlite_close
++sqlite_exec
++sqlite_last_insert_rowid
++sqlite_changes
++sqlite_error_string
++sqlite_interrupt
++sqlite_complete
++sqlite_busy_handler
++sqlite_busy_timeout
++sqlite_get_table
++sqlite_free_table
++sqlite_exec_printf
++sqlite_exec_vprintf
++sqlite_get_table_printf
++sqlite_get_table_vprintf
++sqlite_mprintf
++sqlite_vmprintf
++sqlite_freemem
++sqlite_libversion
++sqlite_libencoding
++sqlite_create_function
++sqlite_create_aggregate
++sqlite_function_type
++sqlite_set_result_string
++sqlite_set_result_int
++sqlite_set_result_double
++sqlite_set_result_error
++sqlite_user_data
++sqlite_aggregate_context
++sqlite_aggregate_count
++sqlite_set_authorizer
++sqlite_trace
++sqlite_compile
++sqlite_step
++sqlite_finalize
++; some experimental stuff
++sqlite_last_statement_changes
++sqlite_reset
++sqlite_bind
++sqlite_progress_handler
++sqlite_commit_hook
+--- /dev/null
++++ b/ext/sqlite/php_sqlite.h
+@@ -0,0 +1,107 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1997-2012 The PHP Group                                |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.01 of the PHP license,      |
++   | that is bundled with this package in the file LICENSE, and is        |
++   | available through the world-wide-web at the following url:           |
++   | http://www.php.net/license/3_01.txt                                  |
++   | If you did not receive a copy of the PHP license and are unable to   |
++   | obtain it through the world-wide-web, please send a note to          |
++   | license@php.net so we can mail you a copy immediately.               |
++   +----------------------------------------------------------------------+
++   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
++   |          Tal Peer <tal@php.net>                                      |
++   |          Marcus Boerger <helly@php.net>                              |
++   +----------------------------------------------------------------------+
++
++   $Id$ 
++*/
++
++#ifndef PHP_SQLITE_H
++#define PHP_SQLITE_H
++
++extern zend_module_entry sqlite_module_entry;
++#define phpext_sqlite_ptr &sqlite_module_entry
++
++#ifdef ZTS
++#include "TSRM.h"
++#endif
++
++PHP_MINIT_FUNCTION(sqlite);
++PHP_MSHUTDOWN_FUNCTION(sqlite);
++PHP_RSHUTDOWN_FUNCTION(sqlite);
++PHP_MINFO_FUNCTION(sqlite);
++
++PHP_FUNCTION(sqlite_open);
++PHP_FUNCTION(sqlite_popen);
++PHP_FUNCTION(sqlite_close);
++PHP_FUNCTION(sqlite_query);
++PHP_FUNCTION(sqlite_exec);
++PHP_FUNCTION(sqlite_unbuffered_query);
++PHP_FUNCTION(sqlite_array_query);
++PHP_FUNCTION(sqlite_single_query);
++
++PHP_FUNCTION(sqlite_fetch_array);
++PHP_FUNCTION(sqlite_fetch_object);
++PHP_FUNCTION(sqlite_fetch_single);
++PHP_FUNCTION(sqlite_fetch_all);
++PHP_FUNCTION(sqlite_current);
++PHP_FUNCTION(sqlite_column);
++
++PHP_FUNCTION(sqlite_num_rows);
++PHP_FUNCTION(sqlite_num_fields);
++PHP_FUNCTION(sqlite_field_name);
++PHP_FUNCTION(sqlite_seek);
++PHP_FUNCTION(sqlite_rewind);
++PHP_FUNCTION(sqlite_next);
++PHP_FUNCTION(sqlite_prev);
++PHP_FUNCTION(sqlite_key);
++
++PHP_FUNCTION(sqlite_valid);
++PHP_FUNCTION(sqlite_has_prev);
++
++PHP_FUNCTION(sqlite_libversion);
++PHP_FUNCTION(sqlite_libencoding);
++
++PHP_FUNCTION(sqlite_changes);
++PHP_FUNCTION(sqlite_last_insert_rowid);
++
++PHP_FUNCTION(sqlite_escape_string);
++
++PHP_FUNCTION(sqlite_busy_timeout);
++
++PHP_FUNCTION(sqlite_last_error);
++PHP_FUNCTION(sqlite_error_string);
++
++PHP_FUNCTION(sqlite_create_aggregate);
++PHP_FUNCTION(sqlite_create_function);
++PHP_FUNCTION(sqlite_udf_decode_binary);
++PHP_FUNCTION(sqlite_udf_encode_binary);
++
++PHP_FUNCTION(sqlite_factory);
++
++PHP_FUNCTION(sqlite_fetch_column_types);
++
++ZEND_BEGIN_MODULE_GLOBALS(sqlite)
++	 long assoc_case;
++ZEND_END_MODULE_GLOBALS(sqlite)
++
++#ifdef ZTS
++#define SQLITE_G(v) TSRMG(sqlite_globals_id, zend_sqlite_globals *, v)
++#else
++#define SQLITE_G(v) (sqlite_globals.v)
++#endif
++
++#endif
++
++
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * indent-tabs-mode: t
++ * End:
++ */
+--- /dev/null
++++ b/ext/sqlite/README
+@@ -0,0 +1,14 @@
++This is an extension for the SQLite Embeddable SQL Database Engine.
++http://www.sqlite.org/
++
++SQLite is a C library that implements an embeddable SQL database engine.
++Programs that link with the SQLite library can have SQL database access
++without running a separate RDBMS process.
++
++SQLite is not a client library used to connect to a big database server.
++SQLite is the server. The SQLite library reads and writes directly to and from
++the database files on disk
++
++
++
++vim:tw=78:et
+--- /dev/null
++++ b/ext/sqlite/sess_sqlite.c
+@@ -0,0 +1,201 @@
++/* 
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1997-2012 The PHP Group                                |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.01 of the PHP license,      |
++   | that is bundled with this package in the file LICENSE, and is        |
++   | available through the world-wide-web at the following url:           |
++   | http://www.php.net/license/3_01.txt                                  |
++   | If you did not receive a copy of the PHP license and are unable to   |
++   | obtain it through the world-wide-web, please send a note to          |
++   | license@php.net so we can mail you a copy immediately.               |
++   +----------------------------------------------------------------------+
++   | Authors: John Coggeshall <john@php.net>                              |
++   |          Wez Furlong <wez@thebrainroom.com>                          |
++   +----------------------------------------------------------------------+
++ */
++
++/* $Id$ */
++
++#include "php.h"
++
++#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++
++#include "ext/session/php_session.h"
++#include "ext/standard/php_lcg.h"
++#include <sqlite.h>
++#define SQLITE_RETVAL(__r) ((__r) == SQLITE_OK ? SUCCESS : FAILURE)
++#define PS_SQLITE_DATA sqlite *db = (sqlite*)PS_GET_MOD_DATA()
++extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out);
++extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
++
++PS_FUNCS(sqlite);
++
++ps_module ps_mod_sqlite = {
++	PS_MOD(sqlite)
++};
++
++PS_OPEN_FUNC(sqlite) 
++{
++	char *errmsg = NULL;
++	sqlite *db;
++
++	/* TODO: do we need a safe_mode check here? */
++	db = sqlite_open(save_path, 0666, &errmsg);
++	if (db == NULL) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, 
++				"SQLite: failed to open/create session database `%s' - %s", save_path, errmsg);
++		sqlite_freemem(errmsg);
++		return FAILURE;
++	}
++
++	/* allow up to 1 minute when busy */
++	sqlite_busy_timeout(db, 60000);
++
++	sqlite_exec(db, "PRAGMA default_synchronous = OFF", NULL, NULL, NULL);
++	sqlite_exec(db, "PRAGMA count_changes = OFF", NULL, NULL, NULL);
++
++	/* This will fail if the table already exists, but that's not a big problem. I'm
++	   unclear as to how to check for a table's existence in SQLite -- that would be better here. */
++	sqlite_exec(db, 
++	    "CREATE TABLE session_data ("
++	    "    sess_id PRIMARY KEY," 
++	    "    value TEXT, "
++	    "    updated INTEGER "
++	    ")", NULL, NULL, NULL);
++
++	PS_SET_MOD_DATA(db);
++
++	return SUCCESS;
++}
++
++PS_CLOSE_FUNC(sqlite) 
++{
++	PS_SQLITE_DATA;
++
++	sqlite_close(db);
++
++	return SUCCESS;
++}
++
++PS_READ_FUNC(sqlite) 
++{
++	PS_SQLITE_DATA;
++	char *query;
++	const char *tail;
++	sqlite_vm *vm;
++	int colcount, result;
++	const char **rowdata, **colnames;
++	char *error;
++
++	*val = NULL;
++	*vallen = 0;
++	
++	query = sqlite_mprintf("SELECT value FROM session_data WHERE sess_id='%q' LIMIT 1", key);
++	if (query == NULL) {
++		/* no memory */
++		return FAILURE;
++	}
++
++	if (sqlite_compile(db, query, &tail, &vm, &error) != SQLITE_OK) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLite: Could not compile session read query: %s", error);
++		sqlite_freemem(error);
++		sqlite_freemem(query);
++		return FAILURE;
++	}
++
++	switch ((result = sqlite_step(vm, &colcount, &rowdata, &colnames))) {
++		case SQLITE_ROW:
++			if (rowdata[0] != NULL) {
++				*vallen = strlen(rowdata[0]);
++				if (*vallen) {
++					*val = emalloc(*vallen);
++					*vallen = sqlite_decode_binary(rowdata[0], *val);
++					(*val)[*vallen] = '\0';
++				} else {
++					*val = STR_EMPTY_ALLOC();
++				}
++			}
++			break;
++		default:
++			sqlite_freemem(error);
++			error = NULL;
++	}
++	
++	if (SQLITE_OK != sqlite_finalize(vm, &error)) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLite: session read: error %s", error);
++		sqlite_freemem(error);
++		error = NULL;
++	}
++
++	sqlite_freemem(query);
++	
++	return *val == NULL ? FAILURE : SUCCESS;
++}
++
++PS_WRITE_FUNC(sqlite) 
++{
++	PS_SQLITE_DATA;
++	char *error;
++	time_t t;
++	char *binary;
++	int binlen;
++	int rv;
++	
++	t = time(NULL);
++
++	binary = safe_emalloc(1 + vallen / 254, 257, 3);
++	binlen = sqlite_encode_binary((const unsigned char*)val, vallen, binary);
++	
++	rv = sqlite_exec_printf(db, "REPLACE INTO session_data VALUES('%q', '%q', %d)", NULL, NULL, &error, key, binary, t);
++	if (rv != SQLITE_OK) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLite: session write query failed: %s", error);
++		sqlite_freemem(error);
++	}
++	efree(binary);
++
++	return SQLITE_RETVAL(rv);
++}
++
++PS_DESTROY_FUNC(sqlite) 
++{
++	int rv;
++	PS_SQLITE_DATA;
++
++	rv = sqlite_exec_printf(db, "DELETE FROM session_data WHERE sess_id='%q'", NULL, NULL, NULL, key);
++	
++	return SQLITE_RETVAL(rv);
++}
++
++PS_GC_FUNC(sqlite) 
++{
++	PS_SQLITE_DATA;
++	int rv;
++	time_t t = time(NULL);
++
++	rv = sqlite_exec_printf(db, 
++			"DELETE FROM session_data WHERE (%d - updated) > %d", 
++			NULL, NULL, NULL, t, maxlifetime);
++
++	/* because SQLite does not actually clear the deleted data from the database 
++	 * we need to occassionaly do so manually to prevent the sessions database 
++	 * from growing endlessly.
++	 */
++	if ((int) ((float) PS(gc_divisor) * PS(gc_divisor) * php_combined_lcg(TSRMLS_C)) < PS(gc_probability)) {
++		rv = sqlite_exec_printf(db, "VACUUM", NULL, NULL, NULL);
++	}
++	return SQLITE_RETVAL(rv);
++}
++
++#endif /* HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) */
++
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: sw=4 ts=4 fdm=marker
++ * vim<600: sw=4 ts=4
++ */
+--- /dev/null
++++ b/ext/sqlite/sqlite.c
+@@ -0,0 +1,3448 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1997-2012 The PHP Group                                |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.01 of the PHP license,      |
++   | that is bundled with this package in the file LICENSE, and is        |
++   | available through the world-wide-web at the following url:           |
++   | http://www.php.net/license/3_01.txt                                  |
++   | If you did not receive a copy of the PHP license and are unable to   |
++   | obtain it through the world-wide-web, please send a note to          |
++   | license@php.net so we can mail you a copy immediately.               |
++   +----------------------------------------------------------------------+
++   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
++   |          Tal Peer <tal@php.net>                                      |
++   |          Marcus Boerger <helly@php.net>                              |
++   +----------------------------------------------------------------------+
++
++   $Id$
++*/
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#define PHP_SQLITE_MODULE_VERSION	"2.0-dev"
++
++#include "php.h"
++#include "php_ini.h"
++#include "ext/standard/info.h"
++#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++#include "ext/session/php_session.h"
++#endif
++#include "php_sqlite.h"
++
++#if HAVE_TIME_H
++# include <time.h>
++#endif
++#if HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#include <sqlite.h>
++
++#include "zend_exceptions.h"
++#include "zend_interfaces.h"
++
++#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
++extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
++extern PHPAPI zend_class_entry *spl_ce_Countable;
++#endif
++
++#if PHP_SQLITE2_HAVE_PDO
++# include "pdo/php_pdo.h"
++# include "pdo/php_pdo_driver.h"
++extern pdo_driver_t pdo_sqlite2_driver;
++#endif
++
++#ifndef safe_emalloc
++# define safe_emalloc(a,b,c) emalloc((a)*(b)+(c))
++#endif
++
++ZEND_DECLARE_MODULE_GLOBALS(sqlite)
++static PHP_GINIT_FUNCTION(sqlite);
++
++#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++extern ps_module ps_mod_sqlite;
++#define ps_sqlite_ptr &ps_mod_sqlite
++#endif
++
++extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out);
++extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
++
++#define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const unsigned char *)in, n, (unsigned char *)out)
++#define php_sqlite_decode_binary(in, out) in && *in ? sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) : 0
++
++static int sqlite_count_elements(zval *object, long *count TSRMLS_DC);
++
++static int le_sqlite_db, le_sqlite_result, le_sqlite_pdb;
++
++static inline void php_sqlite_strtoupper(char *s)
++{
++	while (*s!='\0') {
++		*s = toupper(*s);
++		s++;
++	}
++}
++
++static inline void php_sqlite_strtolower(char *s)
++{
++	while (*s!='\0') {
++		*s = tolower(*s);
++		s++;
++	}
++}
++
++/* {{{ PHP_INI
++ */
++PHP_INI_BEGIN()
++STD_PHP_INI_ENTRY_EX("sqlite.assoc_case", "0", PHP_INI_ALL, OnUpdateLong, assoc_case, zend_sqlite_globals, sqlite_globals, display_link_numbers)
++PHP_INI_END()
++/* }}} */
++
++#define DB_FROM_ZVAL(db, zv)	ZEND_FETCH_RESOURCE2(db, struct php_sqlite_db *, zv, -1, "sqlite database", le_sqlite_db, le_sqlite_pdb)
++
++#define DB_FROM_OBJECT(db, object) \
++	{ \
++		sqlite_object *obj = (sqlite_object*) zend_object_store_get_object(object TSRMLS_CC); \
++		db = obj->u.db; \
++		if (!db) { \
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "The database wasn't opened"); \
++			RETURN_NULL(); \
++		} \
++	}
++
++#define RES_FROM_OBJECT_RESTORE_ERH(res, object, error_handling) \
++	{ \
++		sqlite_object *obj = (sqlite_object*) zend_object_store_get_object(object TSRMLS_CC); \
++		res = obj->u.res; \
++		if (!res) { \
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "No result set available"); \
++			if (error_handling) \
++				zend_restore_error_handling(error_handling TSRMLS_CC); \
++			RETURN_NULL(); \
++		} \
++	}
++
++#define RES_FROM_OBJECT(res, object) RES_FROM_OBJECT_RESTORE_ERH(res, object, NULL)
++
++#define PHP_SQLITE_EMPTY_QUERY \
++	if (!sql_len || !*sql) { \
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot execute empty query."); \
++		RETURN_FALSE; \
++	}
++
++struct php_sqlite_result {
++	struct php_sqlite_db *db;
++	sqlite_vm *vm;
++	int buffered;
++	int ncolumns;
++	int nrows;
++	int curr_row;
++	char **col_names;
++	int alloc_rows;
++	int mode;
++	char **table;
++};
++
++struct php_sqlite_db {
++	sqlite *db;
++	int last_err_code;
++	zend_bool is_persistent;
++	long rsrc_id;
++
++	HashTable callbacks;
++};
++
++struct php_sqlite_agg_functions {
++	struct php_sqlite_db *db;
++	int is_valid;
++	zval *step;
++	zval *fini;
++};
++
++static void php_sqlite_fetch_array(struct php_sqlite_result *res, int mode, zend_bool decode_binary, int move_next, zval *return_value TSRMLS_DC);
++static int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC);
++
++enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM };
++
++/* {{{ arginfo */
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_popen, 0, 0, 1)
++	ZEND_ARG_INFO(0, filename)
++	ZEND_ARG_INFO(0, mode)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_open, 0, 0, 1)
++	ZEND_ARG_INFO(0, filename)
++	ZEND_ARG_INFO(0, mode)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_factory, 0, 0, 1)
++	ZEND_ARG_INFO(0, filename)
++	ZEND_ARG_INFO(0, mode)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_busy_timeout, 0, 0, 2)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, ms)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_busy_timeout, 0, 0, 1)
++	ZEND_ARG_INFO(0, ms)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_close, 0, 0, 1)
++	ZEND_ARG_INFO(0, db)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_unbuffered_query, 0, 0, 2)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_unbuffered_query, 0, 0, 1)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_column_types, 0, 0, 2)
++	ZEND_ARG_INFO(0, table_name)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, result_type)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_column_types, 0, 0, 1)
++	ZEND_ARG_INFO(0, table_name)
++	ZEND_ARG_INFO(0, result_type)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_query, 0, 0, 2)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_query, 0, 0, 1)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_exec, 0, 0, 2)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_exec, 0, 0, 1)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(1, error_message)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_all, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_all, 0, 0, 0)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_array, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_array, 0, 0, 0)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_object, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, class_name)
++	ZEND_ARG_INFO(0, ctor_params)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_object, 0, 0, 0)
++	ZEND_ARG_INFO(0, class_name)
++	ZEND_ARG_INFO(0, ctor_params)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_array_query, 0, 0, 2)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_array_query, 0, 0, 1)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_single_query, 0, 0, 2)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, first_row_only)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_single_query, 0, 0, 1)
++	ZEND_ARG_INFO(0, query)
++	ZEND_ARG_INFO(0, first_row_only)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_single, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_single, 0, 0, 0)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_current, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_current, 0, 0, 0)
++	ZEND_ARG_INFO(0, result_type)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_column, 0, 0, 2)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, index_or_name)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_column, 0, 0, 1)
++	ZEND_ARG_INFO(0, index_or_name)
++	ZEND_ARG_INFO(0, decode_binary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_libversion, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_libencoding, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_changes, 0, 0, 1)
++	ZEND_ARG_INFO(0, db)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_changes, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_last_insert_rowid, 0, 0, 1)
++	ZEND_ARG_INFO(0, db)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_last_insert_rowid, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_num_rows, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_num_rows, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_valid, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_valid, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_has_prev, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_has_prev, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_num_fields, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_num_fields, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_field_name, 0, 0, 2)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, field_index)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_field_name, 0, 0, 1)
++	ZEND_ARG_INFO(0, field_index)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_seek, 0, 0, 2)
++	ZEND_ARG_INFO(0, result)
++	ZEND_ARG_INFO(0, row)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_seek, 0, 0, 1)
++	ZEND_ARG_INFO(0, row)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_rewind, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_rewind, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_next, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_next, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_key, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_key, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_prev, 0, 0, 1)
++	ZEND_ARG_INFO(0, result)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_prev, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_escape_string, 0, 0, 1)
++	ZEND_ARG_INFO(0, item)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_last_error, 0, 0, 1)
++	ZEND_ARG_INFO(0, db)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_last_error, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_error_string, 0, 0, 1)
++	ZEND_ARG_INFO(0, error_code)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_aggregate, 0, 0, 4)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, funcname)
++	ZEND_ARG_INFO(0, step_func)
++	ZEND_ARG_INFO(0, finalize_func)
++	ZEND_ARG_INFO(0, num_args)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_create_aggregate, 0, 0, 3)
++	ZEND_ARG_INFO(0, funcname)
++	ZEND_ARG_INFO(0, step_func)
++	ZEND_ARG_INFO(0, finalize_func)
++	ZEND_ARG_INFO(0, num_args)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_function, 0, 0, 3)
++	ZEND_ARG_INFO(0, db)
++	ZEND_ARG_INFO(0, funcname)
++	ZEND_ARG_INFO(0, callback)
++	ZEND_ARG_INFO(0, num_args)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_create_function, 0, 0, 2)
++	ZEND_ARG_INFO(0, funcname)
++	ZEND_ARG_INFO(0, callback)
++	ZEND_ARG_INFO(0, num_args)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_udf_encode_binary, 0, 0, 1)
++	ZEND_ARG_INFO(0, data)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_udf_decode_binary, 0, 0, 1)
++	ZEND_ARG_INFO(0, data)
++ZEND_END_ARG_INFO()
++/* }}} */
++
++const zend_function_entry sqlite_functions[] = {
++	PHP_FE(sqlite_open, 				arginfo_sqlite_open)
++	PHP_FE(sqlite_popen, 				arginfo_sqlite_popen)
++	PHP_FE(sqlite_close, 				arginfo_sqlite_close)
++	PHP_FE(sqlite_query, 				arginfo_sqlite_query)
++	PHP_FE(sqlite_exec, 				arginfo_sqlite_exec)
++	PHP_FE(sqlite_array_query, 			arginfo_sqlite_array_query)
++	PHP_FE(sqlite_single_query, 		arginfo_sqlite_single_query)
++	PHP_FE(sqlite_fetch_array, 			arginfo_sqlite_fetch_array)
++	PHP_FE(sqlite_fetch_object, 		arginfo_sqlite_fetch_object)
++	PHP_FE(sqlite_fetch_single, 		arginfo_sqlite_fetch_single)
++	PHP_FALIAS(sqlite_fetch_string, sqlite_fetch_single, arginfo_sqlite_fetch_single)
++	PHP_FE(sqlite_fetch_all, 			arginfo_sqlite_fetch_all)
++	PHP_FE(sqlite_current, 				arginfo_sqlite_current)
++	PHP_FE(sqlite_column, 				arginfo_sqlite_column)
++	PHP_FE(sqlite_libversion, 			arginfo_sqlite_libversion)
++	PHP_FE(sqlite_libencoding, 			arginfo_sqlite_libencoding)
++	PHP_FE(sqlite_changes, 				arginfo_sqlite_changes)
++	PHP_FE(sqlite_last_insert_rowid, 	arginfo_sqlite_last_insert_rowid)
++	PHP_FE(sqlite_num_rows, 			arginfo_sqlite_num_rows)
++	PHP_FE(sqlite_num_fields, 			arginfo_sqlite_num_fields)
++	PHP_FE(sqlite_field_name, 			arginfo_sqlite_field_name)
++	PHP_FE(sqlite_seek, 				arginfo_sqlite_seek)
++	PHP_FE(sqlite_rewind, 				arginfo_sqlite_rewind)
++	PHP_FE(sqlite_next, 				arginfo_sqlite_next)
++	PHP_FE(sqlite_prev, 				arginfo_sqlite_prev)
++	PHP_FE(sqlite_valid, 				arginfo_sqlite_valid)
++	PHP_FALIAS(sqlite_has_more, sqlite_valid, arginfo_sqlite_valid)
++	PHP_FE(sqlite_has_prev, 			arginfo_sqlite_has_prev)
++	PHP_FE(sqlite_escape_string, 		arginfo_sqlite_escape_string)
++	PHP_FE(sqlite_busy_timeout, 		arginfo_sqlite_busy_timeout)
++	PHP_FE(sqlite_last_error, 			arginfo_sqlite_last_error)
++	PHP_FE(sqlite_error_string, 		arginfo_sqlite_error_string)
++	PHP_FE(sqlite_unbuffered_query, 	arginfo_sqlite_unbuffered_query)
++	PHP_FE(sqlite_create_aggregate, 	arginfo_sqlite_create_aggregate)
++	PHP_FE(sqlite_create_function, 		arginfo_sqlite_create_function)
++	PHP_FE(sqlite_factory, 				arginfo_sqlite_factory)
++	PHP_FE(sqlite_udf_encode_binary, 	arginfo_sqlite_udf_encode_binary)
++	PHP_FE(sqlite_udf_decode_binary, 	arginfo_sqlite_udf_decode_binary)
++	PHP_FE(sqlite_fetch_column_types,	arginfo_sqlite_fetch_column_types)
++	{NULL, NULL, NULL}
++};
++
++const zend_function_entry sqlite_funcs_db[] = {
++	PHP_ME_MAPPING(__construct, sqlite_open, arginfo_sqlite_open, 0)
++/*	PHP_ME_MAPPING(close, sqlite_close, NULL, 0)*/
++	PHP_ME_MAPPING(query, sqlite_query, arginfo_sqlite_method_query, 0)
++	PHP_ME_MAPPING(queryExec, sqlite_exec, arginfo_sqlite_method_exec, 0)
++	PHP_ME_MAPPING(arrayQuery, sqlite_array_query, arginfo_sqlite_method_array_query, 0)
++	PHP_ME_MAPPING(singleQuery, sqlite_single_query, arginfo_sqlite_method_single_query, 0)
++	PHP_ME_MAPPING(unbufferedQuery, sqlite_unbuffered_query, arginfo_sqlite_method_unbuffered_query, 0)
++	PHP_ME_MAPPING(lastInsertRowid, sqlite_last_insert_rowid, arginfo_sqlite_method_last_insert_rowid, 0)
++	PHP_ME_MAPPING(changes, sqlite_changes, arginfo_sqlite_method_changes, 0)
++	PHP_ME_MAPPING(createAggregate, sqlite_create_aggregate, arginfo_sqlite_method_create_aggregate, 0)
++	PHP_ME_MAPPING(createFunction, sqlite_create_function, arginfo_sqlite_method_create_function, 0)
++	PHP_ME_MAPPING(busyTimeout, sqlite_busy_timeout, arginfo_sqlite_method_busy_timeout, 0)
++	PHP_ME_MAPPING(lastError, sqlite_last_error, arginfo_sqlite_method_last_error, 0)
++	PHP_ME_MAPPING(fetchColumnTypes, sqlite_fetch_column_types, arginfo_sqlite_method_fetch_column_types, 0)
++/*	PHP_ME_MAPPING(error_string, sqlite_error_string, NULL, 0) static */
++/*	PHP_ME_MAPPING(escape_string, sqlite_escape_string, NULL, 0) static */
++	{NULL, NULL, NULL}
++};
++
++const zend_function_entry sqlite_funcs_query[] = {
++	PHP_ME_MAPPING(fetch, sqlite_fetch_array, arginfo_sqlite_method_fetch_array, 0)
++	PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, arginfo_sqlite_method_fetch_object, 0)
++	PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, arginfo_sqlite_method_fetch_single, 0)
++	PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, arginfo_sqlite_method_fetch_all, 0)
++	PHP_ME_MAPPING(column, sqlite_column, arginfo_sqlite_method_column, 0)
++	PHP_ME_MAPPING(numFields, sqlite_num_fields, arginfo_sqlite_method_num_fields, 0)
++	PHP_ME_MAPPING(fieldName, sqlite_field_name, arginfo_sqlite_method_field_name, 0)
++	/* iterator */
++	PHP_ME_MAPPING(current, sqlite_current, arginfo_sqlite_method_current, 0)
++	PHP_ME_MAPPING(key, sqlite_key, arginfo_sqlite_method_key, 0)
++	PHP_ME_MAPPING(next, sqlite_next, arginfo_sqlite_method_next, 0)
++	PHP_ME_MAPPING(valid, sqlite_valid, arginfo_sqlite_method_valid, 0)
++	PHP_ME_MAPPING(rewind, sqlite_rewind, arginfo_sqlite_method_rewind, 0)
++	/* countable */
++	PHP_ME_MAPPING(count, sqlite_num_rows, arginfo_sqlite_method_num_rows, 0)
++	/* additional */
++	PHP_ME_MAPPING(prev, sqlite_prev, arginfo_sqlite_method_prev, 0)
++	PHP_ME_MAPPING(hasPrev, sqlite_has_prev, arginfo_sqlite_method_has_prev, 0)
++	PHP_ME_MAPPING(numRows, sqlite_num_rows, arginfo_sqlite_method_num_rows, 0)
++	PHP_ME_MAPPING(seek, sqlite_seek, arginfo_sqlite_method_seek, 0)
++	{NULL, NULL, NULL}
++};
++
++const zend_function_entry sqlite_funcs_ub_query[] = {
++	PHP_ME_MAPPING(fetch, sqlite_fetch_array, arginfo_sqlite_method_fetch_array, 0)
++	PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, arginfo_sqlite_method_fetch_object, 0)
++	PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, arginfo_sqlite_method_fetch_single, 0)
++	PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, arginfo_sqlite_method_fetch_all, 0)
++	PHP_ME_MAPPING(column, sqlite_column, arginfo_sqlite_method_column, 0)
++	PHP_ME_MAPPING(numFields, sqlite_num_fields, arginfo_sqlite_method_num_fields, 0)
++	PHP_ME_MAPPING(fieldName, sqlite_field_name, arginfo_sqlite_method_field_name, 0)
++	/* iterator */
++	PHP_ME_MAPPING(current, sqlite_current, arginfo_sqlite_method_current, 0)
++	PHP_ME_MAPPING(next, sqlite_next, arginfo_sqlite_method_next, 0)
++	PHP_ME_MAPPING(valid, sqlite_valid, arginfo_sqlite_method_valid, 0)
++	{NULL, NULL, NULL}
++};
++
++const zend_function_entry sqlite_funcs_exception[] = {
++	{NULL, NULL, NULL}
++};
++
++/* Dependancies */
++static const zend_module_dep sqlite_deps[] = {
++#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
++	ZEND_MOD_REQUIRED("spl")
++#endif
++#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++	ZEND_MOD_REQUIRED("session")
++#endif
++#ifdef PHP_SQLITE2_HAVE_PDO
++	ZEND_MOD_REQUIRED("pdo")
++#endif
++	{NULL, NULL, NULL}
++};
++
++zend_module_entry sqlite_module_entry = {
++#if ZEND_MODULE_API_NO >= 20050922
++	STANDARD_MODULE_HEADER_EX, NULL,
++	sqlite_deps,
++#elif ZEND_MODULE_API_NO >= 20010901
++	STANDARD_MODULE_HEADER,
++#endif
++	"SQLite",
++	sqlite_functions,
++	PHP_MINIT(sqlite),
++	PHP_MSHUTDOWN(sqlite),
++	NULL,
++	PHP_RSHUTDOWN(sqlite),
++	PHP_MINFO(sqlite),
++#if ZEND_MODULE_API_NO >= 20010901
++	PHP_SQLITE_MODULE_VERSION,
++#endif
++#if ZEND_MODULE_API_NO >= 20060613
++	PHP_MODULE_GLOBALS(sqlite),
++	PHP_GINIT(sqlite),
++	NULL,
++	NULL,
++	STANDARD_MODULE_PROPERTIES_EX
++#else
++	STANDARD_MODULE_PROPERTIES
++#endif
++};
++
++
++#ifdef COMPILE_DL_SQLITE
++ZEND_GET_MODULE(sqlite)
++#endif
++
++static int php_sqlite_callback_invalidator(struct php_sqlite_agg_functions *funcs TSRMLS_DC)
++{
++	if (!funcs->is_valid) {
++		return 0;
++	}
++
++	if (funcs->step) {
++		zval_ptr_dtor(&funcs->step);
++		funcs->step = NULL;
++	}
++
++	if (funcs->fini) {
++		zval_ptr_dtor(&funcs->fini);
++		funcs->fini = NULL;
++	}
++
++	funcs->is_valid = 0;
++
++	return 0;
++}
++
++
++static void php_sqlite_callback_dtor(void *pDest)
++{
++	struct php_sqlite_agg_functions *funcs = (struct php_sqlite_agg_functions*)pDest;
++
++	if (funcs->is_valid) {
++		TSRMLS_FETCH();
++
++		php_sqlite_callback_invalidator(funcs TSRMLS_CC);
++	}
++}
++
++static ZEND_RSRC_DTOR_FUNC(php_sqlite_db_dtor)
++{
++	if (rsrc->ptr) {
++		struct php_sqlite_db *db = (struct php_sqlite_db*)rsrc->ptr;
++
++		sqlite_close(db->db);
++
++		zend_hash_destroy(&db->callbacks);
++
++		pefree(db, db->is_persistent);
++
++		rsrc->ptr = NULL;
++	}
++}
++
++static void real_result_dtor(struct php_sqlite_result *res TSRMLS_DC)
++{
++	int i, j, base;
++
++	if (res->vm) {
++		sqlite_finalize(res->vm, NULL);
++	}
++
++	if (res->table) {
++		if (!res->buffered && res->nrows) {
++			res->nrows = 1; /* only one row is stored */
++		}
++		for (i = 0; i < res->nrows; i++) {
++			base = i * res->ncolumns;
++			for (j = 0; j < res->ncolumns; j++) {
++				if (res->table[base + j] != NULL) {
++					efree(res->table[base + j]);
++				}
++			}
++		}
++		efree(res->table);
++	}
++	if (res->col_names) {
++		for (j = 0; j < res->ncolumns; j++) {
++			efree(res->col_names[j]);
++		}
++		efree(res->col_names);
++	}
++
++	if (res->db) {
++		zend_list_delete(res->db->rsrc_id);
++	}
++	efree(res);
++}
++
++static int _clean_unfinished_results(zend_rsrc_list_entry *le, void *db TSRMLS_DC)
++{
++	if (Z_TYPE_P(le) == le_sqlite_result) {
++		struct php_sqlite_result *res = (struct php_sqlite_result *)le->ptr;
++		if (res->db->rsrc_id == ((struct php_sqlite_db*)db)->rsrc_id) {
++			return ZEND_HASH_APPLY_REMOVE;
++		}
++	}
++	return ZEND_HASH_APPLY_KEEP;
++}
++
++static ZEND_RSRC_DTOR_FUNC(php_sqlite_result_dtor)
++{
++	struct php_sqlite_result *res = (struct php_sqlite_result *)rsrc->ptr;
++	real_result_dtor(res TSRMLS_CC);
++}
++
++static int php_sqlite_forget_persistent_id_numbers(zend_rsrc_list_entry *rsrc TSRMLS_DC)
++{
++	struct php_sqlite_db *db = (struct php_sqlite_db*)rsrc->ptr;
++
++	if (Z_TYPE_P(rsrc) != le_sqlite_pdb) {
++		return 0;
++	}
++
++	/* prevent bad mojo if someone tries to use a previously registered function in the next request */
++	zend_hash_apply(&db->callbacks, (apply_func_t)php_sqlite_callback_invalidator TSRMLS_CC);
++
++	db->rsrc_id = FAILURE;
++
++	/* don't leave pending commits hanging around */
++	sqlite_exec(db->db, "ROLLBACK", NULL, NULL, NULL);
++
++	return 0;
++}
++
++PHP_RSHUTDOWN_FUNCTION(sqlite)
++{
++	zend_hash_apply(&EG(persistent_list), (apply_func_t)php_sqlite_forget_persistent_id_numbers TSRMLS_CC);
++	return SUCCESS;
++}
++
++/* {{{ PHP Function interface */
++static void php_sqlite_generic_function_callback(sqlite_func *func, int argc, const char **argv)
++{
++	zval *retval = NULL;
++	zval ***zargs = NULL;
++	zval funcname;
++	int i, res;
++	char *callable = NULL, *errbuf=NULL;
++	TSRMLS_FETCH();
++
++	/* sanity check the args */
++	if (argc == 0) {
++		sqlite_set_result_error(func, "not enough parameters", -1);
++		return;
++	}
++
++	ZVAL_STRING(&funcname, (char*)argv[0], 1);
++
++	if (!zend_make_callable(&funcname, &callable TSRMLS_CC)) {
++		spprintf(&errbuf, 0, "function `%s' is not a function name", callable);
++		sqlite_set_result_error(func, errbuf, -1);
++		efree(errbuf);
++		efree(callable);
++		zval_dtor(&funcname);
++		return;
++	}
++
++	if (argc > 1) {
++		zargs = (zval ***)safe_emalloc((argc - 1), sizeof(zval **), 0);
++
++		for (i = 0; i < argc-1; i++) {
++			zargs[i] = emalloc(sizeof(zval *));
++			MAKE_STD_ZVAL(*zargs[i]);
++			ZVAL_STRING(*zargs[i], (char*)argv[i+1], 1);
++		}
++	}
++
++	res = call_user_function_ex(EG(function_table),
++			NULL,
++			&funcname,
++			&retval,
++			argc-1,
++			zargs,
++			0, NULL TSRMLS_CC);
++
++	zval_dtor(&funcname);
++
++	if (res == SUCCESS) {
++		if (retval == NULL) {
++			sqlite_set_result_string(func, NULL, 0);
++		} else {
++			switch (Z_TYPE_P(retval)) {
++				case IS_STRING:
++					sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
++					break;
++				case IS_LONG:
++				case IS_BOOL:
++					sqlite_set_result_int(func, Z_LVAL_P(retval));
++					break;
++				case IS_DOUBLE:
++					sqlite_set_result_double(func, Z_DVAL_P(retval));
++					break;
++				case IS_NULL:
++				default:
++					sqlite_set_result_string(func, NULL, 0);
++			}
++		}
++	} else {
++		char *errbuf;
++		spprintf(&errbuf, 0, "call_user_function_ex failed for function %s()", callable);
++		sqlite_set_result_error(func, errbuf, -1);
++		efree(errbuf);
++	}
++
++	efree(callable);
++
++	if (retval) {
++		zval_ptr_dtor(&retval);
++	}
++
++	if (zargs) {
++		for (i = 0; i < argc-1; i++) {
++			zval_ptr_dtor(zargs[i]);
++			efree(zargs[i]);
++		}
++		efree(zargs);
++	}
++}
++/* }}} */
++
++/* {{{ callback for sqlite_create_function */
++static void php_sqlite_function_callback(sqlite_func *func, int argc, const char **argv)
++{
++	zval *retval = NULL;
++	zval ***zargs = NULL;
++	int i, res;
++	struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
++	TSRMLS_FETCH();
++
++	if (!funcs->is_valid) {
++		sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
++		return;
++	}
++
++	if (argc > 0) {
++		zargs = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
++
++		for (i = 0; i < argc; i++) {
++			zargs[i] = emalloc(sizeof(zval *));
++			MAKE_STD_ZVAL(*zargs[i]);
++
++			if (argv[i] == NULL) {
++				ZVAL_NULL(*zargs[i]);
++			} else {
++				ZVAL_STRING(*zargs[i], (char*)argv[i], 1);
++			}
++		}
++	}
++
++	res = call_user_function_ex(EG(function_table),
++			NULL,
++			funcs->step,
++			&retval,
++			argc,
++			zargs,
++			0, NULL TSRMLS_CC);
++
++	if (res == SUCCESS) {
++		if (retval == NULL) {
++			sqlite_set_result_string(func, NULL, 0);
++		} else {
++			switch (Z_TYPE_P(retval)) {
++				case IS_STRING:
++					/* TODO: for binary results, need to encode the string */
++					sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
++					break;
++				case IS_LONG:
++				case IS_BOOL:
++					sqlite_set_result_int(func, Z_LVAL_P(retval));
++					break;
++				case IS_DOUBLE:
++					sqlite_set_result_double(func, Z_DVAL_P(retval));
++					break;
++				case IS_NULL:
++				default:
++					sqlite_set_result_string(func, NULL, 0);
++			}
++		}
++	} else {
++		sqlite_set_result_error(func, "call_user_function_ex failed", -1);
++	}
++
++	if (retval) {
++		zval_ptr_dtor(&retval);
++	}
++
++	if (zargs) {
++		for (i = 0; i < argc; i++) {
++			zval_ptr_dtor(zargs[i]);
++			efree(zargs[i]);
++		}
++		efree(zargs);
++	}
++}
++/* }}} */
++
++/* {{{ callback for sqlite_create_aggregate: step function */
++static void php_sqlite_agg_step_function_callback(sqlite_func *func, int argc, const char **argv)
++{
++	zval *retval = NULL;
++	zval ***zargs;
++	zval **context_p;
++	int i, res, zargc;
++	struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
++	TSRMLS_FETCH();
++
++	if (!funcs->is_valid) {
++		sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
++		return;
++	}
++
++	/* sanity check the args */
++	if (argc < 1) {
++		return;
++	}
++
++	zargc = argc + 1;
++	zargs = (zval ***)safe_emalloc(zargc, sizeof(zval **), 0);
++
++	/* first arg is always the context zval */
++	context_p = (zval **)sqlite_aggregate_context(func, sizeof(*context_p));
++
++	if (*context_p == NULL) {
++		MAKE_STD_ZVAL(*context_p);
++		Z_SET_ISREF_PP(context_p);
++		Z_TYPE_PP(context_p) = IS_NULL;
++	}
++
++	zargs[0] = context_p;
++
++	/* copy the other args */
++	for (i = 0; i < argc; i++) {
++		zargs[i+1] = emalloc(sizeof(zval *));
++		MAKE_STD_ZVAL(*zargs[i+1]);
++		if (argv[i] == NULL) {
++			ZVAL_NULL(*zargs[i+1]);
++		} else {
++			ZVAL_STRING(*zargs[i+1], (char*)argv[i], 1);
++		}
++	}
++
++	res = call_user_function_ex(EG(function_table),
++			NULL,
++			funcs->step,
++			&retval,
++			zargc,
++			zargs,
++			0, NULL TSRMLS_CC);
++
++	if (res != SUCCESS) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "call_user_function_ex failed");
++	}
++
++	if (retval) {
++		zval_ptr_dtor(&retval);
++	}
++
++	if (zargs) {
++		for (i = 1; i < zargc; i++) {
++			zval_ptr_dtor(zargs[i]);
++			efree(zargs[i]);
++		}
++		efree(zargs);
++	}
++}
++/* }}} */
++
++/* {{{ callback for sqlite_create_aggregate: finalize function */
++static void php_sqlite_agg_fini_function_callback(sqlite_func *func)
++{
++	zval *retval = NULL;
++	int res;
++	struct php_sqlite_agg_functions *funcs = sqlite_user_data(func);
++	zval **context_p;
++	TSRMLS_FETCH();
++
++	if (!funcs->is_valid) {
++		sqlite_set_result_error(func, "this function has not been correctly defined for this request", -1);
++		return;
++	}
++
++	context_p = (zval **)sqlite_aggregate_context(func, sizeof(*context_p));
++
++	res = call_user_function_ex(EG(function_table),
++			NULL,
++			funcs->fini,
++			&retval,
++			1,
++			&context_p,
++			0, NULL TSRMLS_CC);
++
++	if (res == SUCCESS) {
++		if (retval == NULL) {
++			sqlite_set_result_string(func, NULL, 0);
++		} else {
++			switch (Z_TYPE_P(retval)) {
++				case IS_STRING:
++					/* TODO: for binary results, need to encode the string */
++					sqlite_set_result_string(func, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
++					break;
++				case IS_LONG:
++				case IS_BOOL:
++					sqlite_set_result_int(func, Z_LVAL_P(retval));
++					break;
++				case IS_DOUBLE:
++					sqlite_set_result_double(func, Z_DVAL_P(retval));
++					break;
++				case IS_NULL:
++				default:
++					sqlite_set_result_string(func, NULL, 0);
++			}
++		}
++	} else {
++		sqlite_set_result_error(func, "call_user_function_ex failed", -1);
++	}
++
++	if (retval) {
++		zval_ptr_dtor(&retval);
++	}
++
++	zval_ptr_dtor(context_p);
++}
++/* }}} */
++
++/* {{{ Authorization Callback */
++static int php_sqlite_authorizer(void *autharg, int access_type, const char *arg3, const char *arg4,
++		const char *arg5, const char *arg6)
++{
++	switch (access_type) {
++		case SQLITE_COPY:
++			if (strncmp(arg4, ":memory:", sizeof(":memory:") - 1)) {
++				TSRMLS_FETCH();
++				if (PG(safe_mode) && (!php_checkuid(arg4, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
++					return SQLITE_DENY;
++				}
++
++				if (php_check_open_basedir(arg4 TSRMLS_CC)) {
++					return SQLITE_DENY;
++				}
++			}
++			return SQLITE_OK;
++#ifdef SQLITE_ATTACH
++		case SQLITE_ATTACH:
++			if (strncmp(arg3, ":memory:", sizeof(":memory:") - 1)) {
++				TSRMLS_FETCH();
++				if (PG(safe_mode) && (!php_checkuid(arg3, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
++					return SQLITE_DENY;
++				}
++
++				if (php_check_open_basedir(arg3 TSRMLS_CC)) {
++					return SQLITE_DENY;
++				}
++			}
++			return SQLITE_OK;
++#endif
++
++		default:
++			/* access allowed */
++			return SQLITE_OK;
++	}
++}
++/* }}} */
++
++/* {{{ OO init/structure stuff */
++#define REGISTER_SQLITE_CLASS(name, c_name, parent) \
++	{ \
++		zend_class_entry ce; \
++		INIT_CLASS_ENTRY(ce, "SQLite" # name, sqlite_funcs_ ## c_name); \
++		ce.create_object = sqlite_object_new_ ## c_name; \
++		sqlite_ce_ ## c_name = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
++		memcpy(&sqlite_object_handlers_ ## c_name, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
++		sqlite_object_handlers_ ## c_name.clone_obj = NULL; \
++		sqlite_ce_ ## c_name->ce_flags |= ZEND_ACC_FINAL_CLASS; \
++	}
++
++zend_class_entry *sqlite_ce_db, *sqlite_ce_exception;
++zend_class_entry *sqlite_ce_query, *sqlite_ce_ub_query;
++
++static zend_object_handlers sqlite_object_handlers_db;
++static zend_object_handlers sqlite_object_handlers_query;
++static zend_object_handlers sqlite_object_handlers_ub_query;
++static zend_object_handlers sqlite_object_handlers_exception;
++
++typedef enum {
++	is_db,
++	is_result
++} sqlite_obj_type;
++
++typedef struct _sqlite_object {
++	zend_object       std;
++	sqlite_obj_type   type;
++	union {
++		struct php_sqlite_db     *db;
++		struct php_sqlite_result *res;
++		void *ptr;
++	} u;
++} sqlite_object;
++
++static int sqlite_free_persistent(zend_rsrc_list_entry *le, void *ptr TSRMLS_DC)
++{
++	return le->ptr == ptr ? ZEND_HASH_APPLY_REMOVE : ZEND_HASH_APPLY_KEEP;
++}
++
++static void sqlite_object_free_storage(void *object TSRMLS_DC)
++{
++	sqlite_object *intern = (sqlite_object *)object;
++
++	zend_object_std_dtor(&intern->std TSRMLS_CC);
++
++	if (intern->u.ptr) {
++		if (intern->type == is_db) {
++			if (intern->u.db->rsrc_id) {
++				zend_list_delete(intern->u.db->rsrc_id);
++				zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) sqlite_free_persistent, &intern->u.ptr TSRMLS_CC);
++			}
++		} else {
++			real_result_dtor(intern->u.res TSRMLS_CC);
++		}
++	}
++
++	efree(object);
++}
++
++static void sqlite_object_new(zend_class_entry *class_type, zend_object_handlers *handlers, zend_object_value *retval TSRMLS_DC)
++{
++	sqlite_object *intern;
++	zval *tmp;
++
++	intern = emalloc(sizeof(sqlite_object));
++	memset(intern, 0, sizeof(sqlite_object));
++
++	zend_object_std_init(&intern->std, class_type TSRMLS_CC);
++	zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
++
++	retval->handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL TSRMLS_CC);
++	retval->handlers = handlers;
++}
++
++static zend_object_value sqlite_object_new_db(zend_class_entry *class_type TSRMLS_DC)
++{
++	zend_object_value retval;
++
++	sqlite_object_new(class_type, &sqlite_object_handlers_db, &retval TSRMLS_CC);
++	return retval;
++}
++
++static zend_object_value sqlite_object_new_query(zend_class_entry *class_type TSRMLS_DC)
++{
++	zend_object_value retval;
++
++	sqlite_object_new(class_type, &sqlite_object_handlers_query, &retval TSRMLS_CC);
++	return retval;
++}
++
++static zend_object_value sqlite_object_new_ub_query(zend_class_entry *class_type TSRMLS_DC)
++{
++	zend_object_value retval;
++
++	sqlite_object_new(class_type, &sqlite_object_handlers_ub_query, &retval TSRMLS_CC);
++	return retval;
++}
++
++static zend_object_value sqlite_object_new_exception(zend_class_entry *class_type TSRMLS_DC)
++{
++	zend_object_value retval;
++
++	sqlite_object_new(class_type, &sqlite_object_handlers_exception, &retval TSRMLS_CC);
++	return retval;
++}
++
++#define SQLITE_REGISTER_OBJECT(_type, _object, _ptr) \
++	{ \
++		sqlite_object *obj; \
++		obj = (sqlite_object*)zend_object_store_get_object(_object TSRMLS_CC); \
++		obj->type = is_ ## _type; \
++		obj->u._type = _ptr; \
++	}
++
++static zend_class_entry *sqlite_get_ce_query(const zval *object TSRMLS_DC)
++{
++	return sqlite_ce_query;
++}
++
++static zend_class_entry *sqlite_get_ce_ub_query(const zval *object TSRMLS_DC)
++{
++	return sqlite_ce_ub_query;
++}
++
++static zval * sqlite_instanciate(zend_class_entry *pce, zval *object TSRMLS_DC)
++{
++	if (!object) {
++		ALLOC_ZVAL(object);
++	}
++	Z_TYPE_P(object) = IS_OBJECT;
++	object_init_ex(object, pce);
++	Z_SET_REFCOUNT_P(object, 1);
++	Z_SET_ISREF_P(object);
++	return object;
++}
++
++typedef struct _sqlite_object_iterator {
++	zend_object_iterator     it;
++	struct php_sqlite_result *res;
++	zval *value;
++} sqlite_object_iterator;
++
++void sqlite_iterator_dtor(zend_object_iterator *iter TSRMLS_DC)
++{
++	zval *object = (zval*)((sqlite_object_iterator*)iter)->it.data;
++
++	if (((sqlite_object_iterator*)iter)->value) {
++		zval_ptr_dtor(&((sqlite_object_iterator*)iter)->value);
++		((sqlite_object_iterator*)iter)->value = NULL;
++	}
++	zval_ptr_dtor(&object);
++	efree(iter);
++}
++
++void sqlite_iterator_rewind(zend_object_iterator *iter TSRMLS_DC)
++{
++	struct php_sqlite_result *res = ((sqlite_object_iterator*)iter)->res;
++
++	if (((sqlite_object_iterator*)iter)->value) {
++		zval_ptr_dtor(&((sqlite_object_iterator*)iter)->value);
++		((sqlite_object_iterator*)iter)->value = NULL;
++	}
++	if (res) {
++		res->curr_row = 0;
++	}
++}
++
++int sqlite_iterator_valid(zend_object_iterator *iter TSRMLS_DC)
++{
++	struct php_sqlite_result *res = ((sqlite_object_iterator*)iter)->res;
++
++	if (res && res->curr_row < res->nrows && res->nrows) { /* curr_row may be -1 */
++		return SUCCESS;
++	} else {
++		return FAILURE;
++	}
++}
++
++void sqlite_iterator_get_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC)
++{
++	struct php_sqlite_result *res = ((sqlite_object_iterator*)iter)->res;
++
++	*data = &((sqlite_object_iterator*)iter)->value;
++	if (res && !**data) {
++		MAKE_STD_ZVAL(**data);
++		php_sqlite_fetch_array(res, res->mode, 1, 0, **data TSRMLS_CC);
++	}
++
++}
++
++int sqlite_iterator_get_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC)
++{
++	struct php_sqlite_result *res = ((sqlite_object_iterator*)iter)->res;
++
++	*str_key = NULL;
++	*str_key_len = 0;
++	*int_key = res ? res->curr_row : 0;
++	return HASH_KEY_IS_LONG;
++}
++
++void sqlite_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC)
++{
++	struct php_sqlite_result *res = ((sqlite_object_iterator*)iter)->res;
++
++	if (((sqlite_object_iterator*)iter)->value) {
++		zval_ptr_dtor(&((sqlite_object_iterator*)iter)->value);
++		((sqlite_object_iterator*)iter)->value = NULL;
++	}
++	if (res) {
++		if (!res->buffered && res->vm) {
++			php_sqlite_fetch(res TSRMLS_CC);
++		}
++		if (res->curr_row >= res->nrows) {
++			/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "no more rows available"); */
++			return;
++		}
++
++		res->curr_row++;
++	}
++}
++
++zend_object_iterator_funcs sqlite_ub_query_iterator_funcs = {
++	sqlite_iterator_dtor,
++	sqlite_iterator_valid,
++	sqlite_iterator_get_current_data,
++	sqlite_iterator_get_current_key,
++	sqlite_iterator_move_forward,
++	NULL
++};
++
++zend_object_iterator_funcs sqlite_query_iterator_funcs = {
++	sqlite_iterator_dtor,
++	sqlite_iterator_valid,
++	sqlite_iterator_get_current_data,
++	sqlite_iterator_get_current_key,
++	sqlite_iterator_move_forward,
++	sqlite_iterator_rewind
++};
++
++zend_object_iterator *sqlite_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC)
++{
++	sqlite_object_iterator *iterator = emalloc(sizeof(sqlite_object_iterator));
++
++	sqlite_object *obj = (sqlite_object*) zend_object_store_get_object(object TSRMLS_CC);
++
++	if (by_ref) {
++		zend_error(E_RECOVERABLE_ERROR, "An iterator cannot be used with foreach by reference");
++	}
++	Z_ADDREF_P(object);
++	iterator->it.data = (void*)object;
++	iterator->it.funcs = ce->iterator_funcs.funcs;
++	iterator->res = obj->u.res;
++	iterator->value = NULL;
++	return (zend_object_iterator*)iterator;
++}
++/* }}} */
++
++static PHP_GINIT_FUNCTION(sqlite)
++{
++	sqlite_globals->assoc_case = 0;
++}
++
++PHP_MINIT_FUNCTION(sqlite)
++{
++	REGISTER_SQLITE_CLASS(Database,   db,        NULL);
++	REGISTER_SQLITE_CLASS(Result,     query,     NULL);
++	REGISTER_SQLITE_CLASS(Unbuffered, ub_query,  NULL);
++#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
++	REGISTER_SQLITE_CLASS(Exception,  exception, spl_ce_RuntimeException);
++#else
++	REGISTER_SQLITE_CLASS(Exception,  exception, zend_exception_get_default(TSRMLS_C));
++#endif
++
++	sqlite_ce_db->ce_flags &= ~ZEND_ACC_FINAL_CLASS;
++	sqlite_ce_db->constructor->common.fn_flags |= ZEND_ACC_FINAL;
++
++	sqlite_object_handlers_query.get_class_entry = sqlite_get_ce_query;
++	sqlite_object_handlers_ub_query.get_class_entry = sqlite_get_ce_ub_query;
++	sqlite_object_handlers_ub_query.count_elements = sqlite_count_elements;
++
++	sqlite_ce_ub_query->get_iterator = sqlite_get_iterator;
++	sqlite_ce_ub_query->iterator_funcs.funcs = &sqlite_ub_query_iterator_funcs;
++
++#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
++	zend_class_implements(sqlite_ce_query TSRMLS_CC, 2, zend_ce_iterator, spl_ce_Countable);
++#else
++	zend_class_implements(sqlite_ce_query TSRMLS_CC, 1, zend_ce_iterator);
++#endif
++	sqlite_ce_query->get_iterator = sqlite_get_iterator;
++	sqlite_ce_query->iterator_funcs.funcs = &sqlite_query_iterator_funcs;
++
++	REGISTER_INI_ENTRIES();
++
++#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++	php_session_register_module(ps_sqlite_ptr);
++#endif
++
++	le_sqlite_db = zend_register_list_destructors_ex(php_sqlite_db_dtor, NULL, "sqlite database", module_number);
++	le_sqlite_pdb = zend_register_list_destructors_ex(NULL, php_sqlite_db_dtor, "sqlite database (persistent)", module_number);
++	le_sqlite_result = zend_register_list_destructors_ex(php_sqlite_result_dtor, NULL, "sqlite result", module_number);
++
++	REGISTER_LONG_CONSTANT("SQLITE_BOTH",	PHPSQLITE_BOTH, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_NUM",	PHPSQLITE_NUM, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_ASSOC",	PHPSQLITE_ASSOC, CONST_CS|CONST_PERSISTENT);
++
++	REGISTER_LONG_CONSTANT("SQLITE_OK",				SQLITE_OK, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_ERROR",			SQLITE_ERROR, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_INTERNAL",		SQLITE_INTERNAL, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_PERM",			SQLITE_PERM, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_ABORT",			SQLITE_ABORT, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_BUSY",			SQLITE_BUSY, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_LOCKED",			SQLITE_LOCKED, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_NOMEM",			SQLITE_NOMEM, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_READONLY",		SQLITE_READONLY, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_INTERRUPT",		SQLITE_INTERRUPT, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_IOERR",			SQLITE_IOERR, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_CORRUPT",		SQLITE_CORRUPT, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_NOTFOUND",		SQLITE_NOTFOUND, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_FULL",			SQLITE_FULL, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_CANTOPEN",		SQLITE_CANTOPEN, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_PROTOCOL",		SQLITE_PROTOCOL, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_EMPTY",			SQLITE_EMPTY, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_SCHEMA",			SQLITE_SCHEMA, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_TOOBIG",			SQLITE_TOOBIG, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_CONSTRAINT",		SQLITE_CONSTRAINT, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_MISMATCH",		SQLITE_MISMATCH, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_MISUSE",			SQLITE_MISUSE, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_NOLFS",			SQLITE_NOLFS, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_AUTH",			SQLITE_AUTH, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_NOTADB",			SQLITE_NOTADB, CONST_CS|CONST_PERSISTENT);
++#ifdef SQLITE_FORMAT
++	REGISTER_LONG_CONSTANT("SQLITE_FORMAT",			SQLITE_FORMAT, CONST_CS|CONST_PERSISTENT);
++#endif
++	REGISTER_LONG_CONSTANT("SQLITE_ROW",			SQLITE_ROW, CONST_CS|CONST_PERSISTENT);
++	REGISTER_LONG_CONSTANT("SQLITE_DONE",			SQLITE_DONE, CONST_CS|CONST_PERSISTENT);
++
++#ifdef PHP_SQLITE2_HAVE_PDO
++    if (FAILURE == php_pdo_register_driver(&pdo_sqlite2_driver)) {
++	return FAILURE;
++    }
++#endif
++
++	return SUCCESS;
++}
++
++PHP_MSHUTDOWN_FUNCTION(sqlite)
++{
++	UNREGISTER_INI_ENTRIES();
++
++#ifdef PHP_SQLITE2_HAVE_PDO
++    php_pdo_unregister_driver(&pdo_sqlite2_driver);
++#endif
++
++	return SUCCESS;
++}
++
++PHP_MINFO_FUNCTION(sqlite)
++{
++	php_info_print_table_start();
++	php_info_print_table_header(2, "SQLite support", "enabled");
++	php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id$");
++	php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
++	php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
++	php_info_print_table_end();
++
++	DISPLAY_INI_ENTRIES();
++}
++
++static struct php_sqlite_db *php_sqlite_open(char *filename, int mode, char *persistent_id, zval *return_value, zval *errmsg, zval *object TSRMLS_DC)
++{
++	char *errtext = NULL;
++	sqlite *sdb = NULL;
++	struct php_sqlite_db *db = NULL;
++
++	sdb = sqlite_open(filename, mode, &errtext);
++
++	if (sdb == NULL) {
++
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++
++		if (errmsg) {
++			ZVAL_STRING(errmsg, errtext, 1);
++		}
++
++		sqlite_freemem(errtext);
++
++		/* if object is not an object then we're called from the factory() function */
++		if (object && Z_TYPE_P(object) != IS_OBJECT) {
++			RETVAL_NULL();
++		} else {
++			RETVAL_FALSE;
++		}
++		return NULL;
++	}
++
++	db = (struct php_sqlite_db *)pemalloc(sizeof(struct php_sqlite_db), persistent_id ? 1 : 0);
++	db->is_persistent = persistent_id ? 1 : 0;
++	db->last_err_code = SQLITE_OK;
++	db->db = sdb;
++
++	zend_hash_init(&db->callbacks, 0, NULL, php_sqlite_callback_dtor, db->is_persistent);
++
++	/* register the PHP functions */
++	sqlite_create_function(sdb, "php", -1, php_sqlite_generic_function_callback, 0);
++
++	/* set default busy handler; keep retrying up until 1 minute has passed,
++	 * then fail with a busy status code */
++	sqlite_busy_timeout(sdb, 60000);
++
++	/* authorizer hook so we can enforce safe mode
++	 * Note: the declaration of php_sqlite_authorizer is correct for 2.8.2 of libsqlite,
++	 * and IS backwards binary compatible with earlier versions */
++	if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
++		sqlite_set_authorizer(sdb, php_sqlite_authorizer, NULL);
++	}
++
++	db->rsrc_id = ZEND_REGISTER_RESOURCE(object ? NULL : return_value, db, persistent_id ? le_sqlite_pdb : le_sqlite_db);
++	if (object) {
++		/* if object is not an object then we're called from the factory() function */
++		if (Z_TYPE_P(object) != IS_OBJECT) {
++			sqlite_instanciate(sqlite_ce_db, object TSRMLS_CC);
++		}
++		/* and now register the object */
++		SQLITE_REGISTER_OBJECT(db, object, db)
++	}
++
++	if (persistent_id) {
++		zend_rsrc_list_entry le;
++
++		Z_TYPE(le) = le_sqlite_pdb;
++		le.ptr = db;
++
++		if (FAILURE == zend_hash_update(&EG(persistent_list), persistent_id,
++					strlen(persistent_id)+1,
++					(void *)&le, sizeof(le), NULL)) {
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to register persistent resource");
++		}
++	}
++
++	return db;
++}
++
++/* {{{ proto resource sqlite_popen(string filename [, int mode [, string &error_message]])
++   Opens a persistent handle to a SQLite database. Will create the database if it does not exist. */
++PHP_FUNCTION(sqlite_popen)
++{
++	long mode = 0666;
++	char *filename, *fullpath, *hashkey;
++	int filename_len, hashkeylen;
++	zval *errmsg = NULL;
++	struct php_sqlite_db *db = NULL;
++	zend_rsrc_list_entry *le;
++
++	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
++				&filename, &filename_len, &mode, &errmsg)) {
++		return;
++	}
++	if (errmsg) {
++		zval_dtor(errmsg);
++		ZVAL_NULL(errmsg);
++	}
++
++	if (strlen(filename) != filename_len) {
++		RETURN_FALSE;
++	}
++	if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
++		/* resolve the fully-qualified path name to use as the hash key */
++		if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
++			RETURN_FALSE;
++		}
++
++		if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || 
++				php_check_open_basedir(fullpath TSRMLS_CC)) {
++			efree(fullpath);
++			RETURN_FALSE;
++		}
++	} else {
++		fullpath = estrndup(filename, filename_len);
++	}
++
++	hashkeylen = spprintf(&hashkey, 0, "sqlite_pdb_%s:%ld", fullpath, mode);
++
++	/* do we have an existing persistent connection ? */
++	if (SUCCESS == zend_hash_find(&EG(persistent_list), hashkey, hashkeylen+1, (void*)&le)) {
++		if (Z_TYPE_P(le) == le_sqlite_pdb) {
++			db = (struct php_sqlite_db*)le->ptr;
++
++			if (db->rsrc_id == FAILURE) {
++				/* give it a valid resource id for this request */
++				db->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, db, le_sqlite_pdb);
++			} else {
++				int type;
++				/* sanity check to ensure that the resource is still a valid regular resource
++				 * number */
++				if (zend_list_find(db->rsrc_id, &type) == db) {
++					/* already accessed this request; map it */
++					zend_list_addref(db->rsrc_id);
++					ZVAL_RESOURCE(return_value, db->rsrc_id);
++				} else {
++					db->rsrc_id = ZEND_REGISTER_RESOURCE(return_value, db, le_sqlite_pdb);
++				}
++			}
++
++			/* all set */
++			goto done;
++		}
++
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Some other type of persistent resource is using this hash key!?");
++		RETVAL_FALSE;
++		goto done;
++	}
++
++	/* now we need to open the database */
++	php_sqlite_open(fullpath, (int)mode, hashkey, return_value, errmsg, NULL TSRMLS_CC);
++done:
++	efree(fullpath);
++	efree(hashkey);
++}
++/* }}} */
++
++/* {{{ proto resource sqlite_open(string filename [, int mode [, string &error_message]])
++   Opens a SQLite database. Will create the database if it does not exist. */
++PHP_FUNCTION(sqlite_open)
++{
++	long mode = 0666;
++	char *filename, *fullpath = NULL;
++	int filename_len;
++	zval *errmsg = NULL;
++	zval *object = getThis();
++	zend_error_handling error_handling;
++
++	zend_replace_error_handling(object ? EH_THROW : EH_NORMAL, sqlite_ce_exception, &error_handling TSRMLS_CC);
++	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
++				&filename, &filename_len, &mode, &errmsg)) {
++		zend_restore_error_handling(&error_handling TSRMLS_CC);
++		return;
++	}
++	if (errmsg) {
++		zval_dtor(errmsg);
++		ZVAL_NULL(errmsg);
++	}
++
++	if (strlen(filename) != filename_len) {
++		zend_restore_error_handling(&error_handling TSRMLS_CC);
++		RETURN_FALSE;
++	}
++
++	if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
++		/* resolve the fully-qualified path name to use as the hash key */
++		if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
++			zend_restore_error_handling(&error_handling TSRMLS_CC);
++			if (object) {
++				RETURN_NULL();
++			} else {
++				RETURN_FALSE;
++			}
++		}
++
++		if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
++				php_check_open_basedir(fullpath TSRMLS_CC)) {
++			efree(fullpath);
++			zend_restore_error_handling(&error_handling TSRMLS_CC);
++			if (object) {
++				RETURN_NULL();
++			} else {
++				RETURN_FALSE;
++			}
++		}
++	}
++
++	php_sqlite_open(fullpath ? fullpath : filename, (int)mode, NULL, return_value, errmsg, object TSRMLS_CC);
++
++	if (fullpath) {
++		efree(fullpath);
++	}
++	zend_restore_error_handling(&error_handling TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto object sqlite_factory(string filename [, int mode [, string &error_message]])
++   Opens a SQLite database and creates an object for it. Will create the database if it does not exist. */
++PHP_FUNCTION(sqlite_factory)
++{
++	long mode = 0666;
++	char *filename, *fullpath = NULL;
++	int filename_len;
++	zval *errmsg = NULL;
++	zend_error_handling error_handling;
++
++	zend_replace_error_handling(EH_THROW, sqlite_ce_exception, &error_handling TSRMLS_CC);
++	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/",
++				&filename, &filename_len, &mode, &errmsg)) {
++		zend_restore_error_handling(&error_handling TSRMLS_CC);
++		RETURN_NULL();
++	}
++	if (errmsg) {
++		zval_dtor(errmsg);
++		ZVAL_NULL(errmsg);
++	}
++
++	if (strlen(filename) != filename_len) {
++		zend_restore_error_handling(&error_handling TSRMLS_CC);
++		RETURN_FALSE;
++	}
++
++	if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
++		/* resolve the fully-qualified path name to use as the hash key */
++		if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
++			zend_restore_error_handling(&error_handling TSRMLS_CC);
++			RETURN_NULL();
++		}
++
++		if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
++				php_check_open_basedir(fullpath TSRMLS_CC)) {
++			efree(fullpath);
++			zend_restore_error_handling(&error_handling TSRMLS_CC);
++			RETURN_NULL();
++		}
++	}
++
++	php_sqlite_open(fullpath ? fullpath : filename, (int)mode, NULL, return_value, errmsg, return_value TSRMLS_CC);
++	if (fullpath) {
++		efree(fullpath);
++	}
++	zend_restore_error_handling(&error_handling TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto void sqlite_busy_timeout(resource db, int ms)
++   Set busy timeout duration. If ms <= 0, all busy handlers are disabled. */
++PHP_FUNCTION(sqlite_busy_timeout)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	long ms;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &ms)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zdb, &ms)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	sqlite_busy_timeout(db->db, ms);
++}
++/* }}} */
++
++/* {{{ proto void sqlite_close(resource db)
++   Closes an open sqlite database. */
++PHP_FUNCTION(sqlite_close)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	zval *object = getThis();
++
++	if (object) {
++		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Ignored, you must destruct the object instead");
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	zend_hash_apply_with_argument(&EG(regular_list),
++		(apply_func_arg_t) _clean_unfinished_results,
++		db TSRMLS_CC);
++
++	zend_list_delete(Z_RESVAL_P(zdb));
++}
++/* }}} */
++
++/* {{{ php_sqlite_fetch */
++static int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC)
++{
++	const char **rowdata, **colnames;
++	int ret, i, base;
++	char *errtext = NULL;
++
++next_row:
++	ret = sqlite_step(rres->vm, &rres->ncolumns, &rowdata, &colnames);
++	if (!rres->nrows) {
++		/* first row - lets copy the column names */
++		rres->col_names = safe_emalloc(rres->ncolumns, sizeof(char *), 0);
++		for (i = 0; i < rres->ncolumns; i++) {
++			rres->col_names[i] = estrdup((char*)colnames[i]);
++
++			if (SQLITE_G(assoc_case) == 1) {
++				php_sqlite_strtoupper(rres->col_names[i]);
++			} else if (SQLITE_G(assoc_case) == 2) {
++				php_sqlite_strtolower(rres->col_names[i]);
++			}
++		}
++		if (!rres->buffered) {
++			/* non buffered mode - also fetch memory for on single row */
++			rres->table = safe_emalloc(rres->ncolumns, sizeof(char *), 0);
++		}
++	}
++
++	switch (ret) {
++		case SQLITE_ROW:
++			if (rres->buffered) {
++				/* add the row to our collection */
++				if (rres->nrows + 1 >= rres->alloc_rows) {
++					rres->alloc_rows = rres->alloc_rows ? rres->alloc_rows * 2 : 16;
++					rres->table = safe_erealloc(rres->table, rres->alloc_rows, rres->ncolumns*sizeof(char *), 0);
++				}
++				base = rres->nrows * rres->ncolumns;
++				for (i = 0; i < rres->ncolumns; i++) {
++					if (rowdata[i]) {
++						rres->table[base + i] = estrdup(rowdata[i]);
++					} else {
++						rres->table[base + i] = NULL;
++					}
++				}
++				rres->nrows++;
++				goto next_row;
++			} else {
++				/* non buffered: only fetch one row but first free data if not first row */
++				if (rres->nrows++) {
++					for (i = 0; i < rres->ncolumns; i++) {
++						if (rres->table[i]) {
++							efree(rres->table[i]);
++						}
++					}
++				}
++				for (i = 0; i < rres->ncolumns; i++) {
++					if (rowdata[i]) {
++						rres->table[i] = estrdup(rowdata[i]);
++					} else {
++						rres->table[i] = NULL;
++					}
++				}
++			}
++			ret = SQLITE_OK;
++			break;
++
++		case SQLITE_BUSY:
++		case SQLITE_ERROR:
++		case SQLITE_MISUSE:
++		case SQLITE_DONE:
++		default:
++			if (rres->vm) {
++				ret = sqlite_finalize(rres->vm, &errtext);
++			}
++			rres->vm = NULL;
++			if (ret != SQLITE_OK) {
++				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++				sqlite_freemem(errtext);
++			}
++			break;
++	}
++	rres->db->last_err_code = ret;
++
++	return ret;
++}
++/* }}} */
++
++/* {{{ sqlite_query */
++void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result **prres, zval *errmsg TSRMLS_DC)
++{
++	struct php_sqlite_result res, *rres;
++	int ret;
++	char *errtext = NULL;
++	const char *tail;
++
++	memset(&res, 0, sizeof(res));
++	res.buffered = buffered;
++	res.mode = mode;
++
++	ret = sqlite_compile(db->db, sql, &tail, &res.vm, &errtext);
++	db->last_err_code = ret;
++
++	if (ret != SQLITE_OK) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++		if (errmsg) {
++			ZVAL_STRING(errmsg, errtext, 1);
++		}
++		sqlite_freemem(errtext);
++		goto terminate;
++	} else if (!res.vm) { /* empty query */
++terminate:
++		if (return_value) {
++			RETURN_FALSE;
++		} else {
++			return;
++		}
++	}
++
++	if (!prres) {
++		rres = NULL;
++		prres = &rres;
++	}
++	if (!*prres) {
++		*prres = (struct php_sqlite_result*)emalloc(sizeof(**prres));
++	}
++	memcpy(*prres, &res, sizeof(**prres));
++	(*prres)->db = db;
++	zend_list_addref(db->rsrc_id);
++
++
++	/* now the result set is ready for stepping: get first row */
++	if (php_sqlite_fetch((*prres) TSRMLS_CC) != SQLITE_OK) {
++		real_result_dtor((*prres) TSRMLS_CC);
++		*prres = NULL;
++		if (return_value) {
++			RETURN_FALSE;
++		} else {
++			return;
++		}
++	}
++
++	(*prres)->curr_row = 0;
++
++	if (object) {
++		sqlite_object *obj;
++		if (buffered) {
++			sqlite_instanciate(sqlite_ce_query, return_value TSRMLS_CC);
++		} else {
++			sqlite_instanciate(sqlite_ce_ub_query, return_value TSRMLS_CC);
++		}
++		obj = (sqlite_object *) zend_object_store_get_object(return_value TSRMLS_CC);
++		obj->type = is_result;
++		obj->u.res = (*prres);
++	} else if (return_value) {
++		ZEND_REGISTER_RESOURCE(object ? NULL : return_value, (*prres), le_sqlite_result);
++	}
++}
++/* }}} */
++
++/* {{{ proto resource sqlite_unbuffered_query(string query, resource db [ , int result_type [, string &error_message]])
++   Executes a query that does not prefetch and buffer all data. */
++PHP_FUNCTION(sqlite_unbuffered_query)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	char *sql;
++	int sql_len;
++	long mode = PHPSQLITE_BOTH;
++	char *errtext = NULL;
++	zval *errmsg = NULL;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/", &sql, &sql_len, &mode, &errmsg)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
++				ZEND_NUM_ARGS() TSRMLS_CC, "sr|lz/", &sql, &sql_len, &zdb, &mode, &errmsg) &&
++			FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|lz/", &zdb, &sql, &sql_len, &mode, &errmsg)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	if (errmsg) {
++		zval_dtor(errmsg);
++		ZVAL_NULL(errmsg);
++	}
++
++	PHP_SQLITE_EMPTY_QUERY;
++
++	/* avoid doing work if we can */
++	if (!return_value_used) {
++		db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
++
++		if (db->last_err_code != SQLITE_OK) {
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++			if (errmsg) {
++				ZVAL_STRING(errmsg, errtext, 1);
++			}
++			sqlite_freemem(errtext);
++		}
++		return;
++	}
++
++	sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value, NULL, errmsg TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto resource sqlite_fetch_column_types(string table_name, resource db [, int result_type])
++   Return an array of column types from a particular table. */
++PHP_FUNCTION(sqlite_fetch_column_types)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	char *tbl, *sql;
++	int tbl_len;
++	char *errtext = NULL;
++	zval *object = getThis();
++	struct php_sqlite_result res;
++	const char **rowdata, **colnames, *tail;
++	int i, ncols;
++	long result_type = PHPSQLITE_ASSOC;
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &tbl, &tbl_len, &result_type)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
++				ZEND_NUM_ARGS() TSRMLS_CC, "sr|l", &tbl, &tbl_len, &zdb, &result_type) &&
++			FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zdb, &tbl, &tbl_len, &result_type)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	if (!(sql = sqlite_mprintf("SELECT * FROM '%q' LIMIT 1", tbl))) {
++		RETURN_FALSE;
++	}
++
++	sqlite_exec(db->db, "PRAGMA show_datatypes = ON", NULL, NULL, NULL);
++
++	db->last_err_code = sqlite_compile(db->db, sql, &tail, &res.vm, &errtext);
++
++	sqlite_freemem(sql);
++
++	if (db->last_err_code != SQLITE_OK) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++		sqlite_freemem(errtext);
++		RETVAL_FALSE;
++		goto done;
++	}
++
++	sqlite_step(res.vm, &ncols, &rowdata, &colnames);
++
++	array_init(return_value);
++
++	for (i = 0; i < ncols; i++) {
++		if (result_type == PHPSQLITE_ASSOC) {
++			char *colname = estrdup((char *)colnames[i]);
++
++			if (SQLITE_G(assoc_case) == 1) {
++				php_sqlite_strtoupper(colname);
++			} else if (SQLITE_G(assoc_case) == 2) {
++				php_sqlite_strtolower(colname);
++			}
++
++			add_assoc_string(return_value, colname, colnames[ncols + i] ? (char *)colnames[ncols + i] : "", 1);
++			efree(colname);
++		}
++		if (result_type == PHPSQLITE_NUM) {
++			add_index_string(return_value, i, colnames[ncols + i] ? (char *)colnames[ncols + i] : "", 1);
++		}
++	}
++	if (res.vm) {
++		sqlite_finalize(res.vm, NULL);
++	}
++done:
++	sqlite_exec(db->db, "PRAGMA show_datatypes = OFF", NULL, NULL, NULL);
++}
++/* }}} */
++
++/* {{{ proto resource sqlite_query(string query, resource db [, int result_type [, string &error_message]])
++   Executes a query against a given database and returns a result handle. */
++PHP_FUNCTION(sqlite_query)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	char *sql;
++	int sql_len;
++	long mode = PHPSQLITE_BOTH;
++	char *errtext = NULL;
++	zval *errmsg = NULL;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz/", &sql, &sql_len, &mode, &errmsg)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
++				ZEND_NUM_ARGS() TSRMLS_CC, "sr|lz/", &sql, &sql_len, &zdb, &mode, &errmsg) &&
++			FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|lz/", &zdb, &sql, &sql_len, &mode, &errmsg)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	if (errmsg) {
++		zval_dtor(errmsg);
++		ZVAL_NULL(errmsg);
++	}
++
++	PHP_SQLITE_EMPTY_QUERY;
++
++	/* avoid doing work if we can */
++	if (!return_value_used) {
++		db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
++
++		if (db->last_err_code != SQLITE_OK) {
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++			if (errmsg) {
++				ZVAL_STRING(errmsg, errtext, 1);
++			}
++			sqlite_freemem(errtext);
++		}
++		return;
++	}
++
++	sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value, NULL, errmsg TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto boolean sqlite_exec(string query, resource db[, string &error_message])
++   Executes a result-less query against a given database */
++PHP_FUNCTION(sqlite_exec)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	char *sql;
++	int sql_len;
++	char *errtext = NULL;
++	zval *errmsg = NULL;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/", &sql, &sql_len, &errmsg)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if(FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
++			ZEND_NUM_ARGS() TSRMLS_CC, "sr", &sql, &sql_len, &zdb) &&
++		   FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|z/", &zdb, &sql, &sql_len, &errmsg)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	if (errmsg) {
++		zval_dtor(errmsg);
++		ZVAL_NULL(errmsg);
++	}
++
++	PHP_SQLITE_EMPTY_QUERY;
++
++	db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
++
++	if (db->last_err_code != SQLITE_OK) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++		if (errmsg) {
++			ZVAL_STRING(errmsg, errtext, 1);
++		}
++		sqlite_freemem(errtext);
++		RETURN_FALSE;
++	}
++
++	RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ php_sqlite_fetch_array */
++static void php_sqlite_fetch_array(struct php_sqlite_result *res, int mode, zend_bool decode_binary, int move_next, zval *return_value TSRMLS_DC)
++{
++	int j, n = res->ncolumns, buffered = res->buffered;
++	const char **rowdata, **colnames;
++
++	/* check range of the row */
++	if (res->curr_row >= res->nrows) {
++		/* no more */
++		RETURN_FALSE;
++	}
++	colnames = (const char**)res->col_names;
++	if (res->buffered) {
++		rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
++	} else {
++		rowdata = (const char**)res->table;
++	}
++
++	/* now populate the result */
++	array_init(return_value);
++
++	for (j = 0; j < n; j++) {
++		zval *decoded;
++		MAKE_STD_ZVAL(decoded);
++
++		if (rowdata[j] == NULL) {
++			ZVAL_NULL(decoded);
++		} else if (decode_binary && rowdata[j][0] == '\x01') {
++			Z_STRVAL_P(decoded) = emalloc(strlen(rowdata[j]));
++			Z_STRLEN_P(decoded) = php_sqlite_decode_binary(rowdata[j]+1, Z_STRVAL_P(decoded));
++			Z_STRVAL_P(decoded)[Z_STRLEN_P(decoded)] = '\0';
++			Z_TYPE_P(decoded) = IS_STRING;
++			if (!buffered) {
++				efree((char*)rowdata[j]);
++				rowdata[j] = NULL;
++			}
++		} else {
++			ZVAL_STRING(decoded, (char*)rowdata[j], buffered);
++			if (!buffered) {
++				rowdata[j] = NULL;
++			}
++		}
++
++		if (mode & PHPSQLITE_NUM) {
++			if (mode & PHPSQLITE_ASSOC) {
++				add_index_zval(return_value, j, decoded);
++				Z_ADDREF_P(decoded);
++				add_assoc_zval(return_value, (char*)colnames[j], decoded);
++			} else {
++				add_next_index_zval(return_value, decoded);
++			}
++		} else {
++			add_assoc_zval(return_value, (char*)colnames[j], decoded);
++		}
++	}
++
++	if (move_next) {
++		if (!res->buffered) {
++			/* non buffered: fetch next row */
++			php_sqlite_fetch(res TSRMLS_CC);
++		}
++		/* advance the row pointer */
++		res->curr_row++;
++	}
++}
++/* }}} */
++
++/* {{{ php_sqlite_fetch_column */
++static void php_sqlite_fetch_column(struct php_sqlite_result *res, zval *which, zend_bool decode_binary, zval *return_value TSRMLS_DC)
++{
++	int j;
++	const char **rowdata, **colnames;
++
++	/* check range of the row */
++	if (res->curr_row >= res->nrows) {
++		/* no more */
++		RETURN_FALSE;
++	}
++	colnames = (const char**)res->col_names;
++
++	if (Z_TYPE_P(which) == IS_LONG) {
++		j = Z_LVAL_P(which);
++	} else {
++		convert_to_string_ex(&which);
++		for (j = 0; j < res->ncolumns; j++) {
++			if (!strcasecmp((char*)colnames[j], Z_STRVAL_P(which))) {
++				break;
++			}
++		}
++	}
++	if (j < 0 || j >= res->ncolumns) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such column %d", j);
++		RETURN_FALSE;
++	}
++
++	if (res->buffered) {
++		rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
++	} else {
++		rowdata = (const char**)res->table;
++	}
++
++	if (rowdata[j] == NULL) {
++		RETURN_NULL();
++	} else if (decode_binary && rowdata[j] != NULL && rowdata[j][0] == '\x01') {
++		int l = strlen(rowdata[j]);
++		char *decoded = emalloc(l);
++		l = php_sqlite_decode_binary(rowdata[j]+1, decoded);
++		decoded[l] = '\0';
++		RETVAL_STRINGL(decoded, l, 0);
++		if (!res->buffered) {
++			efree((char*)rowdata[j]);
++			rowdata[j] = NULL;
++		}
++	} else {
++		RETVAL_STRING((char*)rowdata[j], res->buffered);
++		if (!res->buffered) {
++			rowdata[j] = NULL;
++		}
++	}
++}
++/* }}} */
++
++/* {{{ proto array sqlite_fetch_all(resource result [, int result_type [, bool decode_binary]])
++   Fetches all rows from a result set as an array of arrays. */
++PHP_FUNCTION(sqlite_fetch_all)
++{
++	zval *zres, *ent;
++	long mode = PHPSQLITE_BOTH;
++	zend_bool decode_binary = 1;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lb", &mode, &decode_binary)) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++		if (!ZEND_NUM_ARGS()) {
++			mode = res->mode;
++		}
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++		if (ZEND_NUM_ARGS() < 2) {
++			mode = res->mode;
++		}
++	}
++
++	if (res->curr_row >= res->nrows && res->nrows) {
++		if (!res->buffered) {
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "One or more rowsets were already returned; returning NULL this time");
++		} else {
++			res->curr_row = 0;
++		}
++	}
++
++	array_init(return_value);
++
++	while (res->curr_row < res->nrows) {
++		MAKE_STD_ZVAL(ent);
++		php_sqlite_fetch_array(res, mode, decode_binary, 1, ent TSRMLS_CC);
++		add_next_index_zval(return_value, ent);
++	}
++}
++/* }}} */
++
++/* {{{ proto array sqlite_fetch_array(resource result [, int result_type [, bool decode_binary]])
++   Fetches the next row from a result set as an array. */
++PHP_FUNCTION(sqlite_fetch_array)
++{
++	zval *zres;
++	long mode = PHPSQLITE_BOTH;
++	zend_bool decode_binary = 1;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lb", &mode, &decode_binary)) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++		if (!ZEND_NUM_ARGS()) {
++			mode = res->mode;
++		}
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++		if (ZEND_NUM_ARGS() < 2) {
++			mode = res->mode;
++		}
++	}
++
++	php_sqlite_fetch_array(res, mode, decode_binary, 1, return_value TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto object sqlite_fetch_object(resource result [, string class_name [, NULL|array ctor_params [, bool decode_binary]]])
++   Fetches the next row from a result set as an object. */
++   /* note that you can do array(&$val) for param ctor_params */
++PHP_FUNCTION(sqlite_fetch_object)
++{
++	zval *zres;
++	zend_bool decode_binary = 1;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++	char *class_name = NULL;
++	int class_name_len;
++	zend_class_entry *ce;
++	zval dataset;
++	zend_fcall_info fci;
++	zend_fcall_info_cache fcc;
++	zval *retval_ptr;
++	zval *ctor_params = NULL;
++	zend_error_handling error_handling;
++
++	zend_replace_error_handling(object ? EH_THROW : EH_NORMAL, sqlite_ce_exception, &error_handling TSRMLS_CC);
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|szb", &class_name, &class_name_len, &ctor_params, &decode_binary)) {
++			zend_restore_error_handling(&error_handling TSRMLS_CC);
++			return;
++		}
++		RES_FROM_OBJECT_RESTORE_ERH(res, object, &error_handling);
++		if (!class_name) {
++			ce = zend_standard_class_def;
++		} else {
++			ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC);
++		}
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|szb", &zres, &class_name, &class_name_len, &ctor_params, &decode_binary)) {
++			zend_restore_error_handling(&error_handling TSRMLS_CC);
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++		if (!class_name) {
++			ce = zend_standard_class_def;
++		} else {
++			ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC);
++		}
++	}
++
++	if (!ce) {
++		zend_throw_exception_ex(sqlite_ce_exception, 0 TSRMLS_CC, "Could not find class '%s'", class_name);
++		zend_restore_error_handling(&error_handling TSRMLS_CC);
++		return;
++	}
++
++	if (res->curr_row < res->nrows) {
++		php_sqlite_fetch_array(res, PHPSQLITE_ASSOC, decode_binary, 1, &dataset TSRMLS_CC);
++	} else {
++		zend_restore_error_handling(&error_handling TSRMLS_CC);
++		RETURN_FALSE;
++	}
++
++	object_and_properties_init(return_value, ce, NULL);
++	zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC);
++
++	zend_restore_error_handling(&error_handling TSRMLS_CC);
++
++	if (ce->constructor) {
++		fci.size = sizeof(fci);
++		fci.function_table = &ce->function_table;
++		fci.function_name = NULL;
++		fci.symbol_table = NULL;
++		fci.object_ptr = return_value;
++		fci.retval_ptr_ptr = &retval_ptr;
++		if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
++			if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
++				HashTable *ht = Z_ARRVAL_P(ctor_params);
++				Bucket *p;
++
++				fci.param_count = 0;
++				fci.params = safe_emalloc(sizeof(zval*), ht->nNumOfElements, 0);
++				p = ht->pListHead;
++				while (p != NULL) {
++					fci.params[fci.param_count++] = (zval**)p->pData;
++					p = p->pListNext;
++				}
++			} else {
++				/* Two problems why we throw exceptions here: PHP is typeless
++				 * and hence passing one argument that's not an array could be
++				 * by mistake and the other way round is possible, too. The
++				 * single value is an array. Also we'd have to make that one
++				 * argument passed by reference.
++				 */
++				zend_throw_exception(sqlite_ce_exception, "Parameter ctor_params must be an array", 0 TSRMLS_CC);
++				return;
++			}
++		} else {
++			fci.param_count = 0;
++			fci.params = NULL;
++		}
++		fci.no_separation = 1;
++
++		fcc.initialized = 1;
++		fcc.function_handler = ce->constructor;
++		fcc.calling_scope = EG(scope);
++		fcc.called_scope = Z_OBJCE_P(return_value);
++		fcc.object_ptr = return_value;
++
++		if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
++			zend_throw_exception_ex(sqlite_ce_exception, 0 TSRMLS_CC, "Could not execute %s::%s()", class_name, ce->constructor->common.function_name);
++		} else {
++			if (retval_ptr) {
++				zval_ptr_dtor(&retval_ptr);
++			}
++		}
++		if (fci.params) {
++			efree(fci.params);
++		}
++	} else if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
++		zend_throw_exception_ex(sqlite_ce_exception, 0 TSRMLS_CC, "Class %s does not have a constructor, use NULL for parameter ctor_params or omit it", class_name);
++	}
++}
++/* }}} */
++
++/* {{{ proto array sqlite_array_query(resource db, string query [ , int result_type [, bool decode_binary]])
++   Executes a query against a given database and returns an array of arrays. */
++PHP_FUNCTION(sqlite_array_query)
++{
++	zval *zdb, *ent;
++	struct php_sqlite_db *db;
++	struct php_sqlite_result *rres;
++	char *sql;
++	int sql_len;
++	long mode = PHPSQLITE_BOTH;
++	char *errtext = NULL;
++	zend_bool decode_binary = 1;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lb", &sql, &sql_len, &mode, &decode_binary)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
++				ZEND_NUM_ARGS() TSRMLS_CC, "sr|lb", &sql, &sql_len, &zdb, &mode, &decode_binary) &&
++			FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|lb", &zdb, &sql, &sql_len, &mode, &decode_binary)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	PHP_SQLITE_EMPTY_QUERY;
++
++	/* avoid doing work if we can */
++	if (!return_value_used) {
++		db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
++
++		if (db->last_err_code != SQLITE_OK) {
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++			sqlite_freemem(errtext);
++		}
++		return;
++	}
++
++	rres = (struct php_sqlite_result *)ecalloc(1, sizeof(*rres));
++	sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres, NULL TSRMLS_CC);
++	if (db->last_err_code != SQLITE_OK) {
++		if (rres) {
++			efree(rres);
++		}
++		RETURN_FALSE;
++	}
++
++	array_init(return_value);
++
++	while (rres->curr_row < rres->nrows) {
++		MAKE_STD_ZVAL(ent);
++		php_sqlite_fetch_array(rres, mode, decode_binary, 1, ent TSRMLS_CC);
++		add_next_index_zval(return_value, ent);
++	}
++	real_result_dtor(rres TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ php_sqlite_fetch_single */
++static void php_sqlite_fetch_single(struct php_sqlite_result *res, zend_bool decode_binary, zval *return_value TSRMLS_DC)
++{
++	const char **rowdata;
++	char *decoded;
++	int decoded_len;
++
++	/* check range of the row */
++	if (res->curr_row >= res->nrows) {
++		/* no more */
++		RETURN_FALSE;
++	}
++
++	if (res->buffered) {
++		rowdata = (const char**)&res->table[res->curr_row * res->ncolumns];
++	} else {
++		rowdata = (const char**)res->table;
++	}
++
++	if (decode_binary && rowdata[0] != NULL && rowdata[0][0] == '\x01') {
++		decoded = emalloc(strlen(rowdata[0]));
++		decoded_len = php_sqlite_decode_binary(rowdata[0]+1, decoded);
++		if (!res->buffered) {
++			efree((char*)rowdata[0]);
++			rowdata[0] = NULL;
++		}
++	} else if (rowdata[0]) {
++		decoded_len = strlen((char*)rowdata[0]);
++		if (res->buffered) {
++			decoded = estrndup((char*)rowdata[0], decoded_len);
++		} else {
++			decoded = (char*)rowdata[0];
++			rowdata[0] = NULL;
++		}
++	} else {
++		decoded = NULL;
++		decoded_len = 0;
++	}
++
++	if (!res->buffered) {
++		/* non buffered: fetch next row */
++		php_sqlite_fetch(res TSRMLS_CC);
++	}
++	/* advance the row pointer */
++	res->curr_row++;
++
++	if (decoded == NULL) {
++		RETURN_NULL();
++	} else {
++		RETURN_STRINGL(decoded, decoded_len, 0);
++	}
++}
++/* }}} */
++
++
++/* {{{ proto array sqlite_single_query(resource db, string query [, bool first_row_only [, bool decode_binary]])
++   Executes a query and returns either an array for one single column or the value of the first row. */
++PHP_FUNCTION(sqlite_single_query)
++{
++	zval *zdb, *ent;
++	struct php_sqlite_db *db;
++	struct php_sqlite_result *rres;
++	char *sql;
++	int sql_len;
++	char *errtext = NULL;
++	zend_bool decode_binary = 1;
++	zend_bool srow = 1;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bb", &sql, &sql_len, &srow, &decode_binary)) {
++			return;
++		}
++		RES_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
++				ZEND_NUM_ARGS() TSRMLS_CC, "sr|bb", &sql, &sql_len, &zdb, &srow, &decode_binary) &&
++			FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|bb", &zdb, &sql, &sql_len, &srow, &decode_binary)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	PHP_SQLITE_EMPTY_QUERY;
++
++	/* avoid doing work if we can */
++	if (!return_value_used) {
++		db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
++
++		if (db->last_err_code != SQLITE_OK) {
++			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
++			sqlite_freemem(errtext);
++		}
++		return;
++	}
++
++	rres = (struct php_sqlite_result *)ecalloc(1, sizeof(*rres));
++	sqlite_query(NULL, db, sql, sql_len, PHPSQLITE_NUM, 0, NULL, &rres, NULL TSRMLS_CC);
++	if (db->last_err_code != SQLITE_OK) {
++		if (rres) {
++			efree(rres);
++		}
++		RETURN_FALSE;
++	}
++
++	if (!srow) {
++		array_init(return_value);
++	}
++
++	while (rres->curr_row < rres->nrows) {
++		MAKE_STD_ZVAL(ent);
++		php_sqlite_fetch_single(rres, decode_binary, ent TSRMLS_CC);
++
++		/* if set and we only have 1 row in the result set, return the result as a string. */
++		if (srow) {
++			if (rres->curr_row == 1 && rres->curr_row >= rres->nrows) {
++				*return_value = *ent;
++				zval_copy_ctor(return_value);
++				zval_dtor(ent);
++				FREE_ZVAL(ent);
++				break;
++			} else {
++				srow = 0;
++				array_init(return_value);
++			}
++		}
++		add_next_index_zval(return_value, ent);
++	}
++
++	real_result_dtor(rres TSRMLS_CC);
++}
++/* }}} */
++
++
++/* {{{ proto string sqlite_fetch_single(resource result [, bool decode_binary])
++   Fetches the first column of a result set as a string. */
++PHP_FUNCTION(sqlite_fetch_single)
++{
++	zval *zres;
++	zend_bool decode_binary = 1;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &decode_binary)) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|b", &zres, &decode_binary)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	php_sqlite_fetch_single(res, decode_binary, return_value TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto array sqlite_current(resource result [, int result_type [, bool decode_binary]])
++   Fetches the current row from a result set as an array. */
++PHP_FUNCTION(sqlite_current)
++{
++	zval *zres;
++	long mode = PHPSQLITE_BOTH;
++	zend_bool decode_binary = 1;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (ZEND_NUM_ARGS() && FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lb", &mode, &decode_binary)) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++		if (!ZEND_NUM_ARGS()) {
++			mode = res->mode;
++		}
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|lb", &zres, &mode, &decode_binary)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++		if (ZEND_NUM_ARGS() < 2) {
++			mode = res->mode;
++		}
++	}
++
++	php_sqlite_fetch_array(res, mode, decode_binary, 0, return_value TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto mixed sqlite_column(resource result, mixed index_or_name [, bool decode_binary])
++   Fetches a column from the current row of a result set. */
++PHP_FUNCTION(sqlite_column)
++{
++	zval *zres;
++	zval *which;
++	zend_bool decode_binary = 1;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &which, &decode_binary)) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|b", &zres, &which, &decode_binary)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	php_sqlite_fetch_column(res, which, decode_binary, return_value TSRMLS_CC);
++}
++/* }}} */
++
++/* {{{ proto string sqlite_libversion()
++   Returns the version of the linked SQLite library. */
++PHP_FUNCTION(sqlite_libversion)
++{
++	if (zend_parse_parameters_none() == FAILURE) {
++		return;
++	}
++	RETURN_STRING((char*)sqlite_libversion(), 1);
++}
++/* }}} */
++
++/* {{{ proto string sqlite_libencoding()
++   Returns the encoding (iso8859 or UTF-8) of the linked SQLite library. */
++PHP_FUNCTION(sqlite_libencoding)
++{
++	if (zend_parse_parameters_none() == FAILURE) {
++		return;
++	}
++	RETURN_STRING((char*)sqlite_libencoding(), 1);
++}
++/* }}} */
++
++/* {{{ proto int sqlite_changes(resource db)
++   Returns the number of rows that were changed by the most recent SQL statement. */
++PHP_FUNCTION(sqlite_changes)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	RETURN_LONG(sqlite_changes(db->db));
++}
++/* }}} */
++
++/* {{{ proto int sqlite_last_insert_rowid(resource db)
++   Returns the rowid of the most recently inserted row. */
++PHP_FUNCTION(sqlite_last_insert_rowid)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	RETURN_LONG(sqlite_last_insert_rowid(db->db));
++}
++/* }}} */
++
++static int sqlite_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
++{
++	sqlite_object *obj = (sqlite_object*) zend_object_store_get_object(object TSRMLS_CC);
++
++	if (obj->u.res == NULL) {
++		zend_throw_exception(sqlite_ce_exception, "Row count is not available for this query", 0 TSRMLS_CC);
++		return FAILURE;
++	}
++
++	if (obj->u.res->buffered) {
++		* count = obj->u.res->nrows;
++		return SUCCESS;
++	} else {
++		zend_throw_exception(sqlite_ce_exception, "Row count is not available for unbuffered queries", 0 TSRMLS_CC);
++		return FAILURE;
++	}
++} /* }}} */
++
++/* {{{ proto int sqlite_num_rows(resource result)
++   Returns the number of rows in a buffered result set. */
++PHP_FUNCTION(sqlite_num_rows)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	if (res->buffered) {
++		RETURN_LONG(res->nrows);
++	} else {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Row count is not available for unbuffered queries");
++		RETURN_FALSE;
++	}
++}
++/* }}} */
++
++/* {{{ proto bool sqlite_valid(resource result)
++   Returns whether more rows are available. */
++PHP_FUNCTION(sqlite_valid)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	RETURN_BOOL(res->curr_row < res->nrows && res->nrows); /* curr_row may be -1 */
++}
++/* }}} */
++
++/* {{{ proto bool sqlite_has_prev(resource result)
++ * Returns whether a previous row is available. */
++PHP_FUNCTION(sqlite_has_prev)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	if(!res->buffered) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "you cannot use sqlite_has_prev on unbuffered querys");
++		RETURN_FALSE;
++	}
++
++	RETURN_BOOL(res->curr_row);
++}
++/* }}} */
++
++/* {{{ proto int sqlite_num_fields(resource result)
++   Returns the number of fields in a result set. */
++PHP_FUNCTION(sqlite_num_fields)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	RETURN_LONG(res->ncolumns);
++}
++/* }}} */
++
++/* {{{ proto string sqlite_field_name(resource result, int field_index)
++   Returns the name of a particular field of a result set. */
++PHP_FUNCTION(sqlite_field_name)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	long field;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &field)) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zres, &field)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	if (field < 0 || field >= res->ncolumns) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "field %ld out of range", field);
++		RETURN_FALSE;
++	}
++
++	RETURN_STRING(res->col_names[field], 1);
++}
++/* }}} */
++
++/* {{{ proto bool sqlite_seek(resource result, int row)
++   Seek to a particular row number of a buffered result set. */
++PHP_FUNCTION(sqlite_seek)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	long row;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &row)) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zres, &row)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	if (!res->buffered) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot seek an unbuffered result set");
++		RETURN_FALSE;
++	}
++
++	if (row < 0 || row >= res->nrows) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "row %ld out of range", row);
++		RETURN_FALSE;
++	}
++
++	res->curr_row = row;
++	RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ proto bool sqlite_rewind(resource result)
++   Seek to the first row number of a buffered result set. */
++PHP_FUNCTION(sqlite_rewind)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	if (!res->buffered) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot rewind an unbuffered result set");
++		RETURN_FALSE;
++	}
++
++	if (!res->nrows) {
++		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "no rows received");
++		RETURN_FALSE;
++	}
++
++	res->curr_row = 0;
++	RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ proto bool sqlite_next(resource result)
++   Seek to the next row number of a result set. */
++PHP_FUNCTION(sqlite_next)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	if (!res->buffered && res->vm) {
++		php_sqlite_fetch(res TSRMLS_CC);
++	}
++
++	if (res->curr_row >= res->nrows) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "no more rows available");
++		RETURN_FALSE;
++	}
++
++	res->curr_row++;
++
++	RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ proto int sqlite_key(resource result)
++   Return the current row index of a buffered result. */
++PHP_FUNCTION(sqlite_key)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	RETURN_LONG(res->curr_row);
++}
++/* }}} */
++
++/* {{{ proto bool sqlite_prev(resource result)
++ * Seek to the previous row number of a result set. */
++PHP_FUNCTION(sqlite_prev)
++{
++	zval *zres;
++	struct php_sqlite_result *res;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		RES_FROM_OBJECT(res, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zres)) {
++			return;
++		}
++		ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, &zres, -1, "sqlite result", le_sqlite_result);
++	}
++
++	if (!res->buffered) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "you cannot use sqlite_prev on unbuffered querys");
++		RETURN_FALSE;
++	}
++
++	if (res->curr_row <= 0) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "no previous row available");
++		RETURN_FALSE;
++	}
++
++	res->curr_row--;
++
++	RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ proto string sqlite_escape_string(string item)
++   Escapes a string for use as a query parameter. */
++PHP_FUNCTION(sqlite_escape_string)
++{
++	char *string = NULL;
++	int stringlen;
++	char *ret;
++
++	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &stringlen)) {
++		return;
++	}
++
++	if (stringlen && (string[0] == '\x01' || memchr(string, '\0', stringlen) != NULL)) {
++		/* binary string */
++		int enclen;
++
++		ret = safe_emalloc(1 + stringlen / 254, 257, 3);
++		ret[0] = '\x01';
++		enclen = php_sqlite_encode_binary(string, stringlen, ret+1);
++		RETVAL_STRINGL(ret, enclen+1, 0);
++
++	} else if (stringlen) {
++		ret = sqlite_mprintf("%q", string);
++		if (ret) {
++			RETVAL_STRING(ret, 1);
++			sqlite_freemem(ret);
++		}
++	} else {
++		RETURN_EMPTY_STRING();
++	}
++}
++/* }}} */
++
++/* {{{ proto int sqlite_last_error(resource db)
++   Returns the error code of the last error for a database. */
++PHP_FUNCTION(sqlite_last_error)
++{
++	zval *zdb;
++	struct php_sqlite_db *db;
++	zval *object = getThis();
++
++	if (object) {
++		if (zend_parse_parameters_none() == FAILURE) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zdb)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	RETURN_LONG(db->last_err_code);
++}
++/* }}} */
++
++/* {{{ proto string sqlite_error_string(int error_code)
++   Returns the textual description of an error code. */
++PHP_FUNCTION(sqlite_error_string)
++{
++	long code;
++	const char *msg;
++
++	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
++		return;
++	}
++
++	msg = sqlite_error_string(code);
++
++	if (msg) {
++		RETURN_STRING((char*)msg, 1);
++	} else {
++		RETURN_NULL();
++	}
++}
++/* }}} */
++
++/* manages duplicate registrations of a particular function, and
++ * also handles the case where the db is using a persistent connection */
++enum callback_prep_t { DO_REG, SKIP_REG, ERR };
++
++static enum callback_prep_t prep_callback_struct(struct php_sqlite_db *db, int is_agg,
++		char *funcname,
++		zval *step, zval *fini, struct php_sqlite_agg_functions **funcs)
++{
++	struct php_sqlite_agg_functions *alloc_funcs, func_tmp;
++	char *hashkey;
++	int hashkeylen;
++	enum callback_prep_t ret;
++
++	hashkeylen = spprintf(&hashkey, 0, "%s-%s", is_agg ? "agg" : "reg", funcname);
++
++	/* is it already registered ? */
++	if (SUCCESS == zend_hash_find(&db->callbacks, hashkey, hashkeylen+1, (void*)&alloc_funcs)) {
++		/* override the previous definition */
++
++		if (alloc_funcs->is_valid) {
++			/* release these */
++
++			if (alloc_funcs->step) {
++				zval_ptr_dtor(&alloc_funcs->step);
++				alloc_funcs->step = NULL;
++			}
++
++			if (alloc_funcs->fini) {
++				zval_ptr_dtor(&alloc_funcs->fini);
++				alloc_funcs->fini = NULL;
++			}
++		}
++
++		ret = SKIP_REG;
++	} else {
++		/* add a new one */
++		func_tmp.db = db;
++
++		ret = SUCCESS == zend_hash_update(&db->callbacks, hashkey, hashkeylen+1,
++				(void*)&func_tmp, sizeof(func_tmp), (void**)&alloc_funcs) ? DO_REG : ERR;
++	}
++
++	efree(hashkey);
++
++	MAKE_STD_ZVAL(alloc_funcs->step);
++	*(alloc_funcs->step)  = *step;
++	zval_copy_ctor(alloc_funcs->step);
++	INIT_PZVAL(alloc_funcs->step);
++
++	if (is_agg) {
++		MAKE_STD_ZVAL(alloc_funcs->fini);
++		*(alloc_funcs->fini) = *fini;
++		zval_copy_ctor(alloc_funcs->fini);
++		INIT_PZVAL(alloc_funcs->fini);
++	} else {
++		alloc_funcs->fini = NULL;
++	}
++	alloc_funcs->is_valid = 1;
++	*funcs = alloc_funcs;
++
++	return ret;
++}
++
++
++/* {{{ proto bool sqlite_create_aggregate(resource db, string funcname, mixed step_func, mixed finalize_func[, long num_args])
++    Registers an aggregate function for queries. */
++PHP_FUNCTION(sqlite_create_aggregate)
++{
++	char *funcname = NULL;
++	int funcname_len;
++	zval *zstep, *zfinal, *zdb;
++	struct php_sqlite_db *db;
++	struct php_sqlite_agg_functions *funcs;
++	char *callable = NULL;
++	long num_args = -1;
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szz|l", &funcname, &funcname_len, &zstep, &zfinal, &num_args)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rszz|l", &zdb, &funcname, &funcname_len, &zstep, &zfinal, &num_args)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	if (!zend_is_callable(zstep, 0, &callable TSRMLS_CC)) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "step function `%s' is not callable", callable);
++		efree(callable);
++		return;
++	}
++	efree(callable);
++
++	if (!zend_is_callable(zfinal, 0, &callable TSRMLS_CC)) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "finalize function `%s' is not callable", callable);
++		efree(callable);
++		return;
++	}
++	efree(callable);
++
++
++	if (prep_callback_struct(db, 1, funcname, zstep, zfinal, &funcs) == DO_REG) {
++		sqlite_create_aggregate(db->db, funcname, num_args,
++				php_sqlite_agg_step_function_callback,
++				php_sqlite_agg_fini_function_callback, funcs);
++	}
++
++
++}
++/* }}} */
++
++/* {{{ proto bool sqlite_create_function(resource db, string funcname, mixed callback[, long num_args])
++    Registers a "regular" function for queries. */
++PHP_FUNCTION(sqlite_create_function)
++{
++	char *funcname = NULL;
++	int funcname_len;
++	zval *zcall, *zdb;
++	struct php_sqlite_db *db;
++	struct php_sqlite_agg_functions *funcs;
++	char *callable = NULL;
++	long num_args = -1;
++
++	zval *object = getThis();
++
++	if (object) {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &funcname, &funcname_len, &zcall, &num_args)) {
++			return;
++		}
++		DB_FROM_OBJECT(db, object);
++	} else {
++		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz|l", &zdb, &funcname, &funcname_len, &zcall, &num_args)) {
++			return;
++		}
++		DB_FROM_ZVAL(db, &zdb);
++	}
++
++	if (!zend_is_callable(zcall, 0, &callable TSRMLS_CC)) {
++		php_error_docref(NULL TSRMLS_CC, E_WARNING, "function `%s' is not callable", callable);
++		efree(callable);
++		return;
++	}
++	efree(callable);
++
++	if (prep_callback_struct(db, 0, funcname, zcall, NULL, &funcs) == DO_REG) {
++		sqlite_create_function(db->db, funcname, num_args, php_sqlite_function_callback, funcs);
++	}
++}
++/* }}} */
++
++/* {{{ proto string sqlite_udf_encode_binary(string data)
++   Apply binary encoding (if required) to a string to return from an UDF. */
++PHP_FUNCTION(sqlite_udf_encode_binary)
++{
++	char *data = NULL;
++	int datalen;
++
++	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
++		return;
++	}
++
++	if (data == NULL) {
++		RETURN_NULL();
++	}
++	if (datalen && (data[0] == '\x01' || memchr(data, '\0', datalen) != NULL)) {
++		/* binary string */
++		int enclen;
++		char *ret;
++
++		ret = safe_emalloc(1 + datalen / 254, 257, 3);
++		ret[0] = '\x01';
++		enclen = php_sqlite_encode_binary(data, datalen, ret+1);
++		RETVAL_STRINGL(ret, enclen+1, 0);
++	} else {
++		RETVAL_STRINGL(data, datalen, 1);
++	}
++}
++/* }}} */
++
++/* {{{ proto string sqlite_udf_decode_binary(string data)
++   Decode binary encoding on a string parameter passed to an UDF. */
++PHP_FUNCTION(sqlite_udf_decode_binary)
++{
++	char *data = NULL;
++	int datalen;
++
++	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
++		return;
++	}
++
++	if (data == NULL) {
++		RETURN_NULL();
++	}
++	if (datalen && data[0] == '\x01') {
++		/* encoded string */
++		int enclen;
++		char *ret;
++
++		ret = emalloc(datalen);
++		enclen = php_sqlite_decode_binary(data+1, ret);
++		ret[enclen] = '\0';
++		RETVAL_STRINGL(ret, enclen, 0);
++	} else {
++		RETVAL_STRINGL(data, datalen, 1);
++	}
++}
++/* }}} */
++
++
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: sw=4 ts=4 fdm=marker
++ * vim<600: sw=4 ts=4
++ */
+--- /dev/null
++++ b/ext/sqlite/sqlite.dsp
+@@ -0,0 +1,339 @@
++# Microsoft Developer Studio Project File - Name="sqlite" - Package Owner=<4>
++# Microsoft Developer Studio Generated Build File, Format Version 6.00
++# ** DO NOT EDIT **
++
++# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
++
++CFG=sqlite - Win32 Debug_TS
++!MESSAGE This is not a valid makefile. To build this project using NMAKE,
++!MESSAGE use the Export Makefile command and run
++!MESSAGE 
++!MESSAGE NMAKE /f "sqlite.mak".
++!MESSAGE 
++!MESSAGE You can specify a configuration when running NMAKE
++!MESSAGE by defining the macro CFG on the command line. For example:
++!MESSAGE 
++!MESSAGE NMAKE /f "sqlite.mak" CFG="sqlite - Win32 Debug_TS"
++!MESSAGE 
++!MESSAGE Possible choices for configuration are:
++!MESSAGE 
++!MESSAGE "sqlite - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
++!MESSAGE "sqlite - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
++!MESSAGE 
++
++# Begin Project
++# PROP AllowPerConfigDependencies 0
++# PROP Scc_ProjName ""
++# PROP Scc_LocalPath ""
++CPP=cl.exe
++MTL=midl.exe
++RSC=rc.exe
++
++!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
++
++# PROP BASE Use_MFC 0
++# PROP BASE Use_Debug_Libraries 0
++# PROP BASE Output_Dir "Release_TS"
++# PROP BASE Intermediate_Dir "Release_TS"
++# PROP BASE Ignore_Export_Lib 0
++# PROP BASE Target_Dir ""
++# PROP Use_MFC 0
++# PROP Use_Debug_Libraries 0
++# PROP Output_Dir "Release_TS"
++# PROP Intermediate_Dir "Release_TS"
++# PROP Ignore_Export_Lib 0
++# PROP Target_Dir ""
++# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /c
++# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /FR /YX /FD /c
++# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
++# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
++# ADD BASE RSC /l 0x407 /d "NDEBUG"
++# ADD RSC /l 0x407 /d "NDEBUG"
++BSC32=bscmake.exe
++# ADD BASE BSC32 /nologo
++# ADD BSC32 /nologo
++LINK32=link.exe
++# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
++# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_sqlite.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
++
++!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
++
++# PROP BASE Use_MFC 0
++# PROP BASE Use_Debug_Libraries 1
++# PROP BASE Output_Dir "Debug_TS"
++# PROP BASE Intermediate_Dir "Debug_TS"
++# PROP BASE Target_Dir ""
++# PROP Use_MFC 0
++# PROP Use_Debug_Libraries 1
++# PROP Output_Dir "Debug_TS"
++# PROP Intermediate_Dir "Debug_TS"
++# PROP Ignore_Export_Lib 0
++# PROP Target_Dir ""
++# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /GZ /c
++# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /YX /FD /GZ /c
++# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
++# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
++# ADD BASE RSC /l 0x407 /d "_DEBUG"
++# ADD RSC /l 0x407 /d "_DEBUG"
++BSC32=bscmake.exe
++# ADD BASE BSC32 /nologo
++# ADD BSC32 /nologo
++LINK32=link.exe
++# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
++# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_sqlite.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
++
++!ENDIF 
++
++# Begin Target
++
++# Name "sqlite - Win32 Release_TS"
++# Name "sqlite - Win32 Debug_TS"
++# Begin Group "Source Files"
++
++# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
++# Begin Group "libsqlite"
++
++# PROP Default_Filter ""
++# Begin Source File
++
++SOURCE=.\libsqlite\src\attach.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\auth.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\btree.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\btree.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\btree_rb.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\build.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\config.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\copy.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\date.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\delete.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\encode.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\expr.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\func.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\hash.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\hash.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\insert.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\main.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\opcodes.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\opcodes.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\os.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\os.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\pager.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\pager.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\parse.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\parse.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\pragma.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\printf.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\random.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\select.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\sqlite.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\sqlite.w32.h
++
++!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
++
++# Begin Custom Build
++InputDir=.\libsqlite\src
++InputPath=.\libsqlite\src\sqlite.w32.h
++
++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\sqlite.h
++
++# End Custom Build
++
++!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
++
++# Begin Custom Build
++InputDir=.\libsqlite\src
++InputPath=.\libsqlite\src\sqlite.w32.h
++
++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\sqlite.h
++
++# End Custom Build
++
++!ENDIF 
++
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\sqlite_config.w32.h
++
++!IF  "$(CFG)" == "sqlite - Win32 Release_TS"
++
++# Begin Custom Build
++InputDir=.\libsqlite\src
++InputPath=.\libsqlite\src\sqlite_config.w32.h
++
++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\config.h
++
++# End Custom Build
++
++!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"
++
++# Begin Custom Build
++InputDir=.\libsqlite\src
++InputPath=.\libsqlite\src\sqlite_config.w32.h
++
++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
++	copy $(InputPath) $(InputDir)\config.h
++
++# End Custom Build
++
++!ENDIF 
++
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\sqliteInt.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\table.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\tokenize.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\trigger.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\update.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\util.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\vacuum.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\vdbe.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\vdbe.h
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\vdbeaux.c
++# End Source File
++# Begin Source File
++
++SOURCE=.\libsqlite\src\where.c
++# End Source File
++# End Group
++# Begin Source File
++
++SOURCE=.\php_sqlite.def
++# End Source File
++# Begin Source File
++
++SOURCE=.\sqlite.c
++# ADD CPP /I "libsqlite\src"
++# End Source File
++# End Group
++# Begin Group "Header Files"
++
++# PROP Default_Filter "h;hpp;hxx;hm;inl"
++# Begin Source File
++
++SOURCE=.\php_sqlite.h
++# End Source File
++# End Group
++# End Target
++# End Project
+--- /dev/null
++++ b/ext/sqlite/sqlite.php
+@@ -0,0 +1,36 @@
++<?php
++if (!extension_loaded("sqlite")) {
++	dl("sqlite.so");
++	if (!extension_loaded("sqlite")) {
++		exit("Please enable SQLite support\n");
++	}
++}
++
++debug_zval_dump(sqlite_libversion());
++debug_zval_dump(sqlite_libencoding());
++
++$s = sqlite_open("weztest.sqlite", 0666, $err);
++
++debug_zval_dump($err);
++debug_zval_dump($s);
++
++$r = sqlite_query("create table foo (a INTEGER PRIMARY KEY, b INTEGER )", $s);
++debug_zval_dump(sqlite_last_error($s));
++debug_zval_dump(sqlite_error_string(sqlite_last_error($s)));
++
++$r = sqlite_query("select *, php('md5', sql) as o from sqlite_master", $s);
++debug_zval_dump($r);
++debug_zval_dump(sqlite_num_rows($r));
++debug_zval_dump(sqlite_num_fields($r));
++
++for ($j = 0; $j < sqlite_num_fields($r); $j++) {
++	echo "Field $j is " . sqlite_field_name($r, $j) . "\n";
++}
++
++while ($row = sqlite_fetch_array($r, SQLITE_ASSOC)) {
++	print_r($row);
++}
++
++sqlite_close($s);
++
++?>
+--- /dev/null
++++ b/ext/sqlite/tests/blankdb.inc
+@@ -0,0 +1,3 @@
++<?php #vim:ft=php
++$db = sqlite_open(":memory:");
++?>
+--- /dev/null
++++ b/ext/sqlite/tests/blankdb_oo.inc
+@@ -0,0 +1,3 @@
++<?php #vim:ft=php
++$db = new SQLiteDatabase(":memory:");
++?>
+--- /dev/null
++++ b/ext/sqlite/tests/bug26911.phpt
+@@ -0,0 +1,12 @@
++--TEST--
++Bug #26911 (crash when fetching data from empty queries)
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php
++	$db = sqlite_open(":memory:");
++	$a = sqlite_query($db, "  ");
++	echo "I am ok\n";
++?>
++--EXPECT--
++I am ok
+--- /dev/null
++++ b/ext/sqlite/tests/bug28112.phpt
+@@ -0,0 +1,16 @@
++--TEST--
++Bug #28112 (sqlite_query() crashing apache on malformed query)
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php
++
++if (!($db = sqlite_open(":memory:", 666, $error))) die ("Couldn't open the database");
++sqlite_query($db, "create table frob (foo INTEGER PRIMARY KEY, bar text);");
++$res = @sqlite_array_query($db, "");
++
++?>
++===DONE===
++<?php exit(0); ?>
++--EXPECTF--
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/bug35248.phpt
+@@ -0,0 +1,15 @@
++--TEST--
++Bug #35248 (sqlite_query does not return parse error message)
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php
++	$db = sqlite_open(":memory:");
++	$res = @sqlite_query($db, "asdfesdfa", SQLITE_NUM, $err);
++	var_dump($err);
++	$res = @sqlite_unbuffered_query($db, "asdfesdfa", SQLITE_NUM, $err);
++	var_dump($err);
++?>
++--EXPECT--
++string(30) "near "asdfesdfa": syntax error"
++string(30) "near "asdfesdfa": syntax error"
+--- /dev/null
++++ b/ext/sqlite/tests/bug38759.phpt
+@@ -0,0 +1,18 @@
++--TEST--
++Bug #38759 (sqlite2 empty query causes segfault)
++--SKIPIF--
++<?php 
++if (!extension_loaded("pdo")) print "skip"; 
++if (!extension_loaded("sqlite")) print "skip"; 
++?>
++--FILE--
++<?php
++
++$dbh = new PDO('sqlite2::memory:');
++var_dump($dbh->query(" "));
++
++echo "Done\n";
++?>
++--EXPECTF--	
++bool(false)
++Done
+--- /dev/null
++++ b/ext/sqlite/tests/bug48679.phpt
+@@ -0,0 +1,20 @@
++--TEST--
++Bug #48679 (sqlite2 count on unbuffered query causes segfault)
++--SKIPIF--
++<?php 
++if (!extension_loaded("sqlite")) print "skip"; 
++?>
++--FILE--
++<?php
++
++try {
++	$x = new sqliteunbuffered;
++	count($x);
++} catch (SQLiteException $e) {
++	var_dump($e->getMessage());
++}
++echo "Done\n";
++?>
++--EXPECT--	
++string(41) "Row count is not available for this query"
++Done
+--- /dev/null
++++ b/ext/sqlite/tests/pdo/common.phpt
+@@ -0,0 +1,12 @@
++--TEST--
++SQLite2
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded('pdo') || !extension_loaded('sqlite')) print 'skip'; ?>
++--REDIRECTTEST--
++return array(
++	'ENV' => array(
++			'PDOTEST_DSN' => 'sqlite2::memory:'
++		),
++	'TESTS' => 'ext/pdo/tests'
++	);
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_001.phpt
+@@ -0,0 +1,16 @@
++--TEST--
++sqlite: sqlite_open/close
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++require_once('blankdb.inc');
++echo "$db\n";
++sqlite_close($db);
++echo "Done\n";
++?>
++--EXPECTF--
++Resource id #%d
++Done
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_002.phpt
+@@ -0,0 +1,32 @@
++--TEST--
++sqlite: Simple insert/select
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++sqlite_query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))", $db);
++sqlite_query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)", $db);
++$r = sqlite_query("SELECT * from foo", $db);
++var_dump(sqlite_fetch_array($r));
++sqlite_close($db);
++?>
++--EXPECT--
++array(6) {
++  [0]=>
++  string(10) "2002-01-02"
++  ["c1"]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  ["c2"]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++  ["c3"]=>
++  NULL
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_003.phpt
+@@ -0,0 +1,52 @@
++--TEST--
++sqlite: Simple insert/select, different result represenatation
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++sqlite_query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))", $db);
++sqlite_query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)", $db);
++$r = sqlite_query("SELECT * from foo", $db);
++var_dump(sqlite_fetch_array($r, SQLITE_BOTH));
++$r = sqlite_query("SELECT * from foo", $db);
++var_dump(sqlite_fetch_array($r, SQLITE_NUM));
++$r = sqlite_query("SELECT * from foo", $db);
++var_dump(sqlite_fetch_array($r, SQLITE_ASSOC));
++sqlite_close($db);
++?>
++--EXPECT--
++array(6) {
++  [0]=>
++  string(10) "2002-01-02"
++  ["c1"]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  ["c2"]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++  ["c3"]=>
++  NULL
++}
++array(3) {
++  [0]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++}
++array(3) {
++  ["c1"]=>
++  string(10) "2002-01-02"
++  ["c2"]=>
++  string(8) "12:49:00"
++  ["c3"]=>
++  NULL
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_004.phpt
+@@ -0,0 +1,49 @@
++--TEST--
++sqlite: binary encoding
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$strings = array(
++	"hello",
++	"hello\x01o",
++	"\x01hello there",
++	"hello\x00there",
++	""
++);
++
++sqlite_query("CREATE TABLE strings(a)", $db);
++
++foreach ($strings as $str) {
++	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($str) . "')", $db);
++}
++
++$i = 0;
++$r = sqlite_query("SELECT * from strings", $db);
++while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
++	if ($row[0] !== $strings[$i]) {
++		echo "FAIL!\n";
++		var_dump($row[0]);
++		var_dump($strings[$i]);
++	} else {
++		echo "OK!\n";
++	}
++	$i++;
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++OK!
++OK!
++OK!
++OK!
++OK!
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_005.phpt
+@@ -0,0 +1,50 @@
++--TEST--
++sqlite: aggregate functions
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($str) . "')", $db);
++}
++
++function cat_step(&$context, $string)
++{
++	$context .= $string;
++}
++
++function cat_fin(&$context)
++{
++	return $context;
++}
++
++sqlite_create_aggregate($db, "cat", "cat_step", "cat_fin");
++
++$r = sqlite_query("SELECT cat(a) from strings", $db);
++while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
++	var_dump($row);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(11) "onetwothree"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_006.phpt
+@@ -0,0 +1,55 @@
++--TEST--
++sqlite: regular functions
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	array("one", "uno"),
++	array("two", "dos"),
++	array("three", "tres"),
++	);
++
++sqlite_query("CREATE TABLE strings(a,b)", $db);
++
++function implode_args()
++{
++	$args = func_get_args();
++	$sep = array_shift($args);
++	return implode($sep, $args);
++}
++
++foreach ($data as $row) {
++	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($row[0]) . "','" . sqlite_escape_string($row[1]) . "')", $db);
++}
++
++sqlite_create_function($db, "implode", "implode_args");
++
++$r = sqlite_query("SELECT implode('-', a, b) from strings", $db);
++while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
++	var_dump($row);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(7) "one-uno"
++}
++array(1) {
++  [0]=>
++  string(7) "two-dos"
++}
++array(1) {
++  [0]=>
++  string(10) "three-tres"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_007.phpt
+@@ -0,0 +1,52 @@
++--TEST--
++sqlite: Simple insert/select (unbuffered)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++sqlite_query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))", $db);
++sqlite_query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)", $db);
++$r = sqlite_unbuffered_query("SELECT * from foo", $db);
++var_dump(sqlite_fetch_array($r, SQLITE_BOTH));
++$r = sqlite_unbuffered_query("SELECT * from foo", $db);
++var_dump(sqlite_fetch_array($r, SQLITE_NUM));
++$r = sqlite_unbuffered_query("SELECT * from foo", $db);
++var_dump(sqlite_fetch_array($r, SQLITE_ASSOC));
++sqlite_close($db);
++?>
++--EXPECT--
++array(6) {
++  [0]=>
++  string(10) "2002-01-02"
++  ["c1"]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  ["c2"]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++  ["c3"]=>
++  NULL
++}
++array(3) {
++  [0]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++}
++array(3) {
++  ["c1"]=>
++  string(10) "2002-01-02"
++  ["c2"]=>
++  string(8) "12:49:00"
++  ["c3"]=>
++  NULL
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_008.phpt
+@@ -0,0 +1,46 @@
++--TEST--
++sqlite: fetch all (buffered)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
++}
++
++$r = sqlite_query("SELECT a from strings", $db);
++while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
++	var_dump($row);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_009.phpt
+@@ -0,0 +1,46 @@
++--TEST--
++sqlite: fetch all (unbuffered)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
++}
++
++$r = sqlite_unbuffered_query("SELECT a from strings", $db);
++while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
++	var_dump($row);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_010.phpt
+@@ -0,0 +1,81 @@
++--TEST--
++sqlite: fetch all (iterator)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
++}
++
++$r = sqlite_unbuffered_query("SELECT a from strings", $db);
++while (sqlite_valid($r)) {
++	var_dump(sqlite_current($r, SQLITE_NUM));
++	sqlite_next($r);
++}
++$r = sqlite_query("SELECT a from strings", $db);
++while (sqlite_valid($r)) {
++	var_dump(sqlite_current($r, SQLITE_NUM));
++	sqlite_next($r);
++}
++sqlite_rewind($r);
++while (sqlite_valid($r)) {
++	var_dump(sqlite_current($r, SQLITE_NUM));
++	sqlite_next($r);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_011.phpt
+@@ -0,0 +1,34 @@
++--TEST--
++sqlite: returned associative column names
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++sqlite_query("CREATE TABLE foo (c1 char, c2 char, c3 char)", $db);
++sqlite_query("CREATE TABLE bar (c1 char, c2 char, c3 char)", $db);
++sqlite_query("INSERT INTO foo VALUES ('1', '2', '3')", $db);
++sqlite_query("INSERT INTO bar VALUES ('4', '5', '6')", $db);
++$r = sqlite_query("SELECT * from foo, bar", $db, SQLITE_ASSOC);
++var_dump(sqlite_fetch_array($r));
++sqlite_close($db);
++?>
++--EXPECT--
++array(6) {
++  ["foo.c1"]=>
++  string(1) "1"
++  ["foo.c2"]=>
++  string(1) "2"
++  ["foo.c3"]=>
++  string(1) "3"
++  ["bar.c1"]=>
++  string(1) "4"
++  ["bar.c2"]=>
++  string(1) "5"
++  ["bar.c3"]=>
++  string(1) "6"
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_012.phpt
+@@ -0,0 +1,38 @@
++--TEST--
++sqlite: read field names
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++sqlite_query("CREATE TABLE strings(foo VARCHAR, bar VARCHAR, baz VARCHAR)", $db);
++
++echo "Buffered\n";
++$r = sqlite_query("SELECT * from strings", $db);
++for($i=0; $i<sqlite_num_fields($r); $i++) {
++	var_dump(sqlite_field_name($r, $i));
++}
++echo "Unbuffered\n";
++$r = sqlite_unbuffered_query("SELECT * from strings", $db);
++for($i=0; $i<sqlite_num_fields($r); $i++) {
++	var_dump(sqlite_field_name($r, $i));
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++Buffered
++string(3) "foo"
++string(3) "bar"
++string(3) "baz"
++Unbuffered
++string(3) "foo"
++string(3) "bar"
++string(3) "baz"
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_013.phpt
+@@ -0,0 +1,78 @@
++--TEST--
++sqlite: fetch column
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	array (0 => 'one', 1 => 'two'),
++	array (0 => 'three', 1 => 'four')
++	);
++
++sqlite_query("CREATE TABLE strings(a VARCHAR, b VARCHAR)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')", $db);
++}
++
++echo "====BUFFERED====\n";
++$r = sqlite_query("SELECT a, b from strings", $db);
++while (sqlite_valid($r)) {
++	var_dump(sqlite_current($r, SQLITE_NUM));
++	var_dump(sqlite_column($r, 0));
++	var_dump(sqlite_column($r, 1));
++	var_dump(sqlite_column($r, 'a'));
++	var_dump(sqlite_column($r, 'b'));
++	sqlite_next($r);
++}
++echo "====UNBUFFERED====\n";
++$r = sqlite_unbuffered_query("SELECT a, b from strings", $db);
++while (sqlite_valid($r)) {
++	var_dump(sqlite_column($r, 0));
++	var_dump(sqlite_column($r, 'b'));
++	var_dump(sqlite_column($r, 1));
++	var_dump(sqlite_column($r, 'a'));
++	sqlite_next($r);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++====BUFFERED====
++array(2) {
++  [0]=>
++  string(3) "one"
++  [1]=>
++  string(3) "two"
++}
++string(3) "one"
++string(3) "two"
++string(3) "one"
++string(3) "two"
++array(2) {
++  [0]=>
++  string(5) "three"
++  [1]=>
++  string(4) "four"
++}
++string(5) "three"
++string(4) "four"
++string(5) "three"
++string(4) "four"
++====UNBUFFERED====
++string(3) "one"
++string(3) "two"
++NULL
++NULL
++string(5) "three"
++string(4) "four"
++NULL
++NULL
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_014.phpt
+@@ -0,0 +1,120 @@
++--TEST--
++sqlite: fetch all (fetch_all)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
++}
++
++echo "unbuffered twice\n";
++$r = sqlite_unbuffered_query("SELECT a from strings", $db, SQLITE_NUM);
++var_dump(sqlite_fetch_all($r));
++var_dump(sqlite_fetch_all($r));
++
++echo "unbuffered with fetch_array\n";
++$r = sqlite_unbuffered_query("SELECT a from strings", $db, SQLITE_NUM);
++var_dump(sqlite_fetch_array($r));
++var_dump(sqlite_fetch_all($r));
++
++echo "buffered\n";
++$r = sqlite_query("SELECT a from strings", $db, SQLITE_NUM);
++var_dump(sqlite_fetch_all($r));
++var_dump(sqlite_fetch_array($r));
++var_dump(sqlite_fetch_all($r));
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECTF--
++unbuffered twice
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++
++Warning: sqlite_fetch_all(): One or more rowsets were already returned; returning NULL this time in %ssqlite_014.php on line %d
++array(0) {
++}
++unbuffered with fetch_array
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(2) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++buffered
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++bool(false)
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_015.phpt
+@@ -0,0 +1,49 @@
++--TEST--
++sqlite: fetch all (array_query)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a VARCHAR)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
++}
++
++$res = sqlite_array_query("SELECT a from strings", $db, SQLITE_NUM);
++var_dump($res);
++
++$db = null;
++
++echo "DONE!\n";
++?>
++--EXPECTF--
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_016.phpt
+@@ -0,0 +1,45 @@
++--TEST--
++sqlite: fetch single
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	array (0 => 'one', 1 => 'two'),
++	array (0 => 'three', 1 => 'four')
++	);
++
++sqlite_query("CREATE TABLE strings(a VARCHAR, b VARCHAR)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')", $db);
++}
++
++echo "====BUFFERED====\n";
++$r = sqlite_query("SELECT a, b from strings", $db);
++while (sqlite_valid($r)) {
++	var_dump(sqlite_fetch_single($r));
++}
++echo "====UNBUFFERED====\n";
++$r = sqlite_unbuffered_query("SELECT a, b from strings", $db);
++while (sqlite_valid($r)) {
++	var_dump(sqlite_fetch_single($r));
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++====BUFFERED====
++string(3) "one"
++string(5) "three"
++====UNBUFFERED====
++string(3) "one"
++string(5) "three"
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_017.phpt
+@@ -0,0 +1,33 @@
++--TEST--
++sqlite: UDF binary handling functions
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++
++$data = array(
++	"hello there",
++	"this has a \x00 char in the middle",
++	"\x01 this has an 0x01 at the start",
++	"this has \x01 in the middle"
++	);
++
++foreach ($data as $item) {
++	$coded = sqlite_udf_encode_binary($item);
++	echo bin2hex($coded) . "\n";
++	$decoded = sqlite_udf_decode_binary($coded);
++	if ($item != $decoded) {
++		echo "FAIL! $item decoded is $decoded\n";
++	}
++}
++
++echo "OK!\n";
++
++?>
++--EXPECT--
++68656c6c6f207468657265
++0101736768721f6760721f601fff1f626760711f686d1f7367641f6c6863636b64
++0102ff1e726667711e665f711e5f6c1e2e762e2f1e5f721e7266631e71725f7072
++7468697320686173200120696e20746865206d6964646c65
++OK!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_018.phpt
+@@ -0,0 +1,14 @@
++--TEST--
++sqlite: crash on bad queries inside sqlite_array_query()
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php
++include "blankdb.inc";
++
++sqlite_array_query($db, "SELECT foo FROM foobar");
++sqlite_close($db);
++?>
++--EXPECTF--
++Warning: sqlite_array_query(): no such table: foobar in %s on line %d
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_019.phpt
+@@ -0,0 +1,47 @@
++--TEST--
++sqlite: single query
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php
++include "blankdb.inc";
++	
++sqlite_query($db, "CREATE TABLE test_db ( id INTEGER PRIMARY KEY, data VARCHAR(100) )");
++for ($i = 0; $i < 10; $i++) {
++	sqlite_query($db, "INSERT INTO test_db (data) VALUES('{$i}data')");
++}
++sqlite_query($db, "INSERT INTO test_db (data) VALUES(NULL)");
++	                                         
++var_dump(sqlite_single_query($db, "SELECT id FROM test_db WHERE id=5"));
++var_dump(sqlite_single_query($db, "SELECT * FROM test_db WHERE id=4"));
++var_dump(sqlite_single_query($db, "SELECT data FROM test_db WHERE id=6"));
++var_dump(sqlite_single_query($db, "SELECT * FROM test_db WHERE id < 5"));
++var_dump(sqlite_single_query($db, "SELECT * FROM test db WHERE id < 4"));
++var_dump(sqlite_single_query($db, "SELECT * FROM test_db WHERE id=999999"));
++var_dump(sqlite_single_query($db, "SELECT id FROM test_db WHERE id=5", FALSE));
++
++sqlite_close($db);
++?>
++--EXPECTF--
++string(1) "5"
++string(1) "4"
++string(5) "5data"
++array(4) {
++  [0]=>
++  string(1) "1"
++  [1]=>
++  string(1) "2"
++  [2]=>
++  string(1) "3"
++  [3]=>
++  string(1) "4"
++}
++
++Warning: sqlite_single_query(): no such table: test in %s on line %d
++bool(false)
++NULL
++array(1) {
++  [0]=>
++  string(1) "5"
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_022.phpt
+@@ -0,0 +1,101 @@
++--TEST--
++sqlite: sqlite_seek
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('$str')", $db);
++}
++
++$res = sqlite_query("SELECT a FROM strings", $db, SQLITE_NUM);
++for ($idx = -1; $idx < 4; $idx++) {
++	echo "====SEEK:$idx====\n";
++	sqlite_seek($res, $idx);
++	var_dump(sqlite_current($res));
++}
++echo "====AGAIN====\n";
++for ($idx = -1; $idx < 4; $idx++) {
++	echo "====SEEK:$idx====\n";
++	sqlite_seek($res, $idx);
++	var_dump(sqlite_current($res));
++}
++
++sqlite_close($db);
++
++echo "====DONE!====\n";
++?>
++--EXPECTF--
++====SEEK:-1====
++
++Warning: sqlite_seek(): row -1 out of range in %ssqlite_022.php on line %d
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++====SEEK:0====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++====SEEK:1====
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++====SEEK:2====
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====SEEK:3====
++
++Warning: sqlite_seek(): row 3 out of range in %ssqlite_022.php on line %d
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====AGAIN====
++====SEEK:-1====
++
++Warning: sqlite_seek(): row -1 out of range in %ssqlite_022.php on line %d
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====SEEK:0====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++====SEEK:1====
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++====SEEK:2====
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====SEEK:3====
++
++Warning: sqlite_seek(): row 3 out of range in %ssqlite_022.php on line %d
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====DONE!====
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_023.phpt
+@@ -0,0 +1,105 @@
++--TEST--
++sqlite: sqlite_[has_]prev
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php
++include "blankdb.inc";
++
++$data = array(
++              "one",
++              "two",
++              "three"
++              );
++
++sqlite_query("CREATE TABLE strings(a)", $db);
++
++foreach ($data as $str) {
++  sqlite_query("INSERT INTO strings VALUES('$str')", $db);
++}
++
++$r = sqlite_query("SELECT a FROM strings", $db, SQLITE_NUM);
++
++echo "====TRAVERSE====\n";
++for(sqlite_rewind($r); sqlite_valid($r); sqlite_next($r)) {
++  var_dump(sqlite_current($r));
++
++}
++echo "====REVERSE====\n";
++do {
++  sqlite_prev($r);
++  var_dump(sqlite_current($r));
++} while(sqlite_has_prev($r));
++
++echo "====UNBUFFERED====\n";
++
++$r = sqlite_unbuffered_query("SELECT a FROM strings", $db, SQLITE_NUM);
++
++echo "====TRAVERSE====\n";
++for(sqlite_rewind($r); sqlite_valid($r); sqlite_next($r)) {
++  var_dump(sqlite_current($r));
++
++}
++echo "====REVERSE====\n";
++do {
++  sqlite_prev($r);
++  var_dump(sqlite_current($r));
++} while(sqlite_has_prev($r));
++
++sqlite_close($db);
++
++echo "====DONE!====\n";
++?>
++--EXPECTF--
++====TRAVERSE====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====REVERSE====
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++====UNBUFFERED====
++====TRAVERSE====
++
++Warning: sqlite_rewind(): Cannot rewind an unbuffered result set in %ssqlite_023.php on line %d
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====REVERSE====
++
++Warning: sqlite_prev(): you cannot use sqlite_prev on unbuffered querys in %ssqlite_023.php on line %d
++bool(false)
++
++Warning: sqlite_has_prev(): you cannot use sqlite_has_prev on unbuffered querys in %ssqlite_023.php on line %d
++====DONE!====
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_024.phpt
+@@ -0,0 +1,76 @@
++--TEST--
++sqlite: sqlite_fetch_object
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++class class24 {
++	function __construct() {
++		echo __METHOD__ . "\n";
++	}
++}
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query($db, "CREATE TABLE strings(a)");
++
++foreach ($data as $str) {
++	sqlite_query($db, "INSERT INTO strings VALUES('$str')");
++}
++
++echo "====class24====\n";
++$res = sqlite_query($db, "SELECT a FROM strings", SQLITE_ASSOC);
++while (sqlite_valid($res)) {
++	var_dump(sqlite_fetch_object($res, 'class24'));
++}
++
++echo "====stdclass====\n";
++$res = sqlite_query($db, "SELECT a FROM strings", SQLITE_ASSOC);
++while (sqlite_valid($res)) {
++	var_dump(sqlite_fetch_object($res));
++}
++
++sqlite_close($db);
++
++echo "====DONE!====\n";
++?>
++--EXPECTF--
++====class24====
++class24::__construct
++object(class24)#%d (1) {
++  ["a"]=>
++  string(3) "one"
++}
++class24::__construct
++object(class24)#%d (1) {
++  ["a"]=>
++  string(3) "two"
++}
++class24::__construct
++object(class24)#%d (1) {
++  ["a"]=>
++  string(5) "three"
++}
++====stdclass====
++object(stdClass)#%d (1) {
++  ["a"]=>
++  string(3) "one"
++}
++object(stdClass)#%d (1) {
++  ["a"]=>
++  string(3) "two"
++}
++object(stdClass)#%d (1) {
++  ["a"]=>
++  string(5) "three"
++}
++====DONE!====
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_025.phpt
+@@ -0,0 +1,38 @@
++--TEST--
++sqlite: sqlite_fetch_object in a loop
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++sqlite_query($db, "CREATE TABLE strings(a)");
++
++foreach (array("one", "two", "three") as $str) {
++	sqlite_query($db, "INSERT INTO strings VALUES('$str')");
++}
++
++$res = sqlite_query("SELECT * FROM strings", $db);
++
++while (($obj = sqlite_fetch_object($res))) {
++	var_dump($obj);
++}
++
++sqlite_close($db);
++?>
++--EXPECTF--
++object(stdClass)#1 (1) {
++  ["a"]=>
++  string(3) "one"
++}
++object(stdClass)#2 (1) {
++  ["a"]=>
++  string(3) "two"
++}
++object(stdClass)#1 (1) {
++  ["a"]=>
++  string(5) "three"
++}
+\ No newline at end of file
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_026.phpt
+@@ -0,0 +1,27 @@
++--TEST--
++sqlite: sqlite_fetch_column_types
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++sqlite_query($db, "CREATE TABLE strings(a, b INTEGER, c VARCHAR(10), d)");
++sqlite_query($db, "INSERT INTO strings VALUES('1', '2', '3', 'abc')");
++
++var_dump(sqlite_fetch_column_types($db, "strings"));
++
++sqlite_close($db);
++?>
++--EXPECT--
++array(4) {
++  ["a"]=>
++  string(0) ""
++  ["b"]=>
++  string(7) "INTEGER"
++  ["c"]=>
++  string(11) "VARCHAR(10)"
++  ["d"]=>
++  string(0) ""
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_027.phpt
+@@ -0,0 +1,15 @@
++--TEST--
++sqlite: crash inside sqlite_escape_string() & sqlite_udf_encode_binary
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--INI--
++memory_limit=-1
++--FILE--
++<?php
++	var_dump(strlen(sqlite_escape_string(str_repeat("\0", 20000000))));
++	var_dump(strlen(sqlite_udf_encode_binary(str_repeat("\0", 20000000))));
++?>
++--EXPECT--
++int(20000002)
++int(20000002)
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_closures_001.phpt
+@@ -0,0 +1,54 @@
++--TEST--
++sqlite: aggregate functions with closures
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++sqlite_query("CREATE TABLE strings(a)", $db);
++
++foreach ($data as $str) {
++	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($str) . "')", $db);
++}
++
++function cat_step(&$context, $string)
++{
++	$context .= $string;
++}
++
++function cat_fin(&$context)
++{
++	return $context;
++}
++
++sqlite_create_aggregate($db, "cat", function (&$context, $string) {
++	$context .= $string;
++}, function (&$context) {
++	return $context;
++});
++
++$r = sqlite_query("SELECT cat(a) from strings", $db);
++while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
++	var_dump($row);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(11) "onetwothree"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_closures_002.phpt
+@@ -0,0 +1,52 @@
++--TEST--
++sqlite: regular functions with closures
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb.inc";
++
++$data = array(
++	array("one", "uno"),
++	array("two", "dos"),
++	array("three", "tres"),
++	);
++
++sqlite_query("CREATE TABLE strings(a,b)", $db);
++
++foreach ($data as $row) {
++	sqlite_query("INSERT INTO strings VALUES('" . sqlite_escape_string($row[0]) . "','" . sqlite_escape_string($row[1]) . "')", $db);
++}
++
++sqlite_create_function($db, "implode", function () {
++	$args = func_get_args();
++	$sep = array_shift($args);
++	return implode($sep, $args);
++});
++
++$r = sqlite_query("SELECT implode('-', a, b) from strings", $db);
++while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
++	var_dump($row);
++}
++
++sqlite_close($db);
++
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(7) "one-uno"
++}
++array(1) {
++  [0]=>
++  string(7) "two-dos"
++}
++array(1) {
++  [0]=>
++  string(10) "three-tres"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlitedatabase_arrayquery.phpt
+@@ -0,0 +1,23 @@
++--TEST--
++Testing SQLiteDatabase::ArrayQuery with NULL-byte string
++--SKIPIF--
++<?php
++if (!extension_loaded("sqlite")) print "skip";
++?>
++--FILE--
++<?php
++
++$method = new ReflectionMethod('sqlitedatabase::arrayquery');
++
++$class = $method->getDeclaringClass()->newInstanceArgs(array(':memory:'));
++
++$p = "\0";
++
++$method->invokeArgs($class, array_fill(0, 2, $p));
++$method->invokeArgs($class, array_fill(0, 1, $p));
++
++?>
++--EXPECTF--
++Warning: SQLiteDatabase::arrayQuery() expects parameter 2 to be long, string given in %s on line %d
++
++Warning: SQLiteDatabase::arrayQuery(): Cannot execute empty query. in %s on line %d
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_exec_basic.phpt
+@@ -0,0 +1,34 @@
++--TEST--
++Test sqlite_exec() function : basic functionality 
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip sqlite extension not loaded"; ?>
++--FILE--
++<?php
++/* Prototype  : boolean sqlite_exec(string query, resource db[, string &error_message])
++ * Description: Executes a result-less query against a given database 
++ * Source code: ext/sqlite/sqlite.c
++ * Alias to functions: 
++ */
++
++echo "*** Testing sqlite_exec() : basic functionality ***\n";
++
++// set up variables
++$query = 'CREATE TABLE foobar (id INTEGER PRIMARY KEY, name CHAR(255));';
++$error_message = null;
++
++// procedural
++$db = sqlite_open(':memory:');
++var_dump( sqlite_exec($db, $query) );
++sqlite_close($db);
++
++// oo-style
++$db = new SQLiteDatabase(':memory:');
++var_dump( $db->queryExec($query, $error_message) );
++
++?>
++===DONE===
++--EXPECTF--
++*** Testing sqlite_exec() : basic functionality ***
++bool(true)
++bool(true)
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_exec_error.phpt
+@@ -0,0 +1,44 @@
++--TEST--
++Test sqlite_exec() function : error behaviour and functionality 
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip sqlite extension not loaded"; ?>
++--FILE--
++<?php
++/* Prototype  : boolean sqlite_exec(string query, resource db[, string &error_message])
++ * Description: Executes a result-less query against a given database 
++ * Source code: ext/sqlite/sqlite.c
++ * Alias to functions: 
++ */
++
++echo "*** Testing sqlite_exec() : error functionality ***\n";
++
++// set up variables
++$fail = 'CRE ATE TABLE';
++$error_message = null;
++
++// procedural
++$db = sqlite_open(':memory:');
++var_dump( sqlite_exec($db, $fail, $error_message) );
++var_dump( $error_message );
++var_dump( sqlite_exec($db) );
++sqlite_close($db);
++
++// oo-style
++$db = new SQLiteDatabase(':memory:');
++var_dump( $db->queryExec($fail, $error_message, 'fooparam') );
++
++?>
++===DONE===
++--EXPECTF--
++*** Testing sqlite_exec() : error functionality ***
++
++Warning: sqlite_exec(): near "CRE": syntax error in %s on line %d
++bool(false)
++%string|unicode%(24) "near "CRE": syntax error"
++
++Warning: sqlite_exec() expects at least 2 parameters, 1 given in %s on line %d
++NULL
++
++Warning: SQLiteDatabase::queryExec() expects at most 2 parameters, 3 given in %s on line %d
++NULL
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_last_error_basic.phpt
+@@ -0,0 +1,48 @@
++--TEST--
++Test sqlite_last_error() function : basic functionality 
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip sqlite extension not loaded"; ?>
++--FILE--
++<?php
++/* Prototype  : int sqlite_last_error(resource db)
++ * Description: Returns the error code of the last error for a database. 
++ * Source code: ext/sqlite/sqlite.c
++ * Alias to functions: 
++ */
++
++echo "*** Testing sqlite_last_error() : basic functionality ***\n";
++
++// set up variables
++$query = 'CREATE TAB LE foobar (id INTEGER PRIMARY KEY, name CHAR(255));';
++$query_ok = 'CREATE TABLE foobar (id INTEGER, name CHAR(255));';
++
++// procedural
++$db = sqlite_open(':memory:');
++var_dump( sqlite_last_error($db) === SQLITE_OK );
++sqlite_exec($db, $query);
++var_dump( sqlite_last_error($db) === SQLITE_ERROR );
++sqlite_exec($db, $query_ok);
++var_dump( sqlite_last_error($db) === SQLITE_OK );
++sqlite_close($db);
++
++// oo-style
++$db = new SQLiteDatabase(':memory:');
++$db->queryExec($query);
++var_dump( $db->lastError() === SQLITE_ERROR );
++$db->queryExec($query_ok);
++var_dump( $db->lastError() === SQLITE_OK );
++
++?>
++===DONE===
++--EXPECTF--
++*** Testing sqlite_last_error() : basic functionality ***
++bool(true)
++
++Warning: sqlite_exec(): near "TAB": syntax error in %s on line %d
++bool(true)
++bool(true)
++
++Warning: SQLiteDatabase::queryExec(): near "TAB": syntax error in %s on line %d
++bool(true)
++bool(true)
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_last_error_error.phpt
+@@ -0,0 +1,47 @@
++--TEST--
++Test sqlite_last_error() function : error conditions 
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip sqlite extension not loaded"; ?>
++--FILE--
++<?php
++/* Prototype  : int sqlite_last_error(resource db)
++ * Description: Returns the error code of the last error for a database. 
++ * Source code: ext/sqlite/sqlite.c
++ * Alias to functions: 
++ */
++
++echo "*** Testing sqlite_last_error() : error conditions ***\n";
++
++// Zero arguments
++echo "\n-- Testing sqlite_last_error() function with Zero arguments --\n";
++var_dump( sqlite_last_error() );
++
++//Test sqlite_last_error with one more than the expected number of arguments
++echo "\n-- Testing sqlite_last_error() function with more than expected no. of arguments --\n";
++
++$db = sqlite_open(':memory:');
++$extra_arg = 10;
++var_dump( sqlite_last_error($db, $extra_arg) );
++sqlite_close($db);
++
++$db = new SQLiteDatabase(':memory:');
++var_dump( $db->lastError($extra_arg) );
++
++?>
++===DONE===
++--EXPECTF--
++*** Testing sqlite_last_error() : error conditions ***
++
++-- Testing sqlite_last_error() function with Zero arguments --
++
++Warning: sqlite_last_error() expects exactly 1 parameter, 0 given in %s on line %d
++NULL
++
++-- Testing sqlite_last_error() function with more than expected no. of arguments --
++
++Warning: sqlite_last_error() expects exactly 1 parameter, 2 given in %s on line %d
++NULL
++
++Warning: SQLiteDatabase::lastError() expects exactly 0 parameters, 1 given in %s on line %d
++NULL
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_001.phpt
+@@ -0,0 +1,17 @@
++--TEST--
++sqlite-oo: sqlite_open/close
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++require_once('blankdb_oo.inc');
++var_dump($db);
++$db = NULL;
++echo "Done\n";
++?>
++--EXPECTF--
++object(SQLiteDatabase)#%d (0) {
++}
++Done
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_002.phpt
+@@ -0,0 +1,41 @@
++--TEST--
++sqlite-oo: Simple insert/select
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++require_once('blankdb_oo.inc');
++var_dump($db);
++
++var_dump($db->query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))"));
++var_dump($db->query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)"));
++$r = $db->query("SELECT * from foo");
++var_dump($r);
++var_dump($r->fetch());
++?>
++--EXPECTF--
++object(SQLiteDatabase)#%d (0) {
++}
++object(SQLiteResult)#%d (0) {
++}
++object(SQLiteResult)#%d (0) {
++}
++object(SQLiteResult)#%d (0) {
++}
++array(6) {
++  [0]=>
++  string(10) "2002-01-02"
++  ["c1"]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  ["c2"]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++  ["c3"]=>
++  NULL
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_003.phpt
+@@ -0,0 +1,51 @@
++--TEST--
++sqlite-oo: Simple insert/select, different result representation
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))");
++$db->query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)");
++$r = $db->query("SELECT * from foo");
++var_dump($r->fetch(SQLITE_BOTH));
++$r = $db->query("SELECT * from foo");
++var_dump($r->fetch(SQLITE_NUM));
++$r = $db->query("SELECT * from foo");
++var_dump($r->fetch(SQLITE_ASSOC));
++?>
++--EXPECT--
++array(6) {
++  [0]=>
++  string(10) "2002-01-02"
++  ["c1"]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  ["c2"]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++  ["c3"]=>
++  NULL
++}
++array(3) {
++  [0]=>
++  string(10) "2002-01-02"
++  [1]=>
++  string(8) "12:49:00"
++  [2]=>
++  NULL
++}
++array(3) {
++  ["c1"]=>
++  string(10) "2002-01-02"
++  ["c2"]=>
++  string(8) "12:49:00"
++  ["c3"]=>
++  NULL
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_008.phpt
+@@ -0,0 +1,43 @@
++--TEST--
++sqlite-oo: fetch all (buffered)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++$r = $db->query("SELECT a from strings");
++while ($row = $r->fetch(SQLITE_NUM)) {
++	var_dump($row);
++}
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_009.phpt
+@@ -0,0 +1,43 @@
++--TEST--
++sqlite-oo: fetch all (unbuffered)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++$r = $db->unbufferedQuery("SELECT a from strings");
++while ($row = $r->fetch(SQLITE_NUM)) {
++	var_dump($row);
++}
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_010.phpt
+@@ -0,0 +1,44 @@
++--TEST--
++sqlite-oo: fetch all (iterator)
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
++while ($row = $r->valid()) {
++	var_dump($r->current());
++	$r->next();
++}
++echo "DONE!\n";
++?>
++--EXPECT--
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_011.phpt
+@@ -0,0 +1,33 @@
++--TEST--
++sqlite-oo: returned associative column names
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE foo (c1 char, c2 char, c3 char)");
++$db->query("CREATE TABLE bar (c1 char, c2 char, c3 char)");
++$db->query("INSERT INTO foo VALUES ('1', '2', '3')");
++$db->query("INSERT INTO bar VALUES ('4', '5', '6')");
++$r = $db->query("SELECT * from foo, bar", SQLITE_ASSOC);
++var_dump($r->fetch());
++?>
++--EXPECT--
++array(6) {
++  ["foo.c1"]=>
++  string(1) "1"
++  ["foo.c2"]=>
++  string(1) "2"
++  ["foo.c3"]=>
++  string(1) "3"
++  ["bar.c1"]=>
++  string(1) "4"
++  ["bar.c2"]=>
++  string(1) "5"
++  ["bar.c3"]=>
++  string(1) "6"
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_012.phpt
+@@ -0,0 +1,35 @@
++--TEST--
++sqlite-oo: read field names
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE strings(foo VARCHAR, bar VARCHAR, baz VARCHAR)");
++
++echo "Buffered\n";
++$r = $db->query("SELECT * from strings");
++for($i=0; $i<$r->numFields(); $i++) {
++	var_dump($r->fieldName($i));
++}
++echo "Unbuffered\n";
++$r = $db->unbufferedQuery("SELECT * from strings");
++for($i=0; $i<$r->numFields(); $i++) {
++	var_dump($r->fieldName($i));
++}
++echo "DONE!\n";
++?>
++--EXPECT--
++Buffered
++string(3) "foo"
++string(3) "bar"
++string(3) "baz"
++Unbuffered
++string(3) "foo"
++string(3) "bar"
++string(3) "baz"
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_013.phpt
+@@ -0,0 +1,75 @@
++--TEST--
++sqlite-oo: fetch column
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	array (0 => 'one', 1 => 'two'),
++	array (0 => 'three', 1 => 'four')
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR, b VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')");
++}
++
++echo "====BUFFERED====\n";
++$r = $db->query("SELECT a, b from strings");
++while ($r->valid()) {
++	var_dump($r->current(SQLITE_NUM));
++	var_dump($r->column(0));
++	var_dump($r->column(1));
++	var_dump($r->column('a'));
++	var_dump($r->column('b'));
++	$r->next();
++}
++echo "====UNBUFFERED====\n";
++$r = $db->unbufferedQuery("SELECT a, b from strings");
++while ($r->valid()) {
++	var_dump($r->column(0));
++	var_dump($r->column('b'));
++	var_dump($r->column(1));
++	var_dump($r->column('a'));
++	$r->next();
++}
++echo "DONE!\n";
++?>
++--EXPECT--
++====BUFFERED====
++array(2) {
++  [0]=>
++  string(3) "one"
++  [1]=>
++  string(3) "two"
++}
++string(3) "one"
++string(3) "two"
++string(3) "one"
++string(3) "two"
++array(2) {
++  [0]=>
++  string(5) "three"
++  [1]=>
++  string(4) "four"
++}
++string(5) "three"
++string(4) "four"
++string(5) "three"
++string(4) "four"
++====UNBUFFERED====
++string(3) "one"
++string(3) "two"
++NULL
++NULL
++string(5) "three"
++string(4) "four"
++NULL
++NULL
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_014.phpt
+@@ -0,0 +1,118 @@
++--TEST--
++sqlite-oo: fetch all
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++echo "unbuffered twice\n";
++$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
++var_dump($r->fetchAll());
++var_dump($r->fetchAll());
++
++echo "unbuffered with fetch_array\n";
++$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
++var_dump($r->fetch());
++var_dump($r->fetchAll());
++
++echo "buffered\n";
++$r = $db->query("SELECT a from strings", SQLITE_NUM);
++var_dump($r->fetchAll());
++var_dump($r->fetch());
++var_dump($r->fetchAll());
++
++echo "DONE!\n";
++?>
++--EXPECTF--
++unbuffered twice
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++
++Warning: SQLiteUnbuffered::fetchAll(): One or more rowsets were already returned; returning NULL this time in %ssqlite_oo_014.php on line %d
++array(0) {
++}
++unbuffered with fetch_array
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(2) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++buffered
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++bool(false)
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_015.phpt
+@@ -0,0 +1,47 @@
++--TEST--
++sqlite-oo: array_query
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++$res = $db->arrayQuery("SELECT a from strings", SQLITE_NUM);
++var_dump($res);
++
++echo "DONE!\n";
++?>
++--EXPECTF--
++array(3) {
++  [0]=>
++  array(1) {
++    [0]=>
++    string(3) "one"
++  }
++  [1]=>
++  array(1) {
++    [0]=>
++    string(3) "two"
++  }
++  [2]=>
++  array(1) {
++    [0]=>
++    string(5) "three"
++  }
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_016.phpt
+@@ -0,0 +1,42 @@
++--TEST--
++sqlite-oo: fetch single
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	array (0 => 'one', 1 => 'two'),
++	array (0 => 'three', 1 => 'four')
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR, b VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')");
++}
++
++echo "====BUFFERED====\n";
++$r = $db->query("SELECT a, b from strings");
++while ($r->valid()) {
++	var_dump($r->fetchSingle());
++}
++echo "====UNBUFFERED====\n";
++$r = $db->unbufferedQuery("SELECT a, b from strings");
++while ($r->valid()) {
++	var_dump($r->fetchSingle());
++}
++echo "DONE!\n";
++?>
++--EXPECT--
++====BUFFERED====
++string(3) "one"
++string(5) "three"
++====UNBUFFERED====
++string(3) "one"
++string(5) "three"
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_020.phpt
+@@ -0,0 +1,66 @@
++--TEST--
++sqlite-oo: factory and exception
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++$dbname = tempnam(dirname(__FILE__), "phpsql");
++function cleanup() {
++	global $db, $dbname;
++
++	$db = NULL;
++	unlink($dbname);
++}
++register_shutdown_function("cleanup");
++
++try {
++	$db = sqlite_factory();
++} catch(SQLiteException $err) {
++	echo "Message: ".$err->getMessage()."\n";
++	echo "File: ".$err->getFile()."\n";
++	//echo "Line: ".$err->getLine()."\n";
++	//print_r($err->getTrace());
++	//echo "BackTrace: ".$err->getTraceAsString()."\n";
++}
++
++$db = sqlite_factory($dbname);
++
++$data = array(
++	array (0 => 'one', 1 => 'two'),
++	array (0 => 'three', 1 => 'four')
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR, b VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')");
++}
++
++$r = $db->unbufferedQuery("SELECT a, b from strings");
++while ($r->valid()) {
++	var_dump($r->current(SQLITE_NUM));
++	$r->next();
++}
++$r = null;
++$db = null;
++echo "DONE!\n";
++?>
++--EXPECTF--
++Message: sqlite_factory() expects at least 1 parameter, 0 given
++File: %ssqlite_oo_020.php
++array(2) {
++  [0]=>
++  string(3) "one"
++  [1]=>
++  string(3) "two"
++}
++array(2) {
++  [0]=>
++  string(5) "three"
++  [1]=>
++  string(4) "four"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_021.phpt
+@@ -0,0 +1,48 @@
++--TEST--
++sqlite-oo: single query
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE test_db ( id INTEGER PRIMARY KEY, data VARCHAR(100) )");
++for ($i = 0; $i < 10; $i++) {
++	$db->query("INSERT INTO test_db (data) VALUES('{$i}data')");
++}
++$db->query("INSERT INTO test_db (data) VALUES(NULL)");
++
++var_dump($db->singleQuery("SELECT id FROM test_db WHERE id=5"));
++var_dump($db->singleQuery("SELECT * FROM test_db WHERE id=4"));
++var_dump($db->singleQuery("SELECT data FROM test_db WHERE id=6"));
++var_dump($db->singleQuery("SELECT * FROM test_db WHERE id < 5"));
++var_dump($db->singleQuery("SELECT * FROM test db WHERE id < 4"));
++var_dump($db->singleQuery("SELECT * FROM test_db WHERE id=999999"));
++var_dump($db->singleQuery("SELECT id FROM test_db WHERE id=5", FALSE));
++
++echo "DONE!\n";
++?>
++--EXPECTF--
++string(1) "5"
++string(1) "4"
++string(5) "5data"
++array(4) {
++  [0]=>
++  string(1) "1"
++  [1]=>
++  string(1) "2"
++  [2]=>
++  string(1) "3"
++  [3]=>
++  string(1) "4"
++}
++
++Warning: SQLiteDatabase::singleQuery(): no such table: test in %s on line %d
++bool(false)
++NULL
++array(1) {
++  [0]=>
++  string(1) "5"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_022.phpt
+@@ -0,0 +1,98 @@
++--TEST--
++sqlite-oo: sqlite::seek
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++$res = $db->query("SELECT a FROM strings", SQLITE_NUM);
++for ($idx = -1; $idx < 4; $idx++) {
++	echo "====SEEK:$idx====\n";
++	$res->seek($idx);
++	var_dump($res->current());
++}
++echo "====AGAIN====\n";
++for ($idx = -1; $idx < 4; $idx++) {
++	echo "====SEEK:$idx====\n";
++	$res->seek($idx);
++	var_dump($res->current());
++}
++echo "====DONE!====\n";
++?>
++--EXPECTF--
++====SEEK:-1====
++
++Warning: SQLiteResult::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++====SEEK:0====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++====SEEK:1====
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++====SEEK:2====
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====SEEK:3====
++
++Warning: SQLiteResult::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====AGAIN====
++====SEEK:-1====
++
++Warning: SQLiteResult::seek(): row -1 out of range in %ssqlite_oo_022.php on line %d
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====SEEK:0====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++====SEEK:1====
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++====SEEK:2====
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====SEEK:3====
++
++Warning: SQLiteResult::seek(): row 3 out of range in %ssqlite_oo_022.php on line %d
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====DONE!====
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_024.phpt
+@@ -0,0 +1,74 @@
++--TEST--
++sqlite-oo: sqlite::fetch_object
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++class class24 {
++	function __construct() {
++		echo __METHOD__ . "\n";
++	}
++}
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++echo "====class24====\n";
++$res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
++while ($res->valid()) {
++	var_dump($res->fetchObject('class24'));
++}
++
++echo "====stdclass====\n";
++$res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
++while ($res->valid()) {
++	var_dump($res->fetchObject());
++}
++
++echo "====DONE!====\n";
++?>
++--EXPECTF--
++====class24====
++class24::__construct
++object(class24)#%d (1) {
++  ["a"]=>
++  string(3) "one"
++}
++class24::__construct
++object(class24)#%d (1) {
++  ["a"]=>
++  string(3) "two"
++}
++class24::__construct
++object(class24)#%d (1) {
++  ["a"]=>
++  string(5) "three"
++}
++====stdclass====
++object(stdClass)#%d (1) {
++  ["a"]=>
++  string(3) "one"
++}
++object(stdClass)#%d (1) {
++  ["a"]=>
++  string(3) "two"
++}
++object(stdClass)#%d (1) {
++  ["a"]=>
++  string(5) "three"
++}
++====DONE!====
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_025.phpt
+@@ -0,0 +1,103 @@
++--TEST--
++sqlite-oo: sqlite / foreach
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++echo "====UNBUFFERED====\n";
++$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
++//var_dump(class_implements($r));
++foreach($r as $row) {
++	var_dump($row);
++}
++echo "====NO-MORE====\n";
++foreach($r as $row) {
++	var_dump($row);
++}
++echo "====DIRECT====\n";
++foreach($db->unbufferedQuery("SELECT a from strings", SQLITE_NUM) as $row) {
++	var_dump($row);
++}
++echo "====BUFFERED====\n";
++$r = $db->query("SELECT a from strings", SQLITE_NUM);
++//var_dump(class_implements($r));
++foreach($r as $row) {
++	var_dump($row);
++}
++foreach($r as $row) {
++	var_dump($row);
++}
++echo "DONE!\n";
++?>
++--EXPECT--
++====UNBUFFERED====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====NO-MORE====
++====DIRECT====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++====BUFFERED====
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++array(1) {
++  [0]=>
++  string(3) "one"
++}
++array(1) {
++  [0]=>
++  string(3) "two"
++}
++array(1) {
++  [0]=>
++  string(5) "three"
++}
++DONE!
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_026.phpt
+@@ -0,0 +1,56 @@
++--TEST--
++sqlite-oo: unbuffered
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array(
++	"one",
++	"two",
++	"three"
++	);
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++}
++
++echo "====FOREACH====\n";
++$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
++foreach($r as $idx => $row) {
++	var_dump($row[0]);
++	var_dump($row[0]);
++}
++echo "====FOR====\n";
++$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
++for(;$r->valid(); $r->next()) {
++	$v = $r->column(0);
++	var_dump($v);
++	$c = $r->column(0);
++	var_dump(is_null($c) || $c==$v);
++}
++echo "===DONE===\n";
++?>
++--EXPECT--
++====FOREACH====
++string(3) "one"
++string(3) "one"
++string(3) "two"
++string(3) "two"
++string(5) "three"
++string(5) "three"
++====FOR====
++string(3) "one"
++bool(true)
++string(3) "two"
++bool(true)
++string(5) "three"
++bool(true)
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_027.phpt
+@@ -0,0 +1,42 @@
++--TEST--
++sqlite-oo: changes
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$data = array("one", "two", "three");
++
++$db->query("CREATE TABLE strings(a VARCHAR)");
++
++foreach ($data as $str) {
++	$db->query("INSERT INTO strings VALUES('$str')");
++	echo $db->changes() . "\n";
++}
++
++$db->query("UPDATE strings SET a='foo' WHERE a!='two'");
++echo $db->changes() . "\n";
++
++$db->query("DELETE FROM strings WHERE 1");
++echo $db->changes() . "\n";
++
++$str = '';
++foreach ($data as $s) {
++	$str .= "INSERT INTO strings VALUES('".$s."');";
++}
++$db->query($str);
++echo $db->changes() . "\n";
++
++?>
++--EXPECT--
++1
++1
++1
++2
++3
++3
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_028.phpt
+@@ -0,0 +1,25 @@
++--TEST--
++sqlite-oo: sqlite_fetch_column_types
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php 
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE strings(a, b INTEGER, c VARCHAR(10), d)");
++$db->query("INSERT INTO strings VALUES('1', '2', '3', 'abc')");
++
++var_dump($db->fetchColumnTypes("strings"));
++?>
++--EXPECT--
++array(4) {
++  ["a"]=>
++  string(0) ""
++  ["b"]=>
++  string(7) "INTEGER"
++  ["c"]=>
++  string(11) "VARCHAR(10)"
++  ["d"]=>
++  string(0) ""
++}
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_029.phpt
+@@ -0,0 +1,53 @@
++--TEST--
++sqlite-oo: call method with $this
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++?>
++--FILE--
++<?php
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE strings(key VARCHAR(10), var VARCHAR(10))");
++$db->query("INSERT INTO strings VALUES('foo', 'foo')");
++
++class sqlite_help
++{
++	function __construct($db){
++		$this->db = $db;
++		$this->db->createFunction('link_keywords', array(&$this, 'linkers'), 1);
++	}
++
++	function getSingle($key)
++	{
++		return $this->db->singleQuery('SELECT link_keywords(var) FROM strings WHERE key=\''.$key.'\'', 1);
++	}
++
++	function linkers($str)
++	{
++		$str = str_replace('foo', 'bar', $str);
++		return $str;
++	}
++
++	function free()
++	{
++		unset($this->db);
++	}
++
++	function __destruct()
++	{
++		echo "DESTRUCTED\n";
++	}
++}
++
++$obj = new sqlite_help($db);
++echo $obj->getSingle('foo')."\n";
++$obj->free();
++unset($obj);
++
++?>
++===DONE===
++--EXPECT--
++bar
++===DONE===
++DESTRUCTED
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_oo_030.phpt
+@@ -0,0 +1,44 @@
++--TEST--
++sqlite-oo: calling static methods
++--INI--
++sqlite.assoc_case=0
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++?>
++--FILE--
++<?php
++
++require_once('blankdb_oo.inc'); 
++
++class foo {
++    static function bar($param = NULL) {
++		return $param;
++    }
++}
++
++function baz($param = NULL) {
++	return $param;
++}
++
++var_dump($db->singleQuery("select php('baz')", 1));
++var_dump($db->singleQuery("select php('baz', 1)", 1));
++var_dump($db->singleQuery("select php('baz', \"PHP\")", 1));
++var_dump($db->singleQuery("select php('foo::bar')", 1));
++var_dump($db->singleQuery("select php('foo::bar', 1)", 1));
++var_dump($db->singleQuery("select php('foo::bar', \"PHP\")", 1));
++var_dump($db->singleQuery("select php('foo::bar(\"PHP\")')", 1));
++
++?>
++===DONE===
++--EXPECTF--
++NULL
++string(1) "1"
++string(3) "PHP"
++NULL
++string(1) "1"
++string(3) "PHP"
++
++Warning: SQLiteDatabase::singleQuery(): function `foo::bar("PHP")' is not a function name in %ssqlite_oo_030.php on line %d
++bool(false)
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_popen_basic.phpt
+@@ -0,0 +1,27 @@
++--TEST--
++SQLite: sqlite_popen() basic tests
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip"; ?>
++--FILE--
++<?php
++/* Prototype  : resource sqlite_popen(string filename [, int mode [, string &error_message]])
++ * Description: Opens a persistent handle to a SQLite database. Will create the database if it does not exist.
++ * Source code: ext/sqlite/sqlite.c
++ * Alias to functions:
++*/
++
++	$db1 = sqlite_popen(":memory:");
++	$db2 = sqlite_popen(":memory:");
++
++	var_dump($db1);
++	var_dump($db2);
++
++	list($resourceId1) = sscanf((string) $db1, "resource(%d) of type (sqlite database (persistent))");
++	list($resourceId2) = sscanf((string) $db2, "resource(%d) of type (sqlite database (persistent))");
++
++	var_dump($resourceId1 === $resourceId2);
++?>
++--EXPECTF--
++resource(%d) of type (sqlite database (persistent))
++resource(%d) of type (sqlite database (persistent))
++bool(true)
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_popen_error.phpt
+@@ -0,0 +1,34 @@
++--TEST--
++Test sqlite_popen() function : error conditions 
++--SKIPIF--
++<?php if (!extension_loaded("sqlite")) print "skip sqlite extension not loaded"; ?>
++--FILE--
++<?php
++/* Prototype  : resource sqlite_popen(string filename [, int mode [, string &error_message]])
++ * Description: Opens a persistent handle to a SQLite database. Will create the database if it does not exist. 
++ * Source code: ext/sqlite/sqlite.c
++ * Alias to functions: 
++ */
++
++$message = '';
++
++echo "*** Testing sqlite_popen() : error conditions ***\n";
++
++var_dump( sqlite_popen() );
++var_dump( sqlite_popen(":memory:", 0666, $message, 'foobar') );
++var_dump( sqlite_popen("", 0666, $message) );
++var_dump( $message );
++
++?>
++===DONE===
++--EXPECTF--
++*** Testing sqlite_popen() : error conditions ***
++
++Warning: sqlite_popen() expects at least 1 parameter, 0 given in %s on line %d
++NULL
++
++Warning: sqlite_popen() expects at most 3 parameters, 4 given in %s on line %d
++NULL
++bool(false)
++NULL
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_session_001.phpt
+@@ -0,0 +1,46 @@
++--TEST--
++sqlite, session storage test
++--CREDITS--
++Mats Lindh <mats at lindh.no>
++#Testfest php.no
++--INI--
++session.save_handler = sqlite
++--SKIPIF--
++if (!extension_loaded("session"))
++{
++	die("skip Session module not loaded");
++}
++if (!extension_loaded("sqlite"))
++{
++	die("skip Session module not loaded");
++}
++--FILE--
++<?php
++/* Description: Tests that sqlite can be used as a session save handler
++* Source code: ext/sqlite/sess_sqlite.c
++*/
++
++ob_start();
++session_save_path(__DIR__ . "/sessiondb.sdb");
++
++// create the session and set a session value
++session_start();
++$_SESSION["test"] = "foo_bar";
++
++// close the session and unset the value
++session_write_close();
++unset($_SESSION["test"]);
++var_dump(isset($_SESSION["test"]));
++
++// start the session again and check that we have the proper value
++session_start();
++var_dump($_SESSION["test"]);
++ob_end_flush();
++?>
++--EXPECTF--
++bool(false)
++%unicode|string%(7) "foo_bar"
++--CLEAN--
++<?php
++	unlink(__DIR__ . "/sessiondb.sdb")
++?>
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_session_002.phpt
+@@ -0,0 +1,54 @@
++--TEST--
++sqlite, session destroy test
++--CREDITS--
++Mats Lindh <mats at lindh.no>
++#Testfest php.no
++--INI--
++session.save_handler = sqlite
++--SKIPIF--
++if (!extension_loaded("session"))
++{
++	die("skip Session module not loaded");
++}
++if (!extension_loaded("sqlite"))
++{
++	die("skip sqlite module not loaded");
++}
++--FILE--
++<?php
++/* Description: Tests that sqlite will destroy a session when used as a session handler
++* Source code: ext/sqlite/sess_sqlite.c
++*/
++ob_start();
++session_save_path(__DIR__ . "/sessiondb.sdb");
++
++// start a session and save a value to it before commiting the session to the database
++session_start();
++$_SESSION["test"] = "foo_bar";
++session_write_close();
++
++// remove the session value
++unset($_SESSION["test"]);
++var_dump(isset($_SESSION["test"]));
++
++// start the session again and destroy it
++session_start();
++var_dump($_SESSION["test"]);
++session_destroy();
++session_write_close();
++
++unset($_SESSION["test"]);
++
++// check that the session has been destroyed
++session_start();
++var_dump(isset($_SESSION["test"]));
++ob_end_flush();
++?>
++--EXPECTF--
++bool(false)
++%unicode|string%(7) "foo_bar"
++bool(false)
++--CLEAN--
++<?php
++	unlink(__DIR__ . "/sessiondb.sdb")
++?>
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_spl_001.phpt
+@@ -0,0 +1,125 @@
++--TEST--
++sqlite-spl: Iteration
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++if (!extension_loaded("spl")) print "skip SPL is not present"; 
++?>
++--FILE--
++<?php
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE menu(id_l int PRIMARY KEY, id_r int UNIQUE, key VARCHAR(10))");
++$db->query("INSERT INTO menu VALUES( 1, 12, 'A')"); 
++$db->query("INSERT INTO menu VALUES( 2,  9, 'B')"); 
++$db->query("INSERT INTO menu VALUES(10, 11, 'F')"); 
++$db->query("INSERT INTO menu VALUES( 3,  6, 'C')"); 
++$db->query("INSERT INTO menu VALUES( 7,  8, 'E')"); 
++$db->query("INSERT INTO menu VALUES( 4,  5, 'D')"); 
++
++class SqliteNestedsetElement
++{
++	protected $id_l;
++	protected $id_r;
++	protected $key;
++
++	function __construct($db)
++	{
++		$this->db = $db;
++	}
++	
++	function getLeft()
++	{
++		return $this->id_l;
++	}
++	
++	function getRight()
++	{
++		return $this->id_r;
++	}
++	
++	function __toString()
++	{
++		return $this->key;
++	}
++
++	function key()
++	{
++		return $this->key;
++	}
++}
++
++class SqliteNestedset implements RecursiveIterator
++{
++	protected $id;
++	protected $id_l;
++	protected $id_r;
++	protected $entry;
++
++	function __construct($db, $id_l = 1)
++	{
++		$this->db = $db;
++		$this->id_l = $id_l;
++		$this->id_r = $this->db->singleQuery('SELECT id_r FROM menu WHERE id_l='.$id_l, 1);
++		$this->id = $id_l;
++	}
++	
++	function rewind()
++	{
++		$this->id = $this->id_l;
++		$this->fetch();
++	}
++
++	function valid()
++	{
++		return is_object($this->entry);
++	}
++	
++	function current()
++	{
++		return $this->entry->__toString();
++	}
++	
++	function key()
++	{
++		return $this->entry->key();;
++	}
++	
++	function next()
++	{
++		$this->id = $this->entry->getRight() + 1;
++		$this->fetch();
++	}
++
++	protected function fetch()
++	{
++		$res = $this->db->unbufferedQuery('SELECT * FROM menu WHERE id_l='.$this->id);
++		$this->entry = $res->fetchObject('SqliteNestedsetElement', array(&$this->db));
++		unset($res);
++	}
++	
++	function hasChildren()
++	{
++		return $this->entry->getLeft() + 1 < $this->entry->getRight();
++	}
++	
++	function getChildren()
++	{
++		return new SqliteNestedset($this->db, $this->entry->getLeft() + 1, $this->entry->getRight() - 1);
++	}
++}
++
++$menu_iterator = new RecursiveIteratorIterator(new SqliteNestedset($db), RecursiveIteratorIterator::SELF_FIRST);
++foreach($menu_iterator as $entry) {
++	echo $menu_iterator->getDepth() . $entry . "\n";
++}
++?>
++===DONE===
++--EXPECT--
++0A
++1B
++2C
++3D
++2E
++1F
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_spl_002.phpt
+@@ -0,0 +1,29 @@
++--TEST--
++sqlite-spl: Countable
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++if (!extension_loaded("spl")) print "skip SPL is not present"; 
++?>
++--FILE--
++<?php
++include "blankdb_oo.inc";
++
++$db->query("CREATE TABLE menu(id_l int PRIMARY KEY, id_r int UNIQUE, key VARCHAR(10))");
++$db->query("INSERT INTO menu VALUES( 1, 12, 'A')"); 
++$db->query("INSERT INTO menu VALUES( 2,  9, 'B')"); 
++$db->query("INSERT INTO menu VALUES(10, 11, 'F')"); 
++$db->query("INSERT INTO menu VALUES( 3,  6, 'C')"); 
++$db->query("INSERT INTO menu VALUES( 7,  8, 'E')"); 
++$db->query("INSERT INTO menu VALUES( 4,  5, 'D')"); 
++
++$res = $db->query("SELECT * from menu");
++
++var_dump($res->count());
++var_dump(count($res));
++?>
++===DONE===
++--EXPECT--
++int(6)
++int(6)
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/tests/sqlite_spl_003.phpt
+@@ -0,0 +1,28 @@
++--TEST--
++sqlite-spl: Exception
++--SKIPIF--
++<?php # vim:ft=php
++if (!extension_loaded("sqlite")) print "skip"; 
++if (!extension_loaded("spl")) print "skip SPL is not present"; 
++?>
++--FILE--
++<?php
++
++try
++{
++	$db = sqlite_factory();
++}
++catch(SQLiteException $e)
++{
++	$parents = class_parents($e);
++	if (array_key_exists('RuntimeException', $parents))
++	{
++		echo "GOOD\n";
++	}
++}
++
++?>
++===DONE===
++--EXPECT--
++GOOD
++===DONE===
+--- /dev/null
++++ b/ext/sqlite/TODO
+@@ -0,0 +1,19 @@
++- Implement a PDO driver, called sqlite2
++
++- Transparent binary encoding of return values from PHP callback functions.
++
++- Add user-space callback for the authorizer function (this is potentially
++  very slow, so it needs to be implemented carefully).
++
++- Add user-space callback to handle busy databases.
++
++  o Test how robust we are when a user-space function is registered as
++    a callback for a persistent connection in script A, then script B is
++	called that doesn't register the callback but does make use of the
++	function in an SQL query.
++	--> Our test suite doesn't allow us to test persistent connections
++	    at this time :/
++
++- Use later version of built-in library
++
++vim:tw=78
diff --git a/trunk/package/lang/php5/patches/091-fix-sqlite2.patch b/trunk/package/lang/php5/patches/091-fix-sqlite2.patch
new file mode 100644
index 00000000..fcbfb230
--- /dev/null
+++ b/trunk/package/lang/php5/patches/091-fix-sqlite2.patch
@@ -0,0 +1,101 @@
+--- a/ext/sqlite/pdo_sqlite2.c
++++ b/ext/sqlite/pdo_sqlite2.c
+@@ -522,11 +522,6 @@ static char *make_filename_safe(const ch
+ 			return NULL;
+ 		}
+ 
+-		if (PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+-			efree(fullpath);
+-			return NULL;
+-		}
+-
+ 		if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+ 			efree(fullpath);
+ 			return NULL;
+@@ -585,7 +580,7 @@ static int pdo_sqlite2_handle_factory(pd
+ 
+ 	if (!filename) {
+ 		zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
+-				"safe_mode/open_basedir prohibits opening %s",
++				"open_basedir prohibits opening %s",
+ 				dbh->data_source);
+ 		goto cleanup;
+ 	}
+--- a/ext/sqlite/sqlite.c
++++ b/ext/sqlite/sqlite.c
+@@ -1066,10 +1066,6 @@ static int php_sqlite_authorizer(void *a
+ 		case SQLITE_COPY:
+ 			if (strncmp(arg4, ":memory:", sizeof(":memory:") - 1)) {
+ 				TSRMLS_FETCH();
+-				if (PG(safe_mode) && (!php_checkuid(arg4, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+-					return SQLITE_DENY;
+-				}
+-
+ 				if (php_check_open_basedir(arg4 TSRMLS_CC)) {
+ 					return SQLITE_DENY;
+ 				}
+@@ -1079,10 +1075,6 @@ static int php_sqlite_authorizer(void *a
+ 		case SQLITE_ATTACH:
+ 			if (strncmp(arg3, ":memory:", sizeof(":memory:") - 1)) {
+ 				TSRMLS_FETCH();
+-				if (PG(safe_mode) && (!php_checkuid(arg3, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+-					return SQLITE_DENY;
+-				}
+-
+ 				if (php_check_open_basedir(arg3 TSRMLS_CC)) {
+ 					return SQLITE_DENY;
+ 				}
+@@ -1160,13 +1152,12 @@ static void sqlite_object_free_storage(v
+ static void sqlite_object_new(zend_class_entry *class_type, zend_object_handlers *handlers, zend_object_value *retval TSRMLS_DC)
+ {
+ 	sqlite_object *intern;
+-	zval *tmp;
+ 
+ 	intern = emalloc(sizeof(sqlite_object));
+ 	memset(intern, 0, sizeof(sqlite_object));
+ 
+ 	zend_object_std_init(&intern->std, class_type TSRMLS_CC);
+-	zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
++	object_properties_init(&intern->std, class_type);
+ 
+ 	retval->handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL TSRMLS_CC);
+ 	retval->handlers = handlers;
+@@ -1510,7 +1501,7 @@ static struct php_sqlite_db *php_sqlite_
+ 	/* authorizer hook so we can enforce safe mode
+ 	 * Note: the declaration of php_sqlite_authorizer is correct for 2.8.2 of libsqlite,
+ 	 * and IS backwards binary compatible with earlier versions */
+-	if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
++	if (PG(open_basedir) && *PG(open_basedir)) {
+ 		sqlite_set_authorizer(sdb, php_sqlite_authorizer, NULL);
+ 	}
+ 
+@@ -1569,8 +1560,7 @@ PHP_FUNCTION(sqlite_popen)
+ 			RETURN_FALSE;
+ 		}
+ 
+-		if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || 
+-				php_check_open_basedir(fullpath TSRMLS_CC)) {
++		if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+ 			efree(fullpath);
+ 			RETURN_FALSE;
+ 		}
+@@ -1656,8 +1646,7 @@ PHP_FUNCTION(sqlite_open)
+ 			}
+ 		}
+ 
+-		if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
+-				php_check_open_basedir(fullpath TSRMLS_CC)) {
++		if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+ 			efree(fullpath);
+ 			zend_restore_error_handling(&error_handling TSRMLS_CC);
+ 			if (object) {
+@@ -1710,8 +1699,7 @@ PHP_FUNCTION(sqlite_factory)
+ 			RETURN_NULL();
+ 		}
+ 
+-		if ((PG(safe_mode) && (!php_checkuid(fullpath, NULL, CHECKUID_CHECK_FILE_AND_DIR))) ||
+-				php_check_open_basedir(fullpath TSRMLS_CC)) {
++		if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+ 			efree(fullpath);
+ 			zend_restore_error_handling(&error_handling TSRMLS_CC);
+ 			RETURN_NULL();
diff --git a/trunk/package/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch b/trunk/package/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch
new file mode 100644
index 00000000..3e81dd6b
--- /dev/null
+++ b/trunk/package/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch
@@ -0,0 +1,11 @@
+--- a/ext/standard/php_crypt_r.c
++++ b/ext/standard/php_crypt_r.c
+@@ -96,6 +96,8 @@ void _crypt_extended_init_r(void)
+ 		InterlockedIncrement(&initialized);
+ #elif defined(HAVE_SYNC_FETCH_AND_ADD)
+ 		__sync_fetch_and_add(&initialized, 1);
++#elif (defined(__GNUC__) && (__GNUC__ == 3))
++		initialized = 1;
+ #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */
+ 		membar_producer();
+ 		atomic_add_int(&initialized, 1);
diff --git a/trunk/package/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch b/trunk/package/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch
new file mode 100644
index 00000000..438274aa
--- /dev/null
+++ b/trunk/package/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch
@@ -0,0 +1,620 @@
+
+Add support for use of the system timezone database, rather
+than embedding a copy.  Discussed upstream but was not desired.
+
+History:
+r9: fix another compile error without --with-system-tzdata configured
+r8: fix compile error without --with-system-tzdata configured
+r7: improve check for valid timezone id to exclude directories
+r6: fix fd leak in r5, fix country code/BC flag use in 
+    timezone_identifiers_list() using system db,
+    fix use of PECL timezonedb to override system db,
+r5: reverts addition of "System/Localtime" fake tzname.
+    updated for 5.3.0, parses zone.tab to pick up mapping between
+    timezone name, country code and long/lat coords
+r4: added "System/Localtime" tzname which uses /etc/localtime
+r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
+r2: add filesystem trawl to set up name alias index
+r1: initial revision
+
+--- a/ext/date/lib/parse_tz.c
++++ b/ext/date/lib/parse_tz.c
+@@ -20,6 +20,16 @@
+ 
+ #include "timelib.h"
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <unistd.h>
++
++#include "php_scandir.h"
++#endif
++
+ #include <stdio.h>
+ 
+ #ifdef HAVE_LOCALE_H
+@@ -31,7 +41,12 @@
+ #else
+ #include <strings.h>
+ #endif
++
++#ifndef HAVE_SYSTEM_TZDATA
+ #include "timezonedb.h"
++#endif
++
++#include <ctype.h>
+ 
+ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
+ # if defined(__LITTLE_ENDIAN__)
+@@ -51,9 +66,14 @@
+ 
+ static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+ {
+-	/* skip ID */
+-	*tzf += 4;
+-	
++        if (memcmp(tzf, "TZif", 4) == 0) {
++                *tzf += 20;
++                return;
++        }
++        
++        /* skip ID */
++        *tzf += 4;
++                
+ 	/* read BC flag */
+ 	tz->bc = (**tzf == '\1');
+ 	*tzf += 1;
+@@ -256,7 +276,397 @@ void timelib_dump_tzinfo(timelib_tzinfo
+ 	}
+ }
+ 
+-static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
++#ifdef HAVE_SYSTEM_TZDATA
++
++#ifdef HAVE_SYSTEM_TZDATA_PREFIX
++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
++#else
++#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
++#endif
++
++/* System timezone database pointer. */
++static const timelib_tzdb *timezonedb_system = NULL;
++
++/* Hash table entry for the cache of the zone.tab mapping table. */
++struct location_info {
++        char code[2];
++        double latitude, longitude;
++        char name[64];
++        char *comment;
++        struct location_info *next;
++};
++
++/* Cache of zone.tab. */
++static struct location_info **system_location_table;
++
++/* Size of the zone.tab hash table; a random-ish prime big enough to
++ * prevent too many collisions. */
++#define LOCINFO_HASH_SIZE (1021)
++
++static uint32_t tz_hash(const char *str)
++{
++    const unsigned char *p = (const unsigned char *)str;
++    uint32_t hash = 5381;
++    int c;
++    
++    while ((c = *p++) != '\0') {
++        hash = (hash << 5) ^ hash ^ c;
++    }
++    
++    return hash % LOCINFO_HASH_SIZE;
++}
++
++/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
++ * parsed string on success, or NULL on parse error.  On success,
++ * writes the parsed number to *result. */
++static char *parse_iso6709(char *p, double *result)
++{
++    double v, sign;
++    char *pend;
++    size_t len;
++
++    if (*p == '+')
++        sign = 1.0;
++    else if (*p == '-')
++        sign = -1.0;
++    else
++        return NULL;
++
++    p++;
++    for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
++        ;;
++
++    /* Annoying encoding used by zone.tab has no decimal point, so use
++     * the length to determine the format:
++     * 
++     * 4 = DDMM
++     * 5 = DDDMM
++     * 6 = DDMMSS
++     * 7 = DDDMMSS
++     */
++    len = pend - p;
++    if (len < 4 || len > 7) {
++        return NULL;
++    }
++
++    /* p => [D]DD */
++    v = (p[0] - '0') * 10.0 + (p[1] - '0');
++    p += 2;
++    if (len == 5 || len == 7)
++        v = v * 10.0 + (*p++ - '0');
++    /* p => MM[SS] */
++    v += (10.0 * (p[0] - '0')
++          + p[1] - '0') / 60.0;
++    p += 2;
++    /* p => [SS] */
++    if (len > 5) {
++        v += (10.0 * (p[0] - '0')
++              + p[1] - '0') / 3600.0;
++        p += 2;
++    }
++
++    /* Round to five decimal place, not because it's a good idea,
++     * but, because the builtin data uses rounded data, so, match
++     * that. */
++    *result = round(v * sign * 100000.0) / 100000.0;
++
++    return p;
++}
++
++/* This function parses the zone.tab file to build up the mapping of
++ * timezone to country code and geographic location, and returns a
++ * hash table.  The hash table is indexed by the function:
++ *
++ *   tz_hash(timezone-name)
++ */
++static struct location_info **create_location_table(void)
++{
++    struct location_info **li, *i;
++    char zone_tab[PATH_MAX];
++    char line[512];
++    FILE *fp;
++
++    strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
++
++    fp = fopen(zone_tab, "r");
++    if (!fp) {
++        return NULL;
++    }
++
++    li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
++
++    while (fgets(line, sizeof line, fp)) {
++        char *p = line, *code, *name, *comment;
++        uint32_t hash;
++        double latitude, longitude;
++
++        while (isspace(*p))
++            p++;
++
++        if (*p == '#' || *p == '\0' || *p == '\n')
++            continue;
++        
++        if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t')
++            continue;
++        
++        /* code => AA */
++        code = p;
++        p[2] = 0;
++        p += 3;
++
++        /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
++        p = parse_iso6709(p, &latitude);
++        if (!p) {
++            continue;
++        }
++        p = parse_iso6709(p, &longitude);
++        if (!p) {
++            continue;
++        }
++
++        if (!p || *p != '\t') {
++            continue;
++        }
++
++        /* name = string */
++        name = ++p;
++        while (*p != '\t' && *p && *p != '\n')
++            p++;
++
++        *p++ = '\0';
++
++        /* comment = string */
++        comment = p;
++        while (*p != '\t' && *p && *p != '\n')
++            p++;
++
++        if (*p == '\n' || *p == '\t')
++            *p = '\0';
++        
++        hash = tz_hash(name);
++        i = malloc(sizeof *i);
++        memcpy(i->code, code, 2);
++        strncpy(i->name, name, sizeof i->name);
++        i->comment = strdup(comment);
++        i->longitude = longitude;
++        i->latitude = latitude;
++        i->next = li[hash];
++        li[hash] = i;
++        /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
++    }
++
++    fclose(fp);
++
++    return li;
++}
++
++/* Return location info from hash table, using given timezone name.
++ * Returns NULL if the name could not be found. */
++const struct location_info *find_zone_info(struct location_info **li, 
++                                           const char *name)
++{
++    uint32_t hash = tz_hash(name);
++    const struct location_info *l;
++
++    if (!li) {
++        return NULL;
++    }
++
++    for (l = li[hash]; l; l = l->next) {
++        if (strcasecmp(l->name, name) == 0)
++            return l;
++    }
++
++    return NULL;
++}    
++
++/* Filter out some non-tzdata files and the posix/right databases, if
++ * present. */
++static int index_filter(const struct dirent *ent)
++{
++	return strcmp(ent->d_name, ".") != 0
++		&& strcmp(ent->d_name, "..") != 0
++		&& strcmp(ent->d_name, "posix") != 0
++		&& strcmp(ent->d_name, "posixrules") != 0
++		&& strcmp(ent->d_name, "right") != 0
++		&& strstr(ent->d_name, ".tab") == NULL;
++}
++
++static int sysdbcmp(const void *first, const void *second)
++{
++        const timelib_tzdb_index_entry *alpha = first, *beta = second;
++
++        return strcmp(alpha->id, beta->id);
++}
++
++
++/* Create the zone identifier index by trawling the filesystem. */
++static void create_zone_index(timelib_tzdb *db)
++{
++	size_t dirstack_size,  dirstack_top;
++	size_t index_size, index_next;
++	timelib_tzdb_index_entry *db_index;
++	char **dirstack;
++
++	/* LIFO stack to hold directory entries to scan; each slot is a
++	 * directory name relative to the zoneinfo prefix. */
++	dirstack_size = 32;
++	dirstack = malloc(dirstack_size * sizeof *dirstack);
++	dirstack_top = 1;
++	dirstack[0] = strdup("");
++	
++	/* Index array. */
++	index_size = 64;
++	db_index = malloc(index_size * sizeof *db_index);
++	index_next = 0;
++
++	do {
++		struct dirent **ents;
++		char name[PATH_MAX], *top;
++		int count;
++
++		/* Pop the top stack entry, and iterate through its contents. */
++		top = dirstack[--dirstack_top];
++		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
++
++		count = php_scandir(name, &ents, index_filter, php_alphasort);
++
++		while (count > 0) {
++			struct stat st;
++			const char *leaf = ents[count - 1]->d_name;
++
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++				 top, leaf);
++			
++			if (strlen(name) && stat(name, &st) == 0) {
++				/* Name, relative to the zoneinfo prefix. */
++				const char *root = top;
++
++				if (root[0] == '/') root++;
++
++				snprintf(name, sizeof name, "%s%s%s", root, 
++					 *root ? "/": "", leaf);
++
++				if (S_ISDIR(st.st_mode)) {
++					if (dirstack_top == dirstack_size) {
++						dirstack_size *= 2;
++						dirstack = realloc(dirstack, 
++								   dirstack_size * sizeof *dirstack);
++					}
++					dirstack[dirstack_top++] = strdup(name);
++				}
++				else {
++					if (index_next == index_size) {
++						index_size *= 2;
++						db_index = realloc(db_index,
++								   index_size * sizeof *db_index);
++					}
++
++					db_index[index_next++].id = strdup(name);
++				}
++			}
++
++			free(ents[--count]);
++		}
++		
++		if (count != -1) free(ents);
++		free(top);
++	} while (dirstack_top);
++
++        qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
++
++	db->index = db_index;
++	db->index_size = index_next;
++
++	free(dirstack);
++}
++
++#define FAKE_HEADER "1234\0??\1??"
++#define FAKE_UTC_POS (7 - 4)
++
++/* Create a fake data segment for database 'sysdb'. */
++static void fake_data_segment(timelib_tzdb *sysdb,
++                              struct location_info **info)
++{
++        size_t n;
++        char *data, *p;
++        
++        data = malloc(3 * sysdb->index_size + 7);
++
++        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
++
++        for (n = 0; n < sysdb->index_size; n++) {
++                const struct location_info *li;
++                timelib_tzdb_index_entry *ent;
++
++                ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
++
++                /* Lookup the timezone name in the hash table. */
++                if (strcmp(ent->id, "UTC") == 0) {
++                        ent->pos = FAKE_UTC_POS;
++                        continue;
++                }
++
++                li = find_zone_info(info, ent->id);
++                if (li) {
++                        /* If found, append the BC byte and the
++                         * country code; set the position for this
++                         * section of timezone data.  */
++                        ent->pos = (p - data) - 4;
++                        *p++ = '\1';
++                        *p++ = li->code[0];
++                        *p++ = li->code[1];
++                }
++                else {
++                        /* If not found, the timezone data can
++                         * point at the header. */
++                        ent->pos = 0;
++                }
++        }
++        
++        sysdb->data = (unsigned char *)data;
++}
++
++/* Returns true if the passed-in stat structure describes a
++ * probably-valid timezone file. */
++static int is_valid_tzfile(const struct stat *st)
++{
++	return S_ISREG(st->st_mode) && st->st_size > 20;
++}
++
++/* Return the mmap()ed tzfile if found, else NULL.  On success, the
++ * length of the mapped data is placed in *length. */
++static char *map_tzfile(const char *timezone, size_t *length)
++{
++	char fname[PATH_MAX];
++	struct stat st;
++	char *p;
++	int fd;
++	
++	if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
++		return NULL;
++	}
++
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++	
++	fd = open(fname, O_RDONLY);
++	if (fd == -1) {
++		return NULL;
++	} else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st)) {
++		close(fd);
++		return NULL;
++	}
++
++	*length = st.st_size;
++	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++	close(fd);
++	
++	return p != MAP_FAILED ? p : NULL;
++}
++
++#endif
++
++static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	int left = 0, right = tzdb->index_size - 1;
+ #ifdef HAVE_SETLOCALE
+@@ -295,36 +705,128 @@ static int seek_to_tz_position(const uns
+ 	return 0;
+ }
+ 
++static int seek_to_tz_position(const unsigned char **tzf, char *timezone, 
++			       char **map, size_t *maplen,
++			       const timelib_tzdb *tzdb)
++{
++#ifdef HAVE_SYSTEM_TZDATA
++	if (tzdb == timezonedb_system) {
++		char *orig;
++
++		orig = map_tzfile(timezone, maplen);
++		if (orig == NULL) {
++			return 0;
++		}
++		
++		(*tzf) = (unsigned char *)orig ;
++		*map = orig;
++                
++                return 1;
++	}
++	else
++#endif
++	{
++		return inmem_seek_to_tz_position(tzf, timezone, tzdb);
++	}
++}
++
+ const timelib_tzdb *timelib_builtin_db(void)
+ {
++#ifdef HAVE_SYSTEM_TZDATA
++	if (timezonedb_system == NULL) {
++		timelib_tzdb *tmp = malloc(sizeof *tmp);
++
++		tmp->version = "0.system";
++		tmp->data = NULL;
++		create_zone_index(tmp);
++		system_location_table = create_location_table();
++                fake_data_segment(tmp, system_location_table);
++		timezonedb_system = tmp;
++	}
++
++			
++	return timezonedb_system;
++#else
+ 	return &timezonedb_builtin;
++#endif
+ }
+ 
+ const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
+ {
++#ifdef HAVE_SYSTEM_TZDATA
++	*count = timezonedb_system->index_size;
++	return timezonedb_system->index;
++#else
+ 	*count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin);
+ 	return timezonedb_idx_builtin;
++#endif
+ }
+ 
+ int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	const unsigned char *tzf;
+-	return (seek_to_tz_position(&tzf, timezone, tzdb));
++
++#ifdef HAVE_SYSTEM_TZDATA
++        if (tzdb == timezonedb_system) {
++            char fname[PATH_MAX];
++            struct stat st;
++
++            if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
++		return 0;
++            }
++            
++            snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
++            
++            return stat(fname, &st) == 0 && is_valid_tzfile(&st);
++        }
++#endif
++
++	return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
+ }
+ 
+ timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	const unsigned char *tzf;
++	char *memmap = NULL;
++	size_t maplen;
+ 	timelib_tzinfo *tmp;
+ 
+-	if (seek_to_tz_position(&tzf, timezone, tzdb)) {
++	if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
+ 		tmp = timelib_tzinfo_ctor(timezone);
+ 
+ 		read_preamble(&tzf, tmp);
+ 		read_header(&tzf, tmp);
+ 		read_transistions(&tzf, tmp);
+ 		read_types(&tzf, tmp);
+-		read_location(&tzf, tmp);
++
++#ifdef HAVE_SYSTEM_TZDATA
++		if (memmap) {
++			const struct location_info *li;
++
++			/* TZif-style - grok the location info from the system database,
++			 * if possible. */
++
++			if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
++				tmp->location.comments = strdup(li->comment);
++                                strncpy(tmp->location.country_code, li->code, 2);
++				tmp->location.longitude = li->longitude;
++				tmp->location.latitude = li->latitude;
++				tmp->bc = 1;
++			}
++			else {
++				strcpy(tmp->location.country_code, "??");
++				tmp->bc = 0;
++				tmp->location.comments = strdup("");
++			}
++
++			/* Now done with the mmap segment - discard it. */
++			munmap(memmap, maplen);
++		} else
++#endif
++		{
++			/* PHP-style - use the embedded info. */
++			read_location(&tzf, tmp);
++		}
+ 	} else {
+ 		tmp = NULL;
+ 	}
+--- a/ext/date/lib/timelib.m4
++++ b/ext/date/lib/timelib.m4
+@@ -78,3 +78,17 @@ stdlib.h
+ 
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS(strtoll atoll strftime)
++
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
++no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
++
++   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++                         [Define for location of system timezone data])
++   fi
++fi
++
diff --git a/trunk/package/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch b/trunk/package/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch
new file mode 100644
index 00000000..ae8d1827
--- /dev/null
+++ b/trunk/package/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch
@@ -0,0 +1,19 @@
+Author: Sean Finney <seanius@debian.org>
+Forwarded: no (upstream doesn't want it)
+Description: Silence warnings about using the default system timezone info
+ In vanilla upstream php, this is considered an error (i.e. the user must
+ set the timezone explicitly), though with our use of the system timezonedb
+ patch, we actually feel quite comfortable using the default timezone info.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762
+--- a/ext/date/tests/date_default_timezone_set-1.phpt
++++ b/ext/date/tests/date_default_timezone_set-1.phpt
+@@ -22,9 +22,6 @@ date.timezone=
+ 	echo date(DATE_ISO8601, $date4), "\n";
+ ?>
+ --EXPECTF--
+-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 3
+-
+-Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in %sdate_default_timezone_set-1.php on line 4
+ America/Indiana/Knox
+ 2005-01-12T03:00:00-0500
+ 2005-07-12T03:00:00-0500
diff --git a/trunk/package/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch b/trunk/package/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch
new file mode 100644
index 00000000..216a5180
--- /dev/null
+++ b/trunk/package/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch
@@ -0,0 +1,14 @@
+--- a/configure.in
++++ b/configure.in
+@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl)
+ PHP_CHECK_FUNC(gethostbyaddr, nsl)
+ PHP_CHECK_FUNC(yp_get_default_domain, nsl)
+ 
+-PHP_CHECK_FUNC(dlopen, dl)
++PHP_ADD_LIBRARY(dl)
++PHP_DEF_HAVE(dlopen)
++PHP_DEF_HAVE(libdl)
++ac_cv_func_dlopen=yes
+ if test "$ac_cv_func_dlopen" = "yes"; then
+   AC_DEFINE(HAVE_LIBDL, 1, [ ])
+ fi
diff --git a/trunk/package/lang/php5/pecl.mk b/trunk/package/lang/php5/pecl.mk
new file mode 100644
index 00000000..e1b98196
--- /dev/null
+++ b/trunk/package/lang/php5/pecl.mk
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2011-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Package/php5-pecl/Default
+  SUBMENU:=PHP
+  SECTION:=lang
+  CATEGORY:=Languages
+  URL:=http://pecl.php.net/
+  MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+  DEPENDS:=php5
+endef
+
+define Build/Configure
+	( cd $(PKG_BUILD_DIR); $(STAGING_DIR_HOST)/usr/bin/phpize )
+	$(Build/Configure/Default)
+endef
+
+CONFIGURE_ARGS+= \
+	--with-php-config=$(STAGING_DIR_HOST)/usr/bin/php-config
+
+define PECLPackage
+
+  define Package/php5-pecl-$(1)
+    $(call Package/php5-pecl/Default)
+    TITLE:=$(2)
+
+    ifneq ($(3),)
+      DEPENDS+=$(3)
+    endif
+  endef
+
+  define Package/php5-pecl-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/php
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
+	$(INSTALL_DIR) $$(1)/etc/php5
+    ifeq ($(4),zend)
+	echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
+    else
+	echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
+    endif
+  endef
+
+endef
diff --git a/trunk/package/lang/python-dns/Makefile b/trunk/package/lang/python-dns/Makefile
new file mode 100644
index 00000000..aa5d2e2c
--- /dev/null
+++ b/trunk/package/lang/python-dns/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-dns
+PKG_RELEASE:=1
+PKG_VERSION:=1.12.0
+PKG_SOURCE_URL:=http://www.dnspython.org/kits/$(PKG_VERSION)
+PKG_MD5SUM:=3f2601ef3c8b77fc6d21a9c77a81efeb
+PKG_SOURCE:=dnspython-$(PKG_VERSION).tar.gz
+PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=LICENSE
+PKG_BUILD_DIR:=$(BUILD_DIR)/dnspython-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/python-dns
+	SECTION:=language-python
+	CATEGORY:=Languages
+	SUBMENU:=Python
+	TITLE:=dnspython
+	URL:=http://www.dnspython.org/
+	DEPENDS:=+python
+endef
+
+define Package/python-dns/description
+ dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0.
+endef
+
+define Build/Compile
+	$(call Build/Compile/PyMod,,\
+		install --prefix="$(PKG_INSTALL_DIR)/usr" \
+	)
+endef
+
+define PyPackage/python-dns/filespec
++|/usr/lib/python$(PYTHON_VERSION)/site-packages
+endef
+
+$(eval $(call PyPackage,python-dns))
+$(eval $(call BuildPackage,python-dns))
diff --git a/trunk/package/lang/python-imglib/Makefile b/trunk/package/lang/python-imglib/Makefile
new file mode 100644
index 00000000..1d12004a
--- /dev/null
+++ b/trunk/package/lang/python-imglib/Makefile
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 1997-2009 by Secret Labs AB
+# Copyright (c) 1995-2009 by Fredrik Lundh
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-imglib
+PKG_VERSION:=1.1.7
+PKG_RELEASE:=1
+PKG_LICENSE:=CUSTOM
+PKG_LICENSE_FILES:=README
+
+PKG_SOURCE:=Imaging-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://effbot.org/downloads
+PKG_MD5SUM:=fc14a54e1ce02a0225be8854bfba478e
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/Imaging-$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=python python-setuptools
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/python-imglib
+  SECTION:=language-python
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Python Imaging Library (PIL)
+  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
+  URL:=http://www.pythonware.com/products/pil/
+  DEPENDS:=+python +libfreetype +libjpeg +zlib
+endef
+
+define Package/python-imglib/description
+ The Python Imaging Library adds image processing capabilities to your
+ Python interpreter.
+
+ This library provides extensive file format support, an efficient
+ internal representation, and fairly powerful image processing
+ capabilities.
+
+ The core image library is designed for fast access to data stored in a
+ few basic pixel formats. It should provide a solid foundation for a
+ general image processing tool.
+endef
+
+define Build/Compile
+	$(call Build/Compile/PyMod,., \
+		install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \
+	)
+endef
+
+define Package/python-imglib/install
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
+		$(1)$(PYTHON_PKG_DIR)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,python-imglib))
diff --git a/trunk/package/lang/python-imglib/patches/010-cross-compile.patch b/trunk/package/lang/python-imglib/patches/010-cross-compile.patch
new file mode 100644
index 00000000..0aca43b3
--- /dev/null
+++ b/trunk/package/lang/python-imglib/patches/010-cross-compile.patch
@@ -0,0 +1,48 @@
+diff -rupN Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py
+--- Imaging-1.1.7.orig/setup.py	2009-11-15 17:06:10.000000000 +0100
++++ Imaging-1.1.7/setup.py	2014-12-11 01:01:10.857100877 +0100
+@@ -34,10 +34,10 @@ def libinclude(root):
+ # TIFF_ROOT = libinclude("/opt/tiff")
+ 
+ TCL_ROOT = None
+-JPEG_ROOT = None
+-ZLIB_ROOT = None
++JPEG_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
++ZLIB_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
+ TIFF_ROOT = None
+-FREETYPE_ROOT = None
++FREETYPE_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include"
+ LCMS_ROOT = None
+ 
+ # FIXME: add mechanism to explicitly *disable* the use of a library
+@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
+             add_directory(library_dirs, "/opt/local/lib")
+             add_directory(include_dirs, "/opt/local/include")
+ 
+-        add_directory(library_dirs, "/usr/local/lib")
+         # FIXME: check /opt/stuff directories here?
+ 
+         prefix = sysconfig.get_config_var("prefix")
+@@ -199,22 +198,6 @@ class pil_build_ext(build_ext):
+             add_directory(include_dirs, include_root)
+ 
+         #
+-        # add standard directories
+-
+-        # look for tcl specific subdirectory (e.g debian)
+-        if _tkinter:
+-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
+-            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
+-                add_directory(include_dirs, tcl_dir)
+-
+-        # standard locations
+-        add_directory(library_dirs, "/usr/local/lib")
+-        add_directory(include_dirs, "/usr/local/include")
+-
+-        add_directory(library_dirs, "/usr/lib")
+-        add_directory(include_dirs, "/usr/include")
+-
+-        #
+         # insert new dirs *before* default libs, to avoid conflicts
+         # between Python PYD stub libs and real libraries
+ 
diff --git a/trunk/package/lang/python-imglib/patches/020-freetype-header-include.patch b/trunk/package/lang/python-imglib/patches/020-freetype-header-include.patch
new file mode 100644
index 00000000..bf131aa7
--- /dev/null
+++ b/trunk/package/lang/python-imglib/patches/020-freetype-header-include.patch
@@ -0,0 +1,21 @@
+diff -rupN Imaging-1.1.7.orig/_imagingft.c Imaging-1.1.7/_imagingft.c
+--- Imaging-1.1.7.orig/_imagingft.c	2009-11-01 01:44:12.000000000 +0100
++++ Imaging-1.1.7/_imagingft.c	2014-12-11 01:05:21.290135484 +0100
+@@ -32,7 +32,7 @@
+ #include FT_FREETYPE_H
+ #else
+ /* freetype 2.0 */
+-#include <freetype/freetype.h>
++#include <freetype2/freetype.h>
+ #endif
+ 
+ #if PY_VERSION_HEX < 0x01060000
+@@ -70,7 +70,7 @@ struct {
+     const char* message;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include <freetype2/fterrors.h>
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */
diff --git a/trunk/package/lang/python-mysql/Makefile b/trunk/package/lang/python-mysql/Makefile
new file mode 100644
index 00000000..04ebe5be
--- /dev/null
+++ b/trunk/package/lang/python-mysql/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=MySQL-python
+PKG_VERSION:=1.2.5
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
+PKG_SOURCE_URL:=https://pypi.python.org/packages/source/M/MySQL-python/
+PKG_MD5SUM:=654f75b302db6ed8dc5a898c625e030c
+
+PKG_BUILD_DEPENDS:=python python-setuptools libmysqlclient
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/python-mysql
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=MySQL database adapter for Python
+  URL:=https://pypi.python.org/pypi/MySQL-python
+  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
+  DEPENDS:=+python +libmysqlclient
+endef
+
+define Package/python-mysql/description
+ MySQLdb is an thread-compatible interface to the popular MySQL database
+ server that provides the Python database API.
+endef
+
+define Build/Compile
+	$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
+endef
+
+define Package/python-mysql/install
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+	$(CP) \
+	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
+	    $(1)$(PYTHON_PKG_DIR)
+endef
+
+$(eval $(call BuildPackage,python-mysql))
diff --git a/trunk/package/lang/python-mysql/patches/010-threadsafe.patch b/trunk/package/lang/python-mysql/patches/010-threadsafe.patch
new file mode 100644
index 00000000..bcd9af8d
--- /dev/null
+++ b/trunk/package/lang/python-mysql/patches/010-threadsafe.patch
@@ -0,0 +1,11 @@
+--- MySQL-python-1.2.2/site_orig.cfg	2007-08-15 12:58:40.000000000 +0200
++++ MySQL-python-1.2.2/site.cfg	2007-08-15 12:58:49.000000000 +0200
+@@ -4,7 +4,7 @@
+ # static: link against a static library (probably required for embedded)
+ 
+ embedded = False
+-threadsafe = True
++threadsafe = False
+ static = False
+ 
+ # The path to mysql_config.
diff --git a/trunk/package/lang/python-pip/Makefile b/trunk/package/lang/python-pip/Makefile
new file mode 100644
index 00000000..d7404ba2
--- /dev/null
+++ b/trunk/package/lang/python-pip/Makefile
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+# 
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-pip
+PKG_VERSION:=1.5.6
+PKG_RELEASE:=1
+
+PKG_SOURCE:=pip-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://pypi.python.org/packages/source/p/pip/
+PKG_MD5SUM:=01026f87978932060cc86c1dc527903e
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/pip-$(PKG_VERSION)
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/python-pip
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Tool for installing Python packages.
+  URL:=https://pip.pypa.io
+  DEPENDS:=+python +python-setuptools
+endef
+
+define Package/python-pip/description
+  A tool for installing and managing Python packages.
+endef
+
+define Build/Compile
+	$(call Build/Compile/PyMod,,\
+		install --prefix="$(PKG_INSTALL_DIR)/usr" \
+	)
+endef
+
+define PyPackage/python-pip/filespec
++|/usr/lib/python$(PYTHON_VERSION)
+endef
+
+define PyPackage/python-pip/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+endef
+
+$(eval $(call PyPackage,python-pip))
+$(eval $(call BuildPackage,python-pip))
+
diff --git a/trunk/package/lang/python-setuptools/Makefile b/trunk/package/lang/python-setuptools/Makefile
new file mode 100644
index 00000000..0511791a
--- /dev/null
+++ b/trunk/package/lang/python-setuptools/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+# 
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-setuptools
+PKG_VERSION:=7.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=setuptools-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://pypi.python.org/packages/source/s/setuptools/
+PKG_MD5SUM:=6245d6752e2ef803c365f560f7f2f940
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/setuptools-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/python-setuptools
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Tool for installing Python packages.
+  URL:=https://bitbucket.org/pypa/setuptools
+  DEPENDS:=+python
+endef
+
+define Package/python-setuptools/description
+  Easily download, build, install, upgrade, and uninstall Python packages
+endef
+
+define Build/Compile
+	$(call Build/Compile/PyMod,,\
+		install --prefix="$(PKG_INSTALL_DIR)/usr" \
+	)
+endef
+
+define PyPackage/python-setuptools/filespec
++|/usr/lib/python$(PYTHON_VERSION)/site-packages
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(2)/lib/python$(PYTHON_VERSION)/site-packages
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \
+		$(HOST_PYTHON_LIB_DIR)/site-packages
+endef
+
+define PyPackage/python-setuptools/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+$(eval $(call PyPackage,python-setuptools))
+$(eval $(call BuildPackage,python-setuptools))
+
diff --git a/trunk/package/lang/python/Makefile b/trunk/package/lang/python/Makefile
new file mode 100644
index 00000000..954612f9
--- /dev/null
+++ b/trunk/package/lang/python/Makefile
@@ -0,0 +1,209 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+# The file included below defines PYTHON_VERSION
+include ./files/python-package.mk
+
+PKG_NAME:=python
+PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
+PKG_RELEASE:=3
+
+PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
+PKG_MD5SUM:=d235bdfa75b8396942e360a70487ee00
+
+PKG_LICENSE:=PSF
+PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+HOST_BUILD_PARALLEL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=libffi/host python/host
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/python/Default
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Python $(PYTHON_VERSION) programming language
+  URL:=http://www.python.org/
+  MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+endef
+
+define Package/python/Default/description
+ Python is a dynamic object-oriented programming language that can be used
+ for many kinds of software development. It offers strong support for
+ integration with other languages and tools, comes with extensive standard
+ libraries, and can be learned in a few days. Many Python programmers
+ report substantial productivity gains and feel the language encourages
+ the development of higher quality, more maintainable code.
+endef
+
+define Package/python-base
+$(call Package/python/Default)
+  TITLE:=Python $(PYTHON_VERSION) interpreter
+  DEPENDS:=+libpthread +zlib +libffi +libopenssl
+endef
+
+define Package/python-base/description
+  This package contains only the interpreter and the bare minimum
+  for the interpreter to start.
+endef
+
+define Package/python
+$(call Package/python/Default)
+  DEPENDS:=+python-base +libncursesw +libbz2 +libgdbm +libsqlite3 +libexpat +libdb47
+endef
+
+define Package/python/description
+  This package contains the (almost) full Python install.
+endef
+
+MAKE_FLAGS+=\
+	CROSS_COMPILE=yes \
+	LD="$(TARGET_CC)" \
+	PGEN=pgen2
+
+EXTRA_CFLAGS+= \
+	-DNDEBUG -fno-inline
+EXTRA_LDFLAGS+= \
+	-L$(PKG_BUILD_DIR)
+
+ENABLE_IPV6:=
+ifeq ($(CONFIG_IPV6),y)
+	ENABLE_IPV6 += --enable-ipv6
+endif
+
+CONFIGURE_ARGS+= \
+	--sysconfdir=/etc \
+	--enable-shared \
+	--without-cxx-main \
+	--with-threads \
+	--with-system-ffi="$(STAGING_DIR)/usr" \
+	--without-pymalloc \
+	$(ENABLE_IPV6) \
+	CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
+	OPT="$(TARGET_CFLAGS)"
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) ./files/config.site $(PKG_BUILD_DIR)/config.site
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/mk/
+	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
+	$(INSTALL_DATA) ./files/python-package.mk $(STAGING_DIR)/mk/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
+		$(1)/usr/include/
+	$(CP) \
+		$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
+		$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
+		$(1)/usr/lib/python$(PYTHON_VERSION)/
+endef
+
+define PyPackage/python-base/filespec
++|/usr/bin/python$(PYTHON_VERSION)
++|/usr/lib/python$(PYTHON_VERSION)/_abcoll.py
++|/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py
++|/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py
++|/usr/lib/python$(PYTHON_VERSION)/abc.py
++|/usr/lib/python$(PYTHON_VERSION)/copy_reg.py
++|/usr/lib/python$(PYTHON_VERSION)/genericpath.py
++|/usr/lib/python$(PYTHON_VERSION)/linecache.py
++|/usr/lib/python$(PYTHON_VERSION)/posixpath.py
++|/usr/lib/python$(PYTHON_VERSION)/os.py
++|/usr/lib/python$(PYTHON_VERSION)/re.py
++|/usr/lib/python$(PYTHON_VERSION)/site.py
++|/usr/lib/python$(PYTHON_VERSION)/sre_compile.py
++|/usr/lib/python$(PYTHON_VERSION)/sre_constants.py
++|/usr/lib/python$(PYTHON_VERSION)/sre_parse.py
++|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
++|/usr/lib/python$(PYTHON_VERSION)/stat.py
++|/usr/lib/python$(PYTHON_VERSION)/traceback.py
++|/usr/lib/python$(PYTHON_VERSION)/types.py
++|/usr/lib/python$(PYTHON_VERSION)/UserDict.py
++|/usr/lib/python$(PYTHON_VERSION)/warnings.py
+endef
+
+define PyPackage/python/filespec
++|/usr/lib/python$(PYTHON_VERSION)
+-|/usr/lib/python$(PYTHON_VERSION)/config
+-|/usr/lib/python$(PYTHON_VERSION)/distutils/cygwinccompiler.py
+-|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst*
+-|/usr/lib/python$(PYTHON_VERSION)/idlelib
+-|/usr/lib/python$(PYTHON_VERSION)/lib2to3
+-|/usr/lib/python$(PYTHON_VERSION)/lib-tk
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_testcapi.so
+-|/usr/lib/python$(PYTHON_VERSION)/pdb.doc
+-|/usr/lib/python$(PYTHON_VERSION)/test
+-|/usr/lib/python$(PYTHON_VERSION)/webbrowser.py
+-|/usr/lib/python$(PYTHON_VERSION)/*/test
+-|/usr/lib/python$(PYTHON_VERSION)/*/tests
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline.so
+-|/usr/lib/python$(PYTHON_VERSION)/_abcoll.py
+-|/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py
+-|/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py
+-|/usr/lib/python$(PYTHON_VERSION)/abc.py
+-|/usr/lib/python$(PYTHON_VERSION)/copy_reg.py
+-|/usr/lib/python$(PYTHON_VERSION)/genericpath.py
+-|/usr/lib/python$(PYTHON_VERSION)/linecache.py
+-|/usr/lib/python$(PYTHON_VERSION)/posixpath.py
+-|/usr/lib/python$(PYTHON_VERSION)/os.py
+-|/usr/lib/python$(PYTHON_VERSION)/re.py
+-|/usr/lib/python$(PYTHON_VERSION)/site.py
+-|/usr/lib/python$(PYTHON_VERSION)/sre_compile.py
+-|/usr/lib/python$(PYTHON_VERSION)/sre_constants.py
+-|/usr/lib/python$(PYTHON_VERSION)/sre_parse.py
+-|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
+-|/usr/lib/python$(PYTHON_VERSION)/stat.py
+-|/usr/lib/python$(PYTHON_VERSION)/traceback.py
+-|/usr/lib/python$(PYTHON_VERSION)/types.py
+-|/usr/lib/python$(PYTHON_VERSION)/UserDict.py
+-|/usr/lib/python$(PYTHON_VERSION)/warnings.py
+endef
+
+define PyPackage/python-base/install
+	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python
+	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python2
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
+endef
+
+HOST_CONFIGURE_ARGS+= \
+	--without-cxx-main \
+	--without-pymalloc \
+	--with-threads \
+	--prefix=$(STAGING_DIR_HOST) \
+	CONFIG_SITE= \
+	OPT="$(HOST_CFLAGS)"
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
+	$(MAKE) -C $(HOST_BUILD_DIR) install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen2
+endef
+
+$(eval $(call HostBuild))
+
+$(eval $(call PyPackage,python-base))
+$(eval $(call PyPackage,python))
+
+$(eval $(call BuildPackage,python-base))
+$(eval $(call BuildPackage,python))
diff --git a/trunk/package/lang/python/files/config.site b/trunk/package/lang/python/files/config.site
new file mode 100644
index 00000000..cfa56b89
--- /dev/null
+++ b/trunk/package/lang/python/files/config.site
@@ -0,0 +1,12 @@
+#! /bin/sh
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ac_cv_file__dev_ptmx=yes
+ac_cv_file__dev_ptc=no
+ac_cv_buggy_getaddrinfo=no
+
diff --git a/trunk/package/lang/python/files/python-package.mk b/trunk/package/lang/python/files/python-package.mk
new file mode 100644
index 00000000..3a71d09b
--- /dev/null
+++ b/trunk/package/lang/python/files/python-package.mk
@@ -0,0 +1,100 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+PYTHON_VERSION:=2.7
+PYTHON_VERSION_MICRO:=8
+
+PYTHON_DIR:=$(STAGING_DIR)/usr
+PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
+PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
+PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
+
+PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
+
+PYTHON:=python$(PYTHON_VERSION)
+
+HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION)
+HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2
+
+PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR)
+PYTHONPATH+=:$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
+define HostPython
+	(	export PYTHONPATH="$(PYTHONPATH)"; \
+		export PYTHONOPTIMIZE=""; \
+		export PYTHONDONTWRITEBYTECODE=1; \
+		$(1) \
+		$(HOST_PYTHON_BIN) $(2); \
+	)
+endef
+
+PKG_USE_MIPS16:=0
+# This is required in addition to PKG_USE_MIPS16:=0 because otherwise MIPS16
+# flags are inherited from the Python base package (via sysconfig module)
+ifdef CONFIG_USE_MIPS16
+  TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16
+endif
+
+define PyPackage
+  $(call shexport,PyPackage/$(1)/filespec)
+
+  define Package/$(1)/install
+	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
+	@echo "$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" | ( \
+		IFS='|'; \
+		while read fop fspec fperm; do \
+		  if [ "$$$$$$$$fop" = "+" ]; then \
+			if [ ! -e "$(PKG_INSTALL_DIR)$$$$$$$$fspec" ]; then \
+			  echo "File not found '$(PKG_INSTALL_DIR)$$$$$$$$fspec'"; \
+			  exit 1; \
+			fi; \
+			dpath=`dirname "$$$$$$$$fspec"`; \
+			if [ -n "$$$$$$$$fperm" ]; then \
+			  dperm="-m$$$$$$$$fperm"; \
+			else \
+			  dperm=`stat -c "%a" $(PKG_INSTALL_DIR)$$$$$$$$dpath`; \
+			fi; \
+			mkdir -p $$$$$$$$$dperm $$(1)$$$$$$$$dpath; \
+			echo "copying: '$$$$$$$$fspec'"; \
+			cp -fpR $(PKG_INSTALL_DIR)$$$$$$$$fspec $$(1)$$$$$$$$dpath/; \
+			if [ -n "$$$$$$$$fperm" ]; then \
+			  chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
+			fi; \
+		  elif [ "$$$$$$$$fop" = "-" ]; then \
+			echo "removing: '$$$$$$$$fspec'"; \
+			rm -fR $$(1)$$$$$$$$fspec; \
+		  elif [ "$$$$$$$$fop" = "=" ]; then \
+			echo "setting permissions: '$$$$$$$$fperm' on '$$$$$$$$fspec'"; \
+			chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
+		  fi; \
+		done; \
+	)
+	$(call PyPackage/$(1)/install,$$(1))
+  endef
+endef
+
+# $(1) => build subdir
+# $(2) => additional arguments to setup.py
+# $(3) => additional variables
+define Build/Compile/PyMod
+	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
+	$(call HostPython, \
+		cd $(PKG_BUILD_DIR)/$(strip $(1)); \
+		CC="$(TARGET_CC)" \
+		CCSHARED="$(TARGET_CC) $(FPIC)" \
+		LD="$(TARGET_CC)" \
+		LDSHARED="$(TARGET_CC) -shared" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON_INC_DIR)" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON_VERSION)" \
+		_PYTHON_HOST_PLATFORM="linux-$(ARCH)" \
+		__PYVENV_LAUNCHER__="/usr/bin/$(PYTHON)" \
+		$(3) \
+		, \
+		./setup.py $(2) \
+	)
+	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
+endef
diff --git a/trunk/package/lang/python/patches/110-enable-zlib.patch b/trunk/package/lang/python/patches/110-enable-zlib.patch
new file mode 100644
index 00000000..780831e8
--- /dev/null
+++ b/trunk/package/lang/python/patches/110-enable-zlib.patch
@@ -0,0 +1,25 @@
+From 6eeab87bc852481e599325549c854b701bf2e39f Mon Sep 17 00:00:00 2001
+From: Alexandru Ardelean <aa@ocedo.com>
+Date: Thu, 25 Sep 2014 18:18:29 +0300
+Subject: [PATCH] enable zlib
+
+---
+ Modules/Setup.dist | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/Setup.dist b/Modules/Setup.dist
+index 01fb85f..01ac492 100644
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
+@@ -358,7 +358,7 @@ _symtable symtablemodule.c
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -lz
+ 
+ # Interface to the Expat XML parser
+ #
+-- 
+1.8.4.5
+
diff --git a/trunk/package/lang/python/patches/120-do-not-add-include-dirs-when-cross-compiling.patch b/trunk/package/lang/python/patches/120-do-not-add-include-dirs-when-cross-compiling.patch
new file mode 100644
index 00000000..fb2fe8a7
--- /dev/null
+++ b/trunk/package/lang/python/patches/120-do-not-add-include-dirs-when-cross-compiling.patch
@@ -0,0 +1,14 @@
+diff --git a/setup.py b/setup.py
+index cbdeaf3..5154412 100644
+--- a/setup.py
++++ b/setup.py
+@@ -480,7 +480,8 @@ class PyBuildExt(build_ext):
+                         add_dir_to_list(dir_list, directory)
+ 
+         if os.path.normpath(sys.prefix) != '/usr' \
+-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
++                and not sysconfig.get_config_var('PYTHONFRAMEWORK') \
++                and not cross_compiling:
+             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+             # building a framework with different architectures than
diff --git a/trunk/package/lang/python/patches/130-do-not-run-distutils-tests.patch b/trunk/package/lang/python/patches/130-do-not-run-distutils-tests.patch
new file mode 100644
index 00000000..4fdd2bb4
--- /dev/null
+++ b/trunk/package/lang/python/patches/130-do-not-run-distutils-tests.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index bcd83bf..c4dcc6d 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1005,32 +1005,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 		done; \
+ 	done
+ 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+-	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
+-		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+-			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
+-	fi
+-	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST) -f \
+-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+-		$(DESTDIR)$(LIBDEST)
+-	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST) -f \
+-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+-		$(DESTDIR)$(LIBDEST)
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST)/site-packages -f \
+-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST)/site-packages -f \
+-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
+ 
+ # Create the PLATDIR source directory, if one wasn't distributed..
+ $(srcdir)/Lib/$(PLATDIR):
diff --git a/trunk/package/lang/python/patches/140-do-not-write-bytes-codes.patch b/trunk/package/lang/python/patches/140-do-not-write-bytes-codes.patch
new file mode 100644
index 00000000..f67e7dca
--- /dev/null
+++ b/trunk/package/lang/python/patches/140-do-not-write-bytes-codes.patch
@@ -0,0 +1,22 @@
+diff --git a/Python/pythonrun.c b/Python/pythonrun.c
+index 748a63b..cb6e291 100644
+--- a/Python/pythonrun.c
++++ b/Python/pythonrun.c
+@@ -79,7 +79,7 @@ int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
+ int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
+ int Py_NoSiteFlag; /* Suppress 'import site' */
+ int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
+-int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
++int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */
+ int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
+ int Py_FrozenFlag; /* Needed by getpath.c */
+ int Py_UnicodeFlag = 0; /* Needed by compile.c */
+@@ -174,7 +174,7 @@ Py_InitializeEx(int install_sigs)
+     if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
+         Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
+     if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
+-        Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p);
++        Py_DontWriteBytecodeFlag = atoi(p);
+     /* The variable is only tested for existence here; _PyRandom_Init will
+        check its value further. */
+     if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0')
diff --git a/trunk/package/lang/python3/Makefile b/trunk/package/lang/python3/Makefile
new file mode 100644
index 00000000..2e9a8715
--- /dev/null
+++ b/trunk/package/lang/python3/Makefile
@@ -0,0 +1,196 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+# The file included below defines PYTHON_VERSION
+include ./files/python3-package.mk
+
+PYTHON_VERSION:=$(PYTHON3_VERSION)
+PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
+
+PKG_NAME:=python3
+PKG_RELEASE:=1
+PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
+
+PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
+PKG_MD5SUM:=36fc7327c02c6f12fa24fc9ba78039e3
+
+PKG_LICENSE:=PSF
+PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+HOST_BUILD_PARALLEL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=libffi/host python3/host
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/python3/Default
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Python $(PYTHON_VERSION) programming language
+  URL:=http://www.python.org/
+  MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
+endef
+
+define Package/python3/Default/description
+ Python is a dynamic object-oriented programming language that can be used
+ for many kinds of software development. It offers strong support for
+ integration with other languages and tools, comes with extensive standard
+ libraries, and can be learned in a few days. Many Python programmers
+ report substantial productivity gains and feel the language encourages
+ the development of higher quality, more maintainable code.
+endef
+
+define Package/python3-base
+$(call Package/python3/Default)
+  TITLE:=Python $(PYTHON_VERSION) interpreter
+  DEPENDS:=+libpthread +zlib +libffi
+endef
+
+define Package/python3-base/description
+  This package contains only the interpreter and the bare minimum
+  for the interpreter to start.
+endef
+
+define Package/python3
+$(call Package/python3/Default)
+  DEPENDS:=+python3-base +libncursesw +libbz2 +libgdbm +libsqlite3 +libdb47 +libopenssl
+endef
+
+define Package/python3/description
+  This package contains the (almost) full Python install.
+endef
+
+MAKE_FLAGS+=\
+	CROSS_COMPILE=yes \
+	LD="$(TARGET_CC)" \
+	PGEN=pgen3
+
+EXTRA_CFLAGS+= \
+	-DNDEBUG -fno-inline
+EXTRA_LDFLAGS+= \
+	-L$(PKG_BUILD_DIR)
+
+ENABLE_IPV6:=
+ifeq ($(CONFIG_IPV6),y)
+	ENABLE_IPV6 += --enable-ipv6
+endif
+
+CONFIGURE_ARGS+= \
+	--sysconfdir=/etc \
+	--enable-shared \
+	--without-cxx-main \
+	--with-threads \
+	--with-system-ffi="$(STAGING_DIR)/usr" \
+	--without-pymalloc \
+	--without-ensurepip \
+	$(ENABLE_IPV6) \
+	CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
+	OPT="$(TARGET_CFLAGS)"
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) ./files/config.site $(PKG_BUILD_DIR)/config.site
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/mk/
+	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
+	$(INSTALL_DATA) ./files/python3-package.mk $(STAGING_DIR)/mk/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
+		$(1)/usr/include/
+	$(CP) \
+		$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
+		$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config-$(PYTHON_VERSION) \
+		$(1)/usr/lib/python$(PYTHON_VERSION)/
+endef
+
+define Py3Package/python3-base/filespec
++|/usr/bin/python$(PYTHON_VERSION)
++|/usr/lib/python$(PYTHON_VERSION)/encodings
++|/usr/lib/python$(PYTHON_VERSION)/_collections_abc.py
++|/usr/lib/python$(PYTHON_VERSION)/_sitebuiltins.py
++|/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py
++|/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py
++|/usr/lib/python$(PYTHON_VERSION)/abc.py
++|/usr/lib/python$(PYTHON_VERSION)/codecs.py
++|/usr/lib/python$(PYTHON_VERSION)/genericpath.py
++|/usr/lib/python$(PYTHON_VERSION)/io.py
++|/usr/lib/python$(PYTHON_VERSION)/os.py
++|/usr/lib/python$(PYTHON_VERSION)/posixpath.py
++|/usr/lib/python$(PYTHON_VERSION)/site.py
++|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
++|/usr/lib/python$(PYTHON_VERSION)/stat.py
+endef
+
+define Py3Package/python3/filespec
++|/usr/lib/python$(PYTHON_VERSION)
+-|/usr/lib/python$(PYTHON_VERSION)/config-$(PYTHON_VERSION)
+-|/usr/lib/python$(PYTHON_VERSION)/distutils/cygwinccompiler.py
+-|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst*
+-|/usr/lib/python$(PYTHON_VERSION)/idlelib
+-|/usr/lib/python$(PYTHON_VERSION)/lib2to3
+-|/usr/lib/python$(PYTHON_VERSION)/tkinter
+-|/usr/lib/python$(PYTHON_VERSION)/turtledemo
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_test*.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline*.so
+-|/usr/lib/python$(PYTHON_VERSION)/pdb.doc
+-|/usr/lib/python$(PYTHON_VERSION)/test
+-|/usr/lib/python$(PYTHON_VERSION)/webbrowser.py
+-|/usr/lib/python$(PYTHON_VERSION)/*/test
+-|/usr/lib/python$(PYTHON_VERSION)/*/tests
+endef
+
+define Py3Package/python3-base/install
+	# Adding the lib-dynload folder (even just empty) suppresses 2 warnings when starting Python
+	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/lib-dynload/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python3
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
+endef
+
+HOST_CONFIGURE_ARGS+= \
+	--without-cxx-main \
+	--without-pymalloc \
+	--without-ensurepip \
+	--with-threads \
+	--prefix=$(STAGING_DIR_HOST) \
+	CONFIG_SITE= \
+	OPT="$(HOST_CFLAGS)"
+
+define Host/Compile
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) python Parser/pgen
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) sharedmods
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
+	$(MAKE) -C $(HOST_BUILD_DIR) install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen3
+endef
+
+$(eval $(call HostBuild))
+
+$(eval $(call Py3Package,python3-base))
+$(eval $(call Py3Package,python3))
+
+$(eval $(call BuildPackage,python3-base))
+$(eval $(call BuildPackage,python3))
diff --git a/trunk/package/lang/python3/files/config.site b/trunk/package/lang/python3/files/config.site
new file mode 100644
index 00000000..cfa56b89
--- /dev/null
+++ b/trunk/package/lang/python3/files/config.site
@@ -0,0 +1,12 @@
+#! /bin/sh
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ac_cv_file__dev_ptmx=yes
+ac_cv_file__dev_ptc=no
+ac_cv_buggy_getaddrinfo=no
+
diff --git a/trunk/package/lang/python3/files/python3-package.mk b/trunk/package/lang/python3/files/python3-package.mk
new file mode 100644
index 00000000..9ab2da9e
--- /dev/null
+++ b/trunk/package/lang/python3/files/python3-package.mk
@@ -0,0 +1,100 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+PYTHON3_VERSION:=3.4
+PYTHON3_VERSION_MICRO:=2
+
+PYTHON3_DIR:=$(STAGING_DIR)/usr
+PYTHON3_BIN_DIR:=$(PYTHON3_DIR)/bin
+PYTHON3_INC_DIR:=$(PYTHON3_DIR)/include/python$(PYTHON3_VERSION)
+PYTHON3_LIB_DIR:=$(PYTHON3_DIR)/lib/python$(PYTHON3_VERSION)
+
+PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages
+
+PYTHON3:=python$(PYTHON3_VERSION)
+
+HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION)
+HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3
+
+PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR)
+PYTHON3PATH+=:$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
+define HostPython3
+	(	export PYTHONPATH="$(PYTHON3PATH)"; \
+		export PYTHONOPTIMIZE=""; \
+		export PYTHONDONTWRITEBYTECODE=1; \
+		$(1) \
+		$(HOST_PYTHON3_BIN) $(2); \
+	)
+endef
+
+PKG_USE_MIPS16:=0
+# This is required in addition to PKG_USE_MIPS16:=0 because otherwise MIPS16
+# flags are inherited from the Python base package (via sysconfig module)
+ifdef CONFIG_USE_MIPS16
+  TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16
+endif
+
+define Py3Package
+  $(call shexport,Py3Package/$(1)/filespec)
+
+  define Package/$(1)/install
+	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
+	@echo "$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" | ( \
+		IFS='|'; \
+		while read fop fspec fperm; do \
+		  if [ "$$$$$$$$fop" = "+" ]; then \
+			if [ ! -e "$(PKG_INSTALL_DIR)$$$$$$$$fspec" ]; then \
+			  echo "File not found '$(PKG_INSTALL_DIR)$$$$$$$$fspec'"; \
+			  exit 1; \
+			fi; \
+			dpath=`dirname "$$$$$$$$fspec"`; \
+			if [ -n "$$$$$$$$fperm" ]; then \
+			  dperm="-m$$$$$$$$fperm"; \
+			else \
+			  dperm=`stat -c "%a" $(PKG_INSTALL_DIR)$$$$$$$$dpath`; \
+			fi; \
+			mkdir -p $$$$$$$$$dperm $$(1)$$$$$$$$dpath; \
+			echo "copying: '$$$$$$$$fspec'"; \
+			cp -fpR $(PKG_INSTALL_DIR)$$$$$$$$fspec $$(1)$$$$$$$$dpath/; \
+			if [ -n "$$$$$$$$fperm" ]; then \
+			  chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
+			fi; \
+		  elif [ "$$$$$$$$fop" = "-" ]; then \
+			echo "removing: '$$$$$$$$fspec'"; \
+			rm -fR $$(1)$$$$$$$$fspec; \
+		  elif [ "$$$$$$$$fop" = "=" ]; then \
+			echo "setting permissions: '$$$$$$$$fperm' on '$$$$$$$$fspec'"; \
+			chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
+		  fi; \
+		done; \
+	)
+	$(call Py3Package/$(1)/install,$$(1))
+  endef
+endef
+
+# $(1) => build subdir
+# $(2) => additional arguments to setup.py
+# $(3) => additional variables
+define Build/Compile/Py3Mod
+	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
+	$(call HostPython3, \
+		cd $(PKG_BUILD_DIR)/$(strip $(1)); \
+		CC="$(TARGET_CC)" \
+		CCSHARED="$(TARGET_CC) $(FPIC)" \
+		LD="$(TARGET_CC)" \
+		LDSHARED="$(TARGET_CC) -shared" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR)" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON3_VERSION)" \
+		_PYTHON_HOST_PLATFORM="linux-$(ARCH)" \
+		__PYVENV_LAUNCHER__="/usr/bin/$(PYTHON3)" \
+		$(3) \
+		, \
+		./setup.py $(2) \
+	)
+	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
+endef
diff --git a/trunk/package/lang/python3/patches/110-enable-zlib.patch b/trunk/package/lang/python3/patches/110-enable-zlib.patch
new file mode 100644
index 00000000..780831e8
--- /dev/null
+++ b/trunk/package/lang/python3/patches/110-enable-zlib.patch
@@ -0,0 +1,25 @@
+From 6eeab87bc852481e599325549c854b701bf2e39f Mon Sep 17 00:00:00 2001
+From: Alexandru Ardelean <aa@ocedo.com>
+Date: Thu, 25 Sep 2014 18:18:29 +0300
+Subject: [PATCH] enable zlib
+
+---
+ Modules/Setup.dist | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/Setup.dist b/Modules/Setup.dist
+index 01fb85f..01ac492 100644
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
+@@ -358,7 +358,7 @@ _symtable symtablemodule.c
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -lz
+ 
+ # Interface to the Expat XML parser
+ #
+-- 
+1.8.4.5
+
diff --git a/trunk/package/lang/python3/patches/120-do-not-add-include-dirs-when-cross-compiling.patch b/trunk/package/lang/python3/patches/120-do-not-add-include-dirs-when-cross-compiling.patch
new file mode 100644
index 00000000..44be1c8f
--- /dev/null
+++ b/trunk/package/lang/python3/patches/120-do-not-add-include-dirs-when-cross-compiling.patch
@@ -0,0 +1,14 @@
+diff --git a/setup.py b/setup.py
+index 93f390f..ace1494 100644
+--- a/setup.py
++++ b/setup.py
+@@ -461,7 +461,8 @@ class PyBuildExt(build_ext):
+                         add_dir_to_list(dir_list, directory)
+ 
+         if os.path.normpath(sys.base_prefix) != '/usr' \
+-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
++                and not sysconfig.get_config_var('PYTHONFRAMEWORK') \
++                and not cross_compiling:
+             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+             # building a framework with different architectures than
diff --git a/trunk/package/lang/python3/patches/130-do-not-run-distutils-tests.patch b/trunk/package/lang/python3/patches/130-do-not-run-distutils-tests.patch
new file mode 100644
index 00000000..0291eb19
--- /dev/null
+++ b/trunk/package/lang/python3/patches/130-do-not-run-distutils-tests.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index f36c11d..f2b6c71 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1217,32 +1217,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 		done; \
+ 	done
+ 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+-	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
+-		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+-			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
+-	fi
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST) -f \
+-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+-		$(DESTDIR)$(LIBDEST)
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST) -f \
+-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+-		$(DESTDIR)$(LIBDEST)
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST)/site-packages -f \
+-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-		-d $(LIBDEST)/site-packages -f \
+-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
+ 
+ # Create the PLATDIR source directory, if one wasn't distributed..
+ $(srcdir)/Lib/$(PLATDIR):
diff --git a/trunk/package/lang/python3/patches/140-do-not-write-bytes-codes.patch b/trunk/package/lang/python3/patches/140-do-not-write-bytes-codes.patch
new file mode 100644
index 00000000..f624d586
--- /dev/null
+++ b/trunk/package/lang/python3/patches/140-do-not-write-bytes-codes.patch
@@ -0,0 +1,22 @@
+diff --git a/Python/pythonrun.c b/Python/pythonrun.c
+index 0327830..df41cda 100644
+--- a/Python/pythonrun.c
++++ b/Python/pythonrun.c
+@@ -124,7 +124,7 @@ int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
+ int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
+ int Py_NoSiteFlag; /* Suppress 'import site' */
+ int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
+-int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
++int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */
+ int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
+ int Py_FrozenFlag; /* Needed by getpath.c */
+ int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
+@@ -350,7 +350,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib)
+     if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
+         Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p);
+     if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0')
+-        Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p);
++        Py_DontWriteBytecodeFlag = atoi(p);
+     /* The variable is only tested for existence here; _PyRandom_Init will
+        check its value further. */
+     if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0')
diff --git a/trunk/package/lang/ruby/Makefile b/trunk/package/lang/ruby/Makefile
new file mode 100644
index 00000000..1eff4c01
--- /dev/null
+++ b/trunk/package/lang/ruby/Makefile
@@ -0,0 +1,1340 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# To Do:
+#  - dirs not removed when uninstalling!
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ruby
+PKG_VERSION:=2.1.5
+PKG_RELEASE:=1
+
+PKG_LIBVER:=2.1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://cache.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
+PKG_MD5SUM:=a7c3e5fec47eff23091b566e9e1dac1b
+PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_DEPENDS:=ruby/host
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/ruby/Default
+  SUBMENU:=Ruby
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Ruby scripting language
+  URL:=http://www.ruby-lang.org/
+endef
+
+define Package/ruby/Default/description
+ Ruby is the interpreted scripting language for quick and easy
+ object-oriented programming.  It has many features to process text files
+ and to do system management tasks (as in perl).  It is simple,
+ straight-forward, and extensible.
+
+endef
+
+define Package/ruby
+$(call Package/ruby/Default)
+  TITLE+= (interpreter)
+  DEPENDS:=+libruby
+endef
+
+define Package/ruby/description
+$(call Package/ruby/Default/description)
+endef
+
+define Package/libruby
+$(call Package/ruby/Default)
+  SUBMENU:=
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (shared library)
+  DEPENDS+= +libpthread +librt +libgmp
+endef
+
+define Package/ruby-stdlib
+$(call Package/ruby/Default)
+  TITLE:=Ruby standard libraries (metadata for all stdlib subsets)
+  DEPENDS:=ruby +ruby-misc +ruby-bigdecimal +ruby-cgi +ruby-csv +ruby-datetime +ruby-dbm +ruby-debuglib\
+			+ruby-digest +ruby-dl +ruby-drb +ruby-enc +ruby-enc-extra +ruby-erb +ruby-gdbm +ruby-gems \
+			+ruby-json +ruby-io-console +ruby-irb +ruby-fiddle +ruby-filelib +ruby-logger +ruby-math \
+			+ruby-minitest +ruby-mkmf +ruby-multithread +ruby-nkf +ruby-net +ruby-openssl +ruby-optparse \
+			+ruby-patterns +ruby-prettyprint +ruby-pstore +ruby-psych +ruby-racc +ruby-rake +ruby-rbconfig \
+			+ruby-rdoc +ruby-readline +ruby-rexml +ruby-rinda +ruby-ripper +ruby-rss +ruby-sdbm +ruby-shell \
+			+ruby-socket +ruby-testunit +ruby-uri +ruby-webrick +ruby-xmlrpc +ruby-yaml +ruby-zlib
+endef
+
+define Package/ruby-stdlib/description
+ This metapackage currently install all ruby-* packages,
+ providing a complete Ruby Standard Library.
+
+endef
+
+define Package/ruby-bigdecimal
+$(call Package/ruby/Default)
+  TITLE:=Arbitrary-precision decimal floating-point lib for Ruby
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-bigdecimal/description
+ Provides bigdecimal* files
+endef
+
+define Package/ruby-cgi
+$(call Package/ruby/Default)
+  TITLE:=Ruby CGI support toolkit
+  DEPENDS:=ruby +ruby-filelib +ruby-pstore
+endef
+
+define Package/ruby-bigdecimal/description
+ Provides bigdecimal* files
+
+endef
+
+define Package/ruby-csv
+$(call Package/ruby/Default)
+  TITLE+=CSV library
+  DEPENDS:=ruby +ruby-patterns +ruby-datetime +ruby-enc
+endef
+
+define Package/ruby-csv/description
+ Provides csv.rb file
+
+endef
+
+define Package/ruby-datetime
+$(call Package/ruby/Default)
+  TITLE+= date library
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-datetime/description
+ Provides date.rb and time.rb
+
+endef
+
+define Package/ruby-dbm
+$(call Package/ruby/Default)
+  TITLE:=Ruby support for dbm
+  DEPENDS:=ruby +libdb47
+endef
+
+define Package/ruby-dbm/description
+ The DBM class provides a wrapper to a Unix-style dbm or Database Manager library.
+ This package provides dbm.so file.
+
+endef
+
+define Package/ruby-debuglib
+$(call Package/ruby/Default)
+  TITLE+= debug library
+  DEPENDS:=ruby +ruby-multithread +ruby-prettyprint
+endef
+
+define Package/ruby-debuglib/description
+ Provides files for debugging:
+ - benchmark.rb
+ - debug.rb
+ - objspace.so
+ - profile.rb
+ - profiler.rb
+ - tracer.rb
+
+endef
+
+define Package/ruby-digest
+$(call Package/ruby/Default)
+  TITLE:=Ruby Digest Library
+  DEPENDS:=ruby +RUBY_DIGEST_USE_OPENSSL:libopenssl
+endef
+
+define Package/ruby-digest/description
+ Provides digest* files. Can be configured to use OpenSSL or
+ bundled hash functions.
+
+endef
+
+define Package/ruby-digest/config
+
+	config RUBY_DIGEST_USE_OPENSSL
+		bool "Use OpenSSL functions for ruby digest hash functions"
+        depends on PACKAGE_ruby-digest
+		help
+			Ruby can use OpenSSL hash functions or compile alternative implementations. Using
+			OpenSSL saves about 30KBytes (less when compressed) but requires OpenSSL (that
+			is way bigger than that). However, if OpenSSL is already needed by another usage,
+			as ruby-openssl or any other non ruby package, it is better to mark this option.
+		default n
+
+endef
+
+define Package/ruby-dl
+$(call Package/ruby/Default)
+  TITLE+= (dynamic linker support)
+  DEPENDS:=ruby +ruby-fiddle +ruby-multithread
+endef
+
+define Package/ruby-dl/description
+ Provides dl* files. This is deprecated, use fiddle.
+
+endef
+
+define Package/ruby-drb
+$(call Package/ruby/Default)
+  TITLE:=Ruby distributed object system
+  DEPENDS:=ruby +ruby-filelib +ruby-patterns +ruby-socket
+endef
+
+define Package/ruby-drb/description
+ Provides drb* files
+
+endef
+
+define Package/ruby-enc
+$(call Package/ruby/Default)
+  TITLE:=Ruby character re-coding library charset (small subset)
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-enc/description
+ Provides ruby encoding library for encodings used directly by
+ libraries in Ruby Standard Library:
+ - enc/encdb.so
+ - enc/euc_jp.so
+ - enc/iso_8859_1.so
+ - enc/utf_16be.so
+ - enc/utf_16le.so
+ - enc/utf_32be.so
+ - enc/utf_32le.so
+ FYI: ASCII-8BIT, UTF-7, UTF-8 and US-ASCII are already in Core.
+
+endef
+
+define Package/ruby-enc-extra
+$(call Package/ruby/Default)
+  TITLE:=Ruby character re-coding library charset (extra subset)
+  DEPENDS:=ruby +ruby-enc
+endef
+
+define Package/ruby-enc-extra/description
+ Provides extra encodings not provided by ruby-enc:
+ - enc/big5.so
+ - enc/cp949.so
+ - enc/emacs_mule.so
+ - enc/euc_kr.so
+ - enc/euc_tw.so
+ - enc/gb18030.so
+ - enc/gb2312.so
+ - enc/gbk.so
+ - enc/iso_8859_10.so
+ - enc/iso_8859_11.so
+ - enc/iso_8859_13.so
+ - enc/iso_8859_14.so
+ - enc/iso_8859_15.so
+ - enc/iso_8859_16.so
+ - enc/iso_8859_2.so
+ - enc/iso_8859_3.so
+ - enc/iso_8859_4.so
+ - enc/iso_8859_5.so
+ - enc/iso_8859_6.so
+ - enc/iso_8859_7.so
+ - enc/iso_8859_8.so
+ - enc/iso_8859_9.so
+ - enc/koi8_r.so
+ - enc/koi8_u.so
+ - enc/shift_jis.so
+ - enc/trans/big5.so
+ - enc/trans/chinese.so
+ - enc/trans/emoji.so
+ - enc/trans/emoji_iso2022_kddi.so
+ - enc/trans/emoji_sjis_docomo.so
+ - enc/trans/emoji_sjis_kddi.so
+ - enc/trans/emoji_sjis_softbank.so
+ - enc/trans/escape.so
+ - enc/trans/gb18030.so
+ - enc/trans/gbk.so
+ - enc/trans/iso2022.so
+ - enc/trans/japanese.so
+ - enc/trans/japanese_euc.so
+ - enc/trans/japanese_sjis.so
+ - enc/trans/korean.so
+ - enc/trans/single_byte.so
+ - enc/trans/transdb.so
+ - enc/trans/utf8_mac.so
+ - enc/trans/utf_16_32.so
+ - enc/windows_1251.so
+ - enc/windows_31j.so
+
+endef
+
+define Package/ruby-erb
+$(call Package/ruby/Default)
+  TITLE+= (embedded interpreter)
+  DEPENDS:=ruby +ruby-cgi
+endef
+
+define Package/ruby-erb/description
+ Provides erb* files
+
+endef
+
+define Package/ruby-fiddle
+$(call Package/ruby/Default)
+  TITLE:=A libffi wrapper for Ruby
+  DEPENDS:=ruby +libffi
+endef
+
+define Package/ruby-fiddle/description
+ Provides fiddle* files
+
+endef
+
+define Package/ruby-filelib
+$(call Package/ruby/Default)
+  TITLE+= File utils library
+  DEPENDS:=ruby +ruby-multithread +ruby-enc
+endef
+
+define Package/ruby-filelib/description
+ Provides filesystem interaction files, including
+ path and temp:
+ - fileutils.rb
+ - find.rb
+ - pathname.rb
+ - pathname.so
+ - tempfile.rb
+ - tmpdir.rb
+
+endef
+
+define Package/ruby-gdbm
+$(call Package/ruby/Default)
+  TITLE:=Ruby support for gdbm
+  DEPENDS:=ruby +libgdbm
+endef
+
+define Package/ruby-gdbm/description
+ Provides gdbm* files
+
+endef
+
+define Package/ruby-gems
+$(call Package/ruby/Default)
+  TITLE:=Ruby gems packet management
+  DEPENDS:=ruby +ruby-net +ruby-rdoc +ruby-zlib
+endef
+
+define Package/ruby-gems/description
+ Provides rubygems for gems usage, download and installation
+
+endef
+
+define Package/ruby-io-console
+$(call Package/ruby/Default)
+  TITLE+= Console interface
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-io-console/description
+ Provides io-console* files
+
+endef
+
+define Package/ruby-irb
+$(call Package/ruby/Default)
+  TITLE+= (interactive shell)
+  DEPENDS:=ruby +ruby-debuglib +ruby-filelib +ruby-math
+endef
+
+define Package/ruby-irb/description
+ Provides irb* files
+
+endef
+
+define Package/ruby-json
+$(call Package/ruby/Default)
+  TITLE:=Ruby support for JSON
+  DEPENDS:=ruby +ruby-datetime +ruby-misc
+endef
+
+define Package/ruby-json/description
+ Provides json* files
+
+endef
+
+define Package/ruby-logger
+$(call Package/ruby/Default)
+  TITLE+= logger and syslog library
+  DEPENDS:=ruby +ruby-multithread
+endef
+
+define Package/ruby-logger/description
+ Provides log library, including syslog:
+ - logger.rb
+ - syslog.so
+ - syslog/logger.rb
+
+endef
+
+define Package/ruby-math
+$(call Package/ruby/Default)
+  TITLE+= math library
+  DEPENDS:=ruby +ruby-patterns
+endef
+
+define Package/ruby-math/description
+ Provides math related files:
+ - cmath.rb
+ - complex.rb
+ - mathn.rb
+ - mathn/complex.so
+ - mathn/rational.so
+ - matrix.rb
+ - matrix/eigenvalue_decomposition.rb
+ - matrix/lup_decomposition.rb
+ - prime.rb
+ - rational.rb
+
+endef
+
+define Package/ruby-minitest
+$(call Package/ruby/Default)
+  TITLE+= minitest bundled with Ruby
+  DEPENDS:=ruby +ruby-filelib +ruby-optparse +ruby-prettyprint +ruby-rbconfig
+endef
+
+define Package/ruby-minitest/description
+ Provides minitest* files
+
+endef
+
+define Package/ruby-misc
+$(call Package/ruby/Default)
+  TITLE:=Ruby standard libraries subset (miscelaneous files)
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-misc/description
+ This package contains miscellaneous files from stdlib
+ not splitted in other ruby packages like stringio:
+ - English.rb
+ - abbrev.rb
+ - base64.rb
+ - continuation.so
+ - coverage.so
+ - delegate.rb
+ - e2mmap.rb
+ - etc.so
+ - expect.rb
+ - fcntl.so
+ - fiber.so
+ - getoptlong.rb
+ - open3.rb
+ - ostruct.rb
+ - pty.so
+ - scanf.rb
+ - securerandom.rb
+ - set.rb
+ - shellwords.rb
+ - stringio.so
+ - strscan.so
+ - tsort.rb
+ - weakref.rb
+
+endef
+
+define Package/ruby-mkmf
+$(call Package/ruby/Default)
+  TITLE+= makefile library
+  DEPENDS:=ruby +ruby-filelib +ruby-optparse +ruby-rbconfig
+endef
+
+define Package/ruby-mkmf/description
+ Provides mkmf* files
+
+endef
+
+define Package/ruby-multithread
+$(call Package/ruby/Default)
+  TITLE+= multithread library
+  DEPENDS:=ruby +ruby-misc
+endef
+
+define Package/ruby-multithread/description
+ Provides files for multithread usage:
+ - io/nonblock.so
+ - io/wait.so
+ - thread.so (FYI, Thread is a core class)
+ - monitor.rb
+ - mutex_m.rb
+ - sync.rb
+ - thwait.rb
+ - timeout.rb
+
+endef
+
+define Package/ruby-net
+$(call Package/ruby/Default)
+  TITLE:=Ruby Network Protocols Library
+  DEPENDS:=ruby +ruby-datetime +ruby-digest +ruby-filelib +ruby-uri
+endef
+
+define Package/ruby-net/description
+ Provides net* files
+
+endef
+
+define Package/ruby-nkf
+$(call Package/ruby/Default)
+  TITLE:=Ruby Network Kanji Filter
+  DEPENDS:=ruby +ruby-enc
+endef
+
+define Package/ruby-nkf/description
+ Provides nkf* files
+
+endef
+
+define Package/ruby-openssl
+$(call Package/ruby/Default)
+  TITLE:=Ruby support for openssl
+  DEPENDS:=ruby +ruby-enc +libopenssl +ruby-misc
+endef
+
+define Package/ruby-openssl/description
+ Provides openssl* files
+
+endef
+
+define Package/ruby-optparse
+$(call Package/ruby/Default)
+  TITLE:=Ruby command-line option analysis
+  DEPENDS:=ruby +ruby-misc
+endef
+
+define Package/ruby-optparse/description
+ Provides optparse* files
+
+endef
+
+define Package/ruby-patterns
+$(call Package/ruby/Default)
+  TITLE:=Ruby design patterns implementation
+  DEPENDS:=ruby +ruby-multithread
+endef
+
+define Package/ruby-patterns/description
+ Provides design patterns helpers files:
+ - forwardable.rb
+ - observer.rb
+ - singleton.rb
+
+endef
+
+define Package/ruby-prettyprint
+$(call Package/ruby/Default)
+  TITLE:=Ruby PrettyPrint librart
+  DEPENDS:=ruby +ruby-misc
+endef
+
+define Package/ruby-prettyprint/description
+ Provides Pretty Print library:
+ - pp.rb
+ - prettyprint.rb
+
+endef
+
+define Package/ruby-pstore
+$(call Package/ruby/Default)
+  TITLE+=file based persistence
+  DEPENDS:=ruby +ruby-digest +ruby-enc
+endef
+
+define Package/ruby-pstore/description
+ Provides pstore.rb file
+
+endef
+
+define Package/ruby-psych
+$(call Package/ruby/Default)
+  TITLE+=YAML parser and emitter
+  DEPENDS:=ruby +ruby-bigdecimal +ruby-datetime +ruby-misc +ruby-enc
+endef
+
+define Package/ruby-psych/description
+ Provides psych* files
+
+endef
+
+define Package/ruby-racc
+$(call Package/ruby/Default)
+  TITLE:=LALR parser generator in Ruby
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-racc/description
+ Provides racc* files
+
+endef
+
+define Package/ruby-rake
+$(call Package/ruby/Default)
+  TITLE+=Ruby Rake (make replacement)
+  DEPENDS:=ruby +ruby-datetime +ruby-filelib +ruby-optparse +ruby-patterns +ruby-rbconfig
+endef
+
+define Package/ruby-rake/description
+ Provides rake* files
+
+endef
+
+define Package/ruby-rbconfig
+$(call Package/ruby/Default)
+  TITLE+=Ruby RbConfig
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-rbconfig/description
+ Provides rbconfig file
+
+endef
+
+define Package/ruby-rdoc
+$(call Package/ruby/Default)
+  TITLE+= (documentation generator)
+  DEPENDS:=ruby +ruby-erb +ruby-irb +ruby-json +ruby-racc +ruby-rake +ruby-yaml
+endef
+
+define Package/ruby-rdoc/description
+ Provides rdoc* and ri files
+
+endef
+
+define Package/ruby-readline
+$(call Package/ruby/Default)
+  TITLE:=Ruby support for readline
+  DEPENDS:=ruby +libncurses +libreadline
+endef
+
+define Package/ruby-readline/description
+ Provides readline* files
+
+endef
+
+define Package/ruby-rexml
+$(call Package/ruby/Default)
+  TITLE:=Ruby XML toolkit
+  DEPENDS:=ruby +ruby-patterns +ruby-enc
+endef
+
+define Package/ruby-rexml/description
+ Provides rexml* files
+
+endef
+
+define Package/ruby-rinda
+$(call Package/ruby/Default)
+  TITLE:=Ruby Linda paradigm implementation
+  DEPENDS:=ruby +ruby-drb
+endef
+
+define Package/ruby-rinda/description
+ Provides rinda* files
+
+endef
+
+define Package/ruby-ripper
+$(call Package/ruby/Default)
+  TITLE:=Ruby script parser
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-ripper/description
+ Provides ripper* files
+
+endef
+
+define Package/ruby-rss
+$(call Package/ruby/Default)
+  TITLE:=Ruby RSS toolkit
+  DEPENDS:=ruby +ruby-net +ruby-nkf +ruby-rexml
+endef
+
+define Package/ruby-rss/description
+ Provides rss* files
+
+endef
+
+define Package/ruby-sdbm
+$(call Package/ruby/Default)
+  TITLE:=Ruby simple file-based key-value dbm implementation
+  DEPENDS:=ruby
+endef
+
+define Package/ruby-sdbm/description
+ Provides sdbm* files
+
+endef
+
+define Package/ruby-shell
+$(call Package/ruby/Default)
+  TITLE:=Ruby idiomatic Ruby interface
+  DEPENDS:=ruby +ruby-patterns
+endef
+
+define Package/ruby-shell/description
+ Provides shell* files
+
+endef
+
+define Package/ruby-socket
+$(call Package/ruby/Default)
+  TITLE+= socket support
+  DEPENDS:=ruby +ruby-multithread
+endef
+
+define Package/ruby-socket/description
+ Provides socket-related files:
+ - gserver.rb
+ - ipaddr.rb
+ - resolv-replace.rb
+ - resolv.rb
+ - socket.rb
+ - socket.so
+
+endef
+
+define Package/ruby-testunit
+$(call Package/ruby/Default)
+  TITLE:=Ruby Test Unit toolkit
+  DEPENDS:=ruby +ruby-minitest
+endef
+
+define Package/ruby-testunit/description
+ Provides test/unit* files
+
+endef
+
+define Package/ruby-uri
+$(call Package/ruby/Default)
+  TITLE:=Ruby library to handle URI
+  DEPENDS:=ruby +ruby-socket +ruby-enc
+endef
+
+define Package/ruby-uri/description
+ Provides uri* files
+
+endef
+
+define Package/ruby-webrick
+$(call Package/ruby/Default)
+  TITLE:=Ruby Web server toolkit
+  DEPENDS:=ruby +ruby-erb +ruby-net +ruby-patterns +ruby-rbconfig
+endef
+
+define Package/ruby-webrick/description
+ Provides webrick* files
+
+endef
+
+define Package/ruby-xmlrpc
+$(call Package/ruby/Default)
+  TITLE:=Ruby XML-RPC toolkit
+  DEPENDS:=ruby +ruby-rexml +ruby-webrick
+endef
+
+define Package/ruby-xmlrpc/description
+ Provides xmlrpc* files
+
+endef
+
+define Package/ruby-yaml
+$(call Package/ruby/Default)
+  TITLE:=Ruby YAML toolkit
+  DEPENDS:=ruby +ruby-dbm +ruby-pstore +ruby-psych
+endef
+
+define Package/ruby-yaml/description
+ Provides yaml* files
+
+endef
+
+define Package/ruby-zlib
+$(call Package/ruby/Default)
+  TITLE:=Ruby support for zlib
+  DEPENDS:=ruby +zlib
+endef
+
+define Package/ruby-zlib/description
+ Provides zlib* files
+
+endef
+
+HOST_CONFIGURE_ARGS += \
+	--disable-install-doc \
+	--disable-install-rdoc \
+	--disable-install-capi \
+	--with-static-linked-ext \
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--enable-ipv6 \
+	--disable-install-doc \
+	--disable-install-capi \
+	--with-ruby-version=minor \
+	--with-iconv-dir=$(ICONV_PREFIX) \
+
+ifndef CONFIG_RUBY_DIGEST_USE_OPENSSL
+CONFIGURE_ARGS += \
+	--with-bundled-sha1\
+	--with-bundled-md5\
+	--with-bundled-rmd160\
+	--with-bundled-sha2 \
+
+endif
+
+TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)
+
+MAKE_FLAGS += \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	SHELL="/bin/bash"
+
+define Package/ruby/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/vendor_ruby/$(PKG_LIBVER)
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/site_ruby/$(PKG_LIBVER)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ruby $(1)/usr/lib/ruby/ruby$(PKG_LIBVER)-bin
+	$(INSTALL_BIN) ./files/ruby $(1)/usr/bin/ruby
+	sed -i -e "s%@RUBY_LIBPATH@%/usr/lib/ruby/$(PKG_LIBVER)%" $(1)/usr/bin/ruby
+	sed -i -e "s%@RUBY_BINPATH@%/usr/lib/ruby/ruby$(PKG_LIBVER)-bin%" $(1)/usr/bin/ruby
+endef
+
+define Package/libruby/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libruby.so.* $(1)/usr/lib/
+endef
+
+define Package/ruby-stdlib/install
+	# nothing to do
+endef
+
+define Package/ruby-bigdecimal/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/bigdecimal.so \
+		usr/lib/ruby/$(PKG_LIBVER)/bigdecimal/ \
+		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/bigdecimal-*.gemspec \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-cgi/install
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/cgi $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/cgi.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-csv/install
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/csv.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-datetime/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/time.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/date.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/date/ \
+		usr/lib/ruby/$(PKG_LIBVER)/*/date_core.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-dbm/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/dbm.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-debuglib/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/profile.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/profiler.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/debug.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/tracer.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/benchmark.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/objspace.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-digest/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/digest \
+		usr/lib/ruby/$(PKG_LIBVER)/digest.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/digest.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/digest/* \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-dl/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/dl.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/dl \
+		usr/lib/ruby/$(PKG_LIBVER)/*/dl.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/dl/ \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-drb/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/drb.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/drb \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-enc/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/enc/encdb.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/enc/iso_8859_1.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/enc/utf_* \
+		usr/lib/ruby/$(PKG_LIBVER)/*/enc/euc_jp.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-enc-extra/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) \
+		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/encdb.so \
+		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/iso_8859_1.so \
+		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/utf_* \
+		--exclude=usr/lib/ruby/$(PKG_LIBVER)/*/enc/euc_jp.so \
+		-cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/enc \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-erb/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/erb $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/erb.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-fiddle/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/fiddle.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/fiddle/ \
+		usr/lib/ruby/$(PKG_LIBVER)/*/fiddle.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-filelib/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/tmpdir.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/tempfile.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/pathname.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/pathname.so \
+		usr/lib/ruby/$(PKG_LIBVER)/find.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/fileutils.rb \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-gdbm/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/gdbm.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-gems/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gem $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/ubygems.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/doc
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/cache
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/extensions
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/build_info
+endef
+
+define Package/ruby-io-console/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/io/console.so \
+		usr/lib/ruby/$(PKG_LIBVER)/io/console/ \
+		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/io-console-*.gemspec \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-irb/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irb $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/irb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/irb.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-json/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/json.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/json \
+		usr/lib/ruby/$(PKG_LIBVER)/*/json \
+		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/json-*.gemspec \
+	) | ( cd $(1); $(TAR) -xf - )
+	rm -rf \
+		$(1)/usr/lib/ruby/$(PKG_LIBVER)/psych/json
+endef
+
+define Package/ruby-logger/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/logger.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/syslog/logger.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/syslog.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-math/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/prime.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/mathn.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/cmath.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/complex.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/rational.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/mathn \
+		usr/lib/ruby/$(PKG_LIBVER)/matrix.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/matrix \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-minitest/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/minitest/ \
+		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/minitest-*.gemspec \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-misc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/English.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/abbrev.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/base64.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/delegate.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/e2mmap.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/expect.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/getoptlong.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/open3.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/ostruct.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/scanf.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/securerandom.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/set.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/shellwords.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/tsort.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/weakref.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/continuation.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/coverage.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/etc.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/fcntl.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/fiber.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/pty.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/stringio.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/strscan.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+
+
+define Package/ruby-mkmf/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/mkmf.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/un.rb \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-multithread/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/monitor.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/timeout.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/thwait.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/mutex_m.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/sync.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/thread.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/io/wait.so \
+		usr/lib/ruby/$(PKG_LIBVER)/*/io/nonblock.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-net/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/open-uri.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/net/* \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-nkf/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/kconv.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/nkf.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-openssl/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/openssl \
+		usr/lib/ruby/$(PKG_LIBVER)/openssl.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-optparse/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/optparse.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/optparse \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-patterns/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/observer.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/singleton.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/forwardable.rb \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-prettyprint/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/pp.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/prettyprint.rb \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-pstore/install
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/pstore.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-psych/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/psych \
+		usr/lib/ruby/$(PKG_LIBVER)/psych.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/psych.so \
+		usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/psych-*.gemspec \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-racc/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/racc \
+		usr/lib/ruby/$(PKG_LIBVER)/*/racc/*.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-rake/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rake $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rake.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rake $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/rake-*.gemspec \
+		$(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/rake-* $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
+endef
+
+define Package/ruby-rbconfig/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/rbconfig.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/rbconfig/* \
+		usr/lib/ruby/$(PKG_LIBVER)/*/rbconfig/*.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-rdoc/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdoc $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ri $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rdoc $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/rdoc-*.gemspec \
+		$(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/rdoc-* \
+		$(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
+endef
+
+define Package/ruby-readline/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/readline.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-rexml/install
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rexml $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-rinda/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/rinda \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-ripper/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/ripper.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/ripper \
+		usr/lib/ruby/$(PKG_LIBVER)/*/ripper.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-rss/install
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rss $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rss.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-sdbm/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/sdbm.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-shell/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/shell.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/shell \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-socket/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/gserver.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/ipaddr.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/resolv-replace.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/resolv.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/socket.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/*/socket.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-testunit/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/testrb $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/test $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/test-unit-*.gemspec $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/specifications/default/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/test-unit-* $(1)/usr/lib/ruby/gems/$(PKG_LIBVER)/gems/
+endef
+
+define Package/ruby-uri/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/uri.rb \
+		usr/lib/ruby/$(PKG_LIBVER)/uri \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-webrick/install
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/webrick $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/webrick.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-xmlrpc/install
+	$(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/xmlrpc $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/xmlrpc.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
+endef
+
+define Package/ruby-yaml/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/yaml \
+		usr/lib/ruby/$(PKG_LIBVER)/yaml.rb \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Package/ruby-zlib/install
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		usr/lib/ruby/$(PKG_LIBVER)/*/zlib.so \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+define Build/InstallDev
+	( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
+		. \
+	) | ( cd $(1); $(TAR) -xf - )
+endef
+
+$(eval $(call BuildPackage,ruby))
+$(eval $(call BuildPackage,libruby))
+$(eval $(call BuildPackage,ruby-stdlib))
+$(eval $(call BuildPackage,ruby-bigdecimal))
+$(eval $(call BuildPackage,ruby-cgi))
+$(eval $(call BuildPackage,ruby-csv))
+$(eval $(call BuildPackage,ruby-datetime))
+$(eval $(call BuildPackage,ruby-dbm))
+$(eval $(call BuildPackage,ruby-debuglib))
+$(eval $(call BuildPackage,ruby-digest))
+$(eval $(call BuildPackage,ruby-dl))
+$(eval $(call BuildPackage,ruby-drb))
+$(eval $(call BuildPackage,ruby-enc))
+$(eval $(call BuildPackage,ruby-enc-extra))
+$(eval $(call BuildPackage,ruby-erb))
+$(eval $(call BuildPackage,ruby-fiddle))
+$(eval $(call BuildPackage,ruby-filelib))
+$(eval $(call BuildPackage,ruby-gdbm))
+$(eval $(call BuildPackage,ruby-gems))
+$(eval $(call BuildPackage,ruby-io-console))
+$(eval $(call BuildPackage,ruby-irb))
+$(eval $(call BuildPackage,ruby-json))
+$(eval $(call BuildPackage,ruby-logger))
+$(eval $(call BuildPackage,ruby-math))
+$(eval $(call BuildPackage,ruby-minitest))
+$(eval $(call BuildPackage,ruby-misc))
+$(eval $(call BuildPackage,ruby-mkmf))
+$(eval $(call BuildPackage,ruby-multithread))
+$(eval $(call BuildPackage,ruby-net))
+$(eval $(call BuildPackage,ruby-nkf))
+$(eval $(call BuildPackage,ruby-openssl))
+$(eval $(call BuildPackage,ruby-optparse))
+$(eval $(call BuildPackage,ruby-patterns))
+$(eval $(call BuildPackage,ruby-prettyprint))
+$(eval $(call BuildPackage,ruby-pstore))
+$(eval $(call BuildPackage,ruby-psych))
+$(eval $(call BuildPackage,ruby-racc))
+$(eval $(call BuildPackage,ruby-rake))
+$(eval $(call BuildPackage,ruby-rbconfig))
+$(eval $(call BuildPackage,ruby-rdoc))
+$(eval $(call BuildPackage,ruby-readline))
+$(eval $(call BuildPackage,ruby-rexml))
+$(eval $(call BuildPackage,ruby-rinda))
+$(eval $(call BuildPackage,ruby-ripper))
+$(eval $(call BuildPackage,ruby-rss))
+$(eval $(call BuildPackage,ruby-sdbm))
+$(eval $(call BuildPackage,ruby-shell))
+$(eval $(call BuildPackage,ruby-socket))
+$(eval $(call BuildPackage,ruby-testunit))
+$(eval $(call BuildPackage,ruby-uri))
+$(eval $(call BuildPackage,ruby-webrick))
+$(eval $(call BuildPackage,ruby-xmlrpc))
+$(eval $(call BuildPackage,ruby-yaml))
+$(eval $(call BuildPackage,ruby-zlib))
+$(eval $(call HostBuild))
diff --git a/trunk/package/lang/ruby/files/ruby b/trunk/package/lang/ruby/files/ruby
new file mode 100644
index 00000000..e4904fc2
--- /dev/null
+++ b/trunk/package/lang/ruby/files/ruby
@@ -0,0 +1,5 @@
+#!/bin/sh
+if ! [ -r "@RUBY_LIBPATH@/rubygems.rb" ]; then
+	exec @RUBY_BINPATH@ --disable-gems "$@"
+fi
+exec @RUBY_BINPATH@ "$@"
diff --git a/trunk/package/lang/ruby/patches/001-rdoc-remove_gems_dep.patch b/trunk/package/lang/ruby/patches/001-rdoc-remove_gems_dep.patch
new file mode 100644
index 00000000..afe81e83
--- /dev/null
+++ b/trunk/package/lang/ruby/patches/001-rdoc-remove_gems_dep.patch
@@ -0,0 +1,32 @@
+--- ruby-2.1.2.orig/lib/rdoc.rb	2014-09-02 17:14:28.719224215 -0300
++++ ruby-2.1.2/lib/rdoc.rb	2014-09-02 17:14:28.762223911 -0300
+@@ -109,6 +109,8 @@
+   def self.load_yaml
+     begin
+       gem 'psych'
++    rescue NameError => e # --disable-gems
++       raise unless e.name == :gem
+     rescue Gem::LoadError
+     end
+ 
+--- ruby-2.1.2.orig/lib/rdoc/markdown.rb	2014-09-02 17:14:28.761223918 -0300
++++ ruby-2.1.2/lib/rdoc/markdown.rb	2014-09-02 17:14:28.805223607 -0300
+@@ -525,7 +525,6 @@
+ 
+ 
+ 
+-  require 'rubygems'
+   require 'rdoc'
+   require 'rdoc/markup/to_joined_paragraph'
+   require 'rdoc/markdown/entities'
+--- ruby-2.1.2.orig/lib/rdoc/text.rb	2014-09-02 17:14:28.721224201 -0300
++++ ruby-2.1.2/lib/rdoc/text.rb	2014-09-02 17:14:28.764223897 -0300
+@@ -10,6 +10,8 @@
+ 
+ begin
+   gem 'json'
++rescue NameError => e # --disable-gems
++  raise unless e.name == :gem
+ rescue Gem::LoadError
+ end
+ 
diff --git a/trunk/package/lang/ruby/patches/002-minitest-remove_gems_dep.patch b/trunk/package/lang/ruby/patches/002-minitest-remove_gems_dep.patch
new file mode 100644
index 00000000..f53490ee
--- /dev/null
+++ b/trunk/package/lang/ruby/patches/002-minitest-remove_gems_dep.patch
@@ -0,0 +1,13 @@
+--- ruby-2.1.2.orig/lib/minitest/autorun.rb	2014-09-03 02:22:29.769909573 -0300
++++ ruby-2.1.2/lib/minitest/autorun.rb	2014-09-03 02:22:29.768909580 -0300
+@@ -6,8 +6,9 @@
+ ######################################################################
+ 
+ begin
+-  require 'rubygems'
+   gem 'minitest'
++rescue NameError => e # --disable-gems
++  raise unless e.name == :gem
+ rescue Gem::LoadError
+   # do nothing
+ end
diff --git a/trunk/package/lang/ruby/patches/003-digest_rmd160_wrong_name_fix.patch b/trunk/package/lang/ruby/patches/003-digest_rmd160_wrong_name_fix.patch
new file mode 100644
index 00000000..2dc49f64
--- /dev/null
+++ b/trunk/package/lang/ruby/patches/003-digest_rmd160_wrong_name_fix.patch
@@ -0,0 +1,12 @@
+diff -r -u ruby-2.1.2.old/ext/digest/rmd160/extconf.rb ruby-2.1.2/ext/digest/rmd160/extconf.rb
+--- ruby-2.1.2.old/ext/digest/rmd160/extconf.rb	2012-11-26 22:58:52.000000000 -0200
++++ ruby-2.1.2/ext/digest/rmd160/extconf.rb	2014-09-17 14:20:57.537367488 -0300
+@@ -14,7 +14,7 @@
+ require File.expand_path('../../../openssl/deprecation', __FILE__)
+ 
+ if !with_config("bundled-rmd160") &&
+-    have_library("crypto") && OpenSSL.check_func("RMD160_Transform", "openssl/ripemd.h")
++    have_library("crypto") && OpenSSL.check_func("RIPEMD160_Transform", "openssl/ripemd.h")
+   $objs << "rmd160ossl.#{$OBJEXT}"
+ else
+   $objs << "rmd160.#{$OBJEXT}"
diff --git a/trunk/package/lang/ruby/patches/004-digest_dont-link-ssl-if-not-needed.patch b/trunk/package/lang/ruby/patches/004-digest_dont-link-ssl-if-not-needed.patch
new file mode 100644
index 00000000..792f76c8
--- /dev/null
+++ b/trunk/package/lang/ruby/patches/004-digest_dont-link-ssl-if-not-needed.patch
@@ -0,0 +1,117 @@
+--- ruby-2.1.2/ext/digest/md5/extconf.rb	2012-11-26 22:58:52.000000000 -0200
++++ ruby-2.1.2/ext/digest/md5/extconf.rb	2014-09-16 19:25:21.120457409 -0300
+@@ -9,14 +9,21 @@
+ 
+ $objs = [ "md5init.#{$OBJEXT}" ]
+ 
+-dir_config("openssl")
+-pkg_config("openssl")
+-require File.expand_path('../../../openssl/deprecation', __FILE__)
++if !with_config("bundled-md5")
++  dir_config("openssl")
++  pkg_config("openssl")
++  require File.expand_path('../../../openssl/deprecation', __FILE__)
++  if have_library("crypto") && OpenSSL.check_func("MD5_Transform", "openssl/md5.h")
++    $use_bundled=false
++  else
++    $use_bundled=true
++  end
++else
++  $use_bundled=true
++end
+ 
+-if !with_config("bundled-md5") &&
+-    have_library("crypto") && OpenSSL.check_func("MD5_Transform", "openssl/md5.h")
++if !$use_bundled
+   $objs << "md5ossl.#{$OBJEXT}"
+-
+ else
+   $objs << "md5.#{$OBJEXT}"
+ end
+--- ruby-2.1.2/ext/digest/rmd160/extconf.rb	2012-11-26 22:58:52.000000000 -0200
++++ ruby-2.1.2/ext/digest/rmd160/extconf.rb	2014-09-16 19:29:11.425628541 -0300
+@@ -9,12 +9,20 @@
+ 
+ $objs = [ "rmd160init.#{$OBJEXT}" ]
+ 
+-dir_config("openssl")
+-pkg_config("openssl")
+-require File.expand_path('../../../openssl/deprecation', __FILE__)
++if !with_config("bundled-rmd160")
++  dir_config("openssl")
++  pkg_config("openssl")
++  require File.expand_path('../../../openssl/deprecation', __FILE__)
++  if have_library("crypto") && OpenSSL.check_func("RIPEMD160_Transform", "openssl/ripemd.h")
++    $use_bundled=false
++  else
++    $use_bundled=true
++  end
++else
++  $use_bundled=true
++end
+ 
+-if !with_config("bundled-rmd160") &&
+-    have_library("crypto") && OpenSSL.check_func("RIPEMD160_Transform", "openssl/ripemd.h")
++if !$use_bundled
+   $objs << "rmd160ossl.#{$OBJEXT}"
+ else
+   $objs << "rmd160.#{$OBJEXT}"
+--- ruby-2.1.2/ext/digest/sha1/extconf.rb	2012-11-26 22:58:52.000000000 -0200
++++ ruby-2.1.2/ext/digest/sha1/extconf.rb	2014-09-16 19:30:09.359168494 -0300
+@@ -9,12 +9,20 @@
+ 
+ $objs = [ "sha1init.#{$OBJEXT}" ]
+ 
+-dir_config("openssl")
+-pkg_config("openssl")
+-require File.expand_path('../../../openssl/deprecation', __FILE__)
++if !with_config("bundled-sha1")
++  dir_config("openssl")
++  pkg_config("openssl")
++  require File.expand_path('../../../openssl/deprecation', __FILE__)
++  if have_library("crypto") && OpenSSL.check_func("SHA1_Transform", "openssl/sha.h")
++    $use_bundled=false
++  else
++    $use_bundled=true
++  end
++else
++  $use_bundled=true
++end
+ 
+-if !with_config("bundled-sha1") &&
+-    have_library("crypto") && OpenSSL.check_func("SHA1_Transform", "openssl/sha.h")
++if !$use_bundled
+   $objs << "sha1ossl.#{$OBJEXT}"
+ else
+   $objs << "sha1.#{$OBJEXT}"
+--- ruby-2.1.2/ext/digest/sha2/extconf.rb	2012-11-26 22:58:52.000000000 -0200
++++ ruby-2.1.2/ext/digest/sha2/extconf.rb	2014-09-16 19:31:31.833513570 -0300
+@@ -9,14 +9,22 @@
+ 
+ $objs = [ "sha2init.#{$OBJEXT}" ]
+ 
+-dir_config("openssl")
+-pkg_config("openssl")
+-require File.expand_path('../../../openssl/deprecation', __FILE__)
+-
+-if !with_config("bundled-sha2") &&
+-    have_library("crypto") &&
++if !with_config("bundled-sha2")
++  dir_config("openssl")
++  pkg_config("openssl")
++  require File.expand_path('../../../openssl/deprecation', __FILE__)
++  if have_library("crypto") &&
+     %w[SHA256 SHA512].all? {|d| OpenSSL.check_func("#{d}_Transform", "openssl/sha.h")} &&
+     %w[SHA256 SHA512].all? {|d| have_type("#{d}_CTX", "openssl/sha.h")}
++    $use_bundled=false
++  else
++    $use_bundled=true
++  end
++else
++  $use_bundled=true
++end
++
++if !$use_bundled
+   $objs << "sha2ossl.#{$OBJEXT}"
+   $defs << "-DSHA2_USE_OPENSSL"
+ else
diff --git a/trunk/package/lang/ruby/ruby_find_pkgsdeps b/trunk/package/lang/ruby/ruby_find_pkgsdeps
new file mode 100644
index 00000000..06587ec0
--- /dev/null
+++ b/trunk/package/lang/ruby/ruby_find_pkgsdeps
@@ -0,0 +1,265 @@
+#!/usr/bin/ruby -Eutf-8
+# encoding: utf-8
+#
+# Find dependencies between ruby packages
+#
+# Must run inside a openwrt with all *ruby* packages installed
+#
+
+failed = false
+
+puts "Looking for installed ruby packages..."
+packages=`opkg list-installed '*ruby*' | cut -d' ' -f 1`.split("\n")
+
+puts "Looking for packages files..."
+package_files=Hash.new([])
+packages.each do
+	|pkg|
+	files=`opkg files "#{pkg}" | sed -e 1d`.split("\n")
+	package_files[pkg]=files if files
+end
+
+require_regex=/^require ["']([^"']+)["'].*/
+require_regex_ignore=/^require ([a-zA-Z\$]|["']$|.*\/$)/
+require_ignore=%w{drb/invokemethod16 foo rubygems/defaults/operating_system win32console java Win32API
+                  builder/xchar json/pure simplecov win32/sspi rdoc/markdown/literals_1_8 enumerator win32/resolv rbtree
+                  nqxml/streamingparser nqxml/treeparser xmlscan/parser xmlscan/scanner xmltreebuilder xml/parser xmlparser xml/encoding-ja xmlencoding-ja
+                  iconv uconv}
+
+builtin_enc=[
+	Encoding.find("ASCII-8BIT"),
+	Encoding.find("UTF-8"),
+	Encoding.find("UTF-7"),
+	Encoding.find("US-ASCII"),
+]
+
+puts "Looking for requires in files..."
+files_requires=Hash.new([])
+packages.each do
+        |pkg|
+	package_files[pkg].each do
+		|file|
+		next if not File.file?(file)
+
+		if not file =~ /.rb$/
+			if File.executable?(file)
+				magic=`head -c50 '#{file}' | head -1`
+				begin
+					if not magic =~ /ruby/
+						next
+					end
+				rescue
+					next
+				end
+			else
+				next
+			end
+		end
+		#puts "Checking #{file}..."
+		File.open(file, "r") do
+			|f|
+			lineno=0
+			while line=f.gets() do
+				lineno+=1; encs=[]; requires=[]; need_encdb=false
+
+				line=line.chomp.gsub!(/^[[:blank:]]*/,"")
+
+				case line
+				when /^#.*coding *:/
+					if lineno <= 2
+						enc=line.sub(/.*coding *: */,"").sub(/ .*/,"")
+						encs << Encoding.find(enc)
+					end
+				end
+				line.gsub!(/#.*/,"")
+				case line
+				when "__END__"
+					break
+				when /^require /
+					#puts "#{file}:#{line}"
+					if require_regex_ignore =~ line
+						#puts "Ignoring #{line} at #{file}:#{lineno} (REGEX)..."
+						next
+					end
+					if not require_regex =~ line
+						$stderr.puts "Unknown require: '#{line}' at file #{file}:#{lineno}"
+						failed=true
+					end
+					require=line.gsub(require_regex,"\\1")
+					require.gsub!(/\.(so|rb)$/,"")
+
+					if require_ignore.include?(require)
+						#puts "Ignoring #{line} at #{file}:#{lineno} (STR)..."
+						next
+					end
+
+					files_requires[file]=files_requires[file] + [require]
+
+				when /Encoding::/
+					encs=line.scan(/Encoding::[[:alnum:]_]+/).collect {|enc| eval(enc) }.select {|enc| enc.kind_of? Encoding }
+					need_encdb=true
+				end
+
+				next if encs.empty?
+				required_encs = (encs - builtin_enc).collect {|enc| "enc/#{enc.name.downcase.gsub("-","_")}" }
+				required_encs << "enc/encdb" if need_encdb
+
+				files_requires[file] = files_requires[file] + required_encs
+			end
+		end
+	end
+end
+exit(1) if failed
+
+# Add deps from .so
+package_files.each do |(pkg,files)| files.each do |file|
+	case file
+	when /\/nkf\.so$/
+		files_requires[file]= files_requires[file] + ["enc/encdb"]
+	end
+end; end
+
+puts "Merging requirements into packages..."
+package_requires = Hash[packages.collect { |pkg| [pkg, package_files[pkg].collect {|file| files_requires[file] }.inject([],:+).uniq] }]
+
+weak_dependency=Hash.new([])
+weak_dependency.merge!({
+"ruby-misc"=>["ruby-openssl"], 					#securerandom.rb
+"ruby-debuglib"=>["ruby-readline"],				#debug.rb
+"ruby-drb"=>["ruby-openssl"],				 	#drb/ssl.rb
+"ruby-irb"=>["ruby-rdoc", "ruby-readline"],		 	#irb/cmd/help.rb
+"ruby-gems"=>["ruby-openssl","ruby-io-console", 		#rubygems/commands/cert_command.rb rubygems/user_interaction.rb
+	      "ruby-minitest", "ruby-webrick"],			#rubygems/test_case.rb rubygems/server.rb
+"ruby-mkmf"=>["ruby-webrick"], 					#un.rb
+"ruby-net"=>["ruby-openssl","ruby-io-console","ruby-zlib"], 	#net/*.rb
+"ruby-optparse"=>["ruby-uri","ruby-datetime"],			#optparse/date.rb optparse/uri.rb
+"ruby-rake"=>["ruby-net","ruby-testunit","ruby-gems"],		#rake/contrib/ftptools.rb rake/runtest.rb /usr/bin/rake
+"ruby-rdoc"=>["ruby-gems","ruby-readline","ruby-webrick",
+	      "ruby-minitest"],					#/usr/bin/rdoc and others
+"ruby-testunit"=>["ruby-gems", "ruby-io-console"],		#test/unit/parallel.rb test/unit.rb
+"ruby-webrick"=>["ruby-openssl"],				#webrick/ssl.rb
+})
+
+puts "Looking for package dependencies..."
+package_provides = {}
+package_dependencies = Hash.new([])
+package_requires.each do
+	|(pkg,requires)|
+
+	requires.each do
+		|require|
+		if package_provides.include?(require)
+			found = package_provides[require]
+		else
+			found = package_files.detect {|(pkg,files)| files.detect {|file| $:.detect {|path| "#{path}/#{require}" == file.gsub(/\.(so|rb)$/,"") } } }
+			if not found
+				$stderr.puts "#{pkg}: Nobody provides #{require}"
+				failed = true
+				next
+			end
+			found = found.first
+			package_provides[require]=found
+		end
+		if weak_dependency[pkg].include?(found)
+			puts "#{pkg}: #{found} provides #{require} (ignored WEAK dep)"
+		else
+			puts "#{pkg}: #{found} provides #{require}"
+			package_dependencies[pkg]=package_dependencies[pkg] + [found]
+		end
+	end
+end
+exit(1) if failed
+
+package_dependencies.each do
+        |(pkg,deps)|
+        package_dependencies[pkg]=deps.uniq.sort - [pkg]
+end
+
+puts "Expanding dependencies..."
+begin
+	changed=false
+	package_dependencies.each do
+		|(pkg,deps)|
+
+		next if deps.empty?
+
+		deps_new = deps.collect {|dep| [dep] + package_dependencies[dep] }.inject([],:+).uniq.sort
+		if not deps == deps_new
+			puts "#{pkg}: #{deps.join(",")}"
+			puts "#{pkg}: #{deps_new.join(",")}"
+			package_dependencies[pkg]=deps_new
+			changed=true
+		end
+	end
+end if not changed
+
+puts "Checking for mutual dependencies..."
+package_dependencies.each do
+	|(pkg,deps)|
+	if deps.include? pkg
+		$stderr.puts "#{pkg}: Cycle dependency detected! "
+		failed = true
+	end
+end
+exit(1) if failed
+
+puts "Removing redundant dependencies..."
+package_dependencies.each do
+	|(pkg,deps)|
+	package_dependencies[pkg]=deps.uniq - [pkg]
+end
+
+package_dependencies2=package_dependencies.dup
+package_dependencies.each do
+	|(pkg,deps)|
+
+	# Ignore dependencies that are aready required by another dependency
+	deps_clean = deps.reject {|dep_suspect| deps.detect {|dep_provider|
+			if package_dependencies[dep_provider].include?(dep_suspect)
+				puts "#{pkg}: #{dep_suspect} is already required by #{dep_provider}"
+				true
+			end
+		 } }
+
+	if not deps==deps_clean
+		puts "before: #{deps.join(",")}"
+		puts "after: #{deps_clean.join(",")}"
+		package_dependencies2[pkg]=deps_clean
+	end
+end
+package_dependencies=package_dependencies2
+
+puts "Checking current packages dependencies..."
+ok=true
+package_dependencies.each do
+	|(pkg,deps)|
+	current_deps=`opkg depends #{pkg} | sed -r -e '1d;s/^[[:blank:]]*//'`.split("\n")
+	current_deps.reject!{|dep| dep =~ /^lib/ }
+	current_deps -= ["ruby"]
+
+	extra_dep = current_deps - deps
+	$stderr.puts "Package #{pkg} does not need to depend on #{extra_dep.join(" ")} " if not extra_dep.empty?
+	missing_dep = deps - current_deps
+	$stderr.puts "Package #{pkg} need to depend on #{missing_dep.join(" ")} " if not missing_dep.empty?
+
+	if not extra_dep.empty? or not missing_dep.empty?
+		$stderr.puts "define Package/#{pkg}"
+		$stderr.puts "  DEPENDS:=ruby#{([""] +deps).join(" +")}"
+		ok=false
+	end
+end
+
+puts "All dependencies are OK." if ok
+
+
+__END__
+
+puts RUBY_VERSION, RUBY_PLATFORM
+puts 123
+
+puts Object.contants
+
+#RUBY_VER=2.1
+#RUBY_ARCH=i486-linux-gnu
+#RUBYLIB=/usr/lib/ruby/$RUBY_VER/
+#RUBYLIB_A=/usr/lib/ruby/$RUBY_ARCH/$RUBY_VER/
diff --git a/trunk/package/lang/ruby/ruby_missingfiles b/trunk/package/lang/ruby/ruby_missingfiles
new file mode 100644
index 00000000..f05e9feb
--- /dev/null
+++ b/trunk/package/lang/ruby/ruby_missingfiles
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+
+function list_staging_files {
+	cd staging_dir/target-*/; find \
+		\( \( -name "root-x86" -or -name "packages" -or -name "stamp" -or -name "pkginfo" \) -prune \) -or -true \
+		\( -path "*ruby*" -or -name "erb" -or -name "gem" -or -name "irb" -or -name "rake" -or -name "rdoc" -or -name "ri" -or -name "testrb" \) \
+		-print | sort
+}
+
+function list_ipkg_files {
+	for OPKG in bin/*/packages/packages/*ruby*; do
+        tar --to-stdout -xzf "$OPKG" ./data.tar.gz | tar tz | sed -e 's%/$%%'
+	done | sort -u
+}
+
+
+echo "          Staging                    Packages"
+diff -y <(list_staging_files) <(list_ipkg_files)
+
diff --git a/trunk/package/lang/simplejson/Makefile b/trunk/package/lang/simplejson/Makefile
new file mode 100644
index 00000000..89da1b2a
--- /dev/null
+++ b/trunk/package/lang/simplejson/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=simplejson
+PKG_VERSION:=3.6.5
+PKG_RELEASE:=1
+PKG_LICENSE:=MIT
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/
+PKG_MD5SUM:=b65dc21c7aaad14c6b4ad0d9179e437d
+PKG_BUILD_DEPENDS:=python python-setuptools
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/simplejson
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
+  TITLE:=Simple, fast, extensible JSON encoder/decoder for Python
+  URL:=http://simplejson.readthedocs.org/
+  DEPENDS:=+python
+endef
+
+define Package/simplejson/description
+  Simple, fast, extensible JSON encoder/decoder for Python
+endef
+
+define Build/Compile
+	$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
+endef
+
+define Package/simplejson/install
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+	$(CP) \
+	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
+	    $(1)$(PYTHON_PKG_DIR)
+endef
+
+$(eval $(call BuildPackage,simplejson))
diff --git a/trunk/package/lang/vala/Makefile b/trunk/package/lang/vala/Makefile
new file mode 100644
index 00000000..d3dbc82f
--- /dev/null
+++ b/trunk/package/lang/vala/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=vala
+PKG_VERSION:=0.26.1
+PKG_RELEASE:=1
+PKG_LICENSE:=LGPL-2.1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNOME/vala/0.26/
+PKG_MD5SUM:=723a03b822d4cc47abc4019685970a3e
+
+PKG_BUILD_DEPENDS:=glib2/host vala/host
+HOST_BUILD_DEPENDS:=glib2/host
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+TARGET_LDFLAGS+=\
+        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+define Package/vala
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=C-sharp like language for the GObject system
+  URL:=https://wiki.gnome.org/Projects/Vala
+  MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
+endef
+
+define Package/vala/description
+Vala is a C-sharp like language for the GObject system. This package contains
+the Vala-to-C compiler.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) \
+		$(1)/usr/share/vala-0.26/vapi \
+		$(1)/usr/lib \
+		$(1)/usr/share/pkgconfig \
+		$(1)/usr/bin
+
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/vala-0.26/vapi/* \
+		$(1)/usr/share/vala-0.26/vapi
+
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/libvala-0.26.{so*,la} \
+		$(1)/usr/lib
+
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.26,valac,valac-0.26,vapicheck,vapicheck-0.26,vapigen,vapigen-0.26,vala-gen-introspect,vala-gen-introspect-0.26} \
+		$(1)/usr/bin
+
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/pkgconfig/*.pc \
+		$(1)/usr/share/pkgconfig
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,vala))
diff --git a/trunk/package/libs/cyassl/Makefile b/trunk/package/libs/cyassl/Makefile
new file mode 100644
index 00000000..fd901576
--- /dev/null
+++ b/trunk/package/libs/cyassl/Makefile
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cyassl
+PKG_VERSION:=3.2.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
+PKG_SOURCE_URL:=http://www.yassl.com/
+PKG_MD5SUM:=a80493c224ff86e45dc333c06d5edb88
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libcyassl
+  SECTION:=libs
+  SUBMENU:=SSL
+  CATEGORY:=Libraries
+  TITLE:=CyaSSL library
+  URL:=http://www.yassl.com/
+endef
+
+define Package/libcyassl/description
+CyaSSL is an SSL library optimized for small footprint, both on disk and for
+memory use.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--without-zlib \
+	--enable-singlethreaded \
+	--disable-examples
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.{so*,la} $(1)/usr/lib/
+endef
+
+define Package/libcyassl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libcyassl))
diff --git a/trunk/package/libs/cyassl/patches/100-respect_cflags.patch b/trunk/package/libs/cyassl/patches/100-respect_cflags.patch
new file mode 100644
index 00000000..0e03230d
--- /dev/null
+++ b/trunk/package/libs/cyassl/patches/100-respect_cflags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ AC_SUBST([CYASSL_LIBRARY_VERSION])
+ 
+ # capture user C_EXTRA_FLAGS from ./configure line, CFLAGS may hold -g -O2 even
+ # if user doesn't override, no way to tell
+-USER_C_EXTRA_FLAGS="$C_EXTRA_FLAGS"
++USER_C_EXTRA_FLAGS="$CFLAGS"
+ 
+ LT_PREREQ([2.2])
+ LT_INIT([disable-static],[win32-dll])
diff --git a/trunk/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch b/trunk/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
new file mode 100644
index 00000000..5463cb0c
--- /dev/null
+++ b/trunk/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
@@ -0,0 +1,13 @@
+--- a/src/internal.c
++++ b/src/internal.c
+@@ -6037,6 +6037,10 @@ int ProcessReply(CYASSL* ssl)
+                 b1 =
+                 ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx++];
+                 ssl->curSize = (word16)(((b0 & 0x7f) << 8) | b1);
++
++                /* does not appear to a be a SSLv2 client hello */
++                if ( ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx] != 1 )
++                    return UNKNOWN_HANDSHAKE_TYPE;
+             }
+             else {
+                 ssl->options.processReply = getRecordLayerHeader;
diff --git a/trunk/package/libs/gettext-full/Makefile b/trunk/package/libs/gettext-full/Makefile
new file mode 100644
index 00000000..2399f0fe
--- /dev/null
+++ b/trunk/package/libs/gettext-full/Makefile
@@ -0,0 +1,80 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gettext-full
+PKG_VERSION:=0.18.2.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=gettext-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/gettext
+PKG_MD5SUM:=034c8103b14654ebd300fadac44d6f14
+PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-3.0+
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=0
+PKG_BUILD_DEPENDS:=gettext-full/host
+PKG_CHECK_FORMAT_SECURITY:=0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/libintl-full
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=GNU Internationalization library
+  URL:=http://www.gnu.org/software/gettext/
+endef
+
+TARGET_CFLAGS += $(FPIC)
+ifneq ($(HOST_OS),Linux)
+  TARGET_CFLAGS += -I$(STAGING_DIR_HOST)/include
+endif
+ifdef CONFIG_USE_MUSL
+  TARGET_CFLAGS += -D__UCLIBC__
+endif
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--enable-nls \
+	--disable-java \
+	--disable-native-java \
+	--disable-openmp \
+	--with-included-gettext \
+	--without-libintl-prefix \
+	--without-libexpat-prefix \
+	--without-emacs
+
+HOST_CONFIGURE_ARGS += \
+	--with-included-libxml --without-libxml2-prefix --with-included-libcroco
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/libintl-full/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl-full/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib/libintl-full/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl-full/lib/
+
+	$(INSTALL_DIR) $(1)/usr/share/aclocal
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
+endef
+
+define Package/libintl-full/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libintl-full))
diff --git a/trunk/package/libs/gettext-full/patches/001-autotools.patch b/trunk/package/libs/gettext-full/patches/001-autotools.patch
new file mode 100644
index 00000000..9b0abc8e
--- /dev/null
+++ b/trunk/package/libs/gettext-full/patches/001-autotools.patch
@@ -0,0 +1,35 @@
+--- a/gettext-runtime/man/Makefile.am
++++ b/gettext-runtime/man/Makefile.am
+@@ -159,8 +159,7 @@ bind_textdomain_codeset.3.html: bind_tex
+ 	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+--- a/gettext-tools/man/Makefile.am
++++ b/gettext-tools/man/Makefile.am
+@@ -186,8 +186,7 @@ autopoint.1.html: autopoint.1
+ 	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+--- a/gettext-runtime/intl/Makefile.in
++++ b/gettext-runtime/intl/Makefile.in
+@@ -17,7 +17,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-SHELL = /bin/sh
++SHELL = @SHELL@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
diff --git a/trunk/package/libs/gettext-full/patches/001-no_examples_and_tests.patch b/trunk/package/libs/gettext-full/patches/001-no_examples_and_tests.patch
new file mode 100644
index 00000000..3660413c
--- /dev/null
+++ b/trunk/package/libs/gettext-full/patches/001-no_examples_and_tests.patch
@@ -0,0 +1,22 @@
+--- a/gettext-runtime/Makefile.in
++++ b/gettext-runtime/Makefile.in
+@@ -251,7 +251,7 @@ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+ DIST_SUBDIRS = doc intl intl-java intl-csharp gnulib-lib libasprintf \
+-	src po man m4 tests
++	src po man m4
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+--- a/gettext-tools/Makefile.in
++++ b/gettext-tools/Makefile.in
+@@ -1503,7 +1503,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
diff --git a/trunk/package/libs/gettext-full/patches/003-gettext-error_print_progname.patch b/trunk/package/libs/gettext-full/patches/003-gettext-error_print_progname.patch
new file mode 100644
index 00000000..72fdc55f
--- /dev/null
+++ b/trunk/package/libs/gettext-full/patches/003-gettext-error_print_progname.patch
@@ -0,0 +1,11 @@
+--- a/gettext-tools/libgettextpo/error.h
++++ b/gettext-tools/libgettextpo/error.h
+@@ -58,7 +58,7 @@ extern void error_at_line (int __status,
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++void (*error_print_progname) (void);
+ 
+ /* This variable is incremented each time 'error' is called.  */
+ extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/trunk/package/libs/gettext-full/patches/100-error_progname.patch b/trunk/package/libs/gettext-full/patches/100-error_progname.patch
new file mode 100644
index 00000000..74f51692
--- /dev/null
+++ b/trunk/package/libs/gettext-full/patches/100-error_progname.patch
@@ -0,0 +1,10 @@
+--- a/gettext-runtime/intl/intl-compat.c
++++ b/gettext-runtime/intl/intl-compat.c
+@@ -129,3 +129,7 @@ bind_textdomain_codeset (const char *dom
+ {
+   return libintl_bind_textdomain_codeset (domainname, codeset);
+ }
++
++#ifdef __UCLIBC__
++DLL_EXPORTED void (*error_print_progname)(void) = NULL;
++#endif
diff --git a/trunk/package/libs/gettext-full/patches/110-error_progname_def.patch b/trunk/package/libs/gettext-full/patches/110-error_progname_def.patch
new file mode 100644
index 00000000..bf01d4b6
--- /dev/null
+++ b/trunk/package/libs/gettext-full/patches/110-error_progname_def.patch
@@ -0,0 +1,11 @@
+--- a/gettext-tools/libgettextpo/error.h
++++ b/gettext-tools/libgettextpo/error.h
+@@ -58,7 +58,7 @@ extern void error_at_line (int __status,
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-void (*error_print_progname) (void);
++extern void (*error_print_progname) (void);
+ 
+ /* This variable is incremented each time 'error' is called.  */
+ extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/trunk/package/libs/gettext-full/patches/120-uclibc-nolocale.patch b/trunk/package/libs/gettext-full/patches/120-uclibc-nolocale.patch
new file mode 100644
index 00000000..81eda14b
--- /dev/null
+++ b/trunk/package/libs/gettext-full/patches/120-uclibc-nolocale.patch
@@ -0,0 +1,11 @@
+--- a/gettext-runtime/intl/localename.c
++++ b/gettext-runtime/intl/localename.c
+@@ -2679,7 +2679,7 @@ gl_locale_name_posix (int category, cons
+ {
+   /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
+      On some systems this can be done by the 'setlocale' function itself.  */
+-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
++#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL && (!defined __UCLIBC__ || defined __UCLIBC_HAS_LOCALE__)
+   return setlocale (category, NULL);
+ #else
+   /* On other systems we ignore what setlocale reports and instead look at the
diff --git a/trunk/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch b/trunk/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch
new file mode 100644
index 00000000..a8f5a5ce
--- /dev/null
+++ b/trunk/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch
@@ -0,0 +1,22 @@
+--- a/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
++++ b/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
+@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
+  *
+  * Whether iconv support is available
+  */
+-#if 1
++#if 0
+ #define LIBXML_ICONV_ENABLED
+ #endif
+ 
+--- a/gnulib-local/lib/libxml/xmlversion.in.h
++++ b/gnulib-local/lib/libxml/xmlversion.in.h
+@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
+  *
+  * Whether iconv support is available
+  */
+-#if 1
++#if 0
+ #define LIBXML_ICONV_ENABLED
+ #endif
+ 
diff --git a/trunk/package/libs/gettext/Makefile b/trunk/package/libs/gettext/Makefile
new file mode 100644
index 00000000..442eceff
--- /dev/null
+++ b/trunk/package/libs/gettext/Makefile
@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gettext
+PKG_RELEASE:=2
+
+PKG_LICENSE:=FSFULLR
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/libintl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Stub header for the GNU Internationalization library
+endef
+
+define Build/Prepare
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef      
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/libintl-stub/include
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/libintl.h $(1)/usr/lib/libintl-stub/include/
+
+	$(INSTALL_DIR) $(1)/usr/share/aclocal
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/
+endef
+
+define Host/Prepare
+	mkdir -p $(HOST_BUILD_DIR)
+endef
+
+define Host/Compile
+
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/include
+	$(INSTALL_DATA) ./src/include/libintl.h $(STAGING_DIR_HOST)/include/
+
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
+	$(INSTALL_DATA) ./src/m4/* $(STAGING_DIR_HOST)/share/aclocal/
+endef
+
+define Package/libintl/install
+	$(INSTALL_DIR) $(1)/tmp
+	touch $(1)/tmp/.libintl-placeholder
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libintl))
diff --git a/trunk/package/libs/gettext/src/LICENSE b/trunk/package/libs/gettext/src/LICENSE
new file mode 100644
index 00000000..d1a59b05
--- /dev/null
+++ b/trunk/package/libs/gettext/src/LICENSE
@@ -0,0 +1,7 @@
+Each source file contains the following message:
+
+Copyright (C) 1995-2010 Free Software Foundation, Inc.
+This file is free software; the Free Software Foundation
+gives unlimited permission to copy and/or distribute it,
+with or without modifications, as long as this notice is preserved.
+
diff --git a/trunk/package/libs/gettext/src/include/libintl.h b/trunk/package/libs/gettext/src/include/libintl.h
new file mode 100644
index 00000000..a1157a44
--- /dev/null
+++ b/trunk/package/libs/gettext/src/include/libintl.h
@@ -0,0 +1,53 @@
+/*
+ * This code is lifted from http://permalink.gmane.org/gmane.linux.gentoo.embedded/3218
+ */
+
+#ifndef _LIBINTL_H
+#define _LIBINTL_H      1
+
+#include <locale.h>
+
+/* Undef gettext macros, if any... */
+#undef gettext
+#undef dgettext
+#undef dcgettext
+#undef ngettext
+#undef dngettext
+#undef dcngettext
+#undef textdomain
+#undef bindtextdomain
+#undef bind_textdomain_codeset
+
+/* part of locale.h */
+/* #undef setlocale */
+
+#undef _
+#undef N_
+
+/* Define gettext stubs that map back to the original strings */
+#define gettext(String) (String)
+#define dgettext(Domain, String) (String)
+#define dcgettext(Domain, String, Type) (String)
+
+#define ngettext(Singular, Plural, Count) \
+	((Count) == 1 ? (const char *) (Singular) : (const char *) (Plural))
+
+#define dngettext(Domain, Singular, Plural, Count) \
+	((Count) == 1 ? (const char *) (Singular) : (const char *) (Plural))
+
+#define dcngettext(Domain, Singular, Plural, Count, Category) \
+	((Count) == 1 ? (const char *) (Singular) : (const char *) (Plural))
+
+#define _(String) (String)
+#define N_(String) String
+
+#ifndef _LOCALE_H
+/* #define setlocale(Category, Locale) ((char *)NULL) */
+#endif
+
+/* No-ops for textdomain operations */
+#define bindtextdomain(Domain, Directory) (Domain)
+#define bind_textdomain_codeset(Domain, Codeset) (Codeset)
+#define textdomain(String) (String) ?: "messages"
+
+#endif  /* _LIBINTL_H */
diff --git a/trunk/package/libs/gettext/src/m4/codeset.m4 b/trunk/package/libs/gettext/src/m4/codeset.m4
new file mode 100644
index 00000000..a53c0426
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/codeset.m4
@@ -0,0 +1,21 @@
+# codeset.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
+      [am_cv_langinfo_codeset=yes],
+      [am_cv_langinfo_codeset=no])
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff --git a/trunk/package/libs/gettext/src/m4/gettext.m4 b/trunk/package/libs/gettext/src/m4/gettext.m4
new file mode 100644
index 00000000..f84e6a5d
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/gettext.m4
@@ -0,0 +1,383 @@
+# gettext.m4 serial 63 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv.
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE([ENABLE_NLS], [1],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST([DATADIRNAME])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST([INSTOBJEXT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST([GENCAT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST([INTLOBJS])
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST([INTLLIBS])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/trunk/package/libs/gettext/src/m4/intl.m4 b/trunk/package/libs/gettext/src/m4/intl.m4
new file mode 100644
index 00000000..335b23c2
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/intl.m4
@@ -0,0 +1,294 @@
+# intl.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2009.
+
+AC_PREREQ([2.52])
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([gl_VISIBILITY])dnl
+  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+  dnl Support for automake's --enable-silent-rules.
+  case "$enable_silent_rules" in
+    yes) INTL_DEFAULT_VERBOSITY=0;;
+    no)  INTL_DEFAULT_VERBOSITY=1;;
+    *)   INTL_DEFAULT_VERBOSITY=1;;
+  esac
+  AC_SUBST([INTL_DEFAULT_VERBOSITY])
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+  AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
+    snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_newlocale" = yes; then
+    HAVE_NEWLOCALE=1
+  else
+    HAVE_NEWLOCALE=0
+  fi
+  AC_SUBST([HAVE_NEWLOCALE])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
+
+  AM_LANGINFO_CODESET
+  gt_LC_MESSAGES
+
+  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
+  dnl 1. when we install a shared library, we must arrange to export
+  dnl    auxiliary pointer variables for every exported variable,
+  dnl 2. when we install a shared library and a static library simultaneously,
+  dnl    the include file specifies __declspec(dllimport) and therefore we
+  dnl    must arrange to define the auxiliary pointer variables for the
+  dnl    exported variables _also_ in the static library.
+  if test "$enable_shared" = yes; then
+    case "$host_os" in
+      mingw* | cygwin*) is_woe32dll=yes ;;
+      *) is_woe32dll=no ;;
+    esac
+  else
+    is_woe32dll=no
+  fi
+  WOE32DLL=$is_woe32dll
+  AC_SUBST([WOE32DLL])
+
+  dnl On mingw and Cygwin, we can activate special Makefile rules which add
+  dnl version information to the shared libraries and executables.
+  case "$host_os" in
+    mingw* | cygwin*) is_woe32=yes ;;
+    *) is_woe32=no ;;
+  esac
+  WOE32=$is_woe32
+  AC_SUBST([WOE32])
+  if test $WOE32 = yes; then
+    dnl Check for a program that compiles Windows resource files.
+    AC_CHECK_TOOL([WINDRES], [windres])
+  fi
+
+  dnl Determine whether when creating a library, "-lc" should be passed to
+  dnl libtool or not. On many platforms, it is required for the libtool option
+  dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
+  dnl in the *.la files - makes it impossible to create multithreaded programs,
+  dnl because libtool also reorders the -lc to come before the -pthread, and
+  dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
+  case "$host_os" in
+    hpux*) LTLIBC="" ;;
+    *)     LTLIBC="-lc" ;;
+  esac
+  AC_SUBST([LTLIBC])
+
+  dnl Rename some macros and functions used for locking.
+  AH_BOTTOM([
+#define __libc_lock_t                   gl_lock_t
+#define __libc_lock_define              gl_lock_define
+#define __libc_lock_define_initialized  gl_lock_define_initialized
+#define __libc_lock_init                gl_lock_init
+#define __libc_lock_lock                gl_lock_lock
+#define __libc_lock_unlock              gl_lock_unlock
+#define __libc_lock_recursive_t                   gl_recursive_lock_t
+#define __libc_lock_define_recursive              gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive                gl_recursive_lock_init
+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
+#define glthread_in_use  libintl_thread_in_use
+#define glthread_lock_init_func     libintl_lock_init_func
+#define glthread_lock_lock_func     libintl_lock_lock_func
+#define glthread_lock_unlock_func   libintl_lock_unlock_func
+#define glthread_lock_destroy_func  libintl_lock_destroy_func
+#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
+#define glthread_rwlock_init_func              libintl_rwlock_init_func
+#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
+#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
+#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
+#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
+#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
+#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
+#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
+#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
+#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
+#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
+#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
+#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
+#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
+#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
+#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
+#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
+#define glthread_once_func            libintl_once_func
+#define glthread_once_singlethreaded  libintl_once_singlethreaded
+#define glthread_once_multithreaded   libintl_once_multithreaded
+])
+])
+
+
+dnl Checks for the core files of the intl subdirectory:
+dnl   dcigettext.c
+dnl   eval-plural.h
+dnl   explodename.c
+dnl   finddomain.c
+dnl   gettextP.h
+dnl   gmo.h
+dnl   hash-string.h hash-string.c
+dnl   l10nflist.c
+dnl   libgnuintl.h.in (except the *printf stuff)
+dnl   loadinfo.h
+dnl   loadmsgcat.c
+dnl   localealias.c
+dnl   log.c
+dnl   plural-exp.h plural-exp.c
+dnl   plural.y
+dnl Used by libglocale.
+AC_DEFUN([gt_INTL_SUBDIR_CORE],
+[
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_LOCK])dnl
+
+  AC_TRY_LINK(
+    [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
+    [],
+    [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
+       [Define to 1 if the compiler understands __builtin_expect.])])
+
+  AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
+    stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
+    argz_stringify argz_next __fsetlocking])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL([feof_unlocked], [#include <stdio.h>])
+  gt_CHECK_DECL([fgets_unlocked], [#include <stdio.h>])
+
+  AM_ICONV
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], [ac_cv_have_decl_$1],
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
diff --git a/trunk/package/libs/gettext/src/m4/intldir.m4 b/trunk/package/libs/gettext/src/m4/intldir.m4
new file mode 100644
index 00000000..ebae76d3
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/intldir.m4
@@ -0,0 +1,19 @@
+# intldir.m4 serial 2 (gettext-0.18)
+dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+AC_PREREQ([2.52])
+
+dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
+AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/trunk/package/libs/gettext/src/m4/intlmacosx.m4 b/trunk/package/libs/gettext/src/m4/intlmacosx.m4
new file mode 100644
index 00000000..dd910259
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/intlmacosx.m4
@@ -0,0 +1,51 @@
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
diff --git a/trunk/package/libs/gettext/src/m4/lcmessage.m4 b/trunk/package/libs/gettext/src/m4/lcmessage.m4
new file mode 100644
index 00000000..1a705431
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/lcmessage.m4
@@ -0,0 +1,31 @@
+# lcmessage.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
+
+# Check whether LC_MESSAGES is available in <locale.h>.
+
+AC_DEFUN([gt_LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       [gt_cv_val_LC_MESSAGES=yes], [gt_cv_val_LC_MESSAGES=no])])
+  if test $gt_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE([HAVE_LC_MESSAGES], [1],
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])
diff --git a/trunk/package/libs/gettext/src/m4/nls.m4 b/trunk/package/libs/gettext/src/m4/nls.m4
new file mode 100644
index 00000000..003704c4
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/nls.m4
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
diff --git a/trunk/package/libs/gettext/src/m4/po.m4 b/trunk/package/libs/gettext/src/m4/po.m4
new file mode 100644
index 00000000..47f36a41
--- /dev/null
+++ b/trunk/package/libs/gettext/src/m4/po.m4
@@ -0,0 +1,449 @@
+# po.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+  # Seen the first line of the variable definition.
+  s/^[	 ]*VARIABLE[	 ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
diff --git a/trunk/package/libs/glib2/Makefile b/trunk/package/libs/glib2/Makefile
new file mode 100644
index 00000000..d797ac9a
--- /dev/null
+++ b/trunk/package/libs/glib2/Makefile
@@ -0,0 +1,102 @@
+#
+# Copyright (C) 2007-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=glib2
+PKG_VERSION:=2.42.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
+PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
+PKG_SOURCE_URL:=@GNOME/glib/2.42
+PKG_MD5SUM:=89c4119e50e767d3532158605ee9121a
+
+PKG_BUILD_DEPENDS:=glib2/host libpthread zlib libintl libffi
+HOST_BUILD_DEPENDS:=libintl/host libiconv/host libffi/host
+PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/glib2
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr
+  TITLE:=glib 2.0
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+  URL:=http://www.gtk.org/
+endef
+
+define Package/glib2/description
+  The GLib library of C routines
+endef
+
+HOST_CONFIGURE_ARGS += \
+	--disable-selinux
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--enable-debug=no \
+	--disable-selinux \
+	--disable-fam \
+	$(if $(ICONV_FULL),--with-libiconv=gnu)
+
+CONFIGURE_VARS += \
+	glib_cv_stack_grows=no \
+	glib_cv_uscore=no \
+	ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOST)/bin/glib-genmarshal \
+	ac_cv_func_mmap_fixed_mapped=yes \
+	ac_cv_func_posix_getpwuid_r=yes \
+	ac_cv_func_posix_getgrgid_r=yes
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/glib-2.0 \
+		$(1)/usr/include/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/glib-2.0/include/*.h \
+		$(1)/usr/include/glib-2.0/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/gio-unix-2.0 \
+		$(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/glib-2.0 \
+		$(1)/usr/lib/
+
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+		$(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+		$(1)/usr/lib/pkgconfig
+
+	$(INSTALL_DIR) $(2)/share/aclocal/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4  \
+		$(2)/share/aclocal/
+endef
+
+define Package/glib2/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,glib2))
diff --git a/trunk/package/libs/gmp/Makefile b/trunk/package/libs/gmp/Makefile
new file mode 100644
index 00000000..9ef780e8
--- /dev/null
+++ b/trunk/package/libs/gmp/Makefile
@@ -0,0 +1,70 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmp
+PKG_VERSION:=6.0.0
+PKG_REVISION:=a
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_REVISION).tar.xz
+PKG_SOURCE_URL:=ftp://ftp.gmplib.org/pub/$(PKG_NAME)/
+PKG_MD5SUM:=1e6da4e434553d2811437aa42c7f7c76
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+PKG_LICENSE:=GPL-2.0+
+
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libgmp
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=GNU multiprecision arithmetic library
+  URL:=http://gmplib.org/
+endef
+
+define Package/libgmp/description
+	GMP is a free library for arbitrary precision arithmetic, operating on
+	signed integers, rational numbers, and floating point numbers.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+CONFIGURE_VARS += CC="$(TARGET_CROSS)gcc"
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--without-readline \
+	--disable-fft \
+
+define Build/Compile
+	$(call Build/Compile/Default, \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CC="$(TARGET_CC)" \
+		all \
+	)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/gmp* $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libgmp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libgmp))
+$(eval $(call HostBuild))
diff --git a/trunk/package/libs/libbsd/Makefile b/trunk/package/libs/libbsd/Makefile
new file mode 100644
index 00000000..3c12d9f6
--- /dev/null
+++ b/trunk/package/libs/libbsd/Makefile
@@ -0,0 +1,57 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libbsd
+PKG_VERSION:=0.3.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://libbsd.freedesktop.org/releases
+#PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150
+
+PKG_LICENSE:=BSD-4-Clause
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+PKG_INSTALL:=1
+
+define Package/libbsd
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=@USE_EGLIBC
+  TITLE:=common BSD library
+endef
+
+define Package/libbsd/description
+ This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making it easier to port projects with strong BSD origins, without needing to embed the same code over and over again on each project.
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) \
+		$(1)/lib \
+		$(1)/usr/include
+
+	$(CP) \
+		$(PKG_INSTALL_DIR)/lib/libbsd.so* \
+		$(1)/lib/
+
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/* \
+		$(1)/usr/include/
+
+	( cd $(1)/lib ; ln -s libbsd.so.$(PKG_VERSION) libbsd.so )
+endef
+
+define Package/libbsd/install
+	$(INSTALL_DIR) \
+		$(1)/lib
+
+	$(CP) \
+		$(PKG_INSTALL_DIR)/lib/libbsd.so* \
+		$(1)/lib/
+
+	( cd $(1)/lib ; ln -s libbsd.so.$(PKG_VERSION) libbsd.so )
+endef
+
+$(eval $(call BuildPackage,libbsd))
+
diff --git a/trunk/package/libs/libbsd/patches/001-aarch64_support.patch b/trunk/package/libs/libbsd/patches/001-aarch64_support.patch
new file mode 100644
index 00000000..62291482
--- /dev/null
+++ b/trunk/package/libs/libbsd/patches/001-aarch64_support.patch
@@ -0,0 +1,19 @@
+--- a/src/local-elf.h
++++ b/src/local-elf.h
+@@ -165,6 +165,16 @@
+ #endif
+ #define ELF_TARG_DATA	ELFDATA2MSB
+ 
++#elif defined(__aarch64__)
++
++#define ELF_TARG_MACH	EM_AARCH64
++#define ELF_TARG_CLASS	ELFCLASS64
++#ifdef __AARCH64EB__
++#define ELF_TARG_DATA	ELFDATA2MSB
++#else
++#define ELF_TARG_DATA	ELFDATA2LSB
++#endif
++
+ #else
+ 
+ #error Unknown ELF machine type
diff --git a/trunk/package/libs/libconfig/Makefile b/trunk/package/libs/libconfig/Makefile
new file mode 100644
index 00000000..bbc0b04f
--- /dev/null
+++ b/trunk/package/libs/libconfig/Makefile
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libconfig
+PKG_VERSION:=1.4.9
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.hyperrealm.com/libconfig
+PKG_MD5SUM:=b6ee0ce2b3ef844bad7cac2803a90634
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=LGPL-2.1+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libconfig
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Configuration File Library
+  URL:=http://www.hyperrealm.com/libconfig/
+endef
+
+define Package/libconfig/description
+ Libconfig is a simple library for manipulating structured configuration
+ files. This file format is more compact and more readable than XML. And
+ unlike XML, it is type-aware, so it is not necessary to do string
+ parsing in application code.
+
+ Libconfig is very compact -- just 38K for the stripped C shared
+ library (less than one-fourth the size of the expat XML parser library)
+ and 66K for the stripped C++ shared library. This makes it well-suited
+ for memory-constrained systems like handheld devices.
+endef
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--disable-static \
+	--disable-cxx
+
+define Build/InstallDev
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/libconfig/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfig.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libconfig))
diff --git a/trunk/package/libs/libevent2/Makefile b/trunk/package/libs/libevent2/Makefile
new file mode 100644
index 00000000..3ce94dd7
--- /dev/null
+++ b/trunk/package/libs/libevent2/Makefile
@@ -0,0 +1,158 @@
+#
+# Copyright (C) 2011-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libevent2
+PKG_VERSION:=2.0.21
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/libevent-$(PKG_VERSION)-stable
+PKG_SOURCE:=libevent-$(PKG_VERSION)-stable.tar.gz
+PKG_SOURCE_URL:=http://www.monkey.org/~provos/ \
+	@SF/levent
+PKG_MD5SUM:=b2405cc9ebf264aa47ff615d9de527a2
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=BSD-3-Clause
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libevent2/Default
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Event notification
+  URL:=http://www.monkey.org/~provos/libevent/
+endef
+
+define Package/libevent2/Default/description
+	The libevent API provides a mechanism to execute a callback function
+	when a specific event occurs on a file descriptor or after a timeout
+	has been reached. Furthermore, libevent also support callbacks due
+	to signals or regular timeouts.
+
+	libevent is meant to replace the event loop found in event driven
+	network servers. An application just needs to call event_dispatch()
+	and then add or remove events dynamically without having to change
+	the event loop.
+endef
+
+define Package/libevent2
+  $(call Package/libevent2/Default)
+  TITLE+= library (version 2.0)
+endef
+
+define Package/libevent2/description
+	$(call Package/libevent2/Default/description)
+
+	This package contains the libevent shared library historically
+	containing both the core & extra libraries.
+endef
+
+define Package/libevent2-core
+  $(call Package/libevent2/Default)
+  TITLE+= core library (version 2.0)
+endef
+
+define Package/libevent2-core/description
+	$(call Package/libevent2/Default/description)
+
+	This package contains the libevent core shared library for the event,
+	buffer & utility functions.
+endef
+
+define Package/libevent2-extra
+  $(call Package/libevent2/Default)
+  TITLE+= extra library (version 2.0)
+endef
+
+define Package/libevent2-extra/description
+	$(call Package/libevent2/Default/description)
+
+	This package contains the libevent extra shared library for specific
+	protocols including HTTP, DNS & RPC.
+endef
+
+define Package/libevent2-openssl
+  $(call Package/libevent2/Default)
+  TITLE+= OpenSSL library (version 2.0)
+  DEPENDS+=+libopenssl
+endef
+
+define Package/libevent2-openssl/description
+	$(call Package/libevent2/Default/description)
+
+	This package contains the libevent OpenSSL shared library for encrypted
+	bufferevents.
+endef
+
+define Package/libevent2-pthreads
+  $(call Package/libevent2/Default)
+  TITLE+= Pthreads library (version 2.0)
+  DEPENDS+=+libpthread
+endef
+
+define Package/libevent2-pthreads/description
+	$(call Package/libevent2/Default/description)
+
+	This package contains the libevent Pthreads shared library for
+	threading & locking.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-debug-mode
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent*.{la,a,so} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent*-2.0.so* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libevent*.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libevent2/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-2.0.so.* $(1)/usr/lib/
+endef
+
+define Package/libevent2-core/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_core-2.0.so.* $(1)/usr/lib/
+endef
+
+define Package/libevent2-extra/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_extra-2.0.so.* $(1)/usr/lib/
+endef
+
+define Package/libevent2-openssl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_openssl-2.0.so.* $(1)/usr/lib/
+endef
+
+define Package/libevent2-pthreads/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_pthreads-2.0.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libevent2))
+$(eval $(call BuildPackage,libevent2-core))
+$(eval $(call BuildPackage,libevent2-extra))
+$(eval $(call BuildPackage,libevent2-openssl))
+$(eval $(call BuildPackage,libevent2-pthreads))
diff --git a/trunk/package/libs/libffi/Makefile b/trunk/package/libs/libffi/Makefile
new file mode 100644
index 00000000..1eea6f76
--- /dev/null
+++ b/trunk/package/libs/libffi/Makefile
@@ -0,0 +1,81 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libffi
+PKG_VERSION:=3.0.13
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/
+PKG_MD5SUM:=45f3b6dbc9ee7c7dfbbbc5feba571529
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/libffi
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Foreign Function Interface (FFI) library
+  URL:=http://sourceware.org/libffi/
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+endef
+
+define Package/libffi/description
+The libffi library provides a portable, high level programming interface to
+various calling conventions. This allows a programmer to call any function
+specified by a call interface description at run-time.
+
+FFI stands for Foreign Function Interface. A foreign function interface is the
+popular name for the interface that allows code written in one language to call
+code written in another language. The libffi library really only provides the
+lowest, machine dependent layer of a fully featured foreign function interface.
+A layer must exist above libffi that handles type conversions for values passed
+between the two languages.
+endef
+
+CONFIGURE_PATH = build
+CONFIGURE_CMD = ../configure
+MAKE_PATH = build
+
+define Build/Configure
+	mkdir -p $(PKG_BUILD_DIR)/build
+	$(Build/Configure/Default)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libffi.{so*,a,la} \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+		$(1)/usr/lib/pkgconfig/
+
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libffi-$(PKG_VERSION)/include/*.h \
+		$(1)/usr/include/
+endef
+
+define Package/libffi/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libffi.so.* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libffi))
diff --git a/trunk/package/libs/libiconv-full/Makefile b/trunk/package/libs/libiconv-full/Makefile
new file mode 100644
index 00000000..75bca833
--- /dev/null
+++ b/trunk/package/libs/libiconv-full/Makefile
@@ -0,0 +1,93 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libiconv-full
+PKG_VERSION:=1.11.1
+PKG_RELEASE:=1
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+PKG_SOURCE:=libiconv-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/libiconv
+PKG_MD5SUM:=d42b97f6ef5dd0ba4469d520ed732fed
+PKG_BUILD_DIR:=$(BUILD_DIR)/libiconv-$(PKG_VERSION)
+
+PKG_FIXUP:=patch-libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libiconv-full/Default
+  URL:=http://www.gnu.org/software/libiconv/
+  TITLE:=Character set conversion
+endef
+
+define Package/libiconv-full
+  $(call Package/libiconv-full/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= library
+endef
+
+define Package/libcharset
+  $(call Package/libiconv-full/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= library
+endef
+
+define Package/iconv
+  $(call Package/libiconv-full/Default)
+  DEPENDS:=+libiconv-full +libcharset
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE+= utility
+endef
+
+TARGET_CFLAGS += $(FPIC) -DUSE_DOS
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--enable-relocatable
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/libiconv-full/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(1)/usr/lib/libiconv-full/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib/libiconv-full/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.{a,so*} $(1)/usr/lib/libiconv-full/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(1)/usr/lib/libiconv-full/lib/
+endef
+
+define Package/libcharset/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.so* $(1)/usr/lib/
+endef
+
+define Package/libiconv-full/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/
+endef
+
+define Package/iconv/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/iconv $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libcharset))
+$(eval $(call BuildPackage,libiconv-full))
+$(eval $(call BuildPackage,iconv))
diff --git a/trunk/package/libs/libiconv-full/patches/100-strip_charsets.patch b/trunk/package/libs/libiconv-full/patches/100-strip_charsets.patch
new file mode 100644
index 00000000..e4f49aec
--- /dev/null
+++ b/trunk/package/libs/libiconv-full/patches/100-strip_charsets.patch
@@ -0,0 +1,3438 @@
+--- a/lib/aliases_dos.h
++++ b/lib/aliases_dos.h
+@@ -2,47 +2,3 @@
+   S(dos_1, "IBM437", ei_cp437 )
+   S(dos_2, "437", ei_cp437 )
+   S(dos_3, "CSPC8CODEPAGE437", ei_cp437 )
+-  S(dos_4, "CP737", ei_cp737 )
+-  S(dos_5, "CP775", ei_cp775 )
+-  S(dos_6, "IBM775", ei_cp775 )
+-  S(dos_7, "CSPC775BALTIC", ei_cp775 )
+-  S(dos_8, "CP852", ei_cp852 )
+-  S(dos_9, "IBM852", ei_cp852 )
+-  S(dos_10, "852", ei_cp852 )
+-  S(dos_11, "CSPCP852", ei_cp852 )
+-  S(dos_12, "CP853", ei_cp853 )
+-  S(dos_13, "CP855", ei_cp855 )
+-  S(dos_14, "IBM855", ei_cp855 )
+-  S(dos_15, "855", ei_cp855 )
+-  S(dos_16, "CSIBM855", ei_cp855 )
+-  S(dos_17, "CP857", ei_cp857 )
+-  S(dos_18, "IBM857", ei_cp857 )
+-  S(dos_19, "857", ei_cp857 )
+-  S(dos_20, "CSIBM857", ei_cp857 )
+-  S(dos_21, "CP858", ei_cp858 )
+-  S(dos_22, "CP860", ei_cp860 )
+-  S(dos_23, "IBM860", ei_cp860 )
+-  S(dos_24, "860", ei_cp860 )
+-  S(dos_25, "CSIBM860", ei_cp860 )
+-  S(dos_26, "CP861", ei_cp861 )
+-  S(dos_27, "IBM861", ei_cp861 )
+-  S(dos_28, "861", ei_cp861 )
+-  S(dos_29, "CP-IS", ei_cp861 )
+-  S(dos_30, "CSIBM861", ei_cp861 )
+-  S(dos_31, "CP863", ei_cp863 )
+-  S(dos_32, "IBM863", ei_cp863 )
+-  S(dos_33, "863", ei_cp863 )
+-  S(dos_34, "CSIBM863", ei_cp863 )
+-  S(dos_35, "CP864", ei_cp864 )
+-  S(dos_36, "IBM864", ei_cp864 )
+-  S(dos_37, "CSIBM864", ei_cp864 )
+-  S(dos_38, "CP865", ei_cp865 )
+-  S(dos_39, "IBM865", ei_cp865 )
+-  S(dos_40, "865", ei_cp865 )
+-  S(dos_41, "CSIBM865", ei_cp865 )
+-  S(dos_42, "CP869", ei_cp869 )
+-  S(dos_43, "IBM869", ei_cp869 )
+-  S(dos_44, "869", ei_cp869 )
+-  S(dos_45, "CP-GR", ei_cp869 )
+-  S(dos_46, "CSIBM869", ei_cp869 )
+-  S(dos_47, "CP1125", ei_cp1125 )
+--- a/lib/aliases.gperf
++++ b/lib/aliases.gperf
+@@ -48,8 +48,6 @@ UCS-2-INTERNAL, ei_ucs2internal
+ UCS-2-SWAPPED, ei_ucs2swapped
+ UCS-4-INTERNAL, ei_ucs4internal
+ UCS-4-SWAPPED, ei_ucs4swapped
+-C99, ei_c99
+-JAVA, ei_java
+ ISO-8859-1, ei_iso8859_1
+ ISO_8859-1, ei_iso8859_1
+ ISO_8859-1:1987, ei_iso8859_1
+@@ -68,285 +66,16 @@ LATIN2, ei_iso8859_2
+ L2, ei_iso8859_2
+ CSISOLATIN2, ei_iso8859_2
+ ISO8859-2, ei_iso8859_2
+-ISO-8859-3, ei_iso8859_3
+-ISO_8859-3, ei_iso8859_3
+-ISO_8859-3:1988, ei_iso8859_3
+-ISO-IR-109, ei_iso8859_3
+-LATIN3, ei_iso8859_3
+-L3, ei_iso8859_3
+-CSISOLATIN3, ei_iso8859_3
+-ISO8859-3, ei_iso8859_3
+-ISO-8859-4, ei_iso8859_4
+-ISO_8859-4, ei_iso8859_4
+-ISO_8859-4:1988, ei_iso8859_4
+-ISO-IR-110, ei_iso8859_4
+-LATIN4, ei_iso8859_4
+-L4, ei_iso8859_4
+-CSISOLATIN4, ei_iso8859_4
+-ISO8859-4, ei_iso8859_4
+-ISO-8859-5, ei_iso8859_5
+-ISO_8859-5, ei_iso8859_5
+-ISO_8859-5:1988, ei_iso8859_5
+-ISO-IR-144, ei_iso8859_5
+-CYRILLIC, ei_iso8859_5
+-CSISOLATINCYRILLIC, ei_iso8859_5
+-ISO8859-5, ei_iso8859_5
+-ISO-8859-6, ei_iso8859_6
+-ISO_8859-6, ei_iso8859_6
+-ISO_8859-6:1987, ei_iso8859_6
+-ISO-IR-127, ei_iso8859_6
+-ECMA-114, ei_iso8859_6
+-ASMO-708, ei_iso8859_6
+-ARABIC, ei_iso8859_6
+-CSISOLATINARABIC, ei_iso8859_6
+-ISO8859-6, ei_iso8859_6
+-ISO-8859-7, ei_iso8859_7
+-ISO_8859-7, ei_iso8859_7
+-ISO_8859-7:1987, ei_iso8859_7
+-ISO_8859-7:2003, ei_iso8859_7
+-ISO-IR-126, ei_iso8859_7
+-ECMA-118, ei_iso8859_7
+-ELOT_928, ei_iso8859_7
+-GREEK8, ei_iso8859_7
+-GREEK, ei_iso8859_7
+-CSISOLATINGREEK, ei_iso8859_7
+-ISO8859-7, ei_iso8859_7
+-ISO-8859-8, ei_iso8859_8
+-ISO_8859-8, ei_iso8859_8
+-ISO_8859-8:1988, ei_iso8859_8
+-ISO-IR-138, ei_iso8859_8
+-HEBREW, ei_iso8859_8
+-CSISOLATINHEBREW, ei_iso8859_8
+-ISO8859-8, ei_iso8859_8
+-ISO-8859-9, ei_iso8859_9
+-ISO_8859-9, ei_iso8859_9
+-ISO_8859-9:1989, ei_iso8859_9
+-ISO-IR-148, ei_iso8859_9
+-LATIN5, ei_iso8859_9
+-L5, ei_iso8859_9
+-CSISOLATIN5, ei_iso8859_9
+-ISO8859-9, ei_iso8859_9
+-ISO-8859-10, ei_iso8859_10
+-ISO_8859-10, ei_iso8859_10
+-ISO_8859-10:1992, ei_iso8859_10
+-ISO-IR-157, ei_iso8859_10
+-LATIN6, ei_iso8859_10
+-L6, ei_iso8859_10
+-CSISOLATIN6, ei_iso8859_10
+-ISO8859-10, ei_iso8859_10
+-ISO-8859-11, ei_iso8859_11
+-ISO_8859-11, ei_iso8859_11
+-ISO8859-11, ei_iso8859_11
+-ISO-8859-13, ei_iso8859_13
+-ISO_8859-13, ei_iso8859_13
+-ISO-IR-179, ei_iso8859_13
+-LATIN7, ei_iso8859_13
+-L7, ei_iso8859_13
+-ISO8859-13, ei_iso8859_13
+-ISO-8859-14, ei_iso8859_14
+-ISO_8859-14, ei_iso8859_14
+-ISO_8859-14:1998, ei_iso8859_14
+-ISO-IR-199, ei_iso8859_14
+-LATIN8, ei_iso8859_14
+-L8, ei_iso8859_14
+-ISO-CELTIC, ei_iso8859_14
+-ISO8859-14, ei_iso8859_14
+ ISO-8859-15, ei_iso8859_15
+ ISO_8859-15, ei_iso8859_15
+ ISO_8859-15:1998, ei_iso8859_15
+ ISO-IR-203, ei_iso8859_15
+ LATIN-9, ei_iso8859_15
+ ISO8859-15, ei_iso8859_15
+-ISO-8859-16, ei_iso8859_16
+-ISO_8859-16, ei_iso8859_16
+-ISO_8859-16:2001, ei_iso8859_16
+-ISO-IR-226, ei_iso8859_16
+-LATIN10, ei_iso8859_16
+-L10, ei_iso8859_16
+-ISO8859-16, ei_iso8859_16
+ KOI8-R, ei_koi8_r
+ CSKOI8R, ei_koi8_r
+-KOI8-U, ei_koi8_u
+-KOI8-RU, ei_koi8_ru
+ CP1250, ei_cp1250
+ WINDOWS-1250, ei_cp1250
+ MS-EE, ei_cp1250
+-CP1251, ei_cp1251
+-WINDOWS-1251, ei_cp1251
+-MS-CYRL, ei_cp1251
+-CP1252, ei_cp1252
+-WINDOWS-1252, ei_cp1252
+-MS-ANSI, ei_cp1252
+-CP1253, ei_cp1253
+-WINDOWS-1253, ei_cp1253
+-MS-GREEK, ei_cp1253
+-CP1254, ei_cp1254
+-WINDOWS-1254, ei_cp1254
+-MS-TURK, ei_cp1254
+-CP1255, ei_cp1255
+-WINDOWS-1255, ei_cp1255
+-MS-HEBR, ei_cp1255
+-CP1256, ei_cp1256
+-WINDOWS-1256, ei_cp1256
+-MS-ARAB, ei_cp1256
+-CP1257, ei_cp1257
+-WINDOWS-1257, ei_cp1257
+-WINBALTRIM, ei_cp1257
+-CP1258, ei_cp1258
+-WINDOWS-1258, ei_cp1258
+-CP850, ei_cp850
+-IBM850, ei_cp850
+-850, ei_cp850
+-CSPC850MULTILINGUAL, ei_cp850
+-CP862, ei_cp862
+-IBM862, ei_cp862
+-862, ei_cp862
+-CSPC862LATINHEBREW, ei_cp862
+-CP866, ei_cp866
+-IBM866, ei_cp866
+-866, ei_cp866
+-CSIBM866, ei_cp866
+-MACROMAN, ei_mac_roman
+-MACINTOSH, ei_mac_roman
+-MAC, ei_mac_roman
+-CSMACINTOSH, ei_mac_roman
+-MACCENTRALEUROPE, ei_mac_centraleurope
+-MACICELAND, ei_mac_iceland
+-MACCROATIAN, ei_mac_croatian
+-MACROMANIA, ei_mac_romania
+-MACCYRILLIC, ei_mac_cyrillic
+-MACUKRAINE, ei_mac_ukraine
+-MACGREEK, ei_mac_greek
+-MACTURKISH, ei_mac_turkish
+-MACHEBREW, ei_mac_hebrew
+-MACARABIC, ei_mac_arabic
+-MACTHAI, ei_mac_thai
+-HP-ROMAN8, ei_hp_roman8
+-ROMAN8, ei_hp_roman8
+-R8, ei_hp_roman8
+-CSHPROMAN8, ei_hp_roman8
+-NEXTSTEP, ei_nextstep
+-ARMSCII-8, ei_armscii_8
+-GEORGIAN-ACADEMY, ei_georgian_academy
+-GEORGIAN-PS, ei_georgian_ps
+-KOI8-T, ei_koi8_t
+-PT154, ei_pt154
+-PTCP154, ei_pt154
+-CP154, ei_pt154
+-CYRILLIC-ASIAN, ei_pt154
+-CSPTCP154, ei_pt154
+-MULELAO-1, ei_mulelao
+-CP1133, ei_cp1133
+-IBM-CP1133, ei_cp1133
+-TIS-620, ei_tis620
+-TIS620, ei_tis620
+-TIS620-0, ei_tis620
+-TIS620.2529-1, ei_tis620
+-TIS620.2533-0, ei_tis620
+-TIS620.2533-1, ei_tis620
+-ISO-IR-166, ei_tis620
+-CP874, ei_cp874
+-WINDOWS-874, ei_cp874
+-VISCII, ei_viscii
+-VISCII1.1-1, ei_viscii
+-CSVISCII, ei_viscii
+-TCVN, ei_tcvn
+-TCVN-5712, ei_tcvn
+-TCVN5712-1, ei_tcvn
+-TCVN5712-1:1993, ei_tcvn
+-JIS_C6220-1969-RO, ei_iso646_jp
+-ISO646-JP, ei_iso646_jp
+-ISO-IR-14, ei_iso646_jp
+-JP, ei_iso646_jp
+-CSISO14JISC6220RO, ei_iso646_jp
+-JIS_X0201, ei_jisx0201
+-JISX0201-1976, ei_jisx0201
+-X0201, ei_jisx0201
+-CSHALFWIDTHKATAKANA, ei_jisx0201
+-JIS_X0208, ei_jisx0208
+-JIS_X0208-1983, ei_jisx0208
+-JIS_X0208-1990, ei_jisx0208
+-JIS0208, ei_jisx0208
+-X0208, ei_jisx0208
+-ISO-IR-87, ei_jisx0208
+-JIS_C6226-1983, ei_jisx0208
+-CSISO87JISX0208, ei_jisx0208
+-JIS_X0212, ei_jisx0212
+-JIS_X0212.1990-0, ei_jisx0212
+-JIS_X0212-1990, ei_jisx0212
+-X0212, ei_jisx0212
+-ISO-IR-159, ei_jisx0212
+-CSISO159JISX02121990, ei_jisx0212
+-GB_1988-80, ei_iso646_cn
+-ISO646-CN, ei_iso646_cn
+-ISO-IR-57, ei_iso646_cn
+-CN, ei_iso646_cn
+-CSISO57GB1988, ei_iso646_cn
+-GB_2312-80, ei_gb2312
+-ISO-IR-58, ei_gb2312
+-CSISO58GB231280, ei_gb2312
+-CHINESE, ei_gb2312
+-ISO-IR-165, ei_isoir165
+-CN-GB-ISOIR165, ei_isoir165
+-KSC_5601, ei_ksc5601
+-KS_C_5601-1987, ei_ksc5601
+-KS_C_5601-1989, ei_ksc5601
+-ISO-IR-149, ei_ksc5601
+-CSKSC56011987, ei_ksc5601
+-KOREAN, ei_ksc5601
+-EUC-JP, ei_euc_jp
+-EUCJP, ei_euc_jp
+-EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp
+-CSEUCPKDFMTJAPANESE, ei_euc_jp
+-SHIFT_JIS, ei_sjis
+-SHIFT-JIS, ei_sjis
+-SJIS, ei_sjis
+-MS_KANJI, ei_sjis
+-CSSHIFTJIS, ei_sjis
+-CP932, ei_cp932
+-ISO-2022-JP, ei_iso2022_jp
+-CSISO2022JP, ei_iso2022_jp
+-ISO-2022-JP-1, ei_iso2022_jp1
+-ISO-2022-JP-2, ei_iso2022_jp2
+-CSISO2022JP2, ei_iso2022_jp2
+-EUC-CN, ei_euc_cn
+-EUCCN, ei_euc_cn
+-GB2312, ei_euc_cn
+-CN-GB, ei_euc_cn
+-CSGB2312, ei_euc_cn
+-GBK, ei_ces_gbk
+-CP936, ei_cp936
+-MS936, ei_cp936
+-WINDOWS-936, ei_cp936
+-GB18030, ei_gb18030
+-ISO-2022-CN, ei_iso2022_cn
+-CSISO2022CN, ei_iso2022_cn
+-ISO-2022-CN-EXT, ei_iso2022_cn_ext
+-HZ, ei_hz
+-HZ-GB-2312, ei_hz
+-EUC-TW, ei_euc_tw
+-EUCTW, ei_euc_tw
+-CSEUCTW, ei_euc_tw
+-BIG5, ei_ces_big5
+-BIG-5, ei_ces_big5
+-BIG-FIVE, ei_ces_big5
+-BIGFIVE, ei_ces_big5
+-CN-BIG5, ei_ces_big5
+-CSBIG5, ei_ces_big5
+-CP950, ei_cp950
+-BIG5-HKSCS:1999, ei_big5hkscs1999
+-BIG5-HKSCS:2001, ei_big5hkscs2001
+-BIG5-HKSCS, ei_big5hkscs2004
+-BIG5HKSCS, ei_big5hkscs2004
+-BIG5-HKSCS:2004, ei_big5hkscs2004
+-EUC-KR, ei_euc_kr
+-EUCKR, ei_euc_kr
+-CSEUCKR, ei_euc_kr
+-CP949, ei_cp949
+-UHC, ei_cp949
+-JOHAB, ei_johab
+-CP1361, ei_johab
+-ISO-2022-KR, ei_iso2022_kr
+-CSISO2022KR, ei_iso2022_kr
+ CHAR, ei_local_char
+ WCHAR_T, ei_local_wchar_t
+--- a/lib/aliases.h
++++ b/lib/aliases.h
+@@ -1,6 +1,6 @@
+ /* ANSI-C code produced by gperf version 3.0.2 */
+ /* Command-line: gperf -m 10 lib/aliases.gperf  */
+-/* Computed positions: -k'1,3-11,$' */
++/* Computed positions: -k'4-7,10,$' */
+ 
+ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+@@ -32,12 +32,12 @@
+ #line 1 "lib/aliases.gperf"
+ struct alias { int name; unsigned int encoding_index; };
+ 
+-#define TOTAL_KEYWORDS 341
++#define TOTAL_KEYWORDS 70
+ #define MIN_WORD_LENGTH 2
+-#define MAX_WORD_LENGTH 45
+-#define MIN_HASH_VALUE 13
+-#define MAX_HASH_VALUE 997
+-/* maximum key range = 985, duplicates = 0 */
++#define MAX_WORD_LENGTH 17
++#define MIN_HASH_VALUE 4
++#define MAX_HASH_VALUE 98
++/* maximum key range = 95, duplicates = 0 */
+ 
+ #ifdef __GNUC__
+ __inline
+@@ -49,38 +49,31 @@ inline
+ static unsigned int
+ aliases_hash (register const char *str, register unsigned int len)
+ {
+-  static const unsigned short asso_values[] =
++  static const unsigned char asso_values[] =
+     {
+-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
+-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
+-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
+-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
+-      998, 998, 998, 998, 998,   4, 199, 998,  79,   6,
+-       29,  65,  13,  15,   4,  88,  20,  22, 386, 998,
+-      998, 998, 998, 998, 998,  47, 188, 110,   6,  26,
+-       63,  19,  12,   5, 281, 202,   7, 166,  11,   5,
+-       64, 998,   4,  11,  20, 185, 110, 152, 163,   4,
+-        4, 998, 998, 998, 998,   5, 998, 998, 998, 998,
+-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
+-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
+-      998, 998, 998, 998, 998, 998, 998, 998
++      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
++      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
++      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
++      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
++      99, 99, 99, 99, 99,  6, 99, 99, 22,  3,
++       2,  2, 17,  3,  2,  7,  3,  2, 99, 99,
++      99, 99, 99, 99, 99,  4, 53,  2, 21,  2,
++      99,  7, 99, 15, 99, 99, 19, 99, 33,  2,
++       4, 99, 11, 26, 17, 99, 99,  3, 26, 99,
++      99, 99, 99, 99, 99, 10, 99, 99, 99, 99,
++      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
++      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
++      99, 99, 99, 99, 99, 99, 99, 99
+     };
+   register int hval = len;
+ 
+   switch (hval)
+     {
+       default:
+-        hval += asso_values[(unsigned char)str[10]];
+-      /*FALLTHROUGH*/
+-      case 10:
+         hval += asso_values[(unsigned char)str[9]];
+       /*FALLTHROUGH*/
+       case 9:
+-        hval += asso_values[(unsigned char)str[8]];
+-      /*FALLTHROUGH*/
+       case 8:
+-        hval += asso_values[(unsigned char)str[7]];
+-      /*FALLTHROUGH*/
+       case 7:
+         hval += asso_values[(unsigned char)str[6]];
+       /*FALLTHROUGH*/
+@@ -94,11 +87,7 @@ aliases_hash (register const char *str,
+         hval += asso_values[(unsigned char)str[3]];
+       /*FALLTHROUGH*/
+       case 3:
+-        hval += asso_values[(unsigned char)str[2]];
+-      /*FALLTHROUGH*/
+       case 2:
+-      case 1:
+-        hval += asso_values[(unsigned char)str[0]];
+         break;
+     }
+   return hval + asso_values[(unsigned char)str[len - 1]];
+@@ -106,1576 +95,306 @@ aliases_hash (register const char *str,
+ 
+ struct stringpool_t
+   {
+-    char stringpool_str13[sizeof("L6")];
+-    char stringpool_str15[sizeof("L1")];
+-    char stringpool_str18[sizeof("HZ")];
+-    char stringpool_str22[sizeof("L4")];
+-    char stringpool_str24[sizeof("L5")];
+-    char stringpool_str26[sizeof("R8")];
+-    char stringpool_str29[sizeof("L8")];
+-    char stringpool_str31[sizeof("866")];
+-    char stringpool_str38[sizeof("L2")];
+-    char stringpool_str42[sizeof("SJIS")];
+-    char stringpool_str43[sizeof("ISO-IR-6")];
+-    char stringpool_str55[sizeof("ISO-IR-166")];
+-    char stringpool_str57[sizeof("LATIN6")];
+-    char stringpool_str61[sizeof("LATIN1")];
+-    char stringpool_str68[sizeof("ISO-IR-14")];
+-    char stringpool_str74[sizeof("L3")];
+-    char stringpool_str75[sizeof("LATIN4")];
+-    char stringpool_str77[sizeof("ISO-IR-165")];
+-    char stringpool_str79[sizeof("LATIN5")];
+-    char stringpool_str80[sizeof("ISO-IR-126")];
+-    char stringpool_str81[sizeof("862")];
+-    char stringpool_str82[sizeof("ISO-IR-144")];
+-    char stringpool_str89[sizeof("LATIN8")];
+-    char stringpool_str91[sizeof("ISO-IR-58")];
+-    char stringpool_str96[sizeof("ISO-IR-148")];
+-    char stringpool_str97[sizeof("L7")];
+-    char stringpool_str98[sizeof("LATIN-9")];
+-    char stringpool_str100[sizeof("ISO-IR-149")];
+-    char stringpool_str102[sizeof("ISO-IR-159")];
+-    char stringpool_str103[sizeof("ISO-IR-226")];
+-    char stringpool_str107[sizeof("LATIN2")];
+-    char stringpool_str108[sizeof("ISO8859-6")];
+-    char stringpool_str109[sizeof("ISO-IR-199")];
+-    char stringpool_str112[sizeof("ISO8859-1")];
+-    char stringpool_str113[sizeof("ISO-8859-6")];
+-    char stringpool_str114[sizeof("ISO_8859-6")];
+-    char stringpool_str115[sizeof("ISO8859-16")];
+-    char stringpool_str116[sizeof("PT154")];
+-    char stringpool_str117[sizeof("ISO-8859-1")];
+-    char stringpool_str118[sizeof("ISO_8859-1")];
+-    char stringpool_str119[sizeof("ISO8859-11")];
+-    char stringpool_str120[sizeof("ISO-8859-16")];
+-    char stringpool_str121[sizeof("ISO_8859-16")];
+-    char stringpool_str123[sizeof("CN")];
+-    char stringpool_str124[sizeof("ISO-8859-11")];
+-    char stringpool_str125[sizeof("ISO_8859-11")];
+-    char stringpool_str126[sizeof("ISO8859-4")];
+-    char stringpool_str128[sizeof("ISO_8859-16:2001")];
+-    char stringpool_str130[sizeof("ISO8859-5")];
+-    char stringpool_str131[sizeof("ISO-8859-4")];
+-    char stringpool_str132[sizeof("ISO_8859-4")];
+-    char stringpool_str133[sizeof("ISO8859-14")];
+-    char stringpool_str134[sizeof("ISO-IR-101")];
+-    char stringpool_str135[sizeof("ISO-8859-5")];
+-    char stringpool_str136[sizeof("ISO_8859-5")];
+-    char stringpool_str137[sizeof("ISO8859-15")];
+-    char stringpool_str138[sizeof("ISO-8859-14")];
+-    char stringpool_str139[sizeof("ISO_8859-14")];
+-    char stringpool_str140[sizeof("ISO8859-8")];
+-    char stringpool_str142[sizeof("ISO-8859-15")];
+-    char stringpool_str143[sizeof("ISO_8859-15")];
+-    char stringpool_str144[sizeof("ISO8859-9")];
+-    char stringpool_str145[sizeof("ISO-8859-8")];
+-    char stringpool_str146[sizeof("ISO_8859-8")];
+-    char stringpool_str147[sizeof("CP866")];
+-    char stringpool_str148[sizeof("ISO-IR-138")];
+-    char stringpool_str149[sizeof("ISO-8859-9")];
+-    char stringpool_str150[sizeof("ISO_8859-9")];
+-    char stringpool_str151[sizeof("ISO_8859-14:1998")];
+-    char stringpool_str153[sizeof("ISO_8859-15:1998")];
+-    char stringpool_str155[sizeof("ELOT_928")];
+-    char stringpool_str156[sizeof("TCVN")];
+-    char stringpool_str157[sizeof("C99")];
+-    char stringpool_str158[sizeof("ISO8859-2")];
+-    char stringpool_str162[sizeof("CP154")];
+-    char stringpool_str163[sizeof("ISO-8859-2")];
+-    char stringpool_str164[sizeof("ISO_8859-2")];
+-    char stringpool_str166[sizeof("ISO-IR-109")];
+-    char stringpool_str168[sizeof("L10")];
+-    char stringpool_str169[sizeof("CHAR")];
+-    char stringpool_str174[sizeof("CP1256")];
+-    char stringpool_str175[sizeof("ISO-IR-179")];
+-    char stringpool_str176[sizeof("ISO646-CN")];
+-    char stringpool_str177[sizeof("ASCII")];
+-    char stringpool_str178[sizeof("CP1251")];
+-    char stringpool_str179[sizeof("LATIN3")];
+-    char stringpool_str181[sizeof("850")];
+-    char stringpool_str183[sizeof("GB2312")];
+-    char stringpool_str185[sizeof("CP819")];
+-    char stringpool_str192[sizeof("CP1254")];
+-    char stringpool_str194[sizeof("CP949")];
+-    char stringpool_str196[sizeof("CP1255")];
+-    char stringpool_str197[sizeof("CP862")];
+-    char stringpool_str198[sizeof("US")];
+-    char stringpool_str203[sizeof("CP1361")];
+-    char stringpool_str206[sizeof("CP1258")];
+-    char stringpool_str207[sizeof("ISO-IR-110")];
+-    char stringpool_str209[sizeof("IBM866")];
+-    char stringpool_str210[sizeof("CP936")];
+-    char stringpool_str211[sizeof("GEORGIAN-PS")];
+-    char stringpool_str214[sizeof("LATIN10")];
+-    char stringpool_str222[sizeof("CHINESE")];
+-    char stringpool_str224[sizeof("CP1252")];
+-    char stringpool_str225[sizeof("LATIN7")];
+-    char stringpool_str226[sizeof("ISO_8859-10:1992")];
+-    char stringpool_str227[sizeof("ISO-IR-57")];
+-    char stringpool_str228[sizeof("TIS620")];
+-    char stringpool_str230[sizeof("ISO8859-3")];
+-    char stringpool_str231[sizeof("UCS-4")];
+-    char stringpool_str232[sizeof("ISO-IR-87")];
+-    char stringpool_str233[sizeof("TIS-620")];
+-    char stringpool_str234[sizeof("ISO-IR-157")];
+-    char stringpool_str235[sizeof("ISO-8859-3")];
+-    char stringpool_str236[sizeof("ISO_8859-3")];
+-    char stringpool_str237[sizeof("ISO8859-13")];
+-    char stringpool_str240[sizeof("CSISOLATIN6")];
+-    char stringpool_str241[sizeof("BIG5")];
+-    char stringpool_str242[sizeof("ISO-8859-13")];
+-    char stringpool_str243[sizeof("ISO_8859-13")];
+-    char stringpool_str244[sizeof("CSISOLATIN1")];
+-    char stringpool_str245[sizeof("KOI8-R")];
+-    char stringpool_str246[sizeof("BIG-5")];
+-    char stringpool_str247[sizeof("IBM819")];
+-    char stringpool_str248[sizeof("ISO-IR-127")];
+-    char stringpool_str249[sizeof("CP874")];
+-    char stringpool_str251[sizeof("ISO646-US")];
+-    char stringpool_str252[sizeof("VISCII")];
+-    char stringpool_str253[sizeof("MS-EE")];
+-    char stringpool_str256[sizeof("MS-ANSI")];
+-    char stringpool_str258[sizeof("CSISOLATIN4")];
+-    char stringpool_str259[sizeof("IBM862")];
+-    char stringpool_str260[sizeof("CP932")];
+-    char stringpool_str261[sizeof("X0212")];
+-    char stringpool_str262[sizeof("CSISOLATIN5")];
+-    char stringpool_str263[sizeof("UCS-2")];
+-    char stringpool_str265[sizeof("ISO8859-10")];
+-    char stringpool_str266[sizeof("MS936")];
+-    char stringpool_str267[sizeof("WCHAR_T")];
+-    char stringpool_str270[sizeof("ISO-8859-10")];
+-    char stringpool_str271[sizeof("ISO_8859-10")];
+-    char stringpool_str272[sizeof("UTF-16")];
+-    char stringpool_str273[sizeof("EUCCN")];
+-    char stringpool_str274[sizeof("ROMAN8")];
+-    char stringpool_str275[sizeof("ISO-IR-203")];
+-    char stringpool_str276[sizeof("ISO8859-7")];
+-    char stringpool_str277[sizeof("KOI8-T")];
+-    char stringpool_str278[sizeof("EUC-CN")];
+-    char stringpool_str279[sizeof("UCS-4LE")];
+-    char stringpool_str280[sizeof("ISO-IR-100")];
+-    char stringpool_str281[sizeof("ISO-8859-7")];
+-    char stringpool_str282[sizeof("ISO_8859-7")];
+-    char stringpool_str283[sizeof("MULELAO-1")];
+-    char stringpool_str284[sizeof("GB_1988-80")];
+-    char stringpool_str288[sizeof("X0201")];
+-    char stringpool_str289[sizeof("ECMA-114")];
+-    char stringpool_str290[sizeof("CSISOLATIN2")];
+-    char stringpool_str291[sizeof("GEORGIAN-ACADEMY")];
+-    char stringpool_str292[sizeof("PTCP154")];
+-    char stringpool_str295[sizeof("UCS-2LE")];
+-    char stringpool_str296[sizeof("CP1253")];
+-    char stringpool_str297[sizeof("UTF-8")];
+-    char stringpool_str298[sizeof("HP-ROMAN8")];
+-    char stringpool_str300[sizeof("CSASCII")];
+-    char stringpool_str303[sizeof("ECMA-118")];
+-    char stringpool_str304[sizeof("UCS-4-INTERNAL")];
+-    char stringpool_str305[sizeof("TCVN5712-1")];
+-    char stringpool_str307[sizeof("KOREAN")];
+-    char stringpool_str308[sizeof("CP850")];
+-    char stringpool_str309[sizeof("MS-CYRL")];
+-    char stringpool_str310[sizeof("CP950")];
+-    char stringpool_str313[sizeof("TIS620-0")];
+-    char stringpool_str316[sizeof("X0208")];
+-    char stringpool_str319[sizeof("GREEK8")];
+-    char stringpool_str320[sizeof("UCS-2-INTERNAL")];
+-    char stringpool_str321[sizeof("TCVN-5712")];
+-    char stringpool_str323[sizeof("CP1133")];
+-    char stringpool_str324[sizeof("CP1250")];
+-    char stringpool_str327[sizeof("ISO-2022-CN")];
+-    char stringpool_str329[sizeof("UTF-16LE")];
+-    char stringpool_str335[sizeof("CYRILLIC-ASIAN")];
+-    char stringpool_str337[sizeof("ISO-10646-UCS-4")];
+-    char stringpool_str340[sizeof("ISO-2022-CN-EXT")];
+-    char stringpool_str342[sizeof("CP1257")];
+-    char stringpool_str345[sizeof("GB_2312-80")];
+-    char stringpool_str347[sizeof("JP")];
+-    char stringpool_str351[sizeof("EUCKR")];
+-    char stringpool_str353[sizeof("ISO-10646-UCS-2")];
+-    char stringpool_str354[sizeof("GB18030")];
+-    char stringpool_str356[sizeof("EUC-KR")];
+-    char stringpool_str357[sizeof("CSKOI8R")];
+-    char stringpool_str358[sizeof("CSBIG5")];
+-    char stringpool_str360[sizeof("CP367")];
+-    char stringpool_str361[sizeof("MACINTOSH")];
+-    char stringpool_str362[sizeof("CSISOLATIN3")];
+-    char stringpool_str363[sizeof("CN-BIG5")];
+-    char stringpool_str366[sizeof("CYRILLIC")];
+-    char stringpool_str369[sizeof("CSVISCII")];
+-    char stringpool_str370[sizeof("IBM850")];
+-    char stringpool_str372[sizeof("MACTHAI")];
+-    char stringpool_str374[sizeof("UNICODE-1-1")];
+-    char stringpool_str376[sizeof("ISO_646.IRV:1991")];
+-    char stringpool_str380[sizeof("US-ASCII")];
+-    char stringpool_str381[sizeof("UTF-32")];
+-    char stringpool_str384[sizeof("CN-GB-ISOIR165")];
+-    char stringpool_str387[sizeof("NEXTSTEP")];
+-    char stringpool_str389[sizeof("MAC")];
+-    char stringpool_str393[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
+-    char stringpool_str394[sizeof("CSISOLATINARABIC")];
+-    char stringpool_str395[sizeof("HZ-GB-2312")];
+-    char stringpool_str397[sizeof("ARMSCII-8")];
+-    char stringpool_str401[sizeof("CSISOLATINHEBREW")];
+-    char stringpool_str405[sizeof("ISO-2022-KR")];
+-    char stringpool_str407[sizeof("WINDOWS-1256")];
+-    char stringpool_str408[sizeof("UHC")];
+-    char stringpool_str409[sizeof("WINDOWS-1251")];
+-    char stringpool_str411[sizeof("MS-HEBR")];
+-    char stringpool_str412[sizeof("ISO-CELTIC")];
+-    char stringpool_str413[sizeof("UTF-32LE")];
+-    char stringpool_str416[sizeof("WINDOWS-1254")];
+-    char stringpool_str418[sizeof("WINDOWS-1255")];
+-    char stringpool_str420[sizeof("SHIFT-JIS")];
+-    char stringpool_str421[sizeof("SHIFT_JIS")];
+-    char stringpool_str422[sizeof("IBM367")];
+-    char stringpool_str423[sizeof("WINDOWS-1258")];
+-    char stringpool_str424[sizeof("CSPTCP154")];
+-    char stringpool_str426[sizeof("GBK")];
+-    char stringpool_str428[sizeof("UNICODELITTLE")];
+-    char stringpool_str432[sizeof("WINDOWS-1252")];
+-    char stringpool_str433[sizeof("UTF-7")];
+-    char stringpool_str435[sizeof("KSC_5601")];
+-    char stringpool_str437[sizeof("ASMO-708")];
+-    char stringpool_str440[sizeof("CSISO2022CN")];
+-    char stringpool_str444[sizeof("BIGFIVE")];
+-    char stringpool_str447[sizeof("WINDOWS-936")];
+-    char stringpool_str448[sizeof("CSUCS4")];
+-    char stringpool_str449[sizeof("BIG-FIVE")];
+-    char stringpool_str453[sizeof("ISO646-JP")];
+-    char stringpool_str456[sizeof("TIS620.2529-1")];
+-    char stringpool_str457[sizeof("CSISOLATINGREEK")];
+-    char stringpool_str459[sizeof("CSISOLATINCYRILLIC")];
+-    char stringpool_str460[sizeof("UCS-4BE")];
+-    char stringpool_str462[sizeof("UNICODE-1-1-UTF-7")];
+-    char stringpool_str465[sizeof("EUCTW")];
+-    char stringpool_str468[sizeof("WINDOWS-1253")];
+-    char stringpool_str469[sizeof("CSHPROMAN8")];
+-    char stringpool_str470[sizeof("EUC-TW")];
+-    char stringpool_str472[sizeof("KS_C_5601-1989")];
+-    char stringpool_str476[sizeof("UCS-2BE")];
+-    char stringpool_str479[sizeof("VISCII1.1-1")];
+-    char stringpool_str480[sizeof("GREEK")];
+-    char stringpool_str482[sizeof("WINDOWS-1250")];
+-    char stringpool_str483[sizeof("CSGB2312")];
+-    char stringpool_str486[sizeof("WINDOWS-874")];
+-    char stringpool_str487[sizeof("CSUNICODE11")];
+-    char stringpool_str489[sizeof("JAVA")];
+-    char stringpool_str491[sizeof("WINDOWS-1257")];
+-    char stringpool_str493[sizeof("CSUNICODE")];
+-    char stringpool_str500[sizeof("CSHALFWIDTHKATAKANA")];
+-    char stringpool_str502[sizeof("CSISO57GB1988")];
+-    char stringpool_str504[sizeof("MACICELAND")];
+-    char stringpool_str509[sizeof("CSIBM866")];
+-    char stringpool_str510[sizeof("UTF-16BE")];
+-    char stringpool_str513[sizeof("ARABIC")];
+-    char stringpool_str514[sizeof("CN-GB")];
+-    char stringpool_str518[sizeof("CSISO2022KR")];
+-    char stringpool_str520[sizeof("CSMACINTOSH")];
+-    char stringpool_str526[sizeof("JIS0208")];
+-    char stringpool_str528[sizeof("MACROMAN")];
+-    char stringpool_str530[sizeof("ISO_8859-4:1988")];
+-    char stringpool_str532[sizeof("ISO_8859-5:1988")];
+-    char stringpool_str535[sizeof("TIS620.2533-1")];
+-    char stringpool_str536[sizeof("ANSI_X3.4-1986")];
+-    char stringpool_str537[sizeof("ISO_8859-8:1988")];
+-    char stringpool_str538[sizeof("KS_C_5601-1987")];
+-    char stringpool_str539[sizeof("CSSHIFTJIS")];
+-    char stringpool_str540[sizeof("HEBREW")];
+-    char stringpool_str541[sizeof("ISO_8859-9:1989")];
+-    char stringpool_str547[sizeof("MACCROATIAN")];
+-    char stringpool_str548[sizeof("ISO-2022-JP-1")];
+-    char stringpool_str550[sizeof("EUCJP")];
+-    char stringpool_str552[sizeof("ANSI_X3.4-1968")];
+-    char stringpool_str555[sizeof("EUC-JP")];
+-    char stringpool_str561[sizeof("CSISO58GB231280")];
+-    char stringpool_str562[sizeof("JIS_C6226-1983")];
+-    char stringpool_str566[sizeof("IBM-CP1133")];
+-    char stringpool_str569[sizeof("MACCENTRALEUROPE")];
+-    char stringpool_str570[sizeof("CSISO159JISX02121990")];
+-    char stringpool_str571[sizeof("ISO-2022-JP-2")];
+-    char stringpool_str573[sizeof("CSUNICODE11UTF7")];
+-    char stringpool_str574[sizeof("UCS-4-SWAPPED")];
+-    char stringpool_str578[sizeof("UNICODEBIG")];
+-    char stringpool_str579[sizeof("CSISO14JISC6220RO")];
+-    char stringpool_str580[sizeof("JIS_C6220-1969-RO")];
+-    char stringpool_str582[sizeof("ISO_8859-3:1988")];
+-    char stringpool_str586[sizeof("CSPC862LATINHEBREW")];
+-    char stringpool_str588[sizeof("BIG5HKSCS")];
+-    char stringpool_str589[sizeof("ISO_8859-6:1987")];
+-    char stringpool_str590[sizeof("UCS-2-SWAPPED")];
+-    char stringpool_str591[sizeof("ISO_8859-1:1987")];
+-    char stringpool_str593[sizeof("BIG5-HKSCS")];
+-    char stringpool_str594[sizeof("UTF-32BE")];
+-    char stringpool_str604[sizeof("ISO-2022-JP")];
+-    char stringpool_str607[sizeof("KOI8-U")];
+-    char stringpool_str608[sizeof("TIS620.2533-0")];
+-    char stringpool_str612[sizeof("KOI8-RU")];
+-    char stringpool_str614[sizeof("ISO_8859-2:1987")];
+-    char stringpool_str618[sizeof("MACROMANIA")];
+-    char stringpool_str641[sizeof("JIS_X0212")];
+-    char stringpool_str648[sizeof("CSEUCKR")];
+-    char stringpool_str649[sizeof("MACCYRILLIC")];
+-    char stringpool_str650[sizeof("ISO_8859-7:2003")];
+-    char stringpool_str651[sizeof("MS-ARAB")];
+-    char stringpool_str657[sizeof("MS-GREEK")];
+-    char stringpool_str666[sizeof("CSKSC56011987")];
+-    char stringpool_str668[sizeof("JIS_X0201")];
+-    char stringpool_str673[sizeof("ISO_8859-7:1987")];
+-    char stringpool_str683[sizeof("CSISO2022JP2")];
+-    char stringpool_str696[sizeof("JIS_X0208")];
+-    char stringpool_str697[sizeof("JISX0201-1976")];
+-    char stringpool_str706[sizeof("JIS_X0212-1990")];
+-    char stringpool_str717[sizeof("CSISO2022JP")];
+-    char stringpool_str721[sizeof("JOHAB")];
+-    char stringpool_str730[sizeof("MS_KANJI")];
+-    char stringpool_str734[sizeof("CSISO87JISX0208")];
+-    char stringpool_str737[sizeof("MACTURKISH")];
+-    char stringpool_str755[sizeof("TCVN5712-1:1993")];
+-    char stringpool_str756[sizeof("JIS_X0208-1983")];
+-    char stringpool_str762[sizeof("CSEUCTW")];
+-    char stringpool_str763[sizeof("MACGREEK")];
+-    char stringpool_str770[sizeof("JIS_X0208-1990")];
+-    char stringpool_str776[sizeof("WINBALTRIM")];
+-    char stringpool_str790[sizeof("MS-TURK")];
+-    char stringpool_str792[sizeof("MACUKRAINE")];
+-    char stringpool_str796[sizeof("MACARABIC")];
+-    char stringpool_str802[sizeof("CSPC850MULTILINGUAL")];
+-    char stringpool_str845[sizeof("MACHEBREW")];
+-    char stringpool_str903[sizeof("JIS_X0212.1990-0")];
+-    char stringpool_str979[sizeof("BIG5-HKSCS:2001")];
+-    char stringpool_str986[sizeof("BIG5-HKSCS:2004")];
+-    char stringpool_str995[sizeof("BIG5-HKSCS:1999")];
+-    char stringpool_str997[sizeof("CSEUCPKDFMTJAPANESE")];
++    char stringpool_str4[sizeof("L2")];
++    char stringpool_str5[sizeof("L1")];
++    char stringpool_str11[sizeof("MS-EE")];
++    char stringpool_str12[sizeof("CP819")];
++    char stringpool_str15[sizeof("UCS-2")];
++    char stringpool_str16[sizeof("IBM819")];
++    char stringpool_str17[sizeof("UTF-8")];
++    char stringpool_str18[sizeof("UTF-32")];
++    char stringpool_str19[sizeof("UTF-16")];
++    char stringpool_str21[sizeof("CP367")];
++    char stringpool_str22[sizeof("ISO8859-2")];
++    char stringpool_str23[sizeof("ISO8859-1")];
++    char stringpool_str24[sizeof("IBM367")];
++    char stringpool_str25[sizeof("UTF-7")];
++    char stringpool_str26[sizeof("CHAR")];
++    char stringpool_str27[sizeof("ISO8859-15")];
++    char stringpool_str28[sizeof("US")];
++    char stringpool_str29[sizeof("ISO-8859-2")];
++    char stringpool_str31[sizeof("ISO-8859-1")];
++    char stringpool_str32[sizeof("ISO-8859-15")];
++    char stringpool_str33[sizeof("ISO_8859-2")];
++    char stringpool_str35[sizeof("ISO_8859-1")];
++    char stringpool_str36[sizeof("ISO_8859-15")];
++    char stringpool_str37[sizeof("KOI8-R")];
++    char stringpool_str38[sizeof("UCS-2LE")];
++    char stringpool_str39[sizeof("UTF-32LE")];
++    char stringpool_str40[sizeof("UTF-16LE")];
++    char stringpool_str41[sizeof("ISO_8859-15:1998")];
++    char stringpool_str43[sizeof("ISO_8859-2:1987")];
++    char stringpool_str44[sizeof("ISO_8859-1:1987")];
++    char stringpool_str45[sizeof("UCS-4")];
++    char stringpool_str47[sizeof("UNICODE-1-1")];
++    char stringpool_str48[sizeof("ISO-IR-6")];
++    char stringpool_str49[sizeof("CSKOI8R")];
++    char stringpool_str50[sizeof("ASCII")];
++    char stringpool_str51[sizeof("UNICODEBIG")];
++    char stringpool_str52[sizeof("ISO-IR-203")];
++    char stringpool_str53[sizeof("UCS-4LE")];
++    char stringpool_str54[sizeof("ISO-IR-101")];
++    char stringpool_str55[sizeof("CP1250")];
++    char stringpool_str56[sizeof("ISO-10646-UCS-2")];
++    char stringpool_str57[sizeof("UNICODE-1-1-UTF-7")];
++    char stringpool_str58[sizeof("LATIN2")];
++    char stringpool_str59[sizeof("UNICODELITTLE")];
++    char stringpool_str60[sizeof("LATIN1")];
++    char stringpool_str61[sizeof("ISO_646.IRV:1991")];
++    char stringpool_str62[sizeof("ISO646-US")];
++    char stringpool_str63[sizeof("CSUNICODE")];
++    char stringpool_str64[sizeof("UCS-2-INTERNAL")];
++    char stringpool_str65[sizeof("LATIN-9")];
++    char stringpool_str66[sizeof("WCHAR_T")];
++    char stringpool_str68[sizeof("CSUCS4")];
++    char stringpool_str69[sizeof("CSUNICODE11")];
++    char stringpool_str70[sizeof("US-ASCII")];
++    char stringpool_str71[sizeof("ISO-10646-UCS-4")];
++    char stringpool_str72[sizeof("UCS-2BE")];
++    char stringpool_str73[sizeof("UTF-32BE")];
++    char stringpool_str74[sizeof("UTF-16BE")];
++    char stringpool_str75[sizeof("ANSI_X3.4-1986")];
++    char stringpool_str76[sizeof("ANSI_X3.4-1968")];
++    char stringpool_str77[sizeof("CSUNICODE11UTF7")];
++    char stringpool_str78[sizeof("UCS-2-SWAPPED")];
++    char stringpool_str79[sizeof("UCS-4-INTERNAL")];
++    char stringpool_str80[sizeof("CSASCII")];
++    char stringpool_str87[sizeof("UCS-4BE")];
++    char stringpool_str88[sizeof("WINDOWS-1250")];
++    char stringpool_str92[sizeof("ISO-IR-100")];
++    char stringpool_str93[sizeof("UCS-4-SWAPPED")];
++    char stringpool_str97[sizeof("CSISOLATIN2")];
++    char stringpool_str98[sizeof("CSISOLATIN1")];
+   };
+ static const struct stringpool_t stringpool_contents =
+   {
+-    "L6",
+-    "L1",
+-    "HZ",
+-    "L4",
+-    "L5",
+-    "R8",
+-    "L8",
+-    "866",
+     "L2",
+-    "SJIS",
+-    "ISO-IR-6",
+-    "ISO-IR-166",
+-    "LATIN6",
+-    "LATIN1",
+-    "ISO-IR-14",
+-    "L3",
+-    "LATIN4",
+-    "ISO-IR-165",
+-    "LATIN5",
+-    "ISO-IR-126",
+-    "862",
+-    "ISO-IR-144",
+-    "LATIN8",
+-    "ISO-IR-58",
+-    "ISO-IR-148",
+-    "L7",
+-    "LATIN-9",
+-    "ISO-IR-149",
+-    "ISO-IR-159",
+-    "ISO-IR-226",
+-    "LATIN2",
+-    "ISO8859-6",
+-    "ISO-IR-199",
++    "L1",
++    "MS-EE",
++    "CP819",
++    "UCS-2",
++    "IBM819",
++    "UTF-8",
++    "UTF-32",
++    "UTF-16",
++    "CP367",
++    "ISO8859-2",
+     "ISO8859-1",
+-    "ISO-8859-6",
+-    "ISO_8859-6",
+-    "ISO8859-16",
+-    "PT154",
+-    "ISO-8859-1",
+-    "ISO_8859-1",
+-    "ISO8859-11",
+-    "ISO-8859-16",
+-    "ISO_8859-16",
+-    "CN",
+-    "ISO-8859-11",
+-    "ISO_8859-11",
+-    "ISO8859-4",
+-    "ISO_8859-16:2001",
+-    "ISO8859-5",
+-    "ISO-8859-4",
+-    "ISO_8859-4",
+-    "ISO8859-14",
+-    "ISO-IR-101",
+-    "ISO-8859-5",
+-    "ISO_8859-5",
++    "IBM367",
++    "UTF-7",
++    "CHAR",
+     "ISO8859-15",
+-    "ISO-8859-14",
+-    "ISO_8859-14",
+-    "ISO8859-8",
++    "US",
++    "ISO-8859-2",
++    "ISO-8859-1",
+     "ISO-8859-15",
++    "ISO_8859-2",
++    "ISO_8859-1",
+     "ISO_8859-15",
+-    "ISO8859-9",
+-    "ISO-8859-8",
+-    "ISO_8859-8",
+-    "CP866",
+-    "ISO-IR-138",
+-    "ISO-8859-9",
+-    "ISO_8859-9",
+-    "ISO_8859-14:1998",
++    "KOI8-R",
++    "UCS-2LE",
++    "UTF-32LE",
++    "UTF-16LE",
+     "ISO_8859-15:1998",
+-    "ELOT_928",
+-    "TCVN",
+-    "C99",
+-    "ISO8859-2",
+-    "CP154",
+-    "ISO-8859-2",
+-    "ISO_8859-2",
+-    "ISO-IR-109",
+-    "L10",
+-    "CHAR",
+-    "CP1256",
+-    "ISO-IR-179",
+-    "ISO646-CN",
+-    "ASCII",
+-    "CP1251",
+-    "LATIN3",
+-    "850",
+-    "GB2312",
+-    "CP819",
+-    "CP1254",
+-    "CP949",
+-    "CP1255",
+-    "CP862",
+-    "US",
+-    "CP1361",
+-    "CP1258",
+-    "ISO-IR-110",
+-    "IBM866",
+-    "CP936",
+-    "GEORGIAN-PS",
+-    "LATIN10",
+-    "CHINESE",
+-    "CP1252",
+-    "LATIN7",
+-    "ISO_8859-10:1992",
+-    "ISO-IR-57",
+-    "TIS620",
+-    "ISO8859-3",
++    "ISO_8859-2:1987",
++    "ISO_8859-1:1987",
+     "UCS-4",
+-    "ISO-IR-87",
+-    "TIS-620",
+-    "ISO-IR-157",
+-    "ISO-8859-3",
+-    "ISO_8859-3",
+-    "ISO8859-13",
+-    "CSISOLATIN6",
+-    "BIG5",
+-    "ISO-8859-13",
+-    "ISO_8859-13",
+-    "CSISOLATIN1",
+-    "KOI8-R",
+-    "BIG-5",
+-    "IBM819",
+-    "ISO-IR-127",
+-    "CP874",
+-    "ISO646-US",
+-    "VISCII",
+-    "MS-EE",
+-    "MS-ANSI",
+-    "CSISOLATIN4",
+-    "IBM862",
+-    "CP932",
+-    "X0212",
+-    "CSISOLATIN5",
+-    "UCS-2",
+-    "ISO8859-10",
+-    "MS936",
+-    "WCHAR_T",
+-    "ISO-8859-10",
+-    "ISO_8859-10",
+-    "UTF-16",
+-    "EUCCN",
+-    "ROMAN8",
++    "UNICODE-1-1",
++    "ISO-IR-6",
++    "CSKOI8R",
++    "ASCII",
++    "UNICODEBIG",
+     "ISO-IR-203",
+-    "ISO8859-7",
+-    "KOI8-T",
+-    "EUC-CN",
+     "UCS-4LE",
+-    "ISO-IR-100",
+-    "ISO-8859-7",
+-    "ISO_8859-7",
+-    "MULELAO-1",
+-    "GB_1988-80",
+-    "X0201",
+-    "ECMA-114",
+-    "CSISOLATIN2",
+-    "GEORGIAN-ACADEMY",
+-    "PTCP154",
+-    "UCS-2LE",
+-    "CP1253",
+-    "UTF-8",
+-    "HP-ROMAN8",
+-    "CSASCII",
+-    "ECMA-118",
+-    "UCS-4-INTERNAL",
+-    "TCVN5712-1",
+-    "KOREAN",
+-    "CP850",
+-    "MS-CYRL",
+-    "CP950",
+-    "TIS620-0",
+-    "X0208",
+-    "GREEK8",
+-    "UCS-2-INTERNAL",
+-    "TCVN-5712",
+-    "CP1133",
++    "ISO-IR-101",
+     "CP1250",
+-    "ISO-2022-CN",
+-    "UTF-16LE",
+-    "CYRILLIC-ASIAN",
+-    "ISO-10646-UCS-4",
+-    "ISO-2022-CN-EXT",
+-    "CP1257",
+-    "GB_2312-80",
+-    "JP",
+-    "EUCKR",
+     "ISO-10646-UCS-2",
+-    "GB18030",
+-    "EUC-KR",
+-    "CSKOI8R",
+-    "CSBIG5",
+-    "CP367",
+-    "MACINTOSH",
+-    "CSISOLATIN3",
+-    "CN-BIG5",
+-    "CYRILLIC",
+-    "CSVISCII",
+-    "IBM850",
+-    "MACTHAI",
+-    "UNICODE-1-1",
+-    "ISO_646.IRV:1991",
+-    "US-ASCII",
+-    "UTF-32",
+-    "CN-GB-ISOIR165",
+-    "NEXTSTEP",
+-    "MAC",
+-    "EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE",
+-    "CSISOLATINARABIC",
+-    "HZ-GB-2312",
+-    "ARMSCII-8",
+-    "CSISOLATINHEBREW",
+-    "ISO-2022-KR",
+-    "WINDOWS-1256",
+-    "UHC",
+-    "WINDOWS-1251",
+-    "MS-HEBR",
+-    "ISO-CELTIC",
+-    "UTF-32LE",
+-    "WINDOWS-1254",
+-    "WINDOWS-1255",
+-    "SHIFT-JIS",
+-    "SHIFT_JIS",
+-    "IBM367",
+-    "WINDOWS-1258",
+-    "CSPTCP154",
+-    "GBK",
++    "UNICODE-1-1-UTF-7",
++    "LATIN2",
+     "UNICODELITTLE",
+-    "WINDOWS-1252",
+-    "UTF-7",
+-    "KSC_5601",
+-    "ASMO-708",
+-    "CSISO2022CN",
+-    "BIGFIVE",
+-    "WINDOWS-936",
++    "LATIN1",
++    "ISO_646.IRV:1991",
++    "ISO646-US",
++    "CSUNICODE",
++    "UCS-2-INTERNAL",
++    "LATIN-9",
++    "WCHAR_T",
+     "CSUCS4",
+-    "BIG-FIVE",
+-    "ISO646-JP",
+-    "TIS620.2529-1",
+-    "CSISOLATINGREEK",
+-    "CSISOLATINCYRILLIC",
+-    "UCS-4BE",
+-    "UNICODE-1-1-UTF-7",
+-    "EUCTW",
+-    "WINDOWS-1253",
+-    "CSHPROMAN8",
+-    "EUC-TW",
+-    "KS_C_5601-1989",
+-    "UCS-2BE",
+-    "VISCII1.1-1",
+-    "GREEK",
+-    "WINDOWS-1250",
+-    "CSGB2312",
+-    "WINDOWS-874",
+     "CSUNICODE11",
+-    "JAVA",
+-    "WINDOWS-1257",
+-    "CSUNICODE",
+-    "CSHALFWIDTHKATAKANA",
+-    "CSISO57GB1988",
+-    "MACICELAND",
+-    "CSIBM866",
++    "US-ASCII",
++    "ISO-10646-UCS-4",
++    "UCS-2BE",
++    "UTF-32BE",
+     "UTF-16BE",
+-    "ARABIC",
+-    "CN-GB",
+-    "CSISO2022KR",
+-    "CSMACINTOSH",
+-    "JIS0208",
+-    "MACROMAN",
+-    "ISO_8859-4:1988",
+-    "ISO_8859-5:1988",
+-    "TIS620.2533-1",
+     "ANSI_X3.4-1986",
+-    "ISO_8859-8:1988",
+-    "KS_C_5601-1987",
+-    "CSSHIFTJIS",
+-    "HEBREW",
+-    "ISO_8859-9:1989",
+-    "MACCROATIAN",
+-    "ISO-2022-JP-1",
+-    "EUCJP",
+     "ANSI_X3.4-1968",
+-    "EUC-JP",
+-    "CSISO58GB231280",
+-    "JIS_C6226-1983",
+-    "IBM-CP1133",
+-    "MACCENTRALEUROPE",
+-    "CSISO159JISX02121990",
+-    "ISO-2022-JP-2",
+     "CSUNICODE11UTF7",
+-    "UCS-4-SWAPPED",
+-    "UNICODEBIG",
+-    "CSISO14JISC6220RO",
+-    "JIS_C6220-1969-RO",
+-    "ISO_8859-3:1988",
+-    "CSPC862LATINHEBREW",
+-    "BIG5HKSCS",
+-    "ISO_8859-6:1987",
+     "UCS-2-SWAPPED",
+-    "ISO_8859-1:1987",
+-    "BIG5-HKSCS",
+-    "UTF-32BE",
+-    "ISO-2022-JP",
+-    "KOI8-U",
+-    "TIS620.2533-0",
+-    "KOI8-RU",
+-    "ISO_8859-2:1987",
+-    "MACROMANIA",
+-    "JIS_X0212",
+-    "CSEUCKR",
+-    "MACCYRILLIC",
+-    "ISO_8859-7:2003",
+-    "MS-ARAB",
+-    "MS-GREEK",
+-    "CSKSC56011987",
+-    "JIS_X0201",
+-    "ISO_8859-7:1987",
+-    "CSISO2022JP2",
+-    "JIS_X0208",
+-    "JISX0201-1976",
+-    "JIS_X0212-1990",
+-    "CSISO2022JP",
+-    "JOHAB",
+-    "MS_KANJI",
+-    "CSISO87JISX0208",
+-    "MACTURKISH",
+-    "TCVN5712-1:1993",
+-    "JIS_X0208-1983",
+-    "CSEUCTW",
+-    "MACGREEK",
+-    "JIS_X0208-1990",
+-    "WINBALTRIM",
+-    "MS-TURK",
+-    "MACUKRAINE",
+-    "MACARABIC",
+-    "CSPC850MULTILINGUAL",
+-    "MACHEBREW",
+-    "JIS_X0212.1990-0",
+-    "BIG5-HKSCS:2001",
+-    "BIG5-HKSCS:2004",
+-    "BIG5-HKSCS:1999",
+-    "CSEUCPKDFMTJAPANESE"
++    "UCS-4-INTERNAL",
++    "CSASCII",
++    "UCS-4BE",
++    "WINDOWS-1250",
++    "ISO-IR-100",
++    "UCS-4-SWAPPED",
++    "CSISOLATIN2",
++    "CSISOLATIN1"
+   };
+ #define stringpool ((const char *) &stringpool_contents)
+ 
+ static const struct alias aliases[] =
+   {
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+     {-1}, {-1}, {-1}, {-1},
+-#line 134 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, ei_iso8859_10},
+-    {-1},
+-#line 60 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_1},
+-    {-1}, {-1},
+-#line 325 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_hz},
+-    {-1}, {-1}, {-1},
+-#line 84 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_4},
+-    {-1},
+-#line 126 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_iso8859_9},
+-    {-1},
+-#line 226 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_hp_roman8},
+-    {-1}, {-1},
+-#line 151 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_14},
+-    {-1},
+-#line 207 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_cp866},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 68 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_iso8859_2},
+-    {-1}, {-1}, {-1},
+-#line 303 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_sjis},
+-#line 16 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_ascii},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1},
+-#line 247 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_tis620},
+-    {-1},
+-#line 133 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_iso8859_10},
+-    {-1}, {-1}, {-1},
+-#line 59 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_iso8859_1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 259 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_iso646_jp},
++#line 66 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str4, ei_iso8859_2},
++#line 58 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, ei_iso8859_1},
+     {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 76 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_3},
+-#line 83 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_4},
+-    {-1},
+-#line 289 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_isoir165},
+-    {-1},
+-#line 125 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_9},
+-#line 107 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_iso8859_7},
+-#line 203 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_cp862},
+-#line 90 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_5},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 150 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_14},
+-    {-1},
+-#line 286 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_gb2312},
+-    {-1}, {-1}, {-1}, {-1},
+-#line 124 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_9},
+-#line 144 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_13},
+-#line 158 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_15},
+-    {-1},
+-#line 294 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_ksc5601},
+-    {-1},
+-#line 278 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str102, ei_jisx0212},
+-#line 163 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_16},
+-    {-1}, {-1}, {-1},
+-#line 67 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_2},
+-#line 102 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_6},
+-#line 149 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_iso8859_14},
++#line 79 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, ei_cp1250},
++#line 55 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, ei_iso8859_1},
+     {-1}, {-1},
+-#line 62 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_1},
+-#line 94 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_6},
+-#line 95 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso8859_6},
+-#line 166 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_iso8859_16},
+-#line 233 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_pt154},
+-#line 53 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_iso8859_1},
+-#line 54 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_1},
+-#line 139 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_11},
+-#line 160 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_iso8859_16},
+-#line 161 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_iso8859_16},
+-    {-1},
+-#line 283 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso646_cn},
+-#line 137 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_11},
+-#line 138 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_11},
+-#line 86 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_iso8859_4},
+-    {-1},
+-#line 162 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_16},
++#line 24 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_ucs2},
++#line 56 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, ei_iso8859_1},
++#line 23 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_utf8},
++#line 41 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_utf32},
++#line 38 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_utf16},
+     {-1},
+-#line 93 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_5},
+-#line 79 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_4},
++#line 19 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_ascii},
++#line 68 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_2},
++#line 60 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, ei_iso8859_1},
++#line 20 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_ascii},
++#line 44 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_utf7},
+ #line 80 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_4},
+-#line 153 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str133, ei_iso8859_14},
+-#line 66 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_2},
+-#line 87 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_5},
+-#line 88 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_5},
+-#line 159 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_15},
+-#line 146 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_14},
+-#line 147 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_14},
+-#line 120 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_iso8859_8},
+-    {-1},
+-#line 154 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_15},
+-#line 155 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_15},
+-#line 128 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_9},
+-#line 114 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_iso8859_8},
+-#line 115 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_8},
+-#line 205 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp866},
+-#line 117 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_8},
+-#line 121 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_iso8859_9},
+-#line 122 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_9},
+-#line 148 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_14},
+-    {-1},
+-#line 156 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_15},
+-    {-1},
+-#line 109 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_7},
+-#line 253 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_tcvn},
+-#line 51 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_c99},
+-#line 70 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_2},
+-    {-1}, {-1}, {-1},
+-#line 235 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_pt154},
+-#line 63 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_2},
+-#line 64 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_2},
+-    {-1},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_local_char},
+ #line 74 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_3},
+-    {-1},
+-#line 165 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str168, ei_iso8859_16},
+-#line 351 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_local_char},
+-    {-1}, {-1}, {-1}, {-1},
+-#line 189 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_cp1256},
+-#line 142 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str175, ei_iso8859_13},
+-#line 281 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso646_cn},
+-#line 13 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str177, ei_ascii},
+-#line 174 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str178, ei_cp1251},
+-#line 75 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_3},
+-    {-1},
+-#line 199 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_cp850},
+-    {-1},
+-#line 314 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_euc_cn},
+-    {-1},
+-#line 57 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str185, ei_iso8859_1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 183 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str192, ei_cp1254},
+-    {-1},
+-#line 345 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str194, ei_cp949},
+-    {-1},
+-#line 186 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_cp1255},
+-#line 201 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_cp862},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_15},
+ #line 21 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_ascii},
+-    {-1}, {-1}, {-1}, {-1},
+-#line 348 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str203, ei_johab},
+-    {-1}, {-1},
+-#line 195 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_cp1258},
+-#line 82 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_iso8859_4},
+-    {-1},
+-#line 206 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_cp866},
+-#line 318 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_cp936},
+-#line 231 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_georgian_ps},
+-    {-1}, {-1},
+-#line 164 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_iso8859_16},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 288 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_gb2312},
+-    {-1},
+-#line 177 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_cp1252},
+-#line 143 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_13},
+-#line 131 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str226, ei_iso8859_10},
+-#line 282 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_iso646_cn},
+-#line 242 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_tis620},
+-    {-1},
+-#line 78 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str230, ei_iso8859_3},
+-#line 33 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str231, ei_ucs4},
+-#line 271 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_jisx0208},
+-#line 241 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str233, ei_tis620},
+-#line 132 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_10},
+-#line 71 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_3},
+-#line 72 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_3},
+-#line 145 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_13},
+-    {-1}, {-1},
+-#line 135 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_iso8859_10},
+-#line 330 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ces_big5},
+-#line 140 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_iso8859_13},
+-#line 141 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str243, ei_iso8859_13},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_ascii},
+ #line 61 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_iso8859_1},
+-#line 167 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_koi8_r},
+-#line 331 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_ces_big5},
+-#line 58 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_1},
+-#line 97 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_iso8859_6},
+-#line 248 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_cp874},
+-    {-1},
+-#line 14 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_ascii},
+-#line 250 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_viscii},
+-#line 173 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str253, ei_cp1250},
+-    {-1}, {-1},
+-#line 179 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str256, ei_cp1252},
+-    {-1},
+-#line 85 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_iso8859_4},
+-#line 202 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_cp862},
+-#line 306 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_cp932},
+-#line 277 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_jisx0212},
+-#line 127 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_9},
+-#line 24 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_ucs2},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_2},
+     {-1},
+-#line 136 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str265, ei_iso8859_10},
+-#line 319 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_cp936},
+-#line 352 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_local_wchar_t},
+-    {-1}, {-1},
+-#line 129 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_iso8859_10},
+-#line 130 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10},
+-#line 38 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str272, ei_utf16},
+-#line 313 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_euc_cn},
+-#line 225 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_hp_roman8},
+-#line 157 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_15},
+-#line 113 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_iso8859_7},
+-#line 232 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str277, ei_koi8_t},
+-#line 312 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_euc_cn},
+-#line 37 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str279, ei_ucs4le},
+-#line 56 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_iso8859_1},
+-#line 103 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso8859_7},
+-#line 104 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_iso8859_7},
+-#line 238 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_mulelao},
+-#line 280 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str284, ei_iso646_cn},
+-    {-1}, {-1}, {-1},
+-#line 264 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_jisx0201},
+-#line 98 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str289, ei_iso8859_6},
++#line 51 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_iso8859_1},
+ #line 69 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_2},
+-#line 230 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_georgian_academy},
+-#line 234 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_pt154},
+-    {-1}, {-1},
+-#line 31 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_ucs2le},
+-#line 180 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_cp1253},
+-#line 23 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str297, ei_utf8},
+-#line 224 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str298, ei_hp_roman8},
+-    {-1},
+-#line 22 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str300, ei_ascii},
+-    {-1}, {-1},
+-#line 108 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_iso8859_7},
+-#line 49 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs4internal},
+-#line 255 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_tcvn},
+-    {-1},
+-#line 296 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_ksc5601},
+-#line 197 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str308, ei_cp850},
+-#line 176 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str309, ei_cp1251},
+-#line 336 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_cp950},
+-    {-1}, {-1},
+-#line 243 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str313, ei_tis620},
+-    {-1}, {-1},
+-#line 270 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_jisx0208},
+-    {-1}, {-1},
+-#line 110 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str319, ei_iso8859_7},
+-#line 47 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal},
+-#line 254 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_tcvn},
+-    {-1},
+-#line 239 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str323, ei_cp1133},
+-#line 171 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_cp1250},
+-    {-1}, {-1},
+-#line 322 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_iso2022_cn},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_iso8859_15},
++#line 62 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_2},
+     {-1},
++#line 52 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_iso8859_1},
++#line 70 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_iso8859_15},
++#line 75 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, ei_koi8_r},
++#line 31 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_ucs2le},
++#line 43 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, ei_utf32le},
+ #line 40 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_utf16le},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 236 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str335, ei_pt154},
+-    {-1},
+-#line 34 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_ucs4},
+-    {-1}, {-1},
+-#line 324 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str340, ei_iso2022_cn_ext},
+-    {-1},
+-#line 192 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str342, ei_cp1257},
+-    {-1}, {-1},
+-#line 285 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str345, ei_gb2312},
+-    {-1},
+-#line 260 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_iso646_jp},
+-    {-1}, {-1}, {-1},
+-#line 343 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_euc_kr},
+-    {-1},
+-#line 25 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str353, ei_ucs2},
+-#line 321 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_gb18030},
+-    {-1},
+-#line 342 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_euc_kr},
+-#line 168 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_koi8_r},
+-#line 335 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str358, ei_ces_big5},
+-    {-1},
+-#line 19 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str360, ei_ascii},
+-#line 210 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_mac_roman},
+-#line 77 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso8859_3},
+-#line 334 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_ces_big5},
+-    {-1}, {-1},
+-#line 91 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_iso8859_5},
+-    {-1}, {-1},
+-#line 252 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_viscii},
+-#line 198 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_cp850},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_utf16le},
++#line 71 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_iso8859_15},
+     {-1},
+-#line 223 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_mac_thai},
++#line 63 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
++#line 53 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_iso8859_1},
++#line 33 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_ucs4},
+     {-1},
+ #line 29 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str374, ei_ucs2be},
+-    {-1},
+-#line 15 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str376, ei_ascii},
+-    {-1}, {-1}, {-1},
+-#line 12 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str380, ei_ascii},
+-#line 41 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str381, ei_utf32},
+-    {-1}, {-1},
+-#line 290 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str384, ei_isoir165},
+-    {-1}, {-1},
+-#line 228 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_nextstep},
+-    {-1},
+-#line 211 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str389, ei_mac_roman},
+-    {-1}, {-1}, {-1},
+-#line 299 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str393, ei_euc_jp},
+-#line 101 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str394, ei_iso8859_6},
+-#line 326 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str395, ei_hz},
+-    {-1},
+-#line 229 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str397, ei_armscii_8},
+-    {-1}, {-1}, {-1},
+-#line 119 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str401, ei_iso8859_8},
+-    {-1}, {-1}, {-1},
+-#line 349 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str405, ei_iso2022_kr},
+-    {-1},
+-#line 190 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str407, ei_cp1256},
+-#line 346 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str408, ei_cp949},
+-#line 175 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_cp1251},
+-    {-1},
+-#line 188 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_cp1255},
+-#line 152 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_iso8859_14},
+-#line 43 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str413, ei_utf32le},
+-    {-1}, {-1},
+-#line 184 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_cp1254},
+-    {-1},
+-#line 187 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_cp1255},
+-    {-1},
+-#line 302 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_sjis},
+-#line 301 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_sjis},
+-#line 20 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str422, ei_ascii},
+-#line 196 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str423, ei_cp1258},
+-#line 237 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_pt154},
+-    {-1},
+-#line 317 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_ces_gbk},
+-    {-1},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_ucs2be},
++#line 16 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, ei_ascii},
++#line 76 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_koi8_r},
++#line 13 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str50, ei_ascii},
++#line 28 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_ucs2be},
++#line 72 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_iso8859_15},
++#line 37 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_ucs4le},
++#line 64 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_iso8859_2},
++#line 77 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_cp1250},
++#line 25 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str56, ei_ucs2},
++#line 45 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_utf7},
++#line 65 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_iso8859_2},
+ #line 32 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str428, ei_ucs2le},
+-    {-1}, {-1}, {-1},
+-#line 178 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str432, ei_cp1252},
+-#line 44 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_utf7},
+-    {-1},
+-#line 291 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str435, ei_ksc5601},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_ucs2le},
++#line 57 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str60, ei_iso8859_1},
++#line 15 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_ascii},
++#line 14 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_ascii},
++#line 26 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str63, ei_ucs2},
++#line 47 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_ucs2internal},
++#line 73 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_iso8859_15},
++#line 81 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_local_wchar_t},
+     {-1},
+-#line 99 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_iso8859_6},
+-    {-1}, {-1},
+-#line 323 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso2022_cn},
+-    {-1}, {-1}, {-1},
+-#line 333 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_ces_big5},
+-    {-1}, {-1},
+-#line 320 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str447, ei_cp936},
+ #line 35 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_ucs4},
+-#line 332 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_ces_big5},
+-    {-1}, {-1}, {-1},
+-#line 258 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str453, ei_iso646_jp},
+-    {-1}, {-1},
+-#line 244 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str456, ei_tis620},
+-#line 112 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_iso8859_7},
+-    {-1},
+-#line 92 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str459, ei_iso8859_5},
+-#line 36 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str460, ei_ucs4be},
+-    {-1},
+-#line 45 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str462, ei_utf7},
+-    {-1}, {-1},
+-#line 328 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_euc_tw},
+-    {-1}, {-1},
+-#line 181 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_cp1253},
+-#line 227 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str469, ei_hp_roman8},
+-#line 327 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_euc_tw},
+-    {-1},
+-#line 293 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str472, ei_ksc5601},
+-    {-1}, {-1}, {-1},
+-#line 27 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_ucs2be},
+-    {-1}, {-1},
+-#line 251 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_viscii},
+-#line 111 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_iso8859_7},
+-    {-1},
+-#line 172 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str482, ei_cp1250},
+-#line 316 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str483, ei_euc_cn},
+-    {-1}, {-1},
+-#line 249 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str486, ei_cp874},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_ucs4},
+ #line 30 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str487, ei_ucs2be},
+-    {-1},
+-#line 52 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_java},
+-    {-1},
+-#line 193 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str491, ei_cp1257},
+-    {-1},
+-#line 26 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str493, ei_ucs2},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 265 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str500, ei_jisx0201},
+-    {-1},
+-#line 284 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_iso646_cn},
+-    {-1},
+-#line 214 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_mac_iceland},
+-    {-1}, {-1}, {-1}, {-1},
+-#line 208 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str509, ei_cp866},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str69, ei_ucs2be},
++#line 12 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_ascii},
++#line 34 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_ucs4},
++#line 27 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_ucs2be},
++#line 42 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str73, ei_utf32be},
+ #line 39 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_utf16be},
+-    {-1}, {-1},
+-#line 100 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str513, ei_iso8859_6},
+-#line 315 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str514, ei_euc_cn},
+-    {-1}, {-1}, {-1},
+-#line 350 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str518, ei_iso2022_kr},
+-    {-1},
+-#line 212 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str520, ei_mac_roman},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 269 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str526, ei_jisx0208},
+-    {-1},
+-#line 209 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str528, ei_mac_roman},
+-    {-1},
+-#line 81 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_iso8859_4},
+-    {-1},
+-#line 89 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str532, ei_iso8859_5},
+-    {-1}, {-1},
+-#line 246 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str535, ei_tis620},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_utf16be},
+ #line 18 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str536, ei_ascii},
+-#line 116 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str537, ei_iso8859_8},
+-#line 292 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str538, ei_ksc5601},
+-#line 305 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str539, ei_sjis},
+-#line 118 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str540, ei_iso8859_8},
+-#line 123 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str541, ei_iso8859_9},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 215 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str547, ei_mac_croatian},
+-#line 309 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_iso2022_jp1},
+-    {-1},
+-#line 298 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str550, ei_euc_jp},
+-    {-1},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_ascii},
+ #line 17 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str552, ei_ascii},
+-    {-1}, {-1},
+-#line 297 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str555, ei_euc_jp},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 287 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str561, ei_gb2312},
+-#line 272 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str562, ei_jisx0208},
+-    {-1}, {-1}, {-1},
+-#line 240 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str566, ei_cp1133},
+-    {-1}, {-1},
+-#line 213 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str569, ei_mac_centraleurope},
+-#line 279 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_jisx0212},
+-#line 310 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_iso2022_jp2},
+-    {-1},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_ascii},
+ #line 46 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str573, ei_utf7},
+-#line 50 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str574, ei_ucs4swapped},
+-    {-1}, {-1}, {-1},
+-#line 28 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str578, ei_ucs2be},
+-#line 261 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str579, ei_iso646_jp},
+-#line 257 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str580, ei_iso646_jp},
+-    {-1},
+-#line 73 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str582, ei_iso8859_3},
+-    {-1}, {-1}, {-1},
+-#line 204 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str586, ei_cp862},
+-    {-1},
+-#line 340 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str588, ei_big5hkscs2004},
+-#line 96 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str589, ei_iso8859_6},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_utf7},
+ #line 48 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str590, ei_ucs2swapped},
+-#line 55 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str591, ei_iso8859_1},
+-    {-1},
+-#line 339 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str593, ei_big5hkscs2004},
+-#line 42 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_utf32be},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 307 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str604, ei_iso2022_jp},
+-    {-1}, {-1},
+-#line 169 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str607, ei_koi8_u},
+-#line 245 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_tis620},
+-    {-1}, {-1}, {-1},
+-#line 170 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str612, ei_koi8_ru},
+-    {-1},
+-#line 65 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_iso8859_2},
+-    {-1}, {-1}, {-1},
+-#line 216 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str618, ei_mac_romania},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1},
+-#line 274 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str641, ei_jisx0212},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 344 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str648, ei_euc_kr},
+-#line 217 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str649, ei_mac_cyrillic},
+-#line 106 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str650, ei_iso8859_7},
+-#line 191 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str651, ei_cp1256},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 182 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str657, ei_cp1253},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 295 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str666, ei_ksc5601},
+-    {-1},
+-#line 262 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str668, ei_jisx0201},
+-    {-1}, {-1}, {-1}, {-1},
+-#line 105 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str673, ei_iso8859_7},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 311 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str683, ei_iso2022_jp2},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1},
+-#line 266 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str696, ei_jisx0208},
+-#line 263 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0201},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 276 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str706, ei_jisx0212},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1},
+-#line 308 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str717, ei_iso2022_jp},
+-    {-1}, {-1}, {-1},
+-#line 347 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str721, ei_johab},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 304 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str730, ei_sjis},
+-    {-1}, {-1}, {-1},
+-#line 273 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str734, ei_jisx0208},
+-    {-1}, {-1},
+-#line 220 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str737, ei_mac_turkish},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 256 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str755, ei_tcvn},
+-#line 267 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str756, ei_jisx0208},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 329 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str762, ei_euc_tw},
+-#line 219 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str763, ei_mac_greek},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 268 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str770, ei_jisx0208},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 194 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str776, ei_cp1257},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1},
+-#line 185 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str790, ei_cp1254},
+-    {-1},
+-#line 218 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str792, ei_mac_ukraine},
+-    {-1}, {-1}, {-1},
+-#line 222 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_arabic},
+-    {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 200 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str802, ei_cp850},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_ucs2swapped},
++#line 49 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_ucs4internal},
++#line 22 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_ascii},
+     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 221 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str845, ei_mac_hebrew},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
++#line 36 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_ucs4be},
++#line 78 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1250},
+     {-1}, {-1}, {-1},
+-#line 275 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str903, ei_jisx0212},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
++#line 54 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_1},
++#line 50 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_ucs4swapped},
+     {-1}, {-1}, {-1},
+-#line 338 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str979, ei_big5hkscs2001},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 341 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str986, ei_big5hkscs2004},
+-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+-#line 337 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str995, ei_big5hkscs1999},
+-    {-1},
+-#line 300 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str997, ei_euc_jp}
++#line 67 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_2},
++#line 59 "lib/aliases.gperf"
++    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_1}
+   };
+ 
+ #ifdef __GNUC__
+--- a/lib/canonical_dos.h
++++ b/lib/canonical_dos.h
+@@ -1,15 +1 @@
+   (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
+-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,
+--- a/lib/canonical.h
++++ b/lib/canonical.h
+@@ -1,107 +1 @@
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str380,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str297,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str476,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str295,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str231,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str460,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str279,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str510,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str381,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str594,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str413,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str433,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str590,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str304,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str574,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str157,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str489,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str117,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str163,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str235,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str131,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str135,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str113,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str281,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str145,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str149,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str270,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str124,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str242,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str138,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str142,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str120,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str245,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str607,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str612,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str324,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str178,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str224,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str296,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str192,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str196,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str174,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str342,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str206,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str308,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str197,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str147,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str528,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str569,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str504,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str547,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str618,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str649,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str792,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str763,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str737,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str845,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str796,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str372,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str298,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str397,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str291,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str211,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str277,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str116,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str283,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str323,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str233,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str249,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str252,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str156,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str580,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str668,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str696,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str641,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str284,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str345,
+   (int)(long)&((struct stringpool_t *)0)->stringpool_str77,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str435,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str555,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str421,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str260,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str604,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str571,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str278,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str210,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str354,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str327,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str340,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str18,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str470,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str241,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str310,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str995,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str979,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str593,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str356,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str194,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str721,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str405,
+--- a/lib/canonical_local.h
++++ b/lib/canonical_local.h
+@@ -1,2 +1 @@
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str169,
+-  (int)(long)&((struct stringpool_t *)0)->stringpool_str267,
++
+--- a/lib/converters.h
++++ b/lib/converters.h
+@@ -129,161 +129,15 @@ struct conv_struct {
+ #include "ucs2swapped.h"
+ #include "ucs4internal.h"
+ #include "ucs4swapped.h"
+-#include "c99.h"
+-#include "java.h"
+ 
+ /* 8-bit encodings */
+ #include "iso8859_1.h"
+ #include "iso8859_2.h"
+-#include "iso8859_3.h"
+-#include "iso8859_4.h"
+-#include "iso8859_5.h"
+-#include "iso8859_6.h"
+-#include "iso8859_7.h"
+-#include "iso8859_8.h"
+-#include "iso8859_9.h"
+-#include "iso8859_10.h"
+-#include "iso8859_11.h"
+-#include "iso8859_13.h"
+-#include "iso8859_14.h"
+ #include "iso8859_15.h"
+-#include "iso8859_16.h"
+ #include "koi8_r.h"
+-#include "koi8_u.h"
+-#include "koi8_ru.h"
+ #include "cp1250.h"
+-#include "cp1251.h"
+-#include "cp1252.h"
+-#include "cp1253.h"
+-#include "cp1254.h"
+-#include "cp1255.h"
+-#include "cp1256.h"
+-#include "cp1257.h"
+-#include "cp1258.h"
+ #include "cp850.h"
+-#include "cp862.h"
+-#include "cp866.h"
+-#include "mac_roman.h"
+-#include "mac_centraleurope.h"
+-#include "mac_iceland.h"
+-#include "mac_croatian.h"
+-#include "mac_romania.h"
+-#include "mac_cyrillic.h"
+-#include "mac_ukraine.h"
+-#include "mac_greek.h"
+-#include "mac_turkish.h"
+-#include "mac_hebrew.h"
+-#include "mac_arabic.h"
+-#include "mac_thai.h"
+-#include "hp_roman8.h"
+-#include "nextstep.h"
+-#include "armscii_8.h"
+-#include "georgian_academy.h"
+-#include "georgian_ps.h"
+-#include "koi8_t.h"
+-#include "pt154.h"
+-#include "mulelao.h"
+-#include "cp1133.h"
+-#include "tis620.h"
+-#include "cp874.h"
+-#include "viscii.h"
+-#include "tcvn.h"
+-
+-/* CJK character sets [CCS = coded character set] [CJKV.INF chapter 3] */
+-
+-typedef struct {
+-  unsigned short indx; /* index into big table */
+-  unsigned short used; /* bitmask of used entries */
+-} Summary16;
+-
+-#include "iso646_jp.h"
+-#include "jisx0201.h"
+-#include "jisx0208.h"
+-#include "jisx0212.h"
+-
+-#include "iso646_cn.h"
+-#include "gb2312.h"
+-#include "isoir165.h"
+-/*#include "gb12345.h"*/
+-#include "gbk.h"
+-#include "cns11643.h"
+-#include "big5.h"
+-
+-#include "ksc5601.h"
+-#include "johab_hangul.h"
+-
+-/* CJK encodings [CES = character encoding scheme] [CJKV.INF chapter 4] */
+-
+-#include "euc_jp.h"
+-#include "sjis.h"
+-#include "cp932.h"
+-#include "iso2022_jp.h"
+-#include "iso2022_jp1.h"
+-#include "iso2022_jp2.h"
+-
+-#include "euc_cn.h"
+-#include "ces_gbk.h"
+-#include "cp936.h"
+-#include "gb18030.h"
+-#include "iso2022_cn.h"
+-#include "iso2022_cnext.h"
+-#include "hz.h"
+-#include "euc_tw.h"
+-#include "ces_big5.h"
+-#include "cp950.h"
+-#include "big5hkscs1999.h"
+-#include "big5hkscs2001.h"
+-#include "big5hkscs2004.h"
+-
+-#include "euc_kr.h"
+-#include "cp949.h"
+-#include "johab.h"
+-#include "iso2022_kr.h"
+-
+-/* Encodings used by system dependent locales. */
+-
+-#ifdef USE_AIX
+-#include "cp856.h"
+-#include "cp922.h"
+-#include "cp943.h"
+-#include "cp1046.h"
+-#include "cp1124.h"
+-#include "cp1129.h"
+-#include "cp1161.h"
+-#include "cp1162.h"
+-#include "cp1163.h"
+-#endif
+-
+-#ifdef USE_OSF1
+-#include "dec_kanji.h"
+-#include "dec_hanyu.h"
+-#endif
+ 
+ #ifdef USE_DOS
+ #include "cp437.h"
+-#include "cp737.h"
+-#include "cp775.h"
+-#include "cp852.h"
+-#include "cp853.h"
+-#include "cp855.h"
+-#include "cp857.h"
+-#include "cp858.h"
+-#include "cp860.h"
+-#include "cp861.h"
+-#include "cp863.h"
+-#include "cp864.h"
+-#include "cp865.h"
+-#include "cp869.h"
+-#include "cp1125.h"
+-#endif
+-
+-#ifdef USE_EXTRA
+-#include "euc_jisx0213.h"
+-#include "shift_jisx0213.h"
+-#include "iso2022_jp3.h"
+-#include "big5_2003.h"
+-#include "tds565.h"
+-#include "atarist.h"
+-#include "riscos1.h"
+ #endif
+-
+--- a/lib/encodings.def
++++ b/lib/encodings.def
+@@ -161,16 +161,6 @@ DEFENCODING(( "UCS-4-SWAPPED",
+             ucs4swapped,
+             { ucs4swapped_mbtowc, NULL }, { ucs4swapped_wctomb, NULL })
+ 
+-DEFENCODING(( "C99",
+-            ),
+-            c99,
+-            { c99_mbtowc, NULL },         { c99_wctomb, NULL })
+-
+-DEFENCODING(( "JAVA",
+-            ),
+-            java,
+-            { java_mbtowc, NULL },        { java_wctomb, NULL })
+-
+ /* Standard 8-bit encodings */
+ 
+ DEFENCODING(( "ISO-8859-1",             /* IANA */
+@@ -203,148 +193,6 @@ DEFENCODING(( "ISO-8859-2",
+             iso8859_2,
+             { iso8859_2_mbtowc, NULL },   { iso8859_2_wctomb, NULL })
+ 
+-DEFENCODING(( "ISO-8859-3",             /* IANA */
+-              "ISO_8859-3",             /* IANA */
+-              "ISO_8859-3:1988",        /* IANA */
+-              "ISO-IR-109",             /* IANA */
+-              "LATIN3",                 /* IANA */
+-              "L3",                     /* IANA */
+-              "csISOLatin3",            /* IANA */
+-              "ISO8859-3",              /* X11R6.4, glibc, FreeBSD */
+-            /*"ISO8859_3",                 JDK 1.1 */
+-            /*"CP28593",                   Windows */
+-            ),
+-            iso8859_3,
+-            { iso8859_3_mbtowc, NULL },   { iso8859_3_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-4",             /* IANA */
+-              "ISO_8859-4",             /* IANA */
+-              "ISO_8859-4:1988",        /* IANA */
+-              "ISO-IR-110",             /* IANA */
+-              "LATIN4",                 /* IANA */
+-              "L4",                     /* IANA */
+-              "csISOLatin4",            /* IANA */
+-              "ISO8859-4",              /* X11R6.4, glibc, FreeBSD */
+-            /*"ISO8859_4",                 JDK 1.1 */
+-            /*"CP28594",                   Windows */
+-            ),
+-            iso8859_4,
+-            { iso8859_4_mbtowc, NULL },   { iso8859_4_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-5",             /* IANA */
+-              "ISO_8859-5",             /* IANA */
+-              "ISO_8859-5:1988",        /* IANA */
+-              "ISO-IR-144",             /* IANA */
+-              "CYRILLIC",               /* IANA */
+-              "csISOLatinCyrillic",     /* IANA */
+-              "ISO8859-5",              /* X11R6.4, glibc, FreeBSD */
+-            /*"ISO8859_5",                 JDK 1.1 */
+-            /*"CP28595",                   Windows */
+-            ),
+-            iso8859_5,
+-            { iso8859_5_mbtowc, NULL },   { iso8859_5_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-6",             /* IANA */
+-              "ISO_8859-6",             /* IANA */
+-              "ISO_8859-6:1987",        /* IANA */
+-              "ISO-IR-127",             /* IANA */
+-              "ECMA-114",               /* IANA */
+-              "ASMO-708",               /* IANA */
+-              "ARABIC",                 /* IANA */
+-              "csISOLatinArabic",       /* IANA */
+-              "ISO8859-6",              /* X11R6.4, glibc, FreeBSD */
+-            /*"ISO8859_6",                 JDK 1.1 */
+-            /*"CP28596",                   Windows */
+-            ),
+-            iso8859_6,
+-            { iso8859_6_mbtowc, NULL },   { iso8859_6_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-7",             /* IANA, RFC 1947 */
+-              "ISO_8859-7",             /* IANA */
+-              "ISO_8859-7:1987",        /* IANA */
+-              "ISO_8859-7:2003",
+-              "ISO-IR-126",             /* IANA */
+-              "ECMA-118",               /* IANA */
+-              "ELOT_928",               /* IANA */
+-              "GREEK8",                 /* IANA */
+-              "GREEK",                  /* IANA */
+-              "csISOLatinGreek",        /* IANA */
+-              "ISO8859-7",              /* X11R6.4, glibc, FreeBSD */
+-            /*"ISO8859_7",                 JDK 1.1 */
+-            /*"CP28597",                   Windows */
+-            ),
+-            iso8859_7,
+-            { iso8859_7_mbtowc, NULL },   { iso8859_7_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-8",             /* IANA */
+-              "ISO_8859-8",             /* IANA */
+-              "ISO_8859-8:1988",        /* IANA */
+-              "ISO-IR-138",             /* IANA */
+-              "HEBREW",                 /* IANA */
+-              "csISOLatinHebrew",       /* IANA */
+-              "ISO8859-8",              /* X11R6.4, glibc, FreeBSD */
+-            /*"ISO8859_8",                 JDK 1.1 */
+-            /*"CP28598",                   Windows */
+-            /*"CP38598",                   Windows */
+-            ),
+-            iso8859_8,
+-            { iso8859_8_mbtowc, NULL },   { iso8859_8_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-9",             /* IANA */
+-              "ISO_8859-9",             /* IANA */
+-              "ISO_8859-9:1989",        /* IANA */
+-              "ISO-IR-148",             /* IANA */
+-              "LATIN5",                 /* IANA */
+-              "L5",                     /* IANA */
+-              "csISOLatin5",            /* IANA */
+-              "ISO8859-9",              /* X11R6.4, glibc, FreeBSD */
+-            /*"ISO8859_9",                 JDK 1.1 */
+-            /*"CP28599",                   Windows */
+-            ),
+-            iso8859_9,
+-            { iso8859_9_mbtowc, NULL },   { iso8859_9_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-10",            /* IANA */
+-              "ISO_8859-10",
+-              "ISO_8859-10:1992",       /* IANA */
+-              "ISO-IR-157",             /* IANA */
+-              "LATIN6",                 /* IANA */
+-              "L6",                     /* IANA */
+-              "csISOLatin6",            /* IANA */
+-              "ISO8859-10",             /* X11R6.4, glibc, FreeBSD */
+-            ),
+-            iso8859_10,
+-            { iso8859_10_mbtowc, NULL },  { iso8859_10_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-11",            /* glibc */
+-              "ISO_8859-11",
+-              "ISO8859-11",             /* X11R6.7, glibc */
+-            ),
+-            iso8859_11,
+-            { iso8859_11_mbtowc, NULL },  { iso8859_11_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-13",            /* IANA, glibc */
+-              "ISO_8859-13",
+-              "ISO-IR-179",             /* glibc */
+-              "LATIN7",                 /* glibc */
+-              "L7",                     /* glibc */
+-              "ISO8859-13",             /* glibc, FreeBSD */
+-            ),
+-            iso8859_13,
+-            { iso8859_13_mbtowc, NULL },  { iso8859_13_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-8859-14",            /* IANA, glibc */
+-              "ISO_8859-14",            /* IANA */
+-              "ISO_8859-14:1998",       /* IANA, glibc */
+-              "ISO-IR-199",             /* IANA */
+-              "LATIN8",                 /* IANA, glibc */
+-              "L8",                     /* IANA, glibc */
+-              "ISO-CELTIC",             /* IANA */
+-              "ISO8859-14",             /* glibc, FreeBSD */
+-            ),
+-            iso8859_14,
+-            { iso8859_14_mbtowc, NULL },  { iso8859_14_wctomb, NULL })
+-
+ DEFENCODING(( "ISO-8859-15",            /* IANA, glibc */
+               "ISO_8859-15",            /* IANA */
+               "ISO_8859-15:1998",       /* glibc */
+@@ -356,17 +204,6 @@ DEFENCODING(( "ISO-8859-15",
+             iso8859_15,
+             { iso8859_15_mbtowc, NULL },  { iso8859_15_wctomb, NULL })
+ 
+-DEFENCODING(( "ISO-8859-16",            /* IANA */
+-              "ISO_8859-16",            /* IANA */
+-              "ISO_8859-16:2001",       /* IANA */
+-              "ISO-IR-226",             /* IANA */
+-              "LATIN10",                /* IANA */
+-              "L10",                    /* IANA */
+-              "ISO8859-16",             /* glibc, FreeBSD */
+-            ),
+-            iso8859_16,
+-            { iso8859_16_mbtowc, NULL },  { iso8859_16_wctomb, NULL })
+-
+ DEFENCODING(( "KOI8-R",                 /* IANA, RFC 1489, X11R6.4, JDK 1.1 */
+               "csKOI8R",                /* IANA */
+             /*"CP20866",                   Windows */
+@@ -374,16 +211,6 @@ DEFENCODING(( "KOI8-R",
+             koi8_r,
+             { koi8_r_mbtowc, NULL },      { koi8_r_wctomb, NULL })
+ 
+-DEFENCODING(( "KOI8-U",                 /* IANA, RFC 2319 */
+-            ),
+-            koi8_u,
+-            { koi8_u_mbtowc, NULL },      { koi8_u_wctomb, NULL })
+-
+-DEFENCODING(( "KOI8-RU",
+-            ),
+-            koi8_ru,
+-            { koi8_ru_mbtowc, NULL },     { koi8_ru_wctomb, NULL })
+-
+ /* Windows 8-bit encodings */
+ 
+ DEFENCODING(( "CP1250",                 /* JDK 1.1 */
+@@ -393,61 +220,6 @@ DEFENCODING(( "CP1250",
+             cp1250,
+             { cp1250_mbtowc, NULL },      { cp1250_wctomb, NULL })
+ 
+-DEFENCODING(( "CP1251",                 /* JDK 1.1 */
+-              "WINDOWS-1251",           /* IANA */
+-              "MS-CYRL",
+-            ),
+-            cp1251,
+-            { cp1251_mbtowc, NULL },      { cp1251_wctomb, NULL })
+-
+-DEFENCODING(( "CP1252",                 /* JDK 1.1 */
+-              "WINDOWS-1252",           /* IANA */
+-              "MS-ANSI",
+-            ),
+-            cp1252,
+-            { cp1252_mbtowc, NULL },      { cp1252_wctomb, NULL })
+-
+-DEFENCODING(( "CP1253",                 /* JDK 1.1 */
+-              "WINDOWS-1253",           /* IANA */
+-              "MS-GREEK",
+-            ),
+-            cp1253,
+-            { cp1253_mbtowc, NULL },      { cp1253_wctomb, NULL })
+-
+-DEFENCODING(( "CP1254",                 /* JDK 1.1 */
+-              "WINDOWS-1254",           /* IANA */
+-              "MS-TURK",
+-            ),
+-            cp1254,
+-            { cp1254_mbtowc, NULL },      { cp1254_wctomb, NULL })
+-
+-DEFENCODING(( "CP1255",                 /* JDK 1.1 */
+-              "WINDOWS-1255",           /* IANA */
+-              "MS-HEBR",
+-            ),
+-            cp1255,
+-            { cp1255_mbtowc, cp1255_flushwc }, { cp1255_wctomb, NULL })
+-
+-DEFENCODING(( "CP1256",                 /* JDK 1.1 */
+-              "WINDOWS-1256",           /* IANA */
+-              "MS-ARAB",
+-            ),
+-            cp1256,
+-            { cp1256_mbtowc, NULL },      { cp1256_wctomb, NULL })
+-
+-DEFENCODING(( "CP1257",                 /* JDK 1.1 */
+-              "WINDOWS-1257",           /* IANA */
+-              "WINBALTRIM",
+-            ),
+-            cp1257,
+-            { cp1257_mbtowc, NULL },      { cp1257_wctomb, NULL })
+-
+-DEFENCODING(( "CP1258",                 /* JDK 1.1 */
+-              "WINDOWS-1258",           /* IANA */
+-            ),
+-            cp1258,
+-            { cp1258_mbtowc, cp1258_flushwc }, { cp1258_wctomb, NULL })
+-
+ /* DOS 8-bit encodings */
+ 
+ DEFENCODING(( "CP850",                  /* IANA, JDK 1.1 */
+@@ -458,431 +230,3 @@ DEFENCODING(( "CP850",
+             cp850,
+             { cp850_mbtowc, NULL },       { cp850_wctomb, NULL })
+ 
+-DEFENCODING(( "CP862",                  /* IANA, JDK 1.1 */
+-              "IBM862",                 /* IANA */
+-              "862",                    /* IANA */
+-              "csPC862LatinHebrew",     /* IANA */
+-            ),
+-            cp862,
+-            { cp862_mbtowc, NULL },       { cp862_wctomb, NULL })
+-
+-DEFENCODING(( "CP866",                  /* IANA, JDK 1.1 */
+-              "IBM866",                 /* IANA */
+-              "866",                    /* IANA */
+-              "csIBM866",               /* IANA */
+-            ),
+-            cp866,
+-            { cp866_mbtowc, NULL },       { cp866_wctomb, NULL })
+-
+-/* Macintosh 8-bit encodings */
+-
+-DEFENCODING(( "MacRoman",               /* JDK 1.1 */
+-              /* This is the best table for MACINTOSH. The ones */
+-              /* in glibc and FreeBSD-iconv are bad quality. */
+-              "MACINTOSH",              /* IANA */
+-              "MAC",                    /* IANA */
+-              "csMacintosh",            /* IANA */
+-            /*"CP10000",                   Windows */
+-            ),
+-            mac_roman,
+-            { mac_roman_mbtowc, NULL },   { mac_roman_wctomb, NULL })
+-
+-DEFENCODING(( "MacCentralEurope",       /* JDK 1.1 */
+-            /*"CP10029",                   Windows */
+-            ),
+-            mac_centraleurope,
+-            { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL })
+-
+-DEFENCODING(( "MacIceland",             /* JDK 1.1 */
+-            /*"CP10079",                   Windows */
+-            ),
+-            mac_iceland,
+-            { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL })
+-
+-DEFENCODING(( "MacCroatian",            /* JDK 1.1 */
+-            /*"CP10082",                   Windows */
+-            ),
+-            mac_croatian,
+-            { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL })
+-
+-DEFENCODING(( "MacRomania",             /* JDK 1.1 */
+-            /*"CP10010",                   Windows */
+-            ),
+-            mac_romania,
+-            { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL })
+-
+-DEFENCODING(( "MacCyrillic",            /* JDK 1.1 */
+-            /*"CP10007",                   Windows */
+-            ),
+-            mac_cyrillic,
+-            { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL })
+-
+-DEFENCODING(( "MacUkraine",             /* JDK 1.1 */
+-            /*"CP10017",                   Windows */
+-            ),
+-            mac_ukraine,
+-            { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL })
+-
+-DEFENCODING(( "MacGreek",               /* JDK 1.1 */
+-            /*"CP10006",                   Windows */
+-            ),
+-            mac_greek,
+-            { mac_greek_mbtowc, NULL },   { mac_greek_wctomb, NULL })
+-
+-DEFENCODING(( "MacTurkish",             /* JDK 1.1 */
+-            /*"CP10081",                   Windows */
+-            ),
+-            mac_turkish,
+-            { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL })
+-
+-DEFENCODING(( "MacHebrew",              /* JDK 1.1 */
+-            /*"CP10005",                   Windows */
+-            ),
+-            mac_hebrew,
+-            { mac_hebrew_mbtowc, NULL },  { mac_hebrew_wctomb, NULL })
+-
+-DEFENCODING(( "MacArabic",              /* JDK 1.1 */
+-            /*"CP10004",                   Windows */
+-            ),
+-            mac_arabic,
+-            { mac_arabic_mbtowc, NULL },  { mac_arabic_wctomb, NULL })
+-
+-DEFENCODING(( "MacThai",                /* JDK 1.1 */
+-            /*"CP10021",                   Windows */
+-            ),
+-            mac_thai,
+-            { mac_thai_mbtowc, NULL },    { mac_thai_wctomb, NULL })
+-
+-/* Other platform specific 8-bit encodings */
+-
+-DEFENCODING(( "HP-ROMAN8",              /* IANA, X11R6.4 */
+-              "ROMAN8",                 /* IANA */
+-              "R8",                     /* IANA */
+-              "csHPRoman8",             /* IANA */
+-            ),
+-            hp_roman8,
+-            { hp_roman8_mbtowc, NULL },   { hp_roman8_wctomb, NULL })
+-
+-DEFENCODING(( "NEXTSTEP",
+-            ),
+-            nextstep,
+-            { nextstep_mbtowc, NULL },    { nextstep_wctomb, NULL })
+-
+-/* Regional 8-bit encodings used for a single language */
+-
+-DEFENCODING(( "ARMSCII-8",
+-            ),
+-            armscii_8,
+-            { armscii_8_mbtowc, NULL },   { armscii_8_wctomb, NULL })
+-
+-DEFENCODING(( "GEORGIAN-ACADEMY",
+-            ),
+-            georgian_academy,
+-            { georgian_academy_mbtowc, NULL }, { georgian_academy_wctomb, NULL })
+-
+-DEFENCODING(( "GEORGIAN-PS",
+-            ),
+-            georgian_ps,
+-            { georgian_ps_mbtowc, NULL }, { georgian_ps_wctomb, NULL })
+-
+-DEFENCODING(( "KOI8-T",
+-            ),
+-            koi8_t,
+-            { koi8_t_mbtowc, NULL },      { koi8_t_wctomb, NULL })
+-
+-DEFENCODING(( "PT154",                  /* IANA, glibc */
+-              "PTCP154",                /* IANA */
+-              "CP154",                  /* IANA */
+-              "CYRILLIC-ASIAN",         /* IANA */
+-              "csPTCP154",              /* IANA */
+-            ),
+-            pt154,
+-            { pt154_mbtowc, NULL },       { pt154_wctomb, NULL })
+-
+-DEFENCODING(( "MULELAO-1",
+-            ),
+-            mulelao,
+-            { mulelao_mbtowc, NULL },     { mulelao_wctomb, NULL })
+-
+-DEFENCODING(( "CP1133",
+-              "IBM-CP1133",
+-            ),
+-            cp1133,
+-            { cp1133_mbtowc, NULL },      { cp1133_wctomb, NULL })
+-
+-DEFENCODING(( "TIS-620",                /* IANA */
+-              "TIS620",                 /* glibc */
+-              "TIS620-0",               /* glibc */
+-              "TIS620.2529-1",          /* glibc */
+-              "TIS620.2533-0",          /* glibc */
+-              "TIS620.2533-1",
+-              "ISO-IR-166",             /* glibc */
+-            ),
+-            tis620,
+-            { tis620_mbtowc, NULL },      { tis620_wctomb, NULL })
+-
+-DEFENCODING(( "CP874",                  /* JDK 1.1 */
+-              "WINDOWS-874",
+-            ),
+-            cp874,
+-            { cp874_mbtowc, NULL },       { cp874_wctomb, NULL })
+-
+-DEFENCODING(( "VISCII",                 /* IANA, RFC 1456 */
+-              "VISCII1.1-1",
+-              "csVISCII",               /* IANA */
+-            ),
+-            viscii,
+-            { viscii_mbtowc, NULL },      { viscii_wctomb, NULL })
+-
+-DEFENCODING(( "TCVN",
+-              "TCVN-5712",
+-              "TCVN5712-1",
+-              "TCVN5712-1:1993",
+-            ),
+-            tcvn,
+-            { tcvn_mbtowc, tcvn_flushwc }, { tcvn_wctomb, NULL })
+-
+-/* CJK character sets (not documented) */
+-
+-DEFENCODING(( "JIS_C6220-1969-RO",      /* IANA */
+-              "ISO646-JP",              /* IANA */
+-              "ISO-IR-14",              /* IANA */
+-              "JP",                     /* IANA */
+-              "csISO14JISC6220ro",      /* IANA */
+-            ),
+-            iso646_jp,
+-            { iso646_jp_mbtowc, NULL },   { iso646_jp_wctomb, NULL })
+-
+-DEFENCODING(( "JIS_X0201",              /* IANA */
+-              "JISX0201-1976",
+-              "X0201",                  /* IANA */
+-              "csHalfWidthKatakana",    /* IANA */
+-            /*"JISX0201.1976-0",           X11R6.4 */
+-            /*"JIS0201",                   JDK 1.1 */
+-            ),
+-            jisx0201,
+-            { jisx0201_mbtowc, NULL },    { jisx0201_wctomb, NULL })
+-
+-DEFENCODING(( "JIS_X0208",
+-              "JIS_X0208-1983",         /* IANA */
+-              "JIS_X0208-1990",
+-              "JIS0208",
+-              "X0208",                  /* IANA */
+-              "ISO-IR-87",              /* IANA */
+-              "JIS_C6226-1983",         /* IANA */
+-              "csISO87JISX0208",        /* IANA */
+-            /*"JISX0208.1983-0",           X11R6.4 */
+-            /*"JISX0208.1990-0",           X11R6.4 */
+-            /*"JIS0208",                   JDK 1.1 */
+-            ),
+-            jisx0208,
+-            { jisx0208_mbtowc, NULL },    { jisx0208_wctomb, NULL })
+-
+-DEFENCODING(( "JIS_X0212",
+-              "JIS_X0212.1990-0",
+-              "JIS_X0212-1990",         /* IANA */
+-              "X0212",                  /* IANA */
+-              "ISO-IR-159",             /* IANA */
+-              "csISO159JISX02121990",   /* IANA */
+-            /*"JISX0212.1990-0",           X11R6.4 */
+-            /*"JIS0212",                   JDK 1.1 */
+-            ),
+-            jisx0212,
+-            { jisx0212_mbtowc, NULL },    { jisx0212_wctomb, NULL })
+-
+-DEFENCODING(( "GB_1988-80",             /* IANA */
+-              "ISO646-CN",              /* IANA */
+-              "ISO-IR-57",              /* IANA */
+-              "CN",                     /* IANA */
+-              "csISO57GB1988",          /* IANA */
+-            ),
+-            iso646_cn,
+-            { iso646_cn_mbtowc, NULL },   { iso646_cn_wctomb, NULL })
+-
+-DEFENCODING(( "GB_2312-80",             /* IANA */
+-              "ISO-IR-58",              /* IANA */
+-              "csISO58GB231280",        /* IANA */
+-              "CHINESE",                /* IANA */
+-            /*"GB2312.1980-0",             X11R6.4 */
+-            ),
+-            gb2312,
+-            { gb2312_mbtowc, NULL },      { gb2312_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-IR-165",
+-              "CN-GB-ISOIR165",         /* RFC 1922 */
+-            ),
+-            isoir165,
+-            { isoir165_mbtowc, NULL },    { isoir165_wctomb, NULL })
+-
+-DEFENCODING(( "KSC_5601",               /* IANA */
+-              "KS_C_5601-1987",         /* IANA */
+-              "KS_C_5601-1989",         /* IANA */
+-              "ISO-IR-149",             /* IANA */
+-              "csKSC56011987",          /* IANA */
+-              "KOREAN",                 /* IANA */
+-            /*"KSC5601.1987-0",            X11R6.4 */
+-            /*"KSX1001:1992",              Ken Lunde */
+-            ),
+-            ksc5601,
+-            { ksc5601_mbtowc, NULL },     { ksc5601_wctomb, NULL })
+-
+-/* CJK encodings */
+-
+-DEFENCODING(( "EUC-JP",                 /* IANA */
+-              "EUCJP",                  /* glibc */
+-              "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */
+-              "csEUCPkdFmtJapanese",    /* IANA */
+-            /*"EUC_JP",                    JDK 1.1 */
+-            /*"CP51932",                   Windows */
+-            ),
+-            euc_jp,
+-            { euc_jp_mbtowc, NULL },      { euc_jp_wctomb, NULL })
+-
+-DEFENCODING(( "SHIFT_JIS",              /* IANA */
+-              "SHIFT-JIS",              /* glibc */
+-              "SJIS",                   /* JDK 1.1 */
+-              "MS_KANJI",               /* IANA */
+-              "csShiftJIS",             /* IANA */
+-            ),
+-            sjis,
+-            { sjis_mbtowc, NULL },        { sjis_wctomb, NULL })
+-
+-DEFENCODING(( "CP932",                  /* glibc */
+-            ),
+-            cp932,
+-            { cp932_mbtowc, NULL },       { cp932_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-2022-JP",            /* IANA, RFC 1468 */
+-              "csISO2022JP",            /* IANA */
+-            /*"ISO2022JP",                 JDK 1.1 */
+-            ),
+-            iso2022_jp,
+-            { iso2022_jp_mbtowc, NULL },  { iso2022_jp_wctomb, iso2022_jp_reset })
+-
+-DEFENCODING(( "ISO-2022-JP-1",          /* RFC 2237 */
+-            ),
+-            iso2022_jp1,
+-            { iso2022_jp1_mbtowc, NULL }, { iso2022_jp1_wctomb, iso2022_jp1_reset })
+-
+-DEFENCODING(( "ISO-2022-JP-2",          /* IANA, RFC 1554 */
+-              "csISO2022JP2",           /* IANA */
+-            ),
+-            iso2022_jp2,
+-            { iso2022_jp2_mbtowc, NULL }, { iso2022_jp2_wctomb, iso2022_jp2_reset })
+-
+-DEFENCODING(( "EUC-CN",                 /* glibc */
+-              "EUCCN",                  /* glibc */
+-              "GB2312",                 /* IANA */
+-              "CN-GB",                  /* RFC 1922 */
+-              "csGB2312",               /* IANA */
+-            /*"EUC_CN",                    JDK 1.1 */
+-            /*"CP51936",                   Windows */
+-            ),
+-            euc_cn,
+-            { euc_cn_mbtowc, NULL },      { euc_cn_wctomb, NULL })
+-
+-DEFENCODING(( "GBK",                    /* IANA, JDK 1.1 */
+-            ),
+-            ces_gbk,
+-            { ces_gbk_mbtowc, NULL },     { ces_gbk_wctomb, NULL })
+-
+-DEFENCODING(( "CP936",                  /* IANA */
+-              "MS936",                  /* IANA */
+-              "WINDOWS-936",            /* IANA */
+-            ),
+-            cp936,
+-            { cp936_mbtowc, NULL },       { cp936_wctomb, NULL })
+-
+-DEFENCODING(( "GB18030",                /* IANA, glibc */
+-            /*"CP54936",                   Windows */
+-            ),
+-            gb18030,
+-            { gb18030_mbtowc, NULL },     { gb18030_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-2022-CN",            /* IANA, RFC 1922 */
+-              "csISO2022CN",
+-            /*"ISO2022CN",                 JDK 1.1 */
+-            ),
+-            iso2022_cn,
+-            { iso2022_cn_mbtowc, NULL },  { iso2022_cn_wctomb, iso2022_cn_reset })
+-
+-DEFENCODING(( "ISO-2022-CN-EXT",        /* IANA, RFC 1922 */
+-            ),
+-            iso2022_cn_ext,
+-            { iso2022_cn_ext_mbtowc, NULL }, { iso2022_cn_ext_wctomb, iso2022_cn_ext_reset })
+-
+-DEFENCODING(( "HZ",                     /* RFC 1843 */
+-              "HZ-GB-2312",             /* IANA, RFC 1842 */
+-            ),
+-            hz,
+-            { hz_mbtowc, NULL },          { hz_wctomb, hz_reset })
+-
+-DEFENCODING(( "EUC-TW",                 /* glibc */
+-              "EUCTW",                  /* glibc */
+-              "csEUCTW",
+-            /*"EUC_TW",                    JDK 1.1 */
+-            /*"CP51950",                   Windows */
+-            ),
+-            euc_tw,
+-            { euc_tw_mbtowc, NULL },      { euc_tw_wctomb, NULL })
+-
+-DEFENCODING(( "BIG5",                   /* IANA, JDK 1.1 */
+-              "BIG-5",                  /* glibc */
+-              "BIG-FIVE",               /* glibc */
+-              "BIGFIVE",                /* glibc */
+-              "CN-BIG5",                /* RFC 1922 */
+-              "csBig5",                 /* IANA */
+-            ),
+-            ces_big5,
+-            { ces_big5_mbtowc, NULL },    { ces_big5_wctomb, NULL })
+-
+-DEFENCODING(( "CP950",                  /* JDK 1.1 */
+-            ),
+-            cp950,
+-            { cp950_mbtowc, NULL },       { cp950_wctomb, NULL })
+-
+-DEFENCODING(( "BIG5-HKSCS:1999",
+-            ),
+-            big5hkscs1999,
+-            { big5hkscs1999_mbtowc, big5hkscs1999_flushwc }, { big5hkscs1999_wctomb, big5hkscs1999_reset })
+-
+-DEFENCODING(( "BIG5-HKSCS:2001",
+-            ),
+-            big5hkscs2001,
+-            { big5hkscs2001_mbtowc, big5hkscs2001_flushwc }, { big5hkscs2001_wctomb, big5hkscs2001_reset })
+-
+-DEFENCODING(( "BIG5-HKSCS",             /* IANA */
+-              "BIG5HKSCS",              /* glibc */
+-              "BIG5-HKSCS:2004",
+-            ),
+-            big5hkscs2004,
+-            { big5hkscs2004_mbtowc, big5hkscs2004_flushwc }, { big5hkscs2004_wctomb, big5hkscs2004_reset })
+-
+-DEFENCODING(( "EUC-KR",                 /* IANA, RFC 1557 */
+-              "EUCKR",                  /* glibc */
+-              "csEUCKR",                /* IANA */
+-            /*"EUC_KR",                    JDK 1.1 */
+-            /*"CP51949",                   Windows */
+-            ),
+-            euc_kr,
+-            { euc_kr_mbtowc, NULL },      { euc_kr_wctomb, NULL })
+-
+-DEFENCODING(( "CP949",                  /* JDK 1.1 */
+-              "UHC",                    /* glibc */
+-            ),
+-            cp949,
+-            { cp949_mbtowc, NULL },       { cp949_wctomb, NULL })
+-
+-DEFENCODING(( "JOHAB",                  /* glibc */
+-              "CP1361",                 /* glibc */
+-            ),
+-            johab,
+-            { johab_mbtowc, NULL },       { johab_wctomb, NULL })
+-
+-DEFENCODING(( "ISO-2022-KR",            /* IANA, RFC 1557 */
+-              "csISO2022KR",            /* IANA */
+-            /*"ISO2022KR",                 JDK 1.1 */
+-            ),
+-            iso2022_kr,
+-            { iso2022_kr_mbtowc, NULL },  { iso2022_kr_wctomb, iso2022_kr_reset })
+-
+--- a/lib/encodings_dos.def
++++ b/lib/encodings_dos.def
+@@ -26,102 +26,3 @@ DEFENCODING(( "CP437",
+             cp437,
+             { cp437_mbtowc, NULL },       { cp437_wctomb, NULL })
+ 
+-DEFENCODING(( "CP737",                  /* JDK 1.1 */
+-            ),
+-            cp737,
+-            { cp737_mbtowc, NULL },       { cp737_wctomb, NULL })
+-
+-DEFENCODING(( "CP775",                  /* IANA, JDK 1.1 */
+-              "IBM775",                 /* IANA */
+-              "csPC775Baltic",          /* IANA */
+-            ),
+-            cp775,
+-            { cp775_mbtowc, NULL },       { cp775_wctomb, NULL })
+-
+-DEFENCODING(( "CP852",                  /* IANA, JDK 1.1 */
+-              "IBM852",                 /* IANA */
+-              "852",                    /* IANA */
+-              "csPCp852",               /* IANA */
+-            ),
+-            cp852,
+-            { cp852_mbtowc, NULL },       { cp852_wctomb, NULL })
+-
+-DEFENCODING(( "CP853",
+-            ),
+-            cp853,
+-            { cp853_mbtowc, NULL },       { cp853_wctomb, NULL })
+-
+-DEFENCODING(( "CP855",                  /* IANA, JDK 1.1 */
+-              "IBM855",                 /* IANA */
+-              "855",                    /* IANA */
+-              "csIBM855",               /* IANA */
+-            ),
+-            cp855,
+-            { cp855_mbtowc, NULL },       { cp855_wctomb, NULL })
+-
+-DEFENCODING(( "CP857",                  /* IANA, JDK 1.1 */
+-              "IBM857",                 /* IANA */
+-              "857",                    /* IANA */
+-              "csIBM857",               /* IANA */
+-            ),
+-            cp857,
+-            { cp857_mbtowc, NULL },       { cp857_wctomb, NULL })
+-
+-DEFENCODING(( "CP858",                  /* JDK 1.1.7 */
+-            ),
+-            cp858,
+-            { cp858_mbtowc, NULL },       { cp858_wctomb, NULL })
+-
+-DEFENCODING(( "CP860",                  /* IANA, JDK 1.1 */
+-              "IBM860",                 /* IANA */
+-              "860",                    /* IANA */
+-              "csIBM860",               /* IANA */
+-            ),
+-            cp860,
+-            { cp860_mbtowc, NULL },       { cp860_wctomb, NULL })
+-
+-DEFENCODING(( "CP861",                  /* IANA, JDK 1.1 */
+-              "IBM861",                 /* IANA */
+-              "861",                    /* IANA */
+-              "CP-IS",                  /* IANA */
+-              "csIBM861",               /* IANA */
+-            ),
+-            cp861,
+-            { cp861_mbtowc, NULL },       { cp861_wctomb, NULL })
+-
+-DEFENCODING(( "CP863",                  /* IANA, JDK 1.1 */
+-              "IBM863",                 /* IANA */
+-              "863",                    /* IANA */
+-              "csIBM863",               /* IANA */
+-            ),
+-            cp863,
+-            { cp863_mbtowc, NULL },       { cp863_wctomb, NULL })
+-
+-DEFENCODING(( "CP864",                  /* IANA, JDK 1.1 */
+-              "IBM864",                 /* IANA */
+-              "csIBM864",               /* IANA */
+-            ),
+-            cp864,
+-            { cp864_mbtowc, NULL },       { cp864_wctomb, NULL })
+-
+-DEFENCODING(( "CP865",                  /* IANA, JDK 1.1 */
+-              "IBM865",                 /* IANA */
+-              "865",                    /* IANA */
+-              "csIBM865",               /* IANA */
+-            ),
+-            cp865,
+-            { cp865_mbtowc, NULL },       { cp865_wctomb, NULL })
+-
+-DEFENCODING(( "CP869",                  /* IANA, JDK 1.1 */
+-              "IBM869",                 /* IANA */
+-              "869",                    /* IANA */
+-              "CP-GR",                  /* IANA */
+-              "csIBM869",               /* IANA */
+-            ),
+-            cp869,
+-            { cp869_mbtowc, NULL },       { cp869_wctomb, NULL })
+-
+-DEFENCODING(( "CP1125",                 /* ICU */
+-            ),
+-            cp1125,
+-            { cp1125_mbtowc, NULL },      { cp1125_wctomb, NULL })
+--- a/lib/loop_unicode.h
++++ b/lib/loop_unicode.h
+@@ -24,14 +24,15 @@
+ static int unicode_transliterate (conv_t cd, ucs4_t wc,
+                                   unsigned char* outptr, size_t outleft)
+ {
++/*
+   if (cd->oflags & HAVE_HANGUL_JAMO) {
+-    /* Decompose Hangul into Jamo. Use double-width Jamo (contained
++    /-* Decompose Hangul into Jamo. Use double-width Jamo (contained
+        in all Korean encodings and ISO-2022-JP-2), not half-width Jamo
+-       (contained in Unicode only). */
++       (contained in Unicode only). *-/
+     ucs4_t buf[3];
+     int ret = johab_hangul_decompose(cd,buf,wc);
+     if (ret != RET_ILUNI) {
+-      /* we know 1 <= ret <= 3 */
++      /-* we know 1 <= ret <= 3 *-/
+       state_t backup_state = cd->ostate;
+       unsigned char* backup_outptr = outptr;
+       size_t backup_outleft = outleft;
+@@ -57,9 +58,9 @@ static int unicode_transliterate (conv_t
+     }
+   }
+   {
+-    /* Try to use a variant, but postfix it with
++    /-* Try to use a variant, but postfix it with
+        U+303E IDEOGRAPHIC VARIATION INDICATOR
+-       (cf. Ken Lunde's "CJKV information processing", p. 188). */
++       (cf. Ken Lunde's "CJKV information processing", p. 188). *-/
+     int indx = -1;
+     if (wc == 0x3006)
+       indx = 0;
+@@ -105,20 +106,20 @@ static int unicode_transliterate (conv_t
+     }
+   }
+   if (wc >= 0x2018 && wc <= 0x201a) {
+-    /* Special case for quotation marks 0x2018, 0x2019, 0x201a */
++    /-* Special case for quotation marks 0x2018, 0x2019, 0x201a *-/
+     ucs4_t substitute =
+       (cd->oflags & HAVE_QUOTATION_MARKS
+        ? (wc == 0x201a ? 0x2018 : wc)
+        : (cd->oflags & HAVE_ACCENTS
+-          ? (wc==0x2019 ? 0x00b4 : 0x0060) /* use accents */
+-          : 0x0027 /* use apostrophe */
++          ? (wc==0x2019 ? 0x00b4 : 0x0060) /-* use accents *-/
++          : 0x0027 /-* use apostrophe *-/
+       )  );
+     int outcount = cd->ofuncs.xxx_wctomb(cd,outptr,substitute,outleft);
+     if (outcount != RET_ILUNI)
+       return outcount;
+   }
+   {
+-    /* Use the transliteration table. */
++    /-* Use the transliteration table. *-/
+     int indx = translit_index(wc);
+     if (indx >= 0) {
+       const unsigned int * cp = &translit_data[indx];
+@@ -135,7 +136,7 @@ static int unicode_transliterate (conv_t
+         }
+         sub_outcount = cd->ofuncs.xxx_wctomb(cd,outptr,cp[i],outleft);
+         if (sub_outcount == RET_ILUNI)
+-          /* Recursive transliteration. */
++          /-* Recursive transliteration. *-/
+           sub_outcount = unicode_transliterate(cd,cp[i],outptr,outleft);
+         if (sub_outcount <= RET_ILUNI)
+           goto translit_failed;
+@@ -151,6 +152,7 @@ static int unicode_transliterate (conv_t
+         return RET_TOOSMALL;
+     }
+   }
++*/
+   return RET_ILUNI;
+ }
+ 
diff --git a/trunk/package/libs/libiconv-full/patches/101-autotools.patch b/trunk/package/libs/libiconv-full/patches/101-autotools.patch
new file mode 100644
index 00000000..f8fdce56
--- /dev/null
+++ b/trunk/package/libs/libiconv-full/patches/101-autotools.patch
@@ -0,0 +1,26014 @@
+--- a/libcharset/configure.ac
++++ b/libcharset/configure.ac
+@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
+ dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
+ dnl Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+-AC_PREREQ(2.13)
++AC_PREREQ(2.61)
++AC_INIT([libcharset],[1.4] )
++AC_CONFIG_SRCDIR([lib/localcharset.c])
+ 
+-PACKAGE=libcharset
+-VERSION=1.4
+-
+-AC_INIT(lib/localcharset.c)
+ AC_CONFIG_AUX_DIR(build-aux)
+ AC_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+-AC_SUBST(PACKAGE)
+-AC_SUBST(VERSION)
++dnl AC_SUBST(PACKAGE)
++dnl AC_SUBST(VERSION)
++
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ dnl           checks for basic programs
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,8 @@ AM_INIT_AUTOMAKE(libiconv, 1.11)
+ AC_CONFIG_HEADERS(config.h lib/config.h)
+ AC_PROG_MAKE_SET
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl           checks for basic programs
+ 
+ AC_PROG_CC
+--- a/libcharset/m4/libtool.m4
++++ b/libcharset/m4/libtool.m4
+@@ -1,107 +1,186 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+-## Free Software Foundation, Inc.
+-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-##
+-## This file is free software; the Free Software Foundation gives
+-## unlimited permission to copy and/or distribute it, with or without
+-## modifications, as long as this notice is preserved.
+-
+-# serial 48 AC_PROG_LIBTOOL
+-
+-
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+-         [],
+-         [m4_define([AC_PROVIDE_IFELSE],
+-	         [m4_ifdef([AC_PROVIDE_$1],
+-		           [$2], [$3])])])
++#
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++m4_define([_LT_COPYING], [dnl
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++#   This file is part of GNU Libtool.
++#
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
++#
++# GNU Libtool is distributed in the hope that 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 GNU Libtool; see the file COPYING.  If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++])
+ 
++# serial 56 LT_INIT
+ 
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-    [AC_LIBTOOL_CXX],
+-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+-  ])])
+-dnl And a similar setup for Fortran 77 support
+-  AC_PROVIDE_IFELSE([AC_PROG_F77],
+-    [AC_LIBTOOL_F77],
+-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
+-
+-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+-    [AC_LIBTOOL_GCJ],
+-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+-      [AC_LIBTOOL_GCJ],
+-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+-	[AC_LIBTOOL_GCJ],
+-      [ifdef([AC_PROG_GCJ],
+-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([A][M_PROG_GCJ],
+-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([LT_AC_PROG_GCJ],
+-	     [define([LT_AC_PROG_GCJ],
+-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+-])])# AC_PROG_LIBTOOL
+ 
++# LT_PREREQ(VERSION)
++# ------------------
++# Complain and exit if this libtool version is less that VERSION.
++m4_defun([LT_PREREQ],
++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
++       [m4_default([$3],
++		   [m4_fatal([Libtool version $1 or higher is required],
++		             63)])],
++       [$2])])
+ 
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++
++# _LT_CHECK_BUILDDIR
++# ------------------
++# Complain if the absolute build directory name contains unusual characters
++m4_defun([_LT_CHECK_BUILDDIR],
++[case `pwd` in
++  *\ * | *\	*)
++    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
++esac
++])
++
++
++# LT_INIT([OPTIONS])
++# ------------------
++AC_DEFUN([LT_INIT],
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++AC_BEFORE([$0], [LT_LANG])dnl
++AC_BEFORE([$0], [LT_OUTPUT])dnl
++AC_BEFORE([$0], [LTDL_INIT])dnl
++m4_require([_LT_CHECK_BUILDDIR])dnl
++
++dnl Autoconf doesn't catch unexpanded LT_ macros by default:
++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
++dnl unless we require an AC_DEFUNed macro:
++AC_REQUIRE([LTOPTIONS_VERSION])dnl
++AC_REQUIRE([LTSUGAR_VERSION])dnl
++AC_REQUIRE([LTVERSION_VERSION])dnl
++AC_REQUIRE([LTOBSOLETE_VERSION])dnl
++m4_require([_LT_PROG_LTMAIN])dnl
++
++dnl Parse OPTIONS
++_LT_SET_OPTIONS([$0], [$1])
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) $(top_builddir)'
++LIBTOOL="$LIBTOOL/$host_alias-libtool"
+ AC_SUBST(LIBTOOL)dnl
+ 
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
++_LT_SETUP
+ 
++# Only expand once:
++m4_define([LT_INIT])
++])# LT_INIT
++
++# Old names:
++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
++dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+ 
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++m4_defun([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_FILEUTILS_DEFAULTS
++# ----------------------
++# It is okay to use these file commands and assume they have been set
++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
++m4_defun([_LT_FILEUTILS_DEFAULTS],
++[: ${CP="cp -f"}
++: ${MV="mv -f"}
++: ${RM="rm -f"}
++])# _LT_FILEUTILS_DEFAULTS
++
++
++# _LT_SETUP
++# ---------
++m4_defun([_LT_SETUP],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++_LT_DECL([], [host_alias], [0], [The host system])dnl
++_LT_DECL([], [host], [0])dnl
++_LT_DECL([], [host_os], [0])dnl
++dnl
++_LT_DECL([], [build_alias], [0], [The build system])dnl
++_LT_DECL([], [build], [0])dnl
++_LT_DECL([], [build_os], [0])dnl
++dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+-
++AC_REQUIRE([LT_PATH_LD])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++dnl
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
++test -z "$LN_S" && LN_S="ln -s"
++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+ dnl
++AC_REQUIRE([LT_CMD_MAX_LEN])dnl
++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
++dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_CMD_RELOAD])dnl
++m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CMD_OLD_ARCHIVE])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++
++_LT_CONFIG_LIBTOOL_INIT([
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes INIT.
++if test -n "\${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
++])
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
+ 
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
++_LT_CHECK_OBJDIR
+ 
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
++m4_require([_LT_TAG_COMPILER])dnl
++_LT_PROG_ECHO_BACKSLASH
+ 
+ case $host_os in
+ aix3*)
+@@ -117,6307 +196,6803 @@ esac
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+ 
+ # Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+ 
+ # Sed substitution to delay expansion of an escaped shell variable in a
+ # double_quote_subst'ed string.
+ delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
+ # Sed substitution to avoid accidental globbing in evaled expressions
+ no_glob_subst='s/\*/\\\*/g'
+ 
+-# Constants:
+-rm="rm -f"
+-
+ # Global variables:
+-default_ofile=libtool
++ofile=${host_alias}-libtool
+ can_build_shared=yes
+ 
+ # All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+ old_CC="$CC"
+ old_CFLAGS="$CFLAGS"
+ 
+ # Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
+ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
+-
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+-    ;;
+-  *)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
+-
+ _LT_CC_BASENAME([$compiler])
+ 
+ # Only perform the check for file, if the check method requires it
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    AC_PATH_MAGIC
++    _LT_PATH_MAGIC
+   fi
+   ;;
+ esac
+ 
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
+-
+-AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Use C for the default configuration in the libtool script
++LT_SUPPORTED_TAG([CC])
++_LT_LANG_C_CONFIG
++_LT_LANG_DEFAULT_CONFIG
++_LT_CONFIG_COMMANDS
++])# _LT_SETUP
+ 
+-AC_ARG_WITH([pic],
+-    [AC_HELP_STRING([--with-pic],
+-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+-    [pic_mode="$withval"],
+-    [pic_mode=default])
+-test -z "$pic_mode" && pic_mode=default
+ 
+-# Use C for the default configuration in the libtool script
+-tagname=
+-AC_LIBTOOL_LANG_C_CONFIG
+-_LT_AC_TAGCONFIG
+-])# AC_LIBTOOL_SETUP
++# _LT_PROG_LTMAIN
++# ---------------
++# Note that this code is called both from `configure', and `config.status'
++# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
++# `config.status' has no value for ac_aux_dir unless we are using Automake,
++# so we pass a copy along to make sure it has a sensible value anyway.
++m4_defun([_LT_PROG_LTMAIN],
++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
++ltmain="$ac_aux_dir/ltmain.sh"
++])# _LT_PROG_LTMAIN
+ 
+ 
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
++## ------------------------------------- ##
++## Accumulate code for creating libtool. ##
++## ------------------------------------- ##
++
++# So that we can recreate a full libtool script including additional
++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
++# in macros and then make a single call at the end using the `libtool'
++# label.
++
++
++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
++# ----------------------------------------
++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL_INIT],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_INIT])
++
++
++# _LT_CONFIG_LIBTOOL([COMMANDS])
++# ------------------------------
++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
++
++
++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
++# -----------------------------------------------------
++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
++[_LT_CONFIG_LIBTOOL([$1])
++_LT_CONFIG_LIBTOOL_INIT([$2])
++])
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++# _LT_FORMAT_COMMENT([COMMENT])
++# -----------------------------
++# Add leading comment marks to the start of each line, and a trailing
++# full-stop to the whole comment if one is not present already.
++m4_define([_LT_FORMAT_COMMENT],
++[m4_ifval([$1], [
++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
++              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
++)])
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
+ 
+ 
+-# _LT_CC_BASENAME(CC)
+-# -------------------
+-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+-AC_DEFUN([_LT_CC_BASENAME],
+-[for cc_temp in $1""; do
+-  case $cc_temp in
+-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++## ------------------------ ##
++## FIXME: Eliminate VARNAME ##
++## ------------------------ ##
++
++
++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
++# -------------------------------------------------------------------
++# CONFIGNAME is the name given to the value in the libtool script.
++# VARNAME is the (base) name used in the configure script.
++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
++# VARNAME.  Any other value will be used directly.
++m4_define([_LT_DECL],
++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
++    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
++	[m4_ifval([$1], [$1], [$2])])
++    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
++    m4_ifval([$4],
++	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
++    lt_dict_add_subkey([lt_decl_dict], [$2],
++	[tagged?], [m4_ifval([$5], [yes], [no])])])
+ ])
+ 
+ 
+-# _LT_COMPILER_BOILERPLATE
+-# ------------------------
+-# Check for compiler boilerplate output or warnings with
+-# the simple compiler test code.
+-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_COMPILER_BOILERPLATE
+-
++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
++# --------------------------------------------------------
++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
++
++
++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_tag_varnames],
++[_lt_decl_filter([tagged?], [yes], $@)])
++
++
++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
++# ---------------------------------------------------------
++m4_define([_lt_decl_filter],
++[m4_case([$#],
++  [0], [m4_fatal([$0: too few arguments: $#])],
++  [1], [m4_fatal([$0: too few arguments: $#: $1])],
++  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
++  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
++  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
++])
+ 
+-# _LT_LINKER_BOILERPLATE
+-# ----------------------
+-# Check for linker boilerplate output or warnings with
+-# the simple link test code.
+-AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_LINKER_BOILERPLATE
+ 
++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
++# --------------------------------------------------
++m4_define([lt_decl_quote_varnames],
++[_lt_decl_filter([value], [1], $@)])
++
++
++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_dquote_varnames],
++[_lt_decl_filter([value], [2], $@)])
++
++
++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_varnames_tagged],
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++     m4_quote(m4_if([$2], [],
++		     m4_quote(lt_decl_tag_varnames),
++		  m4_quote(m4_shift($@)))),
++     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
++m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
++
++
++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_all_varnames],
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++     m4_if([$2], [],
++	   m4_quote(lt_decl_varnames),
++	m4_quote(m4_shift($@))))[]dnl
++])
++m4_define([_lt_decl_all_varnames],
++[lt_join($@, lt_decl_varnames_tagged([$1],
++			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
++])
+ 
+-# _LT_AC_SYS_LIBPATH_AIX
+-# ----------------------
+-# Links a minimal program and checks the executable
+-# for the system default hardcoded library path. In most cases,
+-# this is /usr/lib:/lib, but when the MPI compilers are used
+-# the location of the communication and MPI libs are included too.
+-# If we don't find anything, use the default library path according
+-# to the aix ld manual.
+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-])# _LT_AC_SYS_LIBPATH_AIX
+ 
++# _LT_CONFIG_STATUS_DECLARE([VARNAME])
++# ------------------------------------
++# Quote a variable value, and forward it to `config.status' so that its
++# declaration there will have the same value as in `configure'.  VARNAME
++# must have a single quote delimited value for this to work.
++m4_define([_LT_CONFIG_STATUS_DECLARE],
++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+ 
+-# _LT_AC_SHELL_INIT(ARG)
+-# ----------------------
+-AC_DEFUN([_LT_AC_SHELL_INIT],
+-[ifdef([AC_DIVERSION_NOTICE],
+-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+-	 [AC_DIVERT_PUSH(NOTICE)])
+-$1
+-AC_DIVERT_POP
+-])# _LT_AC_SHELL_INIT
+ 
++# _LT_CONFIG_STATUS_DECLARATIONS
++# ------------------------------
++# We delimit libtool config variables with single quotes, so when
++# we write them to config.status, we have to be sure to quote all
++# embedded single quotes properly.  In configure, this macro expands
++# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
++#
++#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
++    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+ 
+-# _LT_AC_PROG_ECHO_BACKSLASH
+-# --------------------------
+-# Add some code to the start of the generated configure script which
+-# will find an echo command which doesn't interpret backslashes.
+-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[_LT_AC_SHELL_INIT([
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-case X$ECHO in
+-X*--fallback-echo)
+-  # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+-  ;;
+-esac
++# _LT_LIBTOOL_TAGS
++# ----------------
++# Output comment and list of tags supported by the script
++m4_defun([_LT_LIBTOOL_TAGS],
++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
++available_tags="_LT_TAGS"dnl
++])
+ 
+-echo=${ECHO-echo}
+-if test "X[$]1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X[$]1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $echo works!
+-  :
+-else
+-  # Restart under the correct shell.
+-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-fi
+ 
+-if test "X[$]1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-[$]*
+-EOF
+-  exit 0
+-fi
++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
++# -----------------------------------
++# Extract the dictionary values for VARNAME (optionally with TAG) and
++# expand to a commented shell variable setting:
++#
++#    # Some comment about what VAR is for.
++#    visible_name=$lt_internal_name
++m4_define([_LT_LIBTOOL_DECLARE],
++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
++					   [description])))[]dnl
++m4_pushdef([_libtool_name],
++    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
++    [0], [_libtool_name=[$]$1],
++    [1], [_libtool_name=$lt_[]$1],
++    [2], [_libtool_name=$lt_[]$1],
++    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
++])
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+-       echo_test_string=`eval $cmd` &&
+-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+-    then
+-      break
+-    fi
+-  done
+-fi
++# _LT_LIBTOOL_CONFIG_VARS
++# -----------------------
++# Produce commented declarations of non-tagged libtool config variables
++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
++# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
++# section) are produced by _LT_LIBTOOL_TAG_VARS.
++m4_defun([_LT_LIBTOOL_CONFIG_VARS],
++[m4_foreach([_lt_var],
++    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+ 
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
+ 
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for dir in $PATH /usr/ucb; do
+-    IFS="$lt_save_ifs"
+-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      echo="$dir/echo"
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++# _LT_LIBTOOL_TAG_VARS(TAG)
++# -------------------------
++m4_define([_LT_LIBTOOL_TAG_VARS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+ 
+-  if test "X$echo" = Xecho; then
+-    # We didn't find a better echo, so look for alternatives.
+-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      # This shell has a builtin print -r that does the trick.
+-      echo='print -r'
+-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+-      # If we have ksh, try running configure again with it.
+-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-      export ORIGINAL_CONFIG_SHELL
+-      CONFIG_SHELL=/bin/ksh
+-      export CONFIG_SHELL
+-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-    else
+-      # Try using printf.
+-      echo='printf %s\n'
+-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-	 test "X$echo_testing_string" = "X$echo_test_string"; then
+-	# Cool, printf works
+-	:
+-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	export CONFIG_SHELL
+-	SHELL="$CONFIG_SHELL"
+-	export SHELL
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      else
+-	# maybe with a smaller string...
+-	prev=:
+ 
+-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+-	  then
+-	    break
+-	  fi
+-	  prev="$cmd"
+-	done
++# _LT_TAGVAR(VARNAME, [TAGNAME])
++# ------------------------------
++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+ 
+-	if test "$prev" != 'sed 50q "[$]0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
+-      fi
+-    fi
+-  fi
+-fi
+-fi
+ 
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+-fi
++# _LT_CONFIG_COMMANDS
++# -------------------
++# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
++# variables for single and double quote escaping we saved from calls
++# to _LT_DECL, we can put quote escaped variables declarations
++# into `config.status', and then the shell code to quote escape them in
++# for loops in `config.status'.  Finally, any additional code accumulated
++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
++m4_defun([_LT_CONFIG_COMMANDS],
++[AC_PROVIDE_IFELSE([LT_OUTPUT],
++	dnl If the libtool generation code has been placed in $CONFIG_LT,
++	dnl instead of duplicating it all over again into config.status,
++	dnl then we will have config.status run $CONFIG_LT later, so it
++	dnl needs to know what name is stored there:
++        [AC_CONFIG_COMMANDS([libtool],
++            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
++    dnl If the libtool generation code is destined for config.status,
++    dnl expand the accumulated commands and init code now:
++    [AC_CONFIG_COMMANDS([libtool],
++        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
++])#_LT_CONFIG_COMMANDS
+ 
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
+ 
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
++[
+ 
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
+-[AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *ELF-32*)
+-      HPUX_IA64_MODE="32"
+-      ;;
+-    *ELF-64*)
+-      HPUX_IA64_MODE="64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-   if test "$lt_cv_prog_gnu_ld" = yes; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -melf32bsmip"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -melf32bmipn32"
++sed_quote_subst='$sed_quote_subst'
++double_quote_subst='$double_quote_subst'
++delay_variable_subst='$delay_variable_subst'
++_LT_CONFIG_STATUS_DECLARATIONS
++LTCC='$LTCC'
++LTCFLAGS='$LTCFLAGS'
++compiler='$compiler_DEFAULT'
++
++# Quote evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_quote_varnames); do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+       ;;
+-    *64-bit*)
+-      LD="${LD-ld} -melf64bmip"
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+       ;;
+     esac
+-   else
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
++done
++
++# Double-quote double-evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_dquote_varnames); do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+       ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+       ;;
+     esac
+-   fi
+-  fi
+-  rm -rf conftest*
++done
++
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\[$]0 --fallback-echo"')dnl "
++  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+   ;;
++esac
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.o` in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*linux*|powerpc64-*linux*)
+-          LD="${LD-ld} -m elf32ppclinux"
+-          ;;
+-        s390x-*linux*)
+-          LD="${LD-ld} -m elf_s390"
+-          ;;
+-        sparc64-*linux*)
+-          LD="${LD-ld} -m elf32_sparc"
+-          ;;
+-      esac
+-      ;;
+-    *64-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          LD="${LD-ld} -m elf64_s390"
+-          ;;
+-        sparc*-*linux*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++_LT_OUTPUT_LIBTOOL_INIT
++])
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_PUSH(C)
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_POP])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-sparc*-*solaris*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.o` in
+-    *64-bit*)
+-      case $lt_cv_prog_gnu_ld in
+-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+ 
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-  ;;
+-  ])
+-esac
++# LT_OUTPUT
++# ---------
++# This macro allows early generation of the libtool script (before
++# AC_OUTPUT is called), incase it is used in configure for compilation
++# tests.
++AC_DEFUN([LT_OUTPUT],
++[: ${CONFIG_LT=./config.lt}
++AC_MSG_NOTICE([creating $CONFIG_LT])
++cat >"$CONFIG_LT" <<_LTEOF
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate a libtool stub with the current configuration.
++
++lt_cl_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++AS_SHELL_SANITIZE
++_AS_PREPARE
+ 
+-need_locks="$enable_libtool_lock"
++exec AS_MESSAGE_FD>&1
++exec AS_MESSAGE_LOG_FD>>config.log
++{
++  echo
++  AS_BOX([Running $as_me.])
++} >&AS_MESSAGE_LOG_FD
++
++lt_cl_help="\
++\`$as_me' creates a local libtool stub from the current configuration,
++for use in further configure time tests before the real libtool is
++generated.
++
++Usage: $[0] [[OPTIONS]]
++
++  -h, --help      print this help, then exit
++  -V, --version   print version number, then exit
++  -q, --quiet     do not print progress messages
++  -d, --debug     don't remove temporary files
++
++Report bugs to <bug-libtool@gnu.org>."
++
++lt_cl_version="\
++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
++configured by $[0], generated by m4_PACKAGE_STRING.
++
++Copyright (C) 2008 Free Software Foundation, Inc.
++This config.lt script is free software; the Free Software Foundation
++gives unlimited permision to copy, distribute and modify it."
+ 
+-])# _LT_AC_LOCK
++while test $[#] != 0
++do
++  case $[1] in
++    --version | --v* | -V )
++      echo "$lt_cl_version"; exit 0 ;;
++    --help | --h* | -h )
++      echo "$lt_cl_help"; exit 0 ;;
++    --debug | --d* | -d )
++      debug=: ;;
++    --quiet | --q* | --silent | --s* | -q )
++      lt_cl_silent=: ;;
+ 
++    -*) AC_MSG_ERROR([unrecognized option: $[1]
++Try \`$[0] --help' for more information.]) ;;
+ 
+-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ----------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+-[AC_REQUIRE([LT_AC_PROG_SED])
+-AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$3"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   if (exit $ac_status) && test -s "$ac_outfile"; then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-])
++    *) AC_MSG_ERROR([unrecognized argument: $[1]
++Try \`$[0] --help' for more information.]) ;;
++  esac
++  shift
++done
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$5], , :, [$5])
+-else
+-    ifelse([$6], , :, [$6])
++if $lt_cl_silent; then
++  exec AS_MESSAGE_FD>/dev/null
+ fi
+-])# AC_LIBTOOL_COMPILER_OPTION
+-
+-
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The linker can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
+-         $2=yes
+-       fi
+-     else
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-])
++_LTEOF
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$4], , :, [$4])
+-else
+-    ifelse([$5], , :, [$5])
++cat >>"$CONFIG_LT" <<_LTEOF
++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++AC_MSG_NOTICE([creating $ofile])
++_LT_OUTPUT_LIBTOOL_COMMANDS
++AS_EXIT(0)
++_LTEOF
++chmod +x "$CONFIG_LT"
++
++# configure is writing to config.log, but config.lt does its own redirection,
++# appending to config.log, which fails on DOS, as config.log is still kept
++# open by configure.  Here we exec the FD to /dev/null, effectively closing
++# config.log, so it can be properly (re)opened and appended to by config.lt.
++if test "$no_create" != yes; then
++  lt_cl_success=:
++  test "$silent" = yes &&
++    lt_config_lt_args="$lt_config_lt_args --quiet"
++  exec AS_MESSAGE_LOG_FD>/dev/null
++  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
++  exec AS_MESSAGE_LOG_FD>>config.log
++  $lt_cl_success || AS_EXIT(1)
+ fi
+-])# AC_LIBTOOL_LINKER_OPTION
+-
++])# LT_OUTPUT
+ 
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+-  i=0
+-  teststring="ABCD"
+ 
+-  case $build_os in
+-  msdosdjgpp*)
+-    # On DJGPP, this test can blow up pretty badly due to problems in libc
+-    # (any single argument exceeding 2000 bytes causes a buffer overrun
+-    # during glob expansion).  Even if it were fixed, the result of this
+-    # check would be larger than it should be.
+-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+-    ;;
++# _LT_CONFIG(TAG)
++# ---------------
++# If TAG is the built-in tag, create an initial libtool script with a
++# default configuration from the untagged config vars.  Otherwise add code
++# to config.status for appending the configuration named by TAG from the
++# matching tagged config vars.
++m4_defun([_LT_CONFIG],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++_LT_CONFIG_SAVE_COMMANDS([
++  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
++  m4_if(_LT_TAG, [C], [
++    # See if we are running on zsh, and set the options which allow our
++    # commands through without removal of \ escapes.
++    if test -n "${ZSH_VERSION+set}" ; then
++      setopt NO_GLOB_SUBST
++    fi
+ 
+-  gnu*)
+-    # Under GNU Hurd, this test is not required because there is
+-    # no limit to the length of command line arguments.
+-    # Libtool will interpret -1 as no limit whatsoever
+-    lt_cv_sys_max_cmd_len=-1;
+-    ;;
++    cfgfile="${ofile}T"
++    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
++    $RM "$cfgfile"
+ 
+-  cygwin* | mingw*)
+-    # On Win9x/ME, this test blows up -- it succeeds, but takes
+-    # about 5 minutes as the teststring grows exponentially.
+-    # Worse, since 9x/ME are not pre-emptively multitasking,
+-    # you end up with a "frozen" computer, even though with patience
+-    # the test eventually succeeds (with a max line length of 256k).
+-    # Instead, let's just punt: use the minimum linelength reported by
+-    # all of the supported platforms: 8192 (on NT/2K/XP).
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++    cat <<_LT_EOF >> "$cfgfile"
++#! $SHELL
+ 
+-  amigaos*)
+-    # On AmigaOS with pdksh, this test takes hours, literally.
+-    # So we just punt and use a minimum line length of 8192.
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++_LT_COPYING
++_LT_LIBTOOL_TAGS
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+-    # This has been around since 386BSD, at least.  Likely further.
+-    if test -x /sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+-    elif test -x /usr/sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+-    else
+-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+-    fi
+-    # And add a safety zone
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+-    ;;
++# ### BEGIN LIBTOOL CONFIG
++_LT_LIBTOOL_CONFIG_VARS
++_LT_LIBTOOL_TAG_VARS
++# ### END LIBTOOL CONFIG
+ 
+-  interix*)
+-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+-    lt_cv_sys_max_cmd_len=196608
+-    ;;
++_LT_EOF
+ 
+-  osf*)
+-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+-    # nice to cause kernel panics so lets avoid the loop below.
+-    # First set a reasonable default.
+-    lt_cv_sys_max_cmd_len=16384
+-    #
+-    if test -x /sbin/sysconfig; then
+-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+-      esac
+-    fi
+-    ;;
+-  sco3.2v5*)
+-    lt_cv_sys_max_cmd_len=102400
+-    ;;
+-  sysv5* | sco5v6* | sysv4.2uw2*)
+-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+-    if test -n "$kargmax"; then
+-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+-    else
+-      lt_cv_sys_max_cmd_len=32768
+-    fi
+-    ;;
+-  *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+-	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++  case $host_os in
++  aix3*)
++    cat <<\_LT_EOF >> "$cfgfile"
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++_LT_EOF
+     ;;
+   esac
+-])
+-if test -n $lt_cv_sys_max_cmd_len ; then
+-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+-else
+-  AC_MSG_RESULT(none)
+-fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
++  _LT_PROG_LTMAIN
+ 
+-# _LT_AC_CHECK_DLFCN
+-# ------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
+ 
++  _LT_PROG_XSI_SHELLFNS
+ 
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ---------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "$cross_compiling" = yes; then :
+-  [$4]
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-[#line __oline__ "configure"
+-#include "confdefs.h"
++  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++  mv -f "$cfgfile" "$ofile" ||
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++],
++[cat <<_LT_EOF >> "$ofile"
+ 
+-#include <stdio.h>
++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
++dnl in a comment (ie after a #).
++# ### BEGIN LIBTOOL TAG CONFIG: $1
++_LT_LIBTOOL_TAG_VARS(_LT_TAG)
++# ### END LIBTOOL TAG CONFIG: $1
++_LT_EOF
++])dnl /m4_if
++],
++[m4_if([$1], [], [
++    PACKAGE='$PACKAGE'
++    VERSION='$VERSION'
++    TIMESTAMP='$TIMESTAMP'
++    RM='$RM'
++    ofile='$ofile'], [])
++])dnl /_LT_CONFIG_SAVE_COMMANDS
++])# _LT_CONFIG
++
++
++# LT_SUPPORTED_TAG(TAG)
++# ---------------------
++# Trace this macro to discover what tags are supported by the libtool
++# --tag option, using:
++#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
++AC_DEFUN([LT_SUPPORTED_TAG], [])
++
++
++# C support is built-in for now
++m4_define([_LT_LANG_C_enabled], [])
++m4_define([_LT_TAGS], [])
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
++# LT_LANG(LANG)
++# -------------
++# Enable libtool support for the given language if not already enabled.
++AC_DEFUN([LT_LANG],
++[AC_BEFORE([$0], [LT_OUTPUT])dnl
++m4_case([$1],
++  [C],			[_LT_LANG(C)],
++  [C++],		[_LT_LANG(CXX)],
++  [Java],		[_LT_LANG(GCJ)],
++  [Fortran 77],		[_LT_LANG(F77)],
++  [Fortran],		[_LT_LANG(FC)],
++  [Windows Resource],	[_LT_LANG(RC)],
++  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
++    [_LT_LANG($1)],
++    [m4_fatal([$0: unsupported language: "$1"])])])dnl
++])# LT_LANG
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-  else
+-    puts (dlerror ());
++# _LT_LANG(LANGNAME)
++# ------------------
++m4_defun([_LT_LANG],
++[m4_ifdef([_LT_LANG_]$1[_enabled], [],
++  [LT_SUPPORTED_TAG([$1])dnl
++  m4_append([_LT_TAGS], [$1 ])dnl
++  m4_define([_LT_LANG_]$1[_enabled], [])dnl
++  _LT_LANG_$1_CONFIG($1)])dnl
++])# _LT_LANG
+ 
+-    exit (status);
+-}]
+-EOF
+-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) $1 ;;
+-      x$lt_dlneed_uscore) $2 ;;
+-      x$lt_dlunknown|x*) $3 ;;
+-    esac
+-  else :
+-    # compilation failed
+-    $3
+-  fi
+-fi
+-rm -fr conftest*
+-])# _LT_AC_TRY_DLOPEN_SELF
+ 
++# _LT_LANG_DEFAULT_CONFIG
++# -----------------------
++m4_defun([_LT_LANG_DEFAULT_CONFIG],
++[AC_PROVIDE_IFELSE([AC_PROG_CXX],
++  [LT_LANG(CXX)],
++  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
++
++AC_PROVIDE_IFELSE([AC_PROG_F77],
++  [LT_LANG(F77)],
++  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
++
++AC_PROVIDE_IFELSE([AC_PROG_FC],
++  [LT_LANG(FC)],
++  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
++
++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
++dnl pulling things in needlessly.
++AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++  [LT_LANG(GCJ)],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++    [LT_LANG(GCJ)],
++    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
++      [LT_LANG(GCJ)],
++      [m4_ifdef([AC_PROG_GCJ],
++	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
++       m4_ifdef([A][M_PROG_GCJ],
++	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
++       m4_ifdef([LT_PROG_GCJ],
++	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
++
++AC_PROVIDE_IFELSE([LT_PROG_RC],
++  [LT_LANG(RC)],
++  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
++])# _LT_LANG_DEFAULT_CONFIG
++
++# Obsolete macros:
++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
++dnl AC_DEFUN([AC_LIBTOOL_F77], [])
++dnl AC_DEFUN([AC_LIBTOOL_FC], [])
++dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+ 
+-# AC_LIBTOOL_DLOPEN_SELF
+-# ----------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
++# _LT_TAG_COMPILER
++# ----------------
++m4_defun([_LT_TAG_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ])
+-   ;;
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
+-  *)
+-    AC_CHECK_FUNC([shl_load],
+-	  [lt_cv_dlopen="shl_load"],
+-      [AC_CHECK_LIB([dld], [shl_load],
+-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+-	[AC_CHECK_FUNC([dlopen],
+-	      [lt_cv_dlopen="dlopen"],
+-	  [AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+-	    [AC_CHECK_LIB([svld], [dlopen],
+-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+-	      [AC_CHECK_LIB([dld], [dld_link],
+-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+-	      ])
+-	    ])
+-	  ])
+-	])
+-      ])
+-    ;;
+-  esac
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_TAG_COMPILER
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++m4_defun([_LT_COMPILER_BOILERPLATE],
++[m4_require([_LT_DECL_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$RM conftest*
++])# _LT_COMPILER_BOILERPLATE
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++m4_defun([_LT_LINKER_BOILERPLATE],
++[m4_require([_LT_DECL_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$RM -r conftest*
++])# _LT_LINKER_BOILERPLATE
+ 
+-    AC_CACHE_CHECK([whether a program can dlopen itself],
+-	  lt_cv_dlopen_self, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++# _LT_REQUIRED_DARWIN_CHECKS
++# -------------------------
++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
++  case $host_os in
++    rhapsody* | darwin*)
++    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++    AC_CHECK_TOOL([LIPO], [lipo], [:])
++    AC_CHECK_TOOL([OTOOL], [otool], [:])
++    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
++    _LT_DECL([], [DSYMUTIL], [1],
++      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
++    _LT_DECL([], [NMEDIT], [1],
++      [Tool to change global to local symbols on Mac OS X])
++    _LT_DECL([], [LIPO], [1],
++      [Tool to manipulate fat objects and archives on Mac OS X])
++    _LT_DECL([], [OTOOL], [1],
++      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
++    _LT_DECL([], [OTOOL64], [1],
++      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
++
++    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++      [lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++	# By default we will add the -single_module flag. You can override
++	# by either setting the environment variable LT_MULTI_MODULE
++	# non-empty at configure time, or by adding -multi_module to the
++	# link flags.
++	rm -rf libconftest.dylib*
++	echo "int foo(void){return 1;}" > conftest.c
++	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
++	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
++        _lt_result=$?
++	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++	  lt_cv_apple_cc_single_mod=yes
++	else
++	  cat conftest.err >&AS_MESSAGE_LOG_FD
++	fi
++	rm -rf libconftest.dylib*
++	rm -f conftest.*
++      fi])
++    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++      [lt_cv_ld_exported_symbols_list],
++      [lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++	[lt_cv_ld_exported_symbols_list=yes],
++	[lt_cv_ld_exported_symbols_list=no])
++	LDFLAGS="$save_LDFLAGS"
+     ])
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+-    	  lt_cv_dlopen_self_static, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+-      ])
++    case $host_os in
++    rhapsody* | darwin1.[[012]])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*) # darwin 5.x on 
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it? 
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++	10.[[012]]*)
++	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++	10.*)
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    fi
++    if test "$DSYMUTIL" != ":"; then
++      _lt_dsymutil='~$DSYMUTIL $lib || :'
++    else
++      _lt_dsymutil=
+     fi
+-
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+     ;;
+   esac
++])
+ 
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_DLOPEN_SELF
++# _LT_DARWIN_LINKER_FEATURES
++# --------------------------
++# Checks for linker and compiler features on darwin
++m4_defun([_LT_DARWIN_LINKER_FEATURES],
++[
++  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
++  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++  _LT_TAGVAR(hardcode_direct, $1)=no
++  _LT_TAGVAR(hardcode_automatic, $1)=yes
++  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++  _LT_TAGVAR(link_all_deplibs, $1)=yes
++  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++  if test "$GCC" = "yes"; then
++    output_verbose_link_cmd=echo
++    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    m4_if([$1], [CXX],
++[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++    fi
++],[])
++  else
++  _LT_TAGVAR(ld_shlibs, $1)=no
++  fi
++])
+ 
++# _LT_SYS_MODULE_PATH_AIX
++# -----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++m4_defun([_LT_SYS_MODULE_PATH_AIX],
++[m4_require([_LT_DECL_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_SYS_MODULE_PATH_AIX
+ 
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+-# ---------------------------------
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+-   then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-     fi
+-   fi
+-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+-   $rm conftest*
+-   # SGI C++ compiler will create directory out/ii_files/ for
+-   # template instantiation
+-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+-   $rm out/* && rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
+-])
+-])# AC_LIBTOOL_PROG_CC_C_O
++# _LT_SHELL_INIT(ARG)
++# -------------------
++m4_define([_LT_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_SHELL_INIT
+ 
+ 
+-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+-# -----------------------------------------
+-# Check to see if we can do hard links to lock some files if needed
+-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+-[AC_REQUIRE([_LT_AC_LOCK])dnl
++# _LT_PROG_ECHO_BACKSLASH
++# -----------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++m4_defun([_LT_PROG_ECHO_BACKSLASH],
++[_LT_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-hard_links="nottested"
+-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  AC_MSG_CHECKING([if we can lock with hard links])
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  AC_MSG_RESULT([$hard_links])
+-  if test "$hard_links" = no; then
+-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+-    need_locks=warn
+-  fi
++case X$lt_ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++ECHO=${lt_ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $ECHO works!
++  :
+ else
+-  need_locks=no
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ fi
+-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+-
+-# AC_LIBTOOL_OBJDIR
+-# -----------------
+-AC_DEFUN([AC_LIBTOOL_OBJDIR],
+-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+-[rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  lt_cv_objdir=.libs
+-else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  lt_cv_objdir=_libs
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<_LT_EOF
++[$]*
++_LT_EOF
++  exit 0
+ fi
+-rmdir .libs 2>/dev/null])
+-objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_OBJDIR
+ 
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+-# ----------------------------------------------
+-# Check hardcoding attributes.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+-[AC_MSG_CHECKING([how to hardcode library paths into programs])
+-_LT_AC_TAGVAR(hardcode_action, $1)=
+-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+-
+-  # We can hardcode non-existant directories.
+-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++if test -z "$lt_ECHO"; then
++  if test "X${echo_test_string+set}" != Xset; then
++    # find a string as large as possible, as long as the shell can cope with it
++    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++      then
++        break
++      fi
++    done
+   fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+-fi
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++     test "X$echo_testing_string" = "X$echo_test_string"; then
++    :
++  else
++    # The Solaris, AIX, and Digital Unix default echo programs unquote
++    # backslashes.  This makes it impossible to quote backslashes using
++    #   echo "$something" | sed 's/\\/\\\\/g'
++    #
++    # So, first we look for a working echo in the user's PATH.
+ 
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for dir in $PATH /usr/ucb; do
++      IFS="$lt_save_ifs"
++      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        ECHO="$dir/echo"
++        break
++      fi
++    done
++    IFS="$lt_save_ifs"
+ 
+-# AC_LIBTOOL_SYS_LIB_STRIP
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+-[striplib=
+-old_striplib=
+-AC_MSG_CHECKING([whether stripping libraries is possible])
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  AC_MSG_RESULT([yes])
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         AC_MSG_RESULT([yes])
+-       else
+-  AC_MSG_RESULT([no])
+-fi
+-       ;;
+-   *)
+-  AC_MSG_RESULT([no])
+-    ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_SYS_LIB_STRIP
++    if test "X$ECHO" = Xecho; then
++      # We didn't find a better echo, so look for alternatives.
++      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        # This shell has a builtin print -r that does the trick.
++        ECHO='print -r'
++      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
++	   test "X$CONFIG_SHELL" != X/bin/ksh; then
++        # If we have ksh, try running configure again with it.
++        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++        export ORIGINAL_CONFIG_SHELL
++        CONFIG_SHELL=/bin/ksh
++        export CONFIG_SHELL
++        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++      else
++        # Try using printf.
++        ECHO='printf %s\n'
++        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	  # Cool, printf works
++	  :
++        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	  export CONFIG_SHELL
++	  SHELL="$CONFIG_SHELL"
++	  export SHELL
++	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++        else
++	  # maybe with a smaller string...
++	  prev=:
+ 
++	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
++	    then
++	      break
++	    fi
++	    prev="$cmd"
++	  done
+ 
+-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-# -----------------------------
+-# PORTME Fill in your ld.so characteristics
+-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext_cmds=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++	  if test "$prev" != 'sed 50q "[$]0"'; then
++	    echo_test_string=`eval $prev`
++	    export echo_test_string
++	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	  else
++	    # Oops.  We lost completely, so just stick with echo.
++	    ECHO=echo
++	  fi
++        fi
++      fi
++    fi
+   fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+ 
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++lt_ECHO=$ECHO
++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
++AC_SUBST(lt_ECHO)
++])
++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
++_LT_DECL([], [ECHO], [1],
++    [An echo program that does not interpret backslashes])
++])# _LT_PROG_ECHO_BACKSLASH
+ 
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[[01]] | aix4.[[01]].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
+-      else
+-	can_build_shared=no
+-      fi
+-      ;;
++# _LT_ENABLE_LOCK
++# ---------------
++m4_defun([_LT_ENABLE_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++  [AS_HELP_STRING([--disable-libtool-lock],
++    [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++      *ELF-32*)
++	HPUX_IA64_MODE="32"
++	;;
++      *ELF-64*)
++	HPUX_IA64_MODE="64"
++	;;
+     esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    if test "$lt_cv_prog_gnu_ld" = yes; then
++      case `/usr/bin/file conftest.$ac_objext` in
++	*32-bit*)
++	  LD="${LD-ld} -melf32bsmip"
++	  ;;
++	*N32*)
++	  LD="${LD-ld} -melf32bmipn32"
++	  ;;
++	*64-bit*)
++	  LD="${LD-ld} -melf64bmip"
++	;;
++      esac
+     else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
++      case `/usr/bin/file conftest.$ac_objext` in
++	*32-bit*)
++	  LD="${LD-ld} -32"
++	  ;;
++	*N32*)
++	  LD="${LD-ld} -n32"
++	  ;;
++	*64-bit*)
++	  LD="${LD-ld} -64"
++	  ;;
++      esac
+     fi
+-    shlibpath_var=LIBPATH
+   fi
++  rm -rf conftest*
+   ;;
+ 
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++      *32-bit*)
++	case $host in
++	  x86_64-*kfreebsd*-gnu)
++	    LD="${LD-ld} -m elf_i386_fbsd"
++	    ;;
++	  x86_64-*linux*)
++	    LD="${LD-ld} -m elf_i386"
++	    ;;
++	  ppc64-*linux*|powerpc64-*linux*)
++	    LD="${LD-ld} -m elf32ppclinux"
++	    ;;
++	  s390x-*linux*)
++	    LD="${LD-ld} -m elf_s390"
++	    ;;
++	  sparc64-*linux*)
++	    LD="${LD-ld} -m elf32_sparc"
++	    ;;
++	esac
++	;;
++      *64-bit*)
++	case $host in
++	  x86_64-*kfreebsd*-gnu)
++	    LD="${LD-ld} -m elf_x86_64_fbsd"
++	    ;;
++	  x86_64-*linux*)
++	    LD="${LD-ld} -m elf_x86_64"
++	    ;;
++	  ppc*-*linux*|powerpc*-*linux*)
++	    LD="${LD-ld} -m elf64ppc"
++	    ;;
++	  s390*-*linux*|s390*-*tpf*)
++	    LD="${LD-ld} -m elf64_s390"
++	    ;;
++	  sparc*-*linux*)
++	    LD="${LD-ld} -m elf64_sparc"
++	    ;;
++	esac
++	;;
++    esac
++  fi
++  rm -rf conftest*
+   ;;
+ 
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
+   ;;
+-
+-bsdi[[45]]*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)
++	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
+   ;;
++esac
+ 
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext_cmds=".dll"
+-  need_version=no
+-  need_lib_prefix=no
++need_locks="$enable_libtool_lock"
++])# _LT_ENABLE_LOCK
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
+ 
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
+-      ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      ;;
+-    esac
+-    ;;
++# _LT_CMD_OLD_ARCHIVE
++# -------------------
++m4_defun([_LT_CMD_OLD_ARCHIVE],
++[AC_CHECK_TOOL(AR, ar, false)
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1])
++
++AC_CHECK_TOOL(STRIP, strip, :)
++test -z "$STRIP" && STRIP=:
++_LT_DECL([], [STRIP], [1], [A symbol stripping program])
++
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++test -z "$RANLIB" && RANLIB=:
++_LT_DECL([], [RANLIB], [1],
++    [Commands used to install an old-style archive])
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
+   *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++_LT_DECL([], [old_postinstall_cmds], [2])
++_LT_DECL([], [old_postuninstall_cmds], [2])
++_LT_TAGDECL([], [old_archive_cmds], [2],
++    [Commands used to build an old-style archive])
++])# _LT_CMD_OLD_ARCHIVE
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
+ 
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([_LT_COMPILER_OPTION],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       $2=yes
++     fi
++   fi
++   $RM conftest*
++])
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
++if test x"[$]$2" = xyes; then
++    m4_if([$5], , :, [$5])
++else
++    m4_if([$6], , :, [$6])
++fi
++])# _LT_COMPILER_OPTION
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
++# Old name:
++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+ 
+-freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
+-  if test -x /usr/bin/objformat; then
+-    objformat=`/usr/bin/objformat`
+-  else
+-    case $host_os in
+-    freebsd[[123]]*) objformat=aout ;;
+-    *) objformat=elf ;;
+-    esac
+-  fi
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
+-      ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
++
++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                  [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------
++# Check whether the given linker option works
++AC_DEFUN([_LT_LINKER_OPTION],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
++     else
++       $2=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    m4_if([$4], , :, [$4])
++else
++    m4_if([$5], , :, [$5])
++fi
++])# _LT_LINKER_OPTION
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
++
++
++# LT_CMD_MAX_LEN
++#---------------
++AC_DEFUN([LT_CMD_MAX_LEN],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+     ;;
+-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
+     ;;
+-  freebsd*) # from 4.6 on
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
+     ;;
+-  esac
+-  ;;
+ 
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  case $host_cpu in
+-  ia64*)
+-    shrext_cmds='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+     else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+     fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
+-   hppa*64*)
+-     shrext_cmds='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
+-    shrext_cmds='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+     ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
+ 
+-interix3*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  ;;
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
+     ;;
+   *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      # Make teststring a little bigger before we do anything with it.
++      # a 1K string should be a reasonable start.
++      for i in 1 2 3 4 5 6 7 8 ; do
++        teststring=$teststring$teststring
++      done
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      # If test is not a shell built-in, we'll probably end up computing a
++      # maximum length that is only half of the actual maximum length, but
++      # we can't tell.
++      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
++	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      # Only check the string length outside the loop.
++      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on
++      # massive amounts of additional arguments before passing them to the
++      # linker.  It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++max_cmd_len=$lt_cv_sys_max_cmd_len
++_LT_DECL([], [max_cmd_len], [0],
++    [What is the maximum length of a command?])
++])# LT_CMD_MAX_LEN
+ 
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
++# Old name:
++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+ 
+-# This must be Linux ELF.
+-linux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
+ 
+-  # Append ld.so.conf contents to the search path
+-  if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+-  fi
++# _LT_HEADER_DLFCN
++# ----------------
++m4_defun([_LT_HEADER_DLFCN],
++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
++])# _LT_HEADER_DLFCN
+ 
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
+ 
+-knetbsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ----------------------------------------------------------------
++m4_defun([_LT_TRY_DLOPEN_SELF],
++[m4_require([_LT_HEADER_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<_LT_EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
+ 
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++#include <stdio.h>
+ 
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
+-openbsd*)
+-  version_type=sunos
+-  sys_lib_dlsearch_path_spec="/usr/lib"
+-  need_lib_prefix=no
+-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+-  case $host_os in
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
+-  esac
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[[89]] | openbsd2.[[89]].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
+   else
+-    shlibpath_overrides_runpath=yes
++    puts (dlerror ());
++
++    exit (status);
++}]
++_LT_EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_dlunknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
+   fi
+-  ;;
++fi
++rm -fr conftest*
++])# _LT_TRY_DLOPEN_SELF
+ 
+-os2*)
+-  libname_spec='$name'
+-  shrext_cmds=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+ 
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
++# LT_SYS_DLOPEN_SELF
++# ------------------
++AC_DEFUN([LT_SYS_DLOPEN_SELF],
++[m4_require([_LT_HEADER_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
+ 
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
+ 
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++    ;;
+ 
+-sysv4 | sysv4.3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++    ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++    ;;
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  version_type=freebsd-elf
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
++  *)
++    AC_CHECK_FUNC([shl_load],
++	  [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
+   else
+-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+-    case $host_os in
+-      sco3.2v5*)
+-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+-	;;
+-    esac
++    enable_dlopen=no
+   fi
+-  sys_lib_dlsearch_path_spec='/usr/lib'
+-  ;;
+-
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-AC_MSG_RESULT([$dynamic_linker])
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-
+ 
+-# _LT_AC_TAGCONFIG
+-# ----------------
+-AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
+-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+-        [include additional configurations @<:@automatic@:>@])],
+-    [tagnames="$withval"])
+-
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
+-    AC_MSG_WARN([output file `$ofile' does not exist])
+-  fi
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
+-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+-    else
+-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+-    fi
+-  fi
+-  if test -z "$LTCFLAGS"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+-  fi
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+-    "") ;;
+-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+-	;;
+-    esac
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
+ 
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
+-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++	  lt_cv_dlopen_self_static, [dnl
++	  _LT_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
+     fi
+ 
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
+-
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-	    (test "X$CXX" != "Xg++"))) ; then
+-	  AC_LIBTOOL_LANG_CXX_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+-	  AC_LIBTOOL_LANG_F77_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      RC)
+-	AC_LIBTOOL_LANG_RC_CONFIG
+-	;;
+-
+-      *)
+-	AC_MSG_ERROR([Unsupported tag name: $tagname])
+-	;;
+-      esac
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
+ 
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
+ 
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
+-  else
+-    rm -f "${ofile}T"
+-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+-  fi
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
+ fi
+-])# _LT_AC_TAGCONFIG
++_LT_DECL([dlopen_support], [enable_dlopen], [0],
++	 [Whether dlopen is supported])
++_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
++	 [Whether dlopen of programs is supported])
++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
++	 [Whether dlopen of statically linked programs is supported])
++])# LT_SYS_DLOPEN_SELF
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+ 
+ 
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
++# _LT_COMPILER_C_O([TAGNAME])
++# ---------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler.
++# This macro does not hard code the compiler like AC_PROG_CC_C_O.
++m4_defun([_LT_COMPILER_C_O],
++[m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_TAG_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
++])
++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
++	[Does compiler simultaneously support -c and -o options?])
++])# _LT_COMPILER_C_O
+ 
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
+ 
++# _LT_COMPILER_FILE_LOCKS([TAGNAME])
++# ----------------------------------
++# Check to see if we can do hard links to lock some files if needed
++m4_defun([_LT_COMPILER_FILE_LOCKS],
++[m4_require([_LT_ENABLE_LOCK])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++_LT_COMPILER_C_O([$1])
+ 
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
+-
+-
+-# AC_DISABLE_SHARED
+-# -----------------
+-# set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
+-
+-
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
+-
+-
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
+-
+-
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_fast_install=yes ;;
+-    no) enable_fast_install=no ;;
+-    *)
+-      enable_fast_install=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_fast_install=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
+-
+-
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
+-
+-
+-# AC_LIBTOOL_PICMODE([MODE])
+-# --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
+-
+-
+-# AC_PROG_EGREP
+-# -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
+-
+-
+-# AC_PATH_TOOL_PREFIX
+-# -------------------
+-# find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-[[\\/*] |  ?:[\\/]*])
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+-  ;;
+-*)
+-  lt_save_MAGIC_CMD="$MAGIC_CMD"
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    $EGREP "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++hard_links="nottested"
++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $RM conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
++])# _LT_COMPILER_FILE_LOCKS
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+-  ;;
+-esac])
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  AC_MSG_RESULT($MAGIC_CMD)
++# _LT_CHECK_OBJDIR
++# ----------------
++m4_defun([_LT_CHECK_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
+ else
+-  AC_MSG_RESULT(no)
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
+ fi
+-])# AC_PATH_TOOL_PREFIX
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++_LT_DECL([], [objdir], [0],
++         [The name of the directory that contains temporary libtool files])dnl
++m4_pattern_allow([LT_OBJDIR])dnl
++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
++  [Define to the sub-directory in which libtool stores uninstalled libraries.])
++])# _LT_CHECK_OBJDIR
+ 
+ 
+-# AC_PATH_MAGIC
+-# -------------
+-# find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
++# --------------------------------------
++# Check hardcoding attributes.
++m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
++   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
++   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++
++  # We can hardcode non-existent directories.
++  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
++    # Linking always hardcodes the temporary library directory.
++    _LT_TAGVAR(hardcode_action, $1)=relink
+   else
+-    MAGIC_CMD=:
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    _LT_TAGVAR(hardcode_action, $1)=immediate
+   fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  _LT_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
++
++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
++   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
+ fi
+-])# AC_PATH_MAGIC
++_LT_TAGDECL([], [hardcode_action], [0],
++    [How to hardcode a shared library path into an executable])
++])# _LT_LINKER_HARDCODE_LIBPATH
+ 
+ 
+-# AC_PROG_LD
+-# ----------
+-# find the pathname to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH([gnu-ld],
+-    [AC_HELP_STRING([--with-gnu-ld],
+-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+-    [test "$withval" = no || with_gnu_ld=yes],
+-    [with_gnu_ld=no])
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by $CC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [[\\/]]* | ?:[[\\/]]*)
+-      re_direlt='/[[^/]][[^/]]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
++# _LT_CMD_STRIPLIB
++# ----------------
++m4_defun([_LT_CMD_STRIPLIB],
++[m4_require([_LT_DECL_EGREP])
++striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++  darwin*)
++    if test -n "$STRIP" ; then
++      striplib="$STRIP -x"
++      old_striplib="$STRIP -S"
++      AC_MSG_RESULT([yes])
++    else
++      AC_MSG_RESULT([no])
++    fi
+     ;;
+   *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
++    AC_MSG_RESULT([no])
+     ;;
+   esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
+-else
+-  AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(lt_cv_path_LD,
+-[if test -z "$LD"; then
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some variants of GNU ld only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+-      *GNU* | *'with BFD'*)
+-	test "$with_gnu_ld" != no && break
+-	;;
+-      *)
+-	test "$with_gnu_ld" != yes && break
+-	;;
+-      esac
++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
++_LT_DECL([], [striplib], [1])
++])# _LT_CMD_STRIPLIB
++
++
++# _LT_SYS_DYNAMIC_LINKER([TAG])
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++m4_defun([_LT_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
++m4_if([$1],
++	[], [
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+     fi
+   done
+-  IFS="$lt_save_ifs"
++  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ else
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi])
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])# AC_PROG_LD
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-# AC_PROG_LD_GNU
+-# --------------
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+-  lt_cv_prog_gnu_ld=yes
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+-*)
+-  lt_cv_prog_gnu_ld=no
+-  ;;
+-esac])
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+-])# AC_PROG_LD_GNU
+-
+ 
+-# AC_PROG_LD_RELOAD_FLAG
+-# ----------------------
+-# find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+-[AC_CACHE_CHECK([for $LD option to reload object files],
+-  lt_cv_ld_reload_flag,
+-  [lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-case $host_os in
+-  darwin*)
+-    if test "$GCC" = yes; then
+-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++aix[[4-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     else
+-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
+     fi
+-    ;;
+-esac
+-])# AC_PROG_LD_RELOAD_FLAG
+-
+-
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
+-# how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++    shlibpath_var=LIBPATH
++  fi
++  ;;
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
++amigaos*)
++  case $host_cpu in
++  powerpc)
++    # Since July 2007 AmigaOS4 officially supports .so libraries.
++    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    ;;
++  m68k)
++    library_names_spec='$libname.ixlibrary $libname.a'
++    # Create ${libname}_ixlibrary.a entries in /sys/libs.
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    ;;
++  esac
+   ;;
+ 
+ beos*)
+-  lt_cv_deplibs_check_method=pass_all
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+ bsdi[[45]]*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
+-
+-cygwin*)
+-  # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='func_win32_libid'
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
+   ;;
+ 
+-mingw* | pw32*)
+-  # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
+ 
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname~
++      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++      fi'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-hpux10.20* | hpux11*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  case $host_cpu in
+-  ia64*)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+-    ;;
+-  hppa*64*)
+-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
++
+   *)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+   esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
+   ;;
+ 
+-interix3*)
+-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $LD in
+-  *-32|*"-32 ") libmagic=32-bit;;
+-  *-n32|*"-n32 ") libmagic=N32;;
+-  *-64|*"-64 ") libmagic=64-bit;;
+-  *) libmagic=never-match;;
+-  esac
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+-  fi
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+-newos6*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
++freebsd1*)
++  dynamic_linker=no
+   ;;
+ 
+-openbsd*)
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
+   fi
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sysv4 | sysv4.3*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  sequent)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
+     ;;
+-  sni)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+-    lt_cv_file_magic_test_file=/lib/libc.so
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
+     ;;
+-  siemens)
+-    lt_cv_deplibs_check_method=pass_all
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
+     ;;
+-  pc)
+-    lt_cv_deplibs_check_method=pass_all
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
+     ;;
+   esac
+   ;;
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
+   ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-])# AC_DEPLIBS_CHECK_METHOD
+ 
+-
+-# AC_PROG_NM
+-# ----------
+-# find the pathname to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  lt_cv_path_NM="$NM"
+-else
+-  lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+-    lt_nm_to_check="$lt_nm_to_check nm"
+-  fi
+-  for lt_tmp_nm in $lt_nm_to_check; do
+-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+-      IFS="$lt_save_ifs"
+-      test -z "$ac_dir" && ac_dir=.
+-      tmp_nm="$ac_dir/$lt_tmp_nm"
+-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-	# Check to see if the nm accepts a BSD-compat flag.
+-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-	#   nm: unknown option "B" ignored
+-	# Tru64's nm complains that /dev/null is an invalid object file
+-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null* | *'Invalid file or object type'*)
+-	  lt_cv_path_NM="$tmp_nm -B"
+-	  break
+-	  ;;
+-	*)
+-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	  */dev/null*)
+-	    lt_cv_path_NM="$tmp_nm -p"
+-	    break
+-	    ;;
+-	  *)
+-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	    continue # so that we can try to find one that supports BSD flags
+-	    ;;
+-	  esac
+-	  ;;
+-	esac
+-      fi
+-    done
+-    IFS="$lt_save_ifs"
+-  done
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
+-
+-
+-# AC_CHECK_LIBM
+-# -------------
+-# check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+-  # These system don't have libm, or don't need it
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, cos, LIBM="-lm")
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++  hppa*64*)
++    shrext_cmds='.sl'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++  *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
+   ;;
+-esac
+-])# AC_CHECK_LIBM
+ 
++interix[[3-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+-# (note the single quotes!).  If your package is not flat and you're not
+-# using automake, define top_builddir and top_srcdir appropriately in
+-# the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
+   esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+-
+-
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# and an installed libltdl is not found, it is assumed to be `libltdl'.
+-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and top_srcdir
+-# appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, lt_dlinit,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
+-  fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # Some binutils ld are patched to set DT_RUNPATH
++  save_LDFLAGS=$LDFLAGS
++  save_libdir=$libdir
++  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
++       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
++  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
++       [shlibpath_overrides_runpath=yes])])
++  LDFLAGS=$save_LDFLAGS
++  libdir=$save_libdir
+ 
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+-# _LT_AC_PROG_CXXCPP
+-# ------------------
+-AC_DEFUN([_LT_AC_PROG_CXXCPP],
+-[
+-AC_REQUIRE([AC_PROG_CXX])
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
+-  AC_PROG_CXXCPP
+-fi
+-])# _LT_AC_PROG_CXXCPP
+-
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
+-
+-
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
+-
+-
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+-
+-
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+-
+-
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# Source file extension for C test sources.
+-ac_ext=c
++*nto* | *qnx*)
++  version_type=qnx
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='ldqnx.so'
++  ;;
+ 
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++openbsd*)
++  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
++    *)				need_version=no  ;;
++  esac
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[[89]] | openbsd2.[[89]].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-_LT_AC_SYS_COMPILER
++rdos*)
++  dynamic_linker=no
++  ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF
+-
+-# Report which library types will actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
++sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
+   fi
+   ;;
+ 
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
+   fi
+-    ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+-
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
+-
+-
+-# AC_LIBTOOL_LANG_CXX_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+-[AC_LANG_PUSH(C++)
+-AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-
+-# Dependencies to place before and after the object being linked:
+-_LT_AC_TAGVAR(predep_objects, $1)=
+-_LT_AC_TAGVAR(postdep_objects, $1)=
+-_LT_AC_TAGVAR(predeps, $1)=
+-_LT_AC_TAGVAR(postdeps, $1)=
+-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+-
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
+-
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++tpf*)
++  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
+-  $as_unset lt_cv_prog_gnu_ld
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+-if test -n "${lt_cv_path_LDCXX+set}"; then
+-  lt_cv_path_LD=$lt_cv_path_LDCXX
+-else
+-  $as_unset lt_cv_path_LD
++ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-else
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+ 
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
+-
+-  AC_PROG_LD
+-
+-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+-  # archiving commands below assume that GNU ld is being used.
+-  if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+-    #     investigate it a little bit more. (MM)
+-    wlarc='${wl}'
+-
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+-	grep 'no-whole-archive' > /dev/null; then
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    else
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-  else
+-    with_gnu_ld=no
+-    wlarc=
+-
+-    # A generic and very simple default shared library creation
+-    # command for GNU C++ for the case where it uses the native
+-    # linker, instead of GNU ld.  If possible, this setting should
+-    # overridden to take advantage of the native linker features on
+-    # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-  fi
+-
+-  # Commands to make compiler produce verbose output that lists
+-  # what "hidden" libraries, object files and flags are used when
+-  # linking a shared library.
+-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+-
+-else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
+-fi
++_LT_DECL([], [variables_saved_for_relink], [1],
++    [Variables whose values should be saved in libtool wrapper scripts and
++    restored at link time])
++_LT_DECL([], [need_lib_prefix], [0],
++    [Do we need the "lib" prefix for modules?])
++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
++_LT_DECL([], [version_type], [0], [Library versioning type])
++_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
++_LT_DECL([], [shlibpath_overrides_runpath], [0],
++    [Is shlibpath searched before the hard-coded library search path?])
++_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
++_LT_DECL([], [library_names_spec], [1],
++    [[List of archive names.  First name is the real one, the rest are links.
++    The last name is the one that the linker finds with -lNAME]])
++_LT_DECL([], [soname_spec], [1],
++    [[The coded name of the library, if different from the real name]])
++_LT_DECL([], [postinstall_cmds], [2],
++    [Command to use after installation of a shared archive])
++_LT_DECL([], [postuninstall_cmds], [2],
++    [Command to use after uninstallation of a shared archive])
++_LT_DECL([], [finish_cmds], [2],
++    [Commands used to finish a libtool library installation in a directory])
++_LT_DECL([], [finish_eval], [1],
++    [[As "finish_cmds", except a single script fragment to be evaled but
++    not shown]])
++_LT_DECL([], [hardcode_into_libs], [0],
++    [Whether we should hardcode library paths into libraries])
++_LT_DECL([], [sys_lib_search_path_spec], [2],
++    [Compile-time system search path for libraries])
++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
++    [Run-time system search path for libraries])
++])# _LT_SYS_DYNAMIC_LINKER
+ 
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
+-	    ;;
+-	  esac
+-	done
+-	;;
+-      esac
+-
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
++# _LT_PATH_TOOL_PREFIX(TOOL)
++# --------------------------
++# find a file program which can recognize shared library
++AC_DEFUN([_LT_PATH_TOOL_PREFIX],
++[m4_require([_LT_DECL_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="m4_if([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<_LT_EOF 1>&2
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+-
+-    _LT_AC_TAGVAR(archive_cmds, $1)=''
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
+ 
+-    if test "$GXX" = yes; then
+-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-      # We only want to do this on AIX 4.2 and lower, the check
+-      # below for broken collect2 doesn't work under 4.3+
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	else
+-	  # We have old collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	fi
+-	;;
+-      esac
+-      shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
+-	shared_flag="$shared_flag "'${wl}-G'
+-      fi
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-	# chokes on -Wl,-G. The following line is correct:
+-	shared_flag='-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
++_LT_EOF
++	  fi ;;
++	esac
+       fi
++      break
+     fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++_LT_DECL([], [MAGIC_CMD], [0],
++	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
++])# _LT_PATH_TOOL_PREFIX
+ 
+-    # It seems that -bexpall does not export symbols beginning with
+-    # underscore (_), so it is better to generate a list of symbols to export.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-      # Determine the default libpath from the value encoded in an empty executable.
+-      _LT_AC_SYS_LIBPATH_AIX
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++# Old name:
++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+ 
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-     else
+-      if test "$host_cpu" = ia64; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds its shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-      fi
+-    fi
+-    ;;
+ 
+-  beos*)
+-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-    ;;
++# _LT_PATH_MAGIC
++# --------------
++# find a file program which can recognize a shared library
++m4_defun([_LT_PATH_MAGIC],
++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# _LT_PATH_MAGIC
+ 
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-
+-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      # If the export-symbols file already is a .def file (1st line
+-      # is EXPORTS), use it as is; otherwise, prepend...
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname.def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname.def;
+-	cat $export_symbols >> $output_objdir/$soname.def;
+-      fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-  ;;
+-      darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
+-      output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
+-      fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      else
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
+-      fi
+-        ;;
++# LT_PATH_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([LT_PATH_LD],
++[AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_DECL_EGREP])dnl
+ 
+-  dgux*)
+-    case $cc_basename in
+-      ec++*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      ghcx*)
+-	# Green Hills C++ Compiler
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  freebsd[[12]]*)
+-    # C++ shared libraries reported to be fairly broken before switch to ELF
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  freebsd-elf*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  hpux9*)
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-				# but as the default
+-				# location of the library.
+-
+-    case $cc_basename in
+-    CC*)
+-      # FIXME: insert proper C++ library support
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    aCC*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      # Commands to make compiler produce verbose output that lists
+-      # what "hidden" libraries, object files and flags are used when
+-      # linking a shared library.
+-      #
+-      # There doesn't appear to be a way to prevent this compiler from
+-      # explicitly linking system object files so we need to strip them
+-      # from the output so that they don't get included in the library
+-      # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-      ;;
+-    *)
+-      if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-        # FIXME: insert proper C++ library support
+-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
+-    ;;
+-  hpux10*|hpux11*)
+-    if test $with_gnu_ld = no; then
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++AC_ARG_WITH([gnu-ld],
++    [AS_HELP_STRING([--with-gnu-ld],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])dnl
+ 
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-        ;;
+-      *)
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-        ;;
+-      esac
+-    fi
+-    case $host_cpu in
+-    hppa*64*|ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    *)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
++      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
+       ;;
+-    esac
+-
+-    case $cc_basename in
+-      CC*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      aCC*)
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	esac
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
+-	    case $host_cpu in
+-	    hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    ia64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    esac
+-	  fi
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  interix3*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-    # Instead, shared libraries are loaded at an image base (0x10000000 by
+-    # default) and relocated if they conflict, which is a slow very memory
+-    # consuming and fragmenting process.  To avoid this, we pick a random,
+-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    ;;
+-  irix5* | irix6*)
+-    case $cc_basename in
+-      CC*)
+-	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+-	  fi
+-	fi
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-	;;
+-    esac
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
+     ;;
+-  linux*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-	;;
+-      icpc*)
+-	# Intel C++
+-	with_gnu_ld=yes
+-	# version 8.0 and above of icpc choke on multiply defined symbols
+-	# if we add $predep_objects and $postdep_objects, however 7.1 and
+-	# earlier do not add the objects themselves.
+-	case `$CC -V 2>&1` in
+-	*"Version 7."*)
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	*)  # Version 8.0 or newer
+-	  tmp_idyn=
+-	  case $host_cpu in
+-	    ia64*) tmp_idyn=' -i_dynamic';;
+-	  esac
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	esac
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	;;
+-      pgCC*)
+-        # Portland Group C++ compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-        ;;
+-      cxx*)
+-	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+-
+-	runpath_var=LD_RUN_PATH
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ C*)
+-	  # Sun C++ 5.9
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-
+-	  # Not sure whether something based on
+-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+-	  # would be better.
+-	  output_verbose_link_cmd='echo'
+-
+-	  # Archives containing C++ object files must be created using
+-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	  # necessary to make sure instantiated templates are included
+-	  # in the archive.
+-	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	  ;;
+-	esac
+-	;;
+-    esac
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
+     ;;
+-  lynxos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  m88k*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  mvs*)
+-    case $cc_basename in
+-      cxx*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
+ 	;;
+       *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	test "$with_gnu_ld" != yes && break
+ 	;;
+-    esac
+-    ;;
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    fi
+-    # Workaround some broken pre-1.5 toolchains
+-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+-    ;;
+-  openbsd2*)
+-    # C++ shared libraries are fairly broken
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  openbsd*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      esac
+     fi
+-    output_verbose_link_cmd='echo'
+-    ;;
+-  osf3*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++_LT_PATH_LD_GNU
++AC_SUBST([LD])
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  osf4* | osf5*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+-	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+-	  $rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
++])# LT_PATH_LD
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  psos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  sunos4*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      lcc*)
+-	# Lucid
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
++# Old names:
++AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
++AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_PROG_LD], [])
++dnl AC_DEFUN([AC_PROG_LD], [])
++
++
++# _LT_PATH_LD_GNU
++#- --------------
++m4_defun([_LT_PATH_LD_GNU],
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# _LT_PATH_LD_GNU
++
++
++# _LT_CMD_RELOAD
++# --------------
++# find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++m4_defun([_LT_CMD_RELOAD],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
+     ;;
+-  solaris*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	case $host_os in
+-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+-	    ;;
+-	esac
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++esac
++_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
++_LT_DECL([], [reload_cmds], [2])dnl
++])# _LT_CMD_RELOAD
+ 
+-	output_verbose_link_cmd='echo'
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	;;
+-      gcx*)
+-	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++# _LT_CHECK_MAGIC_METHOD
++# ----------------------
++# how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++m4_defun([_LT_CHECK_MAGIC_METHOD],
++[m4_require([_LT_DECL_EGREP])
++AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+ 
+-	# The C++ compiler must be used to create the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	# GNU C++ compiler with Solaris linker
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++case $host_os in
++aix[[4-9]]*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  else
+-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  fi
++bsdi[[45]]*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+-	fi
+-	;;
+-    esac
+-    ;;
+-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    runpath_var='LD_RUN_PATH'
+-
+-    case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
+-    ;;
+-  sysv5* | sco3.2v5* | sco5v6*)
+-    # Note: We can NOT use -z defs as we might desire, because we do not
+-    # link with -lc, and that would cause any symbols used from libc to
+-    # always be unresolved, which means just about no library would
+-    # ever link correctly.  If we're not using GNU ld we use -z text
+-    # though, which does catch some bad symbols but isn't as heavy-handed
+-    # as -z defs.
+-    # For security reasons, it is highly recommended that you always
+-    # use absolute paths for naming shared libraries, and exclude the
+-    # DT_RUNPATH tag from executables and libraries.  But doing so
+-    # requires that you compile everything twice, which is a pain.
+-    # So that behaviour is only enabled if SCOABSPATH is set to a
+-    # non-empty value in the environment.  Most likely only useful for
+-    # creating official distributions of packages.
+-    # This is a hack until libtool officially supports absolute path
+-    # names for shared libraries.
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-    runpath_var='LD_RUN_PATH'
+-
+-    case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
+-    ;;
+-  tandem*)
+-    case $cc_basename in
+-      NCC*)
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
+     esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case $host_cpu in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+     ;;
+-  vxworks*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
+   *)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+-esac
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++  esac
++  ;;
+ 
+-_LT_AC_TAGVAR(GCC, $1)="$GXX"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
++interix[[3-9]]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+-AC_LIBTOOL_POSTDEP_PREDEP($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-AC_LANG_POP
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-with_gnu_ld=$lt_save_with_gnu_ld
+-lt_cv_path_LDCXX=$lt_cv_path_LD
+-lt_cv_path_LD=$lt_save_path_LD
+-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-])# AC_LIBTOOL_LANG_CXX_CONFIG
++netbsd*)
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++  fi
++  ;;
+ 
+-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------------------
+-# Figure out "hidden" library dependencies from verbose
+-# compiler output when linking a shared library.
+-# Parse the compiler output and extract the necessary
+-# objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+-dnl we can't use the lt_simple_compile_test_code here,
+-dnl because it contains code intended for an executable,
+-dnl not a library.  It's possible we should let each
+-dnl tag define a new lt_????_link_test_code variable,
+-dnl but it's only used here...
+-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+-int a;
+-void foo (void) { a = 0; }
+-EOF
+-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
+-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+-      subroutine foo
+-      implicit none
+-      integer*4 a
+-      a=0
+-      return
+-      end
+-EOF
+-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+-public class foo {
+-  private int a;
+-  public void bar (void) {
+-    a = 0;
+-  }
+-};
+-EOF
+-])
+-dnl Parse the compiler output and extract the necessary
+-dnl objects, libraries and library flags.
+-if AC_TRY_EVAL(ac_compile); then
+-  # Parse the compiler output and extract the necessary
+-  # objects, libraries and library flags.
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
+ 
+-  # Sentinel used to keep track of whether or not we are before
+-  # the conftest object file.
+-  pre_test_object_deps_done=no
++*nto* | *qnx*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
+-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  fi
++  ;;
+ 
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $p in
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-    -L* | -R* | -l*)
+-       # Some compilers place space between "-{L,R}" and the path.
+-       # Remove the space.
+-       if test $p = "-L" \
+-	  || test $p = "-R"; then
+-	 prev=$p
+-	 continue
+-       else
+-	 prev=
+-       fi
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.3*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++tpf*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++_LT_DECL([], [deplibs_check_method], [1],
++    [Method to check whether dependent libraries are shared objects])
++_LT_DECL([], [file_magic_cmd], [1],
++    [Command to use when deplibs_check_method == "file_magic"])
++])# _LT_CHECK_MAGIC_METHOD
++
++
++# LT_PATH_NM
++# ----------
++# find the pathname to a BSD- or MS-compatible name lister
++AC_DEFUN([LT_PATH_NM],
++[AC_REQUIRE([AC_PROG_CC])dnl
++AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
++	  break
++	  ;;
++	*)
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
++	  ;;
++	esac
++      fi
++    done
++    IFS="$lt_save_ifs"
++  done
++  : ${lt_cv_path_NM=no}
++fi])
++if test "$lt_cv_path_NM" != "no"; then
++  NM="$lt_cv_path_NM"
++else
++  # Didn't find any BSD compatible name lister, look for dumpbin.
++  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
++  AC_SUBST([DUMPBIN])
++  if test "$DUMPBIN" != ":"; then
++    NM="$DUMPBIN"
++  fi
++fi
++test -z "$NM" && NM=nm
++AC_SUBST([NM])
++_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
++
++AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
++  [lt_cv_nm_interface="BSD nm"
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
++  (eval "$ac_compile" 2>conftest.err)
++  cat conftest.err >&AS_MESSAGE_LOG_FD
++  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
++  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
++  cat conftest.err >&AS_MESSAGE_LOG_FD
++  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
++  cat conftest.out >&AS_MESSAGE_LOG_FD
++  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
++    lt_cv_nm_interface="MS dumpbin"
++  fi
++  rm -f conftest*])
++])# LT_PATH_NM
++
++# Old names:
++AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
++AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_PROG_NM], [])
++dnl AC_DEFUN([AC_PROG_NM], [])
++
++
++# LT_LIB_M
++# --------
++# check for math library
++AC_DEFUN([LT_LIB_M],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
++  ;;
++esac
++AC_SUBST([LIBM])
++])# LT_LIB_M
++
++# Old name:
++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_CHECK_LIBM], [])
++
++
++# _LT_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------
++m4_defun([_LT_COMPILER_NO_RTTI],
++[m4_require([_LT_TAG_COMPILER])dnl
++
++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++
++if test "$GCC" = yes; then
++  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++
++  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
++	[Compiler flag to turn off builtin functions])
++])# _LT_COMPILER_NO_RTTI
++
++
++# _LT_CMD_GLOBAL_SYMBOLS
++# ----------------------
++m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++AC_REQUIRE([LT_PATH_LD])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_TAG_COMPILER])dnl
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
++
++# Transform an extracted symbol line into a proper C declaration.
++# Some systems (esp. on ia64) link data and code symbols differently,
++# so use this general approach.
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# Try without a prefix underscore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
++  # Write the raw and C identifiers.
++  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++    # Fake it for dumpbin and say T for any non-static function
++    # and D for any global variable.
++    # Also find C++ and __fastcall symbols from MSVC++,
++    # which start with @ or ?.
++    lt_cv_sys_global_symbol_pipe="$AWK ['"\
++"     {last_section=section; section=\$ 3};"\
++"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++"     \$ 0!~/External *\|/{next};"\
++"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
++"     {if(hide[section]) next};"\
++"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
++"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++"     ' prfx=^$ac_symprfx]"
++  else
++    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++  fi
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<_LT_EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(void);
++void nm_test_func(void){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++_LT_EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
++	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<_LT_EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++_LT_EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
++
++	  cat <<_LT_EOF >> conftest.$ac_ext
++
++/* The mapping between symbol names and symbols.  */
++const struct {
++  const char *name;
++  void       *address;
++}
++lt__PROGRAM__LTX_preloaded_symbols[[]] =
++{
++  { "@PROGRAM@", (void *) 0 },
++_LT_EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++	  cat <<\_LT_EOF >> conftest.$ac_ext
++  {0, (void *) 0}
++};
++
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt__PROGRAM__LTX_preloaded_symbols;
++}
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++_LT_EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++    fi
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -rf conftest* conftst*
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p in
+-	 -L* | -R*)
+-	   # Internal compiler library paths should come after those
+-	   # provided the user.  The postdeps already come after the
+-	   # user supplied libs so there is no need to process them.
+-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+-	   else
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+-	   fi
+-	   ;;
+-	 # The "-l" case would never come before the object being
+-	 # linked, so don't bother handling this case.
+-	 esac
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+-	 else
+-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+-	 fi
+-       fi
+-       ;;
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
+ 
+-    *.$objext)
+-       # This assumes that the test object file only shows up
+-       # once in the compiler output.
+-       if test "$p" = "conftest.$objext"; then
+-	 pre_test_object_deps_done=yes
+-	 continue
+-       fi
++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
++    [Take the output of nm and produce a listing of raw symbols and C names])
++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
++    [Transform the output of nm in a proper C declaration])
++_LT_DECL([global_symbol_to_c_name_address],
++    [lt_cv_sys_global_symbol_to_c_name_address], [1],
++    [Transform the output of nm in a C name address pair])
++_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
++    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
++    [Transform the output of nm in a C name address pair when lib prefix is needed])
++]) # _LT_CMD_GLOBAL_SYMBOLS
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+-	 fi
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+-	 fi
+-       fi
+-       ;;
+ 
+-    *) ;; # Ignore the rest.
++# _LT_COMPILER_PIC([TAGNAME])
++# ---------------------------
++m4_defun([_LT_COMPILER_PIC],
++[m4_require([_LT_TAG_COMPILER])dnl
++_LT_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_TAGVAR(lt_prog_compiler_static, $1)=
++
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++m4_if([$1], [CXX], [
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++        ;;
++      esac
++      ;;
++
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | cygwin* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++      ;;
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++    *qnx* | *nto*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++      ;;
++    *)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix[[4-9]]*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	else
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68*)
++	  # Green Hills C++ Compiler
++	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++      dgux*)
++	case $cc_basename in
++	  ec++*)
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  ghcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | dragonfly*)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    if test "$host_cpu" != ia64; then
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    fi
++	    ;;
++	  aCC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    case $host_cpu in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux* | k*bsd*-gnu)
++	case $cc_basename in
++	  KCC*)
++	    # KAI C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  icpc* | ecpc* )
++	    # Intel C++
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  pgCC* | pgcpp*)
++	    # Portland Group C++ compiler
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  xlc* | xlC*)
++	    # IBM XL 8.0 on PPC
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
++	    ;;
++	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	      ;;
++	    esac
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd*)
++	;;
++      *qnx* | *nto*)
++        # QNX uses GNU C++, but need to define -shared option too, otherwise
++        # it will coredump.
++        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++        ;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    ;;
++	  RCC*)
++	    # Rational C++ 2.4.1
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  cxx*)
++	    # Digital/Compaq C++
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	    ;;
++	  gcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.x
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  lcc*)
++	    # Lucid
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      vxworks*)
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
+     esac
+-  done
+-
+-  # Clean up.
+-  rm -f a.out a.exe
+-else
+-  echo "libtool.m4: error: problem compiling $1 test program"
+-fi
+-
+-$rm -f confest.$objext
+-
+-# PORTME: override above test on systems where it is broken
+-ifelse([$1],[CXX],
+-[case $host_os in
+-interix3*)
+-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+-  # hack all around it, let's just trust "g++" to DTRT.
+-  _LT_AC_TAGVAR(predep_objects,$1)=
+-  _LT_AC_TAGVAR(postdep_objects,$1)=
+-  _LT_AC_TAGVAR(postdeps,$1)=
+-  ;;
+-
+-linux*)
+-  case `$CC -V 2>&1 | sed 5q` in
+-  *Sun\ C*)
+-    # Sun C++ 5.9
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+-    ;;
+-  esac
+-  ;;
+-
+-solaris*)
+-  case $cc_basename in
+-  CC*)
+-    # Adding this requires a known-good setup of shared libraries for
+-    # Sun compiler versions before 5.6, else PIC objects from an old
+-    # archive will be linked into the output, leading to subtle bugs.
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
+-
+-case " $_LT_AC_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+-])# AC_LIBTOOL_POSTDEP_PREDEP
+-
+-# AC_LIBTOOL_LANG_F77_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+-[AC_REQUIRE([AC_PROG_F77])
+-AC_LANG_PUSH(Fortran 77)
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-
+-# Source file extension for f77 test sources.
+-ac_ext=f
+-
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+-
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+-
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+-
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+-
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+   fi
+-  ;;
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-  ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+-
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+-
+-_LT_AC_TAGVAR(GCC, $1)="$G77"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+-
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_F77_CONFIG
+-
+-
+-# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+-[AC_LANG_SAVE
+-
+-# Source file extension for Java test sources.
+-ac_ext=java
++],
++[
++  if test "$GCC" = yes; then
++    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++        ;;
++      esac
++      ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
+ 
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+ 
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++      ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_GCJ_CONFIG
++    *)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
+ 
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
+ 
+-# AC_LIBTOOL_LANG_RC_CONFIG
+-# -------------------------
+-# Ensure that the configuration vars for the Windows resource compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+-[AC_LANG_SAVE
++    hpux9* | hpux10* | hpux11*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
+ 
+-# Source file extension for RC test sources.
+-ac_ext=rc
++    irix5* | irix6* | nonstopux*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++      icc* | ecc* | ifort*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
++      ccc*)
++        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      xl*)
++	# IBM XL C 8.0/Fortran 10.1 on PPC
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++    newsos6)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++      ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++    osf3* | osf4* | osf5*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++    rdos*)
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++    solaris*)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
++      ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++    sunos4*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_RC_CONFIG
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-# AC_LIBTOOL_CONFIG([TAGNAME])
+-# ----------------------------
+-# If TAGNAME is not passed, then create an initial libtool script
+-# with a default configuration from the untagged config vars.  Otherwise
+-# add code to config.status for appending the configuration named by
+-# TAGNAME from the matching tagged config vars.
+-AC_DEFUN([AC_LIBTOOL_CONFIG],
+-[# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+-    SED SHELL STRIP \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    _LT_AC_TAGVAR(compiler, $1) \
+-    _LT_AC_TAGVAR(CC, $1) \
+-    _LT_AC_TAGVAR(LD, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+-    _LT_AC_TAGVAR(predep_objects, $1) \
+-    _LT_AC_TAGVAR(postdep_objects, $1) \
+-    _LT_AC_TAGVAR(predeps, $1) \
+-    _LT_AC_TAGVAR(postdeps, $1) \
+-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+-    _LT_AC_TAGVAR(archive_cmds, $1) \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+-    _LT_AC_TAGVAR(module_cmds, $1) \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+-    _LT_AC_TAGVAR(include_expsyms, $1); do
+-
+-    case $var in
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++    unicos*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
++    uts4*)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
++
+     *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+     esac
+-  done
+-
+-  case $lt_echo in
+-  *'\[$]0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++  fi
++])
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     ;;
+-  esac
+-
+-ifelse([$1], [],
+-  [cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
+-  AC_MSG_NOTICE([creating $ofile])],
+-  [cfgfile="$ofile"])
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-ifelse([$1], [],
+-[#! $SHELL
++  *)
++    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++	[How to pass a linker flag through the compiler])
+ 
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
++# Check to make sure the PIC flag actually works.
+ #
+-# This program is distributed in the hope that 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.
++if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
++    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
++    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
++	[Additional compiler flags for building library objects])
++
+ #
+-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# Check to make sure the static flag actually works.
+ #
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# A sed program that does not truncate output.
+-SED=$lt_SED
+-
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e 1s/^X//"
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-# The names of the tagged configurations supported by this script.
+-available_tags=
+-
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
++wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
++_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
++_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
++	[Compiler flag to prevent dynamic linking])
++])# _LT_COMPILER_PIC
+ 
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++# _LT_LINKER_SHLIBS([TAGNAME])
++# ----------------------------
++# See if the linker supports building shared libraries.
++m4_defun([_LT_LINKER_SHLIBS],
++[AC_REQUIRE([LT_PATH_LD])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++m4_require([_LT_TAG_COMPILER])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++m4_if([$1], [CXX], [
++  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix[[4-9]]*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++], [
++  runpath_var=
++  _LT_TAGVAR(allow_undefined_flag, $1)=
++  _LT_TAGVAR(always_export_symbols, $1)=no
++  _LT_TAGVAR(archive_cmds, $1)=
++  _LT_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_TAGVAR(compiler_needs_object, $1)=no
++  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  _LT_TAGVAR(hardcode_automatic, $1)=no
++  _LT_TAGVAR(hardcode_direct, $1)=no
++  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
++  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_TAGVAR(inherit_rpath, $1)=no
++  _LT_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_TAGVAR(module_cmds, $1)=
++  _LT_TAGVAR(module_expsym_cmds, $1)=
++  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
++  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_TAGVAR(whole_archive_flag_spec, $1)=
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
++  extract_expsyms_cmds=
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++  _LT_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
++      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      _LT_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>&1` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
+ 
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix[[3-9]]*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++_LT_EOF
++      fi
++      ;;
+ 
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_expsym_cmds, $1)=''
++        ;;
++      m68k)
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++            _LT_TAGVAR(hardcode_minus_L, $1)=yes
++        ;;
++      esac
++      ;;
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
++    beos*)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++    cygwin* | mingw* | pw32*)
++      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_TAGVAR(always_export_symbols, $1)=no
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ 
+-# A symbol stripping program
+-STRIP=$lt_STRIP
++      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
++    interix[[3-9]]*)
++      _LT_TAGVAR(hardcode_direct, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++    gnu* | linux* | tpf* | k*bsd*-gnu)
++      tmp_diet=no
++      if test "$host_os" = linux-dietlibc; then
++	case $cc_basename in
++	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
++	esac
++      fi
++      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
++	 && test "$tmp_diet" = no
++      then
++	tmp_addflag=
++	tmp_sharedflag='-shared'
++	case $cc_basename,$host_cpu in
++        pgcc*)				# Portland Group C compiler
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
++	  tmp_sharedflag='-qmkshrobj'
++	  tmp_addflag= ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(compiler_needs_object, $1)=yes
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	esac
++	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
++        if test "x$supports_anon_versioning" = xyes; then
++          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
++	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	    echo "local: *; };" >> $output_objdir/$libname.ver~
++	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++        fi
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
++	case $cc_basename in
++	xlf*)
++	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++	  if test "x$supports_anon_versioning" = xyes; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
++	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	      echo "local: *; };" >> $output_objdir/$libname.ver~
++	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	  fi
++	  ;;
++	esac
++      else
++        _LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++    netbsd*)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
+ 
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
+ 
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++_LT_EOF
++      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
+ 
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++_LT_EOF
++	;;
++	*)
++	  # For security reasons, it is highly recommended that you always
++	  # use absolute paths for naming shared libraries, and exclude the
++	  # DT_RUNPATH tag from executables and libraries.  But doing so
++	  # requires that you compile everything twice, which is a pain.
++	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  else
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
+ 
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
++    sunos4*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++    *)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
++    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_TAGVAR(always_export_symbols, $1)=yes
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
+ 
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
++    aix[[4-9]]*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
++	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	  for ld_flag in $LDFLAGS; do
++	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	    aix_use_runtimelinking=yes
++	    break
++	  fi
++	  done
++	  ;;
++	esac
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++      _LT_TAGVAR(archive_cmds, $1)=''
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" &&
++	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
++	  then
++	  # We have reworked collect2
++	  :
++	  else
++	  # We have old collect2
++	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
++	fi
++      fi
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
++        # Determine the default libpath from the value encoded in an
++        # empty executable.
++        _LT_SYS_MODULE_PATH_AIX
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      else
++	if test "$host_cpu" = ia64; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an
++	 # empty executable.
++	 _LT_SYS_MODULE_PATH_AIX
++	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_expsym_cmds, $1)=''
++        ;;
++      m68k)
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++            _LT_TAGVAR(hardcode_minus_L, $1)=yes
++        ;;
++      esac
++      ;;
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++    bsdi[[45]]*)
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++    darwin* | rhapsody*)
++      _LT_DARWIN_LINKER_FEATURES($1)
++      ;;
+ 
+-# Library versioning type.
+-version_type=$version_type
++    dgux*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++    freebsd1*)
++      _LT_TAGVAR(ld_shlibs, $1)=no
++      ;;
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_TAGVAR(hardcode_direct, $1)=yes
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      ;;
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
++	_LT_TAGVAR(hardcode_direct, $1)=yes
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	_LT_TAGVAR(hardcode_minus_L, $1)=yes
++      fi
++      ;;
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case $host_cpu in
++	hppa*64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++	case $host_cpu in
++	hppa*64*|ia64*)
++	  _LT_TAGVAR(hardcode_direct, $1)=no
++	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  ;;
++	*)
++	  _LT_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	esac
++      fi
++      ;;
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	# Try to use the -exported_symbol ld option, if it does not
++	# work, assume that -exports_file does not work either and
++	# implicitly export all symbols.
++        save_LDFLAGS="$LDFLAGS"
++        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++        AC_LINK_IFELSE(int foo(void) {},
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++        )
++        LDFLAGS="$save_LDFLAGS"
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++      fi
++      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_TAGVAR(inherit_rpath, $1)=yes
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++    netbsd*)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++    newsos6)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++    *nto* | *qnx*)
++      ;;
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++    openbsd*)
++      if test -f /usr/libexec/ld.so; then
++	_LT_TAGVAR(hardcode_direct, $1)=yes
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++	fi
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++    os2*)
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++    osf3*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      else
++	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
++	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++	# Both c and cxx compiler support -rpath directly
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++      fi
++      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
++    solaris*)
++      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++      else
++	case `$CC -V 2>&1` in
++	*"Compilers 5.0"*)
++	  wlarc=''
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++	  ;;
++	*)
++	  wlarc='${wl}'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++	  ;;
++	esac
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      case $host_os in
++      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
++      esac
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++    sysv4)
++      case $host_vendor in
++	sni)
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++	  _LT_TAGVAR(hardcode_direct, $1)=no
++        ;;
++	motorola)
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++    sysv4.3*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
++      ;;
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	_LT_TAGVAR(ld_shlibs, $1)=yes
++      fi
++      ;;
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++    uts4*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++    *)
++      _LT_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    esac
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++    if test x$host_vendor = xsni; then
++      case $host in
++      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
++	;;
++      esac
++    fi
++  fi
++])
++AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
++_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
++_LT_DECL([], [extract_expsyms_cmds], [2],
++    [The commands to extract the exported symbol list from a shared archive])
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++#
++# Do we need to explicitly link libc?
++#
++case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++  # Assume -lc should be added
++  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $_LT_TAGVAR(archive_cmds, $1) in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $RM conftest*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
++        _LT_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $RM conftest*
++      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
++    [Whether or not to add -lc for building shared libraries])
++_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
++    [enable_shared_with_static_runtimes], [0],
++    [Whether or not to disallow shared libs when runtime libs are static])
++_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
++    [Compiler flag to allow reflexive dlopens])
++_LT_TAGDECL([], [whole_archive_flag_spec], [1],
++    [Compiler flag to generate shared objects directly from archives])
++_LT_TAGDECL([], [compiler_needs_object], [1],
++    [Whether the compiler copes with passing no objects directly])
++_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
++    [Create an old-style archive from a shared archive])
++_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
++    [Create a temporary old-style archive to link instead of a shared archive])
++_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
++_LT_TAGDECL([], [archive_expsym_cmds], [2])
++_LT_TAGDECL([], [module_cmds], [2],
++    [Commands used to build a loadable module if different from building
++    a shared archive.])
++_LT_TAGDECL([], [module_expsym_cmds], [2])
++_LT_TAGDECL([], [with_gnu_ld], [1],
++    [Whether we are building with GNU ld or not])
++_LT_TAGDECL([], [allow_undefined_flag], [1],
++    [Flag that allows shared libraries with undefined symbols to be built])
++_LT_TAGDECL([], [no_undefined_flag], [1],
++    [Flag that enforces no undefined symbols])
++_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
++    [Flag to hardcode $libdir into a binary during linking.
++    This must work even if $libdir does not exist])
++_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
++    [[If ld is used when linking, flag to hardcode $libdir into a binary
++    during linking.  This must work even if $libdir does not exist]])
++_LT_TAGDECL([], [hardcode_libdir_separator], [1],
++    [Whether we need a single "-rpath" flag with a separated argument])
++_LT_TAGDECL([], [hardcode_direct], [0],
++    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    DIR into the resulting binary])
++_LT_TAGDECL([], [hardcode_direct_absolute], [0],
++    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    DIR into the resulting binary and the resulting library dependency is
++    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
++    library is relocated])
++_LT_TAGDECL([], [hardcode_minus_L], [0],
++    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
++    into the resulting binary])
++_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
++    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
++    into the resulting binary])
++_LT_TAGDECL([], [hardcode_automatic], [0],
++    [Set to "yes" if building a shared library automatically hardcodes DIR
++    into the library and all subsequent libraries and executables linked
++    against it])
++_LT_TAGDECL([], [inherit_rpath], [0],
++    [Set to yes if linker adds runtime paths of dependent libraries
++    to runtime path list])
++_LT_TAGDECL([], [link_all_deplibs], [0],
++    [Whether libtool must link a program against all its dependency libraries])
++_LT_TAGDECL([], [fix_srcfile_path], [1],
++    [Fix the shell variable $srcfile for the compiler])
++_LT_TAGDECL([], [always_export_symbols], [0],
++    [Set to "yes" if exported symbols are required])
++_LT_TAGDECL([], [export_symbols_cmds], [2],
++    [The commands to list exported symbols])
++_LT_TAGDECL([], [exclude_expsyms], [1],
++    [Symbols that should not be listed in the preloaded symbols])
++_LT_TAGDECL([], [include_expsyms], [1],
++    [Symbols that must always be exported])
++_LT_TAGDECL([], [prelink_cmds], [2],
++    [Commands necessary for linking programs (against libraries) with templates])
++_LT_TAGDECL([], [file_list_spec], [1],
++    [Specify filename containing input files])
++dnl FIXME: Not yet implemented
++dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
++dnl    [Compiler flag to generate thread safe objects])
++])# _LT_LINKER_SHLIBS
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# _LT_LANG_C_CONFIG([TAG])
++# ------------------------
++# Ensure that the configuration variables for a C compiler are suitably
++# defined.  These variables are subsequently used by _LT_CONFIG to write
++# the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_C_CONFIG],
++[m4_require([_LT_DECL_EGREP])dnl
++lt_save_CC="$CC"
++AC_LANG_PUSH(C)
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++# Source file extension for C test sources.
++ac_ext=c
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++# Object file extension for compiled C test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++_LT_TAG_COMPILER
++# Save the default compiler, since it gets overwritten when the other
++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
++compiler_DEFAULT=$CC
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++if test -n "$compiler"; then
++  _LT_COMPILER_NO_RTTI($1)
++  _LT_COMPILER_PIC($1)
++  _LT_COMPILER_C_O($1)
++  _LT_COMPILER_FILE_LOCKS($1)
++  _LT_LINKER_SHLIBS($1)
++  _LT_SYS_DYNAMIC_LINKER($1)
++  _LT_LINKER_HARDCODE_LIBPATH($1)
++  LT_SYS_DLOPEN_SELF
++  _LT_CMD_STRIPLIB
++
++  # Report which library types will actually be built
++  AC_MSG_CHECKING([if libtool supports shared libraries])
++  AC_MSG_RESULT([$can_build_shared])
+ 
+-__EOF__
++  AC_MSG_CHECKING([whether to build shared libraries])
++  test "$can_build_shared" = "no" && enable_shared=no
+ 
+-ifelse([$1],[], [
++  # On AIX, shared libraries and static libraries use the same namespace, and
++  # are all built from PIC.
+   case $host_os in
+   aix3*)
+-    cat <<\EOF >> "$cfgfile"
++    test "$enable_shared" = yes && enable_static=no
++    if test -n "$RANLIB"; then
++      archive_cmds="$archive_cmds~\$RANLIB \$lib"
++      postinstall_cmds='$RANLIB $lib'
++    fi
++    ;;
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
+-fi
+-EOF
++  aix[[4-9]]*)
++    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++      test "$enable_shared" = yes && enable_static=no
++    fi
+     ;;
+   esac
++  AC_MSG_RESULT([$enable_shared])
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++  AC_MSG_CHECKING([whether to build static libraries])
++  # Make sure either enable_shared or enable_static is yes.
++  test "$enable_shared" = yes || enable_static=yes
++  AC_MSG_RESULT([$enable_static])
+ 
+-  mv -f "$cfgfile" "$ofile" || \
+-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+-  chmod +x "$ofile"
+-])
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+-  if test -f "$ltmain_in"; then
+-    test -f Makefile && make "$ltmain"
+-  fi
++  _LT_CONFIG($1)
+ fi
+-])# AC_LIBTOOL_CONFIG
+-
+-
+-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+-# -------------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-
+-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++AC_LANG_POP
++CC="$lt_save_CC"
++])# _LT_LANG_C_CONFIG
+ 
+-if test "$GCC" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ 
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+-    lt_cv_prog_compiler_rtti_exceptions,
+-    [-fno-rtti -fno-exceptions], [],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++# _LT_PROG_CXX
++# ------------
++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
++# compiler, we have our own version here.
++m4_defun([_LT_PROG_CXX],
++[
++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
++AC_PROG_CXX
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++else
++  _lt_caught_CXX_error=yes
+ fi
+-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_CXX
+ 
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_CXX], [])
+ 
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+-[
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++# _LT_LANG_CXX_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for a C++ compiler are suitably
++# defined.  These variables are subsequently used by _LT_CONFIG to write
++# the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_CXX_CONFIG],
++[AC_REQUIRE([_LT_PROG_CXX])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_EGREP])dnl
++
++AC_LANG_PUSH(C++)
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_TAGVAR(allow_undefined_flag, $1)=
++_LT_TAGVAR(always_export_symbols, $1)=no
++_LT_TAGVAR(archive_expsym_cmds, $1)=
++_LT_TAGVAR(compiler_needs_object, $1)=no
++_LT_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_TAGVAR(hardcode_direct, $1)=no
++_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_TAGVAR(hardcode_minus_L, $1)=no
++_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(inherit_rpath, $1)=no
++_LT_TAGVAR(module_cmds, $1)=
++_LT_TAGVAR(module_expsym_cmds, $1)=
++_LT_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++# Source file extension for C++ test sources.
++ac_ext=cpp
+ 
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[[BCDT]]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[[ABCDGISTW]]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDEGRST]]'
++# No sense in running all these tests if we already determined that
++# the CXX compiler isn't working.  Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_caught_CXX_error" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="int some_variable = 0;"
++
++  # Code to be used in simple link tests
++  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
++
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
++
++  # save warnings/boilerplate of simple test code
++  _LT_COMPILER_BOILERPLATE
++  _LT_LINKER_BOILERPLATE
++
++  # Allow CC to be a program name with arguments.
++  lt_save_CC=$CC
++  lt_save_LD=$LD
++  lt_save_GCC=$GCC
++  GCC=$GXX
++  lt_save_with_gnu_ld=$with_gnu_ld
++  lt_save_path_LD=$lt_cv_path_LD
++  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++  else
++    $as_unset lt_cv_prog_gnu_ld
+   fi
+-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-linux*)
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDGIRSTW]]'
+-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  if test -n "${lt_cv_path_LDCXX+set}"; then
++    lt_cv_path_LD=$lt_cv_path_LDCXX
++  else
++    $as_unset lt_cv_path_LD
+   fi
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[[BCDEGRST]]'
+-  ;;
+-osf*)
+-  symcode='[[BCDEGQRST]]'
+-  ;;
+-solaris*)
+-  symcode='[[BDRT]]'
+-  ;;
+-sco3.2v5*)
+-  symcode='[[DT]]'
+-  ;;
+-sysv4.2uw2*)
+-  symcode='[[DT]]'
+-  ;;
+-sysv5* | sco5v6* | unixware* | OpenUNIX*)
+-  symcode='[[ABDT]]'
+-  ;;
+-sysv4)
+-  symcode='[[DFNSTU]]'
+-  ;;
+-esac
+-
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $build_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-  ;;
+-esac
+-
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+-  symcode='[[ABCDGIRSTW]]' ;;
+-esac
+-
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+-
+-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+-  symxfrm="\\1 $ac_symprfx\\2 \\2"
+-
+-  # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+-
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
+-
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+-
+-  if AC_TRY_EVAL(ac_compile); then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
+-
+-      # Make sure that we snagged all the symbols we need.
+-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+-
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
+-#endif
+-
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr_t address;
+-}
+-lt_preloaded_symbols[[]] =
+-{
+-EOF
+-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr_t) 0}
+-};
++  test -z "${LDCXX+set}" || LD=$LDCXX
++  CC=${CXX-"c++"}
++  compiler=$CC
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
+ 
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$lt_save_LIBS"
+-	  CFLAGS="$lt_save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+-      fi
++  if test -n "$compiler"; then
++    # We don't want -fno-exception when compiling C++ code, so set the
++    # no_builtin_flag separately
++    if test "$GXX" = yes; then
++      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+     else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+     fi
+-  else
+-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
+-
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
+-  fi
+-done
+-])
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  lt_cv_sys_global_symbol_to_cdecl=
+-fi
+-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+-  AC_MSG_RESULT(failed)
+-else
+-  AC_MSG_RESULT(ok)
+-fi
+-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ 
++    if test "$GXX" = yes; then
++      # Set up default GNU C++ configuration
+ 
+-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+-# ---------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++      LT_PATH_LD
+ 
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+- ifelse([$1],[CXX],[
+-  # C++ specific cases for pic, static, wl, etc.
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++      # Check if GNU C++ uses GNU ld as the underlying linker, since the
++      # archiving commands below assume that GNU ld is being used.
++      if test "$with_gnu_ld" = yes; then
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++        # If archive_cmds runs LD, not CC, wlarc should be empty
++        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++        #     investigate it a little bit more. (MM)
++        wlarc='${wl}'
++
++        # ancient GNU ld didn't support --whole-archive et. al.
++        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
++	  $GREP 'no-whole-archive' > /dev/null; then
++          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++        else
++          _LT_TAGVAR(whole_archive_flag_spec, $1)=
++        fi
++      else
++        with_gnu_ld=no
++        wlarc=
+ 
+-    case $host_os in
+-    aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    mingw* | cygwin* | os2* | pw32*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+-      # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
+-    *djgpp*)
+-      # DJGPP does not support shared libraries at all
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-      ;;
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++        # A generic and very simple default shared library creation
++        # command for GNU C++ for the case where it uses the native
++        # linker, instead of GNU ld.  If possible, this setting should
++        # overridden to take advantage of the native linker features on
++        # the platform it is being used on.
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+       fi
+-      ;;
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
+-      ;;
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-      ;;
+-    esac
+-  else
++
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++
++    else
++      GXX=no
++      with_gnu_ld=no
++      wlarc=
++    fi
++
++    # PORTME: fill in a description of your system's C++ link characteristics
++    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++    _LT_TAGVAR(ld_shlibs, $1)=yes
+     case $host_os in
+-      aix4* | aix5*)
+-	# All AIX code is PIC.
+-	if test "$host_cpu" = ia64; then
+-	  # AIX 5 now supports IA64 processor
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      aix3*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
++      aix[[4-9]]*)
++        if test "$host_cpu" = ia64; then
++          # On IA64, the linker does run time linking by default, so we don't
++          # have to do anything special.
++          aix_use_runtimelinking=no
++          exp_sym_flag='-Bexport'
++          no_entry_flag=""
++        else
++          aix_use_runtimelinking=no
++
++          # Test if we are trying to use run time linking or normal
++          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++          # need to do runtime linking.
++          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	    for ld_flag in $LDFLAGS; do
++	      case $ld_flag in
++	      *-brtl*)
++	        aix_use_runtimelinking=yes
++	        break
++	        ;;
++	      esac
++	    done
++	    ;;
++          esac
++
++          exp_sym_flag='-bexport'
++          no_entry_flag='-bnoentry'
++        fi
++
++        # When large executables or shared objects are built, AIX ld can
++        # have problems creating the table of contents.  If linking a library
++        # or program results in "error TOC overflow" add -mminimal-toc to
++        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++        _LT_TAGVAR(archive_cmds, $1)=''
++        _LT_TAGVAR(hardcode_direct, $1)=yes
++        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++        _LT_TAGVAR(link_all_deplibs, $1)=yes
++        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
++
++        if test "$GXX" = yes; then
++          case $host_os in aix4.[[012]]|aix4.[[012]].*)
++          # We only want to do this on AIX 4.2 and lower, the check
++          # below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" &&
++	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
++	  then
++	    # We have reworked collect2
++	    :
++	  else
++	    # We have old collect2
++	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
++	    # It fails to find uninstalled libraries when the uninstalled
++	    # path is not listed in the libpath.  Setting hardcode_minus_L
++	    # to unsupported forces relinking
++	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++          esac
++          shared_flag='-shared'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag="$shared_flag "'${wl}-G'
++	  fi
++        else
++          # not using gcc
++          if test "$host_cpu" = ia64; then
++	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	  # chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++          else
++	    if test "$aix_use_runtimelinking" = yes; then
++	      shared_flag='${wl}-G'
++	    else
++	      shared_flag='${wl}-bM:SRE'
++	    fi
++          fi
++        fi
++
++        # It seems that -bexpall does not export symbols beginning with
++        # underscore (_), so it is better to generate a list of symbols to
++	# export.
++        _LT_TAGVAR(always_export_symbols, $1)=yes
++        if test "$aix_use_runtimelinking" = yes; then
++          # Warning - without using the other runtime loading flags (-brtl),
++          # -berok will link without error, but may produce a broken library.
++          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
++          # Determine the default libpath from the value encoded in an empty
++          # executable.
++          _LT_SYS_MODULE_PATH_AIX
++          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        else
++          if test "$host_cpu" = ia64; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++          else
++	    # Determine the default libpath from the value encoded in an
++	    # empty executable.
++	    _LT_SYS_MODULE_PATH_AIX
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	    # Warning - without using the other run time loading flags,
++	    # -berok will link without error, but may produce a broken library.
++	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	    # Exported symbols can be pulled into shared objects from archives
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++	    # This is similar to how AIX traditionally builds its shared
++	    # libraries.
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++          fi
++        fi
++        ;;
++
++      beos*)
++	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	  # support --undefined.  This deserves some investigation.  FIXME
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	else
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	  _LT_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
++
+       chorus*)
+-	case $cc_basename in
+-	cxch68*)
+-	  # Green Hills C++ Compiler
+-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++        case $cc_basename in
++          *)
++	  # FIXME: insert proper C++ library support
++	  _LT_TAGVAR(ld_shlibs, $1)=no
+ 	  ;;
+-	esac
++        esac
++        ;;
++
++      cygwin* | mingw* | pw32*)
++        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++        # as there is no search path for DLLs.
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++        _LT_TAGVAR(always_export_symbols, $1)=no
++        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++          # If the export-symbols file already is a .def file (1st line
++          # is EXPORTS), use it as is; otherwise, prepend...
++          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	    cp $export_symbols $output_objdir/$soname.def;
++          else
++	    echo EXPORTS > $output_objdir/$soname.def;
++	    cat $export_symbols >> $output_objdir/$soname.def;
++          fi~
++          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++        else
++          _LT_TAGVAR(ld_shlibs, $1)=no
++        fi
++        ;;
++      darwin* | rhapsody*)
++        _LT_DARWIN_LINKER_FEATURES($1)
+ 	;;
+-       darwin*)
+-         # PIC is the default on this platform
+-         # Common symbols not allowed in MH_DYLIB files
+-         case $cc_basename in
+-           xlc*)
+-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-           ;;
+-         esac
+-       ;;
++
+       dgux*)
+-	case $cc_basename in
+-	  ec++*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++        case $cc_basename in
++          ec++*)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	  ghcx*)
++          ghcx*)
+ 	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	  *)
++          *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	esac
+-	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
+-	# FreeBSD uses GNU C++
+-	;;
+-      hpux9* | hpux10* | hpux11*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+-	    if test "$host_cpu" != ia64; then
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	    fi
++        esac
++        ;;
++
++      freebsd[[12]]*)
++        # C++ shared libraries reported to be fairly broken before
++	# switch to ELF
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
++
++      freebsd-elf*)
++        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++        ;;
++
++      freebsd* | dragonfly*)
++        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++        # conventions
++        _LT_TAGVAR(ld_shlibs, $1)=yes
++        ;;
++
++      gnu*)
++        ;;
++
++      hpux9*)
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        _LT_TAGVAR(hardcode_direct, $1)=yes
++        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				             # but as the default
++				             # location of the library.
++
++        case $cc_basename in
++          CC*)
++            # FIXME: insert proper C++ library support
++            _LT_TAGVAR(ld_shlibs, $1)=no
++            ;;
++          aCC*)
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            # Commands to make compiler produce verbose output that lists
++            # what "hidden" libraries, object files and flags are used when
++            # linking a shared library.
++            #
++            # There doesn't appear to be a way to prevent this compiler from
++            # explicitly linking system object files so we need to strip them
++            # from the output so that they don't get included in the library
++            # dependencies.
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++            ;;
++          *)
++            if test "$GXX" = yes; then
++              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            else
++              # FIXME: insert proper C++ library support
++              _LT_TAGVAR(ld_shlibs, $1)=no
++            fi
++            ;;
++        esac
++        ;;
++
++      hpux10*|hpux11*)
++        if test $with_gnu_ld = no; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++          case $host_cpu in
++            hppa*64*|ia64*)
++              ;;
++            *)
++	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++              ;;
++          esac
++        fi
++        case $host_cpu in
++          hppa*64*|ia64*)
++            _LT_TAGVAR(hardcode_direct, $1)=no
++            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++            ;;
++          *)
++            _LT_TAGVAR(hardcode_direct, $1)=yes
++            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					         # but as the default
++					         # location of the library.
++            ;;
++        esac
++
++        case $cc_basename in
++          CC*)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	  aCC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++          aCC*)
+ 	    case $host_cpu in
+-	    hppa*64*|ia64*)
+-	      # +Z the default
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	      ;;
++	      hppa*64*)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
++	      ia64*)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
++	      *)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
+ 	    esac
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 	    ;;
+-	  *)
++          *)
++	    if test "$GXX" = yes; then
++	      if test $with_gnu_ld = no; then
++	        case $host_cpu in
++	          hppa*64*)
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	          ia64*)
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	          *)
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	        esac
++	      fi
++	    else
++	      # FIXME: insert proper C++ library support
++	      _LT_TAGVAR(ld_shlibs, $1)=no
++	    fi
+ 	    ;;
+-	esac
+-	;;
+-      interix*)
+-	# This is c89, which is MS Visual C++ (no shared libs)
+-	# Anyone wants to do a port?
+-	;;
+-      irix5* | irix6* | nonstopux*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    # CC pic flag -KPIC is the default.
++        esac
++        ;;
++
++      interix[[3-9]]*)
++	_LT_TAGVAR(hardcode_direct, $1)=no
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++	# Instead, shared libraries are loaded at an image base (0x10000000 by
++	# default) and relocated if they conflict, which is a slow very memory
++	# consuming and fragmenting process.  To avoid this, we pick a random,
++	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	;;
++      irix5* | irix6*)
++        case $cc_basename in
++          CC*)
++	    # SGI C++
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++
++	    # Archives containing C++ object files must be created using
++	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	    # necessary to make sure instantiated templates are included
++	    # in the archive.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ 	    ;;
+-	  *)
++          *)
++	    if test "$GXX" = yes; then
++	      if test "$with_gnu_ld" = no; then
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	      else
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
++	      fi
++	    fi
++	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+ 	    ;;
+-	esac
+-	;;
+-      linux*)
+-	case $cc_basename in
+-	  KCC*)
+-	    # KAI C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        esac
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++        _LT_TAGVAR(inherit_rpath, $1)=yes
++        ;;
++
++      linux* | k*bsd*-gnu)
++        case $cc_basename in
++          KCC*)
++	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	    # KCC will only create a shared library if the output file
++	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
++	    # to its proper name (with version) after linking.
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++	    # Archives containing C++ object files must be created using
++	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	    ;;
+-	  icpc* | ecpc*)
++	  icpc* | ecpc* )
+ 	    # Intel C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;;
+-	  pgCC*)
+-	    # Portland Group C++ compiler.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	  cxx*)
+-	    # Compaq C++
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    with_gnu_ld=yes
++	    # version 8.0 and above of icpc choke on multiply defined symbols
++	    # if we add $predep_objects and $postdep_objects, however 7.1 and
++	    # earlier do not add the objects themselves.
++	    case `$CC -V 2>&1` in
++	      *"Version 7."*)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++		;;
++	      *)  # Version 8.0 or newer
++	        tmp_idyn=
++	        case $host_cpu in
++		  ia64*) tmp_idyn=' -i_dynamic';;
++		esac
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++		;;
++	    esac
++	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	    ;;
+-	  *)
+-	    case `$CC -V 2>&1 | sed 5q` in
+-	    *Sun\ C*)
+-	      # Sun C++ 5.9
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++          pgCC* | pgcpp*)
++            # Portland Group C++ compiler
++	    case `$CC -V` in
++	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
++	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++		$RANLIB $oldlib'
++	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      ;;
++	    *) # Version 6 will use weak symbols
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ 	      ;;
+ 	    esac
+-	    ;;
+-	esac
+-	;;
+-      lynxos*)
+-	;;
+-      m88k*)
+-	;;
+-      mvs*)
+-	case $cc_basename in
+-	  cxx*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      netbsd*)
+-	;;
+-      osf3* | osf4* | osf5*)
+-	case $cc_basename in
+-	  KCC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    ;;
+-	  RCC*)
+-	    # Rational C++ 2.4.1
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++            ;;
+ 	  cxx*)
+-	    # Digital/Compaq C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      psos*)
+-	;;
+-      solaris*)
+-	case $cc_basename in
+-	  CC*)
+-	    # Sun C++ 4.2, 5.x and Centerline C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-	    ;;
+-	  gcx*)
+-	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      sunos4*)
+-	case $cc_basename in
+-	  CC*)
+-	    # Sun C++ 4.x
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	  lcc*)
+-	    # Lucid
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  *)
++	    # Compaq C++
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	    runpath_var=LD_RUN_PATH
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 	    ;;
+-	esac
+-	;;
+-      tandem*)
+-	case $cc_basename in
+-	  NCC*)
+-	    # NonStop-UX NCC 3.20
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  xl*)
++	    # IBM XL 8.0 on PPC, with GNU ld
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    if test "x$supports_anon_versioning" = xyes; then
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
++		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++		echo "local: *; };" >> $output_objdir/$libname.ver~
++		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	    fi
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	      _LT_TAGVAR(compiler_needs_object, $1)=yes
++
++	      # Not sure whether something based on
++	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	      # would be better.
++	      output_verbose_link_cmd='echo'
++
++	      # Archives containing C++ object files must be created using
++	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	      # necessary to make sure instantiated templates are included
++	      # in the archive.
++	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++
++      lynxos*)
++        # FIXME: insert proper C++ library support
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	;;
++
++      m88k*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++	;;
++
++      mvs*)
++        case $cc_basename in
++          cxx*)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++	  *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+ 	esac
+ 	;;
+-      vxworks*)
++
++      netbsd*)
++        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++	  wlarc=
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	fi
++	# Workaround some broken pre-1.5 toolchains
++	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ 	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++
++      *nto* | *qnx*)
++        _LT_TAGVAR(ld_shlibs, $1)=yes
+ 	;;
+-    esac
+-  fi
+-],
+-[
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+-    case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
++      openbsd2*)
++        # C++ shared libraries are fairly broken
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	;;
++
++      openbsd*)
++	if test -f /usr/libexec/ld.so; then
++	  _LT_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  fi
++	  output_verbose_link_cmd=echo
++	else
++	  _LT_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
+ 
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
++      osf3* | osf4* | osf5*)
++        case $cc_basename in
++          KCC*)
++	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	    # KCC will only create a shared library if the output file
++	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
++	    # to its proper name (with version) after linking.
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	    # Archives containing C++ object files must be created using
++	    # the KAI C++ compiler.
++	    case $host in
++	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
++	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
++	    esac
++	    ;;
++          RCC*)
++	    # Rational C++ 2.4.1
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          cxx*)
++	    case $host in
++	      osf3*)
++	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++		;;
++	      *)
++	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	          echo "-hidden">> $lib.exp~
++	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
++	          $RM $lib.exp'
++	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++		;;
++	    esac
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-    mingw* | cygwin* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+-      # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++	    ;;
++	  *)
++	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	      case $host in
++	        osf3*)
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++		  ;;
++	        *)
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++		  ;;
++	      esac
++
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	      # Commands to make compiler produce verbose output that lists
++	      # what "hidden" libraries, object files and flags are used when
++	      # linking a shared library.
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++
++	    else
++	      # FIXME: insert proper C++ library support
++	      _LT_TAGVAR(ld_shlibs, $1)=no
++	    fi
++	    ;;
++        esac
++        ;;
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
++      psos*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
+ 
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
++      sunos4*)
++        case $cc_basename in
++          CC*)
++	    # Sun C++ 4.x
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          lcc*)
++	    # Lucid
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++        esac
++        ;;
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      enable_shared=no
+-      ;;
++      solaris*)
++        case $cc_basename in
++          CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
++	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	    case $host_os in
++	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	      *)
++		# The compiler driver will combine and reorder linker options,
++		# but understands `-z linker_flag'.
++	        # Supported since Solaris 2.6 (maybe 2.5.1?)
++		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	        ;;
++	    esac
++	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+-      fi
+-      ;;
++	    output_verbose_link_cmd='echo'
+ 
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
+-      ;;
++	    # Archives containing C++ object files must be created using
++	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	    # necessary to make sure instantiated templates are included
++	    # in the archive.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	    ;;
++          gcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      else
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+-      darwin*)
+-        # PIC is the default on this platform
+-        # Common symbols not allowed in MH_DYLIB files
+-       case $cc_basename in
+-         xlc*)
+-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-         ;;
+-       esac
+-       ;;
++	    # The C++ compiler must be used to create the archive.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	    ;;
++          *)
++	    # GNU C++ compiler with Solaris linker
++	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	        # Commands to make compiler produce verbose output that lists
++	        # what "hidden" libraries, object files and flags are used when
++	        # linking a shared library.
++	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++	      else
++	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	        # platform.
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	        # Commands to make compiler produce verbose output that lists
++	        # what "hidden" libraries, object files and flags are used when
++	        # linking a shared library.
++	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++	      fi
++
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	      case $host_os in
++		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++		*)
++		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++		  ;;
++	      esac
++	    fi
++	    ;;
++        esac
++        ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+-      # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	;;
++      case $cc_basename in
++        CC*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
+       esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+       ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
++      sysv5* | sco3.2v5* | sco5v6*)
++	# Note: We can NOT use -z defs as we might desire, because we do not
++	# link with -lc, and that would cause any symbols used from libc to
++	# always be unresolved, which means just about no library would
++	# ever link correctly.  If we're not using GNU ld we use -z text
++	# though, which does catch some bad symbols but isn't as heavy-handed
++	# as -z defs.
++	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++	_LT_TAGVAR(link_all_deplibs, $1)=yes
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++	runpath_var='LD_RUN_PATH'
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	case $cc_basename in
++          CC*)
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    ;;
++	  *)
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    ;;
++	esac
+       ;;
+ 
+-    linux*)
+-      case $cc_basename in
+-      icc* | ecc*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-        ;;
+-      ccc*)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-        # All Alpha code is PIC.
+-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      tandem*)
++        case $cc_basename in
++          NCC*)
++	    # NonStop-UX NCC 3.20
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++        esac
+         ;;
+-      como)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-lopt='
++
++      vxworks*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
+         ;;
++
+       *)
+-        case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ C*)
+-	  # Sun C 5.9
+-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	  ;;
+-	*Sun\ F*)
+-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+-	  ;;
+-	esac
+-	;;
+-      esac
+-      ;;
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
++    esac
+ 
+-    osf3* | osf4* | osf5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # All OSF/1 code is PIC.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
++    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
++    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+-      esac
+-      ;;
++    _LT_TAGVAR(GCC, $1)="$GXX"
++    _LT_TAGVAR(LD, $1)="$LD"
++
++    ## CAVEAT EMPTOR:
++    ## There is no encapsulation within the following macros, do not change
++    ## the running order or otherwise move them around unless you know exactly
++    ## what you are doing...
++    _LT_SYS_HIDDEN_LIBDEPS($1)
++    _LT_COMPILER_PIC($1)
++    _LT_COMPILER_C_O($1)
++    _LT_COMPILER_FILE_LOCKS($1)
++    _LT_LINKER_SHLIBS($1)
++    _LT_SYS_DYNAMIC_LINKER($1)
++    _LT_LINKER_HARDCODE_LIBPATH($1)
++
++    _LT_CONFIG($1)
++  fi # test -n "$compiler"
++
++  CC=$lt_save_CC
++  LDCXX=$LD
++  LD=$lt_save_LD
++  GCC=$lt_save_GCC
++  with_gnu_ld=$lt_save_with_gnu_ld
++  lt_cv_path_LDCXX=$lt_cv_path_LD
++  lt_cv_path_LD=$lt_save_path_LD
++  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++fi # test "$_lt_caught_CXX_error" != yes
++
++AC_LANG_POP
++])# _LT_LANG_CXX_CONFIG
++
++
++# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
++# ---------------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++# Dependencies to place before and after the object being linked:
++_LT_TAGVAR(predep_objects, $1)=
++_LT_TAGVAR(postdep_objects, $1)=
++_LT_TAGVAR(predeps, $1)=
++_LT_TAGVAR(postdeps, $1)=
++_LT_TAGVAR(compiler_lib_search_path, $1)=
++
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
++int a;
++void foo (void) { a = 0; }
++_LT_EOF
++], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++_LT_EOF
++], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++_LT_EOF
++], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
++      subroutine foo
++      implicit none
++      integer a
++      a=0
++      return
++      end
++_LT_EOF
++], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++_LT_EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++  for p in `eval "$output_verbose_link_cmd"`; do
++    case $p in
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" ||
++          test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
++	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
+ 
+-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
+ 
+-    unicos*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      ;;
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
++	   _LT_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
++	   _LT_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++    *) ;; # Ignore the rest.
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      ;;
+     esac
+-  fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++  done
+ 
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+-     "" | " "*) ;;
+-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+-     esac],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling $1 test program"
+ fi
+-case $host_os in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-    ;;
+-  *)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+-    ;;
+-esac
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $lt_tmp_static_flag,
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-])
+ 
++$RM -f confest.$objext
+ 
+-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+-# ------------------------------------
+-# See if the linker supports building shared libraries.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-ifelse([$1],[CXX],[
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  case $host_os in
+-  aix4* | aix5*)
+-    # If we're using GNU nm, then we don't want the "-C" option.
+-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    else
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    fi
+-    ;;
+-  pw32*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+-  ;;
+-  cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  *)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# PORTME: override above test on systems where it is broken
++m4_if([$1], [CXX],
++[case $host_os in
++interix[[3-9]]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_TAGVAR(predep_objects,$1)=
++  _LT_TAGVAR(postdep_objects,$1)=
++  _LT_TAGVAR(postdeps,$1)=
+   ;;
+-  esac
+-],[
+-  runpath_var=
+-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-  _LT_AC_TAGVAR(archive_cmds, $1)=
+-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-  _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  _LT_AC_TAGVAR(include_expsyms, $1)=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
+-  # Just being paranoid about ensuring that cc_basename is set.
+-  _LT_CC_BASENAME([$compiler])
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+-
+-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+-
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-    supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
+-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
+-
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
+-EOF
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
+       ;;
++    esac
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
+ 
+-    interix3*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++solaris*)
++  case $cc_basename in
++  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
+       ;;
++    esac
+ 
+-    linux*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
+-	pgcc*)				# Portland Group C compiler
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ C*)			# Sun C 5.9
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null'
+-	  tmp_sharedflag='-G' ;;
+-	*Sun\ F*)			# Sun Fortran 8.3
+-	  tmp_sharedflag='-G' ;;
+-	*)
+-	  tmp_sharedflag='-shared' ;;
+-	esac
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++esac
++])
+ 
+-	if test $supports_anon_versioning = yes; then
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-  $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-	fi
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++case " $_LT_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
++    [The directories searched by this compiler when creating a shared library])
++_LT_TAGDECL([], [predep_objects], [1],
++    [Dependencies to place before and after the objects being linked to
++    create a shared library])
++_LT_TAGDECL([], [postdep_objects], [1])
++_LT_TAGDECL([], [predeps], [1])
++_LT_TAGDECL([], [postdeps], [1])
++_LT_TAGDECL([], [compiler_lib_search_path], [1],
++    [The library search path used internally by the compiler when linking
++    a shared library])
++])# _LT_SYS_HIDDEN_LIBDEPS
++
++
++# _LT_PROG_F77
++# ------------
++# Since AC_PROG_F77 is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_F77],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
++AC_PROG_F77
++if test -z "$F77" || test "X$F77" = "Xno"; then
++  _lt_disable_F77=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_F77
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_F77], [])
+ 
+-    solaris*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
+ 
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# _LT_LANG_F77_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for a Fortran 77 compiler are
++# suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_F77_CONFIG],
++[AC_REQUIRE([_LT_PROG_F77])dnl
++AC_LANG_PUSH(Fortran 77)
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_TAGVAR(allow_undefined_flag, $1)=
++_LT_TAGVAR(always_export_symbols, $1)=no
++_LT_TAGVAR(archive_expsym_cmds, $1)=
++_LT_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_TAGVAR(hardcode_direct, $1)=no
++_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_TAGVAR(hardcode_minus_L, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(inherit_rpath, $1)=no
++_LT_TAGVAR(module_cmds, $1)=
++_LT_TAGVAR(module_expsym_cmds, $1)=
++_LT_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<_LT_EOF 1>&2
++# Source file extension for f77 test sources.
++ac_ext=f
+ 
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-_LT_EOF
+-	;;
+-	*)
+-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	  fi
+-	;;
+-      esac
+-      ;;
++# No sense in running all these tests if we already determined that
++# the F77 compiler isn't working.  Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_disable_F77" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  # Code to be used in simple link tests
++  lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+-      runpath_var=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-      fi
+-      ;;
++  # save warnings/boilerplate of simple test code
++  _LT_COMPILER_BOILERPLATE
++  _LT_LINKER_BOILERPLATE
++
++  # Allow CC to be a program name with arguments.
++  lt_save_CC="$CC"
++  lt_save_GCC=$GCC
++  CC=${F77-"f77"}
++  compiler=$CC
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
++  GCC=$G77
++  if test -n "$compiler"; then
++    AC_MSG_CHECKING([if libtool supports shared libraries])
++    AC_MSG_RESULT([$can_build_shared])
+ 
+-    aix4* | aix5*)
+-      if test "$host_cpu" = ia64; then
+-	# On IA64, the linker does run time linking by default, so we don't
+-	# have to do anything special.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    AC_MSG_CHECKING([whether to build shared libraries])
++    test "$can_build_shared" = "no" && enable_shared=no
++
++    # On AIX, shared libraries and static libraries use the same namespace, and
++    # are all built from PIC.
++    case $host_os in
++      aix3*)
++        test "$enable_shared" = yes && enable_static=no
++        if test -n "$RANLIB"; then
++          archive_cmds="$archive_cmds~\$RANLIB \$lib"
++          postinstall_cmds='$RANLIB $lib'
++        fi
++        ;;
++      aix[[4-9]]*)
++	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++	  test "$enable_shared" = yes && enable_static=no
+ 	fi
+-	aix_use_runtimelinking=no
++        ;;
++    esac
++    AC_MSG_RESULT([$enable_shared])
+ 
+-	# Test if we are trying to use run time linking or normal
+-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-	# need to do runtime linking.
+-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	  for ld_flag in $LDFLAGS; do
+-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-  	    aix_use_runtimelinking=yes
+-  	    break
+-  	  fi
+-	  done
+-	  ;;
+-	esac
++    AC_MSG_CHECKING([whether to build static libraries])
++    # Make sure either enable_shared or enable_static is yes.
++    test "$enable_shared" = yes || enable_static=yes
++    AC_MSG_RESULT([$enable_static])
++
++    _LT_TAGVAR(GCC, $1)="$G77"
++    _LT_TAGVAR(LD, $1)="$LD"
++
++    ## CAVEAT EMPTOR:
++    ## There is no encapsulation within the following macros, do not change
++    ## the running order or otherwise move them around unless you know exactly
++    ## what you are doing...
++    _LT_COMPILER_PIC($1)
++    _LT_COMPILER_C_O($1)
++    _LT_COMPILER_FILE_LOCKS($1)
++    _LT_LINKER_SHLIBS($1)
++    _LT_SYS_DYNAMIC_LINKER($1)
++    _LT_LINKER_HARDCODE_LIBPATH($1)
++
++    _LT_CONFIG($1)
++  fi # test -n "$compiler"
++
++  GCC=$lt_save_GCC
++  CC="$lt_save_CC"
++fi # test "$_lt_disable_F77" != yes
+ 
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
++AC_LANG_POP
++])# _LT_LANG_F77_CONFIG
+ 
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)=''
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# _LT_PROG_FC
++# -----------
++# Since AC_PROG_FC is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_FC],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
++AC_PROG_FC
++if test -z "$FC" || test "X$FC" = "Xno"; then
++  _lt_disable_FC=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_FC
+ 
+-      if test "$GCC" = yes; then
+-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  else
+-  	  # We have old collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	  fi
+-	  ;;
+-	esac
+-	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag="$shared_flag "'${wl}-G'
+-	fi
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
+-	  if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='${wl}-G'
+-	  else
+-	    shared_flag='${wl}-bM:SRE'
+-	  fi
+-	fi
+-      fi
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_FC], [])
+ 
+-      # It seems that -bexpall does not export symbols beginning with
+-      # underscore (_), so it is better to generate a list of symbols to export.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       _LT_AC_SYS_LIBPATH_AIX
+-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 _LT_AC_SYS_LIBPATH_AIX
+-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      # see comment about different semantics on the GNU ld section
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++# _LT_LANG_FC_CONFIG([TAG])
++# -------------------------
++# Ensure that the configuration variables for a Fortran compiler are
++# suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_FC_CONFIG],
++[AC_REQUIRE([_LT_PROG_FC])dnl
++AC_LANG_PUSH(Fortran)
++
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_TAGVAR(allow_undefined_flag, $1)=
++_LT_TAGVAR(always_export_symbols, $1)=no
++_LT_TAGVAR(archive_expsym_cmds, $1)=
++_LT_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_TAGVAR(hardcode_direct, $1)=no
++_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_TAGVAR(hardcode_minus_L, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(inherit_rpath, $1)=no
++_LT_TAGVAR(module_cmds, $1)=
++_LT_TAGVAR(module_expsym_cmds, $1)=
++_LT_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-    bsdi[[45]]*)
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+-      ;;
++# Source file extension for fc test sources.
++ac_ext=${ac_fc_srcext-f}
+ 
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext_cmds=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+-      # FIXME: Should let the user specify the lib program.
+-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      ;;
++# Object file extension for compiled fc test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-    darwin* | rhapsody*)
+-      case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-      esac
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    if test "$GCC" = yes ; then
+-    	output_verbose_link_cmd='echo'
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
+-    fi
+-      ;;
++# No sense in running all these tests if we already determined that
++# the FC compiler isn't working.  Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_disable_FC" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+-    dgux*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  # Code to be used in simple link tests
++  lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+-    freebsd1*)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
+ 
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  # save warnings/boilerplate of simple test code
++  _LT_COMPILER_BOILERPLATE
++  _LT_LINKER_BOILERPLATE
++
++  # Allow CC to be a program name with arguments.
++  lt_save_CC="$CC"
++  lt_save_GCC=$GCC
++  CC=${FC-"f95"}
++  compiler=$CC
++  GCC=$ac_cv_fc_compiler_gnu
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  if test -n "$compiler"; then
++    AC_MSG_CHECKING([if libtool supports shared libraries])
++    AC_MSG_RESULT([$can_build_shared])
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    AC_MSG_CHECKING([whether to build shared libraries])
++    test "$can_build_shared" = "no" && enable_shared=no
+ 
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      ;;
++    # On AIX, shared libraries and static libraries use the same namespace, and
++    # are all built from PIC.
++    case $host_os in
++      aix3*)
++        test "$enable_shared" = yes && enable_static=no
++        if test -n "$RANLIB"; then
++          archive_cmds="$archive_cmds~\$RANLIB \$lib"
++          postinstall_cmds='$RANLIB $lib'
++        fi
++        ;;
++      aix[[4-9]]*)
++	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++	  test "$enable_shared" = yes && enable_static=no
++	fi
++        ;;
++    esac
++    AC_MSG_RESULT([$enable_shared])
+ 
+-    hpux10*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    AC_MSG_CHECKING([whether to build static libraries])
++    # Make sure either enable_shared or enable_static is yes.
++    test "$enable_shared" = yes || enable_static=yes
++    AC_MSG_RESULT([$enable_static])
++
++    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
++    _LT_TAGVAR(LD, $1)="$LD"
++
++    ## CAVEAT EMPTOR:
++    ## There is no encapsulation within the following macros, do not change
++    ## the running order or otherwise move them around unless you know exactly
++    ## what you are doing...
++    _LT_SYS_HIDDEN_LIBDEPS($1)
++    _LT_COMPILER_PIC($1)
++    _LT_COMPILER_C_O($1)
++    _LT_COMPILER_FILE_LOCKS($1)
++    _LT_LINKER_SHLIBS($1)
++    _LT_SYS_DYNAMIC_LINKER($1)
++    _LT_LINKER_HARDCODE_LIBPATH($1)
++
++    _LT_CONFIG($1)
++  fi # test -n "$compiler"
++
++  GCC=$lt_save_GCC
++  CC="$lt_save_CC"
++fi # test "$_lt_disable_FC" != yes
+ 
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++AC_LANG_POP
++])# _LT_LANG_FC_CONFIG
+ 
+-	# hardcode_minus_L: Not really in the search PATH,
+-	# but as the default location of the library.
+-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      fi
+-      ;;
+ 
+-    hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# _LT_LANG_GCJ_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Java Compiler compiler
++# are suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_GCJ_CONFIG],
++[AC_REQUIRE([LT_PROG_GCJ])dnl
++AC_LANG_SAVE
+ 
+-	case $host_cpu in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++# Source file extension for Java test sources.
++ac_ext=java
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}"
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++lt_save_GCC=$GCC
++GCC=yes
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_TAGVAR(LD, $1)="$LD"
++_LT_CC_BASENAME([$compiler])
+ 
+-    openbsd*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	   ;;
+-	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+-    os2*)
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ 
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++if test -n "$compiler"; then
++  _LT_COMPILER_NO_RTTI($1)
++  _LT_COMPILER_PIC($1)
++  _LT_COMPILER_C_O($1)
++  _LT_COMPILER_FILE_LOCKS($1)
++  _LT_LINKER_SHLIBS($1)
++  _LT_LINKER_HARDCODE_LIBPATH($1)
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++  _LT_CONFIG($1)
++fi
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++AC_LANG_RESTORE
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      if test "$GCC" = yes; then
+-	wlarc='${wl}'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	wlarc=''
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      case $host_os in
+-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
+-      esac
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++GCC=$lt_save_GCC
++CC="$lt_save_CC"
++])# _LT_LANG_GCJ_CONFIG
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-        ;;
+-	motorola)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# _LT_LANG_RC_CONFIG([TAG])
++# -------------------------
++# Ensure that the configuration variables for the Windows resource compiler
++# are suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_RC_CONFIG],
++[AC_REQUIRE([LT_PROG_RC])dnl
++AC_LANG_SAVE
+ 
+-    sysv4.3*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+-      ;;
++# Source file extension for RC test sources.
++ac_ext=rc
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-      fi
+-      ;;
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      runpath_var='LD_RUN_PATH'
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
+ 
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var='LD_RUN_PATH'
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
+ 
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++lt_save_GCC=$GCC
++GCC=
++CC=${RC-"windres"}
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+-    *)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    esac
+-  fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++if test -n "$compiler"; then
++  :
++  _LT_CONFIG($1)
++fi
+ 
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+-x|xyes)
+-  # Assume -lc should be added
+-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++GCC=$lt_save_GCC
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# _LT_LANG_RC_CONFIG
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
+-      ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+-        then
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-        else
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-        fi
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-])# AC_LIBTOOL_PROG_LD_SHLIBS
++# LT_PROG_GCJ
++# -----------
++AC_DEFUN([LT_PROG_GCJ],
++[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
++  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
++    [AC_CHECK_TOOL(GCJ, gcj,)
++      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++      AC_SUBST(GCJFLAGS)])])[]dnl
++])
+ 
++# Old name:
++AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+ 
+-# _LT_AC_FILE_LTDLL_C
+-# -------------------
+-# Be careful that the start marker always follows a newline.
+-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-])# _LT_AC_FILE_LTDLL_C
+ 
++# LT_PROG_RC
++# ----------
++AC_DEFUN([LT_PROG_RC],
++[AC_CHECK_TOOL(RC, windres,)
++])
+ 
+-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++# Old name:
++AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_RC], [])
+ 
+ 
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+-
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
+-
+-AC_DEFUN([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+-  AC_SUBST(GCJFLAGS)
++# _LT_DECL_EGREP
++# --------------
++# If we don't have a new enough Autoconf to choose the best grep
++# available, choose the one first in the user's PATH.
++m4_defun([_LT_DECL_EGREP],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_REQUIRE([AC_PROG_FGREP])dnl
++test -z "$GREP" && GREP=grep
++_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
++_LT_DECL([], [EGREP], [1], [An ERE matcher])
++_LT_DECL([], [FGREP], [1], [A literal string matcher])
++dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
++AC_SUBST([GREP])
+ ])
+ 
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
+-])
+ 
++# _LT_DECL_SED
++# ------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++m4_defun([_LT_DECL_SED],
++[AC_PROG_SED
++test -z "$SED" && SED=sed
++Xsed="$SED -e 1s/^X//"
++_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
++_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
++    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
++])# _LT_DECL_SED
++
++m4_ifndef([AC_PROG_SED], [
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+ #  a released version of Autoconf we should remove this    #
+ #  macro and use it instead.                               #
+ ############################################################
+-# LT_AC_PROG_SED
+-# --------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible.  Prefer GNU sed if found.
+-AC_DEFUN([LT_AC_PROG_SED],
++
++m4_defun([AC_PROG_SED],
+ [AC_MSG_CHECKING([for a sed that does not truncate output])
+ AC_CACHE_VAL(lt_cv_path_SED,
+ [# Loop through the user's path and test for sed and gsed.
+@@ -6435,6 +7010,7 @@ do
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -6467,5 +7043,268 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
++])#AC_PROG_SED
++])#m4_ifndef
++
++# Old name:
++AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_SED], [])
++
++
++# _LT_CHECK_SHELL_FEATURES
++# ------------------------
++# Find out whether the shell is Bourne or XSI compatible,
++# or has some other useful features.
++m4_defun([_LT_CHECK_SHELL_FEATURES],
++[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
++# Try some XSI features
++xsi_shell=no
++( _lt_dummy="a/b/c"
++  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
++      = c,a/b,, \
++    && eval 'test $(( 1 + 1 )) -eq 2 \
++    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
++  && xsi_shell=yes
++AC_MSG_RESULT([$xsi_shell])
++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
++
++AC_MSG_CHECKING([whether the shell understands "+="])
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
++    >/dev/null 2>&1 \
++  && lt_shell_append=yes
++AC_MSG_RESULT([$lt_shell_append])
++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
++
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  lt_unset=unset
++else
++  lt_unset=false
++fi
++_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
++
++# test EBCDIC or ASCII
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  lt_SP2NL='tr \040 \012'
++  lt_NL2SP='tr \015\012 \040\040'
++  ;;
++ *) # EBCDIC based system
++  lt_SP2NL='tr \100 \n'
++  lt_NL2SP='tr \r\n \100\100'
++  ;;
++esac
++_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
++_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
++])# _LT_CHECK_SHELL_FEATURES
++
++
++# _LT_PROG_XSI_SHELLFNS
++# ---------------------
++# Bourne and XSI compatible variants of some useful shell functions.
++m4_defun([_LT_PROG_XSI_SHELLFNS],
++[case $xsi_shell in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
++  esac
++}
++
++# func_basename file
++func_basename ()
++{
++  func_basename_result="${1##*/}"
++}
++
++# func_dirname_and_basename file append nondir_replacement
++# perform func_basename and func_dirname in a single function
++# call:
++#   dirname:  Compute the dirname of FILE.  If nonempty,
++#             add APPEND to the result, otherwise set result
++#             to NONDIR_REPLACEMENT.
++#             value returned in "$func_dirname_result"
++#   basename: Compute filename of FILE.
++#             value retuned in "$func_basename_result"
++# Implementation must be kept synchronized with func_dirname
++# and func_basename. For efficiency, we do not delegate to
++# those functions but instead duplicate the functionality here.
++func_dirname_and_basename ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
++  esac
++  func_basename_result="${1##*/}"
++}
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++func_stripname ()
++{
++  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++  # positional parameters, so assign one to ordinary parameter first.
++  func_stripname_result=${3}
++  func_stripname_result=${func_stripname_result#"${1}"}
++  func_stripname_result=${func_stripname_result%"${2}"}
++}
++
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=${1%%=*}
++  func_opt_split_arg=${1#*=}
++}
++
++# func_lo2o object
++func_lo2o ()
++{
++  case ${1} in
++    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++    *)    func_lo2o_result=${1} ;;
++  esac
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=${1%.*}.lo
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=$(( $[*] ))
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=${#1}
++}
++
++_LT_EOF
++    ;;
++  *) # Bourne compatible functions.
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++  # Extract subdirectory from the argument.
++  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
++  if test "X$func_dirname_result" = "X${1}"; then
++    func_dirname_result="${3}"
++  else
++    func_dirname_result="$func_dirname_result${2}"
++  fi
++}
++
++# func_basename file
++func_basename ()
++{
++  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++}
++
++dnl func_dirname_and_basename
++dnl A portable version of this function is already defined in general.m4sh
++dnl so there is no need for it here.
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++  case ${2} in
++    .*) func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++    *)  func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
++  esac
++}
++
++# sed scripts:
++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[[^=]]*=//'
++
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
++}
++
++# func_lo2o object
++func_lo2o ()
++{
++  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=`expr "$[@]"`
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
++}
++
++_LT_EOF
++esac
++
++case $lt_shell_append in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]+=\$[2]"
++}
++_LT_EOF
++    ;;
++  *)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]=\$$[1]\$[2]"
++}
++
++_LT_EOF
++    ;;
++  esac
+ ])
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1,107 +1,186 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+-## Free Software Foundation, Inc.
+-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-##
+-## This file is free software; the Free Software Foundation gives
+-## unlimited permission to copy and/or distribute it, with or without
+-## modifications, as long as this notice is preserved.
+-
+-# serial 48 AC_PROG_LIBTOOL
+-
+-
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+-         [],
+-         [m4_define([AC_PROVIDE_IFELSE],
+-	         [m4_ifdef([AC_PROVIDE_$1],
+-		           [$2], [$3])])])
++#
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++m4_define([_LT_COPYING], [dnl
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++#   This file is part of GNU Libtool.
++#
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
++#
++# GNU Libtool is distributed in the hope that 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 GNU Libtool; see the file COPYING.  If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++])
+ 
++# serial 56 LT_INIT
+ 
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-    [AC_LIBTOOL_CXX],
+-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+-  ])])
+-dnl And a similar setup for Fortran 77 support
+-  AC_PROVIDE_IFELSE([AC_PROG_F77],
+-    [AC_LIBTOOL_F77],
+-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
+-
+-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+-    [AC_LIBTOOL_GCJ],
+-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+-      [AC_LIBTOOL_GCJ],
+-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+-	[AC_LIBTOOL_GCJ],
+-      [ifdef([AC_PROG_GCJ],
+-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([A][M_PROG_GCJ],
+-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([LT_AC_PROG_GCJ],
+-	     [define([LT_AC_PROG_GCJ],
+-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+-])])# AC_PROG_LIBTOOL
+ 
++# LT_PREREQ(VERSION)
++# ------------------
++# Complain and exit if this libtool version is less that VERSION.
++m4_defun([LT_PREREQ],
++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
++       [m4_default([$3],
++		   [m4_fatal([Libtool version $1 or higher is required],
++		             63)])],
++       [$2])])
+ 
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++
++# _LT_CHECK_BUILDDIR
++# ------------------
++# Complain if the absolute build directory name contains unusual characters
++m4_defun([_LT_CHECK_BUILDDIR],
++[case `pwd` in
++  *\ * | *\	*)
++    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
++esac
++])
++
++
++# LT_INIT([OPTIONS])
++# ------------------
++AC_DEFUN([LT_INIT],
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++AC_BEFORE([$0], [LT_LANG])dnl
++AC_BEFORE([$0], [LT_OUTPUT])dnl
++AC_BEFORE([$0], [LTDL_INIT])dnl
++m4_require([_LT_CHECK_BUILDDIR])dnl
++
++dnl Autoconf doesn't catch unexpanded LT_ macros by default:
++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
++dnl unless we require an AC_DEFUNed macro:
++AC_REQUIRE([LTOPTIONS_VERSION])dnl
++AC_REQUIRE([LTSUGAR_VERSION])dnl
++AC_REQUIRE([LTVERSION_VERSION])dnl
++AC_REQUIRE([LTOBSOLETE_VERSION])dnl
++m4_require([_LT_PROG_LTMAIN])dnl
++
++dnl Parse OPTIONS
++_LT_SET_OPTIONS([$0], [$1])
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) $(top_builddir)'
++LIBTOOL="$LIBTOOL/$host_alias-libtool"
+ AC_SUBST(LIBTOOL)dnl
+ 
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
++_LT_SETUP
+ 
++# Only expand once:
++m4_define([LT_INIT])
++])# LT_INIT
++
++# Old names:
++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
++dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+ 
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++m4_defun([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_FILEUTILS_DEFAULTS
++# ----------------------
++# It is okay to use these file commands and assume they have been set
++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
++m4_defun([_LT_FILEUTILS_DEFAULTS],
++[: ${CP="cp -f"}
++: ${MV="mv -f"}
++: ${RM="rm -f"}
++])# _LT_FILEUTILS_DEFAULTS
++
++
++# _LT_SETUP
++# ---------
++m4_defun([_LT_SETUP],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++_LT_DECL([], [host_alias], [0], [The host system])dnl
++_LT_DECL([], [host], [0])dnl
++_LT_DECL([], [host_os], [0])dnl
++dnl
++_LT_DECL([], [build_alias], [0], [The build system])dnl
++_LT_DECL([], [build], [0])dnl
++_LT_DECL([], [build_os], [0])dnl
++dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+-
++AC_REQUIRE([LT_PATH_LD])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++dnl
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
++test -z "$LN_S" && LN_S="ln -s"
++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+ dnl
++AC_REQUIRE([LT_CMD_MAX_LEN])dnl
++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
++dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_CMD_RELOAD])dnl
++m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CMD_OLD_ARCHIVE])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++
++_LT_CONFIG_LIBTOOL_INIT([
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes INIT.
++if test -n "\${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
++])
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
+ 
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
++_LT_CHECK_OBJDIR
+ 
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
++m4_require([_LT_TAG_COMPILER])dnl
++_LT_PROG_ECHO_BACKSLASH
+ 
+ case $host_os in
+ aix3*)
+@@ -117,6307 +196,6803 @@ esac
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+ 
+ # Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+ 
+ # Sed substitution to delay expansion of an escaped shell variable in a
+ # double_quote_subst'ed string.
+ delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
+ # Sed substitution to avoid accidental globbing in evaled expressions
+ no_glob_subst='s/\*/\\\*/g'
+ 
+-# Constants:
+-rm="rm -f"
+-
+ # Global variables:
+-default_ofile=libtool
++ofile=${host_alias}-libtool
+ can_build_shared=yes
+ 
+ # All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+ old_CC="$CC"
+ old_CFLAGS="$CFLAGS"
+ 
+ # Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
+ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
+-
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+-    ;;
+-  *)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
+-
+ _LT_CC_BASENAME([$compiler])
+ 
+ # Only perform the check for file, if the check method requires it
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    AC_PATH_MAGIC
++    _LT_PATH_MAGIC
+   fi
+   ;;
+ esac
+ 
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
+-
+-AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Use C for the default configuration in the libtool script
++LT_SUPPORTED_TAG([CC])
++_LT_LANG_C_CONFIG
++_LT_LANG_DEFAULT_CONFIG
++_LT_CONFIG_COMMANDS
++])# _LT_SETUP
+ 
+-AC_ARG_WITH([pic],
+-    [AC_HELP_STRING([--with-pic],
+-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+-    [pic_mode="$withval"],
+-    [pic_mode=default])
+-test -z "$pic_mode" && pic_mode=default
+ 
+-# Use C for the default configuration in the libtool script
+-tagname=
+-AC_LIBTOOL_LANG_C_CONFIG
+-_LT_AC_TAGCONFIG
+-])# AC_LIBTOOL_SETUP
++# _LT_PROG_LTMAIN
++# ---------------
++# Note that this code is called both from `configure', and `config.status'
++# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
++# `config.status' has no value for ac_aux_dir unless we are using Automake,
++# so we pass a copy along to make sure it has a sensible value anyway.
++m4_defun([_LT_PROG_LTMAIN],
++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
++ltmain="$ac_aux_dir/ltmain.sh"
++])# _LT_PROG_LTMAIN
+ 
+ 
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
++## ------------------------------------- ##
++## Accumulate code for creating libtool. ##
++## ------------------------------------- ##
++
++# So that we can recreate a full libtool script including additional
++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
++# in macros and then make a single call at the end using the `libtool'
++# label.
++
++
++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
++# ----------------------------------------
++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL_INIT],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_INIT])
++
++
++# _LT_CONFIG_LIBTOOL([COMMANDS])
++# ------------------------------
++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
++
++
++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
++# -----------------------------------------------------
++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
++[_LT_CONFIG_LIBTOOL([$1])
++_LT_CONFIG_LIBTOOL_INIT([$2])
++])
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++# _LT_FORMAT_COMMENT([COMMENT])
++# -----------------------------
++# Add leading comment marks to the start of each line, and a trailing
++# full-stop to the whole comment if one is not present already.
++m4_define([_LT_FORMAT_COMMENT],
++[m4_ifval([$1], [
++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
++              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
++)])
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
+ 
+ 
+-# _LT_CC_BASENAME(CC)
+-# -------------------
+-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+-AC_DEFUN([_LT_CC_BASENAME],
+-[for cc_temp in $1""; do
+-  case $cc_temp in
+-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+-    \-*) ;;
+-    *) break;;
+-  esac
+-done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++## ------------------------ ##
++## FIXME: Eliminate VARNAME ##
++## ------------------------ ##
++
++
++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
++# -------------------------------------------------------------------
++# CONFIGNAME is the name given to the value in the libtool script.
++# VARNAME is the (base) name used in the configure script.
++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
++# VARNAME.  Any other value will be used directly.
++m4_define([_LT_DECL],
++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
++    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
++	[m4_ifval([$1], [$1], [$2])])
++    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
++    m4_ifval([$4],
++	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
++    lt_dict_add_subkey([lt_decl_dict], [$2],
++	[tagged?], [m4_ifval([$5], [yes], [no])])])
+ ])
+ 
+ 
+-# _LT_COMPILER_BOILERPLATE
+-# ------------------------
+-# Check for compiler boilerplate output or warnings with
+-# the simple compiler test code.
+-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_compiler_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_COMPILER_BOILERPLATE
+-
++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
++# --------------------------------------------------------
++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
++
++
++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_tag_varnames],
++[_lt_decl_filter([tagged?], [yes], $@)])
++
++
++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
++# ---------------------------------------------------------
++m4_define([_lt_decl_filter],
++[m4_case([$#],
++  [0], [m4_fatal([$0: too few arguments: $#])],
++  [1], [m4_fatal([$0: too few arguments: $#: $1])],
++  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
++  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
++  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
++])
+ 
+-# _LT_LINKER_BOILERPLATE
+-# ----------------------
+-# Check for linker boilerplate output or warnings with
+-# the simple link test code.
+-AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+-_lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
+-])# _LT_LINKER_BOILERPLATE
+ 
++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
++# --------------------------------------------------
++m4_define([lt_decl_quote_varnames],
++[_lt_decl_filter([value], [1], $@)])
++
++
++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_dquote_varnames],
++[_lt_decl_filter([value], [2], $@)])
++
++
++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_varnames_tagged],
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++     m4_quote(m4_if([$2], [],
++		     m4_quote(lt_decl_tag_varnames),
++		  m4_quote(m4_shift($@)))),
++     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
++m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
++
++
++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_all_varnames],
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++     m4_if([$2], [],
++	   m4_quote(lt_decl_varnames),
++	m4_quote(m4_shift($@))))[]dnl
++])
++m4_define([_lt_decl_all_varnames],
++[lt_join($@, lt_decl_varnames_tagged([$1],
++			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
++])
+ 
+-# _LT_AC_SYS_LIBPATH_AIX
+-# ----------------------
+-# Links a minimal program and checks the executable
+-# for the system default hardcoded library path. In most cases,
+-# this is /usr/lib:/lib, but when the MPI compilers are used
+-# the location of the communication and MPI libs are included too.
+-# If we don't find anything, use the default library path according
+-# to the aix ld manual.
+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-])# _LT_AC_SYS_LIBPATH_AIX
+ 
++# _LT_CONFIG_STATUS_DECLARE([VARNAME])
++# ------------------------------------
++# Quote a variable value, and forward it to `config.status' so that its
++# declaration there will have the same value as in `configure'.  VARNAME
++# must have a single quote delimited value for this to work.
++m4_define([_LT_CONFIG_STATUS_DECLARE],
++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+ 
+-# _LT_AC_SHELL_INIT(ARG)
+-# ----------------------
+-AC_DEFUN([_LT_AC_SHELL_INIT],
+-[ifdef([AC_DIVERSION_NOTICE],
+-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+-	 [AC_DIVERT_PUSH(NOTICE)])
+-$1
+-AC_DIVERT_POP
+-])# _LT_AC_SHELL_INIT
+ 
++# _LT_CONFIG_STATUS_DECLARATIONS
++# ------------------------------
++# We delimit libtool config variables with single quotes, so when
++# we write them to config.status, we have to be sure to quote all
++# embedded single quotes properly.  In configure, this macro expands
++# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
++#
++#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
++    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+ 
+-# _LT_AC_PROG_ECHO_BACKSLASH
+-# --------------------------
+-# Add some code to the start of the generated configure script which
+-# will find an echo command which doesn't interpret backslashes.
+-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[_LT_AC_SHELL_INIT([
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-case X$ECHO in
+-X*--fallback-echo)
+-  # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+-  ;;
+-esac
++# _LT_LIBTOOL_TAGS
++# ----------------
++# Output comment and list of tags supported by the script
++m4_defun([_LT_LIBTOOL_TAGS],
++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
++available_tags="_LT_TAGS"dnl
++])
+ 
+-echo=${ECHO-echo}
+-if test "X[$]1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X[$]1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $echo works!
+-  :
+-else
+-  # Restart under the correct shell.
+-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-fi
+ 
+-if test "X[$]1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-[$]*
+-EOF
+-  exit 0
+-fi
++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
++# -----------------------------------
++# Extract the dictionary values for VARNAME (optionally with TAG) and
++# expand to a commented shell variable setting:
++#
++#    # Some comment about what VAR is for.
++#    visible_name=$lt_internal_name
++m4_define([_LT_LIBTOOL_DECLARE],
++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
++					   [description])))[]dnl
++m4_pushdef([_libtool_name],
++    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
++    [0], [_libtool_name=[$]$1],
++    [1], [_libtool_name=$lt_[]$1],
++    [2], [_libtool_name=$lt_[]$1],
++    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
++])
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+-       echo_test_string=`eval $cmd` &&
+-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+-    then
+-      break
+-    fi
+-  done
+-fi
++# _LT_LIBTOOL_CONFIG_VARS
++# -----------------------
++# Produce commented declarations of non-tagged libtool config variables
++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
++# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
++# section) are produced by _LT_LIBTOOL_TAG_VARS.
++m4_defun([_LT_LIBTOOL_CONFIG_VARS],
++[m4_foreach([_lt_var],
++    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+ 
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
+ 
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for dir in $PATH /usr/ucb; do
+-    IFS="$lt_save_ifs"
+-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      echo="$dir/echo"
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++# _LT_LIBTOOL_TAG_VARS(TAG)
++# -------------------------
++m4_define([_LT_LIBTOOL_TAG_VARS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+ 
+-  if test "X$echo" = Xecho; then
+-    # We didn't find a better echo, so look for alternatives.
+-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      # This shell has a builtin print -r that does the trick.
+-      echo='print -r'
+-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+-      # If we have ksh, try running configure again with it.
+-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-      export ORIGINAL_CONFIG_SHELL
+-      CONFIG_SHELL=/bin/ksh
+-      export CONFIG_SHELL
+-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-    else
+-      # Try using printf.
+-      echo='printf %s\n'
+-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-	 test "X$echo_testing_string" = "X$echo_test_string"; then
+-	# Cool, printf works
+-	:
+-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	export CONFIG_SHELL
+-	SHELL="$CONFIG_SHELL"
+-	export SHELL
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      else
+-	# maybe with a smaller string...
+-	prev=:
+ 
+-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+-	  then
+-	    break
+-	  fi
+-	  prev="$cmd"
+-	done
++# _LT_TAGVAR(VARNAME, [TAGNAME])
++# ------------------------------
++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+ 
+-	if test "$prev" != 'sed 50q "[$]0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
+-      fi
+-    fi
+-  fi
+-fi
+-fi
+ 
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+-fi
++# _LT_CONFIG_COMMANDS
++# -------------------
++# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
++# variables for single and double quote escaping we saved from calls
++# to _LT_DECL, we can put quote escaped variables declarations
++# into `config.status', and then the shell code to quote escape them in
++# for loops in `config.status'.  Finally, any additional code accumulated
++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
++m4_defun([_LT_CONFIG_COMMANDS],
++[AC_PROVIDE_IFELSE([LT_OUTPUT],
++	dnl If the libtool generation code has been placed in $CONFIG_LT,
++	dnl instead of duplicating it all over again into config.status,
++	dnl then we will have config.status run $CONFIG_LT later, so it
++	dnl needs to know what name is stored there:
++        [AC_CONFIG_COMMANDS([libtool],
++            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
++    dnl If the libtool generation code is destined for config.status,
++    dnl expand the accumulated commands and init code now:
++    [AC_CONFIG_COMMANDS([libtool],
++        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
++])#_LT_CONFIG_COMMANDS
+ 
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
+ 
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
++[
+ 
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
+-[AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *ELF-32*)
+-      HPUX_IA64_MODE="32"
+-      ;;
+-    *ELF-64*)
+-      HPUX_IA64_MODE="64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-   if test "$lt_cv_prog_gnu_ld" = yes; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -melf32bsmip"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -melf32bmipn32"
++sed_quote_subst='$sed_quote_subst'
++double_quote_subst='$double_quote_subst'
++delay_variable_subst='$delay_variable_subst'
++_LT_CONFIG_STATUS_DECLARATIONS
++LTCC='$LTCC'
++LTCFLAGS='$LTCFLAGS'
++compiler='$compiler_DEFAULT'
++
++# Quote evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_quote_varnames); do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+       ;;
+-    *64-bit*)
+-      LD="${LD-ld} -melf64bmip"
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+       ;;
+     esac
+-   else
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
++done
++
++# Double-quote double-evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_dquote_varnames); do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+       ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+       ;;
+     esac
+-   fi
+-  fi
+-  rm -rf conftest*
++done
++
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\[$]0 --fallback-echo"')dnl "
++  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+   ;;
++esac
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.o` in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*linux*|powerpc64-*linux*)
+-          LD="${LD-ld} -m elf32ppclinux"
+-          ;;
+-        s390x-*linux*)
+-          LD="${LD-ld} -m elf_s390"
+-          ;;
+-        sparc64-*linux*)
+-          LD="${LD-ld} -m elf32_sparc"
+-          ;;
+-      esac
+-      ;;
+-    *64-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          LD="${LD-ld} -m elf64_s390"
+-          ;;
+-        sparc*-*linux*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++_LT_OUTPUT_LIBTOOL_INIT
++])
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_PUSH(C)
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_POP])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-sparc*-*solaris*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.o` in
+-    *64-bit*)
+-      case $lt_cv_prog_gnu_ld in
+-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+ 
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-  ;;
+-  ])
+-esac
++# LT_OUTPUT
++# ---------
++# This macro allows early generation of the libtool script (before
++# AC_OUTPUT is called), incase it is used in configure for compilation
++# tests.
++AC_DEFUN([LT_OUTPUT],
++[: ${CONFIG_LT=./config.lt}
++AC_MSG_NOTICE([creating $CONFIG_LT])
++cat >"$CONFIG_LT" <<_LTEOF
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate a libtool stub with the current configuration.
++
++lt_cl_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++AS_SHELL_SANITIZE
++_AS_PREPARE
+ 
+-need_locks="$enable_libtool_lock"
++exec AS_MESSAGE_FD>&1
++exec AS_MESSAGE_LOG_FD>>config.log
++{
++  echo
++  AS_BOX([Running $as_me.])
++} >&AS_MESSAGE_LOG_FD
++
++lt_cl_help="\
++\`$as_me' creates a local libtool stub from the current configuration,
++for use in further configure time tests before the real libtool is
++generated.
++
++Usage: $[0] [[OPTIONS]]
++
++  -h, --help      print this help, then exit
++  -V, --version   print version number, then exit
++  -q, --quiet     do not print progress messages
++  -d, --debug     don't remove temporary files
++
++Report bugs to <bug-libtool@gnu.org>."
++
++lt_cl_version="\
++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
++configured by $[0], generated by m4_PACKAGE_STRING.
++
++Copyright (C) 2008 Free Software Foundation, Inc.
++This config.lt script is free software; the Free Software Foundation
++gives unlimited permision to copy, distribute and modify it."
+ 
+-])# _LT_AC_LOCK
++while test $[#] != 0
++do
++  case $[1] in
++    --version | --v* | -V )
++      echo "$lt_cl_version"; exit 0 ;;
++    --help | --h* | -h )
++      echo "$lt_cl_help"; exit 0 ;;
++    --debug | --d* | -d )
++      debug=: ;;
++    --quiet | --q* | --silent | --s* | -q )
++      lt_cl_silent=: ;;
+ 
++    -*) AC_MSG_ERROR([unrecognized option: $[1]
++Try \`$[0] --help' for more information.]) ;;
+ 
+-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ----------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+-[AC_REQUIRE([LT_AC_PROG_SED])
+-AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$3"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   if (exit $ac_status) && test -s "$ac_outfile"; then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings other than the usual output.
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-])
++    *) AC_MSG_ERROR([unrecognized argument: $[1]
++Try \`$[0] --help' for more information.]) ;;
++  esac
++  shift
++done
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$5], , :, [$5])
+-else
+-    ifelse([$6], , :, [$6])
++if $lt_cl_silent; then
++  exec AS_MESSAGE_FD>/dev/null
+ fi
+-])# AC_LIBTOOL_COMPILER_OPTION
+-
+-
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The linker can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
+-         $2=yes
+-       fi
+-     else
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-])
++_LTEOF
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$4], , :, [$4])
+-else
+-    ifelse([$5], , :, [$5])
++cat >>"$CONFIG_LT" <<_LTEOF
++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++AC_MSG_NOTICE([creating $ofile])
++_LT_OUTPUT_LIBTOOL_COMMANDS
++AS_EXIT(0)
++_LTEOF
++chmod +x "$CONFIG_LT"
++
++# configure is writing to config.log, but config.lt does its own redirection,
++# appending to config.log, which fails on DOS, as config.log is still kept
++# open by configure.  Here we exec the FD to /dev/null, effectively closing
++# config.log, so it can be properly (re)opened and appended to by config.lt.
++if test "$no_create" != yes; then
++  lt_cl_success=:
++  test "$silent" = yes &&
++    lt_config_lt_args="$lt_config_lt_args --quiet"
++  exec AS_MESSAGE_LOG_FD>/dev/null
++  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
++  exec AS_MESSAGE_LOG_FD>>config.log
++  $lt_cl_success || AS_EXIT(1)
+ fi
+-])# AC_LIBTOOL_LINKER_OPTION
+-
++])# LT_OUTPUT
+ 
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+-  i=0
+-  teststring="ABCD"
+ 
+-  case $build_os in
+-  msdosdjgpp*)
+-    # On DJGPP, this test can blow up pretty badly due to problems in libc
+-    # (any single argument exceeding 2000 bytes causes a buffer overrun
+-    # during glob expansion).  Even if it were fixed, the result of this
+-    # check would be larger than it should be.
+-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+-    ;;
++# _LT_CONFIG(TAG)
++# ---------------
++# If TAG is the built-in tag, create an initial libtool script with a
++# default configuration from the untagged config vars.  Otherwise add code
++# to config.status for appending the configuration named by TAG from the
++# matching tagged config vars.
++m4_defun([_LT_CONFIG],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++_LT_CONFIG_SAVE_COMMANDS([
++  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
++  m4_if(_LT_TAG, [C], [
++    # See if we are running on zsh, and set the options which allow our
++    # commands through without removal of \ escapes.
++    if test -n "${ZSH_VERSION+set}" ; then
++      setopt NO_GLOB_SUBST
++    fi
+ 
+-  gnu*)
+-    # Under GNU Hurd, this test is not required because there is
+-    # no limit to the length of command line arguments.
+-    # Libtool will interpret -1 as no limit whatsoever
+-    lt_cv_sys_max_cmd_len=-1;
+-    ;;
++    cfgfile="${ofile}T"
++    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
++    $RM "$cfgfile"
+ 
+-  cygwin* | mingw*)
+-    # On Win9x/ME, this test blows up -- it succeeds, but takes
+-    # about 5 minutes as the teststring grows exponentially.
+-    # Worse, since 9x/ME are not pre-emptively multitasking,
+-    # you end up with a "frozen" computer, even though with patience
+-    # the test eventually succeeds (with a max line length of 256k).
+-    # Instead, let's just punt: use the minimum linelength reported by
+-    # all of the supported platforms: 8192 (on NT/2K/XP).
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++    cat <<_LT_EOF >> "$cfgfile"
++#! $SHELL
+ 
+-  amigaos*)
+-    # On AmigaOS with pdksh, this test takes hours, literally.
+-    # So we just punt and use a minimum line length of 8192.
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++_LT_COPYING
++_LT_LIBTOOL_TAGS
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+-    # This has been around since 386BSD, at least.  Likely further.
+-    if test -x /sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+-    elif test -x /usr/sbin/sysctl; then
+-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+-    else
+-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+-    fi
+-    # And add a safety zone
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+-    ;;
++# ### BEGIN LIBTOOL CONFIG
++_LT_LIBTOOL_CONFIG_VARS
++_LT_LIBTOOL_TAG_VARS
++# ### END LIBTOOL CONFIG
+ 
+-  interix*)
+-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+-    lt_cv_sys_max_cmd_len=196608
+-    ;;
++_LT_EOF
+ 
+-  osf*)
+-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+-    # nice to cause kernel panics so lets avoid the loop below.
+-    # First set a reasonable default.
+-    lt_cv_sys_max_cmd_len=16384
+-    #
+-    if test -x /sbin/sysconfig; then
+-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+-      esac
+-    fi
+-    ;;
+-  sco3.2v5*)
+-    lt_cv_sys_max_cmd_len=102400
+-    ;;
+-  sysv5* | sco5v6* | sysv4.2uw2*)
+-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+-    if test -n "$kargmax"; then
+-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+-    else
+-      lt_cv_sys_max_cmd_len=32768
+-    fi
+-    ;;
+-  *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+-	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++  case $host_os in
++  aix3*)
++    cat <<\_LT_EOF >> "$cfgfile"
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++_LT_EOF
+     ;;
+   esac
+-])
+-if test -n $lt_cv_sys_max_cmd_len ; then
+-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+-else
+-  AC_MSG_RESULT(none)
+-fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
++  _LT_PROG_LTMAIN
+ 
+-# _LT_AC_CHECK_DLFCN
+-# ------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
+ 
++  _LT_PROG_XSI_SHELLFNS
+ 
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ---------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "$cross_compiling" = yes; then :
+-  [$4]
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-[#line __oline__ "configure"
+-#include "confdefs.h"
++  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
++    || (rm -f "$cfgfile"; exit 1)
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++  mv -f "$cfgfile" "$ofile" ||
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++],
++[cat <<_LT_EOF >> "$ofile"
+ 
+-#include <stdio.h>
++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
++dnl in a comment (ie after a #).
++# ### BEGIN LIBTOOL TAG CONFIG: $1
++_LT_LIBTOOL_TAG_VARS(_LT_TAG)
++# ### END LIBTOOL TAG CONFIG: $1
++_LT_EOF
++])dnl /m4_if
++],
++[m4_if([$1], [], [
++    PACKAGE='$PACKAGE'
++    VERSION='$VERSION'
++    TIMESTAMP='$TIMESTAMP'
++    RM='$RM'
++    ofile='$ofile'], [])
++])dnl /_LT_CONFIG_SAVE_COMMANDS
++])# _LT_CONFIG
++
++
++# LT_SUPPORTED_TAG(TAG)
++# ---------------------
++# Trace this macro to discover what tags are supported by the libtool
++# --tag option, using:
++#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
++AC_DEFUN([LT_SUPPORTED_TAG], [])
++
++
++# C support is built-in for now
++m4_define([_LT_LANG_C_enabled], [])
++m4_define([_LT_TAGS], [])
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
++# LT_LANG(LANG)
++# -------------
++# Enable libtool support for the given language if not already enabled.
++AC_DEFUN([LT_LANG],
++[AC_BEFORE([$0], [LT_OUTPUT])dnl
++m4_case([$1],
++  [C],			[_LT_LANG(C)],
++  [C++],		[_LT_LANG(CXX)],
++  [Java],		[_LT_LANG(GCJ)],
++  [Fortran 77],		[_LT_LANG(F77)],
++  [Fortran],		[_LT_LANG(FC)],
++  [Windows Resource],	[_LT_LANG(RC)],
++  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
++    [_LT_LANG($1)],
++    [m4_fatal([$0: unsupported language: "$1"])])])dnl
++])# LT_LANG
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
+-
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
+-  else
+-    puts (dlerror ());
++# _LT_LANG(LANGNAME)
++# ------------------
++m4_defun([_LT_LANG],
++[m4_ifdef([_LT_LANG_]$1[_enabled], [],
++  [LT_SUPPORTED_TAG([$1])dnl
++  m4_append([_LT_TAGS], [$1 ])dnl
++  m4_define([_LT_LANG_]$1[_enabled], [])dnl
++  _LT_LANG_$1_CONFIG($1)])dnl
++])# _LT_LANG
+ 
+-    exit (status);
+-}]
+-EOF
+-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) $1 ;;
+-      x$lt_dlneed_uscore) $2 ;;
+-      x$lt_dlunknown|x*) $3 ;;
+-    esac
+-  else :
+-    # compilation failed
+-    $3
+-  fi
+-fi
+-rm -fr conftest*
+-])# _LT_AC_TRY_DLOPEN_SELF
+ 
++# _LT_LANG_DEFAULT_CONFIG
++# -----------------------
++m4_defun([_LT_LANG_DEFAULT_CONFIG],
++[AC_PROVIDE_IFELSE([AC_PROG_CXX],
++  [LT_LANG(CXX)],
++  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
++
++AC_PROVIDE_IFELSE([AC_PROG_F77],
++  [LT_LANG(F77)],
++  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
++
++AC_PROVIDE_IFELSE([AC_PROG_FC],
++  [LT_LANG(FC)],
++  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
++
++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
++dnl pulling things in needlessly.
++AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++  [LT_LANG(GCJ)],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++    [LT_LANG(GCJ)],
++    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
++      [LT_LANG(GCJ)],
++      [m4_ifdef([AC_PROG_GCJ],
++	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
++       m4_ifdef([A][M_PROG_GCJ],
++	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
++       m4_ifdef([LT_PROG_GCJ],
++	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
++
++AC_PROVIDE_IFELSE([LT_PROG_RC],
++  [LT_LANG(RC)],
++  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
++])# _LT_LANG_DEFAULT_CONFIG
++
++# Obsolete macros:
++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
++dnl AC_DEFUN([AC_LIBTOOL_F77], [])
++dnl AC_DEFUN([AC_LIBTOOL_FC], [])
++dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+ 
+-# AC_LIBTOOL_DLOPEN_SELF
+-# ----------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
++# _LT_TAG_COMPILER
++# ----------------
++m4_defun([_LT_TAG_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ])
+-   ;;
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
+-  *)
+-    AC_CHECK_FUNC([shl_load],
+-	  [lt_cv_dlopen="shl_load"],
+-      [AC_CHECK_LIB([dld], [shl_load],
+-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+-	[AC_CHECK_FUNC([dlopen],
+-	      [lt_cv_dlopen="dlopen"],
+-	  [AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+-	    [AC_CHECK_LIB([svld], [dlopen],
+-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+-	      [AC_CHECK_LIB([dld], [dld_link],
+-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+-	      ])
+-	    ])
+-	  ])
+-	])
+-      ])
+-    ;;
+-  esac
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_TAG_COMPILER
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++m4_defun([_LT_COMPILER_BOILERPLATE],
++[m4_require([_LT_DECL_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$RM conftest*
++])# _LT_COMPILER_BOILERPLATE
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++m4_defun([_LT_LINKER_BOILERPLATE],
++[m4_require([_LT_DECL_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$RM -r conftest*
++])# _LT_LINKER_BOILERPLATE
+ 
+-    AC_CACHE_CHECK([whether a program can dlopen itself],
+-	  lt_cv_dlopen_self, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++# _LT_REQUIRED_DARWIN_CHECKS
++# -------------------------
++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
++  case $host_os in
++    rhapsody* | darwin*)
++    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++    AC_CHECK_TOOL([LIPO], [lipo], [:])
++    AC_CHECK_TOOL([OTOOL], [otool], [:])
++    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
++    _LT_DECL([], [DSYMUTIL], [1],
++      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
++    _LT_DECL([], [NMEDIT], [1],
++      [Tool to change global to local symbols on Mac OS X])
++    _LT_DECL([], [LIPO], [1],
++      [Tool to manipulate fat objects and archives on Mac OS X])
++    _LT_DECL([], [OTOOL], [1],
++      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
++    _LT_DECL([], [OTOOL64], [1],
++      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
++
++    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++      [lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++	# By default we will add the -single_module flag. You can override
++	# by either setting the environment variable LT_MULTI_MODULE
++	# non-empty at configure time, or by adding -multi_module to the
++	# link flags.
++	rm -rf libconftest.dylib*
++	echo "int foo(void){return 1;}" > conftest.c
++	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
++	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
++        _lt_result=$?
++	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++	  lt_cv_apple_cc_single_mod=yes
++	else
++	  cat conftest.err >&AS_MESSAGE_LOG_FD
++	fi
++	rm -rf libconftest.dylib*
++	rm -f conftest.*
++      fi])
++    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++      [lt_cv_ld_exported_symbols_list],
++      [lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++	[lt_cv_ld_exported_symbols_list=yes],
++	[lt_cv_ld_exported_symbols_list=no])
++	LDFLAGS="$save_LDFLAGS"
+     ])
+-
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+-    	  lt_cv_dlopen_self_static, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+-      ])
++    case $host_os in
++    rhapsody* | darwin1.[[012]])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*) # darwin 5.x on 
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it? 
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++	10.[[012]]*)
++	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++	10.*)
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    fi
++    if test "$DSYMUTIL" != ":"; then
++      _lt_dsymutil='~$DSYMUTIL $lib || :'
++    else
++      _lt_dsymutil=
+     fi
+-
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+     ;;
+   esac
++])
+ 
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_DLOPEN_SELF
++# _LT_DARWIN_LINKER_FEATURES
++# --------------------------
++# Checks for linker and compiler features on darwin
++m4_defun([_LT_DARWIN_LINKER_FEATURES],
++[
++  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
++  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++  _LT_TAGVAR(hardcode_direct, $1)=no
++  _LT_TAGVAR(hardcode_automatic, $1)=yes
++  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++  _LT_TAGVAR(link_all_deplibs, $1)=yes
++  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++  if test "$GCC" = "yes"; then
++    output_verbose_link_cmd=echo
++    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    m4_if([$1], [CXX],
++[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++    fi
++],[])
++  else
++  _LT_TAGVAR(ld_shlibs, $1)=no
++  fi
++])
+ 
++# _LT_SYS_MODULE_PATH_AIX
++# -----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++m4_defun([_LT_SYS_MODULE_PATH_AIX],
++[m4_require([_LT_DECL_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_SYS_MODULE_PATH_AIX
+ 
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+-# ---------------------------------
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+-   then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-     fi
+-   fi
+-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+-   $rm conftest*
+-   # SGI C++ compiler will create directory out/ii_files/ for
+-   # template instantiation
+-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+-   $rm out/* && rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
+-])
+-])# AC_LIBTOOL_PROG_CC_C_O
++# _LT_SHELL_INIT(ARG)
++# -------------------
++m4_define([_LT_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_SHELL_INIT
+ 
+ 
+-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+-# -----------------------------------------
+-# Check to see if we can do hard links to lock some files if needed
+-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+-[AC_REQUIRE([_LT_AC_LOCK])dnl
++# _LT_PROG_ECHO_BACKSLASH
++# -----------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++m4_defun([_LT_PROG_ECHO_BACKSLASH],
++[_LT_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-hard_links="nottested"
+-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  AC_MSG_CHECKING([if we can lock with hard links])
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  AC_MSG_RESULT([$hard_links])
+-  if test "$hard_links" = no; then
+-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+-    need_locks=warn
+-  fi
++case X$lt_ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++ECHO=${lt_ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $ECHO works!
++  :
+ else
+-  need_locks=no
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ fi
+-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+-
+-# AC_LIBTOOL_OBJDIR
+-# -----------------
+-AC_DEFUN([AC_LIBTOOL_OBJDIR],
+-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+-[rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  lt_cv_objdir=.libs
+-else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  lt_cv_objdir=_libs
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<_LT_EOF
++[$]*
++_LT_EOF
++  exit 0
+ fi
+-rmdir .libs 2>/dev/null])
+-objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_OBJDIR
+ 
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+-# ----------------------------------------------
+-# Check hardcoding attributes.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+-[AC_MSG_CHECKING([how to hardcode library paths into programs])
+-_LT_AC_TAGVAR(hardcode_action, $1)=
+-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+-
+-  # We can hardcode non-existant directories.
+-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++if test -z "$lt_ECHO"; then
++  if test "X${echo_test_string+set}" != Xset; then
++    # find a string as large as possible, as long as the shell can cope with it
++    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++      then
++        break
++      fi
++    done
+   fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+-fi
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++     test "X$echo_testing_string" = "X$echo_test_string"; then
++    :
++  else
++    # The Solaris, AIX, and Digital Unix default echo programs unquote
++    # backslashes.  This makes it impossible to quote backslashes using
++    #   echo "$something" | sed 's/\\/\\\\/g'
++    #
++    # So, first we look for a working echo in the user's PATH.
+ 
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for dir in $PATH /usr/ucb; do
++      IFS="$lt_save_ifs"
++      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        ECHO="$dir/echo"
++        break
++      fi
++    done
++    IFS="$lt_save_ifs"
+ 
+-# AC_LIBTOOL_SYS_LIB_STRIP
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+-[striplib=
+-old_striplib=
+-AC_MSG_CHECKING([whether stripping libraries is possible])
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  AC_MSG_RESULT([yes])
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         AC_MSG_RESULT([yes])
+-       else
+-  AC_MSG_RESULT([no])
+-fi
+-       ;;
+-   *)
+-  AC_MSG_RESULT([no])
+-    ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_SYS_LIB_STRIP
++    if test "X$ECHO" = Xecho; then
++      # We didn't find a better echo, so look for alternatives.
++      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
++         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
++         test "X$echo_testing_string" = "X$echo_test_string"; then
++        # This shell has a builtin print -r that does the trick.
++        ECHO='print -r'
++      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
++	   test "X$CONFIG_SHELL" != X/bin/ksh; then
++        # If we have ksh, try running configure again with it.
++        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++        export ORIGINAL_CONFIG_SHELL
++        CONFIG_SHELL=/bin/ksh
++        export CONFIG_SHELL
++        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++      else
++        # Try using printf.
++        ECHO='printf %s\n'
++        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	  # Cool, printf works
++	  :
++        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	  export CONFIG_SHELL
++	  SHELL="$CONFIG_SHELL"
++	  export SHELL
++	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	     test "X$echo_testing_string" = 'X\t' &&
++	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	     test "X$echo_testing_string" = "X$echo_test_string"; then
++	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
++        else
++	  # maybe with a smaller string...
++	  prev=:
+ 
++	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
++	    then
++	      break
++	    fi
++	    prev="$cmd"
++	  done
+ 
+-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-# -----------------------------
+-# PORTME Fill in your ld.so characteristics
+-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext_cmds=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++	  if test "$prev" != 'sed 50q "[$]0"'; then
++	    echo_test_string=`eval $prev`
++	    export echo_test_string
++	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	  else
++	    # Oops.  We lost completely, so just stick with echo.
++	    ECHO=echo
++	  fi
++        fi
++      fi
++    fi
+   fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+ 
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++lt_ECHO=$ECHO
++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
++AC_SUBST(lt_ECHO)
++])
++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
++_LT_DECL([], [ECHO], [1],
++    [An echo program that does not interpret backslashes])
++])# _LT_PROG_ECHO_BACKSLASH
+ 
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[[01]] | aix4.[[01]].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
+-      else
+-	can_build_shared=no
+-      fi
+-      ;;
++# _LT_ENABLE_LOCK
++# ---------------
++m4_defun([_LT_ENABLE_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++  [AS_HELP_STRING([--disable-libtool-lock],
++    [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++      *ELF-32*)
++	HPUX_IA64_MODE="32"
++	;;
++      *ELF-64*)
++	HPUX_IA64_MODE="64"
++	;;
+     esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    if test "$lt_cv_prog_gnu_ld" = yes; then
++      case `/usr/bin/file conftest.$ac_objext` in
++	*32-bit*)
++	  LD="${LD-ld} -melf32bsmip"
++	  ;;
++	*N32*)
++	  LD="${LD-ld} -melf32bmipn32"
++	  ;;
++	*64-bit*)
++	  LD="${LD-ld} -melf64bmip"
++	;;
++      esac
+     else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
++      case `/usr/bin/file conftest.$ac_objext` in
++	*32-bit*)
++	  LD="${LD-ld} -32"
++	  ;;
++	*N32*)
++	  LD="${LD-ld} -n32"
++	  ;;
++	*64-bit*)
++	  LD="${LD-ld} -64"
++	  ;;
++      esac
+     fi
+-    shlibpath_var=LIBPATH
+   fi
++  rm -rf conftest*
+   ;;
+ 
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++      *32-bit*)
++	case $host in
++	  x86_64-*kfreebsd*-gnu)
++	    LD="${LD-ld} -m elf_i386_fbsd"
++	    ;;
++	  x86_64-*linux*)
++	    LD="${LD-ld} -m elf_i386"
++	    ;;
++	  ppc64-*linux*|powerpc64-*linux*)
++	    LD="${LD-ld} -m elf32ppclinux"
++	    ;;
++	  s390x-*linux*)
++	    LD="${LD-ld} -m elf_s390"
++	    ;;
++	  sparc64-*linux*)
++	    LD="${LD-ld} -m elf32_sparc"
++	    ;;
++	esac
++	;;
++      *64-bit*)
++	case $host in
++	  x86_64-*kfreebsd*-gnu)
++	    LD="${LD-ld} -m elf_x86_64_fbsd"
++	    ;;
++	  x86_64-*linux*)
++	    LD="${LD-ld} -m elf_x86_64"
++	    ;;
++	  ppc*-*linux*|powerpc*-*linux*)
++	    LD="${LD-ld} -m elf64ppc"
++	    ;;
++	  s390*-*linux*|s390*-*tpf*)
++	    LD="${LD-ld} -m elf64_s390"
++	    ;;
++	  sparc*-*linux*)
++	    LD="${LD-ld} -m elf64_sparc"
++	    ;;
++	esac
++	;;
++    esac
++  fi
++  rm -rf conftest*
+   ;;
+ 
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
+   ;;
+-
+-bsdi[[45]]*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)
++	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
+   ;;
++esac
+ 
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext_cmds=".dll"
+-  need_version=no
+-  need_lib_prefix=no
++need_locks="$enable_libtool_lock"
++])# _LT_ENABLE_LOCK
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname~
+-      chmod a+x \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
+ 
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
+-      ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      ;;
+-    esac
+-    ;;
++# _LT_CMD_OLD_ARCHIVE
++# -------------------
++m4_defun([_LT_CMD_OLD_ARCHIVE],
++[AC_CHECK_TOOL(AR, ar, false)
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1])
++
++AC_CHECK_TOOL(STRIP, strip, :)
++test -z "$STRIP" && STRIP=:
++_LT_DECL([], [STRIP], [1], [A symbol stripping program])
++
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++test -z "$RANLIB" && RANLIB=:
++_LT_DECL([], [RANLIB], [1],
++    [Commands used to install an old-style archive])
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
+   *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++_LT_DECL([], [old_postinstall_cmds], [2])
++_LT_DECL([], [old_postuninstall_cmds], [2])
++_LT_TAGDECL([], [old_archive_cmds], [2],
++    [Commands used to build an old-style archive])
++])# _LT_CMD_OLD_ARCHIVE
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
+ 
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([_LT_COMPILER_OPTION],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       $2=yes
++     fi
++   fi
++   $RM conftest*
++])
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
++if test x"[$]$2" = xyes; then
++    m4_if([$5], , :, [$5])
++else
++    m4_if([$6], , :, [$6])
++fi
++])# _LT_COMPILER_OPTION
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
++# Old name:
++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+ 
+-freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
+-  if test -x /usr/bin/objformat; then
+-    objformat=`/usr/bin/objformat`
+-  else
+-    case $host_os in
+-    freebsd[[123]]*) objformat=aout ;;
+-    *) objformat=elf ;;
+-    esac
+-  fi
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
+-      ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
++
++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                  [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------
++# Check whether the given linker option works
++AC_DEFUN([_LT_LINKER_OPTION],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
++     else
++       $2=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    m4_if([$4], , :, [$4])
++else
++    m4_if([$5], , :, [$5])
++fi
++])# _LT_LINKER_OPTION
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
++
++
++# LT_CMD_MAX_LEN
++#---------------
++AC_DEFUN([LT_CMD_MAX_LEN],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+     ;;
+-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
+     ;;
+-  freebsd*) # from 4.6 on
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
+     ;;
+-  esac
+-  ;;
+ 
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  case $host_cpu in
+-  ia64*)
+-    shrext_cmds='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+     else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+     fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
+-   hppa*64*)
+-     shrext_cmds='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
+-    shrext_cmds='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+     ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
+ 
+-interix3*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  ;;
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
+     ;;
+   *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      # Make teststring a little bigger before we do anything with it.
++      # a 1K string should be a reasonable start.
++      for i in 1 2 3 4 5 6 7 8 ; do
++        teststring=$teststring$teststring
++      done
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      # If test is not a shell built-in, we'll probably end up computing a
++      # maximum length that is only half of the actual maximum length, but
++      # we can't tell.
++      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
++	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      # Only check the string length outside the loop.
++      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on
++      # massive amounts of additional arguments before passing them to the
++      # linker.  It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++max_cmd_len=$lt_cv_sys_max_cmd_len
++_LT_DECL([], [max_cmd_len], [0],
++    [What is the maximum length of a command?])
++])# LT_CMD_MAX_LEN
+ 
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
++# Old name:
++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+ 
+-# This must be Linux ELF.
+-linux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
+ 
+-  # Append ld.so.conf contents to the search path
+-  if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+-  fi
++# _LT_HEADER_DLFCN
++# ----------------
++m4_defun([_LT_HEADER_DLFCN],
++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
++])# _LT_HEADER_DLFCN
+ 
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
+ 
+-knetbsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ----------------------------------------------------------------
++m4_defun([_LT_TRY_DLOPEN_SELF],
++[m4_require([_LT_HEADER_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<_LT_EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
+ 
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++#include <stdio.h>
+ 
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
+-openbsd*)
+-  version_type=sunos
+-  sys_lib_dlsearch_path_spec="/usr/lib"
+-  need_lib_prefix=no
+-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+-  case $host_os in
+-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+-    *)                         need_version=no  ;;
+-  esac
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[[89]] | openbsd2.[[89]].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
+   else
+-    shlibpath_overrides_runpath=yes
++    puts (dlerror ());
++
++    exit (status);
++}]
++_LT_EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_dlunknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
+   fi
+-  ;;
++fi
++rm -fr conftest*
++])# _LT_TRY_DLOPEN_SELF
+ 
+-os2*)
+-  libname_spec='$name'
+-  shrext_cmds=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+ 
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
++# LT_SYS_DLOPEN_SELF
++# ------------------
++AC_DEFUN([LT_SYS_DLOPEN_SELF],
++[m4_require([_LT_HEADER_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
+ 
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
+ 
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++    ;;
+ 
+-sysv4 | sysv4.3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++    ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++    ;;
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  version_type=freebsd-elf
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  if test "$with_gnu_ld" = yes; then
+-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
++  *)
++    AC_CHECK_FUNC([shl_load],
++	  [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
+   else
+-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+-    shlibpath_overrides_runpath=yes
+-    case $host_os in
+-      sco3.2v5*)
+-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+-	;;
+-    esac
++    enable_dlopen=no
+   fi
+-  sys_lib_dlsearch_path_spec='/usr/lib'
+-  ;;
+-
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-AC_MSG_RESULT([$dynamic_linker])
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-
+ 
+-# _LT_AC_TAGCONFIG
+-# ----------------
+-AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
+-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+-        [include additional configurations @<:@automatic@:>@])],
+-    [tagnames="$withval"])
+-
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
+-    AC_MSG_WARN([output file `$ofile' does not exist])
+-  fi
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
+-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+-    else
+-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+-    fi
+-  fi
+-  if test -z "$LTCFLAGS"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+-  fi
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+-    "") ;;
+-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+-	;;
+-    esac
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
+ 
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
+-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++	  lt_cv_dlopen_self_static, [dnl
++	  _LT_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
+     fi
+ 
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
+-
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-	    (test "X$CXX" != "Xg++"))) ; then
+-	  AC_LIBTOOL_LANG_CXX_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+-	  AC_LIBTOOL_LANG_F77_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+-
+-      RC)
+-	AC_LIBTOOL_LANG_RC_CONFIG
+-	;;
+-
+-      *)
+-	AC_MSG_ERROR([Unsupported tag name: $tagname])
+-	;;
+-      esac
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
+ 
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
+ 
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
+-  else
+-    rm -f "${ofile}T"
+-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+-  fi
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
+ fi
+-])# _LT_AC_TAGCONFIG
++_LT_DECL([dlopen_support], [enable_dlopen], [0],
++	 [Whether dlopen is supported])
++_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
++	 [Whether dlopen of programs is supported])
++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
++	 [Whether dlopen of statically linked programs is supported])
++])# LT_SYS_DLOPEN_SELF
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+ 
+ 
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
++# _LT_COMPILER_C_O([TAGNAME])
++# ---------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler.
++# This macro does not hard code the compiler like AC_PROG_CC_C_O.
++m4_defun([_LT_COMPILER_C_O],
++[m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_TAG_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
++])
++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
++	[Does compiler simultaneously support -c and -o options?])
++])# _LT_COMPILER_C_O
+ 
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
+ 
++# _LT_COMPILER_FILE_LOCKS([TAGNAME])
++# ----------------------------------
++# Check to see if we can do hard links to lock some files if needed
++m4_defun([_LT_COMPILER_FILE_LOCKS],
++[m4_require([_LT_ENABLE_LOCK])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++_LT_COMPILER_C_O([$1])
+ 
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
+-
+-
+-# AC_DISABLE_SHARED
+-# -----------------
+-# set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
+-
+-
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
+-
+-
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
+-
+-
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_fast_install=yes ;;
+-    no) enable_fast_install=no ;;
+-    *)
+-      enable_fast_install=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_fast_install=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
+-
+-
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
+-
+-
+-# AC_LIBTOOL_PICMODE([MODE])
+-# --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
+-
+-
+-# AC_PROG_EGREP
+-# -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
+-
+-
+-# AC_PATH_TOOL_PREFIX
+-# -------------------
+-# find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-[[\\/*] |  ?:[\\/]*])
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+-  ;;
+-*)
+-  lt_save_MAGIC_CMD="$MAGIC_CMD"
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    $EGREP "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++hard_links="nottested"
++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $RM conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
++])# _LT_COMPILER_FILE_LOCKS
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+-  ;;
+-esac])
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  AC_MSG_RESULT($MAGIC_CMD)
++# _LT_CHECK_OBJDIR
++# ----------------
++m4_defun([_LT_CHECK_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
+ else
+-  AC_MSG_RESULT(no)
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
+ fi
+-])# AC_PATH_TOOL_PREFIX
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++_LT_DECL([], [objdir], [0],
++         [The name of the directory that contains temporary libtool files])dnl
++m4_pattern_allow([LT_OBJDIR])dnl
++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
++  [Define to the sub-directory in which libtool stores uninstalled libraries.])
++])# _LT_CHECK_OBJDIR
+ 
+ 
+-# AC_PATH_MAGIC
+-# -------------
+-# find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
++# --------------------------------------
++# Check hardcoding attributes.
++m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
++   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
++   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++
++  # We can hardcode non-existent directories.
++  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
++    # Linking always hardcodes the temporary library directory.
++    _LT_TAGVAR(hardcode_action, $1)=relink
+   else
+-    MAGIC_CMD=:
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    _LT_TAGVAR(hardcode_action, $1)=immediate
+   fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  _LT_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
++
++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
++   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
+ fi
+-])# AC_PATH_MAGIC
++_LT_TAGDECL([], [hardcode_action], [0],
++    [How to hardcode a shared library path into an executable])
++])# _LT_LINKER_HARDCODE_LIBPATH
+ 
+ 
+-# AC_PROG_LD
+-# ----------
+-# find the pathname to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH([gnu-ld],
+-    [AC_HELP_STRING([--with-gnu-ld],
+-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+-    [test "$withval" = no || with_gnu_ld=yes],
+-    [with_gnu_ld=no])
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by $CC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [[\\/]]* | ?:[[\\/]]*)
+-      re_direlt='/[[^/]][[^/]]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
++# _LT_CMD_STRIPLIB
++# ----------------
++m4_defun([_LT_CMD_STRIPLIB],
++[m4_require([_LT_DECL_EGREP])
++striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++  darwin*)
++    if test -n "$STRIP" ; then
++      striplib="$STRIP -x"
++      old_striplib="$STRIP -S"
++      AC_MSG_RESULT([yes])
++    else
++      AC_MSG_RESULT([no])
++    fi
+     ;;
+   *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
++    AC_MSG_RESULT([no])
+     ;;
+   esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
+-else
+-  AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(lt_cv_path_LD,
+-[if test -z "$LD"; then
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some variants of GNU ld only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+-      *GNU* | *'with BFD'*)
+-	test "$with_gnu_ld" != no && break
+-	;;
+-      *)
+-	test "$with_gnu_ld" != yes && break
+-	;;
+-      esac
++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
++_LT_DECL([], [striplib], [1])
++])# _LT_CMD_STRIPLIB
++
++
++# _LT_SYS_DYNAMIC_LINKER([TAG])
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++m4_defun([_LT_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
++m4_if([$1],
++	[], [
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+     fi
+   done
+-  IFS="$lt_save_ifs"
++  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ else
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi])
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])# AC_PROG_LD
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-# AC_PROG_LD_GNU
+-# --------------
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+-  lt_cv_prog_gnu_ld=yes
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+-*)
+-  lt_cv_prog_gnu_ld=no
+-  ;;
+-esac])
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+-])# AC_PROG_LD_GNU
+-
+ 
+-# AC_PROG_LD_RELOAD_FLAG
+-# ----------------------
+-# find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+-[AC_CACHE_CHECK([for $LD option to reload object files],
+-  lt_cv_ld_reload_flag,
+-  [lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-case $host_os in
+-  darwin*)
+-    if test "$GCC" = yes; then
+-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++aix[[4-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     else
+-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
+     fi
+-    ;;
+-esac
+-])# AC_PROG_LD_RELOAD_FLAG
+-
+-
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
+-# how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++    shlibpath_var=LIBPATH
++  fi
++  ;;
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
++amigaos*)
++  case $host_cpu in
++  powerpc)
++    # Since July 2007 AmigaOS4 officially supports .so libraries.
++    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    ;;
++  m68k)
++    library_names_spec='$libname.ixlibrary $libname.a'
++    # Create ${libname}_ixlibrary.a entries in /sys/libs.
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    ;;
++  esac
+   ;;
+ 
+ beos*)
+-  lt_cv_deplibs_check_method=pass_all
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+ bsdi[[45]]*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
+-
+-cygwin*)
+-  # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='func_win32_libid'
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
+   ;;
+ 
+-mingw* | pw32*)
+-  # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
+ 
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname~
++      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++      fi'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-hpux10.20* | hpux11*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  case $host_cpu in
+-  ia64*)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+-    ;;
+-  hppa*64*)
+-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
++
+   *)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+   esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
+   ;;
+ 
+-interix3*)
+-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $LD in
+-  *-32|*"-32 ") libmagic=32-bit;;
+-  *-n32|*"-n32 ") libmagic=N32;;
+-  *-64|*"-64 ") libmagic=64-bit;;
+-  *) libmagic=never-match;;
+-  esac
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+-  fi
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+-newos6*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
++freebsd1*)
++  dynamic_linker=no
+   ;;
+ 
+-openbsd*)
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
+   fi
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sysv4 | sysv4.3*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  sequent)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
+     ;;
+-  sni)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+-    lt_cv_file_magic_test_file=/lib/libc.so
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
+     ;;
+-  siemens)
+-    lt_cv_deplibs_check_method=pass_all
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
+     ;;
+-  pc)
+-    lt_cv_deplibs_check_method=pass_all
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
+     ;;
+   esac
+   ;;
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
+   ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-])# AC_DEPLIBS_CHECK_METHOD
+ 
+-
+-# AC_PROG_NM
+-# ----------
+-# find the pathname to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  lt_cv_path_NM="$NM"
+-else
+-  lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+-    lt_nm_to_check="$lt_nm_to_check nm"
+-  fi
+-  for lt_tmp_nm in $lt_nm_to_check; do
+-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+-      IFS="$lt_save_ifs"
+-      test -z "$ac_dir" && ac_dir=.
+-      tmp_nm="$ac_dir/$lt_tmp_nm"
+-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-	# Check to see if the nm accepts a BSD-compat flag.
+-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-	#   nm: unknown option "B" ignored
+-	# Tru64's nm complains that /dev/null is an invalid object file
+-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null* | *'Invalid file or object type'*)
+-	  lt_cv_path_NM="$tmp_nm -B"
+-	  break
+-	  ;;
+-	*)
+-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	  */dev/null*)
+-	    lt_cv_path_NM="$tmp_nm -p"
+-	    break
+-	    ;;
+-	  *)
+-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	    continue # so that we can try to find one that supports BSD flags
+-	    ;;
+-	  esac
+-	  ;;
+-	esac
+-      fi
+-    done
+-    IFS="$lt_save_ifs"
+-  done
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
+-
+-
+-# AC_CHECK_LIBM
+-# -------------
+-# check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+-  # These system don't have libm, or don't need it
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, cos, LIBM="-lm")
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++  hppa*64*)
++    shrext_cmds='.sl'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++  *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
+   ;;
+-esac
+-])# AC_CHECK_LIBM
+ 
++interix[[3-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+-# (note the single quotes!).  If your package is not flat and you're not
+-# using automake, define top_builddir and top_srcdir appropriately in
+-# the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
+   esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+-
+-
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that
+-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+-# and an installed libltdl is not found, it is assumed to be `libltdl'.
+-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and top_srcdir
+-# appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, lt_dlinit,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
+-  fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # Some binutils ld are patched to set DT_RUNPATH
++  save_LDFLAGS=$LDFLAGS
++  save_libdir=$libdir
++  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
++       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
++  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
++       [shlibpath_overrides_runpath=yes])])
++  LDFLAGS=$save_LDFLAGS
++  libdir=$save_libdir
+ 
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+-# _LT_AC_PROG_CXXCPP
+-# ------------------
+-AC_DEFUN([_LT_AC_PROG_CXXCPP],
+-[
+-AC_REQUIRE([AC_PROG_CXX])
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
+-  AC_PROG_CXXCPP
+-fi
+-])# _LT_AC_PROG_CXXCPP
+-
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
+-
+-
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
+-
+-
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+-
+-
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+-
+-
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-# Source file extension for C test sources.
+-ac_ext=c
++*nto* | *qnx*)
++  version_type=qnx
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='ldqnx.so'
++  ;;
+ 
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++openbsd*)
++  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
++    *)				need_version=no  ;;
++  esac
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[[89]] | openbsd2.[[89]].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-_LT_AC_SYS_COMPILER
++rdos*)
++  dynamic_linker=no
++  ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF
+-
+-# Report which library types will actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
++sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
+   fi
+   ;;
+ 
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
+   fi
+-    ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+-
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
+-
+-
+-# AC_LIBTOOL_LANG_CXX_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+-[AC_LANG_PUSH(C++)
+-AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-
+-# Dependencies to place before and after the object being linked:
+-_LT_AC_TAGVAR(predep_objects, $1)=
+-_LT_AC_TAGVAR(postdep_objects, $1)=
+-_LT_AC_TAGVAR(predeps, $1)=
+-_LT_AC_TAGVAR(postdeps, $1)=
+-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+-
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
+-
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++tpf*)
++  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
+-  $as_unset lt_cv_prog_gnu_ld
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+-if test -n "${lt_cv_path_LDCXX+set}"; then
+-  lt_cv_path_LD=$lt_cv_path_LDCXX
+-else
+-  $as_unset lt_cv_path_LD
++ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-else
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+ 
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
+-
+-  AC_PROG_LD
+-
+-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+-  # archiving commands below assume that GNU ld is being used.
+-  if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+-    #     investigate it a little bit more. (MM)
+-    wlarc='${wl}'
+-
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+-	grep 'no-whole-archive' > /dev/null; then
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    else
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-  else
+-    with_gnu_ld=no
+-    wlarc=
+-
+-    # A generic and very simple default shared library creation
+-    # command for GNU C++ for the case where it uses the native
+-    # linker, instead of GNU ld.  If possible, this setting should
+-    # overridden to take advantage of the native linker features on
+-    # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-  fi
+-
+-  # Commands to make compiler produce verbose output that lists
+-  # what "hidden" libraries, object files and flags are used when
+-  # linking a shared library.
+-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+-
+-else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
+-fi
++_LT_DECL([], [variables_saved_for_relink], [1],
++    [Variables whose values should be saved in libtool wrapper scripts and
++    restored at link time])
++_LT_DECL([], [need_lib_prefix], [0],
++    [Do we need the "lib" prefix for modules?])
++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
++_LT_DECL([], [version_type], [0], [Library versioning type])
++_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
++_LT_DECL([], [shlibpath_overrides_runpath], [0],
++    [Is shlibpath searched before the hard-coded library search path?])
++_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
++_LT_DECL([], [library_names_spec], [1],
++    [[List of archive names.  First name is the real one, the rest are links.
++    The last name is the one that the linker finds with -lNAME]])
++_LT_DECL([], [soname_spec], [1],
++    [[The coded name of the library, if different from the real name]])
++_LT_DECL([], [postinstall_cmds], [2],
++    [Command to use after installation of a shared archive])
++_LT_DECL([], [postuninstall_cmds], [2],
++    [Command to use after uninstallation of a shared archive])
++_LT_DECL([], [finish_cmds], [2],
++    [Commands used to finish a libtool library installation in a directory])
++_LT_DECL([], [finish_eval], [1],
++    [[As "finish_cmds", except a single script fragment to be evaled but
++    not shown]])
++_LT_DECL([], [hardcode_into_libs], [0],
++    [Whether we should hardcode library paths into libraries])
++_LT_DECL([], [sys_lib_search_path_spec], [2],
++    [Compile-time system search path for libraries])
++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
++    [Run-time system search path for libraries])
++])# _LT_SYS_DYNAMIC_LINKER
+ 
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
+-	    ;;
+-	  esac
+-	done
+-	;;
+-      esac
+-
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
++# _LT_PATH_TOOL_PREFIX(TOOL)
++# --------------------------
++# find a file program which can recognize shared library
++AC_DEFUN([_LT_PATH_TOOL_PREFIX],
++[m4_require([_LT_DECL_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="m4_if([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<_LT_EOF 1>&2
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+-
+-    _LT_AC_TAGVAR(archive_cmds, $1)=''
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
+ 
+-    if test "$GXX" = yes; then
+-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-      # We only want to do this on AIX 4.2 and lower, the check
+-      # below for broken collect2 doesn't work under 4.3+
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	else
+-	  # We have old collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	fi
+-	;;
+-      esac
+-      shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
+-	shared_flag="$shared_flag "'${wl}-G'
+-      fi
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-	# chokes on -Wl,-G. The following line is correct:
+-	shared_flag='-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
++_LT_EOF
++	  fi ;;
++	esac
+       fi
++      break
+     fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++_LT_DECL([], [MAGIC_CMD], [0],
++	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
++])# _LT_PATH_TOOL_PREFIX
+ 
+-    # It seems that -bexpall does not export symbols beginning with
+-    # underscore (_), so it is better to generate a list of symbols to export.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-      # Determine the default libpath from the value encoded in an empty executable.
+-      _LT_AC_SYS_LIBPATH_AIX
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++# Old name:
++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+ 
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-     else
+-      if test "$host_cpu" = ia64; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds its shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-      fi
+-    fi
+-    ;;
+ 
+-  beos*)
+-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-    ;;
++# _LT_PATH_MAGIC
++# --------------
++# find a file program which can recognize a shared library
++m4_defun([_LT_PATH_MAGIC],
++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# _LT_PATH_MAGIC
+ 
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-
+-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      # If the export-symbols file already is a .def file (1st line
+-      # is EXPORTS), use it as is; otherwise, prepend...
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname.def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname.def;
+-	cat $export_symbols >> $output_objdir/$soname.def;
+-      fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-  ;;
+-      darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
+-      output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
+-      fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      else
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
+-      fi
+-        ;;
++# LT_PATH_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([LT_PATH_LD],
++[AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_DECL_EGREP])dnl
+ 
+-  dgux*)
+-    case $cc_basename in
+-      ec++*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      ghcx*)
+-	# Green Hills C++ Compiler
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  freebsd[[12]]*)
+-    # C++ shared libraries reported to be fairly broken before switch to ELF
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  freebsd-elf*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  hpux9*)
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-				# but as the default
+-				# location of the library.
+-
+-    case $cc_basename in
+-    CC*)
+-      # FIXME: insert proper C++ library support
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    aCC*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      # Commands to make compiler produce verbose output that lists
+-      # what "hidden" libraries, object files and flags are used when
+-      # linking a shared library.
+-      #
+-      # There doesn't appear to be a way to prevent this compiler from
+-      # explicitly linking system object files so we need to strip them
+-      # from the output so that they don't get included in the library
+-      # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-      ;;
+-    *)
+-      if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-        # FIXME: insert proper C++ library support
+-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
+-    ;;
+-  hpux10*|hpux11*)
+-    if test $with_gnu_ld = no; then
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++AC_ARG_WITH([gnu-ld],
++    [AS_HELP_STRING([--with-gnu-ld],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])dnl
+ 
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-        ;;
+-      *)
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-        ;;
+-      esac
+-    fi
+-    case $host_cpu in
+-    hppa*64*|ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    *)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
++      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
+       ;;
+-    esac
+-
+-    case $cc_basename in
+-      CC*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      aCC*)
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	esac
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
+-	    case $host_cpu in
+-	    hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    ia64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    esac
+-	  fi
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  interix3*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-    # Instead, shared libraries are loaded at an image base (0x10000000 by
+-    # default) and relocated if they conflict, which is a slow very memory
+-    # consuming and fragmenting process.  To avoid this, we pick a random,
+-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-    ;;
+-  irix5* | irix6*)
+-    case $cc_basename in
+-      CC*)
+-	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+-	  fi
+-	fi
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-	;;
+-    esac
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
+     ;;
+-  linux*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-	;;
+-      icpc*)
+-	# Intel C++
+-	with_gnu_ld=yes
+-	# version 8.0 and above of icpc choke on multiply defined symbols
+-	# if we add $predep_objects and $postdep_objects, however 7.1 and
+-	# earlier do not add the objects themselves.
+-	case `$CC -V 2>&1` in
+-	*"Version 7."*)
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	*)  # Version 8.0 or newer
+-	  tmp_idyn=
+-	  case $host_cpu in
+-	    ia64*) tmp_idyn=' -i_dynamic';;
+-	  esac
+-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	  ;;
+-	esac
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	;;
+-      pgCC*)
+-        # Portland Group C++ compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-        ;;
+-      cxx*)
+-	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+-
+-	runpath_var=LD_RUN_PATH
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ C*)
+-	  # Sun C++ 5.9
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-
+-	  # Not sure whether something based on
+-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+-	  # would be better.
+-	  output_verbose_link_cmd='echo'
+-
+-	  # Archives containing C++ object files must be created using
+-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	  # necessary to make sure instantiated templates are included
+-	  # in the archive.
+-	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	  ;;
+-	esac
+-	;;
+-    esac
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
+     ;;
+-  lynxos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  m88k*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  mvs*)
+-    case $cc_basename in
+-      cxx*)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
+ 	;;
+       *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	test "$with_gnu_ld" != yes && break
+ 	;;
+-    esac
+-    ;;
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    fi
+-    # Workaround some broken pre-1.5 toolchains
+-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+-    ;;
+-  openbsd2*)
+-    # C++ shared libraries are fairly broken
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  openbsd*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      esac
+     fi
+-    output_verbose_link_cmd='echo'
+-    ;;
+-  osf3*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++_LT_PATH_LD_GNU
++AC_SUBST([LD])
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  osf4* | osf5*)
+-    case $cc_basename in
+-      KCC*)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Archives containing C++ object files must be created using
+-	# the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+-	;;
+-      RCC*)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx*)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+-	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+-	  $rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
++])# LT_PATH_LD
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  psos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  sunos4*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      lcc*)
+-	# Lucid
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
++# Old names:
++AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
++AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_PROG_LD], [])
++dnl AC_DEFUN([AC_PROG_LD], [])
++
++
++# _LT_PATH_LD_GNU
++#- --------------
++m4_defun([_LT_PATH_LD_GNU],
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# _LT_PATH_LD_GNU
++
++
++# _LT_CMD_RELOAD
++# --------------
++# find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++m4_defun([_LT_CMD_RELOAD],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
+     ;;
+-  solaris*)
+-    case $cc_basename in
+-      CC*)
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+-
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	case $host_os in
+-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+-	    ;;
+-	esac
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++esac
++_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
++_LT_DECL([], [reload_cmds], [2])dnl
++])# _LT_CMD_RELOAD
+ 
+-	output_verbose_link_cmd='echo'
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	;;
+-      gcx*)
+-	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++# _LT_CHECK_MAGIC_METHOD
++# ----------------------
++# how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++m4_defun([_LT_CHECK_MAGIC_METHOD],
++[m4_require([_LT_DECL_EGREP])
++AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+ 
+-	# The C++ compiler must be used to create the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	# GNU C++ compiler with Solaris linker
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++case $host_os in
++aix[[4-9]]*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  else
+-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  fi
++bsdi[[45]]*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+-	fi
+-	;;
+-    esac
+-    ;;
+-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    runpath_var='LD_RUN_PATH'
+-
+-    case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
+-    ;;
+-  sysv5* | sco3.2v5* | sco5v6*)
+-    # Note: We can NOT use -z defs as we might desire, because we do not
+-    # link with -lc, and that would cause any symbols used from libc to
+-    # always be unresolved, which means just about no library would
+-    # ever link correctly.  If we're not using GNU ld we use -z text
+-    # though, which does catch some bad symbols but isn't as heavy-handed
+-    # as -z defs.
+-    # For security reasons, it is highly recommended that you always
+-    # use absolute paths for naming shared libraries, and exclude the
+-    # DT_RUNPATH tag from executables and libraries.  But doing so
+-    # requires that you compile everything twice, which is a pain.
+-    # So that behaviour is only enabled if SCOABSPATH is set to a
+-    # non-empty value in the environment.  Most likely only useful for
+-    # creating official distributions of packages.
+-    # This is a hack until libtool officially supports absolute path
+-    # names for shared libraries.
+-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-    runpath_var='LD_RUN_PATH'
+-
+-    case $cc_basename in
+-      CC*)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	;;
+-    esac
+-    ;;
+-  tandem*)
+-    case $cc_basename in
+-      NCC*)
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
+     esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case $host_cpu in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+     ;;
+-  vxworks*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
+   *)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+-esac
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++  esac
++  ;;
+ 
+-_LT_AC_TAGVAR(GCC, $1)="$GXX"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
++interix[[3-9]]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+-AC_LIBTOOL_POSTDEP_PREDEP($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-AC_LANG_POP
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-with_gnu_ld=$lt_save_with_gnu_ld
+-lt_cv_path_LDCXX=$lt_cv_path_LD
+-lt_cv_path_LD=$lt_save_path_LD
+-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-])# AC_LIBTOOL_LANG_CXX_CONFIG
++netbsd*)
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++  fi
++  ;;
+ 
+-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------------------
+-# Figure out "hidden" library dependencies from verbose
+-# compiler output when linking a shared library.
+-# Parse the compiler output and extract the necessary
+-# objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+-dnl we can't use the lt_simple_compile_test_code here,
+-dnl because it contains code intended for an executable,
+-dnl not a library.  It's possible we should let each
+-dnl tag define a new lt_????_link_test_code variable,
+-dnl but it's only used here...
+-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+-int a;
+-void foo (void) { a = 0; }
+-EOF
+-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
+-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+-      subroutine foo
+-      implicit none
+-      integer*4 a
+-      a=0
+-      return
+-      end
+-EOF
+-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+-public class foo {
+-  private int a;
+-  public void bar (void) {
+-    a = 0;
+-  }
+-};
+-EOF
+-])
+-dnl Parse the compiler output and extract the necessary
+-dnl objects, libraries and library flags.
+-if AC_TRY_EVAL(ac_compile); then
+-  # Parse the compiler output and extract the necessary
+-  # objects, libraries and library flags.
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
+ 
+-  # Sentinel used to keep track of whether or not we are before
+-  # the conftest object file.
+-  pre_test_object_deps_done=no
++*nto* | *qnx*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
+-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  fi
++  ;;
+ 
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $p in
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-    -L* | -R* | -l*)
+-       # Some compilers place space between "-{L,R}" and the path.
+-       # Remove the space.
+-       if test $p = "-L" \
+-	  || test $p = "-R"; then
+-	 prev=$p
+-	 continue
+-       else
+-	 prev=
+-       fi
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.3*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++tpf*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++_LT_DECL([], [deplibs_check_method], [1],
++    [Method to check whether dependent libraries are shared objects])
++_LT_DECL([], [file_magic_cmd], [1],
++    [Command to use when deplibs_check_method == "file_magic"])
++])# _LT_CHECK_MAGIC_METHOD
++
++
++# LT_PATH_NM
++# ----------
++# find the pathname to a BSD- or MS-compatible name lister
++AC_DEFUN([LT_PATH_NM],
++[AC_REQUIRE([AC_PROG_CC])dnl
++AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
++	  break
++	  ;;
++	*)
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
++	  ;;
++	esac
++      fi
++    done
++    IFS="$lt_save_ifs"
++  done
++  : ${lt_cv_path_NM=no}
++fi])
++if test "$lt_cv_path_NM" != "no"; then
++  NM="$lt_cv_path_NM"
++else
++  # Didn't find any BSD compatible name lister, look for dumpbin.
++  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
++  AC_SUBST([DUMPBIN])
++  if test "$DUMPBIN" != ":"; then
++    NM="$DUMPBIN"
++  fi
++fi
++test -z "$NM" && NM=nm
++AC_SUBST([NM])
++_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
++
++AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
++  [lt_cv_nm_interface="BSD nm"
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
++  (eval "$ac_compile" 2>conftest.err)
++  cat conftest.err >&AS_MESSAGE_LOG_FD
++  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
++  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
++  cat conftest.err >&AS_MESSAGE_LOG_FD
++  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
++  cat conftest.out >&AS_MESSAGE_LOG_FD
++  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
++    lt_cv_nm_interface="MS dumpbin"
++  fi
++  rm -f conftest*])
++])# LT_PATH_NM
++
++# Old names:
++AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
++AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_PROG_NM], [])
++dnl AC_DEFUN([AC_PROG_NM], [])
++
++
++# LT_LIB_M
++# --------
++# check for math library
++AC_DEFUN([LT_LIB_M],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
++  ;;
++esac
++AC_SUBST([LIBM])
++])# LT_LIB_M
++
++# Old name:
++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_CHECK_LIBM], [])
++
++
++# _LT_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------
++m4_defun([_LT_COMPILER_NO_RTTI],
++[m4_require([_LT_TAG_COMPILER])dnl
++
++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++
++if test "$GCC" = yes; then
++  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++
++  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
++	[Compiler flag to turn off builtin functions])
++])# _LT_COMPILER_NO_RTTI
++
++
++# _LT_CMD_GLOBAL_SYMBOLS
++# ----------------------
++m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++AC_REQUIRE([LT_PATH_LD])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_TAG_COMPILER])dnl
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
++
++# Transform an extracted symbol line into a proper C declaration.
++# Some systems (esp. on ia64) link data and code symbols differently,
++# so use this general approach.
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# Try without a prefix underscore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
++  # Write the raw and C identifiers.
++  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++    # Fake it for dumpbin and say T for any non-static function
++    # and D for any global variable.
++    # Also find C++ and __fastcall symbols from MSVC++,
++    # which start with @ or ?.
++    lt_cv_sys_global_symbol_pipe="$AWK ['"\
++"     {last_section=section; section=\$ 3};"\
++"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++"     \$ 0!~/External *\|/{next};"\
++"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
++"     {if(hide[section]) next};"\
++"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
++"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++"     ' prfx=^$ac_symprfx]"
++  else
++    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++  fi
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<_LT_EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(void);
++void nm_test_func(void){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++_LT_EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
++	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<_LT_EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++_LT_EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
++
++	  cat <<_LT_EOF >> conftest.$ac_ext
++
++/* The mapping between symbol names and symbols.  */
++const struct {
++  const char *name;
++  void       *address;
++}
++lt__PROGRAM__LTX_preloaded_symbols[[]] =
++{
++  { "@PROGRAM@", (void *) 0 },
++_LT_EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++	  cat <<\_LT_EOF >> conftest.$ac_ext
++  {0, (void *) 0}
++};
++
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt__PROGRAM__LTX_preloaded_symbols;
++}
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++_LT_EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++    fi
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -rf conftest* conftst*
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p in
+-	 -L* | -R*)
+-	   # Internal compiler library paths should come after those
+-	   # provided the user.  The postdeps already come after the
+-	   # user supplied libs so there is no need to process them.
+-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+-	   else
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+-	   fi
+-	   ;;
+-	 # The "-l" case would never come before the object being
+-	 # linked, so don't bother handling this case.
+-	 esac
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+-	 else
+-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+-	 fi
+-       fi
+-       ;;
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
+ 
+-    *.$objext)
+-       # This assumes that the test object file only shows up
+-       # once in the compiler output.
+-       if test "$p" = "conftest.$objext"; then
+-	 pre_test_object_deps_done=yes
+-	 continue
+-       fi
++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
++    [Take the output of nm and produce a listing of raw symbols and C names])
++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
++    [Transform the output of nm in a proper C declaration])
++_LT_DECL([global_symbol_to_c_name_address],
++    [lt_cv_sys_global_symbol_to_c_name_address], [1],
++    [Transform the output of nm in a C name address pair])
++_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
++    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
++    [Transform the output of nm in a C name address pair when lib prefix is needed])
++]) # _LT_CMD_GLOBAL_SYMBOLS
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+-	 fi
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+-	 fi
+-       fi
+-       ;;
+ 
+-    *) ;; # Ignore the rest.
++# _LT_COMPILER_PIC([TAGNAME])
++# ---------------------------
++m4_defun([_LT_COMPILER_PIC],
++[m4_require([_LT_TAG_COMPILER])dnl
++_LT_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_TAGVAR(lt_prog_compiler_static, $1)=
++
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++m4_if([$1], [CXX], [
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++        ;;
++      esac
++      ;;
++
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | cygwin* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++      ;;
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++    *qnx* | *nto*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++      ;;
++    *)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix[[4-9]]*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	else
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68*)
++	  # Green Hills C++ Compiler
++	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++      dgux*)
++	case $cc_basename in
++	  ec++*)
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  ghcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | dragonfly*)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    if test "$host_cpu" != ia64; then
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    fi
++	    ;;
++	  aCC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    case $host_cpu in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux* | k*bsd*-gnu)
++	case $cc_basename in
++	  KCC*)
++	    # KAI C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  icpc* | ecpc* )
++	    # Intel C++
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  pgCC* | pgcpp*)
++	    # Portland Group C++ compiler
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  xlc* | xlC*)
++	    # IBM XL 8.0 on PPC
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
++	    ;;
++	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	      ;;
++	    esac
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd*)
++	;;
++      *qnx* | *nto*)
++        # QNX uses GNU C++, but need to define -shared option too, otherwise
++        # it will coredump.
++        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++        ;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    ;;
++	  RCC*)
++	    # Rational C++ 2.4.1
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  cxx*)
++	    # Digital/Compaq C++
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	    ;;
++	  gcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.x
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  lcc*)
++	    # Lucid
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      vxworks*)
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
+     esac
+-  done
+-
+-  # Clean up.
+-  rm -f a.out a.exe
+-else
+-  echo "libtool.m4: error: problem compiling $1 test program"
+-fi
+-
+-$rm -f confest.$objext
+-
+-# PORTME: override above test on systems where it is broken
+-ifelse([$1],[CXX],
+-[case $host_os in
+-interix3*)
+-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+-  # hack all around it, let's just trust "g++" to DTRT.
+-  _LT_AC_TAGVAR(predep_objects,$1)=
+-  _LT_AC_TAGVAR(postdep_objects,$1)=
+-  _LT_AC_TAGVAR(postdeps,$1)=
+-  ;;
+-
+-linux*)
+-  case `$CC -V 2>&1 | sed 5q` in
+-  *Sun\ C*)
+-    # Sun C++ 5.9
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+-    ;;
+-  esac
+-  ;;
+-
+-solaris*)
+-  case $cc_basename in
+-  CC*)
+-    # Adding this requires a known-good setup of shared libraries for
+-    # Sun compiler versions before 5.6, else PIC objects from an old
+-    # archive will be linked into the output, leading to subtle bugs.
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
+-
+-case " $_LT_AC_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+-])# AC_LIBTOOL_POSTDEP_PREDEP
+-
+-# AC_LIBTOOL_LANG_F77_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+-[AC_REQUIRE([AC_PROG_F77])
+-AC_LANG_PUSH(Fortran 77)
+-
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-
+-# Source file extension for f77 test sources.
+-ac_ext=f
+-
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
+-
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+-
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+-
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+-
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+-
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+   fi
+-  ;;
+-aix4* | aix5*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-  ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+-
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+-
+-_LT_AC_TAGVAR(GCC, $1)="$G77"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+-
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_F77_CONFIG
+-
+-
+-# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+-[AC_LANG_SAVE
+-
+-# Source file extension for Java test sources.
+-ac_ext=java
++],
++[
++  if test "$GCC" = yes; then
++    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++        ;;
++      esac
++      ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
+ 
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+ 
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++      ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_GCJ_CONFIG
++    *)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
+ 
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
+ 
+-# AC_LIBTOOL_LANG_RC_CONFIG
+-# -------------------------
+-# Ensure that the configuration vars for the Windows resource compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+-[AC_LANG_SAVE
++    hpux9* | hpux10* | hpux11*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
+ 
+-# Source file extension for RC test sources.
+-ac_ext=rc
++    irix5* | irix6* | nonstopux*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++      icc* | ecc* | ifort*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
++      ccc*)
++        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      xl*)
++	# IBM XL C 8.0/Fortran 10.1 on PPC
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++    newsos6)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++      ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++    osf3* | osf4* | osf5*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++    rdos*)
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++    solaris*)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
++      ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++    sunos4*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_RC_CONFIG
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-# AC_LIBTOOL_CONFIG([TAGNAME])
+-# ----------------------------
+-# If TAGNAME is not passed, then create an initial libtool script
+-# with a default configuration from the untagged config vars.  Otherwise
+-# add code to config.status for appending the configuration named by
+-# TAGNAME from the matching tagged config vars.
+-AC_DEFUN([AC_LIBTOOL_CONFIG],
+-[# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+-    SED SHELL STRIP \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    _LT_AC_TAGVAR(compiler, $1) \
+-    _LT_AC_TAGVAR(CC, $1) \
+-    _LT_AC_TAGVAR(LD, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+-    _LT_AC_TAGVAR(predep_objects, $1) \
+-    _LT_AC_TAGVAR(postdep_objects, $1) \
+-    _LT_AC_TAGVAR(predeps, $1) \
+-    _LT_AC_TAGVAR(postdeps, $1) \
+-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+-    _LT_AC_TAGVAR(archive_cmds, $1) \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+-    _LT_AC_TAGVAR(module_cmds, $1) \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+-    _LT_AC_TAGVAR(include_expsyms, $1); do
+-
+-    case $var in
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++    unicos*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
++    uts4*)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
++
+     *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+     esac
+-  done
+-
+-  case $lt_echo in
+-  *'\[$]0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++  fi
++])
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     ;;
+-  esac
+-
+-ifelse([$1], [],
+-  [cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
+-  AC_MSG_NOTICE([creating $ofile])],
+-  [cfgfile="$ofile"])
+-
+-  cat <<__EOF__ >> "$cfgfile"
+-ifelse([$1], [],
+-[#! $SHELL
++  *)
++    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++	[How to pass a linker flag through the compiler])
+ 
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
++# Check to make sure the PIC flag actually works.
+ #
+-# This program is distributed in the hope that 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.
++if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
++    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
++    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
++	[Additional compiler flags for building library objects])
++
+ #
+-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# Check to make sure the static flag actually works.
+ #
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# A sed program that does not truncate output.
+-SED=$lt_SED
+-
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e 1s/^X//"
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-# The names of the tagged configurations supported by this script.
+-available_tags=
+-
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
++wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
++_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
++_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
++	[Compiler flag to prevent dynamic linking])
++])# _LT_COMPILER_PIC
+ 
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++# _LT_LINKER_SHLIBS([TAGNAME])
++# ----------------------------
++# See if the linker supports building shared libraries.
++m4_defun([_LT_LINKER_SHLIBS],
++[AC_REQUIRE([LT_PATH_LD])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++m4_require([_LT_TAG_COMPILER])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++m4_if([$1], [CXX], [
++  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix[[4-9]]*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++], [
++  runpath_var=
++  _LT_TAGVAR(allow_undefined_flag, $1)=
++  _LT_TAGVAR(always_export_symbols, $1)=no
++  _LT_TAGVAR(archive_cmds, $1)=
++  _LT_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_TAGVAR(compiler_needs_object, $1)=no
++  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  _LT_TAGVAR(hardcode_automatic, $1)=no
++  _LT_TAGVAR(hardcode_direct, $1)=no
++  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
++  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_TAGVAR(inherit_rpath, $1)=no
++  _LT_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_TAGVAR(module_cmds, $1)=
++  _LT_TAGVAR(module_expsym_cmds, $1)=
++  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
++  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_TAGVAR(whole_archive_flag_spec, $1)=
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
++  extract_expsyms_cmds=
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
+ 
+-# A C compiler.
+-LTCC=$lt_LTCC
++  _LT_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
++      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      _LT_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>&1` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
+ 
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix[[3-9]]*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++_LT_EOF
++      fi
++      ;;
+ 
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_expsym_cmds, $1)=''
++        ;;
++      m68k)
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++            _LT_TAGVAR(hardcode_minus_L, $1)=yes
++        ;;
++      esac
++      ;;
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
++    beos*)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++    cygwin* | mingw* | pw32*)
++      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_TAGVAR(always_export_symbols, $1)=no
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ 
+-# A symbol stripping program
+-STRIP=$lt_STRIP
++      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
++    interix[[3-9]]*)
++      _LT_TAGVAR(hardcode_direct, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++    gnu* | linux* | tpf* | k*bsd*-gnu)
++      tmp_diet=no
++      if test "$host_os" = linux-dietlibc; then
++	case $cc_basename in
++	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
++	esac
++      fi
++      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
++	 && test "$tmp_diet" = no
++      then
++	tmp_addflag=
++	tmp_sharedflag='-shared'
++	case $cc_basename,$host_cpu in
++        pgcc*)				# Portland Group C compiler
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
++	  tmp_sharedflag='-qmkshrobj'
++	  tmp_addflag= ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(compiler_needs_object, $1)=yes
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	esac
++	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
++        if test "x$supports_anon_versioning" = xyes; then
++          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
++	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	    echo "local: *; };" >> $output_objdir/$libname.ver~
++	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++        fi
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
++	case $cc_basename in
++	xlf*)
++	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++	  if test "x$supports_anon_versioning" = xyes; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
++	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	      echo "local: *; };" >> $output_objdir/$libname.ver~
++	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	  fi
++	  ;;
++	esac
++      else
++        _LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++    netbsd*)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
+ 
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
+ 
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
++_LT_EOF
++      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
+ 
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++_LT_EOF
++	;;
++	*)
++	  # For security reasons, it is highly recommended that you always
++	  # use absolute paths for naming shared libraries, and exclude the
++	  # DT_RUNPATH tag from executables and libraries.  But doing so
++	  # requires that you compile everything twice, which is a pain.
++	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  else
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
+ 
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
++    sunos4*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
++    *)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
++    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_TAGVAR(always_export_symbols, $1)=yes
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
+ 
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
++    aix[[4-9]]*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
++	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	  for ld_flag in $LDFLAGS; do
++	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	    aix_use_runtimelinking=yes
++	    break
++	  fi
++	  done
++	  ;;
++	esac
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++      _LT_TAGVAR(archive_cmds, $1)=''
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" &&
++	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
++	  then
++	  # We have reworked collect2
++	  :
++	  else
++	  # We have old collect2
++	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
++	fi
++      fi
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
++        # Determine the default libpath from the value encoded in an
++        # empty executable.
++        _LT_SYS_MODULE_PATH_AIX
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++      else
++	if test "$host_cpu" = ia64; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an
++	 # empty executable.
++	 _LT_SYS_MODULE_PATH_AIX
++	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_expsym_cmds, $1)=''
++        ;;
++      m68k)
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++            _LT_TAGVAR(hardcode_minus_L, $1)=yes
++        ;;
++      esac
++      ;;
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++    bsdi[[45]]*)
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++    darwin* | rhapsody*)
++      _LT_DARWIN_LINKER_FEATURES($1)
++      ;;
+ 
+-# Library versioning type.
+-version_type=$version_type
++    dgux*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++    freebsd1*)
++      _LT_TAGVAR(ld_shlibs, $1)=no
++      ;;
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_TAGVAR(hardcode_direct, $1)=yes
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      ;;
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
++	_LT_TAGVAR(hardcode_direct, $1)=yes
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	_LT_TAGVAR(hardcode_minus_L, $1)=yes
++      fi
++      ;;
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case $host_cpu in
++	hppa*64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++	case $host_cpu in
++	hppa*64*|ia64*)
++	  _LT_TAGVAR(hardcode_direct, $1)=no
++	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  ;;
++	*)
++	  _LT_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	esac
++      fi
++      ;;
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	# Try to use the -exported_symbol ld option, if it does not
++	# work, assume that -exports_file does not work either and
++	# implicitly export all symbols.
++        save_LDFLAGS="$LDFLAGS"
++        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++        AC_LINK_IFELSE(int foo(void) {},
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++        )
++        LDFLAGS="$save_LDFLAGS"
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++      fi
++      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_TAGVAR(inherit_rpath, $1)=yes
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++    netbsd*)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++    newsos6)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++    *nto* | *qnx*)
++      ;;
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++    openbsd*)
++      if test -f /usr/libexec/ld.so; then
++	_LT_TAGVAR(hardcode_direct, $1)=yes
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++	fi
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++    os2*)
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++    osf3*)
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      else
++	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
++	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++	# Both c and cxx compiler support -rpath directly
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++      fi
++      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
++    solaris*)
++      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++      else
++	case `$CC -V 2>&1` in
++	*"Compilers 5.0"*)
++	  wlarc=''
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++	  ;;
++	*)
++	  wlarc='${wl}'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++	  ;;
++	esac
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      case $host_os in
++      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
++      esac
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++    sysv4)
++      case $host_vendor in
++	sni)
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++	  _LT_TAGVAR(hardcode_direct, $1)=no
++        ;;
++	motorola)
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++    sysv4.3*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
++      ;;
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	_LT_TAGVAR(ld_shlibs, $1)=yes
++      fi
++      ;;
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++      if test "$GCC" = yes; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++    uts4*)
++      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++    *)
++      _LT_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    esac
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++    if test x$host_vendor = xsni; then
++      case $host in
++      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
++	;;
++      esac
++    fi
++  fi
++])
++AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
++_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
++_LT_DECL([], [extract_expsyms_cmds], [2],
++    [The commands to extract the exported symbol list from a shared archive])
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++#
++# Do we need to explicitly link libc?
++#
++case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++  # Assume -lc should be added
++  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $_LT_TAGVAR(archive_cmds, $1) in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $RM conftest*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
++        _LT_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $RM conftest*
++      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
++    [Whether or not to add -lc for building shared libraries])
++_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
++    [enable_shared_with_static_runtimes], [0],
++    [Whether or not to disallow shared libs when runtime libs are static])
++_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
++    [Compiler flag to allow reflexive dlopens])
++_LT_TAGDECL([], [whole_archive_flag_spec], [1],
++    [Compiler flag to generate shared objects directly from archives])
++_LT_TAGDECL([], [compiler_needs_object], [1],
++    [Whether the compiler copes with passing no objects directly])
++_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
++    [Create an old-style archive from a shared archive])
++_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
++    [Create a temporary old-style archive to link instead of a shared archive])
++_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
++_LT_TAGDECL([], [archive_expsym_cmds], [2])
++_LT_TAGDECL([], [module_cmds], [2],
++    [Commands used to build a loadable module if different from building
++    a shared archive.])
++_LT_TAGDECL([], [module_expsym_cmds], [2])
++_LT_TAGDECL([], [with_gnu_ld], [1],
++    [Whether we are building with GNU ld or not])
++_LT_TAGDECL([], [allow_undefined_flag], [1],
++    [Flag that allows shared libraries with undefined symbols to be built])
++_LT_TAGDECL([], [no_undefined_flag], [1],
++    [Flag that enforces no undefined symbols])
++_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
++    [Flag to hardcode $libdir into a binary during linking.
++    This must work even if $libdir does not exist])
++_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
++    [[If ld is used when linking, flag to hardcode $libdir into a binary
++    during linking.  This must work even if $libdir does not exist]])
++_LT_TAGDECL([], [hardcode_libdir_separator], [1],
++    [Whether we need a single "-rpath" flag with a separated argument])
++_LT_TAGDECL([], [hardcode_direct], [0],
++    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    DIR into the resulting binary])
++_LT_TAGDECL([], [hardcode_direct_absolute], [0],
++    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    DIR into the resulting binary and the resulting library dependency is
++    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
++    library is relocated])
++_LT_TAGDECL([], [hardcode_minus_L], [0],
++    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
++    into the resulting binary])
++_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
++    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
++    into the resulting binary])
++_LT_TAGDECL([], [hardcode_automatic], [0],
++    [Set to "yes" if building a shared library automatically hardcodes DIR
++    into the library and all subsequent libraries and executables linked
++    against it])
++_LT_TAGDECL([], [inherit_rpath], [0],
++    [Set to yes if linker adds runtime paths of dependent libraries
++    to runtime path list])
++_LT_TAGDECL([], [link_all_deplibs], [0],
++    [Whether libtool must link a program against all its dependency libraries])
++_LT_TAGDECL([], [fix_srcfile_path], [1],
++    [Fix the shell variable $srcfile for the compiler])
++_LT_TAGDECL([], [always_export_symbols], [0],
++    [Set to "yes" if exported symbols are required])
++_LT_TAGDECL([], [export_symbols_cmds], [2],
++    [The commands to list exported symbols])
++_LT_TAGDECL([], [exclude_expsyms], [1],
++    [Symbols that should not be listed in the preloaded symbols])
++_LT_TAGDECL([], [include_expsyms], [1],
++    [Symbols that must always be exported])
++_LT_TAGDECL([], [prelink_cmds], [2],
++    [Commands necessary for linking programs (against libraries) with templates])
++_LT_TAGDECL([], [file_list_spec], [1],
++    [Specify filename containing input files])
++dnl FIXME: Not yet implemented
++dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
++dnl    [Compiler flag to generate thread safe objects])
++])# _LT_LINKER_SHLIBS
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# _LT_LANG_C_CONFIG([TAG])
++# ------------------------
++# Ensure that the configuration variables for a C compiler are suitably
++# defined.  These variables are subsequently used by _LT_CONFIG to write
++# the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_C_CONFIG],
++[m4_require([_LT_DECL_EGREP])dnl
++lt_save_CC="$CC"
++AC_LANG_PUSH(C)
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++# Source file extension for C test sources.
++ac_ext=c
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++# Object file extension for compiled C test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++_LT_TAG_COMPILER
++# Save the default compiler, since it gets overwritten when the other
++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
++compiler_DEFAULT=$CC
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++if test -n "$compiler"; then
++  _LT_COMPILER_NO_RTTI($1)
++  _LT_COMPILER_PIC($1)
++  _LT_COMPILER_C_O($1)
++  _LT_COMPILER_FILE_LOCKS($1)
++  _LT_LINKER_SHLIBS($1)
++  _LT_SYS_DYNAMIC_LINKER($1)
++  _LT_LINKER_HARDCODE_LIBPATH($1)
++  LT_SYS_DLOPEN_SELF
++  _LT_CMD_STRIPLIB
++
++  # Report which library types will actually be built
++  AC_MSG_CHECKING([if libtool supports shared libraries])
++  AC_MSG_RESULT([$can_build_shared])
+ 
+-__EOF__
++  AC_MSG_CHECKING([whether to build shared libraries])
++  test "$can_build_shared" = "no" && enable_shared=no
+ 
+-ifelse([$1],[], [
++  # On AIX, shared libraries and static libraries use the same namespace, and
++  # are all built from PIC.
+   case $host_os in
+   aix3*)
+-    cat <<\EOF >> "$cfgfile"
++    test "$enable_shared" = yes && enable_static=no
++    if test -n "$RANLIB"; then
++      archive_cmds="$archive_cmds~\$RANLIB \$lib"
++      postinstall_cmds='$RANLIB $lib'
++    fi
++    ;;
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
+-fi
+-EOF
++  aix[[4-9]]*)
++    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++      test "$enable_shared" = yes && enable_static=no
++    fi
+     ;;
+   esac
++  AC_MSG_RESULT([$enable_shared])
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++  AC_MSG_CHECKING([whether to build static libraries])
++  # Make sure either enable_shared or enable_static is yes.
++  test "$enable_shared" = yes || enable_static=yes
++  AC_MSG_RESULT([$enable_static])
+ 
+-  mv -f "$cfgfile" "$ofile" || \
+-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+-  chmod +x "$ofile"
+-])
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+-  if test -f "$ltmain_in"; then
+-    test -f Makefile && make "$ltmain"
+-  fi
++  _LT_CONFIG($1)
+ fi
+-])# AC_LIBTOOL_CONFIG
+-
+-
+-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+-# -------------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-
+-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++AC_LANG_POP
++CC="$lt_save_CC"
++])# _LT_LANG_C_CONFIG
+ 
+-if test "$GCC" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ 
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+-    lt_cv_prog_compiler_rtti_exceptions,
+-    [-fno-rtti -fno-exceptions], [],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++# _LT_PROG_CXX
++# ------------
++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
++# compiler, we have our own version here.
++m4_defun([_LT_PROG_CXX],
++[
++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
++AC_PROG_CXX
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++else
++  _lt_caught_CXX_error=yes
+ fi
+-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_CXX
+ 
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_CXX], [])
+ 
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+-[
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++# _LT_LANG_CXX_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for a C++ compiler are suitably
++# defined.  These variables are subsequently used by _LT_CONFIG to write
++# the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_CXX_CONFIG],
++[AC_REQUIRE([_LT_PROG_CXX])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_EGREP])dnl
++
++AC_LANG_PUSH(C++)
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_TAGVAR(allow_undefined_flag, $1)=
++_LT_TAGVAR(always_export_symbols, $1)=no
++_LT_TAGVAR(archive_expsym_cmds, $1)=
++_LT_TAGVAR(compiler_needs_object, $1)=no
++_LT_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_TAGVAR(hardcode_direct, $1)=no
++_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_TAGVAR(hardcode_minus_L, $1)=no
++_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(inherit_rpath, $1)=no
++_LT_TAGVAR(module_cmds, $1)=
++_LT_TAGVAR(module_expsym_cmds, $1)=
++_LT_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++# Source file extension for C++ test sources.
++ac_ext=cpp
+ 
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[[BCDT]]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[[ABCDGISTW]]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDEGRST]]'
++# No sense in running all these tests if we already determined that
++# the CXX compiler isn't working.  Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_caught_CXX_error" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="int some_variable = 0;"
++
++  # Code to be used in simple link tests
++  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
++
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
++
++  # save warnings/boilerplate of simple test code
++  _LT_COMPILER_BOILERPLATE
++  _LT_LINKER_BOILERPLATE
++
++  # Allow CC to be a program name with arguments.
++  lt_save_CC=$CC
++  lt_save_LD=$LD
++  lt_save_GCC=$GCC
++  GCC=$GXX
++  lt_save_with_gnu_ld=$with_gnu_ld
++  lt_save_path_LD=$lt_cv_path_LD
++  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++  else
++    $as_unset lt_cv_prog_gnu_ld
+   fi
+-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-linux*)
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDGIRSTW]]'
+-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  if test -n "${lt_cv_path_LDCXX+set}"; then
++    lt_cv_path_LD=$lt_cv_path_LDCXX
++  else
++    $as_unset lt_cv_path_LD
+   fi
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[[BCDEGRST]]'
+-  ;;
+-osf*)
+-  symcode='[[BCDEGQRST]]'
+-  ;;
+-solaris*)
+-  symcode='[[BDRT]]'
+-  ;;
+-sco3.2v5*)
+-  symcode='[[DT]]'
+-  ;;
+-sysv4.2uw2*)
+-  symcode='[[DT]]'
+-  ;;
+-sysv5* | sco5v6* | unixware* | OpenUNIX*)
+-  symcode='[[ABDT]]'
+-  ;;
+-sysv4)
+-  symcode='[[DFNSTU]]'
+-  ;;
+-esac
+-
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $build_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-  ;;
+-esac
+-
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+-  symcode='[[ABCDGIRSTW]]' ;;
+-esac
+-
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+-
+-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+-  symxfrm="\\1 $ac_symprfx\\2 \\2"
+-
+-  # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+-
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
+-
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+-
+-  if AC_TRY_EVAL(ac_compile); then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
+-
+-      # Make sure that we snagged all the symbols we need.
+-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+-
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
+-#endif
+-
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr_t address;
+-}
+-lt_preloaded_symbols[[]] =
+-{
+-EOF
+-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr_t) 0}
+-};
++  test -z "${LDCXX+set}" || LD=$LDCXX
++  CC=${CXX-"c++"}
++  compiler=$CC
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
+ 
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$lt_save_LIBS"
+-	  CFLAGS="$lt_save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+-      fi
++  if test -n "$compiler"; then
++    # We don't want -fno-exception when compiling C++ code, so set the
++    # no_builtin_flag separately
++    if test "$GXX" = yes; then
++      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+     else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+     fi
+-  else
+-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
+-
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
+-  fi
+-done
+-])
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  lt_cv_sys_global_symbol_to_cdecl=
+-fi
+-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+-  AC_MSG_RESULT(failed)
+-else
+-  AC_MSG_RESULT(ok)
+-fi
+-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ 
++    if test "$GXX" = yes; then
++      # Set up default GNU C++ configuration
+ 
+-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+-# ---------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++      LT_PATH_LD
+ 
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+- ifelse([$1],[CXX],[
+-  # C++ specific cases for pic, static, wl, etc.
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++      # Check if GNU C++ uses GNU ld as the underlying linker, since the
++      # archiving commands below assume that GNU ld is being used.
++      if test "$with_gnu_ld" = yes; then
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++        # If archive_cmds runs LD, not CC, wlarc should be empty
++        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++        #     investigate it a little bit more. (MM)
++        wlarc='${wl}'
++
++        # ancient GNU ld didn't support --whole-archive et. al.
++        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
++	  $GREP 'no-whole-archive' > /dev/null; then
++          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++        else
++          _LT_TAGVAR(whole_archive_flag_spec, $1)=
++        fi
++      else
++        with_gnu_ld=no
++        wlarc=
+ 
+-    case $host_os in
+-    aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    mingw* | cygwin* | os2* | pw32*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+-      # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
+-    *djgpp*)
+-      # DJGPP does not support shared libraries at all
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-      ;;
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++        # A generic and very simple default shared library creation
++        # command for GNU C++ for the case where it uses the native
++        # linker, instead of GNU ld.  If possible, this setting should
++        # overridden to take advantage of the native linker features on
++        # the platform it is being used on.
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+       fi
+-      ;;
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
+-      ;;
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-      ;;
+-    esac
+-  else
++
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++
++    else
++      GXX=no
++      with_gnu_ld=no
++      wlarc=
++    fi
++
++    # PORTME: fill in a description of your system's C++ link characteristics
++    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++    _LT_TAGVAR(ld_shlibs, $1)=yes
+     case $host_os in
+-      aix4* | aix5*)
+-	# All AIX code is PIC.
+-	if test "$host_cpu" = ia64; then
+-	  # AIX 5 now supports IA64 processor
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      aix3*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
++      aix[[4-9]]*)
++        if test "$host_cpu" = ia64; then
++          # On IA64, the linker does run time linking by default, so we don't
++          # have to do anything special.
++          aix_use_runtimelinking=no
++          exp_sym_flag='-Bexport'
++          no_entry_flag=""
++        else
++          aix_use_runtimelinking=no
++
++          # Test if we are trying to use run time linking or normal
++          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++          # need to do runtime linking.
++          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
++	    for ld_flag in $LDFLAGS; do
++	      case $ld_flag in
++	      *-brtl*)
++	        aix_use_runtimelinking=yes
++	        break
++	        ;;
++	      esac
++	    done
++	    ;;
++          esac
++
++          exp_sym_flag='-bexport'
++          no_entry_flag='-bnoentry'
++        fi
++
++        # When large executables or shared objects are built, AIX ld can
++        # have problems creating the table of contents.  If linking a library
++        # or program results in "error TOC overflow" add -mminimal-toc to
++        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++        _LT_TAGVAR(archive_cmds, $1)=''
++        _LT_TAGVAR(hardcode_direct, $1)=yes
++        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++        _LT_TAGVAR(link_all_deplibs, $1)=yes
++        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
++
++        if test "$GXX" = yes; then
++          case $host_os in aix4.[[012]]|aix4.[[012]].*)
++          # We only want to do this on AIX 4.2 and lower, the check
++          # below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" &&
++	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
++	  then
++	    # We have reworked collect2
++	    :
++	  else
++	    # We have old collect2
++	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
++	    # It fails to find uninstalled libraries when the uninstalled
++	    # path is not listed in the libpath.  Setting hardcode_minus_L
++	    # to unsupported forces relinking
++	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++          esac
++          shared_flag='-shared'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag="$shared_flag "'${wl}-G'
++	  fi
++        else
++          # not using gcc
++          if test "$host_cpu" = ia64; then
++	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	  # chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++          else
++	    if test "$aix_use_runtimelinking" = yes; then
++	      shared_flag='${wl}-G'
++	    else
++	      shared_flag='${wl}-bM:SRE'
++	    fi
++          fi
++        fi
++
++        # It seems that -bexpall does not export symbols beginning with
++        # underscore (_), so it is better to generate a list of symbols to
++	# export.
++        _LT_TAGVAR(always_export_symbols, $1)=yes
++        if test "$aix_use_runtimelinking" = yes; then
++          # Warning - without using the other runtime loading flags (-brtl),
++          # -berok will link without error, but may produce a broken library.
++          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
++          # Determine the default libpath from the value encoded in an empty
++          # executable.
++          _LT_SYS_MODULE_PATH_AIX
++          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        else
++          if test "$host_cpu" = ia64; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++          else
++	    # Determine the default libpath from the value encoded in an
++	    # empty executable.
++	    _LT_SYS_MODULE_PATH_AIX
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	    # Warning - without using the other run time loading flags,
++	    # -berok will link without error, but may produce a broken library.
++	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	    # Exported symbols can be pulled into shared objects from archives
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++	    # This is similar to how AIX traditionally builds its shared
++	    # libraries.
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++          fi
++        fi
++        ;;
++
++      beos*)
++	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	  # support --undefined.  This deserves some investigation.  FIXME
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	else
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	  _LT_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
++
+       chorus*)
+-	case $cc_basename in
+-	cxch68*)
+-	  # Green Hills C++ Compiler
+-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++        case $cc_basename in
++          *)
++	  # FIXME: insert proper C++ library support
++	  _LT_TAGVAR(ld_shlibs, $1)=no
+ 	  ;;
+-	esac
++        esac
++        ;;
++
++      cygwin* | mingw* | pw32*)
++        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++        # as there is no search path for DLLs.
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++        _LT_TAGVAR(always_export_symbols, $1)=no
++        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++          # If the export-symbols file already is a .def file (1st line
++          # is EXPORTS), use it as is; otherwise, prepend...
++          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	    cp $export_symbols $output_objdir/$soname.def;
++          else
++	    echo EXPORTS > $output_objdir/$soname.def;
++	    cat $export_symbols >> $output_objdir/$soname.def;
++          fi~
++          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++        else
++          _LT_TAGVAR(ld_shlibs, $1)=no
++        fi
++        ;;
++      darwin* | rhapsody*)
++        _LT_DARWIN_LINKER_FEATURES($1)
+ 	;;
+-       darwin*)
+-         # PIC is the default on this platform
+-         # Common symbols not allowed in MH_DYLIB files
+-         case $cc_basename in
+-           xlc*)
+-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-           ;;
+-         esac
+-       ;;
++
+       dgux*)
+-	case $cc_basename in
+-	  ec++*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++        case $cc_basename in
++          ec++*)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	  ghcx*)
++          ghcx*)
+ 	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	  *)
++          *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	esac
+-	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
+-	# FreeBSD uses GNU C++
+-	;;
+-      hpux9* | hpux10* | hpux11*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+-	    if test "$host_cpu" != ia64; then
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	    fi
++        esac
++        ;;
++
++      freebsd[[12]]*)
++        # C++ shared libraries reported to be fairly broken before
++	# switch to ELF
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
++
++      freebsd-elf*)
++        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++        ;;
++
++      freebsd* | dragonfly*)
++        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++        # conventions
++        _LT_TAGVAR(ld_shlibs, $1)=yes
++        ;;
++
++      gnu*)
++        ;;
++
++      hpux9*)
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        _LT_TAGVAR(hardcode_direct, $1)=yes
++        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				             # but as the default
++				             # location of the library.
++
++        case $cc_basename in
++          CC*)
++            # FIXME: insert proper C++ library support
++            _LT_TAGVAR(ld_shlibs, $1)=no
++            ;;
++          aCC*)
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            # Commands to make compiler produce verbose output that lists
++            # what "hidden" libraries, object files and flags are used when
++            # linking a shared library.
++            #
++            # There doesn't appear to be a way to prevent this compiler from
++            # explicitly linking system object files so we need to strip them
++            # from the output so that they don't get included in the library
++            # dependencies.
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++            ;;
++          *)
++            if test "$GXX" = yes; then
++              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            else
++              # FIXME: insert proper C++ library support
++              _LT_TAGVAR(ld_shlibs, $1)=no
++            fi
++            ;;
++        esac
++        ;;
++
++      hpux10*|hpux11*)
++        if test $with_gnu_ld = no; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++          case $host_cpu in
++            hppa*64*|ia64*)
++              ;;
++            *)
++	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++              ;;
++          esac
++        fi
++        case $host_cpu in
++          hppa*64*|ia64*)
++            _LT_TAGVAR(hardcode_direct, $1)=no
++            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++            ;;
++          *)
++            _LT_TAGVAR(hardcode_direct, $1)=yes
++            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					         # but as the default
++					         # location of the library.
++            ;;
++        esac
++
++        case $cc_basename in
++          CC*)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+-	  aCC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++          aCC*)
+ 	    case $host_cpu in
+-	    hppa*64*|ia64*)
+-	      # +Z the default
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	      ;;
++	      hppa*64*)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
++	      ia64*)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
++	      *)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        ;;
+ 	    esac
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 	    ;;
+-	  *)
++          *)
++	    if test "$GXX" = yes; then
++	      if test $with_gnu_ld = no; then
++	        case $host_cpu in
++	          hppa*64*)
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	          ia64*)
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	          *)
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            ;;
++	        esac
++	      fi
++	    else
++	      # FIXME: insert proper C++ library support
++	      _LT_TAGVAR(ld_shlibs, $1)=no
++	    fi
+ 	    ;;
+-	esac
+-	;;
+-      interix*)
+-	# This is c89, which is MS Visual C++ (no shared libs)
+-	# Anyone wants to do a port?
+-	;;
+-      irix5* | irix6* | nonstopux*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    # CC pic flag -KPIC is the default.
++        esac
++        ;;
++
++      interix[[3-9]]*)
++	_LT_TAGVAR(hardcode_direct, $1)=no
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++	# Instead, shared libraries are loaded at an image base (0x10000000 by
++	# default) and relocated if they conflict, which is a slow very memory
++	# consuming and fragmenting process.  To avoid this, we pick a random,
++	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	;;
++      irix5* | irix6*)
++        case $cc_basename in
++          CC*)
++	    # SGI C++
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++
++	    # Archives containing C++ object files must be created using
++	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	    # necessary to make sure instantiated templates are included
++	    # in the archive.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ 	    ;;
+-	  *)
++          *)
++	    if test "$GXX" = yes; then
++	      if test "$with_gnu_ld" = no; then
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	      else
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
++	      fi
++	    fi
++	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+ 	    ;;
+-	esac
+-	;;
+-      linux*)
+-	case $cc_basename in
+-	  KCC*)
+-	    # KAI C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        esac
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++        _LT_TAGVAR(inherit_rpath, $1)=yes
++        ;;
++
++      linux* | k*bsd*-gnu)
++        case $cc_basename in
++          KCC*)
++	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	    # KCC will only create a shared library if the output file
++	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
++	    # to its proper name (with version) after linking.
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++	    # Archives containing C++ object files must be created using
++	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	    ;;
+-	  icpc* | ecpc*)
++	  icpc* | ecpc* )
+ 	    # Intel C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-	    ;;
+-	  pgCC*)
+-	    # Portland Group C++ compiler.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	  cxx*)
+-	    # Compaq C++
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    with_gnu_ld=yes
++	    # version 8.0 and above of icpc choke on multiply defined symbols
++	    # if we add $predep_objects and $postdep_objects, however 7.1 and
++	    # earlier do not add the objects themselves.
++	    case `$CC -V 2>&1` in
++	      *"Version 7."*)
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++		;;
++	      *)  # Version 8.0 or newer
++	        tmp_idyn=
++	        case $host_cpu in
++		  ia64*) tmp_idyn=' -i_dynamic';;
++		esac
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++		;;
++	    esac
++	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	    ;;
+-	  *)
+-	    case `$CC -V 2>&1 | sed 5q` in
+-	    *Sun\ C*)
+-	      # Sun C++ 5.9
+-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++          pgCC* | pgcpp*)
++            # Portland Group C++ compiler
++	    case `$CC -V` in
++	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
++	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++		$RANLIB $oldlib'
++	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
++		rm -rf $tpldir~
++		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      ;;
++	    *) # Version 6 will use weak symbols
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ 	      ;;
+ 	    esac
+-	    ;;
+-	esac
+-	;;
+-      lynxos*)
+-	;;
+-      m88k*)
+-	;;
+-      mvs*)
+-	case $cc_basename in
+-	  cxx*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      netbsd*)
+-	;;
+-      osf3* | osf4* | osf5*)
+-	case $cc_basename in
+-	  KCC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+-	    ;;
+-	  RCC*)
+-	    # Rational C++ 2.4.1
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++            ;;
+ 	  cxx*)
+-	    # Digital/Compaq C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    # Make sure the PIC flag is empty.  It appears that all Alpha
+-	    # Linux and Compaq Tru64 Unix objects are PIC.
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      psos*)
+-	;;
+-      solaris*)
+-	case $cc_basename in
+-	  CC*)
+-	    # Sun C++ 4.2, 5.x and Centerline C++
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-	    ;;
+-	  gcx*)
+-	    # Green Hills C++ Compiler
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+-      sunos4*)
+-	case $cc_basename in
+-	  CC*)
+-	    # Sun C++ 4.x
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	    ;;
+-	  lcc*)
+-	    # Lucid
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-	    ;;
+-	  *)
++	    # Compaq C++
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	    runpath_var=LD_RUN_PATH
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ 	    ;;
+-	esac
+-	;;
+-      tandem*)
+-	case $cc_basename in
+-	  NCC*)
+-	    # NonStop-UX NCC 3.20
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  xl*)
++	    # IBM XL 8.0 on PPC, with GNU ld
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	    if test "x$supports_anon_versioning" = xyes; then
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
++		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++		echo "local: *; };" >> $output_objdir/$libname.ver~
++		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	    fi
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	      _LT_TAGVAR(compiler_needs_object, $1)=yes
++
++	      # Not sure whether something based on
++	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	      # would be better.
++	      output_verbose_link_cmd='echo'
++
++	      # Archives containing C++ object files must be created using
++	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	      # necessary to make sure instantiated templates are included
++	      # in the archive.
++	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-	case $cc_basename in
+-	  CC*)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++
++      lynxos*)
++        # FIXME: insert proper C++ library support
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	;;
++
++      m88k*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++	;;
++
++      mvs*)
++        case $cc_basename in
++          cxx*)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++	  *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+ 	esac
+ 	;;
+-      vxworks*)
++
++      netbsd*)
++        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++	  wlarc=
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	fi
++	# Workaround some broken pre-1.5 toolchains
++	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ 	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++
++      *nto* | *qnx*)
++        _LT_TAGVAR(ld_shlibs, $1)=yes
+ 	;;
+-    esac
+-  fi
+-],
+-[
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+-    case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
++      openbsd2*)
++        # C++ shared libraries are fairly broken
++	_LT_TAGVAR(ld_shlibs, $1)=no
++	;;
++
++      openbsd*)
++	if test -f /usr/libexec/ld.so; then
++	  _LT_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  fi
++	  output_verbose_link_cmd=echo
++	else
++	  _LT_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
+ 
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
++      osf3* | osf4* | osf5*)
++        case $cc_basename in
++          KCC*)
++	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	    # KCC will only create a shared library if the output file
++	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
++	    # to its proper name (with version) after linking.
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	    # Archives containing C++ object files must be created using
++	    # the KAI C++ compiler.
++	    case $host in
++	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
++	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
++	    esac
++	    ;;
++          RCC*)
++	    # Rational C++ 2.4.1
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          cxx*)
++	    case $host in
++	      osf3*)
++	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++		;;
++	      *)
++	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	          echo "-hidden">> $lib.exp~
++	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
++	          $RM $lib.exp'
++	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++		;;
++	    esac
+ 
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
++	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-    mingw* | cygwin* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+-      # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    #
++	    # There doesn't appear to be a way to prevent this compiler from
++	    # explicitly linking system object files so we need to strip them
++	    # from the output so that they don't get included in the library
++	    # dependencies.
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++	    ;;
++	  *)
++	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	      case $host in
++	        osf3*)
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++		  ;;
++	        *)
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++		  ;;
++	      esac
++
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	      # Commands to make compiler produce verbose output that lists
++	      # what "hidden" libraries, object files and flags are used when
++	      # linking a shared library.
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++
++	    else
++	      # FIXME: insert proper C++ library support
++	      _LT_TAGVAR(ld_shlibs, $1)=no
++	    fi
++	    ;;
++        esac
++        ;;
+ 
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
++      psos*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
+ 
+-    interix3*)
+-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+-      # Instead, we relocate shared libraries at runtime.
+-      ;;
++      sunos4*)
++        case $cc_basename in
++          CC*)
++	    # Sun C++ 4.x
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          lcc*)
++	    # Lucid
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++        esac
++        ;;
+ 
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      enable_shared=no
+-      ;;
++      solaris*)
++        case $cc_basename in
++          CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
++	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	    case $host_os in
++	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	      *)
++		# The compiler driver will combine and reorder linker options,
++		# but understands `-z linker_flag'.
++	        # Supported since Solaris 2.6 (maybe 2.5.1?)
++		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	        ;;
++	    esac
++	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+-      fi
+-      ;;
++	    output_verbose_link_cmd='echo'
+ 
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	;;
+-      esac
+-      ;;
++	    # Archives containing C++ object files must be created using
++	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	    # necessary to make sure instantiated templates are included
++	    # in the archive.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	    ;;
++          gcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      else
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+-      darwin*)
+-        # PIC is the default on this platform
+-        # Common symbols not allowed in MH_DYLIB files
+-       case $cc_basename in
+-         xlc*)
+-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-         ;;
+-       esac
+-       ;;
++	    # The C++ compiler must be used to create the archive.
++	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	    ;;
++          *)
++	    # GNU C++ compiler with Solaris linker
++	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	        # Commands to make compiler produce verbose output that lists
++	        # what "hidden" libraries, object files and flags are used when
++	        # linking a shared library.
++	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++	      else
++	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	        # platform.
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
++		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++
++	        # Commands to make compiler produce verbose output that lists
++	        # what "hidden" libraries, object files and flags are used when
++	        # linking a shared library.
++	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++	      fi
++
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	      case $host_os in
++		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++		*)
++		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++		  ;;
++	      esac
++	    fi
++	    ;;
++        esac
++        ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+-      # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+-      ;;
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	;;
++      case $cc_basename in
++        CC*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
+       esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+       ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
++      sysv5* | sco3.2v5* | sco5v6*)
++	# Note: We can NOT use -z defs as we might desire, because we do not
++	# link with -lc, and that would cause any symbols used from libc to
++	# always be unresolved, which means just about no library would
++	# ever link correctly.  If we're not using GNU ld we use -z text
++	# though, which does catch some bad symbols but isn't as heavy-handed
++	# as -z defs.
++	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
++	_LT_TAGVAR(link_all_deplibs, $1)=yes
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++	runpath_var='LD_RUN_PATH'
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	case $cc_basename in
++          CC*)
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    ;;
++	  *)
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    ;;
++	esac
+       ;;
+ 
+-    linux*)
+-      case $cc_basename in
+-      icc* | ecc*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-        ;;
+-      ccc*)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-        # All Alpha code is PIC.
+-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      tandem*)
++        case $cc_basename in
++          NCC*)
++	    # NonStop-UX NCC 3.20
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++          *)
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
++        esac
+         ;;
+-      como)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-lopt='
++
++      vxworks*)
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
+         ;;
++
+       *)
+-        case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ C*)
+-	  # Sun C 5.9
+-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	  ;;
+-	*Sun\ F*)
+-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+-	  ;;
+-	esac
+-	;;
+-      esac
+-      ;;
++        # FIXME: insert proper C++ library support
++        _LT_TAGVAR(ld_shlibs, $1)=no
++        ;;
++    esac
+ 
+-    osf3* | osf4* | osf5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # All OSF/1 code is PIC.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
++    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
++    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      case $cc_basename in
+-      f77* | f90* | f95*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+-      esac
+-      ;;
++    _LT_TAGVAR(GCC, $1)="$GXX"
++    _LT_TAGVAR(LD, $1)="$LD"
++
++    ## CAVEAT EMPTOR:
++    ## There is no encapsulation within the following macros, do not change
++    ## the running order or otherwise move them around unless you know exactly
++    ## what you are doing...
++    _LT_SYS_HIDDEN_LIBDEPS($1)
++    _LT_COMPILER_PIC($1)
++    _LT_COMPILER_C_O($1)
++    _LT_COMPILER_FILE_LOCKS($1)
++    _LT_LINKER_SHLIBS($1)
++    _LT_SYS_DYNAMIC_LINKER($1)
++    _LT_LINKER_HARDCODE_LIBPATH($1)
++
++    _LT_CONFIG($1)
++  fi # test -n "$compiler"
++
++  CC=$lt_save_CC
++  LDCXX=$LD
++  LD=$lt_save_LD
++  GCC=$lt_save_GCC
++  with_gnu_ld=$lt_save_with_gnu_ld
++  lt_cv_path_LDCXX=$lt_cv_path_LD
++  lt_cv_path_LD=$lt_save_path_LD
++  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++fi # test "$_lt_caught_CXX_error" != yes
++
++AC_LANG_POP
++])# _LT_LANG_CXX_CONFIG
++
++
++# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
++# ---------------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++# Dependencies to place before and after the object being linked:
++_LT_TAGVAR(predep_objects, $1)=
++_LT_TAGVAR(postdep_objects, $1)=
++_LT_TAGVAR(predeps, $1)=
++_LT_TAGVAR(postdeps, $1)=
++_LT_TAGVAR(compiler_lib_search_path, $1)=
++
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
++int a;
++void foo (void) { a = 0; }
++_LT_EOF
++], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++_LT_EOF
++], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++_LT_EOF
++], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
++      subroutine foo
++      implicit none
++      integer a
++      a=0
++      return
++      end
++_LT_EOF
++], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++_LT_EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++  for p in `eval "$output_verbose_link_cmd"`; do
++    case $p in
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" ||
++          test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
++	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
+ 
+-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
+ 
+-    unicos*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      ;;
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
++	   _LT_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
++	   _LT_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      ;;
++    *) ;; # Ignore the rest.
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      ;;
+     esac
+-  fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++  done
+ 
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+-     "" | " "*) ;;
+-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+-     esac],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling $1 test program"
+ fi
+-case $host_os in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-    ;;
+-  *)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+-    ;;
+-esac
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $lt_tmp_static_flag,
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-])
+ 
++$RM -f confest.$objext
+ 
+-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+-# ------------------------------------
+-# See if the linker supports building shared libraries.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-ifelse([$1],[CXX],[
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  case $host_os in
+-  aix4* | aix5*)
+-    # If we're using GNU nm, then we don't want the "-C" option.
+-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    else
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    fi
+-    ;;
+-  pw32*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+-  ;;
+-  cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  *)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# PORTME: override above test on systems where it is broken
++m4_if([$1], [CXX],
++[case $host_os in
++interix[[3-9]]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_TAGVAR(predep_objects,$1)=
++  _LT_TAGVAR(postdep_objects,$1)=
++  _LT_TAGVAR(postdeps,$1)=
+   ;;
+-  esac
+-],[
+-  runpath_var=
+-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-  _LT_AC_TAGVAR(archive_cmds, $1)=
+-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-  _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  _LT_AC_TAGVAR(include_expsyms, $1)=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
+-  # Just being paranoid about ensuring that cc_basename is set.
+-  _LT_CC_BASENAME([$compiler])
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+-
+-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+-
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-    supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
+-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
+-
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
+-EOF
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
+       ;;
++    esac
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
+ 
+-    interix3*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++solaris*)
++  case $cc_basename in
++  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
+       ;;
++    esac
+ 
+-    linux*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
+-	pgcc*)				# Portland Group C compiler
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ C*)			# Sun C 5.9
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive /dev/null'
+-	  tmp_sharedflag='-G' ;;
+-	*Sun\ F*)			# Sun Fortran 8.3
+-	  tmp_sharedflag='-G' ;;
+-	*)
+-	  tmp_sharedflag='-shared' ;;
+-	esac
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++esac
++])
+ 
+-	if test $supports_anon_versioning = yes; then
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-  $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-	fi
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++case " $_LT_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
++    [The directories searched by this compiler when creating a shared library])
++_LT_TAGDECL([], [predep_objects], [1],
++    [Dependencies to place before and after the objects being linked to
++    create a shared library])
++_LT_TAGDECL([], [postdep_objects], [1])
++_LT_TAGDECL([], [predeps], [1])
++_LT_TAGDECL([], [postdeps], [1])
++_LT_TAGDECL([], [compiler_lib_search_path], [1],
++    [The library search path used internally by the compiler when linking
++    a shared library])
++])# _LT_SYS_HIDDEN_LIBDEPS
++
++
++# _LT_PROG_F77
++# ------------
++# Since AC_PROG_F77 is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_F77],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
++AC_PROG_F77
++if test -z "$F77" || test "X$F77" = "Xno"; then
++  _lt_disable_F77=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_F77
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
+-      ;;
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_F77], [])
+ 
+-    solaris*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
+ 
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# _LT_LANG_F77_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for a Fortran 77 compiler are
++# suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_F77_CONFIG],
++[AC_REQUIRE([_LT_PROG_F77])dnl
++AC_LANG_PUSH(Fortran 77)
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_TAGVAR(allow_undefined_flag, $1)=
++_LT_TAGVAR(always_export_symbols, $1)=no
++_LT_TAGVAR(archive_expsym_cmds, $1)=
++_LT_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_TAGVAR(hardcode_direct, $1)=no
++_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_TAGVAR(hardcode_minus_L, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(inherit_rpath, $1)=no
++_LT_TAGVAR(module_cmds, $1)=
++_LT_TAGVAR(module_expsym_cmds, $1)=
++_LT_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<_LT_EOF 1>&2
++# Source file extension for f77 test sources.
++ac_ext=f
+ 
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-_LT_EOF
+-	;;
+-	*)
+-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	  fi
+-	;;
+-      esac
+-      ;;
++# No sense in running all these tests if we already determined that
++# the F77 compiler isn't working.  Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_disable_F77" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  # Code to be used in simple link tests
++  lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+-      runpath_var=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-      fi
+-      ;;
++  # save warnings/boilerplate of simple test code
++  _LT_COMPILER_BOILERPLATE
++  _LT_LINKER_BOILERPLATE
++
++  # Allow CC to be a program name with arguments.
++  lt_save_CC="$CC"
++  lt_save_GCC=$GCC
++  CC=${F77-"f77"}
++  compiler=$CC
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
++  GCC=$G77
++  if test -n "$compiler"; then
++    AC_MSG_CHECKING([if libtool supports shared libraries])
++    AC_MSG_RESULT([$can_build_shared])
+ 
+-    aix4* | aix5*)
+-      if test "$host_cpu" = ia64; then
+-	# On IA64, the linker does run time linking by default, so we don't
+-	# have to do anything special.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    AC_MSG_CHECKING([whether to build shared libraries])
++    test "$can_build_shared" = "no" && enable_shared=no
++
++    # On AIX, shared libraries and static libraries use the same namespace, and
++    # are all built from PIC.
++    case $host_os in
++      aix3*)
++        test "$enable_shared" = yes && enable_static=no
++        if test -n "$RANLIB"; then
++          archive_cmds="$archive_cmds~\$RANLIB \$lib"
++          postinstall_cmds='$RANLIB $lib'
++        fi
++        ;;
++      aix[[4-9]]*)
++	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++	  test "$enable_shared" = yes && enable_static=no
+ 	fi
+-	aix_use_runtimelinking=no
++        ;;
++    esac
++    AC_MSG_RESULT([$enable_shared])
+ 
+-	# Test if we are trying to use run time linking or normal
+-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-	# need to do runtime linking.
+-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	  for ld_flag in $LDFLAGS; do
+-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-  	    aix_use_runtimelinking=yes
+-  	    break
+-  	  fi
+-	  done
+-	  ;;
+-	esac
++    AC_MSG_CHECKING([whether to build static libraries])
++    # Make sure either enable_shared or enable_static is yes.
++    test "$enable_shared" = yes || enable_static=yes
++    AC_MSG_RESULT([$enable_static])
++
++    _LT_TAGVAR(GCC, $1)="$G77"
++    _LT_TAGVAR(LD, $1)="$LD"
++
++    ## CAVEAT EMPTOR:
++    ## There is no encapsulation within the following macros, do not change
++    ## the running order or otherwise move them around unless you know exactly
++    ## what you are doing...
++    _LT_COMPILER_PIC($1)
++    _LT_COMPILER_C_O($1)
++    _LT_COMPILER_FILE_LOCKS($1)
++    _LT_LINKER_SHLIBS($1)
++    _LT_SYS_DYNAMIC_LINKER($1)
++    _LT_LINKER_HARDCODE_LIBPATH($1)
++
++    _LT_CONFIG($1)
++  fi # test -n "$compiler"
++
++  GCC=$lt_save_GCC
++  CC="$lt_save_CC"
++fi # test "$_lt_disable_F77" != yes
+ 
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
++AC_LANG_POP
++])# _LT_LANG_F77_CONFIG
+ 
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)=''
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# _LT_PROG_FC
++# -----------
++# Since AC_PROG_FC is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_FC],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
++AC_PROG_FC
++if test -z "$FC" || test "X$FC" = "Xno"; then
++  _lt_disable_FC=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_FC
+ 
+-      if test "$GCC" = yes; then
+-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  else
+-  	  # We have old collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	  fi
+-	  ;;
+-	esac
+-	shared_flag='-shared'
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag="$shared_flag "'${wl}-G'
+-	fi
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
+-	  if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='${wl}-G'
+-	  else
+-	    shared_flag='${wl}-bM:SRE'
+-	  fi
+-	fi
+-      fi
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_FC], [])
+ 
+-      # It seems that -bexpall does not export symbols beginning with
+-      # underscore (_), so it is better to generate a list of symbols to export.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       _LT_AC_SYS_LIBPATH_AIX
+-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 _LT_AC_SYS_LIBPATH_AIX
+-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	fi
+-      fi
+-      ;;
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      # see comment about different semantics on the GNU ld section
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++# _LT_LANG_FC_CONFIG([TAG])
++# -------------------------
++# Ensure that the configuration variables for a Fortran compiler are
++# suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_FC_CONFIG],
++[AC_REQUIRE([_LT_PROG_FC])dnl
++AC_LANG_PUSH(Fortran)
++
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_TAGVAR(allow_undefined_flag, $1)=
++_LT_TAGVAR(always_export_symbols, $1)=no
++_LT_TAGVAR(archive_expsym_cmds, $1)=
++_LT_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_TAGVAR(hardcode_direct, $1)=no
++_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_TAGVAR(hardcode_minus_L, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(inherit_rpath, $1)=no
++_LT_TAGVAR(module_cmds, $1)=
++_LT_TAGVAR(module_expsym_cmds, $1)=
++_LT_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-    bsdi[[45]]*)
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+-      ;;
++# Source file extension for fc test sources.
++ac_ext=${ac_fc_srcext-f}
+ 
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext_cmds=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+-      # FIXME: Should let the user specify the lib program.
+-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      ;;
++# Object file extension for compiled fc test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-    darwin* | rhapsody*)
+-      case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-      esac
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    if test "$GCC" = yes ; then
+-    	output_verbose_link_cmd='echo'
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    else
+-      case $cc_basename in
+-        xlc*)
+-         output_verbose_link_cmd='echo'
+-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          ;;
+-       *)
+-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-          ;;
+-      esac
+-    fi
+-      ;;
++# No sense in running all these tests if we already determined that
++# the FC compiler isn't working.  Some variables (like enable_shared)
++# are currently assumed to apply to all compilers on this platform,
++# and will be corrupted by setting them based on a non-working compiler.
++if test "$_lt_disable_FC" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+-    dgux*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  # Code to be used in simple link tests
++  lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+-    freebsd1*)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
+ 
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  # save warnings/boilerplate of simple test code
++  _LT_COMPILER_BOILERPLATE
++  _LT_LINKER_BOILERPLATE
++
++  # Allow CC to be a program name with arguments.
++  lt_save_CC="$CC"
++  lt_save_GCC=$GCC
++  CC=${FC-"f95"}
++  compiler=$CC
++  GCC=$ac_cv_fc_compiler_gnu
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++  if test -n "$compiler"; then
++    AC_MSG_CHECKING([if libtool supports shared libraries])
++    AC_MSG_RESULT([$can_build_shared])
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    AC_MSG_CHECKING([whether to build shared libraries])
++    test "$can_build_shared" = "no" && enable_shared=no
+ 
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      ;;
++    # On AIX, shared libraries and static libraries use the same namespace, and
++    # are all built from PIC.
++    case $host_os in
++      aix3*)
++        test "$enable_shared" = yes && enable_static=no
++        if test -n "$RANLIB"; then
++          archive_cmds="$archive_cmds~\$RANLIB \$lib"
++          postinstall_cmds='$RANLIB $lib'
++        fi
++        ;;
++      aix[[4-9]]*)
++	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++	  test "$enable_shared" = yes && enable_static=no
++	fi
++        ;;
++    esac
++    AC_MSG_RESULT([$enable_shared])
+ 
+-    hpux10*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    AC_MSG_CHECKING([whether to build static libraries])
++    # Make sure either enable_shared or enable_static is yes.
++    test "$enable_shared" = yes || enable_static=yes
++    AC_MSG_RESULT([$enable_static])
++
++    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
++    _LT_TAGVAR(LD, $1)="$LD"
++
++    ## CAVEAT EMPTOR:
++    ## There is no encapsulation within the following macros, do not change
++    ## the running order or otherwise move them around unless you know exactly
++    ## what you are doing...
++    _LT_SYS_HIDDEN_LIBDEPS($1)
++    _LT_COMPILER_PIC($1)
++    _LT_COMPILER_C_O($1)
++    _LT_COMPILER_FILE_LOCKS($1)
++    _LT_LINKER_SHLIBS($1)
++    _LT_SYS_DYNAMIC_LINKER($1)
++    _LT_LINKER_HARDCODE_LIBPATH($1)
++
++    _LT_CONFIG($1)
++  fi # test -n "$compiler"
++
++  GCC=$lt_save_GCC
++  CC="$lt_save_CC"
++fi # test "$_lt_disable_FC" != yes
+ 
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++AC_LANG_POP
++])# _LT_LANG_FC_CONFIG
+ 
+-	# hardcode_minus_L: Not really in the search PATH,
+-	# but as the default location of the library.
+-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      fi
+-      ;;
+ 
+-    hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case $host_cpu in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# _LT_LANG_GCJ_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Java Compiler compiler
++# are suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_GCJ_CONFIG],
++[AC_REQUIRE([LT_PROG_GCJ])dnl
++AC_LANG_SAVE
+ 
+-	case $host_cpu in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++# Source file extension for Java test sources.
++ac_ext=java
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}"
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++lt_save_GCC=$GCC
++GCC=yes
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_TAGVAR(LD, $1)="$LD"
++_LT_CC_BASENAME([$compiler])
+ 
+-    openbsd*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	   ;;
+-	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+-    os2*)
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ 
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++if test -n "$compiler"; then
++  _LT_COMPILER_NO_RTTI($1)
++  _LT_COMPILER_PIC($1)
++  _LT_COMPILER_C_O($1)
++  _LT_COMPILER_FILE_LOCKS($1)
++  _LT_LINKER_SHLIBS($1)
++  _LT_LINKER_HARDCODE_LIBPATH($1)
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++  _LT_CONFIG($1)
++fi
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++AC_LANG_RESTORE
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      if test "$GCC" = yes; then
+-	wlarc='${wl}'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	wlarc=''
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      case $host_os in
+-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
+-      esac
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++GCC=$lt_save_GCC
++CC="$lt_save_CC"
++])# _LT_LANG_GCJ_CONFIG
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-        ;;
+-	motorola)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# _LT_LANG_RC_CONFIG([TAG])
++# -------------------------
++# Ensure that the configuration variables for the Windows resource compiler
++# are suitably defined.  These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_RC_CONFIG],
++[AC_REQUIRE([LT_PROG_RC])dnl
++AC_LANG_SAVE
+ 
+-    sysv4.3*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+-      ;;
++# Source file extension for RC test sources.
++ac_ext=rc
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-      fi
+-      ;;
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      runpath_var='LD_RUN_PATH'
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
+ 
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var='LD_RUN_PATH'
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
+ 
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      ;;
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++lt_save_GCC=$GCC
++GCC=
++CC=${RC-"windres"}
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+-    *)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    esac
+-  fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++if test -n "$compiler"; then
++  :
++  _LT_CONFIG($1)
++fi
+ 
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+-x|xyes)
+-  # Assume -lc should be added
+-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++GCC=$lt_save_GCC
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# _LT_LANG_RC_CONFIG
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
+-      ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+-        then
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-        else
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-        fi
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-])# AC_LIBTOOL_PROG_LD_SHLIBS
++# LT_PROG_GCJ
++# -----------
++AC_DEFUN([LT_PROG_GCJ],
++[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
++  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
++    [AC_CHECK_TOOL(GCJ, gcj,)
++      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++      AC_SUBST(GCJFLAGS)])])[]dnl
++])
+ 
++# Old name:
++AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+ 
+-# _LT_AC_FILE_LTDLL_C
+-# -------------------
+-# Be careful that the start marker always follows a newline.
+-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-])# _LT_AC_FILE_LTDLL_C
+ 
++# LT_PROG_RC
++# ----------
++AC_DEFUN([LT_PROG_RC],
++[AC_CHECK_TOOL(RC, windres,)
++])
+ 
+-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++# Old name:
++AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_RC], [])
+ 
+ 
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+-
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
+-
+-AC_DEFUN([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+-  AC_SUBST(GCJFLAGS)
++# _LT_DECL_EGREP
++# --------------
++# If we don't have a new enough Autoconf to choose the best grep
++# available, choose the one first in the user's PATH.
++m4_defun([_LT_DECL_EGREP],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_REQUIRE([AC_PROG_FGREP])dnl
++test -z "$GREP" && GREP=grep
++_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
++_LT_DECL([], [EGREP], [1], [An ERE matcher])
++_LT_DECL([], [FGREP], [1], [A literal string matcher])
++dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
++AC_SUBST([GREP])
+ ])
+ 
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
+-])
+ 
++# _LT_DECL_SED
++# ------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++m4_defun([_LT_DECL_SED],
++[AC_PROG_SED
++test -z "$SED" && SED=sed
++Xsed="$SED -e 1s/^X//"
++_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
++_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
++    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
++])# _LT_DECL_SED
++
++m4_ifndef([AC_PROG_SED], [
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+ #  a released version of Autoconf we should remove this    #
+ #  macro and use it instead.                               #
+ ############################################################
+-# LT_AC_PROG_SED
+-# --------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible.  Prefer GNU sed if found.
+-AC_DEFUN([LT_AC_PROG_SED],
++
++m4_defun([AC_PROG_SED],
+ [AC_MSG_CHECKING([for a sed that does not truncate output])
+ AC_CACHE_VAL(lt_cv_path_SED,
+ [# Loop through the user's path and test for sed and gsed.
+@@ -6435,6 +7010,7 @@ do
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -6467,5 +7043,268 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
++])#AC_PROG_SED
++])#m4_ifndef
++
++# Old name:
++AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([LT_AC_PROG_SED], [])
++
++
++# _LT_CHECK_SHELL_FEATURES
++# ------------------------
++# Find out whether the shell is Bourne or XSI compatible,
++# or has some other useful features.
++m4_defun([_LT_CHECK_SHELL_FEATURES],
++[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
++# Try some XSI features
++xsi_shell=no
++( _lt_dummy="a/b/c"
++  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
++      = c,a/b,, \
++    && eval 'test $(( 1 + 1 )) -eq 2 \
++    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
++  && xsi_shell=yes
++AC_MSG_RESULT([$xsi_shell])
++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
++
++AC_MSG_CHECKING([whether the shell understands "+="])
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
++    >/dev/null 2>&1 \
++  && lt_shell_append=yes
++AC_MSG_RESULT([$lt_shell_append])
++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
++
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  lt_unset=unset
++else
++  lt_unset=false
++fi
++_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
++
++# test EBCDIC or ASCII
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  lt_SP2NL='tr \040 \012'
++  lt_NL2SP='tr \015\012 \040\040'
++  ;;
++ *) # EBCDIC based system
++  lt_SP2NL='tr \100 \n'
++  lt_NL2SP='tr \r\n \100\100'
++  ;;
++esac
++_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
++_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
++])# _LT_CHECK_SHELL_FEATURES
++
++
++# _LT_PROG_XSI_SHELLFNS
++# ---------------------
++# Bourne and XSI compatible variants of some useful shell functions.
++m4_defun([_LT_PROG_XSI_SHELLFNS],
++[case $xsi_shell in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
++  esac
++}
++
++# func_basename file
++func_basename ()
++{
++  func_basename_result="${1##*/}"
++}
++
++# func_dirname_and_basename file append nondir_replacement
++# perform func_basename and func_dirname in a single function
++# call:
++#   dirname:  Compute the dirname of FILE.  If nonempty,
++#             add APPEND to the result, otherwise set result
++#             to NONDIR_REPLACEMENT.
++#             value returned in "$func_dirname_result"
++#   basename: Compute filename of FILE.
++#             value retuned in "$func_basename_result"
++# Implementation must be kept synchronized with func_dirname
++# and func_basename. For efficiency, we do not delegate to
++# those functions but instead duplicate the functionality here.
++func_dirname_and_basename ()
++{
++  case ${1} in
++    */*) func_dirname_result="${1%/*}${2}" ;;
++    *  ) func_dirname_result="${3}" ;;
++  esac
++  func_basename_result="${1##*/}"
++}
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++func_stripname ()
++{
++  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++  # positional parameters, so assign one to ordinary parameter first.
++  func_stripname_result=${3}
++  func_stripname_result=${func_stripname_result#"${1}"}
++  func_stripname_result=${func_stripname_result%"${2}"}
++}
++
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=${1%%=*}
++  func_opt_split_arg=${1#*=}
++}
++
++# func_lo2o object
++func_lo2o ()
++{
++  case ${1} in
++    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++    *)    func_lo2o_result=${1} ;;
++  esac
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=${1%.*}.lo
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=$(( $[*] ))
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=${#1}
++}
++
++_LT_EOF
++    ;;
++  *) # Bourne compatible functions.
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++  # Extract subdirectory from the argument.
++  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
++  if test "X$func_dirname_result" = "X${1}"; then
++    func_dirname_result="${3}"
++  else
++    func_dirname_result="$func_dirname_result${2}"
++  fi
++}
++
++# func_basename file
++func_basename ()
++{
++  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++}
++
++dnl func_dirname_and_basename
++dnl A portable version of this function is already defined in general.m4sh
++dnl so there is no need for it here.
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++  case ${2} in
++    .*) func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++    *)  func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
++  esac
++}
++
++# sed scripts:
++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[[^=]]*=//'
++
++# func_opt_split
++func_opt_split ()
++{
++  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
++}
++
++# func_lo2o object
++func_lo2o ()
++{
++  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=`expr "$[@]"`
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
++}
++
++_LT_EOF
++esac
++
++case $lt_shell_append in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]+=\$[2]"
++}
++_LT_EOF
++    ;;
++  *)
++    cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]=\$$[1]\$[2]"
++}
++
++_LT_EOF
++    ;;
++  esac
+ ])
diff --git a/trunk/package/libs/libiconv-full/patches/103-configure_ac_fix.patch b/trunk/package/libs/libiconv-full/patches/103-configure_ac_fix.patch
new file mode 100644
index 00000000..d57ae84c
--- /dev/null
+++ b/trunk/package/libs/libiconv-full/patches/103-configure_ac_fix.patch
@@ -0,0 +1,31 @@
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,2 @@
++ACLOCAL_AMFLAGS = -I m4
++SUBDIRS = .
+--- /dev/null
++++ b/libcharset/Makefile.am
+@@ -0,0 +1 @@
++ACLOCAL_AMFLAGS = -I m4
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ AC_ISC_POSIX
+ 
+ dnl           checks for installer options
+ 
+-AC_RELOCATABLE
++gl_RELOCATABLE
+ 
+ AC_ARG_ENABLE([extra-encodings],
+   [AC_HELP_STRING([--enable-extra-encodings],
+--- a/libcharset/configure.ac
++++ b/libcharset/configure.ac
+@@ -41,7 +41,7 @@ AC_CANONICAL_HOST
+ 
+ dnl           checks for installer options
+ 
+-AC_RELOCATABLE_LIBRARY
++gl_RELOCATABLE_LIBRARY
+ 
+ dnl           checks for programs
+ 
diff --git a/trunk/package/libs/libiconv-full/patches/200-work-with-libtool2.patch b/trunk/package/libs/libiconv-full/patches/200-work-with-libtool2.patch
new file mode 100644
index 00000000..6e31967f
--- /dev/null
+++ b/trunk/package/libs/libiconv-full/patches/200-work-with-libtool2.patch
@@ -0,0 +1,17 @@
+Make iconv 1.11.x link correctly with libtool2 - argument "-Xcompiler" ensures "-shared" is passed to $(CC) when used as linker. Otherwise $(CC) tries to create an executable and fails while looking for a main()-function
+
+diff -ruN libiconv-1.11.1/lib/Makefile.in libiconv-1.11.1.mod/lib/Makefile.in
+--- libiconv-1.11.1/lib/Makefile.in	2006-07-14 15:18:42.000000000 +0200
++++ libiconv-1.11.1.mod/lib/Makefile.in	2010-12-01 20:47:57.000000000 +0100
+@@ -70,9 +70,9 @@
+ 
+ preloadable_libiconv_linux.so : $(SOURCES)
+ 	if test -n "@GCC@"; then \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -Xcompiler -shared -o preloadable_libiconv_linux.so; \
+ 	else \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -Xcompiler -shared -o preloadable_libiconv_linux.so; \
+ 	fi
+ 
+ preloadable_libiconv_solaris.so : $(SOURCES)
diff --git a/trunk/package/libs/libiconv/COPYING b/trunk/package/libs/libiconv/COPYING
new file mode 100644
index 00000000..223ede7d
--- /dev/null
+++ b/trunk/package/libs/libiconv/COPYING
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/trunk/package/libs/libiconv/COPYRIGHT b/trunk/package/libs/libiconv/COPYRIGHT
new file mode 100644
index 00000000..d6c04ec1
--- /dev/null
+++ b/trunk/package/libs/libiconv/COPYRIGHT
@@ -0,0 +1,20 @@
+Copyright status on all included code:
+
+All files which have no copyright comments are original works
+Copyright (C) 2005-2006 Rich Felker. The decision to exclude such
+comments is intentional, as it should be possible to carry around the
+complete source code on tiny storage media. All public header files
+(include/*) should be treated as Public Domain as they intentionally
+contain no content which can be covered by copyright. Some source
+modules may fall in this category as well. If you believe that a file
+is so trivial that it should be in the Public Domain, please contact
+me and, if I agree, I will explicitly release it from copyright.
+
+Some code has been modified by the libreCMC project, this includes
+the conversion from char map files to C arrays and the iconv.h header
+file in particular.
+
+The library as a whole is licensed under the GNU LGPL version 2.1.
+See the file COPYING for the text of this license.
+
+The original source can be accessed at svn://svn.mplayerhq.hu/libc/trunk
diff --git a/trunk/package/libs/libiconv/Makefile b/trunk/package/libs/libiconv/Makefile
new file mode 100644
index 00000000..97af32ac
--- /dev/null
+++ b/trunk/package/libs/libiconv/Makefile
@@ -0,0 +1,84 @@
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This Makefile and the code shipped in src/ is free software, licensed
+# under the GNU Lesser General Public License, version 2.1 and later.
+# See src/COPYING for more information.
+#
+# Refer to src/COPYRIGHT for copyright statements on the source files.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libiconv
+PKG_RELEASE:=7
+
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/libiconv
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Tiny drop-in replacement for the GNU Character set conversion library
+endef
+
+define Build/Prepare
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef      
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/iconv.c -o $(PKG_BUILD_DIR)/iconv.o -I$(PKG_BUILD_DIR)/include $(FPIC)
+	$(TARGET_CROSS)ar rcs $(PKG_BUILD_DIR)/libiconv.a $(PKG_BUILD_DIR)/iconv.o
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/libiconv-stub/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libiconv.a $(1)/usr/lib/libiconv-stub/lib/
+
+	$(INSTALL_DIR) $(1)/usr/lib/libiconv-stub/include
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/iconv.h $(1)/usr/lib/libiconv-stub/include/
+
+	$(INSTALL_DIR) $(1)/usr/share/aclocal
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/
+endef
+
+define Package/libiconv/install
+	$(INSTALL_DIR) $(1)/tmp
+	touch $(1)/tmp/.libiconv-placeholder
+endef
+
+define Host/Prepare
+	mkdir -p $(HOST_BUILD_DIR)
+endef
+
+define Host/Configure
+
+endef
+
+define Host/Compile
+	$(HOSTCC) -c src/iconv.c -o $(HOST_BUILD_DIR)/iconv.o -Isrc/include -fPIC
+	ar rcs $(HOST_BUILD_DIR)/libiconv.a $(HOST_BUILD_DIR)/iconv.o
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/lib
+	$(INSTALL_DATA) $(HOST_BUILD_DIR)/libiconv.a $(STAGING_DIR_HOST)/lib/
+
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/include
+	$(INSTALL_DATA) ./src/include/iconv.h $(STAGING_DIR_HOST)/include/
+
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
+	$(INSTALL_DATA) ./src/m4/* $(STAGING_DIR_HOST)/share/aclocal/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libiconv))
diff --git a/trunk/package/libs/libiconv/src/LICENSE b/trunk/package/libs/libiconv/src/LICENSE
new file mode 100644
index 00000000..b59e7be4
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/LICENSE
@@ -0,0 +1,6 @@
+The source file iconv.m4 contains the following message
+
+Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+This file is free software; the Free Software Foundation
+gives unlimited permission to copy and/or distribute it,
+with or without modifications, as long as this notice is preserved.
diff --git a/trunk/package/libs/libiconv/src/iconv.c b/trunk/package/libs/libiconv/src/iconv.c
new file mode 100644
index 00000000..d2e19e3c
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/iconv.c
@@ -0,0 +1,440 @@
+#include <iconv.h>
+#include <errno.h>
+#include <wchar.h>
+#include <string.h>
+#include <strings.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdint.h>
+
+/* builtin charmaps */
+#include "charmaps.h"
+
+/* only 0-7 are valid as dest charset */
+#define UTF_16BE    000
+#define UTF_16LE    001
+#define UTF_32BE    002
+#define UTF_32LE    003
+#define WCHAR_T     004
+#define UTF_8       005
+#define US_ASCII    006
+#define LATIN_1     007
+
+/* additional charsets with algorithmic conversion */
+#define LATIN_9     010
+#define TIS_620     011
+#define JIS_0201    012
+
+/* some programs like php need this */
+int _libiconv_version = _LIBICONV_VERSION;
+
+/* these must match the constants above */
+static const unsigned char charsets[] =
+	"\005" "UTF-8"      "\0"
+	"\004" "WCHAR_T"    "\0"
+	"\000" "UTF-16BE"   "\0"
+	"\001" "UTF-16LE"   "\0"
+	"\002" "UTF-32BE"   "\0"
+	"\003" "UTF-32LE"   "\0"
+	"\006" "ASCII"      "\0"
+	"\006" "US-ASCII"   "\0"
+	"\007" "ISO-8859-1" "\0"
+	"\007" "LATIN1"     "\0"
+	"\010" "ISO-8859-15""\0"
+	"\010" "LATIN9"     "\0"
+	"\011" "ISO-8859-11""\0"
+	"\011" "TIS-620"    "\0"
+	"\012" "JIS-0201"   "\0"
+	"\377";
+
+/* separate identifiers for sbcs/dbcs/etc map type */
+#define UCS2_8BIT   000
+#define UCS3_8BIT   001
+#define EUC         002
+#define EUC_TW      003
+#define SHIFT_JIS   004
+#define BIG5        005
+#define GBK         006
+
+/* FIXME: these are not implemented yet
+// EUC:   A1-FE A1-FE
+// GBK:   81-FE 40-7E,80-FE
+// Big5:  A1-FE 40-7E,A1-FE
+*/
+
+static const unsigned short maplen[] = {
+	[UCS2_8BIT] = 4+ 2* 128,
+	[UCS3_8BIT] = 4+ 3* 128,
+	[EUC]       = 4+ 2* 94*94,
+	[SHIFT_JIS] = 4+ 2* 94*94,
+	[BIG5]      = 4+ 2* 94*157,
+	[GBK]       = 4+ 2* 126*190,
+	[EUC_TW]    = 4+ 2* 2*94*94,
+};
+
+static int find_charmap(const char *name)
+{
+	int i;
+	for (i = 0; i < (sizeof(charmaps) / sizeof(charmaps[0])); i++)
+		if (!strcasecmp(charmaps[i].name, name))
+			return i;
+	return -1;
+}
+
+static int find_charset(const char *name)
+{
+	const unsigned char *s;
+	for (s=charsets; *s<0xff && strcasecmp(s+1, name); s+=strlen(s)+1);
+	return *s;
+}
+
+iconv_t iconv_open(const char *to, const char *from)
+{
+	unsigned f, t;
+	int m;
+
+	if ((t = find_charset(to)) > 8)
+		return -1;
+
+	if ((f = find_charset(from)) < 255)
+		return 0 | (t<<1) | (f<<8);
+
+	if ((m = find_charmap(from)) > -1)
+		return 1 | (t<<1) | (m<<8);
+
+	return -1;
+}
+
+int iconv_close(iconv_t cd)
+{
+	return 0;
+}
+
+static inline wchar_t get_16(const unsigned char *s, int endian)
+{
+	endian &= 1;
+	return s[endian]<<8 | s[endian^1];
+}
+
+static inline void put_16(unsigned char *s, wchar_t c, int endian)
+{
+	endian &= 1;
+	s[endian] = c>>8;
+	s[endian^1] = c;
+}
+
+static inline int utf8enc_wchar(char *outb, wchar_t c)
+{
+	if (c <= 0x7F) {
+		*outb = c;
+		return 1;
+	}
+	else if (c <= 0x7FF) {
+		*outb++ = ((c >>  6) & 0x1F) | 0xC0;
+		*outb++ = ( c        & 0x3F) | 0x80;
+		return 2;
+	}
+	else if (c <= 0xFFFF) {
+		*outb++ = ((c >> 12) & 0x0F) | 0xE0;
+		*outb++ = ((c >>  6) & 0x3F) | 0x80;
+		*outb++ = ( c        & 0x3F) | 0x80;
+		return 3;
+	}
+	else if (c <= 0x10FFFF) {
+		*outb++ = ((c >> 18) & 0x07) | 0xF0;
+		*outb++ = ((c >> 12) & 0x3F) | 0x80;
+		*outb++ = ((c >>  6) & 0x3F) | 0x80;
+		*outb++ = ( c        & 0x3F) | 0x80;
+		return 4;
+	}
+	else {
+		*outb++ = '?';
+		return 1;
+	}
+}
+
+static inline int utf8seq_is_overlong(char *s, int n)
+{
+	switch (n)
+	{
+	case 2:
+		/* 1100000x (10xxxxxx) */
+		return (((*s >> 1) == 0x60) &&
+				((*(s+1) >> 6) == 0x02));
+
+	case 3:
+		/* 11100000 100xxxxx (10xxxxxx) */
+		return ((*s == 0xE0) &&
+				((*(s+1) >> 5) == 0x04) &&
+				((*(s+2) >> 6) == 0x02));
+
+	case 4:
+		/* 11110000 1000xxxx (10xxxxxx 10xxxxxx) */
+		return ((*s == 0xF0) &&
+				((*(s+1) >> 4) == 0x08) &&
+				((*(s+2) >> 6) == 0x02) &&
+				((*(s+3) >> 6) == 0x02));
+	}
+
+	return 0;
+}
+
+static inline int utf8seq_is_surrogate(char *s, int n)
+{
+	return ((n == 3) && (*s == 0xED) && (*(s+1) >= 0xA0) && (*(s+1) <= 0xBF));
+}
+
+static inline int utf8seq_is_illegal(char *s, int n)
+{
+	return ((n == 3) && (*s == 0xEF) && (*(s+1) == 0xBF) &&
+	        (*(s+2) >= 0xBE) && (*(s+2) <= 0xBF));
+}
+
+static inline int utf8dec_wchar(wchar_t *c, unsigned char *in, size_t inb)
+{
+	int i;
+	int n = -1;
+
+	/* trivial char */
+	if (*in <= 0x7F) {
+		*c = *in;
+		return 1;
+	}
+
+	/* find utf8 sequence length */
+	if      ((*in & 0xE0) == 0xC0) n = 2;
+	else if ((*in & 0xF0) == 0xE0) n = 3;
+	else if ((*in & 0xF8) == 0xF0) n = 4;
+	else if ((*in & 0xFC) == 0xF8) n = 5;
+	else if ((*in & 0xFE) == 0xFC) n = 6;
+
+	/* starved? */
+	if (n > inb)
+		return -2;
+
+	/* decode ... */
+	if (n > 1 && n < 5) {
+		/* reject invalid sequences */
+		if (utf8seq_is_overlong(in, n) ||
+			utf8seq_is_surrogate(in, n) ||
+			utf8seq_is_illegal(in, n))
+			return -1;
+
+		/* decode ... */
+		*c = (char)(*in++ & (0x7F >> n));
+
+		for (i = 1; i < n; i++) {
+			/* illegal continuation byte */
+			if (*in < 0x80 || *in > 0xBF)
+				return -1;
+
+			*c = (*c << 6) | (*in++ & 0x3F);
+		}
+
+		return n;
+	}
+
+	/* unmapped sequence (> 4) */
+	return -1;
+}
+
+static inline wchar_t latin9_translit(wchar_t c)
+{
+	/* a number of trivial iso-8859-15 <> utf-8 transliterations */
+	switch (c) {
+	case 0x20AC: return 0xA4; /* Euro */
+	case 0x0160: return 0xA6; /* S caron */
+	case 0x0161: return 0xA8; /* s caron */
+	case 0x017D: return 0xB4; /* Z caron */
+	case 0x017E: return 0xB8; /* z caron */
+	case 0x0152: return 0xBC; /* OE */
+	case 0x0153: return 0xBD; /* oe */
+	case 0x0178: return 0xBE; /* Y diaeresis */
+	default:     return 0xFFFD; /* cannot translate */
+	}
+}
+
+size_t iconv(iconv_t cd, char **in, size_t *inb, char **out, size_t *outb)
+{
+	size_t x=0;
+	unsigned char to = (cd>>1)&127;
+	unsigned char from = 255;
+	const unsigned char *map = 0;
+	char tmp[MB_LEN_MAX];
+	wchar_t c, d;
+	size_t k, l;
+	int err;
+
+	if (!in || !*in || !*inb) return 0;
+
+	if (cd & 1)
+		map = charmaps[cd>>8].map;
+	else
+		from = cd>>8;
+
+	for (; *inb; *in+=l, *inb-=l) {
+		c = *(unsigned char *)*in;
+		l = 1;
+		if (from >= UTF_8 && c < 0x80) goto charok;
+		switch (from) {
+		case WCHAR_T:
+			l = sizeof(wchar_t);
+			if (*inb < l) goto starved;
+			c = *(wchar_t *)*in;
+			break;
+		case UTF_8:
+			l = utf8dec_wchar(&c, *in, *inb);
+			if (!l) l++;
+			else if (l == (size_t)-1) goto ilseq;
+			else if (l == (size_t)-2) goto starved;
+			break;
+		case US_ASCII:
+			goto ilseq;
+		case LATIN_9:
+			if ((unsigned)c - 0xa4 <= 0xbe - 0xa4) {
+				static const unsigned char map[] = {
+					0, 0x60, 0, 0x61, 0, 0, 0, 0, 0, 0, 0,
+					0, 0, 0, 0, 0x7d, 0, 0, 0, 0x7e, 0, 0, 0,
+					0x52, 0x53, 0x78
+				};
+				if (c == 0xa4) c = 0x20ac;
+				else if (map[c-0xa5]) c = 0x100 | map[c-0xa5];
+			}
+		case LATIN_1:
+			goto charok;
+		case TIS_620:
+			if (c >= 0xa1) c += 0x0e01-0xa1;
+			goto charok;
+		case JIS_0201:
+			if (c >= 0xa1) {
+				if (c <= 0xdf) c += 0xff61-0xa1;
+				else goto ilseq;
+			}
+			goto charok;
+		case UTF_16BE:
+		case UTF_16LE:
+			l = 2;
+			if (*inb < 2) goto starved;
+			c = get_16(*in, from);
+			if ((unsigned)(c-0xdc00) < 0x400) goto ilseq;
+			if ((unsigned)(c-0xd800) < 0x400) {
+				l = 4;
+				if (*inb < 4) goto starved;
+				d = get_16(*in + 2, from);
+				if ((unsigned)(c-0xdc00) >= 0x400) goto ilseq;
+				c = ((c-0xd800)<<10) | (d-0xdc00);
+			}
+			break;
+		case UTF_32BE:
+		case UTF_32LE:
+			l = 4;
+			if (*inb < 4) goto starved;
+			// FIXME
+			// c = get_32(*in, from);
+			break;
+		default:
+			/* only support ascii supersets */
+			if (c < 0x80) break;
+			switch (map[0]) {
+			case UCS2_8BIT:
+				c -= 0x80;
+				break;
+			case EUC:
+				if ((unsigned)c - 0xa1 >= 94) goto ilseq;
+				if ((unsigned)in[0][1] - 0xa1 >= 94) goto ilseq;
+				c = (c-0xa1)*94 + (in[0][1]-0xa1);
+				l = 2;
+				break;
+			case SHIFT_JIS:
+				if ((unsigned)c - 0xa1 <= 0xdf-0xa1) {
+					c += 0xff61-0xa1;
+					goto charok;
+				}
+				// FIXME...
+				l = 2;
+				break;
+			default:
+				goto badf;
+			}
+			c = get_16(map + 4 + 2*c, 0);
+			if (c == 0xffff) goto ilseq;
+			goto charok;
+		}
+
+		if ((unsigned)c - 0xd800 < 0x800 || (unsigned)c >= 0x110000)
+			goto ilseq;
+charok:
+		switch (to) {
+		case WCHAR_T:
+			if (*outb < sizeof(wchar_t)) goto toobig;
+			*(wchar_t *)*out = c;
+			*out += sizeof(wchar_t);
+			*outb -= sizeof(wchar_t);
+			break;
+		case UTF_8:
+			if (*outb < 4) {
+				k = utf8enc_wchar(tmp, c);
+				if (*outb < k) goto toobig;
+				memcpy(*out, tmp, k);
+			} else k = utf8enc_wchar(*out, c);
+			*out += k;
+			*outb -= k;
+			break;
+		case US_ASCII:
+			if (c > 0x7f) c = 0xfffd;
+			/* fall thru and count replacement in latin1 case */
+		case LATIN_9:
+			if (c >= 0x100 && c != 0xfffd)
+				c = latin9_translit(c);
+			/* fall through */
+		case LATIN_1:
+			if (c > 0xff) goto ilseq;
+			if (!*outb) goto toobig;
+			**out = c;
+			++*out;
+			--*outb;
+			break;
+		case UTF_16BE:
+		case UTF_16LE:
+			if (c < 0x10000) {
+				if (*outb < 2) goto toobig;
+				put_16(*out, c, to);
+				*out += 2;
+				*outb -= 2;
+				break;
+			}
+			if (*outb < 4) goto toobig;
+			put_16(*out, (c>>10)|0xd800, to);
+			put_16(*out + 2, (c&0x3ff)|0xdc00, to);
+			*out += 4;
+			*outb -= 4;
+			break;
+		default:
+			goto badf;
+		}
+	}
+	return x;
+ilseq:
+	err = EILSEQ;
+	x = -1;
+	goto end;
+badf:
+	err = EBADF;
+	x = -1;
+	goto end;
+toobig:
+	err = E2BIG;
+	x = -1;
+	goto end;
+starved:
+	err = EINVAL;
+end:
+	errno = err;
+	return x;
+}
diff --git a/trunk/package/libs/libiconv/src/include/charmaps.h b/trunk/package/libs/libiconv/src/include/charmaps.h
new file mode 100644
index 00000000..083cd699
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps.h
@@ -0,0 +1,80 @@
+#include "charmaps/iso-8859-2.h"
+#include "charmaps/iso-8859-10.h"
+#include "charmaps/windows-874.h"
+#include "charmaps/windows-1250.h"
+#include "charmaps/koi8-r.h"
+
+#ifdef ALL_CHARSETS
+#include "charmaps/iso-8859-3.h"
+#include "charmaps/iso-8859-4.h"
+#include "charmaps/iso-8859-5.h"
+#include "charmaps/iso-8859-6.h"
+#include "charmaps/iso-8859-7.h"
+#include "charmaps/iso-8859-8.h"
+#include "charmaps/iso-8859-9.h"
+#include "charmaps/iso-8859-13.h"
+#include "charmaps/iso-8859-14.h"
+#include "charmaps/iso-8859-16.h"
+#include "charmaps/windows-1251.h"
+#include "charmaps/windows-1252.h"
+#include "charmaps/windows-1253.h"
+#include "charmaps/windows-1254.h"
+#include "charmaps/windows-1255.h"
+#include "charmaps/windows-1256.h"
+#include "charmaps/windows-1257.h"
+#include "charmaps/windows-1258.h"
+#endif
+
+
+struct charmap {
+	const char name[13];
+	const unsigned char *map;
+};
+
+static struct charmap charmaps[] = {
+	{ "ISO-8859-2",   map_iso_8859_2   },
+	{ "ISO-8859-10",  map_iso_8859_10  },
+
+#ifdef ALL_CHARSETS
+	{ "ISO-8859-3",   map_iso_8859_3   },
+	{ "ISO-8859-4",   map_iso_8859_4   },
+	{ "ISO-8859-5",   map_iso_8859_5   },
+	{ "ISO-8859-6",   map_iso_8859_6   },
+	{ "ISO-8859-7",   map_iso_8859_7   },
+	{ "ISO-8859-8",   map_iso_8859_8   },
+	{ "ISO-8859-9",   map_iso_8859_9   },
+	{ "ISO-8859-13",  map_iso_8859_13  },
+	{ "ISO-8859-14",  map_iso_8859_14  },
+	{ "ISO-8859-16",  map_iso_8859_16  },
+#endif
+
+	{ "WINDOWS-874",  map_windows_874  },
+	{ "WINDOWS-1250", map_windows_1250 },
+
+#ifdef ALL_CHARSETS
+	{ "WINDOWS-1251", map_windows_1251 },
+	{ "WINDOWS-1252", map_windows_1252 },
+	{ "WINDOWS-1253", map_windows_1253 },
+	{ "WINDOWS-1254", map_windows_1254 },
+	{ "WINDOWS-1255", map_windows_1255 },
+	{ "WINDOWS-1256", map_windows_1256 },
+	{ "WINDOWS-1257", map_windows_1257 },
+	{ "WINDOWS-1258", map_windows_1258 },
+#endif
+
+	{ "KOI8-R",       map_koi8_r       },
+
+	/* Aliases */
+	{ "LATIN2",       map_iso_8859_2   },
+	{ "LATIN6",       map_iso_8859_10  },
+
+#ifdef ALL_CHARSETS
+	{ "ARABIC",       map_iso_8859_6   },
+	{ "CYRILLIC",     map_iso_8859_5   },
+	{ "GREEK",        map_iso_8859_7   },
+	{ "HEBREW",       map_iso_8859_8   },
+	{ "LATIN3",       map_iso_8859_3   },
+	{ "LATIN4",       map_iso_8859_4   },
+	{ "LATIN5",       map_iso_8859_9   },
+#endif
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-10.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-10.h
new file mode 100644
index 00000000..cb93d027
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-10.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_10[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x01, 0x04,
+	0x01, 0x12, 0x01, 0x22, 0x01, 0x2a, 0x01, 0x28, 0x01, 0x36, 0x00, 0xa7,
+	0x01, 0x3b, 0x01, 0x10, 0x01, 0x60, 0x01, 0x66, 0x01, 0x7d, 0x00, 0xad,
+	0x01, 0x6a, 0x01, 0x4a, 0x00, 0xb0, 0x01, 0x05, 0x01, 0x13, 0x01, 0x23,
+	0x01, 0x2b, 0x01, 0x29, 0x01, 0x37, 0x00, 0xb7, 0x01, 0x3c, 0x01, 0x11,
+	0x01, 0x61, 0x01, 0x67, 0x01, 0x7e, 0x20, 0x15, 0x01, 0x6b, 0x01, 0x4b,
+	0x01, 0x00, 0x00, 0xc1, 0x00, 0xc2, 0x00, 0xc3, 0x00, 0xc4, 0x00, 0xc5,
+	0x00, 0xc6, 0x01, 0x2e, 0x01, 0x0c, 0x00, 0xc9, 0x01, 0x18, 0x00, 0xcb,
+	0x01, 0x16, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0x00, 0xd0, 0x01, 0x45,
+	0x01, 0x4c, 0x00, 0xd3, 0x00, 0xd4, 0x00, 0xd5, 0x00, 0xd6, 0x01, 0x68,
+	0x00, 0xd8, 0x01, 0x72, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x00, 0xdd,
+	0x00, 0xde, 0x00, 0xdf, 0x01, 0x01, 0x00, 0xe1, 0x00, 0xe2, 0x00, 0xe3,
+	0x00, 0xe4, 0x00, 0xe5, 0x00, 0xe6, 0x01, 0x2f, 0x01, 0x0d, 0x00, 0xe9,
+	0x01, 0x19, 0x00, 0xeb, 0x01, 0x17, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0x00, 0xf0, 0x01, 0x46, 0x01, 0x4d, 0x00, 0xf3, 0x00, 0xf4, 0x00, 0xf5,
+	0x00, 0xf6, 0x01, 0x69, 0x00, 0xf8, 0x01, 0x73, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x00, 0xfd, 0x00, 0xfe, 0x01, 0x38
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-13.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-13.h
new file mode 100644
index 00000000..b44d1b43
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-13.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_13[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x20, 0x1d,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x20, 0x1e, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xd8, 0x00, 0xa9, 0x01, 0x56, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xc6, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x20, 0x1c, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xf8, 0x00, 0xb9,
+	0x01, 0x57, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x00, 0xe6,
+	0x01, 0x04, 0x01, 0x2e, 0x01, 0x00, 0x01, 0x06, 0x00, 0xc4, 0x00, 0xc5,
+	0x01, 0x18, 0x01, 0x12, 0x01, 0x0c, 0x00, 0xc9, 0x01, 0x79, 0x01, 0x16,
+	0x01, 0x22, 0x01, 0x36, 0x01, 0x2a, 0x01, 0x3b, 0x01, 0x60, 0x01, 0x43,
+	0x01, 0x45, 0x00, 0xd3, 0x01, 0x4c, 0x00, 0xd5, 0x00, 0xd6, 0x00, 0xd7,
+	0x01, 0x72, 0x01, 0x41, 0x01, 0x5a, 0x01, 0x6a, 0x00, 0xdc, 0x01, 0x7b,
+	0x01, 0x7d, 0x00, 0xdf, 0x01, 0x05, 0x01, 0x2f, 0x01, 0x01, 0x01, 0x07,
+	0x00, 0xe4, 0x00, 0xe5, 0x01, 0x19, 0x01, 0x13, 0x01, 0x0d, 0x00, 0xe9,
+	0x01, 0x7a, 0x01, 0x17, 0x01, 0x23, 0x01, 0x37, 0x01, 0x2b, 0x01, 0x3c,
+	0x01, 0x61, 0x01, 0x44, 0x01, 0x46, 0x00, 0xf3, 0x01, 0x4d, 0x00, 0xf5,
+	0x00, 0xf6, 0x00, 0xf7, 0x01, 0x73, 0x01, 0x42, 0x01, 0x5b, 0x01, 0x6b,
+	0x00, 0xfc, 0x01, 0x7c, 0x01, 0x7e, 0x20, 0x19
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-14.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-14.h
new file mode 100644
index 00000000..76cead98
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-14.h
@@ -0,0 +1,25 @@
+static const unsigned char map_iso_8859_14[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x1e, 0x02,
+	0x1e, 0x03, 0x00, 0xa3, 0x01, 0x0a, 0x01, 0x0b, 0x1e, 0x0a, 0x00, 0xa7,
+	0x1e, 0x80, 0x00, 0xa9, 0x1e, 0x82, 0x1e, 0x0b, 0x1e, 0xf2, 0x00, 0xad,
+	0x00, 0xae, 0x01, 0x78, 0x1e, 0x1e, 0x1e, 0x1f, 0x01, 0x20, 0x01, 0x21,
+	0x1e, 0x40, 0x1e, 0x41, 0x00, 0xb6, 0x1e, 0x56, 0x1e, 0x81, 0x1e, 0x57,
+	0x1e, 0x83, 0x1e, 0x60, 0x1e, 0xf3, 0x1e, 0x84, 0x1e, 0x85, 0x1e, 0x61,
+	0x00, 0xc0, 0x00, 0xc1, 0x00, 0xc2, 0x00, 0xc3, 0x00, 0xc4, 0x00, 0xc5,
+	0x00, 0xc6, 0x00, 0xc7, 0x00, 0xc8, 0x00, 0xc9, 0x00, 0xca, 0x00, 0xcb,
+	0x00, 0xcc, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0x01, 0x74, 0x00, 0xd1,
+	0x00, 0xd2, 0x00, 0xd3, 0x00, 0xd4, 0x00, 0xd5, 0x00, 0xd6, 0x1e, 0x6a,
+	0x00, 0xd8, 0x00, 0xd9, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x00, 0xdd,
+	0x01, 0x76, 0x00, 0xdf, 0x00, 0xe0, 0x00, 0xe1, 0x00, 0xe2, 0x00, 0xe3,
+	0x00, 0xe4, 0x00, 0xe5, 0x00, 0xe6, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x00, 0xec, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0x01, 0x75, 0x00, 0xf1, 0x00, 0xf2, 0x00, 0xf3, 0x00, 0xf4, 0x00, 0xf5,
+	0x00, 0xf6, 0x1e, 0x6b, 0x00, 0xf8, 0x00, 0xf9, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x00, 0xfd, 0x01, 0x77, 0x00, 0xff
+};
+
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-16.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-16.h
new file mode 100644
index 00000000..4437a41f
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-16.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_16[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x01, 0x04,
+	0x01, 0x05, 0x01, 0x41, 0x20, 0xac, 0x20, 0x1e, 0x01, 0x60, 0x00, 0xa7,
+	0x01, 0x61, 0x00, 0xa9, 0x02, 0x18, 0x00, 0xab, 0x01, 0x79, 0x00, 0xad,
+	0x01, 0x7a, 0x01, 0x7b, 0x00, 0xb0, 0x00, 0xb1, 0x01, 0x0c, 0x01, 0x42,
+	0x01, 0x7d, 0x20, 0x1d, 0x00, 0xb6, 0x00, 0xb7, 0x01, 0x7e, 0x01, 0x0d,
+	0x02, 0x19, 0x00, 0xbb, 0x01, 0x52, 0x01, 0x53, 0x01, 0x78, 0x01, 0x7c,
+	0x00, 0xc0, 0x00, 0xc1, 0x00, 0xc2, 0x01, 0x02, 0x00, 0xc4, 0x01, 0x06,
+	0x00, 0xc6, 0x00, 0xc7, 0x00, 0xc8, 0x00, 0xc9, 0x00, 0xca, 0x00, 0xcb,
+	0x00, 0xcc, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0x01, 0x10, 0x01, 0x43,
+	0x00, 0xd2, 0x00, 0xd3, 0x00, 0xd4, 0x01, 0x50, 0x00, 0xd6, 0x01, 0x5a,
+	0x01, 0x70, 0x00, 0xd9, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x01, 0x18,
+	0x02, 0x1a, 0x00, 0xdf, 0x00, 0xe0, 0x00, 0xe1, 0x00, 0xe2, 0x01, 0x03,
+	0x00, 0xe4, 0x01, 0x07, 0x00, 0xe6, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x00, 0xec, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0x01, 0x11, 0x01, 0x44, 0x00, 0xf2, 0x00, 0xf3, 0x00, 0xf4, 0x01, 0x51,
+	0x00, 0xf6, 0x01, 0x5b, 0x01, 0x71, 0x00, 0xf9, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x01, 0x19, 0x02, 0x1b, 0x00, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-2.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-2.h
new file mode 100644
index 00000000..631610e1
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-2.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_2[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x01, 0x04,
+	0x02, 0xd8, 0x01, 0x41, 0x00, 0xa4, 0x01, 0x3d, 0x01, 0x5a, 0x00, 0xa7,
+	0x00, 0xa8, 0x01, 0x60, 0x01, 0x5e, 0x01, 0x64, 0x01, 0x79, 0x00, 0xad,
+	0x01, 0x7d, 0x01, 0x7b, 0x00, 0xb0, 0x01, 0x05, 0x02, 0xdb, 0x01, 0x42,
+	0x00, 0xb4, 0x01, 0x3e, 0x01, 0x5b, 0x02, 0xc7, 0x00, 0xb8, 0x01, 0x61,
+	0x01, 0x5f, 0x01, 0x65, 0x01, 0x7a, 0x02, 0xdd, 0x01, 0x7e, 0x01, 0x7c,
+	0x01, 0x54, 0x00, 0xc1, 0x00, 0xc2, 0x01, 0x02, 0x00, 0xc4, 0x01, 0x39,
+	0x01, 0x06, 0x00, 0xc7, 0x01, 0x0c, 0x00, 0xc9, 0x01, 0x18, 0x00, 0xcb,
+	0x01, 0x1a, 0x00, 0xcd, 0x00, 0xce, 0x01, 0x0e, 0x01, 0x10, 0x01, 0x43,
+	0x01, 0x47, 0x00, 0xd3, 0x00, 0xd4, 0x01, 0x50, 0x00, 0xd6, 0x00, 0xd7,
+	0x01, 0x58, 0x01, 0x6e, 0x00, 0xda, 0x01, 0x70, 0x00, 0xdc, 0x00, 0xdd,
+	0x01, 0x62, 0x00, 0xdf, 0x01, 0x55, 0x00, 0xe1, 0x00, 0xe2, 0x01, 0x03,
+	0x00, 0xe4, 0x01, 0x3a, 0x01, 0x07, 0x00, 0xe7, 0x01, 0x0d, 0x00, 0xe9,
+	0x01, 0x19, 0x00, 0xeb, 0x01, 0x1b, 0x00, 0xed, 0x00, 0xee, 0x01, 0x0f,
+	0x01, 0x11, 0x01, 0x44, 0x01, 0x48, 0x00, 0xf3, 0x00, 0xf4, 0x01, 0x51,
+	0x00, 0xf6, 0x00, 0xf7, 0x01, 0x59, 0x01, 0x6f, 0x00, 0xfa, 0x01, 0x71,
+	0x00, 0xfc, 0x00, 0xfd, 0x01, 0x63, 0x02, 0xd9
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-3.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-3.h
new file mode 100644
index 00000000..cd76d59c
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-3.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_3[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x01, 0x26,
+	0x02, 0xd8, 0x00, 0xa3, 0x00, 0xa4, 0xff, 0xff, 0x01, 0x24, 0x00, 0xa7,
+	0x00, 0xa8, 0x01, 0x30, 0x01, 0x5e, 0x01, 0x1e, 0x01, 0x34, 0x00, 0xad,
+	0xff, 0xff, 0x01, 0x7b, 0x00, 0xb0, 0x01, 0x27, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x01, 0x25, 0x00, 0xb7, 0x00, 0xb8, 0x01, 0x31,
+	0x01, 0x5f, 0x01, 0x1f, 0x01, 0x35, 0x00, 0xbd, 0xff, 0xff, 0x01, 0x7c,
+	0x00, 0xc0, 0x00, 0xc1, 0x00, 0xc2, 0xff, 0xff, 0x00, 0xc4, 0x01, 0x0a,
+	0x01, 0x08, 0x00, 0xc7, 0x00, 0xc8, 0x00, 0xc9, 0x00, 0xca, 0x00, 0xcb,
+	0x00, 0xcc, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0xff, 0xff, 0x00, 0xd1,
+	0x00, 0xd2, 0x00, 0xd3, 0x00, 0xd4, 0x01, 0x20, 0x00, 0xd6, 0x00, 0xd7,
+	0x01, 0x1c, 0x00, 0xd9, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x01, 0x6c,
+	0x01, 0x5c, 0x00, 0xdf, 0x00, 0xe0, 0x00, 0xe1, 0x00, 0xe2, 0xff, 0xff,
+	0x00, 0xe4, 0x01, 0x0b, 0x01, 0x09, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x00, 0xec, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0xff, 0xff, 0x00, 0xf1, 0x00, 0xf2, 0x00, 0xf3, 0x00, 0xf4, 0x01, 0x21,
+	0x00, 0xf6, 0x00, 0xf7, 0x01, 0x1d, 0x00, 0xf9, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x01, 0x6d, 0x01, 0x5d, 0x02, 0xd9
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-4.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-4.h
new file mode 100644
index 00000000..5db2f778
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-4.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_4[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x01, 0x04,
+	0x01, 0x38, 0x01, 0x56, 0x00, 0xa4, 0x01, 0x28, 0x01, 0x3b, 0x00, 0xa7,
+	0x00, 0xa8, 0x01, 0x60, 0x01, 0x12, 0x01, 0x22, 0x01, 0x66, 0x00, 0xad,
+	0x01, 0x7d, 0x00, 0xaf, 0x00, 0xb0, 0x01, 0x05, 0x02, 0xdb, 0x01, 0x57,
+	0x00, 0xb4, 0x01, 0x29, 0x01, 0x3c, 0x02, 0xc7, 0x00, 0xb8, 0x01, 0x61,
+	0x01, 0x13, 0x01, 0x23, 0x01, 0x67, 0x01, 0x4a, 0x01, 0x7e, 0x01, 0x4b,
+	0x01, 0x00, 0x00, 0xc1, 0x00, 0xc2, 0x00, 0xc3, 0x00, 0xc4, 0x00, 0xc5,
+	0x00, 0xc6, 0x01, 0x2e, 0x01, 0x0c, 0x00, 0xc9, 0x01, 0x18, 0x00, 0xcb,
+	0x01, 0x16, 0x00, 0xcd, 0x00, 0xce, 0x01, 0x2a, 0x01, 0x10, 0x01, 0x45,
+	0x01, 0x4c, 0x01, 0x36, 0x00, 0xd4, 0x00, 0xd5, 0x00, 0xd6, 0x00, 0xd7,
+	0x00, 0xd8, 0x01, 0x72, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x01, 0x68,
+	0x01, 0x6a, 0x00, 0xdf, 0x01, 0x01, 0x00, 0xe1, 0x00, 0xe2, 0x00, 0xe3,
+	0x00, 0xe4, 0x00, 0xe5, 0x00, 0xe6, 0x01, 0x2f, 0x01, 0x0d, 0x00, 0xe9,
+	0x01, 0x19, 0x00, 0xeb, 0x01, 0x17, 0x00, 0xed, 0x00, 0xee, 0x01, 0x2b,
+	0x01, 0x11, 0x01, 0x46, 0x01, 0x4d, 0x01, 0x37, 0x00, 0xf4, 0x00, 0xf5,
+	0x00, 0xf6, 0x00, 0xf7, 0x00, 0xf8, 0x01, 0x73, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x01, 0x69, 0x01, 0x6b, 0x02, 0xd9
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-5.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-5.h
new file mode 100644
index 00000000..d9fe684a
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-5.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_5[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x04, 0x01,
+	0x04, 0x02, 0x04, 0x03, 0x04, 0x04, 0x04, 0x05, 0x04, 0x06, 0x04, 0x07,
+	0x04, 0x08, 0x04, 0x09, 0x04, 0x0a, 0x04, 0x0b, 0x04, 0x0c, 0x00, 0xad,
+	0x04, 0x0e, 0x04, 0x0f, 0x04, 0x10, 0x04, 0x11, 0x04, 0x12, 0x04, 0x13,
+	0x04, 0x14, 0x04, 0x15, 0x04, 0x16, 0x04, 0x17, 0x04, 0x18, 0x04, 0x19,
+	0x04, 0x1a, 0x04, 0x1b, 0x04, 0x1c, 0x04, 0x1d, 0x04, 0x1e, 0x04, 0x1f,
+	0x04, 0x20, 0x04, 0x21, 0x04, 0x22, 0x04, 0x23, 0x04, 0x24, 0x04, 0x25,
+	0x04, 0x26, 0x04, 0x27, 0x04, 0x28, 0x04, 0x29, 0x04, 0x2a, 0x04, 0x2b,
+	0x04, 0x2c, 0x04, 0x2d, 0x04, 0x2e, 0x04, 0x2f, 0x04, 0x30, 0x04, 0x31,
+	0x04, 0x32, 0x04, 0x33, 0x04, 0x34, 0x04, 0x35, 0x04, 0x36, 0x04, 0x37,
+	0x04, 0x38, 0x04, 0x39, 0x04, 0x3a, 0x04, 0x3b, 0x04, 0x3c, 0x04, 0x3d,
+	0x04, 0x3e, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43,
+	0x04, 0x44, 0x04, 0x45, 0x04, 0x46, 0x04, 0x47, 0x04, 0x48, 0x04, 0x49,
+	0x04, 0x4a, 0x04, 0x4b, 0x04, 0x4c, 0x04, 0x4d, 0x04, 0x4e, 0x04, 0x4f,
+	0x21, 0x16, 0x04, 0x51, 0x04, 0x52, 0x04, 0x53, 0x04, 0x54, 0x04, 0x55,
+	0x04, 0x56, 0x04, 0x57, 0x04, 0x58, 0x04, 0x59, 0x04, 0x5a, 0x04, 0x5b,
+	0x04, 0x5c, 0x00, 0xa7, 0x04, 0x5e, 0x04, 0x5f
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-6.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-6.h
new file mode 100644
index 00000000..820020fd
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-6.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_6[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0xa4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x06, 0x0c, 0x00, 0xad,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x06, 0x1b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x06, 0x1f,
+	0xff, 0xff, 0x06, 0x21, 0x06, 0x22, 0x06, 0x23, 0x06, 0x24, 0x06, 0x25,
+	0x06, 0x26, 0x06, 0x27, 0x06, 0x28, 0x06, 0x29, 0x06, 0x2a, 0x06, 0x2b,
+	0x06, 0x2c, 0x06, 0x2d, 0x06, 0x2e, 0x06, 0x2f, 0x06, 0x30, 0x06, 0x31,
+	0x06, 0x32, 0x06, 0x33, 0x06, 0x34, 0x06, 0x35, 0x06, 0x36, 0x06, 0x37,
+	0x06, 0x38, 0x06, 0x39, 0x06, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x06, 0x40, 0x06, 0x41, 0x06, 0x42, 0x06, 0x43,
+	0x06, 0x44, 0x06, 0x45, 0x06, 0x46, 0x06, 0x47, 0x06, 0x48, 0x06, 0x49,
+	0x06, 0x4a, 0x06, 0x4b, 0x06, 0x4c, 0x06, 0x4d, 0x06, 0x4e, 0x06, 0x4f,
+	0x06, 0x50, 0x06, 0x51, 0x06, 0x52, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-7.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-7.h
new file mode 100644
index 00000000..174f9d3c
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-7.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_7[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x20, 0x18,
+	0x20, 0x19, 0x00, 0xa3, 0x20, 0xac, 0x20, 0xaf, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x03, 0x7a, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0xff, 0xff, 0x20, 0x15, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x03, 0x84, 0x03, 0x85, 0x03, 0x86, 0x00, 0xb7, 0x03, 0x88, 0x03, 0x89,
+	0x03, 0x8a, 0x00, 0xbb, 0x03, 0x8c, 0x00, 0xbd, 0x03, 0x8e, 0x03, 0x8f,
+	0x03, 0x90, 0x03, 0x91, 0x03, 0x92, 0x03, 0x93, 0x03, 0x94, 0x03, 0x95,
+	0x03, 0x96, 0x03, 0x97, 0x03, 0x98, 0x03, 0x99, 0x03, 0x9a, 0x03, 0x9b,
+	0x03, 0x9c, 0x03, 0x9d, 0x03, 0x9e, 0x03, 0x9f, 0x03, 0xa0, 0x03, 0xa1,
+	0xff, 0xff, 0x03, 0xa3, 0x03, 0xa4, 0x03, 0xa5, 0x03, 0xa6, 0x03, 0xa7,
+	0x03, 0xa8, 0x03, 0xa9, 0x03, 0xaa, 0x03, 0xab, 0x03, 0xac, 0x03, 0xad,
+	0x03, 0xae, 0x03, 0xaf, 0x03, 0xb0, 0x03, 0xb1, 0x03, 0xb2, 0x03, 0xb3,
+	0x03, 0xb4, 0x03, 0xb5, 0x03, 0xb6, 0x03, 0xb7, 0x03, 0xb8, 0x03, 0xb9,
+	0x03, 0xba, 0x03, 0xbb, 0x03, 0xbc, 0x03, 0xbd, 0x03, 0xbe, 0x03, 0xbf,
+	0x03, 0xc0, 0x03, 0xc1, 0x03, 0xc2, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xc5,
+	0x03, 0xc6, 0x03, 0xc7, 0x03, 0xc8, 0x03, 0xc9, 0x03, 0xca, 0x03, 0xcb,
+	0x03, 0xcc, 0x03, 0xcd, 0x03, 0xce, 0xff, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-8.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-8.h
new file mode 100644
index 00000000..66d4a5ec
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-8.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_8[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0xff, 0xff,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x00, 0xd7, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xaf, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x00, 0xb9,
+	0x00, 0xf7, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x17, 0x05, 0xd0, 0x05, 0xd1, 0x05, 0xd2, 0x05, 0xd3,
+	0x05, 0xd4, 0x05, 0xd5, 0x05, 0xd6, 0x05, 0xd7, 0x05, 0xd8, 0x05, 0xd9,
+	0x05, 0xda, 0x05, 0xdb, 0x05, 0xdc, 0x05, 0xdd, 0x05, 0xde, 0x05, 0xdf,
+	0x05, 0xe0, 0x05, 0xe1, 0x05, 0xe2, 0x05, 0xe3, 0x05, 0xe4, 0x05, 0xe5,
+	0x05, 0xe6, 0x05, 0xe7, 0x05, 0xe8, 0x05, 0xe9, 0x05, 0xea, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x0e, 0x20, 0x0f, 0xff, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-9.h b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-9.h
new file mode 100644
index 00000000..f1a86460
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/iso-8859-9.h
@@ -0,0 +1,24 @@
+static const unsigned char map_iso_8859_9[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83,
+	0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00, 0x89,
+	0x00, 0x8a, 0x00, 0x8b, 0x00, 0x8c, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8f,
+	0x00, 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00, 0x94, 0x00, 0x95,
+	0x00, 0x96, 0x00, 0x97, 0x00, 0x98, 0x00, 0x99, 0x00, 0x9a, 0x00, 0x9b,
+	0x00, 0x9c, 0x00, 0x9d, 0x00, 0x9e, 0x00, 0x9f, 0x00, 0xa0, 0x00, 0xa1,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x00, 0xaa, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xaf, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x00, 0xb9,
+	0x00, 0xba, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x00, 0xbf,
+	0x00, 0xc0, 0x00, 0xc1, 0x00, 0xc2, 0x00, 0xc3, 0x00, 0xc4, 0x00, 0xc5,
+	0x00, 0xc6, 0x00, 0xc7, 0x00, 0xc8, 0x00, 0xc9, 0x00, 0xca, 0x00, 0xcb,
+	0x00, 0xcc, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0x01, 0x1e, 0x00, 0xd1,
+	0x00, 0xd2, 0x00, 0xd3, 0x00, 0xd4, 0x00, 0xd5, 0x00, 0xd6, 0x00, 0xd7,
+	0x00, 0xd8, 0x00, 0xd9, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x01, 0x30,
+	0x01, 0x5e, 0x00, 0xdf, 0x00, 0xe0, 0x00, 0xe1, 0x00, 0xe2, 0x00, 0xe3,
+	0x00, 0xe4, 0x00, 0xe5, 0x00, 0xe6, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x00, 0xec, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0x01, 0x1f, 0x00, 0xf1, 0x00, 0xf2, 0x00, 0xf3, 0x00, 0xf4, 0x00, 0xf5,
+	0x00, 0xf6, 0x00, 0xf7, 0x00, 0xf8, 0x00, 0xf9, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x01, 0x31, 0x01, 0x5f, 0x00, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/koi8-r.h b/trunk/package/libs/libiconv/src/include/charmaps/koi8-r.h
new file mode 100644
index 00000000..c2453a53
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/koi8-r.h
@@ -0,0 +1,24 @@
+static const unsigned char map_koi8_r[] = {
+	0x00, 0x00, 0x00, 0x00, 0x25, 0x00, 0x25, 0x02, 0x25, 0x0c, 0x25, 0x10,
+	0x25, 0x14, 0x25, 0x18, 0x25, 0x1c, 0x25, 0x24, 0x25, 0x2c, 0x25, 0x34,
+	0x25, 0x3c, 0x25, 0x80, 0x25, 0x84, 0x25, 0x88, 0x25, 0x8c, 0x25, 0x90,
+	0x25, 0x91, 0x25, 0x92, 0x25, 0x93, 0x23, 0x20, 0x25, 0xa0, 0x22, 0x19,
+	0x22, 0x1a, 0x22, 0x48, 0x22, 0x64, 0x22, 0x65, 0x00, 0xa0, 0x23, 0x21,
+	0x00, 0xb0, 0x00, 0xb2, 0x00, 0xb7, 0x00, 0xf7, 0x25, 0x50, 0x25, 0x51,
+	0x25, 0x52, 0x04, 0x51, 0x25, 0x53, 0x25, 0x54, 0x25, 0x55, 0x25, 0x56,
+	0x25, 0x57, 0x25, 0x58, 0x25, 0x59, 0x25, 0x5a, 0x25, 0x5b, 0x25, 0x5c,
+	0x25, 0x5d, 0x25, 0x5e, 0x25, 0x5f, 0x25, 0x60, 0x25, 0x61, 0x04, 0x01,
+	0x25, 0x62, 0x25, 0x63, 0x25, 0x64, 0x25, 0x65, 0x25, 0x66, 0x25, 0x67,
+	0x25, 0x68, 0x25, 0x69, 0x25, 0x6a, 0x25, 0x6b, 0x25, 0x6c, 0x00, 0xa9,
+	0x04, 0x4e, 0x04, 0x30, 0x04, 0x31, 0x04, 0x46, 0x04, 0x34, 0x04, 0x35,
+	0x04, 0x44, 0x04, 0x33, 0x04, 0x45, 0x04, 0x38, 0x04, 0x39, 0x04, 0x3a,
+	0x04, 0x3b, 0x04, 0x3c, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x4f,
+	0x04, 0x40, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x36, 0x04, 0x32,
+	0x04, 0x4c, 0x04, 0x4b, 0x04, 0x37, 0x04, 0x48, 0x04, 0x4d, 0x04, 0x49,
+	0x04, 0x47, 0x04, 0x4a, 0x04, 0x2e, 0x04, 0x10, 0x04, 0x11, 0x04, 0x26,
+	0x04, 0x14, 0x04, 0x15, 0x04, 0x24, 0x04, 0x13, 0x04, 0x25, 0x04, 0x18,
+	0x04, 0x19, 0x04, 0x1a, 0x04, 0x1b, 0x04, 0x1c, 0x04, 0x1d, 0x04, 0x1e,
+	0x04, 0x1f, 0x04, 0x2f, 0x04, 0x20, 0x04, 0x21, 0x04, 0x22, 0x04, 0x23,
+	0x04, 0x16, 0x04, 0x12, 0x04, 0x2c, 0x04, 0x2b, 0x04, 0x17, 0x04, 0x28,
+	0x04, 0x2d, 0x04, 0x29, 0x04, 0x27, 0x04, 0x2a
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1250.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1250.h
new file mode 100644
index 00000000..8e4723e4
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1250.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1250[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0x20, 0x1a, 0xff, 0xff,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0xff, 0xff, 0x20, 0x30,
+	0x01, 0x60, 0x20, 0x39, 0x01, 0x5a, 0x01, 0x64, 0x01, 0x7d, 0x01, 0x79,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0xff, 0xff, 0x21, 0x22, 0x01, 0x61, 0x20, 0x3a,
+	0x01, 0x5b, 0x01, 0x65, 0x01, 0x7e, 0x01, 0x7a, 0x00, 0xa0, 0x02, 0xc7,
+	0x02, 0xd8, 0x01, 0x41, 0x00, 0xa4, 0x01, 0x04, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x01, 0x5e, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x01, 0x7b, 0x00, 0xb0, 0x00, 0xb1, 0x02, 0xdb, 0x01, 0x42,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x01, 0x05,
+	0x01, 0x5f, 0x00, 0xbb, 0x01, 0x3d, 0x02, 0xdd, 0x01, 0x3e, 0x01, 0x7c,
+	0x01, 0x54, 0x00, 0xc1, 0x00, 0xc2, 0x01, 0x02, 0x00, 0xc4, 0x01, 0x39,
+	0x01, 0x06, 0x00, 0xc7, 0x01, 0x0c, 0x00, 0xc9, 0x01, 0x18, 0x00, 0xcb,
+	0x01, 0x1a, 0x00, 0xcd, 0x00, 0xce, 0x01, 0x0e, 0x01, 0x10, 0x01, 0x43,
+	0x01, 0x47, 0x00, 0xd3, 0x00, 0xd4, 0x01, 0x50, 0x00, 0xd6, 0x00, 0xd7,
+	0x01, 0x58, 0x01, 0x6e, 0x00, 0xda, 0x01, 0x70, 0x00, 0xdc, 0x00, 0xdd,
+	0x01, 0x62, 0x00, 0xdf, 0x01, 0x55, 0x00, 0xe1, 0x00, 0xe2, 0x01, 0x03,
+	0x00, 0xe4, 0x01, 0x3a, 0x01, 0x07, 0x00, 0xe7, 0x01, 0x0d, 0x00, 0xe9,
+	0x01, 0x19, 0x00, 0xeb, 0x01, 0x1b, 0x00, 0xed, 0x00, 0xee, 0x01, 0x0f,
+	0x01, 0x11, 0x01, 0x44, 0x01, 0x48, 0x00, 0xf3, 0x00, 0xf4, 0x01, 0x51,
+	0x00, 0xf6, 0x00, 0xf7, 0x01, 0x59, 0x01, 0x6f, 0x00, 0xfa, 0x01, 0x71,
+	0x00, 0xfc, 0x00, 0xfd, 0x01, 0x63, 0x02, 0xd9
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1251.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1251.h
new file mode 100644
index 00000000..e2788507
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1251.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1251[] = {
+	0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x04, 0x03, 0x20, 0x1a, 0x04, 0x53,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0x20, 0xac, 0x20, 0x30,
+	0x04, 0x09, 0x20, 0x39, 0x04, 0x0a, 0x04, 0x0c, 0x04, 0x0b, 0x04, 0x0f,
+	0x04, 0x52, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0xff, 0xff, 0x21, 0x22, 0x04, 0x59, 0x20, 0x3a,
+	0x04, 0x5a, 0x04, 0x5c, 0x04, 0x5b, 0x04, 0x5f, 0x00, 0xa0, 0x04, 0x0e,
+	0x04, 0x5e, 0x04, 0x08, 0x00, 0xa4, 0x04, 0x90, 0x00, 0xa6, 0x00, 0xa7,
+	0x04, 0x01, 0x00, 0xa9, 0x04, 0x04, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x04, 0x07, 0x00, 0xb0, 0x00, 0xb1, 0x04, 0x06, 0x04, 0x56,
+	0x04, 0x91, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x04, 0x51, 0x21, 0x16,
+	0x04, 0x54, 0x00, 0xbb, 0x04, 0x58, 0x04, 0x05, 0x04, 0x55, 0x04, 0x57,
+	0x04, 0x10, 0x04, 0x11, 0x04, 0x12, 0x04, 0x13, 0x04, 0x14, 0x04, 0x15,
+	0x04, 0x16, 0x04, 0x17, 0x04, 0x18, 0x04, 0x19, 0x04, 0x1a, 0x04, 0x1b,
+	0x04, 0x1c, 0x04, 0x1d, 0x04, 0x1e, 0x04, 0x1f, 0x04, 0x20, 0x04, 0x21,
+	0x04, 0x22, 0x04, 0x23, 0x04, 0x24, 0x04, 0x25, 0x04, 0x26, 0x04, 0x27,
+	0x04, 0x28, 0x04, 0x29, 0x04, 0x2a, 0x04, 0x2b, 0x04, 0x2c, 0x04, 0x2d,
+	0x04, 0x2e, 0x04, 0x2f, 0x04, 0x30, 0x04, 0x31, 0x04, 0x32, 0x04, 0x33,
+	0x04, 0x34, 0x04, 0x35, 0x04, 0x36, 0x04, 0x37, 0x04, 0x38, 0x04, 0x39,
+	0x04, 0x3a, 0x04, 0x3b, 0x04, 0x3c, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x3f,
+	0x04, 0x40, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x44, 0x04, 0x45,
+	0x04, 0x46, 0x04, 0x47, 0x04, 0x48, 0x04, 0x49, 0x04, 0x4a, 0x04, 0x4b,
+	0x04, 0x4c, 0x04, 0x4d, 0x04, 0x4e, 0x04, 0x4f
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1252.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1252.h
new file mode 100644
index 00000000..a6dad8a0
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1252.h
@@ -0,0 +1,25 @@
+static const unsigned char map_windows_1252[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0x20, 0x1a, 0x01, 0x92,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0x02, 0xc6, 0x20, 0x30,
+	0x01, 0x60, 0x20, 0x39, 0x01, 0x52, 0xff, 0xff, 0x01, 0x7d, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0x02, 0xdc, 0x21, 0x22, 0x01, 0x61, 0x20, 0x3a,
+	0x01, 0x53, 0xff, 0xff, 0x01, 0x7e, 0x01, 0x78, 0x00, 0xa0, 0x00, 0xa1,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x00, 0xaa, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xaf, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x00, 0xb9,
+	0x00, 0xba, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x00, 0xbf,
+	0x00, 0xc0, 0x00, 0xc1, 0x00, 0xc2, 0x00, 0xc3, 0x00, 0xc4, 0x00, 0xc5,
+	0x00, 0xc6, 0x00, 0xc7, 0x00, 0xc8, 0x00, 0xc9, 0x00, 0xca, 0x00, 0xcb,
+	0x00, 0xcc, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0x00, 0xd0, 0x00, 0xd1,
+	0x00, 0xd2, 0x00, 0xd3, 0x00, 0xd4, 0x00, 0xd5, 0x00, 0xd6, 0x00, 0xd7,
+	0x00, 0xd8, 0x00, 0xd9, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x00, 0xdd,
+	0x00, 0xde, 0x00, 0xdf, 0x00, 0xe0, 0x00, 0xe1, 0x00, 0xe2, 0x00, 0xe3,
+	0x00, 0xe4, 0x00, 0xe5, 0x00, 0xe6, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x00, 0xec, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0x00, 0xf0, 0x00, 0xf1, 0x00, 0xf2, 0x00, 0xf3, 0x00, 0xf4, 0x00, 0xf5,
+	0x00, 0xf6, 0x00, 0xf7, 0x00, 0xf8, 0x00, 0xf9, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x00, 0xfd, 0x00, 0xfe, 0x00, 0xff
+};
+
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1253.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1253.h
new file mode 100644
index 00000000..b0bdf1eb
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1253.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1253[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0x20, 0x1a, 0x01, 0x92,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0xff, 0xff, 0x20, 0x30,
+	0xff, 0xff, 0x20, 0x39, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0xff, 0xff, 0x21, 0x22, 0xff, 0xff, 0x20, 0x3a,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xa0, 0x03, 0x85,
+	0x03, 0x86, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0xff, 0xff, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x20, 0x15, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x03, 0x84, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x03, 0x88, 0x03, 0x89,
+	0x03, 0x8a, 0x00, 0xbb, 0x03, 0x8c, 0x00, 0xbd, 0x03, 0x8e, 0x03, 0x8f,
+	0x03, 0x90, 0x03, 0x91, 0x03, 0x92, 0x03, 0x93, 0x03, 0x94, 0x03, 0x95,
+	0x03, 0x96, 0x03, 0x97, 0x03, 0x98, 0x03, 0x99, 0x03, 0x9a, 0x03, 0x9b,
+	0x03, 0x9c, 0x03, 0x9d, 0x03, 0x9e, 0x03, 0x9f, 0x03, 0xa0, 0x03, 0xa1,
+	0xff, 0xff, 0x03, 0xa3, 0x03, 0xa4, 0x03, 0xa5, 0x03, 0xa6, 0x03, 0xa7,
+	0x03, 0xa8, 0x03, 0xa9, 0x03, 0xaa, 0x03, 0xab, 0x03, 0xac, 0x03, 0xad,
+	0x03, 0xae, 0x03, 0xaf, 0x03, 0xb0, 0x03, 0xb1, 0x03, 0xb2, 0x03, 0xb3,
+	0x03, 0xb4, 0x03, 0xb5, 0x03, 0xb6, 0x03, 0xb7, 0x03, 0xb8, 0x03, 0xb9,
+	0x03, 0xba, 0x03, 0xbb, 0x03, 0xbc, 0x03, 0xbd, 0x03, 0xbe, 0x03, 0xbf,
+	0x03, 0xc0, 0x03, 0xc1, 0x03, 0xc2, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xc5,
+	0x03, 0xc6, 0x03, 0xc7, 0x03, 0xc8, 0x03, 0xc9, 0x03, 0xca, 0x03, 0xcb,
+	0x03, 0xcc, 0x03, 0xcd, 0x03, 0xce, 0xff, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1254.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1254.h
new file mode 100644
index 00000000..be226007
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1254.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1254[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0x20, 0x1a, 0x01, 0x92,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0x02, 0xc6, 0x20, 0x30,
+	0x01, 0x60, 0x20, 0x39, 0x01, 0x52, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0x02, 0xdc, 0x21, 0x22, 0x01, 0x61, 0x20, 0x3a,
+	0x01, 0x53, 0xff, 0xff, 0xff, 0xff, 0x01, 0x78, 0x00, 0xa0, 0x00, 0xa1,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x00, 0xaa, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xaf, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x00, 0xb9,
+	0x00, 0xba, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x00, 0xbf,
+	0x00, 0xc0, 0x00, 0xc1, 0x00, 0xc2, 0x00, 0xc3, 0x00, 0xc4, 0x00, 0xc5,
+	0x00, 0xc6, 0x00, 0xc7, 0x00, 0xc8, 0x00, 0xc9, 0x00, 0xca, 0x00, 0xcb,
+	0x00, 0xcc, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0x01, 0x1e, 0x00, 0xd1,
+	0x00, 0xd2, 0x00, 0xd3, 0x00, 0xd4, 0x00, 0xd5, 0x00, 0xd6, 0x00, 0xd7,
+	0x00, 0xd8, 0x00, 0xd9, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x01, 0x30,
+	0x01, 0x5e, 0x00, 0xdf, 0x00, 0xe0, 0x00, 0xe1, 0x00, 0xe2, 0x00, 0xe3,
+	0x00, 0xe4, 0x00, 0xe5, 0x00, 0xe6, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x00, 0xec, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0x01, 0x1f, 0x00, 0xf1, 0x00, 0xf2, 0x00, 0xf3, 0x00, 0xf4, 0x00, 0xf5,
+	0x00, 0xf6, 0x00, 0xf7, 0x00, 0xf8, 0x00, 0xf9, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x01, 0x31, 0x01, 0x5f, 0x00, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1255.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1255.h
new file mode 100644
index 00000000..28bf513d
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1255.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1255[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0x20, 0x1a, 0x01, 0x92,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0x02, 0xc6, 0x20, 0x30,
+	0xff, 0xff, 0x20, 0x39, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0x02, 0xdc, 0x21, 0x22, 0xff, 0xff, 0x20, 0x3a,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xa0, 0x00, 0xa1,
+	0x00, 0xa2, 0x00, 0xa3, 0x20, 0xaa, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x00, 0xd7, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xaf, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x00, 0xb9,
+	0x00, 0xf7, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x00, 0xbf,
+	0x05, 0xb0, 0x05, 0xb1, 0x05, 0xb2, 0x05, 0xb3, 0x05, 0xb4, 0x05, 0xb5,
+	0x05, 0xb6, 0x05, 0xb7, 0x05, 0xb8, 0x05, 0xb9, 0xff, 0xff, 0x05, 0xbb,
+	0x05, 0xbc, 0x05, 0xbd, 0x05, 0xbe, 0x05, 0xbf, 0x05, 0xc0, 0x05, 0xc1,
+	0x05, 0xc2, 0x05, 0xc3, 0x05, 0xf0, 0x05, 0xf1, 0x05, 0xf2, 0x05, 0xf3,
+	0x05, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x05, 0xd0, 0x05, 0xd1, 0x05, 0xd2, 0x05, 0xd3,
+	0x05, 0xd4, 0x05, 0xd5, 0x05, 0xd6, 0x05, 0xd7, 0x05, 0xd8, 0x05, 0xd9,
+	0x05, 0xda, 0x05, 0xdb, 0x05, 0xdc, 0x05, 0xdd, 0x05, 0xde, 0x05, 0xdf,
+	0x05, 0xe0, 0x05, 0xe1, 0x05, 0xe2, 0x05, 0xe3, 0x05, 0xe4, 0x05, 0xe5,
+	0x05, 0xe6, 0x05, 0xe7, 0x05, 0xe8, 0x05, 0xe9, 0x05, 0xea, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x0e, 0x20, 0x0f, 0xff, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1256.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1256.h
new file mode 100644
index 00000000..fbca315e
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1256.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1256[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0x06, 0x7e, 0x20, 0x1a, 0x01, 0x92,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0x02, 0xc6, 0x20, 0x30,
+	0x06, 0x79, 0x20, 0x39, 0x01, 0x52, 0x06, 0x86, 0x06, 0x98, 0x06, 0x88,
+	0x06, 0xaf, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0x06, 0xa9, 0x21, 0x22, 0x06, 0x91, 0x20, 0x3a,
+	0x01, 0x53, 0x20, 0x0c, 0x20, 0x0d, 0x06, 0xba, 0x00, 0xa0, 0x06, 0x0c,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x06, 0xbe, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xaf, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x00, 0xb9,
+	0x06, 0x1b, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x06, 0x1f,
+	0x06, 0xc1, 0x06, 0x21, 0x06, 0x22, 0x06, 0x23, 0x06, 0x24, 0x06, 0x25,
+	0x06, 0x26, 0x06, 0x27, 0x06, 0x28, 0x06, 0x29, 0x06, 0x2a, 0x06, 0x2b,
+	0x06, 0x2c, 0x06, 0x2d, 0x06, 0x2e, 0x06, 0x2f, 0x06, 0x30, 0x06, 0x31,
+	0x06, 0x32, 0x06, 0x33, 0x06, 0x34, 0x06, 0x35, 0x06, 0x36, 0x00, 0xd7,
+	0x06, 0x37, 0x06, 0x38, 0x06, 0x39, 0x06, 0x3a, 0x06, 0x40, 0x06, 0x41,
+	0x06, 0x42, 0x06, 0x43, 0x00, 0xe0, 0x06, 0x44, 0x00, 0xe2, 0x06, 0x45,
+	0x06, 0x46, 0x06, 0x47, 0x06, 0x48, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x06, 0x49, 0x06, 0x4a, 0x00, 0xee, 0x00, 0xef,
+	0x06, 0x4b, 0x06, 0x4c, 0x06, 0x4d, 0x06, 0x4e, 0x00, 0xf4, 0x06, 0x4f,
+	0x06, 0x50, 0x00, 0xf7, 0x06, 0x51, 0x00, 0xf9, 0x06, 0x52, 0x00, 0xfb,
+	0x00, 0xfc, 0x20, 0x0e, 0x20, 0x0f, 0x06, 0xd2
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1257.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1257.h
new file mode 100644
index 00000000..69d4474b
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1257.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1257[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0x20, 0x1a, 0xff, 0xff,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0xff, 0xff, 0x20, 0x30,
+	0xff, 0xff, 0x20, 0x39, 0xff, 0xff, 0x00, 0xa8, 0x02, 0xc7, 0x00, 0xb8,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0xff, 0xff, 0x21, 0x22, 0xff, 0xff, 0x20, 0x3a,
+	0xff, 0xff, 0x00, 0xaf, 0x02, 0xdb, 0xff, 0xff, 0x00, 0xa0, 0xff, 0xff,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0xff, 0xff, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xd8, 0x00, 0xa9, 0x01, 0x56, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xc6, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xf8, 0x00, 0xb9,
+	0x01, 0x57, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x00, 0xe6,
+	0x01, 0x04, 0x01, 0x2e, 0x01, 0x00, 0x01, 0x06, 0x00, 0xc4, 0x00, 0xc5,
+	0x01, 0x18, 0x01, 0x12, 0x01, 0x0c, 0x00, 0xc9, 0x01, 0x79, 0x01, 0x16,
+	0x01, 0x22, 0x01, 0x36, 0x01, 0x2a, 0x01, 0x3b, 0x01, 0x60, 0x01, 0x43,
+	0x01, 0x45, 0x00, 0xd3, 0x01, 0x4c, 0x00, 0xd5, 0x00, 0xd6, 0x00, 0xd7,
+	0x01, 0x72, 0x01, 0x41, 0x01, 0x5a, 0x01, 0x6a, 0x00, 0xdc, 0x01, 0x7b,
+	0x01, 0x7d, 0x00, 0xdf, 0x01, 0x05, 0x01, 0x2f, 0x01, 0x01, 0x01, 0x07,
+	0x00, 0xe4, 0x00, 0xe5, 0x01, 0x19, 0x01, 0x13, 0x01, 0x0d, 0x00, 0xe9,
+	0x01, 0x7a, 0x01, 0x17, 0x01, 0x23, 0x01, 0x37, 0x01, 0x2b, 0x01, 0x3c,
+	0x01, 0x61, 0x01, 0x44, 0x01, 0x46, 0x00, 0xf3, 0x01, 0x4d, 0x00, 0xf5,
+	0x00, 0xf6, 0x00, 0xf7, 0x01, 0x73, 0x01, 0x42, 0x01, 0x5b, 0x01, 0x6b,
+	0x00, 0xfc, 0x01, 0x7c, 0x01, 0x7e, 0x02, 0xd9
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-1258.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-1258.h
new file mode 100644
index 00000000..5bbd737a
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-1258.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_1258[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0x20, 0x1a, 0x01, 0x92,
+	0x20, 0x1e, 0x20, 0x26, 0x20, 0x20, 0x20, 0x21, 0x02, 0xc6, 0x20, 0x30,
+	0xff, 0xff, 0x20, 0x39, 0x01, 0x52, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0x02, 0xdc, 0x21, 0x22, 0xff, 0xff, 0x20, 0x3a,
+	0x01, 0x53, 0xff, 0xff, 0xff, 0xff, 0x01, 0x78, 0x00, 0xa0, 0x00, 0xa1,
+	0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa5, 0x00, 0xa6, 0x00, 0xa7,
+	0x00, 0xa8, 0x00, 0xa9, 0x00, 0xaa, 0x00, 0xab, 0x00, 0xac, 0x00, 0xad,
+	0x00, 0xae, 0x00, 0xaf, 0x00, 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3,
+	0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, 0xb7, 0x00, 0xb8, 0x00, 0xb9,
+	0x00, 0xba, 0x00, 0xbb, 0x00, 0xbc, 0x00, 0xbd, 0x00, 0xbe, 0x00, 0xbf,
+	0x00, 0xc0, 0x00, 0xc1, 0x00, 0xc2, 0x01, 0x02, 0x00, 0xc4, 0x00, 0xc5,
+	0x00, 0xc6, 0x00, 0xc7, 0x00, 0xc8, 0x00, 0xc9, 0x00, 0xca, 0x00, 0xcb,
+	0x03, 0x00, 0x00, 0xcd, 0x00, 0xce, 0x00, 0xcf, 0x01, 0x10, 0x00, 0xd1,
+	0x03, 0x09, 0x00, 0xd3, 0x00, 0xd4, 0x01, 0xa0, 0x00, 0xd6, 0x00, 0xd7,
+	0x00, 0xd8, 0x00, 0xd9, 0x00, 0xda, 0x00, 0xdb, 0x00, 0xdc, 0x01, 0xaf,
+	0x03, 0x03, 0x00, 0xdf, 0x00, 0xe0, 0x00, 0xe1, 0x00, 0xe2, 0x01, 0x03,
+	0x00, 0xe4, 0x00, 0xe5, 0x00, 0xe6, 0x00, 0xe7, 0x00, 0xe8, 0x00, 0xe9,
+	0x00, 0xea, 0x00, 0xeb, 0x03, 0x01, 0x00, 0xed, 0x00, 0xee, 0x00, 0xef,
+	0x01, 0x11, 0x00, 0xf1, 0x03, 0x23, 0x00, 0xf3, 0x00, 0xf4, 0x01, 0xa1,
+	0x00, 0xf6, 0x00, 0xf7, 0x00, 0xf8, 0x00, 0xf9, 0x00, 0xfa, 0x00, 0xfb,
+	0x00, 0xfc, 0x01, 0xb0, 0x20, 0xab, 0x00, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/charmaps/windows-874.h b/trunk/package/libs/libiconv/src/include/charmaps/windows-874.h
new file mode 100644
index 00000000..5749280a
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/charmaps/windows-874.h
@@ -0,0 +1,24 @@
+static const unsigned char map_windows_874[] = {
+	0x00, 0x00, 0x00, 0x00, 0x20, 0xac, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x26, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x20, 0x18, 0x20, 0x19, 0x20, 0x1c, 0x20, 0x1d, 0x20, 0x22,
+	0x20, 0x13, 0x20, 0x14, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xa0, 0x0e, 0x01,
+	0x0e, 0x02, 0x0e, 0x03, 0x0e, 0x04, 0x0e, 0x05, 0x0e, 0x06, 0x0e, 0x07,
+	0x0e, 0x08, 0x0e, 0x09, 0x0e, 0x0a, 0x0e, 0x0b, 0x0e, 0x0c, 0x0e, 0x0d,
+	0x0e, 0x0e, 0x0e, 0x0f, 0x0e, 0x10, 0x0e, 0x11, 0x0e, 0x12, 0x0e, 0x13,
+	0x0e, 0x14, 0x0e, 0x15, 0x0e, 0x16, 0x0e, 0x17, 0x0e, 0x18, 0x0e, 0x19,
+	0x0e, 0x1a, 0x0e, 0x1b, 0x0e, 0x1c, 0x0e, 0x1d, 0x0e, 0x1e, 0x0e, 0x1f,
+	0x0e, 0x20, 0x0e, 0x21, 0x0e, 0x22, 0x0e, 0x23, 0x0e, 0x24, 0x0e, 0x25,
+	0x0e, 0x26, 0x0e, 0x27, 0x0e, 0x28, 0x0e, 0x29, 0x0e, 0x2a, 0x0e, 0x2b,
+	0x0e, 0x2c, 0x0e, 0x2d, 0x0e, 0x2e, 0x0e, 0x2f, 0x0e, 0x30, 0x0e, 0x31,
+	0x0e, 0x32, 0x0e, 0x33, 0x0e, 0x34, 0x0e, 0x35, 0x0e, 0x36, 0x0e, 0x37,
+	0x0e, 0x38, 0x0e, 0x39, 0x0e, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x0e, 0x3f, 0x0e, 0x40, 0x0e, 0x41, 0x0e, 0x42, 0x0e, 0x43,
+	0x0e, 0x44, 0x0e, 0x45, 0x0e, 0x46, 0x0e, 0x47, 0x0e, 0x48, 0x0e, 0x49,
+	0x0e, 0x4a, 0x0e, 0x4b, 0x0e, 0x4c, 0x0e, 0x4d, 0x0e, 0x4e, 0x0e, 0x4f,
+	0x0e, 0x50, 0x0e, 0x51, 0x0e, 0x52, 0x0e, 0x53, 0x0e, 0x54, 0x0e, 0x55,
+	0x0e, 0x56, 0x0e, 0x57, 0x0e, 0x58, 0x0e, 0x59, 0x0e, 0x5a, 0x0e, 0x5b,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
diff --git a/trunk/package/libs/libiconv/src/include/iconv.h b/trunk/package/libs/libiconv/src/include/iconv.h
new file mode 100644
index 00000000..dfab27f0
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/include/iconv.h
@@ -0,0 +1,32 @@
+#ifndef _ICONV_H
+#define _ICONV_H 1
+
+#define _LIBICONV_VERSION 0x010B    /* version number: (major<<8) + minor */
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int _libiconv_version; /* Likewise */
+
+typedef long iconv_t;
+
+extern iconv_t
+iconv_open(const char *tocode, const char *fromcode);
+
+extern size_t
+iconv(iconv_t cd, char **inbuf, size_t *inbytesleft,
+                  char **outbuf, size_t *outbytesleft);
+
+extern int
+iconv_close(iconv_t cd);
+
+#define libiconv_set_relocation_prefix(...) do {} while(0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ICONV_H */
diff --git a/trunk/package/libs/libiconv/src/m4/iconv.m4 b/trunk/package/libs/libiconv/src/m4/iconv.m4
new file mode 100644
index 00000000..e2041b9b
--- /dev/null
+++ b/trunk/package/libs/libiconv/src/m4/iconv.m4
@@ -0,0 +1,214 @@
+# iconv.m4 serial 11 (gettext-0.18.1)
+dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      [am_cv_func_iconv=yes])
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE([HAVE_ICONV], [1],
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
+])
+
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define([gl_iconv_AC_DEFUN],
+  m4_version_prereq([2.64],
+    [[AC_DEFUN_ONCE(
+        [$1], [$2])]],
+    [[AC_DEFUN(
+        [$1], [$2])]]))
+gl_iconv_AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL([am_cv_proto_iconv], [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([
+         $am_cv_proto_iconv])
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+])
diff --git a/trunk/package/libs/libjson-c/Makefile b/trunk/package/libs/libjson-c/Makefile
new file mode 100644
index 00000000..4e0c47da
--- /dev/null
+++ b/trunk/package/libs/libjson-c/Makefile
@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=json-c
+PKG_VERSION:=0.11
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
+PKG_MD5SUM:=aa02367d2f7a830bf1e3376f77881e98
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += $(FPIC)
+
+define Package/libjson-c
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=javascript object notation
+  URL:=http://oss.metaparadigm.com/json-c/
+endef
+
+define Package/libjson-c/description
+ This package contains a library for javascript object notation backends.
+endef
+
+define Package/libjson
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libjson-c
+  TITLE:=javascript object notation (compat library)
+  URL:=http://oss.metaparadigm.com/json-c/
+endef
+
+define Package/libjson/description
+ This package contains a compatibility library for packages that have not
+ been adapted to the json-c library rename yet
+endef
+
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/json-c $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json-c.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libjson-c/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.so.* $(1)/usr/lib/
+endef
+
+define Package/libjson/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libjson-c))
+$(eval $(call BuildPackage,libjson))
diff --git a/trunk/package/libs/libmnl/Makefile b/trunk/package/libs/libmnl/Makefile
new file mode 100644
index 00000000..06c77652
--- /dev/null
+++ b/trunk/package/libs/libmnl/Makefile
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libmnl
+PKG_VERSION:=1.0.3
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://www.netfilter.org/projects/libmnl/files \
+	ftp://ftp.netfilter.org/pub/libmnl
+PKG_MD5SUM:=7d95fc3bea3365bc03c48e484224f65f
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_LICENSE:=LGPL-2.1+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmnl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Minimalistic user-space library for Netlink
+  URL:=http://www.netfilter.org/projects/libmnl/
+endef
+
+define Package/libmnl/description
+ libmnl is a minimalistic user-space library oriented to Netlink developers.
+ There are a lot of common tasks in parsing, validating, constructing of
+ both the Netlink header and TLVs that are repetitive and easy to get wrong.
+ This library aims to provide simple helpers that allows you to re-use code
+ and to avoid re-inventing the wheel. The main features of this library are:
+ .
+ * Small: the shared library requires around 30KB for an x86-based computer.
+ .
+ * Simple: this library avoids complexity and elaborated abstractions that
+   tend to hide Netlink details.
+ .
+ * Easy to use: the library simplifies the work for Netlink-wise developers.
+   It provides functions to make socket handling, message building, validating,
+   parsing and sequence tracking, easier.
+ .
+ * Easy to re-use: you can use the library to build your own abstraction layer
+   on top of this library.
+ .
+ * Decoupling: the interdependency of the main bricks that compose the library
+   is reduced, i.e. the library provides many helpers, but the programmer is not
+   forced to use them.
+endef
+
+CONFIGURE_ARGS+= \
+	--enable-shared \
+	--enable-static \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmnl $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmnl.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmnl.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libmnl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmnl.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libmnl))
diff --git a/trunk/package/libs/libmnl/patches/100-upstream-fixes.patch b/trunk/package/libs/libmnl/patches/100-upstream-fixes.patch
new file mode 100644
index 00000000..d6e21a91
--- /dev/null
+++ b/trunk/package/libs/libmnl/patches/100-upstream-fixes.patch
@@ -0,0 +1,416 @@
+diff --git a/configure.ac b/configure.ac
+index 718ab1c..313a015 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,5 +27,5 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
+ 	-Wformat=2 -pipe"
+ AC_SUBST([regular_CPPFLAGS])
+ AC_SUBST([regular_CFLAGS])
+-AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile include/linux/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg])
++AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg])
+ AC_OUTPUT
+diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h
+index a647fd9..223709c 100644
+--- a/include/libmnl/libmnl.h
++++ b/include/libmnl/libmnl.h
+@@ -1,14 +1,9 @@
+ #ifndef _LIBMNL_H_
+ #define _LIBMNL_H_
+ 
+-#ifdef __cplusplus
+-#	include <cstdio>
+-#	include <cstdint>
+-#else
+-#	include <stdbool.h> /* not in C++ */
+-#	include <stdio.h>
+-#	include <stdint.h>
+-#endif
++#include <stdbool.h>
++#include <stdio.h>
++#include <stdint.h>
+ #include <unistd.h>
+ #include <sys/socket.h> /* for sa_family_t */
+ #include <linux/netlink.h>
+diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
+index 2d02887..08c600b 100644
+--- a/include/linux/Makefile.am
++++ b/include/linux/Makefile.am
+@@ -1 +1,2 @@
+-noinst_HEADERS = netlink.h
++SUBDIRS = netfilter
++noinst_HEADERS = netlink.h socket.h
+diff --git a/include/linux/netfilter/Makefile.am b/include/linux/netfilter/Makefile.am
+new file mode 100644
+index 0000000..64a975e
+--- /dev/null
++++ b/include/linux/netfilter/Makefile.am
+@@ -0,0 +1 @@
++noinst_HEADERS = nfnetlink_conntrack.h
+diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
+new file mode 100644
+index 0000000..08fabc6
+--- /dev/null
++++ b/include/linux/netfilter/nfnetlink_conntrack.h
+@@ -0,0 +1,252 @@
++#ifndef _IPCONNTRACK_NETLINK_H
++#define _IPCONNTRACK_NETLINK_H
++#include <linux/netfilter/nfnetlink.h>
++
++enum cntl_msg_types {
++	IPCTNL_MSG_CT_NEW,
++	IPCTNL_MSG_CT_GET,
++	IPCTNL_MSG_CT_DELETE,
++	IPCTNL_MSG_CT_GET_CTRZERO,
++	IPCTNL_MSG_CT_GET_STATS_CPU,
++	IPCTNL_MSG_CT_GET_STATS,
++	IPCTNL_MSG_CT_GET_DYING,
++	IPCTNL_MSG_CT_GET_UNCONFIRMED,
++
++	IPCTNL_MSG_MAX
++};
++
++enum ctnl_exp_msg_types {
++	IPCTNL_MSG_EXP_NEW,
++	IPCTNL_MSG_EXP_GET,
++	IPCTNL_MSG_EXP_DELETE,
++	IPCTNL_MSG_EXP_GET_STATS_CPU,
++
++	IPCTNL_MSG_EXP_MAX
++};
++
++
++enum ctattr_type {
++	CTA_UNSPEC,
++	CTA_TUPLE_ORIG,
++	CTA_TUPLE_REPLY,
++	CTA_STATUS,
++	CTA_PROTOINFO,
++	CTA_HELP,
++	CTA_NAT_SRC,
++#define CTA_NAT	CTA_NAT_SRC	/* backwards compatibility */
++	CTA_TIMEOUT,
++	CTA_MARK,
++	CTA_COUNTERS_ORIG,
++	CTA_COUNTERS_REPLY,
++	CTA_USE,
++	CTA_ID,
++	CTA_NAT_DST,
++	CTA_TUPLE_MASTER,
++	CTA_NAT_SEQ_ADJ_ORIG,
++	CTA_NAT_SEQ_ADJ_REPLY,
++	CTA_SECMARK,		/* obsolete */
++	CTA_ZONE,
++	CTA_SECCTX,
++	CTA_TIMESTAMP,
++	CTA_MARK_MASK,
++	CTA_LABELS,
++	CTA_LABELS_MASK,
++	__CTA_MAX
++};
++#define CTA_MAX (__CTA_MAX - 1)
++
++enum ctattr_tuple {
++	CTA_TUPLE_UNSPEC,
++	CTA_TUPLE_IP,
++	CTA_TUPLE_PROTO,
++	__CTA_TUPLE_MAX
++};
++#define CTA_TUPLE_MAX (__CTA_TUPLE_MAX - 1)
++
++enum ctattr_ip {
++	CTA_IP_UNSPEC,
++	CTA_IP_V4_SRC,
++	CTA_IP_V4_DST,
++	CTA_IP_V6_SRC,
++	CTA_IP_V6_DST,
++	__CTA_IP_MAX
++};
++#define CTA_IP_MAX (__CTA_IP_MAX - 1)
++
++enum ctattr_l4proto {
++	CTA_PROTO_UNSPEC,
++	CTA_PROTO_NUM,
++	CTA_PROTO_SRC_PORT,
++	CTA_PROTO_DST_PORT,
++	CTA_PROTO_ICMP_ID,
++	CTA_PROTO_ICMP_TYPE,
++	CTA_PROTO_ICMP_CODE,
++	CTA_PROTO_ICMPV6_ID,
++	CTA_PROTO_ICMPV6_TYPE,
++	CTA_PROTO_ICMPV6_CODE,
++	__CTA_PROTO_MAX
++};
++#define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1)
++
++enum ctattr_protoinfo {
++	CTA_PROTOINFO_UNSPEC,
++	CTA_PROTOINFO_TCP,
++	CTA_PROTOINFO_DCCP,
++	CTA_PROTOINFO_SCTP,
++	__CTA_PROTOINFO_MAX
++};
++#define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1)
++
++enum ctattr_protoinfo_tcp {
++	CTA_PROTOINFO_TCP_UNSPEC,
++	CTA_PROTOINFO_TCP_STATE,
++	CTA_PROTOINFO_TCP_WSCALE_ORIGINAL,
++	CTA_PROTOINFO_TCP_WSCALE_REPLY,
++	CTA_PROTOINFO_TCP_FLAGS_ORIGINAL,
++	CTA_PROTOINFO_TCP_FLAGS_REPLY,
++	__CTA_PROTOINFO_TCP_MAX
++};
++#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1)
++
++enum ctattr_protoinfo_dccp {
++	CTA_PROTOINFO_DCCP_UNSPEC,
++	CTA_PROTOINFO_DCCP_STATE,
++	CTA_PROTOINFO_DCCP_ROLE,
++	CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,
++	__CTA_PROTOINFO_DCCP_MAX,
++};
++#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)
++
++enum ctattr_protoinfo_sctp {
++	CTA_PROTOINFO_SCTP_UNSPEC,
++	CTA_PROTOINFO_SCTP_STATE,
++	CTA_PROTOINFO_SCTP_VTAG_ORIGINAL,
++	CTA_PROTOINFO_SCTP_VTAG_REPLY,
++	__CTA_PROTOINFO_SCTP_MAX
++};
++#define CTA_PROTOINFO_SCTP_MAX (__CTA_PROTOINFO_SCTP_MAX - 1)
++
++enum ctattr_counters {
++	CTA_COUNTERS_UNSPEC,
++	CTA_COUNTERS_PACKETS,		/* 64bit counters */
++	CTA_COUNTERS_BYTES,		/* 64bit counters */
++	CTA_COUNTERS32_PACKETS,		/* old 32bit counters, unused */
++	CTA_COUNTERS32_BYTES,		/* old 32bit counters, unused */
++	__CTA_COUNTERS_MAX
++};
++#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)
++
++enum ctattr_tstamp {
++	CTA_TIMESTAMP_UNSPEC,
++	CTA_TIMESTAMP_START,
++	CTA_TIMESTAMP_STOP,
++	__CTA_TIMESTAMP_MAX
++};
++#define CTA_TIMESTAMP_MAX (__CTA_TIMESTAMP_MAX - 1)
++
++enum ctattr_nat {
++	CTA_NAT_UNSPEC,
++	CTA_NAT_V4_MINIP,
++#define CTA_NAT_MINIP CTA_NAT_V4_MINIP
++	CTA_NAT_V4_MAXIP,
++#define CTA_NAT_MAXIP CTA_NAT_V4_MAXIP
++	CTA_NAT_PROTO,
++	CTA_NAT_V6_MINIP,
++	CTA_NAT_V6_MAXIP,
++	__CTA_NAT_MAX
++};
++#define CTA_NAT_MAX (__CTA_NAT_MAX - 1)
++
++enum ctattr_protonat {
++	CTA_PROTONAT_UNSPEC,
++	CTA_PROTONAT_PORT_MIN,
++	CTA_PROTONAT_PORT_MAX,
++	__CTA_PROTONAT_MAX
++};
++#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1)
++
++enum ctattr_natseq {
++	CTA_NAT_SEQ_UNSPEC,
++	CTA_NAT_SEQ_CORRECTION_POS,
++	CTA_NAT_SEQ_OFFSET_BEFORE,
++	CTA_NAT_SEQ_OFFSET_AFTER,
++	__CTA_NAT_SEQ_MAX
++};
++#define CTA_NAT_SEQ_MAX (__CTA_NAT_SEQ_MAX - 1)
++
++enum ctattr_expect {
++	CTA_EXPECT_UNSPEC,
++	CTA_EXPECT_MASTER,
++	CTA_EXPECT_TUPLE,
++	CTA_EXPECT_MASK,
++	CTA_EXPECT_TIMEOUT,
++	CTA_EXPECT_ID,
++	CTA_EXPECT_HELP_NAME,
++	CTA_EXPECT_ZONE,
++	CTA_EXPECT_FLAGS,
++	CTA_EXPECT_CLASS,
++	CTA_EXPECT_NAT,
++	CTA_EXPECT_FN,
++	__CTA_EXPECT_MAX
++};
++#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1)
++
++enum ctattr_expect_nat {
++	CTA_EXPECT_NAT_UNSPEC,
++	CTA_EXPECT_NAT_DIR,
++	CTA_EXPECT_NAT_TUPLE,
++	__CTA_EXPECT_NAT_MAX
++};
++#define CTA_EXPECT_NAT_MAX (__CTA_EXPECT_NAT_MAX - 1)
++
++enum ctattr_help {
++	CTA_HELP_UNSPEC,
++	CTA_HELP_NAME,
++	CTA_HELP_INFO,
++	__CTA_HELP_MAX
++};
++#define CTA_HELP_MAX (__CTA_HELP_MAX - 1)
++
++enum ctattr_secctx {
++	CTA_SECCTX_UNSPEC,
++	CTA_SECCTX_NAME,
++	__CTA_SECCTX_MAX
++};
++#define CTA_SECCTX_MAX (__CTA_SECCTX_MAX - 1)
++
++enum ctattr_stats_cpu {
++	CTA_STATS_UNSPEC,
++	CTA_STATS_SEARCHED,
++	CTA_STATS_FOUND,
++	CTA_STATS_NEW,
++	CTA_STATS_INVALID,
++	CTA_STATS_IGNORE,
++	CTA_STATS_DELETE,
++	CTA_STATS_DELETE_LIST,
++	CTA_STATS_INSERT,
++	CTA_STATS_INSERT_FAILED,
++	CTA_STATS_DROP,
++	CTA_STATS_EARLY_DROP,
++	CTA_STATS_ERROR,
++	CTA_STATS_SEARCH_RESTART,
++	__CTA_STATS_MAX,
++};
++#define CTA_STATS_MAX (__CTA_STATS_MAX - 1)
++
++enum ctattr_stats_global {
++	CTA_STATS_GLOBAL_UNSPEC,
++	CTA_STATS_GLOBAL_ENTRIES,
++	__CTA_STATS_GLOBAL_MAX,
++};
++#define CTA_STATS_GLOBAL_MAX (__CTA_STATS_GLOBAL_MAX - 1)
++
++enum ctattr_expect_stats {
++	CTA_STATS_EXP_UNSPEC,
++	CTA_STATS_EXP_NEW,
++	CTA_STATS_EXP_CREATE,
++	CTA_STATS_EXP_DELETE,
++	__CTA_STATS_EXP_MAX,
++};
++#define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1)
++
++#endif /* _IPCONNTRACK_NETLINK_H */
+diff --git a/include/linux/netlink.h b/include/linux/netlink.h
+index f55ed8c..ced0e1a 100644
+--- a/include/linux/netlink.h
++++ b/include/linux/netlink.h
+@@ -1,14 +1,14 @@
+ #ifndef __LINUX_NETLINK_H
+ #define __LINUX_NETLINK_H
+ 
+-#include <linux/socket.h> /* for sa_family_t */
++#include <linux/socket.h> /* for __kernel_sa_family_t */
+ #include <linux/types.h>
+ 
+ #define NETLINK_ROUTE		0	/* Routing/device hook				*/
+ #define NETLINK_UNUSED		1	/* Unused number				*/
+ #define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
+-#define NETLINK_FIREWALL	3	/* Firewalling hook				*/
+-#define NETLINK_INET_DIAG	4	/* INET socket monitoring			*/
++#define NETLINK_FIREWALL	3	/* Unused number, formerly ip_queue		*/
++#define NETLINK_SOCK_DIAG	4	/* socket monitoring				*/
+ #define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */
+ #define NETLINK_XFRM		6	/* ipsec */
+ #define NETLINK_SELINUX		7	/* SELinux event notifications */
+@@ -24,11 +24,15 @@
+ /* leave room for NETLINK_DM (DM Events) */
+ #define NETLINK_SCSITRANSPORT	18	/* SCSI Transports */
+ #define NETLINK_ECRYPTFS	19
++#define NETLINK_RDMA		20
++#define NETLINK_CRYPTO		21	/* Crypto layer */
++
++#define NETLINK_INET_DIAG	NETLINK_SOCK_DIAG
+ 
+ #define MAX_LINKS 32		
+ 
+ struct sockaddr_nl {
+-	sa_family_t	nl_family;	/* AF_NETLINK	*/
++	__kernel_sa_family_t	nl_family;	/* AF_NETLINK	*/
+ 	unsigned short	nl_pad;		/* zero		*/
+ 	__u32		nl_pid;		/* port ID	*/
+        	__u32		nl_groups;	/* multicast groups mask */
+@@ -48,6 +52,7 @@ struct nlmsghdr {
+ #define NLM_F_MULTI		2	/* Multipart message, terminated by NLMSG_DONE */
+ #define NLM_F_ACK		4	/* Reply with ack, with zero or error code */
+ #define NLM_F_ECHO		8	/* Echo this request 		*/
++#define NLM_F_DUMP_INTR		16	/* Dump was inconsistent due to sequence change */
+ 
+ /* Modifiers to GET request */
+ #define NLM_F_ROOT	0x100	/* specify tree	root	*/
+@@ -145,4 +150,4 @@ struct nlattr {
+ #define NLA_HDRLEN		((int) NLA_ALIGN(sizeof(struct nlattr)))
+ 
+ 
+-#endif	/* __LINUX_NETLINK_H */
++#endif /* __LINUX_NETLINK_H */
+diff --git a/include/linux/socket.h b/include/linux/socket.h
+new file mode 100644
+index 0000000..8c1e501
+--- /dev/null
++++ b/include/linux/socket.h
+@@ -0,0 +1,21 @@
++#ifndef _LINUX_SOCKET_H
++#define _LINUX_SOCKET_H
++
++/*
++ * Desired design of maximum size and alignment (see RFC2553)
++ */
++#define _K_SS_MAXSIZE	128	/* Implementation specific max size */
++#define _K_SS_ALIGNSIZE	(__alignof__ (struct sockaddr *))
++				/* Implementation specific desired alignment */
++
++typedef unsigned short __kernel_sa_family_t;
++
++struct __kernel_sockaddr_storage {
++	__kernel_sa_family_t	ss_family;		/* address family */
++	/* Following field(s) are implementation specific */
++	char		__data[_K_SS_MAXSIZE - sizeof(unsigned short)];
++				/* space to achieve desired size, */
++				/* _SS_MAXSIZE value minus size of ss_family */
++} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */
++
++#endif /* _LINUX_SOCKET_H */
+diff --git a/src/attr.c b/src/attr.c
+index 1136c50..c3c57e6 100644
+--- a/src/attr.c
++++ b/src/attr.c
+@@ -200,6 +200,7 @@ static const size_t mnl_attr_data_type_len[MNL_TYPE_MAX] = {
+ 	[MNL_TYPE_U16]		= sizeof(uint16_t),
+ 	[MNL_TYPE_U32]		= sizeof(uint32_t),
+ 	[MNL_TYPE_U64]		= sizeof(uint64_t),
++	[MNL_TYPE_MSECS]	= sizeof(uint64_t),
+ };
+ 
+ /**
+diff --git a/src/callback.c b/src/callback.c
+index 6337acc..f023401 100644
+--- a/src/callback.c
++++ b/src/callback.c
+@@ -65,6 +65,12 @@ __mnl_cb_run(const void *buf, size_t numbytes, unsigned int seq,
+ 			return -1;
+ 		}
+ 
++		/* dump was interrupted */
++		if (nlh->nlmsg_flags & NLM_F_DUMP_INTR) {
++			errno = EINTR;
++			return -1;
++		}
++
+ 		/* netlink data message handling */
+ 		if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { 
+ 			if (cb_data){
+
diff --git a/trunk/package/libs/libnetfilter-conntrack/Makefile b/trunk/package/libs/libnetfilter-conntrack/Makefile
new file mode 100644
index 00000000..4579a02c
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-conntrack/Makefile
@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnetfilter_conntrack
+PKG_VERSION:=1.0.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://www.netfilter.org/projects/libnetfilter_conntrack/files/ \
+	ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/
+PKG_MD5SUM:=73394a3d8d0cfecc6abb6027b4792d52
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+PKG_FIXUP:=autoreconf
+PKG_LICENSE:=GPL-2.0+
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnetfilter-conntrack
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libnfnetlink +kmod-nf-conntrack-netlink +libmnl
+  TITLE:=API to the in-kernel connection tracking state table
+  URL:=http://www.netfilter.org/projects/libnetfilter_conntrack/
+endef
+
+define Package/libnetfilter-conntrack/description
+ libnetfilter_conntrack is a userspace library providing a programming
+ interface (API) to the in-kernel connection tracking state table. The
+ library libnetfilter_conntrack has been previously known as
+ libnfnetlink_conntrack and libctnetlink. This library is currently
+ used by conntrack-tools among many other applications.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/libnetfilter_conntrack
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/libnetfilter_conntrack/*.h \
+		$(1)/usr/include/libnetfilter_conntrack/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_conntrack.{so*,a,la} \
+		$(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_conntrack.pc \
+		$(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libnetfilter-conntrack/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_conntrack.so.* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnetfilter-conntrack))
diff --git a/trunk/package/libs/libnetfilter-log/Makefile b/trunk/package/libs/libnetfilter-log/Makefile
new file mode 100644
index 00000000..51838fb6
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-log/Makefile
@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnetfilter_log
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://www.netfilter.org/projects/libnetfilter_log/files/ \
+	ftp://ftp.netfilter.org/pub/libnetfilter_log/
+PKG_MD5SUM:=2a4bb0654ae675a52d2e8d1c06090b94
+PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
+
+PKG_FIXUP:=autoreconf
+PKG_LICENSE:=GPL-2.0+
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnetfilter-log
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libnfnetlink +kmod-nfnetlink-log +libmnl
+  TITLE:=API to receive to-be-logged packets from the kernel nfnetlink_log subsystem
+  URL:=http://www.netfilter.org/projects/libnetfilter_log/
+endef
+
+define Package/libnetfilter-log/description
+ libnetfilter_log is a userspace library providing interface to packets that
+ have been logged by the kernel packet filter. It is is part of a system that
+ deprecates the old syslog/dmesg based packet logging. This library has been
+ previously known as libnfnetlink_log.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared \
+	--without-ipulog \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/libnetfilter_log
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/libnetfilter_log/*.h \
+		$(1)/usr/include/libnetfilter_log/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log.{so*,a,la} \
+		$(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_log.pc \
+		$(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libnetfilter-log/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log.so.* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnetfilter-log))
diff --git a/trunk/package/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch b/trunk/package/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch
new file mode 100644
index 00000000..c9b325b4
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch
@@ -0,0 +1,25 @@
+From 8858b8eacd1385f99796ead78b3a7157c5e93121 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 24 Jun 2012 14:57:14 +0200
+Subject: [PATCH 1/6] build: remove unnecessary pkgconfig->config.status
+ dependency
+
+The flags obtained from pkgconfig are in essence preprocessor ones.
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ Make_global.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Make_global.am b/Make_global.am
+index b7dab7b..a4e9bd9 100644
+--- a/Make_global.am
++++ b/Make_global.am
+@@ -1,2 +1,2 @@
+-AM_CPPFLAGS = -I${top_srcdir}/include
+-AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
++AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS}
++AM_CFLAGS = -Wall
+-- 
+1.7.10.4
+
diff --git a/trunk/package/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch b/trunk/package/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch
new file mode 100644
index 00000000..ce47198f
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch
@@ -0,0 +1,24 @@
+From fee63b81ee432d0b3e03ffcf9f54cda99476f267 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 24 Jun 2012 14:57:48 +0200
+Subject: [PATCH 2/6] build: remove unused lines in Makefile.am
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ Makefile.am |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b758e56..9a1cbcb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/include
+ SUBDIRS	= include src utils
+-LINKOPTS = -lnfnetlink
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-- 
+1.7.10.4
+
diff --git a/trunk/package/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch b/trunk/package/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch
new file mode 100644
index 00000000..77cb1b49
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch
@@ -0,0 +1,29 @@
+From 1aa23946431ac593568ccac0e0b6925e7dfd7bd3 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 8 Oct 2012 15:15:07 +0200
+Subject: [PATCH 3/6] build: resolve automake-1.12 warnings
+
+am/ltlibrary.am: warning: 'libnetfilter_log.la': linking libtool
+libraries using a non-POSIX archiver requires 'AM_PROG_AR' in
+'configure.ac'
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index fe6e75f..e6e1317 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
+ 	tar-pax no-dist-gzip dist-bzip2 1.6])
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ 
+ dnl kernel style compile messages
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-- 
+1.7.10.4
+
diff --git a/trunk/package/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch b/trunk/package/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch
new file mode 100644
index 00000000..78578750
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch
@@ -0,0 +1,24 @@
+From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001
+From: Eric Leblond <eric@regit.org>
+Date: Sun, 4 Nov 2012 09:29:44 +0100
+Subject: [PATCH 4/6] Add include needed for integer type definition.
+
+---
+ include/libnetfilter_log/libnetfilter_log.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
+index 6b0d3b0..a1331de 100644
+--- a/include/libnetfilter_log/libnetfilter_log.h
++++ b/include/libnetfilter_log/libnetfilter_log.h
+@@ -9,6 +9,7 @@
+ #ifndef __LIBNETFILTER_LOG_H
+ #define __LIBNETFILTER_LOG_H
+ 
++#include <sys/types.h>
+ #include <libnetfilter_log/linux_nfnetlink_log.h>
+ 
+ struct nflog_handle;
+-- 
+1.7.10.4
+
diff --git a/trunk/package/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch b/trunk/package/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch
new file mode 100644
index 00000000..ff78bb3e
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch
@@ -0,0 +1,27 @@
+From 2f22d3c4453135c27873b9014e9dc5b5712804df Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 16:23:31 -0300
+Subject: [PATCH 5/6] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e6e1317..189a753 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ 
+ case "$host" in 
+-*-*-linux*) ;;
++*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+1.7.10.4
+
diff --git a/trunk/package/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch b/trunk/package/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch
new file mode 100644
index 00000000..839f81bb
--- /dev/null
+++ b/trunk/package/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch
@@ -0,0 +1,95 @@
+From a1b392b4156db984ab2b695a4a70d113f70cb9b8 Mon Sep 17 00:00:00 2001
+From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
+Date: Wed, 5 Feb 2014 14:18:57 +0100
+Subject: [PATCH 6/6] configure: add --without-ipulog option to disable
+ libipulog build
+
+This is a compat library used for netfilter ULOG target.
+ULOG only works with IPv4. NFLOG has replaced ULOG.
+
+Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ configure.ac                         |    5 +++++
+ include/libnetfilter_log/Makefile.am |    5 ++++-
+ src/Makefile.am                      |    6 +++++-
+ utils/Makefile.am                    |    7 +++++--
+ 4 files changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 189a753..88ff7ab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,11 @@ case "$host" in
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
++AC_ARG_WITH([ipulog],
++  AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library]),
++  [ipulog_skip=1], [ipulog_skip=0])
++AM_CONDITIONAL([BUILD_IPULOG], [test $ipulog_skip = 0])
++
+ dnl Dependencies
+ PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
+ 
+diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am
+index fe934f1..fde1d60 100644
+--- a/include/libnetfilter_log/Makefile.am
++++ b/include/libnetfilter_log/Makefile.am
+@@ -1,3 +1,6 @@
+ 
+-pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
++pkginclude_HEADERS = libnetfilter_log.h linux_nfnetlink_log.h
+ 
++if BUILD_IPULOG
++pkginclude_HEADERS += libipulog.h
++endif
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 10a66e2..33933a4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,14 +22,18 @@ LIBVERSION=2:0:1
+ 
+ include ${top_srcdir}/Make_global.am
+ 
+-lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
++lib_LTLIBRARIES = libnetfilter_log.la
+ 
+ libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink	\
+ 			      -version-info $(LIBVERSION)
+ libnetfilter_log_la_SOURCES = libnetfilter_log.c 
+ libnetfilter_log_la_LIBADD  = ${LIBNFNETLINK_LIBS}
+ 
++if BUILD_IPULOG
++lib_LTLIBRARIES += libnetfilter_log_libipulog.la
++
+ libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles	\
+ 					-version-info 1:0:0
+ libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la
+ libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
++endif
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index ae64c90..f961b6c 100644
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -1,12 +1,15 @@
+ include ${top_srcdir}/Make_global.am
+ 
+-check_PROGRAMS = nfulnl_test ulog_test
++check_PROGRAMS = nfulnl_test
+ 
+ nfulnl_test_SOURCES = nfulnl_test.c
+ nfulnl_test_LDADD = ../src/libnetfilter_log.la
+ nfulnl_test_LDFLAGS = -dynamic
+ 
++if BUILD_IPULOG
++check_PROGRAMS += ulog_test
++
+ ulog_test_SOURCES = ulog_test.c
+ ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la
+ ulog_test_LDFLAGS = -dynamic
+-
++endif
+-- 
+1.7.10.4
+
diff --git a/trunk/package/libs/libnfnetlink/Makefile b/trunk/package/libs/libnfnetlink/Makefile
new file mode 100644
index 00000000..861c6040
--- /dev/null
+++ b/trunk/package/libs/libnfnetlink/Makefile
@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2007-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnfnetlink
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://www.netfilter.org/projects/libnfnetlink/files/ \
+	ftp://ftp.netfilter.org/pub/libnfnetlink/ \
+	http://mirrors.evolva.ro/netfilter.org/libnfnetlink/
+PKG_MD5SUM:=98927583d2016a9fb1936fed992e2c5e
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnfnetlink
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A low-level library for netfilter related kernel/userspace communication
+  URL:=http://netfilter.org/projects/libnfnetlink/
+endef
+
+define Package/libnfnetlink/description
+ libnfnetlink is is the low-level library for netfilter related kernel/userspace communication.
+ It provides a generic messaging infrastructure for in-kernel netfilter subsystems
+ (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users
+ and/or management tools in userspace.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/libnfnetlink
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink,linux_nfnetlink_compat}.h \
+		$(1)/usr/include/libnfnetlink/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.{a,so*} \
+		$(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfnetlink.pc \
+		$(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libnfnetlink/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.so.* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnfnetlink))
diff --git a/trunk/package/libs/libnfnetlink/patches/100-missing_include.patch b/trunk/package/libs/libnfnetlink/patches/100-missing_include.patch
new file mode 100644
index 00000000..68155c30
--- /dev/null
+++ b/trunk/package/libs/libnfnetlink/patches/100-missing_include.patch
@@ -0,0 +1,10 @@
+--- a/include/libnfnetlink/libnfnetlink.h
++++ b/include/libnfnetlink/libnfnetlink.h
+@@ -15,6 +15,7 @@
+ #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+ #endif
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>	/* for sa_family_t */
+ #include <linux/netlink.h>
+ #include <libnfnetlink/linux_nfnetlink.h>
diff --git a/trunk/package/libs/libnftnl/Makefile b/trunk/package/libs/libnftnl/Makefile
new file mode 100644
index 00000000..28cc5675
--- /dev/null
+++ b/trunk/package/libs/libnftnl/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnftnl
+PKG_VERSION:=1.0.2+2014-10-21
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=git://git.netfilter.org/libnftnl
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=b858137bf744126531c50643587be328310f0280
+PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
+PKG_LICENSE:=GPL-2.0+
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnftnl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libmnl
+  TITLE:=Low-level netlink library for the nf_tables subsystem
+  URL:=http://www.netfilter.org/projects/libnftnl
+endef
+
+define Package/libnftnl/description
+ libnftnl is a userspace library providing a low-level netlink
+ programming interface (API) to the in-kernel nf_tables subsystem.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared \
+	--without-json-parsing \
+	--without-xml-parsing \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/libnftnl
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/libnftnl/*.h \
+		$(1)/usr/include/libnftnl/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnftnl.{so*,a,la} \
+		$(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnftnl.pc \
+		$(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libnftnl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libnftnl.so.* \
+		$(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnftnl))
diff --git a/trunk/package/libs/libnl-tiny/Makefile b/trunk/package/libs/libnl-tiny/Makefile
new file mode 100644
index 00000000..b3957b0b
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnl-tiny
+PKG_VERSION:=0.1
+PKG_RELEASE:=3
+
+PKG_LICENSE:=LGPL-2.1
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnl-tiny
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=netlink socket library
+endef
+
+define Package/libnl-tiny/description
+ This package contains a stripped down version of libnl
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		all
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(1)/usr/include/libnl-tiny
+	$(CP) $(PKG_BUILD_DIR)/include/* $(1)/usr/include/libnl-tiny
+	$(CP) $(PKG_BUILD_DIR)/libnl-tiny.so $(1)/usr/lib/
+	$(CP) ./files/libnl-tiny.pc $(1)/usr/lib/pkgconfig
+endef
+
+define Package/libnl-tiny/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libnl-tiny.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnl-tiny))
diff --git a/trunk/package/libs/libnl-tiny/files/libnl-tiny.pc b/trunk/package/libs/libnl-tiny/files/libnl-tiny.pc
new file mode 100644
index 00000000..af79cd30
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/files/libnl-tiny.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/libnl-tiny
+
+Name: libnl-tiny
+Description: Convenience library for netlink sockets
+Version: 2.0
+Libs: -L${libdir} -lnl-tiny
+Cflags: -I${includedir}
diff --git a/trunk/package/libs/libnl-tiny/src/Makefile b/trunk/package/libs/libnl-tiny/src/Makefile
new file mode 100644
index 00000000..f6f90ec7
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/Makefile
@@ -0,0 +1,17 @@
+CC=gcc
+WFLAGS=-Wall
+CFLAGS=-O2
+INCLUDES=-Iinclude
+
+LIBNAME=libnl-tiny.so
+
+all: $(LIBNAME)
+
+%.o: %.c
+	$(CC) $(WFLAGS) -c -o $@ $(INCLUDES) $(CFLAGS) $<
+
+LIBNL_OBJ=nl.o handlers.o msg.o attr.o cache.o cache_mngt.o object.o socket.o error.o
+GENL_OBJ=genl.o genl_family.o genl_ctrl.o genl_mngt.o unl.o
+
+$(LIBNAME): $(LIBNL_OBJ) $(GENL_OBJ)
+	$(CC) -shared -o $@ $^
diff --git a/trunk/package/libs/libnl-tiny/src/attr.c b/trunk/package/libs/libnl-tiny/src/attr.c
new file mode 100644
index 00000000..e0f50611
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/attr.c
@@ -0,0 +1,668 @@
+/*
+ * lib/attr.c		Netlink Attributes
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/utils.h>
+#include <netlink/addr.h>
+#include <netlink/attr.h>
+#include <netlink/msg.h>
+#include <linux/socket.h>
+
+/**
+ * @ingroup msg
+ * @defgroup attr Attributes
+ * Netlink Attributes Construction/Parsing Interface
+ *
+ * \section attr_sec Netlink Attributes
+ * Netlink attributes allow for data chunks of arbitary length to be
+ * attached to a netlink message. Each attribute is encoded with a
+ * type and length field, both 16 bits, stored in the attribute header
+ * preceding the attribute data. The main advantage of using attributes
+ * over packing everything into the family header is that the interface
+ * stays extendable as new attributes can supersede old attributes while
+ * remaining backwards compatible. Also attributes can be defined optional
+ * thus avoiding the transmission of unnecessary empty data blocks.
+ * Special nested attributes allow for more complex data structures to
+ * be transmitted, e.g. trees, lists, etc.
+ *
+ * While not required, netlink attributes typically follow the family
+ * header of a netlink message and must be properly aligned to NLA_ALIGNTO:
+ * @code
+ *   +----------------+- - -+---------------+- - -+------------+- - -+
+ *   | Netlink Header | Pad | Family Header | Pad | Attributes | Pad |
+ *   +----------------+- - -+---------------+- - -+------------+- - -+
+ * @endcode
+ *
+ * The actual attributes are chained together each separately aligned to
+ * NLA_ALIGNTO. The position of an attribute is defined based on the
+ * length field of the preceding attributes:
+ * @code
+ *   +-------------+- - -+-------------+- - -+------
+ *   | Attribute 1 | Pad | Attribute 2 | Pad | ...
+ *   +-------------+- - -+-------------+- - -+------
+ *   nla_next(attr1)------^
+ * @endcode
+ *
+ * The attribute itself consists of the attribute header followed by
+ * the actual payload also aligned to NLA_ALIGNTO. The function nla_data()
+ * returns a pointer to the start of the payload while nla_len() returns
+ * the length of the payload in bytes.
+ *
+ * \b Note: Be aware, NLA_ALIGNTO equals to 4 bytes, therefore it is not
+ * safe to dereference any 64 bit data types directly.
+ *
+ * @code
+ *    <----------- nla_total_size(payload) ----------->
+ *    <-------- nla_attr_size(payload) --------->
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ *   | Attribute Header | Pad |     Payload      | Pad |
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ *   nla_data(nla)-------------^
+ *                             <- nla_len(nla) ->
+ * @endcode
+ *
+ * @subsection attr_datatypes Attribute Data Types
+ * A number of basic data types are supported to simplify access and
+ * validation of netlink attributes. This data type information is
+ * not encoded in the attribute, both the kernel and userspace part
+ * are required to share this information on their own.
+ *
+ * One of the major advantages of these basic types is the automatic
+ * validation of each attribute based on an attribute policy. The
+ * validation covers most of the checks required to safely use
+ * attributes and thus keeps the individual sanity check to a minimum.
+ *
+ * Never access attribute payload without ensuring basic validation
+ * first, attributes may:
+ * - not be present even though required
+ * - contain less actual payload than expected
+ * - fake a attribute length which exceeds the end of the message
+ * - contain unterminated character strings
+ *
+ * Policies are defined as array of the struct nla_policy. The array is
+ * indexed with the attribute type, therefore the array must be sized
+ * accordingly.
+ * @code
+ * static struct nla_policy my_policy[ATTR_MAX+1] = {
+ * 	[ATTR_FOO] = { .type = ..., .minlen = ..., .maxlen = ... },
+ * };
+ *
+ * err = nla_validate(attrs, attrlen, ATTR_MAX, &my_policy);
+ * @endcode
+ *
+ * Some basic validations are performed on every attribute, regardless of type.
+ * - If the attribute type exceeds the maximum attribute type specified or
+ *   the attribute type is lesser-or-equal than zero, the attribute will
+ *   be silently ignored.
+ * - If the payload length falls below the \a minlen value the attribute
+ *   will be rejected.
+ * - If \a maxlen is non-zero and the payload length exceeds the \a maxlen
+ *   value the attribute will be rejected.
+ *
+ *
+ * @par Unspecific Attribute (NLA_UNSPEC)
+ * This is the standard type if no type is specified. It is used for
+ * binary data of arbitary length. Typically this attribute carries
+ * a binary structure or a stream of bytes.
+ * @par
+ * @code
+ * // In this example, we will assume a binary structure requires to
+ * // be transmitted. The definition of the structure will typically
+ * // go into a header file available to both the kernel and userspace
+ * // side.
+ * //
+ * // Note: Be careful when putting 64 bit data types into a structure.
+ * // The attribute payload is only aligned to 4 bytes, dereferencing
+ * // the member may fail.
+ * struct my_struct {
+ *     int a;
+ *     int b;
+ * };
+ *
+ * // The validation function will not enforce an exact length match to
+ * // allow structures to grow as required. Note: While it is allowed
+ * // to add members to the end of the structure, changing the order or
+ * // inserting members in the middle of the structure will break your
+ * // binary interface.
+ * static struct nla_policy my_policy[ATTR_MAX+1] = {
+ *     [ATTR_MY_STRICT] = { .type = NLA_UNSPEC,
+ *                          .minlen = sizeof(struct my_struct) },
+ *
+ * // The binary structure is appened to the message using nla_put()
+ * struct my_struct foo = { .a = 1, .b = 2 };
+ * nla_put(msg, ATTR_MY_STRUCT, sizeof(foo), &foo);
+ *
+ * // On the receiving side, a pointer to the structure pointing inside
+ * // the message payload is returned by nla_get().
+ * if (attrs[ATTR_MY_STRUCT])
+ *     struct my_struct *foo = nla_get(attrs[ATTR_MY_STRUCT]);
+ * @endcode
+ *
+ * @par Integers (NLA_U8, NLA_U16, NLA_U32, NLA_U64)
+ * Integers come in different sizes from 8 bit to 64 bit. However, since the
+ * payload length is aligned to 4 bytes, integers smaller than 32 bit are
+ * only useful to enforce the maximum range of values.
+ * @par
+ * \b Note: There is no difference made between signed and unsigned integers.
+ * The validation only enforces the minimal payload length required to store
+ * an integer of specified type.
+ * @par
+ * @code
+ * // Even though possible, it does not make sense to specify .minlen or
+ * // .maxlen for integer types. The data types implies the corresponding
+ * // minimal payload length.
+ * static struct nla_policy my_policy[ATTR_MAX+1] = {
+ *     [ATTR_FOO] = { .type = NLA_U32 },
+ *
+ * // Numeric values can be appended directly using the respective
+ * // nla_put_uxxx() function
+ * nla_put_u32(msg, ATTR_FOO, 123);
+ *
+ * // Same for the receiving side.
+ * if (attrs[ATTR_FOO])
+ *     uint32_t foo = nla_get_u32(attrs[ATTR_FOO]);
+ * @endcode
+ *
+ * @par Character string (NLA_STRING)
+ * This data type represents a NUL terminated character string of variable
+ * length. For binary data streams the type NLA_UNSPEC is recommended.
+ * @par
+ * @code
+ * // Enforce a NUL terminated character string of at most 4 characters
+ * // including the NUL termination.
+ * static struct nla_policy my_policy[ATTR_MAX+1] = {
+ *     [ATTR_BAR] = { .type = NLA_STRING, maxlen = 4 },
+ *
+ * // nla_put_string() creates a string attribute of the necessary length
+ * // and appends it to the message including the NUL termination.
+ * nla_put_string(msg, ATTR_BAR, "some text");
+ *
+ * // It is safe to use the returned character string directly if the
+ * // attribute has been validated as the validation enforces the proper
+ * // termination of the string.
+ * if (attrs[ATTR_BAR])
+ *     char *text = nla_get_string(attrs[ATTR_BAR]);
+ * @endcode
+ *
+ * @par Flag (NLA_FLAG)
+ * This attribute type may be used to indicate the presence of a flag. The
+ * attribute is only valid if the payload length is zero. The presence of
+ * the attribute header indicates the presence of the flag.
+ * @par
+ * @code
+ * // This attribute type is special as .minlen and .maxlen have no effect.
+ * static struct nla_policy my_policy[ATTR_MAX+1] = {
+ *     [ATTR_FLAG] = { .type = NLA_FLAG },
+ *
+ * // nla_put_flag() appends a zero sized attribute to the message.
+ * nla_put_flag(msg, ATTR_FLAG);
+ *
+ * // There is no need for a receival function, the presence is the value.
+ * if (attrs[ATTR_FLAG])
+ *     // flag is present
+ * @endcode
+ *
+ * @par Micro Seconds (NLA_MSECS)
+ *
+ * @par Nested Attribute (NLA_NESTED)
+ * Attributes can be nested and put into a container to create groups, lists
+ * or to construct trees of attributes. Nested attributes are often used to
+ * pass attributes to a subsystem where the top layer has no knowledge of the
+ * configuration possibilities of each subsystem.
+ * @par
+ * \b Note: When validating the attributes using nlmsg_validate() or
+ * nlmsg_parse() it will only affect the top level attributes. Each
+ * level of nested attributes must be validated seperately using
+ * nla_parse_nested() or nla_validate().
+ * @par
+ * @code
+ * // The minimal length policy may be used to enforce the presence of at
+ * // least one attribute.
+ * static struct nla_policy my_policy[ATTR_MAX+1] = {
+ *     [ATTR_OPTS] = { .type = NLA_NESTED, minlen = NLA_HDRLEN },
+ *
+ * // Nested attributes are constructed by enclosing the attributes
+ * // to be nested with calls to nla_nest_start() respetively nla_nest_end().
+ * struct nlattr *opts = nla_nest_start(msg, ATTR_OPTS);
+ * nla_put_u32(msg, ATTR_FOO, 123);
+ * nla_put_string(msg, ATTR_BAR, "some text");
+ * nla_nest_end(msg, opts);
+ *
+ * // Various methods exist to parse nested attributes, the easiest being
+ * // nla_parse_nested() which also allows validation in the same step.
+ * if (attrs[ATTR_OPTS]) {
+ *     struct nlattr *nested[ATTR_MAX+1];
+ *
+ *     nla_parse_nested(nested, ATTR_MAX, attrs[ATTR_OPTS], &policy);
+ *
+ *     if (nested[ATTR_FOO])
+ *         uint32_t foo = nla_get_u32(nested[ATTR_FOO]);
+ * }
+ * @endcode
+ *
+ * @subsection attr_exceptions Exception Based Attribute Construction
+ * Often a large number of attributes are added to a message in a single
+ * function. In order to simplify error handling, a second set of
+ * construction functions exist which jump to a error label when they
+ * fail instead of returning an error code. This second set consists
+ * of macros which are named after their error code based counterpart
+ * except that the name is written all uppercase.
+ *
+ * All of the macros jump to the target \c nla_put_failure if they fail.
+ * @code
+ * void my_func(struct nl_msg *msg)
+ * {
+ *     NLA_PUT_U32(msg, ATTR_FOO, 10);
+ *     NLA_PUT_STRING(msg, ATTR_BAR, "bar");
+ *
+ *     return 0;
+ *
+ * nla_put_failure:
+ *     return -NLE_NOMEM;
+ * }
+ * @endcode
+ *
+ * @subsection attr_examples Examples
+ * @par Example 1.1 Constructing a netlink message with attributes.
+ * @code
+ * struct nl_msg *build_msg(int ifindex, struct nl_addr *lladdr, int mtu)
+ * {
+ *     struct nl_msg *msg;
+ *     struct nlattr *info, *vlan;
+ *     struct ifinfomsg ifi = {
+ *         .ifi_family = AF_INET,
+ *         .ifi_index = ifindex,
+ *     };
+ *
+ *     // Allocate a new netlink message, type=RTM_SETLINK, flags=NLM_F_ECHO
+ *     if (!(msg = nlmsg_alloc_simple(RTM_SETLINK, NLM_F_ECHO)))
+ *         return NULL;
+ *
+ *     // Append the family specific header (struct ifinfomsg)
+ *     if (nlmsg_append(msg, &ifi, sizeof(ifi), NLMSG_ALIGNTO) < 0)
+ *         goto nla_put_failure
+ *
+ *     // Append a 32 bit integer attribute to carry the MTU
+ *     NLA_PUT_U32(msg, IFLA_MTU, mtu);
+ *
+ *     // Append a unspecific attribute to carry the link layer address
+ *     NLA_PUT_ADDR(msg, IFLA_ADDRESS, lladdr);
+ *
+ *     // Append a container for nested attributes to carry link information
+ *     if (!(info = nla_nest_start(msg, IFLA_LINKINFO)))
+ *         goto nla_put_failure;
+ *
+ *     // Put a string attribute into the container
+ *     NLA_PUT_STRING(msg, IFLA_INFO_KIND, "vlan");
+ *
+ *     // Append another container inside the open container to carry
+ *     // vlan specific attributes
+ *     if (!(vlan = nla_nest_start(msg, IFLA_INFO_DATA)))
+ *         goto nla_put_failure;
+ *
+ *     // add vlan specific info attributes here...
+ *
+ *     // Finish nesting the vlan attributes and close the second container.
+ *     nla_nest_end(msg, vlan);
+ *
+ *     // Finish nesting the link info attribute and close the first container.
+ *     nla_nest_end(msg, info);
+ *
+ *     return msg;
+ *
+ * // If any of the construction macros fails, we end up here.
+ * nla_put_failure:
+ *     nlmsg_free(msg);
+ *     return NULL;
+ * }
+ * @endcode
+ *
+ * @par Example 2.1 Parsing a netlink message with attributes.
+ * @code
+ * int parse_message(struct nl_msg *msg)
+ * {
+ *     // The policy defines two attributes: a 32 bit integer and a container
+ *     // for nested attributes.
+ *     struct nla_policy attr_policy[ATTR_MAX+1] = {
+ *         [ATTR_FOO] = { .type = NLA_U32 },
+ *         [ATTR_BAR] = { .type = NLA_NESTED },
+ *     };
+ *     struct nlattr *attrs[ATTR_MAX+1];
+ *     int err;
+ *
+ *     // The nlmsg_parse() function will make sure that the message contains
+ *     // enough payload to hold the header (struct my_hdr), validates any
+ *     // attributes attached to the messages and stores a pointer to each
+ *     // attribute in the attrs[] array accessable by attribute type.
+ *     if ((err = nlmsg_parse(nlmsg_hdr(msg), sizeof(struct my_hdr), attrs,
+ *                            ATTR_MAX, attr_policy)) < 0)
+ *         goto errout;
+ *
+ *     if (attrs[ATTR_FOO]) {
+ *         // It is safe to directly access the attribute payload without
+ *         // any further checks since nlmsg_parse() enforced the policy.
+ *         uint32_t foo = nla_get_u32(attrs[ATTR_FOO]);
+ *     }
+ *
+ *     if (attrs[ATTR_BAR]) {
+ *         struct nlattr *nested[NESTED_MAX+1];
+ *
+ *         // Attributes nested in a container can be parsed the same way
+ *         // as top level attributes.
+ *         if ((err = nla_parse_nested(nested, NESTED_MAX, attrs[ATTR_BAR],
+ *                                     nested_policy)) < 0)
+ *             goto errout;
+ *
+ *         // Process nested attributes here.
+ *     }
+ *
+ *     err = 0;
+ * errout:
+ *     return err;
+ * }
+ * @endcode
+ *
+ * @{
+ */
+
+/**
+ * @name Attribute Size Calculation
+ * @{
+ */
+
+/** @} */
+
+/**
+ * @name Parsing Attributes
+ * @{
+ */
+
+/**
+ * Check if the attribute header and payload can be accessed safely.
+ * @arg nla		Attribute of any kind.
+ * @arg remaining	Number of bytes remaining in attribute stream.
+ *
+ * Verifies that the header and payload do not exceed the number of
+ * bytes left in the attribute stream. This function must be called
+ * before access the attribute header or payload when iterating over
+ * the attribute stream using nla_next().
+ *
+ * @return True if the attribute can be accessed safely, false otherwise.
+ */
+int nla_ok(const struct nlattr *nla, int remaining)
+{
+	return remaining >= sizeof(*nla) &&
+	       nla->nla_len >= sizeof(*nla) &&
+	       nla->nla_len <= remaining;
+}
+
+/**
+ * Return next attribute in a stream of attributes.
+ * @arg nla		Attribute of any kind.
+ * @arg remaining	Variable to count remaining bytes in stream.
+ *
+ * Calculates the offset to the next attribute based on the attribute
+ * given. The attribute provided is assumed to be accessible, the
+ * caller is responsible to use nla_ok() beforehand. The offset (length
+ * of specified attribute including padding) is then subtracted from
+ * the remaining bytes variable and a pointer to the next attribute is
+ * returned.
+ *
+ * nla_next() can be called as long as remainig is >0.
+ *
+ * @return Pointer to next attribute.
+ */
+struct nlattr *nla_next(const struct nlattr *nla, int *remaining)
+{
+	int totlen = NLA_ALIGN(nla->nla_len);
+
+	*remaining -= totlen;
+	return (struct nlattr *) ((char *) nla + totlen);
+}
+
+static uint16_t nla_attr_minlen[NLA_TYPE_MAX+1] = {
+	[NLA_U8]	= sizeof(uint8_t),
+	[NLA_U16]	= sizeof(uint16_t),
+	[NLA_U32]	= sizeof(uint32_t),
+	[NLA_U64]	= sizeof(uint64_t),
+	[NLA_STRING]	= 1,
+};
+
+static int validate_nla(struct nlattr *nla, int maxtype,
+			struct nla_policy *policy)
+{
+	struct nla_policy *pt;
+	int minlen = 0, type = nla_type(nla);
+
+	if (type <= 0 || type > maxtype)
+		return 0;
+
+	pt = &policy[type];
+
+	if (pt->type > NLA_TYPE_MAX)
+		BUG();
+
+	if (pt->minlen)
+		minlen = pt->minlen;
+	else if (pt->type != NLA_UNSPEC)
+		minlen = nla_attr_minlen[pt->type];
+
+	if (pt->type == NLA_FLAG && nla_len(nla) > 0)
+		return -NLE_RANGE;
+
+	if (nla_len(nla) < minlen)
+		return -NLE_RANGE;
+
+	if (pt->maxlen && nla_len(nla) > pt->maxlen)
+		return -NLE_RANGE;
+
+	if (pt->type == NLA_STRING) {
+		char *data = nla_data(nla);
+		if (data[nla_len(nla) - 1] != '\0')
+			return -NLE_INVAL;
+	}
+
+	return 0;
+}
+
+
+/**
+ * Create attribute index based on a stream of attributes.
+ * @arg tb		Index array to be filled (maxtype+1 elements).
+ * @arg maxtype		Maximum attribute type expected and accepted.
+ * @arg head		Head of attribute stream.
+ * @arg len		Length of attribute stream.
+ * @arg policy		Attribute validation policy.
+ *
+ * Iterates over the stream of attributes and stores a pointer to each
+ * attribute in the index array using the attribute type as index to
+ * the array. Attribute with a type greater than the maximum type
+ * specified will be silently ignored in order to maintain backwards
+ * compatibility. If \a policy is not NULL, the attribute will be
+ * validated using the specified policy.
+ *
+ * @see nla_validate
+ * @return 0 on success or a negative error code.
+ */
+int nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head, int len,
+	      struct nla_policy *policy)
+{
+	struct nlattr *nla;
+	int rem, err;
+
+	memset(tb, 0, sizeof(struct nlattr *) * (maxtype + 1));
+
+	nla_for_each_attr(nla, head, len, rem) {
+		int type = nla_type(nla);
+
+		if (type == 0) {
+			fprintf(stderr, "Illegal nla->nla_type == 0\n");
+			continue;
+		}
+
+		if (type <= maxtype) {
+			if (policy) {
+				err = validate_nla(nla, maxtype, policy);
+				if (err < 0)
+					goto errout;
+			}
+
+			tb[type] = nla;
+		}
+	}
+
+	if (rem > 0)
+		fprintf(stderr, "netlink: %d bytes leftover after parsing "
+		       "attributes.\n", rem);
+
+	err = 0;
+errout:
+	return err;
+}
+
+/**
+ * Validate a stream of attributes.
+ * @arg head		Head of attributes stream.
+ * @arg len		Length of attributes stream.
+ * @arg maxtype		Maximum attribute type expected and accepted.
+ * @arg policy		Validation policy.
+ *
+ * Iterates over the stream of attributes and validates each attribute
+ * one by one using the specified policy. Attributes with a type greater
+ * than the maximum type specified will be silently ignored in order to
+ * maintain backwards compatibility.
+ *
+ * See \ref attr_datatypes for more details on what kind of validation
+ * checks are performed on each attribute data type.
+ *
+ * @return 0 on success or a negative error code.
+ */
+int nla_validate(struct nlattr *head, int len, int maxtype,
+		 struct nla_policy *policy)
+{
+	struct nlattr *nla;
+	int rem, err;
+
+	nla_for_each_attr(nla, head, len, rem) {
+		err = validate_nla(nla, maxtype, policy);
+		if (err < 0)
+			goto errout;
+	}
+
+	err = 0;
+errout:
+	return err;
+}
+
+/**
+ * Find a single attribute in a stream of attributes.
+ * @arg head		Head of attributes stream.
+ * @arg len		Length of attributes stream.
+ * @arg attrtype	Attribute type to look for.
+ *
+ * Iterates over the stream of attributes and compares each type with
+ * the type specified. Returns the first attribute which matches the
+ * type.
+ *
+ * @return Pointer to attribute found or NULL.
+ */
+struct nlattr *nla_find(struct nlattr *head, int len, int attrtype)
+{
+	struct nlattr *nla;
+	int rem;
+
+	nla_for_each_attr(nla, head, len, rem)
+		if (nla_type(nla) == attrtype)
+			return nla;
+
+	return NULL;
+}
+
+/** @} */
+
+/**
+ * @name Unspecific Attribute
+ * @{
+ */
+
+/**
+ * Reserve space for a attribute.
+ * @arg msg		Netlink Message.
+ * @arg attrtype	Attribute Type.
+ * @arg attrlen		Length of payload.
+ *
+ * Reserves room for a attribute in the specified netlink message and
+ * fills in the attribute header (type, length). Returns NULL if there
+ * is unsuficient space for the attribute.
+ *
+ * Any padding between payload and the start of the next attribute is
+ * zeroed out.
+ *
+ * @return Pointer to start of attribute or NULL on failure.
+ */
+struct nlattr *nla_reserve(struct nl_msg *msg, int attrtype, int attrlen)
+{
+	struct nlattr *nla;
+	int tlen;
+	
+	tlen = NLMSG_ALIGN(msg->nm_nlh->nlmsg_len) + nla_total_size(attrlen);
+
+	if ((tlen + msg->nm_nlh->nlmsg_len) > msg->nm_size)
+		return NULL;
+
+	nla = (struct nlattr *) nlmsg_tail(msg->nm_nlh);
+	nla->nla_type = attrtype;
+	nla->nla_len = nla_attr_size(attrlen);
+
+	memset((unsigned char *) nla + nla->nla_len, 0, nla_padlen(attrlen));
+	msg->nm_nlh->nlmsg_len = tlen;
+
+	NL_DBG(2, "msg %p: Reserved %d bytes at offset +%td for attr %d "
+		  "nlmsg_len=%d\n", msg, attrlen,
+		  (void *) nla - nlmsg_data(msg->nm_nlh),
+		  attrtype, msg->nm_nlh->nlmsg_len);
+
+	return nla;
+}
+
+/**
+ * Add a unspecific attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg datalen		Length of data to be used as payload.
+ * @arg data		Pointer to data to be used as attribute payload.
+ *
+ * Reserves room for a unspecific attribute and copies the provided data
+ * into the message as payload of the attribute. Returns an error if there
+ * is insufficient space for the attribute.
+ *
+ * @see nla_reserve
+ * @return 0 on success or a negative error code.
+ */
+int nla_put(struct nl_msg *msg, int attrtype, int datalen, const void *data)
+{
+	struct nlattr *nla;
+
+	nla = nla_reserve(msg, attrtype, datalen);
+	if (!nla)
+		return -NLE_NOMEM;
+
+	memcpy(nla_data(nla), data, datalen);
+	NL_DBG(2, "msg %p: Wrote %d bytes at offset +%td for attr %d\n",
+	       msg, datalen, (void *) nla - nlmsg_data(msg->nm_nlh), attrtype);
+
+	return 0;
+}
+
+
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/cache.c b/trunk/package/libs/libnl-tiny/src/cache.c
new file mode 100644
index 00000000..0e145743
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/cache.c
@@ -0,0 +1,839 @@
+/*
+ * lib/cache.c		Caching Module
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup cache_mngt
+ * @defgroup cache Cache
+ *
+ * @code
+ *   Cache Management             |    | Type Specific Cache Operations
+ *                                      
+ *                                |    | +----------------+ +------------+
+ *                                       | request update | | msg_parser |
+ *                                |    | +----------------+ +------------+
+ *                                     +- - - - -^- - - - - - - -^- -|- - - -
+ *    nl_cache_update:            |              |               |   |
+ *          1) --------- co_request_update ------+               |   |
+ *                                |                              |   |
+ *          2) destroy old cache     +----------- pp_cb ---------|---+
+ *                                |  |                           |
+ *          3) ---------- nl_recvmsgs ----------+   +- cb_valid -+
+ *             +--------------+   |  |          |   |
+ *             | nl_cache_add |<-----+   + - - -v- -|- - - - - - - - - - -
+ *             +--------------+   |      | +-------------+
+ *                                         | nl_recvmsgs |
+ *                                |      | +-----|-^-----+
+ *                                           +---v-|---+
+ *                                |      |   | nl_recv |
+ *                                           +---------+
+ *                                |      |                 Core Netlink
+ * @endcode
+ * 
+ * @{
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/cache.h>
+#include <netlink/object.h>
+#include <netlink/utils.h>
+
+/**
+ * @name Access Functions
+ * @{
+ */
+
+#ifdef disabled
+/**
+ * Return the number of items in the cache
+ * @arg cache		cache handle
+ */
+int nl_cache_nitems(struct nl_cache *cache)
+{
+	return cache->c_nitems;
+}
+
+/**
+ * Return the number of items matching a filter in the cache
+ * @arg cache		Cache object.
+ * @arg filter		Filter object.
+ */
+int nl_cache_nitems_filter(struct nl_cache *cache, struct nl_object *filter)
+{
+	struct nl_object_ops *ops;
+	struct nl_object *obj;
+	int nitems = 0;
+
+	if (cache->c_ops == NULL)
+		BUG();
+
+	ops = cache->c_ops->co_obj_ops;
+	
+	nl_list_for_each_entry(obj, &cache->c_items, ce_list) {
+		if (filter && !nl_object_match_filter(obj, filter))
+			continue;
+
+		nitems++;
+	}
+
+	return nitems;
+}
+
+/**
+ * Returns \b true if the cache is empty.
+ * @arg cache		Cache to check
+ * @return \a true if the cache is empty, otherwise \b false is returned.
+ */
+int nl_cache_is_empty(struct nl_cache *cache)
+{
+	return nl_list_empty(&cache->c_items);
+}
+
+/**
+ * Return the operations set of the cache
+ * @arg cache		cache handle
+ */
+struct nl_cache_ops *nl_cache_get_ops(struct nl_cache *cache)
+{
+	return cache->c_ops;
+}
+
+/**
+ * Return the first element in the cache
+ * @arg cache		cache handle
+ */
+struct nl_object *nl_cache_get_first(struct nl_cache *cache)
+{
+	if (nl_list_empty(&cache->c_items))
+		return NULL;
+
+	return nl_list_entry(cache->c_items.next,
+			     struct nl_object, ce_list);
+}
+
+/**
+ * Return the last element in the cache
+ * @arg cache		cache handle
+ */
+struct nl_object *nl_cache_get_last(struct nl_cache *cache)
+{
+	if (nl_list_empty(&cache->c_items))
+		return NULL;
+
+	return nl_list_entry(cache->c_items.prev,
+			     struct nl_object, ce_list);
+}
+
+/**
+ * Return the next element in the cache
+ * @arg obj		current object
+ */
+struct nl_object *nl_cache_get_next(struct nl_object *obj)
+{
+	if (nl_list_at_tail(obj, &obj->ce_cache->c_items, ce_list))
+		return NULL;
+	else
+		return nl_list_entry(obj->ce_list.next,
+				     struct nl_object, ce_list);
+}
+
+/**
+ * Return the previous element in the cache
+ * @arg obj		current object
+ */
+struct nl_object *nl_cache_get_prev(struct nl_object *obj)
+{
+	if (nl_list_at_head(obj, &obj->ce_cache->c_items, ce_list))
+		return NULL;
+	else
+		return nl_list_entry(obj->ce_list.prev,
+				     struct nl_object, ce_list);
+}
+#endif
+
+/** @} */
+
+/**
+ * @name Cache Creation/Deletion
+ * @{
+ */
+
+/**
+ * Allocate an empty cache
+ * @arg ops		cache operations to base the cache on
+ * 
+ * @return A newly allocated and initialized cache.
+ */
+struct nl_cache *nl_cache_alloc(struct nl_cache_ops *ops)
+{
+	struct nl_cache *cache;
+
+	cache = calloc(1, sizeof(*cache));
+	if (!cache)
+		return NULL;
+
+	nl_init_list_head(&cache->c_items);
+	cache->c_ops = ops;
+
+	NL_DBG(2, "Allocated cache %p <%s>.\n", cache, nl_cache_name(cache));
+
+	return cache;
+}
+
+int nl_cache_alloc_and_fill(struct nl_cache_ops *ops, struct nl_sock *sock,
+			    struct nl_cache **result)
+{
+	struct nl_cache *cache;
+	int err;
+	
+	if (!(cache = nl_cache_alloc(ops)))
+		return -NLE_NOMEM;
+
+	if (sock && (err = nl_cache_refill(sock, cache)) < 0) {
+		nl_cache_free(cache);
+		return err;
+	}
+
+	*result = cache;
+	return 0;
+}
+
+#ifdef disabled
+/**
+ * Allocate an empty cache based on type name
+ * @arg kind		Name of cache type
+ * @return A newly allocated and initialized cache.
+ */
+int nl_cache_alloc_name(const char *kind, struct nl_cache **result)
+{
+	struct nl_cache_ops *ops;
+	struct nl_cache *cache;
+
+	ops = nl_cache_ops_lookup(kind);
+	if (!ops)
+		return -NLE_NOCACHE;
+
+	if (!(cache = nl_cache_alloc(ops)))
+		return -NLE_NOMEM;
+
+	*result = cache;
+	return 0;
+}
+
+/**
+ * Allocate a new cache containing a subset of a cache
+ * @arg orig		Original cache to be based on
+ * @arg filter		Filter defining the subset to be filled into new cache
+ * @return A newly allocated cache or NULL.
+ */
+struct nl_cache *nl_cache_subset(struct nl_cache *orig,
+				 struct nl_object *filter)
+{
+	struct nl_cache *cache;
+	struct nl_object_ops *ops;
+	struct nl_object *obj;
+
+	if (!filter)
+		BUG();
+
+	cache = nl_cache_alloc(orig->c_ops);
+	if (!cache)
+		return NULL;
+
+	ops = orig->c_ops->co_obj_ops;
+
+	nl_list_for_each_entry(obj, &orig->c_items, ce_list) {
+		if (!nl_object_match_filter(obj, filter))
+			continue;
+
+		nl_cache_add(cache, obj);
+	}
+
+	return cache;
+}
+#endif
+
+/**
+ * Clear a cache.
+ * @arg cache		cache to clear
+ *
+ * Removes all elements of a cache.
+ */
+void nl_cache_clear(struct nl_cache *cache)
+{
+	struct nl_object *obj, *tmp;
+
+	NL_DBG(1, "Clearing cache %p <%s>...\n", cache, nl_cache_name(cache));
+
+	nl_list_for_each_entry_safe(obj, tmp, &cache->c_items, ce_list)
+		nl_cache_remove(obj);
+}
+
+/**
+ * Free a cache.
+ * @arg cache		Cache to free.
+ *
+ * Removes all elements of a cache and frees all memory.
+ *
+ * @note Use this function if you are working with allocated caches.
+ */
+void nl_cache_free(struct nl_cache *cache)
+{
+	if (!cache)
+		return;
+
+	nl_cache_clear(cache);
+	NL_DBG(1, "Freeing cache %p <%s>...\n", cache, nl_cache_name(cache));
+	free(cache);
+}
+
+/** @} */
+
+/**
+ * @name Cache Modifications
+ * @{
+ */
+
+static int __cache_add(struct nl_cache *cache, struct nl_object *obj)
+{
+	obj->ce_cache = cache;
+
+	nl_list_add_tail(&obj->ce_list, &cache->c_items);
+	cache->c_nitems++;
+
+	NL_DBG(1, "Added %p to cache %p <%s>.\n",
+	       obj, cache, nl_cache_name(cache));
+
+	return 0;
+}
+
+/**
+ * Add object to a cache.
+ * @arg cache		Cache to add object to
+ * @arg obj		Object to be added to the cache
+ *
+ * Adds the given object to the specified cache. The object is cloned
+ * if it has been added to another cache already.
+ *
+ * @return 0 or a negative error code.
+ */
+int nl_cache_add(struct nl_cache *cache, struct nl_object *obj)
+{
+	struct nl_object *new;
+
+	if (cache->c_ops->co_obj_ops != obj->ce_ops)
+		return -NLE_OBJ_MISMATCH;
+
+	if (!nl_list_empty(&obj->ce_list)) {
+		new = nl_object_clone(obj);
+		if (!new)
+			return -NLE_NOMEM;
+	} else {
+		nl_object_get(obj);
+		new = obj;
+	}
+
+	return __cache_add(cache, new);
+}
+
+#ifdef disabled
+/**
+ * Move object from one cache to another
+ * @arg cache		Cache to move object to.
+ * @arg obj		Object subject to be moved
+ *
+ * Removes the given object from its associated cache if needed
+ * and adds it to the new cache.
+ *
+ * @return 0 on success or a negative error code.
+ */
+int nl_cache_move(struct nl_cache *cache, struct nl_object *obj)
+{
+	if (cache->c_ops->co_obj_ops != obj->ce_ops)
+		return -NLE_OBJ_MISMATCH;
+
+	NL_DBG(3, "Moving object %p to cache %p\n", obj, cache);
+	
+	/* Acquire reference, if already in a cache this will be
+	 * reverted during removal */
+	nl_object_get(obj);
+
+	if (!nl_list_empty(&obj->ce_list))
+		nl_cache_remove(obj);
+
+	return __cache_add(cache, obj);
+}
+#endif
+
+/**
+ * Removes an object from a cache.
+ * @arg obj		Object to remove from its cache
+ *
+ * Removes the object \c obj from the cache it is assigned to, since
+ * an object can only be assigned to one cache at a time, the cache
+ * must ne be passed along with it.
+ */
+void nl_cache_remove(struct nl_object *obj)
+{
+	struct nl_cache *cache = obj->ce_cache;
+
+	if (cache == NULL)
+		return;
+
+	nl_list_del(&obj->ce_list);
+	obj->ce_cache = NULL;
+	nl_object_put(obj);
+	cache->c_nitems--;
+
+	NL_DBG(1, "Deleted %p from cache %p <%s>.\n",
+	       obj, cache, nl_cache_name(cache));
+}
+
+#ifdef disabled
+/**
+ * Search for an object in a cache
+ * @arg cache		Cache to search in.
+ * @arg needle		Object to look for.
+ *
+ * Iterates over the cache and looks for an object with identical
+ * identifiers as the needle.
+ *
+ * @return Reference to object or NULL if not found.
+ * @note The returned object must be returned via nl_object_put().
+ */
+struct nl_object *nl_cache_search(struct nl_cache *cache,
+				  struct nl_object *needle)
+{
+	struct nl_object *obj;
+
+	nl_list_for_each_entry(obj, &cache->c_items, ce_list) {
+		if (nl_object_identical(obj, needle)) {
+			nl_object_get(obj);
+			return obj;
+		}
+	}
+
+	return NULL;
+}
+#endif
+
+/** @} */
+
+/**
+ * @name Synchronization
+ * @{
+ */
+
+/**
+ * Request a full dump from the kernel to fill a cache
+ * @arg sk		Netlink socket.
+ * @arg cache		Cache subjected to be filled.
+ *
+ * Send a dumping request to the kernel causing it to dump all objects
+ * related to the specified cache to the netlink socket.
+ *
+ * Use nl_cache_pickup() to read the objects from the socket and fill them
+ * into a cache.
+ */
+int nl_cache_request_full_dump(struct nl_sock *sk, struct nl_cache *cache)
+{
+	NL_DBG(2, "Requesting dump from kernel for cache %p <%s>...\n",
+	          cache, nl_cache_name(cache));
+
+	if (cache->c_ops->co_request_update == NULL)
+		return -NLE_OPNOTSUPP;
+
+	return cache->c_ops->co_request_update(cache, sk);
+}
+
+/** @cond SKIP */
+struct update_xdata {
+	struct nl_cache_ops *ops;
+	struct nl_parser_param *params;
+};
+
+static int update_msg_parser(struct nl_msg *msg, void *arg)
+{
+	struct update_xdata *x = arg;
+	
+	return nl_cache_parse(x->ops, &msg->nm_src, msg->nm_nlh, x->params);
+}
+/** @endcond */
+
+int __cache_pickup(struct nl_sock *sk, struct nl_cache *cache,
+		   struct nl_parser_param *param)
+{
+	int err;
+	struct nl_cb *cb;
+	struct update_xdata x = {
+		.ops = cache->c_ops,
+		.params = param,
+	};
+
+	NL_DBG(1, "Picking up answer for cache %p <%s>...\n",
+		  cache, nl_cache_name(cache));
+
+	cb = nl_cb_clone(sk->s_cb);
+	if (cb == NULL)
+		return -NLE_NOMEM;
+
+	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, update_msg_parser, &x);
+
+	err = nl_recvmsgs(sk, cb);
+	if (err < 0)
+		NL_DBG(2, "While picking up for %p <%s>, recvmsgs() returned " \
+		       "%d: %s", cache, nl_cache_name(cache),
+		       err, nl_geterror(err));
+
+	nl_cb_put(cb);
+
+	return err;
+}
+
+static int pickup_cb(struct nl_object *c, struct nl_parser_param *p)
+{
+	return nl_cache_add((struct nl_cache *) p->pp_arg, c);
+}
+
+/**
+ * Pickup a netlink dump response and put it into a cache.
+ * @arg sk		Netlink socket.
+ * @arg cache		Cache to put items into.
+ *
+ * Waits for netlink messages to arrive, parses them and puts them into
+ * the specified cache.
+ *
+ * @return 0 on success or a negative error code.
+ */
+int nl_cache_pickup(struct nl_sock *sk, struct nl_cache *cache)
+{
+	struct nl_parser_param p = {
+		.pp_cb = pickup_cb,
+		.pp_arg = cache,
+	};
+
+	return __cache_pickup(sk, cache, &p);
+}
+
+#ifdef disabled
+static int cache_include(struct nl_cache *cache, struct nl_object *obj,
+			 struct nl_msgtype *type, change_func_t cb)
+{
+	struct nl_object *old;
+
+	switch (type->mt_act) {
+	case NL_ACT_NEW:
+	case NL_ACT_DEL:
+		old = nl_cache_search(cache, obj);
+		if (old) {
+			nl_cache_remove(old);
+			if (type->mt_act == NL_ACT_DEL) {
+				if (cb)
+					cb(cache, old, NL_ACT_DEL);
+				nl_object_put(old);
+			}
+		}
+
+		if (type->mt_act == NL_ACT_NEW) {
+			nl_cache_move(cache, obj);
+			if (old == NULL && cb)
+				cb(cache, obj, NL_ACT_NEW);
+			else if (old) {
+				if (nl_object_diff(old, obj) && cb)
+					cb(cache, obj, NL_ACT_CHANGE);
+
+				nl_object_put(old);
+			}
+		}
+		break;
+	default:
+		NL_DBG(2, "Unknown action associated to object %p\n", obj);
+		return 0;
+	}
+
+	return 0;
+}
+
+int nl_cache_include(struct nl_cache *cache, struct nl_object *obj,
+		     change_func_t change_cb)
+{
+	struct nl_cache_ops *ops = cache->c_ops;
+	int i;
+
+	if (ops->co_obj_ops != obj->ce_ops)
+		return -NLE_OBJ_MISMATCH;
+
+	for (i = 0; ops->co_msgtypes[i].mt_id >= 0; i++)
+		if (ops->co_msgtypes[i].mt_id == obj->ce_msgtype)
+			return cache_include(cache, obj, &ops->co_msgtypes[i],
+					     change_cb);
+
+	return -NLE_MSGTYPE_NOSUPPORT;
+}
+
+static int resync_cb(struct nl_object *c, struct nl_parser_param *p)
+{
+	struct nl_cache_assoc *ca = p->pp_arg;
+
+	return nl_cache_include(ca->ca_cache, c, ca->ca_change);
+}
+
+int nl_cache_resync(struct nl_sock *sk, struct nl_cache *cache,
+		    change_func_t change_cb)
+{
+	struct nl_object *obj, *next;
+	struct nl_cache_assoc ca = {
+		.ca_cache = cache,
+		.ca_change = change_cb,
+	};
+	struct nl_parser_param p = {
+		.pp_cb = resync_cb,
+		.pp_arg = &ca,
+	};
+	int err;
+
+	NL_DBG(1, "Resyncing cache %p <%s>...\n", cache, nl_cache_name(cache));
+
+	/* Mark all objects so we can see if some of them are obsolete */
+	nl_cache_mark_all(cache);
+
+	err = nl_cache_request_full_dump(sk, cache);
+	if (err < 0)
+		goto errout;
+
+	err = __cache_pickup(sk, cache, &p);
+	if (err < 0)
+		goto errout;
+
+	nl_list_for_each_entry_safe(obj, next, &cache->c_items, ce_list)
+		if (nl_object_is_marked(obj))
+			nl_cache_remove(obj);
+
+	NL_DBG(1, "Finished resyncing %p <%s>\n", cache, nl_cache_name(cache));
+
+	err = 0;
+errout:
+	return err;
+}
+#endif
+
+/** @} */
+
+/**
+ * @name Parsing
+ * @{
+ */
+
+/** @cond SKIP */
+int nl_cache_parse(struct nl_cache_ops *ops, struct sockaddr_nl *who,
+		   struct nlmsghdr *nlh, struct nl_parser_param *params)
+{
+	int i, err;
+
+	if (!nlmsg_valid_hdr(nlh, ops->co_hdrsize))
+		return -NLE_MSG_TOOSHORT;
+
+	for (i = 0; ops->co_msgtypes[i].mt_id >= 0; i++) {
+		if (ops->co_msgtypes[i].mt_id == nlh->nlmsg_type) {
+			err = ops->co_msg_parser(ops, who, nlh, params);
+			if (err != -NLE_OPNOTSUPP)
+				goto errout;
+		}
+	}
+
+
+	err = -NLE_MSGTYPE_NOSUPPORT;
+errout:
+	return err;
+}
+/** @endcond */
+
+/**
+ * Parse a netlink message and add it to the cache.
+ * @arg cache		cache to add element to
+ * @arg msg		netlink message
+ *
+ * Parses a netlink message by calling the cache specific message parser
+ * and adds the new element to the cache.
+ *
+ * @return 0 or a negative error code.
+ */
+int nl_cache_parse_and_add(struct nl_cache *cache, struct nl_msg *msg)
+{
+	struct nl_parser_param p = {
+		.pp_cb = pickup_cb,
+		.pp_arg = cache,
+	};
+
+	return nl_cache_parse(cache->c_ops, NULL, nlmsg_hdr(msg), &p);
+}
+
+/**
+ * (Re)fill a cache with the contents in the kernel.
+ * @arg sk		Netlink socket.
+ * @arg cache		cache to update
+ *
+ * Clears the specified cache and fills it with the current state in
+ * the kernel.
+ *
+ * @return 0 or a negative error code.
+ */
+int nl_cache_refill(struct nl_sock *sk, struct nl_cache *cache)
+{
+	int err;
+
+	err = nl_cache_request_full_dump(sk, cache);
+	if (err < 0)
+		return err;
+
+	NL_DBG(2, "Upading cache %p <%s>, request sent, waiting for dump...\n",
+	       cache, nl_cache_name(cache));
+	nl_cache_clear(cache);
+
+	return nl_cache_pickup(sk, cache);
+}
+
+/** @} */
+#ifdef disabled
+
+/**
+ * @name Utillities
+ * @{
+ */
+
+/**
+ * Mark all objects in a cache
+ * @arg cache		Cache to mark all objects in
+ */
+void nl_cache_mark_all(struct nl_cache *cache)
+{
+	struct nl_object *obj;
+
+	NL_DBG(2, "Marking all objects in cache %p <%s>...\n",
+	          cache, nl_cache_name(cache));
+
+	nl_list_for_each_entry(obj, &cache->c_items, ce_list)
+		nl_object_mark(obj);
+}
+
+/** @} */
+
+/**
+ * @name Dumping
+ * @{
+ */
+/**
+ * Dump all elements of a cache.
+ * @arg cache		cache to dump
+ * @arg params		dumping parameters
+ *
+ * Dumps all elements of the \a cache to the file descriptor \a fd.
+ */
+void nl_cache_dump(struct nl_cache *cache, struct nl_dump_params *params)
+{
+	nl_cache_dump_filter(cache, params, NULL);
+}
+
+/**
+ * Dump all elements of a cache (filtered).
+ * @arg cache		cache to dump
+ * @arg params		dumping parameters (optional)
+ * @arg filter		filter object
+ *
+ * Dumps all elements of the \a cache to the file descriptor \a fd
+ * given they match the given filter \a filter.
+ */
+void nl_cache_dump_filter(struct nl_cache *cache,
+			  struct nl_dump_params *params,
+			  struct nl_object *filter)
+{
+	int type = params ? params->dp_type : NL_DUMP_DETAILS;
+	struct nl_object_ops *ops;
+	struct nl_object *obj;
+
+	NL_DBG(2, "Dumping cache %p <%s> filter %p\n",
+	       cache, nl_cache_name(cache), filter);
+
+	if (type > NL_DUMP_MAX || type < 0)
+		BUG();
+
+	if (cache->c_ops == NULL)
+		BUG();
+
+	ops = cache->c_ops->co_obj_ops;
+	if (!ops->oo_dump[type])
+		return;
+
+	nl_list_for_each_entry(obj, &cache->c_items, ce_list) {
+		if (filter && !nl_object_match_filter(obj, filter))
+			continue;
+
+		NL_DBG(4, "Dumping object %p...\n", obj);
+		dump_from_ops(obj, params);
+	}
+}
+
+/** @} */
+
+/**
+ * @name Iterators
+ * @{
+ */
+
+/**
+ * Call a callback on each element of the cache.
+ * @arg cache		cache to iterate on
+ * @arg cb		callback function
+ * @arg arg		argument passed to callback function
+ *
+ * Calls a callback function \a cb on each element of the \a cache.
+ * The argument \a arg is passed on the callback function.
+ */
+void nl_cache_foreach(struct nl_cache *cache,
+		      void (*cb)(struct nl_object *, void *), void *arg)
+{
+	nl_cache_foreach_filter(cache, NULL, cb, arg);
+}
+
+/**
+ * Call a callback on each element of the cache (filtered).
+ * @arg cache		cache to iterate on
+ * @arg filter		filter object
+ * @arg cb		callback function
+ * @arg arg		argument passed to callback function
+ *
+ * Calls a callback function \a cb on each element of the \a cache
+ * that matches the \a filter. The argument \a arg is passed on
+ * to the callback function.
+ */
+void nl_cache_foreach_filter(struct nl_cache *cache, struct nl_object *filter,
+			     void (*cb)(struct nl_object *, void *), void *arg)
+{
+	struct nl_object *obj, *tmp;
+	struct nl_object_ops *ops;
+
+	if (cache->c_ops == NULL)
+		BUG();
+
+	ops = cache->c_ops->co_obj_ops;
+
+	nl_list_for_each_entry_safe(obj, tmp, &cache->c_items, ce_list) {
+		if (filter && !nl_object_match_filter(obj, filter))
+			continue;
+
+		cb(obj, arg);
+	}
+}
+
+/** @} */
+#endif
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/cache_mngt.c b/trunk/package/libs/libnl-tiny/src/cache_mngt.c
new file mode 100644
index 00000000..5c32d2a1
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/cache_mngt.c
@@ -0,0 +1,253 @@
+/*
+ * lib/cache_mngt.c	Cache Management
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup core
+ * @defgroup cache_mngt Caching
+ * @{
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/cache.h>
+#include <netlink/utils.h>
+
+static struct nl_cache_ops *cache_ops;
+
+/**
+ * @name Cache Operations Sets
+ * @{
+ */
+
+/**
+ * Lookup the set cache operations of a certain cache type
+ * @arg name		name of the cache type
+ *
+ * @return The cache operations or NULL if no operations
+ *         have been registered under the specified name.
+ */
+struct nl_cache_ops *nl_cache_ops_lookup(const char *name)
+{
+	struct nl_cache_ops *ops;
+
+	for (ops = cache_ops; ops; ops = ops->co_next)
+		if (!strcmp(ops->co_name, name))
+			return ops;
+
+	return NULL;
+}
+
+/**
+ * Associate a message type to a set of cache operations
+ * @arg protocol		netlink protocol
+ * @arg msgtype			netlink message type
+ *
+ * Associates the specified netlink message type with
+ * a registered set of cache operations.
+ *
+ * @return The cache operations or NULL if no association
+ *         could be made.
+ */
+struct nl_cache_ops *nl_cache_ops_associate(int protocol, int msgtype)
+{
+	int i;
+	struct nl_cache_ops *ops;
+
+	for (ops = cache_ops; ops; ops = ops->co_next) {
+		if (ops->co_protocol != protocol)
+			continue;
+
+		for (i = 0; ops->co_msgtypes[i].mt_id >= 0; i++)
+			if (ops->co_msgtypes[i].mt_id == msgtype)
+				return ops;
+	}
+
+	return NULL;
+}
+
+#ifdef disabled
+
+/**
+ * Lookup message type cache association
+ * @arg ops			cache operations
+ * @arg msgtype			netlink message type
+ *
+ * Searches for a matching message type association ing the specified
+ * cache operations.
+ *
+ * @return A message type association or NULL.
+ */
+struct nl_msgtype *nl_msgtype_lookup(struct nl_cache_ops *ops, int msgtype)
+{
+	int i;
+
+	for (i = 0; ops->co_msgtypes[i].mt_id >= 0; i++)
+		if (ops->co_msgtypes[i].mt_id == msgtype)
+			return &ops->co_msgtypes[i];
+
+	return NULL;
+}
+
+static struct nl_cache_ops *cache_ops_lookup_for_obj(struct nl_object_ops *obj_ops)
+{
+	struct nl_cache_ops *ops;
+
+	for (ops = cache_ops; ops; ops = ops->co_next)
+		if (ops->co_obj_ops == obj_ops)
+			return ops;
+
+	return NULL;
+
+}
+
+/**
+ * Call a function for each registered cache operation
+ * @arg cb		Callback function to be called
+ * @arg arg		User specific argument.
+ */
+void nl_cache_ops_foreach(void (*cb)(struct nl_cache_ops *, void *), void *arg)
+{
+	struct nl_cache_ops *ops;
+
+	for (ops = cache_ops; ops; ops = ops->co_next)
+		cb(ops, arg);
+}
+#endif
+
+/**
+ * Register a set of cache operations
+ * @arg ops		cache operations
+ *
+ * Called by users of caches to announce the avaibility of
+ * a certain cache type.
+ *
+ * @return 0 on success or a negative error code.
+ */
+int nl_cache_mngt_register(struct nl_cache_ops *ops)
+{
+	if (!ops->co_name || !ops->co_obj_ops)
+		return -NLE_INVAL;
+
+	if (nl_cache_ops_lookup(ops->co_name))
+		return -NLE_EXIST;
+
+	ops->co_next = cache_ops;
+	cache_ops = ops;
+
+	NL_DBG(1, "Registered cache operations %s\n", ops->co_name);
+
+	return 0;
+}
+
+/**
+ * Unregister a set of cache operations
+ * @arg ops		cache operations
+ *
+ * Called by users of caches to announce a set of
+ * cache operations is no longer available. The
+ * specified cache operations must have been registered
+ * previously using nl_cache_mngt_register()
+ *
+ * @return 0 on success or a negative error code
+ */
+int nl_cache_mngt_unregister(struct nl_cache_ops *ops)
+{
+	struct nl_cache_ops *t, **tp;
+
+	for (tp = &cache_ops; (t=*tp) != NULL; tp = &t->co_next)
+		if (t == ops)
+			break;
+
+	if (!t)
+		return -NLE_NOCACHE;
+
+	NL_DBG(1, "Unregistered cache operations %s\n", ops->co_name);
+
+	*tp = t->co_next;
+	return 0;
+}
+
+/** @} */
+
+/**
+ * @name Global Cache Provisioning/Requiring
+ * @{
+ */
+#ifdef disabled
+/**
+ * Provide a cache for global use
+ * @arg cache		cache to provide
+ *
+ * Offers the specified cache to be used by other modules.
+ * Only one cache per type may be shared at a time,
+ * a previsouly provided caches will be overwritten.
+ */
+void nl_cache_mngt_provide(struct nl_cache *cache)
+{
+	struct nl_cache_ops *ops;
+
+	ops = cache_ops_lookup_for_obj(cache->c_ops->co_obj_ops);
+	if (!ops)
+		BUG();
+	else
+		ops->co_major_cache = cache;
+}
+
+/**
+ * Unprovide a cache for global use
+ * @arg cache		cache to unprovide
+ *
+ * Cancels the offer to use a cache globally. The
+ * cache will no longer be returned via lookups but
+ * may still be in use.
+ */
+void nl_cache_mngt_unprovide(struct nl_cache *cache)
+{
+	struct nl_cache_ops *ops;
+
+	ops = cache_ops_lookup_for_obj(cache->c_ops->co_obj_ops);
+	if (!ops)
+		BUG();
+	else if (ops->co_major_cache == cache)
+		ops->co_major_cache = NULL;
+}
+
+/**
+ * Demand the use of a global cache
+ * @arg name		name of the required object type
+ *
+ * Trys to find a cache of the specified type for global
+ * use.
+ *
+ * @return A cache provided by another subsystem of the
+ *         specified type marked to be available.
+ */
+struct nl_cache *nl_cache_mngt_require(const char *name)
+{
+	struct nl_cache_ops *ops;
+
+	ops = nl_cache_ops_lookup(name);
+	if (!ops || !ops->co_major_cache) {
+		fprintf(stderr, "Application BUG: Your application must "
+			"call nl_cache_mngt_provide() and\nprovide a valid "
+			"%s cache to be used for internal lookups.\nSee the "
+			" API documentation for more details.\n", name);
+
+		return NULL;
+	}
+	
+	return ops->co_major_cache;
+}
+
+#endif
+/** @} */
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/error.c b/trunk/package/libs/libnl-tiny/src/error.c
new file mode 100644
index 00000000..e8ee4745
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/error.c
@@ -0,0 +1,116 @@
+/*
+ * lib/error.c		Error Handling
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+
+static const char *errmsg[NLE_MAX+1] = {
+[NLE_SUCCESS]		= "Success",
+[NLE_FAILURE]		= "Unspecific failure",
+[NLE_INTR]		= "Interrupted system call",
+[NLE_BAD_SOCK]		= "Bad socket",
+[NLE_AGAIN]		= "Try again",
+[NLE_NOMEM]		= "Out of memory",
+[NLE_EXIST]		= "Object exists",
+[NLE_INVAL]		= "Invalid input data or parameter",
+[NLE_RANGE]		= "Input data out of range",
+[NLE_MSGSIZE]		= "Message size not sufficient",
+[NLE_OPNOTSUPP]		= "Operation not supported",
+[NLE_AF_NOSUPPORT]	= "Address family not supported",
+[NLE_OBJ_NOTFOUND]	= "Object not found",
+[NLE_NOATTR]		= "Attribute not available",
+[NLE_MISSING_ATTR]	= "Missing attribute",
+[NLE_AF_MISMATCH]	= "Address family mismatch",
+[NLE_SEQ_MISMATCH]	= "Message sequence number mismatch",
+[NLE_MSG_OVERFLOW]	= "Kernel reported message overflow",
+[NLE_MSG_TRUNC]		= "Kernel reported truncated message",
+[NLE_NOADDR]		= "Invalid address for specified address family",
+[NLE_SRCRT_NOSUPPORT]	= "Source based routing not supported",
+[NLE_MSG_TOOSHORT]	= "Netlink message is too short",
+[NLE_MSGTYPE_NOSUPPORT]	= "Netlink message type is not supported",
+[NLE_OBJ_MISMATCH]	= "Object type does not match cache",
+[NLE_NOCACHE]		= "Unknown or invalid cache type",
+[NLE_BUSY]		= "Object busy",
+[NLE_PROTO_MISMATCH]	= "Protocol mismatch",
+[NLE_NOACCESS]		= "No Access",
+[NLE_PERM]		= "Operation not permitted",
+[NLE_PKTLOC_FILE]	= "Unable to open packet location file",
+[NLE_PARSE_ERR]		= "Unable to parse object",
+[NLE_NODEV]		= "No such device",
+[NLE_IMMUTABLE]		= "Immutable attribute",
+[NLE_DUMP_INTR]		= "Dump inconsistency detected, interrupted",
+};
+
+/**
+ * Return error message for an error code
+ * @return error message
+ */
+const char *nl_geterror(int error)
+{
+	error = abs(error);
+
+	if (error > NLE_MAX)
+		error = NLE_FAILURE;
+
+	return errmsg[error];
+}
+
+/**
+ * Print a libnl error message
+ * @arg s		error message prefix
+ *
+ * Prints the error message of the call that failed last.
+ *
+ * If s is not NULL and *s is not a null byte the argument
+ * string is printed, followed by a colon and a blank. Then
+ * the error message and a new-line.
+ */
+void nl_perror(int error, const char *s)
+{
+	if (s && *s)
+		fprintf(stderr, "%s: %s\n", s, nl_geterror(error));
+	else
+		fprintf(stderr, "%s\n", nl_geterror(error));
+}
+
+int nl_syserr2nlerr(int error)
+{
+	error = abs(error);
+
+	switch (error) {
+	case EBADF:		return NLE_BAD_SOCK;
+	case EADDRINUSE:	return NLE_EXIST;
+	case EEXIST:		return NLE_EXIST;
+	case EADDRNOTAVAIL:	return NLE_NOADDR;
+	case ESRCH:		/* fall through */
+	case ENOENT:		return NLE_OBJ_NOTFOUND;
+	case EINTR:		return NLE_INTR;
+	case EAGAIN:		return NLE_AGAIN;
+	case ENOTSOCK:		return NLE_BAD_SOCK;
+	case ENOPROTOOPT:	return NLE_INVAL;
+	case EFAULT:		return NLE_INVAL;
+	case EACCES:		return NLE_NOACCESS;
+	case EINVAL:		return NLE_INVAL;
+	case ENOBUFS:		return NLE_NOMEM;
+	case ENOMEM:		return NLE_NOMEM;
+	case EAFNOSUPPORT:	return NLE_AF_NOSUPPORT;
+	case EPROTONOSUPPORT:	return NLE_PROTO_MISMATCH;
+	case EOPNOTSUPP:	return NLE_OPNOTSUPP;
+	case EPERM:		return NLE_PERM;
+	case EBUSY:		return NLE_BUSY;
+	case ERANGE:		return NLE_RANGE;
+	case ENODEV:		return NLE_NODEV;
+	default:		return NLE_FAILURE;
+	}
+}
+
+/** @} */
+
diff --git a/trunk/package/libs/libnl-tiny/src/genl.c b/trunk/package/libs/libnl-tiny/src/genl.c
new file mode 100644
index 00000000..055be919
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/genl.c
@@ -0,0 +1,268 @@
+/*
+ * lib/genl/genl.c		Generic Netlink
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @defgroup genl Generic Netlink
+ *
+ * @par Message Format
+ * @code
+ *  <------- NLMSG_ALIGN(hlen) ------> <---- NLMSG_ALIGN(len) --->
+ * +----------------------------+- - -+- - - - - - - - - - -+- - -+
+ * |           Header           | Pad |       Payload       | Pad |
+ * |      struct nlmsghdr       |     |                     |     |
+ * +----------------------------+- - -+- - - - - - - - - - -+- - -+
+ * @endcode
+ * @code
+ *  <-------- GENL_HDRLEN -------> <--- hdrlen -->
+ *                                 <------- genlmsg_len(ghdr) ------>
+ * +------------------------+- - -+---------------+- - -+------------+
+ * | Generic Netlink Header | Pad | Family Header | Pad | Attributes |
+ * |    struct genlmsghdr   |     |               |     |            |
+ * +------------------------+- - -+---------------+- - -+------------+
+ * genlmsg_data(ghdr)--------------^                     ^
+ * genlmsg_attrdata(ghdr, hdrlen)-------------------------
+ * @endcode
+ *
+ * @par Example
+ * @code
+ * #include <netlink/netlink.h>
+ * #include <netlink/genl/genl.h>
+ * #include <netlink/genl/ctrl.h>
+ *
+ * struct nl_sock *sock;
+ * struct nl_msg *msg;
+ * int family;
+ *
+ * // Allocate a new netlink socket
+ * sock = nl_socket_alloc();
+ *
+ * // Connect to generic netlink socket on kernel side
+ * genl_connect(sock);
+ *
+ * // Ask kernel to resolve family name to family id
+ * family = genl_ctrl_resolve(sock, "generic_netlink_family_name");
+ *
+ * // Construct a generic netlink by allocating a new message, fill in
+ * // the header and append a simple integer attribute.
+ * msg = nlmsg_alloc();
+ * genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, NLM_F_ECHO,
+ *             CMD_FOO_GET, FOO_VERSION);
+ * nla_put_u32(msg, ATTR_FOO, 123);
+ *
+ * // Send message over netlink socket
+ * nl_send_auto_complete(sock, msg);
+ *
+ * // Free message
+ * nlmsg_free(msg);
+ *
+ * // Prepare socket to receive the answer by specifying the callback
+ * // function to be called for valid messages.
+ * nl_socket_modify_cb(sock, NL_CB_VALID, NL_CB_CUSTOM, parse_cb, NULL);
+ *
+ * // Wait for the answer and receive it
+ * nl_recvmsgs_default(sock);
+ *
+ * static int parse_cb(struct nl_msg *msg, void *arg)
+ * {
+ *     struct nlmsghdr *nlh = nlmsg_hdr(msg);
+ *     struct nlattr *attrs[ATTR_MAX+1];
+ *
+ *     // Validate message and parse attributes
+ *     genlmsg_parse(nlh, 0, attrs, ATTR_MAX, policy);
+ *
+ *     if (attrs[ATTR_FOO]) {
+ *         uint32_t value = nla_get_u32(attrs[ATTR_FOO]);
+ *         ...
+ *     }
+ *
+ *     return 0;
+ * }
+ * @endcode
+ * @{
+ */
+
+#include <netlink-generic.h>
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/utils.h>
+
+/**
+ * @name Socket Creating
+ * @{
+ */
+
+int genl_connect(struct nl_sock *sk)
+{
+	return nl_connect(sk, NETLINK_GENERIC);
+}
+
+/** @} */
+
+/**
+ * @name Sending
+ * @{
+ */
+
+/**
+ * Send trivial generic netlink message
+ * @arg sk		Netlink socket.
+ * @arg family		Generic netlink family
+ * @arg cmd		Command
+ * @arg version		Version
+ * @arg flags		Additional netlink message flags.
+ *
+ * Fills out a routing netlink request message and sends it out
+ * using nl_send_simple().
+ *
+ * @return 0 on success or a negative error code.
+ */
+int genl_send_simple(struct nl_sock *sk, int family, int cmd,
+		     int version, int flags)
+{
+	struct genlmsghdr hdr = {
+		.cmd = cmd,
+		.version = version,
+	};
+
+	return nl_send_simple(sk, family, flags, &hdr, sizeof(hdr));
+}
+
+/** @} */
+
+
+/**
+ * @name Message Parsing
+ * @{
+ */
+
+int genlmsg_valid_hdr(struct nlmsghdr *nlh, int hdrlen)
+{
+	struct genlmsghdr *ghdr;
+
+	if (!nlmsg_valid_hdr(nlh, GENL_HDRLEN))
+		return 0;
+
+	ghdr = nlmsg_data(nlh);
+	if (genlmsg_len(ghdr) < NLMSG_ALIGN(hdrlen))
+		return 0;
+
+	return 1;
+}
+
+int genlmsg_validate(struct nlmsghdr *nlh, int hdrlen, int maxtype,
+		   struct nla_policy *policy)
+{
+	struct genlmsghdr *ghdr;
+
+	if (!genlmsg_valid_hdr(nlh, hdrlen))
+		return -NLE_MSG_TOOSHORT;
+
+	ghdr = nlmsg_data(nlh);
+	return nla_validate(genlmsg_attrdata(ghdr, hdrlen),
+			    genlmsg_attrlen(ghdr, hdrlen), maxtype, policy);
+}
+
+int genlmsg_parse(struct nlmsghdr *nlh, int hdrlen, struct nlattr *tb[],
+		  int maxtype, struct nla_policy *policy)
+{
+	struct genlmsghdr *ghdr;
+
+	if (!genlmsg_valid_hdr(nlh, hdrlen))
+		return -NLE_MSG_TOOSHORT;
+
+	ghdr = nlmsg_data(nlh);
+	return nla_parse(tb, maxtype, genlmsg_attrdata(ghdr, hdrlen),
+			 genlmsg_attrlen(ghdr, hdrlen), policy);
+}
+
+/**
+ * Get head of message payload
+ * @arg gnlh	genetlink messsage header
+ */
+void *genlmsg_data(const struct genlmsghdr *gnlh)
+{
+	return ((unsigned char *) gnlh + GENL_HDRLEN);
+}
+
+/**
+ * Get lenght of message payload
+ * @arg gnlh	genetlink message header
+ */
+int genlmsg_len(const struct genlmsghdr *gnlh)
+{
+	struct nlmsghdr *nlh = (struct nlmsghdr *)((unsigned char *)gnlh -
+							NLMSG_HDRLEN);
+	return (nlh->nlmsg_len - GENL_HDRLEN - NLMSG_HDRLEN);
+}
+
+/**
+ * Get head of attribute data
+ * @arg gnlh	generic netlink message header
+ * @arg hdrlen	length of family specific header
+ */
+struct nlattr *genlmsg_attrdata(const struct genlmsghdr *gnlh, int hdrlen)
+{
+	return genlmsg_data(gnlh) + NLMSG_ALIGN(hdrlen);
+}
+
+/**
+ * Get length of attribute data
+ * @arg gnlh	generic netlink message header
+ * @arg hdrlen	length of family specific header
+ */
+int genlmsg_attrlen(const struct genlmsghdr *gnlh, int hdrlen)
+{
+	return genlmsg_len(gnlh) - NLMSG_ALIGN(hdrlen);
+}
+
+/** @} */
+
+/**
+ * @name Message Building
+ * @{
+ */
+
+/**
+ * Add generic netlink header to netlink message
+ * @arg msg		netlink message
+ * @arg pid		netlink process id or NL_AUTO_PID
+ * @arg seq		sequence number of message or NL_AUTO_SEQ
+ * @arg family		generic netlink family
+ * @arg hdrlen		length of user specific header
+ * @arg flags		message flags
+ * @arg cmd		generic netlink command
+ * @arg version		protocol version
+ *
+ * Returns pointer to user specific header.
+ */
+void *genlmsg_put(struct nl_msg *msg, uint32_t pid, uint32_t seq, int family,
+		  int hdrlen, int flags, uint8_t cmd, uint8_t version)
+{
+	struct nlmsghdr *nlh;
+	struct genlmsghdr hdr = {
+		.cmd = cmd,
+		.version = version,
+	};
+
+	nlh = nlmsg_put(msg, pid, seq, family, GENL_HDRLEN + hdrlen, flags);
+	if (nlh == NULL)
+		return NULL;
+
+	memcpy(nlmsg_data(nlh), &hdr, sizeof(hdr));
+	NL_DBG(2, "msg %p: Added generic netlink header cmd=%d version=%d\n",
+	       msg, cmd, version);
+
+	return nlmsg_data(nlh) + GENL_HDRLEN;
+}
+
+/** @} */
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/genl_ctrl.c b/trunk/package/libs/libnl-tiny/src/genl_ctrl.c
new file mode 100644
index 00000000..13016420
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/genl_ctrl.c
@@ -0,0 +1,302 @@
+/*
+ * lib/genl/ctrl.c		Generic Netlink Controller
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup genl_mngt
+ * @defgroup ctrl Controller
+ * @brief
+ *
+ * @{
+ */
+
+#include <netlink-generic.h>
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
+#include <netlink/genl/mngt.h>
+#include <netlink/genl/ctrl.h>
+#include <netlink/utils.h>
+
+/** @cond SKIP */
+#define CTRL_VERSION		0x0001
+
+static struct nl_cache_ops genl_ctrl_ops;
+/** @endcond */
+
+static int ctrl_request_update(struct nl_cache *c, struct nl_sock *h)
+{
+	return genl_send_simple(h, GENL_ID_CTRL, CTRL_CMD_GETFAMILY,
+				CTRL_VERSION, NLM_F_DUMP);
+}
+
+static struct nla_policy ctrl_policy[CTRL_ATTR_MAX+1] = {
+	[CTRL_ATTR_FAMILY_ID]	= { .type = NLA_U16 },
+	[CTRL_ATTR_FAMILY_NAME]	= { .type = NLA_STRING,
+				    .maxlen = GENL_NAMSIZ },
+	[CTRL_ATTR_VERSION]	= { .type = NLA_U32 },
+	[CTRL_ATTR_HDRSIZE]	= { .type = NLA_U32 },
+	[CTRL_ATTR_MAXATTR]	= { .type = NLA_U32 },
+	[CTRL_ATTR_OPS]		= { .type = NLA_NESTED },
+};
+
+static struct nla_policy family_op_policy[CTRL_ATTR_OP_MAX+1] = {
+	[CTRL_ATTR_OP_ID]	= { .type = NLA_U32 },
+	[CTRL_ATTR_OP_FLAGS]	= { .type = NLA_U32 },
+};
+
+static int ctrl_msg_parser(struct nl_cache_ops *ops, struct genl_cmd *cmd,
+			   struct genl_info *info, void *arg)
+{
+	struct genl_family *family;
+	struct nl_parser_param *pp = arg;
+	int err;
+
+	family = genl_family_alloc();
+	if (family == NULL) {
+		err = -NLE_NOMEM;
+		goto errout;
+	}
+
+	if (info->attrs[CTRL_ATTR_FAMILY_NAME] == NULL) {
+		err = -NLE_MISSING_ATTR;
+		goto errout;
+	}
+
+	if (info->attrs[CTRL_ATTR_FAMILY_ID] == NULL) {
+		err = -NLE_MISSING_ATTR;
+		goto errout;
+	}
+
+	family->ce_msgtype = info->nlh->nlmsg_type;
+	genl_family_set_id(family,
+			   nla_get_u16(info->attrs[CTRL_ATTR_FAMILY_ID]));
+	genl_family_set_name(family,
+		     nla_get_string(info->attrs[CTRL_ATTR_FAMILY_NAME]));
+
+	if (info->attrs[CTRL_ATTR_VERSION]) {
+		uint32_t version = nla_get_u32(info->attrs[CTRL_ATTR_VERSION]);
+		genl_family_set_version(family, version);
+	}
+
+	if (info->attrs[CTRL_ATTR_HDRSIZE]) {
+		uint32_t hdrsize = nla_get_u32(info->attrs[CTRL_ATTR_HDRSIZE]);
+		genl_family_set_hdrsize(family, hdrsize);
+	}
+
+	if (info->attrs[CTRL_ATTR_MAXATTR]) {
+		uint32_t maxattr = nla_get_u32(info->attrs[CTRL_ATTR_MAXATTR]);
+		genl_family_set_maxattr(family, maxattr);
+	}
+
+	if (info->attrs[CTRL_ATTR_OPS]) {
+		struct nlattr *nla, *nla_ops;
+		int remaining;
+
+		nla_ops = info->attrs[CTRL_ATTR_OPS];
+		nla_for_each_nested(nla, nla_ops, remaining) {
+			struct nlattr *tb[CTRL_ATTR_OP_MAX+1];
+			int flags = 0, id;
+
+			err = nla_parse_nested(tb, CTRL_ATTR_OP_MAX, nla,
+					       family_op_policy);
+			if (err < 0)
+				goto errout;
+
+			if (tb[CTRL_ATTR_OP_ID] == NULL) {
+				err = -NLE_MISSING_ATTR;
+				goto errout;
+			}
+			
+			id = nla_get_u32(tb[CTRL_ATTR_OP_ID]);
+
+			if (tb[CTRL_ATTR_OP_FLAGS])
+				flags = nla_get_u32(tb[CTRL_ATTR_OP_FLAGS]);
+
+			err = genl_family_add_op(family, id, flags);
+			if (err < 0)
+				goto errout;
+
+		}
+	}
+
+	err = pp->pp_cb((struct nl_object *) family, pp);
+errout:
+	genl_family_put(family);
+	return err;
+}
+
+/**
+ * @name Cache Management
+ * @{
+ */
+
+int genl_ctrl_alloc_cache(struct nl_sock *sock, struct nl_cache **result)
+{
+	return nl_cache_alloc_and_fill(&genl_ctrl_ops, sock, result);
+}
+
+/**
+ * Look up generic netlink family by id in the provided cache.
+ * @arg cache		Generic netlink family cache.
+ * @arg id		Family identifier.
+ *
+ * Searches through the cache looking for a registered family
+ * matching the specified identifier. The caller will own a
+ * reference on the returned object which needs to be given
+ * back after usage using genl_family_put().
+ *
+ * @return Generic netlink family object or NULL if no match was found.
+ */
+struct genl_family *genl_ctrl_search(struct nl_cache *cache, int id)
+{
+	struct genl_family *fam;
+
+	if (cache->c_ops != &genl_ctrl_ops)
+		BUG();
+
+	nl_list_for_each_entry(fam, &cache->c_items, ce_list) {
+		if (fam->gf_id == id) {
+			nl_object_get((struct nl_object *) fam);
+			return fam;
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * @name Resolver
+ * @{
+ */
+
+/**
+ * Look up generic netlink family by family name in the provided cache.
+ * @arg cache		Generic netlink family cache.
+ * @arg name		Family name.
+ *
+ * Searches through the cache looking for a registered family
+ * matching the specified name. The caller will own a reference
+ * on the returned object which needs to be given back after
+ * usage using genl_family_put().
+ *
+ * @return Generic netlink family object or NULL if no match was found.
+ */
+struct genl_family *genl_ctrl_search_by_name(struct nl_cache *cache,
+					    const char *name)
+{
+	struct genl_family *fam;
+
+	if (cache->c_ops != &genl_ctrl_ops)
+		BUG();
+
+	nl_list_for_each_entry(fam, &cache->c_items, ce_list) {
+		if (!strcmp(name, fam->gf_name)) {
+			nl_object_get((struct nl_object *) fam);
+			return fam;
+		}
+	}
+
+	return NULL;
+}
+
+/** @} */
+
+/**
+ * Resolve generic netlink family name to its identifier
+ * @arg sk		Netlink socket.
+ * @arg name		Name of generic netlink family
+ *
+ * Resolves the generic netlink family name to its identifer and returns
+ * it.
+ *
+ * @return A positive identifier or a negative error code.
+ */
+int genl_ctrl_resolve(struct nl_sock *sk, const char *name)
+{
+	struct nl_cache *cache;
+	struct genl_family *family;
+	int err;
+
+	if ((err = genl_ctrl_alloc_cache(sk, &cache)) < 0)
+		return err;
+
+	family = genl_ctrl_search_by_name(cache, name);
+	if (family == NULL) {
+		err = -NLE_OBJ_NOTFOUND;
+		goto errout;
+	}
+
+	err = genl_family_get_id(family);
+	genl_family_put(family);
+errout:
+	nl_cache_free(cache);
+
+	return err;
+}
+
+/** @} */
+
+static struct genl_cmd genl_cmds[] = {
+	{
+		.c_id		= CTRL_CMD_NEWFAMILY,
+		.c_name		= "NEWFAMILY" ,
+		.c_maxattr	= CTRL_ATTR_MAX,
+		.c_attr_policy	= ctrl_policy,
+		.c_msg_parser	= ctrl_msg_parser,
+	},
+	{
+		.c_id		= CTRL_CMD_DELFAMILY,
+		.c_name		= "DELFAMILY" ,
+	},
+	{
+		.c_id		= CTRL_CMD_GETFAMILY,
+		.c_name		= "GETFAMILY" ,
+	},
+	{
+		.c_id		= CTRL_CMD_NEWOPS,
+		.c_name		= "NEWOPS" ,
+	},
+	{
+		.c_id		= CTRL_CMD_DELOPS,
+		.c_name		= "DELOPS" ,
+	},
+};
+
+static struct genl_ops genl_ops = {
+	.o_cmds			= genl_cmds,
+	.o_ncmds		= ARRAY_SIZE(genl_cmds),
+};
+
+/** @cond SKIP */
+extern struct nl_object_ops genl_family_ops;
+/** @endcond */
+
+static struct nl_cache_ops genl_ctrl_ops = {
+	.co_name		= "genl/family",
+	.co_hdrsize		= GENL_HDRSIZE(0),
+	.co_msgtypes		= GENL_FAMILY(GENL_ID_CTRL, "nlctrl"),
+	.co_genl		= &genl_ops,
+	.co_protocol		= NETLINK_GENERIC,
+	.co_request_update      = ctrl_request_update,
+	.co_obj_ops		= &genl_family_ops,
+};
+
+static void __init ctrl_init(void)
+{
+	genl_register(&genl_ctrl_ops);
+}
+
+static void __exit ctrl_exit(void)
+{
+	genl_unregister(&genl_ctrl_ops);
+}
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/genl_family.c b/trunk/package/libs/libnl-tiny/src/genl_family.c
new file mode 100644
index 00000000..88aaad9b
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/genl_family.c
@@ -0,0 +1,136 @@
+/*
+ * lib/genl/family.c		Generic Netlink Family
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup genl
+ * @defgroup genl_family Generic Netlink Family
+ * @brief
+ *
+ * @{
+ */
+
+#include <netlink-generic.h>
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
+#include <netlink/utils.h>
+
+struct nl_object_ops genl_family_ops;
+/** @endcond */
+
+static void family_constructor(struct nl_object *c)
+{
+	struct genl_family *family = (struct genl_family *) c;
+
+	nl_init_list_head(&family->gf_ops);
+}
+
+static void family_free_data(struct nl_object *c)
+{
+	struct genl_family *family = (struct genl_family *) c;
+	struct genl_family_op *ops, *tmp;
+
+	if (family == NULL)
+		return;
+
+	nl_list_for_each_entry_safe(ops, tmp, &family->gf_ops, o_list) {
+		nl_list_del(&ops->o_list);
+		free(ops);
+	}
+}
+
+static int family_clone(struct nl_object *_dst, struct nl_object *_src)
+{
+	struct genl_family *dst = nl_object_priv(_dst);
+	struct genl_family *src = nl_object_priv(_src);
+	struct genl_family_op *ops;
+	int err;
+
+	nl_list_for_each_entry(ops, &src->gf_ops, o_list) {
+		err = genl_family_add_op(dst, ops->o_id, ops->o_flags);
+		if (err < 0)
+			return err;
+	}
+	
+	return 0;
+}
+
+static int family_compare(struct nl_object *_a, struct nl_object *_b,
+			  uint32_t attrs, int flags)
+{
+	struct genl_family *a = (struct genl_family *) _a;
+	struct genl_family *b = (struct genl_family *) _b;
+	int diff = 0;
+
+#define FAM_DIFF(ATTR, EXPR) ATTR_DIFF(attrs, FAMILY_ATTR_##ATTR, a, b, EXPR)
+
+	diff |= FAM_DIFF(ID,		a->gf_id != b->gf_id);
+	diff |= FAM_DIFF(VERSION,	a->gf_version != b->gf_version);
+	diff |= FAM_DIFF(HDRSIZE,	a->gf_hdrsize != b->gf_hdrsize);
+	diff |= FAM_DIFF(MAXATTR,	a->gf_maxattr != b->gf_maxattr);
+	diff |= FAM_DIFF(NAME,		strcmp(a->gf_name, b->gf_name));
+
+#undef FAM_DIFF
+
+	return diff;
+}
+
+
+/**
+ * @name Family Object
+ * @{
+ */
+
+struct genl_family *genl_family_alloc(void)
+{
+	return (struct genl_family *) nl_object_alloc(&genl_family_ops);
+}
+
+void genl_family_put(struct genl_family *family)
+{
+	nl_object_put((struct nl_object *) family);
+}
+
+/** @} */
+
+
+int genl_family_add_op(struct genl_family *family, int id, int flags)
+{
+	struct genl_family_op *op;
+
+	op = calloc(1, sizeof(*op));
+	if (op == NULL)
+		return -NLE_NOMEM;
+
+	op->o_id = id;
+	op->o_flags = flags;
+
+	nl_list_add_tail(&op->o_list, &family->gf_ops);
+	family->ce_mask |= FAMILY_ATTR_OPS;
+
+	return 0;
+}
+
+/** @} */
+
+/** @cond SKIP */
+struct nl_object_ops genl_family_ops = {
+	.oo_name		= "genl/family",
+	.oo_size		= sizeof(struct genl_family),
+	.oo_constructor		= family_constructor,
+	.oo_free_data		= family_free_data,
+	.oo_clone		= family_clone,
+	.oo_compare		= family_compare,
+	.oo_id_attrs		= FAMILY_ATTR_ID,
+};
+/** @endcond */
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/genl_mngt.c b/trunk/package/libs/libnl-tiny/src/genl_mngt.c
new file mode 100644
index 00000000..6c651796
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/genl_mngt.c
@@ -0,0 +1,274 @@
+/*
+ * lib/genl/mngt.c		Generic Netlink Management
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup genl
+ * @defgroup genl_mngt Management
+ *
+ * @par 1) Registering a generic netlink module
+ * @code
+ * #include <netlink/genl/mngt.h>
+ *
+ * // First step is to define all the commands being used in
+ * // particular generic netlink family. The ID and name are
+ * // mandatory to be filled out. A callback function and
+ * // most the attribute policy that comes with it must be
+ * // defined for commands expected to be issued towards
+ * // userspace.
+ * static struct genl_cmd foo_cmds[] = {
+ * 	{
+ * 		.c_id		= FOO_CMD_NEW,
+ * 		.c_name		= "NEWFOO" ,
+ * 		.c_maxattr	= FOO_ATTR_MAX,
+ * 		.c_attr_policy	= foo_policy,
+ * 		.c_msg_parser	= foo_msg_parser,
+ * 	},
+ * 	{
+ * 		.c_id		= FOO_CMD_DEL,
+ * 		.c_name		= "DELFOO" ,
+ * 	},
+ * };
+ *
+ * // The list of commands must then be integrated into a
+ * // struct genl_ops serving as handle for this particular
+ * // family.
+ * static struct genl_ops my_genl_ops = {
+ * 	.o_cmds			= foo_cmds,
+ * 	.o_ncmds		= ARRAY_SIZE(foo_cmds),
+ * };
+ *
+ * // Using the above struct genl_ops an arbitary number of
+ * // cache handles can be associated to it.
+ * //
+ * // The macro GENL_HDRSIZE() must be used to specify the
+ * // length of the header to automatically take headers on
+ * // generic layers into account.
+ * //
+ * // The macro GENL_FAMILY() is used to represent the generic
+ * // netlink family id.
+ * static struct nl_cache_ops genl_foo_ops = {
+ * 	.co_name		= "genl/foo",
+ * 	.co_hdrsize		= GENL_HDRSIZE(sizeof(struct my_hdr)),
+ * 	.co_msgtypes		= GENL_FAMILY(GENL_ID_GENERATE, "foo"),
+ * 	.co_genl		= &my_genl_ops,
+ * 	.co_protocol		= NETLINK_GENERIC,
+ * 	.co_request_update      = foo_request_update,
+ * 	.co_obj_ops		= &genl_foo_ops,
+ * };
+ *
+ * // Finally each cache handle for a generic netlink family
+ * // must be registered using genl_register().
+ * static void __init foo_init(void)
+ * {
+ * 	genl_register(&genl_foo_ops);
+ * }
+ *
+ * // ... respectively unregsted again.
+ * static void __exit foo_exit(void)
+ * {
+ * 	genl_unregister(&genl_foo_ops);
+ * }
+ * @endcode
+ * @{
+ */
+
+#include <netlink-generic.h>
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/mngt.h>
+#include <netlink/genl/family.h>
+#include <netlink/genl/ctrl.h>
+#include <netlink/utils.h>
+
+static NL_LIST_HEAD(genl_ops_list);
+
+static int genl_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
+			   struct nlmsghdr *nlh, struct nl_parser_param *pp)
+{
+	int i, err;
+	struct genlmsghdr *ghdr;
+	struct genl_cmd *cmd;
+
+	ghdr = nlmsg_data(nlh);
+
+	if (ops->co_genl == NULL)
+		BUG();
+
+	for (i = 0; i < ops->co_genl->o_ncmds; i++) {
+		cmd = &ops->co_genl->o_cmds[i];
+		if (cmd->c_id == ghdr->cmd)
+			goto found;
+	}
+
+	err = -NLE_MSGTYPE_NOSUPPORT;
+	goto errout;
+
+found:
+	if (cmd->c_msg_parser == NULL)
+		err = -NLE_OPNOTSUPP;
+	else {
+		struct nlattr *tb[cmd->c_maxattr + 1];
+		struct genl_info info = {
+			.who = who,
+			.nlh = nlh,
+			.genlhdr = ghdr,
+			.userhdr = genlmsg_data(ghdr),
+			.attrs = tb,
+		};
+
+		err = nlmsg_parse(nlh, ops->co_hdrsize, tb, cmd->c_maxattr,
+				  cmd->c_attr_policy);
+		if (err < 0)
+			goto errout;
+
+		err = cmd->c_msg_parser(ops, cmd, &info, pp);
+	}
+errout:
+	return err;
+
+}
+
+#ifdef disabled
+char *genl_op2name(int family, int op, char *buf, size_t len)
+{
+	struct genl_ops *ops;
+	int i;
+
+	nl_list_for_each_entry(ops, &genl_ops_list, o_list) {
+		if (ops->o_family == family) {
+			for (i = 0; i < ops->o_ncmds; i++) {
+				struct genl_cmd *cmd;
+				cmd = &ops->o_cmds[i];
+
+				if (cmd->c_id == op) {
+					strncpy(buf, cmd->c_name, len - 1);
+					return buf;
+				}
+			}
+		}
+	}
+
+	strncpy(buf, "unknown", len - 1);
+	return NULL;
+}
+#endif
+
+/**
+ * @name Register/Unregister
+ * @{
+ */
+
+/**
+ * Register generic netlink operations
+ * @arg ops		cache operations
+ */
+int genl_register(struct nl_cache_ops *ops)
+{
+	int err;
+
+	if (ops->co_protocol != NETLINK_GENERIC) {
+		err = -NLE_PROTO_MISMATCH;
+		goto errout;
+	}
+
+	if (ops->co_hdrsize < GENL_HDRSIZE(0)) {
+		err = -NLE_INVAL;
+		goto errout;
+	}
+
+	if (ops->co_genl == NULL) {
+		err = -NLE_INVAL;
+		goto errout;
+	}
+
+	ops->co_genl->o_cache_ops = ops;
+	ops->co_genl->o_name = ops->co_msgtypes[0].mt_name;
+	ops->co_genl->o_family = ops->co_msgtypes[0].mt_id;
+	ops->co_msg_parser = genl_msg_parser;
+
+	/* FIXME: check for dup */
+
+	nl_list_add_tail(&ops->co_genl->o_list, &genl_ops_list);
+
+	err = nl_cache_mngt_register(ops);
+errout:
+	return err;
+}
+
+/**
+ * Unregister generic netlink operations
+ * @arg ops		cache operations
+ */
+void genl_unregister(struct nl_cache_ops *ops)
+{
+	nl_cache_mngt_unregister(ops);
+	nl_list_del(&ops->co_genl->o_list);
+}
+
+/** @} */
+
+/**
+ * @name Resolving ID/Name
+ * @{
+ */
+#ifdef disabled
+static int __genl_ops_resolve(struct nl_cache *ctrl, struct genl_ops *ops)
+{
+	struct genl_family *family;
+
+	family = genl_ctrl_search_by_name(ctrl, ops->o_name);
+	if (family != NULL) {
+		ops->o_id = genl_family_get_id(family);
+		genl_family_put(family);
+
+		return 0;
+	}
+
+	return -NLE_OBJ_NOTFOUND;
+}
+
+int genl_ops_resolve(struct nl_sock *sk, struct genl_ops *ops)
+{
+	struct nl_cache *ctrl;
+	int err;
+
+	if ((err = genl_ctrl_alloc_cache(sk, &ctrl)) < 0)
+		goto errout;
+
+	err = __genl_ops_resolve(ctrl, ops);
+
+	nl_cache_free(ctrl);
+errout:
+	return err;
+}
+
+int genl_mngt_resolve(struct nl_sock *sk)
+{
+	struct nl_cache *ctrl;
+	struct genl_ops *ops;
+	int err = 0;
+
+	if ((err = genl_ctrl_alloc_cache(sk, &ctrl)) < 0)
+		goto errout;
+
+	nl_list_for_each_entry(ops, &genl_ops_list, o_list) {
+		err = __genl_ops_resolve(ctrl, ops);
+	}
+
+	nl_cache_free(ctrl);
+errout:
+	return err;
+}
+#endif
+/** @} */
+
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/handlers.c b/trunk/package/libs/libnl-tiny/src/handlers.c
new file mode 100644
index 00000000..12ebda52
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/handlers.c
@@ -0,0 +1,162 @@
+/*
+ * lib/handlers.c	default netlink message handlers
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup core
+ * @defgroup cb Callbacks/Customization
+ *
+ * @details
+ * @par 1) Setting up a callback set
+ * @code
+ * // Allocate a callback set and initialize it to the verbose default set
+ * struct nl_cb *cb = nl_cb_alloc(NL_CB_VERBOSE);
+ *
+ * // Modify the set to call my_func() for all valid messages
+ * nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, my_func, NULL);
+ *
+ * // Set the error message handler to the verbose default implementation
+ * // and direct it to print all errors to the given file descriptor.
+ * FILE *file = fopen(...);
+ * nl_cb_err(cb, NL_CB_VERBOSE, NULL, file);
+ * @endcode
+ * @{
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/utils.h>
+#include <netlink/msg.h>
+#include <netlink/handlers.h>
+
+/**
+ * @name Callback Handle Management
+ * @{
+ */
+
+/**
+ * Allocate a new callback handle
+ * @arg kind		callback kind to be used for initialization
+ * @return Newly allocated callback handle or NULL
+ */
+struct nl_cb *nl_cb_alloc(enum nl_cb_kind kind)
+{
+	int i;
+	struct nl_cb *cb;
+
+	if (kind < 0 || kind > NL_CB_KIND_MAX)
+		return NULL;
+
+	cb = calloc(1, sizeof(*cb));
+	if (!cb)
+		return NULL;
+
+	cb->cb_refcnt = 1;
+
+	for (i = 0; i <= NL_CB_TYPE_MAX; i++)
+		nl_cb_set(cb, i, kind, NULL, NULL);
+
+	nl_cb_err(cb, kind, NULL, NULL);
+
+	return cb;
+}
+
+/**
+ * Clone an existing callback handle
+ * @arg orig		original callback handle
+ * @return Newly allocated callback handle being a duplicate of
+ *         orig or NULL
+ */
+struct nl_cb *nl_cb_clone(struct nl_cb *orig)
+{
+	struct nl_cb *cb;
+	
+	cb = nl_cb_alloc(NL_CB_DEFAULT);
+	if (!cb)
+		return NULL;
+
+	memcpy(cb, orig, sizeof(*orig));
+	cb->cb_refcnt = 1;
+
+	return cb;
+}
+
+void nl_cb_put(struct nl_cb *cb)
+{
+	if (!cb)
+		return;
+
+	cb->cb_refcnt--;
+
+	if (cb->cb_refcnt < 0)
+		BUG();
+
+	if (cb->cb_refcnt <= 0)
+		free(cb);
+}
+
+/** @} */
+
+/**
+ * @name Callback Setup
+ * @{
+ */
+
+/**
+ * Set up a callback 
+ * @arg cb		callback set
+ * @arg type		callback to modify
+ * @arg kind		kind of implementation
+ * @arg func		callback function (NL_CB_CUSTOM)
+ * @arg arg		argument passed to callback
+ *
+ * @return 0 on success or a negative error code
+ */
+int nl_cb_set(struct nl_cb *cb, enum nl_cb_type type, enum nl_cb_kind kind,
+	      nl_recvmsg_msg_cb_t func, void *arg)
+{
+	if (type < 0 || type > NL_CB_TYPE_MAX)
+		return -NLE_RANGE;
+
+	if (kind < 0 || kind > NL_CB_KIND_MAX)
+		return -NLE_RANGE;
+
+	if (kind == NL_CB_CUSTOM) {
+		cb->cb_set[type] = func;
+		cb->cb_args[type] = arg;
+	}
+
+	return 0;
+}
+
+/**
+ * Set up an error callback
+ * @arg cb		callback set
+ * @arg kind		kind of callback
+ * @arg func		callback function
+ * @arg arg		argument to be passed to callback function
+ */
+int nl_cb_err(struct nl_cb *cb, enum nl_cb_kind kind,
+	      nl_recvmsg_err_cb_t func, void *arg)
+{
+	if (kind < 0 || kind > NL_CB_KIND_MAX)
+		return -NLE_RANGE;
+
+	if (kind == NL_CB_CUSTOM) {
+		cb->cb_err = func;
+		cb->cb_err_arg = arg;
+	}
+
+	return 0;
+}
+
+/** @} */
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/include/linux/gen_stats.h b/trunk/package/libs/libnl-tiny/src/include/linux/gen_stats.h
new file mode 100644
index 00000000..13f4e746
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/linux/gen_stats.h
@@ -0,0 +1,67 @@
+#ifndef __LINUX_GEN_STATS_H
+#define __LINUX_GEN_STATS_H
+
+#include <linux/types.h>
+
+enum {
+	TCA_STATS_UNSPEC,
+	TCA_STATS_BASIC,
+	TCA_STATS_RATE_EST,
+	TCA_STATS_QUEUE,
+	TCA_STATS_APP,
+	__TCA_STATS_MAX,
+};
+#define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
+
+/**
+ * struct gnet_stats_basic - byte/packet throughput statistics
+ * @bytes: number of seen bytes
+ * @packets: number of seen packets
+ */
+struct gnet_stats_basic
+{
+	__u64	bytes;
+	__u32	packets;
+};
+
+/**
+ * struct gnet_stats_rate_est - rate estimator
+ * @bps: current byte rate
+ * @pps: current packet rate
+ */
+struct gnet_stats_rate_est
+{
+	__u32	bps;
+	__u32	pps;
+};
+
+/**
+ * struct gnet_stats_queue - queuing statistics
+ * @qlen: queue length
+ * @backlog: backlog size of queue
+ * @drops: number of dropped packets
+ * @requeues: number of requeues
+ * @overlimits: number of enqueues over the limit
+ */
+struct gnet_stats_queue
+{
+	__u32	qlen;
+	__u32	backlog;
+	__u32	drops;
+	__u32	requeues;
+	__u32	overlimits;
+};
+
+/**
+ * struct gnet_estimator - rate estimator configuration
+ * @interval: sampling period
+ * @ewma_log: the log of measurement window weight
+ */
+struct gnet_estimator
+{
+	signed char	interval;
+	unsigned char	ewma_log;
+};
+
+
+#endif /* __LINUX_GEN_STATS_H */
diff --git a/trunk/package/libs/libnl-tiny/src/include/linux/genetlink.h b/trunk/package/libs/libnl-tiny/src/include/linux/genetlink.h
new file mode 100644
index 00000000..b834ef6d
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/linux/genetlink.h
@@ -0,0 +1,83 @@
+#ifndef __LINUX_GENERIC_NETLINK_H
+#define __LINUX_GENERIC_NETLINK_H
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+
+#define GENL_NAMSIZ	16	/* length of family name */
+
+#define GENL_MIN_ID	NLMSG_MIN_TYPE
+#define GENL_MAX_ID	1023
+
+struct genlmsghdr {
+	__u8	cmd;
+	__u8	version;
+	__u16	reserved;
+};
+
+#define GENL_HDRLEN	NLMSG_ALIGN(sizeof(struct genlmsghdr))
+
+#define GENL_ADMIN_PERM		0x01
+#define GENL_CMD_CAP_DO		0x02
+#define GENL_CMD_CAP_DUMP	0x04
+#define GENL_CMD_CAP_HASPOL	0x08
+
+/*
+ * List of reserved static generic netlink identifiers:
+ */
+#define GENL_ID_GENERATE	0
+#define GENL_ID_CTRL		NLMSG_MIN_TYPE
+
+/**************************************************************************
+ * Controller
+ **************************************************************************/
+
+enum {
+	CTRL_CMD_UNSPEC,
+	CTRL_CMD_NEWFAMILY,
+	CTRL_CMD_DELFAMILY,
+	CTRL_CMD_GETFAMILY,
+	CTRL_CMD_NEWOPS,
+	CTRL_CMD_DELOPS,
+	CTRL_CMD_GETOPS,
+	CTRL_CMD_NEWMCAST_GRP,
+	CTRL_CMD_DELMCAST_GRP,
+	CTRL_CMD_GETMCAST_GRP, /* unused */
+	__CTRL_CMD_MAX,
+};
+
+#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1)
+
+enum {
+	CTRL_ATTR_UNSPEC,
+	CTRL_ATTR_FAMILY_ID,
+	CTRL_ATTR_FAMILY_NAME,
+	CTRL_ATTR_VERSION,
+	CTRL_ATTR_HDRSIZE,
+	CTRL_ATTR_MAXATTR,
+	CTRL_ATTR_OPS,
+	CTRL_ATTR_MCAST_GROUPS,
+	__CTRL_ATTR_MAX,
+};
+
+#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1)
+
+enum {
+	CTRL_ATTR_OP_UNSPEC,
+	CTRL_ATTR_OP_ID,
+	CTRL_ATTR_OP_FLAGS,
+	__CTRL_ATTR_OP_MAX,
+};
+
+#define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
+
+enum {
+	CTRL_ATTR_MCAST_GRP_UNSPEC,
+	CTRL_ATTR_MCAST_GRP_NAME,
+	CTRL_ATTR_MCAST_GRP_ID,
+	__CTRL_ATTR_MCAST_GRP_MAX,
+};
+
+#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
+
+#endif	/* __LINUX_GENERIC_NETLINK_H */
diff --git a/trunk/package/libs/libnl-tiny/src/include/linux/if.h b/trunk/package/libs/libnl-tiny/src/include/linux/if.h
new file mode 100644
index 00000000..4c1bcfec
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/linux/if.h
@@ -0,0 +1,131 @@
+/*
+ * INET		An implementation of the TCP/IP protocol suite for the LINUX
+ *		operating system.  INET is implemented using the  BSD Socket
+ *		interface as the means of communication with the user level.
+ *
+ *		Global definitions for the INET interface module.
+ *
+ * Version:	@(#)if.h	1.0.2	04/18/93
+ *
+ * Authors:	Original taken from Berkeley UNIX 4.3, (c) UCB 1982-1988
+ *		Ross Biro
+ *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *
+ *		This program is free software; you can redistribute it and/or
+ *		modify it under the terms of the GNU General Public License
+ *		as published by the Free Software Foundation; either version
+ *		2 of the License, or (at your option) any later version.
+ */
+#ifndef _LINUX_IF_H
+#define _LINUX_IF_H
+
+#include <linux/types.h>		/* for "__kernel_caddr_t" et al	*/
+
+#define	IFNAMSIZ	16
+
+/* Standard interface flags (netdevice->flags). */
+#define	IFF_UP		0x1		/* interface is up		*/
+#define	IFF_BROADCAST	0x2		/* broadcast address valid	*/
+#define	IFF_DEBUG	0x4		/* turn on debugging		*/
+#define	IFF_LOOPBACK	0x8		/* is a loopback net		*/
+#define	IFF_POINTOPOINT	0x10		/* interface is has p-p link	*/
+#define	IFF_NOTRAILERS	0x20		/* avoid use of trailers	*/
+#define	IFF_RUNNING	0x40		/* interface RFC2863 OPER_UP	*/
+#define	IFF_NOARP	0x80		/* no ARP protocol		*/
+#define	IFF_PROMISC	0x100		/* receive all packets		*/
+#define	IFF_ALLMULTI	0x200		/* receive all multicast packets*/
+
+#define IFF_MASTER	0x400		/* master of a load balancer 	*/
+#define IFF_SLAVE	0x800		/* slave of a load balancer	*/
+
+#define IFF_MULTICAST	0x1000		/* Supports multicast		*/
+
+#define IFF_PORTSEL	0x2000          /* can set media type		*/
+#define IFF_AUTOMEDIA	0x4000		/* auto media select active	*/
+#define IFF_DYNAMIC	0x8000		/* dialup device with changing addresses*/
+
+#define IFF_LOWER_UP	0x10000		/* driver signals L1 up		*/
+#define IFF_DORMANT	0x20000		/* driver signals dormant	*/
+
+#define IFF_ECHO	0x40000		/* echo sent packets		*/
+
+#define IFF_VOLATILE	(IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
+		IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
+
+/* Private (from user) interface flags (netdevice->priv_flags). */
+#define IFF_802_1Q_VLAN 0x1             /* 802.1Q VLAN device.          */
+#define IFF_EBRIDGE	0x2		/* Ethernet bridging device.	*/
+#define IFF_SLAVE_INACTIVE	0x4	/* bonding slave not the curr. active */
+#define IFF_MASTER_8023AD	0x8	/* bonding master, 802.3ad. 	*/
+#define IFF_MASTER_ALB	0x10		/* bonding master, balance-alb.	*/
+#define IFF_BONDING	0x20		/* bonding master or slave	*/
+#define IFF_SLAVE_NEEDARP 0x40		/* need ARPs for validation	*/
+#define IFF_ISATAP	0x80		/* ISATAP interface (RFC4214)	*/
+
+#define IF_GET_IFACE	0x0001		/* for querying only */
+#define IF_GET_PROTO	0x0002
+
+/* For definitions see hdlc.h */
+#define IF_IFACE_V35	0x1000		/* V.35 serial interface	*/
+#define IF_IFACE_V24	0x1001		/* V.24 serial interface	*/
+#define IF_IFACE_X21	0x1002		/* X.21 serial interface	*/
+#define IF_IFACE_T1	0x1003		/* T1 telco serial interface	*/
+#define IF_IFACE_E1	0x1004		/* E1 telco serial interface	*/
+#define IF_IFACE_SYNC_SERIAL 0x1005	/* can't be set by software	*/
+#define IF_IFACE_X21D   0x1006          /* X.21 Dual Clocking (FarSite) */
+
+/* For definitions see hdlc.h */
+#define IF_PROTO_HDLC	0x2000		/* raw HDLC protocol		*/
+#define IF_PROTO_PPP	0x2001		/* PPP protocol			*/
+#define IF_PROTO_CISCO	0x2002		/* Cisco HDLC protocol		*/
+#define IF_PROTO_FR	0x2003		/* Frame Relay protocol		*/
+#define IF_PROTO_FR_ADD_PVC 0x2004	/*    Create FR PVC		*/
+#define IF_PROTO_FR_DEL_PVC 0x2005	/*    Delete FR PVC		*/
+#define IF_PROTO_X25	0x2006		/* X.25				*/
+#define IF_PROTO_HDLC_ETH 0x2007	/* raw HDLC, Ethernet emulation	*/
+#define IF_PROTO_FR_ADD_ETH_PVC 0x2008	/*  Create FR Ethernet-bridged PVC */
+#define IF_PROTO_FR_DEL_ETH_PVC 0x2009	/*  Delete FR Ethernet-bridged PVC */
+#define IF_PROTO_FR_PVC	0x200A		/* for reading PVC status	*/
+#define IF_PROTO_FR_ETH_PVC 0x200B
+#define IF_PROTO_RAW    0x200C          /* RAW Socket                   */
+
+/* RFC 2863 operational status */
+enum {
+	IF_OPER_UNKNOWN,
+	IF_OPER_NOTPRESENT,
+	IF_OPER_DOWN,
+	IF_OPER_LOWERLAYERDOWN,
+	IF_OPER_TESTING,
+	IF_OPER_DORMANT,
+	IF_OPER_UP,
+};
+
+/* link modes */
+enum {
+	IF_LINK_MODE_DEFAULT,
+	IF_LINK_MODE_DORMANT,	/* limit upward transition to dormant */
+};
+
+/*
+ *	Device mapping structure. I'd just gone off and designed a 
+ *	beautiful scheme using only loadable modules with arguments
+ *	for driver options and along come the PCMCIA people 8)
+ *
+ *	Ah well. The get() side of this is good for WDSETUP, and it'll
+ *	be handy for debugging things. The set side is fine for now and
+ *	being very small might be worth keeping for clean configuration.
+ */
+
+struct ifmap 
+{
+	unsigned long mem_start;
+	unsigned long mem_end;
+	unsigned short base_addr; 
+	unsigned char irq;
+	unsigned char dma;
+	unsigned char port;
+	/* 3 bytes spare */
+};
+
+
+#endif /* _LINUX_IF_H */
diff --git a/trunk/package/libs/libnl-tiny/src/include/linux/if_addr.h b/trunk/package/libs/libnl-tiny/src/include/linux/if_addr.h
new file mode 100644
index 00000000..43f3beda
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/linux/if_addr.h
@@ -0,0 +1,62 @@
+#ifndef __LINUX_IF_ADDR_H
+#define __LINUX_IF_ADDR_H
+
+#include <linux/netlink.h>
+
+struct ifaddrmsg
+{
+	__u8		ifa_family;
+	__u8		ifa_prefixlen;	/* The prefix length		*/
+	__u8		ifa_flags;	/* Flags			*/
+	__u8		ifa_scope;	/* Address scope		*/
+	__u32		ifa_index;	/* Link index			*/
+};
+
+/*
+ * Important comment:
+ * IFA_ADDRESS is prefix address, rather than local interface address.
+ * It makes no difference for normally configured broadcast interfaces,
+ * but for point-to-point IFA_ADDRESS is DESTINATION address,
+ * local address is supplied in IFA_LOCAL attribute.
+ */
+enum
+{
+	IFA_UNSPEC,
+	IFA_ADDRESS,
+	IFA_LOCAL,
+	IFA_LABEL,
+	IFA_BROADCAST,
+	IFA_ANYCAST,
+	IFA_CACHEINFO,
+	IFA_MULTICAST,
+	__IFA_MAX,
+};
+
+#define IFA_MAX (__IFA_MAX - 1)
+
+/* ifa_flags */
+#define IFA_F_SECONDARY		0x01
+#define IFA_F_TEMPORARY		IFA_F_SECONDARY
+
+#define	IFA_F_NODAD		0x02
+#define IFA_F_OPTIMISTIC	0x04
+#define	IFA_F_HOMEADDRESS	0x10
+#define IFA_F_DEPRECATED	0x20
+#define IFA_F_TENTATIVE		0x40
+#define IFA_F_PERMANENT		0x80
+
+struct ifa_cacheinfo
+{
+	__u32	ifa_prefered;
+	__u32	ifa_valid;
+	__u32	cstamp; /* created timestamp, hundredths of seconds */
+	__u32	tstamp; /* updated timestamp, hundredths of seconds */
+};
+
+/* backwards compatibility for userspace */
+#ifndef __KERNEL__
+#define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/linux/netlink.h b/trunk/package/libs/libnl-tiny/src/include/linux/netlink.h
new file mode 100644
index 00000000..d252103d
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/linux/netlink.h
@@ -0,0 +1,150 @@
+#ifndef __LINUX_NETLINK_H
+#define __LINUX_NETLINK_H
+
+#include <linux/socket.h> /* for sa_family_t */
+#include <linux/types.h>
+
+#define NETLINK_ROUTE		0	/* Routing/device hook				*/
+#define NETLINK_UNUSED		1	/* Unused number				*/
+#define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
+#define NETLINK_FIREWALL	3	/* Firewalling hook				*/
+#define NETLINK_INET_DIAG	4	/* INET socket monitoring			*/
+#define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */
+#define NETLINK_XFRM		6	/* ipsec */
+#define NETLINK_SELINUX		7	/* SELinux event notifications */
+#define NETLINK_ISCSI		8	/* Open-iSCSI */
+#define NETLINK_AUDIT		9	/* auditing */
+#define NETLINK_FIB_LOOKUP	10	
+#define NETLINK_CONNECTOR	11
+#define NETLINK_NETFILTER	12	/* netfilter subsystem */
+#define NETLINK_IP6_FW		13
+#define NETLINK_DNRTMSG		14	/* DECnet routing messages */
+#define NETLINK_KOBJECT_UEVENT	15	/* Kernel messages to userspace */
+#define NETLINK_GENERIC		16
+/* leave room for NETLINK_DM (DM Events) */
+#define NETLINK_SCSITRANSPORT	18	/* SCSI Transports */
+#define NETLINK_ECRYPTFS	19
+
+#define MAX_LINKS 32		
+
+struct sockaddr_nl
+{
+	sa_family_t	nl_family;	/* AF_NETLINK	*/
+	unsigned short	nl_pad;		/* zero		*/
+	__u32		nl_pid;		/* port ID	*/
+       	__u32		nl_groups;	/* multicast groups mask */
+};
+
+struct nlmsghdr
+{
+	__u32		nlmsg_len;	/* Length of message including header */
+	__u16		nlmsg_type;	/* Message content */
+	__u16		nlmsg_flags;	/* Additional flags */
+	__u32		nlmsg_seq;	/* Sequence number */
+	__u32		nlmsg_pid;	/* Sending process port ID */
+};
+
+/* Flags values */
+
+#define NLM_F_REQUEST		1	/* It is request message. 	*/
+#define NLM_F_MULTI		2	/* Multipart message, terminated by NLMSG_DONE */
+#define NLM_F_ACK		4	/* Reply with ack, with zero or error code */
+#define NLM_F_ECHO		8	/* Echo this request 		*/
+
+/* Modifiers to GET request */
+#define NLM_F_ROOT	0x100	/* specify tree	root	*/
+#define NLM_F_MATCH	0x200	/* return all matching	*/
+#define NLM_F_ATOMIC	0x400	/* atomic GET		*/
+#define NLM_F_DUMP	(NLM_F_ROOT|NLM_F_MATCH)
+
+/* Modifiers to NEW request */
+#define NLM_F_REPLACE	0x100	/* Override existing		*/
+#define NLM_F_EXCL	0x200	/* Do not touch, if it exists	*/
+#define NLM_F_CREATE	0x400	/* Create, if it does not exist	*/
+#define NLM_F_APPEND	0x800	/* Add to end of list		*/
+
+/*
+   4.4BSD ADD		NLM_F_CREATE|NLM_F_EXCL
+   4.4BSD CHANGE	NLM_F_REPLACE
+
+   True CHANGE		NLM_F_CREATE|NLM_F_REPLACE
+   Append		NLM_F_CREATE
+   Check		NLM_F_EXCL
+ */
+
+#define NLMSG_ALIGNTO	4
+#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) )
+#define NLMSG_HDRLEN	 ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
+#define NLMSG_LENGTH(len) ((len)+NLMSG_ALIGN(NLMSG_HDRLEN))
+#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
+#define NLMSG_DATA(nlh)  ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
+#define NLMSG_NEXT(nlh,len)	 ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
+				  (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
+#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \
+			   (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
+			   (nlh)->nlmsg_len <= (len))
+#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
+
+#define NLMSG_NOOP		0x1	/* Nothing.		*/
+#define NLMSG_ERROR		0x2	/* Error		*/
+#define NLMSG_DONE		0x3	/* End of a dump	*/
+#define NLMSG_OVERRUN		0x4	/* Data lost		*/
+
+#define NLMSG_MIN_TYPE		0x10	/* < 0x10: reserved control messages */
+
+struct nlmsgerr
+{
+	int		error;
+	struct nlmsghdr msg;
+};
+
+#define NETLINK_ADD_MEMBERSHIP	1
+#define NETLINK_DROP_MEMBERSHIP	2
+#define NETLINK_PKTINFO		3
+
+struct nl_pktinfo
+{
+	__u32	group;
+};
+
+#define NET_MAJOR 36		/* Major 36 is reserved for networking 						*/
+
+enum {
+	NETLINK_UNCONNECTED = 0,
+	NETLINK_CONNECTED,
+};
+
+/*
+ *  <------- NLA_HDRLEN ------> <-- NLA_ALIGN(payload)-->
+ * +---------------------+- - -+- - - - - - - - - -+- - -+
+ * |        Header       | Pad |     Payload       | Pad |
+ * |   (struct nlattr)   | ing |                   | ing |
+ * +---------------------+- - -+- - - - - - - - - -+- - -+
+ *  <-------------- nlattr->nla_len -------------->
+ */
+
+struct nlattr
+{
+	__u16           nla_len;
+	__u16           nla_type;
+};
+
+/*
+ * nla_type (16 bits)
+ * +---+---+-------------------------------+
+ * | N | O | Attribute Type                |
+ * +---+---+-------------------------------+
+ * N := Carries nested attributes
+ * O := Payload stored in network byte order
+ *
+ * Note: The N and O flag are mutually exclusive.
+ */
+#define NLA_F_NESTED		(1 << 15)
+#define NLA_F_NET_BYTEORDER	(1 << 14)
+#define NLA_TYPE_MASK		~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
+
+#define NLA_ALIGNTO		4
+#define NLA_ALIGN(len)		(((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
+#define NLA_HDRLEN		((int) NLA_ALIGN(sizeof(struct nlattr)))
+
+#endif	/* __LINUX_NETLINK_H */
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink-generic.h b/trunk/package/libs/libnl-tiny/src/include/netlink-generic.h
new file mode 100644
index 00000000..10aa2f01
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink-generic.h
@@ -0,0 +1,20 @@
+/*
+ * netlink-generic.h	Local Generic Netlink Interface
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_GENL_PRIV_H_
+#define NETLINK_GENL_PRIV_H_
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+
+#define GENL_HDRSIZE(hdrlen) (GENL_HDRLEN + (hdrlen))
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink-local.h b/trunk/package/libs/libnl-tiny/src/include/netlink-local.h
new file mode 100644
index 00000000..330100e8
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink-local.h
@@ -0,0 +1,158 @@
+/*
+ * netlink-local.h		Local Netlink Interface
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_LOCAL_H_
+#define NETLINK_LOCAL_H_
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <math.h>
+#include <time.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <inttypes.h>
+#include <assert.h>
+#include <limits.h>
+
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#ifndef SOL_NETLINK
+#define SOL_NETLINK 270
+#endif
+
+#include <linux/types.h>
+
+/* local header copies */
+#include <linux/if.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/pkt_sched.h>
+#include <linux/pkt_cls.h>
+#include <linux/gen_stats.h>
+
+#include <netlink/netlink.h>
+#include <netlink/handlers.h>
+#include <netlink/cache.h>
+#include <netlink/object-api.h>
+#include <netlink/cache-api.h>
+#include <netlink-types.h>
+
+struct trans_tbl {
+	int i;
+	const char *a;
+};
+
+#define __ADD(id, name) { .i = id, .a = #name },
+
+struct trans_list {
+	int i;
+	char *a;
+	struct nl_list_head list;
+};
+
+#define NL_DEBUG	1
+
+#define NL_DBG(LVL,FMT,ARG...) \
+	do {} while (0)
+
+#define BUG()                            \
+	do {                                 \
+		fprintf(stderr, "BUG: %s:%d\n",  \
+			__FILE__, __LINE__);         \
+		assert(0);	\
+	} while (0)
+
+extern int __nl_read_num_str_file(const char *path,
+				  int (*cb)(long, const char *));
+
+extern int __trans_list_add(int, const char *, struct nl_list_head *);
+extern void __trans_list_clear(struct nl_list_head *);
+
+extern char *__type2str(int, char *, size_t, struct trans_tbl *, size_t);
+extern int __str2type(const char *, struct trans_tbl *, size_t);
+
+extern char *__list_type2str(int, char *, size_t, struct nl_list_head *);
+extern int __list_str2type(const char *, struct nl_list_head *);
+
+extern char *__flags2str(int, char *, size_t, struct trans_tbl *, size_t);
+extern int __str2flags(const char *, struct trans_tbl *, size_t);
+
+extern void dump_from_ops(struct nl_object *, struct nl_dump_params *);
+
+#ifdef disabled
+static inline struct nl_cache *dp_cache(struct nl_object *obj)
+{
+	if (obj->ce_cache == NULL)
+		return nl_cache_mngt_require(obj->ce_ops->oo_name);
+
+	return obj->ce_cache;
+}
+#endif
+
+static inline int nl_cb_call(struct nl_cb *cb, int type, struct nl_msg *msg)
+{
+	return cb->cb_set[type](msg, cb->cb_args[type]);
+}
+
+#define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
+#define __init __attribute__ ((constructor))
+#define __exit __attribute__ ((destructor))
+#undef __deprecated
+#define __deprecated __attribute__ ((deprecated))
+
+#define min(x,y) ({ \
+	typeof(x) _x = (x);	\
+	typeof(y) _y = (y);	\
+	(void) (&_x == &_y);		\
+	_x < _y ? _x : _y; })
+
+#define max(x,y) ({ \
+	typeof(x) _x = (x);	\
+	typeof(y) _y = (y);	\
+	(void) (&_x == &_y);		\
+	_x > _y ? _x : _y; })
+
+extern int nl_cache_parse(struct nl_cache_ops *, struct sockaddr_nl *,
+			  struct nlmsghdr *, struct nl_parser_param *);
+
+
+static inline char *nl_cache_name(struct nl_cache *cache)
+{
+	return cache->c_ops ? cache->c_ops->co_name : "unknown";
+}
+
+#define GENL_FAMILY(id, name) \
+	{ \
+		{ id, NL_ACT_UNSPEC, name }, \
+		END_OF_MSGTYPES_LIST, \
+	}
+
+static inline int wait_for_ack(struct nl_sock *sk)
+{
+	if (sk->s_flags & NL_NO_AUTO_ACK)
+		return 0;
+	else
+		return nl_wait_for_ack(sk);
+}
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink-types.h b/trunk/package/libs/libnl-tiny/src/include/netlink-types.h
new file mode 100644
index 00000000..0d005935
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink-types.h
@@ -0,0 +1,81 @@
+/*
+ * netlink-types.h	Netlink Types (Private)
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_LOCAL_TYPES_H_
+#define NETLINK_LOCAL_TYPES_H_
+
+#include <netlink/list.h>
+
+struct nl_cache_ops;
+struct nl_sock;
+struct nl_object;
+
+struct nl_cache
+{
+	struct nl_list_head	c_items;
+	int			c_nitems;
+	int                     c_iarg1;
+	int                     c_iarg2;
+	struct nl_cache_ops *   c_ops;
+};
+
+struct nl_cache_assoc
+{
+	struct nl_cache *	ca_cache;
+	change_func_t		ca_change;
+};
+
+struct nl_cache_mngr
+{
+	int			cm_protocol;
+	int			cm_flags;
+	int			cm_nassocs;
+	struct nl_sock *	cm_handle;
+	struct nl_cache_assoc *	cm_assocs;
+};
+
+struct nl_parser_param;
+
+#define LOOSE_COMPARISON	1
+
+
+struct nl_data
+{
+	size_t			d_size;
+	void *			d_data;
+};
+
+struct nl_addr
+{
+	int			a_family;
+	unsigned int		a_maxsize;
+	unsigned int		a_len;
+	int			a_prefixlen;
+	int			a_refcnt;
+	char			a_addr[0];
+};
+
+#define IFQDISCSIZ	32
+
+#define GENL_OP_HAS_POLICY	1
+#define GENL_OP_HAS_DOIT	2
+#define GENL_OP_HAS_DUMPIT	4
+
+struct genl_family_op
+{
+	uint32_t		o_id;
+	uint32_t		o_flags;
+
+	struct nl_list_head	o_list;
+};
+
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/addr.h b/trunk/package/libs/libnl-tiny/src/include/netlink/addr.h
new file mode 100644
index 00000000..cc3d201f
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/addr.h
@@ -0,0 +1,69 @@
+/*
+ * netlink/addr.h		Abstract Address
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_ADDR_H_
+#define NETLINK_ADDR_H_
+
+#include <netlink/netlink.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct nl_addr;
+
+/* Creation */
+extern struct nl_addr *	nl_addr_alloc(size_t);
+extern struct nl_addr *	nl_addr_alloc_attr(struct nlattr *, int);
+extern struct nl_addr *	nl_addr_build(int, void *, size_t);
+extern int		nl_addr_parse(const char *, int, struct nl_addr **);
+extern struct nl_addr *	nl_addr_clone(struct nl_addr *);
+
+/* Destroyage */
+extern void		nl_addr_destroy(struct nl_addr *);
+
+/* Usage Management */
+extern struct nl_addr *	nl_addr_get(struct nl_addr *);
+extern void		nl_addr_put(struct nl_addr *);
+extern int		nl_addr_shared(struct nl_addr *);
+
+extern int		nl_addr_cmp(struct nl_addr *, struct nl_addr *);
+extern int		nl_addr_cmp_prefix(struct nl_addr *, struct nl_addr *);
+extern int		nl_addr_iszero(struct nl_addr *);
+extern int		nl_addr_valid(char *, int);
+extern int      	nl_addr_guess_family(struct nl_addr *);
+extern int		nl_addr_fill_sockaddr(struct nl_addr *,
+					      struct sockaddr *, socklen_t *);
+extern int		nl_addr_info(struct nl_addr *, struct addrinfo **);
+extern int		nl_addr_resolve(struct nl_addr *addr, char *host, size_t hostlen);
+
+/* Access Functions */
+extern void		nl_addr_set_family(struct nl_addr *, int);
+extern int		nl_addr_get_family(struct nl_addr *);
+extern int		nl_addr_set_binary_addr(struct nl_addr *, void *,
+						size_t);
+extern void *		nl_addr_get_binary_addr(struct nl_addr *);
+extern unsigned int	nl_addr_get_len(struct nl_addr *);
+extern void		nl_addr_set_prefixlen(struct nl_addr *, int);
+extern unsigned int	nl_addr_get_prefixlen(struct nl_addr *);
+
+/* Address Family Translations */
+extern char *		nl_af2str(int, char *, size_t);
+extern int		nl_str2af(const char *);
+
+/* Translations to Strings */
+extern char *		nl_addr2str(struct nl_addr *, char *, size_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/attr.h b/trunk/package/libs/libnl-tiny/src/include/netlink/attr.h
new file mode 100644
index 00000000..3b56a82d
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/attr.h
@@ -0,0 +1,726 @@
+/*
+ * netlink/attr.h		Netlink Attributes
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_ATTR_H_
+#define NETLINK_ATTR_H_
+
+#include <netlink/netlink.h>
+#include <netlink/object.h>
+#include <netlink/addr.h>
+#include <netlink/data.h>
+#include <netlink/msg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct nl_msg;
+
+/**
+ * @name Basic Attribute Data Types
+ * @{
+ */
+
+ /**
+  * @ingroup attr
+  * Basic attribute data types
+  *
+  * See \ref attr_datatypes for more details.
+  */
+enum {
+	NLA_UNSPEC,	/**< Unspecified type, binary data chunk */
+	NLA_U8,		/**< 8 bit integer */
+	NLA_U16,	/**< 16 bit integer */
+	NLA_U32,	/**< 32 bit integer */
+	NLA_U64,	/**< 64 bit integer */
+	NLA_STRING,	/**< NUL terminated character string */
+	NLA_FLAG,	/**< Flag */
+	NLA_MSECS,	/**< Micro seconds (64bit) */
+	NLA_NESTED,	/**< Nested attributes */
+	__NLA_TYPE_MAX,
+};
+
+#define NLA_TYPE_MAX (__NLA_TYPE_MAX - 1)
+
+/** @} */
+
+/**
+ * @ingroup attr
+ * Attribute validation policy.
+ *
+ * See \ref attr_datatypes for more details.
+ */
+struct nla_policy {
+	/** Type of attribute or NLA_UNSPEC */
+	uint16_t	type;
+
+	/** Minimal length of payload required */
+	uint16_t	minlen;
+
+	/** Maximal length of payload allowed */
+	uint16_t	maxlen;
+};
+
+/* Attribute parsing */
+extern int		nla_ok(const struct nlattr *, int);
+extern struct nlattr *	nla_next(const struct nlattr *, int *);
+extern int		nla_parse(struct nlattr **, int, struct nlattr *,
+				  int, struct nla_policy *);
+extern int		nla_validate(struct nlattr *, int, int,
+				     struct nla_policy *);
+extern struct nlattr *	nla_find(struct nlattr *, int, int);
+
+/* Unspecific attribute */
+extern struct nlattr *	nla_reserve(struct nl_msg *, int, int);
+extern int		nla_put(struct nl_msg *, int, int, const void *);
+
+/**
+ * nlmsg_find_attr - find a specific attribute in a netlink message
+ * @arg nlh		netlink message header
+ * @arg hdrlen		length of familiy specific header
+ * @arg attrtype	type of attribute to look for
+ *
+ * Returns the first attribute which matches the specified type.
+ */
+static inline struct nlattr *nlmsg_find_attr(struct nlmsghdr *nlh, int hdrlen, int attrtype)
+{
+	return nla_find(nlmsg_attrdata(nlh, hdrlen),
+			nlmsg_attrlen(nlh, hdrlen), attrtype);
+}
+
+
+/**
+ * Return size of attribute whithout padding.
+ * @arg payload		Payload length of attribute.
+ *
+ * @code
+ *    <-------- nla_attr_size(payload) --------->
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ *   | Attribute Header | Pad |     Payload      | Pad |
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ * @endcode
+ *
+ * @return Size of attribute in bytes without padding.
+ */
+static inline int nla_attr_size(int payload)
+{
+	return NLA_HDRLEN + payload;
+}
+
+/**
+ * Return size of attribute including padding.
+ * @arg payload		Payload length of attribute.
+ *
+ * @code
+ *    <----------- nla_total_size(payload) ----------->
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ *   | Attribute Header | Pad |     Payload      | Pad |
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ * @endcode
+ *
+ * @return Size of attribute in bytes.
+ */
+static inline int nla_total_size(int payload)
+{
+	return NLA_ALIGN(nla_attr_size(payload));
+}
+
+/**
+ * Return length of padding at the tail of the attribute.
+ * @arg payload		Payload length of attribute.
+ *
+ * @code
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ *   | Attribute Header | Pad |     Payload      | Pad |
+ *   +------------------+- - -+- - - - - - - - - +- - -+
+ *                                                <--->  
+ * @endcode
+ *
+ * @return Length of padding in bytes.
+ */
+static inline int nla_padlen(int payload)
+{
+	return nla_total_size(payload) - nla_attr_size(payload);
+}
+
+/**
+ * Return type of the attribute.
+ * @arg nla		Attribute.
+ *
+ * @return Type of attribute.
+ */
+static inline int nla_type(const struct nlattr *nla)
+{
+	return nla->nla_type & NLA_TYPE_MASK;
+}
+
+/**
+ * Return pointer to the payload section.
+ * @arg nla		Attribute.
+ *
+ * @return Pointer to start of payload section.
+ */
+static inline void *nla_data(const struct nlattr *nla)
+{
+	return (char *) nla + NLA_HDRLEN;
+}
+
+/**
+ * Return length of the payload .
+ * @arg nla		Attribute
+ *
+ * @return Length of payload in bytes.
+ */
+static inline int nla_len(const struct nlattr *nla)
+{
+	return nla->nla_len - NLA_HDRLEN;
+}
+
+/**
+ * Copy attribute payload to another memory area.
+ * @arg dest		Pointer to destination memory area.
+ * @arg src		Attribute
+ * @arg count		Number of bytes to copy at most.
+ *
+ * Note: The number of bytes copied is limited by the length of
+ *       the attribute payload.
+ *
+ * @return The number of bytes copied to dest.
+ */
+static inline int nla_memcpy(void *dest, struct nlattr *src, int count)
+{
+	int minlen;
+
+	if (!src)
+		return 0;
+	
+	minlen = min_t(int, count, nla_len(src));
+	memcpy(dest, nla_data(src), minlen);
+
+	return minlen;
+}
+
+
+/**
+ * Add abstract data as unspecific attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg data		Abstract data object.
+ *
+ * Equivalent to nla_put() except that the length of the payload is
+ * derived from the abstract data object.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_data(struct nl_msg *msg, int attrtype, struct nl_data *data)
+{
+	return nla_put(msg, attrtype, nl_data_get_size(data),
+		       nl_data_get(data));
+}
+
+/**
+ * Add abstract address as unspecific attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg addr		Abstract address object.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_addr(struct nl_msg *msg, int attrtype, struct nl_addr *addr)
+{
+	return nla_put(msg, attrtype, nl_addr_get_len(addr),
+		       nl_addr_get_binary_addr(addr));
+}
+
+/** @} */
+
+/**
+ * @name Integer Attributes
+ */
+
+/**
+ * Add 8 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value to store as payload.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_u8(struct nl_msg *msg, int attrtype, uint8_t value)
+{
+	return nla_put(msg, attrtype, sizeof(uint8_t), &value);
+}
+
+/**
+ * Return value of 8 bit integer attribute.
+ * @arg nla		8 bit integer attribute
+ *
+ * @return Payload as 8 bit integer.
+ */
+static inline uint8_t nla_get_u8(struct nlattr *nla)
+{
+	return *(uint8_t *) nla_data(nla);
+}
+
+/**
+ * Add 16 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value to store as payload.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_u16(struct nl_msg *msg, int attrtype, uint16_t value)
+{
+	return nla_put(msg, attrtype, sizeof(uint16_t), &value);
+}
+
+/**
+ * Return payload of 16 bit integer attribute.
+ * @arg nla		16 bit integer attribute
+ *
+ * @return Payload as 16 bit integer.
+ */
+static inline uint16_t nla_get_u16(struct nlattr *nla)
+{
+	return *(uint16_t *) nla_data(nla);
+}
+
+/**
+ * Add 32 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value to store as payload.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_u32(struct nl_msg *msg, int attrtype, uint32_t value)
+{
+	return nla_put(msg, attrtype, sizeof(uint32_t), &value);
+}
+
+/**
+ * Return payload of 32 bit integer attribute.
+ * @arg nla		32 bit integer attribute.
+ *
+ * @return Payload as 32 bit integer.
+ */
+static inline uint32_t nla_get_u32(struct nlattr *nla)
+{
+	return *(uint32_t *) nla_data(nla);
+}
+
+/**
+ * Add 64 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value to store as payload.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_u64(struct nl_msg *msg, int attrtype, uint64_t value)
+{
+	return nla_put(msg, attrtype, sizeof(uint64_t), &value);
+}
+
+/**
+ * Return payload of u64 attribute
+ * @arg nla		u64 netlink attribute
+ *
+ * @return Payload as 64 bit integer.
+ */
+static inline uint64_t nla_get_u64(struct nlattr *nla)
+{
+	uint64_t tmp;
+
+	nla_memcpy(&tmp, nla, sizeof(tmp));
+
+	return tmp;
+}
+
+/**
+ * Add string attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg str		NUL terminated string.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_string(struct nl_msg *msg, int attrtype, const char *str)
+{
+	return nla_put(msg, attrtype, strlen(str) + 1, str);
+}
+
+/**
+ * Return payload of string attribute.
+ * @arg nla		String attribute.
+ *
+ * @return Pointer to attribute payload.
+ */
+static inline char *nla_get_string(struct nlattr *nla)
+{
+	return (char *) nla_data(nla);
+}
+
+static inline char *nla_strdup(struct nlattr *nla)
+{
+	return strdup(nla_get_string(nla));
+}
+
+/** @} */
+
+/**
+ * @name Flag Attribute
+ */
+
+/**
+ * Add flag netlink attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_flag(struct nl_msg *msg, int attrtype)
+{
+	return nla_put(msg, attrtype, 0, NULL);
+}
+
+/**
+ * Return true if flag attribute is set.
+ * @arg nla		Flag netlink attribute.
+ *
+ * @return True if flag is set, otherwise false.
+ */
+static inline int nla_get_flag(struct nlattr *nla)
+{
+	return !!nla;
+}
+
+/** @} */
+
+/**
+ * @name Microseconds Attribute
+ */
+
+/**
+ * Add a msecs netlink attribute to a netlink message
+ * @arg n		netlink message
+ * @arg attrtype	attribute type
+ * @arg msecs 		number of msecs
+ */
+static inline int nla_put_msecs(struct nl_msg *n, int attrtype, unsigned long msecs)
+{
+	return nla_put_u64(n, attrtype, msecs);
+}
+
+/**
+ * Return payload of msecs attribute
+ * @arg nla		msecs netlink attribute
+ *
+ * @return the number of milliseconds.
+ */
+static inline unsigned long nla_get_msecs(struct nlattr *nla)
+{
+	return nla_get_u64(nla);
+}
+
+/**
+ * Add nested attributes to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg nested		Message containing attributes to be nested.
+ *
+ * Takes the attributes found in the \a nested message and appends them
+ * to the message \a msg nested in a container of the type \a attrtype.
+ * The \a nested message may not have a family specific header.
+ *
+ * @see nla_put
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_put_nested(struct nl_msg *msg, int attrtype, struct nl_msg *nested)
+{
+	return nla_put(msg, attrtype, nlmsg_len(nested->nm_nlh),
+		       nlmsg_data(nested->nm_nlh));
+}
+
+/**
+ * Start a new level of nested attributes.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type of container.
+ *
+ * @return Pointer to container attribute.
+ */
+static inline struct nlattr *nla_nest_start(struct nl_msg *msg, int attrtype)
+{
+	struct nlattr *start = (struct nlattr *) nlmsg_tail(msg->nm_nlh);
+
+	if (nla_put(msg, attrtype, 0, NULL) < 0)
+		return NULL;
+
+	return start;
+}
+
+/**
+ * Finalize nesting of attributes.
+ * @arg msg		Netlink message.
+ * @arg start		Container attribute as returned from nla_nest_start().
+ *
+ * Corrects the container attribute header to include the appeneded attributes.
+ *
+ * @return 0
+ */
+static inline int nla_nest_end(struct nl_msg *msg, struct nlattr *start)
+{
+	start->nla_len = (unsigned char *) nlmsg_tail(msg->nm_nlh) -
+				(unsigned char *) start;
+	return 0;
+}
+
+/**
+ * Create attribute index based on nested attribute
+ * @arg tb		Index array to be filled (maxtype+1 elements).
+ * @arg maxtype		Maximum attribute type expected and accepted.
+ * @arg nla		Nested Attribute.
+ * @arg policy		Attribute validation policy.
+ *
+ * Feeds the stream of attributes nested into the specified attribute
+ * to nla_parse().
+ *
+ * @see nla_parse
+ * @return 0 on success or a negative error code.
+ */
+static inline int nla_parse_nested(struct nlattr *tb[], int maxtype, struct nlattr *nla,
+		     struct nla_policy *policy)
+{
+	return nla_parse(tb, maxtype, (struct nlattr *)nla_data(nla), nla_len(nla), policy);
+}
+
+/**
+ * Compare attribute payload with memory area.
+ * @arg nla		Attribute.
+ * @arg data		Memory area to compare to.
+ * @arg size		Number of bytes to compare.
+ *
+ * @see memcmp(3)
+ * @return An integer less than, equal to, or greater than zero.
+ */
+static inline int nla_memcmp(const struct nlattr *nla, const void *data, size_t size)
+{
+	int d = nla_len(nla) - size;
+
+	if (d == 0)
+		d = memcmp(nla_data(nla), data, size);
+
+	return d;
+}
+
+/**
+ * Compare string attribute payload with string
+ * @arg nla		Attribute of type NLA_STRING.
+ * @arg str		NUL terminated string.
+ *
+ * @see strcmp(3)
+ * @return An integer less than, equal to, or greater than zero.
+ */
+static inline int nla_strcmp(const struct nlattr *nla, const char *str)
+{
+	int len = strlen(str) + 1;
+	int d = nla_len(nla) - len;
+
+	if (d == 0)
+		d = memcmp(nla_data(nla), str, len);
+
+	return d;
+}
+
+/**
+ * Copy string attribute payload to a buffer.
+ * @arg dst		Pointer to destination buffer.
+ * @arg nla		Attribute of type NLA_STRING.
+ * @arg dstsize		Size of destination buffer in bytes.
+ *
+ * Copies at most dstsize - 1 bytes to the destination buffer.
+ * The result is always a valid NUL terminated string. Unlike
+ * strlcpy the destination buffer is always padded out.
+ *
+ * @return The length of string attribute without the terminating NUL.
+ */
+static inline size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)
+{
+	size_t srclen = (size_t)nla_len(nla);
+	char *src = (char*)nla_data(nla);
+
+	if (srclen > 0 && src[srclen - 1] == '\0')
+		srclen--;
+
+	if (dstsize > 0) {
+		size_t len = (srclen >= dstsize) ? dstsize - 1 : srclen;
+
+		memset(dst, 0, dstsize);
+		memcpy(dst, src, len);
+	}
+
+	return srclen;
+}
+
+
+/**
+ * @name Attribute Construction (Exception Based)
+ * @{
+ */
+
+/**
+ * @ingroup attr
+ * Add unspecific attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg attrlen		Length of attribute payload.
+ * @arg data		Head of attribute payload.
+ */
+#define NLA_PUT(msg, attrtype, attrlen, data) \
+	do { \
+		if (nla_put(msg, attrtype, attrlen, data) < 0) \
+			goto nla_put_failure; \
+	} while(0)
+
+/**
+ * @ingroup attr
+ * Add atomic type attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg type		Atomic type.
+ * @arg attrtype	Attribute type.
+ * @arg value		Head of attribute payload.
+ */
+#define NLA_PUT_TYPE(msg, type, attrtype, value) \
+	do { \
+		type __tmp = value; \
+		NLA_PUT(msg, attrtype, sizeof(type), &__tmp); \
+	} while(0)
+
+/**
+ * Add 8 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value.
+ */
+#define NLA_PUT_U8(msg, attrtype, value) \
+	NLA_PUT_TYPE(msg, uint8_t, attrtype, value)
+
+/**
+ * Add 16 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value.
+ */
+#define NLA_PUT_U16(msg, attrtype, value) \
+	NLA_PUT_TYPE(msg, uint16_t, attrtype, value)
+
+/**
+ * Add 32 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value.
+ */
+#define NLA_PUT_U32(msg, attrtype, value) \
+	NLA_PUT_TYPE(msg, uint32_t, attrtype, value)
+
+/**
+ * Add 64 bit integer attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		Numeric value.
+ */
+#define NLA_PUT_U64(msg, attrtype, value) \
+	NLA_PUT_TYPE(msg, uint64_t, attrtype, value)
+
+/**
+ * Add string attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg value		NUL terminated character string.
+ */
+#define NLA_PUT_STRING(msg, attrtype, value) \
+	NLA_PUT(msg, attrtype, strlen(value) + 1, value)
+
+/**
+ * Add flag attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ */
+#define NLA_PUT_FLAG(msg, attrtype) \
+	NLA_PUT(msg, attrtype, 0, NULL)
+
+/**
+ * Add msecs attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg msecs		Numeric value in micro seconds.
+ */
+#define NLA_PUT_MSECS(msg, attrtype, msecs) \
+	NLA_PUT_U64(msg, attrtype, msecs)
+
+/**
+ * Add address attribute to netlink message.
+ * @arg msg		Netlink message.
+ * @arg attrtype	Attribute type.
+ * @arg addr		Abstract address object.
+ */
+#define NLA_PUT_ADDR(msg, attrtype, addr) \
+	NLA_PUT(msg, attrtype, nl_addr_get_len(addr), \
+		nl_addr_get_binary_addr(addr))
+
+/** @} */
+
+/**
+ * @name Iterators
+ * @{
+ */
+
+/**
+ * @ingroup attr
+ * Iterate over a stream of attributes
+ * @arg pos	loop counter, set to current attribute
+ * @arg head	head of attribute stream
+ * @arg len	length of attribute stream
+ * @arg rem	initialized to len, holds bytes currently remaining in stream
+ */
+#define nla_for_each_attr(pos, head, len, rem) \
+	for (pos = head, rem = len; \
+	     nla_ok(pos, rem); \
+	     pos = nla_next(pos, &(rem)))
+
+/**
+ * @ingroup attr
+ * Iterate over a stream of nested attributes
+ * @arg pos	loop counter, set to current attribute
+ * @arg nla	attribute containing the nested attributes
+ * @arg rem	initialized to len, holds bytes currently remaining in stream
+ */
+#define nla_for_each_nested(pos, nla, rem) \
+	for (pos = (struct nlattr *)nla_data(nla), rem = nla_len(nla); \
+	     nla_ok(pos, rem); \
+	     pos = nla_next(pos, &(rem)))
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/cache-api.h b/trunk/package/libs/libnl-tiny/src/include/netlink/cache-api.h
new file mode 100644
index 00000000..22fc449d
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/cache-api.h
@@ -0,0 +1,199 @@
+/*
+ * netlink/cache-api.h		Caching API
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_CACHE_API_H_
+#define NETLINK_CACHE_API_H_
+
+#include <netlink/netlink.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @ingroup cache
+ * @defgroup cache_api Cache Implementation
+ * @brief
+ *
+ * @par 1) Cache Definition
+ * @code
+ * struct nl_cache_ops my_cache_ops = {
+ * 	.co_name		= "route/link",
+ * 	.co_protocol		= NETLINK_ROUTE,
+ * 	.co_hdrsize		= sizeof(struct ifinfomsg),
+ * 	.co_obj_ops		= &my_obj_ops,
+ * };
+ * @endcode
+ *
+ * @par 2) 
+ * @code
+ * // The simplest way to fill a cache is by providing a request-update
+ * // function which must trigger a complete dump on the kernel-side of
+ * // whatever the cache covers.
+ * static int my_request_update(struct nl_cache *cache,
+ * 				struct nl_sock *socket)
+ * {
+ * 	// In this example, we request a full dump of the interface table
+ * 	return nl_rtgen_request(socket, RTM_GETLINK, AF_UNSPEC, NLM_F_DUMP);
+ * }
+ *
+ * // The resulting netlink messages sent back will be fed into a message
+ * // parser one at a time. The message parser has to extract all relevant
+ * // information from the message and create an object reflecting the
+ * // contents of the message and pass it on to the parser callback function
+ * // provide which will add the object to the cache.
+ * static int my_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
+ * 			    struct nlmsghdr *nlh, struct nl_parser_param *pp)
+ * {
+ * 	struct my_obj *obj;
+ *
+ * 	obj = my_obj_alloc();
+ * 	obj->ce_msgtype = nlh->nlmsg_type;
+ *
+ * 	// Parse the netlink message and continue creating the object.
+ *
+ * 	err = pp->pp_cb((struct nl_object *) obj, pp);
+ * 	if (err < 0)
+ * 		goto errout;
+ * }
+ *
+ * struct nl_cache_ops my_cache_ops = {
+ * 	...
+ * 	.co_request_update	= my_request_update,
+ * 	.co_msg_parser		= my_msg_parser,
+ * };
+ * @endcode
+ *
+ * @par 3) Notification based Updates
+ * @code
+ * // Caches can be kept up-to-date based on notifications if the kernel
+ * // sends out notifications whenever an object is added/removed/changed.
+ * //
+ * // It is trivial to support this, first a list of groups needs to be
+ * // defined which are required to join in order to receive all necessary
+ * // notifications. The groups are separated by address family to support
+ * // the common situation where a separate group is used for each address
+ * // family. If there is only one group, simply specify AF_UNSPEC.
+ * static struct nl_af_group addr_groups[] = {
+ * 	{ AF_INET,	RTNLGRP_IPV4_IFADDR },
+ * 	{ AF_INET6,	RTNLGRP_IPV6_IFADDR },
+ * 	{ END_OF_GROUP_LIST },
+ * };
+ *
+ * // In order for the caching system to know the meaning of each message
+ * // type it requires a table which maps each supported message type to
+ * // a cache action, e.g. RTM_NEWADDR means address has been added or
+ * // updated, RTM_DELADDR means address has been removed.
+ * static struct nl_cache_ops rtnl_addr_ops = {
+ * 	...
+ * 	.co_msgtypes		= {
+ * 					{ RTM_NEWADDR, NL_ACT_NEW, "new" },
+ * 					{ RTM_DELADDR, NL_ACT_DEL, "del" },
+ * 					{ RTM_GETADDR, NL_ACT_GET, "get" },
+ * 					END_OF_MSGTYPES_LIST,
+ * 				},
+ * 	.co_groups		= addr_groups,
+ * };
+ *
+ * // It is now possible to keep the cache up-to-date using the cache manager.
+ * @endcode
+ * @{
+ */
+
+enum {
+	NL_ACT_UNSPEC,
+	NL_ACT_NEW,
+	NL_ACT_DEL,
+	NL_ACT_GET,
+	NL_ACT_SET,
+	NL_ACT_CHANGE,
+	__NL_ACT_MAX,
+};
+
+#define NL_ACT_MAX (__NL_ACT_MAX - 1)
+
+#define END_OF_MSGTYPES_LIST	{ -1, -1, NULL }
+
+/**
+ * Message type to cache action association
+ */
+struct nl_msgtype
+{
+	/** Netlink message type */
+	int			mt_id;
+
+	/** Cache action to take */
+	int			mt_act;
+
+	/** Name of operation for human-readable printing */
+	char *			mt_name;
+};
+
+/**
+ * Address family to netlink group association
+ */
+struct nl_af_group
+{
+	/** Address family */
+	int			ag_family;
+
+	/** Netlink group identifier */
+	int			ag_group;
+};
+
+#define END_OF_GROUP_LIST AF_UNSPEC, 0
+
+struct nl_parser_param
+{
+	int             (*pp_cb)(struct nl_object *, struct nl_parser_param *);
+	void *            pp_arg;
+};
+
+/**
+ * Cache Operations
+ */
+struct nl_cache_ops
+{
+	char  *			co_name;
+
+	int			co_hdrsize;
+	int			co_protocol;
+	struct nl_af_group *	co_groups;
+	
+	/**
+	 * Called whenever an update of the cache is required. Must send
+	 * a request message to the kernel requesting a complete dump.
+	 */
+	int   (*co_request_update)(struct nl_cache *, struct nl_sock *);
+
+	/**
+	 * Called whenever a message was received that needs to be parsed.
+	 * Must parse the message and call the paser callback function
+	 * (nl_parser_param) provided via the argument.
+	 */
+	int   (*co_msg_parser)(struct nl_cache_ops *, struct sockaddr_nl *,
+			       struct nlmsghdr *, struct nl_parser_param *);
+
+	struct nl_object_ops *	co_obj_ops;
+
+	struct nl_cache_ops *co_next;
+	struct nl_cache *co_major_cache;
+	struct genl_ops *	co_genl;
+	struct nl_msgtype	co_msgtypes[];
+};
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/cache.h b/trunk/package/libs/libnl-tiny/src/include/netlink/cache.h
new file mode 100644
index 00000000..09719f3a
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/cache.h
@@ -0,0 +1,128 @@
+/*
+ * netlink/cache.h		Caching Module
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_CACHE_H_
+#define NETLINK_CACHE_H_
+
+#include <netlink/netlink.h>
+#include <netlink/msg.h>
+#include <netlink/utils.h>
+#include <netlink/object.h>
+#include <netlink/cache-api.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct nl_cache;
+
+typedef void (*change_func_t)(struct nl_cache *, struct nl_object *, int);
+
+/* Access Functions */
+extern int			nl_cache_nitems(struct nl_cache *);
+extern int			nl_cache_nitems_filter(struct nl_cache *,
+						       struct nl_object *);
+extern struct nl_cache_ops *	nl_cache_get_ops(struct nl_cache *);
+extern struct nl_object *	nl_cache_get_first(struct nl_cache *);
+extern struct nl_object *	nl_cache_get_last(struct nl_cache *);
+extern struct nl_object *	nl_cache_get_next(struct nl_object *);
+extern struct nl_object *	nl_cache_get_prev(struct nl_object *);
+
+extern struct nl_cache *	nl_cache_alloc(struct nl_cache_ops *);
+extern int			nl_cache_alloc_and_fill(struct nl_cache_ops *,
+							struct nl_sock *,
+							struct nl_cache **);
+extern int			nl_cache_alloc_name(const char *,
+						    struct nl_cache **);
+extern struct nl_cache *	nl_cache_subset(struct nl_cache *,
+						struct nl_object *);
+extern void			nl_cache_clear(struct nl_cache *);
+extern void			nl_cache_free(struct nl_cache *);
+
+/* Cache modification */
+extern int			nl_cache_add(struct nl_cache *,
+					     struct nl_object *);
+extern int			nl_cache_parse_and_add(struct nl_cache *,
+						       struct nl_msg *);
+extern void			nl_cache_remove(struct nl_object *);
+extern int			nl_cache_refill(struct nl_sock *,
+						struct nl_cache *);
+extern int			nl_cache_pickup(struct nl_sock *,
+						struct nl_cache *);
+extern int			nl_cache_resync(struct nl_sock *,
+						struct nl_cache *,
+						change_func_t);
+extern int			nl_cache_include(struct nl_cache *,
+						 struct nl_object *,
+						 change_func_t);
+
+/* General */
+extern int			nl_cache_is_empty(struct nl_cache *);
+extern void			nl_cache_mark_all(struct nl_cache *);
+
+/* Dumping */
+extern void			nl_cache_dump(struct nl_cache *,
+					      struct nl_dump_params *);
+extern void			nl_cache_dump_filter(struct nl_cache *,
+						     struct nl_dump_params *,
+						     struct nl_object *);
+
+/* Iterators */
+#ifdef disabled
+extern void			nl_cache_foreach(struct nl_cache *,
+						 void (*cb)(struct nl_object *,
+							    void *),
+						 void *arg);
+extern void			nl_cache_foreach_filter(struct nl_cache *,
+							struct nl_object *,
+							void (*cb)(struct
+								   nl_object *,
+								   void *),
+							void *arg);
+#endif
+
+/* --- cache management --- */
+
+/* Cache type management */
+extern struct nl_cache_ops *	nl_cache_ops_lookup(const char *);
+extern struct nl_cache_ops *	nl_cache_ops_associate(int, int);
+extern struct nl_msgtype *	nl_msgtype_lookup(struct nl_cache_ops *, int);
+extern void			nl_cache_ops_foreach(void (*cb)(struct nl_cache_ops *, void *), void *);
+extern int			nl_cache_mngt_register(struct nl_cache_ops *);
+extern int			nl_cache_mngt_unregister(struct nl_cache_ops *);
+
+/* Global cache provisioning/requiring */
+extern void			nl_cache_mngt_provide(struct nl_cache *);
+extern void			nl_cache_mngt_unprovide(struct nl_cache *);
+extern struct nl_cache *	nl_cache_mngt_require(const char *);
+
+struct nl_cache_mngr;
+
+#define NL_AUTO_PROVIDE		1
+
+extern int			nl_cache_mngr_alloc(struct nl_sock *,
+						    int, int,
+						    struct nl_cache_mngr **);
+extern int			nl_cache_mngr_add(struct nl_cache_mngr *,
+						  const char *,
+						  change_func_t,
+						  struct nl_cache **);
+extern int			nl_cache_mngr_get_fd(struct nl_cache_mngr *);
+extern int			nl_cache_mngr_poll(struct nl_cache_mngr *,
+						   int);
+extern int			nl_cache_mngr_data_ready(struct nl_cache_mngr *);
+extern void			nl_cache_mngr_free(struct nl_cache_mngr *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/data.h b/trunk/package/libs/libnl-tiny/src/include/netlink/data.h
new file mode 100644
index 00000000..071159ee
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/data.h
@@ -0,0 +1,41 @@
+/*
+ * netlink/data.h	Abstract Data
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_DATA_H_
+#define NETLINK_DATA_H_
+
+#include <netlink/netlink.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct nl_data;
+
+/* General */
+extern struct nl_data *	nl_data_alloc(void *, size_t);
+extern struct nl_data * nl_data_alloc_attr(struct nlattr *);
+extern struct nl_data *	nl_data_clone(struct nl_data *);
+extern int		nl_data_append(struct nl_data *, void *, size_t);
+extern void		nl_data_free(struct nl_data *);
+
+/* Access Functions */
+extern void *		nl_data_get(struct nl_data *);
+extern size_t		nl_data_get_size(struct nl_data *);
+
+/* Misc */
+extern int		nl_data_cmp(struct nl_data *, struct nl_data *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/errno.h b/trunk/package/libs/libnl-tiny/src/include/netlink/errno.h
new file mode 100644
index 00000000..f8b5130c
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/errno.h
@@ -0,0 +1,64 @@
+/*
+ * netlink/errno.h		Error Numbers
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_ERRNO_H_
+#define NETLINK_ERRNO_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define NLE_SUCCESS		0
+#define NLE_FAILURE		1
+#define NLE_INTR		2
+#define NLE_BAD_SOCK		3
+#define NLE_AGAIN		4
+#define NLE_NOMEM		5
+#define NLE_EXIST		6
+#define NLE_INVAL		7
+#define NLE_RANGE		8
+#define NLE_MSGSIZE		9
+#define NLE_OPNOTSUPP		10
+#define NLE_AF_NOSUPPORT	11
+#define NLE_OBJ_NOTFOUND	12
+#define NLE_NOATTR		13
+#define NLE_MISSING_ATTR	14
+#define NLE_AF_MISMATCH		15
+#define NLE_SEQ_MISMATCH	16
+#define NLE_MSG_OVERFLOW	17
+#define NLE_MSG_TRUNC		18
+#define NLE_NOADDR		19
+#define NLE_SRCRT_NOSUPPORT	20
+#define NLE_MSG_TOOSHORT	21
+#define NLE_MSGTYPE_NOSUPPORT	22
+#define NLE_OBJ_MISMATCH	23
+#define NLE_NOCACHE		24
+#define NLE_BUSY		25
+#define NLE_PROTO_MISMATCH	26
+#define NLE_NOACCESS		27
+#define NLE_PERM		28
+#define NLE_PKTLOC_FILE		29
+#define NLE_PARSE_ERR		30
+#define NLE_NODEV		31
+#define NLE_IMMUTABLE		32
+#define NLE_DUMP_INTR		33
+
+#define NLE_MAX			NLE_DUMP_INTR
+
+extern const char *	nl_geterror(int);
+extern void		nl_perror(int, const char *);
+extern int		nl_syserr2nlerr(int);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/genl/ctrl.h b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/ctrl.h
new file mode 100644
index 00000000..1ae62f44
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/ctrl.h
@@ -0,0 +1,37 @@
+/*
+ * netlink/genl/ctrl.h		Generic Netlink Controller
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_GENL_CTRL_H_
+#define NETLINK_GENL_CTRL_H_
+
+#include <netlink/netlink.h>
+#include <netlink/cache.h>
+#include <netlink/addr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct genl_family;
+
+extern int			genl_ctrl_alloc_cache(struct nl_sock *,
+						      struct nl_cache **);
+extern struct genl_family *	genl_ctrl_search(struct nl_cache *, int);
+extern struct genl_family *	genl_ctrl_search_by_name(struct nl_cache *,
+							 const char *);
+extern int			genl_ctrl_resolve(struct nl_sock *,
+						  const char *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/genl/family.h b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/family.h
new file mode 100644
index 00000000..0257cbe2
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/family.h
@@ -0,0 +1,130 @@
+/*
+ * netlink/genl/family.h	Generic Netlink Family
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_GENL_FAMILY_H_
+#define NETLINK_GENL_FAMILY_H_
+
+#include <netlink/netlink.h>
+#include <netlink/cache.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @cond SKIP */
+#define FAMILY_ATTR_ID		0x01
+#define FAMILY_ATTR_NAME	0x02
+#define FAMILY_ATTR_VERSION	0x04
+#define FAMILY_ATTR_HDRSIZE	0x08
+#define FAMILY_ATTR_MAXATTR	0x10
+#define FAMILY_ATTR_OPS		0x20
+
+
+struct genl_family
+{
+	NLHDR_COMMON
+
+	uint16_t		gf_id;
+	char 			gf_name[GENL_NAMSIZ];
+	uint32_t		gf_version;
+	uint32_t		gf_hdrsize;
+	uint32_t		gf_maxattr;
+
+	struct nl_list_head	gf_ops;
+};
+
+
+extern struct genl_family *	genl_family_alloc(void);
+extern void			genl_family_put(struct genl_family *);
+
+extern int			genl_family_add_op(struct genl_family *,
+						   int, int);
+
+/**
+ * @name Attributes
+ * @{
+ */
+
+static inline unsigned int genl_family_get_id(struct genl_family *family)
+{
+	if (family->ce_mask & FAMILY_ATTR_ID)
+		return family->gf_id;
+	else
+		return GENL_ID_GENERATE;
+}
+
+static inline void genl_family_set_id(struct genl_family *family, unsigned int id)
+{
+	family->gf_id = id;
+	family->ce_mask |= FAMILY_ATTR_ID;
+}
+
+static inline char *genl_family_get_name(struct genl_family *family)
+{
+	if (family->ce_mask & FAMILY_ATTR_NAME)
+		return family->gf_name;
+	else
+		return NULL;
+}
+
+static inline void genl_family_set_name(struct genl_family *family, const char *name)
+{
+	strncpy(family->gf_name, name, GENL_NAMSIZ-1);
+	family->ce_mask |= FAMILY_ATTR_NAME;
+}
+
+static inline uint8_t genl_family_get_version(struct genl_family *family)
+{
+	if (family->ce_mask & FAMILY_ATTR_VERSION)
+		return family->gf_version;
+	else
+		return 0;
+}
+
+static inline void genl_family_set_version(struct genl_family *family, uint8_t version)
+{
+	family->gf_version = version;
+	family->ce_mask |= FAMILY_ATTR_VERSION;
+}
+
+static inline uint32_t genl_family_get_hdrsize(struct genl_family *family)
+{
+	if (family->ce_mask & FAMILY_ATTR_HDRSIZE)
+		return family->gf_hdrsize;
+	else
+		return 0;
+}
+
+static inline void genl_family_set_hdrsize(struct genl_family *family, uint32_t hdrsize)
+{
+	family->gf_hdrsize = hdrsize;
+	family->ce_mask |= FAMILY_ATTR_HDRSIZE;
+}
+
+static inline uint32_t genl_family_get_maxattr(struct genl_family *family)
+{
+	if (family->ce_mask & FAMILY_ATTR_MAXATTR)
+		return family->gf_maxattr;
+	else
+		return family->gf_maxattr;
+}
+
+static inline void genl_family_set_maxattr(struct genl_family *family, uint32_t maxattr)
+{
+	family->gf_maxattr = maxattr;
+	family->ce_mask |= FAMILY_ATTR_MAXATTR;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/genl/genl.h b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/genl.h
new file mode 100644
index 00000000..3f3340cf
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/genl.h
@@ -0,0 +1,47 @@
+/*
+ * netlink/genl/genl.h		Generic Netlink
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_GENL_H_
+#define NETLINK_GENL_H_
+
+#include <netlink/netlink.h>
+#include <netlink/msg.h>
+#include <netlink/attr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int		genl_connect(struct nl_sock *);
+
+extern int		genl_send_simple(struct nl_sock *, int, int,
+					 int, int);
+
+extern void *		genlmsg_put(struct nl_msg *, uint32_t, uint32_t,
+				    int, int, int, uint8_t, uint8_t);
+
+extern int		genlmsg_valid_hdr(struct nlmsghdr *, int);
+extern int		genlmsg_validate(struct nlmsghdr *, int, int,
+					 struct nla_policy *);
+extern int		genlmsg_parse(struct nlmsghdr *, int, struct nlattr **,
+				      int, struct nla_policy *);
+extern void *		genlmsg_data(const struct genlmsghdr *);
+extern int		genlmsg_len(const struct genlmsghdr *);
+extern struct nlattr *	genlmsg_attrdata(const struct genlmsghdr *, int);
+extern int		genlmsg_attrlen(const struct genlmsghdr *, int);
+
+extern char *		genl_op2name(int, int, char *, size_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/genl/mngt.h b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/mngt.h
new file mode 100644
index 00000000..8b0244f2
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/genl/mngt.h
@@ -0,0 +1,87 @@
+/*
+ * netlink/genl/mngt.h		Generic Netlink Management
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_GENL_MNGT_H_
+#define NETLINK_GENL_MNGT_H_
+
+#include <netlink/netlink.h>
+#include <netlink/attr.h>
+#include <netlink/list.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct nl_cache_ops;
+
+struct genl_info
+{
+	struct sockaddr_nl *    who;
+	struct nlmsghdr *       nlh;
+	struct genlmsghdr *     genlhdr;
+	void *                  userhdr;
+	struct nlattr **        attrs;
+};
+
+/**
+ * @ingroup genl_mngt
+ * Generic Netlink Command
+ */
+struct genl_cmd
+{
+	/** Unique command identifier */
+	int			c_id;
+
+	/** Name/description of command */
+	char *			c_name;
+
+	/**
+	 * Maximum attribute identifier, must be provided if
+	 * a message parser is available.
+	 */
+	int			c_maxattr;
+
+	int		      (*c_msg_parser)(struct nl_cache_ops *,
+					      struct genl_cmd *,
+					      struct genl_info *, void *);
+
+	/**
+	 * Attribute validation policy (optional)
+	 */
+	struct nla_policy *	c_attr_policy;
+};
+
+/**
+ * @ingroup genl_mngt
+ * Generic Netlink Operations
+ */
+struct genl_ops
+{
+	int			o_family;
+	int			o_id;
+	char *			o_name;
+	struct nl_cache_ops *	o_cache_ops;
+	struct genl_cmd	*	o_cmds;
+	int			o_ncmds;
+
+	/* linked list of all genl cache operations */
+	struct nl_list_head	o_list;
+};
+
+
+extern int		genl_register(struct nl_cache_ops *);
+extern void		genl_unregister(struct nl_cache_ops *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/handlers.h b/trunk/package/libs/libnl-tiny/src/include/netlink/handlers.h
new file mode 100644
index 00000000..7fb53b4e
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/handlers.h
@@ -0,0 +1,230 @@
+/*
+ * netlink/handlers.c	default netlink message handlers
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_HANDLERS_H_
+#define NETLINK_HANDLERS_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <netlink/netlink-compat.h>
+#include <netlink/netlink-kernel.h>
+#include <netlink/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct nl_sock;
+struct nl_msg;
+struct nl_cb;
+/**
+ * @name Callback Typedefs
+ * @{
+ */
+
+/**
+ * nl_recvmsgs() callback for message processing customization
+ * @ingroup cb
+ * @arg msg		netlink message being processed
+ * @arg arg		argument passwd on through caller
+ */
+typedef int (*nl_recvmsg_msg_cb_t)(struct nl_msg *msg, void *arg);
+
+/**
+ * nl_recvmsgs() callback for error message processing customization
+ * @ingroup cb
+ * @arg nla		netlink address of the peer
+ * @arg nlerr		netlink error message being processed
+ * @arg arg		argument passed on through caller
+ */
+typedef int (*nl_recvmsg_err_cb_t)(struct sockaddr_nl *nla,
+				   struct nlmsgerr *nlerr, void *arg);
+
+/** @} */
+
+/**
+ * Callback actions
+ * @ingroup cb
+ */
+enum nl_cb_action {
+	/** Proceed with wathever would come next */
+	NL_OK,
+	/** Skip this message */
+	NL_SKIP,
+	/** Stop parsing altogether and discard remaining messages */
+	NL_STOP,
+};
+
+/**
+ * Callback kinds
+ * @ingroup cb
+ */
+enum nl_cb_kind {
+	/** Default handlers (quiet) */
+	NL_CB_DEFAULT,
+	/** Verbose default handlers (error messages printed) */
+	NL_CB_VERBOSE,
+	/** Debug handlers for debugging */
+	NL_CB_DEBUG,
+	/** Customized handler specified by the user */
+	NL_CB_CUSTOM,
+	__NL_CB_KIND_MAX,
+};
+
+#define NL_CB_KIND_MAX (__NL_CB_KIND_MAX - 1)
+
+/**
+ * Callback types
+ * @ingroup cb
+ */
+enum nl_cb_type {
+	/** Message is valid */
+	NL_CB_VALID,
+	/** Last message in a series of multi part messages received */
+	NL_CB_FINISH,
+	/** Report received that data was lost */
+	NL_CB_OVERRUN,
+	/** Message wants to be skipped */
+	NL_CB_SKIPPED,
+	/** Message is an acknowledge */
+	NL_CB_ACK,
+	/** Called for every message received */
+	NL_CB_MSG_IN,
+	/** Called for every message sent out except for nl_sendto() */
+	NL_CB_MSG_OUT,
+	/** Message is malformed and invalid */
+	NL_CB_INVALID,
+	/** Called instead of internal sequence number checking */
+	NL_CB_SEQ_CHECK,
+	/** Sending of an acknowledge message has been requested */
+	NL_CB_SEND_ACK,
+	__NL_CB_TYPE_MAX,
+};
+
+#define NL_CB_TYPE_MAX (__NL_CB_TYPE_MAX - 1)
+
+struct nl_cb
+{
+	nl_recvmsg_msg_cb_t	cb_set[NL_CB_TYPE_MAX+1];
+	void *			cb_args[NL_CB_TYPE_MAX+1];
+	
+	nl_recvmsg_err_cb_t	cb_err;
+	void *			cb_err_arg;
+
+	/** May be used to replace nl_recvmsgs with your own implementation
+	 * in all internal calls to nl_recvmsgs. */
+	int			(*cb_recvmsgs_ow)(struct nl_sock *,
+						  struct nl_cb *);
+
+	/** Overwrite internal calls to nl_recv, must return the number of
+	 * octets read and allocate a buffer for the received data. */
+	int			(*cb_recv_ow)(struct nl_sock *,
+					      struct sockaddr_nl *,
+					      unsigned char **,
+					      struct ucred **);
+
+	/** Overwrites internal calls to nl_send, must send the netlink
+	 * message. */
+	int			(*cb_send_ow)(struct nl_sock *,
+					      struct nl_msg *);
+
+	int			cb_refcnt;
+};
+
+
+extern struct nl_cb *	nl_cb_alloc(enum nl_cb_kind);
+extern struct nl_cb *	nl_cb_clone(struct nl_cb *);
+extern void		nl_cb_put(struct nl_cb *);
+
+extern int  nl_cb_set(struct nl_cb *, enum nl_cb_type, enum nl_cb_kind,
+		      nl_recvmsg_msg_cb_t, void *);
+extern int  nl_cb_err(struct nl_cb *, enum nl_cb_kind, nl_recvmsg_err_cb_t,
+		      void *);
+
+static inline struct nl_cb *nl_cb_get(struct nl_cb *cb)
+{
+	cb->cb_refcnt++;
+
+	return cb;
+}
+
+/**
+ * Set up a all callbacks
+ * @arg cb		callback set
+ * @arg kind		kind of callback
+ * @arg func		callback function
+ * @arg arg		argument to be passwd to callback function
+ *
+ * @return 0 on success or a negative error code
+ */
+static inline int nl_cb_set_all(struct nl_cb *cb, enum nl_cb_kind kind,
+		  nl_recvmsg_msg_cb_t func, void *arg)
+{
+	int i, err;
+
+	for (i = 0; i <= NL_CB_TYPE_MAX; i++) {
+		err = nl_cb_set(cb,(enum nl_cb_type)i, kind, func, arg);
+		if (err < 0)
+			return err;
+	}
+
+	return 0;
+}
+
+
+/**
+ * @name Overwriting
+ * @{
+ */
+
+/**
+ * Overwrite internal calls to nl_recvmsgs()
+ * @arg cb		callback set
+ * @arg func		replacement callback for nl_recvmsgs()
+ */
+static inline void nl_cb_overwrite_recvmsgs(struct nl_cb *cb,
+			      int (*func)(struct nl_sock *, struct nl_cb *))
+{
+	cb->cb_recvmsgs_ow = func;
+}
+
+/**
+ * Overwrite internal calls to nl_recv()
+ * @arg cb		callback set
+ * @arg func		replacement callback for nl_recv()
+ */
+static inline void nl_cb_overwrite_recv(struct nl_cb *cb,
+			  int (*func)(struct nl_sock *, struct sockaddr_nl *,
+				      unsigned char **, struct ucred **))
+{
+	cb->cb_recv_ow = func;
+}
+
+/**
+ * Overwrite internal calls to nl_send()
+ * @arg cb		callback set
+ * @arg func		replacement callback for nl_send()
+ */
+static inline void nl_cb_overwrite_send(struct nl_cb *cb,
+			  int (*func)(struct nl_sock *, struct nl_msg *))
+{
+	cb->cb_send_ow = func;
+}
+
+/** @} */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/list.h b/trunk/package/libs/libnl-tiny/src/include/netlink/list.h
new file mode 100644
index 00000000..c6876a77
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/list.h
@@ -0,0 +1,88 @@
+/*
+ * netlink/list.h	Netlink List Utilities
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_LIST_H_
+#define NETLINK_LIST_H_
+
+struct nl_list_head
+{
+	struct nl_list_head *	next;
+	struct nl_list_head *	prev;
+};
+
+
+static inline void __nl_list_add(struct nl_list_head *obj,
+				 struct nl_list_head *prev,
+				 struct nl_list_head *next)
+{
+	prev->next = obj;
+	obj->prev = prev;
+	next->prev = obj;
+	obj->next = next;
+}
+
+static inline void nl_list_add_tail(struct nl_list_head *obj,
+				    struct nl_list_head *head)
+{
+	__nl_list_add(obj, head->prev, head);
+}
+
+static inline void nl_list_add_head(struct nl_list_head *obj,
+				    struct nl_list_head *head)
+{
+	__nl_list_add(obj, head, head->next);
+}
+
+static inline void nl_list_del(struct nl_list_head *obj)
+{
+	obj->next->prev = obj->prev;
+	obj->prev->next = obj->next;
+}
+
+static inline int nl_list_empty(struct nl_list_head *head)
+{
+	return head->next == head;
+}
+
+#define nl_container_of(ptr, type, member) ({			\
+        const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+        (type *)( (char *)__mptr - ((size_t) &((type *)0)->member));})
+
+#define nl_list_entry(ptr, type, member) \
+	nl_container_of(ptr, type, member)
+
+#define nl_list_at_tail(pos, head, member) \
+	((pos)->member.next == (head))
+
+#define nl_list_at_head(pos, head, member) \
+	((pos)->member.prev == (head))
+
+#define NL_LIST_HEAD(name) \
+	struct nl_list_head name = { &(name), &(name) }
+
+#define nl_list_first_entry(head, type, member)			\
+	nl_list_entry((head)->next, type, member)
+
+#define nl_list_for_each_entry(pos, head, member)				\
+	for (pos = nl_list_entry((head)->next, typeof(*pos), member);	\
+	     &(pos)->member != (head); 	\
+	     (pos) = nl_list_entry((pos)->member.next, typeof(*(pos)), member))
+
+#define nl_list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = nl_list_entry((head)->next, typeof(*pos), member),	\
+		n = nl_list_entry(pos->member.next, typeof(*pos), member);	\
+	     &(pos)->member != (head); 					\
+	     pos = n, n = nl_list_entry(n->member.next, typeof(*n), member))
+
+#define nl_init_list_head(head) \
+	do { (head)->next = (head); (head)->prev = (head); } while (0)
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/msg.h b/trunk/package/libs/libnl-tiny/src/include/netlink/msg.h
new file mode 100644
index 00000000..b3e2b0b2
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/msg.h
@@ -0,0 +1,308 @@
+/*
+ * netlink/msg.c		Netlink Messages Interface
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_MSG_H_
+#define NETLINK_MSG_H_
+
+#include <netlink/netlink.h>
+#include <netlink/object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct nla_policy;
+
+#define NL_DONTPAD	0
+
+/**
+ * @ingroup msg
+ * @brief
+ * Will cause the netlink pid to be set to the pid assigned to
+ * the netlink handle (socket) just before sending the message off.
+ * @note Requires the use of nl_send_auto_complete()!
+ */
+#define NL_AUTO_PID	0
+
+/**
+ * @ingroup msg
+ * @brief
+ * May be used to refer to a sequence number which should be
+ * automatically set just before sending the message off.
+ * @note Requires the use of nl_send_auto_complete()!
+ */
+#define NL_AUTO_SEQ	0
+
+#define NL_MSG_CRED_PRESENT 1
+
+struct nl_msg
+{
+	int			nm_protocol;
+	int			nm_flags;
+	struct sockaddr_nl	nm_src;
+	struct sockaddr_nl	nm_dst;
+	struct ucred		nm_creds;
+	struct nlmsghdr *	nm_nlh;
+	size_t			nm_size;
+	int			nm_refcnt;
+};
+
+
+struct nl_msg;
+struct nl_tree;
+struct ucred;
+
+/* message parsing */
+extern int		  nlmsg_ok(const struct nlmsghdr *, int);
+extern struct nlmsghdr *  nlmsg_next(struct nlmsghdr *, int *);
+extern int		  nlmsg_parse(struct nlmsghdr *, int, struct nlattr **,
+				      int, struct nla_policy *);
+extern int		  nlmsg_validate(struct nlmsghdr *, int, int,
+					 struct nla_policy *);
+
+extern struct nl_msg *	  nlmsg_alloc(void);
+extern struct nl_msg *	  nlmsg_alloc_size(size_t);
+extern struct nl_msg *	  nlmsg_alloc_simple(int, int);
+extern void		  nlmsg_set_default_size(size_t);
+extern struct nl_msg *	  nlmsg_inherit(struct nlmsghdr *);
+extern struct nl_msg *	  nlmsg_convert(struct nlmsghdr *);
+extern void *		  nlmsg_reserve(struct nl_msg *, size_t, int);
+extern int		  nlmsg_append(struct nl_msg *, void *, size_t, int);
+
+extern struct nlmsghdr *  nlmsg_put(struct nl_msg *, uint32_t, uint32_t,
+				    int, int, int);
+extern void		  nlmsg_free(struct nl_msg *);
+
+extern int		  nl_msg_parse(struct nl_msg *,
+				       void (*cb)(struct nl_object *, void *),
+				       void *);
+
+extern void		nl_msg_dump(struct nl_msg *, FILE *);
+
+/**
+ * length of netlink message not including padding
+ * @arg payload		length of message payload
+ */
+static inline int nlmsg_msg_size(int payload)
+{
+	return NLMSG_HDRLEN + payload;
+}
+
+/**
+ * length of netlink message including padding
+ * @arg payload		length of message payload
+ */
+static inline int nlmsg_total_size(int payload)
+{
+	return NLMSG_ALIGN(nlmsg_msg_size(payload));
+}
+
+/**
+ * length of padding at the message's tail
+ * @arg payload		length of message payload
+ */
+static inline int nlmsg_padlen(int payload)
+{
+	return nlmsg_total_size(payload) - nlmsg_msg_size(payload);
+}
+
+/**
+ * head of message payload
+ * @arg nlh		netlink messsage header
+ */
+static inline void *nlmsg_data(const struct nlmsghdr *nlh)
+{
+	return (unsigned char *) nlh + NLMSG_HDRLEN;
+}
+
+static inline void *nlmsg_tail(const struct nlmsghdr *nlh)
+{
+	return (unsigned char *) nlh + NLMSG_ALIGN(nlh->nlmsg_len);
+}
+
+/**
+ * length of message payload
+ * @arg nlh		netlink message header
+ */
+static inline int nlmsg_len(const struct nlmsghdr *nlh)
+{
+	return nlh->nlmsg_len - NLMSG_HDRLEN;
+}
+
+/**
+ * head of attributes data
+ * @arg nlh		netlink message header
+ * @arg hdrlen		length of family specific header
+ */
+static inline struct nlattr *nlmsg_attrdata(const struct nlmsghdr *nlh, int hdrlen)
+{
+	unsigned char *data = (unsigned char*)nlmsg_data(nlh);
+	return (struct nlattr *) (data + NLMSG_ALIGN(hdrlen));
+}
+
+/**
+ * length of attributes data
+ * @arg nlh		netlink message header
+ * @arg hdrlen		length of family specific header
+ */
+static inline int nlmsg_attrlen(const struct nlmsghdr *nlh, int hdrlen)
+{
+	return nlmsg_len(nlh) - NLMSG_ALIGN(hdrlen);
+}
+
+static inline int nlmsg_valid_hdr(const struct nlmsghdr *nlh, int hdrlen)
+{
+	if (nlh->nlmsg_len < (uint)nlmsg_msg_size(hdrlen))
+		return 0;
+
+	return 1;
+}
+
+
+static inline void nlmsg_set_proto(struct nl_msg *msg, int protocol)
+{
+	msg->nm_protocol = protocol;
+}
+
+static inline int nlmsg_get_proto(struct nl_msg *msg)
+{
+	return msg->nm_protocol;
+}
+
+static inline size_t nlmsg_get_max_size(struct nl_msg *msg)
+{
+	return msg->nm_size;
+}
+
+static inline void nlmsg_set_src(struct nl_msg *msg, struct sockaddr_nl *addr)
+{
+	memcpy(&msg->nm_src, addr, sizeof(*addr));
+}
+
+static inline struct sockaddr_nl *nlmsg_get_src(struct nl_msg *msg)
+{
+	return &msg->nm_src;
+}
+
+static inline void nlmsg_set_dst(struct nl_msg *msg, struct sockaddr_nl *addr)
+{
+	memcpy(&msg->nm_dst, addr, sizeof(*addr));
+}
+
+static inline struct sockaddr_nl *nlmsg_get_dst(struct nl_msg *msg)
+{
+	return &msg->nm_dst;
+}
+
+static inline void nlmsg_set_creds(struct nl_msg *msg, struct ucred *creds)
+{
+	memcpy(&msg->nm_creds, creds, sizeof(*creds));
+	msg->nm_flags |= NL_MSG_CRED_PRESENT;
+}
+
+static inline struct ucred *nlmsg_get_creds(struct nl_msg *msg)
+{
+	if (msg->nm_flags & NL_MSG_CRED_PRESENT)
+		return &msg->nm_creds;
+	return NULL;
+}
+
+/**
+ * Return actual netlink message
+ * @arg n		netlink message
+ * 
+ * Returns the actual netlink message casted to the type of the netlink
+ * message header.
+ * 
+ * @return A pointer to the netlink message.
+ */
+static inline struct nlmsghdr *nlmsg_hdr(struct nl_msg *n)
+{
+	return n->nm_nlh;
+}
+
+/**
+ * Acquire a reference on a netlink message
+ * @arg msg		message to acquire reference from
+ */
+static inline void nlmsg_get(struct nl_msg *msg)
+{
+	msg->nm_refcnt++;
+}
+
+/**
+ * Expand maximum payload size of a netlink message
+ * @arg n		Netlink message.
+ * @arg newlen		New maximum payload size.
+ *
+ * Reallocates the payload section of a netlink message and increases
+ * the maximum payload size of the message.
+ *
+ * @note Any pointers pointing to old payload block will be stale and
+ *       need to be refetched. Therfore, do not expand while constructing
+ *       nested attributes or while reserved data blocks are held.
+ *
+ * @return 0 on success or a negative error code.
+ */
+static inline int nlmsg_expand(struct nl_msg *n, size_t newlen)
+{
+	void *tmp;
+
+	if (newlen <= n->nm_size)
+		return -NLE_INVAL;
+
+	tmp = realloc(n->nm_nlh, newlen);
+	if (tmp == NULL)
+		return -NLE_NOMEM;
+
+	n->nm_nlh = (struct nlmsghdr*)tmp;
+	n->nm_size = newlen;
+
+	return 0;
+}
+
+
+/**
+ * @name Iterators
+ * @{
+ */
+
+/**
+ * @ingroup msg
+ * Iterate over a stream of attributes in a message
+ * @arg pos	loop counter, set to current attribute
+ * @arg nlh	netlink message header
+ * @arg hdrlen	length of family header
+ * @arg rem	initialized to len, holds bytes currently remaining in stream
+ */
+#define nlmsg_for_each_attr(pos, nlh, hdrlen, rem) \
+	nla_for_each_attr(pos, nlmsg_attrdata(nlh, hdrlen), \
+			  nlmsg_attrlen(nlh, hdrlen), rem)
+
+/**
+ * Iterate over a stream of messages
+ * @arg pos	loop counter, set to current message
+ * @arg head	head of message stream
+ * @arg len	length of message stream
+ * @arg rem	initialized to len, holds bytes currently remaining in stream
+ */
+#define nlmsg_for_each_msg(pos, head, len, rem) \
+	for (pos = head, rem = len; \
+	     nlmsg_ok(pos, rem); \
+	     pos = nlmsg_next(pos, &(rem)))
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/netlink-compat.h b/trunk/package/libs/libnl-tiny/src/include/netlink/netlink-compat.h
new file mode 100644
index 00000000..17ec9fc8
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/netlink-compat.h
@@ -0,0 +1,50 @@
+/*
+ * netlink/netlink-compat.h	Netlink Compatability
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_COMPAT_H_
+#define NETLINK_COMPAT_H_
+
+#if !defined _LINUX_SOCKET_H && !defined _BITS_SOCKADDR_H
+typedef unsigned short  sa_family_t;
+#endif
+
+#ifndef IFNAMSIZ 
+/** Maximum length of a interface name */
+#define IFNAMSIZ 16
+#endif
+
+/* patch 2.4.x if_arp */
+#ifndef ARPHRD_INFINIBAND
+#define ARPHRD_INFINIBAND 32
+#endif
+
+/* patch 2.4.x eth header file */
+#ifndef ETH_P_MPLS_UC
+#define ETH_P_MPLS_UC  0x8847 
+#endif
+
+#ifndef ETH_P_MPLS_MC
+#define ETH_P_MPLS_MC   0x8848
+#endif
+
+#ifndef  ETH_P_EDP2
+#define ETH_P_EDP2      0x88A2
+#endif
+
+#ifndef ETH_P_HDLC
+#define ETH_P_HDLC      0x0019 
+#endif
+
+#ifndef AF_LLC
+#define AF_LLC		26
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/netlink-kernel.h b/trunk/package/libs/libnl-tiny/src/include/netlink/netlink-kernel.h
new file mode 100644
index 00000000..a0f55356
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/netlink-kernel.h
@@ -0,0 +1,196 @@
+#ifndef __LINUX_NETLINK_H
+#define __LINUX_NETLINK_H
+
+/**
+ * Netlink socket address
+ * @ingroup nl
+ */
+struct sockaddr_nl
+{
+	/** socket family (AF_NETLINK) */
+	sa_family_t     nl_family;
+
+	/** Padding (unused) */
+	unsigned short  nl_pad;
+
+	/** Unique process ID  */
+	uint32_t        nl_pid;
+
+	/** Multicast group subscriptions */
+	uint32_t        nl_groups;
+};
+
+/**
+ * Netlink message header
+ * @ingroup msg
+ */
+struct nlmsghdr
+{
+	/**
+	 * Length of message including header.
+	 */
+	uint32_t	nlmsg_len;
+
+	/**
+	 * Message type (content type)
+	 */
+	uint16_t	nlmsg_type;
+
+	/**
+	 * Message flags
+	 */
+	uint16_t	nlmsg_flags;
+
+	/**
+	 * Sequence number
+	 */
+	uint32_t	nlmsg_seq;
+
+	/**
+	 * Netlink PID of the proccess sending the message.
+	 */
+	uint32_t	nlmsg_pid;
+};
+
+/**
+ * @name Standard message flags
+ * @{
+ */
+
+/**
+ * Must be set on all request messages (typically from user space to
+ * kernel space).
+ * @ingroup msg
+ */
+#define NLM_F_REQUEST		1
+
+/**
+ * Indicates the message is part of a multipart message terminated
+ * by NLMSG_DONE.
+ */
+#define NLM_F_MULTI		2
+
+/**
+ * Request for an acknowledgment on success.
+ */
+#define NLM_F_ACK		4
+
+/**
+ * Echo this request
+ */
+#define NLM_F_ECHO		8
+
+/** @} */
+
+/**
+ * @name Additional message flags for GET requests
+ * @{
+ */
+
+/**
+ * Return the complete table instead of a single entry.
+ * @ingroup msg
+ */
+#define NLM_F_ROOT	0x100
+
+/**
+ * Return all entries matching criteria passed in message content.
+ */
+#define NLM_F_MATCH	0x200
+
+/**
+ * Return an atomic snapshot of the table being referenced. This
+ * may require special privileges because it has the potential to
+ * interrupt service in the FE for a longer time.
+ */
+#define NLM_F_ATOMIC	0x400
+
+/**
+ * Dump all entries
+ */
+#define NLM_F_DUMP	(NLM_F_ROOT|NLM_F_MATCH)
+
+/** @} */
+
+/**
+ * @name Additional messsage flags for NEW requests
+ * @{
+ */
+
+/**
+ * Replace existing matching config object with this request.
+ * @ingroup msg
+ */
+#define NLM_F_REPLACE	0x100
+
+/**
+ * Don't replace the config object if it already exists.
+ */
+#define NLM_F_EXCL	0x200
+
+/**
+ * Create config object if it doesn't already exist.
+ */
+#define NLM_F_CREATE	0x400
+
+/**
+ * Add to the end of the object list.
+ */
+#define NLM_F_APPEND	0x800
+
+/** @} */
+
+/**
+ * @name Standard Message types
+ * @{
+ */
+
+/**
+ * No operation, message must be ignored
+ * @ingroup msg
+ */
+#define NLMSG_NOOP		0x1
+
+/**
+ * The message signals an error and the payload contains a nlmsgerr
+ * structure. This can be looked at as a NACK and typically it is
+ * from FEC to CPC.
+ */
+#define NLMSG_ERROR		0x2
+
+/**
+ * Message terminates a multipart message.
+ */
+#define NLMSG_DONE		0x3
+
+/**
+ * The message signals that data got lost
+ */
+#define NLMSG_OVERRUN		0x4
+
+/**
+ * Lower limit of reserved message types
+ */
+#define NLMSG_MIN_TYPE		0x10
+
+/** @} */
+
+/**
+ * Netlink error message
+ * @ingroup msg
+ */
+struct nlmsgerr
+{
+	/** Error code (errno number) */
+	int		error;
+
+	/** Original netlink message causing the error */
+	struct nlmsghdr	msg;
+};
+
+struct nl_pktinfo
+{
+	__u32	group;
+};
+
+#endif	/* __LINUX_NETLINK_H */
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/netlink.h b/trunk/package/libs/libnl-tiny/src/include/netlink/netlink.h
new file mode 100644
index 00000000..c333c503
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/netlink.h
@@ -0,0 +1,82 @@
+/*
+ * netlink/netlink.h		Netlink Interface
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_NETLINK_H_
+#define NETLINK_NETLINK_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <poll.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <netdb.h>
+#include <netlink/netlink-compat.h>
+#include <linux/netlink.h>
+#include <linux/genetlink.h>
+#include <netlink/version.h>
+#include <netlink/errno.h>
+#include <netlink/types.h>
+#include <netlink/handlers.h>
+#include <netlink/socket.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int nl_debug;
+extern struct nl_dump_params nl_debug_dp;
+
+/* Connection Management */
+extern int			nl_connect(struct nl_sock *, int);
+extern void			nl_close(struct nl_sock *);
+
+/* Send */
+extern int			nl_sendto(struct nl_sock *, void *, size_t);
+extern int			nl_sendmsg(struct nl_sock *, struct nl_msg *,
+					   struct msghdr *);
+extern int			nl_send(struct nl_sock *, struct nl_msg *);
+extern int			nl_send_auto_complete(struct nl_sock *,
+						      struct nl_msg *);
+extern int			nl_send_simple(struct nl_sock *, int, int,
+					       void *, size_t);
+
+/* Receive */
+extern int			nl_recv(struct nl_sock *,
+					struct sockaddr_nl *, unsigned char **,
+					struct ucred **);
+extern int			nl_recvmsgs(struct nl_sock *sk, struct nl_cb *cb);
+
+extern int			nl_wait_for_ack(struct nl_sock *);
+
+/* Netlink Family Translations */
+extern char *			nl_nlfamily2str(int, char *, size_t);
+extern int			nl_str2nlfamily(const char *);
+
+/**
+ * Receive a set of message from a netlink socket using handlers in nl_sock.
+ * @arg sk		Netlink socket.
+ *
+ * Calls nl_recvmsgs() with the handlers configured in the netlink socket.
+ */
+static inline int nl_recvmsgs_default(struct nl_sock *sk)
+{
+	return nl_recvmsgs(sk, sk->s_cb);
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/object-api.h b/trunk/package/libs/libnl-tiny/src/include/netlink/object-api.h
new file mode 100644
index 00000000..8a44fe90
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/object-api.h
@@ -0,0 +1,331 @@
+/*
+ * netlink/object-api.c		Object API
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2007 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_OBJECT_API_H_
+#define NETLINK_OBJECT_API_H_
+
+#include <netlink/netlink.h>
+#include <netlink/utils.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @ingroup object
+ * @defgroup object_api Object API
+ * @brief
+ *
+ * @par 1) Object Definition
+ * @code
+ * // Define your object starting with the common object header
+ * struct my_obj {
+ * 	NLHDR_COMMON
+ * 	int		my_data;
+ * };
+ *
+ * // Fill out the object operations structure
+ * struct nl_object_ops my_ops = {
+ * 	.oo_name	= "my_obj",
+ * 	.oo_size	= sizeof(struct my_obj),
+ * };
+ *
+ * // At this point the object can be allocated, you may want to provide a
+ * // separate _alloc() function to ease allocting objects of this kind.
+ * struct nl_object *obj = nl_object_alloc(&my_ops);
+ *
+ * // And release it again...
+ * nl_object_put(obj);
+ * @endcode
+ *
+ * @par 2) Allocating additional data
+ * @code
+ * // You may require to allocate additional data and store it inside
+ * // object, f.e. assuming there is a field `ptr'.
+ * struct my_obj {
+ * 	NLHDR_COMMON
+ * 	void *		ptr;
+ * };
+ *
+ * // And at some point you may assign allocated data to this field:
+ * my_obj->ptr = calloc(1, ...);
+ *
+ * // In order to not introduce any memory leaks you have to release
+ * // this data again when the last reference is given back.
+ * static void my_obj_free_data(struct nl_object *obj)
+ * {
+ * 	struct my_obj *my_obj = nl_object_priv(obj);
+ *
+ * 	free(my_obj->ptr);
+ * }
+ *
+ * // Also when the object is cloned, you must ensure for your pointer
+ * // stay valid even if one of the clones is freed by either making
+ * // a clone as well or increase the reference count.
+ * static int my_obj_clone(struct nl_object *src, struct nl_object *dst)
+ * {
+ * 	struct my_obj *my_src = nl_object_priv(src);
+ * 	struct my_obj *my_dst = nl_object_priv(dst);
+ *
+ * 	if (src->ptr) {
+ * 		dst->ptr = calloc(1, ...);
+ * 		memcpy(dst->ptr, src->ptr, ...);
+ * 	}
+ * }
+ *
+ * struct nl_object_ops my_ops = {
+ * 	...
+ * 	.oo_free_data	= my_obj_free_data,
+ * 	.oo_clone	= my_obj_clone,
+ * };
+ * @endcode
+ *
+ * @par 3) Object Dumping
+ * @code
+ * static int my_obj_dump_detailed(struct nl_object *obj,
+ * 				   struct nl_dump_params *params)
+ * {
+ * 	struct my_obj *my_obj = nl_object_priv(obj);
+ *
+ * 	// It is absolutely essential to use nl_dump() when printing
+ *	// any text to make sure the dumping parameters are respected.
+ * 	nl_dump(params, "Obj Integer: %d\n", my_obj->my_int);
+ *
+ * 	// Before we can dump the next line, make sure to prefix
+ *	// this line correctly.
+ * 	nl_new_line(params);
+ *
+ * 	// You may also split a line into multiple nl_dump() calls.
+ * 	nl_dump(params, "String: %s ", my_obj->my_string);
+ * 	nl_dump(params, "String-2: %s\n", my_obj->another_string);
+ * }
+ *
+ * struct nl_object_ops my_ops = {
+ * 	...
+ * 	.oo_dump[NL_DUMP_FULL]	= my_obj_dump_detailed,
+ * };
+ * @endcode
+ *
+ * @par 4) Object Attributes
+ * @code
+ * // The concept of object attributes is optional but can ease the typical
+ * // case of objects that have optional attributes, e.g. a route may have a
+ * // nexthop assigned but it is not required to.
+ *
+ * // The first step to define your object specific bitmask listing all
+ * // attributes
+ * #define MY_ATTR_FOO		(1<<0)
+ * #define MY_ATTR_BAR		(1<<1)
+ *
+ * // When assigning an optional attribute to the object, make sure
+ * // to mark its availability.
+ * my_obj->foo = 123123;
+ * my_obj->ce_mask |= MY_ATTR_FOO;
+ *
+ * // At any time you may use this mask to check for the availability
+ * // of the attribute, e.g. while dumping
+ * if (my_obj->ce_mask & MY_ATTR_FOO)
+ * 	nl_dump(params, "foo %d ", my_obj->foo);
+ *
+ * // One of the big advantages of this concept is that it allows for
+ * // standardized comparisons which make it trivial for caches to
+ * // identify unique objects by use of unified comparison functions.
+ * // In order for it to work, your object implementation must provide
+ * // a comparison function and define a list of attributes which
+ * // combined together make an object unique.
+ *
+ * static int my_obj_compare(struct nl_object *_a, struct nl_object *_b,
+ * 			     uint32_t attrs, int flags)
+ * {
+ * 	struct my_obj *a = nl_object_priv(_a):
+ * 	struct my_obj *b = nl_object_priv(_b):
+ * 	int diff = 0;
+ *
+ * 	// We help ourselves in defining our own DIFF macro which will
+ *	// call ATTR_DIFF() on both objects which will make sure to only
+ *	// compare the attributes if required.
+ * 	#define MY_DIFF(ATTR, EXPR) ATTR_DIFF(attrs, MY_ATTR_##ATTR, a, b, EXPR)
+ *
+ * 	// Call our own diff macro for each attribute to build a bitmask
+ *	// representing the attributes which mismatch.
+ * 	diff |= MY_DIFF(FOO, a->foo != b->foo)
+ * 	diff |= MY_DIFF(BAR, strcmp(a->bar, b->bar))
+ *
+ * 	return diff;
+ * }
+ *
+ * // In order to identify identical objects with differing attributes
+ * // you must specify the attributes required to uniquely identify
+ * // your object. Make sure to not include too many attributes, this
+ * // list is used when caches look for an old version of an object.
+ * struct nl_object_ops my_ops = {
+ * 	...
+ * 	.oo_id_attrs		= MY_ATTR_FOO,
+ * 	.oo_compare		= my_obj_compare,
+ * };
+ * @endcode
+ * @{
+ */
+
+/**
+ * Common Object Header
+ *
+ * This macro must be included as first member in every object
+ * definition to allow objects to be cached.
+ */
+#define NLHDR_COMMON				\
+	int			ce_refcnt;	\
+	struct nl_object_ops *	ce_ops;		\
+	struct nl_cache *	ce_cache;	\
+	struct nl_list_head	ce_list;	\
+	int			ce_msgtype;	\
+	int			ce_flags;	\
+	uint32_t		ce_mask;
+
+/**
+ * Return true if attribute is available in both objects
+ * @arg A		an object
+ * @arg B		another object
+ * @arg ATTR		attribute bit
+ *
+ * @return True if the attribute is available, otherwise false is returned.
+ */
+#define AVAILABLE(A, B, ATTR)	(((A)->ce_mask & (B)->ce_mask) & (ATTR))
+
+/**
+ * Return true if attributes mismatch
+ * @arg A		an object
+ * @arg B		another object
+ * @arg ATTR		attribute bit
+ * @arg EXPR		Comparison expression
+ *
+ * This function will check if the attribute in question is available
+ * in both objects, if not this will count as a mismatch.
+ *
+ * If available the function will execute the expression which must
+ * return true if the attributes mismatch.
+ *
+ * @return True if the attribute mismatch, or false if they match.
+ */
+#define ATTR_MISMATCH(A, B, ATTR, EXPR)	(!AVAILABLE(A, B, ATTR) || (EXPR))
+
+/**
+ * Return attribute bit if attribute does not match
+ * @arg LIST		list of attributes to be compared
+ * @arg ATTR		attribute bit
+ * @arg A		an object
+ * @arg B		another object
+ * @arg EXPR		Comparison expression
+ *
+ * This function will check if the attribute in question is available
+ * in both objects, if not this will count as a mismatch.
+ *
+ * If available the function will execute the expression which must
+ * return true if the attributes mismatch.
+ *
+ * In case the attributes mismatch, the attribute is returned, otherwise
+ * 0 is returned.
+ *
+ * @code
+ * diff |= ATTR_DIFF(attrs, MY_ATTR_FOO, a, b, a->foo != b->foo);
+ * @endcode
+ */
+#define ATTR_DIFF(LIST, ATTR, A, B, EXPR) \
+({	int diff = 0; \
+	if (((LIST) & (ATTR)) && ATTR_MISMATCH(A, B, ATTR, EXPR)) \
+		diff = ATTR; \
+	diff; })
+
+/**
+ * Object Operations
+ */
+struct nl_object;
+struct nl_object_ops
+{
+	/**
+	 * Unique name of object type
+	 *
+	 * Must be in the form family/name, e.g. "route/addr"
+	 */
+	char *		oo_name;
+
+	/** Size of object including its header */
+	size_t		oo_size;
+
+	/* List of attributes needed to uniquely identify the object */
+	uint32_t	oo_id_attrs;
+
+	/**
+	 * Constructor function
+	 *
+	 * Will be called when a new object of this type is allocated.
+	 * Can be used to initialize members such as lists etc.
+	 */
+	void  (*oo_constructor)(struct nl_object *);
+
+	/**
+	 * Destructor function
+	 *
+	 * Will be called when an object is freed. Must free all
+	 * resources which may have been allocated as part of this
+	 * object.
+	 */
+	void  (*oo_free_data)(struct nl_object *);
+
+	/**
+	 * Cloning function
+	 *
+	 * Will be called when an object needs to be cloned. Please
+	 * note that the generic object code will make an exact
+	 * copy of the object first, therefore you only need to take
+	 * care of members which require reference counting etc.
+	 *
+	 * May return a negative error code to abort cloning.
+	 */
+	int  (*oo_clone)(struct nl_object *, struct nl_object *);
+
+	/**
+	 * Dumping functions
+	 *
+	 * Will be called when an object is dumped. The implementations
+	 * have to use nl_dump(), nl_dump_line(), and nl_new_line() to
+	 * dump objects.
+	 *
+	 * The functions must return the number of lines printed.
+	 */
+	void (*oo_dump[NL_DUMP_MAX+1])(struct nl_object *,
+				       struct nl_dump_params *);
+
+	/**
+	 * Comparison function
+	 *
+	 * Will be called when two objects of the same type are
+	 * compared. It takes the two objects in question, an object
+	 * specific bitmask defining which attributes should be
+	 * compared and flags to control the behaviour.
+	 *
+	 * The function must return a bitmask with the relevant bit
+	 * set for each attribute that mismatches.
+	 */
+	int   (*oo_compare)(struct nl_object *, struct nl_object *,
+			    uint32_t, int);
+
+
+	char *(*oo_attrs2str)(int, char *, size_t);
+};
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/object.h b/trunk/package/libs/libnl-tiny/src/include/netlink/object.h
new file mode 100644
index 00000000..8aabe7bb
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/object.h
@@ -0,0 +1,164 @@
+/*
+ * netlink/object.c	Generic Cacheable Object
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_OBJECT_H_
+#define NETLINK_OBJECT_H_
+
+#include <netlink/netlink.h>
+#include <netlink/utils.h>
+#include <netlink/object-api.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define NL_OBJ_MARK		1
+
+struct nl_cache;
+struct nl_object;
+struct nl_object_ops;
+
+struct nl_object
+{
+	NLHDR_COMMON
+};
+
+#define OBJ_CAST(ptr)		((struct nl_object *) (ptr))
+
+/* General */
+extern struct nl_object *	nl_object_alloc(struct nl_object_ops *);
+extern void			nl_object_free(struct nl_object *);
+extern struct nl_object *	nl_object_clone(struct nl_object *obj);
+
+#ifdef disabled
+
+extern int			nl_object_alloc_name(const char *,
+						     struct nl_object **);
+extern void			nl_object_dump(struct nl_object *,
+					       struct nl_dump_params *);
+
+extern uint32_t			nl_object_diff(struct nl_object *,
+					       struct nl_object *);
+extern int			nl_object_match_filter(struct nl_object *,
+						       struct nl_object *);
+extern int			nl_object_identical(struct nl_object *,
+						    struct nl_object *);
+extern char *			nl_object_attrs2str(struct nl_object *,
+						    uint32_t attrs, char *buf,
+						    size_t);
+#endif
+/**
+ * Check whether this object is used by multiple users
+ * @arg obj		object to check
+ * @return true or false
+ */
+static inline int nl_object_shared(struct nl_object *obj)
+{
+	return obj->ce_refcnt > 1;
+}
+
+
+static inline void nl_object_get(struct nl_object *obj)
+{
+	obj->ce_refcnt++;
+}
+
+static inline void nl_object_put(struct nl_object *obj)
+{
+	if (!obj)
+		return;
+
+	obj->ce_refcnt--;
+
+	if (obj->ce_refcnt <= 0)
+		nl_object_free(obj);
+}
+
+
+/**
+ * @name Marks
+ * @{
+ */
+
+/**
+ * Add mark to object
+ * @arg obj		Object to mark
+ */
+static inline void nl_object_mark(struct nl_object *obj)
+{
+	obj->ce_flags |= NL_OBJ_MARK;
+}
+
+/**
+ * Remove mark from object
+ * @arg obj		Object to unmark
+ */
+static inline void nl_object_unmark(struct nl_object *obj)
+{
+	obj->ce_flags &= ~NL_OBJ_MARK;
+}
+
+/**
+ * Return true if object is marked
+ * @arg obj		Object to check
+ * @return true if object is marked, otherwise false
+ */
+static inline int nl_object_is_marked(struct nl_object *obj)
+{
+	return (obj->ce_flags & NL_OBJ_MARK);
+}
+
+/** @} */
+
+#ifdef disabled
+/**
+ * Return list of attributes present in an object
+ * @arg obj		an object
+ * @arg buf		destination buffer
+ * @arg len		length of destination buffer
+ *
+ * @return destination buffer.
+ */
+static inline char *nl_object_attr_list(struct nl_object *obj, char *buf, size_t len)
+{
+	return nl_object_attrs2str(obj, obj->ce_mask, buf, len);
+}
+#endif
+
+/**
+ * @name Attributes
+ * @{
+ */
+
+static inline int nl_object_get_refcnt(struct nl_object *obj)
+{
+	return obj->ce_refcnt;
+}
+
+static inline struct nl_cache *nl_object_get_cache(struct nl_object *obj)
+{
+	return obj->ce_cache;
+}
+
+static inline void *		nl_object_priv(struct nl_object *obj)
+{
+	return obj;
+}
+
+
+/** @} */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/socket.h b/trunk/package/libs/libnl-tiny/src/include/netlink/socket.h
new file mode 100644
index 00000000..9f7f4220
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/socket.h
@@ -0,0 +1,221 @@
+/*
+ * netlink/socket.h		Netlink Socket
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_SOCKET_H_
+#define NETLINK_SOCKET_H_
+
+#include <netlink/types.h>
+#include <netlink/handlers.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define NL_SOCK_BUFSIZE_SET	(1<<0)
+#define NL_SOCK_PASSCRED	(1<<1)
+#define NL_OWN_PORT		(1<<2)
+#define NL_MSG_PEEK		(1<<3)
+#define NL_NO_AUTO_ACK		(1<<4)
+
+struct nl_cb;
+struct nl_sock
+{
+	struct sockaddr_nl	s_local;
+	struct sockaddr_nl	s_peer;
+	int			s_fd;
+	int			s_proto;
+	unsigned int		s_seq_next;
+	unsigned int		s_seq_expect;
+	int			s_flags;
+	struct nl_cb *		s_cb;
+};
+
+
+extern struct nl_sock *	nl_socket_alloc(void);
+extern struct nl_sock *	nl_socket_alloc_cb(struct nl_cb *);
+extern void		nl_socket_free(struct nl_sock *);
+
+extern void		nl_socket_set_local_port(struct nl_sock *, uint32_t);
+
+extern int		nl_socket_add_memberships(struct nl_sock *, int, ...);
+extern int		nl_socket_drop_memberships(struct nl_sock *, int, ...);
+
+extern int		nl_socket_set_buffer_size(struct nl_sock *, int, int);
+extern int		nl_socket_set_passcred(struct nl_sock *, int);
+extern int		nl_socket_recv_pktinfo(struct nl_sock *, int);
+
+extern void		nl_socket_disable_seq_check(struct nl_sock *);
+
+extern int		nl_socket_set_nonblocking(struct nl_sock *);
+
+/**
+ * Use next sequence number
+ * @arg sk		Netlink socket.
+ *
+ * Uses the next available sequence number and increases the counter
+ * by one for subsequent calls.
+ *
+ * @return Unique serial sequence number
+ */
+static inline unsigned int nl_socket_use_seq(struct nl_sock *sk)
+{
+	return sk->s_seq_next++;
+}
+
+/**
+ * Disable automatic request for ACK
+ * @arg sk		Netlink socket.
+ *
+ * The default behaviour of a socket is to request an ACK for
+ * each message sent to allow for the caller to synchronize to
+ * the completion of the netlink operation. This function
+ * disables this behaviour and will result in requests being
+ * sent which will not have the NLM_F_ACK flag set automatically.
+ * However, it is still possible for the caller to set the
+ * NLM_F_ACK flag explicitely.
+ */
+static inline void nl_socket_disable_auto_ack(struct nl_sock *sk)
+{
+	sk->s_flags |= NL_NO_AUTO_ACK;
+}
+
+/**
+ * Enable automatic request for ACK (default)
+ * @arg sk		Netlink socket.
+ * @see nl_socket_disable_auto_ack
+ */
+static inline void nl_socket_enable_auto_ack(struct nl_sock *sk)
+{
+	sk->s_flags &= ~NL_NO_AUTO_ACK;
+}
+
+/**
+ * @name Source Idenficiation
+ * @{
+ */
+
+static inline uint32_t nl_socket_get_local_port(struct nl_sock *sk)
+{
+	return sk->s_local.nl_pid;
+}
+
+/**
+ * Join multicast groups (deprecated)
+ * @arg sk		Netlink socket.
+ * @arg groups		Bitmask of groups to join.
+ *
+ * This function defines the old way of joining multicast group which
+ * has to be done prior to calling nl_connect(). It works on any kernel
+ * version but is very limited as only 32 groups can be joined.
+ */
+static inline void nl_join_groups(struct nl_sock *sk, int groups)
+{
+	sk->s_local.nl_groups |= groups;
+}
+
+/**
+ * @name Peer Identfication
+ * @{
+ */
+
+static inline uint32_t nl_socket_get_peer_port(struct nl_sock *sk)
+{
+	return sk->s_peer.nl_pid;
+}
+
+static inline void nl_socket_set_peer_port(struct nl_sock *sk, uint32_t port)
+{
+	sk->s_peer.nl_pid = port;
+}
+
+/** @} */
+
+/**
+ * @name File Descriptor
+ * @{
+ */
+
+static inline int nl_socket_get_fd(struct nl_sock *sk)
+{
+	return sk->s_fd;
+}
+
+/**
+ * Enable use of MSG_PEEK when reading from socket
+ * @arg sk		Netlink socket.
+ */
+static inline void nl_socket_enable_msg_peek(struct nl_sock *sk)
+{
+	sk->s_flags |= NL_MSG_PEEK;
+}
+
+/**
+ * Disable use of MSG_PEEK when reading from socket
+ * @arg sk		Netlink socket.
+ */
+static inline void nl_socket_disable_msg_peek(struct nl_sock *sk)
+{
+	sk->s_flags &= ~NL_MSG_PEEK;
+}
+
+/**
+ * @name Callback Handler
+ * @{
+ */
+
+static inline struct nl_cb *nl_socket_get_cb(struct nl_sock *sk)
+{
+	return nl_cb_get(sk->s_cb);
+}
+
+static inline void nl_socket_set_cb(struct nl_sock *sk, struct nl_cb *cb)
+{
+	nl_cb_put(sk->s_cb);
+	sk->s_cb = nl_cb_get(cb);
+}
+
+/**
+ * Modify the callback handler associated to the socket
+ * @arg sk		Netlink socket.
+ * @arg type		which type callback to set
+ * @arg kind		kind of callback
+ * @arg func		callback function
+ * @arg arg		argument to be passwd to callback function
+ *
+ * @see nl_cb_set
+ */
+static inline int nl_socket_modify_cb(struct nl_sock *sk, enum nl_cb_type type,
+			enum nl_cb_kind kind, nl_recvmsg_msg_cb_t func,
+			void *arg)
+{
+	return nl_cb_set(sk->s_cb, type, kind, func, arg);
+}
+
+/** @} */
+
+static inline int nl_socket_add_membership(struct nl_sock *sk, int group)
+{
+	return nl_socket_add_memberships(sk, group, 0);
+}
+
+
+static inline int nl_socket_drop_membership(struct nl_sock *sk, int group)
+{
+	return nl_socket_drop_memberships(sk, group, 0);
+}
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/types.h b/trunk/package/libs/libnl-tiny/src/include/netlink/types.h
new file mode 100644
index 00000000..de81ace1
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/types.h
@@ -0,0 +1,121 @@
+/*
+ * netlink/netlink-types.h	Netlink Types
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef __NETLINK_TYPES_H_
+#define __NETLINK_TYPES_H_
+
+#include <stdio.h>
+
+/**
+ * Dumping types (dp_type)
+ * @ingroup utils
+ */
+enum nl_dump_type {
+	NL_DUMP_LINE,		/**< Dump object briefly on one line */
+	NL_DUMP_DETAILS,	/**< Dump all attributes but no statistics */
+	NL_DUMP_STATS,		/**< Dump all attributes including statistics */
+	NL_DUMP_ENV,		/**< Dump all attribtues as env variables */
+	__NL_DUMP_MAX,
+};
+#define NL_DUMP_MAX (__NL_DUMP_MAX - 1)
+
+/**
+ * Dumping parameters
+ * @ingroup utils
+ */
+struct nl_dump_params
+{
+	/**
+	 * Specifies the type of dump that is requested.
+	 */
+	enum nl_dump_type	dp_type;
+
+	/**
+	 * Specifies the number of whitespaces to be put in front
+	 * of every new line (indentation).
+	 */
+	int			dp_prefix;
+
+	/**
+	 * Causes the cache index to be printed for each element.
+	 */
+	int			dp_print_index;
+
+	/**
+	 * Causes each element to be prefixed with the message type.
+	 */
+	int			dp_dump_msgtype;
+
+	/**
+	 * A callback invoked for output
+	 *
+	 * Passed arguments are:
+	 *  - dumping parameters
+	 *  - string to append to the output
+	 */
+	void			(*dp_cb)(struct nl_dump_params *, char *);
+
+	/**
+	 * A callback invoked for every new line, can be used to
+	 * customize the indentation.
+	 *
+	 * Passed arguments are:
+	 *  - dumping parameters
+	 *  - line number starting from 0
+	 */
+	void			(*dp_nl_cb)(struct nl_dump_params *, int);
+
+	/**
+	 * User data pointer, can be used to pass data to callbacks.
+	 */
+	void			*dp_data;
+
+	/**
+	 * File descriptor the dumping output should go to
+	 */
+	FILE *			dp_fd;
+
+	/**
+	 * Alternatively the output may be redirected into a buffer
+	 */
+	char *			dp_buf;
+
+	/**
+	 * Length of the buffer dp_buf
+	 */
+	size_t			dp_buflen;
+
+	/**
+	 * PRIVATE
+	 * Set if a dump was performed prior to the actual dump handler.
+	 */
+	int			dp_pre_dump;
+
+	/**
+	 * PRIVATE
+	 * Owned by the current caller
+	 */
+	int			dp_ivar;
+
+	unsigned int		dp_line;
+};
+
+#ifndef __GNUC__
+#define __extension__
+#endif
+
+#define min_t(type,x,y) \
+	__extension__({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
+#define max_t(type,x,y) \
+	__extension__({ type __x = (x); type __y = (y); __x > __y ? __x: __y; })
+
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/utils.h b/trunk/package/libs/libnl-tiny/src/include/netlink/utils.h
new file mode 100644
index 00000000..480bab61
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/utils.h
@@ -0,0 +1,78 @@
+/*
+ * netlink/utils.h		Utility Functions
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_UTILS_H_
+#define NETLINK_UTILS_H_
+
+#include <netlink/netlink.h>
+#include <netlink/list.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @name Probability Constants
+ * @{
+ */
+
+/**
+ * Lower probability limit
+ * @ingroup utils
+ */
+#define NL_PROB_MIN 0x0
+
+/**
+ * Upper probability limit
+ * @ingroup utils
+ */
+#define NL_PROB_MAX 0xffffffff
+
+/** @} */
+
+/* unit pretty-printing */
+extern double	nl_cancel_down_bytes(unsigned long long, char **);
+extern double	nl_cancel_down_bits(unsigned long long, char **);
+extern double	nl_cancel_down_us(uint32_t, char **);
+
+/* generic unit translations */
+extern long	nl_size2int(const char *);
+extern long	nl_prob2int(const char *);
+
+/* time translations */
+extern int	nl_get_hz(void);
+extern uint32_t	nl_us2ticks(uint32_t);
+extern uint32_t	nl_ticks2us(uint32_t);
+extern int	nl_str2msec(const char *, uint64_t *);
+extern char *	nl_msec2str(uint64_t, char *, size_t);
+
+/* link layer protocol translations */
+extern char *	nl_llproto2str(int, char *, size_t);
+extern int	nl_str2llproto(const char *);
+
+/* ethernet protocol translations */
+extern char *	nl_ether_proto2str(int, char *, size_t);
+extern int	nl_str2ether_proto(const char *);
+
+/* IP protocol translations */
+extern char *	nl_ip_proto2str(int, char *, size_t);
+extern int	nl_str2ip_proto(const char *);
+
+/* Dumping helpers */
+extern void	nl_new_line(struct nl_dump_params *);
+extern void	nl_dump(struct nl_dump_params *, const char *, ...);
+extern void	nl_dump_line(struct nl_dump_params *, const char *, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/netlink/version.h b/trunk/package/libs/libnl-tiny/src/include/netlink/version.h
new file mode 100644
index 00000000..6a316d49
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/netlink/version.h
@@ -0,0 +1,18 @@
+/*
+ * netlink/version.h	Compile Time Versioning Information
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef NETLINK_VERSION_H_
+#define NETLINK_VERSION_H_
+
+#define LIBNL_STRING "libnl"
+#define LIBNL_VERSION "2.0"
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/include/unl.h b/trunk/package/libs/libnl-tiny/src/include/unl.h
new file mode 100644
index 00000000..4fe7dc74
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/include/unl.h
@@ -0,0 +1,47 @@
+#ifndef __UNL_H
+#define __UNL_H
+
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
+#include <stdbool.h>
+
+struct unl {
+	struct nl_sock *sock;
+	struct nl_cache *cache;
+	struct genl_family *family;
+	char *family_name;
+	int hdrlen;
+	bool loop_done;
+};
+
+int unl_genl_init(struct unl *unl, const char *family);
+void unl_free(struct unl *unl);
+
+typedef int (*unl_cb)(struct nl_msg *, void *);
+
+struct nl_msg *unl_genl_msg(struct unl *unl, int cmd, bool dump);
+int unl_genl_request(struct unl *unl, struct nl_msg *msg, unl_cb handler, void *arg);
+int unl_genl_request_single(struct unl *unl, struct nl_msg *msg, struct nl_msg **dest);
+void unl_genl_loop(struct unl *unl, unl_cb handler, void *arg);
+
+int unl_genl_multicast_id(struct unl *unl, const char *name);
+int unl_genl_subscribe(struct unl *unl, const char *name);
+int unl_genl_unsubscribe(struct unl *unl, const char *name);
+
+int unl_nl80211_phy_lookup(const char *name);
+int unl_nl80211_wdev_to_phy(struct unl *unl, int wdev);
+struct nl_msg *unl_nl80211_phy_msg(struct unl *unl, int phy, int cmd, bool dump);
+struct nl_msg *unl_nl80211_vif_msg(struct unl *unl, int dev, int cmd, bool dump);
+
+static inline void unl_loop_done(struct unl *unl)
+{
+	unl->loop_done = true;
+}
+
+static inline struct nlattr *unl_find_attr(struct unl *unl, struct nl_msg *msg, int attr)
+{
+	return nlmsg_find_attr(nlmsg_hdr(msg), unl->hdrlen, attr);
+}
+
+#endif
diff --git a/trunk/package/libs/libnl-tiny/src/msg.c b/trunk/package/libs/libnl-tiny/src/msg.c
new file mode 100644
index 00000000..e84c281f
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/msg.c
@@ -0,0 +1,566 @@
+/*
+ * lib/msg.c		Netlink Messages Interface
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup core
+ * @defgroup msg Messages
+ * Netlink Message Construction/Parsing Interface
+ * 
+ * The following information is partly extracted from RFC3549
+ * (ftp://ftp.rfc-editor.org/in-notes/rfc3549.txt)
+ *
+ * @par Message Format
+ * Netlink messages consist of a byte stream with one or multiple
+ * Netlink headers and an associated payload.  If the payload is too big
+ * to fit into a single message it, can be split over multiple Netlink
+ * messages, collectively called a multipart message.  For multipart
+ * messages, the first and all following headers have the \c NLM_F_MULTI
+ * Netlink header flag set, except for the last header which has the
+ * Netlink header type \c NLMSG_DONE.
+ *
+ * @par
+ * The Netlink message header (\link nlmsghdr struct nlmsghdr\endlink) is shown below.
+ * @code   
+ * 0                   1                   2                   3
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                          Length                             |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |            Type              |           Flags              |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                      Sequence Number                        |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                      Process ID (PID)                       |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * @endcode
+ *
+ * @par
+ * The netlink message header and payload must be aligned properly:
+ * @code
+ *  <------- NLMSG_ALIGN(hlen) ------> <---- NLMSG_ALIGN(len) --->
+ * +----------------------------+- - -+- - - - - - - - - - -+- - -+
+ * |           Header           | Pad |       Payload       | Pad |
+ * |      struct nlmsghdr       |     |                     |     |
+ * +----------------------------+- - -+- - - - - - - - - - -+- - -+
+ * @endcode
+ * @par
+ * Message Format:
+ * @code
+ *    <--- nlmsg_total_size(payload)  --->
+ *    <-- nlmsg_msg_size(payload) ->
+ *   +----------+- - -+-------------+- - -+-------- - -
+ *   | nlmsghdr | Pad |   Payload   | Pad | nlmsghdr
+ *   +----------+- - -+-------------+- - -+-------- - -
+ *   nlmsg_data(nlh)---^                   ^
+ *   nlmsg_next(nlh)-----------------------+
+ * @endcode
+ * @par
+ * The payload may consist of arbitary data but may have strict
+ * alignment and formatting rules depening on the specific netlink
+ * families.
+ * @par
+ * @code
+ *    <---------------------- nlmsg_len(nlh) --------------------->
+ *    <------ hdrlen ------>       <- nlmsg_attrlen(nlh, hdrlen) ->
+ *   +----------------------+- - -+--------------------------------+
+ *   |     Family Header    | Pad |           Attributes           |
+ *   +----------------------+- - -+--------------------------------+
+ *   nlmsg_attrdata(nlh, hdrlen)---^
+ * @endcode
+ * @par The ACK Netlink Message
+ * This message is actually used to denote both an ACK and a NACK.
+ * Typically, the direction is from FEC to CPC (in response to an ACK
+ * request message).  However, the CPC should be able to send ACKs back
+ * to FEC when requested.
+ * @code
+ *  0                   1                   2                   3
+ *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                       Netlink message header                  |
+ * |                       type = NLMSG_ERROR                      |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                          Error code                           |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                       OLD Netlink message header              |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * @endcode
+ *
+ * @par Example
+ * @code
+ * // Various methods exist to create/allocate a new netlink
+ * // message. 
+ * //
+ * // nlmsg_alloc() will allocate an empty netlink message with
+ * // a maximum payload size which defaults to the page size of
+ * // the system. This default size can be modified using the
+ * // function nlmsg_set_default_size().
+ * struct nl_msg *msg = nlmsg_alloc();
+ *
+ * // Very often, the message type and message flags are known
+ * // at allocation time while the other fields are auto generated:
+ * struct nl_msg *msg = nlmsg_alloc_simple(MY_TYPE, MY_FLAGS);
+ *
+ * // Alternatively an existing netlink message header can be used
+ * // to inherit the header values:
+ * struct nlmsghdr hdr = {
+ * 	.nlmsg_type = MY_TYPE,
+ * 	.nlmsg_flags = MY_FLAGS,
+ * };
+ * struct nl_msg *msg = nlmsg_inherit(&hdr);
+ *
+ * // Last but not least, netlink messages received from netlink sockets
+ * // can be converted into nl_msg objects using nlmsg_convert(). This
+ * // will create a message with a maximum payload size which equals the
+ * // length of the existing netlink message, therefore no more data can
+ * // be appened without calling nlmsg_expand() first.
+ * struct nl_msg *msg = nlmsg_convert(nlh_from_nl_sock);
+ *
+ * // Payload may be added to the message via nlmsg_append(). The fourth
+ * // parameter specifies the number of alignment bytes the data should
+ * // be padding with at the end. Common values are 0 to disable it or
+ * // NLMSG_ALIGNTO to ensure proper netlink message padding.
+ * nlmsg_append(msg, &mydata, sizeof(mydata), 0);
+ *
+ * // Sometimes it may be necessary to reserve room for data but defer
+ * // the actual copying to a later point, nlmsg_reserve() can be used
+ * // for this purpose:
+ * void *data = nlmsg_reserve(msg, sizeof(mydata), NLMSG_ALIGNTO);
+ *
+ * // Attributes may be added using the attributes interface.
+ *
+ * // After successful use of the message, the memory must be freed
+ * // using nlmsg_free()
+ * nlmsg_free(msg);
+ * @endcode
+ * 
+ * @par 4) Parsing messages
+ * @code
+ * int n;
+ * unsigned char *buf;
+ * struct nlmsghdr *hdr;
+ *
+ * n = nl_recv(handle, NULL, &buf);
+ * 
+ * hdr = (struct nlmsghdr *) buf;
+ * while (nlmsg_ok(hdr, n)) {
+ * 	// Process message here...
+ * 	hdr = nlmsg_next(hdr, &n);
+ * }
+ * @endcode
+ * @{
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/utils.h>
+#include <netlink/cache.h>
+#include <netlink/attr.h>
+#include <netlink/msg.h>
+#include <linux/socket.h>
+
+static size_t default_msg_size;
+
+static void __init init_msg_size(void)
+{
+	default_msg_size = getpagesize();
+}
+
+/**
+ * @name Attribute Access
+ * @{
+ */
+
+//** @} */
+
+/**
+ * @name Message Parsing
+ * @{
+ */
+
+/**
+ * check if the netlink message fits into the remaining bytes
+ * @arg nlh		netlink message header
+ * @arg remaining	number of bytes remaining in message stream
+ */
+int nlmsg_ok(const struct nlmsghdr *nlh, int remaining)
+{
+	return (remaining >= sizeof(struct nlmsghdr) &&
+		nlh->nlmsg_len >= sizeof(struct nlmsghdr) &&
+		nlh->nlmsg_len <= remaining);
+}
+
+/**
+ * next netlink message in message stream
+ * @arg nlh		netlink message header
+ * @arg remaining	number of bytes remaining in message stream
+ *
+ * @returns the next netlink message in the message stream and
+ * decrements remaining by the size of the current message.
+ */
+struct nlmsghdr *nlmsg_next(struct nlmsghdr *nlh, int *remaining)
+{
+	int totlen = NLMSG_ALIGN(nlh->nlmsg_len);
+
+	*remaining -= totlen;
+
+	return (struct nlmsghdr *) ((unsigned char *) nlh + totlen);
+}
+
+/**
+ * parse attributes of a netlink message
+ * @arg nlh		netlink message header
+ * @arg hdrlen		length of family specific header
+ * @arg tb		destination array with maxtype+1 elements
+ * @arg maxtype		maximum attribute type to be expected
+ * @arg policy		validation policy
+ *
+ * See nla_parse()
+ */
+int nlmsg_parse(struct nlmsghdr *nlh, int hdrlen, struct nlattr *tb[],
+		int maxtype, struct nla_policy *policy)
+{
+	if (!nlmsg_valid_hdr(nlh, hdrlen))
+		return -NLE_MSG_TOOSHORT;
+
+	return nla_parse(tb, maxtype, nlmsg_attrdata(nlh, hdrlen),
+			 nlmsg_attrlen(nlh, hdrlen), policy);
+}
+
+/**
+ * nlmsg_validate - validate a netlink message including attributes
+ * @arg nlh		netlinket message header
+ * @arg hdrlen		length of familiy specific header
+ * @arg maxtype		maximum attribute type to be expected
+ * @arg policy		validation policy
+ */
+int nlmsg_validate(struct nlmsghdr *nlh, int hdrlen, int maxtype,
+		   struct nla_policy *policy)
+{
+	if (!nlmsg_valid_hdr(nlh, hdrlen))
+		return -NLE_MSG_TOOSHORT;
+
+	return nla_validate(nlmsg_attrdata(nlh, hdrlen),
+			    nlmsg_attrlen(nlh, hdrlen), maxtype, policy);
+}
+
+/** @} */
+
+/**
+ * @name Message Building/Access
+ * @{
+ */
+
+static struct nl_msg *__nlmsg_alloc(size_t len)
+{
+	struct nl_msg *nm;
+
+	nm = calloc(1, sizeof(*nm));
+	if (!nm)
+		goto errout;
+
+	nm->nm_refcnt = 1;
+
+	nm->nm_nlh = malloc(len);
+	if (!nm->nm_nlh)
+		goto errout;
+
+	memset(nm->nm_nlh, 0, sizeof(struct nlmsghdr));
+
+	nm->nm_protocol = -1;
+	nm->nm_size = len;
+	nm->nm_nlh->nlmsg_len = nlmsg_total_size(0);
+
+	NL_DBG(2, "msg %p: Allocated new message, maxlen=%zu\n", nm, len);
+
+	return nm;
+errout:
+	free(nm);
+	return NULL;
+}
+
+/**
+ * Allocate a new netlink message with the default maximum payload size.
+ *
+ * Allocates a new netlink message without any further payload. The
+ * maximum payload size defaults to PAGESIZE or as otherwise specified
+ * with nlmsg_set_default_size().
+ *
+ * @return Newly allocated netlink message or NULL.
+ */
+struct nl_msg *nlmsg_alloc(void)
+{
+	return __nlmsg_alloc(default_msg_size);
+}
+
+/**
+ * Allocate a new netlink message with maximum payload size specified.
+ */
+struct nl_msg *nlmsg_alloc_size(size_t max)
+{
+	return __nlmsg_alloc(max);
+}
+
+/**
+ * Allocate a new netlink message and inherit netlink message header
+ * @arg hdr		Netlink message header template
+ *
+ * Allocates a new netlink message and inherits the original message
+ * header. If \a hdr is not NULL it will be used as a template for
+ * the netlink message header, otherwise the header is left blank.
+ * 
+ * @return Newly allocated netlink message or NULL
+ */
+struct nl_msg *nlmsg_inherit(struct nlmsghdr *hdr)
+{
+	struct nl_msg *nm;
+
+	nm = nlmsg_alloc();
+	if (nm && hdr) {
+		struct nlmsghdr *new = nm->nm_nlh;
+
+		new->nlmsg_type = hdr->nlmsg_type;
+		new->nlmsg_flags = hdr->nlmsg_flags;
+		new->nlmsg_seq = hdr->nlmsg_seq;
+		new->nlmsg_pid = hdr->nlmsg_pid;
+	}
+
+	return nm;
+}
+
+/**
+ * Allocate a new netlink message
+ * @arg nlmsgtype	Netlink message type
+ * @arg flags		Message flags.
+ *
+ * @return Newly allocated netlink message or NULL.
+ */
+struct nl_msg *nlmsg_alloc_simple(int nlmsgtype, int flags)
+{
+	struct nl_msg *msg;
+	struct nlmsghdr nlh = {
+		.nlmsg_type = nlmsgtype,
+		.nlmsg_flags = flags,
+	};
+
+	msg = nlmsg_inherit(&nlh);
+	if (msg)
+		NL_DBG(2, "msg %p: Allocated new simple message\n", msg);
+
+	return msg;
+}
+
+/**
+ * Set the default maximum message payload size for allocated messages
+ * @arg max		Size of payload in bytes.
+ */
+void nlmsg_set_default_size(size_t max)
+{
+	if (max < nlmsg_total_size(0))
+		max = nlmsg_total_size(0);
+
+	default_msg_size = max;
+}
+
+/**
+ * Convert a netlink message received from a netlink socket to a nl_msg
+ * @arg hdr		Netlink message received from netlink socket.
+ *
+ * Allocates a new netlink message and copies all of the data pointed to
+ * by \a hdr into the new message object.
+ *
+ * @return Newly allocated netlink message or NULL.
+ */
+struct nl_msg *nlmsg_convert(struct nlmsghdr *hdr)
+{
+	struct nl_msg *nm;
+
+	nm = __nlmsg_alloc(NLMSG_ALIGN(hdr->nlmsg_len));
+	if (!nm)
+		goto errout;
+
+	memcpy(nm->nm_nlh, hdr, hdr->nlmsg_len);
+
+	return nm;
+errout:
+	nlmsg_free(nm);
+	return NULL;
+}
+
+/**
+ * Reserve room for additional data in a netlink message
+ * @arg n		netlink message
+ * @arg len		length of additional data to reserve room for
+ * @arg pad		number of bytes to align data to
+ *
+ * Reserves room for additional data at the tail of the an
+ * existing netlink message. Eventual padding required will
+ * be zeroed out.
+ *
+ * @return Pointer to start of additional data tailroom or NULL.
+ */
+void *nlmsg_reserve(struct nl_msg *n, size_t len, int pad)
+{
+	void *buf = n->nm_nlh;
+	size_t nlmsg_len = n->nm_nlh->nlmsg_len;
+	size_t tlen;
+
+	tlen = pad ? ((len + (pad - 1)) & ~(pad - 1)) : len;
+
+	if ((tlen + nlmsg_len) > n->nm_size)
+		return NULL;
+
+	buf += nlmsg_len;
+	n->nm_nlh->nlmsg_len += tlen;
+
+	if (tlen > len)
+		memset(buf + len, 0, tlen - len);
+
+	NL_DBG(2, "msg %p: Reserved %zu bytes, pad=%d, nlmsg_len=%d\n",
+		  n, len, pad, n->nm_nlh->nlmsg_len);
+
+	return buf;
+}
+
+/**
+ * Append data to tail of a netlink message
+ * @arg n		netlink message
+ * @arg data		data to add
+ * @arg len		length of data
+ * @arg pad		Number of bytes to align data to.
+ *
+ * Extends the netlink message as needed and appends the data of given
+ * length to the message. 
+ *
+ * @return 0 on success or a negative error code
+ */
+int nlmsg_append(struct nl_msg *n, void *data, size_t len, int pad)
+{
+	void *tmp;
+
+	tmp = nlmsg_reserve(n, len, pad);
+	if (tmp == NULL)
+		return -NLE_NOMEM;
+
+	memcpy(tmp, data, len);
+	NL_DBG(2, "msg %p: Appended %zu bytes with padding %d\n", n, len, pad);
+
+	return 0;
+}
+
+/**
+ * Add a netlink message header to a netlink message
+ * @arg n		netlink message
+ * @arg pid		netlink process id or NL_AUTO_PID
+ * @arg seq		sequence number of message or NL_AUTO_SEQ
+ * @arg type		message type
+ * @arg payload		length of message payload
+ * @arg flags		message flags
+ *
+ * Adds or overwrites the netlink message header in an existing message
+ * object. If \a payload is greater-than zero additional room will be
+ * reserved, f.e. for family specific headers. It can be accesed via
+ * nlmsg_data().
+ *
+ * @return A pointer to the netlink message header or NULL.
+ */
+struct nlmsghdr *nlmsg_put(struct nl_msg *n, uint32_t pid, uint32_t seq,
+			   int type, int payload, int flags)
+{
+	struct nlmsghdr *nlh;
+
+	if (n->nm_nlh->nlmsg_len < NLMSG_HDRLEN)
+		BUG();
+
+	nlh = (struct nlmsghdr *) n->nm_nlh;
+	nlh->nlmsg_type = type;
+	nlh->nlmsg_flags = flags;
+	nlh->nlmsg_pid = pid;
+	nlh->nlmsg_seq = seq;
+
+	NL_DBG(2, "msg %p: Added netlink header type=%d, flags=%d, pid=%d, "
+		  "seq=%d\n", n, type, flags, pid, seq);
+
+	if (payload > 0 &&
+	    nlmsg_reserve(n, payload, NLMSG_ALIGNTO) == NULL)
+		return NULL;
+
+	return nlh;
+}
+
+/**
+ * Release a reference from an netlink message
+ * @arg msg		message to release reference from
+ *
+ * Frees memory after the last reference has been released.
+ */
+void nlmsg_free(struct nl_msg *msg)
+{
+	if (!msg)
+		return;
+
+	msg->nm_refcnt--;
+	NL_DBG(4, "Returned message reference %p, %d remaining\n",
+	       msg, msg->nm_refcnt);
+
+	if (msg->nm_refcnt < 0)
+		BUG();
+
+	if (msg->nm_refcnt <= 0) {
+		free(msg->nm_nlh);
+		free(msg);
+		NL_DBG(2, "msg %p: Freed\n", msg);
+	}
+}
+
+/** @} */
+
+/**
+ * @name Direct Parsing
+ * @{
+ */
+
+/** @cond SKIP */
+struct dp_xdata {
+	void (*cb)(struct nl_object *, void *);
+	void *arg;
+};
+/** @endcond */
+
+static int parse_cb(struct nl_object *obj, struct nl_parser_param *p)
+{
+	struct dp_xdata *x = p->pp_arg;
+
+	x->cb(obj, x->arg);
+	return 0;
+}
+
+int nl_msg_parse(struct nl_msg *msg, void (*cb)(struct nl_object *, void *),
+		 void *arg)
+{
+	struct nl_cache_ops *ops;
+	struct nl_parser_param p = {
+		.pp_cb = parse_cb
+	};
+	struct dp_xdata x = {
+		.cb = cb,
+		.arg = arg,
+	};
+
+	ops = nl_cache_ops_associate(nlmsg_get_proto(msg),
+				     nlmsg_hdr(msg)->nlmsg_type);
+	if (ops == NULL)
+		return -NLE_MSGTYPE_NOSUPPORT;
+	p.pp_arg = &x;
+
+	return nl_cache_parse(ops, NULL, nlmsg_hdr(msg), &p);
+}
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/nl.c b/trunk/package/libs/libnl-tiny/src/nl.c
new file mode 100644
index 00000000..99e9aebe
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/nl.c
@@ -0,0 +1,720 @@
+/*
+ * lib/nl.c		Core Netlink Interface
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @defgroup core Core
+ *
+ * @details
+ * @par 1) Connecting the socket
+ * @code
+ * // Bind and connect the socket to a protocol, NETLINK_ROUTE in this example.
+ * nl_connect(sk, NETLINK_ROUTE);
+ * @endcode
+ *
+ * @par 2) Sending data
+ * @code
+ * // The most rudimentary method is to use nl_sendto() simply pushing
+ * // a piece of data to the other netlink peer. This method is not
+ * // recommended.
+ * const char buf[] = { 0x01, 0x02, 0x03, 0x04 };
+ * nl_sendto(sk, buf, sizeof(buf));
+ *
+ * // A more comfortable interface is nl_send() taking a pointer to
+ * // a netlink message.
+ * struct nl_msg *msg = my_msg_builder();
+ * nl_send(sk, nlmsg_hdr(msg));
+ *
+ * // nl_sendmsg() provides additional control over the sendmsg() message
+ * // header in order to allow more specific addressing of multiple peers etc.
+ * struct msghdr hdr = { ... };
+ * nl_sendmsg(sk, nlmsg_hdr(msg), &hdr);
+ *
+ * // You're probably too lazy to fill out the netlink pid, sequence number
+ * // and message flags all the time. nl_send_auto_complete() automatically
+ * // extends your message header as needed with an appropriate sequence
+ * // number, the netlink pid stored in the netlink socket and the message
+ * // flags NLM_F_REQUEST and NLM_F_ACK (if not disabled in the socket)
+ * nl_send_auto_complete(sk, nlmsg_hdr(msg));
+ *
+ * // Simple protocols don't require the complex message construction interface
+ * // and may favour nl_send_simple() to easly send a bunch of payload
+ * // encapsulated in a netlink message header.
+ * nl_send_simple(sk, MY_MSG_TYPE, 0, buf, sizeof(buf));
+ * @endcode
+ *
+ * @par 3) Receiving data
+ * @code
+ * // nl_recv() receives a single message allocating a buffer for the message
+ * // content and gives back the pointer to you.
+ * struct sockaddr_nl peer;
+ * unsigned char *msg;
+ * nl_recv(sk, &peer, &msg);
+ *
+ * // nl_recvmsgs() receives a bunch of messages until the callback system
+ * // orders it to state, usually after receving a compolete multi part
+ * // message series.
+ * nl_recvmsgs(sk, my_callback_configuration);
+ *
+ * // nl_recvmsgs_default() acts just like nl_recvmsg() but uses the callback
+ * // configuration stored in the socket.
+ * nl_recvmsgs_default(sk);
+ *
+ * // In case you want to wait for the ACK to be recieved that you requested
+ * // with your latest message, you can call nl_wait_for_ack()
+ * nl_wait_for_ack(sk);
+ * @endcode
+ *
+ * @par 4) Closing
+ * @code
+ * // Close the socket first to release kernel memory
+ * nl_close(sk);
+ * @endcode
+ * 
+ * @{
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/utils.h>
+#include <netlink/handlers.h>
+#include <netlink/msg.h>
+#include <netlink/attr.h>
+
+/**
+ * @name Connection Management
+ * @{
+ */
+
+/**
+ * Create and connect netlink socket.
+ * @arg sk		Netlink socket.
+ * @arg protocol	Netlink protocol to use.
+ *
+ * Creates a netlink socket using the specified protocol, binds the socket
+ * and issues a connection attempt.
+ *
+ * @return 0 on success or a negative error code.
+ */
+int nl_connect(struct nl_sock *sk, int protocol)
+{
+	int err;
+	socklen_t addrlen;
+
+	sk->s_fd = socket(AF_NETLINK, SOCK_RAW, protocol);
+	if (sk->s_fd < 0) {
+		err = -nl_syserr2nlerr(errno);
+		goto errout;
+	}
+
+	if (!(sk->s_flags & NL_SOCK_BUFSIZE_SET)) {
+		err = nl_socket_set_buffer_size(sk, 0, 0);
+		if (err < 0)
+			goto errout;
+	}
+
+	err = bind(sk->s_fd, (struct sockaddr*) &sk->s_local,
+		   sizeof(sk->s_local));
+	if (err < 0) {
+		err = -nl_syserr2nlerr(errno);
+		goto errout;
+	}
+
+	addrlen = sizeof(sk->s_local);
+	err = getsockname(sk->s_fd, (struct sockaddr *) &sk->s_local,
+			  &addrlen);
+	if (err < 0) {
+		err = -nl_syserr2nlerr(errno);
+		goto errout;
+	}
+
+	if (addrlen != sizeof(sk->s_local)) {
+		err = -NLE_NOADDR;
+		goto errout;
+	}
+
+	if (sk->s_local.nl_family != AF_NETLINK) {
+		err = -NLE_AF_NOSUPPORT;
+		goto errout;
+	}
+
+	sk->s_proto = protocol;
+
+	return 0;
+errout:
+	close(sk->s_fd);
+	sk->s_fd = -1;
+
+	return err;
+}
+
+/**
+ * Close/Disconnect netlink socket.
+ * @arg sk		Netlink socket.
+ */
+void nl_close(struct nl_sock *sk)
+{
+	if (sk->s_fd >= 0) {
+		close(sk->s_fd);
+		sk->s_fd = -1;
+	}
+
+	sk->s_proto = 0;
+}
+
+/** @} */
+
+/**
+ * @name Send
+ * @{
+ */
+
+/**
+ * Send raw data over netlink socket.
+ * @arg sk		Netlink socket.
+ * @arg buf		Data buffer.
+ * @arg size		Size of data buffer.
+ * @return Number of characters written on success or a negative error code.
+ */
+int nl_sendto(struct nl_sock *sk, void *buf, size_t size)
+{
+	int ret;
+
+	ret = sendto(sk->s_fd, buf, size, 0, (struct sockaddr *)
+		     &sk->s_peer, sizeof(sk->s_peer));
+	if (ret < 0)
+		return -nl_syserr2nlerr(errno);
+
+	return ret;
+}
+
+/**
+ * Send netlink message with control over sendmsg() message header.
+ * @arg sk		Netlink socket.
+ * @arg msg		Netlink message to be sent.
+ * @arg hdr		Sendmsg() message header.
+ * @return Number of characters sent on sucess or a negative error code.
+ */
+int nl_sendmsg(struct nl_sock *sk, struct nl_msg *msg, struct msghdr *hdr)
+{
+	struct nl_cb *cb;
+	int ret;
+
+	struct iovec iov = {
+		.iov_base = (void *) nlmsg_hdr(msg),
+		.iov_len = nlmsg_hdr(msg)->nlmsg_len,
+	};
+
+	hdr->msg_iov = &iov;
+	hdr->msg_iovlen = 1;
+
+	nlmsg_set_src(msg, &sk->s_local);
+
+	cb = sk->s_cb;
+	if (cb->cb_set[NL_CB_MSG_OUT])
+		if (nl_cb_call(cb, NL_CB_MSG_OUT, msg) != NL_OK)
+			return 0;
+
+	ret = sendmsg(sk->s_fd, hdr, 0);
+	if (ret < 0)
+		return -nl_syserr2nlerr(errno);
+
+	return ret;
+}
+
+
+/**
+ * Send netlink message.
+ * @arg sk		Netlink socket.
+ * @arg msg		Netlink message to be sent.
+ * @see nl_sendmsg()
+ * @return Number of characters sent on success or a negative error code.
+ */
+int nl_send(struct nl_sock *sk, struct nl_msg *msg)
+{
+	struct sockaddr_nl *dst;
+	struct ucred *creds;
+	
+	struct msghdr hdr = {
+		.msg_name = (void *) &sk->s_peer,
+		.msg_namelen = sizeof(struct sockaddr_nl),
+	};
+
+	/* Overwrite destination if specified in the message itself, defaults
+	 * to the peer address of the socket.
+	 */
+	dst = nlmsg_get_dst(msg);
+	if (dst->nl_family == AF_NETLINK)
+		hdr.msg_name = dst;
+
+	/* Add credentials if present. */
+	creds = nlmsg_get_creds(msg);
+	if (creds != NULL) {
+		char buf[CMSG_SPACE(sizeof(struct ucred))];
+		struct cmsghdr *cmsg;
+
+		hdr.msg_control = buf;
+		hdr.msg_controllen = sizeof(buf);
+
+		cmsg = CMSG_FIRSTHDR(&hdr);
+		cmsg->cmsg_level = SOL_SOCKET;
+		cmsg->cmsg_type = SCM_CREDENTIALS;
+		cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
+		memcpy(CMSG_DATA(cmsg), creds, sizeof(struct ucred));
+	}
+
+	return nl_sendmsg(sk, msg, &hdr);
+}
+
+/**
+ * Send netlink message and check & extend header values as needed.
+ * @arg sk		Netlink socket.
+ * @arg msg		Netlink message to be sent.
+ *
+ * Checks the netlink message \c nlh for completness and extends it
+ * as required before sending it out. Checked fields include pid,
+ * sequence nr, and flags.
+ *
+ * @see nl_send()
+ * @return Number of characters sent or a negative error code.
+ */
+int nl_send_auto_complete(struct nl_sock *sk, struct nl_msg *msg)
+{
+	struct nlmsghdr *nlh;
+	struct nl_cb *cb = sk->s_cb;
+
+	nlh = nlmsg_hdr(msg);
+	if (nlh->nlmsg_pid == 0)
+		nlh->nlmsg_pid = sk->s_local.nl_pid;
+
+	if (nlh->nlmsg_seq == 0)
+		nlh->nlmsg_seq = sk->s_seq_next++;
+
+	if (msg->nm_protocol == -1)
+		msg->nm_protocol = sk->s_proto;
+	
+	nlh->nlmsg_flags |= NLM_F_REQUEST;
+
+	if (!(sk->s_flags & NL_NO_AUTO_ACK))
+		nlh->nlmsg_flags |= NLM_F_ACK;
+
+	if (cb->cb_send_ow)
+		return cb->cb_send_ow(sk, msg);
+	else
+		return nl_send(sk, msg);
+}
+
+/**
+ * Send simple netlink message using nl_send_auto_complete()
+ * @arg sk		Netlink socket.
+ * @arg type		Netlink message type.
+ * @arg flags		Netlink message flags.
+ * @arg buf		Data buffer.
+ * @arg size		Size of data buffer.
+ *
+ * Builds a netlink message with the specified type and flags and
+ * appends the specified data as payload to the message.
+ *
+ * @see nl_send_auto_complete()
+ * @return Number of characters sent on success or a negative error code.
+ */
+int nl_send_simple(struct nl_sock *sk, int type, int flags, void *buf,
+		   size_t size)
+{
+	int err;
+	struct nl_msg *msg;
+
+	msg = nlmsg_alloc_simple(type, flags);
+	if (!msg)
+		return -NLE_NOMEM;
+
+	if (buf && size) {
+		err = nlmsg_append(msg, buf, size, NLMSG_ALIGNTO);
+		if (err < 0)
+			goto errout;
+	}
+	
+
+	err = nl_send_auto_complete(sk, msg);
+errout:
+	nlmsg_free(msg);
+
+	return err;
+}
+
+/** @} */
+
+/**
+ * @name Receive
+ * @{
+ */
+
+/**
+ * Receive data from netlink socket
+ * @arg sk		Netlink socket.
+ * @arg nla		Destination pointer for peer's netlink address.
+ * @arg buf		Destination pointer for message content.
+ * @arg creds		Destination pointer for credentials.
+ *
+ * Receives a netlink message, allocates a buffer in \c *buf and
+ * stores the message content. The peer's netlink address is stored
+ * in \c *nla. The caller is responsible for freeing the buffer allocated
+ * in \c *buf if a positive value is returned.  Interruped system calls
+ * are handled by repeating the read. The input buffer size is determined
+ * by peeking before the actual read is done.
+ *
+ * A non-blocking sockets causes the function to return immediately with
+ * a return value of 0 if no data is available.
+ *
+ * @return Number of octets read, 0 on EOF or a negative error code.
+ */
+int nl_recv(struct nl_sock *sk, struct sockaddr_nl *nla,
+	    unsigned char **buf, struct ucred **creds)
+{
+	int n;
+	int flags = 0;
+	static int page_size = 0;
+	struct iovec iov;
+	struct msghdr msg = {
+		.msg_name = (void *) nla,
+		.msg_namelen = sizeof(struct sockaddr_nl),
+		.msg_iov = &iov,
+		.msg_iovlen = 1,
+		.msg_control = NULL,
+		.msg_controllen = 0,
+		.msg_flags = 0,
+	};
+	struct cmsghdr *cmsg;
+
+	if (sk->s_flags & NL_MSG_PEEK)
+		flags |= MSG_PEEK;
+
+	if (page_size == 0)
+		page_size = getpagesize();
+
+	iov.iov_len = page_size;
+	iov.iov_base = *buf = malloc(iov.iov_len);
+
+	if (sk->s_flags & NL_SOCK_PASSCRED) {
+		msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
+		msg.msg_control = calloc(1, msg.msg_controllen);
+	}
+retry:
+
+	n = recvmsg(sk->s_fd, &msg, flags);
+	if (!n)
+		goto abort;
+	else if (n < 0) {
+		if (errno == EINTR) {
+			NL_DBG(3, "recvmsg() returned EINTR, retrying\n");
+			goto retry;
+		} else if (errno == EAGAIN) {
+			NL_DBG(3, "recvmsg() returned EAGAIN, aborting\n");
+			goto abort;
+		} else {
+			free(msg.msg_control);
+			free(*buf);
+			return -nl_syserr2nlerr(errno);
+		}
+	}
+
+	if (iov.iov_len < n ||
+	    msg.msg_flags & MSG_TRUNC) {
+		/* Provided buffer is not long enough, enlarge it
+		 * and try again. */
+		iov.iov_len *= 2;
+		iov.iov_base = *buf = realloc(*buf, iov.iov_len);
+		goto retry;
+	} else if (msg.msg_flags & MSG_CTRUNC) {
+		msg.msg_controllen *= 2;
+		msg.msg_control = realloc(msg.msg_control, msg.msg_controllen);
+		goto retry;
+	} else if (flags != 0) {
+		/* Buffer is big enough, do the actual reading */
+		flags = 0;
+		goto retry;
+	}
+
+	if (msg.msg_namelen != sizeof(struct sockaddr_nl)) {
+		free(msg.msg_control);
+		free(*buf);
+		return -NLE_NOADDR;
+	}
+
+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+		if (cmsg->cmsg_level == SOL_SOCKET &&
+		    cmsg->cmsg_type == SCM_CREDENTIALS) {
+			*creds = calloc(1, sizeof(struct ucred));
+			memcpy(*creds, CMSG_DATA(cmsg), sizeof(struct ucred));
+			break;
+		}
+	}
+
+	free(msg.msg_control);
+	return n;
+
+abort:
+	free(msg.msg_control);
+	free(*buf);
+	return 0;
+}
+
+#define NL_CB_CALL(cb, type, msg) \
+do { \
+	err = nl_cb_call(cb, type, msg); \
+	switch (err) { \
+	case NL_OK: \
+		err = 0; \
+		break; \
+	case NL_SKIP: \
+		goto skip; \
+	case NL_STOP: \
+		goto stop; \
+	default: \
+		goto out; \
+	} \
+} while (0)
+
+static int recvmsgs(struct nl_sock *sk, struct nl_cb *cb)
+{
+	int n, err = 0, multipart = 0;
+	unsigned char *buf = NULL;
+	struct nlmsghdr *hdr;
+	struct sockaddr_nl nla = {0};
+	struct nl_msg *msg = NULL;
+	struct ucred *creds = NULL;
+
+continue_reading:
+	NL_DBG(3, "Attempting to read from %p\n", sk);
+	if (cb->cb_recv_ow)
+		n = cb->cb_recv_ow(sk, &nla, &buf, &creds);
+	else
+		n = nl_recv(sk, &nla, &buf, &creds);
+
+	if (n <= 0)
+		return n;
+
+	NL_DBG(3, "recvmsgs(%p): Read %d bytes\n", sk, n);
+
+	hdr = (struct nlmsghdr *) buf;
+	while (nlmsg_ok(hdr, n)) {
+		NL_DBG(3, "recgmsgs(%p): Processing valid message...\n", sk);
+
+		nlmsg_free(msg);
+		msg = nlmsg_convert(hdr);
+		if (!msg) {
+			err = -NLE_NOMEM;
+			goto out;
+		}
+
+		nlmsg_set_proto(msg, sk->s_proto);
+		nlmsg_set_src(msg, &nla);
+		if (creds)
+			nlmsg_set_creds(msg, creds);
+
+		/* Raw callback is the first, it gives the most control
+		 * to the user and he can do his very own parsing. */
+		if (cb->cb_set[NL_CB_MSG_IN])
+			NL_CB_CALL(cb, NL_CB_MSG_IN, msg);
+
+		/* Sequence number checking. The check may be done by
+		 * the user, otherwise a very simple check is applied
+		 * enforcing strict ordering */
+		if (cb->cb_set[NL_CB_SEQ_CHECK])
+			NL_CB_CALL(cb, NL_CB_SEQ_CHECK, msg);
+		else if (hdr->nlmsg_seq != sk->s_seq_expect) {
+			if (cb->cb_set[NL_CB_INVALID])
+				NL_CB_CALL(cb, NL_CB_INVALID, msg);
+			else {
+				err = -NLE_SEQ_MISMATCH;
+				goto out;
+			}
+		}
+
+		if (hdr->nlmsg_type == NLMSG_DONE ||
+		    hdr->nlmsg_type == NLMSG_ERROR ||
+		    hdr->nlmsg_type == NLMSG_NOOP ||
+		    hdr->nlmsg_type == NLMSG_OVERRUN) {
+			/* We can't check for !NLM_F_MULTI since some netlink
+			 * users in the kernel are broken. */
+			sk->s_seq_expect++;
+			NL_DBG(3, "recvmsgs(%p): Increased expected " \
+			       "sequence number to %d\n",
+			       sk, sk->s_seq_expect);
+		}
+
+		if (hdr->nlmsg_flags & NLM_F_MULTI)
+			multipart = 1;
+	
+		/* Other side wishes to see an ack for this message */
+		if (hdr->nlmsg_flags & NLM_F_ACK) {
+			if (cb->cb_set[NL_CB_SEND_ACK])
+				NL_CB_CALL(cb, NL_CB_SEND_ACK, msg);
+			else {
+				/* FIXME: implement */
+			}
+		}
+
+		/* messages terminates a multpart message, this is
+		 * usually the end of a message and therefore we slip
+		 * out of the loop by default. the user may overrule
+		 * this action by skipping this packet. */
+		if (hdr->nlmsg_type == NLMSG_DONE) {
+			multipart = 0;
+			if (cb->cb_set[NL_CB_FINISH])
+				NL_CB_CALL(cb, NL_CB_FINISH, msg);
+		}
+
+		/* Message to be ignored, the default action is to
+		 * skip this message if no callback is specified. The
+		 * user may overrule this action by returning
+		 * NL_PROCEED. */
+		else if (hdr->nlmsg_type == NLMSG_NOOP) {
+			if (cb->cb_set[NL_CB_SKIPPED])
+				NL_CB_CALL(cb, NL_CB_SKIPPED, msg);
+			else
+				goto skip;
+		}
+
+		/* Data got lost, report back to user. The default action is to
+		 * quit parsing. The user may overrule this action by retuning
+		 * NL_SKIP or NL_PROCEED (dangerous) */
+		else if (hdr->nlmsg_type == NLMSG_OVERRUN) {
+			if (cb->cb_set[NL_CB_OVERRUN])
+				NL_CB_CALL(cb, NL_CB_OVERRUN, msg);
+			else {
+				err = -NLE_MSG_OVERFLOW;
+				goto out;
+			}
+		}
+
+		/* Message carries a nlmsgerr */
+		else if (hdr->nlmsg_type == NLMSG_ERROR) {
+			struct nlmsgerr *e = nlmsg_data(hdr);
+
+			if (hdr->nlmsg_len < nlmsg_msg_size(sizeof(*e))) {
+				/* Truncated error message, the default action
+				 * is to stop parsing. The user may overrule
+				 * this action by returning NL_SKIP or
+				 * NL_PROCEED (dangerous) */
+				if (cb->cb_set[NL_CB_INVALID])
+					NL_CB_CALL(cb, NL_CB_INVALID, msg);
+				else {
+					err = -NLE_MSG_TRUNC;
+					goto out;
+				}
+			} else if (e->error) {
+				/* Error message reported back from kernel. */
+				if (cb->cb_err) {
+					err = cb->cb_err(&nla, e,
+							   cb->cb_err_arg);
+					if (err < 0)
+						goto out;
+					else if (err == NL_SKIP)
+						goto skip;
+					else if (err == NL_STOP) {
+						err = -nl_syserr2nlerr(e->error);
+						goto out;
+					}
+				} else {
+					err = -nl_syserr2nlerr(e->error);
+					goto out;
+				}
+			} else if (cb->cb_set[NL_CB_ACK])
+				NL_CB_CALL(cb, NL_CB_ACK, msg);
+		} else {
+			/* Valid message (not checking for MULTIPART bit to
+			 * get along with broken kernels. NL_SKIP has no
+			 * effect on this.  */
+			if (cb->cb_set[NL_CB_VALID])
+				NL_CB_CALL(cb, NL_CB_VALID, msg);
+		}
+skip:
+		err = 0;
+		hdr = nlmsg_next(hdr, &n);
+	}
+	
+	nlmsg_free(msg);
+	free(buf);
+	free(creds);
+	buf = NULL;
+	msg = NULL;
+	creds = NULL;
+
+	if (multipart) {
+		/* Multipart message not yet complete, continue reading */
+		goto continue_reading;
+	}
+stop:
+	err = 0;
+out:
+	nlmsg_free(msg);
+	free(buf);
+	free(creds);
+
+	return err;
+}
+
+/**
+ * Receive a set of messages from a netlink socket.
+ * @arg sk		Netlink socket.
+ * @arg cb		set of callbacks to control behaviour.
+ *
+ * Repeatedly calls nl_recv() or the respective replacement if provided
+ * by the application (see nl_cb_overwrite_recv()) and parses the
+ * received data as netlink messages. Stops reading if one of the
+ * callbacks returns NL_STOP or nl_recv returns either 0 or a negative error code.
+ *
+ * A non-blocking sockets causes the function to return immediately if
+ * no data is available.
+ *
+ * @return 0 on success or a negative error code from nl_recv().
+ */
+int nl_recvmsgs(struct nl_sock *sk, struct nl_cb *cb)
+{
+	if (cb->cb_recvmsgs_ow)
+		return cb->cb_recvmsgs_ow(sk, cb);
+	else
+		return recvmsgs(sk, cb);
+}
+
+
+static int ack_wait_handler(struct nl_msg *msg, void *arg)
+{
+	return NL_STOP;
+}
+
+/**
+ * Wait for ACK.
+ * @arg sk		Netlink socket.
+ * @pre The netlink socket must be in blocking state.
+ *
+ * Waits until an ACK is received for the latest not yet acknowledged
+ * netlink message.
+ */
+int nl_wait_for_ack(struct nl_sock *sk)
+{
+	int err;
+	struct nl_cb *cb;
+
+	cb = nl_cb_clone(sk->s_cb);
+	if (cb == NULL)
+		return -NLE_NOMEM;
+
+	nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_wait_handler, NULL);
+	err = nl_recvmsgs(sk, cb);
+	nl_cb_put(cb);
+
+	return err;
+}
+
+/** @} */
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/object.c b/trunk/package/libs/libnl-tiny/src/object.c
new file mode 100644
index 00000000..f9155513
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/object.c
@@ -0,0 +1,279 @@
+/*
+ * lib/object.c		Generic Cacheable Object
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup cache
+ * @defgroup object Object
+ * @{
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/cache.h>
+#include <netlink/object.h>
+#include <netlink/utils.h>
+
+static inline struct nl_object_ops *obj_ops(struct nl_object *obj)
+{
+	if (!obj->ce_ops)
+		BUG();
+
+	return obj->ce_ops;
+}
+
+/**
+ * @name Object Creation/Deletion
+ * @{
+ */
+
+/**
+ * Allocate a new object of kind specified by the operations handle
+ * @arg ops		cache operations handle
+ * @return The new object or NULL
+ */
+struct nl_object *nl_object_alloc(struct nl_object_ops *ops)
+{
+	struct nl_object *new;
+
+	if (ops->oo_size < sizeof(*new))
+		BUG();
+
+	new = calloc(1, ops->oo_size);
+	if (!new)
+		return NULL;
+
+	new->ce_refcnt = 1;
+	nl_init_list_head(&new->ce_list);
+
+	new->ce_ops = ops;
+	if (ops->oo_constructor)
+		ops->oo_constructor(new);
+
+	NL_DBG(4, "Allocated new object %p\n", new);
+
+	return new;
+}
+
+#ifdef disabled
+/**
+ * Allocate a new object of kind specified by the name
+ * @arg kind		name of object type
+ * @return The new object or nULL
+ */
+int nl_object_alloc_name(const char *kind, struct nl_object **result)
+{
+	struct nl_cache_ops *ops;
+
+	ops = nl_cache_ops_lookup(kind);
+	if (!ops)
+		return -NLE_OPNOTSUPP;
+
+	if (!(*result = nl_object_alloc(ops->co_obj_ops)))
+		return -NLE_NOMEM;
+
+	return 0;
+}
+#endif
+
+struct nl_derived_object {
+	NLHDR_COMMON
+	char data;
+};
+
+/**
+ * Allocate a new object and copy all data from an existing object
+ * @arg obj		object to inherite data from
+ * @return The new object or NULL.
+ */
+struct nl_object *nl_object_clone(struct nl_object *obj)
+{
+	struct nl_object *new;
+	struct nl_object_ops *ops = obj_ops(obj);
+	int doff = offsetof(struct nl_derived_object, data);
+	int size;
+
+	new = nl_object_alloc(ops);
+	if (!new)
+		return NULL;
+
+	size = ops->oo_size - doff;
+	if (size < 0)
+		BUG();
+
+	new->ce_ops = obj->ce_ops;
+	new->ce_msgtype = obj->ce_msgtype;
+
+	if (size)
+		memcpy((void *)new + doff, (void *)obj + doff, size);
+
+	if (ops->oo_clone) {
+		if (ops->oo_clone(new, obj) < 0) {
+			nl_object_free(new);
+			return NULL;
+		}
+	} else if (size && ops->oo_free_data)
+		BUG();
+
+	return new;
+}
+
+/**
+ * Free a cacheable object
+ * @arg obj		object to free
+ *
+ * @return 0 or a negative error code.
+ */
+void nl_object_free(struct nl_object *obj)
+{
+	struct nl_object_ops *ops = obj_ops(obj);
+
+	if (obj->ce_refcnt > 0)
+		NL_DBG(1, "Warning: Freeing object in use...\n");
+
+	if (obj->ce_cache)
+		nl_cache_remove(obj);
+
+	if (ops->oo_free_data)
+		ops->oo_free_data(obj);
+
+	free(obj);
+
+	NL_DBG(4, "Freed object %p\n", obj);
+}
+
+/** @} */
+
+/**
+ * @name Reference Management
+ * @{
+ */
+
+/** @} */
+
+/**
+ * @name Utillities
+ * @{
+ */
+
+#ifdef disabled
+/**
+ * Dump this object according to the specified parameters
+ * @arg obj		object to dump
+ * @arg params		dumping parameters
+ */
+void nl_object_dump(struct nl_object *obj, struct nl_dump_params *params)
+{
+	dump_from_ops(obj, params);
+}
+
+/**
+ * Check if the identifiers of two objects are identical 
+ * @arg a		an object
+ * @arg b		another object of same type
+ *
+ * @return true if both objects have equal identifiers, otherwise false.
+ */
+int nl_object_identical(struct nl_object *a, struct nl_object *b)
+{
+	struct nl_object_ops *ops = obj_ops(a);
+	int req_attrs;
+
+	/* Both objects must be of same type */
+	if (ops != obj_ops(b))
+		return 0;
+
+	req_attrs = ops->oo_id_attrs;
+
+	/* Both objects must provide all required attributes to uniquely
+	 * identify an object */
+	if ((a->ce_mask & req_attrs) != req_attrs ||
+	    (b->ce_mask & req_attrs) != req_attrs)
+		return 0;
+
+	/* Can't judge unless we can compare */
+	if (ops->oo_compare == NULL)
+		return 0;
+
+	return !(ops->oo_compare(a, b, req_attrs, 0));
+}
+
+/**
+ * Compute bitmask representing difference in attribute values
+ * @arg a		an object
+ * @arg b		another object of same type
+ *
+ * The bitmask returned is specific to an object type, each bit set represents
+ * an attribute which mismatches in either of the two objects. Unavailability
+ * of an attribute in one object and presence in the other is regarded a
+ * mismatch as well.
+ *
+ * @return Bitmask describing differences or 0 if they are completely identical.
+ */
+uint32_t nl_object_diff(struct nl_object *a, struct nl_object *b)
+{
+	struct nl_object_ops *ops = obj_ops(a);
+
+	if (ops != obj_ops(b) || ops->oo_compare == NULL)
+		return UINT_MAX;
+
+	return ops->oo_compare(a, b, ~0, 0);
+}
+
+/**
+ * Match a filter against an object
+ * @arg obj		object to check
+ * @arg filter		object of same type acting as filter
+ *
+ * @return 1 if the object matches the filter or 0
+ *           if no filter procedure is available or if the
+ *           filter does not match.
+ */
+int nl_object_match_filter(struct nl_object *obj, struct nl_object *filter)
+{
+	struct nl_object_ops *ops = obj_ops(obj);
+
+	if (ops != obj_ops(filter) || ops->oo_compare == NULL)
+		return 0;
+	
+	return !(ops->oo_compare(obj, filter, filter->ce_mask,
+				 LOOSE_COMPARISON));
+}
+
+/**
+ * Convert bitmask of attributes to a character string
+ * @arg obj		object of same type as attribute bitmask
+ * @arg attrs		bitmask of attribute types
+ * @arg buf		destination buffer
+ * @arg len		length of destination buffer
+ *
+ * Converts the bitmask of attribute types into a list of attribute
+ * names separated by comas.
+ *
+ * @return destination buffer.
+ */
+char *nl_object_attrs2str(struct nl_object *obj, uint32_t attrs,
+			  char *buf, size_t len)
+{
+	struct nl_object_ops *ops = obj_ops(obj);
+
+	if (ops->oo_attrs2str != NULL)
+		return ops->oo_attrs2str(attrs, buf, len);
+	else {
+		memset(buf, 0, len);
+		return buf;
+	}
+}
+
+#endif
+
+/** @} */
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/socket.c b/trunk/package/libs/libnl-tiny/src/socket.c
new file mode 100644
index 00000000..1429825e
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/socket.c
@@ -0,0 +1,406 @@
+/*
+ * lib/socket.c		Netlink Socket
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ */
+
+/**
+ * @ingroup core
+ * @defgroup socket Socket
+ * @{
+ */
+
+#include <netlink-local.h>
+#include <netlink/netlink.h>
+#include <netlink/utils.h>
+#include <netlink/handlers.h>
+#include <netlink/msg.h>
+#include <netlink/attr.h>
+
+static uint32_t used_ports_map[32];
+
+static uint32_t generate_local_port(void)
+{
+	int i, n;
+	uint32_t pid = getpid() & 0x3FFFFF;
+
+	for (i = 0; i < 32; i++) {
+		if (used_ports_map[i] == 0xFFFFFFFF)
+			continue;
+
+		for (n = 0; n < 32; n++) {
+			if (1UL & (used_ports_map[i] >> n))
+				continue;
+
+			used_ports_map[i] |= (1UL << n);
+			n += (i * 32);
+
+			/* PID_MAX_LIMIT is currently at 2^22, leaving 10 bit
+			 * to, i.e. 1024 unique ports per application. */
+			return pid + (n << 22);
+
+		}
+	}
+
+	/* Out of sockets in our own PID namespace, what to do? FIXME */
+	return UINT_MAX;
+}
+
+static void release_local_port(uint32_t port)
+{
+	int nr;
+
+	if (port == UINT_MAX)
+		return;
+	
+	nr = port >> 22;
+	used_ports_map[nr / 32] &= ~(1 << nr % 32);
+}
+
+/**
+ * @name Allocation
+ * @{
+ */
+
+static struct nl_sock *__alloc_socket(struct nl_cb *cb)
+{
+	struct nl_sock *sk;
+
+	sk = calloc(1, sizeof(*sk));
+	if (!sk)
+		return NULL;
+
+	sk->s_fd = -1;
+	sk->s_cb = cb;
+	sk->s_local.nl_family = AF_NETLINK;
+	sk->s_peer.nl_family = AF_NETLINK;
+	sk->s_seq_expect = sk->s_seq_next = time(0);
+	sk->s_local.nl_pid = generate_local_port();
+	if (sk->s_local.nl_pid == UINT_MAX) {
+		nl_socket_free(sk);
+		return NULL;
+	}
+
+	return sk;
+}
+
+/**
+ * Allocate new netlink socket
+ *
+ * @return Newly allocated netlink socket or NULL.
+ */
+struct nl_sock *nl_socket_alloc(void)
+{
+	struct nl_cb *cb;
+	
+	cb = nl_cb_alloc(NL_CB_DEFAULT);
+	if (!cb)
+		return NULL;
+
+	return __alloc_socket(cb);
+}
+
+/**
+ * Allocate new socket with custom callbacks
+ * @arg cb		Callback handler
+ *
+ * The reference to the callback handler is taken into account
+ * automatically, it is released again upon calling nl_socket_free().
+ *
+ *@return Newly allocted socket handle or NULL.
+ */
+struct nl_sock *nl_socket_alloc_cb(struct nl_cb *cb)
+{
+	if (cb == NULL)
+		BUG();
+
+	return __alloc_socket(nl_cb_get(cb));
+}
+
+/**
+ * Free a netlink socket.
+ * @arg sk		Netlink socket.
+ */
+void nl_socket_free(struct nl_sock *sk)
+{
+	if (!sk)
+		return;
+
+	if (sk->s_fd >= 0)
+		close(sk->s_fd);
+
+	if (!(sk->s_flags & NL_OWN_PORT))
+		release_local_port(sk->s_local.nl_pid);
+
+	nl_cb_put(sk->s_cb);
+	free(sk);
+}
+
+/** @} */
+
+/**
+ * @name Sequence Numbers
+ * @{
+ */
+
+static int noop_seq_check(struct nl_msg *msg, void *arg)
+{
+	return NL_OK;
+}
+
+
+/**
+ * Disable sequence number checking.
+ * @arg sk		Netlink socket.
+ *
+ * Disables checking of sequence numbers on the netlink socket This is
+ * required to allow messages to be processed which were not requested by
+ * a preceding request message, e.g. netlink events.
+ *
+ * @note This function modifies the NL_CB_SEQ_CHECK configuration in
+ * the callback handle associated with the socket.
+ */
+void nl_socket_disable_seq_check(struct nl_sock *sk)
+{
+	nl_cb_set(sk->s_cb, NL_CB_SEQ_CHECK,
+		  NL_CB_CUSTOM, noop_seq_check, NULL);
+}
+
+/** @} */
+
+/**
+ * Set local port of socket
+ * @arg sk		Netlink socket.
+ * @arg port		Local port identifier
+ *
+ * Assigns a local port identifier to the socket. If port is 0
+ * a unique port identifier will be generated automatically.
+ */
+void nl_socket_set_local_port(struct nl_sock *sk, uint32_t port)
+{
+	if (port == 0) {
+		port = generate_local_port(); 
+		sk->s_flags &= ~NL_OWN_PORT;
+	} else  {
+		if (!(sk->s_flags & NL_OWN_PORT))
+			release_local_port(sk->s_local.nl_pid);
+		sk->s_flags |= NL_OWN_PORT;
+	}
+
+	sk->s_local.nl_pid = port;
+}
+
+/** @} */
+
+/**
+ * @name Group Subscriptions
+ * @{
+ */
+
+/**
+ * Join groups
+ * @arg sk		Netlink socket
+ * @arg group		Group identifier
+ *
+ * Joins the specified groups using the modern socket option which
+ * is available since kernel version 2.6.14. It allows joining an
+ * almost arbitary number of groups without limitation.  The list
+ * of groups has to be terminated by 0 (%NFNLGRP_NONE).
+ *
+ * Make sure to use the correct group definitions as the older
+ * bitmask definitions for nl_join_groups() are likely to still
+ * be present for backward compatibility reasons.
+ *
+ * @return 0 on sucess or a negative error code.
+ */
+int nl_socket_add_memberships(struct nl_sock *sk, int group, ...)
+{
+	int err;
+	va_list ap;
+
+	if (sk->s_fd == -1)
+		return -NLE_BAD_SOCK;
+
+	va_start(ap, group);
+
+	while (group != 0) {
+		if (group < 0)
+			return -NLE_INVAL;
+
+		err = setsockopt(sk->s_fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP,
+						 &group, sizeof(group));
+		if (err < 0)
+			return -nl_syserr2nlerr(errno);
+
+		group = va_arg(ap, int);
+	}
+
+	va_end(ap);
+
+	return 0;
+}
+
+/**
+ * Leave groups
+ * @arg sk		Netlink socket
+ * @arg group		Group identifier
+ *
+ * Leaves the specified groups using the modern socket option
+ * which is available since kernel version 2.6.14. The list of groups
+ * has to terminated by 0 (%NFNLGRP_NONE).
+ *
+ * @see nl_socket_add_membership
+ * @return 0 on success or a negative error code.
+ */
+int nl_socket_drop_memberships(struct nl_sock *sk, int group, ...)
+{
+	int err;
+	va_list ap;
+
+	if (sk->s_fd == -1)
+		return -NLE_BAD_SOCK;
+
+	va_start(ap, group);
+
+	while (group != 0) {
+		if (group < 0)
+			return -NLE_INVAL;
+
+		err = setsockopt(sk->s_fd, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP,
+						 &group, sizeof(group));
+		if (err < 0)
+			return -nl_syserr2nlerr(errno);
+
+		group = va_arg(ap, int);
+	}
+
+	va_end(ap);
+
+	return 0;
+}
+
+
+/** @} */
+
+/**
+ * Set file descriptor of socket to non-blocking state
+ * @arg sk		Netlink socket.
+ *
+ * @return 0 on success or a negative error code.
+ */
+int nl_socket_set_nonblocking(struct nl_sock *sk)
+{
+	if (sk->s_fd == -1)
+		return -NLE_BAD_SOCK;
+
+	if (fcntl(sk->s_fd, F_SETFL, O_NONBLOCK) < 0)
+		return -nl_syserr2nlerr(errno);
+
+	return 0;
+}
+
+/** @} */
+
+/**
+ * @name Utilities
+ * @{
+ */
+
+/**
+ * Set socket buffer size of netlink socket.
+ * @arg sk		Netlink socket.
+ * @arg rxbuf		New receive socket buffer size in bytes.
+ * @arg txbuf		New transmit socket buffer size in bytes.
+ *
+ * Sets the socket buffer size of a netlink socket to the specified
+ * values \c rxbuf and \c txbuf. Providing a value of \c 0 assumes a
+ * good default value.
+ *
+ * @note It is not required to call this function prior to nl_connect().
+ * @return 0 on sucess or a negative error code.
+ */
+int nl_socket_set_buffer_size(struct nl_sock *sk, int rxbuf, int txbuf)
+{
+	int err;
+
+	if (rxbuf <= 0)
+		rxbuf = 32768;
+
+	if (txbuf <= 0)
+		txbuf = 32768;
+
+	if (sk->s_fd == -1)
+		return -NLE_BAD_SOCK;
+	
+	err = setsockopt(sk->s_fd, SOL_SOCKET, SO_SNDBUF,
+			 &txbuf, sizeof(txbuf));
+	if (err < 0)
+		return -nl_syserr2nlerr(errno);
+
+	err = setsockopt(sk->s_fd, SOL_SOCKET, SO_RCVBUF,
+			 &rxbuf, sizeof(rxbuf));
+	if (err < 0)
+		return -nl_syserr2nlerr(errno);
+
+	sk->s_flags |= NL_SOCK_BUFSIZE_SET;
+
+	return 0;
+}
+
+/**
+ * Enable/disable credential passing on netlink socket.
+ * @arg sk		Netlink socket.
+ * @arg state		New state (0 - disabled, 1 - enabled)
+ *
+ * @return 0 on success or a negative error code
+ */
+int nl_socket_set_passcred(struct nl_sock *sk, int state)
+{
+	int err;
+
+	if (sk->s_fd == -1)
+		return -NLE_BAD_SOCK;
+
+	err = setsockopt(sk->s_fd, SOL_SOCKET, SO_PASSCRED,
+			 &state, sizeof(state));
+	if (err < 0)
+		return -nl_syserr2nlerr(errno);
+
+	if (state)
+		sk->s_flags |= NL_SOCK_PASSCRED;
+	else
+		sk->s_flags &= ~NL_SOCK_PASSCRED;
+
+	return 0;
+}
+
+/**
+ * Enable/disable receival of additional packet information
+ * @arg sk		Netlink socket.
+ * @arg state		New state (0 - disabled, 1 - enabled)
+ *
+ * @return 0 on success or a negative error code
+ */
+int nl_socket_recv_pktinfo(struct nl_sock *sk, int state)
+{
+	int err;
+
+	if (sk->s_fd == -1)
+		return -NLE_BAD_SOCK;
+
+	err = setsockopt(sk->s_fd, SOL_NETLINK, NETLINK_PKTINFO,
+			 &state, sizeof(state));
+	if (err < 0)
+		return -nl_syserr2nlerr(errno);
+
+	return 0;
+}
+
+/** @} */
+
+/** @} */
diff --git a/trunk/package/libs/libnl-tiny/src/unl.c b/trunk/package/libs/libnl-tiny/src/unl.c
new file mode 100644
index 00000000..b38dab83
--- /dev/null
+++ b/trunk/package/libs/libnl-tiny/src/unl.c
@@ -0,0 +1,290 @@
+#define _GNU_SOURCE
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#include <netlink/genl/family.h>
+#include <sys/types.h>
+#include <net/if.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <linux/nl80211.h>
+
+#include "unl.h"
+
+static int unl_init(struct unl *unl)
+{
+	unl->sock = nl_socket_alloc();
+	if (!unl->sock)
+		return -1;
+
+	return 0;
+}
+
+int unl_genl_init(struct unl *unl, const char *family)
+{
+	memset(unl, 0, sizeof(*unl));
+
+	if (unl_init(unl))
+		goto error_out;
+
+	unl->hdrlen = NLMSG_ALIGN(sizeof(struct genlmsghdr));
+	unl->family_name = strdup(family);
+	if (!unl->family_name)
+		goto error;
+
+	if (genl_connect(unl->sock))
+		goto error;
+
+	if (genl_ctrl_alloc_cache(unl->sock, &unl->cache))
+		goto error;
+
+	unl->family = genl_ctrl_search_by_name(unl->cache, family);
+	if (!unl->family)
+		goto error;
+
+	return 0;
+
+error:
+	unl_free(unl);
+error_out:
+	return -1;
+}
+
+void unl_free(struct unl *unl)
+{
+	if (unl->family_name)
+		free(unl->family_name);
+
+	if (unl->sock)
+		nl_socket_free(unl->sock);
+
+	if (unl->cache)
+		nl_cache_free(unl->cache);
+
+	memset(unl, 0, sizeof(*unl));
+}
+
+static int
+ack_handler(struct nl_msg *msg, void *arg)
+{
+	int *err = arg;
+	*err = 0;
+	return NL_STOP;
+}
+
+static int
+finish_handler(struct nl_msg *msg, void *arg)
+{
+	int *err = arg;
+	*err = 0;
+	return NL_SKIP;
+}
+
+static int
+error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err, void *arg)
+{
+	int *ret = arg;
+	*ret = err->error;
+	return NL_SKIP;
+}
+
+struct nl_msg *unl_genl_msg(struct unl *unl, int cmd, bool dump)
+{
+	struct nl_msg *msg;
+	int flags = 0;
+
+	msg = nlmsg_alloc();
+	if (!msg)
+		goto out;
+
+	if (dump)
+		flags |= NLM_F_DUMP;
+
+	genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ,
+		    genl_family_get_id(unl->family), 0, flags, cmd, 0);
+
+out:
+	return msg;
+}
+
+int unl_genl_request(struct unl *unl, struct nl_msg *msg, unl_cb handler, void *arg)
+{
+	struct nlmsghdr *nlh;
+	struct nl_cb *cb;
+	int err;
+
+	cb = nl_cb_alloc(NL_CB_CUSTOM);
+	nlh = nlmsg_hdr(msg);
+
+	err = nl_send_auto_complete(unl->sock, msg);
+	if (err < 0)
+		goto out;
+
+	err = 1;
+	nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err);
+	nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err);
+	nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err);
+	if (handler)
+		nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, handler, arg);
+
+	while (err > 0)
+		nl_recvmsgs(unl->sock, cb);
+
+out:
+	nlmsg_free(msg);
+	nl_cb_put(cb);
+	return err;
+}
+
+static int request_single_cb(struct nl_msg *msg, void *arg)
+{
+	struct nl_msg **dest = arg;
+
+	if (!*dest) {
+		nlmsg_get(msg);
+		*dest = msg;
+	}
+	return NL_SKIP;
+}
+
+int unl_genl_request_single(struct unl *unl, struct nl_msg *msg, struct nl_msg **dest)
+{
+	*dest = NULL;
+	return unl_genl_request(unl, msg, request_single_cb, dest);
+}
+
+static int no_seq_check(struct nl_msg *msg, void *arg)
+{
+	return NL_OK;
+}
+
+void unl_genl_loop(struct unl *unl, unl_cb handler, void *arg)
+{
+	struct nl_cb *cb;
+
+	cb = nl_cb_alloc(NL_CB_CUSTOM);
+	unl->loop_done = false;
+	nl_cb_set(cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, no_seq_check, NULL);
+	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, handler, arg);
+
+	while (!unl->loop_done)
+		nl_recvmsgs(unl->sock, cb);
+
+	nl_cb_put(cb);
+}
+
+int unl_genl_multicast_id(struct unl *unl, const char *name)
+{
+	struct nlattr *tb[CTRL_ATTR_MCAST_GRP_MAX + 1];
+	struct nlattr *groups, *group;
+	struct nl_msg *msg;
+	int ctrlid;
+	int ret = -1;
+	int rem;
+
+	msg = nlmsg_alloc();
+	if (!msg)
+		return -1;
+
+	ctrlid = genl_ctrl_resolve(unl->sock, "nlctrl");
+	genlmsg_put(msg, 0, 0, ctrlid, 0, 0, CTRL_CMD_GETFAMILY, 0);
+	NLA_PUT_STRING(msg, CTRL_ATTR_FAMILY_NAME, unl->family_name);
+	unl_genl_request_single(unl, msg, &msg);
+	if (!msg)
+		return -1;
+
+	groups = unl_find_attr(unl, msg, CTRL_ATTR_MCAST_GROUPS);
+	if (!groups)
+		goto nla_put_failure;
+
+	nla_for_each_nested(group, groups, rem) {
+		const char *gn;
+
+		nla_parse(tb, CTRL_ATTR_MCAST_GRP_MAX, nla_data(group),
+			  nla_len(group), NULL);
+
+		if (!tb[CTRL_ATTR_MCAST_GRP_NAME] ||
+		    !tb[CTRL_ATTR_MCAST_GRP_ID])
+			continue;
+
+		gn = nla_data(tb[CTRL_ATTR_MCAST_GRP_NAME]);
+		if (strcmp(gn, name) != 0)
+			continue;
+
+		ret = nla_get_u32(tb[CTRL_ATTR_MCAST_GRP_ID]);
+		break;
+	}
+
+nla_put_failure:
+	nlmsg_free(msg);
+	return ret;
+}
+
+int unl_genl_subscribe(struct unl *unl, const char *name)
+{
+	int mcid;
+
+	mcid = unl_genl_multicast_id(unl, name);
+	if (mcid < 0)
+		return mcid;
+
+	return nl_socket_add_membership(unl->sock, mcid);
+}
+
+int unl_genl_unsubscribe(struct unl *unl, const char *name)
+{
+	int mcid;
+
+	mcid = unl_genl_multicast_id(unl, name);
+	if (mcid < 0)
+		return mcid;
+
+	return nl_socket_drop_membership(unl->sock, mcid);
+}
+
+int unl_nl80211_phy_lookup(const char *name)
+{
+	char buf[32];
+	int fd, pos;
+
+	snprintf(buf, sizeof(buf), "/sys/class/ieee80211/%s/index", name);
+
+	fd = open(buf, O_RDONLY);
+	if (fd < 0)
+		return -1;
+	pos = read(fd, buf, sizeof(buf) - 1);
+	if (pos < 0) {
+		close(fd);
+		return -1;
+	}
+	buf[pos] = '\0';
+	close(fd);
+	return atoi(buf);
+}
+
+int unl_nl80211_wdev_to_phy(struct unl *unl, int wdev)
+{
+	struct nl_msg *msg;
+	struct nlattr *attr;
+	int ret = -1;
+
+	msg = unl_genl_msg(unl, NL80211_CMD_GET_INTERFACE, false);
+	if (!msg)
+		return -1;
+
+	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, wdev);
+	if (unl_genl_request_single(unl, msg, &msg) < 0)
+		return -1;
+
+	attr = unl_find_attr(unl, msg, NL80211_ATTR_WIPHY);
+	if (!attr)
+		goto out;
+
+	ret = nla_get_u32(attr);
+out:
+nla_put_failure:
+	nlmsg_free(msg);
+	return ret;
+}
+
+
diff --git a/trunk/package/libs/libnl/Makefile b/trunk/package/libs/libnl/Makefile
new file mode 100644
index 00000000..995fda20
--- /dev/null
+++ b/trunk/package/libs/libnl/Makefile
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnl
+PKG_VERSION:=3.2.21
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.infradead.org/~tgr/libnl/files/
+PKG_MD5SUM:=6fe7136558a9071e70673dcda38545b3
+PKG_LICENSE:=LGPL-2.1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=netlink socket library
+  DEPENDS:=+libpthread
+  URL:=http://people.suug.ch/~tgr/libnl/
+endef
+
+define Package/libnl/description
+ This package contains a library for applications dealing with netlink sockets
+endef
+
+TARGET_CFLAGS += -ffunction-sections $(FPIC)
+
+define Build/Compile
+	$(call Build/Compile/Default)
+	make -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	mkdir -p $(1)/usr/include/libnl
+	$(CP) $(PKG_BUILD_DIR)/include/linux $(1)/usr/include/libnl/
+endef
+
+define Package/libnl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-route-3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-genl-3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-nf-3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-3.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnl))
diff --git a/trunk/package/libs/libpcap/Config.in b/trunk/package/libs/libpcap/Config.in
new file mode 100644
index 00000000..5fee75a5
--- /dev/null
+++ b/trunk/package/libs/libpcap/Config.in
@@ -0,0 +1,15 @@
+menu "Configuration"
+	depends on PACKAGE_libpcap
+
+config PCAP_HAS_USB
+	bool "Include USB support"
+	depends on PACKAGE_kmod-usb-core
+	default n
+
+config PCAP_HAS_BT
+	bool "Include bluetooth support"
+	depends on PACKAGE_kmod-bluetooth
+	depends on BROKEN
+	default n
+
+endmenu
diff --git a/trunk/package/libs/libpcap/Makefile b/trunk/package/libs/libpcap/Makefile
new file mode 100644
index 00000000..2a90c49f
--- /dev/null
+++ b/trunk/package/libs/libpcap/Makefile
@@ -0,0 +1,98 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libpcap
+PKG_VERSION:=1.5.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.tcpdump.org/release/
+PKG_MD5SUM:=7e7321fb3aff2f2bb05c8229f3795d4a
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=BSD-3-Clause
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/libpcap
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Low-level packet capture library
+  URL:=http://www.tcpdump.org/
+  MENU:=1
+endef
+
+define Package/libpcap/description
+This package contains a system-independent library for user-level network packet
+capture.
+endef
+
+define Package/libpcap/config
+	source "$(SOURCE)/Config.in"
+endef
+
+TARGET_CFLAGS += \
+	-ffunction-sections \
+	-fdata-sections
+
+CONFIGURE_VARS += \
+	ac_cv_linux_vers=$(LINUX_VERSION) \
+	ac_cv_header_libusb_1_0_libusb_h=no \
+	ac_cv_netfilter_can_compile=no
+
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-yydebug \
+	--with-build-cc="$(HOSTCC)" \
+	--with-pcap=linux \
+	--without-septel \
+	--without-dag \
+	--without-libnl \
+	--without-snf \
+	--disable-can \
+	--disable-canusb \
+	--disable-dbus \
+	--disable-bluetooth
+
+ifeq ($(CONFIG_IPV6),y)
+CONFIGURE_ARGS += \
+	--enable-ipv6
+endif
+
+MAKE_FLAGS += \
+	CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include"
+
+define Build/Configure
+	$(call Build/Configure/Default)
+	$(if $(CONFIG_PCAP_HAS_USB),,$(SED) '/^#define PCAP_SUPPORT_USB/D' $(PKG_BUILD_DIR)/config.h)
+	$(if $(CONFIG_PCAP_HAS_USB),,$(SED) 's/pcap-usb-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
+	$(if $(CONFIG_PCAP_HAS_BT),,$(SED) '/^#define PCAP_SUPPORT_BT/D' $(PKG_BUILD_DIR)/config.h)
+	$(if $(CONFIG_PCAP_HAS_BT),,$(SED) 's/pcap-bt-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libpcap/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libpcap))
diff --git a/trunk/package/libs/libpcap/patches/100-debian_shared_lib.patch b/trunk/package/libs/libpcap/patches/100-debian_shared_lib.patch
new file mode 100644
index 00000000..b294e515
--- /dev/null
+++ b/trunk/package/libs/libpcap/patches/100-debian_shared_lib.patch
@@ -0,0 +1,174 @@
+Debian-specific modifications to the upstream Makefile.in to
+build a shared library.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,6 +40,14 @@ mandir = @mandir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
++# some defines for shared library compilation
++MAJ=1.3
++LIBVERSION=$(MAJ).0
++LIBNAME=pcap
++LIBRARY=lib$(LIBNAME).a
++SOLIBRARY=lib$(LIBNAME).so
++SHAREDLIB=$(SOLIBRARY).$(LIBVERSION)
++
+ #
+ # You shouldn't need to edit anything below.
+ #
+@@ -63,7 +71,8 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
+ PROG=libpcap
+ 
+ # Standard CFLAGS
+-FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
++FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) $(CPPFLAGS)
++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -83,7 +92,11 @@ YACC = @V_YACC@
+ # problem if you don't own the file but can write to the directory.
+ .c.o:
+ 	@rm -f $@
+-	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
++	$(CC) $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
++
++%_pic.o: %.c
++	@rm -f $@
++	$(CC) -fPIC $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
+ 
+ PSRC =	pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@ @NETFILTER_SRC@ @CANUSB_SRC@ @DBUS_SRC@
+ FSRC =  fad-@V_FINDALLDEVS@.c
+@@ -99,6 +112,7 @@ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
+ # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
+ # hack the extra indirection
+ OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
+ PUBHDR = \
+ 	pcap.h \
+ 	pcap-bpf.h \
+@@ -153,7 +167,7 @@ TAGFILES = \
+ 
+ CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
+ 	$(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
+-	lex.yy.c pcap-config
++	lex.yy.c pcap-config $(OBJ_PIC)
+ 
+ MAN1 = pcap-config.1
+ 
+@@ -363,7 +377,7 @@ libpcap.a: $(OBJ)
+ 	$(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
+ 	$(RANLIB) $@
+ 
+-shared: libpcap.$(DYEXT)
++shared: $(SHAREDLIB)
+ 
+ libpcap.so: $(OBJ)
+ 	@rm -f $@
+@@ -441,6 +455,13 @@ libpcap.shareda: $(OBJ)
+ #
+ libpcap.none:
+ 
++$(SHAREDLIB): $(OBJ_PIC)
++	-@rm -f $@
++	-@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
++	$(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $(SHAREDLIB) $(OBJ_PIC) -lc $(LIBS)
++	ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
++	ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
++
+ scanner.c: $(srcdir)/scanner.l
+ 	@rm -f $@
+ 	$(srcdir)/runlex.sh $(LEX) -o$@ $<
+@@ -448,6 +469,9 @@ scanner.c: $(srcdir)/scanner.l
+ scanner.o: scanner.c tokdefs.h
+ 	$(CC) $(FULL_CFLAGS) -c scanner.c
+ 
++scanner_pic.o: scanner.c tokdefs.h
++	$(CC) -fPIC $(FULL_CFLAGS) -o $@ -c scanner.c
++
+ pcap.o: version.h
+ 
+ tokdefs.h: grammar.c
+@@ -461,9 +485,16 @@ grammar.o: grammar.c
+ 	@rm -f $@
+ 	$(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c
+ 
++grammar_pic.o: grammar.c
++	@rm -f $@
++	$(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c 
++
+ version.o: version.c
+ 	$(CC) $(FULL_CFLAGS) -c version.c
+ 
++version_pic.o: version.c
++	$(CC) -fPIC $(FULL_CFLAGS) -c version.c -o $@
++
+ snprintf.o: $(srcdir)/missing/snprintf.c
+ 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+ 
+@@ -501,6 +532,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
+ bpf_filter.o: bpf_filter.c
+ 	$(CC) $(FULL_CFLAGS) -c bpf_filter.c
+ 
++bpf_filter_pic.o: bpf_filter.c
++	$(CC) -fPIC $(FULL_CFLAGS) -c bpf_filter.c -o $@
++
+ #
+ # Generate the pcap-config script.
+ #
+@@ -618,11 +652,9 @@ install-shared: install-shared-$(DYEXT)
+ install-shared-so: libpcap.so
+ 	[ -d $(DESTDIR)$(libdir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+-	VER=`cat $(srcdir)/VERSION`; \
+-	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
+-	$(INSTALL_PROGRAM) libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$VER; \
+-	ln -sf libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \
+-	ln -sf libpcap.so.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.so
++	$(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
++	ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
++	ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
+ install-shared-dylib: libpcap.dylib
+ 	[ -d $(DESTDIR)$(libdir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -440,7 +440,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
+ 			esac
+ 			;;
+ 		    esac
+-		    V_CCOPT="$V_CCOPT $PIC_OPT"
++		    V_CCOPT="$V_CCOPT"
+ 		    V_SONAME_OPT="-Wl,-soname,"
+ 		    V_RPATH_OPT="-Wl,-rpath,"
+ 		    ;;
+@@ -503,7 +503,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
+ 		    #
+ 		    # "cc" is GCC.
+ 		    #
+-		    V_CCOPT="$V_CCOPT -fpic"
++		    V_CCOPT="$V_CCOPT"
+ 		    V_SHLIB_CMD="\$(CC)"
+ 		    V_SHLIB_OPT="-shared"
+ 		    V_SONAME_OPT="-Wl,-soname,"
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -36,16 +36,6 @@ do
+ 	esac
+ 	shift
+ done
+-if [ "$V_RPATH_OPT" != "" ]
+-then
+-	#
+-	# If libdir isn't /usr/lib, add it to the run-time linker path.
+-	#
+-	if [ "$libdir" != "/usr/lib" ]
+-	then
+-		RPATH=$V_RPATH_OPT$libdir
+-	fi
+-fi
+ if [ "$static" = 1 ]
+ then
+ 	#
diff --git a/trunk/package/libs/libpcap/patches/102-makefile_disable_manpages.patch b/trunk/package/libs/libpcap/patches/102-makefile_disable_manpages.patch
new file mode 100644
index 00000000..e49b3acc
--- /dev/null
+++ b/trunk/package/libs/libpcap/patches/102-makefile_disable_manpages.patch
@@ -0,0 +1,71 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -585,68 +585,12 @@ install: install-shared install-archive
+ 	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
+ 	[ -d $(DESTDIR)$(includedir)/pcap ] || \
+ 	    (mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)
+-	[ -d $(DESTDIR)$(mandir)/man1 ] || \
+-	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
+-	[ -d $(DESTDIR)$(mandir)/man3 ] || \
+-	    (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3)
+-	[ -d $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@ ] || \
+-	    (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
+-	[ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
+-	    (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
+ 	for i in $(PUBHDR); do \
+ 		$(INSTALL_DATA) $(srcdir)/$$i \
+ 		    $(DESTDIR)$(includedir)/$$i; done
+ 	[ -d $(DESTDIR)$(bindir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
+ 	$(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
+-	for i in $(MAN1); do \
+-		$(INSTALL_DATA) $(srcdir)/$$i \
+-		    $(DESTDIR)$(mandir)/man1/$$i; done
+-	for i in $(MAN3PCAP_NOEXPAND); do \
+-		$(INSTALL_DATA) $(srcdir)/$$i \
+-		    $(DESTDIR)$(mandir)/man3/$$i; done
+-	for i in $(MAN3PCAP_EXPAND:.in=); do \
+-		$(INSTALL_DATA) $$i \
+-		    $(DESTDIR)$(mandir)/man3/$$i; done
+-	(cd $(DESTDIR)$(mandir)/man3 && \
+-	rm -f pcap_datalink_val_to_description.3pcap && \
+-	$(LN_S) pcap_datalink_val_to_name.3pcap \
+-		 pcap_datalink_val_to_description.3pcap && \
+-	rm -f pcap_dump_fopen.3pcap && \
+-	$(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
+-	rm -f pcap_freealldevs.3pcap && \
+-	$(LN_S) pcap_findalldevs.3pcap pcap_freealldevs.3pcap && \
+-	rm -f pcap_perror.3pcap && \
+-	$(LN_S) pcap_geterr.3pcap pcap_perror.3pcap && \
+-	rm -f pcap_sendpacket.3pcap && \
+-	$(LN_S) pcap_inject.3pcap pcap_sendpacket.3pcap && \
+-	rm -f pcap_free_datalinks.3pcap && \
+-	$(LN_S) pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap && \
+-	rm -f pcap_free_tstamp_types.3pcap && \
+-	$(LN_S) pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap && \
+-	rm -f pcap_dispatch.3pcap && \
+-	$(LN_S) pcap_loop.3pcap pcap_dispatch.3pcap && \
+-	rm -f pcap_minor_version.3pcap && \
+-	$(LN_S) pcap_major_version.3pcap pcap_minor_version.3pcap && \
+-	rm -f pcap_next.3pcap && \
+-	$(LN_S) pcap_next_ex.3pcap pcap_next.3pcap && \
+-	rm -f pcap_open_dead_with_tstamp_precision.3pcap && \
+-	$(LN_S) pcap_open_dead.3pcap \
+-		 pcap_open_dead_with_tstamp_precision.3pcap && \
+-	rm -f pcap_open_offline_with_tstamp_precision.3pcap && \
+-	$(LN_S) pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap && \
+-	rm -f pcap_fopen_offline.3pcap && \
+-	$(LN_S) pcap_open_offline.3pcap pcap_fopen_offline.3pcap && \
+-	rm -f pcap_fopen_offline_with_tstamp_precision.3pcap && \
+-	$(LN_S) pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap && \
+-	rm -f pcap_getnonblock.3pcap && \
+-	$(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
+-	for i in $(MANFILE); do \
+-		$(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
+-		    $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
+-	for i in $(MANMISC); do \
+-		$(INSTALL_DATA) `echo $$i | sed 's/.manmisc.in/.manmisc/'` \
+-		    $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
+ 
+ install-shared: install-shared-$(DYEXT)
+ install-shared-so: libpcap.so
diff --git a/trunk/package/libs/libpcap/patches/103-makefile_flex_workaround.patch b/trunk/package/libs/libpcap/patches/103-makefile_flex_workaround.patch
new file mode 100644
index 00000000..f5427261
--- /dev/null
+++ b/trunk/package/libs/libpcap/patches/103-makefile_flex_workaround.patch
@@ -0,0 +1,14 @@
+
+	Copyright (C) 2006 Markus Wigge
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -59,7 +59,7 @@ LN_S = @LN_S@
+ MKDEP = @MKDEP@
+ CCOPT = @V_CCOPT@
+ INCLS = -I. @V_INCLS@
+-DEFS = @DEFS@ @V_DEFS@
++DEFS = -D_BSD_SOURCE @DEFS@ @V_DEFS@
+ ADDLOBJS = @ADDLOBJS@
+ ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
+ LIBS = @LIBS@
diff --git a/trunk/package/libs/libpcap/patches/201-space_optimization.patch b/trunk/package/libs/libpcap/patches/201-space_optimization.patch
new file mode 100644
index 00000000..ee3cd3b8
--- /dev/null
+++ b/trunk/package/libs/libpcap/patches/201-space_optimization.patch
@@ -0,0 +1,133 @@
+--- a/gencode.c
++++ b/gencode.c
+@@ -511,20 +511,6 @@ pcap_compile_nopcap(int snaplen_arg, int
+ }
+ 
+ /*
+- * Clean up a "struct bpf_program" by freeing all the memory allocated
+- * in it.
+- */
+-void
+-pcap_freecode(struct bpf_program *program)
+-{
+-	program->bf_len = 0;
+-	if (program->bf_insns != NULL) {
+-		free((char *)program->bf_insns);
+-		program->bf_insns = NULL;
+-	}
+-}
+-
+-/*
+  * Backpatch the blocks in 'list' to 'target'.  The 'sense' field indicates
+  * which of the jt and jf fields has been resolved and which is a pointer
+  * back to another unresolved block (or nil).  At least one of the fields
+--- a/pcap.c
++++ b/pcap.c
+@@ -1075,6 +1075,59 @@ static const u_char charmap[] = {
+ 	(u_char)'\374', (u_char)'\375', (u_char)'\376', (u_char)'\377',
+ };
+ 
++/*
++ * Clean up a "struct bpf_program" by freeing all the memory allocated
++ * in it.
++ */
++void
++pcap_freecode(struct bpf_program *program)
++{
++	program->bf_len = 0;
++	if (program->bf_insns != NULL) {
++		free((char *)program->bf_insns);
++		program->bf_insns = NULL;
++	}
++}
++
++/*
++ * Make a copy of a BPF program and put it in the "fcode" member of
++ * a "pcap_t".
++ *
++ * If we fail to allocate memory for the copy, fill in the "errbuf"
++ * member of the "pcap_t" with an error message, and return -1;
++ * otherwise, return 0.
++ */
++int
++install_bpf_program(pcap_t *p, struct bpf_program *fp)
++{
++	size_t prog_size;
++
++	/*
++	 * Validate the program.
++	 */
++	if (!bpf_validate(fp->bf_insns, fp->bf_len)) {
++		snprintf(p->errbuf, sizeof(p->errbuf),
++			"BPF program is not valid");
++		return (-1);
++	}
++
++	/*
++	 * Free up any already installed program.
++	 */
++	pcap_freecode(&p->fcode);
++
++	prog_size = sizeof(*fp->bf_insns) * fp->bf_len;
++	p->fcode.bf_len = fp->bf_len;
++	p->fcode.bf_insns = (struct bpf_insn *)malloc(prog_size);
++	if (p->fcode.bf_insns == NULL) {
++		snprintf(p->errbuf, sizeof(p->errbuf),
++			 "malloc: %s", pcap_strerror(errno));
++		return (-1);
++	}
++	memcpy(p->fcode.bf_insns, fp->bf_insns, prog_size);
++	return (0);
++}
++
+ int
+ pcap_strcasecmp(const char *s1, const char *s2)
+ {
+--- a/optimize.c
++++ b/optimize.c
+@@ -2193,45 +2193,6 @@ icode_to_fcode(struct block *root, u_int
+ 	return fp;
+ }
+ 
+-/*
+- * Make a copy of a BPF program and put it in the "fcode" member of
+- * a "pcap_t".
+- *
+- * If we fail to allocate memory for the copy, fill in the "errbuf"
+- * member of the "pcap_t" with an error message, and return -1;
+- * otherwise, return 0.
+- */
+-int
+-install_bpf_program(pcap_t *p, struct bpf_program *fp)
+-{
+-	size_t prog_size;
+-
+-	/*
+-	 * Validate the program.
+-	 */
+-	if (!bpf_validate(fp->bf_insns, fp->bf_len)) {
+-		snprintf(p->errbuf, sizeof(p->errbuf),
+-			"BPF program is not valid");
+-		return (-1);
+-	}
+-
+-	/*
+-	 * Free up any already installed program.
+-	 */
+-	pcap_freecode(&p->fcode);
+-
+-	prog_size = sizeof(*fp->bf_insns) * fp->bf_len;
+-	p->fcode.bf_len = fp->bf_len;
+-	p->fcode.bf_insns = (struct bpf_insn *)malloc(prog_size);
+-	if (p->fcode.bf_insns == NULL) {
+-		snprintf(p->errbuf, sizeof(p->errbuf),
+-			 "malloc: %s", pcap_strerror(errno));
+-		return (-1);
+-	}
+-	memcpy(p->fcode.bf_insns, fp->bf_insns, prog_size);
+-	return (0);
+-}
+-
+ #ifdef BDEBUG
+ static void
+ opt_dump(struct block *root)
diff --git a/trunk/package/libs/libpcap/patches/202-protocol_api.patch b/trunk/package/libs/libpcap/patches/202-protocol_api.patch
new file mode 100644
index 00000000..c02f8427
--- /dev/null
+++ b/trunk/package/libs/libpcap/patches/202-protocol_api.patch
@@ -0,0 +1,140 @@
+--- a/pcap-linux.c
++++ b/pcap-linux.c
+@@ -380,7 +380,7 @@ static int	iface_get_id(int fd, const ch
+ static int	iface_get_mtu(int fd, const char *device, char *ebuf);
+ static int 	iface_get_arptype(int fd, const char *device, char *ebuf);
+ #ifdef HAVE_PF_PACKET_SOCKETS
+-static int 	iface_bind(int fd, int ifindex, char *ebuf);
++static int 	iface_bind(int fd, int ifindex, char *ebuf, unsigned short proto);
+ #ifdef IW_MODE_MONITOR
+ static int	has_wext(int sock_fd, const char *device, char *ebuf);
+ #endif /* IW_MODE_MONITOR */
+@@ -963,7 +963,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle)
+ 	 * (We assume that if we have Wireless Extensions support
+ 	 * we also have PF_PACKET support.)
+ 	 */
+-	sock_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
++	sock_fd = socket(PF_PACKET, SOCK_RAW, p->opt.proto);
+ 	if (sock_fd == -1) {
+ 		(void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+ 		    "socket: %s", pcap_strerror(errno));
+@@ -1251,6 +1251,9 @@ pcap_activate_linux(pcap_t *handle)
+ 	handle->read_op = pcap_read_linux;
+ 	handle->stats_op = pcap_stats_linux;
+ 
++	if (handle->opt.proto < 0)
++		handle->opt.proto = (int) htons(ETH_P_ALL);
++
+ 	/*
+ 	 * The "any" device is a special device which causes us not
+ 	 * to bind to a particular device and thus to look at all
+@@ -3012,8 +3015,8 @@ activate_new(pcap_t *handle)
+ 	 * try a SOCK_RAW socket for the raw interface.
+ 	 */
+ 	sock_fd = is_any_device ?
+-		socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) :
+-		socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
++		socket(PF_PACKET, SOCK_DGRAM, handle->opt.proto) :
++		socket(PF_PACKET, SOCK_RAW, handle->opt.proto);
+ 
+ 	if (sock_fd == -1) {
+ 		if (errno == EINVAL || errno == EAFNOSUPPORT) {
+@@ -3130,7 +3133,7 @@ activate_new(pcap_t *handle)
+ 				return PCAP_ERROR;
+ 			}
+ 			sock_fd = socket(PF_PACKET, SOCK_DGRAM,
+-			    htons(ETH_P_ALL));
++			    handle->opt.proto);
+ 			if (sock_fd == -1) {
+ 				snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+ 				    "socket: %s", pcap_strerror(errno));
+@@ -3193,7 +3196,7 @@ activate_new(pcap_t *handle)
+ 		}
+ 
+ 		if ((err = iface_bind(sock_fd, handlep->ifindex,
+-		    handle->errbuf)) != 1) {
++		    handle->errbuf, handle->opt.proto)) != 1) {
+ 		    	close(sock_fd);
+ 			if (err < 0)
+ 				return err;
+@@ -4667,7 +4670,7 @@ iface_get_id(int fd, const char *device,
+  *  or a PCAP_ERROR_ value on a hard error.
+  */
+ static int
+-iface_bind(int fd, int ifindex, char *ebuf)
++iface_bind(int fd, int ifindex, char *ebuf, unsigned short proto)
+ {
+ 	struct sockaddr_ll	sll;
+ 	int			err;
+@@ -4676,7 +4679,7 @@ iface_bind(int fd, int ifindex, char *eb
+ 	memset(&sll, 0, sizeof(sll));
+ 	sll.sll_family		= AF_PACKET;
+ 	sll.sll_ifindex		= ifindex;
+-	sll.sll_protocol	= htons(ETH_P_ALL);
++	sll.sll_protocol	= proto;
+ 
+ 	if (bind(fd, (struct sockaddr *) &sll, sizeof(sll)) == -1) {
+ 		if (errno == ENETDOWN) {
+@@ -5561,7 +5564,7 @@ activate_old(pcap_t *handle)
+ 
+ 	/* Open the socket */
+ 
+-	handle->fd = socket(PF_INET, SOCK_PACKET, htons(ETH_P_ALL));
++	handle->fd = socket(PF_INET, SOCK_PACKET, handle->opt.proto);
+ 	if (handle->fd == -1) {
+ 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+ 			 "socket: %s", pcap_strerror(errno));
+--- a/pcap.c
++++ b/pcap.c
+@@ -556,6 +556,7 @@ pcap_create_common(const char *source, c
+ 	p->opt.promisc = 0;
+ 	p->opt.rfmon = 0;
+ 	p->opt.immediate = 0;
++	p->opt.proto = -1;
+ 	p->opt.tstamp_type = -1;	/* default to not setting time stamp type */
+ 	p->opt.tstamp_precision = PCAP_TSTAMP_PRECISION_MICRO;
+ 	return (p);
+@@ -713,6 +714,15 @@ pcap_get_tstamp_precision(pcap_t *p)
+ }
+ 
+ int
++pcap_set_protocol(pcap_t *p, unsigned short proto)
++{
++	if (pcap_check_activated(p))
++		return PCAP_ERROR_ACTIVATED;
++	p->opt.proto = proto;
++	return 0;
++}
++
++int
+ pcap_activate(pcap_t *p)
+ {
+ 	int status;
+--- a/pcap/pcap.h
++++ b/pcap/pcap.h
+@@ -68,6 +68,7 @@ extern "C" {
+ #define PCAP_VERSION_MINOR 4
+ 
+ #define PCAP_ERRBUF_SIZE 256
++#define HAS_PROTO_EXTENSION
+ 
+ /*
+  * Compatibility for systems that have a bpf.h that
+@@ -283,6 +284,7 @@ int	pcap_set_timeout(pcap_t *, int);
+ int	pcap_set_tstamp_type(pcap_t *, int);
+ int	pcap_set_immediate_mode(pcap_t *, int);
+ int	pcap_set_buffer_size(pcap_t *, int);
++int	pcap_set_protocol(pcap_t *, unsigned short);
+ int	pcap_set_tstamp_precision(pcap_t *, int);
+ int	pcap_get_tstamp_precision(pcap_t *);
+ int	pcap_activate(pcap_t *);
+--- a/pcap-int.h
++++ b/pcap-int.h
+@@ -88,6 +88,7 @@ struct pcap_opt {
+ 	char	*source;
+ 	int	timeout;	/* timeout for buffering */
+ 	int	buffer_size;
++	int	proto;      /* protocol for packet socket (linux) */
+ 	int	promisc;
+ 	int	rfmon;		/* monitor mode */
+ 	int	immediate;	/* immediate mode - deliver packets as soon as they arrive */
diff --git a/trunk/package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch b/trunk/package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch
new file mode 100644
index 00000000..ce1acdc7
--- /dev/null
+++ b/trunk/package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch
@@ -0,0 +1,11 @@
+--- a/pcap-linux.c
++++ b/pcap-linux.c
+@@ -249,6 +249,8 @@ static const char rcsid[] _U_ =
+ typedef int		socklen_t;
+ #endif
+ 
++#undef IW_MODE_MONITOR
++
+ #ifndef MSG_TRUNC
+ /*
+  * This is being compiled on a system that lacks MSG_TRUNC; define it
diff --git a/trunk/package/libs/libreadline/Makefile b/trunk/package/libs/libreadline/Makefile
new file mode 100644
index 00000000..a9e6a221
--- /dev/null
+++ b/trunk/package/libs/libreadline/Makefile
@@ -0,0 +1,74 @@
+# 
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=readline
+PKG_VERSION:=6.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/readline
+PKG_MD5SUM:=33c8fb279e981274f485fd91da77e94a
+
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libreadline
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Command lines edition library
+  URL:=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+endef
+
+define Package/libreadline/description
+	The Readline library provides a set of functions for use by applications 
+	that allow users to edit command lines as they are typed in. Both Emacs 
+	and vi editing modes are available. The Readline library includes 
+	additional functions to maintain a list of previously-entered command 
+	lines, to recall and perhaps reedit those lines, and perform csh-like 
+	history expansion on previous commands.
+endef
+
+define Build/Configure
+	$(CP) $(SCRIPT_DIR)/config.guess $(SCRIPT_DIR)/config.sub $(PKG_BUILD_DIR)/support/
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+		--without-curses \
+		bash_cv_wcwidth_broken=no \
+		bash_cv_func_sigsetjmp=yes \
+	)
+endef
+
+TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS)
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so,so.6,so.6.3} $(1)/usr/lib/
+endef
+
+define Package/libreadline/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{so,so.6,so.6.3} $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libreadline))
diff --git a/trunk/package/libs/libroxml/Makefile b/trunk/package/libs/libroxml/Makefile
new file mode 100644
index 00000000..1c7b3d34
--- /dev/null
+++ b/trunk/package/libs/libroxml/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libroxml
+PKG_VERSION:=2.3.0
+PKG_RELEASE:=2
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://download.libroxml.net/pool/v2.x
+PKG_MD5SUM:=a975f91be150f7a19168a45ce15769ca
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=LGPL-2.1+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libroxml
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Minimum, easy-to-use, C implementation for xml file parsing
+  URL:=http://www.libroxml.net/
+endef
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-roxml
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/libroxml/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libroxml.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libroxml))
diff --git a/trunk/package/libs/librpc/Makefile b/trunk/package/libs/librpc/Makefile
new file mode 100644
index 00000000..d68e3609
--- /dev/null
+++ b/trunk/package/libs/librpc/Makefile
@@ -0,0 +1,34 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=librpc
+PKG_VERSION:=0.9.32-rc2
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/uclibc-rpc.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=0a2179bbc0844928f2a0ec01dba93d9b5d6d41a7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+CMAKE_INSTALL:=1
+PKG_USE_MIPS16:=0
+
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/librpc
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=uClibc RPC library
+endef
+
+define Package/librpc/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/librpc.so $(1)/lib/
+endef
+
+$(eval $(call BuildPackage,librpc))
diff --git a/trunk/package/libs/librpc/patches/100-compat_fix.patch b/trunk/package/libs/librpc/patches/100-compat_fix.patch
new file mode 100644
index 00000000..a0f03f6e
--- /dev/null
+++ b/trunk/package/libs/librpc/patches/100-compat_fix.patch
@@ -0,0 +1,214 @@
+--- a/compat.h
++++ /dev/null
+@@ -1,32 +0,0 @@
+-#ifndef __UCLIBC_COMPAT_H
+-#define __UCLIBC_COMPAT_H
+-
+-#define _XOPEN_SOURCE
+-#define _GNU_SOURCE
+-
+-#include <features.h>
+-#include <errno.h>
+-
+-#undef __UCLIBC_HAS_THREADS__
+-#include <bits/uClibc_mutex.h>
+-#include <sys/poll.h>
+-
+-#if 0
+-#undef __UCLIBC_MUTEX_LOCK
+-#undef __UCLIBC_MUTEX_UNLOCK
+-#define __UCLIBC_MUTEX_LOCK(M) pthread_mutex_lock(&(M))
+-#define __UCLIBC_MUTEX_UNLOCK(M) pthread_mutex_unlock(&(M))
+-#endif
+-
+-#define smallint int
+-
+-#define _(...) __VA_ARGS__
+-#define internal_function
+-#define attribute_hidden
+-#define attribute_unused
+-#define attribute_noreturn
+-#define libc_hidden_def(...)
+-
+-#define __set_errno(_val) errno = _val
+-
+-#endif
+--- a/rcmd.c
++++ b/rcmd.c
+@@ -85,7 +85,6 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (
+ #include <wchar.h>
+ #endif
+ #include <sys/uio.h>
+-#include <bits/uClibc_alloc.h>
+ 
+ 
+ /* some forward declarations */
+--- a/create_xid.c
++++ b/create_xid.c
+@@ -28,7 +28,6 @@
+ 
+ /* The RPC code is not threadsafe, but new code should be threadsafe. */
+ 
+-#include <bits/uClibc_mutex.h>
+ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
+ 
+ static smallint is_initialized;
+--- a/getrpcent.c
++++ b/getrpcent.c
+@@ -257,7 +257,6 @@ static struct rpcent *interpret(register
+ 
+ #if defined(__UCLIBC_HAS_REENTRANT_RPC__)
+ 
+-#include <bits/uClibc_mutex.h>
+ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
+ 
+ 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 2.6)
+ 
+ PROJECT(rpc C)
+-ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -I. -include compat.h)
++ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -I. -include rpc/compat.h)
+ 
+ FILE(GLOB SOURCES *.c)
+ 
+--- a/rpc/types.h
++++ b/rpc/types.h
+@@ -33,6 +33,8 @@
+ #ifndef _RPC_TYPES_H
+ #define _RPC_TYPES_H 1
+ 
++#include "compat.h"
++
+ #ifdef _LIBC
+ /* Some adjustments to make the libc source from glibc
+  * compile more easily with uClibc... */
+--- a/clnt_perror.c
++++ b/clnt_perror.c
+@@ -246,7 +246,7 @@ clnt_sperror (CLIENT * rpch, const char 
+ 
+     case RPC_CANTSEND:
+     case RPC_CANTRECV:
+-      __glibc_strerror_r (e.re_errno, chrbuf, sizeof chrbuf);
++      strerror_r (e.re_errno, chrbuf, sizeof chrbuf);
+       len = sprintf (str, "; errno = %s", chrbuf);
+       str += len;
+       break;
+@@ -336,7 +336,7 @@ clnt_spcreateerror (const char *msg)
+       (void) strcpy(cp, " - ");
+       cp += strlen(cp);
+ 
+-      __glibc_strerror_r (ce->cf_error.re_errno, chrbuf, sizeof chrbuf);
++      strerror_r (ce->cf_error.re_errno, chrbuf, sizeof chrbuf);
+       (void) strcpy(cp, chrbuf);
+       cp += strlen(cp);
+       break;
+--- a/rpc_thread.c
++++ b/rpc_thread.c
+@@ -13,9 +13,6 @@
+ 
+ #ifdef __UCLIBC_HAS_THREADS__
+ 
+-#include <bits/libc-tsd.h>
+-#include <bits/libc-lock.h>
+-
+ /* Variable used in non-threaded applications or for the first thread.  */
+ static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
+ __libc_tsd_define (, RPC_VARS)
+@@ -52,16 +49,17 @@ rpc_thread_multi (void)
+   __libc_tsd_set (RPC_VARS, &__libc_tsd_RPC_VARS_mem);
+ }
+ 
++__UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
+ 
+ struct rpc_thread_variables attribute_hidden *
+ __rpc_thread_variables (void)
+ {
+-	__libc_once_define (static, once);
+ 	struct rpc_thread_variables *tvp;
+ 
++	__UCLIBC_MUTEX_LOCK(mylock);
+ 	tvp = __libc_tsd_get (RPC_VARS);
+ 	if (tvp == NULL) {
+-		__libc_once (once, rpc_thread_multi);
++		rpc_thread_multi();
+ 		tvp = __libc_tsd_get (RPC_VARS);
+ 		if (tvp == NULL) {
+ 			tvp = calloc (1, sizeof *tvp);
+@@ -71,6 +69,7 @@ __rpc_thread_variables (void)
+ 				tvp = __libc_tsd_get (RPC_VARS);
+ 		}
+ 	}
++	__UCLIBC_MUTEX_UNLOCK(mylock);
+ 	return tvp;
+ }
+ 
+--- /dev/null
++++ b/rpc/compat.h
+@@ -0,0 +1,53 @@
++#ifndef __UCLIBC_COMPAT_H
++#define __UCLIBC_COMPAT_H
++
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++
++#include <features.h>
++#include <errno.h>
++
++#ifndef __UCLIBC_HAS_THREADS__
++#define __UCLIBC_HAS_THREADS__
++#endif
++
++#include <sys/poll.h>
++#include <pthread.h>
++
++#ifdef __UCLIBC__
++#include <bits/libc-lock.h>
++#else
++#undef __UCLIBC_MUTEX_STATIC
++#undef __UCLIBC_MUTEX_LOCK
++#undef __UCLIBC_MUTEX_UNLOCK
++#define __UCLIBC_MUTEX_STATIC(M,I) static pthread_mutex_t M = I
++#define __UCLIBC_MUTEX_LOCK(M) pthread_mutex_lock(&(M))
++#define __UCLIBC_MUTEX_UNLOCK(M) pthread_mutex_unlock(&(M))
++#endif
++
++#define smallint int
++
++#define _(...) __VA_ARGS__
++#define internal_function
++#define attribute_hidden
++#define attribute_unused
++#define attribute_noreturn
++#define libc_hidden_def(...)
++
++#ifndef libc_hidden_proto
++#define libc_hidden_proto(name, attrs...)
++#endif
++
++#define __set_errno(_val) errno = _val
++
++# define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec")))
++
++# define __libc_tsd_define(CLASS, KEY)  \
++  CLASS __thread void *__libc_tsd_##KEY attribute_tls_model_ie;
++
++# define __libc_tsd_address(KEY)    (&__libc_tsd_##KEY)
++# define __libc_tsd_get(KEY)        (__libc_tsd_##KEY)
++# define __libc_tsd_set(KEY, VALUE) (__libc_tsd_##KEY = (VALUE))
++
++
++#endif
+--- a/rpc/netdb.h
++++ b/rpc/netdb.h
+@@ -41,6 +41,8 @@
+ #define __need_size_t
+ #include <stddef.h>
+ 
++#include "types.h"
++
+ __BEGIN_DECLS
+ 
+ struct rpcent
diff --git a/trunk/package/libs/librpc/patches/110-musl_fixes.patch b/trunk/package/libs/librpc/patches/110-musl_fixes.patch
new file mode 100644
index 00000000..969f3e7b
--- /dev/null
+++ b/trunk/package/libs/librpc/patches/110-musl_fixes.patch
@@ -0,0 +1,330 @@
+--- a/rpc/types.h
++++ b/rpc/types.h
+@@ -79,22 +79,6 @@ typedef unsigned long rpcport_t;
+ #include <sys/types.h>
+ #endif
+ 
+-#ifndef __u_char_defined
+-typedef __u_char u_char;
+-typedef __u_short u_short;
+-typedef __u_int u_int;
+-typedef __u_long u_long;
+-typedef __quad_t quad_t;
+-typedef __u_quad_t u_quad_t;
+-typedef __fsid_t fsid_t;
+-# define __u_char_defined
+-#endif
+-#ifndef __daddr_t_defined
+-typedef __daddr_t daddr_t;
+-typedef __caddr_t caddr_t;
+-# define __daddr_t_defined
+-#endif
+-
+ #include <sys/time.h>
+ #include <sys/param.h>
+ 
+--- a/bindresvport.c
++++ b/bindresvport.c
+@@ -39,6 +39,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <netdb.h>
+ 
+ 
+ /*
+--- a/rpc/netdb.h
++++ b/rpc/netdb.h
+@@ -37,12 +37,17 @@
+ #define _RPC_NETDB_H	1
+ 
+ #include <features.h>
++#include <netdb.h>
+ 
+ #define __need_size_t
+ #include <stddef.h>
+ 
+ #include "types.h"
+ 
++#ifndef NETDB_INTERNAL
++#define NETDB_INTERNAL -1
++#endif
++
+ __BEGIN_DECLS
+ 
+ struct rpcent
+--- a/create_xid.c
++++ b/create_xid.c
+@@ -31,7 +31,6 @@
+ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
+ 
+ static smallint is_initialized;
+-static struct drand48_data __rpc_lrand48_data;
+ 
+ u_long _create_xid (void) attribute_hidden;
+ u_long _create_xid (void)
+@@ -45,11 +44,11 @@ u_long _create_xid (void)
+       struct timeval now;
+ 
+       gettimeofday (&now, (struct timezone *) 0);
+-      srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data);
++      srand48 (now.tv_sec ^ now.tv_usec);
+       is_initialized = 1;
+     }
+ 
+-  lrand48_r (&__rpc_lrand48_data, &res);
++  res = lrand48();
+ 
+   __UCLIBC_MUTEX_UNLOCK(mylock);
+ 
+--- a/clnt_tcp.c
++++ b/clnt_tcp.c
+@@ -58,7 +58,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <rpc/rpc.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <rpc/pmap_clnt.h>
+ #ifdef USE_IN_LIBIO
+--- a/clnt_udp.c
++++ b/clnt_udp.c
+@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)clnt_udp.c 1
+ #include <rpc/rpc.h>
+ #include <rpc/xdr.h>
+ #include <rpc/clnt.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netdb.h>
+--- a/clnt_unix.c
++++ b/clnt_unix.c
+@@ -55,7 +55,7 @@
+ #include <unistd.h>
+ #include <rpc/rpc.h>
+ #include <sys/uio.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <rpc/pmap_clnt.h>
+ #ifdef USE_IN_LIBIO
+--- a/pmap_rmt.c
++++ b/pmap_rmt.c
+@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1
+ #include <rpc/pmap_prot.h>
+ #include <rpc/pmap_clnt.h>
+ #include <rpc/pmap_rmt.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- a/rcmd.c
++++ b/rcmd.c
+@@ -62,9 +62,10 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (
+ #define __UCLIBC_HIDE_DEPRECATED__
+ #include <features.h>
+ #include <sys/param.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ 
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+@@ -86,6 +87,11 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (
+ #endif
+ #include <sys/uio.h>
+ 
++#ifndef _PATH_HEQUIV
++#define _PATH_HEQUIV "/etc/hosts.equiv"
++#endif
++
++int rresvport(int *alport);
+ 
+ /* some forward declarations */
+ static int __ivaliduser2(FILE *hostf, u_int32_t raddr,
+@@ -106,7 +112,7 @@ int rcmd(char **ahost, u_short rport, co
+ 	struct hostent *hp;
+ 	struct sockaddr_in sin, from;
+ 	struct pollfd pfd[2];
+-	int32_t oldmask;
++	sigset_t sig, osig;
+ 	pid_t pid;
+ 	int s, lport, timo;
+ 	char c;
+@@ -145,7 +151,9 @@ int rcmd(char **ahost, u_short rport, co
+ 	pfd[1].events = POLLIN;
+ 
+         *ahost = hp->h_name;
+-        oldmask = sigblock(sigmask(SIGURG)); /* __sigblock */
++	sigemptyset(&sig);
++	sigaddset(&sig, SIGURG);
++	sigprocmask(SIG_BLOCK, &sig, &osig);
+ 	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
+ 		s = rresvport(&lport);
+ 		if (s < 0) {
+@@ -154,7 +162,7 @@ int rcmd(char **ahost, u_short rport, co
+ 					  "rcmd: socket: All ports in use\n");
+ 			else
+ 			    (void)fprintf(stderr, "rcmd: socket: %m\n");
+-			sigsetmask(oldmask); /* sigsetmask */
++			sigprocmask(SIG_SETMASK, &osig, NULL);
+ 			return -1;
+ 		}
+ 		fcntl(s, F_SETOWN, pid);
+@@ -189,7 +197,7 @@ int rcmd(char **ahost, u_short rport, co
+ 			continue;
+ 		}
+ 		(void)fprintf(stderr, "%s: %m\n", hp->h_name);
+-		sigsetmask(oldmask); /* __sigsetmask */
++		sigprocmask(SIG_SETMASK, &osig, NULL);
+ 		return -1;
+ 	}
+ 	lport--;
+@@ -256,14 +264,14 @@ int rcmd(char **ahost, u_short rport, co
+ 		}
+ 		goto bad2;
+ 	}
+-	sigsetmask(oldmask);
++	sigprocmask(SIG_SETMASK, &osig, NULL);
+ 	return s;
+ bad2:
+ 	if (lport)
+ 		(void)close(*fd2p);
+ bad:
+ 	(void)close(s);
+-	sigsetmask(oldmask);
++	sigprocmask(SIG_SETMASK, &osig, NULL);
+ 	return -1;
+ }
+ 
+--- a/rpc/compat.h
++++ b/rpc/compat.h
+@@ -11,7 +11,7 @@
+ #define __UCLIBC_HAS_THREADS__
+ #endif
+ 
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <pthread.h>
+ 
+ #ifdef __UCLIBC__
+--- a/rpc_commondata.c
++++ b/rpc_commondata.c
+@@ -27,7 +27,7 @@
+  * Mountain View, California  94043
+  */
+ #include <rpc/rpc.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/select.h>
+ 
+ #undef svc_fdset
+--- a/rtime.c
++++ b/rtime.c
+@@ -51,13 +51,16 @@ static char sccsid[] = "@(#)rtime.c	2.2 
+ #include <rpc/rpc.h>
+ #include <rpc/clnt.h>
+ #include <sys/types.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <rpc/auth_des.h>
+ #include <errno.h>
+ #include <netinet/in.h>
+ 
++#ifndef IPPORT_TIMESERVER
++#define IPPORT_TIMESERVER 37
++#endif
+ 
+ #define NYEARS	(u_long)(1970 - 1900)
+ #define TOFFSET (u_long)(60*60*24*(365*NYEARS + (NYEARS/4)))
+--- a/svc.c
++++ b/svc.c
+@@ -44,7 +44,7 @@
+ #include "rpc_private.h"
+ #include <rpc/svc.h>
+ #include <rpc/pmap_clnt.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ /* used by svc_[max_]pollfd */
+ /* used by svc_fdset */
+--- a/svc_run.c
++++ b/svc_run.c
+@@ -36,7 +36,7 @@
+ 
+ #include <errno.h>
+ #include <unistd.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <rpc/rpc.h>
+ 
+ /* used by svc_[max_]pollfd */
+--- a/svc_tcp.c
++++ b/svc_tcp.c
+@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)svc_tcp.c 1.
+ #include <string.h>
+ #include <rpc/rpc.h>
+ #include <sys/socket.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <errno.h>
+ #include <stdlib.h>
+ 
+--- a/svc_unix.c
++++ b/svc_unix.c
+@@ -47,7 +47,7 @@
+ #include <rpc/svc.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <errno.h>
+ #include <stdlib.h>
+ 
+--- a/sa_len.c
++++ b/sa_len.c
+@@ -20,9 +20,9 @@
+ #include <features.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+-#include <netipx/ipx.h>
+ #include <sys/un.h>
+ #if 0
++#include <netipx/ipx.h>
+ #include <netash/ash.h>
+ #include <netatalk/at.h>
+ #include <netax25/ax25.h>
+@@ -49,13 +49,13 @@ int __libc_sa_len (sa_family_t af)
+       return sizeof (struct sockaddr_rose);
+     case AF_PACKET:
+       return sizeof (struct sockaddr_ll);
++    case AF_IPX:
++      return sizeof (struct sockaddr_ipx);
+ #endif
+     case AF_INET:
+       return sizeof (struct sockaddr_in);
+     case AF_INET6:
+       return sizeof (struct sockaddr_in6);
+-    case AF_IPX:
+-      return sizeof (struct sockaddr_ipx);
+     case AF_LOCAL:
+       return sizeof (struct sockaddr_un);
+     }
+--- a/xdr_float.c
++++ b/xdr_float.c
+@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)xdr_float.c 
+  * This routine works on Suns (Sky / 68000's) and Vaxen.
+  */
+ 
+-#define LSW	(__FLOAT_WORD_ORDER == __BIG_ENDIAN)
++#define LSW	(__BYTE_ORDER == __BIG_ENDIAN)
+ 
+ #ifdef vax
+ 
diff --git a/trunk/package/libs/libtool/Makefile b/trunk/package/libs/libtool/Makefile
new file mode 100644
index 00000000..6afa8bd0
--- /dev/null
+++ b/trunk/package/libs/libtool/Makefile
@@ -0,0 +1,52 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libtool
+PKG_VERSION:=2.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/libtool
+PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021
+
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_PARALLEL:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+CONFIGURE_PREFIX=$(STAGING_DIR)/host
+export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
+
+define Package/libltdl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A generic dynamic object loading library
+  URL:=http://www.gnu.org/software/libtool/
+endef
+
+define Build/InstallDev
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		bindir="$(2)/bin" \
+		datadir="$(2)/share" \
+		prefix="$(2)" \
+		exec_prefix="$(2)" \
+		install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
+	mv $(2)/lib/* $(1)/usr/lib/
+	mv $(2)/include/* $(1)/usr/include/
+endef
+
+define Package/libltdl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libltdl/.libs/libltdl.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libltdl))
diff --git a/trunk/package/libs/libubox/Makefile b/trunk/package/libs/libubox/Makefile
new file mode 100644
index 00000000..9e454aa9
--- /dev/null
+++ b/trunk/package/libs/libubox/Makefile
@@ -0,0 +1,99 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libubox
+PKG_VERSION:=2014-11-23
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://git.openwrt.org/project/libubox.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=f09ae76445e32511433fdab0a1bcda73aa84986d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_BUILD_DEPENDS:=lua
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libubox
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Basic utility library
+  ABI_VERSION:=$(PKG_VERSION)
+  DEPENDS:=
+endef
+
+define Package/libblobmsg-json
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=blobmsg <-> json conversion library
+  DEPENDS:=+libjson-c +libubox
+endef
+
+define Package/jshn
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libjson-c +libubox +libblobmsg-json
+  TITLE:=JSON SHell Notation
+endef
+
+define Package/jshn/description
+  Library for parsing and generating JSON from shell scripts
+endef
+
+define Package/libjson-script
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libubox
+  TITLE:=Minimalistic JSON based scripting engine
+endef
+
+define Package/libubox-lua
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libubox +liblua
+  TITLE:=Lua binding for the libreCMC Basic utility library
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+CMAKE_OPTIONS = \
+	-DLUAPATH=/usr/lib/lua
+
+define Package/libubox/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so $(1)/lib/
+endef
+
+define Package/libblobmsg-json/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/
+endef
+
+define Package/jshn/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/libubox
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jshn $(1)/usr/bin
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/libubox/jshn.sh $(1)/usr/share/libubox
+endef
+
+define Package/libjson-script/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/
+endef
+
+define Package/libubox-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(CP) $(PKG_BUILD_DIR)/lua/uloop.so $(1)/usr/lib/lua/
+endef
+
+$(eval $(call BuildPackage,libubox))
+$(eval $(call BuildPackage,libblobmsg-json))
+$(eval $(call BuildPackage,jshn))
+$(eval $(call BuildPackage,libjson-script))
+$(eval $(call BuildPackage,libubox-lua))
diff --git a/trunk/package/libs/libusb-compat/Makefile b/trunk/package/libs/libusb-compat/Makefile
new file mode 100644
index 00000000..561091f6
--- /dev/null
+++ b/trunk/package/libs/libusb-compat/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2010-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libusb-compat
+PKG_VERSION:=0.1.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/libusb
+PKG_MD5SUM:=2ca521fffadd0c28fdf174e6ec73865b
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=LGPL-2.1
+
+PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libusb-compat
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=libusb-0.1 compatibility library
+  DEPENDS:=+libusb-1.0
+  URL:=http://libusb.wiki.sourceforge.net/
+endef
+
+define Package/libusb-compat/description
+  libusb is a C library that gives applications easy access to USB devices on
+  many different operating systems.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(INSTALL_DIR) $(2)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(2)/bin/
+endef
+
+define Package/libusb-compat/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb-0.1.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libusb-compat))
diff --git a/trunk/package/libs/libusb/Makefile b/trunk/package/libs/libusb/Makefile
new file mode 100644
index 00000000..2796b051
--- /dev/null
+++ b/trunk/package/libs/libusb/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2010-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libusb
+PKG_VERSION:=1.0.9
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=7f5a02375ad960d4e33a6dae7d63cfcb
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=LGPL-2.1
+
+PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libusb-1.0
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A library for accessing Linux USB devices
+  DEPENDS:=+libpthread +librt
+  URL:=http://libusb.wiki.sourceforge.net/
+endef
+
+define Package/libusb-1.0/description
+  libusb is a C library that gives applications easy access to USB devices on
+  many different operating systems.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/InstallDev
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/libusb-1.0/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libusb-1.0))
diff --git a/trunk/package/libs/libusb/patches/001-timerfd.patch b/trunk/package/libs/libusb/patches/001-timerfd.patch
new file mode 100644
index 00000000..de48a7fd
--- /dev/null
+++ b/trunk/package/libs/libusb/patches/001-timerfd.patch
@@ -0,0 +1,33 @@
+commit cadb77d99e314e42c3eb02d016e9d90136ec6959
+Author: Alexander Gordeev <lasaine@lvk.cs.msu.su>
+Date:   Thu Jan 27 06:39:16 2011 +0300
+
+    fix timerfd initialization
+    
+    sys/timerfd.h defines TFD_NONBLOCK as 0x800 but in kernel TFD_NONBLOCK
+    is an alias for O_NONBLOCK which is defined in arch-specific fcntl.h.
+    While it's still 0x800 for most of archs but for mips it's 0x80. So
+    timerfd_create(..., TFD_NONBLOCK) returns -EINVAL because of that. Fix
+    this by using O_NONBLOCK instead.
+    
+    Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
+
+--- a/libusb/io.c
++++ b/libusb/io.c
+@@ -20,6 +20,7 @@
+ 
+ #include <config.h>
+ #include <errno.h>
++#include <fcntl.h>
+ #include <signal.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+@@ -1072,7 +1073,7 @@ int usbi_io_init(struct libusb_context *
+ 
+ #ifdef USBI_TIMERFD_AVAILABLE
+ 	ctx->timerfd = timerfd_create(usbi_backend->get_timerfd_clockid(),
+-		TFD_NONBLOCK);
++		O_NONBLOCK);
+ 	if (ctx->timerfd >= 0) {
+ 		usbi_dbg("using timerfd for timeouts");
+ 		r = usbi_add_pollfd(ctx, ctx->timerfd, POLLIN);
diff --git a/trunk/package/libs/lzo/Makefile b/trunk/package/libs/lzo/Makefile
new file mode 100644
index 00000000..6a88a6f3
--- /dev/null
+++ b/trunk/package/libs/lzo/Makefile
@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lzo
+PKG_VERSION:=2.08
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/lzo/download/
+PKG_MD5SUM:=fcec64c26a0f4f4901468f360029678f
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_LICENSE:=GPL-2.0+
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/liblzo
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A real-time data compression library
+  URL:=http://www.oberhumer.com/opensource/lzo/
+endef
+
+define Package/liblzo/description
+ LZO is a data compression library which is suitable for data de-/compression
+ in real-time. This means it favours speed over compression ratio.
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+	)
+endef
+
+TARGET_CFLAGS += $(FPIC)
+MAKE_FLAGS += CFLAGS_O="$(TARGET_CFLAGS)"
+
+ifeq ($(CONFIG_i386)$(CONFIG_x86_64),)
+  TARGET_CFLAGS += -DLZO_CFG_NO_UNALIGNED=1
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lzo $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/liblzo/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,liblzo))
diff --git a/trunk/package/libs/ncurses/Makefile b/trunk/package/libs/ncurses/Makefile
new file mode 100644
index 00000000..5d6e8fe2
--- /dev/null
+++ b/trunk/package/libs/ncurses/Makefile
@@ -0,0 +1,154 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ncurses
+PKG_VERSION:=5.9
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/ncurses
+PKG_MD5SUM:=8cb9c412e5f2d96bc6f459aa8c6282a1
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=README
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libncurses
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Terminal handling library
+  URL:=http://www.gnu.org/software/ncurses/
+  DEPENDS:= +terminfo
+  VARIANT:=libncurses
+endef
+
+define Package/terminfo
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Terminal Info Database (ncurses)
+  URL:=http://www.gnu.org/software/ncurses/
+  VARIANT:=libncurses
+endef
+
+define Package/libncursesw
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Terminal handling library (Unicode)
+  URL:=http://www.gnu.org/software/ncurses/
+  VARIANT:=libncursesw
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-echo \
+	--enable-const \
+	--enable-overwrite \
+	--disable-rpath \
+	--without-ada \
+	--without-debug \
+	--without-profile \
+	--without-progs \
+	--disable-big-core \
+	--disable-home-terminfo \
+	--with-normal \
+	--with-shared \
+	--with-terminfo-dirs=/usr/share/terminfo \
+	--with-default-terminfo-dir=/usr/share/terminfo
+
+ifeq ($(HOST_OS),FreeBSD)
+	CONFIGURE_ARGS +=
+		--with-terminfo=/usr/share/terminfo.db 
+endif
+
+ifeq ($(BUILD_VARIANT),libncursesw)
+	CONFIGURE_ARGS += \
+		--enable-widec \
+		--with-build-cppflags=-D_GNU_SOURCE
+endif
+
+MAKE_FLAGS += \
+	BUILD_CC="$(HOSTCC)" \
+	HOSTCC="$(HOSTCC)" \
+	HOSTCCFLAGS="" \
+	libs
+
+define Build/Install/Default
+	$(MAKE_VARS) \
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+		$(MAKE_INSTALL_FLAGS) \
+		$(1) install.libs install.data;
+endef
+
+define Package/terminfo/install
+	echo ""
+ifneq ($(HOST_OS),FreeBSD)
+	$(INSTALL_DIR) $(1)/usr/share/terminfo
+	(cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
+		for dir in ??; do \
+			[ -d "$$$$dir" ] || continue; \
+			mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \
+		done \
+	)
+	for file in a/ansi d/dumb l/linux r/rxvt r/rxvt-unicode s/screen v/vt100 v/vt102 x/xterm x/xterm-color x/xterm-256color; do \
+		$(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
+		$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
+			$(1)/usr/share/terminfo/$$$$file; \
+	done
+endif
+endef
+
+define Package/libncurses/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/
+endef
+
+define Package/libncursesw/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/
+endef
+
+ifeq ($(BUILD_VARIANT),libncursesw)
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/ncursesw/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ncursesw/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw5-config $(2)/bin/
+	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \
+		$(2)/bin/ncursesw5-config
+	$(LN) $(2)/bin/ncursesw5-config $(1)/usr/bin/ncursesw5-config
+endef
+else
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncurses5-config $(2)/bin/
+	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+		$(2)/bin/ncurses5-config
+	$(LN) $(2)/bin/ncurses5-config $(1)/usr/bin/ncurses5-config
+endef
+endif
+
+$(eval $(call BuildPackage,terminfo))
+$(eval $(call BuildPackage,libncurses))
+$(eval $(call BuildPackage,libncursesw))
diff --git a/trunk/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch b/trunk/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
new file mode 100644
index 00000000..20a6b43c
--- /dev/null
+++ b/trunk/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
@@ -0,0 +1,175 @@
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -4208,6 +4208,172 @@ rxvt-cygwin-native|rxvt terminal emulato
+ rxvt-16color|xterm with 16 colors like aixterm,
+ 	ncv#32, use=ibm+16color, use=rxvt,
+ 
++# rxvt-unicode
++# http://cvs.schmorp.de/rxvt-unicode/doc/etc/rxvt-unicode.terminfo?revision=1.20
++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
++# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005
++rxvt-unicode|rxvt-unicode terminal (X Window System),
++	am,
++	bce,
++	eo,
++	km,
++	msgr,
++	xenl,
++	hs,
++	cols#80,
++	it#8,
++	lines#24,
++	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
++	bel=^G,
++	blink=\E[5m,
++	bold=\E[1m,
++	civis=\E[?25l,
++	clear=\E[H\E[2J,
++	cnorm=\E[?25h,
++	cr=^M,
++	csr=\E[%i%p1%d;%p2%dr,
++	cub=\E[%p1%dD,
++	cub1=^H,
++	cud=\E[%p1%dB,
++	cud1=^J,
++	cuf=\E[%p1%dC,
++	cuf1=\E[C,
++	cup=\E[%i%p1%d;%p2%dH,
++	cuu=\E[%p1%dA,
++	cuu1=\E[A,
++	cvvis=\E[?25h,
++	dch=\E[%p1%dP,
++	dch1=\E[P,
++	dl=\E[%p1%dM,
++	dl1=\E[M,
++	ed=\E[J,
++	el=\E[K,
++	el1=\E[1K,
++	flash=\E[?5h$<20/>\E[?5l,
++	home=\E[H,
++	hpa=\E[%i%p1%dG,
++	ht=^I,
++	hts=\EH,
++	ich=\E[%p1%d@,
++	ich1=\E[@,
++	il=\E[%p1%dL,
++	il1=\E[L,
++	ind=^J,
++	is1=\E[?47l\E=\E[?1l,
++	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
++	kDC=\E[3$,
++	kIC=\E2$,
++	kEND=\E[8$,
++	kHOM=\E[7$,
++	kLFT=\E[d,
++	kNXT=\E[6$,
++	kPRV=\E[5$,
++	kRIT=\E[c,
++	kbs=\177,
++	ka1=\EOw,
++	ka3=\EOy,
++	kb2=\EOu,
++	kc1=\EOq,
++	kc3=\EOs,
++	kcbt=\E[Z,
++	kcub1=\E[D,
++	kcud1=\E[B,
++	kcuf1=\E[C,
++	kcuu1=\E[A,
++	kdch1=\E[3~,
++	kel=\E[8\^,
++	kend=\E[8~,
++	kent=\EOM,
++	kf1=\E[11~,
++	kf10=\E[21~,
++	kf11=\E[23~,
++	kf12=\E[24~,
++	kf13=\E[25~,
++	kf14=\E[26~,
++	kf15=\E[28~,
++	kf16=\E[29~,
++	kf17=\E[31~,
++	kf18=\E[32~,
++	kf19=\E[33~,
++	kf2=\E[12~,
++	kf20=\E[34~,
++	kf3=\E[13~,
++	kf4=\E[14~,
++	kf5=\E[15~,
++	kf6=\E[17~,
++	kf7=\E[18~,
++	kf8=\E[19~,
++	kf9=\E[20~,
++	kfnd=\E[1~,
++	khome=\E[7~,
++	kich1=\E[2~,
++	kmous=\E[M,
++	knp=\E[6~,
++	kpp=\E[5~,
++	kslt=\E[4~,
++	rc=\E8,
++	rev=\E[7m,
++	ri=\EM,
++	rmso=\E[27m,
++	rmul=\E[24m,
++	rs1=\Ec,
++	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
++	sgr0=\E[m\017,
++	enacs=,
++	smacs=\E(0,
++	rmacs=\E(B,
++	smso=\E[7m,
++	smul=\E[4m,
++	tbc=\E[3g,
++	vpa=\E[%i%p1%dd,
++	colors#88,
++	pairs#256,
++	btns#5,
++	lm#0,
++	ccc,
++	npc,
++	mc5i,
++	ncv#0,
++	mir,
++	xon,
++	bw,
++	ech=\E[%p1%dX,
++	mc0=\E[i,
++	mc4=\E[4i,
++	mc5=\E[5i,
++	sitm=\E[3m,
++	ritm=\E[23m,
++	smam=\E[?7h,
++	rmam=\E[?7l,
++	smir=\E[4h,
++	rmir=\E[4l,
++	smcup=\E[?1049h,
++	rmcup=\E[r\E[?1049l,
++	smkx=\E=,
++	rmkx=\E>,
++	indn=\E[%p1%dS,
++	rin=\E[%p1%dT,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
++	op=\E[39;49m,
++	setaf=\E[38;5;%p1%dm,
++	setab=\E[48;5;%p1%dm,
++	setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
++	setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
++	initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
++	sc=\E7,
++	s0ds=\E(B,
++	s1ds=\E(0,
++	s2ds=\E*B,
++	s3ds=\E+B,
++	u6=\E[%i%d;%dR,
++	u7=\E[6n,
++	u8=\E[?1;2c,
++	u9=\E[c,
++	tsl=\E]2;,
++	fsl=\007,
++	dsl=\E]2;\007,
++
+ # mrxvt 0.5.4
+ #
+ # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
diff --git a/trunk/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch b/trunk/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
new file mode 100644
index 00000000..779fa44b
--- /dev/null
+++ b/trunk/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
@@ -0,0 +1,52 @@
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -3274,6 +3274,7 @@ xterm-xfree86|xterm terminal emulator (X
+ # This version reflects the current xterm features.
+ xterm-new|modern xterm terminal emulator,
+ 	npc,
++	kbs=\177,
+ 	indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
+ 	kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
+ 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+@@ -4061,6 +4062,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+ rxvt-basic|rxvt terminal base (X Window System),
+ 	OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
+ 	cols#80, it#8, lines#24,
++	kbs=\177,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+ 	clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
+@@ -4071,7 +4073,7 @@ rxvt-basic|rxvt terminal base (X Window
+ 	enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I,
+ 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
+ 	ind=^J, is1=\E[?47l\E=\E[?1l,
+-	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
++	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+ 	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
+ 	rmul=\E[24m,
+@@ -4840,6 +4842,7 @@ eterm-color|Emacs term.el terminal emula
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
+ 	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
++	kbs=\177,
+ 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+ 	clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M,
+@@ -4849,7 +4852,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+ 	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ 	dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+ 	flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z,
++	il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kcbt=\E[Z,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+ 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+@@ -4955,6 +4958,7 @@ screen.xterm-r6|screen customized for X1
+ # on Solaris because Sun's curses implementation gets confused.
+ screen.teraterm|disable ncv in teraterm,
+ 	ncv#127,
++	kbs=^H,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	use=screen+fkeys, use=screen,
+ # Other terminals
diff --git a/trunk/package/libs/ncurses/patches/200-fix_missing_include.patch b/trunk/package/libs/ncurses/patches/200-fix_missing_include.patch
new file mode 100644
index 00000000..c5d48d4d
--- /dev/null
+++ b/trunk/package/libs/ncurses/patches/200-fix_missing_include.patch
@@ -0,0 +1,14 @@
+--- a/ncurses/curses.priv.h
++++ b/ncurses/curses.priv.h
+@@ -54,6 +54,11 @@ extern "C" {
+ 
+ #include <ncurses_cfg.h>
+ 
++#if NEED_WCHAR_H
++#include <stdarg.h>
++#include <wchar.h>
++#endif
++
+ #if USE_RCS_IDS
+ #define MODULE_ID(id) static const char Ident[] = id;
+ #else
diff --git a/trunk/package/libs/ncurses/patches/500-cross.patch b/trunk/package/libs/ncurses/patches/500-cross.patch
new file mode 100644
index 00000000..ace6252f
--- /dev/null
+++ b/trunk/package/libs/ncurses/patches/500-cross.patch
@@ -0,0 +1,11 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -4298,7 +4298,7 @@ CF_EOF
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CF_SHARED_SONAME
+-		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
++		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,$(LDFLAGS) -lc -o $[@]'
+ 		;;
+ 	openbsd[[2-9]].*)
+ 		if test "$DFT_LWR_MODEL" = "shared" ; then
diff --git a/trunk/package/libs/ncurses/patches/900-terminfo.patch b/trunk/package/libs/ncurses/patches/900-terminfo.patch
new file mode 100644
index 00000000..7aab3dbc
--- /dev/null
+++ b/trunk/package/libs/ncurses/patches/900-terminfo.patch
@@ -0,0 +1,20 @@
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -3707,12 +3707,11 @@ konsole-xf3x|KDE console window with key
+ # The value for kbs reflects local customization rather than the settings used
+ # for XFree86 xterm.
+ konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
+-	kend=\EOF, khome=\EOH, use=konsole+pcfkeys,
+-	use=konsole-vt100,
+-# Konsole does not implement shifted cursor-keys.
+-konsole+pcfkeys|konsole subset of xterm+pcfkeys,
+-	kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2,
+-	use=xterm+pcf0,
++	kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R,
++	kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
++	kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
++	kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS,
++	khome=\EOH, use=konsole-vt100,
+ # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
+ # it is still useful for deriving the other entries.
+ konsole-vt100|KDE console window with vt100 (sic) keyboard,
diff --git a/trunk/package/libs/nettle/Config.in b/trunk/package/libs/nettle/Config.in
new file mode 100644
index 00000000..0d4806ab
--- /dev/null
+++ b/trunk/package/libs/nettle/Config.in
@@ -0,0 +1,9 @@
+# nettle avanced configuration
+
+menu "Configuration"
+	depends on PACKAGE_libnettle
+
+config LIBNETTLE_MINI
+	bool "use mini-gmp instead of gmp; the library will be much smaller at a 10x performance penalty. Note that this option may have side effects to programs that link to both nettle and gmp."
+
+endmenu
diff --git a/trunk/package/libs/nettle/Makefile b/trunk/package/libs/nettle/Makefile
new file mode 100644
index 00000000..eef078ba
--- /dev/null
+++ b/trunk/package/libs/nettle/Makefile
@@ -0,0 +1,86 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nettle
+PKG_VERSION:=2.7.1
+PKG_RELEASE:=1
+PKG_USE_MIPS16:=0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/nettle
+PKG_MD5SUM:=003d5147911317931dd453520eb234a5
+PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
+
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnettle
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=GNU crypto library
+  URL:=http://www.lysator.liu.se/~nisse/nettle/
+  DEPENDS+= +!LIBNETTLE_MINI:libgmp
+endef
+
+define Package/libnettle/config
+	source "$(SOURCE)/Config.in"
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--disable-openssl \
+	--disable-documentation \
+	--enable-static
+
+ifeq ($(CONFIG_LIBNETTLE_MINI),y)
+CONFIGURE_ARGS += --enable-mini-gmp
+endif
+
+ifeq ($(CONFIG_CPU_SUBTYPE),neon)
+CONFIGURE_ARGS += \
+	--enable-arm-neon
+endif
+
+define Build/Compile
+	$(call Build/Compile/Default, \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CC="$(TARGET_CC)" \
+		libnettle.so libhogweed.so
+	+$(MAKE) -i $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/nettle
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/nettle/*.h $(1)/usr/include/nettle/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnettle.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhogweed.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/nettle.pc \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/hogweed.pc \
+		$(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libnettle/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnettle.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhogweed.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnettle))
diff --git a/trunk/package/libs/nettle/patches/0001-Updated-mini-gmp.patch b/trunk/package/libs/nettle/patches/0001-Updated-mini-gmp.patch
new file mode 100644
index 00000000..7fb8092f
--- /dev/null
+++ b/trunk/package/libs/nettle/patches/0001-Updated-mini-gmp.patch
@@ -0,0 +1,1738 @@
+From 57700c26d73cf7fa6f5cfaec1145eccf388acab9 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 9 Mar 2014 11:27:42 +0100
+Subject: [PATCH 1/5] Updated mini-gmp
+
+---
+ mini-gmp.c | 890 +++++++++++++++++++++++++++++++++++++++----------------------
+ mini-gmp.h |  55 +++-
+ 2 files changed, 618 insertions(+), 327 deletions(-)
+
+diff --git a/mini-gmp.c b/mini-gmp.c
+index 8b6f070..766df30 100644
+--- a/mini-gmp.c
++++ b/mini-gmp.c
+@@ -2,24 +2,33 @@
+ 
+    Contributed to the GNU project by Niels Möller
+ 
+-Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+-Free Software Foundation, Inc.
++Copyright 1991-1997, 1999-2014 Free Software Foundation, Inc.
+ 
+ This file is part of the GNU MP Library.
+ 
+ The GNU MP Library is free software; you can redistribute it and/or modify
+-it under the terms of the GNU Lesser General Public License as published by
+-the Free Software Foundation; either version 3 of the License, or (at your
+-option) any later version.
++it under the terms of either:
++
++  * the GNU Lesser General Public License as published by the Free
++    Software Foundation; either version 3 of the License, or (at your
++    option) any later version.
++
++or
++
++  * the GNU General Public License as published by the Free Software
++    Foundation; either version 2 of the License, or (at your option) any
++    later version.
++
++or both in parallel, as here.
+ 
+ The GNU MP Library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+-License for more details.
++or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++for more details.
+ 
+-You should have received a copy of the GNU Lesser General Public License
+-along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
++You should have received copies of the GNU General Public License and the
++GNU Lesser General Public License along with the GNU MP Library.  If not,
++see https://www.gnu.org/licenses/.  */
+ 
+ /* NOTE: All functions in this file which are not declared in
+    mini-gmp.h are internal, and are not intended to be compatible
+@@ -222,11 +231,13 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
+   } while (0)
+ #define MPZ_SRCPTR_SWAP(x, y)						\
+   do {									\
+-    mpz_srcptr __mpz_srcptr_swap__tmp = (x);			\
++    mpz_srcptr __mpz_srcptr_swap__tmp = (x);				\
+     (x) = (y);								\
+     (y) = __mpz_srcptr_swap__tmp;					\
+   } while (0)
+ 
++const int mp_bits_per_limb = GMP_LIMB_BITS;
++
+ 
+ /* Memory allocation and other helper functions. */
+ static void
+@@ -342,12 +353,10 @@ mpn_copyd (mp_ptr d, mp_srcptr s, mp_size_t n)
+ int
+ mpn_cmp (mp_srcptr ap, mp_srcptr bp, mp_size_t n)
+ {
+-  for (; n > 0; n--)
++  while (--n >= 0)
+     {
+-      if (ap[n-1] < bp[n-1])
+-	return -1;
+-      else if (ap[n-1] > bp[n-1])
+-	return 1;
++      if (ap[n] != bp[n])
++	return ap[n] > bp[n] ? 1 : -1;
+     }
+   return 0;
+ }
+@@ -355,10 +364,8 @@ mpn_cmp (mp_srcptr ap, mp_srcptr bp, mp_size_t n)
+ static int
+ mpn_cmp4 (mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn)
+ {
+-  if (an > bn)
+-    return 1;
+-  else if (an < bn)
+-    return -1;
++  if (an != bn)
++    return an < bn ? -1 : 1;
+   else
+     return mpn_cmp (ap, bp, an);
+ }
+@@ -373,20 +380,31 @@ mpn_normalized_size (mp_srcptr xp, mp_size_t n)
+ 
+ #define mpn_zero_p(xp, n) (mpn_normalized_size ((xp), (n)) == 0)
+ 
++void
++mpn_zero (mp_ptr rp, mp_size_t n)
++{
++  mp_size_t i;
++
++  for (i = 0; i < n; i++)
++    rp[i] = 0;
++}
++
+ mp_limb_t
+ mpn_add_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b)
+ {
+   mp_size_t i;
+ 
+   assert (n > 0);
+-
+-  for (i = 0; i < n; i++)
++  i = 0;
++  do
+     {
+       mp_limb_t r = ap[i] + b;
+       /* Carry out */
+       b = (r < b);
+       rp[i] = r;
+     }
++  while (++i < n);
++
+   return b;
+ }
+ 
+@@ -429,7 +447,8 @@ mpn_sub_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b)
+ 
+   assert (n > 0);
+ 
+-  for (i = 0; i < n; i++)
++  i = 0;
++  do
+     {
+       mp_limb_t a = ap[i];
+       /* Carry out */
+@@ -437,6 +456,8 @@ mpn_sub_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b)
+       rp[i] = a - b;
+       b = cy;
+     }
++  while (++i < n);
++
+   return b;
+ }
+ 
+@@ -602,7 +623,7 @@ mpn_lshift (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
+   retval = low_limb >> tnc;
+   high_limb = (low_limb << cnt);
+ 
+-  for (i = n - 1; i != 0; i--)
++  for (i = n; --i != 0;)
+     {
+       low_limb = *--up;
+       *--rp = high_limb | (low_limb >> tnc);
+@@ -630,7 +651,7 @@ mpn_rshift (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
+   retval = (high_limb << tnc);
+   low_limb = high_limb >> cnt;
+ 
+-  for (i = n - 1; i != 0; i--)
++  for (i = n; --i != 0;)
+     {
+       high_limb = *up++;
+       *rp++ = low_limb | (high_limb << tnc);
+@@ -641,6 +662,46 @@ mpn_rshift (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
+   return retval;
+ }
+ 
++static mp_bitcnt_t
++mpn_common_scan (mp_limb_t limb, mp_size_t i, mp_srcptr up, mp_size_t un,
++		 mp_limb_t ux)
++{
++  unsigned cnt;
++
++  assert (ux == 0 || ux == GMP_LIMB_MAX);
++  assert (0 <= i && i <= un );
++
++  while (limb == 0)
++    {
++      i++;
++      if (i == un)
++	return (ux == 0 ? ~(mp_bitcnt_t) 0 : un * GMP_LIMB_BITS);
++      limb = ux ^ up[i];
++    }
++  gmp_ctz (cnt, limb);
++  return (mp_bitcnt_t) i * GMP_LIMB_BITS + cnt;
++}
++
++mp_bitcnt_t
++mpn_scan1 (mp_srcptr ptr, mp_bitcnt_t bit)
++{
++  mp_size_t i;
++  i = bit / GMP_LIMB_BITS;
++
++  return mpn_common_scan ( ptr[i] & (GMP_LIMB_MAX << (bit % GMP_LIMB_BITS)),
++			  i, ptr, i, 0);
++}
++
++mp_bitcnt_t
++mpn_scan0 (mp_srcptr ptr, mp_bitcnt_t bit)
++{
++  mp_size_t i;
++  i = bit / GMP_LIMB_BITS;
++
++  return mpn_common_scan (~ptr[i] & (GMP_LIMB_MAX << (bit % GMP_LIMB_BITS)),
++			  i, ptr, i, GMP_LIMB_MAX);
++}
++
+ 
+ /* MPN division interface. */
+ mp_limb_t
+@@ -715,8 +776,7 @@ mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
+       if (r < th)
+ 	{
+ 	  m--;
+-	  if (r > u1 || (r == u1 && tl > u0))
+-	    m--;
++	  m -= ((r > u1) | ((r == u1) & (tl > u0)));
+ 	}
+     }
+ 
+@@ -836,14 +896,20 @@ mpn_div_qr_1 (mp_ptr qp, mp_srcptr np, mp_size_t nn, mp_limb_t d)
+   assert (d > 0);
+ 
+   /* Special case for powers of two. */
+-  if (d > 1 && (d & (d-1)) == 0)
++  if ((d & (d-1)) == 0)
+     {
+-      unsigned shift;
+       mp_limb_t r = np[0] & (d-1);
+-      gmp_ctz (shift, d);
+       if (qp)
+-	mpn_rshift (qp, np, nn, shift);
+-
++	{
++	  if (d <= 1)
++	    mpn_copyi (qp, np, nn);
++	  else
++	    {
++	      unsigned shift;
++	      gmp_ctz (shift, d);
++	      mpn_rshift (qp, np, nn, shift);
++	    }
++	}
+       return r;
+     }
+   else
+@@ -880,7 +946,8 @@ mpn_div_qr_2_preinv (mp_ptr qp, mp_ptr rp, mp_srcptr np, mp_size_t nn,
+ 
+   r0 = np[nn - 1];
+ 
+-  for (i = nn - 2; i >= 0; i--)
++  i = nn - 2;
++  do
+     {
+       mp_limb_t n0, q;
+       n0 = np[i];
+@@ -889,6 +956,7 @@ mpn_div_qr_2_preinv (mp_ptr qp, mp_ptr rp, mp_srcptr np, mp_size_t nn,
+       if (qp)
+ 	qp[i] = q;
+     }
++  while (--i >= 0);
+ 
+   if (shift > 0)
+     {
+@@ -930,18 +998,19 @@ mpn_div_qr_pi1 (mp_ptr qp,
+ 
+   assert (dn > 2);
+   assert (nn >= dn);
+-  assert ((dp[dn-1] & GMP_LIMB_HIGHBIT) != 0);
+ 
+   d1 = dp[dn - 1];
+   d0 = dp[dn - 2];
+ 
++  assert ((d1 & GMP_LIMB_HIGHBIT) != 0);
+   /* Iteration variable is the index of the q limb.
+    *
+    * We divide <n1, np[dn-1+i], np[dn-2+i], np[dn-3+i],..., np[i]>
+    * by            <d1,          d0,        dp[dn-3],  ..., dp[0] >
+    */
+ 
+-  for (i = nn - dn; i >= 0; i--)
++  i = nn - dn;
++  do
+     {
+       mp_limb_t n0 = np[dn-1+i];
+ 
+@@ -973,6 +1042,7 @@ mpn_div_qr_pi1 (mp_ptr qp,
+       if (qp)
+ 	qp[i] = q;
+     }
++  while (--i >= 0);
+ 
+   np[dn - 1] = n1;
+ }
+@@ -994,7 +1064,9 @@ mpn_div_qr_preinv (mp_ptr qp, mp_ptr np, mp_size_t nn,
+       mp_limb_t nh;
+       unsigned shift;
+ 
+-      assert (dp[dn-1] & GMP_LIMB_HIGHBIT);
++      assert (inv->d1 == dp[dn-1]);
++      assert (inv->d0 == dp[dn-2]);
++      assert ((inv->d1 & GMP_LIMB_HIGHBIT) != 0);
+ 
+       shift = inv->shift;
+       if (shift > 0)
+@@ -1002,9 +1074,6 @@ mpn_div_qr_preinv (mp_ptr qp, mp_ptr np, mp_size_t nn,
+       else
+ 	nh = 0;
+ 
+-      assert (inv->d1 == dp[dn-1]);
+-      assert (inv->d0 == dp[dn-2]);
+-
+       mpn_div_qr_pi1 (qp, np, nn, nh, dp, dn, inv->di);
+ 
+       if (shift > 0)
+@@ -1238,15 +1307,14 @@ mpn_set_str_other (mp_ptr rp, const unsigned char *sp, size_t sn,
+ {
+   mp_size_t rn;
+   mp_limb_t w;
+-  unsigned first;
+   unsigned k;
+   size_t j;
+ 
+-  first = 1 + (sn - 1) % info->exp;
++  k = 1 + (sn - 1) % info->exp;
+ 
+   j = 0;
+   w = sp[j++];
+-  for (k = 1; k < first; k++)
++  for (; --k > 0; )
+     w = w * b + sp[j++];
+ 
+   rp[0] = w;
+@@ -1300,7 +1368,7 @@ mpz_init (mpz_t r)
+ }
+ 
+ /* The utility of this function is a bit limited, since many functions
+-   assings the result variable using mpz_swap. */
++   assigns the result variable using mpz_swap. */
+ void
+ mpz_init2 (mpz_t r, mp_bitcnt_t bits)
+ {
+@@ -1422,7 +1490,7 @@ mpz_fits_ulong_p (const mpz_t u)
+ {
+   mp_size_t us = u->_mp_size;
+ 
+-  return us == 0 || us == 1;
++  return (us == (us > 0));
+ }
+ 
+ long int
+@@ -1459,6 +1527,48 @@ mpz_getlimbn (const mpz_t u, mp_size_t n)
+     return 0;
+ }
+ 
++void
++mpz_realloc2 (mpz_t x, mp_bitcnt_t n)
++{
++  mpz_realloc (x, 1 + (n - (n != 0)) / GMP_LIMB_BITS);
++}
++
++mp_srcptr
++mpz_limbs_read (mpz_srcptr x)
++{
++  return x->_mp_d;;
++}
++
++mp_ptr
++mpz_limbs_modify (mpz_t x, mp_size_t n)
++{
++  assert (n > 0);
++  return MPZ_REALLOC (x, n);
++}
++
++mp_ptr
++mpz_limbs_write (mpz_t x, mp_size_t n)
++{
++  return mpz_limbs_modify (x, n);
++}
++
++void
++mpz_limbs_finish (mpz_t x, mp_size_t xs)
++{
++  mp_size_t xn;
++  xn = mpn_normalized_size (x->_mp_d, GMP_ABS (xs));
++  x->_mp_size = xs < 0 ? -xn : xn;
++}
++
++mpz_srcptr
++mpz_roinit_n (mpz_t x, mp_srcptr xp, mp_size_t xs)
++{
++  x->_mp_alloc = 0;
++  x->_mp_d = (mp_ptr) xp;
++  mpz_limbs_finish (x, xs);
++  return x;
++}
++
+ 
+ /* Conversions and comparison to double. */
+ void
+@@ -1473,19 +1583,15 @@ mpz_set_d (mpz_t r, double x)
+ 
+   /* x != x is true when x is a NaN, and x == x * 0.5 is true when x is
+      zero or infinity. */
+-  if (x == 0.0 || x != x || x == x * 0.5)
++  if (x != x || x == x * 0.5)
+     {
+       r->_mp_size = 0;
+       return;
+     }
+ 
+-  if (x < 0.0)
+-    {
+-      x = - x;
+-      sign = 1;
+-    }
+-  else
+-    sign = 0;
++  sign = x < 0.0 ;
++  if (sign)
++    x = - x;
+ 
+   if (x < 1.0)
+     {
+@@ -1502,8 +1608,9 @@ mpz_set_d (mpz_t r, double x)
+   f = (mp_limb_t) x;
+   x -= f;
+   assert (x < 1.0);
+-  rp[rn-1] = f;
+-  for (i = rn-1; i-- > 0; )
++  i = rn-1;
++  rp[i] = f;
++  while (--i >= 0)
+     {
+       x = B * x;
+       f = (mp_limb_t) x;
+@@ -1611,12 +1718,7 @@ mpz_sgn (const mpz_t u)
+ {
+   mp_size_t usize = u->_mp_size;
+ 
+-  if (usize > 0)
+-    return 1;
+-  else if (usize < 0)
+-    return -1;
+-  else
+-    return 0;
++  return (usize > 0) - (usize < 0);
+ }
+ 
+ int
+@@ -1635,10 +1737,9 @@ mpz_cmp_si (const mpz_t u, long v)
+       mp_limb_t ul = u->_mp_d[0];
+       if ((mp_limb_t)GMP_NEG_CAST (unsigned long int, v) < ul)
+ 	return -1;
+-      else if ( (mp_limb_t)GMP_NEG_CAST (unsigned long int, v) > ul)
+-	return 1;
++      else
++	return (mp_limb_t)GMP_NEG_CAST (unsigned long int, v) > ul;
+     }
+-  return 0;
+ }
+ 
+ int
+@@ -1653,12 +1754,8 @@ mpz_cmp_ui (const mpz_t u, unsigned long v)
+   else
+     {
+       mp_limb_t ul = (usize > 0) ? u->_mp_d[0] : 0;
+-      if (ul > v)
+-	return 1;
+-      else if (ul < v)
+-	return -1;
++      return (ul > v) - (ul < v);
+     }
+-  return 0;
+ }
+ 
+ int
+@@ -1667,16 +1764,12 @@ mpz_cmp (const mpz_t a, const mpz_t b)
+   mp_size_t asize = a->_mp_size;
+   mp_size_t bsize = b->_mp_size;
+ 
+-  if (asize > bsize)
+-    return 1;
+-  else if (asize < bsize)
+-    return -1;
+-  else if (asize > 0)
++  if (asize != bsize)
++    return (asize < bsize) ? -1 : 1;
++  else if (asize >= 0)
+     return mpn_cmp (a->_mp_d, b->_mp_d, asize);
+-  else if (asize < 0)
+-    return -mpn_cmp (a->_mp_d, b->_mp_d, -asize);
+   else
+-    return 0;
++    return mpn_cmp (b->_mp_d, a->_mp_d, -asize);
+ }
+ 
+ int
+@@ -1690,12 +1783,7 @@ mpz_cmpabs_ui (const mpz_t u, unsigned long v)
+ 
+   ul = (un == 1) ? u->_mp_d[0] : 0;
+ 
+-  if (ul > v)
+-    return 1;
+-  else if (ul < v)
+-    return -1;
+-  else
+-    return 0;
++  return (ul > v) - (ul < v);
+ }
+ 
+ int
+@@ -1753,7 +1841,7 @@ mpz_abs_add_ui (mpz_t r, const mpz_t a, unsigned long b)
+ 
+   cy = mpn_add_1 (rp, a->_mp_d, an, b);
+   rp[an] = cy;
+-  an += (cy > 0);
++  an += cy;
+ 
+   return an;
+ }
+@@ -1815,20 +1903,21 @@ mpz_abs_add (mpz_t r, const mpz_t a, const mpz_t b)
+ {
+   mp_size_t an = GMP_ABS (a->_mp_size);
+   mp_size_t bn = GMP_ABS (b->_mp_size);
+-  mp_size_t rn;
+   mp_ptr rp;
+   mp_limb_t cy;
+ 
+-  rn = GMP_MAX (an, bn);
+-  rp = MPZ_REALLOC (r, rn + 1);
+-  if (an >= bn)
+-    cy = mpn_add (rp, a->_mp_d, an, b->_mp_d, bn);
+-  else
+-    cy = mpn_add (rp, b->_mp_d, bn, a->_mp_d, an);
++  if (an < bn)
++    {
++      MPZ_SRCPTR_SWAP (a, b);
++      MP_SIZE_T_SWAP (an, bn);
++    }
+ 
+-  rp[rn] = cy;
++  rp = MPZ_REALLOC (r, an + 1);
++  cy = mpn_add (rp, a->_mp_d, an, b->_mp_d, bn);
++
++  rp[an] = cy;
+ 
+-  return rn + (cy > 0);
++  return an + cy;
+ }
+ 
+ static mp_size_t
+@@ -1899,31 +1988,26 @@ mpz_mul_si (mpz_t r, const mpz_t u, long int v)
+ void
+ mpz_mul_ui (mpz_t r, const mpz_t u, unsigned long int v)
+ {
+-  mp_size_t un;
+-  mpz_t t;
++  mp_size_t un, us;
+   mp_ptr tp;
+   mp_limb_t cy;
+ 
+-  un = GMP_ABS (u->_mp_size);
++  us = u->_mp_size;
+ 
+-  if (un == 0 || v == 0)
++  if (us == 0 || v == 0)
+     {
+       r->_mp_size = 0;
+       return;
+     }
+ 
+-  mpz_init2 (t, (un + 1) * GMP_LIMB_BITS);
++  un = GMP_ABS (us);
+ 
+-  tp = t->_mp_d;
++  tp = MPZ_REALLOC (r, un + 1);
+   cy = mpn_mul_1 (tp, u->_mp_d, un, v);
+   tp[un] = cy;
+ 
+-  t->_mp_size = un + (cy > 0);
+-  if (u->_mp_size < 0)
+-    t->_mp_size = - t->_mp_size;
+-
+-  mpz_swap (r, t);
+-  mpz_clear (t);
++  un += (cy > 0);
++  r->_mp_size = (us < 0) ? - un : un;
+ }
+ 
+ void
+@@ -1934,8 +2018,8 @@ mpz_mul (mpz_t r, const mpz_t u, const mpz_t v)
+   mpz_t t;
+   mp_ptr tp;
+ 
+-  un = GMP_ABS (u->_mp_size);
+-  vn = GMP_ABS (v->_mp_size);
++  un = u->_mp_size;
++  vn = v->_mp_size;
+ 
+   if (un == 0 || vn == 0)
+     {
+@@ -1943,7 +2027,10 @@ mpz_mul (mpz_t r, const mpz_t u, const mpz_t v)
+       return;
+     }
+ 
+-  sign = (u->_mp_size ^ v->_mp_size) < 0;
++  sign = (un ^ vn) < 0;
++
++  un = GMP_ABS (un);
++  vn = GMP_ABS (vn);
+ 
+   mpz_init2 (t, (un + vn) * GMP_LIMB_BITS);
+ 
+@@ -1996,6 +2083,46 @@ mpz_mul_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t bits)
+   r->_mp_size = (u->_mp_size < 0) ? - rn : rn;
+ }
+ 
++void
++mpz_addmul_ui (mpz_t r, const mpz_t u, unsigned long int v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul_ui (t, u, v);
++  mpz_add (r, r, t);
++  mpz_clear (t);
++}
++
++void
++mpz_submul_ui (mpz_t r, const mpz_t u, unsigned long int v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul_ui (t, u, v);
++  mpz_sub (r, r, t);
++  mpz_clear (t);
++}
++
++void
++mpz_addmul (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul (t, u, v);
++  mpz_add (r, r, t);
++  mpz_clear (t);
++}
++
++void
++mpz_submul (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul (t, u, v);
++  mpz_sub (r, r, t);
++  mpz_clear (t);
++}
++
+ 
+ /* MPZ division */
+ enum mpz_div_round_mode { GMP_DIV_FLOOR, GMP_DIV_CEIL, GMP_DIV_TRUNC };
+@@ -2060,8 +2187,7 @@ mpz_div_qr (mpz_t q, mpz_t r,
+       mp_size_t qn, rn;
+       mpz_t tq, tr;
+ 
+-      mpz_init (tr);
+-      mpz_set (tr, n);
++      mpz_init_set (tr, n);
+       np = tr->_mp_d;
+ 
+       qn = nn - dn + 1;
+@@ -2171,10 +2297,7 @@ mpz_tdiv_r (mpz_t r, const mpz_t n, const mpz_t d)
+ void
+ mpz_mod (mpz_t r, const mpz_t n, const mpz_t d)
+ {
+-  if (d->_mp_size >= 0)
+-    mpz_div_qr (NULL, r, n, d, GMP_DIV_FLOOR);
+-  else
+-    mpz_div_qr (NULL, r, n, d, GMP_DIV_CEIL);
++  mpz_div_qr (NULL, r, n, d, d->_mp_size >= 0 ? GMP_DIV_FLOOR : GMP_DIV_CEIL);
+ }
+ 
+ static void
+@@ -2184,7 +2307,7 @@ mpz_div_q_2exp (mpz_t q, const mpz_t u, mp_bitcnt_t bit_index,
+   mp_size_t un, qn;
+   mp_size_t limb_cnt;
+   mp_ptr qp;
+-  mp_limb_t adjust;
++  int adjust;
+ 
+   un = u->_mp_size;
+   if (un == 0)
+@@ -2226,7 +2349,8 @@ mpz_div_q_2exp (mpz_t q, const mpz_t u, mp_bitcnt_t bit_index,
+ 
+   q->_mp_size = qn;
+ 
+-  mpz_add_ui (q, q, adjust);
++  if (adjust)
++    mpz_add_ui (q, q, 1);
+   if (un < 0)
+     mpz_neg (q, q);
+ }
+@@ -2303,7 +2427,7 @@ mpz_div_r_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t bit_index,
+ 	    {
+ 	      /* r > 0, need to flip sign. */
+ 	      rp[i] = ~rp[i] + 1;
+-	      for (i++; i < rn; i++)
++	      while (++i < rn)
+ 		rp[i] = ~rp[i];
+ 
+ 	      rp[rn-1] &= mask;
+@@ -2366,6 +2490,24 @@ mpz_divisible_p (const mpz_t n, const mpz_t d)
+   return mpz_div_qr (NULL, NULL, n, d, GMP_DIV_TRUNC) == 0;
+ }
+ 
++int
++mpz_congruent_p (const mpz_t a, const mpz_t b, const mpz_t m)
++{
++  mpz_t t;
++  int res;
++
++  /* a == b (mod 0) iff a == b */
++  if (mpz_sgn (m) == 0)
++    return (mpz_cmp (a, b) == 0);
++
++  mpz_init (t);
++  mpz_sub (t, a, b);
++  res = mpz_divisible_p (t, m);
++  mpz_clear (t);
++
++  return res;
++}
++
+ static unsigned long
+ mpz_div_qr_ui (mpz_t q, mpz_t r,
+ 	       const mpz_t n, unsigned long d, enum mpz_div_round_mode mode)
+@@ -2579,32 +2721,16 @@ mpz_gcd_ui (mpz_t g, const mpz_t u, unsigned long v)
+ }
+ 
+ static mp_bitcnt_t
+-mpz_make_odd (mpz_t r, const mpz_t u)
++mpz_make_odd (mpz_t r)
+ {
+-  mp_size_t un, rn, i;
+-  mp_ptr rp;
+-  unsigned shift;
+-
+-  un = GMP_ABS (u->_mp_size);
+-  assert (un > 0);
++  mp_bitcnt_t shift;
+ 
+-  for (i = 0; u->_mp_d[i] == 0; i++)
+-    ;
+-
+-  gmp_ctz (shift, u->_mp_d[i]);
+-
+-  rn = un - i;
+-  rp = MPZ_REALLOC (r, rn);
+-  if (shift > 0)
+-    {
+-      mpn_rshift (rp, u->_mp_d + i, rn, shift);
+-      rn -= (rp[rn-1] == 0);
+-    }
+-  else
+-    mpn_copyi (rp, u->_mp_d + i, rn);
++  assert (r->_mp_size > 0);
++  /* Count trailing zeros, equivalent to mpn_scan1, because we know that there is a 1 */
++  shift = mpn_common_scan (r->_mp_d[0], 0, r->_mp_d, 0, 0);
++  mpz_tdiv_q_2exp (r, r, shift);
+ 
+-  r->_mp_size = rn;
+-  return i * GMP_LIMB_BITS + shift;
++  return shift;
+ }
+ 
+ void
+@@ -2627,8 +2753,10 @@ mpz_gcd (mpz_t g, const mpz_t u, const mpz_t v)
+   mpz_init (tu);
+   mpz_init (tv);
+ 
+-  uz = mpz_make_odd (tu, u);
+-  vz = mpz_make_odd (tv, v);
++  mpz_abs (tu, u);
++  uz = mpz_make_odd (tu);
++  mpz_abs (tv, v);
++  vz = mpz_make_odd (tv);
+   gz = GMP_MIN (uz, vz);
+ 
+   if (tu->_mp_size < tv->_mp_size)
+@@ -2644,7 +2772,7 @@ mpz_gcd (mpz_t g, const mpz_t u, const mpz_t v)
+       {
+ 	int c;
+ 
+-	mpz_make_odd (tu, tu);
++	mpz_make_odd (tu);
+ 	c = mpz_cmp (tu, tv);
+ 	if (c == 0)
+ 	  {
+@@ -2706,8 +2834,10 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
+   mpz_init (t0);
+   mpz_init (t1);
+ 
+-  uz = mpz_make_odd (tu, u);
+-  vz = mpz_make_odd (tv, v);
++  mpz_abs (tu, u);
++  uz = mpz_make_odd (tu);
++  mpz_abs (tv, v);
++  vz = mpz_make_odd (tv);
+   gz = GMP_MIN (uz, vz);
+ 
+   uz -= gz;
+@@ -2755,7 +2885,7 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
+   if (tu->_mp_size > 0)
+     {
+       mp_bitcnt_t shift;
+-      shift = mpz_make_odd (tu, tu);
++      shift = mpz_make_odd (tu);
+       mpz_mul_2exp (t0, t0, shift);
+       mpz_mul_2exp (s0, s0, shift);
+       power += shift;
+@@ -2778,7 +2908,7 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
+ 	      mpz_add (t0, t0, t1);
+ 	      mpz_add (s0, s0, s1);
+ 
+-	      shift = mpz_make_odd (tv, tv);
++	      shift = mpz_make_odd (tv);
+ 	      mpz_mul_2exp (t1, t1, shift);
+ 	      mpz_mul_2exp (s1, s1, shift);
+ 	    }
+@@ -2788,7 +2918,7 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
+ 	      mpz_add (t1, t0, t1);
+ 	      mpz_add (s1, s0, s1);
+ 
+-	      shift = mpz_make_odd (tu, tu);
++	      shift = mpz_make_odd (tu);
+ 	      mpz_mul_2exp (t0, t0, shift);
+ 	      mpz_mul_2exp (s0, s0, shift);
+ 	    }
+@@ -2926,12 +3056,16 @@ mpz_pow_ui (mpz_t r, const mpz_t b, unsigned long e)
+   mpz_t tr;
+   mpz_init_set_ui (tr, 1);
+ 
+-  for (bit = GMP_ULONG_HIGHBIT; bit > 0; bit >>= 1)
++  bit = GMP_ULONG_HIGHBIT;
++  do
+     {
+       mpz_mul (tr, tr, tr);
+       if (e & bit)
+ 	mpz_mul (tr, tr, b);
++      bit >>= 1;
+     }
++  while (bit > 0);
++
+   mpz_swap (r, tr);
+   mpz_clear (tr);
+ }
+@@ -2987,7 +3121,7 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
+   if (e->_mp_size < 0)
+     {
+       if (!mpz_invert (base, b, m))
+-	gmp_die ("mpz_powm: Negative exponent and non-invertibe base.");
++	gmp_die ("mpz_powm: Negative exponent and non-invertible base.");
+     }
+   else
+     {
+@@ -3019,7 +3153,8 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
+       mp_limb_t w = e->_mp_d[en];
+       mp_limb_t bit;
+ 
+-      for (bit = GMP_LIMB_HIGHBIT; bit > 0; bit >>= 1)
++      bit = GMP_LIMB_HIGHBIT;
++      do
+ 	{
+ 	  mpz_mul (tr, tr, tr);
+ 	  if (w & bit)
+@@ -3029,7 +3164,9 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
+ 	      mpn_div_qr_preinv (NULL, tr->_mp_d, tr->_mp_size, mp, mn, &minv);
+ 	      tr->_mp_size = mpn_normalized_size (tr->_mp_d, mn);
+ 	    }
++	  bit >>= 1;
+ 	}
++      while (bit > 0);
+     }
+ 
+   /* Final reduction */
+@@ -3064,21 +3201,26 @@ mpz_rootrem (mpz_t x, mpz_t r, const mpz_t y, unsigned long z)
+   mpz_t t, u;
+ 
+   sgn = y->_mp_size < 0;
+-  if (sgn && (z & 1) == 0)
++  if ((~z & sgn) != 0)
+     gmp_die ("mpz_rootrem: Negative argument, with even root.");
+   if (z == 0)
+     gmp_die ("mpz_rootrem: Zeroth root.");
+ 
+   if (mpz_cmpabs_ui (y, 1) <= 0) {
+-    mpz_set (x, y);
++    if (x)
++      mpz_set (x, y);
+     if (r)
+       r->_mp_size = 0;
+     return;
+   }
+ 
+-  mpz_init (t);
+   mpz_init (u);
+-  mpz_setbit (t, mpz_sizeinbase (y, 2) / z + 1);
++  {
++    mp_bitcnt_t tb;
++    tb = mpz_sizeinbase (y, 2) / z + 1;
++    mpz_init2 (t, tb);
++    mpz_setbit (t, tb);
++  }
+ 
+   if (z == 2) /* simplify sqrt loop: z-1 == 1 */
+     do {
+@@ -3110,7 +3252,8 @@ mpz_rootrem (mpz_t x, mpz_t r, const mpz_t y, unsigned long z)
+     mpz_pow_ui (t, u, z);
+     mpz_sub (r, y, t);
+   }
+-  mpz_swap (x, u);
++  if (x)
++    mpz_swap (x, u);
+   mpz_clear (u);
+   mpz_clear (t);
+ }
+@@ -3142,19 +3285,56 @@ mpz_sqrt (mpz_t s, const mpz_t u)
+   mpz_rootrem (s, NULL, u, 2);
+ }
+ 
++int
++mpz_perfect_square_p (const mpz_t u)
++{
++  if (u->_mp_size <= 0)
++    return (u->_mp_size == 0);
++  else
++    return mpz_root (NULL, u, 2);
++}
++
++int
++mpn_perfect_square_p (mp_srcptr p, mp_size_t n)
++{
++  mpz_t t;
++
++  assert (n > 0);
++  assert (p [n-1] != 0);
++  return mpz_root (NULL, mpz_roinit_n (t, p, n), 2);
++}
++
++mp_size_t
++mpn_sqrtrem (mp_ptr sp, mp_ptr rp, mp_srcptr p, mp_size_t n)
++{
++  mpz_t s, r, u;
++  mp_size_t res;
++
++  assert (n > 0);
++  assert (p [n-1] != 0);
++
++  mpz_init (r);
++  mpz_init (s);
++  mpz_rootrem (s, r, mpz_roinit_n (u, p, n), 2);
++
++  assert (s->_mp_size == (n+1)/2);
++  mpn_copyd (sp, s->_mp_d, s->_mp_size);
++  mpz_clear (s);
++  res = r->_mp_size;
++  if (rp)
++    mpn_copyd (rp, r->_mp_d, res);
++  mpz_clear (r);
++  return res;
++}
+ 
+ /* Combinatorics */
+ 
+ void
+ mpz_fac_ui (mpz_t x, unsigned long n)
+ {
+-  if (n < 2) {
+-    mpz_set_ui (x, 1);
+-    return;
+-  }
+-  mpz_set_ui (x, n);
+-  for (;--n > 1;)
+-    mpz_mul_ui (x, x, n);
++  mpz_set_ui (x, n + (n == 0));
++  for (;n > 2;)
++    mpz_mul_ui (x, x, --n);
+ }
+ 
+ void
+@@ -3162,25 +3342,120 @@ mpz_bin_uiui (mpz_t r, unsigned long n, unsigned long k)
+ {
+   mpz_t t;
+ 
+-  if (k > n) {
+-    r->_mp_size = 0;
+-    return;
+-  }
+-  mpz_fac_ui (r, n);
++  mpz_set_ui (r, k <= n);
++
++  if (k > (n >> 1))
++    k = (k <= n) ? n - k : 0;
++
+   mpz_init (t);
+   mpz_fac_ui (t, k);
+-  mpz_divexact (r, r, t);
+-  mpz_fac_ui (t, n - k);
++
++  for (; k > 0; k--)
++      mpz_mul_ui (r, r, n--);
++
+   mpz_divexact (r, r, t);
+   mpz_clear (t);
+ }
+ 
+ 
++/* Primality testing */
++static int
++gmp_millerrabin (const mpz_t n, const mpz_t nm1, mpz_t y,
++		 const mpz_t q, mp_bitcnt_t k)
++{
++  mp_bitcnt_t i;
++
++  /* Caller must initialize y to the base. */
++  mpz_powm (y, y, q, n);
++
++  if (mpz_cmp_ui (y, 1) == 0 || mpz_cmp (y, nm1) == 0)
++    return 1;
++
++  for (i = 1; i < k; i++)
++    {
++      mpz_powm_ui (y, y, 2, n);
++      if (mpz_cmp (y, nm1) == 0)
++	return 1;
++      if (mpz_cmp_ui (y, 1) == 0)
++	return 0;
++    }
++  return 0;
++}
++
++/* This product is 0xc0cfd797, and fits in 32 bits. */
++#define GMP_PRIME_PRODUCT \
++  (3UL*5UL*7UL*11UL*13UL*17UL*19UL*23UL*29UL)
++
++/* Bit (p+1)/2 is set, for each odd prime <= 61 */
++#define GMP_PRIME_MASK 0xc96996dcUL
++
++int
++mpz_probab_prime_p (const mpz_t n, int reps)
++{
++  mpz_t nm1;
++  mpz_t q;
++  mpz_t y;
++  mp_bitcnt_t k;
++  int is_prime;
++  int j;
++
++  /* Note that we use the absolute value of n only, for compatibility
++     with the real GMP. */
++  if (mpz_even_p (n))
++    return (mpz_cmpabs_ui (n, 2) == 0) ? 2 : 0;
++
++  /* Above test excludes n == 0 */
++  assert (n->_mp_size != 0);
++  
++  if (mpz_cmpabs_ui (n, 64) < 0)
++    return (GMP_PRIME_MASK >> (n->_mp_d[0] >> 1)) & 2;
++
++  if (mpz_gcd_ui (NULL, n, GMP_PRIME_PRODUCT) != 1)
++    return 0;
++
++  /* All prime factors are >= 31. */
++  if (mpz_cmpabs_ui (n, 31*31) < 0)
++    return 2;
++  
++  /* Use Miller-Rabin, with a deterministic sequence of bases, a[j] =
++     j^2 + j + 41 using Euler's polynomial. We potentially stop early,
++     if a[j] >= n - 1. Since n >= 31*31, this can happen only if reps >
++     30 (a[30] == 971 > 31*31 == 961). */
++
++  mpz_init (nm1);
++  mpz_init (q);
++  mpz_init (y);
++
++  /* Find q and k, where q is odd and n = 1 + 2**k * q.  */
++  mpz_abs (nm1, n);
++  mpz_sub_ui (nm1, nm1, 1);
++  k = mpz_scan1 (nm1, 0);
++  mpz_tdiv_q_2exp (q, nm1, k);
++  
++  for (j = 0, is_prime = 1; is_prime && j < reps; j++)
++    {
++      mpz_set_ui (y, (unsigned long) j*j+j+41);
++      if (mpz_cmp (y, nm1) >= 0)
++	{
++	  /* Don't try any further bases. */
++	  assert (j >= 30);
++	  break;
++	}
++      is_prime &= gmp_millerrabin (n, nm1, y, q, k);
++    }
++  mpz_clear (nm1);
++  mpz_clear (q);
++  mpz_clear (y);
++    
++  return is_prime;
++}
++
++
+ /* Logical operations and bit manipulation. */
+ 
+ /* Numbers are treated as if represented in two's complement (and
+    infinitely sign extended). For a negative values we get the two's
+-   complement from -x = ~x + 1, where ~ is bitwise complementt.
++   complement from -x = ~x + 1, where ~ is bitwise complement.
+    Negation transforms
+ 
+      xxxx10...0
+@@ -3374,7 +3649,8 @@ mpz_and (mpz_t r, const mpz_t u, const mpz_t v)
+   up = u->_mp_d;
+   vp = v->_mp_d;
+ 
+-  for (i = 0; i < vn; i++)
++  i = 0;
++  do
+     {
+       ul = (up[i] ^ ux) + uc;
+       uc = ul < uc;
+@@ -3386,6 +3662,7 @@ mpz_and (mpz_t r, const mpz_t u, const mpz_t v)
+       rc = rl < rc;
+       rp[i] = rl;
+     }
++  while (++i < vn);
+   assert (vc == 0);
+ 
+   for (; i < rn; i++)
+@@ -3445,7 +3722,8 @@ mpz_ior (mpz_t r, const mpz_t u, const mpz_t v)
+   up = u->_mp_d;
+   vp = v->_mp_d;
+ 
+-  for (i = 0; i < vn; i++)
++  i = 0;
++  do
+     {
+       ul = (up[i] ^ ux) + uc;
+       uc = ul < uc;
+@@ -3457,6 +3735,7 @@ mpz_ior (mpz_t r, const mpz_t u, const mpz_t v)
+       rc = rl < rc;
+       rp[i] = rl;
+     }
++  while (++i < vn);
+   assert (vc == 0);
+ 
+   for (; i < rn; i++)
+@@ -3512,7 +3791,8 @@ mpz_xor (mpz_t r, const mpz_t u, const mpz_t v)
+   up = u->_mp_d;
+   vp = v->_mp_d;
+ 
+-  for (i = 0; i < vn; i++)
++  i = 0;
++  do
+     {
+       ul = (up[i] ^ ux) + uc;
+       uc = ul < uc;
+@@ -3524,6 +3804,7 @@ mpz_xor (mpz_t r, const mpz_t u, const mpz_t v)
+       rc = rl < rc;
+       rp[i] = rl;
+     }
++  while (++i < vn);
+   assert (vc == 0);
+ 
+   for (; i < un; i++)
+@@ -3561,20 +3842,28 @@ gmp_popcount_limb (mp_limb_t x)
+ }
+ 
+ mp_bitcnt_t
+-mpz_popcount (const mpz_t u)
++mpn_popcount (mp_srcptr p, mp_size_t n)
+ {
+-  mp_size_t un, i;
++  mp_size_t i;
+   mp_bitcnt_t c;
+ 
++  for (c = 0, i = 0; i < n; i++)
++    c += gmp_popcount_limb (p[i]);
++
++  return c;
++}
++
++mp_bitcnt_t
++mpz_popcount (const mpz_t u)
++{
++  mp_size_t un;
++
+   un = u->_mp_size;
+ 
+   if (un < 0)
+     return ~(mp_bitcnt_t) 0;
+ 
+-  for (c = 0, i = 0; i < un; i++)
+-    c += gmp_popcount_limb (u->_mp_d[i]);
+-
+-  return c;
++  return mpn_popcount (u->_mp_d, un);
+ }
+ 
+ mp_bitcnt_t
+@@ -3591,16 +3880,13 @@ mpz_hamdist (const mpz_t u, const mpz_t v)
+   if ( (un ^ vn) < 0)
+     return ~(mp_bitcnt_t) 0;
+ 
+-  if (un < 0)
++  comp = - (uc = vc = (un < 0));
++  if (uc)
+     {
+       assert (vn < 0);
+       un = -un;
+       vn = -vn;
+-      uc = vc = 1;
+-      comp = - (mp_limb_t) 1;
+     }
+-  else
+-    uc = vc = comp = 0;
+ 
+   up = u->_mp_d;
+   vp = v->_mp_d;
+@@ -3636,10 +3922,8 @@ mpz_scan1 (const mpz_t u, mp_bitcnt_t starting_bit)
+ {
+   mp_ptr up;
+   mp_size_t us, un, i;
+-  mp_limb_t limb, ux, uc;
+-  unsigned cnt;
++  mp_limb_t limb, ux;
+ 
+-  up = u->_mp_d;
+   us = u->_mp_size;
+   un = GMP_ABS (us);
+   i = starting_bit / GMP_LIMB_BITS;
+@@ -3649,36 +3933,24 @@ mpz_scan1 (const mpz_t u, mp_bitcnt_t starting_bit)
+   if (i >= un)
+     return (us >= 0 ? ~(mp_bitcnt_t) 0 : starting_bit);
+ 
+-  if (us < 0)
+-    {
+-      ux = GMP_LIMB_MAX;
+-      uc = mpn_zero_p (up, i);
+-    }
+-  else
+-    ux = uc = 0;
+-
+-  limb = (ux ^ up[i]) + uc;
+-  uc = limb < uc;
+-
+-  /* Mask to 0 all bits before starting_bit, thus ignoring them. */
+-  limb &= (GMP_LIMB_MAX << (starting_bit % GMP_LIMB_BITS));
++  up = u->_mp_d;
++  ux = 0;
++  limb = up[i];
+ 
+-  while (limb == 0)
++  if (starting_bit != 0)
+     {
+-      i++;
+-      if (i == un)
++      if (us < 0)
+ 	{
+-	  assert (uc == 0);
+-	  /* For the u > 0 case, this can happen only for the first
+-	     masked limb. For the u < 0 case, it happens when the
+-	     highest limbs of the absolute value are all ones. */
+-	  return (us >= 0 ? ~(mp_bitcnt_t) 0 : un * GMP_LIMB_BITS);
++	  ux = mpn_zero_p (up, i);
++	  limb = ~ limb + ux;
++	  ux = - (mp_limb_t) (limb >= ux);
+ 	}
+-      limb = (ux ^ up[i]) + uc;
+-      uc = limb < uc;
++
++      /* Mask to 0 all bits before starting_bit, thus ignoring them. */
++      limb &= (GMP_LIMB_MAX << (starting_bit % GMP_LIMB_BITS));
+     }
+-  gmp_ctz (cnt, limb);
+-  return (mp_bitcnt_t) i * GMP_LIMB_BITS + cnt;
++
++  return mpn_common_scan (limb, i, up, un, ux);
+ }
+ 
+ mp_bitcnt_t
+@@ -3686,46 +3958,28 @@ mpz_scan0 (const mpz_t u, mp_bitcnt_t starting_bit)
+ {
+   mp_ptr up;
+   mp_size_t us, un, i;
+-  mp_limb_t limb, ux, uc;
+-  unsigned cnt;
++  mp_limb_t limb, ux;
+ 
+-  up = u->_mp_d;
+   us = u->_mp_size;
++  ux = - (mp_limb_t) (us >= 0);
+   un = GMP_ABS (us);
+   i = starting_bit / GMP_LIMB_BITS;
+ 
+   /* When past end, there's an immediate 0 bit for u>=0, or no 0 bits for
+      u<0.  Notice this test picks up all cases of u==0 too. */
+   if (i >= un)
+-    return (us >= 0 ? starting_bit : ~(mp_bitcnt_t) 0);
++    return (ux ? starting_bit : ~(mp_bitcnt_t) 0);
+ 
+-  if (us < 0)
+-    {
+-      ux = GMP_LIMB_MAX;
+-      uc = mpn_zero_p (up, i);
+-    }
+-  else
+-    ux = uc = 0;
++  up = u->_mp_d;
++  limb = up[i] ^ ux;
+ 
+-  limb = (ux ^ up[i]) + uc;
+-  uc = limb < uc;
++  if (ux == 0)
++    limb -= mpn_zero_p (up, i); /* limb = ~(~limb + zero_p) */
+ 
+-  /* Mask to 1 all bits before starting_bit, thus ignoring them. */
+-  limb |= ((mp_limb_t) 1 << (starting_bit % GMP_LIMB_BITS)) - 1;
++  /* Mask all bits before starting_bit, thus ignoring them. */
++  limb &= (GMP_LIMB_MAX << (starting_bit % GMP_LIMB_BITS));
+ 
+-  while (limb == GMP_LIMB_MAX)
+-    {
+-      i++;
+-      if (i == un)
+-	{
+-	  assert (uc == 0);
+-	  return (us >= 0 ? un * GMP_LIMB_BITS : ~(mp_bitcnt_t) 0);
+-	}
+-      limb = (ux ^ up[i]) + uc;
+-      uc = limb < uc;
+-    }
+-  gmp_ctz (cnt, ~limb);
+-  return (mp_bitcnt_t) i * GMP_LIMB_BITS + cnt;
++  return mpn_common_scan (limb, i, up, un, ux);
+ }
+ 
+ 
+@@ -3771,11 +4025,15 @@ mpz_sizeinbase (const mpz_t u, int base)
+   mpn_copyi (tp, up, un);
+   mpn_div_qr_1_invert (&bi, base);
+ 
+-  for (ndigits = 0; un > 0; ndigits++)
++  ndigits = 0;
++  do
+     {
++      ndigits++;
+       mpn_div_qr_1_preinv (tp, tp, un, &bi);
+       un -= (tp[un-1] == 0);
+     }
++  while (un > 0);
++
+   gmp_free (tp);
+   return ndigits;
+ }
+@@ -3852,7 +4110,6 @@ mpz_set_str (mpz_t r, const char *sp, int base)
+   mp_size_t rn, alloc;
+   mp_ptr rp;
+   size_t sn;
+-  size_t dn;
+   int sign;
+   unsigned char *dp;
+ 
+@@ -3861,13 +4118,8 @@ mpz_set_str (mpz_t r, const char *sp, int base)
+   while (isspace( (unsigned char) *sp))
+     sp++;
+ 
+-  if (*sp == '-')
+-    {
+-      sign = 1;
+-      sp++;
+-    }
+-  else
+-    sign = 0;
++  sign = (*sp == '-');
++  sp += sign;
+ 
+   if (base == 0)
+     {
+@@ -3894,7 +4146,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
+   sn = strlen (sp);
+   dp = gmp_xalloc (sn + (sn == 0));
+ 
+-  for (dn = 0; *sp; sp++)
++  for (sn = 0; *sp; sp++)
+     {
+       unsigned digit;
+ 
+@@ -3916,7 +4168,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
+ 	  return -1;
+ 	}
+ 
+-      dp[dn++] = digit;
++      dp[sn++] = digit;
+     }
+ 
+   bits = mpn_base_power_of_two_p (base);
+@@ -3925,7 +4177,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
+     {
+       alloc = (sn * bits + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS;
+       rp = MPZ_REALLOC (r, alloc);
+-      rn = mpn_set_str_bits (rp, dp, dn, bits);
++      rn = mpn_set_str_bits (rp, dp, sn, bits);
+     }
+   else
+     {
+@@ -3933,7 +4185,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
+       mpn_get_base_info (&info, base);
+       alloc = (sn + info.exp - 1) / info.exp;
+       rp = MPZ_REALLOC (r, alloc);
+-      rn = mpn_set_str_other (rp, dp, dn, base, &info);
++      rn = mpn_set_str_other (rp, dp, sn, base, &info);
+     }
+   assert (rn <= alloc);
+   gmp_free (dp);
+@@ -3967,14 +4219,9 @@ mpz_out_str (FILE *stream, int base, const mpz_t x)
+ static int
+ gmp_detect_endian (void)
+ {
+-  static const int i = 1;
++  static const int i = 2;
+   const unsigned char *p = (const unsigned char *) &i;
+-  if (*p == 1)
+-    /* Little endian */
+-    return -1;
+-  else
+-    /* Big endian */
+-    return 1;
++  return 1 - *p;
+ }
+ 
+ /* Import and export. Does not support nails. */
+@@ -4037,29 +4284,22 @@ mpz_import (mpz_t r, size_t count, int order, size_t size, int endian,
+ 	    }
+ 	}
+     }
+-  if (bytes > 0)
++  assert (i + (bytes > 0) == rn);
++  if (limb != 0)
+     rp[i++] = limb;
+-  assert (i == rn);
++  else
++    i = mpn_normalized_size (rp, i);
+ 
+-  r->_mp_size = mpn_normalized_size (rp, i);
++  r->_mp_size = i;
+ }
+ 
+ void *
+ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
+ 	    size_t nails, const mpz_t u)
+ {
+-  unsigned char *p;
+-  ptrdiff_t word_step;
+-  size_t count, k;
++  size_t count;
+   mp_size_t un;
+ 
+-  /* The current (partial) limb. */
+-  mp_limb_t limb;
+-  /* The number of bytes left to to in this limb. */
+-  size_t bytes;
+-  /* The index where the limb was read. */
+-  mp_size_t i;
+-
+   if (nails != 0)
+     gmp_die ("mpz_import: Nails not supported.");
+ 
+@@ -4067,62 +4307,74 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
+   assert (endian >= -1 && endian <= 1);
+   assert (size > 0 || u->_mp_size == 0);
+ 
+-  un = GMP_ABS (u->_mp_size);
+-  if (un == 0)
+-    {
+-      if (countp)
+-	*countp = 0;
+-      return r;
+-    }
++  un = u->_mp_size;
++  count = 0;
++  if (un != 0)
++    {
++      size_t k;
++      unsigned char *p;
++      ptrdiff_t word_step;
++      /* The current (partial) limb. */
++      mp_limb_t limb;
++      /* The number of bytes left to to in this limb. */
++      size_t bytes;
++      /* The index where the limb was read. */
++      mp_size_t i;
+ 
+-  /* Count bytes in top limb. */
+-  for (limb = u->_mp_d[un-1], k = 0; limb > 0; k++, limb >>= CHAR_BIT)
+-    ;
++      un = GMP_ABS (un);
+ 
+-  assert (k > 0);
++      /* Count bytes in top limb. */
++      limb = u->_mp_d[un-1];
++      assert (limb != 0);
+ 
+-  count = (k + (un-1) * sizeof (mp_limb_t) + size - 1) / size;
++      k = 0;
++      do {
++	k++; limb >>= CHAR_BIT;
++      } while (limb != 0);
+ 
+-  if (!r)
+-    r = gmp_xalloc (count * size);
++      count = (k + (un-1) * sizeof (mp_limb_t) + size - 1) / size;
+ 
+-  if (endian == 0)
+-    endian = gmp_detect_endian ();
++      if (!r)
++	r = gmp_xalloc (count * size);
+ 
+-  p = (unsigned char *) r;
++      if (endian == 0)
++	endian = gmp_detect_endian ();
+ 
+-  word_step = (order != endian) ? 2 * size : 0;
++      p = (unsigned char *) r;
+ 
+-  /* Process bytes from the least significant end, so point p at the
+-     least significant word. */
+-  if (order == 1)
+-    {
+-      p += size * (count - 1);
+-      word_step = - word_step;
+-    }
++      word_step = (order != endian) ? 2 * size : 0;
+ 
+-  /* And at least significant byte of that word. */
+-  if (endian == 1)
+-    p += (size - 1);
++      /* Process bytes from the least significant end, so point p at the
++	 least significant word. */
++      if (order == 1)
++	{
++	  p += size * (count - 1);
++	  word_step = - word_step;
++	}
+ 
+-  for (bytes = 0, i = 0, k = 0; k < count; k++, p += word_step)
+-      {
+-	size_t j;
+-	for (j = 0; j < size; j++, p -= (ptrdiff_t) endian)
+-	  {
+-	    if (bytes == 0)
+-	      {
+-		if (i < un)
+-		  limb = u->_mp_d[i++];
+-		bytes = sizeof (mp_limb_t);
+-	      }
+-	    *p = limb;
+-	    limb >>= CHAR_BIT;
+-	    bytes--;
+-	  }
+-      }
+-  assert (i == un);
+-  assert (k == count);
++      /* And at least significant byte of that word. */
++      if (endian == 1)
++	p += (size - 1);
++
++      for (bytes = 0, i = 0, k = 0; k < count; k++, p += word_step)
++	{
++	  size_t j;
++	  for (j = 0; j < size; j++, p -= (ptrdiff_t) endian)
++	    {
++	      if (bytes == 0)
++		{
++		  if (i < un)
++		    limb = u->_mp_d[i++];
++		  bytes = sizeof (mp_limb_t);
++		}
++	      *p = limb;
++	      limb >>= CHAR_BIT;
++	      bytes--;
++	    }
++	}
++      assert (i == un);
++      assert (k == count);
++    }
+ 
+   if (countp)
+     *countp = count;
+diff --git a/mini-gmp.h b/mini-gmp.h
+index 8c94ca2..d8f691f 100644
+--- a/mini-gmp.h
++++ b/mini-gmp.h
+@@ -1,21 +1,32 @@
+ /* mini-gmp, a minimalistic implementation of a GNU GMP subset.
+ 
+-Copyright 2011, 2012, 2013 Free Software Foundation, Inc.
++Copyright 2011-2014 Free Software Foundation, Inc.
+ 
+ This file is part of the GNU MP Library.
+ 
+ The GNU MP Library is free software; you can redistribute it and/or modify
+-it under the terms of the GNU Lesser General Public License as published by
+-the Free Software Foundation; either version 3 of the License, or (at your
+-option) any later version.
++it under the terms of either:
++
++  * the GNU Lesser General Public License as published by the Free
++    Software Foundation; either version 3 of the License, or (at your
++    option) any later version.
++
++or
++
++  * the GNU General Public License as published by the Free Software
++    Foundation; either version 2 of the License, or (at your option) any
++    later version.
++
++or both in parallel, as here.
+ 
+ The GNU MP Library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+-License for more details.
++or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++for more details.
+ 
+-You should have received a copy of the GNU Lesser General Public License
+-along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
++You should have received copies of the GNU General Public License and the
++GNU Lesser General Public License along with the GNU MP Library.  If not,
++see https://www.gnu.org/licenses/.  */
+ 
+ /* About mini-gmp: This is a minimal implementation of a subset of the
+    GMP interface. It is intended for inclusion into applications which
+@@ -64,8 +75,11 @@ typedef __mpz_struct mpz_t[1];
+ typedef __mpz_struct *mpz_ptr;
+ typedef const __mpz_struct *mpz_srcptr;
+ 
++extern const int mp_bits_per_limb;
++
+ void mpn_copyi (mp_ptr, mp_srcptr, mp_size_t);
+ void mpn_copyd (mp_ptr, mp_srcptr, mp_size_t);
++void mpn_zero (mp_ptr, mp_size_t);
+ 
+ int mpn_cmp (mp_srcptr, mp_srcptr, mp_size_t);
+ 
+@@ -84,10 +98,17 @@ mp_limb_t mpn_submul_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
+ mp_limb_t mpn_mul (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
+ void mpn_mul_n (mp_ptr, mp_srcptr, mp_srcptr, mp_size_t);
+ void mpn_sqr (mp_ptr, mp_srcptr, mp_size_t);
++int mpn_perfect_square_p (mp_srcptr, mp_size_t);
++mp_size_t mpn_sqrtrem (mp_ptr, mp_ptr, mp_srcptr, mp_size_t);
+ 
+ mp_limb_t mpn_lshift (mp_ptr, mp_srcptr, mp_size_t, unsigned int);
+ mp_limb_t mpn_rshift (mp_ptr, mp_srcptr, mp_size_t, unsigned int);
+ 
++mp_bitcnt_t mpn_scan0 (mp_srcptr, mp_bitcnt_t);
++mp_bitcnt_t mpn_scan1 (mp_srcptr, mp_bitcnt_t);
++
++mp_bitcnt_t mpn_popcount (mp_srcptr, mp_size_t);
++
+ mp_limb_t mpn_invert_3by2 (mp_limb_t, mp_limb_t);
+ #define mpn_invert_limb(x) mpn_invert_3by2 ((x), 0)
+ 
+@@ -124,6 +145,10 @@ void mpz_mul_si (mpz_t, const mpz_t, long int);
+ void mpz_mul_ui (mpz_t, const mpz_t, unsigned long int);
+ void mpz_mul (mpz_t, const mpz_t, const mpz_t);
+ void mpz_mul_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++void mpz_addmul_ui (mpz_t, const mpz_t, unsigned long int);
++void mpz_addmul (mpz_t, const mpz_t, const mpz_t);
++void mpz_submul_ui (mpz_t, const mpz_t, unsigned long int);
++void mpz_submul (mpz_t, const mpz_t, const mpz_t);
+ 
+ void mpz_cdiv_qr (mpz_t, mpz_t, const mpz_t, const mpz_t);
+ void mpz_fdiv_qr (mpz_t, mpz_t, const mpz_t, const mpz_t);
+@@ -147,6 +172,7 @@ void mpz_mod (mpz_t, const mpz_t, const mpz_t);
+ void mpz_divexact (mpz_t, const mpz_t, const mpz_t);
+ 
+ int mpz_divisible_p (const mpz_t, const mpz_t);
++int mpz_congruent_p (const mpz_t, const mpz_t, const mpz_t);
+ 
+ unsigned long mpz_cdiv_qr_ui (mpz_t, mpz_t, const mpz_t, unsigned long);
+ unsigned long mpz_fdiv_qr_ui (mpz_t, mpz_t, const mpz_t, unsigned long);
+@@ -176,6 +202,7 @@ int mpz_invert (mpz_t, const mpz_t, const mpz_t);
+ 
+ void mpz_sqrtrem (mpz_t, mpz_t, const mpz_t);
+ void mpz_sqrt (mpz_t, const mpz_t);
++int mpz_perfect_square_p (const mpz_t);
+ 
+ void mpz_pow_ui (mpz_t, const mpz_t, unsigned long);
+ void mpz_ui_pow_ui (mpz_t, unsigned long, unsigned long);
+@@ -188,6 +215,9 @@ int mpz_root (mpz_t, const mpz_t, unsigned long);
+ void mpz_fac_ui (mpz_t, unsigned long);
+ void mpz_bin_uiui (mpz_t, unsigned long, unsigned long);
+ 
++int
++mpz_probab_prime_p (const mpz_t, int);
++
+ int mpz_tstbit (const mpz_t, mp_bitcnt_t);
+ void mpz_setbit (mpz_t, mp_bitcnt_t);
+ void mpz_clrbit (mpz_t, mp_bitcnt_t);
+@@ -211,6 +241,15 @@ double mpz_get_d (const mpz_t);
+ size_t mpz_size (const mpz_t);
+ mp_limb_t mpz_getlimbn (const mpz_t, mp_size_t);
+ 
++void mpz_realloc2 (mpz_t, mp_bitcnt_t);
++mp_srcptr mpz_limbs_read (mpz_srcptr);
++mp_ptr mpz_limbs_modify (mpz_t, mp_size_t);
++mp_ptr mpz_limbs_write (mpz_t, mp_size_t);
++void mpz_limbs_finish (mpz_t, mp_size_t);
++mpz_srcptr mpz_roinit_n (mpz_t, mp_srcptr, mp_size_t);
++
++#define MPZ_ROINIT_N(xp, xs) {{0, (xs),(xp) }}
++
+ void mpz_set_si (mpz_t, signed long int);
+ void mpz_set_ui (mpz_t, unsigned long int);
+ void mpz_set (mpz_t, const mpz_t);
+-- 
+1.9.2
+
diff --git a/trunk/package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch b/trunk/package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch
new file mode 100644
index 00000000..4215bdd8
--- /dev/null
+++ b/trunk/package/libs/nettle/patches/0002-Added-option-to-use-mini-gmp-in-hogweed.patch
@@ -0,0 +1,463 @@
+From 8d5360e3e5eea3c9dbfd44f9b981f18a41605e45 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 9 Mar 2014 11:30:25 +0100
+Subject: [PATCH 2/5] Added option to use mini-gmp in hogweed.
+
+---
+ Makefile.in              |  8 +++--
+ bignum.h                 |  6 +++-
+ configure.ac             | 76 +++++++++++++++++++++++++++++++++++-------------
+ dsa.h                    |  2 +-
+ ecc-internal.h           |  2 +-
+ ecc.h                    |  2 +-
+ eccdata.c                | 12 +++++++-
+ examples/Makefile.in     |  2 +-
+ examples/ecc-benchmark.c |  2 ++
+ gmp-glue.c               |  1 +
+ gmp-glue.h               |  2 +-
+ hogweed.pc.in            |  2 +-
+ mini-gmp.c               |  2 +-
+ mini-gmp.h               |  9 ++++++
+ pkcs1.h                  |  2 +-
+ rsa.h                    |  2 +-
+ testsuite/Makefile.in    |  4 +--
+ testsuite/testutils.h    |  5 ++--
+ 18 files changed, 102 insertions(+), 39 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3b0e1cb..42be3a9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,6 +16,10 @@ MKDIR_P = @MKDIR_P@
+ 
+ OPT_ASM_SOURCES = @OPT_ASM_SOURCES@
+ 
++OPT_HOGWEED_SOURCES = @OPT_HOGWEED_SOURCES@
++
++OPT_HOGWEED_HEADERS = @OPT_HOGWEED_HEADERS@
++
+ SUBDIRS = tools testsuite examples
+ 
+ include config.make
+@@ -106,7 +110,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
+ 		 nettle-meta-armors.c \
+ 		 write-be32.c write-le32.c write-le64.c
+ 
+-hogweed_SOURCES = sexp.c sexp-format.c \
++hogweed_SOURCES = $(OPT_HOGWEED_SOURCES) sexp.c sexp-format.c \
+ 		  sexp-transport.c sexp-transport-format.c \
+ 		  bignum.c bignum-next-prime.c \
+ 		  bignum-random.c bignum-random-prime.c \
+@@ -156,7 +160,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.h bignum.h blowfish.h \
+ 	  pgp.h pkcs1.h realloc.h ripemd160.h rsa.h rsa-compat.h \
+ 	  salsa20.h sexp.h \
+ 	  serpent.h sha.h sha1.h sha2.h sha3.h twofish.h \
+-	  umac.h yarrow.h
++	  umac.h yarrow.h $(OPT_HOGWEED_HEADERS)
+ 
+ INSTALL_HEADERS = $(HEADERS) nettle-stdint.h
+ 
+diff --git a/bignum.h b/bignum.h
+index 746b21f..1f2ff07 100644
+--- a/bignum.h
++++ b/bignum.h
+@@ -28,7 +28,11 @@
+ 
+ #include "nettle-meta.h"
+ 
+-#include <gmp.h>
++#ifdef USE_MINI_GMP
++# include "mini-gmp.h"
++#else
++# include <gmp.h>
++#endif
+ #include "nettle-types.h"
+ 
+ #ifdef __cplusplus
+diff --git a/configure.ac b/configure.ac
+index 78a3d4e..93eb09a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,6 +72,16 @@ AC_ARG_ENABLE(arm-neon,
+   AC_HELP_STRING([--enable-arm-neon], [Enable ARM Neon assembly. (default=auto)]),,
+   [enable_arm_neon=auto])
+ 
++AC_ARG_ENABLE(mini-gmp,
++  AC_HELP_STRING([--enable-mini-gmp], [Disable gmp support and enable mini-gmp. (default=disabled)]),,
++  [enable_mini_gmp=no])
++
++if test "x$enable_mini_gmp" = xyes ; then
++GMP_LIBS=""
++else
++GMP_LIBS="-lgmp"
++fi
++
+ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
+     `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \
+     /usr/local/lib /sw/local/lib /sw/lib \
+@@ -409,7 +419,7 @@ case "$host_os" in
+     LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR).dylib'
+     LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR).dylib'
+     LIBHOGWEED_LINK='$(CC) $(CFLAGS) -dynamiclib -L. $(LDFLAGS) -install_name ${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR) -current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'
+-    LIBHOGWEED_LIBS='-lnettle -lgmp'
++    LIBHOGWEED_LIBS='-lnettle $(GMP_LIBS)'
+     ;;
+   solaris*)
+     # Sun's ld uses -h to set the soname, and this option is passed
+@@ -425,7 +435,7 @@ case "$host_os" in
+     LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
+     LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
+     LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)'
+-    LIBHOGWEED_LIBS='-lnettle -lgmp'
++    LIBHOGWEED_LIBS='-lnettle $(GMP_LIBS)'
+     ;;
+   *)
+     LIBNETTLE_FORLINK=libnettle.so
+@@ -443,7 +453,7 @@ case "$host_os" in
+     # -lhogweed -lgmp -lnettle are still required). Also makes dlopen
+     # of libhogweed.so work, without having to use RTLD_GLOBAL.
+     # Depends on -L. above, to locate nettle.so.
+-    LIBHOGWEED_LIBS='-lnettle -lgmp'
++    LIBHOGWEED_LIBS='-lnettle $(GMP_LIBS)'
+     ;;
+ esac
+ 
+@@ -644,32 +654,55 @@ if test "x$nettle_cv_fcntl_locking" = "xyes" ; then
+   AC_DEFINE(HAVE_FCNTL_LOCKING)
+ fi
+ 
+-# Checks for libraries
+-AC_CHECK_LIB(gmp, __gmpz_getlimbn,,
+-    [AC_MSG_WARN(
++TESTSUITE_LIBS=""
++
++OPT_HOGWEED_SOURCES=""
++OPT_HOGWEED_HEADERS=""
++if test "x$enable_mini_gmp" = xyes ; then
++  OPT_HOGWEED_SOURCES="$OPT_HOGWEED_SOURCES mini-gmp.c"
++  OPT_HOGWEED_HEADERS="$OPT_HOGWEED_HEADERS mini-gmp.h"
++  AC_DEFINE([USE_MINI_GMP], 1, [Use mini-gmp instead of gmp])
++  IF_NOT_MINI_GMP='#'
++  GMP_NUMB_BITS="0"
++else
++
++  # Checks for libraries
++  AC_CHECK_LIB(gmp, __gmpz_getlimbn,,
++      [AC_MSG_WARN(
+ [GNU MP not found, or not 3.1 or up, see http://gmplib.org/.
+ Support for public key algorithms will be unavailable.])]
+-    enable_public_key=no)
++      enable_public_key=no)
+ 
+-# Add -R flags needed to run programs linked with gmp
+-LSH_RPATH_FIX
++  # Add -R flags needed to run programs linked with gmp
++  LSH_RPATH_FIX
+ 
+-# Check for gmp limb size
+-nettle_cv_gmp_numb_bits=0
+-if test "$enable_public_key" = yes; then
+-  AC_MSG_CHECKING([for GMP limb size])
+-  AC_COMPUTE_INT(nettle_cv_gmp_numb_bits, [GMP_NUMB_BITS],
+-      [#include <gmp.h>],
+-      [AC_MSG_FAILURE([cannot find value of GMP_NUMB_BITS])])
++  # Check for gmp limb size
++  nettle_cv_gmp_numb_bits=0
++  if test "$enable_public_key" = yes; then
++    AC_MSG_CHECKING([for GMP limb size])
++    AC_COMPUTE_INT(nettle_cv_gmp_numb_bits, [GMP_NUMB_BITS],
++        [#include <gmp.h>],
++        [AC_MSG_FAILURE([cannot find value of GMP_NUMB_BITS])])
+ 
+-  AC_MSG_RESULT([$nettle_cv_gmp_numb_bits bits])
++    AC_MSG_RESULT([$nettle_cv_gmp_numb_bits bits])
++  fi
++
++  GMP_NUMB_BITS="$nettle_cv_gmp_numb_bits"
++
++  AH_TEMPLATE([HAVE_MPZ_POWM_SEC], [Define if mpz_powm_sec is available (appeared in GMP-5)])
++  AC_CHECK_FUNC(__gmpz_powm_sec, [AC_DEFINE(HAVE_MPZ_POWM_SEC)])
++
++  IF_NOT_MINI_GMP=''
++  TESTSUITE_LIBS="-lgmp"
+ fi
+ 
+-GMP_NUMB_BITS="$nettle_cv_gmp_numb_bits"
+-AC_SUBST([GMP_NUMB_BITS])
++AC_SUBST([GMP_LIBS])
+ 
+-AH_TEMPLATE([HAVE_MPZ_POWM_SEC], [Define if mpz_powm_sec is available (appeared in GMP-5)])
+-AC_CHECK_FUNC(__gmpz_powm_sec, [AC_DEFINE(HAVE_MPZ_POWM_SEC)])
++dnl The testsuite requires gmp
++AC_SUBST([TESTSUITE_LIBS])
++AC_SUBST([GMP_NUMB_BITS])
++AC_SUBST([OPT_HOGWEED_SOURCES])
++AC_SUBST([OPT_HOGWEED_HEADERS])
+ 
+ AH_TEMPLATE([WITH_HOGWEED], [Defined if public key features are enabled])
+ 
+@@ -714,6 +747,7 @@ else
+   IF_DOCUMENTATION='#'
+ fi
+ 
++AC_SUBST(IF_NOT_MINI_GMP)
+ AC_SUBST(IF_HOGWEED)
+ AC_SUBST(IF_STATIC)
+ AC_SUBST(IF_SHARED)
+diff --git a/dsa.h b/dsa.h
+index 7ee2624..478e4fc 100644
+--- a/dsa.h
++++ b/dsa.h
+@@ -26,7 +26,7 @@
+ #ifndef NETTLE_DSA_H_INCLUDED
+ #define NETTLE_DSA_H_INCLUDED
+ 
+-#include <gmp.h>
++#include "bignum.h"
+ 
+ #include "nettle-types.h"
+ 
+diff --git a/ecc-internal.h b/ecc-internal.h
+index e8974fe..5cdd0e1 100644
+--- a/ecc-internal.h
++++ b/ecc-internal.h
+@@ -25,7 +25,7 @@
+ #ifndef NETTLE_ECC_INTERNAL_H_INCLUDED
+ #define NETTLE_ECC_INTERNAL_H_INCLUDED
+ 
+-#include <gmp.h>
++#include "bignum.h"
+ 
+ #include "nettle-types.h"
+ #include "ecc-curve.h"
+diff --git a/ecc.h b/ecc.h
+index 609d246..924f8ec 100644
+--- a/ecc.h
++++ b/ecc.h
+@@ -25,7 +25,7 @@
+ #ifndef NETTLE_ECC_H_INCLUDED
+ #define NETTLE_ECC_H_INCLUDED
+ 
+-#include <gmp.h>
++#include "bignum.h"
+ 
+ #include "nettle-types.h"
+ 
+diff --git a/eccdata.c b/eccdata.c
+index 466753c..24f64e3 100644
+--- a/eccdata.c
++++ b/eccdata.c
+@@ -24,11 +24,14 @@
+ 
+ /* Development of Nettle's ECC support was funded by the .SE Internet Fund. */
+ 
++#include "config.h"
++
+ #include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include "mini-gmp.h"
+ #include "mini-gmp.c"
+ 
+ /* Affine coordinates, for simplicity. Infinity point represented as x
+@@ -895,6 +898,7 @@ int
+ main (int argc, char **argv)
+ {
+   struct ecc_curve ecc;
++  unsigned bits;
+ 
+   if (argc < 4)
+     {
+@@ -902,6 +906,7 @@ main (int argc, char **argv)
+       return EXIT_FAILURE;
+     }
+ 
++  bits = atoi(argv[4]);
+   ecc_curve_init (&ecc, atoi(argv[1]));
+ 
+   ecc_pippenger_precompute (&ecc, atoi(argv[2]), atoi(argv[3]));
+@@ -912,7 +917,12 @@ main (int argc, char **argv)
+   ecc_curve_check (&ecc);
+ 
+   if (argc > 4)
+-    output_curve (&ecc, atoi(argv[4]));
++    {
++      /* when using mini-gmp we cannot estimate it on configure */
++      if (bits == 0)
++        bits = GMP_NUMB_BITS;
++      output_curve (&ecc, bits);
++    }
+ 
+   return EXIT_SUCCESS;
+ }
+diff --git a/examples/Makefile.in b/examples/Makefile.in
+index 563d0dc..2bb0436 100644
+--- a/examples/Makefile.in
++++ b/examples/Makefile.in
+@@ -11,7 +11,7 @@ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+ PRE_LDFLAGS = -L..
+ 
+ OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
+-BENCH_LIBS = @BENCH_LIBS@ -lm
++BENCH_LIBS = @BENCH_LIBS@ $(TESTSUITE_LIBS) -lm
+ 
+ HOGWEED_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \
+ 	      rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT) \
+diff --git a/examples/ecc-benchmark.c b/examples/ecc-benchmark.c
+index 1faf6dc..16a1fd6 100644
+--- a/examples/ecc-benchmark.c
++++ b/examples/ecc-benchmark.c
+@@ -37,6 +37,8 @@
+ 
+ #include "timing.h"
+ 
++#undef USE_MINI_GMP
++#include <gmp.h>
+ #include "../ecc.h"
+ #include "../ecc-internal.h"
+ #include "../gmp-glue.h"
+diff --git a/gmp-glue.c b/gmp-glue.c
+index a2633a5..d76fdea 100644
+--- a/gmp-glue.c
++++ b/gmp-glue.c
+@@ -239,3 +239,4 @@ gmp_free_limbs (mp_limb_t *p, mp_size_t n)
+ 
+   free_func (p, (size_t) n * sizeof(mp_limb_t));
+ }
++
+diff --git a/gmp-glue.h b/gmp-glue.h
+index 269667f..f51b5b5 100644
+--- a/gmp-glue.h
++++ b/gmp-glue.h
+@@ -23,7 +23,7 @@
+ #ifndef NETTLE_GMP_GLUE_H_INCLUDED
+ #define NETTLE_GMP_GLUE_H_INCLUDED
+ 
+-#include <gmp.h>
++#include "bignum.h"
+ 
+ #include "nettle-stdint.h"
+ 
+diff --git a/hogweed.pc.in b/hogweed.pc.in
+index 457f5f2..9a9dea0 100644
+--- a/hogweed.pc.in
++++ b/hogweed.pc.in
+@@ -13,6 +13,6 @@ URL: http://www.lysator.liu.se/~nisse/nettle
+ Version: @PACKAGE_VERSION@
+ Requires.private: nettle
+ Libs: -L${libdir} -lhogweed
+-Libs.private: -lgmp
++Libs.private: @GMP_LIBS@
+ Cflags: -I${includedir}
+ 
+diff --git a/mini-gmp.c b/mini-gmp.c
+index 766df30..cf76a2a 100644
+--- a/mini-gmp.c
++++ b/mini-gmp.c
+@@ -1388,7 +1388,7 @@ mpz_clear (mpz_t r)
+   gmp_free (r->_mp_d);
+ }
+ 
+-static void *
++void *
+ mpz_realloc (mpz_t r, mp_size_t size)
+ {
+   size = GMP_MAX (size, 1);
+diff --git a/mini-gmp.h b/mini-gmp.h
+index d8f691f..dac7d1e 100644
+--- a/mini-gmp.h
++++ b/mini-gmp.h
+@@ -70,6 +70,11 @@ typedef struct
+   mp_limb_t *_mp_d;		/* Pointer to the limbs.  */
+ } __mpz_struct;
+ 
++typedef __mpz_struct MP_INT;
++
++#define GMP_NUMB_BITS (SIZEOF_LONG*8)
++#define GMP_NUMB_MASK (~0)
++
+ typedef __mpz_struct mpz_t[1];
+ 
+ typedef __mpz_struct *mpz_ptr;
+@@ -119,6 +124,10 @@ void mpz_init (mpz_t);
+ void mpz_init2 (mpz_t, mp_bitcnt_t);
+ void mpz_clear (mpz_t);
+ 
++void *
++mpz_realloc (mpz_t r, mp_size_t size);
++#define _mpz_realloc mpz_realloc
++
+ #define mpz_odd_p(z)   (((z)->_mp_size != 0) & (int) (z)->_mp_d[0])
+ #define mpz_even_p(z)  (! mpz_odd_p (z))
+ 
+diff --git a/pkcs1.h b/pkcs1.h
+index fa27225..f402688 100644
+--- a/pkcs1.h
++++ b/pkcs1.h
+@@ -26,7 +26,7 @@
+ #ifndef NETTLE_PKCS1_H_INCLUDED
+ #define NETTLE_PKCS1_H_INCLUDED
+ 
+-#include <gmp.h>
++#include "bignum.h"
+ #include "nettle-types.h"
+ 
+ #ifdef __cplusplus
+diff --git a/rsa.h b/rsa.h
+index 4226f38..c293cd1 100644
+--- a/rsa.h
++++ b/rsa.h
+@@ -26,7 +26,7 @@
+ #ifndef NETTLE_RSA_H_INCLUDED
+ #define NETTLE_RSA_H_INCLUDED
+ 
+-#include <gmp.h>
++#include "bignum.h"
+ #include "nettle-types.h"
+ 
+ #include "md5.h"
+diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
+index 91f6e2a..c8ab5f6 100644
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -47,7 +47,7 @@ TS_HOGWEED = $(TS_HOGWEED_SOURCES:.c=$(EXEEXT))
+ TS_C = $(TS_NETTLE) @IF_HOGWEED@ $(TS_HOGWEED)
+ TS_CXX = @IF_CXX@ $(CXX_SOURCES:.cxx=$(EXEEXT))
+ TARGETS = $(TS_C) $(TS_CXX)
+-TS_SH = sexp-conv-test pkcs1-conv-test symbols-test
++TS_SH = sexp-conv-test pkcs1-conv-test @IF_NOT_MINI_GMP@ symbols-test
+ TS_ALL = $(TARGETS) $(TS_SH)
+ EXTRA_SOURCES = sha1-huge-test.c
+ EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT))
+@@ -75,7 +75,7 @@ all: $(TARGETS) $(EXTRA_TARGETS)
+ 
+ LIB_HOGWEED = @IF_HOGWEED@ -lhogweed
+ TEST_OBJS = testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
+-	    $(LIB_HOGWEED) -lnettle $(LIBS)
++	    $(LIB_HOGWEED) -lnettle $(LIBS) $(TESTSUITE_LIBS)
+ 
+ ../nettle-internal.$(OBJEXT):
+ 	( cd .. && $(MAKE) nettle-internal.$(OBJEXT) )
+diff --git a/testsuite/testutils.h b/testsuite/testutils.h
+index 123bae2..a677a2a 100644
+--- a/testsuite/testutils.h
++++ b/testsuite/testutils.h
+@@ -12,11 +12,10 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#if HAVE_LIBGMP
+-# include "bignum.h"
+-#endif
+ 
+ #if WITH_HOGWEED
++# include <gmp.h>
++# undef USE_MINI_GMP
+ # include "rsa.h"
+ # include "dsa.h"
+ # include "ecc-curve.h"
+-- 
+1.9.2
+
diff --git a/trunk/package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch b/trunk/package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch
new file mode 100644
index 00000000..440f4081
--- /dev/null
+++ b/trunk/package/libs/nettle/patches/0003-Include-local-macros-in-nettle.m4-to-allow-regenerat.patch
@@ -0,0 +1,1241 @@
+From a6d49f192166d20755a6651d4612d3abcd780822 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 9 Mar 2014 11:58:05 +0100
+Subject: [PATCH 3/5] Include local macros in nettle.m4 to allow regeneration.
+
+---
+ configure.ac |    1 +
+ nettle.m4    | 1209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 1210 insertions(+)
+ create mode 100644 nettle.m4
+
+diff --git a/configure.ac b/configure.ac
+index 93eb09a..c24f954 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_PREREQ(2.61)
+ AC_CONFIG_SRCDIR([arcfour.c])
+ # Needed to stop autoconf from looking for files in parent directories.
+ AC_CONFIG_AUX_DIR([.])
++AC_CONFIG_MACRO_DIR([.])
+ 
+ AC_CONFIG_HEADER([config.h])
+ 
+diff --git a/nettle.m4 b/nettle.m4
+new file mode 100644
+index 0000000..98b399b
+--- /dev/null
++++ b/nettle.m4
+@@ -0,0 +1,1209 @@
++dnl Try to detect the type of the third arg to getsockname() et al
++AC_DEFUN([LSH_TYPE_SOCKLEN_T],
++[AH_TEMPLATE([socklen_t], [Length type used by getsockopt])
++AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_type_socklen_t,
++[AC_EGREP_HEADER(socklen_t, sys/socket.h,
++  [ac_cv_type_socklen_t=yes], [ac_cv_type_socklen_t=no])])
++if test $ac_cv_type_socklen_t = no; then
++        AC_MSG_CHECKING(for AIX)
++        AC_EGREP_CPP(yes, [
++#ifdef _AIX
++ yes
++#endif
++],[
++AC_MSG_RESULT(yes)
++AC_DEFINE(socklen_t, size_t)
++],[
++AC_MSG_RESULT(no)
++AC_DEFINE(socklen_t, int)
++])
++fi
++])
++
++dnl Choose cc flags for compiling position independent code
++dnl FIXME: Doesn't do the right thing when crosscompiling.
++AC_DEFUN([LSH_CCPIC],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_MSG_CHECKING(CCPIC)
++AC_CACHE_VAL(lsh_cv_sys_ccpic,[
++  if test -z "$CCPIC" ; then
++    if test "$GCC" = yes ; then
++      case "$host_os" in
++	bsdi4.*)	CCPIC="-fPIC" ;;
++	bsdi*)		CCPIC="" ;;
++	darwin*)	CCPIC="-fPIC" ;;
++	# Could also use -fpic, depending on the number of symbol references
++	solaris*)	CCPIC="-fPIC" ;;
++	cygwin*)	CCPIC="" ;;
++	mingw32*)	CCPIC="" ;;
++	*)		CCPIC="-fpic" ;;
++      esac
++    else
++      case "$host_os" in
++	darwin*)	CCPIC="-fPIC" ;;
++        irix*)		CCPIC="-share" ;;
++	hpux*)		CCPIC="+z"; ;;
++	*freebsd*)	CCPIC="-fpic" ;;
++	sco*|sysv4.*)	CCPIC="-KPIC -dy -Bdynamic" ;;
++	solaris*)	CCPIC="-KPIC -Bdynamic" ;;
++	winnt*)		CCPIC="-shared" ;;
++	*)		CCPIC="" ;;
++      esac
++    fi
++  fi
++  OLD_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS $CCPIC"
++  AC_TRY_COMPILE([], [exit(0);],
++    lsh_cv_sys_ccpic="$CCPIC", lsh_cv_sys_ccpic='')
++  CFLAGS="$OLD_CFLAGS"
++])
++CCPIC="$lsh_cv_sys_ccpic"
++AC_MSG_RESULT($CCPIC)
++AC_SUBST([CCPIC])])
++
++dnl LSH_PATH_ADD(path-id, directory)
++AC_DEFUN([LSH_PATH_ADD],
++[AC_MSG_CHECKING($2)
++ac_exists=no
++if test -d "$2/." ; then
++  ac_real_dir=`cd $2 && pwd`
++  if test -n "$ac_real_dir" ; then
++    ac_exists=yes
++    for old in $1_REAL_DIRS ; do
++      ac_found=no
++      if test x$ac_real_dir = x$old ; then
++        ac_found=yes;
++	break;
++      fi
++    done
++    if test $ac_found = yes ; then
++      AC_MSG_RESULT(already added)
++    else
++      AC_MSG_RESULT(added)
++      # LDFLAGS="$LDFLAGS -L $2"
++      $1_REAL_DIRS="$ac_real_dir [$]$1_REAL_DIRS"
++      $1_DIRS="$2 [$]$1_DIRS"
++    fi
++  fi
++fi
++if test $ac_exists = no ; then
++  AC_MSG_RESULT(not found)
++fi
++])
++
++dnl LSH_RPATH_ADD(dir)
++AC_DEFUN([LSH_RPATH_ADD], [LSH_PATH_ADD(RPATH_CANDIDATE, $1)])
++
++dnl LSH_RPATH_INIT(candidates)
++AC_DEFUN([LSH_RPATH_INIT],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_MSG_CHECKING([for -R flag])
++RPATHFLAG=''
++case "$host_os" in
++  osf1*)		RPATHFLAG="-rpath " ;;
++  irix6.*|irix5.*)	RPATHFLAG="-rpath " ;;
++  solaris*)
++    if test "$TCC" = "yes"; then
++      # tcc doesn't know about -R
++      RPATHFLAG="-Wl,-R,"
++    else
++      RPATHFLAG=-R
++    fi
++    ;;
++  linux*)		RPATHFLAG="-Wl,-rpath," ;;
++  *)			RPATHFLAG="" ;;
++esac
++
++if test x$RPATHFLAG = x ; then
++  AC_MSG_RESULT(none)
++else
++  AC_MSG_RESULT([using $RPATHFLAG])
++fi
++
++RPATH_CANDIDATE_REAL_DIRS=''
++RPATH_CANDIDATE_DIRS=''
++
++AC_MSG_RESULT([Searching for libraries])
++
++for d in $1 ; do
++  LSH_RPATH_ADD($d)
++done
++])    
++
++dnl Try to execute a main program, and if it fails, try adding some
++dnl -R flag.
++dnl LSH_RPATH_FIX
++AC_DEFUN([LSH_RPATH_FIX],
++[if test $cross_compiling = no -a "x$RPATHFLAG" != x ; then
++  ac_success=no
++  AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
++    ac_success=yes, ac_success=no, :)
++  
++  if test $ac_success = no ; then
++    AC_MSG_CHECKING([Running simple test program failed. Trying -R flags])
++dnl echo RPATH_CANDIDATE_DIRS = $RPATH_CANDIDATE_DIRS
++    ac_remaining_dirs=''
++    ac_rpath_save_LDFLAGS="$LDFLAGS"
++    for d in $RPATH_CANDIDATE_DIRS ; do
++      if test $ac_success = yes ; then
++  	ac_remaining_dirs="$ac_remaining_dirs $d"
++      else
++  	LDFLAGS="$RPATHFLAG$d $LDFLAGS"
++dnl echo LDFLAGS = $LDFLAGS
++  	AC_TRY_RUN([int main(int argc, char **argv) { return 0; }],
++  	  [ac_success=yes
++  	  ac_rpath_save_LDFLAGS="$LDFLAGS"
++  	  AC_MSG_RESULT([adding $RPATHFLAG$d])
++  	  ],
++  	  [ac_remaining_dirs="$ac_remaining_dirs $d"], :)
++  	LDFLAGS="$ac_rpath_save_LDFLAGS"
++      fi
++    done
++    RPATH_CANDIDATE_DIRS=$ac_remaining_dirs
++  fi
++  if test $ac_success = no ; then
++    AC_MSG_RESULT(failed)
++  fi
++fi
++])
++
++dnl Like AC_CHECK_LIB, but uses $KRB_LIBS rather than $LIBS.
++dnl LSH_CHECK_KRB_LIB(LIBRARY, FUNCTION, [, ACTION-IF-FOUND [,
++dnl                  ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
++
++AC_DEFUN([LSH_CHECK_KRB_LIB],
++[AC_CHECK_LIB([$1], [$2],
++  ifelse([$3], ,
++      [[ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++     	    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++        AC_DEFINE_UNQUOTED($ac_tr_lib)
++        KRB_LIBS="-l$1 $KRB_LIBS"
++      ]], [$3]),
++  ifelse([$4], , , [$4
++])dnl
++, [$5 $KRB_LIBS])
++])
++
++dnl LSH_LIB_ARGP(ACTION-IF-OK, ACTION-IF-BAD)
++AC_DEFUN([LSH_LIB_ARGP],
++[ ac_argp_save_LIBS="$LIBS"
++  ac_argp_save_LDFLAGS="$LDFLAGS"
++  ac_argp_ok=no
++  # First check if we can link with argp.
++  AC_SEARCH_LIBS(argp_parse, argp,
++  [ LSH_RPATH_FIX
++    AC_CACHE_CHECK([for working argp],
++      lsh_cv_lib_argp_works,
++      [ AC_TRY_RUN(
++[#include <argp.h>
++#include <stdlib.h>
++
++static const struct argp_option
++options[] =
++{
++  { NULL, 0, NULL, 0, NULL, 0 }
++};
++
++struct child_state
++{
++  int n;
++};
++
++static error_t
++child_parser(int key, char *arg, struct argp_state *state)
++{
++  struct child_state *input = (struct child_state *) state->input;
++  
++  switch(key)
++    {
++    default:
++      return ARGP_ERR_UNKNOWN;
++    case ARGP_KEY_END:
++      if (!input->n)
++	input->n = 1;
++      break;
++    }
++  return 0;
++}
++
++const struct argp child_argp =
++{
++  options,
++  child_parser,
++  NULL, NULL, NULL, NULL, NULL
++};
++
++struct main_state
++{
++  struct child_state child;
++  int m;
++};
++
++static error_t
++main_parser(int key, char *arg, struct argp_state *state)
++{
++  struct main_state *input = (struct main_state *) state->input;
++
++  switch(key)
++    {
++    default:
++      return ARGP_ERR_UNKNOWN;
++    case ARGP_KEY_INIT:
++      state->child_inputs[0] = &input->child;
++      break;
++    case ARGP_KEY_END:
++      if (!input->m)
++	input->m = input->child.n;
++      
++      break;
++    }
++  return 0;
++}
++
++static const struct argp_child
++main_children[] =
++{
++  { &child_argp, 0, "", 0 },
++  { NULL, 0, NULL, 0}
++};
++
++static const struct argp
++main_argp =
++{ options, main_parser, 
++  NULL,
++  NULL,
++  main_children,
++  NULL, NULL
++};
++
++int main(int argc, char **argv)
++{
++  struct main_state input = { { 0 }, 0 };
++  char *v[2] = { "foo", NULL };
++
++  argp_parse(&main_argp, 1, v, 0, NULL, &input);
++
++  if ( (input.m == 1) && (input.child.n == 1) )
++    return 0;
++  else
++    return 1;
++}
++], lsh_cv_lib_argp_works=yes,
++   lsh_cv_lib_argp_works=no,
++   lsh_cv_lib_argp_works=no)])
++
++  if test x$lsh_cv_lib_argp_works = xyes ; then
++    ac_argp_ok=yes
++  else
++    # Reset link flags
++    LIBS="$ac_argp_save_LIBS"
++    LDFLAGS="$ac_argp_save_LDFLAGS"
++  fi])
++
++  if test x$ac_argp_ok = xyes ; then
++    ifelse([$1],, true, [$1])
++  else
++    ifelse([$2],, true, [$2])
++  fi   
++])
++
++dnl LSH_GCC_ATTRIBUTES
++dnl Check for gcc's __attribute__ construction
++
++AC_DEFUN([LSH_GCC_ATTRIBUTES],
++[AC_CACHE_CHECK(for __attribute__,
++	       lsh_cv_c_attribute,
++[ AC_TRY_COMPILE([
++#include <stdlib.h>
++
++static void foo(void) __attribute__ ((noreturn));
++
++static void __attribute__ ((noreturn))
++foo(void)
++{
++  exit(1);
++}
++],[],
++lsh_cv_c_attribute=yes,
++lsh_cv_c_attribute=no)])
++
++AH_TEMPLATE([HAVE_GCC_ATTRIBUTE], [Define if the compiler understands __attribute__])
++if test "x$lsh_cv_c_attribute" = "xyes"; then
++  AC_DEFINE(HAVE_GCC_ATTRIBUTE)
++fi
++
++AH_BOTTOM(
++[#if __GNUC__ && HAVE_GCC_ATTRIBUTE
++# define NORETURN __attribute__ ((__noreturn__))
++# define PRINTF_STYLE(f, a) __attribute__ ((__format__ (__printf__, f, a)))
++# define UNUSED __attribute__ ((__unused__))
++#else
++# define NORETURN
++# define PRINTF_STYLE(f, a)
++# define UNUSED
++#endif
++])])
++
++# Check for alloca, and include the standard blurb in config.h
++AC_DEFUN([LSH_FUNC_ALLOCA],
++[AC_FUNC_ALLOCA
++AC_CHECK_HEADERS([malloc.h])
++AH_BOTTOM(
++[/* AIX requires this to be the first thing in the file.  */
++#ifndef __GNUC__
++# if HAVE_ALLOCA_H
++#  include <alloca.h>
++# else
++#  ifdef _AIX
++ #pragma alloca
++#  else
++#   ifndef alloca /* predefined by HP cc +Olibcalls */
++char *alloca ();
++#   endif
++#  endif
++/* Needed for alloca on windows */
++#  if HAVE_MALLOC_H
++#   include <malloc.h>
++#  endif
++# endif
++#else /* defined __GNUC__ */
++# if HAVE_ALLOCA_H
++#  include <alloca.h>
++# else
++/* Needed for alloca on windows, also with gcc */
++#  if HAVE_MALLOC_H
++#   include <malloc.h>
++#  endif
++# endif
++#endif
++])])
++
++AC_DEFUN([LSH_FUNC_STRERROR],
++[AC_CHECK_FUNCS(strerror)
++AH_BOTTOM(
++[#if HAVE_STRERROR
++#define STRERROR strerror
++#else
++#define STRERROR(x) (sys_errlist[x])
++#endif
++])])
++
++AC_DEFUN([LSH_FUNC_STRSIGNAL],
++[AC_CHECK_FUNCS(strsignal)
++AC_CHECK_DECLS([sys_siglist, _sys_siglist])
++AH_BOTTOM(
++[#if HAVE_STRSIGNAL
++# define STRSIGNAL strsignal
++#else /* !HAVE_STRSIGNAL */
++# if HAVE_DECL_SYS_SIGLIST
++#  define STRSIGNAL(x) (sys_siglist[x])
++# else
++#  if HAVE_DECL__SYS_SIGLIST
++#   define STRSIGNAL(x) (_sys_siglist[x])
++#  else
++#   define STRSIGNAL(x) "Unknown signal"
++#   if __GNUC__
++#    warning Using dummy STRSIGNAL
++#   endif
++#  endif
++# endif
++#endif /* !HAVE_STRSIGNAL */
++])])
++
++dnl LSH_MAKE_CONDITIONAL(symbol, test)
++AC_DEFUN([LSH_MAKE_CONDITIONAL],
++[if $2 ; then
++  IF_$1=''
++  UNLESS_$1='# '
++else
++  IF_$1='# '
++  UNLESS_$1=''
++fi 
++AC_SUBST(IF_$1)
++AC_SUBST(UNLESS_$1)])
++
++dnl LSH_DEPENDENCY_TRACKING
++
++dnl Defines compiler flags DEP_FLAGS to generate dependency
++dnl information, and DEP_PROCESS that is any shell commands needed for
++dnl massaging the dependency information further. Dependencies are
++dnl generated as a side effect of compilation. Dependency files
++dnl themselves are not treated as targets.
++
++AC_DEFUN([LSH_DEPENDENCY_TRACKING],
++[AC_ARG_ENABLE(dependency_tracking,
++  AC_HELP_STRING([--disable-dependency-tracking],
++    [Disable dependency tracking. Dependency tracking doesn't work with BSD make]),,
++  [enable_dependency_tracking=yes])
++
++DEP_FLAGS=''
++DEP_PROCESS='true'
++if test x$enable_dependency_tracking = xyes ; then
++  if test x$GCC = xyes ; then
++    gcc_version=`gcc --version | head -1`
++    case "$gcc_version" in
++      2.*|*[[!0-9.]]2.*)
++        enable_dependency_tracking=no
++        AC_MSG_WARN([Dependency tracking disabled, gcc-3.x is needed])
++      ;;
++      *)
++        DEP_FLAGS='-MT $[]@ -MD -MP -MF $[]@.d'
++        DEP_PROCESS='true'
++      ;;
++    esac
++  else
++    enable_dependency_tracking=no
++    AC_MSG_WARN([Dependency tracking disabled])
++  fi
++fi
++
++if test x$enable_dependency_tracking = xyes ; then
++  DEP_INCLUDE='include '
++else
++  DEP_INCLUDE='# '
++fi
++
++AC_SUBST([DEP_INCLUDE])
++AC_SUBST([DEP_FLAGS])
++AC_SUBST([DEP_PROCESS])])
++
++dnl  GMP_TRY_ASSEMBLE(asm-code,[action-success][,action-fail])
++dnl  ----------------------------------------------------------
++dnl  Attempt to assemble the given code.
++dnl  Do "action-success" if this succeeds, "action-fail" if not.
++dnl
++dnl  conftest.o and conftest.out are available for inspection in
++dnl  "action-success".  If either action does a "break" out of a loop then
++dnl  an explicit "rm -f conftest*" will be necessary.
++dnl
++dnl  This is not unlike AC_TRY_COMPILE, but there's no default includes or
++dnl  anything in "asm-code", everything wanted must be given explicitly.
++
++AC_DEFUN([GMP_TRY_ASSEMBLE],
++[cat >conftest.s <<EOF
++[$1]
++EOF
++gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
++if AC_TRY_EVAL(gmp_assemble); then
++  cat conftest.out >&AC_FD_CC
++  ifelse([$2],,:,[$2])
++else
++  cat conftest.out >&AC_FD_CC
++  echo "configure: failed program was:" >&AC_FD_CC
++  cat conftest.s >&AC_FD_CC
++  ifelse([$3],,:,[$3])
++fi
++rm -f conftest*
++])
++
++dnl  GMP_PROG_CC_FOR_BUILD
++dnl  ---------------------
++dnl  Establish CC_FOR_BUILD, a C compiler for the build system.
++dnl
++dnl  If CC_FOR_BUILD is set then it's expected to work, likewise the old
++dnl  style HOST_CC, otherwise some likely candidates are tried, the same as
++dnl  configfsf.guess.
++
++AC_DEFUN([GMP_PROG_CC_FOR_BUILD],
++[AC_REQUIRE([AC_PROG_CC])
++if test -n "$CC_FOR_BUILD"; then
++  GMP_PROG_CC_FOR_BUILD_WORKS($CC_FOR_BUILD,,
++    [AC_MSG_ERROR([Specified CC_FOR_BUILD doesn't seem to work])])
++elif test -n "$HOST_CC"; then
++  GMP_PROG_CC_FOR_BUILD_WORKS($HOST_CC,
++    [CC_FOR_BUILD=$HOST_CC],
++    [AC_MSG_ERROR([Specified HOST_CC doesn't seem to work])])
++elif test $cross_compiling = no ; then
++  CC_FOR_BUILD="$CC"
++else
++  for i in cc gcc c89 c99; do
++    GMP_PROG_CC_FOR_BUILD_WORKS($i,
++      [CC_FOR_BUILD=$i
++       break])
++  done
++  if test -z "$CC_FOR_BUILD"; then
++    AC_MSG_ERROR([Cannot find a build system compiler])
++  fi
++fi
++
++AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
++AC_SUBST(CC_FOR_BUILD)
++])
++
++
++dnl  GMP_PROG_CC_FOR_BUILD_WORKS(cc/cflags[,[action-if-good][,action-if-bad]])
++dnl  -------------------------------------------------------------------------
++dnl  See if the given cc/cflags works on the build system.
++dnl
++dnl  It seems easiest to just use the default compiler output, rather than
++dnl  figuring out the .exe or whatever at this stage.
++
++AC_DEFUN([GMP_PROG_CC_FOR_BUILD_WORKS],
++[AC_MSG_CHECKING([build system compiler $1])
++# remove anything that might look like compiler output to our "||" expression
++rm -f conftest* a.out b.out a.exe a_out.exe
++cat >conftest.c <<EOF
++int
++main ()
++{
++  exit(0);
++}
++EOF
++gmp_compile="$1 conftest.c"
++cc_for_build_works=no
++if AC_TRY_EVAL(gmp_compile); then
++  if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&AC_FD_CC 2>&1; then
++    cc_for_build_works=yes
++  fi
++fi
++rm -f conftest* a.out b.out a.exe a_out.exe
++AC_MSG_RESULT($cc_for_build_works)
++if test "$cc_for_build_works" = yes; then
++  ifelse([$2],,:,[$2])
++else
++  ifelse([$3],,:,[$3])
++fi
++])
++
++dnl  GMP_PROG_EXEEXT_FOR_BUILD
++dnl  -------------------------
++dnl  Determine EXEEXT_FOR_BUILD, the build system executable suffix.
++dnl
++dnl  The idea is to find what "-o conftest$foo" will make it possible to run
++dnl  the program with ./conftest.  On Unix-like systems this is of course
++dnl  nothing, for DOS it's ".exe", or for a strange RISC OS foreign file
++dnl  system cross compile it can be ",ff8" apparently.  Not sure if the
++dnl  latter actually applies to a build-system executable, maybe it doesn't,
++dnl  but it won't hurt to try.
++
++AC_DEFUN([GMP_PROG_EXEEXT_FOR_BUILD],
++[AC_REQUIRE([GMP_PROG_CC_FOR_BUILD])
++AC_CACHE_CHECK([for build system executable suffix],
++               gmp_cv_prog_exeext_for_build,
++[if test $cross_compiling = no ; then
++  gmp_cv_prog_exeext_for_build="$EXEEXT"
++else
++  cat >conftest.c <<EOF
++int
++main ()
++{
++  exit (0);
++}
++EOF
++  for i in .exe ,ff8 ""; do
++    gmp_compile="$CC_FOR_BUILD conftest.c -o conftest$i"
++    if AC_TRY_EVAL(gmp_compile); then
++      if (./conftest) 2>&AC_FD_CC; then
++        gmp_cv_prog_exeext_for_build=$i
++        break
++      fi
++    fi
++  done
++  rm -f conftest*
++  if test "${gmp_cv_prog_exeext_for_build+set}" != set; then
++    AC_MSG_ERROR([Cannot determine executable suffix])
++  fi
++fi
++])
++AC_SUBST(EXEEXT_FOR_BUILD,$gmp_cv_prog_exeext_for_build)
++])
++
++dnl NETTLE_CHECK_ARM_NEON
++dnl ---------------------
++dnl Check if ARM Neon instructions should be used.
++dnl Obeys enable_arm_neon, which should be set earlier.
++AC_DEFUN([NETTLE_CHECK_ARM_NEON],
++[if test "$enable_arm_neon" = auto ; then
++  if test "$cross_compiling" = yes ; then
++    dnl Check if compiler/assembler accepts it,
++    dnl without an explicit .fpu neon directive.
++    AC_CACHE_CHECK([if assembler accepts Neon instructions],
++      nettle_cv_asm_arm_neon,
++      [GMP_TRY_ASSEMBLE([
++.text
++foo:
++	vmlal.u32	q1, d0, d1
++],
++      [nettle_cv_asm_arm_neon=yes],
++      [nettle_cv_asm_arm_neon=no])])
++    enable_arm_neon="$nettle_cv_asm_arm_neon"
++  else
++    AC_MSG_CHECKING([if /proc/cpuinfo claims neon support])
++    if grep '^Features.*:.* neon' /proc/cpuinfo >/dev/null ; then
++      enable_arm_neon=yes
++    else
++      enable_arm_neon=no
++    fi
++    AC_MSG_RESULT($enable_arm_neon)
++  fi
++fi
++])
++
++dnl @synopsis AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])]
++dnl
++dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the
++dnl existence of an include file <stdint.h> that defines a set of 
++dnl typedefs, especially uint8_t,int32_t,uintptr_t.
++dnl Many older installations will not provide this file, but some will
++dnl have the very same definitions in <inttypes.h>. In other enviroments
++dnl we can use the inet-types in <sys/types.h> which would define the
++dnl typedefs int8_t and u_int8_t respectivly.
++dnl
++dnl This macros will create a local "_stdint.h" or the headerfile given as 
++dnl an argument. In many cases that file will just "#include <stdint.h>" 
++dnl or "#include <inttypes.h>", while in other environments it will provide 
++dnl the set of basic 'stdint's definitions/typedefs: 
++dnl   int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t
++dnl   int_least32_t.. int_fast32_t.. intmax_t
++dnl which may or may not rely on the definitions of other files,
++dnl or using the AC_CHECK_SIZEOF macro to determine the actual
++dnl sizeof each type.
++dnl
++dnl if your header files require the stdint-types you will want to create an
++dnl installable file mylib-int.h that all your other installable header
++dnl may include. So if you have a library package named "mylib", just use
++dnl      AX_CREATE_STDINT_H(mylib-int.h) 
++dnl in configure.ac and go to install that very header file in Makefile.am
++dnl along with the other headers (mylib.h) - and the mylib-specific headers
++dnl can simply use "#include <mylib-int.h>" to obtain the stdint-types.
++dnl
++dnl Remember, if the system already had a valid <stdint.h>, the generated
++dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things...
++dnl
++dnl @, (status: used on new platforms) (see http://ac-archive.sf.net/gstdint/)
++dnl @author  Guido Draheim <guidod@gmx.de> 
++
++AC_DEFUN([AX_CREATE_STDINT_H],
++[# ------ AX CREATE STDINT H -------------------------------------
++AC_MSG_CHECKING([for stdint types])
++ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)`
++# try to shortcircuit - if the default include path of the compiler
++# can find a "stdint.h" header then we assume that all compilers can.
++AC_CACHE_VAL([ac_cv_header_stdint_t],[
++old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
++old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
++old_CFLAGS="$CFLAGS"     ; CFLAGS=""
++AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
++[ac_cv_stdint_result="(assuming C99 compatible system)"
++ ac_cv_header_stdint_t="stdint.h"; ],
++[ac_cv_header_stdint_t=""])
++CXXFLAGS="$old_CXXFLAGS"
++CPPFLAGS="$old_CPPFLAGS"
++CFLAGS="$old_CFLAGS" ])
++
++v="... $ac_cv_header_stdint_h"
++if test "$ac_stdint_h" = "stdint.h" ; then
++ AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)])
++elif test "$ac_stdint_h" = "inttypes.h" ; then
++ AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)])
++elif test "_$ac_cv_header_stdint_t" = "_" ; then
++ AC_MSG_RESULT([(putting them into $ac_stdint_h)$v])
++else
++ ac_cv_header_stdint="$ac_cv_header_stdint_t"
++ AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)])
++fi
++
++if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
++
++dnl .....intro message done, now do a few system checks.....
++dnl btw, all CHECK_TYPE macros do automatically "DEFINE" a type, therefore
++dnl we use the autoconf implementation detail _AC CHECK_TYPE_NEW instead
++
++inttype_headers=`echo $2 | sed -e 's/,/ /g'`
++
++ac_cv_stdint_result="(no helpful system typedefs seen)"
++AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[
++ ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
++  AC_MSG_RESULT([(..)])
++  for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ; do
++   unset ac_cv_type_uintptr_t 
++   unset ac_cv_type_uint64_t
++   _AC_CHECK_TYPE_NEW(uintptr_t,[ac_cv_header_stdint_x=$i],dnl
++     continue,[#include <$i>])
++   AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
++   ac_cv_stdint_result="(seen uintptr_t$and64 in $i)"
++   break;
++  done
++  AC_MSG_CHECKING([for stdint uintptr_t])
++ ])
++
++if test "_$ac_cv_header_stdint_x" = "_" ; then
++AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[
++ ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
++  AC_MSG_RESULT([(..)])
++  for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ; do
++   unset ac_cv_type_uint32_t
++   unset ac_cv_type_uint64_t
++   AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],dnl
++     continue,[#include <$i>])
++   AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
++   ac_cv_stdint_result="(seen uint32_t$and64 in $i)"
++   break;
++  done
++  AC_MSG_CHECKING([for stdint uint32_t])
++ ])
++fi
++
++if test "_$ac_cv_header_stdint_x" = "_" ; then
++if test "_$ac_cv_header_stdint_o" = "_" ; then
++AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[
++ ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
++  AC_MSG_RESULT([(..)])
++  for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do
++   unset ac_cv_type_u_int32_t
++   unset ac_cv_type_u_int64_t
++   AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],dnl
++     continue,[#include <$i>])
++   AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>])
++   ac_cv_stdint_result="(seen u_int32_t$and64 in $i)"
++   break;
++  done
++  AC_MSG_CHECKING([for stdint u_int32_t])
++ ])
++fi fi
++
++dnl if there was no good C99 header file, do some typedef checks...
++if test "_$ac_cv_header_stdint_x" = "_" ; then
++   AC_MSG_CHECKING([for stdint datatype model])
++   AC_MSG_RESULT([(..)])
++   AC_CHECK_SIZEOF(char)
++   AC_CHECK_SIZEOF(short)
++   AC_CHECK_SIZEOF(int)
++   AC_CHECK_SIZEOF(long)
++   AC_CHECK_SIZEOF(void*)
++   ac_cv_stdint_char_model=""
++   ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_char"
++   ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_short"
++   ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_int"
++   ac_cv_stdint_long_model=""
++   ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_int"
++   ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_long"
++   ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_voidp"
++   name="$ac_cv_stdint_long_model"
++   case "$ac_cv_stdint_char_model/$ac_cv_stdint_long_model" in
++    122/242)     name="$name,  IP16 (standard 16bit machine)" ;;
++    122/244)     name="$name,  LP32 (standard 32bit mac/win)" ;;
++    122/*)       name="$name        (unusual int16 model)" ;; 
++    124/444)     name="$name, ILP32 (standard 32bit unixish)" ;;
++    124/488)     name="$name,  LP64 (standard 64bit unixish)" ;;
++    124/448)     name="$name, LLP64 (unusual  64bit unixish)" ;;
++    124/*)       name="$name        (unusual int32 model)" ;; 
++    128/888)     name="$name, ILP64 (unusual  64bit numeric)" ;;
++    128/*)       name="$name        (unusual int64 model)" ;; 
++    222/*|444/*) name="$name        (unusual dsptype)" ;;
++     *)          name="$name        (very unusal model)" ;;
++   esac
++   AC_MSG_RESULT([combined for stdint datatype model...  $name])
++fi
++
++if test "_$ac_cv_header_stdint_x" != "_" ; then
++   ac_cv_header_stdint="$ac_cv_header_stdint_x"
++elif  test "_$ac_cv_header_stdint_o" != "_" ; then
++   ac_cv_header_stdint="$ac_cv_header_stdint_o"
++elif  test "_$ac_cv_header_stdint_u" != "_" ; then
++   ac_cv_header_stdint="$ac_cv_header_stdint_u"
++else
++   ac_cv_header_stdint="stddef.h"
++fi
++
++AC_MSG_CHECKING([for extra inttypes in chosen header])
++AC_MSG_RESULT([($ac_cv_header_stdint)])
++dnl see if int_least and int_fast types are present in _this_ header.
++unset ac_cv_type_int_least32_t
++unset ac_cv_type_int_fast32_t
++AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>])
++AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>])
++AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>])
++
++fi # shortcircut to system "stdint.h"
++# ------------------ PREPARE VARIABLES ------------------------------
++if test "$GCC" = "yes" ; then
++ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` 
++else
++ac_cv_stdint_message="using $CC"
++fi
++
++AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl
++$ac_cv_stdint_result])
++
++# ----------------- DONE inttypes.h checks START header -------------
++AC_CONFIG_COMMANDS([$ac_stdint_h],[
++AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h)
++ac_stdint=$tmp/_stdint.h
++
++echo "#ifndef" $_ac_stdint_h >$ac_stdint
++echo "#define" $_ac_stdint_h "1" >>$ac_stdint
++echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
++echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
++echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
++if test "_$ac_cv_header_stdint_t" != "_" ; then 
++echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
++fi
++
++cat >>$ac_stdint <<STDINT_EOF
++
++/* ................... shortcircuit part ........................... */
++
++#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H
++#include <stdint.h>
++#else
++#include <stddef.h>
++
++/* .................... configured part ............................ */
++
++STDINT_EOF
++
++echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint
++if test "_$ac_cv_header_stdint_x" != "_" ; then
++  ac_header="$ac_cv_header_stdint_x"
++  echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint
++else
++  echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint
++fi
++
++echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint
++if  test "_$ac_cv_header_stdint_o" != "_" ; then
++  ac_header="$ac_cv_header_stdint_o"
++  echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint
++else
++  echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint
++fi
++
++echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint
++if  test "_$ac_cv_header_stdint_u" != "_" ; then
++  ac_header="$ac_cv_header_stdint_u"
++  echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint
++else
++  echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint
++fi
++
++echo "" >>$ac_stdint
++
++if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then
++  echo "#include <$ac_header>" >>$ac_stdint
++  echo "" >>$ac_stdint
++fi fi
++
++echo "/* which 64bit typedef has been found */" >>$ac_stdint
++if test "$ac_cv_type_uint64_t" = "yes" ; then
++echo "#define   _STDINT_HAVE_UINT64_T" "1"  >>$ac_stdint
++else
++echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint
++fi
++if test "$ac_cv_type_u_int64_t" = "yes" ; then
++echo "#define   _STDINT_HAVE_U_INT64_T" "1"  >>$ac_stdint
++else
++echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint
++fi
++echo "" >>$ac_stdint
++
++echo "/* which type model has been detected */" >>$ac_stdint
++if test "_$ac_cv_stdint_char_model" != "_" ; then
++echo "#define   _STDINT_CHAR_MODEL" "$ac_cv_stdint_char_model" >>$ac_stdint
++echo "#define   _STDINT_LONG_MODEL" "$ac_cv_stdint_long_model" >>$ac_stdint
++else
++echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint
++echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint
++fi
++echo "" >>$ac_stdint
++
++echo "/* whether int_least types were detected */" >>$ac_stdint
++if test "$ac_cv_type_int_least32_t" = "yes"; then
++echo "#define   _STDINT_HAVE_INT_LEAST32_T" "1"  >>$ac_stdint
++else
++echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint
++fi
++echo "/* whether int_fast types were detected */" >>$ac_stdint
++if test "$ac_cv_type_int_fast32_t" = "yes"; then
++echo "#define   _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint
++else
++echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint
++fi
++echo "/* whether intmax_t type was detected */" >>$ac_stdint
++if test "$ac_cv_type_intmax_t" = "yes"; then
++echo "#define   _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint
++else
++echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint
++fi
++echo "" >>$ac_stdint
++
++  cat >>$ac_stdint <<STDINT_EOF
++/* .................... detections part ............................ */
++
++/* whether we need to define bitspecific types from compiler base types */
++#ifndef _STDINT_HEADER_INTPTR
++#ifndef _STDINT_HEADER_UINT32
++#ifndef _STDINT_HEADER_U_INT32
++#define _STDINT_NEED_INT_MODEL_T
++#else
++#define _STDINT_HAVE_U_INT_TYPES
++#endif
++#endif
++#endif
++
++#ifdef _STDINT_HAVE_U_INT_TYPES
++#undef _STDINT_NEED_INT_MODEL_T
++#endif
++
++#ifdef  _STDINT_CHAR_MODEL
++#if     _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124
++#ifndef _STDINT_BYTE_MODEL
++#define _STDINT_BYTE_MODEL 12
++#endif
++#endif
++#endif
++
++#ifndef _STDINT_HAVE_INT_LEAST32_T
++#define _STDINT_NEED_INT_LEAST_T
++#endif
++
++#ifndef _STDINT_HAVE_INT_FAST32_T
++#define _STDINT_NEED_INT_FAST_T
++#endif
++
++#ifndef _STDINT_HEADER_INTPTR
++#define _STDINT_NEED_INTPTR_T
++#ifndef _STDINT_HAVE_INTMAX_T
++#define _STDINT_NEED_INTMAX_T
++#endif
++#endif
++
++
++/* .................... definition part ............................ */
++
++/* some system headers have good uint64_t */
++#ifndef _HAVE_UINT64_T
++#if     defined _STDINT_HAVE_UINT64_T  || defined HAVE_UINT64_T
++#define _HAVE_UINT64_T
++#elif   defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T
++#define _HAVE_UINT64_T
++typedef u_int64_t uint64_t;
++#endif
++#endif
++
++#ifndef _HAVE_UINT64_T
++/* .. here are some common heuristics using compiler runtime specifics */
++#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L
++#define _HAVE_UINT64_T
++typedef long long int64_t;
++typedef unsigned long long uint64_t;
++
++#elif !defined __STRICT_ANSI__
++#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
++#define _HAVE_UINT64_T
++typedef __int64 int64_t;
++typedef unsigned __int64 uint64_t;
++
++#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__
++/* note: all ELF-systems seem to have loff-support which needs 64-bit */
++#if !defined _NO_LONGLONG
++#define _HAVE_UINT64_T
++typedef long long int64_t;
++typedef unsigned long long uint64_t;
++#endif
++
++#elif defined __alpha || (defined __mips && defined _ABIN32)
++#if !defined _NO_LONGLONG
++typedef long int64_t;
++typedef unsigned long uint64_t;
++#endif
++  /* compiler/cpu type to define int64_t */
++#endif
++#endif
++#endif
++
++#if defined _STDINT_HAVE_U_INT_TYPES
++/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
++typedef u_int8_t uint8_t;
++typedef u_int16_t uint16_t;
++typedef u_int32_t uint32_t;
++
++/* glibc compatibility */
++#ifndef __int8_t_defined
++#define __int8_t_defined
++#endif
++#endif
++
++#ifdef _STDINT_NEED_INT_MODEL_T
++/* we must guess all the basic types. Apart from byte-adressable system, */
++/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */
++/* (btw, those nibble-addressable systems are way off, or so we assume) */
++
++dnl   /* have a look at "64bit and data size neutrality" at */
++dnl   /* http://unix.org/version2/whatsnew/login_64bit.html */
++dnl   /* (the shorthand "ILP" types always have a "P" part) */
++
++#if defined _STDINT_BYTE_MODEL
++#if _STDINT_LONG_MODEL+0 == 242
++/* 2:4:2 =  IP16 = a normal 16-bit system                */
++typedef unsigned char   uint8_t;
++typedef unsigned short  uint16_t;
++typedef unsigned long   uint32_t;
++#ifndef __int8_t_defined
++#define __int8_t_defined
++typedef          char    int8_t;
++typedef          short   int16_t;
++typedef          long    int32_t;
++#endif
++#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444
++/* 2:4:4 =  LP32 = a 32-bit system derived from a 16-bit */
++/* 4:4:4 = ILP32 = a normal 32-bit system                */
++typedef unsigned char   uint8_t;
++typedef unsigned short  uint16_t;
++typedef unsigned int    uint32_t;
++#ifndef __int8_t_defined
++#define __int8_t_defined
++typedef          char    int8_t;
++typedef          short   int16_t;
++typedef          int     int32_t;
++#endif
++#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488
++/* 4:8:4 =  IP32 = a 32-bit system prepared for 64-bit    */
++/* 4:8:8 =  LP64 = a normal 64-bit system                 */
++typedef unsigned char   uint8_t;
++typedef unsigned short  uint16_t;
++typedef unsigned int    uint32_t;
++#ifndef __int8_t_defined
++#define __int8_t_defined
++typedef          char    int8_t;
++typedef          short   int16_t;
++typedef          int     int32_t;
++#endif
++/* this system has a "long" of 64bit */
++#ifndef _HAVE_UINT64_T
++#define _HAVE_UINT64_T
++typedef unsigned long   uint64_t;
++typedef          long    int64_t;
++#endif
++#elif _STDINT_LONG_MODEL+0 == 448
++/*      LLP64   a 64-bit system derived from a 32-bit system */
++typedef unsigned char   uint8_t;
++typedef unsigned short  uint16_t;
++typedef unsigned int    uint32_t;
++#ifndef __int8_t_defined
++#define __int8_t_defined
++typedef          char    int8_t;
++typedef          short   int16_t;
++typedef          int     int32_t;
++#endif
++/* assuming the system has a "long long" */
++#ifndef _HAVE_UINT64_T
++#define _HAVE_UINT64_T
++typedef unsigned long long uint64_t;
++typedef          long long  int64_t;
++#endif
++#else
++#define _STDINT_NO_INT32_T
++#endif
++#else
++#define _STDINT_NO_INT8_T
++#define _STDINT_NO_INT32_T
++#endif
++#endif
++
++/*
++ * quote from SunOS-5.8 sys/inttypes.h:
++ * Use at your own risk.  As of February 1996, the committee is squarely
++ * behind the fixed sized types; the "least" and "fast" types are still being
++ * discussed.  The probability that the "fast" types may be removed before
++ * the standard is finalized is high enough that they are not currently
++ * implemented.
++ */
++
++#if defined _STDINT_NEED_INT_LEAST_T
++typedef  int8_t    int_least8_t;
++typedef  int16_t   int_least16_t;
++typedef  int32_t   int_least32_t;
++#ifdef _HAVE_UINT64_T
++typedef  int64_t   int_least64_t;
++#endif
++
++typedef uint8_t   uint_least8_t;
++typedef uint16_t  uint_least16_t;
++typedef uint32_t  uint_least32_t;
++#ifdef _HAVE_UINT64_T
++typedef uint64_t  uint_least64_t;
++#endif
++  /* least types */
++#endif
++
++#if defined _STDINT_NEED_INT_FAST_T
++typedef  int8_t    int_fast8_t; 
++typedef  int       int_fast16_t;
++typedef  int32_t   int_fast32_t;
++#ifdef _HAVE_UINT64_T
++typedef  int64_t   int_fast64_t;
++#endif
++
++typedef uint8_t   uint_fast8_t; 
++typedef unsigned  uint_fast16_t;
++typedef uint32_t  uint_fast32_t;
++#ifdef _HAVE_UINT64_T
++typedef uint64_t  uint_fast64_t;
++#endif
++  /* fast types */
++#endif
++
++#ifdef _STDINT_NEED_INTMAX_T
++#ifdef _HAVE_UINT64_T
++typedef  int64_t       intmax_t;
++typedef uint64_t      uintmax_t;
++#else
++typedef          long  intmax_t;
++typedef unsigned long uintmax_t;
++#endif
++#endif
++
++#ifdef _STDINT_NEED_INTPTR_T
++#ifndef __intptr_t_defined
++#define __intptr_t_defined
++/* we encourage using "long" to store pointer values, never use "int" ! */
++#if   _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484
++typedef  unsinged int   uintptr_t;
++typedef           int    intptr_t;
++#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444
++typedef  unsigned long  uintptr_t;
++typedef           long   intptr_t;
++#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T
++typedef        uint64_t uintptr_t;
++typedef         int64_t  intptr_t;
++#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */
++typedef  unsigned long  uintptr_t;
++typedef           long   intptr_t;
++#endif
++#endif
++#endif
++
++  /* shortcircuit*/
++#endif
++  /* once */
++#endif
++#endif
++STDINT_EOF
++    if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
++      AC_MSG_NOTICE([$ac_stdint_h is unchanged])
++    else
++      ac_dir=`AS_DIRNAME(["$ac_stdint_h"])`
++      AS_MKDIR_P(["$ac_dir"])
++      rm -f $ac_stdint_h
++      mv $ac_stdint $ac_stdint_h
++    fi
++],[# variables for create stdint.h replacement
++PACKAGE="$PACKAGE"
++VERSION="$VERSION"
++ac_stdint_h="$ac_stdint_h"
++_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h)
++ac_cv_stdint_message="$ac_cv_stdint_message"
++ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
++ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
++ac_cv_header_stdint_o="$ac_cv_header_stdint_o"
++ac_cv_header_stdint_u="$ac_cv_header_stdint_u"
++ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
++ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
++ac_cv_stdint_char_model="$ac_cv_stdint_char_model"
++ac_cv_stdint_long_model="$ac_cv_stdint_long_model"
++ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
++ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
++ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
++])
++])
+-- 
+1.9.2
+
diff --git a/trunk/package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch b/trunk/package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch
new file mode 100644
index 00000000..a4534a50
--- /dev/null
+++ b/trunk/package/libs/nettle/patches/0004-Added-auto-generated-nettle-config.h.patch
@@ -0,0 +1,100 @@
+From 7508bb15de94b38402152757f75ff3e2094fdd86 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 9 Mar 2014 13:27:03 +0100
+Subject: [PATCH 4/5] Added-auto-generated-nettle-config.h
+
+---
+ Makefile.in              | 4 ++--
+ bignum.h                 | 1 +
+ configure.ac             | 1 +
+ examples/ecc-benchmark.c | 1 +
+ nettle-config.h.in       | 6 ++++++
+ testsuite/testutils.h    | 1 +
+ 7 files changed, 13 insertions(+), 2 deletions(-)
+ create mode 100644 nettle-config.h.in
+
+diff --git a/Makefile.in b/Makefile.in
+index 42be3a9..280dd30 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -151,7 +151,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.h bignum.h blowfish.h \
+ 	  des.h des-compat.h dsa.h ecc-curve.h ecc.h ecdsa.h \
+ 	  gcm.h gosthash94.h hmac.h \
+ 	  knuth-lfib.h \
+-	  macros.h \
++	  macros.h nettle-config.h \
+ 	  md2.h md4.h \
+ 	  md5.h md5-compat.h \
+ 	  memxor.h \
+@@ -174,7 +174,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h .bootstrap run-tests \
+ 	config.guess config.sub install-sh texinfo.tex \
+ 	config.h.in config.m4.in config.make.in	Makefile.in \
+ 	README AUTHORS COPYING.LIB INSTALL NEWS TODO ChangeLog \
+-	nettle.pc.in hogweed.pc.in \
++	nettle.pc.in hogweed.pc.in nettle-config.h.in \
+ 	memxor.c $(des_headers) descore.README \
+ 	aes-internal.h camellia-internal.h serpent-internal.h \
+ 	cast128_sboxes.h desinfo.h desCode.h \
+diff --git a/bignum.h b/bignum.h
+index 1f2ff07..c31ccaa 100644
+--- a/bignum.h
++++ b/bignum.h
+@@ -26,6 +26,7 @@
+ #ifndef NETTLE_BIGNUM_H_INCLUDED
+ #define NETTLE_BIGNUM_H_INCLUDED
+ 
++#include "nettle-config.h"
+ #include "nettle-meta.h"
+ 
+ #ifdef USE_MINI_GMP
+diff --git a/configure.ac b/configure.ac
+index c24f954..cb65bcd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,6 +10,7 @@ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_MACRO_DIR([.])
+ 
+ AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADER([nettle-config.h])
+ 
+ LIBNETTLE_MAJOR=4
+ LIBNETTLE_MINOR=7
+diff --git a/examples/ecc-benchmark.c b/examples/ecc-benchmark.c
+index 16a1fd6..eaaf3a5 100644
+--- a/examples/ecc-benchmark.c
++++ b/examples/ecc-benchmark.c
+@@ -38,6 +38,7 @@
+ #include "timing.h"
+ 
+ #undef USE_MINI_GMP
++#define NETTLE_CONFIG_H_INCLUDED
+ #include <gmp.h>
+ #include "../ecc.h"
+ #include "../ecc-internal.h"
+diff --git a/nettle-config.h.in b/nettle-config.h.in
+new file mode 100644
+index 0000000..11330ff
+--- /dev/null
++++ b/nettle-config.h.in
+@@ -0,0 +1,6 @@
++#ifndef NETTLE_CONFIG_H_INCLUDED
++#define NETTLE_CONFIG_H_INCLUDED
++
++#undef USE_MINI_GMP
++
++#endif
+diff --git a/testsuite/testutils.h b/testsuite/testutils.h
+index a677a2a..6e9b30c 100644
+--- a/testsuite/testutils.h
++++ b/testsuite/testutils.h
+@@ -15,6 +15,7 @@
+ 
+ #if WITH_HOGWEED
+ # include <gmp.h>
++# define NETTLE_CONFIG_H_INCLUDED
+ # undef USE_MINI_GMP
+ # include "rsa.h"
+ # include "dsa.h"
+-- 
+1.9.2
+
diff --git a/trunk/package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch b/trunk/package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch
new file mode 100644
index 00000000..3a872549
--- /dev/null
+++ b/trunk/package/libs/nettle/patches/0005-allow-der-iterator-to-be-used-with-mini-gmp.patch
@@ -0,0 +1,34 @@
+From d71b3138cbdc3852c96a2639995f2d7f44b1c76c Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sat, 29 Mar 2014 09:12:41 +0100
+Subject: [PATCH 5/5] allow der-iterator to be used with mini-gmp
+
+---
+ der-iterator.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/der-iterator.c b/der-iterator.c
+index 2e6efd5..5ab15b9 100644
+--- a/der-iterator.c
++++ b/der-iterator.c
+@@ -30,7 +30,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
+-#if HAVE_LIBGMP
++#if defined(HAVE_LIBGMP) || defined(USE_MINI_GMP)
+ #include "bignum.h"
+ #endif
+ 
+@@ -246,7 +246,7 @@ asn1_der_get_uint32(struct asn1_der_iterator *i,
+   return 1;
+ }
+ 
+-#if HAVE_LIBGMP
++#if defined(HAVE_LIBGMP) || defined(USE_MINI_GMP)
+ int
+ asn1_der_get_bignum(struct asn1_der_iterator *i,
+ 		    mpz_t x, unsigned max_bits)
+-- 
+1.9.2
+
diff --git a/trunk/package/libs/ocf-crypto-headers/Makefile b/trunk/package/libs/ocf-crypto-headers/Makefile
new file mode 100644
index 00000000..faf05088
--- /dev/null
+++ b/trunk/package/libs/ocf-crypto-headers/Makefile
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ocf-crypto-headers
+PKG_VERSION:=20110720
+PKG_RELEASE:=1
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=cryptodev.h
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ocf-crypto-headers
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=OCF-Linux cryptodev header
+  PKGARCH:=all
+  URL:=http://ocf-linux.sourceforge.net/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include/crypto
+	$(CP) ./src/cryptodev.h $(1)/usr/include/crypto
+endef
+
+$(eval $(call BuildPackage,ocf-crypto-headers))
diff --git a/trunk/package/libs/ocf-crypto-headers/src/cryptodev.h b/trunk/package/libs/ocf-crypto-headers/src/cryptodev.h
new file mode 100644
index 00000000..cca0ec82
--- /dev/null
+++ b/trunk/package/libs/ocf-crypto-headers/src/cryptodev.h
@@ -0,0 +1,480 @@
+/*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.25 2007/05/09 19:37:02 gnn Exp $	*/
+/*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
+
+/*-
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ * The license and original author are listed below.
+ *
+ * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
+ * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
+ *
+ * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * February 2000. Network Security Technologies Inc. (NSTI) kindly
+ * supported the development of this code.
+ *
+ * Copyright (c) 2000 Angelos D. Keromytis
+ *
+ * Permission to use, copy, and modify this software with or without fee
+ * is hereby granted, provided that this entire notice is included in
+ * all source code copies of any software which is or includes a copy or
+ * modification of this software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+ * PURPOSE.
+ *
+ * Copyright (c) 2001 Theo de Raadt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+#ifndef _CRYPTO_CRYPTO_H_
+#define _CRYPTO_CRYPTO_H_
+
+/* Some initial values */
+#define CRYPTO_DRIVERS_INITIAL	4
+#define CRYPTO_SW_SESSIONS	32
+
+/* Hash values */
+#define NULL_HASH_LEN		0
+#define MD5_HASH_LEN		16
+#define SHA1_HASH_LEN		20
+#define RIPEMD160_HASH_LEN	20
+#define SHA2_256_HASH_LEN	32
+#define SHA2_384_HASH_LEN	48
+#define SHA2_512_HASH_LEN	64
+#define MD5_KPDK_HASH_LEN	16
+#define SHA1_KPDK_HASH_LEN	20
+/* Maximum hash algorithm result length */
+#define HASH_MAX_LEN		SHA2_512_HASH_LEN /* Keep this updated */
+
+/* HMAC values */
+#define NULL_HMAC_BLOCK_LEN			1
+#define MD5_HMAC_BLOCK_LEN			64
+#define SHA1_HMAC_BLOCK_LEN			64
+#define RIPEMD160_HMAC_BLOCK_LEN	64
+#define SHA2_256_HMAC_BLOCK_LEN		64
+#define SHA2_384_HMAC_BLOCK_LEN		128
+#define SHA2_512_HMAC_BLOCK_LEN		128
+/* Maximum HMAC block length */
+#define HMAC_MAX_BLOCK_LEN		SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
+#define HMAC_IPAD_VAL			0x36
+#define HMAC_OPAD_VAL			0x5C
+
+/* Encryption algorithm block sizes */
+#define NULL_BLOCK_LEN			1
+#define DES_BLOCK_LEN			8
+#define DES3_BLOCK_LEN			8
+#define BLOWFISH_BLOCK_LEN		8
+#define SKIPJACK_BLOCK_LEN		8
+#define CAST128_BLOCK_LEN		8
+#define RIJNDAEL128_BLOCK_LEN	16
+#define AES_BLOCK_LEN			RIJNDAEL128_BLOCK_LEN
+#define CAMELLIA_BLOCK_LEN		16
+#define ARC4_BLOCK_LEN			1
+#define EALG_MAX_BLOCK_LEN		AES_BLOCK_LEN /* Keep this updated */
+
+/* Encryption algorithm min and max key sizes */
+#define NULL_MIN_KEY_LEN		0
+#define NULL_MAX_KEY_LEN		0
+#define DES_MIN_KEY_LEN			8
+#define DES_MAX_KEY_LEN			8
+#define DES3_MIN_KEY_LEN		24
+#define DES3_MAX_KEY_LEN		24
+#define BLOWFISH_MIN_KEY_LEN	4
+#define BLOWFISH_MAX_KEY_LEN	56
+#define SKIPJACK_MIN_KEY_LEN	10
+#define SKIPJACK_MAX_KEY_LEN	10
+#define CAST128_MIN_KEY_LEN		5
+#define CAST128_MAX_KEY_LEN		16
+#define RIJNDAEL128_MIN_KEY_LEN	16
+#define RIJNDAEL128_MAX_KEY_LEN	32
+#define AES_MIN_KEY_LEN			RIJNDAEL128_MIN_KEY_LEN
+#define AES_MAX_KEY_LEN			RIJNDAEL128_MAX_KEY_LEN
+#define CAMELLIA_MIN_KEY_LEN	16
+#define CAMELLIA_MAX_KEY_LEN	32
+#define ARC4_MIN_KEY_LEN		1
+#define ARC4_MAX_KEY_LEN		256
+
+/* Max size of data that can be processed */
+#define CRYPTO_MAX_DATA_LEN		64*1024 - 1
+
+#define CRYPTO_ALGORITHM_MIN	1
+#define CRYPTO_DES_CBC			1
+#define CRYPTO_3DES_CBC			2
+#define CRYPTO_BLF_CBC			3
+#define CRYPTO_CAST_CBC			4
+#define CRYPTO_SKIPJACK_CBC		5
+#define CRYPTO_MD5_HMAC			6
+#define CRYPTO_SHA1_HMAC		7
+#define CRYPTO_RIPEMD160_HMAC	8
+#define CRYPTO_MD5_KPDK			9
+#define CRYPTO_SHA1_KPDK		10
+#define CRYPTO_RIJNDAEL128_CBC	11 /* 128 bit blocksize */
+#define CRYPTO_AES_CBC			11 /* 128 bit blocksize -- the same as above */
+#define CRYPTO_ARC4				12
+#define CRYPTO_MD5				13
+#define CRYPTO_SHA1				14
+#define CRYPTO_NULL_HMAC		15
+#define CRYPTO_NULL_CBC			16
+#define CRYPTO_DEFLATE_COMP		17 /* Deflate compression algorithm */
+#define CRYPTO_SHA2_256_HMAC	18
+#define CRYPTO_SHA2_384_HMAC	19
+#define CRYPTO_SHA2_512_HMAC	20
+#define CRYPTO_CAMELLIA_CBC		21
+#define CRYPTO_SHA2_256			22
+#define CRYPTO_SHA2_384			23
+#define CRYPTO_SHA2_512			24
+#define CRYPTO_RIPEMD160		25
+#define	CRYPTO_LZS_COMP			26
+#define CRYPTO_ALGORITHM_MAX	26 /* Keep updated - see above */
+
+/* Algorithm flags */
+#define CRYPTO_ALG_FLAG_SUPPORTED	0x01 /* Algorithm is supported */
+#define CRYPTO_ALG_FLAG_RNG_ENABLE	0x02 /* Has HW RNG for DH/DSA */
+#define CRYPTO_ALG_FLAG_DSA_SHA		0x04 /* Can do SHA on msg */
+
+/*
+ * Crypto driver/device flags.  They can set in the crid
+ * parameter when creating a session or submitting a key
+ * op to affect the device/driver assigned.  If neither
+ * of these are specified then the crid is assumed to hold
+ * the driver id of an existing (and suitable) device that
+ * must be used to satisfy the request.
+ */
+#define CRYPTO_FLAG_HARDWARE	0x01000000	/* hardware accelerated */
+#define CRYPTO_FLAG_SOFTWARE	0x02000000	/* software implementation */
+
+/* NB: deprecated */
+struct session_op {
+	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
+	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
+
+	u_int32_t	keylen;		/* cipher key */
+	caddr_t		key;
+	int		mackeylen;	/* mac key */
+	caddr_t		mackey;
+
+  	u_int32_t	ses;		/* returns: session # */ 
+};
+
+struct session2_op {
+	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
+	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
+
+	u_int32_t	keylen;		/* cipher key */
+	caddr_t		key;
+	int		mackeylen;	/* mac key */
+	caddr_t		mackey;
+
+  	u_int32_t	ses;		/* returns: session # */ 
+	int		crid;		/* driver id + flags (rw) */
+	int		pad[4];		/* for future expansion */
+};
+
+struct crypt_op {
+	u_int32_t	ses;
+	u_int16_t	op;		/* i.e. COP_ENCRYPT */
+#define COP_NONE	0
+#define COP_ENCRYPT	1
+#define COP_DECRYPT	2
+	u_int16_t	flags;
+#define	COP_F_BATCH	0x0008		/* Batch op if possible */
+	u_int		len;
+	caddr_t		src, dst;	/* become iov[] inside kernel */
+	caddr_t		mac;		/* must be big enough for chosen MAC */
+	caddr_t		iv;
+};
+
+/*
+ * Parameters for looking up a crypto driver/device by
+ * device name or by id.  The latter are returned for
+ * created sessions (crid) and completed key operations.
+ */
+struct crypt_find_op {
+	int		crid;		/* driver id + flags */
+	char		name[32];	/* device/driver name */
+};
+
+/* bignum parameter, in packed bytes, ... */
+struct crparam {
+	caddr_t		crp_p;
+	u_int		crp_nbits;
+};
+
+#define CRK_MAXPARAM	8
+
+struct crypt_kop {
+	u_int		crk_op;		/* ie. CRK_MOD_EXP or other */
+	u_int		crk_status;	/* return status */
+	u_short		crk_iparams;	/* # of input parameters */
+	u_short		crk_oparams;	/* # of output parameters */
+	u_int		crk_crid;	/* NB: only used by CIOCKEY2 (rw) */
+	struct crparam	crk_param[CRK_MAXPARAM];
+};
+#define CRK_ALGORITM_MIN	0
+#define CRK_MOD_EXP		0
+#define CRK_MOD_EXP_CRT		1
+#define CRK_DSA_SIGN		2
+#define CRK_DSA_VERIFY		3
+#define CRK_DH_COMPUTE_KEY	4
+#define CRK_ALGORITHM_MAX	4 /* Keep updated - see below */
+
+#define CRF_MOD_EXP		(1 << CRK_MOD_EXP)
+#define CRF_MOD_EXP_CRT		(1 << CRK_MOD_EXP_CRT)
+#define CRF_DSA_SIGN		(1 << CRK_DSA_SIGN)
+#define CRF_DSA_VERIFY		(1 << CRK_DSA_VERIFY)
+#define CRF_DH_COMPUTE_KEY	(1 << CRK_DH_COMPUTE_KEY)
+
+/*
+ * done against open of /dev/crypto, to get a cloned descriptor.
+ * Please use F_SETFD against the cloned descriptor.
+ */
+#define CRIOGET		_IOWR('c', 100, u_int32_t)
+#define CRIOASYMFEAT	CIOCASYMFEAT
+#define CRIOFINDDEV	CIOCFINDDEV
+
+/* the following are done against the cloned descriptor */
+#define CIOCGSESSION	_IOWR('c', 101, struct session_op)
+#define CIOCFSESSION	_IOW('c', 102, u_int32_t)
+#define CIOCCRYPT	_IOWR('c', 103, struct crypt_op)
+#define CIOCKEY		_IOWR('c', 104, struct crypt_kop)
+#define CIOCASYMFEAT	_IOR('c', 105, u_int32_t)
+#define CIOCGSESSION2	_IOWR('c', 106, struct session2_op)
+#define CIOCKEY2	_IOWR('c', 107, struct crypt_kop)
+#define CIOCFINDDEV	_IOWR('c', 108, struct crypt_find_op)
+
+struct cryptotstat {
+	struct timespec	acc;		/* total accumulated time */
+	struct timespec	min;		/* min time */
+	struct timespec	max;		/* max time */
+	u_int32_t	count;		/* number of observations */
+};
+
+struct cryptostats {
+	u_int32_t	cs_ops;		/* symmetric crypto ops submitted */
+	u_int32_t	cs_errs;	/* symmetric crypto ops that failed */
+	u_int32_t	cs_kops;	/* asymetric/key ops submitted */
+	u_int32_t	cs_kerrs;	/* asymetric/key ops that failed */
+	u_int32_t	cs_intrs;	/* crypto swi thread activations */
+	u_int32_t	cs_rets;	/* crypto return thread activations */
+	u_int32_t	cs_blocks;	/* symmetric op driver block */
+	u_int32_t	cs_kblocks;	/* symmetric op driver block */
+	/*
+	 * When CRYPTO_TIMING is defined at compile time and the
+	 * sysctl debug.crypto is set to 1, the crypto system will
+	 * accumulate statistics about how long it takes to process
+	 * crypto requests at various points during processing.
+	 */
+	struct cryptotstat cs_invoke;	/* crypto_dipsatch -> crypto_invoke */
+	struct cryptotstat cs_done;	/* crypto_invoke -> crypto_done */
+	struct cryptotstat cs_cb;	/* crypto_done -> callback */
+	struct cryptotstat cs_finis;	/* callback -> callback return */
+
+	u_int32_t	cs_drops;		/* crypto ops dropped due to congestion */
+};
+
+#ifdef __KERNEL__
+
+/* Standard initialization structure beginning */
+struct cryptoini {
+	int		cri_alg;	/* Algorithm to use */
+	int		cri_klen;	/* Key length, in bits */
+	int		cri_mlen;	/* Number of bytes we want from the
+					   entire hash. 0 means all. */
+	caddr_t		cri_key;	/* key to use */
+	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
+	struct cryptoini *cri_next;
+};
+
+/* Describe boundaries of a single crypto operation */
+struct cryptodesc {
+	int		crd_skip;	/* How many bytes to ignore from start */
+	int		crd_len;	/* How many bytes to process */
+	int		crd_inject;	/* Where to inject results, if applicable */
+	int		crd_flags;
+
+#define CRD_F_ENCRYPT		0x01	/* Set when doing encryption */
+#define CRD_F_IV_PRESENT	0x02	/* When encrypting, IV is already in
+					   place, so don't copy. */
+#define CRD_F_IV_EXPLICIT	0x04	/* IV explicitly provided */
+#define CRD_F_DSA_SHA_NEEDED	0x08	/* Compute SHA-1 of buffer for DSA */
+#define CRD_F_KEY_EXPLICIT	0x10	/* Key explicitly provided */
+#define CRD_F_COMP		0x0f    /* Set when doing compression */
+
+	struct cryptoini	CRD_INI; /* Initialization/context data */
+#define crd_iv		CRD_INI.cri_iv
+#define crd_key		CRD_INI.cri_key
+#define crd_alg		CRD_INI.cri_alg
+#define crd_klen	CRD_INI.cri_klen
+#define crd_mlen	CRD_INI.cri_mlen
+
+	struct cryptodesc *crd_next;
+};
+
+/* Structure describing complete operation */
+struct cryptop {
+	struct list_head crp_next;
+	wait_queue_head_t crp_waitq;
+
+	u_int64_t	crp_sid;	/* Session ID */
+	int		crp_ilen;	/* Input data total length */
+	int		crp_olen;	/* Result total length */
+
+	int		crp_etype;	/*
+					 * Error type (zero means no error).
+					 * All error codes except EAGAIN
+					 * indicate possible data corruption (as in,
+					 * the data have been touched). On all
+					 * errors, the crp_sid may have changed
+					 * (reset to a new one), so the caller
+					 * should always check and use the new
+					 * value on future requests.
+					 */
+	int		crp_flags;
+
+#define CRYPTO_F_SKBUF		0x0001	/* Input/output are skbuf chains */
+#define CRYPTO_F_IOV		0x0002	/* Input/output are uio */
+#define CRYPTO_F_REL		0x0004	/* Must return data in same place */
+#define CRYPTO_F_BATCH		0x0008	/* Batch op if possible */
+#define CRYPTO_F_CBIMM		0x0010	/* Do callback immediately */
+#define CRYPTO_F_DONE		0x0020	/* Operation completed */
+#define CRYPTO_F_CBIFSYNC	0x0040	/* Do CBIMM if op is synchronous */
+
+	caddr_t		crp_buf;	/* Data to be processed */
+	caddr_t		crp_opaque;	/* Opaque pointer, passed along */
+	struct cryptodesc *crp_desc;	/* Linked list of processing descriptors */
+
+	int (*crp_callback)(struct cryptop *); /* Callback function */
+};
+
+#define CRYPTO_BUF_CONTIG	0x0
+#define CRYPTO_BUF_IOV		0x1
+#define CRYPTO_BUF_SKBUF		0x2
+
+#define CRYPTO_OP_DECRYPT	0x0
+#define CRYPTO_OP_ENCRYPT	0x1
+
+/*
+ * Hints passed to process methods.
+ */
+#define CRYPTO_HINT_MORE	0x1	/* more ops coming shortly */
+
+struct cryptkop {
+	struct list_head krp_next;
+	wait_queue_head_t krp_waitq;
+
+	int		krp_flags;
+#define CRYPTO_KF_DONE		0x0001	/* Operation completed */
+#define CRYPTO_KF_CBIMM		0x0002	/* Do callback immediately */
+
+	u_int		krp_op;		/* ie. CRK_MOD_EXP or other */
+	u_int		krp_status;	/* return status */
+	u_short		krp_iparams;	/* # of input parameters */
+	u_short		krp_oparams;	/* # of output parameters */
+	u_int		krp_crid;	/* desired device, etc. */
+	u_int32_t	krp_hid;
+	struct crparam	krp_param[CRK_MAXPARAM];	/* kvm */
+	int		(*krp_callback)(struct cryptkop *);
+};
+
+#include <ocf-compat.h>
+
+/*
+ * Session ids are 64 bits.  The lower 32 bits contain a "local id" which
+ * is a driver-private session identifier.  The upper 32 bits contain a
+ * "hardware id" used by the core crypto code to identify the driver and
+ * a copy of the driver's capabilities that can be used by client code to
+ * optimize operation.
+ */
+#define CRYPTO_SESID2HID(_sid)	(((_sid) >> 32) & 0x00ffffff)
+#define CRYPTO_SESID2CAPS(_sid)	(((_sid) >> 32) & 0xff000000)
+#define CRYPTO_SESID2LID(_sid)	(((u_int32_t) (_sid)) & 0xffffffff)
+
+extern	int crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard);
+extern	int crypto_freesession(u_int64_t sid);
+#define CRYPTOCAP_F_HARDWARE	CRYPTO_FLAG_HARDWARE
+#define CRYPTOCAP_F_SOFTWARE	CRYPTO_FLAG_SOFTWARE
+#define CRYPTOCAP_F_SYNC	0x04000000	/* operates synchronously */
+extern	int32_t crypto_get_driverid(device_t dev, int flags);
+extern	int crypto_find_driver(const char *);
+extern	device_t crypto_find_device_byhid(int hid);
+extern	int crypto_getcaps(int hid);
+extern	int crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
+	    u_int32_t flags);
+extern	int crypto_kregister(u_int32_t, int, u_int32_t);
+extern	int crypto_unregister(u_int32_t driverid, int alg);
+extern	int crypto_unregister_all(u_int32_t driverid);
+extern	int crypto_dispatch(struct cryptop *crp);
+extern	int crypto_kdispatch(struct cryptkop *);
+#define CRYPTO_SYMQ	0x1
+#define CRYPTO_ASYMQ	0x2
+extern	int crypto_unblock(u_int32_t, int);
+extern	void crypto_done(struct cryptop *crp);
+extern	void crypto_kdone(struct cryptkop *);
+extern	int crypto_getfeat(int *);
+
+extern	void crypto_freereq(struct cryptop *crp);
+extern	struct cryptop *crypto_getreq(int num);
+
+extern  int crypto_usercrypto;      /* userland may do crypto requests */
+extern  int crypto_userasymcrypto;  /* userland may do asym crypto reqs */
+extern  int crypto_devallowsoft;    /* only use hardware crypto */
+
+/*
+ * random number support,  crypto_unregister_all will unregister
+ */
+extern int crypto_rregister(u_int32_t driverid,
+		int (*read_random)(void *arg, u_int32_t *buf, int len), void *arg);
+extern int crypto_runregister_all(u_int32_t driverid);
+
+/*
+ * Crypto-related utility routines used mainly by drivers.
+ *
+ * XXX these don't really belong here; but for now they're
+ *     kept apart from the rest of the system.
+ */
+struct uio;
+extern	void cuio_copydata(struct uio* uio, int off, int len, caddr_t cp);
+extern	void cuio_copyback(struct uio* uio, int off, int len, caddr_t cp);
+extern	struct iovec *cuio_getptr(struct uio *uio, int loc, int *off);
+
+extern	void crypto_copyback(int flags, caddr_t buf, int off, int size,
+	    caddr_t in);
+extern	void crypto_copydata(int flags, caddr_t buf, int off, int size,
+	    caddr_t out);
+extern	int crypto_apply(int flags, caddr_t buf, int off, int len,
+	    int (*f)(void *, void *, u_int), void *arg);
+
+#endif /* __KERNEL__ */
+#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/trunk/package/libs/openssl/Config.in b/trunk/package/libs/openssl/Config.in
new file mode 100644
index 00000000..b0a29c5e
--- /dev/null
+++ b/trunk/package/libs/openssl/Config.in
@@ -0,0 +1,28 @@
+menu "Configuration"
+	depends on PACKAGE_libopenssl
+
+config OPENSSL_WITH_EC
+	bool
+	default y
+	prompt "Enable elliptic curve support"
+
+config OPENSSL_WITH_EC2M
+        bool
+        depends on OPENSSL_WITH_EC
+        prompt "Enable ec2m support"
+
+config OPENSSL_WITH_SSL3
+	bool
+	default n
+	prompt "Enable sslv3 support"
+
+config OPENSSL_ENGINE_CRYPTO
+	bool
+	prompt "Crypto acceleration support"
+
+config OPENSSL_ENGINE_DIGEST
+	bool
+	depends on OPENSSL_ENGINE_CRYPTO
+	prompt "Digests acceleration support"
+
+endmenu
diff --git a/trunk/package/libs/openssl/Makefile b/trunk/package/libs/openssl/Makefile
new file mode 100644
index 00000000..5f09f507
--- /dev/null
+++ b/trunk/package/libs/openssl/Makefile
@@ -0,0 +1,214 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=openssl
+PKG_VERSION:=1.0.1j
+PKG_RELEASE:=3
+PKG_USE_MIPS16:=0
+
+PKG_BUILD_PARALLEL:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.openssl.org/source/ \
+	ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \
+	ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
+PKG_MD5SUM:=f7175c9cd3c39bb1907ac8bba9df8ed3
+
+PKG_LICENSE:=OpenSSL
+PKG_LICENSE_FILES:=LICENSE
+PKG_BUILD_DEPENDS:=ocf-crypto-headers
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_OPENSSL_ENGINE_CRYPTO \
+	CONFIG_OPENSSL_ENGINE_DIGEST \
+	CONFIG_OPENSSL_WITH_EC \
+	CONFIG_OPENSSL_WITH_EC2M \
+	CONFIG_OPENSSL_WITH_SSL3
+
+include $(INCLUDE_DIR)/package.mk
+
+ifneq ($(CONFIG_CCACHE),)
+HOSTCC=$(HOSTCC_NOCACHE)
+HOSTCXX=$(HOSTCXX_NOCACHE)
+endif
+
+define Package/openssl/Default
+  TITLE:=Open source SSL toolkit
+  URL:=http://www.openssl.org/
+endef
+
+define Package/libopenssl/config
+source "$(SOURCE)/Config.in"
+endef
+
+define Package/openssl/Default/description
+The OpenSSL Project is a collaborative effort to develop a robust,
+commercial-grade, full-featured, and Open Source toolkit implementing the Secure
+Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well
+as a full-strength general purpose cryptography library.
+endef
+
+define Package/libopenssl
+$(call Package/openssl/Default)
+  SECTION:=libs
+  SUBMENU:=SSL
+  CATEGORY:=Libraries
+  DEPENDS:=+zlib
+  TITLE+= (libraries)
+  ABI_VERSION:=$(PKG_VERSION)
+  MENU:=1
+endef
+
+define Package/libopenssl/description
+$(call Package/openssl/Default/description)
+This package contains the OpenSSL shared libraries, needed by other programs.
+endef
+
+define Package/openssl-util
+  $(call Package/openssl/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libopenssl
+  TITLE+= (utility)
+endef
+
+define Package/openssl-util/conffiles
+/etc/ssl/openssl.cnf
+endef
+
+define Package/openssl-util/description
+$(call Package/openssl/Default/description)
+This package contains the OpenSSL command-line utility.
+endef
+
+
+OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia no-krb5
+OPENSSL_OPTIONS:= shared no-err no-hw zlib-dynamic no-sse2 no-ssl2
+
+ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
+  OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
+  ifdef CONFIG_OPENSSL_ENGINE_DIGEST
+    OPENSSL_OPTIONS += -DUSE_CRYPTODEV_DIGESTS
+  endif
+else
+  OPENSSL_OPTIONS += no-engines
+endif
+
+ifndef CONFIG_OPENSSL_WITH_EC
+  OPENSSL_OPTIONS += no-ec
+endif
+
+ifndef CONFIG_OPENSSL_WITH_EC2M
+  OPENSSL_OPTIONS += no-ec2m
+endif
+
+ifndef CONFIG_OPENSSL_WITH_SSL3
+  OPENSSL_OPTIONS += no-ssl3
+endif
+
+ifeq ($(CONFIG_x86_64),y)
+  OPENSSL_TARGET:=linux-x86_64-librecmc
+  OPENSSL_MAKEFLAGS += LIBDIR=lib
+else
+  OPENSSL_OPTIONS+=no-sse2
+  ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
+    OPENSSL_TARGET:=linux-mips-librecmc
+  else
+    OPENSSL_TARGET:=linux-generic-librecmc
+    OPENSSL_OPTIONS+=no-perlasm
+  endif
+endif
+
+STAMP_CONFIGURED := $(STAMP_CONFIGURED)_$(subst $(space),_,$(OPENSSL_OPTIONS))
+
+define Build/Configure
+	[ -f $(STAMP_CONFIGURED) ] || { \
+		rm -f $(PKG_BUILD_DIR)/*.so.* $(PKG_BUILD_DIR)/*.a; \
+		find $(PKG_BUILD_DIR) -name \*.o | xargs rm -f; \
+	}
+	(cd $(PKG_BUILD_DIR); \
+		./Configure $(OPENSSL_TARGET) \
+			--prefix=/usr \
+			--openssldir=/etc/ssl \
+			$(TARGET_CPPFLAGS) \
+			$(TARGET_LDFLAGS) -ldl \
+			-DOPENSSL_SMALL_FOOTPRINT \
+			$(OPENSSL_NO_CIPHERS) \
+			$(OPENSSL_OPTIONS) \
+	)
+	# XXX: OpenSSL "make depend" will look for installed headers before its own,
+	# so remove installed stuff first
+	-$(SUBMAKE) -j1 clean-staging
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		MAKEDEPPROG="$(TARGET_CROSS)gcc" \
+		LIBRECMC_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+		$(OPENSSL_MAKEFLAGS) \
+		depend
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		ASFLAGS="$(TARGET_ASFLAGS) -c" \
+		AR="$(TARGET_CROSS)ar r" \
+		RANLIB="$(TARGET_CROSS)ranlib" \
+		LIBRECMC_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+		$(OPENSSL_MAKEFLAGS) \
+		all
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		ASFLAGS="$(TARGET_ASFLAGS) -c" \
+		AR="$(TARGET_CROSS)ar r" \
+		RANLIB="$(TARGET_CROSS)ranlib" \
+		LIBRECMC_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+		$(OPENSSL_MAKEFLAGS) \
+		build-shared
+	# Work around openssl build bug to link libssl.so with libcrypto.so.
+	-rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		LIBRECMC_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+		$(OPENSSL_MAKEFLAGS) \
+		do_linux-shared
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+		$(OPENSSL_MAKEFLAGS) \
+		install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/
+	[ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc || true
+endef
+
+define Package/libopenssl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcrypto.so.* $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.* $(1)/usr/lib/
+endef
+
+define Package/openssl-util/install
+	$(INSTALL_DIR) $(1)/etc/ssl
+	$(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/
+	$(INSTALL_DIR) $(1)/etc/ssl/certs
+	$(INSTALL_DIR) $(1)/etc/ssl/private
+	chmod 0700 $(1)/etc/ssl/private
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libopenssl))
+$(eval $(call BuildPackage,openssl-util))
diff --git a/trunk/package/libs/openssl/patches/110-optimize-for-size.patch b/trunk/package/libs/openssl/patches/110-optimize-for-size.patch
new file mode 100644
index 00000000..bed61509
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/110-optimize-for-size.patch
@@ -0,0 +1,14 @@
+--- a/Configure
++++ b/Configure
+@@ -403,6 +403,11 @@ my %table=(
+ "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+ "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+ 
++# libreCMC targets
++"linux-x86_64-librecmc",	"gcc:-m64 -DL_ENDIAN -DTERMIOS \$(LIBRECMC_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-mips-librecmc","gcc:-DTERMIOS \$(LIBRECMC_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-generic-librecmc","gcc:-DTERMIOS \$(LIBRECMC_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+ # Android: linux-* but without -DTERMIO and pointers to headers and libs.
+ "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/trunk/package/libs/openssl/patches/130-perl-path.patch b/trunk/package/libs/openssl/patches/130-perl-path.patch
new file mode 100644
index 00000000..dd4fa54d
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/130-perl-path.patch
@@ -0,0 +1,64 @@
+--- a/Configure
++++ b/Configure
+@@ -1,4 +1,4 @@
+-:
++#!/usr/bin/perl
+ eval 'exec perl -S $0 ${1+"$@"}'
+     if $running_under_some_shell;
+ ##
+--- a/tools/c_rehash.in
++++ b/tools/c_rehash.in
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ 
+ # Perl c_rehash script, scan all files in a directory
+--- a/util/clean-depend.pl
++++ b/util/clean-depend.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ # Clean the dependency list in a makefile of standard includes...
+ # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
+ 
+--- a/util/mkdef.pl
++++ b/util/mkdef.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ #
+ # generate a .def file
+ #
+--- a/util/mkerr.pl
++++ b/util/mkerr.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ 
+ my $config = "crypto/err/openssl.ec";
+ my $hprefix = "openssl/";
+--- a/util/mkstack.pl
++++ b/util/mkstack.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ 
+ # This is a utility that searches out "DECLARE_STACK_OF()"
+ # declarations in .h and .c files, and updates/creates/replaces
+--- a/util/pod2man.pl
++++ b/util/pod2man.pl
+@@ -1,4 +1,4 @@
+-: #!/usr/bin/perl-5.005
++#!/usr/bin/perl
+     eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+ 	if $running_under_some_shell;
+ 
+--- a/util/selftest.pl
++++ b/util/selftest.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl
+ #
+ # Run the test suite and generate a report
+ #
diff --git a/trunk/package/libs/openssl/patches/140-makefile-dirs.patch b/trunk/package/libs/openssl/patches/140-makefile-dirs.patch
new file mode 100644
index 00000000..b51ca28b
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/140-makefile-dirs.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -135,7 +135,7 @@ FIPSCANLIB=
+ 
+ BASEADDR=
+ 
+-DIRS=   crypto ssl engines apps test tools
++DIRS=   crypto ssl apps
+ ENGDIRS= ccgost
+ SHLIBDIRS= crypto ssl
+ 
diff --git a/trunk/package/libs/openssl/patches/150-no_engines.patch b/trunk/package/libs/openssl/patches/150-no_engines.patch
new file mode 100644
index 00000000..69ab1398
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/150-no_engines.patch
@@ -0,0 +1,81 @@
+--- a/Configure
++++ b/Configure
+@@ -2012,6 +2012,11 @@ EOF
+ 	close(OUT);
+   }
+   
++# ugly hack to disable engines
++if($target eq "mingwx") {
++	system("sed -e s/^LIB/XLIB/g -i engines/Makefile");
++}
++
+ print <<EOF;
+ 
+ Configured for $target.
+--- a/util/libeay.num
++++ b/util/libeay.num
+@@ -2071,7 +2071,6 @@ PKCS7_ATTR_SIGN_it                      
+ UI_add_error_string                     2633	EXIST::FUNCTION:
+ KRB5_CHECKSUM_free                      2634	EXIST::FUNCTION:
+ OCSP_REQUEST_get_ext                    2635	EXIST::FUNCTION:
+-ENGINE_load_ubsec                       2636	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ ENGINE_register_all_digests             2637	EXIST::FUNCTION:ENGINE
+ PKEY_USAGE_PERIOD_it                    2638	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ PKEY_USAGE_PERIOD_it                    2638	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+@@ -2545,7 +2544,6 @@ OCSP_RESPONSE_new                       
+ AES_set_encrypt_key                     3024	EXIST::FUNCTION:AES
+ OCSP_resp_count                         3025	EXIST::FUNCTION:
+ KRB5_CHECKSUM_new                       3026	EXIST::FUNCTION:
+-ENGINE_load_cswift                      3027	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ OCSP_onereq_get0_id                     3028	EXIST::FUNCTION:
+ ENGINE_set_default_ciphers              3029	EXIST::FUNCTION:ENGINE
+ NOTICEREF_it                            3030	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+@@ -2576,7 +2574,6 @@ ASN1_primitive_free                     
+ i2d_EXTENDED_KEY_USAGE                  3052	EXIST::FUNCTION:
+ i2d_OCSP_SIGNATURE                      3053	EXIST::FUNCTION:
+ asn1_enc_save                           3054	EXIST::FUNCTION:
+-ENGINE_load_nuron                       3055	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ _ossl_old_des_pcbc_encrypt              3056	EXIST::FUNCTION:DES
+ PKCS12_MAC_DATA_it                      3057	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ PKCS12_MAC_DATA_it                      3057	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+@@ -2600,7 +2597,6 @@ asn1_get_choice_selector                
+ i2d_KRB5_CHECKSUM                       3072	EXIST::FUNCTION:
+ ENGINE_set_table_flags                  3073	EXIST::FUNCTION:ENGINE
+ AES_options                             3074	EXIST::FUNCTION:AES
+-ENGINE_load_chil                        3075	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ OCSP_id_cmp                             3076	EXIST::FUNCTION:
+ OCSP_BASICRESP_new                      3077	EXIST::FUNCTION:
+ OCSP_REQUEST_get_ext_by_NID             3078	EXIST::FUNCTION:
+@@ -2667,7 +2663,6 @@ OCSP_CRLID_it                           
+ OCSP_CRLID_it                           3127	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ i2d_KRB5_AUTHENTBODY                    3128	EXIST::FUNCTION:
+ OCSP_REQUEST_get_ext_count              3129	EXIST::FUNCTION:
+-ENGINE_load_atalla                      3130	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ X509_NAME_it                            3131	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ X509_NAME_it                            3131	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ USERNOTICE_it                           3132	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+@@ -2762,8 +2757,6 @@ DES_read_2passwords                     
+ DES_read_password                       3207	EXIST::FUNCTION:DES
+ UI_UTIL_read_pw                         3208	EXIST::FUNCTION:
+ UI_UTIL_read_pw_string                  3209	EXIST::FUNCTION:
+-ENGINE_load_aep                         3210	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+-ENGINE_load_sureware                    3211	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ OPENSSL_add_all_algorithms_noconf       3212	EXIST:!VMS:FUNCTION:
+ OPENSSL_add_all_algo_noconf             3212	EXIST:VMS:FUNCTION:
+ OPENSSL_add_all_algorithms_conf         3213	EXIST:!VMS:FUNCTION:
+@@ -2772,7 +2765,6 @@ OPENSSL_load_builtin_modules            
+ AES_ofb128_encrypt                      3215	EXIST::FUNCTION:AES
+ AES_ctr128_encrypt                      3216	EXIST::FUNCTION:AES
+ AES_cfb128_encrypt                      3217	EXIST::FUNCTION:AES
+-ENGINE_load_4758cca                     3218	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ _ossl_096_des_random_seed               3219	EXIST::FUNCTION:DES
+ EVP_aes_256_ofb                         3220	EXIST::FUNCTION:AES
+ EVP_aes_192_ofb                         3221	EXIST::FUNCTION:AES
+@@ -3107,7 +3099,6 @@ EC_GFp_nist_method                      
+ STORE_meth_set_modify_fn                3530	NOEXIST::FUNCTION:
+ STORE_method_set_modify_function        3530	NOEXIST::FUNCTION:
+ STORE_parse_attrs_next                  3531	NOEXIST::FUNCTION:
+-ENGINE_load_padlock                     3532	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ EC_GROUP_set_curve_name                 3533	EXIST::FUNCTION:EC
+ X509_CERT_PAIR_it                       3534	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ X509_CERT_PAIR_it                       3534	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
diff --git a/trunk/package/libs/openssl/patches/160-disable_doc_tests.patch b/trunk/package/libs/openssl/patches/160-disable_doc_tests.patch
new file mode 100644
index 00000000..54f58fb5
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/160-disable_doc_tests.patch
@@ -0,0 +1,58 @@
+--- a/Makefile
++++ b/Makefile
+@@ -137,7 +137,7 @@ FIPSCANLIB=
+ 
+ BASEADDR=0xFB00000
+ 
+-DIRS=   crypto ssl engines apps test tools
++DIRS=   crypto ssl engines apps tools
+ ENGDIRS= ccgost
+ SHLIBDIRS= crypto ssl
+ 
+@@ -155,7 +155,7 @@ SDIRS=  \
+ 
+ # tests to perform.  "alltests" is a special word indicating that all tests
+ # should be performed.
+-TESTS = alltests
++TESTS =
+ 
+ MAKEFILE= Makefile
+ 
+@@ -169,7 +169,7 @@ SHELL=/bin/sh
+ 
+ TOP=    .
+ ONEDIRS=out tmp
+-EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
++EDIRS=  times bugs util include certs ms shlib mt demos perl sf dep VMS
+ WDIRS=  windows
+ LIBS=   libcrypto.a libssl.a
+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+@@ -270,7 +270,7 @@ reflect:
+ 	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
+ 
+ sub_all: build_all
+-build_all: build_libs build_apps build_tests build_tools
++build_all: build_libs build_apps build_tools
+ 
+ build_libs: build_crypto build_ssl build_engines
+ 
+@@ -540,7 +540,7 @@ dist:
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: all install_sw
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -538,7 +538,7 @@ dist:
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: all install_sw
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
diff --git a/trunk/package/libs/openssl/patches/170-bash_path.patch b/trunk/package/libs/openssl/patches/170-bash_path.patch
new file mode 100644
index 00000000..c29b59af
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/170-bash_path.patch
@@ -0,0 +1,8 @@
+--- a/util/domd
++++ b/util/domd
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # Do a makedepend, only leave out the standard headers
+ # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
+ 
diff --git a/trunk/package/libs/openssl/patches/180-fix_link_segfault.patch b/trunk/package/libs/openssl/patches/180-fix_link_segfault.patch
new file mode 100644
index 00000000..3e36beb4
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/180-fix_link_segfault.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.shared
++++ b/Makefile.shared
+@@ -95,7 +95,6 @@ LINK_APP=	\
+     LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+-    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
+ 
+ LINK_SO=	\
+@@ -105,7 +104,6 @@ LINK_SO=	\
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+-    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+ 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+ 	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
diff --git a/trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch b/trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch
new file mode 100644
index 00000000..46006884
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch
@@ -0,0 +1,23 @@
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -184,7 +184,7 @@ WTARFILE=       $(NAME)-win.tar
+ EXHEADER=       e_os2.h
+ HEADER=         e_os.h
+ 
+-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
++all: build_all openssl.pc libssl.pc libcrypto.pc
+ 
+ # as we stick to -e, CLEARENV ensures that local variables in lower
+ # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
+@@ -397,11 +397,6 @@ openssl.pc: Makefile
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
+ 
+-Makefile: Makefile.org Configure config
+-	@echo "Makefile is older than Makefile.org, Configure or config."
+-	@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
+-	@false
+-
+ libclean:
+ 	rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
+ 
diff --git a/trunk/package/libs/openssl/patches/200-parallel_build.patch b/trunk/package/libs/openssl/patches/200-parallel_build.patch
new file mode 100644
index 00000000..646c51ba
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/200-parallel_build.patch
@@ -0,0 +1,334 @@
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -273,17 +273,17 @@ build_all: build_libs build_apps build_t
+ build_libs: build_crypto build_ssl build_engines
+ 
+ build_crypto:
+-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
+-build_ssl:
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests:
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools:
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
++	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
++build_ssl: build_crypto
++	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
++build_engines: build_crypto
++	+@dir=engines; target=all; $(BUILD_ONE_CMD)
++build_apps: build_libs
++	+@dir=apps; target=all; $(BUILD_ONE_CMD)
++build_tests: build_libs
++	+@dir=test; target=all; $(BUILD_ONE_CMD)
++build_tools: build_libs
++	+@dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -455,7 +455,7 @@ report:
+ 	@$(PERL) util/selftest.pl
+ 
+ depend:
+-	@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
++	+@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
+ 
+ lint:
+ 	@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
+@@ -533,9 +533,9 @@ dist:
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_sw
++install: install_sw
+ 
+-install_sw:
++install_dirs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -544,12 +544,19 @@ install_sw:
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
++	@$(PERL) $(TOP)/util/mkdir-p.pl \
++		$(INSTALL_PREFIX)$(MANDIR)/man1 \
++		$(INSTALL_PREFIX)$(MANDIR)/man3 \
++		$(INSTALL_PREFIX)$(MANDIR)/man5 \
++		$(INSTALL_PREFIX)$(MANDIR)/man7
++
++install_sw: install_dirs
+ 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+ 	do \
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
++	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+ 	do \
+ 		if [ -f "$$i" ]; then \
+@@ -629,12 +636,7 @@ install_html_docs:
+ 		done; \
+ 	done
+ 
+-install_docs:
+-	@$(PERL) $(TOP)/util/mkdir-p.pl \
+-		$(INSTALL_PREFIX)$(MANDIR)/man1 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man3 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man5 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man7
++install_docs: install_dirs
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+--- a/Makefile.shared
++++ b/Makefile.shared
+@@ -120,6 +120,7 @@ SYMLINK_SO=	\
+ 			done; \
+ 		fi; \
+ 		if [ -n "$$SHLIB_SOVER" ]; then \
++			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+ 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+ 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+ 		fi; \
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -90,11 +90,11 @@ testapps:
+ 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+ 
+ subdirs:
+-	@target=all; $(RECURSIVE_MAKE)
++	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+-	@target=files; $(RECURSIVE_MAKE)
++	+@target=files; $(RECURSIVE_MAKE)
+ 
+ links:
+ 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -105,7 +105,7 @@ links:
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib:	$(LIB)
+ 	@touch lib
+-$(LIB):	$(LIBOBJ)
++$(LIB):	$(LIBOBJ) | subdirs
+ 	$(AR) $(LIB) $(LIBOBJ)
+ 	[ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+ 	$(RANLIB) $(LIB) || echo Never mind.
+@@ -116,7 +116,7 @@ shared: buildinf.h lib subdirs
+ 	fi
+ 
+ libs:
+-	@target=lib; $(RECURSIVE_MAKE)
++	+@target=lib; $(RECURSIVE_MAKE)
+ 
+ install:
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -125,7 +125,7 @@ install:
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@target=install; $(RECURSIVE_MAKE)
++	+@target=install; $(RECURSIVE_MAKE)
+ 
+ lint:
+ 	@target=lint; $(RECURSIVE_MAKE)
+--- a/engines/Makefile
++++ b/engines/Makefile
+@@ -72,7 +72,7 @@ top:
+ 
+ all:	lib subdirs
+ 
+-lib:	$(LIBOBJ)
++lib:	$(LIBOBJ) | subdirs
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+ 		set -e; \
+ 		for l in $(LIBNAMES); do \
+@@ -89,7 +89,7 @@ lib:	$(LIBOBJ)
+ 
+ subdirs:
+ 	echo $(EDIRS)
+-	@target=all; $(RECURSIVE_MAKE)
++	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+@@ -128,7 +128,7 @@ install:
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ 		done; \
+ 	fi
+-	@target=install; $(RECURSIVE_MAKE)
++	+@target=install; $(RECURSIVE_MAKE)
+ 
+ tags:
+ 	ctags $(SRC)
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -129,7 +129,7 @@ install:
+ tags:
+ 	ctags $(SRC)
+ 
+-tests:	exe apps $(TESTS)
++tests:	exe $(TESTS)
+ 
+ apps:
+ 	@(cd ..; $(MAKE) DIRS=apps all)
+@@ -384,109 +384,109 @@ BUILD_CMD_STATIC=shlib_target=; \
+ 		link_app.$${shlib_target}
+ 
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+-	@target=$(RSATEST); $(BUILD_CMD)
++	+@target=$(RSATEST); $(BUILD_CMD)
+ 
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
+-	@target=$(BNTEST); $(BUILD_CMD)
++	+@target=$(BNTEST); $(BUILD_CMD)
+ 
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
+-	@target=$(ECTEST); $(BUILD_CMD)
++	+@target=$(ECTEST); $(BUILD_CMD)
+ 
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
+-	@target=$(EXPTEST); $(BUILD_CMD)
++	+@target=$(EXPTEST); $(BUILD_CMD)
+ 
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
+-	@target=$(IDEATEST); $(BUILD_CMD)
++	+@target=$(IDEATEST); $(BUILD_CMD)
+ 
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
+-	@target=$(MD2TEST); $(BUILD_CMD)
++	+@target=$(MD2TEST); $(BUILD_CMD)
+ 
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
+-	@target=$(SHATEST); $(BUILD_CMD)
++	+@target=$(SHATEST); $(BUILD_CMD)
+ 
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA1TEST); $(BUILD_CMD)
++	+@target=$(SHA1TEST); $(BUILD_CMD)
+ 
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA256TEST); $(BUILD_CMD)
++	+@target=$(SHA256TEST); $(BUILD_CMD)
+ 
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA512TEST); $(BUILD_CMD)
++	+@target=$(SHA512TEST); $(BUILD_CMD)
+ 
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
+-	@target=$(RMDTEST); $(BUILD_CMD)
++	+@target=$(RMDTEST); $(BUILD_CMD)
+ 
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
+-	@target=$(MDC2TEST); $(BUILD_CMD)
++	+@target=$(MDC2TEST); $(BUILD_CMD)
+ 
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
+-	@target=$(MD4TEST); $(BUILD_CMD)
++	+@target=$(MD4TEST); $(BUILD_CMD)
+ 
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
+-	@target=$(MD5TEST); $(BUILD_CMD)
++	+@target=$(MD5TEST); $(BUILD_CMD)
+ 
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
+-	@target=$(HMACTEST); $(BUILD_CMD)
++	+@target=$(HMACTEST); $(BUILD_CMD)
+ 
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
+-	@target=$(WPTEST); $(BUILD_CMD)
++	+@target=$(WPTEST); $(BUILD_CMD)
+ 
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
+-	@target=$(RC2TEST); $(BUILD_CMD)
++	+@target=$(RC2TEST); $(BUILD_CMD)
+ 
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
+-	@target=$(BFTEST); $(BUILD_CMD)
++	+@target=$(BFTEST); $(BUILD_CMD)
+ 
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
+-	@target=$(CASTTEST); $(BUILD_CMD)
++	+@target=$(CASTTEST); $(BUILD_CMD)
+ 
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
+-	@target=$(RC4TEST); $(BUILD_CMD)
++	+@target=$(RC4TEST); $(BUILD_CMD)
+ 
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
+-	@target=$(RC5TEST); $(BUILD_CMD)
++	+@target=$(RC5TEST); $(BUILD_CMD)
+ 
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
+-	@target=$(DESTEST); $(BUILD_CMD)
++	+@target=$(DESTEST); $(BUILD_CMD)
+ 
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
+-	@target=$(RANDTEST); $(BUILD_CMD)
++	+@target=$(RANDTEST); $(BUILD_CMD)
+ 
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
+-	@target=$(DHTEST); $(BUILD_CMD)
++	+@target=$(DHTEST); $(BUILD_CMD)
+ 
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
+-	@target=$(DSATEST); $(BUILD_CMD)
++	+@target=$(DSATEST); $(BUILD_CMD)
+ 
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
+-	@target=$(METHTEST); $(BUILD_CMD)
++	+@target=$(METHTEST); $(BUILD_CMD)
+ 
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
++	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ 
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
+-	@target=$(ENGINETEST); $(BUILD_CMD)
++	+@target=$(ENGINETEST); $(BUILD_CMD)
+ 
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
+-	@target=$(EVPTEST); $(BUILD_CMD)
++	+@target=$(EVPTEST); $(BUILD_CMD)
+ 
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
+-	@target=$(ECDSATEST); $(BUILD_CMD)
++	+@target=$(ECDSATEST); $(BUILD_CMD)
+ 
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
+-	@target=$(ECDHTEST); $(BUILD_CMD)
++	+@target=$(ECDHTEST); $(BUILD_CMD)
+ 
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
+-	@target=$(IGETEST); $(BUILD_CMD)
++	+@target=$(IGETEST); $(BUILD_CMD)
+ 
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
+-	@target=$(JPAKETEST); $(BUILD_CMD)
++	+@target=$(JPAKETEST); $(BUILD_CMD)
+ 
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
+-	@target=$(ASN1TEST); $(BUILD_CMD)
++	+@target=$(ASN1TEST); $(BUILD_CMD)
+ 
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+-	@target=$(SRPTEST); $(BUILD_CMD)
++	+@target=$(SRPTEST); $(BUILD_CMD)
+ 
+ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
+ 	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+@@ -505,7 +505,7 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMET
+ #	fi
+ 
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
+-	@target=dummytest; $(BUILD_CMD)
++	+@target=dummytest; $(BUILD_CMD)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+ 
diff --git a/trunk/package/libs/openssl/patches/210-termios_fix.patch b/trunk/package/libs/openssl/patches/210-termios_fix.patch
new file mode 100644
index 00000000..f14960ca
--- /dev/null
+++ b/trunk/package/libs/openssl/patches/210-termios_fix.patch
@@ -0,0 +1,11 @@
+--- a/crypto/ui/ui_openssl.c
++++ b/crypto/ui/ui_openssl.c
+@@ -190,7 +190,7 @@
+ # undef  SGTTY
+ #endif
+ 
+-#if defined(linux) && !defined(TERMIO)
++#if defined(linux) && !defined(TERMIO) && !defined(TERMIOS)
+ # undef  TERMIOS
+ # define TERMIO
+ # undef  SGTTY
diff --git a/trunk/package/libs/polarssl/Makefile b/trunk/package/libs/polarssl/Makefile
new file mode 100644
index 00000000..18e0f44f
--- /dev/null
+++ b/trunk/package/libs/polarssl/Makefile
@@ -0,0 +1,69 @@
+# 
+# Copyright (C) 2011-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=polarssl
+PKG_VERSION:=1.3.9
+PKG_RELEASE:=1
+PKG_USE_MIPS16:=0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
+PKG_SOURCE_URL:=https://polarssl.org/code/releases
+PKG_MD5SUM:=48af7d1f0d5de512cbd6dacf5407884c
+
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0+
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/polarssl/Default
+  SUBMENU:=SSL
+  TITLE:=Embedded SSL
+  URL:=http://polarssl.org/
+endef
+
+define Package/polarssl/Default/description
+The aim of the PolarSSL project is to provide a quality, open-source
+cryptographic library written in C and targeted at embedded systems.
+endef
+
+define Package/libpolarssl
+$(call Package/polarssl/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (library)
+  ABI_VERSION:=$(PKG_VERSION)
+endef
+
+define Package/libpolarssl/description
+$(call Package/polarssl/Default/description)
+This package contains the PolarSSL library.
+endef
+
+PKG_INSTALL:=1
+
+CMAKE_OPTIONS += \
+	-DCMAKE_BUILD_TYPE:String="Release" \
+	-DUSE_SHARED_POLARSSL_LIBRARY:Bool=ON \
+	-DENABLE_TESTING:Bool=OFF \
+	-DENABLE_PROGRAMS:Bool=OFF \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/polarssl $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpolarssl.so* $(1)/usr/lib/
+endef
+
+define Package/libpolarssl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpolarssl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libpolarssl))
diff --git a/trunk/package/libs/polarssl/patches/100-disable_sslv3.patch b/trunk/package/libs/polarssl/patches/100-disable_sslv3.patch
new file mode 100644
index 00000000..06312f34
--- /dev/null
+++ b/trunk/package/libs/polarssl/patches/100-disable_sslv3.patch
@@ -0,0 +1,12 @@
+--- a/include/polarssl/config.h
++++ b/include/polarssl/config.h
+@@ -859,8 +859,8 @@
+  *           POLARSSL_SHA1_C
+  *
+  * Comment this macro to disable support for SSL 3.0
+- */
+ #define POLARSSL_SSL_PROTO_SSL3
++ */
+ 
+ /**
+  * \def POLARSSL_SSL_PROTO_TLS1
diff --git a/trunk/package/libs/polarssl/patches/200-reduce_config.patch b/trunk/package/libs/polarssl/patches/200-reduce_config.patch
new file mode 100644
index 00000000..dc95faad
--- /dev/null
+++ b/trunk/package/libs/polarssl/patches/200-reduce_config.patch
@@ -0,0 +1,212 @@
+--- a/include/polarssl/config.h
++++ b/include/polarssl/config.h
+@@ -395,8 +395,8 @@
+  *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
+  *      TLS_PSK_WITH_3DES_EDE_CBC_SHA
+  *      TLS_PSK_WITH_RC4_128_SHA
+- */
+ #define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
+@@ -419,8 +419,8 @@
+  *      TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+  *      TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
+  *      TLS_DHE_PSK_WITH_RC4_128_SHA
+- */
+ #define POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+@@ -439,8 +439,8 @@
+  *      TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+  *      TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
+  *      TLS_ECDHE_PSK_WITH_RC4_128_SHA
+- */
+ #define POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
+@@ -464,8 +464,8 @@
+  *      TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
+  *      TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
+  *      TLS_RSA_PSK_WITH_RC4_128_SHA
+- */
+ #define POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
+@@ -543,8 +543,8 @@
+  *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
+  *      TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+  *      TLS_ECDHE_RSA_WITH_RC4_128_SHA
+- */
+ #define POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+@@ -567,8 +567,8 @@
+  *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
+  *      TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
+  *      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
+- */
+ #define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+@@ -591,8 +591,8 @@
+  *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
+  *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
+  *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
+- */
+ #define POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
+@@ -615,8 +615,8 @@
+  *      TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
+  *      TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
+  *      TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
+- */
+ #define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
++ */
+ 
+ /**
+  * \def POLARSSL_PK_PARSE_EC_EXTENDED
+@@ -778,8 +778,8 @@
+  * \def POLARSSL_SELF_TEST
+  *
+  * Enable the checkup functions (*_self_test).
+- */
+ #define POLARSSL_SELF_TEST
++ */
+ 
+ /**
+  * \def POLARSSL_SSL_ALL_ALERT_MESSAGES
+@@ -1302,8 +1302,8 @@
+  *      TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
+  *      TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
+  *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
+- */
+ #define POLARSSL_CAMELLIA_C
++ */
+ 
+ /**
+  * \def POLARSSL_CCM_C
+@@ -1330,8 +1330,8 @@
+  * Requires: POLARSSL_PEM_PARSE_C
+  *
+  * This module is used for testing (ssl_client/server).
+- */
+ #define POLARSSL_CERTS_C
++ */
+ 
+ /**
+  * \def POLARSSL_CIPHER_C
+@@ -1370,8 +1370,8 @@
+  *          library/ssl_tls.c
+  *
+  * This module provides debugging functions.
+- */
+ #define POLARSSL_DEBUG_C
++ */
+ 
+ /**
+  * \def POLARSSL_DES_C
+@@ -1426,8 +1426,8 @@
+  *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+  *
+  * Requires: POLARSSL_ECP_C
+- */
+ #define POLARSSL_ECDH_C
++ */
+ 
+ /**
+  * \def POLARSSL_ECDSA_C
+@@ -1441,8 +1441,8 @@
+  *      ECDHE-ECDSA
+  *
+  * Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
+- */
+ #define POLARSSL_ECDSA_C
++ */
+ 
+ /**
+  * \def POLARSSL_ECP_C
+@@ -1454,8 +1454,8 @@
+  *          library/ecdsa.c
+  *
+  * Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
+- */
+ #define POLARSSL_ECP_C
++ */
+ 
+ /**
+  * \def POLARSSL_ENTROPY_C
+@@ -1494,8 +1494,8 @@
+  *
+  * This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
+  * requisites are enabled as well.
+- */
+ #define POLARSSL_GCM_C
++ */
+ 
+ /**
+  * \def POLARSSL_HAVEGE_C
+@@ -1652,8 +1652,8 @@
+  * Requires: POLARSSL_HAVE_ASM
+  *
+  * This modules adds support for the VIA PadLock on x86.
+- */
+ #define POLARSSL_PADLOCK_C
++ */
+ 
+ /**
+  * \def POLARSSL_PBKDF2_C
+@@ -1813,8 +1813,8 @@
+  * Module:  library/ripemd160.c
+  * Caller:  library/md.c
+  *
+- */
+ #define POLARSSL_RIPEMD160_C
++ */
+ 
+ /**
+  * \def POLARSSL_RSA_C
+@@ -1893,8 +1893,8 @@
+  * Caller:
+  *
+  * Requires: POLARSSL_SSL_CACHE_C
+- */
+ #define POLARSSL_SSL_CACHE_C
++ */
+ 
+ /**
+  * \def POLARSSL_SSL_CLI_C
+@@ -1970,8 +1970,8 @@
+  * Caller:  library/havege.c
+  *
+  * This module is used by the HAVEGE random number generator.
+- */
+ #define POLARSSL_TIMING_C
++ */
+ 
+ /**
+  * \def POLARSSL_VERSION_C
+@@ -2091,8 +2091,8 @@
+  *
+  * Module:  library/xtea.c
+  * Caller:
+- */
+ #define POLARSSL_XTEA_C
++ */
+ 
+ /* \} name SECTION: PolarSSL modules */
+ 
diff --git a/trunk/package/libs/popt/Makefile b/trunk/package/libs/popt/Makefile
new file mode 100644
index 00000000..5e03774d
--- /dev/null
+++ b/trunk/package/libs/popt/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=popt
+PKG_VERSION:=1.7
+PKG_RELEASE:=5
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
+PKG_LICENSE:=MIT
+
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=autogen.sh aclocal.m4
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += $(FPIC)
+
+define Package/libpopt
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A command line option parsing library
+  URL:=http://rpm5.org/files/popt/
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+	)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libpopt/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call RequireCommand,xgettext, \
+	$(PKG_NAME) requires the GNU gettext development package installed on the local system to build. \
+))
+
+$(eval $(call BuildPackage,libpopt))
+
diff --git a/trunk/package/libs/popt/patches/002-no-intl.patch b/trunk/package/libs/popt/patches/002-no-intl.patch
new file mode 100644
index 00000000..2f9a4e0b
--- /dev/null
+++ b/trunk/package/libs/popt/patches/002-no-intl.patch
@@ -0,0 +1,81 @@
+--- a/configure.in
++++ b/configure.in
+@@ -64,25 +64,14 @@ else
+ 	AC_MSG_RESULT(no)
+ fi
+ 
+-if test ! -f ../rpm.c
+-then
+-  AC_MSG_CHECKING(for GNU xgettext)
+-  xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
+-  *** GNU gettext is required. The latest version
+-  *** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
+-  AC_MSG_RESULT(yes)
+-fi
+-
+ AC_CHECK_FUNCS(strerror mtrace getuid geteuid)
+ AC_CHECK_FUNC(setreuid, [], [
+     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
+ ])
+ 
+-AM_GNU_GETTEXT
+-
+ POPT_SOURCE_PATH="`pwd`"
+ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
+ 	[Full path to popt top_sourcedir.])
+ AC_SUBST(POPT_SOURCE_PATH)
+ 
+-AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
++AC_OUTPUT([Doxyfile Makefile])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,10 +4,9 @@ AUTOMAKE_OPTIONS = 1.4 foreign
+ 
+ EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
+ 	testit.sh test-poptrc \
+-	po/*.in po/*.po po/popt.pot \
+ 	popt.ps
+ 
+-SUBDIRS = intl po
++SUBDIRS =
+ 
+ INCLUDES = -I. -I$(top_srcdir)
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -124,7 +124,7 @@ EXTRA_DIST = autogen.sh CHANGES $(man_MA
+ 	popt.ps
+ 
+ 
+-SUBDIRS = intl po
++SUBDIRS =
+ 
+ INCLUDES = -I. -I$(top_srcdir)
+ 
+@@ -160,7 +160,7 @@ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = Doxyfile intl/Makefile
++CONFIG_CLEAN_FILES = Doxyfile
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+ libpopt_la_LDFLAGS =
+@@ -261,8 +261,6 @@ distclean-hdr:
+ 	-rm -f config.h stamp-h1
+ Doxyfile: $(top_builddir)/config.status Doxyfile.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+-intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
+-	cd $(top_builddir) && $(SHELL) ./config.status $@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -584,7 +582,7 @@ distcleancheck_listfiles = find . -type 
+ distdir: $(DISTFILES)
+ 	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	$(mkinstalldirs) $(distdir)/. $(distdir)/intl $(distdir)/po
++	$(mkinstalldirs) $(distdir)/.
+ 	@list='$(DISTFILES)'; for file in $$list; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
diff --git a/trunk/package/libs/sysfsutils/Makefile b/trunk/package/libs/sysfsutils/Makefile
new file mode 100644
index 00000000..9ee76a03
--- /dev/null
+++ b/trunk/package/libs/sysfsutils/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sysfsutils
+PKG_VERSION:=2.1.0
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/linux-diag
+PKG_MD5SUM:=14e7dcd0436d2f49aa403f67e1ef7ddc
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=COPYING cmd/GPL lib/LGPL
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libsysfs
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=Filesystem
+  TITLE:=Sysfs library
+  URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
+endef
+
+define Package/sysfsutils
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Filesystem
+  DEPENDS:=+libsysfs
+  TITLE:=System Utilities Based on Sysfs
+  URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
+endef
+
+define Package/libsysfs/description
+The library's purpose is to provide a consistant and stable interface for
+querying system device information exposed through sysfs.
+endef
+
+define Package/sysfsutils/description
+A utility built upon libsysfs that lists devices by bus, class, and topology.
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/sysfs $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsysfs.{a,so*,la} $(1)/usr/lib/
+endef
+
+define Package/libsysfs/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsysfs.so* $(1)/usr/lib/
+endef
+
+define Package/sysfsutils/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/systool $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libsysfs))
+$(eval $(call BuildPackage,sysfsutils))
diff --git a/trunk/package/libs/sysfsutils/patches/200-mnt_path_check.patch b/trunk/package/libs/sysfsutils/patches/200-mnt_path_check.patch
new file mode 100644
index 00000000..8710578c
--- /dev/null
+++ b/trunk/package/libs/sysfsutils/patches/200-mnt_path_check.patch
@@ -0,0 +1,55 @@
+--- a/lib/sysfs_utils.c
++++ b/lib/sysfs_utils.c
+@@ -22,6 +22,7 @@
+  */
+ #include "libsysfs.h"
+ #include "sysfs.h"
++#include <mntent.h>
+ 
+ /**
+  * sysfs_remove_trailing_slash: Removes any trailing '/' in the given path
+@@ -53,6 +54,9 @@ int sysfs_get_mnt_path(char *mnt_path, s
+ {
+ 	static char sysfs_path[SYSFS_PATH_MAX] = "";
+ 	const char *sysfs_path_env;
++	FILE *mnt;
++	struct mntent *mntent;
++	int ret;
+ 
+ 	if (len == 0 || mnt_path == NULL)
+ 		return -1;
+@@ -64,12 +68,31 @@ int sysfs_get_mnt_path(char *mnt_path, s
+ 		if (sysfs_path_env != NULL) {
+ 			safestrcpymax(mnt_path, sysfs_path_env, len);
+ 			sysfs_remove_trailing_slash(mnt_path);
+-			return 0;
++		} else {
++			safestrcpymax(mnt_path, SYSFS_MNT_PATH, len);
+ 		}
+-		safestrcpymax(mnt_path, SYSFS_MNT_PATH, len);
+ 	}
+ 
+-	return 0;
++	/* check that mount point is indeed mounted */
++	ret = -1;
++	if ((mnt = setmntent(SYSFS_PROC_MNTS, "r")) == NULL) {
++		dprintf("Error getting mount information\n");
++		return -1;
++	}
++	while ((mntent = getmntent(mnt)) != NULL) {
++		if (strcmp(mntent->mnt_type, SYSFS_FSTYPE_NAME) == 0 &&
++			strcmp(mntent->mnt_dir, mnt_path) == 0) {
++			ret = 0;
++			break;
++		}
++	}
++	
++	endmntent(mnt);
++
++	if (ret < 0)
++		errno = ENOENT;
++
++	return ret;
+ }
+ 
+ /**
diff --git a/trunk/package/libs/toolchain/Makefile b/trunk/package/libs/toolchain/Makefile
new file mode 100644
index 00000000..10c990a1
--- /dev/null
+++ b/trunk/package/libs/toolchain/Makefile
@@ -0,0 +1,637 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+PKG_NAME:=toolchain
+PKG_RELEASE:=1
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-3.0-with-GCC-exception
+
+include $(INCLUDE_DIR)/package.mk
+
+ifneq ($(DUMP),1)
+  LIBGCC_VERSION:=$(GCC_VERSION)
+else
+  LIBC_VERSION:=<LIBC_VERSION>
+  LIBGCC_VERSION:=<LIBGCC_VERSION>
+endif
+
+define Package/gcc/Default
+  SECTION:=libs
+  CATEGORY:=Base system
+  URL:=http://gcc.gnu.org/
+  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+endef
+
+define Package/libgcc
+$(call Package/gcc/Default)
+  TITLE:=GCC support library
+endef
+
+define Package/libgcc/config
+	menu "Configuration"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+
+	config LIBGCC_ROOT_DIR
+		string
+		prompt "libgcc shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBGCC_FILE_SPEC
+		string
+		prompt "libgcc shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+		default "./lib/libgcc_s.so.*"
+
+	endmenu
+endef
+
+define Package/libatomic
+$(call Package/gcc/Default)
+  DEPENDS:=+libgcc
+  TITLE:=Atomic support library
+endef
+
+define Package/libatomic/config
+	menu "Configuration"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libatomic
+
+	config LIBATOMIC_ROOT_DIR
+		string
+		prompt "libatomic shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libatomic
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBATOMIC_FILE_SPEC
+		string
+		prompt "libatomic shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libatomic
+		default "./lib/libatomic.so.*"
+
+	endmenu
+endef
+
+define Package/libssp
+$(call Package/gcc/Default)
+  DEPENDS+=@SSP_SUPPORT
+  TITLE:=GCC support library
+endef
+
+define Package/libssp/config
+	menu "Configuration"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+
+	config LIBSSP_ROOT_DIR
+		string
+		prompt "libssp shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBSSP_FILE_SPEC
+		string
+		prompt "libssp shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+		default "./lib/libssp.so.*"
+
+	endmenu
+endef
+
+
+define Package/libstdcpp
+$(call Package/gcc/Default)
+  NAME:=libstdc++
+  TITLE:=GNU Standard C++ Library v3
+endef
+
+define Package/libstdcpp/config
+	menu "Configuration"
+	depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+
+	config LIBSTDCPP_ROOT_DIR
+		string
+		prompt "libstdcpp shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBSTDCPP_FILE_SPEC
+		string
+		prompt "libstdc++ shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+		default "./lib/libstdc++.so.*"
+
+	endmenu
+endef
+
+
+define Package/libc/Default
+  SECTION:=libs
+  CATEGORY:=Base system
+  VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
+  DEPENDS:=+libgcc
+  URL:=$(LIBC_URL)
+  PKG_FLAGS:=hold essential
+endef
+
+
+define Package/libc
+$(call Package/libc/Default)
+  TITLE:=C library
+endef
+
+define Package/libc/config
+	menu "Configuration"
+	depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc
+
+	config LIBC_ROOT_DIR
+		string
+		prompt "libc shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBC_FILE_SPEC
+		string
+		prompt "libc shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc
+		default "./lib/ld{-*.so,-linux*.so.*} ./lib/lib{anl,c,cidn,crypt,dl,m,nsl,nss_dns,nss_files,resolv,util}{-*.so,.so.*}"
+
+	endmenu
+endef
+
+
+define Package/libpthread
+$(call Package/libc/Default)
+  TITLE:=POSIX thread library
+endef
+
+define Package/libpthread/config
+	menu "Configuration"
+	depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+
+	config LIBPTHREAD_ROOT_DIR
+		string
+		prompt "libpthread shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBPTHREAD_FILE_SPEC
+		string
+		prompt "libpthread shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+		default "./lib/libpthread{-*.so,.so.*}"
+
+	endmenu
+endef
+
+
+define Package/libthread-db
+$(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
+  TITLE:=POSIX thread library debugging support
+endef
+
+define Package/librt
+$(call Package/libc/Default)
+  TITLE:=POSIX.1b RealTime extension library
+  DEPENDS:=+libpthread
+endef
+
+define Package/librt/config
+	menu "Configuration"
+	depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt
+
+	config LIBRT_ROOT_DIR
+		string
+		prompt "librt shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBRT_FILE_SPEC
+		string
+		prompt "librt shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt
+		default "./lib/librt{-*.so,.so.*}"
+
+	endmenu
+endef
+
+
+define Package/libgfortran
+$(call Package/gcc/Default)
+  TITLE:=GFortran support library
+  DEPENDS+=@INSTALL_GFORTRAN
+endef
+
+define Package/libgfortran/config
+	menu "Configuration"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
+
+	config LIBGFORTRAN_ROOT_DIR
+		string
+		prompt "libgfortran shared library base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LIBGFORTRAN_FILE_SPEC
+		string
+		prompt "libgfortran shared library files (use wildcards)"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
+		default "./usr/lib/libgfortran.so.*"
+
+	endmenu
+endef
+
+define Package/ldd
+$(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=LDD trace utility
+endef
+
+define Package/ldd/config
+	menu "Configuration"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+
+	config LDD_ROOT_DIR
+		string
+		prompt "ldd trace utility base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LDD_FILE_SPEC
+		string
+		prompt "ldd trace utility file"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+		default "./usr/bin/ldd"
+
+	endmenu
+endef
+
+
+define Package/ldconfig
+$(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Shared library path configuration
+endef
+
+define Package/ldconfig/config
+	menu "Configuration"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+
+	config LDCONFIG_ROOT_DIR
+		string
+		prompt "ldconfig base directory"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+		default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+		default "/"  if NATIVE_TOOLCHAIN
+
+	config LDCONFIG_FILE_SPEC
+		string
+		prompt "ldconfig file"
+		depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+		default "./sbin/ldconfig"
+
+	endmenu
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a))
+LIBGCC_MAP=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map))
+LIBGCC_SO=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*))
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  ifneq ($(if $(CONFIG_USE_UCLIBC),$(CONFIG_GCC_VERSION_LINARO)),)
+    BUILD_LIBGCC:=$(if $(CONFIG_avr32)$(CONFIG_m68k)$(CONFIG_powerpc),,$(PKG_BUILD_DIR)/libgcc_s.so.*)
+  endif
+endif
+
+ifneq ($(BUILD_LIBGCC),)
+  define Build/Compile/uClibc
+	$(SCRIPT_DIR)/relink-lib.sh \
+		"$(TARGET_CROSS)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libc_so.a)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libc_so.a)" \
+		"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libuClibc-*.so))" \
+		-Wl,-init,__uClibc_init -Wl,-soname=libc.so.0 \
+		$(BUILD_LIBGCC)
+	$(SCRIPT_DIR)/relink-lib.sh \
+		"$(TARGET_CROSS)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt_pic.a)" \
+		"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so))" \
+		$(BUILD_LIBGCC) \
+		-Wl,-soname=libcrypt.so.0
+	$(SCRIPT_DIR)/relink-lib.sh \
+		"$(TARGET_CROSS)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libatomic.so)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libatomic.a)" \
+		"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libatomic*.so))" \
+		$(BUILD_LIBGCC) \
+		-Wl,-soname=libatomic.so.0
+	$(SCRIPT_DIR)/relink-lib.sh \
+		"$(TARGET_CROSS)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libm_pic.a)" \
+		"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so))" \
+		$(BUILD_LIBGCC) \
+		-Wl,-soname=libm.so.0
+	$(SCRIPT_DIR)/relink-lib.sh \
+		"$(TARGET_CROSS)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread-*.so)" \
+		"$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread_so.a)" \
+		"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread-*.so))" \
+		-Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal \
+		-ldl -lc $(BUILD_LIBGCC) \
+		-Wl,-soname=libpthread.so.0
+  endef
+  define Build/Compile/libgcc
+	$(SCRIPT_DIR)/relink-lib.sh \
+		"$(TARGET_CROSS)" \
+		"$(LIBGCC_SO)" \
+		"$(LIBGCC_A)" \
+		"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(LIBGCC_SO))" \
+		-Wl,--version-script=$(LIBGCC_MAP) -Wl,-soname=libgcc_s.so.1
+  endef
+else
+  define Build/Compile/uClibc
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libuClibc-*.so \
+		$(TOOLCHAIN_DIR)/lib/libcrypt-*.so \
+		$(TOOLCHAIN_DIR)/lib/libm-*.so \
+		$(TOOLCHAIN_DIR)/lib/libpthread-*.so \
+		$(PKG_BUILD_DIR)/
+  endef
+  ifneq ($(LIBGCC_SO),)
+    define Build/Compile/libgcc
+	$(CP) $(LIBGCC_SO) $(PKG_BUILD_DIR)/
+    endef
+  endif
+endif
+
+define Build/Compile/Default
+	$(call Build/Compile/libgcc)
+	$(call Build/Compile/$(LIBC))
+endef
+Build/Compile = $(Build/Compile/Default)
+
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+
+  define Package/libgcc/install
+	$(INSTALL_DIR) $(1)/lib
+	$(if $(CONFIG_TARGET_avr32)$(CONFIG_TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/)
+  endef
+
+  define Package/libatomic/install
+	$(INSTALL_DIR) $(1)/lib
+	$(if $(CONFIG_TARGET_avr32)$(CONFIG_TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libatomic.so.* $(1)/lib/)
+  endef
+
+  define Package/libgfortran/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(if $(CONFIG_TARGET_avr32)$(CONFIG_TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgfortran.so.* $(1)/usr/lib/)
+  endef
+
+  define Package/libssp/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
+  endef
+
+  define Package/libstdcpp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/usr/lib/
+  endef
+
+  use_libutil=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
+  use_libnsl=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
+  use_nsswitch=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)
+
+  define Package/eglibc/install
+	$(CP) ./eglibc-files/* $(1)/
+	rm -f $(1)/etc/localtime
+	$(LN) /tmp/localtime $(1)/etc/localtime
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/ld*.so.* \
+		$(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_VERSION).so \
+		$(1)/lib/
+	for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \
+		for file in $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so; do \
+			if [ -e "$$$$file" ]; then \
+				$(CP) $$$$file $(1)/lib/; \
+			fi; \
+		done; \
+	done
+  endef
+
+  define Package/uClibc/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/ld*-uClibc.so.* \
+		$(TOOLCHAIN_DIR)/lib/ld*-uClibc-$(LIBC_SO_VERSION).so \
+		$(1)/lib/
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libc.so.* \
+		$(TOOLCHAIN_DIR)/lib/libuClibc-$(LIBC_SO_VERSION).so \
+		$(1)/lib/
+	for file in libatomic libcrypt libdl libm libutil; do \
+		$(CP) \
+			$(TOOLCHAIN_DIR)/lib/$$$$file.so.* \
+			$(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so \
+			$(1)/lib/; \
+	done
+
+	$(CP) \
+		$(PKG_BUILD_DIR)/libuClibc-* \
+		$(PKG_BUILD_DIR)/libm-* \
+		$(PKG_BUILD_DIR)/libcrypt-* \
+		$(1)/lib/
+  endef
+
+  LD_MUSL_NAME = $(notdir $(firstword $(wildcard $(TOOLCHAIN_DIR)/lib/libc.so*)))
+
+  define Package/musl/install
+	$(INSTALL_DIR) $(1)/lib $(1)/usr/bin
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/ld-musl-*.so* \
+		$(1)/lib/
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libc.so* \
+		$(1)/lib/
+	$(LN) ../../lib/$(LD_MUSL_NAME) $(1)/usr/bin/ldd
+  endef
+
+  define Package/libc/install
+    $(call Package/$(LIBC)/install,$1)
+  endef
+
+  define Package/libc/install_lib
+	$(CP) $(filter-out %/libdl_pic.a %/libpthread_pic.a %/libresolv_pic.a,$(wildcard $(TOOLCHAIN_DIR)/lib/lib*.a)) $(1)/lib/
+	$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libc_so.a),$(CP) $(TOOLCHAIN_DIR)/lib/libc_so.a $(1)/lib/libc_pic.a)
+	$(if $(LIBGCC_MAP), \
+		$(CP) $(LIBGCC_A) $(1)/lib/libgcc_s_pic.a; \
+		$(CP) $(LIBGCC_MAP) $(1)/lib/libgcc_s_pic.map \
+	)
+  endef
+
+  define Package/libpthread/install
+	$(INSTALL_DIR) $(1)/lib
+  ifneq ($(CONFIG_USE_MUSL),y)
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libpthread.so.* \
+		$(if $(BUILD_LIBGCC),\
+			$(PKG_BUILD_DIR)/libpthread-$(LIBC_SO_VERSION).so, \
+			$(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \
+		) \
+		$(1)/lib/
+  endif
+  endef
+
+  define Package/libthread-db/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libthread_db.so.* $(1)/lib
+  ifeq ($(CONFIG_USE_UCLIBC),y)
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/libthread_db-$(LIBC_SO_VERSION).so \
+		$(1)/lib/
+  endif
+  endef
+
+  define Package/libpthread/install_lib
+	$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libpthread_so.a),$(CP) $(TOOLCHAIN_DIR)/lib/libpthread_so.a $(1)/lib/libpthread_pic.a)
+  endef
+
+  define Package/librt/install
+	$(INSTALL_DIR) $(1)/lib
+  ifneq ($(CONFIG_USE_MUSL),y)
+	$(CP) \
+		$(TOOLCHAIN_DIR)/lib/librt.so.* \
+		$(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so \
+		$(1)/lib/
+  endif
+  endef
+
+  define Package/ldd/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(CP) $(TOOLCHAIN_DIR)/bin/ldd $(1)/usr/bin/
+  endef
+
+  define Package/ldconfig/install
+	$(INSTALL_DIR) $(1)/sbin/
+	$(CP) $(TOOLCHAIN_DIR)/sbin/ldconfig $(1)/sbin/
+  endef
+
+else
+
+  define Package/libgcc/install
+	for file in $(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+  define Package/libgfortran/install
+	for file in $(call qstrip,$(CONFIG_LIBGFORTRAN_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LIBGFORTRAN_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done
+  endef
+
+  define Package/libssp/install
+	for file in $(call qstrip,$(CONFIG_LIBSSP_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+  define Package/libstdcpp/install
+	for file in $(call qstrip,$(CONFIG_LIBSTDCPP_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+  define Package/libc/install
+	for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+  define Package/libpthread/install
+	for file in $(call qstrip,$(CONFIG_LIBPTHREAD_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+  define Package/librt/install
+	for file in $(call qstrip,$(CONFIG_LIBRT_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+  define Package/ldd/install
+	for file in $(call qstrip,$(CONFIG_LDD_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LDD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+  define Package/ldconfig/install
+	for file in $(call qstrip,$(CONFIG_LDCONFIG_FILE_SPEC)); do \
+		dir=`dirname $$$$file` ; \
+		$(INSTALL_DIR) $(1)/$$$$dir ; \
+		$(CP) $(call qstrip,$(CONFIG_LDCONFIG_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+	done ; \
+	exit 0
+  endef
+
+endif
+
+$(eval $(call BuildPackage,libc))
+$(eval $(call BuildPackage,libgcc))
+$(eval $(call BuildPackage,libatomic))
+$(eval $(call BuildPackage,libssp))
+$(eval $(call BuildPackage,libstdcpp))
+$(eval $(call BuildPackage,libpthread))
+$(eval $(call BuildPackage,libthread-db))
+$(eval $(call BuildPackage,librt))
+$(eval $(call BuildPackage,libgfortran))
+$(eval $(call BuildPackage,ldd))
+$(eval $(call BuildPackage,ldconfig))
diff --git a/trunk/package/libs/toolchain/eglibc-files/etc/nsswitch.conf b/trunk/package/libs/toolchain/eglibc-files/etc/nsswitch.conf
new file mode 100644
index 00000000..981c425d
--- /dev/null
+++ b/trunk/package/libs/toolchain/eglibc-files/etc/nsswitch.conf
@@ -0,0 +1,13 @@
+passwd:files
+shadow:files
+group:files
+hosts:dns files
+bootparams:files
+ethers:files
+netmasks:files
+networks:files
+protocols:files
+rpc:files
+services:files
+automount:files
+aliases:files
diff --git a/trunk/package/libs/uclibc++/Makefile b/trunk/package/libs/uclibc++/Makefile
new file mode 100644
index 00000000..ade3c62e
--- /dev/null
+++ b/trunk/package/libs/uclibc++/Makefile
@@ -0,0 +1,93 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uclibc++
+PKG_VERSION:=0.2.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://cxx.uclibc.org/src/
+PKG_MD5SUM:=394c119363dd8b469fb898442a6764b8
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+PKG_LICENSE:=LGPL-2.1+
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/uclibcxx
+  NAME:=uclibc++
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=C++ library for embedded systems
+  URL:=http://cxx.uclibc.org/src/
+endef
+
+UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
+	-e 's/i.86/i386/' \
+	-e 's/sparc.*/sparc/' \
+	-e 's/m68k.*/m68k/' \
+	-e 's/ppc/powerpc/g' \
+	-e 's/v850.*/v850/g' \
+	-e 's/sh64/sh/' \
+	-e 's/sh[234].*/sh/' \
+	-e 's/mips.*/mips/' \
+	-e 's/mipsel.*/mips/' \
+	-e 's/cris.*/cris/' \
+)
+
+TARGET_CFLAGS += $(FPIC)
+
+ifneq ($(CONFIG_CCACHE),)
+TARGET_CXX=$(TARGET_CXX_NOCACHE)
+endif
+
+MAKE_FLAGS:= \
+	TOPDIR="$(PKG_BUILD_DIR)/" \
+	$(TARGET_CONFIGURE_OPTS) \
+	CPU_CFLAGS="$(TARGET_CFLAGS)" \
+	CROSS="$(TARGET_CROSS)" \
+	CP="$(CP)" \
+	GEN_LIBS="-lc $(LIBGCC_S)" \
+	check_as_needed=
+
+# check_as_needed overrides dependency on libgcc_s
+
+define Build/Configure
+	if [ -f ./files/config.$(UCLIBC_TARGET_ARCH) ]; then \
+		cp ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config; \
+	else \
+		cp ./files/config.default $(PKG_BUILD_DIR)/.config; \
+	fi
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/
+	$(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include/uClibc++/
+	$(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++*.{a,so}* $(1)/usr/lib/
+	$(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(TOOLCHAIN_DIR)/bin/g++-uc
+	$(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(TOOLCHAIN_DIR)/bin/g++-uc
+# add another wrapper which links against both uClibc++ and libstdc++ 
+	$(INSTALL_BIN) $(TOOLCHAIN_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/g++-uc+std
+	$(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std
+	$(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(TOOLCHAIN_DIR)/bin/g++-uc+std
+	$(SED) 's|-nostdinc++||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std
+endef
+
+define Package/uclibcxx/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++-*.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,uclibcxx))
diff --git a/trunk/package/libs/uclibc++/files/config.default b/trunk/package/libs/uclibc++/files/config.default
new file mode 100644
index 00000000..944e1a6c
--- /dev/null
+++ b/trunk/package/libs/uclibc++/files/config.default
@@ -0,0 +1,58 @@
+#
+# Automatically generated make config: don't edit
+#
+
+#
+# Target Features and Options
+#
+UCLIBCXX_HAS_FLOATS=y
+# UCLIBCXX_HAS_LONG_DOUBLE is not set
+# UCLIBCXX_HAS_TLS is not set
+WARNINGS="-Wall"
+BUILD_EXTRA_LIBRARIES=""
+HAVE_DOT_CONFIG=y
+
+#
+# String and I/O Stream Support
+#
+UCLIBCXX_HAS_WCHAR=y
+UCLIBCXX_IOSTREAM_BUFSIZE=32
+UCLIBCXX_HAS_LFS=y
+UCLIBCXX_SUPPORT_CDIR=y
+UCLIBCXX_SUPPORT_CIN=y
+UCLIBCXX_SUPPORT_COUT=y
+UCLIBCXX_SUPPORT_CERR=y
+UCLIBCXX_SUPPORT_CLOG=y
+UCLIBCXX_SUPPORT_WCIN=y
+UCLIBCXX_SUPPORT_WCOUT=y
+UCLIBCXX_SUPPORT_WCERR=y
+UCLIBCXX_SUPPORT_WCLOG=y
+
+#
+# STL and Code Expansion
+#
+UCLIBCXX_STL_BUFFER_SIZE=32
+UCLIBCXX_CODE_EXPANSION=y
+UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS=y
+UCLIBCXX_EXPAND_STRING_CHAR=y
+UCLIBCXX_EXPAND_VECTOR_BASIC=y
+UCLIBCXX_EXPAND_IOS_CHAR=y
+UCLIBCXX_EXPAND_STREAMBUF_CHAR=y
+UCLIBCXX_EXPAND_ISTREAM_CHAR=y
+UCLIBCXX_EXPAND_OSTREAM_CHAR=y
+UCLIBCXX_EXPAND_FSTREAM_CHAR=y
+UCLIBCXX_EXPAND_SSTREAM_CHAR=y
+
+#
+# Library Installation Options
+#
+UCLIBCXX_RUNTIME_PREFIX=""
+UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
+UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
+UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
+UCLIBCXX_EXCEPTION_SUPPORT=y
+IMPORT_LIBSUP=y
+# IMPORT_LIBGCC_EH is not set
+BUILD_STATIC_LIB=y
+# BUILD_ONLY_STATIC_LIB is not set
+# DODEBUG is not set
diff --git a/trunk/package/libs/uclibc++/patches/002-path_to_bash.patch b/trunk/package/libs/uclibc++/patches/002-path_to_bash.patch
new file mode 100644
index 00000000..26d88ee4
--- /dev/null
+++ b/trunk/package/libs/uclibc++/patches/002-path_to_bash.patch
@@ -0,0 +1,11 @@
+--- a/bin/Makefile
++++ b/bin/Makefile
+@@ -13,7 +13,7 @@ install:
+ 	$(INSTALL) -m 755 $(WRAPPER) $(PREFIX)$(UCLIBCXX_RUNTIME_BINDIR)
+ 
+ $(WRAPPER): Makefile
+-	echo '#!/bin/sh' > $@
++	echo '#!/usr/bin/env bash' > $@
+ 	echo '' >> $@
+ 	echo 'WRAPPER_INCLUDEDIR="$${WRAPPER_INCLUDEDIR:=-I$(UCLIBCXX_RUNTIME_INCLUDEDIR)}"' >> $@
+ 	echo 'WRAPPER_LIBDIR="$${WRAPPER_LIBDIR:=-L$(UCLIBCXX_RUNTIME_LIBDIR)}"' >> $@
diff --git a/trunk/package/libs/uclibc++/patches/006-eabi_fix.patch b/trunk/package/libs/uclibc++/patches/006-eabi_fix.patch
new file mode 100644
index 00000000..65b436cd
--- /dev/null
+++ b/trunk/package/libs/uclibc++/patches/006-eabi_fix.patch
@@ -0,0 +1,38 @@
+--- a/include/typeinfo
++++ b/include/typeinfo
+@@ -44,6 +44,7 @@ namespace __cxxabiv1
+   class __class_type_info;
+ } // namespace __cxxabiv1
+ 
++#ifndef __GXX_MERGED_TYPEINFO_NAMES
+ #if !__GXX_WEAK__
+   // If weak symbols are not supported, typeinfo names are not merged.
+   #define __GXX_MERGED_TYPEINFO_NAMES 0
+@@ -51,6 +52,7 @@ namespace __cxxabiv1
+   // On platforms that support weak symbols, typeinfo names are merged.
+   #define __GXX_MERGED_TYPEINFO_NAMES 1
+ #endif
++#endif
+ 
+ namespace std 
+ {
+--- a/include/unwind-cxx.h
++++ b/include/unwind-cxx.h
+@@ -173,6 +173,7 @@ extern std::unexpected_handler __unexpec
+ 
+ // This is the exception class we report -- "GNUCC++\0".
+ const _Unwind_Exception_Class __gxx_exception_class
++#ifndef __ARM_EABI_UNWINDER__
+ = ((((((((_Unwind_Exception_Class) 'G' 
+ 	 << 8 | (_Unwind_Exception_Class) 'N')
+ 	<< 8 | (_Unwind_Exception_Class) 'U')
+@@ -181,6 +182,9 @@ const _Unwind_Exception_Class __gxx_exce
+      << 8 | (_Unwind_Exception_Class) '+')
+     << 8 | (_Unwind_Exception_Class) '+')
+    << 8 | (_Unwind_Exception_Class) '\0');
++#else
++= "GNUC++";
++#endif
+ 
+ // GNU C++ personality routine, Version 0.
+ extern "C" _Unwind_Reason_Code __gxx_personality_v0
diff --git a/trunk/package/libs/uclient/Makefile b/trunk/package/libs/uclient/Makefile
new file mode 100644
index 00000000..4f3bc82e
--- /dev/null
+++ b/trunk/package/libs/uclient/Makefile
@@ -0,0 +1,51 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uclient
+PKG_VERSION:=2014-09-04
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://git.openwrt.org/project/uclient.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=57a1dda8f31878282e554bb98d5cc81307edea49
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=
+CMAKE_INSTALL:=1
+
+PKG_BUILD_DEPENDS:=ustream-ssl
+
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libuclient
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=HTTP/1.1 client library
+  ABI_VERSION:=$(PKG_VERSION)
+  DEPENDS:=+libubox
+endef
+
+define Package/uclient-fetch
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Tiny wget replacement using libuclient
+  DEPENDS:=+libuclient
+endef
+
+define Package/libuclient/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libuclient.so $(1)/usr/lib/
+endef
+
+define Package/uclient-fetch/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uclient-fetch $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libuclient))
+$(eval $(call BuildPackage,uclient-fetch))
diff --git a/trunk/package/libs/ustream-ssl/Makefile b/trunk/package/libs/ustream-ssl/Makefile
new file mode 100644
index 00000000..65a1be9f
--- /dev/null
+++ b/trunk/package/libs/ustream-ssl/Makefile
@@ -0,0 +1,73 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ustream-ssl
+PKG_VERSION:=2014-03-25
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/ustream-ssl.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=fc0b5ec804ee43c532978dd04ab0509c34baefb0
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+CMAKE_INSTALL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
+
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libustream/default
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=ustream SSL Library
+  DEPENDS:=+libubox
+  ABI_VERSION:=$(PKG_VERSION)
+endef
+
+define Package/libustream-openssl
+  $(Package/libustream/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_libustream-openssl:libopenssl
+  VARIANT:=openssl
+endef
+
+define Package/libustream-cyassl
+  $(Package/libustream/default)
+  TITLE += (cyassl)
+  DEPENDS += +PACKAGE_libustream-cyassl:libcyassl
+  VARIANT:=cyassl
+endef
+
+define Package/libustream-polarssl
+  $(Package/libustream/default)
+  TITLE += (polarssl)
+  DEPENDS += +libpolarssl
+  VARIANT:=polarssl
+  DEFAULT_VARIANT:=1
+endef
+
+ifeq ($(BUILD_VARIANT),cyassl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl
+  CMAKE_OPTIONS += -DCYASSL=on
+endif
+ifeq ($(BUILD_VARIANT),polarssl)
+  CMAKE_OPTIONS += -DPOLARSSL=on
+endif
+
+define Package/libustream/default/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libustream-ssl.so $(1)/lib/
+endef
+
+Package/libustream-openssl/install = $(Package/libustream/default/install)
+Package/libustream-cyassl/install = $(Package/libustream/default/install)
+Package/libustream-polarssl/install = $(Package/libustream/default/install)
+
+$(eval $(call BuildPackage,libustream-polarssl))
+$(eval $(call BuildPackage,libustream-cyassl))
+$(eval $(call BuildPackage,libustream-openssl))
diff --git a/trunk/package/libs/zlib/Makefile b/trunk/package/libs/zlib/Makefile
new file mode 100644
index 00000000..feeac12a
--- /dev/null
+++ b/trunk/package/libs/zlib/Makefile
@@ -0,0 +1,72 @@
+# 
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=zlib
+PKG_VERSION:=1.2.8
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng
+PKG_MD5SUM:=44d667c142d7cda120332623eab69f40
+
+PKG_LICENSE:=Zlib
+PKG_LICENSE_FILES:=README
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/zlib
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library implementing the deflate compression method
+  URL:=http://www.zlib.net/
+endef
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); \
+		$(TARGET_CONFIGURE_OPTS) \
+		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
+		./configure \
+			--prefix=/usr \
+			--shared \
+			--uname=Linux \
+	);
+endef
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		libz.a libz.so.$(PKG_VERSION)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include
+	$(CP)	$(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \
+		$(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
+		$(1)/usr/lib/
+	mkdir -p $(1)/usr/lib/pkgconfig
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
+		$(1)/usr/lib/pkgconfig/
+endef
+
+# libz.so is needed for openssl (zlib-dynamic)
+define Package/zlib/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,zlib))
diff --git a/trunk/package/luci/CONTRIBUTING.md b/trunk/package/luci/CONTRIBUTING.md
new file mode 100644
index 00000000..050086f4
--- /dev/null
+++ b/trunk/package/luci/CONTRIBUTING.md
@@ -0,0 +1,43 @@
+# Contributing Guidelines
+
+Patches and pull-requests:
+
+If you want to contribute a change to LuCI, please either send a patch using git send-email
+or open a pull request against the librecmc/luci repository.
+
+Regardless of whether you send a patch or open a pull request, please try to follow these rules:
+
+* Have a useful subject prefixed with the component name  
+    (E.g.: "modules/admin-full: fix wifi channel selection on multiple STA networks")
+* Shortly explain the changes made and - if applicable - the reasoning behind them
+* Include Signed-off-by in the comment  
+    (See <https://dev.librecmc.org/wiki/SubmittingPatches#a10.Signyourwork>)
+	
+In case you like to send patches by mail, please use the [LuCI mailinglist](https://lists.subsignal.org/mailman/listinfo/luci)
+or the [libreCMC Development List](https://lists.librecmc.org/cgi-bin/mailman/listinfo/librecmc-devel).
+
+If you send via the libreCMC list, include a "[luci]" tag in your subject line.
+For general information on patch submission, follow the [libreCMC patch submission guideline](https://dev.librecmc.org/wiki/SubmittingPatches).
+
+
+If you have commit access:
+
+* Do NOT use git push --force.
+* Use Pull Requests if you are unsure and to suggest changes to other developers.
+
+Gaining commit access:
+
+* Commit access will be granted to responsible contributors who have made
+  useful pull requests and / or feedback or patches to this repository or
+  libreCMC in general. Please include your request for commit access in your
+  next pull request or ticket.
+
+Release Branches:
+
+* Branches named "luci-X.Y" (e.g. luci-0.12) are release branches.
+* These branches are built with the respective libreCMC release and are created
+  during the release stabilisation phase.
+* Please ONLY cherry-pick or commit security and bug-fixes to these branches.
+* Do NOT add new packages and do NOT do major upgrades of packages here.
+* If you are unsure if your change is suitable, please use a pull request.
+
diff --git a/trunk/package/luci/INSTALL b/trunk/package/luci/INSTALL
new file mode 100644
index 00000000..b28ac753
--- /dev/null
+++ b/trunk/package/luci/INSTALL
@@ -0,0 +1,27 @@
+LuCI Installation Instructions
+
+TOC:
+1. Kamikaze Feed
+2. Kamikaze Packages
+
+
+1. Kamikaze Feed
+	1. Change to your libreCMC buildroot
+
+	2. Add the following line to your libreCMC feeds.conf:
+		src-svn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package
+		
+	3. Run ./scripts/feeds update
+	
+	4. Run ./scripts/feeds install -a -p luci
+	
+	5. Type make menuconfig and you will find luci in the menu "Administration"
+	
+		
+2. Kamikaze Packages
+	1.	cd to the "package" directory of your kamikaze buildroot
+	
+	3.	Type: ln -s /path/to/luci/contrib/package/* ./
+	
+	4.	cd to your kamikaze build root and type: make menuconfig
+		You will find luci in the menu "Administration"
diff --git a/trunk/package/luci/LICENSE b/trunk/package/luci/LICENSE
new file mode 100644
index 00000000..f49a4e16
--- /dev/null
+++ b/trunk/package/luci/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/trunk/package/luci/Makefile b/trunk/package/luci/Makefile
new file mode 100644
index 00000000..70a7e92a
--- /dev/null
+++ b/trunk/package/luci/Makefile
@@ -0,0 +1,99 @@
+include build/config.mk
+
+MODULES = contrib/* applications/* libs/* modules/* themes/* i18n/*
+
+OS:=$(shell uname)
+MODULES:=$(foreach item,$(wildcard $(MODULES)),$(if $(realpath $(wildcard $(item)/Makefile)),$(item)))
+
+export OS
+
+.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
+
+all: build
+
+build: gccbuild luabuild
+
+gccbuild:
+	make -C modules/base CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
+	for i in $(MODULES); do \
+		make -C$$i SDK="$(shell test -f .running-sdk && echo 1)" compile || { \
+			echo "*** Compilation of $$i failed!"; \
+			exit 1; \
+		}; \
+	done
+
+luabuild: i18nbuild
+	for i in $(MODULES); do HOST=$(realpath host) \
+		SDK="$(shell test -f .running-sdk && echo 1)" make -C$$i luabuild; done
+
+i18nbuild:
+	mkdir -p host/lua-po
+	./build/i18n-po2lua.pl ./po host/lua-po
+
+clean:
+	rm -f .running-sdk
+	rm -rf docs
+	make -C modules/base host-clean
+	for i in $(MODULES); do make -C$$i clean; done
+
+
+host: build hostcopy
+
+gcchost: gccbuild hostcopy
+
+luahost: luabuild hostcopy
+
+hostcopy: 
+	mkdir -p host/tmp
+	mkdir -p host/var/state
+	for i in $(MODULES); do cp -pR $$i/dist/* host/ 2>/dev/null || true; done
+	for i in $(MODULES); do cp -pR $$i/hostfiles/* host/ 2>/dev/null || true; done
+	rm -f host/luci
+	ln -s .$(LUCI_MODULEDIR) host/luci
+	rm -rf /tmp/luci-* || true
+
+hostenv: sdk host ucidefaults
+
+sdk:
+	touch .running-sdk
+
+ucidefaults:
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-freifunk-*"
+
+runuhttpd: hostenv
+	cp $(realpath build)/luci.cgi $(realpath host)/www/cgi-bin/luci
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/usr/sbin/uhttpd -p 8080 -h $(realpath host)/www -f"
+
+runlua: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua"
+
+runshell: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL
+
+hostclean: clean
+	rm -rf host
+
+apidocs: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh host/luci/ docs"
+
+nixiodocs: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh libs/nixio/ nixiodocs"
+
+po: host
+	for L in $${LANGUAGE:-$$(find i18n/ -path 'i18n/*/luasrc/i18n/*' -name 'default.*.lua' | \
+	  sed -e 's!.*/default\.\(.*\)\.lua!\1!')}; do \
+	    build/i18n-lua2po.pl . $(realpath host)/po $$L; \
+	done
+
+run:
+	#	make run is deprecated				#
+	#	Please use:					#
+	#							#
+	#	To run LuCI WebUI using uhttpd			#
+	#	make runuhttpd					#
+	#							#
+	#	To start a shell in the LuCI environment	#
+	#	make runshell					#
+	#							#
+	#	To run Lua CLI in the LuCI environment		#
+	#	make runlua					#
diff --git a/trunk/package/luci/NOTICE b/trunk/package/luci/NOTICE
new file mode 100644
index 00000000..c708e5e8
--- /dev/null
+++ b/trunk/package/luci/NOTICE
@@ -0,0 +1,9 @@
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Licensed under the Apache License, Version 2.0.
+
+Contains code from:
+coxpcall	- Copyright 2005 - Kepler Project (www.keplerproject.org)
+ltn12/luasocket - Copyright 2004-2007 Diego Nehab
+axTLS		- Copyright 2008 Cameron Rich
diff --git a/trunk/package/luci/README.md b/trunk/package/luci/README.md
new file mode 100644
index 00000000..c0249ffe
--- /dev/null
+++ b/trunk/package/luci/README.md
@@ -0,0 +1,21 @@
+# libreCMC luci feed
+
+## Description
+
+This is the libreCMC "luci"-feed containing LuCI - libreCMC Configuration Interface.
+
+## Usage
+
+This feed is enabled by default. To install all its package definitions, run:
+```
+./scripts/feeds update luci
+./scripts/feeds install -a -p luci
+```
+
+## License
+
+See [LICENSE](LICENSE) file.
+ 
+## Package Guidelines
+
+See [CONTRIBUTING.md](CONTRIBUTING.md) file.
diff --git a/trunk/package/luci/THANKYOU b/trunk/package/luci/THANKYOU
new file mode 100644
index 00000000..50276f5a
--- /dev/null
+++ b/trunk/package/luci/THANKYOU
@@ -0,0 +1,26 @@
+I'd like to thank the following people for contributing to this software:
+
+* Anton Popov
+	- for rewriting the librecmc.org theme
+
+* Florian Fainelli (libreCMC)
+	- for the french translation
+
+* Alina Friedrichsen
+	- for the reworked translation system, help on standards compliance and accessibility
+	
+* Yanira
+	- several applications and bugreports
+
+
+Also a big thank you goes to:
+	
+* Mono (Freifunk Halle)
+	- for donating a Linksys WRT54GL for development purposes
+	
+* tetzlav (Freifunk Leipzig)
+	- for donating several boards for testing and his feedback
+	
+* Mickey (Freifunk Hannover)
+	- for his feedback and fixes for the libreCMC builds
+	
diff --git a/trunk/package/luci/applications/freifunk-community/Makefile b/trunk/package/luci/applications/freifunk-community/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/applications/freifunk-community/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/applications/luci-ahcp/Makefile b/trunk/package/luci/applications/luci-ahcp/Makefile
new file mode 100644
index 00000000..a70e950a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ahcp/Makefile
@@ -0,0 +1,4 @@
+PO = ahcp
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-ahcp/luasrc/controller/ahcp.lua b/trunk/package/luci/applications/luci-ahcp/luasrc/controller/ahcp.lua
new file mode 100644
index 00000000..704ec4f8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ahcp/luasrc/controller/ahcp.lua
@@ -0,0 +1,60 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: init.lua 6731 2011-01-14 19:44:03Z soma $
+]]--
+
+module("luci.controller.ahcp", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/ahcpd") then
+		return
+	end
+
+	entry({"admin", "network", "ahcpd"}, cbi("ahcp"), _("AHCP Server"), 90)
+	entry({"admin", "network", "ahcpd", "status"}, call("ahcp_status"))
+end
+
+function ahcp_status()
+	local nfs = require "nixio.fs"
+	local uci = require "luci.model.uci".cursor()
+	local lsd = uci:get_first("ahcpd", "ahcpd", "lease_dir") or "/var/lib/leases"
+	local idf = uci:get_first("ahcpd", "ahcpd", "id_file")   or "/var/lib/ahcpd-unique-id"
+
+	local rv = {
+		uid    = "00:00:00:00:00:00:00:00",
+		leases = { }
+	}
+
+	idf = nfs.readfile(idf)
+	if idf and #idf == 8 then
+		rv.uid = "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X" %{ idf:byte(1, 8) }
+	end
+
+	local itr = nfs.dir(lsd)
+	if itr then
+		local addr
+		for addr in itr do
+			if addr:match("^%d+%.%d+%.%d+%.%d+$") then
+				local s = nfs.stat(lsd .. "/" .. addr)
+				rv.leases[#rv.leases+1] = {
+					addr = addr,
+					age  = s and (os.time() - s.mtime) or 0
+				}
+			end
+		end
+	end
+
+	table.sort(rv.leases, function(a, b) return a.age < b.age end)
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+end
diff --git a/trunk/package/luci/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua b/trunk/package/luci/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
new file mode 100644
index 00000000..a48f8b4b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
@@ -0,0 +1,121 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: init.lua 5764 2010-03-08 19:05:34Z jow $
+]]--
+
+m = Map("ahcpd", translate("AHCP Server"), translate("AHCP is an autoconfiguration protocol " ..
+	"for IPv6 and dual-stack IPv6/IPv4 networks designed to be used in place of router " ..
+	"discovery or DHCP on networks where it is difficult or impossible to configure a " ..
+	"server within every link-layer broadcast domain, for example mobile ad-hoc networks."))
+
+
+m:section(SimpleSection).template = "ahcp_status"
+
+s = m:section(TypedSection, "ahcpd")
+s:tab("general", translate("General Setup"))
+s:tab("advanced", translate("Advanced Settings"))
+s.addremove = false
+s.anonymous = true
+
+
+mode = s:taboption("general", ListValue, "mode", translate("Operation mode"))
+mode:value("server", translate("Server"))
+mode:value("forwarder", translate("Forwarder"))
+
+net = s:taboption("general", Value, "interface", translate("Served interfaces"))
+net.template = "cbi/network_netlist"
+net.widget   = "checkbox"
+net.nocreate = true
+
+function net.cfgvalue(self, section)
+	return m.uci:get("ahcpd", section, "interface")
+end
+
+pfx = s:taboption("general", DynamicList, "prefix", translate("Announced prefixes"),
+	translate("Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"))
+pfx.optional  = true
+pfx.datatype  = "ipaddr"
+pfx:depends("mode", "server")
+
+nss = s:taboption("general", DynamicList, "name_server", translate("Announced DNS servers"),
+	translate("Specifies the announced IPv4 and IPv6 name servers"))
+nss.optional = true
+nss.datatype = "ipaddr"
+nss:depends("mode", "server")
+
+ntp = s:taboption("general", DynamicList, "ntp_server", translate("Announced NTP servers"),
+	translate("Specifies the announced IPv4 and IPv6 NTP servers"))
+ntp.optional = true
+ntp.datatype = "ipaddr"
+ntp:depends("mode", "server")
+
+mca = s:taboption("general", Value, "multicast_address", translate("Multicast address"))
+mca.optional    = true
+mca.placeholder = "ff02::cca6:c0f9:e182:5359"
+mca.datatype    = "ip6addr"
+
+port = s:taboption("general", Value, "port", translate("Port"))
+port.optional    = true
+port.placeholder = 5359
+port.datatype    = "port"
+
+fam = s:taboption("general", ListValue, "_family", translate("Protocol family"))
+fam:value("", translate("IPv4 and IPv6"))
+fam:value("ipv4", translate("IPv4 only"))
+fam:value("ipv6", translate("IPv6 only"))
+
+function fam.cfgvalue(self, section)
+	local v4 = m.uci:get_bool("ahcpd", section, "ipv4_only")
+	local v6 = m.uci:get_bool("ahcpd", section, "ipv6_only")
+	if v4 then
+		return "ipv4"
+	elseif v6 then
+		return "ipv6"
+	end
+	return ""
+end
+
+function fam.write(self, section, value)
+	if value == "ipv4" then
+		m.uci:set("ahcpd", section, "ipv4_only", "true")
+		m.uci:delete("ahcpd", section, "ipv6_only")
+	elseif value == "ipv6" then
+		m.uci:set("ahcpd", section, "ipv6_only", "true")
+		m.uci:delete("ahcpd", section, "ipv4_only")
+	end
+end
+
+function fam.remove(self, section)
+	m.uci:delete("ahcpd", section, "ipv4_only")
+	m.uci:delete("ahcpd", section, "ipv6_only")
+end
+
+ltime = s:taboption("general", Value, "lease_time", translate("Lease validity time"))
+ltime.optional    = true
+ltime.placeholder = 3666
+ltime.datatype    = "uinteger"
+
+
+ld = s:taboption("advanced", Value, "lease_dir", translate("Lease directory"))
+ld.datatype    = "directory"
+ld.placeholder = "/var/lib/leases"
+
+id = s:taboption("advanced", Value, "id_file", translate("Unique ID file"))
+--id.datatype    = "file"
+id.placeholder = "/var/lib/ahcpd-unique-id"
+
+log = s:taboption("advanced", Value, "log_file", translate("Log file"))
+--log.datatype    = "file"
+log.placeholder = "/var/log/ahcpd.log"
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-ahcp/luasrc/view/admin_status/index/ahcp.htm b/trunk/package/luci/applications/luci-ahcp/luasrc/view/admin_status/index/ahcp.htm
new file mode 100644
index 00000000..ef4cfca5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ahcp/luasrc/view/admin_status/index/ahcp.htm
@@ -0,0 +1 @@
+<%+ahcp_status%>
diff --git a/trunk/package/luci/applications/luci-ahcp/luasrc/view/ahcp_status.htm b/trunk/package/luci/applications/luci-ahcp/luasrc/view/ahcp_status.htm
new file mode 100644
index 00000000..88796cb1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ahcp/luasrc/view/ahcp_status.htm
@@ -0,0 +1,53 @@
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "ahcpd", "status")%>', null,
+		function(x, st)
+		{
+			var tb = document.getElementById('ahcpd_status_table');
+			var tx = document.getElementById('ahcpd_status_text');
+			if (st && tb && tx)
+			{
+				/* clear all rows */
+				while( tb.rows.length > 1 )
+					tb.deleteRow(1);
+
+				for( var i = 0; i < st.leases.length; i++ )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+					tr.insertCell(-1).innerHTML = st.leases[i].addr;
+					tr.insertCell(-1).innerHTML = String.format('%t', st.leases[i].age);
+				}
+
+				if( tb.rows.length == 1 )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 2;
+						td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+				}
+
+				if( st.uid == '00:00:00:00:00:00:00:00' )
+					tx.innerHTML = '<%:The AHCP Service is not running.%>';
+				else
+					tx.innerHTML = String.format('<%:The AHCP Service is running with ID %s.%>', st.uid);
+			}
+		}
+	);
+//]]></script>
+
+<fieldset class="cbi-section">
+	<legend><%:Active AHCP Leases%></legend>
+	<p id="ahcpd_status_text"></p>
+	<table class="cbi-section-table" id="ahcpd_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Address%></th>
+			<th class="cbi-section-table-cell"><%:Age%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="5"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
diff --git a/trunk/package/luci/applications/luci-ahcp/root/etc/uci-defaults/luci-ahcp b/trunk/package/luci/applications/luci-ahcp/root/etc/uci-defaults/luci-ahcp
new file mode 100755
index 00000000..f2b2487c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ahcp/root/etc/uci-defaults/luci-ahcp
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@ahcpd[-1]
+	add ucitrack ahcpd
+	set ucitrack.@ahcpd[-1].init=ahcpd
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-asterisk/Makefile b/trunk/package/luci/applications/luci-asterisk/Makefile
new file mode 100644
index 00000000..1b8cf53c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/Makefile
@@ -0,0 +1,4 @@
+PO = asterisk
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-asterisk/ipkg/postinst b/trunk/package/luci/applications/luci-asterisk/ipkg/postinst
new file mode 100755
index 00000000..a4fae6df
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-asterisk ) && rm -f /etc/uci-defaults/luci-asterisk
+	/etc/init.d/asterisk enabled || /etc/init.d/asterisk enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/asterisk.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/asterisk.lua
new file mode 100644
index 00000000..af682b65
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/asterisk.lua
@@ -0,0 +1,759 @@
+--[[
+LuCI - Lua Configuration Interface
+Asterisk PBX interface library
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.asterisk", package.seeall)
+require("luci.asterisk.cc_idd")
+
+local _io  = require("io")
+local uci  = require("luci.model.uci").cursor()
+local sys  = require("luci.sys")
+local util = require("luci.util")
+
+AST_BIN   = "/usr/sbin/asterisk"
+AST_FLAGS = "-r -x"
+
+
+--- LuCI Asterisk - Resync uci context
+function uci_resync()
+	uci = luci.model.uci.cursor()
+end
+
+--- LuCI Asterisk io interface
+-- Handles low level io.
+-- @type	module
+io = luci.util.class()
+
+--- Execute command and return output
+-- @param command	String containing the command to execute
+-- @return			String containing the command output
+function io.exec(command)
+	local fh = _io.popen( "%s %s %q" %{ AST_BIN, AST_FLAGS, command }, "r" )
+	assert(fh, "Failed to invoke asterisk")
+
+	local buffer = fh:read("*a")
+	fh:close()
+	return buffer
+end
+
+--- Execute command and invoke given callback for each readed line
+-- @param command	String containing the command to execute
+-- @param callback	Function to call back for each line
+-- @return			Always true
+function io.execl(command, callback)
+	local ln
+	local fh = _io.popen( "%s %s %q" %{ AST_BIN, AST_FLAGS, command }, "r" )
+	assert(fh, "Failed to invoke asterisk")
+
+	repeat
+		ln = fh:read("*l")
+		callback(ln)
+	until not ln
+
+	fh:close()
+	return true
+end
+
+--- Execute command and return an iterator that returns one line per invokation
+-- @param command	String containing the command to execute
+-- @return			Iterator function
+function io.execi(command)
+	local fh = _io.popen( "%s %s %q" %{ AST_BIN, AST_FLAGS, command }, "r" )
+	assert(fh, "Failed to invoke asterisk")
+
+	return function()
+		local ln = fh:read("*l")
+		if not ln then fh:close() end
+		return ln
+	end
+end
+
+
+--- LuCI Asterisk - core status
+core = luci.util.class()
+
+--- Retrive version string.
+-- @return	String containing the reported asterisk version
+function core.version(self)
+	local version = io.exec("core show version")
+	return version:gsub(" *\n", "")
+end
+
+
+--- LuCI Asterisk - SIP information.
+-- @type module
+sip = luci.util.class()
+
+--- Get a list of known SIP peers
+-- @return		Table containing each SIP peer
+function sip.peers(self)
+	local head  = false
+	local peers = { }
+
+	for line in io.execi("sip show peers") do
+		if not head then
+			head = true
+		elseif not line:match(" sip peers ") then
+			local online, delay, id, uid
+			local name, host, dyn, nat, acl, port, status =
+				line:match("(.-) +(.-) +([D ])   ([N ])   (.)  (%d+) +(.+)")
+
+			if host == '(Unspecified)' then host = nil end
+			if port == '0' then port = nil else port = tonumber(port) end
+
+			dyn = ( dyn == 'D' and true or false )
+			nat = ( nat == 'N' and true or false )
+			acl = ( acl ~= ' ' and true or false )
+
+			online, delay = status:match("(OK) %((%d+) ms%)")
+
+			if online == 'OK' then
+				online = true
+				delay  = tonumber(delay)
+			elseif status ~= 'Unmonitored' then
+				online = false
+				delay  = 0
+			else
+				online = nil
+				delay  = 0
+			end
+
+			id, uid = name:match("(.+)/(.+)")
+
+			if not ( id and uid ) then
+				id  = name .. "..."
+				uid = nil
+			end
+
+			peers[#peers+1] = {
+				online  = online,
+				delay   = delay,
+				name    = id,
+				user    = uid,
+				dynamic = dyn,
+				nat     = nat,
+				acl     = acl,
+				host    = host,
+				port    = port
+			}
+		end
+	end
+
+	return peers
+end
+
+--- Get informations of given SIP peer
+-- @param peer	String containing the name of the SIP peer
+function sip.peer(peer)
+	local info = { }
+	local keys = { }
+
+	for line in io.execi("sip show peer " .. peer) do
+		if #line > 0 then
+			local key, val = line:match("(.-) *: +(.*)")
+			if key and val then
+
+				key = key:gsub("^ +",""):gsub(" +$", "")
+				val = val:gsub("^ +",""):gsub(" +$", "")
+
+				if key == "* Name" then
+					key = "Name"
+				elseif key == "Addr->IP" then
+					info.address, info.port = val:match("(.+) Port (.+)")
+					info.port = tonumber(info.port)
+				elseif key == "Status" then
+					info.online, info.delay = val:match("(OK) %((%d+) ms%)")
+					if info.online == 'OK' then
+						info.online = true
+						info.delay  = tonumber(info.delay)
+					elseif status ~= 'Unmonitored' then
+						info.online = false
+						info.delay  = 0
+					else
+						info.online = nil
+						info.delay  = 0
+					end
+				end
+
+				if val == 'Yes' or val == 'yes' or val == '<Set>' then
+					val = true
+				elseif val == 'No' or val == 'no' then
+					val = false
+				elseif val == '<Not set>' or val == '(none)' then
+					val = nil
+				end
+
+				keys[#keys+1] = key
+				info[key] = val
+			end
+		end
+	end
+
+	return info, keys
+end
+
+
+--- LuCI Asterisk - Internal helpers
+-- @type module
+tools = luci.util.class()
+
+--- Convert given value to a list of tokens. Split by white space.
+-- @param val	String or table value
+-- @return		Table containing tokens
+function tools.parse_list(v)
+	local tokens = { }
+
+	v = type(v) == "table" and v or { v }
+	for _, v in ipairs(v) do
+		if type(v) == "string" then
+			for v in v:gmatch("(%S+)") do
+				tokens[#tokens+1] = v
+			end
+		end
+	end
+
+	return tokens
+end
+
+--- Convert given list to a collection of hyperlinks
+-- @param list	Table of tokens
+-- @param url	String pattern or callback function to construct urls (optional)
+-- @param sep	String containing the seperator (optional, default is ", ")
+-- @return		String containing the html fragment
+function tools.hyperlinks(list, url, sep)
+	local html
+
+	local function mkurl(p, t)
+		if type(p) == "string" then
+			return p:format(t)
+		elseif type(p) == "function" then
+			return p(t)
+		else
+			return '#'
+		end
+	end
+
+	list = list or { }
+	url  = url  or "%s"
+	sep  = sep  or ", "
+
+	for _, token in ipairs(list) do
+		html = ( html and html .. sep or '' ) ..
+			'<a href="%s">%s</a>' %{ mkurl(url, token), token }
+	end
+
+	return html or ''
+end
+
+
+--- LuCI Asterisk - International Direct Dialing Prefixes
+-- @type module
+idd = luci.util.class()
+
+--- Lookup the country name for the given IDD code.
+-- @param country	String containing IDD code
+-- @return			String containing the country name
+function idd.country(c)
+	for _, v in ipairs(cc_idd.CC_IDD) do
+		if type(v[3]) == "table" then
+			for _, v2 in ipairs(v[3]) do
+				if v2 == tostring(c) then
+					return v[1]
+				end
+			end
+		elseif v[3] == tostring(c) then
+			return v[1]
+		end
+	end
+end
+
+--- Lookup the country code for the given IDD code.
+-- @param country	String containing IDD code
+-- @return			Table containing the country code(s)
+function idd.cc(c)
+	for _, v in ipairs(cc_idd.CC_IDD) do
+		if type(v[3]) == "table" then
+			for _, v2 in ipairs(v[3]) do
+				if v2 == tostring(c) then
+					return type(v[2]) == "table"
+						and v[2] or { v[2] }
+				end
+			end
+		elseif v[3] == tostring(c) then
+			return type(v[2]) == "table"
+				and v[2] or { v[2] }
+		end
+	end
+end
+
+--- Lookup the IDD code(s) for the given country.
+-- @param idd		String containing the country name
+-- @return			Table containing the IDD code(s)
+function idd.idd(c)
+	for _, v in ipairs(cc_idd.CC_IDD) do
+		if v[1]:lower():match(c:lower()) then
+			return type(v[3]) == "table"
+				and v[3] or { v[3] }
+		end
+	end
+end
+
+--- Populate given CBI field with IDD codes.
+-- @param field		CBI option object
+-- @return			(nothing)
+function idd.cbifill(o)
+	for i, v in ipairs(cc_idd.CC_IDD) do
+		o:value("_%i" % i, util.pcdata(v[1]))
+	end
+
+	o.formvalue = function(...)
+		local val = luci.cbi.Value.formvalue(...)
+		if val:sub(1,1) == "_" then
+			val = tonumber((val:gsub("^_", "")))
+			if val then
+				return type(cc_idd.CC_IDD[val][3]) == "table"
+					and cc_idd.CC_IDD[val][3] or { cc_idd.CC_IDD[val][3] }
+			end
+		end
+		return val
+	end
+
+	o.cfgvalue = function(...)
+		local val = luci.cbi.Value.cfgvalue(...)
+		if val then
+			val = tools.parse_list(val)
+			for i, v in ipairs(cc_idd.CC_IDD) do
+				if type(v[3]) == "table" then
+					if v[3][1] == val[1] then
+						return "_%i" % i
+					end
+				else
+					if v[3] == val[1] then
+						return "_%i" % i
+					end
+				end
+			end
+		end
+		return val
+	end
+end
+
+
+--- LuCI Asterisk - Country Code Prefixes
+-- @type module
+cc = luci.util.class()
+
+--- Lookup the country name for the given CC code.
+-- @param country	String containing CC code
+-- @return			String containing the country name
+function cc.country(c)
+	for _, v in ipairs(cc_idd.CC_IDD) do
+		if type(v[2]) == "table" then
+			for _, v2 in ipairs(v[2]) do
+				if v2 == tostring(c) then
+					return v[1]
+				end
+			end
+		elseif v[2] == tostring(c) then
+			return v[1]
+		end
+	end
+end
+
+--- Lookup the international dialing code for the given CC code.
+-- @param cc		String containing CC code
+-- @return			String containing IDD code
+function cc.idd(c)
+	for _, v in ipairs(cc_idd.CC_IDD) do
+		if type(v[2]) == "table" then
+			for _, v2 in ipairs(v[2]) do
+				if v2 == tostring(c) then
+					return type(v[3]) == "table"
+						and v[3] or { v[3] }
+				end
+			end
+		elseif v[2] == tostring(c) then
+			return type(v[3]) == "table"
+				and v[3] or { v[3] }
+		end
+	end
+end
+
+--- Lookup the CC code(s) for the given country.
+-- @param country	String containing the country name
+-- @return			Table containing the CC code(s)
+function cc.cc(c)
+	for _, v in ipairs(cc_idd.CC_IDD) do
+		if v[1]:lower():match(c:lower()) then
+			return type(v[2]) == "table"
+				and v[2] or { v[2] }
+		end
+	end
+end
+
+--- Populate given CBI field with CC codes.
+-- @param field		CBI option object
+-- @return			(nothing)
+function cc.cbifill(o)
+	for i, v in ipairs(cc_idd.CC_IDD) do
+		o:value("_%i" % i, util.pcdata(v[1]))
+	end
+
+	o.formvalue = function(...)
+		local val = luci.cbi.Value.formvalue(...)
+		if val:sub(1,1) == "_" then
+			val = tonumber((val:gsub("^_", "")))
+			if val then
+				return type(cc_idd.CC_IDD[val][2]) == "table"
+					and cc_idd.CC_IDD[val][2] or { cc_idd.CC_IDD[val][2] }
+			end
+		end
+		return val
+	end
+
+	o.cfgvalue = function(...)
+		local val = luci.cbi.Value.cfgvalue(...)
+		if val then
+			val = tools.parse_list(val)
+			for i, v in ipairs(cc_idd.CC_IDD) do
+				if type(v[2]) == "table" then
+					if v[2][1] == val[1] then
+						return "_%i" % i
+					end
+				else
+					if v[2] == val[1] then
+						return "_%i" % i
+					end
+				end
+			end
+		end
+		return val
+	end
+end
+
+
+--- LuCI Asterisk - Dialzone
+-- @type	module
+dialzone = luci.util.class()
+
+--- Parse a dialzone section
+-- @param zone	Table containing the zone info
+-- @return		Table with parsed information
+function dialzone.parse(z)
+	if z['.name'] then
+		return {
+			trunks		= tools.parse_list(z.uses),
+			name    	= z['.name'],
+			description	= z.description or z['.name'],
+			addprefix	= z.addprefix,
+			matches		= tools.parse_list(z.match),
+			intlmatches	= tools.parse_list(z.international),
+			countrycode	= z.countrycode,
+			localzone	= z.localzone,
+			localprefix	= z.localprefix
+		}
+	end
+end
+
+--- Get a list of known dial zones
+-- @return		Associative table of zones and table of zone names
+function dialzone.zones()
+	local zones  = { }
+	local znames = { }
+	uci:foreach("asterisk", "dialzone",
+		function(z)
+			zones[z['.name']] = dialzone.parse(z)
+			znames[#znames+1] = z['.name']
+		end)
+	return zones, znames
+end
+
+--- Get a specific dial zone
+-- @param name	Name of the dial zone
+-- @return		Table containing zone information
+function dialzone.zone(n)
+	local zone
+	uci:foreach("asterisk", "dialzone",
+		function(z)
+			if z['.name'] == n then
+				zone = dialzone.parse(z)
+			end
+		end)
+	return zone
+end
+
+--- Find uci section hash for given zone number
+-- @param idx	Zone number
+-- @return		String containing the uci hash pointing to the section
+function dialzone.ucisection(i)
+	local hash
+	local index = 1
+	i = tonumber(i)
+	uci:foreach("asterisk", "dialzone",
+		function(z)
+			if not hash and index == i then
+				hash = z['.name']
+			end
+			index = index + 1
+		end)
+	return hash
+end
+
+
+--- LuCI Asterisk - Voicemailbox
+-- @type	module
+voicemail = luci.util.class()
+
+--- Parse a voicemail section
+-- @param zone	Table containing the mailbox info
+-- @return		Table with parsed information
+function voicemail.parse(z)
+	if z.number and #z.number > 0 then
+		local v = {
+			id			= '%s@%s' %{ z.number, z.context or 'default' },
+			number		= z.number,
+			context		= z.context 	or 'default',
+			name		= z.name		or z['.name'] or 'libreCMC',
+			zone		= z.zone		or 'homeloc',
+			password	= z.password	or '0000',
+			email		= z.email		or '',
+			page		= z.page		or '',
+			dialplans	= { }
+		}
+
+		uci:foreach("asterisk", "dialplanvoice",
+			function(s)
+				if s.dialplan and #s.dialplan > 0 and
+				   s.voicebox == v.number
+				then
+					v.dialplans[#v.dialplans+1] = s.dialplan
+				end
+			end)
+
+		return v
+	end
+end
+
+--- Get a list of known voicemail boxes
+-- @return		Associative table of boxes and table of box numbers
+function voicemail.boxes()
+	local vboxes = { }
+	local vnames = { }
+	uci:foreach("asterisk", "voicemail",
+		function(z)
+			local v = voicemail.parse(z)
+			if v then
+				local n = '%s@%s' %{ v.number, v.context }
+				vboxes[n]  = v
+				vnames[#vnames+1] = n
+			end
+		end)
+	return vboxes, vnames
+end
+
+--- Get a specific voicemailbox
+-- @param number	Number of the voicemailbox
+-- @return			Table containing mailbox information
+function voicemail.box(n)
+	local box
+	n = n:gsub("@.+$","")
+	uci:foreach("asterisk", "voicemail",
+		function(z)
+			if z.number == tostring(n) then
+				box = voicemail.parse(z)
+			end
+		end)
+	return box
+end
+
+--- Find all voicemailboxes within the given dialplan
+-- @param plan	Dialplan name or table
+-- @return		Associative table containing extensions mapped to mailbox info
+function voicemail.in_dialplan(p)
+	local plan  = type(p) == "string" and p or p.name
+	local boxes = { }
+	uci:foreach("asterisk", "dialplanvoice",
+		function(s)
+			if s.extension and #s.extension > 0 and s.dialplan == plan then
+				local box = voicemail.box(s.voicebox)
+				if box then
+					boxes[s.extension] = box
+				end
+			end
+		end)
+	return boxes
+end
+
+--- Remove voicemailbox and associated extensions from config
+-- @param box	Voicemailbox number or table
+-- @param ctx	UCI context to use (optional)
+-- @return		Boolean indicating success
+function voicemail.remove(v, ctx)
+	ctx = ctx or uci
+	local box = type(v) == "string" and v or v.number
+	local ok1 = ctx:delete_all("asterisk", "voicemail", {number=box})
+	local ok2 = ctx:delete_all("asterisk", "dialplanvoice", {voicebox=box})
+	return ( ok1 or ok2 ) and true or false
+end
+
+
+--- LuCI Asterisk - MeetMe Conferences
+-- @type	module
+meetme = luci.util.class()
+
+--- Parse a meetme section
+-- @param room	Table containing the room info
+-- @return		Table with parsed information
+function meetme.parse(r)
+	if r.room and #r.room > 0 then
+		local v = {
+			room		= r.room,
+			pin			= r.pin 			or '',
+			adminpin	= r.adminpin		or '',
+			description = r._description	or '',
+			dialplans	= { }
+		}
+
+		uci:foreach("asterisk", "dialplanmeetme",
+			function(s)
+				if s.dialplan and #s.dialplan > 0 and s.room == v.room then
+					v.dialplans[#v.dialplans+1] = s.dialplan
+				end
+			end)
+
+		return v
+	end
+end
+
+--- Get a list of known meetme rooms
+-- @return		Associative table of rooms and table of room numbers
+function meetme.rooms()
+	local mrooms = { }
+	local mnames = { }
+	uci:foreach("asterisk", "meetme",
+		function(r)
+			local v = meetme.parse(r)
+			if v then
+				mrooms[v.room] = v
+				mnames[#mnames+1] = v.room
+			end
+		end)
+	return mrooms, mnames
+end
+
+--- Get a specific meetme room
+-- @param number	Number of the room
+-- @return			Table containing room information
+function meetme.room(n)
+	local room
+	uci:foreach("asterisk", "meetme",
+		function(r)
+			if r.room == tostring(n) then
+				room = meetme.parse(r)
+			end
+		end)
+	return room
+end
+
+--- Find all meetme rooms within the given dialplan
+-- @param plan	Dialplan name or table
+-- @return		Associative table containing extensions mapped to room info
+function meetme.in_dialplan(p)
+	local plan  = type(p) == "string" and p or p.name
+	local rooms = { }
+	uci:foreach("asterisk", "dialplanmeetme",
+		function(s)
+			if s.extension and #s.extension > 0 and s.dialplan == plan then
+				local room = meetme.room(s.room)
+				if room then
+					rooms[s.extension] = room
+				end
+			end
+		end)
+	return rooms
+end
+
+--- Remove meetme room and associated extensions from config
+-- @param room	Voicemailbox number or table
+-- @param ctx	UCI context to use (optional)
+-- @return		Boolean indicating success
+function meetme.remove(v, ctx)
+	ctx = ctx or uci
+	local room = type(v) == "string" and v or v.number
+	local ok1  = ctx:delete_all("asterisk", "meetme", {room=room})
+	local ok2  = ctx:delete_all("asterisk", "dialplanmeetme", {room=room})
+	return ( ok1 or ok2 ) and true or false
+end
+
+
+--- LuCI Asterisk - Dialplan
+-- @type	module
+dialplan = luci.util.class()
+
+--- Parse a dialplan section
+-- @param plan	Table containing the plan info
+-- @return		Table with parsed information
+function dialplan.parse(z)
+	if z['.name'] then
+		local plan = {
+			zones		= { },
+			name    	= z['.name'],
+			description	= z.description or z['.name']
+		}
+
+		-- dialzones
+		for _, name in ipairs(tools.parse_list(z.include)) do
+			local zone = dialzone.zone(name)
+			if zone then
+				plan.zones[#plan.zones+1] = zone
+			end
+		end
+
+		-- voicemailboxes
+		plan.voicemailboxes = voicemail.in_dialplan(plan)
+
+		-- meetme conferences
+		plan.meetmerooms = meetme.in_dialplan(plan)
+
+		return plan
+	end
+end
+
+--- Get a list of known dial plans
+-- @return		Associative table of plans and table of plan names
+function dialplan.plans()
+	local plans  = { }
+	local pnames = { }
+	uci:foreach("asterisk", "dialplan",
+		function(p)
+			plans[p['.name']] = dialplan.parse(p)
+			pnames[#pnames+1] = p['.name']
+		end)
+	return plans, pnames
+end
+
+--- Get a specific dial plan
+-- @param name	Name of the dial plan
+-- @return		Table containing plan information
+function dialplan.plan(n)
+	local plan
+	uci:foreach("asterisk", "dialplan",
+		function(p)
+			if p['.name'] == n then
+				plan = dialplan.parse(p)
+			end
+		end)
+	return plan
+end
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/asterisk/cc_idd.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/asterisk/cc_idd.lua
new file mode 100644
index 00000000..b209b113
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/asterisk/cc_idd.lua
@@ -0,0 +1,254 @@
+--[[
+LuCI - Asterisk - International Direct Dialing Prefixes and Country Codes
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module "luci.asterisk.cc_idd"
+
+CC_IDD = {
+--	Country, CC, IDD
+	{ "Afghanistan", "93", "00" },
+	{ "Albania", "355", "00" },
+	{ "Algeria", "213", "00" },
+	{ "American Samoa", "684", "00" },
+	{ "Andorra", "376", "00" },
+	{ "Angola", "244", "00" },
+	{ "Anguilla", "264", "011" },
+	{ "Antarctica", "672", "" },
+	{ "Antigua", "268", "011" },
+	{ "Argentina", "54", "00" },
+	{ "Armenia", "374", "00" },
+	{ "Aruba", "297", "00" },
+	{ "Ascension Island", "247", "00" },
+	{ "Australia", "61", "0011" },
+	{ "Austria", "43", "00" },
+	{ "Azberbaijan", "994", "00" },
+	{ "Bahamas", "242", "011" },
+	{ "Bahrain", "973", "00" },
+	{ "Bangladesh", "880", "00" },
+	{ "Barbados", "246", "011" },
+	{ "Barbuda", "268", "011" },
+	{ "Belarus", "375", "810" },
+	{ "Belgium", "32", "00" },
+	{ "Belize", "501", "00" },
+	{ "Benin", "229", "00" },
+	{ "Bermuda", "441", "011" },
+	{ "Bhutan", "975", "00" },
+	{ "Bolivia", "591", "00" },
+	{ "Bosnia", "387", "00" },
+	{ "Botswana", "267", "00" },
+	{ "Brazil", "55", "00" },
+	{ "British Virgin Islands", "284", "011" },
+	{ "Brunei", "673", "00" },
+	{ "Bulgaria", "359", "00" },
+	{ "Burkina Faso", "226", "00" },
+	{ "Burma (Myanmar)", "95", "00" },
+	{ "Burundi", "257", "00" },
+	{ "Cambodia", "855", "001" },
+	{ "Cameroon", "237", "00" },
+	{ "Canada", "1", "011" },
+	{ "Cape Verde Islands", "238", "0" },
+	{ "Cayman Islands", "345", "011" },
+	{ "Central African Rep.", "236", "00" },
+	{ "Chad", "235", "15" },
+	{ "Chile", "56", "00" },
+	{ "China", "86", "00" },
+	{ "Christmas Island", "61", "0011" },
+	{ "Cocos Islands", "61", "0011" },
+	{ "Colombia", "57", "00" },
+	{ "Comoros", "269", "00" },
+	{ "Congo", "242", "00" },
+	{ "Congo, Dem. Rep. of", "243", "00" },
+	{ "Cook Islands", "682", "00" },
+	{ "Costa Rica", "506", "00" },
+	{ "Croatia", "385", "00" },
+	{ "Cuba", "53", "119" },
+	{ "Cyprus", "357", "00" },
+	{ "Czech Republic", "420", "00" },
+	{ "Denmark", "45", "00" },
+	{ "Diego Garcia", "246", "00" },
+	{ "Djibouti", "253", "00" },
+	{ "Dominica", "767", "011" },
+	{ "Dominican Rep.", "809", "011" },
+	{ "Ecuador", "593", "00" },
+	{ "Egypt", "20", "00" },
+	{ "El Salvador", "503", "00" },
+	{ "Equatorial Guinea", "240", "00" },
+	{ "Eritrea", "291", "00" },
+	{ "Estonia", "372", "00" },
+	{ "Ethiopia", "251", "00" },
+	{ "Faeroe Islands", "298", "00" },
+	{ "Falkland Islands", "500", "00" },
+	{ "Fiji Islands", "679", "00" },
+	{ "Finland", "358", "00" },
+	{ "France", "33", "00" },
+	{ "French Antilles", "596", "00" },
+	{ "French Guiana", "594", "00" },
+	{ "French Polynesia", "689", "00" },
+	{ "Gabon", "241", "00" },
+	{ "Gambia", "220", "00" },
+	{ "Georgia", "995", "810" },
+	{ "Germany", "49", "00" },
+	{ "Ghana", "233", "00" },
+	{ "Gibraltar", "350", "00" },
+	{ "Greece", "30", "00" },
+	{ "Greenland", "299", "00" },
+	{ "Grenada", "473", "011" },
+	{ "Guadeloupe", "590", "00" },
+	{ "Guam", "671", "011" },
+	{ "Guantanamo Bay", "5399", "00" },
+	{ "Guatemala", "502", "00" },
+	{ "Guinea", "224", "00" },
+	{ "Guinea Bissau", "245", "00" },
+	{ "Guyana", "592", "001" },
+	{ "Haiti", "509", "00" },
+	{ "Honduras", "504", "00" },
+	{ "Hong Kong", "852", "001" },
+	{ "Hungary", "36", "00" },
+	{ "Iceland", "354", "00" },
+	{ "India", "91", "00" },
+	{ "Indonesia", "62", { "001", "008" } },
+	{ "Iran", "98", "00" },
+	{ "Iraq", "964", "00" },
+	{ "Ireland", "353", "00" },
+	{ "Israel", "972", "00" },
+	{ "Italy", "39", "00" },
+	{ "Ivory Coast", "225", "00" },
+	{ "Jamaica", "876", "011" },
+	{ "Japan", "81", "001" },
+	{ "Jordan", "962", "00" },
+	{ "Kazakhstan", "7", "810" },
+	{ "Kenya", "254", "000" },
+	{ "Kiribati", "686", "00" },
+	{ "Korea, North", "850", "00" },
+	{ "Korea, South", "82", "001" },
+	{ "Kuwait", "965", "00" },
+	{ "Kyrgyzstan", "996", "00" },
+	{ "Laos", "856", "00" },
+	{ "Latvia", "371", "00" },
+	{ "Lebanon", "961", "00" },
+	{ "Lesotho", "266", "00" },
+	{ "Liberia", "231", "00" },
+	{ "Libya", "218", "00" },
+	{ "Liechtenstein", "423", "00" },
+	{ "Lithuania", "370", "00" },
+	{ "Luxembourg", "352", "00" },
+	{ "Macau", "853", "00" },
+	{ "Macedonia", "389", "00" },
+	{ "Madagascar", "261", "00" },
+	{ "Malawi", "265", "00" },
+	{ "Malaysia", "60", "00" },
+	{ "Maldives", "960", "00" },
+	{ "Mali", "223", "00" },
+	{ "Malta", "356", "00" },
+	{ "Mariana Islands", "670", "011" },
+	{ "Marshall Islands", "692", "011" },
+	{ "Martinique", "596", "00" },
+	{ "Mauritania", "222", "00" },
+	{ "Mauritius", "230", "00" },
+	{ "Mayotte Islands", "269", "00" },
+	{ "Mexico", "52", "00" },
+	{ "Micronesia", "691", "011" },
+	{ "Midway Island", "808", "011" },
+	{ "Moldova", "373", "00" },
+	{ "Monaco", "377", "00" },
+	{ "Mongolia", "976", "001" },
+	{ "Montserrat", "664", "011" },
+	{ "Morocco", "212", "00" },
+	{ "Mozambique", "258", "00" },
+	{ "Myanmar (Burma)", "95", "00" },
+	{ "Namibia", "264", "00" },
+	{ "Nauru", "674", "00" },
+	{ "Nepal", "977", "00" },
+	{ "Netherlands", "31", "00" },
+	{ "Netherlands Antilles", "599", "00" },
+	{ "Nevis", "869", "011" },
+	{ "New Caledonia", "687", "00" },
+	{ "New Zealand", "64", "00" },
+	{ "Nicaragua", "505", "00" },
+	{ "Niger", "227", "00" },
+	{ "Nigeria", "234", "009" },
+	{ "Niue", "683", "00" },
+	{ "Norfolk Island", "672", "00" },
+	{ "Norway", "47", "00" },
+	{ "Oman", "968", "00" },
+	{ "Pakistan", "92", "00" },
+	{ "Palau", "680", "011" },
+	{ "Palestine", "970", "00" },
+	{ "Panama", "507", "00" },
+	{ "Papua New Guinea", "675", "05" },
+	{ "Paraguay", "595", "002" },
+	{ "Peru", "51", "00" },
+	{ "Philippines", "63", "00" },
+	{ "Poland", "48", "00" },
+	{ "Portugal", "351", "00" },
+	{ "Puerto Rico", { "787", "939" }, "011" },
+	{ "Qatar", "974", "00" },
+	{ "Reunion Island", "262", "00" },
+	{ "Romania", "40", "00" },
+	{ "Russia", "7", "810" },
+	{ "Rwanda", "250", "00" },
+	{ "St. Helena", "290", "00" },
+	{ "St. Kitts", "869", "011" },
+	{ "St. Lucia", "758", "011" },
+	{ "St. Perre & Miquelon", "508", "00" },
+	{ "St. Vincent", "784", "011" },
+	{ "San Marino", "378", "00" },
+	{ "Sao Tome & Principe", "239", "00" },
+	{ "Saudi Arabia", "966", "00" },
+	{ "Senegal", "221", "00" },
+	{ "Serbia", "381", "99" },
+	{ "Seychelles", "248", "00" },
+	{ "Sierra Leone", "232", "00" },
+	{ "Singapore", "65", "001" },
+	{ "Slovakia", "421", "00" },
+	{ "Slovenia", "386", "00" },
+	{ "Solomon Islands", "677", "00" },
+	{ "Somalia", "252", "00" },
+	{ "South Africa", "27", "09" },
+	{ "Spain", "34", "00" },
+	{ "Sri Lanka", "94", "00" },
+	{ "Sudan", "249", "00" },
+	{ "Suriname", "597", "00" },
+	{ "Swaziland", "268", "00" },
+	{ "Sweden", "46", "00" },
+	{ "Switzerland", "41", "00" },
+	{ "Syria", "963", "00" },
+	{ "Taiwan", "886", "002" },
+	{ "Tajikistan", "992", "810" },
+	{ "Tanzania", "255", "00" },
+	{ "Thailand", "66", "001" },
+	{ "Togo", "228", "00" },
+	{ "Tonga", "676", "00" },
+	{ "Trinidad & Tobago", "868", "011" },
+	{ "Tunisia", "216", "00" },
+	{ "Turkey", "90", "00" },
+	{ "Turkmenistan", "993", "810" },
+	{ "Turks & Caicos", "649", "011" },
+	{ "Tuvalu", "688", "00" },
+	{ "Uganda", "256", "000" },
+	{ "Ukraine", "380", "810" },
+	{ "United Arab Emirates", "971", "00" },
+	{ "United Kingdom", "44", "00" },
+	{ "Uruguay", "598", "00" },
+	{ "USA", "1", "011" },
+	{ "US Virgin Islands", "340", "011" },
+	{ "Uzbekistan", "998", "810" },
+	{ "Vanuatu", "678", "00" },
+	{ "Vatican City", "39", "00" },
+	{ "Venezuela", "58", "00" },
+	{ "Vietnam", "84", "00" },
+	{ "Wake Island", "808", "00" },
+	{ "Wallis & Futuna", "681", "19" },
+	{ "Western Samoa", "685", "00" },
+	{ "Yemen", "967", "00" },
+	{ "Yugoslavia", "381", "99" },
+	{ "Zambia", "260", "00" },
+	{ "Zimbabwe", "263", "00" }
+}
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/controller/asterisk.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/controller/asterisk.lua
new file mode 100644
index 00000000..54b9525e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/controller/asterisk.lua
@@ -0,0 +1,205 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.asterisk", package.seeall)
+
+function index()
+
+	entry({"admin", "services", "asterisk"}, 				  cbi("asterisk"), 			  "Asterisk",				80)
+
+	entry({"admin", "services", "asterisk", "voice"},         cbi("asterisk-voice"),      "Voice Functions",        1)
+	entry({"admin", "services", "asterisk", "meetme"},        cbi("asterisk-meetme"),     "Meetme Conferences",     2)
+
+	entry({"admin", "services", "asterisk", "iax-conns"},     cbi("asterisk-iax-connections"), "IAX Connections",   3)
+	entry({"admin", "services", "asterisk", "sip-conns"},     cbi("asterisk-sip-connections"), "SIP Connections", 	4)
+
+	entry({"admin", "services", "asterisk", "dialplans"},     cbi("asterisk-dialplans"),  "Dial Plans", 			5)
+
+	entry({"admin", "services", "asterisk", "mod"},           cbi("asterisk-mod-app"),    "Modules", 				4)
+	entry({"admin", "services", "asterisk", "mod", "app"},    cbi("asterisk-mod-app"),    "Applications", 			1)
+	entry({"admin", "services", "asterisk", "mod", "cdr"},    cbi("asterisk-mod-cdr"),    "Call Detail Records", 	2)
+	entry({"admin", "services", "asterisk", "mod", "chan"},   cbi("asterisk-mod-chan"),   "Channels", 				3)
+	entry({"admin", "services", "asterisk", "mod", "codec"},  cbi("asterisk-mod-codec"),  "Codecs", 				4)
+	entry({"admin", "services", "asterisk", "mod", "format"}, cbi("asterisk-mod-format"), "Format",					5)
+	entry({"admin", "services", "asterisk", "mod", "func"},   cbi("asterisk-mod-func"),   "Functions", 				6)
+	entry({"admin", "services", "asterisk", "mod", "pbx"},    cbi("asterisk-mod-pbx"),    "PBX", 					7)
+	entry({"admin", "services", "asterisk", "mod", "res"},    cbi("asterisk-mod-res"),    "Resources", 				8)
+	entry({"admin", "services", "asterisk", "mod", "res", "feature"},
+		cbi("asterisk-mod-res-feature"), "Feature Module Configuration", 9 )
+
+
+	entry({"admin", "asterisk"},                    		cbi("asterisk/main"),        		"Asterisk",  99).i18n = "asterisk"
+
+	entry({"admin", "asterisk", "phones"},          		cbi("asterisk/phones"),      		"Phones",       1)
+	entry({"admin", "asterisk", "phones", "sip"},   		cbi("asterisk/phone_sip"),   		nil,            1).leaf = true
+	--entry({"admin", "asterisk", "phones", "exten"}, 		cbi("asterisk/phone_exten"), 		"Extensions",   2).leaf = true
+
+	entry({"admin", "asterisk", "trunks"},          		cbi("asterisk/trunks"),      		"Trunks",       2)
+	entry({"admin", "asterisk", "trunks", "sip"},   		cbi("asterisk/trunk_sip"),   		nil,            1).leaf = true
+
+	entry({"admin", "asterisk", "voicemail"},          		cbi("asterisk/voicemail"),      	"Voicemail",    3)
+	entry({"admin", "asterisk", "voicemail", "mailboxes"},	cbi("asterisk/voicemail"),			"Mailboxes",    1)
+	entry({"admin", "asterisk", "voicemail", "settings"},	cbi("asterisk/voicemail_settings"),	"Settings",     2)
+
+	entry({"admin", "asterisk", "meetme"},          		cbi("asterisk/meetme"),      		"MeetMe",		4)
+	entry({"admin", "asterisk", "meetme", "rooms"},			cbi("asterisk/meetme"),				"Rooms",		1)
+	entry({"admin", "asterisk", "meetme", "settings"},		cbi("asterisk/meetme_settings"),	"Settings",     2)
+
+	entry({"admin", "asterisk", "dialplans"},				call("handle_dialplan"),     		"Call Routing", 5)
+	entry({"admin", "asterisk", "dialplans", "out"},		cbi("asterisk/dialplan_out"),		nil,            1).leaf = true
+	entry({"admin", "asterisk", "dialplans", "zones"},		call("handle_dialzones"),			"Dial Zones",	2).leaf = true
+
+end
+
+
+function handle_dialplan()
+	local uci = luci.model.uci.cursor()
+	local ast = require "luci.asterisk"
+	local err = false
+
+	for k, v in pairs(luci.http.formvaluetable("delzone")) do
+		local plan = ast.dialplan.plan(k)
+		if #v > 0 and plan then
+			local newinc = { }
+
+			for _, z in ipairs(plan.zones) do
+				if z.name ~= v then
+					newinc[#newinc+1] = z.name
+				end
+			end
+
+			uci:delete("asterisk", plan.name, "include")
+
+			if #newinc > 0 then
+				uci:set("asterisk", plan.name, "include", newinc)
+			end
+		end
+	end
+
+	for k, v in pairs(luci.http.formvaluetable("addzone")) do
+		local plan = ast.dialplan.plan(k)
+		local zone = ast.dialzone.zone(v)
+		if #v > 0 and plan and zone then
+			local newinc = { zone.name }
+
+			for _, z in ipairs(plan.zones) do
+				newinc[#newinc+1] = z.name
+			end
+
+			uci:delete("asterisk", plan.name, "include")
+
+			if #newinc > 0 then
+				uci:set("asterisk", plan.name, "include", newinc)
+			end
+		end
+	end
+
+	for k, v in pairs(luci.http.formvaluetable("delvbox")) do
+		local plan = ast.dialplan.plan(k)
+		if #v > 0 and plan then
+			uci:delete_all("asterisk", "dialplanvoice",
+				{ extension=v, dialplan=plan.name })
+		end
+	end
+
+	for k, v in pairs(luci.http.formvaluetable("addvbox")) do
+		local plan = ast.dialplan.plan(k)
+		local vbox = ast.voicemail.box(v)
+		if plan and vbox then
+			local vext = luci.http.formvalue("addvboxext.%s" % plan.name)
+			vext = ( vext and #vext > 0 ) and vext or vbox.number
+			uci:section("asterisk", "dialplanvoice", nil, {
+				dialplan		= plan.name,
+				extension		= vext,
+				voicebox		= vbox.number,
+				voicecontext	= vbox.context
+			})
+		end
+	end
+
+	for k, v in pairs(luci.http.formvaluetable("delmeetme")) do
+		local plan = ast.dialplan.plan(k)
+		if #v > 0 and plan then
+			uci:delete_all("asterisk", "dialplanmeetme",
+				{ extension=v, dialplan=plan.name })
+		end
+	end
+
+	for k, v in pairs(luci.http.formvaluetable("addmeetme")) do
+		local plan = ast.dialplan.plan(k)
+		local meetme = ast.meetme.room(v)
+		if plan and meetme then
+			local mext = luci.http.formvalue("addmeetmeext.%s" % plan.name)
+			mext = ( mext and #mext > 0 ) and mext or meetme.room
+			uci:section("asterisk", "dialplanmeetme", nil, {
+				dialplan	= plan.name,
+				extension	= mext,
+				room		= meetme.room
+			})
+		end
+	end
+
+	local aname = luci.http.formvalue("addplan")
+	if aname and #aname > 0 then
+		if aname:match("^[a-zA-Z0-9_]+$") then
+			uci:section("asterisk", "dialplan", aname, { })
+		else
+			err = true
+		end
+	end
+
+	local dname = luci.http.formvalue("delplan")
+	if dname and #dname > 0 then
+		if uci:get("asterisk", dname) == "dialplan" then
+			uci:delete("asterisk", dname)
+			uci:delete_all("asterisk", "dialplanvoice", { dialplan=dname })
+			uci:delete_all("asterisk", "dialplanmeetme", { dialplan=dname })
+		end
+	end
+
+	uci:save("asterisk")
+	ast.uci_resync()
+
+	luci.template.render("asterisk/dialplans", { create_error = err })
+end
+
+function handle_dialzones()
+	local ast = require "luci.asterisk"
+	local uci = luci.model.uci.cursor()
+	local err = false
+
+	if luci.http.formvalue("newzone") then
+		local name = luci.http.formvalue("newzone_name")
+		if name and name:match("^[a-zA-Z0-9_]+$") then
+			uci:section("asterisk", "dialzone", name, {
+				uses  = ast.tools.parse_list(luci.http.formvalue("newzone_uses") or {}),
+				match = ast.tools.parse_list(luci.http.formvalue("newzone_match") or {})
+			})
+			uci:save("asterisk")
+		else
+			err = true
+		end
+	end
+
+	if luci.http.formvalue("delzone") then
+		local name = luci.http.formvalue("delzone")
+		if uci:get("asterisk", name) == "dialzone" then
+			uci:delete("asterisk", name)
+			uci:save("asterisk")
+		end
+	end
+
+	luci.template.render("asterisk/dialzones", { create_error = err })
+end
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
new file mode 100644
index 00000000..4e4dce06
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-dialplans.lua
@@ -0,0 +1,102 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+dialplan = cbimap:section(TypedSection, "dialplan", "Section dialplan", "")
+dialplan.addremove = true
+dialplan.dynamic = true
+
+include = dialplan:option(MultiValue, "include", "Include zones and plans", "")
+cbimap.uci:foreach( "asterisk", "dialplan", function(s) include:value(s['.name']) end )
+cbimap.uci:foreach( "asterisk", "dialzone", function(s) include:value(s['.name']) end )
+
+dialplanexten = cbimap:section(TypedSection, "dialplanexten", "Dialplan Extension", "")
+dialplanexten.anonymous = true
+dialplanexten.addremove = true
+dialplanexten.dynamic = true
+
+
+dialplangeneral = cbimap:section(TypedSection, "dialplangeneral", "Dialplan General Options", "")
+dialplangeneral.anonymous = true
+dialplangeneral.addremove = true
+
+allowtransfer = dialplangeneral:option(Flag, "allowtransfer", "Allow transfer", "")
+allowtransfer.rmempty = true
+
+canreinvite = dialplangeneral:option(ListValue, "canreinvite", "Reinvite/redirect media connections", "")
+canreinvite:value("yes", "Yes")
+canreinvite:value("nonat", "Yes when not behind NAT")
+canreinvite:value("update", "Use UPDATE rather than INVITE for path redirection")
+canreinvite:value("no", "No")
+canreinvite.rmempty = true
+
+clearglobalvars = dialplangeneral:option(Flag, "clearglobalvars", "Clear global vars", "")
+clearglobalvars.rmempty = true
+
+
+dialplangoto = cbimap:section(TypedSection, "dialplangoto", "Dialplan Goto", "")
+dialplangoto.anonymous = true
+dialplangoto.addremove = true
+dialplangoto.dynamic = true
+
+
+dialplanmeetme = cbimap:section(TypedSection, "dialplanmeetme", "Dialplan Conference", "")
+dialplanmeetme.anonymous = true
+dialplanmeetme.addremove = true
+dialplanmeetme.dynamic = true
+
+
+dialplansaytime = cbimap:section(TypedSection, "dialplansaytime", "Dialplan Time", "")
+dialplansaytime.anonymous = true
+dialplansaytime.addremove = true
+dialplansaytime.dynamic = true
+
+
+dialplanvoice = cbimap:section(TypedSection, "dialplanvoice", "Dialplan Voicemail", "")
+dialplanvoice.anonymous = true
+dialplanvoice.addremove = true
+dialplanvoice.dynamic = true
+
+
+dialzone = cbimap:section(TypedSection, "dialzone", "Dial Zones for Dialplan", "")
+dialzone.addremove = true
+dialzone.template = "cbi/tblsection"
+
+addprefix = dialzone:option(Value, "addprefix", "Prefix to add matching dialplans", "")
+addprefix.rmempty = true
+
+--international = dialzone:option(DynamicList, "international", "Match International prefix", "")
+international = dialzone:option(Value, "international", "Match International prefix", "")
+international.rmempty = true
+
+localprefix = dialzone:option(Value, "localprefix", "Prefix (0) to add/remove to/from intl. numbers", "")
+localprefix.rmempty = true
+
+localzone = dialzone:option(Value, "localzone", "Dialzone for intl. numbers matched as local", "")
+localzone.titleref = luci.dispatcher.build_url( "admin", "services", "asterisk", "dialplans" )
+cbimap.uci:foreach( "asterisk", "dialplan", function(s) localzone:value(s['.name']) end )
+cbimap.uci:foreach( "asterisk", "dialzone", function(s) localzone:value(s['.name']) end )
+
+match = dialzone:option(Value, "match", "Match plan", "")
+match.rmempty = true
+
+uses = dialzone:option(ListValue, "uses", "Connection to use", "")
+uses.titleref = luci.dispatcher.build_url( "admin", "services", "asterisk", "sip-conns" )
+cbimap.uci:foreach( "asterisk", "sip", function(s) uses:value('SIP/'..s['.name']) end )
+cbimap.uci:foreach( "asterisk", "iax", function(s) uses:value('IAX/'..s['.name']) end )
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
new file mode 100644
index 00000000..0102c1b9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-iax-connections.lua
@@ -0,0 +1,60 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+iax = cbimap:section(TypedSection, "iax", "IAX Connection", "")
+iax.addremove = true
+
+alwaysinternational = iax:option(Flag, "alwaysinternational", "Always Dial International", "")
+alwaysinternational.optional = true
+
+context = iax:option(ListValue, "context", "Context to use", "")
+context.titleref = luci.dispatcher.build_url( "admin", "services", "asterisk", "dialplans" )
+cbimap.uci:foreach( "asterisk", "dialplan", function(s) context:value(s['.name']) end )
+cbimap.uci:foreach( "asterisk", "dialzone", function(s) context:value(s['.name']) end )
+
+countrycode = iax:option(Value, "countrycode", "Country Code for connection", "")
+countrycode.optional = true
+
+extension = iax:option(Value, "extension", "Add as Extension", "")
+extension.optional = true
+
+host = iax:option(Value, "host", "Host name (or blank)", "")
+host.optional = true
+
+internationalprefix = iax:option(Value, "internationalprefix", "International Dial Prefix", "")
+internationalprefix.optional = true
+
+prefix = iax:option(Value, "prefix", "Dial Prefix (for external line)", "")
+prefix.optional = true
+
+secret = iax:option(Value, "secret", "Secret", "")
+secret.optional = true
+
+timeout = iax:option(Value, "timeout", "Dial Timeout (sec)", "")
+timeout.optional = true
+
+type = iax:option(ListValue, "type", "Option type", "")
+type:value("friend", "Friend (outbound/inbound)")
+type:value("user", "User (inbound - authenticate by \"from\")")
+type:value("peer", "Peer (outbound - match by host)")
+type.optional = true
+
+username = iax:option(Value, "username", "User name", "")
+username.optional = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua
new file mode 100644
index 00000000..08174459
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-meetme.lua
@@ -0,0 +1,33 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+meetmegeneral = cbimap:section(TypedSection, "meetmegeneral", "Meetme Conference General Options", "")
+
+audiobuffers = meetmegeneral:option(Value, "audiobuffers", "Number of 20ms audio buffers to be used", "")
+
+
+meetme = cbimap:section(TypedSection, "meetme", "Meetme Conference", "")
+meetme.addremove = true
+
+adminpin = meetme:option(Value, "adminpin", "Admin PIN", "")
+adminpin.password = true
+
+pin = meetme:option(Value, "pin", "Meeting PIN", "")
+pin.password = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
new file mode 100644
index 00000000..0a0a2d51
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-app.lua
@@ -0,0 +1,391 @@
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+app_alarmreceiver = module:option(ListValue, "app_alarmreceiver", "Alarm Receiver Application", "")
+app_alarmreceiver:value("yes", "Load")
+app_alarmreceiver:value("no", "Do Not Load")
+app_alarmreceiver:value("auto", "Load as Required")
+app_alarmreceiver.rmempty = true
+
+app_authenticate = module:option(ListValue, "app_authenticate", "Authentication Application", "")
+app_authenticate:value("yes", "Load")
+app_authenticate:value("no", "Do Not Load")
+app_authenticate:value("auto", "Load as Required")
+app_authenticate.rmempty = true
+
+app_cdr = module:option(ListValue, "app_cdr", "Make sure asterisk doesnt save CDR", "")
+app_cdr:value("yes", "Load")
+app_cdr:value("no", "Do Not Load")
+app_cdr:value("auto", "Load as Required")
+app_cdr.rmempty = true
+
+app_chanisavail = module:option(ListValue, "app_chanisavail", "Check if channel is available", "")
+app_chanisavail:value("yes", "Load")
+app_chanisavail:value("no", "Do Not Load")
+app_chanisavail:value("auto", "Load as Required")
+app_chanisavail.rmempty = true
+
+app_chanspy = module:option(ListValue, "app_chanspy", "Listen in on any channel", "")
+app_chanspy:value("yes", "Load")
+app_chanspy:value("no", "Do Not Load")
+app_chanspy:value("auto", "Load as Required")
+app_chanspy.rmempty = true
+
+app_controlplayback = module:option(ListValue, "app_controlplayback", "Control Playback Application", "")
+app_controlplayback:value("yes", "Load")
+app_controlplayback:value("no", "Do Not Load")
+app_controlplayback:value("auto", "Load as Required")
+app_controlplayback.rmempty = true
+
+app_cut = module:option(ListValue, "app_cut", "Cuts up variables", "")
+app_cut:value("yes", "Load")
+app_cut:value("no", "Do Not Load")
+app_cut:value("auto", "Load as Required")
+app_cut.rmempty = true
+
+app_db = module:option(ListValue, "app_db", "Database access functions", "")
+app_db:value("yes", "Load")
+app_db:value("no", "Do Not Load")
+app_db:value("auto", "Load as Required")
+app_db.rmempty = true
+
+app_dial = module:option(ListValue, "app_dial", "Dialing Application", "")
+app_dial:value("yes", "Load")
+app_dial:value("no", "Do Not Load")
+app_dial:value("auto", "Load as Required")
+app_dial.rmempty = true
+
+app_dictate = module:option(ListValue, "app_dictate", "Virtual Dictation Machine Application", "")
+app_dictate:value("yes", "Load")
+app_dictate:value("no", "Do Not Load")
+app_dictate:value("auto", "Load as Required")
+app_dictate.rmempty = true
+
+app_directed_pickup = module:option(ListValue, "app_directed_pickup", "Directed Call Pickup Support", "")
+app_directed_pickup:value("yes", "Load")
+app_directed_pickup:value("no", "Do Not Load")
+app_directed_pickup:value("auto", "Load as Required")
+app_directed_pickup.rmempty = true
+
+app_directory = module:option(ListValue, "app_directory", "Extension Directory", "")
+app_directory:value("yes", "Load")
+app_directory:value("no", "Do Not Load")
+app_directory:value("auto", "Load as Required")
+app_directory.rmempty = true
+
+app_disa = module:option(ListValue, "app_disa", "DISA (Direct Inward System Access) Application", "")
+app_disa:value("yes", "Load")
+app_disa:value("no", "Do Not Load")
+app_disa:value("auto", "Load as Required")
+app_disa.rmempty = true
+
+app_dumpchan = module:option(ListValue, "app_dumpchan", "Dump channel variables Application", "")
+app_dumpchan:value("yes", "Load")
+app_dumpchan:value("no", "Do Not Load")
+app_dumpchan:value("auto", "Load as Required")
+app_dumpchan.rmempty = true
+
+app_echo = module:option(ListValue, "app_echo", "Simple Echo Application", "")
+app_echo:value("yes", "Load")
+app_echo:value("no", "Do Not Load")
+app_echo:value("auto", "Load as Required")
+app_echo.rmempty = true
+
+app_enumlookup = module:option(ListValue, "app_enumlookup", "ENUM Lookup", "")
+app_enumlookup:value("yes", "Load")
+app_enumlookup:value("no", "Do Not Load")
+app_enumlookup:value("auto", "Load as Required")
+app_enumlookup.rmempty = true
+
+app_eval = module:option(ListValue, "app_eval", "Reevaluates strings", "")
+app_eval:value("yes", "Load")
+app_eval:value("no", "Do Not Load")
+app_eval:value("auto", "Load as Required")
+app_eval.rmempty = true
+
+app_exec = module:option(ListValue, "app_exec", "Executes applications", "")
+app_exec:value("yes", "Load")
+app_exec:value("no", "Do Not Load")
+app_exec:value("auto", "Load as Required")
+app_exec.rmempty = true
+
+app_externalivr = module:option(ListValue, "app_externalivr", "External IVR application interface", "")
+app_externalivr:value("yes", "Load")
+app_externalivr:value("no", "Do Not Load")
+app_externalivr:value("auto", "Load as Required")
+app_externalivr.rmempty = true
+
+app_forkcdr = module:option(ListValue, "app_forkcdr", "Fork The CDR into 2 seperate entities", "")
+app_forkcdr:value("yes", "Load")
+app_forkcdr:value("no", "Do Not Load")
+app_forkcdr:value("auto", "Load as Required")
+app_forkcdr.rmempty = true
+
+app_getcpeid = module:option(ListValue, "app_getcpeid", "Get ADSI CPE ID", "")
+app_getcpeid:value("yes", "Load")
+app_getcpeid:value("no", "Do Not Load")
+app_getcpeid:value("auto", "Load as Required")
+app_getcpeid.rmempty = true
+
+app_groupcount = module:option(ListValue, "app_groupcount", "Group Management Routines", "")
+app_groupcount:value("yes", "Load")
+app_groupcount:value("no", "Do Not Load")
+app_groupcount:value("auto", "Load as Required")
+app_groupcount.rmempty = true
+
+app_ices = module:option(ListValue, "app_ices", "Encode and Stream via icecast and ices", "")
+app_ices:value("yes", "Load")
+app_ices:value("no", "Do Not Load")
+app_ices:value("auto", "Load as Required")
+app_ices.rmempty = true
+
+app_image = module:option(ListValue, "app_image", "Image Transmission Application", "")
+app_image:value("yes", "Load")
+app_image:value("no", "Do Not Load")
+app_image:value("auto", "Load as Required")
+app_image.rmempty = true
+
+app_lookupblacklist = module:option(ListValue, "app_lookupblacklist", "Look up Caller*ID name/number from black", "")
+app_lookupblacklist:value("yes", "Load")
+app_lookupblacklist:value("no", "Do Not Load")
+app_lookupblacklist:value("auto", "Load as Required")
+app_lookupblacklist.rmempty = true
+
+app_lookupcidname = module:option(ListValue, "app_lookupcidname", "Look up CallerID Name from local databas", "")
+app_lookupcidname:value("yes", "Load")
+app_lookupcidname:value("no", "Do Not Load")
+app_lookupcidname:value("auto", "Load as Required")
+app_lookupcidname.rmempty = true
+
+app_macro = module:option(ListValue, "app_macro", "Extension Macros", "")
+app_macro:value("yes", "Load")
+app_macro:value("no", "Do Not Load")
+app_macro:value("auto", "Load as Required")
+app_macro.rmempty = true
+
+app_math = module:option(ListValue, "app_math", "A simple math Application", "")
+app_math:value("yes", "Load")
+app_math:value("no", "Do Not Load")
+app_math:value("auto", "Load as Required")
+app_math.rmempty = true
+
+app_md5 = module:option(ListValue, "app_md5", "MD5 checksum Application", "")
+app_md5:value("yes", "Load")
+app_md5:value("no", "Do Not Load")
+app_md5:value("auto", "Load as Required")
+app_md5.rmempty = true
+
+app_milliwatt = module:option(ListValue, "app_milliwatt", "Digital Milliwatt (mu-law) Test Application", "")
+app_milliwatt:value("yes", "Load")
+app_milliwatt:value("no", "Do Not Load")
+app_milliwatt:value("auto", "Load as Required")
+app_milliwatt.rmempty = true
+
+app_mixmonitor = module:option(ListValue, "app_mixmonitor", "Record a call and mix the audio during the recording", "")
+app_mixmonitor:value("yes", "Load")
+app_mixmonitor:value("no", "Do Not Load")
+app_mixmonitor:value("auto", "Load as Required")
+app_mixmonitor.rmempty = true
+
+app_parkandannounce = module:option(ListValue, "app_parkandannounce", "Call Parking and Announce Application", "")
+app_parkandannounce:value("yes", "Load")
+app_parkandannounce:value("no", "Do Not Load")
+app_parkandannounce:value("auto", "Load as Required")
+app_parkandannounce.rmempty = true
+
+app_playback = module:option(ListValue, "app_playback", "Trivial Playback Application", "")
+app_playback:value("yes", "Load")
+app_playback:value("no", "Do Not Load")
+app_playback:value("auto", "Load as Required")
+app_playback.rmempty = true
+
+app_privacy = module:option(ListValue, "app_privacy", "Require phone number to be entered", "")
+app_privacy:value("yes", "Load")
+app_privacy:value("no", "Do Not Load")
+app_privacy:value("auto", "Load as Required")
+app_privacy.rmempty = true
+
+app_queue = module:option(ListValue, "app_queue", "True Call Queueing", "")
+app_queue:value("yes", "Load")
+app_queue:value("no", "Do Not Load")
+app_queue:value("auto", "Load as Required")
+app_queue.rmempty = true
+
+app_random = module:option(ListValue, "app_random", "Random goto", "")
+app_random:value("yes", "Load")
+app_random:value("no", "Do Not Load")
+app_random:value("auto", "Load as Required")
+app_random.rmempty = true
+
+app_read = module:option(ListValue, "app_read", "Read Variable Application", "")
+app_read:value("yes", "Load")
+app_read:value("no", "Do Not Load")
+app_read:value("auto", "Load as Required")
+app_read.rmempty = true
+
+app_readfile = module:option(ListValue, "app_readfile", "Read in a file", "")
+app_readfile:value("yes", "Load")
+app_readfile:value("no", "Do Not Load")
+app_readfile:value("auto", "Load as Required")
+app_readfile.rmempty = true
+
+app_realtime = module:option(ListValue, "app_realtime", "Realtime Data Lookup/Rewrite", "")
+app_realtime:value("yes", "Load")
+app_realtime:value("no", "Do Not Load")
+app_realtime:value("auto", "Load as Required")
+app_realtime.rmempty = true
+
+app_record = module:option(ListValue, "app_record", "Trivial Record Application", "")
+app_record:value("yes", "Load")
+app_record:value("no", "Do Not Load")
+app_record:value("auto", "Load as Required")
+app_record.rmempty = true
+
+app_sayunixtime = module:option(ListValue, "app_sayunixtime", "Say time", "")
+app_sayunixtime:value("yes", "Load")
+app_sayunixtime:value("no", "Do Not Load")
+app_sayunixtime:value("auto", "Load as Required")
+app_sayunixtime.rmempty = true
+
+app_senddtmf = module:option(ListValue, "app_senddtmf", "Send DTMF digits Application", "")
+app_senddtmf:value("yes", "Load")
+app_senddtmf:value("no", "Do Not Load")
+app_senddtmf:value("auto", "Load as Required")
+app_senddtmf.rmempty = true
+
+app_sendtext = module:option(ListValue, "app_sendtext", "Send Text Applications", "")
+app_sendtext:value("yes", "Load")
+app_sendtext:value("no", "Do Not Load")
+app_sendtext:value("auto", "Load as Required")
+app_sendtext.rmempty = true
+
+app_setcallerid = module:option(ListValue, "app_setcallerid", "Set CallerID Application", "")
+app_setcallerid:value("yes", "Load")
+app_setcallerid:value("no", "Do Not Load")
+app_setcallerid:value("auto", "Load as Required")
+app_setcallerid.rmempty = true
+
+app_setcdruserfield = module:option(ListValue, "app_setcdruserfield", "CDR user field apps", "")
+app_setcdruserfield:value("yes", "Load")
+app_setcdruserfield:value("no", "Do Not Load")
+app_setcdruserfield:value("auto", "Load as Required")
+app_setcdruserfield.rmempty = true
+
+app_setcidname = module:option(ListValue, "app_setcidname", "load => .so ; Set CallerID Name", "")
+app_setcidname:value("yes", "Load")
+app_setcidname:value("no", "Do Not Load")
+app_setcidname:value("auto", "Load as Required")
+app_setcidname.rmempty = true
+
+app_setcidnum = module:option(ListValue, "app_setcidnum", "load => .so ; Set CallerID Number", "")
+app_setcidnum:value("yes", "Load")
+app_setcidnum:value("no", "Do Not Load")
+app_setcidnum:value("auto", "Load as Required")
+app_setcidnum.rmempty = true
+
+app_setrdnis = module:option(ListValue, "app_setrdnis", "Set RDNIS Number", "")
+app_setrdnis:value("yes", "Load")
+app_setrdnis:value("no", "Do Not Load")
+app_setrdnis:value("auto", "Load as Required")
+app_setrdnis.rmempty = true
+
+app_settransfercapability = module:option(ListValue, "app_settransfercapability", "Set ISDN Transfer Capability", "")
+app_settransfercapability:value("yes", "Load")
+app_settransfercapability:value("no", "Do Not Load")
+app_settransfercapability:value("auto", "Load as Required")
+app_settransfercapability.rmempty = true
+
+app_sms = module:option(ListValue, "app_sms", "SMS/PSTN handler", "")
+app_sms:value("yes", "Load")
+app_sms:value("no", "Do Not Load")
+app_sms:value("auto", "Load as Required")
+app_sms.rmempty = true
+
+app_softhangup = module:option(ListValue, "app_softhangup", "Hangs up the requested channel", "")
+app_softhangup:value("yes", "Load")
+app_softhangup:value("no", "Do Not Load")
+app_softhangup:value("auto", "Load as Required")
+app_softhangup.rmempty = true
+
+app_stack = module:option(ListValue, "app_stack", "Stack Routines", "")
+app_stack:value("yes", "Load")
+app_stack:value("no", "Do Not Load")
+app_stack:value("auto", "Load as Required")
+app_stack.rmempty = true
+
+app_system = module:option(ListValue, "app_system", "Generic System() application", "")
+app_system:value("yes", "Load")
+app_system:value("no", "Do Not Load")
+app_system:value("auto", "Load as Required")
+app_system.rmempty = true
+
+app_talkdetect = module:option(ListValue, "app_talkdetect", "Playback with Talk Detection", "")
+app_talkdetect:value("yes", "Load")
+app_talkdetect:value("no", "Do Not Load")
+app_talkdetect:value("auto", "Load as Required")
+app_talkdetect.rmempty = true
+
+app_test = module:option(ListValue, "app_test", "Interface Test Application", "")
+app_test:value("yes", "Load")
+app_test:value("no", "Do Not Load")
+app_test:value("auto", "Load as Required")
+app_test.rmempty = true
+
+app_transfer = module:option(ListValue, "app_transfer", "Transfer", "")
+app_transfer:value("yes", "Load")
+app_transfer:value("no", "Do Not Load")
+app_transfer:value("auto", "Load as Required")
+app_transfer.rmempty = true
+
+app_txtcidname = module:option(ListValue, "app_txtcidname", "TXTCIDName", "")
+app_txtcidname:value("yes", "Load")
+app_txtcidname:value("no", "Do Not Load")
+app_txtcidname:value("auto", "Load as Required")
+app_txtcidname.rmempty = true
+
+app_url = module:option(ListValue, "app_url", "Send URL Applications", "")
+app_url:value("yes", "Load")
+app_url:value("no", "Do Not Load")
+app_url:value("auto", "Load as Required")
+app_url.rmempty = true
+
+app_userevent = module:option(ListValue, "app_userevent", "Custom User Event Application", "")
+app_userevent:value("yes", "Load")
+app_userevent:value("no", "Do Not Load")
+app_userevent:value("auto", "Load as Required")
+app_userevent.rmempty = true
+
+app_verbose = module:option(ListValue, "app_verbose", "Send verbose output", "")
+app_verbose:value("yes", "Load")
+app_verbose:value("no", "Do Not Load")
+app_verbose:value("auto", "Load as Required")
+app_verbose.rmempty = true
+
+app_voicemail = module:option(ListValue, "app_voicemail", "Voicemail", "")
+app_voicemail:value("yes", "Load")
+app_voicemail:value("no", "Do Not Load")
+app_voicemail:value("auto", "Load as Required")
+app_voicemail.rmempty = true
+
+app_waitforring = module:option(ListValue, "app_waitforring", "Waits until first ring after time", "")
+app_waitforring:value("yes", "Load")
+app_waitforring:value("no", "Do Not Load")
+app_waitforring:value("auto", "Load as Required")
+app_waitforring.rmempty = true
+
+app_waitforsilence = module:option(ListValue, "app_waitforsilence", "Wait For Silence Application", "")
+app_waitforsilence:value("yes", "Load")
+app_waitforsilence:value("no", "Do Not Load")
+app_waitforsilence:value("auto", "Load as Required")
+app_waitforsilence.rmempty = true
+
+app_while = module:option(ListValue, "app_while", "While Loops and Conditional Execution", "")
+app_while:value("yes", "Load")
+app_while:value("no", "Do Not Load")
+app_while:value("auto", "Load as Required")
+app_while.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
new file mode 100644
index 00000000..ee1960d1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-cdr.lua
@@ -0,0 +1,58 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+cdr_csv = module:option(ListValue, "cdr_csv", "Comma Separated Values CDR Backend", "")
+cdr_csv:value("yes", "Load")
+cdr_csv:value("no", "Do Not Load")
+cdr_csv:value("auto", "Load as Required")
+cdr_csv.rmempty = true
+
+cdr_custom = module:option(ListValue, "cdr_custom", "Customizable Comma Separated Values CDR Backend", "")
+cdr_custom:value("yes", "Load")
+cdr_custom:value("no", "Do Not Load")
+cdr_custom:value("auto", "Load as Required")
+cdr_custom.rmempty = true
+
+cdr_manager = module:option(ListValue, "cdr_manager", "Asterisk Call Manager CDR Backend", "")
+cdr_manager:value("yes", "Load")
+cdr_manager:value("no", "Do Not Load")
+cdr_manager:value("auto", "Load as Required")
+cdr_manager.rmempty = true
+
+cdr_mysql = module:option(ListValue, "cdr_mysql", "MySQL CDR Backend", "")
+cdr_mysql:value("yes", "Load")
+cdr_mysql:value("no", "Do Not Load")
+cdr_mysql:value("auto", "Load as Required")
+cdr_mysql.rmempty = true
+
+cdr_pgsql = module:option(ListValue, "cdr_pgsql", "PostgreSQL CDR Backend", "")
+cdr_pgsql:value("yes", "Load")
+cdr_pgsql:value("no", "Do Not Load")
+cdr_pgsql:value("auto", "Load as Required")
+cdr_pgsql.rmempty = true
+
+cdr_sqlite = module:option(ListValue, "cdr_sqlite", "SQLite CDR Backend", "")
+cdr_sqlite:value("yes", "Load")
+cdr_sqlite:value("no", "Do Not Load")
+cdr_sqlite:value("auto", "Load as Required")
+cdr_sqlite.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
new file mode 100644
index 00000000..835cbdcf
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-chan.lua
@@ -0,0 +1,56 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+chan_agent = module:option(ListValue, "chan_agent", "Agent Proxy Channel", "")
+chan_agent:value("yes", "Load")
+chan_agent:value("no", "Do Not Load")
+chan_agent:value("auto", "Load as Required")
+chan_agent.rmempty = true
+
+chan_alsa = module:option(ListValue, "chan_alsa", "Channel driver for GTalk", "")
+chan_alsa:value("yes", "Load")
+chan_alsa:value("no", "Do Not Load")
+chan_alsa:value("auto", "Load as Required")
+chan_alsa.rmempty = true
+
+chan_gtalk = module:option(ListValue, "chan_gtalk", "Channel driver for GTalk", "")
+chan_gtalk:value("yes", "Load")
+chan_gtalk:value("no", "Do Not Load")
+chan_gtalk:value("auto", "Load as Required")
+chan_gtalk.rmempty = true
+
+chan_iax2 = module:option(Flag, "chan_iax2", "Option chan_iax2", "")
+chan_iax2.rmempty = true
+
+chan_local = module:option(ListValue, "chan_local", "Local Proxy Channel", "")
+chan_local:value("yes", "Load")
+chan_local:value("no", "Do Not Load")
+chan_local:value("auto", "Load as Required")
+chan_local.rmempty = true
+
+chan_sip = module:option(ListValue, "chan_sip", "Session Initiation Protocol (SIP)", "")
+chan_sip:value("yes", "Load")
+chan_sip:value("no", "Do Not Load")
+chan_sip:value("auto", "Load as Required")
+chan_sip.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
new file mode 100644
index 00000000..3c8d9584
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-codec.lua
@@ -0,0 +1,64 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+codec_a_mu = module:option(ListValue, "codec_a_mu", "A-law and Mulaw direct Coder/Decoder", "")
+codec_a_mu:value("yes", "Load")
+codec_a_mu:value("no", "Do Not Load")
+codec_a_mu:value("auto", "Load as Required")
+codec_a_mu.rmempty = true
+
+codec_adpcm = module:option(ListValue, "codec_adpcm", "Adaptive Differential PCM Coder/Decoder", "")
+codec_adpcm:value("yes", "Load")
+codec_adpcm:value("no", "Do Not Load")
+codec_adpcm:value("auto", "Load as Required")
+codec_adpcm.rmempty = true
+
+codec_alaw = module:option(ListValue, "codec_alaw", "A-law Coder/Decoder", "")
+codec_alaw:value("yes", "Load")
+codec_alaw:value("no", "Do Not Load")
+codec_alaw:value("auto", "Load as Required")
+codec_alaw.rmempty = true
+
+codec_g726 = module:option(ListValue, "codec_g726", "ITU G.726-32kbps G726 Transcoder", "")
+codec_g726:value("yes", "Load")
+codec_g726:value("no", "Do Not Load")
+codec_g726:value("auto", "Load as Required")
+codec_g726.rmempty = true
+
+codec_gsm = module:option(ListValue, "codec_gsm", "GSM/PCM16 (signed linear) Codec Translation", "")
+codec_gsm:value("yes", "Load")
+codec_gsm:value("no", "Do Not Load")
+codec_gsm:value("auto", "Load as Required")
+codec_gsm.rmempty = true
+
+codec_speex = module:option(ListValue, "codec_speex", "Speex/PCM16 (signed linear) Codec Translator", "")
+codec_speex:value("yes", "Load")
+codec_speex:value("no", "Do Not Load")
+codec_speex:value("auto", "Load as Required")
+codec_speex.rmempty = true
+
+codec_ulaw = module:option(ListValue, "codec_ulaw", "Mu-law Coder/Decoder", "")
+codec_ulaw:value("yes", "Load")
+codec_ulaw:value("no", "Do Not Load")
+codec_ulaw:value("auto", "Load as Required")
+codec_ulaw.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
new file mode 100644
index 00000000..da3989b2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-format.lua
@@ -0,0 +1,100 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+format_au = module:option(ListValue, "format_au", "Sun Microsystems AU format (signed linear)", "")
+format_au:value("yes", "Load")
+format_au:value("no", "Do Not Load")
+format_au:value("auto", "Load as Required")
+format_au.rmempty = true
+
+format_g723 = module:option(ListValue, "format_g723", "G.723.1 Simple Timestamp File Format", "")
+format_g723:value("yes", "Load")
+format_g723:value("no", "Do Not Load")
+format_g723:value("auto", "Load as Required")
+format_g723.rmempty = true
+
+format_g726 = module:option(ListValue, "format_g726", "Raw G.726 (16/24/32/40kbps) data", "")
+format_g726:value("yes", "Load")
+format_g726:value("no", "Do Not Load")
+format_g726:value("auto", "Load as Required")
+format_g726.rmempty = true
+
+format_g729 = module:option(ListValue, "format_g729", "Raw G729 data", "")
+format_g729:value("yes", "Load")
+format_g729:value("no", "Do Not Load")
+format_g729:value("auto", "Load as Required")
+format_g729.rmempty = true
+
+format_gsm = module:option(ListValue, "format_gsm", "Raw GSM data", "")
+format_gsm:value("yes", "Load")
+format_gsm:value("no", "Do Not Load")
+format_gsm:value("auto", "Load as Required")
+format_gsm.rmempty = true
+
+format_h263 = module:option(ListValue, "format_h263", "Raw h263 data", "")
+format_h263:value("yes", "Load")
+format_h263:value("no", "Do Not Load")
+format_h263:value("auto", "Load as Required")
+format_h263.rmempty = true
+
+format_jpeg = module:option(ListValue, "format_jpeg", "JPEG (Joint Picture Experts Group) Image", "")
+format_jpeg:value("yes", "Load")
+format_jpeg:value("no", "Do Not Load")
+format_jpeg:value("auto", "Load as Required")
+format_jpeg.rmempty = true
+
+format_pcm = module:option(ListValue, "format_pcm", "Raw uLaw 8khz Audio support (PCM)", "")
+format_pcm:value("yes", "Load")
+format_pcm:value("no", "Do Not Load")
+format_pcm:value("auto", "Load as Required")
+format_pcm.rmempty = true
+
+format_pcm_alaw = module:option(ListValue, "format_pcm_alaw", "load => .so ; Raw aLaw 8khz PCM Audio support", "")
+format_pcm_alaw:value("yes", "Load")
+format_pcm_alaw:value("no", "Do Not Load")
+format_pcm_alaw:value("auto", "Load as Required")
+format_pcm_alaw.rmempty = true
+
+format_sln = module:option(ListValue, "format_sln", "Raw Signed Linear Audio support (SLN)", "")
+format_sln:value("yes", "Load")
+format_sln:value("no", "Do Not Load")
+format_sln:value("auto", "Load as Required")
+format_sln.rmempty = true
+
+format_vox = module:option(ListValue, "format_vox", "Dialogic VOX (ADPCM) File Format", "")
+format_vox:value("yes", "Load")
+format_vox:value("no", "Do Not Load")
+format_vox:value("auto", "Load as Required")
+format_vox.rmempty = true
+
+format_wav = module:option(ListValue, "format_wav", "Microsoft WAV format (8000hz Signed Line", "")
+format_wav:value("yes", "Load")
+format_wav:value("no", "Do Not Load")
+format_wav:value("auto", "Load as Required")
+format_wav.rmempty = true
+
+format_wav_gsm = module:option(ListValue, "format_wav_gsm", "Microsoft WAV format (Proprietary GSM)", "")
+format_wav_gsm:value("yes", "Load")
+format_wav_gsm:value("no", "Do Not Load")
+format_wav_gsm:value("auto", "Load as Required")
+format_wav_gsm.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
new file mode 100644
index 00000000..7d80641f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-func.lua
@@ -0,0 +1,40 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+func_callerid = module:option(ListValue, "func_callerid", "Caller ID related dialplan functions", "")
+func_callerid:value("yes", "Load")
+func_callerid:value("no", "Do Not Load")
+func_callerid:value("auto", "Load as Required")
+func_callerid.rmempty = true
+
+func_enum = module:option(ListValue, "func_enum", "ENUM Functions", "")
+func_enum:value("yes", "Load")
+func_enum:value("no", "Do Not Load")
+func_enum:value("auto", "Load as Required")
+func_enum.rmempty = true
+
+func_uri = module:option(ListValue, "func_uri", "URI encoding / decoding functions", "")
+func_uri:value("yes", "Load")
+func_uri:value("no", "Do Not Load")
+func_uri:value("auto", "Load as Required")
+func_uri.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
new file mode 100644
index 00000000..8b22b5cb
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-pbx.lua
@@ -0,0 +1,64 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+pbx_ael = module:option(ListValue, "pbx_ael", "Asterisk Extension Language Compiler", "")
+pbx_ael:value("yes", "Load")
+pbx_ael:value("no", "Do Not Load")
+pbx_ael:value("auto", "Load as Required")
+pbx_ael.rmempty = true
+
+pbx_config = module:option(ListValue, "pbx_config", "Text Extension Configuration", "")
+pbx_config:value("yes", "Load")
+pbx_config:value("no", "Do Not Load")
+pbx_config:value("auto", "Load as Required")
+pbx_config.rmempty = true
+
+pbx_functions = module:option(ListValue, "pbx_functions", "load => .so ; Builtin dialplan functions", "")
+pbx_functions:value("yes", "Load")
+pbx_functions:value("no", "Do Not Load")
+pbx_functions:value("auto", "Load as Required")
+pbx_functions.rmempty = true
+
+pbx_loopback = module:option(ListValue, "pbx_loopback", "Loopback Switch", "")
+pbx_loopback:value("yes", "Load")
+pbx_loopback:value("no", "Do Not Load")
+pbx_loopback:value("auto", "Load as Required")
+pbx_loopback.rmempty = true
+
+pbx_realtime = module:option(ListValue, "pbx_realtime", "Realtime Switch", "")
+pbx_realtime:value("yes", "Load")
+pbx_realtime:value("no", "Do Not Load")
+pbx_realtime:value("auto", "Load as Required")
+pbx_realtime.rmempty = true
+
+pbx_spool = module:option(ListValue, "pbx_spool", "Outgoing Spool Support", "")
+pbx_spool:value("yes", "Load")
+pbx_spool:value("no", "Do Not Load")
+pbx_spool:value("auto", "Load as Required")
+pbx_spool.rmempty = true
+
+pbx_wilcalu = module:option(ListValue, "pbx_wilcalu", "Wil Cal U (Auto Dialer)", "")
+pbx_wilcalu:value("yes", "Load")
+pbx_wilcalu:value("no", "Do Not Load")
+pbx_wilcalu:value("auto", "Load as Required")
+pbx_wilcalu.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
new file mode 100644
index 00000000..35c5d476
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua
@@ -0,0 +1,111 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+featuremap = cbimap:section(TypedSection, "featuremap", "Feature Key maps", "")
+featuremap.anonymous = true
+featuremap.addremove = true
+
+atxfer = featuremap:option(Value, "atxfer", "Attended transfer key", "")
+atxfer.rmempty = true
+
+blindxfer = featuremap:option(Value, "blindxfer", "Blind transfer key", "")
+blindxfer.rmempty = true
+
+disconnect = featuremap:option(Value, "disconnect", "Key to Disconnect call", "")
+disconnect.rmempty = true
+
+parkcall = featuremap:option(Value, "parkcall", "Key to Park call", "")
+parkcall.rmempty = true
+
+
+featurepark = cbimap:section(TypedSection, "featurepark", "Parking Feature", "")
+featurepark.anonymous = true
+
+parkenabled = featurepark:option(Flag, "parkenabled", "Enable Parking", "")
+
+adsipark = featurepark:option(Flag, "adsipark", "ADSI Park", "")
+adsipark.rmempty = true
+adsipark:depends({ parkenabled = "1" })
+
+atxfernoanswertimeout = featurepark:option(Value, "atxfernoanswertimeout", "Attended transfer timeout (sec)", "")
+atxfernoanswertimeout.rmempty = true
+atxfernoanswertimeout:depends({ parkenabled = "1" })
+
+automon = featurepark:option(Value, "automon", "One touch record key", "")
+automon.rmempty = true
+automon:depends({ parkenabled = "1" })
+
+context = featurepark:option(Value, "context", "Name of call context for parking", "")
+context.rmempty = true
+context:depends({ parkenabled = "1" })
+
+courtesytone = featurepark:option(Value, "courtesytone", "Sound file to play to parked caller", "")
+courtesytone.rmempty = true
+courtesytone:depends({ parkenabled = "1" })
+
+featuredigittimeout = featurepark:option(Value, "featuredigittimeout", "Max time (ms) between digits for feature activation", "")
+featuredigittimeout.rmempty = true
+featuredigittimeout:depends({ parkenabled = "1" })
+
+findslot = featurepark:option(ListValue, "findslot", "Method to Find Parking slot", "")
+findslot:value("first", "First available slot")
+findslot:value("next", "Next free parking space")
+findslot.rmempty = true
+findslot:depends({ parkenabled = "1" })
+
+parkedmusicclass = featurepark:option(ListValue, "parkedmusicclass", "Music on Hold class for the parked channel", "")
+parkedmusicclass.titleref = luci.dispatcher.build_url( "admin", "services", "asterisk" )
+parkedmusicclass:depends({ parkenabled = "1" })
+cbimap.uci:foreach( "asterisk", "moh", function(s) parkedmusicclass:value(s['.name']) end )
+
+parkedplay = featurepark:option(ListValue, "parkedplay", "Play courtesy tone to", "")
+parkedplay:value("caller", "Caller")
+parkedplay:value("parked", "Parked user")
+parkedplay:value("both", "Both")
+parkedplay.rmempty = true
+parkedplay:depends({ parkenabled = "1" })
+
+parkext = featurepark:option(Value, "parkext", "Extension to dial to park", "")
+parkext.rmempty = true
+parkext:depends({ parkenabled = "1" })
+
+parkingtime = featurepark:option(Value, "parkingtime", "Parking time (secs)", "")
+parkingtime.rmempty = true
+parkingtime:depends({ parkenabled = "1" })
+
+parkpos = featurepark:option(Value, "parkpos", "Range of extensions for call parking", "")
+parkpos.rmempty = true
+parkpos:depends({ parkenabled = "1" })
+
+pickupexten = featurepark:option(Value, "pickupexten", "Pickup extension", "")
+pickupexten.rmempty = true
+pickupexten:depends({ parkenabled = "1" })
+
+transferdigittimeout = featurepark:option(Value, "transferdigittimeout", "Seconds to wait bewteen digits when transferring", "")
+transferdigittimeout.rmempty = true
+transferdigittimeout:depends({ parkenabled = "1" })
+
+xferfailsound = featurepark:option(Value, "xferfailsound", "sound when attended transfer is complete", "")
+xferfailsound.rmempty = true
+xferfailsound:depends({ parkenabled = "1" })
+
+xfersound = featurepark:option(Value, "xfersound", "Sound when attended transfer fails", "")
+xfersound.rmempty = true
+xfersound:depends({ parkenabled = "1" })
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
new file mode 100644
index 00000000..5ef6bddd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-mod-res.lua
@@ -0,0 +1,88 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+module = cbimap:section(TypedSection, "module", "Modules", "")
+module.anonymous = true
+
+res_config_mysql = module:option(ListValue, "res_config_mysql", "MySQL Config Resource", "")
+res_config_mysql:value("yes", "Load")
+res_config_mysql:value("no", "Do Not Load")
+res_config_mysql:value("auto", "Load as Required")
+res_config_mysql.rmempty = true
+
+res_config_odbc = module:option(ListValue, "res_config_odbc", "ODBC Config Resource", "")
+res_config_odbc:value("yes", "Load")
+res_config_odbc:value("no", "Do Not Load")
+res_config_odbc:value("auto", "Load as Required")
+res_config_odbc.rmempty = true
+
+res_config_pgsql = module:option(ListValue, "res_config_pgsql", "PGSQL Module", "")
+res_config_pgsql:value("yes", "Load")
+res_config_pgsql:value("no", "Do Not Load")
+res_config_pgsql:value("auto", "Load as Required")
+res_config_pgsql.rmempty = true
+
+res_crypto = module:option(ListValue, "res_crypto", "Cryptographic Digital Signatures", "")
+res_crypto:value("yes", "Load")
+res_crypto:value("no", "Do Not Load")
+res_crypto:value("auto", "Load as Required")
+res_crypto.rmempty = true
+
+res_features = module:option(ListValue, "res_features", "Call Parking Resource", "")
+res_features:value("yes", "Load")
+res_features:value("no", "Do Not Load")
+res_features:value("auto", "Load as Required")
+res_features.rmempty = true
+
+res_indications = module:option(ListValue, "res_indications", "Indications Configuration", "")
+res_indications:value("yes", "Load")
+res_indications:value("no", "Do Not Load")
+res_indications:value("auto", "Load as Required")
+res_indications.rmempty = true
+
+res_monitor = module:option(ListValue, "res_monitor", "Call Monitoring Resource", "")
+res_monitor:value("yes", "Load")
+res_monitor:value("no", "Do Not Load")
+res_monitor:value("auto", "Load as Required")
+res_monitor.rmempty = true
+
+res_musiconhold = module:option(ListValue, "res_musiconhold", "Music On Hold Resource", "")
+res_musiconhold:value("yes", "Load")
+res_musiconhold:value("no", "Do Not Load")
+res_musiconhold:value("auto", "Load as Required")
+res_musiconhold.rmempty = true
+
+res_odbc = module:option(ListValue, "res_odbc", "ODBC Resource", "")
+res_odbc:value("yes", "Load")
+res_odbc:value("no", "Do Not Load")
+res_odbc:value("auto", "Load as Required")
+res_odbc.rmempty = true
+
+res_smdi = module:option(ListValue, "res_smdi", "SMDI Module", "")
+res_smdi:value("yes", "Load")
+res_smdi:value("no", "Do Not Load")
+res_smdi:value("auto", "Load as Required")
+res_smdi.rmempty = true
+
+res_snmp = module:option(ListValue, "res_snmp", "SNMP Module", "")
+res_snmp:value("yes", "Load")
+res_snmp:value("no", "Do Not Load")
+res_snmp:value("auto", "Load as Required")
+res_snmp.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
new file mode 100644
index 00000000..efb84a01
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-sip-connections.lua
@@ -0,0 +1,109 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+sip = cbimap:section(TypedSection, "sip", "SIP Connection", "")
+sip.addremove = true
+
+alwaysinternational = sip:option(Flag, "alwaysinternational", "Always Dial International", "")
+alwaysinternational.optional = true
+
+canreinvite = sip:option(ListValue, "canreinvite", "Reinvite/redirect media connections", "")
+canreinvite:value("yes", "Yes")
+canreinvite:value("nonat", "Yes when not behind NAT")
+canreinvite:value("update", "Use UPDATE rather than INVITE for path redirection")
+canreinvite:value("no", "No")
+canreinvite.optional = true
+
+context = sip:option(ListValue, "context", "Context to use", "")
+context.titleref = luci.dispatcher.build_url( "admin", "services", "asterisk", "dialplans" )
+cbimap.uci:foreach( "asterisk", "dialplan", function(s) context:value(s['.name']) end )
+cbimap.uci:foreach( "asterisk", "dialzone", function(s) context:value(s['.name']) end )
+
+countrycode = sip:option(Value, "countrycode", "Country Code for connection", "")
+countrycode.optional = true
+
+dtmfmode = sip:option(ListValue, "dtmfmode", "DTMF mode", "")
+dtmfmode:value("info", "Use RFC2833 or INFO for the BudgeTone")
+dtmfmode:value("rfc2833", "Use RFC2833 for the BudgeTone")
+dtmfmode:value("inband", "Use Inband (only with ulaw/alaw)")
+dtmfmode.optional = true
+
+extension = sip:option(Value, "extension", "Add as Extension", "")
+extension.optional = true
+
+fromdomain = sip:option(Value, "fromdomain", "Primary domain identity for From: headers", "")
+fromdomain.optional = true
+
+fromuser = sip:option(Value, "fromuser", "From user (required by many SIP providers)", "")
+fromuser.optional = true
+
+host = sip:option(Value, "host", "Host name (or blank)", "")
+host.optional = true
+
+incoming = sip:option(DynamicList, "incoming", "Ring on incoming dialplan contexts", "")
+incoming.optional = true
+
+insecure = sip:option(ListValue, "insecure", "Allow Insecure for", "")
+insecure:value("port", "Allow mismatched port number")
+insecure:value("invite", "Do not require auth of incoming INVITE")
+insecure:value("port,invite", "Allow mismatched port and Do not require auth of incoming INVITE")
+insecure.optional = true
+
+internationalprefix = sip:option(Value, "internationalprefix", "International Dial Prefix", "")
+internationalprefix.optional = true
+
+mailbox = sip:option(Value, "mailbox", "Mailbox for MWI", "")
+mailbox.optional = true
+
+nat = sip:option(Flag, "nat", "NAT between phone and Asterisk", "")
+nat.optional = true
+
+pedantic = sip:option(Flag, "pedantic", "Check tags in headers", "")
+pedantic.optional = true
+
+port = sip:option(Value, "port", "SIP Port", "")
+port.optional = true
+
+prefix = sip:option(Value, "prefix", "Dial Prefix (for external line)", "")
+prefix.optional = true
+
+qualify = sip:option(Value, "qualify", "Reply Timeout (ms) for down connection", "")
+qualify.optional = true
+
+register = sip:option(Flag, "register", "Register connection", "")
+register.optional = true
+
+secret = sip:option(Value, "secret", "Secret", "")
+secret.optional = true
+
+selfmailbox = sip:option(Flag, "selfmailbox", "Dial own extension for mailbox", "")
+selfmailbox.optional = true
+
+timeout = sip:option(Value, "timeout", "Dial Timeout (sec)", "")
+timeout.optional = true
+
+type = sip:option(ListValue, "type", "Client Type", "")
+type:value("friend", "Friend (outbound/inbound)")
+type:value("user", "User (inbound - authenticate by \"from\")")
+type:value("peer", "Peer (outbound - match by host)")
+type.optional = true
+
+username = sip:option(Value, "username", "Username", "")
+username.optional = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua
new file mode 100644
index 00000000..af025954
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk-voice.lua
@@ -0,0 +1,52 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+voicegeneral = cbimap:section(TypedSection, "voicegeneral", "Voicemail general options", "")
+
+serveremail = voicegeneral:option(Value, "serveremail", "From Email address of server", "")
+
+
+voicemail = cbimap:section(TypedSection, "voicemail", "Voice Mail boxes", "")
+voicemail.addremove = true
+
+attach = voicemail:option(Flag, "attach", "Email contains attachment", "")
+attach.rmempty = true
+
+email = voicemail:option(Value, "email", "Email", "")
+email.rmempty = true
+
+name = voicemail:option(Value, "name", "Display Name", "")
+name.rmempty = true
+
+password = voicemail:option(Value, "password", "Password", "")
+password.rmempty = true
+
+zone = voicemail:option(ListValue, "zone", "Voice Zone", "")
+cbimap.uci:foreach( "asterisk", "voicezone", function(s) zone:value(s['.name']) end )
+
+
+voicezone = cbimap:section(TypedSection, "voicezone", "Voice Zone settings", "")
+voicezone.addremove = true
+
+message = voicezone:option(Value, "message", "Message Format", "")
+message.rmempty = true
+
+zone = voicezone:option(Value, "zone", "Time Zone", "")
+zone.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua
new file mode 100644
index 00000000..7580f22e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk.lua
@@ -0,0 +1,162 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "asterisk", "")
+
+asterisk = cbimap:section(TypedSection, "asterisk", "Asterisk General Options", "")
+asterisk.anonymous = true
+
+agidir = asterisk:option(Value, "agidir", "AGI directory", "")
+agidir.rmempty = true
+
+cache_record_files = asterisk:option(Flag, "cache_record_files", "Cache recorded sound files during recording", "")
+cache_record_files.rmempty = true
+
+debug = asterisk:option(Value, "debug", "Debug Level", "")
+debug.rmempty = true
+
+dontwarn = asterisk:option(Flag, "dontwarn", "Disable some warnings", "")
+dontwarn.rmempty = true
+
+dumpcore = asterisk:option(Flag, "dumpcore", "Dump core on crash", "")
+dumpcore.rmempty = true
+
+highpriority = asterisk:option(Flag, "highpriority", "High Priority", "")
+highpriority.rmempty = true
+
+initcrypto = asterisk:option(Flag, "initcrypto", "Initialise Crypto", "")
+initcrypto.rmempty = true
+
+internal_timing = asterisk:option(Flag, "internal_timing", "Use Internal Timing", "")
+internal_timing.rmempty = true
+
+logdir = asterisk:option(Value, "logdir", "Log directory", "")
+logdir.rmempty = true
+
+maxcalls = asterisk:option(Value, "maxcalls", "Maximum number of calls allowed", "")
+maxcalls.rmempty = true
+
+maxload = asterisk:option(Value, "maxload", "Maximum load to stop accepting new calls", "")
+maxload.rmempty = true
+
+nocolor = asterisk:option(Flag, "nocolor", "Disable console colors", "")
+nocolor.rmempty = true
+
+record_cache_dir = asterisk:option(Value, "record_cache_dir", "Sound files Cache directory", "")
+record_cache_dir.rmempty = true
+record_cache_dir:depends({ ["cache_record_files"] = "true" })
+
+rungroup = asterisk:option(Flag, "rungroup", "The Group to run as", "")
+rungroup.rmempty = true
+
+runuser = asterisk:option(Flag, "runuser", "The User to run as", "")
+runuser.rmempty = true
+
+spooldir = asterisk:option(Value, "spooldir", "Voicemail Spool directory", "")
+spooldir.rmempty = true
+
+systemname = asterisk:option(Value, "systemname", "Prefix UniquID with system name", "")
+systemname.rmempty = true
+
+transcode_via_sln = asterisk:option(Flag, "transcode_via_sln", "Build transcode paths via SLINEAR, not directly", "")
+transcode_via_sln.rmempty = true
+
+transmit_silence_during_record = asterisk:option(Flag, "transmit_silence_during_record", "Transmit SLINEAR silence while recording a channel", "")
+transmit_silence_during_record.rmempty = true
+
+verbose = asterisk:option(Value, "verbose", "Verbose Level", "")
+verbose.rmempty = true
+
+zone = asterisk:option(Value, "zone", "Time Zone", "")
+zone.rmempty = true
+
+
+hardwarereboot = cbimap:section(TypedSection, "hardwarereboot", "Reload Hardware Config", "")
+
+method = hardwarereboot:option(ListValue, "method", "Reboot Method", "")
+method:value("web", "Web URL (wget)")
+method:value("system", "program to run")
+method.rmempty = true
+
+param = hardwarereboot:option(Value, "param", "Parameter", "")
+param.rmempty = true
+
+
+iaxgeneral = cbimap:section(TypedSection, "iaxgeneral", "IAX General Options", "")
+iaxgeneral.anonymous = true
+iaxgeneral.addremove = true
+
+allow = iaxgeneral:option(MultiValue, "allow", "Allow Codecs", "")
+allow:value("alaw", "alaw")
+allow:value("gsm", "gsm")
+allow:value("g726", "g726")
+allow.rmempty = true
+
+canreinvite = iaxgeneral:option(ListValue, "canreinvite", "Reinvite/redirect media connections", "")
+canreinvite:value("yes", "Yes")
+canreinvite:value("nonat", "Yes when not behind NAT")
+canreinvite:value("update", "Use UPDATE rather than INVITE for path redirection")
+canreinvite:value("no", "No")
+canreinvite.rmempty = true
+
+static = iaxgeneral:option(Flag, "static", "Static", "")
+static.rmempty = true
+
+writeprotect = iaxgeneral:option(Flag, "writeprotect", "Write Protect", "")
+writeprotect.rmempty = true
+
+
+sipgeneral = cbimap:section(TypedSection, "sipgeneral", "Section sipgeneral", "")
+sipgeneral.anonymous = true
+sipgeneral.addremove = true
+
+allow = sipgeneral:option(MultiValue, "allow", "Allow codecs", "")
+allow:value("ulaw", "ulaw")
+allow:value("alaw", "alaw")
+allow:value("gsm", "gsm")
+allow:value("g726", "g726")
+allow.rmempty = true
+
+port = sipgeneral:option(Value, "port", "SIP Port", "")
+port.rmempty = true
+
+realm = sipgeneral:option(Value, "realm", "SIP realm", "")
+realm.rmempty = true
+
+
+moh = cbimap:section(TypedSection, "moh", "Music On Hold", "")
+
+application = moh:option(Value, "application", "Application", "")
+application.rmempty = true
+application:depends({ ["asterisk.moh.mode"] = "custom" })
+
+directory = moh:option(Value, "directory", "Directory of Music", "")
+directory.rmempty = true
+
+mode = moh:option(ListValue, "mode", "Option mode", "")
+mode:value("system", "program to run")
+mode:value("files", "Read files from directory")
+mode:value("quietmp3", "Quite MP3")
+mode:value("mp3", "Loud MP3")
+mode:value("mp3nb", "unbuffered MP3")
+mode:value("quietmp3nb", "Quiet Unbuffered MP3")
+mode:value("custom", "Run a custom application")
+mode.rmempty = true
+
+random = moh:option(Flag, "random", "Random Play", "")
+random.rmempty = true
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
new file mode 100644
index 00000000..3115e10d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplan_out.lua
@@ -0,0 +1,137 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local ast = require("luci.asterisk")
+
+local function find_outgoing_contexts(uci)
+	local c = { }
+	local h = { }
+
+--	uci:foreach("asterisk", "dialplan",
+--		function(s)
+--			if not h[s['.name']] then
+--				c[#c+1] = { s['.name'], "Dialplan: %s" % s['.name'] }
+--				h[s['.name']] = true
+--			end
+--		end)
+
+	uci:foreach("asterisk", "dialzone",
+		function(s)
+			if not h[s['.name']] then
+				c[#c+1] = { s['.name'], "Dialzone: %s" % s['.name'] }
+				h[s['.name']] = true
+			end
+		end)
+
+	return c
+end
+
+local function find_incoming_contexts(uci)
+	local c = { }
+	local h = { }
+
+	uci:foreach("asterisk", "sip",
+		function(s)
+			if s.context and not h[s.context] and
+			   uci:get_bool("asterisk", s['.name'], "provider")
+			then
+				c[#c+1] = { s.context, "Incoming: %s" % s['.name'] or s.context }
+				h[s.context] = true
+			end
+		end)
+
+	return c
+end
+
+local function find_trunks(uci)
+	local t = { }
+
+	uci:foreach("asterisk", "sip",
+		function(s)
+			if uci:get_bool("asterisk", s['.name'], "provider") then
+				t[#t+1] = {
+					"SIP/%s" % s['.name'],
+					"SIP: %s" % s['.name']
+				}
+			end
+		end)
+
+	uci:foreach("asterisk", "iax",
+		function(s)
+			t[#t+1] = {
+				"IAX/%s" % s['.name'],
+				"IAX: %s" % s.extension or s['.name']
+			}
+		end)
+
+	return t
+end
+
+--[[
+
+dialzone {name} - Outgoing zone.
+	uses          - Outgoing line to use: TYPE/Name
+	match (list)  - Number to match
+	countrycode   - The effective country code of this dialzone
+	international (list) - International prefix to match
+	localzone     - dialzone for local numbers
+	addprefix     - Prexix required to dial out.
+	localprefix   - Prefix for a local call
+
+]]
+
+
+--
+-- SIP dialzone configuration
+--
+if arg[1] then
+	cbimap = Map("asterisk", "Edit Dialplan Entry")
+
+	entry = cbimap:section(NamedSection, arg[1])
+
+	back = entry:option(DummyValue, "_overview", "Back to dialplan overview")
+	back.value = ""
+	back.titleref = luci.dispatcher.build_url("admin", "asterisk", "dialplans")
+
+	desc = entry:option(Value, "description", "Description")
+	function desc.cfgvalue(self, s, ...)
+		return Value.cfgvalue(self, s, ...) or s
+	end
+
+	match = entry:option(DynamicList, "match", "Number matches")
+
+	intl = entry:option(DynamicList, "international", "Intl. prefix matches (optional)")
+
+	trunk = entry:option(MultiValue, "uses", "Used trunk")
+	for _, v in ipairs(find_trunks(cbimap.uci)) do
+		trunk:value(unpack(v))
+	end
+
+	aprefix = entry:option(Value, "addprefix", "Add prefix to dial out (optional)")
+	--ast.idd.cbifill(aprefix)
+
+	ccode = entry:option(Value, "countrycode", "Effective countrycode (optional)")
+	ast.cc.cbifill(ccode)
+
+	lzone = entry:option(ListValue, "localzone", "Dialzone for local numbers")
+	lzone:value("", "no special treatment of local numbers")
+	for _, v in ipairs(find_outgoing_contexts(cbimap.uci)) do
+		lzone:value(unpack(v))
+	end
+
+	lprefix = entry:option(Value, "localprefix", "Prefix for local calls (optional)")
+
+	return cbimap
+end
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplans.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
new file mode 100644
index 00000000..3a993da4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialplans.lua
@@ -0,0 +1,115 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local ast = require("luci.asterisk")
+
+cbimap = Map("asterisk", "Registered Trunks")
+cbimap.pageaction = false
+
+local sip_peers = { }
+cbimap.uci:foreach("asterisk", "sip",
+	function(s)
+		if s.type == "peer" then
+			s.name = s['.name']
+			s.info = ast.sip.peer(s.name)
+			sip_peers[s.name] = s
+		end
+	end)
+
+
+sip_table = cbimap:section(TypedSection, "sip", "SIP Trunks")
+sip_table.template    = "cbi/tblsection"
+sip_table.extedit     = luci.dispatcher.build_url("admin", "asterisk", "trunks", "sip", "%s")
+sip_table.addremove   = true
+sip_table.sectionhead = "Extension"
+
+function sip_table.filter(self, s)
+	return s and (
+		cbimap.uci:get("asterisk", s, "type") == nil or
+		cbimap.uci:get_bool("asterisk", s, "provider")
+	)
+end
+
+function sip_table.create(self, section)
+	if TypedSection.create(self, section) then
+		created = section
+	else
+		self.invalid_cts = true
+	end
+end
+
+function sip_table.parse(self, ...)
+	TypedSection.parse(self, ...)
+	if created then
+		cbimap.uci:tset("asterisk", created, {
+			type     = "friend",
+			qualify  = "yes",
+			provider = "yes"
+		})
+
+		cbimap.uci:save("asterisk")
+		luci.http.redirect(luci.dispatcher.build_url(
+			"admin", "asterisk", "trunks", "sip", created
+		))
+	end
+end
+
+
+user = sip_table:option(DummyValue, "username", "Username")
+
+host = sip_table:option(DummyValue, "host", "Hostname")
+function host.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.address then
+		return "%s:%i" %{ sip_peers[s].info.address, sip_peers[s].info.port }
+	else
+		return "n/a"
+	end
+end
+
+context = sip_table:option(DummyValue, "context", "Dialplan")
+context.href = luci.dispatcher.build_url("admin", "asterisk", "dialplan")
+function context.cfgvalue(...)
+	return AbstractValue.cfgvalue(...) or "(default)"
+end
+
+online = sip_table:option(DummyValue, "online", "Registered")
+function online.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.online == nil then
+		return "n/a"
+	else
+		return sip_peers[s] and sip_peers[s].info.online
+			and "yes" or "no (%s)" %{
+				sip_peers[s] and sip_peers[s].info.Status:lower() or "unknown"
+			}
+	end
+end
+
+delay = sip_table:option(DummyValue, "delay", "Delay")
+function delay.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.online then
+		return "%i ms" % sip_peers[s].info.delay
+	else
+		return "n/a"
+	end
+end
+
+info = sip_table:option(Button, "_info", "Info")
+function info.write(self, s)
+	luci.http.redirect(luci.dispatcher.build_url(
+		"admin", "asterisk", "trunks", "sip", s, "info"
+	))
+end
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialzones.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
new file mode 100644
index 00000000..4867911c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/dialzones.lua
@@ -0,0 +1,135 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: trunks.lua 4025 2009-01-11 23:37:21Z jow $
+
+]]--
+
+local ast = require("luci.asterisk")
+local uci = require("luci.model.uci").cursor()
+
+--[[
+	Dialzone overview table
+]]
+
+if not arg[1] then
+	zonemap = Map("asterisk", "Dial Zones", [[
+		Dial zones hold patterns of dialed numbers to match.
+		Each zone has one or more trunks assigned. If the first trunk is
+		congested, Asterisk will try to use the next available connection.
+		If all trunks fail, then the following zones in the parent dialplan
+		are tried.
+	]])
+
+	local zones, znames = ast.dialzone.zones()
+
+	zonetbl = zonemap:section(Table, zones, "Zone Overview")
+	zonetbl.sectionhead = "Zone"
+	zonetbl.addremove   = true
+	zonetbl.anonymous   = false
+	zonetbl.extedit     = luci.dispatcher.build_url(
+		"admin", "asterisk", "dialplans", "zones", "%s"
+	)
+
+	function zonetbl.cfgsections(self)
+		return znames
+	end
+
+	function zonetbl.parse(self)
+		for k, v in pairs(self.map:formvaluetable(
+			luci.cbi.REMOVE_PREFIX .. self.config
+		) or {}) do
+			if k:sub(-2) == ".x" then k = k:sub(1, #k - 2) end
+			uci:delete("asterisk", k)
+			uci:save("asterisk")
+			self.data[k] = nil
+			for i = 1,#znames do
+				if znames[i] == k then
+					table.remove(znames, i)
+					break
+				end
+			end
+		end
+
+		Table.parse(self)
+	end
+
+	zonetbl:option(DummyValue, "description", "Description")
+	zonetbl:option(DummyValue, "addprefix")
+
+	match = zonetbl:option(DummyValue, "matches")
+	function match.cfgvalue(self, s)
+		return table.concat(zones[s].matches, ", ")
+	end
+
+	trunks = zonetbl:option(DummyValue, "trunk")
+	trunks.template = "asterisk/cbi/cell"
+	function trunks.cfgvalue(self, s)
+		return ast.tools.hyperlinks(zones[s].trunks)
+	end
+
+	return zonemap
+
+--[[
+	Zone edit form
+]]
+
+else
+	zoneedit = Map("asterisk", "Edit Dialzone")
+
+	entry = zoneedit:section(NamedSection, arg[1])
+	entry.title = "Zone %q" % arg[1];
+
+	back = entry:option(DummyValue, "_overview", "Back to dialzone overview")
+	back.value = ""
+	back.titleref = luci.dispatcher.build_url(
+		"admin", "asterisk", "dialplans", "zones"
+	)
+
+	desc = entry:option(Value, "description", "Description")
+	function desc.cfgvalue(self, s, ...)
+		return Value.cfgvalue(self, s, ...) or s
+	end
+
+	trunks = entry:option(MultiValue, "uses", "Used trunks")
+	trunks.widget = "checkbox"
+	uci:foreach("asterisk", "sip",
+		function(s)
+			if s.provider == "yes" then
+				trunks:value(
+					"SIP/%s" % s['.name'],
+					"SIP/%s (%s)" %{ s['.name'], s.host or 'n/a' }
+				)
+			end
+		end)
+
+
+	match = entry:option(DynamicList, "match", "Number matches")
+
+	intl = entry:option(DynamicList, "international", "Intl. prefix matches (optional)")
+
+	aprefix = entry:option(Value, "addprefix", "Add prefix to dial out (optional)")
+	ccode = entry:option(Value, "countrycode", "Effective countrycode (optional)")
+
+	lzone = entry:option(ListValue, "localzone", "Dialzone for local numbers")
+	lzone:value("", "no special treatment of local numbers")
+	for _, z in ipairs(ast.dialzone.zones()) do
+		lzone:value(z.name, "%q (%s)" %{ z.name, z.description })
+	end
+	--for _, v in ipairs(find_outgoing_contexts(zoneedit.uci)) do
+	--	lzone:value(unpack(v))
+	--end
+
+	lprefix = entry:option(Value, "localprefix", "Prefix for local calls (optional)")
+
+	return zoneedit
+
+end
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme.lua
new file mode 100644
index 00000000..b02a8f61
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme.lua
@@ -0,0 +1,49 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local ast = require "luci.asterisk"
+
+cbimap = Map("asterisk", "MeetMe - Rooms")
+
+meetme = cbimap:section(TypedSection, "meetme", "MeetMe Rooms")
+meetme.addremove = true
+meetme.anonymous = true
+meetme.template = "cbi/tblsection"
+meetme:option(Value, "_description", "Description", "Short room description")
+
+room = meetme:option(Value, "room", "Room Number", "Unique room identifier")
+
+function room.write(self, s, val)
+	if val and #val > 0 then
+		local old = self:cfgvalue(s)
+		self.map.uci:foreach("asterisk", "dialplanmeetme",
+			function(v)
+				if v.room == old then
+					self.map:set(v['.name'], "room", val)
+				end
+			end)
+		Value.write(self, s, val)
+	end
+end
+
+
+meetme:option(Value, "pin", "PIN", "PIN required to access")
+meetme:option(Value, "adminpin", "Admin PIN", "PIN required for administration")
+
+function meetme.remove(self, s)
+	return ast.meetme.remove(self.map:get(s, "room"), self.map.uci)
+end
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
new file mode 100644
index 00000000..511d7a71
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/meetme_settings.lua
@@ -0,0 +1,28 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+cbimap = Map("asterisk", "MeetMe - Common Settings",
+	"Common settings for MeetMe phone conferences.")
+
+meetme = cbimap:section(TypedSection, "meetmegeneral", "General MeetMe Options")
+meetme.addremove = false
+meetme.anonymous = true
+
+audiobuffers = meetme:option(ListValue, "audiobuffers",
+	"Number of 20ms audio buffers to use for conferences")
+
+for i = 2, 32 do audiobuffers:value(i) end
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
new file mode 100644
index 00000000..49d3a077
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phone_sip.lua
@@ -0,0 +1,157 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local ast = require("luci.asterisk")
+
+local function find_outgoing_contexts(uci)
+	local c = { }
+	local h = { }
+
+	uci:foreach("asterisk", "dialplan",
+		function(s)
+			if not h[s['.name']] then
+				c[#c+1] = { s['.name'], "Dialplan: %s" % s['.name'] }
+				h[s['.name']] = true
+			end
+		end)
+
+	return c
+end
+
+local function find_incoming_contexts(uci)
+	local c = { }
+	local h = { }
+
+	uci:foreach("asterisk", "sip",
+		function(s)
+			if s.context and not h[s.context] and
+			   uci:get_bool("asterisk", s['.name'], "provider")
+			then
+				c[#c+1] = { s.context, "Incoming: %s" % s['.name'] or s.context }
+				h[s.context] = true
+			end
+		end)
+
+	return c
+end
+
+
+--
+-- SIP phone info
+--
+if arg[2] == "info" then
+	form = SimpleForm("asterisk", "SIP Phone Information")
+	form.reset  = false
+	form.submit = "Back to overview"
+
+	local info, keys = ast.sip.peer(arg[1])
+	local data = { }
+
+	for _, key in ipairs(keys) do
+		data[#data+1] = {
+			key = key,
+			val = type(info[key]) == "boolean"
+				and ( info[key] and "yes" or "no" )
+				or  ( info[key] == nil or #info[key] == 0 )
+					and "(none)"
+					or  tostring(info[key])
+		}
+	end
+
+	itbl = form:section(Table, data, "SIP Phone %q" % arg[1])
+	itbl:option(DummyValue, "key", "Key")
+	itbl:option(DummyValue, "val", "Value")
+
+	function itbl.parse(...)
+		luci.http.redirect(
+			luci.dispatcher.build_url("admin", "asterisk", "phones")
+		)
+	end
+
+	return form
+
+--
+-- SIP phone configuration
+--
+elseif arg[1] then
+	cbimap = Map("asterisk", "Edit SIP Client")
+
+	peer = cbimap:section(NamedSection, arg[1])
+	peer.hidden = {
+		type        = "friend",
+		qualify     = "yes",
+		host        = "dynamic",
+		nat         = "no",
+		canreinvite = "no"
+	}
+
+	back = peer:option(DummyValue, "_overview", "Back to phone overview")
+	back.value = ""
+	back.titleref = luci.dispatcher.build_url("admin", "asterisk", "phones")
+
+	active = peer:option(Flag, "disable", "Account enabled")
+	active.enabled  = "yes"
+	active.disabled = "no"
+	function active.cfgvalue(...)
+		return AbstractValue.cfgvalue(...) or "yes"
+	end
+
+	exten = peer:option(Value, "extension", "Extension Number")
+	cbimap.uci:foreach("asterisk", "dialplanexten",
+		function(s)
+			exten:value(
+				s.extension,
+				"%s (via %s/%s)" %{ s.extension, s.type:upper(), s.target }
+			)
+		end)
+
+	display = peer:option(Value, "callerid", "Display Name")
+
+	username  = peer:option(Value, "username", "Authorization ID")
+	password  = peer:option(Value, "secret", "Authorization Password")
+	password.password = true
+
+	regtimeout = peer:option(Value, "registertimeout", "Registration Time Value")
+	function regtimeout.cfgvalue(...)
+		return AbstractValue.cfgvalue(...) or "60"
+	end
+
+	sipport = peer:option(Value, "port", "SIP Port")
+	function sipport.cfgvalue(...)
+		return AbstractValue.cfgvalue(...) or "5060"
+	end
+
+	linekey = peer:option(ListValue, "_linekey", "Linekey Mode (broken)")
+	linekey:value("", "Off")
+	linekey:value("trunk", "Trunk Appearance")
+	linekey:value("call", "Call Appearance")
+
+	dialplan = peer:option(ListValue, "context", "Assign Dialplan")
+	dialplan.titleref = luci.dispatcher.build_url("admin", "asterisk", "dialplans")
+	for _, v in ipairs(find_outgoing_contexts(cbimap.uci)) do
+		dialplan:value(unpack(v))
+	end
+
+	incoming = peer:option(StaticList, "incoming", "Receive incoming calls from")
+	for _, v in ipairs(find_incoming_contexts(cbimap.uci)) do
+		incoming:value(unpack(v))
+	end
+
+	--function incoming.cfgvalue(...)
+		--error(table.concat(MultiValue.cfgvalue(...),"."))
+	--end
+
+	return cbimap
+end
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phones.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phones.lua
new file mode 100644
index 00000000..7c8f03f0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/phones.lua
@@ -0,0 +1,116 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local ast = require("luci.asterisk")
+
+cbimap = Map("asterisk", "Registered Phones")
+cbimap.pageaction = false
+
+local sip_peers = { }
+cbimap.uci:foreach("asterisk", "sip",
+	function(s)
+		if s.type ~= "peer" then
+			s.name = s['.name']
+			s.info = ast.sip.peer(s.name)
+			sip_peers[s.name] = s
+		end
+	end)
+
+
+sip_table = cbimap:section(TypedSection, "sip", "SIP Phones")
+sip_table.template  = "cbi/tblsection"
+sip_table.extedit   = luci.dispatcher.build_url("admin", "asterisk", "phones", "sip", "%s")
+sip_table.addremove = true
+
+function sip_table.filter(self, s)
+	return s and not cbimap.uci:get_bool("asterisk", s, "provider")
+end
+
+function sip_table.create(self, section)
+	if TypedSection.create(self, section) then
+		created = section
+		cbimap.uci:tset("asterisk", section, {
+			type        = "friend",
+			qualify     = "yes",
+			provider    = "no",
+			host        = "dynamic",
+			nat         = "no",
+			canreinvite = "no",
+			extension   = section:match("^%d+$") and section or "",
+			username    = section:match("^%d+$") and section or ""
+		})
+	else
+		self.invalid_cts = true
+	end
+end
+
+function sip_table.parse(self, ...)
+	TypedSection.parse(self, ...)
+	if created then
+		cbimap.uci:save("asterisk")
+		luci.http.redirect(luci.dispatcher.build_url(
+			"admin", "asterisk", "phones", "sip", created
+		))
+	end
+end
+
+
+user = sip_table:option(DummyValue, "username", "Username")
+function user.cfgvalue(self, s)
+	return sip_peers[s] and sip_peers[s].callerid or
+		AbstractValue.cfgvalue(self, s)
+end
+
+host = sip_table:option(DummyValue, "host", "Hostname")
+function host.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.address then
+		return "%s:%i" %{ sip_peers[s].info.address, sip_peers[s].info.port }
+	else
+		return "n/a"
+	end
+end
+
+context = sip_table:option(DummyValue, "context", "Dialplan")
+context.href = luci.dispatcher.build_url("admin", "asterisk", "dialplan")
+
+online = sip_table:option(DummyValue, "online", "Registered")
+function online.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.online == nil then
+		return "n/a"
+	else
+		return sip_peers[s] and sip_peers[s].info.online
+			and "yes" or "no (%s)" % {
+				sip_peers[s] and sip_peers[s].info.Status:lower() or "unknown"
+			}
+	end
+end
+
+delay = sip_table:option(DummyValue, "delay", "Delay")
+function delay.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.online then
+		return "%i ms" % sip_peers[s].info.delay
+	else
+		return "n/a"
+	end
+end
+
+info = sip_table:option(Button, "_info", "Info")
+function info.write(self, s)
+	luci.http.redirect(luci.dispatcher.build_url(
+		"admin", "asterisk", "phones", "sip", s, "info"
+	))
+end
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
new file mode 100644
index 00000000..e2e73eef
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
@@ -0,0 +1,98 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local ast = require("luci.asterisk")
+
+--
+-- SIP trunk info
+--
+if arg[2] == "info" then
+	form = SimpleForm("asterisk", "SIP Trunk Information")
+	form.reset  = false
+	form.submit = "Back to overview"
+
+	local info, keys = ast.sip.peer(arg[1])
+	local data = { }
+
+	for _, key in ipairs(keys) do
+		data[#data+1] = {
+			key = key,
+			val = type(info[key]) == "boolean"
+				and ( info[key] and "yes" or "no" )
+				or  ( info[key] == nil or #info[key] == 0 )
+					and "(none)"
+					or  tostring(info[key])
+		}
+	end
+
+	itbl = form:section(Table, data, "SIP Trunk %q" % arg[1])
+	itbl:option(DummyValue, "key", "Key")
+	itbl:option(DummyValue, "val", "Value")
+
+	function itbl.parse(...)
+		luci.http.redirect(
+			luci.dispatcher.build_url("admin", "asterisk", "trunks")
+		)
+	end
+
+	return form
+
+--
+-- SIP trunk config
+--
+elseif arg[1] then
+	cbimap = Map("asterisk", "Edit SIP Trunk")
+
+	peer = cbimap:section(NamedSection, arg[1])
+	peer.hidden = {
+		type    = "peer",
+		qualify = "yes",
+	}
+
+	back = peer:option(DummyValue, "_overview", "Back to trunk overview")
+	back.value = ""
+	back.titleref = luci.dispatcher.build_url("admin", "asterisk", "trunks")
+
+	sipdomain = peer:option(Value, "host", "SIP Domain")
+	sipport   = peer:option(Value, "port", "SIP Port")
+	function sipport.cfgvalue(...)
+		return AbstractValue.cfgvalue(...) or "5060"
+	end
+
+	username  = peer:option(Value, "username", "Authorization ID")
+	password  = peer:option(Value, "secret", "Authorization Password")
+	password.password = true
+
+	outboundproxy = peer:option(Value, "outboundproxy", "Outbound Proxy")
+	outboundport  = peer:option(Value, "outboundproxyport", "Outbound Proxy Port")
+
+	register = peer:option(Flag, "register", "Register with peer")
+	register.enabled  = "yes"
+	register.disabled = "no"
+
+	regext = peer:option(Value, "registerextension", "Extension to register (optional)")
+	regext:depends({register="1"})
+
+	didval = peer:option(ListValue, "_did", "Number of assigned DID numbers")
+	didval:value("", "(none)")
+	for i=1,24 do didval:value(i) end
+
+	dialplan = peer:option(ListValue, "context", "Dialplan Context")
+	dialplan:value(arg[1] .. "_inbound", "(default)")
+	cbimap.uci:foreach("asterisk", "dialplan",
+		function(s) dialplan:value(s['.name']) end)
+
+	return cbimap
+end
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
new file mode 100644
index 00000000..85527c29
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
@@ -0,0 +1,106 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local ast = require("luci.asterisk")
+
+cbimap = Map("asterisk", "Trunks")
+cbimap.pageaction = false
+
+local sip_peers = { }
+cbimap.uci:foreach("asterisk", "sip",
+	function(s)
+		if s.type == "peer" then
+			s.name = s['.name']
+			s.info = ast.sip.peer(s.name)
+			sip_peers[s.name] = s
+		end
+	end)
+
+
+sip_table = cbimap:section(TypedSection, "sip", "SIP Trunks")
+sip_table.template    = "cbi/tblsection"
+sip_table.extedit     = luci.dispatcher.build_url("admin", "asterisk", "trunks", "sip", "%s")
+sip_table.addremove   = true
+sip_table.sectionhead = "Extension"
+
+function sip_table.filter(self, s)
+	return s and (
+		cbimap.uci:get("asterisk", s, "type") == nil or
+		cbimap.uci:get_bool("asterisk", s, "provider")
+	)
+end
+
+function sip_table.create(self, section)
+	if TypedSection.create(self, section) then
+		created = section
+	else
+		self.invalid_cts = true
+	end
+end
+
+function sip_table.parse(self, ...)
+	TypedSection.parse(self, ...)
+	if created then
+		cbimap.uci:tset("asterisk", created, {
+			type     = "friend",
+			qualify  = "yes",
+			provider = "yes"
+		})
+
+		cbimap.uci:save("asterisk")
+		luci.http.redirect(luci.dispatcher.build_url(
+			"admin", "asterisk", "trunks", "sip", created
+		))
+	end
+end
+
+
+user = sip_table:option(DummyValue, "username", "Username")
+
+context = sip_table:option(DummyValue, "context", "Dialplan")
+context.href = luci.dispatcher.build_url("admin", "asterisk", "dialplan")
+function context.cfgvalue(...)
+	return AbstractValue.cfgvalue(...) or "(default)"
+end
+
+online = sip_table:option(DummyValue, "online", "Registered")
+function online.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.online == nil then
+		return "n/a"
+	else
+		return sip_peers[s] and sip_peers[s].info.online
+			and "yes" or "no (%s)" %{
+				sip_peers[s] and sip_peers[s].info.Status:lower() or "unknown"
+			}
+	end
+end
+
+delay = sip_table:option(DummyValue, "delay", "Delay")
+function delay.cfgvalue(self, s)
+	if sip_peers[s] and sip_peers[s].info.online then
+		return "%i ms" % sip_peers[s].info.delay
+	else
+		return "n/a"
+	end
+end
+
+info = sip_table:option(Button, "_info", "Info")
+function info.write(self, s)
+	luci.http.redirect(luci.dispatcher.build_url(
+		"admin", "asterisk", "trunks", "sip", s, "info"
+	))
+end
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
new file mode 100644
index 00000000..5d0de756
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail.lua
@@ -0,0 +1,59 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local ast = require "luci.asterisk"
+
+cbimap = Map("asterisk", "Voicemail - Mailboxes")
+
+voicemail = cbimap:section(TypedSection, "voicemail", "Voicemail Boxes")
+voicemail.addremove = true
+voicemail.anonymous = true
+voicemail.template = "cbi/tblsection"
+
+context = voicemail:option(ListValue, "context", "Context")
+context:value("default")
+
+number = voicemail:option(Value, "number",
+	"Mailbox Number", "Unique mailbox identifier")
+
+function number.write(self, s, val)
+	if val and #val > 0 then
+		local old = self:cfgvalue(s)
+		self.map.uci:foreach("asterisk", "dialplanvoice",
+			function(v)
+				if v.voicebox == old then
+					self.map:set(v['.name'], "voicebox", val)
+				end
+			end)
+		Value.write(self, s, val)
+	end
+end
+
+
+voicemail:option(Value, "name", "Ownername", "Human readable display name")
+voicemail:option(Value, "password", "Password", "Access protection")
+voicemail:option(Value, "email", "eMail", "Where to send voice messages")
+voicemail:option(Value, "page", "Pager", "Pager number")
+
+zone = voicemail:option(ListValue, "zone", "Timezone", "Used time format")
+zone.titleref = luci.dispatcher.build_url("admin/asterisk/voicemail/settings")
+cbimap.uci:foreach("asterisk", "voicezone",
+	function(s) zone:value(s['.name']) end)
+
+function voicemail.remove(self, s)
+	return ast.voicemail.remove(self.map:get(s, "number"), self.map.uci)
+end
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
new file mode 100644
index 00000000..cad2adb9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/model/cbi/asterisk/voicemail_settings.lua
@@ -0,0 +1,62 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require "luci.sys.zoneinfo"
+
+
+cbimap = Map("asterisk", "Voicemail - Common Settings")
+
+voicegeneral = cbimap:section(TypedSection, "voicegeneral",
+	"General Voicemail Options", "Common settings for all mailboxes are " ..
+	"defined here. Most of them are optional. The storage format should " ..
+	"never be changed once set.")
+
+voicegeneral.anonymous = true
+voicegeneral.addremove = false
+
+format = voicegeneral:option(MultiValue, "Used storage formats")
+format.widget = "checkbox"
+format:value("wav49")
+format:value("gsm")
+format:value("wav")
+
+voicegeneral:option(Flag, "sendvoicemail", "Enable sending of emails")
+voicegeneral:option(Flag, "attach", "Attach voice messages to emails")
+voicegeneral:option(Value, "serveremail", "Used email sender address")
+voicegeneral:option(Value, "emaildateformat", "Date format used in emails").optional = true
+voicegeneral:option(Value, "maxlogins", "Max. failed login attempts").optional = true
+voicegeneral:option(Value, "maxmsg", "Max. allowed messages per mailbox").optional = true
+voicegeneral:option(Value, "minmessage", "Min. number of seconds for voicemail").optional = true
+voicegeneral:option(Value, "maxmessage", "Max. number of seconds for voicemail").optional = true
+voicegeneral:option(Value, "maxsilence", "Seconds of silence until stop recording").optional = true
+voicegeneral:option(Value, "maxgreet", "Max. number of seconds for greetings").optional = true
+voicegeneral:option(Value, "skipms", "Milliseconds to skip for rew./ff.").optional = true
+voicegeneral:option(Value, "silencethreshold", "Threshold to detect silence").optional = true
+
+
+voicezone = cbimap:section(TypedSection, "voicezone", "Time Zones",
+	"Time zones define how dates and times are expressen when used in " ..
+	"an voice mails. Refer to the asterisk manual for placeholder values.")
+
+voicezone.addremove = true
+voicezone.sectionhead = "Name"
+voicezone.template = "cbi/tblsection"
+
+tz = voicezone:option(ListValue, "zone", "Location")
+for _, z in ipairs(luci.sys.zoneinfo.TZ) do tz:value(z[1]) end
+
+voicezone:option(Value, "message", "Date Format")
+
+
+return cbimap
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/cbi/cell.htm b/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/cbi/cell.htm
new file mode 100644
index 00000000..b5d618ff
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/cbi/cell.htm
@@ -0,0 +1,22 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: dvalue.htm 3367 2008-09-19 10:42:02Z Cyrus $
+
+-%>
+
+<%+cbi/valueheader%>
+<% if self.href then %><a href="<%=self.href%>"><% end -%>
+	<%=self:cfgvalue(section)%>
+<%- if self.href then %></a><%end%>
+&#160;
+<input type="hidden" id="<%=cbid%>" value="<%=luci.util.pcdata(self:cfgvalue(section))%>" />
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm b/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
new file mode 100644
index 00000000..a46a8db1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialplans.htm
@@ -0,0 +1,254 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<%
+	local uci = luci.model.uci.cursor_state()
+	local ast = require "luci.asterisk"
+
+	function digit_pattern(s,t)
+		return "<code style='padding: 2px; border:1px solid #CCCCCC; background-color: #FFFFFF'%s>%s</code>"
+			%{ t and " title='" .. t .. "'" or "", s }
+	end
+
+	function rowstyle(i)
+		return "cbi-rowstyle-%i" %{
+			( i % 2 ) == 0 and 2 or 1
+		}
+	end
+
+	function format_matches(z)
+		local html = { }
+
+		if type(z) ~= "table" then
+			z = { matches = { z } }
+		end
+
+		if z.localprefix then
+			for _, m in ipairs(z.matches) do
+				html[#html+1] =
+					digit_pattern(z.localprefix, "local prefix") .. " " ..
+					digit_pattern(m)
+			end
+		end
+
+		if z.intlmatches and #z.intlmatches > 0 then
+			for _, i in ipairs(z.intlmatches) do
+				for _, m in ipairs(z.matches) do
+					html[#html+1] = "%s %s" %{
+						digit_pattern("(%s)" % i, "intl. prefix"),
+						digit_pattern(m)
+					}
+				end
+			end
+		else
+			for _, m in ipairs(z.matches) do
+				html[#html+1] = digit_pattern(m)
+			end
+		end
+
+		return table.concat(html, "; ")
+	end
+%>
+
+
+<form method="post" action="<%=luci.dispatcher.build_url("admin", "asterisk", "dialplans")%>" enctype="multipart/form-data">
+	<div>
+		<script type="text/javascript" src="/luci-static/resources/cbi.js"></script>
+		<input type="hidden" name="cbi.submit" value="1" />
+		<input type="submit" value="Save" class="hidden" />
+	</div>
+
+<div class="cbi-map" id="cbi-asterisk">
+	<h2><a id="content" name="content">Outgoing Call Routing</a></h2>
+	<div class="cbi-map-descr">
+		Here you can manage your dial plans which are used to route outgoing calls from your local extensions.<br /><br />
+		Related tasks:<br />
+		<a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/zones')%>" class="cbi-title-ref">Manage dialzones</a> |
+		<a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>" class="cbi-title-ref">Manage voicemail boxes</a> |
+		<a href="<%=luci.dispatcher.build_url('admin/asterisk/meetme/rooms')%>" class="cbi-title-ref">Manage meetme rooms</a>
+	</div>
+	<!-- tblsection -->
+	<fieldset class="cbi-section" id="cbi-asterisk-sip">
+		<!--<legend>Dialplans</legend>-->
+		<div class="cbi-section-descr"></div>
+
+		<% for i, plan in pairs(ast.dialplan.plans()) do %>
+		<div class="cbi-section-node">
+			<table class="cbi-section-table">
+				<tr class="cbi-section-table-titles">
+					<th style="text-align: left; padding: 3px" class="cbi-section-table-cell">
+						<big>Dialplan <em><%=plan.name%></em></big>
+					</th>
+					<td>
+						<a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans')%>?delplan=<%=plan.name%>">
+							<img style="border:none" alt="Remove this dialplan" title="Remove this dialplan" src="/luci-static/resources/cbi/remove.gif" />
+						</a>
+					</td>
+				</tr>
+
+				<!-- dialzones -->
+				<% local zones_used = { }; local row = 0 %>
+				<% for i, zone in ipairs(plan.zones) do zones_used[zone.name] = true %>
+				<tr class="cbi-section-table-row <%=rowstyle(row)%>">
+					<td style="text-align: left; padding: 3px" class="cbi-section-table-cell">
+						<strong>&#x2514; Dialzone <em><%=zone.name%></em></strong> (<%=zone.description%>)
+						<p style="padding-left: 1em; margin-bottom:0">
+							Lines:
+							<%=ast.tools.hyperlinks(
+								zone.trunks, function(v)
+									return luci.dispatcher.build_url("admin", "asterisk", "trunks", "%s") % v:lower()
+								end
+							)%><br />
+							Matches:
+							<%=format_matches(zone)%>
+						</p>
+					</td>
+					<td style="width:5%" class="cbi-value-field">
+						<a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans/out', zone.name)%>">
+							<img style="border:none" alt="Edit dialzone" title="Edit dialzone" src="/luci-static/resources/cbi/edit.gif" />
+						</a>
+						<a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delzone.<%=plan.name%>=<%=zone.name%>">
+							<img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" />
+						</a>
+					</td>
+				</tr>
+				<% row = row + 1; end %>
+				<!-- /dialzones -->
+
+				<!-- voicemail -->
+				<% local boxes_used = { } %>
+				<% for ext, box in luci.util.kspairs(plan.voicemailboxes) do boxes_used[box.id] = true %>
+				<tr class="cbi-section-table-row <%=rowstyle(row)%>">
+					<td style="text-align: left; padding: 3px" class="cbi-section-table-cell">
+						<strong>&#x2514; Voicemailbox <em><%=box.id%></em></strong> (<%=box.name%>)
+						<p style="padding-left: 1em; margin-bottom:0">
+							Owner: <%=box.name%> |
+							eMail: <%=#box.email > 0 and box.email or 'n/a'%> |
+							Pager: <%=#box.page  > 0 and box.page  or 'n/a'%><br />
+							Matches: <%=format_matches(ext)%>
+						</p>
+					</td>
+					<td style="width:5%" class="cbi-value-field">
+						<a href="<%=luci.dispatcher.build_url('admin/asterisk/voicemail/mailboxes')%>">
+							<img style="border:none" alt="Manage mailboxes ..." title="Manage mailboxes ..." src="/luci-static/resources/cbi/edit.gif" />
+						</a>
+						<a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delvbox.<%=plan.name%>=<%=ext%>">
+							<img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" />
+						</a>
+					</td>
+				</tr>
+				<% row = row + 1; end %>
+				<!-- /voicemail -->
+
+				<!-- meetme -->
+				<% local rooms_used = { } %>
+				<% for ext, room in luci.util.kspairs(plan.meetmerooms) do rooms_used[room.room] = true %>
+				<tr class="cbi-section-table-row <%=rowstyle(row)%>">
+					<td style="text-align: left; padding: 3px" class="cbi-section-table-cell">
+						<strong>&#x2514; MeetMe Room <em><%=room.room%></em></strong>
+						<% if room.description and #room.description > 0 then %> (<%=room.description%>)<% end %>
+						<p style="padding-left: 1em; margin-bottom:0">
+							Matches: <%=format_matches(ext)%>
+						</p>
+					</td>
+					<td style="width:5%" class="cbi-value-field">
+						<a href="<%=luci.dispatcher.build_url('admin/asterisk/meetme/rooms')%>">
+							<img style="border:none" alt="Manage conferences ..." title="Manage conferences ..." src="/luci-static/resources/cbi/edit.gif" />
+						</a>
+						<a href="<%=luci.dispatcher.build_url('admin/asterisk/dialplans')%>?delmeetme.<%=plan.name%>=<%=ext%>">
+							<img style="border:none" alt="Remove from this dialplan" title="Remove from this dialplan" src="/luci-static/resources/cbi/remove.gif" />
+						</a>
+					</td>
+				</tr>
+				<% row = row + 1; end %>
+				<!-- /meetme -->
+
+				<tr class="cbi-section-table-row">
+					<td style="text-align: left; padding: 3px" class="cbi-section-table-cell" colspan="2">
+						<hr style="margin-bottom:0.5em; border-width:0 0 1px 0" />
+
+						Add Dialzone:<br />
+						<select style="width:30%" name="addzone.<%=plan.name%>">
+							<option value="">-- please select --</option>
+							<% for _, zone in luci.util.kspairs(ast.dialzone.zones()) do %>
+								<% if not zones_used[zone.name] then %>
+									<option value="<%=zone.name%>"><%=zone.name%> (<%=zone.description%>)</option>
+								<% end %>
+							<% end %>
+						</select>
+						<br /><br />
+
+						Add Voicemailbox:<br />
+						<select style="width:20%" name="addvbox.<%=plan.name%>" onchange="this.form['addvboxext.<%=plan.name%>'].value=this.options[this.selectedIndex].value.split('@')[0]">
+							<option value="">-- please select --</option>
+							<% for ext, box in luci.util.kspairs(ast.voicemail.boxes()) do %>
+								<% if not boxes_used[box.id] then %>
+									<option value="<%=box.id%>"><%=box.id%> (<%=box.name%>)</option>
+								<% end %>
+							<% end %>
+						</select>
+						as extension
+						<input type="text" style="width:5%" name="addvboxext.<%=plan.name%>" />
+						<br /><br />
+
+						Add MeetMe Conference:<br />
+						<select style="width:20%" name="addmeetme.<%=plan.name%>" onchange="this.form['addmeetmeext.<%=plan.name%>'].value=this.options[this.selectedIndex].value">
+							<option value="">-- please select --</option>
+							<% for ext, room in luci.util.kspairs(ast.meetme.rooms()) do %>
+								<%# if not rooms_used[room.room] then %>
+									<option value="<%=room.room%>">
+										<%=room.room%>
+										<% if room.description and #room.description > 0 then %>(<%=room.description%>)<% end %>
+									</option>
+								<%# end %>
+							<% end %>
+						</select>
+						as extension
+						<input type="text" style="width:5%" name="addmeetmeext.<%=plan.name%>" />
+						<br /><br />
+
+						<input type="submit" class="cbi-button cbi-button-add" value="Add item &raquo;" title="Add item ..."/>
+					</td>
+				</tr>
+
+			</table>
+
+			<div class="cbi-section-create cbi-tblsection-create"></div>
+		</div>
+		<br />
+		<% end %>
+
+		<div class="cbi-section-node">
+			<div class="cbi-section-create cbi-tblsection-create" style="padding: 3px">
+				<h3>Create a new dialplan</h3>
+				The name is required and must be unique. It may only contain the characters A-Z, a-z, 0-9 and _ .<br />
+
+				<%- if create_error then %>
+					<br /><span style="color:red">Invalid name given!</span><br />
+				<% end -%>
+
+				<br />
+				<input type="text" class="cbi-section-create-name" name="addplan" style="width:200px" />
+				<input type="submit" class="cbi-button cbi-button-add" value="Add dialplan" title="Add dialplan"/>
+			</div>
+		</div>
+
+	</fieldset>
+</div>
+</form>
+<div class="clear"></div>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm b/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm
new file mode 100644
index 00000000..f93496df
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm
@@ -0,0 +1,174 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<%
+	local uci = luci.model.uci.cursor_state()
+	local ast = require("luci.asterisk")
+
+	function digit_pattern(s)
+		return "<code style='padding: 2px; border:1px solid #CCCCCC; background-color: #FFFFFF'>%s</code>" % s
+	end
+
+	function rowstyle(i)
+		return "cbi-rowstyle-%i" %{
+			( i % 2 ) == 0 and 2 or 1
+		}
+	end
+
+	local function find_trunks()
+		local t = { }
+
+		uci:foreach("asterisk", "sip",
+			function(s)
+				if uci:get_bool("asterisk", s['.name'], "provider") then
+					t[#t+1] = {
+						"SIP/%s" % s['.name'],
+						"SIP: %s" % s['.name']
+					}
+				end
+			end)
+
+		uci:foreach("asterisk", "iax",
+			function(s)
+				t[#t+1] = {
+					"IAX/%s" % s['.name'],
+					"IAX: %s" % s.extension or s['.name']
+				}
+			end)
+
+		return t
+	end
+
+%>
+
+
+<form method="post" action="<%=luci.dispatcher.build_url("admin", "asterisk", "dialplans", "zones")%>" enctype="multipart/form-data">
+	<div>
+		<script type="text/javascript" src="/luci-static/resources/cbi.js"></script>
+		<input type="hidden" name="cbi.submit" value="1" />
+		<input type="submit" value="Save" class="hidden" />
+	</div>
+
+<div class="cbi-map" id="cbi-asterisk">
+	<h2><a id="content" name="content">Dial Zone Management</a></h2>
+	<div class="cbi-map-descr">
+		<a href="<%=luci.dispatcher.build_url("admin/asterisk/dialplans")%>" class="cbi-title-ref">Back to dialplan overview</a><br /><br />
+		Here you can manage your dial zones. The zones are used to route outgoing calls to the destination.
+		Each zone groups multiple trunks and number matches to represent a logical destination. Zones can
+		also be used to enforce certain dial restrictions on selected extensions.
+	</div>
+
+	<!-- tblsection -->
+	<fieldset class="cbi-section" id="cbi-asterisk-sip">
+		<div class="cbi-section-node">
+			<table class="cbi-section-table">
+				<tr class="cbi-section-table-titles">
+					<th style="text-align: left; padding: 3px" class="cbi-section-table-cell" colspan="6">
+						<h3>Dialzone Overview</h3>
+					</th>
+				</tr>
+
+				<tr class="cbi-section-table-descr">
+					<th style="width: 5%; text-align:right" class="cbi-section-table-cell">Name</th>
+					<th style="width: 5%; text-align:right" class="cbi-section-table-cell">Prepend</th>
+					<th style="width: 20%; text-align:left" class="cbi-section-table-cell">- Match</th>
+					<th style="text-align:left" class="cbi-section-table-cell">Trunk</th>
+					<th style="width: 35%; text-align:left" class="cbi-section-table-cell">Description</th>
+					<th style="width: 4%; text-align:left" class="cbi-section-table-cell"></th>
+				</tr>
+
+				<% for i, rule in pairs(ast.dialzone.zones()) do %>
+				<tr class="cbi-section-table-row <%=rowstyle(i)%>">
+					<td style="text-align:right" class="cbi-value-field">
+						<%=rule.name%>
+					</td>
+					<td style="text-align:right" class="cbi-value-field">
+						<% for _ in ipairs(rule.matches) do %>
+							<%=rule.addprefix and digit_pattern(rule.addprefix)%>&#160;<br />
+						<% end %>
+					</td>
+					<td style="text-align:left" class="cbi-value-field">
+						<% for _, m in ipairs(rule.matches) do %>
+							<%=rule.localprefix and "%s " % digit_pattern(rule.localprefix)%>
+							<%=digit_pattern(m)%><br />
+						<% end %>
+					</td>
+					<td style="text-align:left" class="cbi-value-field">
+						<%=ast.tools.hyperlinks(
+							rule.trunks, function(v)
+								return luci.dispatcher.build_url("admin", "asterisk", "trunks", "%s") % v:lower()
+							end
+						)%>
+					</td>
+					<td style="text-align:left" class="cbi-value-field">
+						<%=rule.description or rule.name%>
+					</td>
+					<td style="text-align:left" class="cbi-value-field">
+						<a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'out', rule.name)%>">
+							<img style="border:none" alt="Edit entry" title="Edit entry" src="/luci-static/resources/cbi/edit.gif" />
+						</a>
+						<a href="<%=luci.dispatcher.build_url('admin', 'asterisk', 'dialplans', 'zones')%>?delzone=<%=rule.name%>">
+							<img style="border:none" alt="Delete entry" title="Delete entry" src="/luci-static/resources/cbi/remove.gif" />
+						</a>
+					</td>
+				</tr>
+				<% end %>
+			</table>
+			<div class="cbi-section-create cbi-tblsection-create"></div>
+		</div>
+		<br />
+
+		<div class="cbi-section-node">
+			<div class="cbi-section-create cbi-tblsection-create" style="padding: 3px">
+				<h3>Create a new dialzone</h3>
+				The name is required and must be unique. It may only contain the characters A-Z, a-z, 0-9 and _ .<br />
+				You can specifiy multiple number matches by separating them with spaces.<br />
+
+				<%- if create_error then %>
+					<br /><span style="color:red">Invalid name given!</span><br />
+				<% end -%>
+
+				<table>
+					<tr>
+						<td style="padding:3px">
+							<label for="create1">1) Name</label><br />
+							<input type="text" class="cbi-section-create-name" id="create1" name="newzone_name" style="width:200px" />
+							<br /><br />
+
+							<label for="create2">2) Number Match</label><br />
+							<input type="text" class="cbi-section-create-name" id="create2" name="newzone_match" style="width:200px" />
+						</td>
+						<td style="padding:3px">
+							<label for="create3">3) Trunks</label><br />
+							<select class="cbi-input-select" multiple="multiple" id="create3" name="newzone_uses" size="4"  style="width:200px">
+								<% for i, t in ipairs(find_trunks()) do %>
+									<option value="<%=t[1]%>"><%=t[2]%></option>
+								<% end %>
+							</select>
+						</td>
+					</tr>
+				</table>
+				<br />
+
+				<input type="submit" class="cbi-button cbi-button-add" name="newzone" value="Add entry" title="Add entry"/>
+			</div>
+		</div>
+	</fieldset>
+</div>
+</form>
+<div class="clear"></div>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-asterisk/root/etc/config/asterisk b/trunk/package/luci/applications/luci-asterisk/root/etc/config/asterisk
new file mode 100644
index 00000000..24840979
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/root/etc/config/asterisk
@@ -0,0 +1,231 @@
+config 'asterisk'
+	option 'verbose' 3
+	option 'debug' 3
+	option 'zone' 'Australia/Perth'
+
+config 'hardware' 'reboot'
+	option 'method' 'web'
+	option 'param' 'http://ata.lan/admin/reboot'
+
+config 'feature' 'park'
+	option 'parkenabled' 'yes'
+	option 'parkext'   '700'
+	option 'parkpos'   '701-720'
+	option 'context'  'parkedcalls'
+	option 'parkingtime'  '45'
+	option 'courtesytone'  'beep'
+	option 'parkedplay'  'caller'
+	option 'adsipark'  'yes'
+	option 'findslot'  'first'
+	option 'parkedmusicclass'  'default'
+	option 'transferdigittimeout'  '3'
+	option 'xfersound'  'beep'
+	option 'xferfailsound'  'beeperr'
+	option 'pickupexten'  '"*8"'
+	option 'featuredigittimeout'  '500'
+	option 'atxfernoanswertimeout'  '15'
+
+config 'feature' 'map'
+	option 'blindxfer' '#1'
+	option 'disconnect' '*0'
+	option 'automon' '*1'
+	option 'atxfer' '#2'
+	option 'parkcall' '#30'
+
+config 'sipgeneral'
+	option 'realm' 'sip.mydomain.net'
+	option 'allow' 'alaw'
+	option 'extension' '102'
+
+config 'module'
+	option 'res_config_mysql' 'no'
+	option 'res_crypto' 'auto'
+	option 'chan_iax2' 'yes'
+
+config 'sip' 'PAP2T'
+	option 'type' 'friend'
+	option 'extension' '101'
+	option 'username' 'PAP2T'
+	option 'secret' 'mypass'
+	option 'port' '5061'
+	option 'host' ''
+	option 'dtmfmode' 'rfc2833'
+	option 'insecure' 'very'
+	option 'context' 'internal'
+	option 'mailbox' '1001@default'
+	option 'nat' 'no'
+	option 'canreinvite' 'nonat'
+	option 'selfmailbox' 'yes'
+	option 'incoming' 'provider_inbound'
+
+config 'sip' 'PAP2T2'
+	option 'type' 'friend'
+	option 'extension' '101'
+	option 'username' 'PAP2T2'
+	option 'secret' 'mysecret'
+	option 'port' '5060'
+	option 'host' ''
+	option 'dtmfmode' 'rfc2833'
+	option 'insecure' 'very'
+	option 'context' 'internal'
+	option 'mailbox' '1001@default'
+	option 'nat' 'no'
+	option 'canreinvite' 'nonat'
+	option 'selfmailbox' 'yes'
+	option 'incoming' 'provider_inbound'
+
+config 'sip' 'providerphone'
+	option 'provider' 'yes'
+	option 'type' 'friend'
+	option 'timeout' '55'
+	option 'internationalprefix' '0011'
+	option 'alwaysinternational' 'no'
+	option 'countrycode' '63'
+	option 'register' 'yes'
+	option 'host' '200.200.200.200'
+	option 'username' '0899999999'
+	option 'fromuser' '0899999999'
+	option 'secret' 'mysecret'
+	option 'fromdomain' 'providerphone.provider.net.au'
+	option 'context' 'provider_inbound'
+	option 'canreinvite' 'no'
+	option 'nat' 'yes'
+	option 'qualify' 'yes'
+	option 'insecure' 'very'
+	option 'pedantic' 'no'
+	option 'qualify' '1000'
+
+config 'iaxgeneral'
+	option 'static' 'yes'
+	option 'writeprotect' 'no'
+	option 'canreinvite' 'no'
+	option 'allow' 'ulaw,gsm'
+
+config 'iax' 'nell'
+	option 'type' 'friend'
+	option 'extension' '108'
+	option 'host' ''
+	option 'username' 'nell'
+	option 'secret' 'mypass'
+	option 'context' 'internal'
+
+config 'iax' 'iax_vista'
+	option 'extension' '106'
+	option 'type' 'friend'
+	option 'host' ''
+	option 'username' 'vista'
+	option 'secret' 'mysecret'
+	option 'context' 'internal'
+
+config 'iax' 'sam'
+	option 'type' 'friend'
+	option 'extension' '103'
+	option 'host' ''
+	option 'username' 'sam'
+	option 'secret' 'mysecret'
+	option 'context' 'internal'
+
+config 'voicegeneral'
+	option 'serveremail' 'voice@sip.mydomain.net'
+
+config 'voicemail'
+	option 'number' '1001'
+	option 'context' 'default'
+	option 'password' '0000'
+	option 'name' 'Family'
+	option 'email' 'us@mydomain.net'
+	option 'zone' 'wa'
+	option 'attach' 'no'
+
+config 'voicezone' 'wa'
+	option 'zone' 'Australia/Perth'
+	option 'message' 'Q IMp'
+
+config 'voicezone' 'military'
+	option 'zone' 'Zulu'
+	option 'message' '"vm-received" q "digits/at" H N "hours" "phonetic/z_p"'
+
+config 'incominggeneral'
+	option 'allowtransfer' 'no'
+	option 'timeout' '20'
+	option 'answerfirst' 'no'
+	option 'mailbox' '1001@default'
+
+config 'dialplangeneral'
+	option 'static' 'yes'
+	option 'writeprotect' 'no'
+	option 'canreinvite' 'no'
+	option 'clearglobalvars' 'no'
+	option 'allowtransfer' 'no'
+
+config 'dialplan' 'internal'
+	option 'include' 'localcall interstate smartnumber emergency extensions'
+
+config 'dialplanvoice'
+	option 'dialplan' 'internal'
+	option 'extension' '1001'
+	option 'voicecontext' 'default'
+	option 'voicebox' '1001'
+
+config 'dialplansaytime'
+	option 'dialplan' 'internal'
+	option 'extension' '108'
+
+config 'dialplanmeetme'
+	option 'dialplan' 'internal'
+	option 'extension' '109'
+	option 'room' '101'
+
+config 'dialplanmeetme'
+	option 'dialplan' 'internal'
+	option 'extension' '1009'
+	option 'room' ''
+
+config 'dialplan' 'localinternational'
+	option 'include' 'mobile interstate'
+
+config 'dialzone' 'interstate'
+	option 'uses' 'SIP/providerphone'
+	option 'match' '0[235-8]NXXXXXXX'
+	option 'localprefix' '0'
+
+config 'dialzone' 'mobile'
+	option 'uses' 'SIP/providerphone'
+	option 'match' '04XXXXXXXX'
+	option 'localprefix' '0'
+
+config 'dialzone' 'smartnumber'
+	option 'uses' 'SIP/providerphone'
+	option 'match' '1[835]00.'
+	option 'match' '13ZXXX'
+
+config 'dialzone' 'emergency'
+	option 'uses' 'SIP/providerphone'
+	option 'match' '000'
+	option 'match' '112'
+
+config 'dialzone' 'localcall'
+	option 'uses' 'SIP/providerphone'
+	option 'match' 'NXXXXXXX'
+	option 'addprefix' '08'
+	option 'localprefix' '0'
+
+config 'dialzone' 'international'
+	option 'uses' 'SIP/providerphone'
+	option 'international' '0011,+'
+	option 'localzone' 'localinternational'
+	option 'localprefix' '0'
+	option 'addprefix' ''
+
+config 'meetmegeneral'
+	option 'audiobuffers' '32'
+
+config 'meetme'
+	option 'room' '101'
+	option 'pin' ''
+	option 'adminpin' ''
+
+config 'moh' 'default'
+	option 'mode' 'files'
+	option 'directory' '/opt/moh'
+	option 'random' 'no'
diff --git a/trunk/package/luci/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk b/trunk/package/luci/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk
new file mode 100755
index 00000000..e45819f6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-asterisk/root/etc/uci-defaults/luci-asterisk
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@asterisk[-1]
+	add ucitrack asterisk
+	set ucitrack.@asterisk[-1].init=asterisk
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-commands/Makefile b/trunk/package/luci/applications/luci-commands/Makefile
new file mode 100644
index 00000000..64801c2b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-commands/Makefile
@@ -0,0 +1,4 @@
+PO = commands
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-commands/luasrc/controller/commands.lua b/trunk/package/luci/applications/luci-commands/luasrc/controller/commands.lua
new file mode 100644
index 00000000..8150c4bd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-commands/luasrc/controller/commands.lua
@@ -0,0 +1,237 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Jo-Philipp Wich <jow@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.commands", package.seeall)
+
+function index()
+	entry({"admin", "system", "commands"}, firstchild(), _("Custom Commands"), 80)
+	entry({"admin", "system", "commands", "dashboard"}, template("commands"), _("Dashboard"), 1)
+	entry({"admin", "system", "commands", "config"}, cbi("commands"), _("Configure"), 2)
+	entry({"admin", "system", "commands", "run"}, call("action_run"), nil, 3).leaf = true
+	entry({"admin", "system", "commands", "download"}, call("action_download"), nil, 3).leaf = true
+
+	entry({"command"}, call("action_public"), nil, 1).leaf = true
+end
+
+--- Decode a given string into arguments following shell quoting rules
+--- [[abc \def "foo\"bar" abc'def']] -> [[abc def]] [[foo"bar]] [[abcdef]]
+local function parse_args(str)
+	local args = { }
+
+	local function isspace(c)
+		if c == 9 or c == 10 or c == 11 or c == 12 or c == 13 or c == 32 then
+			return c
+		end
+	end
+
+	local function isquote(c)
+		if c == 34 or c == 39 or c == 96 then
+			return c
+		end
+	end
+
+	local function isescape(c)
+		if c == 92 then
+			return c
+		end
+	end
+
+	local function ismeta(c)
+		if c == 36 or c == 92 or c == 96 then
+			return c
+		end
+	end
+
+	--- Convert given table of byte values into a Lua string and append it to
+	--- the "args" table. Segment byte value sequence into chunks of 256 values
+	--- to not trip over the parameter limit for string.char()
+	local function putstr(bytes)
+		local chunks = { }
+		local csz = 256
+		local upk = unpack
+		local chr = string.char
+		local min = math.min
+		local len = #bytes
+		local off
+
+		for off = 1, len, csz do
+			chunks[#chunks+1] = chr(upk(bytes, off, min(off + csz - 1, len)))
+		end
+
+		args[#args+1] = table.concat(chunks)
+	end
+
+	--- Scan substring defined by the indexes [s, e] of the string "str",
+	--- perform unquoting and de-escaping on the fly and store the result in
+	--- a table of byte values which is passed to putstr()
+	local function unquote(s, e)
+		local off, esc, quote
+		local res = { }
+
+		for off = s, e do
+			local byte = str:byte(off)
+			local q = isquote(byte)
+			local e = isescape(byte)
+			local m = ismeta(byte)
+
+			if e then
+				esc = true
+			elseif esc then
+				if m then res[#res+1] = 92 end
+				res[#res+1] = byte
+				esc = false
+			elseif q and quote and q == quote then
+				quote = nil
+			elseif q and not quote then
+				quote = q
+			else
+				if m then res[#res+1] = 92 end
+				res[#res+1] = byte
+			end
+		end
+
+		putstr(res)
+	end
+
+	--- Find substring boundaries in "str". Ignore escaped or quoted
+	--- whitespace, pass found start- and end-index for each substring
+	--- to unquote()
+	local off, esc, start, quote
+	for off = 1, #str + 1 do
+		local byte = str:byte(off)
+		local q = isquote(byte)
+		local s = isspace(byte) or (off > #str)
+		local e = isescape(byte)
+
+		if esc then
+			esc = false
+		elseif e then
+			esc = true
+		elseif q and quote and q == quote then
+			quote = nil
+		elseif q and not quote then
+			start = start or off
+			quote = q
+		elseif s and not quote then
+			if start then
+				unquote(start, off - 1)
+				start = nil
+			end
+		else
+			start = start or off
+		end
+	end
+
+	--- If the "quote" is still set we encountered an unfinished string
+	if quote then
+		unquote(start, #str)
+	end
+
+	return args
+end
+
+local function parse_cmdline(cmdid, args)
+	local uci = require "luci.model.uci".cursor()
+	if uci:get("luci", cmdid) == "command" then
+		local cmd = uci:get_all("luci", cmdid)
+		local argv = parse_args(cmd.command)
+		local i, v
+
+		if cmd.param == "1" and args then
+			for i, v in ipairs(parse_args(luci.http.urldecode(args))) do
+				argv[#argv+1] = v
+			end
+		end
+
+		for i, v in ipairs(argv) do
+			if v:match("[^%w%.%-i/]") then
+				argv[i] = '"%s"' % v:gsub('"', '\\"')
+			end
+		end
+
+		return argv
+	end
+end
+
+function action_run(...)
+	local fs   = require "nixio.fs"
+	local argv = parse_cmdline(...)
+	if argv then
+		local outfile = os.tmpname()
+		local errfile = os.tmpname()
+
+		local rv = os.execute(table.concat(argv, " ") .. " >%s 2>%s" %{ outfile, errfile })
+		local stdout = fs.readfile(outfile, 1024 * 512) or ""
+		local stderr = fs.readfile(errfile, 1024 * 512) or ""
+
+		fs.unlink(outfile)
+		fs.unlink(errfile)
+
+		local binary = not not (stdout:match("[%z\1-\8\14-\31]"))
+
+		luci.http.prepare_content("application/json")
+		luci.http.write_json({
+			command  = table.concat(argv, " "),
+			stdout   = not binary and stdout,
+			stderr   = stderr,
+			exitcode = rv,
+			binary   = binary
+		})
+	else
+		luci.http.status(404, "No such command")
+	end
+end
+
+function action_download(...)
+	local fs   = require "nixio.fs"
+	local argv = parse_cmdline(...)
+	if argv then
+		local fd = io.popen(table.concat(argv, " ") .. " 2>/dev/null")
+		if fd then
+			local chunk = fd:read(4096) or ""
+			local name
+			if chunk:match("[%z\1-\8\14-\31]") then
+				luci.http.header("Content-Disposition", "attachment; filename=%s"
+				                 % fs.basename(argv[1]):gsub("%W+", ".") .. ".bin")
+				luci.http.prepare_content("application/octet-stream")
+			else
+				luci.http.header("Content-Disposition", "attachment; filename=%s"
+				                 % fs.basename(argv[1]):gsub("%W+", ".") .. ".txt")
+				luci.http.prepare_content("text/plain")
+			end
+
+			while chunk do
+				luci.http.write(chunk)
+				chunk = fd:read(4096)
+			end
+
+			fd:close()
+		else
+			luci.http.status(500, "Failed to execute command")
+		end
+	else
+		luci.http.status(404, "No such command")
+	end
+end
+
+function action_public(cmdid, args)
+	local uci = require "luci.model.uci".cursor()
+	if cmdid and
+	   uci:get("luci", cmdid) == "command" and
+	   uci:get("luci", cmdid, "public") == "1"
+	then
+		action_download(cmdid, args)
+	else
+		luci.http.status(403, "Access to command denied")
+	end
+end
diff --git a/trunk/package/luci/applications/luci-commands/luasrc/model/cbi/commands.lua b/trunk/package/luci/applications/luci-commands/luasrc/model/cbi/commands.lua
new file mode 100644
index 00000000..367ffdbf
--- /dev/null
+++ b/trunk/package/luci/applications/luci-commands/luasrc/model/cbi/commands.lua
@@ -0,0 +1,37 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Jo-Philipp Wich <jow@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local m, s
+
+m = Map("luci", translate("Custom Commands"),
+	translate("This page allows you to configure custom shell commands which can be easily invoked from the web interface."))
+
+s = m:section(TypedSection, "command", "")
+s.template = "cbi/tblsection"
+s.anonymous = true
+s.addremove = true
+
+
+s:option(Value, "name", translate("Description"),
+         translate("A short textual description of the configured command"))
+
+s:option(Value, "command", translate("Command"),
+         translate("Command line to execute"))
+
+s:option(Flag, "param", translate("Custom arguments"),
+         translate("Allow the user to provide additional command line arguments"))
+
+s:option(Flag, "public", translate("Public access"),
+         translate("Allow executing the command and downloading its output without prior authentication"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-commands/luasrc/view/commands.htm b/trunk/package/luci/applications/luci-commands/luasrc/view/commands.htm
new file mode 100644
index 00000000..d40470c0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-commands/luasrc/view/commands.htm
@@ -0,0 +1,176 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2012 Jo-Philipp Wich <jow@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<% css = [[
+
+.commandbox {
+	height: 12em;
+	width: 30%;
+	float: left;
+	height: 12em;
+	margin: 5px;
+	position: relative;
+}
+
+.commandbox h3 {
+	font-size: 1.5em !important;
+	line-height: 2em !important;
+	margin: 0 !important;
+}
+
+.commandbox input[type="text"] {
+	width: 50% !important;
+}
+
+.commandbox div {
+	position: absolute;
+	left: 0;
+	bottom: 1.5em;
+}
+
+]] -%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var stxhr = new XHR();
+
+	function command_run(id)
+	{
+		var args;
+		var field = document.getElementById(id);
+		if (field)
+			args = encodeURIComponent(field.value);
+
+		var legend = document.getElementById('command-rc-legend');
+		var output = document.getElementById('command-rc-output');
+
+		if (legend && output)
+		{
+			output.innerHTML =
+				'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
+				'<%:Waiting for command to complete...%>'
+			;
+
+			legend.parentNode.style.display = 'block';
+			legend.style.display = 'inline';
+
+			stxhr.get('<%=luci.dispatcher.build_url("admin", "system", "commands", "run")%>/' + id + (args ? '/' + args : ''), null,
+				function(x, st)
+				{
+					if (st)
+					{
+						if (st.binary)
+							st.stdout = '[<%:Binary data not displayed, download instead.%>]';
+
+						legend.style.display = 'none';
+						output.innerHTML = String.format(
+							'<pre><strong># %h\n</strong>%h<span style="color:red">%h</span></pre>' +
+							'<div class="alert-message warning">%s (<%:Code:%> %d)</div>',
+							st.command, st.stdout, st.stderr,
+							(st.exitcode == 0) ? '<%:Command successful%>' : '<%:Command failed%>',
+							st.exitcode);
+					}
+					else
+					{
+						legend.style.display = 'none';
+						output.innerHTML = '<span class="error"><%:Failed to execute command!%></span>';
+					}
+
+					location.hash = '#output';
+				}
+			);
+		}
+	}
+
+	function command_download(id)
+	{
+		var args;
+		var field = document.getElementById(id);
+		if (field)
+			args = encodeURIComponent(field.value);
+
+		location.href = '<%=luci.dispatcher.build_url("admin", "system", "commands", "download")%>/' + id + (args ? '/' + args : '');
+	}
+
+	function command_link(id)
+	{
+		var legend = document.getElementById('command-rc-legend');
+		var output = document.getElementById('command-rc-output');
+
+		var args;
+		var field = document.getElementById(id);
+		if (field)
+			args = encodeURIComponent(field.value);
+
+		if (legend && output)
+		{
+			var link = location.protocol + '//' + location.hostname +
+			           (location.port ? ':' + location.port : '') +
+					   location.pathname.split(';')[0] + 'command/' +
+					   id + (args ? '/' + args : '');
+
+			legend.style.display = 'none';
+			output.parentNode.style.display = 'block';
+			output.innerHTML = String.format(
+				'<div class="alert-message"><%:Access command with%> <a href="%s">%s</a></div>',
+				link, link
+			);
+
+			location.hash = '#output';
+		}
+	}
+
+//]]></script>
+
+<%
+	local uci = require "luci.model.uci".cursor()
+	local commands = { }
+
+	uci:foreach("luci", "command", function(s) commands[#commands+1] = s end)
+%>
+
+<form method="get" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
+	<div class="cbi-map">
+		<h2><a id="content" name="content"><%:Custom Commands%></a></h2>
+
+		<fieldset class="cbi-section">
+			<% local _, command; for _, command in ipairs(commands) do %>
+			<div class="commandbox">
+				<h3><%=pcdata(command.name)%></h3>
+				<p><%:Command:%> <code><%=pcdata(command.command)%></code></p>
+				<% if command.param == "1" then %>
+					<p><%:Arguments:%> <input type="text" id="<%=command['.name']%>" /></p>
+				<% end %>
+				<div>
+					<input type="button" value="<%:Run%>" class="cbi-button cbi-button-apply" onclick="command_run('<%=command['.name']%>')" />
+					<input type="button" value="<%:Download%>" class="cbi-button cbi-button-download" onclick="command_download('<%=command['.name']%>')" />
+					<% if command.public == "1" then %>
+						<input type="button" value="<%:Link%>" class="cbi-button cbi-button-link" onclick="command_link('<%=command['.name']%>')" />
+					<% end %>
+				</div>
+			</div>
+			<% end %>
+
+			<br style="clear:both" /><br />
+			<a name="output"></a>
+		</fieldset>
+	</div>
+
+	<fieldset class="cbi-section" style="display:none">
+		<legend id="command-rc-legend"><%:Collecting data...%></legend>
+		<span id="command-rc-output"></span>
+	</fieldset>
+</form>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-coovachilli/Makefile b/trunk/package/luci/applications/luci-coovachilli/Makefile
new file mode 100644
index 00000000..a98ccb84
--- /dev/null
+++ b/trunk/package/luci/applications/luci-coovachilli/Makefile
@@ -0,0 +1,4 @@
+PO = coovachilli
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/trunk/package/luci/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
new file mode 100644
index 00000000..aa0a5cc7
--- /dev/null
+++ b/trunk/package/luci/applications/luci-coovachilli/luasrc/controller/coovachilli.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.coovachilli", package.seeall)
+
+function index()
+	local cc
+
+	cc = entry( { "admin", "services", "coovachilli" },       cbi("coovachilli"),         _("CoovaChilli"),                90)
+	cc.subindex = true
+
+	entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), _("Network Configuration"),      10)
+	entry( { "admin", "services", "coovachilli", "radius"  }, cbi("coovachilli_radius"),  _("RADIUS configuration"),       20)
+	entry( { "admin", "services", "coovachilli", "auth"    }, cbi("coovachilli_auth"),    _("UAM and MAC Authentication"), 30)
+end
diff --git a/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua
new file mode 100644
index 00000000..e97987dd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua
@@ -0,0 +1,31 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+
+m = Map("coovachilli")
+
+-- general
+s = m:section(TypedSection, "general")
+s.anonymous = true
+
+s:option( Flag, "debug" )
+s:option( Value, "interval" )
+s:option( Value, "pidfile" ).optional = true
+s:option( Value, "statedir" ).optional = true
+s:option( Value, "cmdsock" ).optional = true
+s:option( Value, "logfacility" ).optional = true
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
new file mode 100644
index 00000000..064df2b4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
@@ -0,0 +1,76 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+
+m = Map("coovachilli")
+
+-- uam config
+s1 = m:section(TypedSection, "uam")
+s1.anonymous = true
+
+s1:option( Value, "uamserver" )
+s1:option( Value, "uamsecret" ).password = true
+
+s1:option( Flag, "uamanydns" )
+s1:option( Flag, "nouamsuccess" )
+s1:option( Flag, "nouamwispr" )
+s1:option( Flag, "chillixml" )
+s1:option( Flag, "uamanyip" ).optional = true
+s1:option( Flag, "dnsparanoia" ).optional = true
+s1:option( Flag, "usestatusfile" ).optional = true
+
+s1:option( Value, "uamhomepage" ).optional = true
+s1:option( Value, "uamlisten" ).optional = true
+s1:option( Value, "uamport" ).optional = true
+s1:option( Value, "uamiport" ).optional = true
+s1:option( DynamicList, "uamdomain" ).optional = true
+s1:option( Value, "uamlogoutip" ).optional = true
+s1:option( DynamicList, "uamallowed" ).optional = true
+s1:option( Value, "uamui" ).optional = true
+
+s1:option( Value, "wisprlogin" ).optional = true
+
+s1:option( Value, "defsessiontimeout" ).optional = true
+s1:option( Value, "defidletimeout" ).optional = true
+s1:option( Value, "definteriminterval" ).optional = true
+
+s1:option( Value, "ssid" ).optional = true
+s1:option( Value, "vlan" ).optional = true
+s1:option( Value, "nasip" ).optional = true
+s1:option( Value, "nasmac" ).optional = true
+s1:option( Value, "wwwdir" ).optional = true
+s1:option( Value, "wwwbin" ).optional = true
+
+s1:option( Value, "localusers" ).optional = true
+s1:option( Value, "postauthproxy" ).optional = true
+s1:option( Value, "postauthproxyport" ).optional = true
+s1:option( Value, "locationname" ).optional = true
+
+
+-- mac authentication
+s2 = m:section(TypedSection, "macauth")
+s2.anonymous = true
+
+s2:option( Flag, "macauth" )
+s2:option( Flag, "macallowlocal" )
+s2:option( DynamicList, "macallowed" )
+
+pw = s2:option( Value, "macpasswd" )
+pw.optional = true
+pw.password = true
+
+s2:option( Value, "macsuffix" ).optional = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua
new file mode 100644
index 00000000..2e9768ff
--- /dev/null
+++ b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua
@@ -0,0 +1,67 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.sys")
+require("luci.ip")
+
+m = Map("coovachilli")
+
+-- tun
+s1 = m:section(TypedSection, "tun")
+s1.anonymous = true
+
+s1:option( Flag, "usetap" )
+s1:option( Value, "tundev" ).optional = true
+s1:option( Value, "txqlen" ).optional = true
+
+net = s1:option( Value, "net" )
+for _, route in ipairs(luci.sys.net.routes()) do
+	if route.device ~= "lo" and route.dest:prefix() < 32 then
+		net:value( route.dest:string() )
+	end
+end
+
+s1:option( Value, "dynip" ).optional = true
+s1:option( Value, "statip" ).optional = true
+
+s1:option( Value, "dns1" ).optional = true
+s1:option( Value, "dns2" ).optional = true
+s1:option( Value, "domain" ).optional = true
+
+s1:option( Value, "ipup" ).optional = true
+s1:option( Value, "ipdown" ).optional = true
+
+s1:option( Value, "conup" ).optional = true
+s1:option( Value, "condown" ).optional = true
+
+
+-- dhcp config
+s2 = m:section(TypedSection, "dhcp")
+s2.anonymous = true
+
+dif = s2:option( Value, "dhcpif" )
+for _, nif in ipairs(luci.sys.net.devices()) do
+	if nif ~= "lo" then dif:value(nif) end
+end
+
+s2:option( Value, "dhcpmac" ).optional = true
+s2:option( Value, "lease" ).optional = true
+s2:option( Value, "dhcpstart" ).optional = true
+s2:option( Value, "dhcpend" ).optional = true
+
+s2:option( Flag, "eapolenable" )
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
new file mode 100644
index 00000000..ee838b08
--- /dev/null
+++ b/trunk/package/luci/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
@@ -0,0 +1,67 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+
+m = Map("coovachilli")
+
+-- radius server
+s1 = m:section(TypedSection, "radius")
+s1.anonymous = true
+
+s1:option( Value, "radiusserver1" )
+s1:option( Value, "radiusserver2" )
+s1:option( Value, "radiussecret" ).password = true
+
+s1:option( Value, "radiuslisten" ).optional = true
+s1:option( Value, "radiusauthport" ).optional = true
+s1:option( Value, "radiusacctport" ).optional = true
+
+s1:option( Value, "radiusnasid" ).optional = true
+s1:option( Value, "radiusnasip" ).optional = true
+
+s1:option( Value, "radiuscalled" ).optional = true
+s1:option( Value, "radiuslocationid" ).optional = true
+s1:option( Value, "radiuslocationname" ).optional = true
+
+s1:option( Value, "radiusnasporttype" ).optional = true
+
+s1:option( Flag, "radiusoriginalurl" )
+
+s1:option( Value, "adminuser" ).optional = true
+rs = s1:option( Value, "adminpassword" )
+rs.optional = true
+rs.password = true
+
+s1:option( Flag, "swapoctets" )
+s1:option( Flag, "openidauth" )
+s1:option( Flag, "wpaguests" )
+s1:option( Flag, "acctupdate" )
+
+s1:option( Value, "coaport" ).optional = true
+s1:option( Flag, "coanoipcheck" )
+
+
+-- radius proxy
+s2 = m:section(TypedSection, "proxy")
+s2.anonymous = true
+
+s2:option( Value, "proxylisten" ).optional = true
+s2:option( Value, "proxyport" ).optional = true
+s2:option( Value, "proxyclient" ).optional = true
+ps = s2:option( Value, "proxysecret" )
+ps.optional = true
+ps.password = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-coovachilli/root/etc/config/coovachilli b/trunk/package/luci/applications/luci-coovachilli/root/etc/config/coovachilli
new file mode 100644
index 00000000..0b6be2c5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-coovachilli/root/etc/config/coovachilli
@@ -0,0 +1,243 @@
+##############################################################################
+#
+# Sample CoovaChilli configuration file
+#
+##############################################################################
+
+# General settings
+config general
+
+	# Enable this flag to include debug information.
+	option debug	0
+
+	# Re-read configuration file at this interval. Will also cause new domain
+	# name lookups to be performed. Value is given in seconds.
+	option interval	3600
+
+	# File to store information about the process id of the program.
+	# The program must have write access to this file/directory.
+	option pidfile	/var/run/chilli.pid
+
+	# Directory to use for nonvolatile storage.
+	# The program must have write access to this directory.
+	# This tag is currently ignored
+	#option	statedir	./
+
+
+# TUN parameters
+config tun
+
+	# IP network address of external packet data network
+	# Used to allocate dynamic IP addresses and set up routing.
+	# Normally you do not need to uncomment this tag.
+	option net	192.168.182.0/24
+
+	# Dynamic IP address pool
+	# Used to allocate dynamic IP addresses to clients.
+	# If not set it defaults to the net tag.
+	# Do not uncomment this tag unless you are an experienced user!
+	#option	dynip	192.168.182.0/24
+
+	# Static IP address pool
+	# Used to allocate static IP addresses to clients.
+	# Do not uncomment this tag unless you are an experienced user!
+	#option	statip	192.168.182.0/24
+
+	# Primary DNS server.
+	# Will be suggested to the client.
+	# If omitted the system default will be used.
+	# Normally you do not need to uncomment this tag.
+	#option	dns1	172.16.0.5
+
+	# Secondary DNS server.
+	# Will be suggested to the client.
+	# If omitted the system default will be used.
+	# Normally you do not need to uncomment this tag.
+	#option	dns2	172.16.0.6
+
+	# Domain name
+	# Will be suggested to the client.
+	# Normally you do not need to uncomment this tag.
+	option domain	key.chillispot.org
+
+	# Script executed after network interface has been brought up.
+	# Executed with the following parameters: <devicename> <ip address> <mask>
+	# Normally you do not need to uncomment this tag.
+	#option	ipup	/etc/chilli.ipup
+
+	# Script executed after network interface has been taken down.
+	# Executed with the following parameters: <devicename> <ip address> <mask>
+	# Normally you do not need to uncomment this tag.
+	#option	ipdown	/etc/chilli.ipdown
+
+	# Script executed after a user has been authenticated.
+	# Executed with the following parameters: <devicename> <ip address>
+	# <mask> <user ip address> <user mac address> <filter ID>
+	# Normally you do not need to uncomment this tag.
+	#option	conup	/etc/chilli.conup
+
+	# Script executed after a user has disconnected.
+	# Executed with the following parameters: <devicename> <ip address>
+	# <mask> <user ip address> <user mac address> <filter ID>
+	# Normally you do not need to uncomment this tag.
+	#option	condown	/etc/chilli.condown
+
+
+# DHCP Parameters
+config dhcp
+
+	# Ethernet interface to listen to.
+	# This is the network interface which is connected to the access points.
+	# In a typical configuration this tag should be set to eth1.
+	option dhcpif	eth1
+
+	# Use specified MAC address.
+	# An address in the range  00:00:5E:00:02:00 - 00:00:5E:FF:FF:FF falls
+	# within the IANA range of addresses and is not allocated for other
+	# purposes.
+	# Normally you do not need to uncomment this tag.
+	#option dhcpmac	00:00:5E:00:02:00
+
+	# Time before DHCP lease expires
+	# Normally you do not need to uncomment this tag.
+	#option lease	600
+
+
+# Radius parameters
+config radius
+
+	# IP address to listen to
+	# Normally you do not need to uncomment this tag.
+	#option radiuslisten	127.0.0.1
+
+	# IP address of radius server 1
+	# For most installations you need to modify this tag.
+	option radiusserver1	rad01.chillispot.org
+
+	# IP address of radius server 2
+	# If you have only one radius server you should set radiusserver2 to the
+	# same value as radiusserver1.
+	# For most installations you need to modify this tag.
+	option radiusserver2	rad02.chillispot.org
+
+	# Radius authentication port
+	# The UDP port number to use for radius authentication requests.
+	# The same port number is used for both radiusserver1 and radiusserver2.
+	# Normally you do not need to uncomment this tag.
+	#option radiusauthport	1812
+
+	# Radius accounting port
+	# The UDP port number to use for radius accounting requests.
+	# The same port number is used for both radiusserver1 and radiusserver2.
+	# Normally you do not need to uncomment this tag.
+	#option radiusacctport	1813
+
+	# Radius shared secret for both servers
+	# For all installations you should modify this tag.
+	#option radiussecret	testing123
+
+	# Radius NAS-Identifier
+	# Normally you do not need to uncomment this tag.
+	#option radiusnasid	nas01
+
+	# Radius NAS-IP-Address
+	# Normally you do not need to uncomment this tag.
+	#option radiusnasip	127.0.0.1
+
+	# Radius Called-Station-ID
+	# Normally you do not need to uncomment this tag.
+	#option radiuscalled	00133300
+
+	# WISPr Location ID. Should be in the format: isocc=<ISO_Country_Code>,
+	# cc=<E.164_Country_Code>,ac=<E.164_Area_Code>,network=<ssid/ZONE>
+	# Normally you do not need to uncomment this tag.
+	#option radiuslocationid	isocc=us,cc=1,ac=408,network=ACMEWISP_NewarkAirport
+
+	# WISPr Location Name. Should be in the format:
+	# <HOTSPOT_OPERATOR_NAME>,<LOCATION>
+	# Normally you do not need to uncomment this tag.
+	#option radiuslocationname	ACMEWISP,Gate_14_Terminal_C_of_Newark_Airport
+
+
+# Radius proxy parameters
+config proxy
+
+	# IP address to listen to
+	# Normally you do not need to uncomment this tag.
+	#option proxylisten	10.0.0.1
+
+	# UDP port to listen to.
+	# If not specified a port will be selected by the system
+	# Normally you do not need to uncomment this tag.
+	#option proxyport	1645
+
+	# Client(s) from which we accept radius requests
+	# Normally you do not need to uncomment this tag.
+	#option proxyclient	10.0.0.1/24
+
+	# Radius proxy shared secret for all clients
+	# If not specified defaults to radiussecret
+	# Normally you do not need to uncomment this tag.
+	#option proxysecret	testing123
+
+
+# Universal access method (UAM) parameters
+config uam
+
+	# URL of web server handling authentication.
+	option uamserver	https://radius.chillispot.org/hotspotlogin
+
+	# URL of welcome homepage.
+	# Unauthenticated users will be redirected to this URL. If not specified
+	# users will be redirected to the uamserver instead.
+	# Normally you do not need to uncomment this tag.
+	#option uamhomepage	http://192.168.182.1/welcome.html
+
+	# Shared between chilli and authentication web server
+	#option uamsecret	ht2eb8ej6s4et3rg1ulp
+
+	# IP address to listen to for authentication requests
+	# Do not uncomment this tag unless you are an experienced user!
+	#option uamlisten	192.168.182.1
+
+	# TCP port to listen to for authentication requests
+	# Do not uncomment this tag unless you are an experienced user!
+	#option uamport	3990
+
+	# Comma separated list of domain names, IP addresses or network segments
+	# the client can access without first authenticating.
+	# It is possible to specify this tag multiple times.
+	# Normally you do not need to uncomment this tag.
+	#list uamallowed	www.chillispot.org
+	#list uamallowed	10.11.12.0/24
+
+	# If this flag is given unauthenticated users are allowed to use
+	# any DNS server.
+	# Normally you do not need to uncomment this tag.
+	#uamanydns
+
+
+# MAC authentication
+config macauth
+
+	# If this flag is given users will be authenticated only on their MAC
+	# address.
+	# Normally you do not need to enable this flag.
+	option macauth	0
+
+	# List of MAC addresses.
+	# The MAC addresses specified in this list will be authenticated only on
+	# their MAC address.
+	# This tag is ignored if the macauth tag is given.
+	# It is possible to specify this tag multiple times.
+	# Normally you do not need to uncomment this tag.
+	#list macallowed	00-0A-5E-AC-BE-51
+	#list macallowed	00-30-1B-3C-32-E9
+
+	# Password to use for MAC authentication.
+	# Normally you do not need to uncomment this tag.
+	#option macpasswd	password
+
+	# Suffix to add to MAC address in order to form the username.
+	# Normally you do not need to uncomment this tag.
+	#option macsuffix	suffix
diff --git a/trunk/package/luci/applications/luci-ddns/CHANGELOG b/trunk/package/luci/applications/luci-ddns/CHANGELOG
new file mode 100644
index 00000000..22461299
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/CHANGELOG
@@ -0,0 +1,51 @@
+Version: 2.1.0-3
+Date: 2014-12-07
+ddns-scripts: 2.1.0-2 or greater needed
+
+- modified controller
+	- remove support for ddns-scripts Version 1.x
+	- ddns-scripts not correctly installed do not start
+	- no config file create an empty one
+- moved log settings to advanced tab
+- set default syslog level "Notice"
+- removed special handling for dynamic_dns_helper.sh in postinst
+
+--------------------------------------------------------------------------------
+Version: 2.1.0-2
+Date: 2014-11-15
+ddns-scripts: 2.1.0-2 or greater needed
+
+- moved /usr/lib/ddns/dynamic_dns_lucihelper.sh to ddns-scripts package
+- fixed error message when validating proxy
+- modified validating ip_script to allow the usage of parameters
+- using ipkg/postinst AND ipkg/postinst-pkg as long as LuCI Makefiles did not
+	fullfil requirements of new libreCMC default_postinst and default_postrm
+	reported in Issue #255
+- cleanup whitespaces at line ends
+
+--------------------------------------------------------------------------------
+Version: 2.1.0-1
+Date: 2014-11-09
+ddns-scripts: 2.1.0-1 or greater needed
+
+fix verify of entry for DNS server Issue #244
+	https://github.com/librecmc/luci/issues/244
+add support for option 'update_script'
+add display of version information when click on "Dynamic DNS" on overview page
+add verify of installed ddns-scripts version and show as hint if not correct version
+modified epoch to date conversation
+cbi object Flag did not set section.changed state, fixed in tools.flag_parse function
+ucitrack entry no longer needed and removed
+minor fixes
+
+--------------------------------------------------------------------------------
+Version: 2.0.1-1
+Date: 2014-09-21
+ddns-scripts: 2.0.1-1 up to 2.0.1-9
+
+New DDNS status in System->Status overview
+New Overview page with option to start/stop a section
+New Detail page with tabbed view incl. logfile viewer
+Extended verify of all entries before save to config
+   incl. connect test to DNS- and Proxy-server
+Support for all available options of ddns-scripts 1.x and 2.x
diff --git a/trunk/package/luci/applications/luci-ddns/Makefile b/trunk/package/luci/applications/luci-ddns/Makefile
new file mode 100644
index 00000000..3f57d63c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/Makefile
@@ -0,0 +1,4 @@
+PO = ddns
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-ddns/ipkg/postinst b/trunk/package/luci/applications/luci-ddns/ipkg/postinst
new file mode 100644
index 00000000..a2c13fa3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/ipkg/postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-ddns ) && rm -f /etc/uci-defaults/luci-ddns
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-ddns/ipkg/postinst-pkg b/trunk/package/luci/applications/luci-ddns/ipkg/postinst-pkg
new file mode 100644
index 00000000..a2c13fa3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/ipkg/postinst-pkg
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-ddns ) && rm -f /etc/uci-defaults/luci-ddns
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/controller/ddns.lua b/trunk/package/luci/applications/luci-ddns/luasrc/controller/ddns.lua
new file mode 100644
index 00000000..0e162f14
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/controller/ddns.lua
@@ -0,0 +1,261 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.ddns", package.seeall)
+
+local NX   = require "nixio"
+local NXFS = require "nixio.fs"
+local DISP = require "luci.dispatcher"
+local HTTP = require "luci.http"
+local UCI  = require "luci.model.uci"
+local SYS  = require "luci.sys"
+local DDNS = require "luci.tools.ddns"		-- ddns multiused functions
+local UTIL = require "luci.util"
+
+local luci_ddns_version = "2.1.0-3"	-- luci-app-ddns / librecmc Makefile compatible version
+local ddns_scripts_min  = "2.1.0-2"	-- minimum version of ddns-scripts required
+
+function index()
+	-- no services_ipv6 file or no dynamic_dns_lucihelper.sh
+	-- do NOT start
+	if not nixio.fs.access("/usr/lib/ddns/services_ipv6") 
+	or not nixio.fs.access("/usr/lib/ddns/dynamic_dns_lucihelper.sh") then
+		return
+	end
+	-- no config create an empty one
+	if not nixio.fs.access("/etc/config/ddns") then
+		nixio.fs.writefile("/etc/config/ddns", "")
+	end
+
+	entry( {"admin", "services", "ddns"}, cbi("ddns/overview"), _("Dynamic DNS"), 59)
+	entry( {"admin", "services", "ddns", "detail"}, cbi("ddns/detail"), nil ).leaf = true
+	entry( {"admin", "services", "ddns", "hints"}, cbi("ddns/hints",
+		{hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}), nil ).leaf = true
+	entry( {"admin", "services", "ddns", "logview"}, call("logread") ).leaf = true
+	entry( {"admin", "services", "ddns", "startstop"}, call("startstop") ).leaf = true
+	entry( {"admin", "services", "ddns", "status"}, call("status") ).leaf = true
+end
+
+-- function to read all sections status and return data array
+local function _get_status()
+	local uci	 = UCI.cursor()
+	local service	 = SYS.init.enabled("ddns") and 1 or 0
+	local url_start	 = DISP.build_url("admin", "system", "startup")
+	local luci_build = DDNS.ipkg_version("luci-app-ddns").version
+	local ddns_act   = DDNS.ipkg_version("ddns-scripts").version
+	local data	 = {}	-- Array to transfer data to javascript
+
+	data[#data+1] 	= {
+		enabled	   = service,		-- service enabled
+		url_up	   = url_start,		-- link to enable DDS (System-Startup)
+		luci_ver   = luci_ddns_version,	-- luci-app-ddns / librecmc Makefile compatible version
+		luci_build = luci_build,	-- installed luci build
+		script_min = ddns_scripts_min,	-- minimum version of ddns-scripts needed
+		script_ver = ddns_act		-- installed ddns-scripts
+	}
+
+	uci:foreach("ddns", "service", function (s)
+
+		-- Get section we are looking at
+		-- and enabled state
+		local section	= s[".name"]
+		local enabled	= tonumber(s["enabled"]) or 0
+		local datelast	= "_empty_"	-- formated date of last update
+		local datenext	= "_empty_"	-- formated date of next update
+
+		-- get force seconds
+		local force_seconds = DDNS.calc_seconds(
+				tonumber(s["force_interval"]) or 72 ,
+				s["force_unit"] or "hours" )
+		-- get/validate pid and last update
+		local pid      = DDNS.get_pid(section)
+		local uptime   = SYS.uptime()
+		local lasttime = DDNS.get_lastupd(section)
+		if lasttime > uptime then 	-- /var might not be linked to /tmp
+			lasttime = 0 		-- and/or not cleared on reboot
+		end
+
+		-- no last update happen
+		if lasttime == 0 then
+			datelast = "_never_"
+
+		-- we read last update
+		else
+			-- calc last update
+			--             sys.epoch - sys uptime   + lastupdate(uptime)
+			local epoch = os.time() - uptime + lasttime
+			-- use linux date to convert epoch
+			datelast = DDNS.epoch2date(epoch)
+			-- calc and fill next update
+			datenext = DDNS.epoch2date(epoch + force_seconds)
+		end
+
+		-- process running but update needs to happen
+		-- problems it force_seconds > uptime
+		force_seconds = (force_seconds > uptime) and uptime or force_seconds
+		if pid > 0 and ( lasttime + force_seconds - uptime ) <= 0 then
+			datenext = "_verify_"
+
+		-- run once
+		elseif force_seconds == 0 then
+			datenext = "_runonce_"
+
+		-- no process running and NOT enabled
+		elseif pid == 0 and enabled == 0 then
+			datenext  = "_disabled_"
+
+		-- no process running and NOT
+		elseif pid == 0 and enabled ~= 0 then
+			datenext = "_stopped_"
+		end
+
+		-- get/set monitored interface and IP version
+		local iface	= s["interface"] or "_nonet_"
+		local use_ipv6	= tonumber(s["use_ipv6"]) or 0
+		if iface ~= "_nonet_" then
+			local ipv = (use_ipv6 == 1) and "IPv6" or "IPv4"
+			iface = ipv .. " / " .. iface
+		end
+
+		-- try to get registered IP
+		local domain	= s["domain"] or "_nodomain_"
+		local dnsserver	= s["dns_server"] or ""
+		local force_ipversion = tonumber(s["force_ipversion"] or 0)
+		local force_dnstcp = tonumber(s["force_dnstcp"] or 0)
+		local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh]]
+		command = command .. [[ get_registered_ip ]] .. domain .. [[ ]] .. use_ipv6 ..
+			[[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp .. [[ ]] .. dnsserver
+		local reg_ip = SYS.exec(command)
+		if reg_ip == "" then
+			reg_ip = "_nodata_"
+		end
+
+		-- fill transfer array
+		data[#data+1]	= {
+			section  = section,
+			enabled  = enabled,
+			iface    = iface,
+			domain   = domain,
+			reg_ip   = reg_ip,
+			pid      = pid,
+			datelast = datelast,
+			datenext = datenext
+		}
+	end)
+
+	uci:unload("ddns")
+	return data
+end
+
+-- called by XHR.get from detail_logview.htm
+function logread(section)
+	-- read application settings
+	local uci	  = UCI.cursor()
+	local log_dir	  = uci:get("ddns", "global", "log_dir") or "/var/log/ddns"
+	local lfile=log_dir .. "/" .. section .. ".log"
+
+	local ldata=NXFS.readfile(lfile)
+	if not ldata or #ldata == 0 then
+		ldata="_nodata_"
+	end
+	uci:unload("ddns")
+	HTTP.write(ldata)
+end
+
+-- called by XHR.get from overview_status.htm
+function startstop(section, enabled)
+	local uci  = UCI.cursor()
+	local data = {}		-- Array to transfer data to javascript
+
+	-- if process running we want to stop and return
+	local pid = DDNS.get_pid(section)
+	if pid > 0 then
+		local tmp = NX.kill(pid, 15)	-- terminate
+		NX.nanosleep(2)	-- 2 second "show time"
+		-- status changed so return full status
+		data = _get_status()
+		HTTP.prepare_content("application/json")
+		HTTP.write_json(data)
+		return
+	end
+
+	-- read uncommited changes
+	-- we don't save and commit data from other section or other options
+	-- only enabled will be done
+	local exec	  = true
+	local changed     = uci:changes("ddns")
+	for k_config, v_section in pairs(changed) do
+		-- security check because uci.changes only gets our config
+		if k_config ~= "ddns" then
+			exec = false
+			break
+		end
+		for k_section, v_option in pairs(v_section) do
+			-- check if only section of button was changed
+			if k_section ~= section then
+				exec = false
+				break
+			end
+			for k_option, v_value in pairs(v_option) do
+				-- check if only enabled was changed
+				if k_option ~= "enabled" then
+					exec = false
+					break
+				end
+			end
+		end
+	end
+
+	-- we can not execute because other
+	-- uncommited changes pending, so exit here
+	if not exec then
+		HTTP.write("_uncommited_")
+		return
+	end
+
+	-- save enable state
+	uci:set("ddns", section, "enabled", ( (enabled == "true") and "1" or "0") )
+	uci:save("ddns")
+	uci:commit("ddns")
+	uci:unload("ddns")
+
+	-- start dynamic_dns_updater.sh script
+	os.execute ([[/usr/lib/ddns/dynamic_dns_updater.sh %s 0 > /dev/null 2>&1 &]] % section)
+	NX.nanosleep(3)	-- 3 seconds "show time"
+
+	-- status changed so return full status
+	data = _get_status()
+	HTTP.prepare_content("application/json")
+	HTTP.write_json(data)
+end
+
+-- called by XHR.poll from overview_status.htm
+function status()
+	local data = _get_status()
+	HTTP.prepare_content("application/json")
+	HTTP.write_json(data)
+end
+
+-- check if installed ddns-scripts version < required version
+function update_needed()
+	local sver = DDNS.ipkg_version("ddns-scripts")
+	local rver = UTIL.split(ddns_scripts_min, "[%.%-]", nil, true)
+	return (sver.major < (tonumber(rver[1]) or 0))
+	    or (sver.minor < (tonumber(rver[2]) or 0))
+	    or (sver.patch < (tonumber(rver[3]) or 0))
+	    or (sver.build < (tonumber(rver[4]) or 0))
+end
+
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/detail.lua b/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/detail.lua
new file mode 100644
index 00000000..748586cd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/detail.lua
@@ -0,0 +1,1224 @@
+--[[
+LuCI - Lua Configuration Interface
+
+A lot of code taken from original ddns.lua cbi-model made by
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
+
+modified to use as detail page together with new overview page and
+extensions for IPv6, HTTPS settings, syslog and log settings,
+optional Proxy-Support, optional DNS-Server, optional use of TCP requests to DNS server,
+optional force of IP protocol version usage
+Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local NX   = require "nixio"
+local FS   = require "nixio.fs"
+local SYS  = require "luci.sys"
+local UTIL = require "luci.util"
+local DISP = require "luci.dispatcher"
+local WADM = require "luci.tools.webadmin"
+local DTYP = require "luci.cbi.datatypes"
+local DDNS = require "luci.tools.ddns"		-- ddns multiused functions
+
+-- takeover arguments -- #######################################################
+section = arg[1]
+
+-- check supported options -- ##################################################
+-- saved to local vars here because doing multiple os calls slow down the system
+has_ipv6   = DDNS.check_ipv6()	-- IPv6 support
+has_ssl    = DDNS.check_ssl()	-- HTTPS support
+has_proxy  = DDNS.check_proxy()	-- Proxy support
+has_dnstcp = DDNS.check_bind_host()	-- DNS TCP support
+has_force  = has_ssl and has_dnstcp		-- Force IP Protocoll
+
+-- html constants -- ###########################################################
+font_red = "<font color='red'>"
+font_off = "</font>"
+bold_on  = "<strong>"
+bold_off = "</strong>"
+
+-- error text constants -- #####################################################
+err_ipv6_plain = translate("IPv6 not supported") .. " - " ..
+		translate("please select 'IPv4' address version")
+err_ipv6_basic = bold_on ..
+			font_red ..
+				translate("IPv6 not supported") ..
+			font_off ..
+			"<br />" .. translate("please select 'IPv4' address version") ..
+		 bold_off
+err_ipv6_other = bold_on ..
+			font_red ..
+				translate("IPv6 not supported") ..
+			font_off ..
+			"<br />" .. translate("please select 'IPv4' address version in") .. " " ..
+			[[<a href="]] ..
+					DISP.build_url("admin", "services", "ddns", "detail", section) ..
+					"?tab.dns." .. section .. "=basic" ..
+				[[">]] ..
+				translate("Basic Settings") ..
+			[[</a>]] ..
+		 bold_off
+
+function err_tab_basic(self)
+	return translate("Basic Settings") .. " - " .. self.title .. ": "
+end
+function err_tab_adv(self)
+	return translate("Advanced Settings") .. " - " .. self.title .. ": "
+end
+function err_tab_timer(self)
+	return translate("Timer Settings") .. " - " .. self.title .. ": "
+end
+
+-- function to verify settings around ip_source
+-- will use dynamic_dns_lucihelper to check if
+-- local IP can be read
+local function _verify_ip_source()
+	-- section is globally defined here be calling agrument (see above)
+	local _network   = "-"
+	local _url       = "-"
+	local _interface = "-"
+	local _script    = "-"
+	local _proxy     = ""
+
+	local _ipv6   = usev6:formvalue(section)
+	local _source = (_ipv6 == "1")
+			and src6:formvalue(section)
+			or  src4:formvalue(section)
+	if _source == "network" then
+		_network = (_ipv6 == "1")
+			and ipn6:formvalue(section)
+			or  ipn4:formvalue(section)
+	elseif _source == "web" then
+		_url = (_ipv6 == "1")
+			and iurl6:formvalue(section)
+			or  iurl4:formvalue(section)
+		-- proxy only needed for checking url
+		_proxy = (pxy) and pxy:formvalue(section) or ""
+	elseif _source == "interface" then
+		_interface = ipi:formvalue(section)
+	elseif _source == "script" then
+		_script = ips:formvalue(section)
+	end
+
+	local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh get_local_ip ]] ..
+		_ipv6 .. [[ ]] .. _source .. [[ ]] .. _network .. [[ ]] ..
+		_url .. [[ ]] .. _interface .. [[ ']] .. _script.. [[' ]] .. _proxy
+	local ret = SYS.call(command)
+
+	if ret == 0 then
+		return true	-- valid
+	else
+		return nil	-- invalid
+	end
+end
+
+-- cbi-map definition -- #######################################################
+m = Map("ddns")
+
+-- first need to close <a> from cbi map template our <a> closed by template
+m.title = [[</a><a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] ..
+		translate("Dynamic DNS")
+
+m.description = translate("Dynamic DNS allows that your router can be reached with " ..
+			"a fixed hostname while having a dynamically changing " ..
+			"IP address.")
+
+m.redirect = DISP.build_url("admin", "services", "ddns")
+
+m.on_after_commit = function(self)
+	if self.changed then	-- changes ?
+		local pid = DDNS.get_pid(section)
+		if pid > 0 then	-- running ?
+			local tmp = NX.kill(pid, 1)	-- send SIGHUP
+		end
+	end
+end
+
+-- read application settings -- ################################################
+-- date format; if not set use ISO format
+date_format = m.uci:get(m.config, "global", "date_format") or "%F %R"
+-- log directory
+log_dir = m.uci:get(m.config, "global", "log_dir") or "/var/log/ddns"
+
+-- cbi-section definition -- ###################################################
+ns = m:section( NamedSection, section, "service",
+	translate("Details for") .. ([[: <strong>%s</strong>]] % section),
+	translate("Configure here the details for selected Dynamic DNS service") )
+ns.instance = section	-- arg [1]
+ns:tab("basic", translate("Basic Settings"), nil )
+ns:tab("advanced", translate("Advanced Settings"), nil )
+ns:tab("timer", translate("Timer Settings"), nil )
+ns:tab("logview", translate("Log File Viewer"), nil )
+
+-- TAB: Basic  #####################################################################################
+-- enabled  -- #################################################################
+en = ns:taboption("basic", Flag, "enabled",
+	translate("Enabled"),
+	translate("If this service section is disabled it could not be started." .. "<br />" ..
+		"Neither from LuCI interface nor from console") )
+en.orientation = "horizontal"
+function en.parse(self, section)
+	DDNS.flag_parse(self, section)
+end
+
+-- use_ipv6 (NEW)  -- ##########################################################
+usev6 = ns:taboption("basic", ListValue, "use_ipv6",
+	translate("IP address version"),
+	translate("Defines which IP address 'IPv4/IPv6' is send to the DDNS provider") )
+usev6.widget  = "radio"
+usev6.default = "0"
+usev6:value("0", translate("IPv4-Address") )
+function usev6.cfgvalue(self, section)
+	local value = AbstractValue.cfgvalue(self, section)
+	if has_ipv6 or (value == "1" and not has_ipv6) then
+		self:value("1", translate("IPv6-Address") )
+	end
+	if value == "1" and not has_ipv6 then
+		self.description = err_ipv6_basic
+	end
+	return value
+end
+function usev6.validate(self, value)
+	if (value == "1" and has_ipv6) or value == "0" then
+		return value
+	end
+	return nil, err_tab_basic(self) .. err_ipv6_plain
+end
+function usev6.write(self, section, value)
+	if value == "0" then	-- force rmempty
+		return self.map:del(section, self.option)
+	else
+		return self.map:set(section, self.option, value)
+	end
+end
+
+-- IPv4 - service_name -- ######################################################
+svc4 = ns:taboption("basic", ListValue, "ipv4_service_name",
+	translate("DDNS Service provider") .. " [IPv4]" )
+svc4.default	= "-"
+svc4:depends("use_ipv6", "0")	-- only show on IPv4
+
+local services4 = { }
+local fd4 = io.open("/usr/lib/ddns/services", "r")
+
+if fd4 then
+	local ln
+	repeat
+		ln = fd4:read("*l")
+		local s = ln and ln:match('^%s*"([^"]+)"')
+		if s then services4[#services4+1] = s end
+	until not ln
+	fd4:close()
+end
+
+for _, v in UTIL.vspairs(services4) do svc4:value(v) end
+svc4:value("-", translate("-- custom --") )
+
+function svc4.cfgvalue(self, section)
+	local v =  DDNS.read_value(self, section, "service_name")
+	if not v or #v == 0 then
+		return "-"
+	else
+		return v
+	end
+end
+function svc4.validate(self, value)
+	if usev6:formvalue(section) == "0" then	-- do only on IPv4
+		return value
+	else
+		return ""	-- supress validate error
+	end
+end
+function svc4.write(self, section, value)
+	if usev6:formvalue(section) == "0" then	-- do only IPv4 here
+		self.map:del(section, self.option)	-- to be shure
+		if value ~= "-" then			-- and write "service_name
+			self.map:del(section, "update_url")	-- delete update_url
+			return self.map:set(section, "service_name", value)
+		else
+			return self.map:del(section, "service_name")
+		end
+	end
+end
+
+-- IPv6 - service_name -- ######################################################
+svc6 = ns:taboption("basic", ListValue, "ipv6_service_name",
+	translate("DDNS Service provider") .. " [IPv6]" )
+svc6.default	= "-"
+svc6:depends("use_ipv6", "1")	-- only show on IPv6
+if not has_ipv6 then
+	svc6.description = err_ipv6_basic
+end
+
+local services6 = { }
+local fd6 = io.open("/usr/lib/ddns/services_ipv6", "r")
+
+if fd6 then
+	local ln
+	repeat
+		ln = fd6:read("*l")
+		local s = ln and ln:match('^%s*"([^"]+)"')
+		if s then services6[#services6+1] = s end
+	until not ln
+	fd6:close()
+end
+
+for _, v in UTIL.vspairs(services6) do svc6:value(v) end
+svc6:value("-", translate("-- custom --") )
+
+function svc6.cfgvalue(self, section)
+	local v =  DDNS.read_value(self, section, "service_name")
+	if not v or #v == 0 then
+		return "-"
+	else
+		return v
+	end
+end
+function svc6.validate(self, value)
+	if usev6:formvalue(section) == "1" then	-- do only on IPv6
+		if has_ipv6 then return value end
+		return nil, err_tab_basic(self) .. err_ipv6_plain
+	else
+		return ""	-- supress validate error
+	end
+end
+function svc6.write(self, section, value)
+	if usev6:formvalue(section) == "1" then	-- do only when IPv6
+		self.map:del(section, self.option)	-- delete "ipv6_service_name" helper
+		if value ~= "-" then			-- and write "service_name
+			self.map:del(section, "update_url")	-- delete update_url
+			return self.map:set(section, "service_name", value)
+		else
+			return self.map:del(section, "service_name")
+		end
+	end
+end
+
+-- IPv4/IPv6 - update_url -- ###################################################
+uurl = ns:taboption("basic", Value, "update_url",
+	translate("Custom update-URL"),
+	translate("Update URL to be used for updating your DDNS Provider." .. "<br />" ..
+		"Follow instructions you will find on their WEB page.") )
+uurl:depends("ipv4_service_name", "-")
+uurl:depends("ipv6_service_name", "-")
+function uurl.validate(self, value)
+	local script = ush:formvalue(section)
+
+	if (usev6:formvalue(section) == "0" and svc4:formvalue(section) ~= "-") or
+	   (usev6:formvalue(section) == "1" and svc6:formvalue(section) ~= "-") then
+		return ""	-- suppress validate error
+	elseif not value then
+		if not script or not (#script > 0) then
+			return nil, err_tab_basic(self) .. translate("missing / required")
+		else
+			return ""	-- suppress validate error / update_script is given
+		end
+	elseif (#script > 0) then
+		return nil, err_tab_basic(self) .. translate("either url or script could be set")
+	end
+
+	local url = DDNS.parse_url(value)
+	if not url.scheme == "http" then
+		return nil, err_tab_basic(self) .. translate("must start with 'http://'")
+	elseif not url.query then
+		return nil, err_tab_basic(self) .. "<QUERY> " .. translate("missing / required")
+	elseif not url.host then
+		return nil, err_tab_basic(self) .. "<HOST> " .. translate("missing / required")
+	elseif SYS.call([[nslookup ]] .. url.host .. [[ >/dev/null 2>&1]]) ~= 0 then
+		return nil, err_tab_basic(self) .. translate("can not resolve host: ") .. url.host
+	end
+
+	return value
+end
+
+-- IPv4/IPv6 - update_script -- ################################################
+ush = ns:taboption("basic", Value, "update_script",
+	translate("Custom update-script"),
+	translate("Custom update script to be used for updating your DDNS Provider.") )
+ush:depends("ipv4_service_name", "-")
+ush:depends("ipv6_service_name", "-")
+function ush.validate(self, value)
+	local url = uurl:formvalue(section)
+
+	if (usev6:formvalue(section) == "0" and svc4:formvalue(section) ~= "-") or
+	   (usev6:formvalue(section) == "1" and svc6:formvalue(section) ~= "-") then
+		return ""	-- suppress validate error
+	elseif not value then
+		if not url or not (#url > 0) then
+			return nil, err_tab_basic(self) .. translate("missing / required")
+		else
+			return ""	-- suppress validate error / update_url is given
+		end
+	elseif (#url > 0) then
+		return nil, err_tab_basic(self) .. translate("either url or script could be set")
+	elseif not FS.access(value) then
+		return nil, err_tab_basic(self) .. translate("File not found")
+	end
+	return value
+end
+
+-- IPv4/IPv6 - domain -- #######################################################
+dom = ns:taboption("basic", Value, "domain",
+		translate("Hostname/Domain"),
+		translate("Replaces [DOMAIN] in Update-URL") )
+dom.rmempty	= false
+dom.placeholder	= "mypersonaldomain.dyndns.org"
+function dom.validate(self, value)
+	if not value
+	or not (#value > 0)
+	or not DTYP.hostname(value) then
+		return nil, err_tab_basic(self) ..	translate("invalid - Sample") .. ": 'mypersonaldomain.dyndns.org'"
+	else
+		return value
+	end
+end
+
+-- IPv4/IPv6 - username -- #####################################################
+user = ns:taboption("basic", Value, "username",
+		translate("Username"),
+		translate("Replaces [USERNAME] in Update-URL") )
+user.rmempty = false
+function user.validate(self, value)
+	if not value then
+		return nil, err_tab_basic(self) .. translate("missing / required")
+	end
+	return value
+end
+
+-- IPv4/IPv6 - password -- #####################################################
+pw = ns:taboption("basic", Value, "password",
+		translate("Password"),
+		translate("Replaces [PASSWORD] in Update-URL") )
+pw.rmempty  = false
+pw.password = true
+function pw.validate(self, value)
+	if not value then
+		return nil, err_tab_basic(self) .. translate("missing / required")
+	end
+	return value
+end
+
+-- IPv4/IPv6 - use_https (NEW) -- ##############################################
+if has_ssl or ( ( m:get(section, "use_https") or "0" ) == "1" ) then
+	https = ns:taboption("basic", Flag, "use_https",
+		translate("Use HTTP Secure") )
+	https.orientation = "horizontal"
+	https.rmempty = false -- force validate function
+	function https.cfgvalue(self, section)
+		local value = AbstractValue.cfgvalue(self, section)
+		if not has_ssl and value == "1" then
+			self.description = bold_on .. font_red ..
+				translate("HTTPS not supported") .. font_off .. "<br />" ..
+				translate("please disable") .. " !" .. bold_off
+		else
+			self.description = translate("Enable secure communication with DDNS provider")
+		end
+		return value
+	end
+	function https.parse(self, section)
+		DDNS.flag_parse(self, section)
+	end
+	function https.validate(self, value)
+		if (value == "1" and has_ssl ) or value == "0" then return value end
+		return nil, err_tab_basic(self) .. translate("HTTPS not supported") .. " !"
+	end
+	function https.write(self, section, value)
+		if value == "1" then
+			return self.map:set(section, self.option, value)
+		else
+			self.map:del(section, "cacert")
+			return self.map:del(section, self.option)
+		end
+	end
+end
+
+-- IPv4/IPv6 - cacert (NEW) -- #################################################
+if has_ssl then
+	cert = ns:taboption("basic", Value, "cacert",
+		translate("Path to CA-Certificate"),
+		translate("directory or path/file") .. "<br />" ..
+		translate("or") .. bold_on .. " IGNORE " .. bold_off ..
+		translate("to run HTTPS without verification of server certificates (insecure)") )
+	cert:depends("use_https", "1")
+	cert.rmempty = false -- force validate function
+	cert.default = "/etc/ssl/certs"
+	function cert.validate(self, value)
+		if https:formvalue(section) == "0" then
+			return ""	-- supress validate error if NOT https
+		end
+		if value then	-- otherwise errors in datatype check
+			if DTYP.directory(value)
+			or DTYP.file(value)
+			or value == "IGNORE" then
+				return value
+			end
+		end
+		return nil, err_tab_basic(self) ..
+			translate("file or directory not found or not 'IGNORE'") .. " !"
+	end
+end
+
+-- TAB: Advanced  ##################################################################################
+-- IPv4 - ip_source -- #########################################################
+src4 = ns:taboption("advanced", ListValue, "ipv4_source",
+	translate("IP address source") .. " [IPv4]",
+	translate("Defines the source to read systems IPv4-Address from, that will be send to the DDNS provider") )
+src4:depends("use_ipv6", "0")	-- IPv4 selected
+src4.default = "network"
+src4:value("network", translate("Network"))
+src4:value("web", translate("URL"))
+src4:value("interface", translate("Interface"))
+src4:value("script", translate("Script"))
+function src4.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "ip_source")
+end
+function src4.validate(self, value)
+	if usev6:formvalue(section) == "1" then
+		return ""	-- ignore on IPv6 selected
+	elseif not _verify_ip_source() then
+		return nil, err_tab_adv(self) ..
+			translate("can not detect local IP. Please select a different Source combination")
+	else
+		return value
+	end
+end
+function src4.write(self, section, value)
+	if usev6:formvalue(section) == "1" then
+		return true	-- ignore on IPv6 selected
+	elseif value == "network" then
+		self.map:del(section, "ip_url")		-- delete not need parameters
+		self.map:del(section, "ip_interface")
+		self.map:del(section, "ip_script")
+	elseif value == "web" then
+		self.map:del(section, "ip_network")	-- delete not need parameters
+		self.map:del(section, "ip_interface")
+		self.map:del(section, "ip_script")
+	elseif value == "interface" then
+		self.map:del(section, "ip_network")	-- delete not need parameters
+		self.map:del(section, "ip_url")
+		self.map:del(section, "ip_script")
+	elseif value == "script" then
+		self.map:del(section, "ip_network")
+		self.map:del(section, "ip_url")		-- delete not need parameters
+		self.map:del(section, "ip_interface")
+	end
+	self.map:del(section, self.option)		 -- delete "ipv4_source" helper
+	return self.map:set(section, "ip_source", value) -- and write "ip_source
+end
+
+-- IPv6 - ip_source -- #########################################################
+src6 = ns:taboption("advanced", ListValue, "ipv6_source",
+	translate("IP address source") .. " [IPv6]",
+	translate("Defines the source to read systems IPv6-Address from, that will be send to the DDNS provider") )
+src6:depends("use_ipv6", 1)	-- IPv6 selected
+src6.default = "network"
+src6:value("network", translate("Network"))
+src6:value("web", translate("URL"))
+src6:value("interface", translate("Interface"))
+src6:value("script", translate("Script"))
+if not has_ipv6 then
+	src6.description = err_ipv6_other
+end
+function src6.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "ip_source")
+end
+function src6.validate(self, value)
+	if usev6:formvalue(section) == "0" then
+		return ""	-- ignore on IPv4 selected
+	elseif not has_ipv6 then
+		return nil, err_tab_adv(self) .. err_ipv6_plain
+	elseif not _verify_ip_source() then
+		return nil, err_tab_adv(self) ..
+			translate("can not detect local IP. Please select a different Source combination")
+	else
+		return value
+	end
+end
+function src6.write(self, section, value)
+	if usev6:formvalue(section) == "0" then
+		return true	-- ignore on IPv4 selected
+	elseif value == "network" then
+		self.map:del(section, "ip_url")		-- delete not need parameters
+		self.map:del(section, "ip_interface")
+		self.map:del(section, "ip_script")
+	elseif value == "web" then
+		self.map:del(section, "ip_network")	-- delete not need parameters
+		self.map:del(section, "ip_interface")
+		self.map:del(section, "ip_script")
+	elseif value == "interface" then
+		self.map:del(section, "ip_network")	-- delete not need parameters
+		self.map:del(section, "ip_url")
+		self.map:del(section, "ip_script")
+	elseif value == "script" then
+		self.map:del(section, "ip_network")
+		self.map:del(section, "ip_url")		-- delete not need parameters
+		self.map:del(section, "ip_interface")
+	end
+	self.map:del(section, self.option)		 -- delete "ipv4_source" helper
+	return self.map:set(section, "ip_source", value) -- and write "ip_source
+end
+
+-- IPv4 - ip_network (default "wan") -- ########################################
+ipn4 = ns:taboption("advanced", ListValue, "ipv4_network",
+	translate("Network") .. " [IPv4]",
+	translate("Defines the network to read systems IPv4-Address from") )
+ipn4:depends("ipv4_source", "network")
+ipn4.default = "wan"
+WADM.cbi_add_networks(ipn4)
+function ipn4.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "ip_network")
+end
+function ipn4.validate(self, value)
+	if usev6:formvalue(section) == "1"
+	 or src4:formvalue(section) ~= "network" then
+		-- ignore if IPv6 selected OR
+		-- ignore everything except "network"
+		return ""
+	else
+		return value
+	end
+end
+function ipn4.write(self, section, value)
+	if usev6:formvalue(section) == "1"
+	 or src4:formvalue(section) ~= "network" then
+		-- ignore if IPv6 selected OR
+		-- ignore everything except "network"
+		return true
+	else
+		-- set also as "interface" for monitoring events changes/hot-plug
+		self.map:set(section, "interface", value)
+		self.map:del(section, self.option)		  -- delete "ipv4_network" helper
+		return self.map:set(section, "ip_network", value) -- and write "ip_network"
+	end
+end
+
+-- IPv6 - ip_network (default "wan6") -- #######################################
+ipn6 = ns:taboption("advanced", ListValue, "ipv6_network",
+	translate("Network") .. " [IPv6]" )
+ipn6:depends("ipv6_source", "network")
+ipn6.default = "wan6"
+WADM.cbi_add_networks(ipn6)
+if has_ipv6 then
+	ipn6.description = translate("Defines the network to read systems IPv6-Address from")
+else
+	ipn6.description = err_ipv6_other
+end
+function ipn6.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "ip_network")
+end
+function ipn6.validate(self, value)
+	if usev6:formvalue(section) == "0"
+	 or src6:formvalue(section) ~= "network" then
+		-- ignore if IPv4 selected OR
+		-- ignore everything except "network"
+		return ""
+	elseif has_ipv6 then
+		return value
+	else
+		return nil, err_tab_adv(self) .. err_ipv6_plain
+	end
+end
+function ipn6.write(self, section, value)
+	if usev6:formvalue(section) == "0"
+	 or src6:formvalue(section) ~= "network" then
+		-- ignore if IPv4 selected OR
+		-- ignore everything except "network"
+		return true
+	else
+		-- set also as "interface" for monitoring events changes/hotplug
+		self.map:set(section, "interface", value)
+		self.map:del(section, self.option)		  -- delete "ipv6_network" helper
+		return self.map:set(section, "ip_network", value) -- and write "ip_network"
+	end
+end
+
+-- IPv4 - ip_url (default "checkip.dyndns.com") -- #############################
+iurl4 = ns:taboption("advanced", Value, "ipv4_url",
+	translate("URL to detect") .. " [IPv4]",
+	translate("Defines the Web page to read systems IPv4-Address from") )
+iurl4:depends("ipv4_source", "web")
+iurl4.default = "http://checkip.dyndns.com"
+function iurl4.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "ip_url")
+end
+function iurl4.validate(self, value)
+	if usev6:formvalue(section) == "1"
+	 or src4:formvalue(section) ~= "web" then
+		-- ignore if IPv6 selected OR
+		-- ignore everything except "web"
+		return ""
+	elseif not value or #value == 0 then
+		return nil, err_tab_adv(self) .. translate("missing / required")
+	end
+
+	local url = DDNS.parse_url(value)
+	if not (url.scheme == "http" or url.scheme == "https") then
+		return nil, err_tab_adv(self) .. translate("must start with 'http://'")
+	elseif not url.host then
+		return nil, err_tab_adv(self) .. "<HOST> " .. translate("missing / required")
+	elseif SYS.call([[nslookup ]] .. url.host .. [[>/dev/null 2>&1]]) ~= 0 then
+		return nil, err_tab_adv(self) .. translate("can not resolve host: ") .. url.host
+	else
+		return value
+	end
+end
+function iurl4.write(self, section, value)
+	if usev6:formvalue(section) == "1"
+	 or src4:formvalue(section) ~= "web" then
+		-- ignore if IPv6 selected OR
+		-- ignore everything except "web"
+		return true
+	else
+		self.map:del(section, self.option)		-- delete "ipv4_url" helper
+		return self.map:set(section, "ip_url", value)	-- and write "ip_url"
+	end
+end
+
+-- IPv6 - ip_url (default "checkipv6.dyndns.com") -- ###########################
+iurl6 = ns:taboption("advanced", Value, "ipv6_url",
+	translate("URL to detect") .. " [IPv6]" )
+iurl6:depends("ipv6_source", "web")
+iurl6.default = "http://checkipv6.dyndns.com"
+if has_ipv6 then
+	iurl6.description = translate("Defines the Web page to read systems IPv6-Address from")
+else
+	iurl6.description = err_ipv6_other
+end
+function iurl6.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "ip_url")
+end
+function iurl6.validate(self, value)
+	if usev6:formvalue(section) == "0"
+	 or src6:formvalue(section) ~= "web" then
+		-- ignore if IPv4 selected OR
+		-- ignore everything except "web"
+		return ""
+	elseif not has_ipv6 then
+		return nil, err_tab_adv(self) .. err_ipv6_plain
+	elseif not value or #value == 0 then
+		return nil, err_tab_adv(self) .. translate("missing / required")
+	end
+
+	local url = DDNS.parse_url(value)
+	if not (url.scheme == "http" or url.scheme == "https") then
+		return nil, err_tab_adv(self) .. translate("must start with 'http://'")
+	elseif not url.host then
+		return nil, err_tab_adv(self) .. "<HOST> " .. translate("missing / required")
+	elseif SYS.call([[nslookup ]] .. url.host .. [[>/dev/null 2>&1]]) ~= 0 then
+		return nil, err_tab_adv(self) .. translate("can not resolve host: ") .. url.host
+	else
+		return value
+	end
+end
+function iurl6.write(self, section, value)
+	if usev6:formvalue(section) == "0"
+	 or src6:formvalue(section) ~= "web" then
+		-- ignore if IPv4 selected OR
+		-- ignore everything except "web"
+		return true
+	else
+		self.map:del(section, self.option)		-- delete "ipv6_url" helper
+		return self.map:set(section, "ip_url", value)	-- and write "ip_url"
+	end
+end
+
+-- IPv4 + IPv6 - ip_interface -- ###############################################
+ipi = ns:taboption("advanced", ListValue, "ip_interface",
+	translate("Interface"),
+	translate("Defines the interface to read systems IP-Address from") )
+ipi:depends("ipv4_source", "interface")	-- IPv4
+ipi:depends("ipv6_source", "interface")	-- or IPv6
+for _, v in pairs(SYS.net.devices()) do
+	-- show only interface set to a network
+	-- and ignore loopback
+	net = WADM.iface_get_network(v)
+	if net and net ~= "loopback" then
+		ipi:value(v)
+	end
+end
+function ipi.validate(self, value)
+	if (usev6:formvalue(section) == "0" and src4:formvalue(section) ~= "interface")
+	or (usev6:formvalue(section) == "1" and src6:formvalue(section) ~= "interface") then
+		return ""
+	else
+		return value
+	end
+end
+function ipi.write(self, section, value)
+	if (usev6:formvalue(section) == "0" and src4:formvalue(section) ~= "interface")
+	or (usev6:formvalue(section) == "1" and src6:formvalue(section) ~= "interface") then
+		return true
+	else
+		-- get network from device to
+		-- set also as "interface" for monitoring events changes/hotplug
+		local net = WADM.iface_get_network(value)
+		self.map:set(section, "interface", net)
+		return self.map:set(section, self.option, value)
+	end
+end
+
+-- IPv4 + IPv6 - ip_script (NEW) -- ############################################
+ips = ns:taboption("advanced", Value, "ip_script",
+	translate("Script"),
+	translate("User defined script to read systems IP-Address") )
+ips:depends("ipv4_source", "script")	-- IPv4
+ips:depends("ipv6_source", "script")	-- or IPv6
+ips.rmempty	= false
+ips.placeholder = "/path/to/script.sh"
+function ips.validate(self, value)
+	local split
+	if value then split = UTIL.split(value, " ") end
+
+	if (usev6:formvalue(section) == "0" and src4:formvalue(section) ~= "script")
+	or (usev6:formvalue(section) == "1" and src6:formvalue(section) ~= "script") then
+		return ""
+	elseif not value or not (#value > 0) or not FS.access(split[1], "x") then
+		return nil, err_tab_adv(self) ..
+			translate("not found or not executable - Sample: '/path/to/script.sh'")
+	else
+		return value
+	end
+end
+function ips.write(self, section, value)
+	if (usev6:formvalue(section) == "0" and src4:formvalue(section) ~= "script")
+	or (usev6:formvalue(section) == "1" and src6:formvalue(section) ~= "script") then
+		return true
+	else
+		return self.map:set(section, self.option, value)
+	end
+end
+
+-- IPv4 - interface - default "wan" -- #########################################
+-- event network to monitor changes/hotplug/dynamic_dns_updater.sh
+-- only needs to be set if "ip_source"="web" or "script"
+-- if "ip_source"="network" or "interface" we use their network
+eif4 = ns:taboption("advanced", ListValue, "ipv4_interface",
+	translate("Event Network") .. " [IPv4]",
+	translate("Network on which the ddns-updater scripts will be started") )
+eif4:depends("ipv4_source", "web")
+eif4:depends("ipv4_source", "script")
+eif4.default = "wan"
+WADM.cbi_add_networks(eif4)
+function eif4.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "interface")
+end
+function eif4.validate(self, value)
+	if usev6:formvalue(section) == "1"
+	 or src4:formvalue(section) == "network"
+	 or src4:formvalue(section) == "interface" then
+		return ""	-- ignore IPv6, network, interface
+	else
+		return value
+	end
+end
+function eif4.write(self, section, value)
+	if usev6:formvalue(section) == "1"
+	 or src4:formvalue(section) == "network"
+	 or src4:formvalue(section) == "interface" then
+		return true	-- ignore IPv6, network, interface
+	else
+		self.map:del(section, self.option)		 -- delete "ipv4_interface" helper
+		return self.map:set(section, "interface", value) -- and write "interface"
+	end
+end
+
+-- IPv6 - interface (NEW) - default "wan6" -- ##################################
+-- event network to monitor changes/hotplug (NEW)
+-- only needs to be set if "ip_source"="web" or "script"
+-- if "ip_source"="network" or "interface" we use their network
+eif6 = ns:taboption("advanced", ListValue, "ipv6_interface",
+	translate("Event Network") .. " [IPv6]" )
+eif6:depends("ipv6_source", "web")
+eif6:depends("ipv6_source", "script")
+eif6.default = "wan6"
+WADM.cbi_add_networks(eif6)
+if not has_ipv6 then
+	eif6.description = err_ipv6_other
+else
+	eif6.description = translate("Network on which the ddns-updater scripts will be started")
+end
+function eif6.cfgvalue(self, section)
+	return DDNS.read_value(self, section, "interface")
+end
+function eif6.validate(self, value)
+	if usev6:formvalue(section) == "0"
+	 or src4:formvalue(section) == "network"
+	 or src4:formvalue(section) == "interface" then
+		return ""	-- ignore IPv4, network, interface
+	elseif not has_ipv6 then
+		return nil, err_tab_adv(self) .. err_ipv6_plain
+	else
+		return value
+	end
+end
+function eif6.write(self, section, value)
+	if usev6:formvalue(section) == "0"
+	 or src4:formvalue(section) == "network"
+	 or src4:formvalue(section) == "interface" then
+		return true	-- ignore IPv4, network, interface
+	else
+		self.map:del(section, self.option)		 -- delete "ipv6_interface" helper
+		return self.map:set(section, "interface", value) -- and write "interface"
+	end
+end
+
+-- IPv4 + IPv6 - force_ipversion (NEW) -- ######################################
+-- optional to force wget/curl and host to use only selected IP version
+-- command parameter "-4" or "-6"
+if has_force or ( ( m:get(section, "force_ipversion") or "0" ) ~= "0" ) then
+	fipv = ns:taboption("advanced", Flag, "force_ipversion",
+		translate("Force IP Version") )
+	fipv.orientation = "horizontal"
+	function fipv.cfgvalue(self, section)
+		local value = AbstractValue.cfgvalue(self, section)
+		if not has_force and value ~= "0" then
+			self.description = bold_on .. font_red ..
+				translate("Force IP Version not supported") .. font_off .. "<br />" ..
+				translate("please disable") .. " !" .. bold_off
+		else
+			self.description = translate("OPTIONAL: Force the usage of pure IPv4/IPv6 only communication.")
+		end
+		return value
+	end
+	function fipv.validate(self, value)
+		if (value == "1" and has_force) or value == "0" then return value end
+		return nil, err_tab_adv(self) .. translate("Force IP Version not supported")
+	end
+	function fipv.parse(self, section)
+		DDNS.flag_parse(self, section)
+	end
+	function fipv.write(self, section, value)
+		if value == "1" then
+			return self.map:set(section, self.option, value)
+		else
+			return self.map:del(section, self.option)
+		end
+	end
+end
+
+-- IPv4 + IPv6 - dns_server (NEW) -- ###########################################
+-- optional DNS Server to use resolving my IP if "ip_source"="web"
+dns = ns:taboption("advanced", Value, "dns_server",
+	translate("DNS-Server"),
+	translate("OPTIONAL: Use non-default DNS-Server to detect 'Registered IP'.") .. "<br />" ..
+	translate("Format: IP or FQDN"))
+dns.placeholder = "mydns.lan"
+function dns.validate(self, value)
+	-- if .datatype is set, then it is checked before calling this function
+	if not value then
+		return ""	-- ignore on empty
+	elseif not DTYP.host(value) then
+		return nil, err_tab_adv(self) .. translate("use hostname, FQDN, IPv4- or IPv6-Address")
+	else
+		local ipv6  = usev6:formvalue(section)
+		local force = (fipv) and fipv:formvalue(section) or "0"
+		local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh verify_dns ]] ..
+			value .. [[ ]] .. ipv6 .. [[ ]] .. force
+		local ret = SYS.call(command)
+		if     ret == 0 then return value	-- everything OK
+		elseif ret == 2 then return nil, err_tab_adv(self) .. translate("nslookup can not resolve host")
+		elseif ret == 3 then return nil, err_tab_adv(self) .. translate("nc (netcat) can not connect")
+		elseif ret == 4 then return nil, err_tab_adv(self) .. translate("Forced IP Version don't matched")
+		else                 return nil, err_tab_adv(self) .. translate("unspecific error")
+		end
+	end
+end
+
+-- IPv4 + IPv6 - force_dnstcp (NEW) -- #########################################
+if has_dnstcp or ( ( m:get(section, "force_dnstcp") or "0" ) ~= "0" ) then
+	tcp = ns:taboption("advanced", Flag, "force_dnstcp",
+		translate("Force TCP on DNS") )
+	tcp.orientation = "horizontal"
+	function tcp.cfgvalue(self, section)
+		local value = AbstractValue.cfgvalue(self, section)
+		if not has_dnstcp and value ~= "0" then
+			self.description = bold_on .. font_red ..
+				translate("DNS requests via TCP not supported") .. font_off .. "<br />" ..
+				translate("please disable") .. " !" .. bold_off
+		else
+			self.description = translate("OPTIONAL: Force the use of TCP instead of default UDP on DNS requests.")
+		end
+		return value
+	end
+	function tcp.validate(self, value)
+		if (value == "1" and has_dnstcp ) or value == "0" then
+			return value
+		end
+		return nil, err_tab_adv(self) .. translate("DNS requests via TCP not supported")
+	end
+	function tcp.parse(self, section)
+		DDNS.flag_parse(self, section)
+	end
+end
+
+-- IPv4 + IPv6 - proxy (NEW) -- ################################################
+-- optional Proxy to use for http/https requests  [user:password@]proxyhost[:port]
+if has_proxy or ( ( m:get(section, "proxy") or "" ) ~= "" ) then
+	pxy = ns:taboption("advanced", Value, "proxy",
+		translate("PROXY-Server") )
+	pxy.placeholder="user:password@myproxy.lan:8080"
+	function pxy.cfgvalue(self, section)
+		local value = AbstractValue.cfgvalue(self, section)
+		if not has_proxy and value ~= "" then
+			self.description = bold_on .. font_red ..
+				translate("PROXY-Server not supported") .. font_off .. "<br />" ..
+				translate("please remove entry") .. "!" .. bold_off
+		else
+			self.description = translate("OPTIONAL: Proxy-Server for detection and updates.") .. "<br />" ..
+				translate("Format") .. ": " .. bold_on .. "[user:password@]proxyhost:port" .. bold_off .. "<br />" ..
+				translate("IPv6 address must be given in square brackets") .. ": " ..
+				bold_on .. " [2001:db8::1]:8080" .. bold_off
+		end
+		return value
+	end
+	function pxy.validate(self, value)
+		-- if .datatype is set, then it is checked before calling this function
+		if not value then
+			return ""	-- ignore on empty
+		elseif has_proxy then
+			local ipv6  = usev6:formvalue(section) or "0"
+			local force = (fipv) and fipv:formvalue(section) or "0"
+			local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh verify_proxy ]] ..
+				value .. [[ ]] .. ipv6 .. [[ ]] .. force
+			local ret = SYS.call(command)
+			if     ret == 0 then return value
+			elseif ret == 2 then return nil, err_tab_adv(self) .. translate("nslookup can not resolve host")
+			elseif ret == 3 then return nil, err_tab_adv(self) .. translate("nc (netcat) can not connect")
+			elseif ret == 4 then return nil, err_tab_adv(self) .. translate("Forced IP Version don't matched")
+			elseif ret == 5 then return nil, err_tab_adv(self) .. translate("proxy port missing")
+			else                 return nil, err_tab_adv(self) .. translate("unspecific error")
+			end
+		else
+			return nil, err_tab_adv(self) .. translate("PROXY-Server not supported")
+		end
+	end
+end
+
+-- use_syslog -- ###############################################################
+slog = ns:taboption("advanced", ListValue, "use_syslog",
+	translate("Log to syslog"),
+	translate("Writes log messages to syslog. Critical Errors will always be written to syslog.") )
+slog.default = "2"
+slog:value("0", translate("No logging"))
+slog:value("1", translate("Info"))
+slog:value("2", translate("Notice"))
+slog:value("3", translate("Warning"))
+slog:value("4", translate("Error"))
+
+-- use_logfile (NEW) -- ########################################################
+logf = ns:taboption("advanced", Flag, "use_logfile",
+	translate("Log to file"),
+	translate("Writes detailed messages to log file. File will be truncated automatically.") .. "<br />" ..
+	translate("File") .. [[: "]] .. log_dir .. [[/]] .. section .. [[.log"]] )
+logf.orientation = "horizontal"
+logf.rmempty = false	-- we want to save in /etc/config/ddns file on "0" because
+logf.default = "1"	-- if not defined write to log by default
+function logf.parse(self, section)
+	DDNS.flag_parse(self, section)
+end
+
+-- TAB: Timer  #####################################################################################
+-- check_interval -- ###########################################################
+ci = ns:taboption("timer", Value, "check_interval",
+	translate("Check Interval") )
+ci.template = "ddns/detail_value"
+ci.default  = 10
+ci.rmempty = false	-- validate ourselves for translatable error messages
+function ci.validate(self, value)
+	if not DTYP.uinteger(value)
+	or tonumber(value) < 1 then
+		return nil, err_tab_timer(self) .. translate("minimum value 5 minutes == 300 seconds")
+	end
+
+	local secs = DDNS.calc_seconds(value, cu:formvalue(section))
+	if secs >= 300 then
+		return value
+	else
+		return nil, err_tab_timer(self) .. translate("minimum value 5 minutes == 300 seconds")
+	end
+end
+function ci.write(self, section, value)
+	-- simulate rmempty=true remove default
+	local secs = DDNS.calc_seconds(value, cu:formvalue(section))
+	if secs ~= 600 then	--default 10 minutes
+		return self.map:set(section, self.option, value)
+	else
+		self.map:del(section, "check_unit")
+		return self.map:del(section, self.option)
+	end
+end
+
+-- check_unit -- ###############################################################
+cu = ns:taboption("timer", ListValue, "check_unit", "not displayed, but needed otherwise error",
+	translate("Interval to check for changed IP" .. "<br />" ..
+		"Values below 5 minutes == 300 seconds are not supported") )
+cu.template = "ddns/detail_lvalue"
+cu.default  = "minutes"
+cu.rmempty  = false	-- want to control write process
+cu:value("seconds", translate("seconds"))
+cu:value("minutes", translate("minutes"))
+cu:value("hours", translate("hours"))
+--cu:value("days", translate("days"))
+function cu.write(self, section, value)
+	-- simulate rmempty=true remove default
+	local secs = DDNS.calc_seconds(ci:formvalue(section), value)
+	if secs ~= 600 then	--default 10 minutes
+		return self.map:set(section, self.option, value)
+	else
+		return true
+	end
+end
+
+-- force_interval (modified) -- ################################################
+fi = ns:taboption("timer", Value, "force_interval",
+	translate("Force Interval") )
+fi.template = "ddns/detail_value"
+fi.default  = 72 	-- see dynamic_dns_updater.sh script
+fi.rmempty = false	-- validate ourselves for translatable error messages
+function fi.validate(self, value)
+	if not DTYP.uinteger(value)
+	or tonumber(value) < 0 then
+		return nil, err_tab_timer(self) .. translate("minimum value '0'")
+	end
+
+	local force_s = DDNS.calc_seconds(value, fu:formvalue(section))
+	if force_s == 0 then
+		return value
+	end
+
+	local ci_value = ci:formvalue(section)
+	if not DTYP.uinteger(ci_value) then
+		return ""	-- ignore because error in check_interval above
+	end
+
+	local check_s = DDNS.calc_seconds(ci_value, cu:formvalue(section))
+	if force_s >= check_s then
+		return value
+	end
+
+	return nil, err_tab_timer(self) .. translate("must be greater or equal 'Check Interval'")
+end
+function fi.write(self, section, value)
+	-- simulate rmempty=true remove default
+	local secs = DDNS.calc_seconds(value, fu:formvalue(section))
+	if secs ~= 259200 then	--default 72 hours == 3 days
+		return self.map:set(section, self.option, value)
+	else
+		self.map:del(section, "force_unit")
+		return self.map:del(section, self.option)
+	end
+end
+
+-- force_unit -- ###############################################################
+fu = ns:taboption("timer", ListValue, "force_unit", "not displayed, but needed otherwise error",
+	translate("Interval to force updates send to DDNS Provider" .. "<br />" ..
+		"Setting this parameter to 0 will force the script to only run once" .. "<br />" ..
+		"Values lower 'Check Interval' except '0' are not supported") )
+fu.template = "ddns/detail_lvalue"
+fu.default  = "hours"
+fu.rmempty  = false	-- want to control write process
+--fu:value("seconds", translate("seconds"))
+fu:value("minutes", translate("minutes"))
+fu:value("hours", translate("hours"))
+fu:value("days", translate("days"))
+function fu.write(self, section, value)
+	-- simulate rmempty=true remove default
+	local secs = DDNS.calc_seconds(fi:formvalue(section), value)
+	if secs ~= 259200 and secs ~= 0 then	--default 72 hours == 3 days
+		return self.map:set(section, self.option, value)
+	else
+		return true
+	end
+end
+
+-- retry_count (NEW) -- ########################################################
+rc = ns:taboption("timer", Value, "retry_count",
+	translate("Error Retry Counter"),
+	translate("On Error the script will stop execution after given number of retrys") )
+rc.default = 5
+rc.rmempty = false	-- validate ourselves for translatable error messages
+function rc.validate(self, value)
+	if not DTYP.uinteger(value) then
+		return nil, err_tab_timer(self) .. translate("minimum value '0'")
+	else
+		return value
+	end
+end
+function rc.write(self, section, value)
+	-- simulate rmempty=true remove default
+	if tonumber(value) ~= self.default then
+		return self.map:set(section, self.option, value)
+	else
+		return self.map:del(section, self.option)
+	end
+end
+
+-- retry_interval -- ###########################################################
+ri = ns:taboption("timer", Value, "retry_interval",
+	translate("Error Retry Interval") )
+ri.template = "ddns/detail_value"
+ri.default  = 60
+ri.rmempty  = false	-- validate ourselves for translatable error messages
+function ri.validate(self, value)
+	if not DTYP.uinteger(value)
+	or tonumber(value) < 1 then
+		return nil, err_tab_timer(self) .. translate("minimum value '1'")
+	else
+		return value
+	end
+end
+function ri.write(self, section, value)
+	-- simulate rmempty=true remove default
+	local secs = DDNS.calc_seconds(value, ru:formvalue(section))
+	if secs ~= 60 then	--default 60seconds
+		return self.map:set(section, self.option, value)
+	else
+		self.map:del(section, "retry_unit")
+		return self.map:del(section, self.option)
+	end
+end
+
+-- retry_unit -- ###############################################################
+ru = ns:taboption("timer", ListValue, "retry_unit", "not displayed, but needed otherwise error",
+	translate("On Error the script will retry the failed action after given time") )
+ru.template = "ddns/detail_lvalue"
+ru.default  = "seconds"
+ru.rmempty  = false	-- want to control write process
+ru:value("seconds", translate("seconds"))
+ru:value("minutes", translate("minutes"))
+--ru:value("hours", translate("hours"))
+--ru:value("days", translate("days"))
+function ru.write(self, section, value)
+	-- simulate rmempty=true remove default
+	local secs = DDNS.calc_seconds(ri:formvalue(section), value)
+	if secs ~= 60 then	--default 60seconds
+		return self.map:set(section, self.option, value)
+	else
+		return true -- will be deleted by retry_interval
+	end
+end
+
+-- TAB: LogView  (NEW) #############################################################################
+lv = ns:taboption("logview", DummyValue, "_logview")
+lv.template = "ddns/detail_logview"
+lv.inputtitle = translate("Read / Reread log file")
+lv.rows = 50
+function lv.cfgvalue(self, section)
+	local lfile=log_dir .. "/" .. section .. ".log"
+	if FS.access(lfile) then
+		return lfile .. "\n" .. translate("Please press [Read] button")
+	end
+	return lfile .. "\n" .. translate("File not found or empty")
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/hints.lua b/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/hints.lua
new file mode 100644
index 00000000..cead1a78
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/hints.lua
@@ -0,0 +1,147 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local CTRL = require "luci.controller.ddns"	-- this application's controller
+local DISP = require "luci.dispatcher"
+local SYS  = require "luci.sys"
+local DDNS = require "luci.tools.ddns"		-- ddns multiused functions
+
+-- check supported options -- ##################################################
+-- saved to local vars here because doing multiple os calls slow down the system
+has_ssl     = DDNS.check_ssl()		-- HTTPS support
+has_proxy   = DDNS.check_proxy()	-- Proxy support
+has_dnstcp  = DDNS.check_bind_host()	-- DNS TCP support
+need_update = CTRL.update_needed()	-- correct ddns-scripts version
+
+-- html constants
+font_red = [[<font color="red">]]
+font_off = [[</font>]]
+bold_on  = [[<strong>]]
+bold_off = [[</strong>]]
+
+-- cbi-map definition -- #######################################################
+m = Map("ddns")
+
+-- first need to close <a> from cbi map template our <a> closed by template
+m.title = [[</a><a href="]] .. DISP.build_url("admin", "services", "ddns") .. [[">]] ..
+		translate("Dynamic DNS")
+
+m.description = translate("Dynamic DNS allows that your router can be reached with " ..
+			"a fixed hostname while having a dynamically changing " ..
+			"IP address.")
+
+m.redirect = DISP.build_url("admin", "services", "ddns")
+
+-- SimpleSection definition -- #################################################
+-- show Hints to optimize installation and script usage
+s = m:section( SimpleSection,
+	translate("Hints"),
+	translate("Below a list of configuration tips for your system to run Dynamic DNS updates without limitations") )
+
+-- ddns_scripts needs to be updated for full functionality
+if need_update then
+	local dv = s:option(DummyValue, "_update_needed")
+	dv.titleref = DISP.build_url("admin", "system", "packages")
+	dv.rawhtml  = true
+	dv.title = font_red .. bold_on ..
+		translate("Software update required") .. bold_off .. font_off
+	dv.value = translate("The currently installed 'ddns-scripts' package did not support all available settings.") ..
+			"<br />" ..
+			translate("Please update to the current version!")
+end
+
+-- DDNS Service disabled
+if not SYS.init.enabled("ddns") then
+	local dv = s:option(DummyValue, "_not_enabled")
+	dv.titleref = DISP.build_url("admin", "system", "startup")
+	dv.rawhtml  = true
+	dv.title = bold_on ..
+		translate("DDNS Autostart disabled") .. bold_off
+	dv.value = translate("Currently DDNS updates are not started at boot or on interface events." .. "<br />" ..
+			"This is the default if you run DDNS scripts by yourself (i.e. via cron with force_interval set to '0')" )
+end
+
+-- No IPv6 support
+if not DDNS.check_ipv6() then
+	local dv = s:option(DummyValue, "_no_ipv6")
+	dv.titleref = 'http://www.librecmc.org" target="_blank'
+	dv.rawhtml  = true
+	dv.title = bold_on ..
+		translate("IPv6 not supported") .. bold_off
+	dv.value = translate("IPv6 is currently not (fully) supported by this system" .. "<br />" ..
+			"Please follow the instructions on libreCMC's homepage to enable IPv6 support" .. "<br />" ..
+			"or update your system to the latest libreCMC Release")
+end
+
+-- No HTTPS support
+if not has_ssl then
+	local dv = s:option(DummyValue, "_no_https")
+	dv.titleref = DISP.build_url("admin", "system", "packages")
+	dv.rawhtml  = true
+	dv.title = bold_on ..
+		translate("HTTPS not supported") .. bold_off
+	dv.value = translate("Neither GNU Wget with SSL nor cURL installed to support updates via HTTPS protocol.") ..
+			"<br />- " ..
+			translate("You should install GNU Wget with SSL (prefered) or cURL package.") ..
+			"<br />- " ..
+			translate("In some versions cURL/libcurl in libreCMC is compiled without proxy support.")
+end
+
+-- cURL without proxy support
+if has_ssl and not has_proxy then
+	local dv = s:option(DummyValue, "_no_proxy")
+	dv.titleref = DISP.build_url("admin", "system", "packages")
+	dv.rawhtml  = true
+	dv.title = bold_on ..
+		translate("cURL without Proxy Support") .. bold_off
+	dv.value = translate("cURL is installed, but libcurl was compiled without proxy support.") ..
+			"<br />- " ..
+			translate("You should install GNU Wget with SSL or replace libcurl.") ..
+			"<br />- " ..
+			translate("In some versions cURL/libcurl in libreCMC is compiled without proxy support.")
+end
+
+-- "Force IP Version not supported"
+if not (has_ssl and has_dnstcp) then
+	local dv = s:option(DummyValue, "_no_force_ip")
+	dv.titleref = DISP.build_url("admin", "system", "packages")
+	dv.rawhtml  = true
+	dv.title = bold_on ..
+		translate("Force IP Version not supported") .. bold_off
+	local value = translate("BusyBox's nslookup and Wget do not support to specify " ..
+			"the IP version to use for communication with DDNS Provider.")
+	if not has_ssl then
+		value = value .. "<br />- " ..
+			translate("You should install GNU Wget with SSL (prefered) or cURL package.")
+	end
+	if not has_dnstcp then
+		value = value .. "<br />- " ..
+			translate("You should install BIND host package for DNS requests.")
+	end
+	dv.value = value
+end
+
+-- "DNS requests via TCP not supported"
+if not has_dnstcp then
+	local dv = s:option(DummyValue, "_no_dnstcp")
+	dv.titleref = DISP.build_url("admin", "system", "packages")
+	dv.rawhtml  = true
+	dv.title = bold_on ..
+		translate("DNS requests via TCP not supported") .. bold_off
+	dv.value = translate("BusyBox's nslookup does not support to specify to use TCP instead of default UDP when requesting DNS server") ..
+			"<br />- " ..
+			translate("You should install BIND host package for DNS requests.")
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/overview.lua b/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/overview.lua
new file mode 100644
index 00000000..5d24ee5a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/overview.lua
@@ -0,0 +1,256 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local NXFS = require "nixio.fs"
+local CTRL = require "luci.controller.ddns"	-- this application's controller
+local DISP = require "luci.dispatcher"
+local HTTP = require "luci.http"
+local SYS  = require "luci.sys"
+local DDNS = require "luci.tools.ddns"		-- ddns multiused functions
+
+-- show hints ?
+show_hints = not (DDNS.check_ipv6()		-- IPv6 support
+		and DDNS.check_ssl()		-- HTTPS support
+		and DDNS.check_proxy()		-- Proxy support
+		and DDNS.check_bind_host()	-- DNS TCP support
+		)
+need_update = CTRL.update_needed()		-- correct ddns-scripts version
+
+-- html constants
+font_red = [[<font color="red">]]
+font_off = [[</font>]]
+bold_on  = [[<strong>]]
+bold_off = [[</strong>]]
+
+-- cbi-map definition -- #######################################################
+m = Map("ddns")
+
+-- first need to close <a> from cbi map template our <a> closed by template
+--m.title = [[</a><a href="javascript:alert(']] .. CTRL.show_versions() ..[[')">]] ..
+--		translate("Dynamic DNS")
+m.title = [[</a><a href="#" onclick="onclick_maptitle();">]] ..
+		translate("Dynamic DNS")
+
+m.description = translate("Dynamic DNS allows that your router can be reached with " ..
+			"a fixed hostname while having a dynamically changing " ..
+			"IP address.")
+
+m.on_after_commit = function(self)
+	if self.changed then	-- changes ?
+		if SYS.init.enabled("ddns") then	-- ddns service enabled, restart all
+			os.execute("/etc/init.d/ddns restart")
+		else	-- ddns service disabled, send SIGHUP to running
+			os.execute("killall -1 dynamic_dns_updater.sh")
+		end
+	end
+end
+
+-- SimpleSection definiton -- ##################################################
+-- with all the JavaScripts we need for "a good Show"
+a = m:section( SimpleSection )
+a.template = "ddns/overview_status"
+
+-- SimpleSection definition -- #################################################
+-- show Hints to optimize installation and script usage
+-- only show if 	service not enabled
+--		or	no IPv6 support
+--		or	not GNU Wget and not cURL	(for https support)
+--		or	not GNU Wget but cURL without proxy support
+--		or	not BIND's host
+--		or	ddns-scripts package need update
+if show_hints or need_update or not SYS.init.enabled("ddns") then
+	s = m:section( SimpleSection, translate("Hints") )
+
+	-- ddns_scripts needs to be updated for full functionality
+	if need_update then
+		local dv = s:option(DummyValue, "_update_needed")
+		dv.titleref = DISP.build_url("admin", "system", "packages")
+		dv.rawhtml  = true
+		dv.title = font_red .. bold_on ..
+			translate("Software update required") .. bold_off .. font_off
+		dv.value = translate("The currently installed 'ddns-scripts' package did not support all available settings.") ..
+				"<br />" ..
+				translate("Please update to the current version!")
+	end
+
+	-- DDNS Service disabled
+	if not SYS.init.enabled("ddns") then
+		local dv = s:option(DummyValue, "_not_enabled")
+		dv.titleref = DISP.build_url("admin", "system", "startup")
+		dv.rawhtml  = true
+		dv.title = bold_on ..
+			translate("DDNS Autostart disabled") .. bold_off
+		dv.value = translate("Currently DDNS updates are not started at boot or on interface events." .. "<br />" ..
+				"You can start/stop each configuration here. It will run until next reboot.")
+	end
+
+	-- Show more hints on a separate page
+	if show_hints then
+		local dv = s:option(DummyValue, "_separate")
+		dv.titleref = DISP.build_url("admin", "services", "ddns", "hints")
+		dv.rawhtml  = true
+		dv.title = bold_on ..
+			translate("Show more") .. bold_off
+		dv.value = translate("Follow this link" .. "<br />" ..
+				"You will find more hints to optimize your system to run DDNS scripts with all options")
+	end
+end
+
+-- TableSection definition -- ##################################################
+ts = m:section( TypedSection, "service",
+	translate("Overview"),
+	translate("Below is a list of configured DDNS configurations and their current state." .. "<br />" ..
+		"If you want to send updates for IPv4 and IPv6 you need to define two separate Configurations " ..
+		"i.e. 'myddns_ipv4' and 'myddns_ipv6'") )
+ts.sectionhead = translate("Configuration")
+ts.template = "cbi/tblsection"
+ts.addremove = true
+ts.extedit = DISP.build_url("admin", "services", "ddns", "detail", "%s")
+function ts.create(self, name)
+	AbstractSection.create(self, name)
+	HTTP.redirect( self.extedit:format(name) )
+end
+
+-- Domain and registered IP -- #################################################
+dom = ts:option(DummyValue, "_domainIP",
+	translate("Hostname/Domain") .. "<br />" .. translate("Registered IP") )
+dom.template = "ddns/overview_doubleline"
+function dom.set_one(self, section)
+	local domain = self.map:get(section, "domain") or ""
+	if domain ~= "" then
+		return domain
+	else
+		return [[<em>]] .. translate("config error") .. [[</em>]]
+	end
+end
+function dom.set_two(self, section)
+	local domain = self.map:get(section, "domain") or ""
+	if domain == "" then return "" end
+	local dnsserver = self.map:get(section, "dnsserver") or ""
+	local use_ipv6 = tonumber(self.map:get(section, "use_ipv6") or 0)
+	local force_ipversion = tonumber(self.map:get(section, "force_ipversion") or 0)
+	local force_dnstcp = tonumber(self.map:get(section, "force_dnstcp") or 0)
+	local command = [[/usr/lib/ddns/dynamic_dns_lucihelper.sh]]
+	if not NXFS.access(command, "rwx", "rx", "rx") then
+		NXFS.chmod(command, 755)
+	end
+	command = command .. [[ get_registered_ip ]] .. domain .. [[ ]] .. use_ipv6 ..
+		[[ ]] .. force_ipversion .. [[ ]] .. force_dnstcp .. [[ ]] .. dnsserver
+	local ip = SYS.exec(command)
+	if ip == "" then ip = translate("no data") end
+	return ip
+end
+
+-- enabled
+ena = ts:option( Flag, "enabled",
+	translate("Enabled"))
+ena.template = "ddns/overview_enabled"
+ena.rmempty = false
+function ena.parse(self, section)
+	DDNS.flag_parse(self, section)
+end
+
+-- show PID and next update
+upd = ts:option( DummyValue, "_update",
+	translate("Last Update") .. "<br />" .. translate("Next Update"))
+upd.template = "ddns/overview_doubleline"
+function upd.set_one(self, section)	-- fill Last Update
+	-- get/validate last update
+	local uptime   = SYS.uptime()
+	local lasttime = DDNS.get_lastupd(section)
+	if lasttime > uptime then 	-- /var might not be linked to /tmp and cleared on reboot
+		lasttime = 0
+	end
+
+	-- no last update happen
+	if lasttime == 0 then
+		return translate("never")
+
+	-- we read last update
+	else
+		-- calc last update
+		--            os.epoch  - sys.uptime + lastupdate(uptime)
+		local epoch = os.time() - uptime + lasttime
+		-- use linux date to convert epoch
+		return DDNS.epoch2date(epoch)
+	end
+end
+function upd.set_two(self, section)	-- fill Next Update
+	-- get enabled state
+	local enabled	= tonumber(self.map:get(section, "enabled") or 0)
+	local datenext	= translate("unknown error")	-- formatted date of next update
+
+	-- get force seconds
+	local force_interval = tonumber(self.map:get(section, "force_interval") or 72)
+	local force_unit = self.map:get(section, "force_unit") or "hours"
+	local force_seconds = DDNS.calc_seconds(force_interval, force_unit)
+
+	-- get last update and get/validate PID
+	local uptime   = SYS.uptime()
+	local lasttime = DDNS.get_lastupd(section)
+	if lasttime > uptime then 	-- /var might not be linked to /tmp and cleared on reboot
+		lasttime = 0
+	end
+	local pid      = DDNS.get_pid(section)
+
+	-- calc next update
+	if lasttime > 0 then
+		local epoch = os.time() - uptime + lasttime + force_seconds
+		-- use linux date to convert epoch
+		datelast = DDNS.epoch2date(epoch)
+	end
+
+	-- process running but update needs to happen
+	if pid > 0 and ( lasttime + force_seconds - uptime ) < 0 then
+		datenext = translate("Verify")
+
+	-- run once
+	elseif force_seconds == 0 then
+		datenext = translate("Run once")
+
+	-- no process running and NOT enabled
+	elseif pid == 0 and enabled == 0 then
+		datenext  = translate("Disabled")
+
+	-- no process running and NOT
+	elseif pid == 0 and enabled ~= 0 then
+		datenext = translate("Stopped")
+	end
+
+	return datenext
+end
+
+-- start/stop button
+btn = ts:option( Button, "_startstop",
+	translate("Process ID") .. "<br />" .. translate("Start / Stop") )
+btn.template = "ddns/overview_startstop"
+function btn.cfgvalue(self, section)
+	local pid = DDNS.get_pid(section)
+	if pid > 0 then
+		btn.inputtitle	= "PID: " .. pid
+		btn.inputstyle	= "reset"
+		btn.disabled	= false
+	elseif (self.map:get(section, "enabled") or "0") ~= "0" then
+		btn.inputtitle	= translate("Start")
+		btn.inputstyle	= "apply"
+		btn.disabled	= false
+	else
+		btn.inputtitle	= "----------"
+		btn.inputstyle	= "button"
+		btn.disabled	= true
+	end
+	return true
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/tools/ddns.lua b/trunk/package/luci/applications/luci-ddns/luasrc/tools/ddns.lua
new file mode 100644
index 00000000..65a2f07d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/tools/ddns.lua
@@ -0,0 +1,295 @@
+--[[
+LuCI - Lua Configuration Interface
+
+shared module for luci-app-ddns
+Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+
+function parse_url copied from https://svn.nmap.org/nmap/nselib/url.lua
+Parses a URL and returns a table with all its parts according to RFC 2396.
+@author Diego Nehab	@author Eddie Bell <ejlbell@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.tools.ddns", package.seeall)
+
+local NX   = require "nixio"
+local NXFS = require "nixio.fs"
+local OPKG = require "luci.model.ipkg"
+local UCI  = require "luci.model.uci"
+local SYS  = require "luci.sys"
+local UTIL = require "luci.util"
+
+-- function to calculate seconds from given interval and unit
+function calc_seconds(interval, unit)
+	if not tonumber(interval) then
+		return nil
+	elseif unit == "days" then
+		return (tonumber(interval) * 86400)	-- 60 sec * 60 min * 24 h
+	elseif unit == "hours" then
+		return (tonumber(interval) * 3600)	-- 60 sec * 60 min
+	elseif unit == "minutes" then
+		return (tonumber(interval) * 60)	-- 60 sec
+	elseif unit == "seconds" then
+		return tonumber(interval)
+	else
+		return nil
+	end
+end
+
+-- check if IPv6 supported by libreCMC
+function check_ipv6()
+	return NXFS.access("/proc/net/ipv6_route")
+	   and NXFS.access("/usr/sbin/ip6tables")
+end
+
+-- check if Wget with SSL support or cURL installed
+function check_ssl()
+	if (SYS.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
+		return true
+	else
+		return NXFS.access("/usr/bin/curl")
+	end
+end
+
+-- check if Wget with SSL or cURL with proxy support installed
+function check_proxy()
+	-- we prefere GNU Wget for communication
+	if (SYS.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
+		return true
+
+	-- if not installed cURL must support proxy
+	elseif NXFS.access("/usr/bin/curl") then
+		return (SYS.call([[ grep -iq all_proxy /usr/lib/libcurl.so* 2>/dev/null ]]) == 0)
+
+	-- only BusyBox Wget is installed
+	else
+		return NXFS.access("/usr/bin/wget")
+	end
+end
+
+-- check if BIND host installed
+function check_bind_host()
+	return NXFS.access("/usr/bin/host")
+end
+
+-- convert epoch date to given format
+function epoch2date(epoch, format)
+	if not format or #format < 2 then
+		local uci = UCI.cursor()
+		format    = uci:get("ddns", "global", "date_format") or "%F %R"
+		uci:unload("ddns")
+	end
+	format = format:gsub("%%n", "<br />")	-- replace newline
+	format = format:gsub("%%t", "    ")	-- replace tab
+	return os.date(format, epoch)
+end
+
+-- read lastupdate from [section].update file
+function get_lastupd(section)
+	local uci     = UCI.cursor()
+	local run_dir = uci:get("ddns", "global", "run_dir") or "/var/run/ddns"
+	local etime   = tonumber(NXFS.readfile("%s/%s.update" % { run_dir, section } ) or 0 )
+	uci:unload("ddns")
+	return etime
+end
+
+-- read PID from run file and verify if still running
+function get_pid(section)
+	local uci     = UCI.cursor()
+	local run_dir = uci:get("ddns", "global", "run_dir") or "/var/run/ddns"
+	local pid     = tonumber(NXFS.readfile("%s/%s.pid" % { run_dir, section } ) or 0 )
+	if pid > 0 and not NX.kill(pid, 0) then
+		pid = 0
+	end
+	uci:unload("ddns")
+	return pid
+end
+
+-- read version information for given package if installed
+function ipkg_version(package)
+	if not package then
+		return nil
+	end
+	local info = OPKG.info(package)
+	local data = {}
+	local version = ""
+	local i = 0
+	for k, v in pairs(info) do
+		if v.Package == package and v.Status.installed then
+			version = v.Version
+			i = i + 1
+		end
+	end
+	if i > 1 then	-- more then one valid record
+		return data
+	end
+	local sver = UTIL.split(version, "[%.%-]", nil, true)
+	data = {
+		version = version,
+		major   = tonumber(sver[1]) or 0,
+		minor   = tonumber(sver[2]) or 0,
+		patch   = tonumber(sver[3]) or 0,
+		build   = tonumber(sver[4]) or 0
+	}
+	return data
+end
+
+-- replacement of build-in read of UCI option
+-- modified AbstractValue.cfgvalue(self, section) from cbi.lua
+-- needed to read from other option then current value definition
+function read_value(self, section, option)
+	local value
+	if self.tag_error[section] then
+		value = self:formvalue(section)
+	else
+		value = self.map:get(section, option)
+	end
+
+	if not value then
+		return nil
+	elseif not self.cast or self.cast == type(value) then
+		return value
+	elseif self.cast == "string" then
+		if type(value) == "table" then
+			return value[1]
+		end
+	elseif self.cast == "table" then
+		return { value }
+	end
+end
+
+-- replacement of build-in Flag.parse of cbi.lua
+-- modified to mark section as changed if value changes
+-- current parse did not do this, but it is done AbstaractValue.parse()
+function flag_parse(self, section)
+	local fexists = self.map:formvalue(
+		luci.cbi.FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option)
+
+	if fexists then
+		local fvalue = self:formvalue(section) and self.enabled or self.disabled
+		local cvalue = self:cfgvalue(section)
+		if fvalue ~= self.default or (not self.optional and not self.rmempty) then
+			self:write(section, fvalue)
+		else
+			self:remove(section)
+		end
+		if (fvalue ~= cvalue) then self.section.changed = true end
+	else
+		self:remove(section)
+		self.section.changed = true
+	end
+end
+
+-----------------------------------------------------------------------------
+-- copied from https://svn.nmap.org/nmap/nselib/url.lua
+-- @author Diego Nehab
+-- @author Eddie Bell <ejlbell@gmail.com>
+--[[
+    URI parsing, composition and relative URL resolution
+    LuaSocket toolkit.
+    Author: Diego Nehab
+    RCS ID: $Id: url.lua,v 1.37 2005/11/22 08:33:29 diego Exp $
+    parse_query and build_query added For nmap (Eddie Bell <ejlbell@gmail.com>)
+]]--
+---
+-- Parses a URL and returns a table with all its parts according to RFC 2396.
+--
+-- The following grammar describes the names given to the URL parts.
+-- <code>
+-- <url> ::= <scheme>://<authority>/<path>;<params>?<query>#<fragment>
+-- <authority> ::= <userinfo>@<host>:<port>
+-- <userinfo> ::= <user>[:<password>]
+-- <path> :: = {<segment>/}<segment>
+-- </code>
+--
+-- The leading <code>/</code> in <code>/<path></code> is considered part of
+-- <code><path></code>.
+-- @param url URL of request.
+-- @param default Table with default values for each field.
+-- @return A table with the following fields, where RFC naming conventions have
+--   been preserved:
+--     <code>scheme</code>, <code>authority</code>, <code>userinfo</code>,
+--     <code>user</code>, <code>password</code>, <code>host</code>,
+--     <code>port</code>, <code>path</code>, <code>params</code>,
+--     <code>query</code>, and <code>fragment</code>.
+-----------------------------------------------------------------------------
+function parse_url(url)	--, default)
+	-- initialize default parameters
+	local parsed = {}
+--	for i,v in base.pairs(default or parsed) do
+--		parsed[i] = v
+--	end
+
+	-- remove whitespace
+--	url = string.gsub(url, "%s", "")
+	-- get fragment
+	url = string.gsub(url, "#(.*)$",
+		function(f)
+			parsed.fragment = f
+			return ""
+		end)
+	-- get scheme. Lower-case according to RFC 3986 section 3.1.
+	url = string.gsub(url, "^([%w][%w%+%-%.]*)%:",
+		function(s)
+			parsed.scheme = string.lower(s);
+			return ""
+		end)
+	-- get authority
+	url = string.gsub(url, "^//([^/]*)",
+		function(n)
+			parsed.authority = n
+			return ""
+		end)
+	-- get query stringing
+	url = string.gsub(url, "%?(.*)",
+		function(q)
+			parsed.query = q
+			return ""
+		end)
+	-- get params
+	url = string.gsub(url, "%;(.*)",
+		function(p)
+			parsed.params = p
+			return ""
+		end)
+	-- path is whatever was left
+	parsed.path = url
+
+	local authority = parsed.authority
+	if not authority then
+		return parsed
+	end
+	authority = string.gsub(authority,"^([^@]*)@",
+		function(u)
+			parsed.userinfo = u;
+			return ""
+		end)
+	authority = string.gsub(authority, ":([0-9]*)$",
+		function(p)
+			if p ~= "" then
+				parsed.port = p
+			end;
+			return ""
+		end)
+	if authority ~= "" then
+		parsed.host = authority
+	end
+
+	local userinfo = parsed.userinfo
+	if not userinfo then
+		return parsed
+	end
+	userinfo = string.gsub(userinfo, ":([^:]*)$",
+		function(p)
+			parsed.password = p;
+			return ""
+		end)
+	parsed.user = userinfo
+	return parsed
+end
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/admin_status/index/ddns.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/admin_status/index/ddns.htm
new file mode 100644
index 00000000..97910650
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/admin_status/index/ddns.htm
@@ -0,0 +1 @@
+<%+ddns/system_status%>
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_logview.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_logview.htm
new file mode 100644
index 00000000..a74327ae
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_logview.htm
@@ -0,0 +1,56 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ detail_logview.htm ++ -->
+<script type="text/javascript">//<![CDATA[
+	function onclick_logview(section, bottom)  {
+		// get elements
+		var txt = document.getElementById("cbid.ddns." + section + "._logview.txt");	// TextArea
+		if ( !txt ) { return; }	// security check
+
+		XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "logview")%>/' + section, null,
+			function(x) {
+				if (x.responseText == "_nodata_")
+					txt.value = "<%:File not found or empty%>";
+				else
+					txt.value = x.responseText;
+				if (bottom)
+					txt.scrollTop = txt.scrollHeight;
+				else
+					txt.scrollTop = 0;			}
+		);
+	}
+//]]></script>
+
+<%+cbi/valueheader%>
+
+<br />
+
+<%
+-- one button on top, one at the buttom
+%>
+<input class="cbi-button cbi-input-button" style="align: center; width: 100%" type="button" onclick="onclick_logview(this.name, false)"
+<%=
+attr("name", section) .. attr("id", cbid .. ".btn1") .. attr("value", self.inputtitle)
+%> />
+
+<br /><br />
+
+<%
+-- set a readable style taken from librecmc theme for textarea#syslog
+-- in librecmc theme there are problems with a width of 100 so we check for theme and set to lower value
+%>
+<textarea style="width: <%if media == "/luci-static/librecmc.org" then%>98.7%<%else%>100%<%end%> ; min-height: 500px; border: 3px solid #cccccc; padding: 5px; font-family: monospace; resize: none;" wrap="off" readonly="readonly"
+<%=
+attr("name", cbid .. ".txt") .. attr("id", cbid .. ".txt") .. ifattr(self.rows, "rows")
+%> >
+<%-=pcdata(self:cfgvalue(section))-%>
+</textarea>
+<br /><br />
+
+<%
+-- one button on top, one at the buttom
+%>
+<input class="cbi-button cbi-input-button" style="align: center; width: 100%" type="button" onclick="onclick_logview(this.name, true)"
+<%= attr("name", section) .. attr("id", cbid .. ".btn2") .. attr("value", self.inputtitle) %> />
+
+<%+cbi/valuefooter%>
+<!-- ++ END ++ Dynamic DNS ++ detail_logview.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_lvalue.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_lvalue.htm
new file mode 100644
index 00000000..d516837b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_lvalue.htm
@@ -0,0 +1,22 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ detail_lvalue.htm ++ -->
+<!-- no value header to supress next line -->
+&#160;
+<% if self.widget == "select" then %>
+	<select class="cbi-input-select" onchange="cbi_d_update(this.id)"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self.size, "size") %>>
+	<% for i, key in pairs(self.keylist) do -%>
+		<option id="cbi-<%=self.config.."-"..section.."-"..self.option.."-"..key%>"<%= attr("value", key) .. ifattr(tostring(self:cfgvalue(section) or self.default) == key, "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
+	<%- end %>
+	</select>
+<% elseif self.widget == "radio" then
+	local c = 0
+	for i, key in pairs(self.keylist) do
+	c = c + 1
+%>
+	<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr((self:cfgvalue(section) or self.default) == key, "checked", "checked") %> />
+	<label<%= attr("for", cbid..c) %>><%=self.vallist[i]%></label>
+<% if c == self.size then c = 0 %><% if self.orientation == "horizontal" then %>&#160;<% else %><br /><% end %>
+<% end end %>
+<% end %>
+<%+cbi/valuefooter%>
+<!-- ++ END ++ Dynamic DNS ++ detail_lvalue.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_value.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_value.htm
new file mode 100644
index 00000000..7cb28e28
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/detail_value.htm
@@ -0,0 +1,9 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ detail_value.htm ++ -->
+<%+cbi/valueheader%>
+	<input type="text" class="cbi-input-text" style="width: 10em;" onchange="cbi_d_update(this.id)"<%=
+		attr("name", cbid) .. attr("id", cbid) .. attr("value", self:cfgvalue(section) or self.default) ..
+		ifattr(self.size, "size") .. ifattr(self.placeholder, "placeholder")
+	%> />
+<!-- no value footer to supress next line -->
+<!-- ++ END ++ Dynamic DNS ++ detail_value.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_doubleline.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_doubleline.htm
new file mode 100644
index 00000000..1d1b4be0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_doubleline.htm
@@ -0,0 +1,10 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ overview_doubleline.htm ++ -->
+<%+cbi/valueheader%>
+
+<span id="<%=cbid%>.one"><%=self:set_one(section)%></span>
+<br />
+<span id="<%=cbid%>.two"><%=self:set_two(section)%></span>
+
+<%+cbi/valuefooter%>
+<!-- ++ END ++ Dynamic DNS ++ overview_doubleline.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_enabled.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_enabled.htm
new file mode 100644
index 00000000..64b3dae4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_enabled.htm
@@ -0,0 +1,15 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ overview_enabled.htm ++ -->
+<%+cbi/valueheader%>
+
+<input type="hidden" value="1"<%=
+	attr("name", "cbi.cbe." .. self.config .. "." .. section .. "." .. self.option)
+%> />
+                                                                 <!-- modified to call own function -->
+<input class="cbi-input-checkbox" onclick="cbi_d_update(this.id)" onchange="onchange_enabled(this.id)" type="checkbox"<%=
+	attr("id", cbid) .. attr("name", cbid) .. attr("value", self.enabled or 1) ..
+	ifattr((self:cfgvalue(section) or self.default) == self.enabled, "checked", "checked")
+%> />
+
+<%+cbi/valuefooter%>
+<!-- ++ END ++ Dynamic DNS ++ overview_enabled.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_startstop.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_startstop.htm
new file mode 100644
index 00000000..e8a5183a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_startstop.htm
@@ -0,0 +1,17 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ overview_startstop.htm ++ -->
+<%+cbi/valueheader%>
+
+<% if self:cfgvalue(section) ~= false then
+-- We need to garantie that function cfgvalue run first to set missing parameters
+%>
+	<!-- style="font-size: 100%;" needed for librecmc theme to fix font size -->
+	<!-- type="button" onclick="..." enable standard onclick functionalty   -->
+	<input class="cbi-button cbi-input-<%=self.inputstyle or "button" %>" style="font-size: 100%;" type="button" onclick="onclick_startstop(this.id)"
+	<%=
+	attr("name", section) .. attr("id", cbid) .. attr("value", self.inputtitle) .. ifattr(self.disabled, "disabled")
+	%> />
+<% end %>
+
+<%+cbi/valuefooter%>
+<!-- ++ END ++ Dynamic DNS ++ overview_startstop.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_status.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_status.htm
new file mode 100644
index 00000000..37c54be2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/overview_status.htm
@@ -0,0 +1,208 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ overview_status.htm ++ -->
+<script type="text/javascript">//<![CDATA[
+
+	// variables to store version information
+	var luci_version
+	var luci_build
+	var ddns_version
+	var ddns_required
+
+	// helper to extract section from objects id
+	// cbi.ddns.SECTION._xyz
+	function _id2section(id) {
+		var x = id.split(".");
+		return x[2];
+	}
+
+	// helper to move status data to the relevant
+	// screen objects
+	// called by XHR.poll and onclick_startstop
+	function _data2elements(data) {
+		// DDNS Service
+		// fill Version informations
+		luci_version  = data[0].luci_ver
+		luci_build    = data[0].luci_build
+		ddns_version  = data[0].script_ver
+		ddns_required = data[0].script_min
+
+		// Service sections
+		for( i = 1; i < data.length; i++ )
+		{
+			var section = data[i].section	// Section to handle
+			var cbx = document.getElementById("cbid.ddns." + section + ".enabled");		// Enabled
+			var btn = document.getElementById("cbid.ddns." + section + "._startstop");	// Start/Stop button
+			var rip = document.getElementById("cbid.ddns." + section + "._domainIP.two");	// Registered IP
+			var lup = document.getElementById("cbid.ddns." + section + "._update.one");	// Last Update
+			var nup = document.getElementById("cbid.ddns." + section + "._update.two");	// Next Update
+			if ( !(cbx && btn && rip && lup && nup) ) { return; }	// security check
+
+			// process id
+			if (data[i].pid > 0) {
+				// stop always possible if process running
+				btn.value = "PID: " + data[i].pid;
+				btn.className = "cbi-button cbi-input-reset";
+			} else {
+				// default Start / enabled
+				btn.value = "<%:Start%>";
+				btn.className = "cbi-button cbi-input-apply";
+			}
+			btn.disabled = false;	// button enabled
+
+			// last update
+			switch (data[i].datelast) {
+				case "_empty_":
+					lup.innerHTML = '<em><%:Unknown error%></em>' ;
+					break;
+				case "_never_":
+					lup.innerHTML = '<em><%:Never%></em>' ;
+					break;
+				default:
+					lup.innerHTML = data[i].datelast;
+					break;
+			}
+
+			// next update
+			switch (data[i].datenext) {
+				case "_empty_":
+					nup.innerHTML = '<em><%:Unknown error%></em>' ;
+					break;
+				case "_verify_":
+					nup.innerHTML = '<em><%:Verify%></em>';
+					break;
+				case "_runonce_":
+				case "_stopped_":
+				case "_disabled_":
+					if (cbx.checked && data[i].datenext == "_runonce_") {
+						nup.innerHTML = '<em><%:Run once%></em>';
+					} else if (cbx.checked) {
+						nup.innerHTML = '<em><%:Stopped%></em>';
+					} else {
+						nup.innerHTML = '<em><%:Disabled%></em>';
+						btn.value = '----------';
+						btn.className = "cbi-button cbi-input-button";	// no image
+						btn.disabled = true;	// disabled
+					}
+					break;
+				default:
+					nup.innerHTML = data[i].datenext;
+					break;
+			}
+
+			// domain
+			// (data[i].domain ignored here
+
+			// registered IP
+			// rip.innerHTML = "Registered IP";
+			if (data[i].domain == "_nodomain_")
+				rip.innerHTML = '';
+			else if (data[i].reg_ip == "_nodata_")
+				rip.innerHTML = '<em><%:No data%></em>';
+			else
+				rip.innerHTML = data[i].reg_ip;
+
+			// monitored interfacce
+			// data[i].iface ignored here
+		}
+	}
+
+	// event handler for enabled checkbox
+	function onchange_enabled(id) {
+		// run original function in cbi.js
+		// whatever is done there
+		cbi_d_update(id);
+
+		var section = _id2section(id);
+		var cbx = document.getElementById("cbid.ddns." + section + ".enabled");
+		var btn = document.getElementById("cbid.ddns." + section + "._startstop");
+		if ( !(cbx && btn) ) { return; }	// security check
+
+		var pid_txt = btn.value;
+		var pid_found = ( pid_txt.search("PID") >= 0 ) ? true : false;
+
+		if (pid_found) {
+			// btn.value = "PID: 0000";
+			btn.className = "cbi-button cbi-button-reset";
+			btn.disabled = false;
+		} else if (cbx.checked) {
+			btn.value = "<%:Start%>";
+			btn.className = "cbi-button cbi-button-apply";
+			btn.disabled = false;
+		} else {
+			btn.value = '----------';
+			btn.className = "cbi-button cbi-input-button";	// no image
+			btn.disabled = true;		// disabled
+		}
+	}
+
+	// event handler for map.title link
+	function onclick_maptitle() {
+		var str = "<%:Version Information%>";
+		str += "\n\nluci-app-ddns:";
+		str += "\n\t<%:Version%>:\t" + luci_version;
+		str += "\n\t<%:Build%>:\t" + luci_build;
+		str += "\n\nddns-scripts <%:required%>:";
+		str += "\n\t<%:Version%>:\t" + ddns_required + " <%:or greater%>";
+		str += "\n\nddns-scripts <%:installed%>:";
+		str += "\n\t<%:Version%>:\t" + ddns_version;
+		str += "\n\n"
+		alert(str);
+	}
+
+	// event handler for start/stop button
+	function onclick_startstop(id) {
+		// extract section
+		var section = _id2section(id);
+		// get elements
+		var cbx = document.getElementById("cbid.ddns." + section + ".enabled");		// Enabled
+		var obj = document.getElementById("cbi-ddns-overview-status-legend");		// objext defined below to make in-/visible
+		if ( !(obj && cbx) ) { return; }	// security check
+
+		// make me visible
+		obj.parentNode.style.display = "block";
+
+		// do start/stop
+		var btnXHR = new XHR();
+		btnXHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "startstop")%>/' + section + '/' + cbx.checked, null,
+			function(x, data) {
+				if (x.responseText == "_uncommited_") {
+					// we need a trick to display Ampersand "&" in stead of "&#38;" or "&amp;"
+					// after translation
+					txt="<%:Please [Save & Apply] your changes first%>";
+					alert( txt.replace(new RegExp("<%:&%>", "g"), "&") );
+				} else {
+					// should have data because status changed
+					// so update screen
+					if (data)
+						_data2elements(data);
+				}
+				// make me invisible
+				obj.parentNode.style.display = "none";
+			}
+		);
+	}
+
+	// force to immediate show status on page load (not waiting for XHR.poll)
+	XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null,
+		function(x, data) {
+			_data2elements(data);
+		}
+	);
+
+	// define only ONE XHR.poll in a page because if one is running it blocks the other one
+	// optimum is to define on Map or Section Level from here you can reach all elements
+	// we need update every 15 seconds only
+	XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null,
+		function(x, data) {
+			_data2elements(data);
+		}
+	);
+
+//]]></script>
+
+<fieldset class="cbi-section" style="display:none">
+	<legend id="cbi-ddns-overview-status-legend"><%:Applying changes%></legend>
+	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+	<span id="cbi-ddns-overview-status-text"><%:Waiting for changes to be applied...%></span>
+</fieldset>
+<!-- ++ END ++ Dynamic DNS ++ overview_status.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/system_status.htm b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/system_status.htm
new file mode 100644
index 00000000..db9d1d1a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/luasrc/view/ddns/system_status.htm
@@ -0,0 +1,158 @@
+
+<!-- ++ BEGIN ++ Dynamic DNS ++ system_status.htm ++ -->
+<script type="text/javascript">//<![CDATA[
+	// helper to move status data to the relevant
+	// screen objects
+	// called by XHR.poll and XHR.get
+	function _data2elements(x, data) {
+		var tbl = document.getElementById('ddns_status_table');
+		// security check
+		if ( !(tbl) ) { return; }
+
+		// clear all rows
+		while (tbl.rows.length > 1)
+			tbl.deleteRow(1);
+
+		// variable for Modulo-Division use to set cbi-rowstyle-? (0 or 1)
+		var x = -1;
+		var i = 1;
+
+		// no data => no ddns-scripts Version 2 installed
+		if ( !data ) {
+			var txt = '<br /><strong><font color="red"><%:Old version of ddns-scripts installed%></font>' ;
+			var url = '<a href="' ;
+			url += '<%=luci.dispatcher.build_url("admin", "system", "packages")%>' ;
+			url += '"><%:install update here%></a></strong>' ;
+			var tr = tbl.insertRow(-1);
+			tr.className = 'cbi-section-table-row cbi-rowstyle-' + (((i + x) % 2) + 1);
+			var td = tr.insertCell(-1);
+			td.colSpan = 2 ;
+			td.innerHTML = txt + " - " + url
+			tr.insertCell(-1).colSpan = 3 ;
+			return;
+		}
+
+		// DDNS Service disabled
+		if (data[0].enabled == 0) {
+			var txt = '<strong><font color="red"><%:DDNS Autostart disabled%></font>' ;
+			var url = '<a href="' + data[0].url_up + '"><%:enable here%></a></strong>' ;
+			var tr = tbl.insertRow(-1);
+			tr.className = 'cbi-section-table-row cbi-rowstyle-' + (((i + x) % 2) + 1);
+			var td = tr.insertCell(-1);
+			td.colSpan = 2 ;
+			td.innerHTML = txt + " - " + url
+			tr.insertCell(-1).colSpan = 3 ;
+			x++ ;
+		}
+
+		for( i = 1; i < data.length; i++ )
+		{
+			var tr = tbl.insertRow(-1);
+			tr.className = 'cbi-section-table-row cbi-rowstyle-' + (((i + x) % 2) + 1) ;
+
+			// configuration
+			tr.insertCell(-1).innerHTML = '<strong>' + data[i].section + '</strong>' ;
+
+			// pid
+			// data[i].pid ignored here
+
+			// last update
+			// data[i].datelast ignored here
+
+			// next update
+			switch (data[i].datenext) {
+				case "_empty_":
+					tr.insertCell(-1).innerHTML = '<em><%:Unknown error%></em>' ;
+					break;
+				case "_stopped_":
+					tr.insertCell(-1).innerHTML = '<em><%:Stopped%></em>' ;
+					break;
+				case "_disabled_":
+					tr.insertCell(-1).innerHTML = '<em><%:Disabled%></em>' ;
+					break;
+				case "_noupdate_":
+					tr.insertCell(-1).innerHTML = '<em><%:Update error%></em>' ;
+					break;
+				case "_runonce_":
+					tr.insertCell(-1).innerHTML = '<em><%:Run once%></em>' ;
+					break;
+				case "_verify_":
+					tr.insertCell(-1).innerHTML = '<em><%:Verify%></em>';
+					break;
+				default:
+					tr.insertCell(-1).innerHTML = data[i].datenext ;
+					break;
+			}
+
+			// domain
+			if (data[i].domain == "_nodomain_")
+				tr.insertCell(-1).innerHTML = '<em><%:config error%></em>';
+			else
+				tr.insertCell(-1).innerHTML = data[i].domain;
+
+			// registered IP
+			switch (data[i].reg_ip) {
+				case "_nodomain_":
+					tr.insertCell(-1).innerHTML = '<em><%:Config error%></em>';
+					break;
+				case "_nodata_":
+					tr.insertCell(-1).innerHTML = '<em><%:No data%></em>';
+					break;
+				case "_noipv6_":
+					tr.insertCell(-1).innerHTML = '<em><%:IPv6 not supported%></em>';
+					break;
+				default:
+					tr.insertCell(-1).innerHTML = data[i].reg_ip;
+					break;
+			}
+
+			// monitored interfacce
+			if (data[i].iface == "_nonet_")
+				tr.insertCell(-1).innerHTML = '<em><%:Config error%></em>';
+			else
+				tr.insertCell(-1).innerHTML = data[i].iface;
+		}
+
+		if (tbl.rows.length == 1 || (data[0].enabled == 0 && tbl.rows.length == 2) ) {
+			var br = '<br />';
+			if (tbl.rows.length > 1)
+				br = '';
+			var tr = tbl.insertRow(-1);
+			tr.className = "cbi-section-table-row";
+			var td = tr.insertCell(-1);
+			td.colSpan = 5;
+			td.innerHTML = '<em>' + br + '<%:There is no service configured.%></em>' ;
+		}
+	}
+
+	// force to immediate show status (not waiting for XHR.poll)
+	XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null,
+		function(x, data) {
+			_data2elements(x, data);
+		}
+	);
+
+	XHR.poll(10, '<%=luci.dispatcher.build_url("admin", "services", "ddns", "status")%>', null,
+		function(x, data) {
+			_data2elements(x, data);
+		}
+	);
+//]]></script>
+
+<fieldset class="cbi-section" id="ddns_status_section">
+	<legend><a href="<%=luci.dispatcher.build_url([[admin]], [[services]], [[ddns]])%>"><%:Dynamic DNS%></a></legend>
+
+	<table class="cbi-section-table" id="ddns_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Configuration%></th>
+			<th class="cbi-section-table-cell"><%:Next Update%></th>
+			<th class="cbi-section-table-cell"><%:Hostname/Domain%></th>
+			<th class="cbi-section-table-cell"><%:Registered IP%></th>
+			<th class="cbi-section-table-cell"><%:Network%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="5"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+<!-- ++ END ++ Dynamic DNS ++ system_status.htm ++ -->
diff --git a/trunk/package/luci/applications/luci-ddns/root/etc/uci-defaults/luci-ddns b/trunk/package/luci/applications/luci-ddns/root/etc/uci-defaults/luci-ddns
new file mode 100755
index 00000000..4849e59b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ddns/root/etc/uci-defaults/luci-ddns
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# no longer needed for "Save and Apply" to restart ddns
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@ddns[-1]
+	commit ucitrack
+EOF
+
+# make helper script executable
+chmod 755 /usr/lib/ddns/dynamic_dns_lucihelper.sh
+
+# update application section for luci-app-ddns
+uci -q get ddns.global > /dev/null || uci -q set ddns.global='ddns'
+uci -q get ddns.global.date_format > /dev/null || uci -q set ddns.global.date_format='%F %R'
+uci -q get ddns.global.log_lines > /dev/null || uci -q set ddns.global.log_lines='250'
+uci -q commit ddns
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-diag-core/Makefile b/trunk/package/luci/applications/luci-diag-core/Makefile
new file mode 100644
index 00000000..15518749
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-core/Makefile
@@ -0,0 +1,4 @@
+PO = diag_core
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-diag-core/luasrc/controller/luci_diag.lua b/trunk/package/luci/applications/luci-diag-core/luasrc/controller/luci_diag.lua
new file mode 100644
index 00000000..4a8a0200
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-core/luasrc/controller/luci_diag.lua
@@ -0,0 +1,26 @@
+--[[
+
+Luci Voice Core
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_diag", package.seeall)
+
+function index()
+	local e
+
+	e = entry({"admin", "network", "diag_config"}, template("diag/network_config_index") , _("Configure Diagnostics"), 120)
+	e.index = true
+	e.dependent = true
+
+	e = entry({"mini", "diag"}, template("diag/index"), _("Diagnostics"), 120)
+	e.index = true
+	e.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/index.htm b/trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/index.htm
new file mode 100644
index 00000000..6b1efa1a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/index.htm
@@ -0,0 +1,18 @@
+<%#
+LuCI - Lua Configuration Interface
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+<p><%:The entries in the menu allow you to perform diagnostic tests on your system to aid in troubleshooting.%></p>
+<p><%:The diagnostics available under this menu depend on what modules you have installed on your device.%></p>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm b/trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm
new file mode 100644
index 00000000..67980a6e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm
@@ -0,0 +1,18 @@
+<%#
+LuCI - Lua Configuration Interface
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+<p><%:With this menu you can configure network diagnostics, such as network device scans and ping tests.%></p>
+<p><%:The diagnostics available under this menu depend on what modules you have installed on your device.%></p>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/Makefile b/trunk/package/luci/applications/luci-diag-devinfo/Makefile
new file mode 100644
index 00000000..3844248e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/Makefile
@@ -0,0 +1,4 @@
+PO=diag_devinfo
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
new file mode 100644
index 00000000..c124cd31
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
@@ -0,0 +1,195 @@
+--[[
+
+Luci diag - Diagnostics controller module
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_diag.devinfo_common", package.seeall)
+
+require("luci.i18n")
+require("luci.util")
+require("luci.sys")
+require("luci.cbi")
+require("luci.model.uci")
+
+local translate = luci.i18n.translate
+local DummyValue = luci.cbi.DummyValue
+local SimpleSection = luci.cbi.SimpleSection
+
+function index()
+	return -- no-op
+end
+
+function run_processes(outnets, cmdfunc)
+   i = next(outnets, nil)
+   while (i) do
+      outnets[i]["output"] = luci.sys.exec(cmdfunc(outnets, i))
+      i = next(outnets, i)
+   end
+end
+
+function parse_output(devmap, outnets, haslink, type, mini, debug)
+   local curnet = next(outnets, nil)
+
+   while (curnet) do
+      local output = outnets[curnet]["output"]
+      local subnet = outnets[curnet]["subnet"]
+      local ports = outnets[curnet]["ports"]
+      local interface = outnets[curnet]["interface"]
+      local netdevs = {}
+      devlines = luci.util.split(output)
+      if not devlines then
+	 devlines = {}
+	 table.insert(devlines, output)
+      end
+	    
+      local j = nil
+      j = next(devlines, j)
+      
+      local found_a_device = false
+      
+      while (j) do
+	 if devlines[j] and ( devlines[j] ~= "" ) then
+	    found_a_device = true
+	    local devtable
+	    local row = {}
+	    devtable = luci.util.split(devlines[j], ' | ')
+	    row["ip"] = devtable[1]
+	    if (not mini) then
+	       row["mac"] = devtable[2]
+	    end
+	    if ( devtable[4] == 'unknown' ) then 
+	       row["vendor"] = devtable[3]
+	    else
+	       row["vendor"] = devtable[4]
+	    end
+	    row["type"] = devtable[5]
+	    if (not mini) then
+	       row["model"] = devtable[6]
+	    end
+	    if (haslink) then
+	       row["config_page"] = devtable[7]
+	    end
+	    
+	    if (debug) then
+	       row["raw"] = devlines[j]
+	    end
+	    table.insert(netdevs, row)
+	 end
+	 j = next(devlines, j)
+      end
+      if not found_a_device then
+	 local row = {}
+	 row["ip"] = curnet
+	 if (not mini) then
+	    row["mac"] = ""
+	 end
+	 if (type == "smap") then
+	    row["vendor"] = luci.i18n.translate("No SIP devices")
+	 else
+	    row["vendor"] = luci.i18n.translate("No devices detected")
+	 end
+	 row["type"] = luci.i18n.translate("check other networks")
+	 if (not mini) then
+	    row["model"] = ""
+	 end
+	 if (haslink) then
+	    row["config_page"] = ""
+	 end
+	 if (debug) then
+	    row["raw"] = output
+	 end
+	 table.insert(netdevs, row)
+      end	 
+      local s
+      if (type == "smap") then
+	 if (mini) then
+	    s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("SIP devices discovered for") .. " " .. curnet)
+	 else
+	    local interfacestring = ""
+	    if ( interface ~= "" ) then
+	       interfacestring = ", " .. interface
+	    end
+	    s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("SIP devices discovered for") .. " " .. curnet .. " (" .. subnet .. ":" .. ports .. interfacestring .. ")")
+	 end
+	 s.template = "diag/smapsection"
+      else
+	 if (mini) then
+	    s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("Devices discovered for") .. " " .. curnet)
+	 else
+	    local interfacestring = ""
+	    if ( interface ~= "" ) then
+	       interfacestring = ", " .. interface
+	    end
+	    s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("Devices discovered for") .. " " .. curnet .. " (" .. subnet .. interfacestring .. ")")
+	 end
+      end
+      s:option(DummyValue, "ip", translate("IP Address"))
+      if (not mini) then
+	 s:option(DummyValue, "mac", translate("MAC Address"))
+      end
+      s:option(DummyValue, "vendor", translate("Vendor"))
+      s:option(DummyValue, "type", translate("Device Type"))
+      if (not mini) then
+	 s:option(DummyValue, "model", translate("Model"))
+      end
+      if (haslink) then
+	 s:option(DummyValue, "config_page", translate("Link to Device"))
+      end
+      if (debug) then
+	 s:option(DummyValue, "raw", translate("Raw"))
+      end
+      curnet = next(outnets, curnet)
+   end
+end
+
+function get_network_device(interface)
+   local state = luci.model.uci.cursor_state()
+   state:load("network")
+   local dev
+   
+   return state:get("network", interface, "ifname")
+end
+
+
+function cbi_add_networks(field)
+	uci.cursor():foreach("network", "interface",
+		function (section)
+			if section[".name"] ~= "loopback" then
+				field:value(section[".name"])
+			end
+		end
+	)
+	field.titleref = luci.dispatcher.build_url("admin", "network", "network")
+end
+
+function config_devinfo_scan(map, scannet)
+   local o
+   o = scannet:option(luci.cbi.Flag, "enable", translate("Enable"))
+   o.optional = false
+   o.rmempty = false
+
+   o = scannet:option(luci.cbi.Value, "interface", translate("Interface"))
+   o.optional = false
+   luci.controller.luci_diag.devinfo_common.cbi_add_networks(o)
+   
+   local scansubnet
+   scansubnet = scannet:option(luci.cbi.Value, "subnet", translate("Subnet"))
+   scansubnet.optional = false
+   
+   o = scannet:option(luci.cbi.Value, "timeout", translate("Timeout"), translate("Time to wait for responses in seconds (default 10)"))
+   o.optional = true
+   
+   o = scannet:option(luci.cbi.Value, "repeat_count", translate("Repeat Count"), translate("Number of times to send requests (default 1)"))
+   o.optional = true
+   
+   o = scannet:option(luci.cbi.Value, "sleepreq", translate("Sleep Between Requests"), translate("Milliseconds to sleep between requests (default 100)"))
+   o.optional = true
+end
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua
new file mode 100644
index 00000000..7a2fbd91
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua
@@ -0,0 +1,56 @@
+--[[
+
+Luci diag - Diagnostics controller module
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_diag.luci_diag_devinfo", package.seeall)
+
+function index()
+   local e
+
+   e = entry({"admin", "voice", "diag", "phones"}, arcombine(cbi("luci_diag/smap_devinfo"), cbi("luci_diag/smap_devinfo_config")), _("Phones"), 10)
+   e.leaf = true
+   e.subindex = true
+   e.dependent = true
+
+   e = entry({"admin", "voice", "diag", "phones", "config"}, cbi("luci_diag/smap_devinfo_config"), _("Configure"), 10)
+
+   e = entry({"admin", "status", "smap_devinfo"}, cbi("luci_diag/smap_devinfo"), _("SIP Devices on Network"), 120)
+   e.leaf = true
+   e.dependent = true
+
+   e = entry({"admin", "network", "diag_config", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config"), _("Network Device Scan"), 100)
+   e.leaf = true
+   e.dependent = true
+
+   e = entry({"admin", "network", "diag_config", "smap_devinfo_config"}, cbi("luci_diag/smap_devinfo_config"), _("SIP Device Scan"))
+   e.leaf = true
+   e.dependent = true
+
+   e = entry({"admin", "status", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo"), _("Devices on Network"), 90)
+   e.dependent = true
+
+   e = entry({"admin", "network", "mactodevinfo"}, cbi("luci_diag/mactodevinfo"), _("MAC Device Info Overrides"), 190)
+   e.dependent = true
+
+   e = entry({"mini", "diag", "phone_scan"}, cbi("luci_diag/smap_devinfo_mini"), _("Phone Scan"), 100)
+   e.dependent = true
+
+   e = entry({"mini", "voice", "phones", "phone_scan_config"}, cbi("luci_diag/smap_devinfo_config_mini"), _("Config Phone Scan"), 90)
+   e.dependent = true
+
+   e = entry({"mini", "diag", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo_mini"), _("Network Device Scan"), 10)
+   e.dependent = true
+
+   e = entry({"mini", "network", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config_mini"), _("Device Scan Config"))
+   e.dependent = true
+
+end
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
new file mode 100644
index 00000000..592ca1ea
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
@@ -0,0 +1,101 @@
+--[[
+
+Luci diag - Diagnostics controller module
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_diag.netdiscover_common", package.seeall)
+
+require("luci.i18n")
+require("luci.util")
+require("luci.sys")
+require("luci.cbi")
+require("luci.model.uci")
+
+local translate = luci.i18n.translate
+local DummyValue = luci.cbi.DummyValue
+local SimpleSection = luci.cbi.SimpleSection
+
+function index()
+	return -- no-op
+end
+	 
+function get_params()
+
+   local netdiscover_uci = luci.model.uci.cursor()
+   netdiscover_uci:load("luci_devinfo")
+   local nettable = netdiscover_uci:get_all("luci_devinfo")
+
+   local i 
+   local subnet
+   local netdout
+
+   local outnets = {}
+
+   i = next(nettable, nil)
+
+   while (i) do
+      if (netdiscover_uci:get("luci_devinfo", i) == "netdiscover_scannet") then 
+	 local scannet = netdiscover_uci:get_all("luci_devinfo", i)
+	 if scannet["subnet"] and (scannet["subnet"] ~= "") and scannet["enable"] and ( scannet["enable"] == "1") then
+	    local output = ""
+	    local outrow = {}
+	    outrow["interface"] = scannet["interface"]
+	    outrow["timeout"] = 10
+	    local timeout = tonumber(scannet["timeout"]) 
+	    if timeout and ( timeout > 0 ) then
+	       outrow["timeout"] = scannet["timeout"]
+	    end
+
+	    outrow["repeat_count"] = 1
+	    local repcount = tonumber(scannet["repeat_count"]) 
+	    if repcount and ( repcount > 0 ) then
+	       outrow["repeat_count"] = scannet["repeat_count"]
+	    end
+
+	    outrow["sleepreq"] = 100
+	    local repcount = tonumber(scannet["sleepreq"]) 
+	    if repcount and ( repcount > 0 ) then
+	       outrow["sleepreq"] = scannet["sleepreq"]
+	    end
+
+	    outrow["subnet"] = scannet["subnet"]    
+	    outrow["output"] = output
+	    outnets[i] = outrow
+	 end
+      end
+      i = next(nettable, i)
+   end
+   return outnets
+end
+
+function command_function(outnets, i)
+   local interface = luci.controller.luci_diag.devinfo_common.get_network_device(outnets[i]["interface"])
+   
+   return "/usr/bin/netdiscover-to-devinfo " .. outnets[i]["subnet"] .. " " .. interface .. " " .. outnets[i]["timeout"] .. " -r " .. outnets[i]["repeat_count"] .. " -s " .. outnets[i]["sleepreq"] .. " </dev/null"
+end
+
+function action_links(netdiscovermap, mini) 
+   s = netdiscovermap:section(SimpleSection, "", translate("Actions")) 
+   b = s:option(DummyValue, "_config", translate("Configure Scans"))
+   b.value = ""
+   if (mini) then
+      b.titleref = luci.dispatcher.build_url("mini", "network", "netdiscover_devinfo_config")
+   else
+      b.titleref = luci.dispatcher.build_url("admin", "network", "diag_config", "netdiscover_devinfo_config")
+   end
+   b = s:option(DummyValue, "_scans", translate("Repeat Scans (this can take a few minutes)"))
+   b.value = ""
+   if (mini) then
+      b.titleref = luci.dispatcher.build_url("mini", "diag", "netdiscover_devinfo")
+   else
+      b.titleref = luci.dispatcher.build_url("admin", "status", "netdiscover_devinfo")
+   end
+end
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
new file mode 100644
index 00000000..e9aeaa62
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
@@ -0,0 +1,112 @@
+--[[
+
+Luci diag - Diagnostics controller module
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_diag.smap_common", package.seeall)
+
+require("luci.i18n")
+require("luci.util")
+require("luci.sys")
+require("luci.cbi")
+require("luci.model.uci")
+
+local translate = luci.i18n.translate
+local DummyValue = luci.cbi.DummyValue
+local SimpleSection = luci.cbi.SimpleSection
+
+function index()
+	return -- no-op
+end
+
+function get_params()
+
+   local smapnets_uci = luci.model.uci.cursor()
+   smapnets_uci:load("luci_devinfo")
+   local nettable = smapnets_uci:get_all("luci_devinfo")
+
+   local i 
+   local subnet
+   local smapout
+
+   local outnets = {}
+
+   i = next(nettable, nil)
+
+   while (i) do
+      if (smapnets_uci:get("luci_devinfo", i) == "smap_scannet") then 
+	 local scannet = smapnets_uci:get_all("luci_devinfo", i)
+	 if scannet["subnet"] and (scannet["subnet"] ~= "") and scannet["enable"] and ( scannet["enable"] == "1") then
+	    local output = ""
+	    local outrow = {}
+	    outrow["subnet"] = scannet["subnet"]
+	    ports = "5060"
+	    if scannet["ports"] and ( scannet["ports"] ~= "" ) then
+	       ports = scannet["ports"]		 
+	    end
+	    outrow["timeout"] = 10
+	    local timeout = tonumber(scannet["timeout"]) 
+	    if timeout and ( timeout > 0 ) then
+	       outrow["timeout"] = scannet["timeout"]
+	    end
+
+	    outrow["repeat_count"] = 1
+	    local repcount = tonumber(scannet["repeat_count"]) 
+	    if repcount and ( repcount > 0 ) then
+	       outrow["repeat_count"] = scannet["repeat_count"]
+	    end
+
+	    outrow["sleepreq"] = 100
+	    local repcount = tonumber(scannet["sleepreq"]) 
+	    if repcount and ( repcount > 0 ) then
+	       outrow["sleepreq"] = scannet["sleepreq"]
+	    end
+
+	    if scannet["interface"] and ( scannet["interface"] ~= "" ) then
+	       outrow["interface"] = scannet["interface"]
+	    else
+	       outrow["interface"] = ""
+	    end
+
+	    outrow["ports"] = ports
+	    outrow["output"] = output
+	    outnets[i] = outrow
+	 end
+      end
+      i = next(nettable, i)
+   end
+   return outnets
+end
+
+function command_function(outnets, i) 
+
+   local interface = luci.controller.luci_diag.devinfo_common.get_network_device(outnets[i]["interface"])
+
+   return "/usr/bin/netsmap-to-devinfo -r " .. outnets[i]["subnet"] .. " -t " .. outnets[i]["timeout"] .. " -i " .. interface .. " -x -p " ..  outnets[i]["ports"]  .. " -c " .. outnets[i]["repeat_count"] .. " -s " .. outnets[i]["sleepreq"] .. " </dev/null"
+end
+
+function action_links(smapmap, mini) 
+   s = smapmap:section(SimpleSection, "", translate("Actions")) 
+   b = s:option(DummyValue, "_config", translate("Configure Scans"))
+   b.value = ""
+   if (mini) then
+      b.titleref = luci.dispatcher.build_url("mini", "voice", "phones", "phone_scan_config")
+   else
+      b.titleref = luci.dispatcher.build_url("admin", "network", "diag_config", "smap_devinfo_config")
+   end
+   b = s:option(DummyValue, "_scans", translate("Repeat Scans (this can take a few minutes)"))
+   b.value = ""
+   if (mini) then
+      b.titleref = luci.dispatcher.build_url("mini", "diag", "phone_scan")
+   else
+      b.titleref = luci.dispatcher.build_url("admin", "status", "smap_devinfo")
+   end
+end
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
new file mode 100644
index 00000000..baf02c89
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
@@ -0,0 +1,36 @@
+--[[
+LuCI - Lua Configuration Interface
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("mactodevinfo", luci.i18n.translate("MAC Device Info Overrides"), translate("Override the information returned by the MAC to Device Info Script (mac-to-devinfo) for a specified range of MAC Addresses"))
+
+s = m:section(TypedSection, "mactodevinfo", translate("MAC Device Override"), translate("MAC range and information used to override system and IEEE databases"))
+s.addremove = true
+s.anonymous = true
+
+v = s:option(Value, "name", translate("Name"))
+v.optional = true
+v = s:option(Value, "maclow", translate("Beginning of MAC address range"))
+v.optional = false
+v = s:option(Value, "machigh", translate("End of MAC address range"))
+v.optional = false
+v = s:option(Value, "vendor", translate("Vendor"))
+v.optional = false
+v = s:option(Value, "devtype", translate("Device Type"))
+v.optional = false
+v = s:option(Value, "model", translate("Model"))
+v.optional = false
+v = s:option(Value, "ouiowneroverride", translate("OUI Owner"))
+v.optional = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
new file mode 100644
index 00000000..535c46ba
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
@@ -0,0 +1,33 @@
+--[[
+netdiscover_devinfo - SIP Device Information
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.i18n")
+require("luci.util")
+require("luci.sys")
+require("luci.model.uci")
+require("luci.controller.luci_diag.netdiscover_common")
+require("luci.controller.luci_diag.devinfo_common")
+
+local debug = false
+
+m = SimpleForm("luci_devinfo", translate("Network Device Scan"), translate("Scans for devices on specified networks."))
+m.reset = false
+m.submit = false
+
+local outnets = luci.controller.luci_diag.netdiscover_common.get_params()
+luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.netdiscover_common.command_function)
+luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, false, "netdiscover", false, debug)
+luci.controller.luci_diag.netdiscover_common.action_links(m, false)
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
new file mode 100644
index 00000000..e982bcef
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
@@ -0,0 +1,30 @@
+--[[
+LuCI - Lua Configuration Interface
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.controller.luci_diag.devinfo_common")
+
+m = Map("luci_devinfo", translate("Network Device Scanning Configuration"), translate("Configure scanning for devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
+
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
+b.value = ""
+b.titleref = luci.dispatcher.build_url("admin", "status", "netdiscover_devinfo")
+
+scannet = m:section(TypedSection, "netdiscover_scannet", translate("Scanning Configuration"), translate("Networks to scan for devices"))
+scannet.addremove = true
+scannet.anonymous = false
+
+luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet)
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
new file mode 100644
index 00000000..a99ddf9b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
@@ -0,0 +1,30 @@
+--[[
+LuCI - Lua Configuration Interface
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.controller.luci_diag.devinfo_common")
+
+m = Map("luci_devinfo", translate("Network Device Scanning Configuration"), translate("Configure scanning for devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
+
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
+b.value = ""
+b.titleref = luci.dispatcher.build_url("mini", "diag", "netdiscover_devinfo")
+
+scannet = m:section(TypedSection, "netdiscover_scannet", translate("Scanning Configuration"), translate("Networks to scan for devices"))
+scannet.addremove = true
+scannet.anonymous = false
+
+luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet)
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
new file mode 100644
index 00000000..271c114d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
@@ -0,0 +1,33 @@
+--[[
+netdiscover_devinfo - SIP Device Information
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.i18n")
+require("luci.util")
+require("luci.sys")
+require("luci.model.uci")
+require("luci.controller.luci_diag.netdiscover_common")
+require("luci.controller.luci_diag.devinfo_common")
+
+local debug = false
+
+m = SimpleForm("luci_devinfo", translate("Network Device Scan"), translate("Scan for devices on specified networks."))
+m.reset = false
+m.submit = false
+
+local outnets = luci.controller.luci_diag.netdiscover_common.get_params()
+luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.netdiscover_common.command_function)
+luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, false, "netdiscover", true, debug)
+luci.controller.luci_diag.netdiscover_common.action_links(m, true)
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
new file mode 100644
index 00000000..ff808d9e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
@@ -0,0 +1,33 @@
+--[[
+smap_devinfo - SIP Device Information
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.i18n")
+require("luci.util")
+require("luci.sys")
+require("luci.model.uci")
+require("luci.controller.luci_diag.smap_common")
+require("luci.controller.luci_diag.devinfo_common")
+
+local debug = false
+
+m = SimpleForm("luci-smap-to-devinfo", translate("SIP Device Information"), translate("Scan for supported SIP devices on specified networks."))
+m.reset = false
+m.submit = false
+
+local outnets = luci.controller.luci_diag.smap_common.get_params()
+luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.smap_common.command_function)
+luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, true, "smap", false, debug)
+luci.controller.luci_diag.smap_common.action_links(m, false)
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
new file mode 100644
index 00000000..20b6987f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
@@ -0,0 +1,35 @@
+--[[
+LuCI - Lua Configuration Interface
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.controller.luci_diag.devinfo_common")
+
+m = Map("luci_devinfo", translate("SIP Device Scanning Configuration"), translate("Configure scanning for supported SIP devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
+
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
+b.value = ""
+b.titleref = luci.dispatcher.build_url("admin", "status", "smap_devinfo")
+
+scannet = m:section(TypedSection, "smap_scannet", translate("Scanning Configuration"), translate("Networks to scan for supported devices"))
+scannet.addremove = true
+scannet.anonymous = false
+
+local ports
+ports = scannet:option(Value, "ports", translate("Ports"))
+ports.optional = true
+ports.rmempty = true
+
+luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet)
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
new file mode 100644
index 00000000..aff4a98a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
@@ -0,0 +1,36 @@
+--[[
+LuCI - Lua Configuration Interface
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.controller.luci_diag.devinfo_common")
+
+m = Map("luci_devinfo", translate("Phone Scanning Configuration"), translate("Configure scanning for supported SIP devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
+
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
+b.value = ""
+b.titleref = luci.dispatcher.build_url("mini", "diag", "phone_scan")
+
+scannet = m:section(TypedSection, "smap_scannet", translate("Scanning Configuration"), translate("Networks to scan for supported devices"))
+scannet.addremove = true
+scannet.anonymous = false
+
+local ports
+ports = scannet:option(Value, "ports", translate("Ports"))
+ports.optional = true
+ports.rmempty = true
+
+luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet)
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
new file mode 100644
index 00000000..5b7bb0f0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
@@ -0,0 +1,33 @@
+--[[
+smap_devinfo - SIP Device Information
+
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.i18n")
+require("luci.util")
+require("luci.sys")
+require("luci.model.uci")
+require("luci.controller.luci_diag.smap_common")
+require("luci.controller.luci_diag.devinfo_common")
+
+local debug = false
+
+m = SimpleForm("luci-smap-to-devinfo", translate("Phone Information"), translate("Scan for supported SIP devices on specified networks."))
+m.reset = false
+m.submit = false
+
+local outnets = luci.controller.luci_diag.smap_common.get_params()
+luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.smap_common.command_function)
+luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, true, "smap", true, debug)
+luci.controller.luci_diag.smap_common.action_links(m, true)
+
+return m
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm
new file mode 100644
index 00000000..742f6595
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm
@@ -0,0 +1,137 @@
+<%#
+LuCI - Lua Configuration Interface
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%-
+local rowcnt = 1
+function rowstyle()
+	rowcnt = rowcnt + 1
+	return (rowcnt % 2) + 1
+end
+-%>
+
+<!-- smapsection -->
+<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+	<% if self.title and #self.title > 0 then -%>
+		<legend><%=self.title%></legend>
+	<%- end %>
+	<div class="cbi-section-descr"><%=self.description%></div>
+	<div class="cbi-section-node">
+		<%- local count = 0 -%>
+		<table class="cbi-section-table">
+			<tr class="cbi-section-table-titles">
+			<%- if not self.anonymous then -%>
+				<%- if self.sectionhead then -%>
+					<th class="cbi-section-table-cell"><%=self.sectionhead%></th>
+				<%- else -%>
+					<th>&#160;</th>
+				<%- end -%>
+			<%- end -%>
+			<%- for i, k in pairs(self.children) do if not k.optional then -%>
+				<th class="cbi-section-table-cell">
+				<%- if k.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
+					<%-=k.title-%>
+				<%- if k.titleref then -%></a><%- end -%>
+				</th>
+			<%- count = count + 1; end; end; if self.extedit or self.addremove then -%>
+				<th class="cbi-section-table-cell">&#160;</th>
+			<%- count = count + 1; end -%>
+			</tr>
+			<tr class="cbi-section-table-descr">
+			<%- if not self.anonymous then -%>
+				<%- if self.sectiondesc then -%>
+					<th class="cbi-section-table-cell"><%=self.sectiondesc%></th>
+				<%- else -%>
+					<th></th>
+				<%- end -%>
+			<%- end -%>
+			<%- for i, k in pairs(self.children) do if not k.optional then -%>
+				<th class="cbi-section-table-cell"><%=k.description%></th>
+			<%- end; end; if self.extedit or self.addremove then -%>
+				<th class="cbi-section-table-cell"></th>
+			<%- end -%>
+			</tr>
+			<%- local isempty = true
+			    for i, k in ipairs(self:cfgsections()) do
+					section = k
+					isempty = false
+					scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" }
+			-%>
+			<tr class="cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>">
+				<% if not self.anonymous then -%>
+					<th><h3><%=k%></h3></th>
+				<%- end %>
+
+				<%-	for k, node in ipairs(self.children) do -%>
+					<%-    if not node.optional then -%>
+					       <%- nodevalue = node:cfgvalue(section) -%>
+					       <%- if nodevalue and ( nodevalue ~= "" ) and string.find(nodevalue, 'http://', 1, plain) then
+					       	       node.href = nodevalue
+						       node.template = "diag/smapvalue"
+						    end 
+                                               -%>
+					       <%- node:render(section, scope or {}) -%>
+					<%- end -%>
+                                <%- end -%>
+
+				<%- if self.extedit or self.addremove then -%>
+					<td class="cbi-section-table-cell">
+						<%- if self.extedit then -%>
+							<a href="
+							<%- if type(self.extedit) == "string" then -%>
+								<%=self.extedit:format(section)%>
+							<%- elseif type(self.extedit) == "function" then -%>
+								<%=self:extedit(section)%>
+							<%- end -%>
+							" title="<%:Edit%>"><img style="border: none" src="<%=resource%>/cbi/edit.gif" alt="<%:Edit%>" /></a>
+						<%- end; if self.addremove then %>
+							<input type="image" value="<%:Delete%>" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" src="<%=resource%>/cbi/remove.gif" />
+						<%- end -%>
+					</td>
+				<%- end -%>
+			</tr>
+			<%- end -%>
+
+			<%- if isempty then -%>
+			<tr class="cbi-section-table-row">
+				<td colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></td>
+			</tr>
+			<%- end -%>
+		</table>
+
+		<% if self.error then %>
+			<div class="cbi-section-error">
+				<ul><% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%>
+					<li><%=luci.util.pcdata(e):gsub("\n","<br />")%></li>
+				<%- end end %></ul>
+			</div>
+		<% end %>
+
+		<%- if self.addremove then -%>
+			<% if self.template_addremove then include(self.template_addremove) else -%>
+			<div class="cbi-section-create cbi-smapsection-create">
+				<% if self.anonymous then %>
+					<input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:Add%>" />
+				<% else %>
+					<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
+					<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
+					<input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" title="<%:Add%>" />
+					<% if self.invalid_cts then -%>
+						<br /><%:Invalid%></div>
+					<%- end %>
+				<% end %>
+			</div>
+			<%- end %>
+		<%- end -%>
+	</div>
+</fieldset>
+<!-- /smapsection -->
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm
new file mode 100644
index 00000000..60aa70a3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm
@@ -0,0 +1,21 @@
+<%#
+LuCI - Lua Configuration Interface
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+cbi/valueheader%>
+<% if self.href then %><a href="<%=self.href%>" target="_blank"><% end -%>
+	<%=luci.util.pcdata(self:cfgvalue(section))%>
+<%- if self.href then %></a><%end%>
+&#160;
+<input type="hidden" id="<%=cbid%>" value="<%=luci.util.pcdata(self:cfgvalue(section))%>" />
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/applications/luci-diag-devinfo/root/etc/config/luci_devinfo b/trunk/package/luci/applications/luci-diag-devinfo/root/etc/config/luci_devinfo
new file mode 100644
index 00000000..1bcdc198
--- /dev/null
+++ b/trunk/package/luci/applications/luci-diag-devinfo/root/etc/config/luci_devinfo
@@ -0,0 +1,20 @@
+config 'smap_scannet' 'SIP_LAN'
+        option 'enable' '0'
+	option 'interface' 'lan'
+	option 'subnet' '192.168.99.0/24'
+	
+config 'smap_scannet' 'SIP_WAN'
+        option 'enable' '0'
+	option 'interface' 'wan'
+	option 'subnet' '216.218.0.0/16'
+
+config 'netdiscover_scannet' 'SCAN_LAN'
+        option 'enable' '0'
+	option 'interface' 'lan'
+	option 'subnet' '192.168.99.0/24'
+	
+config 'netdiscover_scannet' 'SCAN_WAN'
+        option 'enable' '0'
+	option 'interface' 'wan'
+	option 'subnet' '216.218.0.0/16'
+
diff --git a/trunk/package/luci/applications/luci-dump1090/Makefile b/trunk/package/luci/applications/luci-dump1090/Makefile
new file mode 100644
index 00000000..be4c0ea8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-dump1090/Makefile
@@ -0,0 +1,4 @@
+PO = dump1090
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-dump1090/luasrc/controller/dump1090.lua b/trunk/package/luci/applications/luci-dump1090/luasrc/controller/dump1090.lua
new file mode 100644
index 00000000..c29c22fc
--- /dev/null
+++ b/trunk/package/luci/applications/luci-dump1090/luasrc/controller/dump1090.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface - dump1090 support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.dump1090", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/dump1090") then
+		return
+	end
+
+	local page = entry({"admin", "services", "dump1090"}, cbi("dump1090"), _("dump1090"))
+	page.dependent = true
+
+end
diff --git a/trunk/package/luci/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua b/trunk/package/luci/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua
new file mode 100644
index 00000000..e9ed336c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua
@@ -0,0 +1,156 @@
+--[[
+LuCI - Lua Configuration Interface - dump1090 support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("dump1090", "dump1090", translate("dump1090 is a Mode S decoder specifically designed for RTLSDR devices, here you can configure the settings."))
+
+s = m:section(TypedSection, "dump1090", "")
+s.addremove = true
+s.anonymous = false
+
+enable=s:option(Flag, "disabled", translate("Enabled"))
+enable.enabled="0"
+enable.disabled="1"
+enable.default = "1"
+enable.rmempty = false
+respawn=s:option(Flag, "respawn", translate("Respawn"))
+respawn.default = false
+
+device_index=s:option(Value, "device_index", translate("RTL device index"))
+device_index.rmempty = true
+device_index.datatype = "uinteger"
+
+gain=s:option(Value, "gain", translate("Gain (-10 for auto-gain)"))
+gain.rmempty = true
+gain.datatype = "integer"
+
+enable_agc=s:option(Flag, "enable_agc", translate("Enable automatic gain control"))
+enable_agc.default = false
+
+freq=s:option(Value, "freq", translate("Frequency"))
+freq.rmempty = true
+freq.datatype = "uinteger"
+
+ifile=s:option(Value, "ifile", translate("Data file"))
+ifile.rmempty = true
+ifile.datatype = "file"
+
+raw=s:option(Flag, "raw", translate("Show only messages hex values"))
+raw.default = false
+
+net=s:option(Flag, "net", translate("Enable networking"))
+
+modeac=s:option(Flag, "modeac", translate("Enable decoding of SSR Modes 3/A & 3/C"))
+modeac.default = false
+
+net_beast=s:option(Flag, "net_beast", translate("TCP raw output in Beast binary format"))
+net_beast.default = false
+
+net_only=s:option(Flag, "net_only", translate("Enable just networking, no RTL device or file used"))
+net_only.default = false
+
+net_bind_address=s:option(Value, "net_bind_address", translate("IP address to bind to"))
+net_bind_address.rmempty = true
+net_bind_address.datatype = "ipaddr"
+
+net_http_port=s:option(Value, "net_http_port", translate("HTTP server port"))
+net_http_port.rmempty = true
+net_http_port.datatype = "port"
+
+net_ri_port=s:option(Value, "net_ri_port", translate("TCP raw input listen port"))
+net_ri_port.rmempty = true
+net_ri_port.datatype = "port"
+
+net_ro_port=s:option(Value, "net_ro_port", translate("TCP raw output listen port"))
+net_ro_port.rmempty = true
+net_ro_port.datatype = "port"
+
+net_sbs_port=s:option(Value, "net_sbs_port", translate("TCP BaseStation output listen port"))
+net_sbs_port.rmempty = true
+net_sbs_port.datatype = "port"
+
+net_bi_port=s:option(Value, "net_bi_port", translate("TCP Beast input listen port"))
+net_bi_port.rmempty = true
+net_bi_port.datatype = "port"
+
+net_bo_port=s:option(Value, "net_bo_port", translate("TCP Beast output listen port"))
+net_bo_port.rmempty = true
+net_bo_port.datatype = "port"
+
+net_ro_size=s:option(Value, "net_ro_size", translate("TCP raw output minimum size"))
+net_ro_size.rmempty = true
+net_ro_size.datatype = "uinteger"
+
+net_ro_rate=s:option(Value, "net_ro_rate", translate("TCP raw output memory flush rate"))
+net_ro_rate.rmempty = true
+net_ro_rate.datatype = "uinteger"
+
+net_heartbeat=s:option(Value, "net_heartbeat", translate("TCP heartbeat rate in seconds"))
+net_heartbeat.rmempty = true
+net_heartbeat.datatype = "uinteger"
+
+net_buffer=s:option(Value, "net_buffer", translate("TCP buffer size 64Kb * (2^n)"))
+net_buffer.rmempty = true
+net_buffer.datatype = "uinteger"
+
+lat=s:option(Value, "lat", translate("Reference/receiver latitude for surface posn"))
+lat.rmempty = true
+lat.datatype = "integer"
+
+lon=s:option(Value, "lon", translate("Reference/receiver longitude for surface posn"))
+lon.rmempty = true
+lon.datatype = "integer"
+
+fix=s:option(Flag, "fix", translate("Enable single-bits error correction using CRC"))
+fix.default = false
+
+no_fix=s:option(Flag, "no_fix", translate("Disable single-bits error correction using CRC"))
+no_fix.default = false
+
+no_crc_check=s:option(Flag, "no_crc_check", translate("Disable messages with broken CRC"))
+no_crc_check.default = false
+
+phase_enhance=s:option(Flag, "phase_enhance", translate("Enable phase enhancement"))
+phase_enhance.default = false
+
+agressive=s:option(Flag, "agressive", translate("More CPU for more messages"))
+agressive.default = false
+
+mlat=s:option(Flag, "mlat", translate("Display raw messages in Beast ascii mode"))
+mlat.default = false
+
+stats=s:option(Flag, "stats", translate("Print stats at exit"))
+stats.default = false
+
+stats_every=s:option(Value, "stats_every", translate("Show and reset stats every seconds"))
+stats_every.rmempty = true
+stats_every.datatype = "uinteger"
+
+onlyaddr=s:option(Flag, "onlyaddr", translate("Show only ICAO addresses"))
+onlyaddr.default = false
+
+metric=s:option(Flag, "metric", translate("Use metric units"))
+metric.default = false
+
+snip=s:option(Flag, "snip", translate("Strip IQ file removing samples"))
+snip.rmempty = true
+snip.datatype = "uinteger"
+
+debug_mode=s:option(Flag, "debug", translate("Debug mode flags"))
+debug_mode.rmempty = true
+
+ppm=s:option(Flag, "ppm", translate("Set receiver error in parts per million"))
+ppm.rmempty = true
+ppm.datatype = "uinteger"
+
+return m
diff --git a/trunk/package/luci/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090 b/trunk/package/luci/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090
new file mode 100644
index 00000000..4475d2fb
--- /dev/null
+++ b/trunk/package/luci/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# needed for "Save and Apply" to restart dump1090
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@dump1090[-1]
+	add ucitrack dump1090
+	set ucitrack.@dump1090[-1].init="dump1090"
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-firewall/Makefile b/trunk/package/luci/applications/luci-firewall/Makefile
new file mode 100644
index 00000000..df755bfb
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/Makefile
@@ -0,0 +1,4 @@
+PO = firewall
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/controller/firewall.lua b/trunk/package/luci/applications/luci-firewall/luasrc/controller/firewall.lua
new file mode 100644
index 00000000..5a6ab0ad
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/controller/firewall.lua
@@ -0,0 +1,23 @@
+module("luci.controller.firewall", package.seeall)
+
+function index()
+	entry({"admin", "network", "firewall"},
+		alias("admin", "network", "firewall", "zones"),
+		_("Firewall"), 60)
+
+	entry({"admin", "network", "firewall", "zones"},
+		arcombine(cbi("firewall/zones"), cbi("firewall/zone-details")),
+		_("General Settings"), 10).leaf = true
+
+	entry({"admin", "network", "firewall", "forwards"},
+		arcombine(cbi("firewall/forwards"), cbi("firewall/forward-details")),
+		_("Port Forwards"), 20).leaf = true
+
+	entry({"admin", "network", "firewall", "rules"},
+		arcombine(cbi("firewall/rules"), cbi("firewall/rule-details")),
+		_("Traffic Rules"), 30).leaf = true
+
+	entry({"admin", "network", "firewall", "custom"},
+		cbi("firewall/custom"),
+		_("Custom Rules"), 40).leaf = true
+end
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua
new file mode 100644
index 00000000..9b53a8a6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua
@@ -0,0 +1,38 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs = require "nixio.fs"
+
+local f = SimpleForm("firewall",
+	translate("Firewall - Custom Rules"),
+	translate("Custom rules allow you to execute arbritary iptables commands \
+		which are not otherwise covered by the firewall framework. \
+		The commands are executed after each firewall restart, right after \
+		the default ruleset has been loaded."))
+
+local o = f:field(Value, "_custom")
+
+o.template = "cbi/tvalue"
+o.rows = 20
+
+function o.cfgvalue(self, section)
+	return fs.readfile("/etc/firewall.user")
+end
+
+function o.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	fs.writefile("/etc/firewall.user", value)
+end
+
+return f
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
new file mode 100644
index 00000000..c80a6d0e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
@@ -0,0 +1,161 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local sys = require "luci.sys"
+local dsp = require "luci.dispatcher"
+local ft  = require "luci.tools.firewall"
+
+local m, s, o
+
+arg[1] = arg[1] or ""
+
+m = Map("firewall",
+	translate("Firewall - Port Forwards"),
+	translate("This page allows you to change advanced properties of the port \
+	           forwarding entry. In most cases there is no need to modify \
+			   those settings."))
+
+m.redirect = dsp.build_url("admin/network/firewall/forwards")
+
+if m.uci:get("firewall", arg[1]) ~= "redirect" then
+	luci.http.redirect(m.redirect)
+	return
+else
+	local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
+	if not name or #name == 0 then
+		name = translate("(Unnamed Entry)")
+	end
+	m.title = "%s - %s" %{ translate("Firewall - Port Forwards"), name }
+end
+
+s = m:section(NamedSection, arg[1], "redirect", "")
+s.anonymous = true
+s.addremove = false
+
+ft.opt_enabled(s, Button)
+ft.opt_name(s, Value, translate("Name"))
+
+
+o = s:option(Value, "proto", translate("Protocol"))
+o:value("tcp udp", "TCP+UDP")
+o:value("tcp", "TCP")
+o:value("udp", "UDP")
+o:value("icmp", "ICMP")
+
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	if not v or v == "tcpudp" then
+		return "tcp udp"
+	end
+	return v
+end
+
+
+o = s:option(Value, "src", translate("Source zone"))
+o.nocreate = true
+o.default = "wan"
+o.template = "cbi/firewall_zonelist"
+
+
+o = s:option(DynamicList, "src_mac",
+	translate("Source MAC address"),
+	translate("Only match incoming traffic from these MACs."))
+o.rmempty = true
+o.datatype = "neg(macaddr)"
+o.placeholder = translate("any")
+
+luci.sys.net.mac_hints(function(mac, name)
+	o:value(mac, "%s (%s)" %{ mac, name })
+end)
+
+
+o = s:option(Value, "src_ip",
+	translate("Source IP address"),
+	translate("Only match incoming traffic from this IP or range."))
+o.rmempty = true
+o.datatype = "neg(ip4addr)"
+o.placeholder = translate("any")
+
+luci.sys.net.ipv4_hints(function(ip, name)
+	o:value(ip, "%s (%s)" %{ ip, name })
+end)
+
+
+o = s:option(Value, "src_port",
+	translate("Source port"),
+	translate("Only match incoming traffic originating from the given source port or port range on the client host"))
+o.rmempty = true
+o.datatype = "neg(portrange)"
+o.placeholder = translate("any")
+
+
+o = s:option(Value, "src_dip",
+	translate("External IP address"),
+	translate("Only match incoming traffic directed at the given IP address."))
+
+luci.sys.net.ipv4_hints(function(ip, name)
+	o:value(ip, "%s (%s)" %{ ip, name })
+end)
+
+
+o.rmempty = true
+o.datatype = "neg(ip4addr)"
+o.placeholder = translate("any")
+
+
+o = s:option(Value, "src_dport", translate("External port"),
+	translate("Match incoming traffic directed at the given " ..
+		"destination port or port range on this host"))
+o.datatype = "neg(portrange)"
+
+
+
+o = s:option(Value, "dest", translate("Internal zone"))
+o.nocreate = true
+o.default = "lan"
+o.template = "cbi/firewall_zonelist"
+
+
+o = s:option(Value, "dest_ip", translate("Internal IP address"),
+	translate("Redirect matched incoming traffic to the specified \
+		internal host"))
+o.datatype = "ip4addr"
+
+luci.sys.net.ipv4_hints(function(ip, name)
+	o:value(ip, "%s (%s)" %{ ip, name })
+end)
+
+
+o = s:option(Value, "dest_port",
+	translate("Internal port"),
+	translate("Redirect matched incoming traffic to the given port on \
+		the internal host"))
+o.placeholder = translate("any")
+o.datatype = "portrange"
+
+
+o = s:option(Flag, "reflection", translate("Enable NAT Loopback"))
+o.rmempty = true
+o.default = o.enabled
+o.cfgvalue = function(...)
+	return Flag.cfgvalue(...) or "1"
+end
+
+
+s:option(Value, "extra",
+	translate("Extra arguments"),
+	translate("Passes additional arguments to iptables. Use with care!"))
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua
new file mode 100644
index 00000000..5f7a69b2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua
@@ -0,0 +1,144 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local ds = require "luci.dispatcher"
+local ft = require "luci.tools.firewall"
+
+m = Map("firewall", translate("Firewall - Port Forwards"),
+	translate("Port forwarding allows remote computers on the Internet to \
+	           connect to a specific computer or service within the \
+	           private LAN."))
+
+--
+-- Port Forwards
+--
+
+s = m:section(TypedSection, "redirect", translate("Port Forwards"))
+s.template  = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+s.sortable  = true
+s.extedit   = ds.build_url("admin/network/firewall/forwards/%s")
+s.template_addremove = "firewall/cbi_addforward"
+
+function s.create(self, section)
+	local n = m:formvalue("_newfwd.name")
+	local p = m:formvalue("_newfwd.proto")
+	local E = m:formvalue("_newfwd.extzone")
+	local e = m:formvalue("_newfwd.extport")
+	local I = m:formvalue("_newfwd.intzone")
+	local a = m:formvalue("_newfwd.intaddr")
+	local i = m:formvalue("_newfwd.intport")
+
+	if p == "other" or (p and a) then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target",    "DNAT")
+		self.map:set(created, "src",       E or "wan")
+		self.map:set(created, "dest",      I or "lan")
+		self.map:set(created, "proto",     (p ~= "other") and p or "all")
+		self.map:set(created, "src_dport", e)
+		self.map:set(created, "dest_ip",   a)
+		self.map:set(created, "dest_port", i)
+		self.map:set(created, "name",      n)
+	end
+
+	if p ~= "other" then
+		created = nil
+	end
+end
+
+function s.parse(self, ...)
+	TypedSection.parse(self, ...)
+	if created then
+		m.uci:save("firewall")
+		luci.http.redirect(ds.build_url(
+			"admin/network/firewall/redirect", created
+		))
+	end
+end
+
+function s.filter(self, sid)
+	return (self.map:get(sid, "target") ~= "SNAT")
+end
+
+
+ft.opt_name(s, DummyValue, translate("Name"))
+
+
+local function forward_proto_txt(self, s)
+	return "%s-%s" %{
+		translate("IPv4"),
+		ft.fmt_proto(self.map:get(s, "proto"),
+	                 self.map:get(s, "icmp_type")) or "TCP+UDP"
+	}
+end
+
+local function forward_src_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "src"), translate("any zone"))
+	local a = ft.fmt_ip(self.map:get(s, "src_ip"), translate("any host"))
+	local p = ft.fmt_port(self.map:get(s, "src_port"))
+	local m = ft.fmt_mac(self.map:get(s, "src_mac"))
+
+	if p and m then
+		return translatef("From %s in %s with source %s and %s", a, z, p, m)
+	elseif p or m then
+		return translatef("From %s in %s with source %s", a, z, p or m)
+	else
+		return translatef("From %s in %s", a, z)
+	end
+end
+
+local function forward_via_txt(self, s)
+	local a = ft.fmt_ip(self.map:get(s, "src_dip"), translate("any router IP"))
+	local p = ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if p then
+		return translatef("Via %s at %s", a, p)
+	else
+		return translatef("Via %s", a)
+	end
+end
+
+match = s:option(DummyValue, "match", translate("Match"))
+match.rawhtml = true
+match.width   = "50%"
+function match.cfgvalue(self, s)
+	return "<small>%s<br />%s<br />%s</small>" % {
+		forward_proto_txt(self, s),
+		forward_src_txt(self, s),
+		forward_via_txt(self, s)
+	}
+end
+
+
+dest = s:option(DummyValue, "dest", translate("Forward to"))
+dest.rawhtml = true
+dest.width   = "40%"
+function dest.cfgvalue(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "dest"), translate("any zone"))
+	local a = ft.fmt_ip(self.map:get(s, "dest_ip"), translate("any host"))
+	local p = ft.fmt_port(self.map:get(s, "dest_port")) or
+		ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if p then
+		return translatef("%s, %s in %s", a, p, z)
+	else
+		return translatef("%s in %s", a, z)
+	end
+end
+
+ft.opt_enabled(s, Flag, translate("Enable")).width = "1%"
+
+return m
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
new file mode 100644
index 00000000..d29879c2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -0,0 +1,329 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local sys = require "luci.sys"
+local utl = require "luci.util"
+local dsp = require "luci.dispatcher"
+local nxo = require "nixio"
+
+local ft = require "luci.tools.firewall"
+local nw = require "luci.model.network"
+local m, s, o, k, v
+
+arg[1] = arg[1] or ""
+
+m = Map("firewall",
+	translate("Firewall - Traffic Rules"),
+	translate("This page allows you to change advanced properties of the \
+	           traffic rule entry, such as matched source and destination \
+			   hosts."))
+
+m.redirect = dsp.build_url("admin/network/firewall/rules")
+
+nw.init(m.uci)
+
+local rule_type = m.uci:get("firewall", arg[1])
+if rule_type == "redirect" and m:get(arg[1], "target") ~= "SNAT" then
+	rule_type = nil
+end
+
+if not rule_type then
+	luci.http.redirect(m.redirect)
+	return
+
+--
+-- SNAT
+--
+elseif rule_type == "redirect" then
+
+	local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
+	if not name or #name == 0 then
+		name = translate("(Unnamed SNAT)")
+	else
+		name = "SNAT %s" % name
+	end
+
+	m.title = "%s - %s" %{ translate("Firewall - Traffic Rules"), name }
+
+	local wan_zone = nil
+
+	m.uci:foreach("firewall", "zone",
+		function(s)
+			local n = s.network or s.name
+			if n then
+				local i
+				for i in utl.imatch(n) do
+					if i == "wan" then
+						wan_zone = s.name
+						return false
+					end
+				end
+			end
+		end)
+
+	s = m:section(NamedSection, arg[1], "redirect", "")
+	s.anonymous = true
+	s.addremove = false
+
+
+	ft.opt_enabled(s, Button)
+	ft.opt_name(s, Value, translate("Name"))
+
+
+	o = s:option(Value, "proto",
+		translate("Protocol"),
+		translate("You may specify multiple by selecting \"-- custom --\" and \
+		           then entering protocols separated by space."))
+
+	o:value("all", "All protocols")
+	o:value("tcp udp", "TCP+UDP")
+	o:value("tcp", "TCP")
+	o:value("udp", "UDP")
+	o:value("icmp", "ICMP")
+
+	function o.cfgvalue(...)
+		local v = Value.cfgvalue(...)
+		if not v or v == "tcpudp" then
+			return "tcp udp"
+		end
+		return v
+	end
+
+
+	o = s:option(Value, "src", translate("Source zone"))
+	o.nocreate = true
+	o.default = "wan"
+	o.template = "cbi/firewall_zonelist"
+
+
+	o = s:option(Value, "src_ip", translate("Source IP address"))
+	o.rmempty = true
+	o.datatype = "neg(ipaddr)"
+	o.placeholder = translate("any")
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "src_port",
+		translate("Source port"),
+		translate("Match incoming traffic originating from the given source \
+			port or port range on the client host."))
+	o.rmempty = true
+	o.datatype = "neg(portrange)"
+	o.placeholder = translate("any")
+
+
+	o = s:option(Value, "dest", translate("Destination zone"))
+	o.nocreate = true
+	o.default = "lan"
+	o.template = "cbi/firewall_zonelist"
+
+
+	o = s:option(Value, "dest_ip", translate("Destination IP address"))
+	o.datatype = "neg(ip4addr)"
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "dest_port",
+		translate("Destination port"),
+		translate("Match forwarded traffic to the given destination port or \
+			port range."))
+
+	o.rmempty = true
+	o.placeholder = translate("any")
+	o.datatype = "neg(portrange)"
+
+
+	o = s:option(Value, "src_dip",
+		translate("SNAT IP address"),
+		translate("Rewrite matched traffic to the given address."))
+	o.rmempty = false
+	o.datatype = "ip4addr"
+
+	for k, v in ipairs(nw:get_interfaces()) do
+		local a
+		for k, a in ipairs(v:ipaddrs()) do
+			o:value(a:host():string(), '%s (%s)' %{
+				a:host():string(), v:shortname()
+			})
+		end
+	end
+
+
+	o = s:option(Value, "src_dport", translate("SNAT port"),
+		translate("Rewrite matched traffic to the given source port. May be \
+			left empty to only rewrite the IP address."))
+	o.datatype = "portrange"
+	o.rmempty = true
+	o.placeholder = translate('Do not rewrite')
+
+
+	s:option(Value, "extra",
+		translate("Extra arguments"),
+		translate("Passes additional arguments to iptables. Use with care!"))
+
+
+--
+-- Rule
+--
+else
+	local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
+	if not name or #name == 0 then
+		name = translate("(Unnamed Rule)")
+	end
+
+	m.title = "%s - %s" %{ translate("Firewall - Traffic Rules"), name }
+
+
+	s = m:section(NamedSection, arg[1], "rule", "")
+	s.anonymous = true
+	s.addremove = false
+
+	ft.opt_enabled(s, Button)
+	ft.opt_name(s, Value, translate("Name"))
+
+
+	o = s:option(ListValue, "family", translate("Restrict to address family"))
+	o.rmempty = true
+	o:value("", translate("IPv4 and IPv6"))
+	o:value("ipv4", translate("IPv4 only"))
+	o:value("ipv6", translate("IPv6 only"))
+
+
+	o = s:option(Value, "proto", translate("Protocol"))
+	o:value("all", translate("Any"))
+	o:value("tcp udp", "TCP+UDP")
+	o:value("tcp", "TCP")
+	o:value("udp", "UDP")
+	o:value("icmp", "ICMP")
+
+	function o.cfgvalue(...)
+		local v = Value.cfgvalue(...)
+		if not v or v == "tcpudp" then
+			return "tcp udp"
+		end
+		return v
+	end
+
+
+	o = s:option(DynamicList, "icmp_type", translate("Match ICMP type"))
+	o:value("", "any")
+	o:value("echo-reply")
+	o:value("destination-unreachable")
+	o:value("network-unreachable")
+	o:value("host-unreachable")
+	o:value("protocol-unreachable")
+	o:value("port-unreachable")
+	o:value("fragmentation-needed")
+	o:value("source-route-failed")
+	o:value("network-unknown")
+	o:value("host-unknown")
+	o:value("network-prohibited")
+	o:value("host-prohibited")
+	o:value("TOS-network-unreachable")
+	o:value("TOS-host-unreachable")
+	o:value("communication-prohibited")
+	o:value("host-precedence-violation")
+	o:value("precedence-cutoff")
+	o:value("source-quench")
+	o:value("redirect")
+	o:value("network-redirect")
+	o:value("host-redirect")
+	o:value("TOS-network-redirect")
+	o:value("TOS-host-redirect")
+	o:value("echo-request")
+	o:value("router-advertisement")
+	o:value("router-solicitation")
+	o:value("time-exceeded")
+	o:value("ttl-zero-during-transit")
+	o:value("ttl-zero-during-reassembly")
+	o:value("parameter-problem")
+	o:value("ip-header-bad")
+	o:value("required-option-missing")
+	o:value("timestamp-request")
+	o:value("timestamp-reply")
+	o:value("address-mask-request")
+	o:value("address-mask-reply")
+
+
+	o = s:option(Value, "src", translate("Source zone"))
+	o.nocreate = true
+	o.allowany = true
+	o.default = "wan"
+	o.template = "cbi/firewall_zonelist"
+
+
+	o = s:option(Value, "src_mac", translate("Source MAC address"))
+	o.datatype = "list(macaddr)"
+	o.placeholder = translate("any")
+
+	luci.sys.net.mac_hints(function(mac, name)
+		o:value(mac, "%s (%s)" %{ mac, name })
+	end)
+
+
+	o = s:option(Value, "src_ip", translate("Source address"))
+	o.datatype = "neg(ipaddr)"
+	o.placeholder = translate("any")
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "src_port", translate("Source port"))
+	o.datatype = "list(neg(portrange))"
+	o.placeholder = translate("any")
+
+
+	o = s:option(Value, "dest", translate("Destination zone"))
+	o.nocreate = true
+	o.allowany = true
+	o.allowlocal = true
+	o.template = "cbi/firewall_zonelist"
+
+
+	o = s:option(Value, "dest_ip", translate("Destination address"))
+	o.datatype = "neg(ipaddr)"
+	o.placeholder = translate("any")
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "dest_port", translate("Destination port"))
+	o.datatype = "list(neg(portrange))"
+	o.placeholder = translate("any")
+
+
+	o = s:option(ListValue, "target", translate("Action"))
+	o.default = "ACCEPT"
+	o:value("DROP", translate("drop"))
+	o:value("ACCEPT", translate("accept"))
+	o:value("REJECT", translate("reject"))
+	o:value("NOTRACK", translate("don't track"))
+
+
+	s:option(Value, "extra",
+		translate("Extra arguments"),
+		translate("Passes additional arguments to iptables. Use with care!"))
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua
new file mode 100644
index 00000000..9bfa66bd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua
@@ -0,0 +1,269 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local ds = require "luci.dispatcher"
+local ft = require "luci.tools.firewall"
+
+m = Map("firewall",
+	translate("Firewall - Traffic Rules"),
+	translate("Traffic rules define policies for packets traveling between \
+		different zones, for example to reject traffic between certain hosts \
+		or to open WAN ports on the router."))
+
+--
+-- Rules
+--
+
+s = m:section(TypedSection, "rule", translate("Traffic Rules"))
+s.addremove = true
+s.anonymous = true
+s.sortable  = true
+s.template = "cbi/tblsection"
+s.extedit   = ds.build_url("admin/network/firewall/rules/%s")
+s.defaults.target = "ACCEPT"
+s.template_addremove = "firewall/cbi_addrule"
+
+
+function s.create(self, section)
+	created = TypedSection.create(self, section)
+end
+
+function s.parse(self, ...)
+	TypedSection.parse(self, ...)
+
+	local i_n = m:formvalue("_newopen.name")
+	local i_p = m:formvalue("_newopen.proto")
+	local i_e = m:formvalue("_newopen.extport")
+	local i_x = m:formvalue("_newopen.submit")
+
+	local f_n = m:formvalue("_newfwd.name")
+	local f_s = m:formvalue("_newfwd.src")
+	local f_d = m:formvalue("_newfwd.dest")
+	local f_x = m:formvalue("_newfwd.submit")
+
+	if i_x then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target",    "ACCEPT")
+		self.map:set(created, "src",       "wan")
+		self.map:set(created, "proto",     (i_p ~= "other") and i_p or "all")
+		self.map:set(created, "dest_port", i_e)
+		self.map:set(created, "name",      i_n)
+
+		if i_p ~= "other" and i_e and #i_e > 0 then
+			created = nil
+		end
+
+	elseif f_x then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target", "ACCEPT")
+		self.map:set(created, "src",    f_s)
+		self.map:set(created, "dest",   f_d)
+		self.map:set(created, "name",   f_n)
+	end
+
+	if created then
+		m.uci:save("firewall")
+		luci.http.redirect(ds.build_url(
+			"admin/network/firewall/rules", created
+		))
+	end
+end
+
+ft.opt_name(s, DummyValue, translate("Name"))
+
+local function rule_proto_txt(self, s)
+	local f = self.map:get(s, "family")
+	local p = ft.fmt_proto(self.map:get(s, "proto"),
+	                       self.map:get(s, "icmp_type")) or translate("traffic")
+
+	if f and f:match("4") then
+		return "%s-%s" %{ translate("IPv4"), p }
+	elseif f and f:match("6") then
+		return "%s-%s" %{ translate("IPv6"), p }
+	else
+		return "%s %s" %{ translate("Any"), p }
+	end
+end
+
+local function rule_src_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "src"), translate("any zone"))
+	local a = ft.fmt_ip(self.map:get(s, "src_ip"), translate("any host"))
+	local p = ft.fmt_port(self.map:get(s, "src_port"))
+	local m = ft.fmt_mac(self.map:get(s, "src_mac"))
+
+	if p and m then
+		return translatef("From %s in %s with source %s and %s", a, z, p, m)
+	elseif p or m then
+		return translatef("From %s in %s with source %s", a, z, p or m)
+	else
+		return translatef("From %s in %s", a, z)
+	end
+end
+
+local function rule_dest_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "dest"))
+	local p = ft.fmt_port(self.map:get(s, "dest_port"))
+
+	-- Forward
+	if z then
+		local a = ft.fmt_ip(self.map:get(s, "dest_ip"), translate("any host"))
+		if p then
+			return translatef("To %s, %s in %s", a, p, z)
+		else
+			return translatef("To %s in %s", a, z)
+		end
+
+	-- Input
+	else
+		local a = ft.fmt_ip(self.map:get(s, "dest_ip"),
+			translate("any router IP"))
+
+		if p then
+			return translatef("To %s at %s on <var>this device</var>", a, p)
+		else
+			return translatef("To %s on <var>this device</var>", a)
+		end
+	end
+end
+
+local function snat_dest_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "dest"), translate("any zone"))
+	local a = ft.fmt_ip(self.map:get(s, "dest_ip"), translate("any host"))
+	local p = ft.fmt_port(self.map:get(s, "dest_port")) or
+		ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if p then
+		return translatef("To %s, %s in %s", a, p, z)
+	else
+		return translatef("To %s in %s", a, z)
+	end
+end
+
+
+match = s:option(DummyValue, "match", translate("Match"))
+match.rawhtml = true
+match.width   = "70%"
+function match.cfgvalue(self, s)
+	return "<small>%s<br />%s<br />%s</small>" % {
+		rule_proto_txt(self, s),
+		rule_src_txt(self, s),
+		rule_dest_txt(self, s)
+	}
+end
+
+target = s:option(DummyValue, "target", translate("Action"))
+target.rawhtml = true
+target.width   = "20%"
+function target.cfgvalue(self, s)
+	local t = ft.fmt_target(self.map:get(s, "target"), self.map:get(s, "dest"))
+	local l = ft.fmt_limit(self.map:get(s, "limit"),
+		self.map:get(s, "limit_burst"))
+
+	if l then
+		return translatef("<var>%s</var> and limit to %s", t, l)
+	else
+		return "<var>%s</var>" % t
+	end
+end
+
+ft.opt_enabled(s, Flag, translate("Enable")).width = "1%"
+
+
+--
+-- SNAT
+--
+
+s = m:section(TypedSection, "redirect",
+	translate("Source NAT"),
+	translate("Source NAT is a specific form of masquerading which allows \
+		fine grained control over the source IP used for outgoing traffic, \
+		for example to map multiple WAN addresses to internal subnets."))
+s.template  = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+s.sortable  = true
+s.extedit   = ds.build_url("admin/network/firewall/rules/%s")
+s.template_addremove = "firewall/cbi_addsnat"
+
+function s.create(self, section)
+	created = TypedSection.create(self, section)
+end
+
+function s.parse(self, ...)
+	TypedSection.parse(self, ...)
+
+	local n = m:formvalue("_newsnat.name")
+	local s = m:formvalue("_newsnat.src")
+	local d = m:formvalue("_newsnat.dest")
+	local a = m:formvalue("_newsnat.dip")
+	local p = m:formvalue("_newsnat.dport")
+	local x = m:formvalue("_newsnat.submit")
+
+	if x and a and #a > 0 then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target",    "SNAT")
+		self.map:set(created, "src",       s)
+		self.map:set(created, "dest",      d)
+		self.map:set(created, "proto",     "all")
+		self.map:set(created, "src_dip",   a)
+		self.map:set(created, "src_dport", p)
+		self.map:set(created, "name",      n)
+	end
+
+	if created then
+		m.uci:save("firewall")
+		luci.http.redirect(ds.build_url(
+			"admin/network/firewall/rules", created
+		))
+	end
+end
+
+function s.filter(self, sid)
+	return (self.map:get(sid, "target") == "SNAT")
+end
+
+ft.opt_name(s, DummyValue, translate("Name"))
+
+match = s:option(DummyValue, "match", translate("Match"))
+match.rawhtml = true
+match.width   = "70%"
+function match.cfgvalue(self, s)
+	return "<small>%s<br />%s<br />%s</small>" % {
+		rule_proto_txt(self, s),
+		rule_src_txt(self, s),
+		snat_dest_txt(self, s)
+	}
+end
+
+snat = s:option(DummyValue, "via", translate("Action"))
+snat.rawhtml = true
+snat.width   = "20%"
+function snat.cfgvalue(self, s)
+	local a = ft.fmt_ip(self.map:get(s, "src_dip"))
+	local p = ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if a and p then
+		return translatef("Rewrite to source %s, %s", a, p)
+	else
+		return translatef("Rewrite to source %s", a or p)
+	end
+end
+
+ft.opt_enabled(s, Flag, translate("Enable")).width = "1%"
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
new file mode 100644
index 00000000..e5bcb34d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -0,0 +1,243 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local nw = require "luci.model.network"
+local fw = require "luci.model.firewall"
+local ds = require "luci.dispatcher"
+local ut = require "luci.util"
+
+local m, p, i, v
+local s, name, net, family, msrc, mdest, log, lim
+local s2, out, inp
+
+
+m = Map("firewall", translate("Firewall - Zone Settings"))
+m.redirect = luci.dispatcher.build_url("admin/network/firewall/zones")
+
+fw.init(m.uci)
+nw.init(m.uci)
+
+
+local zone = fw:get_zone(arg[1])
+if not zone then
+	luci.http.redirect(dsp.build_url("admin/network/firewall/zones"))
+	return
+else
+	m.title = "%s - %s" %{
+		translate("Firewall - Zone Settings"),
+		translatef("Zone %q", zone:name() or "?")
+	}
+end
+
+
+s = m:section(NamedSection, zone.sid, "zone",
+	translatef("Zone %q", zone:name()),
+	translatef("This section defines common properties of %q. \
+		The <em>input</em> and <em>output</em> options set the default \
+		policies for traffic entering and leaving this zone while the \
+		<em>forward</em> option describes the policy for forwarded traffic \
+		between different networks within the zone. \
+		<em>Covered networks</em> specifies which available networks are \
+		members of this zone.", zone:name()))
+
+s.anonymous = true
+s.addremove = false
+
+m.on_commit = function(map)
+	local zone = fw:get_zone(arg[1])
+	if zone then
+		s.section  = zone.sid
+		s2.section = zone.sid
+	end
+end
+
+
+s:tab("general", translate("General Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+
+name = s:taboption("general", Value, "name", translate("Name"))
+name.optional = false
+name.forcewrite = true
+name.datatype = "uciname"
+
+function name.write(self, section, value)
+	if zone:name() ~= value then
+		fw:rename_zone(zone:name(), value)
+		out.exclude = value
+		inp.exclude = value
+	end
+
+	m.redirect = ds.build_url("admin/network/firewall/zones", value)
+	m.title = "%s - %s" %{
+		translate("Firewall - Zone Settings"),
+		translatef("Zone %q", value or "?")
+	}
+end
+
+p = {
+	s:taboption("general", ListValue, "input", translate("Input")),
+	s:taboption("general", ListValue, "output", translate("Output")),
+	s:taboption("general", ListValue, "forward", translate("Forward"))
+}
+
+for i, v in ipairs(p) do
+	v:value("REJECT", translate("reject"))
+	v:value("DROP", translate("drop"))
+	v:value("ACCEPT", translate("accept"))
+end
+
+s:taboption("general", Flag, "masq", translate("Masquerading"))
+s:taboption("general", Flag, "mtu_fix", translate("MSS clamping"))
+
+net = s:taboption("general", Value, "network", translate("Covered networks"))
+net.template = "cbi/network_netlist"
+net.widget = "checkbox"
+net.cast = "string"
+
+function net.formvalue(self, section)
+	return Value.formvalue(self, section) or "-"
+end
+
+function net.cfgvalue(self, section)
+	return Value.cfgvalue(self, section) or name:cfgvalue(section)
+end
+
+function net.write(self, section, value)
+	zone:clear_networks()
+
+	local n
+	for n in ut.imatch(value) do
+		zone:add_network(n)
+	end
+end
+
+
+family = s:taboption("advanced", ListValue, "family",
+	translate("Restrict to address family"))
+
+family.rmempty = true
+family:value("", translate("IPv4 and IPv6"))
+family:value("ipv4", translate("IPv4 only"))
+family:value("ipv6", translate("IPv6 only"))
+
+msrc = s:taboption("advanced", DynamicList, "masq_src",
+	translate("Restrict Masquerading to given source subnets"))
+
+msrc.optional = true
+msrc.datatype = "list(neg(or(uciname,hostname,ip4addr)))"
+msrc.placeholder = "0.0.0.0/0"
+msrc:depends("family", "")
+msrc:depends("family", "ipv4")
+
+mdest = s:taboption("advanced", DynamicList, "masq_dest",
+	translate("Restrict Masquerading to given destination subnets"))
+
+mdest.optional = true
+mdest.datatype = "list(neg(or(uciname,hostname,ip4addr)))"
+mdest.placeholder = "0.0.0.0/0"
+mdest:depends("family", "")
+mdest:depends("family", "ipv4")
+
+s:taboption("advanced", Flag, "conntrack",
+	translate("Force connection tracking"))
+
+log = s:taboption("advanced", Flag, "log",
+	translate("Enable logging on this zone"))
+
+log.rmempty = true
+log.enabled = "1"
+
+lim = s:taboption("advanced", Value, "log_limit",
+	translate("Limit log messages"))
+
+lim.placeholder = "10/minute"
+lim:depends("log", "1")
+
+
+s2 = m:section(NamedSection, zone.sid, "fwd_out",
+	translate("Inter-Zone Forwarding"),
+	translatef("The options below control the forwarding policies between \
+		this zone (%s) and other zones. <em>Destination zones</em> cover \
+		forwarded traffic <strong>originating from %q</strong>. \
+		<em>Source zones</em> match forwarded traffic from other zones \
+		<strong>targeted at %q</strong>. The forwarding rule is \
+		<em>unidirectional</em>, e.g. a forward from lan to wan does \
+		<em>not</em> imply a permission to forward from wan to lan as well.",
+		zone:name(), zone:name(), zone:name()
+
+	))
+
+out = s2:option(Value, "out",
+	translate("Allow forward to <em>destination zones</em>:"))
+
+out.nocreate = true
+out.widget = "checkbox"
+out.exclude = zone:name()
+out.template = "cbi/firewall_zonelist"
+
+inp = s2:option(Value, "in",
+	translate("Allow forward from <em>source zones</em>:"))
+
+inp.nocreate = true
+inp.widget = "checkbox"
+inp.exclude = zone:name()
+inp.template = "cbi/firewall_zonelist"
+
+function out.cfgvalue(self, section)
+	local v = { }
+	local f
+	for _, f in ipairs(zone:get_forwardings_by("src")) do
+		v[#v+1] = f:dest()
+	end
+	return table.concat(v, " ")
+end
+
+function inp.cfgvalue(self, section)
+	local v = { }
+	local f
+	for _, f in ipairs(zone:get_forwardings_by("dest")) do
+		v[#v+1] = f:src()
+	end
+	return v
+end
+
+function out.formvalue(self, section)
+	return Value.formvalue(self, section) or "-"
+end
+
+function inp.formvalue(self, section)
+	return Value.formvalue(self, section) or "-"
+end
+
+function out.write(self, section, value)
+	zone:del_forwardings_by("src")
+
+	local f
+	for f in ut.imatch(value) do
+		zone:add_forwarding_to(f)
+	end
+end
+
+function inp.write(self, section, value)
+	zone:del_forwardings_by("dest")
+
+	local f
+	for f in ut.imatch(value) do
+		zone:add_forwarding_from(f)
+	end
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zones.lua b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zones.lua
new file mode 100644
index 00000000..e6d8548b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/model/cbi/firewall/zones.lua
@@ -0,0 +1,88 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local ds = require "luci.dispatcher"
+local fw = require "luci.model.firewall"
+
+local m, s, o, p, i, v
+
+m = Map("firewall",
+	translate("Firewall - Zone Settings"),
+	translate("The firewall creates zones over your network interfaces to control network traffic flow."))
+
+fw.init(m.uci)
+
+s = m:section(TypedSection, "defaults", translate("General Settings"))
+s.anonymous = true
+s.addremove = false
+
+s:option(Flag, "syn_flood", translate("Enable SYN-flood protection"))
+
+o = s:option(Flag, "drop_invalid", translate("Drop invalid packets"))
+o.default = o.disabled
+
+p = {
+	s:option(ListValue, "input", translate("Input")),
+	s:option(ListValue, "output", translate("Output")),
+	s:option(ListValue, "forward", translate("Forward"))
+}
+
+for i, v in ipairs(p) do
+	v:value("REJECT", translate("reject"))
+	v:value("DROP", translate("drop"))
+	v:value("ACCEPT", translate("accept"))
+end
+
+
+s = m:section(TypedSection, "zone", translate("Zones"))
+s.template = "cbi/tblsection"
+s.anonymous = true
+s.addremove = true
+s.extedit   = ds.build_url("admin", "network", "firewall", "zones", "%s")
+
+function s.create(self)
+	local z = fw:new_zone()
+	if z then
+		luci.http.redirect(
+			ds.build_url("admin", "network", "firewall", "zones", z.sid)
+		)
+	end
+end
+
+function s.remove(self, section)
+	return fw:del_zone(section)
+end
+
+o = s:option(DummyValue, "_info", translate("Zone ⇒ Forwardings"))
+o.template = "cbi/firewall_zoneforwards"
+o.cfgvalue = function(self, section)
+	return self.map:get(section, "name")
+end
+
+p = {
+	s:option(ListValue, "input", translate("Input")),
+	s:option(ListValue, "output", translate("Output")),
+	s:option(ListValue, "forward", translate("Forward"))
+}
+
+for i, v in ipairs(p) do
+	v:value("REJECT", translate("reject"))
+	v:value("DROP", translate("drop"))
+	v:value("ACCEPT", translate("accept"))
+end
+
+s:option(Flag, "masq", translate("Masquerading"))
+s:option(Flag, "mtu_fix", translate("MSS clamping"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/tools/firewall.lua b/trunk/package/luci/applications/luci-firewall/luasrc/tools/firewall.lua
new file mode 100644
index 00000000..07162cba
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/tools/firewall.lua
@@ -0,0 +1,289 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.tools.firewall", package.seeall)
+
+local ut = require "luci.util"
+local ip = require "luci.ip"
+local nx = require "nixio"
+
+local translate, translatef = luci.i18n.translate, luci.i18n.translatef
+
+local function tr(...)
+	return tostring(translate(...))
+end
+
+function fmt_neg(x)
+	if type(x) == "string" then
+		local v, neg = x:gsub("^ *! *", "")
+		if neg > 0 then
+			return v, "%s " % tr("not")
+		else
+			return x, ""
+		end
+	end
+	return x, ""
+end
+
+function fmt_mac(x)
+	if x and #x > 0 then
+		local m, n
+		local l = { tr("MAC"), " " }
+		for m in ut.imatch(x) do
+			m, n = fmt_neg(m)
+			l[#l+1] = "<var>%s%s</var>" %{ n, m }
+			l[#l+1] = ", "
+		end
+		if #l > 1 then
+			l[#l] = nil
+			if #l > 3 then
+				l[1] = tr("MACs")
+			end
+			return table.concat(l, "")
+		end
+	end
+end
+
+function fmt_port(x, d)
+	if x and #x > 0 then
+		local p, n
+		local l = { tr("port"), " " }
+		for p in ut.imatch(x) do
+			p, n = fmt_neg(p)
+			local a, b = p:match("(%d+)%D+(%d+)")
+			if a and b then
+				l[1] = tr("ports")
+				l[#l+1] = "<var>%s%d-%d</var>" %{ n, a, b }
+			else
+				l[#l+1] = "<var>%s%d</var>" %{ n, p }
+			end
+			l[#l+1] = ", "
+		end
+		if #l > 1 then
+			l[#l] = nil
+			if #l > 3 then
+				l[1] = tr("ports")
+			end
+			return table.concat(l, "")
+		end
+	end
+	return d and "<var>%s</var>" % d
+end
+
+function fmt_ip(x, d)
+	if x and #x > 0 then
+		local l = { tr("IP"), " " }
+		local v, a, n
+		for v in ut.imatch(x) do
+			v, n = fmt_neg(v)
+			a, m = v:match("(%S+)/(%d+%.%S+)")
+			a = a or v
+			a = a:match(":") and ip.IPv6(a, m) or ip.IPv4(a, m)
+			if a and (a:is6() and a:prefix() < 128 or a:prefix() < 32) then
+				l[1] = tr("IP range")
+				l[#l+1] = "<var title='%s - %s'>%s%s</var>" %{
+					a:minhost():string(),
+					a:maxhost():string(),
+					n, a:string()
+				}
+			else
+				l[#l+1] = "<var>%s%s</var>" %{
+					n,
+					a and a:string() or v
+				}
+			end
+			l[#l+1] = ", "
+		end
+		if #l > 1 then
+			l[#l] = nil
+			if #l > 3 then
+				l[1] = tr("IPs")
+			end
+			return table.concat(l, "")
+		end
+	end
+	return d and "<var>%s</var>" % d
+end
+
+function fmt_zone(x, d)
+	if x == "*" then
+		return "<var>%s</var>" % tr("any zone")
+	elseif x and #x > 0 then
+		return "<var>%s</var>" % x
+	elseif d then
+		return "<var>%s</var>" % d
+	end
+end
+
+function fmt_icmp_type(x)
+	if x and #x > 0 then
+		local t, v, n
+		local l = { tr("type"), " " }
+		for v in ut.imatch(x) do
+			v, n = fmt_neg(v)
+			l[#l+1] = "<var>%s%s</var>" %{ n, v }
+			l[#l+1] = ", "
+		end
+		if #l > 1 then
+			l[#l] = nil
+			if #l > 3 then
+				l[1] = tr("types")
+			end
+			return table.concat(l, "")
+		end
+	end
+end
+
+function fmt_proto(x, icmp_types)
+	if x and #x > 0 then
+		local v, n
+		local l = { }
+		local t = fmt_icmp_type(icmp_types)
+		for v in ut.imatch(x) do
+			v, n = fmt_neg(v)
+			if v == "tcpudp" then
+				l[#l+1] = "TCP"
+				l[#l+1] = ", "
+				l[#l+1] = "UDP"
+				l[#l+1] = ", "
+			elseif v ~= "all" then
+				local p = nx.getproto(v)
+				if p then
+					-- ICMP
+					if (p.proto == 1 or p.proto == 58) and t then
+						l[#l+1] = translatef(
+							"%s%s with %s",
+							n, p.aliases[1] or p.name, t
+						)
+					else
+						l[#l+1] = "%s%s" %{
+							n,
+							p.aliases[1] or p.name
+						}
+					end
+					l[#l+1] = ", "
+				end
+			end
+		end
+		if #l > 0 then
+			l[#l] = nil
+			return table.concat(l, "")
+		end
+	end
+end
+
+function fmt_limit(limit, burst)
+	burst = tonumber(burst)
+	if limit and #limit > 0 then
+		local l, u = limit:match("(%d+)/(%w+)")
+		l = tonumber(l or limit)
+		u = u or "second"
+		if l then
+			if u:match("^s") then
+				u = tr("second")
+			elseif u:match("^m") then
+				u = tr("minute")
+			elseif u:match("^h") then
+				u = tr("hour")
+			elseif u:match("^d") then
+				u = tr("day")
+			end
+			if burst and burst > 0 then
+				return translatef("<var>%d</var> pkts. per <var>%s</var>, \
+				    burst <var>%d</var> pkts.", l, u, burst)
+			else
+				return translatef("<var>%d</var> pkts. per <var>%s</var>", l, u)
+			end
+		end
+	end
+end
+
+function fmt_target(x, dest)
+	if dest and #dest > 0 then
+		if x == "ACCEPT" then
+			return tr("Accept forward")
+		elseif x == "REJECT" then
+			return tr("Refuse forward")
+		elseif x == "NOTRACK" then
+			return tr("Do not track forward")
+		else --if x == "DROP" then
+			return tr("Discard forward")
+		end
+	else
+		if x == "ACCEPT" then
+			return tr("Accept input")
+		elseif x == "REJECT" then
+			return tr("Refuse input")
+		elseif x == "NOTRACK" then
+			return tr("Do not track input")
+		else --if x == "DROP" then
+			return tr("Discard input")
+		end
+	end
+end
+
+
+function opt_enabled(s, t, ...)
+	if t == luci.cbi.Button then
+		local o = s:option(t, "__enabled")
+		function o.render(self, section)
+			if self.map:get(section, "enabled") ~= "0" then
+				self.title      = tr("Rule is enabled")
+				self.inputtitle = tr("Disable")
+				self.inputstyle = "reset"
+			else
+				self.title      = tr("Rule is disabled")
+				self.inputtitle = tr("Enable")
+				self.inputstyle = "apply"
+			end
+			t.render(self, section)
+		end
+		function o.write(self, section, value)
+			if self.map:get(section, "enabled") ~= "0" then
+				self.map:set(section, "enabled", "0")
+			else
+				self.map:del(section, "enabled")
+			end
+		end
+		return o
+	else
+		local o = s:option(t, "enabled", ...)
+		o.default = "1"
+		return o
+	end
+end
+
+function opt_name(s, t, ...)
+	local o = s:option(t, "name", ...)
+
+	function o.cfgvalue(self, section)
+		return self.map:get(section, "name") or
+			self.map:get(section, "_name") or "-"
+	end
+
+	function o.write(self, section, value)
+		if value ~= "-" then
+			self.map:set(section, "name", value)
+			self.map:del(section, "_name")
+		else
+			self:remove(section)
+		end
+	end
+
+	function o.remove(self, section)
+		self.map:del(section, "name")
+		self.map:del(section, "_name")
+	end
+
+	return o
+end
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addforward.htm b/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addforward.htm
new file mode 100644
index 00000000..3726f643
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addforward.htm
@@ -0,0 +1,115 @@
+<%-
+	local fw = require "luci.model.firewall".init()
+	local izl = { }
+	local ezl = { }
+	local _, z
+	for _, z in ipairs(fw:get_zones()) do
+		if z:name() ~= "wan" then
+			izl[#izl+1] = z
+		elseif z:name() ~= "lan" then
+			ezl[#ezl+1] = z
+		end
+	end
+-%>
+<div class="cbi-section-create cbi-tblsection-create">
+	<br />
+	<table class="cbi-section-table" style="width:810px; margin-left:5px">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell" colspan="8"><%:New port forward%>:</th>
+		</tr>
+		<tr class="cbi-section-table-descr">
+			<th class="cbi-section-table-cell"><%:Name%></th>
+			<th class="cbi-section-table-cell"><%:Protocol%></th>
+			<th class="cbi-section-table-cell"><%:External zone%></th>
+			<th class="cbi-section-table-cell"><%:External port%></th>
+			<th class="cbi-section-table-cell"><%:Internal zone%></th>
+			<th class="cbi-section-table-cell"><%:Internal IP address%></th>
+			<th class="cbi-section-table-cell"><%:Internal port%></th>
+			<th class="cbi-section-table-cell"></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td class="cbi-section-table-cell">
+				<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New port forward%>" />
+			</td>
+			<td class="cbi-section-table-cell" style="width:110px">
+				<select class="cbi-input-select" id="_newfwd.proto" name="_newfwd.proto">
+					<option value="tcp udp">TCP+UDP</option>
+					<option value="tcp">TCP</option>
+					<option value="udp">UDP</option>
+					<option value="other"><%:Other...%></option>
+				</select>
+			</td>
+			<td class="cbi-section-table-cell" style="width:55px">
+				<select class="cbi-input-select" id="_newfwd.extzone" name="_newfwd.extzone">
+					<% for _, z in ipairs(ezl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
+				</select>
+			</td>
+			<td class="cbi-section-table-cell" style="width:110px">
+				<input type="text" class="cbi-input-text" id="_newfwd.extport" name="_newfwd.extport" />
+			</td>
+			<td class="cbi-section-table-cell" style="width:55px">
+				<select class="cbi-input-select" id="_newfwd.intzone" name="_newfwd.intzone">
+					<% for _, z in ipairs(izl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
+				</select>
+			</td>
+			<td class="cbi-section-table-cell" style="width:110px">
+				<input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" />
+			</td>
+			<td class="cbi-section-table-cell" style="width:110px">
+				<input type="text" class="cbi-input-text" id="_newfwd.intport" name="_newfwd.intport" />
+			</td>
+			<td class="cbi-section-table-cell">
+				<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+			</td>
+		</tr>
+	</table>
+
+	<script type="text/javascript">//<![CDATA[
+		cbi_validate_field('_newfwd.extport', true, 'portrange');
+		cbi_validate_field('_newfwd.intaddr', true, 'host');
+		cbi_validate_field('_newfwd.intport', true, 'portrange');
+
+		cbi_combobox_init('_newfwd.intaddr', {
+			<% first = true; luci.sys.net.ipv4_hints(function(ip, name) %>
+				<%- if first then first = false else %>,<% end -%>'<%=ip%>': '<%=ip%> (<%=name%>)'
+			<%- end) %> }, '', '<%: -- custom -- %>');
+
+		cbi_bind(document.getElementById('_newfwd.extport'), 'blur',
+			function() {
+				var n = document.getElementById('_newfwd.name');
+				var p = document.getElementById('_newfwd.proto');
+				var i = document.getElementById('_newfwd.intport');
+				var hints = {
+				/*  port    name     0=both, 1=tcp, 2=udp, 3=other */
+					21:   [ 'FTP',   1 ],
+					22:   [ 'SSH',   1 ],
+					53:   [ 'DNS',   0 ],
+					80:   [ 'HTTP',  1 ],
+					443:  [ 'HTTPS', 1 ],
+					3389: [ 'RDP',   1 ],
+					5900: [ 'VNC',   1 ],
+				};
+
+				if (!this.className.match(/invalid/))
+				{
+					if (!i.value) i.value = this.value;
+
+					var hint = hints[this.value || 0] || hints[i.value || 0];
+					if (hint)
+					{
+						p.selectedIndex = hint[1];
+
+						if (!n.value)
+							n.value = hint[0];
+					}
+					else if (!n.value)
+					{
+						n.value = 'Forward' + this.value;
+					}
+				}
+			});
+
+
+		cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname');
+	//]]></script>
+</div>
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm b/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm
new file mode 100644
index 00000000..463b2e05
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm
@@ -0,0 +1,112 @@
+<%
+	local fw = require "luci.model.firewall".init()
+	local wz = fw:get_zone("wan")
+	local lz = fw:get_zone("lan")
+%>
+
+<div class="cbi-section-create cbi-tblsection-create">
+	<% if wz and lz then %>
+		<br />
+		<table class="cbi-section-table" style="margin-left:5px">
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell left" colspan="4"><%:Open ports on router%>:</th>
+			</tr>
+			<tr class="cbi-section-table-descr">
+				<th class="cbi-section-table-cell"><%:Name%></th>
+				<th class="cbi-section-table-cell"><%:Protocol%></th>
+				<th class="cbi-section-table-cell"><%:External port%></th>
+				<th class="cbi-section-table-cell"></th>
+			</tr>
+			<tr class="cbi-section-table-row">
+				<td class="cbi-section-table-cell" style="width:130px">
+					<input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
+						<option value="tcp udp">TCP+UDP</option>
+						<option value="tcp">TCP</option>
+						<option value="udp">UDP</option>
+						<option value="other"><%:Other...%></option>
+					</select>
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
+				</td>
+				<td class="cbi-section-table-cell left">
+					<input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
+				</td>
+			</tr>
+		</table>
+
+		<table class="cbi-section-table" style="margin-left:5px">
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell left" colspan="6"><br /><%:New forward rule%>:</th>
+			</tr>
+			<tr class="cbi-section-table-descr">
+				<th class="cbi-section-table-cell"><%:Name%></th>
+				<th class="cbi-section-table-cell"><%:Source zone%></th>
+				<th class="cbi-section-table-cell"><%:Destination zone%></th>
+				<th class="cbi-section-table-cell"></th>
+			</tr>
+			<tr class="cbi-section-table-row">
+				<td class="cbi-section-table-cell" style="width:130px">
+					<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
+						<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+							<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+						<%- end %>
+					</select>
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
+						<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+							<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+						<%- end %>
+					</select>
+				</td>
+				<td class="cbi-section-table-cell left">
+					<input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
+				</td>
+			</tr>
+		</table>
+
+		<script type="text/javascript">//<![CDATA[
+			cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
+			cbi_bind(document.getElementById('_newopen.extport'), 'blur',
+				function() {
+					var n = document.getElementById('_newopen.name');
+					var p = document.getElementById('_newopen.proto');
+					var hints = {
+					/*  port    name     0=both, 1=tcp, 2=udp, 3=other */
+						22:   [ 'SSH',   1 ],
+						53:   [ 'DNS',   0 ],
+						80:   [ 'HTTP',  1 ],
+						443:  [ 'HTTPS', 1 ],
+					};
+
+					if (!this.className.match(/invalid/))
+					{
+						var hint = hints[this.value || 0];
+						if (hint)
+						{
+							p.selectedIndex = hint[1];
+
+							if (!n.value)
+								n.value = hint[0];
+						}
+						else if (!n.value && this.value)
+						{
+							n.value = 'Open' + this.value;
+						}
+					}
+				});
+
+
+			cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname');
+		//]]></script>
+	<% else %>
+		<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+	<% end %>
+</div>
diff --git a/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm b/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm
new file mode 100644
index 00000000..4e1681c1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm
@@ -0,0 +1,66 @@
+<%
+	local fw = require "luci.model.firewall".init()
+	local nw = require "luci.model.network".init()
+	local wz = fw:get_zone("wan")
+	local lz = fw:get_zone("lan")
+%>
+
+<div class="cbi-section-create cbi-tblsection-create">
+	<% if wz and lz then %>
+		<br />
+		<table class="cbi-section-table" style="width:700px; margin-left:5px">
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell left" colspan="6"><%:New source NAT%>:</th>
+			</tr>
+			<tr class="cbi-section-table-descr">
+				<th class="cbi-section-table-cell"><%:Name%></th>
+				<th class="cbi-section-table-cell"><%:Source zone%></th>
+				<th class="cbi-section-table-cell"><%:Destination zone%></th>
+				<th class="cbi-section-table-cell"><%:To source IP%></th>
+				<th class="cbi-section-table-cell"><%:To source port%></th>
+				<th class="cbi-section-table-cell"></th>
+			</tr>
+			<tr class="cbi-section-table-row">
+				<td class="cbi-section-table-cell">
+					<input type="text" class="cbi-input-text" id="_newsnat.name" name="_newsnat.name" placeholder="<%:New SNAT rule%>" />
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<select class="cbi-input-text" id="_newsnat.src" name="_newsnat.src">
+						<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+							<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+						<%- end %>
+					</select>
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<select class="cbi-input-text" id="_newsnat.dest" name="_newsnat.dest">
+						<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+							<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+						<%- end %>
+					</select>
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" />
+				</td>
+				<td class="cbi-section-table-cell" style="width:110px">
+					<input type="text" class="cbi-input-text" id="_newsnat.dport" name="_newsnat.dport" placeholder="<%:Do not rewrite%>" />
+				</td>
+				<td class="cbi-section-table-cell">
+					<input type="submit" class="cbi-button cbi-button-link" name="_newsnat.submit" value="<%:Add and edit...%>" />
+				</td>
+			</tr>
+		</table>
+
+		<script type="text/javascript">//<![CDATA[
+			cbi_validate_field('_newsnat.dport', true, 'portrange');
+			cbi_validate_field('_newsnat.dip', true, 'ip4addr');
+			cbi_combobox_init('_newsnat.dip', {
+				<% local c, k, v = 0; for k, v in ipairs(nw:get_interfaces()) do -%>
+					<%- local a; for k, a in ipairs(v:ipaddrs()) do c = c + 1 -%>
+						<% if c > 1 then %>,<% end %>'<%=a:host():string()%>': '<%=a:host():string()%> (<%=v:shortname()%>)'
+					<%- end %>
+				<%- end %> }, '<%: -- Please choose -- %>', '<%: -- custom -- %>');
+		//]]></script>
+	<% else %>
+		<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+	<% end %>
+</div>
diff --git a/trunk/package/luci/applications/luci-freifunk-diagnostics/Makefile b/trunk/package/luci/applications/luci-freifunk-diagnostics/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-diagnostics/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-freifunk-diagnostics/ipkg/postinst b/trunk/package/luci/applications/luci-freifunk-diagnostics/ipkg/postinst
new file mode 100644
index 00000000..cc814c36
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-diagnostics/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-freifunk-diagnostics ) && rm -f /etc/uci-defaults/luci-freifunk-diagnostics
+}
diff --git a/trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua b/trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
new file mode 100644
index 00000000..2a5db675
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua
@@ -0,0 +1,82 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2013 Manuel Munz <freifunk@somakoma.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.freifunk.diag", package.seeall)
+
+function index()
+	local uci = require("luci.model.uci").cursor()
+	local page
+	page = node("freifunk", "status", "diagnostics")
+	page.target = template("freifunk/diagnostics")
+	page.title  = _("Diagnostics")
+	page.order  = 60
+
+	page = entry({"freifunk", "status", "diag_ping"}, call("diag_ping"), nil)
+	page.leaf = true
+
+	page = entry({"freifunk", "status", "diag_nslookup"}, call("diag_nslookup"), nil)
+	page.leaf = true
+
+	page = entry({"freifunk", "status", "diag_traceroute"}, call("diag_traceroute"), nil)
+	page.leaf = true
+
+	page = entry({"freifunk", "status", "diag_ping6"}, call("diag_ping6"), nil)
+	page.leaf = true
+
+	page = entry({"freifunk", "status", "diag_traceroute6"}, call("diag_traceroute6"), nil)
+	page.leaf = true
+end
+
+function diag_command(cmd, addr)
+	if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
+		luci.http.prepare_content("text/plain")
+
+		local util = io.popen(cmd % addr)
+		if util then
+			while true do
+				local ln = util:read("*l")
+				if not ln then break end
+				luci.http.write(ln)
+				luci.http.write("\n")
+			end
+
+			util:close()
+		end
+
+		return
+	end
+
+	luci.http.status(500, "Bad address")
+end
+
+function diag_ping(addr)
+	diag_command("ping -c 5 -W 1 %q 2>&1", addr)
+end
+
+function diag_traceroute(addr)
+	diag_command("traceroute -q 1 -w 1 -n %q 2>&1", addr)
+end
+
+function diag_nslookup(addr)
+	diag_command("nslookup %q 2>&1", addr)
+end
+
+function diag_ping6(addr)
+	diag_command("ping6 -c 5 %q 2>&1", addr)
+end
+
+function diag_traceroute6(addr)
+	diag_command("traceroute6 -q 1 -w 2 -n %q 2>&1", addr)
+end
diff --git a/trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm b/trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
new file mode 100644
index 00000000..14706730
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
@@ -0,0 +1,120 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<%
+local fs   = require "nixio.fs"
+local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6")
+local has_traceroute6 = fs.access("/usr/bin/traceroute6")
+%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var stxhr = new XHR();
+
+	function update_status(field, proto)
+	{
+		var tool = field.name;
+		var addr = field.value;
+		var protocol = proto ? "6" : "";
+
+		var legend = document.getElementById('diag-rc-legend');
+		var output = document.getElementById('diag-rc-output');
+
+		if (legend && output)
+		{
+			output.innerHTML =
+				'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
+				'<%:Waiting for command to complete...%>'
+			;
+
+			legend.parentNode.style.display = 'block';
+			legend.style.display = 'inline';
+
+			stxhr.get('<%=luci.dispatcher.build_url("freifunk", "status")%>/diag_' + tool + protocol + '/' + addr, null,
+				function(x)
+				{
+					if (x.responseText)
+					{
+						legend.style.display = 'none';
+						output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
+					}
+					else
+					{
+						legend.style.display = 'none';
+						output.innerHTML = '<span class="error"><%:Bad address specified!%></span>';
+					}
+				}
+			);
+		}
+	}
+//]]></script>
+
+<form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
+	<div class="cbi-map">
+		<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+
+		<fieldset class="cbi-section">
+			<legend><%:Network Utilities%></legend>
+
+			<br />
+
+			<div style="width:30%; float:left">
+				<input style="margin: 5px 0" type="text" value="librecmc.org" name="ping" /><br />
+				<% if has_ping6 then %>
+				<select name="ping_proto" style="width:auto">
+					<option value="" selected="selected"><%:IPv4%></option>
+					<option value="6"><%:IPv6%></option>
+				</select>
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping, this.form.ping_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
+				<% end %>
+			</div>
+
+			<div style="width:33%; float:left">
+				<input style="margin: 5px 0" type="text" value="librecmc.org" name="traceroute" /><br />
+				<% if has_traceroute6 then %>
+				<select name="traceroute_proto" style="width:auto">
+					<option value="" selected="selected"><%:IPv4%></option>
+					<option value="6"><%:IPv6%></option>
+				</select>
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute, this.form.traceroute_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
+				<% end %>
+				<% if not has_traceroute6 then %>
+					<p>&#160;</p>
+					<p><%:Install iputils-traceroute6 for IPv6 traceroute%></p>
+				<% end %>
+			</div>
+
+			<div style="width:33%; float:left;">
+				<input style="margin: 5px 0" type="text" value="librecmc.org" name="nslookup" /><br />
+				<input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
+			</div>
+
+			<br style="clear:both" /><br />
+
+		</fieldset>
+	</div>
+
+	<fieldset class="cbi-section" style="display:none">
+		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
+		<span id="diag-rc-output"></span>
+	</fieldset>
+</form>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics b/trunk/package/luci/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics
new file mode 100644
index 00000000..963d8a4e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics
@@ -0,0 +1,2 @@
+#!/bin/sh
+rm -f /tmp/luci-indexcache
diff --git a/trunk/package/luci/applications/luci-freifunk-policyrouting/Makefile b/trunk/package/luci/applications/luci-freifunk-policyrouting/Makefile
new file mode 100644
index 00000000..3efa329b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-policyrouting/Makefile
@@ -0,0 +1,4 @@
+PO = freifunk-policyrouting
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua b/trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua
new file mode 100644
index 00000000..ec087d93
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua
@@ -0,0 +1,18 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+module "luci.controller.freifunk.policy-routing"
+
+function index()
+	entry({"admin", "freifunk", "policyrouting"}, cbi("freifunk/policyrouting"),
+		_("Policy Routing"), 60)
+end
diff --git a/trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua b/trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua
new file mode 100644
index 00000000..f7f04677
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua
@@ -0,0 +1,43 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local uci = require "luci.model.uci".cursor()
+
+m = Map("freifunk-policyrouting", translate("Policy Routing"), translate("These pages can be used to setup policy routing for certain firewall zones. "..
+	"This is useful if you need to use your own internet connection for yourself but you don't want to share it with others (thats why it can also be "..
+	"called 'Ego Mode'). Your own traffic is then sent via your internet connection while traffic originating from the mesh will use another gateway in the mesh. "))
+m:chain("network")
+
+c = m:section(NamedSection, "pr", "settings", "")
+
+local pr = c:option(Flag, "enable", translate("Enable Policy Routing"))
+pr.rmempty = false
+
+local strict = c:option(Flag, "strict", translate("Strict Filtering"), translate("If no default route is received from the mesh network then traffic which belongs to "..
+	"the selected firewall zones is routed via your internet connection as a fallback. If you do not want this and instead block that traffic then you should "..
+	"select this option."))
+strict.rmempty = false
+
+local fallback = c:option(Flag, "fallback", translate("Fallback to mesh"),
+	translate("If your own gateway is not available then fallback to the mesh default gateway."))
+strict.rmempty = false
+
+local zones = c:option(MultiValue, "zones", translate("Firewall zones"), translate("All traffic from interfaces belonging to these zones will be sent via "..
+	"a gateway in the mesh network."))
+uci:foreach("firewall", "zone", function(section)
+	local name = section.name
+	if not (name == "wan") then
+		zones:value(name)
+	end
+end)
+
+return m
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/Makefile b/trunk/package/luci/applications/luci-freifunk-widgets/Makefile
new file mode 100644
index 00000000..a386a320
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/Makefile
@@ -0,0 +1,4 @@
+PO = freifunk-widgets
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/controller/freifunk/widgets.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/controller/freifunk/widgets.lua
new file mode 100644
index 00000000..5bbd53f5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/controller/freifunk/widgets.lua
@@ -0,0 +1,44 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+local require = require
+module "luci.controller.freifunk.widgets"
+
+
+function index()
+
+	local page  = node("admin", "freifunk", "widgets")
+	page.target = cbi("freifunk/widgets/widgets_overview")
+	page.title  = _("Widgets")
+	page.i18n   = "widgets"
+	page.order  = 30
+
+	local page  = node("admin", "freifunk", "widgets", "widget")
+	page.target = cbi("freifunk/widgets/widget")
+	page.leaf  = true
+
+	local page  = node("freifunk", "search_redirect")
+	page.target = call("search_redirect")
+	page.leaf  = true
+end
+
+function search_redirect()
+	local dsp = require "luci.dispatcher"
+	local http = require "luci.http"
+	local engine = http.formvalue("engine")
+	local searchterms = http.formvalue("searchterms") or ""
+	if engine then
+		http.redirect(engine .. searchterms)
+	else
+		http.redirect(dsp.build_url())
+	end
+end
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua
new file mode 100644
index 00000000..b572187b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local map, section = ...
+
+local width = wdg:option(Value, "width", translate("Width"))
+width.rmempty = true
+
+--[[
+local height = wdg:option(Value, "height", translate("Height"))
+height.rmempty = true
+height.optional = true
+]]--
+
+local pr = wdg:option(Value, "paddingright", translate("Padding right"))
+pr.rmempty = true
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua
new file mode 100644
index 00000000..367e8a26
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua
@@ -0,0 +1,41 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local map, section = ...
+local utl = require "luci.util"
+local fs = require "nixio.fs"
+local file = "/usr/share/customtext/" .. arg[1] .. ".html"
+
+local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua")
+if form then
+	setfenv(form, getfenv(1))(m, wdg)
+end
+
+t = wdg:option(TextValue, "_text")
+t.rmempty = true
+t.rows = 20
+
+
+function t.cfgvalue()
+        return fs.readfile(file) or ""
+end
+
+function t.write(self, section, value)
+        return fs.writefile(file, value)
+end
+
+function t.remove(self, section)
+        return fs.unlink(file)
+end
+
+
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua
new file mode 100644
index 00000000..b9cbcaee
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua
@@ -0,0 +1,23 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local map, section = ...
+local utl = require "luci.util"
+
+local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua")
+if form then
+	setfenv(form, getfenv(1))(m, wdg)
+end
+
+local url = wdg:option(Value, "url", translate("URL"))
+url.default = "http://www.freifunk.net"
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua
new file mode 100644
index 00000000..5df5a346
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua
@@ -0,0 +1,35 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local map, section = ...
+local utl = require "luci.util"
+
+local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua")
+if form then
+	setfenv(form, getfenv(1))(m, wdg)
+end
+
+local url = wdg:option(Value, "url", translate("URL"))
+url.default = "http://global.freifunk.net/rss/all/rss.xml"
+
+local max = wdg:option(Value, "max", translate("Maximal entries to show"))
+max.rmempty = true
+max.default = "10"
+max.datatype = "integer"
+
+local cache = wdg:option(Value, "cache", translate("Cache Time"), translate("Cache downloaded feed for that many seconds."))
+cache.rmempty = true
+cache.default = "3600"
+cache.datatype = "integer"
+
+
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua
new file mode 100644
index 00000000..735dc7cd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local map, section = ...
+local utl = require "luci.util"
+
+local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua")
+if form then
+	setfenv(form, getfenv(1))(m, wdg)
+end
+
+local engine = wdg:option(DynamicList, "engine", translate("Search Engine"),
+	translate("Use the form Name|URL, where URL must be a full URL to the search engine "  ..
+		  "including the query GET parameter, e.g. 'Google|http://www.google.de/search?q='")
+	)
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua
new file mode 100644
index 00000000..5adfc8f8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua
@@ -0,0 +1,48 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+
+local uci = require "luci.model.uci".cursor()
+local dsp = require "luci.dispatcher"
+local utl = require "luci.util"
+local widget = uci:get("freifunk-widgets", arg[1], "template")
+local title = uci:get("freifunk-widgets", arg[1], "title") or ""
+
+m = Map("freifunk-widgets", translate("Widget"))
+m.redirect = luci.dispatcher.build_url("admin/freifunk/widgets")
+
+if not arg[1] or m.uci:get("freifunk-widgets", arg[1]) ~= "widget" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+wdg = m:section(NamedSection, arg[1], "widget", translate("Widget") .. " " .. title)
+wdg.anonymous = true
+wdg.addremove = false
+
+local en = wdg:option(Flag, "enabled", translate("Enable"))
+en.rmempty = false
+
+local title = wdg:option(Value, "title", translate("Title"))
+title.rmempty = true
+
+local form = loadfile(
+	utl.libpath() .. "/model/cbi/freifunk/widgets/%s.lua" % widget
+)
+
+if form then
+	setfenv(form, getfenv(1))(m, wdg)
+end
+
+return m
+
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
new file mode 100644
index 00000000..50771d7e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
@@ -0,0 +1,75 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local uci = require "luci.model.uci".cursor()
+local fs = require "luci.fs"
+local utl = require "luci.util"
+m = Map("freifunk-widgets", translate("Widgets"),
+        translate("Configure installed widgets."))
+
+wdg = m:section(TypedSection, "widget", translate("Widgets"))
+wdg.addremove = true
+wdg.extedit   = luci.dispatcher.build_url("admin/freifunk/widgets/widget/%s")
+wdg.template  = "cbi/tblsection"
+wdg.sortable  = true
+
+--[[
+function wdg.create(...)
+	local sid = TypedSection.create(...)
+	luci.http.redirect(wdg.extedit % sid)
+end
+]]--
+
+local en = wdg:option(Flag, "enabled", translate("Enable"))
+en.rmempty = false
+--en.default = "0"
+function en.cfgvalue(self, section)
+	return Flag.cfgvalue(self, section) or "0"
+end
+
+local tmpl = wdg:option(ListValue, "template", translate("Template"))
+for k, v in ipairs(fs.dir('/usr/lib/lua/luci/view/freifunk/widgets/')) do
+	if v ~= "." and v ~= ".." then
+		tmpl:value(v)
+	end
+end
+
+local title = wdg:option(Value, "title", translate("Title"))
+title.rmempty = true
+
+local width = wdg:option(Value, "width", translate("Width"))
+width.rmempty = true
+
+local height = wdg:option(Value, "height", translate("Height"))
+height.rmempty = true
+
+local pr = wdg:option(Value, "paddingright", translate("Padding right"))
+pr.rmempty = true
+
+function m.on_commit(self)
+	-- clean custom text files whose config has been deleted
+	local dir = "/usr/share/customtext/"
+	local active = {}
+	uci:foreach("freifunk-widgets", "widget", function(s)
+		if s["template"] == "html" then
+			table.insert(active, s[".name"])
+		end
+	end )
+	for k, v in ipairs(fs.dir(dir)) do
+		filename = string.gsub(v, ".html", "")
+		if not utl.contains(active, filename) then
+			fs.unlink(dir .. v)
+		end
+	end
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm
new file mode 100644
index 00000000..df01839f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm
@@ -0,0 +1,15 @@
+<%
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+%>
+<div style="clear:both"></div>
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
new file mode 100644
index 00000000..87ad5b62
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
@@ -0,0 +1,42 @@
+<%
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+--local utl = require "luci.util"
+local fs = require "luci.fs"
+local title = data.title
+local name = data['.name']
+local file = "/usr/share/customtext/" .. name .. ".html"
+local text = fs.readfile(file)
+local width = data.width or "100%"
+local pr = data.paddingright or "0"
+if type(width) == "number" then
+        width = width .. "px"
+end
+
+%>
+
+<div id="<%=name%>" style="width:<%=width%>;float:left">
+	<div style="padding-right: <%=pr%>">
+		<% if title then %>
+			<h2><%=title%></h2>
+		<% end %>
+		<% if text then %>
+			<%=text%>
+		<%else%>
+			<%:Could not load the custom text from%> "<%=file%>!"
+		<%end%>
+
+		<%=data.text%>
+	</div>
+</div>
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm
new file mode 100644
index 00000000..f0d89d74
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm
@@ -0,0 +1,45 @@
+<%
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local url = data['url']
+local name = data['.name']
+local title = data['title'] or "No title set"
+local height = data['height'] or "400px"
+if type(height) == "number" then
+	height = height .. "px"
+end
+local width = data['width'] or "100%"
+if type(width) == "number" then
+	width = width .. "px"
+end
+
+%>
+
+<div id="<%=name%>" style="width:<%=width%>;float:left;">
+<h2><%=title%></h2>
+
+<% if not url then %>
+
+<%:No url set.%>
+
+<% else %>
+<div style="height:<%=height%>;min-height:<%=height%>">
+<object type="text/html" data="<%=url%>" width="100%" height="<%=height%>" name="widget_<%=name%>" id="widget_<%=name%>">
+<param name="src" value="<%=url%>" />
+<%:Sorry, your browser doesn't support the object tag and cannot display this page:%><br />
+<a href="<%=url%>"><%=url%></a>
+</object>
+</div>
+</div>
+<%end%>
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
new file mode 100644
index 00000000..08fc550e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
@@ -0,0 +1,84 @@
+<%
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local sys = require "luci.sys"
+local utl = require "luci.util"
+local fs = require "luci.fs"
+local i18n = require "luci.i18n"
+local url = data.url
+local title = data.title or i18n.translate("RSS")
+local max = tonumber(data.max) or 10
+local rss
+local pr = data.paddingright or "0"
+local output = {}
+local width = data.width or "100%"
+if type(width) == "number" then
+	width = width .. "px"
+end
+local name = data['.name']
+local cachetime = tonumber(data.cache) or 3600
+cachefile = "/tmp/" .. name .. ".cache"
+%>
+<div id="<%=name%>" style="width:<%=width%>;float:left">
+	<div style="padding-right: <%=pr%>">
+	<h2><%=title%></h2>
+
+	<% if not url then %>
+		<%:No url found in config%>
+	<% else
+		local mtime = luci.fs.mtime(cachefile) or 0
+		local now = os.time()
+		expire = mtime + cachetime
+
+		if not fs.access(cachefile) or expire < now then
+			rss = sys.httpget(url)
+			if #rss == 0 then
+	%>
+			<%:Could not get rss data from%> <a href="<%=url%>"><%=url%></a>
+	<%
+			else
+				local count = 0
+				for item in string.gmatch(rss, "<item>(.-)</item>") do
+					if count < max then
+						local title = item:match("<title>(.-)</title>")
+						local link = item:match("<link>(.-)</link>")
+						local desc = item:match("<description>(.-)</description>") or ""
+						if title and link then
+							table.insert(output, { title = utl.pcdata(title), link = utl.pcdata(link) })
+						end
+						count = count + 1
+					end
+				end
+				if count > 0 then
+					local file = io.open(cachefile, "w")
+					file:write(utl.serialize_data(output))
+					file:close()
+				end
+			end
+		else
+			local file = assert(io.open(cachefile))
+			output = utl.restore_data(file:read'*a')
+		end
+	end
+
+	if #output > 0 then
+	%>
+		<ul>
+		<% for k, v in ipairs(output) do %>
+			<li><a href="<%=v.link%>"><%=v.title%></a></li>
+		<% end %>
+		</ul>
+	<%end%>
+	</div>
+</div>
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
new file mode 100644
index 00000000..e319f15f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm
@@ -0,0 +1,54 @@
+<%
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+local utl = require "luci.util"
+local title = luci.i18n.translate(data.title or "Search")
+local name = data['.name']
+local width = data.width or "100%"
+
+if type(width) == "number" then
+        width = width .. "px"
+end
+
+local engines = {}
+if type(data.engine) == "table" then
+		engines = data.engine
+else
+	for k, v in ipairs(string.split(data.engine, " ")) do
+		table.insert(engines, v)
+	end
+end
+%>
+
+<div id="<%=name%>" style="width:<%=width%>;float:left">
+	<h2><%=title%></h2>
+	<div id="form_<%=name%>">
+		<form name="searchform" id="search_<%=name%>" action="<%=luci.dispatcher.build_url('freifunk', 'search_redirect')%>">
+			<input type="text" name="searchterms" style="margin-bottom:15px; width: 90%"><br />
+			<%
+			local checked = " checked"
+			for k, v in ipairs(engines) do
+				local e = utl.split(v, "|")
+				local name = e[1]
+				local url = e[2]
+				if name and url then
+			%>
+			<input name="engine" type="radio" value="<%=url%>"<%=checked%>> <%=name%><br />
+	<%	end
+		checked = ""
+	end
+%>
+			<input type="submit" name="SearchSubmit" value="Search" style="margin-top: 15px">
+		</form>
+	</div>
+</div>
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/root/etc/config/freifunk-widgets b/trunk/package/luci/applications/luci-freifunk-widgets/root/etc/config/freifunk-widgets
new file mode 100644
index 00000000..5a9f3254
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/root/etc/config/freifunk-widgets
@@ -0,0 +1,33 @@
+config widget 'example_iframe'
+	option template 'iframe'
+	option url 'http://www.freifunk.net'
+	option title 'Freifunk Homepage'
+	option height '500px'
+	option width '100%'
+	option enabled '0'
+
+config widget 'example_rss'
+	option template 'rssfeed'
+	option url 'http://global.freifunk.net/rss/all/rss.xml'
+	option max '10'
+	option cache '3600'
+	option enabled '0'
+	option title 'Globaler Freifunk RSS Feed'
+
+config widget 'example_search'
+	option template 'search'
+	option enabled '0'
+	option title 'Search'
+	list engine 'Google|http://www.google.de/search?q='
+	list engine 'Freifunk&#160;Wiki|http://wiki.freifunk.net/index.php?search='
+	option width '50%'
+	option paddingright '8%'
+
+config widget 'example_customtext'
+	option template 'html'
+	option width '50%'
+	option enabled '0'
+
+config widget 'example_clear'
+	option enabled '0'
+	option template 'clear'
diff --git a/trunk/package/luci/applications/luci-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets b/trunk/package/luci/applications/luci-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets
new file mode 100644
index 00000000..ce5537ac
--- /dev/null
+++ b/trunk/package/luci/applications/luci-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets
@@ -0,0 +1 @@
+/usr/share/customtext
diff --git a/trunk/package/luci/applications/luci-hd-idle/Makefile b/trunk/package/luci/applications/luci-hd-idle/Makefile
new file mode 100644
index 00000000..d70bb878
--- /dev/null
+++ b/trunk/package/luci/applications/luci-hd-idle/Makefile
@@ -0,0 +1,4 @@
+PO = hd_idle
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-hd-idle/ipkg/postinst b/trunk/package/luci/applications/luci-hd-idle/ipkg/postinst
new file mode 100644
index 00000000..c12bac57
--- /dev/null
+++ b/trunk/package/luci/applications/luci-hd-idle/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-hd_idle ) && rm -f /etc/uci-defaults/luci-hd_idle
+	/etc/init.d/hd-idle enabled || /etc/init.d/hd-idle enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-hd-idle/luasrc/controller/hd_idle.lua b/trunk/package/luci/applications/luci-hd-idle/luasrc/controller/hd_idle.lua
new file mode 100644
index 00000000..a6f4adc3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-hd-idle/luasrc/controller/hd_idle.lua
@@ -0,0 +1,27 @@
+--[[
+
+LuCI hd-idle
+(c) 2008 Yanira <forum-2008@email.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.controller.hd_idle", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/hd-idle") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "services", "hd_idle"}, cbi("hd_idle"), _("hd-idle"), 60)
+	page.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua b/trunk/package/luci/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
new file mode 100644
index 00000000..0c844ca4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
@@ -0,0 +1,41 @@
+--[[
+
+LuCI hd-idle
+(c) 2008 Yanira <forum-2008@email.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+require("nixio.fs")
+
+m = Map("hd-idle", "hd-idle",
+	translate("hd-idle is a utility program for spinning-down external " ..
+		"disks after a period of idle time."))
+
+s = m:section(TypedSection, "hd-idle", translate("Settings"))
+s.anonymous = true
+
+s:option(Flag, "enabled", translate("Enable"))
+
+disk = s:option(Value, "disk", translate("Disk"))
+disk.rmempty = true
+for dev in nixio.fs.glob("/dev/[sh]d[a-z]") do
+	disk:value(nixio.fs.basename(dev))
+end
+
+s:option(Value, "idle_time_interval", translate("Idle-time")).default = 10
+s.rmempty = true
+unit = s:option(ListValue, "idle_time_unit", translate("Idle-time unit"))
+unit.default = "minutes"
+unit:value("minutes", translate("min"))
+unit:value("hours", translate("h"))
+unit.rmempty = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle b/trunk/package/luci/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle
new file mode 100755
index 00000000..92f43563
--- /dev/null
+++ b/trunk/package/luci/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@hd-idle[-1]
+	add ucitrack hd-idle
+	set ucitrack.@hd-idle[-1].init=hd-idle
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-ltqtapi/Makefile b/trunk/package/luci/applications/luci-ltqtapi/Makefile
new file mode 100644
index 00000000..77925c4e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ltqtapi/Makefile
@@ -0,0 +1,4 @@
+PO = telephony
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-ltqtapi/luasrc/controller/ltqtapi.lua b/trunk/package/luci/applications/luci-ltqtapi/luasrc/controller/ltqtapi.lua
new file mode 100644
index 00000000..94268492
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ltqtapi/luasrc/controller/ltqtapi.lua
@@ -0,0 +1,50 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2019 John Crispin <blogic@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.ltqtapi", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/telephony") then
+		return
+	end
+
+	page = node("admin", "telephony")
+	page.target = firstchild()
+	page.title  = _("VoIP")
+	page.order  = 90
+
+	entry({"admin", "telephony", "account"}, cbi("luci_ltqtapi/account") , _("Account"), 10)
+	entry({"admin", "telephony", "contact"}, cbi("luci_ltqtapi/contact") , _("Contacts"), 20)
+
+	entry({"admin", "telephony", "status"}, call("tapi_status")).leaf = true
+end
+
+function tapi_status()
+	local st = { }
+	local state = require "luci.model.uci".cursor_state()
+	state:load("telephony")
+
+	st.status = "Offline";
+	if state:get("telephony", "state", "port1", "0") == "0" then
+		st.line1 = "Idle";
+	else
+		st.line1 = "Calling";
+	end
+	if state:get("telephony", "state", "port2", "0") == "0" then
+		st.line2 = "Idle";
+	else
+		st.line2 = "Calling";
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(st)
+end
diff --git a/trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua b/trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua
new file mode 100644
index 00000000..b33a3afc
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/account.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 John Crispin <blogic@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+m = Map("telephony", translate("VoIP"))
+m.on_after_commit = function() luci.sys.call("/etc/init.d/telephony restart") end
+
+s = m:section(TypedSection, "account", translate("Account"), translate("Here You can specify the SIP account that you want to use."))
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "realm", translate("Realm"))
+s:option(Value, "username", translate("Username"))
+s:option(Value, "password", translate("Password"))
+s:option(Flag, "disabled", translate("Disabled"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua b/trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua
new file mode 100644
index 00000000..b68dab8a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ltqtapi/luasrc/model/cbi/luci_ltqtapi/contact.lua
@@ -0,0 +1,30 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 John Crispin <blogic@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+m = Map("telephony", translate("VoIP"))
+m.on_after_commit = function() luci.sys.call("/etc/init.d/telephony reload") end
+
+s = m:section(TypedSection, "contact", translate("Contact"), translate("Here You can specify the SIP contacts that you want to use."))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tsection"
+
+s:option(Value, "desc", translate("Name"))
+s:option(Value, "code", translate("Shortdial"))
+s:option(Value, "dial", translate("Dial"))
+
+t = s:option(ListValue, "type", translate("Type"))
+t:value("sip", "SIP")
+t:value("realm", "Landline")
+
+return m
diff --git a/trunk/package/luci/applications/luci-ltqtapi/luasrc/view/admin_status/index/telephony.htm b/trunk/package/luci/applications/luci-ltqtapi/luasrc/view/admin_status/index/telephony.htm
new file mode 100644
index 00000000..c7a58dd3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ltqtapi/luasrc/view/admin_status/index/telephony.htm
@@ -0,0 +1 @@
+<%+telephony_status%>
diff --git a/trunk/package/luci/applications/luci-ltqtapi/luasrc/view/telephony_status.htm b/trunk/package/luci/applications/luci-ltqtapi/luasrc/view/telephony_status.htm
new file mode 100644
index 00000000..234f9093
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ltqtapi/luasrc/view/telephony_status.htm
@@ -0,0 +1,32 @@
+<script type="text/javascript">//<![CDATA[
+XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "telephony", "status")%>', null,
+	function(x, st)
+	{
+		var tb = document.getElementById('telephony_status_table');
+		if (st && tb)
+		{
+			tb.deleteRow(1);
+			var tr = tb.insertRow(-1);
+			tr.className = 'cbi-section-table-row cbi-rowstyle-1';
+
+			tr.insertCell(-1).innerHTML = st.status;
+			tr.insertCell(-1).innerHTML = st.line1;
+			tr.insertCell(-1).innerHTML = st.line2;
+		}
+	}
+);
+//]]></script>
+
+<fieldset class="cbi-section">
+	<legend><%:Current Telephony State%></legend>
+	<table class="cbi-section-table" id="telephony_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Uplink%></th>
+			<th class="cbi-section-table-cell"><%:Port1%></th>
+			<th class="cbi-section-table-cell"><%:Port2%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="5"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
diff --git a/trunk/package/luci/applications/luci-meshwizard/Makefile b/trunk/package/luci/applications/luci-meshwizard/Makefile
new file mode 100644
index 00000000..6d60a520
--- /dev/null
+++ b/trunk/package/luci/applications/luci-meshwizard/Makefile
@@ -0,0 +1,4 @@
+PO = meshwizard
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-meshwizard/ipkg/postinst b/trunk/package/luci/applications/luci-meshwizard/ipkg/postinst
new file mode 100644
index 00000000..0599082e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-meshwizard/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/meshwizard ) && rm -f /etc/uci-defaults/meshwizard
+}
diff --git a/trunk/package/luci/applications/luci-meshwizard/luasrc/controller/meshwizard.lua b/trunk/package/luci/applications/luci-meshwizard/luasrc/controller/meshwizard.lua
new file mode 100644
index 00000000..942987db
--- /dev/null
+++ b/trunk/package/luci/applications/luci-meshwizard/luasrc/controller/meshwizard.lua
@@ -0,0 +1,19 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module "luci.controller.meshwizard"
+
+function index()
+	entry({"admin", "freifunk", "meshwizard"}, cbi("freifunk/meshwizard"), _("Mesh Wizard"), 40)
+end
+
diff --git a/trunk/package/luci/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua b/trunk/package/luci/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
new file mode 100644
index 00000000..68f7a5a2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
@@ -0,0 +1,199 @@
+-- wizard rewrite wip
+
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local util = require "luci.util"
+local ip = require "luci.ip"
+
+local community = "profile_" .. (uci:get("freifunk", "community", "name") or "Freifunk")
+local mesh_network = ip.IPv4(uci:get_first(community, "community", "mesh_network") or "10.0.0.0/8")
+local community_ipv6 = uci:get_first(community, "community", "ipv6") or 0
+local community_ipv6mode = uci:get_first(community, "community", "ipv6_config") or "static"
+local meshkit_ipv6 = uci:get("meshwizard", "ipv6", "enabled") or 0
+local community_vap = uci:get_first(community, "community", "vap") or 0
+
+m = Map("meshwizard", translate("Wizard"), translate("This wizard will assist you in setting up your router for Freifunk " ..
+	"or another similar wireless community network."))
+
+n = m:section(NamedSection, "netconfig", nil, translate("Interfaces"))
+n.anonymous = true
+
+-- common functions
+
+function cbi_configure(device)
+	local configure = n:taboption(device, Flag, device .. "_config", translate("Configure this interface"),
+		translate("Note: this will set up this interface for mesh operation, i.e. add it to zone 'freifunk' and enable olsr."))
+end
+
+function cbi_ip4addr(device)
+	local ip4addr = n:taboption(device, Value, device .. "_ip4addr", translate("Mesh IP address"),
+		translate("This is a unique address in the mesh (e.g. 10.1.1.1) and has to be registered at your local community."))
+		ip4addr:depends(device .. "_config", 1)
+		ip4addr.datatype = "ip4addr"
+	function ip4addr.validate(self, value)
+		local x = ip.IPv4(value)
+		if mesh_network:contains(x) then
+			return value
+		else
+			return nil, translate("The given IP address is not inside the mesh network range ") ..
+			"(" .. mesh_network:string() .. ")."
+		end
+	end
+end
+
+function cbi_ip6addr(device)
+	local ip6addr = n:taboption(device, Value, device .. "_ip6addr", translate("Mesh IPv6 address"),
+		translate("This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and has to be registered at your local community."))
+		ip6addr:depends(device .. "_config", 1)
+		ip6addr.datatype = "ip6addr"
+end
+
+
+function cbi_dhcp(device)
+	local dhcp = n:taboption(device, Flag, device .. "_dhcp", translate("Enable DHCP"),
+		translate("DHCP will automatically assign ip addresses to clients"))
+	dhcp:depends(device .. "_config", 1)
+	dhcp.rmempty = true
+end
+
+function cbi_ra(device)
+	local ra = n:taboption(device, Flag, device .. "_ipv6ra", translate("Enable RA"),
+		translate("Send router advertisements on this device."))
+	ra:depends(device .. "_config", 1)
+	ra.rmempty = true
+end
+
+function cbi_dhcprange(device)
+	local dhcprange = n:taboption(device, Value, device .. "_dhcprange", translate("DHCP IP range"),
+		translate("The IP range from which clients are assigned ip addresses (e.g. 10.1.2.1/28). " ..
+		"If this is a range inside your mesh network range, then it will be announced as HNA. Any other range will use NAT. " ..
+		"If left empty then the defaults from the community profile will be used."))
+	dhcprange:depends(device .. "_dhcp", "1")
+	dhcprange.rmempty = true
+	dhcprange.datatype = "ip4addr"
+end
+-- create tabs and config for wireless
+local nets={}
+uci:foreach("wireless", "wifi-device", function(section)
+        local device = section[".name"]
+	table.insert(nets, device)
+end)
+
+local wired_nets = {}
+uci:foreach("network", "interface", function(section)
+	local device = section[".name"]
+	if not util.contains(nets, device) and device ~= "loopback" and not device:find("wireless") then
+		table.insert(nets, device)
+		table.insert(wired_nets, device)
+	end
+end)
+
+for _, net in util.spairs(nets, function(a,b) return (nets[a] < nets[b]) end) do
+	n:tab(net, net)
+end
+
+-- create cbi config for wireless
+uci:foreach("wireless", "wifi-device", function(section)
+	local device = section[".name"]
+	local hwtype = section.type
+	local syscc = section.country or uci:get(community, "wifi_device", "country") or
+		uci:get("freifunk", "wifi_device", "country")
+
+	cbi_configure(device)
+
+	-- Channel selection
+
+	if hwtype == "atheros" then
+		local cc = util.trim(sys.exec("grep -i '" .. syscc .. "' /lib/wifi/cc_translate.txt |cut -d ' ' -f 2")) or 0
+		sys.exec('"echo " .. cc .. " > /proc/sys/dev/" .. device .. "/countrycode"')
+	elseif hwtype == "mac80211" then
+		sys.exec("iw reg set " .. syscc)
+	elseif hwtype == "broadcom" then
+		sys.exec ("wlc country " .. syscc)
+	end
+
+	local chan = n:taboption(device, ListValue, device .. "_channel", translate("Channel"),
+		translate("Your device and neighbouring nodes have to use the same channel."))
+	chan:depends(device .. "_config", 1)
+	chan:value('default')
+
+	local iwinfo = sys.wifi.getiwinfo(device)
+	if iwinfo and iwinfo.freqlist then
+		for _, f in ipairs(iwinfo.freqlist) do
+			if not f.restricted then
+				chan:value(f.channel)
+			end
+		end
+	end
+	-- IPv4 address
+	cbi_ip4addr(device)
+
+	-- DHCP enable
+	cbi_dhcp(device)
+
+	-- DHCP range
+	cbi_dhcprange(device)
+
+	-- IPv6 addr and RA
+	if community_ipv6 == "1" then
+		if community_ipv6mode == "static" then
+			cbi_ip6addr(device)
+		end
+		cbi_ra(device)
+	end
+
+	-- Enable VAP
+	local supports_vap = 0
+	if sys.call("/usr/bin/meshwizard/helpers/supports_vap.sh " .. device .. " " .. hwtype) == 0 then
+		supports_vap = 1
+	end
+	if supports_vap == 1 then
+		local vap = n:taboption(device, Flag, device .. "_vap", translate("Virtual Access Point (VAP)"),
+			translate("This will setup a new virtual wireless interface in Access Point mode."))
+		vap:depends(device .. "_dhcp", "1")
+                vap.rmempty = true
+                if community_vap == "1" then
+			vap.default = "1"
+		end
+	end
+end)
+
+for _, device in pairs(wired_nets) do
+	cbi_configure(device)
+	cbi_ip4addr(device)
+	cbi_dhcp(device)
+	cbi_dhcprange(device)
+	-- IPv6 addr and RA
+	if community_ipv6 == "1" then
+		if community_ipv6mode == "static" then
+			cbi_ip6addr(device)
+		end
+		cbi_ra(device)
+	end
+end
+
+-- General settings
+g = m:section(TypedSection, "general", translate("General Settings"))
+g.anonymous = true
+
+local cleanup = g:option(Flag, "cleanup", translate("Cleanup config"),
+        translate("If this is selected then config is cleaned before setting new config options."))
+cleanup.default = "1"
+
+local restrict = g:option(Flag, "local_restrict", translate("Protect LAN"), 
+	translate("Check this to protect your LAN from other nodes or clients") .. " (" .. translate("recommended") .. ").")
+
+local share = g:option(Flag, "sharenet", translate("Share your internet connection"),
+	translate("Select this to allow others to use your connection to access the internet."))
+	share.rmempty = true
+
+-- IPv6 config
+if community_ipv6 == "1" then
+	v6 = m:section(NamedSection, "ipv6", nil, translate("IPv6 Settings"))
+	local enabled = v6:option(Flag, "enabled", translate("Enabled"),
+        	translate("Activate or deactivate IPv6 config globally."))
+	enabled.default = meshkit_ipv6
+	enabled.rmempty = false
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-meshwizard/root/etc/uci-defaults/meshwizard b/trunk/package/luci/applications/luci-meshwizard/root/etc/uci-defaults/meshwizard
new file mode 100644
index 00000000..6ceb1b71
--- /dev/null
+++ b/trunk/package/luci/applications/luci-meshwizard/root/etc/uci-defaults/meshwizard
@@ -0,0 +1,8 @@
+#!/bin/sh
+uci batch <<EOF
+set ucitrack.meshwizard="meshwizard"
+set ucitrack.meshwizard.exec="/usr/bin/meshwizard/wizard.sh"
+commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
diff --git a/trunk/package/luci/applications/luci-minidlna/Makefile b/trunk/package/luci/applications/luci-minidlna/Makefile
new file mode 100644
index 00000000..b4d05955
--- /dev/null
+++ b/trunk/package/luci/applications/luci-minidlna/Makefile
@@ -0,0 +1,4 @@
+PO = minidlna
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-minidlna/luasrc/controller/minidlna.lua b/trunk/package/luci/applications/luci-minidlna/luasrc/controller/minidlna.lua
new file mode 100644
index 00000000..eca2d091
--- /dev/null
+++ b/trunk/package/luci/applications/luci-minidlna/luasrc/controller/minidlna.lua
@@ -0,0 +1,57 @@
+--[[
+LuCI - Lua Configuration Interface - miniDLNA support
+
+Copyright 2012 Gabor Juhos <juhosg@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.minidlna", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/minidlna") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "services", "minidlna"}, cbi("minidlna"), _("miniDLNA"))
+	page.dependent = true
+
+	entry({"admin", "services", "minidlna_status"}, call("minidlna_status"))
+end
+
+function minidlna_status()
+	local sys  = require "luci.sys"
+	local uci  = require "luci.model.uci".cursor()
+	local port = tonumber(uci:get_first("minidlna", "minidlna", "port"))
+
+	local status = {
+		running = (sys.call("pidof minidlna >/dev/null") == 0),
+		audio   = 0,
+		video   = 0,
+		image   = 0
+	}
+
+	if status.running then
+		local fd = sys.httpget("http://127.0.0.1:%d/" % (port or 8200), true)
+		if fd then
+			local html = fd:read("*a")
+			if html then
+				status.audio = (tonumber(html:match("Audio files</td><td>(%d+)")) or 0)
+				status.video = (tonumber(html:match("Video files</td><td>(%d+)")) or 0)
+				status.image = (tonumber(html:match("Image files</td><td>(%d+)")) or 0)
+			end
+			fd:close()
+		end
+	end
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(status)
+end
diff --git a/trunk/package/luci/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua b/trunk/package/luci/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
new file mode 100644
index 00000000..a66adb69
--- /dev/null
+++ b/trunk/package/luci/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
@@ -0,0 +1,176 @@
+--[[
+LuCI - Lua Configuration Interface - miniDLNA support
+
+Copyright 2012 Gabor Juhos <juhosg@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local m, s, o
+
+m = Map("minidlna", translate("miniDLNA"),
+	translate("MiniDLNA is server software with the aim of being fully compliant with DLNA/UPnP-AV clients."))
+
+m:section(SimpleSection).template  = "minidlna_status"
+
+s = m:section(TypedSection, "minidlna", "miniDLNA Settings")
+s.addremove = false
+s.anonymous = true
+
+s:tab("general", translate("General Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+o = s:taboption("general", Flag, "enabled", translate("Enable:"))
+o.rmempty = false
+
+function o.cfgvalue(self, section)
+	return luci.sys.init.enabled("minidlna") and self.enabled or self.disabled
+end
+
+function o.write(self, section, value)
+	if value == "1" then
+		luci.sys.init.enable("minidlna")
+		luci.sys.call("/etc/init.d/minidlna start >/dev/null")
+	else
+		luci.sys.call("/etc/init.d/minidlna stop >/dev/null")
+		luci.sys.init.disable("minidlna")
+	end
+
+	return Flag.write(self, section, value)
+end
+
+o = s:taboption("general", Value, "port", translate("Port:"),
+	translate("Port for HTTP (descriptions, SOAP, media transfer) traffic."))
+o.datatype = "port"
+o.default = 8200
+
+
+o = s:taboption("general", Value, "interface", translate("Interfaces:"),
+	translate("Network interfaces to serve."))
+
+o.template = "cbi/network_ifacelist"
+o.widget   = "checkbox"
+o.nocreate = true
+
+function o.cfgvalue(self, section)
+	local rv = { }
+	local val = Value.cfgvalue(self, section)
+	if val then
+		local ifc
+		for ifc in val:gmatch("[^,%s]+") do
+			rv[#rv+1] = ifc
+		end
+	end
+	return rv
+end
+
+function o.write(self, section, value)
+	local rv = { }
+	local ifc
+	for ifc in luci.util.imatch(value) do
+		rv[#rv+1] = ifc
+	end
+	Value.write(self, section, table.concat(rv, ","))
+end
+
+
+o = s:taboption("general", Value, "friendly_name", translate("Friendly name:"),
+	translate("Set this if you want to customize the name that shows up on your clients."))
+o.rmempty = true
+o.placeholder = "libreCMC DLNA Server"
+
+o = s:taboption("advanced", Value, "db_dir", translate("Database directory:"),
+	translate("Set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache."))
+o.rmempty = true
+o.placeholder = "/var/cache/minidlna"
+
+o = s:taboption("advanced", Value, "log_dir", translate("Log directory:"),
+	translate("Set this if you would like to specify the directory where you want MiniDLNA to store its log file."))
+o.rmempty = true
+o.placeholder = "/var/log"
+
+s:taboption("advanced", Flag, "inotify", translate("Enable inotify:"),
+	translate("Set this to enable inotify monitoring to automatically discover new files."))
+
+s:taboption("advanced", Flag, "enable_tivo", translate("Enable TIVO:"),
+	translate("Set this to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO."))
+o.rmempty = true
+
+o = s:taboption("advanced", Flag, "strict_dlna", translate("Strict to DLNA standard:"),
+	translate("Set this to strictly adhere to DLNA standards. This will allow server-side downscaling of very large JPEG images, which may hurt JPEG serving performance on (at least) Sony DLNA products."))
+o.rmempty = true
+
+o = s:taboption("advanced", Value, "presentation_url", translate("Presentation URL:"))
+o.rmempty = true
+o.placeholder = "http://192.168.1.1/"
+
+o = s:taboption("advanced", Value, "notify_interval", translate("Notify interval:"),
+	translate("Notify interval in seconds."))
+o.datatype = "uinteger"
+o.placeholder = 900
+
+o = s:taboption("advanced", Value, "serial", translate("Announced serial number:"),
+	translate("Serial number the miniDLNA daemon will report to clients in its XML description."))
+o.placeholder = "12345678"
+
+s:taboption("advanced", Value, "model_number", translate("Announced model number:"),
+	translate("Model number the miniDLNA daemon will report to clients in its XML description."))
+o.placholder = "1"
+
+o = s:taboption("advanced", Value, "minissdpsocket", translate("miniSSDP socket:"),
+	translate("Specify the path to the MiniSSDPd socket."))
+o.rmempty = true
+o.placeholder = "/var/run/minissdpd.sock"
+
+o = s:taboption("general", ListValue, "root_container", translate("Root container:"))
+o:value(".", translate("Standard container"))
+o:value("B", translate("Browse directory"))
+o:value("M", translate("Music"))
+o:value("V", translate("Video"))
+o:value("P", translate("Pictures"))
+
+
+s:taboption("general", DynamicList, "media_dir", translate("Media directories:"),
+	translate("Set this to the directory you want scanned. If you want to restrict the directory to a specific content type, you can prepend the type ('A' for audio, 'V' for video, 'P' for images), followed by a comma, to the directory (eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."))
+
+
+o = s:taboption("general", DynamicList, "album_art_names", translate("Album art names:"),
+	translate("This is a list of file names to check for when searching for album art."))
+o.rmempty = true
+o.placeholder = "Cover.jpg"
+
+function o.cfgvalue(self, section)
+	local rv = { }
+
+	local val = Value.cfgvalue(self, section)
+	if type(val) == "table" then
+		val = table.concat(val, "/")
+	elseif not val then
+		val = ""
+	end
+
+	local file
+	for file in val:gmatch("[^/%s]+") do
+		rv[#rv+1] = file
+	end
+
+	return rv
+end
+
+function o.write(self, section, value)
+	local rv = { }
+	local file
+	for file in luci.util.imatch(value) do
+		rv[#rv+1] = file
+	end
+	Value.write(self, section, table.concat(rv, "/"))
+end
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-minidlna/luasrc/view/admin_status/index/minidlna.htm b/trunk/package/luci/applications/luci-minidlna/luasrc/view/admin_status/index/minidlna.htm
new file mode 100644
index 00000000..b2feeb2e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-minidlna/luasrc/view/admin_status/index/minidlna.htm
@@ -0,0 +1 @@
+<%+minidlna_status%>
diff --git a/trunk/package/luci/applications/luci-minidlna/luasrc/view/minidlna_status.htm b/trunk/package/luci/applications/luci-minidlna/luasrc/view/minidlna_status.htm
new file mode 100644
index 00000000..098a72a0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-minidlna/luasrc/view/minidlna_status.htm
@@ -0,0 +1,29 @@
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin/services/minidlna_status")%>', null,
+		function(x, st)
+		{
+			var tb = document.getElementById('minidlna_status');
+			if (st && tb)
+			{
+				if (st.running)
+				{
+					tb.innerHTML = String.format(
+						'<%:The miniDLNA service is active, serving %d audio, %d video and %d image files.%>',
+							st.audio, st.video, st.image
+					);
+				}
+				else
+				{
+					tb.innerHTML = '<em><%:The miniDLNA service is not running.%></em>';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<fieldset class="cbi-section">
+	<legend><%:miniDLNA Status%></legend>
+	<p id="minidlna_status">
+		<em><%:Collecting data...%></em>
+	</p>
+</fieldset>
diff --git a/trunk/package/luci/applications/luci-minidlna/root/etc/uci-defaults/luci-minidlna b/trunk/package/luci/applications/luci-minidlna/root/etc/uci-defaults/luci-minidlna
new file mode 100755
index 00000000..df43c1b3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-minidlna/root/etc/uci-defaults/luci-minidlna
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+/etc/init.d/minidlna enabled && {
+	/etc/init.d/minidlna stop
+	/etc/init.d/minidlna disable
+}
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.minidlna
+	set ucitrack.minidlna=minidlna
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-mmc-over-gpio/Makefile b/trunk/package/luci/applications/luci-mmc-over-gpio/Makefile
new file mode 100644
index 00000000..3f031cb7
--- /dev/null
+++ b/trunk/package/luci/applications/luci-mmc-over-gpio/Makefile
@@ -0,0 +1,4 @@
+PO = mmc_over_gpio
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-mmc-over-gpio/ipkg/postinst b/trunk/package/luci/applications/luci-mmc-over-gpio/ipkg/postinst
new file mode 100644
index 00000000..6d18799a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-mmc-over-gpio/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-mmc-over-gpio ) && rm -f /etc/uci-defaults/luci-mmc-over-gpio
+	/etc/init.d/mmc_over_gpio enabled || /etc/init.d/mmc_over_gpio enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua b/trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
new file mode 100644
index 00000000..b9984cb8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
@@ -0,0 +1,27 @@
+--[[
+
+LuCI mmc_over_gpio
+(c) 2008 Yanira <forum-2008@email.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.controller.mmc_over_gpio", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/mmc_over_gpio") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "system", "mmc_over_gpio"}, cbi("mmc_over_gpio"), _("MMC/SD driver configuration"), 60)
+	page.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua b/trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
new file mode 100644
index 00000000..04d356c1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
@@ -0,0 +1,41 @@
+--[[
+
+LuCI mmc_over_gpio
+(c) 2008 Yanira <forum-2008@email.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("mmc_over_gpio", translate("MMC/SD driver configuration"),
+	translate("MMC/SD driver configuration"))
+
+s = m:section(TypedSection, "mmc_over_gpio", translate("Settings"))
+s.addremove = true
+s.anonymous = true
+
+s:option(Flag, "enabled", translate("Enable"))
+
+s:option(Value, "name", translate("Name"))
+
+pin = s:option(Value, "DI_pin", translate("DI_pin"))
+for i = 0,7 do pin:value(i) end
+
+pin = s:option(Value, "DO_pin", translate("DO_pin"))
+for i = 0,7 do pin:value(i) end
+
+pin = s:option(Value, "CLK_pin", translate("CLK_pin"))
+for i = 0,7 do pin:value(i) end
+
+pin = s:option(Value, "CS_pin", translate("CS_pin"))
+for i = 0,7 do pin:value(i) end
+
+s:option(Value, "mode", translate("Mode"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio b/trunk/package/luci/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio
new file mode 100755
index 00000000..c6e79e60
--- /dev/null
+++ b/trunk/package/luci/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@mmc_over_gpio[-1]
+	add ucitrack mmc_over_gpio
+	set ucitrack.@mmc_over_gpio[-1].init=mmc_over_gpio
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-multiwan/Makefile b/trunk/package/luci/applications/luci-multiwan/Makefile
new file mode 100644
index 00000000..cab4e304
--- /dev/null
+++ b/trunk/package/luci/applications/luci-multiwan/Makefile
@@ -0,0 +1,4 @@
+PO = multiwan
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-multiwan/luasrc/controller/multiwan.lua b/trunk/package/luci/applications/luci-multiwan/luasrc/controller/multiwan.lua
new file mode 100644
index 00000000..b596ef7e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-multiwan/luasrc/controller/multiwan.lua
@@ -0,0 +1,60 @@
+module("luci.controller.multiwan", package.seeall)
+
+function index()
+	local fs = luci.fs or nixio.fs
+	if not fs.access("/etc/config/multiwan") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "network", "multiwan"}, cbi("multiwan/multiwan"), _("Multi-WAN"))
+	page.dependent = true
+	
+	entry({"admin", "network", "multiwan", "status"}, call("multiwan_status"))
+
+	page = entry({"mini", "network", "multiwan"}, cbi("multiwan/multiwanmini", {autoapply=true}), _("Multi-WAN"))
+	page.dependent = true
+end
+function multiwan_status()
+	local nfs = require "nixio.fs"
+	local cachefile = "/tmp/.mwan/cache"
+
+	local rv = {	}
+
+	cachefile = nfs.readfile(cachefile)
+	if cachefile then
+		local ntm = require "luci.model.network".init()
+		_, _, wan_if_map = string.find(cachefile, "wan_if_map=\"([^\"]*)\"")
+		_, _, wan_fail_map = string.find(cachefile, "wan_fail_map=\"([^\"]*)\"")
+		_, _, wan_recovery_map = string.find(cachefile, "wan_recovery_map=\"([^\"]*)\"")
+		
+		rv.wans = { }
+		wansid = {}
+
+		for wanname, wanifname in string.gfind(wan_if_map, "([^%[]+)%[([^%]]+)%]") do
+			local wanlink = ntm:get_interface(wanifname)
+			      wanlink = wanlink and wanlink:get_network()
+			      wanlink = wanlink and wanlink:adminlink() or "#"
+			wansid[wanname] = #rv.wans + 1
+			rv.wans[wansid[wanname]] = { name = wanname, link = wanlink, ifname = wanifname, status = "ok", count = 0 }
+		end
+
+		for wanname, failcount in string.gfind(wan_fail_map, "([^%[]+)%[([^%]]+)%]") do
+			if failcount == "x" then
+				rv.wans[wansid[wanname]].status = "ko"
+			else
+				rv.wans[wansid[wanname]].status = "failing"
+				rv.wans[wansid[wanname]].count = failcount
+			end
+		end
+
+		for wanname, recoverycount in string.gfind(wan_recovery_map, "([^%[]+)%[([^%]]+)%]") do
+			rv.wans[wansid[wanname]].status = "recovering"
+			rv.wans[wansid[wanname]].count = recoverycount
+		end
+	end
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+end
diff --git a/trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua b/trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
new file mode 100644
index 00000000..586b6307
--- /dev/null
+++ b/trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
@@ -0,0 +1,155 @@
+require("luci.tools.webadmin")
+
+m = Map("multiwan", translate("Multi-WAN"),
+	translate("Multi-WAN allows for the use of multiple uplinks for load balancing and failover."))
+
+s = m:section(NamedSection, "config", "multiwan", "")
+
+e = s:option(Flag, "enabled", translate("Enable"))
+e.rmempty = false
+e.default = e.enabled
+
+function e.write(self, section, value)
+	if value == "0" then
+		os.execute("/etc/init.d/multiwan stop")
+	else
+		os.execute("/etc/init.d/multiwan enable")
+	end
+	Flag.write(self, section, value)
+end
+
+s = m:section(TypedSection, "interface", translate("WAN Interfaces"),
+	translate("Health Monitor detects and corrects network changes and failed connections."))
+s.addremove = true
+
+weight = s:option(ListValue, "weight", translate("Load Balancer Distribution"))
+weight:value("10", "10")
+weight:value("9", "9")
+weight:value("8", "8")
+weight:value("7", "7")
+weight:value("6", "6")
+weight:value("5", "5")
+weight:value("4", "4")
+weight:value("3", "3")
+weight:value("2", "2")
+weight:value("1", "1")
+weight:value("disable", translate("None"))
+weight.default = "10"
+weight.optional = false
+weight.rmempty = false
+
+interval = s:option(ListValue, "health_interval", translate("Health Monitor Interval"))
+interval:value("disable", translate("Disable"))
+interval:value("5", "5 sec.")
+interval:value("10", "10 sec.")
+interval:value("20", "20 sec.")
+interval:value("30", "30 sec.")
+interval:value("60", "60 sec.")
+interval:value("120", "120 sec.")
+interval.default = "10"
+interval.optional = false
+interval.rmempty = false
+
+icmp_hosts = s:option(Value, "icmp_hosts", translate("Health Monitor ICMP Host(s)"))
+icmp_hosts:value("disable", translate("Disable"))
+icmp_hosts:value("dns", "DNS Server(s)")
+icmp_hosts:value("gateway", "WAN Gateway")
+icmp_hosts.default = "dns"
+icmp_hosts.optional = false
+icmp_hosts.rmempty = false
+
+timeout = s:option(ListValue, "timeout", translate("Health Monitor ICMP Timeout"))
+timeout:value("1", "1 sec.")
+timeout:value("2", "2 sec.")
+timeout:value("3", "3 sec.")
+timeout:value("4", "4 sec.")
+timeout:value("5", "5 sec.")
+timeout:value("10", "10 sec.")
+timeout.default = "3"
+timeout.optional = false
+timeout.rmempty = false
+
+fail = s:option(ListValue, "health_fail_retries", translate("Attempts Before WAN Failover"))
+fail:value("1", "1")
+fail:value("3", "3")
+fail:value("5", "5")
+fail:value("10", "10")
+fail:value("15", "15")
+fail:value("20", "20")
+fail.default = "3"
+fail.optional = false
+fail.rmempty = false
+
+recovery = s:option(ListValue, "health_recovery_retries", translate("Attempts Before WAN Recovery"))
+recovery:value("1", "1")
+recovery:value("3", "3")
+recovery:value("5", "5")
+recovery:value("10", "10")
+recovery:value("15", "15")
+recovery:value("20", "20")
+recovery.default = "5"
+recovery.optional = false
+recovery.rmempty = false
+
+failover_to = s:option(ListValue, "failover_to", translate("Failover Traffic Destination"))
+failover_to:value("disable", translate("None"))
+luci.tools.webadmin.cbi_add_networks(failover_to)
+failover_to:value("fastbalancer", translate("Load Balancer(Performance)"))
+failover_to:value("balancer", translate("Load Balancer(Compatibility)"))
+failover_to.default = "balancer"
+failover_to.optional = false
+failover_to.rmempty = false
+
+dns = s:option(Value, "dns", translate("DNS Server(s)"))
+dns:value("auto", translate("Auto"))
+dns.default = "auto"
+dns.optional = false
+dns.rmempty = true
+
+s = m:section(TypedSection, "mwanfw", translate("Multi-WAN Traffic Rules"),
+	translate("Configure rules for directing outbound traffic through specified WAN Uplinks."))
+s.template = "cbi/tblsection"
+s.anonymous = true
+s.addremove = true
+
+src = s:option(Value, "src", translate("Source Address"))
+src.rmempty = true
+src:value("", translate("all"))
+luci.tools.webadmin.cbi_add_knownips(src)
+
+dst = s:option(Value, "dst", translate("Destination Address"))
+dst.rmempty = true
+dst:value("", translate("all"))
+luci.tools.webadmin.cbi_add_knownips(dst)
+
+proto = s:option(Value, "proto", translate("Protocol"))
+proto:value("", translate("all"))
+proto:value("tcp", "TCP")
+proto:value("udp", "UDP")
+proto:value("icmp", "ICMP")
+proto.rmempty = true
+
+ports = s:option(Value, "ports", translate("Ports"))
+ports.rmempty = true
+ports:value("", translate("all", translate("all")))
+
+wanrule = s:option(ListValue, "wanrule", translate("WAN Uplink"))
+luci.tools.webadmin.cbi_add_networks(wanrule)
+wanrule:value("fastbalancer", translate("Load Balancer(Performance)"))
+wanrule:value("balancer", translate("Load Balancer(Compatibility)"))
+wanrule.default = "fastbalancer"
+wanrule.optional = false
+wanrule.rmempty = false
+
+s = m:section(NamedSection, "config", "", "")
+s.addremove = false
+
+default_route = s:option(ListValue, "default_route", translate("Default Route"))
+luci.tools.webadmin.cbi_add_networks(default_route)
+default_route:value("fastbalancer", translate("Load Balancer(Performance)"))
+default_route:value("balancer", translate("Load Balancer(Compatibility)"))
+default_route.default = "balancer"
+default_route.optional = false
+default_route.rmempty = false
+
+return m
diff --git a/trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua b/trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
new file mode 100644
index 00000000..d3897454
--- /dev/null
+++ b/trunk/package/luci/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
@@ -0,0 +1,67 @@
+require("luci.tools.webadmin")
+
+m = Map("multiwan", translate("Multi-WAN"),
+	translate("Multi-WAN allows for the use of multiple uplinks for load balancing and failover."))
+
+s = m:section(NamedSection, "config", "multiwan", "")
+
+e = s:option(Flag, "enabled", translate("Enable"))
+e.rmempty = false
+e.default = "1"
+
+function e.write(self, section, value)
+	if value == "0" then
+		os.execute("/etc/init.d/multiwan stop")
+	else
+		os.execute("/etc/init.d/multiwan enable")
+	end
+	Flag.write(self, section, value)
+end
+
+s = m:section(TypedSection, "mwanfw", translate("Multi-WAN Traffic Rules"),
+	translate("Configure rules for directing outbound traffic through specified WAN Uplinks."))
+s.template = "cbi/tblsection"
+s.anonymous = true
+s.addremove = true
+
+src = s:option(Value, "src", translate("Source Address"))
+src.rmempty = true
+src:value("", translate("all"))
+luci.tools.webadmin.cbi_add_knownips(src)
+
+dst = s:option(Value, "dst", translate("Destination Address"))
+dst.rmempty = true
+dst:value("", translate("all"))
+luci.tools.webadmin.cbi_add_knownips(dst)
+
+proto = s:option(Value, "proto", translate("Protocol"))
+proto:value("", translate("all"))
+proto:value("tcp", "TCP")
+proto:value("udp", "UDP")
+proto:value("icmp", "ICMP")
+proto.rmempty = true
+
+ports = s:option(Value, "ports", translate("Ports"))
+ports.rmempty = true
+ports:value("", translate("all", translate("all")))
+
+wanrule = s:option(ListValue, "wanrule", translate("WAN Uplink"))
+luci.tools.webadmin.cbi_add_networks(wanrule)
+wanrule:value("fastbalancer", translate("Load Balancer(Performance)"))
+wanrule:value("balancer", translate("Load Balancer(Compatibility)"))
+wanrule.default = "fastbalancer"
+wanrule.optional = false
+wanrule.rmempty = false
+
+s = m:section(NamedSection, "config", "", "")
+s.addremove = false
+
+default_route = s:option(ListValue, "default_route", translate("Default Route"))
+luci.tools.webadmin.cbi_add_networks(default_route)
+default_route:value("fastbalancer", translate("Load Balancer(Performance)"))
+default_route:value("balancer", translate("Load Balancer(Compatibility)"))
+default_route.default = "balancer"
+default_route.optional = false
+default_route.rmempty = false
+
+return m
diff --git a/trunk/package/luci/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm b/trunk/package/luci/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm
new file mode 100644
index 00000000..79c04539
--- /dev/null
+++ b/trunk/package/luci/applications/luci-multiwan/luasrc/view/admin_status/index/multiwan.htm
@@ -0,0 +1 @@
+<%+multiwan_status%>
diff --git a/trunk/package/luci/applications/luci-multiwan/luasrc/view/multiwan_status.htm b/trunk/package/luci/applications/luci-multiwan/luasrc/view/multiwan_status.htm
new file mode 100644
index 00000000..8c4127b2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-multiwan/luasrc/view/multiwan_status.htm
@@ -0,0 +1,71 @@
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "multiwan", "status")%>', null,
+		function(x, st)
+		{
+			var tx = document.getElementById('multiwan_status_text');
+			if (tx)
+			{
+				if (st && st.wans)
+				{
+					var temp = '';
+
+					for( var i = 0; i < st.wans.length; i++ )
+					{
+						var stat = '<%:Unknown%>';
+						var cssc = '';
+
+						switch (st.wans[i].status)
+						{
+							case 'ok':
+								stat = '<%:OK%>';
+								cssc = 'wanok';
+								break;
+
+							case 'ko':
+								stat = '<%:KO%>';
+								cssc = 'wanko';
+								break;
+
+							case 'recovering':
+								stat = String.format('<%:Recovering%>(%d)', st.wans[i].count);
+								cssc = 'wanrecov';
+								break;
+
+							case 'failing':
+								stat = String.format('<%:Failing%>(%d)', st.wans[i].count);
+								cssc = 'wanfail';
+								break;
+						}
+
+						temp += String.format(
+							'<span class="%s"><strong>%s (<a href="%q">%s</a>) :</strong> %s</span>',
+								cssc, st.wans[i].name, st.wans[i].link, st.wans[i].ifname, stat
+						);
+					}
+					
+					tx.innerHTML = temp;
+				}
+				else
+				{
+					tx.innerHTML = '';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<style type="text/css">
+  .wanok { background-color: rgb(144, 240, 144); }
+  .wanko { background-color: rgb(240, 144, 144); }
+  .wanrecov { background-color: rgb(240, 240, 0); }
+  .wanfail { background-color: rgb(255, 165, 0); }
+  .wanko, .wanok, .wanrecov, .wanfail {
+	padding: 0.4em;
+	margin: 0.4em;
+  }
+</style>
+
+<fieldset class="cbi-section">
+	<legend><%:Multi-WAN Status%></legend>
+	<div id="multiwan_status_text" style="text-align:center;"><em><%:Collecting data...%></em></div>
+</fieldset>
diff --git a/trunk/package/luci/applications/luci-ntpc/Makefile b/trunk/package/luci/applications/luci-ntpc/Makefile
new file mode 100644
index 00000000..392e8fed
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ntpc/Makefile
@@ -0,0 +1,4 @@
+PO = ntpc
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua b/trunk/package/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua
new file mode 100644
index 00000000..b7f4cdfc
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua
@@ -0,0 +1,30 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.ntpc", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/ntpclient") then
+		return
+	end
+	
+	local page
+
+	page = entry({"admin", "system", "ntpc"}, cbi("ntpc/ntpc"), _("Time Synchronisation"), 50)
+	page.dependent = true
+
+	page = entry({"mini", "system", "ntpc"}, cbi("ntpc/ntpcmini", {autoapply=true}), _("Time Synchronisation"), 50)
+	page.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua b/trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
new file mode 100644
index 00000000..5265359c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
@@ -0,0 +1,49 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+m = Map("ntpclient", translate("Time Synchronisation"), translate("Synchronizes the system time"))
+
+s = m:section(TypedSection, "ntpclient", translate("General"))
+s.anonymous = true
+s.addremove = false
+
+s:option(DummyValue, "_time", translate("Current system time")).value = os.date("%c")
+
+interval = s:option(Value, "interval", translate("Update interval (in seconds)"))
+interval.datatype = "and(uinteger,min(1))"
+interval.rmempty = true
+
+count = s:option(Value, "count", translate("Count of time measurements"), translate("empty = infinite"))
+count.datatype = "and(uinteger,min(1))"
+count.rmempty = true
+
+s2 = m:section(TypedSection, "ntpdrift", translate("Clock Adjustment"))
+s2.anonymous = true
+s2.addremove = false
+
+freq = s2:option(Value, "freq", translate("Offset frequency"))
+freq.datatype = "integer"
+freq.rmempty = true
+
+s3 = m:section(TypedSection, "ntpserver", translate("Time Servers"))
+s3.anonymous = true
+s3.addremove = true
+s3.template = "cbi/tblsection"
+
+s3:option(Value, "hostname", translate("Hostname"))
+port = s3:option(Value, "port", translate("Port"))
+port.datatype = "port"
+port.rmempty = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua b/trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
new file mode 100644
index 00000000..2a6c4152
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
@@ -0,0 +1,38 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+require("luci.tools.webadmin")
+m = Map("ntpclient", translate("Time Synchronisation"), translate("Synchronizes the system time"))
+
+s = m:section(TypedSection, "ntpclient", translate("General"))
+s.anonymous = true
+s.addremove = false
+
+s:option(DummyValue, "_time", translate("Current system time")).value = os.date("%c")
+
+interval = s:option(Value, "interval", translate("Update interval (in seconds)"))
+interval.datatype = "and(uinteger,min(1))"
+interval.rmempty = true
+
+s3 = m:section(TypedSection, "ntpserver", translate("Time Server"))
+s3.anonymous = true
+s3.addremove = true
+s3.template = "cbi/tblsection"
+
+s3:option(Value, "hostname", translate("Hostname"))
+port = s3:option(Value, "port", translate("Port"))
+port.datatype = "port"
+port.rmempty = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-ocserv/Makefile b/trunk/package/luci/applications/luci-ocserv/Makefile
new file mode 100644
index 00000000..74cd597d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ocserv/Makefile
@@ -0,0 +1,4 @@
+PO = ocserv
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-ocserv/luasrc/controller/ocserv.lua b/trunk/package/luci/applications/luci-ocserv/luasrc/controller/ocserv.lua
new file mode 100644
index 00000000..229102da
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ocserv/luasrc/controller/ocserv.lua
@@ -0,0 +1,88 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2014 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.ocserv", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/ocserv") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "services", "ocserv"}, alias("admin", "services", "ocserv", "main"),
+		_("OpenConnect VPN"))
+	page.dependent = true
+	
+	page = entry({"admin", "services", "ocserv", "main"},
+		cbi("ocserv/main"),
+		_("Server Settings"), 200)
+	page.dependent = true
+
+	page = entry({"admin", "services", "ocserv", "users"},
+		cbi("ocserv/users"),
+		_("User Settings"), 300)
+	page.dependent = true
+
+	entry({"admin", "services", "ocserv", "status"},
+		call("ocserv_status")).leaf = true
+
+	entry({"admin", "services", "ocserv", "disconnect"},
+		call("ocserv_disconnect")).leaf = true
+
+end
+
+function ocserv_status()
+	local ipt = io.popen("/usr/bin/occtl show users");
+
+	if ipt then
+
+		local fwd = { }
+		while true do
+
+			local ln = ipt:read("*l")
+			if not ln then break end
+		
+			local id, user, group, vpn_ip, ip, device, time, cipher, status = 
+				ln:match("^%s*(%d+)%s+([-_%w]+)%s+([%.%*-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+).*")
+			if id then
+				fwd[#fwd+1] = {
+					id = id,
+					user = user,
+					group = group,
+					vpn_ip = vpn_ip,
+					ip = ip,
+					device = device,
+					time = time,
+					cipher = cipher,
+					status = status
+				}
+			end
+		end
+		ipt:close()
+		luci.http.prepare_content("application/json")
+		luci.http.write_json(fwd)
+	end
+end
+
+function ocserv_disconnect(num)
+	local idx = tonumber(num)
+
+	if idx and idx > 0 then
+		luci.sys.call("/usr/bin/occtl disconnect id %d" % idx)
+		luci.http.status(200, "OK")
+
+		return
+	end
+	luci.http.status(400, "Bad request")
+end
diff --git a/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/main.lua b/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/main.lua
new file mode 100644
index 00000000..a909649d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/main.lua
@@ -0,0 +1,148 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2014 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local fs = require "nixio.fs"
+local has_ipv6 = fs.access("/proc/net/ipv6_route")
+
+m = Map("ocserv", translate("OpenConnect VPN"))
+
+s = m:section(TypedSection, "ocserv", "OpenConnect")
+s.anonymous = true
+
+s:tab("general",  translate("General Settings"))
+s:tab("ca", translate("CA certificate"))
+s:tab("template", translate("Edit Template"))
+
+local e = s:taboption("general", Flag, "enable", translate("Enable server"))
+e.rmempty = false
+e.default = "1"
+
+function m.on_commit(map)
+	luci.sys.call("/usr/bin/occtl reload  >/dev/null 2>&1")
+end
+
+function e.write(self, section, value)
+	if value == "0" then
+		luci.sys.call("/etc/init.d/ocserv stop >/dev/null 2>&1")
+		luci.sys.call("/etc/init.d/ocserv disable  >/dev/null 2>&1")
+	else
+		luci.sys.call("/etc/init.d/ocserv enable  >/dev/null 2>&1")
+		luci.sys.call("/etc/init.d/ocserv restart  >/dev/null 2>&1")
+	end
+	Flag.write(self, section, value)
+end
+
+local o
+
+o = s:taboption("general", ListValue, "auth", translate("User Authentication"),
+	translate("The authentication method for the users. The simplest is plain with a single username-password pair. Use PAM modules to authenticate using another server (e.g., LDAP, Radius)."))
+o.rmempty = false
+o.default = "plain"
+o:value("plain")
+o:value("PAM")
+
+o = s:taboption("general", Value, "zone", translate("Firewall Zone"),
+	translate("The firewall zone that the VPN clients will be set to"))
+o.nocreate = true
+o.default = "lan"
+o.template = "cbi/firewall_zonelist"
+
+s:taboption("general", Value, "port", translate("Port"),
+	translate("The same UDP and TCP ports will be used"))
+s:taboption("general", Value, "max_clients", translate("Max clients"))
+s:taboption("general", Value, "max_same", translate("Max same clients"))
+s:taboption("general", Value, "dpd", translate("Dead peer detection time (secs)"))
+
+local pip = s:taboption("general", Flag, "predictable_ips", translate("Predictable IPs"),
+	translate("The assigned IPs will be selected deterministically"))
+pip.default = "1"
+
+local udp = s:taboption("general", Flag, "udp", translate("Enable UDP"),
+	translate("Enable UDP channel support; this must be enabled unless you know what you are doing"))
+udp.default = "1"
+
+local cisco = s:taboption("general", Flag, "cisco_compat", translate("AnyConnect client compatibility"),
+	translate("Enable support for CISCO AnyConnect clients"))
+cisco.default = "1"
+
+ipaddr = s:taboption("general", Value, "ipaddr", translate("VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"))
+ipaddr.datatype = "ip4addr"
+ipaddr.default = "192.168.100.1"
+
+nm = s:taboption("general", Value, "netmask", translate("VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+nm.datatype = "ip4addr"
+nm.default = "255.255.255.0"
+nm:value("255.255.255.0")
+nm:value("255.255.0.0")
+nm:value("255.0.0.0")
+
+if has_ipv6 then
+	ip6addr = s:taboption("general", Value, "ip6addr", translate("VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+	ip6addr.datatype = "ip6addr"
+end
+
+
+tmpl = s:taboption("template", Value, "_tmpl",
+	translate("Edit the template that is used for generating the ocserv configuration."))
+
+tmpl.template = "cbi/tvalue"
+tmpl.rows = 20
+
+function tmpl.cfgvalue(self, section)
+	return nixio.fs.readfile("/etc/ocserv/ocserv.conf.template")
+end
+
+function tmpl.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	nixio.fs.writefile("/etc/ocserv/ocserv.conf.template", value)
+end
+
+ca = s:taboption("ca", Value, "_ca",
+	translate("View the CA certificate used by this server. You will need to save it as 'ca.pem' and import it into the clients."))
+
+ca.template = "cbi/tvalue"
+ca.rows = 20
+
+function ca.cfgvalue(self, section)
+	return nixio.fs.readfile("/etc/ocserv/ca.pem")
+end
+
+--[[DNS]]--
+
+s = m:section(TypedSection, "dns", translate("DNS servers"),
+	translate("The DNS servers to be provided to clients; can be either IPv6 or IPv4"))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tblsection"
+
+s:option(Value, "ip", translate("IP Address")).rmempty = true
+s.datatype = "ipaddr"
+
+--[[Routes]]--
+
+s = m:section(TypedSection, "routes", translate("Routing table"),
+	translate("The routing table to be provided to clients; you can mix IPv4 and IPv6 routes, the server will send only the appropriate. Leave empty to set a default route"))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tblsection"
+
+s:option(Value, "ip", translate("IP Address")).rmempty = true
+
+o = s:option(Value, "netmask", translate("Netmask (or IPv6-prefix)"))
+o.default = "255.255.255.0"
+o:value("255.255.255.0")
+o:value("255.255.0.0")
+o:value("255.0.0.0")
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/user-config.lua b/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/user-config.lua
new file mode 100644
index 00000000..3e241cb6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/user-config.lua
@@ -0,0 +1,149 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2014 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local fs = require "nixio.fs"
+local has_ipv6 = fs.access("/proc/net/ipv6_route")
+
+m = Map("ocserv", translate("OpenConnect VPN"))
+
+s = m:section(TypedSection, "ocserv", "OpenConnect")
+s.anonymous = true
+
+s:tab("general",  translate("General Settings"))
+s:tab("ca", translate("CA certificate"))
+s:tab("template", translate("Edit Template"))
+
+local e = s:taboption("general", Flag, "enable", translate("Enable server"))
+e.rmempty = false
+e.default = "1"
+
+function m.on_commit(map)
+	luci.sys.call("/usr/bin/occtl reload  >/dev/null 2>&1")
+end
+
+function e.write(self, section, value)
+	if value == "0" then
+		luci.sys.call("/etc/init.d/ocserv stop >/dev/null 2>&1")
+		luci.sys.call("/etc/init.d/ocserv disable  >/dev/null 2>&1")
+	else
+		luci.sys.call("/etc/init.d/ocserv enable  >/dev/null 2>&1")
+		luci.sys.call("/etc/init.d/ocserv restart  >/dev/null 2>&1")
+	end
+	Flag.write(self, section, value)
+end
+
+local o
+
+o = s:taboption("general", ListValue, "auth", translate("User Authentication"),
+	translate("The authentication method for the users. The simplest is plain with a single username-password pair. Use PAM modules to authenticate using another server (e.g., LDAP, Radius)."))
+o.rmempty = false
+o.default = "plain"
+o:value("plain")
+o:value("PAM")
+
+o = s:taboption("general", Value, "zone", translate("Firewall Zone"),
+	translate("The firewall zone that the VPN clients will be set to"))
+o.nocreate = true
+o.default = "lan"
+o.template = "cbi/firewall_zonelist"
+
+s:taboption("general", Value, "port", translate("Port"),
+	translate("The same UDP and TCP ports will be used"))
+s:taboption("general", Value, "max_clients", translate("Max clients"))
+s:taboption("general", Value, "max_same", translate("Max same clients"))
+s:taboption("general", Value, "dpd", translate("Dead peer detection time (secs)"))
+
+local pip = s:taboption("general", Flag, "predictable_ips", translate("Predictable IPs"),
+	translate("The assigned IPs will be selected deterministically"))
+pip.default = "1"
+
+local udp = s:taboption("general", Flag, "udp", translate("Enable UDP"),
+	translate("Enable UDP channel support; this must be enabled unless you know what you are doing"))
+udp.default = "1"
+
+local cisco = s:taboption("general", Flag, "cisco_compat", translate("AnyConnect client compatibility"),
+	translate("Enable support for CISCO AnyConnect clients"))
+cisco.default = "1"
+
+ipaddr = s:taboption("general", Value, "ipaddr", translate("VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Network-Address"))
+ipaddr.default = "192.168.100.1"
+ipaddr.datatype = "ip4addr"
+
+nm = s:taboption("general", Value, "netmask", translate("VPN <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+nm.default = "255.255.255.0"
+nm.datatype = "ip4addr"
+nm:value("255.255.255.0")
+nm:value("255.255.0.0")
+nm:value("255.0.0.0")
+
+if has_ipv6 then
+	ip6addr = s:taboption("general", Value, "ip6addr", translate("VPN <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Network-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+end
+
+
+tmpl = s:taboption("template", Value, "_tmpl",
+	translate("Edit the template that is used for generating the ocserv configuration."))
+
+tmpl.template = "cbi/tvalue"
+tmpl.rows = 20
+
+function tmpl.cfgvalue(self, section)
+	return nixio.fs.readfile("/etc/ocserv/ocserv.conf.template")
+end
+
+function tmpl.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	nixio.fs.writefile("/etc/ocserv/ocserv.conf.template", value)
+end
+
+ca = s:taboption("ca", Value, "_ca",
+	translate("View the CA certificate used by this server. You will need to save it as 'ca.pem' and import it into the clients."))
+
+ca.template = "cbi/tvalue"
+ca.rows = 20
+
+function ca.cfgvalue(self, section)
+	return nixio.fs.readfile("/etc/ocserv/ca.pem")
+end
+
+--[[DNS]]--
+
+s = m:section(TypedSection, "dns", translate("DNS servers"),
+	translate("The DNS servers to be provided to clients; can be either IPv6 or IPv4"))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tblsection"
+
+s:option(Value, "ip", translate("IP Address")).rmempty = true
+s.datatype = "ipaddr"
+
+--[[Routes]]--
+
+s = m:section(TypedSection, "routes", translate("Routing table"),
+	translate("The routing table to be provided to clients; you can mix IPv4 and IPv6 routes, the server will send only the appropriate. Leave empty to set a default route"))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tblsection"
+
+s:option(Value, "ip", translate("IP Address")).rmempty = true
+s.datatype = "ipaddr"
+
+o = s:option(Value, "netmask", translate("Netmask (or IPv6-prefix)"))
+o.default = "255.255.255.0"
+
+o:value("255.255.255.0")
+o:value("255.255.0.0")
+o:value("255.0.0.0")
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/users.lua b/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/users.lua
new file mode 100644
index 00000000..2f69c014
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ocserv/luasrc/model/cbi/ocserv/users.lua
@@ -0,0 +1,85 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2014 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local dsp = require "luci.dispatcher"
+local nixio  = require "nixio"
+
+m = Map("ocserv", translate("OpenConnect VPN"))
+
+if m.uci:get("ocserv", "config", "auth") == "plain" then
+
+--[[Users]]--
+
+function m.on_commit(map)
+	luci.sys.call("/etc/init.d/ocserv restart >/dev/null 2>&1")
+end
+
+s = m:section(TypedSection, "ocservusers", translate("Available users"))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tblsection"
+
+s:option(Value, "name", translate("Name")).rmempty = true
+s:option(DummyValue, "group", translate("Group")).rmempty = true
+pwd = s:option(Value, "password", translate("Password"))
+pwd.password = false
+
+function pwd.write(self, section, value)
+	local pass
+	if string.match(value, "^\$%d\$.*") then
+		pass = value
+	else
+		local t = tonumber(nixio.getpid()*os.time())
+		local salt = "$5$" .. t .. "$"
+		pass = nixio.crypt(value, salt)
+	end
+	Value.write(self, section, pass)
+end	
+
+--[[if plain]]--
+end
+
+local lusers = { }
+local fd = io.popen("/usr/bin/occtl show users", "r")
+if fd then local ln
+	repeat
+		ln = fd:read("*l")
+		if not ln then break end
+
+		local id, user, group, vpn_ip, ip, device, time, cipher, status = 
+			ln:match("^%s*(%d+)%s+([-_%w]+)%s+([%.%*-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+)%s+([%:%.-_%w]+).*")
+		if id then
+			table.insert(lusers, {id, user, group, vpn_ip, ip, device, time, cipher, status})
+		end
+	until not ln
+	fd:close()
+end
+
+
+--[[Active Users]]--
+
+local s = m:section(Table, lusers, translate("Active users"))
+s.anonymous = true
+s.template = "cbi/tblsection"
+
+s:option(DummyValue, 1, translate("ID"))
+s:option(DummyValue, 2, translate("Username"))
+s:option(DummyValue, 3, translate("Group"))
+s:option(DummyValue, 4, translate("IP"))
+s:option(DummyValue, 5, translate("VPN IP"))
+s:option(DummyValue, 6, translate("Device"))
+s:option(DummyValue, 7, translate("Time"))
+s:option(DummyValue, 8, translate("Cipher"))
+s:option(DummyValue, 9, translate("Status"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-ocserv/luasrc/view/admin_status/index/ocserv.htm b/trunk/package/luci/applications/luci-ocserv/luasrc/view/admin_status/index/ocserv.htm
new file mode 100644
index 00000000..45758069
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ocserv/luasrc/view/admin_status/index/ocserv.htm
@@ -0,0 +1 @@
+<%+ocserv_status%>
diff --git a/trunk/package/luci/applications/luci-ocserv/luasrc/view/ocserv_status.htm b/trunk/package/luci/applications/luci-ocserv/luasrc/view/ocserv_status.htm
new file mode 100644
index 00000000..fabc1bca
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ocserv/luasrc/view/ocserv_status.htm
@@ -0,0 +1,76 @@
+<script type="text/javascript">//<![CDATA[
+
+	function ocserv_disconnect(idx) {
+		XHR.get('<%=luci.dispatcher.build_url("admin", "services", "ocserv", "disconnect")%>/' + idx, null,
+			function(x)
+			{
+				var tb = document.getElementById('ocserv_status_table');
+				if (tb && (idx < tb.rows.length))
+					tb.rows[0].parentNode.removeChild(tb.rows[idx]);
+			}
+		);
+	}
+
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "ocserv", "status")%>', null,
+		function(x, st)
+		{
+			var tb = document.getElementById('ocserv_status_table');
+			if (st && tb)
+			{
+				/* clear all rows */
+				while( tb.rows.length > 1 )
+					tb.deleteRow(1);
+
+				for( var i = 0; i < st.length; i++ )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+					tr.insertCell(-1).innerHTML = st[i].user;
+					tr.insertCell(-1).innerHTML = st[i].group;
+					tr.insertCell(-1).innerHTML = st[i].vpn_ip;
+					tr.insertCell(-1).innerHTML = st[i].ip;
+					tr.insertCell(-1).innerHTML = st[i].device;
+					tr.insertCell(-1).innerHTML = st[i].time;
+					tr.insertCell(-1).innerHTML = st[i].cipher;
+					tr.insertCell(-1).innerHTML = st[i].status;
+
+					tr.insertCell(-1).innerHTML = String.format(
+						'<input class="cbi-button cbi-input-remove" type="button" value="<%:Disconnect%>" onclick="ocserv_disconnect(%d)" />',
+							st[i].id
+					);
+				}
+
+				if( tb.rows.length == 1 )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 5;
+						td.innerHTML = '<em><br /><%:There are no active users.%></em>';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<fieldset class="cbi-section">
+	<legend><%:Active OpenConnect Users%></legend>
+	<table class="cbi-section-table" id="ocserv_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:User%></th>
+			<th class="cbi-section-table-cell"><%:Group%></th>
+			<th class="cbi-section-table-cell"><%:IP Address%></th>
+			<th class="cbi-section-table-cell"><%:VPN IP Address%></th>
+			<th class="cbi-section-table-cell"><%:Device%></th>
+			<th class="cbi-section-table-cell"><%:Time%></th>
+			<th class="cbi-section-table-cell"><%:Cipher%></th>
+			<th class="cbi-section-table-cell"><%:Status%></th>
+			<th class="cbi-section-table-cell">&#160;</th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="5"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
diff --git a/trunk/package/luci/applications/luci-olsr-services/Makefile b/trunk/package/luci/applications/luci-olsr-services/Makefile
new file mode 100644
index 00000000..572afba3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-services/Makefile
@@ -0,0 +1,4 @@
+PO =
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-olsr-services/luasrc/controller/services.lua b/trunk/package/luci/applications/luci-olsr-services/luasrc/controller/services.lua
new file mode 100644
index 00000000..a4636bfd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-services/luasrc/controller/services.lua
@@ -0,0 +1,16 @@
+module "luci.controller.services"
+
+function index()
+	local uci = require "luci.model.uci".cursor()
+
+	uci:foreach("olsrd", "LoadPlugin", function(s)
+		if s.library == "olsrd_nameservice.so.0.3" then
+			has_serv = true
+		end
+	end)
+
+	if has_serv then
+		entry({"freifunk", "services"}, template("freifunk-services/services"), _("Services"), 60)
+	end
+end
+
diff --git a/trunk/package/luci/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm b/trunk/package/luci/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm
new file mode 100644
index 00000000..fbb39de8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm
@@ -0,0 +1,201 @@
+<%#
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%
+local fs  = require "luci.fs"
+local utl = require "luci.util"
+local last_update
+local i = 1
+local rawdata
+local rawdata6
+local services_file_empty = true
+local has_services = false
+local uci = require "luci.model.uci".cursor()
+local ip = require "luci.ip"
+
+uci:foreach("olsrd", "LoadPlugin", function(s)
+	if s.library == "olsrd_nameservice.so.0.3" then
+		local services_file=s.services_file
+		if services_file and fs.access(services_file) then
+			has_services = true
+			rawdata = fs.readfile(s.services_file)
+		else
+			services_file="/var/run/services_olsr"
+			if fs.access(services_file) then
+				has_services = true
+				rawdata = fs.readfile(services_file)
+			end
+		end
+		services_file=services_file..".ipv6"
+		if services_file and fs.access(services_file) then
+			has_services = true
+			rawdata6 = fs.readfile(services_file)
+		else
+			services_file="/var/run/services_olsr.ipv6"
+			if fs.access(services_file) then
+				has_services = true
+				rawdata6 = fs.readfile(services_file)
+			end
+		end
+		if rawdata and #rawdata ~= 0 then
+			services_file_empty = nil
+		end
+		if rawdata6 and #rawdata6 ~= 0 then
+			services_file_empty = nil
+		end
+	end
+end)
+
+
+if not has_services or services_file_empty then
+%>
+	<%+header%>
+	<br />
+	<%:No services can be shown, because olsrd is not running or the olsrd-nameservice Plugin is not loaded.%>
+	<%+footer%>
+<%
+	return
+end
+
+function fetch_services()
+	local tables = {}
+	if rawdata and #rawdata ~= 0 then
+		tables = utl.split(utl.trim(rawdata), "\n", nil, true)
+		-- remove first 3 lines
+		for i = 1,3 do
+			table.remove(tables,1)
+		end
+	end
+	local tables6 = {}
+	if rawdata6 and #rawdata6 ~= 0 then
+		tables6 = utl.split(utl.trim(rawdata6), "\n", nil, true)
+		-- remove first 3 lines
+		for i = 1,3 do
+			table.remove(tables6,1)
+		end
+	end
+
+	-- store last line in last_update and remove it, then remove another empty line at the end
+	last_update=table.remove(tables)
+	table.remove(tables)
+	last_update=table.remove(tables6)
+	table.remove(tables6)
+	for k, v in ipairs(tables6) do
+		table.insert(tables, v)
+	end
+	return tables
+end
+local services = fetch_services()
+
+if luci.http.formvalue("status") == "1" then
+	local rv = {}
+	for k, line in ipairs(services) do
+		local field = utl.split(line, "[#|]", split, true)
+		local origin_lnk = ip.IPv6(pcdata(field[4])) or ""
+		local origin_link = ""
+		if #origin_lnk ~= 0 and origin_lnk:is6() then
+			origin_link = "["..origin_lnk:string().."]"
+		else
+			origin_link = pcdata(field[4])
+		end
+		local url, proto, descr, origin = pcdata(field[1]), pcdata(field[2]), utl.trim(pcdata(field[3])), pcdata(field[4])
+		rv[#rv+1] = {
+			url = url,
+			proto = proto,
+			origin = origin,
+			origin_link = origin_link,
+			descr = descr,
+			}
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+	return
+end
+
+%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+
+	XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 },
+		function(x, info)
+		{
+		var tbody = document.getElementById('olsr_services');
+			if (tbody)
+			{
+				var s = '';
+				for (var idx = 0; idx < info.length; idx++)
+				{
+				var service = info[idx];
+				s += String.format(
+					'<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
+						'<td class="cbi-section-table-titles"><a href="%s">%s</a></td>' +
+						'<td class="cbi-section-table-titles">%s</td>' +
+						'<td class="cbi-section-table-titles"><a href="http://%s/cgi-bin-status.html">%s</a></td>' +
+					'</tr>',
+					service.url, service.descr, service.proto, service.origin_link, service.origin || '?'
+					);
+				}
+				tbody.innerHTML = s;
+			}
+		}
+	);
+//]]></script>
+	
+
+
+
+	<h2><a id="content" name="content"><%:Services%></a></h2>
+
+	<fieldset class="cbi-section">
+	<legend><%:Internal services%></legend>
+	<table class="cbi-section-table">
+		<thead>
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell"><%:Url%></th>
+				<th class="cbi-section-table-cell"><%:Protocol%></th>
+				<th class="cbi-section-table-cell"><%:Source%></th>
+			</tr>
+		</thead>
+
+		<tbody id="olsr_services">
+	<%
+		for k, line in ipairs(services) do
+			local field = {}
+			-- split line at # and |, 1=url, 2=proto, 3=description, 4=source
+			local field = utl.split(line, "[#|]", split, true)
+			local origin_lnk = ip.IPv6(pcdata(field[4])) or ""
+			local origin_link
+			if #origin_lnk ~= 0 and origin_lnk:is6() then
+				origin_link = "["..origin_lnk:string().."]"
+			else
+				origin_link = pcdata(field[4])
+			end
+			local url, proto, descr, origin = pcdata(field[1]), pcdata(field[2]), utl.trim(pcdata(field[3])), pcdata(field[4])
+			%>
+
+			<tr class="cbi-section-table-row cbi-rowstyle-<%=i%>">
+				<td class="cbi-section-table-titles"><a href="<%=url%>"><%=descr%></a></td>
+				<td class="cbi-section-table-titles"><%=proto%></td>
+				<td class="cbi-section-table-titles"><a href="http://<%=origin_link%>/cgi-bin-status.html"><%=origin%></a></td>
+			</tr>
+			<% i = ((i % 2) + 1)
+		end %>
+		</tbody>
+	</table>
+	<br />
+	<%=last_update%>
+	</fieldset>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr-viz/Makefile b/trunk/package/luci/applications/luci-olsr-viz/Makefile
new file mode 100644
index 00000000..a4f7c76e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-viz/Makefile
@@ -0,0 +1,4 @@
+PO = 
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh b/trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh
new file mode 100755
index 00000000..e33c6324
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+echo Content-type: text/html
+echo
+
+cat << EOF
+<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+var css=document.styleSheets[0];
+if (null!=css.insertRule) {
+css.insertRule(".label {color:black;background-color:white}", css.cssRules.length);
+}
+else {
+css.addRule(".label", "color:black");
+css.addRule(".label", "background-color:white");
+}
+</SCRIPT>
+<SCRIPT SRC="/luci-static/resources/olsr-viz.js" LANGUAGE="JavaScript1.2" TYPE="text/javascript"></SCRIPT>
+<DIV ID="main"
+STYLE="width: 100%; height: 93%; border: 1px solid #ccc; margin-left:auto; margin-right:auto; text-align:center; overflow: scroll">
+<DIV ID="edges" STYLE="width: 1px; height: 1px; position: relative; z-index:2"></DIV>
+<DIV ID="nodes" STYLE="width: 1px; height: 1px; position: relative; z-index:4"></DIV>
+</DIV>
+<DIV STYLE="z-index:99">
+<FORM ACTION="">
+<P><B TITLE="Bestimmt die Vergrößerungsstufe.">Zoom</B>&#160;<A HREF="javascript:set_scale(scale+0.1)">+</A>&#160;<A HREF="javascript:set_scale(scale-0.1)">&ndash;</A>&#160;<INPUT ID="zoom" NAME="zoom" TYPE="text" VALUE="2.0" SIZE="5" ONCHANGE="set_scale()">&#160;
+| &#160;<B TITLE="Beschränkt die Anzeige auf eine maximale Hop-Entfernung.">Metrik</B>&#160;<A HREF="javascript:set_maxmetric(maxmetric+1)">+</A>&#160;<A HREF="javascript:if(0<maxmetric)set_maxmetric(maxmetric-1)">&ndash;</A>&#160;<INPUT ID="maxmetric" NAME="maxmetric" TYPE="text" VALUE="3" SIZE="4" ONCHANGE="set_maxmetric(this.value)">&#160;
+| &#160;<B TITLE="Schaltet die automatischen Layout-Optimierung ein.">Optimierung</B><INPUT ID="auto_declump" NAME="auto_declump" TYPE="checkbox" ONCHANGE="set_autodeclump(this.checked)" CHECKED="CHECKED">&#160;
+| &#160;<B TITLE="Zeige Hostnamen an.">Hostnamen</B><INPUT ID="show_hostnames" NAME="show_hostnames" TYPE="checkbox" ONCHANGE="set_showdesc(this.checked)" CHECKED="CHECKED">&#160;
+| &#160;<A HREF="javascript:viz_save()" TITLE="Speichert die aktuellen Einstellungen in einem Cookie.">Speichern</A>&#160;
+| &#160;<A HREF="javascript:viz_reset()" TITLE="Startet das Viz-Skriptprogramm neu.">Zur&uuml;cksetzen</A></P>
+</FORM></DIV>
+<SPAN ID="debug" STYLE="visibility:hidden;"></SPAN>
+<IFRAME ID="RSIFrame" NAME="RSIFrame" STYLE="border:0px; width:0px; height:0px; visibility:hidden;">
+</IFRAME>
+<SCRIPT LANGUAGE="JavaScript1.2" TYPE="text/javascript">
+
+viz_setup("RSIFrame","main","nodes","edges");
+viz_update();
+
+</SCRIPT>
+EOF
diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/vizdata.sh b/trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/vizdata.sh
new file mode 100755
index 00000000..5a74f2be
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-viz/htdocs/cgi-bin/vizdata.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+echo Content-type: text/html
+echo
+
+cat<<EOF
+<HTML>
+<HEAD>
+	<TITLE>OLSR-VIZ Data</TITLE>
+	<META CONTENT="text/html; charset=iso-8859-1" HTTP-EQUIV="Content-Type">
+	<META CONTENT="no-cache" HTTP-EQUIV="cache-control">
+</HEAD>
+<BODY>
+
+<script langauge='JavaScript1.2' type='text/javascript'>
+EOF
+
+# sed + txtinfo plugin
+re_ip='[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}'
+re_sep='[[:space:]]\{1,\}'
+re_nosep='[^[:space:]]\{1,\}'
+wget http://127.0.0.1:2006/all -qO - | sed -n "
+/^Table: Links$/,/^$/ {
+s#		#	-	#g
+s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{3\}$re_sep\($re_nosep\)#parent.touch_edge(parent.touch_node('\1').set_metric(1).update(),parent.touch_node('\2').set_metric(1).update(),'\4');#p
+}
+/^Table: Topology$/,/^$/ {
+s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{2\}$re_sep\($re_nosep\)#parent.touch_edge(parent.touch_node('\1').update(),parent.touch_node('\2').update(),'\4');#p
+}
+/^Table: HNA$/,/^$/ {
+s#\($re_ip\)/\([0-9]\{1,\}\)$re_sep\($re_ip\)#parent.touch_hna(parent.touch_node('\3'),'\1','\2');#p
+}
+/^Table: Routes$/,/^$/ {
+s#\($re_ip\)/32$re_sep$re_nosep$re_sep\($re_nosep\).*#parent.touch_node('\1').set_metric('\2').update();#p
+}
+"
+
+hosts=$(uci show olsrd|grep hosts_file|cut -d "=" -f 2)
+if [ -n $hosts ]; then
+sed -n "
+s#\($re_ip\)$re_sep\($re_nosep\)$re_sep.*#parent.touch_node('\1').set_desc('\2');#p
+" < $hosts
+fi
+
+cat<<EOF
+	parent.viz_callback();
+</script>
+</BODY></HTML>
+EOF
diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz.js b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
new file mode 100644
index 00000000..49435a4a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
@@ -0,0 +1,818 @@
+/*
+Copyright (c) 2006, Lorenz Schori <lo@znerol.ch>
+All rights reserved (Naja: Ich hab' trotzdem was geaendert. Sven-Ola). (Naja:
+diese Rechte garantiert dir die BSD-Lizenz ja ausdrücklich. Lorenz)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the <ORGANIZATION> nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+OLSR-Viz is inspired by Wi-viz: http://wiviz.natetrue.com
+
+Changes:
+2007-10-04: Added hostname display option -- Stefan Katerkamp <stefan@katerkamp.de>.
+2007-10-04: Optimized display by moving presentation css out of js -- lo
+2010-12-11: Changed some paths to make it work with Kamikaze and Luci -- soma
+*/
+
+var cgi_url = "/cgi-bin/vizdata.sh";
+
+var maxmetric = 3;
+var iconvariant = "-mini";
+var nodes = new Array();
+var ncount = 0;
+var newnodes = new Array();
+var edges = new Array();
+var iel = 220; // ideal edge length
+var optsize = 10; // boundingbox around nodes
+
+var vwidth = 0;
+var vheight = 0;
+
+var xoff = 0;
+var yoff = 0;
+var scale = 1.0;
+
+var idle_timeout = 15;
+var erase_timeout = 60;
+var dcl_timeout = 250;
+var dcllow_timeout = 500;
+var auto_declump = true;
+var showdesc = true;
+var auto_save = 1;
+var now_secs = 5;
+
+// dom elements
+var IFrameObj;
+var maindiv;
+var nodediv;
+var edgediv;
+
+/******* CALL TO SERVER ********/
+function callToServer(URL) {
+	var IFrameDoc;
+
+	if (IFrameObj.document) {
+		// For IE5 + opera
+		IFrameDoc = IFrameObj.document;
+	}
+	else if (IFrameObj.contentDocument) {
+		// For NS6
+		IFrameDoc = IFrameObj.contentDocument;
+	}
+	else if (IFrameObj.contentWindow) {
+		// For IE5.5 and IE6
+		IFrameDoc = IFrameObj.contentWindow.document;
+	}
+ 	else {
+		// opera? hmmmm
+		return true;
+	}
+
+	IFrameDoc.location.replace(URL);
+	return false;
+}
+
+
+/******** EDGE CLASS ********/
+function edge(n1,n2){
+	this.getHTML = function()
+	{
+		var nh = "";
+
+		if(this.n1.metric > maxmetric || this.n2.metric > maxmetric) {
+			return "";
+		}
+
+		x = this.n1.x*scale;
+		y = this.n1.y*scale;
+		dx = this.n2.x*scale - x;
+		dy = this.n2.y*scale - y;
+
+		x += xoff*scale + 75;
+		y += yoff*scale + 15;
+
+		imgtag = "<img src='/luci-static/resources/olsr-viz/dot_"
+		if (this.etx > 0 && this.etx < 2) {
+			imgtag += "good.gif'";
+		}
+		else if(this.etx > 2 && this.etx < 5) {
+			imgtag += "ok.gif'";
+		}
+		else if(this.etx > 5 && this.etx < 10) {
+			imgtag += "weak.gif'";
+		}
+		else {
+			imgtag += "down.gif'";
+		}
+		imgtag += " alt='ETX: " + this.etx + "' title='ETX: " + this.etx + "' ";
+
+		d = Math.sqrt(dx*dx+dy*dy);
+
+		for (j = 0; j < d; j += 15) {
+			nh += imgtag + "style='top:"
+			+ parseInt(y+dy * j / d) + "px; left:"
+			+ parseInt(x+dx * j / d) + "px; "
+			+ "width: 4px; height: 4px; position: absolute; z-index: 2' >";
+		}
+
+		nh += "<div style='top:"
+		+ parseInt(y+dy * 0.5 - 5) + "px; left:"
+		+ parseInt(x+dx * 0.5 - 24) + "px; "
+		+ "position: absolute; z-index: 3; width: 48px; text-align: center;' >"
+		+ "<span class='label etx' >" + this.etx + "</span></div>";
+
+		return nh;
+	}
+
+	this.isIdle = function()
+	{
+		return (now_secs - this.lastseen > idle_timeout);
+	}
+
+	this.isDead = function()
+	{
+		return (now_secs - this.lastseen > erase_timeout);
+	}
+
+	this.cleanup = function()
+	{
+		if(this.n1 && this.n1.weight) {
+			this.n1.weight--;
+		}
+		if(this.n2 && this.n2.weight) {
+			this.n2.weight--;
+		}
+		if(this.n1 && this.n2) {
+			delete this.n1.edges[n2.ip];
+			delete this.n2.edges[n1.ip];
+		}
+	}
+
+	this.n1 = n1;
+	this.n2 = n2;
+
+	// setup edges within node objects
+	this.n1.weight++;
+	this.n1.edges[n2.ip] = this;
+	this.n2.weight++;
+	this.n2.edges[n1.ip] = this;
+
+	return this;
+}
+
+function getEdgeKey(ip1,ip2)
+{
+	key = "";
+	if(ip1 > ip2) {
+		key = ip2 + "-" + ip1;
+	}
+	else {
+		key = ip1 + "-" + ip2;
+	}
+	return key;
+}
+
+function touch_edge(n1,n2,etx)
+{
+	var key = getEdgeKey(n1.ip,n2.ip);
+	var e = edges[key];
+	if(!e) {
+		e = new edge(n1,n2);
+		edges[key] = e;
+	}
+	e.etx = etx;
+	e.lastseen = now_secs;
+	return e;
+}
+
+/******** NODE CLASS ********/
+function node(ip) {
+	this.getHTML = function()
+	{
+		var nh;
+
+		if(this.metric > maxmetric) {
+			return "";
+		}
+		var igw = 0;
+		for(h in this.hna) {
+			if(h == "0.0.0.0") {
+				igw = 1;
+				break;
+			}
+		}
+		nh =
+			"<div id='node_" + this.ip + "' onmousedown='dragstart(this)' style="
+			+ "'top: " + parseInt((this.y+yoff)*scale) + "px; "
+			+ "left: " + parseInt((this.x+xoff)*scale) + "px; "
+			+ "width: 150px; height: 1px; z-index: 4; "
+			+ "position: absolute; background-color: transparent;' >"
+			+ "<div><img src='/luci-static/resources/olsr-viz/node"+(igw ? "-hna" : "")+iconvariant + ".gif'"
+			+ " alt='node " + this.ip + "' style='border: none;'><br>"
+			+ 	"<a href='http://" + this.ip + "/'>"
+			+ 	"<span class='label ip'>" + this.ip + "</span></a>"
+			+ 	(showdesc && this.desc != "" ? 
+						"<br><span class='label desc'>" + this.desc + "</span>" : "")
+			+ "</div></div>";
+		return nh;
+	}
+
+	this.isIdle = function()
+	{
+		return (now_secs - this.lastseen > idle_timeout);
+	}
+
+	this.isDead = function()
+	{
+		return (now_secs - this.lastseen > erase_timeout);
+	}
+
+	this.cleanup = function()
+	{
+		ncount--;
+	}
+	
+	this.set_metric = function(metric) {
+		this.metric = metric;
+		return this;
+	}
+	
+	this.set_desc = function(desc) {
+		this.desc = desc
+		return this;
+	}
+	
+	this.update = function() {
+		this.lastseen = now_secs;
+		return this;
+	}
+	
+	this.ip = ip;
+	this.x = 0;
+	this.y = 0;
+	this.dx_last=0;
+	this.dy_last=0;
+	this.placed = false;
+	this.weight = 0;
+	this.edges = new Array();
+	this.hna = new Array();
+	this.pinned = false;
+	this.metric = 999;
+	this.desc = "";
+
+	ncount++;
+	return this;
+}
+
+function touch_node(ip) {
+	n = nodes[ip];
+	if(!n) {
+		n = new node(ip);
+		nodes[ip] = n;
+		// newnodes.push(n);
+		// push and pop not supported in old ie. shit.
+		newnodes[newnodes.length] = n;
+	}
+	return n;
+}
+
+function place_new_nodes() {
+	var nc = 0;
+	for(i = 0;i<newnodes.length;i++){
+		n = newnodes[i];
+		if(n.placed){continue;}
+		if(sp = getCookie("node_"+n.ip)) {
+			xy = sp.split("x");
+			debug_writeln("sp: "+sp+" xy[0]: "+xy[0]+" xy[1]: "+xy[1]);
+			n.x = parseFloat(xy[0]);
+			n.y = parseFloat(xy[1]);
+		}
+		else if(n.weight>1){
+			// see if we find allredy placed nodes
+			ox=0,oy=0;dx=0,dy=0;c=0;
+			for(e in n.edges){
+				if(nodes[e] && nodes[e].placed){
+					if(!ox && !oy) {
+						ox = nodes[e].x;
+						oy = nodes[e].y;
+					}
+					else {
+						dx += nodes[e].x - ox;
+						dy += nodes[e].y - oy;
+					}
+					c++;
+				}
+			}
+			if(c>0) {
+				n.x = ox + dx/c + Math.random()*iel/2-iel/4;
+				n.y = oy + dy/c + Math.random()*iel/2-iel/4;
+			}
+		}
+		else {
+			// beginn somewhere
+			n.x = Math.random()*400;
+			n.y = Math.random()*400;
+		}
+		n.placed = true;
+		nc++;
+	}
+	newnodes.length=0;
+	return nc;
+}
+
+/******** HNA CLASS ********/
+function hna(gw,net,mask) {
+	this.gw = gw;
+	this.net = net;
+	this.mask = mask;
+	return this;
+}
+
+function touch_hna(node,net,mask) {
+	h = node.hna[net];
+	if(!h) {
+		h = new hna(node.ip,net,mask);
+		node.hna[net] = h;
+	}
+
+	h.lastseen = now_secs;
+	return h;
+}
+
+/******** VIZ SETUP AND SETTINGS ********/
+function viz_setup(iframeid,maindivid,nodedivid,edgedivid) {
+	// assign a reference to the
+	// object to our global variable IFrameObj.
+	IFrameObj=document.getElementById(iframeid);
+	if (document.frames) {
+		// this is for IE5 Mac, because it will only
+		// allow access to the document object
+		// of the IFrame if we access it through
+		// the document.frames array
+		IFrameObj = document.frames[iframeid];
+	}
+
+	draginit();
+
+	maindiv=document.getElementById(maindivid);
+	nodediv=document.getElementById(nodedivid);
+	edgediv=document.getElementById(edgedivid);
+
+	// autosave on exit?
+	if((autosave = getCookie("prefs_autosave"))) {
+		auto_save = parseInt(autosave);
+	}
+	viz_autosave(auto_save);
+
+	// maximum metric of surrounding nodes
+	if(mmx = getCookie("prefs_maxmetric")) {
+		set_maxmetric(mmx,true,true);
+	}
+
+	// scale of view
+	if((savescale = getCookie("prefs_scale")) &&
+		 (savescale = parseFloat(savescale))) {
+			set_scale(savescale,true);
+	}
+
+	// scroll - FIXME
+	/*
+	if(val = getCookie("prefs_innerview")) {
+		iv = val.split("x");
+		if (iv[0] && (iv[0] = parseInt(iv[0])) &&
+				iv[1] && (iv[2] = parseInt(iv[2])) &&
+				iv[3] && (iv[3] = parseInt(iv[3])) &&
+				iv[4] && (iv[4] = parseInt(iv[4])))
+		{
+			maindiv.scrollLeft = iv[0] + "px";
+			maindiv.scrollHeight = iv[1] + "px";
+		}
+	}
+	*/
+}
+
+function viz_save()
+{
+	// let cookie survive a month
+	exp = new Date();
+	exp.setTime(exp.getTime() + 2592000000);
+	// save node positions
+	for(ip in nodes)
+	{
+		if(nodes[ip].metric > maxmetric) {
+			continue;
+		}
+		setCookie("node_"+ip,nodes[ip].x+"x"+nodes[ip].y,exp);
+	}
+
+	// save maxmetric
+	setCookie("prefs_maxmetric",maxmetric,exp);
+
+	// save zooming
+	setCookie("prefs_scale",scale,exp);
+
+	// save scroll - FIXME
+	setCookie("prefs_innerview",
+		parseInt(maindiv.scrollLeft)+"x"+parseInt(maindiv.scrollTop)+"x"+
+		parseInt(vwidth*scale)+"x"+parseInt(vheight*scale),exp);
+}
+
+function viz_autosave(autosave)
+{
+	auto_save = autosave;
+	if(auto_save) {
+		document.body.onunload=viz_save;
+	}
+	else {
+		deleteCookie("prefs_autosave");
+	}
+}
+
+function viz_reset()
+{
+	deleteAllCookies();
+	for(ip in nodes) {
+		delete nodes[ip];
+	}
+	for(e in edges) {
+		delete edges[e];
+	}
+	viz_update();
+}
+
+var updateTimer = 0;
+function viz_update() {
+	if (updateTimer) {
+		clearTimeout(updateTimer);
+	}
+	now_secs = new Date().getTime()/1000;
+	callToServer(cgi_url);
+}
+
+function viz_callback() {
+	if (updateTimer) {
+		clearTimeout(updateTimer);
+	}
+
+	if(place_new_nodes() > 0 && auto_declump) {
+		declump();
+	}
+	refresh();
+	updateTimer = setTimeout('viz_update()', 5000);
+}
+
+var refresh_running = false;
+function refresh() {
+	if(refresh_running) {
+		return;
+	}
+	refresh_running = true;
+
+	var nh = "";
+
+	// refresh nodes
+	nh = "";
+	for (var n in nodes) {
+		if(nodes[n].isDead()) {
+			nodes[n].cleanup();
+			delete nodes[n];
+		}
+		else {
+			nh += nodes[n].getHTML();
+		}
+	}
+	nodediv.innerHTML = nh;
+
+	// refresh edges
+
+		nh = "";
+	for (var e in edges) {
+		if(edges[e].isDead()) {
+			edges[e].cleanup();
+			delete edges[e];
+		}
+		else {
+			nh += edges[e].getHTML();
+		}
+	}
+	edgediv.innerHTML = nh;
+	refresh_running = false;
+}
+
+function set_showdesc(doit)
+{
+	showdesc = doit;
+	if(!noupdate) refresh();
+}
+
+function set_autodeclump(doit)
+{
+	auto_declump = doit;
+	if(doit) {
+		declump();
+	}
+	else {
+		clearTimeout(dclTimer);
+	}
+}
+
+function set_scale(inscale,noupdate)
+{
+	if(!inscale) {
+		inscale = parseFloat(document.getElementById("zoom").value/2);
+	}
+	scale = Math.round(inscale*100)/100;
+	if(!scale || scale<0.1) {
+		scale = 0.1;
+	}
+	document.getElementById("zoom").value = scale*2;
+	if(!noupdate) refresh();
+}
+
+function set_maxmetric(inmetric,noupdate,noconfirm)
+{
+	inmetric = parseInt(inmetric);
+	if(inmetric > 0 || !noconfirm || confirm("warning. setting the maximum metric to zero can lead to expensive calculations if you are connected to a network with many nodes. do you want to proceed?")) {
+		maxmetric = inmetric;
+	}
+	document.getElementById("maxmetric").value = maxmetric;
+	if(!noupdate) refresh();
+}
+
+// k = area / nodes
+function fr(x) {
+	return Math.pow((iel*iel)/x,2);
+}
+
+function fa(x) {
+	return Math.pow((x*x)/iel,2);
+}
+
+var dclTimer = 0;
+var declump_running = false;
+function declump(t) {
+	// clear declump timer
+	if(dclTimer) {
+		clearTimeout(dclTimer);
+	}
+	if(declump_running) {
+		return;
+	}
+	declump_running = true;
+
+	// nodes
+	nc = 0;
+	for (var ip1 in nodes) {
+		nodes[ip1].fr_x=0;
+		nodes[ip1].fr_y=0;
+		nodes[ip1].fa_x=0;
+		nodes[ip1].fa_y=0;
+		nodes[ip1].x_next = nodes[ip1].x;
+		nodes[ip1].y_next = nodes[ip1].y;
+		nodes[ip1].randdisplace = 0;
+	}
+	for (var ip1 in nodes) {
+		if(nodes[ip1].metric > maxmetric || nodes[ip1].pinned) {
+			continue;
+		}
+		for (ip2 in nodes) {
+			if (nodes[ip2].metric > maxmetric || ip1 == ip2) {
+				continue;
+			}
+			dx = (nodes[ip1].x_next - nodes[ip2].x_next);
+			dy = (nodes[ip1].y_next - nodes[ip2].y_next);
+			d = Math.sqrt(dx*dx+dy*dy);
+			d = Math.max(d-optsize,(d+optsize)/optsize);
+
+			nodes[ip1].fr_x += (dx/d) * fr(d);
+			nodes[ip1].fr_y += (dy/d) * fr(d);
+		}
+
+		dx = nodes[ip1].fr_x;
+		dy = nodes[ip1].fr_y;
+		d = Math.sqrt(dx*dx+dy*dy);
+		md = Math.min(d,iel/nodes[ip1].weight);
+		nodes[ip1].x_next += (dx / d) * md;
+		nodes[ip1].y_next += (dy / d) * md;
+		nc++;
+	}
+
+	// edges
+	ec = 0;
+	for (var e in edges) {
+		if (!edges[e].n1 || !edges[e].n2 ||
+			edges[e].n1.metric > maxmetric || edges[e].n2.metric > maxmetric) {
+			continue;
+		}
+		dx = (edges[e].n1.x_next - edges[e].n2.x_next);
+		dy = (edges[e].n1.y_next - edges[e].n2.y_next);
+		d = Math.sqrt(dx*dx+dy*dy);
+//		d = Math.max(d-optsize,(d+optsize)/optsize);
+
+		edges[e].n1.fa_x -= (dx/d) * fa(d);
+		edges[e].n1.fa_y -= (dy/d) * fa(d);
+		edges[e].n2.fa_x += (dx/d) * fa(d);
+		edges[e].n2.fa_y += (dy/d) * fa(d);
+		ec++;
+	}
+
+	// displacement
+	xmin=-20;ymin=-20;xmax=20;ymax=20;dsum=0;
+	for (var ip in nodes) {
+		if(nodes[ip].metric > maxmetric || nodes[ip].pinned) {
+			continue;
+		}
+
+		dx = nodes[ip].fa_x;
+		dy = nodes[ip].fa_y;
+		d = Math.sqrt(dx*dx+dy*dy);
+		dx = (dx / d) * Math.min(d,iel/nodes[ip].weight) * 0.75 + nodes[ip].dx_last * 0.25;
+		dy = (dy / d) * Math.min(d,iel/nodes[ip].weight) * 0.75 + nodes[ip].dy_last * 0.25;
+
+		nodes[ip].dx_last = dx;
+		nodes[ip].dy_last = dy;
+		nodes[ip].x_next += dx;
+		nodes[ip].y_next += dy;
+
+		if(!nodes[ip].x_next || !nodes[ip].y_next) {
+			continue;
+		}
+
+		dx = (nodes[ip].x - nodes[ip].x_next);
+		dy = (nodes[ip].y - nodes[ip].y_next);
+		dsum += Math.sqrt(dx*dx+dy*dy);
+
+		nodes[ip].x = nodes[ip].x_next;
+		nodes[ip].y = nodes[ip].y_next;
+
+		xmin = Math.min(xmin,nodes[ip].x);
+		xmax = Math.max(xmax,nodes[ip].x);
+		ymin = Math.min(ymin,nodes[ip].y);
+		ymax = Math.max(ymax,nodes[ip].y);
+	}
+	vwidth=(xmax-xmin);
+	vheight=(ymax-ymin);
+
+	xoff=-xmin;
+	yoff=-ymin;
+	/*
+	document.getElementById('debug').innerHTML = "<br>" +
+		"offset: " + xoff + "x" + yoff + " dsum: " + dsum + "<br>" +
+		"nc: " + nc + " ec: " + ec + "xmax: " + xmax + " xmin: " + xmin +	"<br>" +
+		"optsize: " + optsize + "<br>";
+		*/
+	refresh();
+	if(auto_declump) {
+		dclTimer = setTimeout("declump()", dsum>ncount ? dcl_timeout : dcllow_timeout );
+	}
+	declump_running = false;
+}
+
+//Das Objekt, das gerade bewegt wird.
+var dragip = null;
+
+// Position, an der das Objekt angeklickt wurde.
+var dragx = 0;
+var dragy = 0;
+
+// Mausposition
+var posx = 0;
+var posy = 0;
+
+function draginit() {
+	// Initialisierung der ãberwachung der Events
+
+	document.onmousemove = drag;
+	document.onmouseup = dragstop;
+}
+
+
+function dragstart(element) {
+	//Wird aufgerufen, wenn ein Objekt bewegt werden soll.
+	dragip = element.id.split("_")[1];
+	dragx = posx - element.offsetLeft;
+	dragy = posy - element.offsetTop;
+
+	n = nodes[dragip];
+	if(n) {
+		n.pinned = true;
+	}
+}
+
+
+function dragstop() {
+	//Wird aufgerufen, wenn ein Objekt nicht mehr bewegt werden soll.
+
+	n = nodes[dragip];
+	if(n) {
+		n.pinned = false;
+	}
+	refresh();
+	dragip=null;
+}
+
+
+function drag(ereignis) {
+	//Wird aufgerufen, wenn die Maus bewegt wird und bewegt bei Bedarf das Objekt.
+
+	posx = document.all ? window.event.clientX : ereignis.pageX;
+	posy = document.all ? window.event.clientY : ereignis.pageY;
+	if(dragip != null) {
+		n = nodes[dragip];
+		if(n) {
+			n.x = (posx - dragx)/scale - xoff;
+			n.y = (posy - dragy)/scale - yoff;
+		}
+		e = document.getElementById('node_'+dragip);
+		e.style.left = parseInt((n.x+xoff)*scale) + "px";
+		e.style.top = parseInt((n.y+yoff)*scale) + "px";
+	}
+}
+
+function debug_writeln(line)
+{
+	document.getElementById('debug').innerHTML = line + "<br>" + document.getElementById('debug').innerHTML;
+}
+
+/**
+ * Sets a Cookie with the given name and value.
+ *
+ * name			 Name of the cookie
+ * value			Value of the cookie
+ * [expires]	Expiration date of the cookie (default: end of current session)
+ * [path]		 Path where the cookie is valid (default: path of calling document)
+ * [domain]	 Domain where the cookie is valid
+ *							(default: domain of calling document)
+ * [secure]	 Boolean value indicating if the cookie transmission requires a
+ *							secure transmission
+ */
+
+function setCookie(name, value, expires, path, domain, secure) {
+	document.cookie= name + "=" + escape(value) +
+		((expires) ? "; expires=" + expires.toGMTString() : "") +
+		((path) ? "; path=" + path : "") +
+		((domain) ? "; domain=" + domain : "") +
+		((secure) ? "; secure" : "");
+}
+
+/**
+ * Gets the value of the specified cookie.
+ *
+ * name	Name of the desired cookie.
+ *
+ * Returns a string containing value of specified cookie,
+ *	 or null if cookie does not exist.
+ */
+
+function getCookie(name)
+{
+	var results = document.cookie.match ( name + '=(.*?)(;|$)' );
+	if (results) {
+		return unescape(results[1]);
+	}
+	return null;
+}
+
+/**
+ * Deletes the specified cookie.
+ *
+ * name		name of the cookie
+ * [path]	path of the cookie (must be same as path used to create cookie)
+ * [domain]	domain of the cookie (must be same as domain used to create cookie)
+ */
+
+function deleteCookie(name, path, domain) {
+	if (getCookie(name)) {
+		document.cookie = name + "=" +
+			((path) ? "; path=" + path : "") +
+			((domain) ? "; domain=" + domain : "") +
+			"; expires=Thu, 01-Jan-70 00:00:01 GMT";
+	}
+}
+
+function deleteAllCookies() {
+	cookies = document.cookie.split("; ");
+	for(i=0;i<cookies.length;i++) {
+		deleteCookie(cookies[i].split("=")[0]);
+	}
+}
diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_down.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4244202f70f8f59006199c341514e575d9ef849
GIT binary patch
literal 46
ycmZ?wbhEHbWMN=oXkcV`^XAR}|Nj+#vM@3*Ff!;c00Bsbfr*tTVfpkx25SH{NDG7j

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_good.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3a2be32b42746136e0852cf4bb7d9eeaa8655d0b
GIT binary patch
literal 46
ycmZ?wbhEHbWMN=oXkcXUJ>d2K|9{1wEQ|~cj0`#qKmd|qU}EJ-SUx?F!5RPus|ptY

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_ok.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b5dd48da75cacf0eb7282e4efba1e344363093c8
GIT binary patch
literal 46
ycmZ?wbhEHbWMN=oXkcXcdouk0|Nn|VSr{1@7#VaJfB+=Jz{JXvuzY$TgEasl4hr1>

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/dot_weak.gif
new file mode 100644
index 0000000000000000000000000000000000000000..36542c4d62da92cb85819ad84e7d221b402e44f6
GIT binary patch
literal 46
ycmZ?wbhEHbWMN=oXkcVGbLPzd|Nj+#vM@3*Ff!;c00Bsbfr*tTVfpkx25SH*NDCwY

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-hna-mini.gif
new file mode 100644
index 0000000000000000000000000000000000000000..529b3d7e967d9fbbfc7c1f6144fb3d5e321a2e0e
GIT binary patch
literal 1192
zcmV;Z1Xue<Nk%w1VHf}w0Qdg@F)=blLq$SCLlYAd009C1{{H>_{r2|u`uh4mK0x*L
z^~A))y}i9FGBtR2caf2i!otEeHaPe9_wVoTN=HfGS42riNp(q3hDcSLOi(#FJNWqc
zz-wjS-`_SiIBIBVH8eKVUSDr-a3v-m${rSWV`$4(MmIM*J25%vI47Q-o>xpy-##*j
zhKNf`O{1ctmozTw<K$mmUh3=X*4EeV?(WIS$==@HbWcpmJul@$IZH}QR#a9qG&(~=
zMKv`yt*)-XQ&5FQNQHTP&dJW<I4|HoFXuff)jBNPG%MyeCE6n$o}i%4M>>g)kh4)$
z*tNUdLqh56>%lKDYBxP?Yi*D)HQhu$U|?Y2b#qQlPkeuXuQe<5@bJ!MWBvX9WMgBf
zsHpMi>f++!JvBg_SXhWtSA&Cu)Ya8ZOiWKtPwP}x$jHbpFDpkXK};)0^Yin5e}8mL
zPs=+j=0P)}p`t-TLk0>7NJ&b1dVA?YEo*6MGc`ChH8n#*MA%|h+1S~(wziLskK|@>
zVo+1XjEaI{apR?-w=FHOWoEx^Y{$sQ`ReS)$H?M8E8pVd=Q%IY(bCm2Dq2@t-ZCX>
zbbJdA96TQ&dV74DL`1lGenCG%$6smp`1thc>ClCL=tw#A^YleMKUO9z&0J7NMo8%B
z=pG#<+*4Y6X>4dMF~~0~bTlz+ZEtUIaJyq>(oH|RP)hOe@Z;a%W@cwmP*GJ=Q!z3u
zGBY$|JVD_!Dfsj9{QUg)^7G~1-*YuX-$+4na&X<<-RW9R-aI<0tE=Yb=F%-C;NakJ
zW^0Oyi{Ws3?BwPi9v_QaWZ6zeky>WFyt|B2Qr^eNg@}nvPEX}PEtr&==vP-aE;ukQ
zFlT0HBPuPy!NK|Y`Px7$?aIq*YHRZH^2u&$eSLl7QcvbnPx|@#q%}0^>gwb}GR$RS
zy*fR%GA}_uLcmK#wym!W3=EnxE?{0^d3kzPR#)gjEq8Wxh=_@Zh=@BnJLX?xH8eF#
zN=*O%|NsC0A^8LW00930EC2ui02lxk000R80RIUbNO0g78wCmagX1qD!5a%43N)~w
zfJA}F8eKF1!Q#bGfi4z+VBq4v3Cb?=Du%!$AQcx8;8S37(SwE#H_)13l0gfc2^FXj
z*E3H^hX(*07+3&-gc`<7nF12WMx>(zCG<&mpaYvQ`96Tz6Ry=3Os?)l^9J<aj2&7^
z1+Wl6K)+hHcubmC#X&G~Or&`Hhh;!B5E|UMOORlbA3HwqRFjdcM5-b1WLZ3;Edj0{
z9`v2)5g`JF6@=uNF$C?^x^ao7oqOS;9squP8i>L{CfkJ!PrPJVHfSHJVNseCs>9Dg
zng%FxWvcKlM7cHC%mIU>D~Y6U$CmtsK@*Q2H6iU*(E+7{SdkP*)UiN<&I&0_K`0&i
zLZj0o4%R5)h&_53kpma<urkUo7`(v_C$X3i!$AIkbHx;Mz@W+{r;Kn10hYK?hBHtw
z;>j+9{UgRRh)_`pHv|lDOB*6wL&Pjyq(~4mu#g~)6Wa*#KsUk|fYn94e4>aiZJG2>
GKma@8=`Yg&

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif b/trunk/package/luci/applications/luci-olsr-viz/htdocs/luci-static/resources/olsr-viz/node-mini.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4d8b7c94e08f07fba39e1c9b089cf82e3105be3d
GIT binary patch
literal 1194
zcmV;b1XcS-Nk%w1VHf}w0Qdg@OJlA}OH4I4IYB~2E-^C{6B0v2Mm;}5Gd4H@0RaB~
z{{8*^`uh6z_V)Gl^}@o!#Kgq-`1tqt_mPp2@9*zQOioKoO*KrARCK%F-{3PdH&t-L
zFD@!}jJHE%upJ*DMMp|UM@m<Bzt7j{hKGogm7hXqvQcipPHDvb{r+ojZz?ue^7HuL
z;pP1N{CatMh=++RFhub1@nUz6)YR5eakX%f!1D6)$;rv6r>QeADljlFG&DB8y}dU&
zJtig}f|jsSW{X{5V~UH6c6WGSbFx5Eh(1-CjGDt{XK2>e*Y57_O;UAZc!ok>qB1v3
zc89f6bGb)IO=@v`YievkSD8#?xre6APElB3U}0TdVogp^W@cwIH8#AvyQ-_J<mc|?
z<>gIjwI(!TVR4V$;O9PDr(=M=>g((3>grK$zv%4qUx2-HlFCMAt6hG&RZ&&Q$;oDI
zcir9HK|w{XvA0xISX5V93=9lTOind5H9tW^y}i9RI6H2O#-pO7d3Jd7^!HzVz>u21
zS7V2so}OH9j`Z{N*x1>}$H;Di!N<tRZ-~mFo}XrXzGZ!>O>DMRT3(2ViCA^P(b3XU
zUU7MRe7nWheSm;IPlsfEqV4hbZ-1!h=;+7F)yU1=QDJ;NJxEGPNl<R6t+>{3Z*OmM
za87K#R&KKk4H;=@YFKl>h@Z+!UXXyH%vx!KH$`xBaBy;Rc6^)4cXf4SVPsKQW8mQ6
z;^N@q;^HzfG9M>De|md0NP;myXnKE#J4b7+uCC+d>tKAtL_<aA=jTgnvR-twgM)-7
zIBrf_cZi3Fa)_<K!NE6Ksb_n(`T6-}fVy~&xbgDze2%#5>*`T$zEf?ykB*P(?ejD<
zIygK%E;&VVl+0aos*R0|M`y2Je7y7X^I&h3$jHf}p`vGNbou)G-rn9QC@5ESyLFPY
zLPJJtY;Qh6L_$nqQBYEBXKM=y1ypdrcZaP{Pfsf{G`6<4JU~J=HaHp`DRYj$dU|^?
zGd2JJ|NsC0A^8LW00930EC2ui02lxk000R80RIUbNN`}TI0Xs%6X!1>L39ut3S0m|
zfkc6~5?x&Iz~aS2_bw`Uu;Ai93PUcs_`<*>qCyuLNOE9u(S(K$BXFT$k`D=-2_4kC
zVX_Cmk`5c_YA{d%0|`sQbSf4M6Ans92};nDra=aBIbf)&6_1JvOqNX1@&XO$KQsZh
zfG`k(7@Yv{;Mj>Iq#dAGyc$*W_%BO=4+wnh8F1i$J9YyMh{~hIoSZ4Y>d3H&i~zoV
z2n1~Fqb*-PDOhY(devkGvkufaeLDB2!W{x#H0%h)<Vg%=hBQfIb;Z>z8;sbX8dQ!4
z5exRXy$j;V+de<t+W0vmB1#QoR=}BuP(%aIi)Emkc$hRy&>IYDPOMTV=E#L-KpsIN
zl|o4bT=bxD$~E(BU=09O7y--*y|j|dDC>ArgfIj7GeS6S0Fa3<yXf<SJPD*S#yDhL
zvPm|95cba+(U<{?Ea@arfDRm#Qi3NfOrs(}U>xHNA>Sl{%>>QNu|QTAv48{=Ww>S1
IKLG&%I|ZgZL;wH)

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua b/trunk/package/luci/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua
new file mode 100644
index 00000000..672486c5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua
@@ -0,0 +1,5 @@
+module "luci.controller.olsr-viz"
+
+function index()
+	entry({"admin", "status", "olsr", "olsr-viz"}, template("olsr-viz/olsr-viz"), _("OLSR-Viz"), 90)
+end
diff --git a/trunk/package/luci/applications/luci-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm b/trunk/package/luci/applications/luci-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm
new file mode 100644
index 00000000..47bd8840
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm
@@ -0,0 +1,10 @@
+<%+header%>
+<noscript>
+	<div class="warning">
+		<%:You need to allow javascript in your browser to show this page.%>
+	</div>
+</noscript>
+
+<iframe style="width:100%; height:640px; border:none" scrolling="no" src="/cgi-bin/olsr-viz.sh"></iframe>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/Makefile b/trunk/package/luci/applications/luci-olsr/Makefile
new file mode 100644
index 00000000..119cffc9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/Makefile
@@ -0,0 +1,4 @@
+PO = olsr
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-nodes.html b/trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-nodes.html
new file mode 100644
index 00000000..0270f4a6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-nodes.html
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci/freifunk/olsr/neighbors" />
+</head>
+<body style="background-color: black">
+<a style="color: white; text-decoration: none" href="/cgi-bin/luci/freifunk/olsr/neighbors">LuCI - Lua Configuration Interface</a>
+</body>
+</html>
diff --git a/trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-status.html b/trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-status.html
new file mode 100644
index 00000000..0270f4a6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/htdocs/cgi-bin-status.html
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci/freifunk/olsr/neighbors" />
+</head>
+<body style="background-color: black">
+<a style="color: white; text-decoration: none" href="/cgi-bin/luci/freifunk/olsr/neighbors">LuCI - Lua Configuration Interface</a>
+</body>
+</html>
diff --git a/trunk/package/luci/applications/luci-olsr/ipkg/postinst b/trunk/package/luci/applications/luci-olsr/ipkg/postinst
new file mode 100755
index 00000000..8d9a034a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/ipkg/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-olsr ) && rm -f /etc/uci-defaults/luci-olsr
+	/etc/init.d/olsrd enabled || /etc/init.d/olsrd enable
+	/etc/init.d/olsrd6 enabled || /etc/init.d/olsrd6 enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr.lua b/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr.lua
new file mode 100644
index 00000000..4573f690
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -0,0 +1,413 @@
+module("luci.controller.olsr", package.seeall)
+
+function index()
+	local ipv4,ipv6
+	if nixio.fs.access("/etc/config/olsrd") then
+		ipv4 = 1
+	end
+	if nixio.fs.access("/etc/config/olsrd6") then
+		ipv6 = 1
+	end
+	if not ipv4 and not ipv6 then
+		return
+	end
+
+	require("luci.model.uci")
+	local uci = luci.model.uci.cursor_state()
+
+	uci:foreach("olsrd", "olsrd", function(s)
+		if s.SmartGateway and s.SmartGateway == "yes" then has_smartgw  = true end
+	end)
+
+	local page  = node("admin", "status", "olsr")
+	page.target = template("status-olsr/overview")
+	page.title  = _("OLSR")
+	page.subindex = true
+
+	local page  = node("admin", "status", "olsr", "json")
+	page.target = call("action_json")
+	page.title = nil
+	page.leaf = true
+
+	local page  = node("admin", "status", "olsr", "neighbors")
+	page.target = call("action_neigh")
+	page.title  = _("Neighbours")
+	page.subindex = true
+	page.order  = 5
+
+	local page  = node("admin", "status", "olsr", "routes")
+	page.target = call("action_routes")
+	page.title  = _("Routes")
+	page.order  = 10
+
+	local page  = node("admin", "status", "olsr", "topology")
+	page.target = call("action_topology")
+	page.title  = _("Topology")
+	page.order  = 20
+
+	local page  = node("admin", "status", "olsr", "hna")
+	page.target = call("action_hna")
+	page.title  = _("HNA")
+	page.order  = 30
+
+	local page  = node("admin", "status", "olsr", "mid")
+	page.target = call("action_mid")
+	page.title  = _("MID")
+	page.order  = 50
+
+	if has_smartgw then
+		local page  = node("admin", "status", "olsr", "smartgw")
+		page.target = call("action_smartgw")
+		page.title  = _("SmartGW")
+		page.order  = 60
+	end
+
+	local page  = node("admin", "status", "olsr", "interfaces")
+	page.target = call("action_interfaces")
+	page.title  = _("Interfaces")
+	page.order  = 70
+
+	odsp = entry(
+		{"admin", "services", "olsrd", "display"},
+		cbi("olsr/olsrddisplay"), _("Display")
+	)
+
+end
+
+function action_json()
+	local http = require "luci.http"
+	local utl = require "luci.util"
+	local uci = require "luci.model.uci".cursor_state()
+	local jsonreq4
+	local jsonreq6
+
+	jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090")
+	jsonreq6 = utl.exec("echo /status | nc ::1 9090")
+	http.prepare_content("application/json")
+	if not jsonreq4 or jsonreq4 == "" then
+		jsonreq4 = "{}"
+	end
+	if not jsonreq6 or jsonreq6 == "" then
+		jsonreq6 = "{}"
+	end
+	http.write('{"v4":' .. jsonreq4 .. ', "v6":' .. jsonreq6 .. '}')
+end
+
+function action_neigh(json)
+	local data, has_v4, has_v6, error = fetch_jsoninfo('links')
+
+	if error then
+		return
+	end
+
+	local uci = require "luci.model.uci".cursor_state()
+	local resolve = uci:get("luci_olsr", "general", "resolve")
+	local ntm = require "luci.model.network".init()
+	local devices  = ntm:get_wifidevs()
+	local sys = require "luci.sys"
+	local assoclist = {}
+	--local neightbl = require "neightbl"
+	local ipc = require "luci.ip"
+
+	luci.sys.net.routes(function(r) 
+		if r.dest:prefix() == 0 then 
+			defaultgw = r.gateway:string() 
+		end
+	end)
+
+	local function compare(a,b)
+		if a.proto == b.proto then
+			return a.linkCost < b.linkCost
+		else
+			return a.proto < b.proto
+		end
+	end
+
+	for _, dev in ipairs(devices) do
+		for _, net in ipairs(dev:get_wifinets()) do
+			assoclist[#assoclist+1] = {} 
+			assoclist[#assoclist]['ifname'] = net.iwdata.ifname
+			assoclist[#assoclist]['network'] = net.iwdata.network
+			assoclist[#assoclist]['device'] = net.iwdata.device
+			assoclist[#assoclist]['list'] = net.iwinfo.assoclist
+		end
+	end
+
+	for k, v in ipairs(data) do
+		local interface
+		local snr = 0
+		local signal = 0
+		local noise = 0
+		local arptable = sys.net.arptable()
+		local mac = ""
+		local rmac = ""
+		local lmac = ""
+		local ip
+		local neihgt = {}
+		
+		if resolve == "1" then
+			hostname = nixio.getnameinfo(v.remoteIP, nil, 100)
+			if hostname then
+				v.hostname = hostname
+			end
+		end
+		if v.proto == '4' then
+			uci:foreach("network", "interface",function(vif)
+				if vif.ipaddr and vif.ipaddr == v.localIP then
+					interface = vif['.name'] or vif.interface
+					lmac = string.lower(vif.macaddr or "") 
+					return
+				end
+			end)
+			for _, arpt in ipairs(arptable) do
+				ip = arpt['IP address']
+				if ip == v.remoteIP then
+					rmac = string.lower(arpt['HW address'] or "")
+				end
+			end
+		elseif v.proto == '6' then
+			uci:foreach("network", "interface",function(vif)
+				local name = vif['.name']
+				local net = ntm:get_network(name)
+				local device = net and net:get_interface()
+				local locip = ipc.IPv6(v.localIP)
+				if device and device:ip6addrs() and locip then
+					for _, a in ipairs(device:ip6addrs()) do
+						if not a:is6linklocal() then
+							if a:host() == locip:host() then
+								interface = name
+								--neihgt = neightbl.get(device.ifname) or {}
+							end
+						end
+					end
+				end
+			end)
+			--[[
+			for ip,mac in pairs(neihgt) do
+				if ip == v.remoteIP then
+					rmac = mac
+				end
+			end
+			]]--
+		end
+		for _, val in ipairs(assoclist) do
+			if val.network == interface and val.list then
+				for assocmac, assot in pairs(val.list) do
+					assocmac = string.lower(assocmac or "")
+					if rmac == assocmac then
+						signal = tonumber(assot.signal)
+						noise = tonumber(assot.noise)
+						snr = (noise*-1) - (signal*-1)
+					end
+				end
+			end
+		end
+		if interface then
+			v.interface = interface
+		end
+		v.snr = snr
+		v.signal = signal
+		v.noise = noise
+		if rmac then
+			v.remoteMAC = rmac
+		end
+		if lmac then
+			v.localMAC = lmac
+		end
+
+		if defaultgw == v.remoteIP then
+			v.defaultgw = 1
+		end
+	end
+
+	table.sort(data, compare)
+	luci.template.render("status-olsr/neighbors", {links=data, has_v4=has_v4, has_v6=has_v6})
+end
+
+function action_routes()
+	local data, has_v4, has_v6, error = fetch_jsoninfo('routes')
+	if error then
+		return
+	end
+
+	local uci = require "luci.model.uci".cursor_state()
+	local resolve = uci:get("luci_olsr", "general", "resolve")
+
+	for k, v in ipairs(data) do
+		if resolve == "1" then
+			local hostname = nixio.getnameinfo(v.gateway, nil, 100)
+			if hostname then
+				v.hostname = hostname
+			end
+		end
+	end
+
+	local function compare(a,b)
+		if a.proto == b.proto then
+			return a.rtpMetricCost < b.rtpMetricCost
+		else
+			return a.proto < b.proto
+		end
+	end
+
+	table.sort(data, compare)
+	luci.template.render("status-olsr/routes", {routes=data, has_v4=has_v4, has_v6=has_v6})
+end
+
+function action_topology()
+	local data, has_v4, has_v6, error = fetch_jsoninfo('topology')
+	if error then
+		return
+	end
+
+	local function compare(a,b)
+		if a.proto == b.proto then
+			return a.tcEdgeCost < b.tcEdgeCost
+		else
+			return a.proto < b.proto
+		end
+	end
+
+	table.sort(data, compare)
+	luci.template.render("status-olsr/topology", {routes=data, has_v4=has_v4, has_v6=has_v6})
+end
+
+function action_hna()
+	local data, has_v4, has_v6, error = fetch_jsoninfo('hna')
+	if error then
+		return
+	end
+
+	local uci = require "luci.model.uci".cursor_state()
+	local resolve = uci:get("luci_olsr", "general", "resolve")
+
+	local function compare(a,b)
+		if a.proto == b.proto then
+			return a.genmask < b.genmask
+		else
+			return a.proto < b.proto
+		end
+	end
+
+	for k, v in ipairs(data) do
+		if resolve == "1" then
+			hostname = nixio.getnameinfo(v.gateway, nil, 100)
+			if hostname then
+				v.hostname = hostname
+			end
+		end
+		if v.validityTime then
+			v.validityTime = tonumber(string.format("%.0f", v.validityTime / 1000))
+		end
+	end
+
+	table.sort(data, compare)
+	luci.template.render("status-olsr/hna", {hna=data, has_v4=has_v4, has_v6=has_v6})
+end
+
+function action_mid()
+	local data, has_v4, has_v6, error = fetch_jsoninfo('mid')
+	if error then
+		return
+	end
+
+	local function compare(a,b)
+		if a.proto == b.proto then
+			return a.ipAddress < b.ipAddress
+		else
+			return a.proto < b.proto
+		end
+	end
+
+	table.sort(data, compare)
+	luci.template.render("status-olsr/mid", {mids=data, has_v4=has_v4, has_v6=has_v6})
+end
+
+function action_smartgw()
+	local data, has_v4, has_v6, error = fetch_jsoninfo('gateways')
+	if error then
+		return
+	end
+
+	local function compare(a,b)
+		if a.proto == b.proto then
+			return a.tcPathCost < b.tcPathCost
+		else
+			return a.proto < b.proto
+		end
+	end
+
+	table.sort(data, compare)
+	luci.template.render("status-olsr/smartgw", {gws=data, has_v4=has_v4, has_v6=has_v6})
+end
+
+function action_interfaces()
+	local data, has_v4, has_v6, error = fetch_jsoninfo('interfaces')
+	if error then
+		return
+	end
+
+	local function compare(a,b)
+		return a.proto < b.proto
+	end
+
+	table.sort(data, compare)
+	luci.template.render("status-olsr/interfaces", {iface=data, has_v4=has_v4, has_v6=has_v6})
+end
+
+-- Internal
+function fetch_jsoninfo(otable)
+	local uci = require "luci.model.uci".cursor_state()
+	local utl = require "luci.util"
+	local json = require "luci.json"
+	local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion")
+	local jsonreq4 = ""
+	local jsonreq6 = ""
+	jsonreq4 = utl.exec("echo /" .. otable .. " | nc 127.0.0.1 9090")
+	jsonreq6 = utl.exec("echo /" .. otable .. " | nc ::1 9090")
+	local jsondata4 = {}
+	local jsondata6 = {}
+	local data4 = {}
+	local data6 = {}
+	local has_v4 = False
+	local has_v6 = False
+
+	if jsonreq4 == '' and jsonreq6 == '' then
+		luci.template.render("status-olsr/error_olsr")
+		return nil, 0, 0, true
+	end
+
+	if jsonreq4 ~= "" then
+		has_v4 = 1
+		jsondata4 = json.decode(jsonreq4)
+		if otable == 'status' then
+			data4 = jsondata4 or {}
+		else
+			data4 = jsondata4[otable] or {}
+		end
+
+		for k, v in ipairs(data4) do
+			data4[k]['proto'] = '4'
+		end
+
+	end
+	if jsonreq6 ~= "" then
+		has_v6 = 1
+		jsondata6 = json.decode(jsonreq6)
+		if otable == 'status' then
+			data6 = jsondata6 or {}
+		else
+			data6 = jsondata6[otable] or {}
+		end
+		for k, v in ipairs(data6) do
+			data6[k]['proto'] = '6'
+		end
+	end
+
+	for k, v in ipairs(data6) do
+		table.insert(data4, v)
+	end
+
+	return data4, has_v4, has_v6, false
+end
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr4.lua b/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr4.lua
new file mode 100644
index 00000000..31a3101b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr4.lua
@@ -0,0 +1,47 @@
+module("luci.controller.olsr4", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/olsrd") then
+		return
+	end
+
+	require("luci.model.uci")
+	local uci = luci.model.uci.cursor_state()
+
+	local ol = entry(
+		{"admin", "services", "olsrd"},
+		cbi("olsr/olsrd"), "OLSR IPv4"
+	)
+	ol.subindex = true
+
+	entry(
+		{"admin", "services", "olsrd", "iface"},
+		cbi("olsr/olsrdiface")
+	).leaf = true
+
+	entry(
+		{"admin", "services", "olsrd", "hna"},
+		cbi("olsr/olsrdhna"), _("HNA Announcements")
+	)
+
+	oplg = entry(
+		{"admin", "services", "olsrd", "plugins"},
+		cbi("olsr/olsrdplugins"), _("Plugins")
+	)
+
+	oplg.leaf = true
+	oplg.subindex = true
+
+	local uci = require("luci.model.uci").cursor()
+	uci:foreach("olsrd", "LoadPlugin",
+		function (section)
+			local lib = section.library
+			entry(
+				{"admin", "services", "olsrd", "plugins", lib },
+				cbi("olsr/olsrdplugins"),
+				nil --'Plugin "%s"' % lib:gsub("^olsrd_",""):gsub("%.so.+$","")
+			)
+		end
+	)
+end
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr6.lua b/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr6.lua
new file mode 100644
index 00000000..9fbaa042
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/controller/olsr6.lua
@@ -0,0 +1,47 @@
+module("luci.controller.olsr6", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/olsrd6") then
+		return
+	end
+
+	require("luci.model.uci")
+	local uci = luci.model.uci.cursor_state()
+
+	local ol = entry(
+		{"admin", "services", "olsrd6"},
+		cbi("olsr/olsrd6"), "OLSR IPv6"
+	)
+	ol.subindex = true
+
+	entry(
+		{"admin", "services", "olsrd6", "iface"},
+		cbi("olsr/olsrdiface6")
+	).leaf = true
+
+	entry(
+		{"admin", "services", "olsrd6", "hna"},
+		cbi("olsr/olsrdhna6"), _("HNA6 Announcements")
+	)
+
+	oplg = entry(
+		{"admin", "services", "olsrd6", "plugins"},
+		cbi("olsr/olsrdplugins6"), _("Plugins")
+	)
+
+	oplg.leaf = true
+	oplg.subindex = true
+
+	local uci = require("luci.model.uci").cursor()
+	uci:foreach("olsrd6", "LoadPlugin",
+		function (section)
+			local lib = section.library
+			entry(
+				{"admin", "services", "olsrd6", "plugins", lib },
+				cbi("olsr/olsrdplugins6"),
+				nil --'Plugin "%s"' % lib:gsub("^olsrd_",""):gsub("%.so.+$","")
+			)
+		end
+	)
+end
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
new file mode 100644
index 00000000..46121747
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -0,0 +1,420 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.tools.webadmin")
+local fs  = require "nixio.fs"
+local util = require "luci.util"
+local ip = require "luci.ip"
+
+local has_ipip  = fs.glob("/etc/modules.d/[0-9]*-ipip")()
+
+m = Map("olsrd", translate("OLSR Daemon"),
+        translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
+	"As such it allows mesh routing for any network equipment. "..
+	"It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
+	"Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and documentation."))
+
+function m.on_parse()
+	local has_defaults = false
+
+	m.uci:foreach("olsrd", "InterfaceDefaults",
+		function(s)
+			has_defaults = true
+			return false
+		end)
+
+	if not has_defaults then
+		m.uci:section("olsrd", "InterfaceDefaults")
+	end
+end
+
+function write_float(self, section, value)
+    local n = tonumber(value)
+    if n ~= nil then
+        return Value.write(self, section, "%.1f" % n) 
+    end
+end
+
+s = m:section(TypedSection, "olsrd", translate("General settings"))
+s.anonymous = true
+
+s:tab("general",  translate("General Settings"))
+s:tab("lquality", translate("Link Quality Settings"))
+s:tab("smartgw", translate("SmartGW"), not has_ipip and translate("Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not work, please install it."))
+s:tab("advanced", translate("Advanced Settings"))
+
+ipv = s:taboption("general", ListValue, "IpVersion", translate("Internet protocol"),
+	translate("IP-version to use. If 6and4 is selected then one olsrd instance is started for each protocol."))
+ipv:value("4", "IPv4")
+ipv:value("6and4", "6and4")
+
+
+poll = s:taboption("advanced", Value, "Pollrate", translate("Pollrate"),
+	translate("Polling rate for OLSR sockets in seconds. Default is 0.05."))
+poll.optional = true
+poll.datatype = "ufloat"
+poll.placeholder = "0.05"
+
+nicc = s:taboption("advanced", Value, "NicChgsPollInt", translate("Nic changes poll interval"),
+	translate("Interval to poll network interfaces for configuration changes (in seconds). Default is \"2.5\"."))
+nicc.optional = true
+nicc.datatype = "ufloat"
+nicc.placeholder = "2.5"
+
+tos = s:taboption("advanced", Value, "TosValue", translate("TOS value"),
+	translate("Type of service value for the IP header of control traffic. Default is \"16\"."))
+tos.optional = true
+tos.datatype = "uinteger"
+tos.placeholder = "16"
+
+fib = s:taboption("general", ListValue, "FIBMetric", translate("FIB metric"),
+	translate ("FIBMetric controls the metric value of the host-routes OLSRd sets. "..
+	"\"flat\" means that the metric value is always 2. This is the preferred value "..
+	"because it helps the linux kernel routing to clean up older routes. "..
+	"\"correct\" uses the hopcount as the metric value. "..
+	"\"approx\" use the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
+	"Default is \"flat\"."))
+fib:value("flat")
+fib:value("correct")
+fib:value("approx")
+
+lql = s:taboption("lquality", ListValue, "LinkQualityLevel", translate("LQ level"),
+	translate("Link quality level switch between hopcount and cost-based (mostly ETX) routing.<br />"..
+	"<b>0</b> = do not use link quality<br />"..
+	"<b>2</b> = use link quality for MPR selection and routing<br />"..
+	"Default is \"2\""))
+lql:value("2")
+lql:value("0")
+
+lqage = s:taboption("lquality", Value, "LinkQualityAging", translate("LQ aging"),
+	translate("Link quality aging factor (only for lq level 2). Tuning parameter for etx_float and etx_fpm, smaller values "..
+	"mean slower changes of ETX value. (allowed values are between 0.01 and 1.0)"))
+lqage.optional = true
+lqage:depends("LinkQualityLevel", "2")
+
+lqa = s:taboption("lquality", ListValue, "LinkQualityAlgorithm", translate("LQ algorithm"),
+	translate("Link quality algorithm (only for lq level 2).<br />"..
+	"<b>etx_float</b>: floating point ETX with exponential aging<br />"..
+	"<b>etx_fpm</b>  : same as etx_float, but with integer arithmetic<br />"..
+	"<b>etx_ff</b>   : ETX freifunk, an etx variant which use all OLSR traffic (instead of only hellos) for ETX calculation<br />"..
+	"<b>etx_ffeth</b>: incompatible variant of etx_ff that allows ethernet links with ETX 0.1.<br />"..
+	"Defaults to \"etx_ff\""))
+lqa.optional = true
+lqa:value("etx_ff")
+lqa:value("etx_fpm")
+lqa:value("etx_float")
+lqa:value("etx_ffeth")
+lqa:depends("LinkQualityLevel", "2")
+lqa.optional = true
+
+lqfish = s:taboption("lquality", Flag, "LinkQualityFishEye", translate("LQ fisheye"),
+	translate("Fisheye mechanism for TCs (checked means on). Default is \"on\""))
+lqfish.default = "1"
+lqfish.optional = true
+
+hyst = s:taboption("lquality", Flag, "UseHysteresis", translate("Use hysteresis"),
+	translate("Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more robustness to the link sensing "..
+	"but delays neighbor registration. Defaults is \"yes\""))
+hyst.default = "yes"
+hyst.enabled = "yes"
+hyst.disabled = "no"
+hyst:depends("LinkQualityLevel", "0")
+hyst.optional = true
+hyst.rmempty = true
+
+port = s:taboption("general", Value, "OlsrPort", translate("Port"),
+        translate("The port OLSR uses. This should usually stay at the IANA assigned port 698. It can have a value between 1 and 65535."))
+port.optional = true
+port.default = "698"
+port.rmempty = true
+
+mainip = s:taboption("general", Value, "MainIp", translate("Main IP"),
+        translate("Sets the main IP (originator ip) of the router. This IP will NEVER change during the uptime of olsrd. "..
+	"Default is 0.0.0.0, which triggers usage of the IP of the first interface."))
+mainip.optional = true
+mainip.rmempty = true
+mainip.datatype = "ipaddr"
+mainip.placeholder = "0.0.0.0"
+
+sgw = s:taboption("smartgw", Flag, "SmartGateway", translate("Enable"), translate("Enable SmartGateway. If it is disabled, then " ..
+	"all other SmartGateway parameters are ignored. Default is \"no\"."))
+sgw.default="no"
+sgw.enabled="yes"
+sgw.disabled="no"
+sgw.rmempty = true
+
+sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing ipv4 gateway with NAT"))
+sgwnat:depends("SmartGateway", "yes")
+sgwnat.default="yes"
+sgwnat.enabled="yes"
+sgwnat.disabled="no"
+sgwnat.optional = true
+sgwnat.rmempty = true
+
+sgwuplink = s:taboption("smartgw", ListValue, "SmartGatewayUplink", translate("Announce uplink"), translate("Which kind of uplink is exported to the other mesh nodes. " ..
+	"An uplink is detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. Default setting is \"both\"."))
+sgwuplink:value("none")
+sgwuplink:value("ipv4")
+sgwuplink:value("ipv6")
+sgwuplink:value("both")
+sgwuplink:depends("SmartGateway", "yes")
+sgwuplink.default="both"
+sgwuplink.optional = true
+sgwuplink.rmempty = true
+
+sgwulnat = s:taboption("smartgw", Flag, "SmartGatewayUplinkNAT", translate("Uplink uses NAT"), translate("If this Node uses NAT for connections to the internet. " ..
+	"Default is \"yes\"."))
+sgwulnat:depends("SmartGatewayUplink", "ipv4")
+sgwulnat:depends("SmartGatewayUplink", "both")
+sgwulnat.default="yes"
+sgwulnat.enabled="yes"
+sgwulnat.disabled="no"
+sgwnat.optional = true
+sgwnat.rmempty = true
+
+sgwspeed = s:taboption("smartgw", Value, "SmartGatewaySpeed", translate("Speed of the uplink"), translate("Specifies the speed of "..
+	"the uplink in kilobits/s. First parameter is upstream, second parameter is downstream. Default is \"128 1024\"."))
+sgwspeed:depends("SmartGatewayUplink", "ipv4")
+sgwspeed:depends("SmartGatewayUplink", "ipv6")
+sgwspeed:depends("SmartGatewayUplink", "both")
+sgwspeed.optional = true
+sgwspeed.rmempty = true
+
+sgwprefix = s:taboption("smartgw", Value, "SmartGatewayPrefix", translate("IPv6-Prefix of the uplink"), translate("This can be used " ..
+	"to signal the external IPv6 prefix of the uplink to the clients. This might allow a client to change it's local IPv6 address to " ..
+	"use the IPv6 gateway without any kind of address translation. The maximum prefix length is 64 bits. " ..
+	"Default is \"::/0\" (no prefix)."))
+sgwprefix:depends("SmartGatewayUplink", "ipv6")
+sgwprefix:depends("SmartGatewayUplink", "both")
+sgwprefix.optional = true
+sgwprefix.rmempty = true
+
+willingness = s:taboption("advanced", ListValue, "Willingness", translate("Willingness"),
+		translate("The fixed willingness to use. If not set willingness will be calculated dynamically based on battery/power status. Default is \"3\"."))
+for i=0,7 do
+	willingness:value(i)
+end
+willingness.optional = true
+willingness.default = "3"
+
+natthr = s:taboption("advanced", Value, "NatThreshold", translate("NAT threshold"),
+	translate("If the route to the current gateway is to be changed, the ETX value of this gateway is "..
+	"multiplied with this value before it is compared to the new one. "..
+	"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 if changed.<br />"..
+	"<b>WARNING:</b> This parameter should not be used together with the etx_ffeth metric!<br />"..
+	"Defaults to \"1.0\"."))
+for i=1,0.1,-0.1 do
+        natthr:value(i)
+end
+natthr:depends("LinkQualityAlgorithm", "etx_ff")
+natthr:depends("LinkQualityAlgorithm", "etx_float")
+natthr:depends("LinkQualityAlgorithm", "etx_fpm")
+natthr.default = "1.0"
+natthr.optional = true
+natthr.write = write_float
+
+
+i = m:section(TypedSection, "InterfaceDefaults", translate("Interfaces Defaults"))
+i.anonymous = true
+i.addremove = false
+
+i:tab("general", translate("General Settings"))
+i:tab("addrs",   translate("IP Addresses"))
+i:tab("timing",  translate("Timing and Validity"))
+
+mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
+	translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+	"valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+mode:value("mesh")
+mode:value("ether")
+mode.optional = true
+mode.rmempty = true
+
+
+weight = i:taboption("general", Value, "Weight", translate("Weight"),
+	translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
+	"Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
+	"but here you can specify a fixed value. Olsrd will choose links with the lowest value.<br />"..
+	"<b>Note:</b> Interface weight is used only when LinkQualityLevel is set to 0. "..
+	"For any other value of LinkQualityLevel, the interface ETX value is used instead."))
+weight.optional = true
+weight.datatype = "uinteger"
+weight.placeholder = "0"
+
+lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
+	translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
+	"It is only used when LQ-Level is greater than 0. Examples:<br />"..
+	"reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />"..
+	"reduce LQ to all nodes on this interface by 20%: default 0.8"))
+lqmult.optional = true
+lqmult.rmempty = true
+lqmult.cast = "table"
+lqmult.placeholder = "default 1.0"
+
+function lqmult.validate(self, value)
+	for _, v in pairs(value) do
+		if v ~= "" then
+			local val = util.split(v, " ")
+			local host = val[1]
+			local mult = val[2]
+			if not host or not mult then
+				return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.")
+			end
+			if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then
+				return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'")
+			end
+			if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
+				return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
+			end
+			if not mult:match("[0-1]%.[0-9]+") then
+				return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
+			end
+		end
+	end
+        return value
+end
+
+ip4b = i:taboption("addrs", Value, "Ip4Broadcast", translate("IPv4 broadcast"),
+	translate("IPv4 broadcast address for outgoing OLSR packets. One useful example would be 255.255.255.255. "..
+	"Default is \"0.0.0.0\", which triggers the usage of the interface broadcast IP."))
+ip4b.optional = true
+ip4b.datatype = "ip4addr"
+ip4b.placeholder = "0.0.0.0"
+
+ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
+	translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
+ip6m.optional = true
+ip6m.datatype = "ip6addr"
+ip6m.placeholder = "FF02::6D"
+
+ip4s = i:taboption("addrs", Value, "IPv4Src", translate("IPv4 source"),
+	translate("IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which triggers usage of the interface IP."))
+ip4s.optional = true
+ip4s.datatype = "ip4addr"
+ip4s.placeholder = "0.0.0.0"
+
+ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
+	translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
+	"Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
+ip6s.optional = true
+ip6s.datatype = "ip6addr"
+ip6s.placeholder = "0::/0"
+
+
+hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
+hi.optional = true
+hi.datatype = "ufloat"
+hi.placeholder = "5.0"
+hi.write = write_float
+
+hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
+hv.optional = true
+hv.datatype = "ufloat"
+hv.placeholder = "40.0"
+hv.write = write_float
+
+ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
+ti.optional = true
+ti.datatype = "ufloat"
+ti.placeholder = "2.0"
+ti.write = write_float
+
+tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
+tv.optional = true
+tv.datatype = "ufloat"
+tv.placeholder = "256.0"
+tv.write = write_float
+
+mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
+mi.optional = true
+mi.datatype = "ufloat"
+mi.placeholder = "18.0"
+mi.write = write_float
+
+mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
+mv.optional = true
+mv.datatype = "ufloat"
+mv.placeholder = "324.0"
+mv.write = write_float
+
+ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
+ai.optional = true
+ai.datatype = "ufloat"
+ai.placeholder = "18.0"
+ai.write = write_float
+
+av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
+av.optional = true
+av.datatype = "ufloat"
+av.placeholder = "108.0"
+av.write = write_float
+
+
+ifs = m:section(TypedSection, "Interface", translate("Interfaces"))
+ifs.addremove = true
+ifs.anonymous = true
+ifs.extedit   = luci.dispatcher.build_url("admin/services/olsrd/iface/%s")
+ifs.template  = "cbi/tblsection"
+
+function ifs.create(...)
+	local sid = TypedSection.create(...)
+	luci.http.redirect(ifs.extedit % sid)
+end
+
+ign = ifs:option(Flag, "ignore", translate("Enable"))
+ign.enabled  = "0"
+ign.disabled = "1"
+ign.rmempty = false
+function ign.cfgvalue(self, section)
+	return Flag.cfgvalue(self, section) or "0"
+end
+
+network = ifs:option(DummyValue, "interface", translate("Network"))
+network.template = "cbi/network_netinfo"
+
+mode = ifs:option(DummyValue, "Mode", translate("Mode"))
+function mode.cfgvalue(...)
+	return Value.cfgvalue(...) or m.uci:get_first("olsrd", "InterfaceDefaults", "Mode", "mesh")
+end
+
+hello = ifs:option(DummyValue, "_hello", translate("Hello"))
+function hello.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd", section, "HelloInterval"))     or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HelloInterval", 5))
+	local v = tonumber(m.uci:get("olsrd", section, "HelloValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HelloValidityTime", 40))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+tc = ifs:option(DummyValue, "_tc", translate("TC"))
+function tc.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd", section, "TcInterval"))     or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "TcInterval", 2))
+	local v = tonumber(m.uci:get("olsrd", section, "TcValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "TcValidityTime", 256))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+mid = ifs:option(DummyValue, "_mid", translate("MID"))
+function mid.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd", section, "MidInterval"))     or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "MidInterval", 18))
+	local v = tonumber(m.uci:get("olsrd", section, "MidValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "MidValidityTime", 324))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+hna = ifs:option(DummyValue, "_hna", translate("HNA"))
+function hna.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd", section, "HnaInterval"))     or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HnaInterval", 18))
+	local v = tonumber(m.uci:get("olsrd", section, "HnaValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HnaValidityTime", 108))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd6.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd6.lua
new file mode 100644
index 00000000..2b8d60cd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd6.lua
@@ -0,0 +1,401 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.tools.webadmin")
+local fs  = require "nixio.fs"
+local util = require "luci.util"
+local ip = require "luci.ip"
+
+local has_ipip  = fs.glob("/etc/modules.d/[0-9]*-ipip")()
+
+m = Map("olsrd6", translate("OLSR Daemon"),
+        translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
+	"As such it allows mesh routing for any network equipment. "..
+	"It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
+	"Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and documentation."))
+
+function m.on_parse()
+	local has_defaults = false
+
+	m.uci:foreach("olsrd6", "InterfaceDefaults",
+		function(s)
+			has_defaults = true
+			return false
+		end)
+
+	if not has_defaults then
+		m.uci:section("olsrd6", "InterfaceDefaults")
+	end
+end
+
+function write_float(self, section, value)
+    local n = tonumber(value)
+    if n ~= nil then
+        return Value.write(self, section, "%.1f" % n) 
+    end
+end
+
+s = m:section(TypedSection, "olsrd6", translate("General settings"))
+s.anonymous = true
+
+s:tab("general",  translate("General Settings"))
+s:tab("lquality", translate("Link Quality Settings"))
+s:tab("smartgw", translate("SmartGW"), not has_ipip and translate("Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not work, please install it."))
+s:tab("advanced", translate("Advanced Settings"))
+
+poll = s:taboption("advanced", Value, "Pollrate", translate("Pollrate"),
+	translate("Polling rate for OLSR sockets in seconds. Default is 0.05."))
+poll.optional = true
+poll.datatype = "ufloat"
+poll.placeholder = "0.05"
+
+nicc = s:taboption("advanced", Value, "NicChgsPollInt", translate("Nic changes poll interval"),
+	translate("Interval to poll network interfaces for configuration changes (in seconds). Default is \"2.5\"."))
+nicc.optional = true
+nicc.datatype = "ufloat"
+nicc.placeholder = "2.5"
+
+tos = s:taboption("advanced", Value, "TosValue", translate("TOS value"),
+	translate("Type of service value for the IP header of control traffic. Default is \"16\"."))
+tos.optional = true
+tos.datatype = "uinteger"
+tos.placeholder = "16"
+
+fib = s:taboption("general", ListValue, "FIBMetric", translate("FIB metric"),
+	translate ("FIBMetric controls the metric value of the host-routes OLSRd sets. "..
+	"\"flat\" means that the metric value is always 2. This is the preferred value "..
+	"because it helps the linux kernel routing to clean up older routes. "..
+	"\"correct\" uses the hopcount as the metric value. "..
+	"\"approx\" use the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
+	"Default is \"flat\"."))
+fib:value("flat")
+fib:value("correct")
+fib:value("approx")
+
+lql = s:taboption("lquality", ListValue, "LinkQualityLevel", translate("LQ level"),
+	translate("Link quality level switch between hopcount and cost-based (mostly ETX) routing.<br />"..
+	"<b>0</b> = do not use link quality<br />"..
+	"<b>2</b> = use link quality for MPR selection and routing<br />"..
+	"Default is \"2\""))
+lql:value("2")
+lql:value("0")
+
+lqage = s:taboption("lquality", Value, "LinkQualityAging", translate("LQ aging"),
+	translate("Link quality aging factor (only for lq level 2). Tuning parameter for etx_float and etx_fpm, smaller values "..
+	"mean slower changes of ETX value. (allowed values are between 0.01 and 1.0)"))
+lqage.optional = true
+lqage:depends("LinkQualityLevel", "2")
+
+lqa = s:taboption("lquality", ListValue, "LinkQualityAlgorithm", translate("LQ algorithm"),
+	translate("Link quality algorithm (only for lq level 2).<br />"..
+	"<b>etx_float</b>: floating point ETX with exponential aging<br />"..
+	"<b>etx_fpm</b>  : same as etx_float, but with integer arithmetic<br />"..
+	"<b>etx_ff</b>   : ETX freifunk, an etx variant which use all OLSR traffic (instead of only hellos) for ETX calculation<br />"..
+	"<b>etx_ffeth</b>: incompatible variant of etx_ff that allows ethernet links with ETX 0.1.<br />"..
+	"Defaults to \"etx_ff\""))
+lqa.optional = true
+lqa:value("etx_ff")
+lqa:value("etx_fpm")
+lqa:value("etx_float")
+lqa:value("etx_ffeth")
+lqa:depends("LinkQualityLevel", "2")
+lqa.optional = true
+
+lqfish = s:taboption("lquality", Flag, "LinkQualityFishEye", translate("LQ fisheye"),
+	translate("Fisheye mechanism for TCs (checked means on). Default is \"on\""))
+lqfish.default = "1"
+lqfish.optional = true
+
+hyst = s:taboption("lquality", Flag, "UseHysteresis", translate("Use hysteresis"),
+	translate("Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more robustness to the link sensing "..
+	"but delays neighbor registration. Defaults is \"yes\""))
+hyst.default = "yes"
+hyst.enabled = "yes"
+hyst.disabled = "no"
+hyst:depends("LinkQualityLevel", "0")
+hyst.optional = true
+hyst.rmempty = true
+
+port = s:taboption("general", Value, "OlsrPort", translate("Port"),
+        translate("The port OLSR uses. This should usually stay at the IANA assigned port 698. It can have a value between 1 and 65535."))
+port.optional = true
+port.default = "698"
+port.rmempty = true
+
+mainip = s:taboption("general", Value, "MainIp", translate("Main IP"),
+        translate("Sets the main IP (originator ip) of the router. This IP will NEVER change during the uptime of olsrd. "..
+	"Default is ::, which triggers usage of the IP of the first interface."))
+mainip.optional = true
+mainip.rmempty = true
+mainip.datatype = "ipaddr"
+mainip.placeholder = "::"
+
+sgw = s:taboption("smartgw", Flag, "SmartGateway", translate("Enable"), translate("Enable SmartGateway. If it is disabled, then " ..
+	"all other SmartGateway parameters are ignored. Default is \"no\"."))
+sgw.default="no"
+sgw.enabled="yes"
+sgw.disabled="no"
+sgw.rmempty = true
+
+sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing ipv4 gateway with NAT"))
+sgwnat:depends("SmartGateway", "yes")
+sgwnat.default="yes"
+sgwnat.enabled="yes"
+sgwnat.disabled="no"
+sgwnat.optional = true
+sgwnat.rmempty = true
+
+sgwuplink = s:taboption("smartgw", ListValue, "SmartGatewayUplink", translate("Announce uplink"), translate("Which kind of uplink is exported to the other mesh nodes. " ..
+	"An uplink is detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default setting is \"both\"."))
+sgwuplink:value("none")
+sgwuplink:value("ipv4")
+sgwuplink:value("ipv6")
+sgwuplink:value("both")
+sgwuplink:depends("SmartGateway", "yes")
+sgwuplink.default="both"
+sgwuplink.optional = true
+sgwuplink.rmempty = true
+
+sgwulnat = s:taboption("smartgw", Flag, "SmartGatewayUplinkNAT", translate("Uplink uses NAT"), translate("If this Node uses NAT for connections to the internet. " ..
+	"Default is \"yes\"."))
+sgwulnat:depends("SmartGatewayUplink", "ipv4")
+sgwulnat:depends("SmartGatewayUplink", "both")
+sgwulnat.default="yes"
+sgwulnat.enabled="yes"
+sgwulnat.disabled="no"
+sgwnat.optional = true
+sgwnat.rmempty = true
+
+sgwspeed = s:taboption("smartgw", Value, "SmartGatewaySpeed", translate("Speed of the uplink"), translate("Specifies the speed of "..
+	"the uplink in kilobits/s. First parameter is upstream, second parameter is downstream. Default is \"128 1024\"."))
+sgwspeed:depends("SmartGatewayUplink", "ipv4")
+sgwspeed:depends("SmartGatewayUplink", "ipv6")
+sgwspeed:depends("SmartGatewayUplink", "both")
+sgwspeed.optional = true
+sgwspeed.rmempty = true
+
+sgwprefix = s:taboption("smartgw", Value, "SmartGatewayPrefix", translate("IPv6-Prefix of the uplink"), translate("This can be used " ..
+	"to signal the external IPv6 prefix of the uplink to the clients. This might allow a client to change it's local IPv6 address to " ..
+	"use the IPv6 gateway without any kind of address translation. The maximum prefix length is 64 bits. " ..
+	"Default is \"::/0\" (no prefix)."))
+sgwprefix:depends("SmartGatewayUplink", "ipv6")
+sgwprefix:depends("SmartGatewayUplink", "both")
+sgwprefix.optional = true
+sgwprefix.rmempty = true
+
+willingness = s:taboption("advanced", ListValue, "Willingness", translate("Willingness"),
+		translate("The fixed willingness to use. If not set willingness will be calculated dynamically based on battery/power status. Default is \"3\"."))
+for i=0,7 do
+	willingness:value(i)
+end
+willingness.optional = true
+willingness.default = "3"
+
+natthr = s:taboption("advanced", Value, "NatThreshold", translate("NAT threshold"),
+	translate("If the route to the current gateway is to be changed, the ETX value of this gateway is "..
+	"multiplied with this value before it is compared to the new one. "..
+	"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 if changed.<br />"..
+	"<b>WARNING:</b> This parameter should not be used together with the etx_ffeth metric!<br />"..
+	"Defaults to \"1.0\"."))
+for i=1,0.1,-0.1 do
+        natthr:value(i)
+end
+natthr:depends("LinkQualityAlgorithm", "etx_ff")
+natthr:depends("LinkQualityAlgorithm", "etx_float")
+natthr:depends("LinkQualityAlgorithm", "etx_fpm")
+natthr.default = "1.0"
+natthr.optional = true
+natthr.write = write_float
+
+
+i = m:section(TypedSection, "InterfaceDefaults", translate("Interfaces Defaults"))
+i.anonymous = true
+i.addremove = false
+
+i:tab("general", translate("General Settings"))
+i:tab("addrs",   translate("IP Addresses"))
+i:tab("timing",  translate("Timing and Validity"))
+
+mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
+	translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+	"valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+mode:value("mesh")
+mode:value("ether")
+mode.optional = true
+mode.rmempty = true
+
+
+weight = i:taboption("general", Value, "Weight", translate("Weight"),
+	translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
+	"Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
+	"but here you can specify a fixed value. Olsrd will choose links with the lowest value.<br />"..
+	"<b>Note:</b> Interface weight is used only when LinkQualityLevel is set to 0. "..
+	"For any other value of LinkQualityLevel, the interface ETX value is used instead."))
+weight.optional = true
+weight.datatype = "uinteger"
+weight.placeholder = "0"
+
+lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
+	translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
+	"It is only used when LQ-Level is greater than 0. Examples:<br />"..
+	"reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />"..
+	"reduce LQ to all nodes on this interface by 20%: default 0.8"))
+lqmult.optional = true
+lqmult.rmempty = true
+lqmult.cast = "table"
+lqmult.placeholder = "default 1.0"
+
+function lqmult.validate(self, value)
+	for _, v in pairs(value) do
+		if v ~= "" then
+			local val = util.split(v, " ")
+			local host = val[1]
+			local mult = val[2]
+			if not host or not mult then
+				return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.")
+			end
+			if not (host == "default" or ip.IPv6(host)) then
+				return nil, translate("Can only be a valid IPv6 address or 'default'")
+			end
+			if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
+				return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
+			end
+			if not mult:match("[0-1]%.[0-9]+") then
+				return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
+			end
+		end
+	end
+	return value
+end
+
+ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
+	translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
+ip6m.optional = true
+ip6m.datatype = "ip6addr"
+ip6m.placeholder = "FF02::6D"
+
+ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
+	translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
+	"Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
+ip6s.optional = true
+ip6s.datatype = "ip6addr"
+ip6s.placeholder = "0::/0"
+
+
+hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
+hi.optional = true
+hi.datatype = "ufloat"
+hi.placeholder = "5.0"
+hi.write = write_float
+
+hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
+hv.optional = true
+hv.datatype = "ufloat"
+hv.placeholder = "40.0"
+hv.write = write_float
+
+ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
+ti.optional = true
+ti.datatype = "ufloat"
+ti.placeholder = "2.0"
+ti.write = write_float
+
+tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
+tv.optional = true
+tv.datatype = "ufloat"
+tv.placeholder = "256.0"
+tv.write = write_float
+
+mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
+mi.optional = true
+mi.datatype = "ufloat"
+mi.placeholder = "18.0"
+mi.write = write_float
+
+mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
+mv.optional = true
+mv.datatype = "ufloat"
+mv.placeholder = "324.0"
+mv.write = write_float
+
+ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
+ai.optional = true
+ai.datatype = "ufloat"
+ai.placeholder = "18.0"
+ai.write = write_float
+
+av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
+av.optional = true
+av.datatype = "ufloat"
+av.placeholder = "108.0"
+av.write = write_float
+
+
+ifs = m:section(TypedSection, "Interface", translate("Interfaces"))
+ifs.addremove = true
+ifs.anonymous = true
+ifs.extedit   = luci.dispatcher.build_url("admin/services/olsrd6/iface/%s")
+ifs.template  = "cbi/tblsection"
+
+function ifs.create(...)
+	local sid = TypedSection.create(...)
+	luci.http.redirect(ifs.extedit % sid)
+end
+
+ign = ifs:option(Flag, "ignore", translate("Enable"))
+ign.enabled  = "0"
+ign.disabled = "1"
+ign.rmempty = false
+function ign.cfgvalue(self, section)
+	return Flag.cfgvalue(self, section) or "0"
+end
+
+network = ifs:option(DummyValue, "interface", translate("Network"))
+network.template = "cbi/network_netinfo"
+
+mode = ifs:option(DummyValue, "Mode", translate("Mode"))
+function mode.cfgvalue(...)
+	return Value.cfgvalue(...) or m.uci:get_first("olsrd6", "InterfaceDefaults", "Mode", "mesh")
+end
+
+hello = ifs:option(DummyValue, "_hello", translate("Hello"))
+function hello.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd6", section, "HelloInterval"))     or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HelloInterval", 5))
+	local v = tonumber(m.uci:get("olsrd6", section, "HelloValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HelloValidityTime", 40))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+tc = ifs:option(DummyValue, "_tc", translate("TC"))
+function tc.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd6", section, "TcInterval"))     or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "TcInterval", 2))
+	local v = tonumber(m.uci:get("olsrd6", section, "TcValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "TcValidityTime", 256))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+mid = ifs:option(DummyValue, "_mid", translate("MID"))
+function mid.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd6", section, "MidInterval"))     or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "MidInterval", 18))
+	local v = tonumber(m.uci:get("olsrd6", section, "MidValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "MidValidityTime", 324))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+hna = ifs:option(DummyValue, "_hna", translate("HNA"))
+function hna.cfgvalue(self, section)
+	local i = tonumber(m.uci:get("olsrd6", section, "HnaInterval"))     or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HnaInterval", 18))
+	local v = tonumber(m.uci:get("olsrd6", section, "HnaValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HnaValidityTime", 108))
+	return "%.01fs / %.01fs" %{ i, v }
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
new file mode 100644
index 00000000..48dc965c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
@@ -0,0 +1,23 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_olsr", translate("OLSR - Display Options"))
+
+s = m:section(TypedSection, "olsr")
+s.anonymous = true
+
+res = s:option(Flag, "resolve", translate("Resolve"),
+        translate("Resolve hostnames on status pages. It is generally safe to allow this, but if you use public IPs and have unstable DNS-Setup then those pages will load really slow. In this case disable it here."))
+res.default = "0"
+res.optional = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
new file mode 100644
index 00000000..d5ee79f2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
@@ -0,0 +1,56 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local uci = require "luci.model.uci".cursor()
+local ipv =  uci:get_first("olsrd", "olsrd", "IpVersion", "4")
+
+mh = Map("olsrd", translate("OLSR - HNA-Announcements"), translate("Hosts in a OLSR routed network can announce connecitivity " ..
+	"to external networks using HNA messages."))
+
+if ipv == "6and4" or ipv == "4" then
+	hna4 = mh:section(TypedSection, "Hna4", translate("Hna4"), translate("Both values must use the dotted decimal notation."))
+	hna4.addremove = true
+	hna4.anonymous = true
+	hna4.template  = "cbi/tblsection"
+
+	net4 = hna4:option(Value, "netaddr", translate("Network address"))
+	net4.datatype = "ip4addr"
+	net4.placeholder = "10.11.12.13"
+	net4.default = "10.11.12.13"
+	msk4 = hna4:option(Value, "netmask", translate("Netmask"))
+	msk4.datatype = "ip4addr"
+	msk4.placeholder = "255.255.255.255"
+	msk4.default = "255.255.255.255"
+end
+
+if ipv == "6and4" or ipv == "6" then
+	hna6 = mh:section(TypedSection, "Hna6", translate("Hna6"), translate("IPv6 network must be given in full notation, " ..
+		"prefix must be in CIDR notation."))
+	hna6.addremove = true
+	hna6.anonymous = true
+	hna6.template  = "cbi/tblsection"
+
+	net6 = hna6:option(Value, "netaddr", translate("Network address"))
+	net6.datatype = "ip6addr"
+	net6.placeholder = "fec0:2200:106:0:0:0:0:0"
+	net6.default = "fec0:2200:106:0:0:0:0:0"
+	msk6 = hna6:option(Value, "prefix", translate("Prefix"))
+	msk6.datatype = "range(0,128)"
+	msk6.placeholder = "128"
+	msk6.default = "128"
+end
+
+return mh
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
new file mode 100644
index 00000000..21b2ec86
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
@@ -0,0 +1,36 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local uci = require "luci.model.uci".cursor()
+
+mh = Map("olsrd6", translate("OLSR - HNA6-Announcements"), translate("Hosts in a OLSR routed network can announce connecitivity " ..
+	"to external networks using HNA6 messages."))
+
+	hna6 = mh:section(TypedSection, "Hna6", translate("Hna6"), translate("IPv6 network must be given in full notation, " ..
+		"prefix must be in CIDR notation."))
+	hna6.addremove = true
+	hna6.anonymous = true
+	hna6.template  = "cbi/tblsection"
+
+	net6 = hna6:option(Value, "netaddr", translate("Network address"))
+	net6.datatype = "ip6addr"
+	net6.placeholder = "fec0:2200:106:0:0:0:0:0"
+	net6.default = "fec0:2200:106:0:0:0:0:0"
+	msk6 = hna6:option(Value, "prefix", translate("Prefix"))
+	msk6.datatype = "range(0,128)"
+	msk6.placeholder = "128"
+	msk6.default = "128"
+return mh
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
new file mode 100644
index 00000000..9673d9af
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
@@ -0,0 +1,189 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local util = require "luci.util"
+local ip = require "luci.ip"
+
+function write_float(self, section, value)
+    local n = tonumber(value)
+    if n ~= nil then
+        return Value.write(self, section, "%.1f" % n)
+    end
+end
+
+m = Map("olsrd", translate("OLSR Daemon - Interface"),
+        translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
+	"As such it allows mesh routing for any network equipment. "..
+	"It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
+	"Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and documentation."))
+
+m.redirect = luci.dispatcher.build_url("admin/services/olsrd")
+
+if not arg[1] or m.uci:get("olsrd", arg[1]) ~= "Interface" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+i = m:section(NamedSection, arg[1], "Interface", translate("Interface"))
+i.anonymous = true
+i.addremove = false
+
+i:tab("general", translate("General Settings"))
+i:tab("addrs",   translate("IP Addresses"))
+i:tab("timing",  translate("Timing and Validity"))
+
+ign = i:taboption("general", Flag, "ignore", translate("Enable"),
+	translate("Enable this interface."))
+ign.enabled  = "0"
+ign.disabled = "1"
+ign.rmempty = false
+function ign.cfgvalue(self, section)
+	return Flag.cfgvalue(self, section) or "0"
+end
+
+network = i:taboption("general", Value, "interface", translate("Network"),
+	translate("The interface OLSRd should serve."))
+
+network.template = "cbi/network_netlist"
+network.widget   = "radio"
+network.nocreate = true
+
+mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
+	translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+	"valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+mode:value("mesh")
+mode:value("ether")
+mode.optional = true
+mode.rmempty = true
+
+
+weight = i:taboption("general", Value, "Weight", translate("Weight"),
+	translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
+	"Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
+	"but here you can specify a fixed value. Olsrd will choose links with the lowest value.<br />"..
+	"<b>Note:</b> Interface weight is used only when LinkQualityLevel is set to 0. "..
+	"For any other value of LinkQualityLevel, the interface ETX value is used instead."))
+weight.optional = true
+weight.datatype = "uinteger"
+weight.placeholder = "0"
+
+lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
+	translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
+	"It is only used when LQ-Level is greater than 0. Examples:<br />"..
+	"reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />"..
+	"reduce LQ to all nodes on this interface by 20%: default 0.8"))
+lqmult.optional = true
+lqmult.rmempty = true
+lqmult.cast = "table"
+lqmult.placeholder = "default 1.0"
+
+function lqmult.validate(self, value)
+	for _, v in pairs(value) do
+		if v ~= "" then
+			local val = util.split(v, " ")
+			local host = val[1]
+			local mult = val[2]
+			if not host or not mult then
+				return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.")
+			end
+			if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then
+				return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'")
+			end
+			if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
+				return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
+			end
+			if not mult:match("[0-1]%.[0-9]+") then
+				return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
+			end
+		end
+	end
+	return value
+end
+
+ip4b = i:taboption("addrs", Value, "Ip4Broadcast", translate("IPv4 broadcast"),
+	translate("IPv4 broadcast address for outgoing OLSR packets. One useful example would be 255.255.255.255. "..
+	"Default is \"0.0.0.0\", which triggers the usage of the interface broadcast IP."))
+ip4b.optional = true
+ip4b.datatype = "ip4addr"
+ip4b.placeholder = "0.0.0.0"
+
+ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
+	translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
+ip6m.optional = true
+ip6m.datatype = "ip6addr"
+ip6m.placeholder = "FF02::6D"
+
+ip4s = i:taboption("addrs", Value, "IPv4Src", translate("IPv4 source"),
+	translate("IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which triggers usage of the interface IP."))
+ip4s.optional = true
+ip4s.datatype = "ip4addr"
+ip4s.placeholder = "0.0.0.0"
+
+ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
+	translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
+	"Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
+ip6s.optional = true
+ip6s.datatype = "ip6addr"
+ip6s.placeholder = "0::/0"
+
+hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
+hi.optional = true
+hi.datatype = "ufloat"
+hi.placeholder = "5.0"
+hi.write = write_float
+
+hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
+hv.optional = true
+hv.datatype = "ufloat"
+hv.placeholder = "40.0"
+hv.write = write_float
+
+ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
+ti.optional = true
+ti.datatype = "ufloat"
+ti.placeholder = "2.0"
+ti.write = write_float
+
+tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
+tv.optional = true
+tv.datatype = "ufloat"
+tv.placeholder = "256.0"
+tv.write = write_float
+
+mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
+mi.optional = true
+mi.datatype = "ufloat"
+mi.placeholder = "18.0"
+mi.write = write_float
+
+mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
+mv.optional = true
+mv.datatype = "ufloat"
+mv.placeholder = "324.0"
+mv.write = write_float
+
+ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
+ai.optional = true
+ai.datatype = "ufloat"
+ai.placeholder = "18.0"
+ai.write = write_float
+
+av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
+av.optional = true
+av.datatype = "ufloat"
+av.placeholder = "108.0"
+av.write = write_float
+
+return m
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
new file mode 100644
index 00000000..85818acb
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
@@ -0,0 +1,176 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local util = require "luci.util"
+local ip = require "luci.ip"
+
+function write_float(self, section, value)
+    local n = tonumber(value)
+    if n ~= nil then
+        return Value.write(self, section, "%.1f" % n)
+    end
+end
+
+m = Map("olsrd6", translate("OLSR Daemon - Interface"),
+        translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
+	"As such it allows mesh routing for any network equipment. "..
+	"It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
+	"Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and documentation."))
+
+m.redirect = luci.dispatcher.build_url("admin/services/olsrd6")
+
+if not arg[1] or m.uci:get("olsrd6", arg[1]) ~= "Interface" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+i = m:section(NamedSection, arg[1], "Interface", translate("Interface"))
+i.anonymous = true
+i.addremove = false
+
+i:tab("general", translate("General Settings"))
+i:tab("addrs",   translate("IP Addresses"))
+i:tab("timing",  translate("Timing and Validity"))
+
+ign = i:taboption("general", Flag, "ignore", translate("Enable"),
+	translate("Enable this interface."))
+ign.enabled  = "0"
+ign.disabled = "1"
+ign.rmempty = false
+function ign.cfgvalue(self, section)
+	return Flag.cfgvalue(self, section) or "0"
+end
+
+network = i:taboption("general", Value, "interface", translate("Network"),
+	translate("The interface OLSRd should serve."))
+
+network.template = "cbi/network_netlist"
+network.widget   = "radio"
+network.nocreate = true
+
+mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
+	translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+	"valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+mode:value("mesh")
+mode:value("ether")
+mode.optional = true
+mode.rmempty = true
+
+
+weight = i:taboption("general", Value, "Weight", translate("Weight"),
+	translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
+	"Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
+	"but here you can specify a fixed value. Olsrd will choose links with the lowest value.<br />"..
+	"<b>Note:</b> Interface weight is used only when LinkQualityLevel is set to 0. "..
+	"For any other value of LinkQualityLevel, the interface ETX value is used instead."))
+weight.optional = true
+weight.datatype = "uinteger"
+weight.placeholder = "0"
+
+lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
+	translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
+	"It is only used when LQ-Level is greater than 0. Examples:<br />"..
+	"reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />"..
+	"reduce LQ to all nodes on this interface by 20%: default 0.8"))
+lqmult.optional = true
+lqmult.rmempty = true
+lqmult.cast = "table"
+lqmult.placeholder = "default 1.0"
+
+function lqmult.validate(self, value)
+	for _, v in pairs(value) do
+		if v ~= "" then
+			local val = util.split(v, " ")
+			local host = val[1]
+			local mult = val[2]
+			if not host or not mult then
+				return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.")
+			end
+			if not (host == "default" or ip.IPv6(host)) then
+				return nil, translate("Can only be a valid IPv6 address or 'default'")
+			end
+			if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
+				return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
+			end
+			if not mult:match("[0-1]%.[0-9]+") then
+				return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
+			end
+		end
+	end
+	return value
+end
+
+ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
+	translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
+ip6m.optional = true
+ip6m.datatype = "ip6addr"
+ip6m.placeholder = "FF02::6D"
+
+ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
+	translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
+	"Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
+ip6s.optional = true
+ip6s.datatype = "ip6addr"
+ip6s.placeholder = "0::/0"
+
+hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
+hi.optional = true
+hi.datatype = "ufloat"
+hi.placeholder = "5.0"
+hi.write = write_float
+
+hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
+hv.optional = true
+hv.datatype = "ufloat"
+hv.placeholder = "40.0"
+hv.write = write_float
+
+ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
+ti.optional = true
+ti.datatype = "ufloat"
+ti.placeholder = "2.0"
+ti.write = write_float
+
+tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
+tv.optional = true
+tv.datatype = "ufloat"
+tv.placeholder = "256.0"
+tv.write = write_float
+
+mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
+mi.optional = true
+mi.datatype = "ufloat"
+mi.placeholder = "18.0"
+mi.write = write_float
+
+mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
+mv.optional = true
+mv.datatype = "ufloat"
+mv.placeholder = "324.0"
+mv.write = write_float
+
+ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
+ai.optional = true
+ai.datatype = "ufloat"
+ai.placeholder = "18.0"
+ai.write = write_float
+
+av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
+av.optional = true
+av.datatype = "ufloat"
+av.placeholder = "108.0"
+av.write = write_float
+
+return m
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
new file mode 100644
index 00000000..bd72c56a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
@@ -0,0 +1,270 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local ip = require "luci.ip"
+local fs = require "nixio.fs"
+
+if arg[1] then
+	mp = Map("olsrd", translate("OLSR - Plugins"))
+
+	p = mp:section(TypedSection, "LoadPlugin", translate("Plugin configuration"))
+	p:depends("library", arg[1])
+	p.anonymous = true
+
+	ign = p:option(Flag, "ignore", translate("Enable"))
+	ign.enabled  = "0"
+	ign.disabled = "1"
+	ign.rmempty  = false
+	function ign.cfgvalue(self, section)
+		return Flag.cfgvalue(self, section) or "0"
+	end
+
+	lib = p:option(DummyValue, "library", translate("Library"))
+	lib.default = arg[1]
+
+	local function Range(x,y)
+		local t = {}
+		for i = x, y do t[#t+1] = i end
+		return t
+	end
+
+	local function Cidr2IpMask(val)
+		if val then
+			for i = 1, #val do
+				local cidr = ip.IPv4(val[i]) or ip.IPv6(val[i])
+				if cidr then
+					val[i] = cidr:network():string() .. " " .. cidr:mask():string()
+				end
+			end
+			return val
+		end
+	end
+
+	local function IpMask2Cidr(val)
+		if val then
+			for i = 1, #val do
+				local ip, mask = val[i]:gmatch("([^%s]+)%s+([^%s]+)")()
+				local cidr
+				if ip and mask and ip:match(":") then
+					cidr = ip.IPv6(ip, mask)
+				elseif ip and mask then
+					cidr = ip.IPv4(ip, mask)
+				end
+
+				if cidr then
+					val[i] = cidr:string()
+				end
+			end
+			return val
+		end
+	end
+
+
+	local knownPlParams = {
+		["olsrd_bmf.so.1.5.3"] = {
+			{ Value,	"BmfInterface",			"bmf0" },
+			{ Value, 	"BmfInterfaceIp",		"10.10.10.234/24" },
+			{ Flag,  	"DoLocalBroadcast",		"no" },
+			{ Flag,  	"CapturePacketsOnOlsrInterfaces", "yes" },
+			{ ListValue, 	"BmfMechanism",			{ "UnicastPromiscuous", "Broadcast" } },
+			{ Value, 	"BroadcastRetransmitCount",	"2" },
+			{ Value, 	"FanOutLimit",			"4" },
+			{ DynamicList,	"NonOlsrIf",			"br-lan" }
+		},
+
+		["olsrd_dyn_gw.so.0.4"] = {
+			{ Value,	"Interval",			"40" },
+			{ DynamicList,  "Ping",				"141.1.1.1" },
+			{ DynamicList,	"HNA",				"192.168.80.0/24", IpMask2Cidr, Cidr2IpMask }
+		},
+
+		["olsrd_httpinfo.so.0.1"] = {
+			{ Value,	"port",				"80" },
+			{ DynamicList,	"Host",				"163.24.87.3" },
+			{ DynamicList,  "Net",				"0.0.0.0/0", Cidr2IpMask }
+		},
+
+		["olsrd_nameservice.so.0.3"] = {
+			{ DynamicList,	"name",				"my-name.mesh" },
+			{ DynamicList,	"hosts",			"1.2.3.4 name-for-other-interface.mesh" },
+			{ Value,	"suffix",			".olsr" },
+			{ Value,	"hosts_file",			"/path/to/hosts_file" },
+			{ Value,	"add_hosts",			"/path/to/file" },
+			{ Value,	"dns_server",			"141.1.1.1" },
+			{ Value,	"resolv_file",			"/path/to/resolv.conf" },
+			{ Value,	"interval",			"120" },
+			{ Value,	"timeout",			"240" },
+			{ Value,	"lat",				"12.123" },
+			{ Value,	"lon",				"12.123" },
+			{ Value,	"latlon_file",			"/var/run/latlon.js" },
+			{ Value,	"latlon_infile",		"/var/run/gps.txt" },
+			{ Value,	"sighup_pid_file",		"/var/run/dnsmasq.pid" },
+			{ Value,	"name_change_script",		"/usr/local/bin/announce_new_hosts.sh" },
+			{ DynamicList,	"service",			"http://me.olsr:80|tcp|my little homepage" },
+			{ Value,	"services_file",		"/var/run/services_olsr" },
+			{ Value,	"services_change_script",	"/usr/local/bin/announce_new_services.sh" },
+                        { DynamicList,	"mac",				"xx:xx:xx:xx:xx:xx[,0-255]" },
+			{ Value,	"macs_file",			"/path/to/macs_file" },
+			{ Value,	"macs_change_script",		"/path/to/script" }
+		},
+
+		["olsrd_quagga.so.0.2.2"] = {
+			{ StaticList,	"redistribute",			{
+				"system", "kernel", "connect", "static", "rip", "ripng", "ospf",
+				"ospf6", "isis", "bgp", "hsls"
+			} },
+			{ ListValue,	"ExportRoutes",			{ "only", "both" } },
+			{ Flag,		"LocalPref",			"true" },
+			{ Value,	"Distance",			Range(0,255) }
+		},
+
+		["olsrd_secure.so.0.5"] = {
+			{ Value,	"Keyfile",			"/etc/private-olsr.key" }
+		},
+
+		["olsrd_txtinfo.so.0.1"] = {
+			{ Value,	"accept",			"127.0.0.1" }
+		},
+
+		["olsrd_jsoninfo.so.0.0"] = {
+			{ Value,	"accept",			"127.0.0.1" },
+			{ Value,	"port",				"9090" },
+			{ Value,	"UUIDFile",			"/etc/olsrd/olsrd.uuid" },
+
+		},
+
+		["olsrd_watchdog.so.0.1"] = {
+			{ Value,	"file",				"/var/run/olsrd.watchdog" },
+			{ Value,	"interval",			"30" }
+		},
+
+		["olsrd_mdns.so.1.0.0"] = {
+			{ DynamicList,	"NonOlsrIf",			"lan" }
+		},
+
+		["olsrd_p2pd.so.0.1.0"] = {
+			{ DynamicList,	"NonOlsrIf",			"lan" },
+			{ Value,	"P2pdTtl",			"10" }
+		},
+
+		["olsrd_arprefresh.so.0.1"]		= {},
+		["olsrd_dot_draw.so.0.3"]		= {},
+		["olsrd_dyn_gw_plain.so.0.4"]	= {},
+		["olsrd_pgraph.so.1.1"]			= {},
+		["olsrd_tas.so.0.1"]			= {}
+	}
+
+
+	-- build plugin options with dependencies
+	if knownPlParams[arg[1]] then
+		for _, option in ipairs(knownPlParams[arg[1]]) do
+			local otype, name, default, uci2cbi, cbi2uci = unpack(option)
+			local values
+
+			if type(default) == "table" then
+				values  = default
+				default = default[1]
+			end
+
+			if otype == Flag then
+				local bool = p:option( Flag, name, name )
+				if default == "yes" or default == "no" then
+					bool.enabled  = "yes"
+					bool.disabled = "no"
+				elseif default == "on" or default == "off" then
+					bool.enabled  = "on"
+					bool.disabled = "off"
+				elseif default == "1" or default == "0" then
+					bool.enabled  = "1"
+					bool.disabled = "0"
+				else
+					bool.enabled  = "true"
+					bool.disabled = "false"
+				end
+				bool.optional = true
+				bool.default = default
+				bool:depends({ library = plugin })
+			else
+				local field = p:option( otype, name, name )
+				if values then
+					for _, value in ipairs(values) do
+						field:value( value )
+					end
+				end
+				if type(uci2cbi) == "function" then
+					function field.cfgvalue(self, section)
+						return uci2cbi(otype.cfgvalue(self, section))
+					end
+				end
+				if type(cbi2uci) == "function" then
+					function field.formvalue(self, section)
+						return cbi2uci(otype.formvalue(self, section))
+					end
+				end
+				field.optional = true
+				field.default = default
+				--field:depends({ library = arg[1] })
+			end
+		end
+	end
+
+	return mp
+
+else
+
+	mpi = Map("olsrd", translate("OLSR - Plugins"))
+
+	local plugins = {}
+	mpi.uci:foreach("olsrd", "LoadPlugin",
+		function(section)
+			if section.library and not plugins[section.library] then
+				plugins[section.library] = true
+			end
+		end
+	)
+
+	-- create a loadplugin section for each found plugin
+	for v in fs.dir("/usr/lib") do
+		if v:sub(1, 6) == "olsrd_" then
+			if not plugins[v] then
+				mpi.uci:section(
+					"olsrd", "LoadPlugin", nil,
+					{ library = v, ignore = 1 }
+				)
+			end
+		end
+	end
+
+	t = mpi:section( TypedSection, "LoadPlugin", translate("Plugins") )
+	t.anonymous = true
+	t.template  = "cbi/tblsection"
+	t.override_scheme = true
+	function t.extedit(self, section)
+		local lib = self.map:get(section, "library") or ""
+		return luci.dispatcher.build_url("admin", "services", "olsrd", "plugins") .. "/" .. lib
+	end
+
+	ign = t:option( Flag, "ignore", translate("Enabled") )
+	ign.enabled  = "0"
+	ign.disabled = "1"
+	ign.rmempty  = false
+	function ign.cfgvalue(self, section)
+		return Flag.cfgvalue(self, section) or "0"
+	end
+
+	t:option( DummyValue, "library", translate("Library") )
+
+	return mpi
+end
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
new file mode 100644
index 00000000..221938e7
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
@@ -0,0 +1,270 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local ip = require "luci.ip"
+local fs = require "nixio.fs"
+
+if arg[1] then
+	mp = Map("olsrd6", translate("OLSR - Plugins"))
+
+	p = mp:section(TypedSection, "LoadPlugin", translate("Plugin configuration"))
+	p:depends("library", arg[1])
+	p.anonymous = true
+
+	ign = p:option(Flag, "ignore", translate("Enable"))
+	ign.enabled  = "0"
+	ign.disabled = "1"
+	ign.rmempty  = false
+	function ign.cfgvalue(self, section)
+		return Flag.cfgvalue(self, section) or "0"
+	end
+
+	lib = p:option(DummyValue, "library", translate("Library"))
+	lib.default = arg[1]
+
+	local function Range(x,y)
+		local t = {}
+		for i = x, y do t[#t+1] = i end
+		return t
+	end
+
+	local function Cidr2IpMask(val)
+		if val then
+			for i = 1, #val do
+				local cidr = ip.IPv4(val[i]) or ip.IPv6(val[i])
+				if cidr then
+					val[i] = cidr:network():string() .. " " .. cidr:mask():string()
+				end
+			end
+			return val
+		end
+	end
+
+	local function IpMask2Cidr(val)
+		if val then
+			for i = 1, #val do
+				local ip, mask = val[i]:gmatch("([^%s]+)%s+([^%s]+)")()
+				local cidr
+				if ip and mask and ip:match(":") then
+					cidr = ip.IPv6(ip, mask)
+				elseif ip and mask then
+					cidr = ip.IPv4(ip, mask)
+				end
+
+				if cidr then
+					val[i] = cidr:string()
+				end
+			end
+			return val
+		end
+	end
+
+
+	local knownPlParams = {
+		["olsrd_bmf.so.1.5.3"] = {
+			{ Value,	"BmfInterface",			"bmf0" },
+			{ Value, 	"BmfInterfaceIp",		"10.10.10.234/24" },
+			{ Flag,  	"DoLocalBroadcast",		"no" },
+			{ Flag,  	"CapturePacketsOnOlsrInterfaces", "yes" },
+			{ ListValue, 	"BmfMechanism",			{ "UnicastPromiscuous", "Broadcast" } },
+			{ Value, 	"BroadcastRetransmitCount",	"2" },
+			{ Value, 	"FanOutLimit",			"4" },
+			{ DynamicList,	"NonOlsrIf",			"br-lan" }
+		},
+
+		["olsrd_dyn_gw.so.0.4"] = {
+			{ Value,	"Interval",			"40" },
+			{ DynamicList,  "Ping",				"141.1.1.1" },
+			{ DynamicList,	"HNA",				"192.168.80.0/24", IpMask2Cidr, Cidr2IpMask }
+		},
+
+		["olsrd_httpinfo.so.0.1"] = {
+			{ Value,	"port",				"80" },
+			{ DynamicList,	"Host",				"163.24.87.3" },
+			{ DynamicList,  "Net",				"0.0.0.0/0", Cidr2IpMask }
+		},
+
+		["olsrd_nameservice.so.0.3"] = {
+			{ DynamicList,	"name",				"my-name.mesh" },
+			{ DynamicList,	"hosts",			"1.2.3.4 name-for-other-interface.mesh" },
+			{ Value,	"suffix",			".olsr" },
+			{ Value,	"hosts_file",			"/path/to/hosts_file" },
+			{ Value,	"add_hosts",			"/path/to/file" },
+			{ Value,	"dns_server",			"141.1.1.1" },
+			{ Value,	"resolv_file",			"/path/to/resolv.conf" },
+			{ Value,	"interval",			"120" },
+			{ Value,	"timeout",			"240" },
+			{ Value,	"lat",				"12.123" },
+			{ Value,	"lon",				"12.123" },
+			{ Value,	"latlon_file",			"/var/run/latlon.js.ipv6" },
+			{ Value,	"latlon_infile",		"/var/run/gps.txt" },
+			{ Value,	"sighup_pid_file",		"/var/run/dnsmasq.pid" },
+			{ Value,	"name_change_script",		"/usr/local/bin/announce_new_hosts.sh" },
+			{ DynamicList,	"service",			"http://me.olsr:80|tcp|my little homepage" },
+			{ Value,	"services_file",		"/var/run/services_olsr" },
+			{ Value,	"services_change_script",	"/usr/local/bin/announce_new_services.sh" },
+                        { DynamicList,	"mac",				"xx:xx:xx:xx:xx:xx[,0-255]" },
+			{ Value,	"macs_file",			"/path/to/macs_file" },
+			{ Value,	"macs_change_script",		"/path/to/script" }
+		},
+
+		["olsrd_quagga.so.0.2.2"] = {
+			{ StaticList,	"redistribute",			{
+				"system", "kernel", "connect", "static", "rip", "ripng", "ospf",
+				"ospf6", "isis", "bgp", "hsls"
+			} },
+			{ ListValue,	"ExportRoutes",			{ "only", "both" } },
+			{ Flag,		"LocalPref",			"true" },
+			{ Value,	"Distance",			Range(0,255) }
+		},
+
+		["olsrd_secure.so.0.5"] = {
+			{ Value,	"Keyfile",			"/etc/private-olsr.key" }
+		},
+
+		["olsrd_txtinfo.so.0.1"] = {
+			{ Value,	"accept",			"::1/128" }
+		},
+
+		["olsrd_jsoninfo.so.0.0"] = {
+			{ Value,	"accept",			"::1/128" },
+			{ Value,	"port",				"9090" },
+			{ Value,	"UUIDFile",			"/etc/olsrd/olsrd.uuid.ipv6" },
+
+		},
+
+		["olsrd_watchdog.so.0.1"] = {
+			{ Value,	"file",				"/var/run/olsrd.watchdog.ipv6" },
+			{ Value,	"interval",			"30" }
+		},
+
+		["olsrd_mdns.so.1.0.0"] = {
+			{ DynamicList,	"NonOlsrIf",			"lan" }
+		},
+
+		["olsrd_p2pd.so.0.1.0"] = {
+			{ DynamicList,	"NonOlsrIf",			"lan" },
+			{ Value,	"P2pdTtl",			"10" }
+		},
+
+		["olsrd_arprefresh.so.0.1"]		= {},
+		["olsrd_dot_draw.so.0.3"]		= {},
+		["olsrd_dyn_gw_plain.so.0.4"]	= {},
+		["olsrd_pgraph.so.1.1"]			= {},
+		["olsrd_tas.so.0.1"]			= {}
+	}
+
+
+	-- build plugin options with dependencies
+	if knownPlParams[arg[1]] then
+		for _, option in ipairs(knownPlParams[arg[1]]) do
+			local otype, name, default, uci2cbi, cbi2uci = unpack(option)
+			local values
+
+			if type(default) == "table" then
+				values  = default
+				default = default[1]
+			end
+
+			if otype == Flag then
+				local bool = p:option( Flag, name, name )
+				if default == "yes" or default == "no" then
+					bool.enabled  = "yes"
+					bool.disabled = "no"
+				elseif default == "on" or default == "off" then
+					bool.enabled  = "on"
+					bool.disabled = "off"
+				elseif default == "1" or default == "0" then
+					bool.enabled  = "1"
+					bool.disabled = "0"
+				else
+					bool.enabled  = "true"
+					bool.disabled = "false"
+				end
+				bool.optional = true
+				bool.default = default
+				bool:depends({ library = plugin })
+			else
+				local field = p:option( otype, name, name )
+				if values then
+					for _, value in ipairs(values) do
+						field:value( value )
+					end
+				end
+				if type(uci2cbi) == "function" then
+					function field.cfgvalue(self, section)
+						return uci2cbi(otype.cfgvalue(self, section))
+					end
+				end
+				if type(cbi2uci) == "function" then
+					function field.formvalue(self, section)
+						return cbi2uci(otype.formvalue(self, section))
+					end
+				end
+				field.optional = true
+				field.default = default
+				--field:depends({ library = arg[1] })
+			end
+		end
+	end
+
+	return mp
+
+else
+
+	mpi = Map("olsrd6", translate("OLSR - Plugins"))
+
+	local plugins = {}
+	mpi.uci:foreach("olsrd6", "LoadPlugin",
+		function(section)
+			if section.library and not plugins[section.library] then
+				plugins[section.library] = true
+			end
+		end
+	)
+
+	-- create a loadplugin section for each found plugin
+	for v in fs.dir("/usr/lib") do
+		if v:sub(1, 6) == "olsrd_" then
+			if not plugins[v] then
+				mpi.uci:section(
+					"olsrd6", "LoadPlugin", nil,
+					{ library = v, ignore = 1 }
+				)
+			end
+		end
+	end
+
+	t = mpi:section( TypedSection, "LoadPlugin", translate("Plugins") )
+	t.anonymous = true
+	t.template  = "cbi/tblsection"
+	t.override_scheme = true
+	function t.extedit(self, section)
+		local lib = self.map:get(section, "library") or ""
+		return luci.dispatcher.build_url("admin", "services", "olsrd6", "plugins") .. "/" .. lib
+	end
+
+	ign = t:option( Flag, "ignore", translate("Enabled") )
+	ign.enabled  = "0"
+	ign.disabled = "1"
+	ign.rmempty  = false
+	function ign.cfgvalue(self, section)
+		return Flag.cfgvalue(self, section) or "0"
+	end
+
+	t:option( DummyValue, "library", translate("Library") )
+
+	return mpi
+end
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/tools/olsr.lua b/trunk/package/luci/applications/luci-olsr/luasrc/tools/olsr.lua
new file mode 100644
index 00000000..dfd8262f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/tools/olsr.lua
@@ -0,0 +1,42 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+module("luci.tools.olsr", package.seeall)
+
+function etx_color(etx)
+	local color = "#bb3333"
+	if etx == 0 then
+		color = "#bb3333"
+	elseif etx < 2 then
+		color = "#00cc00"
+	elseif etx < 4 then
+		color = "#ffcb05"
+	elseif etx < 10 then
+		color = "#ff6600"
+	end
+	return color
+end
+
+function snr_color(snr)
+	local color = "#bb3333"
+	if snr == 0 then
+		color = "#bb3333"
+	elseif snr > 30 then
+		color = "#00cc00"
+	elseif snr > 20 then
+		color = "#ffcb05"
+	elseif snr > 5 then
+		color = "#ff6600"
+	end
+	return color
+end
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/common_js.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/common_js.htm
new file mode 100644
index 00000000..1ee763e1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/common_js.htm
@@ -0,0 +1,35 @@
+<% if has_v4 and has_v6 then %>
+<script type="text/javascript">//<![CDATA[
+
+function css(selector, property, value) {
+  for (var i=0; i<document.styleSheets.length;i++) {
+    try { document.styleSheets[i].insertRule(selector+ ' {'+property+':'+value+'}', document.styleSheets[i].cssRules.length);
+    } catch(err) {try { document.styleSheets[i].addRule(selector, property+':'+value);} catch(err) {}}//IE
+  }
+}
+
+window.onload = function() {
+  buttons = '<input type="button" name="show-proto-4" id="show-proto-4" class="cbi-button cbi-button-apply" style="margin-right: 5px" value="<%:Hide IPv4%>">'
+  buttons += '<input type="button" name="show-proto-6" id="show-proto-6" class="cbi-button cbi-button-apply" value="<%:Hide IPv6%>">'
+
+  document.getElementById('togglebuttons').innerHTML = buttons;
+
+  var visible = true;
+  document.getElementById('show-proto-4').onclick = function() {
+  visible = !visible;
+  document.getElementById('show-proto-4').value = visible ? '<%:Hide IPv4%>' : '<%:Show IPv4%>';
+  document.getElementById('show-proto-4').className = visible ? 'cbi-button cbi-button-apply' : 'cbi-button cbi-button-reset';
+  css('.proto-4', 'display', visible ? 'table-row' : 'none')
+  };
+
+  var visible6 = true;
+  document.getElementById('show-proto-6').onclick = function() {
+  visible6 = !visible6;
+  document.getElementById('show-proto-6').value = visible6 ? '<%:Hide IPv6%>' : '<%:Show IPv6%>';
+  document.getElementById('show-proto-6').className = visible6 ? 'cbi-button cbi-button-apply' : 'cbi-button cbi-button-reset';
+  css('.proto-6', 'display', visible6 ? 'table-row' : 'none')
+  };
+
+}
+//]]></script>
+<%end %>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
new file mode 100644
index 00000000..2c872fa5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
@@ -0,0 +1,17 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:OLSR Daemon%></a></h2>
+<p class="error"><%:Unable to connect to the OLSR daemon!%></p>
+<p><%:Make sure that OLSRd is running, the "jsoninfo" plugin is loaded, configured on port 9090 and accepts connections from "127.0.0.1".%></p>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
new file mode 100644
index 00000000..689bafdf
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -0,0 +1,129 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%
+local i = 1
+
+if luci.http.formvalue("status") == "1" then
+	local rv = {}
+	for k, hna in ipairs(hna) do
+		rv[#rv+1] = {
+			proto = hna["proto"],
+			destination = hna["destination"],
+			genmask = hna["genmask"],
+			gateway = hna["gateway"],
+			hostname = hna["hostname"],
+			validityTime = hna["validityTime"]
+			}
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+	return
+end
+%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
+	function(x, info)
+	{
+	var hnadiv = document.getElementById('olsrd_hna');
+	if (hnadiv)
+	{
+		var s = '';
+		for (var idx = 0; idx < info.length; idx++)
+		{
+			var hna = info[idx];
+			var linkgw = ''
+			s += '<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-' + hna.proto + '">'
+			if (hna.proto == '6') {
+				linkgw = '<a href="http://[' + hna.gateway + ']/cgi-bin-status.html">' + hna.gateway + '</a>'
+			} else {
+				linkgw = '<a href="http://' + hna.gateway + '/cgi-bin-status.html">' + hna.gateway + '</a>'
+			}
+
+			if (hna.validityTime != undefined) {
+				validity = hna.validityTime + 's'
+			} else {
+				validity = '-'
+			}
+
+			if (hna.hostname != undefined) {
+				hostname = ' / <a href="http://' + hna.hostname + '/cgi-bin-status.html">' + hna.hostname + '</a>'
+			} else {
+				hostname = ''
+			}
+
+			s += String.format(
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>', hna.destination + '/' + hna.genmask, linkgw + hostname, validity
+                                )
+			s += '</tr>'
+		}
+		hnadiv.innerHTML = s;
+	}
+}
+);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Active host net announcements%></a></h2>
+
+<div id="togglebuttons"></div>
+<fieldset class="cbi-section">
+
+	<legend><%:Overview of currently active OLSR host net announcements%></legend>
+	<table class="cbi-section-table">
+		<thead>
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Announced network%></th>
+			<th class="cbi-section-table-cell"><%:OLSR gateway%></th>
+			<th class="cbi-section-table-cell"><%:Validity Time%></th>
+		</tr>
+
+		</thead>
+		<tbody id="olsrd_hna">
+		<% for k, route in ipairs(hna) do %>
+
+		<tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=hna[k].proto%>">
+			<td class="cbi-section-table-cell"><%=hna[k].destination%>/<%=hna[k].genmask%> </td>
+			<td class="cbi-section-table-cell">
+				<% if hna[k].proto == '6' then %>
+				<a href="http://[<%=hna[k].gateway%>]/cgi-bin-status.html"><%=hna[k].gateway%></a>
+				<% else %>
+				<a href="http://<%=hna[k].gateway%>/cgi-bin-status.html"><%=hna[k].gateway%></a>
+				<% end %>
+				<% if hna[k].hostname then %>
+				 / <a href="http://<%=hna[k].hostname%>/cgi-bin-status.html"><%=hna[k].hostname%></a>
+				<% end %>
+			</td>
+			<% if hna[k].validityTime then
+				validity = hna[k].validityTime .. 's'
+			else
+				validity = '-'
+			end %>
+
+			<td class="cbi-section-table-cell"><%=validity%></td>
+		</tr>
+
+		<% i = ((i % 2) + 1)
+		end %>
+		</tbody>
+	</table>
+</fieldset>
+
+<%+status-olsr/common_js%>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/interfaces.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/interfaces.htm
new file mode 100644
index 00000000..dd1a21ea
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/interfaces.htm
@@ -0,0 +1,57 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%
+local i = 1
+%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Interfaces%></a></h2>
+
+<div id="togglebuttons"></div>
+
+<fieldset class="cbi-section">
+	<legend><%:Overview of interfaces where OLSR is running%></legend>
+
+	<table class="cbi-section-table">
+		<tr>
+			<th class="cbi-section-table-cell"><%:Interface%></th>
+			<th class="cbi-section-table-cell"><%:State%></th>
+			<th class="cbi-section-table-cell"><%:MTU%></th>
+			<th class="cbi-section-table-cell"><%:WLAN%></th>
+			<th class="cbi-section-table-cell"><%:Source address%></th>
+			<th class="cbi-section-table-cell"><%:Netmask%></th>
+			<th class="cbi-section-table-cell"><%:Broadcast address%></th>
+		</tr>
+
+		<% for k, iface in ipairs(iface) do %>
+
+		<tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=iface.proto%>">
+			<td class="cbi-section-table-cell"><%=iface.name%></td>
+			<td class="cbi-section-table-cell"><%=iface.state%></td>
+			<td class="cbi-section-table-cell"><%=iface.olsrMTU%></td>
+			<td class="cbi-section-table-cell"><%=iface.wireless and luci.i18n.translate('yes') or luci.i18n.translate('no')%></td>
+			<td class="cbi-section-table-cell"><%=iface.ipv4Address or iface.ipv6Address%></td>
+			<td class="cbi-section-table-cell"><%=iface.netmask%></td>
+			<td class="cbi-section-table-cell"><%=iface.broadcast or iface.multicast%></td>
+		</tr>
+		<% i = ((i % 2) + 1)
+		end %>
+	</table>
+</fieldset>
+<%+status-olsr/common_js%>
+<%+footer%>
+
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/legend.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/legend.htm
new file mode 100644
index 00000000..2f598489
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/legend.htm
@@ -0,0 +1,24 @@
+<h3><%:Legend%>:</h3>
+<ul>
+	<li><strong>LQ: </strong><%:Success rate of packages received from the neighbour%></li>
+	<li><strong>NLQ: </strong><%:Success rate of packages sent to the neighbour%></li>
+	<li><strong>ETX: </strong><%:Expected retransmission count%></li>
+	<li style="list-style: none">
+	<ul>
+		<li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (ETX < 2)%></li>
+		<li><strong><span style="color:#ffcb05"><%:Yellow%></span></strong>:<%:Good (2 < ETX < 4)%></li>
+		<li><strong><span style="color:#ff6600"><%:Orange%></span></strong>:<%:Still usable (4 < ETX < 10)%></li>
+		<li><strong><span style="color:#bb3333"><%:Red%></span></strong>:<%:Bad (ETX > 10)%></li>
+	</ul>
+	</li>
+	<li><strong>SNR: </strong><%:Signal Noise Ratio in dB%></li>
+	<li style="list-style: none">
+	<ul>
+		<li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (SNR > 30)%></li>
+		<li><strong><span style="color:#ffcb05"><%:Yellow%></span></strong>:<%:Good (30 > SNR > 20)%></li>
+		<li><strong><span style="color:#ff6600"><%:Orange%></span></strong>:<%:Still usable (20 > SNR > 5)%></li>
+		<li><strong><span style="color:#bb3333"><%:Red%></span></strong>:<%:Bad (SNR < 5)%></li>
+	</ul>
+	</li>
+</ul>
+
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
new file mode 100644
index 00000000..ec5caaa9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -0,0 +1,58 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%
+local i = 1
+%>
+
+<%+header%>
+<h2><a id="content" name="content"><%:Active MID announcements%></a></h2>
+
+<div id="togglebuttons"></div> 
+<fieldset class="cbi-section">
+	<legend><%:Overview of known multiple interface announcements%></legend>
+	<table class="cbi-section-table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:OLSR node%></th>
+			<th class="cbi-section-table-cell" ><%:Secondary OLSR interfaces%></th>
+		</tr>
+
+		<% for k, mid in ipairs(mids) do 
+			local aliases = ''
+			for k,v in ipairs(mid.aliases) do
+				if aliases == '' then
+					sep = ''
+				else
+					sep = ', '
+				end
+				aliases = v.ipAddress .. sep .. aliases
+			end
+			local host = mid.ipAddress
+			if mid.proto == '6' then
+				host = '[' .. mid.ipAddress .. ']'
+			end
+		%>
+
+		<tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=mid.proto%>">
+			<td class="cbi-section-table-cell"><a href="http://<%=host%>/cgi-bin-status.html"><%=mid.ipAddress%></a></td>
+			<td class="cbi-section-table-cell"><%=aliases%></td>
+		</tr>
+
+		<% i = ((i % 2) + 1)
+		end %>
+	</table>
+</fieldset>
+<%+status-olsr/common_js%>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm
new file mode 100644
index 00000000..daa52831
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/neighbors.htm
@@ -0,0 +1,181 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%
+local olsrtools = require "luci.tools.olsr"
+local i = 1
+
+if luci.http.formvalue("status") == "1" then
+	local rv = {}
+	for k, link in ipairs(links) do
+		link.linkCost = tonumber(link.linkCost)/1024 or 0
+		if link.linkCost == 4096 then
+			link.linkCost = 0
+		end
+		local color = olsrtools.etx_color(link.linkCost)
+		local snr_color = olsrtools.snr_color(link.snr)
+		defaultgw_color = ""
+		if link.defaultgw == 1 then
+			defaultgw_color = "#ffff99"
+		end
+
+		rv[#rv+1] = {
+			rip = link.remoteIP,
+			hn = link.hostname,
+			lip = link.localIP,
+			ifn = link.interface,
+			lq = string.format("%.3f", link.linkQuality),
+			nlq = string.format("%.3f",link.neighborLinkQuality),
+			cost = string.format("%.3f", link.linkCost),
+			snr = link.snr,
+			signal = link.signal,
+			noise = link.noise,
+			color = color,
+			snr_color = snr_color,
+			dfgcolor = defaultgw_color,
+			proto = link.proto
+			}
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+	return
+end
+%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+
+	XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 }, 
+		function(x, info)
+		{
+		var nt = document.getElementById('olsr_neigh_table');
+			if (nt)
+			{
+				var s = '';
+				for (var idx = 0; idx < info.length; idx++)
+				{
+					var neigh = info[idx];
+
+					if (neigh.proto == '6') {
+						s += String.format(
+							'<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
+							'<td class="cbi-section-table-titles" style="background-color:%s"><a href="http://[%s]/cgi-bin-status.html">%s</a></td>',
+							neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
+						);
+					} else {
+						s += String.format(
+							'<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
+							'<td class="cbi-section-table-titles" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></td>',
+							neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
+						);
+					}
+					if (neigh.hn) {
+						s += String.format(
+							'<td class="cbi-section-table-titles" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></td>',
+							neigh.dfgcolor, neigh.hn, neigh.hn
+						);
+					} else {
+						s += String.format(
+							'<td class="cbi-section-table-titles" style="background-color:%s">?</td>',
+							neigh.dfgcolor
+						);
+					}
+					s += String.format(
+						'<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+						'<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+						'<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+						'<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+						'<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+						'<td class="cbi-section-table-titles" style="background-color:%s" title="Signal: %s Noise: %s">%s</td>' +
+						'</tr>',
+						neigh.dfgcolor, neigh.ifn, neigh.dfgcolor, neigh.lip, neigh.dfgcolor, neigh.lq, neigh.dfgcolor, neigh.nlq, neigh.color, neigh.cost, neigh.snr_color, neigh.signal, neigh.noise, neigh.snr || '?'
+					);
+				}
+
+				nt.innerHTML = s;
+			}
+		}
+	);
+//]]></script>
+
+
+<h2><a id="content" name="content"><%:OLSR connections%></a></h2>
+
+<div id="togglebuttons"></div>
+
+<fieldset class="cbi-section">
+	<legend><%:Overview of currently established OLSR connections%></legend>
+
+	<table class="cbi-section-table">
+		<thead>
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell"><%:Neighbour IP%></th>
+				<th class="cbi-section-table-cell"><%:Hostname%></th>
+				<th class="cbi-section-table-cell"><%:Interface%></th>
+				<th class="cbi-section-table-cell"><%:Local interface IP%></th>
+				<th class="cbi-section-table-cell">LQ</th>
+				<th class="cbi-section-table-cell">NLQ</th>
+				<th class="cbi-section-table-cell">ETX</th>
+				<th class="cbi-section-table-cell">SNR</th>
+			</tr>
+		</thead>
+	
+		<tbody id="olsr_neigh_table">
+		<% 	local i = 1
+			for k, link in ipairs(links) do
+			link.linkCost = tonumber(link.linkCost)/1024 or 0
+			if link.linkCost == 4096 then
+				link.linkCost = 0
+			end
+
+			color = olsrtools.etx_color(link.linkCost)
+			snr_color = olsrtools.snr_color(link.snr)
+
+			if link.snr == 0 then
+				link.snr = '?'
+			end
+
+			defaultgw_color = ""
+			if link.defaultgw == 1 then
+				defaultgw_color = "#ffff99"
+			end
+		%>
+
+		<tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=link.proto%>">
+			<% if link.proto == "6" then %>
+			<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://[<%=link.remoteIP%>]/cgi-bin-status.html"><%=link.remoteIP%></a></td>
+			<% else %>
+			<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link.remoteIP%>/cgi-bin-status.html"><%=link.remoteIP%></a></td>
+			<% end %>
+			<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link.hostname%>/cgi-bin-status.html"><%=link.hostname%></a></td>
+			<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=link.interface%></td>
+			<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=link.localIP%></td>
+			<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.linkQuality)%></td>
+			<td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.neighborLinkQuality)%></td>
+			<td class="cbi-section-table-titles" style="background-color:<%=color%>"><%=string.format("%.3f", link.linkCost)%></td>
+			<td class="cbi-section-table-titles" style="background-color:<%=snr_color%>" title="Signal: <%=link.signal%> Noise: <%=link.noise%>"><%=link.snr%></td>
+		</tr>
+		<% 
+			i = ((i % 2) + 1)
+		end %>
+		</tbody>
+	</table>
+<br />
+
+<%+status-olsr/legend%>
+</fieldset>
+<%+status-olsr/common_js%>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/overview.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/overview.htm
new file mode 100644
index 00000000..560484ae
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/overview.htm
@@ -0,0 +1,220 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+-%>
+
+<%
+local ipv = luci.model.uci.cursor():get_first("olsrd", "olsrd", "IpVersion", "4")
+
+function write_conf(conf, file)
+	local fs = require "luci.fs"
+	if fs.access(conf) then
+		luci.http.header("Content-Disposition", "attachment; filename="..file)
+		luci.http.prepare_content("text/plain")
+		luci.http.write(fs.readfile(conf))
+	end
+end
+
+conf = luci.http.formvalue()
+
+if conf.librecmc then
+	write_conf("/etc/config/olsrd", "olsrd")
+	return false
+end
+
+if conf.conf_v4 then   
+	write_conf("/var/etc/olsrd.conf.ipv4", "olsrd.conf.ipv4")
+	return false
+end
+
+if conf.conf_v6 then
+	write_conf("/var/etc/olsrd.conf.ipv6", "olsrd.conf.ipv6")
+	return false
+end
+
+if conf.conf then
+	write_conf("/var/etc/olsrd.conf", "olsrd.conf")
+	return false
+end
+
+%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+
+XHR.poll(10, '<%=REQUEST_URI%>/json', { },
+                function(x, info)
+                {
+		var e;
+
+		if (! info) {
+			document.getElementById('error').innerHTML = '<%:Could not get any data. Make sure the jsoninfo plugin is installed and allows connections from localhost.%>';
+			return
+		}
+		document.getElementById('error').innerHTML = '';
+
+		if (e = document.getElementById('version'))
+			var version;
+			var date;
+			if (info.v4.config.olsrdVersion != undefined) {
+				version = info.v4.config.olsrdVersion
+				date = info.v4.config.olsrdBuildDate
+			} else if (info.v6.config.olsrdVersion != undefined) {
+				version = info.v6.config.olsrdVersion
+				date = info.v6.config.olsrdBuildDate
+			} else {
+				version = 'unknown'
+				date = 'unknown'
+			}		
+			e.innerHTML = version + '<br />' + date;
+
+		if (e = document.getElementById('nr_neigh'))
+			var neigh = 0;
+			if (info.v4.links != undefined) {
+				neigh = neigh + info.v4.links.length
+			}
+			if (info.v6.links != undefined) {
+				neigh = neigh + info.v6.links.length
+			}
+			e.innerHTML = neigh;
+
+
+		if (e = document.getElementById('nr_hna'))
+			var hna = 0;
+			if (info.v4.hna != undefined) {
+				hna = hna + info.v4.hna.length
+			}
+			if (info.v6.hna != undefined) {
+				hna = hna + info.v6.hna.length
+			}
+			e.innerHTML = hna;
+
+
+		if (e = document.getElementById('nr_ifaces'))
+			var nrint = 0
+			if (info.v4.interfaces != undefined) {
+				nrint = nrint + info.v4.interfaces.length
+			}
+			if (info.v6.interfaces != undefined) {
+				nrint = nrint + info.v6.interfaces.length
+			}
+			e.innerHTML = nrint
+
+
+		if (e = document.getElementById('nr_topo'))
+			var topo = 0;
+			var nodes = [];
+
+			Array.prototype.contains = function (element) {
+				for (var i = 0; i < this.length; i++) {
+					if (this[i] == element) {
+						return true;
+					}
+				}
+				return false;
+			}
+
+			if (info.v4.topology != undefined) {
+				topo = topo + info.v4.topology.length;
+				for (var i = 0; i < info.v4.topology.length; i++) {
+					var destip = info.v4.topology[i].destinationIP
+					if (! nodes.contains(destip) ) {
+						nodes.push(destip)
+					}
+				}
+			}
+
+			if (info.v6.topology != undefined) {
+				topo = topo + info.v6.topology.length
+				for (var i = 0; i < info.v6.topology.length; i++) {
+					var destip = info.v6.topology[i].destinationIP
+					if (! nodes.contains(destip) ) {
+						nodes.push(destip)
+					}
+				}
+
+			}
+			e.innerHTML = topo;
+
+			if (e = document.getElementById('nr_nodes'))
+				e.innerHTML = nodes.length;
+
+			if (e = document.getElementById('meshfactor'))
+				var meshfactor = topo / nodes.length
+				e.innerHTML = meshfactor.toFixed(2)
+		}
+	);
+//]]></script>
+
+
+<div id="error" class="error"></div>
+
+<h2><a id="content" name="content">OLSR <%:Overview%></a></h2>
+
+<fieldset class="cbi-section">
+        <legend><%:Network%></legend>
+
+        <table width="100%" cellspacing="10">
+                <tr><td width="33%"><%:Interfaces%></td><td>
+			<a href="<%=REQUEST_URI%>/interfaces">
+				<span id="nr_ifaces">-<span>
+			</a>
+		</td></tr>
+                <tr><td width="33%"><%:Neighbors%></td><td>
+			<a href="<%=REQUEST_URI%>/neighbors">
+				<span id="nr_neigh">-</span>
+			</a>
+		</td></tr>
+                <tr><td width="33%"><%:Nodes%></td><td>
+			<a href="<%=REQUEST_URI%>/topology">
+				<span id="nr_nodes">-</span>
+			</a>
+		</td></tr>
+                <tr><td width="33%"><%:HNA%></td><td>
+			<a href="<%=REQUEST_URI%>/hna">
+				<span id="nr_hna">-</span>
+			</a>
+		</td></tr>
+                <tr><td width="33%"><%:Links total%></td><td>
+			<a href="<%=REQUEST_URI%>/topology">
+				<span id="nr_topo">-</span>
+			</a>
+		</td></tr>
+                <tr><td width="33%"><%:Links per node (average)%></td><td>
+			<span id="meshfactor">-</span>
+		</td></tr>
+
+
+        </table>
+</fieldset>
+
+
+<fieldset class="cbi-section">
+        <legend>OLSR <%:Configuration%></legend>
+        <table width="100%" cellspacing="10">
+                <tr><td width="33%"><%:Version%></td><td>
+			<span id="version">-<span>
+		</td></tr>
+                <tr><td width="33%"><%:Download Config%></td><td>
+				<a href="<%=REQUEST_URI%>?librecmc">libreCMC</a>,
+				<% if ipv == "6and4" then %>
+					<a href="<%=REQUEST_URI%>?conf_v4">OLSRD IPv4</a>,
+					<a href="<%=REQUEST_URI%>?conf_v6">OLSRD IPv6</a>
+				<% else %>
+					<a href="<%=REQUEST_URI%>?conf">OLSRD</a>
+				<% end %>
+		</td></tr>
+	</table>
+</fieldset>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
new file mode 100644
index 00000000..76e1b107
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -0,0 +1,148 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+-%>
+
+<%
+
+local olsrtools = require "luci.tools.olsr"
+local i = 1
+
+if luci.http.formvalue("status") == "1" then
+	local rv = {}
+	for k, route in ipairs(routes) do
+		local ETX = string.format("%.3f", tonumber(route.rtpMetricCost)/1024 or 0)
+		rv[#rv+1] = {
+			hostname = route.hostname,
+	                dest = route.destination,
+			genmask = route.genmask,
+			gw = route.gateway,
+			interface = route.networkInterface,
+			metric = route.metric,
+			etx = ETX,
+			color = olsrtools.etx_color(tonumber(ETX))
+		}
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+	return
+end
+
+%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[  
+
+XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
+		function(x, info)
+		{
+
+		var rt = document.getElementById('olsrd_routes');
+			if (rt)
+			{
+				var s = '';
+				for (var idx = 0; idx < info.length; idx++)
+				{
+					var route = info[idx];
+
+					s += String.format(
+						'<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
+							'<td class="cbi-section-table-cell">%s/%s</td>' +
+							'<td class="cbi-section-table-cell">' +
+			                	                '<a href="http://%s/cgi-bin-status.html">%s</a>',
+								route.proto, route.dest, route.genmask, route.gw, route.gw
+						)
+
+					if (route.hostname) {
+						if (hna.proto == '6') {
+							s += String.format(
+			                                        ' / <a href="http://[%s]/cgi-bin-status.html">%s</a>',
+								route.hostname, route.hostname || '?'
+								);
+						} else {
+							s += String.format(
+			                                        ' / <a href="http://%s/cgi-bin-status.html">%s</a>',
+								route.hostname, route.hostname || '?'
+								);
+						}
+
+					}
+					s += String.format(
+				                        '</td>' +
+							'<td class="cbi-section-table-cell">%s</td>' +
+							'<td class="cbi-section-table-cell">%s</td>' +
+							'<td class="cbi-section-table-cell" style="background-color:%s">%s</td>' +
+						'</tr>',
+						route.interface, route.metric, route.color, route.etx || '?'
+					);
+				}
+                        }
+			 rt.innerHTML = s;
+
+		}
+	);
+//]]></script>
+
+
+
+<h2><a id="content" name="content"><%:Known OLSR routes%></a></h2>
+
+<div id="togglebuttons"></div>
+
+<fieldset class="cbi-section">
+<legend><%:Overview of currently known routes to other OLSR nodes%></legend>
+
+<table class="cbi-section-table">
+	<thead>
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Announced network%></th>
+			<th class="cbi-section-table-cell"><%:OLSR gateway%></th>
+			<th class="cbi-section-table-cell"><%:Interface%></th>
+			<th class="cbi-section-table-cell"><%:Metric%></th>
+			<th class="cbi-section-table-cell">ETX</th>
+		</tr>
+	</thead>
+
+	<tbody id="olsrd_routes">
+
+	<% for k, route in ipairs(routes) do
+		ETX = tonumber(route.rtpMetricCost)/1024 or '0'
+		color = olsrtools.etx_color(ETX)
+	%>
+
+		<tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=route.proto%>">
+			<td class="cbi-section-table-cell"><%=route.destination%>/<%=route.genmask%></td>
+			<td class="cbi-section-table-cell">
+				<% if route.proto == '6' then %>
+				<a href="http://[<%=route.gateway%>]/cgi-bin-status.html"><%=route.gateway%></a>
+				<% else  %>
+				<a href="http://<%=route.gateway%>/cgi-bin-status.html"><%=route.gateway%></a>
+				<% end %>
+				<% if route.hostname then %>
+					/ <a href="http://<%=route.Hostname%>/cgi-bin-status.html"><%=route.hostname%></a>  
+				<% end %>
+			</td>
+			<td class="cbi-section-table-cell"><%=route.networkInterface%></td>
+			<td class="cbi-section-table-cell"><%=route.metric%></td>
+			<td class="cbi-section-table-cell" style="background-color:<%=color%>"><%=string.format("%.3f", ETX)%></td>
+		</tr>
+	<% 
+		i = ((i % 2) + 1)
+	end %>
+	</tbody>
+</table>
+
+<%+status-olsr/legend%>
+</fieldset>
+<%+status-olsr/common_js%>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/smartgw.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/smartgw.htm
new file mode 100644
index 00000000..75d0c1c2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/smartgw.htm
@@ -0,0 +1,158 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+-%>
+
+<%
+local i = 1
+require("luci.model.uci")
+local uci = luci.model.uci.cursor_state()
+
+uci:foreach("olsrd", "olsrd", function(s)
+        if s.SmartGateway and s.SmartGateway == "yes" then has_smartgw  = true end
+end)
+
+
+if luci.http.formvalue("status") == "1" then
+	local rv = {}
+	for k, gw in ipairs(gws) do
+		gw.tcPathCost = tonumber(gw.tcPathCost)/1024 or 0
+                if gw.tcPathCost == 4096 then
+                        gw.tcPathCost = 0
+                end
+
+		rv[#rv+1] = {
+			proto = gw.proto,
+			ipAddress = gw.ipAddress,
+			status = gw.ipv4Status or gw.ipv6Status,
+			tcPathCost = string.format("%.3f", gw.tcPathCost),
+			hopCount = gw.hopCount,
+			uplinkSpeed = gw.uplinkSpeed,
+			downlinkSpeed = gw.downlinkSpeed,
+			v4 = gw.ipv4 and luci.i18n.translate('yes') or luci.i18n.translate('no'),
+			v6 = gw.ipv6 and luci.i18n.translate('yes') or luci.i18n.translate('no'),
+			externalPrefix = gw.externalPrefix
+			}
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+	return
+end
+%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
+	function(x, info)
+	{
+	var smartgwdiv = document.getElementById('olsrd_smartgw');
+	if (smartgwdiv)
+	{
+		var s = '';
+		for (var idx = 0; idx < info.length; idx++)
+		{
+			var smartgw = info[idx];
+			s += '<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-' + smartgw.proto + '">'
+			if (smartgw.proto == '6') {
+				linkgw = '<a href="http://[' + smartgw.ipAddress + ']/cgi-bin-status.html">' + smartgw.ipAddress + '</a>'
+			} else {
+				linkgw = '<a href="http://' + smartgw.ipAddress + '/cgi-bin-status.html">' + smartgw.ipAddress + '</a>'
+			}
+
+			s += String.format(
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>' +
+                                '<td class="cbi-section-table-cell">%s</td>',
+				linkgw, smartgw.status, smartgw.tcPathCost, smartgw.hopCount, smartgw.uplinkSpeed, smartgw.downlinkSpeed, smartgw.v4, smartgw.v6, smartgw.externalPrefix
+                                )
+			s += '</tr>'
+		}
+		smartgwdiv.innerHTML = s;
+	}
+}
+);
+//]]></script>
+
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:SmartGW announcements%></a></h2>
+
+<div id="togglebuttons"></div>
+
+<% if has_smartgw then %>
+
+	<fieldset class="cbi-section">
+		<legend><%:Overview of smart gateways in this network%></legend>
+		<table class="cbi-section-table">
+			<thead>
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell"><%:Gateway%></th>
+				<th class="cbi-section-table-cell"><%:Status%></th>
+				<th class="cbi-section-table-cell"><%:ETX%></th>
+				<th class="cbi-section-table-cell"><%:Hops%></th>
+				<th class="cbi-section-table-cell"><%:Uplink%></th>
+				<th class="cbi-section-table-cell"><%:Downlink%></th>
+				<th class="cbi-section-table-cell"><%:IPv4%></th>
+				<th class="cbi-section-table-cell"><%:IPv6%></th>
+				<th class="cbi-section-table-cell"><%:Prefix%></th>
+
+			</tr>
+			</thead>
+
+			<tbody id="olsrd_smartgw">
+			<% for k, gw in ipairs(gws) do 
+
+			gw.tcPathCost = tonumber(gw.tcPathCost)/1024 or 0
+               		if gw.tcPathCost == 4096 then
+	                        gw.tcPathCost = 0
+               		end
+			%>
+
+			<tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=proto%>">
+				<% if gw.proto == '6' then %>
+					<td class="cbi-section-table-cell"><a href="http://[<%=gw.ipAddress%>]/cgi-bin-status.html"><%=gw.ipAddress%></a></td>
+				<% else %>
+					<td class="cbi-section-table-cell"><a href="http://<%=gw.ipAddress%>/cgi-bin-status.html"><%=gw.ipAddress%></a></td>
+				<% end %>
+
+				<td class="cbi-section-table-cell"><%=gw.ipv4Status or gw.ipv6Status or '-' %></td>
+				<td class="cbi-section-table-cell"><%=string.format("%.3f", gw.tcPathCost)%></td>
+				<td class="cbi-section-table-cell"><%=gw.hopCount%></td>
+				<td class="cbi-section-table-cell"><%=gw.uplinkSpeed%></td>
+				<td class="cbi-section-table-cell"><%=gw.downlinkSpeed%></td>
+				<td class="cbi-section-table-cell"><%=gw.ipv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></td>
+				<td class="cbi-section-table-cell"><%=gw.ipv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></td>
+				<td class="cbi-section-table-cell"><%=gw.externalPrefix%></td>
+			</tr>
+
+			<% i = ((i % 2) + 1)
+			end %>
+			</tbody>
+		</table>
+	</fieldset>
+
+<% else %>
+
+	<%:SmartGateway is not configured on this system.%>
+
+<% end %>
+
+<%+status-olsr/common_js%>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
new file mode 100644
index 00000000..eb3df5ff
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -0,0 +1,68 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+<%
+local i = 1
+local olsrtools = require "luci.tools.olsr"
+%>
+
+<%+header%>
+<h2><a id="content" name="content"><%:Active OLSR nodes%></a></h2>
+
+<div id="togglebuttons"></div>
+
+<fieldset class="cbi-section">
+	<legend><%:Overview of currently known OLSR nodes%></legend>
+	<table class="cbi-section-table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:OLSR node%></th>
+			<th class="cbi-section-table-cell"><%:Last hop%></th>
+			<th class="cbi-section-table-cell"><%:LQ%></th>
+			<th class="cbi-section-table-cell"><%:NLQ%></th>
+			<th class="cbi-section-table-cell"><%:ETX%></th>
+		</tr>
+
+		<% for k, route in ipairs(routes) do 
+			local cost = string.format("%.3f", tonumber(route.tcEdgeCost/1024) or 0)
+			local color = olsrtools.etx_color(tonumber(cost))
+			local lq = string.format("%.3f", tonumber(route.linkQuality) or 0)
+			local nlq = string.format("%.3f", tonumber(route.neighborLinkQuality) or 0)
+		%>
+
+		<tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=route.proto%>">
+
+			<% if route.proto == "6" then %>
+
+			<td class="cbi-section-table-cell"><a href="http://[<%=route.destinationIP%>]/cgi-bin-status.html"><%=route.destinationIP%></a></td>
+			<td class="cbi-section-table-cell"><a href="http://[<%=route.lastHopIP%>]/cgi-bin-status.html"><%=route.lastHopIP%></a></td>
+
+			<% else %>
+
+			<td class="cbi-section-table-cell"><a href="http://<%=route.destinationIP%>/cgi-bin-status.html"><%=route.destinationIP%></a></td>
+			<td class="cbi-section-table-cell"><a href="http://<%=route.lastHopIP%>/cgi-bin-status.html"><%=route.lastHopIP%></a></td>
+
+			<%end%>
+
+			<td class="cbi-section-table-cell"><%=lq%></td>
+			<td class="cbi-section-table-cell"><%=nlq%></td>
+			<td class="cbi-section-table-cell" style="background-color:<%=color%>"><%=cost%></td>
+		</tr>
+
+		<%	i = ((i % 2) + 1)
+		end %>
+	</table>
+<%+status-olsr/legend%>
+</fieldset>
+
+<%+status-olsr/common_js%>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-olsr/root/etc/config/luci_olsr b/trunk/package/luci/applications/luci-olsr/root/etc/config/luci_olsr
new file mode 100644
index 00000000..2dd4ffac
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/root/etc/config/luci_olsr
@@ -0,0 +1,2 @@
+config 'olsr' 'general'
+	option 'resolve' '1'
diff --git a/trunk/package/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr b/trunk/package/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr
new file mode 100755
index 00000000..63c01e4a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@olsrd[-1]
+	add ucitrack olsrd
+	set ucitrack.@olsrd[-1].init=olsrd
+	delete ucitrack.@olsrd6[-1]
+	add ucitrack olsrd6
+	set ucitrack.@olsrd6[-1].init=olsrd6
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-openvpn/Makefile b/trunk/package/luci/applications/luci-openvpn/Makefile
new file mode 100644
index 00000000..f394a817
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/Makefile
@@ -0,0 +1,4 @@
+PO = openvpn
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-openvpn/luasrc/controller/openvpn.lua b/trunk/package/luci/applications/luci-openvpn/luasrc/controller/openvpn.lua
new file mode 100644
index 00000000..8695dae8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/luasrc/controller/openvpn.lua
@@ -0,0 +1,22 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.openvpn", package.seeall)
+
+function index()
+	entry( {"admin", "services", "openvpn"}, cbi("openvpn"), _("OpenVPN") )
+	entry( {"admin", "services", "openvpn", "basic"},    cbi("openvpn-basic"),    nil ).leaf = true
+	entry( {"admin", "services", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true
+end
diff --git a/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua
new file mode 100644
index 00000000..f47af6d2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-advanced.lua
@@ -0,0 +1,273 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.ip")
+require("luci.model.uci")
+
+
+local knownParams = {
+	--
+	--	Widget			Name							Default(s)														Description	Option(s)
+	--
+
+	{ "Service", {
+		-- initialisation and daemon options
+		{ ListValue,	"verb",							{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },						translate("Set output verbosity") },
+		{ Flag,			"mlock",						0,																translate("Disable Paging") },
+		{ Flag,			"disable_occ",					0,																translate("Disable options consistency check") },
+	--	{ Value,		"user",							"root",															translate("Set UID to user") },
+	--	{ Value,		"group",						"root",															translate("Set GID to group") },
+		{ Value,		"cd",							"/etc/openvpn",													translate("Change to directory before initialization") },
+		{ Value,		"chroot",						"/var/run",														translate("Chroot to directory after initialization") },
+	--	{ Value,		"daemon",						"Instance-Name",												translate("Daemonize after initialization") },
+	--	{ Value,		"syslog",						"Instance-Name",												translate("Output to syslog and do not daemonize") },
+		{ Flag,			"passtos",						0,																translate("TOS passthrough (applies to IPv4 only)") },
+	--	{ Value,		"inetd",						"nowait Instance-Name",											translate("Run as an inetd or xinetd server") },
+		{ Value,		"log",							"/var/log/openvpn.log",											translate("Write log to file") },
+		{ Value,		"log_append",					"/var/log/openvpn.log",											translate("Append log to file") },
+		{ Flag,			"suppress_timestamps",			0,																translate("Don't log timestamps") },
+	--	{ Value,		"writepid",						"/var/run/openvpn.pid",											translate("Write process ID to file") },
+		{ Value,		"nice",							0,																translate("Change process priority") },
+		{ Flag,			"fast_io",						0,																translate("Optimize TUN/TAP/UDP writes") },
+		{ Value,		"echo",							"some params echoed to log",									translate("Echo parameters to log") },
+		{ ListValue,	"remap_usr1",					{ "SIGHUP", "SIGTERM" },										translate("Remap SIGUSR1 signals") },
+		{ Value,		"status",						"/var/run/openvpn.status 5",									translate("Write status to file every n seconds") },
+		{ Value,		"status_version",				{ 1, 2 },														translate("Status file format version") },	-- status
+		{ Value,		"mute",							5,																translate("Limit repeated log messages") },
+
+		{ Value,		"up",							"/usr/bin/ovpn-up",												translate("Shell cmd to execute after tun device open") },
+		{ Value,		"up_delay",						5,																translate("Delay tun/tap open and up script execution") },
+		{ Value,		"down",							"/usr/bin/ovpn-down",											translate("Shell cmd to run after tun device close") },
+		{ Flag,			"down_pre",						0,																translate("Call down cmd/script before TUN/TAP close") },
+		{ Flag,			"up_restart",					0,																translate("Run up/down scripts for all restarts") },
+		{ Value,		"route_up",						"/usr/bin/ovpn-routeup",										translate("Execute shell cmd after routes are added") },
+		{ Value,		"ipchange",						"/usr/bin/ovpn-ipchange",										translate("Execute shell command on remote ip change"),	{ mode="p2p" } },
+		{ DynamicList,	"setenv",						{ "VAR1 value1", "VAR2 value2" },								translate("Pass environment variables to script") },
+		{ Value,		"tls_verify",					"/usr/bin/ovpn-tlsverify",										translate("Shell command to verify X509 name") },
+		{ Value,		"client_connect",				"/usr/bin/ovpn-clientconnect",									translate("Run script cmd on client connection") },
+		{ Flag,			"client_disconnect",			0,																translate("Run script cmd on client disconnection") },
+		{ Value,		"learn_address",				"/usr/bin/ovpn-learnaddress",									translate("Executed in server mode whenever an IPv4 address/route or MAC address is added to OpenVPN's internal routing table") },
+		{ Value,		"auth_user_pass_verify",		"/usr/bin/ovpn-userpass via-env",								translate("Executed in server mode on new client connections, when the client is still untrusted") },
+		{ ListValue,	"script_security",				{ 0, 1, 2, 3 },													translate("Policy level over usage of external programs and scripts"),	{mode="server" } },
+	} },
+
+	{ "Networking", {
+		-- socket config
+		{ ListValue,	"mode",							{ "p2p", "server" },											translate("Major mode") },
+		{ Value,		"local",						"0.0.0.0",														translate("Local host name or ip address") },
+		{ Value,		"port",							1194,															translate("TCP/UDP port # for both local and remote") },
+		{ Value,		"lport",						1194,															translate("TCP/UDP port # for local (default=1194)") },
+		{ Value,		"rport",						1194,															translate("TCP/UDP port # for remote (default=1194)") },
+		{ Flag,			"float",						0,																translate("Allow remote to change its IP or port") },
+		{ Flag,			"nobind",						0,																translate("Do not bind to local address and port") },
+
+		{ Value,		"dev",							"tun0",															translate("tun/tap device") },
+		{ ListValue,	"dev_type",						{ "tun", "tap" },												translate("Type of used device") },
+		{ Value,		"dev_node",						"/dev/net/tun",													translate("Use tun/tap device node") },
+		{ Flag,			"tun_ipv6",						0,																translate("Make tun device IPv6 capable") },
+
+		{ Value,		"ifconfig",						"10.200.200.3 10.200.200.1",									translate("Set tun/tap adapter parameters") },
+		{ Flag,			"ifconfig_noexec",				0,																translate("Don't actually execute ifconfig") },
+		{ Flag,			"ifconfig_nowarn",				0,																translate("Don't warn on ifconfig inconsistencies") },
+
+		{ DynamicList,	"route",						"10.123.0.0 255.255.0.0",										translate("Add route after establishing connection") },
+		{ Value,		"route_gateway",				"10.234.1.1",													translate("Specify a default gateway for routes") },
+		{ Value,		"route_delay",					0,																translate("Delay n seconds after connection") },
+		{ Flag,			"route_noexec",					0,																translate("Don't add routes automatically") },
+
+		{ ListValue,	"mtu_disc",						{ "yes", "maybe", "no" },										translate("Enable Path MTU discovery") },
+		{ Flag,			"mtu_test",						0,																translate("Empirically measure MTU") },
+		{ ListValue,			"comp_lzo",				{ "yes", "no", "adaptive" },																translate("Use fast LZO compression") },
+		{ Flag,			"comp_noadapt",					0,																translate("Don't use adaptive lzo compression"),	{ comp_lzo=1 } },
+		{ Value,		"link_mtu",						1500,															translate("Set TCP/UDP MTU") },
+		{ Value,		"tun_mtu",						1500,															translate("Set tun/tap device MTU") },
+		{ Value,		"tun_mtu_extra",				1500,															translate("Set tun/tap device overhead") },
+		{ Value,		"fragment",						1500,															translate("Enable internal datagram fragmentation"),	{ proto="udp" } },
+		{ Value, 		"mssfix",						1500,															translate("Set upper bound on TCP MSS"),	{ proto="udp" } },
+		{ Value,		"sndbuf",						65536,															translate("Set the TCP/UDP send buffer size") },
+		{ Value,		"rcvbuf",						65536,															translate("Set the TCP/UDP receive buffer size") },
+		{ Value,		"txqueuelen",					100,															translate("Set tun/tap TX queue length") },
+		{ Value,		"shaper",						10240,															translate("Shaping for peer bandwidth") },
+
+		{ Value,		"inactive",						240,															translate("tun/tap inactivity timeout") },
+		{ Value,		"keepalive",					"10 60",														translate("Helper directive to simplify the expression of --ping and --ping-restart in server mode configurations") },
+		{ Value,		"ping",							30,																translate("Ping remote every n seconds over TCP/UDP port") },
+		{ Value,		"ping_exit",					120,															translate("Remote ping timeout") },
+		{ Value,		"ping_restart",					60,																translate("Restart after remote ping timeout") },
+		{ Flag,			"ping_timer_rem",				0,																translate("Only process ping timeouts if routes exist") },
+
+		{ Flag,			"persist_tun",					0,																translate("Keep tun/tap device open on restart") },
+		{ Flag,			"persist_key",					0,																translate("Don't re-read key on restart") },
+		{ Flag,			"persist_local_ip",				0,																translate("Keep local IP address on restart") },
+		{ Flag,			"persist_remote_ip",			0,																translate("Keep remote IP address on restart") },
+
+		-- management channel
+		{ Value,		"management",					"127.0.0.1 31194 /etc/openvpn/mngmt-pwds",						translate("Enable management interface on <em>IP</em> <em>port</em>") },
+		{ Flag,			"management_query_passwords",	0,																translate("Query management channel for private key") },	-- management
+		{ Flag,			"management_hold",				0,																translate("Start OpenVPN in a hibernating state") },	-- management
+		{ Value,		"management_log_cache",			100,															translate("Number of lines for log file history") },	-- management
+		{ ListValue,	"topology",						{ "net30", "p2p", "subnet" },									translate("'net30', 'p2p', or 'subnet'"),	{dev_type="tun" } },
+	} },
+
+	{ "VPN", {
+		{ Value,		"server",						"10.200.200.0 255.255.255.0",									translate("Configure server mode"),	{ server_mode="1" } },
+		{ Value,		"server_bridge",				"10.200.200.1 255.255.255.0 10.200.200.200 10.200.200.250",		translate("Configure server bridge"),	{ server_mode="1" } },
+		{ DynamicList,	"push",							{ "redirect-gateway", "comp-lzo" },								translate("Push options to peer"),	{ server_mode="1" } },
+		{ Flag,			"push_reset",					0,																translate("Don't inherit global push options"),	{ server_mode="1" } },
+		{ Flag,			"disable",						0,																translate("Client is disabled"),	{ server_mode="1" } },
+		{ Value,		"ifconfig_pool",				"10.200.200.100 10.200.200.150 255.255.255.0",					translate("Set aside a pool of subnets"),	{ server_mode="1" } },
+		{ Value,		"ifconfig_pool_persist",		"/etc/openvpn/ipp.txt 600",										translate("Persist/unpersist ifconfig-pool"),	{ server_mode="1" } },
+--		{ Flag,			"ifconfig_pool_linear",			0,																translate("Use individual addresses rather than /30 subnets"),	{ server_mode="1" } }, -- deprecated and replaced by --topology p2p
+		{ Value,		"ifconfig_push",				"10.200.200.1 255.255.255.255",									translate("Push an ifconfig option to remote"),	{ server_mode="1" } },
+		{ Value,		"iroute",						"10.200.200.0 255.255.255.0",									translate("Route subnet to client"),	{ server_mode="1" } },
+		{ Flag,			"client_to_client",				0,																translate("Allow client-to-client traffic"),	{ server_mode="1" } },
+		{ Flag,			"duplicate_cn",					0,																translate("Allow multiple clients with same certificate"),	{ server_mode="1" } },
+		{ Value,		"client_config_dir",			"/etc/openvpn/ccd",												translate("Directory for custom client config files"),	{ server_mode="1" } },
+		{ Flag,			"ccd_exclusive",				0,																translate("Refuse connection if no custom client config"),	{ server_mode="1" } },
+		{ Value,		"tmp_dir",						"/var/run/openvpn",												translate("Temporary directory for client-connect return file"),	{ server_mode="1" } },
+		{ Value,		"hash_size",					"256 256",														translate("Set size of real and virtual address hash tables"),	{ server_mode="1" } },
+		{ Value,		"bcast_buffers",				256,															translate("Number of allocated broadcast buffers"),	{ server_mode="1" } },
+		{ Value,		"tcp_queue_limit",				64,																translate("Maximum number of queued TCP output packets"),	{ server_mode="1" } },
+		{ Value,		"max_clients",					10,																translate("Allowed maximum of connected clients"),	{ server_mode="1" } },
+		{ Value,		"max_routes_per_client",		256,															translate("Allowed maximum of internal"),	{ server_mode="1" } },
+		{ Value,		"connect_freq",					"3 10",															translate("Allowed maximum of new connections"),	{ server_mode="1" } },
+		{ Flag,			"client_cert_not_required",		0,																translate("Don't require client certificate"),	{ server_mode="1" } },
+		{ Flag,			"username_as_common_name",		0,																translate("Use username as common name"),	{ server_mode="1" } },
+		{ Flag,			"client",						0,																translate("Configure client mode"),	{ server_mode="0" }, { server_mode="" } },
+		{ Flag,			"pull",							0,																translate("Accept options pushed from server"),	{ client="1" } },
+		{ Value,		"auth_user_pass",				"/etc/openvpn/userpass.txt",									translate("Authenticate using username/password"),	{ client="1" } },
+		{ ListValue,	"auth_retry",					{ "none", "nointeract", "interact" },							translate("Handling of authentication failures"),	{ client="1" } },
+		{ Value,		"explicit_exit_notify",			1,																translate("Send notification to peer on disconnect"),	{ client="1" } },
+		{ DynamicList,	"remote",						"1.2.3.4",														translate("Remote host name or ip address"),	{ client="1" } },
+		{ Flag,			"remote_random",				1,																translate("Randomly choose remote server"),	{ client="1" } },
+		{ ListValue,	"proto",						{ "udp", "tcp-client", "tcp-server" },							translate("Use protocol"),	{ client="1" } },
+		{ Value,		"connect_retry",				5,																translate("Connection retry interval"),	{ proto="tcp-client" }, { client="1" } },
+		{ Value,		"http_proxy", 					"192.168.1.100 8080",											translate("Connect to remote host through an HTTP proxy"),	{ client="1" } },
+		{ Flag,			"http_proxy_retry",				0,																translate("Retry indefinitely on HTTP proxy errors"),	{ client="1" } },
+		{ Value,		"http_proxy_timeout",			5,																translate("Proxy timeout in seconds"),	{ client="1" } },
+		{ DynamicList,	"http_proxy_option",			{ "VERSION 1.0", "AGENT OpenVPN/2.0.9" },						translate("Set extended HTTP proxy options"),	{ client="1" } },
+		{ Value,		"socks_proxy", 					"192.168.1.200 1080",											translate("Connect through Socks5 proxy"),	{ client="1" } },
+		{ Value,		"socks_proxy_retry",			5,																translate("Retry indefinitely on Socks proxy errors"),	{ client="1" } },	-- client && socks_proxy
+		{ Value,		"resolv_retry",					"infinite",														translate("If hostname resolve fails, retry"),	{ client="1" } },
+		{ ListValue,	"redirect_gateway",				{ "", "local", "def1", "local def1" },							translate("Automatically redirect default route"),	{ client="1" } },
+	} },
+
+	{ "Cryptography", {
+		{ Value,		"secret",						"/etc/openvpn/secret.key 1",									translate("Enable Static Key encryption mode (non-TLS)") },
+		{ Value,		"auth",							"SHA1",															translate("HMAC authentication for packets") }, -- parse
+		{ Value,		"cipher",						"BF-CBC",														translate("Encryption cipher for packets") }, -- parse
+		{ Value,		"keysize",						1024,															translate("Size of cipher key") }, -- parse
+		{ Value,		"engine",						"dynamic",														translate("Enable OpenSSL hardware crypto engines") }, -- parse
+		{ Flag,			"no_replay",					0,																translate("Disable replay protection") },
+		{ Value,		"replay_window",				"64 15",														translate("Replay protection sliding window size") },
+		{ Flag,			"mute_replay_warnings",			0,																translate("Silence the output of replay warnings") },
+		{ Value,		"replay_persist",				"/var/run/openvpn-replay-state",								translate("Persist replay-protection state") },
+		{ Flag,			"no_iv",						0,																translate("Disable cipher initialisation vector") },
+		{ Flag,			"tls_server",					0,																translate("Enable TLS and assume server role"), { tls_client="" }, { tls_client="0" } },
+		{ Flag,			"tls_client",					0,																translate("Enable TLS and assume client role"), { tls_server="" }, { tls_server="0" } },
+		{ FileUpload,	"ca",							"/etc/easy-rsa/keys/ca.crt",									translate("Certificate authority") },
+		{ FileUpload,	"dh",							"/etc/easy-rsa/keys/dh1024.pem",								translate("Diffie Hellman parameters") },
+		{ FileUpload,	"cert",							"/etc/easy-rsa/keys/some-client.crt",							translate("Local certificate") },
+		{ FileUpload,	"key",							"/etc/easy-rsa/keys/some-client.key",							translate("Local private key") },
+		{ FileUpload,	"pkcs12",						"/etc/easy-rsa/keys/some-client.pk12",							translate("PKCS#12 file containing keys") },
+		{ ListValue,	"key_method",					{ 1, 2 },														translate("Enable TLS and assume client role") },
+		{ Value,		"tls_cipher",					"DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:RC4-SHA:RC4-MD5:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-RC4-MD5",
+																														translate("TLS cipher") },
+		{ Value,		"tls_timeout",					2,																translate("Retransmit timeout on TLS control channel") },
+		{ Value,		"reneg_bytes",					1024,															translate("Renegotiate data chan. key after bytes") },
+		{ Value,		"reneg_pkts",					100,															translate("Renegotiate data chan. key after packets") },
+		{ Value,		"reneg_sec",					3600,															translate("Renegotiate data chan. key after seconds") },
+		{ Value,		"hand_window",					60,																translate("Timeframe for key exchange") },
+		{ Value,		"tran_window",					3600,															translate("Key transition window") },
+		{ Flag,			"single_session",				0,																translate("Allow only one session") },
+		{ Flag,			"tls_exit",						0,																translate("Exit on TLS negotiation failure") },
+		{ Value,		"tls_auth",						"/etc/openvpn/tlsauth.key 1",									translate("Additional authentication over TLS") },
+		--{ Value,		"askpass",						"[file]",														translate("Get PEM password from controlling tty before we daemonize") },
+		{ Flag,			"auth_nocache",					0,																translate("Don't cache --askpass or --auth-user-pass passwords") },
+		{ Value,		"tls_remote",					"remote_x509_name",												translate("Only accept connections from given X509 name") },
+		{ ListValue,	"ns_cert_type",					{ "client", "server" },											translate("Require explicit designation on certificate") },
+		{ ListValue,	"remote_cert_tls",				{ "client", "server" },											translate("Require explicit key usage on certificate") },
+		{ Value,		"crl_verify",					"/etc/easy-rsa/keys/crl.pem",									translate("Check peer certificate against a CRL") },
+ 	} }
+}
+
+
+local cts = { }
+local params = { }
+
+local m = Map("openvpn")
+local p = m:section( SimpleSection )
+
+p.template = "openvpn/pageswitch"
+p.mode     = "advanced"
+p.instance = arg[1]
+p.category = arg[2] or "Service"
+
+for _, c in ipairs(knownParams) do
+	cts[#cts+1] = c[1]
+	if c[1] == p.category then params = c[2] end
+end
+
+p.categories = cts
+
+
+local s = m:section(
+	NamedSection, arg[1], "openvpn",
+	translate("%s" % arg[2])
+)
+
+s.title     = translate("%s" % arg[2])
+s.addremove = false
+s.anonymous = true
+
+
+for _, option in ipairs(params) do
+	local o = s:option(
+		option[1], option[2],
+		option[2], option[4]
+	)
+
+	if option[1] == DummyValue then
+		o.value = option[3]
+	else
+		if option[1] == DynamicList then
+			o.cast = nil
+			function o.cfgvalue(...)
+				local val = AbstractValue.cfgvalue(...)
+				return ( val and type(val) ~= "table" ) and { val } or val
+			end
+		end
+
+		o.optional = true
+
+		if type(option[3]) == "table" then
+			if o.optional then o:value("", "-- remove --") end
+			for _, v in ipairs(option[3]) do
+				v = tostring(v)
+				o:value(v)
+			end
+			o.default = tostring(option[3][1])
+		else
+			o.default = tostring(option[3])
+		end
+	end
+
+	for i=5,#option do
+		if type(option[i]) == "table" then
+			o:depends(option[i])
+		end
+	end
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua b/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
new file mode 100644
index 00000000..92f7cb56
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -0,0 +1,102 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.ip")
+require("luci.model.uci")
+
+
+local basicParams = {
+	--								
+	-- Widget, Name, Default(s), Description
+	--
+					
+	{ ListValue, "verb", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }, translate("Set output verbosity") },
+	{ Value, "nice",0, translate("Change process priority") },
+	{ Value,"port",1194, translate("TCP/UDP port # for both local and remote") },
+	{ ListValue,"dev_type",{ "tun", "tap" }, translate("Type of used device") },
+	{ Flag,"tun_ipv6",0, translate("Make tun device IPv6 capable") },
+
+	{ Value,"ifconfig","10.200.200.3 10.200.200.1", translate("Set tun/tap adapter parameters") },
+	{ Value,"server","10.200.200.0 255.255.255.0", translate("Configure server mode") },
+	{ Value,"server_bridge","192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254", translate("Configure server bridge") },
+	{ Flag,"nobind",0, translate("Do not bind to local address and port") },
+
+	{ ListValue,"comp_lzo",{"yes","no","adaptive"}, translate("Use fast LZO compression") },
+	{ Value,"keepalive","10 60", translate("Helper directive to simplify the expression of --ping and --ping-restart in server mode configurations") },
+
+	{ ListValue,"proto",{ "udp", "tcp" }, translate("Use protocol") },
+
+	{ Flag,"client",0, translate("Configure client mode") },
+	{ Flag,"client_to_client",0, translate("Allow client-to-client traffic") },
+	{ DynamicList,"remote","vpnserver.example.org", translate("Remote host name or ip address") },
+
+	{ FileUpload,"secret","/etc/openvpn/secret.key 1", translate("Enable Static Key encryption mode (non-TLS)") },
+	{ FileUpload,"pkcs12","/etc/easy-rsa/keys/some-client.pk12", translate("PKCS#12 file containing keys") },
+	{ FileUpload,"ca","/etc/easy-rsa/keys/ca.crt", translate("Certificate authority") },
+	{ FileUpload,"dh","/etc/easy-rsa/keys/dh1024.pem", translate("Diffie Hellman parameters") },
+	{ FileUpload,"cert","/etc/easy-rsa/keys/some-client.crt", translate("Local certificate") },
+	{ FileUpload,"key","/etc/easy-rsa/keys/some-client.key", translate("Local private key") },
+}
+
+
+local m = Map("openvpn")
+local p = m:section( SimpleSection )
+
+p.template = "openvpn/pageswitch"
+p.mode     = "basic"
+p.instance = arg[1]
+
+
+local s = m:section( NamedSection, arg[1], "openvpn" )
+
+for _, option in ipairs(basicParams) do
+	local o = s:option(
+		option[1], option[2],
+		option[2], option[4]
+	)
+	
+	o.optional = true
+
+	if option[1] == DummyValue then
+		o.value = option[3]
+	else
+		if option[1] == DynamicList then
+			o.cast = nil
+			function o.cfgvalue(...)
+				local val = AbstractValue.cfgvalue(...)
+				return ( val and type(val) ~= "table" ) and { val } or val
+			end
+		end
+
+		if type(option[3]) == "table" then
+			if o.optional then o:value("", "-- remove --") end
+			for _, v in ipairs(option[3]) do
+				v = tostring(v)
+				o:value(v)
+			end
+			o.default = tostring(option[3][1])
+		else
+			o.default = tostring(option[3])
+		end
+	end
+
+	for i=5,#option do
+		if type(option[i]) == "table" then
+			o:depends(option[i])
+		end
+	end
+end
+
+return m
+
diff --git a/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua b/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
new file mode 100644
index 00000000..2f865e00
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
@@ -0,0 +1,130 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs  = require "nixio.fs"
+local sys = require "luci.sys"
+local uci = require "luci.model.uci".cursor()
+local testfullps = luci.sys.exec("ps --help 2>&1 | grep BusyBox") --check which ps do we have
+local psstring = (string.len(testfullps)>0) and  "ps w" or  "ps axfw" --set command we use to get pid
+
+local m = Map("openvpn", translate("OpenVPN"))
+local s = m:section( TypedSection, "openvpn", translate("OpenVPN instances"), translate("Below is a list of configured OpenVPN instances and their current state") )
+s.template = "cbi/tblsection"
+s.template_addremove = "openvpn/cbi-select-input-add"
+s.addremove = true
+s.add_select_options = { }
+s.extedit = luci.dispatcher.build_url(
+	"admin", "services", "openvpn", "basic", "%s"
+)
+
+uci:load("openvpn_recipes")
+uci:foreach( "openvpn_recipes", "openvpn_recipe",
+	function(section)
+		s.add_select_options[section['.name']] =
+			section['_description'] or section['.name']
+	end
+)
+
+function s.parse(self, section)
+	local recipe = luci.http.formvalue(
+		luci.cbi.CREATE_PREFIX .. self.config .. "." ..
+		self.sectiontype .. ".select"
+	)
+
+	if recipe and not s.add_select_options[recipe] then
+		self.invalid_cts = true
+	else
+		TypedSection.parse( self, section )
+	end
+end
+
+function s.create(self, name)
+	local recipe = luci.http.formvalue(
+		luci.cbi.CREATE_PREFIX .. self.config .. "." ..
+		self.sectiontype .. ".select"
+	)
+	name = luci.http.formvalue(
+		luci.cbi.CREATE_PREFIX .. self.config .. "." ..
+		self.sectiontype .. ".text"
+	)
+	if string.len(name)>3 and not name:match("[^a-zA-Z0-9_]") then
+		uci:section(
+			"openvpn", "openvpn", name,
+			uci:get_all( "openvpn_recipes", recipe )
+		)
+
+		uci:delete("openvpn", name, "_role")
+		uci:delete("openvpn", name, "_description")
+		uci:save("openvpn")
+
+		luci.http.redirect( self.extedit:format(name) )
+	else
+		self.invalid_cts = true
+	end
+end
+
+
+s:option( Flag, "enabled", translate("Enabled") )
+
+local active = s:option( DummyValue, "_active", translate("Started") )
+function active.cfgvalue(self, section)
+	local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
+	if pid and #pid > 0 and tonumber(pid) ~= nil then
+		return (sys.process.signal(pid, 0))
+			and translatef("yes (%i)", pid)
+			or  translate("no")
+	end
+	return translate("no")
+end
+
+local updown = s:option( Button, "_updown", translate("Start/Stop") )
+updown._state = false
+updown.redirect = luci.dispatcher.build_url(
+	"admin", "services", "openvpn"
+)
+function updown.cbid(self, section)
+	local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
+	self._state = pid and #pid > 0 and sys.process.signal(pid, 0)
+	self.option = self._state and "stop" or "start"
+	return AbstractValue.cbid(self, section)
+end
+function updown.cfgvalue(self, section)
+	self.title = self._state and "stop" or "start"
+	self.inputstyle = self._state and "reset" or "reload"
+end
+function updown.write(self, section, value)
+	if self.option == "stop" then
+		local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
+		sys.process.signal(pid,15)
+	else
+		luci.sys.call("/etc/init.d/openvpn start %s" % section)
+	end
+	luci.http.redirect( self.redirect )
+end
+
+
+local port = s:option( DummyValue, "port", translate("Port") )
+function port.cfgvalue(self, section)
+	local val = AbstractValue.cfgvalue(self, section)
+	return val or "1194"
+end
+
+local proto = s:option( DummyValue, "proto", translate("Protocol") )
+function proto.cfgvalue(self, section)
+	local val = AbstractValue.cfgvalue(self, section)
+	return val or "udp"
+end
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
new file mode 100644
index 00000000..0166de77
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
@@ -0,0 +1,11 @@
+<div class="cbi-section-create">
+	<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
+	<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.text" />
+	<select class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.select">
+	<%- for k, v in luci.util.kspairs(self.add_select_options) do %>
+		<option value="<%=k%>"><%=luci.util.pcdata(v)%></option>
+	<% end -%>
+	</select>
+	<input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" title="<%:Add%>" />
+	<% if self.invalid_cts then %><br /><%:Invalid%></div><% end %>
+</div>
diff --git a/trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm b/trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
new file mode 100644
index 00000000..4f4e869e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -0,0 +1,45 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+These strings need to be here to be included in the translation template
+translate("Service")
+translate("Networking")
+translate("VPN")
+translate("Cryptography")
+
+-%>
+
+<fieldset class="cbi-section">
+	<legend>
+		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn")%>"><%:Overview%></a> &raquo;
+		<%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
+	</legend>
+
+	<% if self.mode == "basic" then %>
+		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, "Service")%>"><%:Switch to advanced configuration »%></a>
+	<% else %>
+		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "basic", self.instance)%>"><%:« Switch to basic configuration%></a>
+		<hr style="margin:0.5em 0" />
+		<%:Configuration category%>:
+		<% for i, c in ipairs(self.categories) do %>
+			<% if c == self.category then %>
+				<strong><%=translate(c)%></strong>
+			<% else %>
+				<a href="<%=luci.dispatcher.build_url(
+					"admin", "services", "openvpn", "advanced", self.instance, c
+				)%>"><%=translate(c)%></a>
+			<% end %>
+			<% if next(self.categories, i) then %>|<% end %>
+		<% end %>
+	<% end %>
+</fieldset>
diff --git a/trunk/package/luci/applications/luci-openvpn/root/etc/config/openvpn_recipes b/trunk/package/luci/applications/luci-openvpn/root/etc/config/openvpn_recipes
new file mode 100644
index 00000000..1b394dff
--- /dev/null
+++ b/trunk/package/luci/applications/luci-openvpn/root/etc/config/openvpn_recipes
@@ -0,0 +1,102 @@
+#
+# Routed point-to-point server
+#
+config openvpn_recipe server_tun_ptp
+	option _description		"Simple server configuration for a routed point-to-point VPN"
+	option _role			"server"
+	option dev			"tun"
+	option ifconfig			"10.0.0.1 10.0.0.2"
+	option secret			"shared-secret.key"
+	option keepalive		"10 60"
+	option comp_lzo			"yes"
+	option verb			"3"
+        option mssfix			"1420"
+
+#
+# Routed point-to-point client
+#
+config openvpn_recipe client_tun_ptp
+	option _description		"Simple client configuration for a routed point-to-point VPN"
+	option _role			"client"
+	option dev			"tun"
+	list   remote			"vpnserver.example.org"
+	option ifconfig			"10.0.0.2 10.0.0.1"
+	option secret			"shared-secret.key"
+	option nobind			"1"
+	option comp_lzo			"yes"
+	option verb			"3"
+
+#
+# Routed multi-client server
+#
+config openvpn_recipe server_tun
+	option _description		"Server configuration for a routed multi-client VPN"
+	option _role			"server"
+	option dev			"tun"
+	option server			"10.0.100.0 255.255.255.0"
+	option ca			"ca.crt"
+	option cert			"server.crt"
+	option key 			"server.key"
+	option dh 			"dh1024.pem"
+	option keepalive		"10 60"
+	option comp_lzo			"yes"
+	option verb			"3"
+        option mssfix			"1420"
+
+#
+# Routed client
+#
+config openvpn_recipe client_tun
+	option _description		"Client configuration for a routed multi-client VPN"
+	option _role			"client"
+	option client			"1"
+	option dev			"tun"
+	list   remote			"vpnserver.example.org"
+	option pkcs12			"my_client.p12"
+	option remote_cert_tls		"server"
+	option comp_lzo			"yes"
+	option nobind			"1"
+	option persist_key		"1"
+	option persist_tun		"1"
+	option verb			"3"
+	option reneg_sec		"0"
+	option float			"1"
+
+#
+# Multi-client ethernet bridge server
+#
+config openvpn_recipe server_tap_bridge
+	option _description		"Server configuration for an ethernet bridge VPN"
+	option _role			"server"
+	option dev			"tap"
+	option server_bridge		"192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254"
+	option ca			"ca.crt"
+	option cert			"server.crt"
+	option key 			"server.key"
+	option dh 			"dh1024.pem"
+	option keepalive		"10 60"
+	option comp_lzo			"yes"
+	option verb			"3"
+        option mssfix			"1420"
+
+#
+# Ethernet bridge client
+#
+config openvpn_recipe client_tap_bridge
+	option _description		"Client configuration for an ethernet bridge VPN"
+	option _role			"client"
+	option client			"1"
+	option dev 			"tap"
+	list   remote			"vpnserver.example.org"
+	option ca 			"ca.crt"
+	option cert			"my_client.crt"
+	option key 			"my_client.key"
+	option dh 			"dh1024.pem"
+	option remote_cert_tls		"server"
+	option comp_lzo			"yes"
+	option nobind			"1"
+	option persist_key		"1"
+	option verb			"3"
+	option reneg_sec		"0"
+	option float			"1"
+
diff --git a/trunk/package/luci/applications/luci-p2pblock/Makefile b/trunk/package/luci/applications/luci-p2pblock/Makefile
new file mode 100644
index 00000000..07ce232f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p2pblock/Makefile
@@ -0,0 +1,4 @@
+PO = p2pblock
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-p2pblock/ipkg/postinst b/trunk/package/luci/applications/luci-p2pblock/ipkg/postinst
new file mode 100755
index 00000000..448025b7
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p2pblock/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-p2pblock ) && rm -f /etc/uci-defaults/luci-p2pblock
+	/etc/init.d/freifunk-p2pblock enabled || /etc/init.d/freifunk-p2pblock enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua b/trunk/package/luci/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua
new file mode 100644
index 00000000..887f1875
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua
@@ -0,0 +1,20 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.ff_p2pblock", package.seeall)
+
+function index()
+	entry({"admin", "network", "firewall", "p2pblock"}, cbi("luci_fw/p2pblock"),
+		_("P2P-Block"), 40)
+end
diff --git a/trunk/package/luci/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua b/trunk/package/luci/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
new file mode 100644
index 00000000..35f76cd2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua
@@ -0,0 +1,77 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local sys = require "luci.sys"
+
+m = Map("freifunk_p2pblock", translate("P2P-Block"),
+	translate("P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."))
+
+s = m:section(NamedSection, "p2pblock", "settings", "Settings")
+s.anonymous = true
+s.addremove = false
+
+en = s:option(Flag, "_enabled", translate("Enable P2P-Block"))
+en.rmempty = false
+
+function en.cfgvalue()
+	return ( sys.init.enabled("freifunk-p2pblock") and "1" or "0" )
+end
+
+function en.write(self, section, val)
+	if val == "1" then
+		sys.init.enable("freifunk-p2pblock")
+	else
+		sys.init.disable("freifunk-p2pblock")
+	end
+end
+
+s:option(Value, "portrange", translate("Portrange"))
+
+s:option(Value, "blocktime", translate("Block Time"),
+	translate("seconds"))
+
+s:option(DynamicList, "whitelist", translate("Whitelisted IPs"))
+
+l7 = s:option(MultiValue, "layer7", translate("Layer7-Protocols"))
+l7.widget = "checkbox"
+l7:value("aim", "AIM Chat")
+l7:value("bittorrent", "Bittorrent")
+l7:value("edonkey", "eDonkey, eMule, Kademlia")
+l7:value("fasttrack", "Fasttrack Protocol")
+l7:value("ftp", "File Transfer Protocol")
+l7:value("gnutella", "Gnutella")
+l7:value("http", "Hypertext Transfer Protocol")
+l7:value("ident", "Ident Protocol")
+l7:value("irc", "Internet Relay Chat")
+l7:value("jabber", "Jabber/XMPP")
+l7:value("msnmessenger", "MSN Messenger")
+l7:value("ntp", "Network Time Protocol")
+l7:value("pop3", "POP3 Protocol")
+l7:value("smtp", "SMTP Protocol")
+l7:value("ssl", "SSL Protocol")
+l7:value("vnc", "VNC Protocol")
+
+ipp2p = s:option(MultiValue, "ipp2p", translate("IP-P2P"))
+ipp2p.widget = "checkbox"
+ipp2p:value("edk", "eDonkey, eMule, Kademlia")
+ipp2p:value("kazaa", "KaZaA, FastTrack")
+ipp2p:value("gnu", "Gnutella")
+ipp2p:value("dc", "Direct Connect")
+ipp2p:value("bit", "BitTorrent, extended BT")
+ipp2p:value("apple", "AppleJuice")
+ipp2p:value("winmx", "WinMX")
+ipp2p:value("soul", "SoulSeek")
+ipp2p:value("ares", "AresLite")
+
+return m
diff --git a/trunk/package/luci/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock b/trunk/package/luci/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock
new file mode 100755
index 00000000..030ebbed
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p2pblock/root/etc/uci-defaults/luci-p2pblock
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete citrack.@freifunk_p2pblock[-1]
+	add ucitrack freifunk_p2pblock
+	set ucitrack.@freifunk_p2pblock[-1].init=freifunk-p2pblock
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-p910nd/Makefile b/trunk/package/luci/applications/luci-p910nd/Makefile
new file mode 100644
index 00000000..30073fbd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p910nd/Makefile
@@ -0,0 +1,4 @@
+PO = p910nd
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-p910nd/ipkg/postinst b/trunk/package/luci/applications/luci-p910nd/ipkg/postinst
new file mode 100644
index 00000000..36a91e21
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p910nd/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-p910nd ) && rm -f /etc/uci-defaults/luci-p910nd
+	/etc/init.d/p910nd enabled || /etc/init.d/p910nd enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua b/trunk/package/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua
new file mode 100644
index 00000000..4efaef8a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua
@@ -0,0 +1,27 @@
+--[[
+
+LuCI UVC Streamer
+(c) 2008 Yanira <forum-2008@email.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.controller.p910nd", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/p910nd") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "services", "p910nd"}, cbi("p910nd"), _("p910nd - Printer server"), 60)
+	page.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua b/trunk/package/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
new file mode 100644
index 00000000..26f81d38
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
@@ -0,0 +1,59 @@
+--[[
+
+LuCI p910nd
+(c) 2008 Yanira <forum-2008@email.de>
+(c) 2012 Jo-Philipp Wich <jow@librecmc.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local uci = luci.model.uci.cursor_state()
+local net = require "luci.model.network"
+local m, s, p, b
+
+m = Map("p910nd", translate("p910nd - Printer server"),
+        translatef("First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."))
+
+net = net.init(m.uci)
+
+s = m:section(TypedSection, "p910nd", translate("Settings"))
+s.addremove = true
+s.anonymous = true
+
+s:option(Flag, "enabled", translate("enable"))
+
+s:option(Value, "device", translate("Device")).rmempty = true
+
+b = s:option(Value, "bind", translate("Interface"), translate("Specifies the interface to listen on."))
+b.template = "cbi/network_netlist"
+b.nocreate = true
+b.unspecified = true
+
+function b.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	if v then
+		return (net:get_status_by_address(v))
+	end
+end
+
+function b.write(self, section, value)
+	local n = net:get_network(value)
+	if n and n:ipaddr() then
+		Value.write(self, section, n:ipaddr())
+	end
+end
+
+p = s:option(ListValue, "port", translate("Port"), translate("TCP listener port."))
+p.rmempty = true
+for i=0,9 do
+	p:value(i, 9100+i)
+end
+
+s:option(Flag, "bidirectional", translate("Bidirectional mode"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd b/trunk/package/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd
new file mode 100755
index 00000000..80f6d62f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@p910nd[-1]
+	add ucitrack p910nd
+	set ucitrack.@p910nd[-1].init=p910nd
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/COPYING b/trunk/package/luci/applications/luci-pbx-voicemail/COPYING
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/Makefile b/trunk/package/luci/applications/luci-pbx-voicemail/Makefile
new file mode 100644
index 00000000..19c69a14
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/Makefile
@@ -0,0 +1,4 @@
+PO = pbx-voicemail
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/luasrc/controller/pbx-voicemail.lua b/trunk/package/luci/applications/luci-pbx-voicemail/luasrc/controller/pbx-voicemail.lua
new file mode 100644
index 00000000..6f3dfac0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/luasrc/controller/pbx-voicemail.lua
@@ -0,0 +1,24 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx-voicemail.
+
+    luci-pbx-voicemail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx-voicemail is distributed in the hope that 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 luci-pbx-voicemail.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+module("luci.controller.pbx-voicemail", package.seeall)
+
+function index()
+        entry({"admin", "services", "pbx", "pbx-voicemail"}, cbi("pbx-voicemail"), "Voicemail", 5)
+end
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua b/trunk/package/luci/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
new file mode 100644
index 00000000..9ff2ed97
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/luasrc/model/cbi/pbx-voicemail.lua
@@ -0,0 +1,153 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx-voicemail.
+
+    luci-pbx-voicemail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx-voicemail is distributed in the hope that 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 luci-pbx-voicemail.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename = "pbx-voicemail"
+vmlogfile  = "/tmp/last_sent_voicemail.log"
+
+m = Map (modulename, translate("Voicemail Setup"),
+         translate("Here you can configure a global voicemail for this PBX. Since this system is \
+         intended to run on embedded systems like routers, there is no local storage of voicemail - \
+         it must be sent out by email. Therefore you need to configure an outgoing mail (SMTP) server \
+         (for example your ISP's, Google's, or Yahoo's SMTP server), and provide a list of \
+         addresses that receive recorded voicemail."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+        luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+        luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+end
+
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "global_voicemail", "voicemail", translate("Global Voicemail Setup"),
+              translate("When you enable voicemail, you will have the opportunity to specify \
+              email addresses that receive recorded voicemail. You must also set up an SMTP server below."))
+s.anonymous = true
+
+enable = s:option(ListValue, "enabled", translate("Enable Voicemail"))
+enable:value("yes", translate("Yes"))
+enable:value("no",  translate("No"))
+enable.default = "no"
+
+emails = s:option(DynamicList, "global_email_addresses",
+                  translate("Email Addresses that Receive Voicemail"))
+emails:depends("enabled", "yes")
+
+savepath = s:option(Value, "global_save_path", translate("Local Storage Directory"),
+                    translate("You can also retain copies of voicemail messages on the device running \
+                              your PBX. The path specified here will be created if it doesn't exist. \
+                              Beware of limited space on embedded devices like routers, and enable this \
+                              option only if you know what you are doing."))
+savepath.optional = true
+
+if     nixio.fs.access("/etc/pbx-voicemail/recordings/greeting.gsm")   then
+   m1 = s:option(DummyValue, "_m1")
+   m1:depends("enabled", "yes")
+   m1.default = "NOTE: Found a voicemail greeting. To check or change your voicemail greeting, dial *789 \
+                 and the system will play back your current greeting. After that, a long beep will sound and \
+                 you can press * in order to record a new message. Hang up to avoid recording a message. \
+                 If you press *, a second long beep will sound, and you can record a new greeting. \
+                 Hang up or press # to stop recording. When # is pressed the system will play back the \
+                 new greeting."
+else
+   m1 = s:option(DummyValue, "_m1")
+   m1:depends("enabled", "yes")
+   m1.default = "WARNING: Could not find voicemail greeting. Callers will hear only a beep before \
+                 recording starts. To record a greeting, dial *789, and press * after the long beep. \
+                 If you press *, a second long beep will sound, and you can record a new greeting. \
+                 Hang up or press # to stop recording. When # is pressed the system will play back the \
+                 new greeting."
+end
+
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "voicemail_smtp", "voicemail", translate("Outgoing mail (SMTP) Server"),
+              translate("In order for this PBX to send emails containing voicemail recordings, you need to \
+              set up an SMTP server here. Your ISP usually provides an SMTP server for that purpose. \
+              You can also set up a third party SMTP server such as the one provided by Google or Yahoo."))
+s.anonymous = true
+
+serv = s:option(Value, "smtp_server", translate("SMTP Server Hostname or IP Address"))
+serv.datatype = "host"
+
+port = s:option(Value, "smtp_port", translate("SMTP Port Number"))
+port.datatype = "port"
+port.default = "25"
+
+tls = s:option(ListValue, "smtp_tls", translate("Secure Connection Using TLS"))
+tls:value("on",  translate("Yes"))
+tls:value("off", translate("No"))
+tls.default = "on"
+
+auth = s:option(ListValue, "smtp_auth", translate("SMTP Server Authentication"))
+auth:value("on",  translate("Yes"))
+auth:value("off", translate("No"))
+auth.default = "off"
+
+user = s:option(Value, "smtp_user", translate("SMTP User Name"))
+user:depends("smtp_auth", "on")
+
+pwd = s:option(Value, "smtp_password", translate("SMTP Password"),
+               translate("Your real SMTP password is not shown for your protection. It will be changed \
+                         only when you change the value in this box."))
+pwd.password = true
+pwd:depends("smtp_auth", "on")
+                            
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+   return "Password Not Displayed"
+end
+   
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+   local orig_pwd = m:get(section, self.option)
+   if value == "Password Not Displayed" then value = "" end
+   if value and #value > 0 and orig_pwd ~= value then
+      Value.write(self, section, value)
+   end
+end
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "voicemail_log", "voicemail", translate("Last Sent Voicemail Log"))
+s.anonymous = true
+
+s:option (DummyValue, "vmlog")
+
+sts = s:option(DummyValue, "_sts") 
+sts.template = "cbi/tvalue"
+sts.rows = 5
+
+function sts.cfgvalue(self, section)
+   log = nixio.fs.readfile(vmlogfile)
+   if log == nil or log == "" then
+      log = "No errors or messages reported."
+   end
+   return log
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/config/pbx-voicemail b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/config/pbx-voicemail
new file mode 100644
index 00000000..94e3e96a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/config/pbx-voicemail
@@ -0,0 +1,6 @@
+config 'voicemail' 'global_voicemail'
+
+config 'voicemail' 'voicemail_smtp'
+
+config 'voicemail' 'voicemail_log'
+
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting
new file mode 100755
index 00000000..21fe6941
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-move-greeting
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -f "/tmp/voicemail/greeting.gsm" ]
+then
+    mv /tmp/voicemail/greeting.gsm /etc/pbx-voicemail/recordings/
+fi
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE
new file mode 100644
index 00000000..6b2026c1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-auth.TEMPLATE
@@ -0,0 +1,2 @@
+user           |USER|
+password       |PASSWORD|
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE
new file mode 100644
index 00000000..a001c646
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account-default.TEMPLATE
@@ -0,0 +1,2 @@
+account default : defaultacct
+
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE
new file mode 100644
index 00000000..fd1f4795
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-account.TEMPLATE
@@ -0,0 +1,5 @@
+account        defaultacct
+host           |HOST|
+port           |PORT|
+from           voicemail@pbx
+
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE
new file mode 100644
index 00000000..a4456b8f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-msmtprc-defaults.TEMPLATE
@@ -0,0 +1,5 @@
+defaults
+auth             |AUTH|
+tls_certcheck    off
+tls              |TLS|
+
diff --git a/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail
new file mode 100755
index 00000000..ba639d01
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx-voicemail/root/etc/pbx-voicemail/pbx-send-voicemail
@@ -0,0 +1,114 @@
+#!/bin/sh
+#
+# Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+#
+#    This file is part of luci-pbx-voicemail.
+#
+#    luci-pbx-voicemail is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    luci-pbx-voicemail is distributed in the hope that 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 luci-pbx-voicemail.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Thanks to http://www.zedwood.com for providing an excellent example of how to
+# properly assemble an email message with a base64 encoded attachment.
+#
+
+LOGFILE=/tmp/voicemail/last_sent_voicemail.log
+
+# Redirect standard error and standard output to a log file.
+rm  -f "$LOGFILE"
+exec 1>"$LOGFILE"
+exec 2>&1
+
+# Appends its second argument to a file named in the first argument.
+append_to_file ()
+{
+    echo "$2">>$1;
+}
+
+# Grab the attachment name, which should be sent as the first argument, and
+# exit with a warning if there is no voicemail to send.
+ATTACHMENT="$1"
+[ ! -f "$ATTACHMENT" ] && echo "WARNING: Found no voicemail recording to send." && exit
+
+# Grab the callerID which should have been sent as an argument.
+CALLERID="$2"
+[ -z "$CALLERID" ]   && CALLERID="An unknown caller"
+
+# Determine addresses we would like to send the voicemail to and exit if none are found.
+TO="`uci -q get pbx-voicemail.global_voicemail.global_email_addresses | tr ' ' ','`"
+[ -z "$TO" ] && echo "WARNING: Found no addresses to send voicemail to." && exit
+
+# See whether we should retain a copy of the voicemail.
+SAVEPATH="`uci -q get pbx-voicemail.global_voicemail.global_save_path`"
+
+DATE="`date +%Y-%m-%d`"
+TIME="`date +%H:%M:%S`"
+FROM="voicemail@pbx"
+REPLY="do-not-reply@pbx"
+SUBJECT="Voicemail from $CALLERID, $DATE, $TIME"
+MSGBODY="$CALLERID has left voicemail for you on $DATE at $TIME."
+MIMETYPE="audio/wav"
+TMP1="/tmp/voicemail/tmpemail1.$$";
+TMP2="/tmp/voicemail/tmpemail2.$$";
+BOUNDARY="`date +%s | md5sum | awk '{print $1}'`"
+FILENAME="voicemail-$DATE-$TIME.WAV"
+
+# Clean up just in case.
+rm -f $TMP1 $TMP2
+
+append_to_file $TMP1 "From: $FROM"
+append_to_file $TMP1 "To: $TO"
+append_to_file $TMP1 "Reply-To: $REPLY"
+append_to_file $TMP1 "Subject: $SUBJECT"
+append_to_file $TMP1 "Content-Type: multipart/mixed; boundary=\""$BOUNDARY"\""
+append_to_file $TMP1 ""
+append_to_file $TMP1 "This is a MIME formatted message.  If you see this text it means that your"
+append_to_file $TMP1 "email software does not support MIME formatted messages."
+append_to_file $TMP1 ""
+append_to_file $TMP1 "--$BOUNDARY"
+append_to_file $TMP1 "Content-Type: text/plain; charset=ISO-8859-1; format=flowed"
+append_to_file $TMP1 "Content-Transfer-Encoding: 7bit"
+append_to_file $TMP1 "Content-Disposition: inline"
+append_to_file $TMP1 ""
+append_to_file $TMP1 "$MSGBODY"
+append_to_file $TMP1 ""
+append_to_file $TMP1 ""
+append_to_file $TMP1 "--$BOUNDARY"
+append_to_file $TMP1 "Content-Type: $MIMETYPE; name=\"$FILENAME\""
+append_to_file $TMP1 "Content-Transfer-Encoding: base64"
+append_to_file $TMP1 "Content-Disposition: attachment; filename=\"$FILENAME\";"
+append_to_file $TMP1 ""
+
+append_to_file $TMP2 ""
+append_to_file $TMP2 ""
+append_to_file $TMP2 "--$BOUNDARY--"
+append_to_file $TMP2 ""
+append_to_file $TMP2 ""
+
+# Cat everything together and pass to msmtprc to send out.
+( cat $TMP1
+  cat "$ATTACHMENT" | base64
+  cat $TMP2 ) | msmtp -t -C /etc/pbx-msmtprc
+
+# Clean up email temp files.
+rm -f $TMP1 $TMP2
+
+# Either delete or move the attachment based on the SAVEPATH variable.
+if [ -z "$SAVEPATH" ]
+then
+    rm -f "$ATTACHMENT"
+else
+    mkdir -p "$SAVEPATH"
+    mv --backup=t "$ATTACHMENT" "$SAVEPATH/$FILENAME"
+fi
+
diff --git a/trunk/package/luci/applications/luci-pbx/COPYING b/trunk/package/luci/applications/luci-pbx/COPYING
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/trunk/package/luci/applications/luci-pbx/CREDITS-SOUNDS b/trunk/package/luci/applications/luci-pbx/CREDITS-SOUNDS
new file mode 100644
index 00000000..1fa64bc6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/CREDITS-SOUNDS
@@ -0,0 +1,7 @@
+This file pertains to the sounds files included in root/etc/pbx-asterisk/sounds
+
+Recorded by:
+Allison Smith (http://www.theivrvoice.com)
+
+Financial Contributions by:
+Digium, Inc. (http://www.digium.com)
diff --git a/trunk/package/luci/applications/luci-pbx/LICENSE-SOUNDS b/trunk/package/luci/applications/luci-pbx/LICENSE-SOUNDS
new file mode 100644
index 00000000..fe9c8221
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/LICENSE-SOUNDS
@@ -0,0 +1,312 @@
+This file pertains to the sounds files included in root/etc/pbx-asterisk/sounds
+
+LICENSE FOR VOICE PROMPT FILES
+------------------------------
+
+The voice prompt files distributed herewith are Copyright (C) 2003-2008
+Allison Smith, and provided under terms of the following License.  For
+more information, or to purchase custom voice prompt files, please
+visit:
+
+http://www.digium.com/ivr or http://www.theasteriskvoice.com
+
+LICENSE
+-------
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
+WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
+AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS
+LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU
+THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
+TERMS AND CONDITIONS.
+
+1. Definitions.
+
+a. "Collective Work" means a work, such as a periodical issue,
+anthology or encyclopedia, in which the Work in its entirety in
+unmodified form, along with one or more other contributions,
+constituting separate and independent works in themselves, are
+assembled into a collective whole. A work that constitutes a
+Collective Work will not be considered a Derivative Work (as defined
+below) for the purposes of this License.
+
+b. "Creative Commons Compatible License" means a license that is
+listed at http://creativecommons.org/compatiblelicenses that has been
+approved by Creative Commons as being essentially equivalent to this
+License, including, at a minimum, because that license: (i) contains
+terms that have the same purpose, meaning and effect as the License
+Elements of this License; and, (ii) explicitly permits the relicensing
+of derivatives of works made available under that license under this
+License or either a Creative Commons unported license or a Creative
+Commons jurisdiction license with the same License Elements as this
+License.
+
+c. "Derivative Work" means a work based upon the Work or upon the Work
+and other pre-existing works, such as a translation, musical
+arrangement, dramatization, fictionalization, motion picture version,
+sound recording, art reproduction, abridgment, condensation, or any
+other form in which the Work may be recast, transformed, or adapted,
+except that a work that constitutes a Collective Work will not be
+considered a Derivative Work for the purpose of this License. For the
+avoidance of doubt, where the Work is a musical composition or sound
+recording, the synchronization of the Work in timed-relation with a
+moving image ("synching") will be considered a Derivative Work for the
+purpose of this License.
+
+d. "License Elements" means the following high-level license
+attributes as selected by Licensor and indicated in the title of this
+License: Attribution, ShareAlike.
+
+e. "Licensor" means the individual, individuals, entity or entities
+that offers the Work under the terms of this License.
+
+f. "Original Author" means the individual, individuals, entity or
+entities who created the Work.
+
+g. "Work" means the copyrighted voice prompt files recorded by Allison
+Smith for Asterisk and distributed with this License.
+
+h. "You" means an individual or entity exercising rights under this
+License who has not previously violated the terms of this License with
+respect to the Work, or who has received express permission from the
+Licensor to exercise rights under this License despite a previous
+violation.
+
+2. Fair Use Rights.
+
+Nothing in this license is intended to reduce, limit, or restrict any
+rights arising from fair use, first sale or other limitations on the
+exclusive rights of the copyright owner under copyright law or other
+applicable laws.
+
+3. License Grant.
+
+Subject to the terms and conditions of this License, Licensor hereby
+grants You a worldwide, royalty-free, non-exclusive, perpetual (for
+the duration of the applicable copyright) license to exercise the
+rights in the Work as stated below:
+
+a. to reproduce the Work, to incorporate the Work into one or more
+Collective Works, and to reproduce the Work as incorporated in the
+Collective Works;
+
+b. to create and reproduce Derivative Works provided that any such
+Derivative Work, including any translation in any medium, takes
+reasonable steps to clearly label, demarcate or otherwise identify
+that changes were made to the original Work. For example, a
+translation could be marked "The original work was translated from
+English to Spanish," or a modification could indicate "The original
+work has been modified.";
+
+c. to distribute copies or phonorecords of, display publicly, perform
+publicly, and perform publicly by means of a digital audio
+transmission the Work including as incorporated in Collective Works;
+
+d. to distribute copies or phonorecords of, display publicly, perform
+publicly, and perform publicly by means of a digital audio
+transmission Derivative Works.
+
+e. For the avoidance of doubt, where the Work is a musical
+composition:
+
+ i. Performance Royalties Under Blanket Licenses. Licensor waives the
+ exclusive right to collect, whether individually or, in the event
+ that Licensor is a member of a performance rights society
+ (e.g. ASCAP, BMI, SESAC), via that society, royalties for the public
+ performance or public digital performance e.g. webcast) of the Work.
+
+ ii.Mechanical Rights and Statutory Royalties. Licensor waives the
+ exclusive right to collect, whether individually or via a music
+ rights agency or designated agent (e.g. Harry Fox Agency), royalties
+ for any phonorecord You create from the Work ("cover version") and
+ distribute, subject to the compulsory license created by 17 USC
+ Section 115 of the US Copyright Act (or the equivalent in other
+ jurisdictions).
+
+f. Webcasting Rights and Statutory Royalties. For the avoidance of
+doubt, where the Work is a sound recording, Licensor waives the
+exclusive right to collect, whether individually or via a
+performance-rights society (e.g. SoundExchange), royalties for the
+public digital performance (e.g. webcast) of the Work, subject to the
+compulsory license created by 17 USC Section 114 of the US Copyright
+Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights
+in other media and formats. All rights not expressly granted by
+Licensor are hereby reserved.
+
+4. Restrictions.
+
+The license granted in Section 3 above is expressly made subject to
+and limited by the following restrictions:
+
+a. You may distribute, publicly display, publicly perform, or publicly
+digitally perform the Work only under the terms of this License, and
+You must include a copy of, or the Uniform Resource Identifier for,
+this License with every copy or phonorecord of the Work You
+distribute, publicly display, publicly perform, or publicly digitally
+perform. You may not offer or impose any terms on the Work that
+restrict the terms of this License or the ability of a recipient of
+the Work to exercise of the rights granted to that recipient under the
+terms of the License. You may not sublicense the Work. You must keep
+intact all notices that refer to this License and to the disclaimer of
+warranties. When You distribute, publicly display, publicly perform,
+or publicly digitally perform the Work, You may not impose any
+technological measures on the Work that restrict the ability of a
+recipient of the Work from You to exercise of the rights granted to
+that recipient under the terms of the License. This Section 4(a)
+applies to the Work as incorporated in a Collective Work, but this
+does not require the Collective Work apart from the Work itself to be
+made subject to the terms of this License. If You create a Collective
+Work, upon notice from any Licensor You must, to the extent
+practicable, remove from the Collective Work any credit as required by
+Section 4(c), as requested. If You create a Derivative Work, upon
+notice from any Licensor You must, to the extent practicable, remove
+from the Derivative Work any credit as required by Section 4(c), as
+requested.
+
+b. You may distribute, publicly display, publicly perform, or publicly
+digitally perform a Derivative Work only under: (i) the terms of this
+License; (ii) a later version of this License with the same License
+Elements as this License; (iii) either the Creative Commons (Unported)
+license or a Creative Commons jurisdiction license (either this or a
+later license version) that contains the same License Elements as this
+License (e.g. Attribution-ShareAlike 3.0 (Unported)); (iv) a Creative
+Commons Compatible License. If you license the Derivative Work under
+one of the licenses mentioned in (iv), you must comply with the terms
+of that license. If you license the Derivative Work under the terms of
+any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable
+License"), you must comply with the terms of the Applicable License
+generally and with the following provisions: (I) You must include a
+copy of, or the Uniform Resource Identifier for, the Applicable
+License with every copy or phonorecord of each Derivative Work You
+distribute, publicly display, publicly perform, or publicly digitally
+perform; (II) You may not offer or impose any terms on the Derivative
+Works that restrict the terms of the Applicable License or the ability
+of a recipient of the Work to exercise the rights granted to that
+recipient under the terms of the Applicable License; (III) You must
+keep intact all notices that refer to the Applicable License and to
+the disclaimer of warranties; and, (IV) when You distribute, publicly
+display, publicly perform, or publicly digitally perform the Work, You
+may not impose any technological measures on the Derivative Work that
+restrict the ability of a recipient of the Derivative Work from You to
+exercise the rights granted to that recipient under the terms of the
+Applicable License. This Section 4(b) applies to the Derivative Work
+as incorporated in a Collective Work, but this does not require the
+Collective Work apart from the Derivative Work itself to be made
+subject to the terms of the Applicable License.
+
+c. If You distribute, publicly display, publicly perform, or publicly
+digitally perform the Work (as defined in Section 1 above) or any
+Derivative Works (as defined in Section 1 above) or Collective Works
+(as defined in Section 1 above), You must, unless a request has been
+made pursuant to Section 4(a), keep intact all copyright notices for
+the Work and provide, reasonable to the medium or means You are
+utilizing: (i) the name of the Original Author (or pseudonym, if
+applicable) if supplied, and/or (ii) if the Original Author and/or
+Licensor designate another party or parties (e.g. a sponsor institute,
+publishing entity, journal) for attribution ("Attribution Parties") in
+Licensor's copyright notice, terms of service or by other reasonable
+means, the name of such party or parties; the title of the Work if
+supplied; to the extent reasonably practicable, the Uniform Resource
+Identifier, if any, that Licensor specifies to be associated with the
+Work, unless such URI does not refer to the copyright notice or
+licensing information for the Work; and, consistent with Section 3(b)
+in the case of a Derivative Work, a credit identifying the use of the
+Work in the Derivative Work (e.g., "French translation of the Work by
+Original Author," or "Screenplay based on original Work by Original
+Author"). The credit required by this Section 4(c) may be implemented
+in any reasonable manner; provided, however, that in the case of a
+Derivative Work or Collective Work, at a minimum such credit will
+appear, if a credit for all contributing authors of the Derivative
+Work or Collective Work appears, then as part of these credits and in
+a manner at least as prominent as the credits for the other
+contributing authors. For the avoidance of doubt, You may only use the
+credit required by this Section for the purpose of attribution in the
+manner set out above and, by exercising Your rights under this
+License, You may not implicitly or explicitly assert or imply any
+connection with, sponsorship or endorsement by the Original Author,
+Licensor and/or Attribution Parties, as appropriate, of You or Your
+use of the Work, without the separate, express prior written
+permission of the Original Author, Licensor and/or Attribution
+Parties.
+
+5. Representations, Warranties and Disclaimer.
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,
+LICENSOR OFFERS THE WORK AS-IS AND ONLY TO THE EXTENT OF ANY RIGHTS
+HELD IN THE LICENSED WORK BY THE LICENSOR. THE LICENSOR MAKES NO
+REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK,
+EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES OF TITLE, MARKETABILITY, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
+THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
+TO YOU.
+
+6. Limitation on Liability.
+
+EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL
+LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL,
+INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT
+OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination.
+
+a. This License and the rights granted hereunder will terminate
+automatically upon any breach by You of the terms of this
+License. Individuals or entities who have received Derivative Works or
+Collective Works from You under this License, however, will not have
+their licenses terminated provided such individuals or entities remain
+in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8
+will survive any termination of this License.
+
+b. Subject to the above terms and conditions, the license granted here
+is perpetual (for the duration of the applicable copyright in the
+Work). Notwithstanding the above, Licensor reserves the right to
+release the Work under different license terms or to stop distributing
+the Work at any time; provided, however that any such election will
+not serve to withdraw this License (or any other license that has
+been, or is required to be, granted under the terms of this License),
+and this License will continue in full force and effect unless
+terminated as stated above.
+
+8. Miscellaneous.
+
+a. Each time You distribute or publicly digitally perform the Work (as
+defined in Section 1 above) or a Collective Work (as defined in
+Section 1 above), the Licensor offers to the recipient a license to
+the Work on the same terms and conditions as the license granted to
+You under this License.
+
+b. Each time You distribute or publicly digitally perform a Derivative
+Work, Licensor offers to the recipient a license to the original Work
+on the same terms and conditions as the license granted to You under
+this License.
+
+c. If any provision of this License is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this License, and without further action
+by the parties to this agreement, such provision shall be reformed to
+the minimum extent necessary to make such provision valid and
+enforceable.
+
+d. No term or provision of this License shall be deemed waived and no
+breach consented to unless such waiver or consent shall be in writing
+and signed by the party to be charged with such waiver or consent.
+
+e. This License constitutes the entire agreement between the parties
+with respect to the Work licensed here. There are no understandings,
+agreements or representations with respect to the Work not specified
+here. Licensor shall not be bound by any additional provisions that
+may appear in any communication from You. This License may not be
+modified without the mutual written agreement of the Licensor and You.
diff --git a/trunk/package/luci/applications/luci-pbx/Makefile b/trunk/package/luci/applications/luci-pbx/Makefile
new file mode 100644
index 00000000..9a720f0d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/Makefile
@@ -0,0 +1,4 @@
+PO = pbx
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-pbx/luasrc/controller/pbx.lua b/trunk/package/luci/applications/luci-pbx/luasrc/controller/pbx.lua
new file mode 100644
index 00000000..b77814b1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/luasrc/controller/pbx.lua
@@ -0,0 +1,29 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+module("luci.controller.pbx", package.seeall)
+
+function index()
+        entry({"admin", "services", "pbx"},                 cbi("pbx"),          "PBX",              80)
+        entry({"admin", "services", "pbx", "pbx-google"},   cbi("pbx-google"),   "Google Accounts",   1)
+        entry({"admin", "services", "pbx", "pbx-voip"},     cbi("pbx-voip"),     "SIP Accounts",      2)
+        entry({"admin", "services", "pbx", "pbx-users"},    cbi("pbx-users"),    "User Accounts",     3)
+        entry({"admin", "services", "pbx", "pbx-calls"},    cbi("pbx-calls"),    "Call Routing",      4)
+        entry({"admin", "services", "pbx", "pbx-advanced"}, cbi("pbx-advanced"), "Advanced Settings", 6)
+end
diff --git a/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
new file mode 100644
index 00000000..5d4f135c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
@@ -0,0 +1,293 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+appname         = "PBX"
+modulename      = "pbx-advanced"
+defaultbindport = 5060
+defaultrtpstart = 19850
+defaultrtpend   = 19900
+
+-- Returns all the network related settings, including a constructed RTP range
+function get_network_info()
+        externhost = m.uci:get(modulename, "advanced", "externhost")
+        ipaddr     = m.uci:get("network", "lan", "ipaddr")
+        bindport   = m.uci:get(modulename, "advanced", "bindport")
+        rtpstart   = m.uci:get(modulename, "advanced", "rtpstart")
+        rtpend     = m.uci:get(modulename, "advanced", "rtpend")
+
+        if bindport == nil then bindport = defaultbindport end
+        if rtpstart == nil then rtpstart = defaultrtpstart end
+        if rtpend   == nil then rtpend   = defaultrtpend   end
+
+        if rtpstart == nil or rtpend == nil then
+                rtprange = nil
+        else
+                rtprange = rtpstart .. "-" .. rtpend
+        end
+
+        return bindport, rtprange, ipaddr, externhost
+end
+
+-- If not present, insert empty rules in the given config & section named PBX-SIP and PBX-RTP
+function insert_empty_sip_rtp_rules(config, section)
+
+                -- Add rules named PBX-SIP and PBX-RTP if not existing
+                found_sip_rule = false
+                found_rtp_rule = false
+                m.uci:foreach(config, section,
+                        function(s1)
+                                if     s1._name == 'PBX-SIP' then
+                                        found_sip_rule = true
+                                elseif s1._name == 'PBX-RTP' then
+                                        found_rtp_rule = true
+                                end
+                        end)
+                
+                if found_sip_rule ~= true then
+                        newrule=m.uci:add(config, section)
+                        m.uci:set(config, newrule, '_name', 'PBX-SIP')
+                end
+                if found_rtp_rule ~= true then
+                        newrule=m.uci:add(config, section)
+                        m.uci:set(config, newrule, '_name', 'PBX-RTP')
+                end
+end
+
+-- Delete rules in the given config & section named PBX-SIP and PBX-RTP
+function delete_sip_rtp_rules(config, section)
+
+                -- Remove rules named PBX-SIP and PBX-RTP
+                commit = false
+                m.uci:foreach(config, section,
+                        function(s1)
+                                if s1._name == 'PBX-SIP' or s1._name == 'PBX-RTP' then
+                                        m.uci:delete(config, s1['.name'])
+                                        commit = true
+                                end
+                        end)
+
+        -- If something changed, then we commit the config.
+        if commit == true then m.uci:commit(config) end
+end
+
+-- Deletes QoS rules associated with this PBX.
+function delete_qos_rules()
+        delete_sip_rtp_rules ("qos", "classify")
+end
+
+
+function insert_qos_rules()
+        -- Insert empty PBX-SIP and PBX-RTP rules if not present.
+        insert_empty_sip_rtp_rules ("qos", "classify")
+
+        -- Get the network information
+        bindport, rtprange, ipaddr, externhost = get_network_info()
+
+        -- Iterate through the QoS rules, and if there is no other rule with the same port
+        -- range at the priority service level, insert this rule.
+        commit = false
+        m.uci:foreach("qos", "classify",
+                function(s1)
+                        if     s1._name == 'PBX-SIP' then
+                                if s1.ports ~= bindport or s1.target ~= "Priority" or s1.proto ~= "udp" then
+                                        m.uci:set("qos", s1['.name'], "ports",  bindport)
+                                        m.uci:set("qos", s1['.name'], "proto",  "udp")
+                                        m.uci:set("qos", s1['.name'], "target", "Priority")
+                                        commit = true
+                                end
+                        elseif s1._name == 'PBX-RTP' then
+                                if s1.ports ~= rtprange or s1.target ~= "Priority" or s1.proto ~= "udp" then
+                                        m.uci:set("qos", s1['.name'], "ports",  rtprange)
+                                        m.uci:set("qos", s1['.name'], "proto",  "udp")
+                                        m.uci:set("qos", s1['.name'], "target", "Priority")
+                                        commit = true
+                                end
+                        end
+                end)
+
+        -- If something changed, then we commit the qos config.
+        if commit == true then m.uci:commit("qos") end
+end
+
+-- This function is a (so far) unsuccessful attempt to manipulate the firewall rules from here
+-- Need to do more testing and eventually move to this mode.
+function maintain_firewall_rules()
+        -- Get the network information
+        bindport, rtprange, ipaddr, externhost = get_network_info()
+
+        commit = false
+        -- Only if externhost is set, do we control firewall rules.
+        if externhost ~= nil and bindport ~= nil and rtprange ~= nil then
+                -- Insert empty PBX-SIP and PBX-RTP rules if not present.
+                insert_empty_sip_rtp_rules ("firewall", "rule")
+
+                -- Iterate through the firewall rules, and if the dest_port and dest_ip setting of the\
+                -- SIP and RTP rule do not match what we want configured, set all the entries in the rule\
+                -- appropriately.
+                m.uci:foreach("firewall", "rule",
+                        function(s1)
+                                if     s1._name == 'PBX-SIP' then
+                                        if s1.dest_port ~= bindport then
+                                                m.uci:set("firewall", s1['.name'], "dest_port", bindport)
+                                                m.uci:set("firewall", s1['.name'], "src", "wan")
+                                                m.uci:set("firewall", s1['.name'], "proto", "udp")
+                                                m.uci:set("firewall", s1['.name'], "target", "ACCEPT")
+                                                commit = true
+                                        end
+                                elseif s1._name == 'PBX-RTP' then
+                                        if s1.dest_port ~= rtprange then
+                                                m.uci:set("firewall", s1['.name'], "dest_port", rtprange)
+                                                m.uci:set("firewall", s1['.name'], "src", "wan")
+                                                m.uci:set("firewall", s1['.name'], "proto", "udp")
+                                                m.uci:set("firewall", s1['.name'], "target", "ACCEPT")
+                                                commit = true
+                                        end
+                                end
+                        end)
+        else
+                -- We delete the firewall rules if one or more of the necessary parameters are not set.
+                sip_rule_name=nil
+                rtp_rule_name=nil
+        
+                -- First discover the configuration names of the rules.
+                m.uci:foreach("firewall", "rule",
+                        function(s1)
+                                if     s1._name == 'PBX-SIP' then
+                                        sip_rule_name = s1['.name']
+                                elseif s1._name == 'PBX-RTP' then
+                                        rtp_rule_name = s1['.name']
+                                end
+                        end)
+                
+                -- Then, using the names, actually delete the rules.
+                if sip_rule_name ~= nil then
+                        m.uci:delete("firewall", sip_rule_name)
+                        commit = true
+                end
+                if rtp_rule_name ~= nil then
+                        m.uci:delete("firewall", rtp_rule_name)
+                        commit = true
+                end
+        end
+
+        -- If something changed, then we commit the firewall config.
+        if commit == true then m.uci:commit("firewall") end
+end
+
+m = Map (modulename, translate("Advanced Settings"),
+         translate("This section contains settings that do not need to be changed under \
+         normal circumstances. In addition, here you can configure your system \
+         for use with remote SIP devices, and resolve call quality issues by enabling \
+         the insertion of QoS rules."))
+
+-- Recreate the voip server config, and restart necessary services after changes are commited
+-- to the advanced configuration. The firewall must restart because of "Remote Usage".
+function m.on_after_commit(self)
+
+        -- Make sure firewall rules are in place
+        maintain_firewall_rules()
+
+        -- If insertion of QoS rules is enabled
+        if m.uci:get(modulename, "advanced", "qos_enabled") == "yes" then
+                insert_qos_rules()
+        else
+                delete_qos_rules()
+        end
+
+        luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+        luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+        luci.sys.call("/etc/init.d/firewall             restart 1\>/dev/null 2\>/dev/null")
+end
+
+-----------------------------------------------------------------------------
+s = m:section(NamedSection, "advanced", "settings", translate("Advanced Settings"))
+s.anonymous = true
+
+s:tab("general",  translate("General Settings"))
+s:tab("remote_usage", translate("Remote Usage"),
+      translatef("You can use your SIP devices/softphones with this system from a remote location \
+      as well, as long as your Internet Service Provider gives you a public IP. \
+      You will be able to call other local users for free (e.g. other Analog Telephone Adapters (ATAs)) \
+      and use your VoIP providers to make calls as if you were local to the PBX. \
+      After configuring this tab, go back to where users are configured and see the new \
+      Server and Port setting you need to configure the remote SIP devices with. Please note that if this \
+      PBX is not running on your router/gateway, you will need to configure port forwarding (NAT) on your \
+      router/gateway. Please forward the ports below (SIP port and RTP range) to the IP address of the \
+      device running this PBX."))
+
+s:tab("qos",  translate("QoS Settings"), 
+      translate("If you experience jittery or high latency audio during heavy downloads, you may want \
+      to enable QoS. QoS prioritizes traffic to and from your network for specified ports and IP \
+      addresses, resulting in better latency and throughput for sound in our case. If enabled below, \
+      a QoS rule for this service will be configured by the PBX automatically, but you must visit the \
+      QoS configuration page (Network->QoS) to configure other critical QoS settings like Download \
+      and Upload speed."))
+
+ringtime = s:taboption("general", Value, "ringtime", translate("Number of Seconds to Ring"),
+                 translate("Set the number of seconds to ring users upon incoming calls before hanging up \
+                 or going to voicemail, if the voicemail is installed and enabled."))
+ringtime.datatype = "port"
+ringtime.default = 30
+
+ua = s:taboption("general", Value, "useragent", translate("User Agent String"),
+                 translate("This is the name that the VoIP server will use to identify itself when \
+                 registering to VoIP (SIP) providers. Some providers require this to a specific \
+                 string matching a hardware SIP device."))
+ua.default = appname
+
+h = s:taboption("remote_usage", Value, "externhost", translate("Domain/IP Address/Dynamic Domain"),
+                translate("You can enter your domain name, external IP address, or dynamic domain name here. \
+                The best thing to input is a static IP address. If your IP address is dynamic and it changes, \
+                your configuration will become invalid. Hence, it's recommended to set up Dynamic DNS in this case. \
+                and enter your Dynamic DNS hostname here. You can configure Dynamic DNS with the luci-app-ddns package."))
+h.datatype = "host"
+
+p = s:taboption("remote_usage", Value, "bindport", translate("External SIP Port"),
+                translate("Pick a random port number between 6500 and 9500 for the service to listen on. \
+                Do not pick the standard 5060, because it is often subject to brute-force attacks. \
+                When finished, (1) click \"Save and Apply\", and (2) look in the \
+                \"SIP Device/Softphone Accounts\" section for updated Server and Port settings \
+                for your SIP Devices/Softphones."))
+p.datatype = "port"
+
+p = s:taboption("remote_usage", Value, "rtpstart", translate("RTP Port Range Start"),
+                translate("RTP traffic carries actual voice packets. This is the start of the port range \
+                that will be used for setting up RTP communication. It's usually OK to leave this \
+                at the default value."))
+p.datatype = "port"
+p.default = defaultrtpstart
+
+p = s:taboption("remote_usage", Value, "rtpend", translate("RTP Port Range End"))
+p.datatype = "port"
+p.default = defaultrtpend
+
+p = s:taboption("qos", ListValue, "qos_enabled", translate("Insert QoS Rules"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+return m
diff --git a/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
new file mode 100644
index 00000000..ca373d63
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
@@ -0,0 +1,424 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename        = "pbx-calls"
+voipmodulename    = "pbx-voip"
+googlemodulename  = "pbx-google"
+usersmodulename   = "pbx-users"
+allvalidaccounts  = {}
+nallvalidaccounts = 0
+validoutaccounts  = {}
+nvalidoutaccounts = 0
+validinaccounts   = {}
+nvalidinaccounts  = 0
+allvalidusers     = {}
+nallvalidusers    = 0
+validoutusers     = {}
+nvalidoutusers    = 0
+
+
+-- Checks whether the entered extension is valid syntactically.
+function is_valid_extension(exten)
+   return (exten:match("[#*+0-9NXZ]+$") ~= nil)
+end
+
+
+m = Map (modulename, translate("Call Routing"),
+         translate("This is where you indicate which Google/SIP accounts are used to call what \
+                   country/area codes, which users can use what SIP/Google accounts, how incoming \
+                   calls are routed, what numbers can get into this PBX with a password, and what \
+                   numbers are blacklisted."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+        luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+        luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+end
+
+-- Add Google accounts to all valid accounts, and accounts valid for incoming and outgoing calls.
+m.uci:foreach(googlemodulename, "gtalk_jabber", 
+              function(s1)
+                 -- Add this provider to list of valid accounts.
+                 if s1.username ~= nil and s1.name ~= nil then
+                    allvalidaccounts[s1.name] = s1.username
+                    nallvalidaccounts = nallvalidaccounts + 1
+
+                    if s1.make_outgoing_calls == "yes" then
+                       -- Add provider to the associative array of valid outgoing accounts.
+                       validoutaccounts[s1.name] = s1.username
+                       nvalidoutaccounts = nvalidoutaccounts + 1
+                    end
+
+                    if s1.register == "yes" then
+                       -- Add provider to the associative array of valid outgoing accounts.
+                       validinaccounts[s1.name]  = s1.username
+                       nvalidinaccounts = nvalidinaccounts + 1
+                    end
+                 end
+              end)
+
+-- Add SIP accounts to all valid accounts, and accounts valid for incoming and outgoing calls.
+m.uci:foreach(voipmodulename, "voip_provider", 
+              function(s1)
+                 -- Add this provider to list of valid accounts.
+                 if s1.defaultuser ~= nil and s1.host ~= nil and s1.name ~= nil then
+                    allvalidaccounts[s1.name] = s1.defaultuser .. "@" .. s1.host
+                    nallvalidaccounts = nallvalidaccounts + 1
+
+                    if s1.make_outgoing_calls == "yes" then
+                       -- Add provider to the associative array of valid outgoing accounts.
+                       validoutaccounts[s1.name] = s1.defaultuser .. "@" .. s1.host
+                       nvalidoutaccounts = nvalidoutaccounts + 1
+                    end
+
+                    if s1.register == "yes" then
+                       -- Add provider to the associative array of valid outgoing accounts.
+                       validinaccounts[s1.name]  = s1.defaultuser .. "@" .. s1.host
+                       nvalidinaccounts = nvalidinaccounts + 1
+                    end
+                 end
+              end)
+
+-- Add Local User accounts to all valid users, and users allowed to make outgoing calls.
+m.uci:foreach(usersmodulename, "local_user",
+              function(s1)
+                 -- Add user to list of all valid users.
+                 if s1.defaultuser ~= nil then
+                    allvalidusers[s1.defaultuser] = true
+                    nallvalidusers = nallvalidusers + 1
+                    
+                    if s1.can_call == "yes" then
+                       validoutusers[s1.defaultuser] = true
+                       nvalidoutusers = nvalidoutusers + 1
+                    end
+                 end
+              end)
+
+
+----------------------------------------------------------------------------------------------------
+-- If there are no accounts configured, or no accounts enabled for outgoing calls, display a warning.
+-- Otherwise, display the usual help text within the section.
+if     nallvalidaccounts == 0 then
+   text = translate("NOTE: There are no Google or SIP provider accounts configured.")
+elseif nvalidoutaccounts == 0 then
+   text = translate("NOTE: There are no Google or SIP provider accounts enabled for outgoing calls.")
+else
+   text = translate("If you have more than one account that can make outgoing calls, you \
+   should enter a list of phone numbers and/or prefixes in the following fields for each \
+   provider listed. Invalid prefixes are removed silently, and only 0-9, X, Z, N, #, *, \
+   and + are valid characters. The letter X matches 0-9, Z matches 1-9, and N matches 2-9. \
+   For example to make calls to Germany through a provider, you can enter 49. To make calls \
+   to North America, you can enter 1NXXNXXXXXX. If one of your providers can make \"local\" \
+   calls to an area code like New York's 646, you can enter 646NXXXXXX for that \
+   provider. You should leave one account with an empty list to make calls with \
+   it by default, if no other provider's prefixes match. The system will automatically \
+   replace an empty list with a message that the provider dials all numbers not matched by another \
+   provider's prefixes. Be as specific as possible (i.e. 1NXXNXXXXXX is better than 1). Please note \
+   all international dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a \
+   space-separated list, and/or one per line by hitting enter after every one.")
+end
+
+
+s = m:section(NamedSection, "outgoing_calls", "call_routing", translate("Outgoing Calls"), text)
+s.anonymous = true
+
+for k,v in pairs(validoutaccounts) do
+   patterns = s:option(DynamicList, k, v)
+   
+   -- If the saved field is empty, we return a string
+   -- telling the user that this provider would dial any exten.
+   function patterns.cfgvalue(self, section)
+      value = self.map:get(section, self.option)
+      
+      if value == nil then
+         return {translate("Dials numbers unmatched elsewhere")}
+      else
+         return value
+      end
+   end
+   
+   -- Write only valid extensions into the config file.
+   function patterns.write(self, section, value)
+      newvalue = {}
+      nindex = 1
+      for index, field in ipairs(value) do
+         val = luci.util.trim(value[index])
+         if is_valid_extension(val) == true then
+            newvalue[nindex] = val
+            nindex = nindex + 1
+         end
+      end
+      DynamicList.write(self, section, newvalue)
+   end
+end
+
+----------------------------------------------------------------------------------------------------
+-- If there are no accounts configured, or no accounts enabled for incoming calls, display a warning.
+-- Otherwise, display the usual help text within the section.
+if     nallvalidaccounts == 0 then
+   text = translate("NOTE: There are no Google or SIP provider accounts configured.")
+elseif nvalidinaccounts == 0 then
+   text = translate("NOTE: There are no Google or SIP provider accounts enabled for incoming calls.")
+else
+   text = translate("For each provider enabled for incoming calls, here you can restrict which users to\
+                ring on incoming calls. If the list is empty, the system will indicate that all users \
+                enabled for incoming calls will ring. Invalid usernames will be rejected \
+                silently. Also, entering a username here overrides the user's setting to not receive \
+                incoming calls. This way, you can make certain users ring only for specific providers. \
+                Entries can be made in a space-separated list, and/or one per line by hitting enter after \
+                every one.")
+end
+
+
+s = m:section(NamedSection, "incoming_calls", "call_routing", translate("Incoming Calls"), text)
+s.anonymous = true
+
+for k,v in pairs(validinaccounts) do
+   users = s:option(DynamicList, k, v)
+   
+   -- If the saved field is empty, we return a string telling the user that
+   -- this provider would ring all users configured for incoming calls.
+   function users.cfgvalue(self, section)
+      value = self.map:get(section, self.option)
+      
+      if value == nil then
+         return {translate("Rings users enabled for incoming calls")}
+      else
+         return value
+      end
+   end
+   
+   -- Write only valid user names.
+   function users.write(self, section, value)
+      newvalue = {}
+      nindex = 1
+      for index, field in ipairs(value) do
+         trimuser = luci.util.trim(value[index])
+         if allvalidusers[trimuser] == true then
+            newvalue[nindex] = trimuser
+            nindex = nindex + 1
+         end
+      end
+      DynamicList.write(self, section, newvalue)
+   end
+end
+
+
+----------------------------------------------------------------------------------------------------
+-- If there are no user accounts configured, no user accounts enabled for outgoing calls,
+-- display a warning. Otherwise, display the usual help text within the section.
+if     nallvalidusers == 0 then
+   text = translate("NOTE: There are no local user accounts configured.")
+elseif nvalidoutusers == 0 then
+   text = translate("NOTE: There are no local user accounts enabled for outgoing calls.")
+else
+   text = translate("For each user enabled for outgoing calls you can restrict what providers the user \
+        can use for outgoing calls. By default all users can use all providers. To show up in the list \
+        below the user should be allowed to make outgoing calls in the \"User Accounts\" page. Enter VoIP \
+        providers in the format username@some.host.name, as listed in \"Outgoing Calls\" above. It's \
+        easiest to copy and paste the providers from above. Invalid entries, including providers not \
+        enabled for outgoing calls, will be rejected silently. Entries can be made in a space-separated \
+        list, and/or one per line by hitting enter after every one.")
+end
+
+
+s = m:section(NamedSection, "providers_user_can_use", "call_routing",
+     translate("Providers Used for Outgoing Calls"), text)
+s.anonymous = true
+
+for k,v in pairs(validoutusers) do
+   providers = s:option(DynamicList, k, k)
+
+   -- If the saved field is empty, we return a string telling the user
+   -- that this user uses all providers enavled for outgoing calls.
+   function providers.cfgvalue(self, section)
+      value = self.map:get(section, self.option)
+      
+      if value == nil then
+         return {translate("Uses providers enabled for outgoing calls")}
+      else
+         newvalue = {}
+         -- Convert internal names to user@host values.
+         for i,v in ipairs(value) do
+            newvalue[i] = validoutaccounts[v]
+         end
+         return newvalue
+      end
+   end
+   
+   -- Cook the new values prior to entering them into the config file.
+   -- Also, enter them only if they are valid.
+   function providers.write(self, section, value)
+      cookedvalue = {}
+      cindex = 1
+      for index, field in ipairs(value) do
+         cooked = string.gsub(luci.util.trim(value[index]), "%W", "_")
+         if validoutaccounts[cooked] ~= nil then
+            cookedvalue[cindex] = cooked
+            cindex = cindex + 1
+         end
+      end
+      DynamicList.write(self, section, cookedvalue)
+   end
+end
+
+----------------------------------------------------------------------------------------------------
+s = m:section(TypedSection, "callthrough_numbers", translate("Call-through Numbers"),
+        translate("Designate numbers that are allowed to call through this system and which user's \
+                  privileges they will have."))
+s.anonymous = true
+s.addremove = true
+
+num = s:option(DynamicList, "callthrough_number_list", translate("Call-through Numbers"),
+        translate("Specify numbers individually here. Press enter to add more numbers. \
+        You will have to experiment with what country and area codes you need to add \
+        to the number."))
+num.datatype = "uinteger"
+
+p = s:option(ListValue, "enabled", translate("Enabled"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+user = s:option(Value, "defaultuser",  translate("User Name"),
+         translate("The number(s) specified above will be able to dial out with this user's providers. \
+                   Invalid usernames, including users not enabled for outgoing calls, are dropped silently. \
+                   Please verify that the entry was accepted."))
+function user.write(self, section, value)
+   trimuser = luci.util.trim(value)
+   if allvalidusers[trimuser] == true then
+      Value.write(self, section, trimuser)
+   end
+end
+
+pwd = s:option(Value, "pin", translate("PIN"),
+               translate("Your PIN disappears when saved for your protection. It will be changed \
+                         only when you enter a value different from the saved one. Leaving the PIN \
+                         empty is possible, but please beware of the security implications."))
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+----------------------------------------------------------------------------------------------------
+s = m:section(TypedSection, "callback_numbers", translate("Call-back Numbers"),
+        translate("Designate numbers to whom the system will hang up and call back, which provider will \
+                   be used to call them, and which user's privileges will be granted to them."))
+s.anonymous = true
+s.addremove = true
+
+num = s:option(DynamicList, "callback_number_list", translate("Call-back Numbers"),
+        translate("Specify numbers individually here. Press enter to add more numbers. \
+        You will have to experiment with what country and area codes you need to add \
+        to the number."))
+num.datatype = "uinteger"
+
+p = s:option(ListValue, "enabled", translate("Enabled"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+delay = s:option(Value, "callback_hangup_delay", translate("Hang-up Delay"),
+            translate("How long to wait before hanging up. If the provider you use to dial automatically forwards \
+            to voicemail, you can set this value to a delay that will allow you to hang up before your call gets \
+            forwarded and you get billed for it."))
+delay.datatype = "uinteger"
+delay.default = 0
+
+user = s:option(Value, "defaultuser",  translate("User Name"),
+         translate("The number(s) specified above will be able to dial out with this user's providers. \
+                   Invalid usernames, including users not enabled for outgoing calls, are dropped silently. \
+                   Please verify that the entry was accepted."))
+function user.write(self, section, value)
+   trimuser = luci.util.trim(value)
+   if allvalidusers[trimuser] == true then
+      Value.write(self, section, trimuser)
+   end
+end
+
+pwd = s:option(Value, "pin", translate("PIN"),
+               translate("Your PIN disappears when saved for your protection. It will be changed \
+                         only when you enter a value different from the saved one. Leaving the PIN \
+                         empty is possible, but please beware of the security implications."))
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+provider = s:option(Value, "callback_provider",  translate("Call-back Provider"),
+         translate("Enter a VoIP provider to use for call-back in the format username@some.host.name, as listed in \
+         \"Outgoing Calls\" above. It's easiest to copy and paste the providers from above. Invalid entries, including \
+         providers not enabled for outgoing calls, will be rejected silently."))
+function provider.write(self, section, value)
+    cooked = string.gsub(luci.util.trim(value), "%W", "_")
+    if validoutaccounts[cooked] ~= nil then
+        Value.write(self, section, value)
+    end
+end
+
+----------------------------------------------------------------------------------------------------
+s = m:section(NamedSection, "blacklisting", "call_routing", translate("Blacklisted Numbers"),
+              translate("Enter phone numbers that you want to decline calls from automatically. \
+              You should probably omit the country code and any leading zeroes, but please \
+              experiment to make sure you are blocking numbers from your desired area successfully."))
+s.anonymous = true
+
+b = s:option(DynamicList, "blacklist1", translate("Dynamic List of Blacklisted Numbers"),
+            translate("Specify numbers individually here. Press enter to add more numbers."))
+b.cast = "string"
+b.datatype = "uinteger"
+
+b = s:option(Value, "blacklist2", translate("Space-Separated List of Blacklisted Numbers"),
+            translate("Copy-paste large lists of numbers here."))
+b.template = "cbi/tvalue"
+b.rows = 3
+
+return m
diff --git a/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
new file mode 100644
index 00000000..3c36a168
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
@@ -0,0 +1,122 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename           = "pbx-google"
+googlemodulename     = "pbx-google"
+defaultstatus        = "dnd"
+defaultstatusmessage = "PBX online, may lose messages"
+
+m = Map (modulename, translate("Google Accounts"),
+         translate("This is where you set up your Google (Talk and Voice) Accounts, in order to start \
+                using them for dialing and receiving calls (voice chat and real phone calls). Please \
+                make at least one voice call using the Google Talk plugin installable through the \
+                GMail interface, and then log out from your account everywhere. Click \"Add\" \
+                to add as many accounts as you wish."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+   -- Create a field "name" for each account that identifies the account in the backend.
+   commit = false
+   m.uci:foreach(modulename, "gtalk_jabber", 
+                 function(s1)
+                    if s1.username ~= nil then
+                       name=string.gsub(s1.username, "%W", "_")
+                       if s1.name ~= name then
+                          m.uci:set(modulename, s1['.name'], "name", name)
+                          commit = true
+                       end
+                    end
+                 end)
+   if commit == true then  m.uci:commit(modulename) end
+   
+   luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+   luci.sys.call("/etc/init.d/asterisk             restart 1\>/dev/null 2\>/dev/null")
+end
+
+-----------------------------------------------------------------------------
+s = m:section(TypedSection, "gtalk_jabber", translate("Google Voice/Talk Accounts"))
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "username",     translate("Email"))
+
+pwd = s:option(Value, "secret", translate("Password"),
+               translate("When your password is saved, it disappears from this field and is not displayed \
+                         for your protection. The previously saved password will be changed only when you \
+                         enter a value different from the saved one."))
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+
+p = s:option(ListValue, "register",
+             translate("Enable Incoming Calls (set Status below)"),
+             translate("When somebody starts voice chat with your GTalk account or calls the GVoice, \
+                       number (if you have Google Voice), the call will be forwarded to any users \
+                        that are online (registered using a SIP device or softphone) and permitted to \
+                        receive the call. If you have Google Voice, you must go to your GVoice settings and \
+                        forward calls to Google chat in order to actually receive calls made to your \
+                        GVoice number. If you have trouble receiving calls from GVoice, experiment \
+                        with the Call Screening option in your GVoice Settings. Finally, make sure no other \
+                        client is online with this account (browser in gmail, mobile/desktop Google Talk \
+                        App) as it may interfere."))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+p = s:option(ListValue, "make_outgoing_calls", translate("Enable Outgoing Calls"),
+      translate("Use this account to make outgoing calls as configured in the \"Call Routing\" section."))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+st = s:option(ListValue, "status", translate("Google Talk Status"))
+st:depends("register", "yes")
+st:value("dnd", translate("Do Not Disturb"))
+st:value("away",  translate("Away"))
+st:value("available",  translate("Available"))
+st.default = defaultstatus
+
+stm = s:option(Value, "statusmessage", translate("Google Talk Status Message"),
+             translate("Avoid using anything but alpha-numeric characters, space, comma, and period."))
+stm:depends("register", "yes")
+stm.default = defaultstatusmessage
+
+return m
diff --git a/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
new file mode 100644
index 00000000..c7c8b4d8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
@@ -0,0 +1,133 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename         = "pbx-users"
+modulenamecalls    = "pbx-calls"
+modulenameadvanced = "pbx-advanced"
+
+        
+m = Map (modulename, translate("User Accounts"), 
+        translate("Here you must configure at least one SIP account, that you \
+                will use to register with this service. Use this account either in an Analog Telephony \
+                Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid on your \
+                smartphone, or Ekiga, Linphone, or X-Lite on your computer. By default, all SIP accounts \
+                will ring simultaneously if a call is made to one of your VoIP provider accounts or GV \
+                numbers."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+        luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+        luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+end
+
+externhost = m.uci:get(modulenameadvanced, "advanced", "externhost")
+bindport   = m.uci:get(modulenameadvanced, "advanced", "bindport")
+ipaddr     = m.uci:get("network", "lan", "ipaddr")
+
+-----------------------------------------------------------------------------
+s = m:section(NamedSection, "server", "user", translate("Server Setting"))
+s.anonymous = true
+
+if ipaddr == nil or ipaddr == "" then
+   ipaddr = "(IP address not static)"
+end
+
+if bindport ~= nil then
+   just_ipaddr = ipaddr
+   ipaddr = ipaddr .. ":" .. bindport
+end
+
+s:option(DummyValue, "ipaddr", translate("Server Setting for Local SIP Devices"),
+         translate("Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices you will \
+                   use ONLY locally and never from a remote location.")).default = ipaddr
+
+if externhost ~= nil then
+   if bindport ~= nil then
+      just_externhost = externhost
+      externhost = externhost .. ":" .. bindport
+   end
+   s:option(DummyValue, "externhost", translate("Server Setting for Remote SIP Devices"),
+            translate("Enter this hostname (or hostname:port) in the Server/Registrar setting of SIP \
+                      devices you will use from a remote location (they will work locally too).")
+                     ).default = externhost
+end
+
+if bindport ~= nil then
+        s:option(DummyValue, "bindport", translate("Port Setting for SIP Devices"),
+        translatef("If setting Server/Registrar to %s or %s does not work for you, try setting \
+        it to %s or %s and entering this port number in a separate field that specifies the \
+        Server/Registrar port number. Beware that some devices have a confusing \
+        setting that sets the port where SIP requests originate from on the SIP \
+        device itself (the bind port). The port specified on this page is NOT this bind port \
+        but the port this service listens on.", 
+        ipaddr, externhost, just_ipaddr, just_externhost)).default = bindport
+end
+
+-----------------------------------------------------------------------------
+s = m:section(TypedSection, "local_user", translate("SIP Device/Softphone Accounts"))
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "fullname", translate("Full Name"),
+         translate("You can specify a real name to show up in the Caller ID here."))
+
+du = s:option(Value, "defaultuser",  translate("User Name"),
+         translate("Use (four to five digit) numeric user name if you are connecting normal telephones \
+                   with ATAs to this system (so they can dial user names)."))
+du.datatype = "uciname"
+
+pwd = s:option(Value, "secret", translate("Password"),
+               translate("Your password disappears when saved for your protection. It will be changed \
+                         only when you enter a value different from the saved one."))
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+p = s:option(ListValue, "ring", translate("Receives Incoming Calls"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+p = s:option(ListValue, "can_call", translate("Makes Outgoing Calls"))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+return m
diff --git a/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
new file mode 100644
index 00000000..ed1ed1ed
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
@@ -0,0 +1,116 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+modulename = "pbx-voip"
+
+m = Map (modulename, translate("SIP Accounts"),
+         translate("This is where you set up your SIP (VoIP) accounts ts like Sipgate, SipSorcery, \
+        the popular Betamax providers, and any other providers with SIP settings in order to start \
+        using them for dialing and receiving calls (SIP uri and real phone calls). Click \"Add\" to \
+        add as many accounts as you wish."))
+
+-- Recreate the config, and restart services after changes are commited to the configuration.
+function m.on_after_commit(self)
+   commit = false
+   -- Create a field "name" for each account that identifies the account in the backend.
+   m.uci:foreach(modulename, "voip_provider", 
+                 function(s1)
+                    if s1.defaultuser ~= nil and s1.host ~= nil then
+                       name=string.gsub(s1.defaultuser.."_"..s1.host, "%W", "_")
+                       if s1.name ~= name then
+                          m.uci:set(modulename, s1['.name'], "name", name)
+                          commit = true
+                       end
+                    end
+                 end)
+   if commit == true then m.uci:commit(modulename) end
+
+   luci.sys.call("/etc/init.d/pbx-" .. server .. " restart 1\>/dev/null 2\>/dev/null")
+   luci.sys.call("/etc/init.d/"     .. server .. " restart 1\>/dev/null 2\>/dev/null")
+end
+
+-----------------------------------------------------------------------------
+s = m:section(TypedSection, "voip_provider", translate("SIP Provider Accounts"))
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "defaultuser",  translate("User Name"))
+pwd = s:option(Value, "secret", translate("Password"),
+               translate("When your password is saved, it disappears from this field and is not displayed \
+                         for your protection. The previously saved password will be changed only when you \
+                         enter a value different from the saved one."))
+
+
+
+pwd.password = true
+pwd.rmempty = false
+
+-- We skip reading off the saved value and return nothing.
+function pwd.cfgvalue(self, section)
+    return "" 
+end
+
+-- We check the entered value against the saved one, and only write if the entered value is
+-- something other than the empty string, and it differes from the saved value.
+function pwd.write(self, section, value)
+    local orig_pwd = m:get(section, self.option)
+    if value and #value > 0 and orig_pwd ~= value then
+        Value.write(self, section, value)
+    end
+end
+
+h = s:option(Value, "host", translate("SIP Server/Registrar"))
+h.datatype = "host"
+
+p = s:option(ListValue, "register", translate("Enable Incoming Calls (Register via SIP)"),
+             translate("This option should be set to \"Yes\" if you have a DID \(real telephone number\) \
+                        associated with this SIP account or want to receive SIP uri calls through this \
+                        provider.")) 
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+p = s:option(ListValue, "make_outgoing_calls", translate("Enable Outgoing Calls"),
+             translate("Use this account to make outgoing calls."))
+p:value("yes", translate("Yes"))
+p:value("no",  translate("No"))
+p.default = "yes"
+
+from = s:option(Value, "fromdomain",
+                translate("SIP Realm (needed by some providers)"))
+from.optional = true
+from.datatype = "host"
+
+port = s:option(Value, "port", translate("SIP Server/Registrar Port"))
+port.optional = true
+port.datatype = "port"
+
+op = s:option(Value, "outboundproxy", translate("Outbound Proxy"))
+op.optional = true
+op.datatype = "host"
+
+return m
diff --git a/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx.lua b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx.lua
new file mode 100644
index 00000000..4c5fcbde
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/luasrc/model/cbi/pbx.lua
@@ -0,0 +1,115 @@
+--[[
+    Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+
+    This file is part of luci-pbx.
+
+    luci-pbx is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+]]--
+
+modulename = "pbx"
+
+
+if     nixio.fs.access("/etc/init.d/asterisk")   then
+   server = "asterisk"
+elseif nixio.fs.access("/etc/init.d/freeswitch") then
+   server = "freeswitch"
+else
+   server = ""
+end
+
+
+-- Returns formatted output of string containing only the words at the indices
+-- specified in the table "indices".
+function format_indices(string, indices)
+   if indices == nil then
+      return "Error: No indices to format specified.\n" 
+   end
+
+   -- Split input into separate lines.
+   lines = luci.util.split(luci.util.trim(string), "\n")
+   
+   -- Split lines into separate words.
+   splitlines = {}
+   for lpos,line in ipairs(lines) do
+      splitlines[lpos] = luci.util.split(luci.util.trim(line), "%s+", nil, true)
+   end
+   
+   -- For each split line, if the word at all indices specified
+   -- to be formatted are not null, add the formatted line to the
+   -- gathered output.
+   output = ""
+   for lpos,splitline in ipairs(splitlines) do
+      loutput = ""
+      for ipos,index in ipairs(indices) do
+         if splitline[index] ~= nil then
+            loutput = loutput .. string.format("%-40s", splitline[index])
+         else
+            loutput = nil
+            break
+         end
+      end
+      
+      if loutput ~= nil then
+         output = output .. loutput .. "\n"
+      end
+   end
+   return output
+end
+
+
+m = Map (modulename, translate("PBX Main Page"),
+      translate("This configuration page allows you to configure a phone system (PBX) service which \
+      permits making phone calls through multiple Google and SIP (like Sipgate, \
+      SipSorcery, and Betamax) accounts and sharing them among many SIP devices. \
+      Note that Google accounts, SIP accounts, and local user accounts are configured in the \
+      \"Google Accounts\", \"SIP Accounts\", and \"User Accounts\" sub-sections. \
+      You must add at least one User Account to this PBX, and then configure a SIP device or \
+      softphone to use the account, in order to make and receive calls with your Google/SIP \
+      accounts. Configuring multiple users will allow you to make free calls between all users, \
+      and share the configured Google and SIP accounts. If you have more than one Google and SIP \
+      accounts set up, you should probably configure how calls to and from them are routed in \
+      the \"Call Routing\" page. If you're interested in using your own PBX from anywhere in the \
+      world, then visit the \"Remote Usage\" section in the \"Advanced Settings\" page."))
+
+-----------------------------------------------------------------------------------------
+s = m:section(NamedSection, "connection_status", "main",
+              translate("PBX Service Status"))
+s.anonymous = true
+
+s:option (DummyValue, "status", translate("Service Status"))
+
+sts = s:option(DummyValue, "_sts") 
+sts.template = "cbi/tvalue"
+sts.rows = 20
+
+function sts.cfgvalue(self, section)
+
+   if server == "asterisk" then
+      regs = luci.sys.exec("asterisk -rx 'sip show registry' | sed 's/peer-//'")
+      jabs = luci.sys.exec("asterisk -rx 'jabber show connections' | grep onnected")
+      usrs = luci.sys.exec("asterisk -rx 'sip show users'")
+      chan = luci.sys.exec("asterisk -rx 'core show channels'")
+
+      return format_indices(regs, {1, 5}) ..
+             format_indices(jabs, {2, 4}) .. "\n" ..
+             format_indices(usrs, {1}   ) .. "\n" .. chan
+
+   elseif server == "freeswitch" then
+      return "Freeswitch is not supported yet.\n"
+   else
+      return "Neither Asterisk nor FreeSwitch discovered, please install Asterisk, as Freeswitch is not supported yet.\n"
+   end
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx
new file mode 100644
index 00000000..ca7c1669
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx
@@ -0,0 +1 @@
+config 'main' 'connection_status'
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-advanced b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-advanced
new file mode 100644
index 00000000..39da6f88
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-advanced
@@ -0,0 +1,5 @@
+config 'settings' 'advanced'
+        option 'useragent' 'PBX'
+        option 'ringtime' '30'
+        option 'rtpstart' '19850'
+        option 'rtpend' '19900'
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-calls b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-calls
new file mode 100644
index 00000000..822bd4a1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-calls
@@ -0,0 +1,7 @@
+config 'call_routing' 'outgoing_calls'
+
+config 'call_routing' 'incoming_calls'
+
+config 'call_routing' 'providers_user_can_use'
+
+config 'call_routing' 'blacklisting'
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-google b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-google
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-users b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-users
new file mode 100644
index 00000000..a4277b1b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-users
@@ -0,0 +1 @@
+config 'user' 'server'
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-voip b/trunk/package/luci/applications/luci-pbx/root/etc/config/pbx-voip
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/trunk/package/luci/applications/luci-pbx/root/etc/init.d/pbx-asterisk
new file mode 100755
index 00000000..304c0b0d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/init.d/pbx-asterisk
@@ -0,0 +1,837 @@
+#!/bin/sh /etc/rc.common
+#
+# Copyright 2011 Iordan Iordanov <iiordanov (AT) gmail.com>
+#
+#    This file is part of luci-pbx.
+#
+#    luci-pbx is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    luci-pbx is distributed in the hope that 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 luci-pbx.  If not, see <http://www.gnu.org/licenses/>.
+
+. /lib/functions.sh
+
+START=60
+
+# Some global variables
+MODULENAME=pbx
+USERAGENT="PBX"
+HANGUPCNTXT=hangup-call-context
+GTALKUNVL=unavailable
+
+ASTUSER=nobody
+ASTGROUP=nogroup
+ASTDIRSRECURSIVE="/var/run/asterisk /var/log/asterisk /var/spool/asterisk"
+ASTDIRS="/usr/lib/asterisk"
+ASTSOUNDSDIR="/usr/lib/asterisk/sounds"
+
+TEMPLATEDIR=/etc/${MODULENAME}-asterisk
+PBXSOUNDSDIR=$TEMPLATEDIR/sounds
+VMTEMPLATEDIR=/etc/${MODULENAME}-voicemail
+VMSOUNDSDIR=$VMTEMPLATEDIR/sounds
+ASTERISKDIR=/etc/asterisk
+WORKDIR=/tmp/$MODULENAME.$$
+MD5SUMSFILE=/tmp/$MODULENAME-sums.$$
+
+TMPL_ASTERISK=$TEMPLATEDIR/asterisk.conf.TEMPLATE
+TMPL_GTALK=$TEMPLATEDIR/gtalk.conf.TEMPLATE
+TMPL_INDICATIONS=$TEMPLATEDIR/indications.conf.TEMPLATE
+TMPL_LOGGER=$TEMPLATEDIR/logger.conf.TEMPLATE
+TMPL_MANAGER=$TEMPLATEDIR/manager.conf.TEMPLATE
+TMPL_MODULES=$TEMPLATEDIR/modules.conf.TEMPLATE
+TMPL_RTP=$TEMPLATEDIR/rtp.conf.TEMPLATE
+
+TMPL_EXTCTHRUCHECKHDR=$TEMPLATEDIR/extensions_disa-check_header.conf.TEMPLATE
+TMPL_EXTCTHRUCHECK=$TEMPLATEDIR/extensions_disa-check.conf.TEMPLATE
+TMPL_EXTCTHRUCHECKFTR=$TEMPLATEDIR/extensions_disa-check_footer.conf.TEMPLATE
+TMPL_EXTCTHRUHDR=$TEMPLATEDIR/extensions_disa_header.conf.TEMPLATE
+TMPL_EXTCTHRU=$TEMPLATEDIR/extensions_disa.conf.TEMPLATE
+TMPL_EXTCTHRUNOPIN=$TEMPLATEDIR/extensions_disa-nopin.conf.TEMPLATE
+
+TMPL_EXTCBACKCHECKHDR=$TEMPLATEDIR/extensions_callback-check_header.conf.TEMPLATE
+TMPL_EXTCBACKCHECK=$TEMPLATEDIR/extensions_callback-check.conf.TEMPLATE
+TMPL_EXTCBACKCHECKFTR=$TEMPLATEDIR/extensions_callback-check_footer.conf.TEMPLATE
+TMPL_EXTCBACKHDR=$TEMPLATEDIR/extensions_callback_header.conf.TEMPLATE
+TMPL_EXTCBACKSIP=$TEMPLATEDIR/extensions_callback_sip.conf.TEMPLATE
+TMPL_EXTCBACKGTALK=$TEMPLATEDIR/extensions_callback_gtalk.conf.TEMPLATE
+
+TMPL_EXTENSIONS=$TEMPLATEDIR/extensions.conf.TEMPLATE
+
+TMPL_EXTVMDISABLED=$TEMPLATEDIR/extensions_voicemail_disabled.conf.TEMPLATE
+TMPL_EXTVMENABLED=$TEMPLATEDIR/extensions_voicemail_enabled.conf.TEMPLATE
+
+TMPL_EXTBLKLIST=$TEMPLATEDIR/extensions_blacklist.conf.TEMPLATE
+TMPL_EXTBLKLISTFTR=$TEMPLATEDIR/extensions_blacklist_footer.conf.TEMPLATE
+TMPL_EXTBLKLISTHDR=$TEMPLATEDIR/extensions_blacklist_header.conf.TEMPLATE
+
+TMPL_EXTDEFAULT=$TEMPLATEDIR/extensions_default.conf.TEMPLATE
+TMPL_EXTDEFAULTUSER=$TEMPLATEDIR/extensions_default_user.conf.TEMPLATE
+
+TMPL_EXTINCNTXTSIP=$TEMPLATEDIR/extensions_incoming_context_sip.conf.TEMPLATE
+TMPL_EXTINCNTXTGTALKHDR=$TEMPLATEDIR/extensions_incoming_context_gtalk_header.conf.TEMPLATE
+TMPL_EXTINCNTXTGTALK=$TEMPLATEDIR/extensions_incoming_context_gtalk.conf.TEMPLATE
+
+TMPL_EXTUSERCNTXT=$TEMPLATEDIR/extensions_user_context.conf.TEMPLATE
+TMPL_EXTUSERCNTXTFTR=$TEMPLATEDIR/extensions_user_context_footer.conf.TEMPLATE
+TMPL_EXTUSERCNTXTHDR=$TEMPLATEDIR/extensions_user_context_header.conf.TEMPLATE
+
+TMPL_EXTOUTHDR=$TEMPLATEDIR/extensions_default_outgoing_header.conf.TEMPLATE
+TMPL_EXTOUTGTALK=$TEMPLATEDIR/extensions_outgoing_gtalk.conf.TEMPLATE
+TMPL_EXTOUTLOCAL=$TEMPLATEDIR/extensions_outgoing_dial_local_user.conf.TEMPLATE
+TMPL_EXTOUTSIP=$TEMPLATEDIR/extensions_outgoing_sip.conf.TEMPLATE
+
+TMPL_JABBER=$TEMPLATEDIR/jabber.conf.TEMPLATE
+TMPL_JABBERUSER=$TEMPLATEDIR/jabber_users.conf.TEMPLATE
+TMPL_SIP=$TEMPLATEDIR/sip.conf.TEMPLATE
+TMPL_SIPPEER=$TEMPLATEDIR/sip_peer.TEMPLATE
+TMPL_SIPREG=$TEMPLATEDIR/sip_registration.TEMPLATE
+TMPL_SIPUSR=$TEMPLATEDIR/sip_user.TEMPLATE
+
+TMPL_MSMTPDEFAULT=$VMTEMPLATEDIR/pbx-msmtprc-defaults.TEMPLATE
+TMPL_MSMTPACCOUNT=$VMTEMPLATEDIR/pbx-msmtprc-account.TEMPLATE
+TMPL_MSMTPAUTH=$VMTEMPLATEDIR/pbx-msmtprc-account-auth.TEMPLATE
+TMPL_MSMTPACCTDFLT=$VMTEMPLATEDIR/pbx-msmtprc-account-default.TEMPLATE
+
+
+INCLUDED_FILES="$WORKDIR/extensions_blacklist.conf $WORKDIR/extensions_callthrough.conf\
+                $WORKDIR/extensions_incoming.conf  $WORKDIR/extensions_incoming_gtalk.conf\
+                $WORKDIR/extensions_user.conf      $WORKDIR/jabber_users.conf\
+                $WORKDIR/sip_peers.conf            $WORKDIR/sip_registrations.conf\
+                $WORKDIR/sip_users.conf            $WORKDIR/extensions_voicemail.conf\
+                $WORKDIR/extensions_default.conf"
+
+
+# In this string, we concatenate all local users enabled to receive calls
+# readily formatted for the Dial command.
+localusers_to_ring=""
+
+# In this string, we keep a list of all users that are enabled for outgoing
+# calls. It is used at the end to create the user contexts.
+localusers_can_dial=""
+
+# In this string, we put together a space-separated list of provider names
+# (alphanumeric, with all non-alpha characters replaced with underscores),
+# which will be used to dial out by default (whose outgoing contexts will
+# be included in users' contexts by default.
+outbound_providers=""
+sip_outbound_providers=""
+gtalk_outbound_providers=""
+
+# Function which escapes non-alpha-numeric characters in a string
+escape_non_alpha() {
+    echo $@ | sed 's/\([^a-zA-Z0-9]\)/\\\1/g'
+}
+
+# Function which replaces non-alpha-numeric characters with an underscore
+sub_underscore_for_non_alpha() {
+    echo $@ | sed 's/[^a-zA-Z0-9]/_/g'
+}
+
+# Copies the template files which we don't edit.
+copy_unedited_templates_over()
+{
+    cp $TMPL_ASTERISK      $WORKDIR/asterisk.conf
+    cp $TMPL_GTALK         $WORKDIR/gtalk.conf
+    cp $TMPL_INDICATIONS   $WORKDIR/indications.conf
+    cp $TMPL_LOGGER        $WORKDIR/logger.conf
+    cp $TMPL_MANAGER       $WORKDIR/manager.conf
+    cp $TMPL_MODULES       $WORKDIR/modules.conf
+    # If this file isn't present at this stage, voicemail is disabled.
+    [ ! -f $WORKDIR/extensions_voicemail.conf ] && \
+      cp $TMPL_EXTVMDISABLED $WORKDIR/extensions_voicemail.conf
+}
+
+# Touches all the included files, to prevent asterisk from refusing to
+# start if a config item is missing and an included config file isn't created.
+create_included_files()
+{
+    touch $INCLUDED_FILES
+}
+
+# Puts together all the extensions.conf related configuration.
+pbx_create_extensions_config()
+{
+    local ringtime
+    config_get ringtime advanced ringtime
+
+    sed "s/|RINGTIME|/$ringtime/" $TMPL_EXTENSIONS > $WORKDIR/extensions.conf
+    mv  $WORKDIR/inext.TMP                           $WORKDIR/extensions_incoming.conf
+    cp  $TMPL_EXTINCNTXTGTALKHDR                     $WORKDIR/extensions_incoming_gtalk.conf
+    cat $WORKDIR/outextgtalk.TMP                  >> $WORKDIR/extensions_incoming_gtalk.conf 2>/dev/null
+    rm -f $WORKDIR/outextgtalk.TMP
+    mv  $WORKDIR/blacklist.TMP                       $WORKDIR/extensions_blacklist.conf
+    mv  $WORKDIR/userext.TMP                         $WORKDIR/extensions_user.conf
+
+    cp  $TMPL_EXTCTHRUHDR                            $WORKDIR/extensions_callthrough.conf
+    cat $WORKDIR/callthrough.TMP                  >> $WORKDIR/extensions_callthrough.conf 2>/dev/null
+    rm -f $WORKDIR/callthrough.TMP
+    cat $TMPL_EXTCTHRUCHECKHDR                    >> $WORKDIR/extensions_callthrough.conf 2>/dev/null
+    cat $WORKDIR/callthroughcheck.TMP             >> $WORKDIR/extensions_callthrough.conf 2>/dev/null
+    rm -f $WORKDIR/callthroughcheck.TMP
+    cat $TMPL_EXTCTHRUCHECKFTR                    >> $WORKDIR/extensions_callthrough.conf 2>/dev/null
+
+    cp  $TMPL_EXTCBACKHDR                            $WORKDIR/extensions_callback.conf
+    cat $WORKDIR/callback.TMP                     >> $WORKDIR/extensions_callback.conf 2>/dev/null
+    rm -f $WORKDIR/callback.TMP
+    cat $TMPL_EXTCBACKCHECKHDR                    >> $WORKDIR/extensions_callback.conf 2>/dev/null
+    cat $WORKDIR/callbackcheck.TMP                >> $WORKDIR/extensions_callback.conf 2>/dev/null
+    rm -f $WORKDIR/callbackcheck.TMP
+    cat $TMPL_EXTCBACKCHECKFTR                    >> $WORKDIR/extensions_callback.conf 2>/dev/null
+
+    rm -f $WORKDIR/outext-*.TMP
+    rm -f $WORKDIR/localext.TMP
+    sed "s/|LOCALUSERS|/$localusers_to_ring/g" $TMPL_EXTDEFAULT \
+                                                   > $WORKDIR/extensions_default.conf
+    cat $WORKDIR/inextuser.TMP                    >> $WORKDIR/extensions_default.conf
+    rm -f $WORKDIR/inextuser.TMP
+}
+
+# Puts together all the sip.conf related configuration.
+pbx_create_sip_config()
+{
+    mv $WORKDIR/sip_regs.TMP    $WORKDIR/sip_registrations.conf
+    mv $WORKDIR/sip_peers.TMP   $WORKDIR/sip_peers.conf
+    mv $WORKDIR/sip_users.TMP   $WORKDIR/sip_users.conf
+}
+
+# Creates the jabber.conf related config
+pbx_create_jabber_config()
+{
+    cp  $TMPL_JABBER        $WORKDIR/jabber.conf
+    mv  $WORKDIR/jabber.TMP $WORKDIR/jabber_users.conf
+}
+
+# Gets rid of any config files from $ASTERISKDIR not found in $WORKDIR.
+clean_up_asterisk_config_dir()
+{
+    for f in $ASTERISKDIR/* ; do
+        basef="`basename $f`"
+        if [ ! -e "$WORKDIR/$basef" ] ; then
+            rm -rf "$f"
+        fi
+    done
+}
+
+# Compares md5sums of the config files in $WORKDIR to those
+# in $ASTERISKDIR, and copies only changed files over to reduce
+# wear on flash in embedded devices.
+compare_configs_and_copy_changed()
+{
+    # First, compute md5sums of the config files in $WORKDIR.
+    cd $WORKDIR/
+    md5sum * > $MD5SUMSFILE
+
+    # Now, check the files in $ASTERISKDIR against the md5sums.
+    cd $ASTERISKDIR/
+    changed_files="`md5sum -c $MD5SUMSFILE 2>/dev/null | fgrep ": FAILED" | awk -F: '{print $1}'`"
+
+    rm -f $MD5SUMSFILE
+
+    [ -z "$changed_files" ] && return
+
+    # Now copy over the changed files.
+    for f in $changed_files ; do
+        cp "$WORKDIR/$f" "$ASTERISKDIR/$f"
+    done
+}
+
+# Calls the functions that create the final config files
+# Calls the function which compares which files have changed
+# Puts the final touches on $ASTERISKDIR
+# Gets rid of $WORKDIR
+pbx_assemble_and_copy_config()
+{
+    mkdir -p $ASTERISKDIR
+
+    copy_unedited_templates_over
+    create_included_files
+    pbx_create_extensions_config
+    pbx_create_sip_config
+    pbx_create_jabber_config
+
+    touch    $WORKDIR/features.conf
+
+    # At this point, $WORKDIR should contain a complete, working config.
+    clean_up_asterisk_config_dir
+
+    compare_configs_and_copy_changed
+
+    [ ! -d $ASTERISKDIR/manager.d ] && mkdir -p $ASTERISKDIR/manager.d/
+
+    # Get rid of the working directory
+    rm -rf $WORKDIR/
+}
+
+# Creates configuration for a user and adds it to the temporary file that holds
+# all users configured so far.
+pbx_add_user()
+{
+    local fullname
+    local defaultuser
+    local rawdefaultuser
+    local secret
+    local ring
+    local can_call
+
+    config_get fullname    $1 fullname
+    fullname=`escape_non_alpha $fullname`
+    config_get rawdefaultuser $1 defaultuser
+    defaultuser=`escape_non_alpha $rawdefaultuser`
+    config_get secret      $1 secret
+    secret=`escape_non_alpha $secret`
+    config_get ring        $1 ring
+    config_get can_call    $1 can_call
+
+    [ -z "$defaultuser" -o -z "$secret" ] && return
+    [ -z "$fullname" ] && fullname="$defaultuser"
+
+    sed "s/|DEFAULTUSER|/$defaultuser/g" $TMPL_SIPUSR > $WORKDIR/sip_user.tmp
+
+    if [ "$can_call" = "yes" ] ; then
+        # Add user to list of all users that are allowed to make calls.
+        localusers_can_dial="$localusers_can_dial $rawdefaultuser"
+        sed -i "s/|CONTEXTNAME|/$defaultuser/g"     $WORKDIR/sip_user.tmp
+    else
+        sed -i "s/|CONTEXTNAME|/$HANGUPCNTXT/g"     $WORKDIR/sip_user.tmp
+    fi
+
+    # Add this user's configuration to the temp file containing all user configs.
+    sed "s/|FULLNAME|/$fullname/" $WORKDIR/sip_user.tmp |\
+             sed "s/|SECRET|/$secret/g"                       >> $WORKDIR/sip_users.TMP
+
+    if [ "$ring" = "yes" ] ; then
+        if [ -z "$localusers_to_ring" ] ; then
+            localusers_to_ring="SIP\/$defaultuser"
+        else
+            localusers_to_ring="$localusers_to_ring\&SIP\/$defaultuser"
+        fi
+    fi
+
+    # Add configuration which allows local users to call each other.
+    sed "s/|DEFAULTUSER|/$defaultuser/g" $TMPL_EXTOUTLOCAL    >> $WORKDIR/localext.TMP
+
+    # Add configuration which puts calls to users through the default
+    # context, so that blacklists and voicemail take effect for this user.
+    sed "s/|DEFAULTUSER|/$defaultuser/g" $TMPL_EXTDEFAULTUSER >> $WORKDIR/inextuser.TMP
+
+    rm -f $WORKDIR/sip_user.tmp
+}
+
+# Creates configuration for a Google account, and adds it to the temporary file that holds
+# all accounts configured so far.
+# Also creates the outgoing extensions which are used in users' outgoing contexts.
+pbx_add_jabber()
+{
+    local username
+    local secret
+    local numprefix
+    local register
+    local make_outgoing_calls
+    local name
+    local users_to_ring
+    local status
+    local statusmessage
+
+    config_get username $1 username
+    username=`escape_non_alpha $username`
+    config_get secret $1 secret
+    secret=`escape_non_alpha $secret`
+    #TODO: Is this really necessary here? Numprefix is retrieved below.
+    config_get numprefix $1 numprefix
+    config_get register $1 register
+    config_get make_outgoing_calls $1 make_outgoing_calls
+    config_get name $1 name
+    config_get status $1 status
+    status=`escape_non_alpha $status`
+    config_get statusmessage $1 statusmessage
+    statusmessage=`escape_non_alpha $statusmessage`
+
+    [ -z "$username" -o -z "$secret" ] && return
+
+    # Construct a jabber entry for this provider.
+    sed     "s/|USERNAME|/$username/g" $TMPL_JABBERUSER |\
+            sed "s/|NAME|/$name/g"                            > $WORKDIR/jabber.tmp
+
+    if [ "$register" = yes ] ; then
+        # If this provider is enabled for incoming calls, we need to set the
+        # status of the user to something other than unavailable in order to receive calls.
+        sed -i "s/|STATUS|/$status/g"                   $WORKDIR/jabber.tmp
+        sed -i "s/|STATUSMESSAGE|/\"$statusmessage\"/g" $WORKDIR/jabber.tmp
+
+        users_to_ring="`uci -q get ${MODULENAME}-calls.incoming_calls.$name`"
+        # If no users have been specified to ring, we ring all users enabled for incoming calls.
+        if [ -z "$users_to_ring" ] ; then
+            users_to_ring=$localusers_to_ring
+        else
+            # Else, we cook up a string formatted for the Dial command
+            # with the specified users (SIP/user1&SIP/user2&...). We do it
+            # with set, shift and a loop in order to be more tolerant of ugly whitespace
+            # messes entered by users.
+            set $users_to_ring
+            users_to_ring="SIP\/$1" && shift
+            for u in $@ ; do u=`escape_non_alpha $u` ; users_to_ring=$users_to_ring\\\&SIP\\\/$u ; done
+        fi
+
+        # Now, we add this account to the gtalk incoming context.
+        sed    "s/|USERNAME|/$username/g" $TMPL_EXTINCNTXTGTALK |\
+                   sed "s/|LOCALUSERS|/$users_to_ring/g"    >> $WORKDIR/outextgtalk.TMP
+    else
+        sed -i "s/|STATUS|/$GTALKUNVL/g"               $WORKDIR/jabber.tmp
+        sed -i "s/|STATUSMESSAGE|/\"\"/g"              $WORKDIR/jabber.tmp
+    fi
+
+    # Add this account's configuration to the temp file containing all account configs.
+    sed "s/|SECRET|/$secret/g" $WORKDIR/jabber.tmp      >> $WORKDIR/jabber.TMP
+
+    # If this provider is enabled for outgoing calls.
+    if [ "$make_outgoing_calls" = "yes" ] ; then
+
+        numprefix="`uci -q get ${MODULENAME}-calls.outgoing_calls.$name`"
+
+        # If no prefixes are specified, then we use "X" which matches any prefix.
+        [ -z "$numprefix" ]  && numprefix="X"
+
+        for p in $numprefix ; do
+            p=`escape_non_alpha $p`
+            sed "s/|NUMPREFIX|/$p/g" $TMPL_EXTOUTGTALK |\
+                            sed "s/|NAME|/$name/g"            >> $WORKDIR/outext-$name.TMP
+        done
+
+        # Add this provider to the list of enabled outbound providers.
+        if [ -z "$outbound_providers" ] ; then
+            outbound_providers="$name"
+        else
+            outbound_providers="$outbound_providers $name"
+        fi
+
+        # Add this provider to the list of enabled gtalk outbound providers.
+        if [ -z "$gtalk_outbound_providers" ] ; then
+            gtalk_outbound_providers="$name"
+        else
+            gtalk_outbound_providers="$gtalk_outbound_providers $name"
+        fi
+    fi
+
+    rm -f $WORKDIR/jabber.tmp
+}
+
+# Creates configuration for a SIP provider account, and adds it to the temporary file that holds
+# all accounts configured so far.
+# Also creates the outgoing extensions which are used in users' outgoing contexts.
+pbx_add_peer()
+{
+    local defaultuser
+    local secret
+    local host
+    local fromdomain
+    local register
+    local numprefix
+    local make_outgoing_calls
+    local name
+    local users_to_ring
+    local port
+    local outboundproxy
+
+    config_get defaultuser $1 defaultuser
+    defaultuser=`escape_non_alpha $defaultuser`
+    config_get secret $1 secret
+    secret=`escape_non_alpha $secret`
+    config_get host $1 host
+    host=`escape_non_alpha $host`
+    config_get port $1 port
+    config_get outbountproxy $1 outboundproxy
+    outbountproxy=`escape_non_alpha $outbountproxy`
+    config_get fromdomain $1 fromdomain
+    fromdomain=`escape_non_alpha $fromdomain`
+    config_get register $1 register
+    config_get numprefix $1 numprefix
+    config_get make_outgoing_calls $1 make_outgoing_calls
+    config_get name $1 name
+
+    [ -z "$defaultuser" -o -z "$secret" -o -z "$host" ] && return
+    [ -z "$fromdomain" ]    && fromdomain=$host
+    [ -n "$port" ]          && port="port=$port"
+    [ -n "$outboundproxy" ] && outboundproxy="outboundproxy=$outboundproxy"
+
+    # Construct a sip peer entry for this provider.
+    sed    "s/|DEFAULTUSER|/$defaultuser/" $TMPL_SIPPEER  >  $WORKDIR/sip_peer.tmp
+    sed -i "s/|NAME|/$name/"                                 $WORKDIR/sip_peer.tmp
+    sed -i "s/|FROMUSER|/$defaultuser/"                      $WORKDIR/sip_peer.tmp
+    sed -i "s/|SECRET|/$secret/"                             $WORKDIR/sip_peer.tmp
+    sed -i "s/|HOST|/$host/"                                 $WORKDIR/sip_peer.tmp
+    sed -i "s/|PORT|/$port/"                                 $WORKDIR/sip_peer.tmp
+    sed -i "s/|OUTBOUNDPROXY|/$outboundproxy/"               $WORKDIR/sip_peer.tmp
+    # Add this account's configuration to the temp file containing all account configs.
+    sed    "s/|FROMDOMAIN|/$host/" $WORKDIR/sip_peer.tmp >>  $WORKDIR/sip_peers.TMP
+
+    # If this provider is enabled for incoming calls.
+    if [ "$register" = "yes" ] ; then
+        # Then we create a registration string for this provider.
+        sed    "s/|DEFAULTUSER|/$defaultuser/g" $TMPL_SIPREG         > $WORKDIR/sip_reg.tmp
+        sed -i "s/|SECRET|/$secret/g"                                  $WORKDIR/sip_reg.tmp
+        sed    "s/|NAME|/$name/g" $WORKDIR/sip_reg.tmp              >> $WORKDIR/sip_regs.TMP
+
+        users_to_ring="`uci -q get ${MODULENAME}-calls.incoming_calls.$name`"
+        # If no users have been specified to ring, we ring all users enabled for incoming calls.
+        if [ -z "$users_to_ring" ] ; then
+            users_to_ring=$localusers_to_ring
+        else
+            # Else, we cook up a string formatted for the Dial command
+            # with the specified users (SIP/user1&SIP/user2&...). We do it
+            # with set, shift and a loop in order to be more tolerant of ugly whitespace
+            # messes entered by users.
+            set $users_to_ring
+            users_to_ring="SIP\/$1" && shift
+            for u in $@ ; do users_to_ring=$users_to_ring\\\&SIP\\\/$u ; done
+        fi
+
+        # And we create an incoming calls context for this provider.
+        sed    "s/|NAME|/$name/g"                          $TMPL_EXTINCNTXTSIP |\
+                    sed "s/|LOCALUSERS|/$users_to_ring/g"       >> $WORKDIR/inext.TMP
+    fi
+
+    # If this provider is enabled for outgoing calls.
+    if [ "$make_outgoing_calls" = "yes" ] ; then
+
+        numprefix="`uci -q get ${MODULENAME}-calls.outgoing_calls.$name`"
+        # If no prefixes are specified, then we use "X" which matches any prefix.
+        [ -z "$numprefix" ]  && numprefix="X"
+        for p in $numprefix ; do
+            p=`escape_non_alpha $p`
+            sed "s/|NUMPREFIX|/$p/g" $TMPL_EXTOUTSIP |\
+                            sed "s/|NAME|/$name/g"              >> $WORKDIR/outext-$name.TMP
+        done
+
+        # Add this provider to the list of enabled outbound providers.
+        if [ -z "$outbound_providers" ] ; then
+            outbound_providers="$name"
+        else
+            outbound_providers="$outbound_providers $name"
+        fi
+
+        # Add this provider to the list of enabled sip outbound providers.
+        if [ -z "$sip_outbound_providers" ] ; then
+            sip_outbound_providers="$name"
+        else
+            sip_outbound_providers="$sip_outbound_providers $name"
+        fi
+    fi
+
+    rm -f $WORKDIR/sip_peer.tmp
+    rm -f $WORKDIR/sip_reg.tmp
+}
+
+# For all local users enabled for outbound calls, creates a context
+# containing the extensions for Google and SIP accounts this user is
+# allowed to use.
+pbx_create_user_contexts()
+{
+    local providers
+
+    for u in $localusers_can_dial ; do
+        u=`escape_non_alpha $u`
+        sed "s/|DEFAULTUSER|/$u/g" $TMPL_EXTUSERCNTXTHDR                >> $WORKDIR/userext.TMP
+        cat $WORKDIR/localext.TMP                                       >> $WORKDIR/userext.TMP
+        providers="`uci -q get ${MODULENAME}-calls.providers_user_can_use.$u`"
+        [ -z "$providers" ] && providers="$outbound_providers"
+
+        # For each provider, cat the contents of outext-$name.TMP into the user's outgoing calls extension
+        for p in $providers ; do
+            [ -f $WORKDIR/outext-$p.TMP ] && cat $WORKDIR/outext-$p.TMP >> $WORKDIR/userext.TMP
+        done
+        cat $TMPL_EXTUSERCNTXTFTR                                       >> $WORKDIR/userext.TMP
+    done
+}
+
+# Creates the blacklist context which hangs up on blacklisted numbers.
+pbx_add_blacklist()
+{
+    local blacklist1
+    local blacklist2
+
+    config_get blacklist1 blacklisting blacklist1
+    config_get blacklist2 blacklisting blacklist2
+
+    # We create the blacklist context no matter whether the blacklist
+    # actually contains entries or not, since the PBX will send calls
+    # to the context for a check against the list anyway.
+    cp $TMPL_EXTBLKLISTHDR                                   $WORKDIR/blacklist.TMP
+    for n in $blacklist1 $blacklist2 ; do
+        n=`escape_non_alpha $n`
+        sed "s/|BLACKLISTITEM|/$n/g" $TMPL_EXTBLKLIST >> $WORKDIR/blacklist.TMP 
+    done
+    cat $TMPL_EXTBLKLISTFTR                               >> $WORKDIR/blacklist.TMP
+}
+
+# Creates the callthrough context which allows specified numbers to get
+# into the PBX and dial out as the configured user.
+pbx_add_callthrough()
+{
+    local callthrough_number_list
+    local defaultuser
+    local pin
+    local enabled
+    local F
+
+    config_get callthrough_number_list $1 callthrough_number_list
+    config_get defaultuser $1 defaultuser
+    defaultuser=`escape_non_alpha $defaultuser`
+    config_get pin $1 pin
+    pin=`escape_non_alpha $pin`
+    config_get enabled $1 enabled
+
+    [ "$enabled" = "no" ]   && return
+    [ "$defaultuser" = "" ] && return
+
+    for callthrough_number in $callthrough_number_list ; do
+        sed "s/|NUMBER|/$callthrough_number/g" $TMPL_EXTCTHRUCHECK >> $WORKDIR/callthroughcheck.TMP
+
+	if [ -n "$pin" ] ; then F=$TMPL_EXTCTHRU ; else F=$TMPL_EXTCTHRUNOPIN ; fi
+        sed "s/|NUMBER|/$callthrough_number/g" $F             |\
+                    sed "s/|DEFAULTUSER|/$defaultuser/"       |\
+                        sed "s/|PIN|/$pin/"                        >> $WORKDIR/callthrough.TMP
+    done
+}
+
+
+# Creates the callback context which allows specified numbers to get
+# a callback into the PBX and dial out as the configured user.
+pbx_add_callback()
+{
+    local callback_number_list
+    local defaultuser
+    local pin
+    local enabled
+    local callback_provider
+    local callback_hangup_delay
+    local FB
+    local FT
+
+    config_get callback_number_list $1 callback_number_list
+    config_get defaultuser $1 defaultuser
+    defaultuser=`escape_non_alpha $defaultuser`
+    config_get pin $1 pin
+    pin=`escape_non_alpha $pin`
+    config_get enabled $1 enabled
+    config_get callback_provider $1 callback_provider
+    callback_provider=`sub_underscore_for_non_alpha $callback_provider`
+    config_get callback_hangup_delay $1 callback_hangup_delay
+
+    [ "$enabled" = "no" ]   && return
+    [ "$defaultuser" = "" ] && return
+
+    # If the provider is a SIP provider, set the file to use to $TMPL_EXTCBACKSIP
+    # otherwise, set it to $TMPL_EXTCBACKGTALK
+    if echo $sip_outbound_providers | grep -q $callback_provider 2>/dev/null
+    then
+        FB=$TMPL_EXTCBACKSIP
+    else
+        FB=$TMPL_EXTCBACKGTALK
+    fi
+
+    for callback_number in $callback_number_list ; do
+        sed "s/|NUMBER|/$callback_number/g" $TMPL_EXTCBACKCHECK    >> $WORKDIR/callbackcheck.TMP
+
+        sed "s/|NUMBER|/$callback_number/g" $FB            |\
+            sed "s/|CALLBACKPROVIDER|/$callback_provider/" |\
+                sed "s/|CALLBACKHUPDELAY|/$callback_hangup_delay/" >> $WORKDIR/callback.TMP
+
+        # Perhaps a bit confusingly, we create "callthrough" configuration for callback
+        # numbers, because we use the same DISA construct as for callthrough.
+        if [ -n "$pin" ] ; then FT=$TMPL_EXTCTHRU ; else FT=$TMPL_EXTCTHRUNOPIN ; fi
+        sed "s/|NUMBER|/$callback_number/g" $FT            |\
+            sed "s/|DEFAULTUSER|/$defaultuser/"            |\
+                sed "s/|PIN|/$pin/"                                >> $WORKDIR/callthrough.TMP
+    done
+}
+
+
+# Creates sip.conf from its template.
+pbx_cook_sip_template()
+{
+    local useragent
+    local externhost
+    local bindport
+
+    config_get useragent advanced useragent
+    useragent=`escape_non_alpha $useragent`
+    config_get externhost advanced externhost
+    config_get bindport advanced bindport
+
+    [ -z "$useragent" ] && useragent="$USERAGENT"
+
+    sed "s/|USERAGENT|/$useragent/g" $TMPL_SIP  > $WORKDIR/sip.conf
+
+    if [ -z "$externhost" ] ; then
+        sed -i "s/externhost=|EXTERNHOST|//g" $WORKDIR/sip.conf
+    else
+        sed -i "s/|EXTERNHOST|/$externhost/g" $WORKDIR/sip.conf
+    fi
+
+    if [ -z "$bindport" ] ; then
+        sed -i "s/bindport=|BINDPORT|//g"     $WORKDIR/sip.conf
+    else
+        sed -i "s/|BINDPORT|/$bindport/g"     $WORKDIR/sip.conf
+    fi
+
+
+}
+
+# Creates rtp.conf from its template.
+pbx_cook_rtp_template()
+{
+    local rtpstart
+    local rtpend
+
+    config_get rtpstart advanced rtpstart
+    config_get rtpend   advanced rtpend
+
+    sed "s/|RTPSTART|/$rtpstart/" $TMPL_RTP |\
+            sed "s/|RTPEND|/$rtpend/"               > $WORKDIR/rtp.conf
+}
+
+# Links any sound files found in $PBXSOUNDSDIR and $VMSOUNDSDIR
+# into $ASTSOUNDSDIR for use by Asterisk. Does not overwrite files.
+pbx_link_sounds()
+{
+    mkdir -p $ASTSOUNDSDIR
+
+    for dir in $PBXSOUNDSDIR $VMSOUNDSDIR ; do
+        if [ -d $dir ] ; then
+            for f in $dir/* ; do
+                ln -s $f $ASTSOUNDSDIR 2>/dev/null
+            done
+        fi
+    done
+}
+
+
+# Makes sure the ownership of specified directories is proper.
+pbx_fix_ownership()
+{
+    chown $ASTUSER:$ASTGROUP    $ASTDIRS
+    chown $ASTUSER:$ASTGROUP -R $ASTDIRSRECURSIVE
+}
+
+
+# Creates voicemail config if installed and enabled.
+pbx_configure_voicemail()
+{
+    local enabled
+    local global_timeout
+    local global_email_addresses
+
+    local smtp_tls
+    local smtp_server
+    local smtp_port
+    local smtp_auth
+    local smtp_user
+    local smtp_password
+
+    config_get enabled global_voicemail enabled
+
+    # First check if voicemail is enabled.
+    [ "$enabled" != "yes" ] && return
+
+    config_get global_timeout         global_voicemail global_timeout
+    #config_get global_email_addresses global_voicemail global_email_addresses
+    config_get smtp_auth              voicemail_smtp   smtp_auth
+    config_get smtp_tls               voicemail_smtp   smtp_tls
+    config_get smtp_server            voicemail_smtp   smtp_server
+    config_get smtp_port              voicemail_smtp   smtp_port
+    config_get smtp_user              voicemail_smtp   smtp_user
+    smtp_user=`escape_non_alpha $smtp_user`
+    config_get smtp_password          voicemail_smtp   smtp_password
+    smtp_password=`escape_non_alpha $smtp_password`
+
+    sed "s/|AUTH|/$smtp_auth/"   $TMPL_MSMTPDEFAULT |\
+             sed "s/|TLS|/$smtp_tls/"               >  $WORKDIR/pbx-msmtprc
+
+    sed "s/|HOST|/$smtp_server/" $TMPL_MSMTPACCOUNT |\
+             sed "s/|PORT|/$smtp_port/"             >> $WORKDIR/pbx-msmtprc
+
+    if [ "$smtp_auth" = "on" ] ; then
+        sed "s/|USER|/$smtp_user/"  $TMPL_MSMTPAUTH |\
+             sed "s/|PASSWORD|/$smtp_password/"     >> $WORKDIR/pbx-msmtprc
+    fi
+
+    cat $TMPL_MSMTPACCTDFLT                         >> $WORKDIR/pbx-msmtprc
+
+    [ ! -f /etc/pbx-msmtprc ] && cp $WORKDIR/pbx-msmtprc /etc/pbx-msmtprc
+    cmp -s  $WORKDIR/pbx-msmtprc /etc/pbx-msmtprc 1>/dev/null \
+                                || mv $WORKDIR/pbx-msmtprc /etc/pbx-msmtprc
+    chmod 600                                              /etc/pbx-msmtprc
+    chown nobody                                           /etc/pbx-msmtprc
+
+    # Copy over the extensions file which has voicemail enabled.
+    cp $TMPL_EXTVMENABLED                $WORKDIR/extensions_voicemail.conf
+
+    # Create the voicemail directory in /tmp
+    mkdir -p     /tmp/voicemail
+    chown nobody /tmp/voicemail
+
+    # Create the recordings directory
+    mkdir -p     /etc/pbx-voicemail/recordings
+    chown nobody /etc/pbx-voicemail/recordings
+
+    # Working around a bug in libreCMC 12.09-rc1
+    # TODO: REMOVE AS SOON AS POSSIBLE
+    chmod ugo+w /tmp
+}
+
+
+start() {
+    mkdir -p $WORKDIR
+
+    # Create the users.
+    config_load ${MODULENAME}-users
+    config_foreach pbx_add_user local_user
+
+    # Create configuration for each google account.
+    config_unset
+    config_load ${MODULENAME}-google
+    config_foreach pbx_add_jabber gtalk_jabber
+
+    # Create configuration for each voip provider.
+    config_unset
+    config_load ${MODULENAME}-voip
+    config_foreach pbx_add_peer voip_provider
+
+    # Create the user contexts, callthroug/back, and phone blacklist.
+    config_unset
+    config_load ${MODULENAME}-calls
+    pbx_create_user_contexts
+    pbx_add_blacklist
+    config_foreach pbx_add_callthrough callthrough_numbers
+    config_foreach pbx_add_callback callback_numbers
+
+    # Prepare sip.conf using settings from the "advanced" section.
+    config_unset
+    config_load ${MODULENAME}-advanced
+    pbx_cook_sip_template
+    pbx_cook_rtp_template
+
+    # Prepare voicemail config.
+    config_unset
+    config_load ${MODULENAME}-voicemail
+    pbx_configure_voicemail
+
+    # Assemble the configuration, and copy changed files over.
+    config_unset
+    config_load ${MODULENAME}-advanced
+    pbx_assemble_and_copy_config
+
+    # Link sound files
+    pbx_link_sounds
+
+    # Enforce ownership of specified files and directories.
+    pbx_fix_ownership
+}
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE
new file mode 100644
index 00000000..ac543961
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/asterisk.conf.TEMPLATE
@@ -0,0 +1,17 @@
+[directories]
+astetcdir => /etc/asterisk
+astmoddir => /usr/lib/asterisk/modules
+astvarlibdir => /usr/lib/asterisk
+astdbdir => /usr/lib/asterisk
+astkeydir => /usr/lib/asterisk
+astdatadir => /usr/lib/asterisk
+astagidir => /usr/lib/asterisk/agi-bin
+astspooldir => /var/spool/asterisk
+astrundir => /var/run/asterisk
+astlogdir => /var/log/asterisk
+
+[options]
+languageprefix = yes
+dumpcore = no
+runuser = nobody
+rungroup = nogroup
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/delayedcallback b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/delayedcallback
new file mode 100755
index 00000000..903efe9a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/delayedcallback
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Check if there are more than one instance of this command
+# with the same command line running at the same time for some
+# reason, then quit. We are checking for the same
+# commandline in order to permit two different callback
+# attempts simultaneously.
+
+if ! grep -q "$@" /dev/shm/delayedcallback.[0-9]* 2>/dev/null
+then
+  echo "$@" > /dev/shm/delayedcallback.$$
+  sleep 25
+  asterisk -r -x "$1 $2 \"$3\" $4 $5 $6"
+  rm /dev/shm/delayedcallback.$$
+#  echo "`date` $@": >> /dev/shm/delayedcallback.log
+#else
+#  echo "`date` ERROR: There appears to be a callback attempt in progress to: $@" >> /dev/shm/delayedcallback.err
+fi
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE
new file mode 100644
index 00000000..c8966edd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions.conf.TEMPLATE
@@ -0,0 +1,25 @@
+[general]
+static = yes
+writeprotect = yes
+clearglobalvars = no
+
+[globals]
+RINGTIME => |RINGTIME|
+
+[default]
+
+[context-user-hangup-call-context]
+exten =>   s,1,Hangup()
+exten => _X.,1,Hangup()
+
+[context-catch-all]
+exten   => _[!-~].,1,Dial(SIP/${EXTEN},60,r)
+
+#include extensions_default.conf
+#include extensions_voicemail.conf
+#include extensions_incoming.conf
+#include extensions_incoming_gtalk.conf
+#include extensions_blacklist.conf
+#include extensions_callthrough.conf
+#include extensions_callback.conf
+#include extensions_user.conf
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE
new file mode 100644
index 00000000..54ee989b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist.conf.TEMPLATE
@@ -0,0 +1 @@
+exten => s,n,Gotoif($[ "${CALLERID(NUM)}" = "|BLACKLISTITEM|" ]?context-user-hangup,s,1)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE
new file mode 100644
index 00000000..da964f23
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_footer.conf.TEMPLATE
@@ -0,0 +1,2 @@
+exten => s,n,Goto(${SOURCECONTEXT},${SOURCEEXTEN},doneblacklist)
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE
new file mode 100644
index 00000000..de0e9846
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_blacklist_header.conf.TEMPLATE
@@ -0,0 +1,3 @@
+
+[blacklist-call-context]
+exten => s,1,Noop()
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE
new file mode 100644
index 00000000..06b1a4b6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check.conf.TEMPLATE
@@ -0,0 +1 @@
+exten => s,n,Gotoif($[ "${CALLERID(NUM)}" =~ ".*|NUMBER|" ]?context-user-callback,|NUMBER|,1)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE
new file mode 100644
index 00000000..282fe9e8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_footer.conf.TEMPLATE
@@ -0,0 +1,2 @@
+exten => s,n,Goto(${SOURCECONTEXT},${SOURCEEXTEN},donecallback)
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE
new file mode 100644
index 00000000..be289c4d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback-check_header.conf.TEMPLATE
@@ -0,0 +1,3 @@
+
+[callback-check-call-context]
+exten => s,1,Noop()
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE
new file mode 100644
index 00000000..43eec788
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_gtalk.conf.TEMPLATE
@@ -0,0 +1,4 @@
+exten => |NUMBER|,1,System(/etc/pbx-asterisk/delayedcallback "channel originate Gtalk/gtalk-|CALLBACKPROVIDER|/|NUMBER|@voice.google.com extension |NUMBER|@disa-call-context" &)
+exten => |NUMBER|,n,Wait(|CALLBACKHUPDELAY|)
+exten => |NUMBER|,n,Hangup()
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE
new file mode 100644
index 00000000..0b8fb4c2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_header.conf.TEMPLATE
@@ -0,0 +1 @@
+[context-user-callback]
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE
new file mode 100644
index 00000000..300e9fa0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_callback_sip.conf.TEMPLATE
@@ -0,0 +1,4 @@
+exten => |NUMBER|,1,System(/etc/pbx-asterisk/delayedcallback "channel originate SIP/|NUMBER|@peer-|CALLBACKPROVIDER| extension |NUMBER|@disa-call-context" &)
+exten => |NUMBER|,n,Wait(|CALLBACKHUPDELAY|)
+exten => |NUMBER|,n,Hangup()
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE
new file mode 100644
index 00000000..35836e29
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default.conf.TEMPLATE
@@ -0,0 +1,11 @@
+[default-incoming-call-context]
+exten => s,1,NoOp(${CALLERID})
+exten => s,n,Set(SOURCECONTEXT=default-incoming-call-context)
+exten => s,n,Set(SOURCEEXTEN=s)
+exten => s,n,Goto(blacklist-call-context,s,1)
+exten => s,n(doneblacklist),NoOp()
+exten => s,n,Goto(callback-check-call-context,s,1)
+exten => s,n(donecallback),NoOp()
+exten => s,n,Goto(disa-check-call-context,s,1)
+exten => s,n(donedisacheck),Dial(|LOCALUSERS|,${RINGTIME},r)
+exten => s,n,Goto(context-voicemail,s,1)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE
new file mode 100644
index 00000000..1910ff4d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_default_user.conf.TEMPLATE
@@ -0,0 +1 @@
+exten => |DEFAULTUSER|,1,Goto(default-incoming-call-context,s,1)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE
new file mode 100644
index 00000000..ba2379b7
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check.conf.TEMPLATE
@@ -0,0 +1 @@
+exten => s,n,Gotoif($[ "${CALLERID(NUM)}" =~ ".*|NUMBER|" ]?disa-call-context,|NUMBER|,1)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE
new file mode 100644
index 00000000..74056fa0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_footer.conf.TEMPLATE
@@ -0,0 +1 @@
+exten => s,n,Goto(${SOURCECONTEXT},${SOURCEEXTEN},donedisacheck)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE
new file mode 100644
index 00000000..e0d67b80
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-check_header.conf.TEMPLATE
@@ -0,0 +1,2 @@
+[disa-check-call-context]
+exten => s,1,Noop()
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE
new file mode 100644
index 00000000..74e48de8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa-nopin.conf.TEMPLATE
@@ -0,0 +1,5 @@
+exten => |NUMBER|,1,Noop()
+exten => |NUMBER|,n,Set(TIMEOUT(digit)=15)
+exten => |NUMBER|,n,Set(TIMEOUT(response)=40)
+exten => |NUMBER|,n,DISA(no-password,context-user-|DEFAULTUSER|)
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE
new file mode 100644
index 00000000..3dd8fa35
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa.conf.TEMPLATE
@@ -0,0 +1,6 @@
+exten => |NUMBER|,1,Noop()
+exten => |NUMBER|,n,Set(TIMEOUT(digit)=7)
+exten => |NUMBER|,n,Set(TIMEOUT(response)=21)
+exten => |NUMBER|,n,Authenticate(|PIN|)
+exten => |NUMBER|,n,DISA(no-password,context-user-|DEFAULTUSER|)
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE
new file mode 100644
index 00000000..a7422711
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_disa_header.conf.TEMPLATE
@@ -0,0 +1 @@
+[disa-call-context]
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE
new file mode 100644
index 00000000..3f9cf4c7
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk.conf.TEMPLATE
@@ -0,0 +1,15 @@
+exten => |USERNAME|,1,NoOp(${CALLERID})
+same => n,Set(CALLERID(name)=${CUT(CALLERID(name),@,1)})
+same => n,GotoIf($["${CALLERID(name):0:2}" != "+1"]?notrim)
+same => n,Set(CALLERID(name)=${CALLERID(name):2})
+same => n(notrim),Set(CALLERID(number)=${CALLERID(name)})
+same => n,Set(SOURCECONTEXT=context-incoming-gtalk)
+same => n,Set(SOURCEEXTEN=|USERNAME|)
+same => n,Goto(blacklist-call-context,s,1)
+same => n(doneblacklist),NoOp()
+same => n,Goto(callback-check-call-context,s,1)
+same => n(donecallback),NoOp()
+same => n,Goto(disa-check-call-context,s,1)
+same => n(donedisacheck),Dial(|LOCALUSERS|,${RINGTIME},D(:w11111111))
+same => n,Goto(context-voicemail,s,1)
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE
new file mode 100644
index 00000000..f6e44a5b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_gtalk_header.conf.TEMPLATE
@@ -0,0 +1 @@
+[context-incoming-gtalk]
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE
new file mode 100644
index 00000000..b2c3716b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_incoming_context_sip.conf.TEMPLATE
@@ -0,0 +1,12 @@
+
+[context-incoming-|NAME|]
+exten => s,1,NoOp(${CALLERID})
+exten => s,n,Set(SOURCECONTEXT=context-incoming-|NAME|)
+exten => s,n,Set(SOURCEEXTEN=s)
+exten => s,n,Goto(blacklist-call-context,s,1)
+exten => s,n(doneblacklist),NoOp()
+exten => s,n,Goto(callback-check-call-context,s,1)
+exten => s,n(donecallback),NoOp()
+exten => s,n,Goto(disa-check-call-context,s,1)
+exten => s,n(donedisacheck),Dial(|LOCALUSERS|,${RINGTIME},r)
+exten => s,n,Goto(context-voicemail,s,1)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE
new file mode 100644
index 00000000..45e87588
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_dial_local_user.conf.TEMPLATE
@@ -0,0 +1 @@
+exten =>     |DEFAULTUSER|,1,Dial(SIP/|DEFAULTUSER|,${RINGTIME},r)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE
new file mode 100644
index 00000000..259c2cea
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_gtalk.conf.TEMPLATE
@@ -0,0 +1,9 @@
+exten =>      _|NUMPREFIX|,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN}@voice.google.com,60)
+exten =>     _+|NUMPREFIX|,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN:1}@voice.google.com,60)
+exten =>     _|NUMPREFIX|.,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN}@voice.google.com,60)
+exten =>    _+|NUMPREFIX|.,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN:1}@voice.google.com,60)
+exten =>   _00|NUMPREFIX|.,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN:2}@voice.google.com,60)
+exten =>  _011|NUMPREFIX|.,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN:3}@voice.google.com,60)
+exten =>  _010|NUMPREFIX|.,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN:3}@voice.google.com,60)
+exten => _0011|NUMPREFIX|.,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN:4}@voice.google.com,60)
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE
new file mode 100644
index 00000000..1fa7713e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_gtalk.conf.TEMPLATE
@@ -0,0 +1,2 @@
+exten => |PATTERN|,1,Dial(Gtalk/gtalk-|NAME|/${EXTEN|SYMBOLSTOREMOVE|}@voice.google.com,60)
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE
new file mode 100644
index 00000000..178b6dea
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_pattern_sip.conf.TEMPLATE
@@ -0,0 +1 @@
+exten => |PATTERN|,1,Dial(SIP/${EXTEN|SYMBOLSTOREMOVE|}@peer-|NAME|,60,r)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE
new file mode 100644
index 00000000..9b1d9add
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_outgoing_sip.conf.TEMPLATE
@@ -0,0 +1,8 @@
+exten =>      _|NUMPREFIX|,1,Dial(SIP/${EXTEN}@peer-|NAME|,60,r)
+exten =>     _+|NUMPREFIX|,1,Dial(SIP/${EXTEN}@peer-|NAME|,60,r)
+exten =>     _|NUMPREFIX|.,1,Dial(SIP/${EXTEN}@peer-|NAME|,60,r)
+exten =>    _+|NUMPREFIX|.,1,Dial(SIP/${EXTEN:1}@peer-|NAME|,60,r)
+exten =>   _00|NUMPREFIX|.,1,Dial(SIP/${EXTEN:2}@peer-|NAME|,60,r)
+exten =>  _011|NUMPREFIX|.,1,Dial(SIP/${EXTEN:3}@peer-|NAME|,60,r)
+exten =>  _010|NUMPREFIX|.,1,Dial(SIP/${EXTEN:3}@peer-|NAME|,60,r)
+exten => _0011|NUMPREFIX|.,1,Dial(SIP/${EXTEN:4}@peer-|NAME|,60,r)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE
new file mode 100644
index 00000000..a2ba28c0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_footer.conf.TEMPLATE
@@ -0,0 +1,2 @@
+include => context-voicemail-record-greeting
+include => context-catch-all
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE
new file mode 100644
index 00000000..5931eaf2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_user_context_header.conf.TEMPLATE
@@ -0,0 +1,3 @@
+
+[context-user-|DEFAULTUSER|]
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE
new file mode 100644
index 00000000..be23c294
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_disabled.conf.TEMPLATE
@@ -0,0 +1,4 @@
+[context-voicemail-record-greeting]
+
+[context-voicemail]
+exten =>     s,1,Hangup()
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE
new file mode 100644
index 00000000..4edd9cb4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/extensions_voicemail_enabled.conf.TEMPLATE
@@ -0,0 +1,27 @@
+[context-voicemail-record-greeting]
+exten =>     *789,1,Wait(1)
+exten =>     *789,n,Playback(/etc/pbx-voicemail/recordings/greeting)
+exten =>     *789,n,Wait(1)
+exten =>     *789,n,Playback(beep)
+exten =>     *789,n,Playback(beep)
+exten =>     *789,n,WaitExten(30)
+
+exten =>     t,1,Playback(vm-goodbye)
+exten =>     t,n,Wait(2)
+exten =>     t,n,Hangup()
+
+exten =>     *,1,Playback(beep)
+exten =>     *,n,Playback(beep)
+exten =>     *,n,Record(/tmp/voicemail/greeting:gsm,20,120,k)
+exten =>     *,n,Wait(1)
+exten =>     *,n,Playback(/tmp/voicemail/greeting)
+
+exten =>     h,1,System(/etc/pbx-voicemail/pbx-move-greeting &)
+
+[context-voicemail]
+exten =>     s,1,Wait(2)
+exten =>     s,2,Playback(/etc/pbx-voicemail/recordings/greeting)
+exten =>     s,3,Wait(2)
+exten =>     s,n,Record(/tmp/voicemail/voicemail%d:WAV,20,180,k)
+
+exten =>     h,1,System(/etc/pbx-voicemail/pbx-send-voicemail '${RECORDED_FILE}.WAV' '${CALLERID(all)}' &)
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE
new file mode 100644
index 00000000..4f07a716
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/gtalk.conf.TEMPLATE
@@ -0,0 +1,10 @@
+[general]
+context=context-incoming-gtalk
+allowguest=yes
+allowguests=yes
+bindaddr=0.0.0.0
+
+[guest]
+disallow=all
+allow=ulaw
+context=context-incoming-gtalk
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE
new file mode 100644
index 00000000..d7088db7
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/indications.conf.TEMPLATE
@@ -0,0 +1,733 @@
+; indications.conf
+; Configuration file for location specific tone indications
+; used by the pbx_indications module.
+;
+; NOTE:
+;    When adding countries to this file, please keep them in alphabetical
+;    order according to the 2-character country codes!
+;
+; The [general] category is for certain global variables.
+; All other categories are interpreted as location specific indications
+;
+;
+[general]
+country=us		; default location
+
+
+; [example]
+; description = string
+;      The full name of your country, in English.
+; alias = iso[,iso]*
+;      List of other countries 2-letter iso codes, which have the same
+;      tone indications.
+; ringcadence = num[,num]*
+;      List of durations the physical bell rings.
+; dial = tonelist
+;      Set of tones to be played when one picks up the hook.
+; busy = tonelist
+;      Set of tones played when the receiving end is busy.
+; congestion = tonelist
+;      Set of tones played when there is some congestion (on the network?)
+; callwaiting = tonelist
+;      Set of tones played when there is a call waiting in the background.
+; dialrecall = tonelist
+;      Not well defined; many phone systems play a recall dial tone after hook
+;      flash.
+; record = tonelist
+;      Set of tones played when call recording is in progress.
+; info = tonelist
+;      Set of tones played with special information messages (e.g., "number is
+;      out of service")
+; 'name' = tonelist
+;      Every other variable will be available as a shortcut for the "PlayList" command
+;      but will not be used automatically by Asterisk.
+;
+;
+; The tonelist itself is defined by a comma-separated sequence of elements.
+; Each element consist of a frequency (f) with an optional duration (in ms)
+; attached to it (f/duration). The frequency component may be a mixture of two
+; frequencies (f1+f2) or a frequency modulated by another frequency (f1*f2).
+; The implicit modulation depth is fixed at 90%, though.
+; If the list element starts with a !, that element is NOT repeated,
+; therefore, only if all elements start with !, the tonelist is time-limited,
+; all others will repeat indefinitely.
+;
+; concisely:
+;   element = [!]freq[+|*freq2][/duration]
+;   tonelist = element[,element]*
+;
+; Please note that SPACES ARE NOT ALLOWED in tone lists!
+;
+
+[at]
+description = Austria
+ringcadence = 1000,5000
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+dial = 420
+busy = 420/400,0/400
+ring = 420/1000,0/5000
+congestion = 420/200,0/200
+callwaiting = 420/40,0/1960
+dialrecall = 420
+; RECORDTONE - not specified
+record = 1400/80,0/14920
+info = 950/330,1450/330,1850/330,0/1000
+stutter = 380+420
+
+[au]
+description = Australia
+; Reference http://www.acif.org.au/__data/page/3303/S002_2001.pdf
+; Normal Ring
+ringcadence = 400,200,400,2000
+; Distinctive Ring 1 - Forwarded Calls
+; 400,400,200,200,400,1400
+; Distinctive Ring 2 - Selective Ring 2 + Operator + Recall
+; 400,400,200,2000
+; Distinctive Ring 3 - Multiple Subscriber Number 1
+; 200,200,400,2200
+; Distinctive Ring 4 - Selective Ring 1 + Centrex
+; 400,2600
+; Distinctive Ring 5 - Selective Ring 3
+; 400,400,200,400,200,1400
+; Distinctive Ring 6 - Multiple Subscriber Number 2
+; 200,400,200,200,400,1600
+; Distinctive Ring 7 - Multiple Subscriber Number 3 + Data Privacy
+; 200,400,200,400,200,1600
+; Tones
+dial = 413+438
+busy = 425/375,0/375
+ring = 413+438/400,0/200,413+438/400,0/2000
+; XXX Congestion: Should reduce by 10 db every other cadence XXX
+congestion = 425/375,0/375,420/375,0/375
+callwaiting = 425/200,0/200,425/200,0/4400
+dialrecall = 413+438
+; Record tone used for Call Intrusion/Recording or Conference
+record = !425/1000,!0/15000,425/360,0/15000
+info = 425/2500,0/500
+; Other Australian Tones
+; The STD "pips" indicate the call is not an untimed local call
+std = !525/100,!0/100,!525/100,!0/100,!525/100,!0/100,!525/100,!0/100,!525/100
+; Facility confirmation tone (eg. Call Forward Activated)
+facility = 425
+; Message Waiting "stutter" dialtone
+stutter = 413+438/100,0/40
+; Ringtone for calls to Telstra mobiles
+ringmobile = 400+450/400,0/200,400+450/400,0/2000
+
+[bg]
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+description = Bulgaria
+ringcadence = 1000,4000
+;
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/250,0/250
+callwaiting = 425/150,0/150,425/150,0/4000
+dialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+record = 1400/425,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+stutter = 425/1500,0/100
+
+[br]
+description = Brazil
+ringcadence = 1000,4000
+dial = 425
+busy = 425/250,0/250
+ring = 425/1000,0/4000
+congestion = 425/250,0/250,425/750,0/250
+callwaiting = 425/50,0/1000
+; Dialrecall not used in Brazil standard (using UK standard)
+dialrecall = 350+440
+; Record tone is not used in Brazil, use busy tone
+record = 425/250,0/250
+; Info not used in Brazil standard (using UK standard)
+info = 950/330,1400/330,1800/330
+stutter = 350+440
+
+[be]
+description = Belgium
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,3000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/3000
+congestion = 425/167,0/167
+callwaiting = 1400/175,0/175,1400/175,0/3500
+; DIALRECALL - not specified
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440"
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+info = 900/330,1400/330,1800/330,0/1000
+stutter = 425/1000,0/250
+
+[ch]
+description = Switzerland
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/200,0/200,425/200,0/4000
+; DIALRECALL - not specified
+dialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+; RECORDTONE - not specified
+record = 1400/80,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+stutter = 425+340/1100,0/1100
+
+[cl]
+description = Chile
+; According to specs from Telefonica CTC Chile
+ringcadence = 1000,3000
+dial = 400
+busy = 400/500,0/500
+ring = 400/1000,0/3000
+congestion = 400/200,0/200
+callwaiting = 400/250,0/8750
+dialrecall = !400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400
+record = 1400/500,0/15000
+info = 950/333,1400/333,1800/333,0/1000
+stutter = !400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400
+
+[cn]
+description = China
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+dial = 450
+busy = 450/350,0/350
+ring = 450/1000,0/4000
+congestion = 450/700,0/700
+callwaiting = 450/400,0/4000
+dialrecall = 450
+record = 950/400,0/10000
+info = 450/100,0/100,450/100,0/100,450/100,0/100,450/400,0/400
+; STUTTER - not specified
+stutter = 450+425
+
+[cz]
+description = Czech Republic
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+dial = 425/330,0/330,425/660,0/660
+busy = 425/330,0/330
+ring = 425/1000,0/4000
+congestion = 425/165,0/165
+callwaiting = 425/330,0/9000
+; DIALRECALL - not specified
+dialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425/330,0/330,425/660,0/660
+; RECORDTONE - not specified
+record = 1400/500,0/14000
+info = 950/330,0/30,1400/330,0/30,1800/330,0/1000
+; STUTTER - not specified
+stutter = 425/450,0/50
+
+[de]
+description = Germany
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+dial = 425
+busy = 425/480,0/480
+ring = 425/1000,0/4000
+congestion = 425/240,0/240
+callwaiting = !425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,!0/5000,!425/200,!0/200,!425/200,0
+; DIALRECALL - not specified
+dialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+; RECORDTONE - not specified
+record = 1400/80,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+stutter = 425+400
+
+[dk]
+description = Denmark
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = !425/200,!0/600,!425/200,!0/3000,!425/200,!0/200,!425/200,0
+; DIALRECALL - not specified
+dialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+; RECORDTONE - not specified
+record = 1400/80,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+; STUTTER - not specified
+stutter = 425/450,0/50
+
+[ee]
+description = Estonia
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+dial = 425
+busy = 425/300,0/300
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+; CALLWAIT not in accordance to ITU
+callwaiting = 950/650,0/325,950/325,0/30,1400/1300,0/2600
+; DIALRECALL - not specified
+dialrecall = 425/650,0/25
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+; INFO not in accordance to ITU
+info = 950/650,0/325,950/325,0/30,1400/1300,0/2600
+; STUTTER not specified
+stutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+
+[es]
+description = Spain
+ringcadence = 1500,3000
+dial = 425
+busy = 425/200,0/200
+ring = 425/1500,0/3000
+congestion = 425/200,0/200,425/200,0/200,425/200,0/600
+callwaiting = 425/175,0/175,425/175,0/3500
+dialrecall = !425/200,!0/200,!425/200,!0/200,!425/200,!0/200,425
+record = 1400/500,0/15000
+info = 950/330,0/1000
+dialout = 500
+
+
+[fi]
+description = Finland
+ringcadence = 1000,4000
+dial = 425
+busy = 425/300,0/300
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/150,0/150,425/150,0/8000
+dialrecall = 425/650,0/25
+record = 1400/500,0/15000
+info = 950/650,0/325,950/325,0/30,1400/1300,0/2600
+stutter = 425/650,0/25
+
+[fr]
+description = France
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1500,3500
+; Dialtone can also be 440+330
+dial = 440
+busy = 440/500,0/500
+ring = 440/1500,0/3500
+; CONGESTION - not specified
+congestion = 440/250,0/250
+callwait = 440/300,0/10000
+; DIALRECALL - not specified
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330
+stutter = !440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,440
+
+[gr]
+description = Greece
+ringcadence = 1000,4000
+dial = 425/200,0/300,425/700,0/800
+busy = 425/300,0/300
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/150,0/150,425/150,0/8000
+dialrecall = 425/650,0/25
+record = 1400/400,0/15000
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0
+stutter = 425/650,0/25
+
+[hu]
+description = Hungary
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1250,3750
+dial = 425
+busy = 425/300,0/300
+ring = 425/1250,0/3750
+congestion = 425/300,0/300
+callwaiting = 425/40,0/1960
+dialrecall = 425+450
+; RECORDTONE - not specified
+record = 1400/400,0/15000
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0
+stutter = 350+375+400
+
+[il]
+description = Israel
+ringcadence = 1000,3000
+dial = 414
+busy = 414/500,0/500
+ring = 414/1000,0/3000
+congestion = 414/250,0/250
+callwaiting = 414/100,0/100,414/100,0/100,414/600,0/3000
+dialrecall = !414/100,!0/100,!414/100,!0/100,!414/100,!0/100,414
+record = 1400/500,0/15000
+info = 1000/330,1400/330,1800/330,0/1000
+stutter = !414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,414
+
+
+[in]
+description = India
+ringcadence = 400,200,400,2000
+dial = 400*25
+busy = 400/750,0/750
+ring = 400*25/400,0/200,400*25/400,0/2000
+congestion = 400/250,0/250
+callwaiting = 400/200,0/100,400/200,0/7500
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330,0/1000
+stutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+
+[it]
+description = Italy
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+dial = 425/200,0/200,425/600,0/1000
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/400,0/100,425/250,0/100,425/150,0/14000
+dialrecall = 470/400,425/400
+record = 1400/400,0/15000
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0
+stutter = 470/400,425/400
+
+[lt]
+description = Lithuania
+ringcadence = 1000,4000
+dial = 425
+busy = 425/350,0/350
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/150,0/150,425/150,0/4000
+; DIALRECALL - not specified
+dialrecall = 425/500,0/50
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0
+; STUTTER - not specified
+stutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+
+[jp]
+description = Japan
+ringcadence = 1000,2000
+dial = 400
+busy = 400/500,0/500
+ring = 400+15/1000,0/2000
+congestion = 400/500,0/500
+callwaiting = 400+16/500,0/8000
+dialrecall = !400/200,!0/200,!400/200,!0/200,!400/200,!0/200,400
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330,0
+stutter = !400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400
+
+[mx]
+description = Mexico
+ringcadence = 2000,4000
+dial = 425
+busy = 425/250,0/250
+ring = 425/1000,0/4000
+congestion = 425/250,0/250
+callwaiting = 425/200,0/600,425/200,0/10000
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+record = 1400/500,0/15000
+info = 950/330,0/30,1400/330,0/30,1800/330,0/1000
+stutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+
+[my]
+description = Malaysia
+ringcadence = 2000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/400,0/200
+congestion = 425/500,0/500
+
+[nl]
+description = Netherlands
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+ringcadence = 1000,4000
+; Most of these 425's can also be 450's
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/250,0/250
+callwaiting = 425/500,0/9500
+; DIALRECALL - not specified
+dialrecall = 425/500,0/50
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+stutter = 425/500,0/50
+
+[no]
+description = Norway
+ringcadence = 1000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/200,0/600,425/200,0/10000
+dialrecall = 470/400,425/400
+record = 1400/400,0/15000
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0
+stutter = 470/400,425/400
+
+[nz]
+description = New Zealand
+;NOTE - the ITU has different tonesets for NZ, but according to some residents there,
+;      this is, indeed, the correct way to do it.
+ringcadence = 400,200,400,2000
+dial = 400
+busy = 400/250,0/250
+ring = 400+450/400,0/200,400+450/400,0/2000
+congestion = 400/375,0/375
+callwaiting = !400/200,!0/3000,!400/200,!0/3000,!400/200,!0/3000,!400/200
+dialrecall = !400/100!0/100,!400/100,!0/100,!400/100,!0/100,400
+record = 1400/425,0/15000
+info = 400/750,0/100,400/750,0/100,400/750,0/100,400/750,0/400
+stutter = !400/100!0/100,!400/100,!0/100,!400/100,!0/100,!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400
+unobtainable = 400/75,0/100,400/75,0/100,400/75,0/100,400/75,0/400
+
+[ph]
+
+; reference http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+
+description = Philippines
+ringcadence = 1000,4000
+dial = 425
+busy = 480+620/500,0/500
+ring = 425+480/1000,0/4000
+congestion = 480+620/250,0/250
+callwaiting = 440/300,0/10000
+; DIALRECALL - not specified
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+; INFO - not specified
+info = !950/330,!1400/330,!1800/330,0
+; STUTTER - not specified
+stutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+
+
+[pl]
+description = Poland
+ringcadence = 1000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/500,0/500
+callwaiting = 425/150,0/150,425/150,0/4000
+; DIALRECALL - not specified
+dialrecall = 425/500,0/50
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+; 950/1400/1800 3x0.33 on 1.0 off  repeated 3 times 
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000
+; STUTTER - not specified
+stutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+
+[pt]
+description = Portugal
+ringcadence = 1000,5000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/5000
+congestion = 425/200,0/200
+callwaiting = 440/300,0/10000
+dialrecall = 425/1000,0/200
+record = 1400/500,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+stutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+
+[ru]
+; References:
+;	http://www.minsvyaz.ru/site.shtml?id=1806
+;	http://www.aboutphone.info/lib/gost/45-223-2001.html
+description = Russian Federation / ex Soviet Union
+ringcadence = 1000,4000
+dial = 425
+busy = 425/350,0/350
+ring = 425/1000,0/4000
+congestion = 425/175,0/175
+callwaiting = 425/200,0/5000
+record = 1400/400,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+dialrecall = 425/400,0/40
+stutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+
+[se]
+description = Sweden
+ringcadence = 1000,5000
+dial = 425
+busy = 425/250,0/250
+ring = 425/1000,0/5000
+congestion = 425/250,0/750
+callwaiting = 425/200,0/500,425/200,0/9100
+dialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+record = 1400/500,0/15000
+info = !950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,0
+stutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+; stutter = 425/320,0/20        ; Real swedish standard, not used for now
+
+[sg]
+description = Singapore
+; Singapore
+; Reference: http://www.ida.gov.sg/idaweb/doc/download/I397/ida_ts_pstn1_i4r2.pdf 
+; Frequency specs are:   425 Hz +/- 20Hz; 24 Hz +/- 2Hz; modulation depth 100%; SIT +/- 50Hz
+ringcadence = 400,200,400,2000
+dial        = 425
+ring        = 425*24/400,0/200,425*24/400,0/2000     ; modulation should be 100%, not 90%
+busy        = 425/750,0/750
+congestion  = 425/250,0/250
+callwaiting = 425*24/300,0/200,425*24/300,0/3200
+stutter     = !425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,425
+info        = 950/330,1400/330,1800/330,0/1000       ; not currently in use acc. to reference
+dialrecall  = 425*24/500,0/500,425/500,0/2500        ; unspecified in IDA reference, use repeating Holding Tone A,B
+record      = 1400/500,0/15000                       ; unspecified in IDA reference, use 0.5s tone every 15s
+; additionally defined in reference
+nutone      = 425/2500,0/500
+intrusion   = 425/250,0/2000
+warning     = 425/624,0/4376                         ; end of period tone, warning
+acceptance  = 425/125,0/125
+holdinga    = !425*24/500,!0/500                     ; followed by holdingb
+holdingb    = !425/500,!0/2500
+
+[th]
+description = Thailand
+ringcadence = 1000,4000
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+dial = 400*50
+busy = 400/500,0/500
+ring = 420/1000,0/5000
+congestion = 400/300,0/300
+callwaiting = 1000/400,10000/400,1000/400
+; DIALRECALL - not specified - use special dial tone instead.
+dialrecall = 400*50/400,0/100,400*50/400,0/100
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+; INFO - specified as an announcement - use special information tones instead
+info = 950/330,1400/330,1800/330
+; STUTTER - not specified
+stutter = !400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,400
+
+[uk]
+description = United Kingdom
+ringcadence = 400,200,400,2000
+; These are the official tones taken from BT SIN350. The actual tones
+; used by BT include some volume differences so sound slightly different
+; from Asterisk-generated ones.
+dial = 350+440
+; Special dial is the intermittent dial tone heard when, for example,
+; you have a divert active on the line
+specialdial = 350+440/750,440/750
+; Busy is also called "Engaged"
+busy = 400/375,0/375
+; "Congestion" is the Beep-bip engaged tone
+congestion = 400/400,0/350,400/225,0/525
+; "Special Congestion" is not used by BT very often if at all
+specialcongestion = 400/200,1004/300
+unobtainable = 400
+ring = 400+450/400,0/200,400+450/400,0/2000
+callwaiting = 400/100,0/4000
+; BT seem to use "Special Call Waiting" rather than just "Call Waiting" tones
+specialcallwaiting = 400/250,0/250,400/250,0/250,400/250,0/5000
+; "Pips" used by BT on payphones. (Sounds wrong, but this is what BT claim it
+; is and I've not used a payphone for years)
+creditexpired = 400/125,0/125
+; These two are used to confirm/reject service requests on exchanges that
+; don't do voice announcements.
+confirm = 1400
+switching = 400/200,0/400,400/2000,0/400
+; This is the three rising tones Doo-dah-dee "Special Information Tone",
+; usually followed by the BT woman saying an appropriate message.
+info = 950/330,0/15,1400/330,0/15,1800/330,0/1000
+; Not listed in SIN350
+record = 1400/500,0/60000
+stutter = 350+440/750,440/750
+
+[us]
+description = United States / North America
+ringcadence = 2000,4000
+dial = 350+440
+busy = 480+620/500,0/500
+ring = 440+480/2000,0/4000
+congestion = 480+620/250,0/250
+callwaiting = 440/300,0/10000
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330,0
+stutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+
+[us-old]
+description = United States Circa 1950/ North America
+ringcadence = 2000,4000
+dial = 600*120
+busy = 500*100/500,0/500
+ring = 420*40/2000,0/4000
+congestion = 500*100/250,0/250
+callwaiting = 440/300,0/10000
+dialrecall = !600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,600*120
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330,0
+stutter = !600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,600*120
+
+[tw]
+description = Taiwan
+; http://nemesis.lonestar.org/reference/telecom/signaling/dialtone.html
+; http://nemesis.lonestar.org/reference/telecom/signaling/busy.html
+; http://www.iproducts.com.tw/ee/kylink/06ky-1000a.htm
+; http://www.pbx-manufacturer.com/ky120dx.htm
+; http://www.nettwerked.net/tones.txt
+; http://www.cisco.com/univercd/cc/td/doc/product/tel_pswt/vco_prod/taiw_sup/taiw2.htm
+;
+; busy tone 480+620Hz 0.5 sec. on ,0.5 sec. off
+; reorder tone 480+620Hz 0.25 sec. on,0.25 sec. off
+; ringing tone 440+480Hz 1 sec. on ,2 sec. off
+;
+ringcadence = 1000,4000
+dial = 350+440
+busy = 480+620/500,0/500
+ring = 440+480/1000,0/2000
+congestion = 480+620/250,0/250
+callwaiting = 350+440/250,0/250,350+440/250,0/3250
+dialrecall = 300/1500,0/500
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330,0
+stutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+
+[ve]
+; Tone definition source for ve found on 
+; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
+description = Venezuela / South America
+ringcadence = 1000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/250,0/250
+callwaiting = 400+450/300,0/6000
+dialrecall = 425
+record = 1400/500,0/15000
+info = !950/330,!1440/330,!1800/330,0/1000
+
+
+[za]
+description = South Africa
+; http://www.cisco.com/univercd/cc/td/doc/product/tel_pswt/vco_prod/safr_sup/saf02.htm
+; (definitions for other countries can also be found there)
+; Note, though, that South Africa uses two switch types in their network --
+; Alcatel switches -- mainly in the Western Cape, and Siemens elsewhere.
+; The former use 383+417 in dial, ringback etc.  The latter use 400*33
+; I've provided both, uncomment the ones you prefer
+ringcadence = 400,200,400,2000
+; dial/ring/callwaiting for the Siemens switches:
+dial = 400*33
+ring = 400*33/400,0/200,400*33/400,0/2000
+callwaiting = 400*33/250,0/250,400*33/250,0/250,400*33/250,0/250,400*33/250,0/250
+; dial/ring/callwaiting for the Alcatel switches:
+; dial = 383+417
+; ring = 383+417/400,0/200,383+417/400,0/2000
+; callwaiting = 383+417/250,0/250,383+417/250,0/250,383+417/250,0/250,383+417/250,0/250
+congestion = 400/250,0/250
+busy = 400/500,0/500
+dialrecall = 350+440
+; XXX Not sure about the RECORDTONE
+record = 1400/500,0/10000
+info = 950/330,1400/330,1800/330,0/330
+stutter = !400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,400*33
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE
new file mode 100644
index 00000000..cf71e1f8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber.conf.TEMPLATE
@@ -0,0 +1,4 @@
+[general]
+autoregister=yes
+
+#include jabber_users.conf
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE
new file mode 100644
index 00000000..3ee2463e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/jabber_users.conf.TEMPLATE
@@ -0,0 +1,8 @@
+[gtalk-|NAME|]
+type=client
+serverhost=talk.google.com
+username=|USERNAME|/Talk
+secret=|SECRET|
+timeout=150
+status=|STATUS|
+statusmessage=|STATUSMESSAGE|
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE
new file mode 100644
index 00000000..e5732501
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/logger.conf.TEMPLATE
@@ -0,0 +1,7 @@
+[general]
+queue_log = no
+event_log = no
+
+[logfiles]
+console => notice,warning,error
+messages => error
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE
new file mode 100644
index 00000000..2ac2f003
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/manager.conf.TEMPLATE
@@ -0,0 +1,7 @@
+[general]
+enabled = no
+
+port = 5038
+bindaddr = 0.0.0.0
+
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE
new file mode 100644
index 00000000..93c74336
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/modules.conf.TEMPLATE
@@ -0,0 +1,34 @@
+[modules]
+autoload=no
+load => res_jabber.so ; Used for Gtalk
+load => res_clioriginate.so ; originate calls from commandline
+load => res_rtp_asterisk.so ; rtp "engine" is now a loadable module in asterisk 1.8
+load => pbx_config.so ; Text Extension Configuration Requires N/A
+load => func_callerid.so ; Gets or sets Caller*ID data on the channel. - Requires ?
+load => func_channel.so
+load => func_logic.so ; Logic functions (if, etc.)
+load => func_strings.so ; string manipulation functions
+load => cdr_manager.so ; Asterisk Call Manager CDR Backend - Requires N/A
+load => chan_local.so ; Show status of local channels- Requires N/A
+load => chan_gtalk.so ; Use gtalk
+load => chan_sip.so ; Session Initiation Protocol (SIP) - Requires res_features.so
+load => codec_alaw.so ; A-law Coder/Decoder - Requires N/A
+load => codec_a_mu.so ; A-law and Mulaw direct Coder/Decoder - Requires N/A
+load => codec_gsm.so ; GSM/PCM16 (signed linear) Codec Translat - Requires N/A
+load => codec_ulaw.so ; Mu-law Coder/Decoder - Requires N/A
+load => format_gsm.so ; Raw GSM data - Requires N/A
+load => format_pcm.so ; Raw uLaw 8khz Audio support (PCM) - Requires N/A
+load => format_wav_gsm.so
+load => app_dial.so ; Dialing Application - Requires res_features.so, res_musiconhold.so
+load => app_parkandannounce.so ; Call Parking and Announce Application - Requires res_features.so
+load => app_playback.so ; Sound File Playback Application - Requires N/A
+load => app_record.so ; Sound File Record Application - Requires N/A
+load => app_system.so ; Execute a system command - Requires N/A
+load => app_disa.so ; Direct Inward System Access
+load => app_authenticate.so ; Authenticate via pin
+load => app_senddtmf.so ; Ability to send DTMF tones on the line.
+load => func_cut.so ; To manipulate strings
+load => func_timeout.so ; Used for DISA timeouts
+
+[global]
+chan_modem.so=no
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE
new file mode 100644
index 00000000..10d577d3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/rtp.conf.TEMPLATE
@@ -0,0 +1,6 @@
+[general]
+rtpstart=|RTPSTART|
+rtpend=|RTPEND|
+rtpchecksums=no
+dtmftimeout=3000
+rtcpinterval = 2000
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE
new file mode 100644
index 00000000..8f3b112f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip.conf.TEMPLATE
@@ -0,0 +1,39 @@
+[general]
+transport=udp
+context=default-incoming-call-context
+allowoverlap=yes
+allowtransfer=yes
+realm=asterisk
+bindaddr=0.0.0.0
+srvlookup=yes
+maxexpiry=600
+minexpiry=60
+defaultexpiry=300
+qualifyfreq=55
+disallow=all
+allow=ulaw
+allow=alaw
+dtmfmode = inband
+alwaysauthreject = yes
+t1min=100
+timert1=500
+timerb=16000
+rtptimeout=600
+rtpkeepalive=30
+useragent=|USERAGENT|
+localnet=192.168.0.0/16
+localnet=10.0.0.0/8
+localnet=172.16.0.0/12
+nat=yes
+directmedia=no
+sipdebug=no
+bindport=|BINDPORT|
+externhost=|EXTERNHOST|
+externrefresh=60
+
+#include sip_registrations.conf
+
+[authentication]
+
+#include sip_peers.conf
+#include sip_users.conf
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE
new file mode 100644
index 00000000..30abaadd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_peer.TEMPLATE
@@ -0,0 +1,13 @@
+
+[peer-|NAME|]
+type          = peer
+defaultuser   = |DEFAULTUSER|
+fromuser      = |FROMUSER|
+secret        = |SECRET|
+host          = |HOST|
+fromdomain    = |FROMDOMAIN|
+context       = context-incoming-|NAME|
+insecure      = port,invite
+qualify       = 2000
+|PORT|
+|OUTBOUNDPROXY|
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE
new file mode 100644
index 00000000..e139d43f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_registration.TEMPLATE
@@ -0,0 +1,2 @@
+register => |DEFAULTUSER|:|SECRET|@peer-|NAME|
+
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE
new file mode 100644
index 00000000..61a8b0b8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sip_user.TEMPLATE
@@ -0,0 +1,11 @@
+
+[|DEFAULTUSER|]
+fullname     = |FULLNAME|
+defaultuser  = |DEFAULTUSER|
+secret       = |SECRET|
+hassip       = yes
+hasvoicemail = no
+host         = dynamic
+type         = friend
+context      = context-user-|CONTEXTNAME|
+qualify      = no
\ No newline at end of file
diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm
new file mode 100644
index 0000000000000000000000000000000000000000..83fe27ecfa4dd332504f40dcbd43ddbb812d3d38
GIT binary patch
literal 8943
zcmWl9XH*ji)3vL(E0%SoSV&Mw0twXyp;%TaA)yHgJw&9}#HA~UB28LQLMNc6(osqh
zin7!sR3!~af&xkCSk|(;uD;Lb_v@ZHXU?7ZbI;73Gm@oS>(%Z%p!!4(m@t4)#9JG;
zT}H}Cj==2ea5)LSJWG!%SBQ34LrNOtMVFl+L>_o?#}8mH%q=36cn)OFuv90fFM|in
zwS=Tlt$_r@nn&vxfZ6*G`Yrc4TErK&5Q7e6ls2YEF;(#gxC+;&fM?qr-&Wba_e9BA
z(&#bKW{%4Fu4x$9gR|VXpG}Sbw3Ifczrbt~-<t3PlnhsjqjPkNSbSA>1Sd1a)dK2d
zu+;vm+k&aXLec@Q2scL&w`5o6B*dDA<iozkZJ2d1gygs_OJE82&5bc~>@!=Hcq?(f
z48Q;9#u=X4yjhY_{tI9X-k`p~y!EkL;!<vEjW{a(*ksfJSYSDlPIl@GKo?V|_J?+l
z!@pL?GKC*R0?~S%cFvgDB^rKQ5t8@$W}~on6iFA7J9m|$`V=`AgM=I99zMfPw$!HU
z3&ZOB&bw88EkPL?b#-nGH6jbXcNYr7Zm*C-8`A(zJ^s@US3qq((Id8JQm6Et-$VH_
zB63l*>_y0)VJsaF_gxS9Wp3MK>|(u1m*@kV9Oe2&PB0A-2id>Pp^S6adJQ!bU<XeY
zg!U^Ms*-|(I}=>^tZ2)l;%nY!yOOx$FeLxoQ+_V_stcywi6hVNmZXgG=?@N6h-<x#
zvfiOMnt#ESw^mSE__5p%Fsr4wry$PH9ZPqtFk-1&Q&t-7;LcVjRu2j;D!H_r7HYnH
zz9O&3Uexc(07(21M(RDIHWUI+kv94a%Ig-Sja>CYTk52Zm@A?iM<mBw-{x}^PNKup
z9UN5m<6`*ot;|m$NvD9fsL$4U`5<x4#kUhIRrebH4W@IYK>Y7e)H{3aPj=U@ZR_*z
zw;CzM*oz;Xw|5^5IfHn<J)ELt@v?qfVY~6#yfVdZZUXg`E_{uMpKP~-MQh9jbTI6d
ziBH|xww$W+11|5cgv5C4!wK{rw-vp;Jpacb{aDG4e?19SvbmGCz0V}u8z)&oC2L~Q
zLcj(l_z7DWmyRjOU~Z<u#q<nL=pO+UZx@{&Wf`8Cf8Ros^{Be#@hGT!;~`yfcU?tJ
z1GOEx)xp))#;uX07Nft)RlE1-d_-17M2^?KMIQHT0^_QR>AvHR*J7c+&TrT_KB~%V
zjfrnEu4)>W{gIM5xupqw&?_izWy-&p)8`m~6BAjk%x@)*fZUd=VAGMhsTf2pv3_}G
ztaKaJFPl|@BPJij%xhqJjOW$YGE*88Dh*Eq#eLe#1<!E3$c0(Z**AhZSoYg-C}ew2
z*4;(}CGD4-e%8@>228)D&PpJ`IR`HLgf~*_#$DPNq7$PZjaGK+Otv0Lm)Mu5#Xcbj
z3|T>C;|$!37E*>g=qaI~i#%X!@V}%&-~f0`6VvB4gJ)eA4N&HU2B#hb4{B?ne@Pyp
z0BnhtnqfQs`nY~dXU3Fubb&u;f&KicEPQ}IKlSzdI0X#B+sI-wSm&b8%I7*Wy?3q-
zqX>dPcXa&@&pzMMVw(2<HPCI}OgdmM{vJ99vO7plj=HQ>;ecz|ebwbO<>yx`_~t$J
zhF+-oWrwdM@o`*?)JHvE^?^$E9^+LK8K9=I-i_^%*5(Mq!&7{yILKvF)_mW)1;Ehr
zp~+43QHOl8<3E(U)cJ7Py?C0gM9(=;=4YrMYlQ0cGh}|wn}B9)92S=y@OsMk4E5ML
zE?IOg-Sks;l(~*Cb~Z@p#n!)IjSO|R*>aq^Z*4-4hBz=pwv5x)o$z>(*j*2KYdU(N
zEBw{*qF#@_@ZWujhJHe72yOYg%376cUo)b*LKx$i1kl-Ka0k`+P=cDtX5nnGlT(Oj
zxoulb6CO^Pe|&$is-NcT|FkW{&+c1eSTKDK7C$zbn{&W`I0nd5XryoOR3e4dE+63Q
zYl>NjuSj3az#j2j8F}DE<Vqv#lDvY}&Bq|{Mv~Y2KeyS6Qf{qSKUF3|PaB9|Fcqc7
z<p;O@+sj)n7&v-?D_x=1soEsbYUiwdCBafgyg(+Kj4hZt1=q#)ZxoEkH(f3@-G|FX
zH%P}P>iC}L3HzeRhW!Ce`jA!UM5U`WwDK1pO(TaB!cYETg2jB86yJ0HH4j$n_IrSo
zJGA7M0-57h72avp5y9g&^k&0O^Gf}Lh5DoukH$bn*_EPgK2^|QyBTktD*RNkM47zb
zKra5X;J)e{?v9a0j-y3H0;D9%5hWjE9u|H{)vM0h^^sgmkq$MC0t;E1cf*`hK)=0y
z!M%DY2YN@CLOQOInrEqr`V*4MvzKjHYH=Ja%iLh^I1Dx>&RHr<>^NMLmMx)RCPLDO
zHBXEE9^N%fmJ+Ou?>Y<uAO7tp+!)T^7&PGM+c<&m+gp9U4GqgvHg7v1UcDM!h&N@A
z3O2|REjit9oY<+os6>XJRX17P)qQo@D&3v-+$)S#FQ#E%=RZ+(dpp_u&nvv@=YqzI
z9^np0>oJau2t-zj)nh?Rwj|!e;Optc;cM>@VatDXuhwid2=P5OQ^qW<Sl(?>s2f;T
zjVxFoqL!=HM;7DV%Bzu_Jz}@O>V1})?fs9$bXS^v_5E(S)9qu`P0oG^Bc;{ONZAW3
zVddU%T3v6cn35EZuH@4K-75Xd3mB*HM$4tV*@ck3wGUkX)ONF%i>c|+&a*}v8(v+{
zA56>w;`-}|JeYBcI<9bx?4_e_BwEIA<jx?`?}E+og)oEnbx?ib?*DTg;e{6QL!3>k
z?}`GG>g`3@`*&t+ZsgIan=azpliX&MCq86jr@uq4&xzSc|5-q>t)_noCu3#hhOYbK
z6nfQ1r<U5!<V}l;Aj^_#4(DX$Te8S#+u5wPi~g=%v&B<LX&n1`O%r#i82(N2`eF)s
z9m?`!!!K+j*~9S;_;)bwP{~{(CMT~j_vXhrn${^fCY)<W_%RO+uJ51m{=0?OZR_W>
z?4vy3e@mJ-yQK9_?lYpJd~`Vf=_u4QVe~gFs{23Uh^!N3rToi4D0y@dyoEJbTe!-L
z<gEJv+PedB_wR2TTb#i{BXN=A*M*O>6|?~E%L3Qtx$cpc=N=4l-@b1B@gAT%_h{)O
zg|nb3^t^x_i3BDmD}0$yEyAcA8^VDgxL>^$R#c_UnxG}%JhpS^M_q4sg`dMyNEBa&
z9aLM7Rq0?U)6BC7nE)S<hV2Af8mEtWcIrKoKL&es+J<N(Ujno2IJ&N*QejMI;C>tz
zj+IhRVENxl+=g{<zq-{F_h<&<&kwVlHAJUNn`-+u68~p3YK}8S2ury#oN*5j-%sx`
zVgO4lZA9@kD+`=Rdt=hsDxBIsk=o)NoY;POv^4;iz5jgmKCS<s0PHb=*RFHvJ-IdK
zI_??Za$s8o=myT%0bFdbDvBpDA${QpuO!>bK1RXUUmZLHl^>!Cpr-@x`$&eZlp<Di
z6AtIZ(Y(RZ>524SaP1fOK!;RL^|!GG$9CQ114JDKP;H#r7rGfDk~3N_E4Q1((Hj0u
zoNmFcnLPZAkO^BzD`mKK6tLS^AKS>&VR4PIhHzz^@#Hh24UGU_6*UKi1bf#Xa&0xi
z`ZC<baom5qc6mIK?n3w4RdEDEH3FlWl^{0cu=GzSng5`=e(HPIu0fH4Btr%)acl0M
zPZv@yM(g0Nu-Ah3sIa!*NK7ORH##=lE?Kx{+xf0*g!F2oH4HNZf)w@p?eiaC#CiK9
zcc08_e%KTH>iYbSj=Y6eEhAFU^?|9gugIFOC`d(eH;_NDuIq+Wh7Q_p#dRy@%oBd~
z+;nh;L}p+@N3n$et)OCucar;}k{hSFiv>q0V&?gG3)c@M|F88olE2xX#!+zj!|j_3
zXmk1E<a0^<AXv-{0gLL@&yQ1My}TOsFP<4Y(Y(IrpTqX6K3hlMYMQIW##s@CJ}wOH
zb%wsr9``8WU+7lj6>8GoM_b2TOtigji2lenoAfiXwlB0+K6Qo5i6h_rP=^^F4uS1z
zU5hIEsOYoHTMTye$|mtr6ARWTFNP^Pjd(|j;WDf`OqR};i7i6#{(j8JMa8T4Sf|KZ
z@0)d<&W-*Al&~|(Q{mcZBesaa*Z8klc{W<WSof1R@JJPwcV(j-1>`sz{1;ab5PeE*
ztl>m)mD}999(D7LiiChbb-t*;TJ{3fX%uG-75$YORUN3dKhmkZAW+>;7-u8;Q=Jom
z?@|UCa%&&KgrdX?K_&e>k<7=9+|OVt;?D;T44tMu95fi-eGpCTtrh;|aLgkFY#nIG
z>=@nk!K?C2_NYB#o%9sjKf=`aVEKujh9o`YjjWM1IGPbm)G6&6YJ?+P`KTsniVxq6
zx6BcngmfI0)U&mSqAj7(??9BdQW$RYQZ50;MAicf%(ld_&Ko5yd=Ll^)t$G$krOG!
zN%I`Q*JgF(%8_z(V}wxUvAy(~y0>~n@M6slir+Setl0jtA%3yFLe<bD$_!>=vOmu+
z{{+3uf(T!q<OrtlJzIJnMjjHytsv(=^2132m@BI!abRm9Ypmer;4c~-J;3(^s$1^B
zqOB)#3p24)07IOaPt2GB5JrvP4s5lU8r9u8S&!*(^b5LPB`iN$D}W;4ekmt=w@%fF
zZ!WTx6%lH+8B8f@<kRhp1+AQA#g7sl=-wwvWsRJEJEH*`k5DKFHq9R*J+Ce9+f}+L
z6)-NW3#tZ2&<Pi{atHci;*7k}1Jz|jSCjVx4j@;^7l9HJSCu_rc%lyZqdV<=Gs}09
z2W~S^_6r$L0Dx4irx21rDcKqTVGDhZWo9^fvbYP21II$zdEtvEZRrKpV6lE7Lz=h<
zmyx{X(#!Cz4uo`VharT(iVe8z2adLqi=Q;%D2Y$bhvK`1=#x%ccphZ=vIDrn8aH&=
zKuB^?h-qXx&Htn!1kW>mw!;tDVWliTi2@VZvaSJ?F|iROTJAHfZoh1`&@NFvTZGF?
ztbq@AAZ2lm5XlZlK)fGN{CJomO+5*hbs!a6*DXzoQ2_%xtO3LxaAJlvu-Hj138`7p
z^Utu_Bv=Bj?LaDt-SQ`wQ92~wnyr(LU=mU$QKd%8DhA*S#g>r73=|mO0~S3AGmf{C
zDF;xYBn!=1l|L>By@-P3TZZNRAdT(`ZFvG$l*~e?PprWN_~!g-mO#6bj)D-Z(|lg4
z#cVf+x{uR{CZ<_=ZPv;5=9S`O*|HFH>&xVZ%uUk1p1<(0+TvD@w4F_sZ~X}@>8cYx
zdUPVHZuj47qwKo1^;^J03@BNDUaZmamdqGG&t~`vuRWzUl6Pg_f*;dZ*XIp2^2uur
z4tq<wU#vGIfs)t?(PR9obaRhEHOb-iYNSDFG5+cs7bqa^7C_O`r}=<MpS^DWPE=}q
zL3StQ&;!HxYhQ9_#$q4DMw!=U8CpjXE0wdl`o>yA%^h;*vAuViCXN)FOZ$v|*CfDS
z+-yR4=HHZws}Tet3o4oZRHICS5o1v(VB2Vg?C{^aR@TG;M1!xw`Q#hGM*DAN77j~H
z+S+8yC~Rie|IV2gy^RTT42^GiC)B;0qWy@rBPRbpbQE|n<lnA^X)1zt?rC<If-9TW
zlL{!6ANN;gHpS>zQA2j^+4i^~AGPJh^mO%<f|0V@-Etu);<GA<DuYDkzYDU>G`m#w
zym;hN>BZ-@gLd8@O%>+_5#^tiA9fu%*1t=qMA7}l41OnQm;<mmcp${CSGT>JC!*SO
z$UKK=!M-$|&|#KILHHjv%b0VNIybo;|NYeLuXAq;(fjIE7Ps>aw%^&UIQ98nuBA<!
zH%;)k?>GjE8x5St7dZvAFmem~5JiQNGQIV%fPozN(>T(bA_jlgcct%KTcMk0_z151
z0Iq>F%+O1B5%L_oAYzjFy9n6(nYnF|(j^{4Lz*k%Wk+XSddyup7osMtYD1*U6apfh
z0OyNVaP6Wb;#U#gGByR(fj)6bddmfV+mF4RZuW&nunZPM!}W#f##Zvge`;Q!`0Jm~
z0SBFX6k&YX-NIBA0jVoq!>yC<@o#BFAOAkM1remrYi322d@nF~mBkPACvqyq^`0Gj
zhn*3!s1)$<K8{Yhjqo0_;du{CnaTUN&(vC75JkW{O+(*k;v4lBLEy_b?)vkCpUK&y
zN5_X8%^rH{35;?L{WGb?+a4pXc|%fJ`vHTOL3L+nN4qKporX?H--{?QVWfwdBSRIk
za}R7Eve4ILbiIb9I{`kkjB~%WPTiO{NjS3GX9D(b>op*H!e4`Ixj%VL3?QkHq6uCi
zac7%Ye!;ltrSo=`{&`k%!ym~%3!k-_Snqr5t(${toGj|onth|$JejpOdDG0{Tvo*C
zR!a-tVSC-&x1O%U`cBWQOU}$Ls5MWFj@ZqA255|M$DP}+#pXcvY!>!TjD>tWUR}YQ
z*W2|@n(qL8T~smoGAgCXwQHp?9JkliaEnOehlXEb&n>Clm=V(Qmb}hie=y8H1vU6M
zn}Z=I^`@4tdTtYo6|;f52@~ZEq*<%KT4g=_V**`Poug>KLH1vD{!=H(S0sLnFrM--
z>X(%u<Q{xG;E>f8Ez;V7ifCzUu-?-WTPz8`AYAZrcD!(=(cjBSG8+xwY;_thUFRA5
z8Feq0G6KYno)hv;V^4)ysuX89PA2$CaSX>Ry(5oE4Tsc-M<+y^E-xDcqY}5`t#w}5
zso&}cs0R&KeQPpT46C!i@t4X(O)j&yhPj5oZSVIrjGCONt^+~Tb&PiKWDwo@bd$B0
zXw`ML@z2p@`K79`Ai7^ptRgx{)d-9p%c;uE`<ZwaD1lfgN`e$$oX78L2JwBa$03zL
zd(llVtdxVOZei0Wx+EBWYVV*EcLC2!t<Bfb#ScV>s1ribj)0IT$5gyEKterkxo=n<
zDaNn>fiRZ7(X{9VG*@n;-shd$<lts?Z<eBauBdO%-$0L{O`PK8V6}H64n?ym>6Woj
zMnzxXKaNFi3C`FE$3y9oh0d@c6)|t)X_#Av^s?A1;z$U(e_4$6Nh$JxhKJ>2R33Y5
zvP*c%I^?)!$y6vAX`@M)j}h0pr4+70Z8XCd;#3aTg_s-ns_oUVwcGaI^vp->NN=HT
zv4KX%l}rz;AGR$h92{-fI`mT`fcT3(f6#}H)S?Rl9~r27F5zO@yXx8&yBJdq+sRKx
z<m_SGpC{**iI(T)W3U=n?D81sa%GZN=6C(P%A`_#kGC!4kc0?!=cV5r=NmA4h3-X6
zMRHInI)C@Vl!L2#-ceC;Z`I<~0%f-=RPx3iDsq46Tj0vNT~=(hkguOw(}GZ4=@Zo<
z>Fd9K>zqAl7bx2_gu*nV7ClftzTRV=v?$b$8kY(WXU}CcM>-pfE~Q`)6fnkgs)+Ad
za|o5*4Gq_Htv}U`^e-%-*9#0=nYP~C{~LF+uY0sJW`42@Qk6COF|nJBrv6R)qoZ!7
znNc@Mr~G@?nvSF2yQ2iN0~l8b0cIm~48<hs!BOSRcAXx;<EL3UQ6i)TT{Vfe70`nE
zmC<Y=En~Els~`&^vg7?Q1I=^A$a`Kx_3|mM5M#%(DMu`Ot#H6ZUW0fuI3x=*W%Z`m
zT;$a>z}mK&#;hIm%onYC5e$JUZk@O(t$81YUr&C__QVwC>%`B=F($sU6pjYNL?TP*
z7K%;Mq6M@D4ltY0N{dF)Qh5Hf6@5tYp0}7-wk)MvDvBi^AErg@^(0q3qriNMN(3)4
z`Z^>|>}mSw(b0;nc0p5O81}WkmH<!q-Z0W4%kjPKWw*CEXFdW0+O6%vX%$3~8KGXF
zPGDqDsuxw8me&@G8H`bT8=j0=x>QymJ}fXIt4tWS$DF$mZ!mg=niW+)B4Z~~jS&Wv
z5*_cLHM33B?yA>|sP#8mZyJpJ4{fh#8-zj|`RmW_bqD{&fe4JtD7x&$3TcfCzMrDw
ziFabjpY#@afoenV;mPsl`Qq4%&iL{bYdqWWXP*L6?FW8o^vn7mx{$lK!T<B<0Z2^s
zi#I9Gl5eIQG{yyGgYN-g81R_F<FyzCVt(6hO7cM)oq$oQj^tOGVt6pAY88SRF+Aa1
zRm&L3Q=DrcN}e6?PQ#!$Ixmp5jJ*g2rdks-EKyNaQVb0!Zt}I3m>j4%&!CaD8lucG
zSw{e0FF(L6hiGN|BgYIXX4nXcxLH@y$%y>1dwr2H_HZC^{d5|t9vt^407EYXC5>x|
zVHazZ7}}9zJ(p-0wITZ9n*W%&BQctmon0_E80~m!78We1WzxF~-~cthp9u@UzDf*0
zd`!cYjkeSesL0WRd6TTc!uZj0lZtehDEF0f*{$Tz(ecB<N5Z;zK00p?*UoKsNz@n)
zr(o~8^^({6Mafn*?)9#IZnta&W2h>xw6k;3bZ?hCOfq=?i}2f{2by<VNT->cgs5KA
z*Ln7RWy7(vj56s&be^Sch4=EK>^^Og!Bz!bP(H)ej;4OA@Zi$sqOzozY3g4RRyAhX
zc6}c^x3!3Jy;)D})=T+U$4F2<YZxOgPhgJaWHD%H8ssIM6*besr+M+z+$VU)I#<+%
z$%V(AQiaxO9vuDn`aNOhN4lRmv1PSf*;_92tO{{dWEm3ely3N0$Can-gK@Ei{F-zJ
z#|QZp^1jeh`%Ev~5v91q74+G)47zXYri0tP+IgTJ7}O+=bMV$4Kd_sbLi8~vYN>Oi
zV&>xom!zh1@{)$_1f=gw%(_loqdvBbA0g^UU6<mW`hch;{TL&7r3bg}@tzqf^-FNX
z1ftIkwk1l5G4u~Zacizw0?XBD3X*<E2*c+%;ap%T%<<R_j)w3bdjmj_-GSHndEW+i
zN~{mgQ9giOWAa{qEZxP}#%rew;V$8NqapOlcKQ-eEpgNB0(m0T<}ZRJ;+4u$qfn(I
zOh&IS;X}Lo2<Lu|vxm26rC}4mgBoAqr73(f8Ijv1{8(y8NozFJ$@>mYFJw!vA>{W=
z;9rRi3-|G#0UqoH;roK^`6420xfuSRs2LWM|Cn61r6Y|_l`Xe40`RFap+$^}v@$-c
zN%$gv#N+Lc|6B9@4@jDpdO@K;4~|msuF#0&*I)@DS)cZ^=by{%`Wv0AHYYH6_0;i`
zFus8*Yza9v;YYLl@U(Q&kK5f_Q4RD9hri1|2J8&Aiv9c~LdYnUkvm7Fn@)WvacZe&
zB8=c=woI*C8JDKPcQ;^}yJlJwJ5Ks$&VO$^+Q9^wd?WDX>?_YWCFgaxODkn>EFiBw
zjObPe4;o-?zXSW9@b<fbKaMXpgdyNzBLjU5*F@b{Z4;`ch#jM+E6WmsGwO}5TH<@3
z?6z=m5h!=~=|?rR31C@EODmV3D~XQ4=nVBJQrFD248Lowo;3xFM)-{hu$XrHV8D&*
z^lDNc{_c{Wjss#PVM4Z}T4tPZ1}-HfE{p5SN+&!^c)-pMnTKm|b-%fs);b5)F$}@%
z3kY-j024>H0ty>ry>0y2^UX~NrsKg#pE1)1A^SIdHVTv;D1>OMsNTgVrV~<PVbi=f
zZEq7IxYcB@th{Q$%js*-S@?v=_&H6@tKl=a9c$WX+)wiump5#?$=r~#dUf7y6kjGZ
zDPlTce&JnA>;ck;c?X`uTf2VxqDZ!+ErPOT$x*RlY8nVM6xKz?kEVM;B5UpqwAS-u
zKo7FH9`AU765a`+>UIM9@zjW*iw7k;mfKUDZ?2+_mK!+omwzab;J7S0NerA+g;%<l
zrFvHzK;6rorj>aPM{75=lw7vB*{xdmh9OydzH1RX8{<a@4S*gv#=f`xP3FP5t-NBY
z6RoEsi0;}zjZ-czPkR@3T=6@eY~WcnXunwl04f(5{_iIY=Az>TMXNM~sARXL`-r7U
zhGAm$$^_UcKfpb24B=Hxn{DwZCI%P~rD#}1?<kvSllXw=)bzOc^5mUK-Wz-wea^@U
zy}!`SR6ozNxn^<-aD@ydO^?3H35ySYdb8U6Wz1}hQ^o#(SIGU*^N@-uZ?c7>s;#&I
zlRGP4EBdF%s7E4U22kv3wvqeIE=J4|TaN9uOsAaw)QqkN*G`{aOtxGV8zhD~kzLMY
zq0gt4wHzIfd!cyU#x0F=qc51TWzh*CVxutqU8T|8r0;x1$<KL*{wuDTHw2$(YNE{V
zH%coJYlyZ&=f_K62cyTk1ap)BDDYjYGL#P>pZ&d*aR68_v?ywIS(uUi^0y|zY^u}|
zt|+bdmxXmJ(w+PlhFg6!I!i@u_Td@}!*ik2HV?{k_D)tb0xPp4M+pugmD#g4I3tqC
z)b_)?!r&^V(Gyo4wzyHCPhEA?3nn(+sD^Pj3ZPKIW~$LKvRZ=-MUEibI~*;>-dYc}
zR3j~9k~1SWs;zi}h5~XS*&ZQ^cEhdioXyUk6R++}aiN-pt%A(7J-${5j1m-}^$^?O
zr`7&-I}=-yhIMKw68|?AT3dqx;`eaxnYNs$;H{y{-r~81M}tqo>yWP>2hkwu2-dqy
z1EnkH$jo-mg52W@y@kd9_p#n-+zUVB$Ak9t7$ntW$q+QgDxG;s1OYwtG|~&kQy=ST
z!M!isez(Lsn~do3xRTpSvS|_+ri038_tX=cs9_%WY%7W<)G!plIj^n`$|yn{kF*iM
zvKyN`86HOn+*;-^sJ=-OfC0IeN}LaQT|rYneg91WZC<MO3bLpCE35XoqG5ra6}2q?
zMvr!B?hLl6rCCvhFi#PAV6ex?JNNYv#bNi$zx1vTcH=E4H!)Y38prw;WPha13`MLV
zq^SCB%%)FJyVa=YMgpZss;o2Nl(EHE=GU^&wVuVO$g~=w@8rgl_(Ww()IT%%LjRHc
zw1qgM@VOvNN$t>j)%;&IADIPR8wGKxoks2rS3SSQ7fI&Ku%Tjq2d1#Q@OO}*W5{^^
z)%`HZ7ka~0jn?sUFX-r+n^CE-?#6~QIuCmu-z8%*Hm&2>WwcP==T_oh86YByS~V}$
z@wu@dLlvI#6az6oSB8E-$S}kE8(1QimtwArXA&X8CO_5kq3gxrU7h_xUnvv#0<7Yz
zK9d&Ca>$QFH*|^puNsH~MvflOc3J2A{EsXiE)RtCY!R*XLa2imJUT(bn!C*XJjgHL
zIv<TFu*~&vG&7v$nN{-a?KIu-yi1R!s47Aw5Q0%6AEu|+&IeQOXcP038lvpV?O9uA
zk)iLh_~_Mj%<R3s0@Cjxcu?dMk}7<DmuFqv6@6JIrj)YcDe{e2D#h!uz#Z$h^2{;7
zuMsA)ol!g6EHZD{o)2EPRf>JChI_uztJ5TH+bDjz4=|{=NU%c*qml9(R8i9(uceYB
zj?w^vLQ>W^@+}DzDTqC0kpyCZzZeJ;si0MS4@V>kTq)b4@ONK!mVOBK=~FXqPYbq=
zBlsP;Nnsb}_oj&?5g_^V%tn(hmp#*i;fxB*>2$kK5N|`%+@GG+b)wL-)w)z6RgW9M
zsz37f-t3*-7NFcg_W-F&DwmQuUy^7buJpzY-=SP2Hx8k1E=?*hbDM96bbo6kOx_&g
zEdMZUl4D`w%v1_XEAG4Y>mcS(7hjdJ<XFRa_F>>2ES7X_dhSWUvMuuoY36-L%hnU=
ze+3u5@CW7uX8sHB7a8*;*`c|UuDUZTi}S%QV;VyP>!9K>!1xXTrflL|%@Zw}VC<L}
k5VIaFzieqLu{_rG<4XnK19?B-REKtiOz%J_NtTfR2c>@s?EnA(

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-incorrect.gsm b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-incorrect.gsm
new file mode 100644
index 0000000000000000000000000000000000000000..27d934beb0b082969f9a55e9b4d6cb55cc4cfebb
GIT binary patch
literal 8085
zcmWl7cR<pK`+q~bhIjWlS0z>|;MVR+L9Oo66vdT_xWL?7Fi`8tmT4I%cHqiASne&(
z%oG(zrSJwp&=PRrXm|U*zkYwc{&_vG=db5^y`D#OGAqHz$H1?G15^4KxJmJFi1;Ex
zO5rGgJ@ycq+oC8gcQeFi#2!R+lcrrnEaH)nYy%`D0S+k`8It0;Qei`CaB|u`d!1_=
zm3?mz3i7JC@*X^zW>=sbaZM%`viN7Zh>4_d4+~G)n(qWpLFrznOmd{S-g7~t9U5L!
z3H+<{GfAZrm`I$-?m9zPlcTlv<bkm}<=NTSQH6Dnz03GG@~)wXVKlS+MkjZFNVV_&
z?i}UGDBQ%_)EK#(h@9oOdvxkOh$&P)=JB(f8o-~KT4T{JTi!59=7B#Hc=%a<moq_f
zS3RHt_hs=m6b|0uRy>V*=85dJzO5z%5nKg=FaDeJgA*)iAXhUZkN2813Ci$HV-O|_
zZy>o+c7ryMp3x${VGcd&XH)T>Y^_YTFHd*tp3UI!H$D5$;d)O1spQ(ymV?(dy}cEw
z?yT2@Zh(+;0;=<*gMc(%tXL}pzIdADu9&+3Esafhw%((HH9kAuzOI2YkP>ZuuxT+-
zXlt|T!Hhlj*~|9y(!pbk_$vaoo9!vw1S5q$-AUpt2-7{@)0Wl|(zj>$DKpQ&ICxSD
zYg$4hRWftRel11&3wsi+Bbdx%i@5}T$|h4j<#IM<a=I{uiAmx0$^2Xlg!ojv9{W)d
zh-~rW>&<cRU*i`EJG>>lV`u7)o$@Rb3vAp<<X*@3$O!|?PV&J-uZEU)IW^c&FWx)j
z9?0u%B!4}vvV3}f$lsq!L85)2)7G{7M0J~BZ0@%{b-ldV#TLF<8WdA8dP*(PC23<t
z&ZnIQ%M5RjG+j@>+spP#;IS9z_m@J@N}kNc^^Oli;$t~0@~8jlhV;M+wxys1ds9h_
z6JO{{z6GNO9*OX3y%FHR_t&t)Wvm_P^M+Oa*N$B{1%(4XFKlEVrUg~a45jLvmTIO5
zw2LiZG->WsnF|(_TEEY-6HA(JKZy!7ooh*9gIY`zb?>LiTM{MOl$TP`n+s>Nf_e5j
zyko7HWVpUB>}}_RJZf{*kx&b70ioA?fq4R+7y9r?WJx<Cl!q|nNcBRIcKqvuk%Ml=
zD^_o<#0}=_z+gkSg6t9&c1RuLHBk}9dvAg3s|cNfoiFOu7sonaW(U_NO{b9fu!qH~
z?;rVxjr~a$Mua_u@EdEr?h2PssM2;fv;8F9)uF5^(Egx+A?2X$Z>B55lXhX83Cw&w
zqfu`ti*e-0&i2srKliuX(ioDTYxZ{eV<fYX_A8@iK7q1=dA9FnI>8ki7GWl{n$&x0
zzy;oyXg!TE<pv1R^T|b(f~ST@{1HcQhD9J$zOc5ZhQUebMod`53m3dy<3bgLj)_?x
zZF|<E8KyczuQXl7m?CO@@zGuG{W|V&saUR^Qqbet3rc4Uaalrr7r!4clXd{LM}mnf
zXXH<QFFtu9b*A6+;vx+R8f7hjl4i;Xu0GLz$Wz4ZYjfRMV6pt$>mDQ%=~kY<vT<Kd
zS$l(Z2f{<k3uY@GmECl7i&-?)NcF37lojS*Zklqjdt6+%<#!3<SMYZia}q}TAX19M
zp{;@}NcP^;f6a5^{swt*<nMW2F&~U+5#uG){%czcAZxrw=mDnoqw<+v*L5(7**6;n
z)E(4>V$^?!c-6?nZ`4ndyG#<I8b&~Eu3phpu6B#F{UFt3Uz>CAFJ!|Xfh8BYur15V
zJ?Sm94cc)g-)^;Y?IJG37Sx$NT>Ge;&5ut%NyqHBukbt@+CI9moo8y)eLvm2qcft%
z$U7;&Z;Wq7iBVxzj!8R2RhUexXeK-f^9ES)t_ONXS}<hGGJ$b&Ky1%Szn)pxI%cIu
zYVL{--mp_r$ELB_e>9f<Navg9=y`R@(?1i9UUeItJK2%GxAVD`r?6t9d*$%Q-^XI+
z*DFKIx}V=m+T1{e8lHz_oQlFeFA4FT9vXCVqkB8w6o8|Tm(8ubwlHMW#*Rv^6Awh*
zh4e!QjUS?ogxQF5zLJm4NG&vS%82MT=bN<dP<DpqGj-<+(O3&b2DXY#9!aid_(>yL
zm#>x-`}tV~NNEK?<8J|UYSriqZ!gJTXL7|?Lk<+ilT)4|jH?0nvZA{83A>39;~Ocf
zS6}>wt+L$}CFq|z?$-j-q73S{l8K;V9UR)k=f~itVzkP!yvMy(nCPPQgRl8ZtkuMp
zPwwTz38K~N!>69N1eN%ZUrzfWmVs@{1!DE#)<WN2{kQQbhdc*GHT0wH`9p;}2Y<J=
zhhha5*tK)j2R<pzz(H@J>MK-u(N479+|*FjPV{$W4c;PtBR!_M8d9Q`jtqRO2K^@8
zwV3XF(wG#~hH}<;n8w@Xw`8pR>;I4*)Op;330B$LGTyO`)09b&Ej0H%1%Ip^F!frH
zp(cNpBanJ1$Sbd$`m=Q9$yb$KcwctMN~vAbLh||Y3e?n8qx#EHbPGI#08^rKVXyE2
zGqBNL8mU}gF!zir3~YvDu5e_*B-Wer?u{6d>@rzqgTW5~B;lfHJ#C%ayKP%@<9l!H
zjIS2VrZAMO#vn~>4_ey|64)4#X?mOb;J2{y;faDU-jeojiS!5!I~lGwqtNrBHledZ
zSbw|m{@8b)jr{CEW9|vR#w1{38or^&qZx6m?xxR`^TPE9ZATc*h7igzWkRDs<y#6#
zP}v^E^=&74T%ve+(?uq?W5-%s9xYK!72=j_3L+dTMfU3Mj51T#M76wy2~kYC$-beP
zA5ZvBs;yg?+#>bK){}Tr@^Y@SVK0alT`FQ=*PT+$DrE>e#&tJ$>~&x8@PXU|Z;fbM
zNNX9g*I0DYD{5@*(IG!U(8?OibU7*}dX3IfxWgBBFU8pQG4>0q(Q+r1(O3qdH~QV4
zH;-;#$X6Kv|3@92ez)QPq+<m_diIGjRgK64f4TDJJw7K!?bEe4OZ*3-(1r1SFwynY
z!WsXf@^!L?j4~DFW0Z4^7$O+G*i@ebx7rP#@ED$8F4U(66mUjh{A#-x)reEvS+M)|
zNH6pTYl#?sP(Z^(3F*nkKE(!Vf-=uSrGZPN_qn9@i!dcQAyIx$m)VH~OIor@G#=JK
zm;+9AQr;xEC}J*PD$b(dx0CTE*R|&hrINI<eD4aS^W;lw{u+X(>bE(+<Kp^La?%Qo
zQ6T?qIabm}_ZIfmA;?pWHP`M3b`a!NA}6lQ3!Tw;AFCaQtd+EudAMBL%c<K%q8h`Q
z>50Eel;P9d!2Ty!pWCcHwxNkw=NeIbgN>eI<D$+QSAaWc-52g!M;JW(?xHP}=xPYm
z<}!VEF9vJ72i|PogP6_77~QY21zm&dy}am(rLYu0Sf17Kfjw?gO0U(x8#jO;fs$*S
zl|+s#pvF!~v{MMf%Lz{!N8A*6-qu_VT#q;dy0ZsvL739tePeHt|CLbJjQj272uzCa
z#|G_zDJfzlKOCt~gDGb3c|a1~R)saRhSDGd_zCJ)2dqI_QtTnS25w5CJ(jfxeu6Tf
z6u!w#FC`klWK^D_(Ey>K_Cv0Yn1E<Vu+JVihA;yX8J6!J;~KyrlnLpt;YdB|6nMh`
zru<4^-E&jsyFx@^4BIE7i+0L<H(Av^IEaV@-};(Waf6Vcufdek3lW7j5hCghkRV(y
zbR!(5pt)Myx%gGD7c@HJww(`$2;VRgj^DfI0-;PnxCSsOm8YBzheN3S;9u{#LW(#_
z2|JBeNPdHm<|C8a+BnMexr)&CU}#4U5VC!I={;;hY=jBG5}WC3=7~c2_b?ibxH>yK
z7g7wzhv&x68TW4kOX)|o{K<bw%%-B5hdu!`q26xpA4Ry)PutD05Nc1dpsFNbaihT>
zlhCoV-7v02nL1ZoUtfT?SlxuKDTsI80982p7*(AWnf#~ZwTqqX)*qk>9!$x1vXru#
zFDLd!iop<zS>JCt|FpnCxu;J>c}*<mm}8uM?U_^Nj@tNOL-C5%dfw#v_mK~&=<!2q
z1HYMoGtI6ke7pb29F;O7wEGr9bW*gRJ#sbjX<fa&0pGLWYL;O_jG>;O_o}ha>P>ns
zU=F}B*WJeCcusLUGxGa1+>;G%%;g(LjGELBd^VpN6CHzn#1LG1HFrg|DVG}CYWw+2
zaI*H(Z|ZQ-=f55k0zr97Ds};UQlUEoss`7hJB^k6x<091G`-rXRf#~O`LA<eqJ;a&
zXsxGu3Hx(n@UGy>NVaaHn>e8^KC&|cB!~$3qNp65pwo_qCESk-x%n|TVf4b0_SW*s
zEZ)rQR5%dk`7tEPnGi#YPm5pe!v*xJ0gRO-g0*ocg9oNL(8cDFn&tIl-K~7scgqab
z-_h*qTU<Loe$~S&B`Iq6AYN>qx|lmO=K9@F#I6xKG1_~w33aJ?BF;7)#kBLK1P+TE
zu$l#TvKdZp|I(6K(2)0H|7%$Y=3Vhv`?zfw$wnzK#+hr#>bASROHQq-vyXfIdt_^~
z0owvANo}zCh<@xL*l4cWpH2$Goa!~a(eTq-%7iF`7YL$yqwhBGnz1AdP+zgO|E>k%
zbv~;gv%#ZThpm?N@TMsJJb27_pzP9Ck&u<NJC^lGyhyyJ9G|KOcEsi5ES(!S%|YX_
z^C0W68erAq%>09I>H#36nCE7yc+ZheJLi1K93{`X+~zar7x<Rl^@}gLU#QN~uKUkt
zG<C(hv$e3mGO+69^YK(_-xI#s12fRvbKcv=fW*b{YEJfqq<F>jFZ&6hJQJGr;!B;R
zsiK6||H>XhnUnf_FHxo!?p!g2D<WX!RqGqo<e)6k^0_c6{}B`R!TBOl720Hl{{GG^
z@^Dd!GRM=I@$i~*K@N)I=NwW``+1m@lk>AGeF8g!^khaL!8xX`W#-QRh>f(O1f=XQ
zE%B<T99OmNGyTXJbr19TMeP}9_o41@&|>=jl$jUN3kjO^{udLxB?`il1Re>{xp6fY
zGU-y~rY1=^9EN>0J|58e<3jHG+3k9h;Q5W)M%Dq<l!w1Q|H2uPm}`Z}<{NszxYNnG
z8y7Wmq>B_*w#Wh2ES$DktG{qd#ITB6l{A9RM|>$NGTSV#+Sgnf-|DpzU%WQ^voKRs
zDO|gtwdIQ(o(<?$*18R6-|VqqnjIg@cUuiKWji#$vB0MP^37n=3HI!BX4k=3+OX3r
z%m!yMl_L!`-6;2Zr2|;_FP`g1n)9i>4(|>y)$`U4hao@7iEzU(w(HUKaU&qfvufZe
z(?9jDLunWi4to5x)C~#Eeg+OT?*-?d`Ab;uqW5>GYafHcAMI_rQJ3hVAIhFL?FclF
znlcld<|sum(DlYtmh;#^(1$`(o=%L!f{k#EjWTUnQ!l+V+ixjWoi$m?hkRp<z}9wN
zGNa#~By_aE6nMK^A*L)yV#rrJ2pv|%8g*M0H8u@Jx((3m>s5wk-*+cIkFUkp>h|ah
zly^E5<cPC+`3^-DBMUnCi9G(EspM8JRa7%$(~)DfptxXOMXc$>;=^|QN2VRUF;O9J
zKqn3r|D*UYrT4R)bfM<LY5f#;QDuGKf42_n?C(I_n|ui?@0oa1efF9ny-z06M|a99
zwu2qhISbo6E+~TiscH}3vjk9erJ4L)Iw=6CxQoYDOiem=*bQ$yf=>U|_*wbz$i-RY
z>o=RxSnuoQfb{OBd~xCjL)0#p0wrnTzeLPKy2poEbtJ_plSx>>g7l<{L>iwAB99m3
zxYk9teDr-lue|lE*Wm}Tl5;(fGEu29o-%Io3YuthB@<~U>^KsW>5_E~ZAHzD>py43
z;|oJBY-v1?yIFn%^6v<<aoqa?bcCthyRT_w_mXGk^+hz_plwledtbCuN<uX4VgaO}
z#CAEH3Z$O<VcTG#e85H_iFOEtQk<aBFWs~t!-18m{*yKLjY3QNB~h2my5)tDi^Ot%
zsbaLHprR%e{YaA4ALtv<p#4;2OuIAVWkET|mBia$7B-nDh)FI>LDQVo8{|S&8xkAq
z_Il?sj8^oEzF6s?CAjyJrMSY8-nDXgO>$;D%eA83aAV)i*&A0sJStvwNAd5ntX)Aj
z&)#+C47YPDp1J+okXLfzZv3Q?*Hpbw<`3czuZ<c!{v0&227LEPqQ^BRJ@xKBko_P<
zb0h0Ne$s=6!xP!#MlMToZf2%=zL3O~+r7ry>P^)CN$oen@qet0p5fiUsl**?na*s}
zLR5yn%w)~61GeT3xQYLP68Wd|YYHAaLIV>wlm&+MTTQ*#m5AWN%BKcfdrx3y>SOsE
zvD^GW$Fb8z6Q%u*lNP-w&AD2RlmiY+iLfYlRBQQ4h{jxZT*zo=%%p_>zRLCZW3F}v
z{FBXvkkP-A61oHUmd(x5aQR)`2Ml#o#KeTKZr%6N6qeHcdP6azOMyJ)TUGu@E{zIm
zN?=P%oUTQBofDQCA!x|qx2291H0#g(qIkcgvDGG6h4JlZ|2f2BMsJ9(x9RLZp8iEs
z^3Bn?PojoM_Wq)#-0yz66j@}=`6u55R5U%6SjX*JYO-EB&MXpc->+7qsvJIf8wZM8
z22msv#bb|8O<ps`LN61)oL-DDnH-k=_;4AmLM+YS*8RKKv<#>>8B{q-f!MbhUN*k`
zq?kkvrOT_2IL6W%SPWcco)>4s!7U9yK_m)-{GG-B@pi4CP_9qC{EJ~>UD~wY^5k+I
z#JB9z;L1M4tg5$s{(VJ)QAwnZeZIY3sUiEuj)jjRVj;%W4ZOM+iJQE1cpg6(6SY=5
zvxFbetd0nQoY7tLA9-c{B3ssaQ3{(=4-&3MN!8ztA+1IKEAVp)WyeBf%o#TY?j>}q
z@lsj!J{r*EQjm0mfRy1lioD$~bfTS-|FGt2qvN@}>ArHDw+vAI9P+2orP&|689{Xe
z<ds2164PD{6_-J+Q({&1)_@9j@)mV623*9cE-?GKf-<U*KDf$aJ*c3X+7{qA{|GH?
zuMANSHkMN+r4po#l<-AKeZW|3V;fOfeTp?$6rj3r<s9{3?<ucdqXm=x^Ey1~Lc%bR
z4_l#51fmj=2p}d}o?PJO0C?Lwl(<fu@&3i5#HGXYF(y=@PFK$wtPn9hb(dASET!LN
zkgsV`&?|Q<|N3tZeGo0>*SCvXq_*P5+!wREtT{`(J-=?69Zim{A;nMn{kf)5Yjz}Z
zi4!hK%p(cHH>Wa+e1t-a)1V@rmu%`*WWG~N*~UP{ct?h$nJ)5ZZR9DNjX&p4#o0Kr
z&*iZbvaNen*;5I~Up@52syxlgtCL>$txr|3HU_oP4*vwOi^Cs(j?8<o@?C6mmw2b}
zW#uxLb3UJalfkV`O!-ufx)hKz)%2j1{-mUcN0Z>2`TpcOV#U8u(>HZ7i(Lw^QgQTr
zqOTV)n)t5<5+QDD(bL}=OHAEcav^|mPM@fL-Z!=fVmbI?ZG33wFdQOySK+6h+Ni42
z4O;b?=@XQ6`rv%}Ww^ezG>WdA@Uu+Nn-P1decK$^?2~Rc!OL-+g?F1U1^Tnzjc-It
zw}e`NZ3d3tGwJ&R=X&%;_A1XeZ0Y(MtLF29_H`yW2G8mTx|5iabgnCqyryVlm}#%^
ziRn3LG{ttjh3PPs_US$F*<bESSbe@ruFG$5xl^`3;SKwc^8}GowsbHimHZt8u#GV~
z!dw@o5~km#AWgJ!U*vQ*L>O*jMq>7>jBptw;H1WsG7pL>b~sWd<6UqQoV;|<v^<m}
zCAhX(5MciZ((c#RDU8v6IYY{pxS-~I_W#mNu+jwj$DJ4_>2*#i|1%0&);$3mCiH*?
zc-Itody8jL+=XDpu`w`8c!gyq=#H}X%P~c~ZmCz08kk$SzOr1)>mWRA?Qu>HsK-qO
zoJqn@OL)$^KMe~?>Y)wPXQ;}<>`2@z5X$YG9(9*2co+3y8a;kmtA}eGXwriXuy^P{
za0l_gmkxxne{0YG_#dKMJ$n#8ms6)_`?5>^p!FpWu#Q!&xkWu?I;>JYWBA+UCRq^-
z*Q4Jx7)3ZwFwi=W$M(OW6QMOx&?$#UliK{|@^$y|@u-kcR#TM8xCM2%FiPF{BO128
z4RyL-#4YEq6)5OqE;B?I4`=T9w&&wfxqsH9v6iKekz+Pw=+-auR`dk%^xmx>NL{cA
zM~iruLGXy9Lz5_5y5VSRi$bo<<1(yDeeM+sz=0r9?PXsoS8;966qu?Ck=LHpB}_)m
zTQqIf?i#chIk_>GM>ZkF7Jl-Jkhh&7)uIudU`^MM1+%QF7t5KLDCGY%BWpubdY$=A
zFA!3~+V_4Ml)p*3fG{EJ@hp*soF~F$ejP8dxCup7ez2g$vWPV+&Eid85n5%vo?%;9
z*n4{DqczwjBse&bP0jG?QUvlw`MXGcA)9e|Hn5%z_D9kJo6@@M5}SjQgRrnK5y2Wl
z5N=8!jL!<3ZA<LYCijm9ng_}7@Kbkq_h$%*ogl{FncrPLF0Az^E}xF>>0W$5eWzA(
zLbUuKNM18P(1I5$&uF_BeGx{c3TB_Xe_Kd{2|~=^CV0pq>V^HOnEpuAVH50*D@6D@
ztzZ`Q=o@_&Y#GJo2{sW5lsg-=!(FADUrM|^;4ccll}kpMxrB6lD9cm(qC{2uzS+-?
zgeLtbiUQZ{eUZ+O%8q(IYqS-$7p5HABW;QvSmGHpqz5%<iuU@oU1moLjFXxi{Z=l@
z(+5L+Y6CFD9&C4wSU-P)K3lU<o*1kpZpipPRQ?=;?F>DJ%KBeu@l<kXTi?=&?&y%_
z>EvCX2#G~5BKL_$T<_fIhpXGp3Jb~dg6|oC=v^88{$OtYWgYR`TzAjdcdRkedR+Sp
zk6dGowZ6Rh4?cBOxT}K@od+~gJ<j|Rwp{`(s4J*yH^Fv|A7RanqaQQ<n3m?4jK~ck
zlM<<h_O?^Dbrkq&^d-<zjo!WB$h*chRdZjVR|`-TE~`~H+c8p)=u~>z(L;MdTb76>
ztVprxf!0!Sq(ZCo7;ZUlp8SvdVr9KRFw`ilv~mG|o%J2}amc2h9C(|)!mT~XE_`oZ
z`Q9}!<XyxGy31tYj-xi6`)ww_iVnPujq#u}&s%~H%TZhx(8_8wlg<+Nr+q-Va-`2}
z76I$D&0HoU;HUOy0E+3DKx2YXSqBu;r4%N^S;5am0WFxsBXl!BPW{55o4J6B{($<b
zJ(<<T&(^Aw3t>1<z?>X1^IrW}9_+HZuiK<PF^%C%*U><umwjDf0_tCYAU1=BLOmqu
zQ@NIY3=*hgSjNgyuS>KVVvQe^yI<bo$K7fu_v4-gAzJ_zJ@y0A<c|iUwITBp3^X`E
z<_j|6n^rVn*n4{;DGwf__oeC;9fhLzMbLxK>Nhy8lm*+!=2hKw8Ym}xv_rQD9dYyQ
z1p^U#ulFhrxX(6xaS9o8n4gf02iQ)bmU*+8C?m7h;X}S?L-uM>$rCiQDlxquG~d`A
zLu1Nq4N0BrC_~Gg+Y_MrQM-TAMd-%bB3<g=2l*ylwITk`1NEw;wVk!a-4<v?->A*D
zuKCu@=R=l<^^^h&G!m72X@02(RuMgR>G%h+qP>=J@yeD-$S7p=g#;ooFDL*_@@y6p
zcAuiG;QINGY(g{~WVx*JN4upG{1=79I0KzKG~=w*WiA|=HhoF(uveMqDRCjYEEPwK
z_-sw6hh@=&EfJ31n;6D={fUR&|5aE{loR>`eb&?>3e8x6<Vquo9><_l%uG;mJ>|HD
z)4pnYKd7AJ{IcElv1&L1X%3!`qF+kVwkkwr?H@+Mqfm-eW=P{AIyzm;o1qdO4{H^$
zqnDKl02UpCl#&8MnzCXy$VX=aja}pLuqI(pV5clN%OWqzVW|VL-?DMizlZVRL=VX-
z6k)GPwfh$cirZQ2Q;G`j0RuzaYj22r{V2$=l8V%hax&@B7exUJfomai5B#%>*Flp`
zEn1mU*n|SE(cW<(#>qsGCyoS4;^e5Qy<0|=9Q7BG8s)9t{6u+qFlo6mp)R7v&&&`w
zma<%suy4lbJ)$yUA52EMq7X#%7R0)qPKr3>-0ZaewZ)D!X>S)hJ*NRz+h|PgX~yl%
z4R?SEQzAd>6|v-iC~Q;u+DO#WX?TWU#8Oa0{w3_qRwlIQD4aZQs!!?(MZc_p2oV#z
zsO!%anK@nlgUQ6v>yH9xO)F0J`jrD%p>E*nVyfZ3YCrgTTCGUK*FvyX=L&E50dn1O
zFxd;U3W!o-7B}}XDkxLZyGC#}6l!$a#a)KG#<*42pw>LC5*_^|R*PKMyk4ovD6IPi
zKNYflD-(NP*U+Zs>uRn9{DeYp=&XFDu5u>`xHpQ7{LTz?+wofTwJGqOk%wN^*9k&h
zbS3%W^PsMu=%_`*_??bEW${I}77}xM)PSdGZQ3sk^tz&zJz`rPT<+gE(x)U%C`Rw~
z8@Kd>ME8P0WU~{%o21y_ian-F9Sb1Y|9>mOy109g7>eCe{5?A<4IvetOtorg9<hfI
zjb$MQZVD=Id-jbhh%g1p3`ZIf?F0)Ixd|cuHEzmup7hpNz}rVR-*b@RVKSdRNC*uH
F`G39VSLpx%

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-pass.gsm b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/agent-pass.gsm
new file mode 100644
index 0000000000000000000000000000000000000000..f95637bb320c384d29c74ee2b66e789778329cdc
GIT binary patch
literal 4752
zcmXZd`Crn9<G}G%HY=^qwk%WZP(Z=6m7>+E<q4W5-hx&hsEFV^(hhCqk)om@9(i-A
zc$aygmdgtvwG`eU0$K_lh*xd3w!Zs*KA*?;@%`!fAG}@?R;<6;`_wrIwMP;1vzt+&
ztEl7wDv}DDzx&D_M4bakn8AxoE*+st36OE=E|J9u;N>YeB+nk(`m-xQa#zm5(}ahz
zUYUV<kfMh-d!c3DPDbpYPCvR%i`^hS{<Y+Yv?0x~D*yB(_PU*33Y<IZ))>Ou*xmM&
zaBTV@3gmSQB9{AALfE;wH~elZo5@#7LYqHIUptSsZ)FrWpKYn4zZNcbmw#Wl&fCuJ
zQfBepRy=!TuLXB7d5G>Q=PyZ=qO*YF7VR*(fu;8h6_b;tZE@*7BxfIggYqm^5EuMI
z3Ziiq0_o7rImo9`yEVUBe8<X^>--8wbR?E6-m|oU;GI87BSD18d*iiLR37I}95RsF
zXprh|1NI!-?1+AP&G(CVc0u>KI4Q>dc$*}q$uzija+<Nwu+H<<HY9$V{K;x?LSlfh
z_n(XI1;q!H6I@M|&u;tR%_fYfoYl8`Y(ah4AiyApR6F%;Wb-^TGK#%@>;k5;+(}!7
zw!)QWmL?u@u@W*GS0E7)3v)l*m(d)J0RP%zs?)h>m%bZe;T%P18C$rR(^*=ycp{_J
z<>rmyZX*(J;AKW%csi62nx&)ntXUy4jz3eAKP-+79+QP;<Qs4F8HO^)u*?>{flQe`
z`R0nSA^lHKkrNcA$PHZ>jdQ<_(TxD-M|#0l%QCaGXx$~^lM%|us7%6ZTpX~&<XuZb
z(AP79=N>n!cQX3R^Ek^=Gt3)BLio>{K6F|5a2gYR>&SHmPvchkk;8Na+U-wC@k#Cl
zy(Y=`B#2YtOCA^T6Yraxdi*Dbmvggns&ims5hQMXYHD|?t<OyjkKKpO_S{L0=5^qE
zDv9I}F=a?Cj`nPth$nMIC%Cet^?xN(dT!kkILKppeW?P=M)%Q=;x&KLo;#ccv42lP
zFXtz)=VoQPhTCZE(0q?9RV1KJNnm~-o%(X`n2^w2>C2-m_1MXDev`BRWb3^H_acbh
zRzO6WsS`Ih0P8W1NgGW%tv~KQ8mYO6+6&>;Up#=j@N%ZL8&+~R)AaG7`I@`CsMZ)A
zC+_axv-(FMgAd=^9CA?$%~Fh^u@5J&CP`SFp?#|UGnFe>{Glq<dc!OAVJbXYx*i+o
zq1iYGBAxFDwIM@Ff>gPJCPIPLWv(ahb>hGGi4{((qdS(FHlOt(pSBE&yaFz)dm^fv
zQk1_UJ^VICYbEa>79;7f<)2Q&K`%C3g$cib()R(1_%Va@6*n-o_t-4RXuDuwEd2LG
zmQ#A9q}B~k41nQ2^Zcs=(Pq`;KJD3REe-8A?QFP@J!Yu>$Mnj*z9U*w$D41)jqSBR
zv*8AwgJ@X@vvYJJ<GS@HIJb+DicjR|NAjY$iMKF>;zj^i8m&tJC@QFSYA&NFyZ%w#
zqZ-=SSel1jO!-wCtUnhJFWIdE-ffq`6nhX|@J3$GQ}}bv9eeFA35>A=@If_VQ%{hr
z!!5bPFDD`t<{+%KogY9sFM54egdusNg5Q1w*8FG*U5)*Ql%Rt{t{+W^0>iMCzL6e@
zCalqRJw1RaijA!O5QaN1??_gTXmLxYLegp>`woS7>5Z9QUy2<i2%FO1!Xq5H3jpGG
z9<%pW%w>-qW1r)+G2+6NKvU>3mC!PIB}lO=q@<GndYvw?AlRF(+-z7vc^qAMFu*7_
zEf8AN9QO`?)eEJ*43W}HAzpH$WO}zwnJatv!5wU0r9v9Vx)!RrVq4um(O$l6ODje>
zg--T@i&17_&t6q@Vj*+Zqr7~KHS=M|oaOM;nT#IyuHh}yW%Wvl#=9@BXy1(V1FcZU
z|Cb;8%d8EGcaF8zw)yyUG{_5AZ}x1HO*-43%-IwKl&m}ss31;72gdWq4*q>HoN5PS
z_*=H2<>0H_XepuksB`m&_GIs_Zq?J5cF87H?589B-AAi9R10ghca?;bR;i2juDIdJ
zQ!=Of%+4HRRu}PC^Gs#x?+~jAT$b26?fB%XP49&S{?aP`&>wk{nQ{xVVwhi|B&4a%
zG|<KEA&X<ndABTxy!vvFa|H>Av{GIBDk>tqbpIfh?6fJi@elPa#UGU?eDa&uKHB1t
z8ZvKY_I=HSkvwYnWJmZiu<ei2r8c^06}s2YxiZ+5utlmCNVMcgpUdXgCANWq4x*J7
zb+5pWV)y$jtRKJ+%4fA5SQcNZX8CZPkEZp2b)-65JTh@~_zIR1bw#mxzLcWODf9ZN
zox<+7yehI15$~Cfh_bRYK9w@c-W;REluBU(SAL&IljR~5Th0n`T?okUeZ84YBD7*{
z^u?g}7k^dO5zj_dV!`mxjod#CXQS?UtteQ%mvA?C)RFIgba0(09G!f3?F_4gT@SsX
zZ6bxG9Xb-lZk=Cquk2)P{Lewllar&DgAxo*6th+%V1<{Y#8LDFIx?n-Ik%?Cu|iq=
zm0!@%S^P0zW5$&0)3z8diOI`55@@y@+0YIqABa?<n{Irt?37a%M0t-M*7|PzA~Iw9
zlojvcaa#V$-%$;=)aY%lWFOWIeSxc7hIOoz77N>+&uu7UZ2$c6iF`5FJuRVuRl46z
zo@Z}F%d!TSa_<SZ^RHi!FCT<ZxF6&$uOp)J#WX0Q#Ex`E9;L6FRQ-#{f(SY-cjZ^7
z_lRk(T-CD3Lhi!faxak6v}eyJH0lC`i{J#go3--4W0jA7Y5TtZ8r7{ELv;9uy4T<^
z1*I0Pd7Vs{b2+n=n9@pBajS!@B8xK5m!2T+DH?{0)Iqn!rkCoLikA4@Q60t<UR^b6
zWnQ$Ly8li$j$+C!AzdbjRR~t=43fQ6BwNbQ$<`}d_0G?7F`8@LlOJ`h?P}JNL}|H-
z%SWDj-)0uJ09$uvx^6b$UaL-(Us{K1;=ZZ37B)X3A$`FApyAy4HOFK{3PjcUv$S-t
zn?dWVw}|~cB8eJX{Kmft1tz(^_tE-Ns~NEk$<93?ZY21y$R`5VrX?zmVlgMPOn(2a
za7W4V?YgUoblm+nKUhaPBFDrcpwhLZH;2T~_C}v$J}IN5whG&{PS&w9T{%G#R_(2U
zYG&864E<hYrrb=?PVr;HDRKEHs#%Je&ZqPFjyG2~AZ%%Kvf+`KMdv=ByWDAp#~v%u
z*3Qr?Ipt1E+wOhyg#tq<EMlQF@BMEFacJ?Ihdp(~Ci7N?;g)9~IFHe1H1*7Swz>3#
zA2#b3<+K|)QWgLBaBN=8P?5=>0RiL|F{Ie-G+_SXsQ;bZruzhw{Jai(NJ6)n+#4dK
zab?L*9U8rCmqeeK>oaLvpXDSoLjNR0j{YorG0AUHkAcz;H1|_nl|Tw1MdwAq7>GEo
z9MG0T6wSg0khWjjk5=77;Z5+p3gDKrI_r+J&qPu^t=ozJg~a(|JKCY8*bDw__zPU=
zxCSIzF8ivZnp((B=a-#0{3180GV;ma>1Uyh->M0ZtOEdqOU)4$-c?zQSdDI2Z^nO~
ziZ(-hC9}Wcpr`|v27VBwIO8h?F15?}+WFFG*jq1GIW7Vs3zQU(JDY#?GE5hKNFvGv
z;L*xn?vo0qHwrv<YAW2caV0MpZ*u1pr=v#H8M}lL?QRYF+YS}a`ohj=f+T<&%uj|_
zB^8`y`5@kj{)lWxrNT=w#J|9)aPG|KMsUwYTLcO5b_A7Gl_01FKKzuDFTkJ0l0Pdc
z?EIyunFMOXiLrnI@cihgZN(TEu!<lFtKj-aH#=2m0^%K!tMna%+n{{G{-|*yb=N##
z9;*p&inc4MMFa;f?^j;PHV%a0L6i<mhr1PsSg#SitHD}eot?Tf7?&%XoTq&Cop<)?
z+jp|_rXf)KcfH@u5UVjW+&w*7fq0{?D@=`{3t`aMMJJ#<a@ZKF+d9gcIbC47f0F+E
zQ^6NqVDTIzDJUd}-US300rNNi5dAc7I748ERtCLVTIlA<3+bGenclXQpM}+Uq-y6B
z{)E6pEP)cd%GT&T%CB)i%mV<qw}n(U#h1tLgL+Q~8&Tk?VqDF?M!aWoAVk4=-#FKh
zrkRbvt7h1z0UfcFth|(NT`|11N*H|gmZ2|PC%DZ`>D~(tCYzTA4u)b$h*fkGNNibP
z=JWhf^7$4r=6Pd7eP`~yU@Mf7`z2AZl|4A2PX<_&5Ds*}xRHg8+zzB<<5thV1NZLJ
z?d*IVm}6s5Y=#rzvslh;F_$r3jih#`7lG8_uEB`<ABwl+GN+y@^MS8GeUh>?h=nYU
z;l8D)r$W5V4r3-SL%m$9eB12js9Xi`zMyK-H^=`05$lgOAD0oOY_#gcapL)F=&=`;
zd9EFRaS8SZwA&#OerbT7ecbu!=!;I1bGrX@MU6UYO?`IV6h;xYGI%B?x{2zDb>rb9
zq~Htd?}bRuzDM4S+pS)<i$YGCX+|DhVc+aLEu%LK7LR+=A2hVZ${F+r4z1<`VN#1Y
z!-Cl`=PrNg!sawzQEcxN6d$OjNJVswz@X@M^DF}^+QZlFl9j7>p*=umk5v;zaaDRP
zDMvOfwN<J$i`jJ_%)|$45R`|sU{Cd#HSa*?J+%X?K3-)|$i6fSBMB^-=}4cp0}Ged
z(1&{cD1Rt7N$>;DIj?KqaO5Jk3|LFAajI-PsvIZ>t+aCFwFt#Z!7<rit}PW7-N)Bm
z^Z-rPV%Dk^;$0#_xvX)%m}07^82h8^j_;L<1ODj=h&iz(4xhQY=H5?0NYq&roO$(9
z&4FMMnWNY=zb+%X83CI(`0zGt%LnfU-L4;%7UDx0**%b00Tj)Qpw=jjfla^7VFvO|
z6_KZ8nY}S0j)Ph36|44<a5T?OMs*Ma8(7jqhQLll;Q}nx)xtvLQ#A522+slPU>D@X
zC#9msj5^0H!8;JXXTC17=j0jgYTX{)kri0=rlWb0-)N)gWC0DdZ4!T>@o>owv!8gD
zu3%;&KUoY5cQR(Xv;lXaWqPeI!{mlV9=oJ=F}TAh;|Sx*`0>!L`E6rlLvUxw%tkf7
zvTkT5gwnHt&Ttil^jg&o@ha3!ahnWDrMfRpXx@sitf6;LKOSal7AFqlp(ksGqr<88
z`e@_Zyqo#mLQY5`W_$PDNt}N7Hk(^j@ImCwTzm6?l0s*$WrrQSH1pp^1lJDBT<}e`
zJ4>!EBzp{pu|Cws-w1ekG9t?Ljc_HT(u=!z65<quTp#kZeFy!1%D8Kp!oTas;3yvR
zqGc-{WZ(Q4q#|MWvUeMbNX-TOJghbzb}0+i6u{$8+A>aZjbiXk?{Tkl!)g5TuXsTK
zhNEtYeDrbwep`X>A;`=#F@9@npIJo)dRu&Vz-qgsWq(<Nv1XFgXey{2Y!}Nym?2Mc
z_vzf7s99UfjeGqYx{R+MNBqY?)ofstch3N*NDUL!L^qVS@RzH{IY7Qdw!wkPi+D5*
zv{{zKqlx4>%)>RA+K0ylc4!v2<%t`(j@fT9h6<>2=CNxU6k>zuP1^P__w20$5;U$y
zlg`JowEUKR8&ST)fgpj0n|SWprqWkAek5Wp%s*3?(!^g4#38FFf0+l5z(*frti{J}
zd;~o=^;TKU9`71;C}CSfgfh{`5f=~K7|OGoD`$z11#TS)+s&(~#Z*P??yUH=jurv#
zH6Tvu<4iD_WMm!iBzn0<05((Mc-7J13zb`@HB*k-#|77P-ehE+L0e#fC#g)m=-qb=
zW9z|hcf+;=zE#dR&KV~0X){B<{r)sdU^afC1iyHl;1eXnUzt;q`T64Aftb`jT>_)e
zn8F<s2i{=%y=QXtIQ-UGu-(N;d&4;<LRA<XM2O%iNDk$a^2=L#^Tu+mt8j}1M;Du0
z*@j9+-^E1SbkZ&pzwF-$;<7;XNYXC-_=i@OOG|y&rq7Ej41^j8THU--v#XxJ3C!MD
z!Q5qXmBp7ZJrAFQ54~jFWz4Cx+T}Y-fnlGTDkQU)f@!Ub&kXPCU%x*ji`!pM03Hq;
zZvS7LiqY&`%rBMb<D?^x8JB~}-U=Cg))?_m$<_mzk)1<l2K_hBwg4Z=Txfl80KLMp
z8@B!U!RM0LMk^osxl)ps;>G);L!Uzri9^zZzkmIp7eW~U-+zTQ{!V~<`U(k9rJ7gY
zn5ueARX|AQCV1x?q=Ezw8Km2X5c`aFes)%p+~<8xnL(&Qs#z0Slu6nHS9wBji1#-r
ONHJ3Nf1n`$&wl`yp0Q&9

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-incorrect.gsm b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-incorrect.gsm
new file mode 100644
index 0000000000000000000000000000000000000000..12fec25d56cf39e92b04ae899eed85d34d994931
GIT binary patch
literal 7458
zcmXwdc~sH~)OJ(0Z&PYbf|CjE+SH`Dw2Y-9V4Aoqk|Jt?g1NR>O}Ui|mZ&YFserg3
zmK%z;xS)b-!jDZzO~75VWtyp(-tX)E<NfQNd(OT0JkLGnKIfiCLQAt@dvCC?rf^ls
zGf2oon5uGvJ%s8GPB*eQDX@o1p5#Tb<2D4T6M5ifXL~5s5!BJ`2&KZ*v(9ie)e)>%
z9QpP4j&6HM3Wt8Na#BoQ#%5Lm8(%AaxiSP(CVCx|eWI1(aR9J>i>^)H_2s|omExfS
z*zYY)MBtd}IzRiCydiJDZa~vAdb{FZ-=ycjSWHs>o9uy_FpH^HQ*FF^hCDv@NnYWe
zTq{gjZvOa-Tk6c>$v5REi3gVC%@;iA?gykxp>r;8o`3v+Za+E1i5|K<^<m(dp6U;{
zVqhKdZ-O0I5}TsXy)*i2WQs$_EskV=!d2x}HofjUY`87XLY&|3Bw6+}^lh?sKZL%z
zoPuiGn%$v!#@?=f^9AD>vQ;$IStPY`3-+0}sQtJ8_Zm*WQ~as*%A^H{DFa(2JNws@
zz0I?d6+eZN?cTr1@YQ5O?SV@Q*AF$d<A(Y&eEgu_DmG|J5_`kapxOiJXYqFgV`$>Q
zK)s)$ZYm<{icjoOZUq?zNUY=Ro>W;2l!U)QlDT=`C}nL0(i}itos^jV{<^NX4~R)3
z9wKepLvXrmHmTix^8UWsDWMSR)udTty6Qe0|5+Ll8Zfe+wL>Ej40ST%N*|vFb!tvM
zva%O0F$Bg=G+&u%nshj>4>?Jo-B9rXh_6t0L5-ZELs-f5t-F)sH_I(E4-{9XZz@ZP
z;4d(+U`t`9bhesv*{A7g`oGTA%O(n&R*~PIu6BCO4c;{-VTW-JOWrK_ur|f6w+^OG
zxEdl)c=<#bDj*!Vzu}aRK%sNZ(K=CkukZMB+)}OkuMLo$06um~S2Y*^8L>SopTXO8
z?bAc~R(oAa$Fw(dNG}KRT5Mjn5Ab1F?;^n7GwDtqIqipQXB&1A5v)a1Qg}%RNYqe_
z()v}OQNv8Y92eyIK-h71b>~UPlRkdc@cEiU#$wCNyC<I4n5#YyFfsG&&>ILg#@z)(
zPSMAx=b;0Q4nR~CwG+z}?`SOkled|-4`tqqwYUIAyMw#32S*!gB@#1Nu~Qhr7rJT>
z!o}3+KB|G>)W2|iQjP&;t|4x3-b-R^d{wwDU+9HA5H7ub_o%yZ50nS~VoK{Vh0Qkp
zLzBc9Vq$Tc0aZeqSla*dtef~KZnk}2iT`sPy^~)@fJg~?5uaZVNM}E^K*RWqW0<-l
zVf3Zk+>fWjG(+VaX05blS6D+>=2dK}ergy$JyOaI4T~IGtwTayo3h>$=kQXd9*xoC
zI=KIzKHdx~i~4}WdgJz&L2YaFP^9ob0UsrU?wVFk_H}-#xV{xvT^B++*A>)1pqE^%
zCJa0?g1y)!Rf8|R70xRI1s%&_F{ZMIozyN<<c^G~HEdtKRlupoGA4-e78}*d4i|jH
z-u(({YSm!-&y*AZ5=`yH?nIuRY+e_l#tH&})jBX1X#z>&s(46PF=b56yCj%AUUO3x
zwX?>uV@{spYCGL!l3<YNP}Bugx)s3KukHpx+lh3M*~2Q|?zsVE>Yt2P=WOLR-!Hy8
zcOnGWmey<R;k|flLUidyK*MX?R~Tw`D9o7kx0iiv*iY1u|A`sJv0(3(_)8NDC8Wys
zjd%bBQ+Lph6YqU$Y3&WkPS7_DeTR7$kcpqTRK|g{_5}T1d%E;Rk2@eTS_#7qRGhG=
z4ebf4sv28XwC3gPidsO17?oK2?+QyMnP!Eoyfkd=4a86IE*?v<RJ0H$=rJTn`o~rL
z#oV7u6JD~$JfAO->RQ$sh8{+Br^%0__Gm7yPz=eSLyf~;19NR5GeVnr+l_HcZ;)vw
zbr4C+DH+)Bf$$`WrF=XzIJ*cdr&+t9KghKUBS-rw19K9hD>bRy{Mn`yyTj$ke|#xi
z4Go!0%j#HJw6O#II1j)w)cAz9UwGGMef`N!1V9oxJh2#Hdbx|9Z0}em+l$3Eakv|E
z_3Z`)XOuMP7FzM^(FLKsUg1Bqr6HKAAXO<o<|pl{itJ?9^ap>ycdq2whkrOX&UlbY
zK&Kxpe%#0wb3Apee3>X3`7#mRs|6(_kE5BEvsC;0XboSL8|omnJbk|ieRo*T%S(=~
zu`l*&1kkku?7~Ks@4aYsf!9`<m0Osv?}$B=G#=rflY{qi<ogSZZ9|N00+;+ghvZI6
ziT>=Jw|D9FlnjJCV}IAJ0~na|uQ6mdaNEM<$&0NVDIuzn-!5>g6MoBRw{Zu>%8c7<
z9h6xgXc$sEi0G!4)ZJXmY&*|Yk+`zXx}I|>Tnu&r2Z}d+7dCe?cr>6!QkSxp`LYhC
zIWSp;JMSPa_#1@J-uaMva_`uAmM+y+4J?-|_C+D56a=|=cpK*7jE;7c;Hsrwp1c&(
zj>+km2NtU7n~1g9$U<r8ScBt9&pPPDj&_JovU(z>%edgsD+xX;BBShHw#z;Eve@i&
zMzs?|j9{_L9YQA%Zbwp)v(oAF>WoUkaVVk=I}Vqd5<5rU%%NYrfr(Wn0JzA5A;J1F
zewp34(eUiy3kw@BX^%VT&7HL}_&)h5vS$bNd4pDLoMnhyGZI!ITY&{<g0bjW>zmuz
zZwtBASG#Lh;6kXJ+ke2bi;Y-tLV~W2-cwN#K&eh_&~F~w_{$gAM!Xc+3Mx>~8*&qZ
z<bl%9u4z$F^*W9pIt3SZ-e%2GI$EW3K9fUZMx~-uWJqQ=Q#AxvX`G2uB(t3K%E(q9
zcgW=NRs*RhoKK^E6Wx5rGy7(=13fB)7WRe()s68?lv2g-4IsVL;T><U2Z8`NxA!U3
zWY+B;ZBw>dkfHzks^up|tN7u-8%7-Z%f!|-#_qk>M0Eb_)ZWsA+sD*F!4-Bed1C}#
zFS6GZO0u$k;G6@#ccxslp~i~Pb#lPD4MeL!Nj0&={5LbLb5yR9T6vI&7%m-h_TV-`
z-%T2suO>QZB-*q#xyA^gL<&K3w*w=5Ji#}d%|Z)DAtT*Tt;kd(q30z8$90=7CCo#5
zH`wC~hty@2_9lt$J5z5vTKhPNB}dXYil;_MC>gG7c80GMN+omQj`${)D!bCdfErLH
ziO5|QE`&R%r~}GIX9sP88#wzmd?klx)jNY=lI^V|VSTHIGL2xX93J@g275yeSEDhq
zkEPUsOP$?8g+h?z9i#c@bR!2<fn&(f1{gDe2U?kN01A+hH_mWv;eb*aPX8cZbB1dQ
z2i`7qyF&_WHMfm|R>%&j<PG-FW`s(5m`0cw*>Dm<5vWB*KknH<JJju<Omt9_H#nLU
z^1zbm2F?TT${!$MszxI>Fx5fhT?tqI_}GXujt~+LDw(E{e-3emX@5L>8Y2e{6$ud;
znQ96Jsv8>|ls~x34!79I$0~nd;Hn~w5b8vC$lMP^RC~w+=O2UM8X1<|R9XCkMd2Xy
z-UdfdAy?DwjL=YckVGTck1nPBeg3|Yr$$aHG7@sp*>5@35p-u<2u?o!Cq6+RPiY6_
zV3*0KWQ+BcZ(RPsV#Nv1{cUfo*}r8KtDmmQmXI~NfMI3@WNvIwO=8g=FQnx(xmHXK
zr4@2ujZcWJWrg-m;-}@bkRtx6$P%-=N|O(|`Km9nZ3oIIgX=OljGnjv1#mab!1vwT
ze(iiyBolO|-mLd46zq;X8X0pxR-x+y`zljI<41FLto{OX`RnfXDlqzgD(|BF%0BiE
zWo>PK`8_>IuGYOY+P`yeip@Yt2C=oVE>+oQ$&SS`%l<@2U&Jxh62<9f=WkjPwFC<_
z&m^Ai0fe=i1!WR=ao5b{DoUFM2o5}<+oZEwH~s3xB)HtL(A`hdmpX7&7F_2dzHgTo
z3WNlvg-k;e8jg>Y$7xuDxdTd)$pSOsl~|$^h*^DND5k}KG9YY9q1~3o(TvZPTr>|H
zJ@@kbZ;z{=^zmrqzzk8<(=X!TJ_mUXY8VgQ4fR5)2m6YF#+v8&s<zT1GrmZD>8lF=
zjuVI$2NvNTkH?Dl^cz1Rq*w*vA!n?ghggdt*cQDg$N=d;`xb)B-iV~*Dq?TbWCm9v
z?cJ5^v+c9o^rX*QO(vq)MG>;XryNDsGhUvPhc6PcpQ~R;_h>WaE3s6a_1<dh#i|2q
z=?d`{%@Q|#>;v&-*{X3(mhi)FiN>Qsk8|(G+EJE18gyi9fciQ!G}=vmYphmKRP^y@
zK<i1~e`)c3ERr#ufT~sErJ5@{x#JX}K^i%gNok*yEO;jPrqwp6B5%F>(}R`!U7~v@
zwrQo1cjWGcFKRNZK~n3VaDEtNT~&MEDrdVE<od7G_<302nm{#<D1NraRY_|6$o&%*
z40T(*m?ChtE2t)jx2l)@9@$W!sVWo0KY@tY_q)WK7DQJwY()Gn-yNg+08{fzQow%z
zKhyMUr(oh^L-~&Uj3WCF2b9@Au?g38R^FVI+n9QgMtUtm$X2rx9Ey=rS`~xhd{Y)z
zMMNdJE(1o?$<m<bEAQ-WQ%&#7>pc$aT6U>{z79Bx;lP?Wz<Qzy!S=6A+VvsfQux+*
zX@y=A<qj(CC)62DdXB%Ti@!l{t^&O(FB^>6T%2`!hb&Ytb~wwNaEL7J%8KqTq5Ne%
zXi^mS#PRH1*SXe`>}7d{&Tk{as9_U=xm;L%llVXoHe4N~BJ?li&}HU>0T1P~JJ}(l
z{RsL8eo-E?y=`J6kT-|K`ygT_vaUT&ZB@ycy3Z7ptwdJ>uTiZ1^=v&S{QeF<Wu8Lk
zzCb$pp&Bchc6&crxWo1l)zVjC?)3fHG38s!K_wQZQd^%X<^0e|sGGW!W{%k!9iT-=
z|AT>*5UMQCNWA)?{vH=Yy<Ar$1h<2LKO?tH-|QXRq~wn%{Tt8VM$=l?l{O31#LF5i
zu<Ygw@V4MVTgl`wlXGA)^3=L%r*5KY;OouFn*AO<KyARzq8{~5*EuhJoR0S=$zw(j
z+-#T)FU4(Z2UDE704smps;9LMktA;hzF$)-vOkaOLrvq5#GcJ(iZK!AMayZ6#O~~+
zA|J==#pkvXBcv+P#yAXRv*9Zo@5U$}C5p|jo)Mj;#TMQK1C{soU+bKb-m!rax^`-Q
zatx)x#S_anw4#~Y)H13SWUdnY&Qo<kS}6ybI+kZDVcM~?5c%_@`=Q!dM+1xD@BSk~
z2&rS<|H0-+^vlS&aYyiOp`qevZlB(ZonP^dI@In0#|TL&80~2&5p98nkCm6L9oeOb
z%k$!g7s_ne&a|rC^PGX+<MegKiG&)R_2(n2cbUU-4nAO0#QN~lgvv7dm?S!H)1LJ;
z!-FZA%Ca{+f4N*wTATc<>zv3Py2>wlJkfqQ(N_F$-2O%iOI#BFOrH#+OKnII=P8Zj
zCWZWdisx6*gQAK&lmrX?>v+yl3FfAQO8OidT{3!9F7q*677kB9&lw&VJc<disCk=V
z6I4pL5-W}OuhaB<*!C=6f@WOWBw0ir?$0r%<q9QP3#~<7Uulw6tg&7el9l^(c=w>?
z@AG6y$e@LtVl^lzYd9u}3bU42N4+Z&Zu^y9%Ld<dSLffHqYqmQ$P&$IcP(_&+HA$*
zwVOvWhRs9Yk{n*#-8`c#r~nCd91rwe(G_m)KXR*MQf!@H>UtMyW^>I9K2&{G>*<dj
zn!Wy5#AqCgur2Z*)5=(WdqRth2g8dG-kj9TG@}JGe)QMVZrfRt^v-<&@-F#Ok|<Qv
zQ{6vsYIP<fVPAkJ*w<xn`+ERe6v5eh&y=NzEA#Q|xHE5W+j)Jx?_kVOEb3yPEi;La
z8JZ1rdlfVxZ)^+Do8OdAmcsS~Kwe%g?3iR`Ax%A-Eam(^e%;Zml0SbTJ)dK04`mzZ
zFV}XOBseu@R`<O7`9%DKTH9H|=-*OJ$e1{v>3!#S$N21xx8FQ|mbT{d^GeF4$vLLO
zoDFY9TvxU)(vRL7igNqcFC#!jLcH|Na3~}9KJyoFnWXxEMXT)KWPf)9Flp!(`Vy*`
z(qF+q)B=U@c^}q2>ebq}V&V-+m%sZx@e@bg8rH|<L`P%)EmNi00tVaN>sSq<3|RE^
zPzP$=7t(o_!T78*!AQL(Hv#0UI|Q?(R(+vgPeMF3zSPE?NG4g=V>OpYbGoQlq(DV>
zoes&Wm6x#OlDgA-6S4FQUdM;Zv3z?8@`VaJ+ZLs3vlp8Vwi=@8O3e*@o3R9#iu6Ur
zV;=1bvAZ0i<-bKnRAMzf22_MrYOa4U4cm8wI>-0y>g|}ZdLigi^ZX1u#a(=9Uh`qB
zq#9b$7S`L$?BnfwQ+tk`i2;Rey<+SG#lLh-(cbQOEYU)B8(zD;QiE(8!gV(1bP8j~
z@Y0=@m|If3nZfqWq=}e(PSwSp>F*?c1MY_9gS7oEBRIG=Pu}~cduX}HK2FMt&DBZm
zMH(1Ei!p2=^dTC5F)w_jNeH<ST>_#CwK6CwSAQhRd4e>gx`a<{+9!<`^znev=k@I9
z<Aj#0bVY2^+59UyEp>s8k}$Y3$c7hiJ#({zF#Bn1wuR)tvW4O@le&|s;kKpMk^h7{
z)kJ3tA~J&K5-nb)_CF`F<jeBqd>`y2BP6}8%ZSh1{W}*3^wzY6?pD1GnT<w{e%~**
zNRlc$@6hV5eP-V3=_wP|9Ga^7N*!yR4X<*+FS!THiD?04nw~aQ6QH@*-AhU~_+C20
z4~``ksBY&OknvDi46~qQ-dS4x*G4G*j!7Hm(8anwm0lo1L&`e^y=h`AUM&tTxyTMD
zCDcJ~z<F3t_-oNPe3JY(DCI)kVJ|m`m`i_}n>g~13dy6TnCQQG2w)e4H7lO3HS^{I
zN$yd#_)C&WZ<0BTzUClK5bRMlx<e9}c6tR~$~x0QRb6!w@Hug@a60Or2QB62-!AOn
z0ew*<IBlm_@+<>sZ$oN*4}A6|70I>%Vz1O$f*C*Un%&V$?%c;MoyDW(+f`XlTEt&G
zwBo2}SM*vZ@JJ`Wd18S1Bx>+_4(t1Hq`eNNC0%^Q&ZKxa%1q61U4G0M5?@53$Bk9c
zVoBLVI`R>rrc|7IYE>MYZuy{4991=I7hXOHi9c5nN^(i9!}Dop5R>B6NaI5(S{G$b
z$Ni>-A58v$r15KvUvy}A+K!IG;a>sUNb>NV^PL*9`_^H^w!W0M|0pP?hIAh<L(z<5
zzA42Y@y&hHs9@dL0VUc}2#RN^8P*P}c&>VV#6gwtWm3$EjrR!5Oan>|1q5%i!!)%!
zVPg72DcpJ0mW_oRX^v>I_3#jO>lD+=9>g<iuYJ<4hmE#3Sv{wIQ9Zc-QQST8#d6&U
z+?+6?g#So0cvd&j5u6H9b{;6s6F?M(AB2Y{mRq9aV;hY%zJvAMM$i4Op|R2<-vA_c
zZmDX}?`5ms1iPg!_;S^8d?IQswP!Opy9>9}6I|wH8@XiE@n3-wH(^6N5`3fbRUcVl
zBRAUZXKYgR!g&!)=}=E~J1RSbAlYK#R_ttdYiN{RYiQLp-c#uNNc+Pwwm(?)tji@u
z;U^(x>e5IjV9Ih>nU4tecCj5?alvPH4F&iP`N!^iktAW4fyx5+BA7`vI|El7V*-h#
zf%Q&-mJo2D;NrArS(Jpx#7F{d+N=t>FQ1WItSGJD{FZC=Dg59-!8i5+k6jYWOfx=b
zXm3EYyHy}crJINZbF3Wuh=CCHPDBmINd>U-rbpN)?juS&hz%d0H%FK>@E`3FFYIX4
zB0eE6gaG(7wYs@_pqf(p0>kbC=fb`PH+0f+1T}tw&6NC3zF3>d_6Xb-ems#?>O0?%
zU-WR^m#;NW$eZ;=eWsJSOTfE)8J}U{r9uU?&}+SxE!>kjTtiM!`YmTRG8zBR-dJQ&
zJoiBU6IHi#nZrGzqYgoq(9a&HlN@b)ZcEi(tP7&Lxagk-dX7p8Y(ssGES3~we%{^f
zjKs;1_3j!Xc?FQOX&yxxN7^Cz?7uKBa8=VrEv6m`rXIcP`}6jiO;`_^nt0bBJQlIP
z2(j2p<R8X(I*T|%eqpjh6&_}>YvLaQg3B#>+8`*G2sbW`y2MFN?V?$m#6EF#<QzkN
zPM(RBMPn|W3t9{5{F-sd?>W-CJX<;Q9BESi5L12uzFbTMOU#nBu1k&Q{u3f--Z}Np
z=4_2u@@p&9E})fBL_5q>4J>9xZ=&tCoThM<r5x_}1eS7P%~6%ZRW71vK(1wpB-W3!
zi8gG3D;%0GZMfi*;~**Dek(7>O>Y_Xxx~w18CZ#n8d??LET~WXDm+pb30zG@)|0^F
zTwaC6b%4my0MGnLxfR+;ZGu!#vE^z#sYCrf+6_dK1y#AiD|1?W0CJ+`z7Kr{9dp%4
zw9aQd{NZX<G)swwz5hUfsY%@T;zcU96pa`(Ahnyl-?FapY_oYEwbj>?-H4_OW)u1^
z0MqQDQgqKF*TqW*(a{#WNIbKuOK{*vIXa?mcT8KnIE-OxK(F2+=QyaCnZ7YpQzDab
zGrYj)gs%=+?d3`rS!EfHp>_U%Qf-yqy*O+tlu>2eqkoOBS*IuYV~;UK)+M;&s<Ub~
zC6j@!y3`WnP>sf6j7Im*SK-dgj8NxARwX8r@6Ud<NZC(D;}qVbdTUiUq4$K|UmqYs
zP%;iW(ZGMZzv`^}FReUsWpBzaSL-=GRTzR{aSH3su-%SUjmS95pnq)E^M*0(T_gRf
z6kQV=Qss0dv0qnODbj{jrzno3mj{nmw*`9+p9+9<{6^BFVO-t(zokYJYL6{R<WDD;
zlF{_MyaSk<)1f{M&B}+#Wg(nA6H>=)L-t>Xjy`-lNywYfXx#jLZ?ZN|ExJzq)m!pt
z>m2=7v~|SbN!@D*n4$vpu!w;$^QmJy@l3`bq(}#xnS1G&v;H`7Ue&z8P!i-nSLD5T
z^=&DfO5fHGxz#$k9%E-U#iiB3BULT_n*dDe;v~AyAQFEe!Pm3~%ogsfa?1lJ$@8n2
zgODq%C`oYOqPSwSy~nsfS+Ut%oWvEQUHkQJA%H3<T$&{Fl^hCdEcQ*$#T43E`s<uO
zU+|AQa1$4x{uau?JB*aP4h0lpA9Xnq3=5>=qh}iTC=zTTVAedp((H1e$rVtdsS1#X
zEtWO?^z~ZQl5fj7!Am=2M7zu2p$~Ei&bYWJNk|vV|I|iw&vvGJ#Xbw@^Nx<vkL~N}
z+-JwO!beP=rr3eSkMAxP4W5Jj9RQ!jzXNPYkLeNba*o)%emc-2?@iqDL*d+4Rl=VX
zr|-4UFCD4=154XA((5XuUGT*p8ThpCk&Wc>A4{PFRsSX)g?NkU2*Z>5xL6!>m8hsB
z_Lx>>IXcOHIefHO)`P1z{d+&@hzEVzwqAMm(T<OpYqE`(8{o$wvS0Ro%pn;&l5Q*f
zr_Xs9dh}96Jws!A2KADAiMN|sEz*N$noHB@0kkz1`|`VvfcO*HH-8!q-EIZG-s^~2
z^U#$9kxfG~?>u1qjR0=lu~0t9jLzW0RHv);Z}n)Hc87M#f;N*exn~E-*L760&b|M6
zttRHr)MNHK(r?U+tWcsyqz4TZ%3GCrP#+oo!R>)ybcaS$Dfslb4)fr)S=^)cW#Eb5
z+sU;Jwh<3(NRt~vmUDz5w<{fusazU)CO};{Z1BTGeLK5e85HRygk1mOXh{ZCwMLF6
z1&HO5+wRZ=q&4t1muxw;0j8!5LT_z=mr>n8>)nBngmx&)*+E5iget1L>K?B+yMq&v
TQ11;$C>059_}}38f7$;B(8DRC

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-thankyou.gsm b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/auth-thankyou.gsm
new file mode 100644
index 0000000000000000000000000000000000000000..93f936d1a0c49ac8c8b6d4d0efa285d1e276b978
GIT binary patch
literal 1353
zcmV-P1-AOwUy)%VP(U`@ayHy{068RXHsg>0M%!)2Bjf-!+m1He*XM-ZYPtY79Fex%
z*q}KhZMO@8pywk|$s=+ANZU?FB-kl@>V?K2O4O1j-0(n3+iA%i$LvWHog*e>iDH=6
z)TGnst{uyjk~H^`1FcX^ko=AnY_cr2OzpTN-b}XOkGT-krk-I{UF^Q(ZL1t#3t-oF
z#GhYj+8~z97+;6-ba5`6)TfozR*$A*IaO68zi8H!&0G~>q!}GBKVtDnr81EuywxRj
z-G;-aVmq=jd}F3u8d=Ebl}D(4O~fz9C^q66=JC}beda^Q3#luuCcDWgC>?!NTbYI~
zQcCFV%Lh>8>rm6xV0I<T%_lnQN%w2bDWv6+G?$wv$x%nv>zjq7I#))A)ZU&Y!_P$B
zLLRx2&t{I^rNd^?Bl3+hT9cn+_4!PzD%DtSW=o$U3XWA((rZJuCCXJ&)`NasQBPIe
z<vP1<CFRm8#AWN;<z~Qk{Ml;a3e&Pd-K4{|<UTVb+QhZnZZ@>iE4*prZz8zkN4n#0
zLn8E%)K90u+l4H?;&DOLPqH}((e1pcn{z_;<BhJQt0A==PsWwx#4)ptSciC{$y%sB
z=FzL9W!##hr$Bzn%zopY9f`QlxMM}yQaKcO;n!8745`^<L<!v6Mp<EGCcjX~_DU`5
zZBodh<C!~G)r^gmiZ-p-r<7iUen+Z>dC3%_XQ^Z<PCD=fX_y7wZJwmYQE~Sj+2?%T
z9Kxj5SZ(a{-l9)MZv0!0<Ff9WHQ(1tMwD|$)7olVSyNJoha{HP!>Fc9F3Pa8;>D`n
zZZ1-g$1d`cG=$o$dzsXR$9^MKmsW7-8l}yNZIFeS>e2{*;;1^DhFfpd*&VjzlS?)U
zll>85C^wPvv?PQmDI(A);>_o+BNEmj*d7eF(~qh8qHZ?rkBa#cDc5Y*>N69O_acwv
z-=hQTNY~vZw^EVjrmA<`X_Lql^LJT-l_(b<)+URWNXEU4#N^jpE<4Maq^cW-@noCm
zNeg}`-Rr7XigT$OQAo+%RT!PtoIW?qQ%Kj;aVXoPCD^@jg(6de%!OwL{8fZXu3^Kh
z)!sd~)KvsaTIn{Wt0b9W&`7VV<O2{L?JZeFP-<7pDb<}tGt65D+QY6++Or5ZVQyIa
zUFG4ck3^rK#zNHC64TY3Oy|>IrOaH4MFzbGG`Eg5V!cQx<en!JzbD8hGf3OiUUX;B
zza*I`9UCgX##AMZM08<g_L5RUs$oOld2mY|(;$pv;K4+=?0rh>!$bt+xJ=w+#=8=Y
z%ztGggkx1G>(ZmW7uaOwKU8K$>dJ)26TP&R%_5o1jeAqZqcLMVS54Att7GBOLeWcf
z$s=mSHus4)8`y-X<WT(#Zz3$B>Q<i8EyEk4e#G`mk|kT*;-<dJ7g}*4QQnDLvgE;~
zC?i;;(ldIily>83J5n~(=%LEoS$Ux7!7|}js}|^?FKHz<mD4VHS}pA%*ABI7Q14<p
zT9pkRdqYgI4mzZLBSd?hM+ws{nVDmDqE>pCsVDHGNg4^cCFUZdE!IrXcVV+4<o6fS
z@PU>Th=SKBWw#}CfuQZN%uRP8w%fe5jOxKx(p@I0)3909+IqraU6VTEV1XpBG7)ol
z!AU4pH0*rgNZOC6>eTUb5!&X!rh?IEVv69oba~i~oPZ#%kH)FspuFA1*rU~HgN@o=
zU`p$7#-`YyNo#I`#p*!I95XoEQlK`Qb<I=O<a3$Y<lrS_vL>a(z$;yjMvRsKTO5)p
LC77TlosKBmtj@qs

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/beep.gsm b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/beep.gsm
new file mode 100644
index 0000000000000000000000000000000000000000..d38eda9cc55c8de7b488dbd7993b545210be692f
GIT binary patch
literal 726
zcmXBQdrT4m9Ki9;=GJEGkIcDg8i$&pvgQl{tu}nSmMJ3w0!ssDs5t@IbhULhHDcN5
zAwJ5ubC)8avqCuaAJmDVfr)ciq@DswJ{rxow*JYT|9|%VJzR88U2k!MjojJF7fj^r
zC*|(+K#{DK$*YbmNqm)y<YMelkp+Af+T|^8!G9~>aTTLTMBqUpUjfZIBp&Snpdh}o
zWA65`Fc=V4*|~QFxITN>pjNRsdx<kf0yqIwFPJ<hXSua1|AGwXv*(AhoS>IFJpG;+
zAwTjW<D_+60T;Y!6{BXbeWQ`)x(QZ3n{uZR1vSXPOs}LEOT5#T)3^yx@cK?f1zHS7
zWjs-^;K|nDnJ5Lkv<mrAKdcSNl1tQO?0;#T0ipntRGEB?rv`Yj!^OY+&{1YO1=m^q
zHTjBe0*F`!L^IG21K&`6L7xb;Y>1fAy+FFqxVGzJ9-N7RTDT!9SPyuf!izpRII`7X
zzAJ+6(=OQ~T?{V;k-=KAvQ^WAOE0F{(!6lE>~-u1VN=EpbjC*jjHQ*l?9LTJ)pOH%
zwFg|PiS7`Aw|!4|RAL7?Xjv4YvobhvqS;N|1p2B3VS;&lag?2XfdCk&LO54=LhJtC
zJ#HEdd`?LZEB9J?^h)oa!vYXu!crM>(s)9kT&ruMlN)I|2VAkz@_Us4x(P~05bKfy
z_6W_=7ae4hUPenCuqUR4dkB14Ot7B$T>zyV4=79DhU9EBzorWDiSc~S&%*+em?ScU
zJ8-e$nz#|Mj_E$x)XuUz#Uo3Q0FNP4bquO=f?GBEsUaa0n#m2V!$4*Ab#^TQ%-|_x
zgl2cLBxj{lsF`ew)0jzeuyPx97ZI;^vM}B<g?tMbY#uE5p@8Ggb34{`cu`kiPT<=8
iXcUw}ChEiG=W8T-lm?6LCo$t>OP=B*g{RvJ<NpKQfpTF0

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/vm-goodbye.gsm b/trunk/package/luci/applications/luci-pbx/root/etc/pbx-asterisk/sounds/vm-goodbye.gsm
new file mode 100644
index 0000000000000000000000000000000000000000..735b281c8eff6e531d617b97b628b8f2a01779d0
GIT binary patch
literal 1683
zcmV;E25kA(pOc{?P#`%QGC5>gfHxeG#N?&`NhFQ7+~fdA+il4t*PDtR8p;4R+j2=8
zfB-h+l1Cf7AV(x^w&d<$M;vlVBiSUfnPH>=Hso?h+-@K^<Z?#jW*|o-Zb>6}07%@D
zM<mhitr`-;;kg@fMuSoSIVFi2fLP*t6_Ga*TA>>|mPXOhF|^%Su%Q(%l1P-S;T3*S
z#T!_`Lamlo+*Kf!nyr0=(DAe#8Cs!6iqW~DwIR6Lezh#<;i%wF$n08x`3gx~+tD=B
zpqX6&xma$z)3TsnWCF^|uE1I24QCsypl4leRFu%NyWv^5pjjolBUfVp5_X-#v20){
zTUKoxu)ye=ZMNjlZMAh#Y`{%jO;qK!z+!c>yA#^LM_$Y<+^*nE(PrCQ*Y<PP8-c<*
zW&i(JUnmd(a@%cZ%}H!(HsEy+&LeJH9M)z#+uM4~rc9pt*;xtcmo{M{q^viSiT7Gl
z3Lw03KO@tmZDY$*NFcneMI)xBVDoW4YNqGId2vqSRRuUVZAW#}BZXhoriU1ntjQl%
zs2LoTEbCb(2ON?Klv!qY>T#(f(<XG^+Oa0N<cdh6u_QG+X-MI*;+*CsNdj4ebs=&@
z<kaG1m*ZK6M;oqoT3O`ROM-V}S;I(Ru{j}Gq23*Cxkl9AU7y-n;^wPoM}ApF2@I|o
zQ&|Phj7rp_uSd7qiP+QApl&D9u>ym&u&S6@18Z9C$fdI*t0y)1+jPV<zY<AU(juN;
zP<jGL#bqb0%s~qrO%(6yLF(LXwnbK<%Kd6c+|enOG7w_HDK)W+lEmRSSG~BL!C^Ba
zQ%GgNpurgqHhj@2ye*=}!97u|w_0L>DSVYF6K0^s4*hDA&0w1pZc97S=96kEX+V`C
zE>lNqAnbH)GTUl_SlpLJBi6vDT}In>(J8CqDQ>{FnQBW5+<`e{hD9OZpw{w^TN~h@
zwp5YG-O#PYCK~F%=TmL9T;#w-6;;P#<iIT3?M9sNKvyAcsUy{AdyiJ-!AUH(#)<3D
zNX3rW<4}$^+){MgSL?Z&s&IbQE1TbxSxz-44$EV+Y__Z6r+-^Zw408&#aqbHV>+|S
z)a<-t3|mXT8j41;w@jCMim4l03#8$`Mw++hX7&oo#nkbPs#IMoy6KHx<6R0TBB~cV
zw@5~!ZPP`!h5fo{(Pq^1d}f+kNbcKF)l;=;E7FHJ;j<~$*KR1=vr4#|>a`u!G*xO;
zvF0{o9_pf3=f#zXMI)^$H(gQ<WLL%}-8j)*)pJ#C;#Z|bO?AUOSHhK5;w5sc#D`OL
zNUp1Bs*`oN*wu4gY2sCb&d!3SnpI498*WD1Q>cktamd?KrM28`w`0|ERiaa+Nv~UN
z#~Y()KICb~BBKd6+=;l`p{KE>im2Pwv0Y*lQRI43Zb)8H#ZOtS<l9llK3z4*BA<mZ
zbEvs1)v#5f8&Ran*BUD7@5Lj33KwEgqRR}j4Da!!z^0CiCe`j;;!{(Eo8xK88dFR)
z<B7Q(r^eVj8Yrn%q_~EXnxoZgW+{|aN;cQBHse>QSr%eQqgP0_+g~`tS8F!gXV)9m
zW^L`mS;g5icZ^%LNFAH5IpJSuLgaNbcU{FsC3U3c)n9Gy0$T_j<Au1ZxQV9s4y7Zx
zCOlr{$emkgHydxo8P(fm@`ATTMw5*G+g)WV8+cpYw`8}(jZ(I@<YPf}rqI<}R<aDW
z2QMU!Hr!idm-99_inQfKKgGo%vqYDfoyeWl8E2{0TLh$IZ@XNxV!%~bD`2rAX-P6p
zGgo4_BQ165)R}Mc3|Avsm1x+ztt2TMjj11~qB!L>Au3lPn4}ehUesBK?gOaeYT{}p
zXR4yFWMwxKQvvstYNVV~Vae2sG@#YkMzTwzV%M>)x=>KU_v&^gn581^D07(7p&|(M
zRy2mxm`1V;?!rl(k|r*iq4-+LMs?_+OdF3T`<&q8nrkSc(wv3jTjU{WGHo{$+Cb?d
zN=0JUz{?zr=NgEBKTN45Wz!*y-RgRvRPkL4CRm_Y%rMC=Sl~3%vb$7<z%=BlQ!CSC
zi=iUOpgS8<NYtc&DPwJF<hr0F)3w_YfS@Sknb@4vqnqI3j6gdqZMfWmz*yXFNbB%`
zHsh5!99DoS9g-&G)gz-JVT!;>T&=d{ynsgIl19|BfHx#|M4MPZS!1o%qts=rq?%BG
dHzaW>BTxWIB$7!aPyk6Jl1U^`07)d0NhDIuL#_Y-

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/applications/luci-polipo/Makefile b/trunk/package/luci/applications/luci-polipo/Makefile
new file mode 100644
index 00000000..4f5743f4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-polipo/Makefile
@@ -0,0 +1,4 @@
+PO = polipo
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-polipo/ipkg/postinst b/trunk/package/luci/applications/luci-polipo/ipkg/postinst
new file mode 100755
index 00000000..0e23e2a4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-polipo/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-polipo ) && rm -f /etc/uci-defaults/luci-polipo
+	/etc/init.d/polipo enabled || /etc/init.d/polipo enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-polipo/luasrc/controller/polipo.lua b/trunk/package/luci/applications/luci-polipo/luasrc/controller/polipo.lua
new file mode 100644
index 00000000..1113f8f2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-polipo/luasrc/controller/polipo.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Aleksandar Krsteski <alekrsteski@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.polipo", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/polipo") then
+		return
+	end
+
+	entry({"admin", "services", "polipo"}, alias("admin", "services", "polipo", "config"), _("Polipo"))
+	entry({"admin", "services", "polipo", "status"}, template("polipo_status"), _("Status"))
+	entry({"admin", "services", "polipo", "config"}, cbi("polipo"), _("Configuration"))
+end
+
diff --git a/trunk/package/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua b/trunk/package/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua
new file mode 100644
index 00000000..6dc35d58
--- /dev/null
+++ b/trunk/package/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua
@@ -0,0 +1,188 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Aleksandar Krsteski <alekrsteski@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("polipo", translate("Polipo"),
+	translate("Polipo is a small and fast caching web proxy."))
+
+-- General section
+s = m:section(NamedSection, "general", "polipo", translate("Proxy"))
+
+s:tab("general", translate("General Settings"))
+s:tab("dns",     translate("DNS and Query Settings"))
+s:tab("proxy",   translate("Parent Proxy"))
+s:tab("logging", translate("Logging and RAM"))
+
+-- General settings
+s:taboption("general", Flag, "enabled", translate("enable"))
+
+o = s:taboption("general", Value, "proxyAddress", translate("Listen address"),
+	translate("The interface on which Polipo will listen. To listen on all " ..
+		"interfaces use 0.0.0.0 or :: (IPv6)."))
+
+o.placeholder = "0.0.0.0"
+o.datatype = "ipaddr"
+
+
+o = s:taboption("general", Value, "proxyPort", translate("Listen port"),
+	translate("Port on which Polipo will listen"))
+
+o.optional = true
+o.placeholder = "8123"
+o.datatype = "port"
+
+
+o = s:taboption("general", DynamicList, "allowedClients",
+	translate("Allowed clients"),
+	translate("When listen address is set to 0.0.0.0 or :: (IPv6), you must " ..
+		"list clients that are allowed to connect. The format is IP address " ..
+		"or network address (192.168.1.123, 192.168.1.0/24, " ..
+		"2001:660:116::/48 (IPv6))"))
+
+o.datatype = "ipaddr"
+o.placeholder = "0.0.0.0/0"
+
+
+-- DNS settings
+dns = s:taboption("dns", Value, "dnsNameServer", translate("DNS server address"),
+	translate("Set the DNS server address to use, if you want Polipo to use " ..
+		"different DNS server than the host system."))
+
+dns.optional = true
+dns.datatype = "ipaddr"
+
+l = s:taboption("dns", ListValue, "dnsQueryIPv6",
+	translate("Query DNS for IPv6"))
+
+l.default = "happily"
+l:value("true", translate("Query only IPv6"))
+l:value("happily", translate("Query IPv4 and IPv6, prefer IPv6"))
+l:value("reluctantly", translate("Query IPv4 and IPv6, prefer IPv4"))
+l:value("false", translate("Do not query IPv6"))
+
+
+l = s:taboption("dns", ListValue, "dnsUseGethostbyname",
+	translate("Query DNS by hostname"))
+
+l.default = "reluctantly"
+l:value("true", translate("Always use system DNS resolver"))
+l:value("happily",
+	translate("Query DNS directly, for unknown hosts fall back " ..
+		"to system resolver"))
+l:value("reluctantly",
+	translate("Query DNS directly, fallback to system resolver"))
+l:value("false", translate("Never use system DNS resolver"))
+
+
+-- Proxy settings
+o = s:taboption("proxy", Value, "parentProxy",
+	translate("Parent proxy address"),
+	translate("Parent proxy address (in host:port format), to which Polipo " ..
+		"will forward the requests."))
+
+o.optional = true
+o.datatype = "ipaddr"
+
+
+o = s:taboption("proxy", Value, "parentAuthCredentials",
+	translate("Parent proxy authentication"),
+	translate("Basic HTTP authentication supported. Provide username and " ..
+		"password in username:password format."))
+
+o.optional = true
+o.placeholder = "username:password"
+
+
+-- Logging
+s:taboption("logging", Flag, "logSyslog", translate("Log to syslog"))
+
+s:taboption("logging", Value, "logFacility",
+	translate("Syslog facility")):depends("logSyslog", "1")
+
+
+v = s:taboption("logging", Value, "logFile",
+	translate("Log file location"),
+	translate("Use of external storage device is recommended, because the " ..
+		"log file is written frequently and can grow considerably."))
+
+v:depends("logSyslog", "")
+v.rmempty = true
+
+
+o = s:taboption("logging", Value, "chunkHighMark",
+	translate("In RAM cache size (in bytes)"),
+	translate("How much RAM should Polipo use for its cache."))
+
+o.datatype = "uinteger"
+
+
+-- Disk cache section
+s = m:section(NamedSection, "cache", "polipo", translate("On-Disk Cache"))
+s:tab("general",  translate("General Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+
+-- Disk cache settings
+s:taboption("general", Value, "diskCacheRoot", translate("Disk cache location"),
+	translate("Location where polipo will cache files permanently. Use of " ..
+		"external storage devices is recommended, because the cache can " ..
+		"grow considerably. Leave it empty to disable on-disk " ..
+		"cache.")).rmempty = true
+
+
+s:taboption("general", Flag, "cacheIsShared", translate("Shared cache"),
+	translate("Enable if cache (proxy) is shared by multiple users."))
+
+
+o = s:taboption("advanced", Value, "diskCacheTruncateSize",
+	translate("Truncate cache files size (in bytes)"),
+	translate("Size to which cached files should be truncated"))
+
+o.optional = true
+o.placeholder = "1048576"
+o.datatype = "uinteger"
+
+
+o = s:taboption("advanced", Value, "diskCacheTruncateTime",
+	translate("Truncate cache files time"),
+	translate("Time after which cached files will be truncated"))
+
+o.optional = true
+o.placeholder = "4d12h"
+
+
+o = s:taboption("advanced", Value, "diskCacheUnlinkTime",
+	translate("Delete cache files time"),
+	translate("Time after which cached files will be deleted"))
+
+o.optional = true
+o.placeholder = "32d"
+
+
+-- Poor man's multiplexing section
+s = m:section(NamedSection, "pmm", "polipo",
+	translate("Poor Man's Multiplexing"),
+	translate("Poor Man's Multiplexing (PMM) is a technique that simulates " ..
+		"multiplexing by requesting an instance in multiple segments. It " ..
+		"tries to lower the latency caused by the weakness of HTTP " ..
+		"protocol. NOTE: some sites may not work with PMM enabled."))
+
+s:option(Value, "pmmSize", translate("PMM segments size (in bytes)"),
+	translate("To enable PMM, PMM segment size must be set to some " ..
+		"positive value.")).rmempty = true
+
+s:option(Value, "pmmFirstSize", translate("First PMM segment size (in bytes)"),
+	translate("Size of the first PMM segment. If not defined, it defaults " ..
+		"to twice the PMM segment size.")).rmempty = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-polipo/luasrc/view/polipo_status.htm b/trunk/package/luci/applications/luci-polipo/luasrc/view/polipo_status.htm
new file mode 100644
index 00000000..c2695ca8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-polipo/luasrc/view/polipo_status.htm
@@ -0,0 +1,18 @@
+<%
+
+local uci = require "luci.model.uci".cursor()
+local addr = "127.0.0.1"
+local port = uci:get("polipo", "general", "proxyPort") or "8123"
+
+-%>
+
+<%+header%>
+
+<div class="cbi-map">
+	<h2><a id="content" name="content"><%:Polipo Status%></a></h2>
+	<div class="cbi-section">
+		<iframe id="sf" src="http://<%=luci.http.getenv('SERVER_NAME')%>:<%=port%>/polipo/" style="width:100%; height:350px; border:none"></iframe>
+	</div>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo b/trunk/package/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo
new file mode 100755
index 00000000..0c570630
--- /dev/null
+++ b/trunk/package/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@polipo[-1]
+	add ucitrack polipo
+	set ucitrack.@polipo[-1].init=polipo
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-polipo/root/usr/sbin/polipo_purge b/trunk/package/luci/applications/luci-polipo/root/usr/sbin/polipo_purge
new file mode 100755
index 00000000..23ba5719
--- /dev/null
+++ b/trunk/package/luci/applications/luci-polipo/root/usr/sbin/polipo_purge
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+DAEMON=/usr/sbin/polipo
+PIDFILE=`uci get polipo.daemon.pidFile`
+CFGFILE=/var/etc/polipo.conf
+
+[ -e "$PIDFILE" ] && {
+	PID=`cat $PIDFILE`
+
+	# send Polipo USR1 signal to write its in-memory cache to disk
+	kill -USR1 $PID
+	sleep 2
+	# start polipo with -x flag to purge the on-disk cache
+	polipo -c $CFGFILE -x
+	# send Polipo USR2 signal to discard its in-memory cache
+	kill -USR2 $PID
+}
+
diff --git a/trunk/package/luci/applications/luci-qos/Makefile b/trunk/package/luci/applications/luci-qos/Makefile
new file mode 100644
index 00000000..ef79869a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-qos/Makefile
@@ -0,0 +1,4 @@
+PO = qos
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-qos/luasrc/controller/qos.lua b/trunk/package/luci/applications/luci-qos/luasrc/controller/qos.lua
new file mode 100644
index 00000000..4a7092de
--- /dev/null
+++ b/trunk/package/luci/applications/luci-qos/luasrc/controller/qos.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.qos", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/qos") then
+		return
+	end
+	
+	local page
+
+	page = entry({"admin", "network", "qos"}, cbi("qos/qos"), _("QoS"))
+	page.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/trunk/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
new file mode 100644
index 00000000..6965078e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -0,0 +1,101 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local wa = require "luci.tools.webadmin"
+local fs = require "nixio.fs"
+
+m = Map("qos", translate("Quality of Service"),
+	translate("With <abbr title=\"Quality of Service\">QoS</abbr> you " ..
+		"can prioritize network traffic selected by addresses, " ..
+		"ports or services."))
+
+s = m:section(TypedSection, "interface", translate("Interfaces"))
+s.addremove = true
+s.anonymous = false
+
+e = s:option(Flag, "enabled", translate("Enable"))
+e.rmempty = false
+
+c = s:option(ListValue, "classgroup", translate("Classification group"))
+c:value("Default", translate("default"))
+c.default = "Default"
+
+s:option(Flag, "overhead", translate("Calculate overhead"))
+
+s:option(Flag, "halfduplex", translate("Half-duplex"))
+
+dl = s:option(Value, "download", translate("Download speed (kbit/s)"))
+dl.datatype = "and(uinteger,min(1))"
+
+ul = s:option(Value, "upload", translate("Upload speed (kbit/s)"))
+ul.datatype = "and(uinteger,min(1))"
+
+s = m:section(TypedSection, "classify", translate("Classification Rules"))
+s.template = "cbi/tblsection"
+s.anonymous = true
+s.addremove = true
+s.sortable  = true
+
+t = s:option(ListValue, "target", translate("Target"))
+t:value("Priority", translate("priority"))
+t:value("Express", translate("express"))
+t:value("Normal", translate("normal"))
+t:value("Bulk", translate("low"))
+t.default = "Normal"
+
+srch = s:option(Value, "srchost", translate("Source host"))
+srch.rmempty = true
+srch:value("", translate("all"))
+wa.cbi_add_knownips(srch)
+
+dsth = s:option(Value, "dsthost", translate("Destination host"))
+dsth.rmempty = true
+dsth:value("", translate("all"))
+wa.cbi_add_knownips(dsth)
+
+l7 = s:option(ListValue, "layer7", translate("Service"))
+l7.rmempty = true
+l7:value("", translate("all"))
+
+local pats = io.popen("find /etc/l7-protocols/ -type f -name '*.pat'")
+if pats then
+	local l
+	while true do
+		l = pats:read("*l")
+		if not l then break end
+
+		l = l:match("([^/]+)%.pat$")
+		if l then
+			l7:value(l)
+		end
+	end
+	pats:close()
+end
+
+p = s:option(Value, "proto", translate("Protocol"))
+p:value("", translate("all"))
+p:value("tcp", "TCP")
+p:value("udp", "UDP")
+p:value("icmp", "ICMP")
+p.rmempty = true
+
+ports = s:option(Value, "ports", translate("Ports"))
+ports.rmempty = true
+ports:value("", translate("all"))
+
+bytes = s:option(Value, "connbytes", translate("Number of bytes"))
+
+comment = s:option(Value, "comment", translate("Comment"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-radvd/Makefile b/trunk/package/luci/applications/luci-radvd/Makefile
new file mode 100644
index 00000000..68c6b99c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/Makefile
@@ -0,0 +1,4 @@
+PO = radvd
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-radvd/ipkg/postinst b/trunk/package/luci/applications/luci-radvd/ipkg/postinst
new file mode 100644
index 00000000..88aaf833
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/ipkg/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-radvd ) && rm -f /etc/uci-defaults/luci-radvd
+	/etc/init.d/radvd enabled || /etc/init.d/radvd enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-radvd/luasrc/controller/radvd.lua b/trunk/package/luci/applications/luci-radvd/luasrc/controller/radvd.lua
new file mode 100644
index 00000000..58dcbb2e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/luasrc/controller/radvd.lua
@@ -0,0 +1,28 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.radvd", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/radvd") then
+		return
+	end
+
+	entry({"admin", "network", "radvd"}, cbi("radvd"), _("Radvd"), 61)
+	entry({"admin", "network", "radvd", "interface"}, cbi("radvd/interface"), nil).leaf = true
+	entry({"admin", "network", "radvd", "prefix"}, cbi("radvd/prefix"), nil).leaf = true
+	entry({"admin", "network", "radvd", "route"}, cbi("radvd/route"), nil).leaf = true
+	entry({"admin", "network", "radvd", "rdnss"}, cbi("radvd/rdnss"), nil).leaf = true
+	entry({"admin", "network", "radvd", "dnssl"}, cbi("radvd/dnssl"), nil).leaf = true
+end
diff --git a/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd.lua b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd.lua
new file mode 100644
index 00000000..a43e8d95
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd.lua
@@ -0,0 +1,335 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("radvd", translate("Radvd"),
+	translate("Radvd is a router advertisement daemon for IPv6. " ..
+		"It listens to router solicitations and sends router advertisements " ..
+		"as described in RFC 4861."))
+
+local nm = require "luci.model.network".init(m.uci)
+local ut = require "luci.util"
+
+
+--
+-- Interfaces
+--
+
+s = m:section(TypedSection, "interface", translate("Interfaces"))
+s.template = "cbi/tblsection"
+s.extedit  = luci.dispatcher.build_url("admin/network/radvd/interface/%s")
+s.anonymous = true
+s.addremove = true
+
+function s.create(...)
+	local id = TypedSection.create(...)
+	luci.http.redirect(s.extedit % id)
+end
+
+function s.remove(self, section)
+	if m.uci:get("radvd", section) == "interface" then
+		local iface = m.uci:get("radvd", section, "interface")
+		if iface then
+			m.uci:delete_all("radvd", "prefix",
+				function(s) return s.interface == iface end)
+
+			m.uci:delete_all("radvd", "route",
+				function(s) return s.interface == iface end)
+
+			m.uci:delete_all("radvd", "rdnss",
+				function(s) return s.interface == iface end)
+		end
+	end
+
+	return TypedSection.remove(self, section)
+end
+
+o = s:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+o.width   = "30px"
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+o = s:option(DummyValue, "interface", translate("Interface"))
+o.template = "cbi/network_netinfo"
+o.width    = "10%"
+
+o = s:option(DummyValue, "UnicastOnly", translate("Multicast"))
+function o.cfgvalue(self, section)
+	local v  = Value.cfgvalue(self, section)
+	local v2 = m.uci:get("radvd", section, "client")
+	return (v == "1" or (v2 and #v2 > 0)) and translate("no") or translate("yes")
+end
+
+o = s:option(DummyValue, "AdvSendAdvert", translate("Advertising"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	return v == "1" and translate("yes") or translate("no")
+end
+
+o = s:option(DummyValue, "MaxRtrAdvInterval", translate("Max. interval"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...) or "600"
+	return v .. "s"
+end
+
+o = s:option(DummyValue, "AdvHomeAgentFlag", translate("Mobile IPv6"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	return v == "1" and translate("yes") or translate("no")
+end
+
+o = s:option(DummyValue, "AdvDefaultPreference", translate("Preference"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...) or "medium"
+	return translate(v)
+end
+
+
+--
+-- Prefixes
+--
+
+s2 = m:section(TypedSection, "prefix", translate("Prefixes"))
+s2.template = "cbi/tblsection"
+s2.extedit  = luci.dispatcher.build_url("admin/network/radvd/prefix/%s")
+s2.addremove = true
+s2.anonymous = true
+
+function s2.create(...)
+	local id = TypedSection.create(...)
+	luci.http.redirect(s2.extedit % id)
+end
+
+
+o = s2:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+o.width   = "30px"
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+o = s2:option(DummyValue, "interface", translate("Interface"))
+o.template = "cbi/network_netinfo"
+o.width    = "10%"
+
+pfx = s2:option(DummyValue, "prefix", translate("Prefix"))
+pfx.width = "60%"
+function pfx.cfgvalue(self, section)
+	local v = m.uci:get_list("radvd", section, self.option)
+	local l = { }
+
+	if not v or #v == 0 or (#v == 1 and #v[1] == 0) then
+		local net = nm:get_network(m.uci:get("radvd", section, "interface"))
+		if net then
+			local ifc = nm:get_interface(net:ifname())
+			if ifc then
+				local adr
+				for _, adr in ipairs(ifc:ip6addrs()) do
+					if not adr:is6linklocal() then
+						v = adr:string()
+						break
+					end
+				end
+			end
+		end
+	end
+
+	for v in ut.imatch(v) do
+		v = luci.ip.IPv6(v)
+		if v then
+			l[#l+1] = v:string()
+		end
+	end
+
+	if #l == 0 then
+		l[1] = "?"
+	end
+
+	return table.concat(l, ", ")
+end
+
+o = s2:option(DummyValue, "AdvAutonomous", translate("Autonomous"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	return v == "1" and translate("yes") or translate("no")
+end
+
+o = s2:option(DummyValue, "AdvOnLink", translate("On-link"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	return v == "1" and translate("yes") or translate("no")
+end
+
+o = s2:option(DummyValue, "AdvValidLifetime", translate("Validity time"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...) or "86400"
+	return translate(v)
+end
+
+
+--
+-- Routes
+--
+
+s3 = m:section(TypedSection, "route", translate("Routes"))
+s3.template = "cbi/tblsection"
+s3.extedit  = luci.dispatcher.build_url("admin/network/radvd/route/%s")
+s3.addremove = true
+s3.anonymous = true
+
+function s3.create(...)
+	local id = TypedSection.create(...)
+	luci.http.redirect(s3.extedit % id)
+end
+
+
+o = s3:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+o.width   = "30px"
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+o = s3:option(DummyValue, "interface", translate("Interface"))
+o.template = "cbi/network_netinfo"
+o.width    = "10%"
+
+o = s3:option(DummyValue, "prefix", translate("Prefix"))
+o.width = "60%"
+o.cfgvalue = pfx.cfgvalue
+
+o = s3:option(DummyValue, "AdvRouteLifetime", translate("Lifetime"))
+function o.cfgvalue(self, section)
+	local v = Value.cfgvalue(self, section) or "1800"
+	return translate(v)
+end
+
+o = s3:option(DummyValue, "AdvRoutePreference", translate("Preference"))
+function o.cfgvalue(self, section)
+	local v = Value.cfgvalue(self, section) or "medium"
+	return translate(v)
+end
+
+
+--
+-- RDNSS
+--
+
+s4 = m:section(TypedSection, "rdnss", translate("RDNSS"))
+s4.template = "cbi/tblsection"
+s4.extedit  = luci.dispatcher.build_url("admin/network/radvd/rdnss/%s")
+s4.addremove = true
+s4.anonymous = true
+
+function s4.create(...)
+	local id = TypedSection.create(...)
+	luci.http.redirect(s4.extedit % id)
+end
+
+
+o = s4:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+o.width   = "30px"
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+o = s4:option(DummyValue, "interface", translate("Interface"))
+o.template = "cbi/network_netinfo"
+o.width    = "10%"
+
+o = s4:option(DummyValue, "addr", translate("Address"))
+o.width = "60%"
+o.cfgvalue = pfx.cfgvalue
+
+o = s4:option(DummyValue, "AdvRDNSSLifetime", translate("Lifetime"))
+function o.cfgvalue(self, section)
+	local v = Value.cfgvalue(self, section) or "1200"
+	return translate(v)
+end
+
+
+--
+-- DNSSL
+--
+
+s5 = m:section(TypedSection, "dnssl", translate("DNSSL"))
+s5.template = "cbi/tblsection"
+s5.extedit  = luci.dispatcher.build_url("admin/network/radvd/dnssl/%s")
+s5.addremove = true
+s5.anonymous = true
+
+function s5.create(...)
+	local id = TypedSection.create(...)
+	luci.http.redirect(s5.extedit % id)
+end
+
+
+o = s5:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+o.width   = "30px"
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+o = s5:option(DummyValue, "interface", translate("Interface"))
+o.template = "cbi/network_netinfo"
+o.width    = "10%"
+
+o = s5:option(DummyValue, "suffix", translate("Suffix"))
+o.width = "60%"
+function o.cfgvalue(self, section)
+	local v = m.uci:get_list("radvd", section, "suffix")
+	local l = { }
+
+	for v in ut.imatch(v) do
+		l[#l+1] = v
+	end
+
+	if #l == 0 then
+		l[1] = "?"
+	end
+
+	return table.concat(l, ", ")
+end
+
+o = s5:option(DummyValue, "AdvDNSSLLifetime", translate("Lifetime"))
+function o.cfgvalue(self, section)
+	local v = Value.cfgvalue(self, section) or "1200"
+	return translate(v)
+end
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/dnssl.lua b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/dnssl.lua
new file mode 100644
index 00000000..ec67f308
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/dnssl.lua
@@ -0,0 +1,99 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: rdnss.lua 6715 2011-01-13 20:03:40Z jow $
+]]--
+
+local sid = arg[1]
+local utl = require "luci.util"
+
+m = Map("radvd", translatef("Radvd - DNSSL"),
+	translate("Radvd is a router advertisement daemon for IPv6. " ..
+		"It listens to router solicitations and sends router advertisements " ..
+		"as described in RFC 4861."))
+
+m.redirect = luci.dispatcher.build_url("admin/network/radvd")
+
+if m.uci:get("radvd", sid) ~= "dnssl" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+
+s = m:section(NamedSection, sid, "interface", translate("DNSSL Configuration"))
+s.addremove = false
+
+
+--
+-- General
+--
+
+o = s:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+
+o = s:option(Value, "interface", translate("Interface"),
+	translate("Specifies the logical interface name this section belongs to"))
+
+o.template = "cbi/network_netlist"
+o.nocreate = true
+o.optional = false
+
+function o.formvalue(...)
+	return Value.formvalue(...) or "-"
+end
+
+function o.validate(self, value)
+	if value == "-" then
+		return nil, translate("Interface required")
+	end
+	return value
+end
+
+function o.write(self, section, value)
+	m.uci:set("radvd", section, "ignore", 0)
+	m.uci:set("radvd", section, "interface", value)
+end
+
+
+o = s:option(DynamicList, "suffix", translate("Suffix"),
+	translate("Advertised Domain Suffixes"))
+
+o.optional    = false
+o.rmempty     = false
+o.datatype    = "hostname"
+function o.cfgvalue(self, section)
+	local l = { }
+	local v = m.uci:get_list("radvd", section, "suffix")
+	for v in utl.imatch(v) do
+		l[#l+1] = v
+	end
+	return l
+end
+
+
+o = s:option(Value, "AdvDNSSLLifetime", translate("Lifetime"),
+	translate("Specifies the maximum duration how long the DNSSL entries are used for name resolution."))
+
+o.datatype = 'or(uinteger,"infinity")'
+o.placeholder = 1200
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/interface.lua b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/interface.lua
new file mode 100644
index 00000000..519664cd
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/interface.lua
@@ -0,0 +1,276 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local sid = arg[1]
+local utl = require "luci.util"
+
+m = Map("radvd", translatef("Radvd - Interface %q", "?"),
+	translate("Radvd is a router advertisement daemon for IPv6. " ..
+		"It listens to router solicitations and sends router advertisements " ..
+		"as described in RFC 4861."))
+
+m.redirect = luci.dispatcher.build_url("admin/network/radvd")
+
+if m.uci:get("radvd", sid) ~= "interface" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+m.uci:foreach("radvd", "interface",
+	function(s)
+		if s['.name'] == sid and s.interface then
+			m.title = translatef("Radvd - Interface %q", s.interface)
+			return false
+		end
+	end)
+
+
+s = m:section(NamedSection, sid, "interface", translate("Interface Configuration"))
+s.addremove = false
+
+s:tab("general", translate("General"))
+s:tab("timing",  translate("Timing"))
+s:tab("mobile",  translate("Mobile IPv6"))
+
+
+--
+-- General
+--
+
+o = s:taboption("general", Flag, "ignore", translate("Enable"))
+o.rmempty = false
+
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+
+o = s:taboption("general", Value, "interface", translate("Interface"),
+	translate("Specifies the logical interface name this section belongs to"))
+
+o.template = "cbi/network_netlist"
+o.nocreate = true
+o.optional = false
+
+function o.formvalue(...)
+	return Value.formvalue(...) or "-"
+end
+
+function o.validate(self, value)
+	if value == "-" then
+		return nil, translate("Interface required")
+	end
+	return value
+end
+
+function o.write(self, section, value)
+	m.uci:set("radvd", section, "ignore", 0)
+	m.uci:set("radvd", section, "interface", value)
+end
+
+
+o = s:taboption("general", DynamicList, "client", translate("Clients"),
+	translate("Restrict communication to specified clients, leave empty to use multicast"))
+
+o.rmempty     = true
+o.datatype    = "ip6addr"
+o.placeholder = "any"
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	local l = { }
+	for v in utl.imatch(v) do
+		l[#l+1] = v
+	end
+	return l
+end
+
+
+o = s:taboption("general", Flag, "AdvSendAdvert", translate("Enable advertisements"),
+	translate("Enables router advertisements and solicitations"))
+
+o.rmempty = false
+function o.write(self, section, value)
+	if value == "1" then
+		m.uci:set("radvd", section, "ignore", 0)
+		m.uci:set("radvd", section, "IgnoreIfMissing", 1)
+	end
+
+	m.uci:set("radvd", section, "AdvSendAdvert", value)
+end
+
+
+o = s:taboption("general", Flag, "UnicastOnly", translate("Unicast only"),
+	translate("Indicates that the underlying link is not broadcast capable, prevents unsolicited advertisements from being sent"))
+
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("general", Flag, "AdvManagedFlag", translate("Managed flag"),
+	translate("Enables the additional stateful administered autoconfiguration protocol (RFC2462)"))
+
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("general", Flag, "AdvOtherConfigFlag", translate("Configuration flag"),
+	translate("Enables the autoconfiguration of additional, non address information (RFC2462)"))
+
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("general", Flag, "AdvSourceLLAddress", translate("Source link-layer address"),
+	translate("Includes the link-layer address of the outgoing interface in the RA"))
+
+o.rmempty = false
+o.default = "1"
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("general", Value, "AdvLinkMTU", translate("Link MTU"),
+	translate("Advertises the given link MTU in the RA if specified. 0 disables MTU advertisements"))
+
+o.datatype = "uinteger"
+o.placeholder = 0
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("general", Value, "AdvCurHopLimit", translate("Current hop limit"),
+	translate("Advertises the default Hop Count value for outgoing unicast packets in the RA. 0 disables hopcount advertisements"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 64
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("general", ListValue, "AdvDefaultPreference", translate("Default preference"),
+	translate("Advertises the default router preference"))
+
+o.optional = false
+o.default = "medium"
+o:value("low",    translate("low"))
+o:value("medium", translate("medium"))
+o:value("high",   translate("high"))
+o:depends("AdvSendAdvert", "1")
+
+
+--
+-- Timing
+--
+
+o = s:taboption("timing", Value, "MinRtrAdvInterval", translate("Minimum advertisement interval"),
+	translate("The minimum time allowed between sending unsolicited multicast router advertisements from the interface, in seconds"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 198
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("timing", Value, "MaxRtrAdvInterval", translate("Maximum advertisement interval"),
+	translate("The maximum time allowed between sending unsolicited multicast router advertisements from the interface, in seconds"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 600
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("timing", Value, "MinDelayBetweenRAs", translate("Minimum advertisement delay"),
+	translate("The minimum time allowed between sending multicast router advertisements from the interface, in seconds"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 3
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("timing", Value, "AdvReachableTime", translate("Reachable time"),
+	translate("Advertises assumed reachability time in milliseconds of neighbours in the RA if specified. 0 disables reachability advertisements"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 0
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("timing", Value, "AdvRetransTimer", translate("Retransmit timer"),
+	translate("Advertises wait time in milliseconds between Neighbor Solicitation messages in the RA if specified. 0 disables retransmit advertisements"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 0
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("timing", Value, "AdvDefaultLifetime", translate("Default lifetime"),
+	translate("Advertises the lifetime of the default router in seconds. 0 indicates that the node is no default router"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 1800
+o:depends("AdvSendAdvert", "1")
+
+
+--
+-- Mobile
+--
+
+o = s:taboption("mobile", Flag, "AdvHomeAgentFlag", translate("Advertise Home Agent flag"),
+	translate("Advertises Mobile IPv6 Home Agent capability (RFC3775)"))
+
+o:depends("AdvSendAdvert", "1")
+
+
+o = s:taboption("mobile", Flag, "AdvIntervalOpt", translate("Mobile IPv6 interval option"),
+	translate("Include Mobile IPv6 Advertisement Interval option to RA"))
+
+o:depends({AdvHomeAgentFlag = "1", AdvSendAdvert = "1"})
+
+
+o = s:taboption("mobile", Flag, "AdvHomeAgentInfo", translate("Home Agent information"),
+	translate("Include Home Agent Information in the RA"))
+
+o:depends({AdvHomeAgentFlag = "1", AdvSendAdvert = "1"})
+
+
+o = s:taboption("mobile", Flag, "AdvMobRtrSupportFlag", translate("Mobile IPv6 router registration"),
+	translate("Advertises Mobile Router registration capability (NEMO Basic)"))
+
+o:depends({AdvHomeAgentInfo = "1", AdvSendAdvert = "1"})
+
+
+o = s:taboption("mobile", Value, "HomeAgentLifetime", translate("Home Agent lifetime"),
+	translate("Advertises the time in seconds the router is offering Mobile IPv6 Home Agent services"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 1800
+o:depends({AdvHomeAgentInfo = "1", AdvSendAdvert = "1"})
+
+
+o = s:taboption("mobile", Value, "HomeAgentPreference", translate("Home Agent preference"),
+	translate("The preference for the Home Agent sending this RA"))
+
+o.datatype = "uinteger"
+o.optional = false
+o.placeholder = 0
+o:depends({AdvHomeAgentInfo = "1", AdvSendAdvert = "1"})
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/prefix.lua b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/prefix.lua
new file mode 100644
index 00000000..60329865
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/prefix.lua
@@ -0,0 +1,139 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local sid = arg[1]
+local utl = require "luci.util"
+
+m = Map("radvd", translatef("Radvd - Prefix"),
+	translate("Radvd is a router advertisement daemon for IPv6. " ..
+		"It listens to router solicitations and sends router advertisements " ..
+		"as described in RFC 4861."))
+
+m.redirect = luci.dispatcher.build_url("admin/network/radvd")
+
+if m.uci:get("radvd", sid) ~= "prefix" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+
+s = m:section(NamedSection, sid, "interface", translate("Prefix Configuration"))
+s.addremove = false
+
+s:tab("general", translate("General"))
+s:tab("advanced",  translate("Advanced"))
+
+
+--
+-- General
+--
+
+o = s:taboption("general", Flag, "ignore", translate("Enable"))
+o.rmempty = false
+
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+
+o = s:taboption("general", Value, "interface", translate("Interface"),
+	translate("Specifies the logical interface name this section belongs to"))
+
+o.template = "cbi/network_netlist"
+o.nocreate = true
+o.optional = false
+
+function o.formvalue(...)
+	return Value.formvalue(...) or "-"
+end
+
+function o.validate(self, value)
+	if value == "-" then
+		return nil, translate("Interface required")
+	end
+	return value
+end
+
+function o.write(self, section, value)
+	m.uci:set("radvd", section, "ignore", 0)
+	m.uci:set("radvd", section, "interface", value)
+end
+
+
+o = s:taboption("general", DynamicList, "prefix", translate("Prefixes"),
+	translate("Advertised IPv6 prefixes. If empty, the current interface prefix is used"))
+
+o.optional    = true
+o.datatype    = "ip6addr"
+o.placeholder = translate("default")
+function o.cfgvalue(self, section)
+	local l = { }
+	local v = m.uci:get_list("radvd", section, "prefix")
+	for v in utl.imatch(v) do
+		l[#l+1] = v
+	end
+	return l
+end
+
+
+o = s:taboption("general", Flag, "AdvOnLink", translate("On-link determination"),
+	translate("Indicates that this prefix can be used for on-link determination (RFC4861)"))
+
+o.rmempty = false
+o.default = "1"
+
+
+o = s:taboption("general", Flag, "AdvAutonomous", translate("Autonomous"),
+	translate("Indicates that this prefix can be used for autonomous address configuration (RFC4862)"))
+
+o.rmempty = false
+o.default = "1"
+
+
+--
+-- Advanced
+--
+
+o = s:taboption("advanced", Flag, "AdvRouterAddr", translate("Advertise router address"),
+	translate("Indicates that the address of interface is sent instead of network prefix, as is required by Mobile IPv6"))
+
+
+o = s:taboption("advanced", Value, "AdvValidLifetime", translate("Valid lifetime"),
+	translate("Advertises the length of time in seconds that the prefix is valid for the purpose of on-link determination."))
+
+o.datatype = 'or(uinteger,"infinity")'
+o.placeholder = 86400
+
+
+o = s:taboption("advanced", Value, "AdvPreferredLifetime", translate("Preferred lifetime"),
+	translate("Advertises the length of time in seconds that addresses generated from the prefix via stateless address autoconfiguration remain preferred."))
+
+o.datatype = 'or(uinteger,"infinity")'
+o.placeholder = 14400
+
+
+o = s:taboption("advanced", Value, "Base6to4Interface", translate("6to4 interface"),
+	translate("Specifies a logical interface name to derive a 6to4 prefix from. The interfaces public IPv4 address is combined with 2002::/3 and the value of the prefix option"))
+
+o.template = "cbi/network_netlist"
+o.nocreate = true
+o.unspecified = true
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua
new file mode 100644
index 00000000..ea652639
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua
@@ -0,0 +1,100 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local sid = arg[1]
+local utl = require "luci.util"
+
+m = Map("radvd", translatef("Radvd - RDNSS"),
+	translate("Radvd is a router advertisement daemon for IPv6. " ..
+		"It listens to router solicitations and sends router advertisements " ..
+		"as described in RFC 4861."))
+
+m.redirect = luci.dispatcher.build_url("admin/network/radvd")
+
+if m.uci:get("radvd", sid) ~= "rdnss" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+
+s = m:section(NamedSection, sid, "interface", translate("RDNSS Configuration"))
+s.addremove = false
+
+
+--
+-- General
+--
+
+o = s:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+
+o = s:option(Value, "interface", translate("Interface"),
+	translate("Specifies the logical interface name this section belongs to"))
+
+o.template = "cbi/network_netlist"
+o.nocreate = true
+o.optional = false
+
+function o.formvalue(...)
+	return Value.formvalue(...) or "-"
+end
+
+function o.validate(self, value)
+	if value == "-" then
+		return nil, translate("Interface required")
+	end
+	return value
+end
+
+function o.write(self, section, value)
+	m.uci:set("radvd", section, "ignore", 0)
+	m.uci:set("radvd", section, "interface", value)
+end
+
+
+o = s:option(DynamicList, "addr", translate("Addresses"),
+	translate("Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface is used"))
+
+o.optional    = false
+o.rmempty     = true
+o.datatype    = "ip6addr"
+o.placeholder = translate("default")
+function o.cfgvalue(self, section)
+	local l = { }
+	local v = m.uci:get_list("radvd", section, "addr")
+	for v in utl.imatch(v) do
+		l[#l+1] = v
+	end
+	return l
+end
+
+
+o = s:option(Value, "AdvRDNSSLifetime", translate("Lifetime"),
+	translate("Specifies the maximum duration how long the RDNSS entries are used for name resolution."))
+
+o.datatype = 'or(uinteger,"infinity")'
+o.placeholder = 1200
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/route.lua b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/route.lua
new file mode 100644
index 00000000..97c72a4e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/luasrc/model/cbi/radvd/route.lua
@@ -0,0 +1,108 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local sid = arg[1]
+local utl = require "luci.util"
+
+m = Map("radvd", translatef("Radvd - Route"),
+	translate("Radvd is a router advertisement daemon for IPv6. " ..
+		"It listens to router solicitations and sends router advertisements " ..
+		"as described in RFC 4861."))
+
+m.redirect = luci.dispatcher.build_url("admin/network/radvd")
+
+if m.uci:get("radvd", sid) ~= "route" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+
+s = m:section(NamedSection, sid, "interface", translate("Route Configuration"))
+s.addremove = false
+
+
+--
+-- General
+--
+
+o = s:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+
+function o.cfgvalue(...)
+	local v = Flag.cfgvalue(...)
+	return v == "1" and "0" or "1"
+end
+
+function o.write(self, section, value)
+	Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+
+o = s:option(Value, "interface", translate("Interface"),
+	translate("Specifies the logical interface name this section belongs to"))
+
+o.template = "cbi/network_netlist"
+o.nocreate = true
+o.optional = false
+
+function o.formvalue(...)
+	return Value.formvalue(...) or "-"
+end
+
+function o.validate(self, value)
+	if value == "-" then
+		return nil, translate("Interface required")
+	end
+	return value
+end
+
+function o.write(self, section, value)
+	m.uci:set("radvd", section, "ignore", 0)
+	m.uci:set("radvd", section, "interface", value)
+end
+
+
+o = s:option(DynamicList, "prefix", translate("Prefixes"),
+	translate("Advertised IPv6 prefixes"))
+
+o.rmempty     = false
+o.datatype    = "ip6addr"
+o.placeholder = translate("default")
+function o.cfgvalue(self, section)
+	local l = { }
+	local v = m.uci:get_list("radvd", section, "prefix")
+	for v in utl.imatch(v) do
+		l[#l+1] = v
+	end
+	return l
+end
+
+
+o = s:option(Value, "AdvRouteLifetime", translate("Lifetime"),
+	translate("Specifies the lifetime associated with the route in seconds."))
+
+o.datatype = 'or(uinteger,"infinity")'
+o.placeholder = 1800
+
+
+o = s:option(ListValue, "AdvRoutePreference", translate("Preference"),
+	translate("Specifies the preference associated with the default router"))
+
+o.default = "medium"
+o:value("low",    translate("low"))
+o:value("medium", translate("medium"))
+o:value("high",   translate("high"))
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-radvd/root/etc/uci-defaults/luci-radvd b/trunk/package/luci/applications/luci-radvd/root/etc/uci-defaults/luci-radvd
new file mode 100755
index 00000000..c1f3b754
--- /dev/null
+++ b/trunk/package/luci/applications/luci-radvd/root/etc/uci-defaults/luci-radvd
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@radvd[-1]
+	add ucitrack radvd
+	set ucitrack.@radvd[-1].init=radvd
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-samba/Makefile b/trunk/package/luci/applications/luci-samba/Makefile
new file mode 100644
index 00000000..e91079bb
--- /dev/null
+++ b/trunk/package/luci/applications/luci-samba/Makefile
@@ -0,0 +1,4 @@
+PO = samba
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-samba/luasrc/controller/samba.lua b/trunk/package/luci/applications/luci-samba/luasrc/controller/samba.lua
new file mode 100644
index 00000000..ee7d44aa
--- /dev/null
+++ b/trunk/package/luci/applications/luci-samba/luasrc/controller/samba.lua
@@ -0,0 +1,27 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.samba", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/samba") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "services", "samba"}, cbi("samba"), _("Network Shares"))
+	page.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-samba/luasrc/model/cbi/samba.lua b/trunk/package/luci/applications/luci-samba/luasrc/model/cbi/samba.lua
new file mode 100644
index 00000000..91526374
--- /dev/null
+++ b/trunk/package/luci/applications/luci-samba/luasrc/model/cbi/samba.lua
@@ -0,0 +1,83 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("samba", translate("Network Shares"))
+
+s = m:section(TypedSection, "samba", "Samba")
+s.anonymous = true
+
+s:tab("general",  translate("General Settings"))
+s:tab("template", translate("Edit Template"))
+
+s:taboption("general", Value, "name", translate("Hostname"))
+s:taboption("general", Value, "description", translate("Description"))
+s:taboption("general", Value, "workgroup", translate("Workgroup"))
+s:taboption("general", Value, "homes", translate("Share home-directories"),
+        translate("Allow system users to reach their home directories via " ..
+                "network shares"))
+
+tmpl = s:taboption("template", Value, "_tmpl",
+	translate("Edit the template that is used for generating the samba configuration."), 
+	translate("This is the content of the file '/etc/samba/smb.conf.template' from which your samba configuration will be generated. " ..
+		"Values enclosed by pipe symbols ('|') should not be changed. They get their values from the 'General Settings' tab."))
+
+tmpl.template = "cbi/tvalue"
+tmpl.rows = 20
+
+function tmpl.cfgvalue(self, section)
+	return nixio.fs.readfile("/etc/samba/smb.conf.template")
+end
+
+function tmpl.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	nixio.fs.writefile("//etc/samba/smb.conf.template", value)
+end
+
+
+s = m:section(TypedSection, "sambashare", translate("Shared Directories"))
+s.anonymous = true
+s.addremove = true
+s.template = "cbi/tblsection"
+
+s:option(Value, "name", translate("Name"))
+pth = s:option(Value, "path", translate("Path"))
+if nixio.fs.access("/etc/config/fstab") then
+        pth.titleref = luci.dispatcher.build_url("admin", "system", "fstab")
+end
+
+s:option(Value, "users", translate("Allowed users")).rmempty = true
+
+ro = s:option(Flag, "read_only", translate("Read-only"))
+ro.rmempty = false
+ro.enabled = "yes"
+ro.disabled = "no"
+
+go = s:option(Flag, "guest_ok", translate("Allow guests"))
+go.rmempty = false
+go.enabled = "yes"
+go.disabled = "no"
+
+cm = s:option(Value, "create_mask", translate("Create mask"),
+        translate("Mask for new files"))
+cm.rmempty = true
+cm.size = 4
+
+dm = s:option(Value, "dir_mask", translate("Directory mask"),
+        translate("Mask for new directories"))
+dm.rmempty = true
+dm.size = 4
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-shairplay/Makefile b/trunk/package/luci/applications/luci-shairplay/Makefile
new file mode 100644
index 00000000..b6c2db4a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairplay/Makefile
@@ -0,0 +1,4 @@
+PO = shairplay
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-shairplay/luasrc/controller/shairplay.lua b/trunk/package/luci/applications/luci-shairplay/luasrc/controller/shairplay.lua
new file mode 100644
index 00000000..3a2c2ea1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairplay/luasrc/controller/shairplay.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface - Shairplay support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.shairplay", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/shairplay") then
+		return
+	end
+
+	local page = entry({"admin", "services", "shairplay"}, cbi("shairplay"), _("Shairplay"))
+	page.dependent = true
+
+end
diff --git a/trunk/package/luci/applications/luci-shairplay/luasrc/model/cbi/shairplay.lua b/trunk/package/luci/applications/luci-shairplay/luasrc/model/cbi/shairplay.lua
new file mode 100644
index 00000000..e957ce69
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairplay/luasrc/model/cbi/shairplay.lua
@@ -0,0 +1,76 @@
+--[[
+LuCI - Lua Configuration Interface - Shairplay support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("shairplay", "Shairplay", translate("Shairplay is a simple AirPlay server implementation, here you can configure the settings."))
+
+s = m:section(TypedSection, "shairplay", "")
+s.addremove = true
+s.anonymous = false
+
+enable=s:option(Flag, "disabled", translate("Enabled"))
+enable.enabled="0"
+enable.disabled="1"
+enable.default = "1"
+enable.rmempty = false
+respawn=s:option(Flag, "respawn", translate("Respawn"))
+respawn.default = false
+
+apname = s:option(Value, "apname", translate("Airport Name"))
+apname.rmempty = true
+
+port=s:option(Value, "port", translate("Port"))
+port.rmempty = true
+port.datatype = "port"
+
+pw = s:option(Value, "password", translate("Password"))
+pw.rmempty = true
+pw.password = true
+
+hwaddr=s:option(Value, "hwaddr", translate("HW Address"))
+hwaddr.rmempty = true
+hwaddr.datatype = "macaddr"
+
+ao_driver=s:option(ListValue, "ao_driver", translate("AO Driver"))
+ao_driver:value("", translate("Default"))
+ao_driver:value("alsa")
+--ao_driver:value("alsa05")
+--ao_driver:value("arts")
+--ao_driver:value("esd")
+--ao_driver:value("irix")
+--ao_driver:value("nas")
+ao_driver:value("oss")
+--ao_driver:value("sun")
+
+ao_devicename=s:option(Value, "ao_devicename", translate("AO Device Name"))
+ao_devicename.rmempty = true
+
+ao_deviceid = s:option(ListValue, "ao_deviceid", translate("AO Device ID"))
+ao_deviceid.rmempty = true
+ao_deviceid:value("", translate("Default"))
+local pats = io.popen("find /proc/asound/ -type d -name 'card*' | sort")
+if pats then
+	local l
+	while true do
+		l = pats:read("*l")
+		if not l then break end
+
+		l = string.gsub(l, "/proc/asound/card", "")
+		if l then
+			ao_deviceid:value(l)
+		end
+	end
+	pats:close()
+end
+
+return m
diff --git a/trunk/package/luci/applications/luci-shairplay/root/etc/uci-defaults/luci-shairplay b/trunk/package/luci/applications/luci-shairplay/root/etc/uci-defaults/luci-shairplay
new file mode 100644
index 00000000..efc8a89b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairplay/root/etc/uci-defaults/luci-shairplay
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# needed for "Save and Apply" to restart shairplay
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@shairplay[-1]
+	add ucitrack shairplay
+	set ucitrack.@shairplay[-1].init="shairplay"
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-shairport/Makefile b/trunk/package/luci/applications/luci-shairport/Makefile
new file mode 100644
index 00000000..4c827554
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairport/Makefile
@@ -0,0 +1,4 @@
+PO = shairport
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-shairport/luasrc/controller/shairport.lua b/trunk/package/luci/applications/luci-shairport/luasrc/controller/shairport.lua
new file mode 100644
index 00000000..d201eca5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairport/luasrc/controller/shairport.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface - Shairport support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.shairport", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/shairport") then
+		return
+	end
+
+	local page = entry({"admin", "services", "shairport"}, cbi("shairport"), _("Shairport"))
+	page.dependent = true
+
+end
diff --git a/trunk/package/luci/applications/luci-shairport/luasrc/model/cbi/shairport.lua b/trunk/package/luci/applications/luci-shairport/luasrc/model/cbi/shairport.lua
new file mode 100644
index 00000000..974d7850
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairport/luasrc/model/cbi/shairport.lua
@@ -0,0 +1,172 @@
+--[[
+LuCI - Lua Configuration Interface - Shairport support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("shairport", "Shairport", translate("Shairport is a simple AirPlay server implementation, here you can configure the settings."))
+
+s = m:section(TypedSection, "shairport", "")
+s.addremove = true
+s.anonymous = false
+
+enable=s:option(Flag, "disabled", translate("Enabled"))
+enable.enabled="0"
+enable.disabled="1"
+enable.default = "1"
+enable.rmempty = false
+respawn=s:option(Flag, "respawn", translate("Respawn"))
+respawn.default = false
+
+bname = s:option(Value, "bname", translate("Airport Name"))
+bname.rmempty = true
+
+pw = s:option(Value, "password", translate("Password"))
+pw.rmempty = true
+pw.password = true
+
+port=s:option(Value, "port", translate("Port"))
+port.rmempty = true
+port.datatype = "port"
+
+buffer=s:option(Value, "buffer", translate("Buffer fill"))
+buffer.rmempty = true
+buffer.datatype = "uinteger"
+
+log_file=s:option(Value, "log_file", translate("Log file"))
+log_file.rmempty = true
+--log_file.datatype = "file"
+
+err_file=s:option(Value, "err_file", translate("Error file"))
+err_file.rmempty = true
+--err_file.datatype = "file"
+
+meta_dir=s:option(Value, "meta_dir", translate("Metadata directory"))
+meta_dir.rmempty = true
+meta_dir.datatype = "directory"
+
+cmd_start=s:option(Value, "cmd_start", translate("Command when playback begins"))
+cmd_start.rmempty = true
+
+cmd_stop=s:option(Value, "cmd_stop", translate("Command when playback ends"))
+cmd_stop.rmempty = true
+
+cmd_wait=s:option(Flag, "cmd_wait", translate("Block while the commands run"))
+cmd_wait.default = false
+
+mdns=s:option(ListValue, "mdns", translate("mDNS"))
+mdns.rmempty = true
+mdns:value("", translate("Default"))
+mdns:value("avahi")
+mdns:value("dns_sd")
+mdns:value("external_avahi")
+mdns:value("external_dns_sd")
+mdns:value("tinysvcmdns")
+
+audio_output=s:option(ListValue, "audio_output", translate("Audio output"))
+audio_output.rmempty = true
+audio_output:value("", translate("Default"))
+audio_output:value("alsa")
+audio_output:value("ao")
+audio_output:value("dummy")
+audio_output:value("pulse")
+audio_output:value("pipe")
+
+-- alsa output --
+output_dev=s:option(Value, "output_dev", translate("Output device"))
+output_dev.rmempty = true
+output_dev:depends("audio_output", "alsa")
+
+mixer_dev=s:option(Value, "mixer_dev", translate("Mixer device"))
+mixer_dev.rmempty = true
+mixer_dev:depends("audio_output", "alsa")
+
+mixer_type=s:option(ListValue, "mixer_type", translate("Mixer type"))
+mixer_type.rmempty = true
+mixer_type:value("", translate("Default"))
+mixer_type:value("software")
+mixer_type:value("hardware")
+mixer_type:depends("audio_output", "alsa")
+
+mixer_control=s:option(Value, "mixer_control", translate("Mixer control"))
+mixer_control.rmempty = true
+mixer_control:depends("audio_output", "alsa")
+
+mixer_index = s:option(ListValue, "mixer_index", translate("Mixer index"))
+mixer_index.rmempty = true
+mixer_index:depends("audio_output", "alsa")
+mixer_index:value("", translate("Default"))
+local pats = io.popen("find /proc/asound/ -type d -name 'card*' | sort")
+if pats then
+	local l
+	while true do
+		l = pats:read("*l")
+		if not l then break end
+
+		l = string.gsub(l, "/proc/asound/card", "")
+		if l then
+			mixer_index:value(l)
+		end
+	end
+	pats:close()
+end
+
+-- ao output --
+ao_driver=s:option(Value, "ao_driver", translate("AO driver"))
+ao_driver.rmempty = true
+ao_driver:depends("audio_output", "ao")
+
+ao_name=s:option(Value, "ao_name", translate("AO name"))
+ao_name.rmempty = true
+ao_name:depends("audio_output", "ao")
+
+ao_id = s:option(ListValue, "ao_id", translate("AO id"))
+ao_id.rmempty = true
+ao_id:depends("audio_output", "ao")
+ao_id:value("", translate("Default"))
+local pats = io.popen("find /proc/asound/ -type d -name 'card*' | sort")
+if pats then
+	local l
+	while true do
+		l = pats:read("*l")
+		if not l then break end
+
+		l = string.gsub(l, "/proc/asound/card", "")
+		if l then
+			ao_id:value(l)
+		end
+	end
+	pats:close()
+end
+
+ao_options=s:option(Value, "ao_options", translate("AO options"))
+ao_options.rmempty = true
+ao_options:depends("audio_output", "ao")
+
+-- pipe output --
+output_fifo=s:option(Value, "output_fifo", translate("Output FIFO"))
+output_fifo.rmempty = true
+output_fifo:depends("audio_output", "pipe")
+
+-- pulse output --
+pulse_server=s:option(Value, "pulse_server", translate("Pulse server"))
+pulse_server.rmempty = true
+pulse_server:depends("audio_output", "pulse")
+
+pulse_sink=s:option(Value, "pulse_sink", translate("Pulse sink"))
+pulse_sink.rmempty = true
+pulse_sink:depends("audio_output", "pulse")
+
+pulse_appname=s:option(Value, "pulse_appname", translate("Pulse application name"))
+pulse_appname.rmempty = true
+pulse_appname:depends("audio_output", "pulse")
+
+return m
diff --git a/trunk/package/luci/applications/luci-shairport/root/etc/uci-defaults/luci-shairport b/trunk/package/luci/applications/luci-shairport/root/etc/uci-defaults/luci-shairport
new file mode 100644
index 00000000..be9412ba
--- /dev/null
+++ b/trunk/package/luci/applications/luci-shairport/root/etc/uci-defaults/luci-shairport
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# needed for "Save and Apply" to restart shairport
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@shairport[-1]
+	add ucitrack shairport
+	set ucitrack.@shairport[-1].init="shairport"
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-siitwizard/Makefile b/trunk/package/luci/applications/luci-siitwizard/Makefile
new file mode 100644
index 00000000..a4f7c76e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-siitwizard/Makefile
@@ -0,0 +1,4 @@
+PO = 
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua b/trunk/package/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua
new file mode 100644
index 00000000..2e0fd081
--- /dev/null
+++ b/trunk/package/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua
@@ -0,0 +1,21 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module "luci.controller.siitwizard"
+
+function index()
+	entry({"admin", "network", "siitwizard"}, form("siitwizard"), "SIIT 4over6 assistent", 99)
+end
diff --git a/trunk/package/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/trunk/package/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
new file mode 100644
index 00000000..57ba556a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -0,0 +1,383 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local uci = require "luci.model.uci".cursor()
+
+-------------------- Init --------------------
+
+--
+-- Find link-local address
+--
+LL_PREFIX = luci.ip.IPv6("fe80::/64")
+function find_ll()
+	for _, r in ipairs(luci.sys.net.routes6()) do
+		if LL_PREFIX:contains(r.dest) and r.dest:higher(LL_PREFIX) then
+			return r.dest:sub(LL_PREFIX)
+		end
+	end
+	return luci.ip.IPv6("::")
+end
+
+--
+-- Determine defaults
+--
+local ula_prefix  = uci:get("siit", "ipv6", "ula_prefix")  or "fd00::"
+local ula_global  = uci:get("siit", "ipv6", "ula_global")  or "00ca:ffee:babe::"		-- = Freifunk
+local ula_subnet  = uci:get("siit", "ipv6", "ula_subnet")  or "0000:0000:0000:4223::"	-- = Berlin
+local siit_prefix = uci:get("siit", "ipv6", "siit_prefix") or "::ffff:0000:0000"
+local ipv4_pool   = uci:get("siit", "ipv4", "pool")        or "172.16.0.0/12"
+local ipv4_netsz  = uci:get("siit", "ipv4", "netsize")     or "24"
+
+--
+-- Find IPv4 allocation pool
+--
+local gv4_net = luci.ip.IPv4(ipv4_pool)
+
+--
+-- Generate ULA
+--
+local ula = luci.ip.IPv6("::/64")
+
+for _, prefix in ipairs({ ula_prefix, ula_global, ula_subnet }) do
+	ula = ula:add(luci.ip.IPv6(prefix))
+end
+
+ula = ula:add(find_ll())
+
+
+-------------------- View --------------------
+f = SimpleForm("siitwizward", "SIIT-Wizzard",
+ "This wizzard helps to setup SIIT (IPv4-over-IPv6) translation according to RFC2765.")
+
+f:field(DummyValue, "info_ula", "Mesh ULA address").value = ula:string()
+
+f:field(DummyValue, "ipv4_pool", "IPv4 allocation pool").value =
+	"%s (%i hosts)" %{ gv4_net:string(), 2 ^ ( 32 - gv4_net:prefix() ) - 2 }
+
+f:field(DummyValue, "ipv4_size", "IPv4 LAN network prefix").value =
+	"%i bit (%i hosts)" %{ ipv4_netsz, 2 ^ ( 32 - ipv4_netsz ) - 2 }
+
+mode = f:field(ListValue, "mode", "Operation mode")
+mode:value("client", "Client")
+mode:value("gateway", "Gateway")
+
+dev = f:field(ListValue, "device", "Wireless device")
+uci:foreach("wireless", "wifi-device",
+	function(section)
+		dev:value(section[".name"])
+	end)
+
+lanip = f:field(Value, "ipaddr", "LAN IPv4 subnet")
+function lanip.formvalue(self, section)
+	local val = self.map:formvalue(self:cbid(section))
+	local net = luci.ip.IPv4("%s/%i" %{ val, ipv4_netsz })
+
+	if net then
+		if gv4_net:contains(net) then
+			if not net:minhost():equal(net:host()) then
+				self.error = { [section] = true }
+				f.errmessage = "IPv4 address is not the first host of " ..
+					"subnet, expected " .. net:minhost():string()
+			end
+		else
+			self.error = { [section] = true }
+			f.errmessage = "IPv4 address is not within the allocation pool"
+		end
+	else
+		self.error = { [section] = true }
+		f.errmessage = "Invalid IPv4 address given"
+	end
+
+	return val
+end
+
+dns = f:field(Value, "dns", "DNS server for LAN clients")
+dns.value = "141.1.1.1"
+
+-------------------- Control --------------------
+function f.handle(self, state, data)
+	if state == FORM_VALID then
+		luci.http.redirect(luci.dispatcher.build_url("admin", "uci", "changes"))
+		return false
+	end
+	return true
+end
+
+function mode.write(self, section, value)
+
+	--
+	-- Find LAN IPv4 range
+	--
+	local lan_net = luci.ip.IPv4(
+		( lanip:formvalue(section) or "172.16.0.1" ) .. "/" .. ipv4_netsz
+	)
+
+	if not lan_net then return end
+
+	--
+	-- Find wifi interface, dns server and hostname
+	--
+	local device      = dev:formvalue(section)
+	local dns_server  = dns:formvalue(section) or "141.1.1.1"
+	local hostname    = "siit-" .. lan_net:host():string():gsub("%.","-")
+
+	--
+	-- Configure wifi device
+	--
+	local wifi_device  = dev:formvalue(section)
+	local wifi_essid   = uci:get("siit", "wifi", "essid")   or "6mesh.freifunk.net"
+	local wifi_bssid   = uci:get("siit", "wifi", "bssid")   or "02:ca:ff:ee:ba:be"
+	local wifi_channel = uci:get("siit", "wifi", "channel") or "1"
+
+	-- nuke old device definition
+	uci:delete_all("wireless", "wifi-iface",
+		function(s) return s.device == wifi_device end )
+
+	uci:delete_all("network", "interface",
+		function(s) return s['.name'] == wifi_device end )
+
+	-- create wifi device definition
+	uci:tset("wireless", wifi_device, {
+		disabled  = 0,
+		channel   = wifi_channel,
+--		txantenna = 1,
+--		rxantenna = 1,
+--		diversity = 0
+	})
+
+	uci:section("wireless", "wifi-iface", nil, {
+		encryption = "none",
+		mode       = "adhoc",
+		txpower    = 10,
+		sw_merge   = 1,
+		network    = wifi_device,
+		device     = wifi_device,
+		ssid       = wifi_essid,
+		bssid      = wifi_bssid,
+	})
+
+	--
+	-- Gateway mode
+	--
+	--	* wan port is dhcp, lan port is 172.23.1.1/24
+	--	* siit0 gets a dummy address: 169.254.42.42
+	--	* wl0 gets an ipv6 address, in this case the fdca:ffee:babe::1:1/64
+	--	* we do a ::ffff:ffff:0/96 route into siit0, so everything from 6mesh goes into translation.
+	--	* an HNA6 of ::ffff:ffff:0:0/96 announces the mapped 0.0.0.0/0 ipv4 space.
+	--	* MTU on WAN, LAN down to 1400, ipv6 headers are slighly larger.
+
+	if value == "gateway" then
+
+		-- wan mtu
+		uci:set("network", "wan", "mtu", 1240)
+
+		-- lan settings
+		uci:tset("network", "lan", {
+			mtu     = 1240,
+			ipaddr  = lan_net:host():string(),
+			netmask = lan_net:mask():string(),
+			proto   = "static"
+		})
+
+		-- use full siit subnet
+		siit_route = luci.ip.IPv6(siit_prefix .. "/96")
+
+		-- v4 <-> siit route
+		uci:delete_all("network", "route",
+			function(s) return s.interface == "siit0" end)
+
+		uci:section("network", "route", nil, {
+			interface = "siit0",
+			target    = gv4_net:network():string(),
+			netmask   = gv4_net:mask():string()
+		})
+
+	--
+	-- Client mode
+	--
+	--	* 172.23.2.1/24 on its lan, fdca:ffee:babe::1:2 on wl0 and the usual dummy address on siit0.
+	--	* we do a ::ffff:ffff:172.13.2.0/120 to siit0, because in this case, only traffic directed to clients needs to go into translation.
+	--	* same route as HNA6 announcement to catch the traffic out of the mesh.
+	--	* Also, MTU on LAN reduced to 1400.
+
+	else
+
+		-- lan settings
+		uci:tset("network", "lan", {
+			mtu     = 1240,
+			ipaddr  = lan_net:host():string(),
+			netmask = lan_net:mask():string()
+		})
+
+		-- derive siit subnet from lan config
+		siit_route = luci.ip.IPv6(
+			siit_prefix .. "/" .. (96 + lan_net:prefix())
+		):add(lan_net[2])
+
+		-- ipv4 <-> siit route
+		uci:delete_all("network", "route",
+			function(s) return s.interface == "siit0" end)
+
+		-- XXX: kind of a catch all, gv4_net would be better
+		--      but does not cover non-local v4 space
+		uci:section("network", "route", nil, {
+			interface = "siit0",
+			target    = "0.0.0.0",
+			netmask   = "0.0.0.0"
+		})
+	end
+
+	-- setup the firewall
+	uci:delete_all("firewall", "zone",
+		function(s) return (
+			s['.name'] == "siit0" or s.name == "siit0" or
+			s.network == "siit0" or	s['.name'] == wifi_device or
+			s.name == wifi_device or s.network == wifi_device
+		) end)
+
+	uci:delete_all("firewall", "forwarding",
+		function(s) return (
+			s.src == wifi_device and s.dest == "siit0" or
+			s.dest == wifi_device and s.src == "siit0" or
+			s.src == "lan" and s.dest == "siit0" or
+			s.dest == "lan" and s.src == "siit0"
+		) end)
+
+	uci:section("firewall", "zone", "siit0", {
+		name    = "siit0",
+		network = "siit0",
+		input   = "ACCEPT",
+		output  = "ACCEPT",
+		forward = "ACCEPT"
+	})
+
+	uci:section("firewall", "zone", wifi_device, {
+		name    = wifi_device,
+		network = wifi_device,
+		input   = "ACCEPT",
+		output  = "ACCEPT",
+		forward = "ACCEPT"
+	})
+
+	uci:section("firewall", "forwarding", nil, {
+		src  = wifi_device,
+		dest = "siit0"
+	})
+
+	uci:section("firewall", "forwarding", nil, {
+		src  = "siit0",
+		dest = wifi_device
+	})
+
+	uci:section("firewall", "forwarding", nil, {
+		src  = "lan",
+		dest = "siit0"
+	})
+
+	uci:section("firewall", "forwarding", nil, {
+		src  = "siit0",
+		dest = "lan"
+	})
+
+	-- firewall include
+	uci:delete_all("firewall", "include",
+		function(s) return s.path == "/etc/firewall.user" end)
+
+	uci:section("firewall", "include", nil, {
+		path = "/etc/firewall.user"
+	})
+
+
+	-- siit0 interface
+	uci:delete_all("network", "interface",
+		function(s) return ( s.ifname == "siit0" ) end)
+
+	uci:section("network", "interface", "siit0", {
+		ifname  = "siit0",
+		proto   = "none"
+	})
+
+	-- siit0 route
+	uci:delete_all("network", "route6",
+		function(s) return siit_route:contains(luci.ip.IPv6(s.target)) end)
+
+	uci:section("network", "route6", nil, {
+		interface = "siit0",
+		target    = siit_route:string()
+	})
+
+	-- create wifi network interface
+	uci:section("network", "interface", wifi_device, {
+		proto   = "static",
+		mtu     = 1400,
+		ip6addr = ula:string()
+	})
+
+	-- nuke old olsrd interfaces
+	uci:delete_all("olsrd", "Interface",
+		function(s) return s.interface == wifi_device end)
+
+	-- configure olsrd interface
+	uci:foreach("olsrd", "olsrd",
+		function(s) uci:set("olsrd", s['.name'], "IpVersion", 6) end)
+
+	uci:section("olsrd", "Interface", nil, {
+		ignore      = 0,
+		interface   = wifi_device,
+		Ip6AddrType = "unique-local"
+	})
+
+	-- hna6
+	uci:delete_all("olsrd", "Hna6",
+		function(s) return true end)
+
+	uci:section("olsrd", "Hna6", nil, {
+		netaddr = siit_route:host():string(),
+		prefix  = siit_route:prefix()
+	})
+
+	-- txtinfo v6 & olsrd nameservice
+	uci:foreach("olsrd", "LoadPlugin",
+		function(s)
+			if s.library == "olsrd_txtinfo.so.0.1" then
+				uci:set("olsrd", s['.name'], "accept", "::1")
+			elseif s.library == "olsrd_nameservice.so.0.3" then
+				uci:set("olsrd", s['.name'], "name", hostname)
+			end
+		end)
+
+	-- lan dns
+	uci:tset("dhcp", "lan", {
+		dhcp_option = "6," .. dns_server,
+		start       = bit.band(lan_net:minhost():add(1)[2][2], 0xFF),
+		limit       = ( 2 ^ ( 32 - lan_net:prefix() ) ) - 3
+	})
+
+	-- hostname
+	uci:foreach("system", "system",
+		function(s)
+			uci:set("system", s['.name'], "hostname", hostname)
+		end)
+
+	uci:save("wireless")
+	uci:save("firewall")
+	uci:save("network")
+	uci:save("system")
+	uci:save("olsrd")
+	uci:save("dhcp")
+end
+
+return f
diff --git a/trunk/package/luci/applications/luci-siitwizard/root/etc/config/siit b/trunk/package/luci/applications/luci-siitwizard/root/etc/config/siit
new file mode 100644
index 00000000..c594547d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-siitwizard/root/etc/config/siit
@@ -0,0 +1,14 @@
+config siit ipv4
+	option pool			"77.87.52.0/22"
+	option netsize			"29"
+
+config siit ipv6
+	option ula_prefix		"fd00::"
+	option ula_global		"00ca:ffee:babe::"
+	option ula_subnet		"0000:0000:0000:dada::"
+	option siit_prefix		"::ffff:0000:0000"
+
+config siit wifi
+	option essid			"6mesh.freifunk.net"
+	option bssid			"02:25:c3:ca:ff:ee"
+	option channel			"1"
diff --git a/trunk/package/luci/applications/luci-splash/Makefile b/trunk/package/luci/applications/luci-splash/Makefile
new file mode 100644
index 00000000..6e625c0e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/Makefile
@@ -0,0 +1,4 @@
+PO = splash
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-splash/README b/trunk/package/luci/applications/luci-splash/README
new file mode 100644
index 00000000..5a7af14c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/README
@@ -0,0 +1,5 @@
+
+* IPv6 support is only partial:
+  - will only work when used together with IPv4 (Dual stack)
+  - No bandwidth limiting
+
diff --git a/trunk/package/luci/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh b/trunk/package/luci/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh
new file mode 100755
index 00000000..76f6d4d3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/htdocs/cgi-bin/splash/splash.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+$(uci -q get luci_splash.general.redirect_url) || {
+	set -x
+	touch /var/state/luci_splash_locations
+	touch /etc/config/luci_splash_locations
+	MAC=$(grep "$REMOTE_HOST" /proc/net/arp | awk '{print $4}')
+	uci -P /var/state set luci_splash_locations.${MAC//:/}=redirect
+	uci -P /var/state set luci_splash_locations.${MAC//:/}.location="http://${HTTP_HOST}${REQUEST_URI}"
+	set +x
+}
+
+echo -en "Cache-Control: no-cache, max-age=0, no-store, must-revalidate\r\n"
+echo -en "Pragma: no-cache\r\n"
+echo -en "Expires: -1\r\n"
+echo -en "Status: 307 Temporary Redirect\r\n"
+echo -en "Location: http://$SERVER_ADDR/cgi-bin/luci/splash\r\n" 
+echo -en "\r\n"
+
+cat <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<WISPAccessGatewayParam xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.wballiance.net/wispr_2_0.xsd">
+	<Redirect>
+		<MessageType>100</MessageType>
+		<ResponseCode>0</ResponseCode>
+		<AccessProcedure>1.0</AccessProcedure>
+		<AccessLocation>12</AccessLocation>
+		<LocationName>$SERVER_ADDR</LocationName>
+		<LoginURL>http://$SERVER_ADDR/cgi-bin/luci/splash?wispr=1</LoginURL>
+		<AbortLoginURL>http://$SERVER_ADDR/</AbortLoginURL>
+	</Redirect>
+</WISPAccessGatewayParam>
+EOT
+
+
diff --git a/trunk/package/luci/applications/luci-splash/htdocs/luci/splash/index.html b/trunk/package/luci/applications/luci-splash/htdocs/luci/splash/index.html
new file mode 100644
index 00000000..486409a2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/htdocs/luci/splash/index.html
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci/splash" />
+</head>
+<body style="background-color: black">
+<a style="color: white; text-decoration: none" href="/cgi-bin/luci/splash">LuCI - Lua Configuration Interface</a>
+</body>
+</html>
diff --git a/trunk/package/luci/applications/luci-splash/ipkg/postinst b/trunk/package/luci/applications/luci-splash/ipkg/postinst
new file mode 100755
index 00000000..a87729e4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -n "${IPKG_INSTROOT}" ] || {
+	/etc/init.d/luci_splash enabled || /etc/init.d/luci_splash enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/controller/splash/splash.lua b/trunk/package/luci/applications/luci-splash/luasrc/controller/splash/splash.lua
new file mode 100644
index 00000000..97d04008
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/controller/splash/splash.lua
@@ -0,0 +1,151 @@
+module("luci.controller.splash.splash", package.seeall)
+
+local uci = luci.model.uci.cursor()
+local util = require "luci.util"
+
+function index()
+	entry({"admin", "services", "splash"}, cbi("splash/splash"), _("Client-Splash"), 90)
+	entry({"admin", "services", "splash", "splashtext" }, form("splash/splashtext"), _("Splashtext"), 10)
+
+	local e
+	
+	e = node("splash")
+	e.target = call("action_dispatch")
+
+	node("splash", "activate").target = call("action_activate")
+	node("splash", "splash").target   = template("splash_splash/splash")
+	node("splash", "blocked").target  = template("splash/blocked")
+
+	entry({"admin", "status", "splash"}, call("action_status_admin"), _("Client-Splash"))
+
+	local page  = node("splash", "publicstatus")
+	page.target = call("action_status_public")
+	page.leaf   = true
+end
+
+function action_dispatch()
+	local uci = luci.model.uci.cursor_state()
+	local mac = luci.sys.net.ip4mac(luci.http.getenv("REMOTE_ADDR")) or ""
+	local access = false
+
+	uci:foreach("luci_splash", "lease", function(s)
+		if s.mac and s.mac:lower() == mac then access = true end
+	end)
+	uci:foreach("luci_splash", "whitelist", function(s)
+		if s.mac and s.mac:lower() == mac then access = true end
+	end)
+
+	if #mac > 0 and access then
+		luci.http.redirect(luci.dispatcher.build_url())
+	else
+		luci.http.redirect(luci.dispatcher.build_url("splash", "splash"))
+	end
+end
+
+function blacklist()
+	leased_macs = { }
+	uci:foreach("luci_splash", "blacklist",
+	        function(s) leased_macs[s.mac:lower()] = true
+	end)
+	return leased_macs
+end
+
+function action_activate()
+	local ip = luci.http.getenv("REMOTE_ADDR") or "127.0.0.1"
+	local mac = luci.sys.net.ip4mac(ip:match("^[\[::ffff:]*(%d+.%d+%.%d+%.%d+)\]*$"))
+	local uci_state = require "luci.model.uci".cursor_state()
+	local blacklisted = false
+	if mac and luci.http.formvalue("accept") then
+		uci:foreach("luci_splash", "blacklist",
+        	        function(s) if s.mac:lower() == mac or s.mac == mac then blacklisted = true end
+	        end)
+		if blacklisted then	
+			luci.http.redirect(luci.dispatcher.build_url("splash" ,"blocked"))
+		else
+			local redirect_url = uci:get("luci_splash", "general", "redirect_url")
+			if not redirect_url then
+				redirect_url = uci_state:get("luci_splash_locations", mac:gsub(':', ''):lower(), "location")
+			end
+			if not redirect_url then
+				redirect_url = luci.model.uci.cursor():get("freifunk", "community", "homepage") or 'http://www.freifunk.net'
+			end
+			remove_redirect(mac:gsub(':', ''):lower())
+			os.execute("luci-splash lease "..mac.." >/dev/null 2>&1")
+			luci.http.redirect(redirect_url)
+		end
+	else
+		luci.http.redirect(luci.dispatcher.build_url())
+	end
+end
+
+function action_status_admin()
+	local uci = luci.model.uci.cursor_state()
+	local macs = luci.http.formvaluetable("save")
+
+	local changes = { 
+		whitelist = { },
+		blacklist = { },
+		lease     = { },
+		remove    = { }
+	}
+
+	for key, _ in pairs(macs) do
+		local policy = luci.http.formvalue("policy.%s" % key)
+		local mac    = luci.http.protocol.urldecode(key)
+
+		if policy == "whitelist" or policy == "blacklist" then
+			changes[policy][#changes[policy]+1] = mac
+		elseif policy == "normal" then
+			changes["lease"][#changes["lease"]+1] = mac
+		elseif policy == "kicked" then
+			changes["remove"][#changes["remove"]+1] = mac
+		end
+	end
+
+	if #changes.whitelist > 0 then
+		os.execute("luci-splash whitelist %s >/dev/null"
+			% table.concat(changes.whitelist))
+	end
+
+	if #changes.blacklist > 0 then
+		os.execute("luci-splash blacklist %s >/dev/null"
+			% table.concat(changes.blacklist))
+	end
+
+	if #changes.lease > 0 then
+		os.execute("luci-splash lease %s >/dev/null"
+			% table.concat(changes.lease))
+	end
+
+	if #changes.remove > 0 then
+		os.execute("luci-splash remove %s >/dev/null"
+			% table.concat(changes.remove))
+	end
+
+	luci.template.render("admin_status/splash", { is_admin = true })
+end
+
+function action_status_public()
+	luci.template.render("admin_status/splash", { is_admin = false })
+end
+
+function remove_redirect(mac)
+	local mac = mac:lower()
+	mac = mac:gsub(":", "")
+	local uci = require "luci.model.uci".cursor_state()
+	local redirects = uci:get_all("luci_splash_locations")
+	--uci:load("luci_splash_locations")
+	uci:revert("luci_splash_locations")
+	-- For all redirects
+	for k, v in pairs(redirects) do
+		if v[".type"] == "redirect" then
+			if v[".name"] ~= mac then
+				-- Rewrite state
+				uci:section("luci_splash_locations", "redirect", v[".name"], {
+					location = v.location
+				})
+			end
+		end
+	end
+	uci:save("luci_splash_redirects")
+end
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua b/trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
new file mode 100644
index 00000000..206ef705
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
@@ -0,0 +1,87 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+require("luci.model.uci")
+
+m = Map("luci_splash", translate("Client-Splash"), translate("Client-Splash is a hotspot authentification system for wireless mesh networks."))
+
+s = m:section(NamedSection, "general", "core", translate("General"))
+s.addremove = false
+
+s:option(Value, "leasetime", translate("Clearance time"), translate("Clients that have accepted the splash are allowed to use the network for that many hours."))
+local redir = s:option(Value, "redirect_url", translate("Redirect target"), translate("Clients are redirected to this page after they have accepted the splash. If this is left empty they are redirected to the page they had requested."))
+redir.rmempty = true
+
+s:option(Value, "limit_up", translate("Upload limit"), translate("Clients upload speed is limited to this value (kbyte/s)"))
+s:option(Value, "limit_down", translate("Download limit"), translate("Clients download speed is limited to this value (kbyte/s)"))
+
+s:option(DummyValue, "_tmp", "",
+	translate("Bandwidth limit for clients is only activated when both up- and download limit are set. " ..
+	"Use a value of 0 here to completely disable this limitation. Whitelisted clients are not limited."))
+
+s = m:section(TypedSection, "iface", translate("Interfaces"), translate("Interfaces that are used for Splash."))
+
+s.template = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+
+local uci = luci.model.uci.cursor()
+
+zone = s:option(ListValue, "zone", translate("Firewall zone"),
+	translate("Splash rules are integrated in this firewall zone"))
+
+uci:foreach("firewall", "zone",
+	function (section)
+		zone:value(section.name)
+	end)
+	
+iface = s:option(ListValue, "network", translate("Network"),
+	translate("Intercept client traffic on this Interface"))
+
+uci:foreach("network", "interface",
+	function (section)
+		if section[".name"] ~= "loopback" then
+			iface:value(section[".name"])
+		end
+	end)
+	
+uci:foreach("network", "alias",
+	function (section)
+		iface:value(section[".name"])
+	end)
+
+
+s = m:section(TypedSection, "whitelist", translate("Whitelist"),
+	translate("MAC addresses of whitelisted clients. These do not need to accept the splash and are not bandwidth limited."))
+
+s.template = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+s:option(Value, "mac", translate ("MAC Address"))
+
+
+s = m:section(TypedSection, "blacklist", translate("Blacklist"),
+	translate("MAC addresses in this list are blocked."))
+
+s.template = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+s:option(Value, "mac", translate ("MAC Address"))
+
+s = m:section(TypedSection, "subnet", translate("Allowed hosts/subnets"),
+	translate("Destination hosts and networks that are excluded from splashing, i.e. they are always allowed."))
+
+s.template = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+s:option(Value, "ipaddr", translate("IP Address"))
+s:option(Value, "netmask", translate("Netmask"), translate("optional when using host addresses")).rmempty = true
+	
+return m
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua b/trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
new file mode 100644
index 00000000..00c5aba9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splashtext.lua
@@ -0,0 +1,66 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2010 Manuel Munz <freifunk@somakoma.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local fs = require "nixio.fs"
+
+local splashtextfile = "/usr/lib/luci-splash/splashtext.html" 
+local splashtextinclude = "/usr/lib/luci-splash/splashtextinclude.html" 
+
+
+f = SimpleForm("splashtext", translate("Edit the complete splash text"),
+	translate("You can enter your own text that is displayed to clients here.<br />" ..
+	"It is possible to use the following markers: " ..
+	"###COMMUNITY###, ###COMMUNITY_URL###, ###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."))
+
+t = f:field(TextValue, "text")
+t.rmempty = true
+t.rows = 30
+function t.cfgvalue()
+	return fs.readfile(splashtextfile) or ""
+end
+
+function f.handle(self, state, data)
+	if state == FORM_VALID then
+		if data.text then
+			fs.writefile(splashtextfile, data.text:gsub("\r\n", "\n"))
+		else
+			fs.unlink(splashtextfile)
+		end
+	end
+	return true
+end
+
+g = SimpleForm("splashtextinclude", translate("Include your own text in the default splash"),
+	translate("As an alternative to editing the complete splash text you can also just include some custom text in the default splash page by entering it here."))
+
+t = g:field(TextValue, "text")
+t.rmempty = true
+t.rows = 30
+function t.cfgvalue()
+	return fs.readfile(splashtextinclude) or ""
+end
+
+function g.handle(self, state, data)
+	if state == FORM_VALID then
+		if data.text then
+			fs.writefile(splashtextinclude, data.text:gsub("\r\n", "\n"))
+		else
+			fs.unlink(splashtextinclude)
+		end
+	end
+	return true
+end
+
+
+return f, g
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/view/admin_status/splash.htm b/trunk/package/luci/applications/luci-splash/luasrc/view/admin_status/splash.htm
new file mode 100644
index 00000000..61b32bab
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/view/admin_status/splash.htm
@@ -0,0 +1,294 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%-
+
+local utl = require "luci.util"
+local ipt = require "luci.sys.iptparser".IptParser()
+local uci = require "luci.model.uci".cursor_state()
+local wat = require "luci.tools.webadmin"
+local fs  = require "nixio.fs"
+
+local clients = { }
+local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime") or 1) * 60 * 60
+local leasefile = "/tmp/dhcp.leases"
+
+uci:foreach("dhcp", "dnsmasq",
+	function(s)
+		if s.leasefile then leasefile = s.leasefile end
+	end)
+
+
+uci:foreach("luci_splash_leases", "lease",
+	function(s)
+		if s.start and s.mac then
+			clients[s.mac:lower()] = {
+				start   = tonumber(s.start),
+				limit   = ( tonumber(s.start) + leasetime ),
+				mac     = s.mac:upper(),
+				ipaddr  = s.ipaddr,
+				policy  = "normal",
+				packets = 0,
+				bytes   = 0,
+			}
+		end
+	end)
+
+for _, r in ipairs(ipt:find({table="nat", chain="luci_splash_leases"})) do
+	if r.options and #r.options >= 2 and r.options[1] == "MAC" then
+		if not clients[r.options[2]:lower()] then
+			clients[r.options[2]:lower()] = {
+				start  = 0,
+				limit  = 0,
+				mac    = r.options[2]:upper(),
+				policy = ( r.target == "RETURN" ) and "whitelist" or "blacklist",
+				packets = 0,
+				bytes   = 0
+			}
+		end
+	end
+end
+
+for mac, client in pairs(clients) do
+	client.bytes_in    = 0
+	client.bytes_out   = 0
+	client.packets_in  = 0
+	client.packets_out = 0
+
+	if client.ipaddr then
+		local rin  = ipt:find({table="mangle", chain="luci_splash_mark_in", destination=client.ipaddr})
+		local rout = ipt:find({table="mangle", chain="luci_splash_mark_out", options={"MAC", client.mac:upper()}})
+
+		if rin and #rin > 0 then
+			client.bytes_in   = rin[1].bytes
+			client.packets_in = rin[1].packets
+		end
+
+		if rout and #rout > 0 then
+			client.bytes_out   = rout[1].bytes
+			client.packets_out = rout[1].packets
+		end
+	end
+end
+
+uci:foreach("luci_splash", "whitelist",
+	function(s)
+		if s.mac and clients[s.mac:lower()] then
+			clients[s.mac:lower()].policy="whitelist"
+		end
+	end)
+
+uci:foreach("luci_splash", "blacklist",
+	function(s)
+		if s.mac and clients[s.mac:lower()] then
+			clients[s.mac:lower()].policy=(s.kicked and "kicked" or "blacklist")
+		end
+	end)		
+
+if fs.access(leasefile) then
+	for l in io.lines(leasefile) do
+		local time, mac, ip, name = l:match("^(%d+) (%S+) (%S+) (%S+)")
+		if time and mac and ip then
+			local c = clients[mac:lower()]
+			if c then
+				c.ip = ip
+				c.hostname = ( name ~= "*" ) and name or nil
+			end
+		end
+	end
+end
+
+for i, a in ipairs(luci.sys.net.arptable()) do
+	local c = clients[a["HW address"]:lower()]
+	if c and not c.ip then
+		c.ip = a["IP address"]
+	end
+end
+
+local function showmac(mac)
+	if not is_admin then
+		mac = mac:gsub("(%S%S:%S%S):%S%S:%S%S:(%S%S:%S%S)", "%1:XX:XX:%2")
+	end
+	return mac
+end
+
+if luci.http.formvalue("status") == "1" then
+	local rv = {}
+	for _, c in utl.spairs(clients,
+		function(a,b) if clients[a].policy == clients[b].policy then
+			return (clients[a].start > clients[b].start)
+		else
+			return (clients[a].policy > clients[b].policy)
+		end
+	end)
+	do
+		if c.ip then
+			rv[#rv+1] = {
+				hostname = c.hostname or "?",
+				ip = c.ip or "?",
+				mac = showmac(c.mac) or "?",
+				timeleft = (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or (c.policy ~= "normal") and "-" or "expired",
+				trafficin = wat.byte_format(c.bytes_in) or "?",
+				trafficout = wat.byte_format(c.bytes_out) or "?",
+				policy = c.policy or "?"
+	                        }
+		end
+	end
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+	return
+end
+-%>
+
+
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+
+	XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 },
+		function(x, info)
+		{
+		var tbody = document.getElementById('splash_table');
+			if (tbody)
+			{
+				var s = '';
+				if (info.length == undefined) {
+					s += '<tr class="cbi-section-table-row"><td colspan="7" class="cbi-section-table-cell"><br /><em><%:No clients connected%></em><br /></td></tr>'
+				};
+				for (var idx = 0; idx < info.length; idx++)
+				{
+					var splash = info[idx];
+					s += String.format(
+						'<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
+						'<td class="cbi-section-table-cell">%s</td>' +
+						'<td class="cbi-section-table-cell">%s</td>' +
+						'<td class="cbi-section-table-cell">%s</td>' +
+						'<td class="cbi-section-table-cell">%s</td>' +
+						'<td class="cbi-section-table-cell">%s/%s</td>' +
+						'<td class="cbi-section-table-cell">',
+						splash.hostname, splash.ip, splash.mac, splash.timeleft, splash.trafficin, splash.trafficout);
+
+				<% if is_admin then %>
+					s += String.format('<select name="policy.%s" style="width:200px">', splash.mac.toLowerCase());
+					if (splash.policy == 'whitelist') { 	
+						s += '<option value="whitelist" selected="selected"><%:whitelisted%></option>'
+					} else {
+						s += '<option value="whitelist"><%:whitelisted%></option>'
+					};
+					if (splash.policy == 'normal') {
+						s += '<option value="normal" selected="selected"><%:splashed%></option>';
+						s += '<option value="kicked"><%:temporarily blocked%></option>'
+					} else {
+						s += '<option value="normal"><%:splashed%></option>'
+					};
+					if (splash.policy == 'blacklist') {
+						s+= '<option value="blacklist" selected="selected"><%:blacklisted%></option>'
+					} else {
+						s += '<option value="blacklist"><%:blacklisted%></option>'
+					};
+					s += String.format(
+						'</select>' +
+						'<input type="submit" class="cbi-button cbi-button-save" name="save.%s" value="<%:Save%>" />',
+						splash.mac.toLowerCase());
+				<% else %>
+					s += String.format('%s', splash.policy);
+				<% end %>
+					s += '</td></tr>'
+				}
+				tbody.innerHTML = s;
+			}
+		}
+	);
+//]]></script>
+
+
+<div id="cbi-splash-leases" class="cbi-map">
+	<h2><a id="content" name="content"><%:Client-Splash%></a></h2>
+	<fieldset id="cbi-table-table" class="cbi-section">
+		<legend><%:Active Clients%></legend>
+		<div class="cbi-section-node">
+			<% if is_admin then %><form action="<%=REQUEST_URI%>" method="post"><% end %>
+			<table class="cbi-section-table">
+				<thead>
+					<tr class="cbi-section-table-titles">
+						<th class="cbi-section-table-cell"><%:Hostname%></th>
+						<th class="cbi-section-table-cell"><%:IP Address%></th>
+						<th class="cbi-section-table-cell"><%:MAC Address%></th>
+						<th class="cbi-section-table-cell"><%:Time remaining%></th>
+						<th class="cbi-section-table-cell"><%:Traffic in/out%></th>
+						<th class="cbi-section-table-cell"><%:Policy%></th>
+					</tr>
+				</thead>
+				<tbody id="splash_table">
+
+				<%-
+					local count = 0
+					for _, c in utl.spairs(clients,
+						function(a,b)
+							if clients[a].policy == clients[b].policy then
+								return (clients[a].start > clients[b].start)
+							else
+								return (clients[a].policy > clients[b].policy)
+							end
+						end)
+					do
+						if c.ip then
+							count = count + 1
+				-%>
+						<tr class="cbi-section-table-row cbi-rowstyle-<%=2-(count%2)%>">
+						<td class="cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("unknown") .. "</em>"%></td>
+						<td class="cbi-section-table-cell"><%=c.ip or "<em>" .. translate("unknown") .. "</em>"%></td>
+						<td class="cbi-section-table-cell"><%=showmac(c.mac)%></td>
+						<td class="cbi-section-table-cell"><%=
+							(c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or
+								(c.policy ~= "normal") and "-" or "<em>" .. translate("expired") .. "</em>"
+						%></td>
+						<td class="cbi-section-table-cell"><%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%></td>
+						<td class="cbi-section-table-cell">
+							<% if is_admin then %>
+							<select name="policy.<%=c.mac:lower()%>" style="width:200px">
+								<option value="whitelist"<%=c.policy=="whitelist" and ' selected="selected"'%>><%:whitelisted%></option>
+								<option value="normal"<%=c.policy=="normal" and not c.kicked and ' selected="selected"'%>><%:splashed%></option>
+								<option value="blacklist"<%=c.policy=="blacklist" and ' selected="selected"'%>><%:blacklisted%></option>
+								<% if c.policy == "normal" then -%>
+									<option value="kicked"><%:temporarily blocked%></option>
+								<%- end %>
+							</select>
+							<input type="submit" class="cbi-button cbi-button-save" name="save.<%=c.mac:lower()%>" value="<%:Save%>" />
+							<% else %>
+							<%=c.policy%>
+							<% end %>
+						</td>
+						</tr>
+						<%- 
+							end
+						end
+						if count == 0 then
+						-%>
+						<tr class="cbi-section-table-row">
+							<td colspan="7" class="cbi-section-table-cell">
+								<br /><em><%:No clients connected%></em><br />
+							</td>
+						</tr>
+				<%- end -%>
+				</tbody>
+			</table>
+			<% if is_admin then %></form><% end %>
+		</div>
+	</fieldset>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/view/splash/blocked.htm b/trunk/package/luci/applications/luci-splash/luasrc/view/splash/blocked.htm
new file mode 100644
index 00000000..de61ecf0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/view/splash/blocked.htm
@@ -0,0 +1,25 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+-%>
+<%
+local contacturl = luci.dispatcher.build_url("freifunk", "contact")
+%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Blocked%></a></h2>
+
+<p><%:Your access to this network has been blocked, most likely because you did something that our rules explicitly forbid.%></p>
+<p><%:To ask for the reason why you have been blocked or ask for access again you can try to contact the owner of this access point:%> <a href="<%=contacturl%>"><%:Contact%></a></p>
+
+<%+footer%>
+
+
+
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/view/splash/splash.htm b/trunk/package/luci/applications/luci-splash/luasrc/view/splash/splash.htm
new file mode 100644
index 00000000..2ebee273
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/view/splash/splash.htm
@@ -0,0 +1,139 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+-%>
+<%
+local fs = require "luci.fs"
+local has_custom_splash = fs.access("/usr/lib/luci-splash/splashtext.html")
+local has_custom_splashinclude = fs.access("/usr/lib/luci-splash/splashtextinclude.html")
+
+function expand (e, R)        
+	return (string.gsub(e, "###([A-Z_]+)###", R))
+end
+
+local community, homepage, leasetime, limit_up, limit_down
+
+local contacturl = luci.dispatcher.build_url("freifunk", "contact")
+
+local c = luci.model.uci.cursor():get_all("freifunk", "community")
+if c and c.name then
+        name = luci.model.uci.cursor():get('profile_' .. c.name, 'profile', 'name')
+	if name then
+		community = name
+	else
+		community = c.name
+	end
+else
+	community = "Freifunk"
+end
+
+if c and c.homepage then
+	homepage = c.homepage
+else
+	homepage = "http://freifunk.net"
+end
+
+local s = luci.model.uci.cursor():get_all("luci_splash", "general")
+if s then
+	leasetime = s.leasetime or ""
+	limit_up = s.limit_up or nil
+	limit_down = s.limit_down or nil
+end
+
+local limit_text = ""
+if limit_up and limit_down then
+	limit_text = "<p>" .. translate("Your bandwidth is limited to") .. " " .. limit_down .. "/" .. limit_up ..
+	" " .. translate("KB/s (Download/Upload). You may be able to remove this limit by actively contributing " ..
+	"to this project.") .. "</p>"
+end
+
+local contact = translate('Get in %s with the operator of this access point.')
+contact = contact % ('<a href="' .. contacturl .. '">' .. translatef('Contact') .. '</a>')
+
+local accepttext = translate('By accepting these rules you can use this network for %s hour(s). After this time you need to accept these rules again.')
+accepttext = accepttext % leasetime
+
+
+if has_custom_splash then
+	local R = {
+		COMMUNITY = community,
+		COMMUNITY_URL = homepage,
+		LEASETIME = leasetime,
+		ACCEPT = tostring(translate("Accept")),
+		LIMIT = limit_text,
+		CONTACTURL = contacturl
+	}
+	local splashtext = expand(fs.readfile("/usr/lib/luci-splash/splashtext.html"), R)
+	%>
+	<%=splashtext%>
+
+<% else %>
+
+	<h2><a id="content" name="content"><%:Welcome%></a></h2>
+
+	<p><%:You are now connected to the free wireless mesh network%> <a href="<%=homepage%>"><%=community%></a>.
+	<%:Please note that we are not an internet service provider but an experimental community network.%></p>
+	<p><%:Access to the internet might be possible nevertheless, because some activists of this project share their
+	private	internet connections. These few connections are shared between all users. That means available bandwidth
+	is limited and because of this we ask you not to do any of the following:%></p>
+	<ul>
+		<li><%:use filesharing applications on this network%></li>
+		<li><%:waste bandwidth with unneccesary downloads or streams%></li>
+		<li><%:perform any kind of illegal activities%></li>
+	</ul>
+	<br />
+
+	<% if limit_up and limit_down then %>
+		<%=limit_text%>
+	<% end %>
+	
+	<p><%:If you use this network on a regular basis we ask for your support:%></p>
+	<ul>
+		<li><a href="<%=homepage%>"><%:Become an active member of this community and help by operating your own node%></a></li>
+		<li><%=contact%></li>
+		<li><%:Donate some money to help us keep this project alive.%></li>
+		<li><%:If you operate your own wifi equipment use channels different from ours.%></li>
+	</ul>
+
+	<%
+	if has_custom_splashinclude then
+		local splashtextinclude = fs.readfile("/usr/lib/luci-splash/splashtextinclude.html")
+	%>
+		<%=splashtextinclude%>
+	<% end %>
+
+	<h2><%:Usage Agreement%></h2>
+	<p>
+	<%:The open and free wireless network of volunteers ("Operators") provides the necessary equipment and Internet connections ("Infrastructure") at their own expense.%>
+	<%:These Terms of Use govern the use of the network by its participants' computer, PDA, or similar device ("Devices") within the network.%>
+	<%:Access to the network is not guaranteed. It can be interrupted at any time without notice for any reason, for certain devices, and/or may be blocked for certain users.%>
+	</p>
+
+	<h3><%:Legally Prohibited Activities%></h3>
+	<p><%:The participant agrees to not perform any action and refrain from acts which may violate the law or infringe upon the rights of third parties.%></p>
+ 
+	<h3><%:Legally Prohibited content%></h3>
+	<p><%:The participant agrees to not transfer content over the network which violates the law.%></p>
+ 
+	<h3><%:Fair Use Policy%></h3>
+	<p><%:The participant agrees to not use the network in any way which will harm the infrastructure, the network itself, its operators or other participants.%></p>
+ 
+	<h3><%:Safety%></h3>
+	<p><%:The network, like the Internet, is unencrypted and open. Each participant is responsible for the safety of their own connections and devices.%></p>
+ 
+	<h3>Disclaimer</h3>
+	<p><%:The operator claims no liability for loss of data, unauthorized access/damage to devices, or financial losses that participants may suffer from the use of the network.%></p>
+
+	<br /><p><b><%=accepttext%></b></p>
+<% end %>
+
+
+
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm b/trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm
new file mode 100644
index 00000000..ab754913
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm
@@ -0,0 +1,16 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<%+footer%>
\ No newline at end of file
diff --git a/trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm
new file mode 100644
index 00000000..8554913c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm
@@ -0,0 +1,25 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<%+splash/splash%>
+
+<form method="get" action="<%=controller%>/splash/activate">
+	<p>
+		<input type="submit" value="<%:Decline%>" />
+		<input type="submit" name="accept" value="<%:Accept%>" />
+	</p>
+</form>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash b/trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash
new file mode 100644
index 00000000..c4cfef5d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash
@@ -0,0 +1,2 @@
+config core general
+	option leasetime 1
\ No newline at end of file
diff --git a/trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash_leases b/trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash_leases
new file mode 100644
index 00000000..6afdd90e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/root/etc/config/luci_splash_leases
@@ -0,0 +1 @@
+# This file should always stay empty and is just needed to be able to use this config in /var/state!
diff --git a/trunk/package/luci/applications/luci-splash/root/etc/hotplug.d/iface/25-splash b/trunk/package/luci/applications/luci-splash/root/etc/hotplug.d/iface/25-splash
new file mode 100644
index 00000000..045e908c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/root/etc/hotplug.d/iface/25-splash
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+[ "$ACTION" = ifup ] || exit 0
+
+/etc/init.d/firewall enabled || exit 0
+
+if [ -x /etc/init.d/luci_splash ]; then
+	restart_splash() {
+	        local net="$1"
+		if [ "$INTERFACE" = "$net" ]; then
+			logger -t splash "Reloading splash firewall rules due to ifup of $INTERFACE ($DEVICE)"
+			/etc/init.d/luci_splash restart
+		fi
+	}
+	config_load luci_splash
+	config_foreach restart_splash iface
+fi
diff --git a/trunk/package/luci/applications/luci-splash/root/etc/init.d/luci_splash b/trunk/package/luci/applications/luci-splash/root/etc/init.d/luci_splash
new file mode 100755
index 00000000..feefabd8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/root/etc/init.d/luci_splash
@@ -0,0 +1,362 @@
+#!/bin/sh /etc/rc.common
+
+START=70
+EXTRA_COMMANDS=clear_leases
+LIMIT_DOWN=0
+LIMIT_DOWN_BURST=0
+LIMIT_UP=0
+TC=/usr/sbin/tc
+IPT=/usr/sbin/iptables
+IPT6=/usr/sbin/ip6tables
+
+IPT_REPLAY=/var/run/luci_splash.iptlog
+LOCK=/var/run/luci_splash.lock
+[ -x $IPT6 ] && [ -f /proc/net/ipv6_route ] && HAS_IPV6=1
+
+silent() {
+	"$@" 2>/dev/null
+}
+
+ipt_log() {
+	$IPT -I "$@"
+	echo $IPT -D "$@" >> $IPT_REPLAY
+}
+
+ipt6_log() {
+	[ "$HAS_IPV6" = 1 ] || return
+	$IPT6 -I "$@"
+	echo $IPT6 -D "$@" >> $IPT_REPLAY
+}
+
+
+iface_add() {
+	local cfg="$1"
+
+	config_get zone "$cfg" zone
+	[ -n "$zone" ] || return 0
+
+	config_get net "$cfg" network
+	[ -n "$net" ] || return 0
+
+	config_get ifname "$net" ifname
+	[ -n "$ifname" ] || return 0
+
+	config_get ipaddr "$net" ipaddr
+	[ -n "$ipaddr" ] || return 0
+
+	config_get netmask "$net" netmask
+	[ -n "$netmask" ] || return 0
+
+	config_get ip6addr "$net" ip6addr
+
+	config_get type "$net" type
+
+	parentiface="$(uci -q get network.${net}.ifname)"
+
+	[ -n "$parentiface" ] && [ ! "$type" = "bridge" ] && {
+		parentiface=${parentiface#@}
+		config_get parentproto   "$parentiface" proto
+		config_get parentipaddr  "$parentiface" ipaddr
+		config_get parentnetmask "$parentiface" netmask
+	}
+
+	eval "$(ipcalc.sh $ipaddr $netmask)"
+
+	logger -s -p info -t splash "Add $NETWORK/$PREFIX ($ifname) to splashed networks."
+
+	### Add interface specific chain entry rules
+	ipt_log "prerouting_${zone}_rule" -i "${ifname%:*}" -s "$NETWORK/$PREFIX" -j luci_splash_prerouting -t nat
+	ipt_log "forwarding_${zone}_rule"    -i "${ifname%:*}" -s "$NETWORK/$PREFIX" -j luci_splash_forwarding -t filter
+
+	if [ "$HAS_IPV6" = 1 ] && [ -n "$ip6addr" ]; then
+		ipt6_log "forwarding_${zone}_rule"    -i "${ifname%:*}" -s "$ip6addr" -j luci_splash_forwarding -t filter
+	fi
+
+	### Allow traffic to the same subnet
+	$IPT -t nat    -I luci_splash_prerouting -d "$ipaddr/${netmask:-32}" -j RETURN
+	$IPT -t filter -I luci_splash_forwarding -d "$ipaddr/${netmask:-32}" -j RETURN
+
+	### Allow traffic to the mesh subnet
+	[ "$parentproto" = "static" -a -n "$parentipaddr" ] && {
+		$IPT -t nat    -I luci_splash_prerouting -d "$parentipaddr/${parentnetmask:-32}" -j RETURN
+		$IPT -t filter -I luci_splash_forwarding -d "$parentipaddr/${parentnetmask:-32}" -j RETURN
+	}
+
+	qos_iface_add "$ifname" "$NETWORK" "$PREFIX"
+}
+
+iface_del() {
+	config_get zone "$1" zone
+	[ -n "$zone" ] || return 0
+
+	config_get net "$1" network
+	[ -n "$net" ] || return 0
+
+	config_get ifname "$net" ifname
+	[ -n "$ifname" ] || return 0
+
+	# Clear interface specific rules
+	[ -s $IPT_REPLAY ] && {
+		logger -s -p info -t splash "Remove $ifname from splashed networks."
+		grep -- "-i ${ifname%:*}" $IPT_REPLAY | while read ln; do silent $ln; done
+		sed -ie "/-i ${ifname%:*}/d" $IPT_REPLAY
+	}
+
+	qos_iface_del "$ifname"
+}
+
+mac_add() {
+	config_get mac "$1" mac
+	append MACS "$mac"
+}
+
+whitelist_add() {
+	config_get mac "$1" mac
+	iface=$2
+	$TC filter add dev "$iface" parent ffff: protocol ip prio 1 u32 match ether src $mac police pass
+	$TC filter add dev "$iface" parent 1:0 protocol ip prio 1 u32 match ether dst $mac classid 1:1
+}
+
+
+subnet_add() {
+	local cfg="$1"
+
+	config_get ipaddr  "$cfg" ipaddr
+	config_get netmask "$cfg" netmask
+
+	[ -n "$ipaddr" ] && {
+		$IPT -t nat    -I luci_splash_prerouting -d "$ipaddr/${netmask:-32}" -j RETURN
+		$IPT -t filter -I luci_splash_forwarding -d "$ipaddr/${netmask:-32}" -j RETURN
+	}
+}
+
+qos_iface_add() {
+	local iface="$1"
+	local network="$2"
+	local prefix="$3"
+
+	# 77   -> download root qdisc
+	# ffff -> upload root qdisc
+
+	silent $TC qdisc del dev "$iface" root handle 1:
+	silent $TC class del dev "$iface" parent 1: classid 1:ffff
+	silent $TC class del dev "$iface" parent 1: classid 1:1
+	silent $TC filter del dev "$iface" parent ffff: protocol ip prio 1 u32
+	silent $TC filter del dev "$iface" parent ffff: protocol ip prio 2 u32
+	silent $TC filter del dev "$iface" parent ffff: protocol ip prio 3 u32
+
+	if [ "$LIMIT_UP" -gt 0 -a "$LIMIT_DOWN" -gt 0 ]; then
+		# Setup qdiscs
+		$TC qdisc add dev "$iface" root handle 1: htb default 1
+		silent $TC qdisc add dev "$iface" ingress
+
+		# Default class - all clients which are not otherwise handled are put in that class
+		# and share that bandwidth.
+		$TC class add dev "$iface" parent 1: classid 1:ffff htb rate ${LIMIT_DOWN}kbit
+
+		# default class and class for whitelisted clients = unlimited
+		$TC class add dev "$iface" parent 1: classid 1:1 htb rate 100mbit
+
+		# All traffic to the dhcp subnet is put into the limited class
+		$TC filter add dev "$iface" parent 1:0 protocol ip prio 3 u32 match ip dst $network/$prefix classid 1:ffff
+		$TC qdisc add dev "$iface" parent 1:ffff sfq perturb 10
+                $TC filter add dev "$iface" parent ffff: protocol ip prio 3 u32 match ip src $network/$prefix police rate ${LIMIT_UP}kbit mtu 6k burst 6k drop
+
+		# classify packets by their iptables MARK set in luci_splash_mark_in (mangle table)
+		# every client gets his own class and so his own bandwidth limit
+		$TC filter add dev "$iface" parent 1:0 protocol ip prio 2 fw
+
+		config_foreach whitelist_add whitelist $iface
+	fi
+}
+
+qos_iface_del() {
+	local iface="$1"
+	silent $TC qdisc del dev "$iface" root handle 77:
+}
+
+boot() {
+	### Setup splash-relay
+        uci get uhttpd.splash 2>/dev/null || {
+uci batch <<EOF
+	set uhttpd.splash=uhttpd
+	set uhttpd.splash.home="/www/cgi-bin/splash/"
+	set uhttpd.splash.interpreter=".sh=/bin/ash"
+	set uhttpd.splash.listen_http="8082"
+	set uhttpd.splash.index_page="splash.sh"
+	set uhttpd.splash.error_page="/splash.sh"
+	set uhttpd.splash.http_keepalive='0'
+        commit uhttpd
+EOF
+	}
+
+	### We are started by the firewall include
+	exit 0
+}
+
+start() {
+	lock $LOCK
+	logger -s -p info -t splash "Starting luci-splash"
+	include /lib/network
+	. /lib/functions/network.sh
+	scan_interfaces
+	config_load luci_splash
+
+	### Find QoS limits
+	config_get LIMIT_UP general limit_up
+	config_get LIMIT_DOWN general limit_down
+	config_get LIMIT_DOWN_BURST general limit_down_burst
+
+	LIMIT_UP="$((8*${LIMIT_UP:-0}))"
+	LIMIT_DOWN="$((8*${LIMIT_DOWN:-0}))"
+	LIMIT_DOWN_BURST="${LIMIT_DOWN_BURST:+$((8*$LIMIT_DOWN_BURST))}"
+	LIMIT_DOWN_BURST="${LIMIT_DOWN_BURST:-$(($LIMIT_DOWN / 5 * 6))}"
+
+	### Load required modules
+	[ "$LIMIT_UP" -gt 0 -a "$LIMIT_DOWN" -gt 0 ] && {
+		silent insmod act_police
+		silent insmod cls_fw
+		silent insmod cls_u32
+		silent insmod sch_htb
+		silent insmod sch_sfq
+		silent insmod sch_ingress
+	}
+
+	### Create subchains
+	$IPT -t nat    -N luci_splash_prerouting
+	$IPT -t nat    -N luci_splash_leases
+	$IPT -t filter -N luci_splash_forwarding
+	$IPT -t filter -N luci_splash_filter
+
+	if [ "$HAS_IPV6" = 1 ]; then
+		$IPT6 -t filter -N luci_splash_forwarding
+		$IPT6 -t filter -N luci_splash_filter
+	fi
+
+	### Clear iptables replay log
+	[ -s $IPT_REPLAY ] && . $IPT_REPLAY
+	echo -n > $IPT_REPLAY
+
+	### Add interface independant prerouting rules
+	$IPT -t nat -A luci_splash_prerouting -j luci_splash_leases
+	$IPT -t nat -A luci_splash_leases -p udp --dport 53 -j REDIRECT --to-ports 53
+	$IPT -t nat -A luci_splash_leases -p tcp --dport 80 -j REDIRECT --to-ports 8082
+
+	### Add interface independant forwarding rules
+	$IPT -t filter -A luci_splash_forwarding -j luci_splash_filter
+	$IPT -t filter -A luci_splash_filter -p tcp -j REJECT --reject-with tcp-reset
+	$IPT -t filter -A luci_splash_filter -j REJECT --reject-with icmp-net-prohibited
+
+	if [ "$HAS_IPV6" = 1 ]; then
+		$IPT6 -t filter -A luci_splash_forwarding -j luci_splash_filter
+		$IPT6 -t filter -A luci_splash_filter -p tcp -j REJECT --reject-with tcp-reset
+		$IPT6 -t filter -A luci_splash_filter -j REJECT --reject-with adm-prohibited
+	fi
+
+	### Add QoS chain
+	$IPT -t mangle -N luci_splash_mark_out
+	$IPT -t mangle -N luci_splash_mark_in
+	$IPT -t mangle -I PREROUTING  -j luci_splash_mark_out
+	$IPT -t mangle -I POSTROUTING -j luci_splash_mark_in
+
+	if [ "$HAS_IPV6" = 1 ]; then
+		$IPT6 -t mangle -N luci_splash_mark_out
+		$IPT6 -t mangle -N luci_splash_mark_in
+		$IPT6 -t mangle -I PREROUTING  -j luci_splash_mark_out
+		$IPT6 -t mangle -I POSTROUTING -j luci_splash_mark_in
+	fi
+
+	### Build the main and portal rule
+	config_foreach iface_add iface
+	config_foreach subnet_add subnet
+
+	### Add the community homepage to the list of allowed destination subnets
+	hp=$(uci -q get freifunk.community.homepage) && {
+		chp=${hp#http*://}
+		chp=${chp%%/*}
+		$IPT -t nat    -I luci_splash_prerouting -d "${chp}/32" -j RETURN
+		$IPT -t filter -I luci_splash_forwarding -d "${chp}/32" -j RETURN
+	}
+
+	### Find active mac addresses
+	MACS=""
+
+	
+	config_foreach mac_add blacklist
+	config_foreach mac_add whitelist
+
+	config_load luci_splash_leases
+	config_foreach mac_add lease
+
+	### Add crontab entry
+	test -f /etc/crontabs/root || touch /etc/crontabs/root
+	grep -q luci-splash /etc/crontabs/root || {
+		echo '*/5 * * * * 	/usr/sbin/luci-splash sync' >> /etc/crontabs/root
+	}
+
+	lock -u $LOCK
+
+	### Populate iptables
+	[ -n "$MACS" ] && luci-splash add-rules $MACS
+}
+
+stop() {
+	lock $LOCK
+
+	include /lib/network
+	scan_interfaces
+	config_load luci_splash
+
+	### Clear interface rules
+	config_foreach iface_del iface
+
+	silent $IPT -t mangle -D PREROUTING  -j luci_splash_mark_out
+	silent $IPT -t mangle -D POSTROUTING -j luci_splash_mark_in
+
+	if [ "$HAS_IPV6" = 1 ]; then
+		silent $IPT6 -t mangle -D PREROUTING  -j luci_splash_mark_out
+		silent $IPT6 -t mangle -D POSTROUTING -j luci_splash_mark_in
+	fi
+
+	### Clear subchains
+	silent $IPT -t nat    -F luci_splash_prerouting
+	silent $IPT -t nat    -F luci_splash_leases
+	silent $IPT -t filter -F luci_splash_forwarding
+	silent $IPT -t filter -F luci_splash_filter
+	silent $IPT -t mangle -F luci_splash_mark_out
+	silent $IPT -t mangle -F luci_splash_mark_in
+
+	if [ "$HAS_IPV6" = 1 ]; then
+		$IPT6 -t filter -F luci_splash_forwarding
+		$IPT6 -t filter -F luci_splash_filter
+		$IPT6 -t mangle -F luci_splash_mark_out
+		$IPT6 -t mangle -F luci_splash_mark_in
+	fi
+
+	### Delete subchains
+	silent $IPT -t nat    -X luci_splash_prerouting
+	silent $IPT -t nat    -X luci_splash_leases
+	silent $IPT -t filter -X luci_splash_forwarding
+	silent $IPT -t filter -X luci_splash_filter
+	silent $IPT -t mangle -X luci_splash_mark_out
+	silent $IPT -t mangle -X luci_splash_mark_in
+	if [ "$HAS_IPV6" = 1 ]; then
+		$IPT6 -t filter -X luci_splash_forwarding
+		$IPT6 -t filter -X luci_splash_filter
+		$IPT6 -t mangle -X luci_splash_mark_out
+		$IPT6 -t mangle -X luci_splash_mark_in
+	fi
+	sed -ie '/\/usr\/sbin\/luci-splash sync/d' /var/spool/cron/crontabs/root
+
+	lock -u $LOCK
+}
+
+clear_leases() {
+	### Find active mac addresses
+	MACS=""
+	config_foreach mac_add lease
+
+	### Clear leases
+	[ -n "$MACS" ] && luci-splash remove $MACS
+}
+
diff --git a/trunk/package/luci/applications/luci-splash/root/usr/sbin/luci-splash b/trunk/package/luci/applications/luci-splash/root/usr/sbin/luci-splash
new file mode 100755
index 00000000..6b1e41ed
--- /dev/null
+++ b/trunk/package/luci/applications/luci-splash/root/usr/sbin/luci-splash
@@ -0,0 +1,751 @@
+#!/usr/bin/lua
+
+utl = require "luci.util"
+sys = require "luci.sys"
+
+require("luci.model.uci")
+require("luci.sys.iptparser")
+
+-- Init state session
+local uci = luci.model.uci.cursor_state()
+local ipt = luci.sys.iptparser.IptParser()
+local net = sys.net
+local fs = require "luci.fs"
+local ip = require "luci.ip"
+
+local debug = false
+
+local has_ipv6 = fs.access("/proc/net/ipv6_route") and fs.access("/usr/sbin/ip6tables")
+
+function exec(cmd)
+	-- executes a cmd and gets its output
+	if debug then
+		local ret = sys.exec(cmd)
+		print('+ ' .. cmd)
+		if ret and ret ~= "" then
+			print(ret)
+		end
+	else
+		local ret = sys.exec(cmd .. " &> /dev/null")
+	end
+end
+
+function call(cmd)
+	-- just calls a command
+	if debug then
+		print('+ ' .. cmd)
+	end
+	os.execute(cmd)
+end
+
+
+function lock()
+	call("lock /var/run/luci_splash.lock")
+end
+
+function unlock()
+	call("lock -u /var/run/luci_splash.lock")
+end
+
+function get_id(ip)
+	local o3, o4 = ip:match("[0-9]+%.[0-9]+%.([0-9]+)%.([0-9]+)")
+	if o3 and 04 then
+		return string.format("%02X%s", tonumber(o3), "") .. string.format("%02X%s", tonumber(o4), "")
+	else
+		return false
+	end
+end
+
+function update_stats(leased, whitelisted, whitelisttotal, blacklisted, blacklisttotal)
+	local leases = uci:get_all("luci_splash_leases", "stats")
+	uci:delete("luci_splash_leases", "stats")
+	uci:section("luci_splash_leases", "stats", "stats", {
+		leases    = leased or (leases and leases.leases) or 0,
+		whitelisttotal = whitelisttotal or (leased and leases.whitelisttotal) or 0,
+		whitelistonline = whitelisted or (leases and leases.whitelistonline) or 0,
+		blacklisttotal = blacklisttotal or (leases and leases.blacklisttotal) or 0,
+		blacklistonline = blacklisted or (leases and leases.blacklistonline) or 0,
+	})
+	uci:save("luci_splash_leases")
+end
+
+
+function get_device_for_ip(ipaddr)
+	local dev
+	uci:foreach("network", "interface", function(s)
+		if s.ipaddr and s.netmask then
+			local network = ip.IPv4(s.ipaddr, s.netmask)
+			if network:contains(ip.IPv4(ipaddr)) then
+				-- this should be rewritten to luci functions if possible
+				dev = utl.trim(sys.exec(". /lib/functions/network.sh; network_get_device IFNAME '" ..  s['.name'] .. "'; echo $IFNAME"))
+			end
+		end
+	end)
+	return dev
+end
+
+function get_physdev(interface)
+	local dev
+	dev = utl.trim(sys.exec(". /lib/functions/network.sh; network_get_device IFNAME '" ..  interface .. "'; echo $IFNAME"))
+	return dev
+end
+
+
+
+function get_filter_handle(parent, direction, device, mac)
+	local input = utl.split(sys.exec('/usr/sbin/tc filter show dev ' .. device .. ' parent ' .. parent) or {})
+	local tbl = {}
+	local handle
+	for k, v in pairs(input) do
+		handle = v:match('filter protocol ip pref %d+ u32 fh (%d*:%d*:%d*) order') or v:match('filter protocol all pref %d+ u32 fh (%d*:%d*:%d*) order')
+		if handle then
+			local mac, mac1, mac2, mac3, mac4, mac5, mac6
+			if direction == 'src' then
+				mac1, mac2, mac3, mac4 = input[k+1]:match('match ([%a%d][%a%d])([%a%d][%a%d])([%a%d][%a%d])([%a%d][%a%d])/ffffffff')
+				mac5, mac6 = input[k+2]:match('match ([%a%d][%a%d])([%a%d][%a%d])0000/ffff0000')
+			else
+				mac1, mac2 = input[k+1]:match('match 0000([%a%d][%a%d])([%a%d][%a%d])/0000ffff')
+				mac3, mac4, mac5, mac6 = input[k+2]:match('match ([%a%d][%a%d])([%a%d][%a%d])([%a%d][%a%d])([%a%d][%a%d])/ffffffff')
+			end
+			if mac1 and mac2 and mac3 and mac4 and mac5 and mac6 then
+				mac = "%s:%s:%s:%s:%s:%s" % { mac1, mac2, mac3, mac4, mac5, mac6 }
+				tbl[mac] = handle
+			end
+		end
+	end
+	if tbl[mac] then
+		handle = tbl[mac]
+	end
+	return handle
+end
+
+function macvalid(mac)
+	if mac and mac:match(
+		"^[a-fA-F0-9][a-fA-F0-9]:[a-fA-F0-9][a-fA-F0-9]:" ..
+		"[a-fA-F0-9][a-fA-F0-9]:[a-fA-F0-9][a-fA-F0-9]:" ..
+		"[a-fA-F0-9][a-fA-F0-9]:[a-fA-F0-9][a-fA-F0-9]$"
+	) then
+		return true
+	end
+
+	return false
+end
+
+function ipvalid(ipaddr)
+	if ipaddr then
+		return ip.IPv4(ipaddr) and true or false
+	end
+
+	return false
+end
+
+function main(argv)
+	local cmd = table.remove(argv, 1)
+	local arg = argv[1]
+
+	limit_up = (tonumber(uci:get("luci_splash", "general", "limit_up")) or 0) * 8
+	limit_down = (tonumber(uci:get("luci_splash", "general", "limit_down")) or 0) * 8
+
+	if ( cmd == "lease" or cmd == "add-rules" or cmd == "remove" or
+	     cmd == "whitelist" or cmd == "blacklist" or cmd == "status" ) and #argv > 0
+	then
+		if not (macvalid(arg) or ipvalid(arg)) then
+			print("Invalid argument. The second argument must " ..
+				"be a valid IPv4 or Mac Address.")
+			os.exit(1)
+		end
+
+		lock()
+
+		local arp_cache      = net.arptable()
+		local leased_macs    = get_known_macs("lease")
+		local blacklist_macs = get_known_macs("blacklist")
+		local whitelist_macs = get_known_macs("whitelist")
+
+		for i, adr in ipairs(argv) do
+			local mac = nil
+			if adr:find(":") then
+				mac = adr:lower()
+			else
+				for _, e in ipairs(arp_cache) do
+					if e["IP address"] == adr then
+						mac = e["HW address"]:lower()
+						break
+					end
+				end
+			end
+
+			if mac and cmd == "add-rules" then
+				if leased_macs[mac] then
+					add_lease(mac, arp_cache, true)
+				elseif blacklist_macs[mac] then
+					add_blacklist_rule(mac)
+				elseif whitelist_macs[mac] then
+					add_whitelist_rule(mac)
+				end
+			elseif mac and cmd == "status" then
+				print(leased_macs[mac] and "lease"
+					or whitelist_macs[mac] and "whitelist"
+					or blacklist_macs[mac] and "blacklist"
+					or "new")
+			elseif mac and ( cmd == "whitelist" or cmd == "blacklist" or cmd == "lease" ) then
+				if cmd ~= "lease" and leased_macs[mac] then
+					print("Removing %s from leases" % mac)
+					remove_lease(mac)
+					leased_macs[mac] = nil
+				end
+
+				if cmd ~= "whitelist" and whitelist_macs[mac] then
+					if cmd == "lease" then
+						print('%s is whitelisted. Remove it before you can lease it.' % mac)
+					else
+						print("Removing %s from whitelist" % mac)
+						remove_whitelist(mac)
+						whitelist_macs[mac] = nil
+					end
+				end
+
+				if cmd == "whitelist" and leased_macs[mac] then
+					print("Removing %s from leases" % mac)
+					remove_lease(mac)
+					leased_macs[mac] = nil
+				end
+
+				if cmd ~= "blacklist" and blacklist_macs[mac] then
+					print("Removing %s from blacklist" % mac)
+					remove_blacklist(mac)
+					blacklist_macs[mac] = nil
+				end
+
+				if cmd == "lease" and not leased_macs[mac] then
+					if not whitelist_macs[mac] then
+						print("Adding %s to leases" % mac)
+						add_lease(mac)
+						leased_macs[mac] = true
+					end
+				elseif cmd == "whitelist" and not whitelist_macs[mac] then
+					print("Adding %s to whitelist" % mac)
+					add_whitelist(mac)
+					whitelist_macs[mac] = true
+				elseif cmd == "blacklist" and not blacklist_macs[mac] then
+					print("Adding %s to blacklist" % mac)
+					add_blacklist(mac)
+					blacklist_macs[mac] = true
+				else
+					print("The mac %s is already %sed" %{ mac, cmd })
+				end
+			elseif mac and cmd == "remove" then
+				if leased_macs[mac] then
+					print("Removing %s from leases" % mac)
+					remove_lease(mac)
+					leased_macs[mac] = nil
+				elseif whitelist_macs[mac] then
+					print("Removing %s from whitelist" % mac)
+					remove_whitelist(mac)
+					whitelist_macs[mac] = nil					
+				elseif blacklist_macs[mac] then
+					print("Removing %s from blacklist" % mac)
+					remove_blacklist(mac)
+					blacklist_macs[mac] = nil
+				else
+					print("The mac %s is not known" % mac)
+				end
+
+			else
+				print("Can not find mac for ip %s" % argv[i])
+			end
+		end
+		unlock()
+		os.exit(0)
+	elseif cmd == "sync" then
+		sync()
+		os.exit(0)
+	elseif cmd == "list" then
+		list()
+		os.exit(0)
+	else
+		print("Usage:")
+		print("\n  luci-splash list\n    List connected, black- and whitelisted clients")
+		print("\n  luci-splash sync\n    Synchronize firewall rules and clear expired leases")
+		print("\n  luci-splash lease <MAC-or-IP>\n    Create a lease for the given address")
+		print("\n  luci-splash blacklist <MAC-or-IP>\n    Add given address to blacklist")
+		print("\n  luci-splash whitelist <MAC-or-IP>\n    Add given address to whitelist")
+		print("\n  luci-splash remove <MAC-or-IP>\n    Remove given address from the lease-, black- or whitelist")
+		print("")
+
+		os.exit(1)	
+	end
+end
+
+-- Get current arp cache
+function get_arpcache()
+	local arpcache = { }
+	for _, entry in ipairs(net.arptable()) do
+		arpcache[entry["HW address"]:lower()] = { entry["Device"]:lower(), entry["IP address"]:lower() }
+	end
+	return arpcache
+end
+
+-- Get a list of known mac addresses
+function get_known_macs(list)
+	local leased_macs = { }
+
+	if not list or list == "lease" then
+		uci:foreach("luci_splash_leases", "lease", function(s)
+			if s.mac then
+				leased_macs[s.mac:lower()] = true
+			end
+		end)
+	end
+
+	if not list or list == "whitelist" then
+		uci:foreach("luci_splash", "whitelist",	function(s)
+			if s.mac then
+				leased_macs[s.mac:lower()] = true
+			end
+		end)
+	end
+
+	if not list or list == "blacklist" then
+		uci:foreach("luci_splash", "blacklist",	function(s)
+			if s.mac then
+				leased_macs[s.mac:lower()] = true
+			end
+		end)
+	end
+	return leased_macs
+end
+
+
+-- Helper to delete iptables rules
+function ipt_delete_all(args, comp, off)
+	off = off or { }
+	for i, r in ipairs(ipt:find(args)) do
+		if comp == nil or comp(r) then
+			off[r.table] = off[r.table] or { }
+			off[r.table][r.chain] = off[r.table][r.chain] or 0
+
+			exec("iptables -t %q -D %q %d 2>/dev/null"
+				%{ r.table, r.chain, r.index - off[r.table][r.chain] })
+
+			off[r.table][r.chain] = off[r.table][r.chain] + 1
+		end
+	end
+end
+
+function ipt6_delete_all(args, comp, off)
+	off = off or { }
+	for i, r in ipairs(ipt:find(args)) do
+		if comp == nil or comp(r) then
+			off[r.table] = off[r.table] or { }
+			off[r.table][r.chain] = off[r.table][r.chain] or 0
+
+			exec("ip6tables -t %q -D %q %d 2>/dev/null"
+				%{ r.table, r.chain, r.index - off[r.table][r.chain] })
+
+			off[r.table][r.chain] = off[r.table][r.chain] + 1
+		end
+	end
+end
+
+
+-- Convert mac to uci-compatible section name
+function convert_mac_to_secname(mac)
+	return string.gsub(mac, ":", "")
+end
+
+-- Add a lease to state and invoke add_rule
+function add_lease(mac, arp, no_uci)
+	mac = mac:lower()
+
+	-- Get current ip address
+	local ipaddr
+	for _, entry in ipairs(arp or net.arptable()) do
+		if entry["HW address"]:lower() == mac then
+			ipaddr = entry["IP address"]
+			break
+		end
+	end
+
+	-- Add lease if there is an ip addr
+	if ipaddr then
+		local device = get_device_for_ip(ipaddr)
+		if not no_uci then
+			local leased = uci:get("luci_splash_leases", "stats", "leases")
+			if type(tonumber(leased)) == "number" then
+				update_stats(leased + 1, nil, nil, nil, nil)
+			end
+
+			uci:section("luci_splash_leases", "lease", convert_mac_to_secname(mac), {
+				mac    = mac,
+				ipaddr = ipaddr,
+				device = device,
+				limit_up = limit_up,
+				limit_down = limit_down,
+				start  = os.time()
+			})
+			uci:save("luci_splash_leases")
+		end
+		add_lease_rule(mac, ipaddr, device)
+	else
+		print("Found no active IP for %s, lease not added" % mac)
+	end
+end
+
+
+-- Remove a lease from state and invoke remove_rule
+function remove_lease(mac)
+	mac = mac:lower()
+
+	uci:delete_all("luci_splash_leases", "lease",
+		function(s)
+			if s.mac:lower() == mac then
+
+				local leased = uci:get("luci_splash_leases", "stats", "leases")
+				if type(tonumber(leased)) == "number" and tonumber(leased) > 0 then
+					update_stats(leased - 1, nil, nil, nil, nil)
+				end
+				remove_lease_rule(mac, s.ipaddr, s.device, tonumber(s.limit_up), tonumber(s.limit_down))
+				return true
+			end
+			return false
+		end)
+
+	uci:save("luci_splash_leases")
+end
+
+
+-- Add a whitelist entry
+function add_whitelist(mac)
+	uci:section("luci_splash", "whitelist", convert_mac_to_secname(mac), { mac = mac })
+	uci:save("luci_splash")
+	uci:commit("luci_splash")
+	add_whitelist_rule(mac)
+end
+
+
+-- Add a blacklist entry
+function add_blacklist(mac)
+	uci:section("luci_splash", "blacklist", convert_mac_to_secname(mac), { mac = mac })
+	uci:save("luci_splash")
+	uci:commit("luci_splash")
+	add_blacklist_rule(mac)
+end
+
+
+-- Remove a whitelist entry
+function remove_whitelist(mac)
+	mac = mac:lower()
+	uci:delete_all("luci_splash", "whitelist",
+		function(s) return not s.mac or s.mac:lower() == mac end)
+	uci:save("luci_splash")
+	uci:commit("luci_splash")
+	remove_lease_rule(mac)
+	remove_whitelist_tc(mac)
+end
+
+function remove_whitelist_tc(mac)
+        uci:foreach("luci_splash", "iface", function(s)
+		local device = get_physdev(s['.name'])
+		if device and device ~= "" then
+			if debug then
+				print("Removing whitelist filters for %s interface %s." % {mac, device})
+			end
+			local handle = get_filter_handle('ffff:', 'src', device, mac)
+			if handle then
+				exec('tc filter del dev "%s" parent ffff: protocol ip prio 1 handle %s u32' % { device, handle })
+			else
+				print('Warning! Could not get a handle for %s parent :ffff on interface %s' % { mac, device })
+			end
+			local handle = get_filter_handle('1:', 'dest', device, mac)
+			if handle then
+				exec('tc filter del dev "%s" parent 1:0 protocol ip prio 1 handle %s u32' % { device, handle })
+			else
+				print('Warning! Could not get a handle for %s parent 1:0 on interface %s' % { mac, device })
+			end
+		end
+        end)
+end
+
+-- Remove a blacklist entry
+function remove_blacklist(mac)
+	mac = mac:lower()
+	uci:delete_all("luci_splash", "blacklist",
+		function(s) return not s.mac or s.mac:lower() == mac end)
+	uci:save("luci_splash")
+	uci:commit("luci_splash")
+	remove_lease_rule(mac)
+end
+
+
+-- Add an iptables rule
+function add_lease_rule(mac, ipaddr, device)
+	local id
+	if ipaddr then
+		id = get_id(ipaddr)
+	end
+
+	exec("iptables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j RETURN" % mac)
+
+	-- Mark incoming packets to a splashed host
+	-- for ipv4 - by iptables and destination
+	if id and device then
+		exec("iptables -t mangle -I luci_splash_mark_in -d %q -j MARK --set-mark 0x1%s -m comment --comment %s" % {ipaddr, id, mac:upper()})
+	end
+
+	--for ipv6: need to use the mac here
+
+	if has_ipv6 then
+		exec("ip6tables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j MARK --set-mark 79" % mac)
+		if id and device and tonumber(limit_down) then
+			exec("tc filter add dev %s parent 1:0 protocol ipv6 prio 1 u32 match ether dst %s classid 1:%s" % {device, mac:lower(), id})
+		end
+	end
+
+
+	if device and tonumber(limit_up) > 0 then
+		exec('tc filter add dev "%s" parent ffff: protocol all prio 2 u32 match ether src %s police rate %skbit mtu 6k burst 6k drop' % {device, mac, limit_up})
+	end
+
+	if id and device and tonumber(limit_down) > 0 then
+		exec("tc class add dev %s parent 1: classid 1:0x%s htb rate %skbit" % { device, id, limit_down })
+		exec("tc qdisc add dev %s parent 1:%s sfq perturb 10" % { device, id })
+	end
+
+	exec("iptables -t filter -I luci_splash_filter -m mac --mac-source %q -j RETURN" % mac)
+	exec("iptables -t nat    -I luci_splash_leases -m mac --mac-source %q -j RETURN" % mac)
+	if has_ipv6 then
+		exec("ip6tables -t filter -I luci_splash_filter -m mac --mac-source %q -j RETURN" % mac)
+	end
+end
+
+
+-- Remove lease, black- or whitelist rules
+function remove_lease_rule(mac, ipaddr, device, limit_up, limit_down)
+
+	local id
+	if ipaddr then
+		id = get_id(ipaddr)
+	end
+
+	ipt:resync()
+	ipt_delete_all({table="mangle", chain="luci_splash_mark_in", options={"/*", mac:upper()}})
+	ipt_delete_all({table="mangle", chain="luci_splash_mark_out", options={"MAC", mac:upper()}})
+	ipt_delete_all({table="filter", chain="luci_splash_filter",   options={"MAC", mac:upper()}})
+	ipt_delete_all({table="nat",    chain="luci_splash_leases",   options={"MAC", mac:upper()}})
+	if has_ipv6 then
+		ipt6_delete_all({table="mangle", chain="luci_splash_mark_out", options={"MAC", mac:upper()}})
+		ipt6_delete_all({table="filter", chain="luci_splash_filter",   options={"MAC", mac:upper()}})
+	end
+
+	if device and tonumber(limit_up) > 0 then
+		local handle = get_filter_handle('ffff:', 'src', device, mac)
+		if handle then
+			exec('tc filter del dev "%s" parent ffff: protocol all prio 2 handle %s u32 police rate %skbit mtu 6k burst 6k drop' % {device, handle, limit_up})
+		else
+			print('Warning! Could not get a handle for %s parent :ffff on interface %s' % { mac, device })
+		end
+	end
+	-- remove clients class
+	if device and id then
+		exec('tc class del dev "%s" classid 1:%s' % {device, id})
+		exec('tc filter del dev "%s" parent 1:0 prio 1' % device) -- ipv6 rule
+		--exec('tc qdisc del dev "%s" parent 1:%s sfq perturb 10' % { device, id })
+	end
+end
+
+
+-- Add whitelist rules
+function add_whitelist_rule(mac)
+	exec("iptables -t filter -I luci_splash_filter -m mac --mac-source %q -j RETURN" % mac)
+	exec("iptables -t nat    -I luci_splash_leases -m mac --mac-source %q -j RETURN" % mac)
+	if has_ipv6 then
+		exec("ip6tables -t filter -I luci_splash_filter -m mac --mac-source %q -j RETURN" % mac)
+	end
+        uci:foreach("luci_splash", "iface", function(s)
+		local device = get_physdev(s['.name'])
+		if device and device ~= "" then
+			exec('tc filter add dev "%s" parent ffff: protocol ip prio 1 u32 match ether src %s police pass' % { device, mac })
+			exec('tc filter add dev "%s" parent 1:0 protocol ip prio 1 u32 match ether dst %s classid 1:1' % { device, mac })
+		end
+        end)
+end
+
+
+-- Add blacklist rules
+function add_blacklist_rule(mac)
+	exec("iptables -t filter -I luci_splash_filter -m mac --mac-source %q -j DROP" % mac)
+	if has_ipv6 then
+		exec("ip6tables -t filter -I luci_splash_filter -m mac --mac-source %q -j DROP" % mac)
+	end
+end
+
+
+-- Synchronise leases, remove abandoned rules
+function sync()
+	lock()
+
+	local time = os.time()
+
+	-- Current leases in state files
+	local leases = uci:get_all("luci_splash_leases")
+	
+	-- Convert leasetime to seconds
+	local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime")) * 3600
+	
+	-- Clean state file
+	uci:load("luci_splash_leases")
+	uci:revert("luci_splash_leases")
+
+        
+	local arpcache = get_arpcache()
+
+	local blackwhitelist = uci:get_all("luci_splash")
+	local whitelist_total = 0
+	local whitelist_online = 0
+	local blacklist_total = 0
+	local blacklist_online = 0
+	local leasecount = 0
+	local leases_online = 0
+
+	-- For all leases
+	for k, v in pairs(leases) do
+		if v[".type"] == "lease" then
+			if os.difftime(time, tonumber(v.start)) > leasetime then
+				-- Remove expired
+				remove_lease_rule(v.mac, v.ipaddr, v.device, tonumber(v.limit_up), tonumber(v.limit_down))
+			else
+				leasecount = leasecount + 1
+
+                                -- only count leases_online for connected clients
+                                if arpcache[v.mac] then
+                                	leases_online = leases_online + 1
+                                end
+
+				-- Rewrite state
+				uci:section("luci_splash_leases", "lease", convert_mac_to_secname(v.mac), {		
+					mac    = v.mac,
+					ipaddr = v.ipaddr,
+					device = v.device,
+					limit_up = limit_up,
+					limit_down = limit_down,
+					start  = v.start
+				})
+			end
+		end
+	end
+	
+	-- Whitelist, Blacklist
+	for _, s in utl.spairs(blackwhitelist,
+		function(a,b) return blackwhitelist[a][".type"] > blackwhitelist[b][".type"] end
+	) do
+		if (s[".type"] == "whitelist") then
+			whitelist_total = whitelist_total + 1
+			if s.mac then
+				local mac = s.mac:lower()
+				if arpcache[mac] then
+					whitelist_online = whitelist_online + 1
+				end
+			end
+		end
+		if (s[".type"] == "blacklist") then
+			blacklist_total = blacklist_total + 1
+			if s.mac then
+				local mac = s.mac:lower()
+				if arpcache[mac] then
+					blacklist_online = blacklist_online + 1
+				end
+			end
+		end
+	end
+
+	-- ToDo:
+        -- include a new field "leases_online" in stats to differ between active clients and leases:
+        -- update_stats(leasecount, leases_online, whitelist_online, whitelist_total, blacklist_online, blacklist_total) later: 
+        update_stats(leases_online, whitelist_online, whitelist_total, blacklist_online, blacklist_total)
+
+	uci:save("luci_splash_leases")
+
+        -- Get the mac addresses of current leases
+	local macs = get_known_macs()
+
+	ipt:resync()
+
+	ipt_delete_all({table="filter", chain="luci_splash_filter", options={"MAC"}},
+		function(r) return not macs[r.options[2]:lower()] end)
+	ipt_delete_all({table="nat", chain="luci_splash_leases", options={"MAC"}},
+		function(r) return not macs[r.options[2]:lower()] end)
+	ipt_delete_all({table="mangle", chain="luci_splash_mark_out", options={"MAC", "MARK", "set"}},
+		function(r) return not macs[r.options[2]:lower()] end)
+	ipt_delete_all({table="mangle", chain="luci_splash_mark_in", options={"/*", "MARK", "set"}},
+		function(r) return not macs[r.options[2]:lower()] end)
+
+
+	if has_ipv6 then
+		ipt6_delete_all({table="filter", chain="luci_splash_filter", options={"MAC"}},
+			function(r) return not macs[r.options[2]:lower()] end)
+		ipt6_delete_all({table="mangle", chain="luci_splash_mark_out", options={"MAC", "MARK", "set"}},
+			function(r) return not macs[r.options[2]:lower()] end)
+	end
+
+	unlock()
+end
+
+-- Show client info
+function list()
+	local arpcache = get_arpcache()
+	-- Find traffic usage
+	local function traffic(lease)
+		local traffic_in  = 0
+		local traffic_out = 0
+
+		local rin  = ipt:find({table="mangle", chain="luci_splash_mark_in", destination=lease.ipaddr})
+		local rout = ipt:find({table="mangle", chain="luci_splash_mark_out", options={"MAC", lease.mac:upper()}})
+
+		if rin  and #rin  > 0 then traffic_in  = math.floor( rin[1].bytes / 1024) end
+		if rout and #rout > 0 then traffic_out = math.floor(rout[1].bytes / 1024) end
+
+		return traffic_in, traffic_out
+	end
+
+	-- Print listings
+	local leases = uci:get_all("luci_splash_leases")
+	local blackwhitelist = uci:get_all("luci_splash")
+
+	print(string.format(
+		"%-17s  %-15s  %-9s  %-4s  %-7s  %20s",
+		"MAC", "IP", "State", "Dur.", "Intf.", "Traffic down/up"
+	))
+
+	-- Leases
+	for _, s in pairs(leases) do
+		if s[".type"] == "lease" and s.mac then
+			local ti, to = traffic(s)
+			local mac = s.mac:lower()
+			local arp = arpcache[mac]
+			print(string.format(
+				"%-17s  %-15s  %-9s  %3dm  %-7s  %7dKB  %7dKB",
+				mac, s.ipaddr, "leased",
+				math.floor(( os.time() - tonumber(s.start) ) / 60),
+				arp and arp[1] or "?", ti, to
+			))
+		end
+	end
+
+	-- Whitelist, Blacklist
+	for _, s in utl.spairs(blackwhitelist,
+		function(a,b) return blackwhitelist[a][".type"] > blackwhitelist[b][".type"] end
+	) do
+		if (s[".type"] == "whitelist" or s[".type"] == "blacklist") and s.mac then
+			local mac = s.mac:lower()
+			local arp = arpcache[mac]
+			print(string.format(
+				"%-17s  %-15s  %-9s  %4s  %-7s  %9s  %9s",
+				mac, arp and arp[2] or "?", s[".type"],
+				"- ", arp and arp[1] or "?", "-", "-"
+			))
+		end
+	end
+end
+
+main(arg)
diff --git a/trunk/package/luci/applications/luci-statistics/Makefile b/trunk/package/luci/applications/luci-statistics/Makefile
new file mode 100644
index 00000000..ff3d6702
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/Makefile
@@ -0,0 +1,4 @@
+PO = statistics rrdtool
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-statistics/ipkg/postinst b/trunk/package/luci/applications/luci-statistics/ipkg/postinst
new file mode 100755
index 00000000..7e81b366
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/ipkg/postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-statistics ) && rm -f /etc/uci-defaults/luci-statistics
+
+	/etc/init.d/luci_statistics enabled || /etc/init.d/luci_statistics enable
+	/etc/init.d/collectd enabled || /etc/init.d/collectd enable
+	
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/trunk/package/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
new file mode 100644
index 00000000..5729bb18
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -0,0 +1,209 @@
+--[[
+
+Luci statistics - statistics controller module
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+(c) 2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_statistics.luci_statistics", package.seeall)
+
+function index()
+
+	require("nixio.fs")
+	require("luci.util")
+	require("luci.statistics.datatree")
+
+	-- override entry(): check for existance <plugin>.so where <plugin> is derived from the called path
+	function _entry( path, ... )
+		local file = path[5] or path[4]
+		if nixio.fs.access( "/usr/lib/collectd/" .. file .. ".so" ) then
+			entry( path, ... )
+		end
+	end
+
+	local labels = {
+		s_output	= _("Output plugins"),
+		s_system	= _("System plugins"),
+		s_network	= _("Network plugins"),
+
+		conntrack	= _("Conntrack"),
+		cpu			= _("Processor"),
+		csv			= _("CSV Output"),
+		df			= _("Disk Space Usage"),
+		disk		= _("Disk Usage"),
+		dns			= _("DNS"),
+		email		= _("Email"),
+		exec		= _("Exec"),
+		interface	= _("Interfaces"),
+		iptables	= _("Firewall"),
+		irq			= _("Interrupts"),
+		iwinfo		= _("Wireless"),
+		load		= _("System Load"),
+		memory		= _("Memory"),
+		netlink		= _("Netlink"),
+		network		= _("Network"),
+		nut			= _("UPS"),
+		olsrd		= _("OLSRd"),
+		ping		= _("Ping"),
+		processes	= _("Processes"),
+		rrdtool		= _("RRDTool"),
+		splash_leases = _("Splash Leases"),
+		tcpconns	= _("TCP Connections"),
+		unixsock	= _("UnixSock"),
+		uptime		= _("Uptime")
+	}
+
+	-- our collectd menu
+	local collectd_menu = {
+		output  = { "csv", "network", "rrdtool", "unixsock" },
+		system  = { "cpu", "df", "disk", "email", "exec", "irq", "load", "memory", "nut", "processes", "uptime" },
+		network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "splash_leases", "tcpconns", "iwinfo" }
+	}
+
+	-- create toplevel menu nodes
+	local st = entry({"admin", "statistics"}, template("admin_statistics/index"), _("Statistics"), 80)
+	st.index = true
+
+	entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Collectd"), 10).subindex = true
+
+
+	-- populate collectd plugin menu
+	local index = 1
+	for section, plugins in luci.util.kspairs( collectd_menu ) do
+		local e = entry(
+			{ "admin", "statistics", "collectd", section },
+			firstchild(), labels["s_"..section], index * 10
+		)
+
+		e.index = true
+
+		for j, plugin in luci.util.vspairs( plugins ) do
+			_entry(
+				{ "admin", "statistics", "collectd", section, plugin },
+				cbi("luci_statistics/" .. plugin ),
+				labels[plugin], j * 10
+			)
+		end
+
+		index = index + 1
+	end
+
+	-- output views
+	local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 80)
+	      page.setuser  = "nobody"
+	      page.setgroup = "nogroup"
+
+	local vars = luci.http.formvalue(nil, true)
+	local span = vars.timespan or nil
+	local host = vars.host or nil
+
+	-- get rrd data tree
+	local tree = luci.statistics.datatree.Instance(host)
+
+	local _, plugin, idx
+	for _, plugin, idx in luci.util.vspairs( tree:plugins() ) do
+
+		-- get plugin instances
+		local instances = tree:plugin_instances( plugin )
+
+		-- plugin menu entry
+		entry(
+			{ "admin", "statistics", "graph", plugin },
+			call("statistics_render"), labels[plugin], idx
+		).query = { timespan = span , host = host }
+
+		-- if more then one instance is found then generate submenu
+		if #instances > 1 then
+			local _, inst, idx2
+			for _, inst, idx2 in luci.util.vspairs(instances) do
+				-- instance menu entry
+				entry(
+					{ "admin", "statistics", "graph", plugin, inst },
+					call("statistics_render"), inst, idx2
+				).query = { timespan = span , host = host }
+			end
+		end
+	end
+end
+
+function statistics_render()
+
+	require("luci.statistics.rrdtool")
+	require("luci.template")
+	require("luci.model.uci")
+
+	local vars  = luci.http.formvalue()
+	local req   = luci.dispatcher.context.request
+	local path  = luci.dispatcher.context.path
+	local uci   = luci.model.uci.cursor()
+	local spans = luci.util.split( uci:get( "luci_statistics", "collectd_rrdtool", "RRATimespans" ), "%s+", nil, true )
+	local span  = vars.timespan or uci:get( "luci_statistics", "rrdtool", "default_timespan" ) or spans[1]
+	local host  = vars.host     or uci:get( "luci_statistics", "collectd", "Hostname" ) or luci.sys.hostname()
+	local opts = { host = vars.host }
+	local graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ), opts )
+	local hosts = graph.tree:host_instances()
+
+	local is_index = false
+	local i, p, inst, idx
+
+	-- deliver image
+	if vars.img then
+		local l12 = require "luci.ltn12"
+		local png = io.open(graph.opts.imgpath .. "/" .. vars.img:gsub("%.+", "."), "r")
+		if png then
+			luci.http.prepare_content("image/png")
+			l12.pump.all(l12.source.file(png), luci.http.write)
+			png:close()
+		end
+		return
+	end
+
+	local plugin, instances
+	local images = { }
+
+	-- find requested plugin and instance
+    for i, p in ipairs( luci.dispatcher.context.path ) do
+        if luci.dispatcher.context.path[i] == "graph" then
+            plugin    = luci.dispatcher.context.path[i+1]
+            instances = { luci.dispatcher.context.path[i+2] }
+        end
+    end
+
+	-- no instance requested, find all instances
+	if #instances == 0 then
+		--instances = { graph.tree:plugin_instances( plugin )[1] }
+		instances = graph.tree:plugin_instances( plugin )
+		is_index = true
+
+	-- index instance requested
+	elseif instances[1] == "-" then
+		instances[1] = ""
+		is_index = true
+	end
+
+
+	-- render graphs
+	for i, inst in luci.util.vspairs( instances ) do
+		for i, img in luci.util.vspairs( graph:render( plugin, inst, is_index ) ) do
+			table.insert( images, graph:strippngpath( img ) )
+			images[images[#images]] = inst
+		end
+	end
+
+	luci.template.render( "public_statistics/graph", {
+		images           = images,
+		plugin           = plugin,
+		timespans        = spans,
+		current_timespan = span,
+		hosts            = hosts,
+		current_host     = host,
+		is_index         = is_index
+	} )
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
new file mode 100644
index 00000000..2343854f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
@@ -0,0 +1,74 @@
+--[[
+
+Luci configuration model for statistics - general collectd configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0 
+
+$Id$
+
+]]--
+
+require("luci.sys")
+
+
+m = Map("luci_statistics",
+	translate("Collectd Settings"),
+	translate(
+		"Collectd is a small daemon for collecting data from " ..
+		"various sources through different plugins. On this page " ..
+		"you can change general settings for the collectd daemon."
+	))
+
+-- general config section
+s = m:section( NamedSection, "collectd", "luci_statistics" )
+
+-- general.hostname (Hostname)
+hostname = s:option( Value, "Hostname", translate("Hostname") )
+hostname.default  = luci.sys.hostname()
+hostname.optional = true
+
+-- general.basedir (BaseDir)
+basedir = s:option( Value, "BaseDir", translate("Base Directory") )
+basedir.default = "/var/run/collectd"
+
+-- general.include (Include)
+include = s:option( Value, "Include", translate("Directory for sub-configurations") )
+include.default = "/etc/collectd/conf.d/*.conf"
+
+-- general.plugindir (PluginDir)
+plugindir = s:option( Value, "PluginDir", translate("Directory for collectd plugins") )
+plugindir.default = "/usr/lib/collectd/"
+
+-- general.pidfile (PIDFile)
+pidfile = s:option( Value, "PIDFile", translate("Used PID file") )
+pidfile.default = "/var/run/collectd.pid"
+
+-- general.typesdb (TypesDB)
+typesdb = s:option( Value, "TypesDB", translate("Datasets definition file") )
+typesdb.default = "/etc/collectd/types.db"
+
+-- general.interval (Interval)
+interval = s:option( Value, "Interval", translate("Data collection interval"), translate("Seconds") )
+interval.default  = 60
+interval.isnumber = true
+
+-- general.readthreads (ReadThreads)
+readthreads = s:option( Value, "ReadThreads", translate("Number of threads for data collection") )
+readthreads.default  = 5
+readthreads.isnumber = true
+
+-- general.fqdnlookup (FQDNLookup)
+fqdnlookup = s:option( Flag, "FQDNLookup", translate("Try to lookup fully qualified hostname") )
+fqdnlookup.enabled  = "true"
+fqdnlookup.disabled = "false"
+fqdnlookup.default  = "false"
+fqdnlookup.optional = true
+fqdnlookup:depends( "Hostname", "" )
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
new file mode 100644
index 00000000..81e9c05a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua
@@ -0,0 +1,21 @@
+--[[
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_statistics",
+	translate("Conntrack Plugin Configuration"),
+	translate("The conntrack plugin collects statistics about the number of tracked connections."))
+
+s = m:section( NamedSection, "collectd_conntrack", "luci_statistics" )
+
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
new file mode 100644
index 00000000..26d5f07c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
@@ -0,0 +1,27 @@
+--[[
+
+Luci configuration model for statistics - collectd cpu plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("CPU Plugin Configuration"),
+	translate("The cpu plugin collects basic statistics about the processor usage."))
+
+-- collectd_cpu config section
+s = m:section( NamedSection, "collectd_cpu", "luci_statistics" )
+
+-- collectd_cpu.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua
new file mode 100644
index 00000000..4f5aeef1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua
@@ -0,0 +1,41 @@
+--[[
+
+Luci configuration model for statistics - collectd csv plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("CSV Plugin Configuration"),
+	translate(
+		"The csv plugin stores collected data in csv file format " ..
+		"for further processing by external programs."
+	))
+
+-- collectd_csv config section
+s = m:section( NamedSection, "collectd_csv", "luci_statistics" )
+
+-- collectd_csv.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_csv.datadir (DataDir)
+datadir = s:option( Value, "DataDir", translate("Storage directory for the csv files") )
+datadir.default = "127.0.0.1"
+datadir:depends( "enable", 1 )
+
+-- collectd_csv.storerates (StoreRates)
+storerates = s:option( Flag, "StoreRates", translate("Store data values as rates instead of absolute values") )
+storerates.default = 0
+storerates:depends( "enable", 1 )
+
+return m
+
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua
new file mode 100644
index 00000000..1a3245fc
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua
@@ -0,0 +1,53 @@
+--[[
+
+Luci configuration model for statistics - collectd df plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("DF Plugin Configuration"),
+	translate(
+		"The df plugin collects statistics about the disk space " ..
+		"usage on different devices, mount points or filesystem types."
+	))
+
+-- collectd_df config section
+s = m:section( NamedSection, "collectd_df", "luci_statistics" )
+
+-- collectd_df.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_df.devices (Device)
+devices = s:option( Value, "Devices", translate("Monitor devices") )
+devices.default  = "/dev/mtdblock/4"
+devices.optional = true
+devices:depends( "enable", 1 )
+
+-- collectd_df.mountpoints (MountPoint)
+mountpoints = s:option( Value, "MountPoints", translate("Monitor mount points") )
+mountpoints.default  = "/overlay"
+mountpoints.optional = true
+mountpoints:depends( "enable", 1 )
+
+-- collectd_df.fstypes (FSType)
+fstypes = s:option( Value, "FSTypes", translate("Monitor filesystem types") )
+fstypes.default  = "tmpfs"
+fstypes.optional = true
+fstypes:depends( "enable", 1 )
+
+-- collectd_df.ignoreselected (IgnoreSelected)
+ignoreselected = s:option( Flag, "IgnoreSelected", translate("Monitor all except specified") )
+ignoreselected.default = 0
+ignoreselected:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua
new file mode 100644
index 00000000..7592b444
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua
@@ -0,0 +1,41 @@
+--[[
+
+Luci configuration model for statistics - collectd disk plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("Disk Plugin Configuration"),
+	translate(
+		"The disk plugin collects detailled usage statistics " ..
+		"for selected partitions or whole disks."
+	))
+
+-- collectd_disk config section
+s = m:section( NamedSection, "collectd_disk", "luci_statistics" )
+
+-- collectd_disk.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_disk.disks (Disk)
+devices = s:option( Value, "Disks", translate("Monitor disks and partitions") )
+devices.default = "hda1 hdb"
+devices.rmempty = true
+devices:depends( "enable", 1 )
+
+-- collectd_disk.ignoreselected (IgnoreSelected)
+ignoreselected = s:option( Flag, "IgnoreSelected", translate("Monitor all except specified") )
+ignoreselected.default = 0
+ignoreselected:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
new file mode 100644
index 00000000..28d9e5de
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
@@ -0,0 +1,48 @@
+--[[
+
+Luci configuration model for statistics - collectd dns plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+require("luci.sys")
+
+
+m = Map("luci_statistics",
+	translate("DNS Plugin Configuration"),
+	translate(
+		"The dns plugin collects detailled statistics about dns " ..
+		"related traffic on selected interfaces."
+	))
+
+-- collectd_dns config section
+s = m:section( NamedSection, "collectd_dns", "luci_statistics" )
+
+-- collectd_dns.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_dns.interfaces (Interface)
+interfaces = s:option( MultiValue, "Interfaces", translate("Monitor interfaces") )
+interfaces.widget = "select"
+interfaces.size   = 5
+interfaces:depends( "enable", 1 )
+interfaces:value("any")
+for k, v in pairs(luci.sys.net.devices()) do
+        interfaces:value(v)
+end
+         
+-- collectd_dns.ignoresources (IgnoreSource)
+ignoresources = s:option( Value, "IgnoreSources", translate("Ignore source addresses") )
+ignoresources.default = "127.0.0.1"
+ignoresources:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua
new file mode 100644
index 00000000..c5733d8c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua
@@ -0,0 +1,60 @@
+--[[
+
+Luci configuration model for statistics - collectd email plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("E-Mail Plugin Configuration"),
+	translate(
+		"The email plugin creates a unix socket which can be used " ..
+		"to transmit email-statistics to a running collectd daemon. " ..
+		"This plugin is primarily intended to be used in conjunction " ..
+		"with Mail::SpamAssasin::Plugin::Collectd but can be used in " ..
+		"other ways as well."
+	))
+
+-- collectd_email config section
+s = m:section( NamedSection, "collectd_email", "luci_statistics" )
+
+-- collectd_email.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_email.socketfile (SocketFile)
+socketfile = s:option( Value, "SocketFile", translate("Socket file") )
+socketfile.default = "/var/run/collect-email.sock"
+socketfile:depends( "enable", 1 )
+
+-- collectd_email.socketgroup (SocketGroup)
+socketgroup = s:option( Value, "SocketGroup", translate("Socket group") )
+socketgroup.default  = "nobody"
+socketgroup.rmempty  = true
+socketgroup.optional = true
+socketgroup:depends( "enable", 1 )
+
+-- collectd_email.socketperms (SocketPerms)
+socketperms = s:option( Value, "SocketPerms", translate("Socket permissions") )
+socketperms.default  = "0770"
+socketperms.rmempty  = true
+socketperms.optional = true
+socketperms:depends( "enable", 1 )
+
+-- collectd_email.maxconns (MaxConns)
+maxconns = s:option( Value, "MaxConns", translate("Maximum allowed connections") )
+maxconns.default   = 5
+maxconns.isinteger = true
+maxconns.rmempty   = true
+maxconns.optional  = true
+maxconns:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua
new file mode 100644
index 00000000..997d455d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua
@@ -0,0 +1,89 @@
+--[[
+
+Luci configuration model for statistics - collectd exec plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("Exec Plugin Configuration"),
+	translate(
+		"The exec plugin starts external commands to read values " ..
+		"from or to notify external processes when certain threshold " ..
+		"values have been reached."
+	))
+
+-- collectd_exec config section
+s = m:section( NamedSection, "collectd_exec", "luci_statistics" )
+
+-- collectd_exec.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+
+-- collectd_exec_input config section (Exec directives)
+exec = m:section( TypedSection, "collectd_exec_input",
+	translate("Add command for reading values"),
+	translate(
+		"Here you can define external commands which will be " ..
+		"started by collectd in order to read certain values. " ..
+		"The values will be read from stdout."
+	))
+exec.addremove = true
+exec.anonymous = true
+
+-- collectd_exec_input.cmdline
+exec_cmdline = exec:option( Value, "cmdline", translate("Script") )
+exec_cmdline.default = "/usr/bin/stat-dhcpusers"
+
+-- collectd_exec_input.cmdline
+exec_cmduser = exec:option( Value, "cmduser", translate("User") )
+exec_cmduser.default  = "nobody"
+exec_cmduser.rmempty  = true
+exec_cmduser.optional = true
+
+-- collectd_exec_input.cmdline
+exec_cmdgroup = exec:option( Value, "cmdgroup", translate("Group") )
+exec_cmdgroup.default  = "nogroup"
+exec_cmdgroup.rmempty  = true
+exec_cmdgroup.optional = true
+
+
+-- collectd_exec_notify config section (NotifyExec directives)
+notify = m:section( TypedSection, "collectd_exec_notify",
+	translate("Add notification command"),
+	translate(
+		"Here you can define external commands which will be " ..
+		"started by collectd when certain threshold values have " ..
+		"been reached. The values leading to invokation will be " ..
+		"feeded to the the called programs stdin."
+	))
+notify.addremove = true
+notify.anonymous = true
+
+-- collectd_notify_input.cmdline
+notify_cmdline = notify:option( Value, "cmdline", translate("Script") )
+notify_cmdline.default = "/usr/bin/stat-dhcpusers"
+
+-- collectd_notify_input.cmdline
+notify_cmduser = notify:option( Value, "cmduser", translate("User") )
+notify_cmduser.default  = "nobody"
+notify_cmduser.rmempty  = true
+notify_cmduser.optional = true
+
+-- collectd_notify_input.cmdline
+notify_cmdgroup = notify:option( Value, "cmdgroup", translate("Group") )
+notify_cmdgroup.default  = "nogroup"
+notify_cmdgroup.rmempty  = true
+notify_cmdgroup.optional = true
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua
new file mode 100644
index 00000000..dbb3e9dc
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua
@@ -0,0 +1,47 @@
+--[[
+
+Luci configuration model for statistics - collectd interface plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+require("luci.sys")
+
+
+m = Map("luci_statistics",
+	translate("Interface Plugin Configuration"),
+	translate(
+		"The interface plugin collects traffic statistics on " ..
+		"selected interfaces."
+	))
+
+-- collectd_interface config section
+s = m:section( NamedSection, "collectd_interface", "luci_statistics" )
+
+-- collectd_interface.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_interface.interfaces (Interface)
+interfaces = s:option( MultiValue, "Interfaces", translate("Monitor interfaces") )
+interfaces.widget = "select"
+interfaces.size   = 5
+interfaces:depends( "enable", 1 )
+for k, v in pairs(luci.sys.net.devices()) do
+	interfaces:value(v)
+end
+
+-- collectd_interface.ignoreselected (IgnoreSelected)
+ignoreselected = s:option( Flag, "IgnoreSelected", translate("Monitor all except specified") )
+ignoreselected.default = 0
+ignoreselected:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
new file mode 100644
index 00000000..1f7341c4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
@@ -0,0 +1,132 @@
+--[[
+
+Luci configuration model for statistics - collectd iptables plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+require("luci.sys.iptparser")
+
+ip = luci.sys.iptparser.IptParser()
+chains  = { }
+targets = { }
+
+for i, rule in ipairs( ip:find() ) do 
+	if rule.chain and rule.target then
+		chains[rule.chain] = true
+		targets[rule.target] = true
+	end
+end
+
+
+m = Map("luci_statistics",
+	translate("Iptables Plugin Configuration"),
+	translate(
+		"The iptables plugin will monitor selected firewall rules and " ..
+		"collect informations about processed bytes and packets per rule."
+	))
+
+-- collectd_iptables config section
+s = m:section( NamedSection, "collectd_iptables", "luci_statistics" )
+
+-- collectd_iptables.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+
+-- collectd_iptables_match config section (Chain directives)
+rule = m:section( TypedSection, "collectd_iptables_match",
+	translate("Add matching rule"),
+	translate(
+		"Here you can define various criteria by which the monitored " ..
+		"iptables rules are selected."
+	))
+rule.addremove = true
+rule.anonymous = true
+
+
+-- collectd_iptables_match.name
+rule_table = rule:option( Value, "name",
+	translate("Name of the rule"), translate("max. 16 chars") )
+
+-- collectd_iptables_match.table
+rule_table = rule:option( ListValue, "table", translate("Table") )
+rule_table.default  = "filter"
+rule_table.rmempty  = true
+rule_table.optional = true
+rule_table:value("")
+rule_table:value("filter")
+rule_table:value("nat")
+rule_table:value("mangle")
+
+
+-- collectd_iptables_match.chain
+rule_chain = rule:option( ListValue, "chain", translate("Chain") )
+rule_chain.rmempty  = true
+rule_chain.optional = true
+rule_chain:value("")
+
+for chain, void in pairs( chains ) do
+	rule_chain:value( chain )
+end
+
+
+-- collectd_iptables_match.target
+rule_target = rule:option( ListValue, "target", translate("Action (target)") )
+rule_target.rmempty  = true
+rule_target.optional = true
+rule_target:value("")
+
+for target, void in pairs( targets ) do
+	rule_target:value( target )
+end
+
+
+-- collectd_iptables_match.protocol
+rule_protocol = rule:option( ListValue, "protocol", translate("Network protocol") )
+rule_protocol.rmempty  = true
+rule_protocol.optional = true
+rule_protocol:value("")
+rule_protocol:value("tcp")
+rule_protocol:value("udp")
+rule_protocol:value("icmp")
+
+-- collectd_iptables_match.source
+rule_source = rule:option( Value, "source", translate("Source ip range") )
+rule_source.default  = "0.0.0.0/0"
+rule_source.rmempty  = true
+rule_source.optional = true
+
+-- collectd_iptables_match.destination
+rule_destination = rule:option( Value, "destination", translate("Destination ip range") )
+rule_destination.default  = "0.0.0.0/0"
+rule_destination.rmempty  = true
+rule_destination.optional = true
+
+-- collectd_iptables_match.inputif
+rule_inputif = rule:option( Value, "inputif",
+	translate("Incoming interface"), translate("e.g. br-lan") )
+rule_inputif.rmempty  = true
+rule_inputif.optional = true
+
+-- collectd_iptables_match.outputif
+rule_outputif = rule:option( Value, "outputif",
+	translate("Outgoing interface"), translate("e.g. br-ff") )
+rule_outputif.rmempty  = true
+rule_outputif.optional = true
+
+-- collectd_iptables_match.options
+rule_options = rule:option( Value, "options",
+	translate("Options"), translate("e.g. reject-with tcp-reset") )
+rule_options.rmempty  = true
+rule_options.optional = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua
new file mode 100644
index 00000000..d6aa2e96
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua
@@ -0,0 +1,42 @@
+--[[
+
+Luci configuration model for statistics - collectd irq plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("IRQ Plugin Configuration"),
+	translate(
+		"The irq plugin will monitor the rate of issues per second for " ..
+		"each selected interrupt. If no interrupt is selected then all " ..
+		"interrupts are monitored."
+	))
+
+-- collectd_irq config section
+s = m:section( NamedSection, "collectd_irq", "luci_statistics" )
+
+-- collectd_irq.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_irq.irqs (Irq)
+irqs = s:option( Value, "Irqs", translate("Monitor interrupts") )
+irqs.optional = true
+irqs:depends( "enable", 1 )
+
+-- collectd_irq.ignoreselected (IgnoreSelected)
+ignoreselected = s:option( Flag, "IgnoreSelected", translate("Monitor all except specified") )
+ignoreselected.default  = 0
+ignoreselected.optional = "true"
+ignoreselected:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
new file mode 100644
index 00000000..5e9340dc
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
@@ -0,0 +1,38 @@
+--[[
+
+Luci configuration model for statistics - collectd interface plugin configuration
+(c) 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local m, s, o
+
+m = Map("luci_statistics",
+	translate("Wireless iwinfo Plugin Configuration"),
+	translate("The iwinfo plugin collects statistics about wireless signal strength, noise and quality."))
+
+s = m:section(NamedSection, "collectd_iwinfo", "luci_statistics")
+
+o = s:option(Flag, "enable", translate("Enable this plugin"))
+o.default = 0
+
+o = s:option(Value, "Interfaces", translate("Monitor interfaces"),
+	translate("Leave unselected to automatically determine interfaces to monitor."))
+o.template = "cbi/network_ifacelist"
+o.widget   = "checkbox"
+o.nocreate = true
+o:depends("enable", 1)
+
+o = s:option(Flag, "IgnoreSelected", translate("Monitor all except specified"))
+o.default = 0
+o:depends("enable", 1)
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua
new file mode 100644
index 00000000..e59a4b8f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua
@@ -0,0 +1,29 @@
+--[[
+
+Luci configuration model for statistics - collectd load plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("Load Plugin Configuration"),
+	translate(
+		"The load plugin collects statistics about the general system load."
+	))
+
+-- collectd_wireless config section
+s = m:section( NamedSection, "collectd_load", "luci_statistics" )
+
+-- collectd_wireless.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua
new file mode 100644
index 00000000..5510a5a8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua
@@ -0,0 +1,21 @@
+--[[
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_statistics",
+	translate("Memory Plugin Configuration"),
+	translate("The memory plugin collects statistics about the memory usage."))
+
+s = m:section( NamedSection, "collectd_memory", "luci_statistics" )
+
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
new file mode 100644
index 00000000..3417d090
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
@@ -0,0 +1,95 @@
+--[[
+
+Luci configuration model for statistics - collectd netlink plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+require("luci.sys")
+
+local devices = luci.sys.net.devices()
+
+
+m = Map("luci_statistics",
+	translate("Netlink Plugin Configuration"),
+	translate(
+		"The netlink plugin collects extended informations like " ..
+		"qdisc-, class- and filter-statistics for selected interfaces."
+	))
+
+-- collectd_netlink config section
+s = m:section( NamedSection, "collectd_netlink", "luci_statistics" )
+
+-- collectd_netlink.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_netlink.interfaces (Interface)
+interfaces = s:option( MultiValue, "Interfaces", translate("Basic monitoring") )
+interfaces.widget   = "select"
+interfaces.optional = true
+interfaces.size     = #devices + 1
+interfaces:depends( "enable", 1 )
+interfaces:value("")
+for i, v in ipairs(devices) do
+	interfaces:value(v)
+end
+
+-- collectd_netlink.verboseinterfaces (VerboseInterface)
+verboseinterfaces = s:option( MultiValue, "VerboseInterfaces", translate("Verbose monitoring") )
+verboseinterfaces.widget   = "select"
+verboseinterfaces.optional = true
+verboseinterfaces.size     = #devices + 1
+verboseinterfaces:depends( "enable", 1 )
+verboseinterfaces:value("")
+for i, v in ipairs(devices) do
+	verboseinterfaces:value(v)
+end
+
+-- collectd_netlink.qdiscs (QDisc)
+qdiscs = s:option( MultiValue, "QDiscs", translate("Qdisc monitoring") )
+qdiscs.widget   = "select"
+qdiscs.optional = true
+qdiscs.size     = #devices + 1
+qdiscs:depends( "enable", 1 )
+qdiscs:value("")
+for i, v in ipairs(devices) do
+        qdiscs:value(v)
+end
+
+-- collectd_netlink.classes (Class)
+classes = s:option( MultiValue, "Classes", translate("Shaping class monitoring") )
+classes.widget   = "select"
+classes.optional = true
+classes.size     = #devices + 1
+classes:depends( "enable", 1 )
+classes:value("")
+for i, v in ipairs(devices) do
+        classes:value(v)
+end
+
+-- collectd_netlink.filters (Filter)
+filters = s:option( MultiValue, "Filters", translate("Filter class monitoring") )
+filters.widget   = "select"
+filters.optional = true
+filters.size     = #devices + 1
+filters:depends( "enable", 1 )
+filters:value("")
+for i, v in ipairs(devices) do
+        filters:value(v)
+end
+
+-- collectd_netlink.ignoreselected (IgnoreSelected)
+ignoreselected = s:option( Flag, "IgnoreSelected", translate("Monitor all except specified") )
+ignoreselected.default = 0
+ignoreselected:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua
new file mode 100644
index 00000000..8a006897
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua
@@ -0,0 +1,98 @@
+--[[
+
+Luci configuration model for statistics - collectd network plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+
+m = Map("luci_statistics",
+	translate("Network Plugin Configuration"),
+	translate(
+		"The network plugin provides network based communication between " ..
+		"different collectd instances. Collectd can operate both in client " ..
+		"and server mode. In client mode locally collected date is " ..
+		"transferred to a collectd server instance, in server mode the " ..
+		"local instance receives data from other hosts."
+	))
+
+-- collectd_network config section
+s = m:section( NamedSection, "collectd_network", "luci_statistics" )
+
+-- collectd_network.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+
+-- collectd_network_listen config section (Listen)
+listen = m:section( TypedSection, "collectd_network_listen",
+	translate("Listener interfaces"),
+	translate(
+		"This section defines on which interfaces collectd will wait " ..
+		"for incoming connections."
+	))
+listen.addremove = true
+listen.anonymous = true
+
+-- collectd_network_listen.host
+listen_host = listen:option( Value, "host", translate("Listen host") )
+listen_host.default = "0.0.0.0"
+
+-- collectd_network_listen.port
+listen_port = listen:option( Value, "port", translate("Listen port") )
+listen_port.default   = 25826
+listen_port.isinteger = true
+listen_port.optional  = true
+
+
+-- collectd_network_server config section (Server)
+server = m:section( TypedSection, "collectd_network_server",
+	translate("server interfaces"),
+	translate(
+		"This section defines to which servers the locally collected " ..
+		"data is sent to."
+	))
+server.addremove = true
+server.anonymous = true
+
+-- collectd_network_server.host
+server_host = server:option( Value, "host", translate("Server host") )
+server_host.default = "0.0.0.0"
+
+-- collectd_network_server.port
+server_port = server:option( Value, "port", translate("Server port") )
+server_port.default   = 25826
+server_port.isinteger = true
+server_port.optional  = true
+
+-- collectd_network.timetolive (TimeToLive)
+ttl = s:option( Value, "TimeToLive", translate("TTL for network packets") )
+ttl.default   = 128
+ttl.isinteger = true
+ttl.optional  = true
+ttl:depends( "enable", 1 )
+
+-- collectd_network.forward (Forward)
+forward = s:option( Flag, "Forward", translate("Forwarding between listen and server addresses") )
+forward.default  = 0
+forward.optional = true
+forward:depends( "enable", 1 )
+
+-- collectd_network.cacheflush (CacheFlush)
+cacheflush = s:option( Value, "CacheFlush",
+	translate("Cache flush interval"), translate("Seconds") )
+cacheflush.default   = 86400
+cacheflush.isinteger = true
+cacheflush.optional  = true
+cacheflush:depends( "enable", 1 )
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/nut.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/nut.lua
new file mode 100644
index 00000000..ad030718
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/nut.lua
@@ -0,0 +1,28 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright © 2011 Manuel Munz <freifunk at somakoma dot de>
+Copyright © 2012 David Woodhouse <dwmw2@infradead.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_statistics",
+	translate("UPS Plugin Configuration"),
+	translate("The NUT plugin reads information about Uninterruptible Power Supplies."))
+
+s = m:section(NamedSection, "collectd_nut", "luci_statistics" )
+
+enable = s:option(Flag, "enable", translate("Enable this plugin"))
+enable.default = 0
+
+host = s:option(Value, "UPS", translate("UPS"), translate("UPS name in NUT ups@host format"))
+host.placeholder = "myupsname"
+host.datatype = "string"
+host.rmempty = true
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua
new file mode 100644
index 00000000..e3eb7b2c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua
@@ -0,0 +1,54 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_statistics",
+	translate("OLSRd Plugin Configuration"),
+	translate("The OLSRd plugin reads information about meshed networks from the txtinfo plugin of OLSRd."))
+
+s = m:section(NamedSection, "collectd_olsrd", "luci_statistics" )
+
+enable = s:option(Flag, "enable", translate("Enable this plugin"))
+enable.default = 0
+
+host = s:option(Value, "Host", translate("Host"), translate("IP or hostname where to get the txtinfo output from"))
+host.placeholder = "127.0.0.1"
+host.datatype = "host"
+host.rmempty = true
+
+port = s:option(Value, "Port", translate("Port"))
+port.placeholder = "2006"
+port.datatype = "range(0,65535)"
+port.rmempty = true
+port.cast = "string"
+
+cl = s:option(ListValue, "CollectLinks", translate("CollectLinks"),
+	translate("Specifies what information to collect about links."))
+cl:value("No")
+cl:value("Summary")
+cl:value("Detail")
+cl.default = "Detail"
+
+cr = s:option(ListValue, "CollectRoutes", translate("CollectRoutes"),
+        translate("Specifies what information to collect about routes."))
+cr:value("No")
+cr:value("Summary")
+cr:value("Detail")
+cr.default = "Summary"
+
+ct = s:option(ListValue, "CollectTopology", translate("CollectTopology"),
+        translate("Specifies what information to collect about the global topology."))
+ct:value("No")
+ct:value("Summary")
+ct:value("Detail")
+ct.default = "Summary"
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
new file mode 100644
index 00000000..c55ac873
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
@@ -0,0 +1,47 @@
+--[[
+
+Luci configuration model for statistics - collectd ping plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("Ping Plugin Configuration"),
+	translate(
+		"The ping plugin will send icmp echo replies to selected " ..
+		"hosts and measure the roundtrip time for each host."
+	))
+
+-- collectd_ping config section
+s = m:section( NamedSection, "collectd_ping", "luci_statistics" )
+
+-- collectd_ping.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_ping.hosts (Host)
+hosts = s:option( Value, "Hosts", translate("Monitor hosts"), translate ("Add multiple hosts separated by space."))
+hosts.default = "127.0.0.1"
+hosts:depends( "enable", 1 )
+
+-- collectd_ping.ttl (TTL)
+ttl = s:option( Value, "TTL", translate("TTL for ping packets") )
+ttl.isinteger = true
+ttl.default   = 128
+ttl:depends( "enable", 1 )
+
+-- collectd_ping.interval (Interval)
+interval = s:option( Value, "Interval", translate("Interval for pings"), translate ("Seconds") )
+interval.isinteger = true
+interval.default   = 30
+interval:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
new file mode 100644
index 00000000..3aea6b3c
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
@@ -0,0 +1,36 @@
+--[[
+
+Luci configuration model for statistics - collectd processes plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("Processes Plugin Configuration"),
+	translate(
+		"The processes plugin collects informations like cpu time, " ..
+		"page faults and memory usage of selected processes."
+	))
+
+-- collectd_processes config section
+s = m:section( NamedSection, "collectd_processes", "luci_statistics" )
+
+-- collectd_processes.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_processes.processes (Process)
+processes = s:option( Value, "Processes", translate("Monitor processes"),
+	translate("Processes to monitor separated by space") )
+processes:depends( "enable", 1 )
+processes.default = "uhttpd dropbear dnsmasq"
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
new file mode 100644
index 00000000..75716341
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
@@ -0,0 +1,108 @@
+--[[
+
+Luci configuration model for statistics - collectd rrdtool plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("RRDTool Plugin Configuration"),
+	translate(
+		"The rrdtool plugin stores the collected data in rrd database " ..
+		"files, the foundation of the diagrams.<br /><br />" ..
+		"<strong>Warning: Setting the wrong values will result in a very " ..
+		"high memory consumption in the temporary directory. " ..
+		"This can render the device unusable!</strong>"
+	))
+
+-- collectd_rrdtool config section
+s = m:section( NamedSection, "collectd_rrdtool", "luci_statistics" )
+
+-- collectd_rrdtool.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 1
+
+-- collectd_rrdtool.datadir (DataDir)
+datadir = s:option( Value, "DataDir", translate("Storage directory") )
+datadir.default  = "/tmp"
+datadir.rmempty  = true
+datadir.optional = true
+datadir:depends( "enable", 1 )
+
+-- collectd_rrdtool.stepsize (StepSize)
+stepsize = s:option( Value, "StepSize",
+	translate("RRD step interval"), translate("Seconds") )
+stepsize.default   = 30
+stepsize.isinteger = true
+stepsize.rmempty   = true
+stepsize.optional  = true
+stepsize:depends( "enable", 1 )
+
+-- collectd_rrdtool.heartbeat (HeartBeat)
+heartbeat = s:option( Value, "HeartBeat",
+	translate("RRD heart beat interval"), translate("Seconds") )
+heartbeat.default   = 60
+heartbeat.isinteger = true
+heartbeat.rmempty   = true
+heartbeat.optional  = true
+heartbeat:depends( "enable", 1 )
+
+-- collectd_rrdtool.rrasingle (RRASingle)
+rrasingle = s:option( Flag, "RRASingle",
+	translate("Only create average RRAs"), translate("reduces rrd size") )
+rrasingle.default  = true
+rrasingle.rmempty  = true
+rrasingle.optional = true
+rrasingle:depends( "enable", 1 )
+
+-- collectd_rrdtool.rratimespans (RRATimespan)
+rratimespans = s:option( Value, "RRATimespans",
+	translate("Stored timespans"), translate("seconds; multiple separated by space") )
+rratimespans.default  = "600 86400 604800 2678400 31622400"
+rratimespans.rmempty  = true
+rratimespans.optional = true
+rratimespans:depends( "enable", 1 )
+
+-- collectd_rrdtool.rrarows (RRARows)
+rrarows = s:option( Value, "RRARows", translate("Rows per RRA") )
+rrarows.isinteger = true
+rrarows.default   = 100
+rrarows.rmempty   = true
+rrarows.optional  = true
+rrarows:depends( "enable", 1 )
+
+-- collectd_rrdtool.xff (XFF)
+xff = s:option( Value, "XFF", translate("RRD XFiles Factor") )
+xff.default  = 0.1
+xff.isnumber = true
+xff.rmempty  = true
+xff.optional = true
+xff:depends( "enable", 1 )
+
+-- collectd_rrdtool.cachetimeout (CacheTimeout)
+cachetimeout = s:option( Value, "CacheTimeout",
+	translate("Cache collected data for"), translate("Seconds") )
+cachetimeout.isinteger = true
+cachetimeout.default   = 100
+cachetimeout.rmempty   = true
+cachetimeout.optional  = true
+cachetimeout:depends( "enable", 1 )
+
+-- collectd_rrdtool.cacheflush (CacheFlush)
+cacheflush = s:option( Value, "CacheFlush",
+	translate("Flush cache after"), translate("Seconds") )
+cacheflush.isinteger = true
+cacheflush.default   = 100
+cacheflush.rmempty   = true
+cacheflush.optional  = true
+cacheflush:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
new file mode 100644
index 00000000..a15ed0ec
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
@@ -0,0 +1,24 @@
+--[[
+
+Luci configuration model for statistics - collectd splash_leases plugin configuration
+(c) 2013 Freifunk Augsburg / Michael Wendland <michael@michiwend.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+m = Map("luci_statistics",
+	translate("Splash Leases Plugin Configuration"),
+	translate("The splash leases plugin uses libuci to collect statistics about splash leases."))
+
+s = m:section( NamedSection, "collectd_splash_leases", "luci_statistics" )
+
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 1
+
+return m
+
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
new file mode 100644
index 00000000..9d0f6e13
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
@@ -0,0 +1,45 @@
+--[[
+
+Luci configuration model for statistics - collectd tcpconns plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("TCPConns Plugin Configuration"),
+	translate(
+		"The tcpconns plugin collects informations about open tcp " ..
+		"connections on selected ports."
+	))
+
+-- collectd_tcpconns config section
+s = m:section( NamedSection, "collectd_tcpconns", "luci_statistics" )
+
+-- collectd_tcpconns.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_tcpconns.listeningports (ListeningPorts)
+listeningports = s:option( Flag, "ListeningPorts", translate("Monitor all local listen ports") )
+listeningports.default = 1
+listeningports:depends( "enable", 1 )
+
+-- collectd_tcpconns.localports (LocalPort)
+localports = s:option( Value, "LocalPorts", translate("Monitor local ports") )
+localports.optional = true
+localports:depends( "enable", 1 )
+
+-- collectd_tcpconns.remoteports (RemotePort)
+remoteports = s:option( Value, "RemotePorts", translate("Monitor remote ports") )
+remoteports.optional = true
+remoteports:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
new file mode 100644
index 00000000..cbd52ec1
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
@@ -0,0 +1,49 @@
+--[[
+
+Luci configuration model for statistics - collectd unixsock plugin configuration
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("luci_statistics",
+	translate("Unixsock Plugin Configuration"),
+	translate(
+		"The unixsock plugin creates a unix socket which can be used " ..
+		"to read collected data from a running collectd instance."
+	))
+
+-- collectd_unixsock config section
+s = m:section( NamedSection, "collectd_unixsock", "luci_statistics" )
+
+-- collectd_unixsock.enable
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+-- collectd_unixsock.socketfile (SocketFile)
+socketfile = s:option( Value, "SocketFile" )
+socketfile.default = "/var/run/collect-query.socket"
+socketfile:depends( "enable", 1 )
+
+-- collectd_unixsock.socketgroup (SocketGroup)
+socketgroup = s:option( Value, "SocketGroup" )
+socketgroup.default  = "nobody"
+socketgroup.rmempty  = true
+socketgroup.optional = true
+socketgroup:depends( "enable", 1 )
+
+-- collectd_unixsock.socketperms (SocketPerms)
+socketperms = s:option( Value, "SocketPerms" )
+socketperms.default  = "0770"
+socketperms.rmempty  = true
+socketperms.optional = true
+socketperms:depends( "enable", 1 )
+
+return m
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
new file mode 100644
index 00000000..3a6c4644
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
@@ -0,0 +1,22 @@
+--[[
+
+Copyright 2013 Thomas Endt <tmo26@gmx.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_statistics",
+        translate("Uptime Plugin Configuration"),
+        translate("The uptime plugin collects statistics about the uptime of the system."))
+
+s = m:section( NamedSection, "collectd_uptime", "luci_statistics" )
+
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+return m
+
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/datatree.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/datatree.lua
new file mode 100644
index 00000000..850b83a9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/datatree.lua
@@ -0,0 +1,209 @@
+--[[
+
+Luci statistics - rrd data tree builder
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.datatree", package.seeall)
+
+local util = require("luci.util")
+local sys  = require("luci.sys")
+local fs   = require("nixio.fs")
+local uci  = require("luci.model.uci").cursor()
+local sections = uci:get_all("luci_statistics")
+
+
+Instance = util.class()
+
+function Instance.__init__( self, host )
+	self._host    = host or sections.collectd.Hostname or sys.hostname()
+	self._libdir  = sections.collectd.PluginDir        or "/usr/lib/collectd"
+	self._rrddir  = sections.collectd_rrdtool.DataDir  or "/tmp/rrd"
+
+	self._libdir  = self._libdir:gsub("/$","")
+	self._rrddir  = self._rrddir:gsub("/$","")
+	self._plugins = { }
+
+	self:_scan()
+end
+
+function Instance._mkpath( self, plugin, pinstance )
+	local dir = self._rrddir .. "/" .. self._host
+
+	if type(plugin) == "string" and plugin:len() > 0 then
+		dir = dir .. "/" .. plugin
+
+		if type(pinstance) == "string" and pinstance:len() > 0 then
+			dir = dir .. "-" .. pinstance
+		end
+	end
+
+	return dir
+end
+
+function Instance._ls( self, ... )
+	local ditr = fs.dir(self:_mkpath(...))
+	if ditr then
+		local dirs = { }
+		while true do
+			local d = ditr()
+			if not d then break end
+			dirs[#dirs+1] = d
+		end
+		return dirs
+	end
+end
+
+function Instance._notzero( self, table )
+	for k in pairs(table) do
+		return true
+	end
+
+	return false
+end
+
+function Instance._scan( self )
+	local dirs = self:_ls()
+	if not dirs then
+		return
+	end
+
+--	for i, plugin in ipairs( dirs ) do
+--		if plugin:match("%w+.so") then
+--			self._plugins[ plugin:gsub("%.so$", "") ] = { }
+--		end
+--	end
+
+	for _, dir in ipairs(dirs) do
+		if dir ~= "." and dir ~= ".." and
+		   fs.stat(self:_mkpath(dir)).type == "dir"
+		then
+			local plugin = dir:gsub("%-.+$", "")
+			if not self._plugins[plugin] then
+				self._plugins[plugin] = { }
+			end
+		end
+	end
+
+	for plugin, instances in pairs( self._plugins ) do
+
+		local dirs = self:_ls()
+
+		if type(dirs) == "table" then
+			for i, dir in ipairs(dirs) do
+				if dir:find( plugin .. "%-" ) or dir == plugin then
+					local instance = ""
+
+					if dir ~= plugin then
+						instance = dir:gsub( plugin .. "%-", "", 1 )
+					end
+
+					instances[instance] = { }
+				end
+			end
+		end
+
+		for instance, data_instances in pairs( instances ) do
+
+			dirs = self:_ls(plugin, instance)
+
+			if type(dirs) == "table" then
+				for i, file in ipairs(dirs) do
+					if file:find("%.rrd") then
+						file = file:gsub("%.rrd","")
+
+						local data_type
+						local data_instance
+
+						if file:find("%-") then
+							data_type     = file:gsub( "%-.+","" )
+							data_instance = file:gsub( "[^%-]-%-", "", 1 )
+						else
+							data_type     = file
+							data_instance = ""
+						end
+
+						if not data_instances[data_type] then
+							data_instances[data_type] = { data_instance }
+						else
+							table.insert( data_instances[data_type], data_instance )
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+
+function Instance.plugins( self )
+	local rv = { }
+
+	for plugin, val in pairs( self._plugins ) do
+		if self:_notzero( val ) then
+			table.insert( rv, plugin )
+		end
+	end
+
+	return rv
+end
+
+function Instance.plugin_instances( self, plugin )
+	local rv = { }
+
+	for instance, val in pairs( self._plugins[plugin] ) do
+		table.insert( rv, instance )
+	end
+
+	return rv
+end
+
+function Instance.data_types( self, plugin, instance )
+	local rv = { }
+	local p  = self._plugins[plugin]
+
+	if type(p) == "table" and type(p[instance]) == "table" then
+		for type, val in pairs(p[instance]) do
+			table.insert( rv, type )
+		end
+	end
+
+	return rv
+end
+
+function Instance.data_instances( self, plugin, instance, dtype )
+	local rv = { }
+	local p  = self._plugins[plugin]
+
+	if type(p) == "table" and type(p[instance]) == "table" and type(p[instance][dtype]) == "table" then
+		for i, instance in ipairs(p[instance][dtype]) do
+			table.insert( rv, instance )
+		end
+	end
+
+	return rv
+end
+
+function Instance.host_instances( self )
+	local hosts_path = fs.glob(self._rrddir..'/*')
+	local hosts = { }
+
+	if hosts_path then
+		local path
+		for path in hosts_path do
+			hosts[#hosts+1] = fs.basename(path)
+		end
+	end
+
+	return hosts
+end
+
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/i18n.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/i18n.lua
new file mode 100644
index 00000000..a1a2fa9d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/i18n.lua
@@ -0,0 +1,108 @@
+--[[
+
+Luci statistics - diagram i18n helper
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.i18n", package.seeall)
+
+require("luci.util")
+require("luci.i18n")
+
+
+Instance = luci.util.class()
+
+
+function Instance.__init__( self, graph )
+	self.i18n  = luci.i18n
+	self.graph = graph
+end
+
+function Instance._subst( self, str, val )
+	str = str:gsub( "%%H",  self.graph.opts.host or "" )
+	str = str:gsub( "%%pn", val.plugin or "" )
+	str = str:gsub( "%%pi", val.pinst  or "" )
+	str = str:gsub( "%%dt", val.dtype  or "" )
+	str = str:gsub( "%%di", val.dinst  or "" )
+	str = str:gsub( "%%ds", val.dsrc   or "" )
+
+	return str
+end
+
+function Instance._translate( self, key, alt )
+	local val = self.i18n.string(key)
+	if val ~= key then
+		return val
+	else
+		return alt
+	end
+end
+
+function Instance.title( self, plugin, pinst, dtype, dinst, user_title )
+
+	local title = user_title or
+		"p=%s/pi=%s/dt=%s/di=%s" % {
+			plugin,
+			(pinst and #pinst > 0) and pinst or "(nil)",
+			(dtype and #dtype > 0) and dtype or "(nil)",
+			(dinst and #dinst > 0) and dinst or "(nil)"
+		}
+
+	return self:_subst( title, {
+		plugin = plugin,
+		pinst  = pinst,
+		dtype  = dtype,
+		dinst  = dinst
+	} )
+
+end
+
+function Instance.label( self, plugin, pinst, dtype, dinst, user_label )
+
+	local label = user_label or
+		"dt=%s/di=%s" % {
+			(dtype and #dtype > 0) and dtype or "(nil)",
+			(dinst and #dinst > 0) and dinst or "(nil)"
+		}
+
+	return self:_subst( label, {
+		plugin = plugin,
+		pinst  = pinst,
+		dtype  = dtype,
+		dinst  = dinst
+	} )
+
+end
+
+function Instance.ds( self, source )
+
+	local label = source.title or self:_translate(
+		string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ),
+		self:_translate(
+			string.format( "stat_ds_%s_%s", source.type, source.instance ),
+			self:_translate(
+				string.format( "stat_ds_label_%s__%s", source.type, source.ds ),
+				self:_translate(
+					string.format( "stat_ds_%s", source.type ),
+					source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds
+				)
+			)
+		)
+	)
+
+	return self:_subst( label, {
+		dtype = source.type,
+		dinst = source.instance,
+		dsrc  = source.ds
+	} )
+
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua
new file mode 100644
index 00000000..dbcae9dc
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua
@@ -0,0 +1,561 @@
+--[[
+
+Luci statistics - rrdtool interface library / diagram model interpreter
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool", package.seeall)
+
+require("luci.statistics.datatree")
+require("luci.statistics.rrdtool.colors")
+require("luci.statistics.i18n")
+require("luci.model.uci")
+require("luci.util")
+require("luci.sys")
+
+local fs = require "nixio.fs"
+
+
+Graph = luci.util.class()
+
+function Graph.__init__( self, timespan, opts )
+
+	opts = opts or { }
+
+	local uci = luci.model.uci.cursor()
+	local sections = uci:get_all( "luci_statistics" )
+
+	-- options
+	opts.timespan  = timespan       or sections.rrdtool.default_timespan or 900
+	opts.rrasingle = opts.rrasingle or ( sections.collectd_rrdtool.RRASingle == "1" )
+	opts.host      = opts.host      or sections.collectd.Hostname        or luci.sys.hostname()
+	opts.width     = opts.width     or sections.rrdtool.image_width      or 400
+	opts.rrdpath   = opts.rrdpath   or sections.collectd_rrdtool.DataDir or "/tmp/rrd"
+	opts.imgpath   = opts.imgpath   or sections.rrdtool.image_path       or "/tmp/rrdimg"
+	opts.rrdpath   = opts.rrdpath:gsub("/$","")
+	opts.imgpath   = opts.imgpath:gsub("/$","")
+
+	-- helper classes
+	self.colors = luci.statistics.rrdtool.colors.Instance()
+	self.tree   = luci.statistics.datatree.Instance(opts.host)
+	self.i18n   = luci.statistics.i18n.Instance( self )
+
+	-- rrdtool default args
+	self.args = {
+		"-a", "PNG",
+		"-s", "NOW-" .. opts.timespan,
+		"-w", opts.width
+	}
+
+	-- store options
+	self.opts = opts
+end
+
+function Graph._mkpath( self, plugin, plugin_instance, dtype, dtype_instance )
+	local t = self.opts.host .. "/" .. plugin
+	if type(plugin_instance) == "string" and plugin_instance:len() > 0 then
+		t = t .. "-" .. plugin_instance
+	end
+	t = t .. "/" .. dtype
+	if type(dtype_instance) == "string" and dtype_instance:len() > 0 then
+		t = t .. "-" .. dtype_instance
+	end
+	return t
+end
+
+function Graph.mkrrdpath( self, ... )
+	return string.format( "%s/%s.rrd", self.opts.rrdpath, self:_mkpath( ... ) )
+end
+
+function Graph.mkpngpath( self, ... )
+	return string.format( "%s/%s.%i.png", self.opts.imgpath, self:_mkpath( ... ), self.opts.timespan )
+end
+
+function Graph.strippngpath( self, path )
+	return path:sub( self.opts.imgpath:len() + 2 )
+end
+
+function Graph._forcelol( self, list )
+	if type(list[1]) ~= "table" then
+		return( { list } )
+	end
+	return( list )
+end
+
+function Graph._rrdtool( self, def, rrd )
+
+	-- prepare directory
+	local dir = def[1]:gsub("/[^/]+$","")
+	fs.mkdirr( dir )
+
+	-- construct commandline
+	local cmdline = "rrdtool graph"
+
+	-- copy default arguments to def stack
+	for i, opt in ipairs(self.args) do
+		table.insert( def, 1 + i, opt )
+	end
+
+	-- construct commandline from def stack
+	for i, opt in ipairs(def) do
+		opt = opt .. ""    -- force string
+
+		if rrd then
+			opt = opt:gsub( "{file}", rrd )
+		end
+
+		if opt:match("[^%w]") then
+			cmdline = cmdline .. " '" .. opt .. "'"
+		else
+			cmdline = cmdline .. " " .. opt
+		end
+	end
+
+	-- execute rrdtool
+	local rrdtool = io.popen( cmdline )
+	rrdtool:close()
+end
+
+function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
+
+	-- generated graph defs
+	local defs = { }
+
+	-- internal state variables
+	local _args         = { }
+	local _sources	    = { }
+	local _stack_neg    = { }
+	local _stack_pos    = { }
+	local _longest_name = 0
+	local _has_totals   = false
+
+	-- some convenient aliases
+	local _ti	    = table.insert
+	local _sf	    = string.format
+
+	-- local helper: append a string.format() formatted string to given table
+	function _tif( list, fmt, ... )
+		table.insert( list, string.format( fmt, ... ) )
+	end
+
+	-- local helper: create definitions for min, max, avg and create *_nnl (not null) variable from avg
+	function __def(source)
+
+		local inst = source.sname
+		local rrd  = source.rrd
+		local ds   = source.ds
+
+		if not ds or ds:len() == 0 then ds = "value" end
+
+		_tif( _args, "DEF:%s_avg_raw=%s:%s:AVERAGE", inst, rrd, ds )
+		_tif( _args, "CDEF:%s_avg=%s_avg_raw,%s", inst, inst, source.transform_rpn )
+
+		if not self.opts.rrasingle then
+			_tif( _args, "DEF:%s_min_raw=%s:%s:MIN", inst, rrd, ds )
+			_tif( _args, "CDEF:%s_min=%s_min_raw,%s", inst, inst, source.transform_rpn )
+			_tif( _args, "DEF:%s_max_raw=%s:%s:MAX", inst, rrd, ds )
+			_tif( _args, "CDEF:%s_max=%s_max_raw,%s", inst, inst, source.transform_rpn )
+		end
+
+		_tif( _args, "CDEF:%s_nnl=%s_avg,UN,0,%s_avg,IF", inst, inst, inst )
+	end
+
+	-- local helper: create cdefs depending on source options like flip and overlay
+	function __cdef(source)
+
+		local prev
+
+		-- find previous source, choose stack depending on flip state
+		if source.flip then
+			prev = _stack_neg[#_stack_neg]
+		else
+			prev = _stack_pos[#_stack_pos]
+		end
+
+		-- is first source in stack or overlay source: source_stk = source_nnl
+		if not prev or source.overlay then
+			-- create cdef statement for cumulative stack (no NaNs) and also
+                        -- for display (preserving NaN where no points should be displayed)
+			_tif( _args, "CDEF:%s_stk=%s_nnl", source.sname, source.sname )
+			_tif( _args, "CDEF:%s_plot=%s_avg", source.sname, source.sname )
+
+		-- is subsequent source without overlay: source_stk = source_nnl + previous_stk
+		else
+			-- create cdef statement
+			_tif( _args, "CDEF:%s_stk=%s_nnl,%s_stk,+", source.sname, source.sname, prev )
+			_tif( _args, "CDEF:%s_plot=%s_avg,%s_stk,+", source.sname, source.sname, prev )
+		end
+
+		-- create multiply by minus one cdef if flip is enabled
+		if source.flip then
+
+			-- create cdef statement: source_stk = source_stk * -1
+			_tif( _args, "CDEF:%s_neg=%s_plot,-1,*", source.sname, source.sname )
+
+			-- push to negative stack if overlay is disabled
+			if not source.overlay then
+				_ti( _stack_neg, source.sname )
+			end
+
+		-- no flipping, push to positive stack if overlay is disabled
+		elseif not source.overlay then
+
+			-- push to positive stack
+			_ti( _stack_pos, source.sname )
+		end
+
+		-- calculate total amount of data if requested
+		if source.total then
+			_tif( _args,
+				"CDEF:%s_avg_sample=%s_avg,UN,0,%s_avg,IF,sample_len,*",
+				source.sname, source.sname, source.sname
+			)
+
+			_tif( _args,
+				"CDEF:%s_avg_sum=PREV,UN,0,PREV,IF,%s_avg_sample,+",
+				source.sname, source.sname, source.sname
+			)
+		end
+	end
+
+	-- local helper: create cdefs required for calculating total values
+	function __cdef_totals()
+		if _has_totals then
+			_tif( _args, "CDEF:mytime=%s_avg,TIME,TIME,IF", _sources[1].sname    )
+			_ti(  _args, "CDEF:sample_len_raw=mytime,PREV(mytime),-"             )
+			_ti(  _args, "CDEF:sample_len=sample_len_raw,UN,0,sample_len_raw,IF" )
+		end
+	end
+
+	-- local helper: create line and area statements
+	function __line(source)
+
+		local line_color
+		local area_color
+		local legend
+		local var
+
+		-- find colors: try source, then opts.colors; fall back to random color
+		if type(source.color) == "string" then
+			line_color = source.color
+			area_color = self.colors:from_string( line_color )
+		elseif type(opts.colors[source.name:gsub("[^%w]","_")]) == "string" then
+			line_color = opts.colors[source.name:gsub("[^%w]","_")]
+			area_color = self.colors:from_string( line_color )
+		else
+			area_color = self.colors:random()
+			line_color = self.colors:to_string( area_color )
+		end
+
+		-- derive area background color from line color
+		area_color = self.colors:to_string( self.colors:faded( area_color ) )
+
+		-- choose source_plot or source_neg variable depending on flip state
+		if source.flip then
+			var = "neg"
+		else
+			var = "plot"
+		end
+
+		-- create legend
+		legend = _sf( "%-" .. _longest_name .. "s", source.title )
+
+		-- create area if not disabled
+		if not source.noarea then
+			_tif( _args, "AREA:%s_%s#%s", source.sname, var, area_color )
+		end
+
+		-- create line1 statement
+		_tif( _args, "LINE%d:%s_%s#%s:%s",
+			source.noarea and 2 or 1,
+			source.sname, var, line_color, legend )
+	end
+
+	-- local helper: create gprint statements
+	function __gprint(source)
+
+		local numfmt = opts.number_format or "%6.1lf"
+		local totfmt = opts.totals_format or "%5.1lf%s"
+
+		-- don't include MIN if rrasingle is enabled
+		if not self.opts.rrasingle then
+			_tif( _args, "GPRINT:%s_min:MIN:\tMin\\: %s", source.sname, numfmt )
+		end
+
+		-- always include AVERAGE
+		_tif( _args, "GPRINT:%s_avg:AVERAGE:\tAvg\\: %s", source.sname, numfmt )
+
+		-- don't include MAX if rrasingle is enabled
+		if not self.opts.rrasingle then
+			_tif( _args, "GPRINT:%s_max:MAX:\tMax\\: %s", source.sname, numfmt )
+		end
+
+		-- include total count if requested else include LAST
+		if source.total then
+			_tif( _args, "GPRINT:%s_avg_sum:LAST:(ca. %s Total)\\l", source.sname, totfmt )
+		else
+			_tif( _args, "GPRINT:%s_avg:LAST:\tLast\\: %s\\l", source.sname, numfmt )
+		end
+	end
+
+
+	--
+	-- find all data sources
+	--
+
+	-- find data types
+	local data_types
+
+	if dtype then
+		data_types = { dtype }
+	else
+		data_types = opts.data.types or { }
+	end
+
+	if not ( dtype or opts.data.types ) then
+		if opts.data.instances then
+			for k, v in pairs(opts.data.instances) do
+				_ti( data_types, k )
+			end
+		elseif opts.data.sources then
+			for k, v in pairs(opts.data.sources) do
+				_ti( data_types, k )
+			end
+		end
+	end
+
+
+	-- iterate over data types
+	for i, dtype in ipairs(data_types) do
+
+		-- find instances
+
+		local data_instances
+
+		if not opts.per_instance then
+			if type(opts.data.instances) == "table" and type(opts.data.instances[dtype]) == "table" then
+				data_instances = opts.data.instances[dtype]
+			else
+				data_instances = self.tree:data_instances( plugin, plugin_instance, dtype )
+			end
+		end
+
+		if type(data_instances) ~= "table" or #data_instances == 0 then data_instances = { "" } end
+
+
+		-- iterate over data instances
+		for i, dinst in ipairs(data_instances) do
+
+			-- construct combined data type / instance name
+			local dname = dtype
+
+			if dinst:len() > 0 then
+				dname = dname .. "_" .. dinst
+			end
+
+
+			-- find sources
+			local data_sources = { "value" }
+
+			if type(opts.data.sources) == "table" then
+				if type(opts.data.sources[dname]) == "table" then
+					data_sources = opts.data.sources[dname]
+				elseif type(opts.data.sources[dtype]) == "table" then
+					data_sources = opts.data.sources[dtype]
+				end
+			end
+
+
+			-- iterate over data sources
+			for i, dsource in ipairs(data_sources) do
+
+				local dsname  = dtype .. "_" .. dinst:gsub("[^%w]","_") .. "_" .. dsource
+				local altname = dtype .. "__" .. dsource
+
+				--assert(dtype ~= "ping", dsname .. " or " .. altname)
+
+				-- find datasource options
+				local dopts = { }
+
+				if type(opts.data.options) == "table" then
+					if type(opts.data.options[dsname]) == "table" then
+						dopts = opts.data.options[dsname]
+					elseif type(opts.data.options[altname]) == "table" then
+						dopts = opts.data.options[altname]
+					elseif type(opts.data.options[dname]) == "table" then
+						dopts = opts.data.options[dname]
+					elseif type(opts.data.options[dtype]) == "table" then
+						dopts = opts.data.options[dtype]
+					end
+				end
+
+
+				-- store values
+				_ti( _sources, {
+					rrd      = dopts.rrd     or self:mkrrdpath( plugin, plugin_instance, dtype, dinst ),
+					color    = dopts.color   or self.colors:to_string( self.colors:random() ),
+					flip     = dopts.flip    or false,
+					total    = dopts.total   or false,
+					overlay  = dopts.overlay or false,
+					transform_rpn = dopts.transform_rpn or "0,+",
+					noarea   = dopts.noarea  or false,
+					title    = dopts.title   or nil,
+					ds       = dsource,
+					type     = dtype,
+					instance = dinst,
+					index    = #_sources + 1,
+					sname    = ( #_sources + 1 ) .. dtype
+				} )
+
+
+				-- generate datasource title
+				_sources[#_sources].title = self.i18n:ds( _sources[#_sources] )
+
+
+				-- find longest name ...
+				if _sources[#_sources].title:len() > _longest_name then
+					_longest_name = _sources[#_sources].title:len()
+				end
+
+
+				-- has totals?
+				if _sources[#_sources].total then
+					_has_totals = true
+				end
+			end
+		end
+	end
+
+
+	--
+	-- construct diagrams
+	--
+
+	-- if per_instance is enabled then find all instances from the first datasource in diagram
+	-- if per_instance is disabled then use an empty pseudo instance and use model provided values
+	local instances = { "" }
+
+	if opts.per_instance then
+		instances = self.tree:data_instances( plugin, plugin_instance, _sources[1].type )
+	end
+
+
+	-- iterate over instances
+	for i, instance in ipairs(instances) do
+
+		-- store title and vlabel
+		_ti( _args, "-t" )
+		_ti( _args, self.i18n:title( plugin, plugin_instance, _sources[1].type, instance, opts.title ) )
+		_ti( _args, "-v" )
+		_ti( _args, self.i18n:label( plugin, plugin_instance, _sources[1].type, instance, opts.vlabel ) )
+		if opts.y_max then
+			_ti ( _args, "-u" )
+			_ti ( _args, opts.y_max )
+		end
+		if opts.y_min then
+			_ti ( _args, "-l" )
+			_ti ( _args, opts.y_min )
+		end
+		if opts.units_exponent then
+			_ti ( _args, "-X" )
+			_ti ( _args, opts.units_exponent )
+		end
+
+		-- store additional rrd options
+		if opts.rrdopts then
+			for i, o in ipairs(opts.rrdopts) do _ti( _args, o ) end
+		end
+
+
+		-- create DEF statements for each instance
+		for i, source in ipairs(_sources) do
+			-- fixup properties for per instance mode...
+			if opts.per_instance then
+				source.instance = instance
+				source.rrd      = self:mkrrdpath( plugin, plugin_instance, source.type, instance )
+			end
+
+			__def( source )
+		end
+
+		-- create CDEF required for calculating totals
+		__cdef_totals()
+
+		-- create CDEF statements for each instance in reversed order
+		for i, source in ipairs(_sources) do
+			__cdef( _sources[1 + #_sources - i] )
+		end
+
+		-- create LINE1, AREA and GPRINT statements for each instance
+		for i, source in ipairs(_sources) do
+			__line( source )
+			__gprint( source )
+		end
+
+		-- prepend image path to arg stack
+		_ti( _args, 1, self:mkpngpath( plugin, plugin_instance, index .. instance ) )
+
+		-- push arg stack to definition list
+		_ti( defs, _args )
+
+		-- reset stacks
+		_args         = { }
+		_stack_pos    = { }
+		_stack_neg    = { }
+	end
+
+	return defs
+end
+
+function Graph.render( self, plugin, plugin_instance, is_index )
+
+	dtype_instances = dtype_instances or { "" }
+	local pngs = { }
+
+	-- check for a whole graph handler
+	local plugin_def = "luci.statistics.rrdtool.definitions." .. plugin
+	local stat, def = pcall( require, plugin_def )
+
+	if stat and def and type(def.rrdargs) == "function" then
+
+		-- temporary image matrix
+		local _images = { }
+
+		-- get diagram definitions
+		for i, opts in ipairs( self:_forcelol( def.rrdargs( self, plugin, plugin_instance, nil, is_index ) ) ) do
+			if not is_index or not opts.detail then
+				_images[i] = { }
+
+				-- get diagram definition instances
+				local diagrams = self:_generic( opts, plugin, plugin_instance, nil, i )
+
+				-- render all diagrams
+				for j, def in ipairs( diagrams ) do
+					-- remember image
+					_images[i][j] = def[1]
+
+					-- exec
+					self:_rrdtool( def )
+				end
+			end
+		end
+
+		-- remember images - XXX: fixme (will cause probs with asymmetric data)
+		for y = 1, #_images[1] do
+			for x = 1, #_images do
+				table.insert( pngs, _images[x][y] )
+			end
+		end
+	end
+
+	return pngs
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua
new file mode 100644
index 00000000..2da9f5a0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua
@@ -0,0 +1,73 @@
+--[[
+
+Luci statistics - diagram color helper class
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool.colors", package.seeall)
+
+require("luci.util")
+
+
+Instance = luci.util.class()
+
+function Instance.from_string( self, s )
+	return {
+		tonumber(s:sub(1,2), 16),
+		tonumber(s:sub(3,4), 16),
+		tonumber(s:sub(5,6), 16)
+	}
+end
+
+function Instance.to_string( self, c )
+	return string.format(
+		"%02x%02x%02x",
+		math.floor(c[1]),
+		math.floor(c[2]),
+		math.floor(c[3])
+	)
+end
+
+function Instance.random( self )
+	local r   = math.random(255)
+	local g   = math.random(255)
+	local min = 0
+	local max = 255
+
+	if ( r + g ) < 255 then
+		min = 255 - r - g
+	else
+		max = 511 - r - g
+	end
+
+	local b = min + math.floor( math.random() * ( max - min ) )
+
+	return { r, g, b }
+end
+
+function Instance.faded( self, fg, opts )
+	opts = opts or {}
+	opts.background = opts.background or { 255, 255, 255 }
+	opts.alpha      = opts.alpha      or 0.25
+
+	if type(opts.background) == "string" then
+		opts.background = _string_to_color(opts.background)
+	end
+
+	local bg = opts.background
+
+	return {
+		( opts.alpha * fg[1] ) + ( ( 1.0 - opts.alpha ) * bg[1] ),
+		( opts.alpha * fg[2] ) + ( ( 1.0 - opts.alpha ) * bg[2] ),
+		( opts.alpha * fg[3] ) + ( ( 1.0 - opts.alpha ) * bg[3] )
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
new file mode 100644
index 00000000..0da546c0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
@@ -0,0 +1,35 @@
+--[[
+
+Luci statistics - conntrack plugin diagram definition
+(c) 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.conntrack",package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+	return {
+		title = "%H: Conntrack entries",
+		vlabel = "Count",
+		number_format = "%5.0lf",
+		data = {
+			sources = {
+				conntrack = { "value" }
+			},
+			options = {
+				conntrack = { 
+					color = "0000ff",
+					title = "Tracked connections"
+				}
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
new file mode 100644
index 00000000..c0e86245
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
@@ -0,0 +1,42 @@
+--[[
+
+Luci statistics - cpu plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: cpu.lua 2274 2008-06-03 23:15:16Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.cpu",package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		title = "%H: Processor usage on core #%pi",
+		y_min = "0",
+		vlabel = "Percent",
+		number_format = "%5.1lf%%",
+		data = {
+			instances = { 
+				cpu = { "idle", "user", "system", "nice" }
+			},
+
+			options = {
+				cpu_idle      = { color = "ffffff" },
+				cpu_nice      = { color = "00e000" },
+				cpu_user      = { color = "0000ff" },
+				cpu_wait      = { color = "ffb000" },
+				cpu_system    = { color = "ff0000" },
+				cpu_softirq   = { color = "ff00ff" },
+				cpu_interrupt = { color = "a000a0" },
+				cpu_steal     = { color = "000000" }
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df.lua
new file mode 100644
index 00000000..fa206bad
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df.lua
@@ -0,0 +1,46 @@
+--[[
+
+Luci statistics - df plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: df.lua 2274 2008-06-03 23:15:16Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.df", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		title = "%H: Disk space usage on %di",
+		vlabel = "Bytes",
+		per_instance  = true,
+		number_format = "%5.1lf%sB",
+
+		data = {
+			sources = {
+				df = { "free", "used" }
+			},
+
+			options = {
+				df__free = {
+					color = "00ff00",
+					overlay = false,
+					title = "free"
+				},
+
+				df__used = {
+					color = "ff0000",
+					overlay = false,
+					title = "used"
+				}
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/disk.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
new file mode 100644
index 00000000..ebc37ef3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
@@ -0,0 +1,74 @@
+--[[
+
+Luci statistics - df plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: df.lua 2274 2008-06-03 23:15:16Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.disk", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+	return {
+		{
+			title = "%H: Disk I/O operations on %pi",
+			vlabel = "Operations/s",
+			number_format = "%5.1lf%sOp/s",
+
+			data = {
+				types = { "disk_ops" },
+				sources = {
+					disk_ops = { "read", "write" },
+				},
+
+				options = {
+					disk_ops__read = {
+						title = "Reads",
+						color = "00ff00",
+						flip  = false
+					},
+
+					disk_ops__write = {
+						title = "Writes",
+						color = "ff0000",
+						flip  = true
+					}
+				}
+			}
+		},
+
+		{
+			title = "%H: Disk I/O bandwidth on %pi",
+			vlabel = "Bytes/s",
+			number_format = "%5.1lf%sB/s",
+
+			detail = true,
+
+			data = {
+				types = { "disk_octets" },
+				sources = {
+					disk_octets = { "read", "write" }
+				},
+				options = {
+					disk_octets__read = {
+						title = "Read",
+						color = "00ff00",
+						flip  = false
+					},
+					disk_octets__write = {
+						title = "Write",
+						color = "ff0000",
+						flip  = true
+					}
+				}
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/dns.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/dns.lua
new file mode 100644
index 00000000..94a148d8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/dns.lua
@@ -0,0 +1,81 @@
+--[[
+
+Luci statistics - dns plugin diagram definition
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+module("luci.statistics.rrdtool.definitions.dns", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance )
+
+	local traffic = {
+		title = "%H: DNS traffic", vlabel = "Bit/s",
+
+		data = {
+			sources = {
+				dns_octets = { "queries", "responses" }
+			},
+
+			options = {
+				dns_octets__responses = {
+					total = true,
+					color = "00ff00",
+					title = "Responses"
+				},
+
+				dns_octets__queries = {
+					total = true,
+					color = "0000ff",
+					title = "Queries"
+				}
+			}
+		}
+	}
+
+	local opcode_query = {
+		title = "%H: DNS Opcode Query", vlabel = "Queries/s",
+		data = {
+			instances = { dns_opcode = { "Query" } },
+			options = {
+				dns_opcode_Query_value = {
+					total = true,
+					color = "0000ff",
+					title = "Queries/s"
+				},
+			}
+		}
+	}
+
+	local qtype = {
+		title = "%H: DNS QType", vlabel = "Queries/s",
+		data = {
+			sources = { dns_qtype = { "" } },
+			options = {
+				dns_qtype_AAAA_	= { title = "AAAA", noarea = true, total = true },
+				dns_qtype_A_	= { title = "A", noarea = true, total = true },
+				dns_qtype_A6_	= { title = "A6", noarea = true, total = true },
+				dns_qtype_TXT_	= { title = "TXT", noarea = true, total = true },
+				dns_qtype_MX_	= { title = "MX", noarea = true, total = true },
+				dns_qtype_NS_	= { title = "NS", noarea = true, total = true },
+				dns_qtype_ANY_	= { title = "ANY", noarea = true, total = true },
+				dns_qtype_CNAME_= { title = "CNAME", noarea = true, total = true },
+				dns_qtype_SOA_	= { title = "SOA", noarea = true, total = true },
+				dns_qtype_SRV_	= { title = "SRV", noarea = true, total = true },
+				dns_qtype_PTR_	= { title = "PTR", noarea = true, total = true },
+				dns_qtype_RP_	= { title = "RP", noarea = true, total = true },
+				dns_qtype_MAILB_= { title = "MAILB", noarea = true, total = true },
+				dns_qtype_IXFR_	= { title = "IXFR", noarea = true, total = true },
+				dns_qtype_HINFO_= { title = "HINFO", noarea = true, total = true },
+			},
+		}
+	}
+				
+	return { traffic, opcode_query, qtype }
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
new file mode 100644
index 00000000..a6f3b5c6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
@@ -0,0 +1,117 @@
+--[[
+
+Luci statistics - interface plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.interface", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance )
+
+	--
+	-- traffic diagram
+	--
+	local traffic = {
+
+		-- draw this diagram for each plugin instance
+		per_instance = true,
+		title = "%H: Transfer on %pi",
+		vlabel = "Bytes/s",
+
+		-- diagram data description
+		data = {
+			-- defined sources for data types, if ommitted assume a single DS named "value" (optional)
+			sources = {
+				if_octets = { "tx", "rx" }
+			},
+
+			-- special options for single data lines
+			options = {
+				if_octets__tx = {
+					total = true,		-- report total amount of bytes
+					color = "00ff00",	-- tx is green
+					title = "Bytes (TX)"
+				},
+
+				if_octets__rx = {
+					flip  = true,		-- flip rx line
+					total = true,		-- report total amount of bytes
+					color = "0000ff",	-- rx is blue
+					title = "Bytes (RX)"
+				}
+			}
+		}
+	}
+
+
+	--
+	-- packet diagram
+	--
+	local packets = {
+
+		-- draw this diagram for each plugin instance
+		per_instance = true,
+		title = "%H: Packets on %pi",
+		vlabel = "Packets/s",
+
+		-- diagram data description
+		data = {
+			-- data type order
+			types = { "if_packets", "if_errors" },
+
+			-- defined sources for data types
+			sources = {
+				if_packets = { "tx", "rx" },
+				if_errors  = { "tx", "rx" }
+			},
+
+			-- special options for single data lines
+			options = {
+				-- processed packets (tx DS)
+				if_packets__tx = {
+					overlay = true,		-- don't summarize
+					total   = true,		-- report total amount of bytes
+					color   = "00ff00",	-- processed tx is green
+					title	= "Processed (tx)"
+				},
+
+				-- processed packets (rx DS)
+				if_packets__rx = {
+					overlay = true,		-- don't summarize
+					flip    = true,		-- flip rx line
+					total   = true,		-- report total amount of bytes
+					color   = "0000ff",	-- processed rx is blue
+					title	= "Processed (rx)"
+				},
+
+				-- packet errors (tx DS)
+				if_errors__tx = {
+					overlay = true,		-- don't summarize
+					total   = true,		-- report total amount of packets
+					color   = "ff5500",	-- tx errors are orange
+					title	= "Errors (tx)"
+				},
+
+				-- packet errors (rx DS)
+				if_errors__rx = {
+					overlay = true,		-- don't summarize
+					flip    = true,		-- flip rx line
+					total   = true,		-- report total amount of packets
+					color   = "ff0000",	-- rx errors are red
+					title	= "Errors (rx)"
+				}
+			}
+		}
+	}
+
+	return { traffic, packets }
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
new file mode 100644
index 00000000..c1adbdc6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
@@ -0,0 +1,53 @@
+--[[
+
+Luci statistics - iptables plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: ipt_bytes.lua 2276 2008-06-03 23:18:37Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.iptables", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		{
+			title = "%H: Firewall: Processed bytes in %pi",
+			vlabel = "Bytes/s",
+			number_format = "%5.0lf%sB/s",
+			totals_format = "%5.0lf%sB",
+			data = { 
+				types = { "ipt_bytes" },
+				options = {
+					ipt_bytes = {
+						total = true,
+						title = "%di"
+					}
+				}
+			}
+		},
+
+		{
+			title = "%H: Firewall: Processed packets in %pi",
+			vlabel = "Packets/s",
+			number_format = "%5.1lf P/s",
+			totals_format = "%5.0lf%s",
+			data = {
+				types = { "ipt_packets" },
+				options = {
+					ipt_packets = {
+						total = true,
+						title = "%di"
+					}
+				}
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
new file mode 100644
index 00000000..aabe14a0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq.lua
@@ -0,0 +1,30 @@
+--[[
+
+Luci statistics - irq plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: irq.lua 2276 2008-06-03 23:18:37Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.irq", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		title = "%H: Interrupts", vlabel = "Issues/s",
+		number_format = "%5.0lf", data = {
+			types = { "irq" },
+			options = {
+				irq = { title = "IRQ %di", noarea = true }
+			}
+		}
+	}
+
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
new file mode 100644
index 00000000..0c6eed99
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua
@@ -0,0 +1,102 @@
+--[[
+
+Luci statistics - wireless plugin diagram definition
+(c) 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.iwinfo", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance )
+
+	--
+	-- signal/noise diagram
+	--
+	local snr = {
+		title = "%H: Signal and noise on %pi",
+		vlabel = "dBm",
+		number_format = "%5.1lf dBm",
+		data = {
+			types = { "signal_noise", "signal_power" },
+			options = {
+				signal_power = {
+					title  = "Signal",
+					overlay = true,
+					color   = "0000ff"
+				},
+				signal_noise = {
+					title   = "Noise",
+					overlay = true,
+					color   = "ff0000"
+				}
+			}
+		}
+	}
+
+
+	--
+	-- signal quality diagram
+	--
+	local quality = {
+		title = "%H: Signal quality on %pi",
+		vlabel = "Quality",
+		number_format = "%3.0lf",
+		data = {
+			types = { "signal_quality" },
+			options = {
+				signal_quality = {
+					title  = "Quality",
+					noarea = true,
+					color  = "0000ff"
+				}
+			}
+		}
+	}
+
+
+	--
+	-- phy rate diagram
+	--
+	local bitrate = {
+		title = "%H: Average phy rate on %pi",
+		vlabel = "MBit/s",
+		number_format = "%5.1lf%sBit/s",
+		data = {
+			types = { "bitrate" },
+			options = {
+				bitrate = {
+					title = "Rate",
+					color = "00ff00"
+				}
+			}
+		}
+	}
+
+	--
+	-- associated stations
+	--
+	local stations = {
+		title = "%H: Associated stations on %pi",
+		vlabel = "Stations",
+		number_format = "%3.0lf",
+		data = {
+			types = { "stations" },
+			options = {
+				stations = {
+					title = "Stations",
+					color = "0000ff"
+				}
+			}
+		}
+	}
+
+	return { snr, quality, bitrate, stations }
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load.lua
new file mode 100644
index 00000000..4cb4795e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load.lua
@@ -0,0 +1,36 @@
+--[[
+
+Luci statistics - load plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: load.lua 2329 2008-06-08 21:51:55Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.load", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		title = "%H: Load", vlabel = "Load",
+		y_min = "0",
+		units_exponent = "0",
+		number_format = "%5.2lf", data = {
+			sources = {
+				load = { "shortterm", "midterm", "longterm" }
+			},
+
+			options = {
+				load__shortterm = { color = "ff0000", title = "1 minute", noarea = true },
+				load__midterm   = { color = "ff6600", title = "5 minutes", noarea = true },
+				load__longterm  = { color = "ffaa00", title = "15 minutes", noarea = true }
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
new file mode 100644
index 00000000..a1c65f56
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
@@ -0,0 +1,33 @@
+--[[
+
+(c) 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+module("luci.statistics.rrdtool.definitions.memory",package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		title = "%H: Memory usage",
+		vlabel = "MB",
+		number_format = "%5.1lf%s",
+		data = {
+			instances = { 
+				memory = { "free", "buffered", "cached", "used" }
+			},
+
+			options = {
+				memory_buffered	= { color = "0000ff", title = "Buffered" },
+				memory_cached	= { color = "ff00ff", title = "Cached" },
+				memory_used	= { color = "ff0000", title = "Used" },
+				memory_free	= { color = "00ff00", title = "Free" }
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
new file mode 100644
index 00000000..93139525
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
@@ -0,0 +1,203 @@
+--[[
+
+Luci statistics - netlink plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.netlink", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance )
+
+	--
+	-- traffic diagram
+	--
+	local traffic = {
+		title = "%H: Netlink - Transfer on %pi",
+		vlabel = "Bytes/s",
+
+		-- diagram data description
+		data = {
+			-- defined sources for data types, if ommitted assume a single DS named "value" (optional)
+			sources = {
+				if_octets = { "tx", "rx" }
+			},
+
+			-- special options for single data lines
+			options = {
+				if_octets__tx = {
+					total = true,		-- report total amount of bytes
+					color = "00ff00"	-- tx is green
+				},
+
+				if_octets__rx = {
+					flip  = true,		-- flip rx line
+					total = true,		-- report total amount of bytes
+					color = "0000ff"	-- rx is blue
+				}
+			}
+		}
+	}
+
+
+	--
+	-- packet diagram
+	--
+	local packets = {
+		title = "%H: Netlink - Packets on %pi",
+		vlabel = "Packets/s", detail = true,
+
+		-- diagram data description
+		data = {
+			-- data type order
+			types = { "if_packets", "if_dropped", "if_errors" },
+
+			-- defined sources for data types
+			sources = {
+				if_packets = { "tx", "rx" },
+				if_dropped = { "tx", "rx" },
+				if_errors  = { "tx", "rx" }
+			},
+
+			-- special options for single data lines
+			options = {
+				-- processed packets (tx DS)
+				if_packets__tx = {
+					overlay = true,		-- don't summarize
+					total   = true,		-- report total amount of bytes
+					color   = "00ff00"	-- processed tx is green
+				},
+
+				-- processed packets (rx DS)
+				if_packets__rx = {
+					overlay = true,		-- don't summarize
+					flip    = true,		-- flip rx line
+					total   = true,		-- report total amount of bytes
+					color   = "0000ff"	-- processed rx is blue
+				},
+
+				-- dropped packets (tx DS)
+				if_dropped__tx = {
+					overlay = true,		-- don't summarize
+					total   = true,		-- report total amount of bytes
+					color   = "660055"	-- dropped tx is ... dunno ;)
+				},
+
+				-- dropped packets (rx DS)
+				if_dropped__rx = {
+					overlay = true,		-- don't summarize
+					flip    = true,		-- flip rx line
+					total   = true,		-- report total amount of bytes
+					color   = "440066"	-- dropped rx is violett
+				},
+
+				-- packet errors (tx DS)
+				if_errors__tx = {
+					overlay = true,		-- don't summarize
+					total   = true,		-- report total amount of packets
+					color   = "ff5500"	-- tx errors are orange
+				},
+
+				-- packet errors (rx DS)
+				if_errors__rx = {
+					overlay = true,		-- don't summarize
+					flip    = true,		-- flip rx line
+					total   = true,		-- report total amount of packets
+					color   = "ff0000"	-- rx errors are red
+				}
+			}
+		}
+	}
+
+
+	--
+	-- multicast diagram
+	--
+	local multicast = {
+		title = "%H: Netlink - Multicast on %pi",
+		vlabel = "Packets/s", detail = true,
+
+		-- diagram data description
+		data = {
+			-- data type order
+			types = { "if_multicast" },
+
+			-- special options for single data lines
+			options = {
+				-- multicast packets
+				if_multicast = {
+					total = true,		-- report total amount of packets
+					color = "0000ff"	-- multicast is blue
+				}
+			}
+		}
+	}
+
+
+	--
+	-- collision diagram
+	--
+	local collisions = {
+		title = "%H: Netlink - Collisions on %pi",
+		vlabel = "Collisions/s", detail = true,
+
+		-- diagram data description
+		data = {
+			-- data type order
+			types = { "if_collisions" },
+
+			-- special options for single data lines
+			options = {
+				-- collision rate
+				if_collisions = {
+					total = true,		-- report total amount of packets
+					color = "ff0000"	-- collsions are red
+				}
+			}
+		}
+	}
+
+
+	--
+	-- error diagram
+	--
+	local errors = {
+		title = "%H: Netlink - Errors on %pi",
+		vlabel = "Errors/s", detail = true,
+
+		-- diagram data description
+		data = {
+			-- data type order
+			types = { "if_tx_errors", "if_rx_errors" },
+
+			-- data type instances
+			instances = {
+				if_tx_errors = { "aborted", "carrier", "fifo", "heartbeat", "window" },
+				if_rx_errors = { "length", "missed", "over", "crc", "fifo", "frame" }
+			},
+
+			-- special options for single data lines
+			options = {	-- XXX: fixme (define colors...)
+				if_tx_errors = {
+					total = true
+				},
+
+				if_rx_errors = {
+					flip  = true,
+					total = true
+				}
+			}
+		}
+	}
+
+
+	return { traffic, packets, multicast, collisions, errors }
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
new file mode 100644
index 00000000..69f1ae30
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
@@ -0,0 +1,106 @@
+--[[
+
+Luci statistics - ups plugin diagram definition
+Copyright © 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright © 2012 David Woodhouse <dwmw2@infradead.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+
+module("luci.statistics.rrdtool.definitions.nut",package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	local voltages = {
+		title = "%H: Voltages on UPS \"%pi\"",
+		vlabel = "V",
+		number_format = "%5.1lfV",
+		data = {
+			instances = {
+				voltage = { "battery", "input", "output" }
+			},
+
+			options = {
+				voltage_output  = { color = "00e000", title = "Output voltage", noarea=true, overlay=true },
+				voltage_battery = { color = "0000ff", title = "Battery voltage", noarea=true, overlay=true },
+				voltage_input   = { color = "ffb000", title = "Input voltage", noarea=true, overlay=true }
+			}
+		}
+	}
+
+	local currents = {
+		title = "%H: Current on UPS \"%pi\"",
+		vlabel = "A",
+		number_format = "%5.3lfA",
+		data = {
+			instances = {
+				current = { "battery", "output" }
+			},
+
+			options = {
+				current_output  = { color = "00e000", title = "Output current", noarea=true, overlay=true },
+				current_battery = { color = "0000ff", title = "Battery current", noarea=true, overlay=true },
+			}
+		}
+	}
+
+	local percentage = {
+		title = "%H: Battery charge on UPS \"%pi\"",
+		vlabel = "Percent",
+		y_min = "0",
+		y_max = "100",
+		number_format = "%5.1lf%%",
+		data = {
+		        sources = {
+				percent = { "percent" }
+			},
+			instances = {
+				percent = "charge"
+			},
+			options = {
+				percent_charge = { color = "00ff00", title = "Charge level"  }
+			}
+		}
+	}
+
+	-- Note: This is in ISO8859-1 for rrdtool. Welcome to the 20th century.
+	local temperature = {
+		title = "%H: Battery temperature on UPS \"%pi\"",
+		vlabel = "\176C",
+		number_format = "%5.1lf\176C",
+		data = {
+			instances = {
+				temperature = "battery"
+			},
+
+			options = {
+				temperature_battery = { color = "ffb000", title = "Battery temperature" }
+			}
+		}
+	}
+
+	local timeleft = {
+		title = "%H: Time left on UPS \"%pi\"",
+		vlabel = "Minutes",
+		number_format = "%.1lfm",
+		data = {
+			sources = {
+				timeleft = { "timeleft" }
+			},
+			instances = {
+				timeleft = { "battery" }
+			},
+			options = {
+				timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/" }
+			}
+		}
+	}
+
+	return { voltages, currents, percentage, temperature, timeleft }
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
new file mode 100644
index 00000000..3ca2f03e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
@@ -0,0 +1,146 @@
+--[[
+
+Luci statistics - olsrd plugin diagram definition
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+module("luci.statistics.rrdtool.definitions.olsrd", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+	local g = { }
+
+	if plugin_instance == "routes" then
+
+		g[#g+1] = {
+	                -- diagram data description
+			title = "%H: Total amount of OLSR routes", vlabel = "n",
+			number_format = "%5.0lf", data = {
+                        	types = { "routes" },
+				options = {
+					routes = {
+						color = "ff0000",
+						title = "Total number of routes"
+					}
+				}
+	                }
+        	}
+
+		g[#g+1] = {
+			title = "%H: Average route ETX", vlabel = "ETX", detail = true,
+			number_format = "%5.1lf",data = {
+				instances = { "average" }, -- falls es irgendwann mal welche pro ip gibt, wie bei links, dann werden die hier excludiert
+				types = { "route_etx" },
+				options = {
+					route_etx = {
+						title = "Average route ETX"
+					}
+				}
+			}
+		}
+
+		g[#g+1] = {
+			title = "%H: Average route metric", vlabel = "metric", detail = true,
+			number_format = "%5.1lf", data = {
+				instances = { "average" }, -- falls es irgendwann mal welche pro ip gibt, wie bei links, dann werden die hier excludiert
+				types = { "route_metric" },
+				options = {
+					route_metric = {
+						title = "Average route metric"
+					}
+				}
+			}
+		}
+
+	elseif plugin_instance == "links" then
+
+		g[#g+1] = {
+			-- diagram data description
+			title = "%H: Total amount of OLSR neighbours", vlabel = "n",
+			number_format = "%5.0lf", data = {
+				instances = { "" },
+				types = { "links" },
+				options = {
+					links = {
+						color = "00ff00",
+						title = "Number of neighbours"
+					}
+				}
+			}
+		}
+
+		local instances = graph.tree:data_instances(plugin, plugin_instance, "signal_quality")
+		table.sort(instances)
+
+		-- define one diagram per host, containing the rx and lq values
+		local i
+		for i = 1, #instances, 2 do
+			local dsn1 = "signal_quality_%s_value" % instances[i]:gsub("[^%w]+", "_")
+			local dsn2 = "signal_quality_%s_value" % instances[i+1]:gsub("[^%w]+", "_")
+			local host = instances[i]:match("^[^%-]+%-([^%-]+)%-.+")
+
+			g[#g+1] = {
+				title = "%H: Signal Quality" .. " (" .. (host or "avg") ..")", vlabel = "ETX",
+				number_format = "%5.2lf", detail = true,
+				data = {
+					types = { "signal_quality" },
+	
+					instances = {
+						signal_quality = { instances[i], instances[i+1] },
+					},
+
+					options = {
+						[dsn1] = {
+							color = "00ff00",
+							title = "LQ (%s)" % (host or "avg"),
+						},
+						[dsn2] = {
+							color = "0000ff",
+							title = "NLQ (%s)" % (host or "avg"),
+							flip  = true
+						}
+					}
+				}
+			}
+		end
+
+	elseif plugin_instance == "topology" then
+
+		g[#g+1] = {
+			title= "%H: Total amount of OLSR links", vlabel = "n",
+			number_format = "%5.0lf", data = {
+				instances = { "" },
+	                        types = { "links" },
+				options = {
+					links = {
+						color = "0000ff",
+						title = "Total number of links"
+					}
+				}
+			}
+	        }
+
+		g[#g+1] = {
+			title= "%H: Average signal quality", vlabel = "n",
+			number_format = "%5.2lf", detail = true,
+			data = {
+				instances = { "average" }, -- exclude possible per-ip stuff
+				types = { "signal_quality" },
+				options = {
+					signal_quality = {
+						color = "0000ff",
+						title = "Average signal quality"
+					}
+				}
+			}
+		}
+	end
+
+	return g
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
new file mode 100644
index 00000000..bdffc859
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -0,0 +1,41 @@
+--[[
+
+Luci statistics - ping plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: ping.lua 6810 2011-01-29 03:33:48Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.ping", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+	return {
+		-- Ping roundtrip time
+		{ title = "%H: ICMP Round Trip Time", vlabel = "ms",
+		  number_format = "%5.1lf ms", data = {
+			sources = { ping = { "value" } },
+			options = { ping__ping = { noarea = true, title = "%di" } }
+		} },
+
+		-- Ping droprate
+		{ title = "%H: ICMP Drop Rate", vlabel = "%",
+		  number_format = "%5.2lf %%", data = {
+			types   = { "ping_droprate" },
+			options = { ping_droprate = { title = "%di" } }
+		} },
+
+		-- Ping standard deviation
+		{ title = "%H: ICMP Standard Deviation", vlabel = "ms",
+		  number_format = "%5.2lf ms", data = {
+			types   = { "ping_stddev" },
+			options = { ping_stddev = { title = "%di" } }
+		} },
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
new file mode 100644
index 00000000..6f83c8e2
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
@@ -0,0 +1,110 @@
+--[[
+
+Luci statistics - processes plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.processes", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		{
+			title = "%H: Processes",
+			vlabel = "Processes/s",
+			data = {
+				instances = {
+					ps_state = {
+						"sleeping", "running", "paging", "blocked", "stopped", "zombies"
+					}
+				},
+
+				options = {
+					ps_state_sleeping = { color = "0000ff" },
+					ps_state_running  = { color = "008000" },
+					ps_state_paging   = { color = "ffff00" },
+					ps_state_blocked  = { color = "ff5000" },
+					ps_state_stopped  = { color = "555555" },
+					ps_state_zombies  = { color = "ff0000" }
+				}
+			}
+		},
+
+		{
+			title = "%H: CPU time used by %pi",
+			vlabel = "Jiffies",
+			data = {
+				sources = {
+					ps_cputime = { "syst", "user" }
+				},
+
+				options = {
+					ps_cputime__user = {
+						color   = "0000ff",
+						overlay = true
+					},
+
+					ps_cputime__syst = {
+						color   = "ff0000",
+						overlay = true
+					}
+				}
+			}
+		},
+
+		{
+			title = "%H: Threads and processes belonging to %pi",
+			vlabel = "Count",
+			detail = true,
+			data = {
+				sources = {
+					ps_count = { "threads", "processes" }
+				},
+
+				options = {
+					ps_count__threads   = { color = "00ff00" },
+					ps_count__processes = { color = "0000bb" }
+				}
+			}
+		},
+
+		{
+			title = "%H: Page faults in %pi",
+			vlabel = "Pagefaults",
+			detail = true,
+			data = {
+				sources = {
+					ps_pagefaults = { "minflt", "majflt" }
+				},
+
+				options = {
+					ps_pagefaults__minflt = { color = "ff0000" },
+					ps_pagefaults__majflt = { color = "ff5500" }
+				}
+			}
+		},
+
+		{
+			title = "%H: Virtual memory size of %pi",
+			vlabel = "Bytes",
+			detail = true,
+			number_format = "%5.1lf%sB",
+			data = {
+				types = { "ps_rss" },
+
+				options = {
+					ps_rss = { color = "0000ff" }
+				}
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
new file mode 100644
index 00000000..69f3c113
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
@@ -0,0 +1,37 @@
+--[[
+    
+Luci statistics - splash_leases plugin diagram definition
+(c) 2013 Freifunk Augsburg / Michael Wendland <michael@michiwend.com>
+                                     
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at             
+                       
+    http://www.apache.org/licenses/LICENSE-2.0
+                          
+
+]]--
+    
+module("luci.statistics.rrdtool.definitions.splash_leases", package.seeall)
+                                       
+function rrdargs( graph, plugin, plugin_instance, dtype )
+                             
+    return {
+        title = "%H: Splash Leases",
+        vlabel = "Active Clients",  
+        y_min = "0",          
+        number_format = "%5.1lf",
+        data = {         
+            sources = {
+                splash_leases = { "leased", "whitelisted", "blacklisted" }
+            },                                
+              
+            options = {
+                splash_leases__leased      = { color = "00CC00", title = "Leased",      overlay = false },
+                splash_leases__whitelisted = { color = "0000FF", title = "Whitelisted", overlay = false },
+                splash_leases__blacklisted = { color = "FF0000", title = "Blacklisted", overlay = false } 
+            }                                                 
+        }    
+    }
+
+end 
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
new file mode 100644
index 00000000..4f1c221f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
@@ -0,0 +1,37 @@
+--[[
+
+Luci statistics - tcpconns plugin diagram definition
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: tcp_connections.lua 2274 2008-06-03 23:15:16Z jow $
+
+]]--
+
+module("luci.statistics.rrdtool.definitions.tcpconns", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+	return {
+		title = "%H: TCP connections to port %pi",
+		vlabel = "Connections/s",
+		number_format = "%5.0lf",
+		data = {
+			types = { "tcp_connections" },
+			instances = {
+				tcp_connections = {
+			                "SYN_SENT", "SYN_RECV", "LISTEN", "ESTABLISHED",
+					"LAST_ACK", "TIME_WAIT", "CLOSING", "CLOSE_WAIT",
+					"CLOSED", "FIN_WAIT1", "FIN_WAIT2"
+				},
+				options = {
+					load__ESTABLISHED = { title = "%di", noarea = true }
+				}
+			}
+		}
+	}
+end
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
new file mode 100644
index 00000000..077ec57e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
@@ -0,0 +1,27 @@
+--[[
+
+Copyright 2013 Thomas Endt <tmo26@gmx.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+module("luci.statistics.rrdtool.definitions.uptime", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+        return {
+                title = "%H: Uptime", vlabel = "seconds",
+                number_format = "%5.0lf%s", data = {
+                        types = { "uptime" },
+                        options = {
+                                uptime = { title = "Uptime %di", noarea = true }
+                        }
+                }
+        }
+
+end
+
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm b/trunk/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
new file mode 100644
index 00000000..25157da4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
@@ -0,0 +1,22 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+
+<h2><a id="content" name="content"><%:Statistics%></a></h2>
+
+<p><%_The statistics package is based on <a href="http://collectd.org/index.shtml">Collectd</a>
+and uses <a href="http://oss.oetiker.ch/rrdtool/">RRD Tool</a> to render diagram images from collected data.%></p>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm b/trunk/package/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
new file mode 100644
index 00000000..8a8256bb
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
@@ -0,0 +1,48 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+
+<h2><a id="content" name="content"><%:Statistics%></a></h2>
+
+<form action="" method="get">
+	<select name="host">
+		<% for i, host in ipairs(hosts) do %>
+			<option<% if host == current_host then %> selected="selected"<% end %>><%=pcdata(host)%></option>
+		<% end %>
+	</select>
+	<input class="cbi-button cbi-button-apply" type="submit" name="submit" value="<%:Display Host »%>" />
+	<select name="timespan">
+		<% for i, span in ipairs(timespans) do %>
+			<option<% if span == current_timespan then %> selected="selected"<% end %>><%=span%></option>
+		<% end %>
+	</select>
+	<input class="cbi-button cbi-button-apply" type="submit" name="submit" value="<%:Display timespan »%>" />
+</form>
+
+<br />
+<hr />
+<br />
+
+<div style="text-align: center">
+	<% for i, img in ipairs(images) do %>
+		<% if is_index then %><a href="<%=pcdata(images[img])%>"><% end %>
+		<img src="<%=REQUEST_URI%>?img=<%=img%>&#38;host=<%=current_host%>" />
+		<% if is_index then %></a><% end %>
+		<br />
+	<% end %>
+</div>
+
+<%+footer%>
+
diff --git a/trunk/package/luci/applications/luci-statistics/root/etc/config/luci_statistics b/trunk/package/luci/applications/luci-statistics/root/etc/config/luci_statistics
new file mode 100644
index 00000000..e39db351
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/root/etc/config/luci_statistics
@@ -0,0 +1,143 @@
+config 'statistics' 'rrdtool'
+        option 'default_timespan' '1hour'
+        option 'image_width' '600'
+        option 'image_path' '/tmp/rrdimg'
+
+config 'statistics' 'collectd'
+	option 'BaseDir' '/var/run/collectd'
+	option 'Include' '/etc/collectd/conf.d'
+	option 'PIDFile' '/var/run/collectd.pid'
+	option 'PluginDir' '/usr/lib/collectd'
+	option 'TypesDB' '/usr/share/collectd/types.db'
+	option 'Interval' '30'
+	option 'ReadThreads' '2'
+
+config 'statistics' 'collectd_ping'
+	option 'enable' '0'
+	option 'TTL' '127'
+	option 'Interval' '30'
+	option 'Hosts' '127.0.0.1'
+
+config 'statistics' 'collectd_csv'
+	option 'enable' '0'
+	option 'StoreRates' '0'
+	option 'DataDir' '/tmp'
+
+config 'statistics' 'collectd_df'
+	option 'enable' '0'
+	option 'Devices' '/dev/mtdblock/4'
+	option 'MountPoints' '/jffs'
+	option 'FSTypes' 'tmpfs'
+	option 'IgnoreSelected' '0'
+
+config 'statistics' 'collectd_disk'
+	option 'enable' '0'
+	option 'Disks' 'hda1 hdb'
+	option 'IgnoreSelected' '0'
+
+config 'statistics' 'collectd_dns'
+	option 'enable' '0'
+	option 'Interfaces' 'ffdhcp ff br-lan'
+	option 'IgnoreSources' '127.0.0.1'
+
+config 'statistics' 'collectd_email'
+	option 'enable' '0'
+	option 'SocketFile' '/var/run/collectd/email.sock'
+	option 'SocketGroup' 'nogroup'
+
+config 'statistics' 'collectd_exec'
+	option 'enable' '0'
+
+config 'statistics' 'collectd_interface'
+	option 'enable' '1'
+	option 'Interfaces' 'br-lan br-ff'
+	option 'IgnoreSelected' '0'
+
+config 'statistics' 'collectd_iptables'
+	option 'enable' '1'
+
+config 'collectd_iptables_match'
+	option 'table' 'nat'
+	option 'chain' 'luci_fw_postrouting'
+	option 'target' 'MASQUERADE'
+	option 'source' '192.168.1.0/24'
+	option 'outputif' 'br-ff'
+	option 'name' 'Verkehr LAN-Clients'
+
+config 'collectd_iptables_match'
+	option 'chain' 'luci_fw_postrouting'
+	option 'table' 'nat'
+	option 'target' 'MASQUERADE'
+	option 'source' '10.61.230.0/24'
+	option 'outputif' 'br-ff'
+	option 'name' 'Verkehr WLAN-Clients'
+
+config 'statistics' 'collectd_irq'
+	option 'enable' '0'
+	option 'Irqs' '2 3 4 7'
+
+config 'statistics' 'collectd_load'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_logfile'
+	option 'enable' '0'
+	option 'LogLevel' 'notice'
+	option 'File' '/var/log/collectd.log'
+	option 'Timestamp' '1'
+
+config 'statistics' 'collectd_netlink'
+	option 'enable' '0'
+	option 'IgnoreSelected' '0'
+	option 'VerboseInterfaces' 'br-lan br-ff'
+	option 'QDiscs' 'br-lan br-ff'
+
+config 'statistics' 'collectd_network'
+	option 'enable' '0'
+
+config 'statistics' 'collectd_processes'
+	option 'enable' '1'
+	option 'Processes' 'uhttpd dnsmasq dropbear'
+
+config statistics 'collectd_splash_leases'              
+        option enable '1' 
+
+config 'statistics' 'collectd_tcpconns'
+	option 'enable' '1'
+	option 'ListeningPorts' '0'
+	option 'LocalPorts' '22 80'
+
+config 'statistics' 'collectd_unixsock'
+	option 'enable' '0'
+	option 'SocketFile' '/var/run/collectd/query.sock'
+	option 'SocketGroup' 'nogroup'
+
+config 'statistics' 'collectd_cpu'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_rrdtool'
+	option 'enable' '1'
+	option 'DataDir' '/tmp/rrd'
+	option 'RRARows' '100'
+	option 'RRASingle' '1'
+	option 'RRATimespans' '1hour 1day 1week 1month 1year'
+
+config 'statistics' 'collectd_memory'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_conntrack'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_olsrd'
+	option 'enable' '1'
+	option 'Port' '2006'
+	option 'Host' '127.0.0.1'
+
+config 'statistics' 'collectd_iwinfo'
+	option 'enable' '1'
+
+config 'statistics' 'collectd_nut'
+	option 'enable' '0'
+	option 'UPS' 'myupsname'
+
+config 'statistics' 'collectd_uptime'
+	option 'enable' '1'
diff --git a/trunk/package/luci/applications/luci-statistics/root/etc/init.d/luci_statistics b/trunk/package/luci/applications/luci-statistics/root/etc/init.d/luci_statistics
new file mode 100755
index 00000000..936f3a63
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/root/etc/init.d/luci_statistics
@@ -0,0 +1,33 @@
+#!/bin/sh /etc/rc.common
+START=79
+
+start() {
+	### replace shipped config with symlink
+	if [ ! -L /etc/collectd.conf ]; then
+		test -f /etc/collectd.conf && mv /etc/collectd.conf /etc/collectd.conf.bak
+		ln -s /var/etc/collectd.conf /etc/collectd.conf
+	fi
+
+	### create config
+	mkdir -p /var/etc
+	/usr/bin/stat-genconfig > /var/etc/collectd.conf
+
+	### prepare rrdimg directory
+	if [ -f /etc/config/lucid ] && [ -x /etc/init.d/lucid ] && /etc/init.d/lucid enabled && \
+	   [ "$(uci get luci_statistics.rrdtool.image_path 2>/dev/null)" != "$(uci get lucid.statistics.physical 2>/dev/null)" ]; then
+		uci set lucid.statistics.physical=$(uci get luci_statistics.rrdtool.image_path)
+		uci commit lucid
+		/etc/init.d/lucid restart
+	fi
+
+	### workaround broken permissions on /tmp
+	chmod 1777 /tmp
+}
+
+restart() {
+	### regenerate config / prepare environment
+	start
+
+	### restart collectd
+	/etc/init.d/collectd restart
+}
diff --git a/trunk/package/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics b/trunk/package/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics
new file mode 100755
index 00000000..e94a8637
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# register commit handler
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@luci_statistics[-1]
+	add ucitrack luci_statistics
+	set ucitrack.@luci_statistics[-1].init=luci_statistics
+	commit ucitrack
+EOF
+
+# register LuCId virtual path handler
+[ -f /etc/config/lucid ] && \
+uci -q batch <<-EOF >/dev/null
+	delete lucid.statistics
+
+	set lucid.statistics=DirectoryPublisher
+	set lucid.statistics.name='RRDTool Image Cache'
+	set lucid.statistics.physical=/tmp/rrdimg
+	set lucid.statistics.virtual=/rrdimg
+	set lucid.statistics.domain=''
+
+	add_list lucid.http.publisher=statistics
+	add_list lucid.https.publisher=statistics
+
+	commit lucid
+EOF
+
+# symlink for busybox httpd
+[ -x /usr/sbin/httpd ] && [ ! -h /www/rrdimg ] && \
+	ln -s /tmp/rrdimg /www/rrdimg
+
+# restart LuCId service
+[ -x /etc/init.d/lucid ] && /etc/init.d/lucid enabled && /etc/init.d/lucid restart
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-statistics/root/usr/bin/stat-genconfig b/trunk/package/luci/applications/luci-statistics/root/usr/bin/stat-genconfig
new file mode 100755
index 00000000..86773b4e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-statistics/root/usr/bin/stat-genconfig
@@ -0,0 +1,438 @@
+#!/usr/bin/lua
+
+--[[
+
+Luci statistics - collectd configuration generator
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+
+require("luci.model.uci")
+require("luci.sys.iptparser")
+require("luci.util")
+
+local ipt = luci.sys.iptparser.IptParser()
+local uci = luci.model.uci.cursor()
+local sections = uci:get_all( "luci_statistics" )
+
+
+function print(...)
+	nixio.stdout:write(...)
+	nixio.stdout:write("\n")
+end
+
+function section( plugin )
+
+	local config = sections[ "collectd_" .. plugin ] or sections["collectd"]
+
+	if type(config) == "table" and ( plugin == "collectd" or config.enable == "1" ) then
+
+		local params = ""
+
+		if type( plugins[plugin] ) == "function" then
+			params = plugins[plugin]( config )
+		else
+			params = config_generic( config, plugins[plugin][1], plugins[plugin][2], plugins[plugin][3], plugin == "collectd" )
+		end
+
+
+		if plugin ~= "collectd" then
+			print( "LoadPlugin " .. plugin )
+
+			if params:len() > 0 then
+				print( "<Plugin " .. plugin .. ">\n" .. params .. "</Plugin>\n" )
+			else
+				print( "" )
+			end
+		else
+			print( params .. "\n" )
+		end
+	end
+end
+
+function config_generic( c, singles, bools, lists, nopad )
+	local str = ""
+
+	if type(c) == "table" then
+
+		if type(singles) == "table" then
+			for i, key in ipairs( singles ) do
+				if preprocess[key] then
+					c[key] = preprocess[key](c[key])
+				end
+
+				str = str .. _string( c[key], key, nopad )
+			end
+		end
+
+		if type(bools) == "table" then
+			for i, key in ipairs( bools ) do
+				if preprocess[key] then
+					c[key] = preprocess[key](c[key])
+				end
+
+				str = str .. _bool( c[key], key, nopad )
+			end
+		end
+
+		if type(lists) == "table" then
+			str = str .. _list_expand( c, lists, nopad )
+		end
+	end
+
+	return str
+end
+
+function config_exec( c )
+	local str = ""
+
+	for s in pairs(sections) do
+		for key, type in pairs({ Exec="collectd_exec_input", NotificationExec="collectd_exec_notify" }) do
+			if sections[s][".type"] == type then
+
+				cmd = sections[s].cmdline
+
+				if cmd then
+					cmd   = cmd:gsub("^%s+", ""):gsub("%s+$", "")
+					user  = sections[s].cmduser  or "nobody"
+					group = sections[s].cmdgroup
+
+					str = str .. "\t" .. key .. ' "' ..
+						user .. ( group and ":" .. group or "" ) .. '" "' ..
+						cmd:gsub('%s+', '" "') .. '"\n'
+				end
+			end
+		end
+	end
+
+	return str
+end
+
+function config_iptables( c )
+	local str = ""
+
+	for s in pairs(sections) do
+		if sections[s][".type"] == "collectd_iptables_match" then
+
+			search = { }
+
+			for i, k in ipairs( {
+				"table", "chain", "target", "protocol", "source", "destination",
+				"inputif", "outputif", "options"
+			} ) do
+				v = sections[s][k]
+
+				if type(v) == "string" then
+					if k == "options" then v = luci.util.split( v, "%s+", nil, true ) end
+					search[k] = v
+				end
+			end
+
+			for i, rule in ipairs( ipt:find( search ) ) do
+
+				name = sections[s].name:gsub( "%s+", "_" )
+				if i > 1 then name = name .. "_(" .. i .. ")" end
+
+				str = str .. "\tChain " .. rule.table .. " " .. rule.chain .. " " .. rule.index .. ' "' .. name .. "\"\n"
+			end
+		end
+	end
+
+	return str
+end
+
+function config_network( c )
+	local str = ""
+
+	for s in pairs(sections) do
+		for key, type in pairs({ Listen="collectd_network_listen", Server="collectd_network_server" }) do
+			if sections[s][".type"] == type then
+
+				host = sections[s].host
+				port = sections[s].port
+
+				if host then
+					if port then
+						str = str .. "\t" .. key .. " \"" .. host .. "\" \"" .. port .. "\"\n"
+					else
+						str = str .. "\t" .. key .. " \"" .. host .. "\"\n"
+					end
+				end
+						end
+				end
+		end
+
+	return str .. _string( c["TimeToLive"], "TimeToLive" )
+		   .. _string( c["CacheFlush"], "CacheFlush" )
+		   .. _bool(   c["Forward"],    "Forward"    )
+end
+
+
+function _list_expand( c, l, nopad )
+	local str = ""
+
+	for i, n in ipairs(l) do
+		if c[n] then
+			if preprocess[n] then
+				c[n] = preprocess[n](c[n])
+			end
+
+			if n:find("(%w+)ses") then
+				k = n:gsub("(%w+)ses", "%1s")
+			else
+				k = n:gsub("(%w+)s", "%1")
+			end
+
+			str = str .. _expand( c[n], k, nopad )
+		end
+	end
+
+	return str
+end
+
+function _expand( s, n, nopad )
+	local str = ""
+
+	if type(s) == "string" then
+		for i, v in ipairs( luci.util.split( s, "%s+", nil, true ) ) do
+			str = str .. _string( v, n, nopad )
+		end
+	elseif type(s) == "table" then
+		for i, v in ipairs(s) do
+			str = str .. _string( v, n, nopad )
+		end
+	end
+
+	return str
+end
+
+function _bool( s, n, nopad )
+
+	local str = ""
+	local pad = ""
+	if not nopad then pad = "\t" end
+
+	if s and s == "1" then
+		str = pad .. n .. " true"
+	else
+		str = pad .. n .. " false"
+	end
+
+	return str .. "\n"
+end
+
+function _string( s, n, nopad )
+
+	local str = ""
+	local pad = ""
+	if not nopad then pad = "\t" end
+
+	if s then
+		if s:find("[^%d]") or n == "Port" then
+			if not s:find("[^%w]") and n ~= "Port" then
+				str = pad .. n .. " " .. luci.util.trim(s)
+			else
+				str = pad .. n .. ' "' .. luci.util.trim(s) .. '"'
+			end
+		else
+			str = pad .. n .. " " .. luci.util.trim(s)
+		end
+
+		str = str .. "\n"
+	end
+
+	return str
+end
+
+
+plugins = {
+	collectd = {
+		{ "BaseDir", "Include", "PIDFile", "PluginDir", "TypesDB", "Interval", "ReadThreads", "Hostname" },
+		{ },
+		{ }
+	},
+
+	conntrack = {
+		{ },
+		{ },
+		{ }
+	},
+
+	cpu	= {
+		{ },
+		{ },
+		{ }
+	},
+
+	csv	= {
+		{ "DataDir" },
+		{ "StoreRates" },
+		{ }
+	},
+
+	df	= {
+		{ },
+		{ "IgnoreSelected" },
+		{ "Devices", "MountPoints", "FSTypes" }
+	},
+
+	disk	= {
+		{ },
+		{ "IgnoreSelected" },
+		{ "Disks" }
+	},
+
+	dns	= {
+		{ },
+		{ },
+		{ "Interfaces", "IgnoreSources" }
+	},
+
+	email	= {
+		{ "SocketFile", "SocketGroup", "SocketPerms", "MaxConns" },
+		{ },
+		{ }
+	},
+
+	exec	= config_exec,
+
+	interface = {
+		{ },
+		{ "IgnoreSelected" },
+		{ "Interfaces" }
+	},
+
+	iptables = config_iptables,
+
+	irq	= {
+		{ },
+		{ "IgnoreSelected" },
+		{ "Irqs" }
+	},
+
+	iwinfo = {
+		{ },
+		{ "IgnoreSelected" },
+		{ "Interfaces" }
+	},
+
+	load	= {
+		{ },
+		{ },
+		{ }
+	},
+
+	logfile	= {
+		{ "LogLevel", "File" },
+		{ "Timestamp" },
+		{ }
+	},
+
+	madwifi = {
+		{ "WatchSet" },
+		{ },
+		{ "Interfaces", "WatchAdds" }
+	},
+
+	memory = { 
+		{ },
+		{ },
+		{ }
+	},
+
+	netlink	= {
+		{ },
+		{ "IgnoreSelected" },
+		{ "Interfaces", "VerboseInterfaces", "QDiscs", "Classes", "Filters" }
+	},
+
+	network	= config_network,
+
+	nut = {
+		{ "UPS" },
+		{ },
+		{ }
+	},
+
+	olsrd = {
+		{ "Host", "Port", "CollectLinks","CollectRoutes","CollectTopology"},
+		{ },
+		{ }
+	},
+
+	ping	= {
+		{ "TTL", "Interval" },
+		{ },
+		{ "Hosts" }
+	},
+
+	processes = {
+		{ },
+		{ },
+		{ "Processes" }
+	},
+
+	rrdtool	= {
+		{ "DataDir", "StepSize", "HeartBeat", "RRARows", "XFF", "CacheFlush", "CacheTimeout" },
+		{ "RRASingle" },
+		{ "RRATimespans" }
+	},
+
+        splash_leases = {
+          { },
+          { },
+          { }
+        },
+
+	tcpconns = {
+		{ },
+		{ "ListeningPorts" },
+		{ "LocalPorts", "RemotePorts" }
+	},
+
+	unixsock = {
+		{ "SocketFile", "SocketGroup", "SocketPerms" },
+		{ },
+		{ }
+	},
+
+	uptime = {
+		{ },
+		{ },
+		{ }
+	},
+
+	wireless = {
+		{ },
+		{ },
+		{ }
+	},
+}
+
+preprocess = {
+	RRATimespans = function(val)
+		local rv = { }
+		for time in val:gmatch("[^%s]+") do
+			table.insert( rv, luci.util.parse_units(time) )
+		end
+		return table.concat(rv, " ")
+	end
+}
+
+
+section("collectd")
+
+for plugin in pairs(plugins) do
+	if plugin ~= "collectd" then
+		section( plugin )
+	end
+end
diff --git a/trunk/package/luci/applications/luci-tinyproxy/Makefile b/trunk/package/luci/applications/luci-tinyproxy/Makefile
new file mode 100644
index 00000000..0123c164
--- /dev/null
+++ b/trunk/package/luci/applications/luci-tinyproxy/Makefile
@@ -0,0 +1,4 @@
+PO = tinyproxy
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua b/trunk/package/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
new file mode 100644
index 00000000..0b81b908
--- /dev/null
+++ b/trunk/package/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.tinyproxy", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/tinyproxy") then
+		return
+	end
+
+	entry({"admin", "services", "tinyproxy"}, alias("admin", "services", "tinyproxy", "config"), _("Tinyproxy"))
+	entry({"admin", "services", "tinyproxy", "status"}, template("tinyproxy_status"), _("Status"))
+	entry({"admin", "services", "tinyproxy", "config"}, cbi("tinyproxy"), _("Configuration"))
+end
diff --git a/trunk/package/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/trunk/package/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua
new file mode 100644
index 00000000..4c2a3cbf
--- /dev/null
+++ b/trunk/package/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua
@@ -0,0 +1,250 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("tinyproxy", translate("Tinyproxy"),
+	translate("Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"))
+
+s = m:section(TypedSection, "tinyproxy", translate("Server Settings"))
+s.anonymous = true
+
+s:tab("general", translate("General settings"))
+s:tab("privacy", translate("Privacy settings"))
+s:tab("filter", translate("Filtering and ACLs"))
+s:tab("limits", translate("Server limits"))
+
+
+o = s:taboption("general", Flag, "enabled", translate("Enable Tinyproxy server"))
+o.rmempty = false
+
+function o.write(self, section, value)
+	if value == "1" then
+		luci.sys.init.enable("tinyproxy")
+	else
+		luci.sys.init.disable("tinyproxy")
+	end
+
+	return Flag.write(self, section, value)
+end
+
+
+o = s:taboption("general", Value, "Port", translate("Listen port"),
+	translate("Specifies the HTTP port Tinyproxy is listening on for requests"))
+
+o.optional = true
+o.datatype = "port"
+o.placeholder = 8888
+
+
+o = s:taboption("general", Value, "Listen", translate("Listen address"),
+	translate("Specifies the addresses Tinyproxy is listening on for requests"))
+
+o.optional = true
+o.datatype = "ipaddr"
+o.placeholder = "0.0.0.0"
+
+
+o = s:taboption("general", Value, "Bind", translate("Bind address"),
+	translate("Specifies the address Tinyproxy binds to for outbound forwarded requests"))
+
+o.optional = true
+o.datatype = "ipaddr"
+o.placeholder = "0.0.0.0"
+
+
+o = s:taboption("general", Value, "DefaultErrorFile", translate("Error page"),
+	translate("HTML template file to serve when HTTP errors occur"))
+
+o.optional = true
+o.default = "/usr/share/tinyproxy/default.html"
+
+
+o = s:taboption("general", Value, "StatFile", translate("Statistics page"),
+	translate("HTML template file to serve for stat host requests"))
+
+o.optional = true
+o.default = "/usr/share/tinyproxy/stats.html"
+
+
+o = s:taboption("general", Flag, "Syslog", translate("Use syslog"),
+	translate("Writes log messages to syslog instead of a log file"))
+
+
+o = s:taboption("general", Value, "LogFile", translate("Log file"),
+	translate("Log file to use for dumping messages"))
+
+o.default = "/var/log/tinyproxy.log"
+o:depends("Syslog", "")
+
+
+o = s:taboption("general", ListValue, "LogLevel", translate("Log level"),
+	translate("Logging verbosity of the Tinyproxy process"))
+
+o:value("Critical")
+o:value("Error")
+o:value("Warning")
+o:value("Notice")
+o:value("Connect")
+o:value("Info")
+
+
+o = s:taboption("general", Value, "User", translate("User"),
+	translate("Specifies the user name the Tinyproxy process is running as"))
+
+o.default = "nobody"
+
+
+o = s:taboption("general", Value, "Group", translate("Group"),
+	translate("Specifies the group name the Tinyproxy process is running as"))
+
+o.default = "nogroup"
+
+
+--
+-- Privacy
+--
+
+o = s:taboption("privacy", Flag, "XTinyproxy", translate("X-Tinyproxy header"),
+	translate("Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded requests"))
+
+
+o = s:taboption("privacy", Value, "ViaProxyName", translate("Via hostname"),
+	translate("Specifies the Tinyproxy hostname to use in the Via HTTP header"))
+
+o.placeholder = "tinyproxy"
+o.datatype = "hostname"
+
+
+s:taboption("privacy", DynamicList, "Anonymous", translate("Header whitelist"),
+	translate("Specifies HTTP header names which are allowed to pass-through, all others are discarded. Leave empty to disable header filtering"))
+
+
+--
+-- Filter
+--
+
+o = s:taboption("filter", DynamicList, "Allow", translate("Allowed clients"),
+	translate("List of IP addresses or ranges which are allowed to use the proxy server"))
+
+o.placeholder = "0.0.0.0"
+o.datatype = "ipaddr"
+
+
+o = s:taboption("filter", DynamicList, "ConnectPort", translate("Allowed connect ports"),
+	translate("List of allowed ports for the CONNECT method. A single value \"0\" allows all ports"))
+
+o.placeholder = 0
+o.datatype = "port"
+
+
+s:taboption("filter", FileUpload, "Filter", translate("Filter file"),
+	translate("Plaintext file with URLs or domains to filter. One entry per line"))
+
+
+s:taboption("filter", Flag, "FilterURLs", translate("Filter by URLs"),
+	translate("By default, filtering is done based on domain names. Enable this to match against URLs instead"))
+
+
+s:taboption("filter", Flag, "FilterExtended", translate("Filter by RegExp"),
+	translate("By default, basic POSIX expressions are used for filtering. Enable this to activate extended regular expressions"))
+
+
+ s:taboption("filter", Flag, "FilterCaseSensitive", translate("Filter case-sensitive"),
+	translate("By default, filter strings are treated as case-insensitive. Enable this to make the matching case-sensitive"))
+
+
+s:taboption("filter", Flag, "FilterDefaultDeny", translate("Default deny"),
+	translate("By default, the filter rules act as blacklist. Enable this option to only allow matched URLs or domain names"))
+
+
+--
+-- Limits
+--
+
+o = s:taboption("limits", Value, "Timeout", translate("Connection timeout"),
+	translate("Maximum number of seconds an inactive connection is held open"))
+
+o.optional = true
+o.datatype = "uinteger"
+o.default = 600
+
+
+o = s:taboption("limits", Value, "MaxClients", translate("Max. clients"),
+	translate("Maximum allowed number of concurrently connected clients"))
+
+o.datatype = "uinteger"
+o.default = 10
+
+
+o = s:taboption("limits", Value, "MinSpareServers", translate("Min. spare servers"),
+	translate("Minimum number of prepared idle processes"))
+
+o.datatype = "uinteger"
+o.default = 5
+
+
+o = s:taboption("limits", Value, "MaxSpareServers", translate("Max. spare servers"),
+	translate("Maximum number of prepared idle processes"))
+
+o.datatype = "uinteger"
+o.default = 10
+
+
+o = s:taboption("limits", Value, "StartServers", translate("Start spare servers"),
+	translate("Number of idle processes to start when launching Tinyproxy"))
+
+o.datatype = "uinteger"
+o.default = 5
+
+
+o = s:taboption("limits", Value, "MaxRequestsPerChild", translate("Max. requests per server"),
+	translate("Maximum allowed number of requests per process. If it is exeeded, the process is restarted. Zero means unlimited."))
+
+o.datatype = "uinteger"
+o.default = 0
+
+
+--
+-- Upstream
+--
+
+s = m:section(TypedSection, "upstream", translate("Upstream Proxies"),
+	translate("Upstream proxy rules define proxy servers to use when accessing certain IP addresses or domains."))
+
+s.anonymous = true
+s.addremove = true
+
+
+t = s:option(ListValue, "type", translate("Policy"),
+	translate("<em>Via proxy</em> routes requests to the given target via the specifed upstream proxy, <em>Reject access</em> disables any upstream proxy for the target"))
+
+t:value("proxy", translate("Via proxy"))
+t:value("reject", translate("Reject access"))
+
+
+ta = s:option(Value, "target", translate("Target host"),
+	translate("Can be either an IP address or range, a domain name or \".\" for any host without domain"))
+
+ta.rmempty = true
+ta.placeholder = "0.0.0.0/0"
+ta.datatype = "host"
+
+
+v = s:option(Value, "via", translate("Via proxy"),
+	translate("Specifies the upstream proxy to use for accessing the target host. Format is <code>address:port</code>"))
+
+v:depends({type="proxy"})
+v.placeholder = "10.0.0.1:8080"
+
+return m
diff --git a/trunk/package/luci/applications/luci-tinyproxy/luasrc/view/tinyproxy_status.htm b/trunk/package/luci/applications/luci-tinyproxy/luasrc/view/tinyproxy_status.htm
new file mode 100644
index 00000000..c85a206b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-tinyproxy/luasrc/view/tinyproxy_status.htm
@@ -0,0 +1,50 @@
+<%
+
+if luci.http.formvalue("frame") == "1" then
+	local uci = require "luci.model.uci".cursor()
+	local addr = "127.0.0.1"
+	local port = "8888"
+
+	uci:foreach("tinyproxy", "tinyproxy",
+		function(s)
+			addr = s.StatHost or addr
+			port = s.Port     or port
+			return false
+		end)
+
+	local data = false
+	local wget = io.popen("wget -qO- http://%s:%s" % { addr, port })
+	if wget then
+		while true do
+			local l = wget:read("*l")
+			if not l then
+				break
+			end
+
+			luci.http.write(l)
+			data = true
+		end
+
+		wget:close()
+	end
+
+	if not data then
+		luci.http.write(translate("Failed to retrieve statistics from url:"))
+		luci.http.write(" http://%s:%s" % { addr, port })
+	end
+
+	return
+end
+
+-%>
+
+<%+header%>
+
+<div class="cbi-map">
+	<h2><a id="content" name="content"><%:Tinyproxy Status%></a></h2>
+	<div class="cbi-section">
+		<iframe src="<%=REQUESTURL%>?frame=1" style="width:100%; height:350px; border:none"></iframe>
+	</div>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-transmission/Makefile b/trunk/package/luci/applications/luci-transmission/Makefile
new file mode 100644
index 00000000..a30d474b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-transmission/Makefile
@@ -0,0 +1,4 @@
+PO = transmission
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-transmission/luasrc/controller/transmission.lua b/trunk/package/luci/applications/luci-transmission/luasrc/controller/transmission.lua
new file mode 100644
index 00000000..2c4df46b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-transmission/luasrc/controller/transmission.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface - Transmission support
+
+Copyright 2012 Gabor Varga <vargagab@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.transmission", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/transmission") then
+		return
+	end
+
+	local page = entry({"admin", "services", "transmission"}, cbi("transmission"), _("Transmission"))
+	page.dependent = true
+
+end
diff --git a/trunk/package/luci/applications/luci-transmission/luasrc/model/cbi/transmission.lua b/trunk/package/luci/applications/luci-transmission/luasrc/model/cbi/transmission.lua
new file mode 100644
index 00000000..4f9e3c54
--- /dev/null
+++ b/trunk/package/luci/applications/luci-transmission/luasrc/model/cbi/transmission.lua
@@ -0,0 +1,231 @@
+--[[
+LuCI - Lua Configuration Interface - Transmission support
+
+Copyright 2012 Gabor Varga <vargagab@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.sys")
+require("luci.util")
+require("luci.model.ipkg")
+
+local uci = require "luci.model.uci".cursor()
+local trport = uci:get_first("transmission", "transmission", "rpc_port") or 9091
+local running = (luci.sys.call("pidof transmission-daemon > /dev/null") == 0)
+local webinstalled = luci.model.ipkg.installed("transmission-web") 
+local button = ""
+if running and webinstalled then
+	button = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\" " .. translate("Open Web Interface") .. " \" onclick=\"window.open('http://'+window.location.hostname+':" .. trport .. "')\"/>"
+end
+
+m = Map("transmission", "Transmission", translate("Transmission daemon is a simple bittorrent client, here you can configure the settings.") .. button)
+
+s=m:section(TypedSection, "transmission", translate("Global settings"))
+s.addremove=false
+s.anonymous=true
+
+enable=s:option(Flag, "enabled", translate("Enabled"))
+enable.rmempty=false
+config_dir=s:option(Value, "config_dir", translate("Config file directory"))
+user=s:option(ListValue, "user", translate("Run daemon as user"))
+local p_user
+for _, p_user in luci.util.vspairs(luci.util.split(luci.sys.exec("cat /etc/passwd | cut -f 1 -d :"))) do
+	user:value(p_user)
+end
+cache_size_mb=s:option(Value, "cache_size_mb", translate("Cache size in MB"))
+
+bandwidth=m:section(TypedSection, "transmission", translate("Bandwidth settings"))
+bandwidth.anonymous=true
+alt_speed_enabled=bandwidth:option(Flag, "alt_speed_enabled", translate("Alternative speed enabled"))
+alt_speed_enabled.enabled="true"
+alt_speed_enabled.disabled="false"
+alt_speed_down=bandwidth:option(Value, "alt_speed_down", translate("Alternative download speed"), "KB/s")
+alt_speed_down:depends("alt_speed_enabled", "true")
+alt_speed_up=bandwidth:option(Value, "alt_speed_up", translate("Alternative upload speed"), "KB/s")
+alt_speed_up:depends("alt_speed_enabled", "true")
+speed_limit_down_enabled=bandwidth:option(Flag, "speed_limit_down_enabled", translate("Speed limit down enabled"))
+speed_limit_down_enabled.enabled="true"
+speed_limit_down_enabled.disabled="false"
+speed_limit_down=bandwidth:option(Value, "speed_limit_down", translate("Speed limit down"), "KB/s")
+speed_limit_down:depends("speed_limit_down_enabled", "true")
+speed_limit_up_enabled=bandwidth:option(Flag, "speed_limit_up_enabled", translate("Speed limit up enabled"))
+speed_limit_up_enabled.enabled="true"
+speed_limit_up_enabled.disabled="false"
+speed_limit_up=bandwidth:option(Value, "speed_limit_up", translate("Speed limit up"), "KB/s")
+speed_limit_up:depends("speed_limit_up_enabled", "true")
+upload_slots_per_torrent=bandwidth:option(Value, "upload_slots_per_torrent", translate("Upload slots per torrent"))
+
+blocklists=m:section(TypedSection, "transmission", translate("Blocklists"))
+blocklists.anonymous=true
+blocklist_enabled=blocklists:option(Flag, "blocklist_enabled", translate("Block list enabled"))
+blocklist_enabled.enabled="true"
+blocklist_enabled.disabled="false"
+blocklist_url=blocklists:option(Value, "blocklist_url", translate("Blocklist URL"))
+blocklist_url:depends("blocklist_enabled", "true")
+
+fileslocations=m:section(TypedSection, "transmission", translate("Files and Locations"))
+fileslocations.anonymous=true
+download_dir=fileslocations:option(Value, "download_dir", translate("Download directory"))
+incomplete_dir_enabled=fileslocations:option(Flag, "incomplete_dir_enabled", translate("Incomplete directory enabled"))
+incomplete_dir_enabled.enabled="true"
+incomplete_dir_enabled.disabled="false"
+incomplete_dir=fileslocations:option(Value, "incomplete_dir", translate("Incomplete directory"))
+incomplete_dir:depends("incomplete_dir_enabled", "true")
+preallocation=fileslocations:option(ListValue, "preallocation", translate("preallocation"))
+preallocation:value("0", translate("Off"))
+preallocation:value("1", translate("Fast"))
+preallocation:value("2", translate("Full"))
+prefetch_enabled=fileslocations:option(Flag, "prefetch_enabled", translate("Prefetch enabled"))
+rename_partial_files=fileslocations:option(Flag, "rename_partial_files", translate("Rename partial files"))
+rename_partial_files.enableid="true"
+rename_partial_files.disabled="false"
+start_added_torrents=fileslocations:option(Flag, "start_added_torrents", translate("Automatically start added torrents"))
+start_added_torrents.enabled="true"
+start_added_torrents.disabled="false"
+trash_original_torrent_files=fileslocations:option(Flag, "trash_original_torrent_files", translate("Trash original torrent files"))
+trash_original_torrent_files.enabled="true"
+trash_original_torrent_files.disabled="false"
+umask=fileslocations:option(Value, "umask", "umask")
+watch_dir_enabled=fileslocations:option(Flag, "watch_dir_enabled", translate("Enable watch directory"))
+watch_dir_enabled.enabled="true"
+watch_dir_enabled.disabled="false"
+watch_dir=fileslocations:option(Value, "watch_dir", translate("Watch directory"))
+watch_dir:depends("watch_dir_enabled", "true")
+
+misc=m:section(TypedSection, "transmission", translate("Miscellaneous"))
+misc.anonymous=true
+dht_enabled=misc:option(Flag, "dht_enabled", translate("DHT enabled"))
+dht_enabled.enabled="true"
+dht_enabled.disabled="false"
+encryption=misc:option(ListValue, "encryption", translate("Encryption"))
+encryption:value("0", translate("Off"))
+encryption:value("1", translate("Preferred"))
+encryption:value("2", translate("Forced"))
+lazy_bitfield_enabled=misc:option(Flag, "lazy_bitfield_enabled", translate("Lazy bitfield enabled"))
+lazy_bitfield_enabled.enabled="true"
+lazy_bitfield_enabled.disabled="false"
+lpd_enabled=misc:option(Flag, "lpd_enabled", translate("LPD enabled"))
+lpd_enabled.enabled="true"
+lpd_enabled.disabled="false"
+message_level=misc:option(ListValue, "message_level", translate("Message level"))
+message_level:value("0", translate("None"))
+message_level:value("1", translate("Error"))
+message_level:value("2", translate("Info"))
+message_level:value("3", translate("Debug"))
+pex_enabled=misc:option(Flag, "pex_enabled", translate("PEX enabled"))
+pex_enabled.enabled="true"
+pex_enabled.disabled="false"
+script_torrent_done_enabled=misc:option(Flag, "script_torrent_done_enabled", translate("Script torrent done enabled"))
+script_torrent_done_enabled.enabled="true"
+script_torrent_done_enabled.disabled="false"
+script_torrent_done_filename=misc:option(Value, "script_torrent_done_filename", translate("Script torrent done filename"))
+script_torrent_done_filename:depends("script_torrent_done_enabled", "true")
+idle_seeding_limit_enabled=misc:option(Flag, "idle_seeding_limit_enabled", translate("Idle seeding limit enabled"))
+idle_seeding_limit_enabled.enabled="true"
+idle_seeding_limit_enabled.disabled="false"
+idle_seeding_limit=misc:option(Value, "idle_seeding_limit", translate("Idle seeding limit"))
+idle_seeding_limit:depends("idle_seeding_limit_enabled", "true")
+utp_enabled=misc:option(Flag, "utp_enabled", translate("uTP enabled"))
+utp_enabled.enabled="true"
+utp_enabled.disabled="false"
+
+peers=m:section(TypedSection, "transmission", translate("Peer settings"))
+peers.anonymous=true
+bind_address_ipv4=peers:option(Value, "bind_address_ipv4", translate("Binding address IPv4"))
+bind_address_ipv4.default="0.0.0.0"
+bind_address_ipv6=peers:option(Value, "bind_address_ipv6", translate("Binding address IPv6"))
+bind_address_ipv6.default="::"
+peer_congestion_algorithm=peers:option(Value, "peer_congestion_algorithm", translate("Peer congestion algorithm"))
+peer_limit_global=peers:option(Value, "peer_limit_global", translate("Global peer limit"))
+peer_limit_per_torrent=peers:option(Value, "peer_limit_per_torrent", translate("Peer limit per torrent"))
+peer_socket_tos=peers:option(Value, "peer_socket_tos", translate("Peer socket tos"))
+
+peerport=m:section(TypedSection, "transmission", translate("Peer Port settings"))
+peerport.anonymous=true
+peer_port=peerport:option(Value, "peer_port", translate("Peer port"))
+peer_port_random_on_start=peerport:option(Flag, "peer_port_random_on_start", translate("Peer port random on start"))
+peer_port_random_on_start.enabled="true"
+peer_port_random_on_start.disabled="false"
+peer_port_random_high=peerport:option(Value, "peer_port_random_high", translate("Peer port random high"))
+peer_port_random_high:depends("peer_port_random_on_start", "true")
+peer_port_random_low=peerport:option(Value, "peer_port_random_low", translate("Peer port random low"))
+peer_port_random_low:depends("peer_port_random_on_start", "true")
+port_forwarding_enabled=peerport:option(Flag, "port_forwarding_enabled", translate("Port forwarding enabled"))
+port_forwarding_enabled.enabled="true"
+port_forwarding_enabled.disabled="false"
+
+rpc=m:section(TypedSection, "transmission", translate("RPC settings"))
+rpc.anonymous=true
+rpc_enabled=rpc:option(Flag, "rpc_enabled", translate("RPC enabled"))
+rpc_enabled.enabled="true"
+rpc_enabled.disabled="false"
+rpc_port=rpc:option(Value, "rpc_port", translate("RPC port"))
+rpc_port:depends("rpc_enabled", "true")
+rpc_bind_address=rpc:option(Value, "rpc_bind_address", translate("RPC bind address"))
+rpc_bind_address:depends("rpc_enabled", "true")
+rpc_url=rpc:option(Value, "rpc_url", translate("RPC URL"))
+rpc_url:depends("rpc_enabled", "true")
+rpc_whitelist_enabled=rpc:option(Flag, "rpc_whitelist_enabled", translate("RPC whitelist enabled"))
+rpc_whitelist_enabled.enabled="true"
+rpc_whitelist_enabled.disabled="false"
+rpc_whitelist_enabled:depends("rpc_enabled", "true")
+rpc_whitelist=rpc:option(Value, "rpc_whitelist", translate("RPC whitelist"))
+rpc_whitelist:depends("rpc_whitelist_enabled", "true")
+rpc_authentication_required=rpc:option(Flag, "rpc_authentication_required", translate("RPC authentication required"))
+rpc_authentication_required.enabled="true"
+rpc_authentication_required.disabled="false"
+rpc_authentication_required:depends("rpc_enabled", "true")
+rpc_username=rpc:option(Value, "rpc_username", translate("RPC username"))
+rpc_username:depends("rpc_authentication_required", "true")
+rpc_password=rpc:option(Value, "rpc_password", translate("RPC password"))
+rpc_password:depends("rpc_authentication_required", "true")
+rpc_password.password = true
+
+scheduling=m:section(TypedSection, "transmission", translate("Scheduling"))
+scheduling.anonymous=true
+alt_speed_time_enabled=scheduling:option(Flag, "alt_speed_time_enabled", translate("Alternative speed timing enabled"))
+alt_speed_time_enabled.enabled="true"
+alt_speed_time_enabled.disabled="false"
+alt_speed_time_enabled.default="false"
+alt_speed_time_enabled:depends("alt_speed_enabled", "true")
+alt_speed_time_day=scheduling:option(Value, "alt_speed_time_day", translate("Alternative speed time day"), translate("Number/bitfield. Start with 0, then for each day you want the scheduler enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - 8, Thursday - 16, Friday - 32, Saturday - 64"))
+alt_speed_time_day:depends("alt_speed_time_enabled", "true")
+alt_speed_time_begin=scheduling:option(Value, "alt_speed_time_begin", translate("Alternative speed time begin"), translate("in minutes from midnight"))
+alt_speed_time_begin:depends("alt_speed_time_enabled", "true")
+alt_speed_time_end=scheduling:option(Value, "alt_speed_time_end", translate("Alternative speed time end"), translate("in minutes from midnight"))
+alt_speed_time_end:depends("alt_speed_time_enabled", "true")
+ratio_limit_enabled=scheduling:option(Flag, "ratio_limit_enabled", translate("Ratio limit enabled"))
+ratio_limit_enabled.enabled="true"
+ratio_limit_enabled.disabled="false"
+ratio_limit=scheduling:option(Value, "ratio_limit", translate("Ratio limit"))
+ratio_limit:depends("ratio_limit_enabled", "true")
+
+queueing=m:section(TypedSection, "transmission", translate("Queueing"))
+queueing.anonymous=true
+download_queue_enabled=queueing:option(Flag, "download_queue_enabled", translate("Download queue enabled"))
+download_queue_enabled.enabled="true"
+download_queue_enabled.disabled="false"
+download_queue_size=queueing:option(Value, "download_queue_size", translate("Download queue size"))
+download_queue_size:depends("download_queue_enabled", "true")
+queue_stalled_enabled=queueing:option(Flag, "queue_stalled_enabled", translate("Queue stalled enabled"))
+queue_stalled_enabled.enabled="true"
+queue_stalled_enabled.disabled="false"
+queue_stalled_minutes=queueing:option(Value, "queue_stalled_minutes", translate("Queue stalled minutes"))
+queue_stalled_minutes:depends("queue_stalled_enabled", "true")
+seed_queue_enabled=queueing:option(Flag, "seed_queue_enabled", translate("Seed queue enabled"))
+seed_queue_enabled.enabled="true"
+seed_queue_enabled.disabled="false"
+seed_queue_size=queueing:option(Value, "seed_queue_size", translate("Seed queue size"))
+seed_queue_size:depends("seed_queue_enabled", "true")
+scrape_paused_torrents_enabled=queueing:option(Flag, "scrape_paused_torrents_enabled", translate("Scrape paused torrents enabled"))
+scrape_paused_torrents_enabled.enabled="true"
+scrape_paused_torrents_enabled.disabled="false"
+
+return m
diff --git a/trunk/package/luci/applications/luci-transmission/root/etc/uci-defaults/luci-transmission b/trunk/package/luci/applications/luci-transmission/root/etc/uci-defaults/luci-transmission
new file mode 100644
index 00000000..456e8b89
--- /dev/null
+++ b/trunk/package/luci/applications/luci-transmission/root/etc/uci-defaults/luci-transmission
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@tranmsmission[-1]
+	add ucitrack transmission
+	set ucitrack.@transmission[-1].init=transmission
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-udpxy/Makefile b/trunk/package/luci/applications/luci-udpxy/Makefile
new file mode 100644
index 00000000..05228b16
--- /dev/null
+++ b/trunk/package/luci/applications/luci-udpxy/Makefile
@@ -0,0 +1,4 @@
+PO = udpxy
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-udpxy/luasrc/controller/udpxy.lua b/trunk/package/luci/applications/luci-udpxy/luasrc/controller/udpxy.lua
new file mode 100644
index 00000000..bc85b0bb
--- /dev/null
+++ b/trunk/package/luci/applications/luci-udpxy/luasrc/controller/udpxy.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface - udpxy support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.udpxy", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/udpxy") then
+		return
+	end
+
+	local page = entry({"admin", "services", "udpxy"}, cbi("udpxy"), _("udpxy"))
+	page.dependent = true
+
+end
diff --git a/trunk/package/luci/applications/luci-udpxy/luasrc/model/cbi/udpxy.lua b/trunk/package/luci/applications/luci-udpxy/luasrc/model/cbi/udpxy.lua
new file mode 100644
index 00000000..b08f93ba
--- /dev/null
+++ b/trunk/package/luci/applications/luci-udpxy/luasrc/model/cbi/udpxy.lua
@@ -0,0 +1,74 @@
+--[[
+LuCI - Lua Configuration Interface - udpxy support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("udpxy", "udpxy", translate("udpxy is a UDP-to-HTTP multicast traffic relay daemon, here you can configure the settings."))
+
+s = m:section(TypedSection, "udpxy", "")
+s.addremove = true
+s.anonymous = false
+
+enable=s:option(Flag, "disabled", translate("Enabled"))
+enable.enabled="0"
+enable.disabled="1"
+enable.default = "1"
+enable.rmempty = false
+respawn=s:option(Flag, "respawn", translate("Respawn"))
+respawn.default = false
+
+verbose=s:option(Flag, "verbose", translate("Verbose"))
+verbose.default = false
+
+status=s:option(Flag, "status", translate("Status"))
+
+bind=s:option(Value, "bind", translate("Bind IP/Interface"))
+bind.rmempty = true
+bind.datatype = "or(ipaddr, network)"
+
+port=s:option(Value, "port", translate("Port"))
+port.rmempty = true
+port.datatype = "port"
+
+source=s:option(Value, "source", translate("Source IP/Interface"))
+source.rmempty = true
+source.datatype = "or(ipaddr, network)"
+
+max_clients=s:option(Value, "max_clients", translate("Max clients"))
+max_clients.rmempty = true
+max_clients.datatype = "range(1, 5000)"
+
+log_file=s:option(Value, "log_file", translate("Log file"))
+log_file.rmempty = true
+--log_file.datatype = "file"
+
+buffer_size=s:option(Value, "buffer_size", translate("Buffer size"))
+buffer_size.rmempty = true
+buffer_size.datatype = "range(4096,2097152)"
+
+buffer_messages=s:option(Value, "buffer_messages", translate("Buffer messages"))
+buffer_messages.rmempty = true
+buffer_messages.datatype = "or(-1, and(min(1), uinteger))"
+
+buffer_time=s:option(Value, "buffer_time", translate("Buffer time"))
+buffer_time.rmempty = true
+buffer_time.datatype = "or(-1, and(min(1), uinteger))"
+
+nice_increment=s:option(Value, "nice_increment", translate("Nice increment"))
+nice_increment.rmempty = true
+nice_increment.datatype = "or(and(max(-1), integer),and(min(1), integer))"
+
+mcsub_renew=s:option(Value, "mcsub_renew", translate("Multicast subscription renew"))
+mcsub_renew.rmempty = true
+mcsub_renew.datatype = "or(0, range(30, 64000))"
+
+return m
diff --git a/trunk/package/luci/applications/luci-udpxy/root/etc/uci-defaults/luci-udpxy b/trunk/package/luci/applications/luci-udpxy/root/etc/uci-defaults/luci-udpxy
new file mode 100644
index 00000000..e93c0788
--- /dev/null
+++ b/trunk/package/luci/applications/luci-udpxy/root/etc/uci-defaults/luci-udpxy
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# needed for "Save and Apply" to restart udpxy
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@udpxy[-1]
+	add ucitrack udpxy
+	set ucitrack.@udpxy[-1].init="udpxy"
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-upnp/Makefile b/trunk/package/luci/applications/luci-upnp/Makefile
new file mode 100644
index 00000000..2f850c61
--- /dev/null
+++ b/trunk/package/luci/applications/luci-upnp/Makefile
@@ -0,0 +1,4 @@
+PO = upnp
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-upnp/luasrc/controller/upnp.lua b/trunk/package/luci/applications/luci-upnp/luasrc/controller/upnp.lua
new file mode 100644
index 00000000..83fa9415
--- /dev/null
+++ b/trunk/package/luci/applications/luci-upnp/luasrc/controller/upnp.lua
@@ -0,0 +1,84 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.upnp", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/upnpd") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "services", "upnp"}, cbi("upnp/upnp"), _("UPNP"))
+	page.dependent = true
+
+	entry({"admin", "services", "upnp", "status"}, call("act_status")).leaf = true
+	entry({"admin", "services", "upnp", "delete"}, call("act_delete")).leaf = true
+end
+
+function act_status()
+	local ipt = io.popen("iptables --line-numbers -t nat -xnvL MINIUPNPD")
+	if ipt then
+		local fwd = { }
+		while true do
+			local ln = ipt:read("*l")
+			if not ln then
+				break
+			elseif ln:match("^%d+") then
+				local num, proto, extport, intaddr, intport =
+					ln:match("^(%d+).-([a-z]+).-dpt:(%d+) to:(%S-):(%d+)")
+
+				if num and proto and extport and intaddr and intport then
+					num     = tonumber(num)
+					extport = tonumber(extport)
+					intport = tonumber(intport)
+
+					fwd[#fwd+1] = {
+						num     = num,
+						proto   = proto:upper(),
+						extport = extport,
+						intaddr = intaddr,
+						intport = intport
+					}
+				end
+			end
+		end
+
+		ipt:close()
+
+		luci.http.prepare_content("application/json")
+		luci.http.write_json(fwd)
+	end
+end
+
+function act_delete(num)
+	local idx = tonumber(num)
+	local uci = luci.model.uci.cursor()
+
+	if idx and idx > 0 then
+		luci.sys.call("iptables -t filter -D MINIUPNPD %d 2>/dev/null" % idx)
+		luci.sys.call("iptables -t nat -D MINIUPNPD %d 2>/dev/null" % idx)
+
+		local lease_file = uci:get("upnpd", "config", "upnp_lease_file")
+		if lease_file and nixio.fs.access(lease_file) then
+			luci.sys.call("sed -i -e '%dd' %q" %{ idx, lease_file })
+		end
+
+		luci.http.status(200, "OK")
+		return
+	end
+
+	luci.http.status(400, "Bad request")
+end
diff --git a/trunk/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/trunk/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
new file mode 100644
index 00000000..3d98d668
--- /dev/null
+++ b/trunk/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -0,0 +1,114 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("upnpd", luci.util.pcdata(translate("Universal Plug & Play")),
+	translate("UPnP allows clients in the local network to automatically configure the router."))
+
+m:section(SimpleSection).template  = "upnp_status"
+
+s = m:section(NamedSection, "config", "upnpd", translate("MiniUPnP settings"))
+s.addremove = false
+s:tab("general",  translate("General Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+e = s:taboption("general", Flag, "_init", translate("Start UPnP and NAT-PMP service"))
+e.rmempty  = false
+
+function e.cfgvalue(self, section)
+	return luci.sys.init.enabled("miniupnpd") and self.enabled or self.disabled
+end
+
+function e.write(self, section, value)
+	if value == "1" then
+		luci.sys.call("/etc/init.d/miniupnpd enable >/dev/null")
+		luci.sys.call("/etc/init.d/miniupnpd start >/dev/null")
+	else
+		luci.sys.call("/etc/init.d/miniupnpd stop >/dev/null")
+		luci.sys.call("/etc/init.d/miniupnpd disable >/dev/null")
+	end
+end
+
+s:taboption("general", Flag, "enable_upnp", translate("Enable UPnP functionality")).default = "1"
+s:taboption("general", Flag, "enable_natpmp", translate("Enable NAT-PMP functionality")).default = "1"
+
+s:taboption("general", Flag, "secure_mode", translate("Enable secure mode"),
+	translate("Allow adding forwards only to requesting ip addresses")).default = "1"
+
+s:taboption("general", Flag, "log_output", translate("Enable additional logging"),
+	translate("Puts extra debugging information into the system log"))
+
+s:taboption("general", Value, "download", translate("Downlink"),
+	translate("Value in KByte/s, informational only")).rmempty = true
+
+s:taboption("general", Value, "upload", translate("Uplink"),
+	translate("Value in KByte/s, informational only")).rmempty = true
+
+port = s:taboption("general", Value, "port", translate("Port"))
+port.datatype = "port"
+port.default  = 5000
+
+
+s:taboption("advanced", Flag, "system_uptime", translate("Report system instead of daemon uptime")).default = "1"
+
+s:taboption("advanced", Value, "uuid", translate("Device UUID"))
+s:taboption("advanced", Value, "serial_number", translate("Announced serial number"))
+s:taboption("advanced", Value, "model_number", translate("Announced model number"))
+
+ni = s:taboption("advanced", Value, "notify_interval", translate("Notify interval"))
+ni.datatype    = "uinteger"
+ni.placeholder = 30
+
+ct = s:taboption("advanced", Value, "clean_ruleset_threshold", translate("Clean rules threshold"))
+ct.datatype    = "uinteger"
+ct.placeholder = 20
+
+ci = s:taboption("advanced", Value, "clean_ruleset_interval", translate("Clean rules interval"))
+ci.datatype    = "uinteger"
+ci.placeholder = 600
+
+pu = s:taboption("advanced", Value, "presentation_url", translate("Presentation URL"))
+pu.placeholder = "http://192.168.1.1/"
+
+lf = s:taboption("advanced", Value, "upnp_lease_file", translate("UPnP lease file"))
+lf.placeholder = "/var/log/upnp.leases"
+
+
+s2 = m:section(TypedSection, "perm_rule", translate("MiniUPnP ACLs"),
+	translate("ACLs specify which external ports may be redirected to which internal addresses and ports"))
+
+s2.template  = "cbi/tblsection"
+s2.sortable  = true
+s2.anonymous = true
+s2.addremove = true
+
+s2:option(Value, "comment", translate("Comment"))
+
+ep = s2:option(Value, "ext_ports", translate("External ports"))
+ep.datatype    = "portrange"
+ep.placeholder = "0-65535"
+
+ia = s2:option(Value, "int_addr", translate("Internal addresses"))
+ia.datatype    = "ip4addr"
+ia.placeholder = "0.0.0.0/0"
+
+ip = s2:option(Value, "int_ports", translate("Internal ports"))
+ip.datatype    = "portrange"
+ip.placeholder = "0-65535"
+
+ac = s2:option(ListValue, "action", translate("Action"))
+ac:value("allow")
+ac:value("deny")
+
+return m
diff --git a/trunk/package/luci/applications/luci-upnp/luasrc/view/admin_status/index/upnp.htm b/trunk/package/luci/applications/luci-upnp/luasrc/view/admin_status/index/upnp.htm
new file mode 100644
index 00000000..d0c2e2ed
--- /dev/null
+++ b/trunk/package/luci/applications/luci-upnp/luasrc/view/admin_status/index/upnp.htm
@@ -0,0 +1 @@
+<%+upnp_status%>
diff --git a/trunk/package/luci/applications/luci-upnp/luasrc/view/upnp_status.htm b/trunk/package/luci/applications/luci-upnp/luasrc/view/upnp_status.htm
new file mode 100644
index 00000000..d50ed0c4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-upnp/luasrc/view/upnp_status.htm
@@ -0,0 +1,67 @@
+<script type="text/javascript">//<![CDATA[
+	function upnp_delete_fwd(idx) {
+		XHR.get('<%=luci.dispatcher.build_url("admin", "services", "upnp", "delete")%>/' + idx, null,
+			function(x)
+			{
+				var tb = document.getElementById('upnp_status_table');
+				if (tb && (idx < tb.rows.length))
+					tb.rows[0].parentNode.removeChild(tb.rows[idx]);
+			}
+		);
+	}
+
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "upnp", "status")%>', null,
+		function(x, st)
+		{
+			var tb = document.getElementById('upnp_status_table');
+			if (st && tb)
+			{
+				/* clear all rows */
+				while( tb.rows.length > 1 )
+					tb.deleteRow(1);
+
+				for( var i = 0; i < st.length; i++ )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+					tr.insertCell(-1).innerHTML = st[i].proto;
+					tr.insertCell(-1).innerHTML = st[i].extport;
+					tr.insertCell(-1).innerHTML = st[i].intaddr;
+					tr.insertCell(-1).innerHTML = st[i].intport;
+
+					tr.insertCell(-1).innerHTML = String.format(
+						'<input class="cbi-button cbi-input-remove" type="button" value="<%:Delete Redirect%>" onclick="upnp_delete_fwd(%d)" />',
+							st[i].num
+					);
+				}
+
+				if( tb.rows.length == 1 )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 5;
+						td.innerHTML = '<em><br /><%:There are no active redirects.%></em>';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<fieldset class="cbi-section">
+	<legend><%:Active UPnP Redirects%></legend>
+	<table class="cbi-section-table" id="upnp_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Protocol%></th>
+			<th class="cbi-section-table-cell"><%:External Port%></th>
+			<th class="cbi-section-table-cell"><%:Client Address%></th>
+			<th class="cbi-section-table-cell"><%:Client Port%></th>
+			<th class="cbi-section-table-cell">&#160;</th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="5"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
diff --git a/trunk/package/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp b/trunk/package/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp
new file mode 100755
index 00000000..fe22a3e3
--- /dev/null
+++ b/trunk/package/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+/etc/init.d/miniupnpd enabled && {
+	/etc/init.d/miniupnpd stop
+	/etc/init.d/miniupnpd disable
+}
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-ushare/Makefile b/trunk/package/luci/applications/luci-ushare/Makefile
new file mode 100644
index 00000000..9b0a6e4a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ushare/Makefile
@@ -0,0 +1,4 @@
+PO = ushare
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-ushare/ipkg/postinst b/trunk/package/luci/applications/luci-ushare/ipkg/postinst
new file mode 100644
index 00000000..54b1a33b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ushare/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-ushare ) && rm -f /etc/uci-defaults/luci-ushare
+	/etc/init.d/ushare enabled || /etc/init.d/ushare enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-ushare/luasrc/controller/ushare.lua b/trunk/package/luci/applications/luci-ushare/luasrc/controller/ushare.lua
new file mode 100644
index 00000000..eed85323
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ushare/luasrc/controller/ushare.lua
@@ -0,0 +1,27 @@
+--[[
+
+LuCI uShare
+(c) 2008 Yanira <forum-2008@email.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+module("luci.controller.ushare", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/ushare") then
+		return
+	end
+
+	local page
+
+	page = entry({"admin", "services", "ushare"}, cbi("ushare"), _("uShare"), 60)
+	page.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua b/trunk/package/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua
new file mode 100644
index 00000000..7032b2d5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua
@@ -0,0 +1,42 @@
+--[[
+
+LuCI uShare
+(c) 2008 Yanira <forum-2008@email.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+m = Map("ushare", translate("uShare"),
+	luci.util.pcdata(translate("uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server component that provides UPnP media devices with information on available multimedia files.")))
+
+s = m:section(TypedSection, "ushare", translate("Settings"))
+s.addremove = false
+s.anonymous = true
+
+s:option(Flag, "enabled", translate("Enable"))
+
+s:option(Value, "username", translate("Username"))
+
+s:option(Value, "servername", translate("Servername"))
+
+dif = s:option( Value, "interface", translate("Interface")) 
+for _, nif in ipairs(luci.sys.net.devices()) do                         
+        if nif ~= "lo" then dif:value(nif) end                          
+end 
+
+s:option(DynamicList, "content_directories", translate("Content directories"))
+
+s:option(Flag, "disable_webif", translate("Disable webinterface"))
+
+s:option(Flag, "disable_telnet", translate("Disable telnet console"))
+
+s:option(Value, "options", translate("Options"))
+
+return m
diff --git a/trunk/package/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare b/trunk/package/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare
new file mode 100755
index 00000000..8bcb6e41
--- /dev/null
+++ b/trunk/package/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@ushare[-1]
+	add ucitrack ushare
+	set ucitrack.@ushare[-1].init=ushare
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-vnstat/Makefile b/trunk/package/luci/applications/luci-vnstat/Makefile
new file mode 100644
index 00000000..0d76c05e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-vnstat/Makefile
@@ -0,0 +1,4 @@
+PO = vnstat
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-vnstat/ipkg/postinst b/trunk/package/luci/applications/luci-vnstat/ipkg/postinst
new file mode 100755
index 00000000..816084a4
--- /dev/null
+++ b/trunk/package/luci/applications/luci-vnstat/ipkg/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-vnstat ) && rm -f /etc/uci-defaults/luci-vnstat
+	/etc/init.d/vnstat enabled || /etc/init.d/vnstat enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-vnstat/luasrc/controller/vnstat.lua b/trunk/package/luci/applications/luci-vnstat/luasrc/controller/vnstat.lua
new file mode 100644
index 00000000..3871fa25
--- /dev/null
+++ b/trunk/package/luci/applications/luci-vnstat/luasrc/controller/vnstat.lua
@@ -0,0 +1,11 @@
+module("luci.controller.vnstat", package.seeall)
+
+function index()
+	entry({"admin", "status", "vnstat"}, alias("admin", "status", "vnstat", "graphs"), _("VnStat Traffic Monitor"), 90)
+	entry({"admin", "status", "vnstat", "graphs"}, template("vnstat"), _("Graphs"), 1)
+	entry({"admin", "status", "vnstat", "config"}, cbi("vnstat"), _("Configuration"), 2)
+
+	entry({"mini", "network", "vnstat"}, alias("mini", "network", "vnstat", "graphs"), _("VnStat Traffic Monitor"), 90)
+	entry({"mini", "network", "vnstat", "graphs"}, template("vnstat"), _("Graphs"), 1)
+	entry({"mini", "network", "vnstat", "config"}, cbi("vnstat"), _("Configuration"), 2)
+end
diff --git a/trunk/package/luci/applications/luci-vnstat/luasrc/model/cbi/vnstat.lua b/trunk/package/luci/applications/luci-vnstat/luasrc/model/cbi/vnstat.lua
new file mode 100644
index 00000000..38b06ba9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-vnstat/luasrc/model/cbi/vnstat.lua
@@ -0,0 +1,91 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local utl = require "luci.util"
+local sys = require "luci.sys"
+local fs  = require "nixio.fs"
+local nw  = require "luci.model.network"
+
+local dbdir, line
+
+for line in io.lines("/etc/vnstat.conf") do
+	dbdir = line:match("^%s*DatabaseDir%s+[\"'](%S-)[\"']")
+	if dbdir then break end
+end
+
+dbdir = dbdir or "/var/lib/vnstat"
+
+
+m = Map("vnstat", translate("VnStat"),
+	translate("VnStat is a network traffic monitor for Linux that keeps a log of network traffic for the selected interface(s)."))
+
+m.submit = translate("Restart VnStat")
+m.reset  = false
+
+nw.init(luci.model.uci.cursor_state())
+
+local ifaces = { }
+local enabled = { }
+local iface
+
+if fs.access(dbdir) then
+	for iface in fs.dir(dbdir) do
+		if iface:sub(1,1) ~= '.' then
+			ifaces[iface] = iface
+			enabled[iface] = iface
+		end
+	end
+end
+
+for _, iface in ipairs(sys.net.devices()) do
+	ifaces[iface] = iface
+end
+
+
+local s = m:section(TypedSection, "vnstat")
+s.anonymous = true
+s.addremove = false
+
+mon_ifaces = s:option(Value, "interface", translate("Monitor selected interfaces"))
+mon_ifaces.template   = "cbi/network_ifacelist"
+mon_ifaces.widget     = "checkbox"
+mon_ifaces.cast       = "table"
+mon_ifaces.noinactive = true
+mon_ifaces.nocreate   = true
+
+function mon_ifaces.write(self, section, val)
+	local i
+	local s = { }
+
+	if val then
+		for _, i in ipairs(type(val) == "table" and val or { val }) do
+			s[i] = true
+		end
+	end
+
+	for i, _ in pairs(ifaces) do
+		if not s[i] then
+			fs.unlink(dbdir .. "/" .. i)
+			fs.unlink(dbdir .. "/." .. i)
+		end
+	end
+
+	if next(s) then
+		m.uci:set_list("vnstat", section, "interface", utl.keys(s))
+	else
+		m.uci:delete("vnstat", section, "interface")
+	end
+end
+
+mon_ifaces.remove = mon_ifaces.write
+
+return m
diff --git a/trunk/package/luci/applications/luci-vnstat/luasrc/view/vnstat.htm b/trunk/package/luci/applications/luci-vnstat/luasrc/view/vnstat.htm
new file mode 100644
index 00000000..d67f9b3b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-vnstat/luasrc/view/vnstat.htm
@@ -0,0 +1,108 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%-
+
+local fs  = require "nixio.fs"
+local sys = require "luci.sys"
+local utl = require "luci.util"
+
+local param = luci.http.formvalue
+
+local iface = param("iface")
+local style = param("style")
+
+style = (style and #style > 0) and style or "s"
+
+
+--
+-- render image
+--
+if iface then
+	style = style:gsub("[^%w]", "")
+	iface = iface:gsub("[^%w%.%-]", "")
+
+	luci.http.prepare_content("image/png")
+
+	local png = io.popen("vnstati -i '%s' '-%s' -o -" % { iface, style })
+	luci.http.write(png:read("*a"))
+	png:close()
+
+	return
+
+--
+-- update database
+--
+else
+	sys.call("vnstat -u >/dev/null 2>/dev/null")
+end
+
+
+--
+-- find databases
+--
+local dbdir, line
+
+for line in io.lines("/etc/vnstat.conf") do
+	dbdir = line:match("^%s*DatabaseDir%s+[\"'](%S-)[\"']")
+	if dbdir then break end
+end
+
+dbdir = dbdir or "/var/lib/vnstat"
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:VnStat Graphs%></a></h2>
+
+<form action="" method="get">
+
+<select name="style">
+	<option value="s"<%=(style == "s") and ' selected="selected"' or ''%>><%:Summary display%></option>
+	<option value="t"<%=(style == "t") and ' selected="selected"' or ''%>><%:Top 10 display%></option>
+	<option value="h"<%=(style == "h") and ' selected="selected"' or ''%>><%:Hourly traffic%></option>
+	<option value="d"<%=(style == "d") and ' selected="selected"' or ''%>><%:Daily traffic%></option>
+	<option value="m"<%=(style == "m") and ' selected="selected"' or ''%>><%:Monthly traffic%></option>
+</select>
+
+<input type="submit" value="<%:Update »%>" />
+
+</form>
+
+<br /><hr /><br />
+
+<div style="text-align:center">
+<%
+   empty = true
+   ifdir = fs.dir(dbdir)
+
+   if ifdir then
+     for iface in ifdir do
+       if iface:sub(1,1) ~= "." then
+         empty = false
+%>
+	<img src="<%=REQUEST_URI%>?iface=<%=iface%>&amp;style=<%=param('style')%>" alt="" />
+	<br /><br />
+<%
+       end
+     end
+   end 
+%>
+
+<% if empty then %>
+<p><em><%:No database has been set up yet. Go to the VnStat configuration and enable monitoring for one or more interfaces.%></em></p>
+<% end %>
+
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-vnstat/root/etc/uci-defaults/luci-vnstat b/trunk/package/luci/applications/luci-vnstat/root/etc/uci-defaults/luci-vnstat
new file mode 100755
index 00000000..fa204b3b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-vnstat/root/etc/uci-defaults/luci-vnstat
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@vnstat[-1]
+	add ucitrack vnstat
+	set ucitrack.@vnstat[-1].init=vnstat
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-voice-core/Makefile b/trunk/package/luci/applications/luci-voice-core/Makefile
new file mode 100644
index 00000000..d57c456d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-voice-core/Makefile
@@ -0,0 +1,4 @@
+PO=voice_core
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-voice-core/luasrc/controller/luci_voice.lua b/trunk/package/luci/applications/luci-voice-core/luasrc/controller/luci_voice.lua
new file mode 100644
index 00000000..728afb6a
--- /dev/null
+++ b/trunk/package/luci/applications/luci-voice-core/luasrc/controller/luci_voice.lua
@@ -0,0 +1,31 @@
+--[[
+
+Luci Voice Core
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_voice", package.seeall)
+
+function index()
+   local e
+
+   e = entry({"admin", "voice"}, template("luci_voice/index") , _("Voice"), 90)
+   e.index = true
+
+   e = entry({"mini", "voice"}, template("luci_voice/index"), _("Voice"), 90)
+   e.index = true
+
+   e = entry({"mini", "voice", "phones"}, template("luci_voice/phone_index"), _("Phones"), 90)
+   e.index = true
+
+   e = entry({"admin", "voice", "phones"}, template("luci_voice/phone_index"), _("Phones"), 90)
+   e.index = true
+
+end
diff --git a/trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/index.htm b/trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/index.htm
new file mode 100644
index 00000000..13ec9ed5
--- /dev/null
+++ b/trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/index.htm
@@ -0,0 +1,24 @@
+<%#
+LuCI - Lua Configuration Interface
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content">Voice</a></h2>
+<p>Here you can control libreCMC voice-related settings and see
+  voice-related information from libreCMC</p>
+<p>In particular Asterisk configuration and information is displayed
+  here, as well as diagnostics that specifically apply to voice but are
+  not general networking diagnostics (e.g. includes SIP device scans, but not
+  ping tests).  Includes PSTN phones as well as VoIP and possibly
+  non-telephony related options.
+</p>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/phone_index.htm b/trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/phone_index.htm
new file mode 100644
index 00000000..98630f9d
--- /dev/null
+++ b/trunk/package/luci/applications/luci-voice-core/luasrc/view/luci_voice/phone_index.htm
@@ -0,0 +1,20 @@
+<%#
+LuCI - Lua Configuration Interface
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content">Phones</a></h2>
+<p>Here you can control phone configuration and information in libreCMC</p>
+<p>You can control the setup of phone clients and servers and see
+  information such as diagnostics related to phone devices from this menu.
+</p>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-voice-diag/Makefile b/trunk/package/luci/applications/luci-voice-diag/Makefile
new file mode 100644
index 00000000..b764ed43
--- /dev/null
+++ b/trunk/package/luci/applications/luci-voice-diag/Makefile
@@ -0,0 +1,4 @@
+PO=voice_diag
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua b/trunk/package/luci/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua
new file mode 100644
index 00000000..7c3f341e
--- /dev/null
+++ b/trunk/package/luci/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua
@@ -0,0 +1,22 @@
+--[[
+
+Luci Voice Core
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.luci_voice.luci_voice_diag", package.seeall)
+
+function index()
+	local e
+
+	e = entry({"admin", "voice", "diag"}, template("luci_voice/diag_index"), _("Diagnostics"), 90)
+	e.index = true
+	e.dependent = true
+end
diff --git a/trunk/package/luci/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm b/trunk/package/luci/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm
new file mode 100644
index 00000000..387d2ab6
--- /dev/null
+++ b/trunk/package/luci/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm
@@ -0,0 +1,18 @@
+<%#
+LuCI - Lua Configuration Interface
+(c) 2009 Daniel Dickinson
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+<p><%:Under this menu are options that allow you to configure and perform tests on the voice operations of your system.  These are known as diagnostics.%></p>
+<p><%:The diagnostics available on your device depend on the modules that you have installed.%></p>
+<%+footer%>
diff --git a/trunk/package/luci/applications/luci-watchcat/Makefile b/trunk/package/luci/applications/luci-watchcat/Makefile
new file mode 100644
index 00000000..2cb156c0
--- /dev/null
+++ b/trunk/package/luci/applications/luci-watchcat/Makefile
@@ -0,0 +1,3 @@
+PO=watchcat
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-watchcat/ipkg/postinst b/trunk/package/luci/applications/luci-watchcat/ipkg/postinst
new file mode 100644
index 00000000..99114604
--- /dev/null
+++ b/trunk/package/luci/applications/luci-watchcat/ipkg/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+me="watchcat"
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-$me ) && rm -f /etc/uci-defaults/luci-$me
+	/etc/init.d/$me enabled || /etc/init.d/$me enable
+	exit 0
+}
diff --git a/trunk/package/luci/applications/luci-watchcat/luasrc/controller/watchcat.lua b/trunk/package/luci/applications/luci-watchcat/luasrc/controller/watchcat.lua
new file mode 100644
index 00000000..5eba5cde
--- /dev/null
+++ b/trunk/package/luci/applications/luci-watchcat/luasrc/controller/watchcat.lua
@@ -0,0 +1,22 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Christian Gagneraud <chris@techworks.ie>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.watchcat", package.seeall)
+
+function index()
+   if not nixio.fs.access("/etc/config/system") then
+      return
+   end
+   entry({"admin", "services", "watchcat"}, cbi("watchcat/watchcat"), _("Watchcat"), 90)
+end
diff --git a/trunk/package/luci/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua b/trunk/package/luci/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
new file mode 100644
index 00000000..fd7038c8
--- /dev/null
+++ b/trunk/package/luci/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
@@ -0,0 +1,64 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Christian Gagneraud <chris@techworks.ie>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("system", 
+	translate("Watchcat"), 
+	translate("Watchcat allows configuring a periodic reboot when the " ..
+		  "Internet connection has been lost for a certain period of time."
+		 ))
+
+s = m:section(TypedSection, "watchcat")
+s.anonymous = true
+s.addremove = true
+
+mode = s:option(ListValue, "mode",
+		translate("Operating mode"))
+mode.default = "allways"
+mode:value("ping", "Reboot on internet connection lost")
+mode:value("allways", "Periodic reboot")
+
+forcedelay = s:option(Value, "forcedelay",
+		      translate("Forced reboot delay"),
+		      translate("When rebooting the system, the watchcat will trigger a soft reboot. " ..
+				"Entering a non zero value here will trigger a delayed hard reboot " ..
+				"if the soft reboot fails. Enter a number of seconds to enable, " ..
+				"use 0 to disable"))
+forcedelay.datatype = "uinteger"
+forcedelay.default = "0"
+
+period = s:option(Value, "period", 
+		  translate("Period"),
+		  translate("In periodic mode, it defines the reboot period. " ..
+			    "In internet mode, it defines the longest period of " .. 
+			    "time without internet access before a reboot is engaged." ..
+			    "Default unit is seconds, you can use the " ..
+			    "suffix 'm' for minutes, 'h' for hours or 'd' " ..
+			    "for days"))
+
+pinghost = s:option(Value, "pinghosts", 
+		    translate("Ping host"),
+		    translate("Host address to ping"))
+pinghost.datatype = "host"
+pinghost.default = "8.8.8.8"
+pinghost:depends({mode="ping"})
+
+pingperiod = s:option(Value, "pingperiod", 
+		      translate("Ping period"),
+		      translate("How often to check internet connection. " ..
+				"Default unit is seconds, you can you use the " ..
+				"suffix 'm' for minutes, 'h' for hours or 'd' " ..
+				"for days"))
+pingperiod:depends({mode="ping"})
+
+return m
diff --git a/trunk/package/luci/applications/luci-watchcat/root/etc/uci-defaults/luci-watchcat b/trunk/package/luci/applications/luci-watchcat/root/etc/uci-defaults/luci-watchcat
new file mode 100644
index 00000000..8cdb8c7b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-watchcat/root/etc/uci-defaults/luci-watchcat
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+        add ucitrack system
+        set ucitrack.@system[-1].init=watchcat
+        commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/luci-wol/Makefile b/trunk/package/luci/applications/luci-wol/Makefile
new file mode 100644
index 00000000..7c4a85b9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wol/Makefile
@@ -0,0 +1,4 @@
+PO = wol
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-wol/luasrc/controller/wol.lua b/trunk/package/luci/applications/luci-wol/luasrc/controller/wol.lua
new file mode 100644
index 00000000..73a9594b
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wol/luasrc/controller/wol.lua
@@ -0,0 +1,6 @@
+module("luci.controller.wol", package.seeall)
+
+function index()
+	entry({"admin", "network", "wol"}, cbi("wol"), _("Wake on LAN"), 90)
+	entry({"mini", "network", "wol"}, cbi("wol"), _("Wake on LAN"), 90)
+end
diff --git a/trunk/package/luci/applications/luci-wol/luasrc/model/cbi/wol.lua b/trunk/package/luci/applications/luci-wol/luasrc/model/cbi/wol.lua
new file mode 100644
index 00000000..ece9e498
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wol/luasrc/model/cbi/wol.lua
@@ -0,0 +1,103 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local sys = require "luci.sys"
+local fs  = require "nixio.fs"
+
+m = SimpleForm("wol", translate("Wake on LAN"),
+	translate("Wake on LAN is a mechanism to remotely boot computers in the local network."))
+
+m.submit = translate("Wake up host")
+m.reset  = false
+
+
+local has_ewk = fs.access("/usr/bin/etherwake")
+local has_wol = fs.access("/usr/bin/wol")
+
+
+s = m:section(SimpleSection)
+
+if has_ewk and has_wol then
+	bin = s:option(ListValue, "binary", translate("WoL program"),
+		translate("Sometimes only one of the two tools works. If one fails, try the other one"))
+
+	bin:value("/usr/bin/etherwake", "Etherwake")
+	bin:value("/usr/bin/wol", "WoL")
+end
+
+if has_ewk then
+	iface = s:option(ListValue, "iface", translate("Network interface to use"),
+		translate("Specifies the interface the WoL packet is sent on"))
+
+	if has_wol then
+		iface:depends("binary", "/usr/bin/etherwake")
+	end
+
+	iface:value("", translate("Broadcast on all interfaces"))
+
+	for _, e in ipairs(sys.net.devices()) do
+		if e ~= "lo" then iface:value(e) end
+	end
+end
+
+
+host = s:option(Value, "mac", translate("Host to wake up"),
+	translate("Choose the host to wake up or enter a custom MAC address to use"))
+
+sys.net.mac_hints(function(mac, name)
+	host:value(mac, "%s (%s)" %{ mac, name })
+end)
+
+
+function host.write(self, s, val)
+	local host = luci.http.formvalue("cbid.wol.1.mac")
+	if host and #host > 0 and host:match("^[a-fA-F0-9:]+$") then
+		local cmd
+		local util = luci.http.formvalue("cbid.wol.1.binary") or (
+			has_ewk and "/usr/bin/etherwake" or "/usr/bin/wol"
+		)
+
+		if util == "/usr/bin/etherwake" then
+			local iface = luci.http.formvalue("cbid.wol.1.iface")
+			cmd = "%s -D%s %q" %{
+				util, (iface ~= "" and " -i %q" % iface or ""), host
+			}
+		else
+			cmd = "%s -v %q" %{ util, host }
+		end
+
+		local msg = "<p><strong>%s</strong><br /><br /><code>%s<br /><br />" %{
+			translate("Starting WoL utility:"), cmd
+		}
+
+		local p = io.popen(cmd .. " 2>&1")
+		if p then
+			while true do
+				local l = p:read("*l")
+				if l then
+					if #l > 100 then l = l:sub(1, 100) .. "..." end
+					msg = msg .. l .. "<br />"
+				else
+					break
+				end
+			end
+			p:close()
+		end
+
+		msg = msg .. "</code></p>"
+
+		m.message = msg
+	end
+end
+
+
+return m
diff --git a/trunk/package/luci/applications/luci-wshaper/Makefile b/trunk/package/luci/applications/luci-wshaper/Makefile
new file mode 100644
index 00000000..fcdd099f
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wshaper/Makefile
@@ -0,0 +1,4 @@
+PO = wshaper
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/applications/luci-wshaper/ipkg/postinst b/trunk/package/luci/applications/luci-wshaper/ipkg/postinst
new file mode 100644
index 00000000..dad88425
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wshaper/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/wshaper ) && rm -f /etc/uci-defaults/wshaper
+	exit 0
+}
+
diff --git a/trunk/package/luci/applications/luci-wshaper/luasrc/controller/wshaper.lua b/trunk/package/luci/applications/luci-wshaper/luasrc/controller/wshaper.lua
new file mode 100644
index 00000000..9d7f01e9
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wshaper/luasrc/controller/wshaper.lua
@@ -0,0 +1,19 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module "luci.controller.wshaper"
+
+function index()
+	entry({"admin", "network", "wshaper"}, cbi("wshaper"), _("Wondershaper"), 80)
+end
+
diff --git a/trunk/package/luci/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua b/trunk/package/luci/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
new file mode 100644
index 00000000..faa64f66
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
@@ -0,0 +1,55 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+require("luci.tools.webadmin")
+
+m = Map("wshaper", translate("Wondershaper"),
+	translate("Wondershaper shapes traffic to ensure low latencies for interactive traffic even when your " ..
+	"internet connection is highly saturated."))
+
+s = m:section(NamedSection, "settings", "wshaper", translate("Wondershaper settings"))
+s.anonymous = true
+
+network = s:option(ListValue, "network", translate("Interface"))
+luci.tools.webadmin.cbi_add_networks(network)
+
+uplink = s:option(Value, "uplink", translate("Uplink"), translate("Upstream bandwidth in kbit/s"))
+uplink.optional = false
+uplink.datatype = "uinteger"
+uplink.default = "240"
+
+uplink = s:option(Value, "downlink", translate("Downlink"), translate("Downstream bandwidth in kbit/s"))
+uplink.optional = false
+uplink.datatype = "uinteger"
+uplink.default = "200"
+
+nopriohostsrc = s:option(DynamicList, "nopriohostsrc", translate("Low priority hosts (Source)"), translate("Host or Network in CIDR notation."))
+nopriohostsrc.optional = true
+nopriohostsrc.datatype = ipaddr
+nopriohostsrc.placeholder = "10.0.0.1/32"
+
+nopriohostdst = s:option(DynamicList, "nopriohostdst", translate("Low priority hosts (Destination)"), translate("Host or Network in CIDR notation."))
+nopriohostdst.optional = true
+nopriohostdst.datatype = ipaddr
+nopriohostdst.placeholder = "10.0.0.1/32"
+
+noprioportsrc = s:option(DynamicList, "noprioportsrc", translate("Low priority source ports"))
+noprioportsrc.optional = true
+noprioportsrc.datatype = "range(0,65535)"
+noprioportsrc.placeholder = "21"
+
+noprioportdst = s:option(DynamicList, "noprioportdst", translate("Low priority destination ports"))
+noprioportdst.optional = true
+noprioportdst.datatype = "range(0,65535)"
+noprioportdst.placeholder = "21"
+
+return m
diff --git a/trunk/package/luci/applications/luci-wshaper/root/etc/uci-defaults/wshaper b/trunk/package/luci/applications/luci-wshaper/root/etc/uci-defaults/wshaper
new file mode 100644
index 00000000..918dff28
--- /dev/null
+++ b/trunk/package/luci/applications/luci-wshaper/root/etc/uci-defaults/wshaper
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@wshaper[-1]
+	set ucitrack.wshaper="wshaper"
+	set ucitrack.wshaper.exec='/etc/init.d/wshaper start'
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/trunk/package/luci/applications/myapplication/Makefile b/trunk/package/luci/applications/myapplication/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/applications/myapplication/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/build/config.mk b/trunk/package/luci/build/config.mk
new file mode 100644
index 00000000..31279ba7
--- /dev/null
+++ b/trunk/package/luci/build/config.mk
@@ -0,0 +1,16 @@
+LUAC = luac
+LUAC_OPTIONS = -s
+LUA_TARGET ?= source
+
+LUA_MODULEDIR = /usr/lib/lua
+LUA_LIBRARYDIR = /usr/lib/lua
+
+LUCI_MODULEDIR = $(LUA_MODULEDIR)/luci
+LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
+LUCI_I18NDIR = $(LUA_MODULEDIR)/luci/i18n
+
+UVL_SCHEMEDIR = host/lib/uci/schema
+
+HTDOCS = /www
+
+LUA=$(shell which lua)
diff --git a/trunk/package/luci/build/gccconfig.mk b/trunk/package/luci/build/gccconfig.mk
new file mode 100644
index 00000000..97d19bde
--- /dev/null
+++ b/trunk/package/luci/build/gccconfig.mk
@@ -0,0 +1,22 @@
+OS ?= $(shell uname)
+
+LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1 || pkg-config --silence-errors --libs lua-5.1 || pkg-config --silence-errors --libs lua)
+LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
+LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1 || pkg-config --silence-errors --cflags lua-5.1 || pkg-config --silence-errors --cflags lua)
+
+CC = gcc
+AR = ar
+RANLIB = ranlib
+CFLAGS = -O2
+FPIC = -fPIC
+EXTRA_CFLAGS = --std=gnu99
+WFLAGS = -Wall -pedantic
+CPPFLAGS =
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+ifeq ($(OS),Darwin)
+  SHLIB_FLAGS = -bundle -undefined dynamic_lookup
+else
+  SHLIB_FLAGS = -shared
+endif
+LINK = $(CC) $(LDFLAGS)
+
diff --git a/trunk/package/luci/build/hostenv.sh b/trunk/package/luci/build/hostenv.sh
new file mode 100755
index 00000000..0f2fc27d
--- /dev/null
+++ b/trunk/package/luci/build/hostenv.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+export LD_LIBRARY_PATH="$1/usr/lib:$LD_LIBRARY_PATH"
+[ `uname -s` = "Darwin" ] && export DYLD_LIBRARY_PATH="$1/usr/lib:$DYLD_LIBRARY_PATH"
+export PATH="$1/bin:$1/usr/bin:$PATH"
+export LUA_PATH="$1/$2/?.lua;$1/$2/?/init.lua;;"
+export LUA_CPATH="$1/$3/?.so;;"
+export LUCI_SYSROOT="$1"
+$4
diff --git a/trunk/package/luci/build/i18n-init.sh b/trunk/package/luci/build/i18n-init.sh
new file mode 100755
index 00000000..b20fbc33
--- /dev/null
+++ b/trunk/package/luci/build/i18n-init.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+PATTERN=$1
+SCM=
+
+[ -d .svn ] && SCM="svn"
+git=$( which git 2>/dev/null )
+[ "$git" ] && "$git" status >/dev/null && SCM="git"
+
+[ -z "$SCM" ] && {
+	echo "Unsupported SCM tool" >&2
+	exit 1
+}
+
+[ -z "$PATTERN" ] && PATTERN="*.pot"
+
+for lang in $(cd po; echo ?? ??_??); do
+	for file in $(cd po/templates; echo $PATTERN); do
+		if [ -f po/templates/$file -a ! -f "po/$lang/${file%.pot}.po" ]; then
+			msginit --no-translator -l "$lang" -i "po/templates/$file" -o "po/$lang/${file%.pot}.po"
+			$SCM add "po/$lang/${file%.pot}.po"
+		fi
+	done
+done
diff --git a/trunk/package/luci/build/i18n-po2lua.pl b/trunk/package/luci/build/i18n-po2lua.pl
new file mode 100755
index 00000000..5129055f
--- /dev/null
+++ b/trunk/package/luci/build/i18n-po2lua.pl
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+
+@ARGV == 2 || die "Usage: $0 <source-dir> <dest-dir>\n";
+
+my $source_dir  = shift @ARGV;
+my $target_dir  = shift @ARGV;
+
+if( ! -d $target_dir )
+{
+	system('mkdir', '-p', $target_dir);
+}
+
+if( open F, "find $source_dir -type f -name '*.po' |" )
+{
+	while( chomp( my $file = readline F ) )
+	{
+		my ( $lang, $basename ) = $file =~ m{.+/(\w+)/([^/]+)\.po$};
+		$lang = lc $lang;
+		$lang =~ s/_/-/g;
+
+		printf "Generating %-40s ", "$target_dir/$basename.$lang.lmo";
+		system("./build/po2lmo", $file, "$target_dir/$basename.$lang.lmo");
+		print ( -f "$target_dir/$basename.$lang.lmo" ? "done\n" : "empty\n" );
+	}
+
+	close F;
+}
diff --git a/trunk/package/luci/build/i18n-scan.pl b/trunk/package/luci/build/i18n-scan.pl
new file mode 100755
index 00000000..899d90d2
--- /dev/null
+++ b/trunk/package/luci/build/i18n-scan.pl
@@ -0,0 +1,128 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use Text::Balanced qw(extract_bracketed extract_delimited extract_tagged);
+
+@ARGV >= 1 || die "Usage: $0 <source direcory>\n";
+
+
+my %stringtable;
+
+sub dec_lua_str
+{
+	my $s = shift;
+	$s =~ s/[\s\n]+/ /g;
+	$s =~ s/\\n/\n/g;
+	$s =~ s/\\t/\t/g;
+	$s =~ s/\\(.)/$1/g;
+	$s =~ s/^ //;
+	$s =~ s/ $//;
+	return $s;
+}
+
+sub dec_tpl_str
+{
+	my $s = shift;
+	$s =~ s/-$//;
+	$s =~ s/[\s\n]+/ /g;
+	$s =~ s/^ //;
+	$s =~ s/ $//;
+	$s =~ s/\\/\\\\/g;
+	return $s;
+}
+
+
+if( open F, "find @ARGV -type f '(' -name '*.htm' -o -name '*.lua' ')' |" )
+{
+	while( defined( my $file = readline F ) )
+	{
+		chomp $file;
+
+		if( open S, "< $file" )
+		{
+			local $/ = undef;
+			my $raw = <S>;
+			close S;
+
+
+			my $text = $raw;
+
+			while( $text =~ s/ ^ .*? (?:translate|translatef|i18n|_) [\n\s]* \( /(/sgx )
+			{
+				( my $code, $text ) = extract_bracketed($text, q{('")});
+
+				$code =~ s/\\\n/ /g;
+				$code =~ s/^\([\n\s]*//;
+				$code =~ s/[\n\s]*\)$//;
+
+				my $res = "";
+				my $sub = "";
+
+				if( $code =~ /^['"]/ )
+				{
+					while( defined $sub )
+					{
+						( $sub, $code ) = extract_delimited($code, q{'"}, q{\s*(?:\.\.\s*)?});
+
+						if( defined $sub && length($sub) > 2 )
+						{
+							$res .= substr $sub, 1, length($sub) - 2;
+						}
+						else
+						{
+							undef $sub;
+						}
+					}
+				}
+				elsif( $code =~ /^(\[=*\[)/ )
+				{
+					my $stag = quotemeta $1;
+					my $etag = $stag;
+					   $etag =~ s/\[/]/g;
+
+					( $res ) = extract_tagged($code, $stag, $etag);
+
+					$res =~ s/^$stag//;
+					$res =~ s/$etag$//;
+				}
+
+				$res = dec_lua_str($res);
+				$stringtable{$res}++ if $res;
+			}
+
+
+			$text = $raw;
+
+			while( $text =~ s/ ^ .*? <% -? [:_] /<%/sgx )
+			{
+				( my $code, $text ) = extract_tagged($text, '<%', '%>');
+
+				if( defined $code )
+				{
+					$code = dec_tpl_str(substr $code, 2, length($code) - 4);
+					$stringtable{$code}++;
+				}
+			}
+		}
+	}
+
+	close F;
+}
+
+
+if( open C, "| msgcat -" )
+{
+	printf C "msgid \"\"\nmsgstr \"Content-Type: text/plain; charset=UTF-8\"\n\n";
+
+	foreach my $key ( sort keys %stringtable )
+	{
+		if( length $key )
+		{
+			$key =~ s/"/\\"/g;
+			printf C "msgid \"%s\"\nmsgstr \"\"\n\n", $key;
+		}
+	}
+
+	close C;
+}
diff --git a/trunk/package/luci/build/i18n-sync.sh b/trunk/package/luci/build/i18n-sync.sh
new file mode 100755
index 00000000..430e13f2
--- /dev/null
+++ b/trunk/package/luci/build/i18n-sync.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+for m in */*/Makefile; do
+	if grep -qE '^PO *=' $m; then
+		p="${m%/Makefile}"
+		t="$(sed -ne 's/^PO *= *//p' $m)"
+
+		case "$t" in
+			*\ *)
+				echo "WARNING: Cannot handle $p" >&2
+				continue
+			;;
+			*base*)
+				continue
+			;;
+		esac
+
+		if [ -f "po/templates/$t.pot" ]; then
+			./build/i18n-scan.pl "$p" > "po/templates/$t.pot"
+		fi
+	fi
+done
+
+./build/mkbasepot.sh
+./build/i18n-update.pl po
diff --git a/trunk/package/luci/build/i18n-update.pl b/trunk/package/luci/build/i18n-update.pl
new file mode 100755
index 00000000..4106c6da
--- /dev/null
+++ b/trunk/package/luci/build/i18n-update.pl
@@ -0,0 +1,69 @@
+#!/usr/bin/perl
+
+@ARGV >= 1 || die "Usage: $0 <po directory> [<file pattern>]\n";
+
+my $source  = shift @ARGV;
+my $pattern = shift @ARGV || '*.po';
+
+sub read_header
+{
+	my $file = shift || return;
+	local $/;
+
+	open P, "< $file" || die "open(): $!";
+	my $data = readline P;
+	close P;
+
+	$data =~ /
+		^ (
+		msgid \s "" \n
+		msgstr \s "" \n
+		(?: " [^\n]+ " \n )+
+		\n )
+	/mx;
+
+	return $1;
+}
+
+sub write_header
+{
+	my $file = shift || return;
+	my $head = shift || return;
+	local $/;
+
+	open P, "< $file" || die "open(): $!";
+	my $data = readline P;
+	close P;
+
+	$data =~ s/
+		^ (
+		msgid \s "" \n
+		msgstr \s "" \n
+		(?: " [^\n]+ " \n )+
+		\n )
+	/$head/mx;
+
+	open P, "> $file" || die "open(): $!";
+	print P $data;
+	close P;
+}
+
+if( open F, "find $source -type f -name '$pattern' |" )
+{
+	while( chomp( my $file = readline F ) )
+	{
+		my ( $basename ) = $file =~ m{.+/([^/]+)\.po$};
+		
+		if( -f "$source/templates/$basename.pot" )
+		{
+			my $head = read_header($file);
+
+			printf "Updating %-40s", $file;
+			system("msgmerge", "-U", "-N", $file, "$source/templates/$basename.pot");
+
+			write_header($file, $head);
+		}
+	}
+
+	close F;
+}
diff --git a/trunk/package/luci/build/luci.cgi b/trunk/package/luci/build/luci.cgi
new file mode 100755
index 00000000..f4b59004
--- /dev/null
+++ b/trunk/package/luci/build/luci.cgi
@@ -0,0 +1,8 @@
+#!/usr/bin/lua
+
+dofile "../../build/setup.lua"
+
+require "luci.cacheloader"
+require "luci.sgi.cgi"
+luci.dispatcher.indexcache = "/tmp/luci-indexcache"
+luci.sgi.cgi.run()
diff --git a/trunk/package/luci/build/lucid.lua b/trunk/package/luci/build/lucid.lua
new file mode 100644
index 00000000..71e4fd25
--- /dev/null
+++ b/trunk/package/luci/build/lucid.lua
@@ -0,0 +1,2 @@
+dofile "build/setup.lua"
+require "luci.lucid".start()
diff --git a/trunk/package/luci/build/makedocs.sh b/trunk/package/luci/build/makedocs.sh
new file mode 100755
index 00000000..2f7f5734
--- /dev/null
+++ b/trunk/package/luci/build/makedocs.sh
@@ -0,0 +1,2 @@
+luadoc -d $2 --no-files $(for f in $(find $1 -name '*.lua' -type f); do if grep -q -- "@return" $f; then echo $f; fi; done)
+echo API-Documentation was created in $2.
diff --git a/trunk/package/luci/build/mkbasepot.sh b/trunk/package/luci/build/mkbasepot.sh
new file mode 100755
index 00000000..009e9b8a
--- /dev/null
+++ b/trunk/package/luci/build/mkbasepot.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+[ -d ./build ] || {
+	echo "Please execute as ./build/mkbasepot.sh" >&2
+	exit 1
+}
+
+echo -n "Updating po/templates/base.pot ... "
+
+./build/i18n-scan.pl \
+	modules/base/ modules/admin-full/ \
+	protocols/ themes/librecmc/ \
+> po/templates/base.pot
+
+echo "done"
diff --git a/trunk/package/luci/build/mkrevision.sh b/trunk/package/luci/build/mkrevision.sh
new file mode 100755
index 00000000..02b7fa37
--- /dev/null
+++ b/trunk/package/luci/build/mkrevision.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+TOPDIR="${0%mkrevision.sh}"
+
+[ -d "$TOPDIR/../build" ] || {
+	echo "Please execute as ./build/mkrevision.sh" >&2
+	exit 1
+}
+
+(
+	cd "$TOPDIR"
+	if svn info >/dev/null 2>/dev/null; then
+		revision="svn-r$(LC_ALL=C svn info | sed -ne 's/^Revision: //p')"
+	elif git log -1 >/dev/null 2>/dev/null; then
+		revision="svn-r$(LC_ALL=C git log -1 | sed -ne 's/.*git-svn-id: .*@\([0-9]\+\) .*/\1/p')"
+		if [ "$revision" = "svn-r" ]; then
+			set -- $(git log -1 --format="%ct %h")
+			secs="$(($1 % 86400))"
+			yday="$(date --utc --date="@$1" "+%y.%j")"
+			revision="$(printf 'git-%s.%05d-%s' "$yday" "$secs" "$2")"
+		fi
+	else
+		revision="unknown"
+	fi
+
+	echo "$revision"
+)
diff --git a/trunk/package/luci/build/mkversion.sh b/trunk/package/luci/build/mkversion.sh
new file mode 100755
index 00000000..48703b44
--- /dev/null
+++ b/trunk/package/luci/build/mkversion.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+if svn info >/dev/null 2>/dev/null; then
+	if [ "${4%%/*}" = "branches" ]; then
+		variant="LuCI ${4##*[-/]} Branch"
+	elif [ "${4%%/*}" = "tags" ]; then
+		variant="LuCI ${4##*[-/]} Release"
+	else
+		variant="LuCI Trunk"
+	fi
+elif git status >/dev/null 2>/dev/null; then
+	tag="$(git describe --tags 2>/dev/null)"
+	branch="$(git symbolic-ref --short -q HEAD 2>/dev/null)"
+
+	if [ -n "$tag" ]; then
+		variant="LuCI $tag Release"
+	elif [ "$branch" != "master" ]; then
+		variant="LuCI ${branch##*-} Branch"
+	else
+		variant="LuCI Master"
+	fi
+else
+	variant="LuCI"
+fi
+
+cat <<EOF > $1
+local pcall, dofile, _G = pcall, dofile, _G
+
+module "luci.version"
+
+if pcall(dofile, "/etc/librecmc_release") and _G.DISTRIB_DESCRIPTION then
+	distname    = ""
+	distversion = _G.DISTRIB_DESCRIPTION
+else
+	distname    = "${2:-libreCMC}"
+	distversion = "${3:-Development Snapshot}"
+end
+
+luciname    = "$variant"
+luciversion = "${5:-svn}"
+EOF
diff --git a/trunk/package/luci/build/module.mk b/trunk/package/luci/build/module.mk
new file mode 100644
index 00000000..b69019c5
--- /dev/null
+++ b/trunk/package/luci/build/module.mk
@@ -0,0 +1,46 @@
+MAKEPATH:=$(dir $(lastword $(MAKEFILE_LIST)))
+-include $(MAKEPATH)config.mk
+-include $(MAKEPATH)gccconfig.mk
+
+.PHONY: all build compile luacompile luasource clean luaclean
+
+all: build
+
+build: luabuild gccbuild
+
+luabuild: lua$(LUA_TARGET)
+
+gccbuild: compile
+compile:
+
+clean: luaclean
+
+luasource:
+	mkdir -p dist$(LUA_MODULEDIR)
+	mkdir -p dist$(LUCI_MODULEDIR)
+	mkdir -p dist$(HTDOCS)
+	cp -pR root/* dist 2>/dev/null || true
+	cp -pR luasrc/* dist$(LUCI_MODULEDIR) 2>/dev/null || true
+	cp -pR lua/* dist$(LUA_MODULEDIR) 2>/dev/null || true
+	cp -pR htdocs/* dist$(HTDOCS) 2>/dev/null || true
+	for i in $$(find dist -name .svn -o -name .gitignore); do rm -rf $$i || true; done
+  ifneq ($(PO),)
+	mkdir -p dist$(LUCI_I18NDIR)
+	for file in $(PO); do \
+	  cp $(HOST)/lua-po/$$file.$(if $(PO_LANG),$(PO_LANG),*).* dist$(LUCI_I18NDIR)/ 2>/dev/null || true; \
+	done
+  endif
+
+
+luadiet: luasource
+	for i in $$(find dist -type f -name '*.lua'); do LUA_PATH="../../contrib/luasrcdiet/lua/?.lua" $(LUA) ../../contrib/luasrcdiet/lua/LuaSrcDiet.lua --maximum $$i -o $$i.diet && mv $$i.diet $$i; done
+
+luastrip: luasource
+	for i in $$(find dist -type f -name '*.lua'); do perl -e 'undef $$/; open( F, "< $$ARGV[0]" ) || die $$!; $$src = <F>; close F; $$src =~ s/--\[\[.*?\]\](--)?//gs; $$src =~ s/^\s*--.*?\n//gm; open( F, "> $$ARGV[0]" ) || die $$!; print F $$src; close F' $$i; done
+
+luacompile: luasource
+	for i in $$(find dist -name *.lua -not -name debug.lua| sort); do if ! $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; then echo "Error compiling $$i"; exit 1; fi; done
+
+luaclean:
+	rm -rf dist
+
diff --git a/trunk/package/luci/build/setup.lua b/trunk/package/luci/build/setup.lua
new file mode 100644
index 00000000..f4ed7695
--- /dev/null
+++ b/trunk/package/luci/build/setup.lua
@@ -0,0 +1,46 @@
+local SYSROOT = os.getenv("LUCI_SYSROOT")
+
+-- override uci access
+local uci_core  = require "uci"
+local uci_model = require "luci.model.uci"
+
+uci_model.cursor = function(config, save)
+	return uci_core.cursor(config or SYSROOT .. "/etc/config", save or SYSROOT .. "/tmp/.uci")
+end
+
+uci_model.cursor_state = function()
+	return uci_core.cursor(SYSROOT .. "/etc/config", SYSROOT .. "/var/state")
+end
+
+uci_model.inst = uci_model.cursor()
+uci_model.inst_state = uci_model.cursor_state()
+
+-- allow any password in local sdk
+local sys = require "luci.sys"
+sys.user.checkpasswd = function() return true end
+sys.user.getpasswd   = function() return "x"  end
+
+-- dummy sysinfo on Darwin
+require "nixio"
+
+if not nixio.sysinfo then
+	function nixio.sysinfo()
+		return {
+			bufferram = 0,
+			freehigh = 0,
+			freeram = 0,
+			freeswap = 0,
+			loads = { 0.0, 0.0, 0.0 },
+			mem_unit = 1024,
+			procs = 0,
+			sharedram = 0,
+			totalhigh = 0
+		}
+	end
+end
+
+-- override nixio.fs.access() to check sysroot first
+local _access = nixio.fs.access
+function nixio.fs.access(file)
+	return _access(SYSROOT .. "/" .. file) or _access(file)
+end
diff --git a/trunk/package/luci/build/zoneinfo2lua.pl b/trunk/package/luci/build/zoneinfo2lua.pl
new file mode 100755
index 00000000..722711a9
--- /dev/null
+++ b/trunk/package/luci/build/zoneinfo2lua.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/perl
+# zoneinfo2lua.pl - Make Lua module from /usr/share/zoneinfo
+# Execute from within /usr/share/zoneinfo
+# $Id$
+
+use strict;
+
+my %TZ;
+
+my $tzdin  = $ARGV[0] || "/usr/share/zoneinfo";
+my $tzdout = $ARGV[1] || "./libs/sys/luasrc/sys/zoneinfo";
+
+local $/ = "\012";
+open( ZTAB, "< $tzdin/zone.tab" ) || die "open($tzdin/zone.tab): $!";
+
+while( ! eof ZTAB ) {
+	chomp( my $line = readline ZTAB );
+	next if $line =~ /^#/ || $line =~ /^\s+$/;
+
+	my ( undef, undef, $zone, @comment ) = split /\s+/, $line;
+
+	printf STDERR "%-40s", $zone;
+
+	if( open ZONE, "< $tzdin/$zone" ) {
+		seek ZONE, -2, 2;
+
+		while( tell(ZONE) > 0 ) {
+			read ZONE, my $char, 1;
+			( $char eq "\012" ) ? last : seek ZONE, -2, 1;
+		}
+
+		chomp( my $tz = readline ZONE );
+		print STDERR ( $tz || "(no tzinfo found)" ), "\n";
+		close ZONE;
+
+		if( $tz ) {
+			$zone =~ s/_/ /g;
+			$TZ{$zone} = $tz;
+		}
+	}
+	else
+	{
+		print STDERR "open($tzdin/$zone): $!\n";
+	}
+}
+
+close ZTAB;
+
+
+open(O, "> $tzdout/tzdata.lua") || die "open($tzdout/tzdata.lua): $!\n";
+
+print STDERR "Writing time zones to $tzdout/tzdata.lua ... ";
+print O <<HEAD;
+--[[
+LuCI - Autogenerated Zoneinfo Module
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module "luci.sys.zoneinfo.tzdata"
+
+TZ = {
+HEAD
+
+foreach my $zone ( sort keys %TZ ) {
+	printf O "\t{ '%s', '%s' },\n", $zone, $TZ{$zone}
+}
+
+print O "}\n";
+close O;
+
+print STDERR "done\n";
+
+
+open (O, "> $tzdout/tzoffset.lua") || die "open($tzdout/tzoffset.lua): $!\n";
+
+print STDERR "Writing time offsets to $tzdout/tzoffset.lua ... ";
+print O <<HEAD;
+--[[
+LuCI - Autogenerated Zoneinfo Module
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module "luci.sys.zoneinfo.tzoffset"
+
+OFFSET = {
+HEAD
+
+my %seen;
+foreach my $tz ( sort keys %TZ ) {
+	my $zone = $TZ{$tz};
+
+	if( $zone =~ /^
+		([A-Z]+)
+		(?:
+			( -? \d+ (?: : \d+ )? )
+			(?:
+				([A-Z]+)
+				( -? \d+ (?: : \d+ )? )? 
+			)?
+		)?
+	\b /xo ) {
+		my ( $offset, $s, $h, $m ) = ( 0, 1, 0, 0 );
+		my ( $std, $soffset, $dst, $doffset ) = ( $1, $2, $3, $4 );
+
+		next if $seen{$std}; # and ( !$dst or $seen{$dst} );
+
+		if ( $soffset ) {
+			( $s, $h, $m ) = $soffset =~ /^(-)?(\d+)(?::(\d+))?$/;
+
+			$s = $s ? 1 : -1;
+			$h ||= 0;
+			$m ||= 0;
+
+			$offset  = $s * $h * 60 * 60;
+			$offset += $s * $m * 60;
+
+			printf O "\t%-5s = %6d,\t-- %s\n",
+				lc($std), $offset, $std;
+
+			$seen{$std} = 1;
+
+			if( $dst ) {
+				if( $doffset ) {
+					( $s, $h, $m ) = $doffset =~ /^(-)?(\d+)(?::(\d+))?$/;
+
+					$s = $s ? 1 : -1;
+					$h ||= 0;
+					$m ||= 0;
+
+					$offset  = $s * $h * 60 * 60;
+					$offset += $s * $m * 60;
+				} else  {
+					$offset += 60 * 60;
+				}
+
+				printf O "\t%-5s = %6d,\t-- %s\n",
+					lc($dst), $offset, $dst;
+	
+				$seen{$dst} = 1;
+			}
+		}
+		else {
+			printf O "\t%-5s = %6d,\t-- %s\n",
+				lc($std), $offset, $std;
+
+			$seen{$std} = 1;
+		}
+
+	}
+}
+
+print O "}\n";
+close O;
+
+print STDERR "done\n";
diff --git a/trunk/package/luci/contrib/fwd/Makefile b/trunk/package/luci/contrib/fwd/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/contrib/fwd/src/Makefile b/trunk/package/luci/contrib/fwd/src/Makefile
new file mode 100644
index 00000000..43749124
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/Makefile
@@ -0,0 +1,18 @@
+CFLAGS  := -ggdb3 -O0 -Wall -I./uci -I./iptables-1.4.5/include
+LDFLAGS := -luci -liptc -lxtables -ldl -L./iptables-1.4.5/libiptc/.libs -L./iptables-1.4.5/.libs -Wl,--export-dynamic
+
+fwd:
+	$(CC) $(CFLAGS) -c -o ucix.o ucix.c
+	$(CC) $(CFLAGS) -c -o fwd_addr.o fwd_addr.c
+	$(CC) $(CFLAGS) -c -o fwd_rules.o fwd_rules.c
+	$(CC) $(CFLAGS) -c -o fwd_config.o fwd_config.c
+	$(CC) $(CFLAGS) -c -o fwd_xtables.o fwd_xtables.c
+	$(CC) $(CFLAGS) -c -o fwd_ipc.o fwd_ipc.c
+	$(CC) $(CFLAGS) -c -o fwd_utils.o fwd_utils.c
+	$(CC) $(CFLAGS) -c -o fwd.o fwd.c
+	$(CC) $(LDFLAGS) -o fwd fwd.o fwd_addr.o fwd_rules.o fwd_config.o fwd_xtables.o fwd_ipc.o fwd_utils.o ucix.o
+	ln -s fwd fw
+
+clean:
+	rm -f *~ fwd fw *.o
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd.c b/trunk/package/luci/contrib/fwd/src/fwd.c
new file mode 100644
index 00000000..3403d844
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd.c
@@ -0,0 +1,320 @@
+/*
+ * fwd - libreCMC firewall daemon - main part
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#include "fwd.h"
+#include "fwd_addr.h"
+#include "fwd_rules.h"
+#include "fwd_config.h"
+#include "fwd_xtables.h"
+#include "fwd_ipc.h"
+#include "fwd_utils.h"
+
+
+static void fwd_foreach_network(
+	struct fwd_handle *h,
+	void (*cb)(struct fwd_handle *h, struct fwd_network *net)
+) {
+	struct fwd_data *data;
+	struct fwd_network *net;
+
+	for( data = h->conf; data; data = data->next )
+	{
+		if( data->type != FWD_S_ZONE )
+			continue;
+
+		for( net = data->section.zone.networks; net; net = net->next )
+			cb(h, net);
+	}
+}
+
+static void fwd_addif_all_cb(struct fwd_handle *h, struct fwd_network *net)
+{
+	fwd_ipt_addif(h, net->name);
+}
+
+static void fwd_delif_all_cb(struct fwd_handle *h, struct fwd_network *net)
+{
+	fwd_ipt_delif(h, net->name);
+}
+
+#define fwd_addif_all(h) fwd_foreach_network(h, fwd_addif_all_cb)
+#define fwd_delif_all(h) fwd_foreach_network(h, fwd_delif_all_cb)
+
+
+static int fwd_server_main(int argc, const char *argv[])
+{
+	struct fwd_handle *h;
+	struct fwd_network *net;
+	struct fwd_addr *addrs;
+	struct fwd_data *data;
+	struct fwd_cidr *addr_old, *addr_new;
+	struct sigaction sa;
+	int unix_client;
+
+	sa.sa_handler = SIG_IGN;
+	sigaction(SIGPIPE, &sa, NULL);
+
+	if( getuid() > 0 )
+		fwd_fatal("Need root permissions!");
+
+	if( !(h = fwd_alloc_ptr(struct fwd_handle)) )
+		fwd_fatal("Out of memory");
+
+	if( (h->rtnl_socket = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) == -1 )
+		fwd_fatal("Failed to create AF_NETLINK socket (%m)");
+
+	if( (h->unix_socket = fwd_ipc_listen()) == -1 )
+		fwd_fatal("Failed to create AF_UNIX socket (%m)");
+
+	if( !(h->conf = fwd_read_config(h)) )
+		fwd_fatal("Failed to read configuration");
+
+	fwd_log_init();
+
+	fwd_ipt_build_ruleset(h);
+	fwd_addif_all(h);
+
+	while(1)
+	{
+		if( (addrs = fwd_get_addrs(h->rtnl_socket, AF_INET)) != NULL )
+		{
+			for( data = h->conf; data; data = data->next )
+			{
+				if( data->type != FWD_S_ZONE )
+					continue;
+
+				for( net = data->section.zone.networks; net; net = net->next )
+				{
+					addr_new = fwd_lookup_addr(addrs, net->ifname);
+					addr_old = net->addr;
+
+					if( !fwd_empty_cidr(addr_new) && fwd_empty_cidr(addr_old) )
+					{
+						fwd_log_info(
+							"Interface %s brought up - adding rules",
+							net->ifname
+						);
+
+						fwd_update_cidr(addr_old, addr_new);
+						fwd_ipt_addif(h, net->name);
+					}
+					else if( fwd_empty_cidr(addr_new) && !fwd_empty_cidr(addr_old) )
+					{
+						fwd_log_info(
+							"Interface %s went down - removing rules",
+							net->ifname
+						);
+
+						fwd_update_cidr(addr_old, NULL);
+						fwd_ipt_delif(h, net->name);
+					}
+					else if( ! fwd_equal_cidr(addr_old, addr_new) )
+					{
+						fwd_log_info(
+							"Interface %s changed IP - rebuilding rules",
+							net->ifname
+						);
+
+						fwd_update_cidr(addr_old, addr_new);
+						fwd_ipt_chgif(h, net->name);
+					}
+				}
+			}
+
+			fwd_free_addrs(addrs);
+		}
+
+
+		if( (unix_client = fwd_ipc_accept(h->unix_socket)) > -1 )
+		{
+			struct fwd_ipc_msg msg;
+			memset(&msg, 0, sizeof(struct fwd_ipc_msg));
+
+			while( fwd_ipc_recvmsg(unix_client, &msg, sizeof(struct fwd_ipc_msg)) > 0 )
+			{
+				fwd_log_info("Got message [%i]", msg.type);
+
+				switch(msg.type)
+				{
+					case FWD_IPC_FLUSH:
+						fwd_log_info("Flushing rules ...");
+						fwd_ipt_clear_ruleset(h);
+						fwd_ipc_sendtype(unix_client, FWD_IPC_OK);
+						break;
+
+					case FWD_IPC_BUILD:
+						fwd_log_info("Building rules ...");
+						fwd_ipt_clear_ruleset(h);
+						fwd_ipt_build_ruleset(h);
+						fwd_addif_all(h);
+						fwd_ipc_sendtype(unix_client, FWD_IPC_OK);
+						break;
+
+					case FWD_IPC_RELOAD:
+						if( (data = fwd_read_config(h)) != NULL )
+						{
+							fwd_log_info("Flushing rules ...");
+							fwd_ipt_clear_ruleset(h);
+							fwd_free_config(h->conf);
+							h->conf = data;
+							fwd_log_info("Building rules ...");
+							fwd_ipt_build_ruleset(h);
+							fwd_addif_all(h);
+							fwd_ipc_sendtype(unix_client, FWD_IPC_OK);
+						}
+						else
+						{
+							fwd_log_err("Cannot reload configuration!");
+							fwd_ipc_sendtype(unix_client, FWD_IPC_ERROR);
+						}
+						break;
+
+					case FWD_IPC_ADDIF:
+					case FWD_IPC_DELIF:
+						if( strlen(msg.data.network) > 0 )
+						{
+							fwd_ipt_delif(h, msg.data.network);
+
+							if( msg.type == FWD_IPC_ADDIF )
+								fwd_ipt_addif(h, msg.data.network);
+
+							fwd_ipc_sendtype(unix_client, FWD_IPC_OK);
+						}
+						else
+						{
+							fwd_log_err("No network name provided!");
+							fwd_ipc_sendtype(unix_client, FWD_IPC_ERROR);
+						}
+						break;
+
+					case FWD_IPC_OK:
+					case FWD_IPC_ERROR:
+						break;
+				}
+			}
+
+			fwd_ipc_shutdown(unix_client);
+		}
+
+
+		sleep(1);
+	}
+
+	fwd_delif_all(h);
+	fwd_ipt_clear_ruleset(h);
+
+	close(h->rtnl_socket);
+	fwd_free_config(h->conf);
+	fwd_free_ptr(h);
+
+	return 0;
+}
+
+static void fwd_client_usage(const char *msg)
+{
+	printf(
+		"%s\n\n"
+		"Usage:\n"
+		"  fw flush\n"
+		"    Flush all rules in the firewall and reset policy\n\n"
+		"  fw build\n"
+		"    Rebuild firewall rules\n\n"
+		"  fw reload\n"
+		"    Reload configuration and rebuild firewall rules\n\n"
+		"  fw addif {network}\n"
+		"    Add rules for given network\n\n"
+		"  fw delif {network}\n"
+		"    Remove rules for given network\n\n"
+		"", msg
+	);
+
+	exit(1);
+}
+
+static int fwd_client_main(int argc, const char *argv[])
+{
+	int unix_server;
+	struct fwd_ipc_msg msg;
+	enum fwd_ipc_msgtype type;
+
+	if( argc < 2 )
+		fwd_client_usage("Command required");
+
+	if( (unix_server = fwd_ipc_connect()) < 0 )
+		fwd_fatal("Cannot connect to server instance (%m)");
+
+
+	memset(&msg, 0, sizeof(struct fwd_ipc_msg));
+
+	if( !strcmp(argv[1], "flush") )
+		type = FWD_IPC_FLUSH;
+
+	else if( !strcmp(argv[1], "build") )
+		type = FWD_IPC_BUILD;
+
+	else if( !strcmp(argv[1], "reload") )
+		type = FWD_IPC_RELOAD;
+
+	else if( !strcmp(argv[1], "addif") || !strcmp(argv[1], "delif") )
+	{
+		if( argc < 3 )
+			fwd_client_usage("The command requires a parameter.");
+
+		type = strcmp(argv[1], "addif") ? FWD_IPC_DELIF : FWD_IPC_ADDIF;
+		strncpy(msg.data.network, argv[2], sizeof(msg.data.network));
+	}
+
+	else
+		fwd_client_usage("Invalid command given.");
+
+	msg.type = type;
+	fwd_ipc_sendmsg(unix_server, &msg, sizeof(struct fwd_ipc_msg));
+
+	memset(&msg, 0, sizeof(struct fwd_ipc_msg));
+
+	while( fwd_ipc_recvmsg(unix_server, &msg, sizeof(struct fwd_ipc_msg)) == 0 )
+		continue;
+
+	switch(msg.type)
+	{
+		case FWD_IPC_OK:
+			printf("Success\n");
+			break;
+
+		case FWD_IPC_ERROR:
+			printf("The server reported an error, check logread!\n");
+			break;
+
+		default:
+			fwd_fatal("Unexpected response type %i", msg.type);
+	}
+
+	fwd_ipc_shutdown(unix_server);
+
+	return 0;
+}
+
+int main(int argc, const char *argv[])
+{
+	if( strstr(argv[0], "fwd") )
+		return fwd_server_main(argc, argv);
+	else
+		return fwd_client_main(argc, argv);
+}
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd.h b/trunk/package/luci/contrib/fwd/src/fwd.h
new file mode 100644
index 00000000..b88a419f
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd.h
@@ -0,0 +1,182 @@
+/*
+ * fwd - libreCMC firewall daemon - data structures
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef __FWD_H__
+#define __FWD_H__
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <signal.h>
+#include <netinet/in.h>
+
+
+enum fwd_policy {
+	FWD_P_UNSPEC = 0,
+	FWD_P_DROP   = 1,
+	FWD_P_REJECT = 2,
+	FWD_P_ACCEPT = 3
+};
+
+enum fwd_stype {
+	FWD_S_DEFAULTS = 0,
+	FWD_S_ZONE     = 1,
+	FWD_S_FORWARD  = 2,
+	FWD_S_REDIRECT = 3,
+	FWD_S_RULE     = 4,
+	FWD_S_INCLUDE  = 5
+};
+
+enum fwd_ptype {
+	FWD_PR_CUSTOM  = 0,
+	FWD_PR_TCP     = 1,
+	FWD_PR_UDP     = 2,
+	FWD_PR_TCPUDP  = 3,
+	FWD_PR_ICMP    = 4,
+	FWD_PR_ALL     = 5
+};
+
+struct fwd_portrange {
+	unsigned short min;
+	unsigned short max;
+};
+
+struct fwd_cidr {
+	struct in_addr addr;
+	int prefix;
+};
+
+struct fwd_mac {
+	unsigned char mac[6];
+};
+
+struct fwd_proto {
+	enum fwd_ptype type;
+	int proto;
+};
+
+struct fwd_icmptype {
+	char name[32];
+	int type;
+	int code;
+};
+
+struct fwd_network {
+	char *name;
+	char *ifname;
+	int isalias;
+	struct fwd_cidr *addr;
+	struct fwd_network *next;
+};
+
+struct fwd_defaults {
+	enum fwd_policy input;
+	enum fwd_policy forward;
+	enum fwd_policy output;
+	int syn_flood;
+	int syn_rate;
+	int syn_burst;
+	int drop_invalid;	
+};
+
+struct fwd_zone {
+	char *name;
+	struct fwd_network *networks;
+	struct fwd_data *forwardings;
+	struct fwd_data *redirects;
+	struct fwd_data *rules;
+	enum fwd_policy input;
+	enum fwd_policy forward;
+	enum fwd_policy output;
+	int masq;
+	int mtu_fix;
+	int conntrack;
+};
+
+struct fwd_forwarding {
+	struct fwd_zone *src;
+	struct fwd_zone *dest;
+	int mtu_fix;  /* legacy */
+	int masq;     /* new */
+};
+
+struct fwd_redirect {
+	struct fwd_zone      *src;
+	struct fwd_cidr      *src_ip;
+	struct fwd_mac       *src_mac;
+	struct fwd_portrange *src_port;
+	struct fwd_portrange *src_dport;
+	struct fwd_cidr      *dest_ip;
+	struct fwd_portrange *dest_port;
+	struct fwd_proto     *proto;
+	int clone; /* true if rule is cloned (tcpudp -> tcp + udp) */
+};
+
+struct fwd_rule {
+	struct fwd_zone      *src;
+	struct fwd_zone      *dest;
+	struct fwd_cidr      *src_ip;
+	struct fwd_mac       *src_mac;
+	struct fwd_portrange *src_port;
+	struct fwd_cidr      *dest_ip;
+	struct fwd_portrange *dest_port;
+	struct fwd_proto     *proto;
+	struct fwd_icmptype  *icmp_type;
+	enum fwd_policy target;
+	int clone; /* true if rule is cloned (tcpudp -> tcp + udp) */
+};
+
+struct fwd_include {
+	char *path;
+};
+
+struct fwd_data {
+	enum fwd_stype type;
+	struct fwd_data *next;
+	union {
+		struct fwd_defaults   defaults;
+		struct fwd_zone       zone;
+		struct fwd_forwarding forwarding;
+		struct fwd_redirect   redirect;
+		struct fwd_rule       rule;
+		struct fwd_include    include;
+	} section;
+};
+
+
+struct fwd_handle {
+	int rtnl_socket;
+	int unix_socket;
+	struct fwd_data *conf;
+};
+
+
+/* fwd_fatal(fmt, ...)
+ * Prints message to stderr and termintes program. */
+#define fwd_fatal(...) do {       \
+	fprintf(stderr, "ERROR: ");   \
+	fprintf(stderr, __VA_ARGS__); \
+	fprintf(stderr, "\n");        \
+	exit(1);                      \
+} while(0)
+
+
+#endif
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_addr.c b/trunk/package/luci/contrib/fwd/src/fwd_addr.c
new file mode 100644
index 00000000..27ed9c21
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_addr.c
@@ -0,0 +1,162 @@
+/*
+ * fwd - libreCMC firewall daemon - rtnetlink communication
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#include "fwd.h"
+#include "fwd_addr.h"
+#include "fwd_utils.h"
+
+struct fwd_addr * fwd_get_addrs(int fd, int family)
+{
+	struct {
+		  struct nlmsghdr n;
+		  struct ifaddrmsg r;
+	} req;
+
+	int offlen;
+	int rtattrlen;
+	int dump_done;
+	char buf[16384];
+
+	struct rtattr *rta;
+	struct rtattr *rtatp;
+	struct nlmsghdr *nlmp;
+	struct ifaddrmsg *rtmp;
+
+	struct fwd_addr *head, *entry;
+
+	/* Build request */
+	memset(&req, 0, sizeof(req));
+	req.n.nlmsg_len   = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
+	req.n.nlmsg_flags = NLM_F_REQUEST | NLM_F_ROOT;
+	req.n.nlmsg_type  = RTM_GETADDR;
+	req.r.ifa_family  = family;
+
+	rta = (struct rtattr *)(((char *)&req) + NLMSG_ALIGN(req.n.nlmsg_len));
+	rta->rta_len = RTA_LENGTH(family == AF_INET ? 4 : 16);
+
+	head = entry = NULL;
+
+	/* Send request */
+	if( send(fd, &req, sizeof(req), 0) <= 0 )
+		goto error;
+
+	/* Receive responses */
+	for( dump_done = 0; !dump_done; )
+	{
+		if( (offlen = recv(fd, buf, sizeof(buf), 0)) <= 0 )
+			goto error;
+
+		/* Parse message */
+		for(nlmp = (struct nlmsghdr *)buf; offlen > sizeof(*nlmp);)
+		{
+			/* Dump finished? */
+			if( nlmp->nlmsg_type == NLMSG_DONE )
+			{
+				dump_done = 1;
+				break;
+			}
+
+			int len = nlmp->nlmsg_len;
+			int req_len = len - sizeof(*nlmp);
+
+			if( req_len<0 || len>offlen )
+				goto error;
+
+			if( !NLMSG_OK(nlmp, offlen) )
+				goto error;
+
+			rtmp  = (struct ifaddrmsg *) NLMSG_DATA(nlmp);
+			rtatp = (struct rtattr *) IFA_RTA(rtmp);
+
+			if( !(entry = fwd_alloc_ptr(struct fwd_addr)) )
+				goto error;
+
+			entry->index = rtmp->ifa_index;
+			if_indextoname(rtmp->ifa_index, (char *)&entry->ifname);
+
+			rtattrlen = IFA_PAYLOAD(nlmp);
+
+			for( ; RTA_OK(rtatp, rtattrlen); rtatp = RTA_NEXT(rtatp, rtattrlen) )
+			{
+				if( rtatp->rta_type == IFA_ADDRESS )
+				{
+					memcpy(&entry->ipaddr.addr, (char *) RTA_DATA(rtatp), rtatp->rta_len);
+					entry->ipaddr.prefix = rtmp->ifa_prefixlen;
+					entry->family = family;
+				}
+				else if( rtatp->rta_type == IFA_LABEL)
+				{
+					memcpy(&entry->label, (char *) RTA_DATA(rtatp), rtatp->rta_len);
+				}
+			}
+
+			entry->next = head;
+			head = entry;
+
+			offlen -= NLMSG_ALIGN(len);
+			nlmp = (struct nlmsghdr*)((char*)nlmp + NLMSG_ALIGN(len));
+		}
+	}
+
+	return head;
+
+
+	error:
+
+	fwd_free_addrs(head);
+	head = entry = NULL;
+
+	return NULL;
+}
+
+struct fwd_cidr * fwd_lookup_addr(struct fwd_addr *head, const char *ifname)
+{
+	struct fwd_addr *entry;
+
+	for( entry = head; entry; entry = entry->next )
+		if( !strncmp(entry->ifname, ifname, IFNAMSIZ) )
+			return &entry->ipaddr;
+
+	return NULL;
+}
+
+void fwd_free_addrs(struct fwd_addr *head)
+{
+	struct fwd_addr *entry = head;
+
+	while( entry != NULL )
+	{
+		head = entry->next;
+		free(entry);
+		entry = head;
+	}
+
+	head = entry = NULL;
+}
+
+struct fwd_addr * fwd_append_addrs(struct fwd_addr *head, struct fwd_addr *add)
+{
+	struct fwd_addr *entry = head;
+
+	while( entry->next != NULL )
+		entry = entry->next;
+
+	return (entry->next = add);
+}
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_addr.h b/trunk/package/luci/contrib/fwd/src/fwd_addr.h
new file mode 100644
index 00000000..e5e9ab5f
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_addr.h
@@ -0,0 +1,50 @@
+/*
+ * fwd - libreCMC firewall daemon - header for rtnetlink communication
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef __FWD_ADDR_H__
+#define __FWD_ADDR_H__
+
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <arpa/inet.h>
+
+
+struct fwd_addr {
+	char ifname[IFNAMSIZ];
+	char label[IFNAMSIZ];
+	int family;
+	int index;
+	struct fwd_cidr ipaddr;
+	struct fwd_addr *next;
+};
+
+
+struct fwd_addr * fwd_get_addrs(int, int);
+struct fwd_addr * fwd_append_addrs(struct fwd_addr *, struct fwd_addr *);
+void fwd_free_addrs(struct fwd_addr *);
+
+struct fwd_cidr * fwd_lookup_addr(struct fwd_addr *, const char *);
+
+#define fwd_foreach_addrs(head, entry) for(entry = head; entry; entry = entry->next)
+
+#endif
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_config.c b/trunk/package/luci/contrib/fwd/src/fwd_config.c
new file mode 100644
index 00000000..c7e1c444
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_config.c
@@ -0,0 +1,987 @@
+/*
+ * fwd - libreCMC firewall daemon - config parsing
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#include "fwd.h"
+#include "fwd_addr.h"
+#include "fwd_config.h"
+#include "fwd_utils.h"
+
+#include "ucix.h"
+
+
+#define fwd_read_error(...) do { \
+	fwd_log_err(__VA_ARGS__);    \
+	return;                      \
+} while(0)
+
+
+/*
+ * Parse helpers
+ */
+static int
+fwd_read_policy(struct uci_context *uci, const char *s, const char *o)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+
+	if( val != NULL )
+	{
+		switch( val[0] )
+		{
+			case 'D':
+			case 'd':
+				return FWD_P_DROP;
+
+			case 'R':
+			case 'r':
+				return FWD_P_REJECT;
+
+			case 'A':
+			case 'a':
+				return FWD_P_ACCEPT;
+		}
+	}
+
+	return FWD_P_UNSPEC;
+}
+
+static int
+fwd_read_bool(struct uci_context *uci, const char *s, const char *o, int d)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+
+	if( val != NULL )
+	{
+		if( !strcmp(val, "yes") || !strcmp(val, "true") || !strcmp(val, "1") )
+			return 1;
+		else
+			return 0;
+	}
+
+	return d;
+}
+
+static unsigned int
+fwd_read_uint(struct uci_context *uci, const char *s, const char *o, unsigned int d)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+
+	if( val != NULL )
+	{
+		return atoi(val);
+	}
+
+	return d;
+}
+
+static int
+fwd_read_cidr(struct uci_context *uci, const char *s, const char *o, struct fwd_cidr **c)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+	char ip[32], prefix[32];
+	struct in_addr ina;
+
+	memset(ip, 0, 32);
+	memset(prefix, 0, 32);
+
+	if( val == NULL )
+	{
+		return 0;
+	}
+	else if( (strlen(val) < 32) && (sscanf(val, "%[^/]/%s", ip, prefix) > 0) )
+	{
+		if( !(*c = fwd_alloc_ptr(struct fwd_cidr)) )
+			goto inval;
+
+		if( inet_aton(ip, &ina) )
+		{
+			(*c)->addr.s_addr = ina.s_addr;
+
+			if( strchr(prefix, '.') )
+			{
+				if( inet_aton(prefix, &ina) )
+				{
+					(*c)->prefix = 32;
+					ina.s_addr = ntohl(ina.s_addr);
+
+					while( !(ina.s_addr & 1) )
+					{
+						ina.s_addr >>= 1;
+						(*c)->prefix--;
+					}
+				}
+				else
+				{
+					goto inval;
+				}
+			}
+			else
+			{
+				(*c)->prefix = prefix[0] ? atoi(prefix) : 32;
+
+				if( ((*c)->prefix < 0) || ((*c)->prefix > 32) )
+				{
+					goto inval;
+				}
+			}
+
+			return 0;
+		}
+	}
+
+	inval:
+	fwd_free_ptr(*c);
+	return -1;
+}
+
+static int
+fwd_read_mac(struct uci_context *uci, const char *s, const char *o, struct fwd_mac **m)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+
+	if( val == NULL )
+	{
+		return 0;
+	}
+	else
+	{
+		if( (*m = fwd_alloc_ptr(struct fwd_mac)) != NULL )
+		{
+			unsigned int i1, i2, i3, i4, i5, i6;
+
+			if( sscanf(val, "%2x:%2x:%2x:%2x:%2x:%2x",
+				&i1, &i2, &i3, &i4, &i5, &i6) == 6
+			) {
+				(*m)->mac[0] = (unsigned char)i1;
+				(*m)->mac[1] = (unsigned char)i2;
+				(*m)->mac[2] = (unsigned char)i3;
+				(*m)->mac[3] = (unsigned char)i4;
+				(*m)->mac[4] = (unsigned char)i5;
+				(*m)->mac[5] = (unsigned char)i6;
+				return 0;
+			}
+		}
+	}
+
+	fwd_free_ptr(*m);
+	return -1;
+}
+
+static int
+fwd_read_portrange(struct uci_context *uci, const char *s, const char *o, struct fwd_portrange **p)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+	int min = -1;
+	int max = -1;
+	unsigned int tmp;
+
+	if( val == NULL )
+	{
+		return 0;
+	}
+	else if( sscanf(val, "%u%*[:-]%u", &min, &max) > 0 )
+	{
+		if( max == -1 )
+		{
+			max = min;
+		}
+		else if( min > max )
+		{
+			tmp = max;
+			max = min;
+			min = tmp;
+		}
+
+		if( (min >= 0) && (min <= 65535) && (max >= 0) && (max <= 65535) )
+		{
+			if( (*p = fwd_alloc_ptr(struct fwd_portrange)) != NULL )
+			{
+				(*p)->min = min;
+				(*p)->max = max;
+				return 0;
+			}
+		}
+	}
+
+	fwd_free_ptr(*p);
+	return -1;
+}
+
+static int
+fwd_read_proto(struct uci_context *uci, const char *s, const char *o, struct fwd_proto **p)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+	int proto;
+
+	if( val == NULL )
+	{
+		return 0;
+	}
+	else
+	{
+		if( (*p = fwd_alloc_ptr(struct fwd_proto)) != NULL )
+		{
+			proto = atoi(val);
+
+			if( !strcasecmp(val, "all") )
+			{
+				(*p)->type  = FWD_PR_ALL;
+				(*p)->proto = 0;
+			}
+			else if( !strcasecmp(val, "icmp") )
+			{
+				(*p)->type  = FWD_PR_ICMP;
+				(*p)->proto = 0;
+			}
+			else if( !strcasecmp(val, "udp") )
+			{
+				(*p)->type  = FWD_PR_UDP;
+				(*p)->proto = 0;
+			}
+			else if( !strcasecmp(val, "tcp") )
+			{
+				(*p)->type  = FWD_PR_TCP;
+				(*p)->proto = 0;
+			}
+			else if( !strcasecmp(val, "tcpudp") )
+			{
+				(*p)->type  = FWD_PR_TCPUDP;
+				(*p)->proto = 0;
+			}
+			else if( proto > 0 )
+			{
+				(*p)->type  = FWD_PR_CUSTOM;
+				(*p)->proto = proto;
+			}
+			else
+			{
+				goto inval;
+			}
+
+			return 0;
+		}
+	}
+
+	inval:
+	fwd_free_ptr(*p);
+	return -1;
+}
+
+static int
+fwd_read_icmptype(struct uci_context *uci, const char *s, const char *o, struct fwd_icmptype **i)
+{
+	const char *val = ucix_get_option(uci, "firewall", s, o);
+	unsigned int type, code;
+
+	if( val == NULL )
+	{
+		return 0;
+	}
+	else
+	{
+		if( (*i = fwd_alloc_ptr(struct fwd_icmptype)) != NULL )
+		{
+			if( sscanf(val, "%u/%u", &type, &code) == 2 )
+			{
+				if( (type > 255) || (code > 255) )
+					goto inval;
+
+				(*i)->type = type;
+				(*i)->code = code;
+
+				return 0;
+			}
+
+			else if( sscanf(val, "%u", &type) == 1 )
+			{
+				if( type > 255 )
+					goto inval;
+
+				(*i)->type = type;
+				(*i)->code = -1;
+
+				return 0;
+			}
+
+			/* XXX: no validity check here but I do not want to
+			        duplicate libipt_icmp.c ... */
+			else if( sscanf(val, "%31s", (*i)->name) == 1 )
+			{
+				return 0;
+			}
+		}
+	}
+
+	inval:
+	fwd_free_ptr(*i);
+	return -1;
+}
+
+static const char *
+fwd_read_string(struct uci_context *uci, const char *s, const char *o)
+{
+	return ucix_get_option(uci, "firewall", s, o);
+}
+
+
+static void
+fwd_append_config(struct fwd_data *h, struct fwd_data *a)
+{
+	while( h->next )
+		h = h->next;
+
+	h->next = a;
+}
+
+
+/*
+ * config defaults
+ */
+static void fwd_read_defaults_cb(
+	struct uci_context *uci,
+	const char *s, struct fwd_defaults *d
+) {
+	d->input        = fwd_read_policy(uci, s, "input");
+	d->forward      = fwd_read_policy(uci, s, "forward");
+	d->output       = fwd_read_policy(uci, s, "output");
+	d->syn_flood    = fwd_read_bool(uci, s, "syn_flood", 1);
+	d->syn_rate     = fwd_read_uint(uci, s, "syn_rate", 25);
+	d->syn_burst    = fwd_read_uint(uci, s, "syn_burst", 50);
+	d->drop_invalid = fwd_read_bool(uci, s, "drop_invalid", 1);
+}
+
+static struct fwd_data *
+fwd_read_defaults(struct uci_context *uci)
+{
+	struct fwd_data *dt;
+	struct fwd_defaults d;
+
+	if( (dt = fwd_alloc_ptr(struct fwd_data)) != NULL )
+	{
+		memset(&d, 0, sizeof(d));
+
+		ucix_for_each_section_type(uci, "firewall", "defaults",
+			(void *)fwd_read_defaults_cb, &d);
+
+		memcpy(&dt->section.defaults, &d, sizeof(d));
+
+		dt->type = FWD_S_DEFAULTS;
+		dt->next = NULL;
+
+		return dt;
+	}
+
+	return NULL;
+}
+
+
+/*
+ * config zone
+ */
+static void fwd_read_zone_networks_cb(
+	const char *net, struct fwd_network **np
+) {
+	struct fwd_network *nn;
+
+	if( (nn = fwd_alloc_ptr(struct fwd_network)) != NULL )
+	{
+		nn->name = strdup(net);
+		nn->next = *np;
+		*np = nn;
+	}
+}
+
+static void fwd_read_zones_cb(
+	struct uci_context *uci,
+	const char *s, struct fwd_data_conveyor *cv
+) {
+	struct fwd_data *dtn;
+	struct fwd_network *net = NULL;
+	const char *name;
+
+	if( !(name = fwd_read_string(uci, s, "name")) )
+		fwd_read_error("section '%s' is missing 'name' option!", s);
+
+	if( (dtn = fwd_alloc_ptr(struct fwd_data)) != NULL )
+	{
+		dtn->section.zone.name      = strdup(name);
+		dtn->section.zone.masq      = fwd_read_bool(uci, s, "masq", 0);
+		dtn->section.zone.mtu_fix   = fwd_read_bool(uci, s, "mtu_fix", 0);
+		dtn->section.zone.conntrack = fwd_read_bool(uci, s, "conntrack", 0);
+
+		dtn->section.zone.input     = fwd_read_policy(uci, s, "input")
+			?: cv->head->section.defaults.input   ?: FWD_P_DROP;
+
+		dtn->section.zone.forward   = fwd_read_policy(uci, s, "forward")
+			?: cv->head->section.defaults.forward ?: FWD_P_DROP;
+
+		dtn->section.zone.output    = fwd_read_policy(uci, s, "output")
+			?: cv->head->section.defaults.output  ?: FWD_P_DROP;
+
+		/* try to parse option/list network ... */
+		if( ucix_for_each_list(uci, "firewall", s, "network",
+			(void *)&fwd_read_zone_networks_cb, &net) < 0 )
+		{
+			/* ... didn't work, fallback to option name */
+			fwd_read_zone_networks_cb(name, &net);
+		}
+
+		dtn->section.zone.networks = net;
+		dtn->type = FWD_S_ZONE;
+		dtn->next = cv->cursor;
+		cv->cursor = dtn;
+	}
+}
+
+static struct fwd_data *
+fwd_read_zones(struct uci_context *uci, struct fwd_data *def)
+{
+	struct fwd_data_conveyor cv;
+
+	cv.cursor = NULL;
+	cv.head = def;
+
+	ucix_for_each_section_type(uci, "firewall", "zone",
+		(void *)fwd_read_zones_cb, &cv);
+
+	return cv.cursor;
+}
+
+
+/*
+ * config forwarding
+ */
+static void fwd_read_forwards_cb(
+	struct uci_context *uci,
+	const char *s, struct fwd_data_conveyor *cv
+) {
+	const char *src, *dest;
+	struct fwd_data *dtn;
+	struct fwd_zone *zsrc  = NULL;
+	struct fwd_zone *zdest = NULL;
+
+	if( !(src = fwd_read_string(uci, s, "src")) )
+		fwd_read_error("section '%s' is missing 'src' option!", s);
+	else if( !(zsrc = fwd_lookup_zone(cv->head, src)) )
+		fwd_read_error("section '%s' references unknown src zone '%s'!", s, src);
+	else if( !(dest = fwd_read_string(uci, s, "dest")) )
+		fwd_read_error("section '%s' is missing 'dest' option!", s);
+	else if( !(zdest = fwd_lookup_zone(cv->head, dest)) )
+		fwd_read_error("section '%s' references unknown dest zone '%s'!", s, dest);
+	
+	if( (dtn = fwd_alloc_ptr(struct fwd_data)) != NULL )
+	{
+		dtn->section.forwarding.src = zsrc;
+		dtn->section.forwarding.dest = zdest;
+		dtn->section.forwarding.mtu_fix = fwd_read_bool(uci, s, "mtu_fix", 0);
+		dtn->section.forwarding.masq = fwd_read_bool(uci, s, "masq", 0);
+
+		dtn->type = FWD_S_FORWARD;
+
+		if( zsrc )
+		{
+			dtn->next = zsrc->forwardings;
+			zsrc->forwardings = dtn;
+		}
+		else
+		{
+			dtn->next = cv->cursor;
+			cv->cursor = dtn;
+		}
+	}
+	else
+	{
+		fwd_read_error("out of memory while parsing config!");
+	}
+}
+
+static struct fwd_data *
+fwd_read_forwards(struct uci_context *uci, struct fwd_data *zones)
+{
+	struct fwd_data_conveyor cv;
+
+	cv.cursor = NULL;
+	cv.head = zones;
+
+	ucix_for_each_section_type(uci, "firewall", "forwarding",
+		(void *)fwd_read_forwards_cb, &cv);
+
+	return cv.cursor;
+}
+
+
+/*
+ * config redirect
+ */
+static void fwd_read_redirects_cb(
+	struct uci_context *uci,
+	const char *s, struct fwd_data_conveyor *cv
+) {
+	const char *src;
+	struct fwd_data *dtn  = NULL;
+	struct fwd_data *dtn2 = NULL;
+	struct fwd_zone *zsrc = NULL;
+
+	/* check zone */
+	if( !(src = fwd_read_string(uci, s, "src")) )
+		fwd_read_error(
+			"section '%s' is missing 'src' option!",
+			s
+		);
+
+	else if( !(zsrc = fwd_lookup_zone(cv->head, src)) )
+		fwd_read_error(
+			"section '%s' references unknown src zone '%s'!",
+			s, src
+		);
+
+	/* uci context, section, name, type */
+	fwd_check_option(uci, s, src_ip, cidr);
+	fwd_check_option(uci, s, src_mac, mac);
+	fwd_check_option(uci, s, src_port, portrange);
+	fwd_check_option(uci, s, src_dport, portrange);
+	fwd_check_option(uci, s, dest_ip, cidr);
+	fwd_check_option(uci, s, dest_port, portrange);
+	fwd_check_option(uci, s, proto, proto);
+	
+	if( (dtn = fwd_alloc_ptr(struct fwd_data)) != NULL )
+	{
+		dtn->section.redirect.proto     = proto;
+		dtn->section.redirect.src       = zsrc;
+		dtn->section.redirect.src_ip    = src_ip;
+		dtn->section.redirect.src_mac   = src_mac;
+		dtn->section.redirect.src_port  = src_port;
+		dtn->section.redirect.src_dport = src_dport;
+		dtn->section.redirect.dest_ip   = dest_ip;
+		dtn->section.redirect.dest_port = dest_port;
+
+		dtn->type = FWD_S_REDIRECT;
+		dtn->next = zsrc->redirects;
+		zsrc->redirects = dtn;
+
+		if( (proto != NULL) && (proto->type == FWD_PR_TCPUDP) )
+		{
+			if( !(dtn2 = fwd_alloc_ptr(struct fwd_data)) ||
+			    !(dtn2->section.redirect.proto = fwd_alloc_ptr(struct fwd_proto))
+			) {
+				fwd_free_ptr(dtn2);
+				fwd_read_error("out of memory while parsing config!");
+			}
+
+			dtn->section.redirect.proto->type = FWD_PR_UDP;
+			dtn2->section.redirect.proto->type = FWD_PR_TCP;
+
+			dtn2->section.redirect.src       = zsrc;
+			dtn2->section.redirect.src_ip    = src_ip;
+			dtn2->section.redirect.src_mac   = src_mac;
+			dtn2->section.redirect.src_port  = src_port;
+			dtn2->section.redirect.src_dport = src_dport;
+			dtn2->section.redirect.dest_ip   = dest_ip;
+			dtn2->section.redirect.dest_port = dest_port;
+			dtn2->section.redirect.clone     = 1;
+
+			dtn2->type = FWD_S_REDIRECT;
+			dtn2->next = zsrc->redirects;
+			zsrc->redirects = dtn2;
+		}
+	}
+	else
+	{
+		fwd_read_error("out of memory while parsing config!");
+	}
+}
+
+static struct fwd_data *
+fwd_read_redirects(struct uci_context *uci, struct fwd_data *zones)
+{
+	struct fwd_data_conveyor cv;
+
+	cv.cursor = NULL;
+	cv.head = zones;
+
+	ucix_for_each_section_type(uci, "firewall", "redirect",
+		(void *)fwd_read_redirects_cb, &cv);
+
+	return cv.cursor;
+}
+
+
+/*
+ * config rule
+ */
+static void fwd_read_rules_cb(
+	struct uci_context *uci,
+	const char *s, struct fwd_data_conveyor *cv
+) {
+	const char *src, *dest;
+	struct fwd_data *dtn   = NULL;
+	struct fwd_data *dtn2  = NULL;
+	struct fwd_zone *zsrc  = NULL;
+	struct fwd_zone *zdest = NULL;
+
+	/* check zones */
+	if( !(src = fwd_read_string(uci, s, "src")) )
+		fwd_read_error(
+			"section '%s' is missing 'src' option!",
+			s
+		);
+
+	else if( !(zsrc = fwd_lookup_zone(cv->head, src)) )
+		fwd_read_error(
+			"section '%s' references unknown src zone '%s'!",
+			s, src
+		);
+
+	if( (dest = fwd_read_string(uci, s, "dest")) != NULL )
+		if( !(zdest = fwd_lookup_zone(cv->head, dest)) )
+			fwd_read_error(
+				"section '%s' references unknown dest zone '%s'!",
+				s, dest
+			);
+
+	/* uci context, section, name, type */
+	fwd_check_option(uci, s, src_ip, cidr);
+	fwd_check_option(uci, s, src_mac, mac);
+	fwd_check_option(uci, s, src_port, portrange);
+	fwd_check_option(uci, s, dest_ip, cidr);
+	fwd_check_option(uci, s, dest_port, portrange);
+	fwd_check_option(uci, s, proto, proto);
+	fwd_check_option(uci, s, icmptype, icmptype);
+	
+	if( (dtn = fwd_alloc_ptr(struct fwd_data)) != NULL )
+	{
+		dtn->section.rule.proto     = proto;
+		dtn->section.rule.icmp_type = icmptype;
+		dtn->section.rule.src       = zsrc;
+		dtn->section.rule.src_ip    = src_ip;
+		dtn->section.rule.src_mac   = src_mac;
+		dtn->section.rule.src_port  = src_port;
+		dtn->section.rule.dest      = zdest;
+		dtn->section.rule.dest_ip   = dest_ip;
+		dtn->section.rule.dest_port = dest_port;
+		dtn->section.rule.target    = fwd_read_policy(uci, s, "target");
+
+		dtn->type = FWD_S_RULE;
+		dtn->next = zsrc->rules;
+		zsrc->rules = dtn;
+
+		if( (proto != NULL) && (proto->type == FWD_PR_TCPUDP) )
+		{
+			if( !(dtn2 = fwd_alloc_ptr(struct fwd_data)) ||
+			    !(dtn2->section.rule.proto = fwd_alloc_ptr(struct fwd_proto))
+			) {
+				fwd_free_ptr(dtn2);
+				fwd_read_error("out of memory while parsing config!");
+			}
+
+			dtn->section.rule.proto->type = FWD_PR_UDP;
+			dtn2->section.rule.proto->type = FWD_PR_TCP;
+
+			dtn2->section.rule.src       = zsrc;
+			dtn2->section.rule.src_ip    = src_ip;
+			dtn2->section.rule.src_mac   = src_mac;
+			dtn2->section.rule.src_port  = src_port;
+			dtn2->section.rule.dest      = zdest;
+			dtn2->section.rule.dest_ip   = dest_ip;
+			dtn2->section.rule.dest_port = dest_port;
+			dtn2->section.rule.target    = dtn->section.rule.target;
+			dtn2->section.rule.clone     = 1;
+
+			dtn2->type = FWD_S_RULE;
+			dtn2->next = zsrc->rules;
+			zsrc->rules = dtn2;
+		}
+	}
+	else
+	{
+		fwd_read_error("out of memory while parsing config!");
+	}
+}
+
+static struct fwd_data *
+fwd_read_rules(struct uci_context *uci, struct fwd_data *zones)
+{
+	struct fwd_data_conveyor cv;
+
+	cv.cursor = NULL;
+	cv.head = zones;
+
+	ucix_for_each_section_type(uci, "firewall", "rule",
+		(void *)fwd_read_rules_cb, &cv);
+
+	return cv.cursor;
+}
+
+
+/*
+ * config include
+ */
+static void fwd_read_includes_cb(
+	struct uci_context *uci,
+	const char *s, struct fwd_data_conveyor *cv
+) {
+	const char *path = fwd_read_string(uci, s, "path");
+	struct fwd_data *dtn = NULL;
+
+	if( path != NULL )
+	{
+		if( (dtn = fwd_alloc_ptr(struct fwd_data)) != NULL )
+		{
+			dtn->section.include.path = strdup(path);
+
+			dtn->type = FWD_S_INCLUDE;
+			dtn->next = cv->cursor;
+			cv->cursor = dtn;
+		}
+		else
+		{
+			fwd_read_error("out of memory while parsing config!");
+		}
+	}
+}
+
+static struct fwd_data *
+fwd_read_includes(struct uci_context *uci)
+{
+	struct fwd_data_conveyor cv;
+
+	cv.cursor = NULL;
+	cv.head   = NULL;
+
+	ucix_for_each_section_type(uci, "firewall", "include",
+		(void *)fwd_read_includes_cb, &cv);
+
+	return cv.cursor;
+}
+
+
+/*
+ * config interface
+ */
+static void fwd_read_network_data(
+	struct uci_context *uci, struct fwd_network *net
+) {
+	struct fwd_network *e;
+	const char *type, *ifname;
+
+	for( e = net; e; e = e->next )
+	{
+		if( (type = ucix_get_option(uci, "network", e->name, NULL)) != NULL )
+		{
+			if( !(ifname = ucix_get_option(uci, "network", e->name, "ifname")) )
+				fwd_read_error(
+					"section '%s' is missing 'ifname' option!",
+					e->name
+				);
+
+			e->isalias = (strcmp(type, "alias") ? 0 : 1);
+			e->ifname  = strdup(ifname);
+		}
+	}
+}
+
+static void fwd_read_networks(
+	struct uci_context *uci, struct fwd_data *zones
+) {
+	struct fwd_data *e;
+
+	for( e = zones; e; e = e->next )
+		if( e->type == FWD_S_ZONE )
+			fwd_read_network_data(uci, e->section.zone.networks);
+}
+
+static void fwd_free_networks(struct fwd_network *h)
+{
+	struct fwd_network *e = h;
+
+	while( h != NULL )
+	{
+		e = h->next;
+
+		fwd_free_ptr(h->name);
+		fwd_free_ptr(h->ifname);
+		fwd_free_ptr(h->addr);
+
+		free(h);
+		h = e;
+	}
+
+	e = h = NULL;
+}
+
+static struct fwd_cidr * fwd_alloc_cidr(struct fwd_cidr *addr)
+{
+	struct fwd_cidr *cidr;
+
+	if( (cidr = fwd_alloc_ptr(struct fwd_cidr)) != NULL )
+	{
+		if( addr != NULL )
+		{
+			cidr->addr.s_addr = addr->addr.s_addr;
+			cidr->prefix = addr->prefix;
+		}
+
+		return cidr;
+	}
+
+	return NULL;
+}
+
+
+
+struct fwd_data * fwd_read_config(struct fwd_handle *h)
+{
+	struct uci_context *ctx;
+	struct fwd_data *defaults, *zones, *e;
+	struct fwd_addr *addrs;
+	struct fwd_network *net;
+	struct fwd_zone *zone;
+
+	if( (ctx = ucix_init("firewall")) != NULL )
+	{
+		if( !(defaults = fwd_read_defaults(ctx)) )
+			goto error;
+
+		if( !(zones = fwd_read_zones(ctx, defaults)) )
+			goto error;
+
+		fwd_append_config(defaults, zones);
+		fwd_append_config(defaults, fwd_read_forwards(ctx, zones));
+		fwd_append_config(defaults, fwd_read_redirects(ctx, zones));
+		fwd_append_config(defaults, fwd_read_rules(ctx, zones));
+		fwd_append_config(defaults, fwd_read_includes(ctx));
+
+		ucix_cleanup(ctx);
+
+		if( (ctx = ucix_init("network")) != NULL )
+		{
+			fwd_read_networks(ctx, zones);
+			ucix_cleanup(ctx);
+
+			if( !(addrs = fwd_get_addrs(h->rtnl_socket, AF_INET)) )
+				goto error;
+
+			for( e = zones; e && (zone = &e->section.zone); e = e->next )
+			{
+				if( e->type != FWD_S_ZONE )
+					break;
+
+				for( net = zone->networks; net; net = net->next )
+				{
+					net->addr = fwd_alloc_cidr(
+						fwd_lookup_addr(addrs, net->ifname)
+					);
+				}
+			}
+
+			fwd_free_addrs(addrs);
+			return defaults;
+		}
+	}
+
+	error:
+	if( ctx ) ucix_cleanup(ctx);
+	fwd_free_config(defaults);
+	fwd_free_config(zones);
+	return NULL;	
+}
+
+
+void fwd_free_config(struct fwd_data *h)
+{
+	struct fwd_data *e = h;
+
+	while( h != NULL )
+	{
+		e = h->next;
+
+		switch(h->type)
+		{
+			case FWD_S_INCLUDE:
+				fwd_free_ptr(h->section.include.path);
+				break;
+
+			case FWD_S_ZONE:
+				fwd_free_ptr(h->section.zone.name);
+				fwd_free_networks(h->section.zone.networks);
+				fwd_free_config(h->section.zone.rules);
+				fwd_free_config(h->section.zone.redirects);
+				fwd_free_config(h->section.zone.forwardings);
+				break;
+
+			case FWD_S_REDIRECT:
+				/* Clone rules share all pointers except proto.
+                   Prevent a double-free here */          
+				if( ! h->section.redirect.clone )
+				{
+					fwd_free_ptr(h->section.redirect.src_ip);
+					fwd_free_ptr(h->section.redirect.src_mac);
+					fwd_free_ptr(h->section.redirect.src_port);
+					fwd_free_ptr(h->section.redirect.src_dport);
+					fwd_free_ptr(h->section.redirect.dest_ip);
+					fwd_free_ptr(h->section.redirect.dest_port);
+				}
+				fwd_free_ptr(h->section.redirect.proto);
+				break;
+
+			case FWD_S_RULE:
+				/* Clone rules share all pointers except proto.
+                   Prevent a double-free here */          
+				if( ! h->section.rule.clone )
+				{
+					fwd_free_ptr(h->section.rule.src_ip);
+					fwd_free_ptr(h->section.rule.src_mac);
+					fwd_free_ptr(h->section.rule.src_port);
+					fwd_free_ptr(h->section.rule.dest_ip);
+					fwd_free_ptr(h->section.rule.dest_port);
+					fwd_free_ptr(h->section.rule.icmp_type);
+				}
+				fwd_free_ptr(h->section.rule.proto);
+				break;
+
+			case FWD_S_DEFAULTS:
+			case FWD_S_FORWARD:
+				/* Make gcc happy */
+				break;
+		}
+
+		fwd_free_ptr(h);
+		h = e;
+	}
+
+	e = h = NULL;
+}
+
+
+struct fwd_zone *
+fwd_lookup_zone(struct fwd_data *h, const char *n)
+{
+	struct fwd_data *e;
+
+	if( n != NULL )
+	{
+		for( e = h; e; e = e->next )
+		{
+			if( (e->type = FWD_S_ZONE) && !strcmp(e->section.zone.name, n) )
+				return &e->section.zone;
+		}
+	}
+
+	return NULL;
+}
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_config.h b/trunk/package/luci/contrib/fwd/src/fwd_config.h
new file mode 100644
index 00000000..058cff47
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_config.h
@@ -0,0 +1,29 @@
+#ifndef __FWD_CONFIG_H__
+#define __FWD_CONFIG_H__
+
+#include "fwd.h"
+#include "ucix.h"
+
+/* fwd_check_option(uci_ctx, section, name, type) */
+#define fwd_check_option(uci, sct, name, type)                       \
+	struct fwd_##type *name = NULL;                                  \
+	if( fwd_read_##type(uci, sct, #name, &name) )                    \
+	{                                                                \
+		printf("ERROR: section '%s' contains invalid %s in '%s'!\n", \
+			sct, #type, #name);                                      \
+        return;                                                      \
+	}
+
+/* structure to access fwd_data* in uci iter callbacks */
+struct fwd_data_conveyor {
+	struct fwd_data *head;
+	struct fwd_data *cursor;
+};
+
+/* api */
+struct fwd_data * fwd_read_config(struct fwd_handle *);
+struct fwd_zone * fwd_lookup_zone(struct fwd_data *, const char *);
+
+void fwd_free_config(struct fwd_data *);
+
+#endif
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_ipc.c b/trunk/package/luci/contrib/fwd/src/fwd_ipc.c
new file mode 100644
index 00000000..23363295
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_ipc.c
@@ -0,0 +1,98 @@
+/*
+ * fwd - libreCMC firewall daemon - unix domain socket parts
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#include "fwd.h"
+#include "fwd_ipc.h"
+
+
+int fwd_ipc_listen(void)
+{
+	int fd;
+	struct sockaddr_un addr;
+
+	if( (fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0 )
+		fwd_fatal("Cannot create AF_UNIX socket: %m");
+
+	memset(&addr, 0, sizeof(struct sockaddr_un));
+	strcpy(addr.sun_path, FWD_SOCKET_PATH);
+	addr.sun_family = AF_UNIX;
+
+	unlink(FWD_SOCKET_PATH);
+
+	if( bind(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0 )
+		fwd_fatal("Cannot bind AF_UNIX socket: %m");
+
+	if( listen(fd, 1) < 0 )
+		fwd_fatal("Cannot listen on AF_UNIX socket: %m");
+
+	//fcntl(fd, F_SETFL, O_NONBLOCK);
+
+	return fd;
+}
+
+int fwd_ipc_accept(int fd)
+{
+	return accept(fd, NULL, NULL);
+}
+
+int fwd_ipc_connect(void)
+{
+	int fd;
+	struct sockaddr_un addr;
+
+	if( (fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0 )
+		fwd_fatal("Cannot create AF_UNIX socket: %m");
+
+	memset(&addr, 0, sizeof(struct sockaddr_un));
+	strcpy(addr.sun_path, FWD_SOCKET_PATH);
+	addr.sun_family = AF_UNIX;
+
+	if( connect(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0 )
+		fwd_fatal("Cannot connect AF_UNIX socket: %m");
+
+	fcntl(fd, F_SETFL, O_NONBLOCK);
+
+	return fd;
+}
+
+int fwd_ipc_recvmsg(int fd, void *buf, int len)
+{
+	return recv(fd, buf, len, 0);
+}
+
+int fwd_ipc_sendmsg(int fd, void *buf, int len)
+{
+	return send(fd, buf, len, 0);
+}
+
+void fwd_ipc_shutdown(int fd)
+{
+	shutdown(fd, SHUT_RDWR);
+	close(fd);
+}
+
+int fwd_ipc_sendtype(int fd, enum fwd_ipc_msgtype type)
+{
+	struct fwd_ipc_msg msg;
+
+	memset(&msg, 0, sizeof(struct fwd_ipc_msg));
+	msg.type = type;
+
+	return fwd_ipc_sendmsg(fd, &msg, sizeof(struct fwd_ipc_msg));
+}
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_ipc.h b/trunk/package/luci/contrib/fwd/src/fwd_ipc.h
new file mode 100644
index 00000000..e98ef024
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_ipc.h
@@ -0,0 +1,61 @@
+/*
+ * fwd - libreCMC firewall daemon - unix domain socket headers
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef __FWD_IPC_H__
+#define __FWD_IPC_H__
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#define FWD_SOCKET_PATH	"/var/run/fwd.sock"
+
+
+enum fwd_ipc_msgtype {
+	FWD_IPC_OK     = 0,
+	FWD_IPC_ERROR  = 1,
+	FWD_IPC_FLUSH  = 2,
+	FWD_IPC_BUILD  = 3,
+	FWD_IPC_RELOAD = 4,
+	FWD_IPC_ADDIF  = 5,
+	FWD_IPC_DELIF  = 6
+};
+
+struct fwd_ipc_msg {
+	enum fwd_ipc_msgtype type;
+	union {
+		char network[256];
+	} data;
+};
+
+int fwd_ipc_listen(void);
+int fwd_ipc_accept(int);
+
+int fwd_ipc_connect(void);
+
+int fwd_ipc_recvmsg(int, void *, int);
+int fwd_ipc_sendmsg(int, void *, int);
+
+void fwd_ipc_shutdown(int);
+
+int fwd_ipc_sendtype(int, enum fwd_ipc_msgtype);
+
+#endif
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_rules.c b/trunk/package/luci/contrib/fwd/src/fwd_rules.c
new file mode 100644
index 00000000..4f6c3a7d
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_rules.c
@@ -0,0 +1,886 @@
+/*
+ * fwd - libreCMC firewall daemon - iptables rule set
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#include "fwd.h"
+#include "fwd_addr.h"
+#include "fwd_rules.h"
+#include "fwd_xtables.h"
+#include "fwd_utils.h"
+
+
+/* -P <chain> <policy> */
+static void fwd_r_set_policy(
+	struct iptc_handle *h, const char *chain, const char *policy
+) {
+	iptc_set_policy(chain, policy, NULL, h);
+}
+
+/* -N <chain> */
+static void fwd_r_new_chain(struct iptc_handle *h, const char *chain)
+{
+	iptc_create_chain(chain, h);
+}
+
+/* -A <chain1> -j <chain2> */
+static void fwd_r_jump_chain(
+	struct iptc_handle *h, const char *chain1, const char *chain2
+) {
+	struct fwd_xt_rule *r;
+
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		fwd_xt_get_target(r, chain2);
+		fwd_xt_append_rule(r, chain1);
+	}
+}
+
+/* -A <chain> -m state --state INVALID -j DROP */
+static void fwd_r_drop_invalid(struct iptc_handle *h, const char *chain)
+{
+	struct fwd_xt_rule *r;
+	struct xtables_match *m;
+
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		if( (m = fwd_xt_get_match(r, "state")) != NULL )
+		{
+			fwd_xt_parse_match(r, m, "--state", "INVALID");
+			fwd_xt_get_target(r, "DROP");
+			fwd_xt_append_rule(r, chain);
+		}
+	}
+}
+
+/* -A <chain> -m state --state RELATED,ESTABLISHED -j ACCEPT */
+static void fwd_r_accept_related(struct iptc_handle *h, const char *chain)
+{
+	struct fwd_xt_rule *r;
+	struct xtables_match *m;
+
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		if( (m = fwd_xt_get_match(r, "state")) != NULL )
+		{
+			fwd_xt_parse_match(r, m, "--state", "RELATED,ESTABLISHED");
+			fwd_xt_get_target(r, "ACCEPT");
+			fwd_xt_append_rule(r, chain);
+		}
+	}
+}
+
+/* -A INPUT -i lo -j ACCEPT; -A OUTPUT -o lo -j ACCEPT */
+static void fwd_r_accept_lo(struct iptc_handle *h)
+{
+	struct fwd_network n;
+	struct fwd_xt_rule *r;
+
+	n.ifname = "lo";
+
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		fwd_xt_parse_in(r, &n, 0);
+		fwd_xt_get_target(r, "ACCEPT");
+		fwd_xt_append_rule(r, "INPUT");
+	}
+
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		fwd_xt_parse_out(r, &n, 0);
+		fwd_xt_get_target(r, "ACCEPT");
+		fwd_xt_append_rule(r, "OUTPUT");
+	}
+}
+
+/* build syn_flood chain and jump rule */
+static void fwd_r_add_synflood(struct iptc_handle *h, struct fwd_defaults *def)
+{
+	struct fwd_proto p;
+	struct fwd_xt_rule *r;
+	struct xtables_match *m;
+	char buf[32];
+
+	/* -N syn_flood */
+	fwd_r_new_chain(h, "syn_flood");
+
+	/* return rule */
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		/* -p tcp */
+		p.type = FWD_PR_TCP;
+		fwd_xt_parse_proto(r, &p, 0);
+
+		/* -m tcp --syn */
+		if( (m = fwd_xt_get_match(r, "tcp")) != NULL )
+		{
+			fwd_xt_parse_match(r, m, "--syn");
+		}
+
+		/* -m limit --limit x/second --limit-burst y */
+		if( (m = fwd_xt_get_match(r, "limit")) != NULL )
+		{
+			sprintf(buf, "%i/second", def->syn_rate);
+			fwd_xt_parse_match(r, m, "--limit", buf);
+
+			sprintf(buf, "%i", def->syn_burst);
+			fwd_xt_parse_match(r, m, "--limit-burst", buf);
+		}
+
+		/* -j RETURN; -A syn_flood */
+		fwd_xt_get_target(r, "RETURN");
+		fwd_xt_append_rule(r, "syn_flood");
+	}
+
+	/* drop rule */
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{	
+		/* -j DROP; -A syn_flood */
+		fwd_xt_get_target(r, "DROP");
+		fwd_xt_append_rule(r, "syn_flood");
+	}
+
+	/* jump to syn_flood rule */
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{	
+		/* -p tcp */
+		p.type = FWD_PR_TCP;
+		fwd_xt_parse_proto(r, &p, 0);
+
+		/* -m tcp --syn */
+		if( (m = fwd_xt_get_match(r, "tcp")) != NULL )
+		{
+			fwd_xt_parse_match(r, m, "--syn");
+		}
+
+		/* -j syn_flood; -A INPUT */
+		fwd_xt_get_target(r, "syn_flood");
+		fwd_xt_append_rule(r, "INPUT");
+	}
+}
+
+/* build reject target chain */
+static void fwd_r_handle_reject(struct iptc_handle *h)
+{
+	struct fwd_proto p;
+	struct fwd_xt_rule *r;
+	struct xtables_target *t;
+
+	/* -N handle_reject */
+	fwd_r_new_chain(h, "handle_reject");
+
+	/* tcp reject rule */
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		/* -p tcp */
+		p.type = FWD_PR_TCP;
+		fwd_xt_parse_proto(r, &p, 0);
+
+		/* -j REJECT --reject-with tcp-reset */
+		if( (t = fwd_xt_get_target(r, "REJECT")) != NULL )
+		{
+			fwd_xt_parse_target(r, t, "--reject-with", "tcp-reset");
+		}
+
+		/* -A handle_reject */
+		fwd_xt_append_rule(r, "handle_reject");
+	}
+
+	/* common reject rule */
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		/* -j REJECT --reject-with icmp-port-unreachable */
+		if( (t = fwd_xt_get_target(r, "REJECT")) != NULL )
+		{
+			fwd_xt_parse_target(r, t, "--reject-with",
+				"icmp-port-unreachable");
+		}
+
+		/* -A handle_reject */
+		fwd_xt_append_rule(r, "handle_reject");
+	}
+}
+
+/* build drop target chain */
+static void fwd_r_handle_drop(struct iptc_handle *h)
+{
+	struct fwd_xt_rule *r;
+
+	/* -N handle_drop */
+	fwd_r_new_chain(h, "handle_drop");
+
+	/* common drop rule */
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		/* -j DROP; -A handle_drop */
+		fwd_xt_get_target(r, "DROP");
+		fwd_xt_append_rule(r, "handle_drop");
+	}
+}
+
+/* build accept target chain */
+static void fwd_r_handle_accept(struct iptc_handle *h)
+{
+	struct fwd_xt_rule *r;
+
+	/* -N handle_accept */
+	fwd_r_new_chain(h, "handle_accept");
+
+	/* common accept rule */
+	if( (r = fwd_xt_init_rule(h)) != NULL )
+	{
+		/* -j ACCEPT; -A handle_accept */
+		fwd_xt_get_target(r, "ACCEPT");
+		fwd_xt_append_rule(r, "handle_accept");
+	}
+}
+
+/* add comment match */
+static void fwd_r_add_comment(
+	struct fwd_xt_rule *r, const char *t, struct fwd_zone *z,
+	struct fwd_network *n
+) {
+	struct xtables_match *m;
+	char buf[256];
+
+	if( (m = fwd_xt_get_match(r, "comment")) != NULL )
+	{
+		snprintf(buf, sizeof(buf), "%s:net=%s zone=%s", t, n->name, z->name);
+		fwd_xt_parse_match(r, m, "--comment", buf);
+	}
+}
+
+/* add --sport (if applicable) */
+static void fwd_r_add_sport(
+	struct fwd_xt_rule *r, struct fwd_portrange *p
+) {
+	int proto = r->entry->ip.proto;
+	char buf[12];
+	struct xtables_match *m;
+
+	/* have portrange and proto is tcp or udp ... */
+	if( (p != NULL) && ((proto == 6) || (proto == 17)) )
+	{
+		/* get match ... */
+		if( (m = fwd_xt_get_match(r, (proto == 6) ? "tcp" : "udp")) != NULL )
+		{
+			snprintf(buf, sizeof(buf), "%u:%u", p->min, p->max);
+			fwd_xt_parse_match(r, m, "--sport", buf);
+		}
+	}
+}
+
+/* add --dport (if applicable) */
+static void fwd_r_add_dport(
+	struct fwd_xt_rule *r, struct fwd_portrange *p
+) {
+	int proto = r->entry->ip.proto;
+	char buf[12];
+	struct xtables_match *m;
+
+	/* have portrange and proto is tcp or udp ... */
+	if( (p != NULL) && ((proto == 6) || (proto == 17)) )
+	{
+		/* get match ... */
+		if( (m = fwd_xt_get_match(r, (proto == 6) ? "tcp" : "udp")) != NULL )
+		{
+			snprintf(buf, sizeof(buf), "%u:%u", p->min, p->max);
+			fwd_xt_parse_match(r, m, "--dport", buf);
+		}
+	}
+}
+
+/* add --icmp-type (of applicable) */
+static void fwd_r_add_icmptype(
+	struct fwd_xt_rule *r, struct fwd_icmptype *i
+) {
+	int proto = r->entry->ip.proto;
+	struct xtables_match *m;
+	char buf[32];
+
+	/* have icmp-type and proto is icmp ... */
+	if( (i != NULL) && (proto == 1) )
+	{
+		/* get match ... */
+		if( (m = fwd_xt_get_match(r, "icmp")) != NULL )
+		{
+			if( i->name[0] )
+				snprintf(buf, sizeof(buf), "%s", i->name);
+			else
+				snprintf(buf, sizeof(buf), "%u/%u", i->type, i->code);
+
+			fwd_xt_parse_match(r, m, "--icmp-type", buf);
+		}
+	}
+}
+
+/* add -m mac --mac-source ... */
+static void fwd_r_add_srcmac(
+	struct fwd_xt_rule *r, struct fwd_mac *mac
+) {
+	struct xtables_match *m;
+	char buf[18];
+
+	if( mac != NULL )
+	{
+		if( (m = fwd_xt_get_match(r, "mac")) != NULL )
+		{
+			snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x",
+				mac->mac[0], mac->mac[1], mac->mac[2],
+				mac->mac[3], mac->mac[4], mac->mac[5]);
+
+			fwd_xt_parse_match(r, m, "--mac-source", buf);
+		}
+	}
+}
+
+/* add policy target */
+static void fwd_r_add_policytarget(
+	struct fwd_xt_rule *r, enum fwd_policy pol
+) {
+	switch(pol)
+	{
+		case FWD_P_ACCEPT:
+			fwd_xt_get_target(r, "handle_accept");
+			break;
+
+		case FWD_P_REJECT:
+			fwd_xt_get_target(r, "handle_reject");
+			break;
+
+		case FWD_P_DROP:
+		case FWD_P_UNSPEC:
+			fwd_xt_get_target(r, "handle_drop");
+			break;
+	}
+}
+
+/* add dnat target */
+static void fwd_r_add_dnattarget(
+	struct fwd_xt_rule *r, struct fwd_cidr *c, struct fwd_portrange *p
+) {
+	struct xtables_target *t;
+	char buf[32];
+
+	if( c != NULL )
+	{
+		if( (t = fwd_xt_get_target(r, "DNAT")) != NULL )
+		{
+			if( p != NULL )
+				snprintf(buf, sizeof(buf), "%s:%u-%u",
+					inet_ntoa(c->addr), p->min, p->max);
+			else
+				snprintf(buf, sizeof(buf), "%s", inet_ntoa(c->addr));
+
+			fwd_xt_parse_target(r, t, "--to-destination", buf);
+		}
+	}
+}
+
+/* parse comment string and look for match */
+static int fwd_r_cmp(const char *what, const char *cmt, const char *cmp)
+{
+	char *match;
+
+	if( (match = strstr(cmt, what)) == NULL )
+		return 0;
+
+	match += strlen(what);
+
+	if( strncmp(match, cmp, strlen(cmp)) != 0 )
+		return 0;
+
+	if( (match[strlen(cmp)] != ' ') && (match[strlen(cmp)] != '\0') )
+		return 0;
+
+	return 1;
+}
+
+
+static void fwd_ipt_defaults_create(struct fwd_data *d)
+{
+	struct fwd_defaults *def = &d->section.defaults;
+	struct iptc_handle *h_filter, *h_nat;
+
+	if( !(h_filter = iptc_init("filter")) || !(h_nat = iptc_init("nat")) )
+		fwd_fatal("Unable to obtain libiptc handle");
+
+	/* policies */
+	fwd_r_set_policy(h_filter, "INPUT",
+		def->input == FWD_P_ACCEPT ? "ACCEPT" : "DROP");
+	fwd_r_set_policy(h_filter, "OUTPUT",
+		def->output == FWD_P_ACCEPT ? "ACCEPT" : "DROP");
+	fwd_r_set_policy(h_filter, "FORWARD",
+		def->forward == FWD_P_ACCEPT ? "ACCEPT" : "DROP");
+
+	/* invalid state drop */
+	if( def->drop_invalid )
+	{
+		fwd_r_drop_invalid(h_filter, "INPUT");
+		fwd_r_drop_invalid(h_filter, "OUTPUT");
+		fwd_r_drop_invalid(h_filter, "FORWARD");
+	}
+
+	/* default accept related */
+	fwd_r_accept_related(h_filter, "INPUT");
+	fwd_r_accept_related(h_filter, "OUTPUT");
+	fwd_r_accept_related(h_filter, "FORWARD");
+
+	/* default accept on lo */
+	fwd_r_accept_lo(h_filter);
+
+	/* syn flood protection */
+	if( def->syn_flood )
+	{
+		fwd_r_add_synflood(h_filter, def);
+	}
+
+	/* rule container chains */
+	fwd_r_new_chain(h_filter, "mssfix");
+	fwd_r_new_chain(h_filter, "zones");
+	fwd_r_new_chain(h_filter, "rules");
+	fwd_r_new_chain(h_filter, "redirects");
+	fwd_r_new_chain(h_filter, "forwardings");
+	fwd_r_jump_chain(h_filter, "INPUT", "rules");
+	fwd_r_jump_chain(h_filter, "FORWARD", "mssfix");
+	fwd_r_jump_chain(h_filter, "FORWARD", "zones");
+	fwd_r_jump_chain(h_filter, "FORWARD", "rules");
+	fwd_r_jump_chain(h_filter, "FORWARD", "redirects");
+	fwd_r_jump_chain(h_filter, "FORWARD", "forwardings");
+	fwd_r_new_chain(h_nat, "zonemasq");
+	fwd_r_new_chain(h_nat, "redirects");
+	fwd_r_new_chain(h_nat, "loopback");
+	fwd_r_jump_chain(h_nat, "POSTROUTING", "zonemasq");
+	fwd_r_jump_chain(h_nat, "PREROUTING", "redirects");
+	fwd_r_jump_chain(h_nat, "POSTROUTING", "loopback");
+
+	/* standard drop, accept, reject chain */
+	fwd_r_handle_drop(h_filter);
+	fwd_r_handle_accept(h_filter);
+	fwd_r_handle_reject(h_filter);
+
+
+	if( !iptc_commit(h_nat) )
+		fwd_fatal("Cannot commit nat table: %s", iptc_strerror(errno));
+
+	if( !iptc_commit(h_filter) )
+		fwd_fatal("Cannot commit filter table: %s", iptc_strerror(errno));
+
+	iptc_free(h_nat);
+	iptc_free(h_filter);
+}
+
+
+void fwd_ipt_build_ruleset(struct fwd_handle *h)
+{
+	struct fwd_data *e;
+
+	fwd_xt_init();
+
+	for( e = h->conf; e; e = e->next )
+	{
+		switch(e->type)
+		{
+			case FWD_S_DEFAULTS:
+				fwd_log_info("Loading defaults");
+				fwd_ipt_defaults_create(e);
+				break;
+
+			case FWD_S_INCLUDE:
+				fwd_log_info("Loading include: %s",
+					e->section.include.path);
+				break;
+
+			case FWD_S_ZONE:
+			case FWD_S_FORWARD:
+			case FWD_S_REDIRECT:
+			case FWD_S_RULE:
+				/* Make gcc happy */
+				break;
+		}
+	}
+}
+
+
+static struct fwd_zone *
+fwd_lookup_zone(struct fwd_handle *h, const char *net)
+{
+	struct fwd_data *e;
+	struct fwd_network *n;
+
+	for( e = h->conf; e; e = e->next )
+		if( e->type == FWD_S_ZONE )
+			for( n = e->section.zone.networks; n; n = n->next )
+				if( !strcmp(n->name, net) )
+					return &e->section.zone;
+
+	return NULL;
+}
+
+static struct fwd_network *
+fwd_lookup_network(struct fwd_zone *z, const char *net)
+{
+	struct fwd_network *n;
+
+	for( n = z->networks; n; n = n->next )
+		if( !strcmp(n->name, net) )
+			return n;
+
+	return NULL;
+}
+
+void fwd_ipt_addif(struct fwd_handle *h, const char *net)
+{
+	struct fwd_data *e;
+	struct fwd_zone *z;
+	struct fwd_rule *c;
+	struct fwd_redirect *r;
+	struct fwd_forwarding *f;
+	struct fwd_cidr *a, *a2;
+	struct fwd_network *n, *n2;
+	struct fwd_proto p;
+
+	struct fwd_xt_rule *x;
+	struct xtables_match *m;
+	struct xtables_target *t;
+
+	struct iptc_handle *h_filter, *h_nat;
+
+	if( !(h_filter = iptc_init("filter")) || !(h_nat = iptc_init("nat")) )
+		fwd_fatal("Unable to obtain libiptc handle");
+
+
+	if( !(z = fwd_lookup_zone(h, net)) )
+		return;
+
+	if( !(n = fwd_lookup_network(z, net)) )
+		return;
+
+	if( !(a = n->addr) || fwd_empty_cidr(a) )
+		return;
+
+
+	fwd_log_info("Adding network %s (interface %s)",
+		n->name, n->ifname);
+
+	/* Build masquerading rule */
+	if( z->masq )
+	{
+		if( (x = fwd_xt_init_rule(h_nat)) != NULL )
+		{
+			fwd_xt_parse_out(x, n, 0);				/* -o ... */
+			fwd_xt_get_target(x, "MASQUERADE");		/* -j MASQUERADE */
+			fwd_r_add_comment(x, "masq", z, n);		/* -m comment ... */
+			fwd_xt_append_rule(x, "zonemasq");		/* -A zonemasq */
+		}
+	}
+
+	/* Build MSS fix rule */
+	if( z->mtu_fix )
+	{
+		if( (x = fwd_xt_init_rule(h_filter)) != NULL )
+		{
+			p.type = FWD_PR_TCP;
+			fwd_xt_parse_out(x, n, 0);					/* -o ... */
+			fwd_xt_parse_proto(x, &p, 0);				/* -p tcp */
+
+			/* -m tcp --tcp-flags SYN,RST SYN */
+			if( (m = fwd_xt_get_match(x, "tcp")) != NULL )
+				fwd_xt_parse_match(x, m, "--tcp-flags", "SYN,RST", "SYN");
+
+			/* -j TCPMSS --clamp-mss-to-pmtu */
+			if( (t = fwd_xt_get_target(x, "TCPMSS")) != NULL )
+				fwd_xt_parse_target(x, t, "--clamp-mss-to-pmtu");
+
+			/* -m comment ... */
+			fwd_r_add_comment(x, "mssfix", z, n);
+
+			/* -A mssfix */
+			fwd_xt_append_rule(x, "mssfix");
+		}
+	}
+
+	/* Build intra-zone forwarding rules */
+	for( n2 = z->networks; n2; n2 = n2->next )
+	{
+		if( (a2 = n2->addr) != NULL )
+		{
+			if( (x = fwd_xt_init_rule(h_filter)) != NULL )
+			{
+				fwd_xt_parse_in(x, n, 0);				/* -i ... */
+				fwd_xt_parse_out(x, n2, 0);				/* -o ... */
+				fwd_r_add_policytarget(x, z->forward);	/* -j handle_... */
+				fwd_r_add_comment(x, "zone", z, n);		/* -m comment ... */
+				fwd_xt_append_rule(x, "zones");			/* -A zones */
+			}
+		}
+	}
+
+	/* Build inter-zone forwarding rules */
+	for( e = z->forwardings; e && (f = &e->section.forwarding); e = e->next )
+	{
+		for( n2 = f->dest->networks; n2; n2 = n2->next )
+		{
+			/* Build forwarding rule */
+			if( (x = fwd_xt_init_rule(h_filter)) != NULL )
+			{
+				fwd_xt_parse_in(x, n, 0);					/* -i ... */
+				fwd_xt_parse_out(x, n2, 0);					/* -o ... */
+				fwd_r_add_policytarget(x, FWD_P_ACCEPT);	/* -j handle_... */
+				fwd_r_add_comment(x, "forward", z, n);		/* -m comment ... */
+				fwd_xt_append_rule(x, "forwardings");		/* -A forwardings */
+			}
+		}
+	}
+
+	/* Build DNAT rules */
+	for( e = z->redirects; e && (r = &e->section.redirect); e = e->next )
+	{
+		/* DNAT */
+		if( (x = fwd_xt_init_rule(h_nat)) != NULL )
+		{
+			fwd_xt_parse_in(x, n, 0);					/* -i ... */
+			fwd_xt_parse_src(x, r->src_ip, 0);			/* -s ... */
+			fwd_xt_parse_dest(x, a, 0);					/* -d ... */
+			fwd_xt_parse_proto(x, r->proto, 0);			/* -p ... */
+			fwd_r_add_sport(x, r->src_port);			/* --sport ... */
+			fwd_r_add_dport(x, r->src_dport);			/* --dport ... */
+			fwd_r_add_srcmac(x, r->src_mac);			/* -m mac --mac-source ... */
+			fwd_r_add_dnattarget(x, r->dest_ip, r->dest_port);	/* -j DNAT ... */
+			fwd_r_add_comment(x, "redir", z, n);		/* -m comment ... */
+			fwd_xt_append_rule(x, "redirects");			/* -A redirects */
+		}
+
+		/* Forward */
+		if( (x = fwd_xt_init_rule(h_filter)) != NULL )
+		{
+			fwd_xt_parse_in(x, n, 0);					/* -i ... */
+			fwd_xt_parse_src(x, r->src_ip, 0);			/* -s ... */
+			fwd_xt_parse_dest(x, r->dest_ip, 0);		/* -d ... */
+			fwd_xt_parse_proto(x, r->proto, 0);			/* -p ... */
+			fwd_r_add_srcmac(x, r->src_mac);			/* -m mac --mac-source ... */
+			fwd_r_add_sport(x, r->src_port);			/* --sport ... */
+			fwd_r_add_dport(x, r->dest_port);			/* --dport ... */
+			fwd_r_add_policytarget(x, FWD_P_ACCEPT);	/* -j handle_accept */
+			fwd_r_add_comment(x, "redir", z, n);		/* -m comment ... */
+			fwd_xt_append_rule(x, "redirects");			/* -A redirects */
+		}
+
+		/* Add loopback rule if neither src_ip nor src_mac are defined */
+		if( !r->src_ip && !r->src_mac )
+		{
+			if( (x = fwd_xt_init_rule(h_nat)) != NULL )
+			{
+				fwd_xt_parse_in(x, n, 1);				/* -i ! ... */
+				fwd_xt_parse_dest(x, r->dest_ip, 0);	/* -d ... */
+				fwd_xt_parse_proto(x, r->proto, 0);		/* -p ... */
+				fwd_r_add_sport(x, r->src_port);		/* --sport ... */
+				fwd_r_add_dport(x, r->src_dport);		/* --dport ... */
+				fwd_xt_get_target(x, "MASQUERADE");		/* -j MASQUERADE */
+				fwd_r_add_comment(x, "redir", z, n);	/* -m comment ... */
+				fwd_xt_append_rule(x, "loopback");		/* -A loopback */
+			}
+		}
+	}
+
+	/* Build rules */
+	for( e = z->rules; e && (c = &e->section.rule); e = e->next )
+	{
+		/* Has destination, add forward rule for each network in target zone */
+		if( c->dest )
+		{
+			for( n2 = c->dest->networks; n2; n2 = n2->next )
+			{
+				if( (x = fwd_xt_init_rule(h_filter)) != NULL )
+				{
+					fwd_xt_parse_in(x, n, 0);				/* -i ... */
+					fwd_xt_parse_out(x, n2, 0);				/* -o ... */
+					fwd_xt_parse_src(x, c->src_ip, 0);		/* -s ... */
+					fwd_xt_parse_dest(x, c->dest_ip, 0);	/* -d ... */
+					fwd_xt_parse_proto(x, c->proto, 0);		/* -p ... */
+					fwd_r_add_icmptype(x, c->icmp_type);	/* --icmp-type ... */
+					fwd_r_add_srcmac(x, c->src_mac);		/* --mac-source ... */
+					fwd_r_add_sport(x, c->src_port);		/* --sport ... */
+					fwd_r_add_dport(x, c->dest_port);		/* --dport ... */
+					fwd_r_add_policytarget(x, c->target);	/* -j handle_... */
+					fwd_r_add_comment(x, "rule", z, n);		/* -m comment ... */
+					fwd_xt_append_rule(x, "rules");			/* -A rules */
+				}
+			}
+		}
+
+		/* No destination specified, treat it as input rule */
+		else
+		{
+			if( (x = fwd_xt_init_rule(h_filter)) != NULL )
+			{
+				fwd_xt_parse_in(x, n, 0);				/* -i ... */
+				fwd_xt_parse_src(x, c->src_ip, 0);		/* -s ... */
+				fwd_xt_parse_dest(x, c->dest_ip, 0);	/* -d ... */
+				fwd_xt_parse_proto(x, c->proto, 0);		/* -p ... */
+				fwd_r_add_icmptype(x, c->icmp_type);	/* --icmp-type ... */
+				fwd_r_add_srcmac(x, c->src_mac);		/* --mac-source ... */
+				fwd_r_add_sport(x, c->src_port);		/* --sport ... */
+				fwd_r_add_dport(x, c->dest_port);		/* --dport ... */
+				fwd_r_add_policytarget(x, c->target);	/* -j handle_... */
+				fwd_r_add_comment(x, "rule", z, n);		/* -m comment ... */
+				fwd_xt_append_rule(x, "rules");			/* -A rules */
+			}
+		}
+	}
+
+	if( !iptc_commit(h_nat) )
+		fwd_fatal("Cannot commit nat table: %s", iptc_strerror(errno));
+
+	if( !iptc_commit(h_filter) )
+		fwd_fatal("Cannot commit filter table: %s", iptc_strerror(errno));
+
+	iptc_free(h_nat);
+	iptc_free(h_filter);
+}
+
+
+static void fwd_ipt_delif_table(struct iptc_handle *h, const char *net)
+{
+	const struct xt_entry_match *m;
+	const struct ipt_entry *e;
+	const char *chain, *comment;
+	size_t off = 0, num = 0;
+
+	/* iterate chains */
+	for( chain = iptc_first_chain(h); chain;
+	     chain = iptc_next_chain(h)
+	) {
+		/* iterate rules */
+		for( e = iptc_first_rule(chain, h), num = 0; e;
+		     e = iptc_next_rule(e, h), num++
+		) {
+			repeat_rule:
+
+			/* skip entries w/o matches */
+			if( ! e->target_offset )
+				continue;
+
+			/* iterate matches */
+			for( off = sizeof(struct ipt_entry);
+			     off < e->target_offset;
+			     off += m->u.match_size
+			) {
+				m = (void *)e + off;
+
+				/* yay */
+				if( ! strcmp(m->u.user.name, "comment") )
+				{
+					/* better use struct_xt_comment_info but well... */
+					comment = (void *)m + sizeof(struct xt_entry_match);
+
+					if( fwd_r_cmp("net=", comment, net) )
+					{
+						e = iptc_next_rule(e, h);
+						iptc_delete_num_entry(chain, num, h);
+
+						if( e != NULL )
+							goto repeat_rule;
+						else
+							break;
+					}
+				}
+			}
+		}
+	}
+}
+
+void fwd_ipt_delif(struct fwd_handle *h, const char *net)
+{
+	struct iptc_handle *h_filter, *h_nat;
+
+	if( !(h_filter = iptc_init("filter")) || !(h_nat = iptc_init("nat")) )
+		fwd_fatal("Unable to obtain libiptc handle");
+
+
+	fwd_log_info("Removing network %s", net);
+
+	/* delete network related rules */
+	fwd_ipt_delif_table(h_nat, net);
+	fwd_ipt_delif_table(h_filter, net);
+
+
+	if( !iptc_commit(h_nat) )
+		fwd_fatal("Cannot commit nat table: %s", iptc_strerror(errno));
+
+	if( !iptc_commit(h_filter) )
+		fwd_fatal("Cannot commit filter table: %s", iptc_strerror(errno));
+
+	iptc_free(h_nat);
+	iptc_free(h_filter);
+}
+
+void fwd_ipt_chgif(struct fwd_handle *h, const char *net)
+{
+	/* XXX: should alter rules in-place, tbd */
+	fwd_ipt_delif(h, net);
+	fwd_ipt_addif(h, net);
+}
+
+
+static void fwd_ipt_clear_ruleset_table(struct iptc_handle *h)
+{
+	const char *chain;
+
+	/* pass 1: flush all chains */
+	for( chain = iptc_first_chain(h); chain;
+	     chain = iptc_next_chain(h)
+	) {
+		iptc_flush_entries(chain, h);
+	}
+
+	/* pass 2: remove user defined chains */
+	for( chain = iptc_first_chain(h); chain;
+	     chain = iptc_next_chain(h)
+	) {
+		if( ! iptc_builtin(chain, h) )
+			iptc_delete_chain(chain, h);
+	}
+}
+
+void fwd_ipt_clear_ruleset(struct fwd_handle *h)
+{
+	struct iptc_handle *h_filter, *h_nat;
+
+	if( !(h_filter = iptc_init("filter")) || !(h_nat = iptc_init("nat")) )
+		fwd_fatal("Unable to obtain libiptc handle");
+
+	/* flush tables */
+	fwd_ipt_clear_ruleset_table(h_nat);
+	fwd_ipt_clear_ruleset_table(h_filter);
+
+	/* revert policies */
+	fwd_r_set_policy(h_filter, "INPUT", "ACCEPT");
+	fwd_r_set_policy(h_filter, "OUTPUT", "ACCEPT");
+	fwd_r_set_policy(h_filter, "FORWARD", "ACCEPT");	
+
+
+	if( !iptc_commit(h_nat) )
+		fwd_fatal("Cannot commit nat table: %s", iptc_strerror(errno));
+
+	if( !iptc_commit(h_filter) )
+		fwd_fatal("Cannot commit filter table: %s", iptc_strerror(errno));
+
+	iptc_free(h_nat);
+	iptc_free(h_filter);
+}
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_rules.h b/trunk/package/luci/contrib/fwd/src/fwd_rules.h
new file mode 100644
index 00000000..a30e4125
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_rules.h
@@ -0,0 +1,32 @@
+/*
+ * fwd - libreCMC firewall daemon - header for iptables rule set
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef __FWD_RULES_H__
+#define __FWD_RULES_H__
+
+#include "fwd.h"
+
+void fwd_ipt_build_ruleset(struct fwd_handle *h);
+void fwd_ipt_clear_ruleset(struct fwd_handle *h);
+
+void fwd_ipt_addif(struct fwd_handle *h, const char *net);
+void fwd_ipt_delif(struct fwd_handle *h, const char *net);
+void fwd_ipt_chgif(struct fwd_handle *h, const char *net);
+
+#endif
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_utils.c b/trunk/package/luci/contrib/fwd/src/fwd_utils.c
new file mode 100644
index 00000000..e57c7057
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_utils.c
@@ -0,0 +1,78 @@
+/*
+ * fwd - libreCMC firewall daemon - commmon utility functions
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#include "fwd_utils.h"
+
+
+void fwd_log_init(void)
+{
+	openlog("Firewall", 0, LOG_DAEMON | LOG_PERROR);
+}
+
+void __fwd_log(int prio, const char *msg, ...)
+{
+	va_list ap;
+	va_start(ap, msg);
+	vsyslog(prio, msg, ap);
+	va_end(ap);
+}
+
+
+
+int fwd_empty_cidr(struct fwd_cidr *c)
+{
+	if( (c == NULL) || ((c->addr.s_addr == 0) && (c->prefix == 0)) )
+		return 1;
+
+	return 0;
+}
+
+int fwd_equal_cidr(struct fwd_cidr *a, struct fwd_cidr *b)
+{
+	if( fwd_empty_cidr(a) && fwd_empty_cidr(b) )
+		return 1;
+	else if( (a->addr.s_addr == b->addr.s_addr) && (a->prefix == b->prefix) )
+		return 1;
+
+	return 0;
+}
+
+void fwd_update_cidr(struct fwd_cidr *a, struct fwd_cidr *b)
+{
+	if( a != NULL )
+	{
+		a->addr.s_addr = b ? b->addr.s_addr : 0;
+		a->prefix = b ? b->prefix : 0;
+	}
+}
+
+
+/* fwd_zmalloc(size_t)
+ * Allocates a zeroed buffer of the given size. */
+void * fwd_zmalloc(size_t s)
+{
+	void *b = malloc(s);
+
+	if( b != NULL )
+		memset(b, 0, s);
+
+	return b;
+}
+
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_utils.h b/trunk/package/luci/contrib/fwd/src/fwd_utils.h
new file mode 100644
index 00000000..e8d80cc7
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_utils.h
@@ -0,0 +1,50 @@
+/*
+ * fwd - libreCMC firewall daemon - commmon utility header
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef __FWD_UTILS_H__
+#define __FWD_UTILS_H__
+
+#include <syslog.h>
+
+#include "fwd.h"
+
+void fwd_log_init(void);
+void __fwd_log(int, const char *, ...);
+#define fwd_log_info(...) __fwd_log(LOG_INFO, __VA_ARGS__)
+#define fwd_log_err(...) __fwd_log(LOG_ERR, __VA_ARGS__)
+
+int fwd_empty_cidr(struct fwd_cidr *);
+int fwd_equal_cidr(struct fwd_cidr *, struct fwd_cidr *);
+void fwd_update_cidr(struct fwd_cidr *, struct fwd_cidr *);
+
+/* fwd_zmalloc(size_t)
+ * Allocates a zeroed buffer of the given size. */
+void * fwd_zmalloc(size_t);
+
+/* fwd_alloc_ptr(type)
+ * Allocates a buffer with the size of the given datatype
+ * and returns a pointer to it. */
+#define fwd_alloc_ptr(t) (t *) fwd_zmalloc(sizeof(t))
+
+/* fwd_free_ptr(void *)
+ * Frees the given pointer and sets it to NULL.
+ * Safe for NULL values. */
+#define fwd_free_ptr(x) do { if(x != NULL) free(x); x = NULL; } while(0)
+
+#endif
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_xtables.c b/trunk/package/luci/contrib/fwd/src/fwd_xtables.c
new file mode 100644
index 00000000..afb21693
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_xtables.c
@@ -0,0 +1,412 @@
+/*
+ * fwd - libreCMC firewall daemon - libiptc/libxtables interface
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#include "fwd.h"
+#include "fwd_xtables.h"
+#include "fwd_utils.h"
+
+
+/* Required by certain extensions like SNAT and DNAT */
+int kernel_version;
+
+extern void
+get_kernel_version(void) {
+	static struct utsname uts;
+	int x = 0, y = 0, z = 0;
+
+	if (uname(&uts) == -1) {
+		fprintf(stderr, "Unable to retrieve kernel version.\n");
+		xtables_free_opts(1);
+		exit(1);
+	}
+
+	sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
+	kernel_version = LINUX_VERSION(x, y, z);
+}
+
+
+static void xt_exit_error(enum xtables_exittype status, const char *msg, ...)
+{
+	va_list ap;
+	va_start(ap, msg);
+	vprintf(msg, ap);
+	va_end(ap);	
+	exit(1);
+}
+
+void fwd_xt_init(void)
+{
+	struct xtables_globals xt_globals = {
+		.option_offset = 0,
+		.program_version = IPTABLES_VERSION,
+		.opts = 0,
+		.orig_opts = 0,
+		.exit_err = (void *)&xt_exit_error,
+	};
+
+	xtables_init();
+	xtables_set_nfproto(NFPROTO_IPV4);
+	xtables_set_params(&xt_globals);
+}
+
+
+struct fwd_xt_rule * fwd_xt_init_rule(struct iptc_handle *h)
+{
+	struct fwd_xt_rule *r;
+
+	if( (r = fwd_alloc_ptr(struct fwd_xt_rule)) != NULL )
+	{
+		if( (r->entry = fwd_alloc_ptr(struct ipt_entry)) != NULL )
+		{
+			r->iptc = h;
+			return r;
+		}
+	}
+
+	fwd_free_ptr(r);
+	return NULL;
+}
+
+void fwd_xt_parse_frag(
+	struct fwd_xt_rule *r, int frag, int inv
+) {
+	if( frag )
+	{
+		r->entry->ip.flags |= IPT_F_FRAG;
+
+		if( inv )
+			r->entry->ip.invflags |= IPT_INV_FRAG;
+	}
+}
+
+void fwd_xt_parse_proto(
+	struct fwd_xt_rule *r, struct fwd_proto *p, int inv
+) {
+	if( p != NULL )
+	{
+		switch(p->type)
+		{
+			case FWD_PR_TCP:
+				r->entry->ip.proto = 6;
+				break;
+
+			case FWD_PR_UDP:
+				r->entry->ip.proto = 17;
+				break;
+
+			case FWD_PR_ICMP:
+				r->entry->ip.proto = 1;
+				break;
+
+			case FWD_PR_CUSTOM:
+				r->entry->ip.proto = p->proto;
+				break;
+
+			case FWD_PR_ALL:
+			case FWD_PR_TCPUDP:
+				r->entry->ip.proto = 0;
+				break;
+		}
+
+		if( inv )
+			r->entry->ip.invflags |= IPT_INV_PROTO;
+	}
+}
+
+void fwd_xt_parse_in(
+	struct fwd_xt_rule *r, struct fwd_network *n, int inv
+) {
+	if( n != NULL )
+	{
+		strncpy(r->entry->ip.iniface, n->ifname, IFNAMSIZ);
+
+		if( inv )
+			r->entry->ip.invflags |= IPT_INV_VIA_IN;
+	}
+}
+
+void fwd_xt_parse_out(
+	struct fwd_xt_rule *r, struct fwd_network *n, int inv
+) {
+	if( n != NULL )
+	{
+		strncpy(r->entry->ip.outiface, n->ifname, IFNAMSIZ);
+
+		if( inv )
+			r->entry->ip.invflags |= IPT_INV_VIA_OUT;
+	}
+}
+
+void fwd_xt_parse_src(
+	struct fwd_xt_rule *r, struct fwd_cidr *c, int inv
+) {
+	if( c != NULL )
+	{
+		r->entry->ip.src.s_addr  = c->addr.s_addr;
+		r->entry->ip.smsk.s_addr = htonl(~((1 << (32 - c->prefix)) - 1));
+
+		if( inv )
+			r->entry->ip.invflags |= IPT_INV_SRCIP;
+	}
+}
+
+void fwd_xt_parse_dest(
+	struct fwd_xt_rule *r, struct fwd_cidr *c, int inv
+) {
+	if( c != NULL )
+	{
+		r->entry->ip.dst.s_addr  = c->addr.s_addr;
+		r->entry->ip.dmsk.s_addr = htonl(~((1 << (32 - c->prefix)) - 1));
+
+		if( inv )
+			r->entry->ip.invflags |= IPT_INV_DSTIP;
+	}
+}
+
+
+struct xtables_match * fwd_xt_get_match(
+	struct fwd_xt_rule *r, const char *name
+) {
+	struct xtables_match *m = xtables_find_match(name, XTF_TRY_LOAD, &r->matches);
+	size_t s;
+
+	if( m != NULL )
+	{
+		s = IPT_ALIGN(sizeof(struct ipt_entry_match)) + m->size;
+
+		if(	(m->m = malloc(s)) != NULL )
+		{
+			memset(m->m, 0, s);
+			strcpy(m->m->u.user.name, m->name);
+			m->m->u.match_size = s;
+
+			if( m->init )
+				m->init(m->m);
+
+			return m;
+		}
+	}
+
+	return NULL;
+}
+
+void __fwd_xt_parse_match(
+	struct fwd_xt_rule *r, struct xtables_match *m, ...
+) {
+	char optc;
+	char *s, **opts;
+	size_t len = 1;
+	int inv = 0;
+
+	va_list ap;
+	va_start(ap, m);
+
+	opts = malloc(len * sizeof(*opts));
+	opts[0] = "x";
+
+	while( (s = (char *)va_arg(ap, char *)) != NULL )
+	{
+		opts = realloc(opts, ++len * sizeof(*opts));
+		opts[len-1] = s;
+	}
+
+	va_end(ap);
+
+	if( len > 1 )
+	{
+		optind = 0;
+
+		while( (optc = getopt_long(len, opts, "", m->extra_opts, NULL)) > -1 )
+		{
+			if( (optc == '?') && (optarg[0] == '!') && (optarg[1] == '\0') )
+			{
+				inv = 1;
+				continue;
+			}
+
+			m->parse(optc, opts, inv, &m->mflags, r->entry, &m->m);
+			inv = 0;
+		}
+	}
+
+	free(opts);
+}
+
+
+struct xtables_target * fwd_xt_get_target(
+	struct fwd_xt_rule *r, const char *name
+) {
+	struct xtables_target *t = xtables_find_target(name, XTF_TRY_LOAD);
+	size_t s;
+
+	if( !t )
+		t = xtables_find_target(IPT_STANDARD_TARGET, XTF_LOAD_MUST_SUCCEED);
+
+	if( t != NULL )
+	{
+		s = IPT_ALIGN(sizeof(struct ipt_entry_target)) + t->size;
+
+		if(	(t->t = malloc(s)) != NULL )
+		{
+			memset(t->t, 0, s);
+			strcpy(t->t->u.user.name, name);
+			t->t->u.target_size = s;
+			xtables_set_revision(t->t->u.user.name, t->revision);
+
+			if( t->init )
+				t->init(t->t);
+
+			r->target = t;
+
+			return t;
+		}
+	}
+
+	return NULL;
+}
+
+void __fwd_xt_parse_target(
+	struct fwd_xt_rule *r, struct xtables_target *t, ...
+) {
+	char optc;
+	char *s, **opts;
+	size_t len = 1;
+	int inv = 0;
+
+	va_list ap;
+	va_start(ap, t);
+
+	opts = malloc(len * sizeof(*opts));
+	opts[0] = "x";
+
+	while( (s = (char *)va_arg(ap, char *)) != NULL )
+	{
+		opts = realloc(opts, ++len * sizeof(*opts));
+		opts[len-1] = s;
+	}
+
+	va_end(ap);
+
+	if( len > 1 )
+	{
+		optind = 0;
+
+		while( (optc = getopt_long(len, opts, "", t->extra_opts, NULL)) > -1 )
+		{
+			if( (optc == '?') && (optarg[0] == '!') && (optarg[1] == '\0') )
+			{
+				inv = 1;
+				continue;
+			}
+
+			t->parse(optc, opts, inv, &t->tflags, r->entry, &t->t);
+			inv = 0;
+		}
+	}
+
+	free(opts);
+}
+
+
+static int fwd_xt_exec_rule(struct fwd_xt_rule *r, const char *chain, int pos)
+{
+	size_t s;
+	struct xtables_rule_match *m, *next;
+	struct xtables_match *em;
+	struct xtables_target *et;
+	struct ipt_entry *e;
+	int rv = 0;
+
+	s = IPT_ALIGN(sizeof(struct ipt_entry));
+
+	for( m = r->matches; m; m = m->next )
+		s += m->match->m->u.match_size;
+
+	if( (e = malloc(s + r->target->t->u.target_size)) != NULL )
+	{
+		memset(e, 0, s + r->target->t->u.target_size);
+		memcpy(e, r->entry, sizeof(struct ipt_entry));
+
+		e->target_offset = s;
+		e->next_offset = s + r->target->t->u.target_size;
+
+		s = 0;
+
+		for( m = r->matches; m; m = m->next )
+		{
+			memcpy(e->elems + s, m->match->m, m->match->m->u.match_size);
+			s += m->match->m->u.match_size;
+		}
+
+		memcpy(e->elems + s, r->target->t, r->target->t->u.target_size);
+
+		rv = (pos > -1)
+			? iptc_insert_entry(chain, e, (unsigned int) pos, r->iptc)
+			: iptc_append_entry(chain, e, r->iptc)
+		;
+	}
+	else
+	{
+		errno = ENOMEM;
+	}
+
+
+	fwd_free_ptr(e);
+	fwd_free_ptr(r->entry);
+	fwd_free_ptr(r->target->t);
+
+	for( m = r->matches; m; )
+	{
+		next = m->next;
+		fwd_free_ptr(m->match->m);
+
+		if( m->match == m->match->next )
+			fwd_free_ptr(m->match);
+
+		fwd_free_ptr(m);
+		m = next;
+	}
+
+	fwd_free_ptr(r);
+
+	/* reset all targets and matches */
+	for (em = xtables_matches; em; em = em->next)
+		em->mflags = 0;
+
+	for (et = xtables_targets; et; et = et->next)
+	{
+		et->tflags = 0;
+		et->used = 0;
+	}
+
+	return rv;
+}
+
+int fwd_xt_insert_rule(
+	struct fwd_xt_rule *r, const char *chain, unsigned int pos
+) {
+	return fwd_xt_exec_rule(r, chain, pos);
+}
+
+int fwd_xt_append_rule(
+	struct fwd_xt_rule *r, const char *chain
+) {
+	return fwd_xt_exec_rule(r, chain, -1);
+}
+
diff --git a/trunk/package/luci/contrib/fwd/src/fwd_xtables.h b/trunk/package/luci/contrib/fwd/src/fwd_xtables.h
new file mode 100644
index 00000000..41414b73
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/fwd_xtables.h
@@ -0,0 +1,70 @@
+/*
+ * fwd - libreCMC firewall daemon - libiptc/libxtables interface headers
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * The fwd program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * The fwd program is distributed in the hope that 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 the fwd program. If not, see http://www.gnu.org/licenses/.
+ */
+
+
+#ifndef __FWD_XTABLES_H__
+#define __FWD_XTABLES_H__
+
+#include <iptables.h>
+#include <xtables.h>
+#include <libiptc/libxtc.h>
+
+#include <dlfcn.h>
+#include <errno.h>
+
+#include <sys/stat.h>
+#include <sys/utsname.h>
+
+
+
+struct fwd_xt_rule {
+	struct iptc_handle *iptc;
+	struct ipt_entry *entry;
+	struct xtables_rule_match *matches;
+	struct xtables_target *target;
+};
+
+
+/* Required by certain extensions like SNAT and DNAT */
+extern int kernel_version;
+extern void get_kernel_version(void);
+
+
+void fwd_xt_init(void);
+
+struct fwd_xt_rule * fwd_xt_init_rule(struct iptc_handle *h);
+
+void fwd_xt_parse_proto(struct fwd_xt_rule *r, struct fwd_proto *p, int inv);
+void fwd_xt_parse_in(struct fwd_xt_rule *r, struct fwd_network *n, int inv);
+void fwd_xt_parse_out(struct fwd_xt_rule *r, struct fwd_network *n, int inv);
+void fwd_xt_parse_src(struct fwd_xt_rule *r, struct fwd_cidr *c, int inv);
+void fwd_xt_parse_dest(struct fwd_xt_rule *r, struct fwd_cidr *c, int inv);
+void fwd_xt_parse_frag(struct fwd_xt_rule *r, int frag, int inv);
+
+struct xtables_match * fwd_xt_get_match(struct fwd_xt_rule *r, const char *name);
+void __fwd_xt_parse_match(struct fwd_xt_rule *r, struct xtables_match *m, ...);
+#define fwd_xt_parse_match(r, m, ...) __fwd_xt_parse_match(r, m, __VA_ARGS__, NULL)
+
+struct xtables_target * fwd_xt_get_target(struct fwd_xt_rule *r, const char *name);
+void __fwd_xt_parse_target(struct fwd_xt_rule *r, struct xtables_target *t, ...);
+#define fwd_xt_parse_target(r, t, ...) __fwd_xt_parse_target(r, t, __VA_ARGS__, NULL)
+
+int fwd_xt_append_rule(struct fwd_xt_rule *r, const char *chain);
+int fwd_xt_insert_rule(struct fwd_xt_rule *r, const char *chain, unsigned int pos);
+
+#endif
diff --git a/trunk/package/luci/contrib/fwd/src/ucix.c b/trunk/package/luci/contrib/fwd/src/ucix.c
new file mode 100644
index 00000000..4900782e
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/ucix.c
@@ -0,0 +1,236 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that 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 (C) 2008 John Crispin <blogic@librecmc.org> 
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <uci_config.h>
+#include <uci.h>
+#include "ucix.h"
+
+static struct uci_ptr ptr;
+
+static inline int ucix_get_ptr(struct uci_context *ctx, const char *p, const char *s, const char *o, const char *t)
+{
+	memset(&ptr, 0, sizeof(ptr));
+	ptr.package = p;
+	ptr.section = s;
+	ptr.option = o;
+	ptr.value = t;
+	return uci_lookup_ptr(ctx, &ptr, NULL, true);
+}
+
+struct uci_context* ucix_init(const char *config_file)
+{
+	struct uci_context *ctx = uci_alloc_context();
+	uci_add_history_path(ctx, "/var/state");
+	if(uci_load(ctx, config_file, NULL) != UCI_OK)
+	{
+		printf("%s/%s is missing or corrupt\n", ctx->savedir, config_file);
+		return NULL;
+	}
+	return ctx;
+}
+
+struct uci_context* ucix_init_path(const char *path, const char *config_file)
+{
+	struct uci_context *ctx = uci_alloc_context();
+	if(path)
+		uci_set_confdir(ctx, path);
+	if(uci_load(ctx, config_file, NULL) != UCI_OK)
+	{
+		printf("%s/%s is missing or corrupt\n", ctx->savedir, config_file);
+		return NULL;
+	}
+	return ctx;
+}
+
+int ucix_load(struct uci_context *ctx, const char *config_file)
+{
+	if(uci_load(ctx, config_file, NULL) != UCI_OK)
+	{
+		printf("%s/%s is missing or corrupt\n", ctx->savedir, config_file);
+		return 0;
+	}
+	return 1;
+}
+
+void ucix_cleanup(struct uci_context *ctx)
+{
+	uci_free_context(ctx);
+}
+
+void ucix_save(struct uci_context *ctx)
+{
+	uci_set_savedir(ctx, "/tmp/.uci/");
+	uci_save(ctx, NULL);
+}
+
+void ucix_save_state(struct uci_context *ctx)
+{
+	uci_set_savedir(ctx, "/var/state/");
+	uci_save(ctx, NULL);
+}
+
+const char* ucix_get_option(struct uci_context *ctx, const char *p, const char *s, const char *o)
+{
+	struct uci_element *e = NULL;
+	const char *value = NULL;
+	if(ucix_get_ptr(ctx, p, s, o, NULL))
+		return NULL;
+	if (!(ptr.flags & UCI_LOOKUP_COMPLETE))
+		return NULL;
+	e = ptr.last;
+	switch (e->type)
+	{
+		case UCI_TYPE_SECTION:
+			value = uci_to_section(e)->type;
+			break;
+
+		case UCI_TYPE_OPTION:
+			switch(ptr.o->type) {
+				case UCI_TYPE_STRING:
+					value = ptr.o->v.string;
+					break;
+				default:
+					value = NULL;
+					break;
+			}
+			break;
+
+		default:
+			return 0;
+	}
+
+	return value;
+}
+
+int ucix_for_each_list(
+	struct uci_context *ctx, const char *p, const char *s, const char *o,
+	void (*cb)(const char*, void*), void *priv)
+{
+	struct uci_element *e = NULL;
+	char *value = NULL;
+	int count = 0;
+	if(ucix_get_ptr(ctx, p, s, o, NULL))
+		return -1;
+	if (!(ptr.flags & UCI_LOOKUP_COMPLETE))
+		return -1;
+	e = ptr.last;
+	if(e->type == UCI_TYPE_OPTION)
+	{
+		switch(ptr.o->type)
+		{
+			case UCI_TYPE_LIST:
+				uci_foreach_element(&ptr.o->v.list, e) {
+					cb(e->name, priv);
+					count++;
+				}
+				break;
+
+			case UCI_TYPE_STRING:
+				if( (value = strdup(ptr.o->v.string)) != NULL )
+				{
+					char *ts, *tt, *tp;
+					for( ts = value; 1; ts = NULL )
+					{
+						if( (tt = strtok_r(ts, " \t", &tp)) != NULL )
+						{
+							cb(tt, priv);
+							count++;
+						}
+						else
+						{
+							break;
+						}
+					}
+					free(value);
+				}
+				break;
+		}
+
+		return count;
+	}
+
+	return -1;
+}
+
+int ucix_get_option_int(struct uci_context *ctx, const char *p, const char *s, const char *o, int def)
+{
+	const char *tmp = ucix_get_option(ctx, p, s, o);
+	int ret = def;
+
+	if (tmp)
+		ret = atoi(tmp);
+	return ret;
+}
+
+void ucix_add_section(struct uci_context *ctx, const char *p, const char *s, const char *t)
+{
+	if(ucix_get_ptr(ctx, p, s, NULL, t))
+		return;
+	uci_set(ctx, &ptr);
+}
+
+void ucix_add_option(struct uci_context *ctx, const char *p, const char *s, const char *o, const char *t)
+{
+	if(ucix_get_ptr(ctx, p, s, o, (t)?(t):("")))
+		return;
+	uci_set(ctx, &ptr);
+}
+
+void ucix_add_option_int(struct uci_context *ctx, const char *p, const char *s, const char *o, int t)
+{
+	char tmp[64];
+	snprintf(tmp, 64, "%d", t);
+	ucix_add_option(ctx, p, s, o, tmp);
+}
+
+void ucix_del(struct uci_context *ctx, const char *p, const char *s, const char *o)
+{
+	if(!ucix_get_ptr(ctx, p, s, o, NULL))
+		uci_delete(ctx, &ptr);
+}
+
+void ucix_revert(struct uci_context *ctx, const char *p, const char *s, const char *o)
+{
+	if(!ucix_get_ptr(ctx, p, s, o, NULL))
+		uci_revert(ctx, &ptr);
+}
+
+void ucix_for_each_section_type(struct uci_context *ctx,
+	const char *p, const char *t,
+	void (*cb)(struct uci_context *, const char*, void*), void *priv)
+{
+	struct uci_element *e;
+	if(ucix_get_ptr(ctx, p, NULL, NULL, NULL))
+		return;
+	uci_foreach_element(&ptr.p->sections, e)
+		if (!strcmp(t, uci_to_section(e)->type))
+			cb(ctx, e->name, priv);
+}
+
+int ucix_commit(struct uci_context *ctx, const char *p)
+{
+	if(ucix_get_ptr(ctx, p, NULL, NULL, NULL))
+		return 1;
+	return uci_commit(ctx, &ptr.p, false);
+}
+
+
diff --git a/trunk/package/luci/contrib/fwd/src/ucix.h b/trunk/package/luci/contrib/fwd/src/ucix.h
new file mode 100644
index 00000000..0763cca3
--- /dev/null
+++ b/trunk/package/luci/contrib/fwd/src/ucix.h
@@ -0,0 +1,50 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that 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 (C) 2008 John Crispin <blogic@librecmc.org> 
+ */
+
+#ifndef __UCIX_H__
+#define __UCIX_H_
+
+struct uci_context* ucix_init(const char *config_file);
+struct uci_context* ucix_init_path(const char *path, const char *config_file);
+int ucix_load(struct uci_context *ctx, const char *config_file);
+void ucix_cleanup(struct uci_context *ctx);
+void ucix_save(struct uci_context *ctx);
+void ucix_save_state(struct uci_context *ctx);
+const char* ucix_get_option(struct uci_context *ctx,
+	const char *p, const char *s, const char *o);
+int ucix_for_each_list(struct uci_context *ctx,
+	const char *p, const char *s, const char *o,
+	void (*cb)(const char*, void*), void *priv);
+int ucix_get_option_int(struct uci_context *ctx,
+	const char *p, const char *s, const char *o, int def);
+void ucix_add_section(struct uci_context *ctx,
+	const char *p, const char *s, const char *t);
+void ucix_add_option(struct uci_context *ctx,
+	const char *p, const char *s, const char *o, const char *t);
+void ucix_add_option_int(struct uci_context *ctx,
+	const char *p, const char *s, const char *o, int t);
+void ucix_for_each_section_type(struct uci_context *ctx,
+	const char *p, const char *t,
+	void (*cb)(struct uci_context *, const char*, void*), void *priv);
+int ucix_commit(struct uci_context *ctx, const char *p);
+void ucix_revert(struct uci_context *ctx,
+	const char *p, const char *s, const char *o);
+void ucix_del(struct uci_context *ctx, const char *p,
+	const char *s, const char *o);
+#endif
+
diff --git a/trunk/package/luci/contrib/lar/Makefile b/trunk/package/luci/contrib/lar/Makefile
new file mode 100644
index 00000000..5199546e
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/Makefile
@@ -0,0 +1,13 @@
+GCC     := gcc
+CFLAGS  := -Wall
+LDFLAGS :=
+
+OBJ = cli.o lar.o md5.o
+BIN = lar
+
+compile:
+cli: $(OBJ)
+	$(GCC) $(CFLAGS) -o $(BIN) $(OBJ) $(LDFLAGS)
+
+clean:
+	rm -f $(OBJ) $(BIN)
diff --git a/trunk/package/luci/contrib/lar/cli.c b/trunk/package/luci/contrib/lar/cli.c
new file mode 100644
index 00000000..36216d46
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/cli.c
@@ -0,0 +1,131 @@
+#include "lar.h"
+
+int do_print_member( lar_archive *ar, const char *name )
+{
+	lar_member *member;
+
+	if( (member = lar_open_member(ar, name)) != NULL )
+	{
+		write(fileno(stdout), member->data, member->length);
+		lar_close_member(member);
+	}
+	else
+		LAR_DIE("Unable to locate archive member");
+
+	return 0;
+}
+
+int do_print_index( lar_archive *ar )
+{
+	lar_index *index = ar->index;
+
+	if( ar->has_filenames )
+	{
+		while(index)
+		{
+			if( index->type == LAR_TYPE_REGULAR )
+			{
+				printf("%s\n", index->filename);
+			}
+
+			index = index->next;
+		}
+
+		return 0;
+	}
+
+	LAR_DIE("The archive contains no file list");
+	return 1;
+}
+
+int do_require( const char *package, const char *path )
+{
+	int stat = 1;
+	lar_archive *ar;
+	lar_member *mb;
+
+	if( (ar = lar_find_archive(package, path, 1)) != NULL )
+	{
+		if( (mb = lar_find_member(ar, package)) != NULL )
+		{
+			write(fileno(stdout), mb->data, mb->length);
+			lar_close_member(mb);
+			stat = 0;
+		}
+
+		lar_close(ar);
+	}
+
+	return stat;
+}
+
+int do_findfile( const char *filename, const char *path )
+{
+	int stat = 1;
+	lar_archive *ar;
+	lar_member *mb;
+
+	if( (ar = lar_find_archive(filename, path, 0)) != NULL )
+	{
+		if( (mb = lar_open_member(ar, filename)) != NULL )
+		{
+			write(fileno(stdout), mb->data, mb->length);
+			lar_close_member(mb);
+			stat = 0;
+		}
+
+		lar_close(ar);
+	}
+
+	return stat;
+}
+
+int main( int argc, const char* argv[] )
+{
+	lar_archive *ar;
+	int stat = 0;
+
+	if( argv[1] != NULL && argv[2] != NULL )
+	{
+		switch(argv[1][0])
+		{
+			case 's':
+				if( (ar = lar_open(argv[2])) != NULL )
+				{
+					if( argv[3] != NULL )
+						stat = do_print_member(ar, argv[3]);
+					else
+						stat = do_print_index(ar);
+
+					lar_close(ar);
+				}
+				else
+				{
+					LAR_DIE("Failed to open archive");
+				}
+
+				break;
+
+			case 'r':
+				stat = do_require(argv[2], argv[3]);
+				break;
+
+			case 'f':
+				stat = do_findfile(argv[2], argv[3]);
+				break;
+		}
+
+		return stat;
+	}
+	else
+	{
+		printf("Usage:\n");
+		printf("\tlar show <archive> [<member>]\n");
+		printf("\tlar require <package> [<path>]\n");
+		printf("\tlar find <filename> [<path>]\n");
+
+		return 1;
+	}
+
+	return 0;
+}
diff --git a/trunk/package/luci/contrib/lar/lar.c b/trunk/package/luci/contrib/lar/lar.c
new file mode 100644
index 00000000..2a0fa7da
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/lar.c
@@ -0,0 +1,328 @@
+/*
+ * lar - Lua Archive Library
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+#include "lar.h"
+
+static int lar_read32( int fd, uint32_t *val )
+{
+	uint8_t buffer[5];
+
+	if( read(fd, buffer, 4) < 4 )
+		LAR_DIE("Unexpected EOF while reading data");
+
+	buffer[4] = 0;
+	*val = ntohl(*((uint32_t *) buffer));
+
+	return 0;
+}
+
+static int lar_read16( int fd, uint16_t *val )
+{
+	uint8_t buffer[3];
+
+	if( read(fd, buffer, 2) < 2 )
+		LAR_DIE("Unexpected EOF while reading data");
+
+	buffer[2] = 0;
+	*val = ntohs(*((uint16_t *) buffer));
+
+	return 0;
+}
+
+static void lar_md5( char *md5, const char *data, int len )
+{
+	md5_state_t state;
+
+	md5_init(&state);
+	md5_append(&state, (const md5_byte_t *)data, len);
+	md5_finish(&state, (md5_byte_t *)md5);
+}
+
+static int lar_read_filenames( lar_archive *ar )
+{
+	int i;
+	int j;
+	char *filelist;
+	size_t pgof;
+	size_t pgsz = getpagesize();
+	lar_index *idx_ptr;
+	lar_index *idx_filelist = ar->index;
+
+	while(idx_filelist)
+	{
+		if( idx_filelist->type == LAR_TYPE_FILELIST )
+			break;
+
+		idx_filelist = idx_filelist->next;
+	}
+
+	if( idx_filelist != NULL )
+	{
+		pgof = ( idx_filelist->offset % pgsz );
+
+		filelist = mmap(
+			0, idx_filelist->length + pgof, PROT_READ, MAP_PRIVATE,
+			ar->fd, idx_filelist->offset - pgof
+		);
+
+		if( filelist == MAP_FAILED )
+			LAR_DIE("Failed to mmap() file list");
+
+
+		idx_ptr = ar->index;
+		i = pgof;
+
+		while(idx_ptr)
+		{
+			if( idx_ptr->type == LAR_TYPE_REGULAR )
+			{
+				j = strlen(&filelist[i]) + 1;
+
+				if( (j >= LAR_FNAME_BUFFER) ||
+				    ((i+j) > (idx_filelist->length+pgof)) )
+						LAR_DIE("Filename exceeds maximum allowed length");
+
+				idx_ptr->filename = (char *)malloc(j);
+				memcpy(idx_ptr->filename, &filelist[i], j);
+
+				i += j;
+			}
+
+			idx_ptr = idx_ptr->next;
+		}
+
+		munmap(filelist, idx_filelist->length + pgof);
+
+		return 1;
+	}
+
+	return 0;
+}
+
+lar_index * lar_get_index( lar_archive *ar )
+{
+	uint32_t i;
+	uint32_t idx_offset;
+	uint32_t idx_length;
+	lar_index *idx_map;
+	lar_index *idx_ptr;
+
+	if( lseek(ar->fd, -(sizeof(idx_offset)), SEEK_END) == -1 )
+		LAR_DIE("Unable to seek to end of archive");
+
+	lar_read32(ar->fd, &idx_offset);
+	idx_length = ( ar->length - idx_offset - sizeof(idx_offset) );
+
+	if( lseek(ar->fd, idx_offset, SEEK_SET) == -1 )
+		LAR_DIE("Unable to seek to archive index");
+
+
+	idx_map = NULL;
+
+	for( i = 0; i < idx_length; i += (sizeof(lar_index) - 2 * sizeof(char *)) )
+	{
+		idx_ptr = (lar_index *)malloc(sizeof(lar_index));
+		idx_ptr->filename = NULL;
+
+		lar_read32(ar->fd, &idx_ptr->offset);
+		lar_read32(ar->fd, &idx_ptr->length);
+		lar_read16(ar->fd, &idx_ptr->type);
+		lar_read16(ar->fd, &idx_ptr->flags);
+
+		if(read(ar->fd,&idx_ptr->id,sizeof(idx_ptr->id)) < sizeof(idx_ptr->id))
+			LAR_DIE("Unexpected EOF while reading member id");
+
+		idx_ptr->next = idx_map;
+		idx_map = idx_ptr;
+	}
+
+	return idx_map;
+}
+
+lar_member * lar_mmap_member( lar_archive *ar, lar_index *idx_ptr )
+{
+	lar_member *member;
+	size_t pgsz = getpagesize();
+	size_t pgof = ( idx_ptr->offset % pgsz );
+
+	char *memberdata = mmap(
+		0, idx_ptr->length + pgof, PROT_READ, MAP_PRIVATE,
+		ar->fd, idx_ptr->offset - pgof
+	);
+
+	if( memberdata == MAP_FAILED )
+		LAR_DIE("Failed to mmap() member data");
+
+	member = (lar_member *)malloc(sizeof(lar_member));
+	member->type   = idx_ptr->type;
+	member->flags  = idx_ptr->flags;
+	member->length = idx_ptr->length;
+	member->data   = &memberdata[pgof];
+
+	member->mmap   = memberdata;
+	member->mlen   = idx_ptr->length + pgof;
+
+	return member;
+}
+
+lar_member * lar_open_member( lar_archive *ar, const char *name )
+{
+	lar_index *idx_ptr = ar->index;
+	char mbid[sizeof(idx_ptr->id)];
+
+	lar_md5(mbid, name, strlen(name));
+
+	while(idx_ptr)
+	{
+		if( !strncmp(mbid, idx_ptr->id, sizeof(mbid)) )
+			return lar_mmap_member(ar, idx_ptr);
+
+		idx_ptr = idx_ptr->next;
+	}
+
+	return NULL;
+}
+
+int lar_close_member( lar_member *member )
+{
+	int stat = munmap(member->mmap, member->mlen);
+	free(member);
+	member = NULL;
+
+	return stat;
+}
+
+lar_archive * lar_open( const char *filename )
+{
+	int fd;
+	struct stat as;
+	lar_archive *ar;
+
+	if( stat(filename, &as) == -1 )
+		return NULL;
+
+	if( !(as.st_mode & S_IFREG) )
+		return NULL;
+
+	if( (fd = open(filename, O_RDONLY)) != -1 )
+	{
+		ar = (lar_archive *)malloc(sizeof(lar_archive));
+		ar->fd       = fd;
+		ar->length   = as.st_size;
+		ar->index    = lar_get_index(ar);
+		strncpy(ar->filename, filename, sizeof(ar->filename));
+
+		ar->has_filenames = lar_read_filenames(ar);
+
+		return ar;
+	}
+
+	return NULL;
+}
+
+int lar_close( lar_archive *ar )
+{
+	lar_index *idx_head;
+	lar_index *idx_next;
+
+	close(ar->fd);
+
+	idx_head = ar->index;
+	do {
+		idx_next = idx_head->next;
+		free(idx_head->filename);
+		free(idx_head);
+	} while( (idx_head = idx_next) != NULL );
+
+	free(ar);
+	ar = NULL;
+
+	return 0;
+}
+
+lar_archive * lar_find_archive( const char *package, const char *path, int pkg )
+{
+	uint32_t i;
+	uint32_t j;
+	uint32_t seg = 1;
+	uint32_t len = 0;
+	uint32_t pln = 0;
+	char sep = ( pkg ? '.' : '/' );
+	struct stat s;
+	LAR_FNAME(buffer);
+
+	if( path )
+	{
+		for( pln = 0; path[pln] != '\0'; pln++ )
+			if( pln >= (sizeof(buffer) - 5) )
+				LAR_DIE("Library path exceeds maximum allowed length");
+
+		memcpy(buffer, path, pln);
+	}
+
+	if( buffer[pln-1] != '/' )
+		buffer[pln++] = '/';
+
+	for( len = 0; package[len] != '\0'; len++ )
+	{
+		if( len >= (sizeof(buffer) - 5 - pln) )
+			LAR_DIE("Package name exceeds maximum allowed length");
+
+		if( package[len] == sep ) seg++;
+	}
+
+	while( seg > 0 )
+	{
+		for( i = 0, j = 1; (i < len) && (j <= seg); i++ )
+		{
+			if( package[i] == sep ) {
+				if( j < seg ) j++; else break;
+			}
+
+			buffer[pln+i] = ( package[i] == sep ) ? LAR_DIRSEP : package[i];
+		}
+
+		strcpy(&buffer[pln+i], ".lar");
+
+		if( (stat(buffer, &s) > -1) && (s.st_mode & S_IFREG) )
+			return lar_open(buffer);
+
+		seg--;
+	}
+
+	return NULL;
+}
+
+lar_member * lar_find_member( lar_archive *ar, const char *package )
+{
+	int len;
+	LAR_FNAME(buffer);
+
+	for( len = 0; package[len] != '\0'; len++ )
+	{
+		if( len >= (sizeof(buffer) - 5) )
+			LAR_DIE("Package name exceeds maximum allowed length");
+
+		buffer[len] = ( package[len] == '.' ) ? '/' : package[len];
+	}
+
+	strcpy(&buffer[len], ".lua");
+
+	return lar_open_member(ar, buffer);
+}
diff --git a/trunk/package/luci/contrib/lar/lar.h b/trunk/package/luci/contrib/lar/lar.h
new file mode 100644
index 00000000..5888f7e6
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/lar.h
@@ -0,0 +1,108 @@
+/*
+ * lar - Lua Archive Library
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+#ifndef __LAR_H
+#define __LAR_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+#include "md5.h"
+
+#define LAR_DIE(s) \
+	do { \
+		fprintf(stderr, "%s(%i): %s(): %s\n", \
+			__FILE__, __LINE__, __FUNCTION__, s); \
+		if( errno ) fprintf(stderr, "%s(%i): %s\n", \
+			__FILE__, __LINE__, strerror(errno) ); \
+		exit(1); \
+	} while(0)
+
+
+#define LAR_FNAME_BUFFER 1024
+#define LAR_FNAME(s) char s[LAR_FNAME_BUFFER]
+
+#define LAR_TYPE_REGULAR	0x0000
+#define LAR_TYPE_FILELIST	0xFFFF
+
+#ifdef __WIN32__
+#define LAR_DIRSEP	'\\'
+#else
+#define LAR_DIRSEP	'/'
+#endif
+
+
+struct lar_index_item {
+	uint32_t offset;
+	uint32_t length;
+	uint16_t type;
+	uint16_t flags;
+	char id[16];
+	char *filename;
+	struct lar_index_item *next;
+};
+
+struct lar_member_item {
+	uint16_t type;
+	uint16_t flags;
+	uint32_t length;
+	char *data;
+	char *mmap;
+	size_t mlen;
+};
+
+struct lar_archive_handle {
+	int fd;
+	int has_filenames;
+	off_t length;
+	char filename[LAR_FNAME_BUFFER];
+	struct lar_index_item *index;
+};
+
+typedef struct lar_index_item lar_index;
+typedef struct lar_member_item lar_member;
+typedef struct lar_archive_handle lar_archive;
+
+
+lar_index * lar_get_index( lar_archive *ar );
+
+lar_member * lar_mmap_member( lar_archive *ar, lar_index *idx_ptr );
+
+lar_member * lar_open_member( lar_archive *ar, const char *name );
+
+int lar_close_member( lar_member *member );
+
+lar_archive * lar_open( const char *filename );
+
+int lar_close( lar_archive *ar );
+
+lar_archive * lar_find_archive( const char *package, const char *path, int pkg);
+
+lar_member * lar_find_member( lar_archive *ar, const char *package );
+
+#endif
diff --git a/trunk/package/luci/contrib/lar/lar.pl b/trunk/package/luci/contrib/lar/lar.pl
new file mode 100755
index 00000000..2f9f3dd6
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/lar.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+
+use strict;
+
+@ARGV || die "Usage: $0 <file1> <file2> ... <fileN>\n";
+
+my @index;
+my $offset = 0;
+
+foreach my $file ( @ARGV )
+{
+	if( -f $file && open F, "< $file" )
+	{
+		warn sprintf "Member at 0x%08X\n", $offset;
+		push @index, [ ];
+
+		my $size = length $file;
+
+		print $file;
+		print "\0" x ( $size % 4 );
+
+		$index[-1][0] = $offset;
+		$index[-1][1] = $size;
+		$index[-1][2] = $offset + $size + ( $size % 4 );
+
+		
+		$size = 0;
+		while( read F, my $buffer, 4096 ) {
+			$size += length $buffer;
+			print $buffer;
+		}
+		print "\0" x ( $size % 4 );
+
+		$index[-1][3] = $size;
+		$offset = $index[-1][2] + $size + ( $size % 4 );
+
+		close F;
+	}
+}
+
+my $count = 1;
+foreach my $file ( @index )
+{
+	warn sprintf "Index[%4d]: 0x%08X 0x%08X 0x%08X 0x%08X\n", $count++, $file->[0], $file->[1], $file->[2], $file->[3];
+	print pack "NNNNnn", $file->[0], $file->[1], $file->[2], $file->[3], 0x0000, 0x0000;
+}
+
+warn sprintf "Index at 0x%08X, length 0x%08X\n", $offset, @index * 20;
+print pack "N", $offset;
+
diff --git a/trunk/package/luci/contrib/lar/larlib.c b/trunk/package/luci/contrib/lar/larlib.c
new file mode 100644
index 00000000..aa9280a0
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/larlib.c
@@ -0,0 +1,540 @@
+/*
+ * lar - Lua Archive Library
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+#include "lar.h"
+
+typedef struct {
+	int fd;
+	char *data;
+	size_t length;
+} mmap_handle;
+
+static int larlib_perror( lua_State *L, const char *message )
+{
+	lua_pushnil(L);
+	lua_pushstring(L, message);
+
+	return 2;
+}
+
+int larlib_open( lua_State *L )
+{
+	lar_archive *ar, **udata;
+	const char *filename = luaL_checkstring( L, 1 );
+
+	if( filename != NULL && (ar = lar_open(filename)) != NULL )
+	{
+		if( (udata = lua_newuserdata(L, sizeof(lar_archive *))) != NULL )
+		{
+			*udata = ar;
+			luaL_getmetatable(L, "lar.archive");
+			lua_setmetatable(L, -2);
+		}
+		else
+		{
+			return luaL_error(L, "Out of memory");
+		}
+	}
+	else
+	{
+		return larlib_perror(L, "Archive not found");
+	}
+
+	return 1;
+}
+
+int larlib_find( lua_State *L )
+{
+	const char *filename = luaL_checkstring( L, 1 );
+	const char *basepath = luaL_optstring( L, 2, "./" );
+	int is_pkg = strstr(filename, "/") ? 0 : 1;
+	lar_archive *ar, **udata;
+
+	if( ((ar = lar_find_archive(filename, basepath, is_pkg)) != NULL) ||
+	    ((ar = lar_find_archive(filename, LUA_LDIR, is_pkg)) != NULL) ||
+		((ar = lar_find_archive(filename, LUA_CDIR, is_pkg)) != NULL) )
+	{
+		if( (udata = lua_newuserdata(L, sizeof(lar_archive *))) != NULL )
+		{
+			*udata = ar;
+			luaL_getmetatable(L, "lar.archive");
+			lua_setmetatable(L, -2);
+		}
+		else
+		{
+			return luaL_error(L, "Out of memory");
+		}
+	}
+	else
+	{
+		return larlib_perror(L, "Archive not found");
+	}
+
+	return 1;
+}
+
+int larlib_md5( lua_State *L )
+{
+	int i;
+	char md5[16], md5_hex[33];
+	const char *data = luaL_checkstring( L, 1 );
+	md5_state_t state;
+
+	md5_init(&state);
+	md5_append(&state, (const md5_byte_t *)data, strlen(data));
+	md5_finish(&state, (md5_byte_t *)md5);
+
+	for( i = 0; i < 16; i++ )
+		sprintf(&md5_hex[i*2], "%02x", (unsigned char)md5[i]);
+
+	lua_pushstring(L, md5_hex);
+	return 1;
+}
+
+int larlib_md5_file( lua_State *L )
+{
+	int i, fd, len;
+	char md5[16], md5_hex[33], buffer[1024];
+	const char *filename = luaL_checkstring( L, 1 );
+	md5_state_t state;
+
+	if( (fd = open(filename, O_RDONLY)) != -1 )
+	{
+		md5_init(&state);
+
+		while( (len = read(fd, buffer, 1024)) > 0 )
+			md5_append(&state, (const md5_byte_t *)buffer, len);
+
+		md5_finish(&state, (md5_byte_t *)md5);
+
+		for( i = 0; i < 16; i++ )
+			sprintf(&md5_hex[i*2], "%02x", (unsigned char)md5[i]);
+
+		close(fd);
+		lua_pushstring(L, md5_hex);
+	}
+	else
+	{
+		return larlib_perror(L, strerror(errno));
+	}
+
+	return 1;
+}
+
+static int larlib_mkpath( const char *name, const char *path, char *buffer )
+{
+	int nlen = strlen(name);
+	int plen = strlen(path);
+
+	if( (nlen + plen + 1) <= LAR_FNAME_BUFFER )
+	{
+		strcpy(buffer, path);
+
+		if( buffer[plen-1] != '/' )
+			buffer[plen++] = '/';
+
+		strcpy(&buffer[plen], name);
+		buffer[plen + nlen] = '\0';
+
+		return 0;
+	}
+
+	return 1;
+}
+
+static int larlib__gc( lua_State *L )
+{
+	lar_archive **archive = luaL_checkudata( L, 1, "lar.archive" );
+
+	if( *archive )
+		lar_close(*archive);
+
+	*archive = NULL;
+	return 0;
+}
+
+
+static int larlib_member__open( lua_State *L, lar_member *mb )
+{
+	lar_archive **archive = NULL;
+	const char *filename = NULL;
+	lar_member **udata;
+
+	if( mb == NULL )
+	{
+		*archive = luaL_checkudata( L, 1, "lar.archive" );
+		filename = luaL_checkstring( L, 2 );
+	}
+
+	if( mb != NULL || (mb = lar_open_member(*archive, filename)) != NULL )
+	{
+		if( (udata = lua_newuserdata(L, sizeof(lar_member *))) != NULL )
+		{
+			*udata = mb;
+			luaL_getmetatable(L, "lar.member");
+			lua_setmetatable(L, -2);
+		}
+		else
+		{
+			return luaL_error(L, "Out of memory");
+		}
+	}
+	else
+	{
+		return larlib_perror(L, "Member not found in archive");
+	}
+
+	return 1;
+}
+
+int larlib_member_open( lua_State *L )
+{
+	return larlib_member__open( L, NULL );
+}
+
+int larlib_member_find( lua_State *L )
+{
+	lar_archive **archive = luaL_checkudata( L, 1, "lar.archive" );
+	const char *package = luaL_checkstring( L, 2 );
+	lar_member *mb, **udata;
+
+	if( (mb = lar_find_member(*archive, package)) != NULL )
+	{
+		if( (udata = lua_newuserdata(L, sizeof(lar_member *))) != NULL )
+		{
+			*udata = mb;
+			luaL_getmetatable(L, "lar.member");
+			lua_setmetatable(L, -2);
+		}
+		else
+		{
+			return luaL_error(L, "Out of memory");
+		}
+	}
+	else
+	{
+		return larlib_perror(L, "Member not found in archive");
+	}
+
+	return 1;
+}
+
+int larlib_member_size( lua_State *L )
+{
+	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
+	lua_pushnumber(L, (*member)->length);
+	return 1;
+}
+
+int larlib_member_type( lua_State *L )
+{
+	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
+	lua_pushnumber(L, (*member)->type);
+	return 1;
+}
+
+int larlib_member_flags( lua_State *L )
+{
+	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
+	lua_pushnumber(L, (*member)->flags);
+	return 1;
+}
+
+int larlib_member_read( lua_State *L )
+{
+	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
+	int start  = luaL_checknumber( L, 2 );
+	int length = luaL_optnumber( L, 3, (*member)->length );
+	char *stringcopy;
+
+	if( (start >= 0) && (start < (*member)->length) && (length > 0) )
+	{
+		if( (start + length) >= (*member)->length )
+			length = (*member)->length - start;
+
+		if( (stringcopy = (char *)malloc(length + 1)) != NULL )
+		{
+			memcpy(stringcopy, &(*member)->data[start], length);
+			stringcopy[length] = '\0';
+			lua_pushstring(L, stringcopy);
+			free(stringcopy);
+		}
+		else
+		{
+			return luaL_error(L, "Out of memory");
+		}
+	}
+	else
+	{
+		return larlib_perror(L, "Invalid argument");
+	}
+
+	return 1;
+}
+
+int larlib_member_data( lua_State *L )
+{
+	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
+	lua_pushstring(L, (*member)->data);
+	return 1;
+}
+
+int larlib_member_load( lua_State *L )
+{
+	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
+	int status = luaL_loadbuffer( L, (*member)->data, (*member)->length,
+		"=(lar member)" );
+
+	if( status )
+	{
+		lua_pushnil(L);
+		lua_insert(L, -2);
+		return 2;
+	}
+
+	return 1;
+}
+
+static int larlib_member__gc( lua_State *L )
+{
+	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
+
+	if( *member )
+		lar_close_member(*member);
+
+	*member = NULL;
+	return 0;
+}
+
+
+static int larlib_mmfile__open( lua_State *L, const char *filename )
+{
+	struct stat s;
+	mmap_handle *fh, **udata;
+
+	if( filename == NULL )
+		filename = (const char *)luaL_checkstring( L, 1 );
+
+	if( (fh = (mmap_handle *)malloc(sizeof(mmap_handle))) == NULL )
+		return larlib_perror(L, "Out of memory");
+
+	if( stat(filename, &s) > -1 && (fh->fd = open(filename, O_RDONLY)) > -1 )
+	{
+		fh->length = s.st_size;
+		fh->data   = mmap( 0, s.st_size, PROT_READ, MAP_PRIVATE, fh->fd, 0 );
+
+		if( fh->data == MAP_FAILED )
+			return larlib_perror(L, "Failed to mmap() file");
+
+		if( (udata = lua_newuserdata(L, sizeof(char *))) != NULL )
+		{
+			*udata = fh;
+			luaL_getmetatable(L, "lar.mmfile");
+			lua_setmetatable(L, -2);
+		}
+		else
+		{
+			return larlib_perror(L, "Out of memory");
+		}
+	}
+	else
+	{
+		return larlib_perror(L, strerror(errno));
+	}
+
+	return 1;
+}
+
+int larlib_mmfile_open( lua_State *L )
+{
+	return larlib_mmfile__open(L, NULL);
+}
+
+int larlib_mmfile_size( lua_State *L )
+{
+	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
+	lua_pushnumber(L, (*fh)->length);
+	return 1;
+}
+
+int larlib_mmfile_read( lua_State *L )
+{
+	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
+	int start  = luaL_checknumber( L, 2 );
+	int length = luaL_optnumber( L, 3, (*fh)->length );
+	char *stringcopy;
+
+	if( (start >= 0) && (start < (*fh)->length) && (length > 0) )
+	{
+		if( (start + length) >= (*fh)->length )
+			length = (*fh)->length - start;
+
+		if( (stringcopy = (char *)malloc(length + 1)) != NULL )
+		{
+			memcpy(stringcopy, &(*fh)->data[start], length);
+			stringcopy[length] = '\0';
+			lua_pushstring(L, stringcopy);
+			free(stringcopy);
+		}
+		else
+		{
+			return luaL_error(L, "Out of memory");
+		}
+	}
+	else
+	{
+		return larlib_perror(L, "Invalid argument");
+	}
+
+	return 1;
+}
+
+int larlib_mmfile_data( lua_State *L )
+{
+	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
+	lua_pushstring(L, (*fh)->data);
+	return 1;
+}
+
+int larlib_mmfile_load( lua_State *L )
+{
+	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
+	int status = luaL_loadbuffer(L, (*fh)->data, (*fh)->length, "=(mmap file)");
+
+	if( status )
+	{
+		lua_pushnil(L);
+		lua_insert(L, -2);
+		return 2;
+	}
+
+	return 1;
+}
+
+static int larlib_mmfile__gc( lua_State *L )
+{
+	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
+
+	if( *fh )
+	{
+		close((*fh)->fd);
+		munmap((*fh)->data, (*fh)->length);
+		free(*fh);
+		*fh = NULL;
+	}
+
+	return 0;
+}
+
+
+int larlib_findfile( lua_State *L )
+{
+	int i;
+	const char *filename = luaL_checkstring( L, 1 );
+	const char *basepath = luaL_optstring( L, 2, "./" );
+	struct stat s;
+	lar_archive *ar;
+	lar_member  *mb;
+	LAR_FNAME(filepath);
+
+	const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR };
+
+	for( i = 0; i < 3; i++ )
+		if( !larlib_mkpath(filename, searchpath[i], filepath) )
+			if( stat(filepath, &s) > -1 && (s.st_mode & S_IFREG) )
+				return larlib_mmfile__open( L, filepath );
+
+	for( i = 0; i < 3; i++ )
+		if( (ar = lar_find_archive(filename, searchpath[i], 0)) != NULL )
+			if( (mb = lar_open_member(ar, filename)) != NULL )
+				return larlib_member__open( L, mb );
+
+	return larlib_perror(L, "File not found");
+}
+
+
+static const luaL_reg LAR_REG[] = {
+	{ "open",			larlib_open 		},
+	{ "find",			larlib_find 		},
+	{ "md5",			larlib_md5			},
+	{ "md5_file",		larlib_md5_file		},
+	{ "mmap",			larlib_mmfile_open	},
+	{ "findfile",		larlib_findfile		},
+	{ NULL,				NULL				}
+};
+
+static const luaL_reg LAR_ARCHIVE_REG[] = {
+	{ "member",			larlib_member_open	},
+	{ "find",			larlib_member_find	},
+	{ "__gc",			larlib__gc			},
+	{ NULL,				NULL				}
+};
+
+static const luaL_reg LAR_MEMBER_REG[] = {
+	{ "size",			larlib_member_size	},
+	{ "type",			larlib_member_type	},
+	{ "flags",			larlib_member_flags	},
+	{ "read",			larlib_member_read	},
+	{ "data",			larlib_member_data	},
+	{ "load",			larlib_member_load	},
+	{ "__gc",			larlib_member__gc	},
+	{ NULL,				NULL				}
+};
+
+static const luaL_reg LAR_MMFILE_REG[] = {
+	{ "size",			larlib_mmfile_size	},
+	{ "read",			larlib_mmfile_read	},
+	{ "data",			larlib_mmfile_data	},
+	{ "load",			larlib_mmfile_load	},
+	{ "__gc",			larlib_mmfile__gc	},
+	{ NULL,				NULL				}
+};
+
+
+LUALIB_API int luaopen_larlib( lua_State *L )
+{
+	luaL_newmetatable(L, "lar");
+	luaL_register(L, NULL, LAR_REG);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	lua_setglobal(L, "lar");
+
+	luaL_newmetatable(L, "lar.archive");
+	luaL_register(L, NULL, LAR_ARCHIVE_REG);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	lua_setglobal(L, "lar.archive");
+
+	luaL_newmetatable(L, "lar.member");
+	luaL_register(L, NULL, LAR_MEMBER_REG);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	lua_setglobal(L, "lar.member");
+
+	luaL_newmetatable(L, "lar.mmfile");
+	luaL_register(L, NULL, LAR_MMFILE_REG);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	lua_setglobal(L, "lar.mmfile");
+
+	return 1;
+}
diff --git a/trunk/package/luci/contrib/lar/md5.c b/trunk/package/luci/contrib/lar/md5.c
new file mode 100644
index 00000000..c35d96c5
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/md5.c
@@ -0,0 +1,381 @@
+/*
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+	either statically or dynamically; added missing #include <string.h>
+	in library.
+  2002-03-11 lpd Corrected argument list for main(), and added int return
+	type, in test program and T value program.
+  2002-02-21 lpd Added missing #include <stdio.h> in test program.
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+	unsigned in ANSI C, signed in traditional"; made test program
+	self-checking.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
+ */
+
+#include "md5.h"
+#include <string.h>
+
+#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+{
+    md5_word_t
+	a = pms->abcd[0], b = pms->abcd[1],
+	c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+#endif
+
+    {
+#if BYTE_ORDER == 0
+	/*
+	 * Determine dynamically whether this is a big-endian or
+	 * little-endian machine, since we can use a more efficient
+	 * algorithm on the latter.
+	 */
+	static const int w = 1;
+
+	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0		/* little-endian */
+	{
+	    /*
+	     * On little-endian machines, we can process properly aligned
+	     * data without copying it.
+	     */
+	    if (!((data - (const md5_byte_t *)0) & 3)) {
+		/* data are properly aligned */
+		X = (const md5_word_t *)data;
+	    } else {
+		/* not aligned */
+		memcpy(xbuf, data, 64);
+		X = xbuf;
+	    }
+	}
+#endif
+#if BYTE_ORDER == 0
+	else			/* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0		/* big-endian */
+	{
+	    /*
+	     * On big-endian machines, we must arrange the bytes in the
+	     * right order.
+	     */
+	    const md5_byte_t *xp = data;
+	    int i;
+
+#  if BYTE_ORDER == 0
+	    X = xbuf;		/* (dynamic only) */
+#  else
+#    define xbuf X		/* (static only) */
+#  endif
+	    for (i = 0; i < 16; ++i, xp += 4)
+		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+	}
+#endif
+    }
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
+}
+
+void
+md5_init(md5_state_t *pms)
+{
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
+}
+
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+{
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+	memcpy(pms->buf + offset, p, copy);
+	if (offset + copy < 64)
+	    return;
+	p += copy;
+	left -= copy;
+	md5_process(pms, pms->buf);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buf, p, left);
+}
+
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
+{
+    static const md5_byte_t pad[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}
diff --git a/trunk/package/luci/contrib/lar/md5.h b/trunk/package/luci/contrib/lar/md5.h
new file mode 100644
index 00000000..698c995d
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/md5.h
@@ -0,0 +1,91 @@
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+	references to Ghostscript; clarified derivation from RFC 1321;
+	now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
+
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+
+/* Finish the message and return the digest. */
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
+
+#endif /* md5_INCLUDED */
diff --git a/trunk/package/luci/contrib/lar/openwrt/050-lar-source-loader.patch b/trunk/package/luci/contrib/lar/openwrt/050-lar-source-loader.patch
new file mode 100644
index 00000000..c2e1c596
--- /dev/null
+++ b/trunk/package/luci/contrib/lar/openwrt/050-lar-source-loader.patch
@@ -0,0 +1,1561 @@
+diff -Nbur lua-5.1.4.orig/src/Makefile lua-5.1.4/src/Makefile
+--- lua-5.1.4.orig/src/Makefile	2009-04-06 21:36:52.000000000 +0200
++++ lua-5.1.4/src/Makefile	2009-04-11 01:02:45.000000000 +0200
+@@ -28,7 +28,7 @@
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o lnum.o
+ LIB_O=	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
+-	lstrlib.o loadlib.o linit.o
++	lstrlib.o loadlib.o linit.o lar.o md5.o larlib.o
+ 
+ LUA_T=	lua
+ LUA_O=	lua.o
+diff -Nbur lua-5.1.4.orig/src/lar.c lua-5.1.4/src/lar.c
+--- lua-5.1.4.orig/src/lar.c	1970-01-01 01:00:00.000000000 +0100
++++ lua-5.1.4/src/lar.c	2009-04-13 16:51:07.000000000 +0200
+@@ -0,0 +1,328 @@
++/*
++ * lar - Lua Archive Library
++ *
++ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
++ *
++ *  Licensed under the Apache License, Version 2.0 (the "License");
++ *  you may not use this file except in compliance with the License.
++ *  You may obtain a copy of the License at
++ *
++ *      http://www.apache.org/licenses/LICENSE-2.0
++ *
++ *  Unless required by applicable law or agreed to in writing, software
++ *  distributed under the License is distributed on an "AS IS" BASIS,
++ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ *  See the License for the specific language governing permissions and
++ *  limitations under the License.
++ */
++
++
++#include "lar.h"
++
++static int lar_read32( int fd, uint32_t *val )
++{
++	uint8_t buffer[5];
++
++	if( read(fd, buffer, 4) < 4 )
++		LAR_DIE("Unexpected EOF while reading data");
++
++	buffer[4] = 0;
++	*val = ntohl(*((uint32_t *) buffer));
++
++	return 0;
++}
++
++static int lar_read16( int fd, uint16_t *val )
++{
++	uint8_t buffer[3];
++
++	if( read(fd, buffer, 2) < 2 )
++		LAR_DIE("Unexpected EOF while reading data");
++
++	buffer[2] = 0;
++	*val = ntohs(*((uint16_t *) buffer));
++
++	return 0;
++}
++
++static void lar_md5( char *md5, const char *data, int len )
++{
++	md5_state_t state;
++
++	md5_init(&state);
++	md5_append(&state, (const md5_byte_t *)data, len);
++	md5_finish(&state, (md5_byte_t *)md5);
++}
++
++static int lar_read_filenames( lar_archive *ar )
++{
++	int i;
++	int j;
++	char *filelist;
++	size_t pgof;
++	size_t pgsz = getpagesize();
++	lar_index *idx_ptr;
++	lar_index *idx_filelist = ar->index;
++
++	while(idx_filelist)
++	{
++		if( idx_filelist->type == LAR_TYPE_FILELIST )
++			break;
++
++		idx_filelist = idx_filelist->next;
++	}
++
++	if( idx_filelist != NULL )
++	{
++		pgof = ( idx_filelist->offset % pgsz );
++
++		filelist = mmap(
++			0, idx_filelist->length + pgof, PROT_READ, MAP_PRIVATE,
++			ar->fd, idx_filelist->offset - pgof
++		);
++
++		if( filelist == MAP_FAILED )
++			LAR_DIE("Failed to mmap() file list");
++
++
++		idx_ptr = ar->index;
++		i = pgof;
++
++		while(idx_ptr)
++		{
++			if( idx_ptr->type == LAR_TYPE_REGULAR )
++			{
++				j = strlen(&filelist[i]) + 1;
++
++				if( (j >= LAR_FNAME_BUFFER) ||
++				    ((i+j) > (idx_filelist->length+pgof)) )
++						LAR_DIE("Filename exceeds maximum allowed length");
++
++				idx_ptr->filename = (char *)malloc(j);
++				memcpy(idx_ptr->filename, &filelist[i], j);
++
++				i += j;
++			}
++
++			idx_ptr = idx_ptr->next;
++		}
++
++		munmap(filelist, idx_filelist->length + pgof);
++
++		return 1;
++	}
++
++	return 0;
++}
++
++lar_index * lar_get_index( lar_archive *ar )
++{
++	uint32_t i;
++	uint32_t idx_offset;
++	uint32_t idx_length;
++	lar_index *idx_map;
++	lar_index *idx_ptr;
++
++	if( lseek(ar->fd, -(sizeof(idx_offset)), SEEK_END) == -1 )
++		LAR_DIE("Unable to seek to end of archive");
++
++	lar_read32(ar->fd, &idx_offset);
++	idx_length = ( ar->length - idx_offset - sizeof(idx_offset) );
++
++	if( lseek(ar->fd, idx_offset, SEEK_SET) == -1 )
++		LAR_DIE("Unable to seek to archive index");
++
++
++	idx_map = NULL;
++
++	for( i = 0; i < idx_length; i += (sizeof(lar_index) - 2 * sizeof(char *)) )
++	{
++		idx_ptr = (lar_index *)malloc(sizeof(lar_index));
++		idx_ptr->filename = NULL;
++
++		lar_read32(ar->fd, &idx_ptr->offset);
++		lar_read32(ar->fd, &idx_ptr->length);
++		lar_read16(ar->fd, &idx_ptr->type);
++		lar_read16(ar->fd, &idx_ptr->flags);
++
++		if(read(ar->fd,&idx_ptr->id,sizeof(idx_ptr->id)) < sizeof(idx_ptr->id))
++			LAR_DIE("Unexpected EOF while reading member id");
++
++		idx_ptr->next = idx_map;
++		idx_map = idx_ptr;
++	}
++
++	return idx_map;
++}
++
++lar_member * lar_mmap_member( lar_archive *ar, lar_index *idx_ptr )
++{
++	lar_member *member;
++	size_t pgsz = getpagesize();
++	size_t pgof = ( idx_ptr->offset % pgsz );
++
++	char *memberdata = mmap(
++		0, idx_ptr->length + pgof, PROT_READ, MAP_PRIVATE,
++		ar->fd, idx_ptr->offset - pgof
++	);
++
++	if( memberdata == MAP_FAILED )
++		LAR_DIE("Failed to mmap() member data");
++
++	member = (lar_member *)malloc(sizeof(lar_member));
++	member->type   = idx_ptr->type;
++	member->flags  = idx_ptr->flags;
++	member->length = idx_ptr->length;
++	member->data   = &memberdata[pgof];
++
++	member->mmap   = memberdata;
++	member->mlen   = idx_ptr->length + pgof;
++
++	return member;
++}
++
++lar_member * lar_open_member( lar_archive *ar, const char *name )
++{
++	lar_index *idx_ptr = ar->index;
++	char mbid[sizeof(idx_ptr->id)];
++
++	lar_md5(mbid, name, strlen(name));
++
++	while(idx_ptr)
++	{
++		if( !strncmp(mbid, idx_ptr->id, sizeof(mbid)) )
++			return lar_mmap_member(ar, idx_ptr);
++
++		idx_ptr = idx_ptr->next;
++	}
++
++	return NULL;
++}
++
++int lar_close_member( lar_member *member )
++{
++	int stat = munmap(member->mmap, member->mlen);
++	free(member);
++	member = NULL;
++
++	return stat;
++}
++
++lar_archive * lar_open( const char *filename )
++{
++	int fd;
++	struct stat as;
++	lar_archive *ar;
++
++	if( stat(filename, &as) == -1 )
++		return NULL;
++
++	if( !(as.st_mode & S_IFREG) )
++		return NULL;
++
++	if( (fd = open(filename, O_RDONLY)) != -1 )
++	{
++		ar = (lar_archive *)malloc(sizeof(lar_archive));
++		ar->fd       = fd;
++		ar->length   = as.st_size;
++		ar->index    = lar_get_index(ar);
++		strncpy(ar->filename, filename, sizeof(ar->filename));
++
++		ar->has_filenames = lar_read_filenames(ar);
++
++		return ar;
++	}
++
++	return NULL;
++}
++
++int lar_close( lar_archive *ar )
++{
++	lar_index *idx_head;
++	lar_index *idx_next;
++
++	close(ar->fd);
++
++	idx_head = ar->index;
++	do {
++		idx_next = idx_head->next;
++		free(idx_head->filename);
++		free(idx_head);
++	} while( (idx_head = idx_next) != NULL );
++
++	free(ar);
++	ar = NULL;
++
++	return 0;
++}
++
++lar_archive * lar_find_archive( const char *package, const char *path, int pkg )
++{
++	uint32_t i;
++	uint32_t j;
++	uint32_t seg = 1;
++	uint32_t len = 0;
++	uint32_t pln = 0;
++	char sep = ( pkg ? '.' : '/' );
++	struct stat s;
++	LAR_FNAME(buffer);
++
++	if( path )
++	{
++		for( pln = 0; path[pln] != '\0'; pln++ )
++			if( pln >= (sizeof(buffer) - 5) )
++				LAR_DIE("Library path exceeds maximum allowed length");
++
++		memcpy(buffer, path, pln);
++	}
++
++	if( buffer[pln-1] != '/' )
++		buffer[pln++] = '/';
++
++	for( len = 0; package[len] != '\0'; len++ )
++	{
++		if( len >= (sizeof(buffer) - 5 - pln) )
++			LAR_DIE("Package name exceeds maximum allowed length");
++
++		if( package[len] == sep ) seg++;
++	}
++
++	while( seg > 0 )
++	{
++		for( i = 0, j = 1; (i < len) && (j <= seg); i++ )
++		{
++			if( package[i] == sep ) {
++				if( j < seg ) j++; else break;
++			}
++
++			buffer[pln+i] = ( package[i] == sep ) ? LAR_DIRSEP : package[i];
++		}
++
++		strcpy(&buffer[pln+i], ".lar");
++
++		if( (stat(buffer, &s) > -1) && (s.st_mode & S_IFREG) )
++			return lar_open(buffer);
++
++		seg--;
++	}
++
++	return NULL;
++}
++
++lar_member * lar_find_member( lar_archive *ar, const char *package )
++{
++	int len;
++	LAR_FNAME(buffer);
++
++	for( len = 0; package[len] != '\0'; len++ )
++	{
++		if( len >= (sizeof(buffer) - 5) )
++			LAR_DIE("Package name exceeds maximum allowed length");
++
++		buffer[len] = ( package[len] == '.' ) ? '/' : package[len];
++	}
++
++	strcpy(&buffer[len], ".lua");
++
++	return lar_open_member(ar, buffer);
++}
+diff -Nbur lua-5.1.4.orig/src/lar.h lua-5.1.4/src/lar.h
+--- lua-5.1.4.orig/src/lar.h	1970-01-01 01:00:00.000000000 +0100
++++ lua-5.1.4/src/lar.h	2009-04-13 17:13:47.000000000 +0200
+@@ -0,0 +1,108 @@
++/*
++ * lar - Lua Archive Library
++ *
++ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
++ *
++ *  Licensed under the Apache License, Version 2.0 (the "License");
++ *  you may not use this file except in compliance with the License.
++ *  You may obtain a copy of the License at
++ *
++ *      http://www.apache.org/licenses/LICENSE-2.0
++ *
++ *  Unless required by applicable law or agreed to in writing, software
++ *  distributed under the License is distributed on an "AS IS" BASIS,
++ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ *  See the License for the specific language governing permissions and
++ *  limitations under the License.
++ */
++
++
++#ifndef __LAR_H
++#define __LAR_H
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <stdint.h>
++#include <fcntl.h>
++#include <string.h>
++#include <errno.h>
++#include <arpa/inet.h>
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <sys/stat.h>
++
++#include "md5.h"
++
++#define LAR_DIE(s) \
++	do { \
++		fprintf(stderr, "%s(%i): %s(): %s\n", \
++			__FILE__, __LINE__, __FUNCTION__, s); \
++		if( errno ) fprintf(stderr, "%s(%i): %s\n", \
++			__FILE__, __LINE__, strerror(errno) ); \
++		exit(1); \
++	} while(0)
++
++
++#define LAR_FNAME_BUFFER 1024
++#define LAR_FNAME(s) char s[LAR_FNAME_BUFFER]
++
++#define LAR_TYPE_REGULAR	0x0000
++#define LAR_TYPE_FILELIST	0xFFFF
++
++#ifdef __WIN32__
++#define LAR_DIRSEP	'\\'
++#else
++#define LAR_DIRSEP	'/'
++#endif
++
++
++struct lar_index_item {
++	uint32_t offset;
++	uint32_t length;
++	uint16_t type;
++	uint16_t flags;
++	char id[16];
++	char *filename;
++	struct lar_index_item *next;
++};
++
++struct lar_member_item {
++	uint16_t type;
++	uint16_t flags;
++	uint32_t length;
++	char *data;
++	char *mmap;
++	size_t mlen;
++};
++
++struct lar_archive_handle {
++	int fd;
++	int has_filenames;
++	off_t length;
++	char filename[LAR_FNAME_BUFFER];
++	struct lar_index_item *index;
++};
++
++typedef struct lar_index_item lar_index;
++typedef struct lar_member_item lar_member;
++typedef struct lar_archive_handle lar_archive;
++
++
++lar_index * lar_get_index( lar_archive *ar );
++
++lar_member * lar_mmap_member( lar_archive *ar, lar_index *idx_ptr );
++
++lar_member * lar_open_member( lar_archive *ar, const char *name );
++
++int lar_close_member( lar_member *member );
++
++lar_archive * lar_open( const char *filename );
++
++int lar_close( lar_archive *ar );
++
++lar_archive * lar_find_archive( const char *package, const char *path, int pkg);
++
++lar_member * lar_find_member( lar_archive *ar, const char *package );
++
++#endif
+diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c
+--- lua-5.1.4.orig/src/larlib.c	1970-01-01 01:00:00.000000000 +0100
++++ lua-5.1.4/src/larlib.c	2009-04-13 17:24:57.000000000 +0200
+@@ -0,0 +1,540 @@
++/*
++ * lar - Lua Archive Library
++ *
++ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
++ *
++ *  Licensed under the Apache License, Version 2.0 (the "License");
++ *  you may not use this file except in compliance with the License.
++ *  You may obtain a copy of the License at
++ *
++ *      http://www.apache.org/licenses/LICENSE-2.0
++ *
++ *  Unless required by applicable law or agreed to in writing, software
++ *  distributed under the License is distributed on an "AS IS" BASIS,
++ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ *  See the License for the specific language governing permissions and
++ *  limitations under the License.
++ */
++
++
++#include "lua.h"
++#include "lualib.h"
++#include "lauxlib.h"
++#include "lar.h"
++
++typedef struct {
++	int fd;
++	char *data;
++	size_t length;
++} mmap_handle;
++
++static int larlib_perror( lua_State *L, const char *message )
++{
++	lua_pushnil(L);
++	lua_pushstring(L, message);
++
++	return 2;
++}
++
++int larlib_open( lua_State *L )
++{
++	lar_archive *ar, **udata;
++	const char *filename = luaL_checkstring( L, 1 );
++
++	if( filename != NULL && (ar = lar_open(filename)) != NULL )
++	{
++		if( (udata = lua_newuserdata(L, sizeof(lar_archive *))) != NULL )
++		{
++			*udata = ar;
++			luaL_getmetatable(L, "lar.archive");
++			lua_setmetatable(L, -2);
++		}
++		else
++		{
++			return luaL_error(L, "Out of memory");
++		}
++	}
++	else
++	{
++		return larlib_perror(L, "Archive not found");
++	}
++
++	return 1;
++}
++
++int larlib_find( lua_State *L )
++{
++	const char *filename = luaL_checkstring( L, 1 );
++	const char *basepath = luaL_optstring( L, 2, "./" );
++	int is_pkg = strstr(filename, "/") ? 0 : 1;
++	lar_archive *ar, **udata;
++
++	if( ((ar = lar_find_archive(filename, basepath, is_pkg)) != NULL) ||
++	    ((ar = lar_find_archive(filename, LUA_LDIR, is_pkg)) != NULL) ||
++		((ar = lar_find_archive(filename, LUA_CDIR, is_pkg)) != NULL) )
++	{
++		if( (udata = lua_newuserdata(L, sizeof(lar_archive *))) != NULL )
++		{
++			*udata = ar;
++			luaL_getmetatable(L, "lar.archive");
++			lua_setmetatable(L, -2);
++		}
++		else
++		{
++			return luaL_error(L, "Out of memory");
++		}
++	}
++	else
++	{
++		return larlib_perror(L, "Archive not found");
++	}
++
++	return 1;
++}
++
++int larlib_md5( lua_State *L )
++{
++	int i;
++	char md5[16], md5_hex[33];
++	const char *data = luaL_checkstring( L, 1 );
++	md5_state_t state;
++
++	md5_init(&state);
++	md5_append(&state, (const md5_byte_t *)data, strlen(data));
++	md5_finish(&state, (md5_byte_t *)md5);
++
++	for( i = 0; i < 16; i++ )
++		sprintf(&md5_hex[i*2], "%02x", (unsigned char)md5[i]);
++
++	lua_pushstring(L, md5_hex);
++	return 1;
++}
++
++int larlib_md5_file( lua_State *L )
++{
++	int i, fd, len;
++	char md5[16], md5_hex[33], buffer[1024];
++	const char *filename = luaL_checkstring( L, 1 );
++	md5_state_t state;
++
++	if( (fd = open(filename, O_RDONLY)) != -1 )
++	{
++		md5_init(&state);
++
++		while( (len = read(fd, buffer, 1024)) > 0 )
++			md5_append(&state, (const md5_byte_t *)buffer, len);
++
++		md5_finish(&state, (md5_byte_t *)md5);
++
++		for( i = 0; i < 16; i++ )
++			sprintf(&md5_hex[i*2], "%02x", (unsigned char)md5[i]);
++
++		close(fd);
++		lua_pushstring(L, md5_hex);
++	}
++	else
++	{
++		return larlib_perror(L, strerror(errno));
++	}
++
++	return 1;
++}
++
++static int larlib_mkpath( const char *name, const char *path, char *buffer )
++{
++	int nlen = strlen(name);
++	int plen = strlen(path);
++
++	if( (nlen + plen + 1) <= LAR_FNAME_BUFFER )
++	{
++		strcpy(buffer, path);
++
++		if( buffer[plen-1] != '/' )
++			buffer[plen++] = '/';
++
++		strcpy(&buffer[plen], name);
++		buffer[plen + nlen] = '\0';
++
++		return 0;
++	}
++
++	return 1;
++}
++
++static int larlib__gc( lua_State *L )
++{
++	lar_archive **archive = luaL_checkudata( L, 1, "lar.archive" );
++
++	if( *archive )
++		lar_close(*archive);
++
++	*archive = NULL;
++	return 0;
++}
++
++
++static int larlib_member__open( lua_State *L, lar_member *mb )
++{
++	lar_archive **archive = NULL;
++	const char *filename = NULL;
++	lar_member **udata;
++
++	if( mb == NULL )
++	{
++		*archive = luaL_checkudata( L, 1, "lar.archive" );
++		filename = luaL_checkstring( L, 2 );
++	}
++
++	if( mb != NULL || (mb = lar_open_member(*archive, filename)) != NULL )
++	{
++		if( (udata = lua_newuserdata(L, sizeof(lar_member *))) != NULL )
++		{
++			*udata = mb;
++			luaL_getmetatable(L, "lar.member");
++			lua_setmetatable(L, -2);
++		}
++		else
++		{
++			return luaL_error(L, "Out of memory");
++		}
++	}
++	else
++	{
++		return larlib_perror(L, "Member not found in archive");
++	}
++
++	return 1;
++}
++
++int larlib_member_open( lua_State *L )
++{
++	return larlib_member__open( L, NULL );
++}
++
++int larlib_member_find( lua_State *L )
++{
++	lar_archive **archive = luaL_checkudata( L, 1, "lar.archive" );
++	const char *package = luaL_checkstring( L, 2 );
++	lar_member *mb, **udata;
++
++	if( (mb = lar_find_member(*archive, package)) != NULL )
++	{
++		if( (udata = lua_newuserdata(L, sizeof(lar_member *))) != NULL )
++		{
++			*udata = mb;
++			luaL_getmetatable(L, "lar.member");
++			lua_setmetatable(L, -2);
++		}
++		else
++		{
++			return luaL_error(L, "Out of memory");
++		}
++	}
++	else
++	{
++		return larlib_perror(L, "Member not found in archive");
++	}
++
++	return 1;
++}
++
++int larlib_member_size( lua_State *L )
++{
++	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
++	lua_pushnumber(L, (*member)->length);
++	return 1;
++}
++
++int larlib_member_type( lua_State *L )
++{
++	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
++	lua_pushnumber(L, (*member)->type);
++	return 1;
++}
++
++int larlib_member_flags( lua_State *L )
++{
++	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
++	lua_pushnumber(L, (*member)->flags);
++	return 1;
++}
++
++int larlib_member_read( lua_State *L )
++{
++	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
++	int start  = luaL_checknumber( L, 2 );
++	int length = luaL_optnumber( L, 3, (*member)->length );
++	char *stringcopy;
++
++	if( (start >= 0) && (start < (*member)->length) && (length > 0) )
++	{
++		if( (start + length) >= (*member)->length )
++			length = (*member)->length - start;
++
++		if( (stringcopy = (char *)malloc(length + 1)) != NULL )
++		{
++			memcpy(stringcopy, &(*member)->data[start], length);
++			stringcopy[length] = '\0';
++			lua_pushstring(L, stringcopy);
++			free(stringcopy);
++		}
++		else
++		{
++			return luaL_error(L, "Out of memory");
++		}
++	}
++	else
++	{
++		return larlib_perror(L, "Invalid argument");
++	}
++
++	return 1;
++}
++
++int larlib_member_data( lua_State *L )
++{
++	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
++	lua_pushstring(L, (*member)->data);
++	return 1;
++}
++
++int larlib_member_load( lua_State *L )
++{
++	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
++	int status = luaL_loadbuffer( L, (*member)->data, (*member)->length,
++		"=(lar member)" );
++
++	if( status )
++	{
++		lua_pushnil(L);
++		lua_insert(L, -2);
++		return 2;
++	}
++
++	return 1;
++}
++
++static int larlib_member__gc( lua_State *L )
++{
++	lar_member **member = luaL_checkudata( L, 1, "lar.member" );
++
++	if( *member )
++		lar_close_member(*member);
++
++	*member = NULL;
++	return 0;
++}
++
++
++static int larlib_mmfile__open( lua_State *L, const char *filename )
++{
++	struct stat s;
++	mmap_handle *fh, **udata;
++
++	if( filename == NULL )
++		filename = (const char *)luaL_checkstring( L, 1 );
++
++	if( (fh = (mmap_handle *)malloc(sizeof(mmap_handle))) == NULL )
++		return larlib_perror(L, "Out of memory");
++
++	if( stat(filename, &s) > -1 && (fh->fd = open(filename, O_RDONLY)) > -1 )
++	{
++		fh->length = s.st_size;
++		fh->data   = mmap( 0, s.st_size, PROT_READ, MAP_PRIVATE, fh->fd, 0 );
++
++		if( fh->data == MAP_FAILED )
++			return larlib_perror(L, "Failed to mmap() file");
++
++		if( (udata = lua_newuserdata(L, sizeof(char *))) != NULL )
++		{
++			*udata = fh;
++			luaL_getmetatable(L, "lar.mmfile");
++			lua_setmetatable(L, -2);
++		}
++		else
++		{
++			return larlib_perror(L, "Out of memory");
++		}
++	}
++	else
++	{
++		return larlib_perror(L, strerror(errno));
++	}
++
++	return 1;
++}
++
++int larlib_mmfile_open( lua_State *L )
++{
++	return larlib_mmfile__open(L, NULL);
++}
++
++int larlib_mmfile_size( lua_State *L )
++{
++	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
++	lua_pushnumber(L, (*fh)->length);
++	return 1;
++}
++
++int larlib_mmfile_read( lua_State *L )
++{
++	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
++	int start  = luaL_checknumber( L, 2 );
++	int length = luaL_optnumber( L, 3, (*fh)->length );
++	char *stringcopy;
++
++	if( (start >= 0) && (start < (*fh)->length) && (length > 0) )
++	{
++		if( (start + length) >= (*fh)->length )
++			length = (*fh)->length - start;
++
++		if( (stringcopy = (char *)malloc(length + 1)) != NULL )
++		{
++			memcpy(stringcopy, &(*fh)->data[start], length);
++			stringcopy[length] = '\0';
++			lua_pushstring(L, stringcopy);
++			free(stringcopy);
++		}
++		else
++		{
++			return luaL_error(L, "Out of memory");
++		}
++	}
++	else
++	{
++		return larlib_perror(L, "Invalid argument");
++	}
++
++	return 1;
++}
++
++int larlib_mmfile_data( lua_State *L )
++{
++	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
++	lua_pushstring(L, (*fh)->data);
++	return 1;
++}
++
++int larlib_mmfile_load( lua_State *L )
++{
++	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
++	int status = luaL_loadbuffer(L, (*fh)->data, (*fh)->length, "=(mmap file)");
++
++	if( status )
++	{
++		lua_pushnil(L);
++		lua_insert(L, -2);
++		return 2;
++	}
++
++	return 1;
++}
++
++static int larlib_mmfile__gc( lua_State *L )
++{
++	mmap_handle **fh = luaL_checkudata( L, 1, "lar.mmfile" );
++
++	if( *fh )
++	{
++		close((*fh)->fd);
++		munmap((*fh)->data, (*fh)->length);
++		free(*fh);
++		*fh = NULL;
++	}
++
++	return 0;
++}
++
++
++int larlib_findfile( lua_State *L )
++{
++	int i;
++	const char *filename = luaL_checkstring( L, 1 );
++	const char *basepath = luaL_optstring( L, 2, "./" );
++	struct stat s;
++	lar_archive *ar;
++	lar_member  *mb;
++	LAR_FNAME(filepath);
++
++	const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR };
++
++	for( i = 0; i < 3; i++ )
++		if( !larlib_mkpath(filename, searchpath[i], filepath) )
++			if( stat(filepath, &s) > -1 && (s.st_mode & S_IFREG) )
++				return larlib_mmfile__open( L, filepath );
++
++	for( i = 0; i < 3; i++ )
++		if( (ar = lar_find_archive(filename, searchpath[i], 0)) != NULL )
++			if( (mb = lar_open_member(ar, filename)) != NULL )
++				return larlib_member__open( L, mb );
++
++	return larlib_perror(L, "File not found");
++}
++
++
++static const luaL_reg LAR_REG[] = {
++	{ "open",			larlib_open 		},
++	{ "find",			larlib_find 		},
++	{ "md5",			larlib_md5			},
++	{ "md5_file",		larlib_md5_file		},
++	{ "mmap",			larlib_mmfile_open	},
++	{ "findfile",		larlib_findfile		},
++	{ NULL,				NULL				}
++};
++
++static const luaL_reg LAR_ARCHIVE_REG[] = {
++	{ "member",			larlib_member_open	},
++	{ "find",			larlib_member_find	},
++	{ "__gc",			larlib__gc			},
++	{ NULL,				NULL				}
++};
++
++static const luaL_reg LAR_MEMBER_REG[] = {
++	{ "size",			larlib_member_size	},
++	{ "type",			larlib_member_type	},
++	{ "flags",			larlib_member_flags	},
++	{ "read",			larlib_member_read	},
++	{ "data",			larlib_member_data	},
++	{ "load",			larlib_member_load	},
++	{ "__gc",			larlib_member__gc	},
++	{ NULL,				NULL				}
++};
++
++static const luaL_reg LAR_MMFILE_REG[] = {
++	{ "size",			larlib_mmfile_size	},
++	{ "read",			larlib_mmfile_read	},
++	{ "data",			larlib_mmfile_data	},
++	{ "load",			larlib_mmfile_load	},
++	{ "__gc",			larlib_mmfile__gc	},
++	{ NULL,				NULL				}
++};
++
++
++LUALIB_API int luaopen_larlib( lua_State *L )
++{
++	luaL_newmetatable(L, "lar");
++	luaL_register(L, NULL, LAR_REG);
++	lua_pushvalue(L, -1);
++	lua_setfield(L, -2, "__index");
++	lua_setglobal(L, "lar");
++
++	luaL_newmetatable(L, "lar.archive");
++	luaL_register(L, NULL, LAR_ARCHIVE_REG);
++	lua_pushvalue(L, -1);
++	lua_setfield(L, -2, "__index");
++	lua_setglobal(L, "lar.archive");
++
++	luaL_newmetatable(L, "lar.member");
++	luaL_register(L, NULL, LAR_MEMBER_REG);
++	lua_pushvalue(L, -1);
++	lua_setfield(L, -2, "__index");
++	lua_setglobal(L, "lar.member");
++
++	luaL_newmetatable(L, "lar.mmfile");
++	luaL_register(L, NULL, LAR_MMFILE_REG);
++	lua_pushvalue(L, -1);
++	lua_setfield(L, -2, "__index");
++	lua_setglobal(L, "lar.mmfile");
++
++	return 1;
++}
+diff -Nbur lua-5.1.4.orig/src/linit.c lua-5.1.4/src/linit.c
+--- lua-5.1.4.orig/src/linit.c	2009-04-06 21:36:52.000000000 +0200
++++ lua-5.1.4/src/linit.c	2009-04-11 01:27:00.000000000 +0200
+@@ -23,6 +23,7 @@
+   {LUA_STRLIBNAME, luaopen_string},
+   {LUA_MATHLIBNAME, luaopen_math},
+   {LUA_DBLIBNAME, luaopen_debug},
++  {LUA_LARLIBNAME, luaopen_larlib},
+   {NULL, NULL}
+ };
+ 
+diff -Nbur lua-5.1.4.orig/src/loadlib.c lua-5.1.4/src/loadlib.c
+--- lua-5.1.4.orig/src/loadlib.c	2009-04-06 21:36:52.000000000 +0200
++++ lua-5.1.4/src/loadlib.c	2009-04-11 01:04:47.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "lauxlib.h"
+ #include "lualib.h"
+ 
++#include "lar.h"
+ 
+ /* prefix for open functions in C libraries */
+ #define LUA_POF		"luaopen_"
+@@ -388,6 +389,36 @@
+ }
+ 
+ 
++static int loader_Lar (lua_State *L) {
++  lar_archive *ar;
++  lar_member  *mb;
++  const char  *name = luaL_checkstring(L, 1);
++
++  if( (ar = lar_find_archive(name, "./", 1))     ||
++      (ar = lar_find_archive(name, LUA_LDIR, 1)) ||
++      (ar = lar_find_archive(name, LUA_CDIR, 1))
++  ) {
++    if( (mb = lar_find_member(ar, name)) != NULL ) {
++      if( luaL_loadbuffer(L, mb->data, mb->length, ar->filename) != 0 ) {
++        luaL_error(L, "error while loading lar member '%s':\n\t%s",
++          name, lua_tostring(L, -1));
++      }
++      lar_close_member(mb);
++    }
++    else {
++      lua_pushfstring(L, "\n\tno matching lar member " LUA_QS " in " LUA_QS,
++        name, ar->filename);
++    }
++    lar_close(ar);
++  }
++  else {
++    lua_pushfstring(L, "\n\tno matching lar archive for " LUA_QS, name);
++  }
++
++  return 1;
++}
++
++
+ static const char *mkfuncname (lua_State *L, const char *modname) {
+   const char *funcname;
+   const char *mark = strchr(modname, *LUA_IGMARK);
+@@ -621,7 +652,7 @@
+ 
+ 
+ static const lua_CFunction loaders[] =
+-  {loader_preload, loader_Lua, loader_C, loader_Croot, NULL};
++  {loader_preload, loader_Lua, loader_Lar, loader_C, loader_Croot, NULL};
+ 
+ 
+ LUALIB_API int luaopen_package (lua_State *L) {
+diff -Nbur lua-5.1.4.orig/src/lualib.h lua-5.1.4/src/lualib.h
+--- lua-5.1.4.orig/src/lualib.h	2009-04-06 21:36:52.000000000 +0200
++++ lua-5.1.4/src/lualib.h	2009-04-11 01:28:24.000000000 +0200
+@@ -39,6 +39,9 @@
+ #define LUA_LOADLIBNAME	"package"
+ LUALIB_API int (luaopen_package) (lua_State *L);
+ 
++#define LUA_LARLIBNAME	"lar"
++LUALIB_API int (luaopen_larlib) (lua_State *L);
++
+ 
+ /* open all previous libraries */
+ LUALIB_API void (luaL_openlibs) (lua_State *L); 
+diff -Nbur lua-5.1.4.orig/src/md5.c lua-5.1.4/src/md5.c
+--- lua-5.1.4.orig/src/md5.c	1970-01-01 01:00:00.000000000 +0100
++++ lua-5.1.4/src/md5.c	2009-04-10 23:07:56.000000000 +0200
+@@ -0,0 +1,381 @@
++/*
++  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
++
++  This software is provided 'as-is', without any express or implied
++  warranty.  In no event will the authors be held liable for any damages
++  arising from the use of this software.
++
++  Permission is granted to anyone to use this software for any purpose,
++  including commercial applications, and to alter it and redistribute it
++  freely, subject to the following restrictions:
++
++  1. The origin of this software must not be misrepresented; you must not
++     claim that you wrote the original software. If you use this software
++     in a product, an acknowledgment in the product documentation would be
++     appreciated but is not required.
++  2. Altered source versions must be plainly marked as such, and must not be
++     misrepresented as being the original software.
++  3. This notice may not be removed or altered from any source distribution.
++
++  L. Peter Deutsch
++  ghost@aladdin.com
++
++ */
++/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
++/*
++  Independent implementation of MD5 (RFC 1321).
++
++  This code implements the MD5 Algorithm defined in RFC 1321, whose
++  text is available at
++	http://www.ietf.org/rfc/rfc1321.txt
++  The code is derived from the text of the RFC, including the test suite
++  (section A.5) but excluding the rest of Appendix A.  It does not include
++  any code or documentation that is identified in the RFC as being
++  copyrighted.
++
++  The original and principal author of md5.c is L. Peter Deutsch
++  <ghost@aladdin.com>.  Other authors are noted in the change history
++  that follows (in reverse chronological order):
++
++  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
++	either statically or dynamically; added missing #include <string.h>
++	in library.
++  2002-03-11 lpd Corrected argument list for main(), and added int return
++	type, in test program and T value program.
++  2002-02-21 lpd Added missing #include <stdio.h> in test program.
++  2000-07-03 lpd Patched to eliminate warnings about "constant is
++	unsigned in ANSI C, signed in traditional"; made test program
++	self-checking.
++  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
++  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
++  1999-05-03 lpd Original version.
++ */
++
++#include "md5.h"
++#include <string.h>
++
++#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
++#ifdef ARCH_IS_BIG_ENDIAN
++#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
++#else
++#  define BYTE_ORDER 0
++#endif
++
++#define T_MASK ((md5_word_t)~0)
++#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
++#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
++#define T3    0x242070db
++#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
++#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
++#define T6    0x4787c62a
++#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
++#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
++#define T9    0x698098d8
++#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
++#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
++#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
++#define T13    0x6b901122
++#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
++#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
++#define T16    0x49b40821
++#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
++#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
++#define T19    0x265e5a51
++#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
++#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
++#define T22    0x02441453
++#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
++#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
++#define T25    0x21e1cde6
++#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
++#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
++#define T28    0x455a14ed
++#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
++#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
++#define T31    0x676f02d9
++#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
++#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
++#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
++#define T35    0x6d9d6122
++#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
++#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
++#define T38    0x4bdecfa9
++#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
++#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
++#define T41    0x289b7ec6
++#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
++#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
++#define T44    0x04881d05
++#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
++#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
++#define T47    0x1fa27cf8
++#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
++#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
++#define T50    0x432aff97
++#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
++#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
++#define T53    0x655b59c3
++#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
++#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
++#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
++#define T57    0x6fa87e4f
++#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
++#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
++#define T60    0x4e0811a1
++#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
++#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
++#define T63    0x2ad7d2bb
++#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
++
++
++static void
++md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
++{
++    md5_word_t
++	a = pms->abcd[0], b = pms->abcd[1],
++	c = pms->abcd[2], d = pms->abcd[3];
++    md5_word_t t;
++#if BYTE_ORDER > 0
++    /* Define storage only for big-endian CPUs. */
++    md5_word_t X[16];
++#else
++    /* Define storage for little-endian or both types of CPUs. */
++    md5_word_t xbuf[16];
++    const md5_word_t *X;
++#endif
++
++    {
++#if BYTE_ORDER == 0
++	/*
++	 * Determine dynamically whether this is a big-endian or
++	 * little-endian machine, since we can use a more efficient
++	 * algorithm on the latter.
++	 */
++	static const int w = 1;
++
++	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
++#endif
++#if BYTE_ORDER <= 0		/* little-endian */
++	{
++	    /*
++	     * On little-endian machines, we can process properly aligned
++	     * data without copying it.
++	     */
++	    if (!((data - (const md5_byte_t *)0) & 3)) {
++		/* data are properly aligned */
++		X = (const md5_word_t *)data;
++	    } else {
++		/* not aligned */
++		memcpy(xbuf, data, 64);
++		X = xbuf;
++	    }
++	}
++#endif
++#if BYTE_ORDER == 0
++	else			/* dynamic big-endian */
++#endif
++#if BYTE_ORDER >= 0		/* big-endian */
++	{
++	    /*
++	     * On big-endian machines, we must arrange the bytes in the
++	     * right order.
++	     */
++	    const md5_byte_t *xp = data;
++	    int i;
++
++#  if BYTE_ORDER == 0
++	    X = xbuf;		/* (dynamic only) */
++#  else
++#    define xbuf X		/* (static only) */
++#  endif
++	    for (i = 0; i < 16; ++i, xp += 4)
++		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
++	}
++#endif
++    }
++
++#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
++
++    /* Round 1. */
++    /* Let [abcd k s i] denote the operation
++       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
++#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
++#define SET(a, b, c, d, k, s, Ti)\
++  t = a + F(b,c,d) + X[k] + Ti;\
++  a = ROTATE_LEFT(t, s) + b
++    /* Do the following 16 operations. */
++    SET(a, b, c, d,  0,  7,  T1);
++    SET(d, a, b, c,  1, 12,  T2);
++    SET(c, d, a, b,  2, 17,  T3);
++    SET(b, c, d, a,  3, 22,  T4);
++    SET(a, b, c, d,  4,  7,  T5);
++    SET(d, a, b, c,  5, 12,  T6);
++    SET(c, d, a, b,  6, 17,  T7);
++    SET(b, c, d, a,  7, 22,  T8);
++    SET(a, b, c, d,  8,  7,  T9);
++    SET(d, a, b, c,  9, 12, T10);
++    SET(c, d, a, b, 10, 17, T11);
++    SET(b, c, d, a, 11, 22, T12);
++    SET(a, b, c, d, 12,  7, T13);
++    SET(d, a, b, c, 13, 12, T14);
++    SET(c, d, a, b, 14, 17, T15);
++    SET(b, c, d, a, 15, 22, T16);
++#undef SET
++
++     /* Round 2. */
++     /* Let [abcd k s i] denote the operation
++          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
++#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
++#define SET(a, b, c, d, k, s, Ti)\
++  t = a + G(b,c,d) + X[k] + Ti;\
++  a = ROTATE_LEFT(t, s) + b
++     /* Do the following 16 operations. */
++    SET(a, b, c, d,  1,  5, T17);
++    SET(d, a, b, c,  6,  9, T18);
++    SET(c, d, a, b, 11, 14, T19);
++    SET(b, c, d, a,  0, 20, T20);
++    SET(a, b, c, d,  5,  5, T21);
++    SET(d, a, b, c, 10,  9, T22);
++    SET(c, d, a, b, 15, 14, T23);
++    SET(b, c, d, a,  4, 20, T24);
++    SET(a, b, c, d,  9,  5, T25);
++    SET(d, a, b, c, 14,  9, T26);
++    SET(c, d, a, b,  3, 14, T27);
++    SET(b, c, d, a,  8, 20, T28);
++    SET(a, b, c, d, 13,  5, T29);
++    SET(d, a, b, c,  2,  9, T30);
++    SET(c, d, a, b,  7, 14, T31);
++    SET(b, c, d, a, 12, 20, T32);
++#undef SET
++
++     /* Round 3. */
++     /* Let [abcd k s t] denote the operation
++          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
++#define H(x, y, z) ((x) ^ (y) ^ (z))
++#define SET(a, b, c, d, k, s, Ti)\
++  t = a + H(b,c,d) + X[k] + Ti;\
++  a = ROTATE_LEFT(t, s) + b
++     /* Do the following 16 operations. */
++    SET(a, b, c, d,  5,  4, T33);
++    SET(d, a, b, c,  8, 11, T34);
++    SET(c, d, a, b, 11, 16, T35);
++    SET(b, c, d, a, 14, 23, T36);
++    SET(a, b, c, d,  1,  4, T37);
++    SET(d, a, b, c,  4, 11, T38);
++    SET(c, d, a, b,  7, 16, T39);
++    SET(b, c, d, a, 10, 23, T40);
++    SET(a, b, c, d, 13,  4, T41);
++    SET(d, a, b, c,  0, 11, T42);
++    SET(c, d, a, b,  3, 16, T43);
++    SET(b, c, d, a,  6, 23, T44);
++    SET(a, b, c, d,  9,  4, T45);
++    SET(d, a, b, c, 12, 11, T46);
++    SET(c, d, a, b, 15, 16, T47);
++    SET(b, c, d, a,  2, 23, T48);
++#undef SET
++
++     /* Round 4. */
++     /* Let [abcd k s t] denote the operation
++          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
++#define I(x, y, z) ((y) ^ ((x) | ~(z)))
++#define SET(a, b, c, d, k, s, Ti)\
++  t = a + I(b,c,d) + X[k] + Ti;\
++  a = ROTATE_LEFT(t, s) + b
++     /* Do the following 16 operations. */
++    SET(a, b, c, d,  0,  6, T49);
++    SET(d, a, b, c,  7, 10, T50);
++    SET(c, d, a, b, 14, 15, T51);
++    SET(b, c, d, a,  5, 21, T52);
++    SET(a, b, c, d, 12,  6, T53);
++    SET(d, a, b, c,  3, 10, T54);
++    SET(c, d, a, b, 10, 15, T55);
++    SET(b, c, d, a,  1, 21, T56);
++    SET(a, b, c, d,  8,  6, T57);
++    SET(d, a, b, c, 15, 10, T58);
++    SET(c, d, a, b,  6, 15, T59);
++    SET(b, c, d, a, 13, 21, T60);
++    SET(a, b, c, d,  4,  6, T61);
++    SET(d, a, b, c, 11, 10, T62);
++    SET(c, d, a, b,  2, 15, T63);
++    SET(b, c, d, a,  9, 21, T64);
++#undef SET
++
++     /* Then perform the following additions. (That is increment each
++        of the four registers by the value it had before this block
++        was started.) */
++    pms->abcd[0] += a;
++    pms->abcd[1] += b;
++    pms->abcd[2] += c;
++    pms->abcd[3] += d;
++}
++
++void
++md5_init(md5_state_t *pms)
++{
++    pms->count[0] = pms->count[1] = 0;
++    pms->abcd[0] = 0x67452301;
++    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
++    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
++    pms->abcd[3] = 0x10325476;
++}
++
++void
++md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
++{
++    const md5_byte_t *p = data;
++    int left = nbytes;
++    int offset = (pms->count[0] >> 3) & 63;
++    md5_word_t nbits = (md5_word_t)(nbytes << 3);
++
++    if (nbytes <= 0)
++	return;
++
++    /* Update the message length. */
++    pms->count[1] += nbytes >> 29;
++    pms->count[0] += nbits;
++    if (pms->count[0] < nbits)
++	pms->count[1]++;
++
++    /* Process an initial partial block. */
++    if (offset) {
++	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
++
++	memcpy(pms->buf + offset, p, copy);
++	if (offset + copy < 64)
++	    return;
++	p += copy;
++	left -= copy;
++	md5_process(pms, pms->buf);
++    }
++
++    /* Process full blocks. */
++    for (; left >= 64; p += 64, left -= 64)
++	md5_process(pms, p);
++
++    /* Process a final partial block. */
++    if (left)
++	memcpy(pms->buf, p, left);
++}
++
++void
++md5_finish(md5_state_t *pms, md5_byte_t digest[16])
++{
++    static const md5_byte_t pad[64] = {
++	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
++    };
++    md5_byte_t data[8];
++    int i;
++
++    /* Save the length before padding. */
++    for (i = 0; i < 8; ++i)
++	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
++    /* Pad to 56 bytes mod 64. */
++    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
++    /* Append the length. */
++    md5_append(pms, data, 8);
++    for (i = 0; i < 16; ++i)
++	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
++}
+diff -Nbur lua-5.1.4.orig/src/md5.h lua-5.1.4/src/md5.h
+--- lua-5.1.4.orig/src/md5.h	1970-01-01 01:00:00.000000000 +0100
++++ lua-5.1.4/src/md5.h	2009-04-10 23:07:56.000000000 +0200
+@@ -0,0 +1,91 @@
++/*
++  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
++
++  This software is provided 'as-is', without any express or implied
++  warranty.  In no event will the authors be held liable for any damages
++  arising from the use of this software.
++
++  Permission is granted to anyone to use this software for any purpose,
++  including commercial applications, and to alter it and redistribute it
++  freely, subject to the following restrictions:
++
++  1. The origin of this software must not be misrepresented; you must not
++     claim that you wrote the original software. If you use this software
++     in a product, an acknowledgment in the product documentation would be
++     appreciated but is not required.
++  2. Altered source versions must be plainly marked as such, and must not be
++     misrepresented as being the original software.
++  3. This notice may not be removed or altered from any source distribution.
++
++  L. Peter Deutsch
++  ghost@aladdin.com
++
++ */
++/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
++/*
++  Independent implementation of MD5 (RFC 1321).
++
++  This code implements the MD5 Algorithm defined in RFC 1321, whose
++  text is available at
++	http://www.ietf.org/rfc/rfc1321.txt
++  The code is derived from the text of the RFC, including the test suite
++  (section A.5) but excluding the rest of Appendix A.  It does not include
++  any code or documentation that is identified in the RFC as being
++  copyrighted.
++
++  The original and principal author of md5.h is L. Peter Deutsch
++  <ghost@aladdin.com>.  Other authors are noted in the change history
++  that follows (in reverse chronological order):
++
++  2002-04-13 lpd Removed support for non-ANSI compilers; removed
++	references to Ghostscript; clarified derivation from RFC 1321;
++	now handles byte order either statically or dynamically.
++  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
++  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
++	added conditionalization for C++ compilation from Martin
++	Purschke <purschke@bnl.gov>.
++  1999-05-03 lpd Original version.
++ */
++
++#ifndef md5_INCLUDED
++#  define md5_INCLUDED
++
++/*
++ * This package supports both compile-time and run-time determination of CPU
++ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
++ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
++ * defined as non-zero, the code will be compiled to run only on big-endian
++ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
++ * run on either big- or little-endian CPUs, but will run slightly less
++ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
++ */
++
++typedef unsigned char md5_byte_t; /* 8-bit byte */
++typedef unsigned int md5_word_t; /* 32-bit word */
++
++/* Define the state of the MD5 Algorithm. */
++typedef struct md5_state_s {
++    md5_word_t count[2];	/* message length in bits, lsw first */
++    md5_word_t abcd[4];		/* digest buffer */
++    md5_byte_t buf[64];		/* accumulate block */
++} md5_state_t;
++
++#ifdef __cplusplus
++extern "C" 
++{
++#endif
++
++/* Initialize the algorithm. */
++void md5_init(md5_state_t *pms);
++
++/* Append a string to the message. */
++void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
++
++/* Finish the message and return the digest. */
++void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
++
++#ifdef __cplusplus
++}  /* end extern "C" */
++#endif
++
++#endif /* md5_INCLUDED */
diff --git a/trunk/package/luci/contrib/luadoc/Makefile b/trunk/package/luci/contrib/luadoc/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/contrib/luadoc/hostfiles/bin/luadoc b/trunk/package/luci/contrib/luadoc/hostfiles/bin/luadoc
new file mode 100755
index 00000000..ba99a377
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/hostfiles/bin/luadoc
@@ -0,0 +1,121 @@
+#!/usr/bin/env lua
+-------------------------------------------------------------------------------
+-- LuaDoc launcher.
+-- @release $Id: luadoc.lua.in,v 1.1 2008/02/17 06:42:51 jasonsantos Exp $
+-------------------------------------------------------------------------------
+
+require "luadoc"
+
+-------------------------------------------------------------------------------
+-- Print version number.
+
+local function print_version ()
+	print (string.format("%s\n%s\n%s", 
+		luadoc._VERSION, 
+		luadoc._DESCRIPTION, 
+		luadoc._COPYRIGHT))
+end
+
+-------------------------------------------------------------------------------
+-- Print usage message.
+
+local function print_help ()
+	print ("Usage: "..arg[0]..[[ [options|files]
+Generate documentation from files. Available options are:
+  -d path                      output directory path
+  -t path                      template directory path
+  -h, --help                   print this help and exit
+      --noindexpage            do not generate global index page
+      --nofiles                do not generate documentation for files
+      --nomodules              do not generate documentation for modules
+      --doclet doclet_module   doclet module to generate output
+      --taglet taglet_module   taglet module to parse input code
+  -q, --quiet                  suppress all normal output
+  -v, --version                print version information]])
+end
+
+local function off_messages (arg, i, options)
+	options.verbose = nil
+end
+
+-------------------------------------------------------------------------------
+-- Process options. TODO: use getopts.
+-- @class table
+-- @name OPTIONS
+
+local OPTIONS = {
+	d = function (arg, i, options)
+		local dir = arg[i+1]
+		if string.sub (dir, -2) ~= "/" then
+			dir = dir..'/'
+		end
+		options.output_dir = dir
+		return 1
+	end,
+	t = function (arg, i, options)
+		local dir = arg[i+1]
+		if string.sub (dir, -2) ~= "/" then
+			dir = dir..'/'
+		end
+		options.template_dir = dir
+		return 1
+	end,
+	h = print_help,
+	help = print_help,
+	q = off_messages,
+	quiet = off_messages,
+	v = print_version,
+	version = print_version,
+	doclet = function (arg, i, options)
+		options.doclet = arg[i+1]
+		return 1
+	end,
+	taglet = function (arg, i, options)
+		options.taglet = arg[i+1]
+		return 1
+	end,
+}
+
+-------------------------------------------------------------------------------
+
+local function process_options (arg)
+	local files = {}
+	local options = require "luadoc.config"
+	local i = 1
+	while i <= #arg do
+		local argi = arg[i]
+		if string.sub (argi, 1, 1) ~= '-' then
+			table.insert (files, argi)
+		else
+			local opt = string.sub (argi, 2)
+			if string.sub (opt, 1, 1) == '-' then
+				opt = string.gsub (opt, "%-", "")
+			end
+			if OPTIONS[opt] then
+				if OPTIONS[opt] (arg, i, options) then
+					i = i + 1
+				end
+			else
+				options[opt] = 1
+			end
+		end
+		i = i+1
+	end
+	return files, options
+end 
+
+-------------------------------------------------------------------------------
+-- Main function. Process command-line parameters and call luadoc processor.
+
+function main (arg)
+	-- Process options
+	local argc = #arg
+	if argc < 1 then
+		print_help ()
+		return
+	end
+	local files, options = process_options (arg)
+	return luadoc.main(files, options)
+end
+
+main(arg)
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/config.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/config.lua
new file mode 100644
index 00000000..9e4b9de3
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/config.lua
@@ -0,0 +1,34 @@
+-------------------------------------------------------------------------------
+-- LuaDoc configuration file. This file contains the default options for 
+-- luadoc operation. These options can be overriden by the command line tool
+-- @see luadoc.print_help
+-- @release $Id: config.lua,v 1.6 2007/04/18 14:28:39 tomas Exp $
+-------------------------------------------------------------------------------
+
+module "luadoc.config"
+
+-------------------------------------------------------------------------------
+-- Default options
+-- @class table
+-- @name default_options
+-- @field output_dir default output directory for generated documentation, used
+-- by several doclets
+-- @field taglet parser used to analyze source code input
+-- @field doclet documentation generator
+-- @field template_dir directory with documentation templates, used by the html
+-- doclet
+-- @field verbose command line tool configuration to output processing 
+-- information
+
+local default_options = {
+	output_dir = "",
+	taglet = "luadoc.taglet.standard",
+	doclet = "luadoc.doclet.html",
+	-- TODO: find a way to define doclet specific options
+	template_dir = "luadoc/doclet/html/",
+	nomodules = false,
+	nofiles = false,
+	verbose = true,
+}
+
+return default_options
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua
new file mode 100644
index 00000000..0b75f84c
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua
@@ -0,0 +1,46 @@
+-----------------------------------------------------------------
+-- LuaDoc debugging facilities.
+-- @release $Id: debug.lua,v 1.3 2007/04/18 14:28:39 tomas Exp $
+-----------------------------------------------------------------
+
+module "luadoc.doclet.debug"
+
+function printline()
+	print(string.rep('-', 79))
+end
+
+-----------------------------------------------------------------
+-- Print debug information about document
+-- @param doc Table with the structured documentation.
+
+function start (doc)
+	print("Files:")
+	for _, filepath in ipairs(doc.files) do
+		print('\t', filepath)
+	end
+	printline()
+
+	print("Modules:")
+	for _, modulename in ipairs(doc.modules) do
+		print('\t', modulename)
+	end
+	printline()
+	
+	for i, v in pairs(doc.files) do
+		print('\t', i, v)
+	end
+	printline()
+	for i, v in pairs(doc.files[doc.files[1]]) do
+		print(i, v)
+	end
+	
+	printline()
+	for i, v in pairs(doc.files[doc.files[1]].doc[1]) do
+		print(i, v)
+	end
+	printline()
+	print("Params")
+	for i, v in pairs(doc.files[doc.files[1]].doc[1].param) do
+		print(i, v)
+	end
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua
new file mode 100644
index 00000000..2d725389
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua
@@ -0,0 +1,84 @@
+-------------------------------------------------------------------------------
+-- Doclet to format source code according to LuaDoc standard tags. This doclet
+-- (re)write .lua files adding missing standard tags. Texts are formatted to
+-- 80 columns and function parameters are added based on code analysis.
+--
+-- @release $Id: formatter.lua,v 1.5 2007/04/18 14:28:39 tomas Exp $
+-------------------------------------------------------------------------------
+
+local util = require "luadoc.util"
+local assert, ipairs, pairs, type = assert, ipairs, pairs, type
+local string = require"string"
+local table = require"table"
+
+module "luadoc.doclet.formatter"
+
+options = {
+	output_dir = "./",
+}
+
+-------------------------------------------------------------------------------
+-- Assembly the output filename for an input file.
+-- TODO: change the name of this function
+function out_file (filename)
+	local h = filename
+	h = options.output_dir..h
+	return h
+end
+
+-------------------------------------------------------------------------------
+-- Generate a new lua file for each input lua file. If the user does not 
+-- specify a different output directory input files will be rewritten.
+-- @param doc documentation table
+
+function start (doc)
+	local todo = "<TODO>"
+	
+	-- Process files
+	for i, file_doc in ipairs(doc.files) do
+		-- assembly the filename
+		local filename = out_file(file_doc.name)
+		luadoc.logger:info(string.format("generating file `%s'", filename))
+
+		-- TODO: confirm file overwrite
+		local f = posix.open(filename, "w")
+		assert(f, string.format("could not open `%s' for writing", filename))
+
+		for _, block in ipairs(file_doc.doc) do
+
+			-- write reorganized comments
+			f:write(string.rep("-", 80).."\n")
+			
+			-- description
+			f:write(util.comment(util.wrap(block.description, 77)))
+			f:write("\n")
+			
+			if block.class == "function" then
+				-- parameters
+				table.foreachi(block.param, function (_, param_name)
+					f:write(util.comment(util.wrap(string.format("@param %s %s", param_name, block.param[param_name] or todo), 77)))
+					f:write("\n")
+				end)
+				
+				-- return
+				if type(block.ret) == "table" then
+					table.foreachi(block.ret, function (_, ret)
+						f:write(util.comment(util.wrap(string.format("@return %s", ret), 77)).."\n")
+					end)
+				else
+					f:write(util.comment(util.wrap(string.format("@return %s", block.ret or todo), 77)).."\n")
+				end
+			end
+			
+			-- TODO: usage
+			-- TODO: see
+
+			-- write code
+			for _, line in ipairs(block.code) do
+				f:write(line.."\n")
+			end
+		end
+		
+		f:close()
+	end
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html.lua
new file mode 100644
index 00000000..e77fb744
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html.lua
@@ -0,0 +1,275 @@
+-------------------------------------------------------------------------------
+-- Doclet that generates HTML output. This doclet generates a set of html files
+-- based on a group of templates. The main templates are:
+-- <ul>
+-- <li>index.lp: index of modules and files;</li>
+-- <li>file.lp: documentation for a lua file;</li>
+-- <li>module.lp: documentation for a lua module;</li>
+-- <li>function.lp: documentation for a lua function. This is a
+-- sub-template used by the others.</li>
+-- </ul>
+--
+-- @release $Id: html.lua,v 1.29 2007/12/21 17:50:48 tomas Exp $
+-------------------------------------------------------------------------------
+
+local assert, getfenv, ipairs, loadstring, pairs, setfenv, tostring, tonumber, type = assert, getfenv, ipairs, loadstring, pairs, setfenv, tostring, tonumber, type
+local io = require"io"
+local posix = require "nixio.fs"
+local lp = require "luadoc.lp"
+local luadoc = require"luadoc"
+local package = package
+local string = require"string"
+local table = require"table"
+
+module "luadoc.doclet.html"
+
+-------------------------------------------------------------------------------
+-- Looks for a file `name' in given path. Removed from compat-5.1
+-- @param path String with the path.
+-- @param name String with the name to look for.
+-- @return String with the complete path of the file found
+--	or nil in case the file is not found.
+
+local function search (path, name)
+  for c in string.gfind(path, "[^;]+") do
+    c = string.gsub(c, "%?", name)
+    local f = io.open(c)
+    if f then   -- file exist?
+      f:close()
+      return c
+    end
+  end
+  return nil    -- file not found
+end
+
+-------------------------------------------------------------------------------
+-- Include the result of a lp template into the current stream.
+
+function include (template, env)
+	-- template_dir is relative to package.path
+	local templatepath = options.template_dir .. template
+
+	-- search using package.path (modified to search .lp instead of .lua
+	local search_path = string.gsub(package.path, "%.lua", "")
+	local templatepath = search(search_path, templatepath)
+	assert(templatepath, string.format("template `%s' not found", template))
+
+	env = env or {}
+	env.table = table
+	env.io = io
+	env.lp = lp
+	env.ipairs = ipairs
+	env.tonumber = tonumber
+	env.tostring = tostring
+	env.type = type
+	env.luadoc = luadoc
+	env.options = options
+
+	return lp.include(templatepath, env)
+end
+
+-------------------------------------------------------------------------------
+-- Returns a link to a html file, appending "../" to the link to make it right.
+-- @param html Name of the html file to link to
+-- @return link to the html file
+
+function link (html, from)
+	local h = html
+	from = from or ""
+	string.gsub(from, "/", function () h = "../" .. h end)
+	return h
+end
+
+-------------------------------------------------------------------------------
+-- Returns the name of the html file to be generated from a module.
+-- Files with "lua" or "luadoc" extensions are replaced by "html" extension.
+-- @param modulename Name of the module to be processed, may be a .lua file or
+-- a .luadoc file.
+-- @return name of the generated html file for the module
+
+function module_link (modulename, doc, from)
+	-- TODO: replace "." by "/" to create directories?
+	-- TODO: how to deal with module names with "/"?
+	assert(modulename)
+	assert(doc)
+	from = from or ""
+
+	if doc.modules[modulename] == nil then
+--		logger:error(string.format("unresolved reference to module `%s'", modulename))
+		return
+	end
+
+	local href = "modules/" .. modulename .. ".html"
+	string.gsub(from, "/", function () href = "../" .. href end)
+	return href
+end
+
+-------------------------------------------------------------------------------
+-- Returns the name of the html file to be generated from a lua(doc) file.
+-- Files with "lua" or "luadoc" extensions are replaced by "html" extension.
+-- @param to Name of the file to be processed, may be a .lua file or
+-- a .luadoc file.
+-- @param from path of where am I, based on this we append ..'s to the
+-- beginning of path
+-- @return name of the generated html file
+
+function file_link (to, from)
+	assert(to)
+	from = from or ""
+
+	local href = to
+	href = string.gsub(href, "lua$", "html")
+	href = string.gsub(href, "luadoc$", "html")
+	href = "files/" .. href
+	string.gsub(from, "/", function () href = "../" .. href end)
+	return href
+end
+
+-------------------------------------------------------------------------------
+-- Returns a link to a function or to a table
+-- @param fname name of the function or table to link to.
+-- @param doc documentation table
+-- @param kind String specying the kinf of element to link ("functions" or "tables").
+
+function link_to (fname, doc, module_doc, file_doc, from, kind)
+	assert(fname)
+	assert(doc)
+	from = from or ""
+	kind = kind or "functions"
+
+	if file_doc then
+		for _, func_name in pairs(file_doc[kind]) do
+			if func_name == fname then
+				return file_link(file_doc.name, from) .. "#" .. fname
+			end
+		end
+	end
+
+	if module_doc and module_doc[kind] then
+		for func_name, tbl in pairs(module_doc[kind]) do
+			if func_name == fname then
+				return "#" .. fname
+			end
+		end
+	end
+
+	local _, _, modulename, fname = string.find(fname, "^(.-)[%.%:]?([^%.%:]*)$")
+	assert(fname)
+
+	-- if fname does not specify a module, use the module_doc
+	if string.len(modulename) == 0 and module_doc then
+		modulename = module_doc.name
+	end
+
+	local module_doc = doc.modules[modulename]
+	if not module_doc then
+--		logger:error(string.format("unresolved reference to function `%s': module `%s' not found", fname, modulename))
+		return
+	end
+
+	for _, func_name in pairs(module_doc[kind]) do
+		if func_name == fname then
+			return module_link(modulename, doc, from) .. "#" .. fname
+		end
+	end
+
+--	logger:error(string.format("unresolved reference to function `%s' of module `%s'", fname, modulename))
+end
+
+-------------------------------------------------------------------------------
+-- Make a link to a file, module or function
+
+function symbol_link (symbol, doc, module_doc, file_doc, from)
+	assert(symbol)
+	assert(doc)
+
+	local href =
+--		file_link(symbol, from) or
+		module_link(symbol, doc, from) or
+		link_to(symbol, doc, module_doc, file_doc, from, "functions") or
+		link_to(symbol, doc, module_doc, file_doc, from, "tables")
+
+	if not href then
+		logger:error(string.format("unresolved reference to symbol `%s'", symbol))
+	end
+
+	return href or ""
+end
+
+-------------------------------------------------------------------------------
+-- Assembly the output filename for an input file.
+-- TODO: change the name of this function
+function out_file (filename)
+	local h = filename
+	h = string.gsub(h, "lua$", "html")
+	h = string.gsub(h, "luadoc$", "html")
+	h = "files/" .. h
+--	h = options.output_dir .. string.gsub (h, "^.-([%w_]+%.html)$", "%1")
+	h = options.output_dir .. h
+	return h
+end
+
+-------------------------------------------------------------------------------
+-- Assembly the output filename for a module.
+-- TODO: change the name of this function
+function out_module (modulename)
+	local h = modulename .. ".html"
+	h = "modules/" .. h
+	h = options.output_dir .. h
+	return h
+end
+
+-----------------------------------------------------------------
+-- Generate the output.
+-- @param doc Table with the structured documentation.
+
+function start (doc)
+	-- Generate index file
+	if (#doc.files > 0 or #doc.modules > 0) and (not options.noindexpage) then
+		local filename = options.output_dir.."index.html"
+		logger:info(string.format("generating file `%s'", filename))
+		local f = posix.open(filename, "w")
+		assert(f, string.format("could not open `%s' for writing", filename))
+		io.output(f)
+		include("index.lp", { doc = doc })
+		f:close()
+	end
+
+	-- Process modules
+	if not options.nomodules then
+		for _, modulename in ipairs(doc.modules) do
+			local module_doc = doc.modules[modulename]
+			-- assembly the filename
+			local filename = out_module(modulename)
+			logger:info(string.format("generating file `%s'", filename))
+
+			local f = posix.open(filename, "w")
+			assert(f, string.format("could not open `%s' for writing", filename))
+			io.output(f)
+			include("module.lp", { doc = doc, module_doc = module_doc })
+			f:close()
+		end
+	end
+
+	-- Process files
+	if not options.nofiles then
+		for _, filepath in ipairs(doc.files) do
+			local file_doc = doc.files[filepath]
+			-- assembly the filename
+			local filename = out_file(file_doc.name)
+			logger:info(string.format("generating file `%s'", filename))
+
+			local f = posix.open(filename, "w")
+			assert(f, string.format("could not open `%s' for writing", filename))
+			io.output(f)
+			include("file.lp", { doc = doc, file_doc = file_doc} )
+			f:close()
+		end
+	end
+
+	-- copy extra files
+	local f = posix.open(options.output_dir.."luadoc.css", "w")
+	io.output(f)
+	include("luadoc.css")
+	f:close()
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp
new file mode 100644
index 00000000..2e35392a
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp
@@ -0,0 +1,28 @@
+<%
+if module_doc then
+	from = "modules/"..module_doc.name
+elseif file_doc then
+	from = "files/.."..file_doc.name
+else
+	from = ""
+end
+%>
+
+<dt><%=const.private and "local " or ""%><a name="<%=const.name%>"></a><strong><%=const.name:gsub(".+%.","")%></strong></dt>
+<dd>
+<%=const.description or ""%>
+
+<%if type(const.see) == "string" then %>
+<h3>See also:</h3>
+	<a href="<%=const.see%>"><%=const.see%></a>
+<%elseif type(const.see) == "table" and #const.see > 0 then %>
+<h3>See also:</h3>
+<ul>
+	<%for i = 1, #const.see do%>
+	<li><a href="<%=luadoc.doclet.html.symbol_link(const.see[i], doc, module_doc, file_doc, from)%>">
+		<%=const.see[i]:gsub(".+%.","")%>
+	</a>
+	<%end%>
+</ul
+<%end%>
+</dd>
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp
new file mode 100644
index 00000000..67926b4a
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp
@@ -0,0 +1,112 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+    <title>Reference</title>
+    <link rel="stylesheet" href="<%=luadoc.doclet.html.link('luadoc.css', 'files/'..file_doc.name)%>" type="text/css" />
+	<!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/-->
+</head>
+
+<body>
+<div id="container">
+
+<div id="product">
+	<div id="product_logo"></div>
+	<div id="product_name"><big><b></b></big></div>
+	<div id="product_description"></div>
+</div> <!-- id="product" -->
+
+<div id="main">
+
+<div id="navigation">
+<%=luadoc.doclet.html.include("menu.lp", { doc=doc, file_doc=file_doc })%>
+
+</div> <!-- id="navigation" -->
+
+<div id="content">
+
+<h1>File <code><%=file_doc.name%></code></h1>
+
+<%if file_doc.description then%>
+<p><%=file_doc.description%></p>
+<%end%>
+<%if file_doc.author then%>
+<p><b><%= #file_doc.author>1 and "Authors" or "Author" %>:</b>
+<table class="authors_list">
+<%for _, author in ipairs(file_doc.author) do%>
+	<tr><td class="name"><%= author %></td></tr>
+<%end%>
+</table>
+</p>
+<%end%>
+<%if file_doc.copyright then%>
+<p>Copyright &copy;<%=file_doc.copyright%></p>
+<%end%>
+<%if file_doc.release then%>
+<p><small><b>Release:</b> <%=file_doc.release%></small></p>
+<%end%>
+
+<%if #file_doc.functions > 0 then%>
+<h2>Functions</h2>
+<table class="function_list">
+<%for _, func_name in ipairs(file_doc.functions) do
+  local func_data = file_doc.functions[func_name]%>
+	<tr>
+	<td class="name" nowrap><%=func_data.private and "local " or ""%><a href="#<%=func_name%>"><%=func_name%></a>&nbsp;(<%=table.concat(func_data.param, ", ")%>)</td>
+	<td class="summary"><%=func_data.summary%></td>
+	</tr>
+<%end%>
+</table>
+<%end%>
+
+
+<%if #file_doc.tables > 0 then%>
+<h2>Tables</h2>
+<table class="table_list">
+<%for _, tab_name in ipairs(file_doc.tables) do%>
+	<tr>
+	<td class="name" nowrap><a href="#<%=tab_name%>"><%=tab_name%></a></td>
+	<td class="summary"><%=file_doc.tables[tab_name].summary%></td>
+	</tr>
+<%end%>
+</table>
+<%end%>
+
+
+<br/>
+<br/>
+
+
+
+<%if #file_doc.functions > 0 then%>
+<h2><a name="functions"></a>Functions</h2>
+<dl class="function">
+<%for _, func_name in ipairs(file_doc.functions) do%>
+<%=luadoc.doclet.html.include("function.lp", { doc=doc, file_doc=file_doc, func=file_doc.functions[func_name] })%>
+<%end%>
+</dl>
+<%end%>
+
+
+<%if #file_doc.tables > 0 then%>
+<h2><a name="tables"></a>Tables</h2>
+<dl class="table">
+<%for _, tab_name in ipairs(file_doc.tables) do%>
+<%=luadoc.doclet.html.include("table.lp", { doc=doc, file_doc=file_doc, tab=file_doc.tables[tab_name] })%>
+<%end%>
+</dl>
+<%end%>
+
+
+
+</div> <!-- id="content" -->
+
+</div> <!-- id="main" -->
+
+<div id="about">
+	<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
+</div> <!-- id="about" -->
+
+</div> <!-- id="container" -->	
+</body>
+</html>
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp
new file mode 100644
index 00000000..a870ff8b
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp
@@ -0,0 +1,64 @@
+<%
+if module_doc then
+	from = "modules/"..module_doc.name
+elseif file_doc then
+	from = "files/.."..file_doc.name
+else
+	from = ""
+end
+%>
+
+<dt><%=func.private and "local " or ""%><a name="<%=func.name%>"></a><strong><%=(oop and func.name:gsub("%.",":") or func.name:gsub(".+%.",""))%></strong>&nbsp;(<%=table.concat(func.param or {}, ", ")%>)</dt>
+<dd>
+<%=func.description or ""%>
+
+<%if type(func.param) == "table" and #func.param > 0 then%>
+<h3>Parameters</h3>
+<ul>
+	<%for p = 1, #func.param do%>
+	<li>
+	  <%=func.param[p]%>: <%=func.param[func.param[p]] or ""%>
+	</li>
+	<%end%>
+</ul>
+<%end%>
+
+
+<%if type(func.usage) == "string" then%>
+<h3>Usage:</h3>
+<%=func.usage%>
+<%elseif type(func.usage) == "table" then%>
+<h3>Usage</h3>
+<ul>
+	<%for _, usage in ipairs(func.usage) do%>
+	<li><%= usage %>
+	<%end%>
+</ul>
+<%end%>
+
+<%if type(func.ret) == "string" then%>
+<h3>Return value:</h3>
+<%=func.ret%>
+<%elseif type(func.ret) == "table" then%>
+<h3>Return values:</h3>
+<ol>
+	<%for _, ret in ipairs(func.ret) do%>
+	<li><%= ret %>
+	<%end%>
+</ol>
+<%end%>
+
+<%if type(func.see) == "string" then %>
+<h3>See also:</h3>
+	<a href="<%=func.see%>"><%=func.see%></a>
+<%elseif type(func.see) == "table" and #func.see > 0 then %>
+<h3>See also:</h3>
+<ul>
+	<%for i = 1, #func.see do%>
+	<li><a href="<%=luadoc.doclet.html.symbol_link(func.see[i], doc, module_doc, file_doc, from)%>">
+		<%=(oop and func.see[i]:gsub("%.",":") or func.see[i]:gsub(".+%.",""))%>
+	</a>
+	<%end%>
+</ul
+<%end%>
+</dd>
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp
new file mode 100644
index 00000000..b4b9f5c3
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+    <title>Reference</title>
+    <link rel="stylesheet" href="<%=luadoc.doclet.html.link("luadoc.css")%>" type="text/css" />
+	<!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/-->
+</head>
+
+<body>
+<div id="container">
+
+<div id="product">
+	<div id="product_logo"></div>
+	<div id="product_name"><big><b></b></big></div>
+	<div id="product_description"></div>
+</div> <!-- id="product" -->
+
+<div id="main">
+
+<div id="navigation">
+<%=luadoc.doclet.html.include("menu.lp", { doc=doc })%>
+
+</div> <!-- id="navigation" -->
+
+<div id="content">
+
+
+<%if not options.nomodules and #doc.modules > 0 then%>
+<h2>Modules</h2>
+<table class="module_list">
+<!--<tr><td colspan="2">Modules</td></tr>-->
+<%for _, modulename in ipairs(doc.modules) do%>
+	<tr>
+		<td class="name"><a href="<%=luadoc.doclet.html.module_link(modulename, doc)%>"><%=modulename%></a></td>
+		<td class="summary"><%=doc.modules[modulename].summary%></td>
+	</tr>
+<%end%>
+</table>
+<%end%>
+
+
+
+<%if not options.nofiles and #doc.files > 0 then%>
+<h2>Files</h2>
+<table class="file_list">
+<!--<tr><td colspan="2">Files</td></tr>-->
+<%for _, filepath in ipairs(doc.files) do%>
+	<tr>
+		<td class="name"><a href="<%=luadoc.doclet.html.file_link(filepath)%>"><%=filepath%></a></td>
+		<td class="summary"></td>
+	</tr>
+<%end%>
+</table>
+<%end%>
+
+</div> <!-- id="content" -->
+
+</div> <!-- id="main" -->
+
+<div id="about">
+	<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
+</div> <!-- id="about" -->
+
+</div> <!-- id="container" -->	
+</body>
+</html>
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css
new file mode 100644
index 00000000..bc0f98a5
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css
@@ -0,0 +1,286 @@
+body { 
+    margin-left: 1em; 
+    margin-right: 1em; 
+    font-family: arial, helvetica, geneva, sans-serif;
+	background-color:#ffffff; margin:0px;
+}
+
+code {
+    font-family: "Andale Mono", monospace; 
+}
+
+tt {
+    font-family: "Andale Mono", monospace; 
+}
+
+body, td, th { font-size: 11pt; }
+
+h1, h2, h3, h4 { margin-left: 0em; }
+
+textarea, pre, tt { font-size:10pt; }
+body, td, th { color:#000000; }
+small { font-size:0.85em; }
+h1 { font-size:1.5em; }
+h2 { font-size:1.25em; }
+h3 { font-size:1.15em; }
+h4 { font-size:1.06em; }
+
+a:link { font-weight:bold; color: #004080; text-decoration: none; }
+a:visited { font-weight:bold; color: #006699; text-decoration: none; }
+a:link:hover { text-decoration:underline; }
+hr { color:#cccccc }
+img { border-width: 0px; }
+
+
+h3 { padding-top: 1em; }
+
+p { margin-left: 1em; }
+
+p.name { 
+    font-family: "Andale Mono", monospace; 
+    padding-top: 1em;
+    margin-left: 0em; 
+}
+
+blockquote { margin-left: 3em; }
+
+pre.example {
+    background-color: rgb(245, 245, 245);
+    border-top-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-top-style: solid;
+    border-right-style: solid;
+    border-bottom-style: solid;
+    border-left-style: solid;
+    border-top-color: silver;
+    border-right-color: silver;
+    border-bottom-color: silver;
+    border-left-color: silver;
+    padding: 1em;
+    margin-left: 1em;
+    margin-right: 1em;
+    font-family: "Andale Mono", monospace; 
+    font-size: smaller;
+}
+
+
+hr { 
+    margin-left: 0em;
+	background: #00007f; 
+	border: 0px;
+	height: 1px;
+}
+
+ul { list-style-type: disc; }
+
+table.index { border: 1px #00007f; }
+table.index td { text-align: left; vertical-align: top; }
+table.index ul { padding-top: 0em; margin-top: 0em; }
+
+table {
+    border: 1px solid black;
+	border-collapse: collapse;
+    margin-left: auto;
+    margin-right: auto;
+}
+th {
+    border: 1px solid black;
+    padding: 0.5em;
+}
+td {
+    border: 1px solid black;
+    padding: 0.5em;
+}
+div.header, div.footer { margin-left: 0em; }
+
+#container
+{
+	margin-left: 1em;
+	margin-right: 1em;
+	background-color: #f0f0f0;
+}
+
+#product
+{
+	text-align: center;
+	border-bottom: 1px solid #cccccc;
+	background-color: #ffffff;
+}
+
+#product big {
+	font-size: 2em;
+}
+
+#product_logo
+{
+}
+
+#product_name
+{
+}
+
+#product_description
+{
+}
+
+#main
+{
+	background-color: #f0f0f0;
+	border-left: 2px solid #cccccc;
+}
+
+#navigation
+{
+	float: left;
+	width: 18em;
+	margin: 0;
+	vertical-align: top;
+	background-color: #f0f0f0;
+	overflow:visible;
+}
+
+#navigation h1 {
+	background-color:#e7e7e7;
+	font-size:1.1em;
+	color:#000000;
+	text-align:left;
+	margin:0px;
+	padding:0.2em;
+	border-top:1px solid #dddddd;
+	border-bottom:1px solid #dddddd;
+}
+
+#navigation ul
+{
+	font-size:1em;
+	list-style-type: none;
+	padding: 0;
+	margin: 1px;
+}
+
+#navigation li
+{
+	text-indent: -1em;
+	margin: 0em 0em 0em 0.5em;
+	display: block;
+	padding: 3px 0px 0px 12px;
+}
+
+#navigation li li a
+{
+	padding: 0px 3px 0px -1em;
+}
+
+#content
+{
+	margin-left: 18em;
+	padding: 1em;
+	border-left: 2px solid #cccccc;
+	border-right: 2px solid #cccccc;
+	background-color: #ffffff;
+}
+
+#about
+{
+	clear: both;
+	margin: 0;
+	padding: 5px;
+	border-top: 2px solid #cccccc;
+	background-color: #ffffff;
+}
+
+@media print {
+	body { 
+		font: 12pt "Times New Roman", "TimeNR", Times, serif;
+	}
+	a { font-weight:bold; color: #004080; text-decoration: underline; }
+	
+	#main
	{
		background-color: #ffffff;
		border-left: 0px;
	}
	
+	#container
	{
		margin-left: 2%;
		margin-right: 2%;
		background-color: #ffffff;
	}
+	
+	#content
	{
		margin-left: 0px;
		padding: 1em;
		border-left: 0px;
		border-right: 0px;
		background-color: #ffffff;
	}
+	
+	#navigation
	{
		display: none;
+	}
+	pre.example {
+		font-family: "Andale Mono", monospace; 
+		font-size: 10pt;
+		page-break-inside: avoid;
+	}
+}
+
+table.module_list td
+{
+	border-width: 1px;
+	padding: 3px;
+	border-style: solid;
+	border-color: #cccccc;
+}
+table.module_list td.name { background-color: #f0f0f0; }
+table.module_list td.summary { width: 100%; }
+
+table.file_list
+{
+	border-width: 1px;
+	border-style: solid;
+	border-color: #cccccc;
+	border-collapse: collapse;
+}
+table.file_list td
+{
+	border-width: 1px;
+	padding: 3px;
+	border-style: solid;
+	border-color: #cccccc;
+}
+table.file_list td.name { background-color: #f0f0f0; }
+table.file_list td.summary { width: 100%; }
+
+
+table.function_list
+{
+	border-width: 1px;
+	border-style: solid;
+	border-color: #cccccc;
+	border-collapse: collapse;
+}
+table.function_list td
+{
+	border-width: 1px;
+	padding: 3px;
+	border-style: solid;
+	border-color: #cccccc;
+}
+table.function_list td.name { background-color: #f0f0f0; }
+table.function_list td.summary { width: 100%; }
+
+
+table.table_list
+{
+	border-width: 1px;
+	border-style: solid;
+	border-color: #cccccc;
+	border-collapse: collapse;
+}
+table.table_list td
+{
+	border-width: 1px;
+	padding: 3px;
+	border-style: solid;
+	border-color: #cccccc;
+}
+table.table_list td.name { background-color: #f0f0f0; }
+table.table_list td.summary { width: 100%; }
+
+dl.function dt {border-top: 1px solid #ccc; padding-top: 1em;}
+dl.function dd {padding-bottom: 1em;}
+dl.function h3 {padding: 0; margin: 0; font-size: medium;}
+
+dl.table dt {border-top: 1px solid #ccc; padding-top: 1em;}
+dl.table dd {padding-bottom: 1em;}
+dl.table h3 {padding: 0; margin: 0; font-size: medium;}
+
+#TODO: make module_list, file_list, function_list, table_list inherit from a list
+
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp
new file mode 100644
index 00000000..0fe36520
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp
@@ -0,0 +1,55 @@
+<%
+if module_doc then
+	from = "modules/"..module_doc.name
+elseif file_doc then
+	from = "files/.."..file_doc.name
+else
+	from = ""
+end
+%>
+
+<h1>LuaDoc</h1>
+<ul>
+	<%if not module_doc and not file_doc then%>
+	<li><strong>Index</strong></li>
+	<%else%>
+	<li><a href="<%=luadoc.doclet.html.link("index.html", from)%>">Index</a></li>
+	<%end%>
+</ul>
+
+
+<!-- Module list -->
+<%if not options.nomodules and #doc.modules > 0 then%>
+<h1>Modules</h1>
+<ul>
+<%for _, modulename in ipairs(doc.modules) do
+	if module_doc and module_doc.name == modulename then%>
+	<li><strong><%=modulename%></strong></li>
+	<%else%>
+	<li>
+		<a href="<%=luadoc.doclet.html.module_link(modulename, doc, from)%>"><%=modulename%></a>
+	</li>
+<%	end
+end%>
+</ul>
+<%end%>
+
+
+<!-- File list -->
+<%if not options.nofiles and #doc.files > 0 then%>
+<h1>Files</h1>
+<ul>
+<%for _, filepath in ipairs(doc.files) do
+	if file_doc and file_doc.name == filepath then%>
+	<li><strong><%=filepath%></strong></li>
+	<%else%>
+	<li>
+		<a href="<%=luadoc.doclet.html.file_link(filepath, from)%>"><%=filepath%></a>
+	</li>
+<%	end
+end%>
+</ul>
+<%end%>
+
+
+
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp
new file mode 100644
index 00000000..daa70862
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+    <title>Reference</title>
+    <link rel="stylesheet" href="<%=luadoc.doclet.html.link('luadoc.css', 'modules/'..module_doc.name)%>" type="text/css" />
+	<!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/-->
+</head>
+
+<body>
+<div id="container">
+
+<div id="product">
+	<div id="product_logo"></div>
+	<div id="product_name"><big><b></b></big></div>
+	<div id="product_description"></div>
+</div> <!-- id="product" -->
+
+<div id="main">
+
+<div id="navigation">
+<%=luadoc.doclet.html.include("menu.lp", { doc=doc, module_doc=module_doc })%>
+<% oop = ( module_doc.doc[1].cstyle == "instance" ) and true or false %>
+
+</div><!-- id="navigation" -->
+
+<div id="content">
+
+<h1><%=( oop and "Object Instance" or "Class" )%> <code><%=module_doc.name%></code></h1>
+
+<p><%=module_doc.description%></p>
+<%if module_doc.author then%>
+<p><b><%= #module_doc.author>1 and "Authors" or "Author" %>:</b>
+<table class="authors_list">
+<%for _, author in ipairs(module_doc.author) do%>
+	<tr><td class="name"><%= author %></td></tr>
+<%end%>
+</table>
+</p>
+<%end%>
+<%if module_doc.copyright then%>
+<p>Copyright&copy; <%=module_doc.copyright%></p>
+<%end%>
+<%if module_doc.release then%>
+<p><small><b>Release:</b> <%=module_doc.release%></small></p>
+<%end%>
+
+<%if #module_doc.constants > 0 then %>
+<h2>Constants</h2>
+<table class="function_list">
+<%for _, const_name in ipairs(module_doc.constants) do
+  local const_data = module_doc.constants[const_name]%>
+	<tr>
+	<td class="name" nowrap><code><%=const_data.private and "local " or ""%><%=(const_name:gsub(".+%.",""))%></code></td>
+	<td class="summary"><%=const_data.summary%></td>
+	</tr>
+<%end%>
+</table>
+<%end%>
+
+<%if #module_doc.functions > 0 then %>
+<h2>Functions</h2>
+<table class="function_list">
+<%for _, func_name in ipairs(module_doc.functions) do
+  local func_data = module_doc.functions[func_name]%>
+	<tr>
+	<td class="name" nowrap><%=func_data.private and "local " or ""%><a href="#<%=func_name%>"><%=(oop and func_name:gsub("%.",":") or func_name:gsub(".+%.",""))%></a>&nbsp;(<%=table.concat(module_doc.functions[func_name].param or {}, ", ")%>)</td>
+	<td class="summary"><%=module_doc.functions[func_name].summary%></td>
+	</tr>
+<%end%>
+</table>
+<%end%>
+
+
+<%if #module_doc.tables > 0 then%>
+<h2>Tables</h2>
+<table class="table_list">
+<%for _, tab_name in ipairs(module_doc.tables) do%>
+	<tr>
+	<td class="name" nowrap><a href="#<%=tab_name%>"><%=tab_name%></a></td>
+	<td class="summary"><%=module_doc.tables[tab_name].summary%></td>
+	</tr>
+<%end%>
+</table>
+<%end%>
+
+
+<br/>
+<br/>
+
+<%if #module_doc.functions > 0 then%>
+<h2><a name="functions"></a>Functions</h2>
+<dl class="function">
+<%for _, func_name in ipairs(module_doc.functions) do%>
+<%=luadoc.doclet.html.include("function.lp", { doc=doc, module_doc=module_doc, func=module_doc.functions[func_name], oop=oop })%>
+<%end%>
+</dl>
+<%end%>
+
+<%if #module_doc.tables > 0 then%>
+<h2><a name="tables"></a>Tables</h2>
+<dl class="table">
+<%for _, tab_name in ipairs(module_doc.tables) do%>
+<%=luadoc.doclet.html.include("table.lp", { doc=doc, module_doc=module_doc, tab=module_doc.tables[tab_name] })%>
+<%end%>
+</dl>
+<%end%>
+
+
+</div> <!-- id="content" -->
+
+</div> <!-- id="main" -->
+
+<div id="about">
+	<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p>
+</div> <!-- id="about" -->
+
+</div> <!-- id="container" -->
+</body>
+</html>
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp
new file mode 100644
index 00000000..5cd02395
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp
@@ -0,0 +1,15 @@
+<dt><a name="<%=tab.name%>"></a><strong><%=tab.name%></strong></dt>
+<dd><%=tab.description%>
+
+<%if type(tab.field) == "table" and #tab.field > 0 then%>
+<em>Fields</em>
+<ul>
+	<%for p = 1, #tab.field do%>
+	<li>
+	  <%=tab.field[p]%>: <%=tab.field[tab.field[p]] or ""%>
+	</li>
+	<%end%>
+</ul>
+<%end%>
+
+</dd>
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua
new file mode 100644
index 00000000..1e880b88
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua
@@ -0,0 +1,12 @@
+-----------------------------------------------------------------
+-- @release $Id: raw.lua,v 1.5 2007/04/18 14:28:39 tomas Exp $
+-----------------------------------------------------------------
+
+module "luadoc.doclet.raw"
+
+-----------------------------------------------------------------
+-- Generate the output.
+-- @param doc Table with the structured documentation.
+
+function start (doc)
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/init.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/init.lua
new file mode 100644
index 00000000..649515de
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/init.lua
@@ -0,0 +1,50 @@
+-------------------------------------------------------------------------------
+-- LuaDoc main function.
+-- @release $Id: init.lua,v 1.4 2008/02/17 06:42:51 jasonsantos Exp $
+-------------------------------------------------------------------------------
+
+local require = require
+
+local util = require "luadoc.util"
+
+logger = {}
+
+module ("luadoc")
+
+-------------------------------------------------------------------------------
+-- LuaDoc version number.
+
+_COPYRIGHT = "Copyright (c) 2003-2007 The Kepler Project"
+_DESCRIPTION = "Documentation Generator Tool for the Lua language"
+_VERSION = "LuaDoc 3.0.1"
+
+-------------------------------------------------------------------------------
+-- Main function
+-- @see luadoc.doclet.html, luadoc.doclet.formatter, luadoc.doclet.raw
+-- @see luadoc.taglet.standard
+
+function main (files, options)
+	logger = util.loadlogengine(options)
+
+	-- load config file
+	if options.config ~= nil then
+		-- load specified config file
+		dofile(options.config)
+	else
+		-- load default config file
+		require("luadoc.config")
+	end
+	
+	local taglet = require(options.taglet)
+	local doclet = require(options.doclet)
+
+	-- analyze input
+	taglet.options = options
+	taglet.logger = logger
+	local doc = taglet.start(files)
+
+	-- generate output
+	doclet.options = options
+	doclet.logger = logger
+	doclet.start(doc)
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/lp.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/lp.lua
new file mode 100644
index 00000000..adf84f9f
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/lp.lua
@@ -0,0 +1,130 @@
+----------------------------------------------------------------------------
+-- Lua Pages Template Preprocessor.
+--
+-- @release $Id: lp.lua,v 1.7 2007/04/18 14:28:39 tomas Exp $
+----------------------------------------------------------------------------
+
+local assert, error, getfenv, loadstring, setfenv = assert, error, getfenv, loadstring, setfenv
+local find, format, gsub, strsub = string.find, string.format, string.gsub, string.sub
+local concat, tinsert = table.concat, table.insert
+local open = io.open
+
+module (...)
+
+----------------------------------------------------------------------------
+-- function to do output
+local outfunc = "io.write"
+-- accepts the old expression field: `$| <Lua expression> |$'
+local compatmode = true
+
+--
+-- Builds a piece of Lua code which outputs the (part of the) given string.
+-- @param s String.
+-- @param i Number with the initial position in the string.
+-- @param f Number with the final position in the string (default == -1).
+-- @return String with the correspondent Lua code which outputs the part of the string.
+--
+local function out (s, i, f)
+	s = strsub(s, i, f or -1)
+	if s == "" then return s end
+	-- we could use `%q' here, but this way we have better control
+	s = gsub(s, "([\\\n\'])", "\\%1")
+	-- substitute '\r' by '\'+'r' and let `loadstring' reconstruct it
+	s = gsub(s, "\r", "\\r")
+	return format(" %s('%s'); ", outfunc, s)
+end
+
+
+----------------------------------------------------------------------------
+-- Translate the template to Lua code.
+-- @param s String to translate.
+-- @return String with translated code.
+----------------------------------------------------------------------------
+function translate (s)
+	if compatmode then
+		s = gsub(s, "$|(.-)|%$", "<?lua = %1 ?>")
+		s = gsub(s, "<!%-%-$$(.-)$$%-%->", "<?lua %1 ?>")
+	end
+	s = gsub(s, "<%%(.-)%%>", "<?lua %1 ?>")
+	local res = {}
+	local start = 1   -- start of untranslated part in `s'
+	while true do
+		local ip, fp, target, exp, code = find(s, "<%?(%w*)[ \t]*(=?)(.-)%?>", start)
+		if not ip then break end
+		tinsert(res, out(s, start, ip-1))
+		if target ~= "" and target ~= "lua" then
+			-- not for Lua; pass whole instruction to the output
+			tinsert(res, out(s, ip, fp))
+		else
+			if exp == "=" then   -- expression?
+				tinsert(res, format(" %s(%s);", outfunc, code))
+			else  -- command
+				tinsert(res, format(" %s ", code))
+			end
+		end
+		start = fp + 1
+	end
+	tinsert(res, out(s, start))
+	return concat(res)
+end
+
+
+----------------------------------------------------------------------------
+-- Defines the name of the output function.
+-- @param f String with the name of the function which produces output.
+
+function setoutfunc (f)
+	outfunc = f
+end
+
+----------------------------------------------------------------------------
+-- Turns on or off the compatibility with old CGILua 3.X behavior.
+-- @param c Boolean indicating if the compatibility mode should be used.
+
+function setcompatmode (c)
+	compatmode = c
+end
+
+----------------------------------------------------------------------------
+-- Internal compilation cache.
+
+local cache = {}
+
+----------------------------------------------------------------------------
+-- Translates a template into a Lua function.
+-- Does NOT execute the resulting function.
+-- Uses a cache of templates.
+-- @param string String with the template to be translated.
+-- @param chunkname String with the name of the chunk, for debugging purposes.
+-- @return Function with the resulting translation.
+
+function compile (string, chunkname)
+	local f, err = cache[string]
+	if f then return f end
+	f, err = loadstring (translate (string), chunkname)
+	if not f then error (err, 3) end
+	cache[string] = f
+	return f
+end
+
+----------------------------------------------------------------------------
+-- Translates and executes a template in a given file.
+-- The translation creates a Lua function which will be executed in an
+-- optionally given environment.
+-- @param filename String with the name of the file containing the template.
+-- @param env Table with the environment to run the resulting function.
+
+function include (filename, env)
+	-- read the whole contents of the file
+	local fh = assert (open (filename))
+	local src = fh:read("*a")
+	fh:close()
+	-- translates the file into a function
+	local prog = compile (src, '@'..filename)
+	local _env
+	if env then
+		_env = getfenv (prog)
+		setfenv (prog, env)
+	end
+	prog ()
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua
new file mode 100644
index 00000000..17a30588
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua
@@ -0,0 +1,565 @@
+-------------------------------------------------------------------------------
+-- @release $Id: standard.lua,v 1.39 2007/12/21 17:50:48 tomas Exp $
+-------------------------------------------------------------------------------
+
+local assert, pairs, tostring, type = assert, pairs, tostring, type
+local io = require "io"
+local posix = require "nixio.fs"
+local luadoc = require "luadoc"
+local util = require "luadoc.util"
+local tags = require "luadoc.taglet.standard.tags"
+local string = require "string"
+local table = require "table"
+
+module 'luadoc.taglet.standard'
+
+-------------------------------------------------------------------------------
+-- Creates an iterator for an array base on a class type.
+-- @param t array to iterate over
+-- @param class name of the class to iterate over
+
+function class_iterator (t, class)
+	return function ()
+		local i = 1
+		return function ()
+			while t[i] and t[i].class ~= class do
+				i = i + 1
+			end
+			local v = t[i]
+			i = i + 1
+			return v
+		end
+	end
+end
+
+-- Patterns for function recognition
+local identifiers_list_pattern = "%s*(.-)%s*"
+local identifier_pattern = "[^%(%s]+"
+local function_patterns = {
+	"^()%s*function%s*("..identifier_pattern..")%s*%("..identifiers_list_pattern.."%)",
+	"^%s*(local%s)%s*function%s*("..identifier_pattern..")%s*%("..identifiers_list_pattern.."%)",
+	"^()%s*("..identifier_pattern..")%s*%=%s*function%s*%("..identifiers_list_pattern.."%)",
+}
+
+-------------------------------------------------------------------------------
+-- Checks if the line contains a function definition
+-- @param line string with line text
+-- @return function information or nil if no function definition found
+
+local function check_function (line)
+	line = util.trim(line)
+
+	local info = table.foreachi(function_patterns, function (_, pattern)
+		local r, _, l, id, param = string.find(line, pattern)
+		if r ~= nil then
+			return {
+				name = id,
+				private = (l == "local"),
+				param = { } --util.split("%s*,%s*", param),
+			}
+		end
+	end)
+
+	-- TODO: remove these assert's?
+	if info ~= nil then
+		assert(info.name, "function name undefined")
+		assert(info.param, string.format("undefined parameter list for function `%s'", info.name))
+	end
+
+	return info
+end
+
+-------------------------------------------------------------------------------
+-- Checks if the line contains a module definition.
+-- @param line string with line text
+-- @param currentmodule module already found, if any
+-- @return the name of the defined module, or nil if there is no module
+-- definition
+
+local function check_module (line, currentmodule)
+	line = util.trim(line)
+
+	-- module"x.y"
+	-- module'x.y'
+	-- module[[x.y]]
+	-- module("x.y")
+	-- module('x.y')
+	-- module([[x.y]])
+	-- module(...)
+
+	local r, _, modulename = string.find(line, "^module%s*[%s\"'(%[]+([^,\"')%]]+)")
+	if r then
+		-- found module definition
+		logger:debug(string.format("found module `%s'", modulename))
+		return modulename
+	end
+	return currentmodule
+end
+
+-- Patterns for constant recognition
+local constant_patterns = {
+	"^()%s*([A-Z][A-Z0-9_]*)%s*=",
+	"^%s*(local%s)%s*([A-Z][A-Z0-9_]*)%s*=",
+}
+
+-------------------------------------------------------------------------------
+-- Checks if the line contains a constant definition
+-- @param line string with line text
+-- @return constant information or nil if no constant definition found
+
+local function check_constant (line)
+	line = util.trim(line)
+
+	local info = table.foreachi(constant_patterns, function (_, pattern)
+		local r, _, l, id = string.find(line, pattern)
+		if r ~= nil then
+			return {
+				name = id,
+				private = (l == "local"),
+			}
+		end
+	end)
+
+	-- TODO: remove these assert's?
+	if info ~= nil then
+		assert(info.name, "constant name undefined")
+	end
+
+	return info
+end
+
+-------------------------------------------------------------------------------
+-- Extracts summary information from a description. The first sentence of each
+-- doc comment should be a summary sentence, containing a concise but complete
+-- description of the item. It is important to write crisp and informative
+-- initial sentences that can stand on their own
+-- @param description text with item description
+-- @return summary string or nil if description is nil
+
+local function parse_summary (description)
+	-- summary is never nil...
+	description = description or ""
+
+	-- append an " " at the end to make the pattern work in all cases
+	description = description.." "
+
+	-- read until the first period followed by a space or tab
+	local summary = string.match(description, "(.-%.)[%s\t]")
+
+	-- if pattern did not find the first sentence, summary is the whole description
+	summary = summary or description
+
+	return summary
+end
+
+-------------------------------------------------------------------------------
+-- @param f file handle
+-- @param line current line being parsed
+-- @param modulename module already found, if any
+-- @return current line
+-- @return code block
+-- @return modulename if found
+
+local function parse_code (f, line, modulename)
+	local code = {}
+	while line ~= nil do
+		if string.find(line, "^[\t ]*%-%-%-") then
+			-- reached another luadoc block, end this parsing
+			return line, code, modulename
+		else
+			-- look for a module definition
+			modulename = check_module(line, modulename)
+
+			table.insert(code, line)
+			line = f:read()
+		end
+	end
+	-- reached end of file
+	return line, code, modulename
+end
+
+-------------------------------------------------------------------------------
+-- Parses the information inside a block comment
+-- @param block block with comment field
+-- @return block parameter
+
+local function parse_comment (block, first_line, modulename)
+
+	-- get the first non-empty line of code
+	local code = table.foreachi(block.code, function(_, line)
+		if not util.line_empty(line) then
+			-- `local' declarations are ignored in two cases:
+			-- when the `nolocals' option is turned on; and
+			-- when the first block of a file is parsed (this is
+			--	necessary to avoid confusion between the top
+			--	local declarations and the `module' definition.
+			if (options.nolocals or first_line) and line:find"^%s*local" then
+				return
+			end
+			return line
+		end
+	end)
+
+	-- parse first line of code
+	if code ~= nil then
+		local func_info = check_function(code)
+		local module_name = check_module(code)
+		local const_info = check_constant(code)
+		if func_info then
+			block.class = "function"
+			block.name = func_info.name
+			block.param = func_info.param
+			block.private = func_info.private
+		elseif const_info then
+			block.class = "constant"
+			block.name = const_info.name
+			block.private = const_info.private
+		elseif module_name then
+			block.class = "module"
+			block.name = module_name
+			block.param = {}
+		else
+			block.param = {}
+		end
+	else
+		-- TODO: comment without any code. Does this means we are dealing
+		-- with a file comment?
+	end
+
+	-- parse @ tags
+	local currenttag = "description"
+	local currenttext
+
+	table.foreachi(block.comment, function (_, line)
+		line = util.trim_comment(line)
+
+		local r, _, tag, text = string.find(line, "@([_%w%.]+)%s+(.*)")
+		if r ~= nil then
+			-- found new tag, add previous one, and start a new one
+			-- TODO: what to do with invalid tags? issue an error? or log a warning?
+			tags.handle(currenttag, block, currenttext)
+
+			currenttag = tag
+			currenttext = text
+		else
+			currenttext = util.concat(currenttext, line)
+			assert(string.sub(currenttext, 1, 1) ~= " ", string.format("`%s', `%s'", currenttext, line))
+		end
+	end)
+	tags.handle(currenttag, block, currenttext)
+
+	-- extracts summary information from the description
+	block.summary = parse_summary(block.description)
+	assert(string.sub(block.description, 1, 1) ~= " ", string.format("`%s'", block.description))
+
+	if block.name and block.class == "module" then
+		modulename = block.name
+	end
+
+	return block, modulename
+end
+
+-------------------------------------------------------------------------------
+-- Parses a block of comment, started with ---. Read until the next block of
+-- comment.
+-- @param f file handle
+-- @param line being parsed
+-- @param modulename module already found, if any
+-- @return line
+-- @return block parsed
+-- @return modulename if found
+
+local function parse_block (f, line, modulename, first)
+	local block = {
+		comment = {},
+		code = {},
+	}
+
+	while line ~= nil do
+		if string.find(line, "^[\t ]*%-%-") == nil then
+			-- reached end of comment, read the code below it
+			-- TODO: allow empty lines
+			line, block.code, modulename = parse_code(f, line, modulename)
+
+			-- parse information in block comment
+			block, modulename = parse_comment(block, first, modulename)
+
+			return line, block, modulename
+		else
+			table.insert(block.comment, line)
+			line = f:read()
+		end
+	end
+	-- reached end of file
+
+	-- parse information in block comment
+	block, modulename = parse_comment(block, first, modulename)
+
+	return line, block, modulename
+end
+
+-------------------------------------------------------------------------------
+-- Parses a file documented following luadoc format.
+-- @param filepath full path of file to parse
+-- @param doc table with documentation
+-- @return table with documentation
+
+function parse_file (filepath, doc, handle, prev_line, prev_block, prev_modname)
+	local blocks = { prev_block }
+	local modulename = prev_modname
+
+	-- read each line
+	local f = handle or io.open(filepath, "r")
+	local i = 1
+	local line = prev_line or f:read()
+	local first = true
+	while line ~= nil do
+
+		if string.find(line, "^[\t ]*%-%-%-") then
+			-- reached a luadoc block
+			local block, newmodname
+			line, block, newmodname = parse_block(f, line, modulename, first)
+
+			if modulename and newmodname and newmodname ~= modulename then
+				doc = parse_file( nil, doc, f, line, block, newmodname )
+			else
+				table.insert(blocks, block)
+				modulename = newmodname
+			end
+		else
+			-- look for a module definition
+			local newmodname = check_module(line, modulename)
+
+			if modulename and newmodname and newmodname ~= modulename then
+				parse_file( nil, doc, f )
+			else
+				modulename = newmodname
+			end
+
+			-- TODO: keep beginning of file somewhere
+
+			line = f:read()
+		end
+		first = false
+		i = i + 1
+	end
+
+	if not handle then
+		f:close()
+	end
+
+	if filepath then
+		-- store blocks in file hierarchy
+		assert(doc.files[filepath] == nil, string.format("doc for file `%s' already defined", filepath))
+		table.insert(doc.files, filepath)
+		doc.files[filepath] = {
+			type = "file",
+			name = filepath,
+			doc = blocks,
+	--		functions = class_iterator(blocks, "function"),
+	--		tables = class_iterator(blocks, "table"),
+		}
+	--
+		local first = doc.files[filepath].doc[1]
+		if first and modulename then
+			doc.files[filepath].author = first.author
+			doc.files[filepath].copyright = first.copyright
+			doc.files[filepath].description = first.description
+			doc.files[filepath].release = first.release
+			doc.files[filepath].summary = first.summary
+		end
+	end
+
+	-- if module definition is found, store in module hierarchy
+	if modulename ~= nil then
+		if modulename == "..." then
+			assert( filepath, "Can't determine name for virtual module from filepatch" )
+			modulename = string.gsub (filepath, "%.lua$", "")
+			modulename = string.gsub (modulename, "/", ".")
+		end
+		if doc.modules[modulename] ~= nil then
+			-- module is already defined, just add the blocks
+			table.foreachi(blocks, function (_, v)
+				table.insert(doc.modules[modulename].doc, v)
+			end)
+		else
+			-- TODO: put this in a different module
+			table.insert(doc.modules, modulename)
+			doc.modules[modulename] = {
+				type = "module",
+				name = modulename,
+				doc = blocks,
+--				functions = class_iterator(blocks, "function"),
+--				tables = class_iterator(blocks, "table"),
+				author = first and first.author,
+				copyright = first and first.copyright,
+				description = "",
+				release = first and first.release,
+				summary = "",
+			}
+
+			-- find module description
+			for m in class_iterator(blocks, "module")() do
+				doc.modules[modulename].description = util.concat(
+					doc.modules[modulename].description,
+					m.description)
+				doc.modules[modulename].summary = util.concat(
+					doc.modules[modulename].summary,
+					m.summary)
+				if m.author then
+					doc.modules[modulename].author = m.author
+				end
+				if m.copyright then
+					doc.modules[modulename].copyright = m.copyright
+				end
+				if m.release then
+					doc.modules[modulename].release = m.release
+				end
+				if m.name then
+					doc.modules[modulename].name = m.name
+				end
+			end
+			doc.modules[modulename].description = doc.modules[modulename].description or (first and first.description) or ""
+			doc.modules[modulename].summary = doc.modules[modulename].summary or (first and first.summary) or ""
+		end
+
+		-- make functions table
+		doc.modules[modulename].functions = {}
+		for f in class_iterator(blocks, "function")() do
+			if f and f.name then
+				table.insert(doc.modules[modulename].functions, f.name)
+				doc.modules[modulename].functions[f.name] = f
+			end
+		end
+
+		-- make tables table
+		doc.modules[modulename].tables = {}
+		for t in class_iterator(blocks, "table")() do
+			if t and t.name then
+				table.insert(doc.modules[modulename].tables, t.name)
+				doc.modules[modulename].tables[t.name] = t
+			end
+		end
+
+		-- make constants table
+		doc.modules[modulename].constants = {}
+		for c in class_iterator(blocks, "constant")() do
+			if c and c.name then
+				table.insert(doc.modules[modulename].constants, c.name)
+				doc.modules[modulename].constants[c.name] = c
+			end
+		end
+	end
+
+	if filepath then
+		-- make functions table
+		doc.files[filepath].functions = {}
+		for f in class_iterator(blocks, "function")() do
+			if f and f.name then
+				table.insert(doc.files[filepath].functions, f.name)
+				doc.files[filepath].functions[f.name] = f
+			end
+		end
+
+		-- make tables table
+		doc.files[filepath].tables = {}
+		for t in class_iterator(blocks, "table")() do
+			if t and t.name then
+				table.insert(doc.files[filepath].tables, t.name)
+				doc.files[filepath].tables[t.name] = t
+			end
+		end
+	end
+
+	return doc
+end
+
+-------------------------------------------------------------------------------
+-- Checks if the file is terminated by ".lua" or ".luadoc" and calls the
+-- function that does the actual parsing
+-- @param filepath full path of the file to parse
+-- @param doc table with documentation
+-- @return table with documentation
+-- @see parse_file
+
+function file (filepath, doc)
+	local patterns = { "%.lua$", "%.luadoc$" }
+	local valid = table.foreachi(patterns, function (_, pattern)
+		if string.find(filepath, pattern) ~= nil then
+			return true
+		end
+	end)
+
+	if valid then
+		logger:info(string.format("processing file `%s'", filepath))
+		doc = parse_file(filepath, doc)
+	end
+
+	return doc
+end
+
+-------------------------------------------------------------------------------
+-- Recursively iterates through a directory, parsing each file
+-- @param path directory to search
+-- @param doc table with documentation
+-- @return table with documentation
+
+function directory (path, doc)
+	for f in posix.dir(path) do
+		local fullpath = path .. "/" .. f
+		local attr = posix.stat(fullpath)
+		assert(attr, string.format("error stating file `%s'", fullpath))
+
+		if attr.type == "reg" then
+			doc = file(fullpath, doc)
+		elseif attr.type == "dir" and f ~= "." and f ~= ".." then
+			doc = directory(fullpath, doc)
+		end
+	end
+	return doc
+end
+
+-- Recursively sorts the documentation table
+local function recsort (tab)
+	table.sort (tab)
+	-- sort list of functions by name alphabetically
+	for f, doc in pairs(tab) do
+		if doc.functions then
+			table.sort(doc.functions)
+		end
+		if doc.tables then
+			table.sort(doc.tables)
+		end
+	end
+end
+
+-------------------------------------------------------------------------------
+
+function start (files, doc)
+	assert(files, "file list not specified")
+
+	-- Create an empty document, or use the given one
+	doc = doc or {
+		files = {},
+		modules = {},
+	}
+	assert(doc.files, "undefined `files' field")
+	assert(doc.modules, "undefined `modules' field")
+
+	table.foreachi(files, function (_, path)
+		local attr = posix.stat(path)
+		assert(attr, string.format("error stating path `%s'", path))
+
+		if attr.type == "reg" then
+			doc = file(path, doc)
+		elseif attr.type == "dir" then
+			doc = directory(path, doc)
+		end
+	end)
+
+	-- order arrays alphabetically
+	recsort(doc.files)
+	recsort(doc.modules)
+
+	return doc
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua
new file mode 100644
index 00000000..d03df82d
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua
@@ -0,0 +1,178 @@
+-------------------------------------------------------------------------------
+-- Handlers for several tags
+-- @release $Id: tags.lua,v 1.8 2007/09/05 12:39:09 tomas Exp $
+-------------------------------------------------------------------------------
+
+local luadoc = require "luadoc"
+local util = require "luadoc.util"
+local string = require "string"
+local table = require "table"
+local assert, type, tostring = assert, type, tostring
+
+module "luadoc.taglet.standard.tags"
+
+-------------------------------------------------------------------------------
+
+local function author (tag, block, text)
+	block[tag] = block[tag] or {}
+	if not text then
+		luadoc.logger:warn("author `name' not defined [["..text.."]]: skipping")
+		return
+	end
+	table.insert (block[tag], text)
+end
+
+-------------------------------------------------------------------------------
+-- Set the class of a comment block. Classes can be "module", "function",
+-- "table". The first two classes are automatic, extracted from the source code
+
+local function class (tag, block, text)
+	block[tag] = text
+end
+
+-------------------------------------------------------------------------------
+
+local function cstyle (tag, block, text)
+	block[tag] = text
+end
+
+-------------------------------------------------------------------------------
+
+local function copyright (tag, block, text)
+	block[tag] = text
+end
+
+-------------------------------------------------------------------------------
+
+local function description (tag, block, text)
+	block[tag] = text
+end
+
+-------------------------------------------------------------------------------
+
+local function field (tag, block, text)
+	if block["class"] ~= "table" then
+		luadoc.logger:warn("documenting `field' for block that is not a `table'")
+	end
+	block[tag] = block[tag] or {}
+
+	local _, _, name, desc = string.find(text, "^([_%w%.]+)%s+(.*)")
+	assert(name, "field name not defined")
+
+	table.insert(block[tag], name)
+	block[tag][name] = desc
+end
+
+-------------------------------------------------------------------------------
+-- Set the name of the comment block. If the block already has a name, issue
+-- an error and do not change the previous value
+
+local function name (tag, block, text)
+	if block[tag] and block[tag] ~= text then
+		luadoc.logger:error(string.format("block name conflict: `%s' -> `%s'", block[tag], text))
+	end
+
+	block[tag] = text
+end
+
+-------------------------------------------------------------------------------
+-- Processes a parameter documentation.
+-- @param tag String with the name of the tag (it must be "param" always).
+-- @param block Table with previous information about the block.
+-- @param text String with the current line beeing processed.
+
+local function param (tag, block, text)
+	block[tag] = block[tag] or {}
+	-- TODO: make this pattern more flexible, accepting empty descriptions
+	local _, _, name, desc = string.find(text, "^([_%w%.]+)%s+(.*)")
+	if not name then
+		luadoc.logger:warn("parameter `name' not defined [["..text.."]]: skipping")
+		return
+	end
+	local i = table.foreachi(block[tag], function (i, v)
+		if v == name then
+			return i
+		end
+	end)
+	if i == nil then
+		luadoc.logger:warn(string.format("documenting undefined parameter `%s'", name))
+		table.insert(block[tag], name)
+	end
+	block[tag][name] = desc
+end
+
+-------------------------------------------------------------------------------
+
+local function release (tag, block, text)
+	block[tag] = text
+end
+
+-------------------------------------------------------------------------------
+
+local function ret (tag, block, text)
+	tag = "ret"
+	if type(block[tag]) == "string" then
+		block[tag] = { block[tag], text }
+	elseif type(block[tag]) == "table" then
+		table.insert(block[tag], text)
+	else
+		block[tag] = text
+	end
+end
+
+-------------------------------------------------------------------------------
+-- @see ret
+
+local function see (tag, block, text)
+	-- see is always an array
+	block[tag] = block[tag] or {}
+
+	-- remove trailing "."
+	text = string.gsub(text, "(.*)%.$", "%1")
+
+	local s = util.split("%s*,%s*", text)
+
+	table.foreachi(s, function (_, v)
+		table.insert(block[tag], v)
+	end)
+end
+
+-------------------------------------------------------------------------------
+-- @see ret
+
+local function usage (tag, block, text)
+	if type(block[tag]) == "string" then
+		block[tag] = { block[tag], text }
+	elseif type(block[tag]) == "table" then
+		table.insert(block[tag], text)
+	else
+		block[tag] = text
+	end
+end
+
+-------------------------------------------------------------------------------
+
+local handlers = {}
+handlers["author"] = author
+handlers["class"] = class
+handlers["cstyle"] = cstyle
+handlers["copyright"] = copyright
+handlers["description"] = description
+handlers["field"] = field
+handlers["name"] = name
+handlers["param"] = param
+handlers["release"] = release
+handlers["return"] = ret
+handlers["see"] = see
+handlers["usage"] = usage
+
+-------------------------------------------------------------------------------
+
+function handle (tag, block, text)
+	if not handlers[tag] then
+		luadoc.logger:error(string.format("undefined handler for tag `%s'", tag))
+		return
+	end
+--	assert(handlers[tag], string.format("undefined handler for tag `%s'", tag))
+	return handlers[tag](tag, block, text)
+end
diff --git a/trunk/package/luci/contrib/luadoc/lua/luadoc/util.lua b/trunk/package/luci/contrib/luadoc/lua/luadoc/util.lua
new file mode 100644
index 00000000..acaaac82
--- /dev/null
+++ b/trunk/package/luci/contrib/luadoc/lua/luadoc/util.lua
@@ -0,0 +1,201 @@
+-------------------------------------------------------------------------------
+-- General utilities.
+-- @release $Id: util.lua,v 1.16 2008/02/17 06:42:51 jasonsantos Exp $
+-------------------------------------------------------------------------------
+
+local posix = require "nixio.fs"
+local type, table, string, io, assert, tostring, setmetatable, pcall = type, table, string, io, assert, tostring, setmetatable, pcall
+
+-------------------------------------------------------------------------------
+-- Module with several utilities that could not fit in a specific module
+
+module "luadoc.util"
+
+-------------------------------------------------------------------------------
+-- Removes spaces from the begining and end of a given string
+-- @param s string to be trimmed
+-- @return trimmed string
+
+function trim (s)
+	return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
+end
+
+-------------------------------------------------------------------------------
+-- Removes spaces from the begining and end of a given string, considering the
+-- string is inside a lua comment.
+-- @param s string to be trimmed
+-- @return trimmed string
+-- @see trim
+-- @see string.gsub
+
+function trim_comment (s)
+	s = string.gsub(s, "%-%-+(.*)$", "%1")
+	return trim(s)
+end
+
+-------------------------------------------------------------------------------
+-- Checks if a given line is empty
+-- @param line string with a line
+-- @return true if line is empty, false otherwise
+
+function line_empty (line)
+	return (string.len(trim(line)) == 0)
+end
+
+-------------------------------------------------------------------------------
+-- Appends two string, but if the first one is nil, use to second one
+-- @param str1 first string, can be nil
+-- @param str2 second string
+-- @return str1 .. " " .. str2, or str2 if str1 is nil
+
+function concat (str1, str2)
+	if str1 == nil or string.len(str1) == 0 then
+		return str2
+	else
+		return str1 .. " " .. str2
+	end
+end
+
+-------------------------------------------------------------------------------
+-- Split text into a list consisting of the strings in text,
+-- separated by strings matching delim (which may be a pattern). 
+-- @param delim if delim is "" then action is the same as %s+ except that 
+-- field 1 may be preceeded by leading whitespace
+-- @usage split(",%s*", "Anna, Bob, Charlie,Dolores")
+-- @usage split(""," x y") gives {"x","y"}
+-- @usage split("%s+"," x y") gives {"", "x","y"}
+-- @return array with strings
+-- @see table.concat
+
+function split(delim, text)
+	local list = {}
+	if string.len(text) > 0 then
+		delim = delim or ""
+		local pos = 1
+		-- if delim matches empty string then it would give an endless loop
+		if string.find("", delim, 1) and delim ~= "" then 
+			error("delim matches empty string!")
+		end
+		local first, last
+		while 1 do
+			if delim ~= "" then 
+				first, last = string.find(text, delim, pos)
+			else
+				first, last = string.find(text, "%s+", pos)
+				if first == 1 then
+					pos = last+1
+					first, last = string.find(text, "%s+", pos)
+				end
+			end
+			if first then -- found?
+				table.insert(list, string.sub(text, pos, first-1))
+				pos = last+1
+			else
+				table.insert(list, string.sub(text, pos))
+				break
+			end
+		end
+	end
+	return list
+end
+
+-------------------------------------------------------------------------------
+-- Comments a paragraph.
+-- @param text text to comment with "--", may contain several lines
+-- @return commented text
+
+function comment (text)
+	text = string.gsub(text, "\n", "\n-- ")
+	return "-- " .. text
+end
+
+-------------------------------------------------------------------------------
+-- Wrap a string into a paragraph.
+-- @param s string to wrap
+-- @param w width to wrap to [80]
+-- @param i1 indent of first line [0]
+-- @param i2 indent of subsequent lines [0]
+-- @return wrapped paragraph
+
+function wrap(s, w, i1, i2)
+	w = w or 80
+	i1 = i1 or 0
+	i2 = i2 or 0
+	assert(i1 < w and i2 < w, "the indents must be less than the line width")
+	s = string.rep(" ", i1) .. s
+	local lstart, len = 1, string.len(s)
+	while len - lstart > w do
+		local i = lstart + w
+		while i > lstart and string.sub(s, i, i) ~= " " do i = i - 1 end
+		local j = i
+		while j > lstart and string.sub(s, j, j) == " " do j = j - 1 end
+		s = string.sub(s, 1, j) .. "\n" .. string.rep(" ", i2) ..
+			string.sub(s, i + 1, -1)
+		local change = i2 + 1 - (i - j)
+		lstart = j + change
+		len = len + change
+	end
+	return s
+end
+
+-------------------------------------------------------------------------------
+-- Opens a file, creating the directories if necessary
+-- @param filename full path of the file to open (or create)
+-- @param mode mode of opening
+-- @return file handle
+
+function posix.open (filename, mode)
+	local f = io.open(filename, mode)
+	if f == nil then
+		filename = string.gsub(filename, "\\", "/")
+		local dir = ""
+		for d in string.gfind(filename, ".-/") do
+			dir = dir .. d
+			posix.mkdir(dir)
+		end
+		f = io.open(filename, mode)
+	end
+	return f
+end
+
+
+----------------------------------------------------------------------------------
+-- Creates a Logger with LuaLogging, if present. Otherwise, creates a mock logger.
+-- @param options a table with options for the logging mechanism
+-- @return logger object that will implement log methods
+
+function loadlogengine(options)
+	local logenabled = pcall(function()
+		require "logging"
+		require "logging.console"
+	end)
+	
+	local logging = logenabled and logging
+	
+	if logenabled then
+		if options.filelog then
+			logger = logging.file("luadoc.log") -- use this to get a file log
+		else
+			logger = logging.console("[%level] %message\n")
+		end
+	
+		if options.verbose then
+			logger:setLevel(logging.INFO)
+		else
+			logger:setLevel(logging.WARN)
+		end
+		
+	else
+		noop = {__index=function(...)
+			return function(...)
+				-- noop
+			end
+		end}
+		
+		logger = {} 
+		setmetatable(logger, noop)
+	end
+	
+	return logger
+end
+
diff --git a/trunk/package/luci/contrib/luasrcdiet/Makefile b/trunk/package/luci/contrib/luasrcdiet/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/contrib/luasrcdiet/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/contrib/luasrcdiet/lua/COPYRIGHT b/trunk/package/luci/contrib/luasrcdiet/lua/COPYRIGHT
new file mode 100644
index 00000000..b91ffa8d
--- /dev/null
+++ b/trunk/package/luci/contrib/luasrcdiet/lua/COPYRIGHT
@@ -0,0 +1,38 @@
+LuaSrcDiet License
+------------------
+
+LuaSrcDiet is licensed under the terms of the MIT license reproduced
+below. This means that LuaSrcDiet is free software and can be used for
+both academic and commercial purposes at absolutely no cost.
+
+Parts of LuaSrcDiet is based on Lua 5 code. See COPYRIGHT_Lua51
+(Lua 5.1.3) for Lua 5 license information.
+
+For details and rationale, see http://www.lua.org/license.html .
+
+===============================================================================
+
+Copyright (C) 2005-2008 Kein-Hong Man <khman@users.sf.net>
+Lua 5.1.3 Copyright (C) 1994-2008 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
+
+(end of COPYRIGHT)
diff --git a/trunk/package/luci/contrib/luasrcdiet/lua/LuaSrcDiet.lua b/trunk/package/luci/contrib/luasrcdiet/lua/LuaSrcDiet.lua
new file mode 100755
index 00000000..d9a41f24
--- /dev/null
+++ b/trunk/package/luci/contrib/luasrcdiet/lua/LuaSrcDiet.lua
@@ -0,0 +1,670 @@
+#!/usr/bin/env lua
+--[[--------------------------------------------------------------------
+
+  LuaSrcDiet
+  Compresses Lua source code by removing unnecessary characters.
+  For Lua 5.1.x source code.
+
+  Copyright (c) 2008 Kein-Hong Man <khman@users.sf.net>
+  The COPYRIGHT file describes the conditions
+  under which this software may be distributed.
+
+  See the ChangeLog for more information.
+
+----------------------------------------------------------------------]]
+
+--[[--------------------------------------------------------------------
+-- NOTES:
+-- * Remember to update version and date information below (MSG_TITLE)
+-- * TODO: to implement pcall() to properly handle lexer etc. errors
+-- * TODO: verify token stream or double-check binary chunk?
+-- * TODO: need some automatic testing for a semblance of sanity
+-- * TODO: the plugin module is highly experimental and unstable
+----------------------------------------------------------------------]]
+
+-- standard libraries, functions
+local string = string
+local math = math
+local table = table
+local require = require
+local print = print
+local sub = string.sub
+local gmatch = string.gmatch
+
+-- support modules
+local llex = require "llex"
+local lparser = require "lparser"
+local optlex = require "optlex"
+local optparser = require "optparser"
+local plugin
+
+--[[--------------------------------------------------------------------
+-- messages and textual data
+----------------------------------------------------------------------]]
+
+local MSG_TITLE = [[
+LuaSrcDiet: Puts your Lua 5.1 source code on a diet
+Version 0.11.2 (20080608)  Copyright (c) 2005-2008 Kein-Hong Man
+The COPYRIGHT file describes the conditions under which this
+software may be distributed.
+]]
+
+local MSG_USAGE = [[
+usage: LuaSrcDiet [options] [filenames]
+
+example:
+  >LuaSrcDiet myscript.lua -o myscript_.lua
+
+options:
+  -v, --version       prints version information
+  -h, --help          prints usage information
+  -o <file>           specify file name to write output
+  -s <suffix>         suffix for output files (default '_')
+  --keep <msg>        keep block comment with <msg> inside
+  --plugin <module>   run <module> in plugin/ directory
+  -                   stop handling arguments
+
+  (optimization levels)
+  --none              all optimizations off (normalizes EOLs only)
+  --basic             lexer-based optimizations only
+  --maximum           maximize reduction of source
+
+  (informational)
+  --quiet             process files quietly
+  --read-only         read file and print token stats only
+  --dump-lexer        dump raw tokens from lexer to stdout
+  --dump-parser       dump variable tracking tables from parser
+  --details           extra info (strings, numbers, locals)
+
+features (to disable, insert 'no' prefix like --noopt-comments):
+%s
+default settings:
+%s]]
+
+------------------------------------------------------------------------
+-- optimization options, for ease of switching on and off
+-- * positive to enable optimization, negative (no) to disable
+-- * these options should follow --opt-* and --noopt-* style for now
+------------------------------------------------------------------------
+
+local OPTION = [[
+--opt-comments,'remove comments and block comments'
+--opt-whitespace,'remove whitespace excluding EOLs'
+--opt-emptylines,'remove empty lines'
+--opt-eols,'all above, plus remove unnecessary EOLs'
+--opt-strings,'optimize strings and long strings'
+--opt-numbers,'optimize numbers'
+--opt-locals,'optimize local variable names'
+--opt-entropy,'tries to reduce symbol entropy of locals'
+]]
+
+-- preset configuration
+local DEFAULT_CONFIG = [[
+  --opt-comments --opt-whitespace --opt-emptylines
+  --opt-numbers --opt-locals
+]]
+-- override configurations: MUST explicitly enable/disable everything
+local BASIC_CONFIG = [[
+  --opt-comments --opt-whitespace --opt-emptylines
+  --noopt-eols --noopt-strings --noopt-numbers
+  --noopt-locals
+]]
+local MAXIMUM_CONFIG = [[
+  --opt-comments --opt-whitespace --opt-emptylines
+  --opt-eols --opt-strings --opt-numbers
+  --opt-locals --opt-entropy
+]]
+local NONE_CONFIG = [[
+  --noopt-comments --noopt-whitespace --noopt-emptylines
+  --noopt-eols --noopt-strings --noopt-numbers
+  --noopt-locals
+]]
+
+local DEFAULT_SUFFIX = "_"      -- default suffix for file renaming
+local PLUGIN_SUFFIX = "plugin/" -- relative location of plugins
+
+--[[--------------------------------------------------------------------
+-- startup and initialize option list handling
+----------------------------------------------------------------------]]
+
+-- simple error message handler; change to error if traceback wanted
+local function die(msg)
+  print("LuaSrcDiet: "..msg); os.exit()
+end
+--die = error--DEBUG
+
+if not string.match(_VERSION, "5.1", 1, 1) then  -- sanity check
+  die("requires Lua 5.1 to run")
+end
+
+------------------------------------------------------------------------
+-- prepares text for list of optimizations, prepare lookup table
+------------------------------------------------------------------------
+
+local MSG_OPTIONS = ""
+do
+  local WIDTH = 24
+  local o = {}
+  for op, desc in gmatch(OPTION, "%s*([^,]+),'([^']+)'") do
+    local msg = "  "..op
+    msg = msg..string.rep(" ", WIDTH - #msg)..desc.."\n"
+    MSG_OPTIONS = MSG_OPTIONS..msg
+    o[op] = true
+    o["--no"..sub(op, 3)] = true
+  end
+  OPTION = o  -- replace OPTION with lookup table
+end
+
+MSG_USAGE = string.format(MSG_USAGE, MSG_OPTIONS, DEFAULT_CONFIG)
+
+------------------------------------------------------------------------
+-- global variable initialization, option set handling
+------------------------------------------------------------------------
+
+local suffix = DEFAULT_SUFFIX           -- file suffix
+local option = {}                       -- program options
+local stat_c, stat_l                    -- statistics tables
+
+-- function to set option lookup table based on a text list of options
+-- note: additional forced settings for --opt-eols is done in optlex.lua
+local function set_options(CONFIG)
+  for op in gmatch(CONFIG, "(%-%-%S+)") do
+    if sub(op, 3, 4) == "no" and        -- handle negative options
+       OPTION["--"..sub(op, 5)] then
+      option[sub(op, 5)] = false
+    else
+      option[sub(op, 3)] = true
+    end
+  end
+end
+
+--[[--------------------------------------------------------------------
+-- support functions
+----------------------------------------------------------------------]]
+
+-- list of token types, parser-significant types are up to TTYPE_GRAMMAR
+-- while the rest are not used by parsers; arranged for stats display
+local TTYPES = {
+  "TK_KEYWORD", "TK_NAME", "TK_NUMBER",         -- grammar
+  "TK_STRING", "TK_LSTRING", "TK_OP",
+  "TK_EOS",
+  "TK_COMMENT", "TK_LCOMMENT",                  -- non-grammar
+  "TK_EOL", "TK_SPACE",
+}
+local TTYPE_GRAMMAR = 7
+
+local EOLTYPES = {                      -- EOL names for token dump
+  ["\n"] = "LF", ["\r"] = "CR",
+  ["\n\r"] = "LFCR", ["\r\n"] = "CRLF",
+}
+
+------------------------------------------------------------------------
+-- read source code from file
+------------------------------------------------------------------------
+
+local function load_file(fname)
+  local INF = io.open(fname, "rb")
+  if not INF then die("cannot open \""..fname.."\" for reading") end
+  local dat = INF:read("*a")
+  if not dat then die("cannot read from \""..fname.."\"") end
+  INF:close()
+  return dat
+end
+
+------------------------------------------------------------------------
+-- save source code to file
+------------------------------------------------------------------------
+
+local function save_file(fname, dat)
+  local OUTF = io.open(fname, "wb")
+  if not OUTF then die("cannot open \""..fname.."\" for writing") end
+  local status = OUTF:write(dat)
+  if not status then die("cannot write to \""..fname.."\"") end
+  OUTF:close()
+end
+
+------------------------------------------------------------------------
+-- functions to deal with statistics
+------------------------------------------------------------------------
+
+-- initialize statistics table
+local function stat_init()
+  stat_c, stat_l = {}, {}
+  for i = 1, #TTYPES do
+    local ttype = TTYPES[i]
+    stat_c[ttype], stat_l[ttype] = 0, 0
+  end
+end
+
+-- add a token to statistics table
+local function stat_add(tok, seminfo)
+  stat_c[tok] = stat_c[tok] + 1
+  stat_l[tok] = stat_l[tok] + #seminfo
+end
+
+-- do totals for statistics table, return average table
+local function stat_calc()
+  local function avg(c, l)                      -- safe average function
+    if c == 0 then return 0 end
+    return l / c
+  end
+  local stat_a = {}
+  local c, l = 0, 0
+  for i = 1, TTYPE_GRAMMAR do                   -- total grammar tokens
+    local ttype = TTYPES[i]
+    c = c + stat_c[ttype]; l = l + stat_l[ttype]
+  end
+  stat_c.TOTAL_TOK, stat_l.TOTAL_TOK = c, l
+  stat_a.TOTAL_TOK = avg(c, l)
+  c, l = 0, 0
+  for i = 1, #TTYPES do                         -- total all tokens
+    local ttype = TTYPES[i]
+    c = c + stat_c[ttype]; l = l + stat_l[ttype]
+    stat_a[ttype] = avg(stat_c[ttype], stat_l[ttype])
+  end
+  stat_c.TOTAL_ALL, stat_l.TOTAL_ALL = c, l
+  stat_a.TOTAL_ALL = avg(c, l)
+  return stat_a
+end
+
+--[[--------------------------------------------------------------------
+-- main tasks
+----------------------------------------------------------------------]]
+
+------------------------------------------------------------------------
+-- a simple token dumper, minimal translation of seminfo data
+------------------------------------------------------------------------
+
+local function dump_tokens(srcfl)
+  --------------------------------------------------------------------
+  -- load file and process source input into tokens
+  --------------------------------------------------------------------
+  local z = load_file(srcfl)
+  llex.init(z)
+  llex.llex()
+  local toklist, seminfolist = llex.tok, llex.seminfo
+  --------------------------------------------------------------------
+  -- display output
+  --------------------------------------------------------------------
+  for i = 1, #toklist do
+    local tok, seminfo = toklist[i], seminfolist[i]
+    if tok == "TK_OP" and string.byte(seminfo) < 32 then
+      seminfo = "(".. string.byte(seminfo)..")"
+    elseif tok == "TK_EOL" then
+      seminfo = EOLTYPES[seminfo]
+    else
+      seminfo = "'"..seminfo.."'"
+    end
+    print(tok.." "..seminfo)
+  end--for
+end
+
+----------------------------------------------------------------------
+-- parser dump; dump globalinfo and localinfo tables
+----------------------------------------------------------------------
+
+local function dump_parser(srcfl)
+  local print = print
+  --------------------------------------------------------------------
+  -- load file and process source input into tokens
+  --------------------------------------------------------------------
+  local z = load_file(srcfl)
+  llex.init(z)
+  llex.llex()
+  local toklist, seminfolist, toklnlist
+    = llex.tok, llex.seminfo, llex.tokln
+  --------------------------------------------------------------------
+  -- do parser optimization here
+  --------------------------------------------------------------------
+  lparser.init(toklist, seminfolist, toklnlist)
+  local globalinfo, localinfo = lparser.parser()
+  --------------------------------------------------------------------
+  -- display output
+  --------------------------------------------------------------------
+  local hl = string.rep("-", 72)
+  print("*** Local/Global Variable Tracker Tables ***")
+  print(hl.."\n GLOBALS\n"..hl)
+  -- global tables have a list of xref numbers only
+  for i = 1, #globalinfo do
+    local obj = globalinfo[i]
+    local msg = "("..i..") '"..obj.name.."' -> "
+    local xref = obj.xref
+    for j = 1, #xref do msg = msg..xref[j].." " end
+    print(msg)
+  end
+  -- local tables have xref numbers and a few other special
+  -- numbers that are specially named: decl (declaration xref),
+  -- act (activation xref), rem (removal xref)
+  print(hl.."\n LOCALS (decl=declared act=activated rem=removed)\n"..hl)
+  for i = 1, #localinfo do
+    local obj = localinfo[i]
+    local msg = "("..i..") '"..obj.name.."' decl:"..obj.decl..
+                " act:"..obj.act.." rem:"..obj.rem
+    if obj.isself then
+      msg = msg.." isself"
+    end
+    msg = msg.." -> "
+    local xref = obj.xref
+    for j = 1, #xref do msg = msg..xref[j].." " end
+    print(msg)
+  end
+  print(hl.."\n")
+end
+
+------------------------------------------------------------------------
+-- reads source file(s) and reports some statistics
+------------------------------------------------------------------------
+
+local function read_only(srcfl)
+  local print = print
+  --------------------------------------------------------------------
+  -- load file and process source input into tokens
+  --------------------------------------------------------------------
+  local z = load_file(srcfl)
+  llex.init(z)
+  llex.llex()
+  local toklist, seminfolist = llex.tok, llex.seminfo
+  print(MSG_TITLE)
+  print("Statistics for: "..srcfl.."\n")
+  --------------------------------------------------------------------
+  -- collect statistics
+  --------------------------------------------------------------------
+  stat_init()
+  for i = 1, #toklist do
+    local tok, seminfo = toklist[i], seminfolist[i]
+    stat_add(tok, seminfo)
+  end--for
+  local stat_a = stat_calc()
+  --------------------------------------------------------------------
+  -- display output
+  --------------------------------------------------------------------
+  local fmt = string.format
+  local function figures(tt)
+    return stat_c[tt], stat_l[tt], stat_a[tt]
+  end
+  local tabf1, tabf2 = "%-16s%8s%8s%10s", "%-16s%8d%8d%10.2f"
+  local hl = string.rep("-", 42)
+  print(fmt(tabf1, "Lexical",  "Input", "Input", "Input"))
+  print(fmt(tabf1, "Elements", "Count", "Bytes", "Average"))
+  print(hl)
+  for i = 1, #TTYPES do
+    local ttype = TTYPES[i]
+    print(fmt(tabf2, ttype, figures(ttype)))
+    if ttype == "TK_EOS" then print(hl) end
+  end
+  print(hl)
+  print(fmt(tabf2, "Total Elements", figures("TOTAL_ALL")))
+  print(hl)
+  print(fmt(tabf2, "Total Tokens", figures("TOTAL_TOK")))
+  print(hl.."\n")
+end
+
+------------------------------------------------------------------------
+-- process source file(s), write output and reports some statistics
+------------------------------------------------------------------------
+
+local function process_file(srcfl, destfl)
+  local function print(...)             -- handle quiet option
+    if option.QUIET then return end
+    _G.print(...)
+  end
+  if plugin and plugin.init then        -- plugin init
+    option.EXIT = false
+    plugin.init(option, srcfl, destfl)
+    if option.EXIT then return end
+  end
+  print(MSG_TITLE)                      -- title message
+  --------------------------------------------------------------------
+  -- load file and process source input into tokens
+  --------------------------------------------------------------------
+  local z = load_file(srcfl)
+  if plugin and plugin.post_load then   -- plugin post-load
+    z = plugin.post_load(z) or z
+    if option.EXIT then return end
+  end
+  llex.init(z)
+  llex.llex()
+  local toklist, seminfolist, toklnlist
+    = llex.tok, llex.seminfo, llex.tokln
+  if plugin and plugin.post_lex then    -- plugin post-lex
+    plugin.post_lex(toklist, seminfolist, toklnlist)
+    if option.EXIT then return end
+  end
+  --------------------------------------------------------------------
+  -- collect 'before' statistics
+  --------------------------------------------------------------------
+  stat_init()
+  for i = 1, #toklist do
+    local tok, seminfo = toklist[i], seminfolist[i]
+    stat_add(tok, seminfo)
+  end--for
+  local stat1_a = stat_calc()
+  local stat1_c, stat1_l = stat_c, stat_l
+  --------------------------------------------------------------------
+  -- do parser optimization here
+  --------------------------------------------------------------------
+  if option["opt-locals"] then
+    optparser.print = print  -- hack
+    lparser.init(toklist, seminfolist, toklnlist)
+    local globalinfo, localinfo = lparser.parser()
+    if plugin and plugin.post_parse then        -- plugin post-parse
+      plugin.post_parse(globalinfo, localinfo)
+      if option.EXIT then return end
+    end
+    optparser.optimize(option, toklist, seminfolist, globalinfo, localinfo)
+    if plugin and plugin.post_optparse then     -- plugin post-optparse
+      plugin.post_optparse()
+      if option.EXIT then return end
+    end
+  end
+  --------------------------------------------------------------------
+  -- do lexer optimization here, save output file
+  --------------------------------------------------------------------
+  optlex.print = print  -- hack
+  toklist, seminfolist, toklnlist
+    = optlex.optimize(option, toklist, seminfolist, toklnlist)
+  if plugin and plugin.post_optlex then         -- plugin post-optlex
+    plugin.post_optlex(toklist, seminfolist, toklnlist)
+    if option.EXIT then return end
+  end
+  local dat = table.concat(seminfolist)
+  -- depending on options selected, embedded EOLs in long strings and
+  -- long comments may not have been translated to \n, tack a warning
+  if string.find(dat, "\r\n", 1, 1) or
+     string.find(dat, "\n\r", 1, 1) then
+    optlex.warn.mixedeol = true
+  end
+  -- save optimized source stream to output file
+  save_file(destfl, dat)
+  --------------------------------------------------------------------
+  -- collect 'after' statistics
+  --------------------------------------------------------------------
+  stat_init()
+  for i = 1, #toklist do
+    local tok, seminfo = toklist[i], seminfolist[i]
+    stat_add(tok, seminfo)
+  end--for
+  local stat_a = stat_calc()
+  --------------------------------------------------------------------
+  -- display output
+  --------------------------------------------------------------------
+  print("Statistics for: "..srcfl.." -> "..destfl.."\n")
+  local fmt = string.format
+  local function figures(tt)
+    return stat1_c[tt], stat1_l[tt], stat1_a[tt],
+           stat_c[tt],  stat_l[tt],  stat_a[tt]
+  end
+  local tabf1, tabf2 = "%-16s%8s%8s%10s%8s%8s%10s",
+                       "%-16s%8d%8d%10.2f%8d%8d%10.2f"
+  local hl = string.rep("-", 68)
+  print("*** lexer-based optimizations summary ***\n"..hl)
+  print(fmt(tabf1, "Lexical",
+            "Input", "Input", "Input",
+            "Output", "Output", "Output"))
+  print(fmt(tabf1, "Elements",
+            "Count", "Bytes", "Average",
+            "Count", "Bytes", "Average"))
+  print(hl)
+  for i = 1, #TTYPES do
+    local ttype = TTYPES[i]
+    print(fmt(tabf2, ttype, figures(ttype)))
+    if ttype == "TK_EOS" then print(hl) end
+  end
+  print(hl)
+  print(fmt(tabf2, "Total Elements", figures("TOTAL_ALL")))
+  print(hl)
+  print(fmt(tabf2, "Total Tokens", figures("TOTAL_TOK")))
+  print(hl)
+  --------------------------------------------------------------------
+  -- report warning flags from optimizing process
+  --------------------------------------------------------------------
+  if optlex.warn.lstring then
+    print("* WARNING: "..optlex.warn.lstring)
+  elseif optlex.warn.mixedeol then
+    print("* WARNING: ".."output still contains some CRLF or LFCR line endings")
+  end
+  print()
+end
+
+--[[--------------------------------------------------------------------
+-- main functions
+----------------------------------------------------------------------]]
+
+local arg = {...}  -- program arguments
+local fspec = {}
+set_options(DEFAULT_CONFIG)     -- set to default options at beginning
+
+------------------------------------------------------------------------
+-- per-file handling, ship off to tasks
+------------------------------------------------------------------------
+
+local function do_files(fspec)
+  for _, srcfl in ipairs(fspec) do
+    local destfl
+    ------------------------------------------------------------------
+    -- find and replace extension for filenames
+    ------------------------------------------------------------------
+    local extb, exte = string.find(srcfl, "%.[^%.%\\%/]*$")
+    local basename, extension = srcfl, ""
+    if extb and extb > 1 then
+      basename = sub(srcfl, 1, extb - 1)
+      extension = sub(srcfl, extb, exte)
+    end
+    destfl = basename..suffix..extension
+    if #fspec == 1 and option.OUTPUT_FILE then
+      destfl = option.OUTPUT_FILE
+    end
+    if srcfl == destfl then
+      die("output filename identical to input filename")
+    end
+    ------------------------------------------------------------------
+    -- perform requested operations
+    ------------------------------------------------------------------
+    if option.DUMP_LEXER then
+      dump_tokens(srcfl)
+    elseif option.DUMP_PARSER then
+      dump_parser(srcfl)
+    elseif option.READ_ONLY then
+      read_only(srcfl)
+    else
+      process_file(srcfl, destfl)
+    end
+  end--for
+end
+
+------------------------------------------------------------------------
+-- main function (entry point is after this definition)
+------------------------------------------------------------------------
+
+local function main()
+  local argn, i = #arg, 1
+  if argn == 0 then
+    option.HELP = true
+  end
+  --------------------------------------------------------------------
+  -- handle arguments
+  --------------------------------------------------------------------
+  while i <= argn do
+    local o, p = arg[i], arg[i + 1]
+    local dash = string.match(o, "^%-%-?")
+    if dash == "-" then                 -- single-dash options
+      if o == "-h" then
+        option.HELP = true; break
+      elseif o == "-v" then
+        option.VERSION = true; break
+      elseif o == "-s" then
+        if not p then die("-s option needs suffix specification") end
+        suffix = p
+        i = i + 1
+      elseif o == "-o" then
+        if not p then die("-o option needs a file name") end
+        option.OUTPUT_FILE = p
+        i = i + 1
+      elseif o == "-" then
+        break -- ignore rest of args
+      else
+        die("unrecognized option "..o)
+      end
+    elseif dash == "--" then            -- double-dash options
+      if o == "--help" then
+        option.HELP = true; break
+      elseif o == "--version" then
+        option.VERSION = true; break
+      elseif o == "--keep" then
+        if not p then die("--keep option needs a string to match for") end
+        option.KEEP = p
+        i = i + 1
+      elseif o == "--plugin" then
+        if not p then die("--plugin option needs a module name") end
+        if option.PLUGIN then die("only one plugin can be specified") end
+        option.PLUGIN = p
+        plugin = require(PLUGIN_SUFFIX..p)
+        i = i + 1
+      elseif o == "--quiet" then
+        option.QUIET = true
+      elseif o == "--read-only" then
+        option.READ_ONLY = true
+      elseif o == "--basic" then
+        set_options(BASIC_CONFIG)
+      elseif o == "--maximum" then
+        set_options(MAXIMUM_CONFIG)
+      elseif o == "--none" then
+        set_options(NONE_CONFIG)
+      elseif o == "--dump-lexer" then
+        option.DUMP_LEXER = true
+      elseif o == "--dump-parser" then
+        option.DUMP_PARSER = true
+      elseif o == "--details" then
+        option.DETAILS = true
+      elseif OPTION[o] then  -- lookup optimization options
+        set_options(o)
+      else
+        die("unrecognized option "..o)
+      end
+    else
+      fspec[#fspec + 1] = o             -- potential filename
+    end
+    i = i + 1
+  end--while
+  if option.HELP then
+    print(MSG_TITLE..MSG_USAGE); return true
+  elseif option.VERSION then
+    print(MSG_TITLE); return true
+  end
+  if #fspec > 0 then
+    if #fspec > 1 and option.OUTPUT_FILE then
+      die("with -o, only one source file can be specified")
+    end
+    do_files(fspec)
+    return true
+  else
+    die("nothing to do!")
+  end
+end
+
+-- entry point -> main() -> do_files()
+if not main() then
+  die("Please run with option -h or --help for usage information")
+end
+
+-- end of script
diff --git a/trunk/package/luci/contrib/luasrcdiet/lua/llex.lua b/trunk/package/luci/contrib/luasrcdiet/lua/llex.lua
new file mode 100644
index 00000000..a637f304
--- /dev/null
+++ b/trunk/package/luci/contrib/luasrcdiet/lua/llex.lua
@@ -0,0 +1,355 @@
+--[[--------------------------------------------------------------------
+
+  llex.lua: Lua 5.1 lexical analyzer in Lua
+  This file is part of LuaSrcDiet, based on Yueliang material.
+
+  Copyright (c) 2008 Kein-Hong Man <khman@users.sf.net>
+  The COPYRIGHT file describes the conditions
+  under which this software may be distributed.
+
+  See the ChangeLog for more information.
+
+----------------------------------------------------------------------]]
+
+--[[--------------------------------------------------------------------
+-- NOTES:
+-- * This is a version of the native 5.1.x lexer from Yueliang 0.4.0,
+--   with significant modifications to handle LuaSrcDiet's needs:
+--   (1) llex.error is an optional error function handler
+--   (2) seminfo for strings include their delimiters and no
+--       translation operations are performed on them
+-- * ADDED shbang handling has been added to support executable scripts
+-- * NO localized decimal point replacement magic
+-- * NO limit to number of lines
+-- * NO support for compatible long strings (LUA_COMPAT_LSTR)
+-- * Please read technotes.txt for more technical details.
+----------------------------------------------------------------------]]
+
+local base = _G
+local string = require "string"
+module "llex"
+
+local find = string.find
+local match = string.match
+local sub = string.sub
+
+----------------------------------------------------------------------
+-- initialize keyword list, variables
+----------------------------------------------------------------------
+
+local kw = {}
+for v in string.gmatch([[
+and break do else elseif end false for function if in
+local nil not or repeat return then true until while]], "%S+") do
+  kw[v] = true
+end
+
+-- NOTE: see init() for module variables (externally visible):
+--       tok, seminfo, tokln
+
+local z,                -- source stream
+      sourceid,         -- name of source
+      I,                -- position of lexer
+      buff,             -- buffer for strings
+      ln                -- line number
+
+----------------------------------------------------------------------
+-- add information to token listing
+----------------------------------------------------------------------
+
+local function addtoken(token, info)
+  local i = #tok + 1
+  tok[i] = token
+  seminfo[i] = info
+  tokln[i] = ln
+end
+
+----------------------------------------------------------------------
+-- handles line number incrementation and end-of-line characters
+----------------------------------------------------------------------
+
+local function inclinenumber(i, is_tok)
+  local sub = sub
+  local old = sub(z, i, i)
+  i = i + 1  -- skip '\n' or '\r'
+  local c = sub(z, i, i)
+  if (c == "\n" or c == "\r") and (c ~= old) then
+    i = i + 1  -- skip '\n\r' or '\r\n'
+    old = old..c
+  end
+  if is_tok then addtoken("TK_EOL", old) end
+  ln = ln + 1
+  I = i
+  return i
+end
+
+----------------------------------------------------------------------
+-- initialize lexer for given source _z and source name _sourceid
+----------------------------------------------------------------------
+
+function init(_z, _sourceid)
+  z = _z                        -- source
+  sourceid = _sourceid          -- name of source
+  I = 1                         -- lexer's position in source
+  ln = 1                        -- line number
+  tok = {}                      -- lexed token list*
+  seminfo = {}                  -- lexed semantic information list*
+  tokln = {}                    -- line numbers for messages*
+                                -- (*) externally visible thru' module
+  --------------------------------------------------------------------
+  -- initial processing (shbang handling)
+  --------------------------------------------------------------------
+  local p, _, q, r = find(z, "^(#[^\r\n]*)(\r?\n?)")
+  if p then                             -- skip first line
+    I = I + #q
+    addtoken("TK_COMMENT", q)
+    if #r > 0 then inclinenumber(I, true) end
+  end
+end
+
+----------------------------------------------------------------------
+-- returns a chunk name or id, no truncation for long names
+----------------------------------------------------------------------
+
+function chunkid()
+  if sourceid and match(sourceid, "^[=@]") then
+    return sub(sourceid, 2)  -- remove first char
+  end
+  return "[string]"
+end
+
+----------------------------------------------------------------------
+-- formats error message and throws error
+-- * a simplified version, does not report what token was responsible
+----------------------------------------------------------------------
+
+function errorline(s, line)
+  local e = error or base.error
+  e(string.format("%s:%d: %s", chunkid(), line or ln, s))
+end
+local errorline = errorline
+
+------------------------------------------------------------------------
+-- count separators ("=") in a long string delimiter
+------------------------------------------------------------------------
+
+local function skip_sep(i)
+  local sub = sub
+  local s = sub(z, i, i)
+  i = i + 1
+  local count = #match(z, "=*", i)  -- note, take the length
+  i = i + count
+  I = i
+  return (sub(z, i, i) == s) and count or (-count) - 1
+end
+
+----------------------------------------------------------------------
+-- reads a long string or long comment
+----------------------------------------------------------------------
+
+local function read_long_string(is_str, sep)
+  local i = I + 1  -- skip 2nd '['
+  local sub = sub
+  local c = sub(z, i, i)
+  if c == "\r" or c == "\n" then  -- string starts with a newline?
+    i = inclinenumber(i)  -- skip it
+  end
+  local j = i
+  while true do
+    local p, q, r = find(z, "([\r\n%]])", i) -- (long range)
+    if not p then
+      errorline(is_str and "unfinished long string" or
+                "unfinished long comment")
+    end
+    i = p
+    if r == "]" then                    -- delimiter test
+      if skip_sep(i) == sep then
+        buff = sub(z, buff, I)
+        I = I + 1  -- skip 2nd ']'
+        return buff
+      end
+      i = I
+    else                                -- newline
+      buff = buff.."\n"
+      i = inclinenumber(i)
+    end
+  end--while
+end
+
+----------------------------------------------------------------------
+-- reads a string
+----------------------------------------------------------------------
+
+local function read_string(del)
+  local i = I
+  local find = find
+  local sub = sub
+  while true do
+    local p, q, r = find(z, "([\n\r\\\"\'])", i) -- (long range)
+    if p then
+      if r == "\n" or r == "\r" then
+        errorline("unfinished string")
+      end
+      i = p
+      if r == "\\" then                         -- handle escapes
+        i = i + 1
+        r = sub(z, i, i)
+        if r == "" then break end -- (EOZ error)
+        p = find("abfnrtv\n\r", r, 1, true)
+        ------------------------------------------------------
+        if p then                               -- special escapes
+          if p > 7 then
+            i = inclinenumber(i)
+          else
+            i = i + 1
+          end
+        ------------------------------------------------------
+        elseif find(r, "%D") then               -- other non-digits
+          i = i + 1
+        ------------------------------------------------------
+        else                                    -- \xxx sequence
+          local p, q, s = find(z, "^(%d%d?%d?)", i)
+          i = q + 1
+          if s + 1 > 256 then -- UCHAR_MAX
+            errorline("escape sequence too large")
+          end
+        ------------------------------------------------------
+        end--if p
+      else
+        i = i + 1
+        if r == del then                        -- ending delimiter
+          I = i
+          return sub(z, buff, i - 1)            -- return string
+        end
+      end--if r
+    else
+      break -- (error)
+    end--if p
+  end--while
+  errorline("unfinished string")
+end
+
+------------------------------------------------------------------------
+-- main lexer function
+------------------------------------------------------------------------
+
+function llex()
+  local find = find
+  local match = match
+  while true do--outer
+    local i = I
+    -- inner loop allows break to be used to nicely section tests
+    while true do--inner
+      ----------------------------------------------------------------
+      local p, _, r = find(z, "^([_%a][_%w]*)", i)
+      if p then
+        I = i + #r
+        if kw[r] then
+          addtoken("TK_KEYWORD", r)             -- reserved word (keyword)
+        else
+          addtoken("TK_NAME", r)                -- identifier
+        end
+        break -- (continue)
+      end
+      ----------------------------------------------------------------
+      local p, _, r = find(z, "^(%.?)%d", i)
+      if p then                                 -- numeral
+        if r == "." then i = i + 1 end
+        local _, q, r = find(z, "^%d*[%.%d]*([eE]?)", i)
+        i = q + 1
+        if #r == 1 then                         -- optional exponent
+          if match(z, "^[%+%-]", i) then        -- optional sign
+            i = i + 1
+          end
+        end
+        local _, q = find(z, "^[_%w]*", i)
+        I = q + 1
+        local v = sub(z, p, q)                  -- string equivalent
+        if not base.tonumber(v) then            -- handles hex test also
+          errorline("malformed number")
+        end
+        addtoken("TK_NUMBER", v)
+        break -- (continue)
+      end
+      ----------------------------------------------------------------
+      local p, q, r, t = find(z, "^((%s)[ \t\v\f]*)", i)
+      if p then
+        if t == "\n" or t == "\r" then          -- newline
+          inclinenumber(i, true)
+        else
+          I = q + 1                             -- whitespace
+          addtoken("TK_SPACE", r)
+        end
+        break -- (continue)
+      end
+      ----------------------------------------------------------------
+      local r = match(z, "^%p", i)
+      if r then
+        buff = i
+        local p = find("-[\"\'.=<>~", r, 1, true)
+        if p then
+          -- two-level if block for punctuation/symbols
+          --------------------------------------------------------
+          if p <= 2 then
+            if p == 1 then                      -- minus
+              local c = match(z, "^%-%-(%[?)", i)
+              if c then
+                i = i + 2
+                local sep = -1
+                if c == "[" then
+                  sep = skip_sep(i)
+                end
+                if sep >= 0 then                -- long comment
+                  addtoken("TK_LCOMMENT", read_long_string(false, sep))
+                else                            -- short comment
+                  I = find(z, "[\n\r]", i) or (#z + 1)
+                  addtoken("TK_COMMENT", sub(z, buff, I - 1))
+                end
+                break -- (continue)
+              end
+              -- (fall through for "-")
+            else                                -- [ or long string
+              local sep = skip_sep(i)
+              if sep >= 0 then
+                addtoken("TK_LSTRING", read_long_string(true, sep))
+              elseif sep == -1 then
+                addtoken("TK_OP", "[")
+              else
+                errorline("invalid long string delimiter")
+              end
+              break -- (continue)
+            end
+          --------------------------------------------------------
+          elseif p <= 5 then
+            if p < 5 then                       -- strings
+              I = i + 1
+              addtoken("TK_STRING", read_string(r))
+              break -- (continue)
+            end
+            r = match(z, "^%.%.?%.?", i)        -- .|..|... dots
+            -- (fall through)
+          --------------------------------------------------------
+          else                                  -- relational
+            r = match(z, "^%p=?", i)
+            -- (fall through)
+          end
+        end
+        I = i + #r
+        addtoken("TK_OP", r)  -- for other symbols, fall through
+        break -- (continue)
+      end
+      ----------------------------------------------------------------
+      local r = sub(z, i, i)
+      if r ~= "" then
+        I = i + 1
+        addtoken("TK_OP", r)                    -- other single-char tokens
+        break
+      end
+      addtoken("TK_EOS", "")                    -- end of stream,
+      return                                    -- exit here
+      ----------------------------------------------------------------
+    end--while inner
+  end--while outer
+end
+
+return base.getfenv()
diff --git a/trunk/package/luci/contrib/luasrcdiet/lua/lparser.lua b/trunk/package/luci/contrib/luasrcdiet/lua/lparser.lua
new file mode 100644
index 00000000..a1e10e01
--- /dev/null
+++ b/trunk/package/luci/contrib/luasrcdiet/lua/lparser.lua
@@ -0,0 +1,1295 @@
+--[[--------------------------------------------------------------------
+
+  lparser.lua: Lua 5.1 parser in Lua
+  This file is part of LuaSrcDiet, based on Yueliang material.
+
+  Copyright (c) 2008 Kein-Hong Man <khman@users.sf.net>
+  The COPYRIGHT file describes the conditions
+  under which this software may be distributed.
+
+  See the ChangeLog for more information.
+
+----------------------------------------------------------------------]]
+
+--[[--------------------------------------------------------------------
+-- NOTES:
+-- * This is a version of the native 5.1.x parser from Yueliang 0.4.0,
+--   with significant modifications to handle LuaSrcDiet's needs:
+--   (1) needs pre-built token tables instead of a module.method
+--   (2) lparser.error is an optional error handler (from llex)
+--   (3) not full parsing, currently fakes raw/unlexed constants
+--   (4) parser() returns globalinfo, localinfo tables
+-- * Please read technotes.txt for more technical details.
+-- * NO support for 'arg' vararg functions (LUA_COMPAT_VARARG)
+-- * A lot of the parser is unused, but might later be useful for
+--   full-on parsing and analysis for a few measly bytes saved.
+----------------------------------------------------------------------]]
+
+local base = _G
+local string = require "string"
+module "lparser"
+local _G = base.getfenv()
+
+--[[--------------------------------------------------------------------
+-- variable and data structure initialization
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- initialization: main variables
+----------------------------------------------------------------------
+
+local toklist,                  -- grammar-only token tables (token table,
+      seminfolist,              -- semantic information table, line number
+      toklnlist,                -- table, cross-reference table)
+      xreflist,
+      tpos,                     -- token position
+
+      line,                     -- start line # for error messages
+      lastln,                   -- last line # for ambiguous syntax chk
+      tok, seminfo, ln, xref,   -- token, semantic info, line
+      nameref,                  -- proper position of <name> token
+      fs,                       -- current function state
+      top_fs,                   -- top-level function state
+
+      globalinfo,               -- global variable information table
+      globallookup,             -- global variable name lookup table
+      localinfo,                -- local variable information table
+      ilocalinfo,               -- inactive locals (prior to activation)
+      ilocalrefs                -- corresponding references to activate
+
+-- forward references for local functions
+local explist1, expr, block, exp1, body, chunk
+
+----------------------------------------------------------------------
+-- initialization: data structures
+----------------------------------------------------------------------
+
+local gmatch = string.gmatch
+
+local block_follow = {}         -- lookahead check in chunk(), returnstat()
+for v in gmatch("else elseif end until <eof>", "%S+") do
+  block_follow[v] = true
+end
+
+local stat_call = {}            -- lookup for calls in stat()
+for v in gmatch("if while do for repeat function local return break", "%S+") do
+  stat_call[v] = v.."_stat"
+end
+
+local binopr_left = {}          -- binary operators, left priority
+local binopr_right = {}         -- binary operators, right priority
+for op, lt, rt in gmatch([[
+{+ 6 6}{- 6 6}{* 7 7}{/ 7 7}{% 7 7}
+{^ 10 9}{.. 5 4}
+{~= 3 3}{== 3 3}
+{< 3 3}{<= 3 3}{> 3 3}{>= 3 3}
+{and 2 2}{or 1 1}
+]], "{(%S+)%s(%d+)%s(%d+)}") do
+  binopr_left[op] = lt + 0
+  binopr_right[op] = rt + 0
+end
+
+local unopr = { ["not"] = true, ["-"] = true,
+                ["#"] = true, } -- unary operators
+local UNARY_PRIORITY = 8        -- priority for unary operators
+
+--[[--------------------------------------------------------------------
+-- support functions
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- formats error message and throws error (duplicated from llex)
+-- * a simplified version, does not report what token was responsible
+----------------------------------------------------------------------
+
+local function errorline(s, line)
+  local e = error or base.error
+  e(string.format("(source):%d: %s", line or ln, s))
+end
+
+----------------------------------------------------------------------
+-- handles incoming token, semantic information pairs
+-- * NOTE: 'nextt' is named 'next' originally
+----------------------------------------------------------------------
+
+-- reads in next token
+local function nextt()
+  lastln = toklnlist[tpos]
+  tok, seminfo, ln, xref
+    = toklist[tpos], seminfolist[tpos], toklnlist[tpos], xreflist[tpos]
+  tpos = tpos + 1
+end
+
+-- peek at next token (single lookahead for table constructor)
+local function lookahead()
+  return toklist[tpos]
+end
+
+----------------------------------------------------------------------
+-- throws a syntax error, or if token expected is not there
+----------------------------------------------------------------------
+
+local function syntaxerror(msg)
+  local tok = tok
+  if tok ~= "<number>" and tok ~= "<string>" then
+    if tok == "<name>" then tok = seminfo end
+    tok = "'"..tok.."'"
+  end
+  errorline(msg.." near "..tok)
+end
+
+local function error_expected(token)
+  syntaxerror("'"..token.."' expected")
+end
+
+----------------------------------------------------------------------
+-- tests for a token, returns outcome
+-- * return value changed to boolean
+----------------------------------------------------------------------
+
+local function testnext(c)
+  if tok == c then nextt(); return true end
+end
+
+----------------------------------------------------------------------
+-- check for existence of a token, throws error if not found
+----------------------------------------------------------------------
+
+local function check(c)
+  if tok ~= c then error_expected(c) end
+end
+
+----------------------------------------------------------------------
+-- verify existence of a token, then skip it
+----------------------------------------------------------------------
+
+local function checknext(c)
+  check(c); nextt()
+end
+
+----------------------------------------------------------------------
+-- throws error if condition not matched
+----------------------------------------------------------------------
+
+local function check_condition(c, msg)
+  if not c then syntaxerror(msg) end
+end
+
+----------------------------------------------------------------------
+-- verifies token conditions are met or else throw error
+----------------------------------------------------------------------
+
+local function check_match(what, who, where)
+  if not testnext(what) then
+    if where == ln then
+      error_expected(what)
+    else
+      syntaxerror("'"..what.."' expected (to close '"..who.."' at line "..where..")")
+    end
+  end
+end
+
+----------------------------------------------------------------------
+-- expect that token is a name, return the name
+----------------------------------------------------------------------
+
+local function str_checkname()
+  check("<name>")
+  local ts = seminfo
+  nameref = xref
+  nextt()
+  return ts
+end
+
+----------------------------------------------------------------------
+-- adds given string s in string pool, sets e as VK
+----------------------------------------------------------------------
+
+local function codestring(e, s)
+  e.k = "VK"
+end
+
+----------------------------------------------------------------------
+-- consume a name token, adds it to string pool
+----------------------------------------------------------------------
+
+local function checkname(e)
+  codestring(e, str_checkname())
+end
+
+--[[--------------------------------------------------------------------
+-- variable (global|local|upvalue) handling
+-- * to track locals and globals, we can extend Yueliang's minimal
+--   variable management code with little trouble
+-- * entry point is singlevar() for variable lookups
+-- * lookup tables (bl.locallist) are maintained awkwardly in the basic
+--   block data structures, PLUS the function data structure (this is
+--   an inelegant hack, since bl is nil for the top level of a function)
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- register a local variable, create local variable object, set in
+-- to-activate variable list
+-- * used in new_localvarliteral(), parlist(), fornum(), forlist(),
+--   localfunc(), localstat()
+----------------------------------------------------------------------
+
+local function new_localvar(name, special)
+  local bl = fs.bl
+  local locallist
+  -- locate locallist in current block object or function root object
+  if bl then
+    locallist = bl.locallist
+  else
+    locallist = fs.locallist
+  end
+  -- build local variable information object and set localinfo
+  local id = #localinfo + 1
+  localinfo[id] = {             -- new local variable object
+    name = name,                -- local variable name
+    xref = { nameref },         -- xref, first value is declaration
+    decl = nameref,             -- location of declaration, = xref[1]
+  }
+  if special then               -- "self" must be not be changed
+    localinfo[id].isself = true
+  end
+  -- this can override a local with the same name in the same scope
+  -- but first, keep it inactive until it gets activated
+  local i = #ilocalinfo + 1
+  ilocalinfo[i] = id
+  ilocalrefs[i] = locallist
+end
+
+----------------------------------------------------------------------
+-- actually activate the variables so that they are visible
+-- * remember Lua semantics, e.g. RHS is evaluated first, then LHS
+-- * used in parlist(), forbody(), localfunc(), localstat(), body()
+----------------------------------------------------------------------
+
+local function adjustlocalvars(nvars)
+  local sz = #ilocalinfo
+  -- i goes from left to right, in order of local allocation, because
+  -- of something like: local a,a,a = 1,2,3 which gives a = 3
+  while nvars > 0 do
+    nvars = nvars - 1
+    local i = sz - nvars
+    local id = ilocalinfo[i]            -- local's id
+    local obj = localinfo[id]
+    local name = obj.name               -- name of local
+    obj.act = xref                      -- set activation location
+    ilocalinfo[i] = nil
+    local locallist = ilocalrefs[i]     -- ref to lookup table to update
+    ilocalrefs[i] = nil
+    local existing = locallist[name]    -- if existing, remove old first!
+    if existing then                    -- do not overlap, set special
+      obj = localinfo[existing]         -- form of rem, as -id
+      obj.rem = -id
+    end
+    locallist[name] = id                -- activate, now visible to Lua
+  end
+end
+
+----------------------------------------------------------------------
+-- remove (deactivate) variables in current scope (before scope exits)
+-- * zap entire locallist tables since we are not allocating registers
+-- * used in leaveblock(), close_func()
+----------------------------------------------------------------------
+
+local function removevars()
+  local bl = fs.bl
+  local locallist
+  -- locate locallist in current block object or function root object
+  if bl then
+    locallist = bl.locallist
+  else
+    locallist = fs.locallist
+  end
+  -- enumerate the local list at current scope and deactivate 'em
+  for name, id in base.pairs(locallist) do
+    local obj = localinfo[id]
+    obj.rem = xref                      -- set deactivation location
+  end
+end
+
+----------------------------------------------------------------------
+-- creates a new local variable given a name
+-- * skips internal locals (those starting with '('), so internal
+--   locals never needs a corresponding adjustlocalvars() call
+-- * special is true for "self" which must not be optimized
+-- * used in fornum(), forlist(), parlist(), body()
+----------------------------------------------------------------------
+
+local function new_localvarliteral(name, special)
+  if string.sub(name, 1, 1) == "(" then  -- can skip internal locals
+    return
+  end
+  new_localvar(name, special)
+end
+
+----------------------------------------------------------------------
+-- search the local variable namespace of the given fs for a match
+-- * returns localinfo index
+-- * used only in singlevaraux()
+----------------------------------------------------------------------
+
+local function searchvar(fs, n)
+  local bl = fs.bl
+  local locallist
+  if bl then
+    locallist = bl.locallist
+    while locallist do
+      if locallist[n] then return locallist[n] end  -- found
+      bl = bl.prev
+      locallist = bl and bl.locallist
+    end
+  end
+  locallist = fs.locallist
+  return locallist[n] or -1  -- found or not found (-1)
+end
+
+----------------------------------------------------------------------
+-- handle locals, globals and upvalues and related processing
+-- * search mechanism is recursive, calls itself to search parents
+-- * used only in singlevar()
+----------------------------------------------------------------------
+
+local function singlevaraux(fs, n, var)
+  if fs == nil then  -- no more levels?
+    var.k = "VGLOBAL"  -- default is global variable
+    return "VGLOBAL"
+  else
+    local v = searchvar(fs, n)  -- look up at current level
+    if v >= 0 then
+      var.k = "VLOCAL"
+      var.id = v
+      --  codegen may need to deal with upvalue here
+      return "VLOCAL"
+    else  -- not found at current level; try upper one
+      if singlevaraux(fs.prev, n, var) == "VGLOBAL" then
+        return "VGLOBAL"
+      end
+      -- else was LOCAL or UPVAL, handle here
+      var.k = "VUPVAL"  -- upvalue in this level
+      return "VUPVAL"
+    end--if v
+  end--if fs
+end
+
+----------------------------------------------------------------------
+-- consume a name token, creates a variable (global|local|upvalue)
+-- * used in prefixexp(), funcname()
+----------------------------------------------------------------------
+
+local function singlevar(v)
+  local name = str_checkname()
+  singlevaraux(fs, name, v)
+  ------------------------------------------------------------------
+  -- variable tracking
+  ------------------------------------------------------------------
+  if v.k == "VGLOBAL" then
+    -- if global being accessed, keep track of it by creating an object
+    local id = globallookup[name]
+    if not id then
+      id = #globalinfo + 1
+      globalinfo[id] = {                -- new global variable object
+        name = name,                    -- global variable name
+        xref = { nameref },             -- xref, first value is declaration
+      }
+      globallookup[name] = id           -- remember it
+    else
+      local obj = globalinfo[id].xref
+      obj[#obj + 1] = nameref           -- add xref
+    end
+  else
+    -- local/upvalue is being accessed, keep track of it
+    local id = v.id
+    local obj = localinfo[id].xref
+    obj[#obj + 1] = nameref             -- add xref
+  end
+end
+
+--[[--------------------------------------------------------------------
+-- state management functions with open/close pairs
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- enters a code unit, initializes elements
+----------------------------------------------------------------------
+
+local function enterblock(isbreakable)
+  local bl = {}  -- per-block state
+  bl.isbreakable = isbreakable
+  bl.prev = fs.bl
+  bl.locallist = {}
+  fs.bl = bl
+end
+
+----------------------------------------------------------------------
+-- leaves a code unit, close any upvalues
+----------------------------------------------------------------------
+
+local function leaveblock()
+  local bl = fs.bl
+  removevars()
+  fs.bl = bl.prev
+end
+
+----------------------------------------------------------------------
+-- opening of a function
+-- * top_fs is only for anchoring the top fs, so that parser() can
+--   return it to the caller function along with useful output
+-- * used in parser() and body()
+----------------------------------------------------------------------
+
+local function open_func()
+  local new_fs  -- per-function state
+  if not fs then  -- top_fs is created early
+    new_fs = top_fs
+  else
+    new_fs = {}
+  end
+  new_fs.prev = fs  -- linked list of function states
+  new_fs.bl = nil
+  new_fs.locallist = {}
+  fs = new_fs
+end
+
+----------------------------------------------------------------------
+-- closing of a function
+-- * used in parser() and body()
+----------------------------------------------------------------------
+
+local function close_func()
+  removevars()
+  fs = fs.prev
+end
+
+--[[--------------------------------------------------------------------
+-- other parsing functions
+-- * for table constructor, parameter list, argument list
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- parse a function name suffix, for function call specifications
+-- * used in primaryexp(), funcname()
+----------------------------------------------------------------------
+
+local function field(v)
+  -- field -> ['.' | ':'] NAME
+  local key = {}
+  nextt()  -- skip the dot or colon
+  checkname(key)
+  v.k = "VINDEXED"
+end
+
+----------------------------------------------------------------------
+-- parse a table indexing suffix, for constructors, expressions
+-- * used in recfield(), primaryexp()
+----------------------------------------------------------------------
+
+local function yindex(v)
+  -- index -> '[' expr ']'
+  nextt()  -- skip the '['
+  expr(v)
+  checknext("]")
+end
+
+----------------------------------------------------------------------
+-- parse a table record (hash) field
+-- * used in constructor()
+----------------------------------------------------------------------
+
+local function recfield(cc)
+  -- recfield -> (NAME | '['exp1']') = exp1
+  local key, val = {}, {}
+  if tok == "<name>" then
+    checkname(key)
+  else-- tok == '['
+    yindex(key)
+  end
+  checknext("=")
+  expr(val)
+end
+
+----------------------------------------------------------------------
+-- emit a set list instruction if enough elements (LFIELDS_PER_FLUSH)
+-- * note: retained in this skeleton because it modifies cc.v.k
+-- * used in constructor()
+----------------------------------------------------------------------
+
+local function closelistfield(cc)
+  if cc.v.k == "VVOID" then return end  -- there is no list item
+  cc.v.k = "VVOID"
+end
+
+----------------------------------------------------------------------
+-- parse a table list (array) field
+-- * used in constructor()
+----------------------------------------------------------------------
+
+local function listfield(cc)
+  expr(cc.v)
+end
+
+----------------------------------------------------------------------
+-- parse a table constructor
+-- * used in funcargs(), simpleexp()
+----------------------------------------------------------------------
+
+local function constructor(t)
+  -- constructor -> '{' [ field { fieldsep field } [ fieldsep ] ] '}'
+  -- field -> recfield | listfield
+  -- fieldsep -> ',' | ';'
+  local line = ln
+  local cc = {}
+  cc.v = {}
+  cc.t = t
+  t.k = "VRELOCABLE"
+  cc.v.k = "VVOID"
+  checknext("{")
+  repeat
+    if tok == "}" then break end
+    -- closelistfield(cc) here
+    local c = tok
+    if c == "<name>" then  -- may be listfields or recfields
+      if lookahead() ~= "=" then  -- look ahead: expression?
+        listfield(cc)
+      else
+        recfield(cc)
+      end
+    elseif c == "[" then  -- constructor_item -> recfield
+      recfield(cc)
+    else  -- constructor_part -> listfield
+      listfield(cc)
+    end
+  until not testnext(",") and not testnext(";")
+  check_match("}", "{", line)
+  -- lastlistfield(cc) here
+end
+
+----------------------------------------------------------------------
+-- parse the arguments (parameters) of a function declaration
+-- * used in body()
+----------------------------------------------------------------------
+
+local function parlist()
+  -- parlist -> [ param { ',' param } ]
+  local nparams = 0
+  if tok ~= ")" then  -- is 'parlist' not empty?
+    repeat
+      local c = tok
+      if c == "<name>" then  -- param -> NAME
+        new_localvar(str_checkname())
+        nparams = nparams + 1
+      elseif c == "..." then
+        nextt()
+        fs.is_vararg = true
+      else
+        syntaxerror("<name> or '...' expected")
+      end
+    until fs.is_vararg or not testnext(",")
+  end--if
+  adjustlocalvars(nparams)
+end
+
+----------------------------------------------------------------------
+-- parse the parameters of a function call
+-- * contrast with parlist(), used in function declarations
+-- * used in primaryexp()
+----------------------------------------------------------------------
+
+local function funcargs(f)
+  local args = {}
+  local line = ln
+  local c = tok
+  if c == "(" then  -- funcargs -> '(' [ explist1 ] ')'
+    if line ~= lastln then
+      syntaxerror("ambiguous syntax (function call x new statement)")
+    end
+    nextt()
+    if tok == ")" then  -- arg list is empty?
+      args.k = "VVOID"
+    else
+      explist1(args)
+    end
+    check_match(")", "(", line)
+  elseif c == "{" then  -- funcargs -> constructor
+    constructor(args)
+  elseif c == "<string>" then  -- funcargs -> STRING
+    codestring(args, seminfo)
+    nextt()  -- must use 'seminfo' before 'next'
+  else
+    syntaxerror("function arguments expected")
+    return
+  end--if c
+  f.k = "VCALL"
+end
+
+--[[--------------------------------------------------------------------
+-- mostly expression functions
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- parses an expression in parentheses or a single variable
+-- * used in primaryexp()
+----------------------------------------------------------------------
+
+local function prefixexp(v)
+  -- prefixexp -> NAME | '(' expr ')'
+  local c = tok
+  if c == "(" then
+    local line = ln
+    nextt()
+    expr(v)
+    check_match(")", "(", line)
+  elseif c == "<name>" then
+    singlevar(v)
+  else
+    syntaxerror("unexpected symbol")
+  end--if c
+end
+
+----------------------------------------------------------------------
+-- parses a prefixexp (an expression in parentheses or a single
+-- variable) or a function call specification
+-- * used in simpleexp(), assignment(), expr_stat()
+----------------------------------------------------------------------
+
+local function primaryexp(v)
+  -- primaryexp ->
+  --    prefixexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs }
+  prefixexp(v)
+  while true do
+    local c = tok
+    if c == "." then  -- field
+      field(v)
+    elseif c == "[" then  -- '[' exp1 ']'
+      local key = {}
+      yindex(key)
+    elseif c == ":" then  -- ':' NAME funcargs
+      local key = {}
+      nextt()
+      checkname(key)
+      funcargs(v)
+    elseif c == "(" or c == "<string>" or c == "{" then  -- funcargs
+      funcargs(v)
+    else
+      return
+    end--if c
+  end--while
+end
+
+----------------------------------------------------------------------
+-- parses general expression types, constants handled here
+-- * used in subexpr()
+----------------------------------------------------------------------
+
+local function simpleexp(v)
+  -- simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... |
+  --              constructor | FUNCTION body | primaryexp
+  local c = tok
+  if c == "<number>" then
+    v.k = "VKNUM"
+  elseif c == "<string>" then
+    codestring(v, seminfo)
+  elseif c == "nil" then
+    v.k = "VNIL"
+  elseif c == "true" then
+    v.k = "VTRUE"
+  elseif c == "false" then
+    v.k = "VFALSE"
+  elseif c == "..." then  -- vararg
+    check_condition(fs.is_vararg == true,
+                    "cannot use '...' outside a vararg function");
+    v.k = "VVARARG"
+  elseif c == "{" then  -- constructor
+    constructor(v)
+    return
+  elseif c == "function" then
+    nextt()
+    body(v, false, ln)
+    return
+  else
+    primaryexp(v)
+    return
+  end--if c
+  nextt()
+end
+
+------------------------------------------------------------------------
+-- Parse subexpressions. Includes handling of unary operators and binary
+-- operators. A subexpr is given the rhs priority level of the operator
+-- immediately left of it, if any (limit is -1 if none,) and if a binop
+-- is found, limit is compared with the lhs priority level of the binop
+-- in order to determine which executes first.
+-- * recursively called
+-- * used in expr()
+------------------------------------------------------------------------
+
+local function subexpr(v, limit)
+  -- subexpr -> (simpleexp | unop subexpr) { binop subexpr }
+  --   * where 'binop' is any binary operator with a priority
+  --     higher than 'limit'
+  local op = tok
+  local uop = unopr[op]
+  if uop then
+    nextt()
+    subexpr(v, UNARY_PRIORITY)
+  else
+    simpleexp(v)
+  end
+  -- expand while operators have priorities higher than 'limit'
+  op = tok
+  local binop = binopr_left[op]
+  while binop and binop > limit do
+    local v2 = {}
+    nextt()
+    -- read sub-expression with higher priority
+    local nextop = subexpr(v2, binopr_right[op])
+    op = nextop
+    binop = binopr_left[op]
+  end
+  return op  -- return first untreated operator
+end
+
+----------------------------------------------------------------------
+-- Expression parsing starts here. Function subexpr is entered with the
+-- left operator (which is non-existent) priority of -1, which is lower
+-- than all actual operators. Expr information is returned in parm v.
+-- * used in cond(), explist1(), index(), recfield(), listfield(),
+--   prefixexp(), while_stat(), exp1()
+----------------------------------------------------------------------
+
+-- this is a forward-referenced local
+function expr(v)
+  -- expr -> subexpr
+  subexpr(v, 0)
+end
+
+--[[--------------------------------------------------------------------
+-- third level parsing functions
+----------------------------------------------------------------------]]
+
+------------------------------------------------------------------------
+-- parse a variable assignment sequence
+-- * recursively called
+-- * used in expr_stat()
+------------------------------------------------------------------------
+
+local function assignment(v)
+  local e = {}
+  local c = v.v.k
+  check_condition(c == "VLOCAL" or c == "VUPVAL" or c == "VGLOBAL"
+                  or c == "VINDEXED", "syntax error")
+  if testnext(",") then  -- assignment -> ',' primaryexp assignment
+    local nv = {}  -- expdesc
+    nv.v = {}
+    primaryexp(nv.v)
+    -- lparser.c deals with some register usage conflict here
+    assignment(nv)
+  else  -- assignment -> '=' explist1
+    checknext("=")
+    explist1(e)
+    return  -- avoid default
+  end
+  e.k = "VNONRELOC"
+end
+
+----------------------------------------------------------------------
+-- parse a for loop body for both versions of the for loop
+-- * used in fornum(), forlist()
+----------------------------------------------------------------------
+
+local function forbody(nvars, isnum)
+  -- forbody -> DO block
+  checknext("do")
+  enterblock(false)  -- scope for declared variables
+  adjustlocalvars(nvars)
+  block()
+  leaveblock()  -- end of scope for declared variables
+end
+
+----------------------------------------------------------------------
+-- parse a numerical for loop, calls forbody()
+-- * used in for_stat()
+----------------------------------------------------------------------
+
+local function fornum(varname)
+  -- fornum -> NAME = exp1, exp1 [, exp1] DO body
+  local line = line
+  new_localvarliteral("(for index)")
+  new_localvarliteral("(for limit)")
+  new_localvarliteral("(for step)")
+  new_localvar(varname)
+  checknext("=")
+  exp1()  -- initial value
+  checknext(",")
+  exp1()  -- limit
+  if testnext(",") then
+    exp1()  -- optional step
+  else
+    -- default step = 1
+  end
+  forbody(1, true)
+end
+
+----------------------------------------------------------------------
+-- parse a generic for loop, calls forbody()
+-- * used in for_stat()
+----------------------------------------------------------------------
+
+local function forlist(indexname)
+  -- forlist -> NAME {, NAME} IN explist1 DO body
+  local e = {}
+  -- create control variables
+  new_localvarliteral("(for generator)")
+  new_localvarliteral("(for state)")
+  new_localvarliteral("(for control)")
+  -- create declared variables
+  new_localvar(indexname)
+  local nvars = 1
+  while testnext(",") do
+    new_localvar(str_checkname())
+    nvars = nvars + 1
+  end
+  checknext("in")
+  local line = line
+  explist1(e)
+  forbody(nvars, false)
+end
+
+----------------------------------------------------------------------
+-- parse a function name specification
+-- * used in func_stat()
+----------------------------------------------------------------------
+
+local function funcname(v)
+  -- funcname -> NAME {field} [':' NAME]
+  local needself = false
+  singlevar(v)
+  while tok == "." do
+    field(v)
+  end
+  if tok == ":" then
+    needself = true
+    field(v)
+  end
+  return needself
+end
+
+----------------------------------------------------------------------
+-- parse the single expressions needed in numerical for loops
+-- * used in fornum()
+----------------------------------------------------------------------
+
+-- this is a forward-referenced local
+function exp1()
+  -- exp1 -> expr
+  local e = {}
+  expr(e)
+end
+
+----------------------------------------------------------------------
+-- parse condition in a repeat statement or an if control structure
+-- * used in repeat_stat(), test_then_block()
+----------------------------------------------------------------------
+
+local function cond()
+  -- cond -> expr
+  local v = {}
+  expr(v)  -- read condition
+end
+
+----------------------------------------------------------------------
+-- parse part of an if control structure, including the condition
+-- * used in if_stat()
+----------------------------------------------------------------------
+
+local function test_then_block()
+  -- test_then_block -> [IF | ELSEIF] cond THEN block
+  nextt()  -- skip IF or ELSEIF
+  cond()
+  checknext("then")
+  block()  -- 'then' part
+end
+
+----------------------------------------------------------------------
+-- parse a local function statement
+-- * used in local_stat()
+----------------------------------------------------------------------
+
+local function localfunc()
+  -- localfunc -> NAME body
+  local v, b = {}
+  new_localvar(str_checkname())
+  v.k = "VLOCAL"
+  adjustlocalvars(1)
+  body(b, false, ln)
+end
+
+----------------------------------------------------------------------
+-- parse a local variable declaration statement
+-- * used in local_stat()
+----------------------------------------------------------------------
+
+local function localstat()
+  -- localstat -> NAME {',' NAME} ['=' explist1]
+  local nvars = 0
+  local e = {}
+  repeat
+    new_localvar(str_checkname())
+    nvars = nvars + 1
+  until not testnext(",")
+  if testnext("=") then
+    explist1(e)
+  else
+    e.k = "VVOID"
+  end
+  adjustlocalvars(nvars)
+end
+
+----------------------------------------------------------------------
+-- parse a list of comma-separated expressions
+-- * used in return_stat(), localstat(), funcargs(), assignment(),
+--   forlist()
+----------------------------------------------------------------------
+
+-- this is a forward-referenced local
+function explist1(e)
+  -- explist1 -> expr { ',' expr }
+  expr(e)
+  while testnext(",") do
+    expr(e)
+  end
+end
+
+----------------------------------------------------------------------
+-- parse function declaration body
+-- * used in simpleexp(), localfunc(), func_stat()
+----------------------------------------------------------------------
+
+-- this is a forward-referenced local
+function body(e, needself, line)
+  -- body ->  '(' parlist ')' chunk END
+  open_func()
+  checknext("(")
+  if needself then
+    new_localvarliteral("self", true)
+    adjustlocalvars(1)
+  end
+  parlist()
+  checknext(")")
+  chunk()
+  check_match("end", "function", line)
+  close_func()
+end
+
+----------------------------------------------------------------------
+-- parse a code block or unit
+-- * used in do_stat(), while_stat(), forbody(), test_then_block(),
+--   if_stat()
+----------------------------------------------------------------------
+
+-- this is a forward-referenced local
+function block()
+  -- block -> chunk
+  enterblock(false)
+  chunk()
+  leaveblock()
+end
+
+--[[--------------------------------------------------------------------
+-- second level parsing functions, all with '_stat' suffix
+-- * since they are called via a table lookup, they cannot be local
+--   functions (a lookup table of local functions might be smaller...)
+-- * stat() -> *_stat()
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- initial parsing for a for loop, calls fornum() or forlist()
+-- * removed 'line' parameter (used to set debug information only)
+-- * used in stat()
+----------------------------------------------------------------------
+
+function for_stat()
+  -- stat -> for_stat -> FOR (fornum | forlist) END
+  local line = line
+  enterblock(true)  -- scope for loop and control variables
+  nextt()  -- skip 'for'
+  local varname = str_checkname()  -- first variable name
+  local c = tok
+  if c == "=" then
+    fornum(varname)
+  elseif c == "," or c == "in" then
+    forlist(varname)
+  else
+    syntaxerror("'=' or 'in' expected")
+  end
+  check_match("end", "for", line)
+  leaveblock()  -- loop scope (`break' jumps to this point)
+end
+
+----------------------------------------------------------------------
+-- parse a while-do control structure, body processed by block()
+-- * used in stat()
+----------------------------------------------------------------------
+
+function while_stat()
+  -- stat -> while_stat -> WHILE cond DO block END
+  local line = line
+  nextt()  -- skip WHILE
+  cond()  -- parse condition
+  enterblock(true)
+  checknext("do")
+  block()
+  check_match("end", "while", line)
+  leaveblock()
+end
+
+----------------------------------------------------------------------
+-- parse a repeat-until control structure, body parsed by chunk()
+-- * originally, repeatstat() calls breakstat() too if there is an
+--   upvalue in the scope block; nothing is actually lexed, it is
+--   actually the common code in breakstat() for closing of upvalues
+-- * used in stat()
+----------------------------------------------------------------------
+
+function repeat_stat()
+  -- stat -> repeat_stat -> REPEAT block UNTIL cond
+  local line = line
+  enterblock(true)  -- loop block
+  enterblock(false)  -- scope block
+  nextt()  -- skip REPEAT
+  chunk()
+  check_match("until", "repeat", line)
+  cond()
+  -- close upvalues at scope level below
+  leaveblock()  -- finish scope
+  leaveblock()  -- finish loop
+end
+
+----------------------------------------------------------------------
+-- parse an if control structure
+-- * used in stat()
+----------------------------------------------------------------------
+
+function if_stat()
+  -- stat -> if_stat -> IF cond THEN block
+  --                    {ELSEIF cond THEN block} [ELSE block] END
+  local line = line
+  local v = {}
+  test_then_block()  -- IF cond THEN block
+  while tok == "elseif" do
+    test_then_block()  -- ELSEIF cond THEN block
+  end
+  if tok == "else" then
+    nextt()  -- skip ELSE
+    block()  -- 'else' part
+  end
+  check_match("end", "if", line)
+end
+
+----------------------------------------------------------------------
+-- parse a return statement
+-- * used in stat()
+----------------------------------------------------------------------
+
+function return_stat()
+  -- stat -> return_stat -> RETURN explist
+  local e = {}
+  nextt()  -- skip RETURN
+  local c = tok
+  if block_follow[c] or c == ";" then
+    -- return no values
+  else
+    explist1(e)  -- optional return values
+  end
+end
+
+----------------------------------------------------------------------
+-- parse a break statement
+-- * used in stat()
+----------------------------------------------------------------------
+
+function break_stat()
+  -- stat -> break_stat -> BREAK
+  local bl = fs.bl
+  nextt()  -- skip BREAK
+  while bl and not bl.isbreakable do -- find a breakable block
+    bl = bl.prev
+  end
+  if not bl then
+    syntaxerror("no loop to break")
+  end
+end
+
+----------------------------------------------------------------------
+-- parse a function call with no returns or an assignment statement
+-- * the struct with .prev is used for name searching in lparse.c,
+--   so it is retained for now; present in assignment() also
+-- * used in stat()
+----------------------------------------------------------------------
+
+function expr_stat()
+  -- stat -> expr_stat -> func | assignment
+  local v = {}
+  v.v = {}
+  primaryexp(v.v)
+  if v.v.k == "VCALL" then  -- stat -> func
+    -- call statement uses no results
+  else  -- stat -> assignment
+    v.prev = nil
+    assignment(v)
+  end
+end
+
+----------------------------------------------------------------------
+-- parse a function statement
+-- * used in stat()
+----------------------------------------------------------------------
+
+function function_stat()
+  -- stat -> function_stat -> FUNCTION funcname body
+  local line = line
+  local v, b = {}, {}
+  nextt()  -- skip FUNCTION
+  local needself = funcname(v)
+  body(b, needself, line)
+end
+
+----------------------------------------------------------------------
+-- parse a simple block enclosed by a DO..END pair
+-- * used in stat()
+----------------------------------------------------------------------
+
+function do_stat()
+  -- stat -> do_stat -> DO block END
+  local line = line
+  nextt()  -- skip DO
+  block()
+  check_match("end", "do", line)
+end
+
+----------------------------------------------------------------------
+-- parse a statement starting with LOCAL
+-- * used in stat()
+----------------------------------------------------------------------
+
+function local_stat()
+  -- stat -> local_stat -> LOCAL FUNCTION localfunc
+  --                    -> LOCAL localstat
+  nextt()  -- skip LOCAL
+  if testnext("function") then  -- local function?
+    localfunc()
+  else
+    localstat()
+  end
+end
+
+--[[--------------------------------------------------------------------
+-- main functions, top level parsing functions
+-- * accessible functions are: init(lexer), parser()
+-- * [entry] -> parser() -> chunk() -> stat()
+----------------------------------------------------------------------]]
+
+----------------------------------------------------------------------
+-- initial parsing for statements, calls '_stat' suffixed functions
+-- * used in chunk()
+----------------------------------------------------------------------
+
+local function stat()
+  -- stat -> if_stat while_stat do_stat for_stat repeat_stat
+  --         function_stat local_stat return_stat break_stat
+  --         expr_stat
+  line = ln  -- may be needed for error messages
+  local c = tok
+  local fn = stat_call[c]
+  -- handles: if while do for repeat function local return break
+  if fn then
+    _G[fn]()
+    -- return or break must be last statement
+    if c == "return" or c == "break" then return true end
+  else
+    expr_stat()
+  end
+  return false
+end
+
+----------------------------------------------------------------------
+-- parse a chunk, which consists of a bunch of statements
+-- * used in parser(), body(), block(), repeat_stat()
+----------------------------------------------------------------------
+
+-- this is a forward-referenced local
+function chunk()
+  -- chunk -> { stat [';'] }
+  local islast = false
+  while not islast and not block_follow[tok] do
+    islast = stat()
+    testnext(";")
+  end
+end
+
+----------------------------------------------------------------------
+-- performs parsing, returns parsed data structure
+----------------------------------------------------------------------
+
+function parser()
+  open_func()
+  fs.is_vararg = true  -- main func. is always vararg
+  nextt()  -- read first token
+  chunk()
+  check("<eof>")
+  close_func()
+  return globalinfo, localinfo
+end
+
+----------------------------------------------------------------------
+-- initialization function
+----------------------------------------------------------------------
+
+function init(tokorig, seminfoorig, toklnorig)
+  tpos = 1                      -- token position
+  top_fs = {}                   -- reset top level function state
+  ------------------------------------------------------------------
+  -- set up grammar-only token tables; impedance-matching...
+  -- note that constants returned by the lexer is source-level, so
+  -- for now, fake(!) constant tokens (TK_NUMBER|TK_STRING|TK_LSTRING)
+  ------------------------------------------------------------------
+  local j = 1
+  toklist, seminfolist, toklnlist, xreflist = {}, {}, {}, {}
+  for i = 1, #tokorig do
+    local tok = tokorig[i]
+    local yep = true
+    if tok == "TK_KEYWORD" or tok == "TK_OP" then
+      tok = seminfoorig[i]
+    elseif tok == "TK_NAME" then
+      tok = "<name>"
+      seminfolist[j] = seminfoorig[i]
+    elseif tok == "TK_NUMBER" then
+      tok = "<number>"
+      seminfolist[j] = 0  -- fake!
+    elseif tok == "TK_STRING" or tok == "TK_LSTRING" then
+      tok = "<string>"
+      seminfolist[j] = ""  -- fake!
+    elseif tok == "TK_EOS" then
+      tok = "<eof>"
+    else
+      -- non-grammar tokens; ignore them
+      yep = false
+    end
+    if yep then  -- set rest of the information
+      toklist[j] = tok
+      toklnlist[j] = toklnorig[i]
+      xreflist[j] = i
+      j = j + 1
+    end
+  end--for
+  ------------------------------------------------------------------
+  -- initialize data structures for variable tracking
+  ------------------------------------------------------------------
+  globalinfo, globallookup, localinfo = {}, {}, {}
+  ilocalinfo, ilocalrefs = {}, {}
+end
+
+return _G
diff --git a/trunk/package/luci/contrib/luasrcdiet/lua/optlex.lua b/trunk/package/luci/contrib/luasrcdiet/lua/optlex.lua
new file mode 100644
index 00000000..4c46b918
--- /dev/null
+++ b/trunk/package/luci/contrib/luasrcdiet/lua/optlex.lua
@@ -0,0 +1,832 @@
+--[[--------------------------------------------------------------------
+
+  optlex.lua: does lexer-based optimizations
+  This file is part of LuaSrcDiet.
+
+  Copyright (c) 2008 Kein-Hong Man <khman@users.sf.net>
+  The COPYRIGHT file describes the conditions
+  under which this software may be distributed.
+
+  See the ChangeLog for more information.
+
+----------------------------------------------------------------------]]
+
+--[[--------------------------------------------------------------------
+-- NOTES:
+-- * For more lexer-based optimization ideas, see the TODO items or
+--   look at technotes.txt.
+-- * TODO: general string delimiter conversion optimizer
+-- * TODO: (numbers) warn if overly significant digit
+----------------------------------------------------------------------]]
+
+local base = _G
+local string = require "string"
+module "optlex"
+local match = string.match
+local sub = string.sub
+local find = string.find
+local rep = string.rep
+local print
+
+------------------------------------------------------------------------
+-- variables and data structures
+------------------------------------------------------------------------
+
+-- error function, can override by setting own function into module
+error = base.error
+
+warn = {}                       -- table for warning flags
+
+local stoks, sinfos, stoklns    -- source lists
+
+local is_realtoken = {          -- significant (grammar) tokens
+  TK_KEYWORD = true,
+  TK_NAME = true,
+  TK_NUMBER = true,
+  TK_STRING = true,
+  TK_LSTRING = true,
+  TK_OP = true,
+  TK_EOS = true,
+}
+local is_faketoken = {          -- whitespace (non-grammar) tokens
+  TK_COMMENT = true,
+  TK_LCOMMENT = true,
+  TK_EOL = true,
+  TK_SPACE = true,
+}
+
+local opt_details               -- for extra information
+
+------------------------------------------------------------------------
+-- true if current token is at the start of a line
+-- * skips over deleted tokens via recursion
+------------------------------------------------------------------------
+
+local function atlinestart(i)
+  local tok = stoks[i - 1]
+  if i <= 1 or tok == "TK_EOL" then
+    return true
+  elseif tok == "" then
+    return atlinestart(i - 1)
+  end
+  return false
+end
+
+------------------------------------------------------------------------
+-- true if current token is at the end of a line
+-- * skips over deleted tokens via recursion
+------------------------------------------------------------------------
+
+local function atlineend(i)
+  local tok = stoks[i + 1]
+  if i >= #stoks or tok == "TK_EOL" or tok == "TK_EOS" then
+    return true
+  elseif tok == "" then
+    return atlineend(i + 1)
+  end
+  return false
+end
+
+------------------------------------------------------------------------
+-- counts comment EOLs inside a long comment
+-- * in order to keep line numbering, EOLs need to be reinserted
+------------------------------------------------------------------------
+
+local function commenteols(lcomment)
+  local sep = #match(lcomment, "^%-%-%[=*%[")
+  local z = sub(lcomment, sep + 1, -(sep - 1))  -- remove delims
+  local i, c = 1, 0
+  while true do
+    local p, q, r, s = find(z, "([\r\n])([\r\n]?)", i)
+    if not p then break end     -- if no matches, done
+    i = p + 1
+    c = c + 1
+    if #s > 0 and r ~= s then   -- skip CRLF or LFCR
+      i = i + 1
+    end
+  end
+  return c
+end
+
+------------------------------------------------------------------------
+-- compares two tokens (i, j) and returns the whitespace required
+-- * important! see technotes.txt for more information
+-- * only two grammar/real tokens are being considered
+-- * if "", no separation is needed
+-- * if " ", then at least one whitespace (or EOL) is required
+------------------------------------------------------------------------
+
+local function checkpair(i, j)
+  local match = match
+  local t1, t2 = stoks[i], stoks[j]
+  --------------------------------------------------------------------
+  if t1 == "TK_STRING" or t1 == "TK_LSTRING" or
+     t2 == "TK_STRING" or t2 == "TK_LSTRING" then
+    return ""
+  --------------------------------------------------------------------
+  elseif t1 == "TK_OP" or t2 == "TK_OP" then
+    if (t1 == "TK_OP" and (t2 == "TK_KEYWORD" or t2 == "TK_NAME")) or
+       (t2 == "TK_OP" and (t1 == "TK_KEYWORD" or t1 == "TK_NAME")) then
+      return ""
+    end
+    if t1 == "TK_OP" and t2 == "TK_OP" then
+      -- for TK_OP/TK_OP pairs, see notes in technotes.txt
+      local op, op2 = sinfos[i], sinfos[j]
+      if (match(op, "^%.%.?$") and match(op2, "^%.")) or
+         (match(op, "^[~=<>]$") and op2 == "=") or
+         (op == "[" and (op2 == "[" or op2 == "=")) then
+        return " "
+      end
+      return ""
+    end
+    -- "TK_OP" + "TK_NUMBER" case
+    local op = sinfos[i]
+    if t2 == "TK_OP" then op = sinfos[j] end
+    if match(op, "^%.%.?%.?$") then
+      return " "
+    end
+    return ""
+  --------------------------------------------------------------------
+  else-- "TK_KEYWORD" | "TK_NAME" | "TK_NUMBER" then
+    return " "
+  --------------------------------------------------------------------
+  end
+end
+
+------------------------------------------------------------------------
+-- repack tokens, removing deletions caused by optimization process
+------------------------------------------------------------------------
+
+local function repack_tokens()
+  local dtoks, dinfos, dtoklns = {}, {}, {}
+  local j = 1
+  for i = 1, #stoks do
+    local tok = stoks[i]
+    if tok ~= "" then
+      dtoks[j], dinfos[j], dtoklns[j] = tok, sinfos[i], stoklns[i]
+      j = j + 1
+    end
+  end
+  stoks, sinfos, stoklns = dtoks, dinfos, dtoklns
+end
+
+------------------------------------------------------------------------
+-- number optimization
+-- * optimization using string formatting functions is one way of doing
+--   this, but here, we consider all cases and handle them separately
+--   (possibly an idiotic approach...)
+-- * scientific notation being generated is not in canonical form, this
+--   may or may not be a bad thing, feedback welcome
+-- * note: intermediate portions need to fit into a normal number range
+-- * optimizations can be divided based on number patterns:
+-- * hexadecimal:
+--   (1) no need to remove leading zeros, just skip to (2)
+--   (2) convert to integer if size equal or smaller
+--       * change if equal size -> lose the 'x' to reduce entropy
+--   (3) number is then processed as an integer
+--   (4) note: does not make 0[xX] consistent
+-- * integer:
+--   (1) note: includes anything with trailing ".", ".0", ...
+--   (2) remove useless fractional part, if present, e.g. 123.000
+--   (3) remove leading zeros, e.g. 000123
+--   (4) switch to scientific if shorter, e.g. 123000 -> 123e3
+-- * with fraction:
+--   (1) split into digits dot digits
+--   (2) if no integer portion, take as zero (can omit later)
+--   (3) handle degenerate .000 case, after which the fractional part
+--       must be non-zero (if zero, it's matched as an integer)
+--   (4) remove trailing zeros for fractional portion
+--   (5) p.q where p > 0 and q > 0 cannot be shortened any more
+--   (6) otherwise p == 0 and the form is .q, e.g. .000123
+--   (7) if scientific shorter, convert, e.g. .000123 -> 123e-6
+-- * scientific:
+--   (1) split into (digits dot digits) [eE] ([+-] digits)
+--   (2) if significand has ".", shift it out so it becomes an integer
+--   (3) if significand is zero, just use zero
+--   (4) remove leading zeros for significand
+--   (5) shift out trailing zeros for significand
+--   (6) examine exponent and determine which format is best:
+--       integer, with fraction, scientific
+------------------------------------------------------------------------
+
+local function do_number(i)
+  local before = sinfos[i]      -- 'before'
+  local z = before              -- working representation
+  local y                       -- 'after', if better
+  --------------------------------------------------------------------
+  if match(z, "^0[xX]") then            -- hexadecimal number
+    local v = base.tostring(base.tonumber(z))
+    if #v <= #z then
+      z = v  -- change to integer, AND continue
+    else
+      return  -- no change; stick to hex
+    end
+  end
+  --------------------------------------------------------------------
+  if match(z, "^%d+%.?0*$") then        -- integer or has useless frac
+    z = match(z, "^(%d+)%.?0*$")  -- int portion only
+    if z + 0 > 0 then
+      z = match(z, "^0*([1-9]%d*)$")  -- remove leading zeros
+      local v = #match(z, "0*$")
+      local nv = base.tostring(v)
+      if v > #nv + 1 then  -- scientific is shorter
+        z = sub(z, 1, #z - v).."e"..nv
+      end
+      y = z
+    else
+      y = "0"  -- basic zero
+    end
+  --------------------------------------------------------------------
+  elseif not match(z, "[eE]") then      -- number with fraction part
+    local p, q = match(z, "^(%d*)%.(%d+)$")  -- split
+    if p == "" then p = 0 end  -- int part zero
+    if q + 0 == 0 and p == 0 then
+      y = "0"  -- degenerate .000 case
+    else
+      -- now, q > 0 holds and p is a number
+      local v = #match(q, "0*$")  -- remove trailing zeros
+      if v > 0 then
+        q = sub(q, 1, #q - v)
+      end
+      -- if p > 0, nothing else we can do to simplify p.q case
+      if p + 0 > 0 then
+        y = p.."."..q
+      else
+        y = "."..q  -- tentative, e.g. .000123
+        local v = #match(q, "^0*")  -- # leading spaces
+        local w = #q - v            -- # significant digits
+        local nv = base.tostring(#q)
+        -- e.g. compare 123e-6 versus .000123
+        if w + 2 + #nv < 1 + #q then
+          y = sub(q, -w).."e-"..nv
+        end
+      end
+    end
+  --------------------------------------------------------------------
+  else                                  -- scientific number
+    local sig, ex = match(z, "^([^eE]+)[eE]([%+%-]?%d+)$")
+    ex = base.tonumber(ex)
+    -- if got ".", shift out fractional portion of significand
+    local p, q = match(sig, "^(%d*)%.(%d*)$")
+    if p then
+      ex = ex - #q
+      sig = p..q
+    end
+    if sig + 0 == 0 then
+      y = "0"  -- basic zero
+    else
+      local v = #match(sig, "^0*")  -- remove leading zeros
+      sig = sub(sig, v + 1)
+      v = #match(sig, "0*$") -- shift out trailing zeros
+      if v > 0 then
+        sig = sub(sig, 1, #sig - v)
+        ex = ex + v
+      end
+      -- examine exponent and determine which format is best
+      local nex = base.tostring(ex)
+      if ex == 0 then  -- it's just an integer
+        y = sig
+      elseif ex > 0 and (ex <= 1 + #nex) then  -- a number
+        y = sig..rep("0", ex)
+      elseif ex < 0 and (ex >= -#sig) then  -- fraction, e.g. .123
+        v = #sig + ex
+        y = sub(sig, 1, v).."."..sub(sig, v + 1)
+      elseif ex < 0 and (#nex >= -ex - #sig) then
+        -- e.g. compare 1234e-5 versus .01234
+        -- gives: #sig + 1 + #nex >= 1 + (-ex - #sig) + #sig
+        --     -> #nex >= -ex - #sig
+        v = -ex - #sig
+        y = "."..rep("0", v)..sig
+      else  -- non-canonical scientific representation
+        y = sig.."e"..ex
+      end
+    end--if sig
+  end
+  --------------------------------------------------------------------
+  if y and y ~= sinfos[i] then
+    if opt_details then
+      print("<number> (line "..stoklns[i]..") "..sinfos[i].." -> "..y)
+      opt_details = opt_details + 1
+    end
+    sinfos[i] = y
+  end
+end
+
+------------------------------------------------------------------------
+-- string optimization
+-- * note: works on well-formed strings only!
+-- * optimizations on characters can be summarized as follows:
+--   \a\b\f\n\r\t\v -- no change
+--   \\ -- no change
+--   \"\' -- depends on delim, other can remove \
+--   \[\] -- remove \
+--   \<char> -- general escape, remove \
+--   \<eol> -- normalize the EOL only
+--   \ddd -- if \a\b\f\n\r\t\v, change to latter
+--           if other < ascii 32, keep ddd but zap leading zeros
+--           if >= ascii 32, translate it into the literal, then also
+--                           do escapes for \\,\",\' cases
+--   <other> -- no change
+-- * switch delimiters if string becomes shorter
+------------------------------------------------------------------------
+
+local function do_string(I)
+  local info = sinfos[I]
+  local delim = sub(info, 1, 1)                 -- delimiter used
+  local ndelim = (delim == "'") and '"' or "'"  -- opposite " <-> '
+  local z = sub(info, 2, -2)                    -- actual string
+  local i = 1
+  local c_delim, c_ndelim = 0, 0                -- "/' counts
+  --------------------------------------------------------------------
+  while i <= #z do
+    local c = sub(z, i, i)
+    ----------------------------------------------------------------
+    if c == "\\" then                   -- escaped stuff
+      local j = i + 1
+      local d = sub(z, j, j)
+      local p = find("abfnrtv\\\n\r\"\'0123456789", d, 1, true)
+      ------------------------------------------------------------
+      if not p then                     -- \<char> -- remove \
+        z = sub(z, 1, i - 1)..sub(z, j)
+        i = i + 1
+      ------------------------------------------------------------
+      elseif p <= 8 then                -- \a\b\f\n\r\t\v\\
+        i = i + 2                       -- no change
+      ------------------------------------------------------------
+      elseif p <= 10 then               -- \<eol> -- normalize EOL
+        local eol = sub(z, j, j + 1)
+        if eol == "\r\n" or eol == "\n\r" then
+          z = sub(z, 1, i).."\n"..sub(z, j + 2)
+        elseif p == 10 then  -- \r case
+          z = sub(z, 1, i).."\n"..sub(z, j + 1)
+        end
+        i = i + 2
+      ------------------------------------------------------------
+      elseif p <= 12 then               -- \"\' -- remove \ for ndelim
+        if d == delim then
+          c_delim = c_delim + 1
+          i = i + 2
+        else
+          c_ndelim = c_ndelim + 1
+          z = sub(z, 1, i - 1)..sub(z, j)
+          i = i + 1
+        end
+      ------------------------------------------------------------
+      else                              -- \ddd -- various steps
+        local s = match(z, "^(%d%d?%d?)", j)
+        j = i + 1 + #s                  -- skip to location
+        local cv = s + 0
+        local cc = string.char(cv)
+        local p = find("\a\b\f\n\r\t\v", cc, 1, true)
+        if p then                       -- special escapes
+          s = "\\"..sub("abfnrtv", p, p)
+        elseif cv < 32 then             -- normalized \ddd
+          s = "\\"..cv
+        elseif cc == delim then         -- \<delim>
+          s = "\\"..cc
+          c_delim = c_delim + 1
+        elseif cc == "\\" then          -- \\
+          s = "\\\\"
+        else                            -- literal character
+          s = cc
+          if cc == ndelim then
+            c_ndelim = c_ndelim + 1
+          end
+        end
+        z = sub(z, 1, i - 1)..s..sub(z, j)
+        i = i + #s
+      ------------------------------------------------------------
+      end--if p
+    ----------------------------------------------------------------
+    else-- c ~= "\\"                    -- <other> -- no change
+      i = i + 1
+      if c == ndelim then  -- count ndelim, for switching delimiters
+        c_ndelim = c_ndelim + 1
+      end
+    ----------------------------------------------------------------
+    end--if c
+  end--while
+  --------------------------------------------------------------------
+  -- switching delimiters, a long-winded derivation:
+  -- (1) delim takes 2+2*c_delim bytes, ndelim takes c_ndelim bytes
+  -- (2) delim becomes c_delim bytes, ndelim becomes 2+2*c_ndelim bytes
+  -- simplifying the condition (1)>(2) --> c_delim > c_ndelim
+  if c_delim > c_ndelim then
+    i = 1
+    while i <= #z do
+      local p, q, r = find(z, "([\'\"])", i)
+      if not p then break end
+      if r == delim then                -- \<delim> -> <delim>
+        z = sub(z, 1, p - 2)..sub(z, p)
+        i = p
+      else-- r == ndelim                -- <ndelim> -> \<ndelim>
+        z = sub(z, 1, p - 1).."\\"..sub(z, p)
+        i = p + 2
+      end
+    end--while
+    delim = ndelim  -- actually change delimiters
+  end
+  --------------------------------------------------------------------
+  z = delim..z..delim
+  if z ~= sinfos[I] then
+    if opt_details then
+      print("<string> (line "..stoklns[I]..") "..sinfos[I].." -> "..z)
+      opt_details = opt_details + 1
+    end
+    sinfos[I] = z
+  end
+end
+
+------------------------------------------------------------------------
+-- long string optimization
+-- * note: warning flagged if trailing whitespace found, not trimmed
+-- * remove first optional newline
+-- * normalize embedded newlines
+-- * reduce '=' separators in delimiters if possible
+------------------------------------------------------------------------
+
+local function do_lstring(I)
+  local info = sinfos[I]
+  local delim1 = match(info, "^%[=*%[")  -- cut out delimiters
+  local sep = #delim1
+  local delim2 = sub(info, -sep, -1)
+  local z = sub(info, sep + 1, -(sep + 1))  -- lstring without delims
+  local y = ""
+  local i = 1
+  --------------------------------------------------------------------
+  while true do
+    local p, q, r, s = find(z, "([\r\n])([\r\n]?)", i)
+    -- deal with a single line
+    local ln
+    if not p then
+      ln = sub(z, i)
+    elseif p >= i then
+      ln = sub(z, i, p - 1)
+    end
+    if ln ~= "" then
+      -- flag a warning if there are trailing spaces, won't optimize!
+      if match(ln, "%s+$") then
+        warn.lstring = "trailing whitespace in long string near line "..stoklns[I]
+      end
+      y = y..ln
+    end
+    if not p then  -- done if no more EOLs
+      break
+    end
+    -- deal with line endings, normalize them
+    i = p + 1
+    if p then
+      if #s > 0 and r ~= s then  -- skip CRLF or LFCR
+        i = i + 1
+      end
+      -- skip first newline, which can be safely deleted
+      if not(i == 1 and i == p) then
+        y = y.."\n"
+      end
+    end
+  end--while
+  --------------------------------------------------------------------
+  -- handle possible deletion of one or more '=' separators
+  if sep >= 3 then
+    local chk, okay = sep - 1
+    -- loop to test ending delimiter with less of '=' down to zero
+    while chk >= 2 do
+      local delim = "%]"..rep("=", chk - 2).."%]"
+      if not match(y, delim) then okay = chk end
+      chk = chk - 1
+    end
+    if okay then  -- change delimiters
+      sep = rep("=", okay - 2)
+      delim1, delim2 = "["..sep.."[", "]"..sep.."]"
+    end
+  end
+  --------------------------------------------------------------------
+  sinfos[I] = delim1..y..delim2
+end
+
+------------------------------------------------------------------------
+-- long comment optimization
+-- * note: does not remove first optional newline
+-- * trim trailing whitespace
+-- * normalize embedded newlines
+-- * reduce '=' separators in delimiters if possible
+------------------------------------------------------------------------
+
+local function do_lcomment(I)
+  local info = sinfos[I]
+  local delim1 = match(info, "^%-%-%[=*%[")  -- cut out delimiters
+  local sep = #delim1
+  local delim2 = sub(info, -sep, -1)
+  local z = sub(info, sep + 1, -(sep - 1))  -- comment without delims
+  local y = ""
+  local i = 1
+  --------------------------------------------------------------------
+  while true do
+    local p, q, r, s = find(z, "([\r\n])([\r\n]?)", i)
+    -- deal with a single line, extract and check trailing whitespace
+    local ln
+    if not p then
+      ln = sub(z, i)
+    elseif p >= i then
+      ln = sub(z, i, p - 1)
+    end
+    if ln ~= "" then
+      -- trim trailing whitespace if non-empty line
+      local ws = match(ln, "%s*$")
+      if #ws > 0 then ln = sub(ln, 1, -(ws + 1)) end
+      y = y..ln
+    end
+    if not p then  -- done if no more EOLs
+      break
+    end
+    -- deal with line endings, normalize them
+    i = p + 1
+    if p then
+      if #s > 0 and r ~= s then  -- skip CRLF or LFCR
+        i = i + 1
+      end
+      y = y.."\n"
+    end
+  end--while
+  --------------------------------------------------------------------
+  -- handle possible deletion of one or more '=' separators
+  sep = sep - 2
+  if sep >= 3 then
+    local chk, okay = sep - 1
+    -- loop to test ending delimiter with less of '=' down to zero
+    while chk >= 2 do
+      local delim = "%]"..rep("=", chk - 2).."%]"
+      if not match(y, delim) then okay = chk end
+      chk = chk - 1
+    end
+    if okay then  -- change delimiters
+      sep = rep("=", okay - 2)
+      delim1, delim2 = "--["..sep.."[", "]"..sep.."]"
+    end
+  end
+  --------------------------------------------------------------------
+  sinfos[I] = delim1..y..delim2
+end
+
+------------------------------------------------------------------------
+-- short comment optimization
+-- * trim trailing whitespace
+------------------------------------------------------------------------
+
+local function do_comment(i)
+  local info = sinfos[i]
+  local ws = match(info, "%s*$")        -- just look from end of string
+  if #ws > 0 then
+    info = sub(info, 1, -(ws + 1))      -- trim trailing whitespace
+  end
+  sinfos[i] = info
+end
+
+------------------------------------------------------------------------
+-- returns true if string found in long comment
+-- * this is a feature to keep copyright or license texts
+------------------------------------------------------------------------
+
+local function keep_lcomment(opt_keep, info)
+  if not opt_keep then return false end  -- option not set
+  local delim1 = match(info, "^%-%-%[=*%[")  -- cut out delimiters
+  local sep = #delim1
+  local delim2 = sub(info, -sep, -1)
+  local z = sub(info, sep + 1, -(sep - 1))  -- comment without delims
+  if find(z, opt_keep, 1, true) then  -- try to match
+    return true
+  end
+end
+
+------------------------------------------------------------------------
+-- main entry point
+-- * currently, lexer processing has 2 passes
+-- * processing is done on a line-oriented basis, which is easier to
+--   grok due to the next point...
+-- * since there are various options that can be enabled or disabled,
+--   processing is a little messy or convoluted
+------------------------------------------------------------------------
+
+function optimize(option, toklist, semlist, toklnlist)
+  --------------------------------------------------------------------
+  -- set option flags
+  --------------------------------------------------------------------
+  local opt_comments = option["opt-comments"]
+  local opt_whitespace = option["opt-whitespace"]
+  local opt_emptylines = option["opt-emptylines"]
+  local opt_eols = option["opt-eols"]
+  local opt_strings = option["opt-strings"]
+  local opt_numbers = option["opt-numbers"]
+  local opt_keep = option.KEEP
+  opt_details = option.DETAILS and 0  -- upvalues for details display
+  print = print or base.print
+  if opt_eols then  -- forced settings, otherwise won't work properly
+    opt_comments = true
+    opt_whitespace = true
+    opt_emptylines = true
+  end
+  --------------------------------------------------------------------
+  -- variable initialization
+  --------------------------------------------------------------------
+  stoks, sinfos, stoklns                -- set source lists
+    = toklist, semlist, toklnlist
+  local i = 1                           -- token position
+  local tok, info                       -- current token
+  local prev    -- position of last grammar token
+                -- on same line (for TK_SPACE stuff)
+  --------------------------------------------------------------------
+  -- changes a token, info pair
+  --------------------------------------------------------------------
+  local function settoken(tok, info, I)
+    I = I or i
+    stoks[I] = tok or ""
+    sinfos[I] = info or ""
+  end
+  --------------------------------------------------------------------
+  -- processing loop (PASS 1)
+  --------------------------------------------------------------------
+  while true do
+    tok, info = stoks[i], sinfos[i]
+    ----------------------------------------------------------------
+    local atstart = atlinestart(i)      -- set line begin flag
+    if atstart then prev = nil end
+    ----------------------------------------------------------------
+    if tok == "TK_EOS" then             -- end of stream/pass
+      break
+    ----------------------------------------------------------------
+    elseif tok == "TK_KEYWORD" or       -- keywords, identifiers,
+           tok == "TK_NAME" or          -- operators
+           tok == "TK_OP" then
+      -- TK_KEYWORD and TK_OP can't be optimized without a big
+      -- optimization framework; it would be more of an optimizing
+      -- compiler, not a source code compressor
+      -- TK_NAME that are locals needs parser to analyze/optimize
+      prev = i
+    ----------------------------------------------------------------
+    elseif tok == "TK_NUMBER" then      -- numbers
+      if opt_numbers then
+        do_number(i)  -- optimize
+      end
+      prev = i
+    ----------------------------------------------------------------
+    elseif tok == "TK_STRING" or        -- strings, long strings
+           tok == "TK_LSTRING" then
+      if opt_strings then
+        if tok == "TK_STRING" then
+          do_string(i)  -- optimize
+        else
+          do_lstring(i)  -- optimize
+        end
+      end
+      prev = i
+    ----------------------------------------------------------------
+    elseif tok == "TK_COMMENT" then     -- short comments
+      if opt_comments then
+        if i == 1 and sub(info, 1, 1) == "#" then
+          -- keep shbang comment, trim whitespace
+          do_comment(i)
+        else
+          -- safe to delete, as a TK_EOL (or TK_EOS) always follows
+          settoken()  -- remove entirely
+        end
+      elseif opt_whitespace then        -- trim whitespace only
+        do_comment(i)
+      end
+    ----------------------------------------------------------------
+    elseif tok == "TK_LCOMMENT" then    -- long comments
+      if keep_lcomment(opt_keep, info) then
+        ------------------------------------------------------------
+        -- if --keep, we keep a long comment if <msg> is found;
+        -- this is a feature to keep copyright or license texts
+        if opt_whitespace then          -- trim whitespace only
+          do_lcomment(i)
+        end
+        prev = i
+      elseif opt_comments then
+        local eols = commenteols(info)
+        ------------------------------------------------------------
+        -- prepare opt_emptylines case first, if a disposable token
+        -- follows, current one is safe to dump, else keep a space;
+        -- it is implied that the operation is safe for '-', because
+        -- current is a TK_LCOMMENT, and must be separate from a '-'
+        if is_faketoken[stoks[i + 1]] then
+          settoken()  -- remove entirely
+          tok = ""
+        else
+          settoken("TK_SPACE", " ")
+        end
+        ------------------------------------------------------------
+        -- if there are embedded EOLs to keep and opt_emptylines is
+        -- disabled, then switch the token into one or more EOLs
+        if not opt_emptylines and eols > 0 then
+          settoken("TK_EOL", rep("\n", eols))
+        end
+        ------------------------------------------------------------
+        -- if optimizing whitespaces, force reinterpretation of the
+        -- token to give a chance for the space to be optimized away
+        if opt_whitespace and tok ~= "" then
+          i = i - 1  -- to reinterpret
+        end
+        ------------------------------------------------------------
+      else                              -- disabled case
+        if opt_whitespace then          -- trim whitespace only
+          do_lcomment(i)
+        end
+        prev = i
+      end
+    ----------------------------------------------------------------
+    elseif tok == "TK_EOL" then         -- line endings
+      if atstart and opt_emptylines then
+        settoken()  -- remove entirely
+      elseif info == "\r\n" or info == "\n\r" then
+        -- normalize the rest of the EOLs for CRLF/LFCR only
+        -- (note that TK_LCOMMENT can change into several EOLs)
+        settoken("TK_EOL", "\n")
+      end
+    ----------------------------------------------------------------
+    elseif tok == "TK_SPACE" then       -- whitespace
+      if opt_whitespace then
+        if atstart or atlineend(i) then
+          -- delete leading and trailing whitespace
+          settoken()  -- remove entirely
+        else
+          ------------------------------------------------------------
+          -- at this point, since leading whitespace have been removed,
+          -- there should be a either a real token or a TK_LCOMMENT
+          -- prior to hitting this whitespace; the TK_LCOMMENT case
+          -- only happens if opt_comments is disabled; so prev ~= nil
+          local ptok = stoks[prev]
+          if ptok == "TK_LCOMMENT" then
+            -- previous TK_LCOMMENT can abut with anything
+            settoken()  -- remove entirely
+          else
+            -- prev must be a grammar token; consecutive TK_SPACE
+            -- tokens is impossible when optimizing whitespace
+            local ntok = stoks[i + 1]
+            if is_faketoken[ntok] then
+              -- handle special case where a '-' cannot abut with
+              -- either a short comment or a long comment
+              if (ntok == "TK_COMMENT" or ntok == "TK_LCOMMENT") and
+                 ptok == "TK_OP" and sinfos[prev] == "-" then
+                -- keep token
+              else
+                settoken()  -- remove entirely
+              end
+            else--is_realtoken
+              -- check a pair of grammar tokens, if can abut, then
+              -- delete space token entirely, otherwise keep one space
+              local s = checkpair(prev, i + 1)
+              if s == "" then
+                settoken()  -- remove entirely
+              else
+                settoken("TK_SPACE", " ")
+              end
+            end
+          end
+          ------------------------------------------------------------
+        end
+      end
+    ----------------------------------------------------------------
+    else
+      error("unidentified token encountered")
+    end
+    ----------------------------------------------------------------
+    i = i + 1
+  end--while
+  repack_tokens()
+  --------------------------------------------------------------------
+  -- processing loop (PASS 2)
+  --------------------------------------------------------------------
+  if opt_eols then
+    i = 1
+    -- aggressive EOL removal only works with most non-grammar tokens
+    -- optimized away because it is a rather simple scheme -- basically
+    -- it just checks 'real' token pairs around EOLs
+    if stoks[1] == "TK_COMMENT" then
+      -- first comment still existing must be shbang, skip whole line
+      i = 3
+    end
+    while true do
+      tok, info = stoks[i], sinfos[i]
+      --------------------------------------------------------------
+      if tok == "TK_EOS" then           -- end of stream/pass
+        break
+      --------------------------------------------------------------
+      elseif tok == "TK_EOL" then       -- consider each TK_EOL
+        local t1, t2 = stoks[i - 1], stoks[i + 1]
+        if is_realtoken[t1] and is_realtoken[t2] then  -- sanity check
+          local s = checkpair(i - 1, i + 1)
+          if s == "" then
+            settoken()  -- remove entirely
+          end
+        end
+      end--if tok
+      --------------------------------------------------------------
+      i = i + 1
+    end--while
+    repack_tokens()
+  end
+  --------------------------------------------------------------------
+  if opt_details and opt_details > 0 then print() end -- spacing
+  return stoks, sinfos, stoklns
+end
diff --git a/trunk/package/luci/contrib/luasrcdiet/lua/optparser.lua b/trunk/package/luci/contrib/luasrcdiet/lua/optparser.lua
new file mode 100644
index 00000000..cfe6cc10
--- /dev/null
+++ b/trunk/package/luci/contrib/luasrcdiet/lua/optparser.lua
@@ -0,0 +1,564 @@
+--[[--------------------------------------------------------------------
+
+  optparser.lua: does parser-based optimizations
+  This file is part of LuaSrcDiet.
+
+  Copyright (c) 2008 Kein-Hong Man <khman@users.sf.net>
+  The COPYRIGHT file describes the conditions
+  under which this software may be distributed.
+
+  See the ChangeLog for more information.
+
+----------------------------------------------------------------------]]
+
+--[[--------------------------------------------------------------------
+-- NOTES:
+-- * For more parser-based optimization ideas, see the TODO items or
+--   look at technotes.txt.
+-- * The processing load is quite significant, but since this is an
+--   off-line text processor, I believe we can wait a few seconds.
+-- * TODO: might process "local a,a,a" wrongly... need tests!
+-- * TODO: remove position handling if overlapped locals (rem < 0)
+--   needs more study, to check behaviour
+-- * TODO: there are probably better ways to do allocation, e.g. by
+--   choosing better methods to sort and pick locals...
+-- * TODO: we don't need 53*63 two-letter identifiers; we can make
+--   do with significantly less depending on how many that are really
+--   needed and improve entropy; e.g. 13 needed -> choose 4*4 instead
+----------------------------------------------------------------------]]
+
+local base = _G
+local string = require "string"
+local table = require "table"
+module "optparser"
+
+----------------------------------------------------------------------
+-- Letter frequencies for reducing symbol entropy (fixed version)
+-- * Might help a wee bit when the output file is compressed
+-- * See Wikipedia: http://en.wikipedia.org/wiki/Letter_frequencies
+-- * We use letter frequencies according to a Linotype keyboard, plus
+--   the underscore, and both lower case and upper case letters.
+-- * The arrangement below (LC, underscore, %d, UC) is arbitrary.
+-- * This is certainly not optimal, but is quick-and-dirty and the
+--   process has no significant overhead
+----------------------------------------------------------------------
+
+local LETTERS = "etaoinshrdlucmfwypvbgkqjxz_ETAOINSHRDLUCMFWYPVBGKQJXZ"
+local ALPHANUM = "etaoinshrdlucmfwypvbgkqjxz_0123456789ETAOINSHRDLUCMFWYPVBGKQJXZ"
+
+-- names or identifiers that must be skipped
+-- * the first two lines are for keywords
+local SKIP_NAME = {}
+for v in string.gmatch([[
+and break do else elseif end false for function if in
+local nil not or repeat return then true until while
+self]], "%S+") do
+  SKIP_NAME[v] = true
+end
+
+------------------------------------------------------------------------
+-- variables and data structures
+------------------------------------------------------------------------
+
+local toklist, seminfolist,             -- token lists
+      globalinfo, localinfo,            -- variable information tables
+      globaluniq, localuniq,            -- unique name tables
+      var_new,                          -- index of new variable names
+      varlist                           -- list of output variables
+
+----------------------------------------------------------------------
+-- preprocess information table to get lists of unique names
+----------------------------------------------------------------------
+
+local function preprocess(infotable)
+  local uniqtable = {}
+  for i = 1, #infotable do              -- enumerate info table
+    local obj = infotable[i]
+    local name = obj.name
+    --------------------------------------------------------------------
+    if not uniqtable[name] then         -- not found, start an entry
+      uniqtable[name] = {
+        decl = 0, token = 0, size = 0,
+      }
+    end
+    --------------------------------------------------------------------
+    local uniq = uniqtable[name]        -- count declarations, tokens, size
+    uniq.decl = uniq.decl + 1
+    local xref = obj.xref
+    local xcount = #xref
+    uniq.token = uniq.token + xcount
+    uniq.size = uniq.size + xcount * #name
+    --------------------------------------------------------------------
+    if obj.decl then            -- if local table, create first,last pairs
+      obj.id = i
+      obj.xcount = xcount
+      if xcount > 1 then        -- if ==1, means local never accessed
+        obj.first = xref[2]
+        obj.last = xref[xcount]
+      end
+    --------------------------------------------------------------------
+    else                        -- if global table, add a back ref
+      uniq.id = i
+    end
+    --------------------------------------------------------------------
+  end--for
+  return uniqtable
+end
+
+----------------------------------------------------------------------
+-- calculate actual symbol frequencies, in order to reduce entropy
+-- * this may help further reduce the size of compressed sources
+-- * note that since parsing optimizations is put before lexing
+--   optimizations, the frequency table is not exact!
+-- * yes, this will miss --keep block comments too...
+----------------------------------------------------------------------
+
+local function recalc_for_entropy(option)
+  local byte = string.byte
+  local char = string.char
+  -- table of token classes to accept in calculating symbol frequency
+  local ACCEPT = {
+    TK_KEYWORD = true, TK_NAME = true, TK_NUMBER = true,
+    TK_STRING = true, TK_LSTRING = true,
+  }
+  if not option["opt-comments"] then
+    ACCEPT.TK_COMMENT = true
+    ACCEPT.TK_LCOMMENT = true
+  end
+  --------------------------------------------------------------------
+  -- create a new table and remove any original locals by filtering
+  --------------------------------------------------------------------
+  local filtered = {}
+  for i = 1, #toklist do
+    filtered[i] = seminfolist[i]
+  end
+  for i = 1, #localinfo do              -- enumerate local info table
+    local obj = localinfo[i]
+    local xref = obj.xref
+    for j = 1, obj.xcount do
+      local p = xref[j]
+      filtered[p] = ""                  -- remove locals
+    end
+  end
+  --------------------------------------------------------------------
+  local freq = {}                       -- reset symbol frequency table
+  for i = 0, 255 do freq[i] = 0 end
+  for i = 1, #toklist do                -- gather symbol frequency
+    local tok, info = toklist[i], filtered[i]
+    if ACCEPT[tok] then
+      for j = 1, #info do
+        local c = byte(info, j)
+        freq[c] = freq[c] + 1
+      end
+    end--if
+  end--for
+  --------------------------------------------------------------------
+  -- function to re-sort symbols according to actual frequencies
+  --------------------------------------------------------------------
+  local function resort(symbols)
+    local symlist = {}
+    for i = 1, #symbols do              -- prepare table to sort
+      local c = byte(symbols, i)
+      symlist[i] = { c = c, freq = freq[c], }
+    end
+    table.sort(symlist,                 -- sort selected symbols
+      function(v1, v2)
+        return v1.freq > v2.freq
+      end
+    )
+    local charlist = {}                 -- reconstitute the string
+    for i = 1, #symlist do
+      charlist[i] = char(symlist[i].c)
+    end
+    return table.concat(charlist)
+  end
+  --------------------------------------------------------------------
+  LETTERS = resort(LETTERS)             -- change letter arrangement
+  ALPHANUM = resort(ALPHANUM)
+end
+
+----------------------------------------------------------------------
+-- returns a string containing a new local variable name to use, and
+-- a flag indicating whether it collides with a global variable
+-- * trapping keywords and other names like 'self' is done elsewhere
+----------------------------------------------------------------------
+
+local function new_var_name()
+  local var
+  local cletters, calphanum = #LETTERS, #ALPHANUM
+  local v = var_new
+  if v < cletters then                  -- single char
+    v = v + 1
+    var = string.sub(LETTERS, v, v)
+  else                                  -- longer names
+    local range, sz = cletters, 1       -- calculate # chars fit
+    repeat
+      v = v - range
+      range = range * calphanum
+      sz = sz + 1
+    until range > v
+    local n = v % cletters              -- left side cycles faster
+    v = (v - n) / cletters              -- do first char first
+    n = n + 1
+    var = string.sub(LETTERS, n, n)
+    while sz > 1 do
+      local m = v % calphanum
+      v = (v - m) / calphanum
+      m = m + 1
+      var = var..string.sub(ALPHANUM, m, m)
+      sz = sz - 1
+    end
+  end
+  var_new = var_new + 1
+  return var, globaluniq[var] ~= nil
+end
+
+----------------------------------------------------------------------
+-- calculate and print some statistics
+-- * probably better in main source, put here for now
+----------------------------------------------------------------------
+
+local function stats_summary(globaluniq, localuniq, afteruniq, option)
+  local print = print or base.print
+  local fmt = string.format
+  local opt_details = option.DETAILS
+  local uniq_g , uniq_li, uniq_lo, uniq_ti, uniq_to,  -- stats needed
+        decl_g, decl_li, decl_lo, decl_ti, decl_to,
+        token_g, token_li, token_lo, token_ti, token_to,
+        size_g, size_li, size_lo, size_ti, size_to
+    = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+  local function avg(c, l)              -- safe average function
+    if c == 0 then return 0 end
+    return l / c
+  end
+  --------------------------------------------------------------------
+  -- collect statistics (note: globals do not have declarations!)
+  --------------------------------------------------------------------
+  for name, uniq in base.pairs(globaluniq) do
+    uniq_g = uniq_g + 1
+    token_g = token_g + uniq.token
+    size_g = size_g + uniq.size
+  end
+  for name, uniq in base.pairs(localuniq) do
+    uniq_li = uniq_li + 1
+    decl_li = decl_li + uniq.decl
+    token_li = token_li + uniq.token
+    size_li = size_li + uniq.size
+  end
+  for name, uniq in base.pairs(afteruniq) do
+    uniq_lo = uniq_lo + 1
+    decl_lo = decl_lo + uniq.decl
+    token_lo = token_lo + uniq.token
+    size_lo = size_lo + uniq.size
+  end
+  uniq_ti = uniq_g + uniq_li
+  decl_ti = decl_g + decl_li
+  token_ti = token_g + token_li
+  size_ti = size_g + size_li
+  uniq_to = uniq_g + uniq_lo
+  decl_to = decl_g + decl_lo
+  token_to = token_g + token_lo
+  size_to = size_g + size_lo
+  --------------------------------------------------------------------
+  -- detailed stats: global list
+  --------------------------------------------------------------------
+  if opt_details then
+    local sorted = {} -- sort table of unique global names by size
+    for name, uniq in base.pairs(globaluniq) do
+      uniq.name = name
+      sorted[#sorted + 1] = uniq
+    end
+    table.sort(sorted,
+      function(v1, v2)
+        return v1.size > v2.size
+      end
+    )
+    local tabf1, tabf2 = "%8s%8s%10s  %s", "%8d%8d%10.2f  %s"
+    local hl = string.rep("-", 44)
+    print("*** global variable list (sorted by size) ***\n"..hl)
+    print(fmt(tabf1, "Token",  "Input", "Input", "Global"))
+    print(fmt(tabf1, "Count", "Bytes", "Average", "Name"))
+    print(hl)
+    for i = 1, #sorted do
+      local uniq = sorted[i]
+      print(fmt(tabf2, uniq.token, uniq.size, avg(uniq.token, uniq.size), uniq.name))
+    end
+    print(hl)
+    print(fmt(tabf2, token_g, size_g, avg(token_g, size_g), "TOTAL"))
+    print(hl.."\n")
+  --------------------------------------------------------------------
+  -- detailed stats: local list
+  --------------------------------------------------------------------
+    local tabf1, tabf2 = "%8s%8s%8s%10s%8s%10s  %s", "%8d%8d%8d%10.2f%8d%10.2f  %s"
+    local hl = string.rep("-", 70)
+    print("*** local variable list (sorted by allocation order) ***\n"..hl)
+    print(fmt(tabf1, "Decl.", "Token",  "Input", "Input", "Output", "Output", "Global"))
+    print(fmt(tabf1, "Count", "Count", "Bytes", "Average", "Bytes", "Average", "Name"))
+    print(hl)
+    for i = 1, #varlist do  -- iterate according to order assigned
+      local name = varlist[i]
+      local uniq = afteruniq[name]
+      local old_t, old_s = 0, 0
+      for j = 1, #localinfo do  -- find corresponding old names and calculate
+        local obj = localinfo[j]
+        if obj.name == name then
+          old_t = old_t + obj.xcount
+          old_s = old_s + obj.xcount * #obj.oldname
+        end
+      end
+      print(fmt(tabf2, uniq.decl, uniq.token, old_s, avg(old_t, old_s),
+                uniq.size, avg(uniq.token, uniq.size), name))
+    end
+    print(hl)
+    print(fmt(tabf2, decl_lo, token_lo, size_li, avg(token_li, size_li),
+              size_lo, avg(token_lo, size_lo), "TOTAL"))
+    print(hl.."\n")
+  end--if opt_details
+  --------------------------------------------------------------------
+  -- display output
+  --------------------------------------------------------------------
+  local tabf1, tabf2 = "%-16s%8s%8s%8s%8s%10s", "%-16s%8d%8d%8d%8d%10.2f"
+  local hl = string.rep("-", 58)
+  print("*** local variable optimization summary ***\n"..hl)
+  print(fmt(tabf1, "Variable",  "Unique", "Decl.", "Token", "Size", "Average"))
+  print(fmt(tabf1, "Types", "Names", "Count", "Count", "Bytes", "Bytes"))
+  print(hl)
+  print(fmt(tabf2, "Global", uniq_g, decl_g, token_g, size_g, avg(token_g, size_g)))
+  print(hl)
+  print(fmt(tabf2, "Local (in)", uniq_li, decl_li, token_li, size_li, avg(token_li, size_li)))
+  print(fmt(tabf2, "TOTAL (in)", uniq_ti, decl_ti, token_ti, size_ti, avg(token_ti, size_ti)))
+  print(hl)
+  print(fmt(tabf2, "Local (out)", uniq_lo, decl_lo, token_lo, size_lo, avg(token_lo, size_lo)))
+  print(fmt(tabf2, "TOTAL (out)", uniq_to, decl_to, token_to, size_to, avg(token_to, size_to)))
+  print(hl.."\n")
+end
+
+----------------------------------------------------------------------
+-- main entry point
+-- * does only local variable optimization for now
+----------------------------------------------------------------------
+
+function optimize(option, _toklist, _seminfolist, _globalinfo, _localinfo)
+  -- set tables
+  toklist, seminfolist, globalinfo, localinfo
+    = _toklist, _seminfolist, _globalinfo, _localinfo
+  var_new = 0                           -- reset variable name allocator
+  varlist = {}
+  ------------------------------------------------------------------
+  -- preprocess global/local tables, handle entropy reduction
+  ------------------------------------------------------------------
+  globaluniq = preprocess(globalinfo)
+  localuniq = preprocess(localinfo)
+  if option["opt-entropy"] then         -- for entropy improvement
+    recalc_for_entropy(option)
+  end
+  ------------------------------------------------------------------
+  -- build initial declared object table, then sort according to
+  -- token count, this might help assign more tokens to more common
+  -- variable names such as 'e' thus possibly reducing entropy
+  -- * an object knows its localinfo index via its 'id' field
+  -- * special handling for "self" special local (parameter) here
+  ------------------------------------------------------------------
+  local object = {}
+  for i = 1, #localinfo do
+    object[i] = localinfo[i]
+  end
+  table.sort(object,                    -- sort largest first
+    function(v1, v2)
+      return v1.xcount > v2.xcount
+    end
+  )
+  ------------------------------------------------------------------
+  -- the special "self" function parameters must be preserved
+  -- * the allocator below will never use "self", so it is safe to
+  --   keep those implicit declarations as-is
+  ------------------------------------------------------------------
+  local temp, j, gotself = {}, 1, false
+  for i = 1, #object do
+    local obj = object[i]
+    if not obj.isself then
+      temp[j] = obj
+      j = j + 1
+    else
+      gotself = true
+    end
+  end
+  object = temp
+  ------------------------------------------------------------------
+  -- a simple first-come first-served heuristic name allocator,
+  -- note that this is in no way optimal...
+  -- * each object is a local variable declaration plus existence
+  -- * the aim is to assign short names to as many tokens as possible,
+  --   so the following tries to maximize name reuse
+  -- * note that we preserve sort order
+  ------------------------------------------------------------------
+  local nobject = #object
+  while nobject > 0 do
+    local varname, gcollide
+    repeat
+      varname, gcollide = new_var_name()  -- collect a variable name
+    until not SKIP_NAME[varname]          -- skip all special names
+    varlist[#varlist + 1] = varname       -- keep a list
+    local oleft = nobject
+    ------------------------------------------------------------------
+    -- if variable name collides with an existing global, the name
+    -- cannot be used by a local when the name is accessed as a global
+    -- during which the local is alive (between 'act' to 'rem'), so
+    -- we drop objects that collides with the corresponding global
+    ------------------------------------------------------------------
+    if gcollide then
+      -- find the xref table of the global
+      local gref = globalinfo[globaluniq[varname].id].xref
+      local ngref = #gref
+      -- enumerate for all current objects; all are valid at this point
+      for i = 1, nobject do
+        local obj = object[i]
+        local act, rem = obj.act, obj.rem  -- 'live' range of local
+        -- if rem < 0, it is a -id to a local that had the same name
+        -- so follow rem to extend it; does this make sense?
+        while rem < 0 do
+          rem = localinfo[-rem].rem
+        end
+        local drop
+        for j = 1, ngref do
+          local p = gref[j]
+          if p >= act and p <= rem then drop = true end  -- in range?
+        end
+        if drop then
+          obj.skip = true
+          oleft = oleft - 1
+        end
+      end--for
+    end--if gcollide
+    ------------------------------------------------------------------
+    -- now the first unassigned local (since it's sorted) will be the
+    -- one with the most tokens to rename, so we set this one and then
+    -- eliminate all others that collides, then any locals that left
+    -- can then reuse the same variable name; this is repeated until
+    -- all local declaration that can use this name is assigned
+    -- * the criteria for local-local reuse/collision is:
+    --   A is the local with a name already assigned
+    --   B is the unassigned local under consideration
+    --   => anytime A is accessed, it cannot be when B is 'live'
+    --   => to speed up things, we have first/last accesses noted
+    ------------------------------------------------------------------
+    while oleft > 0 do
+      local i = 1
+      while object[i].skip do  -- scan for first object
+        i = i + 1
+      end
+      ------------------------------------------------------------------
+      -- first object is free for assignment of the variable name
+      -- [first,last] gives the access range for collision checking
+      ------------------------------------------------------------------
+      oleft = oleft - 1
+      local obja = object[i]
+      i = i + 1
+      obja.newname = varname
+      obja.skip = true
+      obja.done = true
+      local first, last = obja.first, obja.last
+      local xref = obja.xref
+      ------------------------------------------------------------------
+      -- then, scan all the rest and drop those colliding
+      -- if A was never accessed then it'll never collide with anything
+      -- otherwise trivial skip if:
+      -- * B was activated after A's last access (last < act)
+      -- * B was removed before A's first access (first > rem)
+      -- if not, see detailed skip below...
+      ------------------------------------------------------------------
+      if first and oleft > 0 then  -- must have at least 1 access
+        local scanleft = oleft
+        while scanleft > 0 do
+          while object[i].skip do  -- next valid object
+            i = i + 1
+          end
+          scanleft = scanleft - 1
+          local objb = object[i]
+          i = i + 1
+          local act, rem = objb.act, objb.rem  -- live range of B
+          -- if rem < 0, extend range of rem thru' following local
+          while rem < 0 do
+            rem = localinfo[-rem].rem
+          end
+          --------------------------------------------------------
+          if not(last < act or first > rem) then  -- possible collision
+            --------------------------------------------------------
+            -- B is activated later than A or at the same statement,
+            -- this means for no collision, A cannot be accessed when B
+            -- is alive, since B overrides A (or is a peer)
+            --------------------------------------------------------
+            if act >= obja.act then
+              for j = 1, obja.xcount do  -- ... then check every access
+                local p = xref[j]
+                if p >= act and p <= rem then  -- A accessed when B live!
+                  oleft = oleft - 1
+                  objb.skip = true
+                  break
+                end
+              end--for
+            --------------------------------------------------------
+            -- A is activated later than B, this means for no collision,
+            -- A's access is okay since it overrides B, but B's last
+            -- access need to be earlier than A's activation time
+            --------------------------------------------------------
+            else
+              if objb.last and objb.last >= obja.act then
+                oleft = oleft - 1
+                objb.skip = true
+              end
+            end
+          end
+          --------------------------------------------------------
+          if oleft == 0 then break end
+        end
+      end--if first
+      ------------------------------------------------------------------
+    end--while
+    ------------------------------------------------------------------
+    -- after assigning all possible locals to one variable name, the
+    -- unassigned locals/objects have the skip field reset and the table
+    -- is compacted, to hopefully reduce iteration time
+    ------------------------------------------------------------------
+    local temp, j = {}, 1
+    for i = 1, nobject do
+      local obj = object[i]
+      if not obj.done then
+        obj.skip = false
+        temp[j] = obj
+        j = j + 1
+      end
+    end
+    object = temp  -- new compacted object table
+    nobject = #object  -- objects left to process
+    ------------------------------------------------------------------
+  end--while
+  ------------------------------------------------------------------
+  -- after assigning all locals with new variable names, we can
+  -- patch in the new names, and reprocess to get 'after' stats
+  ------------------------------------------------------------------
+  for i = 1, #localinfo do  -- enumerate all locals
+    local obj = localinfo[i]
+    local xref = obj.xref
+    if obj.newname then                 -- if got new name, patch it in
+      for j = 1, obj.xcount do
+        local p = xref[j]               -- xrefs indexes the token list
+        seminfolist[p] = obj.newname
+      end
+      obj.name, obj.oldname             -- adjust names
+        = obj.newname, obj.name
+    else
+      obj.oldname = obj.name            -- for cases like 'self'
+    end
+  end
+  ------------------------------------------------------------------
+  -- deal with statistics output
+  ------------------------------------------------------------------
+  if gotself then  -- add 'self' to end of list
+    varlist[#varlist + 1] = "self"
+  end
+  local afteruniq = preprocess(localinfo)
+  stats_summary(globaluniq, localuniq, afteruniq, option)
+  ------------------------------------------------------------------
+end
diff --git a/trunk/package/luci/contrib/package/Makefile b/trunk/package/luci/contrib/package/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/contrib/package/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/contrib/package/community-profiles/Makefile b/trunk/package/luci/contrib/package/community-profiles/Makefile
new file mode 100644
index 00000000..1992b7c3
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/Makefile
@@ -0,0 +1,39 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=community-profiles
+PKG_RELEASE:=2
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/community-profiles
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Community profiles
+  DEPENDS:=freifunk-common
+endef
+
+define Package/community-profiles/description
+  These community profiles set defaults for various free network/freifunk communities and are used by wizards like ffwizard and meshwizard.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/community-profiles/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,community-profiles))
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_Freifunk b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_Freifunk
new file mode 100644
index 00000000..b8f445a7
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_Freifunk
@@ -0,0 +1,10 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk'
+	option 'homepage' 'http://freifunk.net'
+	option 'ssid' 'www.freifunk.net'
+	option 'splash_network' '10.104.0.0/16'
+	option 'latitude' '52.000'
+	option 'longitude' '10.000'
+	option 'splash_prefix' '28'
+	option 'mesh_network' '10.0.0.0/8'
+
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_aachen b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_aachen
new file mode 100644
index 00000000..cc643e13
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_aachen
@@ -0,0 +1,10 @@
+config 'community' 'profile'
+	option 'name' 'Aachen'
+	option 'homepage' 'http://aachen.freifunk.net'
+	option 'ssid' 'aachen.freifunk.net'
+	option 'suffix' 'ffac'
+	option 'latitude' '50.77900'
+	option 'longitude' '6.05399'
+	option 'mesh_network' '10.90.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '28'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_altmark b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_altmark
new file mode 100644
index 00000000..20d51b2f
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_altmark
@@ -0,0 +1,56 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Altmark'
+	option 'homepage' 'http://altmark.freifunk.net'
+	option 'ssid' 'altmark.freifunk.net'
+	option 'mesh_network' '10.59.0.0/16'
+	option 'latitude' '52.885'
+	option 'longitude' '11.15'
+	option 'suffix' 'olsr.altmark.freifunk.net'
+	option 'vap' '1'
+	option 'adhoc_dhcp_when_vap' '0'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.255'
+
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '40' '02:40:CA:FF:EE:EE'
+
+config 'defaults' 'wifi_device'
+    option 'country' 'DE'
+
+config 'defaults' 'wifi_iface'
+    option 'mcast_rate' '6000'
+
+config 'defaults' 'olsrd'
+    option 'LinkQualityAlgorithm' 'etx_ff'
+
+
+config widget 'customindex'
+    option enabled '1'
+    option width '50%'
+    option paddingright '5%'
+    option template 'html'
+
+config widget 'rssffl'
+    option enabled '1'
+    option max '10'
+    option cache '3600'
+    option width '100%'
+    option title 'Freifunk Blog'
+    option template 'iframe'
+    option url 'http://freifunk.net'
+
+config widget 'rssbundesweit'
+    option cache '3600'
+    option width '50%'
+    option title 'bundesweiter Freifunk Blog'
+    option template 'rssfeed'
+    option enabled '1'
+    option max '10'
+    option url 'http://blog.freifunk.net/rss.xml'
+
+config widget 'clear1'
+    option template 'clear'
+    option enabled '1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_arad b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_arad
new file mode 100644
index 00000000..55d012fb
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_arad
@@ -0,0 +1,22 @@
+config 'community' 'profile'
+        option 'name' 'arig Arad'
+        option 'homepage' 'http://arig.org.il'
+        option 'ssid' 'arig.org.il'
+        option 'latitude' '31.26'
+        option 'longitude' '35.21'
+        option 'splash_prefix' '28'
+        option 'suffix' 'arig'
+        option 'mesh_network' '10.81.8.0/22'
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '13' '13:CA:FF:EE:BA:BE'
+
+config 'defaults' 'wifi_device'
+        option 'channel' '13'
+        option 'country' 'IL'
+        option 'beacon_int' '5000'
+        option 'distance' '1500'
+
+config 'defaults' 'wifi_iface'
+        option 'mcast_rate' '6000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_neot_semadar b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_neot_semadar
new file mode 100644
index 00000000..062b18e2
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_neot_semadar
@@ -0,0 +1,22 @@
+config 'community' 'profile'
+        option 'name' 'arig Neot Semadar'
+        option 'homepage' 'http://www.neot-semadar.com'
+        option 'ssid' 'arig.org.il'
+        option 'latitude' '30.05'
+        option 'longitude' '35.02'
+        option 'splash_prefix' '272'
+        option 'suffix' 'arig'
+        option 'mesh_network' '10.81.12.0/22'
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '13' '13:CA:FF:EE:BA:BE'
+
+config 'defaults' 'wifi_device'
+        option 'channel' '13'
+        option 'country' 'IL'
+        option 'beacon_int' '5000'
+        option 'distance' '1500'
+
+config 'defaults' 'wifi_iface'
+        option 'mcast_rate' '6000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_tel-aviv b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_tel-aviv
new file mode 100644
index 00000000..fe7df226
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_arig_tel-aviv
@@ -0,0 +1,22 @@
+config 'community' 'profile'
+        option 'name' 'arig Tel Aviv'
+        option 'homepage' 'http://arig.org.il'
+        option 'ssid' 'arig.org.il'
+        option 'latitude' '32.056'
+        option 'longitude' '34.772'
+        option 'splash_prefix' '28'
+        option 'suffix' 'arig'
+        option 'mesh_network' '10.81.0.0/21'
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '13' '13:CA:FF:EE:BA:BE'
+
+config 'defaults' 'wifi_device'
+        option 'channel' '13'
+        option 'country' 'IL'
+        option 'beacon_int' '5000'
+        option 'distance' '1500'
+
+config 'defaults' 'wifi_iface'
+        option 'mcast_rate' '6000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_augsburg b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_augsburg
new file mode 100644
index 00000000..0bbafcae
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_augsburg
@@ -0,0 +1,66 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Augsburg'
+	option 'homepage' 'http://augsburg.freifunk.net'
+	option 'ssid' 'augsburg.freifunk.net'
+	option 'mesh_network' '10.11.0.0/18'
+	option 'splash_network' '10.104.0.0/16'
+	option 'latitude' '48.37071'
+	option 'longitude' '10.89475'
+	option 'suffix' 'ffa'
+	option 'splash_prefix' '27'
+	option 'vap' '1'
+	option adhoc_dhcp_when_vap '1'
+	option 'ipv6' '1'
+	option 'ipv6_config' 'auto-ipv6-fromv4'
+	option 'ipv6_prefix' 'fdca:ffee:ffa::/48'
+	option 'extrapackages' 'luci-app-owm luci-app-owm-ant luci-app-owm-cmd luci-app-owm-gui'
+	list 'owm_api' 'http://api.openwifimap.net'
+	list 'owm_api' 'http://owmapi.pberg.freifunk.net'
+	option 'mapserver' 'http://openwifimap.net/'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.192.0'
+
+config 'defaults' 'bssidscheme'
+	option '1'	'02:CA:FF:EE:BA:BE'
+
+config 'defaults' 'luci_splash'
+	option 'limit_up' '20'
+	option 'limit_down' '50'
+
+config widget 'customindex'
+	option enabled '1'
+	option width '50%'
+	option paddingright '5%'
+	option template 'html'
+
+config widget 'rssffa'
+	option enabled '1'
+	option max '10'
+	option cache '3600'
+	option width '50%'
+	option title 'Freifunk Augsburg Blog'
+	option template 'rssfeed'
+	option url 'http://augsburg.freifunk.net/blog?type=100'
+
+config widget 'rssaugsburg'
+	option cache '3600'
+	option width '50%'
+	option title 'Augsburger Blogs'
+	option template 'rssfeed'
+	option enabled '1'
+	option max '10'
+	option url 'http://wgaugsburg.de/augsburg/rss20.xml'
+
+config widget 'search'
+	option template 'search'
+	option title 'Search'
+	option enabled '1'
+	option width '50%'
+	list engine 'Google|http://www.google.de/search?q=' 
+	list engine 'Freifunk&#160;Augsburg|http://www.google.de/search?q=site:augsburg.freifunk.net+'
+	list engine 'Freifunk&#160;Wiki|http://wiki.freifunk.net/index.php?search='
+
+config widget 'clear1'
+	option template 'clear'
+	option enabled '1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bayreuth b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bayreuth
new file mode 100644
index 00000000..90fccbd8
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bayreuth
@@ -0,0 +1,20 @@
+config 'community' 'profile'
+        option 'name' 'Freifunk Bayreuth'
+        option 'homepage' 'http://bayreuth.freifunk.net'
+        option 'ssid' 'bayreuth.freifunk.net'
+        option 'mesh_network' '10.195.0.0/16'
+        option 'splash_network' '10.104.0.0/16'
+        option 'latitude' '49.945812'
+        option 'longitude' '11.575045'
+        option 'suffix' 'ffbt'
+        option 'splash_prefix' '28'
+
+config 'defaults' 'interface'
+        option 'netmask' '255.255.192.0'
+
+config 'defaults' 'wifi_device'
+        option 'channel' '4'
+
+config 'defaults' 'wifi_iface'
+        option 'bssid' '42:CA:FF:EE:BA:BE'
+
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bensheim b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bensheim
new file mode 100644
index 00000000..48c1d47b
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bensheim
@@ -0,0 +1,9 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Bensheim'
+	option 'homepage' 'http://bensheim.freifunk.net'
+	option 'ssid' 'bensheim.freifunk.net'
+	option 'mesh_network' '10.49.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '49.63939'
+	option 'longitude' '8.633718'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bergischesland b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bergischesland
new file mode 100644
index 00000000..0de45430
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bergischesland
@@ -0,0 +1,15 @@
+config 'community'	'profile'
+	option 'name' 'Piratenfreifunk Bergisches Land'
+	option 'homepage' 'http://www.piraten-bergisches-land.de'
+	option 'ssid' 'PiratenfunkBL'
+	option 'mesh_network' '10.3.0.0/16'
+	option 'splash_network' '192.168.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '51.26849'
+	option 'longitude' '7.19476'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '11'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' '02:40:00:42:42:42'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_berlin b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_berlin
new file mode 100644
index 00000000..b4694c00
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_berlin
@@ -0,0 +1,50 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Berlin'
+	option 'homepage' 'http://berlin.freifunk.net'
+	option 'ssid' 'freifunk.net'
+	option 'ssid_scheme' 'addchannelbefore'
+	option 'mesh_network' '104.0.0.0/8'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '52.52075'
+	option 'longitude' '13.40948'
+	list 'owm_api' 'http://api.openwifimap.net'
+	list 'owm_api' 'http://owmapi.pberg.freifunk.net'
+	option 'mapserver' 'http://map.pberg.freifunk.net/'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '13'
+
+config 'defaults' 'bssidscheme'
+	option '10'	'02:CA:FF:EE:BA:BE'
+	option '13'	'D2:CA:FF:EE:BA:BE'
+	option '36'	'02:36:CA:FF:EE:EE'
+
+config 'defaults' 'ssidscheme'
+	option '13'	'ch13.freifunk.net'
+	option '36'	'ch36.freifunk.net'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.0.0.0'
+	option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168'
+
+config 'defaults' 'olsr_interface'
+	option 'Ip4Broadcast' '255.255.255.255'
+	option 'HelloInterval' '3.0'
+	option 'HelloValidityTime' '125.0'
+	option 'TcInterval'  '2.0'
+	option 'TcValidityTime' '500.0'
+	option 'MidInterval' '25.0'
+	option 'MidValidityTime'  '500.0'
+	option 'HnaInterval' '10.0'
+	option 'HnaValidityTime' '125.0'
+
+config 'defaults' 'olsrd'
+	option 'AllowNoInt' 'yes'
+	option 'FIBMetric' 'flat'
+	option 'Pollrate' '0.025'
+	option 'TcRedundancy' '2'
+	option 'NatThreshold' '0.75'
+	option 'LinkQualityAlgorithm' 'etx_ff'
+	option 'RtTableDefaultOlsrPriority' '20000'
+	option 'RtTableTunnelPriority' '100000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bno b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bno
new file mode 100644
index 00000000..2d0f0f5b
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_bno
@@ -0,0 +1,38 @@
+config 'community' 'profile'
+	option 'name' 'Berlin NordOst'
+	option 'homepage' 'http://www.freifunk-bno.de/'
+	option 'ssid' 'olsr.freifunk.net'
+	option 'mesh_network' '104.0.0.0/8'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '52.55010'
+	option 'longitude' '13.45889'
+	option 'suffix' 'olsr'
+        list 'owm_api' 'http://api.openwifimap.net'
+        list 'owm_api' 'http://owmapi.pberg.freifunk.net'
+        option 'mapserver' 'http://map.pberg.freifunk.net/'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '10'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.0.0.0'
+
+config 'defaults' 'olsr_interface'
+	option 'Ip4Broadcast' '255.255.255.255'
+	option 'HelloInterval' '3.0'
+	option 'HelloValidityTime' '125.0'
+	option 'TcInterval'  '2.0'
+	option 'TcValidityTime' '500.0'
+	option 'MidInterval' '25.0'
+	option 'MidValidityTime'  '500.0'
+	option 'HnaInterval' '10.0'
+	option 'HnaValidityTime' '125.0'
+
+config 'defaults' 'olsrd'
+	option 'AllowNoInt' 'yes'
+	option 'FIBMetric' 'flat'
+	option 'Pollrate' '0.025'
+	option 'TcRedundancy' '2'
+	option 'NatThreshold' '0.75'
+	option 'LinkQualityAlgorithm' 'etx_ff'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_carbodebit b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_carbodebit
new file mode 100644
index 00000000..0b263f9c
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_carbodebit
@@ -0,0 +1,23 @@
+config 'community' 'profile'
+	option 'name' 'carbodebit'
+	option 'homepage' 'http://carbodebit.net'
+	option 'ssid' 'VHDCARBES'
+	option 'mesh_network' '10.72.1.0/24'
+	option 'latitude' '43.633683'
+	option 'longitude' '2.160894'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' 'DE:78:70:E4:FA:B8'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.0'
+	option 'dns' '10.70.1.1 213.190.64.170 213.190.64.166'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '11'
+	option 'country' 'FR'
+	option 'distance' '2000'
+
+config 'defaults' 'bssidscheme'
+	option 'all'      'DE:78:70:E4:FA:B8'
+
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_demo b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_demo
new file mode 100644
index 00000000..d3223496
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_demo
@@ -0,0 +1,24 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Demo'
+	option 'homepage' 'http://www.freifunk.net'
+	option 'ssid' 'demo.freifunk.net'
+	option 'mesh_network' '10.11.12.0/24'
+	option 'latitude' '51.163375'
+	option 'longitude' '10.447683'
+	option 'suffix' 'ff'
+	option 'vap' '1'
+	option adhoc_dhcp_when_vap '1'
+	option 'ipv6' '1'
+	option 'ipv6_config' 'auto-ipv6-fromv4'
+	option 'ipv6_prefix' 'fdca:ffff:ffff::/48'
+	option 'extrapackages' 'luci-app-owm luci-app-owm-ant luci-app-owm-cmd luci-app-owm-gui'
+	list 'owm_api' 'http://api.openwifimap.net'
+	list 'owm_api' 'http://owmapi.pberg.freifunk.net'
+	option 'mapserver' 'http://openwifimap.net/'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.0'
+
+config 'defaults' 'luci_splash'
+	option 'limit_up' '50'
+	option 'limit_down' '200'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_duesseldorf b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_duesseldorf
new file mode 100644
index 00000000..cb36aabf
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_duesseldorf
@@ -0,0 +1,15 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Duesseldorf'
+	option 'homepage' 'http://freifunk-duesseldorf.de'
+	option 'ssid' 'duesseldorf.freifunk.net'
+	option 'mesh_network' '10.40.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '51.217812'
+	option 'longitude' '6.761564'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '3'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' '02:CA:FF:EE:BA:BE'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_erfurt b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_erfurt
new file mode 100644
index 00000000..dba31a0b
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_erfurt
@@ -0,0 +1,48 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Erfurt'
+	option 'homepage' 'http://erfurt.freifunk.net'
+	option 'ssid' 'erfurt.freifunk.net'
+	option 'mesh_network' '10.99.0.0/16'
+	option 'latitude' '50.9768'
+	option 'longitude' '11.02367'
+	option 'suffix' 'olsr.erfurt.freifunk.net'
+	option 'vap' '1'
+	option 'adhoc_dhcp_when_vap' '0'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.0.0'
+
+config 'defaults' 'bssidscheme'
+	option '1' '02:CA:FF:EE:BA:BE'
+
+config 'defaults' 'olsrd'
+    option 'LinkQualityAlgorithm' 'etx_ff'
+
+
+config widget 'customindex'
+    option enabled '1'
+    option width '50%'
+    option paddingright '5%'
+    option template 'html'
+
+config widget 'rssffl'
+    option enabled '1'
+    option max '10'
+    option cache '3600'
+    option width '100%'
+    option title 'Freifunk Blog'
+    option template 'iframe'
+    option url 'http://freifunk.net'
+
+config widget 'rssbundesweit'
+    option cache '3600'
+    option width '50%'
+    option title 'bundesweiter Freifunk Blog'
+    option template 'rssfeed'
+    option enabled '1'
+    option max '10'
+    option url 'http://blog.freifunk.net/rss.xml'
+
+config widget 'clear1'
+    option template 'clear'
+    option enabled '1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_evernet b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_evernet
new file mode 100644
index 00000000..05453608
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_evernet
@@ -0,0 +1,25 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Evernet eG'
+	option 'homepage' 'http://www.evernet-eg.de'
+	option 'ssid' 'evernet.freifunk.net'
+	option 'mesh_network' '10.0.0.0/8'
+	option 'latitude' '51.15692062509162'
+	option 'longitude' '10.716041922569275'
+	option 'suffix' 'evernet'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.0.0.0'
+
+config 'defaults' 'bssidscheme'
+	option 'all'	'02:CA:FF:EE:BA:BE'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '13'
+	option 'country' 'DE'
+	option 'txpower' '19'
+	option 'beacon_int' '5000'
+	option 'distance' '1500'
+	option 'noscan' '0'
+
+config 'defaults' 'wifi_iface'
+	option 'mcast_rate' '6000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_freiburg b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_freiburg
new file mode 100644
index 00000000..eee3d6ad
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_freiburg
@@ -0,0 +1,45 @@
+config 'community' 'profile'
+  option 'name' 'Freifunk Freiburg'
+  option 'homepage' 'http://freiburg.freifunk.net'
+  option 'ssid' '02:CA:FF:EE:BA:BE'
+  option 'mesh_network' '10.60.0.0/16'
+  option 'latitude' '47.994841'
+  option 'longitude' '7.849772'
+  option 'suffix' 'olsr.freiburg.freifunk.net'
+  option 'vap' '1'
+  option 'adhoc_dhcp_when_vap' '0'
+
+config 'defaults' 'interface'
+  option 'netmask' '255.255.255.255'
+
+config 'defaults' 'bssidscheme'
+  option '1' '02:CA:FF:EE:BA:BE'
+  option '40' '02:40:CA:FF:EE:EE'
+
+config 'defaults' 'wifi_device'
+  option 'country' 'DE'
+
+config 'defaults' 'wifi_iface'
+  option 'mcast_rate' '6000'
+
+config 'defaults' 'olsrd'
+  option 'LinkQualityAlgorithm' 'etx_ff'
+
+config widget 'customindex'
+  option enabled '1'
+  option width '50%'
+  option paddingright '5%'
+  option template 'html'
+
+config widget 'rssbundesweit'
+  option cache '3600'
+  option width '50%'
+  option title 'bundesweiter Freifunk Blog'
+  option template 'rssfeed'
+  option enabled '1'
+  option max '10'
+  option url 'http://blog.freifunk.net/rss.xml'
+
+config widget 'clear1'
+  option template 'clear'
+  option enabled '1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_gadow b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_gadow
new file mode 100644
index 00000000..bc4a2036
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_gadow
@@ -0,0 +1,23 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Gadow'
+	option 'homepage' 'http://gadow.freifunk.net'
+	option 'ssid' 'gadow.freifunk.net'
+	option 'mesh_network' '10.61.0.0/16'
+	option 'latitude' '53.11'
+	option 'longitude' '12.61'
+	option 'vap' '1'
+	option 'adhoc_dhcp_when_vap' '0'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.255'
+
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '40' '02:40:CA:FF:EE:EE'
+
+config 'defaults' 'wifi_device'
+    option 'country' 'DE'
+
+config 'defaults' 'wifi_iface'
+    option 'mcast_rate' '6000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_guifibages b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_guifibages
new file mode 100644
index 00000000..a0fc4fc1
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_guifibages
@@ -0,0 +1,19 @@
+config 'community' 'profile'
+        option 'name' 'Guifi Bages'
+        option 'homepage' 'http://guifi.net/PlaBages'
+        option 'ssid' 'guifibages'
+        option 'mesh_network' '10.224.3.0/16'
+        option 'splash_network' '10.104.0.0/16'
+	option 'theme' 'luci-theme-freifunk-generic'
+        option 'latitude' '41.718437'
+        option 'longitude' '1.826477'
+        option 'suffix' 'guifibages.cat'
+        option 'splash_prefix' '27'
+	option 'extrapackages' 'luci-app-olsr-viz luci-i18n-catalan'
+
+config 'defaults' 'interface'
+        option 'netmask' '255.255.0.0'
+
+config 'defaults' 'bssidscheme'
+	option 'all'	'12:34:56:78:9a:bc'
+
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_halle b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_halle
new file mode 100644
index 00000000..0e8e43fd
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_halle
@@ -0,0 +1,40 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Halle'
+	option 'homepage' 'http://freifunk-halle.net'
+	option 'ssid' 'halle.freifunk.net'
+	option 'mesh_network' '104.62.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '51.47911'
+	option 'longitude' '11.96901'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '13'
+	option 'country' 'DE'
+
+config 'defaults' 'bssidscheme'
+	option 'all' '02:CA:FF:EE:BA:BE'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.0.0.0'
+
+config 'defaults' 'olsrd'
+	option 'AllowNoInt' 'yes'
+	option 'FIBMetric' 'flat'
+	option 'Pollrate' '0.025'
+	option 'TcRedundancy' '2'
+	option 'NatThreshold' '0.75'
+	option 'LinkQualityAlgorithm' 'etx_ff'
+	option 'LinkQualityFishEye' '1'
+	option 'Willingness' '3'
+
+config 'defaults' 'olsr_interface'
+	option 'Ip4Broadcast' '255.255.255.255'
+	option 'HelloInterval' '5.0'
+	option 'HelloValidityTime' '125.0'
+	option 'TcInterval'  '3.0'
+	option 'TcValidityTime' '375.0'
+	option 'MidInterval' '25.0'
+	option 'MidValidityTime'  '375.0'
+	option 'HnaInterval' '25.0'
+	option 'HnaValidityTime' '375.0'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hannover b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hannover
new file mode 100644
index 00000000..008b6c70
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hannover
@@ -0,0 +1,12 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Hannover'
+	option 'homepage' 'http://hannover.freifunk.net'
+	option 'ssid' 'hannover.freifunk.net'
+	option 'mesh_network' '10.2.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '52.38427'
+	option 'longitude' '9.74359'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' 'CA:FF:EE:CA:FF:EE'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_heppenheim b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_heppenheim
new file mode 100644
index 00000000..a8304946
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_heppenheim
@@ -0,0 +1,9 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Heppenheim'
+	option 'homepage' 'http://heppenheim.freifunk.net'
+	option 'ssid' 'heppenheim.freifunk.net'
+	option 'mesh_network' '10.48.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '51.151786'
+	option 'longitude' '10.415039'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hooge b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hooge
new file mode 100644
index 00000000..62f6fa9a
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_hooge
@@ -0,0 +1,22 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Hooge'
+	option 'homepage' 'http://hooge.freifunk.net'
+	option 'ssid' 'hooge.freifunk.net'
+	option 'mesh_network' '10.11.128.0/24'
+	option 'splash_network' '10.104.0.0/16'
+	option 'latitude' '54.572161'
+	option 'longitude' '8.559551'
+	option 'suffix' 'hooge'
+	option 'splash_prefix' '27'
+        option 'vap' '1'
+	option 'extrapackages' ''
+        list 'owm_api' 'http://api.openwifimap.net'
+        list 'owm_api' 'http://owmapi.pberg.freifunk.net'
+        option 'mapserver' 'http://openwifimap.net/'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.0'
+
+config 'defaults' 'luci_splash'
+	option 'limit_up' '20'
+	option 'limit_down' '50'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kiberpipa b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kiberpipa
new file mode 100644
index 00000000..c2a96e47
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kiberpipa
@@ -0,0 +1,15 @@
+config 'community' 'profile'
+	option 'name' 'Kiberpipa.net'
+	option 'homepage' 'http://www.kiberpipa.net'
+	option 'ssid' 'open.kiberpipa.net'
+	option 'mesh_network' '10.14.0.0/16'
+	option 'splash_network' '10.14.128.0/17'
+	option 'splash_prefix' '27'
+	option 'latitude' '46.05063'
+	option 'longitude' '14.50402'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '8'
+
+config 'defaults' 'interface'
+	option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kyritz b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kyritz
new file mode 100644
index 00000000..f97e79f9
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_kyritz
@@ -0,0 +1,57 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Kyritz'
+	option 'homepage' 'http://kyritz.freifunk.net'
+	option 'ssid' 'mesh.freifunk.net'
+	option 'mesh_network' '104.59.0.0/16'
+	option 'latitude' '52.94'
+	option 'longitude' '12.4'
+	option 'suffix' 'olsr.kyritz.freifunk.net'
+	option 'vap' '1'
+	option 'adhoc_dhcp_when_vap' '0'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.255'
+
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '40' '02:40:CA:FF:EE:EE'
+
+config 'defaults' 'wifi_device'
+    option 'country' 'DE'
+
+config 'defaults' 'wifi_iface'
+    option 'mcast_rate' '6000'
+
+
+config 'defaults' 'olsrd'
+    option 'LinkQualityAlgorithm' 'etx_ff'
+
+
+config widget 'customindex'
+    option enabled '1'
+    option width '50%'
+    option paddingright '5%'
+    option template 'html'
+
+config widget 'rssffl'
+    option enabled '1'
+    option max '10'
+    option cache '3600'
+    option width '100%'
+    option title 'Freifunk Blog'
+    option template 'iframe'
+    option url 'http://freifunk.net'
+
+config widget 'rssbundesweit'
+    option cache '3600'
+    option width '50%'
+    option title 'bundesweiter Freifunk Blog'
+    option template 'rssfeed'
+    option enabled '1'
+    option max '10'
+    option url 'http://blog.freifunk.net/rss.xml'
+
+config widget 'clear1'
+    option template 'clear'
+    option enabled '1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_l59 b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_l59
new file mode 100644
index 00000000..5e6f472b
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_l59
@@ -0,0 +1,25 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk L59'
+	option 'homepage' 'http://freifunk.net'
+	option 'ssid' 'freifunk.net'
+	option 'mesh_network' '10.59.0.0/16'
+	option 'splash_network' '6.59.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '52.26337'
+	option 'longitude' '10.52103'
+	option 'vap' '1'
+	option 'adhoc_dhcp_when_vap' '0'
+
+config 'defaults' 'interface'
+    option 'netmask' '255.255.255.255'
+
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '40' '02:40:CA:FF:EE:EE'
+
+config 'defaults' 'wifi_device'
+    option 'country' 'DE'
+
+config 'defaults' 'wifi_iface'
+    option 'mcast_rate' '6000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_leipzig b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_leipzig
new file mode 100644
index 00000000..671f3e85
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_leipzig
@@ -0,0 +1,55 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Leipzig'
+	option 'homepage' 'http://leipzig.freifunk.net'
+	option 'ssid' 'leipzig.freifunk.net'
+	option 'mesh_network' '10.61.0.0/16'
+	option 'latitude' '51.33348'
+	option 'longitude' '12.40297'
+	option 'suffix' 'olsr.leipzig.freifunk.net'
+	option 'vap' '1'
+	option 'adhoc_dhcp_when_vap' '0'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.255'
+
+config 'defaults' 'bssidscheme'
+	option '1' '02:CA:FF:EE:BA:BE'
+	option '40' '02:40:CA:FF:EE:EE'
+
+config 'defaults' 'wifi_device'
+    option 'country' 'DE'
+
+config 'defaults' 'wifi_iface'
+    option 'mcast_rate' '6000'
+
+config 'defaults' 'olsrd'
+    option 'LinkQualityAlgorithm' 'etx_ff'
+
+
+config widget 'customindex'
+    option enabled '1'
+    option width '50%'
+    option paddingright '5%'
+    option template 'html'
+
+config widget 'rssffl'
+    option enabled '1'
+    option max '10'
+    option cache '3600'
+    option width '100%'
+    option title 'Freifunk Leipzig Blog'
+    option template 'iframe'
+    option url 'http://leipzig.freifunk.net'
+
+config widget 'rssbundesweit'
+    option cache '3600'
+    option width '50%'
+    option title 'bundesweiter Freifunk Blog'
+    option template 'rssfeed'
+    option enabled '1'
+    option max '10'
+    option url 'http://blog.freifunk.net/rss.xml'
+
+config widget 'clear1'
+    option template 'clear'
+    option enabled '1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_marburg b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_marburg
new file mode 100644
index 00000000..18cff80e
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_marburg
@@ -0,0 +1,12 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Marburg'
+	option 'homepage' ' http://marburg.freifunk.de'
+	option 'ssid' 'marburg.freifunk.net'
+	option 'mesh_network' '10.128.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '29'
+	option 'latitude' '49.63939'
+	option 'longitude' '8.633718'
+
+config 'defaults' 'interface'
+	option 'dns' '8.8.8.8 212.204.49.83'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_neuss b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_neuss
new file mode 100644
index 00000000..8e306173
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_neuss
@@ -0,0 +1,15 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Neuss'
+	option 'homepage' 'http://neuss.freifunk.net'
+	option 'ssid' 'neuss.freifunk.net'
+	option 'mesh_network' '172.28.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '51.19045'
+	option 'longitude' '6.69471'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '11'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' 'DE:AD:BE:EF:CA:FE'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_oldenburg b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_oldenburg
new file mode 100644
index 00000000..e967fdb4
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_oldenburg
@@ -0,0 +1,15 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Oldenburg'
+	option 'homepage' 'http://oldenburg.freifunk.net'
+	option 'ssid' 'oldenburg.freifunk.net'
+	option 'mesh_network' '10.18.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '53.14083'
+	option 'longitude' '8.21314'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '6'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' '02:CA:FF:EE:BA:BE'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern
new file mode 100644
index 00000000..810ad8f1
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern
@@ -0,0 +1,18 @@
+config 'community' 'profile'
+	option 'name' 'Openwireless Bern'
+	option 'homepage' 'http://bern.openwireless.ch/'
+	option 'ssid' 'www.openwireless.ch'
+	option 'mesh_network' '10.247.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '50.814788'
+	option 'longitude' '8.769239'
+
+config 'defaults' 'interface'
+	option 'dns' '208.67.222.222 208.67.220.220'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '10'
+	option 'country' '756'
+
+
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_pberg b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_pberg
new file mode 100644
index 00000000..1122eaa3
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_pberg
@@ -0,0 +1,38 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Berlin Prenzlauer Berg'
+	option 'homepage' 'http://pberg.freifunk.net'
+	option 'ssid' 'olsr.freifunk.net'
+	option 'mesh_network' '104.0.0.0/8'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '52.5427'
+	option 'longitude' '13.4172'
+	list 'owm_api' 'http://api.openwifimap.net'
+	list 'owm_api' 'http://owmapi.pberg.freifunk.net'
+	option 'mapserver' 'http://map.pberg.freifunk.net/'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '10'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.0.0.0'
+
+config 'defaults' 'olsr_interface'
+	option 'Ip4Broadcast' '255.255.255.255'
+	option 'HelloInterval' '3.0'
+	option 'HelloValidityTime' '125.0'
+	option 'TcInterval'  '2.0'
+	option 'TcValidityTime' '500.0'
+	option 'MidInterval' '25.0'
+	option 'MidValidityTime'  '500.0'
+	option 'HnaInterval' '10.0'
+	option 'HnaValidityTime' '125.0'
+
+config 'defaults' 'olsrd'
+	option 'AllowNoInt' 'yes'
+	option 'FIBMetric' 'flat'
+	option 'Pollrate' '0.025'
+	option 'TcRedundancy' '2'
+	option 'NatThreshold' '0.75'
+	option 'LinkQualityAlgorithm' 'etx_ff'
+
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden
new file mode 100644
index 00000000..2af0e319
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden
@@ -0,0 +1,12 @@
+config 'community' 'profile'
+	option 'name' 'Piratenfreifunk Dresden'
+	option 'homepage' 'http://www.piraten-sachsen.de/'
+	option 'ssid' 'dresden.freifunk.net'
+	option 'mesh_network' '10.12.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '51.05081'
+	option 'longitude' '13.73420'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_potsdam b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_potsdam
new file mode 100644
index 00000000..bde824f3
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_potsdam
@@ -0,0 +1,15 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Potsdam'
+	option 'homepage' 'http://potsdam.freifunk.net'
+	option 'ssid' 'www.freifunk-potsdam.de'
+	option 'mesh_network' '10.22.0.0/16'
+	option 'splash_network' '192.168.22.0/24'
+	option 'splash_prefix' '24'
+	option 'latitude' '52.39349'
+	option 'longitude' '13.06489'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '5'
+
+config 'defaults' 'bssidscheme'
+	option '5' '02:CA:FF:EE:BA:BE'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_reihen b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_reihen
new file mode 100644
index 00000000..e978d375
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_reihen
@@ -0,0 +1,20 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Reihen'
+	option 'homepage' 'http://freifunk.reihen.de'
+	option 'ssid' 'freifunk.reihen.de'
+	option 'mesh_network' '172.23.0.0/16'
+	option 'splash_network' '172.23.26.0/29'
+	option 'latitude' '49.21'
+	option 'longitude' '8.91'
+	option 'splash_prefix' '29'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.0.0'
+	option 'dns' '172.23.25.204 172.23.31.237 141.1.1.1'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '13'
+	option 'bssid' '02:07:04:08:08:09'
+
+config 'defaults' 'bssidscheme'
+	option '13'      '02:07:04:08:08:09'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_rosbach b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_rosbach
new file mode 100644
index 00000000..4444f709
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_rosbach
@@ -0,0 +1,15 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Rosbach'
+	option 'homepage' 'freifunk-rosbach.de'
+	option 'ssid' 'rosbach.freifunk.net'
+	option 'mesh_network' '10.212.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '50.18'
+	option 'longitude' '8.42'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '13'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' 'D2:CA:FF:EE:BA:BE'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_schwarzach b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_schwarzach
new file mode 100644
index 00000000..c973ca0a
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_schwarzach
@@ -0,0 +1,12 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Schwarzach'
+	option 'homepage' 'http://schwarzach.freifunk.net'
+	option 'ssid' 'schwarzach.freifunk.net'
+	option 'mesh_network' '10.81.0.0/20'
+	option 'splash_network' '10.104.0.0/16'
+	option 'latitude' '49.373'
+	option 'longitude' '8.983'
+	option 'splash_prefix' '27'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.240.0'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_seefeld b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_seefeld
new file mode 100644
index 00000000..5d03f7d0
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_seefeld
@@ -0,0 +1,13 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Seefeld'
+	option 'homepage' 'http://wiki.freifunk.net/Seefeld.freifunk.net'
+	option 'ssid' 'seefeld.freifunk.net'
+	option 'mesh_network' '10.111.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '48.03485'
+	option 'longitude' '11.21279'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '1'
+	option 'bssid' '02:CA:FF:EE:BA:BB'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_stuttgart b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_stuttgart
new file mode 100644
index 00000000..28d60d8d
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_stuttgart
@@ -0,0 +1,13 @@
+config 'community' 'profile'
+        option 'name' 'Freifunk Stuttgart'
+        option 'homepage' 'http://freifunk-stuttgart.de'
+        option 'ssid' 'Freifunk Stuttgart'
+        option 'mesh_network' '172.21.0.0/16'
+        option 'splash_network' '10.104.0.0/16'
+        option 'latitude' '48'
+        option 'longitude' '9'
+        option 'splash_prefix' '27'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '5'
+	option 'bssid' '52:CA:FF:EE:BA:BE'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_vogtland b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_vogtland
new file mode 100644
index 00000000..8baeec6d
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_vogtland
@@ -0,0 +1,23 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Vogtland'
+	option 'homepage' 'http://wiki.freifunk.net/Freifunk_Vogtland'
+	option 'ssid' 'vogtland.freifunk.net'
+	option 'mesh_network' '10.204.0.0/16'
+	option 'splash_network' '6.204.0.0/16'
+	option 'splash_prefix' '27'
+	option 'latitude' '53.11'
+	option 'longitude' '12.61'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.255'
+
+
+config 'defaults' 'bssidscheme'
+        option '1' '02:CA:FF:EE:BA:BE'
+        option '40' '02:40:CA:FF:EE:EE'
+
+config 'defaults' 'wifi_device'
+    option 'country' 'DE'
+
+config 'defaults' 'wifi_iface'
+    option 'mcast_rate' '6000'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weil b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weil
new file mode 100644
index 00000000..ddba1f35
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weil
@@ -0,0 +1,23 @@
+config 'community' 'profile'
+        option 'name' 'Freifunk Weil am Rhein'
+        option 'homepage' 'http://weil-am-rhein.freifunk.net'
+        option 'ssid' 'mesh.freifunk.net'
+        option 'mesh_network' '10.119.0.0/18'
+        option 'latitude' '47.6056'
+        option 'longitude' '7.6083'
+        option 'suffix' 'ffwr'
+        option 'vap' '1'
+        option 'adhoc_dhcp_when_vap' '0'
+        list 'owm_api' 'http://api.openwifimap.net'
+        list 'owm_api' 'http://owmapi.pberg.freifunk.net'
+        option 'mapserver' 'http://openwifimap.net/'
+
+config 'defaults' 'interface'
+        option 'netmask' '255.255.192.0'
+
+config 'defaults' 'wifi_device'
+        option 'country' 'DE'
+        option 'channel' '10'
+
+config 'defaults' 'luci_splash'
+        option 'leasetime' '24'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weimar b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weimar
new file mode 100644
index 00000000..65938e74
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weimar
@@ -0,0 +1,10 @@
+config 'community' 'profile'
+	option 'name' 'Weimarnetz e.V.'
+	option 'homepage' 'http://www.weimarnetz.de'
+	option 'ssid' 'weimarnetz'
+	option 'mesh_network' '10.63.0.0/16'
+	option 'latitude' '50.989530'
+	option 'longitude' '11.338675'
+
+config 'defaults' 'interface'
+	option 'dns' '217.11.48.200 217.11.49.200 8.8.8.8'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weinstadt b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weinstadt
new file mode 100644
index 00000000..49a42fa6
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_weinstadt
@@ -0,0 +1,19 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk Weinstadt'
+	option 'homepage' 'http://freifunk-weinstadt.de'
+	option 'ssid' 'freifunk-weinstadt'
+	option 'mesh_network' '172.21.0.0/16'
+	option 'splash_network' '172.21.85.0/30'
+	option 'latitude' '48.81'
+	option 'longitude' '9.39'
+	option 'splash_prefix' '30'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '13'
+	option 'bssid' '02:07:01:03:08:04'
+
+config 'defaults' 'bssidscheme'
+	option '13'      '02:07:01:03:08:04'
+
+config 'defaults' 'interface'
+	option 'dns' '172.21.77.4 172.21.84.235 141.1.1.1'
diff --git a/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana
new file mode 100644
index 00000000..eeefbd22
--- /dev/null
+++ b/trunk/package/luci/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana
@@ -0,0 +1,15 @@
+config 'community' 'profile'
+	option 'name' 'wlan ljubljana'
+	option 'homepage' 'http://wlan-lj.net'
+	option 'ssid' 'open.wlan-lj.net'
+	option 'mesh_network' '10.254.0.0/16'
+	option 'splash_network' '10.254.120.0/21'
+	option 'splash_prefix' '27'
+	option 'latitude' '46.05063'
+	option 'longitude' '14.50402'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '8'
+
+config 'defaults' 'interface'
+	option 'dns' '10.254.0.1 10.254.0.2'
diff --git a/trunk/package/luci/contrib/package/freifunk-common/Makefile b/trunk/package/luci/contrib/package/freifunk-common/Makefile
new file mode 100644
index 00000000..c15f02dc
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/Makefile
@@ -0,0 +1,42 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-common
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-common
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk common files
+endef
+
+define Package/freifunk-common/description
+  Common files and scripts that are needed to run free wireless mesh networks.
+endef
+
+define Package/luci-mod-freifunk/conffiles
+/etc/config/freifunk
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/freifunk-common/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,freifunk-common))
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/etc/config/freifunk b/trunk/package/luci/contrib/package/freifunk-common/files/etc/config/freifunk
new file mode 100644
index 00000000..c55fe0af
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/etc/config/freifunk
@@ -0,0 +1,124 @@
+package 'freifunk'
+
+config 'public' 'contact'
+	option 'nickname' ''
+	option 'name' ''
+	option 'mail' ''
+	option 'phone' ''
+	option 'note' ''
+
+config 'public' 'community'
+	option 'name' 'Freifunk'
+	option 'homepage' 'http://freifunk.net'
+
+config 'fw_zone' 'zone_freifunk'
+	option 'name' 'freifunk'
+	option 'input' 'REJECT'
+	option 'forward' 'REJECT'
+	option 'output' 'ACCEPT'
+
+config 'fw_rule' 'fficmp'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'icmp'
+
+config 'fw_rule' 'ffhttp'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '80'
+
+config 'fw_rule' 'ffhttps'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '443'
+
+config 'fw_rule' 'ffssh'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '22'
+
+config 'fw_rule' 'ffolsr'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'udp'
+	option 'dest_port' '698'
+
+config 'fw_rule' 'ffwprobe'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '17990'
+
+config 'fw_rule' 'ffdns'
+	option 'dest_port' '53'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'udp'
+
+config 'fw_rule' 'ffdhcp'
+	option 'src_port' '68'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'dest_port' '67'
+	option 'proto' 'udp'
+	option 'leasetime' '30m'
+
+config 'fw_rule' 'ffsplash'
+	option 'dest_port' '8082'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+
+config 'fw_forwarding' 'lanfffwd'
+	option 'src' 'lan'
+	option 'dest' 'freifunk'
+
+config 'fw_forwarding' 'ffwanfwd'
+	option 'src' 'freifunk'
+	option 'dest' 'wan'
+
+config 'fw_forwarding' 'fffwd'
+	option 'src' 'freifunk'
+	option 'dest' 'freifunk'
+
+config 'include' 'freifunk'
+	option 'path' '/etc/firewall.freifunk'
+
+config 'defaults' 'system'
+	option 'zonename' 'Europe/Berlin'
+	option 'timezone' 'CET-1CEST,M3.5.0,M10.5.0/3'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '1'
+	option 'diversity' '1'
+	option 'disabled' '0'
+	option 'country' 'DE'
+	option 'hwmode' '11g'
+	option 'distance' '1000'
+
+config 'defaults' 'wifi_iface'
+	option 'mode' 'adhoc'
+	option 'encryption' 'none'
+	option 'bgscan' '0'
+	option 'bssid' '12:CA:FF:EE:BA:BE'
+	option 'sw_merge' '1'
+	option 'mcast_rate' '5500'
+	option 'probereq' '1'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.0.0'
+	option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1'
+
+config 'defaults' 'alias'
+	option 'netmask' '255.255.255.0'
+
+config 'defaults' 'dhcp'
+	option 'leasetime' '30m'
+	option 'start' '2'
+	option 'force' '1'
+
+config 'defaults' 'olsr_interfacedefaults'
+	option 'Ip4Broadcast' '255.255.255.255'
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/etc/init.d/freifunk b/trunk/package/luci/contrib/package/freifunk-common/files/etc/init.d/freifunk
new file mode 100755
index 00000000..dbe648ae
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/etc/init.d/freifunk
@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+# Freifunk Init
+# $Id$
+
+START=99
+
+boot() {
+	test -f /etc/crontabs/root || touch /etc/crontabs/root
+
+	grep -q 'killall -HUP dnsmasq' /etc/crontabs/root || {
+		echo "*/5 * * * *	killall -HUP dnsmasq" >> /etc/crontabs/root
+	}
+
+	grep -q '/usr/sbin/ff_olsr_watchdog' /etc/crontabs/root || {
+		echo "*/5 * * * *	/usr/sbin/ff_olsr_watchdog" >> /etc/crontabs/root
+	}
+
+	[ -d /etc/rc.local.d ] && {
+		for file in /etc/rc.local.d/*; do
+			test -f "$file" && . "$file"
+		done
+	}
+
+	/etc/init.d/cron restart &
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration b/trunk/package/luci/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration
new file mode 100644
index 00000000..11f1ad60
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration
@@ -0,0 +1,51 @@
+# Fixup various configurations to remove quirks
+# from former versions.
+
+_log() {
+	logger -t "Config Migration" "$1"
+}
+
+_uci() {
+	uci ${2:+-c $2} get "$1" 2>/dev/null
+}
+
+
+# Splash redirector had a wrong virtual url match
+# which resulted in "No such handler"
+
+[ "$(_uci lucid.splashredir.virtual)" == "/" ] && {
+	_log "Fix splash redirector configuration"
+	uci set lucid.splashredir.virtual=''
+	uci commit lucid
+	/etc/init.d/lucid restart
+}
+
+
+# Newer OLSR versions have the MinTCVtime hack active,
+# ensure proper timings or olsrd won't start
+
+FIX=0
+for i in 0 1 2 3 4; do
+	[ -z "$(_uci olsrd.@Interface[$i].TcInterval)" ] && \
+	[ -z "$(_uci olsrd.@Interface[$i].TcValidityTime)" ] || {
+		uci delete olsrd.@Interface[$i].TcInterval
+		uci delete olsrd.@Interface[$i].TcValidityTime
+		FIX=1
+	}
+done
+
+[ "$FIX" == 1 ] && {
+	_log "Fix olsrd configuration for MinTCVTime hack"
+	uci commit olsrd
+	/etc/init.d/olsrd restart
+}
+
+
+# Ensure that the community definitions are in the
+# new format
+
+[ -z "$(_uci freifunk.leipzig.mesh_network)" ] && \
+[ -n "$(_uci freifunk.leipzig.mesh_network /rom/etc/config)" ] && {
+	_log "Converting freifunk configuration to new format"
+	cp /rom/etc/config/freifunk /etc/config/freifunk
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/etc/uci-defaults/freifunk b/trunk/package/luci/contrib/package/freifunk-common/files/etc/uci-defaults/freifunk
new file mode 100644
index 00000000..fe6586c2
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/etc/uci-defaults/freifunk
@@ -0,0 +1,2 @@
+uci set uhttpd.main.rfc1918_filter=0
+uci commit uhttpd
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/ffdzero b/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/ffdzero
new file mode 100755
index 00000000..24e8c2e1
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/ffdzero
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+test "$1" = "-h" && echo -e "Usage:\n\t$0 -h\n\t$0 [ { ip | hostname } ]" >&2 && exit 1
+
+host="${1:-leipzig.freifunk.net}"
+
+wget -O /dev/null http://$host/cgi-bin-dev-zero.bin
+test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/dev-zero.bin
+test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/luci/freifunk/status/zeroes
+test "$?" = "1" && echo "$host: no zero download found..." && exit 1
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/neigh.sh
new file mode 100755
index 00000000..cf434245
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/neigh.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+VARS="localIP:Local remoteIP:Remote validityTime:vTime linkQuality:LQ neighborLinkQuality:NLQ linkCost:Cost"
+
+for HOST in 127.0.0.1 ::1;do
+	json_init
+	json_load "$(echo /links|nc ${HOST} 9090)"
+	if json_is_a links array;then
+		json_select links
+		for v in ${VARS};do
+			eval _${v%:*}=0
+		done
+		for j in 0 1;do
+			case ${j} in 1)
+				for v in ${VARS};do
+					eval printf \"%-\${_${v%:*}}s \" ${v#*:}
+				done
+				echo
+			;;esac
+			i=1;while json_is_a ${i} object;do
+				json_select ${i}
+				json_get_vars $(for v in ${VARS};do echo ${v%:*};done)
+				case ${j} in 0)
+					for v in ${VARS};do
+						eval "test \${_${v%:*}} -lt \${#${v%:*}} && _${v%:*}=\${#${v%:*}}"
+					done
+				;;*)
+					for v in ${VARS};do
+						eval printf \"%-\${_${v%:*}}s \" \$${v%:*}
+					done
+					echo
+				;;esac
+				json_select ..
+				i=$(( i + 1 ))
+			done
+		done
+	fi
+	echo
+done
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/watch.sh b/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/watch.sh
new file mode 100755
index 00000000..728526b9
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/usr/bin/watch.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+command="$1"
+interval="$2"; [ -z "$interval" ] && interval=1
+
+if [ -z $command ]; then
+        echo 'Usage: watch.sh "command [options]" [interval], e.g. watch "ifconfig ath0" 2'
+        echo 'interval is optional and defaults to 1'
+        exit 1
+fi
+
+while true; do clear; $command; sleep $interval; done
diff --git a/trunk/package/luci/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog b/trunk/package/luci/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
new file mode 100755
index 00000000..069f4c32
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
@@ -0,0 +1,29 @@
+#!/usr/bin/lua
+
+require "os"
+require "io"
+require "uci"
+local fs = require "nixio.fs"
+
+if fs.access("/var/run/olsrd.pid") or fs.access("/var/run/olsrd4.pid") then
+	local stamp, intv
+	local x = uci.cursor()
+
+	x:foreach("olsrd", "LoadPlugin",
+		function(s)
+			if s.library == "olsrd_watchdog.so.0.1" then
+				intv  = tonumber(s.interval)
+				stamp = s.file
+			end
+		end)
+
+	if intv and fs.access(stamp) then
+		local systime = os.time()
+		local wdgtime = tonumber(io.lines(stamp)())
+
+		if not wdgtime or ( systime - wdgtime ) > ( intv * 2 ) then
+			os.execute("logger -t 'OLSR watchdog' 'Process died - restarting!'")
+			os.execute("/etc/init.d/olsrd restart")
+		end
+	end
+end
diff --git a/trunk/package/luci/contrib/package/freifunk-common/ipkg/postinst b/trunk/package/luci/contrib/package/freifunk-common/ipkg/postinst
new file mode 100755
index 00000000..52bedb2d
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-common/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -n "${IPKG_INSTROOT}" ] || {
+	/etc/init.d/freifunk enabled || /etc/init.d/freifunk enable
+	exit 0
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-firewall/Makefile b/trunk/package/luci/contrib/package/freifunk-firewall/Makefile
new file mode 100644
index 00000000..5bcb2c8a
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-firewall/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the Apache 2.0 license.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-firewall
+PKG_RELEASE:=3
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-firewall
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk Firewall Addon
+  DEPENDS:=+firewall
+endef
+
+define Package/freifunk-firewall/description
+  Various firewall extensions for Freifunk. Includes NAT fixes and advanced settings.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/freifunk-firewall/postinst
+#!/bin/sh
+[ -n "$${IPKG_INSTROOT}" ] || {
+  if ! grep -q /etc/firewall.freifunk /etc/config/firewall; then
+    uci add firewall include >/dev/null
+    uci set firewall.@include[-1].path=/etc/firewall.freifunk
+    uci commit firewall
+  fi
+}
+endef
+
+define Package/freifunk-firewall/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,freifunk-firewall))
diff --git a/trunk/package/luci/contrib/package/freifunk-firewall/files/etc/firewall.freifunk b/trunk/package/luci/contrib/package/freifunk-firewall/files/etc/firewall.freifunk
new file mode 100644
index 00000000..d2805f66
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-firewall/files/etc/firewall.freifunk
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Freifunk Firewall addons
+
+. /lib/functions.sh
+
+#
+# Apply advanced settings
+#
+apply_advanced() {
+	local tcp_ecn
+	local tcp_window_scaling
+	local accept_redirects
+	local accept_source_route
+
+	config_get_bool tcp_ecn $1 tcp_ecn 1
+	config_get_bool tcp_window_scaling $1 tcp_window_scaling 1
+	config_get_bool accept_redirects $1 accept_redirects 0
+	config_get_bool accept_source_route $1 accept_source_route 0
+
+	logger -t firewall.freifunk "tcp_ecn is $tcp_ecn"
+	logger -t firewall.freifunk "tcp_window_scaling is $tcp_window_scaling"
+	logger -t firewall.freifunk "accept_redirects is $accept_redirects"
+	logger -t firewall.freifunk "accept_source_route is $accept_source_route"
+
+	sysctl -w net.ipv4.tcp_ecn=$tcp_ecn >/dev/null
+	sysctl -w net.ipv4.tcp_window_scaling=$tcp_window_scaling >/dev/null
+
+	for f in /proc/sys/net/ipv4/conf/*/accept_redirects; do
+		echo $accept_redirects > $f
+	done
+
+	for f in /proc/sys/net/ipv4/conf/*/accept_source_route; do
+		echo $accept_source_route > $f
+	done
+}
+
+config_foreach apply_advanced advanced
+
+[ -x /etc/init.d/freifunk-p2pblock ] && /etc/init.d/freifunk-p2pblock enabled && \
+	( sleep 3; /etc/init.d/freifunk-p2pblock restart )&
diff --git a/trunk/package/luci/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan b/trunk/package/luci/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan
new file mode 100644
index 00000000..e71c852d
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+clear_restricted_gw()
+{
+	local state="$1"
+	local iface
+	local ifname
+	local subnet
+
+	config_get iface "$state" iface
+
+	if [ "$iface" = "$INTERFACE" ]; then
+		config_get ifname "$state" ifname
+		config_get subnet "$state" subnet
+
+		logger -t firewall.freifunk "removing local restriction to the network connected to $ifname ($iface)"
+		iptables -D forwarding_freifunk_rule -o $ifname -d $subnet -j REJECT --reject-with icmp-host-prohibited
+		uci_revert_state firewall "$state"
+	fi
+}
+
+get_enabled()
+{
+	local name
+	config_get name "$1" name
+
+	if [ "$name" = "$ZONE" ]; then
+		config_get_bool local_restrict "$1" local_restrict
+	fi
+}
+
+if [ "$ACTION" = add ]; then
+	local enabled
+	local subnet
+
+	. /lib/functions/network.sh
+
+	network_find_wan wan
+
+	[ "$INTERFACE" = "$wan" ] || return 0
+
+	network_get_subnet subnet $INTERFACE
+
+	if [ -n "$subnet" ]; then
+		config_load firewall
+
+		local_restrict=0
+		config_foreach get_enabled zone
+		
+		if [ "$local_restrict" = 1 ]; then
+			logger -t firewall.freifunk "restricting local access to the network connected to $INTERFACE ($DEVICE)"
+			iptables -I forwarding_freifunk_rule -o $DEVICE -d $subnet -j REJECT --reject-with icmp-host-prohibited
+			local state="restricted_gw_${INTERFACE}"
+			uci_set_state firewall "$state" "" restricted_gw_state
+			uci_set_state firewall "$state" iface "$INTERFACE"
+			uci_set_state firewall "$state" ifname "$DEVICE"
+			uci_set_state firewall "$state" subnet "$subnet"
+		fi
+	fi
+
+elif [ "$ACTION" = remove ]; then
+	config_load firewall
+	config_foreach clear_restricted_gw restricted_gw_state	 
+fi
+
diff --git a/trunk/package/luci/contrib/package/freifunk-gwcheck/Makefile b/trunk/package/luci/contrib/package/freifunk-gwcheck/Makefile
new file mode 100644
index 00000000..6c2affe7
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-gwcheck/Makefile
@@ -0,0 +1,40 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-gwcheck
+PKG_RELEASE:=4
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-gwcheck
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk gateway check script
+  DEPENDS:=firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain
+endef
+
+define Package/freifunk-gwcheck/description
+  This script periodically checks if internet is available via your own gateway. If it detects that it is broken, then the defaultroute is removed from the main table and temporarilly placed in table gw-check until your internet works again. Config file is /etc/config/freifunk-gwcheck.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/freifunk-gwcheck/install
+	$(CP) ./files/* $(1)/
+	$(CP) ./root/* $(1)/
+endef
+
+$(eval $(call BuildPackage,freifunk-gwcheck))
diff --git a/trunk/package/luci/contrib/package/freifunk-gwcheck/files/etc/config/freifunk-gwcheck b/trunk/package/luci/contrib/package/freifunk-gwcheck/files/etc/config/freifunk-gwcheck
new file mode 100644
index 00000000..b174dd62
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-gwcheck/files/etc/config/freifunk-gwcheck
@@ -0,0 +1,5 @@
+config 'gwcheck' 'hosts'
+	list 'host' 'augsburg.freifunk.net'
+	list 'host' 'vpn4.leipzig.freifunk.net'
+	list 'host' 'luci.subsignal.org'
+	list 'host' 'bbb-vpn.berlin.freifunk.net'
diff --git a/trunk/package/luci/contrib/package/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh b/trunk/package/luci/contrib/package/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh
new file mode 100755
index 00000000..b86b6687
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh
@@ -0,0 +1,132 @@
+#!/bin/sh
+# Copyright 2013 Manuel Munz <freifunk at somakoma dot de>
+# Licensed under the GNU General Public License (GPL) v3
+# This script monitors the local internet gateway
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+. /usr/share/libubox/jshn.sh
+
+# exit if dyngw_plain is not enabled or RtTable is not (254 or unset)
+config_load olsrd
+
+check_dyngw_plain()
+{
+        local cfg="$1"
+	config_get library "$cfg" library
+	if [ "${library#olsrd_dyn_gw_plain}" != "$library" ]; then
+		config_get ignore "$cfg" ignore
+		config_get RtTable "$cfg" RtTable
+		if [ "$ignore" != "1" ] && [ -z "$RtTable" -o "$RtTable" = "254" ]; then
+			exit=0
+		fi
+	fi
+}
+
+exit=1
+config_foreach check_dyngw_plain LoadPlugin
+[ "$exit" = "1" ] && exit 1
+
+#Exit if this script is already running
+pid="$(pidof ff_olsr_test_gw.sh)"
+if [ ${#pid} -gt 5 ]; then
+	logger -p debug -t gwcheck "Gateway check script is already running, exit now"
+	exit 1
+fi
+
+# exit if there is no defaultroute with metric=0 in main or gw-check table.
+defroutemain="$(ip route show |grep default |grep -v metric)"
+defroutegwcheck="$(ip route show table gw-check |grep default |grep -v metric)"
+if [ -z "$defroutegwcheck" -a -z "$defroutemain" ]; then
+	exit 1
+fi
+
+# get and shuffle list of testservers
+testserver="$(uci -q get freifunk-gwcheck.hosts.host)"
+[ -z "$testserver" ] && echo "No testservers found, exit" && exit
+
+testserver="$(for t in $testserver; do echo $t; done | awk 'BEGIN {
+	srand();
+}
+{
+	l[NR] = $0;
+}
+
+END {
+	for (i = 1; i <= NR; i++) {
+		n = int(rand() * (NR - i + 1)) + i;
+		print l[n];
+		l[n] = l[i];
+	}
+}')"
+
+check_internet() {
+	for t in $testserver; do
+		local test
+		test=$(wget -q http://$t/conntest.html -O -| grep "Internet_works")
+		if [ "$test" == "Internet_works" ]; then
+			echo 0
+			break
+		else
+			logger -p debug -t gw-check "Could not fetch http://$t/conntest.html"
+		fi
+	done
+}
+
+resolve() {
+	echo "$(nslookup $1 2>/dev/null |grep 'Address' |grep -v '127.0.0.1' |awk '{ print $3 }')"
+}
+
+get_dnsservers() {
+	# this gets all dns servers for the interface which has the default route
+
+	dns=""
+	if [ ! -x /bin/ubus ]; then
+		# ubus not present (versions before Attitude): fallback to get these from /var/state/network.
+		# We always assume that wan is the default route interface here
+		dns="$(grep network.wan.resolv_dns /var/state/network | cut -d "=" -f 2)"
+	else
+		network_find_wan wan
+		network_get_dnsserver dns $wan
+	fi
+}
+
+iw=$(check_internet)
+
+if [ "$iw" == 0 ]; then
+	# Internet available again, restore default route and remove ip rules
+	if [ -n "$defroutegwcheck" ]; then
+		ip route add $defroutegwcheck
+		ip route del $defroutegwcheck table gw-check
+		for host in $testserver; do
+			ips="$(resolve $host)"
+			for ip in $ips; do
+				[ -n "$(ip rule show | grep "to $ip lookup gw-check")" ] && ip rule del to $ip table gw-check
+			done
+		done
+		get_dnsservers
+		for d in $dns; do
+			[ -n "$(ip rule show | grep "to $d lookup gw-check")" ] && ip rule del to $d table gw-check
+		done
+		logger -p err -t gw-check "Internet is available again, default route restored ( $defroutegwcheck)"
+	fi
+
+else
+	# Check failed. Move default route to table gw-check and setup ip rules.
+	if [ -z "$(ip rule show | grep gw-check)" -a -n "$defroutemain" ]; then
+		ip route add $defroutemain table gw-check
+		ip route del $defroutemain
+		logger -p err -t gw-check "Internet is not available, default route deactivated ( $defroutemain)"
+	fi
+	for host in $testserver; do
+		ips="$(resolve $host)"
+		for ip in $ips; do
+			[ -z "$(ip rule show | grep "to $ip lookup gw-check")" ] && ip rule add to $ip table gw-check
+		done
+	done
+	get_dnsservers
+	for d in $dns; do
+		[ -z "$(ip rule show | grep "to $d lookup gw-check")" ] && ip rule add to $d table gw-check
+	done
+	logger -p err -t gw-check "Check your internet connection!"
+fi
diff --git a/trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postinst b/trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postinst
new file mode 100644
index 00000000..1c5308ff
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/freifunk-gwcheck ) && rm -f /etc/uci-defaults/freifunk-gwcheck
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postrm b/trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postrm
new file mode 100644
index 00000000..18e4a07d
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-gwcheck/ipkg/postrm
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	sed -i '/gw-check/d' /etc/iproute2/rt_tables
+	sed -i '/ff_olsr_test_gw.sh/d' /etc/crontabs/root
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck b/trunk/package/luci/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck
new file mode 100644
index 00000000..33b1b99d
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck
@@ -0,0 +1,7 @@
+#!/bin/sh
+tables="/etc/iproute2/rt_tables"
+test -d /etc/iproute2/ || mkdir -p /etc/iproute2/
+grep -q "gw-check" $tables || echo "200 gw-check" >> $tables
+test -f /etc/crontabs/root || touch /etc/crontabs/root
+grep -q "ff_olsr_test_gw.sh" /etc/crontabs/root || echo "* * * * *	/usr/sbin/ff_olsr_test_gw.sh" >> /etc/crontabs/root
+/etc/init.d/cron restart
diff --git a/trunk/package/luci/contrib/package/freifunk-mapupdate/Makefile b/trunk/package/luci/contrib/package/freifunk-mapupdate/Makefile
new file mode 100644
index 00000000..a9281ca2
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-mapupdate/Makefile
@@ -0,0 +1,39 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-mapupdate
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-mapupdate
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Update script for freifunkmap
+  DEPENDS:=+olsrd-mod-nameservice
+endef
+
+define Package/freifunk-mapupdate/description
+  This script updates the freifunkmap (also known as the global map, see http://map.berlin.freifunk.net) every hour. Config file is /etc/config/freifunk-mapupdate.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/freifunk-mapupdate/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,freifunk-mapupdate))
diff --git a/trunk/package/luci/contrib/package/freifunk-mapupdate/files/etc/config/freifunk-mapupdate b/trunk/package/luci/contrib/package/freifunk-mapupdate/files/etc/config/freifunk-mapupdate
new file mode 100644
index 00000000..7e98f956
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-mapupdate/files/etc/config/freifunk-mapupdate
@@ -0,0 +1,3 @@
+config 'mapupdate' 'mapupdate'
+	option 'enabled' '1'
+	option 'mapserver' 'http://map.berlin.freifunk.net/freifunkmap.php'
diff --git a/trunk/package/luci/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh b/trunk/package/luci/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh
new file mode 100755
index 00000000..40a077f1
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+if [ ! "$(uci -q get freifunk-mapupdate.mapupdate.enabled)" == 1 ]; then
+	exit 1
+fi
+
+MAPSERVER="$(uci -q get freifunk-mapupdate.mapupdate.mapserver)"
+[ -z "$MAPSERVER" ] && logger -t "freifunk-mapupdate:" "No mapserver configured" && exit 1
+
+#check if nameservice plugin is installed and enabled, else exit
+nslib=`uci show olsrd |grep olsrd_nameservice.so |awk {' FS="."; print $1"."$2 '}`
+if [ -n "$nslib" ]; then
+		LATLONFILE="$(uci -q get $nslib.latlon_file)"
+		if [ -z "$LATLONFILE" ]; then
+			LATLONFILE="/var/run/latlon.js"
+		fi
+		if [ ! -p "$LATLONFILE" ]; then
+			logger -t "freifunk-mapupdate:" "latlon_file not found."; exit 1
+		fi
+else
+        logger -t "freifunk-mapupdate:" "nameservice plugin not found in olsrd config."
+        exit 1
+fi
+
+HOSTNAME="$(uci show system |grep hostname |cut -d "=" -f 2)"
+HF_INFO=""
+
+# Get info for myself
+SELF=$(cat $LATLONFILE |grep ^Self | sed -e 's/Self(//' -e 's/);//' -e "s/'//g")
+OLSR_IP="$(echo $SELF |awk '{ FS=",";print $1 }')"
+LOCATION="$(uci show system |grep .location |cut -d "=" -f 2)"
+[ -n "$LOCATION" ] && NOTE="$LOCATION<br>"
+FFNOTE="$(uci -q get freifunk.contact.note)"
+[ -n "$FFNOTE" ] && NOTE="$NOTE $FFNOTE"
+NOTE="<h3><a href='http://$OLSR_IP' target='_blank'>$HOSTNAME</a></h3><p>$NOTE"
+NOTE=`echo -e "$NOTE" | sed -e 's/\ /%20/g' -e 's/&/%26/g' -e 's/"/%22/g'`
+
+UPDATESTRING="$(echo $SELF |awk '{ FS=",";print $2 }'), $(echo $SELF |awk '{ FS=",";print $3 }')"
+
+# write our coordinates to mygooglemapscoords.txt to make Freifunk Firmware happy
+echo "$UPDATESTRING" > /tmp/mygooglemapscoords.txt
+[ ! -L /www/mygooglemapscoords.txt ] && ln -s /tmp/mygooglemapscoords.txt /www/mygooglemapscoords.txt
+
+# get neighbor Info (lat, lon, lq)
+while read line; do
+	NEIGHUPD="$(echo $line |awk '{ FS=","; print $6 }'), $(echo $line |awk '{ FS=","; print $7 }'), $(echo $line |awk '{ FS=",";print $4 }')"
+	UPDATESTRING="${UPDATESTRING}, ${NEIGHUPD}"
+done << EOF
+`grep "PLink('$OLSR_IP" $LATLONFILE | sed -e 's/PLink(//' -e 's/);//' -e "s/'//g"`
+EOF
+
+# Send UPDATESTRING
+UPDATE=`echo -e "$UPDATESTRING" | sed s/\ /%20/g`
+result="$(wget "$MAPSERVER?update=$UPDATE&updateiv=3600&olsrip=$OLSR_IP&note=${NOTE}${HF_INFO}" -qO -)"
+
+if [ ! "$result" == "success update" ]; then
+	logger -t "freifunk-mapupdate:" "Update failed: $result"
+fi
+	
diff --git a/trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postinst b/trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postinst
new file mode 100644
index 00000000..28446973
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/freifunk-mapupdate ) && rm -f /etc/uci-defaults/freifunk-mapupdate
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postrm b/trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postrm
new file mode 100644
index 00000000..dc1a8704
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-mapupdate/ipkg/postrm
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	sed -i '/ff_mapupdate.sh/d' /etc/crontabs/root
+	/etc/init.d/cron restart
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate b/trunk/package/luci/contrib/package/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate
new file mode 100644
index 00000000..dee7f1bb
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate
@@ -0,0 +1,6 @@
+#!/bin/sh
+test -f /etc/crontabs/root || touch /etc/crontabs/root
+SEED="$( dd if=/dev/urandom bs=2 count=1 2>&- | hexdump | if read line; then echo 0x${line#* }; fi )"
+MIN="$(( $SEED % 59 ))"
+grep -q "ff_mapupdate.sh" /etc/crontabs/root || echo "$MIN * * * *	/usr/sbin/ff_mapupdate.sh" >> /etc/crontabs/root
+/etc/init.d/cron restart
diff --git a/trunk/package/luci/contrib/package/freifunk-p2pblock/Makefile b/trunk/package/luci/contrib/package/freifunk-p2pblock/Makefile
new file mode 100644
index 00000000..6bf3a961
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-p2pblock/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2009 Andreas Seidler <tetzlav@subsignal.org>
+# Copyright (C) 2012 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-p2pblock
+PKG_RELEASE:=3
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-p2pblock
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk p2pblock Addon
+  DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra
+endef
+
+define Package/freifunk-p2pblock/description
+  Simple Addon for Freifunk which use iptables layer7-, ipp2p- and recent-modules 
+  to block p2p/filesharing traffic
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/freifunk-p2pblock/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/freifunk-p2pblock.init $(1)/etc/init.d/freifunk-p2pblock
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/freifunk-p2pblock.config $(1)/etc/config/freifunk_p2pblock
+endef
+
+$(eval $(call BuildPackage,freifunk-p2pblock))
diff --git a/trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.config b/trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.config
new file mode 100644
index 00000000..291260e3
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.config
@@ -0,0 +1,6 @@
+config 'settings' 'p2pblock'
+	option 'portrange' '1024:65535'
+	option 'layer7' 'edonkey bittorrent fasttrack'
+	option 'ipp2p' 'edk dc kazaa gnu bit ares soul winmx apple'
+	option 'blocktime' '60'
+	option 'whitelist' ''
diff --git a/trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init b/trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
new file mode 100644
index 00000000..5ca60c89
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init
@@ -0,0 +1,95 @@
+#!/bin/sh /etc/rc.common
+
+START=82
+ME="freifunk-p2pblock"
+LOCK='/var/run/p2pblock.lock'
+
+# helper-scripts
+ipt_add() {
+	logger -t "$ME" "set 'iptables -I $1'"
+	iptables -I $1
+	echo "iptables -D $1" >> $LOCK
+}
+
+start() {
+	/etc/init.d/freifunk-p2pblock enabled || return
+
+	if [ ! -s "$LOCK" ]; then
+		logger -s -t "$ME" 'starting p2pblock...'
+
+		config_load network
+		config_get wan wan ifname
+
+		if [ -n "$wan" ]; then
+			config_load freifunk_p2pblock
+			config_get layer7 p2pblock layer7
+			config_get ipp2p p2pblock ipp2p
+			config_get portrange p2pblock portrange
+			config_get blocktime p2pblock blocktime
+			config_get whitelist p2pblock whitelist
+
+			# load modules
+			insmod ipt_ipp2p 2>&-
+			insmod ipt_layer7 2>&-
+			insmod ipt_recent ip_list_tot=400 ip_pkt_list_tot=3 2>&-
+
+			# create new p2p-chain
+			iptables -N p2pblock
+			# pipe all incoming FORWARD with source-/destination-port 1024-65535 throu p2p-chain
+			ipt_add "FORWARD -i $wan -p tcp --sport $portrange --dport $portrange -j p2pblock"
+			ipt_add "FORWARD -i $wan -p udp --sport $portrange --dport $portrange -j p2pblock"
+
+			# if p2p-traffic blocked 3 packages to a destination ip then block all traffic within the next 180 sec (port 1024-65535)
+			ipt_add "p2pblock -m recent --rdest --rcheck --name P2PBLOCK --seconds $blocktime --hitcount 3 -j DROP"
+			ipt_add "p2pblock -m recent --rdest --rcheck --name P2PBLOCK --seconds $blocktime --hitcount 3 -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-DROP:"
+
+			# create layer7-rules
+			for proto in $layer7; do
+				ipt_add "p2pblock -m layer7 --l7proto $proto -m recent --rdest --set --name P2PBLOCK"
+				ipt_add "p2pblock -m layer7 --l7proto $proto -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-seen-$proto:"
+			done
+
+			# create ipp2p-rules
+			for proto in $ipp2p; do
+				ipt_add "p2pblock -m ipp2p --$proto -m recent --rdest --set --name P2PBLOCK"
+				ipt_add "p2pblock -m ipp2p --$proto -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-seen-$proto:"
+			done
+
+			# insert whitelisted ips
+			for ip in $whitelist; do
+				ipt_add "p2pblock -d $ip -j RETURN"
+			done
+
+			logger -s -t "$ME" 'Done.'; return 0
+		else
+			logger -s -t "$ME" 'No wan interface present.'; return 0
+		fi
+	else
+		logger -s -t "$ME" 'WARNING! already running - Aborting!'; return 2
+	fi
+}
+
+stop() {
+	if [ -s "$LOCK" ]; then
+		logger -s -t "$ME" 'stopping p2pblock...'
+
+		# unset all rules in $LOCK-file
+		cat $LOCK | sed -ne '1!G;h;$p' | while read line; do
+			logger -t "$ME" "unset $line"
+			while eval $line 2>&-; do :; done
+		done; : > "$LOCK"
+
+		# flush and delete the p2p-chain
+		iptables -F p2pblock
+		iptables -X p2pblock
+		logger -s -t "$ME" 'Done.'; return 0
+
+	else
+		logger -s -t "$ME" 'WARNING! not running - Aborting!'; return 2
+
+	fi
+}
+
+restart() {
+	stop; sleep 1; start
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-policyrouting/Makefile b/trunk/package/luci/contrib/package/freifunk-policyrouting/Makefile
new file mode 100644
index 00000000..a9301cef
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-policyrouting/Makefile
@@ -0,0 +1,47 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-policyrouting
+PKG_RELEASE:=6
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-policyrouting
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk policy routing addon
+  DEPENDS:=+ip
+endef
+
+define Package/freifunk-policyrouting/description
+  Allows you to send your own traffic via your own default gateway while sending traffic received from the mesh to a gateway in the mesh.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/freifunk-policyrouting/install
+	$(CP) ./files/* $(1)/
+endef
+
+define Package/freifunk-policyrouting/postinst
+#!/bin/sh
+[ -n "$${IPKG_INSTROOT}" ] || {
+	/etc/init.d/freifunk-policyrouting enabled || /etc/init.d/freifunk-policyrouting enable
+	exit 0
+}
+endef
+
+$(eval $(call BuildPackage,freifunk-policyrouting))
diff --git a/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
new file mode 100644
index 00000000..3dd2998f
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
@@ -0,0 +1,7 @@
+
+config 'settings' 'pr'
+	option 'enable' '0'
+	option 'strict' '1'
+        option 'fallback' '1'
+	option 'zones' ''
+
diff --git a/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
new file mode 100644
index 00000000..327e8793
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+
+proto="4"
+[ -f /proc/net/ipv6_route ] && proto="4 6"
+
+config_load freifunk-policyrouting
+config_get enable pr enable
+config_get fallback pr fallback
+config_get strict pr strict
+config_get zones pr zones
+
+if [ "$ACTION" = "ifup" ] && [ "$enable" = "1" ]; then
+	network_get_subnet net $INTERFACE
+	network_get_subnet6 net6 $INTERFACE
+	network_get_physdev dev $INTERFACE
+
+	if [ "$net" != "" -a -n "$dev" ]; then
+		eval $(/bin/ipcalc.sh $net)
+		if [ "$PREFIX" != "0" -a "$NETWORK" != "127.0.0.0" ]; then
+			if [ ! "$(ip r s t localnets |grep "$NETWORK/$PREFIX dev")" ]; then
+				cmd="ip r a $NETWORK/$PREFIX dev $dev table localnets"
+				$cmd
+				if [ "$?" = 0 ]; then
+					logger -s -t policyrouting "Add route: $cmd"
+				else
+					logger -s -t policyrouting "Error! Could not add route: $cmd"
+				fi
+			fi
+
+		fi
+
+		if [ -n "$net6" ]; then
+			cmd="ip -6 r a $net6 dev $dev table localnets"
+			$cmd 2>&1 > /dev/null
+			if [ "$?" = 0 ]; then
+				logger -s -t policyrouting "Add route: $cmd (IPv6)"
+			fi
+
+		fi
+
+		networks=""
+		for z in $zones; do
+			network_zone="$(uci -q get firewall.zone_${z}.network)"
+			if [ -z "$network_zone" ]; then
+				network_zone="$z"
+			fi
+			networks="$networks $network_zone"
+		done
+		for n in $networks; do
+			if [ "$INTERFACE" = "$n" ]; then
+				for p in $proto; do
+					if [ ! "$(ip -$p ru s | grep "from all iif $dev lookup olsr-default")" ]; then
+						ip -$p rule add dev "$dev" lookup olsr-default prio 20000
+						if [ "$strict" != 0 ]; then
+							ip -$p rule add dev "$dev" unreachable prio 20001
+						fi
+						if [ "$?" = 0 ]; then
+							logger -s -t policyrouting "Use mesh gateway for interface $dev (IPv$p)"
+							if [ -z "$(uci -P /var/state get freifunk-policyrouting.${INTERFACE})" ]; then
+								uci -P /var/state set freifunk-policyrouting.${INTERFACE}="state"
+							fi
+							uci -P /var/state set freifunk-policyrouting.${INTERFACE}.device="$dev"
+						else
+							logger -s -t policyrouting "Error: Could not add rule: dev "$dev" lookup olsr-default prio 20000 (IPv$p)"
+						fi
+					fi
+				done
+			fi
+		done
+	fi
+
+fi
+
+if [ "$ACTION" = "ifdown" ]; then
+	dev="$(uci -q -P /var/state get freifunk-policyrouting.${INTERFACE}.device)"
+	if [ -n "$dev" ]; then
+		networks=""
+		for z in $zones; do
+			network_zone="$(uci -q get firewall.zone_${z}.network)"
+			if [ -z "$network_zone" ]; then
+				network_zone="$z"
+			fi
+			networks="$networks $network_zone"
+		done
+		for n in $networks; do
+			if [ "$INTERFACE" = "$n" ]; then
+				for p in $proto; do
+					if [ "$(ip -$p ru s | grep "from all iif $dev lookup olsr-default")" ]; then
+						ip -$p rule del dev "$dev" lookup olsr-default prio 20000
+						ip -$p rule del dev "$dev" unreachable prio 20001
+						if [ "$?" = 0 ]; then
+							logger -s -t policyrouting "Remove rule: dev "$dev" lookup olsr-default prio 20000 (IPv$p)"
+						else
+							logger -s -t policyrouting "Error! Could not remove rule: dev "$dev" lookup olsr-default prio 20000 (IPv$p)"
+						fi
+					fi
+				done
+			fi
+		done
+	fi
+fi
diff --git a/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
new file mode 100755
index 00000000..05a75407
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
@@ -0,0 +1,161 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+. /lib/functions/network.sh
+. /lib/functions.sh
+
+proto="4"
+[ -f /proc/net/ipv6_route ] && proto="4 6"
+[ -f /etc/config/olsrd ] && cfgs="olsrd"
+[ -f /etc/config/olsrd6 ] && cfgs="$cfgs olsrd6"
+
+config_load freifunk-policyrouting
+config_get enable pr enable
+config_get fallback pr fallback
+config_get zones pr zones
+
+
+olsrd_rmtables() {
+	for cfg in $cfgs; do
+		# Remove custom routing tables from olsrd 
+		if [ "`uci -q get $cfg.@olsrd[0].RtTable`" == "111" ] || [ "`uci -q get $cfg.@olsrd[0].RtTableDefault`" == "112" ]; then
+			uci delete $cfg.@olsrd[0].RtTable
+			uci delete $cfg.@olsrd[0].RtTableDefault
+			uci commit
+		fi
+	done
+}
+
+olsrd_intalltables() {
+	for cfg in $cfgs; do
+		if [ ! "`uci -q get $cfg.@olsrd[0].RtTable`" == "111" ] || [ ! "`uci -q get $cfg.@olsrd[0].RtTableDefault`" == "112" ]; then
+			uci set $cfg.@olsrd[0].RtTable='111'
+			uci set $cfg.@olsrd[0].RtTableDefault='112'
+			uci commit $cfg
+			/etc/init.d/$cfg restart 2&> /dev/null
+		fi
+	done
+}
+
+rt_tables() {
+	tables="/etc/iproute2/rt_tables"
+	if [ -z "`grep "110" $tables`" ]; then
+		echo "110 localnets" >> $tables
+	fi
+	if [ -z "`grep "111" $tables`" ]; then
+		echo "111 olsr" >> $tables
+	fi
+	if [ -z "`grep "112" $tables`" ]; then
+		echo "112 olsr-default" >> $tables
+	fi
+
+}
+
+disable_dyngw() {
+	for cfg in $cfgs; do
+		local dyngwlib=`uci show $cfg |grep dyn_gw.so |awk {' FS="."; print $1"."$2 '}`
+		if [ -n "$dyngwlib" ]; then
+			uci set $dyngwlib.ignore=1
+			uci commit $cfg
+		fi
+
+		dyngwplainlib=`uci show $cfg |grep dyn_gw_plain |awk {' FS="."; print $1"."$2 '}`
+		if [ -n "$dyngwplainlib" ]; then
+			rttable="$(uci -q get $dyngwplainlib.RtTable)"
+			if [ -z "$rttable" ] || [ "$rttable" = "254" ]; then 
+				uci set $dyngwplainlib.ignore=1
+				uci commit $cfg
+			fi
+		fi
+	done
+}
+
+restart_services() {
+	logger -s -t policyrouting -p info "Restarting services"
+	/etc/init.d/network restart 2&> /dev/null
+	for cfg in $cfgs; do
+		/etc/init.d/$cfg restart 2&> /dev/null
+	done
+}
+
+boot() {
+	if [ "$enable" = "1" ]; then
+		[ -d /var/state ] || mkdir -p /var/state
+		touch /var/state/freifunk-policyrouting
+		start noservicerestart
+	else
+		olsrd_rmtables
+	fi
+}
+
+add_lookup_rule() {
+	name=${1/-/_}
+	lookup=$2
+	prio=$3
+
+	if [ -z "$name" -o -z "$lookup" -o -z "$prio" ]; then
+		logger -s -t policyrouting "Missing parameters for add_rule!"
+	else
+		for p in $proto; do
+			if [ "$p" = "6" ]; then
+				rule="rule6"
+			else
+				rule="rule"
+			fi
+
+			uci batch <<- EOF
+				set network.${name}ipv${p}="$rule"
+				set network.${name}ipv${p}.lookup="$lookup"
+				set network.${name}ipv${p}.priority="$prio"
+			EOF
+		done
+	fi
+}
+
+del_lookup_rule() {
+	name=${1/-/_}
+	for p in $proto; do
+		uci -q delete network.${name}ipv${p}
+	done
+}
+
+start() {
+	if [ $enable = "1" ]; then
+		logger -s -t policyrouting "Starting policy routing."
+		rt_tables
+		olsrd_intalltables
+		disable_dyngw
+
+		add_lookup_rule olsr olsr 1000
+		add_lookup_rule localnets localnets 2000
+
+		if [ "$fallback" = 1 ]; then
+			add_lookup_rule olsr-default olsr-default 100000
+		fi
+	fi
+	uci commit network
+	if [ ! "$1" = "noservicerestart" ]; then
+		restart_services
+	fi
+}
+
+stop() {
+	logger -s -t policyrouting "Stopping policy routing"
+	olsrd_rmtables
+	del_lookup_rule olsr-default
+	del_lookup_rule olsr
+	del_lookup_rule localnets
+	uci commit network
+	restart_services
+	echo "Hint: To completely disable freifunk-policyrouting set enable=0 in /etc/config/freifunk-policyrouting."
+}
+
+restart() {
+	logger -s -t policyrouting "Restarting policy routing"
+	olsrd_rmtables
+	del_lookup_rule olsr-default
+	del_lookup_rule olsr
+	del_lookup_rule localnets
+	uci commit network
+	start
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/rc.d/S15-freifunk-policyrouting b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/rc.d/S15-freifunk-policyrouting
new file mode 100755
index 00000000..05a75407
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/rc.d/S15-freifunk-policyrouting
@@ -0,0 +1,161 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+. /lib/functions/network.sh
+. /lib/functions.sh
+
+proto="4"
+[ -f /proc/net/ipv6_route ] && proto="4 6"
+[ -f /etc/config/olsrd ] && cfgs="olsrd"
+[ -f /etc/config/olsrd6 ] && cfgs="$cfgs olsrd6"
+
+config_load freifunk-policyrouting
+config_get enable pr enable
+config_get fallback pr fallback
+config_get zones pr zones
+
+
+olsrd_rmtables() {
+	for cfg in $cfgs; do
+		# Remove custom routing tables from olsrd 
+		if [ "`uci -q get $cfg.@olsrd[0].RtTable`" == "111" ] || [ "`uci -q get $cfg.@olsrd[0].RtTableDefault`" == "112" ]; then
+			uci delete $cfg.@olsrd[0].RtTable
+			uci delete $cfg.@olsrd[0].RtTableDefault
+			uci commit
+		fi
+	done
+}
+
+olsrd_intalltables() {
+	for cfg in $cfgs; do
+		if [ ! "`uci -q get $cfg.@olsrd[0].RtTable`" == "111" ] || [ ! "`uci -q get $cfg.@olsrd[0].RtTableDefault`" == "112" ]; then
+			uci set $cfg.@olsrd[0].RtTable='111'
+			uci set $cfg.@olsrd[0].RtTableDefault='112'
+			uci commit $cfg
+			/etc/init.d/$cfg restart 2&> /dev/null
+		fi
+	done
+}
+
+rt_tables() {
+	tables="/etc/iproute2/rt_tables"
+	if [ -z "`grep "110" $tables`" ]; then
+		echo "110 localnets" >> $tables
+	fi
+	if [ -z "`grep "111" $tables`" ]; then
+		echo "111 olsr" >> $tables
+	fi
+	if [ -z "`grep "112" $tables`" ]; then
+		echo "112 olsr-default" >> $tables
+	fi
+
+}
+
+disable_dyngw() {
+	for cfg in $cfgs; do
+		local dyngwlib=`uci show $cfg |grep dyn_gw.so |awk {' FS="."; print $1"."$2 '}`
+		if [ -n "$dyngwlib" ]; then
+			uci set $dyngwlib.ignore=1
+			uci commit $cfg
+		fi
+
+		dyngwplainlib=`uci show $cfg |grep dyn_gw_plain |awk {' FS="."; print $1"."$2 '}`
+		if [ -n "$dyngwplainlib" ]; then
+			rttable="$(uci -q get $dyngwplainlib.RtTable)"
+			if [ -z "$rttable" ] || [ "$rttable" = "254" ]; then 
+				uci set $dyngwplainlib.ignore=1
+				uci commit $cfg
+			fi
+		fi
+	done
+}
+
+restart_services() {
+	logger -s -t policyrouting -p info "Restarting services"
+	/etc/init.d/network restart 2&> /dev/null
+	for cfg in $cfgs; do
+		/etc/init.d/$cfg restart 2&> /dev/null
+	done
+}
+
+boot() {
+	if [ "$enable" = "1" ]; then
+		[ -d /var/state ] || mkdir -p /var/state
+		touch /var/state/freifunk-policyrouting
+		start noservicerestart
+	else
+		olsrd_rmtables
+	fi
+}
+
+add_lookup_rule() {
+	name=${1/-/_}
+	lookup=$2
+	prio=$3
+
+	if [ -z "$name" -o -z "$lookup" -o -z "$prio" ]; then
+		logger -s -t policyrouting "Missing parameters for add_rule!"
+	else
+		for p in $proto; do
+			if [ "$p" = "6" ]; then
+				rule="rule6"
+			else
+				rule="rule"
+			fi
+
+			uci batch <<- EOF
+				set network.${name}ipv${p}="$rule"
+				set network.${name}ipv${p}.lookup="$lookup"
+				set network.${name}ipv${p}.priority="$prio"
+			EOF
+		done
+	fi
+}
+
+del_lookup_rule() {
+	name=${1/-/_}
+	for p in $proto; do
+		uci -q delete network.${name}ipv${p}
+	done
+}
+
+start() {
+	if [ $enable = "1" ]; then
+		logger -s -t policyrouting "Starting policy routing."
+		rt_tables
+		olsrd_intalltables
+		disable_dyngw
+
+		add_lookup_rule olsr olsr 1000
+		add_lookup_rule localnets localnets 2000
+
+		if [ "$fallback" = 1 ]; then
+			add_lookup_rule olsr-default olsr-default 100000
+		fi
+	fi
+	uci commit network
+	if [ ! "$1" = "noservicerestart" ]; then
+		restart_services
+	fi
+}
+
+stop() {
+	logger -s -t policyrouting "Stopping policy routing"
+	olsrd_rmtables
+	del_lookup_rule olsr-default
+	del_lookup_rule olsr
+	del_lookup_rule localnets
+	uci commit network
+	restart_services
+	echo "Hint: To completely disable freifunk-policyrouting set enable=0 in /etc/config/freifunk-policyrouting."
+}
+
+restart() {
+	logger -s -t policyrouting "Restarting policy routing"
+	olsrd_rmtables
+	del_lookup_rule olsr-default
+	del_lookup_rule olsr
+	del_lookup_rule localnets
+	uci commit network
+	start
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting
new file mode 100644
index 00000000..a1e63101
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting
@@ -0,0 +1,7 @@
+#!/bin/sh
+uci batch <<-EOF
+        add ucitrack freifunk-policyrouting
+        add_list ucitrack.@freifunk-policyrouting[-1].exec="/etc/init.d/freifunk-policyrouting restart"
+        commit ucitrack
+EOF
+
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/Makefile b/trunk/package/luci/contrib/package/freifunk-watchdog/Makefile
new file mode 100644
index 00000000..33ba33da
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-watchdog
+PKG_RELEASE:=8
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS := uci
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-watchdog
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk Ad-Hoc watchdog daemon
+  DEPENDS:=libuci
+endef
+
+define Package/freifunk-watchdog/description
+  A watchdog daemon that monitors wireless interfaces to ensure the correct bssid and channel.
+  The process will initiate a wireless restart as soon as it detects a bssid or channel mismatch.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+endef
+
+define Package/freifunk-watchdog/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/freifunk-watchdog.init $(1)/etc/init.d/freifunk-watchdog
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/freifunk-watchdog.config $(1)/etc/config/freifunk-watchdog
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ffwatchd $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,freifunk-watchdog))
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.config b/trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.config
new file mode 100644
index 00000000..b6e65433
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.config
@@ -0,0 +1,7 @@
+config process
+	option process 'dropbear'
+	option initscript '/etc/init.d/dropbear'
+
+config process
+	option process 'crond'
+	option initscript '/etc/init.d/cron'
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.init b/trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.init
new file mode 100755
index 00000000..d6ede09b
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/files/freifunk-watchdog.init
@@ -0,0 +1,39 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+PID=/var/run/ffwatchd.pid
+BIN=/usr/sbin/ffwatchd
+
+boot()
+{
+	# If watchdog service is enabled, install cronjob, create device node and start daemon
+	if /etc/init.d/freifunk-watchdog enabled 2>/dev/null; then
+		if ! grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then
+			echo "* * * * *	$BIN running || /etc/init.d/freifunk-watchdog restart" >> /etc/crontabs/root
+		fi
+
+		mknod /dev/watchdog c 10 130
+
+		start
+		
+	# If service is disabled, find and remove related cronjob
+	elif grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then
+		sed -i -e "\\'$BIN'd" /etc/crontabs/root
+	fi
+}
+
+start()
+{
+	start-stop-daemon -q -b -m -p $PID -x $BIN -S
+}
+
+stop()
+{
+	start-stop-daemon -q -p $PID -x $BIN -K
+
+	if ! /etc/init.d/freifunk-watchdog enabled; then
+		if grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then
+			sed -i -e "\\'$BIN'd" /etc/crontabs/root
+		fi
+	fi
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/src/Makefile b/trunk/package/luci/contrib/package/freifunk-watchdog/src/Makefile
new file mode 100644
index 00000000..e049ebc8
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/src/Makefile
@@ -0,0 +1,12 @@
+WD_BINARY:=ffwatchd
+WD_CFLAGS:=$(CFLAGS) -c -DBINARY=\"$(WD_BINARY)\"
+WD_LDFLAGS:=$(LDFLAGS) -lm -luci
+
+watchdog:
+	$(CC) $(WD_CFLAGS) -o ucix.o ucix.c
+	$(CC) $(WD_CFLAGS) -o watchdog.o watchdog.c
+	$(CC) $(WD_LDFLAGS) -o $(WD_BINARY) watchdog.o ucix.o
+
+clean:
+	rm -f *~ $(WD_BINARY) *.o
+
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.c b/trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.c
new file mode 100644
index 00000000..ad8e70d1
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.c
@@ -0,0 +1,102 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that 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 (C) 2008 John Crispin <blogic@librecmc.org> 
+ *
+ *   Changed by Jo-Philipp Wich <xm@subsignal.org>
+ */
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <uci_config.h>
+#include <uci.h>
+#include "ucix.h"
+
+static struct uci_ptr ptr;
+
+static inline int ucix_get_ptr(struct uci_context *ctx, const char *p, const char *s, const char *o, const char *t)
+{
+	memset(&ptr, 0, sizeof(ptr));
+	ptr.package = p;
+	ptr.section = s;
+	ptr.option = o;
+	ptr.value = t;
+	return uci_lookup_ptr(ctx, &ptr, NULL, true);
+}
+
+struct uci_context* ucix_init(const char *config_file)
+{
+	struct uci_context *ctx = uci_alloc_context();
+#ifdef uci_to_delta
+	uci_add_delta_path(ctx, "/var/state");
+#else
+	uci_add_history_path(ctx, "/var/state");
+#endif
+	if(uci_load(ctx, config_file, NULL) != UCI_OK)
+	{
+		return NULL;
+	}
+	return ctx;
+}
+
+void ucix_cleanup(struct uci_context *ctx)
+{
+	uci_free_context(ctx);
+}
+
+const char* ucix_get_option(struct uci_context *ctx, const char *p, const char *s, const char *o)
+{
+	struct uci_element *e = NULL;
+	const char *value = NULL;
+	if(ucix_get_ptr(ctx, p, s, o, NULL))
+		return NULL;
+	if (!(ptr.flags & UCI_LOOKUP_COMPLETE))
+		return NULL;
+	e = ptr.last;
+	switch (e->type)
+	{
+	case UCI_TYPE_SECTION:
+		value = uci_to_section(e)->type;
+		break;
+	case UCI_TYPE_OPTION:
+		switch(ptr.o->type) {
+			case UCI_TYPE_STRING:
+				value = ptr.o->v.string;
+				break;
+			default:
+				value = NULL;
+				break;
+		}
+		break;
+	default:
+		return 0;
+	}
+
+	return value;
+}
+
+void ucix_for_each_section_type(struct uci_context *ctx,
+	const char *p, const char *t,
+	void (*cb)(const char*, void*), void *priv)
+{
+	struct uci_element *e;
+	if(ucix_get_ptr(ctx, p, NULL, NULL, NULL))
+		return;
+	uci_foreach_element(&ptr.p->sections, e)
+		if (!strcmp(t, uci_to_section(e)->type))
+			cb(e->name, priv);
+}
+
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.h b/trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.h
new file mode 100644
index 00000000..9c15880c
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/src/ucix.h
@@ -0,0 +1,29 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that 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 (C) 2008 John Crispin <blogic@librecmc.org> 
+ */
+
+#ifndef _UCI_H__
+#define _UCI_H__
+struct uci_context* ucix_init(const char *config_file);
+
+void ucix_for_each_section_type(struct uci_context *ctx,
+	const char *p, const char *t,
+	void (*cb)(const char*, void*), void *priv);
+
+const char* ucix_get_option(struct uci_context *ctx,
+	const char *p, const char *s, const char *o);
+#endif
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.c b/trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.c
new file mode 100644
index 00000000..ce66adad
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.c
@@ -0,0 +1,527 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that 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 (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ */
+
+#include "watchdog.h"
+
+/* Global watchdog fd, required by signal handler */
+int wdfd = -1;
+
+/* Handle finished childs */
+static void sigchld_handler(int sig)
+{
+	pid_t pid;
+
+	while( (pid = waitpid(-1, NULL, WNOHANG)) > 0 )
+		syslog(LOG_INFO, "Child returned (pid %d)", pid);
+}
+
+/* Watchdog shutdown helper */
+static void shutdown_watchdog(int sig)
+{
+	static const char wshutdown = WATCH_SHUTDOWN;
+
+	if( wdfd > -1 )
+	{
+		syslog(LOG_INFO, "Stopping watchdog timer");
+		write(wdfd, &wshutdown, 1);
+		close(wdfd);
+		wdfd = -1;
+	}
+
+	exit(0);
+}
+
+/* Get BSSID of given interface */
+static int iw_get_bssid(int iwfd, const char *ifname, char *bssid)
+{
+	struct iwreq iwrq;
+
+	if( iw_ioctl(iwfd, ifname, SIOCGIWAP, &iwrq) >= 0 )
+	{
+		unsigned char *addr = (unsigned char *)iwrq.u.ap_addr.sa_data;
+
+		sprintf(bssid, "%02X:%02X:%02X:%02X:%02X:%02X",
+			addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+
+		return 0;
+	}
+
+	return -1;
+}
+
+/* Get channel of given interface */
+static int iw_get_channel(int iwfd, const char *ifname, int *channel)
+{
+	int i;
+	char buffer[sizeof(struct iw_range)];
+	double cur_freq, cmp_freq;
+	struct iwreq iwrq;
+	struct iw_range *range;
+
+	memset(buffer, 0, sizeof(buffer));
+
+	iwrq.u.data.pointer = (char *)buffer;
+	iwrq.u.data.length = sizeof(buffer);
+	iwrq.u.data.flags = 0;
+
+	if( iw_ioctl(iwfd, ifname, SIOCGIWRANGE, &iwrq) < 0)
+	{
+		*channel = -1;
+		return -1;
+	}
+
+	range = (struct iw_range *)buffer;
+
+	if( iw_ioctl(iwfd, ifname, SIOCGIWFREQ, &iwrq) >= 0 )
+	{
+		cur_freq = ((double)iwrq.u.freq.m) * pow(10, iwrq.u.freq.e);
+		if( cur_freq < 1000.00 )
+		{
+			*channel = (int)cur_freq;
+			return 0;
+		}
+
+		for(i = 0; i < range->num_frequency; i++)
+		{
+			cmp_freq = ((double)range->freq[i].m) * pow(10, range->freq[i].e);
+			if( cmp_freq == cur_freq )
+			{
+				*channel = (int)range->freq[i].i;
+				return 0;
+			}
+		}
+	}
+
+	*channel = -1;
+	return -1;
+}
+
+/* Get the (first) pid of given process name */
+static int find_process(const char *name)
+{
+	int pid = -1;
+	int file;
+	char buffer[128];
+	char cmpname[128];
+	DIR *dir;
+	struct dirent *entry;
+
+	if( (dir = opendir("/proc")) != NULL )
+	{
+		snprintf(cmpname, sizeof(cmpname), "Name:\t%s\n", name);
+
+		while( (entry = readdir(dir)) != NULL )
+		{
+			if( !strcmp(entry->d_name, "..") || !isdigit(*entry->d_name) )
+				continue;
+
+			sprintf(buffer, "/proc/%s/status", entry->d_name);
+			if( (file = open(buffer, O_RDONLY)) > -1 )
+			{
+				read(file, buffer, sizeof(buffer));
+				close(file);
+
+				if( strstr(buffer, cmpname) == buffer )
+				{
+					pid = atoi(entry->d_name);
+
+					/* Skip myself ... */
+					if( pid == getpid() )
+						pid = -1;
+					else
+						break;
+				}
+			}
+		}
+
+		closedir(dir);
+		return pid;
+	}
+
+	syslog(LOG_CRIT, "Unable to open /proc: %s",
+		strerror(errno));
+
+	return -1;
+}
+
+/* Get the 5 minute load average */
+static double find_loadavg(void)
+{
+	int fd;
+	char buffer[10];
+	double load = 0.00;
+
+	if( (fd = open("/proc/loadavg", O_RDONLY)) > -1 )
+	{
+		if( read(fd, buffer, sizeof(buffer)) == sizeof(buffer) )
+			load = atof(&buffer[5]);
+
+		close(fd);
+	}
+
+	return load;
+}
+
+/* Check if given uci file was updated */
+static int check_uci_update(const char *config, time_t *mtime)
+{
+	struct stat s;
+	char path[128];
+
+	snprintf(path, sizeof(path), "/var/state/%s", config);
+	if( stat(path, &s) > -1 )
+	{
+		if( (*mtime == 0) || (s.st_mtime > *mtime) )
+		{
+			*mtime = s.st_mtime;
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/* Add tuple */
+static void load_wifi_uci_add_iface(const char *section, struct uci_wifi_iface_itr_ctx *itr)
+{
+	wifi_tuple_t *t;
+	const char *ucitmp;
+	int val = 0;
+
+	ucitmp = ucix_get_option(itr->ctx, "wireless", section, "mode");
+	if( ucitmp && !strncmp(ucitmp, "adhoc", 5) )
+	{
+		if( (t = (wifi_tuple_t *)malloc(sizeof(wifi_tuple_t))) != NULL )
+		{
+			ucitmp = ucix_get_option(itr->ctx, "wireless", section, "ifname");
+			if(ucitmp)
+			{
+				strncpy(t->ifname, ucitmp, sizeof(t->ifname));
+				val++;
+			}
+
+			ucitmp = ucix_get_option(itr->ctx, "wireless", section, "bssid");
+			if(ucitmp)
+			{
+				strncpy(t->bssid, ucitmp, sizeof(t->bssid));
+				val++;
+			}
+
+			ucitmp = ucix_get_option(itr->ctx, "wireless", section, "device");
+			if(ucitmp)
+			{
+				ucitmp = ucix_get_option(itr->ctx, "wireless", ucitmp, "channel");
+				if(ucitmp)
+				{
+					t->channel = atoi(ucitmp);
+					val++;
+				}
+			}
+
+			if( val == 3 )
+			{
+				syslog(LOG_INFO, "Monitoring %s: bssid=%s channel=%d",
+					t->ifname, t->bssid, t->channel);
+
+				t->next = itr->list;
+				itr->list = t;
+			}
+			else
+			{
+				free(t);
+			}
+		}
+	}
+}
+
+/* Load config */
+static wifi_tuple_t * load_wifi_uci(wifi_tuple_t *ifs, time_t *modtime)
+{
+	struct uci_context *ctx;
+	struct uci_wifi_iface_itr_ctx itr;
+	wifi_tuple_t *cur, *next;
+
+	if( check_uci_update("wireless", modtime) )
+	{
+		syslog(LOG_INFO, "Wireless config changed, reloading");
+
+		if( (ctx = ucix_init("wireless")) != NULL )
+		{
+			if( ifs != NULL )
+			{
+				for(cur = ifs; cur; cur = next)
+				{
+					next = cur->next;
+					free(cur);
+				}
+			}
+
+			itr.list = NULL;
+			itr.ctx = ctx;
+
+			ucix_for_each_section_type(ctx, "wireless", "wifi-iface",
+				(void *)load_wifi_uci_add_iface, &itr);
+
+			return itr.list;
+		}
+	}
+
+	return ifs;
+}
+
+/* Add tuple */
+static void load_watchdog_uci_add_process(const char *section, struct uci_process_itr_ctx *itr)
+{
+	process_tuple_t *t;
+	const char *ucitmp;
+	int val = 0;
+
+	if( (t = (process_tuple_t *)malloc(sizeof(process_tuple_t))) != NULL )
+	{
+		t->restart = 0;
+
+		ucitmp = ucix_get_option(itr->ctx, "freifunk-watchdog", section, "process");
+		if(ucitmp)
+		{
+			strncpy(t->process, ucitmp, sizeof(t->process));
+			val++;
+		}
+
+		ucitmp = ucix_get_option(itr->ctx, "freifunk-watchdog", section, "initscript");
+		if(ucitmp)
+		{
+			strncpy(t->initscript, ucitmp, sizeof(t->initscript));
+			val++;
+		}
+
+		if( val == 2 )
+		{
+			syslog(LOG_INFO, "Monitoring %s: initscript=%s",
+				t->process, t->initscript);
+
+				t->next = itr->list;
+				itr->list = t;
+		}
+		else
+		{
+			free(t);
+		}
+	}
+}
+
+/* Load config */
+static process_tuple_t * load_watchdog_uci(process_tuple_t *procs)
+{
+	struct uci_context *ctx;
+	struct uci_process_itr_ctx itr;
+	process_tuple_t *cur, *next;
+
+	syslog(LOG_INFO, "Loading watchdog config");
+
+	if( (ctx = ucix_init("freifunk-watchdog")) != NULL )
+	{
+		if( procs != NULL )
+		{
+			for(cur = procs; cur; cur = next)
+			{
+				next = cur->next;
+				free(cur);
+			}
+		}
+
+		itr.list = NULL;
+		itr.ctx = ctx;
+
+		ucix_for_each_section_type(ctx, "freifunk-watchdog", "process",
+			(void *)load_watchdog_uci_add_process, &itr);
+
+		return itr.list;
+	}
+
+	return procs;
+}
+
+/* Daemon implementation */
+static int do_daemon(void)
+{
+	static int wdtrigger = 1;
+	static int wdtimeout = BASE_INTERVAL * 2;
+	static const char wdkeepalive = WATCH_KEEPALIVE;
+
+	int iwfd;
+	int channel;
+	char bssid[18];
+	struct sigaction sa;
+
+	wifi_tuple_t *ifs = NULL, *curr_if;
+	process_tuple_t *procs = NULL, *curr_proc;
+	time_t wireless_modtime = 0;
+
+	int action_intv = 0;
+	int restart_wifi = 0;
+	int loadavg_panic = 0;
+
+	openlog(SYSLOG_IDENT, 0, LOG_DAEMON);
+	memset(&sa, 0, sizeof(sa));
+
+	if( (iwfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1 )
+	{
+		syslog(LOG_ERR, "Can not open wireless control socket: %s",
+			strerror(errno));
+
+		return 1;
+	}
+
+	if( (wdfd = open(WATCH_DEVICE, O_WRONLY)) > -1 )
+	{
+		syslog(LOG_INFO, "Opened %s - polling every %i seconds",
+			WATCH_DEVICE, BASE_INTERVAL);
+
+		/* Install signal handler to halt watchdog on shutdown */
+		sa.sa_handler = shutdown_watchdog;
+		sa.sa_flags = SA_NOCLDWAIT | SA_RESTART;
+		sigaction(SIGHUP,  &sa, NULL);
+		sigaction(SIGINT,  &sa, NULL);
+		sigaction(SIGPIPE, &sa, NULL);
+		sigaction(SIGTERM, &sa, NULL);
+		sigaction(SIGUSR1, &sa, NULL);
+		sigaction(SIGUSR2, &sa, NULL);
+
+		/* Set watchdog timeout to twice the interval */
+		ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtimeout);
+	}
+
+	/* Install signal handler to reap childs */
+	sa.sa_handler = sigchld_handler;
+	sa.sa_flags = 0;
+	sigaction(SIGCHLD, &sa, NULL);
+
+	/* Load watchdog configuration only once */
+	procs = load_watchdog_uci(procs);
+
+	while( 1 )
+	{
+		/* Check/increment action interval */
+		if( ++action_intv >= ACTION_INTERVAL )
+		{
+			/* Reset action interval */
+			action_intv = 0;
+
+			/* Check average load */
+			if( find_loadavg() >= LOAD_TRESHOLD )
+				loadavg_panic++;
+			else
+				loadavg_panic = 0;
+
+			/* Check wireless interfaces */
+			ifs = load_wifi_uci(ifs, &wireless_modtime);
+			for( curr_if = ifs; curr_if; curr_if = curr_if->next )
+			{
+				/* Get current channel and bssid */
+				if( (iw_get_bssid(iwfd, curr_if->ifname, bssid) == 0) &&
+			    (iw_get_channel(iwfd, curr_if->ifname, &channel) == 0) )
+				{
+					/* Check BSSID */
+					if( strcasecmp(bssid, curr_if->bssid) != 0 )
+					{
+						syslog(LOG_WARNING, "BSSID mismatch on %s: current=%s wanted=%s",
+							curr_if->ifname, bssid, curr_if->bssid);
+
+						restart_wifi++;
+					}
+
+					/* Check channel */
+					else if( channel != curr_if->channel )
+					{
+						syslog(LOG_WARNING, "Channel mismatch on %s: current=%d wanted=%d",
+							curr_if->ifname, channel, curr_if->channel);
+
+						restart_wifi++;
+					}
+				}
+				else
+				{
+					syslog(LOG_WARNING, "Requested interface %s not present", curr_if->ifname);
+				}
+			}
+
+			/* Check processes */
+			for( curr_proc = procs; curr_proc; curr_proc = curr_proc->next )
+			{
+				if( find_process(curr_proc->process) < 0 )
+					curr_proc->restart++;
+				else
+					curr_proc->restart = 0;
+
+				/* Process restart required? */
+				if( curr_proc->restart >= HYSTERESIS )
+				{
+					curr_proc->restart = 0;
+					syslog(LOG_WARNING, "The %s process died, restarting", curr_proc->process);
+					EXEC(PROC_ACTION);
+				}
+			}
+
+
+			/* Wifi restart required? */
+			if( restart_wifi >= HYSTERESIS )
+			{
+				restart_wifi = 0;
+				syslog(LOG_WARNING, "Channel or BSSID mismatch on wireless interface, restarting");
+				EXEC(WIFI_ACTION);
+			}
+
+			/* Is there a load problem? */
+			if( loadavg_panic >= HYSTERESIS )
+			{
+				syslog(LOG_EMERG, "Critical system load level, triggering reset!");
+
+				/* Try watchdog, fall back to reboot */
+				if( wdfd > -1 )
+					ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtrigger);
+				else
+					EXEC(LOAD_ACTION);
+			}
+		}
+
+
+		/* Reset watchdog timer */
+		if( wdfd > -1 )
+			write(wdfd, &wdkeepalive, 1);
+
+		sleep(BASE_INTERVAL);
+	}
+
+	shutdown_watchdog(0);
+	closelog();
+
+	return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+	/* Check if watchdog is running ... */
+	if( (argc > 1) && (strcmp(argv[1], "running") == 0) )
+	{
+		return (find_process(BINARY) == -1);
+	}
+
+	/* Start daemon */
+	return do_daemon();
+}
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.h b/trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.h
new file mode 100644
index 00000000..34d616c3
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/src/watchdog.h
@@ -0,0 +1,141 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that 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 (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <ctype.h>
+#include <errno.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <math.h>
+#include <time.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <linux/types.h>
+#include <linux/watchdog.h>
+
+#include "ucix.h"
+#include "wireless.22.h"
+
+
+/* Watchdog poll interval */
+#define BASE_INTERVAL	5
+
+/* Action interval (N * BASE_INTERVAL) */
+#define ACTION_INTERVAL	6
+
+/* Hysteresis */
+#define HYSTERESIS		3
+
+/* How to call myself in the logs */
+#define SYSLOG_IDENT	"Freifunk Watchdog"
+
+/* Process error action */
+#define PROC_ACTION		curr_proc->initscript, curr_proc->initscript, "restart"
+
+/* Wifi error action */
+#define WIFI_ACTION		"/sbin/wifi", "/sbin/wifi"
+
+/* Watchdog device */
+#define WATCH_DEVICE	"/dev/watchdog"
+#define WATCH_SHUTDOWN	'V'
+#define WATCH_KEEPALIVE	'\0'
+
+/* System load error action and treshold */
+#define LOAD_TRESHOLD	15.00
+#define LOAD_ACTION		"/sbin/reboot", "/sbin/reboot"
+
+/* Fallback binary name (passed by makefile) */
+#ifndef BINARY
+#define BINARY "ffwatchd"
+#endif
+
+
+/* ifname/bssid/channel tuples */
+struct wifi_tuple {
+	char ifname[16];
+	char bssid[18];
+	int channel;
+	struct wifi_tuple *next;
+};
+
+/* structure to hold tuple-list and uci context during iteration */
+struct uci_wifi_iface_itr_ctx {
+	struct wifi_tuple *list;
+	struct uci_context *ctx;
+};
+
+typedef struct wifi_tuple wifi_tuple_t;
+
+
+/* process name/exec tuples */
+struct process_tuple {
+	char process[PATH_MAX + 1];
+	char initscript[PATH_MAX + 1];
+	int restart;
+	struct process_tuple *next;
+};
+
+/* structure to hold tuple-list and uci context during iteration */
+struct uci_process_itr_ctx {
+	struct process_tuple *list;
+	struct uci_context *ctx;
+};
+
+typedef struct process_tuple process_tuple_t;
+
+
+/* ioctl() helper (stolen from iwlib) */
+static inline int
+iw_ioctl(int                  skfd,           /* Socket to the kernel */
+         const char *         ifname,         /* Device name */
+         int                  request,        /* WE ID */
+         struct iwreq *       pwrq)           /* Fixed part of the request */
+{
+  /* Set device name */
+  strncpy(pwrq->ifr_ifrn.ifrn_name, ifname, 16);
+
+  /* Do the request */
+  return(ioctl(skfd, request, pwrq));
+}
+
+/* fork() & execl() helper */
+#define EXEC(x)														\
+	do {															\
+		switch(fork())												\
+		{															\
+			case -1:												\
+				syslog(LOG_CRIT, "Unable to fork child: %s",		\
+					strerror(errno));								\
+				break;												\
+																	\
+			case 0:													\
+				execl(x, NULL);										\
+				syslog(LOG_CRIT, "Unable to execute action: %s",	\
+					strerror(errno));								\
+				return 1;											\
+		}															\
+	} while(0)
+
diff --git a/trunk/package/luci/contrib/package/freifunk-watchdog/src/wireless.22.h b/trunk/package/luci/contrib/package/freifunk-watchdog/src/wireless.22.h
new file mode 100644
index 00000000..1d19243f
--- /dev/null
+++ b/trunk/package/luci/contrib/package/freifunk-watchdog/src/wireless.22.h
@@ -0,0 +1,1139 @@
+/*
+ * This file define a set of standard wireless extensions
+ *
+ * Version :	22	16.3.07
+ *
+ * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>
+ * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
+ */
+
+#ifndef _LINUX_WIRELESS_H
+#define _LINUX_WIRELESS_H
+
+/************************** DOCUMENTATION **************************/
+/*
+ * Initial APIs (1996 -> onward) :
+ * -----------------------------
+ * Basically, the wireless extensions are for now a set of standard ioctl
+ * call + /proc/net/wireless
+ *
+ * The entry /proc/net/wireless give statistics and information on the
+ * driver.
+ * This is better than having each driver having its entry because
+ * its centralised and we may remove the driver module safely.
+ *
+ * Ioctl are used to configure the driver and issue commands.  This is
+ * better than command line options of insmod because we may want to
+ * change dynamically (while the driver is running) some parameters.
+ *
+ * The ioctl mechanimsm are copied from standard devices ioctl.
+ * We have the list of command plus a structure descibing the
+ * data exchanged...
+ * Note that to add these ioctl, I was obliged to modify :
+ *	# net/core/dev.c (two place + add include)
+ *	# net/ipv4/af_inet.c (one place + add include)
+ *
+ * /proc/net/wireless is a copy of /proc/net/dev.
+ * We have a structure for data passed from the driver to /proc/net/wireless
+ * Too add this, I've modified :
+ *	# net/core/dev.c (two other places)
+ *	# include/linux/netdevice.h (one place)
+ *	# include/linux/proc_fs.h (one place)
+ *
+ * New driver API (2002 -> onward) :
+ * -------------------------------
+ * This file is only concerned with the user space API and common definitions.
+ * The new driver API is defined and documented in :
+ *	# include/net/iw_handler.h
+ *
+ * Note as well that /proc/net/wireless implementation has now moved in :
+ *	# net/core/wireless.c
+ *
+ * Wireless Events (2002 -> onward) :
+ * --------------------------------
+ * Events are defined at the end of this file, and implemented in :
+ *	# net/core/wireless.c
+ *
+ * Other comments :
+ * --------------
+ * Do not add here things that are redundant with other mechanisms
+ * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
+ * wireless specific.
+ *
+ * These wireless extensions are not magic : each driver has to provide
+ * support for them...
+ *
+ * IMPORTANT NOTE : As everything in the kernel, this is very much a
+ * work in progress. Contact me if you have ideas of improvements...
+ */
+
+/***************************** INCLUDES *****************************/
+
+/* This header is used in user-space, therefore need to be sanitised
+ * for that purpose. Those includes are usually not compatible with glibc.
+ * To know which includes to use in user-space, check iwlib.h. */
+#ifdef __KERNEL__
+#include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
+#include <linux/if.h>			/* for IFNAMSIZ and co... */
+#endif	/* __KERNEL__ */
+
+/***************************** VERSION *****************************/
+/*
+ * This constant is used to know the availability of the wireless
+ * extensions and to know which version of wireless extensions it is
+ * (there is some stuff that will be added in the future...)
+ * I just plan to increment with each new version.
+ */
+#define WIRELESS_EXT	22
+
+/*
+ * Changes :
+ *
+ * V2 to V3
+ * --------
+ *	Alan Cox start some incompatibles changes. I've integrated a bit more.
+ *	- Encryption renamed to Encode to avoid US regulation problems
+ *	- Frequency changed from float to struct to avoid problems on old 386
+ *
+ * V3 to V4
+ * --------
+ *	- Add sensitivity
+ *
+ * V4 to V5
+ * --------
+ *	- Missing encoding definitions in range
+ *	- Access points stuff
+ *
+ * V5 to V6
+ * --------
+ *	- 802.11 support (ESSID ioctls)
+ *
+ * V6 to V7
+ * --------
+ *	- define IW_ESSID_MAX_SIZE and IW_MAX_AP
+ *
+ * V7 to V8
+ * --------
+ *	- Changed my e-mail address
+ *	- More 802.11 support (nickname, rate, rts, frag)
+ *	- List index in frequencies
+ *
+ * V8 to V9
+ * --------
+ *	- Support for 'mode of operation' (ad-hoc, managed...)
+ *	- Support for unicast and multicast power saving
+ *	- Change encoding to support larger tokens (>64 bits)
+ *	- Updated iw_params (disable, flags) and use it for NWID
+ *	- Extracted iw_point from iwreq for clarity
+ *
+ * V9 to V10
+ * ---------
+ *	- Add PM capability to range structure
+ *	- Add PM modifier : MAX/MIN/RELATIVE
+ *	- Add encoding option : IW_ENCODE_NOKEY
+ *	- Add TxPower ioctls (work like TxRate)
+ *
+ * V10 to V11
+ * ----------
+ *	- Add WE version in range (help backward/forward compatibility)
+ *	- Add retry ioctls (work like PM)
+ *
+ * V11 to V12
+ * ----------
+ *	- Add SIOCSIWSTATS to get /proc/net/wireless programatically
+ *	- Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
+ *	- Add new statistics (frag, retry, beacon)
+ *	- Add average quality (for user space calibration)
+ *
+ * V12 to V13
+ * ----------
+ *	- Document creation of new driver API.
+ *	- Extract union iwreq_data from struct iwreq (for new driver API).
+ *	- Rename SIOCSIWNAME as SIOCSIWCOMMIT
+ *
+ * V13 to V14
+ * ----------
+ *	- Wireless Events support : define struct iw_event
+ *	- Define additional specific event numbers
+ *	- Add "addr" and "param" fields in union iwreq_data
+ *	- AP scanning stuff (SIOCSIWSCAN and friends)
+ *
+ * V14 to V15
+ * ----------
+ *	- Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
+ *	- Make struct iw_freq signed (both m & e), add explicit padding
+ *	- Add IWEVCUSTOM for driver specific event/scanning token
+ *	- Add IW_MAX_GET_SPY for driver returning a lot of addresses
+ *	- Add IW_TXPOW_RANGE for range of Tx Powers
+ *	- Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
+ *	- Add IW_MODE_MONITOR for passive monitor
+ *
+ * V15 to V16
+ * ----------
+ *	- Increase the number of bitrates in iw_range to 32 (for 802.11g)
+ *	- Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
+ *	- Reshuffle struct iw_range for increases, add filler
+ *	- Increase IW_MAX_AP to 64 for driver returning a lot of addresses
+ *	- Remove IW_MAX_GET_SPY because conflict with enhanced spy support
+ *	- Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
+ *	- Add IW_ENCODE_TEMP and iw_range->encoding_login_index
+ *
+ * V16 to V17
+ * ----------
+ *	- Add flags to frequency -> auto/fixed
+ *	- Document (struct iw_quality *)->updated, add new flags (INVALID)
+ *	- Wireless Event capability in struct iw_range
+ *	- Add support for relative TxPower (yick !)
+ *
+ * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
+ * ----------
+ *	- Add support for WPA/WPA2
+ *	- Add extended encoding configuration (SIOCSIWENCODEEXT and
+ *	  SIOCGIWENCODEEXT)
+ *	- Add SIOCSIWGENIE/SIOCGIWGENIE
+ *	- Add SIOCSIWMLME
+ *	- Add SIOCSIWPMKSA
+ *	- Add struct iw_range bit field for supported encoding capabilities
+ *	- Add optional scan request parameters for SIOCSIWSCAN
+ *	- Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA
+ *	  related parameters (extensible up to 4096 parameter values)
+ *	- Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE,
+ *	  IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND
+ *
+ * V18 to V19
+ * ----------
+ *	- Remove (struct iw_point *)->pointer from events and streams
+ *	- Remove header includes to help user space
+ *	- Increase IW_ENCODING_TOKEN_MAX from 32 to 64
+ *	- Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
+ *	- Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
+ *	- Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
+ *
+ * V19 to V20
+ * ----------
+ *	- RtNetlink requests support (SET/GET)
+ *
+ * V20 to V21
+ * ----------
+ *	- Remove (struct net_device *)->get_wireless_stats()
+ *	- Change length in ESSID and NICK to strlen() instead of strlen()+1
+ *	- Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
+ *	- Power/Retry relative values no longer * 100000
+ *	- Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
+ *
+ * V21 to V22
+ * ----------
+ *	- Prevent leaking of kernel space in stream on 64 bits.
+ */
+
+/**************************** CONSTANTS ****************************/
+
+/* -------------------------- IOCTL LIST -------------------------- */
+
+/* Wireless Identification */
+#define SIOCSIWCOMMIT	0x8B00		/* Commit pending changes to driver */
+#define SIOCGIWNAME	0x8B01		/* get name == wireless protocol */
+/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
+ * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
+ * Don't put the name of your driver there, it's useless. */
+
+/* Basic operations */
+#define SIOCSIWNWID	0x8B02		/* set network id (pre-802.11) */
+#define SIOCGIWNWID	0x8B03		/* get network id (the cell) */
+#define SIOCSIWFREQ	0x8B04		/* set channel/frequency (Hz) */
+#define SIOCGIWFREQ	0x8B05		/* get channel/frequency (Hz) */
+#define SIOCSIWMODE	0x8B06		/* set operation mode */
+#define SIOCGIWMODE	0x8B07		/* get operation mode */
+#define SIOCSIWSENS	0x8B08		/* set sensitivity (dBm) */
+#define SIOCGIWSENS	0x8B09		/* get sensitivity (dBm) */
+
+/* Informative stuff */
+#define SIOCSIWRANGE	0x8B0A		/* Unused */
+#define SIOCGIWRANGE	0x8B0B		/* Get range of parameters */
+#define SIOCSIWPRIV	0x8B0C		/* Unused */
+#define SIOCGIWPRIV	0x8B0D		/* get private ioctl interface info */
+#define SIOCSIWSTATS	0x8B0E		/* Unused */
+#define SIOCGIWSTATS	0x8B0F		/* Get /proc/net/wireless stats */
+/* SIOCGIWSTATS is strictly used between user space and the kernel, and
+ * is never passed to the driver (i.e. the driver will never see it). */
+
+/* Spy support (statistics per MAC address - used for Mobile IP support) */
+#define SIOCSIWSPY	0x8B10		/* set spy addresses */
+#define SIOCGIWSPY	0x8B11		/* get spy info (quality of link) */
+#define SIOCSIWTHRSPY	0x8B12		/* set spy threshold (spy event) */
+#define SIOCGIWTHRSPY	0x8B13		/* get spy threshold */
+
+/* Access Point manipulation */
+#define SIOCSIWAP	0x8B14		/* set access point MAC addresses */
+#define SIOCGIWAP	0x8B15		/* get access point MAC addresses */
+#define SIOCGIWAPLIST	0x8B17		/* Deprecated in favor of scanning */
+#define SIOCSIWSCAN	0x8B18		/* trigger scanning (list cells) */
+#define SIOCGIWSCAN	0x8B19		/* get scanning results */
+
+/* 802.11 specific support */
+#define SIOCSIWESSID	0x8B1A		/* set ESSID (network name) */
+#define SIOCGIWESSID	0x8B1B		/* get ESSID */
+#define SIOCSIWNICKN	0x8B1C		/* set node name/nickname */
+#define SIOCGIWNICKN	0x8B1D		/* get node name/nickname */
+/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
+ * within the 'iwreq' structure, so we need to use the 'data' member to
+ * point to a string in user space, like it is done for RANGE... */
+
+/* Other parameters useful in 802.11 and some other devices */
+#define SIOCSIWRATE	0x8B20		/* set default bit rate (bps) */
+#define SIOCGIWRATE	0x8B21		/* get default bit rate (bps) */
+#define SIOCSIWRTS	0x8B22		/* set RTS/CTS threshold (bytes) */
+#define SIOCGIWRTS	0x8B23		/* get RTS/CTS threshold (bytes) */
+#define SIOCSIWFRAG	0x8B24		/* set fragmentation thr (bytes) */
+#define SIOCGIWFRAG	0x8B25		/* get fragmentation thr (bytes) */
+#define SIOCSIWTXPOW	0x8B26		/* set transmit power (dBm) */
+#define SIOCGIWTXPOW	0x8B27		/* get transmit power (dBm) */
+#define SIOCSIWRETRY	0x8B28		/* set retry limits and lifetime */
+#define SIOCGIWRETRY	0x8B29		/* get retry limits and lifetime */
+
+/* Encoding stuff (scrambling, hardware security, WEP...) */
+#define SIOCSIWENCODE	0x8B2A		/* set encoding token & mode */
+#define SIOCGIWENCODE	0x8B2B		/* get encoding token & mode */
+/* Power saving stuff (power management, unicast and multicast) */
+#define SIOCSIWPOWER	0x8B2C		/* set Power Management settings */
+#define SIOCGIWPOWER	0x8B2D		/* get Power Management settings */
+/* Modulation bitmask */
+#define SIOCSIWMODUL	0x8B2E		/* set Modulations settings */
+#define SIOCGIWMODUL	0x8B2F		/* get Modulations settings */
+
+/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM).
+ * This ioctl uses struct iw_point and data buffer that includes IE id and len
+ * fields. More than one IE may be included in the request. Setting the generic
+ * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers
+ * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers
+ * are required to report the used IE as a wireless event, e.g., when
+ * associating with an AP. */
+#define SIOCSIWGENIE	0x8B30		/* set generic IE */
+#define SIOCGIWGENIE	0x8B31		/* get generic IE */
+
+/* WPA : IEEE 802.11 MLME requests */
+#define SIOCSIWMLME	0x8B16		/* request MLME operation; uses
+					 * struct iw_mlme */
+/* WPA : Authentication mode parameters */
+#define SIOCSIWAUTH	0x8B32		/* set authentication mode params */
+#define SIOCGIWAUTH	0x8B33		/* get authentication mode params */
+
+/* WPA : Extended version of encoding configuration */
+#define SIOCSIWENCODEEXT 0x8B34		/* set encoding token & mode */
+#define SIOCGIWENCODEEXT 0x8B35		/* get encoding token & mode */
+
+/* WPA2 : PMKSA cache management */
+#define SIOCSIWPMKSA	0x8B36		/* PMKSA cache operation */
+
+/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
+
+/* These 32 ioctl are wireless device private, for 16 commands.
+ * Each driver is free to use them for whatever purpose it chooses,
+ * however the driver *must* export the description of those ioctls
+ * with SIOCGIWPRIV and *must* use arguments as defined below.
+ * If you don't follow those rules, DaveM is going to hate you (reason :
+ * it make mixed 32/64bit operation impossible).
+ */
+#define SIOCIWFIRSTPRIV	0x8BE0
+#define SIOCIWLASTPRIV	0x8BFF
+/* Previously, we were using SIOCDEVPRIVATE, but we now have our
+ * separate range because of collisions with other tools such as
+ * 'mii-tool'.
+ * We now have 32 commands, so a bit more space ;-).
+ * Also, all 'even' commands are only usable by root and don't return the
+ * content of ifr/iwr to user (but you are not obliged to use the set/get
+ * convention, just use every other two command). More details in iwpriv.c.
+ * And I repeat : you are not forced to use them with iwpriv, but you
+ * must be compliant with it.
+ */
+
+/* ------------------------- IOCTL STUFF ------------------------- */
+
+/* The first and the last (range) */
+#define SIOCIWFIRST	0x8B00
+#define SIOCIWLAST	SIOCIWLASTPRIV		/* 0x8BFF */
+#define IW_IOCTL_IDX(cmd)	((cmd) - SIOCIWFIRST)
+
+/* Odd : get (world access), even : set (root access) */
+#define IW_IS_SET(cmd)	(!((cmd) & 0x1))
+#define IW_IS_GET(cmd)	((cmd) & 0x1)
+
+/* ----------------------- WIRELESS EVENTS ----------------------- */
+/* Those are *NOT* ioctls, do not issue request on them !!! */
+/* Most events use the same identifier as ioctl requests */
+
+#define IWEVTXDROP	0x8C00		/* Packet dropped to excessive retry */
+#define IWEVQUAL	0x8C01		/* Quality part of statistics (scan) */
+#define IWEVCUSTOM	0x8C02		/* Driver specific ascii string */
+#define IWEVREGISTERED	0x8C03		/* Discovered a new node (AP mode) */
+#define IWEVEXPIRED	0x8C04		/* Expired a node (AP mode) */
+#define IWEVGENIE	0x8C05		/* Generic IE (WPA, RSN, WMM, ..)
+					 * (scan results); This includes id and
+					 * length fields. One IWEVGENIE may
+					 * contain more than one IE. Scan
+					 * results may contain one or more
+					 * IWEVGENIE events. */
+#define IWEVMICHAELMICFAILURE 0x8C06	/* Michael MIC failure
+					 * (struct iw_michaelmicfailure)
+					 */
+#define IWEVASSOCREQIE	0x8C07		/* IEs used in (Re)Association Request.
+					 * The data includes id and length
+					 * fields and may contain more than one
+					 * IE. This event is required in
+					 * Managed mode if the driver
+					 * generates its own WPA/RSN IE. This
+					 * should be sent just before
+					 * IWEVREGISTERED event for the
+					 * association. */
+#define IWEVASSOCRESPIE	0x8C08		/* IEs used in (Re)Association
+					 * Response. The data includes id and
+					 * length fields and may contain more
+					 * than one IE. This may be sent
+					 * between IWEVASSOCREQIE and
+					 * IWEVREGISTERED events for the
+					 * association. */
+#define IWEVPMKIDCAND	0x8C09		/* PMKID candidate for RSN
+					 * pre-authentication
+					 * (struct iw_pmkid_cand) */
+
+#define IWEVFIRST	0x8C00
+#define IW_EVENT_IDX(cmd)	((cmd) - IWEVFIRST)
+
+/* ------------------------- PRIVATE INFO ------------------------- */
+/*
+ * The following is used with SIOCGIWPRIV. It allow a driver to define
+ * the interface (name, type of data) for its private ioctl.
+ * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
+ */
+
+#define IW_PRIV_TYPE_MASK	0x7000	/* Type of arguments */
+#define IW_PRIV_TYPE_NONE	0x0000
+#define IW_PRIV_TYPE_BYTE	0x1000	/* Char as number */
+#define IW_PRIV_TYPE_CHAR	0x2000	/* Char as character */
+#define IW_PRIV_TYPE_INT	0x4000	/* 32 bits int */
+#define IW_PRIV_TYPE_FLOAT	0x5000	/* struct iw_freq */
+#define IW_PRIV_TYPE_ADDR	0x6000	/* struct sockaddr */
+
+#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed number of args */
+
+#define IW_PRIV_SIZE_MASK	0x07FF	/* Max number of those args */
+
+/*
+ * Note : if the number of args is fixed and the size < 16 octets,
+ * instead of passing a pointer we will put args in the iwreq struct...
+ */
+
+/* ----------------------- OTHER CONSTANTS ----------------------- */
+
+/* Maximum frequencies in the range struct */
+#define IW_MAX_FREQUENCIES	32
+/* Note : if you have something like 80 frequencies,
+ * don't increase this constant and don't fill the frequency list.
+ * The user will be able to set by channel anyway... */
+
+/* Maximum bit rates in the range struct */
+#define IW_MAX_BITRATES		32
+
+/* Maximum tx powers in the range struct */
+#define IW_MAX_TXPOWER		8
+/* Note : if you more than 8 TXPowers, just set the max and min or
+ * a few of them in the struct iw_range. */
+
+/* Maximum of address that you may set with SPY */
+#define IW_MAX_SPY		8
+
+/* Maximum of address that you may get in the
+   list of access points in range */
+#define IW_MAX_AP		64
+
+/* Maximum size of the ESSID and NICKN strings */
+#define IW_ESSID_MAX_SIZE	32
+
+/* Modes of operation */
+#define IW_MODE_AUTO	0	/* Let the driver decides */
+#define IW_MODE_ADHOC	1	/* Single cell network */
+#define IW_MODE_INFRA	2	/* Multi cell network, roaming, ... */
+#define IW_MODE_MASTER	3	/* Synchronisation master or Access Point */
+#define IW_MODE_REPEAT	4	/* Wireless Repeater (forwarder) */
+#define IW_MODE_SECOND	5	/* Secondary master/repeater (backup) */
+#define IW_MODE_MONITOR	6	/* Passive monitor (listen only) */
+
+/* Statistics flags (bitmask in updated) */
+#define IW_QUAL_QUAL_UPDATED	0x01	/* Value was updated since last read */
+#define IW_QUAL_LEVEL_UPDATED	0x02
+#define IW_QUAL_NOISE_UPDATED	0x04
+#define IW_QUAL_ALL_UPDATED	0x07
+#define IW_QUAL_DBM		0x08	/* Level + Noise are dBm */
+#define IW_QUAL_QUAL_INVALID	0x10	/* Driver doesn't provide value */
+#define IW_QUAL_LEVEL_INVALID	0x20
+#define IW_QUAL_NOISE_INVALID	0x40
+#define IW_QUAL_RCPI		0x80	/* Level + Noise are 802.11k RCPI */
+#define IW_QUAL_ALL_INVALID	0x70
+
+/* Frequency flags */
+#define IW_FREQ_AUTO		0x00	/* Let the driver decides */
+#define IW_FREQ_FIXED		0x01	/* Force a specific value */
+
+/* Maximum number of size of encoding token available
+ * they are listed in the range structure */
+#define IW_MAX_ENCODING_SIZES	8
+
+/* Maximum size of the encoding token in bytes */
+#define IW_ENCODING_TOKEN_MAX	64	/* 512 bits (for now) */
+
+/* Flags for encoding (along with the token) */
+#define IW_ENCODE_INDEX		0x00FF	/* Token index (if needed) */
+#define IW_ENCODE_FLAGS		0xFF00	/* Flags defined below */
+#define IW_ENCODE_MODE		0xF000	/* Modes defined below */
+#define IW_ENCODE_DISABLED	0x8000	/* Encoding disabled */
+#define IW_ENCODE_ENABLED	0x0000	/* Encoding enabled */
+#define IW_ENCODE_RESTRICTED	0x4000	/* Refuse non-encoded packets */
+#define IW_ENCODE_OPEN		0x2000	/* Accept non-encoded packets */
+#define IW_ENCODE_NOKEY		0x0800  /* Key is write only, so not present */
+#define IW_ENCODE_TEMP		0x0400  /* Temporary key */
+
+/* Power management flags available (along with the value, if any) */
+#define IW_POWER_ON		0x0000	/* No details... */
+#define IW_POWER_TYPE		0xF000	/* Type of parameter */
+#define IW_POWER_PERIOD		0x1000	/* Value is a period/duration of  */
+#define IW_POWER_TIMEOUT	0x2000	/* Value is a timeout (to go asleep) */
+#define IW_POWER_SAVING		0x4000	/* Value is relative (how aggressive)*/
+#define IW_POWER_MODE		0x0F00	/* Power Management mode */
+#define IW_POWER_UNICAST_R	0x0100	/* Receive only unicast messages */
+#define IW_POWER_MULTICAST_R	0x0200	/* Receive only multicast messages */
+#define IW_POWER_ALL_R		0x0300	/* Receive all messages though PM */
+#define IW_POWER_FORCE_S	0x0400	/* Force PM procedure for sending unicast */
+#define IW_POWER_REPEATER	0x0800	/* Repeat broadcast messages in PM period */
+#define IW_POWER_MODIFIER	0x000F	/* Modify a parameter */
+#define IW_POWER_MIN		0x0001	/* Value is a minimum  */
+#define IW_POWER_MAX		0x0002	/* Value is a maximum */
+#define IW_POWER_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
+
+/* Transmit Power flags available */
+#define IW_TXPOW_TYPE		0x00FF	/* Type of value */
+#define IW_TXPOW_DBM		0x0000	/* Value is in dBm */
+#define IW_TXPOW_MWATT		0x0001	/* Value is in mW */
+#define IW_TXPOW_RELATIVE	0x0002	/* Value is in arbitrary units */
+#define IW_TXPOW_RANGE		0x1000	/* Range of value between min/max */
+
+/* Retry limits and lifetime flags available */
+#define IW_RETRY_ON		0x0000	/* No details... */
+#define IW_RETRY_TYPE		0xF000	/* Type of parameter */
+#define IW_RETRY_LIMIT		0x1000	/* Maximum number of retries*/
+#define IW_RETRY_LIFETIME	0x2000	/* Maximum duration of retries in us */
+#define IW_RETRY_MODIFIER	0x00FF	/* Modify a parameter */
+#define IW_RETRY_MIN		0x0001	/* Value is a minimum  */
+#define IW_RETRY_MAX		0x0002	/* Value is a maximum */
+#define IW_RETRY_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
+#define IW_RETRY_SHORT		0x0010	/* Value is for short packets  */
+#define IW_RETRY_LONG		0x0020	/* Value is for long packets */
+
+/* Scanning request flags */
+#define IW_SCAN_DEFAULT		0x0000	/* Default scan of the driver */
+#define IW_SCAN_ALL_ESSID	0x0001	/* Scan all ESSIDs */
+#define IW_SCAN_THIS_ESSID	0x0002	/* Scan only this ESSID */
+#define IW_SCAN_ALL_FREQ	0x0004	/* Scan all Frequencies */
+#define IW_SCAN_THIS_FREQ	0x0008	/* Scan only this Frequency */
+#define IW_SCAN_ALL_MODE	0x0010	/* Scan all Modes */
+#define IW_SCAN_THIS_MODE	0x0020	/* Scan only this Mode */
+#define IW_SCAN_ALL_RATE	0x0040	/* Scan all Bit-Rates */
+#define IW_SCAN_THIS_RATE	0x0080	/* Scan only this Bit-Rate */
+/* struct iw_scan_req scan_type */
+#define IW_SCAN_TYPE_ACTIVE 0
+#define IW_SCAN_TYPE_PASSIVE 1
+/* Maximum size of returned data */
+#define IW_SCAN_MAX_DATA	4096	/* In bytes */
+
+/* Max number of char in custom event - use multiple of them if needed */
+#define IW_CUSTOM_MAX		256	/* In bytes */
+
+/* Generic information element */
+#define IW_GENERIC_IE_MAX	1024
+
+/* MLME requests (SIOCSIWMLME / struct iw_mlme) */
+#define IW_MLME_DEAUTH		0
+#define IW_MLME_DISASSOC	1
+#define IW_MLME_AUTH		2
+#define IW_MLME_ASSOC		3
+
+/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */
+#define IW_AUTH_INDEX		0x0FFF
+#define IW_AUTH_FLAGS		0xF000
+/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095)
+ * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the
+ * parameter that is being set/get to; value will be read/written to
+ * struct iw_param value field) */
+#define IW_AUTH_WPA_VERSION		0
+#define IW_AUTH_CIPHER_PAIRWISE		1
+#define IW_AUTH_CIPHER_GROUP		2
+#define IW_AUTH_KEY_MGMT		3
+#define IW_AUTH_TKIP_COUNTERMEASURES	4
+#define IW_AUTH_DROP_UNENCRYPTED	5
+#define IW_AUTH_80211_AUTH_ALG		6
+#define IW_AUTH_WPA_ENABLED		7
+#define IW_AUTH_RX_UNENCRYPTED_EAPOL	8
+#define IW_AUTH_ROAMING_CONTROL		9
+#define IW_AUTH_PRIVACY_INVOKED		10
+
+/* IW_AUTH_WPA_VERSION values (bit field) */
+#define IW_AUTH_WPA_VERSION_DISABLED	0x00000001
+#define IW_AUTH_WPA_VERSION_WPA		0x00000002
+#define IW_AUTH_WPA_VERSION_WPA2	0x00000004
+
+/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */
+#define IW_AUTH_CIPHER_NONE	0x00000001
+#define IW_AUTH_CIPHER_WEP40	0x00000002
+#define IW_AUTH_CIPHER_TKIP	0x00000004
+#define IW_AUTH_CIPHER_CCMP	0x00000008
+#define IW_AUTH_CIPHER_WEP104	0x00000010
+
+/* IW_AUTH_KEY_MGMT values (bit field) */
+#define IW_AUTH_KEY_MGMT_802_1X	1
+#define IW_AUTH_KEY_MGMT_PSK	2
+
+/* IW_AUTH_80211_AUTH_ALG values (bit field) */
+#define IW_AUTH_ALG_OPEN_SYSTEM	0x00000001
+#define IW_AUTH_ALG_SHARED_KEY	0x00000002
+#define IW_AUTH_ALG_LEAP	0x00000004
+
+/* IW_AUTH_ROAMING_CONTROL values */
+#define IW_AUTH_ROAMING_ENABLE	0	/* driver/firmware based roaming */
+#define IW_AUTH_ROAMING_DISABLE	1	/* user space program used for roaming
+					 * control */
+
+/* SIOCSIWENCODEEXT definitions */
+#define IW_ENCODE_SEQ_MAX_SIZE	8
+/* struct iw_encode_ext ->alg */
+#define IW_ENCODE_ALG_NONE	0
+#define IW_ENCODE_ALG_WEP	1
+#define IW_ENCODE_ALG_TKIP	2
+#define IW_ENCODE_ALG_CCMP	3
+/* struct iw_encode_ext ->ext_flags */
+#define IW_ENCODE_EXT_TX_SEQ_VALID	0x00000001
+#define IW_ENCODE_EXT_RX_SEQ_VALID	0x00000002
+#define IW_ENCODE_EXT_GROUP_KEY		0x00000004
+#define IW_ENCODE_EXT_SET_TX_KEY	0x00000008
+
+/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */
+#define IW_MICFAILURE_KEY_ID	0x00000003 /* Key ID 0..3 */
+#define IW_MICFAILURE_GROUP	0x00000004
+#define IW_MICFAILURE_PAIRWISE	0x00000008
+#define IW_MICFAILURE_STAKEY	0x00000010
+#define IW_MICFAILURE_COUNT	0x00000060 /* 1 or 2 (0 = count not supported)
+					    */
+
+/* Bit field values for enc_capa in struct iw_range */
+#define IW_ENC_CAPA_WPA		0x00000001
+#define IW_ENC_CAPA_WPA2	0x00000002
+#define IW_ENC_CAPA_CIPHER_TKIP	0x00000004
+#define IW_ENC_CAPA_CIPHER_CCMP	0x00000008
+
+/* Event capability macros - in (struct iw_range *)->event_capa
+ * Because we have more than 32 possible events, we use an array of
+ * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */
+#define IW_EVENT_CAPA_BASE(cmd)		((cmd >= SIOCIWFIRSTPRIV) ? \
+					 (cmd - SIOCIWFIRSTPRIV + 0x60) : \
+					 (cmd - SIOCSIWCOMMIT))
+#define IW_EVENT_CAPA_INDEX(cmd)	(IW_EVENT_CAPA_BASE(cmd) >> 5)
+#define IW_EVENT_CAPA_MASK(cmd)		(1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F))
+/* Event capability constants - event autogenerated by the kernel
+ * This list is valid for most 802.11 devices, customise as needed... */
+#define IW_EVENT_CAPA_K_0	(IW_EVENT_CAPA_MASK(0x8B04) | \
+				 IW_EVENT_CAPA_MASK(0x8B06) | \
+				 IW_EVENT_CAPA_MASK(0x8B1A))
+#define IW_EVENT_CAPA_K_1	(IW_EVENT_CAPA_MASK(0x8B2A))
+/* "Easy" macro to set events in iw_range (less efficient) */
+#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd))
+#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; }
+
+/* Modulations bitmasks */
+#define IW_MODUL_ALL		0x00000000	/* Everything supported */
+#define IW_MODUL_FH		0x00000001	/* Frequency Hopping */
+#define IW_MODUL_DS		0x00000002	/* Original Direct Sequence */
+#define IW_MODUL_CCK		0x00000004	/* 802.11b : 5.5 + 11 Mb/s */
+#define IW_MODUL_11B		(IW_MODUL_DS | IW_MODUL_CCK)
+#define IW_MODUL_PBCC		0x00000008	/* TI : 5.5 + 11 + 22 Mb/s */
+#define IW_MODUL_OFDM_A		0x00000010	/* 802.11a : 54 Mb/s */
+#define IW_MODUL_11A		(IW_MODUL_OFDM_A)
+#define IW_MODUL_11AB		(IW_MODUL_11B | IW_MODUL_11A)
+#define IW_MODUL_OFDM_G		0x00000020	/* 802.11g : 54 Mb/s */
+#define IW_MODUL_11G		(IW_MODUL_11B | IW_MODUL_OFDM_G)
+#define IW_MODUL_11AG		(IW_MODUL_11G | IW_MODUL_11A)
+#define IW_MODUL_TURBO		0x00000040	/* ATH : bonding, 108 Mb/s */
+/* In here we should define MIMO stuff. Later... */
+#define IW_MODUL_CUSTOM		0x40000000	/* Driver specific */
+
+/* Bitrate flags available */
+#define IW_BITRATE_TYPE		0x00FF	/* Type of value */
+#define IW_BITRATE_UNICAST	0x0001	/* Maximum/Fixed unicast bitrate */
+#define IW_BITRATE_BROADCAST	0x0002	/* Fixed broadcast bitrate */
+
+/****************************** TYPES ******************************/
+
+/* --------------------------- SUBTYPES --------------------------- */
+/*
+ *	Generic format for most parameters that fit in an int
+ */
+struct	iw_param
+{
+  int32_t		value;		/* The value of the parameter itself */
+  uint8_t		fixed;		/* Hardware should not use auto select */
+  uint8_t		disabled;	/* Disable the feature */
+  uint16_t		flags;		/* Various specifc flags (if any) */
+};
+
+/*
+ *	For all data larger than 16 octets, we need to use a
+ *	pointer to memory allocated in user space.
+ */
+struct	iw_point
+{
+  void 			*pointer;	/* Pointer to the data  (in user space) */
+  uint16_t		length;		/* number of fields or size in bytes */
+  uint16_t		flags;		/* Optional params */
+};
+
+/*
+ *	A frequency
+ *	For numbers lower than 10^9, we encode the number in 'm' and
+ *	set 'e' to 0
+ *	For number greater than 10^9, we divide it by the lowest power
+ *	of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
+ *	The power of 10 is in 'e', the result of the division is in 'm'.
+ */
+struct	iw_freq
+{
+	int32_t		m;		/* Mantissa */
+	int16_t		e;		/* Exponent */
+	uint8_t		i;		/* List index (when in range struct) */
+	uint8_t		flags;		/* Flags (fixed/auto) */
+};
+
+/*
+ *	Quality of the link
+ */
+struct	iw_quality
+{
+	uint8_t		qual;		/* link quality (%retries, SNR,
+					   %missed beacons or better...) */
+	uint8_t		level;		/* signal level (dBm) */
+	uint8_t		noise;		/* noise level (dBm) */
+	uint8_t		updated;	/* Flags to know if updated */
+};
+
+/*
+ *	Packet discarded in the wireless adapter due to
+ *	"wireless" specific problems...
+ *	Note : the list of counter and statistics in net_device_stats
+ *	is already pretty exhaustive, and you should use that first.
+ *	This is only additional stats...
+ */
+struct	iw_discarded
+{
+	uint32_t		nwid;		/* Rx : Wrong nwid/essid */
+	uint32_t		code;		/* Rx : Unable to code/decode (WEP) */
+	uint32_t		fragment;	/* Rx : Can't perform MAC reassembly */
+	uint32_t		retries;	/* Tx : Max MAC retries num reached */
+	uint32_t		misc;		/* Others cases */
+};
+
+/*
+ *	Packet/Time period missed in the wireless adapter due to
+ *	"wireless" specific problems...
+ */
+struct	iw_missed
+{
+	uint32_t		beacon;		/* Missed beacons/superframe */
+};
+
+/*
+ *	Quality range (for spy threshold)
+ */
+struct	iw_thrspy
+{
+	struct sockaddr		addr;		/* Source address (hw/mac) */
+	struct iw_quality	qual;		/* Quality of the link */
+	struct iw_quality	low;		/* Low threshold */
+	struct iw_quality	high;		/* High threshold */
+};
+
+/*
+ *	Optional data for scan request
+ *
+ *	Note: these optional parameters are controlling parameters for the
+ *	scanning behavior, these do not apply to getting scan results
+ *	(SIOCGIWSCAN). Drivers are expected to keep a local BSS table and
+ *	provide a merged results with all BSSes even if the previous scan
+ *	request limited scanning to a subset, e.g., by specifying an SSID.
+ *	Especially, scan results are required to include an entry for the
+ *	current BSS if the driver is in Managed mode and associated with an AP.
+ */
+struct	iw_scan_req
+{
+	uint8_t		scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */
+	uint8_t		essid_len;
+	uint8_t		num_channels; /* num entries in channel_list;
+				       * 0 = scan all allowed channels */
+	uint8_t		flags; /* reserved as padding; use zero, this may
+				* be used in the future for adding flags
+				* to request different scan behavior */
+	struct sockaddr	bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or
+				* individual address of a specific BSS */
+
+	/*
+	 * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using
+	 * the current ESSID. This allows scan requests for specific ESSID
+	 * without having to change the current ESSID and potentially breaking
+	 * the current association.
+	 */
+	uint8_t		essid[IW_ESSID_MAX_SIZE];
+
+	/*
+	 * Optional parameters for changing the default scanning behavior.
+	 * These are based on the MLME-SCAN.request from IEEE Std 802.11.
+	 * TU is 1.024 ms. If these are set to 0, driver is expected to use
+	 * reasonable default values. min_channel_time defines the time that
+	 * will be used to wait for the first reply on each channel. If no
+	 * replies are received, next channel will be scanned after this. If
+	 * replies are received, total time waited on the channel is defined by
+	 * max_channel_time.
+	 */
+	uint32_t		min_channel_time; /* in TU */
+	uint32_t		max_channel_time; /* in TU */
+
+	struct iw_freq	channel_list[IW_MAX_FREQUENCIES];
+};
+
+/* ------------------------- WPA SUPPORT ------------------------- */
+
+/*
+ *	Extended data structure for get/set encoding (this is used with
+ *	SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_*
+ *	flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and
+ *	only the data contents changes (key data -> this structure, including
+ *	key data).
+ *
+ *	If the new key is the first group key, it will be set as the default
+ *	TX key. Otherwise, default TX key index is only changed if
+ *	IW_ENCODE_EXT_SET_TX_KEY flag is set.
+ *
+ *	Key will be changed with SIOCSIWENCODEEXT in all cases except for
+ *	special "change TX key index" operation which is indicated by setting
+ *	key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY.
+ *
+ *	tx_seq/rx_seq are only used when respective
+ *	IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal
+ *	TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start
+ *	TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally
+ *	used only by an Authenticator (AP or an IBSS station) to get the
+ *	current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and
+ *	RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for
+ *	debugging/testing.
+ */
+struct	iw_encode_ext
+{
+	uint32_t		ext_flags; /* IW_ENCODE_EXT_* */
+	uint8_t		tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+	uint8_t		rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+	struct sockaddr	addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast
+			       * (group) keys or unicast address for
+			       * individual keys */
+	uint16_t		alg; /* IW_ENCODE_ALG_* */
+	uint16_t		key_len;
+	uint8_t		key[0];
+};
+
+/* SIOCSIWMLME data */
+struct	iw_mlme
+{
+	uint16_t		cmd; /* IW_MLME_* */
+	uint16_t		reason_code;
+	struct sockaddr	addr;
+};
+
+/* SIOCSIWPMKSA data */
+#define IW_PMKSA_ADD		1
+#define IW_PMKSA_REMOVE		2
+#define IW_PMKSA_FLUSH		3
+
+#define IW_PMKID_LEN	16
+
+struct	iw_pmksa
+{
+	uint32_t		cmd; /* IW_PMKSA_* */
+	struct sockaddr	bssid;
+	uint8_t		pmkid[IW_PMKID_LEN];
+};
+
+/* IWEVMICHAELMICFAILURE data */
+struct	iw_michaelmicfailure
+{
+	uint32_t		flags;
+	struct sockaddr	src_addr;
+	uint8_t		tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+};
+
+/* IWEVPMKIDCAND data */
+#define IW_PMKID_CAND_PREAUTH	0x00000001 /* RNS pre-authentication enabled */
+struct	iw_pmkid_cand
+{
+	uint32_t		flags; /* IW_PMKID_CAND_* */
+	uint32_t		index; /* the smaller the index, the higher the
+				* priority */
+	struct sockaddr	bssid;
+};
+
+/* ------------------------ WIRELESS STATS ------------------------ */
+/*
+ * Wireless statistics (used for /proc/net/wireless)
+ */
+struct	iw_statistics
+{
+	uint16_t		status;		/* Status
+					 * - device dependent for now */
+
+	struct iw_quality	qual;		/* Quality of the link
+						 * (instant/mean/max) */
+	struct iw_discarded	discard;	/* Packet discarded counts */
+	struct iw_missed	miss;		/* Packet missed counts */
+};
+
+/* ------------------------ IOCTL REQUEST ------------------------ */
+/*
+ * This structure defines the payload of an ioctl, and is used 
+ * below.
+ *
+ * Note that this structure should fit on the memory footprint
+ * of iwreq (which is the same as ifreq), which mean a max size of
+ * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
+ * You should check this when increasing the structures defined
+ * above in this file...
+ */
+union	iwreq_data
+{
+	/* Config - generic */
+	char		name[16];
+	/* Name : used to verify the presence of  wireless extensions.
+	 * Name of the protocol/provider... */
+
+	struct iw_point	essid;		/* Extended network name */
+	struct iw_param	nwid;		/* network id (or domain - the cell) */
+	struct iw_freq	freq;		/* frequency or channel :
+					 * 0-1000 = channel
+					 * > 1000 = frequency in Hz */
+
+	struct iw_param	sens;		/* signal level threshold */
+	struct iw_param	bitrate;	/* default bit rate */
+	struct iw_param	txpower;	/* default transmit power */
+	struct iw_param	rts;		/* RTS threshold threshold */
+	struct iw_param	frag;		/* Fragmentation threshold */
+	uint32_t		mode;		/* Operation mode */
+	struct iw_param	retry;		/* Retry limits & lifetime */
+
+	struct iw_point	encoding;	/* Encoding stuff : tokens */
+	struct iw_param	power;		/* PM duration/timeout */
+	struct iw_quality qual;		/* Quality part of statistics */
+
+	struct sockaddr	ap_addr;	/* Access point address */
+	struct sockaddr	addr;		/* Destination address (hw/mac) */
+
+	struct iw_param	param;		/* Other small parameters */
+	struct iw_point	data;		/* Other large parameters */
+};
+
+/*
+ * The structure to exchange data for ioctl.
+ * This structure is the same as 'struct ifreq', but (re)defined for
+ * convenience...
+ * Do I need to remind you about structure size (32 octets) ?
+ */
+struct	iwreq 
+{
+	union
+	{
+		char	ifrn_name[16];	/* if name, e.g. "eth0" */
+	} ifr_ifrn;
+
+	/* Data part (defined just above) */
+	union	iwreq_data	u;
+};
+
+/* -------------------------- IOCTL DATA -------------------------- */
+/*
+ *	For those ioctl which want to exchange mode data that what could
+ *	fit in the above structure...
+ */
+
+/*
+ *	Range of parameters
+ */
+
+struct	iw_range
+{
+	/* Informative stuff (to choose between different interface) */
+	uint32_t		throughput;	/* To give an idea... */
+	/* In theory this value should be the maximum benchmarked
+	 * TCP/IP throughput, because with most of these devices the
+	 * bit rate is meaningless (overhead an co) to estimate how
+	 * fast the connection will go and pick the fastest one.
+	 * I suggest people to play with Netperf or any benchmark...
+	 */
+
+	/* NWID (or domain id) */
+	uint32_t		min_nwid;	/* Minimal NWID we are able to set */
+	uint32_t		max_nwid;	/* Maximal NWID we are able to set */
+
+	/* Old Frequency (backward compat - moved lower ) */
+	uint16_t		old_num_channels;
+	uint8_t		old_num_frequency;
+
+	/* Wireless event capability bitmasks */
+	uint32_t		event_capa[6];
+
+	/* signal level threshold range */
+	int32_t		sensitivity;
+
+	/* Quality of link & SNR stuff */
+	/* Quality range (link, level, noise)
+	 * If the quality is absolute, it will be in the range [0 ; max_qual],
+	 * if the quality is dBm, it will be in the range [max_qual ; 0].
+	 * Don't forget that we use 8 bit arithmetics... */
+	struct iw_quality	max_qual;	/* Quality of the link */
+	/* This should contain the average/typical values of the quality
+	 * indicator. This should be the threshold between a "good" and
+	 * a "bad" link (example : monitor going from green to orange).
+	 * Currently, user space apps like quality monitors don't have any
+	 * way to calibrate the measurement. With this, they can split
+	 * the range between 0 and max_qual in different quality level
+	 * (using a geometric subdivision centered on the average).
+	 * I expect that people doing the user space apps will feedback
+	 * us on which value we need to put in each driver... */
+	struct iw_quality	avg_qual;	/* Quality of the link */
+
+	/* Rates */
+	uint8_t		num_bitrates;	/* Number of entries in the list */
+	int32_t		bitrate[IW_MAX_BITRATES];	/* list, in bps */
+
+	/* RTS threshold */
+	int32_t		min_rts;	/* Minimal RTS threshold */
+	int32_t		max_rts;	/* Maximal RTS threshold */
+
+	/* Frag threshold */
+	int32_t		min_frag;	/* Minimal frag threshold */
+	int32_t		max_frag;	/* Maximal frag threshold */
+
+	/* Power Management duration & timeout */
+	int32_t		min_pmp;	/* Minimal PM period */
+	int32_t		max_pmp;	/* Maximal PM period */
+	int32_t		min_pmt;	/* Minimal PM timeout */
+	int32_t		max_pmt;	/* Maximal PM timeout */
+	uint16_t		pmp_flags;	/* How to decode max/min PM period */
+	uint16_t		pmt_flags;	/* How to decode max/min PM timeout */
+	uint16_t		pm_capa;	/* What PM options are supported */
+
+	/* Encoder stuff */
+	uint16_t	encoding_size[IW_MAX_ENCODING_SIZES];	/* Different token sizes */
+	uint8_t	num_encoding_sizes;	/* Number of entry in the list */
+	uint8_t	max_encoding_tokens;	/* Max number of tokens */
+	/* For drivers that need a "login/passwd" form */
+	uint8_t	encoding_login_index;	/* token index for login token */
+
+	/* Transmit power */
+	uint16_t		txpower_capa;	/* What options are supported */
+	uint8_t		num_txpower;	/* Number of entries in the list */
+	int32_t		txpower[IW_MAX_TXPOWER];	/* list, in bps */
+
+	/* Wireless Extension version info */
+	uint8_t		we_version_compiled;	/* Must be WIRELESS_EXT */
+	uint8_t		we_version_source;	/* Last update of source */
+
+	/* Retry limits and lifetime */
+	uint16_t		retry_capa;	/* What retry options are supported */
+	uint16_t		retry_flags;	/* How to decode max/min retry limit */
+	uint16_t		r_time_flags;	/* How to decode max/min retry life */
+	int32_t		min_retry;	/* Minimal number of retries */
+	int32_t		max_retry;	/* Maximal number of retries */
+	int32_t		min_r_time;	/* Minimal retry lifetime */
+	int32_t		max_r_time;	/* Maximal retry lifetime */
+
+	/* Frequency */
+	uint16_t		num_channels;	/* Number of channels [0; num - 1] */
+	uint8_t		num_frequency;	/* Number of entry in the list */
+	struct iw_freq	freq[IW_MAX_FREQUENCIES];	/* list */
+	/* Note : this frequency list doesn't need to fit channel numbers,
+	 * because each entry contain its channel index */
+
+	uint32_t		enc_capa;	/* IW_ENC_CAPA_* bit field */
+
+	/* More power management stuff */
+	int32_t		min_pms;	/* Minimal PM saving */
+	int32_t		max_pms;	/* Maximal PM saving */
+	uint16_t		pms_flags;	/* How to decode max/min PM saving */
+
+	/* All available modulations for driver (hw may support less) */
+	int32_t		modul_capa;	/* IW_MODUL_* bit field */
+
+	/* More bitrate stuff */
+	uint32_t		bitrate_capa;	/* Types of bitrates supported */
+};
+
+/*
+ * Private ioctl interface information
+ */
+ 
+struct	iw_priv_args
+{
+	uint32_t		cmd;		/* Number of the ioctl to issue */
+	uint16_t		set_args;	/* Type and number of args */
+	uint16_t		get_args;	/* Type and number of args */
+	char		name[16];	/* Name of the extension */
+};
+
+/* ----------------------- WIRELESS EVENTS ----------------------- */
+/*
+ * Wireless events are carried through the rtnetlink socket to user
+ * space. They are encapsulated in the IFLA_WIRELESS field of
+ * a RTM_NEWLINK message.
+ */
+
+/*
+ * A Wireless Event. Contains basically the same data as the ioctl...
+ */
+struct iw_event
+{
+	uint16_t		len;			/* Real lenght of this stuff */
+	uint16_t		cmd;			/* Wireless IOCTL */
+	union iwreq_data	u;		/* IOCTL fixed payload */
+};
+
+/* Size of the Event prefix (including padding and alignement junk) */
+#define IW_EV_LCP_LEN	(sizeof(struct iw_event) - sizeof(union iwreq_data))
+/* Size of the various events */
+#define IW_EV_CHAR_LEN	(IW_EV_LCP_LEN + IFNAMSIZ)
+#define IW_EV_UINT_LEN	(IW_EV_LCP_LEN + sizeof(uint32_t))
+#define IW_EV_FREQ_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_freq))
+#define IW_EV_PARAM_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_param))
+#define IW_EV_ADDR_LEN	(IW_EV_LCP_LEN + sizeof(struct sockaddr))
+#define IW_EV_QUAL_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_quality))
+
+/* iw_point events are special. First, the payload (extra data) come at
+ * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
+ * we omit the pointer, so start at an offset. */
+#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
+			  (char *) NULL)
+#define IW_EV_POINT_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_point) - \
+			 IW_EV_POINT_OFF)
+
+/* Size of the Event prefix when packed in stream */
+#define IW_EV_LCP_PK_LEN	(4)
+/* Size of the various events when packed in stream */
+#define IW_EV_CHAR_PK_LEN	(IW_EV_LCP_PK_LEN + IFNAMSIZ)
+#define IW_EV_UINT_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(uint32_t))
+#define IW_EV_FREQ_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))
+#define IW_EV_PARAM_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
+#define IW_EV_ADDR_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
+#define IW_EV_QUAL_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
+#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_LEN + 4)
+
+#endif	/* _LINUX_WIRELESS_H */
diff --git a/trunk/package/luci/contrib/package/luci-addons/Makefile b/trunk/package/luci/contrib/package/luci-addons/Makefile
new file mode 100644
index 00000000..f3777ec4
--- /dev/null
+++ b/trunk/package/luci/contrib/package/luci-addons/Makefile
@@ -0,0 +1,287 @@
+include $(TOPDIR)/rules.mk
+
+LUCI_TOPDIR=../../..
+
+PKG_NAME:=luci-addons
+PKG_RELEASE:=1
+
+PKG_BUILD_PARALLEL:=0
+
+PKG_VERSION:=$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
+
+PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_USE_MIPS16:=0
+
+LUA_TARGET:=source
+LUCI_CFLAGS:=
+LUCI_BUILD_PACKAGES:=
+LUCI_SELECTED_MODULES:=
+
+
+# 1: luci component
+# 2: package names
+define add_deps
+	$(foreach dep,$(2), \
+		$(if $(patsubst @%,,$(dep)), \
+			$(if $(patsubst luci-%,,$(dep)), \
+				+PACKAGE_luci-$(1):$(dep), \
+				+$(dep)), \
+			$(dep)))
+endef
+
+### Templates ###
+define Package/luci-addons/install/template
+	$(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+	$(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true
+endef
+
+
+### Community Packages ###
+define Package/luci-mod-freifunk-community
+  SECTION:=luci
+  CATEGORY:=LuCI
+  TITLE:=LuCI - Lua Configuration Interface
+  URL:=http://luci.subsignal.org/
+  MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk Community Meta-Package
+  DEPENDS+=$(call add_deps,mod-freifunk-community, \
+    iptables-mod-nat-extra iptables-mod-ipopt \
+	luci-app-splash luci-i18n-german \
+	olsrd olsrd-mod-dyn-gw-plain \
+	olsrd-mod-jsoninfo olsrd-mod-nameservice \
+	olsrd-mod-watchdog kmod-tun \
+	ip freifunk-watchdog luci-app-olsr \
+	luci-app-olsr-services freifunk-gwcheck freifunk-mapupdate \
+  )
+endef
+
+define Package/luci-mod-freifunk-community/install
+	$(call Package/luci-addons/install/template,$(1),applications/freifunk-community)
+endef
+
+ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk-community),)
+	LUCI_SELECTED_MODULES+=applications/freifunk-community
+endif
+
+LUCI_BUILD_PACKAGES += luci-mod-freifunk-community
+
+
+### Modules ###
+define module
+  define Package/luci-mod-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=2. Modules
+    TITLE:=$(if $(2),$(2),LuCI $(1) module)
+    $(if $(3),DEPENDS+=$(3))
+  endef
+
+  define Package/luci-mod-$(1)/install
+	$(call Package/luci-addons/install/template,$$(1),modules/$(1))
+	$(call Package/luci-mod-$(1)/extra-install)
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-mod-$(1)),)
+    LUCI_SELECTED_MODULES+=modules/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-mod-$(1)
+endef
+
+
+$(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall +freifunk-common))
+
+
+### Applications ###
+define application
+  define Package/luci-app-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=3. Applications
+    TITLE:=$(if $(2),$(2),LuCI $(1) application)
+	DEPENDS:=$(call add_deps,app-$(1),$(3))
+  endef
+
+  define Package/luci-app-$(1)/install
+	$(call Package/luci-addons/install/template,$$(1),applications/luci-$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-app-$(1)),)
+    LUCI_SELECTED_MODULES+=applications/luci-$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-app-$(1)
+endef
+
+define Package/luci-app-splash/conffiles
+/etc/config/luci_splash
+/usr/lib/luci-splash/splashtext.html
+/usr/lib/luci-splash/splashtextinclude.html
+endef
+
+define Package/luci-app-statistics/conffiles
+/etc/config/luci_statistics
+endef
+
+define Package/luci-app-diag-devinfo/conffiles
+/etc/config/luci_devinfo
+endef
+
+
+$(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,kmod-siit))
+$(eval $(call application,freifunk-policyrouting,Policy routing for mesh traffic,freifunk-policyrouting))
+$(eval $(call application,freifunk-widgets,Widgets for the Freifunk index page,luci-mod-freifunk))
+$(eval $(call application,meshwizard, Shellscript based wizard to setup mesh networks,meshwizard))
+$(eval $(call application,olsr,OLSR configuration and status module,olsrd olsrd-mod-jsoninfo luci-lib-luaneightbl))
+$(eval $(call application,olsr-viz,OLSR Visualisation,luci-app-olsr olsrd olsrd-mod-txtinfo))
+$(eval $(call application,freifunk-diagnostics,Tools for network diagnosis like traceroute and ping))
+$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,luci-app-olsr olsrd olsrd-mod-nameservice))
+$(eval $(call application,splash,Freifunk DHCP-Splash application,luci-lib-nixio tc kmod-sched iptables-mod-nat-extra iptables-mod-ipopt))
+
+$(eval $(call application,statistics,LuCI Statistics Application,\
+	collectd \
+	rrdtool1 \
+	collectd-mod-rrdtool \
+	collectd-mod-iwinfo \
+	collectd-mod-interface \
+	collectd-mod-load \
+	collectd-mod-network))
+
+
+$(eval $(call application,diag-core,LuCI Diagnostics Tools (Core)))
+
+$(eval $(call application,diag-devinfo,LuCI Diagnostics Tools (Device Info),\
+	luci-app-diag-core \
+	smap \
+	netdiscover \
+	mac-to-devinfo \
+	httping \
+	smap-to-devinfo \
+	netdiscover-to-devinfo))
+
+$(eval $(call application,voice-core,LuCI Voice Software (Core)))
+$(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),luci-app-diag-devinfo))
+
+$(eval $(call application,udpxy,LuCI Support for udpxy,udpxy))
+$(eval $(call application,upnp,Universal Plug & Play configuration module,miniupnpd))
+$(eval $(call application,ntpc,NTP time synchronisation configuration module,ntpclient))
+$(eval $(call application,ddns,Dynamic DNS configuration module,ddns-scripts))
+$(eval $(call application,dump1090,LuCI Support for dump1090,dump1090))
+$(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,samba36-server))
+$(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,kmod-mmc-over-gpio))
+$(eval $(call application,p910nd,p910nd - Printer server module,p910nd))
+$(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,ushare))
+$(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,hd-idle))
+$(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,tinyproxy))
+$(eval $(call application,polipo,LuCI Support for the Polipo Proxy,polipo))
+$(eval $(call application,ocserv,LuCI Support for OpenConnect VPN,ocserv certtool))
+$(eval $(call application,openvpn,LuCI Support for OpenVPN,openvpn))
+$(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,luci-app-firewall freifunk-p2pblock))
+$(eval $(call application,multiwan,LuCI Support for the libreCMC MultiWAN agent,luci-app-firewall multiwan))
+$(eval $(call application,wol,LuCI Support for Wake-on-LAN,etherwake))
+$(eval $(call application,vnstat,LuCI Support for VnStat,vnstat vnstati))
+$(eval $(call application,radvd,LuCI Support for Radvd,radvd))
+$(eval $(call application,ahcp,LuCI Support for AHCPd,ahcpd))
+$(eval $(call application,wshaper,LuCI Support for wshaper,wshaper))
+
+$(eval $(call application,pbx,LuCI PBX Administration,\
+	asterisk18 \
+	asterisk18-app-authenticate \
+	asterisk18-app-disa \
+	asterisk18-app-setcallerid \
+	asterisk18-app-system \
+	asterisk18-chan-gtalk \
+	asterisk18-codec-a-mu \
+	asterisk18-codec-alaw \
+	asterisk18-func-cut \
+	asterisk18-res-clioriginate \
+	asterisk18-func-channel \
+	asterisk18-chan-local \
+	asterisk18-app-record \
+	asterisk18-app-senddtmf \
+	asterisk18-res-crypto))
+
+$(eval $(call application,pbx-voicemail,LuCI PBX Administration Voicemail Support,luci-app-pbx asterisk18 msmtp coreutils-base64))
+$(eval $(call application,ltqtapi,Lantiq voip))
+$(eval $(call application,minidlna,LuCI Support for miniDLNA,minidlna))
+$(eval $(call application,shairplay,LuCI Support for Shairplay,shairplay))
+$(eval $(call application,shairport,LuCI Support for Shairport,shairport))
+$(eval $(call application,transmission,LuCI Support for Transmission,transmission-daemon))
+$(eval $(call application,watchcat,LuCI Support for Watchcat,watchcat))
+
+
+### Themes ###
+define theme
+  define Package/luci-theme-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    SUBMENU:=4. Themes
+    TITLE:=$(if $(2),$(2),LuCI $(1) theme)
+	MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
+	DEPENDS:=+luci-base $(4)
+  endef
+
+  define Package/luci-theme-$(1)/install
+	$(call Package/luci-addons/install/template,$$(1),themes/$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-theme-$(1)),)
+    LUCI_SELECTED_MODULES+=themes/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-theme-$(1)
+endef
+
+
+$(eval $(call theme,freifunk-bno,Freifunk Berlin Nordost Theme,\
+	Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>))
+
+$(eval $(call theme,freifunk-generic,Freifunk Generic Theme,\
+	Manuel Munz <freifunk-at-somakoma-dot-de>))
+
+
+### Compile ###
+PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES))
+
+include $(INCLUDE_DIR)/package.mk
+
+define Build/Prepare
+	@if [ ! -x $(LUCI_TOPDIR)/build/mkrevision.sh ]; then \
+		echo "*** Repository layout changed!" >&2; \
+		echo "*** Please change the LuCI url in feeds.conf to http://svn.luci.subsignal.org/luci/trunk and reinstall the feed with" >&2; \
+		echo "*** ./scripts/feeds update luci; ./scripts/feeds install -a -p luci" >&2; \
+		exit 1; \
+	fi
+	mkdir -p $(PKG_BUILD_DIR)
+	$(TAR) c -C $(LUCI_TOPDIR) . \
+		--exclude=.pc --exclude=.svn --exclude=.git \
+		--exclude='*.o' --exclude='*.so' \
+		--exclude=dist | \
+			tar x -C $(PKG_BUILD_DIR)/
+	$(call Build/Prepare/Default)
+endef
+
+define Build/Configure
+endef
+
+MAKE_FLAGS += \
+	MODULES="$(LUCI_SELECTED_MODULES)" \
+	LUA_TARGET="$(LUA_TARGET)" \
+	LUA_SHLIBS="-llua -lm -ldl -lcrypt" \
+	CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+	LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+	NIXIO_TLS="$(NIXIO_TLS)" OS="Linux"
+
+
+$(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b))))
diff --git a/trunk/package/luci/contrib/package/luci/Makefile b/trunk/package/luci/contrib/package/luci/Makefile
new file mode 100644
index 00000000..a0401905
--- /dev/null
+++ b/trunk/package/luci/contrib/package/luci/Makefile
@@ -0,0 +1,403 @@
+include $(TOPDIR)/rules.mk
+
+LUCI_TOPDIR=../../..
+
+PKG_NAME:=luci
+PKG_RELEASE:=1
+
+PKG_BUILD_PARALLEL:=0
+
+PKG_VERSION:=$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
+
+PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host) iwinfo
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_USE_MIPS16:=0
+
+LUA_TARGET:=source
+LUCI_CFLAGS:=
+LUCI_BUILD_PACKAGES:=
+LUCI_SELECTED_MODULES:=
+
+ifeq ($(BOARD),brcm-2.4)
+  MAKE_FLAGS += CRAP="1"
+endif
+
+
+### Templates ###
+define Package/luci/install/template
+	$(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+	$(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true
+endef
+
+
+### Core package ###
+define Package/luci-base
+  SECTION:=luci
+  CATEGORY:=LuCI
+  TITLE:=LuCI - Lua Configuration Interface
+  URL:=http://luci.subsignal.org/
+  MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+  SUBMENU:=8. Libraries
+  DEPENDS:=+lua +libuci-lua +libubus-lua
+  TITLE:=LuCI core libraries
+endef
+
+define Package/luci-base/install
+	$(call Package/luci/install/template,$(1),modules/base)
+	$(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
+		"libreCMC Firmware" \
+		"$(LIBRECMCVERSION)" \
+		"trunk" \
+		"$(PKG_VERSION)"
+endef
+
+define Package/luci-base/config
+       choice
+               prompt "Build Target"
+               default PACKAGE_luci-base_source
+
+       config PACKAGE_luci-base_compile
+               bool "Precompiled"
+
+       config PACKAGE_luci-base_stripped
+               bool "Stripped"
+
+       config PACKAGE_luci-base_srcdiet
+               bool "Compressed Source"
+
+       config PACKAGE_luci-base_source
+               bool "Full Source"
+
+       endchoice
+endef
+
+define Package/luci-base/conffiles
+/etc/config/luci
+endef
+
+ifneq ($(CONFIG_PACKAGE_luci-base_compile),)
+  LUA_TARGET:=compile
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-base_stripped),)
+  LUA_TARGET:=strip
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-base_srcdiet),)
+  LUA_TARGET:=diet
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-base),)
+  LUCI_SELECTED_MODULES+=modules/base
+endif
+
+LUCI_BUILD_PACKAGES += luci-base
+
+
+### Libraries ###
+define library
+  define Package/luci-lib-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=8. Libraries
+    TITLE:=$(if $(2),$(2),LuCI $(1) library)
+    $(if $(3),DEPENDS:=+luci-base $(3))
+  endef
+
+  define Package/luci-lib-$(1)/install
+	$(call Package/luci/install/template,$$(1),libs/$(1))
+	$(call Package/luci-lib-$(1)/extra-install)
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-lib-$(1)),)
+    LUCI_SELECTED_MODULES+=libs/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-lib-$(1)
+endef
+
+define Package/luci-lib-nixio/config
+	choice
+		prompt "TLS Provider"
+		default PACKAGE_luci-lib-nixio_notls
+
+		config PACKAGE_luci-lib-nixio_notls
+			bool "Disabled"
+
+		config PACKAGE_luci-lib-nixio_axtls
+			bool "Builtin (axTLS)"
+
+		config PACKAGE_luci-lib-nixio_cyassl
+			bool "CyaSSL"
+			select PACKAGE_libcyassl
+
+		config PACKAGE_luci-lib-nixio_openssl
+			bool "OpenSSL"
+			select PACKAGE_libopenssl
+	endchoice
+endef
+
+
+NIXIO_TLS:=
+
+ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_axtls),)
+  NIXIO_TLS:=axtls
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_openssl),)
+  NIXIO_TLS:=openssl
+endif
+
+ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),)
+  NIXIO_TLS:=cyassl
+  LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl
+endif
+
+
+$(eval $(call library,httpclient,HTTP(S) client library,+luci-base +luci-lib-nixio))
+$(eval $(call library,json,LuCI JSON library))
+$(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl))
+$(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio))
+$(eval $(call library,luaneightbl,neightbl - Lua lib for IPv6 neighbors,+luci-base))
+
+
+### Protocols ###
+define protocol
+  define Package/luci-proto-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=6. Protocols
+    TITLE:=$(if $(2),$(2),LuCI $(1) protocol support)
+    DEPENDS:=$(3)
+  endef
+
+  define Package/luci-proto-$(1)/install
+	$(call Package/luci/install/template,$$(1),protocols/$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-proto-$(1)),)
+    LUCI_SELECTED_MODULES+=protocols/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-proto-$(1)
+endef
+
+$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
+$(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd/DS-Lite))
+$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
+$(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))
+$(eval $(call protocol,openconnect,Support for OpenConnect VPN,+openconnect))
+
+### Modules ###
+define module
+  define Package/luci-mod-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=2. Modules
+    TITLE:=$(if $(2),$(2),LuCI $(1) module)
+    $(if $(3),DEPENDS+=$(3))
+  endef
+
+  define Package/luci-mod-$(1)/install
+	$(call Package/luci/install/template,$$(1),modules/$(1))
+	$(call Package/luci-mod-$(1)/extra-install)
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-mod-$(1)),)
+    LUCI_SELECTED_MODULES+=modules/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-mod-$(1)
+endef
+
+
+$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-base @BROKEN))
+$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-base))
+$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-base))
+$(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json))
+
+
+### Applications ###
+define application
+  define Package/luci-app-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=3. Applications
+    TITLE:=$(if $(2),$(2),LuCI $(1) application)
+	DEPENDS:=$(3)
+  endef
+
+  define Package/luci-app-$(1)/install
+	$(call Package/luci/install/template,$$(1),applications/luci-$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-app-$(1)),)
+    LUCI_SELECTED_MODULES+=applications/luci-$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-app-$(1)
+endef
+
+$(eval $(call application,firewall,Firewall and Portforwarding application,\
+	+PACKAGE_luci-app-firewall:firewall))
+
+$(eval $(call application,qos,Quality of Service configuration module,\
+	+PACKAGE_luci-app-qos:qos-scripts))
+
+$(eval $(call application,commands,LuCI Shell Command Module))
+
+
+### Themes ###
+define theme
+  define Package/luci-theme-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    SUBMENU:=4. Themes
+    TITLE:=$(if $(2),$(2),LuCI $(1) theme)
+    MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
+  endef
+
+  define Package/luci-theme-$(1)/install
+	$(call Package/luci/install/template,$$(1),themes/$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-theme-$(1)),)
+    LUCI_SELECTED_MODULES+=themes/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-theme-$(1)
+endef
+
+$(eval $(call theme,librecmc,OpenWrt.org))
+$(eval $(call theme,bootstrap,Bootstrap Theme (default)))
+
+
+### Translations ###
+define translation
+  define Package/luci-i18n-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=5. Translations
+    TITLE:=$(if $(2),$(2),$(1))
+  endef
+
+  define Package/luci-i18n-$(1)/install
+	$(call Package/luci/install/template,$$(1),i18n/$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-i18n-$(1)),)
+    LUCI_SELECTED_MODULES+=i18n/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-i18n-$(1)
+endef
+
+$(eval $(call translation,german,German))
+$(eval $(call translation,english,English))
+$(eval $(call translation,french,French (by Florian Fainelli)))
+$(eval $(call translation,italian,Italian (by Matteo Croce)))
+$(eval $(call translation,russian,Russian (by Skryabin Dmitry)))
+$(eval $(call translation,portuguese-brazilian,Portuguese (Brazilian) (by Carlos Cesario)))
+$(eval $(call translation,chinese,Chinese (by Chinese Translators)))
+$(eval $(call translation,japanese,Japanese (by Tsukasa Hamano)))
+$(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis)))
+$(eval $(call translation,catalan,Catalan (by Eduard Duran)))
+$(eval $(call translation,portuguese,Portuguese (by Jose Monteiro)))
+$(eval $(call translation,spanish,Spanish (by Guillermo Javier Nardoni)))
+$(eval $(call translation,vietnamese,Vietnamese (by Hong Phuc Dang)))
+$(eval $(call translation,malay,Malay (by Teow Wai Chet)))
+$(eval $(call translation,norwegian,Norwegian (by Lars Hardy)))
+$(eval $(call translation,hebrew,Hebrew))
+$(eval $(call translation,romanian,Romanian))
+$(eval $(call translation,ukrainian,Ukrainian))
+$(eval $(call translation,hungarian,Hungarian))
+$(eval $(call translation,polish,Polish))
+
+
+### Collections ###
+define collection
+  define Package/luci$(if $(1),-$(1))
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=1. Collections
+    TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection)
+    $(if $(3),DEPENDS:=$(3))
+  endef
+
+  define Package/luci$(if $(1),-$(1))/install
+	true
+  endef
+
+  LUCI_BUILD_PACKAGES += luci$(if $(1),-$(1))
+endef
+
+$(eval $(call collection,,\
+	Standard libreCMC set including full admin with ppp support and the \
+	default libreCMC theme,\
+	+uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-bootstrap \
+	+luci-app-firewall +luci-proto-ppp +libiwinfo-lua +luci-lib-nixio))
+
+$(eval $(call collection,ssl,\
+	Standard libreCMC set with HTTPS support,\
+	+luci +libustream-polarssl +px5g))
+
+$(eval $(call collection,light,\
+	Minimum package set using only admin mini and the standard theme,\
+	+uhttpd +luci-mod-admin-mini +luci-theme-librecmc @BROKEN))
+
+
+### Compile ###
+PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES))
+
+include $(INCLUDE_DIR)/package.mk
+
+define Build/Prepare
+	@if [ ! -x $(LUCI_TOPDIR)/build/mkrevision.sh ]; then \
+		echo "*** Repository layout changed!" >&2; \
+		echo "*** Please change the LuCI url in feeds.conf to http://svn.luci.subsignal.org/luci/trunk and reinstall the feed with" >&2; \
+		echo "*** ./scripts/feeds update luci; ./scripts/feeds install -a -p luci" >&2; \
+		exit 1; \
+	fi
+	mkdir -p $(PKG_BUILD_DIR)
+	$(TAR) c -C $(LUCI_TOPDIR) . \
+		--exclude=.pc --exclude=.svn --exclude=.git \
+		--exclude='*.o' --exclude='*.so' \
+		--exclude=dist | \
+			tar x -C $(PKG_BUILD_DIR)/
+	$(call Build/Prepare/Default)
+endef
+
+define Build/Configure
+endef
+
+MAKE_FLAGS += \
+	MODULES="$(LUCI_SELECTED_MODULES)" \
+	LUA_TARGET="$(LUA_TARGET)" \
+	LUA_SHLIBS="-llua -lm -ldl -lcrypt" \
+	CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+	LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+	NIXIO_TLS="$(NIXIO_TLS)" OS="Linux"
+
+
+$(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b))))
diff --git a/trunk/package/luci/contrib/package/meshwizard/Makefile b/trunk/package/luci/contrib/package/meshwizard/Makefile
new file mode 100644
index 00000000..45d5f216
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/Makefile
@@ -0,0 +1,39 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=meshwizard
+PKG_RELEASE:=0.1.0
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/meshwizard
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Shell script based wizard for Mesh networks
+  DEPENDS:=+firewall
+endef
+
+define Package/meshwizard/description
+  A shellscript based wizard to simplify the setup of a typical mesh node (e.g. for Freifunk.net)
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/meshwizard/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,meshwizard))
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/etc/config/meshwizard b/trunk/package/luci/contrib/package/meshwizard/files/etc/config/meshwizard
new file mode 100644
index 00000000..a60b0cc4
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/etc/config/meshwizard
@@ -0,0 +1,7 @@
+config 'netconfig' 'netconfig'
+
+config 'general' 'general'
+	option 'sharenet' '0'
+	option 'local_restrict' '1'
+	option 'cleanup' '1'
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh
new file mode 100644
index 00000000..8abdf9f0
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh
@@ -0,0 +1,59 @@
+uci_remove_list_element() {
+	local option="$1"
+	local value="$2"
+	local list="$(uci get $option)"
+	local elem
+
+	uci delete $option
+	for elem in $list; do
+		if [ "$elem" != "$value" ]; then
+			uci add_list $option=$elem
+		fi
+	done
+}
+
+# Takes 2 arguments
+# $1 = text to be displayed in the output for this section
+# $2 = section (optional)
+uci_commitverbose() {
+	echo "+ $1"
+	uci changes $2 | while read line; do
+		echo "    $line"
+	done
+	uci commit $2
+}
+
+set_defaults() {
+	for def in $(env |grep "^$1" | sed 's/ /_/g'); do
+		option="${def/$1/}"
+		a="$(echo $option |cut -d '=' -f1)"
+		b="$(echo $option |cut -d '=' -f2-)"
+		b="${b//_/ }"
+		uci set $2.$a="$b"
+	done
+}
+
+# 3 arguements: 1=config name 2=oldname 3=newname
+section_rename() {
+	uci -q rename $1.$2=$3 && msg_rename $1.$2 $1.$3 || msg_rename_error $1.$2 $1.$3
+}
+
+msg_missing_value() {
+	echo -e "    \033[1mWarning:\033[0m Configuration option for $2 is missing in $1."
+}
+
+msg_success() {
+	echo "    Finished."
+}
+
+msg_error() {
+	echo "    \033[1mError: \033[0mThere was a problem."
+}
+
+msg_rename() {
+	echo "    Renamed unnamed section $1 to $2."
+}
+
+msg_rename_error() {
+	echo "    \033[1mWarning:\033[0m Could not rename $1 to $2."
+}
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh
new file mode 100755
index 00000000..c889c55e
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Checks whether a netrange is inside another netrange, returns 1 if true
+# Takes two arguments: $1: net from which we want to know if it is inside $2
+# nets need to be given in CIDR notation
+
+dir=$(dirname $0)
+
+awk -f $dir/common.awk -f - $* <<EOF
+BEGIN {
+
+	slpos=index(ARGV[1],"/")
+	ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
+	netmask=compl(2**(32-int(substr(ARGV[1],slpos+1)))-1)
+	network=and(ipaddr,netmask)
+	broadcast=or(network,compl(netmask))
+
+	slpos2=index(ARGV[2],"/")
+	ipaddr2=ip2int(substr(ARGV[2],0,slpos2-1))
+	netmask2=compl(2**(32-int(substr(ARGV[2],slpos2+1)))-1)
+	network2=and(ipaddr2,netmask2)
+	broadcast2=or(network2,compl(netmask2))
+
+	if (network >= network2) {
+		if (network <= broadcast2) {
+			if (broadcast <= broadcast2) {
+				print "1"
+			}
+		}
+	}
+}
+EOF
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/common.awk b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/common.awk
new file mode 100644
index 00000000..5b03d06b
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/common.awk
@@ -0,0 +1,20 @@
+function bitcount(c) {
+	c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
+	c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
+	c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
+	c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
+	c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
+	return c
+}
+
+function ip2int(ip) {
+	for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) 
+	return ret
+}
+
+function int2ip(ip,ret,x) {
+	ret=and(ip,255)
+	ip=rshift(ip,8)
+	for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
+	return ret
+}
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
new file mode 100755
index 00000000..ca623dbc
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+netrenamed=$1
+
+local PREFIX="$(echo $ipv6_prefix| cut -d "/" -f 1| sed 's/::/:/')"
+
+# Get the devices mac address
+local device="$(uci -p/var/state -q get network.$1.ifname)"
+if [ -n "$device" ]; then
+	local MAC="$(ifconfig $netrenamed |grep HWaddr | awk '{ print $5 '})"
+else 
+	local MAC="$(cat /sys/class/net/$1/address)"
+	local IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')"
+fi
+
+echo "${PREFIX}${IPV6_UNIQ}:1"
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh
new file mode 100755
index 00000000..efe101fa
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# create essid from channel, takes two args:
+# $1 = channel (integer)
+# $2 = community (optional)
+channel=$1
+community=$2
+
+. /lib/functions.sh
+
+
+# Try to get BSSID from profile first
+config_load profile_$community
+config_get bssid bssidscheme $channel
+if [ -z "$bssid" ]; then
+	config_get bssid bssidscheme "all"
+fi
+
+if [ -z "$bssid" ]; then
+	case $channel in
+	[1-9])
+		bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE"
+		;;
+	1[0-4])
+		bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE"
+		;;
+	[3-9][0-9])
+		bssid="02:$channel:CA:FF:EE:EE"
+		;;
+	1[0-9][0-9])
+		bssid="${channel/1/12:}:CA:FF:EE:EE"
+		;;
+	*)	bssid="02:CA:FF:EE:BA:BE"
+		;;
+	esac
+fi
+echo $bssid
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh
new file mode 100755
index 00000000..e559166f
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# generates a dhcp-ip and netrange from a given ip/subnet
+# takes 2 arguments:
+# $1: Ip Address (of the Interface for which we want to generate an ip)
+
+echo "$1" | awk 'BEGIN { FS = "." } ; { print "6."$3"."$4".1" }'
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
new file mode 100755
index 00000000..c1e55224
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# This is only run once (usually after flashing an image from the imagebuilder)
+# It sets up the initial config for this node.
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+config_load system
+
+# Rename system config
+handle_system() {
+	if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+		section_rename system $1 system
+	fi
+}
+config_foreach handle_system system
+
+if [ -n "$(uci -q get meshwizard.community)" ]; then
+	set_defaults "community_" freifunk.community
+	uci -q delete meshwizard.community
+fi
+
+[ -n "$profile_homepage" ] && uci set freifunk.community.homepage="$profile_homepage"
+
+[ -n "$profile_mapserver" ] && {
+	uci -q delete freifunk.community.mapserver
+	for m in $profile_mapserver; do
+		uci add_list freifunk.community.mapserver="$m"
+	done
+}
+
+uci_commitverbose "Setup community" freifunk
+
+if [ -n "$(uci -q get meshwizard.contact)" ]; then
+	set_defaults "contact_" freifunk.contact
+	uci -q delete meshwizard.contact && uci_commitverbose "Setup contact" freifunk
+fi
+
+if [ "$has_luci" == TRUE ]; then
+	set_defaults "luci_main_" luci.main
+	uci -q delete meshwizard.luci_main && uci_commitverbose "Setup luci" luci
+fi
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh
new file mode 100755
index 00000000..6d7a1fb5
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+dir=$(dirname $0)
+awk -f $dir/common.awk -f - $* <<EOF
+BEGIN {
+	slpos=index(ARGV[1],"/")
+	if (slpos == 0) {
+		ipaddr=ip2int(ARGV[1])
+		netmask=ip2int(ARGV[2])
+	} else {
+		ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
+		netmask=compl(2**(32-int(substr(ARGV[1],slpos+1)))-1)
+		ARGV[4]=ARGV[3]
+		ARGV[3]=ARGV[2]
+	}
+
+	network=and(ipaddr,netmask)
+	broadcast=or(network,compl(netmask))
+	
+	start=or(network,and(ip2int(ARGV[3]),compl(netmask)))
+	limit=network+1
+	if (start<limit) start=limit
+	
+	end=start+ARGV[4]
+	limit=or(network,compl(netmask))-1
+	if (end>limit) end=limit
+
+	print "IP="int2ip(ipaddr)
+	print "NETMASK="int2ip(netmask)
+	print "BROADCAST="int2ip(broadcast)
+	print "NETWORK="int2ip(network)
+	print "NEXTNET="int2ip(broadcast + 1)
+	print "PREFIX="32-bitcount(compl(netmask))
+	
+	# range calculations:
+	# ipcalc <ip> <netmask> <start> <num>
+	
+	if (ARGC > 3) {
+		print "START="int2ip(start)
+		print "END="int2ip(end)
+	}
+}
+EOF
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh
new file mode 100755
index 00000000..cb0d319a
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+# This reads the settings we need to have to configure everything
+# Argument $1: community
+
+. /lib/functions.sh
+community="$1"
+
+# reads variables from uci files, parameter $1 is the section
+get_var() {
+	uci -q show $1 | cut -d "." -f 2-100 |grep "\." | sed -e 's/^\([A-Za-z0-9_]*\)\./\1_/g' -e 's/=\(.*\)$/="\1"/g'
+}
+
+handle_widgets() {
+        widgets="$widgets $1"
+}
+config_load freifunk
+config_foreach handle_widgets widget
+config_load profile_$community
+config_foreach handle_widgets widget
+echo "widgets=$widgets"
+
+# read default values from /etc/config/freifunk
+for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults zone_freifunk include $widgets; do
+	get_var freifunk.$v
+done
+
+# now read all values from the selected community profile, will override some values from the defaults before
+for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults profile zone_freifunk include luci_splash ipv6 $widgets; do
+	get_var profile_$community.$v
+done
+
+# read values from meshwizard
+for v in system luci_main contact community wan lan general ipv6 qos; do
+        get_var meshwizard.$v
+done
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh
new file mode 100755
index 00000000..ea200559
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+# This script renames IB_wifi_ interface names into real interface names used on this system.
+# E.g. wireless.IB_wifi0 would become wireless.wifi0 on madwifi and wireless.radio0 on mac80211
+
+. $dir/functions.sh
+
+posIB=-1
+
+IBwifis="$(uci show meshwizard.netconfig | grep 'IB_' | sed 's/meshwizard.netconfig\.\(IB_wifi.*\)_.*/\1/' |uniq)"
+[ -z "$(echo $IBwifis |grep IB_wifi)" ] && exit
+
+for w in $IBwifis; do
+	posIB=$(( $posIB + 1 ))
+	export IB_wifi$posIB="$w"
+done
+
+pos=0
+syswifis="$(uci show wireless |grep wifi-device | sed 's/wireless\.\(.*\)=.*/\1/' |uniq)"
+
+for s in $syswifis; do
+	export syswifi$pos="$s"
+	pos=$(( $pos + 1 ))
+done
+
+for i in `seq 0 $posIB`; do
+	IBwifi=$(eval echo \$IB_wifi$i)
+	syswifi=$(eval echo \$syswifi$i)
+
+	if [ -n "$syswifi" ]; then
+		case $IBwifi in
+		IB_wifi* )
+			# replace IB_wifi_* with actual wifi interface names, delete old ones first
+			uci show meshwizard.netconfig | grep $IBwifi | while read line; do
+				oldline=$(echo $line | cut -d "=" -f 1)
+				uci set $oldline=""
+				newline=$(echo $line |sed "s/$IBwifi/$syswifi/g")
+				uci set $newline
+			done
+		;;
+		esac
+		unset IBwifi
+		unset syswifi
+	fi
+done
+
+uci_commitverbose "Renaming wifi-devices in /etc/config/meshwizard" meshwizard
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh
new file mode 100755
index 00000000..3f6ce358
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# This will restore default "factory" settings before running the meshwizard
+# and is used when cleanup=1
+# Warning: This will reset network settings for wan and lan to defaults too.
+
+echo "+ Restore default config as requested with cleanup=1"
+cp -f /rom/etc/config/* /etc/config/
+rm /etc/config/wireless
+wifi detect > /etc/config/wireless
+rm /etc/config/network
+/etc/init.d/defconfig start
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh
new file mode 100755
index 00000000..adf34291
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+net=$1
+. $dir/functions.sh
+
+ra="$(uci -q get meshwizard.netconfig.${net}_ipv6ra)"
+uci set autoipv6.${netrenamed}="interface"
+if [ -n "$ra" ]; then
+	uci set autoipv6.${netrenamed}.ra=1
+fi
+
+uci_commitverbose "Setup auto-ipv6 for interface $netrenamed" autoipv6
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh
new file mode 100755
index 00000000..8e3f015c
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+. $dir/functions.sh
+
+if [ "$ipv6_config" = "auto-ipv6-fromv4" ]; then
+	mode="fromv4"
+else
+	mode="random"
+fi
+
+uci set autoipv6.olsr_node.enabled=1
+uci set autoipv6.olsr_node.mode="$mode"
+uci_commitverbose "Setup auto-ipv6" autoipv6
+
+uci set network.wan.accept_ra=0
+uci_commitverbose "Do not accept ra's on wan when using auto-ipv6" network
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
new file mode 100755
index 00000000..707178d2
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Sets up the dhcp part of dnsmasq
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+net="$1"
+vap="$(uci -q get meshwizard.netconfig.${net}_vap)"
+
+handle_dnsmasq() {
+	config_get interface "$1" interface
+	if [ "$interface" == "${netrenamed}dhcp" ]; then
+		if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+			section_rename dhcp $1 ${netrenamed}dhcp
+		fi
+	fi
+}
+config_load dhcp
+config_foreach handle_dnsmasq dhcp
+
+[ "$net" == "lan" ] && uci -q delete dhcp.lan
+
+if [ "$supports_vap" = 1 -a "$vap" = 1 ]; then
+	uci batch <<- EOF
+		set dhcp.${netrenamed}dhcp="dhcp"
+		set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp"
+	EOF
+	set_defaults "dhcp_" dhcp.${netrenamed}dhcp
+fi
+
+ahdhcp_when_vap="$(uci get profile_$community.profile.adhoc_dhcp_when_vap)"
+if [ "$supports_vap" = 0 ] || [ "$supports_vap" = 1 -a "$vap" = 1 -a "$ahdhcp_when_vap" = 1 ]; then
+	uci batch <<- EOF
+		set dhcp.${netrenamed}ahdhcp="dhcp"
+		set dhcp.${netrenamed}ahdhcp.interface="${netrenamed}ahdhcp"
+	EOF
+fi
+set_defaults "dhcp_" dhcp.${netrenamed}ahdhcp
+
+uci_commitverbose "Setup DHCP for $netrenamed" dhcp
+
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh
new file mode 100755
index 00000000..9297f917
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+# Set dnsmasq config
+handle_dhcp() {
+	if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+		section_rename dhcp $1 dnsmasq
+	fi
+}
+
+config_load dhcp
+config_foreach handle_dhcp dnsmasq
+
+uci batch << EOF
+	set dhcp.dnsmasq.local="/$profile_suffix/"
+	set dhcp.dnsmasq.domain="$profile_suffix"
+EOF
+
+config_get addnhosts dnsmasq addnhosts
+if [ -z "${addnhosts/\var\/etc\/hosts.olsr/}" ]; then
+	uci add_list dhcp.dnsmasq.addnhosts="/var/etc/hosts.olsr"
+	if [ "$ipv6_enabled" = 1 ]; then
+		uci add_list dhcp.dnsmasq.addnhosts="/var/etc/hosts.olsr.ipv6"
+	fi
+fi
+
+uci_commitverbose "Setup dnsmasq" dhcp
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh
new file mode 100755
index 00000000..bf472411
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh
@@ -0,0 +1,139 @@
+#!/bin/sh
+# Add "freifunk" firewall zone
+# If wan/lan is used for olsr then remove these networks from wan/lan zones
+# Also setup rules defined in /etc/config/freifunk and /etc/config/profile_<community>
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+wan_is_olsr=$(uci -q get meshwizard.netconfig.wan_config)
+lan_is_olsr=$(uci -q get meshwizard.netconfig.lan_config)
+
+config_load firewall
+
+# Rename firewall zone for freifunk if unnamed
+# If wan is used for olsr then set network for the firewall zone wan to ' ' to remove the wan interface from it, else add local restrict to it
+# If lan is used for olsr then set network for the firewall zone lan to ' ' to remove the lan interface from it
+
+handle_fwzone() {
+	config_get name "$1" name
+	config_get network "$1" network
+
+	if [ "$name" == "freifunk" ]; then
+		# rename section if unnamed
+		if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+			section_rename firewall $1 zone_freifunk
+		fi
+	fi
+
+	if [ "$name" == "wan" ]; then
+		if  [ "$wan_is_olsr" == 1 ]; then
+			uci set firewall.$1.network=' ' && uci_commitverbose "WAN is used for olsr, removed the wan interface from zone wan" firewall
+		else
+			uci set firewall.$1.local_restrict=1 && uci_commitverbose "Enable local_restrict for zone wan" firewall
+		fi
+	fi
+
+	if [ "$name" == "lan" ] && [ "$lan_is_olsr" == 1 ]; then
+			uci set firewall.$1.network=' ' && uci_commitverbose "LAN is used for olsr, removed the lan interface from zone lan" firewall
+	fi
+}
+
+config_foreach handle_fwzone zone
+
+uci batch << EOF
+	set firewall.zone_freifunk="zone"
+	set firewall.zone_freifunk.name="freifunk"
+	set firewall.zone_freifunk.input="$zone_freifunk_input"
+	set firewall.zone_freifunk.forward="$zone_freifunk_forward"
+	set firewall.zone_freifunk.output="$zone_freifunk_output"
+EOF
+
+uci_commitverbose "Setup firewall zones" firewall
+
+# Usually we need to setup masquerading for lan, except lan is an olsr interface or has an olsr hna-entry
+
+handle_interface() {
+        config_get interface "$1" interface
+        if [ "$interface" == "lan" ]; then
+                no_masq_lan=1
+        fi
+}
+config_load olsrd
+config_foreach handle_interface Interface
+
+LANIP="$(uci -q get network.lan.ipaddr)"
+if [ -n "$LANIP" ]; then
+	handle_hna() {
+		config_get netaddr "$1" netaddr
+			if [ "$LANIP" == "$netaddr" ]; then
+			no_masq_lan=1
+		fi
+	}
+	config_foreach handle_hna Hna4
+fi
+
+currms=$(uci -q get firewall.zone_freifunk.masq_src)
+if [ ! "$no_masq_lan" == "1" ] && [ ! "$(uci -q get meshwizard.netconfig.lan_config)" == 1 ]; then
+	uci set firewall.zone_freifunk.masq="1"
+	[ -z "$(echo $currms |grep lan)" ] && uci add_list firewall.zone_freifunk.masq_src="lan"
+fi
+
+
+# Rules, Forwardings, advanced config and includes
+
+for config in freifunk profile_$community; do
+
+	config_load $config
+
+	for section in advanced include fw_rule fw_forwarding; do
+		handle_firewall() {
+		        local options=$(uci show $config."$1")
+			options=$(echo "$options" | sed -e "s/fw_//g" -e "s/^$config/firewall/g")
+			for o in $options; do
+				uci set $o
+			done
+		}
+		config_foreach handle_firewall $section
+	done
+done
+
+# If we use auto-ipv6-dhcp then allow 547/udp on the freifunk zone
+if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then
+	uci batch <<- EOF
+		set firewall.dhcpv6=rule
+		set firewall.dhcpv6.src=freifunk
+		set firewall.dhcpv6.target=ACCEPT
+		set firewall.dhcpv6.dest_port=547
+		set firewall.dhcpv6.proto=udp
+	EOF
+fi
+
+# Firewall rules to allow incoming ssh and web if enabled
+
+if [ "$wan_allowssh" == 1 ]; then
+	uci batch <<- EOF
+		set firewall.wanssh=rule
+		set firewall.wanssh.src=wan
+		set firewall.wanssh.target=ACCEPT
+		set firewall.wanssh.proto=tcp
+		set firewall.wanssh.dest_port=22
+	EOF
+fi
+
+if [ "$wan_allowweb" == 1 ]; then
+	uci batch <<- EOF
+		set firewall.wanweb=rule
+		set firewall.wanweb.src=wan
+		set firewall.wanweb.target=ACCEPT
+		set firewall.wanweb.proto=tcp
+		set firewall.wanweb.dest_port=80
+		set firewall.wanwebhttps=rule
+		set firewall.wanwebhttps.src=wan
+		set firewall.wanwebhttps.target=ACCEPT
+		set firewall.wanwebhttps.proto=tcp
+		set firewall.wanwebhttps.dest_port=443
+	EOF
+fi
+
+uci_commitverbose "Setup rules, forwardings, advanced config and includes." firewall
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh
new file mode 100755
index 00000000..8ca5d3b7
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh
@@ -0,0 +1,111 @@
+#!/bin/sh
+# This will add $net to the zone firewall (and remove it from other zones where it is referenced)
+# It will also setup rules defined in /etc/config/freifunk and /etc/config/profile_<community>
+# Arg $1 = $net
+
+net=$1
+. /lib/functions.sh
+. $dir/functions.sh
+config_load firewall
+
+# Get some variables
+type="$(uci -q get wireless.$net.type)"
+vap="$(uci -q get meshwizard.netconfig.$net\_vap)"
+wan_is_olsr=$(uci -q get meshwizard.netconfig.wan_config)
+
+# Delete old firewall zone for freifunk
+handle_fwzone() {
+	config_get name "$1" name
+	config_get network "$1" network
+
+	if [ "$2" == "zoneconf" ]; then
+		if [ "$name" == "freifunk" ]; then
+			# rename section if unnamed
+			if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+				section_rename firewall $1 zone_freifunk
+			fi
+		else
+			if [ ! "$name" == "freifunk" ] && [ -n "$netrenamed" -a -n "$(echo $network | grep $netrenamed)" ]; then
+				echo "    Removed $netrenamed from firewall zone $name."
+				network_new=$(echo $network | sed -e 's/'$netrenamed'//' -e 's/^ //' -e 's/  / /' -e 's/ $//')
+				uci set firewall.$1.network="$network_new"
+			fi
+		fi
+	fi
+}
+
+config_foreach handle_fwzone zone zoneconf
+
+# Add $netrenamed and if needed ${netrenamed}dhcp to the "freifunk" zone
+config_get network zone_freifunk network
+
+# remove ${netrenamed}dhcp from networks list
+[ -n "$network" -a -n "$net" ] && network="${network/${netrenamed}dhcp/}"
+network=$(echo $network) # Removes leading and trailing whitespaces
+
+[ -n "$netrenamed" ] && [ -z "$(echo $network | grep $netrenamed)" ] && network="$network $netrenamed"
+
+if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then
+        [ -n "$netrenamed" ] && [ "$network" == "${network/${netrenamed}dhcp/}" ] && network="$network ${netrenamed}dhcp"
+fi
+
+uci set firewall.zone_freifunk.network="$network"
+
+uci_commitverbose "Add '$netrenamed' to freifunk firewall zone" firewall
+
+currms=$(uci -q get firewall.zone_freifunk.masq_src)
+
+# If interfaces are outside of the mesh network they should be natted
+
+if [ "$vap" == 1 ]; then
+	# Get dhcprange and meshnet for the dhcp interface
+	if_ip="$(uci -q get network.${netrenamed}dhcp.ipaddr)"
+	if_mask="$(uci -q get network.${netrenamed}dhcp.netmask)"
+
+	[ -n "$if_ip" -a "$if_mask" ] && export $(ipcalc.sh $if_ip $if_mask)
+	[ -n "$NETWORK" -a "$PREFIX" ] && dhcprange="$NETWORK/$PREFIX"
+
+	if [ -n "$dhcprange" ]; then
+		meshnet="$(uci get profile_$community.profile.mesh_network)"
+		# check if the dhcprange is inside meshnet
+		dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)"
+		if [ "$dhcpinmesh" == 1 ]; then
+			# needed or splash will not work
+			if [ "$has_luci_splash" == TRUE ]; then
+				uci set firewall.zone_freifunk.contrack="1"
+			fi
+		else
+			uci set firewall.zone_freifunk.masq=1
+			[ -z "$(echo $currms |grep ${netrenamed}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}dhcp"
+		fi
+	fi
+fi
+
+# Get dhcprange and meshnet for the adhoc dhcp interface
+if_ip="$(uci -q get network.${netrenamed}ahdhcp.ipaddr)"
+if_mask="$(uci -q get network.${netrenamed}ahdhcp.netmask)"
+
+[ -n "$if_ip" -a "$if_mask" ] && export $(ipcalc.sh $if_ip $if_mask)
+[ -n "$NETWORK" -a "$PREFIX" ] && dhcprangeah="$NETWORK/$PREFIX"
+
+if [ -n "$dhcprangeah" ]; then
+	meshnet="$(uci get profile_$community.profile.mesh_network)"
+	# check if the dhcprange is inside meshnet
+	dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprangeah $meshnet)"
+	if [ "$dhcpinmesh" == 1 ]; then
+		# needed or splash will not work
+		if [ "$has_luci_splash" == TRUE ]; then
+			uci set firewall.zone_freifunk.contrack="1"
+		fi
+	else
+		uci set firewall.zone_freifunk.masq=1
+		[ -z "$(echo $currms |grep ${netrenamed}ahdhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}ahdhcp"
+	fi
+fi
+
+
+for i in IP NETMASK BROADCAST NETWORK PREFIX; do
+	unset $i
+done
+
+uci_commitverbose "Setup masquerading rules for '$netrenamed'" firewall
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh
new file mode 100755
index 00000000..2f6144b6
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+[ ! "$(uci -q get network.lan)" == "interface" ] && exit
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+# Setup IPv6 for the lan interface
+
+local ip6addr=""
+if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then
+	# get lan mac
+	local device="$(uci -p/var/state -q get network.lan.ifname)"
+	if [ -n "device" ]; then
+		ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $device)"
+	fi
+	uci set network.lan.ip6addr="${ip6addr}/112"
+fi
+
+uci_commitverbose "Setup ipv6 address for lan" network
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh
new file mode 100755
index 00000000..172dcf13
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Setup static interface settings for lan if lan is not an olsr interface
+
+[ ! "$(uci -q get network.lan)" == "interface" ] && exit
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+uci batch << EOF
+	set network.lan.proto='$lan_proto'
+	set network.lan.ipaddr='$lan_ip4addr'
+	set network.lan.netmask='$lan_netmask'
+EOF
+
+uci_commitverbose "Setup static ip settings for lan" network
+
+uci delete meshwizard.lan && uci commit meshwizard
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh
new file mode 100755
index 00000000..d8aa8a09
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh
@@ -0,0 +1,131 @@
+# setup entry in /etc/config/network for a interface
+# Argument $1: network interface
+ 
+net="$1"
+. /lib/functions.sh
+. $dir/functions.sh
+
+# Setup a (new) interface section for $net
+
+ipaddr=$(uci -q get meshwizard.netconfig.$net\_ip4addr)
+ip6addr=$(uci -q get meshwizard.netconfig.$net\_ip6addr)
+[ -z "$ipaddr" ] && msg_missing_value meshwizard $net\_ip4addr
+
+netmask=$(uci -q get meshwizard.netconfig.$net\_netmask)
+[ -z "$netmask" ] && netmask="$interface_netmask"
+[ -z "$netmask" ] && netmask="255.255.0.0"
+
+uci set network.$netrenamed="interface"
+set_defaults "interface_" network.$netrenamed
+
+uci batch << EOF
+	set network.$netrenamed.proto="static"
+	set network.$netrenamed.ipaddr="$ipaddr"
+	set network.$netrenamed.netmask="$netmask"
+EOF
+
+# Setup IPv6 for the interface
+local ip6addr
+if [ "$ipv6_enabled" = 1 ]; then
+	if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then
+		ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $netrenamed)"
+		uci set network.$netrenamed.ip6addr="${ip6addr}/112"
+	fi
+	if [ "$ipv6_config" = "static" ] && [ -n "$ip6addr" ]; then
+		uci set network.$netrenamed.ip6addr="$ip6addr"
+	fi
+fi
+
+uci_commitverbose "Setup interface $netrenamed" network
+
+# setup dhcp alias/interface
+
+net_dhcp=$(uci -q get meshwizard.netconfig.${net}_dhcp)
+if [ "$net_dhcp" == 1 ]; then
+
+	# Load meshwizard_settings
+	dhcprange="$(uci -q get meshwizard.netconfig.${net}_dhcprange)"
+	interface_ip="$(uci -q get meshwizard.netconfig.${net}_ip4addr)"
+	vap=$(uci -q get meshwizard.netconfig.${net}_vap)
+
+	# Rename config
+	handle_dhcpalias() {
+			config_get interface "$1" interface
+			if [ "$interface" == "$netrenamed" ]; then
+				if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+					section_rename network $1 ${netrenamed}dhcp
+				fi
+			fi
+	}
+	config_load network
+	config_foreach handle_dhcpalias interface
+
+	# Get IP/netmask and start-ip for $net dhcp
+	# If no dhcprange is given in /etc/config/meshwizard we autogenerate one
+
+	if [ -z "$dhcprange" ]; then
+		dhcprange="$($dir/helpers/gen_dhcp_ip.sh $interface_ip)/24"
+		uci set meshwizard.netconfig.${net}_dhcprange="$dhcprange"
+	fi
+
+	# If we use VAP and also offer dhcp on the adhoc interface then cut the dhcp
+	# range in two halves. one for the adhoc, one for the managed VAP interface
+	ahdhcp_when_vap="$(uci get profile_$community.profile.adhoc_dhcp_when_vap)"
+
+	if [ "$supports_vap" = 1 -a "$vap" = 1 -a "$ahdhcp_when_vap" = 1 ]; then
+		# VAPs are enabled for this interface, supported and we want to
+		# also use DHCP on the adhoc interface
+		local network
+		local mask
+		network=${dhcprange%%/*}
+		mask=${dhcprange##*/}
+		# Divide network size by adding 1 to the netmask
+		mask=$(($mask + 1))
+		# Get first ip and netmask for the adhoc dhcp network
+		eval $(sh $dir/helpers/ipcalc-cidr.sh ${network}/${mask} 1 0)
+		STARTADHOC=$START
+		NETMASKADHOC=$NETMASK
+		# Get first ip and netmask for the managed dhcp network
+		eval $(sh $dir/helpers/ipcalc-cidr.sh ${NEXTNET}/${mask} 1 0)
+		STARTVAP=$START
+		NETMASKVAP=$NETMASK
+		# Add dhcp interface
+		uci batch <<- EOF
+			set network.${netrenamed}dhcp=interface
+			set network.${netrenamed}dhcp.proto=static
+			set network.${netrenamed}dhcp.ipaddr="$STARTVAP"
+			set network.${netrenamed}dhcp.netmask="$NETMASKVAP"
+		EOF
+		uci_commitverbose  "Setup interface for ${netrenamed}dhcp" network
+	else
+		eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange 1 0)
+		STARTADHOC=$START
+		NETMASKADHOC=$NETMASK
+	fi
+	if [ "$supports_vap" = 1 -a "$vap" = 1 -a "$ahdhcp_when_vap" != 1 ]; then
+		# vaps are enabled and supported and we do not use DHCP on adhoc
+		# Add dhcp interface
+		uci batch <<- EOF
+			set network.${netrenamed}dhcp=interface
+			set network.${netrenamed}dhcp.proto=static
+			set network.${netrenamed}dhcp.ipaddr="$STARTADHOC"
+			set network.${netrenamed}dhcp.netmask="$NETMASKADHOC"
+		EOF
+		uci_commitverbose  "Setup interface for ${netrenamed}dhcp" network
+	fi
+
+
+	# Setup alias for $net adhoc interface 
+	if  [ "$supports_vap" = 0 ] || [ "$vap" = 0 ] || [ "$supports_vap" = 1 -a "$vap" = 1 -a "$ahdhcp_when_vap" = 1 ]; then
+		# vaps are either not supported or enabled or they are supported and enabled
+		# but we also want to use DHCP on the adhoc interface
+		uci batch <<- EOF
+			set network.${netrenamed}ahdhcp=interface
+			set network.${netrenamed}ahdhcp.ifname="@${netrenamed}"
+			set network.${netrenamed}ahdhcp.proto=static
+			set network.${netrenamed}ahdhcp.ipaddr="$STARTADHOC"
+			set network.${netrenamed}ahdhcp.netmask="$NETMASKADHOC"
+		EOF
+	fi
+	uci_commitverbose  "Setup interface for ${netrenamed}ahdhcp" network
+fi
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
new file mode 100755
index 00000000..9d18a582
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
@@ -0,0 +1,145 @@
+#!/bin/sh
+# Sets up olsrd
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+local protocols="4"
+if [ "$ipv6_enabled" = 1 ] && [ "$has_ipv6" == "1" ]; then
+    protocols="4 6"
+fi
+
+clean_config() {
+    # Clean the config, remove interface wlan
+    handle_interface() {
+            config_get interface "$1" interface
+            if [ "$interface" = "wlan" ]; then
+                    uci delete $cfg.$1
+            fi
+    }
+    config_foreach handle_interface Interface
+}
+
+rename_olsrd() {
+    #Rename olsrd basic settings
+    handle_olsrd() {
+	if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+		section_rename $cfg $1 olsrd
+	fi
+    }
+    config_foreach handle_olsrd olsrd
+}
+
+rename_interface_defaults() {
+    # Rename interface defaults
+    handle_interfacedefaults() {
+            if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+                    section_rename $cfg $1 InterfaceDefaults
+            fi
+    }
+    config_foreach handle_interfacedefaults InterfaceDefaults
+}
+
+cleanup_plugins() {
+    # Rename nameservice, dyngw and httpinfo plugins
+    handle_plugin() {
+            config_get library "$1" library
+            if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+                    new="$(echo $library | cut -d '.' -f 1)"
+                    section_rename $cfg "$1" "$new"
+            fi
+    }
+    config_foreach handle_plugin LoadPlugin
+    uci -q delete $cfg.olsrd_httpinfo
+    uci -q delete $cfg.olsrd_dyn_gw
+}
+
+setup_nameservice() {
+    # Setup nameservice plugin
+    if [ -n "$profile_suffix" ]; then
+            suffix=".$profile_suffix"
+    else
+            suffix=".olsr"
+    fi
+    local llfile="/var/run/latlon.js"
+    local hosts="/var/etc/hosts.olsr"
+    local services="/var/run/services_olsr"
+
+    if [ "$proto" = "6" ]; then
+        local llfile="/var/run/latlon.js.ipv6"
+        local hosts="/var/etc/hosts.olsr.ipv6"
+        local services="/var/run/services_olsr.ipv6"
+    fi
+
+	uci batch <<- EOF
+		set $cfg.olsrd_nameservice=LoadPlugin
+		set $cfg.olsrd_nameservice.library="olsrd_nameservice.so.0.3"
+		set $cfg.olsrd_nameservice.latlon_file="$llfile"
+		set $cfg.olsrd_nameservice.hosts_file="$hosts"
+		set $cfg.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid"
+		set $cfg.olsrd_nameservice.services_file="$services"
+		set $cfg.olsrd_nameservice.suffix="$suffix"
+	EOF
+
+    uci_commitverbose "Setup olsr nameservice plugin" $cfg
+}
+
+setup_dyngw_plain() {
+    # Setup dyngw_plain
+    # If Sharing of Internet is enabled then enable dyngw_plain plugin
+
+    if [ "$general_sharenet" == 1 ]; then
+	uci set $cfg.dyngw_plain=LoadPlugin
+	uci set $cfg.dyngw_plain.ignore=0
+	uci set $cfg.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4"
+	uci_commitverbose "Setup olsrd_dyngw_plain plugin" $cfg
+    fi
+
+}
+
+setup_watchdog() {
+    # Setup watchdog
+    local watchdogfile="/var/run/olsrd.watchdog"
+    if [ "$proto" = "6" ]; then
+        watchdogfile="/var/run/olsrd.watchdog.ipv6"
+    fi
+
+	uci batch <<- EOF
+		set $cfg.olsrd_watchdog=LoadPlugin
+		set $cfg.olsrd_watchdog.library="olsrd_watchdog.so.0.1"
+		set $cfg.olsrd_watchdog.file="$watchdogfile"
+		set $cfg.olsrd_watchdog.interval=30
+	EOF
+    uci_commitverbose "Setup olsr watchdog plugin" $cfg
+
+}
+
+setup_jsoninfo() {
+    # Setup jsoninfo
+	uci batch <<- EOF
+		set $cfg.olsrd_jsoninfo=LoadPlugin
+		set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo.so.0.0"
+	EOF
+    uci_commitverbose "Setup olsr jsoninfo plugin" $cfg
+}
+
+
+for proto in $protocols; do
+    cfg="olsrd"
+    [ "$proto" == "6" ] && cfg="olsrd6"
+    config_load $cfg
+    clean_config
+    rename_olsrd
+    cleanup_plugins
+
+    uci set $cfg.olsrd.IpVersion="$proto"
+    uci set $cfg.InterfaceDefaults=InterfaceDefaults
+    set_defaults "olsr_interfacedefaults_" $cfg.InterfaceDefaults
+    uci_commitverbose "Cleanup olsrd config" $cfg
+
+    setup_nameservice
+    setup_dyngw_plain
+    setup_watchdog
+    setup_jsoninfo
+
+done
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh
new file mode 100755
index 00000000..8f21893a
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh
@@ -0,0 +1,76 @@
+#!/bin/sh
+# Sets up olsrd interfaces
+# arg $1 = net
+
+net=$1
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+local protocols="4"
+if [ "$ipv6_enabled" = 1 ] && [ "$has_ipv6" == "1" ]; then
+	protocols="4 6"
+fi
+
+for proto in $protocols; do
+
+	cfg="olsrd"
+	[ "$proto" == "6" ] && cfg="olsrd6"
+
+	# Rename interface for $netrenamed
+	handle_interface() {
+		config_get interface "$1" Interface
+		if [ "$interface" == "$netrenamed" ]; then
+			if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+				section_rename $cfg $1 $netrenamed
+			fi
+		fi
+	}
+
+	config_foreach handle_interface Interface
+
+	# Setup new interface for $netrenamed
+
+	uci set $cfg.$netrenamed=Interface
+	set_defaults "olsr_interface_" $cfg.$net
+	uci set $cfg.$netrenamed.interface="$netrenamed"
+
+	uci_commitverbose "Setup olsr interface for $netrenamed." $cfg
+
+	if [ "$proto" = "4" ]; then
+		# If dhcp-network is inside the mesh_network then add HNA for it
+
+		dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange)
+		uci -q delete $cfg.${netrenamed}clients
+
+		if [ -n "$dhcprange" ]; then
+			meshnet="$(uci get profile_$community.profile.mesh_network)"
+			dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)"
+
+			if [ "$dhcpinmesh" == 1 ] && [ -n "$meshnet" ]; then
+				uci set $cfg.${netrenamed}clients="Hna4"
+				eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange)
+				uci set $cfg.${netrenamed}clients.netaddr="$NETWORK"
+				uci set $cfg.${netrenamed}clients.netmask="$NETMASK"
+				uci_commitverbose "Setup HNA for network $dhcprange" $cfg
+			fi
+		fi
+	fi
+
+	if [ "$proto" = "6" ]; then
+		# Set Hna entry for ipv6 net for static ipv6 config
+		uci -q delete $cfg.${netrenamed}static
+		if [ "$ipv6_config" = "static" ]; then
+			local v6range="$(uci -q get meshwizard.netconfig.$net\_ip6addr)"
+			local v6net="$(echo $v6range | cut -d '/' -f 1)"
+			local v6mask="$(echo $v6range | cut -d '/' -f 2)"
+			if [ -n "$v6net" ] && [ -n "$v6mask" ]; then
+				uci set $cfg.${netrenamed}static="Hna6"
+				uci set $cfg.${netrenamed}static.netaddr="$v6net"
+				uci set $cfg.${netrenamed}static.prefix="$v6mask"
+				uci_commitverbose "Setup HNA for network $v6range" $cfg
+			fi
+		fi
+	fi
+
+done
\ No newline at end of file
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh
new file mode 100755
index 00000000..f898bd68
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. $dir/functions.sh
+
+uci batch << EOF
+	set freifunk-policyrouting.pr.enable=1
+	set freifunk-policyrouting.pr.strict=1
+	set freifunk-policyrouting.pr.zones="freifunk"
+EOF
+
+uci_commitverbose "Setup policyrouting" freifunk-policyrouting
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_qos.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_qos.sh
new file mode 100755
index 00000000..25884b30
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_qos.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# sets up qos-scripts for the wan interface
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+if [ ! -f /etc/config/qos ]; then
+	echo "NOT setting up QOS because /etc/config/qos-scripts was not found"
+else
+	uci batch <<- EOF
+		set qos.wan.enabled=1
+		set qos.wan.upload=$wan_up
+		set qos.wan.download=$wan_down
+	EOF
+	uci_commitverbose "Setup QOS on WAN interface." qos
+
+fi
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
new file mode 100755
index 00000000..7cac3d69
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Setup_splash, takes 1 argument: 1=net
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+net=$1
+vap=$(uci -q get meshwizard.netconfig.${net}_vap)
+
+if [ ! "$has_luci_splash" == TRUE ]; then
+	echo "    Luci Splash is not installed, skipping setup of it."
+	exit
+fi
+
+set_defaults "luci_splash_" luci_splash.general
+uci_commitverbose "Setup general splash settings" luci_splash
+
+dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange)
+
+splash_net_add() {
+	uci batch <<- EOF
+		set luci_splash.$1="iface"
+		set luci_splash.$1.network="$1"
+		set luci_splash.$1.zone="freifunk"
+	EOF
+}
+
+if [ "$(uci -q get meshwizard.netconfig.$net\_dhcp)" == 1 ] && [ -n "$dhcprange" ]; then
+	handle_splash() {
+		config_get network "$1" network
+		if [ "$network" == "${netrenamed}dhcp" ]; then
+			if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+				section_rename luci_splash $1 ${netrenamed}dhcp
+			fi
+		fi
+	}
+	config_load luci_splash
+	config_foreach handle_splash iface
+
+	if [ "$supports_vap" = 1 -a "$vap" = 1 ]; then
+		splash_net_add ${netrenamed}dhcp		
+		uci_commitverbose "Setup dhcpsplash for ${netrenamed}dhcp" luci_splash
+	fi
+
+	ahdhcp_when_vap="$(uci get profile_$community.profile.adhoc_dhcp_when_vap)"
+	if [ "$supports_vap" = 0 ] || [ "$supports_vap" = 1 -a "$vap" = 1 -a "$ahdhcp_when_vap" = 1 ]; then
+		splash_net_add ${netrenamed}ahdhcp		
+		uci_commitverbose "Setup dhcpsplash for ${netrenamed}ahdhcp" luci_splash
+	fi
+	/etc/init.d/luci_splash enable
+fi
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh
new file mode 100755
index 00000000..38b331e7
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Setup ssh. At this point only used to store pubkeys.
+
+[ ! "$(uci -q get meshwizard.ssh)" == "system" ] && exit
+
+. /lib/functions.sh
+. $dir/functions.sh
+authorized="/etc/dropbear/authorized_keys"
+
+
+config_load meshwizard
+
+i=0
+handle_pubkeys() {
+	local k="$1"
+	( [ -f "$authorized" ] && grep -q "$k" $authorized) || {
+		echo "$k" >> $authorized
+		i=`expr $i + 1`
+	}
+}
+
+config_list_foreach ssh pubkey handle_pubkeys
+
+uci delete meshwizard.ssh
+uci_commitverbose "Added $i pubkeys to authorized_keys" meshwizard
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh
new file mode 100755
index 00000000..e9ce953f
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. $dir/functions.sh
+
+set_defaults "system_" system.system
+uci -q delete meshwizard.system && uci commit meshwizard
+uci_commitverbose "System config" system
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh
new file mode 100755
index 00000000..b25a1756
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+. $dir/functions.sh
+if [ "$ipv6_enabled" = "1" ]; then
+	uci batch <<- EOF
+		set uhttpd.main.listen_http="80"
+		set uhttpd.main.listen_https="443"
+	EOF
+fi
+
+uci_commitverbose "Setup uhttpd" uhttpd
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh
new file mode 100755
index 00000000..2f4514b6
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Setup dhcp interface settings for wan. This is the libreCMC default,
+# so all we need to do here is to delete wan from meshwizard after setup.
+# Also disallow ra on wan if ipv6 is enabled
+
+[ ! "$(uci -q get network.wan)" == "interface" ] && exit
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+if [ "$ipv6_enabled" = "1" ]; then
+	uci set network.wan.accept_ra='0'
+	uci_commitverbose "Do not accept ra on wan interface" network
+fi
+
+
+uci delete meshwizard.wan && uci commit meshwizard
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh
new file mode 100755
index 00000000..570470aa
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Setup static interface settings for wan if wan is not an olsr interface
+
+[ ! "$(uci -q get network.wan)" == "interface" ] && exit
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+uci batch << EOF
+set network.wan.proto='$wan_proto'
+set network.wan.ipaddr='$wan_ip4addr'
+set network.wan.netmask='$wan_netmask'
+set network.wan.gateway='$wan_gateway'
+set network.wan.dns='$wan_dns'
+EOF
+
+uci_commitverbose "Setup static ip settings for wan" network
+
+uci delete meshwizard.wan && uci commit meshwizard
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh
new file mode 100755
index 00000000..288252f3
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+. /lib/functions.sh
+ . $dir/functions.sh
+
+if [ -n "$widgets" ]; then
+	[ ! -f "/etc/config/freifunk-widgets" ] && touch /etc/config/freifunk-widgets
+	for w in $widgets; do
+		uci set freifunk-widgets.${w}=widget
+		set_defaults "${w}_" freifunk-widgets.${w}
+		uci delete profile_$community.${w}
+	done
+	uci commit profile_$community
+	uci_commitverbose "Added widget config." freifunk-widgets
+fi
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
new file mode 100755
index 00000000..707b7b72
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+# sets up a wifi interface for meshing
+# Arguments: $1 = network interface
+
+net="$1"
+. /lib/functions.sh
+. $dir/functions.sh
+
+##### wifi-device #####
+
+# Get the type before we delete the wifi-device
+config_load wireless
+config_get type $net type
+
+# Rename wifi-device for $net
+
+handle_wifidevice() {
+	if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+		section_rename wireless $1 $net
+	fi
+}
+config_foreach handle_wifidevice wifi-device
+
+# create new wifi-device for $net
+uci set wireless.${net}=wifi-device
+
+# get and set wifi-device defaults
+set_defaults "wifi_device_" wireless.${net}
+
+channel="$(uci -q get meshwizard.netconfig.$net\_channel)"
+
+if [ -z "$channel" -o "$channel" == "default" ]; then
+	channel=$wifi_device_channel
+fi
+
+uci batch << EOF
+	set wireless.${net}.type="$type"
+	set wireless.${net}.channel="$channel"
+EOF
+
+uci_commitverbose "Setup wifi device for $netrenamed" wireless
+
+##### wifi iface
+
+# Rename wifi-iface for $net
+handle_interface() {
+	config_get device "$1" device
+	if [ "$device" == "$net" ]; then
+		if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then
+			section_rename wireless $1 ${net}_iface
+		fi
+	fi
+} 
+config_foreach handle_interface wifi-iface
+
+# create new wifi-device for $net
+uci set wireless.$net\_iface=wifi-iface
+
+# create new wifi-iface for $net from defaults
+set_defaults "wifi_iface_" wireless.$net\_iface
+
+# overwrite defaults
+bssid="$($dir/helpers/gen_bssid.sh $channel $community)"
+
+ssid="$profile_ssid"
+if [ "$profile_ssid_scheme" == "addchannel" ]; then
+	ssid="$ssid - ch$channel"
+elif [ "$profile_ssid_scheme" == "addchannelbefore" ]; then
+	ssid="ch$channel.$ssid"
+fi
+
+uci batch << EOF
+	set wireless.$net\_iface.device="${net}"
+	set wireless.$net\_iface.network="$netrenamed"
+	set wireless.$net\_iface.ssid="$ssid"
+	set wireless.$net\_iface.bssid="$bssid"
+EOF
+
+uci_commitverbose "Setup wifi interface for $netrenamed" wireless
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi_vap.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi_vap.sh
new file mode 100755
index 00000000..df58ad76
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi_vap.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# sets up a wifi interface for meshing
+# Arguments: $1 = network interface
+
+net="$1"
+. /lib/functions.sh
+. $dir/functions.sh
+
+## Setup a VAP interface in AP Mode
+ip4addr="$(uci get meshwizard.netconfig.$net\_ip4addr)"
+vap="$(uci -q get meshwizard.netconfig.$net\_vap)"
+
+if [ "$supports_vap" == 1 -a "$vap" == 1 ]; then
+	uci batch <<- EOF
+		set wireless.$net\_iface_dhcp="wifi-iface"
+		set wireless.$net\_iface_dhcp.device="$net"
+		set wireless.$net\_iface_dhcp.mode="ap"
+		set wireless.$net\_iface_dhcp.encryption="none"
+		set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp"
+		set wireless.$net\_iface_dhcp.ssid="Freifunk-$ip4addr"
+	EOF
+	uci_commitverbose "Setup VAP interface for $netrenamed" wireless
+fi
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh
new file mode 100755
index 00000000..0585ab5f
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+# checks if a given device can be used for a VAP interface (1 adhoc + 1 ap)
+dev="$1"
+type="$2"
+
+
+if [ -z "$dev" -o -z "$type" ]; then
+	exit 1
+fi
+
+if [ "$type" = "atheros" ]; then
+        exit 0
+elif [ "$type" = "mac80211" ]; then
+	# not hostapd[-mini], no VAP
+	if [ ! -x /usr/sbin/hostapd ]; then
+		echo "WARNING: hostapd[-mini] is required to be able to use VAP with mac80211."
+		exit 1
+	fi
+        # get driver in use
+        netindex="$(echo $dev |sed 's/[a-zA-z]*//')"
+	if [ -d /sys/class/net/wlan${netindex}/device/driver/module ]; then
+	        driver="$(basename $(ls -l /sys/class/net/wlan${netindex}/device/driver/module | sed -ne 's/.* -> //p'))"
+	        if [ "$driver" = "ath9k" -o  "$driver" = "ath5k" ]; then
+	                exit 0
+		else
+			exit 1
+	        fi
+	else
+		exit 1
+	fi
+else
+	exit 1
+fi
+
diff --git a/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
new file mode 100755
index 00000000..77c6cd95
--- /dev/null
+++ b/trunk/package/luci/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
@@ -0,0 +1,141 @@
+#!/bin/sh
+
+# This collection of scripts will take settings from /etc/config/meshwizard, /etc/config/freifunk
+# and /etc/config/profile_<community> and setup the router to participate in wireless mesh networks
+
+# Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+# Licensed under the Apache License, Version 2.0 (the "License")
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+. /lib/functions.sh
+
+echo "
+/* Meshwizard 0.2.0 */
+"
+
+# config
+export dir="/usr/bin/meshwizard"
+. $dir/functions.sh
+[ -f /proc/net/ipv6_route ] && export has_ipv6=1
+
+# Check which packages we have installed
+export has_luci=FALSE
+opkg list_installed |grep luci-mod-admin > /dev/null && export has_luci=TRUE
+export has_luci_splash=FALSE
+opkg list_installed |grep luci-app-splash > /dev/null && export has_luci_splash=TRUE
+
+# Check whether we want to cleanup/restore uci config before setting new options
+cleanup=$(uci -q get meshwizard.general.cleanup)
+[ "$cleanup" == 1 ] && $dir/helpers/restore_default_config.sh
+
+# Rename wifi interfaces
+$dir/helpers/rename-wifi.sh
+
+# Get community
+community=$(uci -q get meshwizard.community.name || uci -q get freifunk.community.name)
+[ -z "$community" ] && echo "Error: Community is not set in /etc/config/freifunk, aborting now." && exit 1
+export community="$community"
+echo $community
+
+# Get a list of networks we need to setup
+networks=$(uci show meshwizard.netconfig | grep -v "netconfig=" | sed -e 's/meshwizard.netconfig\.\(.*\)\_.*/\1/' |sort|uniq)
+export networks
+[ -z "$networks" ] && echo "Error: No networks to setup could be found in /etc/config/meshwizard, aborting now." && exit 1
+
+# Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community
+# then /etc/config/meshwizard
+# last will overwrite first
+
+$dir/helpers/read_defaults.sh $community > /tmp/meshwizard.tmp
+while read line; do
+	export "${line//\"/}"
+done < /tmp/meshwizard.tmp
+
+# Do config
+$dir/helpers/initial_config.sh
+$dir/helpers/setup_dnsmasq.sh
+$dir/helpers/setup_system.sh
+$dir/helpers/setup_olsrd.sh
+$dir/helpers/setup_firewall.sh
+$dir/helpers/setup_ssh.sh
+$dir/helpers/setup_uhttpd.sh
+$dir/helpers/setup_widgets.sh
+
+if [ "$wan_proto" == "static" ] && [ -n "$wan_ip4addr" ] && [ -n "$wan_netmask" ]; then
+	$dir/helpers/setup_wan_static.sh
+fi
+
+if [ "$wan_proto" == "dhcp" ]; then
+	$dir/helpers/setup_wan_dhcp.sh
+fi
+
+if [ -n "$wan_down" -a -n "$wan_up" ]; then
+	$dir/helpers/setup_qos.sh
+fi
+
+if [ "$lan_proto" == "static" ] && [ -n "$lan_ip4addr" ] && [ -n "$lan_netmask" ]; then
+	$dir/helpers/setup_lan_static.sh
+fi
+
+if [ "$ipv6_enabled" == 1 ] && [ "$has_ipv6" = 1 ]; then
+	$dir/helpers/setup_lan_ipv6.sh
+	# Setup auto-ipv6
+	if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then
+		$dir/helpers/setup_auto-ipv6.sh
+	fi
+fi
+
+# Setup policyrouting if internet sharing is disabled and wan is not used for olsrd
+# Always disable it first to make sure its disabled when the user decied to share his internet
+uci set freifunk-policyrouting.pr.enable=0
+if [ ! "$general_sharenet" == 1 ] && [ ! "$(uci -q get meshwizard.netconfig.wan_proto)" == "olsr" ]; then
+	$dir/helpers/setup_policyrouting.sh
+fi
+
+# Configure found networks
+for net in $networks; do
+	# radioX devices need to be renamed
+	netrenamed="${net/radio/wireless}"
+	export netrenamed
+
+	if [ ! "$net" == "wan" ] && [ ! "$net" == "lan" ]; then
+		$dir/helpers/setup_wifi.sh $net
+		# check if this net supports vap
+		/sbin/wifi # wifi needs to be up for the check
+		export supports_vap="0"
+		type="$(uci -q get wireless.$net.type)"
+		[ -n "$type" ] && $dir/helpers/supports_vap.sh $net $type && export supports_vap=1
+		if [ "$supports_vap" = 1 ]; then
+			$dir/helpers/setup_wifi_vap.sh $net
+		fi
+	fi
+
+	$dir/helpers/setup_network.sh $net
+
+	$dir/helpers/setup_olsrd_interface.sh $net
+
+	net_dhcp=$(uci -q get meshwizard.netconfig.${net}_dhcp)
+	if [ "$net_dhcp" == 1 ]; then
+		$dir/helpers/setup_dhcp.sh $net
+	fi
+
+	$dir/helpers/setup_splash.sh $net
+	$dir/helpers/setup_firewall_interface.sh $net
+
+	if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then
+		$dir/helpers/setup_auto-ipv6-interface.sh $net
+	fi
+done
+
+##### postinstall script
+
+[ -f /etc/rc.local.meshkitpostinstall ] && /etc/rc.local.meshkitpostinstall
+
+
+##### Reboot the router (because simply restarting services gave errors)
+
+echo "+ The wizard has finished and the router will reboot now."
+
+reboot
diff --git a/trunk/package/luci/contrib/package/remote-update/Makefile b/trunk/package/luci/contrib/package/remote-update/Makefile
new file mode 100644
index 00000000..2bb3b24c
--- /dev/null
+++ b/trunk/package/luci/contrib/package/remote-update/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the Apache 2.0 license.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=remote-update
+PKG_RELEASE:=4
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/remote-update
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=9. Freifunk
+  TITLE:=Freifunk remote update utility.
+  DEPENDS:=@TARGET_atheros||@TARGET_ar71xx||@TARGET_brcm_2_4
+endef
+
+define Package/remote-update/description
+  The freifunk remote-update utility uses sysupgrade to reflash the currently 
+  running firmware while keeping most of the existing configuratio.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/remote-update/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,remote-update))
diff --git a/trunk/package/luci/contrib/package/remote-update/files/usr/sbin/remote-update b/trunk/package/luci/contrib/package/remote-update/files/usr/sbin/remote-update
new file mode 100755
index 00000000..3413954e
--- /dev/null
+++ b/trunk/package/luci/contrib/package/remote-update/files/usr/sbin/remote-update
@@ -0,0 +1,306 @@
+#!/bin/sh
+
+local tempfile=/tmp/remote-upgrade.img
+local D2='\([0-9]\{2\}\)'
+local D4='\([0-9]\{4\}\)'
+local NL='
+'
+
+find_architecture()
+{
+	local ifs="$IFS"; IFS="-"
+	set -- $(opkg list_installed kernel)
+	IFS="$ifs"
+
+	echo "$3"
+}
+
+find_image()
+{
+	case "$1" in
+		atheros)
+			echo "librecmc-atheros-combined.squashfs.img"
+		;;
+		ar71xx)
+			echo "librecmc-ar71xx-combined.squashfs.img"
+		;;
+		brcm)
+			echo "librecmc-brcm-2.4-squashfs.trx"
+		;;
+	esac
+}
+
+check_image()
+{
+	local file; for file in /lib/upgrade/*.sh; do . $file; done
+	if platform_check_image "$1" >/dev/null 2>/dev/null; then
+		return 0
+	fi
+	return 1
+}
+
+find_remote_checksum()
+{
+	wget -qO- ${1%/*}/md5sums 2>/dev/null | \
+		sed -ne '/'$2'/ { s/ .*//p }'
+}
+
+find_local_checksum()
+{
+	set -- $(md5sum "$tempfile")
+	echo $1
+}
+
+find_remote_info()
+{
+	wget -qO- "${1%/*}/VERSION.txt" 2>/dev/null
+}
+
+find_remote_version()
+{
+	find_remote_info "$1" | \
+		sed -ne "s!.*$D4/$D2/$D2 $D2:$D2.*!\\1\\2\\3\\4\\5!p;t"
+}
+
+find_local_version()
+{
+	if [ -f /rom/etc/banner ]; then
+		sed -ne "s!.*$D4/$D2/$D2 $D2:$D2.*!\\1\\2\\3\\4\\5!p;t" \
+			/rom/etc/banner
+	else
+		date +"%Y%m%d%H%M" -r /bin/sh
+	fi
+}
+
+stop_service()
+{
+	[ -x /etc/init.d/$1 ] && {
+		echo -n "Stopping service $1 ... "
+		/etc/init.d/$1 stop >/dev/null 2>/dev/null
+		echo "done"
+	}
+}
+
+do_wait()
+{
+	if [ ${1:-0} -gt 0 ]; then
+		echo -n "${2:-Waiting} "
+		for i in $(seq 1 $1); do
+			printf "%-2dseconds" $(($1-$i))
+			sleep 1
+			echo -en "\b\b\b\b\b\b\b\b\b"
+		done
+		echo "${NL}"
+	fi
+}
+
+version_compare()
+{
+	local v1="$1"
+	local v2="$2"
+
+	while [ -n "$v1" -o -n "$v2" ]; do
+		if [ -z "${v2:0:4}" -o "${v1:0:4}" -gt "${v2:0:4}" ]; then
+			return 1
+		elif [ -z "${v1:0:4}" -o "${v1:0:4}" -lt "${v2:0:4}" ]; then
+			return 2
+		fi
+
+		v1="${v1:4}"
+		v2="${v2:4}"
+	done
+
+	return 0
+}
+
+usage()
+{
+	cat <<EOT
+
+Usage:
+  remote-update -h
+  remote-update [-u <update url>] -c
+  remote-update [-v] [-y] [-u <update url>] -w
+  remote-update [-d] [-n] [-v] [-y] [-s <sleep seconds>] [-u <update url>]
+
+Actions:
+  -h    Display this help message and exit.
+  -c    Check for firmware update and exit.
+  -w    Fetch image and exit, do not perform flash write.
+
+Options:
+  -d    Do not detach from terminal.
+  -n    Do not backup configuration.
+  -v    Skip verification of downloaded image.
+  -y    Assume defaults for all questions.
+
+  -s <seconds>
+    Sleep given amount of seconds before starting flash write.
+    If ommitted and '-y' is not used, 5 seconds are assumed.
+
+  -u <url>
+    Fetch firmware image from given url. A file "md5sums" is expected
+    in the same remote directory. If there is no such file, use -v to
+    suppress verification.
+
+EOT
+
+	exit 1
+}
+
+
+while getopts "s:u:cdnvwyh" flag; do
+	case $flag in
+		s) sleeptime="$OPTARG";;
+		u) updateurl="$OPTARG";;
+		c) checkupdate=1;;
+		d) nodetach=1;;
+		n) nobackup=1;;
+		v) noverify=1;;
+		w) noflash=1;;
+		y) noquestions=1;;
+		*) usage;;
+	esac
+done
+
+
+local image_url="$updateurl"
+local image_name="${image_url##*/}"
+
+[ -z "$image_url" ] && {
+	local arch=$(find_architecture)
+	local image=$(find_image "$arch")
+	local repo=$(uci get freifunk.upgrade.repository 2>/dev/null)
+	repo=${repo:-$(uci get system.upgrade.repository 2>/dev/null)}
+
+	[ -z "$arch" ] && {
+		echo "Can not determine the current architecture."
+		exit 1
+	}
+
+	[ -z "$repo" ] && {
+		echo "No repository configured in 'system.upgrade.repository'."
+		echo "Use the '-u' flag to specify an image location."
+		exit 1
+	}
+
+	[ -z "$image" ] && {
+		echo "No suitable image for the '$arch' architecture."
+		echo "Your platform is not supported."
+		exit 1
+	}
+
+	echo "Architecture: $arch"
+	echo "Repository:   $repo"
+
+	image_name="$image"
+	image_url="${repo%/}/$arch/$image"
+}
+
+
+if [ "$checkupdate" = 1 ]; then
+	local v1=$(find_local_version)
+	local v2=$(find_remote_version "$image_url")
+
+	[ -n "$v1" -a -n "$v2" ] && {
+		version_compare "$v1" "$v2"
+		[ $? == 2 ] && {
+			echo "Update available!${NL}Local:  $v1${NL}Remote: $v2${NL}--"
+			find_remote_info "$image_url"
+			exit 0
+		} || {
+			echo "Local version $v1 is up to date"
+			exit 2
+		}
+	} || {
+		echo "No remote time stamp found."
+		exit 1
+	}
+else
+	if [ "$noquestions" != 1 ]; then
+		echo -n "${NL}About to download $image_name. Continue? [y] "
+		read answer
+		case "$answer" in
+			[nN]) exit 1;;
+		esac
+	fi
+
+	echo -n "Downloading $image_name ... "
+	rm -f $tempfile
+	wget -qO $tempfile "$image_url" 2>/dev/null
+	[ $? == 0 ] && echo done || {
+		echo failed
+		rm -f $tempfile
+		exit 1
+	}
+
+	if [ "$noverify" != 1 ]; then
+		echo -n "Verifying $image_name ... "
+
+		local md5_remote=$(find_remote_checksum "$image_url" "$image_name")
+		local md5_local=$(find_local_checksum)
+
+		check_image "$tempfile"
+		local image_ok=$?
+
+		if [ $image_ok = 0 -a -n "$md5_remote" -a -n "$md5_local" -a "$md5_remote" = "$md5_local" ]; then
+			echo "done"
+		else
+			if [ $image_ok != 0 ]; then
+				echo "unsupported image type"
+			else
+				echo "checksum mismatch! (local:${md5_local:-(none)} remote:${md5_remote:-(none)})"
+			fi
+
+			local answer=n
+			if [ "$noquestions" != 1 ]; then
+				echo -n "${NL}Verification failed. Continue anyway? [n] "
+				read answer
+			fi
+
+			case "$answer" in
+				[yYjJ]*) : ;;
+				*)
+					echo "Aborting."
+					rm -f $tempfile
+					exit 1
+				;;
+			esac
+		fi
+	fi
+
+	if [ "$noflash" != 1 ]; then
+		if [ -f "$tempfile" ]; then
+			if [ "$noquestions" == 1 ]; then
+				do_wait ${sleeptime:-5} "${NL}About to start flashing, hit <Ctrl-C> to abort!${NL}${NL}Starting in"
+			else
+				if [ -z "$nobackup" ]; then
+					echo -n "${NL}Keep configuration files? [y] "
+					read answer
+					case "$answer" in
+						[nN]) nobackup=1;;
+					esac
+				fi
+
+				echo -n "${NL}About to start flashing!${NL}Hit <Enter> to continue or <Ctrl-C> to abort.${NL}"
+				read answer
+			fi
+
+			for s in lucid collectd; do stop_service $s; done
+
+			if [ "$nodetach" != 1 ]; then
+				echo -n "Starting sysupgrade in background ... "
+				/bin/busybox start-stop-daemon -S -b -x /sbin/sysupgrade -- ${nobackup:+-n} "$tempfile"
+				echo "done"
+			else
+				echo "Executing sysupgrade ... "
+				exec /sbin/sysupgrade ${nobackup:+-n} "$tempfile"
+			fi
+		else
+			echo "No upgrade image found!"
+			exit 1
+		fi
+	else
+		echo "Image saved in '$tempfile'"
+	fi
+fi
diff --git a/trunk/package/luci/contrib/uci/Makefile b/trunk/package/luci/contrib/uci/Makefile
new file mode 100644
index 00000000..daf2c915
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/Makefile
@@ -0,0 +1,43 @@
+include ../../build/config.mk
+include ../../build/gccconfig.mk
+
+UCI_VERSION  = 0.8.0
+#UCI_SITE    = http://mirror2.librecmc.org/sources
+#UCI_DIR     = uci-$(UCI_VERSION)
+#UCI_FILE    = $(UCI_DIR).tar.gz
+#UCI_URL     = $(UCI_SITE)/$(UCI_FILE)
+UCI_GITREV   = aa3ab8012bfbf793d2884c08ea924545a04e9544
+UCI_SITE     = http://nbd.name
+UCI_DIR      = uci.git
+UCI_FILE     = uci-$(UCI_VERSION)$(UCI_APPEND).tar.gz
+UCI_URL      = $(UCI_SITE)/gitweb.cgi?p=uci.git;a=snapshot;h=$(UCI_GITREV)
+UCI_PATCHDIR = patches
+
+all: compile
+
+include ../../build/module.mk
+
+$(UCI_FILE):
+	wget -O $@ "$(UCI_URL)" || rm -f $@
+
+$(UCI_DIR)/.prepared: $(UCI_FILE)
+	rm -rf $(UCI_DIR)
+	tar xvfz $(UCI_FILE)
+	(cd $(UCI_PATCHDIR); ls *.patch | sort > series) || true
+	[ -f "$(UCI_PATCHDIR)/series" ] && while read patch; do \
+		patch -d $(UCI_DIR) -p1 < $(UCI_PATCHDIR)/$$patch; \
+	done < $(UCI_PATCHDIR)/series || true
+	touch $@
+
+compile: $(UCI_DIR)/.prepared
+	$(MAKE) -C $(UCI_DIR) CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
+	mkdir -p dist/usr/lib dist/usr/bin
+	$(MAKE) -C $(UCI_DIR) install DESTDIR=../dist prefix=/usr
+	$(MAKE) -C $(UCI_DIR)/lua CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
+	$(MAKE) -C $(UCI_DIR)/lua install DESTDIR=../../dist luadir=$(LUA_LIBRARYDIR)
+
+compile-all: compile
+
+clean:
+	rm -rf $(UCI_PATCHDIR)/series
+	rm -rf $(UCI_DIR) $(UCI_FILE)
diff --git a/trunk/package/luci/contrib/uci/hostfiles/bin/uci b/trunk/package/luci/contrib/uci/hostfiles/bin/uci
new file mode 100755
index 00000000..f6104c6e
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/bin/uci
@@ -0,0 +1,2 @@
+#!/bin/sh
+$(dirname $0)/../usr/bin/uci -c $(dirname $0)/../etc/config "$@"
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/batmand b/trunk/package/luci/contrib/uci/hostfiles/etc/config/batmand
new file mode 100644
index 00000000..95ec3fab
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/batmand
@@ -0,0 +1,10 @@
+config batmand general
+	option interface		ath0
+	option announce			
+	option gateway_class		
+	option originator_interval
+	option preferred_gateway	
+	option routing_class
+	option visualisation_srv
+	option policy_routing_script
+	
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/ddns b/trunk/package/luci/contrib/uci/hostfiles/etc/config/ddns
new file mode 100644
index 00000000..7c3f3c1a
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/ddns
@@ -0,0 +1,85 @@
+#################################################################
+# In order to enable dynamic dns you need at least one section,
+# and in that seciton the "enabled" option must be set to one
+# 
+# Each section represents an update to a different service
+#
+# You specify your domain name, your username and your password
+# with the optins "domain", "username" and "password" respectively
+#
+# Next you need to specify the name of the service you are 
+# connecting to "eg. dyndns.org".  The format of the update
+# urls for several different dynamic dns services is specified
+# in the /usr/lib/ddns/services file.  This list is hardly complete
+# as there are many, many different dynamic dns services.  If your
+# service is on the list you can merely specify it with the 
+# "service_name" option.  Otherwise you will need to determine
+# the format of the url to update with.  You can either add an
+# entry to the /usr/lib/ddns/services file or specify this with
+# the "update_url" option.
+#
+# We also need to specify the source of the ip address to associate with
+# your domain.  The "ip_source" option can be "network", "interface"
+# or "web", with "network" as the default.  
+#
+# If "ip_source" is "network" you specify a network section in your 
+# /etc/network config file (e.g. "wan", which is the default) with
+# the "ip_network" option.  If you specify "wan", you will update
+# with whatever the ip for your wan is.
+# 
+# If "ip_source" is "interface" you specify a hardware interface 
+# (e.g. "eth1") and whatever the current ip of this interface is
+# will be associated with the domain when an update is performed.
+#
+# The last possibility is that "ip_source" is "web", which means
+# that in order to obtain our ip address we will connect to a 
+# website, and the first valid ip address listed on that page
+# will be assumed to be ours.  If you are behind another firewall
+# this is the best option since none of the local networks or 
+# interfaces will have the external ip.  The website to connect
+# to is specified by the "ip_url" option.  You may specify multiple
+# urls in the option, separated by whitespace.
+#
+# Finally we need to specify how often to check whether we need
+# to check whether the ip address has changed (and if so update
+# it) and how often we need to force an update ( many services
+# will expire your domain if you don't connect and do an update
+# every so often).  Use the "check_interval" to specify how
+# often to check whether an update is necessary, and the 
+# "force_interval" option to specify how often to force an
+# update.  Specify the units for these values with the "check_unit"
+# and the "force_unit" options.  Units can be "days", "hours",
+# "minutes" or "seconds".  The default force_unit is hours and the
+# default check_unit is seconds.  The default check_interval is
+# 600 seconds, or ten minutes.  The default force_interval is 
+# 72 hours or 3 days.
+#
+#
+#########################################################
+
+config service "myddns"
+	option enabled		"0"
+
+	option service_name	"dyndns.org"
+	option domain		"mypersonaldomain.dyndns.org"
+	option username		"myusername"
+	option password		"mypassword"
+
+	option ip_source	"network" 
+	option ip_network	"wan"
+	
+
+	option force_interval	"72"
+	option force_unit	"hours"
+	option check_interval	"10"
+	option check_unit	"minutes"
+
+	#option ip_source	"interface"
+	#option ip_interface	"eth0.1"
+
+	#option ip_source	"web"
+	#option ip_url		"http://www.whatismyip.com/automation/n09230945.asp"
+
+	#option update_url	"http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
+
+
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/dhcp b/trunk/package/luci/contrib/uci/hostfiles/etc/config/dhcp
new file mode 100644
index 00000000..4904b025
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/dhcp
@@ -0,0 +1,23 @@
+config dnsmasq
+	option domainneeded	1
+	option boguspriv	1
+	option filterwin2k	'0'  #enable for dial on demand
+	option localise_queries	1
+	option local	'/lan/'
+	option domain	'lan'
+	option expandhosts	1
+	option nonegcache	0
+	option authoritative	1
+	option readethers	1
+	option leasefile	'/tmp/dhcp.leases'
+	option resolvfile	'/tmp/resolv.conf.auto'
+
+config dhcp
+	option interface	lan
+	option start 	100
+	option limit	150
+	option leasetime	12h
+
+config dhcp
+	option interface	wan
+	option ignore	1
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/dropbear b/trunk/package/luci/contrib/uci/hostfiles/etc/config/dropbear
new file mode 100644
index 00000000..e660ac73
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/dropbear
@@ -0,0 +1,3 @@
+config dropbear
+	option PasswordAuth 'on'
+	option Port         '22'
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/firewall b/trunk/package/luci/contrib/uci/hostfiles/etc/config/firewall
new file mode 100644
index 00000000..07316901
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/firewall
@@ -0,0 +1,80 @@
+config defaults
+	option syn_flood	1
+	option input		DROP 
+	option output		ACCEPT 
+	option forward		DROP 
+
+config zone
+	option name		lan
+	option input	ACCEPT 
+	option output	ACCEPT 
+	option forward	DROP 
+
+config zone
+	option name		wan
+	option input	DROP 
+	option output	ACCEPT 
+	option forward	DROP 
+	option masq		1 
+
+config forwarding 
+	option src      lan
+	option dest     wan
+
+
+### EXAMPLE CONFIG SECTIONS
+# do not allow a specific ip to access wan
+#config rule
+#	option src		lan
+#	option src_ip	192.168.45.2
+#	option dest		wan
+#	option proto	tcp
+#	option target	REJECT 
+
+# block a specific mac on wan
+#config rule
+#	option dest		wan
+#	option src_mac	00:11:22:33:44:66
+#	option target	REJECT 
+
+# block incoming ICMP traffic on a zone
+#config rule
+#	option src		lan
+#	option proto	ICMP
+#	option target	DROP
+
+# port redirect port coming in on wan to lan
+#config redirect
+#	option src			wan
+#	option src_dport	80
+#	option dest			lan
+#	option dest_ip		192.168.16.235
+#	option dest_port	80 
+#	option protocol		tcp
+
+# include a file with users custom iptables rules
+#config include
+#	option path /etc/firewall.user
+
+
+### FULL CONFIG SECTIONS
+#config rule
+#	option src		lan
+#	option src_ip	192.168.45.2
+#	option src_mac	00:11:22:33:44:55
+#	option src_port	80
+#	option dest		wan
+#	option dest_ip	194.25.2.129
+#	option dest_port	120
+#	option proto	tcp
+#	option target	REJECT 
+
+#config redirect
+#	option src		lan
+#	option src_ip	192.168.45.2
+#	option src_mac	00:11:22:33:44:55
+#	option src_port		1024
+#	option src_dport	80
+#	option dest_ip	194.25.2.129
+#	option dest_port	120
+#	option proto	tcp
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/fstab b/trunk/package/luci/contrib/uci/hostfiles/etc/config/fstab
new file mode 100644
index 00000000..eccf0ce6
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/fstab
@@ -0,0 +1,10 @@
+config mount
+	option target	/home
+	option device	/dev/sda1
+	option fstype	ext3
+	option options	rw,sync
+	option enabled	0
+
+config swap
+	option device	/dev/sda2
+	option enabled	0
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/httpd b/trunk/package/luci/contrib/uci/hostfiles/etc/config/httpd
new file mode 100644
index 00000000..2f8020ff
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/httpd
@@ -0,0 +1,5 @@
+
+config 'httpd'
+	option 'port' '80'
+	option 'home' '/www'
+
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/luci_devinfo b/trunk/package/luci/contrib/uci/hostfiles/etc/config/luci_devinfo
new file mode 100644
index 00000000..a8ab3ee7
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/luci_devinfo
@@ -0,0 +1,29 @@
+config 'smap_scannet' 'SIP_LAN'
+        option 'enable' '0'
+	option 'interface' 'lan'
+	option 'subnet' '192.168.99.0/24'
+	option 'ports'	'5060'
+	option 'timeout' '10'
+	option 'repeat_count' '1'
+	option 'sleepreq' '100'
+	
+config 'smap_scannet' 'SIP_WAN'
+        option 'enable' '0'
+	option 'interface' 'wan'
+	option 'subnet' '216.218.0.0/16'
+
+config 'netdiscover_scannet' 'SCAN_LAN'
+        option 'enable' '0'
+	option 'interface' 'lan'
+	option 'subnet' '192.168.99.0/24'
+	
+config 'netdiscover_scannet' 'SCAN_WAN'
+        option 'enable' '0'
+	option 'interface' 'wan'
+	option 'subnet' '216.218.0.0/16'
+	option 'ports'	'5060'
+	option 'timeout' '10'
+	option 'repeat_count' '1'
+	option 'sleepreq' '100'
+	
+
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/mactodevinfo b/trunk/package/luci/contrib/uci/hostfiles/etc/config/mactodevinfo
new file mode 100644
index 00000000..ca243240
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/mactodevinfo
@@ -0,0 +1,10 @@
+
+config 'mactodevinfo'
+	option 'maclow' '00:19:15:00:00:00'
+	option 'machigh' '00:19:15:ff:ff:ff'
+	option 'vendor' 'Vertical Communications'
+	option 'devtype' 'SIP devices'
+	option 'model' 'varies'
+	option 'ouiowneroverride' 'Some company'
+	option 'name' 'Vertical XIP and Phones'
+
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/network b/trunk/package/luci/contrib/uci/hostfiles/etc/config/network
new file mode 100644
index 00000000..6f499c99
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/network
@@ -0,0 +1,27 @@
+#### VLAN configuration 
+config switch eth0
+	option vlan0	"0 1 2 3 5*"
+	option vlan1	"4 5"
+
+
+#### Loopback configuration
+config interface loopback
+	option ifname	"lo"
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+
+#### LAN configuration
+config interface lan
+	option type 	bridge
+	option ifname	"eth0"
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+
+
+#### WAN configuration
+config interface	wan
+	option ifname	"wlan0"
+	option proto	dhcp
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/ntpclient b/trunk/package/luci/contrib/uci/hostfiles/etc/config/ntpclient
new file mode 100644
index 00000000..01c26ca9
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/ntpclient
@@ -0,0 +1,22 @@
+config ntpserver
+	option hostname '0.librecmc.pool.ntp.org'
+	option port     '123'
+
+config ntpserver
+	option hostname '1.librecmc.pool.ntp.org'
+	option port     '123'
+
+config ntpserver
+	option hostname '2.librecmc.pool.ntp.org'
+	option port     '123'
+
+config ntpserver
+	option hostname '3.librecmc.pool.ntp.org'
+	option port     '123'
+
+config ntpdrift
+	option freq     '0'
+
+config ntpclient
+	option interval	60
+	#option count	10
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/qos b/trunk/package/luci/contrib/uci/hostfiles/etc/config/qos
new file mode 100644
index 00000000..ddf0968f
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/qos
@@ -0,0 +1,89 @@
+# QoS configuration for libreCMC
+
+# INTERFACES:
+config interface wan
+	option classgroup  "Default"
+	option enabled      1
+	option overhead     1
+	option upload       128
+	option download     1024
+
+# RULES:
+config classify
+	option target       "Bulk"
+	option ipp2p        "all"
+config classify
+	option target       "Bulk"
+	option layer7       "edonkey"
+config classify
+	option target       "Bulk"
+	option layer7       "bittorrent"
+config classify
+	option target       "Priority"
+	option ports        "22,53"
+config classify
+	option target       "Normal"
+	option proto        "tcp"
+	option ports        "20,21,25,80,110,443,993,995"
+config classify
+	option target       "Express"
+	option ports        "5190"
+config default
+	option target       "Express"
+	option proto        "udp"
+	option pktsize      "-500"
+config reclassify
+	option target       "Priority"
+	option proto        "icmp"
+config default
+	option target       "Bulk"
+	option portrange    "1024-65535"
+config reclassify
+	option target       "Priority"
+	option proto        "tcp"
+	option pktsize      "-128"
+	option mark         "!Bulk"
+	option tcpflags     "SYN"
+config reclassify
+	option target       "Priority"
+	option proto        "tcp"
+	option pktsize      "-128"
+	option mark	        "!Bulk"
+	option tcpflags     "ACK"
+
+
+# Don't change the stuff below unless you
+# really know what it means :)
+
+config classgroup "Default"
+	option classes      "Priority Express Normal Bulk"
+	option default      "Normal"
+
+
+config class "Priority"
+	option packetsize  400
+	option maxsize     400
+	option avgrate     10
+	option priority    20
+config class "Priority_down"
+	option packetsize  1000
+	option avgrate     10
+
+
+config class "Express"
+	option packetsize  1000
+	option maxsize     800
+	option avgrate     50
+	option priority    10
+
+config class "Normal"
+	option packetsize  1500
+	option packetdelay 100
+	option avgrate     10
+	option priority    5
+config class "Normal_down"
+	option avgrate     20
+
+config class "Bulk"
+	option avgrate     1
+	option packetdelay 200
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/system b/trunk/package/luci/contrib/uci/hostfiles/etc/config/system
new file mode 100644
index 00000000..73d63c7b
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/system
@@ -0,0 +1,3 @@
+config system
+	option hostname	libreCMC
+	option timezone	UTC
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/upnpd b/trunk/package/luci/contrib/uci/hostfiles/etc/config/upnpd
new file mode 100644
index 00000000..75dcb9ac
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/upnpd
@@ -0,0 +1,4 @@
+config upnpd config
+	option log_output	0
+	option download 	1024
+	option upload   	512
diff --git a/trunk/package/luci/contrib/uci/hostfiles/etc/config/wireless b/trunk/package/luci/contrib/uci/hostfiles/etc/config/wireless
new file mode 100644
index 00000000..8b2b402e
--- /dev/null
+++ b/trunk/package/luci/contrib/uci/hostfiles/etc/config/wireless
@@ -0,0 +1,16 @@
+config wifi-device  wifi0
+	option type     atheros
+	option channel  auto
+	option disabled 0
+
+config wifi-iface
+	option device	wifi0
+	option network	lan
+	option mode	ap
+	option ssid	libreCMC
+	option encryption none
+
+	# Fake active wifi
+	option ifname	ath0
+	option up		1
+
diff --git a/trunk/package/luci/contrib/uhttpd/Makefile b/trunk/package/luci/contrib/uhttpd/Makefile
new file mode 100644
index 00000000..22c0529d
--- /dev/null
+++ b/trunk/package/luci/contrib/uhttpd/Makefile
@@ -0,0 +1,30 @@
+include ../../build/config.mk
+include ../../build/gccconfig.mk
+
+UHTTPD_SRC		= svn://svn.librecmc.org/librecmc/branches/backfire/package/uhttpd/src
+UHTTPD_DIR		= uhttpd-src
+UHTTPD_PATCHDIR = patches
+
+all: compile
+
+include ../../build/module.mk
+
+$(UHTTPD_DIR)/Makefile:
+	svn co $(UHTTPD_SRC) $(UHTTPD_DIR)
+
+$(UHTTPD_DIR)/.prepared: $(UHTTPD_DIR)/Makefile
+	(cd $(UHTTPD_PATCHDIR); ls *.patch | sort > series) || true
+	[ -f "$(UHTTPD_PATCHDIR)/series" ] && while read patch; do \
+		patch -d $(UHTTPD_DIR) -p1 < $(UHTTPD_PATCHDIR)/$$patch; \
+	done < $(UHTTPD_PATCHDIR)/series || true
+	touch $@
+
+compile: $(UHTTPD_DIR)/.prepared
+	(cd $(UHTTPD_DIR); $(MAKE) LUA_SUPPORT=0 TLS_SUPPORT=0 CGI_SUPPORT=1)
+	mkdir -p dist/usr/sbin
+	cp $(UHTTPD_DIR)/uhttpd dist/usr/sbin
+
+compile-all: compile
+
+clean:
+	rm -rf $(UHTTPD_DIR)
diff --git a/trunk/package/luci/contrib/uhttpd/patches/001-pass-env.patch b/trunk/package/luci/contrib/uhttpd/patches/001-pass-env.patch
new file mode 100644
index 00000000..ab607dbf
--- /dev/null
+++ b/trunk/package/luci/contrib/uhttpd/patches/001-pass-env.patch
@@ -0,0 +1,11 @@
+--- a/uhttpd-cgi.c
++++ b/uhttpd-cgi.c
+@@ -216,7 +216,7 @@ void uh_cgi_request(
+ 			     (pi->stat.st_mode & S_IXOTH)) || (ip != NULL)
+ 			) {
+ 				/* build environment */
+-				clearenv();
++				//clearenv();
+ 
+ 				/* common information */
+ 				setenv("GATEWAY_INTERFACE", "CGI/1.1", 1);
diff --git a/trunk/package/luci/contrib/uhttpd/patches/002-link-order.patch b/trunk/package/luci/contrib/uhttpd/patches/002-link-order.patch
new file mode 100644
index 00000000..8bdd3353
--- /dev/null
+++ b/trunk/package/luci/contrib/uhttpd/patches/002-link-order.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -70,7 +70,7 @@ endif
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ compile: $(OBJ) $(TLSLIB) $(LUALIB)
+-	$(CC) -o uhttpd $(LDFLAGS) $(LIB) $(OBJ)
++	$(CC) -o uhttpd $(LDFLAGS) $(OBJ) $(LIB)
+ 
+ clean:
+ 	rm -f *.o *.so uhttpd
diff --git a/trunk/package/luci/contrib/uhttpd/patches/series b/trunk/package/luci/contrib/uhttpd/patches/series
new file mode 100644
index 00000000..8a1834ec
--- /dev/null
+++ b/trunk/package/luci/contrib/uhttpd/patches/series
@@ -0,0 +1,2 @@
+001-pass-env.patch
+002-link-order.patch
diff --git a/trunk/package/luci/i18n/catalan/Makefile b/trunk/package/luci/i18n/catalan/Makefile
new file mode 100644
index 00000000..1803f39c
--- /dev/null
+++ b/trunk/package/luci/i18n/catalan/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = ca
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/catalan/ipkg/postinst b/trunk/package/luci/i18n/catalan/ipkg/postinst
new file mode 100755
index 00000000..48be5724
--- /dev/null
+++ b/trunk/package/luci/i18n/catalan/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-catalan ) && rm -f /etc/uci-defaults/luci-i18n-catalan
+}
diff --git a/trunk/package/luci/i18n/catalan/root/etc/uci-defaults/luci-i18n-catalan b/trunk/package/luci/i18n/catalan/root/etc/uci-defaults/luci-i18n-catalan
new file mode 100755
index 00000000..faa8fcf9
--- /dev/null
+++ b/trunk/package/luci/i18n/catalan/root/etc/uci-defaults/luci-i18n-catalan
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.ca=Català
+	commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/chinese/Makefile b/trunk/package/luci/i18n/chinese/Makefile
new file mode 100644
index 00000000..bb1480e9
--- /dev/null
+++ b/trunk/package/luci/i18n/chinese/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = zh-cn
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/chinese/ipkg/postinst b/trunk/package/luci/i18n/chinese/ipkg/postinst
new file mode 100644
index 00000000..9fbec28c
--- /dev/null
+++ b/trunk/package/luci/i18n/chinese/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-chinese ) &&	rm -f /etc/uci-defaults/luci-i18n-chinese
+}
diff --git a/trunk/package/luci/i18n/chinese/root/etc/uci-defaults/luci-i18n-chinese b/trunk/package/luci/i18n/chinese/root/etc/uci-defaults/luci-i18n-chinese
new file mode 100644
index 00000000..aee25e6f
--- /dev/null
+++ b/trunk/package/luci/i18n/chinese/root/etc/uci-defaults/luci-i18n-chinese
@@ -0,0 +1,5 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.zh_cn=chinese
+	commit luci
+EOF
diff --git a/trunk/package/luci/i18n/english/Makefile b/trunk/package/luci/i18n/english/Makefile
new file mode 100644
index 00000000..1bc56476
--- /dev/null
+++ b/trunk/package/luci/i18n/english/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = en
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/english/ipkg/postinst b/trunk/package/luci/i18n/english/ipkg/postinst
new file mode 100755
index 00000000..24cf8dd2
--- /dev/null
+++ b/trunk/package/luci/i18n/english/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-english ) &&	rm -f /etc/uci-defaults/luci-i18n-english
+}
diff --git a/trunk/package/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english b/trunk/package/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english
new file mode 100755
index 00000000..48cfc5eb
--- /dev/null
+++ b/trunk/package/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.en=English
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/french/Makefile b/trunk/package/luci/i18n/french/Makefile
new file mode 100644
index 00000000..5dcd3db9
--- /dev/null
+++ b/trunk/package/luci/i18n/french/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = fr
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/french/ipkg/postinst b/trunk/package/luci/i18n/french/ipkg/postinst
new file mode 100755
index 00000000..e220e4dc
--- /dev/null
+++ b/trunk/package/luci/i18n/french/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-french ) &&	rm -f /etc/uci-defaults/luci-i18n-french
+}
diff --git a/trunk/package/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french b/trunk/package/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french
new file mode 100755
index 00000000..85bc0243
--- /dev/null
+++ b/trunk/package/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.fr='Français'
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/german/Makefile b/trunk/package/luci/i18n/german/Makefile
new file mode 100644
index 00000000..b5c20d57
--- /dev/null
+++ b/trunk/package/luci/i18n/german/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = de
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/german/ipkg/postinst b/trunk/package/luci/i18n/german/ipkg/postinst
new file mode 100755
index 00000000..c5af6628
--- /dev/null
+++ b/trunk/package/luci/i18n/german/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-german ) &&	rm -f /etc/uci-defaults/luci-i18n-german
+}
diff --git a/trunk/package/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german b/trunk/package/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german
new file mode 100755
index 00000000..aca22b42
--- /dev/null
+++ b/trunk/package/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.de=Deutsch
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/greek/Makefile b/trunk/package/luci/i18n/greek/Makefile
new file mode 100644
index 00000000..c16228ea
--- /dev/null
+++ b/trunk/package/luci/i18n/greek/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = el
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/greek/ipkg/postinst b/trunk/package/luci/i18n/greek/ipkg/postinst
new file mode 100755
index 00000000..cfd1512d
--- /dev/null
+++ b/trunk/package/luci/i18n/greek/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-greek ) &&	rm -f /etc/uci-defaults/luci-i18n-greek
+}
diff --git a/trunk/package/luci/i18n/greek/root/etc/uci-defaults/luci-i18n-greek b/trunk/package/luci/i18n/greek/root/etc/uci-defaults/luci-i18n-greek
new file mode 100755
index 00000000..493b5991
--- /dev/null
+++ b/trunk/package/luci/i18n/greek/root/etc/uci-defaults/luci-i18n-greek
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.el=Ελληνικά
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/hebrew/Makefile b/trunk/package/luci/i18n/hebrew/Makefile
new file mode 100644
index 00000000..6527c7a1
--- /dev/null
+++ b/trunk/package/luci/i18n/hebrew/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = he
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/hebrew/ipkg/postinst b/trunk/package/luci/i18n/hebrew/ipkg/postinst
new file mode 100755
index 00000000..78010a48
--- /dev/null
+++ b/trunk/package/luci/i18n/hebrew/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-hebrew ) &&	rm -f /etc/uci-defaults/luci-i18n-hebrew
+}
diff --git a/trunk/package/luci/i18n/hebrew/root/etc/uci-defaults/luci-i18n-hebrew b/trunk/package/luci/i18n/hebrew/root/etc/uci-defaults/luci-i18n-hebrew
new file mode 100644
index 00000000..a33c448c
--- /dev/null
+++ b/trunk/package/luci/i18n/hebrew/root/etc/uci-defaults/luci-i18n-hebrew
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.he=עִבְרִית
+	commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/hungarian/Makefile b/trunk/package/luci/i18n/hungarian/Makefile
new file mode 100644
index 00000000..ebde70ce
--- /dev/null
+++ b/trunk/package/luci/i18n/hungarian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = hu
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/hungarian/ipkg/postinst b/trunk/package/luci/i18n/hungarian/ipkg/postinst
new file mode 100755
index 00000000..7f69ba75
--- /dev/null
+++ b/trunk/package/luci/i18n/hungarian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-hungarian ) &&	rm -f /etc/uci-defaults/luci-i18n-hungarian
+}
diff --git a/trunk/package/luci/i18n/hungarian/root/etc/uci-defaults/luci-i18n-hungarian b/trunk/package/luci/i18n/hungarian/root/etc/uci-defaults/luci-i18n-hungarian
new file mode 100755
index 00000000..6d4c8adf
--- /dev/null
+++ b/trunk/package/luci/i18n/hungarian/root/etc/uci-defaults/luci-i18n-hungarian
@@ -0,0 +1,5 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.hu=Magyar
+	commit luci
+EOF
diff --git a/trunk/package/luci/i18n/italian/Makefile b/trunk/package/luci/i18n/italian/Makefile
new file mode 100644
index 00000000..5a0298c1
--- /dev/null
+++ b/trunk/package/luci/i18n/italian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = it
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/italian/ipkg/postinst b/trunk/package/luci/i18n/italian/ipkg/postinst
new file mode 100755
index 00000000..623ef1c8
--- /dev/null
+++ b/trunk/package/luci/i18n/italian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-italian ) &&	rm -f /etc/uci-defaults/luci-i18n-italian
+}
diff --git a/trunk/package/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian b/trunk/package/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian
new file mode 100755
index 00000000..544915c5
--- /dev/null
+++ b/trunk/package/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.it=Italiano
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/japanese/Makefile b/trunk/package/luci/i18n/japanese/Makefile
new file mode 100644
index 00000000..fd520216
--- /dev/null
+++ b/trunk/package/luci/i18n/japanese/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = ja
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/japanese/ipkg/postinst b/trunk/package/luci/i18n/japanese/ipkg/postinst
new file mode 100755
index 00000000..aaa44e26
--- /dev/null
+++ b/trunk/package/luci/i18n/japanese/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-japanese ) &&	rm -f /etc/uci-defaults/luci-i18n-japanese
+}
diff --git a/trunk/package/luci/i18n/japanese/root/etc/uci-defaults/luci-i18n-japanese b/trunk/package/luci/i18n/japanese/root/etc/uci-defaults/luci-i18n-japanese
new file mode 100644
index 00000000..b43e20a1
--- /dev/null
+++ b/trunk/package/luci/i18n/japanese/root/etc/uci-defaults/luci-i18n-japanese
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.ja=日本語
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/malay/Makefile b/trunk/package/luci/i18n/malay/Makefile
new file mode 100644
index 00000000..e4d34283
--- /dev/null
+++ b/trunk/package/luci/i18n/malay/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = ms
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/malay/root/etc/uci-defaults/luci-i18n-malay b/trunk/package/luci/i18n/malay/root/etc/uci-defaults/luci-i18n-malay
new file mode 100755
index 00000000..95f7ada1
--- /dev/null
+++ b/trunk/package/luci/i18n/malay/root/etc/uci-defaults/luci-i18n-malay
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.ms='Bahasa Melayu'
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/norwegian/Makefile b/trunk/package/luci/i18n/norwegian/Makefile
new file mode 100644
index 00000000..897ed76d
--- /dev/null
+++ b/trunk/package/luci/i18n/norwegian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = no
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/norwegian/ipkg/postinst b/trunk/package/luci/i18n/norwegian/ipkg/postinst
new file mode 100755
index 00000000..0b6c62d4
--- /dev/null
+++ b/trunk/package/luci/i18n/norwegian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-norwegian ) &&	rm -f /etc/uci-defaults/luci-i18n-norwegian
+}
diff --git a/trunk/package/luci/i18n/norwegian/root/etc/uci-defaults/luci-i18n-norwegian b/trunk/package/luci/i18n/norwegian/root/etc/uci-defaults/luci-i18n-norwegian
new file mode 100644
index 00000000..955ab654
--- /dev/null
+++ b/trunk/package/luci/i18n/norwegian/root/etc/uci-defaults/luci-i18n-norwegian
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.no=Norsk
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/polish/Makefile b/trunk/package/luci/i18n/polish/Makefile
new file mode 100644
index 00000000..cdf26211
--- /dev/null
+++ b/trunk/package/luci/i18n/polish/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = pl
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/polish/ipkg/postinst b/trunk/package/luci/i18n/polish/ipkg/postinst
new file mode 100755
index 00000000..c562629e
--- /dev/null
+++ b/trunk/package/luci/i18n/polish/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-polish ) && rm -f /etc/uci-defaults/luci-i18n-polish
+}
diff --git a/trunk/package/luci/i18n/polish/root/etc/uci-defaults/luci-i18n-polish b/trunk/package/luci/i18n/polish/root/etc/uci-defaults/luci-i18n-polish
new file mode 100755
index 00000000..0183c9e9
--- /dev/null
+++ b/trunk/package/luci/i18n/polish/root/etc/uci-defaults/luci-i18n-polish
@@ -0,0 +1,5 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.pl='Polski'
+	commit luci
+EOF
diff --git a/trunk/package/luci/i18n/portuguese-brazilian/Makefile b/trunk/package/luci/i18n/portuguese-brazilian/Makefile
new file mode 100644
index 00000000..9749c9d5
--- /dev/null
+++ b/trunk/package/luci/i18n/portuguese-brazilian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = pt-br
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/portuguese-brazilian/ipkg/postinst b/trunk/package/luci/i18n/portuguese-brazilian/ipkg/postinst
new file mode 100755
index 00000000..fc331566
--- /dev/null
+++ b/trunk/package/luci/i18n/portuguese-brazilian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-portuguese_brazilian ) &&	rm -f /etc/uci-defaults/luci-i18n-portuguese_brazilian
+}
diff --git a/trunk/package/luci/i18n/portuguese-brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian b/trunk/package/luci/i18n/portuguese-brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
new file mode 100755
index 00000000..1554c1ec
--- /dev/null
+++ b/trunk/package/luci/i18n/portuguese-brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
@@ -0,0 +1,5 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.pt_br="Português (Brasil)"
+        commit luci
+EOF
diff --git a/trunk/package/luci/i18n/portuguese/Makefile b/trunk/package/luci/i18n/portuguese/Makefile
new file mode 100644
index 00000000..bd127bb3
--- /dev/null
+++ b/trunk/package/luci/i18n/portuguese/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = pt
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/portuguese/ipkg/postinst b/trunk/package/luci/i18n/portuguese/ipkg/postinst
new file mode 100755
index 00000000..cc97e03e
--- /dev/null
+++ b/trunk/package/luci/i18n/portuguese/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-portuguese ) && rm -f /etc/uci-defaults/luci-i18n-portuguese
+}
diff --git a/trunk/package/luci/i18n/portuguese/root/etc/uci-defaults/luci-i18n-portuguese b/trunk/package/luci/i18n/portuguese/root/etc/uci-defaults/luci-i18n-portuguese
new file mode 100755
index 00000000..26089072
--- /dev/null
+++ b/trunk/package/luci/i18n/portuguese/root/etc/uci-defaults/luci-i18n-portuguese
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.pt=Português
+	commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/romanian/Makefile b/trunk/package/luci/i18n/romanian/Makefile
new file mode 100644
index 00000000..35fbe32d
--- /dev/null
+++ b/trunk/package/luci/i18n/romanian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = ro
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/romanian/ipkg/postinst b/trunk/package/luci/i18n/romanian/ipkg/postinst
new file mode 100755
index 00000000..d8f3b85a
--- /dev/null
+++ b/trunk/package/luci/i18n/romanian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-romanian ) && rm -f /etc/uci-defaults/luci-i18n-romanian
+}
diff --git a/trunk/package/luci/i18n/romanian/root/etc/uci-defaults/luci-i18n-romanian b/trunk/package/luci/i18n/romanian/root/etc/uci-defaults/luci-i18n-romanian
new file mode 100755
index 00000000..0f7e7b71
--- /dev/null
+++ b/trunk/package/luci/i18n/romanian/root/etc/uci-defaults/luci-i18n-romanian
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.ro=Română
+	commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/russian/Makefile b/trunk/package/luci/i18n/russian/Makefile
new file mode 100644
index 00000000..537ed8ee
--- /dev/null
+++ b/trunk/package/luci/i18n/russian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = ru
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/russian/ipkg/postinst b/trunk/package/luci/i18n/russian/ipkg/postinst
new file mode 100755
index 00000000..7ace4822
--- /dev/null
+++ b/trunk/package/luci/i18n/russian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-russian ) &&	rm -f /etc/uci-defaults/luci-i18n-russian
+}
diff --git a/trunk/package/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian b/trunk/package/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian
new file mode 100755
index 00000000..a4805d1c
--- /dev/null
+++ b/trunk/package/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.ru=Русский
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/spanish/Makefile b/trunk/package/luci/i18n/spanish/Makefile
new file mode 100644
index 00000000..a15be258
--- /dev/null
+++ b/trunk/package/luci/i18n/spanish/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = es
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/spanish/root/etc/uci-defaults/luci-i18n-spanish b/trunk/package/luci/i18n/spanish/root/etc/uci-defaults/luci-i18n-spanish
new file mode 100755
index 00000000..7ab53663
--- /dev/null
+++ b/trunk/package/luci/i18n/spanish/root/etc/uci-defaults/luci-i18n-spanish
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.es=Español
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/swedish/Makefile b/trunk/package/luci/i18n/swedish/Makefile
new file mode 100644
index 00000000..9c135255
--- /dev/null
+++ b/trunk/package/luci/i18n/swedish/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = sv
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/swedish/ipkg/postinst b/trunk/package/luci/i18n/swedish/ipkg/postinst
new file mode 100755
index 00000000..eac6e344
--- /dev/null
+++ b/trunk/package/luci/i18n/swedish/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-swedish ) && rm -f /etc/uci-defaults/luci-i18n-swedish
+}
diff --git a/trunk/package/luci/i18n/swedish/root/etc/uci-defaults/luci-i18n-swedish b/trunk/package/luci/i18n/swedish/root/etc/uci-defaults/luci-i18n-swedish
new file mode 100755
index 00000000..239405a7
--- /dev/null
+++ b/trunk/package/luci/i18n/swedish/root/etc/uci-defaults/luci-i18n-swedish
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.sv=Svenska
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/ukrainian/Makefile b/trunk/package/luci/i18n/ukrainian/Makefile
new file mode 100644
index 00000000..3252b008
--- /dev/null
+++ b/trunk/package/luci/i18n/ukrainian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = uk
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/ukrainian/ipkg/postinst b/trunk/package/luci/i18n/ukrainian/ipkg/postinst
new file mode 100755
index 00000000..ba9a7af0
--- /dev/null
+++ b/trunk/package/luci/i18n/ukrainian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-ukrainian ) &&	rm -f /etc/uci-defaults/luci-i18n-ukrainian
+}
diff --git a/trunk/package/luci/i18n/ukrainian/root/etc/uci-defaults/luci-i18n-ukrainian b/trunk/package/luci/i18n/ukrainian/root/etc/uci-defaults/luci-i18n-ukrainian
new file mode 100755
index 00000000..ebfdc95b
--- /dev/null
+++ b/trunk/package/luci/i18n/ukrainian/root/etc/uci-defaults/luci-i18n-ukrainian
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.uk='украї́нська'
+        commit luci
+EOF
+
diff --git a/trunk/package/luci/i18n/vietnamese/Makefile b/trunk/package/luci/i18n/vietnamese/Makefile
new file mode 100644
index 00000000..213642c2
--- /dev/null
+++ b/trunk/package/luci/i18n/vietnamese/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = vi
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/i18n/vietnamese/ipkg/postinst b/trunk/package/luci/i18n/vietnamese/ipkg/postinst
new file mode 100755
index 00000000..cda03df7
--- /dev/null
+++ b/trunk/package/luci/i18n/vietnamese/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-vietnamese ) && rm -f /etc/uci-defaults/luci-i18n-vietnamese
+}
diff --git a/trunk/package/luci/i18n/vietnamese/root/etc/uci-defaults/luci-i18n-vietnamese b/trunk/package/luci/i18n/vietnamese/root/etc/uci-defaults/luci-i18n-vietnamese
new file mode 100755
index 00000000..ab585883
--- /dev/null
+++ b/trunk/package/luci/i18n/vietnamese/root/etc/uci-defaults/luci-i18n-vietnamese
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.vi="Tiếng Việt"
+	commit luci
+EOF
+
diff --git a/trunk/package/luci/libs/httpclient/Makefile b/trunk/package/luci/libs/httpclient/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/libs/httpclient/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/libs/httpclient/luasrc/httpclient.lua b/trunk/package/luci/libs/httpclient/luasrc/httpclient.lua
new file mode 100644
index 00000000..e9fec5db
--- /dev/null
+++ b/trunk/package/luci/libs/httpclient/luasrc/httpclient.lua
@@ -0,0 +1,369 @@
+--[[
+LuCI - Lua Development Framework
+
+Copyright 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require "nixio.util"
+local nixio = require "nixio"
+
+local ltn12 = require "luci.ltn12"
+local util = require "luci.util"
+local table = require "table"
+local http = require "luci.http.protocol"
+local date = require "luci.http.protocol.date"
+
+local type, pairs, ipairs, tonumber = type, pairs, ipairs, tonumber
+local unpack = unpack
+
+module "luci.httpclient"
+
+function chunksource(sock, buffer)
+	buffer = buffer or ""
+	return function()
+		local output
+		local _, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
+		while not count and #buffer <= 1024 do
+			local newblock, code = sock:recv(1024 - #buffer)
+			if not newblock then
+				return nil, code
+			end
+			buffer = buffer .. newblock  
+			_, endp, count = buffer:find("^([0-9a-fA-F]+);?.-\r\n")
+		end
+		count = tonumber(count, 16)
+		if not count then
+			return nil, -1, "invalid encoding"
+		elseif count == 0 then
+			return nil
+		elseif count + 2 <= #buffer - endp then
+			output = buffer:sub(endp+1, endp+count)
+			buffer = buffer:sub(endp+count+3)
+			return output
+		else
+			output = buffer:sub(endp+1, endp+count)
+			buffer = ""
+			if count - #output > 0 then
+				local remain, code = sock:recvall(count-#output)
+				if not remain then
+					return nil, code
+				end
+				output = output .. remain
+				count, code = sock:recvall(2)
+			else
+				count, code = sock:recvall(count+2-#buffer+endp)
+			end
+			if not count then
+				return nil, code
+			end
+			return output
+		end
+	end
+end
+
+
+function request_to_buffer(uri, options)
+	local source, code, msg = request_to_source(uri, options)
+	local output = {}
+	
+	if not source then
+		return nil, code, msg
+	end
+	
+	source, code = ltn12.pump.all(source, (ltn12.sink.table(output)))
+	
+	if not source then
+		return nil, code
+	end
+	
+	return table.concat(output)
+end
+
+function request_to_source(uri, options)
+	local status, response, buffer, sock = request_raw(uri, options)
+	if not status then
+		return status, response, buffer
+	elseif status ~= 200 and status ~= 206 then
+		return nil, status, buffer
+	end
+	
+	if response.headers["Transfer-Encoding"] == "chunked" then
+		return chunksource(sock, buffer)
+	else
+		return ltn12.source.cat(ltn12.source.string(buffer), sock:blocksource())
+	end
+end
+
+--
+-- GET HTTP-resource
+--
+function request_raw(uri, options)
+	options = options or {}
+	local pr, auth, host, port, path
+	
+	if uri:find("%[") then
+		if uri:find("@") then
+			pr, auth, host, port, path = uri:match("(%w+)://(.+)@(%b[]):?([0-9]*)(.*)")
+			host = host:sub(2,-2)
+		else
+			pr, host, port, path = uri:match("(%w+)://(%b[]):?([0-9]*)(.*)")
+			host = host:sub(2,-2)
+		end
+	else
+		if uri:find("@") then
+			pr, auth, host, port, path =
+				uri:match("(%w+)://(.+)@([%w-.]+):?([0-9]*)(.*)")
+		else
+			pr, host, port, path = uri:match("(%w+)://([%w-.]+):?([0-9]*)(.*)")
+		end
+	end
+
+	if not host then
+		return nil, -1, "unable to parse URI"
+	end
+	
+	if pr ~= "http" and pr ~= "https" then
+		return nil, -2, "protocol not supported"
+	end
+	
+	port = #port > 0 and port or (pr == "https" and 443 or 80)
+	path = #path > 0 and path or "/"
+	
+	options.depth = options.depth or 10
+	local headers = options.headers or {}
+	local protocol = options.protocol or "HTTP/1.1"
+	headers["User-Agent"] = headers["User-Agent"] or "LuCI httpclient 0.1"
+	
+	if headers.Connection == nil then
+		headers.Connection = "close"
+	end
+	
+	if auth and not headers.Authorization then
+		headers.Authorization = "Basic " .. nixio.bin.b64encode(auth)
+	end
+
+	local sock, code, msg = nixio.connect(host, port)
+	if not sock then
+		return nil, code, msg
+	end
+	
+	sock:setsockopt("socket", "sndtimeo", options.sndtimeo or 15)
+	sock:setsockopt("socket", "rcvtimeo", options.rcvtimeo or 15)
+	
+	if pr == "https" then
+		local tls = options.tls_context or nixio.tls()
+		sock = tls:create(sock)
+		local stat, code, error = sock:connect()
+		if not stat then
+			return stat, code, error
+		end
+	end
+
+	-- Pre assemble fixes	
+	if protocol == "HTTP/1.1" then
+		headers.Host = headers.Host or host
+	end
+	
+	if type(options.body) == "table" then
+		options.body = http.urlencode_params(options.body)
+	end
+
+	if type(options.body) == "string" then
+		headers["Content-Length"] = headers["Content-Length"] or #options.body
+		headers["Content-Type"] = headers["Content-Type"] or
+			"application/x-www-form-urlencoded"
+		options.method = options.method or "POST"
+	end
+	
+	if type(options.body) == "function" then
+		options.method = options.method or "POST"
+	end
+
+	-- Assemble message
+	local message = {(options.method or "GET") .. " " .. path .. " " .. protocol}
+	
+	for k, v in pairs(headers) do
+		if type(v) == "string" or type(v) == "number" then
+			message[#message+1] = k .. ": " .. v
+		elseif type(v) == "table" then
+			for i, j in ipairs(v) do
+				message[#message+1] = k .. ": " .. j
+			end
+		end
+	end
+	
+	if options.cookies then
+		for _, c in ipairs(options.cookies) do
+			local cdo = c.flags.domain
+			local cpa = c.flags.path
+			if   (cdo == host or cdo == "."..host or host:sub(-#cdo) == cdo) 
+			 and (cpa == path or cpa == "/" or cpa .. "/" == path:sub(#cpa+1))
+			 and (not c.flags.secure or pr == "https")
+			then
+				message[#message+1] = "Cookie: " .. c.key .. "=" .. c.value
+			end 
+		end
+	end
+	
+	message[#message+1] = ""
+	message[#message+1] = ""
+	
+	-- Send request
+	sock:sendall(table.concat(message, "\r\n"))
+	
+	if type(options.body) == "string" then
+		sock:sendall(options.body)
+	elseif type(options.body) == "function" then
+		local res = {options.body(sock)}
+		if not res[1] then
+			sock:close()
+			return unpack(res)
+		end
+	end
+	
+	-- Create source and fetch response
+	local linesrc = sock:linesource()
+	local line, code, error = linesrc()
+	
+	if not line then
+		sock:close()
+		return nil, code, error
+	end
+	
+	local protocol, status, msg = line:match("^([%w./]+) ([0-9]+) (.*)")
+	
+	if not protocol then
+		sock:close()
+		return nil, -3, "invalid response magic: " .. line
+	end
+	
+	local response = {
+		status = line, headers = {}, code = 0, cookies = {}, uri = uri
+	}
+	
+	line = linesrc()
+	while line and line ~= "" do
+		local key, val = line:match("^([%w-]+)%s?:%s?(.*)")
+		if key and key ~= "Status" then
+			if type(response.headers[key]) == "string" then
+				response.headers[key] = {response.headers[key], val}
+			elseif type(response.headers[key]) == "table" then
+				response.headers[key][#response.headers[key]+1] = val
+			else
+				response.headers[key] = val
+			end
+		end
+		line = linesrc()
+	end
+	
+	if not line then
+		sock:close()
+		return nil, -4, "protocol error"
+	end
+	
+	-- Parse cookies
+	if response.headers["Set-Cookie"] then
+		local cookies = response.headers["Set-Cookie"]
+		for _, c in ipairs(type(cookies) == "table" and cookies or {cookies}) do
+			local cobj = cookie_parse(c)
+			cobj.flags.path = cobj.flags.path or path:match("(/.*)/?[^/]*")
+			if not cobj.flags.domain or cobj.flags.domain == "" then
+				cobj.flags.domain = host
+				response.cookies[#response.cookies+1] = cobj
+			else
+				local hprt, cprt = {}, {}
+				
+				-- Split hostnames and save them in reverse order
+				for part in host:gmatch("[^.]*") do
+					table.insert(hprt, 1, part)
+				end
+				for part in cobj.flags.domain:gmatch("[^.]*") do
+					table.insert(cprt, 1, part)
+				end
+				
+				local valid = true
+				for i, part in ipairs(cprt) do
+					-- If parts are different and no wildcard
+					if hprt[i] ~= part and #part ~= 0 then
+						valid = false
+						break
+					-- Wildcard on invalid position
+					elseif hprt[i] ~= part and #part == 0 then
+						if i ~= #cprt or (#hprt ~= i and #hprt+1 ~= i) then
+							valid = false
+							break
+						end
+					end
+				end
+				-- No TLD cookies
+				if valid and #cprt > 1 and #cprt[2] > 0 then
+					response.cookies[#response.cookies+1] = cobj
+				end
+			end
+		end
+	end
+	
+	-- Follow 
+	response.code = tonumber(status)
+	if response.code and options.depth > 0 then
+		if (response.code == 301 or response.code == 302 or response.code == 307)
+		 and response.headers.Location then
+			local nuri = response.headers.Location or response.headers.location
+			if not nuri then
+				return nil, -5, "invalid reference"
+			end
+			if not nuri:find("https?://") then
+				nuri = pr .. "://" .. host .. ":" .. port .. nuri
+			end
+			
+			options.depth = options.depth - 1
+			if options.headers then
+				options.headers.Host = nil
+			end
+			sock:close()
+			
+			return request_raw(nuri, options)
+		end
+	end
+	
+	return response.code, response, linesrc(true), sock
+end
+
+function cookie_parse(cookiestr)
+	local key, val, flags = cookiestr:match("%s?([^=;]+)=?([^;]*)(.*)")
+	if not key then
+		return nil
+	end
+
+	local cookie = {key = key, value = val, flags = {}}
+	for fkey, fval in flags:gmatch(";%s?([^=;]+)=?([^;]*)") do
+		fkey = fkey:lower()
+		if fkey == "expires" then
+			fval = date.to_unix(fval:gsub("%-", " "))
+		end
+		cookie.flags[fkey] = fval
+	end
+
+	return cookie
+end
+
+function cookie_create(cookie)
+	local cookiedata = {cookie.key .. "=" .. cookie.value}
+
+	for k, v in pairs(cookie.flags) do
+		if k == "expires" then
+			v = date.to_http(v):gsub(", (%w+) (%w+) (%w+) ", ", %1-%2-%3 ")
+		end
+		cookiedata[#cookiedata+1] = k .. ((#v > 0) and ("=" .. v) or "")
+	end
+
+	return table.concat(cookiedata, "; ")
+end
diff --git a/trunk/package/luci/libs/httpclient/luasrc/httpclient/receiver.lua b/trunk/package/luci/libs/httpclient/luasrc/httpclient/receiver.lua
new file mode 100644
index 00000000..4f08e93f
--- /dev/null
+++ b/trunk/package/luci/libs/httpclient/luasrc/httpclient/receiver.lua
@@ -0,0 +1,295 @@
+--[[
+LuCI - Lua Development Framework 
+
+Copyright 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require "nixio.util"
+local nixio = require "nixio"
+local httpc = require "luci.httpclient"
+local ltn12 = require "luci.ltn12"
+
+local print, tonumber, require, unpack = print, tonumber, require, unpack
+
+module "luci.httpclient.receiver"
+
+local function prepare_fd(target)
+	-- Open fd for appending
+	local oflags = nixio.open_flags("wronly", "creat")
+	local file, code, msg = nixio.open(target, oflags)
+	if not file then
+		return file, code, msg
+	end
+	
+	-- Acquire lock
+	local stat, code, msg = file:lock("tlock")
+	if not stat then
+		return stat, code, msg
+	end
+	
+	file:seek(0, "end") 
+	
+	return file
+end
+
+local function splice_async(sock, pipeout, pipein, file, cb)
+	local ssize = 65536
+	local smode = nixio.splice_flags("move", "more", "nonblock")
+
+	-- Set pipe non-blocking otherwise we might end in a deadlock
+	local stat, code, msg = pipein:setblocking(false)
+	if stat then
+		stat, code, msg = pipeout:setblocking(false)
+	end
+	if not stat then
+		return stat, code, msg
+	end
+	
+	
+	local pollsock = {
+		{fd=sock, events=nixio.poll_flags("in")}
+	}
+	
+	local pollfile = {
+		{fd=file, events=nixio.poll_flags("out")}
+	}
+	
+	local done
+	local active -- Older splice implementations sometimes don't detect EOS
+	
+	repeat
+		active = false
+		
+		-- Socket -> Pipe
+		repeat
+			nixio.poll(pollsock, 15000)
+		
+			stat, code, msg = nixio.splice(sock, pipeout, ssize, smode)
+			if stat == nil then
+				return stat, code, msg
+			elseif stat == 0 then
+				done = true
+				break
+			elseif stat then
+				active = true
+			end
+		until stat == false
+		
+		-- Pipe -> File
+		repeat
+			nixio.poll(pollfile, 15000)
+		
+			stat, code, msg = nixio.splice(pipein, file, ssize, smode)
+			if stat == nil then
+				return stat, code, msg
+			elseif stat then
+				active = true
+			end
+		until stat == false
+		
+		if cb then
+			cb(file)
+		end
+		
+		if not active then
+			-- We did not splice any data, maybe EOS, fallback to default
+			return false
+		end
+	until done
+	
+	pipein:close()
+	pipeout:close()
+	sock:close()
+	file:close()
+	return true
+end
+
+local function splice_sync(sock, pipeout, pipein, file, cb)
+	local os = require "os"
+	local ssize = 65536
+	local smode = nixio.splice_flags("move", "more")
+	local stat
+	
+	-- This is probably the only forking http-client ;-)
+	local pid, code, msg = nixio.fork()
+	if not pid then
+		return pid, code, msg
+	elseif pid == 0 then
+		pipein:close()
+		file:close()
+
+		repeat
+			stat, code = nixio.splice(sock, pipeout, ssize, smode)
+		until not stat or stat == 0
+	
+		pipeout:close()
+		sock:close()
+		os.exit(stat or code)
+	else
+		pipeout:close()
+		sock:close()
+		
+		repeat
+			stat, code, msg = nixio.splice(pipein, file, ssize, smode)
+			if cb then
+				cb(file)
+			end
+		until not stat or stat == 0
+		
+		pipein:close()
+		file:close()
+		
+		if not stat then
+			nixio.kill(pid, 15)
+			nixio.wait(pid)
+			return stat, code, msg
+		else
+			pid, msg, code = nixio.wait(pid)
+			if msg == "exited" then
+				if code == 0 then
+					return true
+				else
+					return nil, code, nixio.strerror(code)
+				end
+			else
+				return nil, -0x11, "broken pump"
+			end
+		end
+	end
+end
+
+function request_to_file(uri, target, options, cbs)
+	options = options or {}
+	cbs = cbs or {}
+	options.headers = options.headers or {}
+	local hdr = options.headers
+	local file, code, msg
+	
+	if target then
+		file, code, msg = prepare_fd(target)
+		if not file then
+			return file, code, msg
+		end
+	
+		local off = file:tell()
+		
+		-- Set content range
+		if off > 0 then
+			hdr.Range = hdr.Range or ("bytes=" .. off .. "-")  
+		end
+	end
+	
+	local code, resp, buffer, sock = httpc.request_raw(uri, options)
+	if not code then
+		-- No success
+		if file then
+			file:close()
+		end
+		return code, resp, buffer
+	elseif hdr.Range and code ~= 206 then
+		-- We wanted a part but we got the while file
+		sock:close()
+		if file then
+			file:close()
+		end
+		return nil, -4, code, resp
+	elseif not hdr.Range and code ~= 200 then
+		-- We encountered an error
+		sock:close()
+		if file then
+			file:close()
+		end
+		return nil, -4, code, resp
+	end
+	
+	if cbs.on_header then
+		local stat = {cbs.on_header(file, code, resp)}
+		if stat[1] == false then
+			if file then
+				file:close()
+			end
+			sock:close()
+			return unpack(stat)
+		elseif stat[2] then
+			file = file and stat[2]
+		end
+	end
+	
+	if not file then
+		return nil, -5, "no target given"
+	end
+
+	local chunked = resp.headers["Transfer-Encoding"] == "chunked"
+	local stat
+
+	-- Write the buffer to file
+	file:writeall(buffer)
+	
+	repeat
+		if not options.splice or not sock:is_socket() or chunked then
+			break
+		end
+		
+		-- This is a plain TCP socket and there is no encoding so we can splice
+	
+		local pipein, pipeout, msg = nixio.pipe()
+		if not pipein then
+			sock:close()
+			file:close()
+			return pipein, pipeout, msg
+		end
+		
+		
+		-- Adjust splice values
+		local ssize = 65536
+		local smode = nixio.splice_flags("move", "more")
+		
+		-- Splicing 512 bytes should never block on a fresh pipe
+		local stat, code, msg = nixio.splice(sock, pipeout, 512, smode)
+		if stat == nil then
+			break
+		end
+		
+		-- Now do the real splicing
+		local cb = cbs.on_write
+		if options.splice == "asynchronous" then
+			stat, code, msg = splice_async(sock, pipeout, pipein, file, cb)
+		elseif options.splice == "synchronous" then
+			stat, code, msg = splice_sync(sock, pipeout, pipein, file, cb)
+		else
+			break
+		end
+		
+		if stat == false then
+			break
+		end
+
+		return stat, code, msg
+	until true
+	
+	local src = chunked and httpc.chunksource(sock) or sock:blocksource()
+	local snk = file:sink()
+	
+	if cbs.on_write then
+		src = ltn12.source.chain(src, function(chunk)
+			cbs.on_write(file)
+			return chunk
+		end)
+	end
+	
+	-- Fallback to read/write
+	stat, code, msg = ltn12.pump.all(src, snk)
+
+	file:close()
+	sock:close()
+	return stat and true, code, msg
+end
+
diff --git a/trunk/package/luci/libs/json/Makefile b/trunk/package/luci/libs/json/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/libs/json/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/libs/json/luasrc/json.lua b/trunk/package/luci/libs/json/luasrc/json.lua
new file mode 100644
index 00000000..8dbaf918
--- /dev/null
+++ b/trunk/package/luci/libs/json/luasrc/json.lua
@@ -0,0 +1,600 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+Decoder:
+	Info:
+		null will be decoded to luci.json.null if first parameter of Decoder() is true
+
+	Example:
+		decoder = luci.json.Decoder()
+		luci.ltn12.pump.all(luci.ltn12.source.string("decodableJSON"), decoder:sink())
+		luci.util.dumptable(decoder:get())
+
+	Known issues:
+		does not support unicode conversion \uXXYY with XX != 00 will be ignored
+
+
+Encoder:
+	Info:
+		Accepts numbers, strings, nil, booleans as they are
+		Accepts luci.json.null as replacement for nil
+		Accepts full associative and full numerically indexed tables
+		Mixed tables will loose their associative values during conversion
+		Iterator functions will be encoded as an array of their return values
+		Non-iterator functions will probably corrupt the encoder
+
+	Example:
+		encoder = luci.json.Encoder(encodableData)
+		luci.ltn12.pump.all(encoder:source(), luci.ltn12.sink.file(io.open("someFile", w)))
+]]--
+
+local nixio     = require "nixio"
+local util      = require "luci.util"
+local table     = require "table"
+local string    = require "string"
+local coroutine = require "coroutine"
+
+local assert    = assert
+local tonumber  = tonumber
+local tostring  = tostring
+local error     = error
+local type	    = type
+local pairs	    = pairs
+local ipairs    = ipairs
+local next      = next
+local pcall		= pcall
+
+local band      = nixio.bit.band
+local bor       = nixio.bit.bor
+local rshift    = nixio.bit.rshift
+local char      = string.char
+
+local getmetatable = getmetatable
+
+--- LuCI JSON-Library
+-- @cstyle	instance
+module "luci.json"
+
+
+--- Directly decode a JSON string
+-- @param json JSON-String
+-- @return Lua object
+function decode(json, ...)
+	local a = ActiveDecoder(function() return nil end, ...)
+	a.chunk = json
+	local s, obj = pcall(a.get, a)
+	return s and obj or nil
+end
+
+
+--- Direcly encode a Lua object into a JSON string.
+-- @param obj Lua Object
+-- @return JSON string
+function encode(obj, ...)
+	local out = {}
+	local e = Encoder(obj, 1, ...):source()
+	local chnk, err
+	repeat
+		chnk, err = e()
+		out[#out+1] = chnk
+	until not chnk
+	return not err and table.concat(out) or nil
+end
+
+
+--- Null replacement function
+-- @return null
+function null()
+	return null
+end
+
+--- Create a new JSON-Encoder.
+-- @class	function
+-- @name	Encoder
+-- @param data			Lua-Object to be encoded.
+-- @param buffersize	Blocksize of returned data source.
+-- @param fastescape	Use non-standard escaping (don't escape control chars)
+-- @return JSON-Encoder
+Encoder = util.class()
+
+function Encoder.__init__(self, data, buffersize, fastescape)
+	self.data = data
+	self.buffersize = buffersize or 512
+	self.buffer = ""
+	self.fastescape = fastescape
+
+	getmetatable(self).__call = Encoder.source
+end
+
+--- Create an LTN12 source providing the encoded JSON-Data.
+-- @return LTN12 source
+function Encoder.source(self)
+	local source = coroutine.create(self.dispatch)
+	return function()
+		local res, data = coroutine.resume(source, self, self.data, true)
+		if res then
+			return data
+		else
+			return nil, data
+		end
+	end
+end
+
+function Encoder.dispatch(self, data, start)
+	local parser = self.parsers[type(data)]
+
+	parser(self, data)
+
+	if start then
+		if #self.buffer > 0 then
+			coroutine.yield(self.buffer)
+		end
+
+		coroutine.yield()
+	end
+end
+
+function Encoder.put(self, chunk)
+	if self.buffersize < 2 then
+		coroutine.yield(chunk)
+	else
+		if #self.buffer + #chunk > self.buffersize then
+			local written = 0
+			local fbuffer = self.buffersize - #self.buffer
+
+			coroutine.yield(self.buffer .. chunk:sub(written + 1, fbuffer))
+			written = fbuffer
+
+			while #chunk - written > self.buffersize do
+				fbuffer = written + self.buffersize
+				coroutine.yield(chunk:sub(written + 1, fbuffer))
+				written = fbuffer
+			end
+
+			self.buffer = chunk:sub(written + 1)
+		else
+			self.buffer = self.buffer .. chunk
+		end
+	end
+end
+
+function Encoder.parse_nil(self)
+	self:put("null")
+end
+
+function Encoder.parse_bool(self, obj)
+	self:put(obj and "true" or "false")
+end
+
+function Encoder.parse_number(self, obj)
+	self:put(tostring(obj))
+end
+
+function Encoder.parse_string(self, obj)
+	if self.fastescape then
+		self:put('"' .. obj:gsub('\\', '\\\\'):gsub('"', '\\"') .. '"')
+	else
+		self:put('"' ..
+			obj:gsub('[%c\\"]',
+				function(char)
+					return '\\u00%02x' % char:byte()
+				end
+			)
+		.. '"')
+	end
+end
+
+function Encoder.parse_iter(self, obj)
+	if obj == null then
+		return self:put("null")
+	end
+
+	if type(obj) == "table" and (#obj == 0 and next(obj)) then
+		self:put("{")
+		local first = true
+
+		for key, entry in pairs(obj) do
+			first = first or self:put(",")
+			first = first and false
+			self:parse_string(tostring(key))
+			self:put(":")
+			self:dispatch(entry)
+		end
+
+		self:put("}")
+	else
+		self:put("[")
+		local first = true
+
+		if type(obj) == "table" then
+			for i=1, #obj do
+				first = first or self:put(",")
+				first = first and nil
+				self:dispatch(obj[i])
+			end
+		else
+			for entry in obj do
+				first = first or self:put(",")
+				first = first and nil
+				self:dispatch(entry)
+			end
+		end
+
+		self:put("]")
+	end
+end
+
+Encoder.parsers = {
+	['nil']      = Encoder.parse_nil,
+	['table']    = Encoder.parse_iter,
+	['number']   = Encoder.parse_number,
+	['string']   = Encoder.parse_string,
+	['boolean']  = Encoder.parse_bool,
+	['function'] = Encoder.parse_iter
+}
+
+
+--- Create a new JSON-Decoder.
+-- @class	function
+-- @name	Decoder
+-- @param customnull Use luci.json.null instead of nil for decoding null
+-- @return JSON-Decoder
+Decoder = util.class()
+
+function Decoder.__init__(self, customnull)
+	self.cnull = customnull
+	getmetatable(self).__call = Decoder.sink
+end
+
+--- Create an LTN12 sink from the decoder object which accepts the JSON-Data.
+-- @return LTN12 sink
+function Decoder.sink(self)
+	local sink = coroutine.create(self.dispatch)
+	return function(...)
+		return coroutine.resume(sink, self, ...)
+	end
+end
+
+
+--- Get the decoded data packets after the rawdata has been sent to the sink.
+-- @return Decoded data
+function Decoder.get(self)
+	return self.data
+end
+
+function Decoder.dispatch(self, chunk, src_err, strict)
+	local robject, object
+	local oset = false
+
+	while chunk do
+		while chunk and #chunk < 1 do
+			chunk = self:fetch()
+		end
+
+		assert(not strict or chunk, "Unexpected EOS")
+		if not chunk then break end
+
+		local char   = chunk:sub(1, 1)
+		local parser = self.parsers[char]
+		 or (char:match("%s")     and self.parse_space)
+		 or (char:match("[0-9-]") and self.parse_number)
+		 or error("Unexpected char '%s'" % char)
+
+		chunk, robject = parser(self, chunk)
+
+		if parser ~= self.parse_space then
+			assert(not oset, "Scope violation: Too many objects")
+			object = robject
+			oset = true
+
+			if strict then
+				return chunk, object
+			end
+		end
+	end
+
+	assert(not src_err, src_err)
+	assert(oset, "Unexpected EOS")
+
+	self.data = object
+end
+
+
+function Decoder.fetch(self)
+	local tself, chunk, src_err = coroutine.yield()
+	assert(chunk or not src_err, src_err)
+	return chunk
+end
+
+
+function Decoder.fetch_atleast(self, chunk, bytes)
+	while #chunk < bytes do
+		local nchunk = self:fetch()
+		assert(nchunk, "Unexpected EOS")
+		chunk = chunk .. nchunk
+	end
+
+	return chunk
+end
+
+
+function Decoder.fetch_until(self, chunk, pattern)
+	local start = chunk:find(pattern)
+
+	while not start do
+		local nchunk = self:fetch()
+		assert(nchunk, "Unexpected EOS")
+		chunk = chunk .. nchunk
+		start = chunk:find(pattern)
+	end
+
+	return chunk, start
+end
+
+
+function Decoder.parse_space(self, chunk)
+	local start = chunk:find("[^%s]")
+
+	while not start do
+		chunk = self:fetch()
+		if not chunk then
+			return nil
+		end
+		start = chunk:find("[^%s]")
+	end
+
+	return chunk:sub(start)
+end
+
+
+function Decoder.parse_literal(self, chunk, literal, value)
+	chunk = self:fetch_atleast(chunk, #literal)
+	assert(chunk:sub(1, #literal) == literal, "Invalid character sequence")
+	return chunk:sub(#literal + 1), value
+end
+
+
+function Decoder.parse_null(self, chunk)
+	return self:parse_literal(chunk, "null", self.cnull and null)
+end
+
+
+function Decoder.parse_true(self, chunk)
+	return self:parse_literal(chunk, "true", true)
+end
+
+
+function Decoder.parse_false(self, chunk)
+	return self:parse_literal(chunk, "false", false)
+end
+
+
+function Decoder.parse_number(self, chunk)
+	local chunk, start = self:fetch_until(chunk, "[^0-9eE.+-]")
+	local number = tonumber(chunk:sub(1, start - 1))
+	assert(number, "Invalid number specification")
+	return chunk:sub(start), number
+end
+
+
+function Decoder.parse_string(self, chunk)
+	local str = ""
+	local object = nil
+	assert(chunk:sub(1, 1) == '"', 'Expected "')
+	chunk = chunk:sub(2)
+
+	while true do
+		local spos = chunk:find('[\\"]')
+		if spos then
+			str = str .. chunk:sub(1, spos - 1)
+
+			local char = chunk:sub(spos, spos)
+			if char == '"' then				-- String end
+				chunk = chunk:sub(spos + 1)
+				break
+			elseif char == "\\" then 		-- Escape sequence
+				chunk, object = self:parse_escape(chunk:sub(spos))
+				str = str .. object
+			end
+		else
+			str = str .. chunk
+			chunk = self:fetch()
+			assert(chunk, "Unexpected EOS while parsing a string")
+		end
+	end
+
+	return chunk, str
+end
+
+
+function Decoder.utf8_encode(self, s1, s2)
+	local n = s1 * 256 + s2
+
+	if n >= 0 and n <= 0x7F then
+		return char(n)
+	elseif n >= 0 and n <= 0x7FF then
+		return char(
+			bor(band(rshift(n,  6), 0x1F), 0xC0),
+			bor(band(n,             0x3F), 0x80)
+		)
+	elseif n >= 0 and n <= 0xFFFF then
+		return char(
+			bor(band(rshift(n, 12), 0x0F), 0xE0),
+			bor(band(rshift(n,  6), 0x3F), 0x80),
+			bor(band(n,             0x3F), 0x80)
+		)
+	elseif n >= 0 and n <= 0x10FFFF then
+		return char(
+			bor(band(rshift(n, 18), 0x07), 0xF0),
+			bor(band(rshift(n, 12), 0x3F), 0x80),
+			bor(band(rshift(n,  6), 0x3F), 0x80),
+			bor(band(n,             0x3F), 0x80)
+		)
+	else
+		return "?"
+	end
+end
+
+
+function Decoder.parse_escape(self, chunk)
+	local str = ""
+	chunk = self:fetch_atleast(chunk:sub(2), 1)
+	local char = chunk:sub(1, 1)
+	chunk = chunk:sub(2)
+
+	if char == '"' then
+		return chunk, '"'
+	elseif char == "\\" then
+		return chunk, "\\"
+	elseif char == "u" then
+		chunk = self:fetch_atleast(chunk, 4)
+		local s1, s2 = chunk:sub(1, 2), chunk:sub(3, 4)
+		s1, s2 = tonumber(s1, 16), tonumber(s2, 16)
+		assert(s1 and s2, "Invalid Unicode character")
+
+		return chunk:sub(5), self:utf8_encode(s1, s2)
+	elseif char == "/" then
+		return chunk, "/"
+	elseif char == "b" then
+		return chunk, "\b"
+	elseif char == "f" then
+		return chunk, "\f"
+	elseif char == "n" then
+		return chunk, "\n"
+	elseif char == "r" then
+		return chunk, "\r"
+	elseif char == "t" then
+		return chunk, "\t"
+	else
+		error("Unexpected escaping sequence '\\%s'" % char)
+	end
+end
+
+
+function Decoder.parse_array(self, chunk)
+	chunk = chunk:sub(2)
+	local array = {}
+	local nextp = 1
+
+	local chunk, object = self:parse_delimiter(chunk, "%]")
+
+	if object then
+		return chunk, array
+	end
+
+	repeat
+		chunk, object = self:dispatch(chunk, nil, true)
+		table.insert(array, nextp, object)
+		nextp = nextp + 1
+
+		chunk, object = self:parse_delimiter(chunk, ",%]")
+		assert(object, "Delimiter expected")
+	until object == "]"
+
+	return chunk, array
+end
+
+
+function Decoder.parse_object(self, chunk)
+	chunk = chunk:sub(2)
+	local array = {}
+	local name
+
+	local chunk, object = self:parse_delimiter(chunk, "}")
+
+	if object then
+		return chunk, array
+	end
+
+	repeat
+		chunk = self:parse_space(chunk)
+		assert(chunk, "Unexpected EOS")
+
+		chunk, name   = self:parse_string(chunk)
+
+		chunk, object = self:parse_delimiter(chunk, ":")
+		assert(object, "Separator expected")
+
+		chunk, object = self:dispatch(chunk, nil, true)
+		array[name] = object
+
+		chunk, object = self:parse_delimiter(chunk, ",}")
+		assert(object, "Delimiter expected")
+	until object == "}"
+
+	return chunk, array
+end
+
+
+function Decoder.parse_delimiter(self, chunk, delimiter)
+	while true do
+		chunk = self:fetch_atleast(chunk, 1)
+		local char = chunk:sub(1, 1)
+		if char:match("%s") then
+			chunk = self:parse_space(chunk)
+			assert(chunk, "Unexpected EOS")
+		elseif char:match("[%s]" % delimiter) then
+			return chunk:sub(2), char
+		else
+			return chunk, nil
+		end
+	end
+end
+
+
+Decoder.parsers = {
+	['"'] = Decoder.parse_string,
+	['t'] = Decoder.parse_true,
+	['f'] = Decoder.parse_false,
+	['n'] = Decoder.parse_null,
+	['['] = Decoder.parse_array,
+	['{'] = Decoder.parse_object
+}
+
+
+--- Create a new Active JSON-Decoder.
+-- @class	function
+-- @name	ActiveDecoder
+-- @param   customnull	Use luci.json.null instead of nil for decoding null
+-- @return  Active JSON-Decoder
+ActiveDecoder = util.class(Decoder)
+
+function ActiveDecoder.__init__(self, source, customnull)
+	Decoder.__init__(self, customnull)
+	self.source = source
+	self.chunk = nil
+	getmetatable(self).__call = self.get
+end
+
+
+--- Fetches one JSON-object from given source
+-- @return Decoded object
+function ActiveDecoder.get(self)
+	local chunk, src_err, object
+	if not self.chunk then
+		chunk, src_err = self.source()
+	else
+		chunk = self.chunk
+	end
+
+	self.chunk, object = self:dispatch(chunk, src_err, true)
+	return object
+end
+
+
+function ActiveDecoder.fetch(self)
+	local chunk, src_err = self.source()
+	assert(chunk or not src_err, src_err)
+	return chunk
+end
diff --git a/trunk/package/luci/libs/luaneightbl/Makefile b/trunk/package/luci/libs/luaneightbl/Makefile
new file mode 100644
index 00000000..dc2db674
--- /dev/null
+++ b/trunk/package/luci/libs/luaneightbl/Makefile
@@ -0,0 +1,24 @@
+ifneq (,$(wildcard ../../build/config.mk))
+include ../../build/config.mk
+include ../../build/module.mk
+include ../../build/gccconfig.mk
+else
+include standalone.mk
+endif
+
+NEIGHTBL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+
+NEIGHTBL_OBJ = src/neightbl.o
+NEIGHTBL_LIB = src/neightbl.so
+
+%.o: %.c
+	$(CC) $(NEIGHTBL_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
+
+compile: $(NEIGHTBL_OBJ)
+	$(LINK) $(SHLIB_FLAGS) -o $(NEIGHTBL_LIB) $(NEIGHTBL_OBJ)
+	mkdir -p dist$(LUA_LIBRARYDIR)
+	cp $(NEIGHTBL_LIB) dist$(LUA_LIBRARYDIR)/
+
+clean: luaclean
+	rm -f src/*.o src/*.so src/*.a src/*.dll
+
diff --git a/trunk/package/luci/libs/luaneightbl/src/neightbl.c b/trunk/package/luci/libs/luaneightbl/src/neightbl.c
new file mode 100644
index 00000000..987ec5e3
--- /dev/null
+++ b/trunk/package/luci/libs/luaneightbl/src/neightbl.c
@@ -0,0 +1,122 @@
+/*
+License:
+Copyright 2013 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+#include <linux/rtnetlink.h>
+#include <sys/socket.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/ether.h>
+
+char *ether_ntoa_l (const struct ether_addr *addr, char *buf)
+{
+  sprintf (buf, "%02x:%02x:%02x:%02x:%02x:%02x",
+           addr->ether_addr_octet[0], addr->ether_addr_octet[1],
+           addr->ether_addr_octet[2], addr->ether_addr_octet[3],
+           addr->ether_addr_octet[4], addr->ether_addr_octet[5]);
+  return buf;
+}
+
+static int neightbl_get(lua_State *L) {
+	int sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
+	struct sockaddr_nl kernel = {AF_NETLINK, 0, 0, 0};
+	if (connect(sock, (struct sockaddr*)&kernel, sizeof(kernel)))
+		goto error;
+
+	const char *ifname = luaL_checkstring(L, 1);
+	int ifindex = if_nametoindex(ifname);
+	if (ifindex <= 0)
+		goto error;
+
+	struct {
+		struct nlmsghdr hdr;
+		struct ndmsg ndm;
+	} req = {
+		{sizeof(req), RTM_GETNEIGH, NLM_F_REQUEST | NLM_F_DUMP, 1, 0},
+		{AF_INET6, 0, 0, ifindex, 0, 0, 0},
+	};
+
+	if (send(sock, &req, sizeof(req), 0) != sizeof(req))
+		goto error;
+
+	lua_newtable(L);
+
+	char buf[8192];
+	struct nlmsghdr *nh = (struct nlmsghdr*)buf;
+	do {
+		ssize_t len = recv(sock, buf, sizeof(buf), 0);
+		if (len < 0) {
+			lua_pop(L, 1);
+			goto error;
+		}
+
+
+		for (;NLMSG_OK(nh, (size_t)len) && nh->nlmsg_type == RTM_NEWNEIGH;
+				nh = NLMSG_NEXT(nh, len)) {
+			struct ndmsg *ndm = NLMSG_DATA(nh);
+			if (NLMSG_PAYLOAD(nh, 0) < sizeof(*ndm) || ndm->ndm_ifindex != ifindex)
+				continue;
+
+			ssize_t alen = NLMSG_PAYLOAD(nh, sizeof(*ndm));
+			char buf[INET6_ADDRSTRLEN] = {0}, *mac = NULL, str_buf[ETH_ALEN];
+			for (struct rtattr *rta = (struct rtattr*)&ndm[1]; RTA_OK(rta, alen);
+					rta = RTA_NEXT(rta, alen)) {
+				if (rta->rta_type == NDA_DST && RTA_PAYLOAD(rta) >= sizeof(struct in6_addr))
+					inet_ntop(AF_INET6, RTA_DATA(rta), buf, sizeof(buf));
+				else if (rta->rta_type == NDA_LLADDR && RTA_PAYLOAD(rta) >= 6)
+					mac = ether_ntoa_l(RTA_DATA(rta),str_buf);
+			}
+
+			if (mac)
+				lua_pushstring(L, mac);
+			else
+				lua_pushboolean(L, false);
+
+			lua_setfield(L, -2, buf);
+		}
+	} while (nh->nlmsg_type == RTM_NEWNEIGH);
+
+	close(sock);
+        return 1;
+
+error:
+	close(sock);
+	lua_pushnil(L);
+	lua_pushinteger(L, errno);
+	lua_pushstring(L, strerror(errno));
+	return 3;
+}
+
+
+static const luaL_reg R[] = {
+        {"get", neightbl_get},
+        {NULL, NULL}
+};
+
+
+int luaopen_neightbl(lua_State *l)
+{
+	luaL_register(l, "neightbl", R);
+	return 1;
+}
diff --git a/trunk/package/luci/libs/nixio/LICENSE b/trunk/package/luci/libs/nixio/LICENSE
new file mode 100644
index 00000000..f49a4e16
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/Makefile b/trunk/package/luci/libs/nixio/Makefile
new file mode 100644
index 00000000..49ba3ff2
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/Makefile
@@ -0,0 +1,125 @@
+ifneq (,$(wildcard ../../build/config.mk))
+include ../../build/config.mk
+include ../../build/module.mk
+include ../../build/gccconfig.mk
+else
+include standalone.mk
+endif
+
+AXTLS_VERSION = 1.2.1
+AXTLS_DIR     = axTLS
+AXTLS_FILE    = $(AXTLS_DIR)-$(AXTLS_VERSION).tar.gz
+#NIXIO_TLS    ?= openssl
+NIXIO_SHADOW ?= $(shell echo 'int main(void){ return !getspnam("root"); }' | $(CC) $(CFLAGS) -include shadow.h -xc -o/dev/null - 2>/dev/null && echo yes)
+NIXIO_SO      = nixio.so
+NIXIO_LDFLAGS =
+
+ifeq (,$(findstring Darwin,$(OS)))
+	NIXIO_LDFLAGS += -lcrypt
+else
+	EXTRA_CFLAGS += -D__DARWIN__
+endif
+
+NIXIO_OBJ = src/nixio.o src/socket.o src/sockopt.o src/bind.o src/address.o \
+	    src/protoent.o src/poll.o src/io.o src/file.o src/splice.o src/process.o \
+	    src/syslog.o src/bit.o src/binary.o src/fs.o src/user.o \
+	    $(if $(NIXIO_TLS),src/tls-crypto.o src/tls-context.o src/tls-socket.o,)
+
+ifeq ($(NIXIO_TLS),axtls)
+	TLS_CFLAGS = -IaxTLS/ssl -IaxTLS/crypto -IaxTLS/config -include src/axtls-compat.h
+	TLS_DEPENDS = src/axtls-compat.o
+	NIXIO_OBJ += src/axtls-compat.o src/libaxtls.a
+endif
+
+ifeq ($(NIXIO_TLS),openssl)
+	NIXIO_LDFLAGS += -lssl -lcrypto
+endif
+
+ifeq ($(NIXIO_TLS),cyassl)
+	NIXIO_LDFLAGS += -lcyassl
+	TLS_DEPENDS = src/cyassl-compat.o
+	TLS_CFLAGS = -include src/cyassl-compat.h
+	NIXIO_OBJ += src/cyassl-compat.o
+endif
+
+ifeq ($(NIXIO_TLS),)
+	NIXIO_CFLAGS += -DNO_TLS
+endif
+
+ifneq ($(NIXIO_SHADOW),yes)
+	NIXIO_CFLAGS += -DNO_SHADOW
+endif
+
+
+ifeq ($(OS),SunOS)
+	NIXIO_LDFLAGS += -lsocket -lnsl -lsendfile
+endif
+
+ifneq (,$(findstring MINGW,$(OS))$(findstring mingw,$(OS))$(findstring Windows,$(OS)))
+	NIXIO_CROSS_CC:=$(shell which i586-mingw32msvc-cc)
+ifneq (,$(NIXIO_CROSS_CC))
+	CC:=$(NIXIO_CROSS_CC)
+endif
+	NIXIO_OBJ += src/mingw-compat.o
+	NIXIO_LDFLAGS_POST:=-llua -lssl -lcrypto -lws2_32 -lgdi32
+	FPIC:=
+	EXTRA_CFLAGS += -D_WIN32_WINNT=0x0501
+	LUA_CFLAGS:=
+	NIXIO_SO:=nixio.dll
+	NIXIO_LDFLAGS:=
+endif
+
+
+%.o: %.c
+	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
+
+ifneq ($(NIXIO_TLS),)
+src/tls-crypto.o: $(TLS_DEPENDS) src/tls-crypto.c
+	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-crypto.c
+
+src/tls-context.o: $(TLS_DEPENDS) src/tls-context.c
+	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-context.c
+	
+src/tls-socket.o: $(TLS_DEPENDS) src/tls-socket.c
+	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-socket.c
+	
+src/axtls-compat.o: src/libaxtls.a src/axtls-compat.c
+	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/axtls-compat.c
+	mkdir -p dist
+	cp -pR axtls-root/* dist/
+endif	
+
+compile: $(NIXIO_OBJ)
+	$(LINK) $(SHLIB_FLAGS) -o src/$(NIXIO_SO) $(NIXIO_OBJ) $(NIXIO_LDFLAGS) $(NIXIO_LDFLAGS_POST)
+	mkdir -p dist$(LUA_LIBRARYDIR)
+	cp src/$(NIXIO_SO) dist$(LUA_LIBRARYDIR)/$(NIXIO_SO)
+
+$(AXTLS_DIR)/.prepared:
+	#rm -rf $(AXTLS_DIR)
+	#tar xvfz $(AXTLS_FILE)
+	cp axtls-config/.config axtls-config/config.h $(AXTLS_DIR)/config
+	touch $@
+
+src/libaxtls.a: $(AXTLS_DIR)/.prepared
+	$(MAKE) -C $(AXTLS_DIR) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS) $(FPIC) -Wall -pedantic -I../config -I../ssl -I../crypto" LDFLAGS="$(LDFLAGS)" OS="$(OS)" clean all
+	cp -p $(AXTLS_DIR)/_stage/libaxtls.a src
+	# *************************************************************************
+	#
+	#
+	#
+	# *** WARNING ***
+	# The use of the axTLS cryptographical provider is discouraged!
+	# Please switch to either CyaSSL or OpenSSL.
+	# Support for axTLS might be removed in the near future.
+	#
+	#
+	#
+	#**************************************************************************
+
+clean: luaclean
+	rm -f src/*.o src/*.so src/*.a src/*.dll
+	rm -f $(AXTLS_DIR)/.prepared
+
+install: build
+	cp -pR dist$(LUA_MODULEDIR)/* $(LUA_MODULEDIR)
+	cp -pR dist$(LUA_LIBRARYDIR)/* $(LUA_LIBRARYDIR)
diff --git a/trunk/package/luci/libs/nixio/NOTICE b/trunk/package/luci/libs/nixio/NOTICE
new file mode 100644
index 00000000..4a528884
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/NOTICE
@@ -0,0 +1,10 @@
+nixio - Linux I/O library for lua
+Copyright 2009 Steven Barth <steven@midlink.org>
+Licensed under the Apache License, Version 2.0.
+
+Contains code from:
+axTLS		- Copyright 2008 Cameron Rich
+
+Thanks for testing, feedback and code snippets:
+John Crispin <blogic@librecmc.org>
+Jo-Philipp Wich <xm@leipzig.freifunk.net>
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/README b/trunk/package/luci/libs/nixio/README
new file mode 100644
index 00000000..ba9b36b3
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/README
@@ -0,0 +1,13 @@
+Building:
+	Use GNU Make.
+	make or gmake depending on your system.
+	
+	Special make flags:
+
+	OS		Override Target OS	[Linux|FreeBSD|SunOS|Windows]
+	NIXIO_TLS	TLS-Library		[*openssl|axtls]
+	NIXIO_CROSS_CC	MinGW CC (Windows)	`which i586-mingw32msvc-cc`
+	LUA_CFLAGS	Lua CFLAGS		`pkg-config --cflags lua5.1`
+	LUA_TARGET	Lua compile		target	[*source|strip|compile]
+	LUA_MODULEDIR	Install LUA_PATH	"/usr/share/lua/5.1"
+	LUA_LIBRARYDIR	Install LUA_CPATH	"/usr/lib/lua/5.1"
diff --git a/trunk/package/luci/libs/nixio/axTLS/Makefile b/trunk/package/luci/libs/nixio/axTLS/Makefile
new file mode 100644
index 00000000..02c33d24
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/Makefile
@@ -0,0 +1,181 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+-include config/.config
+
+ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
+all: menuconfig
+else
+all: target
+endif
+
+include config/makefile.conf
+
+target : $(STAGE) $(TARGET)
+
+# VERSION has to come from the command line
+RELEASE=axTLS-$(VERSION)
+
+# standard version
+target:
+	$(MAKE) -C crypto
+	$(MAKE) -C ssl
+ifdef CONFIG_AXHTTPD
+	$(MAKE) -C httpd
+endif
+ifdef CONFIG_BINDINGS
+	$(MAKE) -C bindings
+endif
+ifdef CONFIG_SAMPLES
+	$(MAKE) -C samples
+endif
+
+$(STAGE) : ssl/version.h
+	@mkdir -p $(STAGE)
+
+# create a version file with something in it.
+ssl/version.h:
+	@echo "#define AXTLS_VERSION    \"(no version)\"" > ssl/version.h
+
+$(PREFIX) :
+	@mkdir -p $(PREFIX)/lib
+	@mkdir -p $(PREFIX)/bin
+
+release:
+	$(MAKE) -C config/scripts/config clean
+	-$(MAKE) clean
+	-@rm config/*.msi config/*.back.aip config/config.h config/.config*
+	-@rm www/index.20*
+	-@rm -fr $(STAGE)
+	@echo "#define AXTLS_VERSION    \"$(VERSION)\"" > ssl/version.h
+	cd ../; tar cvfz $(RELEASE).tar.gz --wildcards-match-slash --exclude .svn axTLS; cd -;
+
+docs:
+	$(MAKE) -C docsrc doco
+
+# build the Win32 demo release version
+win32_demo:
+	@echo "#define AXTLS_VERSION    \"$(VERSION)\"" > ssl/version.h
+	$(MAKE) win32releaseconf
+
+install: $(PREFIX) all
+	cp --no-dereference $(STAGE)/libax* $(PREFIX)/lib
+	chmod 755 $(PREFIX)/lib/libax* 
+ifdef CONFIG_SAMPLES
+	install -m 755 $(STAGE)/ax* $(PREFIX)/bin 
+endif
+ifdef CONFIG_HTTP_HAS_AUTHORIZATION
+	install -m 755 $(STAGE)/htpasswd $(PREFIX)/bin 
+endif
+ifdef CONFIG_PLATFORM_CYGWIN
+	install -m 755 $(STAGE)/cygaxtls.dll $(PREFIX)/bin 
+endif
+ifdef CONFIG_PERL_BINDINGS 
+	install -m 755 $(STAGE)/axtlsp.pm `perl -e 'use Config; print $$Config{installarchlib};'`
+endif
+	@mkdir -p -m 755 $(PREFIX)/include/axTLS
+	install -m 644 crypto/*.h $(PREFIX)/include/axTLS
+	install -m 644 ssl/*.h $(PREFIX)/include/axTLS
+	-rm $(PREFIX)/include/axTLS/cert.h
+	-rm $(PREFIX)/include/axTLS/private_key.h
+	install -m 644 config/config.h $(PREFIX)/include/axTLS
+
+installclean:
+	-@rm $(PREFIX)/lib/libax* > /dev/null 2>&1
+	-@rm $(PREFIX)/bin/ax* > /dev/null 2>&1
+	-@rm $(PREFIX)/bin/axhttpd* > /dev/null 2>&1
+	-@rm `perl -e 'use Config; print $$Config{installarchlib};'`/axtlsp.pm > /dev/null 2>&1
+
+test:
+	cd $(STAGE); ssltest; ../ssl/test/test_axssl.sh; cd -;
+
+# tidy up things
+clean::
+	@cd crypto; $(MAKE) clean
+	@cd ssl; $(MAKE) clean
+	@cd httpd; $(MAKE) clean
+	@cd samples; $(MAKE) clean
+	@cd docsrc; $(MAKE) clean
+	@cd bindings; $(MAKE) clean
+
+# ---------------------------------------------------------------------------
+# mconf stuff
+# ---------------------------------------------------------------------------
+
+CONFIG_CONFIG_IN = config/Config.in
+CONFIG_DEFCONFIG = config/defconfig
+
+config/scripts/config/conf: config/scripts/config/Makefile
+	$(MAKE) -C config/scripts/config conf
+	-@if [ ! -f config/.config ] ; then \
+		cp $(CONFIG_DEFCONFIG) config/.config; \
+	fi
+
+config/scripts/config/mconf: config/scripts/config/Makefile
+	$(MAKE) -C config/scripts/config ncurses conf mconf
+	-@if [ ! -f config/.config ] ; then \
+		cp $(CONFIG_DEFCONFIG) .config; \
+	fi
+
+cleanconf:
+	$(MAKE) -C config/scripts/config clean
+	@rm -f config/.config
+
+menuconfig: config/scripts/config/mconf
+	@./config/scripts/config/mconf $(CONFIG_CONFIG_IN)
+
+config: config/scripts/config/conf
+	@./config/scripts/config/conf $(CONFIG_CONFIG_IN)
+
+oldconfig: config/scripts/config/conf
+	@./config/scripts/config/conf -o $(CONFIG_CONFIG_IN)
+
+default: config/scripts/config/conf
+	@./config/scripts/config/conf -d $(CONFIG_CONFIG_IN) > /dev/null
+	$(MAKE)
+
+randconfig: config/scripts/config/conf
+	@./config/scripts/config/conf -r $(CONFIG_CONFIG_IN)
+
+allnoconfig: config/scripts/config/conf
+	@./config/scripts/config/conf -n $(CONFIG_CONFIG_IN)
+
+allyesconfig: config/scripts/config/conf
+	@./config/scripts/config/conf -y $(CONFIG_CONFIG_IN)
+
+# The special win32 release configuration
+win32releaseconf: config/scripts/config/conf
+	@./config/scripts/config/conf -D config/win32config $(CONFIG_CONFIG_IN) > /dev/null
+	$(MAKE)
+
+# The special linux release configuration
+linuxconf: config/scripts/config/conf
+	@./config/scripts/config/conf -D config/linuxconfig $(CONFIG_CONFIG_IN) > /dev/null
+	$(MAKE)
diff --git a/trunk/package/luci/libs/nixio/axTLS/README b/trunk/package/luci/libs/nixio/axTLS/README
new file mode 100644
index 00000000..c8926d9b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/README
@@ -0,0 +1,3 @@
+
+See www/index.html for the README, CHANGELOG, LICENSE and other notes.
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/Config.in b/trunk/package/luci/libs/nixio/axTLS/bindings/Config.in
new file mode 100644
index 00000000..12a696ba
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/Config.in
@@ -0,0 +1,105 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/config/Kconfig-language.txt
+#
+menu "Language Bindings"
+
+config CONFIG_BINDINGS
+    bool "Create language bindings"
+    default n
+    help
+        axTLS supports language bindings in C#, VB.NET, Java and Perl.
+
+        Select Y here if you want to build the various language bindings.
+
+config CONFIG_CSHARP_BINDINGS
+    bool "Create C# bindings"
+    default n
+    depends on CONFIG_BINDINGS
+    help
+        Build C# bindings.
+
+        This requires .NET to be installed on Win32 platforms and mono to be
+        installed on all other platforms.
+
+config CONFIG_VBNET_BINDINGS
+    bool "Create VB.NET bindings"
+    default n
+    depends on CONFIG_BINDINGS
+    help
+        Build VB.NET bindings.
+
+        This requires the .NET to be installed and is only built under Win32
+        platforms.
+
+menu ".Net Framework"
+depends on CONFIG_CSHARP_BINDINGS || CONFIG_VBNET_BINDINGS
+config CONFIG_DOT_NET_FRAMEWORK_BASE
+    string "Location of .NET Framework"
+    default "c:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727"
+endmenu
+
+config CONFIG_JAVA_BINDINGS
+    bool "Create Java bindings"
+    default n
+    depends on CONFIG_BINDINGS
+    help
+        Build Java bindings.
+
+        Current Issues (see README): 
+        * Needs Java 1.4 or better.
+        * If building under Win32 it will use the Win32 JDK.
+
+menu "Java Home"
+depends on CONFIG_JAVA_BINDINGS
+config CONFIG_JAVA_HOME
+    string "Location of JDK"
+    default "c:\\Program Files\\Java\\jdk1.5.0_06" if CONFIG_PLATFORM_WIN32 || CONFIG_PLATFORM_CYGWIN
+    default "/usr/local/jdk142" if !CONFIG_PLATFORM_WIN32 && !CONFIG_PLATFORM_CYGWIN
+    depends on CONFIG_JAVA_BINDINGS 
+    help
+        The location of Sun's JDK.
+endmenu
+
+config CONFIG_PERL_BINDINGS
+    bool "Create Perl bindings"
+    default n
+    depends on CONFIG_BINDINGS
+    help
+        Build Perl bindings.
+
+        Current Issues (see README):
+        * 64 bit versions don't work at present.
+        * libperl.so needs to be in the shared library path.
+
+menu "Perl Home"
+depends on CONFIG_PERL_BINDINGS && CONFIG_PLATFORM_WIN32
+config CONFIG_PERL_CORE
+    string "Location of Perl CORE"
+    default "c:\\perl\\lib\\CORE"
+    help:
+        works with ActiveState
+        "http://www.activestate.com/Products/ActivePerl"
+
+config CONFIG_PERL_LIB
+    string "Name of Perl Library"
+    default "perl58.lib"
+endmenu
+
+config CONFIG_LUA_BINDINGS
+    bool "Create Lua bindings"
+    default n
+    depends on CONFIG_BINDINGS && !CONFIG_PLATFORM_WIN32
+    help
+        Build Lua bindings (see www.lua.org).
+
+menu "Lua Home"
+depends on CONFIG_LUA_BINDINGS 
+config CONFIG_LUA_CORE
+    string "Location of Lua CORE"
+    default "/usr/local"
+    help:
+        If the Lua exists on another directory then this needs to be changed
+endmenu
+
+endmenu
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/Makefile b/trunk/package/luci/libs/nixio/axTLS/bindings/Makefile
new file mode 100644
index 00000000..7654fbba
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/Makefile
@@ -0,0 +1,86 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+all:
+
+include ../config/.config
+include ../config/makefile.conf
+
+ifdef CONFIG_CSHARP_BINDINGS
+all: csharp/axInterface.cs
+endif
+
+ifdef CONFIG_VBNET_BINDINGS
+all: vbnet/axInterface.vb
+endif
+
+ifdef CONFIG_JAVA_BINDINGS
+all: java/axtlsj.java
+endif
+
+ifdef CONFIG_PERL_BINDINGS
+all: perl/axTLSp_wrap.c
+endif
+
+ifdef CONFIG_LUA_BINDINGS
+all: lua/axTLSl_wrap.c
+endif
+
+csharp/axInterface.cs: ../ssl/ssl.h
+	@perl ./generate_interface.pl -csharp
+
+vbnet/axInterface.vb: ../ssl/ssl.h
+	@perl ./generate_interface.pl -vbnet
+
+java/axTLSj.i: ../ssl/ssl.h
+	@perl ./generate_SWIG_interface.pl -java
+
+java/axtlsj.java: java/axTLSj.i $(wildcard java/SSL*.java)
+	@cd java; swig -java -package axTLSj axTLSj.i; $(MAKE)
+
+perl/axTLSp.i: ../ssl/ssl.h
+	@perl ./generate_SWIG_interface.pl -perl
+
+perl/axTLSp_wrap.c: perl/axTLSp.i
+	@cd perl; swig -perl5 axTLSp.i; $(MAKE)
+
+lua/axTLSl.i: ../ssl/ssl.h
+	@perl ./generate_SWIG_interface.pl -lua
+
+lua/axTLSl_wrap.c: lua/axTLSl.i
+	@cd lua; swig -lua axTLSl.i; $(MAKE)
+
+clean::
+	$(MAKE) -C csharp clean
+	$(MAKE) -C vbnet clean
+	$(MAKE) -C java clean
+	$(MAKE) -C perl clean
+	$(MAKE) -C lua clean
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/README b/trunk/package/luci/libs/nixio/axTLS/bindings/README
new file mode 100644
index 00000000..8bc3109c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/README
@@ -0,0 +1,43 @@
+===============================================================================
+=                             Language Bindings                               =
+===============================================================================
+
+The tools to generate the various language bindings are done here.
+SWIG 1.3.24 or better is required for creating the Java and Perl bindings.
+
+Perl scripts are used to parse ssl.h and automagically give the appropriate 
+bindings.
+
+At present, the four languages supported are:
+
+* C#
+* VB.NET
+* Java
+* Perl
+
+To generate each binding run the following:
+
+C#:
+> generate_interface.pl -csharp
+
+VB.NET:
+> generate_interface.pl -vbnet
+
+
+Java:
+> generate_SWIG_interface.pl -java
+> cd java; swig -java -package axTLSj -noextern axTLSj.i
+
+Perl:
+> generate_SWIG_interface.pl -perl
+> cd perl; swig -noextern -perl axTLSp.i
+
+Java and Perl both create a library each called libaxtlsj.so and libaxtlsp.so 
+(or axtlsj.dll and atlsp.dll on Win32 platforms).
+
+Note: the "-noextern" is deprecated in swig 1.3.27 and newer. The "-noextern"
+option was required to get Win32 bindings to work (which is why is has probably
+been deprecated).
+
+Each binding (except for Perl) has an extra helper interface to make life 
+easier.
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/csharp/Makefile b/trunk/package/luci/libs/nixio/axTLS/bindings/csharp/Makefile
new file mode 100644
index 00000000..3414f856
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/csharp/Makefile
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../config/.config
+include ../../config/makefile.conf
+
+clean::
+	@rm -f axssl* axInterface.cs
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/csharp/axTLS.cs b/trunk/package/luci/libs/nixio/axTLS/bindings/csharp/axTLS.cs
new file mode 100644
index 00000000..cf64a256
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/csharp/axTLS.cs
@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * A wrapper around the unmanaged interface to give a semi-decent C# API
+ */
+
+using System;
+using System.Runtime.InteropServices;
+using System.Net.Sockets;
+
+/**
+ * @defgroup csharp_api C# API.
+ *
+ * Ensure that the appropriate Dispose() methods are called when finished with
+ * various objects - otherwise memory leaks will result.
+ * @{
+ */
+namespace axTLS
+{
+    /**
+     * @class SSL
+     * @ingroup csharp_api 
+     * @brief A representation of an SSL connection.
+     */
+    public class SSL
+    {
+        public IntPtr m_ssl;    /**< A pointer to the real SSL type */
+
+        /**
+         * @brief Store the reference to an SSL context.
+         * @param ip [in] A reference to an SSL object.
+         */
+        public SSL(IntPtr ip)
+        {
+            m_ssl = ip;
+        }
+
+        /**
+         * @brief Free any used resources on this connection. 
+         * 
+         * A "Close Notify" message is sent on this connection (if possible). 
+         * It is up to the application to close the socket.
+         */
+        public void Dispose()
+        {
+            axtls.ssl_free(m_ssl);
+        }
+
+        /**
+         * @brief Return the result of a handshake.
+         * @return SSL_OK if the handshake is complete and ok.
+         * @see ssl.h for the error code list.
+         */
+        public int HandshakeStatus()
+        {
+            return axtls.ssl_handshake_status(m_ssl);
+        }
+
+        /**
+         * @brief Return the SSL cipher id.
+         * @return The cipher id which is one of:
+         * - SSL_AES128_SHA (0x2f)
+         * - SSL_AES256_SHA (0x35)
+         * - SSL_RC4_128_SHA (0x05)
+         * - SSL_RC4_128_MD5 (0x04)
+         */
+        public byte GetCipherId()
+        {
+            return axtls.ssl_get_cipher_id(m_ssl);
+        }
+
+        /**
+         * @brief Get the session id for a handshake. 
+         * 
+         * This will be a 32 byte sequence and is available after the first
+         * handshaking messages are sent.
+         * @return The session id as a 32 byte sequence.
+         * @note A SSLv23 handshake may have only 16 valid bytes.
+         */
+        public byte[] GetSessionId()
+        {
+            IntPtr ptr = axtls.ssl_get_session_id(m_ssl);
+            byte sess_id_size = axtls.ssl_get_session_id_size(m_ssl);
+            byte[] result = new byte[sess_id_size];
+            Marshal.Copy(ptr, result, 0, sess_id_size);
+            return result;
+        }
+
+        /**
+         * @brief Retrieve an X.509 distinguished name component.
+         * 
+         * When a handshake is complete and a certificate has been exchanged, 
+         * then the details of the remote certificate can be retrieved.
+         *
+         * This will usually be used by a client to check that the server's 
+         * common name matches the URL.
+         *
+         * A full handshake needs to occur for this call to work.
+         *
+         * @param component [in] one of:
+         * - SSL_X509_CERT_COMMON_NAME
+         * - SSL_X509_CERT_ORGANIZATION
+         * - SSL_X509_CERT_ORGANIZATIONAL_NAME
+         * - SSL_X509_CA_CERT_COMMON_NAME
+         * - SSL_X509_CA_CERT_ORGANIZATION
+         * - SSL_X509_CA_CERT_ORGANIZATIONAL_NAME
+         * @return The appropriate string (or null if not defined)
+         */
+        public string GetCertificateDN(int component)
+        {
+            return axtls.ssl_get_cert_dn(m_ssl, component);
+        }
+    }
+
+    /**
+     * @class SSLUtil
+     * @ingroup csharp_api 
+     * @brief Some global helper functions.
+     */
+    public class SSLUtil
+    {
+
+        /**
+         * @brief Return the build mode of the axTLS project.
+         * @return The build mode is one of:
+         * - SSL_BUILD_SERVER_ONLY
+         * - SSL_BUILD_ENABLE_VERIFICATION
+         * - SSL_BUILD_ENABLE_CLIENT
+         * - SSL_BUILD_FULL_MODE
+         */
+        public static int BuildMode()
+        {
+            return axtls.ssl_get_config(axtls.SSL_BUILD_MODE);
+        }
+
+        /**
+         * @brief Return the number of chained certificates that the 
+         * client/server supports.
+         * @return The number of supported server certificates.
+         */
+        public static int MaxCerts()
+        {
+            return axtls.ssl_get_config(axtls.SSL_MAX_CERT_CFG_OFFSET);
+        }
+
+        /**
+         * @brief Return the number of CA certificates that the client/server
+         * supports.
+         * @return The number of supported CA certificates.
+         */
+        public static int MaxCACerts()
+        {
+            return axtls.ssl_get_config(axtls.SSL_MAX_CA_CERT_CFG_OFFSET);
+        }
+
+        /**
+         * @brief Indicate if PEM is supported.
+         * @return true if PEM supported.
+         */
+        public static bool HasPEM()
+        {
+            return axtls.ssl_get_config(axtls.SSL_HAS_PEM) > 0 ? true : false;
+        }
+
+        /**
+         * @brief Display the text string of the error.
+         * @param error_code [in] The integer error code.
+         */
+        public static void DisplayError(int error_code)
+        {
+            axtls.ssl_display_error(error_code);
+        }
+
+        /**
+         * @brief Return the version of the axTLS project.
+         */
+        public static string Version()
+        {
+            return axtls.ssl_version();
+        }
+    }
+
+    /**
+     * @class SSLCTX
+     * @ingroup csharp_api 
+     * @brief A base object for SSLServer/SSLClient.
+     */
+    public class SSLCTX
+    {
+        /**
+         * @brief A reference to the real client/server context.
+         */
+        protected IntPtr m_ctx;
+
+        /**
+         * @brief Establish a new client/server context.
+         *
+         * This function is called before any client/server SSL connections are 
+         * made.  If multiple threads are used, then each thread will have its 
+         * own SSLCTX context. Any number of connections may be made with a 
+         * single context. 
+         *
+         * Each new connection will use the this context's private key and 
+         * certificate chain. If a different certificate chain is required, 
+         * then a different context needs to be be used.
+         *
+         * @param options [in]  Any particular options. At present the options
+         * supported are:
+         * - SSL_SERVER_VERIFY_LATER (client only): Don't stop a handshake if 
+         * the server authentication fails. The certificate can be 
+         * authenticated later with a call to VerifyCert().
+         * - SSL_CLIENT_AUTHENTICATION (server only): Enforce client 
+         * authentication i.e. each handshake will include a "certificate 
+         * request" message from the server.
+         * - SSL_DISPLAY_BYTES (full mode build only): Display the byte 
+         * sequences during the handshake.
+         * - SSL_DISPLAY_STATES (full mode build only): Display the state 
+         * changes during the handshake.
+         * - SSL_DISPLAY_CERTS (full mode build only): Display the 
+         * certificates that are passed during a handshake.
+         * - SSL_DISPLAY_RSA (full mode build only): Display the RSA key 
+         * details that are passed during a handshake.
+         * @param num_sessions [in] The number of sessions to be used for 
+         * session caching. If this value is 0, then there is no session 
+         * caching.
+         * @return A client/server context.
+         */
+        protected SSLCTX(uint options, int num_sessions)
+        {
+            m_ctx = axtls.ssl_ctx_new(options, num_sessions);
+        }
+
+        /**
+         * @brief Remove a client/server context.
+         *
+         * Frees any used resources used by this context. Each connection will 
+         * be sent a "Close Notify" alert (if possible).
+         */
+        public void Dispose()
+        {
+            axtls.ssl_ctx_free(m_ctx);
+        }
+
+        /**
+         * @brief Read the SSL data stream.
+         * @param ssl [in] An SSL object reference.
+         * @param in_data [out] After a successful read, the decrypted data 
+         * will be here. It will be null otherwise.
+         * @return The number of decrypted bytes:
+         * - if > 0, then the handshaking is complete and we are returning the 
+         * number of decrypted bytes. 
+         * - SSL_OK if the handshaking stage is successful (but not yet 
+         * complete).  
+         * - < 0 if an error.
+         * @see ssl.h for the error code list.
+         * @note Use in_data before doing any successive ssl calls.
+         */
+        public int Read(SSL ssl, out byte[] in_data)
+        {
+            IntPtr ptr = IntPtr.Zero;
+            int ret = axtls.ssl_read(ssl.m_ssl, ref ptr);
+
+            if (ret > axtls.SSL_OK)
+            {
+                in_data = new byte[ret];
+                Marshal.Copy(ptr, in_data, 0, ret);
+            }
+            else
+            {
+                in_data = null;
+            }
+
+            return ret;
+        }
+
+        /**
+         * @brief Write to the SSL data stream.
+         * @param ssl [in] An SSL obect reference.
+         * @param out_data [in] The data to be written
+         * @return The number of bytes sent, or if < 0 if an error.
+         * @see ssl.h for the error code list.
+         */
+        public int Write(SSL ssl, byte[] out_data)
+        {
+            return axtls.ssl_write(ssl.m_ssl, out_data, out_data.Length);
+        }
+
+        /**
+         * @brief Write to the SSL data stream.
+         * @param ssl [in] An SSL obect reference.
+         * @param out_data [in] The data to be written
+         * @param out_len [in] The number of bytes to be written
+         * @return The number of bytes sent, or if < 0 if an error.
+         * @see ssl.h for the error code list.
+         */
+        public int Write(SSL ssl, byte[] out_data, int out_len)
+        {
+            return axtls.ssl_write(ssl.m_ssl, out_data, out_len);
+        }
+
+        /**
+         * @brief Find an ssl object based on a Socket reference.
+         *
+         * Goes through the list of SSL objects maintained in a client/server 
+         * context to look for a socket match.
+         * @param s [in] A reference to a <A HREF="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemnetsocketssocketclasstopic.asp">Socket</A> object.
+         * @return A reference to the SSL object. Returns null if the object 
+         * could not be found.
+         */
+        public SSL Find(Socket s)
+        {
+            int client_fd = s.Handle.ToInt32();
+            return new SSL(axtls.  ssl_find(m_ctx, client_fd));
+        }
+
+        /**
+         * @brief Authenticate a received certificate.
+         * 
+         * This call is usually made by a client after a handshake is complete 
+         * and the context is in SSL_SERVER_VERIFY_LATER mode.
+         * @param ssl [in] An SSL object reference.
+         * @return SSL_OK if the certificate is verified.
+         */
+        public int VerifyCert(SSL ssl)
+        {
+            return axtls.ssl_verify_cert(ssl.m_ssl);
+        }
+
+        /**
+         * @brief Force the client to perform its handshake again.
+         *
+         * For a client this involves sending another "client hello" message.
+         * For the server is means sending a "hello request" message.
+         *
+         * This is a blocking call on the client (until the handshake 
+         * completes).
+         * @param ssl [in] An SSL object reference.
+         * @return SSL_OK if renegotiation instantiation was ok
+         */
+        public int Renegotiate(SSL ssl)
+        {
+            return axtls.ssl_renegotiate(ssl.m_ssl);
+        }
+
+        /**
+         * @brief Load a file into memory that is in binary DER or ASCII PEM 
+         * format.
+         *
+         * These are temporary objects that are used to load private keys,
+         * certificates etc into memory.
+         * @param obj_type [in] The format of the file. Can be one of:
+         * - SSL_OBJ_X509_CERT (no password required)
+         * - SSL_OBJ_X509_CACERT (no password required)
+         * - SSL_OBJ_RSA_KEY (AES128/AES256 PEM encryption supported)
+         * - SSL_OBJ_P8 (RC4-128 encrypted data supported)
+         * - SSL_OBJ_P12 (RC4-128 encrypted data supported)
+         *
+         * PEM files are automatically detected (if supported).
+         * @param filename [in] The location of a file in DER/PEM format.
+         * @param password [in] The password used. Can be null if not required.
+         * @return SSL_OK if all ok
+         */
+        public int ObjLoad(int obj_type, string filename, string password)
+        {
+            return axtls.ssl_obj_load(m_ctx, obj_type, filename, password);
+        }
+
+        /**
+         * @brief Transfer binary data into the object loader.
+         *
+         * These are temporary objects that are used to load private keys,
+         * certificates etc into memory.
+         * @param obj_type [in] The format of the memory data.
+         * @param data [in] The binary data to be loaded.
+         * @param len [in] The amount of data to be loaded.
+         * @param password [in] The password used. Can be null if not required.
+         * @return SSL_OK if all ok
+         */
+        public int ObjLoad(int obj_type, byte[] data, int len, string password)
+        {
+            return axtls.ssl_obj_memory_load(m_ctx, obj_type, 
+                                            data, len, password);
+        }
+    }
+
+    /**
+     * @class SSLServer
+     * @ingroup csharp_api 
+     * @brief The server context.
+     *
+     * All server connections are started within a server context.
+     */
+    public class SSLServer : SSLCTX
+    {
+        /**
+         * @brief Start a new server context.
+         * 
+         * @see SSLCTX for details.
+         */
+        public SSLServer(uint options, int num_sessions) :
+                            base(options, num_sessions) {}
+
+        /**
+         * @brief Establish a new SSL connection to an SSL client.
+         *
+         * It is up to the application to establish the initial socket 
+         * connection.
+         *
+         * Call Dispose() when the connection is to be removed.
+         * @param s [in] A reference to a <A HREF="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemnetsocketssocketclasstopic.asp">Socket</A> object.
+         * @return An SSL object reference.
+         */
+        public SSL Connect(Socket s)
+        {
+            int client_fd = s.Handle.ToInt32();
+            return new SSL(axtls.ssl_server_new(m_ctx, client_fd));
+        }
+    }
+
+    /**
+     * @class SSLClient
+     * @ingroup csharp_api
+     * @brief The client context.
+     *
+     * All client connections are started within a client context.
+     */
+    public class SSLClient : SSLCTX
+    {
+        /**
+         * @brief Start a new client context.
+         * 
+         * @see SSLCTX for details.
+         */
+        public SSLClient(uint options, int num_sessions) :
+                        base(options, num_sessions) {}
+
+        /**
+         * @brief Establish a new SSL connection to an SSL server.
+         *
+         * It is up to the application to establish the initial socket 
+         * connection.
+         *
+         * This is a blocking call - it will finish when the handshake is 
+         * complete (or has failed).
+         *
+         * Call Dispose() when the connection is to be removed.
+         * @param s [in] A reference to a <A HREF="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemnetsocketssocketclasstopic.asp">Socket</A> object.
+         * @param session_id [in] A 32 byte session id for session resumption. 
+         * This can be null if no session resumption is not required.
+         * @return An SSL object reference. Use SSL.handshakeStatus() to check 
+         * if a handshake succeeded.
+         */
+        public SSL Connect(Socket s, byte[] session_id)
+        {
+            int client_fd = s.Handle.ToInt32();
+            byte sess_id_size = (byte)(session_id != null ? 
+                                session_id.Length : 0);
+            return new SSL(axtls.ssl_client_new(m_ctx, client_fd, session_id,
+                        sess_id_size));
+        }
+    }
+}
+/** @} */
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl b/trunk/package/luci/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl
new file mode 100755
index 00000000..4b251798
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl
@@ -0,0 +1,393 @@
+#!/usr/bin/perl
+
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#===============================================================
+# Transforms function signature into SWIG format
+sub transformSignature
+{
+    foreach $item (@_)
+    { 
+        $line =~ s/STDCALL //g;
+        $line =~ s/EXP_FUNC/extern/g;
+
+        # make API Java more 'byte' friendly
+        $line =~ s/uint32_t/int/g;
+        $line =~ s/const uint8_t \* /const unsigned char \* /g;
+        $line =~ s/\(void\)/()/g;
+        if ($ARGV[0] eq "-java")
+        {
+            $line =~ s/.*ssl_read.*//g;
+            $line =~ s/const uint8_t \*(\w+)/const signed char $1\[\]/g;
+            $line =~ s/uint8_t/signed char/g;
+        }
+        elsif ($ARGV[0] eq "-perl")
+        {
+            $line =~ s/const uint8_t \*(\w+)/const unsigned char $1\[\]/g;
+            $line =~ s/uint8_t/unsigned char/g;
+        }
+        else # lua
+        {
+            $line =~ s/const uint8_t \*session_id/const unsigned char session_id\[\]/g;
+            $line =~ s/const uint8_t \*\w+/unsigned char *INPUT/g;
+            $line =~ s/uint8_t/unsigned char/g;
+        }
+    }
+
+    return $line;
+}
+
+# Parse input file
+sub parseFile
+{
+    foreach $line (@_)
+    {
+        next if $line =~ /ssl_x509_create/; # ignore for now
+
+        # test for a #define
+        if (!$skip && $line =~ m/^#define/)
+        {
+            $splitDefine = 1 if $line =~ m/\\$/;
+            print DATA_OUT $line;
+
+            # check line is not split
+            next if $splitDefine == 1;
+        }
+
+        # pick up second line of #define statement
+        if ($splitDefine) 
+        {
+            print DATA_OUT $line;
+
+            # check line is not split
+            $splitDefine = ($line =~ m/\\$/);
+            next;
+        } 
+
+        # test for function declaration
+        if (!$skip && $line =~ /EXP_FUNC/ && $line !~/\/\*/)
+        {
+            $line = transformSignature($line);
+            $splitFunctionDeclaration = $line !~ /;/;
+            print DATA_OUT $line;
+            next;
+        }
+
+        if ($splitFunctionDeclaration) 
+        {
+            $line = transformSignature($line);
+            $splitFunctionDeclaration = $line !~ /;/;
+            print DATA_OUT $line;
+            next;
+        }
+    }
+}
+
+#===============================================================
+
+# Determine which module to build from cammand-line options
+use strict;
+use Getopt::Std;
+
+my $module;
+my $interfaceFile;
+my $data_file;
+my $skip;
+my $splitLine;
+my @raw_data;
+
+if (not defined  $ARGV[0])
+{
+    goto ouch;
+}
+
+if ($ARGV[0] eq "-java")
+{
+    print "Generating Java interface file\n";
+    $module = "axtlsj";
+    $interfaceFile = "java/axTLSj.i";
+}
+elsif ($ARGV[0] eq "-perl")
+{
+    print "Generating Perl interface file\n";
+    $module = "axtlsp";
+    $interfaceFile = "perl/axTLSp.i";
+}
+elsif ($ARGV[0] eq "-lua")
+{
+    print "Generating lua interface file\n";
+    $module = "axtlsl";
+    $interfaceFile = "lua/axTLSl.i";
+}
+else
+{
+ouch:
+    die "Usage: $0 [-java | -perl | -lua]\n";
+}
+
+# Input file required to generate SWIG interface file.
+$data_file = "../ssl/ssl.h";
+
+# Open input files
+open(DATA_IN, $data_file) || die("Could not open file ($data_file)!");
+@raw_data = <DATA_IN>;
+
+# Open output file
+open(DATA_OUT, ">$interfaceFile") || die("Cannot Open File");
+
+#
+# I wish I could say it was easy to generate the Perl/Java/Lua bindings, 
+# but each had their own set of challenges... :-(.
+#
+print DATA_OUT << "END";
+%module $module\n
+
+/* include our own header */
+%inline %{
+#include "ssl.h"
+%}
+
+%include "typemaps.i"
+/* Some SWIG magic to make the API a bit more Java friendly */
+#ifdef SWIGJAVA
+
+%apply long { SSL * };
+%apply long { SSL_CTX * };
+%apply long { SSLObjLoader * };
+
+/* allow "unsigned char []" to become "byte[]" */
+%include "arrays_java.i"
+
+/* convert these pointers to use long */
+%apply signed char[] {unsigned char *};
+%apply signed char[] {signed char *};
+
+/* allow ssl_get_session_id() to return "byte[]" */
+%typemap(out) unsigned char * ssl_get_session_id \"if (result) jresult = SWIG_JavaArrayOutSchar(jenv, result, ssl_get_session_id_size((SSL const *)arg1));\"
+
+/* allow ssl_client_new() to have a null session_id input */
+%typemap(in) const signed char session_id[] (jbyte *jarr) {
+    if (jarg3 == NULL)
+    {
+        jresult = (jint)ssl_client_new(arg1,arg2,NULL,0);
+        return jresult;
+    }
+    
+    if (!SWIG_JavaArrayInSchar(jenv, &jarr, &arg3, jarg3)) return 0;
+}   
+
+/* Lot's of work required for an ssl_read() due to its various custom
+ * requirements.
+ */
+%native (ssl_read) int ssl_read(SSL *ssl, jobject in_data);
+%{
+JNIEXPORT jint JNICALL Java_axTLSj_axtlsjJNI_ssl_1read(JNIEnv *jenv, jclass jcls, jint jarg1, jobject jarg2) {
+    jint jresult = 0 ;
+    SSL *arg1;
+    unsigned char *arg2;
+    jbyte *jarr;
+    int result;
+    JNIEnv e = *jenv;
+    jclass holder_class;
+    jfieldID fid;
+
+    arg1 = (SSL *)jarg1;
+    result = (int)ssl_read(arg1, &arg2);
+
+    /* find the "m_buf" entry in the SSLReadHolder class */
+    if (!(holder_class = e->GetObjectClass(jenv,jarg2)) ||
+            !(fid = e->GetFieldID(jenv,holder_class, "m_buf", "[B")))
+        return SSL_NOT_OK;
+
+    if (result > SSL_OK)
+    {
+        int i;
+
+        /* create a new byte array to hold the read data */
+        jbyteArray jarray = e->NewByteArray(jenv, result);
+
+        /* copy the bytes across to the java byte array */
+        jarr = e->GetByteArrayElements(jenv, jarray, 0);
+        for (i = 0; i < result; i++)
+            jarr[i] = (jbyte)arg2[i];
+
+        /* clean up and set the new m_buf object */
+        e->ReleaseByteArrayElements(jenv, jarray, jarr, 0);
+        e->SetObjectField(jenv, jarg2, fid, jarray);
+    }
+    else    /* set to null */
+        e->SetObjectField(jenv, jarg2, fid, NULL);
+
+    jresult = (jint)result;
+    return jresult;
+}
+%}
+
+/* Big hack to get hold of a socket's file descriptor */
+%typemap (jtype) long "Object"
+%typemap (jstype) long "Object"
+%native (getFd) int getFd(long sock);
+%{
+JNIEXPORT jint JNICALL Java_axTLSj_axtlsjJNI_getFd(JNIEnv *env, jclass jcls, jobject sock)
+{
+    JNIEnv e = *env;
+    jfieldID fid;
+    jobject impl;
+    jobject fdesc;
+
+    /* get the SocketImpl from the Socket */
+    if (!(jcls = e->GetObjectClass(env,sock)) ||
+            !(fid = e->GetFieldID(env,jcls,"impl","Ljava/net/SocketImpl;")) ||
+            !(impl = e->GetObjectField(env,sock,fid))) return -1;
+
+    /* get the FileDescriptor from the SocketImpl */
+    if (!(jcls = e->GetObjectClass(env,impl)) ||
+            !(fid = e->GetFieldID(env,jcls,"fd","Ljava/io/FileDescriptor;")) ||
+            !(fdesc = e->GetObjectField(env,impl,fid))) return -1;
+
+    /* get the fd from the FileDescriptor */
+    if (!(jcls = e->GetObjectClass(env,fdesc)) ||
+            !(fid = e->GetFieldID(env,jcls,"fd","I"))) return -1;
+
+    /* return the descriptor */
+    return e->GetIntField(env,fdesc,fid);
+} 
+%}
+
+#endif
+
+/* Some SWIG magic to make the API a bit more Perl friendly */
+#ifdef SWIGPERL
+
+/* for ssl_session_id() */
+%typemap(out) const unsigned char * {
+    SV *svs = newSVpv((unsigned char *)\$1, ssl_get_session_id_size((SSL const *)arg1));
+    \$result = newRV(svs);
+    sv_2mortal(\$result);
+    argvi++;
+}
+
+/* for ssl_write() */
+%typemap(in) const unsigned char out_data[] {
+    SV* tempsv;
+    if (!SvROK(\$input))
+        croak("Argument \$argnum is not a reference.");
+    tempsv = SvRV(\$input);
+    if (SvTYPE(tempsv) != SVt_PV)
+        croak("Argument \$argnum is not an string.");
+    \$1 = (unsigned char *)SvPV(tempsv, PL_na);
+}
+
+/* for ssl_read() */
+%typemap(in) unsigned char **in_data (unsigned char *buf) {
+    \$1 = &buf;
+}
+
+%typemap(argout) unsigned char **in_data { 
+    if (result > SSL_OK) {
+        SV *svs = newSVpv(*\$1, result);
+        \$result = newRV(svs);
+        sv_2mortal(\$result);
+        argvi++;
+    }
+}
+
+/* for ssl_client_new() */
+%typemap(in) const unsigned char session_id[] {
+    /* check for a reference */
+    if (SvOK(\$input) && SvROK(\$input)) {
+        SV* tempsv = SvRV(\$input);
+        if (SvTYPE(tempsv) != SVt_PV)
+            croak("Argument \$argnum is not an string.");
+        \$1 = (unsigned char *)SvPV(tempsv, PL_na); 
+    } 
+    else
+        \$1 = NULL;
+}
+
+#endif
+
+/* Some SWIG magic to make the API a bit more Lua friendly */
+#ifdef SWIGLUA
+SWIG_NUMBER_TYPEMAP(unsigned char);
+SWIG_TYPEMAP_NUM_ARR(uchar,unsigned char);
+
+/* for ssl_session_id() */
+%typemap(out) const unsigned char * {
+    int i;
+    lua_newtable(L);
+    for (i = 0; i < ssl_get_session_id_size((SSL const *)arg1); i++){
+        lua_pushnumber(L,(lua_Number)result[i]);
+        lua_rawseti(L,-2,i+1); /* -1 is the number, -2 is the table */
+    }
+    SWIG_arg++;
+}
+
+/* for ssl_read() */
+%typemap(in) unsigned char **in_data (unsigned char *buf) {
+    \$1 = &buf;
+}
+
+%typemap(argout) unsigned char **in_data { 
+    if (result > SSL_OK) {
+		int i;
+		lua_newtable(L);
+		for (i = 0; i < result; i++){
+			lua_pushnumber(L,(lua_Number)buf2[i]);
+			lua_rawseti(L,-2,i+1); /* -1 is the number, -2 is the table */
+		}
+        SWIG_arg++;
+    }
+}
+
+/* for ssl_client_new() */
+%typemap(in) const unsigned char session_id[] {
+    if (lua_isnil(L,\$input))
+        \$1 = NULL;
+    else
+        \$1 = SWIG_get_uchar_num_array_fixed(L,\$input, ssl_get_session_id((SSL const *)\$1));
+}
+
+#endif
+
+END
+
+# Initialise loop variables
+$skip = 1;
+$splitLine = 0;
+
+parseFile(@raw_data);
+
+close(DATA_IN);
+close(DATA_OUT);
+
+#===============================================================
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/generate_interface.pl b/trunk/package/luci/libs/nixio/axTLS/bindings/generate_interface.pl
new file mode 100755
index 00000000..c24bff9f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/generate_interface.pl
@@ -0,0 +1,322 @@
+#!/usr/bin/perl -w
+
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#===============================================================
+# This application transforms ssl.h into interfaces that can be used by 
+# other language bindings. It is "SWIG"-like in nature in that various 
+# files are generated based on the axTLS API.
+#
+# The file produced is axInterface.? (depending on the file extension).
+#
+#===============================================================
+
+use strict;
+
+my $CSHARP = 0;
+my $VBNET = 1;
+
+my $binding;
+my $skip = 0;
+my $signature_ret_type;
+
+# Transforms function signature into an Interface format
+sub transformSignature
+{
+    my $item;
+    my ($line) = @_;
+
+    foreach $item ($line)
+    { 
+        # our very basic preprocessor
+        if ($binding == $CSHARP)
+        {
+            $line =~ s/STDCALL //;
+            $line =~ s/EXP_FUNC/        [DllImport ("axtls")]\n        public static extern/;
+            $line =~ s/uint32_t/uint/g;
+            $line =~ s/uint8_t \*\*/ref IntPtr /g;
+            $line =~ s/const uint8_t \* /IntPtr /g;
+            $line =~ s/const uint8_t \*/byte[] /g;    # note: subtle diff 
+            $line =~ s/uint8_t \* ?/byte[] /g;
+            $line =~ s/uint8_t ?/byte /g;
+            $line =~ s/const char \* ?/string /g;
+            $line =~ s/const SSL_CTX \* ?/IntPtr /g;
+            $line =~ s/SSL_CTX \* ?/IntPtr /g;
+            $line =~ s/SSLObjLoader \* ?/IntPtr /g;
+            $line =~ s/const SSL \* ?/IntPtr /g;
+            $line =~ s/SSL \* ?/IntPtr /g;
+            $line =~ s/\(void\)/()/g;
+        }
+        elsif ($binding == $VBNET)
+        {
+            if ($line =~ /EXP_FUNC/)
+            {
+                # Procedure or function?
+                my $invariant = $line =~ /void /;
+
+                my $proc = $invariant ? "Sub" : "Function";
+                ($signature_ret_type) = $line =~ /EXP_FUNC (.*) STDCALL/;
+                $line =~ s/EXP_FUNC .* STDCALL /        <DllImport("axtls")> Public Shared $proc _\n            /;
+
+                $signature_ret_type =~ s/const uint8_t \*/As IntPtr/;
+                $signature_ret_type =~ s/const char \*/As String/;
+                $signature_ret_type =~ s/SSL_CTX \*/As IntPtr/;
+                $signature_ret_type =~ s/SSLObjLoader \*/As IntPtr/;
+                $signature_ret_type =~ s/SSL \*/As IntPtr/;
+                $signature_ret_type =~ s/uint8_t/As Byte/;
+                $signature_ret_type =~ s/int/As Integer/;
+                $signature_ret_type =~ s/void//;
+                $signature_ret_type .= "\n        End $proc\n\n";
+            }
+
+            $line =~ s/uint32_t (\w+)/ByVal $1 As Integer/g;
+            $line =~ s/int (\w+)/ByVal $1 As Integer/g;
+            $line =~ s/uint8_t \*\* ?(\w+)/ByRef $1 As IntPtr/g;
+            $line =~ s/const uint8_t \* ?(\w+)/ByVal $1() As Byte/g;
+            $line =~ s/uint8_t \* ?(\w+)/ByVal $1() As Byte/g;
+            $line =~ s/uint8_t ?(\w+)/ByVal $1 As Byte/g;
+            $line =~ s/const char \* ?(\w+)/ByVal $1 As String/g;
+            $line =~ s/const SSL_CTX \* ?(\w+)/ByVal $1 As IntPtr/g;
+            $line =~ s/SSL_CTX \* ?(\w+)/ByVal $1 As IntPtr/g;
+            $line =~ s/SSLObjLoader \* ?(\w+)/ByVal $1 As IntPtr/g;
+            $line =~ s/const SSL \* ?(\w+)/ByVal $1 As IntPtr/g;
+            $line =~ s/SSL \* ?(\w+)/ByVal $1 As IntPtr/g;
+            $line =~ s/void \* ?(\w+)/Byval $1 As IntPtr/g;
+            $line =~ s/\(void\)/()/g;
+            $line =~ s/void//g;
+            $line =~ s/;\n/ $signature_ret_type;/;
+        }
+    }
+
+    return $line;
+}
+
+# Parse input file
+sub parseFile
+{
+    my (@file) = @_;
+    my $line;
+    my $splitDefine = 0;
+    my $splitFunctionDeclaration;
+    my $vb_hack = " ";
+    my $vb_line_hack = 0;
+
+    $skip = 0;
+
+    foreach $line (@file)
+    {
+        next if $line =~ /sl_x509_create/;  # ignore for now
+
+        # test for a #define
+        if (!$skip && $line =~ m/^#define/)
+        {
+            $splitDefine = 1 if $line =~ m/\\$/;
+
+            if ($binding == $VBNET)
+            {
+                $line =~ s/\|/Or/g;
+                $line =~ s/ 0x/ &H/;
+            }
+
+            my ($name, $value) = $line =~ /#define (\w+) +([^\\]*)[\\]?\n/;
+
+            if (defined $name && defined $value)
+            {
+                # C# constant translation
+                if ($binding == $CSHARP)
+                {
+                    $line = "        public const int $name = $value";
+                }
+                # VB.NET constant translation
+                elsif ($binding == $VBNET)
+                {
+                    $line = "        Public Const $name As Integer = $value";
+                }
+            }
+
+            next if $line =~ /#define/;  # ignore any other defines
+               
+            print DATA_OUT $line;
+
+            # check line is not split
+            next if $splitDefine == 1;
+            print DATA_OUT ";" if $binding == $CSHARP;
+            print DATA_OUT "\n";
+        }
+
+        # pick up second line of #define statement
+        if ($splitDefine) 
+        {
+            if ($line !~ /\\$/)
+            {
+                $line =~ s/$/;/ if $binding == $CSHARP;        # add the ";"
+            }
+
+            $line =~ s/ ?\| ?/ Or /g 
+                                if ($binding == $VBNET);
+
+            # check line is not split
+            $splitDefine = ($line =~ m/\\$/);
+
+            # ignore trailing "\"
+            $line =~ s/\\$// if $binding == $CSHARP;
+            $line =~ s/\\$/_/ if $binding == $VBNET;
+            print DATA_OUT $line;
+            next;
+        } 
+
+        # test for function declaration
+        if (!$skip && $line =~ /EXP_FUNC/ && $line !~ /\/\*/)
+        {
+            $line = transformSignature($line);
+            $splitFunctionDeclaration = $line !~ /;/;
+            $line =~ s/;// if ($binding == $VBNET);
+            $line =~ s/\n$/ _\n/ if ($binding == $VBNET) && 
+                                                $splitFunctionDeclaration;
+            print DATA_OUT $line;
+            next;
+        }
+
+        if ($splitFunctionDeclaration) 
+        {
+            $line = transformSignature($line);
+            $splitFunctionDeclaration = $line !~ /;/;
+            $line =~ s/;// if ($binding == $VBNET);
+            $line =~ s/\n/ _\n/ if ($binding == $VBNET) && 
+                                                $splitFunctionDeclaration == 1;
+            print DATA_OUT $line;
+            next;
+        }
+    }
+}
+
+#===============================================================
+
+# Determine which module to build from command-line options
+use strict;
+use Getopt::Std;
+
+my $binding_prefix;
+my $binding_suffix;
+my $data_file;
+my @raw_data;
+
+if (not defined  $ARGV[0])
+{
+    goto ouch;
+}
+
+if ($ARGV[0] eq "-csharp")
+{
+    print "Generating C# interface file\n";
+    $binding_prefix = "csharp";
+    $binding_suffix = "cs";
+    $binding = $CSHARP;
+}
+elsif ($ARGV[0] eq "-vbnet")
+{
+    print "Generating VB.NET interface file\n";
+    $binding_prefix = "vbnet";
+    $binding_suffix = "vb";
+    $binding = $VBNET;
+}
+else
+{
+ouch:
+    die "Usage: $0 [-csharp | -vbnet]\n";
+}
+
+my $interfaceFile = "$binding_prefix/axInterface.$binding_suffix";
+
+# Input file required to generate interface file.
+$data_file = "../ssl/ssl.h";
+
+# Open input files
+open(DATA_IN, $data_file) || die("Could not open file ($data_file)!");
+@raw_data = <DATA_IN>;
+
+
+# Open output file
+if ($binding == $CSHARP || $binding == $VBNET)
+{
+    open(DATA_OUT, ">$interfaceFile") || die("Cannot Open File");
+}
+
+# SPEC interface file header
+if ($binding == $CSHARP)
+{
+    # generate the C#/C interface file
+    print DATA_OUT << "END";
+// The C# to C interface definition file for the axTLS project
+// Do not modify - this file is generated
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace axTLS
+{
+    public class axtls
+    {
+END
+}
+elsif ($binding == $VBNET)
+{
+    # generate the VB.NET/C interface file
+    print DATA_OUT << "END";
+' The VB.NET to C interface definition file for the axTLS project
+' Do not modify - this file is generated
+
+Imports System
+Imports System.Runtime.InteropServices
+
+Namespace axTLSvb
+    Public Class axtls
+END
+}
+
+parseFile(@raw_data);
+
+# finish up
+if ($binding == $CSHARP)
+{
+    print DATA_OUT "    };\n";
+    print DATA_OUT "};\n";
+}
+elsif ($binding == $VBNET)
+{
+    print DATA_OUT "    End Class\nEnd Namespace\n";
+}
+
+close(DATA_IN);
+close(DATA_OUT);
+
+#===============================================================
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/java/Makefile b/trunk/package/luci/libs/nixio/axTLS/bindings/java/Makefile
new file mode 100644
index 00000000..8df1d0aa
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/java/Makefile
@@ -0,0 +1,94 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+AXTLS_HOME=../..
+
+include $(AXTLS_HOME)/config/.config
+include $(AXTLS_HOME)/config/makefile.conf
+include $(AXTLS_HOME)/config/makefile.java.conf
+
+all: lib jar
+
+JAR=$(AXTLS_HOME)/$(STAGE)/axtls.jar
+
+ifdef CONFIG_PLATFORM_WIN32
+TARGET=$(AXTLS_HOME)/$(STAGE)/axtlsj.dll
+else
+TARGET=$(AXTLS_HOME)/$(STAGE)/libaxtlsj.so
+endif
+
+lib: $(TARGET)
+axTLSj_wrap.o : axTLSj_wrap.c
+
+JAVA_FILES= \
+	axtlsjJNI.java \
+	axtlsjConstants.java \
+	axtlsj.java \
+	SSLReadHolder.java \
+	SSL.java \
+	SSLUtil.java \
+	SSLCTX.java \
+	SSLServer.java \
+	SSLClient.java
+
+OBJ=axTLSj_wrap.o
+
+JAVA_CLASSES:=$(JAVA_FILES:%.java=classes/axTLSj/%.class)
+
+ifdef CONFIG_PLATFORM_WIN32
+LDFLAGS += axtls.lib /libpath:"$(AXTLS_HOME)/$(STAGE)"
+
+include $(AXTLS_HOME)/config/makefile.post
+
+$(TARGET) : $(OBJ)
+	$(LD) $(LDFLAGS) $(LDSHARED) /out:$@ $(OBJ)
+else    # Not Win32
+
+$(TARGET) : $(OBJ)
+	$(LD) $(LDFLAGS) -L $(AXTLS_HOME)/$(STAGE) $(LDSHARED) -o $@ $(OBJ) -laxtls 
+endif
+
+jar: $(OBJ) $(JAR)
+
+# if we are doing the samples then defer creating the jar until then
+$(JAR): $(JAVA_CLASSES)
+ifndef CONFIG_JAVA_SAMPLES
+	jar cvf $@ -C classes axTLSj
+else
+	@if [ ! -f $(JAR) ]; then touch $(JAR); fi
+endif
+
+classes/axTLSj/%.class : %.java
+	javac -d classes -classpath classes $^
+
+clean::
+	@rm -f $(JAR) $(TARGET) SWIG* axtls* *.i *.c 
+	@rm -fr classes/*
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSL.java b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSL.java
new file mode 100644
index 00000000..b53a6da0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSL.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * A wrapper around the unmanaged interface to give a semi-decent Java API
+ */
+
+package axTLSj;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * @defgroup java_api Java API.
+ *
+ * Ensure that the appropriate dispose() methods are called when finished with
+ * various objects - otherwise memory leaks will result.
+ */
+
+/**
+ * @class SSL
+ * @ingroup java_api 
+ * @brief A representation of an SSL connection.
+ *
+ */
+public class SSL
+{
+    public int m_ssl;    /**< A pointer to the real SSL type */
+
+    /**
+     * @brief Store the reference to an SSL context.
+     * @param ip [in] A reference to an SSL object.
+     */
+    public SSL(int ip)
+    {
+        m_ssl = ip;
+    }
+
+    /**
+     * @brief Free any used resources on this connection. 
+     * 
+     * A "Close Notify" message is sent on this connection (if possible). It 
+     * is up to the application to close the socket.
+     */
+    public void dispose()
+    {
+        axtlsj.ssl_free(m_ssl);
+    }
+
+    /**
+     * @brief Return the result of a handshake.
+     * @return SSL_OK if the handshake is complete and ok.
+     * @see ssl.h for the error code list.
+     */
+    public int handshakeStatus()
+    {
+        return axtlsj.ssl_handshake_status(m_ssl);
+    }
+
+    /**
+     * @brief Return the SSL cipher id.
+     * @return The cipher id which is one of:
+     * - SSL_AES128_SHA (0x2f)
+     * - SSL_AES256_SHA (0x35)
+     * - SSL_RC4_128_SHA (0x05)
+     * - SSL_RC4_128_MD5 (0x04)
+     */
+    public byte getCipherId()
+    {
+        return axtlsj.ssl_get_cipher_id(m_ssl);
+    }
+
+    /**
+     * @brief Get the session id for a handshake. 
+     * 
+     * This will be a 32 byte sequence and is available after the first
+     * handshaking messages are sent.
+     * @return The session id as a 32 byte sequence.
+     * @note A SSLv23 handshake may have only 16 valid bytes.
+     */
+    public byte[] getSessionId()
+    {
+        return axtlsj.ssl_get_session_id(m_ssl);
+    }
+
+    /**
+     * @brief Retrieve an X.509 distinguished name component.
+     * 
+     * When a handshake is complete and a certificate has been exchanged, 
+     * then the details of the remote certificate can be retrieved.
+     *
+     * This will usually be used by a client to check that the server's common 
+     * name matches the URL.
+     *
+     * A full handshake needs to occur for this call to work.
+     *
+     * @param component [in] one of:
+     * - SSL_X509_CERT_COMMON_NAME
+     * - SSL_X509_CERT_ORGANIZATION
+     * - SSL_X509_CERT_ORGANIZATIONAL_NAME
+     * - SSL_X509_CA_CERT_COMMON_NAME
+     * - SSL_X509_CA_CERT_ORGANIZATION
+     * - SSL_X509_CA_CERT_ORGANIZATIONAL_NAME
+     * @return The appropriate string (or null if not defined)
+     */
+    public String getCertificateDN(int component)
+    {
+        return axtlsj.ssl_get_cert_dn(m_ssl, component);
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLCTX.java b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLCTX.java
new file mode 100644
index 00000000..1cd3e032
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLCTX.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * A wrapper around the unmanaged interface to give a semi-decent Java API
+ */
+
+package axTLSj;
+
+import java.net.*;
+
+/**
+ * @class SSLCTX
+ * @ingroup java_api 
+ * @brief A base object for SSLServer/SSLClient.
+ */
+public class SSLCTX
+{
+    /**
+     * A reference to the real client/server context.
+     */
+    protected int m_ctx;
+
+    /**
+     * @brief Establish a new client/server context.
+     *
+     * This function is called before any client/server SSL connections are 
+     * made.  If multiple threads are used, then each thread will have its 
+     * own SSLCTX context. Any number of connections may be made with a single 
+     * context. 
+     *
+     * Each new connection will use the this context's private key and 
+     * certificate chain. If a different certificate chain is required, then a 
+     * different context needs to be be used.
+     *
+     * @param options [in]  Any particular options. At present the options
+     * supported are:
+     * - SSL_SERVER_VERIFY_LATER (client only): Don't stop a handshake if the 
+     * server authentication fails. The certificate can be authenticated later 
+     * with a call to verifyCert().
+     * - SSL_CLIENT_AUTHENTICATION (server only): Enforce client authentication
+     * i.e. each handshake will include a "certificate request" message from 
+     * the server.
+     * - SSL_DISPLAY_BYTES (full mode build only): Display the byte sequences
+     * during the handshake.
+     * - SSL_DISPLAY_STATES (full mode build only): Display the state changes
+     * during the handshake.
+     * - SSL_DISPLAY_CERTS (full mode build only): Display the certificates that
+     * are passed during a handshake.
+     * - SSL_DISPLAY_RSA (full mode build only): Display the RSA key details 
+     * that are passed during a handshake.
+     *
+     * @param num_sessions [in] The number of sessions to be used for session
+     * caching. If this value is 0, then there is no session caching.
+     * 
+     * If this option is null, then the default internal private key/
+     * certificate pair is used (if CONFIG_SSL_USE_DEFAULT_KEY is set). 
+     * 
+     * The resources used by this object are automatically freed.  
+     * @return A client/server context.
+     */
+    protected SSLCTX(int options, int num_sessions)
+    {
+        m_ctx = axtlsj.ssl_ctx_new(options, num_sessions);
+    }
+
+    /**
+     * @brief Remove a client/server context.
+     *
+     * Frees any used resources used by this context. Each connection will be 
+     * sent a "Close Notify" alert (if possible).
+     */
+    public void dispose()
+    {
+        axtlsj.ssl_ctx_free(m_ctx);
+    }
+
+    /**
+     * @brief Read the SSL data stream.
+     * @param ssl [in] An SSL object reference.
+     * @param rh [out] After a successful read, the decrypted data can be 
+     * retrieved with rh.getData(). It will be null otherwise.
+     * @return The number of decrypted bytes:
+     * - if > 0, then the handshaking is complete and we are returning the 
+     * number of decrypted bytes. 
+     * - SSL_OK if the handshaking stage is successful (but not yet complete).  
+     * - < 0 if an error.
+     * @see ssl.h for the error code list.
+     * @note Use rh before doing any successive ssl calls.
+     */
+    public int read(SSL ssl, SSLReadHolder rh)
+    {
+        return axtlsj.ssl_read(ssl.m_ssl, rh);
+    }
+
+    /**
+     * @brief Write to the SSL data stream.
+     * @param ssl [in] An SSL obect reference.
+     * @param out_data [in] The data to be written
+     * @return The number of bytes sent, or if < 0 if an error.
+     * @see ssl.h for the error code list.
+     */
+    public int write(SSL ssl, byte[] out_data)
+    {
+        return axtlsj.ssl_write(ssl.m_ssl, out_data, out_data.length);
+    }
+
+    /**
+     * @brief Write to the SSL data stream.
+     * @param ssl [in] An SSL obect reference.
+     * @param out_data [in] The data to be written
+     * @param out_len [in] The number of bytes to be written
+     * @return The number of bytes sent, or if < 0 if an error.
+     * @see ssl.h for the error code list.
+     */
+    public int write(SSL ssl, byte[] out_data, int out_len)
+    {
+        return axtlsj.ssl_write(ssl.m_ssl, out_data, out_len);
+    }
+
+    /**
+     * @brief Find an ssl object based on a Socket reference.
+     *
+     * Goes through the list of SSL objects maintained in a client/server 
+     * context to look for a socket match.
+     * @param s [in] A reference to a <A HREF="http://java.sun.com/j2se/1.4.2/docs/api">Socket</A> object.
+     * @return A reference to the SSL object. Returns null if the object 
+     * could not be found.
+     */
+    public SSL find(Socket s)
+    {
+        int client_fd = axtlsj.getFd(s);
+        return new SSL(axtlsj.ssl_find(m_ctx, client_fd));
+    }
+
+    /**
+     * @brief Authenticate a received certificate.
+     * 
+     * This call is usually made by a client after a handshake is complete 
+     * and the context is in SSL_SERVER_VERIFY_LATER mode.
+     * @param ssl [in] An SSL object reference.
+     * @return SSL_OK if the certificate is verified.
+     */
+    public int verifyCert(SSL ssl)
+    {
+        return axtlsj.ssl_verify_cert(ssl.m_ssl);
+    }
+
+    /**
+     * @brief Force the client to perform its handshake again.
+     *
+     * For a client this involves sending another "client hello" message.
+     * For the server is means sending a "hello request" message.
+     *
+     * This is a blocking call on the client (until the handshake completes).
+     * @param ssl [in] An SSL object reference.
+     * @return SSL_OK if renegotiation instantiation was ok
+     */
+    public int renegotiate(SSL ssl)
+    {
+        return axtlsj.ssl_renegotiate(ssl.m_ssl);
+    }
+
+    /**
+     * @brief Load a file into memory that is in binary DER or ASCII PEM format.
+     *
+     * These are temporary objects that are used to load private keys,
+     * certificates etc into memory.
+     * @param obj_type [in] The format of the file. Can be one of:
+     * - SSL_OBJ_X509_CERT (no password required)
+     * - SSL_OBJ_X509_CACERT (no password required)
+     * - SSL_OBJ_RSA_KEY (AES128/AES256 PEM encryption supported)
+     * - SSL_OBJ_P8 (RC4-128 encrypted data supported)
+     * - SSL_OBJ_P12 (RC4-128 encrypted data supported)
+     *
+     * PEM files are automatically detected (if supported).
+     * @param filename [in] The location of a file in DER/PEM format.
+     * @param password [in] The password used. Can be null if not required.
+     * @return SSL_OK if all ok
+     */
+    public int objLoad(int obj_type, String filename, String password)
+    {
+        return axtlsj.ssl_obj_load(m_ctx, obj_type, filename, password);
+    }
+
+    /**
+     * @brief Transfer binary data into the object loader.
+     *
+     * These are temporary objects that are used to load private keys,
+     * certificates etc into memory.
+     * @param obj_type [in] The format of the memory data.
+     * @param data [in] The binary data to be loaded.
+     * @param len [in] The amount of data to be loaded.
+     * @param password [in] The password used. Can be null if not required.
+     * @return SSL_OK if all ok
+     */
+
+    public int objLoad(int obj_type, byte[] data, int len, String password)
+    {
+        return axtlsj.ssl_obj_memory_load(m_ctx, obj_type, data, len, password);
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLClient.java b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLClient.java
new file mode 100644
index 00000000..f65fe9c5
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLClient.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * A wrapper around the unmanaged interface to give a semi-decent Java API
+ */
+
+package axTLSj;
+
+import java.net.*;
+
+/**
+ * @class SSLClient
+ * @ingroup java_api 
+ * @brief The client context.
+ *
+ * All client connections are started within a client context.
+ */
+public class SSLClient extends SSLCTX
+{
+    /**
+     * @brief Start a new client context.
+     * 
+     * @see SSLCTX for details.
+     */
+    public SSLClient(int options, int num_sessions)
+    {
+        super(options, num_sessions);
+    }
+
+    /**
+     * @brief Establish a new SSL connection to an SSL server.
+     *
+     * It is up to the application to establish the initial socket connection.
+     *
+     * This is a blocking call - it will finish when the handshake is 
+     * complete (or has failed).
+     *
+     * Call dispose() when the connection is to be removed.
+     * @param s [in] A reference to a <A HREF="http://java.sun.com/j2se/1.4.2/docs/api">Socket</A> object.
+     * @param session_id [in] A 32 byte session id for session resumption. This 
+     * can be null if no session resumption is not required.
+     * @return An SSL object reference. Use SSL.handshakeStatus() to check 
+     * if a handshake succeeded.
+     */
+    public SSL connect(Socket s, byte[] session_id)
+    {
+        int client_fd = axtlsj.getFd(s);
+        byte sess_id_size = (byte)(session_id != null ? 
+                                session_id.length : 0);
+        return new SSL(axtlsj.ssl_client_new(m_ctx, client_fd, session_id,
+                        sess_id_size));
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLReadHolder.java b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLReadHolder.java
new file mode 100644
index 00000000..91fd76b2
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLReadHolder.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * A wrapper around the unmanaged interface to give a semi-decent Java API
+ */
+
+package axTLSj;
+
+/**
+ * @class SSLReadHolder
+ * @ingroup java_api 
+ * @brief A holder for data read in an SSL read.
+ */
+public class SSLReadHolder
+{
+    /**
+     * @brief Contruct a new read holder object.
+     */
+    public SSLReadHolder()
+    {
+        m_buf = null;
+    }
+
+    /**
+     * @brief Retrieve the reference to the read data.
+     */
+    public byte[] getData()
+    {
+        return m_buf;
+    }
+
+    private byte[] m_buf;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLServer.java b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLServer.java
new file mode 100644
index 00000000..514ccb03
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLServer.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * A wrapper around the unmanaged interface to give a semi-decent Java API
+ */
+
+package axTLSj;
+
+import java.net.*;
+
+/**
+ * @class SSLServer
+ * @ingroup java_api 
+ * @brief The server context.
+ *
+ * All server connections are started within a server context.
+ */
+public class SSLServer extends SSLCTX
+{
+    /**
+     * @brief Start a new server context.
+     * 
+     * @see SSLCTX for details.
+     */
+    public SSLServer(int options, int num_sessions)
+    {
+        super(options, num_sessions);
+    }
+
+    /**
+     * @brief Establish a new SSL connection to an SSL client.
+     *
+     * It is up to the application to establish the initial socket connection.
+     *
+     * Call dispose() when the connection is to be removed.
+     * @param s [in] A reference to a <A HREF="http://java.sun.com/j2se/1.4.2/docs/api">Socket</A> object.
+     * @return An SSL object reference.
+     */
+    public SSL connect(Socket s)
+    {
+        int client_fd = axtlsj.getFd(s);
+        return new SSL(axtlsj.ssl_server_new(m_ctx, client_fd));
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLUtil.java b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLUtil.java
new file mode 100644
index 00000000..3d53de51
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/java/SSLUtil.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * A wrapper around the unmanaged interface to give a semi-decent Java API
+ */
+
+package axTLSj;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * @class SSLUtil
+ * @ingroup java_api 
+ * @brief Some global helper functions.
+ *
+ */
+public class SSLUtil
+{
+    /**
+     * @brief Load up the ddl/shared library 
+     */
+    static
+    {
+        System.loadLibrary("axtlsj");
+    }
+
+    /**
+     * @brief Return the build mode of the axTLS project.
+     * @return The build mode is one of:
+     * - SSL_BUILD_SERVER_ONLY
+     * - SSL_BUILD_ENABLE_VERIFICATION
+     * - SSL_BUILD_ENABLE_CLIENT
+     * - SSL_BUILD_FULL_MODE
+     */
+    public static int buildMode()
+    {
+        return axtlsj.ssl_get_config(axtlsj.SSL_BUILD_MODE);
+    }
+
+    /**
+     * @brief Return the number of chained certificates that the client/server 
+     * supports.
+     * @return The number of supported client/server certificates.
+     */
+    public static int maxCerts()
+    {
+        return axtlsj.ssl_get_config(axtlsj.SSL_MAX_CERT_CFG_OFFSET);
+    }
+
+    /**
+     * @brief Return the number of CA certificates that the client/server
+     * supports.
+     * @return The number of supported CA certificates.
+     */
+    public static int maxCACerts()
+    {
+        return axtlsj.ssl_get_config(axtlsj.SSL_MAX_CA_CERT_CFG_OFFSET);
+    }
+
+    /**
+     * @brief Indicate if PEM is supported.
+     * @return true if PEM supported.
+     */
+    public static boolean hasPEM()
+    {
+        return axtlsj.ssl_get_config(axtlsj.SSL_HAS_PEM) > 0 ? true : false;
+    }
+
+    /**
+     * @brief Display the text string of the error.
+     * @param error_code [in] The integer error code.
+     * @see ssl.h for the error code list.
+     */
+    public static void displayError(int error_code)
+    {
+        axtlsj.ssl_display_error(error_code);
+    }
+
+    /**
+     * @brief Return the version of the axTLS project.
+     */
+    public static String version()
+    {
+        return axtlsj.ssl_version();
+    }
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/lua/Makefile b/trunk/package/luci/libs/nixio/axTLS/bindings/lua/Makefile
new file mode 100644
index 00000000..daacf921
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/lua/Makefile
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+AXTLS_HOME=../..
+
+include $(AXTLS_HOME)/config/.config
+include $(AXTLS_HOME)/config/makefile.conf
+
+all: lib
+
+
+ifdef CONFIG_PLATFORM_WIN32
+TARGET=$(AXTLS_HOME)/$(STAGE)/axtlsl.dll
+else
+TARGET=$(CONFIG_LUA_CORE)/lib/lua/5.1/axtlsl.so
+endif
+
+ifneq ($(MAKECMDGOALS), clean)
+
+lib: $(TARGET)
+OBJ:=axTLSl_wrap.o
+include $(AXTLS_HOME)/config/makefile.post
+
+# there are a few static functions that aren't used
+CFLAGS += -funit-at-a-time
+
+$(TARGET) : $(OBJ)
+	$(LD) $(LDFLAGS) $(LDSHARED) -o $@ $^ -L$(AXTLS_HOME)/$(STAGE) -L$(CONFIG_LUA_CORE)/lib -laxtls -llua
+
+CFLAGS += -I $(CONFIG_LUA_CORE)/include
+else
+CFLAGS += /I"`cygpath -w $(CONFIG_LUA_CORE)/include`"
+LDFLAGS += axtls.lib /libpath:"$(AXTLS_HOME)/$(STAGE)"
+
+$(TARGET) : $(OBJ)
+	$(LD) $(LDFLAGS) $(LDSHARED) /out:$@ $(OBJ)
+endif # WIN32
+
+clean::
+	@rm -f $(TARGET) *.i axTLSl* .depend
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/perl/Makefile b/trunk/package/luci/libs/nixio/axTLS/bindings/perl/Makefile
new file mode 100644
index 00000000..92fd3c50
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/perl/Makefile
@@ -0,0 +1,91 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+AXTLS_HOME=../..
+
+include $(AXTLS_HOME)/config/.config
+include $(AXTLS_HOME)/config/makefile.conf
+
+all: lib
+
+ifdef CONFIG_PLATFORM_WIN32
+TARGET=$(AXTLS_HOME)/$(STAGE)/axtlsp.dll
+else
+TARGET=$(AXTLS_HOME)/$(STAGE)/libaxtlsp.so
+endif
+
+ifneq ($(MAKECMDGOALS), clean)
+
+ifdef CONFIG_PLATFORM_WIN32
+PERL5_CORE:=$(shell cygpath -w "$(CONFIG_PERL_CORE)")
+else
+PERL5_CORE= $(shell perl -e 'use Config; print $$Config{archlib};')/CORE
+endif
+
+all: test_perl
+
+test_perl:
+	@if ! [ -d "$(PERL5_CORE)" ]; then \
+		echo "*** Error: Perl not installed at $(CONFIG_PERL_CORE) - go to " \
+        "http://www.cpan.org/authors/id/G/GR/GRAHAMC/SiePerl-5.8.0-bin-1.0-Win32.INSTALL.exe" && exit 1; \
+	fi
+
+endif
+
+lib: $(TARGET)
+OBJ:=axTLSp_wrap.o
+include $(AXTLS_HOME)/config/makefile.post
+
+ifndef CONFIG_PLATFORM_WIN32        # Linux/Unix/Cygwin
+
+#
+# Could have used libperl.a, but it increases the library to over 1MB, so just
+# use libperl.so. But this needs to be in the shared library path for things to
+# work.
+#
+$(TARGET) : $(OBJ)
+	$(LD) $(LDFLAGS) -L$(AXTLS_HOME)/$(STAGE) -L$(PERL5_CORE) $(LDSHARED) -o $@ $(OBJ) -laxtls -lperl
+ifdef CONFIG_PLATFORM_CYGWIN
+	cd $(AXTLS_HOME)/$(STAGE); ln -sf $(notdir $@) axtlsp.dll
+endif
+	@install axtlsp.pm $(AXTLS_HOME)/$(STAGE)
+
+CFLAGS += -D_GNU_SOURCE -I$(PERL5_CORE)
+else
+CFLAGS += /I"$(PERL5_CORE)"
+LDFLAGS += $(CONFIG_PERL_LIB) /libpath:"$(PERL5_CORE)" axtls.lib /libpath:"$(AXTLS_HOME)/$(STAGE)"
+
+$(TARGET) : $(OBJ)
+	$(LD) $(LDFLAGS) $(LDSHARED) /out:$@ $(OBJ)
+	install axtlsp.pm $(AXTLS_HOME)/$(STAGE)
+endif # WIN32
+
+clean::
+	@rm -f $(TARGET) axtls* *.i axTLSp* *.c .depend $(AXTLS_HOME)/$(STAGE)/axtlsp.pm
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/Makefile b/trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/Makefile
new file mode 100644
index 00000000..7da60d02
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/Makefile
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../config/.config
+include ../../config/makefile.conf
+
+clean::
+	@rm -f axssl* axInterface.vb
diff --git a/trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb b/trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb
new file mode 100644
index 00000000..9388273c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb
@@ -0,0 +1,200 @@
+'
+' Copyright (c) 2007, Cameron Rich
+'
+' All rights reserved.
+'
+' Redistribution and use in source and binary forms, with or without
+' modification, are permitted provided that the following conditions are met:
+'
+' * Redistributions of source code must retain the above copyright notice,
+'   this list of conditions and the following disclaimer.
+' * Redistributions in binary form must reproduce the above copyright
+'   notice, this list of conditions and the following disclaimer in the
+'   documentation and/or other materials provided with the distribution.
+' * Neither the name of the axTLS project nor the names of its
+'   contributors may be used to endorse or promote products derived
+'   from this software without specific prior written permission.
+'
+' THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+' "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+' LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+' A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+' CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+' SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+' TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+' DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+' OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+' NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+' THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+'
+
+'
+' A wrapper around the unmanaged Integererface to give a semi-decent VB.NET API
+'
+
+Imports System
+Imports System.Runtime.InteropServices
+Imports System.Net.Sockets
+Imports axTLSvb
+
+Namespace axTLSvb
+    Public Class SSL
+        Public m_ssl As IntPtr
+
+        Public Sub New(ByRef ip As IntPtr)
+            m_ssl = ip
+        End Sub
+
+        Public Sub Dispose()
+            axtls.ssl_free(m_ssl)
+        End Sub
+
+        Public Function HandshakeStatus() As Integer
+            Return axtls.ssl_handshake_status(m_ssl)
+        End Function
+
+        Public Function GetCipherId() As Byte
+            Return axtls.ssl_get_cipher_id(m_ssl)
+        End Function
+
+        Public Function GetSessionId() As Byte()
+            Dim ptr As IntPtr = axtls.ssl_get_session_id(m_ssl)
+            Dim sess_id_size As Integer = axtls.ssl_get_session_id_size(m_ssl)
+            Dim result(sess_id_size-1) As Byte
+            Marshal.Copy(ptr, result, 0, sess_id_size)
+            Return result
+        End Function
+
+        Public Function GetCertificateDN(component As Integer) As String
+            Return axtls.ssl_get_cert_dn(m_ssl, component)
+        End Function
+    End Class
+
+    Public Class SSLUtil
+        Private dummy As Integer    ' need something here
+
+        Public Shared Function BuildMode() As Integer
+            Return axtls.ssl_get_config(axtls.SSL_BUILD_MODE)
+        End Function
+
+        Public Shared Function MaxCerts() As Integer
+            Return axtls.ssl_get_config(axtls.SSL_MAX_CERT_CFG_OFFSET)
+        End Function
+
+        Public Shared Function MaxCACerts() As Integer
+            Return axtls.ssl_get_config(axtls.SSL_MAX_CA_CERT_CFG_OFFSET)
+        End Function
+
+        Public Shared Function HasPEM() As Boolean
+            If axtls.ssl_get_config(axtls.SSL_HAS_PEM) > 0 Then
+                Return True
+            Else
+                Return False
+            End If
+        End Function
+        
+        Public Shared Sub DisplayError(ByVal error_code As Integer)
+            axtls.ssl_display_error(error_code)
+        End Sub
+
+        Public Shared Function Version() As String
+            Return axtls.ssl_version()
+        End Function
+    End Class
+
+    Public Class SSLCTX
+        Protected m_ctx As IntPtr
+
+        Protected Sub New(ByVal options As Integer, _
+                ByVal num_sessions As Integer)
+            m_ctx = axtls.ssl_ctx_new(options, num_sessions)
+        End Sub
+
+        Public Sub Dispose()
+            axtls.ssl_ctx_free(m_ctx)
+        End Sub
+
+        Public Function Read(ByVal ssl As SSL, ByRef in_data As Byte()) As Integer
+            Dim ptr As IntPtr = IntPtr.Zero
+            Dim ret as Integer = axtls.ssl_read(ssl.m_ssl, ptr)
+
+            If ret > axtls.SSL_OK Then
+                ReDim in_data(ret)
+                Marshal.Copy(ptr, in_data, 0, ret)
+            Else
+                in_data = Nothing
+            End If
+
+            Return ret
+        End Function
+
+        Public Function Write(ByVal ssl As SSL, _
+                ByVal data As Byte(), len As Integer) As Integer
+            Return axtls.ssl_write(ssl.m_ssl, data, len)
+        End Function
+
+        Public Function Find(ByVal s As Socket) As SSL
+            Dim client_fd As Integer = s.Handle.ToInt32()
+            Return New SSL(axtls.ssl_find(m_ctx, client_fd))
+        End Function
+
+        Public Function VerifyCert(ByVal ssl As SSL) As Integer
+            Return axtls.ssl_verify_cert(ssl.m_ssl)
+        End Function
+
+        Public Function Renegotiate(ByVal ssl As SSL) As Integer
+            Return axtls.ssl_renegotiate(ssl.m_ssl)
+        End Function
+
+        Public Function ObjLoad(ByVal obj_type As Integer, _
+                ByVal filename As String, _
+                password As String) As Integer
+            Return axtls.ssl_obj_load(m_ctx, obj_type, filename, password)
+        End Function
+
+        Public Function ObjLoad(ByVal obj_type As Integer, _
+                ByVal data As Byte(), ByVal len As Integer, _
+                password As String) As Integer
+            Return axtls.ssl_obj_memory_load( _
+                    m_ctx, obj_type, data, len, password)
+        End Function
+    End Class
+
+    Public Class SSLServer 
+            Inherits SSLCTX
+
+        Public Sub New(ByVal options As Integer, _
+                ByVal num_sessions As Integer)
+            MyBase.New(options, num_sessions)
+        End Sub
+
+        Public Function Connect(ByVal s As Socket) As SSL
+            Dim client_fd As Integer = s.Handle.ToInt32()
+            Return New SSL(axtls.ssl_server_new(m_ctx, client_fd))
+        End Function
+    End Class
+
+    Public Class SSLClient 
+            Inherits SSLCTX
+
+        Public Sub New(ByVal options As Integer, _
+                ByVal num_sessions As Integer)
+            MyBase.New(options, num_sessions)
+        End Sub
+
+        Public Function Connect(ByVal s As Socket, _
+                                ByVal session_id As Byte()) As SSL
+            Dim client_fd As Integer = s.Handle.ToInt32()
+            Dim sess_id_size As Byte
+            If session_id is Nothing Then
+                sess_id_size = 0
+            Else
+                sess_id_size = session_id.Length
+            End If
+
+            Return New SSL(axtls.ssl_client_new(m_ctx, client_fd, session_id, _
+                       sess_id_size))
+        End Function
+
+    End Class
+End Namespace
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/Config.in b/trunk/package/luci/libs/nixio/axTLS/config/Config.in
new file mode 100644
index 00000000..dc407564
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/Config.in
@@ -0,0 +1,114 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/config/Kconfig-language.txt
+#
+
+mainmenu "axTLS Configuration"
+
+config HAVE_DOT_CONFIG
+    bool
+    default y
+
+choice 
+    prompt "Platform"
+    default CONFIG_PLATFORM_LINUX
+
+config CONFIG_PLATFORM_LINUX
+    bool "Linux"
+
+config CONFIG_PLATFORM_CYGWIN
+    bool "Cygwin"
+
+config CONFIG_PLATFORM_WIN32
+    bool "Win32"
+
+endchoice 
+
+menu "General Configuration"
+
+config PREFIX
+    string "axTLS installation prefix"
+    depends on !CONFIG_PLATFORM_WIN32
+    default "/usr/local"
+    help
+      Define your directory to install axTLS files/subdirs in.
+
+config CONFIG_DEBUG
+    bool "Build axTLS with Debugging symbols"
+    default n
+    help
+      Say Y here if you wish to compile axTLS with debugging symbols.
+      This will allow you to use a debugger to examine axTLS internals.  
+      This increases the size of the binary considerably and should only be 
+      used when doing development.
+      If you are doing development and want to debug axTLS, answer Y.
+
+      Most people should answer N.
+
+config CONFIG_STRIP_UNWANTED_SECTIONS
+    depends on !CONFIG_PLATFORM_WIN32 && !CONFIG_DEBUG
+    bool "Strip unwanted sections from elf binaries"
+    default y
+    help
+        Strip unwanted sections from the resulting binaries
+
+menu "Microsoft Compiler Options"
+depends on CONFIG_PLATFORM_WIN32
+
+choice 
+    prompt "Compiler"
+    depends on CONFIG_PLATFORM_WIN32
+    default CONFIG_VISUAL_STUDIO_7_0
+
+config CONFIG_VISUAL_STUDIO_7_0
+    bool "Visual Studio 7.0 (2003)"
+    help 
+        Use Microsoft's Visual Studio 2003 platform.
+
+config CONFIG_VISUAL_STUDIO_8_0
+    bool "Visual Studio 8.0 (2005)"
+    help 
+        Use Microsoft's Visual Studio 2005 platform.
+
+endchoice
+
+config CONFIG_VISUAL_STUDIO_7_0_BASE
+    string "Base"
+    depends on CONFIG_VISUAL_STUDIO_7_0
+    default "c:\\Program Files\\Microsoft Visual Studio .NET 2003"
+
+config CONFIG_VISUAL_STUDIO_8_0_BASE
+    string "Base"
+    depends on CONFIG_VISUAL_STUDIO_8_0
+    default "c:\\Program Files\\Microsoft Visual Studio 8"
+
+endmenu
+
+config CONFIG_EXTRA_CFLAGS_OPTIONS
+    string "Any extra CFLAGS options for the compiler?"
+    help
+        Do you want to pass any extra CFLAGS options to the compiler as  
+        you build axTLS? If so, this is the option for you...  For
+        example, if you want to add some simple compiler switches (like
+        -march=i686), or check for warnings using -Werror, just those 
+        options here.
+
+config CONFIG_EXTRA_LDFLAGS_OPTIONS
+    string "Any extra LDFLAGS options for the compiler?"
+    help
+        Do you want to pass any extra LDFLAGS options to the compiler?
+
+endmenu
+
+source ssl/Config.in
+config CONFIG_AXHTTPD
+    bool "Enable HTTP/HTTPS Web Server"
+    default y
+    help
+        Build the AXHTTPD web server
+
+source httpd/Config.in
+source bindings/Config.in
+source samples/Config.in
+source ssl/BigIntConfig.in
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/JMeter.jmx b/trunk/package/luci/libs/nixio/axTLS/config/JMeter.jmx
new file mode 100755
index 00000000..f62c03f0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/JMeter.jmx
@@ -0,0 +1,247 @@
+<jmeterTestPlan version="1.2" properties="1.8">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="axhttpd Test Plan" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"></stringProp>
+      <boolProp name="TestPlan.serialize_threadgroups">true</boolProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <stringProp name="TestPlan.comments"></stringProp>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test 1" enabled="true">
+        <longProp name="ThreadGroup.start_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.num_threads">16</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <stringProp name="LoopController.loops">10</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">0</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Normal" enabled="true">
+          <stringProp name="HTTPSampler.path">/index.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.port">80</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.domain">127.0.0.1</stringProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        </HTTPSampler>
+        <hashTree/>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test 2" enabled="true">
+        <longProp name="ThreadGroup.start_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.num_threads">16</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <stringProp name="LoopController.loops">10</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">0</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="RC4" enabled="true">
+          <stringProp name="HTTPSampler.path">/index.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <stringProp name="HTTPSampler.protocol">HTTPS</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.port">443</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.domain">127.0.0.1</stringProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        </HTTPSampler>
+        <hashTree/>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test 3" enabled="true">
+        <longProp name="ThreadGroup.start_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.num_threads">16</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <stringProp name="LoopController.loops">10</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">0</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="AES128" enabled="true">
+          <stringProp name="HTTPSampler.path">/index.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <stringProp name="HTTPSampler.protocol">HTTPS</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.port">2443</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.domain">127.0.0.1</stringProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        </HTTPSampler>
+        <hashTree/>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test 4" enabled="true">
+        <longProp name="ThreadGroup.start_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.num_threads">16</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <stringProp name="LoopController.loops">10</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">0</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="AES256" enabled="true">
+          <stringProp name="HTTPSampler.path">/index.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <stringProp name="HTTPSampler.protocol">HTTPS</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.port">3443</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.domain">127.0.0.1</stringProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        </HTTPSampler>
+        <hashTree/>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test 5" enabled="true">
+        <longProp name="ThreadGroup.start_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+        <stringProp name="ThreadGroup.duration"></stringProp>
+        <stringProp name="ThreadGroup.num_threads">16</stringProp>
+        <boolProp name="ThreadGroup.scheduler">false</boolProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <stringProp name="LoopController.loops">10</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+        <longProp name="ThreadGroup.end_time">1152004173000</longProp>
+        <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">0</stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Skeleton (RC4)" enabled="true">
+          <stringProp name="HTTPSampler.path">/index.html</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <stringProp name="HTTPSampler.protocol">HTTPS</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.port">1443</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.mimetype"></stringProp>
+          <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.domain">127.0.0.1</stringProp>
+          <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        </HTTPSampler>
+        <hashTree/>
+      </hashTree>
+      <ResultCollector guiclass="StatGraphVisualizer" testclass="ResultCollector" testname="Aggregate Graph" enabled="true">
+        <objProp>
+          <value class="SampleSaveConfiguration">
+            <time>true</time>
+            <latency>true</latency>
+            <timestamp>true</timestamp>
+            <success>true</success>
+            <label>true</label>
+            <code>true</code>
+            <message>true</message>
+            <threadName>true</threadName>
+            <dataType>true</dataType>
+            <encoding>false</encoding>
+            <assertions>true</assertions>
+            <subresults>true</subresults>
+            <responseData>false</responseData>
+            <samplerData>false</samplerData>
+            <xml>false</xml>
+            <fieldNames>false</fieldNames>
+            <responseHeaders>false</responseHeaders>
+            <requestHeaders>false</requestHeaders>
+            <responseDataOnError>false</responseDataOnError>
+            <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+            <assertionsResultsToSave>0</assertionsResultsToSave>
+          </value>
+          <name>saveConfig</name>
+        </objProp>
+        <stringProp name="filename"></stringProp>
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
+      </ResultCollector>
+      <hashTree/>
+      <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
+        <objProp>
+          <value class="SampleSaveConfiguration">
+            <time>true</time>
+            <latency>true</latency>
+            <timestamp>true</timestamp>
+            <success>true</success>
+            <label>true</label>
+            <code>true</code>
+            <message>true</message>
+            <threadName>true</threadName>
+            <dataType>true</dataType>
+            <encoding>false</encoding>
+            <assertions>true</assertions>
+            <subresults>true</subresults>
+            <responseData>false</responseData>
+            <samplerData>false</samplerData>
+            <xml>false</xml>
+            <fieldNames>false</fieldNames>
+            <responseHeaders>false</responseHeaders>
+            <requestHeaders>false</requestHeaders>
+            <responseDataOnError>false</responseDataOnError>
+            <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+            <assertionsResultsToSave>0</assertionsResultsToSave>
+          </value>
+          <name>saveConfig</name>
+        </objProp>
+        <stringProp name="filename"></stringProp>
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
+      </ResultCollector>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/Rules.mak b/trunk/package/luci/libs/nixio/axTLS/config/Rules.mak
new file mode 100644
index 00000000..c0308da0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/Rules.mak
@@ -0,0 +1,220 @@
+# Rules.make for busybox
+#
+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
+#
+# Licensed under GPLv2, see the file LICENSE in this tarball for details.
+#
+
+# Pull in the user's busybox configuration
+ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
+-include $(top_builddir)/.config
+endif
+
+#--------------------------------------------------------
+PROG      := busybox
+MAJOR_VERSION   :=1
+MINOR_VERSION   :=1
+SUBLEVEL_VERSION:=0
+EXTRAVERSION    :=
+VERSION   :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
+BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
+
+
+#--------------------------------------------------------
+# With a modern GNU make(1) (highly recommended, that's what all the
+# developers use), all of the following configuration values can be
+# overridden at the command line.  For example:
+#   make CROSS=powerpc-linux- top_srcdir="$HOME/busybox" PREFIX=/mnt/app
+#--------------------------------------------------------
+
+# If you are running a cross compiler, you will want to set 'CROSS'
+# to something more interesting...  Target architecture is determined
+# by asking the CC compiler what arch it compiles things for, so unless
+# your compiler is broken, you should not need to specify TARGET_ARCH
+CROSS           =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
+CC             = $(CROSS)gcc
+AR             = $(CROSS)ar
+AS             = $(CROSS)as
+LD             = $(CROSS)ld
+NM             = $(CROSS)nm
+STRIP          = $(CROSS)strip
+CPP            = $(CC) -E
+# MAKEFILES      = $(top_builddir)/.config
+RM             = rm
+RM_F           = $(RM) -f
+LN             = ln
+LN_S           = $(LN) -s
+MKDIR          = mkdir
+MKDIR_P        = $(MKDIR) -p
+MV             = mv
+CP             = cp
+
+
+# What OS are you compiling busybox for?  This allows you to include
+# OS specific things, syscall overrides, etc.
+TARGET_OS=linux
+
+# Select the compiler needed to build binaries for your development system
+HOSTCC    = gcc
+HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+
+# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
+LC_ALL:= C
+
+# If you want to add some simple compiler switches (like -march=i686),
+# especially from the command line, use this instead of CFLAGS directly.
+# For optimization overrides, it's better still to set OPTIMIZATION.
+CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
+
+# To compile vs some other alternative libc, you may need to use/adjust
+# the following lines to meet your needs...
+#
+# If you are using Red Hat 6.x with the compatible RPMs (for developing under
+# Red Hat 5.x and glibc 2.0) uncomment the following.  Be sure to read about
+# using the compatible RPMs (compat-*) at http://www.redhat.com !
+#LIBCDIR:=/usr/i386-glibc20-linux
+#
+# For other libraries, you are on your own.  But these may (or may not) help...
+#LDFLAGS+=-nostdlib
+#LIBRARIES:=$(LIBCDIR)/lib/libc.a -lgcc
+#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR) -funsigned-char
+#GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
+
+WARNINGS=-Wall -Wstrict-prototypes -Wshadow
+CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
+ARFLAGS=cru
+
+
+# gcc centric. Perhaps fiddle with findstring gcc,$(CC) for the rest
+# get the CC MAJOR/MINOR version
+CC_MAJOR:=$(shell printf "%02d" $(shell echo __GNUC__ | $(CC) -E -xc - | tail -n 1))
+CC_MINOR:=$(shell printf "%02d" $(shell echo __GNUC_MINOR__ | $(CC) -E -xc - | tail -n 1))
+
+#--------------------------------------------------------
+export VERSION BUILDTIME HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
+ifeq ($(strip $(TARGET_ARCH)),)
+TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
+		-e 's/i.86/i386/' \
+		-e 's/sparc.*/sparc/' \
+		-e 's/arm.*/arm/g' \
+		-e 's/m68k.*/m68k/' \
+		-e 's/ppc/powerpc/g' \
+		-e 's/v850.*/v850/g' \
+		-e 's/sh[234]/sh/' \
+		-e 's/mips-.*/mips/' \
+		-e 's/mipsel-.*/mipsel/' \
+		-e 's/cris.*/cris/' \
+		)
+endif
+
+# A nifty macro to make testing gcc features easier
+check_gcc=$(shell \
+	if [ "$(1)" != "" ]; then \
+		if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+		then echo "$(1)"; else echo "$(2)"; fi \
+	fi)
+
+# Setup some shortcuts so that silent mode is silent like it should be
+ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS))
+export MAKE_IS_SILENT=n
+SECHO=@echo
+else
+export MAKE_IS_SILENT=y
+SECHO=-@false
+endif
+
+CFLAGS+=$(call check_gcc,-funsigned-char,)
+
+#--------------------------------------------------------
+# Arch specific compiler optimization stuff should go here.
+# Unless you want to override the defaults, do not set anything
+# for OPTIMIZATION...
+
+# use '-Os' optimization if available, else use -O2
+OPTIMIZATION:=$(call check_gcc,-Os,-O2)
+
+# Some nice architecture specific optimizations
+ifeq ($(strip $(TARGET_ARCH)),arm)
+	OPTIMIZATION+=-fstrict-aliasing
+endif
+ifeq ($(strip $(TARGET_ARCH)),i386)
+	OPTIMIZATION+=$(call check_gcc,-march=i386,)
+	OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=2,)
+	OPTIMIZATION+=$(call check_gcc,-falign-functions=0 -falign-jumps=0 -falign-loops=0,\
+		-malign-functions=0 -malign-jumps=0 -malign-loops=0)
+endif
+OPTIMIZATIONS:=$(OPTIMIZATION) -fomit-frame-pointer
+
+#
+#--------------------------------------------------------
+# If you're going to do a lot of builds with a non-vanilla configuration,
+# it makes sense to adjust parameters above, so you can type "make"
+# by itself, instead of following it by the same half-dozen overrides
+# every time.  The stuff below, on the other hand, is probably less
+# prone to casual user adjustment.
+#
+
+ifeq ($(strip $(CONFIG_LFS)),y)
+    # For large file summit support
+    CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+endif
+ifeq ($(strip $(CONFIG_DMALLOC)),y)
+    # For testing mem leaks with dmalloc
+    CFLAGS+=-DDMALLOC
+    LIBRARIES:=-ldmalloc
+else
+    ifeq ($(strip $(CONFIG_EFENCE)),y)
+	LIBRARIES:=-lefence
+    endif
+endif
+ifeq ($(strip $(CONFIG_DEBUG)),y)
+    CFLAGS  +=$(WARNINGS) -g -D_GNU_SOURCE
+    LDFLAGS +=-Wl,-warn-common
+    STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
+else
+    CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG
+    LDFLAGS += -Wl,-warn-common
+    STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment
+endif
+ifeq ($(strip $(CONFIG_STATIC)),y)
+    LDFLAGS += --static
+endif
+
+ifeq ($(strip $(CONFIG_SELINUX)),y)
+    LIBRARIES += -lselinux
+endif
+
+ifeq ($(strip $(PREFIX)),)
+    PREFIX:=`pwd`/_install
+endif
+
+# Additional complications due to support for pristine source dir.
+# Include files in the build directory should take precedence over
+# the copy in top_srcdir, both during the compilation phase and the
+# shell script that finds the list of object files.
+# Work in progress by <ldoolitt@recycle.lbl.gov>.
+
+
+OBJECTS:=$(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o
+CFLAGS    += $(CROSS_CFLAGS)
+ifdef BB_INIT_SCRIPT
+    CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
+endif
+
+# Put user-supplied flags at the end, where they
+# have a chance of winning.
+CFLAGS += $(CFLAGS_EXTRA)
+
+#------------------------------------------------------------
+# Installation options
+ifeq ($(strip $(CONFIG_INSTALL_APPLET_HARDLINKS)),y)
+INSTALL_OPTS=--hardlinks
+endif
+ifeq ($(strip $(CONFIG_INSTALL_APPLET_SYMLINKS)),y)
+INSTALL_OPTS=--symlinks
+endif
+ifeq ($(strip $(CONFIG_INSTALL_APPLET_DONT)),y)
+INSTALL_OPTS=
+endif
+
+.PHONY: dummy
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/axhttpd.aip b/trunk/package/luci/libs/nixio/axTLS/config/axhttpd.aip
new file mode 100755
index 00000000..412fe3b4
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/axhttpd.aip
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DOCUMENT type="Advanced Installer" CreateVersion="3.9" version="6.0.1" modules="freeware" RootPath="." Language="en">
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
+    <ROW Property="ALLUSERS" Value="2"/>
+    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install &lt;product name&gt;." ValueLocId="*"/>
+    <ROW Property="ARPPRODUCTICON" Value="controlPanelIcon.exe"/>
+    <ROW Property="ARPURLINFOABOUT" Value="http://axtls.cerocclub.com.au"/>
+    <ROW Property="BannerBitmap" Value="default_banner.bmp" Type="1"/>
+    <ROW Property="DialogBitmap" Value="default_dialog.bmp" Type="1"/>
+    <ROW Property="Manufacturer" Value="axTLS" ValueLocId="*"/>
+    <ROW Property="ProductCode" Value="1033:{F49FFA19-C243-4627-BE13-7DEDA4E700D0} "/>
+    <ROW Property="ProductLanguage" Value="1033"/>
+    <ROW Property="ProductName" Value="Axhttpd" ValueLocId="*"/>
+    <ROW Property="ProductVersion" Value="1.1.8"/>
+    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
+    <ROW Property="UpgradeCode" Value="{93E5623E-740C-449C-9770-EDABD392868D}"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
+    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
+    <ROW Directory="New_Folder_DIR" Directory_Parent="APPDIR" DefaultDir="include"/>
+    <ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/>
+    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
+    <ROW Directory="another_dir_DIR" Directory_Parent="test_dir_DIR" DefaultDir="anothe~1|another_dir"/>
+    <ROW Directory="bin_DIR" Directory_Parent="test_dir_DIR" DefaultDir="bin"/>
+    <ROW Directory="no_http_DIR" Directory_Parent="test_dir_DIR" DefaultDir="no_http"/>
+    <ROW Directory="no_ssl_DIR" Directory_Parent="test_dir_DIR" DefaultDir="no_ssl"/>
+    <ROW Directory="test_dir_DIR" Directory_Parent="www_DIR" DefaultDir="test_dir"/>
+    <ROW Directory="www_DIR" Directory_Parent="APPDIR" DefaultDir="www"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
+    <ROW Component="another_dir" ComponentId="{3F073789-DB33-40BC-BF88-922C6DF252EC}" Directory_="another_dir_DIR" Attributes="0"/>
+    <ROW Component="axhttpd.exe" ComponentId="{0AEFFA20-29FA-4304-8227-F9ED0E6B8A0A}" Directory_="APPDIR" Attributes="0" KeyPath="axhttpd.exe" FullKeyPath="APPDIR\axhttpd.exe"/>
+    <ROW Component="axssl.exe" ComponentId="{E1E96774-7BFC-45B9-BA33-FC0C631921FD}" Directory_="APPDIR" Attributes="0" KeyPath="axssl.exe" FullKeyPath="APPDIR\axssl.exe"/>
+    <ROW Component="axtls.dll" ComponentId="{4C741E75-A18A-4FC9-972C-C1EF583713EB}" Directory_="APPDIR" Attributes="0" KeyPath="axtls.dll" FullKeyPath="APPDIR\axtls.dll"/>
+    <ROW Component="axtls.jar" ComponentId="{796CB0A9-6214-4531-A330-9B37420B7799}" Directory_="APPDIR" Attributes="0" KeyPath="axtls.static.lib" FullKeyPath="APPDIR"/>
+    <ROW Component="bigint.h" ComponentId="{FC3E492B-D4F0-41FB-A977-76F6E9FE9FFE}" Directory_="New_Folder_DIR" Attributes="0" KeyPath="bigint.h" FullKeyPath="APPDIR\include"/>
+    <ROW Component="favicon.ico" ComponentId="{9A1AB507-100A-470D-A002-CD8262CA4913}" Directory_="www_DIR" Attributes="0" KeyPath="favicon.ico" FullKeyPath="APPDIR\www"/>
+    <ROW Component="htaccess" ComponentId="{F53CB1D5-A3B9-4401-B0BA-B6AB1DA860B7}" Directory_="no_ssl_DIR" Attributes="0" KeyPath="htaccess" FullKeyPath="APPDIR\www\test_dir\no_ssl"/>
+    <ROW Component="htaccess_1" ComponentId="{953D1999-CC00-4F85-9B48-2CD83ACAE2F9}" Directory_="no_http_DIR" Attributes="0" KeyPath="htaccess_1" FullKeyPath="APPDIR\www\test_dir\no_http"/>
+    <ROW Component="htaccess_2" ComponentId="{6F181A8B-B313-47E2-AF79-AABFDBD353D8}" Directory_="bin_DIR" Attributes="0" KeyPath="htaccess_2" FullKeyPath="APPDIR\www\test_dir\bin"/>
+    <ROW Component="htpasswd.exe" ComponentId="{9FE1AAD2-4E35-443A-AAE5-3A7D03A52AAA}" Directory_="APPDIR" Attributes="0" KeyPath="htpasswd.exe" FullKeyPath="APPDIR\htpasswd.exe"/>
+    <ROW Component="test_dir" ComponentId="{832C9295-CF2A-402E-BB3C-65BCBCBB5971}" Directory_="test_dir_DIR" Attributes="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="axhttpd.exe axssl.exe axtls.dll axtls.jar favicon.ico bigint.h htpasswd.exe another_dir htaccess htaccess_2 htaccess_1 test_dir"/>
+    <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
+    <ROW File="axhttpd.exe" Component_="axhttpd.exe" FileName="axhttpd.exe" Attributes="0" SourcePath="..\_stage\axhttpd.exe" SelfReg="false" Sequence="1"/>
+    <ROW File="axssl.exe" Component_="axssl.exe" FileName="axssl.exe" Attributes="0" SourcePath="..\_stage\axssl.exe" SelfReg="false" Sequence="2"/>
+    <ROW File="axtls.dll" Component_="axtls.dll" FileName="axtls.dll" Attributes="0" SourcePath="..\_stage\axtls.dll" SelfReg="false" Sequence="3"/>
+    <ROW File="axtls.lib" Component_="axtls.jar" FileName="axtls.lib" Attributes="0" SourcePath="..\_stage\axtls.lib" SelfReg="false" Sequence="4"/>
+    <ROW File="axtls.static.lib" Component_="axtls.jar" FileName="axtlss~1.lib|axtls.static.lib" Attributes="0" SourcePath="..\_stage\axtls.static.lib" SelfReg="false" Sequence="5"/>
+    <ROW File="bigint.h" Component_="bigint.h" FileName="bigint.h" Attributes="0" SourcePath="..\crypto\bigint.h" SelfReg="false" Sequence="12"/>
+    <ROW File="bigint_impl.h" Component_="bigint.h" FileName="bigint~1.h|bigint_impl.h" Attributes="0" SourcePath="..\crypto\bigint_impl.h" SelfReg="false" Sequence="9"/>
+    <ROW File="crypto.h" Component_="bigint.h" FileName="crypto.h" Attributes="0" SourcePath="..\crypto\crypto.h" SelfReg="false" Sequence="10"/>
+    <ROW File="crypto_misc.h" Component_="bigint.h" FileName="crypto~1.h|crypto_misc.h" Attributes="0" SourcePath="..\ssl\crypto_misc.h" SelfReg="false" Sequence="21"/>
+    <ROW File="favicon.ico" Component_="favicon.ico" FileName="favicon.ico" Attributes="0" SourcePath="..\www\favicon.ico" SelfReg="false" Sequence="6"/>
+    <ROW File="htaccess" Component_="htaccess" FileName="htacce~1|.htaccess" Attributes="0" SourcePath="..\www\test_dir\no_ssl\.htaccess" SelfReg="false" Sequence="15"/>
+    <ROW File="htaccess_1" Component_="htaccess_1" FileName="htacce~1|.htaccess" Attributes="0" SourcePath="..\www\test_dir\no_http\.htaccess" SelfReg="false" Sequence="18"/>
+    <ROW File="htaccess_2" Component_="htaccess_2" FileName="htacce~1|.htaccess" Attributes="0" SourcePath="..\www\test_dir\bin\.htaccess" SelfReg="false" Sequence="17"/>
+    <ROW File="htpasswd" Component_="htaccess_1" FileName="htpass~1|.htpasswd" Attributes="0" SourcePath="..\www\test_dir\no_http\.htpasswd" SelfReg="false" Sequence="19"/>
+    <ROW File="htpasswd.exe" Component_="htpasswd.exe" FileName="htpasswd.exe" Attributes="0" SourcePath="..\_stage\htpasswd.exe" SelfReg="false" Sequence="14"/>
+    <ROW File="index.html" Component_="favicon.ico" FileName="index~1.htm|index.html" Attributes="0" SourcePath="..\www\index.html" SelfReg="false" Sequence="7"/>
+    <ROW File="index.html_1" Component_="htaccess" FileName="index~1.htm|index.html" Attributes="0" SourcePath="..\www\test_dir\no_ssl\index.html" SelfReg="false" Sequence="16"/>
+    <ROW File="index.html_2" Component_="htaccess_1" FileName="index~1.htm|index.html" Attributes="0" SourcePath="..\www\test_dir\no_http\index.html" SelfReg="false" Sequence="20"/>
+    <ROW File="os_port.h" Component_="bigint.h" FileName="os_port.h" Attributes="0" SourcePath="..\ssl\os_port.h" SelfReg="false" Sequence="13"/>
+    <ROW File="ssl.h" Component_="bigint.h" FileName="ssl.h" Attributes="0" SourcePath="..\ssl\ssl.h" SelfReg="false" Sequence="8"/>
+    <ROW File="tls1.h" Component_="bigint.h" FileName="tls1.h" Attributes="0" SourcePath="..\ssl\tls1.h" SelfReg="false" Sequence="11"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" InstallationType="4"/>
+    <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
+    <ROW Path="&lt;ui.ail&gt;"/>
+    <ROW Path="&lt;ui_en.ail&gt;"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
+    <ROW Fragment="FolderDlg.aip" Path="&lt;FolderDlg.aip&gt;"/>
+    <ROW Fragment="StaticUIStrings.aip" Path="&lt;StaticUIStrings.aip&gt;"/>
+    <ROW Fragment="UI.aip" Path="&lt;UI.aip&gt;"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
+    <ROW Name="aicustact.dll" SourcePath="&lt;aicustact.dll&gt;"/>
+    <ROW Name="default_banner.bmp" SourcePath="&lt;default-banner.bmp&gt;"/>
+    <ROW Name="default_dialog.bmp" SourcePath="&lt;default-dialog.bmp&gt;"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent">
+    <ATTRIBUTE name="FixedSizeBitmaps" value="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
+    <ROW Dialog_="FolderDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="3"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="2"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="1"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="2"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
+    <ROW Directory_="another_dir_DIR" Component_="another_dir"/>
+    <ROW Directory_="test_dir_DIR" Component_="test_dir"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
+    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
+    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
+    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFilesFolder][ProductName]"/>
+    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
+    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="controlPanelIcon.exe" SourcePath="..\..\axhttpd\www\favicon.ico" Index="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
+    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="740"/>
+    <ROW Action="AI_STORE_LOCATION" Condition="Not Installed" Sequence="1545"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1300"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="740"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
+    <ROW Shortcut="axhttpd.exe" Directory_="SHORTCUTDIR" Name="axhttpd" Component_="axhttpd.exe" Target="[#axhttpd.exe]" Description="axhttpd.exe" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
+    <ROW Shortcut="axssl_client" Directory_="SHORTCUTDIR" Name="axsslc~1|axssl client" Component_="axssl.exe" Target="[#axssl.exe]" Arguments="s_client" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
+    <ROW Shortcut="axssl_server" Directory_="SHORTCUTDIR" Name="axssls~1|axssl server" Component_="axssl.exe" Target="[#axssl.exe]" Arguments="s_server" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMax="[|ProductVersion]" Attributes="1025" ActionProperty="OLDPRODUCTS"/>
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
+  </COMPONENT>
+</DOCUMENT>
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/axtls.RES b/trunk/package/luci/libs/nixio/axTLS/config/axtls.RES
new file mode 100644
index 0000000000000000000000000000000000000000..2929b3b679fddfb78bb58ebbccc5c0c4a9eb37d8
GIT binary patch
literal 22748
zcmeHv30##&mTzG?K4*D7Jw0!hH?QA&nx&IYC+SQlopu+K7&VE;M57o{F>Z(o7g<CQ
zM0OMfWV;~3WxujsSugu#QC4M90Yw4D1$SIQQUC8>A6}*Hq&q!t=JmYaq>@9`t*@3-
zr|PS({&mh#2qDIjfMH_tcY^lE#^*1vjEVB>CqMa%9~le1&cr(;3zCT#!@okf|D_TQ
z{~4~Lq`^+y-QAgXXRQ1cJv}{Q?AWnFqtOTp3k%_H;BO12-8I7<kF^jQgF%>TdV~c@
zX7==$iXM#x(-!<iGIeKpcVWspW8DobXAtfrO%H^jhq1d527|0OmSx$OyQwf}*oMJ^
zd2EL?cC3XkHRW#>?lG`Jk2~{779^n&WI&i&Xvm|6ylcoW`ysCylA)(Z3=R$oCnqQ2
z=jSK-`uap|ZLR3&=nz`1R_OJ5p;oKKAjhv#ISF0QplI$N6dHXk+tUh-RwrtkJIG6)
z&~*&5+#qE=D1w6YY`aew`UZu{NyYY6!kz60sr}fFmVIeOke`mf*}k?}=nc)n(9y$w
zdxWl8w$(56J^iAVq-DE$wqszw9V90e+j934enEbW)k0;dVLKe(EUj=NPby2TaCg!Q
zwMO#CH2d*mKN_80_;Kt(S_8*r5bB^>q1H7EZEZ8hOlocxIzxxh)piKIB#z5KYNjmw
z^gS%sBlP62mZUcHiDr(kgYxPj>B(<xA9-#juar?O`K=|dJtURNlKePP4(`Iq-CfKY
z?<XuRgP0DY9D;<UnOaz?)RdW;JTa!cH5#>;^^QhZa?UI{K9!S(GSqM`NE(jSR4Xhw
zUJEmhmt-l&O>&ZB_oIB(d^StRdK^2)ua=}CX>~%Y(+M*(J?rTyFTHRlSz1yyBuf=z
zcRlBZG3QV%NzRc*FSI1JmU1L%NovYdCrQt_Ci(dp_{_le8B@M`17)qLrMyYHTCQUf
z*Opq}%;%IlNk_TsNd{7ozJt#?xGuT&DF0^4UduJwOnG;3o$6}2p13yp`ul{2@-|T3
z&7?j_{ry}wls(r<2iJ2yskRSXFAx}nuynEz|0FEM*fEx3-aJcTVQI;+lAK5uDy|uo
zm}Sa2vUKA5l5^$6wMFuC5<i4LECG}MH(~tv@$5*__X^`LjUGK|{IyAwt||3Q#*e>t
zNeRP0pKF7Sk3Nz+ZSv$Jlc!ALkMWa6cTGMrjbXC0k|E1Kt2zGCq)DS&r<$5ZMNOSN
znrY{0Q%$2L%CN?C%#kURCS8&x$iXFr>1(4WPo6TRb<D&G6HHs3C$sRxQ4=Oi_<&*F
zgb7hor%h{}JS}(X)ZEr7mn6@lou`hOc4XSriK|vk95ZIGEd0Sd8RXv&CX8Y?YbK5w
zHEPY&$&<#9o;<B)>Y6WYoX1T3U`*76QKMwppdi_}3_(HchgG7YqD;rsuzc6li4#{(
z7&X&3(5uzgIbrpxFXnx)XYIRR>E_HaR8|@iRtJ4CVd5AL+<D5BDWflq?;69}6N2V_
zc_eV<%55LqpKyQZ-8oHWW@ei=pK@{8>gr`W7#3AC>%^>Cu3oeK#*d#eb;7(o2Sb8_
z?q;tHTrz4%{b0e*ezy5k=lk8}=1Z6MF26WMZ8fKHu}g2S>#VLm6O-J;kdT>e8EYfL
z!(6X^Z5etiwCQJ?-+$lRd*>(T&z}#NYwn}X>|XBE+v~M$)}&8OOsuolS<hNr@zqAl
z6sxSln73}L%zn1{<o3Vy-g*AKg~caly?u&G7dNbn_|n?p$Wiz4;}_4|)ZzAZ+gA%q
ziu8JIQcS2_%XSw3+smJv|1iMf%KP3vt(6n*2L-K~FfnS(v?-U`4|lk=JGsnQG{?|T
zTCy=!)7-Ls`*!ckOV5A!dB7*1>|FNSa`m35@bE7mPna-jZ%x<n8ErG#XS8qHlw+Hb
zzG1<FvKgHxy}i$WV)5bUpRf4jL;nlg9wdjw$A*QEF`YkgVpOivB3qTp)_ze{j%vYz
zl$g+Z7Y}nv=EDzV`42x_wxc05Cdn!}Iqcw($#ql5<SyEny5QrFKh9c^mGyCEl9g52
zadS`erON_Ve184<u5XqtpWAw%s7Rj_V-*>`cIN0QQ<_w1TB{@$wBi>$t>nOBH@CU|
zOP78A%||zOf3)kuT;Cpt#`nw|^_j6L>USMxU-R&2QEgbie!X^m(fX1(^(7yheeJny
z*|HU~{O)CQeG;N-PHd@Oyrt2xB!B<A5wlO9_V74$%r0GJJLB*S`~7(_g<pTPeA(w8
zt^8>BM?2=OY`ilnD%ZJd@-)+gX^Tr2gwH&5c*gP5r|ge)+O;^f+ZX2Lm$)8pKD*<i
zk3L%IGiZBh;ot-c-ZW~|o;9uKF7<609UUFLE-~G5hMRdyi><0SFSXpIzSErLR|c+C
zXKia7niwn>`JS+;qm|uY{`@ubqb>6n<{WCav&$+>DQRmm>z=#(;zi%t>%RK9ZSlsa
zF;S+b`{GmH;|o0gGZSFVnl<qS8{^_4e_fn!mG)j))9JZ$m-~3RPp`Gsl(;y?Wz<e?
zomP^$aCnord2?XisPGg@I4LH^s;G2P^C?fyuf1kp<Brf6_i?>h(Z{OvNXyKm_lC=_
zAw#&QPA<~s7o;uxDn0veoSfQc^^KoCozML$eqG>LUyz@lpR{52aC!dy^xWi`Vd|21
zE#D0bk507CbvSeFvrk#RfBa`>{zkW8L;c1L>abZ)i_65NNlRv0FPY>#+TFct%7~qb
zOgUFHE_QI3{d;>QrN!6h`OrUo{G}z6J~J`-jARVc<!<*RjM(?&<4>7AT|P3F{T}hB
z)4xZdKUa}I{B`@`DY1`)KRnlezxW4<{b31wUpX4fX$eiovPnSV*ilO3&*ND6+?4bb
z$Nq>vjKRd1Q09>5TH-{Wr$=H}i6tfOl(<p|i(y=<=^-`{3g#SZDsd-&jO8<u#G4Av
z6z;@<?oaWh1@UFiSc8IP73}NYqu^h6!|!5Ei7ky-Q{qmEF(uZNxKUzHiKis~lbF&k
zD2NzJO}rxUi^LnX3f7WXRN_mCM~%31kY{~)-dFJI6WnQO!81L_?Bo>0v8&mhdKg!!
zG{Q_`sCmRsl8hLNu|}gMj?og|4C5#Z_U&Y$BTgb_eS)DRF47PaY1G4*Qb){VsFm2K
zmN>GO7>U@17)N3oi7zF-k=RB<Y@^^Cjx$J4xjey@3jXE1NSq@vu%TlZTXqoNXgO9R
z29~(8mbk`JWkG%{6?`dijKsz7{Djzr_(ftECy8H3X7k*Ku_y7TALZcZ=Pt(olOOB)
z5%2g>E+pb<cg};v)PBV15~o|tA~v<4%qX{cudBtpS(KZ^supUNryNP{60b_qsEH9t
zT0Wmgd}>C#O5Ez_M+$m|TeVu^S<2ju@>WSAc6Fz`EiIWQDfm@I{Oa@s$NKS}AZQrR
z1`*S$Ng7g+mTipZe8_om(ve5vTvCvX-I+(ctKj}1=Bb&-Ia9DNW1UP(3~Z|BnDjy=
zX&%W;ui#-n71K^kyXz@G;#yJ=$;pptlElVNT&K#N0@r|_hFF*+@v+3k@}5C&U>Qr^
z<v1D0mw`B%G1rN_fAAwlmN;2WoGh`jmN?l@O<YX!lX#h=BdLj-HIj&(^&~CVm7b*K
z+LAcBnWRxSvkr-CEr=wswT`6aeTs%_PTp-8F*aZ9KWq56_`Z*O;f+^bd1c%<6O(b{
zm{3yB+GXCWFEhL$6R*Gg;)^f7{Q3*yo&**fx9Zh5I>RUbeDSN5uZ?<X^5n_RlV5tR
z^7Yr}y!dkG3*%l`{_4x&i|35``KY(~(9zME!O`KRmqz{k=Rbd&ZNB>2&tH1UY~8YT
zpT0E3$!A~2FMhG$tFOYHT;6{D)mK-&@yfVY-**0Bn#0@H6Jn>j{i^5wiWOGt*Ke@S
z4)|&r&ztMUnaqFN@7HD1y-GF|ZSlM~uwu2<TQ)YoeAE2Unl%rwoX<}hmRR-{)xY!3
z49|}&EC&AC%Esm`E2}lf-+pQGsMlUzHLiaN9zXt<1??>b+G7^0SFeBTz2Cg`)|<cH
zWoqi{@zSW*Uj2H}v9@#n@@26$Vej>o>({?!^PAti_uji{fl=|npT0ilwU<k^vp)X#
zi!Wx)otZkccKt6^zp>l&n>XLRQP@?JyXRM*zVO0|tNF7NXMU2b|Ha|UmT$hPvU~si
zP4AjjEL*ztO4B<ZX0Cd;a^*K?kDdAYR^!3X*R22L`|rO$_R+ejFTJ?<b@gk@AC%6I
zh{*Y}WaWzciyA&}GQY>?*3&;)vwPG_qg=gWU!m}K`0t!PFRT1$^XIb{4qCnY?z)Y-
z6!V2)adSSK)on6iyotU2<ZbV~6BIPJu65ChwU+B%F<F=1aQAe{FAA!=<s2_w+^PQ6
z%z3k;Lt?6ahK=Log#JtZ=~H<#K4kO5VdL@>H&@+Wwfv27^7q8?zkTI=@2}6lF#OPD
z(vx^(^xId)@vQqa=eH)~CQg|2tl+qbCKFiT-y-~3Up{s|e4cpr_ureJXFUz4EMMgD
zLE%H5V_s0YfBqcv6Xwb?#&eA6h_eebp9Z!l9zA*_9z1v`9u7ScLqiY6&_kw~_xSN+
z@%Ry#_lRX4i%0y8$2=F{p}2DOs<?RhyeKbg5=ncjM1F3KD6g#(ZQb3<J@{ih615Gd
zgeI;|Xrd2^ix;l3k0G(u$6jppauzn<#EP|RwPN`~t?<~MEi|RAqOs?)xP0Tfh)XCH
z?pyW3$0to#uZ<OZLu$mnynGRvT`U4)%SB9ao!GIjLRhaX5Xm|1!f@`kXu5P=MDMQ_
z>d15v80;(JQuc`$O{!>bJ1-iJw2RQB8nJnEuCQ93D(u#$2}i3;;k%<ml$^XMiqGE>
z^*0}hBLfhHO~*xiRH2C6(J0*Q4+ww13{hH9C8ATyMJ&G^`!WxTU7>km&5~r{?2;{F
z4t9y?Lsvw0*MP|H84&u@{bIXAidZ^thj4NB7tzrXqJX?d#Kw!b%xn?1S0}bRC5h0W
zTJh<mox)qwD1vg%i<G9jBE4%!ly%+_vEkJsJ~dCorDcn%+D38r?p>kF$`qcS-onk@
zLljh1i_*G!VYS9q*r+_kj?hdIvaeXgrd4s=2gD|;Z6aBlBg(1|i`KT2;tuO~b#;k@
z2M>w;`%{JMR#$Q0K$b{M)Cf1%t-?;VN!VK32q#BJ5uXq%viU4IDM1*@%f#*5w?$i9
zn>cmql(=>4mbiB9n&>>$shlk@UcAUP0`ZXR#cASC6*6#beK^rveE#8AV#eGBV(j#}
zV(k1GV!`aWV!ruwF-OJ=z7z{S|5ChdwL+}mO6>pbPZg4D_A}D7C#&;q#(z><=0g0$
z@MCf8#E-?pKcVh;mYqbBuZ7fQ$v$mXI*8TQ_G0V`Yx2KZ*srq|cI1DfjO{lGdz(!{
z#j^i5yqf;xr$W-aKcP=4v&k&~k0cpJlVqM3nK$zC7W2N(7-aoF6vm8_yS4IX%$`wW
z#+aD+@7Nh&vTJu>P_T)~m@&@0vvk|$zTLyq%iG7-&uaaKjn+0Q+f8=%4vw3hw*12q
zUal>-Sn<uuRjb$VGi3GYXLII$KJSY!=P&qb;UcreUr(AmW$HB3=^uRf(TtC0&YJzn
zFW-FY?O(m~FTZ~Gz2Ch5+wl`7{?GsQzsHVy>E%~m{rPLJ|Kbf3lfU`N-~ROP{@dUG
zgULVs(|`Zx|1s)k#&5}A|5uYAOMXU;df`Vej{YxWOve1^FaGkcOyqR_!7z-)|6q}C
zeQ2zweN~9DEHR8Hf25Rsejk2^xfUc7rKAw<tn)+oK>|NW;0Fo(N0ET>e97~kF-d^*
z_*=<X!1&zw`}x@T{Ex-5o-FfxFy<NK=bu0S+gMJ<#`L$9F+TtIj%D9QK1TLs%zr*_
zWIoU1N?jQb4GrP`{rd{>ob@~TBg>6U%eLijW8TQVzAf+h=f*O|c;xeuY00w;#=Mc`
zWm@vh^CG&tyK(yTY4DyBckbK)&y=`)`7*9txuT@+-Mgohm353kj#bvDO$~VN#Ely_
zaQ*sqr9Bx-x_R>^WZef39>6FYBQG+R?TzHg`0V+7+2_b|Qs$B*uafVwvNB|4WuZ{7
zM_pYV>S}9IUS5vsg9mZ)<VjE)4xZ7KI<lTj%RE{4=+UF7si}d%U_ePpi9*H2#Y$XV
zU5%!uW^{ITD&>u1k!_6RN2ZND$#EL_|F&4lOv>fz)vJn(d&olt`%X+sLYP_&-VY-r
zBm}|1!AMKdqOran-Dl3=($y=<e8{;veE2YUhm7RpWJE?rA}A;b0RaKv{WARh{o(6N
z^6|y)-MbJG5srj}1Vu(t78fpDP{v}MAIS%m&p5+Acvp_z-d=?-$)lXxk>inLlxstl
zt0!Oe4GlQi-i}VTTS-~P#%b8E4`^cr7Z(@o<yhp{jx;ypAm^l@pa3Z;DdZ_a;dSfQ
zt=PPIGaMWoU~lh$O`A3;WVguywzivKXK%;n4%q6lRT*PiTADKMqM{;HR8&CDPhnvp
zGBPrdnwpCJ`}ZR=GZU4Sl{j(Ygt8WmJj=CAJcM)S&Y`)f3F&MrHfA4k3-VFQ^;5z&
zwVVS#%Fo`;P9eV?{)mZ*K|*{y!b3tSS6{ffxnYab7V_+<@M=#U?d-_6oeC;j8^*Q@
z?<!lBl4oactCZVJnRt47KAodoyLNGYb}PTPZ}$Lo74Y=(#4hGZ8P(L(D*VcKN6tBI
z)sUB$hn(D8XvzDopg@-QLwqvV2-j$QVj_IJeW6m>A&%+bJ$vBb?1JrHUfAYJIXl=x
zMfuuF{>YQHY9p*|Y#48XwY5F$R4&+L?SxG>PO#m;`LNjxI~xaV+^`-tHr8;oXBj&Z
zV@Jo$*hYT+{rwQMI}jmzf)T>?st$`lVq5}pvvbhc*no@NPvm-+?^t?zx>DZPZwIz{
zc*B0PJ+``fAR#3KC(d0&@7;T-J8=rd74>L4*N5sO%?OW(ho?sXc~ZgALB%y<LtZw)
z!O<P=+alrN5eFZ?RQT^WfY9J#@{o^+utFs6%SUod5n`kB5Ehll@%zBedIKCdSCV%h
zA1`R)_Hn<+Lv76=v@{<fHR0H?<LKyULudC1oITg0tRKmLYiq0W4#_p`zHK}FyaV90
znR41h8FJoTef^*-uR>4%06MSULFbJ-sBAt4m5nV_8*Sj^xCJUJ6>O|F!`&kWA-jvn
zR}J<iH$k1!h`nh|*q70ay}BmE7q=t3x)WIj(!rC+tM5d8^94jlN5X0a*QMnS><$P;
zPIflx8;_x~p%n)YA4kK{lPEcK3=PM6aQfV3^j^3^*$?7A*UzzI$GE1Fm3Pvb>(bVF
z8<JA>aCGy9t<6T*Zrq5KtJWhrJ`*SU?%`}d>$IQYd*=nKHQQi5-ybt4yI{R-Je<QT
z;Sp7h$ebp`mb61%&<;&e7cwi(A^XTRWVT#IdizymAH9yMwi`Hf>MEKpTu0l<PFQ{(
zfaNpOu_w3)S$S2^mvtbg>;%ecdr@_y4@EWYsBP&&Q_CstLDzYeHT;c8(`6$nHV#g1
z?h3_db;v9|4ByZ+c(_Ht%OeP`TLWQZy$5-<9XL6750&jFU}qJJ>A&>DKaX06nG^gF
z5Z3_b&}xL}nvqz38v80wL0x(gd&|y2fAkKrI`3j{^G(Dw^<y97qEmw?JJE-X;}>wG
z>nt4R?Z?__MbPE;qW;7cv~*sBq47MbT6=M@?F=egIakL|;@qW+7<x4H^qUtJqs88Y
z3<QM6ATll$waq7RpzH|3_vInLCmr6~_Vb-fz{*8hESedI&5jkY+)#{}zmCBhW47ae
z{naYCx*tGrdNVvUO$g0CilF><xW=7>!=4KWD?EqXqxTVg>^8!W-^2d4dq`{>L~iFj
z=nnNkQ+*AGd-||zQ!XMrDv@7y7zt^m*b^ED-<=_F;X4_cl8C(gG8C0oqLlAMQ`<2N
z-WyQ9YuOcbh)&BzoURD8VMIamag-eEMOr}<eEI$bdgWk`V<C20>f!lK9z2)k!}^O1
zESjE#FW%XUS-<r{K&%0~vYO$a(TP2IC*had1Iyhfu*vr{4m96G=J7$qbPVFa*#Q)t
z9zb&20P;HrkeGi7;U!mb_(C5_^BTCn<iN>!Gxsj8V>>JE4IAOWeQc|vBmB94?%}sE
zmiu)fzvU-Sp1}1R*O6Jp@#dF8-_U~MmNsP9HzWPvF=SU9Lt?=}?2ar%@NPZABJvQO
zRLVKYgYWh{IB(vMjTVVmV;PTKDK*%oYk^Ne7XnMpU}td;LJwYmj_W3;^A-}0-Nb?J
z`>5y}Kxxka4s_f{PTO7RTkj#Ki|;{qFQNkTux4R69BjE3cd6mvvJ-aOcEXL{Om|mj
z?oH0z<D9UadrTO=H#s@^XlXeLO(FM%+y-b1TM$>!fJ{RZ;)?2!b*K*1!6Ake#&=?8
zR5rXqGU4Wz2J7|d{O+VfWxXGMAq9xZtHoZvt3efAP*<HtOm!a;j$B9jiF-)uxPy$Y
z0aRRkh_Xxfp+7gkF%2S{^N`<p9R}_trH9+`<+QC>{dpX$Ed$}~lz{aXq_x3t*&cwn
zIIitzHG=j8Vuz16c5qJ&4hlhLMi$ZzHDOmw0er&>;1;ZdTR;xnxliv&F2(M>1zdZ1
z2-Rj|oBsjWQsy=)Emki+fKMjHWA>ylem6>xR@#R2I<A$Ymyy|g2|2A-kWHi4jMMj!
zes&N!XYZln!UI%Y8ba}fyEwqKuJ;~FDEqpLw~&%liO=8k!~D0kFq;$&^I3bbW_B7@
zf0}@G98YpeAxaJ9sIBAKk>|e@o&{oJV|cF2L||ktT%9S?6<XMD)M3>(T9_|Q#qy;o
zu-}r4wHqks&Dn6+mWAcZld<HpJbd|KGM3HOV%eN1`189ISKiFE(ha@bPg>6N-MkL{
z+1sQ+6!s0F^vVO&U4Do|q}nS3D7!X<!t=LK*?j|5J(o~cQUkSD7QAe9@V70)wsi)W
zzn6)xUd@8}XBup@4u!2_5ZpY&5TBHVQ>S{+-f>)^u((Qi`ewpuT{2V)_hZ#3<ZWsS
zmQ7BE`A3XD*^i}^gB73Ie3=UC1^cmeT?T?&^Pt|D4Si(`@>@Glc$8=D)0dEU{3;Hd
zxQ>F}+bFwwABG!4IDGptj^B8M+FOs%GQe?g3>CfPy}J+X*RJ3w_s6{KY8*(bL|jxk
z-{TfU?rMP7s!FV-yjCxb!_ozDSU7hN+}vZ4SIF<_*$cRN=N7bwFCewy48pQ%v2{l_
zY}cj0@tZWbEKh~Ac`6*t65+a13va7*xUEV+z_uI&2kNnVR|UTdC0J>h26fU=RJ5H%
zaa%9SyKbTIbUzAv`=P&b7v=r@#@~K~;~YZ+)3yC~QF87E482#;+;bi3=mhKv4nlfP
zAu0|YMRiRF_s=4fQ7$#rEzqUcATF#40S;BLH7n*=_QTa95!=0k(cOCyakVFqa`+^)
z^`}VPh(6eg(1I3tYYo`sor-O{bFpJ@5%%fous5d?G5LoOlv0j0oCC8(MVR*6{aC*y
z50%Hy;OMnMu7?{aIn$5oOZU*yKZN7AhRFW|G+e)nqjw*m{@QhvbzQ)zTLVbTticy^
z*1*%<4MBmy$js64yx4@6);1ifX+&;5-@WiqM5*^7zn}y~C5I8<R}AY7iEwlcM@&*W
z_GT4gUv3#<3J)Q+_z1Lh#}QZ6id~6SP#3pAU2+`0@m1J!pbFZ9O*{)UA~?=~)fPEC
zI}~Bv!b12u=Axwh6cY1}VW+kM84Z1?xo{gtZrnxdtp_;Ve+TV%?or;CVfKwHd?Ipj
z_WDii@z27_<y+yh#Q`o3F7W1gHe^o-Xyl8~kRWVz_kyhx&&`25h(Qdve(Nf(5qn;^
z(2u(Mqg+G12;Lip-BIC`aU^!^+lSy}4LpLAv2m3K2?ez{aI6EFT-$+JM-WVT`9>GR
z!IOO37GcT4T&R|(BPOI6y1Wj!dDkHPz$xS(y@J~Fx6yKY5KWYO=Z*X5x^xR3-Vs=0
z#&fts7OEP1keyryJ4^0|JBb~fo#DL28LqBwJo~!B*<~~LIv=dt5Q-#i2D-aWV{qX9
z6NvrT2(_^*lHZF6KkN+kM?m;a1VxANY#syKFY<^3vJkFIMR-mD_M|qzH?9o62^Fw%
z$iP~z84JG4JGSN{BeM}93H8{wzZ)q$`&68}ifXR^roLM^cI_tG&R-_Zyog<4@$m9W
z#!8F*NXcwNRZ%-U9h2c55(!O`Mmg(;hVDT`xEj&1YB)RZ!;&u(`97CoVBqdktUoj)
zF~2+mJ>q`9725(_;Th-w?;sEO1^dHM6%D6ldbm0yLA7Ns>^)LoxhWE6=861Wj@9P5
zFq@H%Eo)M_UmSvOa5;8pYLUiwsk-MX%FkZGLB@x<zchAr<LIeVJaaulhQ0_Pd%4H0
ziHGZUzN7lHQ17mW%3cGX$Q0z1=y8yHd{t!~3W|#1?vjti9~WX5zdiE2`4sOyCXOdP
ze)JeCZI)xL{YtEJTn&|rHMV(f=b1hLYv!lIZAmE>OpnEfQzP+(sRkdvrNP`uNmwx}
z9otm~gzw-tE-V*&((4ghd7S%xFN)fGQF^==jU8vvdG<W|d5<B3?EB8$J4nke!KN(<
zSg||>{@w?Xk-&GxrUA>$wb&Yv0T-`SthS24hIQOCXBJ}K_#7l?3`!f1DDOw)d1Tlb
z;)~!&;?0O1@DK8XtB(_9y%uYhM8bMbCVbX&y?>n!$FFkXVv&dK8#1uVQwKjEEivYP
z1SjSqrLGG54>cg=;9+Ffw4$2$=JM6+c=&*KG4lR{yi5LNpybeV{tEUc7UOI4aBSI7
zim0GE1i3ZA)}jm>%!;saehI9<s>D~*Ghw|d4QKh@8}Ec3Q>ksd3zG53aGz_c@7g6C
zY^+C2VkTCu+=aDEqPfPii3Q?euZn`t_IOy??Si8x#~c%hh@=EW#U~?4mxHX5Dzu$G
zg<D*!4|zr(Vte<={{zxv(xah=7~r`V7(&~bE~J%Jz<Wm)Hdv=%ofYR}XF0zqS=h8*
zi{*>LuyXZI)VCfR9yP~r<a;E~$~_S0g*toXIhUCduHNj&#VZ%k(Rmu0{RfB#(uvi&
zaqh|`)EzmBQ)kcNXlDnG@*LZI^cYTbbnwn=_#R6(Aln`8k9U0XKgvpyTm$mnz!(OG
z28gR#5vd_A&NiT+su5ZF2ca*lrQFXe^ENbef4DB!j%;IOFt%%qAB~u6PPXivIFs-C
zlWGqh4KRCnEsShOrezy)ofzAaF@O9{G2>X|_#SdT9<cl!V%f{LZ%|g<=(}`<W0(8n
z@O`A*XC6I%z-FX8WOL8%DUE&7HbUX^A!B8(8O!;Wa*`NdxxagG9|OGe8sb<UFz*5H
zyClhZGnP~4lI_db*!IY=7}LhN8G85tcLxW!H$Grn?1wzx=iYda@BHAvJ*D4AkNCzY
zGBM8Q@5<x(e&kq`{$(tAQHXLSPjc?%p7ofMq5M|L43}4A&Bly88e?T3BmNlkWh{An
zNRlE|))i$vB>9zl4F8w0Bo<ZLHS#*5x$jK={wTk*=+g(1r+;1e{d#hpJqyF>?`mG@
zmqkX(Mh<%9@9&eA{Ta&{)6aMqP8py7YvS)}^Z7phfBO9&MGyA_A3sRo2MPS=lfdv^
zX|yZ-<MDq!3H@m!{!`_trQzXNb}?+nMdMnA=k2)0GS8Is)Q*dFeh5EEV59`(dFuJ_
zU1zM3<-V)T$o!GzN2ZN^j*LgvGv<%1Bhxb9h#|hKjIqx1?TxHwd}eIZ_*=$Ozc2Ov
zQdfSRb|BJ*<HAMWxjxbT%Q7-ZY$R<T<a22kVzdqE@9%$VBVcUT*tb&g$sgl0V=S?h
zw87}V(T_&j5J=kx`pGH!`}DMQ9H+kW2C=a$BkdI$8ygkfcT!TaqL1IVZy)uc(Tbj2
z+5*t_S+PMe+GogEjzRJ#+mQW9z9jCHByAX^PPc}7u49Z#N=p=b3tL-T?4S)rd3ibS
zMr)wU($O9xQqkLQ-t0)-j2(5p)H|^p9ou2&V9WcjEs8xu_JM50zM-_FRIx{hr_DtY
z$5mQdinC|WDl(L|70u1fioHp)HU)u!dr($Uso1V~xKpp}=MQ(<2<!~lMV+Px_1v_B
zV1L#&8>siTp+4D;`Yz^KGbYg{92+)RQLk-Jn~N>jy44ll-d^yhor1K(2nq~DDs3X#
z+uIcxNSlrD@NnwC{opKZFKCl+KwpC67cRm;J#sU3ocrQZsDGp`%6=m@scfj{@#TFW
z_3S%na}bzI{Z0X*_Ud`xS44erF6Fit4x4P@VCTU80w{w#)YR4}b9SWpC{CR2q#eLT
z1!FgGu6NV!fi}qS-xUU@t=q7E{W|#X4#n~F*Kv6Wh>DKI+LeyHQ`}13dL;bR)!3JH
z6#MkNb1yuN^y+iSXu5>#mdhwRb{WTce;KRZ4~tJjpoz~%Wo<hu8hUW3`5X*~JJH^G
zfoouZ^ZyX3Svl-01nxdNkX2lZ-Qm=yYzxH(D?fPnX2a0l2QSZDy!m%dnDQ3yDx>S+
zpK=&6Whb$lI^Xz;OVCkY7S(za@kei?u>B^Ac?X$B9lq+*0_sgKP?voQnMFrXP=6c;
zo7-`syBh<%yO1G1OOL1&9S)S&pzLTD;!>;O@5%c&+kDu4l?l5gxmY|S4Zrz&FRZtT
z!=BuB?ACQ)d)g_e0(y{IcMEat14un}4;d#1k=b|?aTQm2&wLsQ5qTV2Fz3}pu}5)p
z--f7&C?uz+p_T8`0Ph--3Tu#IXn_7m8?tJTBCDzyk=i1JhUG&Yqo>}EdM>9-sMaOH
zH?kOk)E5R6pFv=0FOm-5K*otX&~*=jzNoy%q<)aP&*HPUpet^`dh-x$*%E-w&cSeS
z<@)pX;JdLEZd{XlqoQ%Jn!1C$8U$;2j~iWtov|edPcKEpe%@QBWMhkOI&7$~Tr?*I
zOBco=HnX032HsU4zNpv~WKuVu+D*L}^?HVj_mSPp{(J6FXVwodmlVu-BMhtOYq09m
z6s-O_jO$nneQ^P@GSb+8l=3d_49SN5`Xp>HPl5Rt$yh$0`utUySVujJ<u|EV`bj!g
z&*dGf&3>d-HY30NEOL+cDZ08s>O@Pg4x#SqL+V$CP)WU4F?BFaeK$~)U5DMyIoPp<
z`keX2Sn_@*R(})4_m=vTI32pU271q*K~mLeM5NX8-d_i6bL#vTq+-K7>RFa)slQ5v
zw__H91B&6{u18R8Eet1mQPE8uRX1%BF5gAXt%o>v^AVZ`sAr?CNzM72$S$rxN@^wy
z)lJARZsMI@D>CBivD>2@o0jEZ&2s9l_9UbEcsmlPyGp6=Kr(GgG>6)-Gp!2VQ6&iA
zoM;LTA-Sv$PTLDG=i^+gSg4~7%US9<E}-D#H5|D<h?bkQ<+=9&m8Z`mwWb-(otLqC
zxihwKZ;a8zp^Ua(h1`!LdFL8VyR(|w!#I%Df`HwbNXa;WkeIy)jMZ?yd8bSr<u;FO
zq|t^Yw)z;t^BS370c)p1Ed4SEA)bXu-rq`H49C<)8<HFMIQIKEb@ev3x<z8WDh}0$
zy5VNO2Oitq;7l7E`pr<c;*8anUQpBS=jydS<-L=aSMnR?AI`lo#E1HRKWy6`0Y~#}
z_(vpSXHqtt0}J5jUyNm6^KSQ>OzhiRg^<J}(AAtn<+<yqr#`Tmc1ovvFCZi;1y<`*
zke1$#eW9h;zB>|$sqwTuOG9cV?}@1&jtDmJ8_v7S2lAUUq<qg;*{+}-VHIp$Ho(r&
z4K|C@VZA65Uw*n5UrddI`6rpMr%oiuo4WC&Drl<OP(*z}IrWz9Jr{6=-(PvBccSMs
zZ3ei0R5^$bZ-uLE2|TD%51@U4r)v%tOyM3)I~N%q@*dFmO)jr4h2dZs^rd{BsK%y^
z5wQFs5nH~=fIW2$Th_;6%hpJE1;!#$r$b^%Ir3_n(0%>_hVE0J^W;n-+r547E~1k3
zij9H0V+kDAmtfrz9n3yX##-71T%^r_yoZ!`mBw>~tT!^8xp)qTYFm)BzmWRgLujOJ
zMtMyG4!5<S?(h+`wRhkaztu9xJ5D)v*_ON$ekAW9`QN!qmywuJj@bRBpuarQGYr)E
zos~77j@x+dFn<3>>MCU0<WfcqkB6h@{tn-7J{yO;UslHTWPA_E$2Fc;255I=Y{NL`
z!+k%yE0$d-_qS4(Jc~TwIHZnD-Z{&0(Z5g8r5JfM^8RhHl!<abJv7XZQdhR4+$I0+
z-K23y%rz$eZR79JtQ>>v{@cd#$MPhzO8qDCA1nXt`LlW>vA_@M|9ld7e!>5HOW^tb
zEa`$amYojYV@S`y-@nI@*A`<*#(NCYVYfBr{KpCM-ICvw=fk(<$+B`kGJb>PZ)1=+
zjJ~T+@te$-{s{D6r5$dEV*fm%_|tuZ{<7%m>H_^`i5XLs?>_xyk(j6f{bgy(Ogm>{
zBl^pN{<5IIEa)!_`pYVKkiNRabl$Wx@}MrX8uZnrovSTzi6`i*3;ODUzPg~VF6gTZ
z`s#wdx}dMFf_LdF4EhR#zQUldFz71``U-=-!l17(=qn8R3WL7Fpsz6KD-8MygTBH_
z|MXP`eU(99WzbiddiZ3X39~_8Wzbg{^i>9Zl|f%+&{rAsRR(>PiFqSHUuDo&ns)KI
zpszIOD-HTegTB(BuQcc@4f;xhzS5wtH0Uc0`bvYo(x9(2=qnBSYJ<MoJd2fszS^{j
z;kj#N0qCm@`f7u|+MusC=&KF-YEusTc)m*oeYHVfZO}&?^brSr#6cf%&_|qSux!vr
z9P|+feZ)Z@anMJcSd(^hYhytlapSauzUiQEI_R4Y`lf@v>7Z{q=$o#{R~D4tWcsJm
zPMbE4(T8}RxTdTj`lvr`=erW}`}*uN_e>9M{3gh?C`mb+@!M(q<{HlzO8;`*@)<v|
zd@jpBTepAiH__<d`ls??toJo5O21d&$6~hlh_qZx7iMAsy}Rc>Y4n{D|9-ICjYf-i
zSVjJ81@d1T=I%81$uIt!O`~`lJN!%j%Lgw!DLGb1|JxruDal_f^Wu||V};xc<qr6N
E0E3frQ2+n{

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/config/axtls.rc b/trunk/package/luci/libs/nixio/axTLS/config/axtls.rc
new file mode 100644
index 00000000..0f288aa9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/axtls.rc
@@ -0,0 +1,32 @@
+//Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#undef APSTUDIO_HIDDEN_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE 9, 1
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+
+IDI_AXTLS       ICON         "../www/favicon.ico"
+
+
+#endif
+/////////////////////////////////////////////////////////////////////////////
+
+
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/config.h b/trunk/package/luci/libs/nixio/axTLS/config/config.h
new file mode 100644
index 00000000..0f861f34
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/config.h
@@ -0,0 +1,113 @@
+/*
+ * Automatically generated header file: don't edit
+ */
+
+#define HAVE_DOT_CONFIG 1
+#define CONFIG_PLATFORM_LINUX 1
+#undef CONFIG_PLATFORM_CYGWIN
+#undef CONFIG_PLATFORM_WIN32
+
+/*
+ * General Configuration
+ */
+#define PREFIX "/usr"
+#undef CONFIG_DEBUG
+#define CONFIG_STRIP_UNWANTED_SECTIONS 1
+#undef CONFIG_VISUAL_STUDIO_7_0
+#undef CONFIG_VISUAL_STUDIO_8_0
+#define CONFIG_VISUAL_STUDIO_7_0_BASE ""
+#define CONFIG_VISUAL_STUDIO_8_0_BASE ""
+#define CONFIG_EXTRA_CFLAGS_OPTIONS "-fpic"
+#define CONFIG_EXTRA_LDFLAGS_OPTIONS ""
+
+/*
+ * SSL Library
+ */
+#undef CONFIG_SSL_SERVER_ONLY
+#undef CONFIG_SSL_CERT_VERIFICATION
+#undef CONFIG_SSL_ENABLE_CLIENT
+#define CONFIG_SSL_FULL_MODE 1
+#undef CONFIG_SSL_SKELETON_MODE
+#undef CONFIG_SSL_PROT_LOW
+#define CONFIG_SSL_PROT_MEDIUM 1
+#undef CONFIG_SSL_PROT_HIGH
+#undef CONFIG_SSL_USE_DEFAULT_KEY
+#define CONFIG_SSL_PRIVATE_KEY_LOCATION "/etc/nixio/rsa_main.der"
+#define CONFIG_SSL_PRIVATE_KEY_PASSWORD ""
+#define CONFIG_SSL_X509_CERT_LOCATION ""
+#undef CONFIG_SSL_GENERATE_X509_CERT
+#define CONFIG_SSL_X509_COMMON_NAME ""
+#define CONFIG_SSL_X509_ORGANIZATION_NAME ""
+#define CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME ""
+#undef CONFIG_SSL_ENABLE_V23_HANDSHAKE
+#undef CONFIG_SSL_HAS_PEM
+#undef CONFIG_SSL_USE_PKCS12
+#define CONFIG_SSL_EXPIRY_TIME 24
+#define CONFIG_X509_MAX_CA_CERTS 4
+#define CONFIG_SSL_MAX_CERTS 2
+#define CONFIG_SSL_CTX_MUTEXING 1
+#define CONFIG_USE_DEV_URANDOM 1
+#undef CONFIG_WIN32_USE_CRYPTO_LIB
+#undef CONFIG_OPENSSL_COMPATIBLE
+#undef CONFIG_PERFORMANCE_TESTING
+#undef CONFIG_SSL_TEST
+#undef CONFIG_AXHTTPD
+#undef CONFIG_HTTP_STATIC_BUILD
+#define CONFIG_HTTP_PORT 
+#define CONFIG_HTTP_HTTPS_PORT 
+#define CONFIG_HTTP_SESSION_CACHE_SIZE 
+#define CONFIG_HTTP_WEBROOT ""
+#define CONFIG_HTTP_TIMEOUT 
+#undef CONFIG_HTTP_HAS_CGI
+#define CONFIG_HTTP_CGI_EXTENSIONS ""
+#undef CONFIG_HTTP_ENABLE_LUA
+#define CONFIG_HTTP_LUA_PREFIX ""
+#define CONFIG_HTTP_LUA_CGI_LAUNCHER ""
+#undef CONFIG_HTTP_BUILD_LUA
+#undef CONFIG_HTTP_DIRECTORIES
+#undef CONFIG_HTTP_HAS_AUTHORIZATION
+#undef CONFIG_HTTP_HAS_IPV6
+#undef CONFIG_HTTP_ENABLE_DIFFERENT_USER
+#define CONFIG_HTTP_USER ""
+#undef CONFIG_HTTP_VERBOSE
+#undef CONFIG_HTTP_IS_DAEMON
+
+/*
+ * Language Bindings
+ */
+#undef CONFIG_BINDINGS
+#undef CONFIG_CSHARP_BINDINGS
+#undef CONFIG_VBNET_BINDINGS
+#define CONFIG_DOT_NET_FRAMEWORK_BASE ""
+#undef CONFIG_JAVA_BINDINGS
+#define CONFIG_JAVA_HOME ""
+#undef CONFIG_PERL_BINDINGS
+#define CONFIG_PERL_CORE ""
+#define CONFIG_PERL_LIB ""
+#undef CONFIG_LUA_BINDINGS
+#define CONFIG_LUA_CORE ""
+
+/*
+ * Samples
+ */
+#undef CONFIG_SAMPLES
+#undef CONFIG_C_SAMPLES
+#undef CONFIG_CSHARP_SAMPLES
+#undef CONFIG_VBNET_SAMPLES
+#undef CONFIG_JAVA_SAMPLES
+#undef CONFIG_PERL_SAMPLES
+#undef CONFIG_LUA_SAMPLES
+
+/*
+ * BigInt Options
+ */
+#undef CONFIG_BIGINT_CLASSICAL
+#undef CONFIG_BIGINT_MONTGOMERY
+#define CONFIG_BIGINT_BARRETT 1
+#define CONFIG_BIGINT_CRT 1
+#undef CONFIG_BIGINT_KARATSUBA
+#define MUL_KARATSUBA_THRESH 
+#define SQU_KARATSUBA_THRESH 
+#define CONFIG_BIGINT_SLIDING_WINDOW 1
+#define CONFIG_BIGINT_SQUARE 1
+#undef CONFIG_BIGINT_CHECK_ON
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/linuxconfig b/trunk/package/luci/libs/nixio/axTLS/config/linuxconfig
new file mode 100644
index 00000000..614fdd80
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/linuxconfig
@@ -0,0 +1,119 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+CONFIG_PLATFORM_LINUX=y
+# CONFIG_PLATFORM_CYGWIN is not set
+# CONFIG_PLATFORM_SOLARIS is not set
+# CONFIG_PLATFORM_WIN32 is not set
+
+#
+# General Configuration
+#
+PREFIX="/usr/local"
+# CONFIG_DEBUG is not set
+CONFIG_STRIP_UNWANTED_SECTIONS=y
+# CONFIG_VISUAL_STUDIO_7_0 is not set
+# CONFIG_VISUAL_STUDIO_8_0 is not set
+CONFIG_VISUAL_STUDIO_7_0_BASE=""
+CONFIG_VISUAL_STUDIO_8_0_BASE=""
+CONFIG_EXTRA_CFLAGS_OPTIONS=""
+CONFIG_EXTRA_LDFLAGS_OPTIONS=""
+
+#
+# SSL Library
+#
+# CONFIG_SSL_SERVER_ONLY is not set
+# CONFIG_SSL_CERT_VERIFICATION is not set
+# CONFIG_SSL_ENABLE_CLIENT is not set
+CONFIG_SSL_FULL_MODE=y
+# CONFIG_SSL_SKELETON_MODE is not set
+# CONFIG_SSL_PROT_LOW is not set
+CONFIG_SSL_PROT_MEDIUM=y
+# CONFIG_SSL_PROT_HIGH is not set
+CONFIG_SSL_USE_DEFAULT_KEY=y
+CONFIG_SSL_PRIVATE_KEY_LOCATION=""
+CONFIG_SSL_PRIVATE_KEY_PASSWORD=""
+CONFIG_SSL_X509_CERT_LOCATION=""
+CONFIG_SSL_GENERATE_X509_CERT=y
+CONFIG_SSL_X509_COMMON_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME=""
+CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
+CONFIG_SSL_HAS_PEM=y
+CONFIG_SSL_USE_PKCS12=y
+CONFIG_SSL_EXPIRY_TIME=24
+CONFIG_X509_MAX_CA_CERTS=4
+CONFIG_SSL_MAX_CERTS=2
+# CONFIG_SSL_CTX_MUTEXING is not set
+CONFIG_USE_DEV_URANDOM=y
+# CONFIG_WIN32_USE_CRYPTO_LIB is not set
+CONFIG_OPENSSL_COMPATIBLE=y
+# CONFIG_PERFORMANCE_TESTING is not set
+# CONFIG_SSL_TEST is not set
+CONFIG_AXHTTPD=y
+
+#
+# Axhttpd Configuration
+#
+# CONFIG_HTTP_STATIC_BUILD is not set
+CONFIG_HTTP_PORT=80
+CONFIG_HTTP_HTTPS_PORT=443
+CONFIG_HTTP_SESSION_CACHE_SIZE=5
+CONFIG_HTTP_WEBROOT="../www"
+CONFIG_HTTP_TIMEOUT=300
+
+#
+# CGI
+#
+CONFIG_HTTP_HAS_CGI=y
+CONFIG_HTTP_CGI_EXTENSIONS=".lua,.lp"
+CONFIG_HTTP_ENABLE_LUA=y
+CONFIG_HTTP_LUA_PREFIX="/usr/local"
+CONFIG_HTTP_LUA_CGI_LAUNCHER="/bin/cgi"
+# CONFIG_HTTP_BUILD_LUA is not set
+CONFIG_HTTP_DIRECTORIES=y
+CONFIG_HTTP_HAS_AUTHORIZATION=y
+# CONFIG_HTTP_HAS_IPV6 is not set
+# CONFIG_HTTP_VERBOSE is not set
+# CONFIG_HTTP_IS_DAEMON is not set
+
+#
+# Language Bindings
+#
+CONFIG_BINDINGS=y
+# CONFIG_CSHARP_BINDINGS is not set
+# CONFIG_VBNET_BINDINGS is not set
+CONFIG_DOT_NET_FRAMEWORK_BASE=""
+# CONFIG_JAVA_BINDINGS is not set
+CONFIG_JAVA_HOME=""
+# CONFIG_PERL_BINDINGS is not set
+CONFIG_PERL_CORE=""
+CONFIG_PERL_LIB=""
+# CONFIG_LUA_BINDINGS is not set
+CONFIG_LUA_CORE=""
+
+#
+# Samples
+#
+CONFIG_SAMPLES=y
+CONFIG_C_SAMPLES=y
+# CONFIG_CSHARP_SAMPLES is not set
+# CONFIG_VBNET_SAMPLES is not set
+# CONFIG_JAVA_SAMPLES is not set
+# CONFIG_PERL_SAMPLES is not set
+# CONFIG_LUA_SAMPLES is not set
+
+#
+# BigInt Options
+#
+# CONFIG_BIGINT_CLASSICAL is not set
+# CONFIG_BIGINT_MONTGOMERY is not set
+CONFIG_BIGINT_BARRETT=y
+CONFIG_BIGINT_CRT=y
+# CONFIG_BIGINT_KARATSUBA is not set
+MUL_KARATSUBA_THRESH=0
+SQU_KARATSUBA_THRESH=0
+CONFIG_BIGINT_SLIDING_WINDOW=y
+CONFIG_BIGINT_SQUARE=y
+# CONFIG_BIGINT_CHECK_ON is not set
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/makefile.conf b/trunk/package/luci/libs/nixio/axTLS/config/makefile.conf
new file mode 100644
index 00000000..9f9db133
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/makefile.conf
@@ -0,0 +1,127 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# A standard makefile for all makefiles
+#
+
+# All executables and libraries go here
+STAGE=./_stage
+
+ifneq ($(MAKECMDGOALS), clean)
+
+# Give an initial rule
+all: 
+
+# Win32 
+ifdef CONFIG_PLATFORM_WIN32
+
+ifdef CONFIG_VISUAL_STUDIO_7_0
+CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_7_0_BASE))
+export INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\include;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\platformsdk\include")
+export LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\lib")
+PATH:=$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/vc7/bin:$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/common7/ide:$(PATH)
+else 
+ifdef CONFIG_VISUAL_STUDIO_8_0
+CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_8_0_BASE))
+export INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\include;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\include")
+export LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\lib")
+PATH:=$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/vc/bin:$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/common7/ide:$(PATH)
+stuff:
+	@echo $(INCLUDE)
+endif
+endif
+
+CC=cl.exe
+LD=link.exe
+AXTLS_INCLUDE=$(shell cygpath -w $(AXTLS_HOME))
+CFLAGS+=/nologo /W3 /D"WIN32" /D"_MBCS" /D"_CONSOLE" /D"_CRT_SECURE_NO_DEPRECATE" /FD /I"$(AXTLS_INCLUDE)crypto" /I"$(AXTLS_INCLUDE)ssl" /I"$(AXTLS_INCLUDE)config" /c 
+LDFLAGS=/nologo /subsystem:console /machine:I386
+LDSHARED = /dll
+AR=lib /nologo
+
+ifdef CONFIG_DEBUG
+	CFLAGS += /Gm /Zi /Od /D "_DEBUG"
+	LDFLAGS += /debug /incremental:yes 
+else
+	CFLAGS += /O2 /D "NDEBUG"
+	LDFLAGS += /incremental:no 
+endif
+
+else    # Not Win32
+
+-include .depend
+
+CFLAGS += -I$(AXTLS_HOME)/config -I$(AXTLS_HOME)/ssl -I$(AXTLS_HOME)/crypto
+LD=$(CC)
+STRIP=strip
+
+# Solaris
+ifdef CONFIG_PLATFORM_SOLARIS
+CFLAGS += -DCONFIG_PLATFORM_SOLARIS
+LDFLAGS += -lsocket -lnsl -lc
+LDSHARED = -G
+# Linux/Cygwin
+else 
+CFLAGS += -Wall -Wstrict-prototypes -Wshadow
+LDSHARED = -shared
+
+# Linux
+ifndef CONFIG_PLATFORM_CYGWIN
+# CFLAGS += -fPIC 
+
+# Cygwin
+else
+CFLAGS += -DCONFIG_PLATFORM_CYGWIN
+LDFLAGS += -enable-auto-import
+endif
+endif
+
+ifdef CONFIG_DEBUG
+CFLAGS += -g
+else
+LDFLAGS += -s
+ifdef CONFIG_PLATFORM_SOLARIS
+CFLAGS += -O 
+else
+CFLAGS += -O3
+endif
+
+endif	# CONFIG_DEBUG
+endif   # WIN32
+
+CFLAGS+=$(subst ",, $(strip $(CONFIG_EXTRA_CFLAGS_OPTIONS)))
+LDFLAGS+=$(subst ",, $(strip $(CONFIG_EXTRA_LDFLAGS_OPTIONS)))
+
+endif   # not 'clean'
+
+clean::
+	-@rm -f *.o *.obj core* *.out *~ \.depend vc*0* 
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/makefile.dotnet.conf b/trunk/package/luci/libs/nixio/axTLS/config/makefile.dotnet.conf
new file mode 100644
index 00000000..9cff4fdd
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/makefile.dotnet.conf
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+ifneq ($(MAKECMDGOALS), clean)
+
+ifdef CONFIG_PLATFORM_WIN32
+GO_DOT_NET=y
+endif
+
+ifdef CONFIG_PLATFORM_CYGWIN
+GO_DOT_NET=y
+endif
+
+ifdef GO_DOT_NET
+all: test_dot_net_location
+
+# find out where the C# compiler is
+CONFIG_DOT_NET_FRAMEWORK_BASE:=$(shell cygpath -u $(CONFIG_DOT_NET_FRAMEWORK_BASE))
+
+test_dot_net_location:
+	@if ! [ -d "$(CONFIG_DOT_NET_FRAMEWORK_BASE)" ]; then \
+		echo "*** Error: .NET path of $(CONFIG_DOT_NET_FRAMEWORK_BASE) doesn't exist" && exit 1; \
+    fi
+
+PATH:=$(CONFIG_DOT_NET_FRAMEWORK_BASE):$(PATH)
+
+else        # Linux?
+all: test_mcs
+
+test_mcs:
+	@if ! mcs --about > /dev/null 2>&1; then \
+        echo "Mono not installed! - go " \
+        "to http://www.mono-project.com/Main_Page" && exit 1; \
+    fi 
+
+endif   # Linux
+
+endif   # not 'clean'
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/makefile.java.conf b/trunk/package/luci/libs/nixio/axTLS/config/makefile.java.conf
new file mode 100644
index 00000000..9b224629
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/makefile.java.conf
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+ifneq ($(MAKECMDGOALS), clean)
+
+ifdef CONFIG_PLATFORM_CYGWIN 
+CFLAGS += -I"$(CONFIG_JAVA_HOME)/include"
+CFLAGS += -I"$(CONFIG_JAVA_HOME)/include/win32"
+JAVA_BIN:=$(CONFIG_JAVA_HOME)/bin
+else
+
+ifdef CONFIG_PLATFORM_WIN32
+CFLAGS += /I"$(shell cygpath -w $(CONFIG_JAVA_HOME)/include)"
+CFLAGS += /I"$(shell cygpath -w $(CONFIG_JAVA_HOME)/include/win32)"
+JAVA_BIN:=$(shell cygpath -u $(CONFIG_JAVA_HOME)/bin)
+else # Linux
+CFLAGS += -I$(CONFIG_JAVA_HOME)/include
+
+ifdef CONFIG_PLATFORM_SOLARIS
+CFLAGS += -I$(CONFIG_JAVA_HOME)/include/solaris
+else
+CFLAGS += -I$(CONFIG_JAVA_HOME)/include/linux
+endif
+
+JAVA_BIN:=$(CONFIG_JAVA_HOME)/bin
+endif
+endif
+
+PATH:=$(JAVA_BIN):$(PATH)
+
+endif   # not 'clean'                    
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/makefile.post b/trunk/package/luci/libs/nixio/axTLS/config/makefile.post
new file mode 100644
index 00000000..033981c4
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/makefile.post
@@ -0,0 +1,19 @@
+
+ifneq ($(MAKECMDGOALS), clean)
+ifndef CONFIG_PLATFORM_WIN32
+ifndef CONFIG_PLATFORM_SOLARIS
+# do dependencies
+-include .depend
+all : .depend 
+.depend: $(wildcard *.c)
+	@$(CC) $(CFLAGS) -MM $^ > $@
+endif   # 'not' solaris
+endif   # 'not' win32
+
+ifdef CONFIG_PLATFORM_WIN32
+OBJ:=$(OBJ:.o=.obj)
+%.obj : %.c
+	$(CC) $(CFLAGS) $< 
+endif   # win32
+
+endif   # end of 'not' clean
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt
new file mode 100644
index 00000000..493749b3
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt
@@ -0,0 +1,255 @@
+Introduction
+------------
+
+The configuration database is collection of configuration options
+organized in a tree structure:
+
+	+- Code maturity level options
+	|  +- Prompt for development and/or incomplete code/drivers
+	+- General setup
+	|  +- Networking support
+	|  +- System V IPC
+	|  +- BSD Process Accounting
+	|  +- Sysctl support
+	+- Loadable module support
+	|  +- Enable loadable module support
+	|     +- Set version information on all module symbols
+	|     +- Kernel module loader
+	+- ...
+
+Every entry has its own dependencies. These dependencies are used
+to determine the visible of an entry. Any child entry is only
+visible if its parent entry is also visible.
+
+Menu entries
+------------
+
+Most entries define a config option, all other entries help to organize
+them. A single configuration option is defined like this:
+
+config MODVERSIONS
+	bool "Set version information on all module symbols"
+	depends MODULES
+	help
+	  Usually, modules have to be recompiled whenever you switch to a new
+	  kernel.  ...
+
+Every line starts with a key word and can be followed by multiple
+arguments.  "config" starts a new config entry. The following lines
+define attributes for this config option. Attributes can be the type of
+the config option, input prompt, dependencies, help text and default
+values. A config option can be defined multiple times with the same
+name, but every definition can have only a single input prompt and the
+type must not conflict.
+
+Menu attributes
+---------------
+
+A menu entry can have a number of attributes. Not all of them are
+applicable everywhere (see syntax).
+
+- type definition: "bool"/"tristate"/"string"/"hex"/"integer"
+  Every config option must have a type. There are only two basic types:
+  tristate and string, the other types base on these two. The type
+  definition optionally accepts an input prompt, so these two examples
+  are equivalent:
+
+	bool "Networking support"
+  and
+	bool
+	prompt "Networking support"
+
+- input prompt: "prompt" <prompt> ["if" <expr>]
+  Every menu entry can have at most one prompt, which is used to display
+  to the user. Optionally dependencies only for this prompt can be added
+  with "if".
+
+- default value: "default" <symbol> ["if" <expr>]
+  A config option can have any number of default values. If multiple
+  default values are visible, only the first defined one is active.
+  Default values are not limited to the menu entry, where they are
+  defined, this means the default can be defined somewhere else or be
+  overriden by an earlier definition.
+  The default value is only assigned to the config symbol if no other
+  value was set by the user (via the input prompt above). If an input
+  prompt is visible the default value is presented to the user and can
+  be overridden by him.
+  Optionally dependencies only for this default value can be added with
+  "if".
+
+- dependencies: "depends on"/"requires" <expr>
+  This defines a dependency for this menu entry. If multiple
+  dependencies are defined they are connected with '&&'. Dependencies
+  are applied to all other options within this menu entry (which also
+  accept "if" expression), so these two examples are equivalent:
+
+	bool "foo" if BAR
+	default y if BAR
+  and
+	depends on BAR
+	bool "foo"
+	default y
+
+- help text: "help"
+  This defines a help text. The end of the help text is determined by
+  the level indentation, this means it ends at the first line which has
+  a smaller indentation than the first line of the help text.
+
+
+Menu dependencies
+-----------------
+
+Dependencies define the visibility of a menu entry and can also reduce
+the input range of tristate symbols. The tristate logic used in the
+expressions uses one more state than normal boolean logic to express the
+module state. Dependency expressions have the following syntax:
+
+<expr> ::= <symbol>                             (1)
+           <symbol> '=' <symbol>                (2)
+           <symbol> '!=' <symbol>               (3)
+           '(' <expr> ')'                       (4)
+           '!' <expr>                           (5)
+           <expr> '||' <expr>                   (6)
+           <expr> '&&' <expr>                   (7)
+
+Expressions are listed in decreasing order of precedence.
+
+(1) Convert the symbol into an expression. Boolean and tristate symbols
+    are simply converted into the respective expression values. All
+    other symbol types result in 'n'.
+(2) If the values of both symbols are equal, it returns 'y',
+    otherwise 'n'.
+(3) If the values of both symbols are equal, it returns 'n',
+    otherwise 'y'.
+(4) Returns the value of the expression. Used to override precedence.
+(5) Returns the result of (2-/expr/).
+(6) Returns the result of min(/expr/, /expr/).
+(7) Returns the result of max(/expr/, /expr/).
+
+An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2
+respectively for calculations). A menu entry becomes visible when it's
+expression evaluates to 'm' or 'y'.
+
+There are two type of symbols: constant and nonconstant symbols.
+Nonconstant symbols are the most common ones and are defined with the
+'config' statement. Nonconstant symbols consist entirely of alphanumeric
+characters or underscores.
+Constant symbols are only part of expressions. Constant symbols are
+always surrounded by single or double quotes. Within the quote any
+other character is allowed and the quotes can be escaped using '\'.
+
+Menu structure
+--------------
+
+The position of a menu entry in the tree is determined in two ways. First
+it can be specified explicitely:
+
+menu "Network device support"
+	depends NET
+
+config NETDEVICES
+	...
+
+endmenu
+
+All entries within the "menu" ... "endmenu" block become a submenu of
+"Network device support". All subentries inherit the dependencies from
+the menu entry, e.g. this means the dependency "NET" is added to the
+dependency list of the config option NETDEVICES.
+
+The other way to generate the menu structure is done by analyzing the
+dependencies. If a menu entry somehow depends on the previous entry, it
+can be made a submenu of it. First the the previous (parent) symbol must
+be part of the dependency list and then one of these two condititions
+must be true:
+- the child entry must become invisible, if the parent is set to 'n'
+- the child entry must only be visible, if the parent is visible
+
+config MODULES
+	bool "Enable loadable module support"
+
+config MODVERSIONS
+	bool "Set version information on all module symbols"
+	depends MODULES
+
+comment "module support disabled"
+	depends !MODULES
+
+MODVERSIONS directly depends on MODULES, this means it's only visible if
+MODULES is different from 'n'. The comment on the other hand is always
+visible when MODULES it's visible (the (empty) dependency of MODULES is
+also part of the comment dependencies).
+
+
+Kconfig syntax
+--------------
+
+The configuration file describes a series of menu entries, where every
+line starts with a keyword (except help texts). The following keywords
+end a menu entry:
+- config
+- choice/endchoice
+- comment
+- menu/endmenu
+- if/endif
+- source
+The first four also start the definition of a menu entry.
+
+config:
+
+	"config" <symbol>
+	<config options>
+
+This defines a config symbol <symbol> and accepts any of above
+attributes as options.
+
+choices:
+
+	"choice"
+	<choice options>
+	<choice block>
+	"endchoice"
+
+This defines a choice group and accepts any of above attributes as
+options. A choice can only be of type bool or tristate, while a boolean
+choice only allows a single config entry to be selected, a tristate
+choice also allows any number of config entries to be set to 'm'. This
+can be used if multiple drivers for a single hardware exists and only a
+single driver can be compiled/loaded into the kernel, but all drivers
+can be compiled as modules.
+A choice accepts another option "optional", which allows to set the
+choice to 'n' and no entry needs to be selected.
+
+comment:
+
+	"comment" <prompt>
+	<comment options>
+
+This defines a comment which is displayed to the user during the
+configuration process and is also echoed to the output files. The only
+possible options are dependencies.
+
+menu:
+
+	"menu" <prompt>
+	<menu options>
+	<menu block>
+	"endmenu"
+
+This defines a menu block, see "Menu structure" above for more
+information. The only possible options are dependencies.
+
+if:
+
+	"if" <expr>
+	<if block>
+	"endif"
+
+This defines an if block. The dependency expression <expr> is appended
+to all enclosed menu entries.
+
+source:
+
+	"source" <prompt>
+
+This reads the specified configuration file. This file is always parsed.
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Makefile b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Makefile
new file mode 100644
index 00000000..73995016
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/Makefile
@@ -0,0 +1,121 @@
+# Makefile for axTLS
+#
+# Copyright (C) 2002 Erik Andersen <andersen@codepoet.org>
+
+top_srcdir=../..
+top_builddir=../..
+srcdir=$(top_srcdir)/scripts/config
+include $(top_srcdir)/Rules.mak
+
+all: ncurses conf mconf
+
+ifeq ($(shell uname),SunOS)
+LIBS = -lcurses
+else
+LIBS = -lncurses
+endif
+ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
+	HOSTNCURSES += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
+else
+ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
+	HOSTNCURSES += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+else
+ifeq (/usr/local/include/ncurses/ncurses.h, $(wildcard /usr/local/include/ncurses/ncurses.h))
+	HOSTCFLAGS += -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses.h>"
+else
+ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h))
+	HOSTCFLAGS += -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+else
+ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
+	HOSTNCURSES += -DCURSES_LOC="<ncurses.h>"
+else
+	HOSTNCURSES += -DCURSES_LOC="<curses.h>"
+endif
+endif
+endif
+endif
+endif
+
+CONF_SRC     = conf.c
+MCONF_SRC    = mconf.c
+LXD_SRC      = lxdialog/checklist.c lxdialog/menubox.c lxdialog/textbox.c \
+               lxdialog/yesno.c lxdialog/inputbox.c lxdialog/util.c \
+               lxdialog/msgbox.c
+
+SHARED_SRC   = zconf.tab.c
+SHARED_DEPS := $(srcdir)/lkc.h $(srcdir)/lkc_proto.h \
+               lkc_defs.h $(srcdir)/expr.h zconf.tab.h
+CONF_OBJS    = $(patsubst %.c,%.o, $(CONF_SRC))
+MCONF_OBJS   = $(patsubst %.c,%.o, $(MCONF_SRC) $(LXD_SRC))
+SHARED_OBJS  = $(patsubst %.c,%.o, $(SHARED_SRC))
+
+conf: $(CONF_OBJS) $(SHARED_OBJS)
+	$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@
+
+mconf: $(MCONF_OBJS) $(SHARED_OBJS)
+	$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
+
+$(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS)
+	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+
+$(MCONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS)
+	@[ -d $(@D) ] || mkdir -v $(@D)
+	$(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@
+
+lkc_defs.h: $(srcdir)/lkc_proto.h
+	@sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+
+###
+# The following requires flex/bison
+# By default we use the _shipped versions, uncomment the
+# following line if you are modifying the flex/bison src.
+#LKC_GENPARSER := 1
+
+ifdef LKC_GENPARSER
+
+%.tab.c %.tab.h: $(srcdir)/%.y
+	bison -t -d -v -b $* -p $(notdir $*) $<
+
+lex.%.c: $(srcdir)/%.l
+	flex -P$(notdir $*) -o$@ $<
+else
+
+lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
+	$(HOSTCC) $(HOSTCFLAGS) -I$(srcdir) -c $< -o $@
+
+lex.zconf.c: $(srcdir)/lex.zconf.c_shipped
+	cp $< $@
+
+zconf.tab.c: $(srcdir)/zconf.tab.c_shipped
+	cp $< $@
+
+zconf.tab.h: $(srcdir)/zconf.tab.h_shipped
+	cp $< $@
+endif
+
+zconf.tab.o: zconf.tab.c lex.zconf.c $(srcdir)/confdata.c $(srcdir)/expr.c \
+             $(srcdir)/symbol.c $(srcdir)/menu.c $(SHARED_DEPS)
+	$(HOSTCC) $(HOSTCFLAGS) -I$(srcdir) -I. -c $< -o $@
+
+.PHONY: ncurses
+
+ncurses:
+	@echo "main() {}" > lxtemp.c
+	@if $(HOSTCC) lxtemp.c $(LIBS) ; then \
+		rm -f lxtemp.c a.out; \
+	else \
+		rm -f lxtemp.c; \
+		echo -e "\007" ;\
+		echo ">> Unable to find the Ncurses libraries." ;\
+		echo ">>" ;\
+		echo ">> You must have Ncurses installed in order" ;\
+		echo ">> to use 'make menuconfig'" ;\
+		echo ;\
+		exit 1 ;\
+	fi
+
+clean:
+	rm -f *.o *~ ../../*~ core *.exe $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS)
+	rm -f conf conf.exe mconf mconf.exe zconf.tab.c zconf.tab.h lex.zconf.c lkc_defs.h
+	rm -f ../..config.h
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/conf.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/conf.c
new file mode 100644
index 00000000..15244678
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/conf.c
@@ -0,0 +1,583 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/stat.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+static void conf(struct menu *menu);
+static void check_conf(struct menu *menu);
+
+enum {
+	ask_all,
+	ask_new,
+	ask_silent,
+	set_default,
+	set_yes,
+	set_mod,
+	set_no,
+	set_random
+} input_mode = ask_all;
+char *defconfig_file;
+
+static int indent = 1;
+static int valid_stdin = 1;
+static int conf_cnt;
+static char line[128];
+static struct menu *rootEntry;
+
+static char nohelp_text[] = "Sorry, no help available for this option yet.\n";
+
+static void strip(char *str)
+{
+	char *p = str;
+	int l;
+
+	while ((isspace(*p)))
+		p++;
+	l = strlen(p);
+	if (p != str)
+		memmove(str, p, l + 1);
+	if (!l)
+		return;
+	p = str + l - 1;
+	while ((isspace(*p)))
+		*p-- = 0;
+}
+
+static void check_stdin(void)
+{
+	if (!valid_stdin && input_mode == ask_silent) {
+		printf("aborted!\n\n");
+		printf("Console input/output is redirected. ");
+		printf("Run 'make oldconfig' to update configuration.\n\n");
+		exit(1);
+	}
+}
+
+static void conf_askvalue(struct symbol *sym, const char *def)
+{
+	enum symbol_type type = sym_get_type(sym);
+	tristate val;
+
+	if (!sym_has_value(sym))
+		printf("(NEW) ");
+
+	line[0] = '\n';
+	line[1] = 0;
+
+	if (!sym_is_changable(sym)) {
+		printf("%s\n", def);
+		line[0] = '\n';
+		line[1] = 0;
+		return;
+	}
+
+	switch (input_mode) {
+	case ask_new:
+	case ask_silent:
+		if (sym_has_value(sym)) {
+			printf("%s\n", def);
+			return;
+		}
+		check_stdin();
+	case ask_all:
+		fflush(stdout);
+		fgets(line, 128, stdin);
+		return;
+	case set_default:
+		printf("%s\n", def);
+		return;
+	default:
+		break;
+	}
+
+	switch (type) {
+	case S_INT:
+	case S_HEX:
+	case S_STRING:
+		printf("%s\n", def);
+		return;
+	default:
+		;
+	}
+	switch (input_mode) {
+	case set_yes:
+		if (sym_tristate_within_range(sym, yes)) {
+			line[0] = 'y';
+			line[1] = '\n';
+			line[2] = 0;
+			break;
+		}
+	case set_mod:
+		if (type == S_TRISTATE) {
+			if (sym_tristate_within_range(sym, mod)) {
+				line[0] = 'm';
+				line[1] = '\n';
+				line[2] = 0;
+				break;
+			}
+		} else {
+			if (sym_tristate_within_range(sym, yes)) {
+				line[0] = 'y';
+				line[1] = '\n';
+				line[2] = 0;
+				break;
+			}
+		}
+	case set_no:
+		if (sym_tristate_within_range(sym, no)) {
+			line[0] = 'n';
+			line[1] = '\n';
+			line[2] = 0;
+			break;
+		}
+	case set_random:
+		do {
+			val = (tristate)(random() % 3);
+		} while (!sym_tristate_within_range(sym, val));
+		switch (val) {
+		case no: line[0] = 'n'; break;
+		case mod: line[0] = 'm'; break;
+		case yes: line[0] = 'y'; break;
+		}
+		line[1] = '\n';
+		line[2] = 0;
+		break;
+	default:
+		break;
+	}
+	printf("%s", line);
+}
+
+int conf_string(struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	const char *def, *help;
+
+	while (1) {
+		printf("%*s%s ", indent - 1, "", menu->prompt->text);
+		printf("(%s) ", sym->name);
+		def = sym_get_string_value(sym);
+		if (sym_get_string_value(sym))
+			printf("[%s] ", def);
+		conf_askvalue(sym, def);
+		switch (line[0]) {
+		case '\n':
+			break;
+		case '?':
+			/* print help */
+			if (line[1] == '\n') {
+				help = nohelp_text;
+				if (menu->sym->help)
+					help = menu->sym->help;
+				printf("\n%s\n", menu->sym->help);
+				def = NULL;
+				break;
+			}
+		default:
+			line[strlen(line)-1] = 0;
+			def = line;
+		}
+		if (def && sym_set_string_value(sym, def))
+			return 0;
+	}
+}
+
+static int conf_sym(struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	int type;
+	tristate oldval, newval;
+	const char *help;
+
+	while (1) {
+		printf("%*s%s ", indent - 1, "", menu->prompt->text);
+		if (sym->name)
+			printf("(%s) ", sym->name);
+		type = sym_get_type(sym);
+		putchar('[');
+		oldval = sym_get_tristate_value(sym);
+		switch (oldval) {
+		case no:
+			putchar('N');
+			break;
+		case mod:
+			putchar('M');
+			break;
+		case yes:
+			putchar('Y');
+			break;
+		}
+		if (oldval != no && sym_tristate_within_range(sym, no))
+			printf("/n");
+		if (oldval != mod && sym_tristate_within_range(sym, mod))
+			printf("/m");
+		if (oldval != yes && sym_tristate_within_range(sym, yes))
+			printf("/y");
+		if (sym->help)
+			printf("/?");
+		printf("] ");
+		conf_askvalue(sym, sym_get_string_value(sym));
+		strip(line);
+
+		switch (line[0]) {
+		case 'n':
+		case 'N':
+			newval = no;
+			if (!line[1] || !strcmp(&line[1], "o"))
+				break;
+			continue;
+		case 'm':
+		case 'M':
+			newval = mod;
+			if (!line[1])
+				break;
+			continue;
+		case 'y':
+		case 'Y':
+			newval = yes;
+			if (!line[1] || !strcmp(&line[1], "es"))
+				break;
+			continue;
+		case 0:
+			newval = oldval;
+			break;
+		case '?':
+			goto help;
+		default:
+			continue;
+		}
+		if (sym_set_tristate_value(sym, newval))
+			return 0;
+help:
+		help = nohelp_text;
+		if (sym->help)
+			help = sym->help;
+		printf("\n%s\n", help);
+	}
+}
+
+static int conf_choice(struct menu *menu)
+{
+	struct symbol *sym, *def_sym;
+	struct menu *child;
+	int type;
+	bool is_new;
+
+	sym = menu->sym;
+	type = sym_get_type(sym);
+	is_new = !sym_has_value(sym);
+	if (sym_is_changable(sym)) {
+		conf_sym(menu);
+		sym_calc_value(sym);
+		switch (sym_get_tristate_value(sym)) {
+		case no:
+			return 1;
+		case mod:
+			return 0;
+		case yes:
+			break;
+		}
+	} else {
+		switch (sym_get_tristate_value(sym)) {
+		case no:
+			return 1;
+		case mod:
+			printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
+			return 0;
+		case yes:
+			break;
+		}
+	}
+
+	while (1) {
+		int cnt, def;
+
+		printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
+		def_sym = sym_get_choice_value(sym);
+		cnt = def = 0;
+		line[0] = '0';
+		line[1] = 0;
+		for (child = menu->list; child; child = child->next) {
+			if (!menu_is_visible(child))
+				continue;
+			if (!child->sym) {
+				printf("%*c %s\n", indent, '*', menu_get_prompt(child));
+				continue;
+			}
+			cnt++;
+			if (child->sym == def_sym) {
+				def = cnt;
+				printf("%*c", indent, '>');
+			} else
+				printf("%*c", indent, ' ');
+			printf(" %d. %s", cnt, menu_get_prompt(child));
+			if (child->sym->name)
+				printf(" (%s)", child->sym->name);
+			if (!sym_has_value(child->sym))
+				printf(" (NEW)");
+			printf("\n");
+		}
+		printf("%*schoice", indent - 1, "");
+		if (cnt == 1) {
+			printf("[1]: 1\n");
+			goto conf_childs;
+		}
+		printf("[1-%d", cnt);
+		if (sym->help)
+			printf("?");
+		printf("]: ");
+		switch (input_mode) {
+		case ask_new:
+		case ask_silent:
+			if (!is_new) {
+				cnt = def;
+				printf("%d\n", cnt);
+				break;
+			}
+			check_stdin();
+		case ask_all:
+			fflush(stdout);
+			fgets(line, 128, stdin);
+			strip(line);
+			if (line[0] == '?') {
+				printf("\n%s\n", menu->sym->help ?
+					menu->sym->help : nohelp_text);
+				continue;
+			}
+			if (!line[0])
+				cnt = def;
+			else if (isdigit(line[0]))
+				cnt = atoi(line);
+			else
+				continue;
+			break;
+		case set_random:
+			def = (random() % cnt) + 1;
+		case set_default:
+		case set_yes:
+		case set_mod:
+		case set_no:
+			cnt = def;
+			printf("%d\n", cnt);
+			break;
+		}
+
+	conf_childs:
+		for (child = menu->list; child; child = child->next) {
+			if (!child->sym || !menu_is_visible(child))
+				continue;
+			if (!--cnt)
+				break;
+		}
+		if (!child)
+			continue;
+		if (line[strlen(line) - 1] == '?') {
+			printf("\n%s\n", child->sym->help ?
+				child->sym->help : nohelp_text);
+			continue;
+		}
+		sym_set_choice_value(sym, child->sym);
+		if (child->list) {
+			indent += 2;
+			conf(child->list);
+			indent -= 2;
+		}
+		return 1;
+	}
+}
+
+static void conf(struct menu *menu)
+{
+	struct symbol *sym;
+	struct property *prop;
+	struct menu *child;
+
+	if (!menu_is_visible(menu))
+		return;
+
+	sym = menu->sym;
+	prop = menu->prompt;
+	if (prop) {
+		const char *prompt;
+
+		switch (prop->type) {
+		case P_MENU:
+			if (input_mode == ask_silent && rootEntry != menu) {
+				check_conf(menu);
+				return;
+			}
+		case P_COMMENT:
+			prompt = menu_get_prompt(menu);
+			if (prompt)
+				printf("%*c\n%*c %s\n%*c\n",
+					indent, '*',
+					indent, '*', prompt,
+					indent, '*');
+		default:
+			;
+		}
+	}
+
+	if (!sym)
+		goto conf_childs;
+
+	if (sym_is_choice(sym)) {
+		conf_choice(menu);
+		if (sym->curr.tri != mod)
+			return;
+		goto conf_childs;
+	}
+
+	switch (sym->type) {
+	case S_INT:
+	case S_HEX:
+	case S_STRING:
+		conf_string(menu);
+		break;
+	default:
+		conf_sym(menu);
+		break;
+	}
+
+conf_childs:
+	if (sym)
+		indent += 2;
+	for (child = menu->list; child; child = child->next)
+		conf(child);
+	if (sym)
+		indent -= 2;
+}
+
+static void check_conf(struct menu *menu)
+{
+	struct symbol *sym;
+	struct menu *child;
+
+	if (!menu_is_visible(menu))
+		return;
+
+	sym = menu->sym;
+	if (sym) {
+		if (sym_is_changable(sym) && !sym_has_value(sym)) {
+			if (!conf_cnt++)
+				printf("*\n* Restart config...\n*\n");
+			rootEntry = menu_get_parent_menu(menu);
+			conf(rootEntry);
+		}
+		if (sym_is_choice(sym) && sym_get_tristate_value(sym) != mod)
+			return;
+	}
+
+	for (child = menu->list; child; child = child->next)
+		check_conf(child);
+}
+
+int main(int ac, char **av)
+{
+	int i = 1;
+	const char *name;
+	struct stat tmpstat;
+
+	if (ac > i && av[i][0] == '-') {
+		switch (av[i++][1]) {
+		case 'o':
+			input_mode = ask_new;
+			break;
+		case 's':
+			input_mode = ask_silent;
+			valid_stdin = isatty(0) && isatty(1) && isatty(2);
+			break;
+		case 'd':
+			input_mode = set_default;
+			break;
+		case 'D':
+			input_mode = set_default;
+			defconfig_file = av[i++];
+			if (!defconfig_file) {
+				printf("%s: No default config file specified\n",
+					av[0]);
+				exit(1);
+			}
+			break;
+		case 'n':
+			input_mode = set_no;
+			break;
+		case 'm':
+			input_mode = set_mod;
+			break;
+		case 'y':
+			input_mode = set_yes;
+			break;
+		case 'r':
+			input_mode = set_random;
+			srandom(time(NULL));
+			break;
+		case 'h':
+		case '?':
+			printf("%s [-o|-s] config\n", av[0]);
+			exit(0);
+		}
+	}
+  	name = av[i];
+	if (!name) {
+		printf("%s: configuration file missing\n", av[0]);
+	}
+	conf_parse(name);
+	//zconfdump(stdout);
+	switch (input_mode) {
+	case set_default:
+		if (!defconfig_file)
+			defconfig_file = conf_get_default_confname();
+		if (conf_read(defconfig_file)) {
+			printf("***\n"
+				"*** Can't find default configuration \"%s\"!\n"
+				"***\n", defconfig_file);
+			exit(1);
+		}
+		break;
+	case ask_silent:
+		if (stat(".config", &tmpstat)) {
+			printf("***\n"
+				"*** You have not yet configured axTLS!\n"
+				"***\n"
+				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
+				"*** \"make menuconfig\" or \"make config\").\n"
+				"***\n");
+			exit(1);
+		}
+	case ask_all:
+	case ask_new:
+		conf_read(NULL);
+		break;
+	default:
+		break;
+	}
+
+	if (input_mode != ask_silent) {
+		rootEntry = &rootmenu;
+		conf(&rootmenu);
+		if (input_mode == ask_all) {
+			input_mode = ask_silent;
+			valid_stdin = 1;
+		}
+	}
+	do {
+		conf_cnt = 0;
+		check_conf(&rootmenu);
+	} while (conf_cnt);
+	if (conf_write(NULL)) {
+		fprintf(stderr, "\n*** Error during writing of the axTLS configuration.\n\n");
+		return 1;
+	}
+	return 0;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/confdata.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/confdata.c
new file mode 100644
index 00000000..a59e2455
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/confdata.c
@@ -0,0 +1,458 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <sys/stat.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+const char conf_def_filename[] = "config/.config";
+
+const char conf_defname[] = "config/defconfig";
+
+const char *conf_confnames[] = {
+	"config/.config",
+	conf_defname,
+	NULL,
+};
+
+static char *conf_expand_value(const char *in)
+{
+	struct symbol *sym;
+	const char *src;
+	static char res_value[SYMBOL_MAXLENGTH];
+	char *dst, name[SYMBOL_MAXLENGTH];
+
+	res_value[0] = 0;
+	dst = name;
+	while ((src = strchr(in, '$'))) {
+		strncat(res_value, in, src - in);
+		src++;
+		dst = name;
+		while (isalnum(*src) || *src == '_')
+			*dst++ = *src++;
+		*dst = 0;
+		sym = sym_lookup(name, 0);
+		sym_calc_value(sym);
+		strcat(res_value, sym_get_string_value(sym));
+		in = src;
+	}
+	strcat(res_value, in);
+
+	return res_value;
+}
+
+char *conf_get_default_confname(void)
+{
+	struct stat buf;
+	static char fullname[PATH_MAX+1];
+	char *env, *name;
+
+	name = conf_expand_value(conf_defname);
+	env = getenv(SRCTREE);
+	if (env) {
+		sprintf(fullname, "%s/%s", env, name);
+		if (!stat(fullname, &buf))
+			return fullname;
+	}
+	return name;
+}
+
+int conf_read(const char *name)
+{
+	FILE *in = NULL;
+	char line[1024];
+	char *p, *p2;
+	int lineno = 0;
+	struct symbol *sym;
+	struct property *prop;
+	struct expr *e;
+	int i;
+
+	if (name) {
+		in = zconf_fopen(name);
+	} else {
+		const char **names = conf_confnames;
+		while ((name = *names++)) {
+			name = conf_expand_value(name);
+			in = zconf_fopen(name);
+			if (in) {
+				printf("#\n"
+				       "# using defaults found in %s\n"
+				       "#\n", name);
+				break;
+			}
+		}
+	}
+
+	if (!in)
+		return 1;
+
+	for_all_symbols(i, sym) {
+		sym->flags |= SYMBOL_NEW | SYMBOL_CHANGED;
+		sym->flags &= ~SYMBOL_VALID;
+		switch (sym->type) {
+		case S_INT:
+		case S_HEX:
+		case S_STRING:
+			if (sym->user.val)
+				free(sym->user.val);
+		default:
+			sym->user.val = NULL;
+			sym->user.tri = no;
+		}
+	}
+
+	while (fgets(line, sizeof(line), in)) {
+		lineno++;
+		sym = NULL;
+		switch (line[0]) {
+		case '#':
+			if (line[1]!=' ')
+				continue;
+			p = strchr(line + 2, ' ');
+			if (!p)
+				continue;
+			*p++ = 0;
+			if (strncmp(p, "is not set", 10))
+				continue;
+			sym = sym_find(line + 2);
+			if (!sym) {
+				fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 2);
+				break;
+			}
+			switch (sym->type) {
+			case S_BOOLEAN:
+			case S_TRISTATE:
+				sym->user.tri = no;
+				sym->flags &= ~SYMBOL_NEW;
+				break;
+			default:
+				;
+			}
+			break;
+
+		case 'A' ... 'Z':
+			p = strchr(line, '=');
+			if (!p)
+				continue;
+			*p++ = 0;
+			p2 = strchr(p, '\n');
+			if (p2)
+				*p2 = 0;
+			sym = sym_find(line);
+			if (!sym) {
+				fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line);
+				break;
+			}
+			switch (sym->type) {
+			case S_TRISTATE:
+				if (p[0] == 'm') {
+					sym->user.tri = mod;
+					sym->flags &= ~SYMBOL_NEW;
+					break;
+				}
+			case S_BOOLEAN:
+				if (p[0] == 'y') {
+					sym->user.tri = yes;
+					sym->flags &= ~SYMBOL_NEW;
+					break;
+				}
+				if (p[0] == 'n') {
+					sym->user.tri = no;
+					sym->flags &= ~SYMBOL_NEW;
+					break;
+				}
+				break;
+			case S_STRING:
+				if (*p++ != '"')
+					break;
+				for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) {
+					if (*p2 == '"') {
+						*p2 = 0;
+						break;
+					}
+					memmove(p2, p2 + 1, strlen(p2));
+				}
+				if (!p2) {
+					fprintf(stderr, "%s:%d: invalid string found\n", name, lineno);
+					exit(1);
+				}
+			case S_INT:
+			case S_HEX:
+				if (sym_string_valid(sym, p)) {
+					sym->user.val = strdup(p);
+					sym->flags &= ~SYMBOL_NEW;
+				} else {
+					fprintf(stderr, "%s:%d: symbol value '%s' invalid for %s\n", name, lineno, p, sym->name);
+					exit(1);
+				}
+				break;
+			default:
+				;
+			}
+			break;
+		case '\n':
+			break;
+		default:
+			continue;
+		}
+		if (sym && sym_is_choice_value(sym)) {
+			struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+			switch (sym->user.tri) {
+			case no:
+				break;
+			case mod:
+				if (cs->user.tri == yes)
+					/* warn? */;
+				break;
+			case yes:
+				if (cs->user.tri != no)
+					/* warn? */;
+				cs->user.val = sym;
+				break;
+			}
+			cs->user.tri = E_OR(cs->user.tri, sym->user.tri);
+			cs->flags &= ~SYMBOL_NEW;
+		}
+	}
+	fclose(in);
+
+	if (modules_sym)
+		sym_calc_value(modules_sym);
+	for_all_symbols(i, sym) {
+		sym_calc_value(sym);
+		if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
+			if (sym->visible == no)
+				sym->flags |= SYMBOL_NEW;
+			switch (sym->type) {
+			case S_STRING:
+			case S_INT:
+			case S_HEX:
+				if (!sym_string_within_range(sym, sym->user.val))
+					sym->flags |= SYMBOL_NEW;
+			default:
+				break;
+			}
+		}
+		if (!sym_is_choice(sym))
+			continue;
+		prop = sym_get_choice_prop(sym);
+		for (e = prop->expr; e; e = e->left.expr)
+			if (e->right.sym->visible != no)
+				sym->flags |= e->right.sym->flags & SYMBOL_NEW;
+	}
+
+	sym_change_count = 1;
+
+	return 0;
+}
+
+struct menu *next_menu(struct menu *menu)
+{
+	if (menu->list) return menu->list;
+	do {
+		if (menu->next) {
+			menu = menu->next;
+			break;
+		}
+	} while ((menu = menu->parent));
+	
+	return menu;
+}
+
+#define SYMBOL_FORCEWRITE (1<<31)
+
+int conf_write(const char *name)
+{
+	FILE *out, *out_h;
+	struct symbol *sym;
+	struct menu *menu;
+	const char *basename;
+	char dirname[128], tmpname[128], newname[128];
+	int type, l;
+	const char *str;
+
+	dirname[0] = 0;
+	if (name && name[0]) {
+		struct stat st;
+		char *slash;
+
+		if (!stat(name, &st) && S_ISDIR(st.st_mode)) {
+			strcpy(dirname, name);
+			strcat(dirname, "/");
+			basename = conf_def_filename;
+		} else if ((slash = strrchr(name, '/'))) {
+			int size = slash - name + 1;
+			memcpy(dirname, name, size);
+			dirname[size] = 0;
+			if (slash[1])
+				basename = slash + 1;
+			else
+				basename = conf_def_filename;
+		} else
+			basename = name;
+	} else
+		basename = conf_def_filename;
+
+	sprintf(newname, "config/%s.tmpconfig.%d", dirname, (int)getpid());
+	out = fopen(newname, "w");
+	if (!out)
+		return 1;
+	out_h = NULL;
+	if (!name) {
+		out_h = fopen("config/.tmpconfig.h", "w");
+		if (!out_h)
+			return 1;
+	}
+	fprintf(out, "#\n"
+		     "# Automatically generated make config: don't edit\n"
+		     "#\n");
+	if (out_h) {
+		fprintf(out_h, "/*\n"
+			     " * Automatically generated header file: don't edit\n"
+			     " */\n\n");
+#if 0
+			     "/* Version Number */\n"
+			     "#define BB_VER \"%s\"\n"
+			     "#define BB_BT \"%s\"\n",
+			     getenv("VERSION"),
+			     getenv("BUILDTIME"));
+		if (getenv("EXTRA_VERSION"))
+			fprintf(out_h, "#define BB_EXTRA_VERSION \"%s\"\n",
+				     getenv("EXTRA_VERSION"));
+		fprintf(out_h, "\n");
+#endif
+	}
+
+	if (!sym_change_count)
+		sym_clear_all_valid();
+
+	/* Force write of all non-duplicate symbols. */
+
+	/* Write out everything by default. */
+	for(menu = rootmenu.list; menu; menu = next_menu(menu))
+		if (menu->sym) menu->sym->flags |= SYMBOL_FORCEWRITE;
+
+	menu = rootmenu.list;
+	while (menu) {
+		sym = menu->sym;
+		if (!sym) {
+			if (!menu_is_visible(menu))
+				goto next;
+			str = menu_get_prompt(menu);
+			fprintf(out, "\n"
+				     "#\n"
+				     "# %s\n"
+				     "#\n", str);
+			if (out_h)
+				fprintf(out_h, "\n"
+					       "/*\n"
+					       " * %s\n"
+					       " */\n", str);
+		} else if (!(sym->flags & SYMBOL_CHOICE)) {
+			sym_calc_value(sym);
+			if (!(sym->flags & SYMBOL_FORCEWRITE))
+				goto next;
+
+			sym->flags &= ~SYMBOL_FORCEWRITE;
+			type = sym->type;
+			if (type == S_TRISTATE) {
+				sym_calc_value(modules_sym);
+				if (modules_sym->curr.tri == no)
+					type = S_BOOLEAN;
+			}
+			switch (type) {
+			case S_BOOLEAN:
+			case S_TRISTATE:
+				switch (sym_get_tristate_value(sym)) {
+				case no:
+					fprintf(out, "# %s is not set\n", sym->name);
+					if (out_h)
+						fprintf(out_h, "#undef %s\n", sym->name);
+					break;
+				case mod:
+#if 0
+					fprintf(out, "%s=m\n", sym->name);
+					if (out_h)
+						fprintf(out_h, "#define %s_MODULE 1\n", sym->name);
+#endif
+					break;
+				case yes:
+					fprintf(out, "%s=y\n", sym->name);
+					if (out_h)
+						fprintf(out_h, "#define %s 1\n", sym->name);
+					break;
+				}
+				break;
+			case S_STRING:
+				// fix me
+				str = sym_get_string_value(sym);
+				fprintf(out, "%s=\"", sym->name);
+				if (out_h)
+					fprintf(out_h, "#define %s \"", sym->name);
+				do {
+					l = strcspn(str, "\"\\");
+					if (l) {
+						fwrite(str, l, 1, out);
+						if (out_h)
+							fwrite(str, l, 1, out_h);
+					}
+					str += l;
+					while (*str == '\\' || *str == '"') {
+						fprintf(out, "\\%c", *str);
+						if (out_h)
+							fprintf(out_h, "\\%c", *str);
+						str++;
+					}
+				} while (*str);
+				fputs("\"\n", out);
+				if (out_h)
+					fputs("\"\n", out_h);
+				break;
+			case S_HEX:
+				str = sym_get_string_value(sym);
+				if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
+					fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
+					if (out_h)
+						fprintf(out_h, "#define %s 0x%s\n", sym->name, str);
+					break;
+				}
+			case S_INT:
+				str = sym_get_string_value(sym);
+				fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
+				if (out_h)
+					fprintf(out_h, "#define %s %s\n", sym->name, str);
+				break;
+			}
+		}
+next:
+		menu = next_menu(menu);
+	}
+	fclose(out);
+	if (out_h) {
+		fclose(out_h);
+		rename("config/.tmpconfig.h", "config/config.h");
+		file_write_dep(NULL);
+	}
+	if (!name || basename != conf_def_filename) {
+		if (!name)
+			name = conf_def_filename;
+		sprintf(tmpname, "%s.old", name);
+		rename(name, tmpname);
+	}
+	sprintf(tmpname, "%s%s", dirname, basename);
+	if (rename(newname, tmpname))
+		return 1;
+
+	sym_change_count = 0;
+
+	return 0;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.c
new file mode 100644
index 00000000..30e4f9d6
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.c
@@ -0,0 +1,1099 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+#define DEBUG_EXPR	0
+
+struct expr *expr_alloc_symbol(struct symbol *sym)
+{
+	struct expr *e = malloc(sizeof(*e));
+	memset(e, 0, sizeof(*e));
+	e->type = E_SYMBOL;
+	e->left.sym = sym;
+	return e;
+}
+
+struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)
+{
+	struct expr *e = malloc(sizeof(*e));
+	memset(e, 0, sizeof(*e));
+	e->type = type;
+	e->left.expr = ce;
+	return e;
+}
+
+struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2)
+{
+	struct expr *e = malloc(sizeof(*e));
+	memset(e, 0, sizeof(*e));
+	e->type = type;
+	e->left.expr = e1;
+	e->right.expr = e2;
+	return e;
+}
+
+struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2)
+{
+	struct expr *e = malloc(sizeof(*e));
+	memset(e, 0, sizeof(*e));
+	e->type = type;
+	e->left.sym = s1;
+	e->right.sym = s2;
+	return e;
+}
+
+struct expr *expr_alloc_and(struct expr *e1, struct expr *e2)
+{
+	if (!e1)
+		return e2;
+	return e2 ? expr_alloc_two(E_AND, e1, e2) : e1;
+}
+
+struct expr *expr_alloc_or(struct expr *e1, struct expr *e2)
+{
+	if (!e1)
+		return e2;
+	return e2 ? expr_alloc_two(E_OR, e1, e2) : e1;
+}
+
+struct expr *expr_copy(struct expr *org)
+{
+	struct expr *e;
+
+	if (!org)
+		return NULL;
+
+	e = malloc(sizeof(*org));
+	memcpy(e, org, sizeof(*org));
+	switch (org->type) {
+	case E_SYMBOL:
+		e->left = org->left;
+		break;
+	case E_NOT:
+		e->left.expr = expr_copy(org->left.expr);
+		break;
+	case E_EQUAL:
+	case E_UNEQUAL:
+		e->left.sym = org->left.sym;
+		e->right.sym = org->right.sym;
+		break;
+	case E_AND:
+	case E_OR:
+	case E_CHOICE:
+		e->left.expr = expr_copy(org->left.expr);
+		e->right.expr = expr_copy(org->right.expr);
+		break;
+	default:
+		printf("can't copy type %d\n", e->type);
+		free(e);
+		e = NULL;
+		break;
+	}
+
+	return e;
+}
+
+void expr_free(struct expr *e)
+{
+	if (!e)
+		return;
+
+	switch (e->type) {
+	case E_SYMBOL:
+		break;
+	case E_NOT:
+		expr_free(e->left.expr);
+		return;
+	case E_EQUAL:
+	case E_UNEQUAL:
+		break;
+	case E_OR:
+	case E_AND:
+		expr_free(e->left.expr);
+		expr_free(e->right.expr);
+		break;
+	default:
+		printf("how to free type %d?\n", e->type);
+		break;
+	}
+	free(e);
+}
+
+static int trans_count;
+
+#define e1 (*ep1)
+#define e2 (*ep2)
+
+static void __expr_eliminate_eq(enum expr_type type, struct expr **ep1, struct expr **ep2)
+{
+	if (e1->type == type) {
+		__expr_eliminate_eq(type, &e1->left.expr, &e2);
+		__expr_eliminate_eq(type, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		__expr_eliminate_eq(type, &e1, &e2->left.expr);
+		__expr_eliminate_eq(type, &e1, &e2->right.expr);
+		return;
+	}
+	if (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&
+	    e1->left.sym == e2->left.sym && (e1->left.sym->flags & (SYMBOL_YES|SYMBOL_NO)))
+		return;
+	if (!expr_eq(e1, e2))
+		return;
+	trans_count++;
+	expr_free(e1); expr_free(e2);
+	switch (type) {
+	case E_OR:
+		e1 = expr_alloc_symbol(&symbol_no);
+		e2 = expr_alloc_symbol(&symbol_no);
+		break;
+	case E_AND:
+		e1 = expr_alloc_symbol(&symbol_yes);
+		e2 = expr_alloc_symbol(&symbol_yes);
+		break;
+	default:
+		;
+	}
+}
+
+void expr_eliminate_eq(struct expr **ep1, struct expr **ep2)
+{
+	if (!e1 || !e2)
+		return;
+	switch (e1->type) {
+	case E_OR:
+	case E_AND:
+		__expr_eliminate_eq(e1->type, ep1, ep2);
+	default:
+		;
+	}
+	if (e1->type != e2->type) switch (e2->type) {
+	case E_OR:
+	case E_AND:
+		__expr_eliminate_eq(e2->type, ep1, ep2);
+	default:
+		;
+	}
+	e1 = expr_eliminate_yn(e1);
+	e2 = expr_eliminate_yn(e2);
+}
+
+#undef e1
+#undef e2
+
+int expr_eq(struct expr *e1, struct expr *e2)
+{
+	int res, old_count;
+
+	if (e1->type != e2->type)
+		return 0;
+	switch (e1->type) {
+	case E_EQUAL:
+	case E_UNEQUAL:
+		return e1->left.sym == e2->left.sym && e1->right.sym == e2->right.sym;
+	case E_SYMBOL:
+		return e1->left.sym == e2->left.sym;
+	case E_NOT:
+		return expr_eq(e1->left.expr, e2->left.expr);
+	case E_AND:
+	case E_OR:
+		e1 = expr_copy(e1);
+		e2 = expr_copy(e2);
+		old_count = trans_count;
+		expr_eliminate_eq(&e1, &e2);
+		res = (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&
+		       e1->left.sym == e2->left.sym);
+		expr_free(e1);
+		expr_free(e2);
+		trans_count = old_count;
+		return res;
+	case E_CHOICE:
+	case E_RANGE:
+	case E_NONE:
+		/* panic */;
+	}
+
+	if (DEBUG_EXPR) {
+		expr_fprint(e1, stdout);
+		printf(" = ");
+		expr_fprint(e2, stdout);
+		printf(" ?\n");
+	}
+
+	return 0;
+}
+
+struct expr *expr_eliminate_yn(struct expr *e)
+{
+	struct expr *tmp;
+
+	if (e) switch (e->type) {
+	case E_AND:
+		e->left.expr = expr_eliminate_yn(e->left.expr);
+		e->right.expr = expr_eliminate_yn(e->right.expr);
+		if (e->left.expr->type == E_SYMBOL) {
+			if (e->left.expr->left.sym == &symbol_no) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_no;
+				e->right.expr = NULL;
+				return e;
+			} else if (e->left.expr->left.sym == &symbol_yes) {
+				free(e->left.expr);
+				tmp = e->right.expr;
+				*e = *(e->right.expr);
+				free(tmp);
+				return e;
+			}
+		}
+		if (e->right.expr->type == E_SYMBOL) {
+			if (e->right.expr->left.sym == &symbol_no) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_no;
+				e->right.expr = NULL;
+				return e;
+			} else if (e->right.expr->left.sym == &symbol_yes) {
+				free(e->right.expr);
+				tmp = e->left.expr;
+				*e = *(e->left.expr);
+				free(tmp);
+				return e;
+			}
+		}
+		break;
+	case E_OR:
+		e->left.expr = expr_eliminate_yn(e->left.expr);
+		e->right.expr = expr_eliminate_yn(e->right.expr);
+		if (e->left.expr->type == E_SYMBOL) {
+			if (e->left.expr->left.sym == &symbol_no) {
+				free(e->left.expr);
+				tmp = e->right.expr;
+				*e = *(e->right.expr);
+				free(tmp);
+				return e;
+			} else if (e->left.expr->left.sym == &symbol_yes) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_yes;
+				e->right.expr = NULL;
+				return e;
+			}
+		}
+		if (e->right.expr->type == E_SYMBOL) {
+			if (e->right.expr->left.sym == &symbol_no) {
+				free(e->right.expr);
+				tmp = e->left.expr;
+				*e = *(e->left.expr);
+				free(tmp);
+				return e;
+			} else if (e->right.expr->left.sym == &symbol_yes) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_yes;
+				e->right.expr = NULL;
+				return e;
+			}
+		}
+		break;
+	default:
+		;
+	}
+	return e;
+}
+
+/*
+ * bool FOO!=n => FOO
+ */
+struct expr *expr_trans_bool(struct expr *e)
+{
+	if (!e)
+		return NULL;
+	switch (e->type) {
+	case E_AND:
+	case E_OR:
+	case E_NOT:
+		e->left.expr = expr_trans_bool(e->left.expr);
+		e->right.expr = expr_trans_bool(e->right.expr);
+		break;
+	case E_UNEQUAL:
+		// FOO!=n -> FOO
+		if (e->left.sym->type == S_TRISTATE) {
+			if (e->right.sym == &symbol_no) {
+				e->type = E_SYMBOL;
+				e->right.sym = NULL;
+			}
+		}
+		break;
+	default:
+		;
+	}
+	return e;
+}
+
+/*
+ * e1 || e2 -> ?
+ */
+struct expr *expr_join_or(struct expr *e1, struct expr *e2)
+{
+	struct expr *tmp;
+	struct symbol *sym1, *sym2;
+
+	if (expr_eq(e1, e2))
+		return expr_copy(e1);
+	if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT)
+		return NULL;
+	if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT)
+		return NULL;
+	if (e1->type == E_NOT) {
+		tmp = e1->left.expr;
+		if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL)
+			return NULL;
+		sym1 = tmp->left.sym;
+	} else
+		sym1 = e1->left.sym;
+	if (e2->type == E_NOT) {
+		if (e2->left.expr->type != E_SYMBOL)
+			return NULL;
+		sym2 = e2->left.expr->left.sym;
+	} else
+		sym2 = e2->left.sym;
+	if (sym1 != sym2)
+		return NULL;
+	if (sym1->type != S_BOOLEAN && sym1->type != S_TRISTATE)
+		return NULL;
+	if (sym1->type == S_TRISTATE) {
+		if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+		    ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+		     (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
+			// (a='y') || (a='m') -> (a!='n')
+			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no);
+		}
+		if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+		    ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+		     (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) {
+			// (a='y') || (a='n') -> (a!='m')
+			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod);
+		}
+		if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+		    ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+		     (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) {
+			// (a='m') || (a='n') -> (a!='y')
+			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
+		}
+	}
+	if (sym1->type == S_BOOLEAN && sym1 == sym2) {
+		if ((e1->type == E_NOT && e1->left.expr->type == E_SYMBOL && e2->type == E_SYMBOL) ||
+		    (e2->type == E_NOT && e2->left.expr->type == E_SYMBOL && e1->type == E_SYMBOL))
+			return expr_alloc_symbol(&symbol_yes);
+	}
+
+	if (DEBUG_EXPR) {
+		printf("optimize (");
+		expr_fprint(e1, stdout);
+		printf(") || (");
+		expr_fprint(e2, stdout);
+		printf(")?\n");
+	}
+	return NULL;
+}
+
+struct expr *expr_join_and(struct expr *e1, struct expr *e2)
+{
+	struct expr *tmp;
+	struct symbol *sym1, *sym2;
+
+	if (expr_eq(e1, e2))
+		return expr_copy(e1);
+	if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT)
+		return NULL;
+	if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT)
+		return NULL;
+	if (e1->type == E_NOT) {
+		tmp = e1->left.expr;
+		if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL)
+			return NULL;
+		sym1 = tmp->left.sym;
+	} else
+		sym1 = e1->left.sym;
+	if (e2->type == E_NOT) {
+		if (e2->left.expr->type != E_SYMBOL)
+			return NULL;
+		sym2 = e2->left.expr->left.sym;
+	} else
+		sym2 = e2->left.sym;
+	if (sym1 != sym2)
+		return NULL;
+	if (sym1->type != S_BOOLEAN && sym1->type != S_TRISTATE)
+		return NULL;
+
+	if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
+	    (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
+		// (a) && (a='y') -> (a='y')
+		return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+	if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) ||
+	    (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no))
+		// (a) && (a!='n') -> (a)
+		return expr_alloc_symbol(sym1);
+
+	if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
+	    (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
+		// (a) && (a!='m') -> (a='y')
+		return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+	if (sym1->type == S_TRISTATE) {
+		if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
+			// (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
+			sym2 = e1->right.sym;
+			if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+				return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+							     : expr_alloc_symbol(&symbol_no);
+		}
+		if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
+			// (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
+			sym2 = e2->right.sym;
+			if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+				return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+							     : expr_alloc_symbol(&symbol_no);
+		}
+		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+			   ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+			    (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
+			// (a!='y') && (a!='n') -> (a='m')
+			return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod);
+
+		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+			   ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+			    (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes)))
+			// (a!='y') && (a!='m') -> (a='n')
+			return expr_alloc_comp(E_EQUAL, sym1, &symbol_no);
+
+		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+			   ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+			    (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
+			// (a!='m') && (a!='n') -> (a='m')
+			return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+		if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
+		    (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_mod) ||
+		    (e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_yes) ||
+		    (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_yes))
+			return NULL;
+	}
+
+	if (DEBUG_EXPR) {
+		printf("optimize (");
+		expr_fprint(e1, stdout);
+		printf(") && (");
+		expr_fprint(e2, stdout);
+		printf(")?\n");
+	}
+	return NULL;
+}
+
+static void expr_eliminate_dups1(enum expr_type type, struct expr **ep1, struct expr **ep2)
+{
+#define e1 (*ep1)
+#define e2 (*ep2)
+	struct expr *tmp;
+
+	if (e1->type == type) {
+		expr_eliminate_dups1(type, &e1->left.expr, &e2);
+		expr_eliminate_dups1(type, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		expr_eliminate_dups1(type, &e1, &e2->left.expr);
+		expr_eliminate_dups1(type, &e1, &e2->right.expr);
+		return;
+	}
+	if (e1 == e2)
+		return;
+
+	switch (e1->type) {
+	case E_OR: case E_AND:
+		expr_eliminate_dups1(e1->type, &e1, &e1);
+	default:
+		;
+	}
+
+	switch (type) {
+	case E_OR:
+		tmp = expr_join_or(e1, e2);
+		if (tmp) {
+			expr_free(e1); expr_free(e2);
+			e1 = expr_alloc_symbol(&symbol_no);
+			e2 = tmp;
+			trans_count++;
+		}
+		break;
+	case E_AND:
+		tmp = expr_join_and(e1, e2);
+		if (tmp) {
+			expr_free(e1); expr_free(e2);
+			e1 = expr_alloc_symbol(&symbol_yes);
+			e2 = tmp;
+			trans_count++;
+		}
+		break;
+	default:
+		;
+	}
+#undef e1
+#undef e2
+}
+
+static void expr_eliminate_dups2(enum expr_type type, struct expr **ep1, struct expr **ep2)
+{
+#define e1 (*ep1)
+#define e2 (*ep2)
+	struct expr *tmp, *tmp1, *tmp2;
+
+	if (e1->type == type) {
+		expr_eliminate_dups2(type, &e1->left.expr, &e2);
+		expr_eliminate_dups2(type, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		expr_eliminate_dups2(type, &e1, &e2->left.expr);
+		expr_eliminate_dups2(type, &e1, &e2->right.expr);
+	}
+	if (e1 == e2)
+		return;
+
+	switch (e1->type) {
+	case E_OR:
+		expr_eliminate_dups2(e1->type, &e1, &e1);
+		// (FOO || BAR) && (!FOO && !BAR) -> n
+		tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+		tmp2 = expr_copy(e2);
+		tmp = expr_extract_eq_and(&tmp1, &tmp2);
+		if (expr_is_yes(tmp1)) {
+			expr_free(e1);
+			e1 = expr_alloc_symbol(&symbol_no);
+			trans_count++;
+		}
+		expr_free(tmp2);
+		expr_free(tmp1);
+		expr_free(tmp);
+		break;
+	case E_AND:
+		expr_eliminate_dups2(e1->type, &e1, &e1);
+		// (FOO && BAR) || (!FOO || !BAR) -> y
+		tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+		tmp2 = expr_copy(e2);
+		tmp = expr_extract_eq_or(&tmp1, &tmp2);
+		if (expr_is_no(tmp1)) {
+			expr_free(e1);
+			e1 = expr_alloc_symbol(&symbol_yes);
+			trans_count++;
+		}
+		expr_free(tmp2);
+		expr_free(tmp1);
+		expr_free(tmp);
+		break;
+	default:
+		;
+	}
+#undef e1
+#undef e2
+}
+
+struct expr *expr_eliminate_dups(struct expr *e)
+{
+	int oldcount;
+	if (!e)
+		return e;
+
+	oldcount = trans_count;
+	while (1) {
+		trans_count = 0;
+		switch (e->type) {
+		case E_OR: case E_AND:
+			expr_eliminate_dups1(e->type, &e, &e);
+			expr_eliminate_dups2(e->type, &e, &e);
+		default:
+			;
+		}
+		if (!trans_count)
+			break;
+		e = expr_eliminate_yn(e);
+	}
+	trans_count = oldcount;
+	return e;
+}
+
+struct expr *expr_transform(struct expr *e)
+{
+	struct expr *tmp;
+
+	if (!e)
+		return NULL;
+	switch (e->type) {
+	case E_EQUAL:
+	case E_UNEQUAL:
+	case E_SYMBOL:
+	case E_CHOICE:
+		break;
+	default:
+		e->left.expr = expr_transform(e->left.expr);
+		e->right.expr = expr_transform(e->right.expr);
+	}
+
+	switch (e->type) {
+	case E_EQUAL:
+		if (e->left.sym->type != S_BOOLEAN)
+			break;
+		if (e->right.sym == &symbol_no) {
+			e->type = E_NOT;
+			e->left.expr = expr_alloc_symbol(e->left.sym);
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_mod) {
+			printf("boolean symbol %s tested for 'm'? test forced to 'n'\n", e->left.sym->name);
+			e->type = E_SYMBOL;
+			e->left.sym = &symbol_no;
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_yes) {
+			e->type = E_SYMBOL;
+			e->right.sym = NULL;
+			break;
+		}
+		break;
+	case E_UNEQUAL:
+		if (e->left.sym->type != S_BOOLEAN)
+			break;
+		if (e->right.sym == &symbol_no) {
+			e->type = E_SYMBOL;
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_mod) {
+			printf("boolean symbol %s tested for 'm'? test forced to 'y'\n", e->left.sym->name);
+			e->type = E_SYMBOL;
+			e->left.sym = &symbol_yes;
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_yes) {
+			e->type = E_NOT;
+			e->left.expr = expr_alloc_symbol(e->left.sym);
+			e->right.sym = NULL;
+			break;
+		}
+		break;
+	case E_NOT:
+		switch (e->left.expr->type) {
+		case E_NOT:
+			// !!a -> a
+			tmp = e->left.expr->left.expr;
+			free(e->left.expr);
+			free(e);
+			e = tmp;
+			e = expr_transform(e);
+			break;
+		case E_EQUAL:
+		case E_UNEQUAL:
+			// !a='x' -> a!='x'
+			tmp = e->left.expr;
+			free(e);
+			e = tmp;
+			e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
+			break;
+		case E_OR:
+			// !(a || b) -> !a && !b
+			tmp = e->left.expr;
+			e->type = E_AND;
+			e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+			tmp->type = E_NOT;
+			tmp->right.expr = NULL;
+			e = expr_transform(e);
+			break;
+		case E_AND:
+			// !(a && b) -> !a || !b
+			tmp = e->left.expr;
+			e->type = E_OR;
+			e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+			tmp->type = E_NOT;
+			tmp->right.expr = NULL;
+			e = expr_transform(e);
+			break;
+		case E_SYMBOL:
+			if (e->left.expr->left.sym == &symbol_yes) {
+				// !'y' -> 'n'
+				tmp = e->left.expr;
+				free(e);
+				e = tmp;
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_no;
+				break;
+			}
+			if (e->left.expr->left.sym == &symbol_mod) {
+				// !'m' -> 'm'
+				tmp = e->left.expr;
+				free(e);
+				e = tmp;
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_mod;
+				break;
+			}
+			if (e->left.expr->left.sym == &symbol_no) {
+				// !'n' -> 'y'
+				tmp = e->left.expr;
+				free(e);
+				e = tmp;
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_yes;
+				break;
+			}
+			break;
+		default:
+			;
+		}
+		break;
+	default:
+		;
+	}
+	return e;
+}
+
+int expr_contains_symbol(struct expr *dep, struct symbol *sym)
+{
+	if (!dep)
+		return 0;
+
+	switch (dep->type) {
+	case E_AND:
+	case E_OR:
+		return expr_contains_symbol(dep->left.expr, sym) ||
+		       expr_contains_symbol(dep->right.expr, sym);
+	case E_SYMBOL:
+		return dep->left.sym == sym;
+	case E_EQUAL:
+	case E_UNEQUAL:
+		return dep->left.sym == sym ||
+		       dep->right.sym == sym;
+	case E_NOT:
+		return expr_contains_symbol(dep->left.expr, sym);
+	default:
+		;
+	}
+	return 0;
+}
+
+bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
+{
+	if (!dep)
+		return false;
+
+	switch (dep->type) {
+	case E_AND:
+		return expr_depends_symbol(dep->left.expr, sym) ||
+		       expr_depends_symbol(dep->right.expr, sym);
+	case E_SYMBOL:
+		return dep->left.sym == sym;
+	case E_EQUAL:
+		if (dep->left.sym == sym) {
+			if (dep->right.sym == &symbol_yes || dep->right.sym == &symbol_mod)
+				return true;
+		}
+		break;
+	case E_UNEQUAL:
+		if (dep->left.sym == sym) {
+			if (dep->right.sym == &symbol_no)
+				return true;
+		}
+		break;
+	default:
+		;
+	}
+ 	return false;
+}
+
+struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
+{
+	struct expr *tmp = NULL;
+	expr_extract_eq(E_AND, &tmp, ep1, ep2);
+	if (tmp) {
+		*ep1 = expr_eliminate_yn(*ep1);
+		*ep2 = expr_eliminate_yn(*ep2);
+	}
+	return tmp;
+}
+
+struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
+{
+	struct expr *tmp = NULL;
+	expr_extract_eq(E_OR, &tmp, ep1, ep2);
+	if (tmp) {
+		*ep1 = expr_eliminate_yn(*ep1);
+		*ep2 = expr_eliminate_yn(*ep2);
+	}
+	return tmp;
+}
+
+void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)
+{
+#define e1 (*ep1)
+#define e2 (*ep2)
+	if (e1->type == type) {
+		expr_extract_eq(type, ep, &e1->left.expr, &e2);
+		expr_extract_eq(type, ep, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		expr_extract_eq(type, ep, ep1, &e2->left.expr);
+		expr_extract_eq(type, ep, ep1, &e2->right.expr);
+		return;
+	}
+	if (expr_eq(e1, e2)) {
+		*ep = *ep ? expr_alloc_two(type, *ep, e1) : e1;
+		expr_free(e2);
+		if (type == E_AND) {
+			e1 = expr_alloc_symbol(&symbol_yes);
+			e2 = expr_alloc_symbol(&symbol_yes);
+		} else if (type == E_OR) {
+			e1 = expr_alloc_symbol(&symbol_no);
+			e2 = expr_alloc_symbol(&symbol_no);
+		}
+	}
+#undef e1
+#undef e2
+}
+
+struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym)
+{
+	struct expr *e1, *e2;
+
+	if (!e) {
+		e = expr_alloc_symbol(sym);
+		if (type == E_UNEQUAL)
+			e = expr_alloc_one(E_NOT, e);
+		return e;
+	}
+	switch (e->type) {
+	case E_AND:
+		e1 = expr_trans_compare(e->left.expr, E_EQUAL, sym);
+		e2 = expr_trans_compare(e->right.expr, E_EQUAL, sym);
+		if (sym == &symbol_yes)
+			e = expr_alloc_two(E_AND, e1, e2);
+		if (sym == &symbol_no)
+			e = expr_alloc_two(E_OR, e1, e2);
+		if (type == E_UNEQUAL)
+			e = expr_alloc_one(E_NOT, e);
+		return e;
+	case E_OR:
+		e1 = expr_trans_compare(e->left.expr, E_EQUAL, sym);
+		e2 = expr_trans_compare(e->right.expr, E_EQUAL, sym);
+		if (sym == &symbol_yes)
+			e = expr_alloc_two(E_OR, e1, e2);
+		if (sym == &symbol_no)
+			e = expr_alloc_two(E_AND, e1, e2);
+		if (type == E_UNEQUAL)
+			e = expr_alloc_one(E_NOT, e);
+		return e;
+	case E_NOT:
+		return expr_trans_compare(e->left.expr, type == E_EQUAL ? E_UNEQUAL : E_EQUAL, sym);
+	case E_UNEQUAL:
+	case E_EQUAL:
+		if (type == E_EQUAL) {
+			if (sym == &symbol_yes)
+				return expr_copy(e);
+			if (sym == &symbol_mod)
+				return expr_alloc_symbol(&symbol_no);
+			if (sym == &symbol_no)
+				return expr_alloc_one(E_NOT, expr_copy(e));
+		} else {
+			if (sym == &symbol_yes)
+				return expr_alloc_one(E_NOT, expr_copy(e));
+			if (sym == &symbol_mod)
+				return expr_alloc_symbol(&symbol_yes);
+			if (sym == &symbol_no)
+				return expr_copy(e);
+		}
+		break;
+	case E_SYMBOL:
+		return expr_alloc_comp(type, e->left.sym, sym);
+	case E_CHOICE:
+	case E_RANGE:
+	case E_NONE:
+		/* panic */;
+	}
+	return NULL;
+}
+
+tristate expr_calc_value(struct expr *e)
+{
+	tristate val1, val2;
+	const char *str1, *str2;
+
+	if (!e)
+		return yes;
+
+	switch (e->type) {
+	case E_SYMBOL:
+		sym_calc_value(e->left.sym);
+		return e->left.sym->curr.tri;
+	case E_AND:
+		val1 = expr_calc_value(e->left.expr);
+		val2 = expr_calc_value(e->right.expr);
+		return E_AND(val1, val2);
+	case E_OR:
+		val1 = expr_calc_value(e->left.expr);
+		val2 = expr_calc_value(e->right.expr);
+		return E_OR(val1, val2);
+	case E_NOT:
+		val1 = expr_calc_value(e->left.expr);
+		return E_NOT(val1);
+	case E_EQUAL:
+		sym_calc_value(e->left.sym);
+		sym_calc_value(e->right.sym);
+		str1 = sym_get_string_value(e->left.sym);
+		str2 = sym_get_string_value(e->right.sym);
+		return !strcmp(str1, str2) ? yes : no;
+	case E_UNEQUAL:
+		sym_calc_value(e->left.sym);
+		sym_calc_value(e->right.sym);
+		str1 = sym_get_string_value(e->left.sym);
+		str2 = sym_get_string_value(e->right.sym);
+		return !strcmp(str1, str2) ? no : yes;
+	default:
+		printf("expr_calc_value: %d?\n", e->type);
+		return no;
+	}
+}
+
+int expr_compare_type(enum expr_type t1, enum expr_type t2)
+{
+#if 0
+	return 1;
+#else
+	if (t1 == t2)
+		return 0;
+	switch (t1) {
+	case E_EQUAL:
+	case E_UNEQUAL:
+		if (t2 == E_NOT)
+			return 1;
+	case E_NOT:
+		if (t2 == E_AND)
+			return 1;
+	case E_AND:
+		if (t2 == E_OR)
+			return 1;
+	case E_OR:
+		if (t2 == E_CHOICE)
+			return 1;
+	case E_CHOICE:
+		if (t2 == 0)
+			return 1;
+	default:
+		return -1;
+	}
+	printf("[%dgt%d?]", t1, t2);
+	return 0;
+#endif
+}
+
+void expr_print(struct expr *e, void (*fn)(void *, const char *), void *data, int prevtoken)
+{
+	if (!e) {
+		fn(data, "y");
+		return;
+	}
+
+	if (expr_compare_type(prevtoken, e->type) > 0)
+		fn(data, "(");
+	switch (e->type) {
+	case E_SYMBOL:
+		if (e->left.sym->name)
+			fn(data, e->left.sym->name);
+		else
+			fn(data, "<choice>");
+		break;
+	case E_NOT:
+		fn(data, "!");
+		expr_print(e->left.expr, fn, data, E_NOT);
+		break;
+	case E_EQUAL:
+		fn(data, e->left.sym->name);
+		fn(data, "=");
+		fn(data, e->right.sym->name);
+		break;
+	case E_UNEQUAL:
+		fn(data, e->left.sym->name);
+		fn(data, "!=");
+		fn(data, e->right.sym->name);
+		break;
+	case E_OR:
+		expr_print(e->left.expr, fn, data, E_OR);
+		fn(data, " || ");
+		expr_print(e->right.expr, fn, data, E_OR);
+		break;
+	case E_AND:
+		expr_print(e->left.expr, fn, data, E_AND);
+		fn(data, " && ");
+		expr_print(e->right.expr, fn, data, E_AND);
+		break;
+	case E_CHOICE:
+		fn(data, e->right.sym->name);
+		if (e->left.expr) {
+			fn(data, " ^ ");
+			expr_print(e->left.expr, fn, data, E_CHOICE);
+		}
+		break;
+	case E_RANGE:
+		fn(data, "[");
+		fn(data, e->left.sym->name);
+		fn(data, " ");
+		fn(data, e->right.sym->name);
+		fn(data, "]");
+		break;
+	default:
+	  {
+		char buf[32];
+		sprintf(buf, "<unknown type %d>", e->type);
+		fn(data, buf);
+		break;
+	  }
+	}
+	if (expr_compare_type(prevtoken, e->type) > 0)
+		fn(data, ")");
+}
+
+static void expr_print_file_helper(void *data, const char *str)
+{
+	fwrite(str, strlen(str), 1, data);
+}
+
+void expr_fprint(struct expr *e, FILE *out)
+{
+	expr_print(e, expr_print_file_helper, out, E_NONE);
+}
+
+static void expr_print_gstr_helper(void *data, const char *str)
+{
+	str_append((struct gstr*)data, str);
+}
+
+void expr_gstr_print(struct expr *e, struct gstr *gs)
+{
+	expr_print(e, expr_print_gstr_helper, gs, E_NONE);
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.h b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.h
new file mode 100644
index 00000000..7d39ff43
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/expr.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#ifndef EXPR_H
+#define EXPR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+struct file {
+	struct file *next;
+	struct file *parent;
+	char *name;
+	int lineno;
+	int flags;
+};
+
+#define FILE_BUSY		0x0001
+#define FILE_SCANNED		0x0002
+#define FILE_PRINTED		0x0004
+
+typedef enum tristate {
+	no, mod, yes
+} tristate;
+
+enum expr_type {
+	E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_CHOICE, E_SYMBOL, E_RANGE
+};
+
+union expr_data {
+	struct expr *expr;
+	struct symbol *sym;
+};
+
+struct expr {
+	enum expr_type type;
+	union expr_data left, right;
+};
+
+#define E_OR(dep1, dep2)	(((dep1)>(dep2))?(dep1):(dep2))
+#define E_AND(dep1, dep2)	(((dep1)<(dep2))?(dep1):(dep2))
+#define E_NOT(dep)		(2-(dep))
+
+struct expr_value {
+	struct expr *expr;
+	tristate tri;
+};
+
+struct symbol_value {
+	void *val;
+	tristate tri;
+};
+
+enum symbol_type {
+	S_UNKNOWN, S_BOOLEAN, S_TRISTATE, S_INT, S_HEX, S_STRING, S_OTHER
+};
+
+struct symbol {
+	struct symbol *next;
+	char *name;
+	char *help;
+	enum symbol_type type;
+	struct symbol_value curr, user;
+	tristate visible;
+	int flags;
+	struct property *prop;
+	struct expr *dep, *dep2;
+	struct expr_value rev_dep;
+};
+
+#define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
+
+#define SYMBOL_YES		0x0001
+#define SYMBOL_MOD		0x0002
+#define SYMBOL_NO		0x0004
+#define SYMBOL_CONST		0x0007
+#define SYMBOL_CHECK		0x0008
+#define SYMBOL_CHOICE		0x0010
+#define SYMBOL_CHOICEVAL	0x0020
+#define SYMBOL_PRINTED		0x0040
+#define SYMBOL_VALID		0x0080
+#define SYMBOL_OPTIONAL		0x0100
+#define SYMBOL_WRITE		0x0200
+#define SYMBOL_CHANGED		0x0400
+#define SYMBOL_NEW		0x0800
+#define SYMBOL_AUTO		0x1000
+#define SYMBOL_CHECKED		0x2000
+#define SYMBOL_CHECK_DONE	0x4000
+#define SYMBOL_WARNED		0x8000
+
+#define SYMBOL_MAXLENGTH	256
+#define SYMBOL_HASHSIZE		257
+#define SYMBOL_HASHMASK		0xff
+
+enum prop_type {
+	P_UNKNOWN, P_PROMPT, P_COMMENT, P_MENU, P_DEFAULT, P_CHOICE, P_SELECT, P_RANGE
+};
+
+struct property {
+	struct property *next;
+	struct symbol *sym;
+	enum prop_type type;
+	const char *text;
+	struct expr_value visible;
+	struct expr *expr;
+	struct menu *menu;
+	struct file *file;
+	int lineno;
+};
+
+#define for_all_properties(sym, st, tok) \
+	for (st = sym->prop; st; st = st->next) \
+		if (st->type == (tok))
+#define for_all_defaults(sym, st) for_all_properties(sym, st, P_DEFAULT)
+#define for_all_choices(sym, st) for_all_properties(sym, st, P_CHOICE)
+#define for_all_prompts(sym, st) \
+	for (st = sym->prop; st; st = st->next) \
+		if (st->text)
+
+struct menu {
+	struct menu *next;
+	struct menu *parent;
+	struct menu *list;
+	struct symbol *sym;
+	struct property *prompt;
+	struct expr *dep;
+	unsigned int flags;
+	//char *help;
+	struct file *file;
+	int lineno;
+	void *data;
+};
+
+#define MENU_CHANGED		0x0001
+#define MENU_ROOT		0x0002
+
+#ifndef SWIG
+
+extern struct file *file_list;
+extern struct file *current_file;
+struct file *lookup_file(const char *name);
+
+extern struct symbol symbol_yes, symbol_no, symbol_mod;
+extern struct symbol *modules_sym;
+extern int cdebug;
+struct expr *expr_alloc_symbol(struct symbol *sym);
+struct expr *expr_alloc_one(enum expr_type type, struct expr *ce);
+struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2);
+struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2);
+struct expr *expr_alloc_and(struct expr *e1, struct expr *e2);
+struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);
+struct expr *expr_copy(struct expr *org);
+void expr_free(struct expr *e);
+int expr_eq(struct expr *e1, struct expr *e2);
+void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);
+tristate expr_calc_value(struct expr *e);
+struct expr *expr_eliminate_yn(struct expr *e);
+struct expr *expr_trans_bool(struct expr *e);
+struct expr *expr_eliminate_dups(struct expr *e);
+struct expr *expr_transform(struct expr *e);
+int expr_contains_symbol(struct expr *dep, struct symbol *sym);
+bool expr_depends_symbol(struct expr *dep, struct symbol *sym);
+struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
+struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
+void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
+struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);
+
+void expr_fprint(struct expr *e, FILE *out);
+struct gstr; /* forward */
+void expr_gstr_print(struct expr *e, struct gstr *gs);
+
+static inline int expr_is_yes(struct expr *e)
+{
+	return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes);
+}
+
+static inline int expr_is_no(struct expr *e)
+{
+	return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no);
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EXPR_H */
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
new file mode 100644
index 00000000..b877bb6b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
@@ -0,0 +1,3688 @@
+
+#line 3 "lex.zconf.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 31
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t;
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+#if __STDC__
+
+#define YY_USE_CONST
+
+#endif	/* __STDC__ */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE zconfrestart(zconfin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int zconfleng;
+
+extern FILE *zconfin, *zconfout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up zconftext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via zconfrestart()), so that the user can continue scanning by
+	 * just pointing zconfin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when zconftext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int zconfleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 1;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow zconfwrap()'s to do buffer switches
+ * instead of setting up a fresh zconfin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void zconfrestart (FILE *input_file  );
+void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE zconf_create_buffer (FILE *file,int size  );
+void zconf_delete_buffer (YY_BUFFER_STATE b  );
+void zconf_flush_buffer (YY_BUFFER_STATE b  );
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void zconfpop_buffer_state (void );
+
+static void zconfensure_buffer_stack (void );
+static void zconf_load_buffer_state (void );
+static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER zconf_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,int len  );
+
+void *zconfalloc (yy_size_t  );
+void *zconfrealloc (void *,yy_size_t  );
+void zconffree (void *  );
+
+#define yy_new_buffer zconf_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        zconfensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        zconfensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define zconfwrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *zconfin = (FILE *) 0, *zconfout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int zconflineno;
+
+int zconflineno = 1;
+
+extern char *zconftext;
+#define yytext_ptr zconftext
+static yyconst flex_int16_t yy_nxt[][38] =
+    {
+    {
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
+
+       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   18,   18,   19,   20,
+       21,   22,   18,   18,   23,   24,   18,   25,   18,   26,
+       27,   18,   28,   29,   30,   18,   18,   16
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   18,   18,   19,   20,
+       21,   22,   18,   18,   23,   24,   18,   25,   18,   26,
+       27,   18,   28,   29,   30,   18,   18,   16
+
+    },
+
+    {
+       11,   31,   32,   33,   31,   31,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31
+    },
+
+    {
+       11,   31,   32,   33,   31,   31,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
+       31,   31,   31,   31,   31,   31,   31,   31
+    },
+
+    {
+       11,   34,   34,   35,   34,   36,   34,   34,   36,   34,
+       34,   34,   34,   34,   34,   37,   34,   34,   34,   34,
+
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34
+    },
+
+    {
+       11,   34,   34,   35,   34,   36,   34,   34,   36,   34,
+       34,   34,   34,   34,   34,   37,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34
+    },
+
+    {
+       11,   38,   38,   39,   40,   41,   42,   43,   41,   44,
+       45,   46,   47,   47,   48,   49,   47,   47,   47,   47,
+       47,   47,   47,   47,   47,   50,   47,   47,   47,   51,
+       47,   47,   47,   47,   47,   47,   47,   52
+
+    },
+
+    {
+       11,   38,   38,   39,   40,   41,   42,   43,   41,   44,
+       45,   46,   47,   47,   48,   49,   47,   47,   47,   47,
+       47,   47,   47,   47,   47,   50,   47,   47,   47,   51,
+       47,   47,   47,   47,   47,   47,   47,   52
+    },
+
+    {
+      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
+      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
+      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
+      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11
+    },
+
+    {
+       11,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
+      -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
+
+      -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
+      -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12
+    },
+
+    {
+       11,  -13,   53,   54,  -13,  -13,   55,  -13,  -13,  -13,
+      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
+      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
+      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13
+    },
+
+    {
+       11,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
+      -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
+      -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
+      -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14
+
+    },
+
+    {
+       11,   56,   56,   57,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56
+    },
+
+    {
+       11,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
+      -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
+      -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
+      -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16
+    },
+
+    {
+       11,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17
+    },
+
+    {
+       11,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,   58,  -18,  -18,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -18
+    },
+
+    {
+       11,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
+      -19,  -19,  -19,   58,  -19,  -19,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   59,
+       58,   58,   58,   58,   58,   58,   58,  -19
+
+    },
+
+    {
+       11,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
+      -20,  -20,  -20,   58,  -20,  -20,   58,   58,   58,   58,
+       58,   58,   58,   58,   60,   58,   58,   58,   58,   61,
+       58,   58,   58,   58,   58,   58,   58,  -20
+    },
+
+    {
+       11,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
+      -21,  -21,  -21,   58,  -21,  -21,   58,   58,   58,   58,
+       58,   62,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -21
+    },
+
+    {
+       11,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,   58,  -22,  -22,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   63,   58,
+       58,   58,   58,   58,   58,   58,   58,  -22
+    },
+
+    {
+       11,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
+      -23,  -23,  -23,   58,  -23,  -23,   58,   58,   58,   58,
+       58,   64,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -23
+    },
+
+    {
+       11,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
+      -24,  -24,  -24,   58,  -24,  -24,   58,   58,   58,   58,
+       58,   58,   65,   58,   58,   58,   58,   58,   66,   58,
+       58,   58,   58,   58,   58,   58,   58,  -24
+
+    },
+
+    {
+       11,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
+      -25,  -25,  -25,   58,  -25,  -25,   58,   67,   58,   58,
+       58,   68,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -25
+    },
+
+    {
+       11,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
+      -26,  -26,  -26,   58,  -26,  -26,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       69,   58,   58,   58,   58,   58,   58,  -26
+    },
+
+    {
+       11,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
+      -27,  -27,  -27,   58,  -27,  -27,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   70,   58,   58,   58,   58,  -27
+    },
+
+    {
+       11,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
+      -28,  -28,  -28,   58,  -28,  -28,   58,   71,   58,   58,
+       58,   72,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -28
+    },
+
+    {
+       11,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,   58,  -29,  -29,   58,   58,   58,   58,
+       58,   73,   58,   58,   58,   58,   58,   58,   58,   74,
+       58,   58,   58,   58,   75,   58,   58,  -29
+
+    },
+
+    {
+       11,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,   58,  -30,  -30,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   76,   58,   58,   58,   58,  -30
+    },
+
+    {
+       11,   77,   77,  -31,   77,   77,   77,   77,   77,   77,
+       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
+       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
+       77,   77,   77,   77,   77,   77,   77,   77
+    },
+
+    {
+       11,  -32,   78,   79,  -32,  -32,  -32,  -32,  -32,  -32,
+      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
+
+      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
+      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32
+    },
+
+    {
+       11,   80,  -33,  -33,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80
+    },
+
+    {
+       11,   81,   81,   82,   81,  -34,   81,   81,  -34,   81,
+       81,   81,   81,   81,   81,  -34,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81
+
+    },
+
+    {
+       11,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35
+    },
+
+    {
+       11,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36
+    },
+
+    {
+       11,   83,   83,   84,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83
+    },
+
+    {
+       11,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38
+    },
+
+    {
+       11,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
+      -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
+      -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
+      -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39
+
+    },
+
+    {
+       11,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,
+      -40,  -40,  -40,  -40,   85,  -40,  -40,  -40,  -40,  -40,
+      -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,
+      -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40
+    },
+
+    {
+       11,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,
+      -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,
+      -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,
+      -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41
+    },
+
+    {
+       11,   86,   86,  -42,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86
+    },
+
+    {
+       11,  -43,  -43,  -43,  -43,  -43,  -43,   87,  -43,  -43,
+      -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,
+      -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,
+      -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43
+    },
+
+    {
+       11,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
+      -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
+      -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
+      -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44
+
+    },
+
+    {
+       11,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,
+      -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,
+      -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,
+      -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45
+    },
+
+    {
+       11,  -46,  -46,  -46,  -46,  -46,  -46,  -46,  -46,  -46,
+      -46,   88,   89,   89,  -46,  -46,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,  -46
+    },
+
+    {
+       11,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,
+      -47,   89,   89,   89,  -47,  -47,   89,   89,   89,   89,
+
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,  -47
+    },
+
+    {
+       11,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48
+    },
+
+    {
+       11,  -49,  -49,   90,  -49,  -49,  -49,  -49,  -49,  -49,
+      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
+      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
+      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49
+
+    },
+
+    {
+       11,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
+      -50,   89,   89,   89,  -50,  -50,   89,   89,   89,   89,
+       89,   89,   91,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,  -50
+    },
+
+    {
+       11,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
+      -51,   89,   89,   89,  -51,  -51,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,   89,   92,   89,
+       89,   89,   89,   89,   89,   89,   89,  -51
+    },
+
+    {
+       11,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
+      -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
+
+      -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
+      -52,  -52,  -52,  -52,  -52,  -52,  -52,   93
+    },
+
+    {
+       11,  -53,   53,   54,  -53,  -53,   55,  -53,  -53,  -53,
+      -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
+      -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
+      -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53
+    },
+
+    {
+       11,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,
+      -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,
+      -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,
+      -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54
+
+    },
+
+    {
+       11,   56,   56,   57,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56
+    },
+
+    {
+       11,   56,   56,   57,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56
+    },
+
+    {
+       11,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
+      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
+
+      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
+      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57
+    },
+
+    {
+       11,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
+      -58,  -58,  -58,   58,  -58,  -58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -58
+    },
+
+    {
+       11,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,
+      -59,  -59,  -59,   58,  -59,  -59,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   94,
+       58,   58,   58,   58,   58,   58,   58,  -59
+
+    },
+
+    {
+       11,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,
+      -60,  -60,  -60,   58,  -60,  -60,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   95,
+       58,   58,   58,   58,   58,   58,   58,  -60
+    },
+
+    {
+       11,  -61,  -61,  -61,  -61,  -61,  -61,  -61,  -61,  -61,
+      -61,  -61,  -61,   58,  -61,  -61,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   96,   97,   58,
+       58,   58,   58,   58,   58,   58,   58,  -61
+    },
+
+    {
+       11,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
+      -62,  -62,  -62,   58,  -62,  -62,   58,   58,   58,   58,
+
+       58,   58,   98,   58,   58,   58,   58,   58,   58,   58,
+       99,   58,   58,   58,   58,   58,   58,  -62
+    },
+
+    {
+       11,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,
+      -63,  -63,  -63,   58,  -63,  -63,   58,  100,   58,   58,
+      101,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -63
+    },
+
+    {
+       11,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
+      -64,  -64,  -64,   58,  -64,  -64,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,  102,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,  103,  -64
+
+    },
+
+    {
+       11,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
+      -65,  -65,  -65,   58,  -65,  -65,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -65
+    },
+
+    {
+       11,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+      -66,  -66,  -66,   58,  -66,  -66,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  104,   58,   58,  -66
+    },
+
+    {
+       11,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
+      -67,  -67,  -67,   58,  -67,  -67,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,  105,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -67
+    },
+
+    {
+       11,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
+      -68,  -68,  -68,   58,  -68,  -68,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  106,   58,
+       58,   58,   58,   58,   58,   58,   58,  -68
+    },
+
+    {
+       11,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,
+      -69,  -69,  -69,   58,  -69,  -69,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  107,   58,   58,  -69
+
+    },
+
+    {
+       11,  -70,  -70,  -70,  -70,  -70,  -70,  -70,  -70,  -70,
+      -70,  -70,  -70,   58,  -70,  -70,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,  108,
+       58,   58,   58,   58,   58,   58,   58,  -70
+    },
+
+    {
+       11,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,
+      -71,  -71,  -71,   58,  -71,  -71,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  109,   58,
+       58,   58,   58,   58,   58,   58,   58,  -71
+    },
+
+    {
+       11,  -72,  -72,  -72,  -72,  -72,  -72,  -72,  -72,  -72,
+      -72,  -72,  -72,   58,  -72,  -72,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,  110,   58,   58,   58,   58,   58,  -72
+    },
+
+    {
+       11,  -73,  -73,  -73,  -73,  -73,  -73,  -73,  -73,  -73,
+      -73,  -73,  -73,   58,  -73,  -73,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,  111,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -73
+    },
+
+    {
+       11,  -74,  -74,  -74,  -74,  -74,  -74,  -74,  -74,  -74,
+      -74,  -74,  -74,   58,  -74,  -74,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  112,   58,  -74
+
+    },
+
+    {
+       11,  -75,  -75,  -75,  -75,  -75,  -75,  -75,  -75,  -75,
+      -75,  -75,  -75,   58,  -75,  -75,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,  113,   58,   58,   58,   58,  -75
+    },
+
+    {
+       11,  -76,  -76,  -76,  -76,  -76,  -76,  -76,  -76,  -76,
+      -76,  -76,  -76,   58,  -76,  -76,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  114,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -76
+    },
+
+    {
+       11,   77,   77,  -77,   77,   77,   77,   77,   77,   77,
+       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
+
+       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
+       77,   77,   77,   77,   77,   77,   77,   77
+    },
+
+    {
+       11,  -78,   78,   79,  -78,  -78,  -78,  -78,  -78,  -78,
+      -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,
+      -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,
+      -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78
+    },
+
+    {
+       11,   80,  -79,  -79,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80
+
+    },
+
+    {
+       11,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,
+      -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,
+      -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,
+      -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80
+    },
+
+    {
+       11,   81,   81,   82,   81,  -81,   81,   81,  -81,   81,
+       81,   81,   81,   81,   81,  -81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81
+    },
+
+    {
+       11,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,
+      -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,
+
+      -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,
+      -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82
+    },
+
+    {
+       11,  -83,  -83,   84,  -83,  -83,  -83,  -83,  -83,  -83,
+      -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,
+      -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,
+      -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83
+    },
+
+    {
+       11,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,
+      -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,
+      -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,
+      -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84
+
+    },
+
+    {
+       11,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,
+      -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,
+      -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,
+      -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85
+    },
+
+    {
+       11,   86,   86,  -86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86
+    },
+
+    {
+       11,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,
+      -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,
+
+      -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,
+      -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87
+    },
+
+    {
+       11,  -88,  -88,  -88,  -88,  -88,  -88,  -88,  -88,  -88,
+      -88,  115,   89,   89,  -88,  -88,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,  -88
+    },
+
+    {
+       11,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,   89,   89,   89,  -89,  -89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,  -89
+
+    },
+
+    {
+       11,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,
+      -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,
+      -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,
+      -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90
+    },
+
+    {
+       11,  -91,  -91,  -91,  -91,  -91,  -91,  -91,  -91,  -91,
+      -91,   89,   89,   89,  -91,  -91,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,  -91
+    },
+
+    {
+       11,  -92,  -92,  -92,  -92,  -92,  -92,  -92,  -92,  -92,
+      -92,   89,   89,   89,  -92,  -92,   89,   89,   89,   89,
+
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,  -92
+    },
+
+    {
+       11,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,
+      -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,
+      -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,
+      -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93
+    },
+
+    {
+       11,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,
+      -94,  -94,  -94,   58,  -94,  -94,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,  116,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -94
+
+    },
+
+    {
+       11,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
+      -95,  -95,  -95,   58,  -95,  -95,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  117,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -95
+    },
+
+    {
+       11,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,
+      -96,  -96,  -96,   58,  -96,  -96,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  118,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -96
+    },
+
+    {
+       11,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
+      -97,  -97,  -97,   58,  -97,  -97,   58,   58,   58,   58,
+
+       58,   58,  119,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -97
+    },
+
+    {
+       11,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,
+      -98,  -98,  -98,   58,  -98,  -98,  120,  121,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -98
+    },
+
+    {
+       11,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,
+      -99,  -99,  -99,   58,  -99,  -99,   58,   58,   58,   58,
+       58,  122,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  -99
+
+    },
+
+    {
+       11, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+     -100, -100, -100,   58, -100, -100,   58,   58,  123,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -100
+    },
+
+    {
+       11, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+     -101, -101, -101,   58, -101, -101,   58,   58,   58,  124,
+       58,   58,   58,   58,   58,  125,   58,  126,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -101
+    },
+
+    {
+       11, -102, -102, -102, -102, -102, -102, -102, -102, -102,
+     -102, -102, -102,   58, -102, -102,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+      127,   58,   58,   58,   58,   58,   58, -102
+    },
+
+    {
+       11, -103, -103, -103, -103, -103, -103, -103, -103, -103,
+     -103, -103, -103,   58, -103, -103,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -103
+    },
+
+    {
+       11, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+     -104, -104, -104,   58, -104, -104,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -104
+
+    },
+
+    {
+       11, -105, -105, -105, -105, -105, -105, -105, -105, -105,
+     -105, -105, -105,   58, -105, -105,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  128,   58,
+       58,   58,   58,   58,   58,   58,   58, -105
+    },
+
+    {
+       11, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+     -106, -106, -106,   58, -106, -106,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  129,   58, -106
+    },
+
+    {
+       11, -107, -107, -107, -107, -107, -107, -107, -107, -107,
+     -107, -107, -107,   58, -107, -107,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,  130,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -107
+    },
+
+    {
+       11, -108, -108, -108, -108, -108, -108, -108, -108, -108,
+     -108, -108, -108,   58, -108, -108,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  131,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -108
+    },
+
+    {
+       11, -109, -109, -109, -109, -109, -109, -109, -109, -109,
+     -109, -109, -109,   58, -109, -109,   58,   58,   58,   58,
+       58,   58,   58,  132,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -109
+
+    },
+
+    {
+       11, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+     -110, -110, -110,   58, -110, -110,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  133,   58, -110
+    },
+
+    {
+       11, -111, -111, -111, -111, -111, -111, -111, -111, -111,
+     -111, -111, -111,   58, -111, -111,   58,   58,   58,   58,
+       58,  134,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -111
+    },
+
+    {
+       11, -112, -112, -112, -112, -112, -112, -112, -112, -112,
+     -112, -112, -112,   58, -112, -112,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,  135,   58,   58,   58,   58, -112
+    },
+
+    {
+       11, -113, -113, -113, -113, -113, -113, -113, -113, -113,
+     -113, -113, -113,   58, -113, -113,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  136,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -113
+    },
+
+    {
+       11, -114, -114, -114, -114, -114, -114, -114, -114, -114,
+     -114, -114, -114,   58, -114, -114,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,  137,   58,   58,   58, -114
+
+    },
+
+    {
+       11, -115, -115, -115, -115, -115, -115, -115, -115, -115,
+     -115,   89,   89,   89, -115, -115,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   89,   89,   89, -115
+    },
+
+    {
+       11, -116, -116, -116, -116, -116, -116, -116, -116, -116,
+     -116, -116, -116,   58, -116, -116,   58,   58,   58,   58,
+       58,  138,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -116
+    },
+
+    {
+       11, -117, -117, -117, -117, -117, -117, -117, -117, -117,
+     -117, -117, -117,   58, -117, -117,   58,   58,   58,  139,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -117
+    },
+
+    {
+       11, -118, -118, -118, -118, -118, -118, -118, -118, -118,
+     -118, -118, -118,   58, -118, -118,   58,   58,   58,   58,
+       58,  140,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -118
+    },
+
+    {
+       11, -119, -119, -119, -119, -119, -119, -119, -119, -119,
+     -119, -119, -119,   58, -119, -119,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  141,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -119
+
+    },
+
+    {
+       11, -120, -120, -120, -120, -120, -120, -120, -120, -120,
+     -120, -120, -120,   58, -120, -120,   58,   58,  142,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  143,   58,   58, -120
+    },
+
+    {
+       11, -121, -121, -121, -121, -121, -121, -121, -121, -121,
+     -121, -121, -121,   58, -121, -121,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  144,   58, -121
+    },
+
+    {
+       11, -122, -122, -122, -122, -122, -122, -122, -122, -122,
+     -122, -122, -122,   58, -122, -122,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,  145,   58,
+       58,   58,   58,   58,   58,   58,   58, -122
+    },
+
+    {
+       11, -123, -123, -123, -123, -123, -123, -123, -123, -123,
+     -123, -123, -123,   58, -123, -123,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,  146,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -123
+    },
+
+    {
+       11, -124, -124, -124, -124, -124, -124, -124, -124, -124,
+     -124, -124, -124,   58, -124, -124,   58,   58,   58,   58,
+       58,   58,   58,   58,  147,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -124
+
+    },
+
+    {
+       11, -125, -125, -125, -125, -125, -125, -125, -125, -125,
+     -125, -125, -125,   58, -125, -125,   58,   58,   58,   58,
+       58,   58,  148,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -125
+    },
+
+    {
+       11, -126, -126, -126, -126, -126, -126, -126, -126, -126,
+     -126, -126, -126,   58, -126, -126,   58,   58,   58,   58,
+       58,  149,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -126
+    },
+
+    {
+       11, -127, -127, -127, -127, -127, -127, -127, -127, -127,
+     -127, -127, -127,   58, -127, -127,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -127
+    },
+
+    {
+       11, -128, -128, -128, -128, -128, -128, -128, -128, -128,
+     -128, -128, -128,   58, -128, -128,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,  150,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -128
+    },
+
+    {
+       11, -129, -129, -129, -129, -129, -129, -129, -129, -129,
+     -129, -129, -129,   58, -129, -129,   58,   58,   58,  151,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -129
+
+    },
+
+    {
+       11, -130, -130, -130, -130, -130, -130, -130, -130, -130,
+     -130, -130, -130,   58, -130, -130,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,  152,
+       58,   58,   58,   58,   58,   58,   58, -130
+    },
+
+    {
+       11, -131, -131, -131, -131, -131, -131, -131, -131, -131,
+     -131, -131, -131,   58, -131, -131,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+      153,   58,   58,   58,   58,   58,   58, -131
+    },
+
+    {
+       11, -132, -132, -132, -132, -132, -132, -132, -132, -132,
+     -132, -132, -132,   58, -132, -132,   58,   58,   58,   58,
+
+       58,  154,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -132
+    },
+
+    {
+       11, -133, -133, -133, -133, -133, -133, -133, -133, -133,
+     -133, -133, -133,   58, -133, -133,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  155,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -133
+    },
+
+    {
+       11, -134, -134, -134, -134, -134, -134, -134, -134, -134,
+     -134, -134, -134,   58, -134, -134,   58,   58,   58,  156,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -134
+
+    },
+
+    {
+       11, -135, -135, -135, -135, -135, -135, -135, -135, -135,
+     -135, -135, -135,   58, -135, -135,   58,   58,   58,  157,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -135
+    },
+
+    {
+       11, -136, -136, -136, -136, -136, -136, -136, -136, -136,
+     -136, -136, -136,   58, -136, -136,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  158,   58,
+       58,   58,   58,   58,   58,   58,   58, -136
+    },
+
+    {
+       11, -137, -137, -137, -137, -137, -137, -137, -137, -137,
+     -137, -137, -137,   58, -137, -137,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  159,   58,   58, -137
+    },
+
+    {
+       11, -138, -138, -138, -138, -138, -138, -138, -138, -138,
+     -138, -138, -138,   58, -138, -138,   58,  160,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -138
+    },
+
+    {
+       11, -139, -139, -139, -139, -139, -139, -139, -139, -139,
+     -139, -139, -139,   58, -139, -139,   58,   58,   58,   58,
+       58,  161,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -139
+
+    },
+
+    {
+       11, -140, -140, -140, -140, -140, -140, -140, -140, -140,
+     -140, -140, -140,   58, -140, -140,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  162,   58,
+       58,   58,   58,   58,   58,   58,   58, -140
+    },
+
+    {
+       11, -141, -141, -141, -141, -141, -141, -141, -141, -141,
+     -141, -141, -141,   58, -141, -141,   58,   58,   58,   58,
+       58,   58,   58,  163,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -141
+    },
+
+    {
+       11, -142, -142, -142, -142, -142, -142, -142, -142, -142,
+     -142, -142, -142,   58, -142, -142,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,  164,
+       58,   58,   58,   58,   58,   58,   58, -142
+    },
+
+    {
+       11, -143, -143, -143, -143, -143, -143, -143, -143, -143,
+     -143, -143, -143,   58, -143, -143,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,  165,   58,   58,   58,   58, -143
+    },
+
+    {
+       11, -144, -144, -144, -144, -144, -144, -144, -144, -144,
+     -144, -144, -144,   58, -144, -144,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,  166,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -144
+
+    },
+
+    {
+       11, -145, -145, -145, -145, -145, -145, -145, -145, -145,
+     -145, -145, -145,   58, -145, -145,   58,   58,   58,   58,
+      167,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -145
+    },
+
+    {
+       11, -146, -146, -146, -146, -146, -146, -146, -146, -146,
+     -146, -146, -146,   58, -146, -146,   58,   58,   58,   58,
+       58,  168,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -146
+    },
+
+    {
+       11, -147, -147, -147, -147, -147, -147, -147, -147, -147,
+     -147, -147, -147,   58, -147, -147,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,  169,
+       58,   58,   58,   58,   58,   58,   58, -147
+    },
+
+    {
+       11, -148, -148, -148, -148, -148, -148, -148, -148, -148,
+     -148, -148, -148,   58, -148, -148,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -148
+    },
+
+    {
+       11, -149, -149, -149, -149, -149, -149, -149, -149, -149,
+     -149, -149, -149,   58, -149, -149,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  170,   58,
+       58,   58,   58,   58,   58,   58,   58, -149
+
+    },
+
+    {
+       11, -150, -150, -150, -150, -150, -150, -150, -150, -150,
+     -150, -150, -150,   58, -150, -150,   58,   58,   58,   58,
+       58,  171,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -150
+    },
+
+    {
+       11, -151, -151, -151, -151, -151, -151, -151, -151, -151,
+     -151, -151, -151,   58, -151, -151,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,  172,
+       58,   58,   58,   58,   58,   58,   58, -151
+    },
+
+    {
+       11, -152, -152, -152, -152, -152, -152, -152, -152, -152,
+     -152, -152, -152,   58, -152, -152,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,  173,   58,
+       58,   58,   58,   58,   58,   58,   58, -152
+    },
+
+    {
+       11, -153, -153, -153, -153, -153, -153, -153, -153, -153,
+     -153, -153, -153,   58, -153, -153,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  174,   58,   58, -153
+    },
+
+    {
+       11, -154, -154, -154, -154, -154, -154, -154, -154, -154,
+     -154, -154, -154,   58, -154, -154,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -154
+
+    },
+
+    {
+       11, -155, -155, -155, -155, -155, -155, -155, -155, -155,
+     -155, -155, -155,   58, -155, -155,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,  175,   58,   58,   58,   58, -155
+    },
+
+    {
+       11, -156, -156, -156, -156, -156, -156, -156, -156, -156,
+     -156, -156, -156,   58, -156, -156,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  176,   58,   58, -156
+    },
+
+    {
+       11, -157, -157, -157, -157, -157, -157, -157, -157, -157,
+     -157, -157, -157,   58, -157, -157,   58,   58,   58,   58,
+
+       58,  177,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -157
+    },
+
+    {
+       11, -158, -158, -158, -158, -158, -158, -158, -158, -158,
+     -158, -158, -158,   58, -158, -158,   58,   58,   58,   58,
+       58,   58,   58,  178,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -158
+    },
+
+    {
+       11, -159, -159, -159, -159, -159, -159, -159, -159, -159,
+     -159, -159, -159,   58, -159, -159,   58,  179,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -159
+
+    },
+
+    {
+       11, -160, -160, -160, -160, -160, -160, -160, -160, -160,
+     -160, -160, -160,   58, -160, -160,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  180,   58,
+       58,   58,   58,   58,   58,   58,   58, -160
+    },
+
+    {
+       11, -161, -161, -161, -161, -161, -161, -161, -161, -161,
+     -161, -161, -161,   58, -161, -161,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -161
+    },
+
+    {
+       11, -162, -162, -162, -162, -162, -162, -162, -162, -162,
+     -162, -162, -162,   58, -162, -162,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  181,   58,   58, -162
+    },
+
+    {
+       11, -163, -163, -163, -163, -163, -163, -163, -163, -163,
+     -163, -163, -163,   58, -163, -163,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -163
+    },
+
+    {
+       11, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164,   58, -164, -164,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,  182,
+       58,   58,   58,   58,   58,   58,   58, -164
+
+    },
+
+    {
+       11, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165,   58, -165, -165,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  183,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -165
+    },
+
+    {
+       11, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166,   58, -166, -166,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  184,   58,   58, -166
+    },
+
+    {
+       11, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+     -167, -167, -167,   58, -167, -167,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,  185,   58,   58,   58, -167
+    },
+
+    {
+       11, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+     -168, -168, -168,   58, -168, -168,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -168
+    },
+
+    {
+       11, -169, -169, -169, -169, -169, -169, -169, -169, -169,
+     -169, -169, -169,   58, -169, -169,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  186,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -169
+
+    },
+
+    {
+       11, -170, -170, -170, -170, -170, -170, -170, -170, -170,
+     -170, -170, -170,   58, -170, -170,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  187,   58, -170
+    },
+
+    {
+       11, -171, -171, -171, -171, -171, -171, -171, -171, -171,
+     -171, -171, -171,   58, -171, -171,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  188,   58,
+       58,   58,   58,   58,   58,   58,   58, -171
+    },
+
+    {
+       11, -172, -172, -172, -172, -172, -172, -172, -172, -172,
+     -172, -172, -172,   58, -172, -172,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,  189,   58,
+       58,   58,   58,   58,   58,   58,   58, -172
+    },
+
+    {
+       11, -173, -173, -173, -173, -173, -173, -173, -173, -173,
+     -173, -173, -173,   58, -173, -173,   58,  190,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -173
+    },
+
+    {
+       11, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174,   58, -174, -174,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -174
+
+    },
+
+    {
+       11, -175, -175, -175, -175, -175, -175, -175, -175, -175,
+     -175, -175, -175,   58, -175, -175,   58,   58,   58,   58,
+       58,  191,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -175
+    },
+
+    {
+       11, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+     -176, -176, -176,   58, -176, -176,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -176
+    },
+
+    {
+       11, -177, -177, -177, -177, -177, -177, -177, -177, -177,
+     -177, -177, -177,   58, -177, -177,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -177
+    },
+
+    {
+       11, -178, -178, -178, -178, -178, -178, -178, -178, -178,
+     -178, -178, -178,   58, -178, -178,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -178
+    },
+
+    {
+       11, -179, -179, -179, -179, -179, -179, -179, -179, -179,
+     -179, -179, -179,   58, -179, -179,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  192,   58,   58, -179
+
+    },
+
+    {
+       11, -180, -180, -180, -180, -180, -180, -180, -180, -180,
+     -180, -180, -180,   58, -180, -180,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -180
+    },
+
+    {
+       11, -181, -181, -181, -181, -181, -181, -181, -181, -181,
+     -181, -181, -181,   58, -181, -181,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -181
+    },
+
+    {
+       11, -182, -182, -182, -182, -182, -182, -182, -182, -182,
+     -182, -182, -182,   58, -182, -182,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,  193,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -182
+    },
+
+    {
+       11, -183, -183, -183, -183, -183, -183, -183, -183, -183,
+     -183, -183, -183,   58, -183, -183,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,  194,   58,   58,   58, -183
+    },
+
+    {
+       11, -184, -184, -184, -184, -184, -184, -184, -184, -184,
+     -184, -184, -184,   58, -184, -184,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -184
+
+    },
+
+    {
+       11, -185, -185, -185, -185, -185, -185, -185, -185, -185,
+     -185, -185, -185,   58, -185, -185,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -185
+    },
+
+    {
+       11, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186,   58, -186, -186,   58,   58,   58,  195,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -186
+    },
+
+    {
+       11, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187,   58, -187, -187,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -187
+    },
+
+    {
+       11, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188,   58, -188, -188,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,  196,   58, -188
+    },
+
+    {
+       11, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+     -189, -189, -189,   58, -189, -189,   58,   58,   58,   58,
+       58,   58,  197,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -189
+
+    },
+
+    {
+       11, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+     -190, -190, -190,   58, -190, -190,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,  198,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -190
+    },
+
+    {
+       11, -191, -191, -191, -191, -191, -191, -191, -191, -191,
+     -191, -191, -191,   58, -191, -191,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,  199,   58,   58,   58, -191
+    },
+
+    {
+       11, -192, -192, -192, -192, -192, -192, -192, -192, -192,
+     -192, -192, -192,   58, -192, -192,   58,   58,   58,   58,
+
+       58,  200,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -192
+    },
+
+    {
+       11, -193, -193, -193, -193, -193, -193, -193, -193, -193,
+     -193, -193, -193,   58, -193, -193,   58,   58,   58,   58,
+       58,  201,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -193
+    },
+
+    {
+       11, -194, -194, -194, -194, -194, -194, -194, -194, -194,
+     -194, -194, -194,   58, -194, -194,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  202,   58,   58, -194
+
+    },
+
+    {
+       11, -195, -195, -195, -195, -195, -195, -195, -195, -195,
+     -195, -195, -195,   58, -195, -195,   58,   58,   58,   58,
+       58,  203,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -195
+    },
+
+    {
+       11, -196, -196, -196, -196, -196, -196, -196, -196, -196,
+     -196, -196, -196,   58, -196, -196,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -196
+    },
+
+    {
+       11, -197, -197, -197, -197, -197, -197, -197, -197, -197,
+     -197, -197, -197,   58, -197, -197,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,  204,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -197
+    },
+
+    {
+       11, -198, -198, -198, -198, -198, -198, -198, -198, -198,
+     -198, -198, -198,   58, -198, -198,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -198
+    },
+
+    {
+       11, -199, -199, -199, -199, -199, -199, -199, -199, -199,
+     -199, -199, -199,   58, -199, -199,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -199
+
+    },
+
+    {
+       11, -200, -200, -200, -200, -200, -200, -200, -200, -200,
+     -200, -200, -200,   58, -200, -200,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -200
+    },
+
+    {
+       11, -201, -201, -201, -201, -201, -201, -201, -201, -201,
+     -201, -201, -201,   58, -201, -201,   58,  205,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -201
+    },
+
+    {
+       11, -202, -202, -202, -202, -202, -202, -202, -202, -202,
+     -202, -202, -202,   58, -202, -202,   58,  206,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -202
+    },
+
+    {
+       11, -203, -203, -203, -203, -203, -203, -203, -203, -203,
+     -203, -203, -203,   58, -203, -203,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -203
+    },
+
+    {
+       11, -204, -204, -204, -204, -204, -204, -204, -204, -204,
+     -204, -204, -204,   58, -204, -204,   58,   58,   58,   58,
+       58,   58,   58,  207,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -204
+
+    },
+
+    {
+       11, -205, -205, -205, -205, -205, -205, -205, -205, -205,
+     -205, -205, -205,   58, -205, -205,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,  208,   58,
+       58,   58,   58,   58,   58,   58,   58, -205
+    },
+
+    {
+       11, -206, -206, -206, -206, -206, -206, -206, -206, -206,
+     -206, -206, -206,   58, -206, -206,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,  209,   58,   58, -206
+    },
+
+    {
+       11, -207, -207, -207, -207, -207, -207, -207, -207, -207,
+     -207, -207, -207,   58, -207, -207,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -207
+    },
+
+    {
+       11, -208, -208, -208, -208, -208, -208, -208, -208, -208,
+     -208, -208, -208,   58, -208, -208,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -208
+    },
+
+    {
+       11, -209, -209, -209, -209, -209, -209, -209, -209, -209,
+     -209, -209, -209,   58, -209, -209,   58,   58,   58,   58,
+       58,  210,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -209
+
+    },
+
+    {
+       11, -210, -210, -210, -210, -210, -210, -210, -210, -210,
+     -210, -210, -210,   58, -210, -210,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58, -210
+    },
+
+    } ;
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up zconftext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	zconfleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 64
+#define YY_END_OF_BUFFER 65
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[211] =
+    {   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       65,    5,    4,    3,    2,   36,   37,   35,   35,   35,
+       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+       63,   60,   62,   55,   59,   58,   57,   53,   48,   42,
+       47,   51,   53,   40,   41,   50,   50,   43,   53,   50,
+       50,   53,    4,    3,    2,    2,    1,   35,   35,   35,
+       35,   35,   35,   35,   16,   35,   35,   35,   35,   35,
+       35,   35,   35,   35,   35,   35,   63,   60,   62,   61,
+       55,   54,   57,   56,   44,   51,   38,   50,   50,   52,
+       45,   46,   39,   35,   35,   35,   35,   35,   35,   35,
+
+       35,   35,   30,   29,   35,   35,   35,   35,   35,   35,
+       35,   35,   35,   35,   49,   25,   35,   35,   35,   35,
+       35,   35,   35,   35,   35,   35,   15,   35,    7,   35,
+       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
+       35,   35,   35,   35,   35,   35,   35,   17,   35,   35,
+       35,   35,   35,   34,   35,   35,   35,   35,   35,   35,
+       10,   35,   13,   35,   35,   35,   35,   33,   35,   35,
+       35,   35,   35,   22,   35,   32,    9,   31,   35,   26,
+       12,   35,   35,   21,   18,   35,    8,   35,   35,   35,
+       35,   35,   27,   35,   35,    6,   35,   20,   19,   23,
+
+       35,   35,   11,   35,   35,   35,   14,   28,   35,   24
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    6,    1,    1,    7,    8,    9,
+       10,    1,    1,    1,   11,   12,   12,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
+       14,    1,    1,    1,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+        1,   15,    1,    1,   16,    1,   17,   18,   19,   20,
+
+       21,   22,   23,   24,   25,   13,   13,   26,   27,   28,
+       29,   30,   31,   32,   33,   34,   35,   13,   13,   36,
+       13,   13,    1,   37,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+extern int zconf_flex_debug;
+int zconf_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *zconftext;
+
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+#define START_STRSIZE	16
+
+char *text;
+static char *text_ptr;
+static int text_size, text_asize;
+
+struct buffer {
+        struct buffer *parent;
+        YY_BUFFER_STATE state;
+};
+
+struct buffer *current_buf;
+
+static int last_ts, first_ts;
+
+static void zconf_endhelp(void);
+static struct buffer *zconf_endfile(void);
+
+void new_string(void)
+{
+	text = malloc(START_STRSIZE);
+	text_asize = START_STRSIZE;
+	text_ptr = text;
+	text_size = 0;
+	*text_ptr = 0;
+}
+
+void append_string(const char *str, int size)
+{
+	int new_size = text_size + size + 1;
+	if (new_size > text_asize) {
+		text = realloc(text, new_size);
+		text_asize = new_size;
+		text_ptr = text + text_size;
+	}
+	memcpy(text_ptr, str, size);
+	text_ptr += size;
+	text_size += size;
+	*text_ptr = 0;
+}
+
+void alloc_string(const char *str, int size)
+{
+	text = malloc(size + 1);
+	memcpy(text, str, size);
+	text[size] = 0;
+}
+
+#define INITIAL 0
+#define COMMAND 1
+#define HELP 2
+#define STRING 3
+#define PARAM 4
+
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int zconfwrap (void );
+#else
+extern int zconfwrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	errno=0; \
+	while ( (result = read( fileno(zconfin), (char *) buf, max_size )) < 0 ) \
+	{ \
+		if( errno != EINTR) \
+		{ \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+			break; \
+		} \
+		errno=0; \
+		clearerr(zconfin); \
+	}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int zconflex (void);
+
+#define YY_DECL int zconflex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after zconftext and zconfleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+
+	int str = 0;
+	int ts, i;
+
+	if ( (yy_init) )
+		{
+		(yy_init) = 0;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! zconfin )
+			zconfin = stdin;
+
+		if ( ! zconfout )
+			zconfout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			zconfensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				zconf_create_buffer(zconfin,YY_BUF_SIZE );
+		}
+
+		zconf_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of zconftext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		while ( (yy_current_state = yy_nxt[yy_current_state][ yy_ec[YY_SC_TO_UI(*yy_cp)]  ]) > 0 )
+			++yy_cp;
+
+		yy_current_state = -yy_current_state;
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+current_file->lineno++;
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+
+	YY_BREAK
+case 3:
+/* rule 3 can match eol */
+YY_RULE_SETUP
+current_file->lineno++; return T_EOL;
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+{
+	BEGIN(COMMAND);
+}
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+{
+	unput(zconftext[0]);
+	BEGIN(COMMAND);
+}
+	YY_BREAK
+
+case 6:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_MAINMENU;
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_MENU;
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_ENDMENU;
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_SOURCE;
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_CHOICE;
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_ENDCHOICE;
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_COMMENT;
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_CONFIG;
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_MENUCONFIG;
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_HELP;
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_IF;
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_ENDIF;
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_DEPENDS;
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_REQUIRES;
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_OPTIONAL;
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_DEFAULT;
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_PROMPT;
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_TRISTATE;
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_DEF_TRISTATE;
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_BOOLEAN;
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_BOOLEAN;
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_DEF_BOOLEAN;
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_DEF_BOOLEAN;
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_INT;
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_HEX;
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_STRING;
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_SELECT;
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_SELECT;
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
+BEGIN(PARAM); return T_RANGE;
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
+{
+		alloc_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+
+	YY_BREAK
+case 37:
+/* rule 37 can match eol */
+YY_RULE_SETUP
+current_file->lineno++; BEGIN(INITIAL);
+	YY_BREAK
+
+case 38:
+YY_RULE_SETUP
+return T_AND;
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+return T_OR;
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+return T_OPEN_PAREN;
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+return T_CLOSE_PAREN;
+	YY_BREAK
+case 42:
+YY_RULE_SETUP
+return T_NOT;
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
+return T_EQUAL;
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+return T_UNEQUAL;
+	YY_BREAK
+case 45:
+YY_RULE_SETUP
+return T_IF;
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+return T_ON;
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
+{
+		str = zconftext[0];
+		new_string();
+		BEGIN(STRING);
+	}
+	YY_BREAK
+case 48:
+/* rule 48 can match eol */
+YY_RULE_SETUP
+BEGIN(INITIAL); current_file->lineno++; return T_EOL;
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+/* ignore */
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+{
+		alloc_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+/* comment */
+	YY_BREAK
+case 52:
+/* rule 52 can match eol */
+YY_RULE_SETUP
+current_file->lineno++;
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+
+	YY_BREAK
+case YY_STATE_EOF(PARAM):
+{
+		BEGIN(INITIAL);
+	}
+	YY_BREAK
+
+case 54:
+/* rule 54 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		append_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+{
+		append_string(zconftext, zconfleng);
+	}
+	YY_BREAK
+case 56:
+/* rule 56 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		append_string(zconftext + 1, zconfleng - 1);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	YY_BREAK
+case 57:
+YY_RULE_SETUP
+{
+		append_string(zconftext + 1, zconfleng - 1);
+	}
+	YY_BREAK
+case 58:
+YY_RULE_SETUP
+{
+		if (str == zconftext[0]) {
+			BEGIN(PARAM);
+			zconflval.string = text;
+			return T_WORD_QUOTE;
+		} else
+			append_string(zconftext, 1);
+	}
+	YY_BREAK
+case 59:
+/* rule 59 can match eol */
+YY_RULE_SETUP
+{
+		printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+		current_file->lineno++;
+		BEGIN(INITIAL);
+		return T_EOL;
+	}
+	YY_BREAK
+case YY_STATE_EOF(STRING):
+{
+		BEGIN(INITIAL);
+	}
+	YY_BREAK
+
+case 60:
+YY_RULE_SETUP
+{
+		ts = 0;
+		for (i = 0; i < zconfleng; i++) {
+			if (zconftext[i] == '\t')
+				ts = (ts & ~7) + 8;
+			else
+				ts++;
+		}
+		last_ts = ts;
+		if (first_ts) {
+			if (ts < first_ts) {
+				zconf_endhelp();
+				return T_HELPTEXT;
+			}
+			ts -= first_ts;
+			while (ts > 8) {
+				append_string("        ", 8);
+				ts -= 8;
+			}
+			append_string("        ", ts);
+		}
+	}
+	YY_BREAK
+case 61:
+/* rule 61 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		current_file->lineno++;
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	YY_BREAK
+case 62:
+/* rule 62 can match eol */
+YY_RULE_SETUP
+{
+		current_file->lineno++;
+		append_string("\n", 1);
+	}
+	YY_BREAK
+case 63:
+YY_RULE_SETUP
+{
+		append_string(zconftext, zconfleng);
+		if (!first_ts)
+			first_ts = last_ts;
+	}
+	YY_BREAK
+case YY_STATE_EOF(HELP):
+{
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	YY_BREAK
+
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(COMMAND):
+{
+	if (current_buf) {
+		zconf_endfile();
+		return T_EOF;
+	}
+	fclose(zconfin);
+	yyterminate();
+}
+	YY_BREAK
+case 64:
+YY_RULE_SETUP
+YY_FATAL_ERROR( "flex scanner jammed" );
+	YY_BREAK
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed zconfin at a new source and called
+			 * zconflex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = zconfin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( zconfwrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * zconftext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of zconflex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					zconfrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			zconfrestart(zconfin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		yy_current_state = yy_nxt[yy_current_state][(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1)];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+
+	yy_current_state = yy_nxt[yy_current_state][1];
+	yy_is_jam = (yy_current_state <= 0);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up zconftext */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					zconfrestart(zconfin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( zconfwrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve zconftext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ *
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void zconfrestart  (FILE * input_file )
+{
+
+	if ( ! YY_CURRENT_BUFFER ){
+        zconfensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            zconf_create_buffer(zconfin,YY_BUF_SIZE );
+	}
+
+	zconf_init_buffer(YY_CURRENT_BUFFER,input_file );
+	zconf_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ *
+ */
+    void zconf_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		zconfpop_buffer_state();
+	 *		zconfpush_buffer_state(new_buffer);
+     */
+	zconfensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	zconf_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (zconfwrap()) processing, but the only time this flag
+	 * is looked at is after zconfwrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void zconf_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	zconfin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ *
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE zconf_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+
+	b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) zconfalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	zconf_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with zconf_create_buffer()
+ *
+ */
+    void zconf_delete_buffer (YY_BUFFER_STATE  b )
+{
+
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		zconffree((void *) b->yy_ch_buf  );
+
+	zconffree((void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a zconfrestart() or at EOF.
+ */
+    static void zconf_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+
+	zconf_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then zconf_init_buffer was _probably_
+     * called from zconfrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = 0;
+
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ *
+ */
+    void zconf_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		zconf_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *
+ */
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	zconfensure_buffer_stack();
+
+	/* This block is copied from zconf_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from zconf_switch_to_buffer. */
+	zconf_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *
+ */
+void zconfpop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	zconf_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		zconf_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void zconfensure_buffer_stack (void)
+{
+	int num_to_alloc;
+
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)zconfrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ *
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	zconf_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to zconflex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ *
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       zconf_scan_bytes() instead.
+ */
+YY_BUFFER_STATE zconf_scan_string (yyconst char * str )
+{
+
+	return zconf_scan_bytes(str,strlen(str) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to zconflex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ *
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE zconf_scan_bytes  (yyconst char * bytes, int  len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = len + 2;
+	buf = (char *) zconfalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_bytes()" );
+
+	for ( i = 0; i < len; ++i )
+		buf[i] = bytes[i];
+
+	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = zconf_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in zconf_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		zconftext[zconfleng] = (yy_hold_char); \
+		(yy_c_buf_p) = zconftext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		zconfleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ *
+ */
+int zconfget_lineno  (void)
+{
+
+    return zconflineno;
+}
+
+/** Get the input stream.
+ *
+ */
+FILE *zconfget_in  (void)
+{
+        return zconfin;
+}
+
+/** Get the output stream.
+ *
+ */
+FILE *zconfget_out  (void)
+{
+        return zconfout;
+}
+
+/** Get the length of the current token.
+ *
+ */
+int zconfget_leng  (void)
+{
+        return zconfleng;
+}
+
+/** Get the current token.
+ *
+ */
+
+char *zconfget_text  (void)
+{
+        return zconftext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ *
+ */
+void zconfset_lineno (int  line_number )
+{
+
+    zconflineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ *
+ * @see zconf_switch_to_buffer
+ */
+void zconfset_in (FILE *  in_str )
+{
+        zconfin = in_str ;
+}
+
+void zconfset_out (FILE *  out_str )
+{
+        zconfout = out_str ;
+}
+
+int zconfget_debug  (void)
+{
+        return zconf_flex_debug;
+}
+
+void zconfset_debug (int  bdebug )
+{
+        zconf_flex_debug = bdebug ;
+}
+
+/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
+int zconflex_destroy  (void)
+{
+
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		zconf_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		zconfpop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	zconffree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+    	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+    	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *zconfalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *zconfrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void zconffree (void * ptr )
+{
+	free( (char *) ptr );	/* see zconfrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
+#endif
+
+void zconf_starthelp(void)
+{
+	new_string();
+	last_ts = first_ts = 0;
+	BEGIN(HELP);
+}
+
+static void zconf_endhelp(void)
+{
+	zconflval.string = text;
+	BEGIN(INITIAL);
+}
+
+/*
+ * Try to open specified file with following names:
+ * ./name
+ * $(srctree)/name
+ * The latter is used when srctree is separate from objtree
+ * when compiling the kernel.
+ * Return NULL if file is not found.
+ */
+FILE *zconf_fopen(const char *name)
+{
+	char *env, fullname[PATH_MAX+1];
+	FILE *f;
+
+	f = fopen(name, "r");
+	if (!f && name[0] != '/') {
+		env = getenv(SRCTREE);
+		if (env) {
+			sprintf(fullname, "%s/%s", env, name);
+			f = fopen(fullname, "r");
+		}
+	}
+	return f;
+}
+
+void zconf_initscan(const char *name)
+{
+	zconfin = zconf_fopen(name);
+	if (!zconfin) {
+		printf("can't find file %s\n", name);
+		exit(1);
+	}
+
+	current_buf = malloc(sizeof(*current_buf));
+	memset(current_buf, 0, sizeof(*current_buf));
+
+	current_file = file_lookup(name);
+	current_file->lineno = 1;
+	current_file->flags = FILE_BUSY;
+}
+
+void zconf_nextfile(const char *name)
+{
+	struct file *file = file_lookup(name);
+	struct buffer *buf = malloc(sizeof(*buf));
+	memset(buf, 0, sizeof(*buf));
+
+	current_buf->state = YY_CURRENT_BUFFER;
+	zconfin = zconf_fopen(name);
+	if (!zconfin) {
+		printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
+		exit(1);
+	}
+	zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
+	buf->parent = current_buf;
+	current_buf = buf;
+
+	if (file->flags & FILE_BUSY) {
+		printf("recursive scan (%s)?\n", name);
+		exit(1);
+	}
+	if (file->flags & FILE_SCANNED) {
+		printf("file %s already scanned?\n", name);
+		exit(1);
+	}
+	file->flags |= FILE_BUSY;
+	file->lineno = 1;
+	file->parent = current_file;
+	current_file = file;
+}
+
+static struct buffer *zconf_endfile(void)
+{
+	struct buffer *parent;
+
+	current_file->flags |= FILE_SCANNED;
+	current_file->flags &= ~FILE_BUSY;
+	current_file = current_file->parent;
+
+	parent = current_buf->parent;
+	if (parent) {
+		fclose(zconfin);
+		zconf_delete_buffer(YY_CURRENT_BUFFER);
+		zconf_switch_to_buffer(parent->state);
+	}
+	free(current_buf);
+	current_buf = parent;
+
+	return parent;
+}
+
+int zconf_lineno(void)
+{
+	if (current_buf)
+		return current_file->lineno - 1;
+	else
+		return 0;
+}
+
+char *zconf_curname(void)
+{
+	if (current_buf)
+		return current_file->name;
+	else
+		return "<none>";
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc.h b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc.h
new file mode 100644
index 00000000..b8a67fc9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#ifndef LKC_H
+#define LKC_H
+
+#include "expr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef LKC_DIRECT_LINK
+#define P(name,type,arg)	extern type name arg
+#else
+#include "lkc_defs.h"
+#define P(name,type,arg)	extern type (*name ## _p) arg
+#endif
+#include "lkc_proto.h"
+#undef P
+
+#define SRCTREE "srctree"
+
+int zconfparse(void);
+void zconfdump(FILE *out);
+
+extern int zconfdebug;
+void zconf_starthelp(void);
+FILE *zconf_fopen(const char *name);
+void zconf_initscan(const char *name);
+void zconf_nextfile(const char *name);
+int zconf_lineno(void);
+char *zconf_curname(void);
+
+/* confdata.c */
+extern const char conf_def_filename[];
+extern char conf_filename[];
+
+char *conf_get_default_confname(void);
+
+/* kconfig_load.c */
+void kconfig_load(void);
+
+/* menu.c */
+void menu_init(void);
+void menu_add_menu(void);
+void menu_end_menu(void);
+void menu_add_entry(struct symbol *sym);
+void menu_end_entry(void);
+void menu_add_dep(struct expr *dep);
+struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep);
+void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
+void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
+void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
+void menu_finalize(struct menu *parent);
+void menu_set_type(int type);
+
+/* util.c */
+struct file *file_lookup(const char *name);
+int file_write_dep(const char *name);
+
+struct gstr {
+	size_t len;
+	char  *s;
+};
+struct gstr str_new(void);
+struct gstr str_assign(const char *s);
+void str_free(struct gstr *gs);
+void str_append(struct gstr *gs, const char *s);
+void str_printf(struct gstr *gs, const char *fmt, ...);
+const char *str_get(struct gstr *gs);
+
+/* symbol.c */
+void sym_init(void);
+void sym_clear_all_valid(void);
+void sym_set_changed(struct symbol *sym);
+struct symbol *sym_check_deps(struct symbol *sym);
+struct property *prop_alloc(enum prop_type type, struct symbol *sym);
+struct symbol *prop_get_symbol(struct property *prop);
+
+static inline tristate sym_get_tristate_value(struct symbol *sym)
+{
+	return sym->curr.tri;
+}
+
+
+static inline struct symbol *sym_get_choice_value(struct symbol *sym)
+{
+	return (struct symbol *)sym->curr.val;
+}
+
+static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval)
+{
+	return sym_set_tristate_value(chval, yes);
+}
+
+static inline bool sym_is_choice(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_CHOICE ? true : false;
+}
+
+static inline bool sym_is_choice_value(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_CHOICEVAL ? true : false;
+}
+
+static inline bool sym_is_optional(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_OPTIONAL ? true : false;
+}
+
+static inline bool sym_has_value(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_NEW ? false : true;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LKC_H */
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc_proto.h b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc_proto.h
new file mode 100644
index 00000000..6dc6d0c4
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lkc_proto.h
@@ -0,0 +1,40 @@
+
+/* confdata.c */
+P(conf_parse,void,(const char *name));
+P(conf_read,int,(const char *name));
+P(conf_write,int,(const char *name));
+
+/* menu.c */
+P(rootmenu,struct menu,);
+
+P(menu_is_visible,bool,(struct menu *menu));
+P(menu_get_prompt,const char *,(struct menu *menu));
+P(menu_get_root_menu,struct menu *,(struct menu *menu));
+P(menu_get_parent_menu,struct menu *,(struct menu *menu));
+
+/* symbol.c */
+P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
+P(sym_change_count,int,);
+
+P(sym_lookup,struct symbol *,(const char *name, int isconst));
+P(sym_find,struct symbol *,(const char *name));
+P(sym_re_search,struct symbol **,(const char *pattern));
+P(sym_type_name,const char *,(enum symbol_type type));
+P(sym_calc_value,void,(struct symbol *sym));
+P(sym_get_type,enum symbol_type,(struct symbol *sym));
+P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri));
+P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri));
+P(sym_toggle_tristate_value,tristate,(struct symbol *sym));
+P(sym_string_valid,bool,(struct symbol *sym, const char *newval));
+P(sym_string_within_range,bool,(struct symbol *sym, const char *str));
+P(sym_set_string_value,bool,(struct symbol *sym, const char *newval));
+P(sym_is_changable,bool,(struct symbol *sym));
+P(sym_get_choice_prop,struct property *,(struct symbol *sym));
+P(sym_get_default_prop,struct property *,(struct symbol *sym));
+P(sym_get_string_value,const char *,(struct symbol *sym));
+
+P(prop_get_type_name,const char *,(enum prop_type type));
+
+/* expr.c */
+P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2));
+P(expr_print,void,(struct expr *e, void (*fn)(void *, const char *), void *data, int prevtoken));
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
new file mode 100644
index 00000000..a8999d82
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
@@ -0,0 +1,4 @@
+This is NOT the official version of dialog.  This version has been
+significantly modified from the original.  It is for use by the Linux
+kernel configuration script.  Please do not bother Savio Lam with 
+questions about this program.
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c
new file mode 100644
index 00000000..71de4a19
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c
@@ -0,0 +1,372 @@
+/*
+ *  checklist.c -- implements the checklist box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *     Stuart Herbert - S.Herbert@sheffield.ac.uk: radiolist extension
+ *     Alessandro Rubini - rubini@ipvvis.unipv.it: merged the two
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+static int list_width, check_x, item_x, checkflag;
+
+/*
+ * Print list item
+ */
+static void
+print_item (WINDOW * win, const char *item, int status,
+	    int choice, int selected)
+{
+    int i;
+
+    /* Clear 'residue' of last item */
+    wattrset (win, menubox_attr);
+    wmove (win, choice, 0);
+    for (i = 0; i < list_width; i++)
+	waddch (win, ' ');
+
+    wmove (win, choice, check_x);
+    wattrset (win, selected ? check_selected_attr : check_attr);
+    if (checkflag == FLAG_CHECK)
+	wprintw (win, "[%c]", status ? 'X' : ' ');
+    else
+	wprintw (win, "(%c)", status ? 'X' : ' ');
+
+    wattrset (win, selected ? tag_selected_attr : tag_attr);
+    mvwaddch(win, choice, item_x, item[0]);
+    wattrset (win, selected ? item_selected_attr : item_attr);
+    waddstr (win, (char *)item+1);
+    if (selected) {
+    	wmove (win, choice, check_x+1);
+    	wrefresh (win);
+    }
+}
+
+/*
+ * Print the scroll indicators.
+ */
+static void
+print_arrows (WINDOW * win, int choice, int item_no, int scroll,
+		int y, int x, int height)
+{
+    wmove(win, y, x);
+
+    if (scroll > 0) {
+	wattrset (win, uarrow_attr);
+	waddch (win, ACS_UARROW);
+	waddstr (win, "(-)");
+    }
+    else {
+	wattrset (win, menubox_attr);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+    }
+
+   y = y + height + 1;
+   wmove(win, y, x);
+
+   if ((height < item_no) && (scroll + choice < item_no - 1)) {
+	wattrset (win, darrow_attr);
+	waddch (win, ACS_DARROW);
+	waddstr (win, "(+)");
+    }
+    else {
+	wattrset (win, menubox_border_attr);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+   }
+}
+
+/*
+ *  Display the termination buttons
+ */
+static void
+print_buttons( WINDOW *dialog, int height, int width, int selected)
+{
+    int x = width / 2 - 11;
+    int y = height - 2;
+
+    print_button (dialog, "Select", y, x, selected == 0);
+    print_button (dialog, " Help ", y, x + 14, selected == 1);
+
+    wmove(dialog, y, x+1 + 14*selected);
+    wrefresh (dialog);
+}
+
+/*
+ * Display a dialog box with a list of options that can be turned on or off
+ * The `flag' parameter is used to select between radiolist and checklist.
+ */
+int
+dialog_checklist (const char *title, const char *prompt, int height, int width,
+	int list_height, int item_no, struct dialog_list_item ** items,
+	int flag)
+	
+{
+    int i, x, y, box_x, box_y;
+    int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
+    WINDOW *dialog, *list;
+
+    checkflag = flag;
+
+    /* Allocate space for storing item on/off status */
+    if ((status = malloc (sizeof (int) * item_no)) == NULL) {
+	endwin ();
+	fprintf (stderr,
+		 "\nCan't allocate memory in dialog_checklist().\n");
+	exit (-1);
+    }
+
+    /* Initializes status */
+    for (i = 0; i < item_no; i++) {
+	status[i] = (items[i]->selected == 1); /* ON */
+	if ((!choice && status[i]) || items[i]->selected == 2) /* SELECTED */
+            choice = i + 1;
+    }
+    if (choice)
+	    choice--;
+
+    max_choice = MIN (list_height, item_no);
+
+    /* center dialog box on screen */
+    x = (COLS - width) / 2;
+    y = (LINES - height) / 2;
+
+    draw_shadow (stdscr, y, x, height, width);
+
+    dialog = newwin (height, width, y, x);
+    keypad (dialog, TRUE);
+
+    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
+    wattrset (dialog, border_attr);
+    mvwaddch (dialog, height-3, 0, ACS_LTEE);
+    for (i = 0; i < width - 2; i++)
+	waddch (dialog, ACS_HLINE);
+    wattrset (dialog, dialog_attr);
+    waddch (dialog, ACS_RTEE);
+
+    if (title != NULL && strlen(title) >= width-2 ) {
+	/* truncate long title -- mec */
+	char * title2 = malloc(width-2+1);
+	memcpy( title2, title, width-2 );
+	title2[width-2] = '\0';
+	title = title2;
+    }
+
+    if (title != NULL) {
+	wattrset (dialog, title_attr);
+	mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
+	waddstr (dialog, (char *)title);
+	waddch (dialog, ' ');
+    }
+
+    wattrset (dialog, dialog_attr);
+    print_autowrap (dialog, prompt, width - 2, 1, 3);
+
+    list_width = width - 6;
+    box_y = height - list_height - 5;
+    box_x = (width - list_width) / 2 - 1;
+
+    /* create new window for the list */
+    list = subwin (dialog, list_height, list_width, y+box_y+1, x+box_x+1);
+
+    keypad (list, TRUE);
+
+    /* draw a box around the list items */
+    draw_box (dialog, box_y, box_x, list_height + 2, list_width + 2,
+	      menubox_border_attr, menubox_attr);
+
+    /* Find length of longest item in order to center checklist */
+    check_x = 0;
+    for (i = 0; i < item_no; i++) 
+	check_x = MAX (check_x, + strlen (items[i]->name) + 4);
+
+    check_x = (list_width - check_x) / 2;
+    item_x = check_x + 4;
+
+    if (choice >= list_height) {
+	scroll = choice - list_height + 1;
+	choice -= scroll;
+    }
+
+    /* Print the list */
+    for (i = 0; i < max_choice; i++) {
+	print_item (list, items[scroll + i]->name,
+		    status[i+scroll], i, i == choice);
+    }
+
+    print_arrows(dialog, choice, item_no, scroll,
+			box_y, box_x + check_x + 5, list_height);
+
+    print_buttons(dialog, height, width, 0);
+
+    wnoutrefresh (list);
+    wnoutrefresh (dialog);
+    doupdate ();
+
+    while (key != ESC) {
+	key = wgetch (dialog);
+
+    	for (i = 0; i < max_choice; i++)
+            if (toupper(key) == toupper(items[scroll + i]->name[0]))
+                break;
+
+
+	if ( i < max_choice || key == KEY_UP || key == KEY_DOWN || 
+	    key == '+' || key == '-' ) {
+	    if (key == KEY_UP || key == '-') {
+		if (!choice) {
+		    if (!scroll)
+			continue;
+		    /* Scroll list down */
+		    if (list_height > 1) {
+			/* De-highlight current first item */
+			print_item (list, items[scroll]->name,
+					status[scroll], 0, FALSE);
+			scrollok (list, TRUE);
+			wscrl (list, -1);
+			scrollok (list, FALSE);
+		    }
+		    scroll--;
+		    print_item (list, items[scroll]->name,
+				status[scroll], 0, TRUE);
+		    wnoutrefresh (list);
+
+    		    print_arrows(dialog, choice, item_no, scroll,
+				box_y, box_x + check_x + 5, list_height);
+
+		    wrefresh (dialog);
+
+		    continue;	/* wait for another key press */
+		} else
+		    i = choice - 1;
+	    } else if (key == KEY_DOWN || key == '+') {
+		if (choice == max_choice - 1) {
+		    if (scroll + choice >= item_no - 1)
+			continue;
+		    /* Scroll list up */
+		    if (list_height > 1) {
+			/* De-highlight current last item before scrolling up */
+			print_item (list, items[scroll + max_choice - 1]->name,
+				    status[scroll + max_choice - 1],
+				    max_choice - 1, FALSE);
+			scrollok (list, TRUE);
+			scroll (list);
+			scrollok (list, FALSE);
+		    }
+		    scroll++;
+		    print_item (list, items[scroll + max_choice - 1]->name,
+				status[scroll + max_choice - 1],
+				max_choice - 1, TRUE);
+		    wnoutrefresh (list);
+
+    		    print_arrows(dialog, choice, item_no, scroll,
+				box_y, box_x + check_x + 5, list_height);
+
+		    wrefresh (dialog);
+
+		    continue;	/* wait for another key press */
+		} else
+		    i = choice + 1;
+	    }
+	    if (i != choice) {
+		/* De-highlight current item */
+		print_item (list, items[scroll + choice]->name,
+			    status[scroll + choice], choice, FALSE);
+		/* Highlight new item */
+		choice = i;
+		print_item (list, items[scroll + choice]->name,
+			    status[scroll + choice], choice, TRUE);
+		wnoutrefresh (list);
+		wrefresh (dialog);
+	    }
+	    continue;		/* wait for another key press */
+	}
+	switch (key) {
+	case 'H':
+	case 'h':
+	case '?':
+	    for (i = 0; i < item_no; i++)
+		items[i]->selected = 0;
+	    items[scroll + choice]->selected = 1;
+	    delwin (dialog);
+	    free (status);
+	    return 1;
+	case TAB:
+	case KEY_LEFT:
+	case KEY_RIGHT:
+	    button = ((key == KEY_LEFT ? --button : ++button) < 0)
+			? 1 : (button > 1 ? 0 : button);
+
+	    print_buttons(dialog, height, width, button);
+	    wrefresh (dialog);
+	    break;
+	case 'S':
+	case 's':
+	case ' ':
+	case '\n':
+	    if (!button) {
+		if (flag == FLAG_CHECK) {
+		    status[scroll + choice] = !status[scroll + choice];
+		    wmove (list, choice, check_x);
+		    wattrset (list, check_selected_attr);
+		    wprintw (list, "[%c]", status[scroll + choice] ? 'X' : ' ');
+		} else {
+		    if (!status[scroll + choice]) {
+			for (i = 0; i < item_no; i++)
+			    status[i] = 0;
+			status[scroll + choice] = 1;
+			for (i = 0; i < max_choice; i++)
+			    print_item (list, items[scroll + i]->name,
+					status[scroll + i], i, i == choice);
+		    }
+		}
+		wnoutrefresh (list);
+		wrefresh (dialog);
+            
+		for (i = 0; i < item_no; i++) {
+			items[i]->selected = status[i];
+		}
+            } else {
+		    for (i = 0; i < item_no; i++)
+			    items[i]->selected = 0;
+		    items[scroll + choice]->selected = 1;
+	    }
+	    delwin (dialog);
+	    free (status);
+	    return button;
+	case 'X':
+	case 'x':
+	    key = ESC;
+	case ESC:
+	    break;
+	}
+
+	/* Now, update everything... */
+	doupdate ();
+    }
+    
+
+    delwin (dialog);
+    free (status);
+    return -1;			/* ESC pressed */
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h
new file mode 100644
index 00000000..d34dd37c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h
@@ -0,0 +1,161 @@
+/*
+ *  colors.h -- color attribute definitions
+ *
+ *  AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ *   Default color definitions
+ *
+ *   *_FG = foreground
+ *   *_BG = background
+ *   *_HL = highlight?
+ */
+#define SCREEN_FG                    COLOR_CYAN
+#define SCREEN_BG                    COLOR_BLUE
+#define SCREEN_HL                    TRUE
+
+#define SHADOW_FG                    COLOR_BLACK
+#define SHADOW_BG                    COLOR_BLACK
+#define SHADOW_HL                    TRUE
+
+#define DIALOG_FG                    COLOR_BLACK
+#define DIALOG_BG                    COLOR_WHITE
+#define DIALOG_HL                    FALSE
+
+#define TITLE_FG                     COLOR_YELLOW
+#define TITLE_BG                     COLOR_WHITE
+#define TITLE_HL                     TRUE
+
+#define BORDER_FG                    COLOR_WHITE
+#define BORDER_BG                    COLOR_WHITE
+#define BORDER_HL                    TRUE
+
+#define BUTTON_ACTIVE_FG             COLOR_WHITE
+#define BUTTON_ACTIVE_BG             COLOR_BLUE
+#define BUTTON_ACTIVE_HL             TRUE
+
+#define BUTTON_INACTIVE_FG           COLOR_BLACK
+#define BUTTON_INACTIVE_BG           COLOR_WHITE
+#define BUTTON_INACTIVE_HL           FALSE
+
+#define BUTTON_KEY_ACTIVE_FG         COLOR_WHITE
+#define BUTTON_KEY_ACTIVE_BG         COLOR_BLUE
+#define BUTTON_KEY_ACTIVE_HL         TRUE
+
+#define BUTTON_KEY_INACTIVE_FG       COLOR_RED
+#define BUTTON_KEY_INACTIVE_BG       COLOR_WHITE
+#define BUTTON_KEY_INACTIVE_HL       FALSE
+
+#define BUTTON_LABEL_ACTIVE_FG       COLOR_YELLOW
+#define BUTTON_LABEL_ACTIVE_BG       COLOR_BLUE
+#define BUTTON_LABEL_ACTIVE_HL       TRUE
+
+#define BUTTON_LABEL_INACTIVE_FG     COLOR_BLACK
+#define BUTTON_LABEL_INACTIVE_BG     COLOR_WHITE
+#define BUTTON_LABEL_INACTIVE_HL     TRUE
+
+#define INPUTBOX_FG                  COLOR_BLACK
+#define INPUTBOX_BG                  COLOR_WHITE
+#define INPUTBOX_HL                  FALSE
+
+#define INPUTBOX_BORDER_FG           COLOR_BLACK
+#define INPUTBOX_BORDER_BG           COLOR_WHITE
+#define INPUTBOX_BORDER_HL           FALSE
+
+#define SEARCHBOX_FG                 COLOR_BLACK
+#define SEARCHBOX_BG                 COLOR_WHITE
+#define SEARCHBOX_HL                 FALSE
+
+#define SEARCHBOX_TITLE_FG           COLOR_YELLOW
+#define SEARCHBOX_TITLE_BG           COLOR_WHITE
+#define SEARCHBOX_TITLE_HL           TRUE
+
+#define SEARCHBOX_BORDER_FG          COLOR_WHITE
+#define SEARCHBOX_BORDER_BG          COLOR_WHITE
+#define SEARCHBOX_BORDER_HL          TRUE
+
+#define POSITION_INDICATOR_FG        COLOR_YELLOW
+#define POSITION_INDICATOR_BG        COLOR_WHITE
+#define POSITION_INDICATOR_HL        TRUE
+
+#define MENUBOX_FG                   COLOR_BLACK
+#define MENUBOX_BG                   COLOR_WHITE
+#define MENUBOX_HL                   FALSE
+
+#define MENUBOX_BORDER_FG            COLOR_WHITE
+#define MENUBOX_BORDER_BG            COLOR_WHITE
+#define MENUBOX_BORDER_HL            TRUE
+
+#define ITEM_FG                      COLOR_BLACK
+#define ITEM_BG                      COLOR_WHITE
+#define ITEM_HL                      FALSE
+
+#define ITEM_SELECTED_FG             COLOR_WHITE
+#define ITEM_SELECTED_BG             COLOR_BLUE
+#define ITEM_SELECTED_HL             TRUE
+
+#define TAG_FG                       COLOR_YELLOW
+#define TAG_BG                       COLOR_WHITE
+#define TAG_HL                       TRUE
+
+#define TAG_SELECTED_FG              COLOR_YELLOW
+#define TAG_SELECTED_BG              COLOR_BLUE
+#define TAG_SELECTED_HL              TRUE
+
+#define TAG_KEY_FG                   COLOR_YELLOW
+#define TAG_KEY_BG                   COLOR_WHITE
+#define TAG_KEY_HL                   TRUE
+
+#define TAG_KEY_SELECTED_FG          COLOR_YELLOW
+#define TAG_KEY_SELECTED_BG          COLOR_BLUE
+#define TAG_KEY_SELECTED_HL          TRUE
+
+#define CHECK_FG                     COLOR_BLACK
+#define CHECK_BG                     COLOR_WHITE
+#define CHECK_HL                     FALSE
+
+#define CHECK_SELECTED_FG            COLOR_WHITE
+#define CHECK_SELECTED_BG            COLOR_BLUE
+#define CHECK_SELECTED_HL            TRUE
+
+#define UARROW_FG                    COLOR_GREEN
+#define UARROW_BG                    COLOR_WHITE
+#define UARROW_HL                    TRUE
+
+#define DARROW_FG                    COLOR_GREEN
+#define DARROW_BG                    COLOR_WHITE
+#define DARROW_HL                    TRUE
+
+/* End of default color definitions */
+
+#define C_ATTR(x,y)                  ((x ? A_BOLD : 0) | COLOR_PAIR((y)))
+#define COLOR_NAME_LEN               10
+#define COLOR_COUNT                  8
+
+/*
+ * Global variables
+ */
+
+typedef struct {
+    char name[COLOR_NAME_LEN];
+    int value;
+} color_names_st;
+
+extern color_names_st color_names[];
+extern int color_table[][3];
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h
new file mode 100644
index 00000000..7bab3ad0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h
@@ -0,0 +1,199 @@
+
+/*
+ *  dialog.h -- common declarations for all dialog modules
+ *
+ *  AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef CURSES_LOC
+#ifdef __sun__
+#define CURS_MACROS
+#endif
+#include CURSES_LOC
+
+/*
+ * Colors in ncurses 1.9.9e do not work properly since foreground and
+ * background colors are OR'd rather than separately masked.  This version
+ * of dialog was hacked to work with ncurses 1.9.9e, making it incompatible
+ * with standard curses.  The simplest fix (to make this work with standard
+ * curses) uses the wbkgdset() function, not used in the original hack.
+ * Turn it off if we're building with 1.9.9e, since it just confuses things.
+ */
+#if defined(NCURSES_VERSION) && defined(_NEED_WRAP) && !defined(GCC_PRINTFLIKE)
+#define OLD_NCURSES 1
+#undef  wbkgdset
+#define wbkgdset(w,p) /*nothing*/
+#else
+#define OLD_NCURSES 0
+#endif
+
+#define TR(params) _tracef params
+
+#define ESC 27
+#define TAB 9
+#define MAX_LEN 2048
+#define BUF_SIZE (10*1024)
+#define MIN(x,y) (x < y ? x : y)
+#define MAX(x,y) (x > y ? x : y)
+
+
+#ifndef ACS_ULCORNER
+#define ACS_ULCORNER '+'
+#endif
+#ifndef ACS_LLCORNER
+#define ACS_LLCORNER '+'
+#endif
+#ifndef ACS_URCORNER
+#define ACS_URCORNER '+'
+#endif
+#ifndef ACS_LRCORNER
+#define ACS_LRCORNER '+'
+#endif
+#ifndef ACS_HLINE
+#define ACS_HLINE '-'
+#endif
+#ifndef ACS_VLINE
+#define ACS_VLINE '|'
+#endif
+#ifndef ACS_LTEE
+#define ACS_LTEE '+'
+#endif
+#ifndef ACS_RTEE
+#define ACS_RTEE '+'
+#endif
+#ifndef ACS_UARROW
+#define ACS_UARROW '^'
+#endif
+#ifndef ACS_DARROW
+#define ACS_DARROW 'v'
+#endif
+
+/* 
+ * Attribute names
+ */
+#define screen_attr                   attributes[0]
+#define shadow_attr                   attributes[1]
+#define dialog_attr                   attributes[2]
+#define title_attr                    attributes[3]
+#define border_attr                   attributes[4]
+#define button_active_attr            attributes[5]
+#define button_inactive_attr          attributes[6]
+#define button_key_active_attr        attributes[7]
+#define button_key_inactive_attr      attributes[8]
+#define button_label_active_attr      attributes[9]
+#define button_label_inactive_attr    attributes[10]
+#define inputbox_attr                 attributes[11]
+#define inputbox_border_attr          attributes[12]
+#define searchbox_attr                attributes[13]
+#define searchbox_title_attr          attributes[14]
+#define searchbox_border_attr         attributes[15]
+#define position_indicator_attr       attributes[16]
+#define menubox_attr                  attributes[17]
+#define menubox_border_attr           attributes[18]
+#define item_attr                     attributes[19]
+#define item_selected_attr            attributes[20]
+#define tag_attr                      attributes[21]
+#define tag_selected_attr             attributes[22]
+#define tag_key_attr                  attributes[23]
+#define tag_key_selected_attr         attributes[24]
+#define check_attr                    attributes[25]
+#define check_selected_attr           attributes[26]
+#define uarrow_attr                   attributes[27]
+#define darrow_attr                   attributes[28]
+
+/* number of attributes */
+#define ATTRIBUTE_COUNT               29
+
+/*
+ * Global variables
+ */
+extern bool use_colors;
+
+extern chtype attributes[];
+#endif
+
+extern const char *backtitle;
+
+struct dialog_list_item {
+	char *name;
+	int namelen;
+	char *tag;
+	int selected; /* Set to 1 by dialog_*() function. */
+};
+
+/*
+ * Function prototypes
+ */
+
+void init_dialog (void);
+void end_dialog (void);
+void dialog_clear (void);
+#ifdef CURSES_LOC
+void attr_clear (WINDOW * win, int height, int width, chtype attr);
+void color_setup (void);
+void print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x);
+void print_button (WINDOW * win, const char *label, int y, int x, int selected);
+void draw_box (WINDOW * win, int y, int x, int height, int width, chtype box,
+		chtype border);
+void draw_shadow (WINDOW * win, int y, int x, int height, int width);
+#endif
+
+int first_alpha (const char *string, const char *exempt);
+int dialog_yesno (const char *title, const char *prompt, int height, int width);
+int dialog_msgbox (const char *title, const char *prompt, int height,
+		int width, int pause);
+int dialog_textbox (const char *title, const char *file, int height, int width);
+int dialog_menu (const char *title, const char *prompt, int height, int width,
+		int menu_height, const char *choice, int item_no, 
+		struct dialog_list_item ** items);
+int dialog_checklist (const char *title, const char *prompt, int height,
+		int width, int list_height, int item_no,
+		struct dialog_list_item ** items, int flag);
+extern unsigned char dialog_input_result[];
+int dialog_inputbox (const char *title, const char *prompt, int height,
+		int width, const char *init);
+
+struct dialog_list_item *first_sel_item(int item_no,
+		struct dialog_list_item ** items);
+
+/*
+ * This is the base for fictitious keys, which activate
+ * the buttons.
+ *
+ * Mouse-generated keys are the following:
+ *   -- the first 32 are used as numbers, in addition to '0'-'9'
+ *   -- the lowercase are used to signal mouse-enter events (M_EVENT + 'o')
+ *   -- uppercase chars are used to invoke the button (M_EVENT + 'O')
+ */
+#ifdef CURSES_LOC
+#define M_EVENT (KEY_MAX+1)
+#endif
+
+
+/*
+ * The `flag' parameter in checklist is used to select between
+ * radiolist and checklist
+ */
+#define FLAG_CHECK 1
+#define FLAG_RADIO 0
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
new file mode 100644
index 00000000..fa7bebc6
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
@@ -0,0 +1,240 @@
+/*
+ *  inputbox.c -- implements the input box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+unsigned char dialog_input_result[MAX_LEN + 1];
+
+/*
+ *  Print the termination buttons
+ */
+static void
+print_buttons(WINDOW *dialog, int height, int width, int selected)
+{
+    int x = width / 2 - 11;
+    int y = height - 2;
+
+    print_button (dialog, "  Ok  ", y, x, selected==0);
+    print_button (dialog, " Help ", y, x + 14, selected==1);
+
+    wmove(dialog, y, x+1+14*selected);
+    wrefresh(dialog);
+}
+
+/*
+ * Display a dialog box for inputing a string
+ */
+int
+dialog_inputbox (const char *title, const char *prompt, int height, int width,
+		 const char *init)
+{
+    int i, x, y, box_y, box_x, box_width;
+    int input_x = 0, scroll = 0, key = 0, button = -1;
+    unsigned char *instr = dialog_input_result;
+    WINDOW *dialog;
+
+    /* center dialog box on screen */
+    x = (COLS - width) / 2;
+    y = (LINES - height) / 2;
+
+
+    draw_shadow (stdscr, y, x, height, width);
+
+    dialog = newwin (height, width, y, x);
+    keypad (dialog, TRUE);
+
+    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
+    wattrset (dialog, border_attr);
+    mvwaddch (dialog, height-3, 0, ACS_LTEE);
+    for (i = 0; i < width - 2; i++)
+	waddch (dialog, ACS_HLINE);
+    wattrset (dialog, dialog_attr);
+    waddch (dialog, ACS_RTEE);
+
+    if (title != NULL && strlen(title) >= width-2 ) {
+	/* truncate long title -- mec */
+	char * title2 = malloc(width-2+1);
+	memcpy( title2, title, width-2 );
+	title2[width-2] = '\0';
+	title = title2;
+    }
+
+    if (title != NULL) {
+	wattrset (dialog, title_attr);
+	mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
+	waddstr (dialog, (char *)title);
+	waddch (dialog, ' ');
+    }
+
+    wattrset (dialog, dialog_attr);
+    print_autowrap (dialog, prompt, width - 2, 1, 3);
+
+    /* Draw the input field box */
+    box_width = width - 6;
+    getyx (dialog, y, x);
+    box_y = y + 2;
+    box_x = (width - box_width) / 2;
+    draw_box (dialog, y + 1, box_x - 1, 3, box_width + 2,
+	      border_attr, dialog_attr);
+
+    print_buttons(dialog, height, width, 0);
+
+    /* Set up the initial value */
+    wmove (dialog, box_y, box_x);
+    wattrset (dialog, inputbox_attr);
+
+    if (!init)
+	instr[0] = '\0';
+    else
+	strcpy (instr, init);
+
+    input_x = strlen (instr);
+
+    if (input_x >= box_width) {
+	scroll = input_x - box_width + 1;
+	input_x = box_width - 1;
+	for (i = 0; i < box_width - 1; i++)
+	    waddch (dialog, instr[scroll + i]);
+    } else
+	waddstr (dialog, instr);
+
+    wmove (dialog, box_y, box_x + input_x);
+
+    wrefresh (dialog);
+
+    while (key != ESC) {
+	key = wgetch (dialog);
+
+	if (button == -1) {	/* Input box selected */
+	    switch (key) {
+	    case TAB:
+	    case KEY_UP:
+	    case KEY_DOWN:
+		break;
+	    case KEY_LEFT:
+		continue;
+	    case KEY_RIGHT:
+		continue;
+	    case KEY_BACKSPACE:
+	    case 127:
+		if (input_x || scroll) {
+		    wattrset (dialog, inputbox_attr);
+		    if (!input_x) {
+			scroll = scroll < box_width - 1 ?
+			    0 : scroll - (box_width - 1);
+			wmove (dialog, box_y, box_x);
+			for (i = 0; i < box_width; i++)
+			    waddch (dialog, instr[scroll + input_x + i] ?
+				    instr[scroll + input_x + i] : ' ');
+			input_x = strlen (instr) - scroll;
+		    } else
+			input_x--;
+		    instr[scroll + input_x] = '\0';
+		    mvwaddch (dialog, box_y, input_x + box_x, ' ');
+		    wmove (dialog, box_y, input_x + box_x);
+		    wrefresh (dialog);
+		}
+		continue;
+	    default:
+		if (key < 0x100 && isprint (key)) {
+		    if (scroll + input_x < MAX_LEN) {
+			wattrset (dialog, inputbox_attr);
+			instr[scroll + input_x] = key;
+			instr[scroll + input_x + 1] = '\0';
+			if (input_x == box_width - 1) {
+			    scroll++;
+			    wmove (dialog, box_y, box_x);
+			    for (i = 0; i < box_width - 1; i++)
+				waddch (dialog, instr[scroll + i]);
+			} else {
+			    wmove (dialog, box_y, input_x++ + box_x);
+			    waddch (dialog, key);
+			}
+			wrefresh (dialog);
+		    } else
+			flash ();	/* Alarm user about overflow */
+		    continue;
+		}
+	    }
+	}
+	switch (key) {
+	case 'O':
+	case 'o':
+	    delwin (dialog);
+	    return 0;
+	case 'H':
+	case 'h':
+	    delwin (dialog);
+	    return 1;
+	case KEY_UP:
+	case KEY_LEFT:
+	    switch (button) {
+	    case -1:
+		button = 1;	/* Indicates "Cancel" button is selected */
+		print_buttons(dialog, height, width, 1);
+		break;
+	    case 0:
+		button = -1;	/* Indicates input box is selected */
+		print_buttons(dialog, height, width, 0);
+		wmove (dialog, box_y, box_x + input_x);
+		wrefresh (dialog);
+		break;
+	    case 1:
+		button = 0;	/* Indicates "OK" button is selected */
+		print_buttons(dialog, height, width, 0);
+		break;
+	    }
+	    break;
+	case TAB:
+	case KEY_DOWN:
+	case KEY_RIGHT:
+	    switch (button) {
+	    case -1:
+		button = 0;	/* Indicates "OK" button is selected */
+		print_buttons(dialog, height, width, 0);
+		break;
+	    case 0:
+		button = 1;	/* Indicates "Cancel" button is selected */
+		print_buttons(dialog, height, width, 1);
+		break;
+	    case 1:
+		button = -1;	/* Indicates input box is selected */
+		print_buttons(dialog, height, width, 0);
+		wmove (dialog, box_y, box_x + input_x);
+		wrefresh (dialog);
+		break;
+	    }
+	    break;
+	case ' ':
+	case '\n':
+	    delwin (dialog);
+	    return (button == -1 ? 0 : button);
+	case 'X':
+	case 'x':
+	    key = ESC;
+	case ESC:
+	    break;
+	}
+    }
+
+    delwin (dialog);
+    return -1;			/* ESC pressed */
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c
new file mode 100644
index 00000000..873dc587
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c
@@ -0,0 +1,438 @@
+/*
+ *  menubox.c -- implements the menu box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ *  Changes by Clifford Wolf (god@clifford.at)
+ *
+ *  [ 1998-06-13 ]
+ *
+ *    *)  A bugfix for the Page-Down problem
+ *
+ *    *)  Formerly when I used Page Down and Page Up, the cursor would be set 
+ *        to the first position in the menu box.  Now lxdialog is a bit
+ *        smarter and works more like other menu systems (just have a look at
+ *        it).
+ *
+ *    *)  Formerly if I selected something my scrolling would be broken because
+ *        lxdialog is re-invoked by the Menuconfig shell script, can't
+ *        remember the last scrolling position, and just sets it so that the
+ *        cursor is at the bottom of the box.  Now it writes the temporary file
+ *        lxdialog.scrltmp which contains this information. The file is
+ *        deleted by lxdialog if the user leaves a submenu or enters a new
+ *        one, but it would be nice if Menuconfig could make another "rm -f"
+ *        just to be sure.  Just try it out - you will recognise a difference!
+ *
+ *  [ 1998-06-14 ]
+ *
+ *    *)  Now lxdialog is crash-safe against broken "lxdialog.scrltmp" files
+ *        and menus change their size on the fly.
+ *
+ *    *)  If for some reason the last scrolling position is not saved by
+ *        lxdialog, it sets the scrolling so that the selected item is in the
+ *        middle of the menu box, not at the bottom.
+ *
+ * 02 January 1999, Michael Elizabeth Chastain (mec@shout.net)
+ * Reset 'scroll' to 0 if the value from lxdialog.scrltmp is bogus.
+ * This fixes a bug in Menuconfig where using ' ' to descend into menus
+ * would leave mis-synchronized lxdialog.scrltmp files lying around,
+ * fscanf would read in 'scroll', and eventually that value would get used.
+ */
+
+#include "dialog.h"
+
+static int menu_width, item_x;
+
+/*
+ * Print menu item
+ */
+static void
+print_item (WINDOW * win, const char *item, int choice, int selected, int hotkey)
+{
+    int j;
+    char menu_item[menu_width+1];
+
+    strncpy(menu_item, item, menu_width);
+    menu_item[menu_width] = 0;
+    j = first_alpha(menu_item, "YyNnMmHh");
+
+    /* Clear 'residue' of last item */
+    wattrset (win, menubox_attr);
+    wmove (win, choice, 0);
+#if OLD_NCURSES
+    {
+        int i;
+        for (i = 0; i < menu_width; i++)
+	    waddch (win, ' ');
+    }
+#else
+    wclrtoeol(win);
+#endif
+    wattrset (win, selected ? item_selected_attr : item_attr);
+    mvwaddstr (win, choice, item_x, menu_item);
+    if (hotkey) {
+    	wattrset (win, selected ? tag_key_selected_attr : tag_key_attr);
+    	mvwaddch(win, choice, item_x+j, menu_item[j]);
+    }
+    if (selected) {
+	wmove (win, choice, item_x+1);
+	wrefresh (win);
+    }
+}
+
+/*
+ * Print the scroll indicators.
+ */
+static void
+print_arrows (WINDOW * win, int item_no, int scroll,
+		int y, int x, int height)
+{
+    int cur_y, cur_x;
+
+    getyx(win, cur_y, cur_x);
+
+    wmove(win, y, x);
+
+    if (scroll > 0) {
+	wattrset (win, uarrow_attr);
+	waddch (win, ACS_UARROW);
+	waddstr (win, "(-)");
+    }
+    else {
+	wattrset (win, menubox_attr);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+    }
+
+   y = y + height + 1;
+   wmove(win, y, x);
+
+   if ((height < item_no) && (scroll + height < item_no)) {
+	wattrset (win, darrow_attr);
+	waddch (win, ACS_DARROW);
+	waddstr (win, "(+)");
+    }
+    else {
+	wattrset (win, menubox_border_attr);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+	waddch (win, ACS_HLINE);
+   }
+
+   wmove(win, cur_y, cur_x);
+}
+
+/*
+ * Display the termination buttons.
+ */
+static void
+print_buttons (WINDOW *win, int height, int width, int selected)
+{
+    int x = width / 2 - 16;
+    int y = height - 2;
+
+    print_button (win, "Select", y, x, selected == 0);
+    print_button (win, " Exit ", y, x + 12, selected == 1);
+    print_button (win, " Help ", y, x + 24, selected == 2);
+
+    wmove(win, y, x+1+12*selected);
+    wrefresh (win);
+}
+
+/*
+ * Display a menu for choosing among a number of options
+ */
+int
+dialog_menu (const char *title, const char *prompt, int height, int width,
+		int menu_height, const char *current, int item_no,
+		struct dialog_list_item ** items)
+{
+    int i, j, x, y, box_x, box_y;
+    int key = 0, button = 0, scroll = 0, choice = 0, first_item = 0, max_choice;
+    WINDOW *dialog, *menu;
+    FILE *f;
+
+    max_choice = MIN (menu_height, item_no);
+
+    /* center dialog box on screen */
+    x = (COLS - width) / 2;
+    y = (LINES - height) / 2;
+
+    draw_shadow (stdscr, y, x, height, width);
+
+    dialog = newwin (height, width, y, x);
+    keypad (dialog, TRUE);
+
+    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
+    wattrset (dialog, border_attr);
+    mvwaddch (dialog, height - 3, 0, ACS_LTEE);
+    for (i = 0; i < width - 2; i++)
+	waddch (dialog, ACS_HLINE);
+    wattrset (dialog, dialog_attr);
+    wbkgdset (dialog, dialog_attr & A_COLOR);
+    waddch (dialog, ACS_RTEE);
+
+    if (title != NULL && strlen(title) >= width-2 ) {
+	/* truncate long title -- mec */
+	char * title2 = malloc(width-2+1);
+	memcpy( title2, title, width-2 );
+	title2[width-2] = '\0';
+	title = title2;
+    }
+
+    if (title != NULL) {
+	wattrset (dialog, title_attr);
+	mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
+	waddstr (dialog, (char *)title);
+	waddch (dialog, ' ');
+    }
+
+    wattrset (dialog, dialog_attr);
+    print_autowrap (dialog, prompt, width - 2, 1, 3);
+
+    menu_width = width - 6;
+    box_y = height - menu_height - 5;
+    box_x = (width - menu_width) / 2 - 1;
+
+    /* create new window for the menu */
+    menu = subwin (dialog, menu_height, menu_width,
+		y + box_y + 1, x + box_x + 1);
+    keypad (menu, TRUE);
+
+    /* draw a box around the menu items */
+    draw_box (dialog, box_y, box_x, menu_height + 2, menu_width + 2,
+	      menubox_border_attr, menubox_attr);
+
+    /*
+     * Find length of longest item in order to center menu.
+     * Set 'choice' to default item. 
+     */
+    item_x = 0;
+    for (i = 0; i < item_no; i++) {
+	item_x = MAX (item_x, MIN(menu_width, strlen (items[i]->name) + 2));
+	if (strcmp(current, items[i]->tag) == 0) choice = i;
+    }
+
+    item_x = (menu_width - item_x) / 2;
+
+    /* get the scroll info from the temp file */
+    if ( (f=fopen("lxdialog.scrltmp","r")) != NULL ) {
+	if ( (fscanf(f,"%d\n",&scroll) == 1) && (scroll <= choice) &&
+	     (scroll+max_choice > choice) && (scroll >= 0) &&
+	     (scroll+max_choice <= item_no) ) {
+	    first_item = scroll;
+	    choice = choice - scroll;
+	    fclose(f);
+	} else {
+	    scroll=0;
+	    remove("lxdialog.scrltmp");
+	    fclose(f);
+	    f=NULL;
+	}
+    }
+    if ( (choice >= max_choice) || (f==NULL && choice >= max_choice/2) ) {
+	if (choice >= item_no-max_choice/2)
+	    scroll = first_item = item_no-max_choice;
+	else
+	    scroll = first_item = choice - max_choice/2;
+	choice = choice - scroll;
+    }
+
+    /* Print the menu */
+    for (i=0; i < max_choice; i++) {
+	print_item (menu, items[first_item + i]->name, i, i == choice,
+                    (items[first_item + i]->tag[0] != ':'));
+    }
+
+    wnoutrefresh (menu);
+
+    print_arrows(dialog, item_no, scroll,
+		 box_y, box_x+item_x+1, menu_height);
+
+    print_buttons (dialog, height, width, 0);
+    wmove (menu, choice, item_x+1);
+    wrefresh (menu);
+
+    while (key != ESC) {
+	key = wgetch(menu);
+
+	if (key < 256 && isalpha(key)) key = tolower(key);
+
+	if (strchr("ynmh", key))
+		i = max_choice;
+	else {
+        for (i = choice+1; i < max_choice; i++) {
+		j = first_alpha(items[scroll + i]->name, "YyNnMmHh");
+		if (key == tolower(items[scroll + i]->name[j]))
+                	break;
+	}
+	if (i == max_choice)
+       		for (i = 0; i < max_choice; i++) {
+			j = first_alpha(items[scroll + i]->name, "YyNnMmHh");
+			if (key == tolower(items[scroll + i]->name[j]))
+                		break;
+		}
+	}
+
+	if (i < max_choice || 
+            key == KEY_UP || key == KEY_DOWN ||
+            key == '-' || key == '+' ||
+            key == KEY_PPAGE || key == KEY_NPAGE) {
+
+            print_item (menu, items[scroll + choice]->name, choice, FALSE,
+                       (items[scroll + choice]->tag[0] != ':'));
+
+	    if (key == KEY_UP || key == '-') {
+                if (choice < 2 && scroll) {
+	            /* Scroll menu down */
+                    scrollok (menu, TRUE);
+                    wscrl (menu, -1);
+                    scrollok (menu, FALSE);
+
+                    scroll--;
+
+                    print_item (menu, items[scroll]->name, 0, FALSE,
+                               (items[scroll]->tag[0] != ':'));
+		} else
+		    choice = MAX(choice - 1, 0);
+
+	    } else if (key == KEY_DOWN || key == '+')  {
+
+		print_item (menu, items[scroll + choice]->name, choice, FALSE,
+                                (items[scroll + choice]->tag[0] != ':'));
+
+                if ((choice > max_choice-3) &&
+                    (scroll + max_choice < item_no)
+                   ) {
+		    /* Scroll menu up */
+		    scrollok (menu, TRUE);
+                    scroll (menu);
+                    scrollok (menu, FALSE);
+
+                    scroll++;
+
+                    print_item (menu, items[scroll + max_choice - 1]->name,
+                               max_choice-1, FALSE,
+                               (items[scroll + max_choice - 1]->tag[0] != ':'));
+                } else
+                    choice = MIN(choice+1, max_choice-1);
+
+	    } else if (key == KEY_PPAGE) {
+	        scrollok (menu, TRUE);
+                for (i=0; (i < max_choice); i++) {
+                    if (scroll > 0) {
+                	wscrl (menu, -1);
+                	scroll--;
+                	print_item (menu, items[scroll]->name, 0, FALSE,
+                	(items[scroll]->tag[0] != ':'));
+                    } else {
+                        if (choice > 0)
+                            choice--;
+                    }
+                }
+                scrollok (menu, FALSE);
+
+            } else if (key == KEY_NPAGE) {
+                for (i=0; (i < max_choice); i++) {
+                    if (scroll+max_choice < item_no) {
+			scrollok (menu, TRUE);
+			scroll(menu);
+			scrollok (menu, FALSE);
+                	scroll++;
+                	print_item (menu, items[scroll + max_choice - 1]->name,
+			            max_choice-1, FALSE,
+			            (items[scroll + max_choice - 1]->tag[0] != ':'));
+		    } else {
+			if (choice+1 < max_choice)
+			    choice++;
+		    }
+                }
+
+            } else
+                choice = i;
+
+            print_item (menu, items[scroll + choice]->name, choice, TRUE,
+                       (items[scroll + choice]->tag[0] != ':'));
+
+            print_arrows(dialog, item_no, scroll,
+                         box_y, box_x+item_x+1, menu_height);
+
+            wnoutrefresh (dialog);
+            wrefresh (menu);
+
+	    continue;		/* wait for another key press */
+        }
+
+	switch (key) {
+	case KEY_LEFT:
+	case TAB:
+	case KEY_RIGHT:
+	    button = ((key == KEY_LEFT ? --button : ++button) < 0)
+			? 2 : (button > 2 ? 0 : button);
+
+	    print_buttons(dialog, height, width, button);
+	    wrefresh (menu);
+	    break;
+	case ' ':
+	case 's':
+	case 'y':
+	case 'n':
+	case 'm':
+	case '/':
+	    /* save scroll info */
+	    if ( (f=fopen("lxdialog.scrltmp","w")) != NULL ) {
+		fprintf(f,"%d\n",scroll);
+		fclose(f);
+	    }
+	    delwin (dialog);
+            items[scroll + choice]->selected = 1;
+            switch (key) {
+            case 's': return 3;
+            case 'y': return 3;
+            case 'n': return 4;
+            case 'm': return 5;
+            case ' ': return 6;
+            case '/': return 7;
+            }
+	    return 0;
+	case 'h':
+	case '?':
+	    button = 2;
+	case '\n':
+	    delwin (dialog);
+	    items[scroll + choice]->selected = 1;
+
+	    remove("lxdialog.scrltmp");
+	    return button;
+	case 'e':
+	case 'x':
+	    key = ESC;
+	case ESC:
+	    break;
+	}
+    }
+
+    delwin (dialog);
+    remove("lxdialog.scrltmp");
+    return -1;			/* ESC pressed */
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
new file mode 100644
index 00000000..93692e1f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
@@ -0,0 +1,85 @@
+/*
+ *  msgbox.c -- implements the message box and info box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+/*
+ * Display a message box. Program will pause and display an "OK" button
+ * if the parameter 'pause' is non-zero.
+ */
+int
+dialog_msgbox (const char *title, const char *prompt, int height, int width,
+		int pause)
+{
+    int i, x, y, key = 0;
+    WINDOW *dialog;
+
+    /* center dialog box on screen */
+    x = (COLS - width) / 2;
+    y = (LINES - height) / 2;
+
+    draw_shadow (stdscr, y, x, height, width);
+
+    dialog = newwin (height, width, y, x);
+    keypad (dialog, TRUE);
+
+    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
+
+    if (title != NULL && strlen(title) >= width-2 ) {
+	/* truncate long title -- mec */
+	char * title2 = malloc(width-2+1);
+	memcpy( title2, title, width-2 );
+	title2[width-2] = '\0';
+	title = title2;
+    }
+
+    if (title != NULL) {
+	wattrset (dialog, title_attr);
+	mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
+	waddstr (dialog, (char *)title);
+	waddch (dialog, ' ');
+    }
+    wattrset (dialog, dialog_attr);
+    print_autowrap (dialog, prompt, width - 2, 1, 2);
+
+    if (pause) {
+	wattrset (dialog, border_attr);
+	mvwaddch (dialog, height - 3, 0, ACS_LTEE);
+	for (i = 0; i < width - 2; i++)
+	    waddch (dialog, ACS_HLINE);
+	wattrset (dialog, dialog_attr);
+	waddch (dialog, ACS_RTEE);
+
+	print_button (dialog, "  Ok  ",
+		      height - 2, width / 2 - 4, TRUE);
+
+	wrefresh (dialog);
+	while (key != ESC && key != '\n' && key != ' ' &&
+               key != 'O' && key != 'o' && key != 'X' && key != 'x')
+	    key = wgetch (dialog);
+    } else {
+	key = '\n';
+	wrefresh (dialog);
+    }
+
+    delwin (dialog);
+    return key == ESC ? -1 : 0;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c
new file mode 100644
index 00000000..a5a460b5
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c
@@ -0,0 +1,556 @@
+/*
+ *  textbox.c -- implements the text box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+static void back_lines (int n);
+static void print_page (WINDOW * win, int height, int width);
+static void print_line (WINDOW * win, int row, int width);
+static char *get_line (void);
+static void print_position (WINDOW * win, int height, int width);
+
+static int hscroll, fd, file_size, bytes_read;
+static int begin_reached = 1, end_reached, page_length;
+static char *buf, *page;
+
+/*
+ * Display text from a file in a dialog box.
+ */
+int
+dialog_textbox (const char *title, const char *file, int height, int width)
+{
+    int i, x, y, cur_x, cur_y, fpos, key = 0;
+    int passed_end;
+    char search_term[MAX_LEN + 1];
+    WINDOW *dialog, *text;
+
+    search_term[0] = '\0';	/* no search term entered yet */
+
+    /* Open input file for reading */
+    if ((fd = open (file, O_RDONLY)) == -1) {
+	endwin ();
+	fprintf (stderr,
+		 "\nCan't open input file in dialog_textbox().\n");
+	exit (-1);
+    }
+    /* Get file size. Actually, 'file_size' is the real file size - 1,
+       since it's only the last byte offset from the beginning */
+    if ((file_size = lseek (fd, 0, SEEK_END)) == -1) {
+	endwin ();
+	fprintf (stderr, "\nError getting file size in dialog_textbox().\n");
+	exit (-1);
+    }
+    /* Restore file pointer to beginning of file after getting file size */
+    if (lseek (fd, 0, SEEK_SET) == -1) {
+	endwin ();
+	fprintf (stderr, "\nError moving file pointer in dialog_textbox().\n");
+	exit (-1);
+    }
+    /* Allocate space for read buffer */
+    if ((buf = malloc (BUF_SIZE + 1)) == NULL) {
+	endwin ();
+	fprintf (stderr, "\nCan't allocate memory in dialog_textbox().\n");
+	exit (-1);
+    }
+    if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
+	endwin ();
+	fprintf (stderr, "\nError reading file in dialog_textbox().\n");
+	exit (-1);
+    }
+    buf[bytes_read] = '\0';	/* mark end of valid data */
+    page = buf;			/* page is pointer to start of page to be displayed */
+
+    /* center dialog box on screen */
+    x = (COLS - width) / 2;
+    y = (LINES - height) / 2;
+
+
+    draw_shadow (stdscr, y, x, height, width);
+
+    dialog = newwin (height, width, y, x);
+    keypad (dialog, TRUE);
+
+    /* Create window for text region, used for scrolling text */
+    text = subwin (dialog, height - 4, width - 2, y + 1, x + 1);
+    wattrset (text, dialog_attr);
+    wbkgdset (text, dialog_attr & A_COLOR);
+
+    keypad (text, TRUE);
+
+    /* register the new window, along with its borders */
+    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
+
+    wattrset (dialog, border_attr);
+    mvwaddch (dialog, height-3, 0, ACS_LTEE);
+    for (i = 0; i < width - 2; i++)
+	waddch (dialog, ACS_HLINE);
+    wattrset (dialog, dialog_attr);
+    wbkgdset (dialog, dialog_attr & A_COLOR);
+    waddch (dialog, ACS_RTEE);
+
+    if (title != NULL && strlen(title) >= width-2 ) {
+	/* truncate long title -- mec */
+	char * title2 = malloc(width-2+1);
+	memcpy( title2, title, width-2 );
+	title2[width-2] = '\0';
+	title = title2;
+    }
+
+    if (title != NULL) {
+	wattrset (dialog, title_attr);
+	mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
+	waddstr (dialog, (char *)title);
+	waddch (dialog, ' ');
+    }
+    print_button (dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
+    wnoutrefresh (dialog);
+    getyx (dialog, cur_y, cur_x);	/* Save cursor position */
+
+    /* Print first page of text */
+    attr_clear (text, height - 4, width - 2, dialog_attr);
+    print_page (text, height - 4, width - 2);
+    print_position (dialog, height, width);
+    wmove (dialog, cur_y, cur_x);	/* Restore cursor position */
+    wrefresh (dialog);
+
+    while ((key != ESC) && (key != '\n')) {
+	key = wgetch (dialog);
+	switch (key) {
+	case 'E':		/* Exit */
+	case 'e':
+	case 'X':
+	case 'x':
+	    delwin (dialog);
+	    free (buf);
+	    close (fd);
+	    return 0;
+	case 'g':		/* First page */
+	case KEY_HOME:
+	    if (!begin_reached) {
+		begin_reached = 1;
+		/* First page not in buffer? */
+		if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
+		    endwin ();
+		    fprintf (stderr,
+		      "\nError moving file pointer in dialog_textbox().\n");
+		    exit (-1);
+		}
+		if (fpos > bytes_read) {	/* Yes, we have to read it in */
+		    if (lseek (fd, 0, SEEK_SET) == -1) {
+			endwin ();
+			fprintf (stderr, "\nError moving file pointer in "
+				 "dialog_textbox().\n");
+			exit (-1);
+		    }
+		    if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
+			endwin ();
+			fprintf (stderr,
+			     "\nError reading file in dialog_textbox().\n");
+			exit (-1);
+		    }
+		    buf[bytes_read] = '\0';
+		}
+		page = buf;
+		print_page (text, height - 4, width - 2);
+		print_position (dialog, height, width);
+		wmove (dialog, cur_y, cur_x);	/* Restore cursor position */
+		wrefresh (dialog);
+	    }
+	    break;
+	case 'G':		/* Last page */
+	case KEY_END:
+
+	    end_reached = 1;
+	    /* Last page not in buffer? */
+	    if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
+		endwin ();
+		fprintf (stderr,
+		      "\nError moving file pointer in dialog_textbox().\n");
+		exit (-1);
+	    }
+	    if (fpos < file_size) {	/* Yes, we have to read it in */
+		if (lseek (fd, -BUF_SIZE, SEEK_END) == -1) {
+		    endwin ();
+		    fprintf (stderr,
+		      "\nError moving file pointer in dialog_textbox().\n");
+		    exit (-1);
+		}
+		if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
+		    endwin ();
+		    fprintf (stderr,
+			     "\nError reading file in dialog_textbox().\n");
+		    exit (-1);
+		}
+		buf[bytes_read] = '\0';
+	    }
+	    page = buf + bytes_read;
+	    back_lines (height - 4);
+	    print_page (text, height - 4, width - 2);
+	    print_position (dialog, height, width);
+	    wmove (dialog, cur_y, cur_x);	/* Restore cursor position */
+	    wrefresh (dialog);
+	    break;
+	case 'K':		/* Previous line */
+	case 'k':
+	case KEY_UP:
+	    if (!begin_reached) {
+		back_lines (page_length + 1);
+
+		/* We don't call print_page() here but use scrolling to ensure
+		   faster screen update. However, 'end_reached' and
+		   'page_length' should still be updated, and 'page' should
+		   point to start of next page. This is done by calling
+		   get_line() in the following 'for' loop. */
+		scrollok (text, TRUE);
+		wscrl (text, -1);	/* Scroll text region down one line */
+		scrollok (text, FALSE);
+		page_length = 0;
+		passed_end = 0;
+		for (i = 0; i < height - 4; i++) {
+		    if (!i) {
+			/* print first line of page */
+			print_line (text, 0, width - 2);
+			wnoutrefresh (text);
+		    } else
+			/* Called to update 'end_reached' and 'page' */
+			get_line ();
+		    if (!passed_end)
+			page_length++;
+		    if (end_reached && !passed_end)
+			passed_end = 1;
+		}
+
+		print_position (dialog, height, width);
+		wmove (dialog, cur_y, cur_x);	/* Restore cursor position */
+		wrefresh (dialog);
+	    }
+	    break;
+	case 'B':		/* Previous page */
+	case 'b':
+	case KEY_PPAGE:
+	    if (begin_reached)
+		break;
+	    back_lines (page_length + height - 4);
+	    print_page (text, height - 4, width - 2);
+	    print_position (dialog, height, width);
+	    wmove (dialog, cur_y, cur_x);
+	    wrefresh (dialog);
+	    break;
+	case 'J':		/* Next line */
+	case 'j':
+	case KEY_DOWN:
+	    if (!end_reached) {
+		begin_reached = 0;
+		scrollok (text, TRUE);
+		scroll (text);	/* Scroll text region up one line */
+		scrollok (text, FALSE);
+		print_line (text, height - 5, width - 2);
+		wnoutrefresh (text);
+		print_position (dialog, height, width);
+		wmove (dialog, cur_y, cur_x);	/* Restore cursor position */
+		wrefresh (dialog);
+	    }
+	    break;
+	case KEY_NPAGE:		/* Next page */
+	case ' ':
+	    if (end_reached)
+		break;
+
+	    begin_reached = 0;
+	    print_page (text, height - 4, width - 2);
+	    print_position (dialog, height, width);
+	    wmove (dialog, cur_y, cur_x);
+	    wrefresh (dialog);
+	    break;
+	case '0':		/* Beginning of line */
+	case 'H':		/* Scroll left */
+	case 'h':
+	case KEY_LEFT:
+	    if (hscroll <= 0)
+		break;
+
+	    if (key == '0')
+		hscroll = 0;
+	    else
+		hscroll--;
+	    /* Reprint current page to scroll horizontally */
+	    back_lines (page_length);
+	    print_page (text, height - 4, width - 2);
+	    wmove (dialog, cur_y, cur_x);
+	    wrefresh (dialog);
+	    break;
+	case 'L':		/* Scroll right */
+	case 'l':
+	case KEY_RIGHT:
+	    if (hscroll >= MAX_LEN)
+		break;
+	    hscroll++;
+	    /* Reprint current page to scroll horizontally */
+	    back_lines (page_length);
+	    print_page (text, height - 4, width - 2);
+	    wmove (dialog, cur_y, cur_x);
+	    wrefresh (dialog);
+	    break;
+	case ESC:
+	    break;
+	}
+    }
+
+    delwin (dialog);
+    free (buf);
+    close (fd);
+    return 1;			/* ESC pressed */
+}
+
+/*
+ * Go back 'n' lines in text file. Called by dialog_textbox().
+ * 'page' will be updated to point to the desired line in 'buf'.
+ */
+static void
+back_lines (int n)
+{
+    int i, fpos;
+
+    begin_reached = 0;
+    /* We have to distinguish between end_reached and !end_reached
+       since at end of file, the line is not ended by a '\n'.
+       The code inside 'if' basically does a '--page' to move one
+       character backward so as to skip '\n' of the previous line */
+    if (!end_reached) {
+	/* Either beginning of buffer or beginning of file reached? */
+	if (page == buf) {
+	    if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
+		endwin ();
+		fprintf (stderr, "\nError moving file pointer in "
+			 "back_lines().\n");
+		exit (-1);
+	    }
+	    if (fpos > bytes_read) {	/* Not beginning of file yet */
+		/* We've reached beginning of buffer, but not beginning of
+		   file yet, so read previous part of file into buffer.
+		   Note that we only move backward for BUF_SIZE/2 bytes,
+		   but not BUF_SIZE bytes to avoid re-reading again in
+		   print_page() later */
+		/* Really possible to move backward BUF_SIZE/2 bytes? */
+		if (fpos < BUF_SIZE / 2 + bytes_read) {
+		    /* No, move less then */
+		    if (lseek (fd, 0, SEEK_SET) == -1) {
+			endwin ();
+			fprintf (stderr, "\nError moving file pointer in "
+				 "back_lines().\n");
+			exit (-1);
+		    }
+		    page = buf + fpos - bytes_read;
+		} else {	/* Move backward BUF_SIZE/2 bytes */
+		    if (lseek (fd, -(BUF_SIZE / 2 + bytes_read), SEEK_CUR)
+			== -1) {
+			endwin ();
+			fprintf (stderr, "\nError moving file pointer "
+				 "in back_lines().\n");
+			exit (-1);
+		    }
+		    page = buf + BUF_SIZE / 2;
+		}
+		if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
+		    endwin ();
+		    fprintf (stderr, "\nError reading file in back_lines().\n");
+		    exit (-1);
+		}
+		buf[bytes_read] = '\0';
+	    } else {		/* Beginning of file reached */
+		begin_reached = 1;
+		return;
+	    }
+	}
+	if (*(--page) != '\n') {	/* '--page' here */
+	    /* Something's wrong... */
+	    endwin ();
+	    fprintf (stderr, "\nInternal error in back_lines().\n");
+	    exit (-1);
+	}
+    }
+    /* Go back 'n' lines */
+    for (i = 0; i < n; i++)
+	do {
+	    if (page == buf) {
+		if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
+		    endwin ();
+		    fprintf (stderr,
+			  "\nError moving file pointer in back_lines().\n");
+		    exit (-1);
+		}
+		if (fpos > bytes_read) {
+		    /* Really possible to move backward BUF_SIZE/2 bytes? */
+		    if (fpos < BUF_SIZE / 2 + bytes_read) {
+			/* No, move less then */
+			if (lseek (fd, 0, SEEK_SET) == -1) {
+			    endwin ();
+			    fprintf (stderr, "\nError moving file pointer "
+				     "in back_lines().\n");
+			    exit (-1);
+			}
+			page = buf + fpos - bytes_read;
+		    } else {	/* Move backward BUF_SIZE/2 bytes */
+			if (lseek (fd, -(BUF_SIZE / 2 + bytes_read),
+				   SEEK_CUR) == -1) {
+			    endwin ();
+			    fprintf (stderr, "\nError moving file pointer"
+				     " in back_lines().\n");
+			    exit (-1);
+			}
+			page = buf + BUF_SIZE / 2;
+		    }
+		    if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
+			endwin ();
+			fprintf (stderr, "\nError reading file in "
+				 "back_lines().\n");
+			exit (-1);
+		    }
+		    buf[bytes_read] = '\0';
+		} else {	/* Beginning of file reached */
+		    begin_reached = 1;
+		    return;
+		}
+	    }
+	} while (*(--page) != '\n');
+    page++;
+}
+
+/*
+ * Print a new page of text. Called by dialog_textbox().
+ */
+static void
+print_page (WINDOW * win, int height, int width)
+{
+    int i, passed_end = 0;
+
+    page_length = 0;
+    for (i = 0; i < height; i++) {
+	print_line (win, i, width);
+	if (!passed_end)
+	    page_length++;
+	if (end_reached && !passed_end)
+	    passed_end = 1;
+    }
+    wnoutrefresh (win);
+}
+
+/*
+ * Print a new line of text. Called by dialog_textbox() and print_page().
+ */
+static void
+print_line (WINDOW * win, int row, int width)
+{
+    int y, x;
+    char *line;
+
+    line = get_line ();
+    line += MIN (strlen (line), hscroll);	/* Scroll horizontally */
+    wmove (win, row, 0);	/* move cursor to correct line */
+    waddch (win, ' ');
+    waddnstr (win, line, MIN (strlen (line), width - 2));
+
+    getyx (win, y, x);
+    /* Clear 'residue' of previous line */
+#if OLD_NCURSES
+    {
+        int i;
+        for (i = 0; i < width - x; i++)
+	    waddch (win, ' ');
+    }
+#else
+    wclrtoeol(win);
+#endif
+}
+
+/*
+ * Return current line of text. Called by dialog_textbox() and print_line().
+ * 'page' should point to start of current line before calling, and will be
+ * updated to point to start of next line.
+ */
+static char *
+get_line (void)
+{
+    int i = 0, fpos;
+    static char line[MAX_LEN + 1];
+
+    end_reached = 0;
+    while (*page != '\n') {
+	if (*page == '\0') {
+	    /* Either end of file or end of buffer reached */
+	    if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
+		endwin ();
+		fprintf (stderr, "\nError moving file pointer in "
+			 "get_line().\n");
+		exit (-1);
+	    }
+	    if (fpos < file_size) {	/* Not end of file yet */
+		/* We've reached end of buffer, but not end of file yet,
+		   so read next part of file into buffer */
+		if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
+		    endwin ();
+		    fprintf (stderr, "\nError reading file in get_line().\n");
+		    exit (-1);
+		}
+		buf[bytes_read] = '\0';
+		page = buf;
+	    } else {
+		if (!end_reached)
+		    end_reached = 1;
+		break;
+	    }
+	} else if (i < MAX_LEN)
+	    line[i++] = *(page++);
+	else {
+	    /* Truncate lines longer than MAX_LEN characters */
+	    if (i == MAX_LEN)
+		line[i++] = '\0';
+	    page++;
+	}
+    }
+    if (i <= MAX_LEN)
+	line[i] = '\0';
+    if (!end_reached)
+	page++;			/* move pass '\n' */
+
+    return line;
+}
+
+/*
+ * Print current position
+ */
+static void
+print_position (WINDOW * win, int height, int width)
+{
+    int fpos, percent;
+
+    if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
+	endwin ();
+	fprintf (stderr, "\nError moving file pointer in print_position().\n");
+	exit (-1);
+    }
+    wattrset (win, position_indicator_attr);
+    wbkgdset (win, position_indicator_attr & A_COLOR);
+    percent = !file_size ?
+	100 : ((fpos - bytes_read + page - buf) * 100) / file_size;
+    wmove (win, height - 3, width - 9);
+    wprintw (win, "(%3d%%)", percent);
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c
new file mode 100644
index 00000000..6f83951b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c
@@ -0,0 +1,375 @@
+/*
+ *  util.c
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+
+/* use colors by default? */
+bool use_colors = 1;
+
+const char *backtitle = NULL;
+
+const char *dialog_result;
+
+/* 
+ * Attribute values, default is for mono display
+ */
+chtype attributes[] =
+{
+    A_NORMAL,			/* screen_attr */
+    A_NORMAL,			/* shadow_attr */
+    A_NORMAL,			/* dialog_attr */
+    A_BOLD,			/* title_attr */
+    A_NORMAL,			/* border_attr */
+    A_REVERSE,			/* button_active_attr */
+    A_DIM,			/* button_inactive_attr */
+    A_REVERSE,			/* button_key_active_attr */
+    A_BOLD,			/* button_key_inactive_attr */
+    A_REVERSE,			/* button_label_active_attr */
+    A_NORMAL,			/* button_label_inactive_attr */
+    A_NORMAL,			/* inputbox_attr */
+    A_NORMAL,			/* inputbox_border_attr */
+    A_NORMAL,			/* searchbox_attr */
+    A_BOLD,			/* searchbox_title_attr */
+    A_NORMAL,			/* searchbox_border_attr */
+    A_BOLD,			/* position_indicator_attr */
+    A_NORMAL,			/* menubox_attr */
+    A_NORMAL,			/* menubox_border_attr */
+    A_NORMAL,			/* item_attr */
+    A_REVERSE,			/* item_selected_attr */
+    A_BOLD,			/* tag_attr */
+    A_REVERSE,			/* tag_selected_attr */
+    A_BOLD,			/* tag_key_attr */
+    A_REVERSE,			/* tag_key_selected_attr */
+    A_BOLD,			/* check_attr */
+    A_REVERSE,			/* check_selected_attr */
+    A_BOLD,			/* uarrow_attr */
+    A_BOLD			/* darrow_attr */
+};
+
+
+#include "colors.h"
+
+/*
+ * Table of color values
+ */
+int color_table[][3] =
+{
+    {SCREEN_FG, SCREEN_BG, SCREEN_HL},
+    {SHADOW_FG, SHADOW_BG, SHADOW_HL},
+    {DIALOG_FG, DIALOG_BG, DIALOG_HL},
+    {TITLE_FG, TITLE_BG, TITLE_HL},
+    {BORDER_FG, BORDER_BG, BORDER_HL},
+    {BUTTON_ACTIVE_FG, BUTTON_ACTIVE_BG, BUTTON_ACTIVE_HL},
+    {BUTTON_INACTIVE_FG, BUTTON_INACTIVE_BG, BUTTON_INACTIVE_HL},
+    {BUTTON_KEY_ACTIVE_FG, BUTTON_KEY_ACTIVE_BG, BUTTON_KEY_ACTIVE_HL},
+    {BUTTON_KEY_INACTIVE_FG, BUTTON_KEY_INACTIVE_BG, BUTTON_KEY_INACTIVE_HL},
+    {BUTTON_LABEL_ACTIVE_FG, BUTTON_LABEL_ACTIVE_BG, BUTTON_LABEL_ACTIVE_HL},
+    {BUTTON_LABEL_INACTIVE_FG, BUTTON_LABEL_INACTIVE_BG,
+     BUTTON_LABEL_INACTIVE_HL},
+    {INPUTBOX_FG, INPUTBOX_BG, INPUTBOX_HL},
+    {INPUTBOX_BORDER_FG, INPUTBOX_BORDER_BG, INPUTBOX_BORDER_HL},
+    {SEARCHBOX_FG, SEARCHBOX_BG, SEARCHBOX_HL},
+    {SEARCHBOX_TITLE_FG, SEARCHBOX_TITLE_BG, SEARCHBOX_TITLE_HL},
+    {SEARCHBOX_BORDER_FG, SEARCHBOX_BORDER_BG, SEARCHBOX_BORDER_HL},
+    {POSITION_INDICATOR_FG, POSITION_INDICATOR_BG, POSITION_INDICATOR_HL},
+    {MENUBOX_FG, MENUBOX_BG, MENUBOX_HL},
+    {MENUBOX_BORDER_FG, MENUBOX_BORDER_BG, MENUBOX_BORDER_HL},
+    {ITEM_FG, ITEM_BG, ITEM_HL},
+    {ITEM_SELECTED_FG, ITEM_SELECTED_BG, ITEM_SELECTED_HL},
+    {TAG_FG, TAG_BG, TAG_HL},
+    {TAG_SELECTED_FG, TAG_SELECTED_BG, TAG_SELECTED_HL},
+    {TAG_KEY_FG, TAG_KEY_BG, TAG_KEY_HL},
+    {TAG_KEY_SELECTED_FG, TAG_KEY_SELECTED_BG, TAG_KEY_SELECTED_HL},
+    {CHECK_FG, CHECK_BG, CHECK_HL},
+    {CHECK_SELECTED_FG, CHECK_SELECTED_BG, CHECK_SELECTED_HL},
+    {UARROW_FG, UARROW_BG, UARROW_HL},
+    {DARROW_FG, DARROW_BG, DARROW_HL},
+};				/* color_table */
+
+/*
+ * Set window to attribute 'attr'
+ */
+void
+attr_clear (WINDOW * win, int height, int width, chtype attr)
+{
+    int i, j;
+
+    wattrset (win, attr);
+    for (i = 0; i < height; i++) {
+	wmove (win, i, 0);
+	for (j = 0; j < width; j++)
+	    waddch (win, ' ');
+    }
+    touchwin (win);
+}
+
+void dialog_clear (void)
+{
+    attr_clear (stdscr, LINES, COLS, screen_attr);
+    /* Display background title if it exists ... - SLH */
+    if (backtitle != NULL) {
+        int i;
+
+        wattrset (stdscr, screen_attr);
+        mvwaddstr (stdscr, 0, 1, (char *)backtitle);
+        wmove (stdscr, 1, 1);
+        for (i = 1; i < COLS - 1; i++)
+            waddch (stdscr, ACS_HLINE);
+    }
+    wnoutrefresh (stdscr);
+}
+
+/*
+ * Do some initialization for dialog
+ */
+void
+init_dialog (void)
+{
+    initscr ();			/* Init curses */
+    keypad (stdscr, TRUE);
+    cbreak ();
+    noecho ();
+
+
+    if (use_colors)	/* Set up colors */
+	color_setup ();
+
+
+    dialog_clear ();
+}
+
+/*
+ * Setup for color display
+ */
+void
+color_setup (void)
+{
+    int i;
+
+    if (has_colors ()) {	/* Terminal supports color? */
+	start_color ();
+
+	/* Initialize color pairs */
+	for (i = 0; i < ATTRIBUTE_COUNT; i++)
+	    init_pair (i + 1, color_table[i][0], color_table[i][1]);
+
+	/* Setup color attributes */
+	for (i = 0; i < ATTRIBUTE_COUNT; i++)
+	    attributes[i] = C_ATTR (color_table[i][2], i + 1);
+    }
+}
+
+/*
+ * End using dialog functions.
+ */
+void
+end_dialog (void)
+{
+    endwin ();
+}
+
+
+/*
+ * Print a string of text in a window, automatically wrap around to the
+ * next line if the string is too long to fit on one line. Newline
+ * characters '\n' are replaced by spaces.  We start on a new line
+ * if there is no room for at least 4 nonblanks following a double-space.
+ */
+void
+print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x)
+{
+    int newl, cur_x, cur_y;
+    int i, prompt_len, room, wlen;
+    char tempstr[MAX_LEN + 1], *word, *sp, *sp2;
+
+    strcpy (tempstr, prompt);
+
+    prompt_len = strlen(tempstr);
+	
+    /*
+     * Remove newlines
+     */
+    for(i=0; i<prompt_len; i++) {
+	if(tempstr[i] == '\n') tempstr[i] = ' ';
+    }
+
+    if (prompt_len <= width - x * 2) {	/* If prompt is short */
+	wmove (win, y, (width - prompt_len) / 2);
+	waddstr (win, tempstr);
+    } else {
+	cur_x = x;
+	cur_y = y;
+	newl = 1;
+	word = tempstr;
+	while (word && *word) {
+	    sp = index(word, ' ');
+	    if (sp)
+	        *sp++ = 0;
+
+	    /* Wrap to next line if either the word does not fit,
+	       or it is the first word of a new sentence, and it is
+	       short, and the next word does not fit. */
+	    room = width - cur_x;
+	    wlen = strlen(word);
+	    if (wlen > room ||
+	       (newl && wlen < 4 && sp && wlen+1+strlen(sp) > room
+		     && (!(sp2 = index(sp, ' ')) || wlen+1+(sp2-sp) > room))) {
+		cur_y++;
+		cur_x = x;
+	    }
+	    wmove (win, cur_y, cur_x);
+	    waddstr (win, word);
+	    getyx (win, cur_y, cur_x);
+	    cur_x++;
+	    if (sp && *sp == ' ') {
+	        cur_x++;	/* double space */
+		while (*++sp == ' ');
+		newl = 1;
+	    } else
+	        newl = 0;
+	    word = sp;
+	}
+    }
+}
+
+/*
+ * Print a button
+ */
+void
+print_button (WINDOW * win, const char *label, int y, int x, int selected)
+{
+    int i, temp;
+
+    wmove (win, y, x);
+    wattrset (win, selected ? button_active_attr : button_inactive_attr);
+    waddstr (win, "<");
+    temp = strspn (label, " ");
+    label += temp;
+    wattrset (win, selected ? button_label_active_attr
+	      : button_label_inactive_attr);
+    for (i = 0; i < temp; i++)
+	waddch (win, ' ');
+    wattrset (win, selected ? button_key_active_attr
+	      : button_key_inactive_attr);
+    waddch (win, label[0]);
+    wattrset (win, selected ? button_label_active_attr
+	      : button_label_inactive_attr);
+    waddstr (win, (char *)label + 1);
+    wattrset (win, selected ? button_active_attr : button_inactive_attr);
+    waddstr (win, ">");
+    wmove (win, y, x + temp + 1);
+}
+
+/*
+ * Draw a rectangular box with line drawing characters
+ */
+void
+draw_box (WINDOW * win, int y, int x, int height, int width,
+	  chtype box, chtype border)
+{
+    int i, j;
+
+    wattrset (win, 0);
+    for (i = 0; i < height; i++) {
+	wmove (win, y + i, x);
+	for (j = 0; j < width; j++)
+	    if (!i && !j)
+		waddch (win, border | ACS_ULCORNER);
+	    else if (i == height - 1 && !j)
+		waddch (win, border | ACS_LLCORNER);
+	    else if (!i && j == width - 1)
+		waddch (win, box | ACS_URCORNER);
+	    else if (i == height - 1 && j == width - 1)
+		waddch (win, box | ACS_LRCORNER);
+	    else if (!i)
+		waddch (win, border | ACS_HLINE);
+	    else if (i == height - 1)
+		waddch (win, box | ACS_HLINE);
+	    else if (!j)
+		waddch (win, border | ACS_VLINE);
+	    else if (j == width - 1)
+		waddch (win, box | ACS_VLINE);
+	    else
+		waddch (win, box | ' ');
+    }
+}
+
+/*
+ * Draw shadows along the right and bottom edge to give a more 3D look
+ * to the boxes
+ */
+void
+draw_shadow (WINDOW * win, int y, int x, int height, int width)
+{
+    int i;
+
+    if (has_colors ()) {	/* Whether terminal supports color? */
+	wattrset (win, shadow_attr);
+	wmove (win, y + height, x + 2);
+	for (i = 0; i < width; i++)
+	    waddch (win, winch (win) & A_CHARTEXT);
+	for (i = y + 1; i < y + height + 1; i++) {
+	    wmove (win, i, x + width);
+	    waddch (win, winch (win) & A_CHARTEXT);
+	    waddch (win, winch (win) & A_CHARTEXT);
+	}
+	wnoutrefresh (win);
+    }
+}
+
+/*
+ *  Return the position of the first alphabetic character in a string.
+ */
+int
+first_alpha(const char *string, const char *exempt)
+{
+	int i, in_paren=0, c;
+
+	for (i = 0; i < strlen(string); i++) {
+		c = tolower(string[i]);
+
+		if (strchr("<[(", c)) ++in_paren;
+		if (strchr(">])", c) && in_paren > 0) --in_paren;
+
+		if ((! in_paren) && isalpha(c) && 
+		     strchr(exempt, c) == 0)
+			return i;
+	}
+
+	return 0;
+}
+
+/*
+ * Get the first selected item in the dialog_list_item list.
+ */
+struct dialog_list_item *
+first_sel_item(int item_no, struct dialog_list_item ** items)
+{
+	int i;
+
+	for (i = 0; i < item_no; i++) {
+		if (items[i]->selected)
+			return items[i];
+	}
+
+	return NULL;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c
new file mode 100644
index 00000000..11fcc25f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c
@@ -0,0 +1,118 @@
+/*
+ *  yesno.c -- implements the yes/no box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+/*
+ * Display termination buttons
+ */
+static void
+print_buttons(WINDOW *dialog, int height, int width, int selected)
+{
+    int x = width / 2 - 10;
+    int y = height - 2;
+
+    print_button (dialog, " Yes ", y, x, selected == 0);
+    print_button (dialog, "  No  ", y, x + 13, selected == 1);
+
+    wmove(dialog, y, x+1 + 13*selected );
+    wrefresh (dialog);
+}
+
+/*
+ * Display a dialog box with two buttons - Yes and No
+ */
+int
+dialog_yesno (const char *title, const char *prompt, int height, int width)
+{
+    int i, x, y, key = 0, button = 0;
+    WINDOW *dialog;
+
+    /* center dialog box on screen */
+    x = (COLS - width) / 2;
+    y = (LINES - height) / 2;
+
+    draw_shadow (stdscr, y, x, height, width);
+
+    dialog = newwin (height, width, y, x);
+    keypad (dialog, TRUE);
+
+    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
+    wattrset (dialog, border_attr);
+    mvwaddch (dialog, height-3, 0, ACS_LTEE);
+    for (i = 0; i < width - 2; i++)
+	waddch (dialog, ACS_HLINE);
+    wattrset (dialog, dialog_attr);
+    waddch (dialog, ACS_RTEE);
+
+    if (title != NULL && strlen(title) >= width-2 ) {
+	/* truncate long title -- mec */
+	char * title2 = malloc(width-2+1);
+	memcpy( title2, title, width-2 );
+	title2[width-2] = '\0';
+	title = title2;
+    }
+
+    if (title != NULL) {
+	wattrset (dialog, title_attr);
+	mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
+	waddstr (dialog, (char *)title);
+	waddch (dialog, ' ');
+    }
+
+    wattrset (dialog, dialog_attr);
+    print_autowrap (dialog, prompt, width - 2, 1, 3);
+
+    print_buttons(dialog, height, width, 0);
+
+    while (key != ESC) {
+	key = wgetch (dialog);
+	switch (key) {
+	case 'Y':
+	case 'y':
+	    delwin (dialog);
+	    return 0;
+	case 'N':
+	case 'n':
+	    delwin (dialog);
+	    return 1;
+
+	case TAB:
+	case KEY_LEFT:
+	case KEY_RIGHT:
+	    button = ((key == KEY_LEFT ? --button : ++button) < 0)
+			? 1 : (button > 1 ? 0 : button);
+
+	    print_buttons(dialog, height, width, button);
+	    wrefresh (dialog);
+	    break;
+	case ' ':
+	case '\n':
+	    delwin (dialog);
+	    return button;
+	case ESC:
+	    break;
+	}
+    }
+
+    delwin (dialog);
+    return -1;			/* ESC pressed */
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mconf.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mconf.c
new file mode 100644
index 00000000..406eb29c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mconf.c
@@ -0,0 +1,977 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ *
+ * Introduced single menu mode (show all sub-menus in one large tree).
+ * 2002-11-06 Petr Baudis <pasky@ucw.cz>
+ *
+ * Directly use liblxdialog library routines.
+ * 2002-11-14 Petr Baudis <pasky@ucw.cz>
+ */
+
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <sys/termios.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+
+#include "lxdialog/dialog.h"
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+static char menu_backtitle[128];
+static const char mconf_readme[] =
+"Overview\n"
+"--------\n"
+"Some features may be built directly into axTLS.  Some features\n"
+"may be completely removed altogether.  There are also certain\n"
+"parameters which are not really features, but must be\n"
+"entered in as decimal or hexadecimal numbers or possibly text.\n"
+"\n"
+"Menu items beginning with [*] or [ ] represent features\n"
+"configured to be built in or removed respectively.\n"
+"\n"
+"To change any of these features, highlight it with the cursor\n"
+"keys and press <Y> to build it in or <N> to removed it.\n"
+"You may also press the <Space Bar> to cycle\n"
+"through the available options (ie. Y->N->Y).\n"
+"\n"
+"Some additional keyboard hints:\n"
+"\n"
+"Menus\n"
+"----------\n"
+"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
+"   you wish to change or submenu wish to select and press <Enter>.\n"
+"   Submenus are designated by \"--->\".\n"
+"\n"
+"   Shortcut: Press the option's highlighted letter (hotkey).\n"
+"             Pressing a hotkey more than once will sequence\n"
+"             through all visible items which use that hotkey.\n"
+"\n"
+"   You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n"
+"   unseen options into view.\n"
+"\n"
+"o  To exit a menu use the cursor keys to highlight the <Exit> button\n"
+"   and press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <ESC><ESC> or <E> or <X> if there is no hotkey\n"
+"             using those letters.  You may press a single <ESC>, but\n"
+"             there is a delayed response which you may find annoying.\n"
+"\n"
+"   Also, the <TAB> and cursor keys will cycle between <Select>,\n"
+"   <Exit> and <Help>\n"
+"\n"
+"o  To get help with an item, use the cursor keys to highlight <Help>\n"
+"   and Press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <H> or <?>.\n"
+"\n"
+"\n"
+"Radiolists  (Choice lists)\n"
+"-----------\n"
+"o  Use the cursor keys to select the option you wish to set and press\n"
+"   <S> or the <SPACE BAR>.\n"
+"\n"
+"   Shortcut: Press the first letter of the option you wish to set then\n"
+"             press <S> or <SPACE BAR>.\n"
+"\n"
+"o  To see available help for the item, use the cursor keys to highlight\n"
+"   <Help> and Press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <H> or <?>.\n"
+"\n"
+"   Also, the <TAB> and cursor keys will cycle between <Select> and\n"
+"   <Help>\n"
+"\n"
+"\n"
+"Data Entry\n"
+"-----------\n"
+"o  Enter the requested information and press <ENTER>\n"
+"   If you are entering hexadecimal values, it is not necessary to\n"
+"   add the '0x' prefix to the entry.\n"
+"\n"
+"o  For help, use the <TAB> or cursor keys to highlight the help option\n"
+"   and press <ENTER>.  You can try <TAB><H> as well.\n"
+"\n"
+"\n"
+"Text Box    (Help Window)\n"
+"--------\n"
+"o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
+"   keys h,j,k,l function here as do <SPACE BAR> and <B> for those\n"
+"   who are familiar with less and lynx.\n"
+"\n"
+"o  Press <E>, <X>, <Enter> or <Esc><Esc> to exit.\n"
+"\n"
+"\n"
+"Alternate Configuration Files\n"
+"-----------------------------\n"
+"Menuconfig supports the use of alternate configuration files for\n"
+"those who, for various reasons, find it necessary to switch\n"
+"between different configurations.\n"
+"\n"
+"At the end of the main menu you will find two options.  One is\n"
+"for saving the current configuration to a file of your choosing.\n"
+"The other option is for loading a previously saved alternate\n"
+"configuration.\n"
+"\n"
+"Even if you don't use alternate configuration files, but you\n"
+"find during a Menuconfig session that you have completely messed\n"
+"up your settings, you may use the \"Load Alternate...\" option to\n"
+"restore your previously saved settings from \".config\" without\n"
+"restarting Menuconfig.\n"
+"\n"
+"Other information\n"
+"-----------------\n"
+"If you use Menuconfig in an XTERM window make sure you have your\n"
+"$TERM variable set to point to a xterm definition which supports color.\n"
+"Otherwise, Menuconfig will look rather bad.  Menuconfig will not\n"
+"display correctly in a RXVT window because rxvt displays only one\n"
+"intensity of color, bright.\n"
+"\n"
+"Menuconfig will display larger menus on screens or xterms which are\n"
+"set to display more than the standard 25 row by 80 column geometry.\n"
+"In order for this to work, the \"stty size\" command must be able to\n"
+"display the screen's current row and column geometry.  I STRONGLY\n"
+"RECOMMEND that you make sure you do NOT have the shell variables\n"
+"LINES and COLUMNS exported into your environment.  Some distributions\n"
+"export those variables via /etc/profile.  Some ncurses programs can\n"
+"become confused when those variables (LINES & COLUMNS) don't reflect\n"
+"the true screen size.\n"
+"\n"
+"Optional personality available\n"
+"------------------------------\n"
+"If you prefer to have all of the options listed in a single\n"
+"menu, rather than the default multimenu hierarchy, run the menuconfig\n"
+"with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
+"\n"
+"make MENUCONFIG_MODE=single_menu menuconfig\n"
+"\n"
+"<Enter> will then unroll the appropriate category, or enfold it if it\n"
+"is already unrolled.\n"
+"\n"
+"Note that this mode can eventually be a little more CPU expensive\n"
+"(especially with a larger number of unrolled categories) than the\n"
+"default mode.\n",
+menu_instructions[] =
+	"Arrow keys navigate the menu.  "
+	"<Enter> selects submenus --->.  "
+	"Highlighted letters are hotkeys.  "
+	"Pressing <Y> selectes a feature, while <N> will exclude a feature.  "
+	"Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
+	"Legend: [*] feature is selected  [ ] feature is excluded",
+radiolist_instructions[] =
+	"Use the arrow keys to navigate this window or "
+	"press the hotkey of the item you wish to select "
+	"followed by the <SPACE BAR>. "
+	"Press <?> for additional information about this option.",
+inputbox_instructions_int[] =
+	"Please enter a decimal value. "
+	"Fractions will not be accepted.  "
+	"Use the <TAB> key to move from the input field to the buttons below it.",
+inputbox_instructions_hex[] =
+	"Please enter a hexadecimal value. "
+	"Use the <TAB> key to move from the input field to the buttons below it.",
+inputbox_instructions_string[] =
+	"Please enter a string value. "
+	"Use the <TAB> key to move from the input field to the buttons below it.",
+setmod_text[] =
+	"This feature depends on another which has been configured as a module.\n"
+	"As a result, this feature will be built as a module.",
+nohelp_text[] =
+	"There is no help available for this option.\n",
+load_config_text[] =
+	"Enter the name of the configuration file you wish to load.  "
+	"Accept the name shown to restore the configuration you "
+	"last retrieved.  Leave blank to abort.",
+load_config_help[] =
+	"\n"
+	"For various reasons, one may wish to keep several different axTLS\n"
+	"configurations available on a single machine.\n"
+	"\n"
+	"If you have saved a previous configuration in a file other than the\n"
+	"axTLS's default, entering the name of the file here will allow you\n"
+	"to modify that configuration.\n"
+	"\n"
+	"If you are uncertain, then you have probably never used alternate\n"
+	"configuration files.  You should therefor leave this blank to abort.\n",
+save_config_text[] =
+	"Enter a filename to which this configuration should be saved "
+	"as an alternate.  Leave blank to abort.",
+save_config_help[] =
+	"\n"
+	"For various reasons, one may wish to keep different axTLS\n"
+	"configurations available on a single machine.\n"
+	"\n"
+	"Entering a file name here will allow you to later retrieve, modify\n"
+	"and use the current configuration as an alternate to whatever\n"
+	"configuration options you have selected at that time.\n"
+	"\n"
+	"If you are uncertain what all this means then you should probably\n"
+	"leave this blank.\n",
+search_help[] =
+	"\n"
+	"Search for CONFIG_ symbols and display their relations.\n"
+	"Example: search for \"^FOO\"\n"
+	"Result:\n"
+	"-----------------------------------------------------------------\n"
+	"Symbol: FOO [=m]\n"
+	"Prompt: Foo bus is used to drive the bar HW\n"
+	"Defined at drivers/pci/Kconfig:47\n"
+	"Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
+	"Location:\n"
+	"  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
+	"    -> PCI support (PCI [=y])\n"
+	"      -> PCI access mode (<choice> [=y])\n"
+	"Selects: LIBCRC32\n"
+	"Selected by: BAR\n"
+	"-----------------------------------------------------------------\n"
+	"o The line 'Prompt:' shows the text used in the menu structure for\n"
+	"  this CONFIG_ symbol\n"
+	"o The 'Defined at' line tell at what file / line number the symbol\n"
+	"  is defined\n"
+	"o The 'Depends on:' line tell what symbols needs to be defined for\n"
+	"  this symbol to be visible in the menu (selectable)\n"
+	"o The 'Location:' lines tell where in the menu structure this symbol\n"
+	"  is located\n"
+	"    A location followed by a [=y] indicate that this is a selectable\n"
+	"    menu item - and current value is displayed inside brackets.\n"
+	"o The 'Selects:' line tell what symbol will be automatically\n"
+	"  selected if this symbol is selected (y or m)\n"
+	"o The 'Selected by' line tell what symbol has selected this symbol\n"
+	"\n"
+	"Only relevant lines are shown.\n"
+	"\n\n"
+	"Search examples:\n"
+	"Examples: USB	=> find all CONFIG_ symbols containing USB\n"
+	"          ^USB => find all CONFIG_ symbols starting with USB\n"
+	"          USB$ => find all CONFIG_ symbols ending with USB\n"
+	"\n";
+
+static char filename[PATH_MAX+1] = ".config";
+static int indent;
+static struct termios ios_org;
+static int rows = 0, cols = 0;
+static struct menu *current_menu;
+static int child_count;
+static int single_menu_mode;
+
+static struct dialog_list_item *items[16384]; /* FIXME: This ought to be dynamic. */
+static int item_no;
+
+static void conf(struct menu *menu);
+static void conf_choice(struct menu *menu);
+static void conf_string(struct menu *menu);
+static void conf_load(void);
+static void conf_save(void);
+static void show_textbox(const char *title, const char *text, int r, int c);
+static void show_helptext(const char *title, const char *text);
+static void show_help(struct menu *menu);
+static void show_file(const char *filename, const char *title, int r, int c);
+
+static void init_wsize(void)
+{
+	struct winsize ws;
+	char *env;
+
+	if (!ioctl(STDIN_FILENO, TIOCGWINSZ, &ws)) {
+		rows = ws.ws_row;
+		cols = ws.ws_col;
+	}
+
+	if (!rows) {
+		env = getenv("LINES");
+		if (env)
+			rows = atoi(env);
+		if (!rows)
+			rows = 24;
+	}
+	if (!cols) {
+		env = getenv("COLUMNS");
+		if (env)
+			cols = atoi(env);
+		if (!cols)
+			cols = 80;
+	}
+
+	if (rows < 19 || cols < 80) {
+		fprintf(stderr, "Your display is too small to run Menuconfig!\n");
+		fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");
+		exit(1);
+	}
+
+	rows -= 4;
+	cols -= 5;
+}
+
+static void cinit(void)
+{
+	item_no = 0;
+}
+
+static void cmake(void)
+{
+	items[item_no] = malloc(sizeof(struct dialog_list_item));
+	memset(items[item_no], 0, sizeof(struct dialog_list_item));
+	items[item_no]->tag = malloc(32); items[item_no]->tag[0] = 0;
+	items[item_no]->name = malloc(512); items[item_no]->name[0] = 0;
+	items[item_no]->namelen = 0;
+	item_no++;
+}
+
+static int cprint_name(const char *fmt, ...)
+{
+	va_list ap;
+	int res;
+
+	if (!item_no)
+		cmake();
+	va_start(ap, fmt);
+	res = vsnprintf(items[item_no - 1]->name + items[item_no - 1]->namelen,
+			512 - items[item_no - 1]->namelen, fmt, ap);
+	if (res > 0)
+		items[item_no - 1]->namelen += res;
+	va_end(ap);
+
+	return res;
+}
+
+static int cprint_tag(const char *fmt, ...)
+{
+	va_list ap;
+	int res;
+
+	if (!item_no)
+		cmake();
+	va_start(ap, fmt);
+	res = vsnprintf(items[item_no - 1]->tag, 32, fmt, ap);
+	va_end(ap);
+
+	return res;
+}
+
+static void cdone(void)
+{
+	int i;
+
+	for (i = 0; i < item_no; i++) {
+		free(items[i]->tag);
+		free(items[i]->name);
+		free(items[i]);
+	}
+
+	item_no = 0;
+}
+
+static void get_prompt_str(struct gstr *r, struct property *prop)
+{
+	int i, j;
+	struct menu *submenu[8], *menu;
+
+	str_printf(r, "Prompt: %s\n", prop->text);
+	str_printf(r, "  Defined at %s:%d\n", prop->menu->file->name,
+		prop->menu->lineno);
+	if (!expr_is_yes(prop->visible.expr)) {
+		str_append(r, "  Depends on: ");
+		expr_gstr_print(prop->visible.expr, r);
+		str_append(r, "\n");
+	}
+	menu = prop->menu->parent;
+	for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
+		submenu[i++] = menu;
+	if (i > 0) {
+		str_printf(r, "  Location:\n");
+		for (j = 4; --i >= 0; j += 2) {
+			menu = submenu[i];
+			str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu));
+			if (menu->sym) {
+				str_printf(r, " (%s [=%s])", menu->sym->name ?
+					menu->sym->name : "<choice>",
+					sym_get_string_value(menu->sym));
+			}
+			str_append(r, "\n");
+		}
+	}
+}
+
+static void get_symbol_str(struct gstr *r, struct symbol *sym)
+{
+	bool hit;
+	struct property *prop;
+
+	str_printf(r, "Symbol: %s [=%s]\n", sym->name,
+	                               sym_get_string_value(sym));
+	for_all_prompts(sym, prop)
+		get_prompt_str(r, prop);
+	hit = false;
+	for_all_properties(sym, prop, P_SELECT) {
+		if (!hit) {
+			str_append(r, "  Selects: ");
+			hit = true;
+		} else
+			str_printf(r, " && ");
+		expr_gstr_print(prop->expr, r);
+	}
+	if (hit)
+		str_append(r, "\n");
+	if (sym->rev_dep.expr) {
+		str_append(r, "  Selected by: ");
+		expr_gstr_print(sym->rev_dep.expr, r);
+		str_append(r, "\n");
+	}
+	str_append(r, "\n\n");
+}
+
+static struct gstr get_relations_str(struct symbol **sym_arr)
+{
+	struct symbol *sym;
+	struct gstr res = str_new();
+	int i;
+
+	for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
+		get_symbol_str(&res, sym);
+	if (!i)
+		str_append(&res, "No matches found.\n");
+	return res;
+}
+
+static void search_conf(void)
+{
+	struct symbol **sym_arr;
+	struct gstr res;
+
+again:
+	switch (dialog_inputbox("Search Configuration Parameter",
+				"Enter Keyword", 10, 75,
+				NULL)) {
+	case 0:
+		break;
+	case 1:
+		show_helptext("Search Configuration", search_help);
+		goto again;
+	default:
+		return;
+	}
+
+	sym_arr = sym_re_search(dialog_input_result);
+	res = get_relations_str(sym_arr);
+	free(sym_arr);
+	show_textbox("Search Results", str_get(&res), 0, 0);
+	str_free(&res);
+}
+
+static void build_conf(struct menu *menu)
+{
+	struct symbol *sym;
+	struct property *prop;
+	struct menu *child;
+	int type, tmp, doint = 2;
+	tristate val;
+	char ch;
+
+	if (!menu_is_visible(menu))
+		return;
+
+	sym = menu->sym;
+	prop = menu->prompt;
+	if (!sym) {
+		if (prop && menu != current_menu) {
+			const char *prompt = menu_get_prompt(menu);
+			switch (prop->type) {
+			case P_MENU:
+				child_count++;
+				cmake();
+				cprint_tag("m%p", menu);
+
+				if (single_menu_mode) {
+					cprint_name("%s%*c%s",
+						menu->data ? "-->" : "++>",
+						indent + 1, ' ', prompt);
+				} else {
+					cprint_name("   %*c%s  --->", indent + 1, ' ', prompt);
+				}
+
+				if (single_menu_mode && menu->data)
+					goto conf_childs;
+				return;
+			default:
+				if (prompt) {
+					child_count++;
+					cmake();
+					cprint_tag(":%p", menu);
+					cprint_name("---%*c%s", indent + 1, ' ', prompt);
+				}
+			}
+		} else
+			doint = 0;
+		goto conf_childs;
+	}
+
+	cmake();
+	type = sym_get_type(sym);
+	if (sym_is_choice(sym)) {
+		struct symbol *def_sym = sym_get_choice_value(sym);
+		struct menu *def_menu = NULL;
+
+		child_count++;
+		for (child = menu->list; child; child = child->next) {
+			if (menu_is_visible(child) && child->sym == def_sym)
+				def_menu = child;
+		}
+
+		val = sym_get_tristate_value(sym);
+		if (sym_is_changable(sym)) {
+			cprint_tag("t%p", menu);
+			switch (type) {
+			case S_BOOLEAN:
+				cprint_name("[%c]", val == no ? ' ' : '*');
+				break;
+			case S_TRISTATE:
+				switch (val) {
+				case yes: ch = '*'; break;
+				case mod: ch = 'M'; break;
+				default:  ch = ' '; break;
+				}
+				cprint_name("<%c>", ch);
+				break;
+			}
+		} else {
+			cprint_tag("%c%p", def_menu ? 't' : ':', menu);
+			cprint_name("   ");
+		}
+
+		cprint_name("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+		if (val == yes) {
+			if (def_menu) {
+				cprint_name(" (%s)", menu_get_prompt(def_menu));
+				cprint_name("  --->");
+				if (def_menu->list) {
+					indent += 2;
+					build_conf(def_menu);
+					indent -= 2;
+				}
+			}
+			return;
+		}
+	} else {
+		if (menu == current_menu) {
+			cprint_tag(":%p", menu);
+			cprint_name("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+			goto conf_childs;
+		}
+		child_count++;
+		val = sym_get_tristate_value(sym);
+		if (sym_is_choice_value(sym) && val == yes) {
+			cprint_tag(":%p", menu);
+			cprint_name("   ");
+		} else {
+			switch (type) {
+			case S_BOOLEAN:
+				cprint_tag("t%p", menu);
+				if (sym_is_changable(sym))
+					cprint_name("[%c]", val == no ? ' ' : '*');
+				else
+					cprint_name("---");
+				break;
+			case S_TRISTATE:
+				cprint_tag("t%p", menu);
+				switch (val) {
+				case yes: ch = '*'; break;
+				case mod: ch = 'M'; break;
+				default:  ch = ' '; break;
+				}
+				if (sym_is_changable(sym))
+					cprint_name("<%c>", ch);
+				else
+					cprint_name("---");
+				break;
+			default:
+				cprint_tag("s%p", menu);
+				tmp = cprint_name("(%s)", sym_get_string_value(sym));
+				tmp = indent - tmp + 4;
+				if (tmp < 0)
+					tmp = 0;
+				cprint_name("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
+					(sym_has_value(sym) || !sym_is_changable(sym)) ?
+					"" : " (NEW)");
+				goto conf_childs;
+			}
+		}
+		cprint_name("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
+			(sym_has_value(sym) || !sym_is_changable(sym)) ?
+			"" : " (NEW)");
+		if (menu->prompt->type == P_MENU) {
+			cprint_name("  --->");
+			return;
+		}
+	}
+
+conf_childs:
+	indent += doint;
+	for (child = menu->list; child; child = child->next)
+		build_conf(child);
+	indent -= doint;
+}
+
+static void conf(struct menu *menu)
+{
+	struct dialog_list_item *active_item = NULL;
+	struct menu *submenu;
+	const char *prompt = menu_get_prompt(menu);
+	struct symbol *sym;
+	char active_entry[40];
+	int stat, type;
+
+	unlink("lxdialog.scrltmp");
+	active_entry[0] = 0;
+	while (1) {
+		indent = 0;
+		child_count = 0;
+		current_menu = menu;
+		cdone(); cinit();
+		build_conf(menu);
+		if (!child_count)
+			break;
+		if (menu == &rootmenu) {
+			cmake(); cprint_tag(":"); cprint_name("--- ");
+			cmake(); cprint_tag("L"); cprint_name("Load an Alternate Configuration File");
+			cmake(); cprint_tag("S"); cprint_name("Save Configuration to an Alternate File");
+		}
+		dialog_clear();
+		stat = dialog_menu(prompt ? prompt : "Main Menu",
+				menu_instructions, rows, cols, rows - 10,
+				active_entry, item_no, items);
+		if (stat < 0)
+			return;
+
+		if (stat == 1 || stat == 255)
+			break;
+
+		active_item = first_sel_item(item_no, items);
+		if (!active_item)
+			continue;
+		active_item->selected = 0;
+		strncpy(active_entry, active_item->tag, sizeof(active_entry));
+		active_entry[sizeof(active_entry)-1] = 0;
+		type = active_entry[0];
+		if (!type)
+			continue;
+
+		sym = NULL;
+		submenu = NULL;
+		if (sscanf(active_entry + 1, "%p", &submenu) == 1)
+			sym = submenu->sym;
+
+		switch (stat) {
+		case 0:
+			switch (type) {
+			case 'm':
+				if (single_menu_mode)
+					submenu->data = (void *) (long) !submenu->data;
+				else
+					conf(submenu);
+				break;
+			case 't':
+				if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)
+					conf_choice(submenu);
+				else if (submenu->prompt->type == P_MENU)
+					conf(submenu);
+				break;
+			case 's':
+				conf_string(submenu);
+				break;
+			case 'L':
+				conf_load();
+				break;
+			case 'S':
+				conf_save();
+				break;
+			}
+			break;
+		case 2:
+			if (sym)
+				show_help(submenu);
+			else
+				show_helptext("README", mconf_readme);
+			break;
+		case 3:
+			if (type == 't') {
+				if (sym_set_tristate_value(sym, yes))
+					break;
+				if (sym_set_tristate_value(sym, mod))
+					show_textbox(NULL, setmod_text, 6, 74);
+			}
+			break;
+		case 4:
+			if (type == 't')
+				sym_set_tristate_value(sym, no);
+			break;
+		case 5:
+			if (type == 't')
+				sym_set_tristate_value(sym, mod);
+			break;
+		case 6:
+			if (type == 't')
+				sym_toggle_tristate_value(sym);
+			else if (type == 'm')
+				conf(submenu);
+			break;
+		case 7:
+			search_conf();
+			break;
+		}
+	}
+}
+
+static void show_textbox(const char *title, const char *text, int r, int c)
+{
+	int fd;
+
+	fd = creat(".help.tmp", 0777);
+	write(fd, text, strlen(text));
+	close(fd);
+	show_file(".help.tmp", title, r, c);
+	unlink(".help.tmp");
+}
+
+static void show_helptext(const char *title, const char *text)
+{
+	show_textbox(title, text, 0, 0);
+}
+
+static void show_help(struct menu *menu)
+{
+	struct gstr help = str_new();
+	struct symbol *sym = menu->sym;
+
+	if (sym->help)
+	{
+		if (sym->name) {
+			str_printf(&help, "%s:\n\n", sym->name);
+			str_append(&help, sym->help);
+			str_append(&help, "\n");
+		}
+	} else {
+		str_append(&help, nohelp_text);
+	}
+	get_symbol_str(&help, sym);
+	show_helptext(menu_get_prompt(menu), str_get(&help));
+	str_free(&help);
+}
+
+static void show_file(const char *filename, const char *title, int r, int c)
+{
+	while (dialog_textbox(title, filename, r ? r : rows, c ? c : cols) < 0)
+		;
+}
+
+static void conf_choice(struct menu *menu)
+{
+	const char *prompt = menu_get_prompt(menu);
+	struct menu *child;
+	struct symbol *active;
+
+	active = sym_get_choice_value(menu->sym);
+	while (1) {
+		current_menu = menu;
+		cdone(); cinit();
+		for (child = menu->list; child; child = child->next) {
+			if (!menu_is_visible(child))
+				continue;
+			cmake();
+			cprint_tag("%p", child);
+			cprint_name("%s", menu_get_prompt(child));
+			if (child->sym == sym_get_choice_value(menu->sym))
+				items[item_no - 1]->selected = 1; /* ON */
+			else if (child->sym == active)
+				items[item_no - 1]->selected = 2; /* SELECTED */
+			else
+				items[item_no - 1]->selected = 0; /* OFF */
+		}
+
+		switch (dialog_checklist(prompt ? prompt : "Main Menu",
+					radiolist_instructions, 15, 70, 6,
+					item_no, items, FLAG_RADIO)) {
+		case 0:
+			if (sscanf(first_sel_item(item_no, items)->tag, "%p", &child) != 1)
+				break;
+			sym_set_tristate_value(child->sym, yes);
+			return;
+		case 1:
+			if (sscanf(first_sel_item(item_no, items)->tag, "%p", &child) == 1) {
+				show_help(child);
+				active = child->sym;
+			} else
+				show_help(menu);
+			break;
+		case 255:
+			return;
+		}
+	}
+}
+
+static void conf_string(struct menu *menu)
+{
+	const char *prompt = menu_get_prompt(menu);
+
+	while (1) {
+		char *heading;
+
+		switch (sym_get_type(menu->sym)) {
+		case S_INT:
+			heading = (char *) inputbox_instructions_int;
+			break;
+		case S_HEX:
+			heading = (char *) inputbox_instructions_hex;
+			break;
+		case S_STRING:
+			heading = (char *) inputbox_instructions_string;
+			break;
+		default:
+			heading = "Internal mconf error!";
+			/* panic? */;
+		}
+
+		switch (dialog_inputbox(prompt ? prompt : "Main Menu",
+					heading, 10, 75,
+					sym_get_string_value(menu->sym))) {
+		case 0:
+			if (sym_set_string_value(menu->sym, dialog_input_result))
+				return;
+			show_textbox(NULL, "You have made an invalid entry.", 5, 43);
+			break;
+		case 1:
+			show_help(menu);
+			break;
+		case 255:
+			return;
+		}
+	}
+}
+
+static void conf_load(void)
+{
+	while (1) {
+		switch (dialog_inputbox(NULL, load_config_text, 11, 55,
+					filename)) {
+		case 0:
+			if (!dialog_input_result[0])
+				return;
+			if (!conf_read(dialog_input_result))
+				return;
+			show_textbox(NULL, "File does not exist!", 5, 38);
+			break;
+		case 1:
+			show_helptext("Load Alternate Configuration", load_config_help);
+			break;
+		case 255:
+			return;
+		}
+	}
+}
+
+static void conf_save(void)
+{
+	while (1) {
+		switch (dialog_inputbox(NULL, save_config_text, 11, 55,
+					filename)) {
+		case 0:
+			if (!dialog_input_result[0])
+				return;
+			if (!conf_write(dialog_input_result))
+				return;
+			show_textbox(NULL, "Can't create file!  Probably a nonexistent directory.", 5, 60);
+			break;
+		case 1:
+			show_helptext("Save Alternate Configuration", save_config_help);
+			break;
+		case 255:
+			return;
+		}
+	}
+}
+
+static void conf_cleanup(void)
+{
+	tcsetattr(1, TCSAFLUSH, &ios_org);
+	unlink(".help.tmp");
+}
+
+static void winch_handler(int sig)
+{
+	struct winsize ws;
+
+	if (ioctl(1, TIOCGWINSZ, &ws) == -1) {
+		rows = 24;
+		cols = 80;
+	} else {
+		rows = ws.ws_row;
+		cols = ws.ws_col;
+	}
+
+	if (rows < 19 || cols < 80) {
+		end_dialog();
+		fprintf(stderr, "Your display is too small to run Menuconfig!\n");
+		fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");
+		exit(1);
+	}
+
+	rows -= 4;
+	cols -= 5;
+
+}
+
+int main(int ac, char **av)
+{
+	struct symbol *sym;
+	char *mode;
+	int stat;
+
+	conf_parse(av[1]);
+	conf_read(NULL);
+
+	sym = sym_lookup("VERSION", 0);
+	sym_calc_value(sym);
+	snprintf(menu_backtitle, 128, "axTLS v%s Configuration",
+		sym_get_string_value(sym));
+
+	mode = getenv("MENUCONFIG_MODE");
+	if (mode) {
+		if (!strcasecmp(mode, "single_menu"))
+			single_menu_mode = 1;
+	}
+
+	tcgetattr(1, &ios_org);
+	atexit(conf_cleanup);
+	init_wsize();
+	init_dialog();
+	signal(SIGWINCH, winch_handler);
+	conf(&rootmenu);
+	end_dialog();
+
+	/* Restart dialog to act more like when lxdialog was still separate */
+	init_dialog();
+	do {
+		stat = dialog_yesno(NULL,
+				    "Do you wish to save your new axTLS configuration?", 5, 60);
+	} while (stat < 0);
+	end_dialog();
+
+	if (stat == 0) {
+		conf_write(NULL);
+		printf("\n\n"
+			"*** End of axTLS configuration.\n"
+			"*** Check the top-level Makefile for additional configuration options.\n\n");
+	} else
+		printf("\n\nYour axTLS configuration changes were NOT saved.\n\n");
+
+	return 0;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/menu.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/menu.c
new file mode 100644
index 00000000..0c13156f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/menu.c
@@ -0,0 +1,390 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+struct menu rootmenu;
+static struct menu **last_entry_ptr;
+
+struct file *file_list;
+struct file *current_file;
+
+static void menu_warn(struct menu *menu, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	fprintf(stderr, "%s:%d:warning: ", menu->file->name, menu->lineno);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "\n");
+	va_end(ap);
+}
+
+static void prop_warn(struct property *prop, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	fprintf(stderr, "%s:%d:warning: ", prop->file->name, prop->lineno);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "\n");
+	va_end(ap);
+}
+
+void menu_init(void)
+{
+	current_entry = current_menu = &rootmenu;
+	last_entry_ptr = &rootmenu.list;
+}
+
+void menu_add_entry(struct symbol *sym)
+{
+	struct menu *menu;
+
+	menu = malloc(sizeof(*menu));
+	memset(menu, 0, sizeof(*menu));
+	menu->sym = sym;
+	menu->parent = current_menu;
+	menu->file = current_file;
+	menu->lineno = zconf_lineno();
+
+	*last_entry_ptr = menu;
+	last_entry_ptr = &menu->next;
+	current_entry = menu;
+}
+
+void menu_end_entry(void)
+{
+}
+
+void menu_add_menu(void)
+{
+	current_menu = current_entry;
+	last_entry_ptr = &current_entry->list;
+}
+
+void menu_end_menu(void)
+{
+	last_entry_ptr = &current_menu->next;
+	current_menu = current_menu->parent;
+}
+
+struct expr *menu_check_dep(struct expr *e)
+{
+	if (!e)
+		return e;
+
+	switch (e->type) {
+	case E_NOT:
+		e->left.expr = menu_check_dep(e->left.expr);
+		break;
+	case E_OR:
+	case E_AND:
+		e->left.expr = menu_check_dep(e->left.expr);
+		e->right.expr = menu_check_dep(e->right.expr);
+		break;
+	case E_SYMBOL:
+		/* change 'm' into 'm' && MODULES */
+		if (e->left.sym == &symbol_mod)
+			return expr_alloc_and(e, expr_alloc_symbol(modules_sym));
+		break;
+	default:
+		break;
+	}
+	return e;
+}
+
+void menu_add_dep(struct expr *dep)
+{
+	current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));
+}
+
+void menu_set_type(int type)
+{
+	struct symbol *sym = current_entry->sym;
+
+	if (sym->type == type)
+		return;
+	if (sym->type == S_UNKNOWN) {
+		sym->type = type;
+		return;
+	}
+	menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'\n",
+	    sym->name ? sym->name : "<choice>",
+	    sym_type_name(sym->type), sym_type_name(type));
+}
+
+struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep)
+{
+	struct property *prop = prop_alloc(type, current_entry->sym);
+
+	prop->menu = current_entry;
+	prop->text = prompt;
+	prop->expr = expr;
+	prop->visible.expr = menu_check_dep(dep);
+
+	if (prompt) {
+		if (current_entry->prompt)
+			menu_warn(current_entry, "prompt redefined\n");
+		current_entry->prompt = prop;
+	}
+
+	return prop;
+}
+
+void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
+{
+	menu_add_prop(type, prompt, NULL, dep);
+}
+
+void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep)
+{
+	menu_add_prop(type, NULL, expr, dep);
+}
+
+void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
+{
+	menu_add_prop(type, NULL, expr_alloc_symbol(sym), dep);
+}
+
+void sym_check_prop(struct symbol *sym)
+{
+	struct property *prop;
+	struct symbol *sym2;
+	for (prop = sym->prop; prop; prop = prop->next) {
+		switch (prop->type) {
+		case P_DEFAULT:
+			if ((sym->type == S_STRING || sym->type == S_INT || sym->type == S_HEX) &&
+			    prop->expr->type != E_SYMBOL)
+				prop_warn(prop,
+				    "default for config symbol '%'"
+				    " must be a single symbol", sym->name);
+			break;
+		case P_SELECT:
+			sym2 = prop_get_symbol(prop);
+			if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE)
+				prop_warn(prop,
+				    "config symbol '%s' uses select, but is "
+				    "not boolean or tristate", sym->name);
+			else if (sym2->type == S_UNKNOWN)
+				prop_warn(prop,
+				    "'select' used by config symbol '%s' "
+				    "refer to undefined symbol '%s'",
+				    sym->name, sym2->name);
+			else if (sym2->type != S_BOOLEAN && sym2->type != S_TRISTATE)
+				prop_warn(prop,
+				    "'%s' has wrong type. 'select' only "
+				    "accept arguments of boolean and "
+				    "tristate type", sym2->name);
+			break;
+		case P_RANGE:
+			if (sym->type != S_INT && sym->type != S_HEX)
+				prop_warn(prop, "range is only allowed "
+				                "for int or hex symbols");
+			if (!sym_string_valid(sym, prop->expr->left.sym->name) ||
+			    !sym_string_valid(sym, prop->expr->right.sym->name))
+				prop_warn(prop, "range is invalid");
+			break;
+		default:
+			;
+		}
+	}
+}
+
+void menu_finalize(struct menu *parent)
+{
+	struct menu *menu, *last_menu;
+	struct symbol *sym;
+	struct property *prop;
+	struct expr *parentdep, *basedep, *dep, *dep2, **ep;
+
+	sym = parent->sym;
+	if (parent->list) {
+		if (sym && sym_is_choice(sym)) {
+			/* find the first choice value and find out choice type */
+			for (menu = parent->list; menu; menu = menu->next) {
+				if (menu->sym) {
+					current_entry = parent;
+					menu_set_type(menu->sym->type);
+					current_entry = menu;
+					menu_set_type(sym->type);
+					break;
+				}
+			}
+			parentdep = expr_alloc_symbol(sym);
+		} else if (parent->prompt)
+			parentdep = parent->prompt->visible.expr;
+		else
+			parentdep = parent->dep;
+
+		for (menu = parent->list; menu; menu = menu->next) {
+			basedep = expr_transform(menu->dep);
+			basedep = expr_alloc_and(expr_copy(parentdep), basedep);
+			basedep = expr_eliminate_dups(basedep);
+			menu->dep = basedep;
+			if (menu->sym)
+				prop = menu->sym->prop;
+			else
+				prop = menu->prompt;
+			for (; prop; prop = prop->next) {
+				if (prop->menu != menu)
+					continue;
+				dep = expr_transform(prop->visible.expr);
+				dep = expr_alloc_and(expr_copy(basedep), dep);
+				dep = expr_eliminate_dups(dep);
+				if (menu->sym && menu->sym->type != S_TRISTATE)
+					dep = expr_trans_bool(dep);
+				prop->visible.expr = dep;
+				if (prop->type == P_SELECT) {
+					struct symbol *es = prop_get_symbol(prop);
+					es->rev_dep.expr = expr_alloc_or(es->rev_dep.expr,
+							expr_alloc_and(expr_alloc_symbol(menu->sym), expr_copy(dep)));
+				}
+			}
+		}
+		for (menu = parent->list; menu; menu = menu->next)
+			menu_finalize(menu);
+	} else if (sym) {
+		basedep = parent->prompt ? parent->prompt->visible.expr : NULL;
+		basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);
+		basedep = expr_eliminate_dups(expr_transform(basedep));
+		last_menu = NULL;
+		for (menu = parent->next; menu; menu = menu->next) {
+			dep = menu->prompt ? menu->prompt->visible.expr : menu->dep;
+			if (!expr_contains_symbol(dep, sym))
+				break;
+			if (expr_depends_symbol(dep, sym))
+				goto next;
+			dep = expr_trans_compare(dep, E_UNEQUAL, &symbol_no);
+			dep = expr_eliminate_dups(expr_transform(dep));
+			dep2 = expr_copy(basedep);
+			expr_eliminate_eq(&dep, &dep2);
+			expr_free(dep);
+			if (!expr_is_yes(dep2)) {
+				expr_free(dep2);
+				break;
+			}
+			expr_free(dep2);
+		next:
+			menu_finalize(menu);
+			menu->parent = parent;
+			last_menu = menu;
+		}
+		if (last_menu) {
+			parent->list = parent->next;
+			parent->next = last_menu->next;
+			last_menu->next = NULL;
+		}
+	}
+	for (menu = parent->list; menu; menu = menu->next) {
+		if (sym && sym_is_choice(sym) && menu->sym) {
+			menu->sym->flags |= SYMBOL_CHOICEVAL;
+			if (!menu->prompt)
+				menu_warn(menu, "choice value must have a prompt");
+			for (prop = menu->sym->prop; prop; prop = prop->next) {
+				if (prop->type == P_PROMPT && prop->menu != menu) {
+					prop_warn(prop, "choice values "
+					    "currently only support a "
+					    "single prompt");
+				}
+				if (prop->type == P_DEFAULT)
+					prop_warn(prop, "defaults for choice "
+					    "values not supported");
+			}
+			current_entry = menu;
+			menu_set_type(sym->type);
+			menu_add_symbol(P_CHOICE, sym, NULL);
+			prop = sym_get_choice_prop(sym);
+			for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)
+				;
+			*ep = expr_alloc_one(E_CHOICE, NULL);
+			(*ep)->right.sym = menu->sym;
+		}
+		if (menu->list && (!menu->prompt || !menu->prompt->text)) {
+			for (last_menu = menu->list; ; last_menu = last_menu->next) {
+				last_menu->parent = parent;
+				if (!last_menu->next)
+					break;
+			}
+			last_menu->next = menu->next;
+			menu->next = menu->list;
+			menu->list = NULL;
+		}
+	}
+
+	if (sym && !(sym->flags & SYMBOL_WARNED)) {
+		if (sym->type == S_UNKNOWN)
+			menu_warn(parent, "config symbol defined "
+			    "without type\n");
+
+		if (sym_is_choice(sym) && !parent->prompt)
+			menu_warn(parent, "choice must have a prompt\n");
+
+		/* Check properties connected to this symbol */
+		sym_check_prop(sym);
+		sym->flags |= SYMBOL_WARNED;
+	}
+
+	if (sym && !sym_is_optional(sym) && parent->prompt) {
+		sym->rev_dep.expr = expr_alloc_or(sym->rev_dep.expr,
+				expr_alloc_and(parent->prompt->visible.expr,
+					expr_alloc_symbol(&symbol_mod)));
+	}
+}
+
+bool menu_is_visible(struct menu *menu)
+{
+	struct menu *child;
+	struct symbol *sym;
+	tristate visible;
+
+	if (!menu->prompt)
+		return false;
+	sym = menu->sym;
+	if (sym) {
+		sym_calc_value(sym);
+		visible = menu->prompt->visible.tri;
+	} else
+		visible = menu->prompt->visible.tri = expr_calc_value(menu->prompt->visible.expr);
+
+	if (visible != no)
+		return true;
+	if (!sym || sym_get_tristate_value(menu->sym) == no)
+		return false;
+
+	for (child = menu->list; child; child = child->next)
+		if (menu_is_visible(child))
+			return true;
+	return false;
+}
+
+const char *menu_get_prompt(struct menu *menu)
+{
+	if (menu->prompt)
+		return menu->prompt->text;
+	else if (menu->sym)
+		return menu->sym->name;
+	return NULL;
+}
+
+struct menu *menu_get_root_menu(struct menu *menu)
+{
+	return &rootmenu;
+}
+
+struct menu *menu_get_parent_menu(struct menu *menu)
+{
+	enum prop_type type;
+
+	for (; menu != &rootmenu; menu = menu->parent) {
+		type = menu->prompt ? menu->prompt->type : 0;
+		if (type == P_MENU)
+			break;
+	}
+	return menu;
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mkconfigs b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mkconfigs
new file mode 100755
index 00000000..3cb7bb17
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/mkconfigs
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Copyright (C) 2002 Khalid Aziz <khalid_aziz at hp.com>
+# Copyright (C) 2002 Randy Dunlap <rddunlap at osdl.org>
+# Copyright (C) 2002 Al Stone <ahs3 at fc.hp.com>
+# Copyright (C) 2002 Hewlett-Packard Company
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#   Busybox version by Matteo Croce <3297627799 at wind.it>
+#
+# Rules to generate bbconfig.h from .config:
+#      - Retain lines that begin with "CONFIG_"
+#      - Retain lines that begin with "# CONFIG_"
+#      - lines that use double-quotes must \\-escape-quote them
+
+if [ $# -lt 1 ]
+then
+	config=.config
+else	config=$1
+fi
+
+echo "#ifndef _BBCONFIG_H"
+echo "#define _BBCONFIG_H"
+echo \
+"/*
+ * busybox configuration options.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT.  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ *
+ * This file is generated automatically by scripts/config/mkconfigs.
+ * Do not edit.
+ *
+ */"
+
+echo "static char const bbconfig_config[] ="
+echo "\"CONFIG_BEGIN=n\\n\\"
+echo "`sed 's/\"/\\\\\"/g' $config | grep "^#\? \?CONFIG_" | awk '{ print $0 "\\\\n\\\\" }' `"
+echo "CONFIG_END=n\\n\";"
+echo "#endif /* _BBCONFIG_H */"
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/symbol.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/symbol.c
new file mode 100644
index 00000000..ea629728
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/symbol.c
@@ -0,0 +1,809 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <regex.h>
+#include <sys/utsname.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+struct symbol symbol_yes = {
+	.name = "y",
+	.curr = { "y", yes },
+	.flags = SYMBOL_YES|SYMBOL_VALID,
+}, symbol_mod = {
+	.name = "m",
+	.curr = { "m", mod },
+	.flags = SYMBOL_MOD|SYMBOL_VALID,
+}, symbol_no = {
+	.name = "n",
+	.curr = { "n", no },
+	.flags = SYMBOL_NO|SYMBOL_VALID,
+}, symbol_empty = {
+	.name = "",
+	.curr = { "", no },
+	.flags = SYMBOL_VALID,
+};
+
+int sym_change_count;
+struct symbol *modules_sym;
+tristate modules_val;
+
+void sym_add_default(struct symbol *sym, const char *def)
+{
+	struct property *prop = prop_alloc(P_DEFAULT, sym);
+
+	prop->expr = expr_alloc_symbol(sym_lookup(def, 1));
+}
+
+void sym_init(void)
+{
+	struct symbol *sym;
+	char *p;
+	static bool inited = false;
+
+	if (inited)
+		return;
+	inited = true;
+
+	sym = sym_lookup("VERSION", 0);
+	sym->type = S_STRING;
+	sym->flags |= SYMBOL_AUTO;
+	p = getenv("VERSION");
+	if (p)
+		sym_add_default(sym, p);
+
+	sym = sym_lookup("TARGET_ARCH", 0);
+	sym->type = S_STRING;
+	sym->flags |= SYMBOL_AUTO;
+	p = getenv("TARGET_ARCH");
+	if (p)
+		sym_add_default(sym, p);
+
+}
+
+enum symbol_type sym_get_type(struct symbol *sym)
+{
+	enum symbol_type type = sym->type;
+
+	if (type == S_TRISTATE) {
+		if (sym_is_choice_value(sym) && sym->visible == yes)
+			type = S_BOOLEAN;
+		else if (modules_val == no)
+			type = S_BOOLEAN;
+	}
+	return type;
+}
+
+const char *sym_type_name(enum symbol_type type)
+{
+	switch (type) {
+	case S_BOOLEAN:
+		return "boolean";
+	case S_TRISTATE:
+		return "tristate";
+	case S_INT:
+		return "integer";
+	case S_HEX:
+		return "hex";
+	case S_STRING:
+		return "string";
+	case S_UNKNOWN:
+		return "unknown";
+	case S_OTHER:
+		break;
+	}
+	return "???";
+}
+
+struct property *sym_get_choice_prop(struct symbol *sym)
+{
+	struct property *prop;
+
+	for_all_choices(sym, prop)
+		return prop;
+	return NULL;
+}
+
+struct property *sym_get_default_prop(struct symbol *sym)
+{
+	struct property *prop;
+
+	for_all_defaults(sym, prop) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		if (prop->visible.tri != no)
+			return prop;
+	}
+	return NULL;
+}
+
+struct property *sym_get_range_prop(struct symbol *sym)
+{
+	struct property *prop;
+
+	for_all_properties(sym, prop, P_RANGE) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		if (prop->visible.tri != no)
+			return prop;
+	}
+	return NULL;
+}
+
+static void sym_calc_visibility(struct symbol *sym)
+{
+	struct property *prop;
+	tristate tri;
+
+	/* any prompt visible? */
+	tri = no;
+	for_all_prompts(sym, prop) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		tri = E_OR(tri, prop->visible.tri);
+	}
+	if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))
+		tri = yes;
+	if (sym->visible != tri) {
+		sym->visible = tri;
+		sym_set_changed(sym);
+	}
+	if (sym_is_choice_value(sym))
+		return;
+	tri = no;
+	if (sym->rev_dep.expr)
+		tri = expr_calc_value(sym->rev_dep.expr);
+	if (tri == mod && sym_get_type(sym) == S_BOOLEAN)
+		tri = yes;
+	if (sym->rev_dep.tri != tri) {
+		sym->rev_dep.tri = tri;
+		sym_set_changed(sym);
+	}
+}
+
+static struct symbol *sym_calc_choice(struct symbol *sym)
+{
+	struct symbol *def_sym;
+	struct property *prop;
+	struct expr *e;
+
+	/* is the user choice visible? */
+	def_sym = sym->user.val;
+	if (def_sym) {
+		sym_calc_visibility(def_sym);
+		if (def_sym->visible != no)
+			return def_sym;
+	}
+
+	/* any of the defaults visible? */
+	for_all_defaults(sym, prop) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		if (prop->visible.tri == no)
+			continue;
+		def_sym = prop_get_symbol(prop);
+		sym_calc_visibility(def_sym);
+		if (def_sym->visible != no)
+			return def_sym;
+	}
+
+	/* just get the first visible value */
+	prop = sym_get_choice_prop(sym);
+	for (e = prop->expr; e; e = e->left.expr) {
+		def_sym = e->right.sym;
+		sym_calc_visibility(def_sym);
+		if (def_sym->visible != no)
+			return def_sym;
+	}
+
+	/* no choice? reset tristate value */
+	sym->curr.tri = no;
+	return NULL;
+}
+
+void sym_calc_value(struct symbol *sym)
+{
+	struct symbol_value newval, oldval;
+	struct property *prop;
+	struct expr *e;
+
+	if (!sym)
+		return;
+
+	if (sym->flags & SYMBOL_VALID)
+		return;
+	sym->flags |= SYMBOL_VALID;
+
+	oldval = sym->curr;
+
+	switch (sym->type) {
+	case S_INT:
+	case S_HEX:
+	case S_STRING:
+		newval = symbol_empty.curr;
+		break;
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		newval = symbol_no.curr;
+		break;
+	default:
+		sym->curr.val = sym->name;
+		sym->curr.tri = no;
+		return;
+	}
+	if (!sym_is_choice_value(sym))
+		sym->flags &= ~SYMBOL_WRITE;
+
+	sym_calc_visibility(sym);
+
+	/* set default if recursively called */
+	sym->curr = newval;
+
+	switch (sym_get_type(sym)) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		if (sym_is_choice_value(sym) && sym->visible == yes) {
+			prop = sym_get_choice_prop(sym);
+			newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no;
+		} else if (E_OR(sym->visible, sym->rev_dep.tri) != no) {
+			sym->flags |= SYMBOL_WRITE;
+			if (sym_has_value(sym))
+				newval.tri = sym->user.tri;
+			else if (!sym_is_choice(sym)) {
+				prop = sym_get_default_prop(sym);
+				if (prop)
+					newval.tri = expr_calc_value(prop->expr);
+			}
+			newval.tri = E_OR(E_AND(newval.tri, sym->visible), sym->rev_dep.tri);
+		} else if (!sym_is_choice(sym)) {
+			prop = sym_get_default_prop(sym);
+			if (prop) {
+				sym->flags |= SYMBOL_WRITE;
+				newval.tri = expr_calc_value(prop->expr);
+			}
+		}
+		if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
+			newval.tri = yes;
+		break;
+	case S_STRING:
+	case S_HEX:
+	case S_INT:
+		if (sym->visible != no) {
+			sym->flags |= SYMBOL_WRITE;
+			if (sym_has_value(sym)) {
+				newval.val = sym->user.val;
+				break;
+			}
+		}
+		prop = sym_get_default_prop(sym);
+		if (prop) {
+			struct symbol *ds = prop_get_symbol(prop);
+			if (ds) {
+				sym->flags |= SYMBOL_WRITE;
+				sym_calc_value(ds);
+				newval.val = ds->curr.val;
+			}
+		}
+		break;
+	default:
+		;
+	}
+
+	sym->curr = newval;
+	if (sym_is_choice(sym) && newval.tri == yes)
+		sym->curr.val = sym_calc_choice(sym);
+
+	if (memcmp(&oldval, &sym->curr, sizeof(oldval)))
+		sym_set_changed(sym);
+	if (modules_sym == sym)
+		modules_val = modules_sym->curr.tri;
+
+	if (sym_is_choice(sym)) {
+		int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE);
+		prop = sym_get_choice_prop(sym);
+		for (e = prop->expr; e; e = e->left.expr) {
+			e->right.sym->flags |= flags;
+			if (flags & SYMBOL_CHANGED)
+				sym_set_changed(e->right.sym);
+		}
+	}
+}
+
+void sym_clear_all_valid(void)
+{
+	struct symbol *sym;
+	int i;
+
+	for_all_symbols(i, sym)
+		sym->flags &= ~SYMBOL_VALID;
+	sym_change_count++;
+	if (modules_sym)
+		sym_calc_value(modules_sym);
+}
+
+void sym_set_changed(struct symbol *sym)
+{
+	struct property *prop;
+
+	sym->flags |= SYMBOL_CHANGED;
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu)
+			prop->menu->flags |= MENU_CHANGED;
+	}
+}
+
+void sym_set_all_changed(void)
+{
+	struct symbol *sym;
+	int i;
+
+	for_all_symbols(i, sym)
+		sym_set_changed(sym);
+}
+
+bool sym_tristate_within_range(struct symbol *sym, tristate val)
+{
+	int type = sym_get_type(sym);
+
+	if (sym->visible == no)
+		return false;
+
+	if (type != S_BOOLEAN && type != S_TRISTATE)
+		return false;
+
+	if (type == S_BOOLEAN && val == mod)
+		return false;
+	if (sym->visible <= sym->rev_dep.tri)
+		return false;
+	if (sym_is_choice_value(sym) && sym->visible == yes)
+		return val == yes;
+	return val >= sym->rev_dep.tri && val <= sym->visible;
+}
+
+bool sym_set_tristate_value(struct symbol *sym, tristate val)
+{
+	tristate oldval = sym_get_tristate_value(sym);
+
+	if (oldval != val && !sym_tristate_within_range(sym, val))
+		return false;
+
+	if (sym->flags & SYMBOL_NEW) {
+		sym->flags &= ~SYMBOL_NEW;
+		sym_set_changed(sym);
+	}
+	if (sym_is_choice_value(sym) && val == yes) {
+		struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+
+		cs->user.val = sym;
+		cs->flags &= ~SYMBOL_NEW;
+	}
+
+	sym->user.tri = val;
+	if (oldval != val) {
+		sym_clear_all_valid();
+		if (sym == modules_sym)
+			sym_set_all_changed();
+	}
+
+	return true;
+}
+
+tristate sym_toggle_tristate_value(struct symbol *sym)
+{
+	tristate oldval, newval;
+
+	oldval = newval = sym_get_tristate_value(sym);
+	do {
+		switch (newval) {
+		case no:
+			newval = mod;
+			break;
+		case mod:
+			newval = yes;
+			break;
+		case yes:
+			newval = no;
+			break;
+		}
+		if (sym_set_tristate_value(sym, newval))
+			break;
+	} while (oldval != newval);
+	return newval;
+}
+
+bool sym_string_valid(struct symbol *sym, const char *str)
+{
+	signed char ch;
+
+	switch (sym->type) {
+	case S_STRING:
+		return true;
+	case S_INT:
+		ch = *str++;
+		if (ch == '-')
+			ch = *str++;
+		if (!isdigit(ch))
+			return false;
+		if (ch == '0' && *str != 0)
+			return false;
+		while ((ch = *str++)) {
+			if (!isdigit(ch))
+				return false;
+		}
+		return true;
+	case S_HEX:
+		if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
+			str += 2;
+		ch = *str++;
+		do {
+			if (!isxdigit(ch))
+				return false;
+		} while ((ch = *str++));
+		return true;
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		switch (str[0]) {
+		case 'y': case 'Y':
+		case 'm': case 'M':
+		case 'n': case 'N':
+			return true;
+		}
+		return false;
+	default:
+		return false;
+	}
+}
+
+bool sym_string_within_range(struct symbol *sym, const char *str)
+{
+	struct property *prop;
+	int val;
+
+	switch (sym->type) {
+	case S_STRING:
+		return sym_string_valid(sym, str);
+	case S_INT:
+		if (!sym_string_valid(sym, str))
+			return false;
+		prop = sym_get_range_prop(sym);
+		if (!prop)
+			return true;
+		val = strtol(str, NULL, 10);
+		return val >= strtol(prop->expr->left.sym->name, NULL, 10) &&
+		       val <= strtol(prop->expr->right.sym->name, NULL, 10);
+	case S_HEX:
+		if (!sym_string_valid(sym, str))
+			return false;
+		prop = sym_get_range_prop(sym);
+		if (!prop)
+			return true;
+		val = strtol(str, NULL, 16);
+		return val >= strtol(prop->expr->left.sym->name, NULL, 16) &&
+		       val <= strtol(prop->expr->right.sym->name, NULL, 16);
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		switch (str[0]) {
+		case 'y': case 'Y':
+			return sym_tristate_within_range(sym, yes);
+		case 'm': case 'M':
+			return sym_tristate_within_range(sym, mod);
+		case 'n': case 'N':
+			return sym_tristate_within_range(sym, no);
+		}
+		return false;
+	default:
+		return false;
+	}
+}
+
+bool sym_set_string_value(struct symbol *sym, const char *newval)
+{
+	const char *oldval;
+	char *val;
+	int size;
+
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		switch (newval[0]) {
+		case 'y': case 'Y':
+			return sym_set_tristate_value(sym, yes);
+		case 'm': case 'M':
+			return sym_set_tristate_value(sym, mod);
+		case 'n': case 'N':
+			return sym_set_tristate_value(sym, no);
+		}
+		return false;
+	default:
+		;
+	}
+
+	if (!sym_string_within_range(sym, newval))
+		return false;
+
+	if (sym->flags & SYMBOL_NEW) {
+		sym->flags &= ~SYMBOL_NEW;
+		sym_set_changed(sym);
+	}
+
+	oldval = sym->user.val;
+	size = strlen(newval) + 1;
+	if (sym->type == S_HEX && (newval[0] != '0' || (newval[1] != 'x' && newval[1] != 'X'))) {
+		size += 2;
+		sym->user.val = val = malloc(size);
+		*val++ = '0';
+		*val++ = 'x';
+	} else if (!oldval || strcmp(oldval, newval))
+		sym->user.val = val = malloc(size);
+	else
+		return true;
+
+	strcpy(val, newval);
+	free((void *)oldval);
+	sym_clear_all_valid();
+
+	return true;
+}
+
+const char *sym_get_string_value(struct symbol *sym)
+{
+	tristate val;
+
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		val = sym_get_tristate_value(sym);
+		switch (val) {
+		case no:
+			return "n";
+		case mod:
+			return "m";
+		case yes:
+			return "y";
+		}
+		break;
+	default:
+		;
+	}
+	return (const char *)sym->curr.val;
+}
+
+bool sym_is_changable(struct symbol *sym)
+{
+	return sym->visible > sym->rev_dep.tri;
+}
+
+struct symbol *sym_lookup(const char *name, int isconst)
+{
+	struct symbol *symbol;
+	const char *ptr;
+	char *new_name;
+	int hash = 0;
+
+	if (name) {
+		if (name[0] && !name[1]) {
+			switch (name[0]) {
+			case 'y': return &symbol_yes;
+			case 'm': return &symbol_mod;
+			case 'n': return &symbol_no;
+			}
+		}
+		for (ptr = name; *ptr; ptr++)
+			hash += *ptr;
+		hash &= 0xff;
+
+		for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
+			if (!strcmp(symbol->name, name)) {
+				if ((isconst && symbol->flags & SYMBOL_CONST) ||
+				    (!isconst && !(symbol->flags & SYMBOL_CONST)))
+					return symbol;
+			}
+		}
+		new_name = strdup(name);
+	} else {
+		new_name = NULL;
+		hash = 256;
+	}
+
+	symbol = malloc(sizeof(*symbol));
+	memset(symbol, 0, sizeof(*symbol));
+	symbol->name = new_name;
+	symbol->type = S_UNKNOWN;
+	symbol->flags = SYMBOL_NEW;
+	if (isconst)
+		symbol->flags |= SYMBOL_CONST;
+
+	symbol->next = symbol_hash[hash];
+	symbol_hash[hash] = symbol;
+
+	return symbol;
+}
+
+struct symbol *sym_find(const char *name)
+{
+	struct symbol *symbol = NULL;
+	const char *ptr;
+	int hash = 0;
+
+	if (!name)
+		return NULL;
+
+	if (name[0] && !name[1]) {
+		switch (name[0]) {
+		case 'y': return &symbol_yes;
+		case 'm': return &symbol_mod;
+		case 'n': return &symbol_no;
+		}
+	}
+	for (ptr = name; *ptr; ptr++)
+		hash += *ptr;
+	hash &= 0xff;
+
+	for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
+		if (!strcmp(symbol->name, name) &&
+		    !(symbol->flags & SYMBOL_CONST))
+				break;
+	}
+
+	return symbol;
+}
+
+struct symbol **sym_re_search(const char *pattern)
+{
+	struct symbol *sym, **sym_arr = NULL;
+	int i, cnt, size;
+	regex_t re;
+
+	cnt = size = 0;
+	/* Skip if empty */
+	if (strlen(pattern) == 0)
+		return NULL;
+	if (regcomp(&re, pattern, REG_EXTENDED|REG_NOSUB|REG_ICASE))
+		return NULL;
+
+	for_all_symbols(i, sym) {
+		if (sym->flags & SYMBOL_CONST || !sym->name)
+			continue;
+		if (regexec(&re, sym->name, 0, NULL, 0))
+			continue;
+		if (cnt + 1 >= size) {
+			void *tmp = sym_arr;
+			size += 16;
+			sym_arr = realloc(sym_arr, size * sizeof(struct symbol *));
+			if (!sym_arr) {
+				free(tmp);
+				return NULL;
+			}
+		}
+		sym_arr[cnt++] = sym;
+	}
+	if (sym_arr)
+		sym_arr[cnt] = NULL;
+	regfree(&re);
+
+	return sym_arr;
+}
+
+
+struct symbol *sym_check_deps(struct symbol *sym);
+
+static struct symbol *sym_check_expr_deps(struct expr *e)
+{
+	struct symbol *sym;
+
+	if (!e)
+		return NULL;
+	switch (e->type) {
+	case E_OR:
+	case E_AND:
+		sym = sym_check_expr_deps(e->left.expr);
+		if (sym)
+			return sym;
+		return sym_check_expr_deps(e->right.expr);
+	case E_NOT:
+		return sym_check_expr_deps(e->left.expr);
+	case E_EQUAL:
+	case E_UNEQUAL:
+		sym = sym_check_deps(e->left.sym);
+		if (sym)
+			return sym;
+		return sym_check_deps(e->right.sym);
+	case E_SYMBOL:
+		return sym_check_deps(e->left.sym);
+	default:
+		break;
+	}
+	printf("Oops! How to check %d?\n", e->type);
+	return NULL;
+}
+
+struct symbol *sym_check_deps(struct symbol *sym)
+{
+	struct symbol *sym2;
+	struct property *prop;
+
+	if (sym->flags & SYMBOL_CHECK_DONE)
+		return NULL;
+	if (sym->flags & SYMBOL_CHECK) {
+		printf("Warning! Found recursive dependency: %s", sym->name);
+		return sym;
+	}
+
+	sym->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED);
+	sym2 = sym_check_expr_deps(sym->rev_dep.expr);
+	if (sym2)
+		goto out;
+
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->type == P_CHOICE || prop->type == P_SELECT)
+			continue;
+		sym2 = sym_check_expr_deps(prop->visible.expr);
+		if (sym2)
+			goto out;
+		if (prop->type != P_DEFAULT || sym_is_choice(sym))
+			continue;
+		sym2 = sym_check_expr_deps(prop->expr);
+		if (sym2)
+			goto out;
+	}
+out:
+	if (sym2)
+		printf(" %s", sym->name);
+	sym->flags &= ~SYMBOL_CHECK;
+	return sym2;
+}
+
+struct property *prop_alloc(enum prop_type type, struct symbol *sym)
+{
+	struct property *prop;
+	struct property **propp;
+
+	prop = malloc(sizeof(*prop));
+	memset(prop, 0, sizeof(*prop));
+	prop->type = type;
+	prop->sym = sym;
+	prop->file = current_file;
+	prop->lineno = zconf_lineno();
+
+	/* append property to the prop list of symbol */
+	if (sym) {
+		for (propp = &sym->prop; *propp; propp = &(*propp)->next)
+			;
+		*propp = prop;
+	}
+
+	return prop;
+}
+
+struct symbol *prop_get_symbol(struct property *prop)
+{
+	if (prop->expr && (prop->expr->type == E_SYMBOL ||
+			   prop->expr->type == E_CHOICE))
+		return prop->expr->left.sym;
+	return NULL;
+}
+
+const char *prop_get_type_name(enum prop_type type)
+{
+	switch (type) {
+	case P_PROMPT:
+		return "prompt";
+	case P_COMMENT:
+		return "comment";
+	case P_MENU:
+		return "menu";
+	case P_DEFAULT:
+		return "default";
+	case P_CHOICE:
+		return "choice";
+	case P_SELECT:
+		return "select";
+	case P_RANGE:
+		return "range";
+	case P_UNKNOWN:
+		break;
+	}
+	return "unknown";
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/util.c b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/util.c
new file mode 100644
index 00000000..8fc95a2a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/util.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org>
+ * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>
+ *
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <string.h>
+#include "lkc.h"
+
+/* file already present in list? If not add it */
+struct file *file_lookup(const char *name)
+{
+	struct file *file;
+
+	for (file = file_list; file; file = file->next) {
+		if (!strcmp(name, file->name))
+			return file;
+	}
+
+	file = malloc(sizeof(*file));
+	memset(file, 0, sizeof(*file));
+	file->name = strdup(name);
+	file->next = file_list;
+	file_list = file;
+	return file;
+}
+
+/* write a dependency file as used by kbuild to track dependencies */
+int file_write_dep(const char *name)
+{
+	struct file *file;
+	FILE *out;
+
+	if (!name)
+		name = "config/.config.cmd";
+	out = fopen("config/.config.tmp", "w");
+	if (!out)
+		return 1;
+	fprintf(out, "deps_config := \\\n");
+	for (file = file_list; file; file = file->next) {
+		if (file->next)
+			fprintf(out, "\t%s \\\n", file->name);
+		else
+			fprintf(out, "\t%s\n", file->name);
+	}
+	fprintf(out, "\n.config include/config.h: $(deps_config)\n\n$(deps_config):\n");
+	fclose(out);
+	rename(".config.tmp", name);
+	return 0;
+}
+
+
+/* Allocate initial growable sting */
+struct gstr str_new(void)
+{
+	struct gstr gs;
+	gs.s = malloc(sizeof(char) * 64);
+	gs.len = 16;
+	strcpy(gs.s, "\0");
+	return gs;
+}
+
+/* Allocate and assign growable string */
+struct gstr str_assign(const char *s)
+{
+	struct gstr gs;
+	gs.s = strdup(s);
+	gs.len = strlen(s) + 1;
+	return gs;
+}
+
+/* Free storage for growable string */
+void str_free(struct gstr *gs)
+{
+	if (gs->s)
+		free(gs->s);
+	gs->s = NULL;
+	gs->len = 0;
+}
+
+/* Append to growable string */
+void str_append(struct gstr *gs, const char *s)
+{
+	size_t l = strlen(gs->s) + strlen(s) + 1;
+	if (l > gs->len) {
+		gs->s   = realloc(gs->s, l);
+		gs->len = l;
+	}
+	strcat(gs->s, s);
+}
+
+/* Append printf formatted string to growable string */
+void str_printf(struct gstr *gs, const char *fmt, ...)
+{
+	va_list ap;
+	char s[10000]; /* big enough... */
+	va_start(ap, fmt);
+	vsnprintf(s, sizeof(s), fmt, ap);
+	str_append(gs, s);
+	va_end(ap);
+}
+
+/* Retreive value of growable string */
+const char *str_get(struct gstr *gs)
+{
+	return gs->s;
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.l b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.l
new file mode 100644
index 00000000..55517b28
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.l
@@ -0,0 +1,366 @@
+%option backup nostdinit noyywrap never-interactive full ecs
+%option 8bit backup nodefault perf-report perf-report
+%x COMMAND HELP STRING PARAM
+%{
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+#define START_STRSIZE	16
+
+char *text;
+static char *text_ptr;
+static int text_size, text_asize;
+
+struct buffer {
+        struct buffer *parent;
+        YY_BUFFER_STATE state;
+};
+
+struct buffer *current_buf;
+
+static int last_ts, first_ts;
+
+static void zconf_endhelp(void);
+static struct buffer *zconf_endfile(void);
+
+void new_string(void)
+{
+	text = malloc(START_STRSIZE);
+	text_asize = START_STRSIZE;
+	text_ptr = text;
+	text_size = 0;
+	*text_ptr = 0;
+}
+
+void append_string(const char *str, int size)
+{
+	int new_size = text_size + size + 1;
+	if (new_size > text_asize) {
+		text = realloc(text, new_size);
+		text_asize = new_size;
+		text_ptr = text + text_size;
+	}
+	memcpy(text_ptr, str, size);
+	text_ptr += size;
+	text_size += size;
+	*text_ptr = 0;
+}
+
+void alloc_string(const char *str, int size)
+{
+	text = malloc(size + 1);
+	memcpy(text, str, size);
+	text[size] = 0;
+}
+%}
+
+ws	[ \n\t]
+n	[A-Za-z0-9_]
+
+%%
+	int str = 0;
+	int ts, i;
+
+[ \t]*#.*\n	current_file->lineno++;
+[ \t]*#.*
+
+[ \t]*\n	current_file->lineno++; return T_EOL;
+
+[ \t]+	{
+	BEGIN(COMMAND);
+}
+
+.	{
+	unput(yytext[0]);
+	BEGIN(COMMAND);
+}
+
+
+<COMMAND>{
+	"mainmenu"		BEGIN(PARAM); return T_MAINMENU;
+	"menu"			BEGIN(PARAM); return T_MENU;
+	"endmenu"		BEGIN(PARAM); return T_ENDMENU;
+	"source"		BEGIN(PARAM); return T_SOURCE;
+	"choice"		BEGIN(PARAM); return T_CHOICE;
+	"endchoice"		BEGIN(PARAM); return T_ENDCHOICE;
+	"comment"		BEGIN(PARAM); return T_COMMENT;
+	"config"		BEGIN(PARAM); return T_CONFIG;
+	"menuconfig"		BEGIN(PARAM); return T_MENUCONFIG;
+	"help"			BEGIN(PARAM); return T_HELP;
+	"if"			BEGIN(PARAM); return T_IF;
+	"endif"			BEGIN(PARAM); return T_ENDIF;
+	"depends"		BEGIN(PARAM); return T_DEPENDS;
+	"requires"		BEGIN(PARAM); return T_REQUIRES;
+	"optional"		BEGIN(PARAM); return T_OPTIONAL;
+	"default"		BEGIN(PARAM); return T_DEFAULT;
+	"prompt"		BEGIN(PARAM); return T_PROMPT;
+	"tristate"		BEGIN(PARAM); return T_TRISTATE;
+	"def_tristate"		BEGIN(PARAM); return T_DEF_TRISTATE;
+	"bool"			BEGIN(PARAM); return T_BOOLEAN;
+	"boolean"		BEGIN(PARAM); return T_BOOLEAN;
+	"def_bool"		BEGIN(PARAM); return T_DEF_BOOLEAN;
+	"def_boolean"		BEGIN(PARAM); return T_DEF_BOOLEAN;
+	"int"			BEGIN(PARAM); return T_INT;
+	"hex"			BEGIN(PARAM); return T_HEX;
+	"string"		BEGIN(PARAM); return T_STRING;
+	"select"		BEGIN(PARAM); return T_SELECT;
+	"enable"		BEGIN(PARAM); return T_SELECT;
+	"range"			BEGIN(PARAM); return T_RANGE;
+	{n}+	{
+		alloc_string(yytext, yyleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	.
+	\n	current_file->lineno++; BEGIN(INITIAL);
+}
+
+<PARAM>{
+	"&&"	return T_AND;
+	"||"	return T_OR;
+	"("	return T_OPEN_PAREN;
+	")"	return T_CLOSE_PAREN;
+	"!"	return T_NOT;
+	"="	return T_EQUAL;
+	"!="	return T_UNEQUAL;
+	"if"	return T_IF;
+	"on"	return T_ON;
+	\"|\'	{
+		str = yytext[0];
+		new_string();
+		BEGIN(STRING);
+	}
+	\n	BEGIN(INITIAL); current_file->lineno++; return T_EOL;
+	---	/* ignore */
+	({n}|[-/.])+	{
+		alloc_string(yytext, yyleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	#.*	/* comment */
+	\\\n	current_file->lineno++;
+	.
+	<<EOF>> {
+		BEGIN(INITIAL);
+	}
+}
+
+<STRING>{
+	[^'"\\\n]+/\n	{
+		append_string(yytext, yyleng);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	[^'"\\\n]+	{
+		append_string(yytext, yyleng);
+	}
+	\\.?/\n	{
+		append_string(yytext + 1, yyleng - 1);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	\\.?	{
+		append_string(yytext + 1, yyleng - 1);
+	}
+	\'|\"	{
+		if (str == yytext[0]) {
+			BEGIN(PARAM);
+			zconflval.string = text;
+			return T_WORD_QUOTE;
+		} else
+			append_string(yytext, 1);
+	}
+	\n	{
+		printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+		current_file->lineno++;
+		BEGIN(INITIAL);
+		return T_EOL;
+	}
+	<<EOF>>	{
+		BEGIN(INITIAL);
+	}
+}
+
+<HELP>{
+	[ \t]+	{
+		ts = 0;
+		for (i = 0; i < yyleng; i++) {
+			if (yytext[i] == '\t')
+				ts = (ts & ~7) + 8;
+			else
+				ts++;
+		}
+		last_ts = ts;
+		if (first_ts) {
+			if (ts < first_ts) {
+				zconf_endhelp();
+				return T_HELPTEXT;
+			}
+			ts -= first_ts;
+			while (ts > 8) {
+				append_string("        ", 8);
+				ts -= 8;
+			}
+			append_string("        ", ts);
+		}
+	}
+	[ \t]*\n/[^ \t\n] {
+		current_file->lineno++;
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	[ \t]*\n	{
+		current_file->lineno++;
+		append_string("\n", 1);
+	}
+	[^ \t\n].* {
+		append_string(yytext, yyleng);
+		if (!first_ts)
+			first_ts = last_ts;
+	}
+	<<EOF>>	{
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+}
+
+<<EOF>>	{
+	if (current_buf) {
+		zconf_endfile();
+		return T_EOF;
+	}
+	fclose(yyin);
+	yyterminate();
+}
+
+%%
+void zconf_starthelp(void)
+{
+	new_string();
+	last_ts = first_ts = 0;
+	BEGIN(HELP);
+}
+
+static void zconf_endhelp(void)
+{
+	zconflval.string = text;
+	BEGIN(INITIAL);
+}
+
+
+/*
+ * Try to open specified file with following names:
+ * ./name
+ * $(srctree)/name
+ * The latter is used when srctree is separate from objtree
+ * when compiling the kernel.
+ * Return NULL if file is not found.
+ */
+FILE *zconf_fopen(const char *name)
+{
+	char *env, fullname[PATH_MAX+1];
+	FILE *f;
+
+	f = fopen(name, "r");
+	if (!f && name[0] != '/') {
+		env = getenv(SRCTREE);
+		if (env) {
+			sprintf(fullname, "%s/%s", env, name);
+			f = fopen(fullname, "r");
+		}
+	}
+	return f;
+}
+
+void zconf_initscan(const char *name)
+{
+	yyin = zconf_fopen(name);
+	if (!yyin) {
+		printf("can't find file %s\n", name);
+		exit(1);
+	}
+
+	current_buf = malloc(sizeof(*current_buf));
+	memset(current_buf, 0, sizeof(*current_buf));
+
+	current_file = file_lookup(name);
+	current_file->lineno = 1;
+	current_file->flags = FILE_BUSY;
+}
+
+void zconf_nextfile(const char *name)
+{
+	struct file *file = file_lookup(name);
+	struct buffer *buf = malloc(sizeof(*buf));
+	memset(buf, 0, sizeof(*buf));
+
+	current_buf->state = YY_CURRENT_BUFFER;
+	yyin = zconf_fopen(name);
+	if (!yyin) {
+		printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
+		exit(1);
+	}
+	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
+	buf->parent = current_buf;
+	current_buf = buf;
+
+	if (file->flags & FILE_BUSY) {
+		printf("recursive scan (%s)?\n", name);
+		exit(1);
+	}
+	if (file->flags & FILE_SCANNED) {
+		printf("file %s already scanned?\n", name);
+		exit(1);
+	}
+	file->flags |= FILE_BUSY;
+	file->lineno = 1;
+	file->parent = current_file;
+	current_file = file;
+}
+
+static struct buffer *zconf_endfile(void)
+{
+	struct buffer *parent;
+
+	current_file->flags |= FILE_SCANNED;
+	current_file->flags &= ~FILE_BUSY;
+	current_file = current_file->parent;
+
+	parent = current_buf->parent;
+	if (parent) {
+		fclose(yyin);
+		yy_delete_buffer(YY_CURRENT_BUFFER);
+		yy_switch_to_buffer(parent->state);
+	}
+	free(current_buf);
+	current_buf = parent;
+
+	return parent;
+}
+
+int zconf_lineno(void)
+{
+	if (current_buf)
+		return current_file->lineno - 1;
+	else
+		return 0;
+}
+
+char *zconf_curname(void)
+{
+	if (current_buf)
+		return current_file->name;
+	else
+		return "<none>";
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
new file mode 100644
index 00000000..cc68dcb9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
@@ -0,0 +1,2130 @@
+/* A Bison parser, made by GNU Bison 1.875a.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that 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.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+/* If NAME_PREFIX is specified substitute the variables and functions
+   names.  */
+#define yyparse zconfparse
+#define yylex   zconflex
+#define yyerror zconferror
+#define yylval  zconflval
+#define yychar  zconfchar
+#define yydebug zconfdebug
+#define yynerrs zconfnerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_MAINMENU = 258,
+     T_MENU = 259,
+     T_ENDMENU = 260,
+     T_SOURCE = 261,
+     T_CHOICE = 262,
+     T_ENDCHOICE = 263,
+     T_COMMENT = 264,
+     T_CONFIG = 265,
+     T_MENUCONFIG = 266,
+     T_HELP = 267,
+     T_HELPTEXT = 268,
+     T_IF = 269,
+     T_ENDIF = 270,
+     T_DEPENDS = 271,
+     T_REQUIRES = 272,
+     T_OPTIONAL = 273,
+     T_PROMPT = 274,
+     T_DEFAULT = 275,
+     T_TRISTATE = 276,
+     T_DEF_TRISTATE = 277,
+     T_BOOLEAN = 278,
+     T_DEF_BOOLEAN = 279,
+     T_STRING = 280,
+     T_INT = 281,
+     T_HEX = 282,
+     T_WORD = 283,
+     T_WORD_QUOTE = 284,
+     T_UNEQUAL = 285,
+     T_EOF = 286,
+     T_EOL = 287,
+     T_CLOSE_PAREN = 288,
+     T_OPEN_PAREN = 289,
+     T_ON = 290,
+     T_SELECT = 291,
+     T_RANGE = 292,
+     T_OR = 293,
+     T_AND = 294,
+     T_EQUAL = 295,
+     T_NOT = 296
+   };
+#endif
+#define T_MAINMENU 258
+#define T_MENU 259
+#define T_ENDMENU 260
+#define T_SOURCE 261
+#define T_CHOICE 262
+#define T_ENDCHOICE 263
+#define T_COMMENT 264
+#define T_CONFIG 265
+#define T_MENUCONFIG 266
+#define T_HELP 267
+#define T_HELPTEXT 268
+#define T_IF 269
+#define T_ENDIF 270
+#define T_DEPENDS 271
+#define T_REQUIRES 272
+#define T_OPTIONAL 273
+#define T_PROMPT 274
+#define T_DEFAULT 275
+#define T_TRISTATE 276
+#define T_DEF_TRISTATE 277
+#define T_BOOLEAN 278
+#define T_DEF_BOOLEAN 279
+#define T_STRING 280
+#define T_INT 281
+#define T_HEX 282
+#define T_WORD 283
+#define T_WORD_QUOTE 284
+#define T_UNEQUAL 285
+#define T_EOF 286
+#define T_EOL 287
+#define T_CLOSE_PAREN 288
+#define T_OPEN_PAREN 289
+#define T_ON 290
+#define T_SELECT 291
+#define T_RANGE 292
+#define T_OR 293
+#define T_AND 294
+#define T_EQUAL 295
+#define T_NOT 296
+
+
+
+
+/* Copy the first part of user declarations.  */
+
+
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+
+#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
+
+#define PRINTD		0x0001
+#define DEBUG_PARSE	0x0002
+
+int cdebug = PRINTD;
+
+extern int zconflex(void);
+static void zconfprint(const char *err, ...);
+static void zconferror(const char *err);
+static bool zconf_endtoken(int token, int starttoken, int endtoken);
+
+struct symbol *symbol_hash[257];
+
+static struct menu *current_menu, *current_entry;
+
+#define YYERROR_VERBOSE
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+
+typedef union YYSTYPE {
+	int token;
+	char *string;
+	struct symbol *symbol;
+	struct expr *expr;
+	struct menu *menu;
+} YYSTYPE;
+/* Line 191 of yacc.c.  */
+
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+
+/* Line 214 of yacc.c.  */
+
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || (defined (_ALLOCA_H) && defined (__GNUC__))
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
+
+#endif
+
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  2
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   201
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  42
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  41
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  104
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  182
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   296
+
+#define YYTRANSLATE(YYX) 						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const unsigned short yyprhs[] =
+{
+       0,     0,     3,     4,     7,     9,    11,    13,    17,    19,
+      21,    23,    26,    28,    30,    32,    34,    36,    38,    42,
+      45,    49,    52,    53,    56,    59,    62,    65,    69,    74,
+      78,    83,    87,    91,    95,   100,   105,   110,   116,   119,
+     122,   124,   128,   131,   132,   135,   138,   141,   144,   149,
+     153,   157,   160,   165,   166,   169,   173,   175,   179,   182,
+     183,   186,   189,   192,   196,   199,   201,   205,   208,   209,
+     212,   215,   218,   222,   226,   228,   232,   235,   238,   241,
+     242,   245,   248,   253,   257,   261,   262,   265,   267,   269,
+     272,   275,   278,   280,   282,   283,   286,   288,   292,   296,
+     300,   303,   307,   311,   313
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
+{
+      43,     0,    -1,    -1,    43,    44,    -1,    45,    -1,    55,
+      -1,    66,    -1,     3,    77,    79,    -1,     5,    -1,    15,
+      -1,     8,    -1,     1,    79,    -1,    61,    -1,    71,    -1,
+      47,    -1,    49,    -1,    69,    -1,    79,    -1,    10,    28,
+      32,    -1,    46,    50,    -1,    11,    28,    32,    -1,    48,
+      50,    -1,    -1,    50,    51,    -1,    50,    75,    -1,    50,
+      73,    -1,    50,    32,    -1,    21,    76,    32,    -1,    22,
+      81,    80,    32,    -1,    23,    76,    32,    -1,    24,    81,
+      80,    32,    -1,    26,    76,    32,    -1,    27,    76,    32,
+      -1,    25,    76,    32,    -1,    19,    77,    80,    32,    -1,
+      20,    81,    80,    32,    -1,    36,    28,    80,    32,    -1,
+      37,    82,    82,    80,    32,    -1,     7,    32,    -1,    52,
+      56,    -1,    78,    -1,    53,    58,    54,    -1,    53,    58,
+      -1,    -1,    56,    57,    -1,    56,    75,    -1,    56,    73,
+      -1,    56,    32,    -1,    19,    77,    80,    32,    -1,    21,
+      76,    32,    -1,    23,    76,    32,    -1,    18,    32,    -1,
+      20,    28,    80,    32,    -1,    -1,    58,    45,    -1,    14,
+      81,    32,    -1,    78,    -1,    59,    62,    60,    -1,    59,
+      62,    -1,    -1,    62,    45,    -1,    62,    66,    -1,    62,
+      55,    -1,     4,    77,    32,    -1,    63,    74,    -1,    78,
+      -1,    64,    67,    65,    -1,    64,    67,    -1,    -1,    67,
+      45,    -1,    67,    66,    -1,    67,    55,    -1,    67,     1,
+      32,    -1,     6,    77,    32,    -1,    68,    -1,     9,    77,
+      32,    -1,    70,    74,    -1,    12,    32,    -1,    72,    13,
+      -1,    -1,    74,    75,    -1,    74,    32,    -1,    16,    35,
+      81,    32,    -1,    16,    81,    32,    -1,    17,    81,    32,
+      -1,    -1,    77,    80,    -1,    28,    -1,    29,    -1,     5,
+      79,    -1,     8,    79,    -1,    15,    79,    -1,    32,    -1,
+      31,    -1,    -1,    14,    81,    -1,    82,    -1,    82,    40,
+      82,    -1,    82,    30,    82,    -1,    34,    81,    33,    -1,
+      41,    81,    -1,    81,    38,    81,    -1,    81,    39,    81,
+      -1,    28,    -1,    29,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short yyrline[] =
+{
+       0,    94,    94,    95,    98,    99,   100,   101,   102,   103,
+     104,   105,   109,   110,   111,   112,   113,   114,   120,   128,
+     134,   142,   152,   154,   155,   156,   157,   160,   166,   173,
+     179,   186,   192,   198,   204,   210,   216,   222,   230,   239,
+     245,   254,   255,   261,   263,   264,   265,   266,   269,   275,
+     281,   287,   293,   299,   301,   306,   315,   324,   325,   331,
+     333,   334,   335,   340,   347,   353,   362,   363,   369,   371,
+     372,   373,   374,   377,   383,   390,   397,   404,   410,   417,
+     418,   419,   422,   427,   432,   440,   442,   447,   448,   451,
+     452,   453,   457,   457,   459,   460,   463,   464,   465,   466,
+     467,   468,   469,   472,   473
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU",
+  "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG",
+  "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS",
+  "T_REQUIRES", "T_OPTIONAL", "T_PROMPT", "T_DEFAULT", "T_TRISTATE",
+  "T_DEF_TRISTATE", "T_BOOLEAN", "T_DEF_BOOLEAN", "T_STRING", "T_INT",
+  "T_HEX", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", "T_EOF", "T_EOL",
+  "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_ON", "T_SELECT", "T_RANGE", "T_OR",
+  "T_AND", "T_EQUAL", "T_NOT", "$accept", "input", "block",
+  "common_block", "config_entry_start", "config_stmt",
+  "menuconfig_entry_start", "menuconfig_stmt", "config_option_list",
+  "config_option", "choice", "choice_entry", "choice_end", "choice_stmt",
+  "choice_option_list", "choice_option", "choice_block", "if", "if_end",
+  "if_stmt", "if_block", "menu", "menu_entry", "menu_end", "menu_stmt",
+  "menu_block", "source", "source_stmt", "comment", "comment_stmt",
+  "help_start", "help", "depends_list", "depends", "prompt_stmt_opt",
+  "prompt", "end", "nl_or_eof", "if_expr", "expr", "symbol", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,    42,    43,    43,    44,    44,    44,    44,    44,    44,
+      44,    44,    45,    45,    45,    45,    45,    45,    46,    47,
+      48,    49,    50,    50,    50,    50,    50,    51,    51,    51,
+      51,    51,    51,    51,    51,    51,    51,    51,    52,    53,
+      54,    55,    55,    56,    56,    56,    56,    56,    57,    57,
+      57,    57,    57,    58,    58,    59,    60,    61,    61,    62,
+      62,    62,    62,    63,    64,    65,    66,    66,    67,    67,
+      67,    67,    67,    68,    69,    70,    71,    72,    73,    74,
+      74,    74,    75,    75,    75,    76,    76,    77,    77,    78,
+      78,    78,    79,    79,    80,    80,    81,    81,    81,    81,
+      81,    81,    81,    82,    82
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
+{
+       0,     2,     0,     2,     1,     1,     1,     3,     1,     1,
+       1,     2,     1,     1,     1,     1,     1,     1,     3,     2,
+       3,     2,     0,     2,     2,     2,     2,     3,     4,     3,
+       4,     3,     3,     3,     4,     4,     4,     5,     2,     2,
+       1,     3,     2,     0,     2,     2,     2,     2,     4,     3,
+       3,     2,     4,     0,     2,     3,     1,     3,     2,     0,
+       2,     2,     2,     3,     2,     1,     3,     2,     0,     2,
+       2,     2,     3,     3,     1,     3,     2,     2,     2,     0,
+       2,     2,     4,     3,     3,     0,     2,     1,     1,     2,
+       2,     2,     1,     1,     0,     2,     1,     3,     3,     3,
+       2,     3,     3,     1,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const unsigned char yydefact[] =
+{
+       2,     0,     1,     0,     0,     0,     8,     0,     0,    10,
+       0,     0,     0,     0,     9,    93,    92,     3,     4,    22,
+      14,    22,    15,    43,    53,     5,    59,    12,    79,    68,
+       6,    74,    16,    79,    13,    17,    11,    87,    88,     0,
+       0,     0,    38,     0,     0,     0,   103,   104,     0,     0,
+       0,    96,    19,    21,    39,    42,    58,    64,     0,    76,
+       7,    63,    73,    75,    18,    20,     0,   100,    55,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    85,     0,
+      85,     0,    85,    85,    85,    26,     0,     0,    23,     0,
+      25,    24,     0,     0,     0,    85,    85,    47,    44,    46,
+      45,     0,     0,     0,    54,    41,    40,    60,    62,    57,
+      61,    56,    81,    80,     0,    69,    71,    66,    70,    65,
+      99,   101,   102,    98,    97,    77,     0,     0,     0,    94,
+      94,     0,    94,    94,     0,    94,     0,     0,     0,    94,
+       0,    78,    51,    94,    94,     0,     0,    89,    90,    91,
+      72,     0,    83,    84,     0,     0,     0,    27,    86,     0,
+      29,     0,    33,    31,    32,     0,    94,     0,     0,    49,
+      50,    82,    95,    34,    35,    28,    30,    36,     0,    48,
+      52,    37
+};
+
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short yydefgoto[] =
+{
+      -1,     1,    17,    18,    19,    20,    21,    22,    52,    88,
+      23,    24,   105,    25,    54,    98,    55,    26,   109,    27,
+      56,    28,    29,   117,    30,    58,    31,    32,    33,    34,
+      89,    90,    57,    91,   131,   132,   106,    35,   155,    50,
+      51
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -99
+static const short yypact[] =
+{
+     -99,    48,   -99,    38,    46,    46,   -99,    46,   -29,   -99,
+      46,   -17,    -3,   -11,   -99,   -99,   -99,   -99,   -99,   -99,
+     -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,
+     -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,    38,
+      12,    15,   -99,    18,    51,    62,   -99,   -99,   -11,   -11,
+       4,   -24,   138,   138,   160,   121,   110,    -4,    81,    -4,
+     -99,   -99,   -99,   -99,   -99,   -99,   -19,   -99,   -99,   -11,
+     -11,    70,    70,    73,    32,   -11,    46,   -11,    46,   -11,
+      46,   -11,    46,    46,    46,   -99,    36,    70,   -99,    95,
+     -99,   -99,    96,    46,   106,    46,    46,   -99,   -99,   -99,
+     -99,    38,    38,    38,   -99,   -99,   -99,   -99,   -99,   -99,
+     -99,   -99,   -99,   -99,   112,   -99,   -99,   -99,   -99,   -99,
+     -99,   117,   -99,   -99,   -99,   -99,   -11,    33,    65,   131,
+       1,   119,   131,     1,   136,     1,   153,   154,   155,   131,
+      70,   -99,   -99,   131,   131,   156,   157,   -99,   -99,   -99,
+     -99,   101,   -99,   -99,   -11,   158,   159,   -99,   -99,   161,
+     -99,   162,   -99,   -99,   -99,   163,   131,   164,   165,   -99,
+     -99,   -99,    99,   -99,   -99,   -99,   -99,   -99,   166,   -99,
+     -99,   -99
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const short yypgoto[] =
+{
+     -99,   -99,   -99,   111,   -99,   -99,   -99,   -99,   178,   -99,
+     -99,   -99,   -99,    91,   -99,   -99,   -99,   -99,   -99,   -99,
+     -99,   -99,   -99,   -99,   115,   -99,   -99,   -99,   -99,   -99,
+     -99,   146,   168,    89,    27,     0,   126,    -1,   -98,   -48,
+     -63
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -68
+static const short yytable[] =
+{
+      66,    67,    36,    42,    39,    40,    71,    41,   123,   124,
+      43,    44,    74,    75,   120,   154,    72,    46,    47,    69,
+      70,   121,   122,    48,   140,    45,   127,   128,   112,   130,
+      49,   133,   156,   135,   158,   159,    68,   161,    60,    69,
+      70,   165,    69,    70,    61,   167,   168,    62,     2,     3,
+      63,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      46,    47,    13,    14,   139,   152,    48,   126,   178,    15,
+      16,    69,    70,    49,    37,    38,   129,   166,   151,    15,
+      16,   -67,   114,    64,   -67,     5,   101,     7,     8,   102,
+      10,    11,    12,   143,    65,    13,   103,   153,    46,    47,
+     147,   148,   149,    69,    70,   125,   172,   134,   141,   136,
+     137,   138,    15,    16,     5,   101,     7,     8,   102,    10,
+      11,    12,   145,   146,    13,   103,   101,     7,   142,   102,
+      10,    11,    12,   171,   144,    13,   103,    69,    70,    69,
+      70,    15,    16,   100,   150,   154,   113,   108,   113,   116,
+      73,   157,    15,    16,    74,    75,    70,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,   104,   107,   160,   115,
+      85,   110,    73,   118,    86,    87,    74,    75,    92,    93,
+      94,    95,   111,    96,   119,   162,   163,   164,   169,   170,
+     173,   174,    97,   175,   176,   177,   179,   180,   181,    53,
+      99,    59
+};
+
+static const unsigned char yycheck[] =
+{
+      48,    49,     3,    32,     4,     5,    30,     7,    71,    72,
+      10,    28,    16,    17,    33,    14,    40,    28,    29,    38,
+      39,    69,    70,    34,    87,    28,    74,    75,    32,    77,
+      41,    79,   130,    81,   132,   133,    32,   135,    39,    38,
+      39,   139,    38,    39,    32,   143,   144,    32,     0,     1,
+      32,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      28,    29,    14,    15,    28,    32,    34,    35,   166,    31,
+      32,    38,    39,    41,    28,    29,    76,   140,   126,    31,
+      32,     0,     1,    32,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    93,    32,    14,    15,    32,    28,    29,
+     101,   102,   103,    38,    39,    32,   154,    80,    13,    82,
+      83,    84,    31,    32,     4,     5,     6,     7,     8,     9,
+      10,    11,    95,    96,    14,    15,     5,     6,    32,     8,
+       9,    10,    11,    32,    28,    14,    15,    38,    39,    38,
+      39,    31,    32,    54,    32,    14,    57,    56,    59,    58,
+      12,    32,    31,    32,    16,    17,    39,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    55,    56,    32,    58,
+      32,    56,    12,    58,    36,    37,    16,    17,    18,    19,
+      20,    21,    56,    23,    58,    32,    32,    32,    32,    32,
+      32,    32,    32,    32,    32,    32,    32,    32,    32,    21,
+      54,    33
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const unsigned char yystos[] =
+{
+       0,    43,     0,     1,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    14,    15,    31,    32,    44,    45,    46,
+      47,    48,    49,    52,    53,    55,    59,    61,    63,    64,
+      66,    68,    69,    70,    71,    79,    79,    28,    29,    77,
+      77,    77,    32,    77,    28,    28,    28,    29,    34,    41,
+      81,    82,    50,    50,    56,    58,    62,    74,    67,    74,
+      79,    32,    32,    32,    32,    32,    81,    81,    32,    38,
+      39,    30,    40,    12,    16,    17,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    32,    36,    37,    51,    72,
+      73,    75,    18,    19,    20,    21,    23,    32,    57,    73,
+      75,     5,     8,    15,    45,    54,    78,    45,    55,    60,
+      66,    78,    32,    75,     1,    45,    55,    65,    66,    78,
+      33,    81,    81,    82,    82,    32,    35,    81,    81,    77,
+      81,    76,    77,    81,    76,    81,    76,    76,    76,    28,
+      82,    13,    32,    77,    28,    76,    76,    79,    79,    79,
+      32,    81,    32,    32,    14,    80,    80,    32,    80,    80,
+      32,    80,    32,    32,    32,    80,    82,    80,    80,    32,
+      32,    32,    81,    32,    32,    32,    32,    32,    80,    32,
+      32,    32
+};
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrlab1
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK;						\
+      goto yybackup;						\
+    }								\
+  else								\
+    { 								\
+      yyerror ("syntax error: cannot back up");\
+      YYERROR;							\
+    }								\
+while (0)
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).  */
+
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)         \
+  Current.first_line   = Rhs[1].first_line;      \
+  Current.first_column = Rhs[1].first_column;    \
+  Current.last_line    = Rhs[N].last_line;       \
+  Current.last_column  = Rhs[N].last_column;
+#endif
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (0)
+
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+do {								\
+  if (yydebug)							\
+    {								\
+      YYFPRINTF (stderr, "%s ", Title);				\
+      yysymprint (stderr, 					\
+                  Token, Value);	\
+      YYFPRINTF (stderr, "\n");					\
+    }								\
+} while (0)
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (cinluded).                                                   |
+`------------------------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short *bottom, short *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short *bottom;
+    short *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+    int yyrule;
+#endif
+{
+  int yyi;
+  unsigned int yylineno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylineno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (Rule);		\
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#if YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
+{
+  register const char *yys = yystr;
+
+  while (*yys++ != '\0')
+    continue;
+
+  return yys - yystr - 1;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
+{
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+#endif /* !YYERROR_VERBOSE */
+
+
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
+}
+
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yytype, yyvaluep)
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM);
+# else
+int yyparse ();
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+
+  register int yystate;
+  register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK   (yyvsp--, yyssp--)
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule.  */
+  int yylen;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack. Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	short *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyoverflowlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyoverflowlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	short *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyoverflowlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+/* Do appropriate processing given the current state.  */
+/* Read a lookahead token if we need one and don't already have one.  */
+/* yyresume: */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Shift the lookahead token.  */
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+
+  /* Discard the token being shifted unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  *++yyvsp = yylval;
+
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 8:
+
+    { zconfprint("unexpected 'endmenu' statement"); ;}
+    break;
+
+  case 9:
+
+    { zconfprint("unexpected 'endif' statement"); ;}
+    break;
+
+  case 10:
+
+    { zconfprint("unexpected 'endchoice' statement"); ;}
+    break;
+
+  case 11:
+
+    { zconfprint("syntax error"); yyerrok; ;}
+    break;
+
+  case 18:
+
+    {
+	struct symbol *sym = sym_lookup(yyvsp[-1].string, 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), yyvsp[-1].string);
+;}
+    break;
+
+  case 19:
+
+    {
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 20:
+
+    {
+	struct symbol *sym = sym_lookup(yyvsp[-1].string, 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), yyvsp[-1].string);
+;}
+    break;
+
+  case 21:
+
+    {
+	if (current_entry->prompt)
+		current_entry->prompt->type = P_MENU;
+	else
+		zconfprint("warning: menuconfig statement without prompt");
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 27:
+
+    {
+	menu_set_type(S_TRISTATE);
+	printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 28:
+
+    {
+	menu_add_expr(P_DEFAULT, yyvsp[-2].expr, yyvsp[-1].expr);
+	menu_set_type(S_TRISTATE);
+	printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 29:
+
+    {
+	menu_set_type(S_BOOLEAN);
+	printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 30:
+
+    {
+	menu_add_expr(P_DEFAULT, yyvsp[-2].expr, yyvsp[-1].expr);
+	menu_set_type(S_BOOLEAN);
+	printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 31:
+
+    {
+	menu_set_type(S_INT);
+	printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 32:
+
+    {
+	menu_set_type(S_HEX);
+	printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 33:
+
+    {
+	menu_set_type(S_STRING);
+	printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 34:
+
+    {
+	menu_add_prompt(P_PROMPT, yyvsp[-2].string, yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 35:
+
+    {
+	menu_add_expr(P_DEFAULT, yyvsp[-2].expr, yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 36:
+
+    {
+	menu_add_symbol(P_SELECT, sym_lookup(yyvsp[-2].string, 0), yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 37:
+
+    {
+	menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,yyvsp[-3].symbol, yyvsp[-2].symbol), yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 38:
+
+    {
+	struct symbol *sym = sym_lookup(NULL, 0);
+	sym->flags |= SYMBOL_CHOICE;
+	menu_add_entry(sym);
+	menu_add_expr(P_CHOICE, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 39:
+
+    {
+	menu_end_entry();
+	menu_add_menu();
+;}
+    break;
+
+  case 40:
+
+    {
+	if (zconf_endtoken(yyvsp[0].token, T_CHOICE, T_ENDCHOICE)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 42:
+
+    {
+	printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno);
+	zconfnerrs++;
+;}
+    break;
+
+  case 48:
+
+    {
+	menu_add_prompt(P_PROMPT, yyvsp[-2].string, yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 49:
+
+    {
+	menu_set_type(S_TRISTATE);
+	printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 50:
+
+    {
+	menu_set_type(S_BOOLEAN);
+	printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 51:
+
+    {
+	current_entry->sym->flags |= SYMBOL_OPTIONAL;
+	printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 52:
+
+    {
+	menu_add_symbol(P_DEFAULT, sym_lookup(yyvsp[-2].string, 0), yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 55:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
+	menu_add_entry(NULL);
+	menu_add_dep(yyvsp[-1].expr);
+	menu_end_entry();
+	menu_add_menu();
+;}
+    break;
+
+  case 56:
+
+    {
+	if (zconf_endtoken(yyvsp[0].token, T_IF, T_ENDIF)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 58:
+
+    {
+	printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno);
+	zconfnerrs++;
+;}
+    break;
+
+  case 63:
+
+    {
+	menu_add_entry(NULL);
+	menu_add_prop(P_MENU, yyvsp[-1].string, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 64:
+
+    {
+	menu_end_entry();
+	menu_add_menu();
+;}
+    break;
+
+  case 65:
+
+    {
+	if (zconf_endtoken(yyvsp[0].token, T_MENU, T_ENDMENU)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 67:
+
+    {
+	printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno);
+	zconfnerrs++;
+;}
+    break;
+
+  case 72:
+
+    { zconfprint("invalid menu option"); yyerrok; ;}
+    break;
+
+  case 73:
+
+    {
+	yyval.string = yyvsp[-1].string;
+	printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), yyvsp[-1].string);
+;}
+    break;
+
+  case 74:
+
+    {
+	zconf_nextfile(yyvsp[0].string);
+;}
+    break;
+
+  case 75:
+
+    {
+	menu_add_entry(NULL);
+	menu_add_prop(P_COMMENT, yyvsp[-1].string, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 76:
+
+    {
+	menu_end_entry();
+;}
+    break;
+
+  case 77:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
+	zconf_starthelp();
+;}
+    break;
+
+  case 78:
+
+    {
+	current_entry->sym->help = yyvsp[0].string;
+;}
+    break;
+
+  case 82:
+
+    {
+	menu_add_dep(yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 83:
+
+    {
+	menu_add_dep(yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 84:
+
+    {
+	menu_add_dep(yyvsp[-1].expr);
+	printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 86:
+
+    {
+	menu_add_prop(P_PROMPT, yyvsp[-1].string, NULL, yyvsp[0].expr);
+;}
+    break;
+
+  case 89:
+
+    { yyval.token = T_ENDMENU; ;}
+    break;
+
+  case 90:
+
+    { yyval.token = T_ENDCHOICE; ;}
+    break;
+
+  case 91:
+
+    { yyval.token = T_ENDIF; ;}
+    break;
+
+  case 94:
+
+    { yyval.expr = NULL; ;}
+    break;
+
+  case 95:
+
+    { yyval.expr = yyvsp[0].expr; ;}
+    break;
+
+  case 96:
+
+    { yyval.expr = expr_alloc_symbol(yyvsp[0].symbol); ;}
+    break;
+
+  case 97:
+
+    { yyval.expr = expr_alloc_comp(E_EQUAL, yyvsp[-2].symbol, yyvsp[0].symbol); ;}
+    break;
+
+  case 98:
+
+    { yyval.expr = expr_alloc_comp(E_UNEQUAL, yyvsp[-2].symbol, yyvsp[0].symbol); ;}
+    break;
+
+  case 99:
+
+    { yyval.expr = yyvsp[-1].expr; ;}
+    break;
+
+  case 100:
+
+    { yyval.expr = expr_alloc_one(E_NOT, yyvsp[0].expr); ;}
+    break;
+
+  case 101:
+
+    { yyval.expr = expr_alloc_two(E_OR, yyvsp[-2].expr, yyvsp[0].expr); ;}
+    break;
+
+  case 102:
+
+    { yyval.expr = expr_alloc_two(E_AND, yyvsp[-2].expr, yyvsp[0].expr); ;}
+    break;
+
+  case 103:
+
+    { yyval.symbol = sym_lookup(yyvsp[0].string, 0); free(yyvsp[0].string); ;}
+    break;
+
+  case 104:
+
+    { yyval.symbol = sym_lookup(yyvsp[0].string, 1); free(yyvsp[0].string); ;}
+    break;
+
+
+    }
+
+/* Line 999 of yacc.c.  */
+
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+
+
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
+	{
+	  YYSIZE_T yysize = 0;
+	  int yytype = YYTRANSLATE (yychar);
+	  char *yymsg;
+	  int yyx, yycount;
+
+	  yycount = 0;
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
+	    {
+	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[yytype]);
+
+	      if (yycount < 5)
+		{
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
+		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+		      {
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
+			yyp = yystpcpy (yyp, yytname[yyx]);
+			yycount++;
+		      }
+		}
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
+	    }
+	  else
+	    yyerror ("syntax error; also virtual memory exhausted");
+	}
+      else
+#endif /* YYERROR_VERBOSE */
+	yyerror ("syntax error");
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
+
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
+        {
+	  /* Pop the error token.  */
+          YYPOPSTACK;
+	  /* Pop the rest of the stack.  */
+	  while (yyss < yyssp)
+	    {
+	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+	      yydestruct (yystos[*yyssp], yyvsp);
+	      YYPOPSTACK;
+	    }
+	  YYABORT;
+        }
+
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
+      yychar = YYEMPTY;
+
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp);
+      yyvsp--;
+      yystate = *--yyssp;
+
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  YYDPRINTF ((stderr, "Shifting error token, "));
+
+  *++yyvsp = yylval;
+
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+  return yyresult;
+}
+
+
+
+
+
+void conf_parse(const char *name)
+{
+	struct symbol *sym;
+	int i;
+
+	zconf_initscan(name);
+
+	sym_init();
+	menu_init();
+	modules_sym = sym_lookup("MODULES", 0);
+	rootmenu.prompt = menu_add_prop(P_MENU, "axTLS Configuration", NULL, NULL);
+
+	//zconfdebug = 1;
+	zconfparse();
+	if (zconfnerrs)
+		exit(1);
+	menu_finalize(&rootmenu);
+	for_all_symbols(i, sym) {
+                if (!(sym->flags & SYMBOL_CHECKED) && sym_check_deps(sym))
+                        printf("\n");
+		else
+			sym->flags |= SYMBOL_CHECK_DONE;
+        }
+
+	sym_change_count = 1;
+}
+
+const char *zconf_tokenname(int token)
+{
+	switch (token) {
+	case T_MENU:		return "menu";
+	case T_ENDMENU:		return "endmenu";
+	case T_CHOICE:		return "choice";
+	case T_ENDCHOICE:	return "endchoice";
+	case T_IF:		return "if";
+	case T_ENDIF:		return "endif";
+	}
+	return "<token>";
+}
+
+static bool zconf_endtoken(int token, int starttoken, int endtoken)
+{
+	if (token != endtoken) {
+		zconfprint("unexpected '%s' within %s block", zconf_tokenname(token), zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	if (current_menu->file != current_file) {
+		zconfprint("'%s' in different file than '%s'", zconf_tokenname(token), zconf_tokenname(starttoken));
+		zconfprint("location of the '%s'", zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	return true;
+}
+
+static void zconfprint(const char *err, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno() + 1);
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconferror(const char *err)
+{
+	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+}
+
+void print_quoted_string(FILE *out, const char *str)
+{
+	const char *p;
+	int len;
+
+	putc('"', out);
+	while ((p = strchr(str, '"'))) {
+		len = p - str;
+		if (len)
+			fprintf(out, "%.*s", len, str);
+		fputs("\\\"", out);
+		str = p + 1;
+	}
+	fputs(str, out);
+	putc('"', out);
+}
+
+void print_symbol(FILE *out, struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	struct property *prop;
+
+	if (sym_is_choice(sym))
+		fprintf(out, "choice\n");
+	else
+		fprintf(out, "config %s\n", sym->name);
+	switch (sym->type) {
+	case S_BOOLEAN:
+		fputs("  boolean\n", out);
+		break;
+	case S_TRISTATE:
+		fputs("  tristate\n", out);
+		break;
+	case S_STRING:
+		fputs("  string\n", out);
+		break;
+	case S_INT:
+		fputs("  integer\n", out);
+		break;
+	case S_HEX:
+		fputs("  hex\n", out);
+		break;
+	default:
+		fputs("  ???\n", out);
+		break;
+	}
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu != menu)
+			continue;
+		switch (prop->type) {
+		case P_PROMPT:
+			fputs("  prompt ", out);
+			print_quoted_string(out, prop->text);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_DEFAULT:
+			fputs( "  default ", out);
+			expr_fprint(prop->expr, out);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_CHOICE:
+			fputs("  #choice value\n", out);
+			break;
+		default:
+			fprintf(out, "  unknown prop %d!\n", prop->type);
+			break;
+		}
+	}
+	if (sym->help) {
+		int len = strlen(sym->help);
+		while (sym->help[--len] == '\n')
+			sym->help[len] = 0;
+		fprintf(out, "  help\n%s\n", sym->help);
+	}
+	fputc('\n', out);
+}
+
+void zconfdump(FILE *out)
+{
+	struct property *prop;
+	struct symbol *sym;
+	struct menu *menu;
+
+	menu = rootmenu.list;
+	while (menu) {
+		if ((sym = menu->sym))
+			print_symbol(out, menu);
+		else if ((prop = menu->prompt)) {
+			switch (prop->type) {
+			case P_COMMENT:
+				fputs("\ncomment ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			case P_MENU:
+				fputs("\nmenu ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			default:
+				;
+			}
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs("  depends ", out);
+				expr_fprint(prop->visible.expr, out);
+				fputc('\n', out);
+			}
+			fputs("\n", out);
+		}
+
+		if (menu->list)
+			menu = menu->list;
+		else if (menu->next)
+			menu = menu->next;
+		else while ((menu = menu->parent)) {
+			if (menu->prompt && menu->prompt->type == P_MENU)
+				fputs("\nendmenu\n", out);
+			if (menu->next) {
+				menu = menu->next;
+				break;
+			}
+		}
+	}
+}
+
+#include "lex.zconf.c"
+#include "util.c"
+#include "confdata.c"
+#include "expr.c"
+#include "symbol.c"
+#include "menu.c"
+
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
new file mode 100644
index 00000000..3b191ef5
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
@@ -0,0 +1,125 @@
+/* A Bison parser, made from zconf.y, by GNU bison 1.75.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that 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.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+#ifndef BISON_ZCONF_TAB_H
+# define BISON_ZCONF_TAB_H
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_MAINMENU = 258,
+     T_MENU = 259,
+     T_ENDMENU = 260,
+     T_SOURCE = 261,
+     T_CHOICE = 262,
+     T_ENDCHOICE = 263,
+     T_COMMENT = 264,
+     T_CONFIG = 265,
+     T_HELP = 266,
+     T_HELPTEXT = 267,
+     T_IF = 268,
+     T_ENDIF = 269,
+     T_DEPENDS = 270,
+     T_REQUIRES = 271,
+     T_OPTIONAL = 272,
+     T_PROMPT = 273,
+     T_DEFAULT = 274,
+     T_TRISTATE = 275,
+     T_BOOLEAN = 276,
+     T_INT = 277,
+     T_HEX = 278,
+     T_WORD = 279,
+     T_STRING = 280,
+     T_UNEQUAL = 281,
+     T_EOF = 282,
+     T_EOL = 283,
+     T_CLOSE_PAREN = 284,
+     T_OPEN_PAREN = 285,
+     T_ON = 286,
+     T_OR = 287,
+     T_AND = 288,
+     T_EQUAL = 289,
+     T_NOT = 290
+   };
+#endif
+#define T_MAINMENU 258
+#define T_MENU 259
+#define T_ENDMENU 260
+#define T_SOURCE 261
+#define T_CHOICE 262
+#define T_ENDCHOICE 263
+#define T_COMMENT 264
+#define T_CONFIG 265
+#define T_HELP 266
+#define T_HELPTEXT 267
+#define T_IF 268
+#define T_ENDIF 269
+#define T_DEPENDS 270
+#define T_REQUIRES 271
+#define T_OPTIONAL 272
+#define T_PROMPT 273
+#define T_DEFAULT 274
+#define T_TRISTATE 275
+#define T_BOOLEAN 276
+#define T_INT 277
+#define T_HEX 278
+#define T_WORD 279
+#define T_STRING 280
+#define T_UNEQUAL 281
+#define T_EOF 282
+#define T_EOL 283
+#define T_CLOSE_PAREN 284
+#define T_OPEN_PAREN 285
+#define T_ON 286
+#define T_OR 287
+#define T_AND 288
+#define T_EQUAL 289
+#define T_NOT 290
+
+
+
+
+#ifndef YYSTYPE
+#line 33 "zconf.y"
+typedef union {
+	int token;
+	char *string;
+	struct symbol *symbol;
+	struct expr *expr;
+	struct menu *menu;
+} yystype;
+/* Line 1281 of /usr/share/bison/yacc.c.  */
+#line 118 "zconf.tab.h"
+# define YYSTYPE yystype
+#endif
+
+extern YYSTYPE zconflval;
+
+
+#endif /* not BISON_ZCONF_TAB_H */
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.y b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.y
new file mode 100644
index 00000000..cf45da0b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/scripts/config/zconf.y
@@ -0,0 +1,690 @@
+%{
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+
+#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
+
+#define PRINTD		0x0001
+#define DEBUG_PARSE	0x0002
+
+int cdebug = PRINTD;
+
+extern int zconflex(void);
+static void zconfprint(const char *err, ...);
+static void zconferror(const char *err);
+static bool zconf_endtoken(int token, int starttoken, int endtoken);
+
+struct symbol *symbol_hash[257];
+
+static struct menu *current_menu, *current_entry;
+
+#define YYERROR_VERBOSE
+%}
+%expect 40
+
+%union
+{
+	int token;
+	char *string;
+	struct symbol *symbol;
+	struct expr *expr;
+	struct menu *menu;
+}
+
+%token T_MAINMENU
+%token T_MENU
+%token T_ENDMENU
+%token T_SOURCE
+%token T_CHOICE
+%token T_ENDCHOICE
+%token T_COMMENT
+%token T_CONFIG
+%token T_MENUCONFIG
+%token T_HELP
+%token <string> T_HELPTEXT
+%token T_IF
+%token T_ENDIF
+%token T_DEPENDS
+%token T_REQUIRES
+%token T_OPTIONAL
+%token T_PROMPT
+%token T_DEFAULT
+%token T_TRISTATE
+%token T_DEF_TRISTATE
+%token T_BOOLEAN
+%token T_DEF_BOOLEAN
+%token T_STRING
+%token T_INT
+%token T_HEX
+%token <string> T_WORD
+%token <string> T_WORD_QUOTE
+%token T_UNEQUAL
+%token T_EOF
+%token T_EOL
+%token T_CLOSE_PAREN
+%token T_OPEN_PAREN
+%token T_ON
+%token T_SELECT
+%token T_RANGE
+
+%left T_OR
+%left T_AND
+%left T_EQUAL T_UNEQUAL
+%nonassoc T_NOT
+
+%type <string> prompt
+%type <string> source
+%type <symbol> symbol
+%type <expr> expr
+%type <expr> if_expr
+%type <token> end
+
+%{
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+%}
+%%
+input:	  /* empty */
+	| input block
+;
+
+block:	  common_block
+	| choice_stmt
+	| menu_stmt
+	| T_MAINMENU prompt nl_or_eof
+	| T_ENDMENU		{ zconfprint("unexpected 'endmenu' statement"); }
+	| T_ENDIF		{ zconfprint("unexpected 'endif' statement"); }
+	| T_ENDCHOICE		{ zconfprint("unexpected 'endchoice' statement"); }
+	| error nl_or_eof	{ zconfprint("syntax error"); yyerrok; }
+;
+
+common_block:
+	  if_stmt
+	| comment_stmt
+	| config_stmt
+	| menuconfig_stmt
+	| source_stmt
+	| nl_or_eof
+;
+
+
+/* config/menuconfig entry */
+
+config_entry_start: T_CONFIG T_WORD T_EOL
+{
+	struct symbol *sym = sym_lookup($2, 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2);
+};
+
+config_stmt: config_entry_start config_option_list
+{
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+};
+
+menuconfig_entry_start: T_MENUCONFIG T_WORD T_EOL
+{
+	struct symbol *sym = sym_lookup($2, 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), $2);
+};
+
+menuconfig_stmt: menuconfig_entry_start config_option_list
+{
+	if (current_entry->prompt)
+		current_entry->prompt->type = P_MENU;
+	else
+		zconfprint("warning: menuconfig statement without prompt");
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+};
+
+config_option_list:
+	  /* empty */
+	| config_option_list config_option
+	| config_option_list depends
+	| config_option_list help
+	| config_option_list T_EOL
+;
+
+config_option: T_TRISTATE prompt_stmt_opt T_EOL
+{
+	menu_set_type(S_TRISTATE);
+	printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_DEF_TRISTATE expr if_expr T_EOL
+{
+	menu_add_expr(P_DEFAULT, $2, $3);
+	menu_set_type(S_TRISTATE);
+	printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_BOOLEAN prompt_stmt_opt T_EOL
+{
+	menu_set_type(S_BOOLEAN);
+	printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_DEF_BOOLEAN expr if_expr T_EOL
+{
+	menu_add_expr(P_DEFAULT, $2, $3);
+	menu_set_type(S_BOOLEAN);
+	printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_INT prompt_stmt_opt T_EOL
+{
+	menu_set_type(S_INT);
+	printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_HEX prompt_stmt_opt T_EOL
+{
+	menu_set_type(S_HEX);
+	printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_STRING prompt_stmt_opt T_EOL
+{
+	menu_set_type(S_STRING);
+	printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_PROMPT prompt if_expr T_EOL
+{
+	menu_add_prompt(P_PROMPT, $2, $3);
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_DEFAULT expr if_expr T_EOL
+{
+	menu_add_expr(P_DEFAULT, $2, $3);
+	printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_SELECT T_WORD if_expr T_EOL
+{
+	menu_add_symbol(P_SELECT, sym_lookup($2, 0), $3);
+	printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_RANGE symbol symbol if_expr T_EOL
+{
+	menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,$2, $3), $4);
+	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
+};
+
+/* choice entry */
+
+choice: T_CHOICE T_EOL
+{
+	struct symbol *sym = sym_lookup(NULL, 0);
+	sym->flags |= SYMBOL_CHOICE;
+	menu_add_entry(sym);
+	menu_add_expr(P_CHOICE, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
+};
+
+choice_entry: choice choice_option_list
+{
+	menu_end_entry();
+	menu_add_menu();
+};
+
+choice_end: end
+{
+	if (zconf_endtoken($1, T_CHOICE, T_ENDCHOICE)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
+	}
+};
+
+choice_stmt:
+	  choice_entry choice_block choice_end
+	| choice_entry choice_block
+{
+	printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno);
+	zconfnerrs++;
+};
+
+choice_option_list:
+	  /* empty */
+	| choice_option_list choice_option
+	| choice_option_list depends
+	| choice_option_list help
+	| choice_option_list T_EOL
+;
+
+choice_option: T_PROMPT prompt if_expr T_EOL
+{
+	menu_add_prompt(P_PROMPT, $2, $3);
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+};
+
+choice_option: T_TRISTATE prompt_stmt_opt T_EOL
+{
+	menu_set_type(S_TRISTATE);
+	printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
+};
+
+choice_option: T_BOOLEAN prompt_stmt_opt T_EOL
+{
+	menu_set_type(S_BOOLEAN);
+	printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
+};
+
+choice_option: T_OPTIONAL T_EOL
+{
+	current_entry->sym->flags |= SYMBOL_OPTIONAL;
+	printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
+};
+
+choice_option: T_DEFAULT T_WORD if_expr T_EOL
+{
+	menu_add_symbol(P_DEFAULT, sym_lookup($2, 0), $3);
+	printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+};
+
+choice_block:
+	  /* empty */
+	| choice_block common_block
+;
+
+/* if entry */
+
+if: T_IF expr T_EOL
+{
+	printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
+	menu_add_entry(NULL);
+	menu_add_dep($2);
+	menu_end_entry();
+	menu_add_menu();
+};
+
+if_end: end
+{
+	if (zconf_endtoken($1, T_IF, T_ENDIF)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
+	}
+};
+
+if_stmt:
+	  if if_block if_end
+	| if if_block
+{
+	printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno);
+	zconfnerrs++;
+};
+
+if_block:
+	  /* empty */
+	| if_block common_block
+	| if_block menu_stmt
+	| if_block choice_stmt
+;
+
+/* menu entry */
+
+menu: T_MENU prompt T_EOL
+{
+	menu_add_entry(NULL);
+	menu_add_prop(P_MENU, $2, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
+};
+
+menu_entry: menu depends_list
+{
+	menu_end_entry();
+	menu_add_menu();
+};
+
+menu_end: end
+{
+	if (zconf_endtoken($1, T_MENU, T_ENDMENU)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
+	}
+};
+
+menu_stmt:
+	  menu_entry menu_block menu_end
+	| menu_entry menu_block
+{
+	printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno);
+	zconfnerrs++;
+};
+
+menu_block:
+	  /* empty */
+	| menu_block common_block
+	| menu_block menu_stmt
+	| menu_block choice_stmt
+	| menu_block error T_EOL		{ zconfprint("invalid menu option"); yyerrok; }
+;
+
+source: T_SOURCE prompt T_EOL
+{
+	$$ = $2;
+	printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
+};
+
+source_stmt: source
+{
+	zconf_nextfile($1);
+};
+
+/* comment entry */
+
+comment: T_COMMENT prompt T_EOL
+{
+	menu_add_entry(NULL);
+	menu_add_prop(P_COMMENT, $2, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
+};
+
+comment_stmt: comment depends_list
+{
+	menu_end_entry();
+};
+
+/* help option */
+
+help_start: T_HELP T_EOL
+{
+	printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
+	zconf_starthelp();
+};
+
+help: help_start T_HELPTEXT
+{
+	current_entry->sym->help = $2;
+};
+
+/* depends option */
+
+depends_list:	  /* empty */
+		| depends_list depends
+		| depends_list T_EOL
+;
+
+depends: T_DEPENDS T_ON expr T_EOL
+{
+	menu_add_dep($3);
+	printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
+}
+	| T_DEPENDS expr T_EOL
+{
+	menu_add_dep($2);
+	printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
+}
+	| T_REQUIRES expr T_EOL
+{
+	menu_add_dep($2);
+	printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
+};
+
+/* prompt statement */
+
+prompt_stmt_opt:
+	  /* empty */
+	| prompt if_expr
+{
+	menu_add_prop(P_PROMPT, $1, NULL, $2);
+};
+
+prompt:	  T_WORD
+	| T_WORD_QUOTE
+;
+
+end:	  T_ENDMENU nl_or_eof	{ $$ = T_ENDMENU; }
+	| T_ENDCHOICE nl_or_eof	{ $$ = T_ENDCHOICE; }
+	| T_ENDIF nl_or_eof	{ $$ = T_ENDIF; }
+;
+
+nl_or_eof:
+	T_EOL | T_EOF;
+
+if_expr:  /* empty */			{ $$ = NULL; }
+	| T_IF expr			{ $$ = $2; }
+;
+
+expr:	  symbol				{ $$ = expr_alloc_symbol($1); }
+	| symbol T_EQUAL symbol			{ $$ = expr_alloc_comp(E_EQUAL, $1, $3); }
+	| symbol T_UNEQUAL symbol		{ $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); }
+	| T_OPEN_PAREN expr T_CLOSE_PAREN	{ $$ = $2; }
+	| T_NOT expr				{ $$ = expr_alloc_one(E_NOT, $2); }
+	| expr T_OR expr			{ $$ = expr_alloc_two(E_OR, $1, $3); }
+	| expr T_AND expr			{ $$ = expr_alloc_two(E_AND, $1, $3); }
+;
+
+symbol:	  T_WORD	{ $$ = sym_lookup($1, 0); free($1); }
+	| T_WORD_QUOTE	{ $$ = sym_lookup($1, 1); free($1); }
+;
+
+%%
+
+void conf_parse(const char *name)
+{
+	struct symbol *sym;
+	int i;
+
+	zconf_initscan(name);
+
+	sym_init();
+	menu_init();
+	modules_sym = sym_lookup("MODULES", 0);
+	rootmenu.prompt = menu_add_prop(P_MENU, "axTLS Configuration", NULL, NULL);
+
+	//zconfdebug = 1;
+	zconfparse();
+	if (zconfnerrs)
+		exit(1);
+	menu_finalize(&rootmenu);
+	for_all_symbols(i, sym) {
+                if (!(sym->flags & SYMBOL_CHECKED) && sym_check_deps(sym))
+                        printf("\n");
+		else
+			sym->flags |= SYMBOL_CHECK_DONE;
+        }
+
+	sym_change_count = 1;
+}
+
+const char *zconf_tokenname(int token)
+{
+	switch (token) {
+	case T_MENU:		return "menu";
+	case T_ENDMENU:		return "endmenu";
+	case T_CHOICE:		return "choice";
+	case T_ENDCHOICE:	return "endchoice";
+	case T_IF:		return "if";
+	case T_ENDIF:		return "endif";
+	}
+	return "<token>";
+}
+
+static bool zconf_endtoken(int token, int starttoken, int endtoken)
+{
+	if (token != endtoken) {
+		zconfprint("unexpected '%s' within %s block", zconf_tokenname(token), zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	if (current_menu->file != current_file) {
+		zconfprint("'%s' in different file than '%s'", zconf_tokenname(token), zconf_tokenname(starttoken));
+		zconfprint("location of the '%s'", zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	return true;
+}
+
+static void zconfprint(const char *err, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno() + 1);
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconferror(const char *err)
+{
+	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+}
+
+void print_quoted_string(FILE *out, const char *str)
+{
+	const char *p;
+	int len;
+
+	putc('"', out);
+	while ((p = strchr(str, '"'))) {
+		len = p - str;
+		if (len)
+			fprintf(out, "%.*s", len, str);
+		fputs("\\\"", out);
+		str = p + 1;
+	}
+	fputs(str, out);
+	putc('"', out);
+}
+
+void print_symbol(FILE *out, struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	struct property *prop;
+
+	if (sym_is_choice(sym))
+		fprintf(out, "choice\n");
+	else
+		fprintf(out, "config %s\n", sym->name);
+	switch (sym->type) {
+	case S_BOOLEAN:
+		fputs("  boolean\n", out);
+		break;
+	case S_TRISTATE:
+		fputs("  tristate\n", out);
+		break;
+	case S_STRING:
+		fputs("  string\n", out);
+		break;
+	case S_INT:
+		fputs("  integer\n", out);
+		break;
+	case S_HEX:
+		fputs("  hex\n", out);
+		break;
+	default:
+		fputs("  ???\n", out);
+		break;
+	}
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu != menu)
+			continue;
+		switch (prop->type) {
+		case P_PROMPT:
+			fputs("  prompt ", out);
+			print_quoted_string(out, prop->text);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_DEFAULT:
+			fputs( "  default ", out);
+			expr_fprint(prop->expr, out);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_CHOICE:
+			fputs("  #choice value\n", out);
+			break;
+		default:
+			fprintf(out, "  unknown prop %d!\n", prop->type);
+			break;
+		}
+	}
+	if (sym->help) {
+		int len = strlen(sym->help);
+		while (sym->help[--len] == '\n')
+			sym->help[len] = 0;
+		fprintf(out, "  help\n%s\n", sym->help);
+	}
+	fputc('\n', out);
+}
+
+void zconfdump(FILE *out)
+{
+	struct property *prop;
+	struct symbol *sym;
+	struct menu *menu;
+
+	menu = rootmenu.list;
+	while (menu) {
+		if ((sym = menu->sym))
+			print_symbol(out, menu);
+		else if ((prop = menu->prompt)) {
+			switch (prop->type) {
+			case P_COMMENT:
+				fputs("\ncomment ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			case P_MENU:
+				fputs("\nmenu ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			default:
+				;
+			}
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs("  depends ", out);
+				expr_fprint(prop->visible.expr, out);
+				fputc('\n', out);
+			}
+			fputs("\n", out);
+		}
+
+		if (menu->list)
+			menu = menu->list;
+		else if (menu->next)
+			menu = menu->next;
+		else while ((menu = menu->parent)) {
+			if (menu->prompt && menu->prompt->type == P_MENU)
+				fputs("\nendmenu\n", out);
+			if (menu->next) {
+				menu = menu->next;
+				break;
+			}
+		}
+	}
+}
+
+#include "lex.zconf.c"
+#include "util.c"
+#include "confdata.c"
+#include "expr.c"
+#include "symbol.c"
+#include "menu.c"
diff --git a/trunk/package/luci/libs/nixio/axTLS/config/win32config b/trunk/package/luci/libs/nixio/axTLS/config/win32config
new file mode 100644
index 00000000..6c8d6071
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/config/win32config
@@ -0,0 +1,119 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+# CONFIG_PLATFORM_LINUX is not set
+# CONFIG_PLATFORM_CYGWIN is not set
+# CONFIG_PLATFORM_SOLARIS is not set
+CONFIG_PLATFORM_WIN32=y
+
+#
+# General Configuration
+#
+PREFIX=""
+# CONFIG_DEBUG is not set
+# CONFIG_STRIP_UNWANTED_SECTIONS is not set
+
+#
+# Microsoft Compiler Options
+#
+# CONFIG_VISUAL_STUDIO_7_0 is not set
+CONFIG_VISUAL_STUDIO_8_0=y
+CONFIG_VISUAL_STUDIO_7_0_BASE=""
+CONFIG_VISUAL_STUDIO_8_0_BASE="c:\\Program Files\\Microsoft Visual Studio 8"
+CONFIG_EXTRA_CFLAGS_OPTIONS=""
+CONFIG_EXTRA_LDFLAGS_OPTIONS=""
+
+#
+# SSL Library
+#
+# CONFIG_SSL_SERVER_ONLY is not set
+# CONFIG_SSL_CERT_VERIFICATION is not set
+# CONFIG_SSL_ENABLE_CLIENT is not set
+CONFIG_SSL_FULL_MODE=y
+# CONFIG_SSL_SKELETON_MODE is not set
+# CONFIG_SSL_PROT_LOW is not set
+CONFIG_SSL_PROT_MEDIUM=y
+# CONFIG_SSL_PROT_HIGH is not set
+CONFIG_SSL_USE_DEFAULT_KEY=y
+CONFIG_SSL_PRIVATE_KEY_LOCATION=""
+CONFIG_SSL_PRIVATE_KEY_PASSWORD=""
+CONFIG_SSL_X509_CERT_LOCATION=""
+CONFIG_SSL_GENERATE_X509_CERT=y
+CONFIG_SSL_X509_COMMON_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME=""
+CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
+CONFIG_SSL_HAS_PEM=y
+CONFIG_SSL_USE_PKCS12=y
+CONFIG_SSL_EXPIRY_TIME=24
+CONFIG_X509_MAX_CA_CERTS=4
+CONFIG_SSL_MAX_CERTS=2
+# CONFIG_SSL_CTX_MUTEXING is not set
+# CONFIG_USE_DEV_URANDOM is not set
+CONFIG_WIN32_USE_CRYPTO_LIB=y
+# CONFIG_OPENSSL_COMPATIBLE is not set
+# CONFIG_PERFORMANCE_TESTING is not set
+# CONFIG_SSL_TEST is not set
+CONFIG_AXHTTPD=y
+
+#
+# Axhttpd Configuration
+#
+# CONFIG_HTTP_STATIC_BUILD is not set
+CONFIG_HTTP_PORT=80
+CONFIG_HTTP_HTTPS_PORT=443
+CONFIG_HTTP_SESSION_CACHE_SIZE=5
+CONFIG_HTTP_WEBROOT="www"
+CONFIG_HTTP_TIMEOUT=300
+# CONFIG_HTTP_HAS_CGI is not set
+CONFIG_HTTP_CGI_EXTENSIONS=""
+# CONFIG_HTTP_ENABLE_LUA is not set
+CONFIG_HTTP_LUA_PREFIX=""
+CONFIG_HTTP_LUA_CGI_LAUNCHER=""
+# CONFIG_HTTP_BUILD_LUA is not set
+CONFIG_HTTP_DIRECTORIES=y
+CONFIG_HTTP_HAS_AUTHORIZATION=y
+# CONFIG_HTTP_HAS_IPV6 is not set
+CONFIG_HTTP_VERBOSE=y
+# CONFIG_HTTP_IS_DAEMON is not set
+
+#
+# Language Bindings
+#
+# CONFIG_BINDINGS is not set
+# CONFIG_CSHARP_BINDINGS is not set
+# CONFIG_VBNET_BINDINGS is not set
+CONFIG_DOT_NET_FRAMEWORK_BASE=""
+# CONFIG_JAVA_BINDINGS is not set
+CONFIG_JAVA_HOME=""
+# CONFIG_PERL_BINDINGS is not set
+CONFIG_PERL_CORE=""
+CONFIG_PERL_LIB=""
+# CONFIG_LUA_BINDINGS is not set
+CONFIG_LUA_CORE=""
+
+#
+# Samples
+#
+CONFIG_SAMPLES=y
+CONFIG_C_SAMPLES=y
+# CONFIG_CSHARP_SAMPLES is not set
+# CONFIG_VBNET_SAMPLES is not set
+# CONFIG_JAVA_SAMPLES is not set
+# CONFIG_PERL_SAMPLES is not set
+# CONFIG_LUA_SAMPLES is not set
+
+#
+# BigInt Options
+#
+# CONFIG_BIGINT_CLASSICAL is not set
+# CONFIG_BIGINT_MONTGOMERY is not set
+CONFIG_BIGINT_BARRETT=y
+CONFIG_BIGINT_CRT=y
+# CONFIG_BIGINT_KARATSUBA is not set
+MUL_KARATSUBA_THRESH=0
+SQU_KARATSUBA_THRESH=0
+CONFIG_BIGINT_SLIDING_WINDOW=y
+CONFIG_BIGINT_SQUARE=y
+# CONFIG_BIGINT_CHECK_ON is not set
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/Makefile b/trunk/package/luci/libs/nixio/axTLS/crypto/Makefile
new file mode 100644
index 00000000..3ea8bdde
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../config/.config
+include ../config/makefile.conf
+
+AXTLS_HOME=..
+
+OBJ=\
+	aes.o \
+	bigint.o \
+	crypto_misc.o \
+	hmac.o \
+	md2.o \
+	md5.o \
+	rc4.o \
+	rsa.o \
+	sha1.o
+
+include ../config/makefile.post
+
+all: $(OBJ)
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/aes.c b/trunk/package/luci/libs/nixio/axTLS/crypto/aes.c
new file mode 100644
index 00000000..038a45bd
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/aes.c
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * AES implementation - this is a small code version. There are much faster
+ * versions around but they are much larger in size (i.e. they use large 
+ * submix tables).
+ */
+
+#include <string.h>
+#include "crypto.h"
+
+/* all commented out in skeleton mode */
+#ifndef CONFIG_SSL_SKELETON_MODE
+
+#define rot1(x) (((x) << 24) | ((x) >> 8))
+#define rot2(x) (((x) << 16) | ((x) >> 16))
+#define rot3(x) (((x) <<  8) | ((x) >> 24))
+
+/* 
+ * This cute trick does 4 'mul by two' at once.  Stolen from
+ * Dr B. R. Gladman <brg@gladman.uk.net> but I'm sure the u-(u>>7) is
+ * a standard graphics trick
+ * The key to this is that we need to xor with 0x1b if the top bit is set.
+ * a 1xxx xxxx   0xxx 0xxx First we mask the 7bit,
+ * b 1000 0000   0000 0000 then we shift right by 7 putting the 7bit in 0bit,
+ * c 0000 0001   0000 0000 we then subtract (c) from (b)
+ * d 0111 1111   0000 0000 and now we and with our mask
+ * e 0001 1011   0000 0000
+ */
+#define mt  0x80808080
+#define ml  0x7f7f7f7f
+#define mh  0xfefefefe
+#define mm  0x1b1b1b1b
+#define mul2(x,t)	((t)=((x)&mt), \
+			((((x)+(x))&mh)^(((t)-((t)>>7))&mm)))
+
+#define inv_mix_col(x,f2,f4,f8,f9) (\
+			(f2)=mul2(x,f2), \
+			(f4)=mul2(f2,f4), \
+			(f8)=mul2(f4,f8), \
+			(f9)=(x)^(f8), \
+			(f8)=((f2)^(f4)^(f8)), \
+			(f2)^=(f9), \
+			(f4)^=(f9), \
+			(f8)^=rot3(f2), \
+			(f8)^=rot2(f4), \
+			(f8)^rot1(f9))
+
+/*
+ * AES S-box
+ */
+static const uint8_t aes_sbox[256] =
+{
+	0x63,0x7C,0x77,0x7B,0xF2,0x6B,0x6F,0xC5,
+	0x30,0x01,0x67,0x2B,0xFE,0xD7,0xAB,0x76,
+	0xCA,0x82,0xC9,0x7D,0xFA,0x59,0x47,0xF0,
+	0xAD,0xD4,0xA2,0xAF,0x9C,0xA4,0x72,0xC0,
+	0xB7,0xFD,0x93,0x26,0x36,0x3F,0xF7,0xCC,
+	0x34,0xA5,0xE5,0xF1,0x71,0xD8,0x31,0x15,
+	0x04,0xC7,0x23,0xC3,0x18,0x96,0x05,0x9A,
+	0x07,0x12,0x80,0xE2,0xEB,0x27,0xB2,0x75,
+	0x09,0x83,0x2C,0x1A,0x1B,0x6E,0x5A,0xA0,
+	0x52,0x3B,0xD6,0xB3,0x29,0xE3,0x2F,0x84,
+	0x53,0xD1,0x00,0xED,0x20,0xFC,0xB1,0x5B,
+	0x6A,0xCB,0xBE,0x39,0x4A,0x4C,0x58,0xCF,
+	0xD0,0xEF,0xAA,0xFB,0x43,0x4D,0x33,0x85,
+	0x45,0xF9,0x02,0x7F,0x50,0x3C,0x9F,0xA8,
+	0x51,0xA3,0x40,0x8F,0x92,0x9D,0x38,0xF5,
+	0xBC,0xB6,0xDA,0x21,0x10,0xFF,0xF3,0xD2,
+	0xCD,0x0C,0x13,0xEC,0x5F,0x97,0x44,0x17,
+	0xC4,0xA7,0x7E,0x3D,0x64,0x5D,0x19,0x73,
+	0x60,0x81,0x4F,0xDC,0x22,0x2A,0x90,0x88,
+	0x46,0xEE,0xB8,0x14,0xDE,0x5E,0x0B,0xDB,
+	0xE0,0x32,0x3A,0x0A,0x49,0x06,0x24,0x5C,
+	0xC2,0xD3,0xAC,0x62,0x91,0x95,0xE4,0x79,
+	0xE7,0xC8,0x37,0x6D,0x8D,0xD5,0x4E,0xA9,
+	0x6C,0x56,0xF4,0xEA,0x65,0x7A,0xAE,0x08,
+	0xBA,0x78,0x25,0x2E,0x1C,0xA6,0xB4,0xC6,
+	0xE8,0xDD,0x74,0x1F,0x4B,0xBD,0x8B,0x8A,
+	0x70,0x3E,0xB5,0x66,0x48,0x03,0xF6,0x0E,
+	0x61,0x35,0x57,0xB9,0x86,0xC1,0x1D,0x9E,
+	0xE1,0xF8,0x98,0x11,0x69,0xD9,0x8E,0x94,
+	0x9B,0x1E,0x87,0xE9,0xCE,0x55,0x28,0xDF,
+	0x8C,0xA1,0x89,0x0D,0xBF,0xE6,0x42,0x68,
+	0x41,0x99,0x2D,0x0F,0xB0,0x54,0xBB,0x16,
+};
+
+/*
+ * AES is-box
+ */
+static const uint8_t aes_isbox[256] = 
+{
+    0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38,
+    0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb,
+    0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87,
+    0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb,
+    0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d,
+    0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e,
+    0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2,
+    0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25,
+    0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16,
+    0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92,
+    0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda,
+    0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84,
+    0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a,
+    0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06,
+    0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02,
+    0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b,
+    0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea,
+    0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73,
+    0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85,
+    0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e,
+    0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89,
+    0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b,
+    0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20,
+    0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4,
+    0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31,
+    0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f,
+    0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d,
+    0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef,
+    0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0,
+    0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61,
+    0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26,
+    0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
+};
+
+static const unsigned char Rcon[30]=
+{
+	0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,
+	0x1b,0x36,0x6c,0xd8,0xab,0x4d,0x9a,0x2f,
+	0x5e,0xbc,0x63,0xc6,0x97,0x35,0x6a,0xd4,
+	0xb3,0x7d,0xfa,0xef,0xc5,0x91,
+};
+
+/* ----- static functions ----- */
+static void AES_encrypt(const AES_CTX *ctx, uint32_t *data);
+static void AES_decrypt(const AES_CTX *ctx, uint32_t *data);
+
+/* Perform doubling in Galois Field GF(2^8) using the irreducible polynomial
+   x^8+x^4+x^3+x+1 */
+static unsigned char AES_xtime(uint32_t x)
+{
+	return x = (x&0x80) ? (x<<1)^0x1b : x<<1;
+}
+
+/**
+ * Set up AES with the key/iv and cipher size.
+ */
+void AES_set_key(AES_CTX *ctx, const uint8_t *key, 
+        const uint8_t *iv, AES_MODE mode)
+{
+    int i, ii;
+    uint32_t *W, tmp, tmp2;
+    const unsigned char *ip;
+    int words;
+
+    switch (mode)
+    {
+        case AES_MODE_128:
+            i = 10;
+            words = 4;
+            break;
+
+        case AES_MODE_256:
+            i = 14;
+            words = 8;
+            break;
+
+        default:        /* fail silently */
+            return;
+    }
+
+    ctx->rounds = i;
+    ctx->key_size = words;
+    W = ctx->ks;
+    for (i = 0; i < words; i+=2)
+    {
+        W[i+0]=	((uint32_t)key[ 0]<<24)|
+            ((uint32_t)key[ 1]<<16)|
+            ((uint32_t)key[ 2]<< 8)|
+            ((uint32_t)key[ 3]    );
+        W[i+1]=	((uint32_t)key[ 4]<<24)|
+            ((uint32_t)key[ 5]<<16)|
+            ((uint32_t)key[ 6]<< 8)|
+            ((uint32_t)key[ 7]    );
+        key += 8;
+    }
+
+    ip = Rcon;
+    ii = 4 * (ctx->rounds+1);
+    for (i = words; i<ii; i++)
+    {
+        tmp = W[i-1];
+
+        if ((i % words) == 0)
+        {
+            tmp2 =(uint32_t)aes_sbox[(tmp    )&0xff]<< 8;
+            tmp2|=(uint32_t)aes_sbox[(tmp>> 8)&0xff]<<16;
+            tmp2|=(uint32_t)aes_sbox[(tmp>>16)&0xff]<<24;
+            tmp2|=(uint32_t)aes_sbox[(tmp>>24)     ];
+            tmp=tmp2^(((unsigned int)*ip)<<24);
+            ip++;
+        }
+
+        if ((words == 8) && ((i % words) == 4))
+        {
+            tmp2 =(uint32_t)aes_sbox[(tmp    )&0xff]    ;
+            tmp2|=(uint32_t)aes_sbox[(tmp>> 8)&0xff]<< 8;
+            tmp2|=(uint32_t)aes_sbox[(tmp>>16)&0xff]<<16;
+            tmp2|=(uint32_t)aes_sbox[(tmp>>24)     ]<<24;
+            tmp=tmp2;
+        }
+
+        W[i]=W[i-words]^tmp;
+    }
+
+    /* copy the iv across */
+    memcpy(ctx->iv, iv, 16);
+}
+
+/**
+ * Change a key for decryption.
+ */
+void AES_convert_key(AES_CTX *ctx)
+{
+    int i;
+    uint32_t *k,w,t1,t2,t3,t4;
+
+    k = ctx->ks;
+    k += 4;
+
+    for (i= ctx->rounds*4; i > 4; i--)
+    {
+        w= *k;
+        w = inv_mix_col(w,t1,t2,t3,t4);
+        *k++ =w;
+    }
+}
+
+/**
+ * Encrypt a byte sequence (with a block size 16) using the AES cipher.
+ */
+void AES_cbc_encrypt(AES_CTX *ctx, const uint8_t *msg, uint8_t *out, int length)
+{
+    int i;
+    uint32_t tin[4], tout[4], iv[4];
+
+    memcpy(iv, ctx->iv, AES_IV_SIZE);
+    for (i = 0; i < 4; i++)
+        tout[i] = ntohl(iv[i]);
+
+    for (length -= AES_BLOCKSIZE; length >= 0; length -= AES_BLOCKSIZE)
+    {
+        uint32_t msg_32[4];
+        uint32_t out_32[4];
+        memcpy(msg_32, msg, AES_BLOCKSIZE);
+        msg += AES_BLOCKSIZE;
+
+        for (i = 0; i < 4; i++)
+            tin[i] = ntohl(msg_32[i])^tout[i];
+
+        AES_encrypt(ctx, tin);
+
+        for (i = 0; i < 4; i++)
+        {
+            tout[i] = tin[i]; 
+            out_32[i] = htonl(tout[i]);
+        }
+
+        memcpy(out, out_32, AES_BLOCKSIZE);
+        out += AES_BLOCKSIZE;
+    }
+
+    for (i = 0; i < 4; i++)
+        iv[i] = htonl(tout[i]);
+    memcpy(ctx->iv, iv, AES_IV_SIZE);
+}
+
+/**
+ * Decrypt a byte sequence (with a block size 16) using the AES cipher.
+ */
+void AES_cbc_decrypt(AES_CTX *ctx, const uint8_t *msg, uint8_t *out, int length)
+{
+    int i;
+    uint32_t tin[4], xor[4], tout[4], data[4], iv[4];
+
+    memcpy(iv, ctx->iv, AES_IV_SIZE);
+    for (i = 0; i < 4; i++)
+        xor[i] = ntohl(iv[i]);
+
+    for (length -= 16; length >= 0; length -= 16)
+    {
+        uint32_t msg_32[4];
+        uint32_t out_32[4];
+        memcpy(msg_32, msg, AES_BLOCKSIZE);
+        msg += AES_BLOCKSIZE;
+
+        for (i = 0; i < 4; i++)
+        {
+            tin[i] = ntohl(msg_32[i]);
+            data[i] = tin[i];
+        }
+
+        AES_decrypt(ctx, data);
+
+        for (i = 0; i < 4; i++)
+        {
+            tout[i] = data[i]^xor[i];
+            xor[i] = tin[i];
+            out_32[i] = htonl(tout[i]);
+        }
+
+        memcpy(out, out_32, AES_BLOCKSIZE);
+        out += AES_BLOCKSIZE;
+    }
+
+    for (i = 0; i < 4; i++)
+        iv[i] = htonl(xor[i]);
+    memcpy(ctx->iv, iv, AES_IV_SIZE);
+}
+
+/**
+ * Encrypt a single block (16 bytes) of data
+ */
+static void AES_encrypt(const AES_CTX *ctx, uint32_t *data)
+{
+    /* To make this code smaller, generate the sbox entries on the fly.
+     * This will have a really heavy effect upon performance.
+     */
+    uint32_t tmp[4];
+    uint32_t tmp1, old_a0, a0, a1, a2, a3, row;
+    int curr_rnd;
+    int rounds = ctx->rounds; 
+    const uint32_t *k = ctx->ks;
+
+    /* Pre-round key addition */
+    for (row = 0; row < 4; row++)
+        data[row] ^= *(k++);
+
+    /* Encrypt one block. */
+    for (curr_rnd = 0; curr_rnd < rounds; curr_rnd++)
+    {
+        /* Perform ByteSub and ShiftRow operations together */
+        for (row = 0; row < 4; row++)
+        {
+            a0 = (uint32_t)aes_sbox[(data[row%4]>>24)&0xFF];
+            a1 = (uint32_t)aes_sbox[(data[(row+1)%4]>>16)&0xFF];
+            a2 = (uint32_t)aes_sbox[(data[(row+2)%4]>>8)&0xFF]; 
+            a3 = (uint32_t)aes_sbox[(data[(row+3)%4])&0xFF];
+
+            /* Perform MixColumn iff not last round */
+            if (curr_rnd < (rounds - 1))
+            {
+                tmp1 = a0 ^ a1 ^ a2 ^ a3;
+                old_a0 = a0;
+                a0 ^= tmp1 ^ AES_xtime(a0 ^ a1);
+                a1 ^= tmp1 ^ AES_xtime(a1 ^ a2);
+                a2 ^= tmp1 ^ AES_xtime(a2 ^ a3);
+                a3 ^= tmp1 ^ AES_xtime(a3 ^ old_a0);
+            }
+
+            tmp[row] = ((a0 << 24) | (a1 << 16) | (a2 << 8) | a3);
+        }
+
+        /* KeyAddition - note that it is vital that this loop is separate from
+           the MixColumn operation, which must be atomic...*/ 
+        for (row = 0; row < 4; row++)
+            data[row] = tmp[row] ^ *(k++);
+    }
+}
+
+/**
+ * Decrypt a single block (16 bytes) of data
+ */
+static void AES_decrypt(const AES_CTX *ctx, uint32_t *data)
+{ 
+    uint32_t tmp[4];
+    uint32_t xt0,xt1,xt2,xt3,xt4,xt5,xt6;
+    uint32_t a0, a1, a2, a3, row;
+    int curr_rnd;
+    int rounds = ctx->rounds;
+    const uint32_t *k = ctx->ks + ((rounds+1)*4);
+
+    /* pre-round key addition */
+    for (row=4; row > 0;row--)
+        data[row-1] ^= *(--k);
+
+    /* Decrypt one block */
+    for (curr_rnd = 0; curr_rnd < rounds; curr_rnd++)
+    {
+        /* Perform ByteSub and ShiftRow operations together */
+        for (row = 4; row > 0; row--)
+        {
+            a0 = aes_isbox[(data[(row+3)%4]>>24)&0xFF];
+            a1 = aes_isbox[(data[(row+2)%4]>>16)&0xFF];
+            a2 = aes_isbox[(data[(row+1)%4]>>8)&0xFF];
+            a3 = aes_isbox[(data[row%4])&0xFF];
+
+            /* Perform MixColumn iff not last round */
+            if (curr_rnd<(rounds-1))
+            {
+                /* The MDS cofefficients (0x09, 0x0B, 0x0D, 0x0E)
+                   are quite large compared to encryption; this 
+                   operation slows decryption down noticeably. */
+                xt0 = AES_xtime(a0^a1);
+                xt1 = AES_xtime(a1^a2);
+                xt2 = AES_xtime(a2^a3);
+                xt3 = AES_xtime(a3^a0);
+                xt4 = AES_xtime(xt0^xt1);
+                xt5 = AES_xtime(xt1^xt2);
+                xt6 = AES_xtime(xt4^xt5);
+
+                xt0 ^= a1^a2^a3^xt4^xt6;
+                xt1 ^= a0^a2^a3^xt5^xt6;
+                xt2 ^= a0^a1^a3^xt4^xt6;
+                xt3 ^= a0^a1^a2^xt5^xt6;
+                tmp[row-1] = ((xt0<<24)|(xt1<<16)|(xt2<<8)|xt3);
+            }
+            else
+                tmp[row-1] = ((a0<<24)|(a1<<16)|(a2<<8)|a3);
+        }
+
+        for (row = 4; row > 0; row--)
+            data[row-1] = tmp[row-1] ^ *(--k);
+    }
+}
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/bigint.c b/trunk/package/luci/libs/nixio/axTLS/crypto/bigint.c
new file mode 100644
index 00000000..53a58392
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/bigint.c
@@ -0,0 +1,1575 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @defgroup bigint_api Big Integer API
+ * @brief The bigint implementation as used by the axTLS project.
+ *
+ * The bigint library is for RSA encryption/decryption as well as signing.
+ * This code tries to minimise use of malloc/free by maintaining a small 
+ * cache. A bigint context may maintain state by being made "permanent". 
+ * It be be later released with a bi_depermanent() and bi_free() call.
+ *
+ * It supports the following reduction techniques:
+ * - Classical
+ * - Barrett
+ * - Montgomery
+ *
+ * It also implements the following:
+ * - Karatsuba multiplication
+ * - Squaring
+ * - Sliding window exponentiation
+ * - Chinese Remainder Theorem (implemented in rsa.c).
+ *
+ * All the algorithms used are pretty standard, and designed for different
+ * data bus sizes. Negative numbers are not dealt with at all, so a subtraction
+ * may need to be tested for negativity.
+ *
+ * This library steals some ideas from Jef Poskanzer
+ * <http://cs.marlboro.edu/term/cs-fall02/algorithms/crypto/RSA/bigint>
+ * and GMP <http://www.swox.com/gmp>. It gets most of its implementation
+ * detail from "The Handbook of Applied Cryptography"
+ * <http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf>
+ * @{
+ */
+
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+#include "bigint.h"
+
+#define V1      v->comps[v->size-1]                 /**< v1 for division */
+#define V2      v->comps[v->size-2]                 /**< v2 for division */
+#define U(j)    tmp_u->comps[tmp_u->size-j-1]       /**< uj for division */
+#define Q(j)    quotient->comps[quotient->size-j-1] /**< qj for division */
+
+static bigint *bi_int_multiply(BI_CTX *ctx, bigint *bi, comp i);
+static bigint *bi_int_divide(BI_CTX *ctx, bigint *biR, comp denom);
+static bigint *alloc(BI_CTX *ctx, int size);
+static bigint *trim(bigint *bi);
+static void more_comps(bigint *bi, int n);
+#if defined(CONFIG_BIGINT_KARATSUBA) || defined(CONFIG_BIGINT_BARRETT) || \
+    defined(CONFIG_BIGINT_MONTGOMERY)
+static bigint *comp_right_shift(bigint *biR, int num_shifts);
+static bigint *comp_left_shift(bigint *biR, int num_shifts);
+#endif
+
+#ifdef CONFIG_BIGINT_CHECK_ON
+static void check(const bigint *bi);
+#else
+#define check(A)                /**< disappears in normal production mode */
+#endif
+
+
+/**
+ * @brief Start a new bigint context.
+ * @return A bigint context.
+ */
+BI_CTX *bi_initialize(void)
+{
+    /* calloc() sets everything to zero */
+    BI_CTX *ctx = (BI_CTX *)calloc(1, sizeof(BI_CTX));
+   
+    /* the radix */
+    ctx->bi_radix = alloc(ctx, 2); 
+    ctx->bi_radix->comps[0] = 0;
+    ctx->bi_radix->comps[1] = 1;
+    bi_permanent(ctx->bi_radix);
+    return ctx;
+}
+
+/**
+ * @brief Close the bigint context and free any resources.
+ *
+ * Free up any used memory - a check is done if all objects were not 
+ * properly freed.
+ * @param ctx [in]   The bigint session context.
+ */
+void bi_terminate(BI_CTX *ctx)
+{
+    bi_depermanent(ctx->bi_radix); 
+    bi_free(ctx, ctx->bi_radix);
+
+    if (ctx->active_count != 0)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("bi_terminate: there were %d un-freed bigints\n",
+                       ctx->active_count);
+#endif
+        abort();
+    }
+
+    bi_clear_cache(ctx);
+    free(ctx);
+}
+
+/**
+ *@brief Clear the memory cache.
+ */
+void bi_clear_cache(BI_CTX *ctx)
+{
+    bigint *p, *pn;
+
+    if (ctx->free_list == NULL)
+        return;
+    
+    for (p = ctx->free_list; p != NULL; p = pn)
+    {
+        pn = p->next;
+        free(p->comps);
+        free(p);
+    }
+
+    ctx->free_count = 0;
+    ctx->free_list = NULL;
+}
+
+/**
+ * @brief Increment the number of references to this object. 
+ * It does not do a full copy.
+ * @param bi [in]   The bigint to copy.
+ * @return A reference to the same bigint.
+ */
+bigint *bi_copy(bigint *bi)
+{
+    check(bi);
+    if (bi->refs != PERMANENT)
+        bi->refs++;
+    return bi;
+}
+
+/**
+ * @brief Simply make a bigint object "unfreeable" if bi_free() is called on it.
+ *
+ * For this object to be freed, bi_depermanent() must be called.
+ * @param bi [in]   The bigint to be made permanent.
+ */
+void bi_permanent(bigint *bi)
+{
+    check(bi);
+    if (bi->refs != 1)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("bi_permanent: refs was not 1\n");
+#endif
+        abort();
+    }
+
+    bi->refs = PERMANENT;
+}
+
+/**
+ * @brief Take a permanent object and make it eligible for freedom.
+ * @param bi [in]   The bigint to be made back to temporary.
+ */
+void bi_depermanent(bigint *bi)
+{
+    check(bi);
+    if (bi->refs != PERMANENT)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("bi_depermanent: bigint was not permanent\n");
+#endif
+        abort();
+    }
+
+    bi->refs = 1;
+}
+
+/**
+ * @brief Free a bigint object so it can be used again. 
+ *
+ * The memory itself it not actually freed, just tagged as being available 
+ * @param ctx [in]   The bigint session context.
+ * @param bi [in]    The bigint to be freed.
+ */
+void bi_free(BI_CTX *ctx, bigint *bi)
+{
+    check(bi);
+    if (bi->refs == PERMANENT)
+    {
+        return;
+    }
+
+    if (--bi->refs > 0)
+    {
+        return;
+    }
+
+    bi->next = ctx->free_list;
+    ctx->free_list = bi;
+    ctx->free_count++;
+
+    if (--ctx->active_count < 0)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("bi_free: active_count went negative "
+                "- double-freed bigint?\n");
+#endif
+        abort();
+    }
+}
+
+/**
+ * @brief Convert an (unsigned) integer into a bigint.
+ * @param ctx [in]   The bigint session context.
+ * @param i [in]     The (unsigned) integer to be converted.
+ * 
+ */
+bigint *int_to_bi(BI_CTX *ctx, comp i)
+{
+    bigint *biR = alloc(ctx, 1);
+    biR->comps[0] = i;
+    return biR;
+}
+
+/**
+ * @brief Do a full copy of the bigint object.
+ * @param ctx [in]   The bigint session context.
+ * @param bi  [in]   The bigint object to be copied.
+ */
+bigint *bi_clone(BI_CTX *ctx, const bigint *bi)
+{
+    bigint *biR = alloc(ctx, bi->size);
+    check(bi);
+    memcpy(biR->comps, bi->comps, bi->size*COMP_BYTE_SIZE);
+    return biR;
+}
+
+/**
+ * @brief Perform an addition operation between two bigints.
+ * @param ctx [in]  The bigint session context.
+ * @param bia [in]  A bigint.
+ * @param bib [in]  Another bigint.
+ * @return The result of the addition.
+ */
+bigint *bi_add(BI_CTX *ctx, bigint *bia, bigint *bib)
+{
+    int n;
+    comp carry = 0;
+    comp *pa, *pb;
+
+    check(bia);
+    check(bib);
+
+    n = max(bia->size, bib->size);
+    more_comps(bia, n+1);
+    more_comps(bib, n);
+    pa = bia->comps;
+    pb = bib->comps;
+
+    do
+    {
+        comp  sl, rl, cy1;
+        sl = *pa + *pb++;
+        rl = sl + carry;
+        cy1 = sl < *pa;
+        carry = cy1 | (rl < sl);
+        *pa++ = rl;
+    } while (--n != 0);
+
+    *pa = carry;                  /* do overflow */
+    bi_free(ctx, bib);
+    return trim(bia);
+}
+
+/**
+ * @brief Perform a subtraction operation between two bigints.
+ * @param ctx [in]  The bigint session context.
+ * @param bia [in]  A bigint.
+ * @param bib [in]  Another bigint.
+ * @param is_negative [out] If defined, indicates that the result was negative.
+ * is_negative may be null.
+ * @return The result of the subtraction. The result is always positive.
+ */
+bigint *bi_subtract(BI_CTX *ctx, 
+        bigint *bia, bigint *bib, int *is_negative)
+{
+    int n = bia->size;
+    comp *pa, *pb, carry = 0;
+
+    check(bia);
+    check(bib);
+
+    more_comps(bib, n);
+    pa = bia->comps;
+    pb = bib->comps;
+
+    do 
+    {
+        comp sl, rl, cy1;
+        sl = *pa - *pb++;
+        rl = sl - carry;
+        cy1 = sl > *pa;
+        carry = cy1 | (rl > sl);
+        *pa++ = rl;
+    } while (--n != 0);
+
+    if (is_negative)    /* indicate a negative result */
+    {
+        *is_negative = carry;
+    }
+
+    bi_free(ctx, trim(bib));    /* put bib back to the way it was */
+    return trim(bia);
+}
+
+/**
+ * Perform a multiply between a bigint an an (unsigned) integer
+ */
+static bigint *bi_int_multiply(BI_CTX *ctx, bigint *bia, comp b)
+{
+    int j = 0, n = bia->size;
+    bigint *biR = alloc(ctx, n + 1);
+    comp carry = 0;
+    comp *r = biR->comps;
+    comp *a = bia->comps;
+
+    check(bia);
+
+    /* clear things to start with */
+    memset(r, 0, ((n+1)*COMP_BYTE_SIZE));
+
+    do
+    {
+        long_comp tmp = *r + (long_comp)a[j]*b + carry;
+        *r++ = (comp)tmp;              /* downsize */
+        carry = (comp)(tmp >> COMP_BIT_SIZE);
+    } while (++j < n);
+
+    *r = carry;
+    bi_free(ctx, bia);
+    return trim(biR);
+}
+
+/**
+ * @brief Does both division and modulo calculations. 
+ *
+ * Used extensively when doing classical reduction.
+ * @param ctx [in]  The bigint session context.
+ * @param u [in]    A bigint which is the numerator.
+ * @param v [in]    Either the denominator or the modulus depending on the mode.
+ * @param is_mod [n] Determines if this is a normal division (0) or a reduction
+ * (1).
+ * @return  The result of the division/reduction.
+ */
+bigint *bi_divide(BI_CTX *ctx, bigint *u, bigint *v, int is_mod)
+{
+    int n = v->size, m = u->size-n;
+    int j = 0, orig_u_size = u->size;
+    uint8_t mod_offset = ctx->mod_offset;
+    comp d;
+    bigint *quotient, *tmp_u;
+    comp q_dash;
+
+    check(u);
+    check(v);
+
+    /* if doing reduction and we are < mod, then return mod */
+    if (is_mod && bi_compare(v, u) > 0)
+    {
+        bi_free(ctx, v);
+        return u;
+    }
+
+    quotient = alloc(ctx, m+1);
+    tmp_u = alloc(ctx, n+1);
+    v = trim(v);        /* make sure we have no leading 0's */
+    d = (comp)((long_comp)COMP_RADIX/(V1+1));
+
+    /* clear things to start with */
+    memset(quotient->comps, 0, ((quotient->size)*COMP_BYTE_SIZE));
+
+    /* normalise */
+    if (d > 1)
+    {
+        u = bi_int_multiply(ctx, u, d);
+
+        if (is_mod)
+        {
+            v = ctx->bi_normalised_mod[mod_offset];
+        }
+        else
+        {
+            v = bi_int_multiply(ctx, v, d);
+        }
+    }
+
+    if (orig_u_size == u->size)  /* new digit position u0 */
+    {
+        more_comps(u, orig_u_size + 1);
+    }
+
+    do
+    {
+        /* get a temporary short version of u */
+        memcpy(tmp_u->comps, &u->comps[u->size-n-1-j], (n+1)*COMP_BYTE_SIZE);
+
+        /* calculate q' */
+        if (U(0) == V1)
+        {
+            q_dash = COMP_RADIX-1;
+        }
+        else
+        {
+            q_dash = (comp)(((long_comp)U(0)*COMP_RADIX + U(1))/V1);
+        }
+
+        if (v->size > 1 && V2)
+        {
+            /* we are implementing the following:
+            if (V2*q_dash > (((U(0)*COMP_RADIX + U(1) - 
+                    q_dash*V1)*COMP_RADIX) + U(2))) ... */
+            comp inner = (comp)((long_comp)COMP_RADIX*U(0) + U(1) - 
+                                        (long_comp)q_dash*V1);
+            if ((long_comp)V2*q_dash > (long_comp)inner*COMP_RADIX + U(2))
+            {
+                q_dash--;
+            }
+        }
+
+        /* multiply and subtract */
+        if (q_dash)
+        {
+            int is_negative;
+            tmp_u = bi_subtract(ctx, tmp_u, 
+                    bi_int_multiply(ctx, bi_copy(v), q_dash), &is_negative);
+            more_comps(tmp_u, n+1);
+
+            Q(j) = q_dash; 
+
+            /* add back */
+            if (is_negative)
+            {
+                Q(j)--;
+                tmp_u = bi_add(ctx, tmp_u, bi_copy(v));
+
+                /* lop off the carry */
+                tmp_u->size--;
+                v->size--;
+            }
+        }
+        else
+        {
+            Q(j) = 0; 
+        }
+
+        /* copy back to u */
+        memcpy(&u->comps[u->size-n-1-j], tmp_u->comps, (n+1)*COMP_BYTE_SIZE);
+    } while (++j <= m);
+
+    bi_free(ctx, tmp_u);
+    bi_free(ctx, v);
+
+    if (is_mod)     /* get the remainder */
+    {
+        bi_free(ctx, quotient);
+        return bi_int_divide(ctx, trim(u), d);
+    }
+    else            /* get the quotient */
+    {
+        bi_free(ctx, u);
+        return trim(quotient);
+    }
+}
+
+/*
+ * Perform an integer divide on a bigint.
+ */
+static bigint *bi_int_divide(BI_CTX *ctx, bigint *biR, comp denom)
+{
+    int i = biR->size - 1;
+    long_comp r = 0;
+
+    check(biR);
+
+    do
+    {
+        r = (r<<COMP_BIT_SIZE) + biR->comps[i];
+        biR->comps[i] = (comp)(r / denom);
+        r %= denom;
+    } while (--i >= 0);
+
+    return trim(biR);
+}
+
+#ifdef CONFIG_BIGINT_MONTGOMERY
+/**
+ * There is a need for the value of integer N' such that B^-1(B-1)-N^-1N'=1, 
+ * where B^-1(B-1) mod N=1. Actually, only the least significant part of 
+ * N' is needed, hence the definition N0'=N' mod b. We reproduce below the 
+ * simple algorithm from an article by Dusse and Kaliski to efficiently 
+ * find N0' from N0 and b */
+static comp modular_inverse(bigint *bim)
+{
+    int i;
+    comp t = 1;
+    comp two_2_i_minus_1 = 2;   /* 2^(i-1) */
+    long_comp two_2_i = 4;      /* 2^i */
+    comp N = bim->comps[0];
+
+    for (i = 2; i <= COMP_BIT_SIZE; i++)
+    {
+        if ((long_comp)N*t%two_2_i >= two_2_i_minus_1)
+        {
+            t += two_2_i_minus_1;
+        }
+
+        two_2_i_minus_1 <<= 1;
+        two_2_i <<= 1;
+    }
+
+    return (comp)(COMP_RADIX-t);
+}
+#endif
+
+#if defined(CONFIG_BIGINT_KARATSUBA) || defined(CONFIG_BIGINT_BARRETT) || \
+    defined(CONFIG_BIGINT_MONTGOMERY)
+/**
+ * Take each component and shift down (in terms of components) 
+ */
+static bigint *comp_right_shift(bigint *biR, int num_shifts)
+{
+    int i = biR->size-num_shifts;
+    comp *x = biR->comps;
+    comp *y = &biR->comps[num_shifts];
+
+    check(biR);
+
+    if (i <= 0)     /* have we completely right shifted? */
+    {
+        biR->comps[0] = 0;  /* return 0 */
+        biR->size = 1;
+        return biR;
+    }
+
+    do
+    {
+        *x++ = *y++;
+    } while (--i > 0);
+
+    biR->size -= num_shifts;
+    return biR;
+}
+
+/**
+ * Take each component and shift it up (in terms of components) 
+ */
+static bigint *comp_left_shift(bigint *biR, int num_shifts)
+{
+    int i = biR->size-1;
+    comp *x, *y;
+
+    check(biR);
+
+    if (num_shifts <= 0)
+    {
+        return biR;
+    }
+
+    more_comps(biR, biR->size + num_shifts);
+
+    x = &biR->comps[i+num_shifts];
+    y = &biR->comps[i];
+
+    do
+    {
+        *x-- = *y--;
+    } while (i--);
+
+    memset(biR->comps, 0, num_shifts*COMP_BYTE_SIZE); /* zero LS comps */
+    return biR;
+}
+#endif
+
+/**
+ * @brief Allow a binary sequence to be imported as a bigint.
+ * @param ctx [in]  The bigint session context.
+ * @param data [in] The data to be converted.
+ * @param size [in] The number of bytes of data.
+ * @return A bigint representing this data.
+ */
+bigint *bi_import(BI_CTX *ctx, const uint8_t *data, int size)
+{
+    bigint *biR = alloc(ctx, (size+COMP_BYTE_SIZE-1)/COMP_BYTE_SIZE);
+    int i, j = 0, offset = 0;
+
+    memset(biR->comps, 0, biR->size*COMP_BYTE_SIZE);
+
+    for (i = size-1; i >= 0; i--)
+    {
+        biR->comps[offset] += data[i] << (j*8);
+
+        if (++j == COMP_BYTE_SIZE)
+        {
+            j = 0;
+            offset ++;
+        }
+    }
+
+    return trim(biR);
+}
+
+#ifdef CONFIG_SSL_FULL_MODE
+/**
+ * @brief The testharness uses this code to import text hex-streams and 
+ * convert them into bigints.
+ * @param ctx [in]  The bigint session context.
+ * @param data [in] A string consisting of hex characters. The characters must
+ * be in upper case.
+ * @return A bigint representing this data.
+ */
+bigint *bi_str_import(BI_CTX *ctx, const char *data)
+{
+    int size = strlen(data);
+    bigint *biR = alloc(ctx, (size+COMP_NUM_NIBBLES-1)/COMP_NUM_NIBBLES);
+    int i, j = 0, offset = 0;
+    memset(biR->comps, 0, biR->size*COMP_BYTE_SIZE);
+
+    for (i = size-1; i >= 0; i--)
+    {
+        int num = (data[i] <= '9') ? (data[i] - '0') : (data[i] - 'A' + 10);
+        biR->comps[offset] += num << (j*4);
+
+        if (++j == COMP_NUM_NIBBLES)
+        {
+            j = 0;
+            offset ++;
+        }
+    }
+
+    return biR;
+}
+
+void bi_print(const char *label, bigint *x)
+{
+    int i, j;
+
+    if (x == NULL)
+    {
+        printf("%s: (null)\n", label);
+        return;
+    }
+
+    printf("%s: (size %d)\n", label, x->size);
+    for (i = x->size-1; i >= 0; i--)
+    {
+        for (j = COMP_NUM_NIBBLES-1; j >= 0; j--)
+        {
+            comp mask = 0x0f << (j*4);
+            comp num = (x->comps[i] & mask) >> (j*4);
+            putc((num <= 9) ? (num + '0') : (num + 'A' - 10), stdout);
+        }
+    }  
+
+    printf("\n");
+}
+#endif
+
+/**
+ * @brief Take a bigint and convert it into a byte sequence. 
+ *
+ * This is useful after a decrypt operation.
+ * @param ctx [in]  The bigint session context.
+ * @param x [in]  The bigint to be converted.
+ * @param data [out] The converted data as a byte stream.
+ * @param size [in] The maximum size of the byte stream. Unused bytes will be
+ * zeroed.
+ */
+void bi_export(BI_CTX *ctx, bigint *x, uint8_t *data, int size)
+{
+    int i, j, k = size-1;
+
+    check(x);
+    memset(data, 0, size);  /* ensure all leading 0's are cleared */
+
+    for (i = 0; i < x->size; i++)
+    {
+        for (j = 0; j < COMP_BYTE_SIZE; j++)
+        {
+            comp mask = 0xff << (j*8);
+            int num = (x->comps[i] & mask) >> (j*8);
+            data[k--] = num;
+
+            if (k < 0)
+            {
+                break;
+            }
+        }
+    }
+
+    bi_free(ctx, x);
+}
+
+/**
+ * @brief Pre-calculate some of the expensive steps in reduction. 
+ *
+ * This function should only be called once (normally when a session starts).
+ * When the session is over, bi_free_mod() should be called. bi_mod_power()
+ * relies on this function being called.
+ * @param ctx [in]  The bigint session context.
+ * @param bim [in]  The bigint modulus that will be used.
+ * @param mod_offset [in] There are three moduluii that can be stored - the
+ * standard modulus, and its two primes p and q. This offset refers to which
+ * modulus we are referring to.
+ * @see bi_free_mod(), bi_mod_power().
+ */
+void bi_set_mod(BI_CTX *ctx, bigint *bim, int mod_offset)
+{
+    int k = bim->size;
+    comp d = (comp)((long_comp)COMP_RADIX/(bim->comps[k-1]+1));
+#ifdef CONFIG_BIGINT_MONTGOMERY
+    bigint *R, *R2;
+#endif
+
+    ctx->bi_mod[mod_offset] = bim;
+    bi_permanent(ctx->bi_mod[mod_offset]);
+    ctx->bi_normalised_mod[mod_offset] = bi_int_multiply(ctx, bim, d);
+    bi_permanent(ctx->bi_normalised_mod[mod_offset]);
+
+#if defined(CONFIG_BIGINT_MONTGOMERY)
+    /* set montgomery variables */
+    R = comp_left_shift(bi_clone(ctx, ctx->bi_radix), k-1);     /* R */
+    R2 = comp_left_shift(bi_clone(ctx, ctx->bi_radix), k*2-1);  /* R^2 */
+    ctx->bi_RR_mod_m[mod_offset] = bi_mod(ctx, R2);             /* R^2 mod m */
+    ctx->bi_R_mod_m[mod_offset] = bi_mod(ctx, R);               /* R mod m */
+
+    bi_permanent(ctx->bi_RR_mod_m[mod_offset]);
+    bi_permanent(ctx->bi_R_mod_m[mod_offset]);
+
+    ctx->N0_dash[mod_offset] = modular_inverse(ctx->bi_mod[mod_offset]);
+
+#elif defined (CONFIG_BIGINT_BARRETT)
+    ctx->bi_mu[mod_offset] = 
+        bi_divide(ctx, comp_left_shift(
+            bi_clone(ctx, ctx->bi_radix), k*2-1), ctx->bi_mod[mod_offset], 0);
+    bi_permanent(ctx->bi_mu[mod_offset]);
+#endif
+}
+
+/**
+ * @brief Used when cleaning various bigints at the end of a session.
+ * @param ctx [in]  The bigint session context.
+ * @param mod_offset [in] The offset to use.
+ * @see bi_set_mod().
+ */
+void bi_free_mod(BI_CTX *ctx, int mod_offset)
+{
+    bi_depermanent(ctx->bi_mod[mod_offset]);
+    bi_free(ctx, ctx->bi_mod[mod_offset]);
+#if defined (CONFIG_BIGINT_MONTGOMERY)
+    bi_depermanent(ctx->bi_RR_mod_m[mod_offset]);
+    bi_depermanent(ctx->bi_R_mod_m[mod_offset]);
+    bi_free(ctx, ctx->bi_RR_mod_m[mod_offset]);
+    bi_free(ctx, ctx->bi_R_mod_m[mod_offset]);
+#elif defined(CONFIG_BIGINT_BARRETT)
+    bi_depermanent(ctx->bi_mu[mod_offset]); 
+    bi_free(ctx, ctx->bi_mu[mod_offset]);
+#endif
+    bi_depermanent(ctx->bi_normalised_mod[mod_offset]); 
+    bi_free(ctx, ctx->bi_normalised_mod[mod_offset]);
+}
+
+/** 
+ * Perform a standard multiplication between two bigints.
+ */
+static bigint *regular_multiply(BI_CTX *ctx, bigint *bia, bigint *bib)
+{
+    int i, j, i_plus_j;
+    int n = bia->size; 
+    int t = bib->size;
+    bigint *biR = alloc(ctx, n + t);
+    comp *sr = biR->comps;
+    comp *sa = bia->comps;
+    comp *sb = bib->comps;
+
+    check(bia);
+    check(bib);
+
+    /* clear things to start with */
+    memset(biR->comps, 0, ((n+t)*COMP_BYTE_SIZE));
+    i = 0;
+
+    do 
+    {
+        comp carry = 0;
+        comp b = *sb++;
+        i_plus_j = i;
+        j = 0;
+
+        do
+        {
+            long_comp tmp = sr[i_plus_j] + (long_comp)sa[j]*b + carry;
+            sr[i_plus_j++] = (comp)tmp;              /* downsize */
+            carry = (comp)(tmp >> COMP_BIT_SIZE);
+        } while (++j < n);
+
+        sr[i_plus_j] = carry;
+    } while (++i < t);
+
+    bi_free(ctx, bia);
+    bi_free(ctx, bib);
+    return trim(biR);
+}
+
+#ifdef CONFIG_BIGINT_KARATSUBA
+/*
+ * Karatsuba improves on regular multiplication due to only 3 multiplications 
+ * being done instead of 4. The additional additions/subtractions are O(N) 
+ * rather than O(N^2) and so for big numbers it saves on a few operations 
+ */
+static bigint *karatsuba(BI_CTX *ctx, bigint *bia, bigint *bib, int is_square)
+{
+    bigint *x0, *x1;
+    bigint *p0, *p1, *p2;
+    int m;
+
+    if (is_square)
+    {
+        m = (bia->size + 1)/2;
+    }
+    else
+    {
+        m = (max(bia->size, bib->size) + 1)/2;
+    }
+
+    x0 = bi_clone(ctx, bia);
+    x0->size = m;
+    x1 = bi_clone(ctx, bia);
+    comp_right_shift(x1, m);
+    bi_free(ctx, bia);
+
+    /* work out the 3 partial products */
+    if (is_square)
+    {
+        p0 = bi_square(ctx, bi_copy(x0));
+        p2 = bi_square(ctx, bi_copy(x1));
+        p1 = bi_square(ctx, bi_add(ctx, x0, x1));
+    }
+    else /* normal multiply */
+    {
+        bigint *y0, *y1;
+        y0 = bi_clone(ctx, bib);
+        y0->size = m;
+        y1 = bi_clone(ctx, bib);
+        comp_right_shift(y1, m);
+        bi_free(ctx, bib);
+
+        p0 = bi_multiply(ctx, bi_copy(x0), bi_copy(y0));
+        p2 = bi_multiply(ctx, bi_copy(x1), bi_copy(y1));
+        p1 = bi_multiply(ctx, bi_add(ctx, x0, x1), bi_add(ctx, y0, y1));
+    }
+
+    p1 = bi_subtract(ctx, 
+            bi_subtract(ctx, p1, bi_copy(p2), NULL), bi_copy(p0), NULL);
+
+    comp_left_shift(p1, m);
+    comp_left_shift(p2, 2*m);
+    return bi_add(ctx, p1, bi_add(ctx, p0, p2));
+}
+#endif
+
+/**
+ * @brief Perform a multiplication operation between two bigints.
+ * @param ctx [in]  The bigint session context.
+ * @param bia [in]  A bigint.
+ * @param bib [in]  Another bigint.
+ * @return The result of the multiplication.
+ */
+bigint *bi_multiply(BI_CTX *ctx, bigint *bia, bigint *bib)
+{
+    check(bia);
+    check(bib);
+
+#ifdef CONFIG_BIGINT_KARATSUBA
+    if (min(bia->size, bib->size) < MUL_KARATSUBA_THRESH)
+    {
+        return regular_multiply(ctx, bia, bib);
+    }
+
+    return karatsuba(ctx, bia, bib, 0);
+#else
+    return regular_multiply(ctx, bia, bib);
+#endif
+}
+
+#ifdef CONFIG_BIGINT_SQUARE
+/*
+ * Perform the actual square operion. It takes into account overflow.
+ */
+static bigint *regular_square(BI_CTX *ctx, bigint *bi)
+{
+    int t = bi->size;
+    int i = 0, j;
+    bigint *biR = alloc(ctx, t*2);
+    comp *w = biR->comps;
+    comp *x = bi->comps;
+    comp carry;
+
+    memset(w, 0, biR->size*COMP_BYTE_SIZE);
+
+    do
+    {
+        long_comp tmp = w[2*i] + (long_comp)x[i]*x[i];
+        comp u = 0;
+        w[2*i] = (comp)tmp;
+        carry = (comp)(tmp >> COMP_BIT_SIZE);
+
+        for (j = i+1; j < t; j++)
+        {
+            long_comp xx = (long_comp)x[i]*x[j];
+            long_comp xx2 = 2*xx;
+            long_comp blob = (long_comp)w[i+j]+carry;
+
+            if (u)                  /* previous overflow */
+            {
+                blob += COMP_RADIX;
+            }
+
+
+            u = 0;
+            tmp = xx2 + blob;
+
+            /* check for overflow */
+            if ((COMP_MAX-xx) < xx  || (COMP_MAX-xx2) < blob)
+            {
+                u = 1;
+            }
+
+            w[i+j] = (comp)tmp;
+            carry = (comp)(tmp >> COMP_BIT_SIZE);
+        }
+
+        w[i+t] += carry;
+
+        if (u)
+        {
+            w[i+t+1] = 1;   /* add carry */
+        }
+    } while (++i < t);
+
+    bi_free(ctx, bi);
+    return trim(biR);
+}
+
+/**
+ * @brief Perform a square operation on a bigint.
+ * @param ctx [in]  The bigint session context.
+ * @param bia [in]  A bigint.
+ * @return The result of the multiplication.
+ */
+bigint *bi_square(BI_CTX *ctx, bigint *bia)
+{
+    check(bia);
+
+#ifdef CONFIG_BIGINT_KARATSUBA
+    if (bia->size < SQU_KARATSUBA_THRESH) 
+    {
+        return regular_square(ctx, bia);
+    }
+
+    return karatsuba(ctx, bia, NULL, 1);
+#else
+    return regular_square(ctx, bia);
+#endif
+}
+#endif
+
+/**
+ * @brief Compare two bigints.
+ * @param bia [in]  A bigint.
+ * @param bib [in]  Another bigint.
+ * @return -1 if smaller, 1 if larger and 0 if equal.
+ */
+int bi_compare(bigint *bia, bigint *bib)
+{
+    int r, i;
+
+    check(bia);
+    check(bib);
+
+    if (bia->size > bib->size)
+        r = 1;
+    else if (bia->size < bib->size)
+        r = -1;
+    else
+    {
+        comp *a = bia->comps; 
+        comp *b = bib->comps; 
+
+        /* Same number of components.  Compare starting from the high end
+         * and working down. */
+        r = 0;
+        i = bia->size - 1;
+
+        do 
+        {
+            if (a[i] > b[i])
+            { 
+                r = 1;
+                break; 
+            }
+            else if (a[i] < b[i])
+            { 
+                r = -1;
+                break; 
+            }
+        } while (--i >= 0);
+    }
+
+    return r;
+}
+
+/*
+ * Allocate and zero more components.  Does not consume bi. 
+ */
+static void more_comps(bigint *bi, int n)
+{
+    if (n > bi->max_comps)
+    {
+        bi->max_comps = max(bi->max_comps * 2, n);
+        bi->comps = (comp*)realloc(bi->comps, bi->max_comps * COMP_BYTE_SIZE);
+    }
+
+    if (n > bi->size)
+    {
+        memset(&bi->comps[bi->size], 0, (n-bi->size)*COMP_BYTE_SIZE);
+    }
+
+    bi->size = n;
+}
+
+/*
+ * Make a new empty bigint. It may just use an old one if one is available.
+ * Otherwise get one off the heap.
+ */
+static bigint *alloc(BI_CTX *ctx, int size)
+{
+    bigint *biR;
+
+    /* Can we recycle an old bigint? */
+    if (ctx->free_list != NULL)
+    {
+        biR = ctx->free_list;
+        ctx->free_list = biR->next;
+        ctx->free_count--;
+
+        if (biR->refs != 0)
+        {
+#ifdef CONFIG_SSL_FULL_MODE
+            printf("alloc: refs was not 0\n");
+#endif
+            abort();    /* create a stack trace from a core dump */
+        }
+
+        more_comps(biR, size);
+    }
+    else
+    {
+        /* No free bigints available - create a new one. */
+        biR = (bigint *)malloc(sizeof(bigint));
+        biR->comps = (comp*)malloc(size * COMP_BYTE_SIZE);
+        biR->max_comps = size;  /* give some space to spare */
+    }
+
+    biR->size = size;
+    biR->refs = 1;
+    biR->next = NULL;
+    ctx->active_count++;
+    return biR;
+}
+
+/*
+ * Work out the highest '1' bit in an exponent. Used when doing sliding-window
+ * exponentiation.
+ */
+static int find_max_exp_index(bigint *biexp)
+{
+    int i = COMP_BIT_SIZE-1;
+    comp shift = COMP_RADIX/2;
+    comp test = biexp->comps[biexp->size-1];    /* assume no leading zeroes */
+
+    check(biexp);
+
+    do
+    {
+        if (test & shift)
+        {
+            return i+(biexp->size-1)*COMP_BIT_SIZE;
+        }
+
+        shift >>= 1;
+    } while (--i != 0);
+
+    return -1;      /* error - must have been a leading 0 */
+}
+
+/*
+ * Is a particular bit is an exponent 1 or 0? Used when doing sliding-window
+ * exponentiation.
+ */
+static int exp_bit_is_one(bigint *biexp, int offset)
+{
+    comp test = biexp->comps[offset / COMP_BIT_SIZE];
+    int num_shifts = offset % COMP_BIT_SIZE;
+    comp shift = 1;
+    int i;
+
+    check(biexp);
+
+    for (i = 0; i < num_shifts; i++)
+    {
+        shift <<= 1;
+    }
+
+    return test & shift;
+}
+
+#ifdef CONFIG_BIGINT_CHECK_ON
+/*
+ * Perform a sanity check on bi.
+ */
+static void check(const bigint *bi)
+{
+    if (bi->refs <= 0)
+    {
+        printf("check: zero or negative refs in bigint\n");
+        abort();
+    }
+
+    if (bi->next != NULL)
+    {
+        printf("check: attempt to use a bigint from "
+                "the free list\n");
+        abort();
+    }
+}
+#endif
+
+/*
+ * Delete any leading 0's (and allow for 0).
+ */
+static bigint *trim(bigint *bi)
+{
+    check(bi);
+
+    while (bi->comps[bi->size-1] == 0 && bi->size > 1)
+    {
+        bi->size--;
+    }
+
+    return bi;
+}
+
+#if defined(CONFIG_BIGINT_MONTGOMERY)
+/**
+ * @brief Perform a single montgomery reduction.
+ * @param ctx [in]  The bigint session context.
+ * @param bixy [in]  A bigint.
+ * @return The result of the montgomery reduction.
+ */
+bigint *bi_mont(BI_CTX *ctx, bigint *bixy)
+{
+    int i = 0, n;
+    uint8_t mod_offset = ctx->mod_offset;
+    bigint *bim = ctx->bi_mod[mod_offset];
+    comp mod_inv = ctx->N0_dash[mod_offset];
+
+    check(bixy);
+
+    if (ctx->use_classical)     /* just use classical instead */
+    {
+        return bi_mod(ctx, bixy);
+    }
+
+    n = bim->size;
+
+    do
+    {
+        bixy = bi_add(ctx, bixy, comp_left_shift(
+                    bi_int_multiply(ctx, bim, bixy->comps[i]*mod_inv), i));
+    } while (++i < n);
+
+    comp_right_shift(bixy, n);
+
+    if (bi_compare(bixy, bim) >= 0)
+    {
+        bixy = bi_subtract(ctx, bixy, bim, NULL);
+    }
+
+    return bixy;
+}
+
+#elif defined(CONFIG_BIGINT_BARRETT)
+/*
+ * Stomp on the most significant components to give the illusion of a "mod base
+ * radix" operation 
+ */
+static bigint *comp_mod(bigint *bi, int mod)
+{
+    check(bi);
+
+    if (bi->size > mod)
+    {
+        bi->size = mod;
+    }
+
+    return bi;
+}
+
+/*
+ * Barrett reduction has no need for some parts of the product, so ignore bits
+ * of the multiply. This routine gives Barrett its big performance
+ * improvements over Classical/Montgomery reduction methods. 
+ */
+static bigint *partial_multiply(BI_CTX *ctx, bigint *bia, bigint *bib, 
+        int inner_partial, int outer_partial)
+{
+    int i = 0, j, n = bia->size, t = bib->size;
+    bigint *biR;
+    comp carry;
+    comp *sr, *sa, *sb;
+
+    check(bia);
+    check(bib);
+
+    biR = alloc(ctx, n + t);
+    sa = bia->comps;
+    sb = bib->comps;
+    sr = biR->comps;
+
+    if (inner_partial)
+    {
+        memset(sr, 0, inner_partial*COMP_BYTE_SIZE); 
+    }
+    else    /* outer partial */
+    {
+        if (n < outer_partial || t < outer_partial) /* should we bother? */
+        {
+            bi_free(ctx, bia);
+            bi_free(ctx, bib);
+            biR->comps[0] = 0;      /* return 0 */
+            biR->size = 1;
+            return biR;
+        }
+
+        memset(&sr[outer_partial], 0, (n+t-outer_partial)*COMP_BYTE_SIZE);
+    }
+
+    do 
+    {
+        comp *a = sa;
+        comp b = *sb++;
+        long_comp tmp;
+        int i_plus_j = i;
+        carry = 0;
+        j = n;
+
+        if (outer_partial && i_plus_j < outer_partial)
+        {
+            i_plus_j = outer_partial;
+            a = &sa[outer_partial-i];
+            j = n-(outer_partial-i);
+        }
+
+        do
+        {
+            if (inner_partial && i_plus_j >= inner_partial) 
+            {
+                break;
+            }
+
+            tmp = sr[i_plus_j] + ((long_comp)*a++)*b + carry;
+            sr[i_plus_j++] = (comp)tmp;              /* downsize */
+            carry = (comp)(tmp >> COMP_BIT_SIZE);
+        } while (--j != 0);
+
+        sr[i_plus_j] = carry;
+    } while (++i < t);
+
+    bi_free(ctx, bia);
+    bi_free(ctx, bib);
+    return trim(biR);
+}
+
+/**
+ * @brief Perform a single Barrett reduction.
+ * @param ctx [in]  The bigint session context.
+ * @param bi [in]  A bigint.
+ * @return The result of the Barrett reduction.
+ */
+bigint *bi_barrett(BI_CTX *ctx, bigint *bi)
+{
+    bigint *q1, *q2, *q3, *r1, *r2, *r;
+    uint8_t mod_offset = ctx->mod_offset;
+    bigint *bim = ctx->bi_mod[mod_offset];
+    int k = bim->size;
+
+    check(bi);
+    check(bim);
+
+    /* use Classical method instead  - Barrett cannot help here */
+    if (bi->size > k*2)
+    {
+        return bi_mod(ctx, bi);
+    }
+
+    q1 = comp_right_shift(bi_clone(ctx, bi), k-1);
+
+    /* do outer partial multiply */
+    q2 = partial_multiply(ctx, q1, ctx->bi_mu[mod_offset], 0, k-1); 
+    q3 = comp_right_shift(q2, k+1);
+    r1 = comp_mod(bi, k+1);
+
+    /* do inner partial multiply */
+    r2 = comp_mod(partial_multiply(ctx, q3, bim, k+1, 0), k+1);
+    r = bi_subtract(ctx, r1, r2, NULL);
+
+    /* if (r >= m) r = r - m; */
+    if (bi_compare(r, bim) >= 0)
+    {
+        r = bi_subtract(ctx, r, bim, NULL);
+    }
+
+    return r;
+}
+#endif /* CONFIG_BIGINT_BARRETT */
+
+#ifdef CONFIG_BIGINT_SLIDING_WINDOW
+/*
+ * Work out g1, g3, g5, g7... etc for the sliding-window algorithm 
+ */
+static void precompute_slide_window(BI_CTX *ctx, int window, bigint *g1)
+{
+    int k = 1, i;
+    bigint *g2;
+
+    for (i = 0; i < window-1; i++)   /* compute 2^(window-1) */
+    {
+        k <<= 1;
+    }
+
+    ctx->g = (bigint **)malloc(k*sizeof(bigint *));
+    ctx->g[0] = bi_clone(ctx, g1);
+    bi_permanent(ctx->g[0]);
+    g2 = bi_residue(ctx, bi_square(ctx, ctx->g[0]));   /* g^2 */
+
+    for (i = 1; i < k; i++)
+    {
+        ctx->g[i] = bi_residue(ctx, bi_multiply(ctx, ctx->g[i-1], bi_copy(g2)));
+        bi_permanent(ctx->g[i]);
+    }
+
+    bi_free(ctx, g2);
+    ctx->window = k;
+}
+#endif
+
+/**
+ * @brief Perform a modular exponentiation.
+ *
+ * This function requires bi_set_mod() to have been called previously. This is 
+ * one of the optimisations used for performance.
+ * @param ctx [in]  The bigint session context.
+ * @param bi  [in]  The bigint on which to perform the mod power operation.
+ * @param biexp [in] The bigint exponent.
+ * @return The result of the mod exponentiation operation
+ * @see bi_set_mod().
+ */
+bigint *bi_mod_power(BI_CTX *ctx, bigint *bi, bigint *biexp)
+{
+    int i = find_max_exp_index(biexp), j, window_size = 1;
+    bigint *biR = int_to_bi(ctx, 1);
+
+#if defined(CONFIG_BIGINT_MONTGOMERY)
+    uint8_t mod_offset = ctx->mod_offset;
+    if (!ctx->use_classical)
+    {
+        /* preconvert */
+        bi = bi_mont(ctx, 
+                bi_multiply(ctx, bi, ctx->bi_RR_mod_m[mod_offset]));    /* x' */
+        bi_free(ctx, biR);
+        biR = ctx->bi_R_mod_m[mod_offset];                              /* A */
+    }
+#endif
+
+    check(bi);
+    check(biexp);
+
+#ifdef CONFIG_BIGINT_SLIDING_WINDOW
+    for (j = i; j > 32; j /= 5) /* work out an optimum size */
+        window_size++;
+
+    /* work out the slide constants */
+    precompute_slide_window(ctx, window_size, bi);
+#else   /* just one constant */
+    ctx->g = (bigint **)malloc(sizeof(bigint *));
+    ctx->g[0] = bi_clone(ctx, bi);
+    ctx->window = 1;
+    bi_permanent(ctx->g[0]);
+#endif
+
+    /* if sliding-window is off, then only one bit will be done at a time and
+     * will reduce to standard left-to-right exponentiation */
+    do
+    {
+        if (exp_bit_is_one(biexp, i))
+        {
+            int l = i-window_size+1;
+            int part_exp = 0;
+
+            if (l < 0)  /* LSB of exponent will always be 1 */
+                l = 0;
+            else
+            {
+                while (exp_bit_is_one(biexp, l) == 0)
+                    l++;    /* go back up */
+            }
+
+            /* build up the section of the exponent */
+            for (j = i; j >= l; j--)
+            {
+                biR = bi_residue(ctx, bi_square(ctx, biR));
+                if (exp_bit_is_one(biexp, j))
+                    part_exp++;
+
+                if (j != l)
+                    part_exp <<= 1;
+            }
+
+            part_exp = (part_exp-1)/2;  /* adjust for array */
+            biR = bi_residue(ctx, bi_multiply(ctx, biR, ctx->g[part_exp]));
+            i = l-1;
+        }
+        else    /* square it */
+        {
+            biR = bi_residue(ctx, bi_square(ctx, biR));
+            i--;
+        }
+    } while (i >= 0);
+     
+    /* cleanup */
+    for (i = 0; i < ctx->window; i++)
+    {
+        bi_depermanent(ctx->g[i]);
+        bi_free(ctx, ctx->g[i]);
+    }
+
+    free(ctx->g);
+    bi_free(ctx, bi);
+    bi_free(ctx, biexp);
+#if defined CONFIG_BIGINT_MONTGOMERY
+    return ctx->use_classical ? biR : bi_mont(ctx, biR); /* convert back */
+#else /* CONFIG_BIGINT_CLASSICAL or CONFIG_BIGINT_BARRETT */
+    return biR;
+#endif
+}
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+/**
+ * @brief Perform a modular exponentiation using a temporary modulus.
+ *
+ * We need this function to check the signatures of certificates. The modulus
+ * of this function is temporary as it's just used for authentication.
+ * @param ctx [in]  The bigint session context.
+ * @param bi  [in]  The bigint to perform the exp/mod.
+ * @param bim [in]  The temporary modulus.
+ * @param biexp [in] The bigint exponent.
+ * @return The result of the mod exponentiation operation
+ * @see bi_set_mod().
+ */
+bigint *bi_mod_power2(BI_CTX *ctx, bigint *bi, bigint *bim, bigint *biexp)
+{
+    bigint *biR, *tmp_biR;
+
+    /* Set up a temporary bigint context and transfer what we need between
+     * them. We need to do this since we want to keep the original modulus
+     * which is already in this context. This operation is only called when
+     * doing peer verification, and so is not expensive :-) */
+    BI_CTX *tmp_ctx = bi_initialize();
+    bi_set_mod(tmp_ctx, bi_clone(tmp_ctx, bim), BIGINT_M_OFFSET);
+    tmp_biR = bi_mod_power(tmp_ctx, 
+                bi_clone(tmp_ctx, bi), 
+                bi_clone(tmp_ctx, biexp));
+    biR = bi_clone(ctx, tmp_biR);
+    bi_free(tmp_ctx, tmp_biR);
+    bi_free_mod(tmp_ctx, BIGINT_M_OFFSET);
+    bi_terminate(tmp_ctx);
+
+    bi_free(ctx, bi);
+    bi_free(ctx, bim);
+    bi_free(ctx, biexp);
+    return biR;
+}
+#endif
+
+#ifdef CONFIG_BIGINT_CRT
+/**
+ * @brief Use the Chinese Remainder Theorem to quickly perform RSA decrypts.
+ *
+ * @param ctx [in]  The bigint session context.
+ * @param bi  [in]  The bigint to perform the exp/mod.
+ * @param dP [in] CRT's dP bigint
+ * @param dQ [in] CRT's dQ bigint
+ * @param p [in] CRT's p bigint
+ * @param q [in] CRT's q bigint
+ * @param qInv [in] CRT's qInv bigint
+ * @return The result of the CRT operation
+ */
+bigint *bi_crt(BI_CTX *ctx, bigint *bi,
+        bigint *dP, bigint *dQ,
+        bigint *p, bigint *q, bigint *qInv)
+{
+    bigint *m1, *m2, *h;
+
+    /* Montgomery has a condition the 0 < x, y < m and these products violate
+     * that condition. So disable Montgomery when using CRT */
+#if defined(CONFIG_BIGINT_MONTGOMERY)
+    ctx->use_classical = 1;
+#endif
+    ctx->mod_offset = BIGINT_P_OFFSET;
+    m1 = bi_mod_power(ctx, bi_copy(bi), dP);
+
+    ctx->mod_offset = BIGINT_Q_OFFSET;
+    m2 = bi_mod_power(ctx, bi, dQ);
+
+    h = bi_subtract(ctx, bi_add(ctx, m1, p), bi_copy(m2), NULL);
+    h = bi_multiply(ctx, h, qInv);
+    ctx->mod_offset = BIGINT_P_OFFSET;
+    h = bi_residue(ctx, h);
+#if defined(CONFIG_BIGINT_MONTGOMERY)
+    ctx->use_classical = 0;         /* reset for any further operation */
+#endif
+    return bi_add(ctx, m2, bi_multiply(ctx, q, h));
+}
+#endif
+/** @} */
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/bigint.h b/trunk/package/luci/libs/nixio/axTLS/crypto/bigint.h
new file mode 100644
index 00000000..2966a3ed
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/bigint.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BIGINT_HEADER
+#define BIGINT_HEADER
+
+#include "crypto.h"
+
+BI_CTX *bi_initialize(void);
+void bi_terminate(BI_CTX *ctx);
+void bi_permanent(bigint *bi);
+void bi_depermanent(bigint *bi);
+void bi_clear_cache(BI_CTX *ctx);
+void bi_free(BI_CTX *ctx, bigint *bi);
+bigint *bi_copy(bigint *bi);
+bigint *bi_clone(BI_CTX *ctx, const bigint *bi);
+void bi_export(BI_CTX *ctx, bigint *bi, uint8_t *data, int size);
+bigint *bi_import(BI_CTX *ctx, const uint8_t *data, int len);
+bigint *int_to_bi(BI_CTX *ctx, comp i);
+
+/* the functions that actually do something interesting */
+bigint *bi_add(BI_CTX *ctx, bigint *bia, bigint *bib);
+bigint *bi_subtract(BI_CTX *ctx, bigint *bia, 
+        bigint *bib, int *is_negative);
+bigint *bi_divide(BI_CTX *ctx, bigint *bia, bigint *bim, int is_mod);
+bigint *bi_multiply(BI_CTX *ctx, bigint *bia, bigint *bib);
+bigint *bi_mod_power(BI_CTX *ctx, bigint *bi, bigint *biexp);
+bigint *bi_mod_power2(BI_CTX *ctx, bigint *bi, bigint *bim, bigint *biexp);
+int bi_compare(bigint *bia, bigint *bib);
+void bi_set_mod(BI_CTX *ctx, bigint *bim, int mod_offset);
+void bi_free_mod(BI_CTX *ctx, int mod_offset);
+
+#ifdef CONFIG_SSL_FULL_MODE
+void bi_print(const char *label, bigint *bi);
+bigint *bi_str_import(BI_CTX *ctx, const char *data);
+#endif
+
+/**
+ * @def bi_mod
+ * Find the residue of B. bi_set_mod() must be called before hand.
+ */
+#define bi_mod(A, B)      bi_divide(A, B, ctx->bi_mod[ctx->mod_offset], 1)
+
+/**
+ * bi_residue() is technically the same as bi_mod(), but it uses the
+ * appropriate reduction technique (which is bi_mod() when doing classical
+ * reduction).
+ */
+#if defined(CONFIG_BIGINT_MONTGOMERY)
+#define bi_residue(A, B)         bi_mont(A, B)
+bigint *bi_mont(BI_CTX *ctx, bigint *bixy);
+#elif defined(CONFIG_BIGINT_BARRETT)
+#define bi_residue(A, B)         bi_barrett(A, B)
+bigint *bi_barrett(BI_CTX *ctx, bigint *bi);
+#else /* if defined(CONFIG_BIGINT_CLASSICAL) */
+#define bi_residue(A, B)         bi_mod(A, B)
+#endif
+
+#ifdef CONFIG_BIGINT_SQUARE
+bigint *bi_square(BI_CTX *ctx, bigint *bi);
+#else
+#define bi_square(A, B)     bi_multiply(A, bi_copy(B), B)
+#endif
+
+#ifdef CONFIG_BIGINT_CRT
+bigint *bi_crt(BI_CTX *ctx, bigint *bi,
+        bigint *dP, bigint *dQ,
+        bigint *p, bigint *q,
+        bigint *qInv);
+#endif
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/bigint_impl.h b/trunk/package/luci/libs/nixio/axTLS/crypto/bigint_impl.h
new file mode 100644
index 00000000..1483154a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/bigint_impl.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef BIGINT_IMPL_HEADER
+#define BIGINT_IMPL_HEADER
+
+/* Maintain a number of precomputed variables when doing reduction */
+#define BIGINT_M_OFFSET     0    /**< Normal modulo offset. */
+#ifdef CONFIG_BIGINT_CRT
+#define BIGINT_P_OFFSET     1    /**< p modulo offset. */
+#define BIGINT_Q_OFFSET     2    /**< q module offset. */
+#define BIGINT_NUM_MODS     3    /**< The number of modulus constants used. */
+#else
+#define BIGINT_NUM_MODS     1    
+#endif
+
+/* Architecture specific functions for big ints */
+#ifdef WIN32
+#define COMP_RADIX          4294967296i64         
+#define COMP_MAX            0xFFFFFFFFFFFFFFFFui64
+#else
+#define COMP_RADIX          4294967296ULL         /**< Max component + 1 */
+#define COMP_MAX            0xFFFFFFFFFFFFFFFFULL/**< (Max dbl comp -1) */
+#endif
+#define COMP_BIT_SIZE       32  /**< Number of bits in a component. */
+#define COMP_BYTE_SIZE      4   /**< Number of bytes in a component. */
+#define COMP_NUM_NIBBLES    8   /**< Used For diagnostics only. */
+
+typedef uint32_t comp;	        /**< A single precision component. */
+typedef uint64_t long_comp;     /**< A double precision component. */
+typedef int64_t slong_comp;     /**< A signed double precision component. */
+
+/**
+ * @struct  _bigint
+ * @brief A big integer basic object
+ */
+struct _bigint
+{
+    struct _bigint* next;       /**< The next bigint in the cache. */
+    short size;                 /**< The number of components in this bigint. */
+    short max_comps;            /**< The heapsize allocated for this bigint */
+    int refs;                   /**< An internal reference count. */
+    comp* comps;                /**< A ptr to the actual component data */
+};
+
+typedef struct _bigint bigint;  /**< An alias for _bigint */
+
+/**
+ * Maintains the state of the cache, and a number of variables used in 
+ * reduction.
+ */
+typedef struct /**< A big integer "session" context. */
+{
+    bigint *active_list;                    /**< Bigints currently used. */
+    bigint *free_list;                      /**< Bigints not used. */
+    bigint *bi_radix;                       /**< The radix used. */
+    bigint *bi_mod[BIGINT_NUM_MODS];        /**< modulus */
+
+#if defined(CONFIG_BIGINT_MONTGOMERY)
+    bigint *bi_RR_mod_m[BIGINT_NUM_MODS];   /**< R^2 mod m */
+    bigint *bi_R_mod_m[BIGINT_NUM_MODS];    /**< R mod m */
+    comp N0_dash[BIGINT_NUM_MODS];
+#elif defined(CONFIG_BIGINT_BARRETT)
+    bigint *bi_mu[BIGINT_NUM_MODS];         /**< Storage for mu */
+#endif
+    bigint *bi_normalised_mod[BIGINT_NUM_MODS]; /**< Normalised mod storage. */
+    bigint **g;                 /**< Used by sliding-window. */
+    int window;                 /**< The size of the sliding window */
+    int active_count;           /**< Number of active bigints. */
+    int free_count;             /**< Number of free bigints. */
+
+#ifdef CONFIG_BIGINT_MONTGOMERY
+    uint8_t use_classical;      /**< Use classical reduction. */
+#endif
+    uint8_t mod_offset;         /**< The mod offset we are using */
+} BI_CTX;
+
+#ifndef WIN32
+#define max(a,b) ((a)>(b)?(a):(b))  /**< Find the maximum of 2 numbers. */
+#define min(a,b) ((a)<(b)?(a):(b))  /**< Find the minimum of 2 numbers. */
+#endif
+
+#define PERMANENT           0x7FFF55AA  /**< A magic number for permanents. */
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/crypto.h b/trunk/package/luci/libs/nixio/axTLS/crypto/crypto.h
new file mode 100644
index 00000000..5c95f215
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/crypto.h
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file crypto.h
+ */
+
+#ifndef HEADER_CRYPTO_H
+#define HEADER_CRYPTO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "config.h"
+#include "os_port.h"
+#include "bigint_impl.h"
+#include "bigint.h"
+
+/* enable features based on a 'super-set' capbaility. */
+#if defined(CONFIG_SSL_FULL_MODE) 
+#define CONFIG_SSL_ENABLE_CLIENT
+#define CONFIG_SSL_CERT_VERIFICATION
+#elif defined(CONFIG_SSL_ENABLE_CLIENT)
+#define CONFIG_SSL_CERT_VERIFICATION
+#endif
+
+/**************************************************************************
+ * AES declarations 
+ **************************************************************************/
+
+#define AES_MAXROUNDS			14
+#define AES_BLOCKSIZE           16
+#define AES_IV_SIZE             16
+
+typedef struct aes_key_st 
+{
+    uint16_t rounds;
+    uint16_t key_size;
+    uint32_t ks[(AES_MAXROUNDS+1)*8];
+    uint8_t iv[AES_IV_SIZE];
+} AES_CTX;
+
+typedef enum
+{
+    AES_MODE_128,
+    AES_MODE_256
+} AES_MODE;
+
+void AES_set_key(AES_CTX *ctx, const uint8_t *key, 
+        const uint8_t *iv, AES_MODE mode);
+void AES_cbc_encrypt(AES_CTX *ctx, const uint8_t *msg, 
+        uint8_t *out, int length);
+void AES_cbc_decrypt(AES_CTX *ks, const uint8_t *in, uint8_t *out, int length);
+void AES_convert_key(AES_CTX *ctx);
+
+/**************************************************************************
+ * RC4 declarations 
+ **************************************************************************/
+
+typedef struct 
+{
+    uint8_t x, y, m[256];
+} RC4_CTX;
+
+void RC4_setup(RC4_CTX *s, const uint8_t *key, int length);
+void RC4_crypt(RC4_CTX *s, const uint8_t *msg, uint8_t *data, int length);
+
+/**************************************************************************
+ * SHA1 declarations 
+ **************************************************************************/
+
+#define SHA1_SIZE   20
+
+/*
+ *  This structure will hold context information for the SHA-1
+ *  hashing operation
+ */
+typedef struct 
+{
+    uint32_t Intermediate_Hash[SHA1_SIZE/4]; /* Message Digest */
+    uint32_t Length_Low;            /* Message length in bits */
+    uint32_t Length_High;           /* Message length in bits */
+    uint16_t Message_Block_Index;   /* Index into message block array   */
+    uint8_t Message_Block[64];      /* 512-bit message blocks */
+} SHA1_CTX;
+
+void SHA1_Init(SHA1_CTX *);
+void SHA1_Update(SHA1_CTX *, const uint8_t * msg, int len);
+void SHA1_Final(uint8_t *digest, SHA1_CTX *);
+
+/**************************************************************************
+ * MD2 declarations 
+ **************************************************************************/
+
+#define MD2_SIZE 16
+
+typedef struct
+{
+    unsigned char cksum[16];    /* checksum of the data block */
+    unsigned char state[48];    /* intermediate digest state */
+    unsigned char buffer[16];   /* data block being processed */
+    int left;                   /* amount of data in buffer */
+} MD2_CTX;
+
+EXP_FUNC void STDCALL MD2_Init(MD2_CTX *ctx);
+EXP_FUNC void STDCALL MD2_Update(MD2_CTX *ctx, const uint8_t *input, int ilen);
+EXP_FUNC void STDCALL MD2_Final(uint8_t *digest, MD2_CTX *ctx);
+
+/**************************************************************************
+ * MD5 declarations 
+ **************************************************************************/
+
+#define MD5_SIZE    16
+
+typedef struct 
+{
+  uint32_t state[4];        /* state (ABCD) */
+  uint32_t count[2];        /* number of bits, modulo 2^64 (lsb first) */
+  uint8_t buffer[64];       /* input buffer */
+} MD5_CTX;
+
+EXP_FUNC void STDCALL MD5_Init(MD5_CTX *);
+EXP_FUNC void STDCALL MD5_Update(MD5_CTX *, const uint8_t *msg, int len);
+EXP_FUNC void STDCALL MD5_Final(uint8_t *digest, MD5_CTX *);
+
+/**************************************************************************
+ * HMAC declarations 
+ **************************************************************************/
+void hmac_md5(const uint8_t *msg, int length, const uint8_t *key, 
+        int key_len, uint8_t *digest);
+void hmac_sha1(const uint8_t *msg, int length, const uint8_t *key, 
+        int key_len, uint8_t *digest);
+
+/**************************************************************************
+ * RSA declarations 
+ **************************************************************************/
+
+typedef struct 
+{
+    bigint *m;              /* modulus */
+    bigint *e;              /* public exponent */
+    bigint *d;              /* private exponent */
+#ifdef CONFIG_BIGINT_CRT
+    bigint *p;              /* p as in m = pq */
+    bigint *q;              /* q as in m = pq */
+    bigint *dP;             /* d mod (p-1) */
+    bigint *dQ;             /* d mod (q-1) */
+    bigint *qInv;           /* q^-1 mod p */
+#endif
+    int num_octets;
+    BI_CTX *bi_ctx;
+} RSA_CTX;
+
+void RSA_priv_key_new(RSA_CTX **rsa_ctx, 
+        const uint8_t *modulus, int mod_len,
+        const uint8_t *pub_exp, int pub_len,
+        const uint8_t *priv_exp, int priv_len
+#ifdef CONFIG_BIGINT_CRT
+      , const uint8_t *p, int p_len,
+        const uint8_t *q, int q_len,
+        const uint8_t *dP, int dP_len,
+        const uint8_t *dQ, int dQ_len,
+        const uint8_t *qInv, int qInv_len
+#endif
+        );
+void RSA_pub_key_new(RSA_CTX **rsa_ctx, 
+        const uint8_t *modulus, int mod_len,
+        const uint8_t *pub_exp, int pub_len);
+void RSA_free(RSA_CTX *ctx);
+int RSA_decrypt(const RSA_CTX *ctx, const uint8_t *in_data, uint8_t *out_data,
+        int is_decryption);
+bigint *RSA_private(const RSA_CTX *c, bigint *bi_msg);
+#if defined(CONFIG_SSL_CERT_VERIFICATION) || defined(CONFIG_SSL_GENERATE_X509_CERT)
+bigint *RSA_sign_verify(BI_CTX *ctx, const uint8_t *sig, int sig_len,
+        bigint *modulus, bigint *pub_exp);
+bigint *RSA_public(const RSA_CTX * c, bigint *bi_msg);
+int RSA_encrypt(const RSA_CTX *ctx, const uint8_t *in_data, uint16_t in_len, 
+        uint8_t *out_data, int is_signing);
+void RSA_print(const RSA_CTX *ctx);
+#endif
+
+/**************************************************************************
+ * RNG declarations 
+ **************************************************************************/
+EXP_FUNC void STDCALL RNG_initialize(const uint8_t *seed_buf, int size);
+EXP_FUNC void STDCALL RNG_terminate(void);
+EXP_FUNC void STDCALL get_random(int num_rand_bytes, uint8_t *rand_data);
+void get_random_NZ(int num_rand_bytes, uint8_t *rand_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif 
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/crypto_misc.c b/trunk/package/luci/libs/nixio/axTLS/crypto/crypto_misc.c
new file mode 100644
index 00000000..59b72ec0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/crypto_misc.c
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Some misc. routines to help things out
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include "crypto_misc.h"
+#ifdef CONFIG_WIN32_USE_CRYPTO_LIB
+#include "wincrypt.h"
+#endif
+
+#ifndef WIN32
+static int rng_fd = -1;
+#elif defined(CONFIG_WIN32_USE_CRYPTO_LIB)
+static HCRYPTPROV gCryptProv;
+#endif
+
+#if (!defined(CONFIG_USE_DEV_URANDOM) && !defined(CONFIG_WIN32_USE_CRYPTO_LIB))
+static uint64_t rng_num;
+#endif
+
+static int rng_ref_count;
+const char * const unsupported_str = "Error: Feature not supported\n";
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+/** 
+ * Retrieve a file and put it into memory
+ * @return The size of the file, or -1 on failure.
+ */
+int get_file(const char *filename, uint8_t **buf)
+{
+    int total_bytes = 0;
+    int bytes_read = 0; 
+    int filesize;
+    FILE *stream = fopen(filename, "rb");
+
+    if (stream == NULL)
+    {
+#ifdef CONFIG_SSL_FULL_MODE         
+        printf("file '%s' does not exist\n", filename); TTY_FLUSH();
+#endif
+        return -1;
+    }
+
+    /* Win CE doesn't support stat() */
+    fseek(stream, 0, SEEK_END);
+    filesize = ftell(stream);
+    *buf = (uint8_t *)malloc(filesize);
+    fseek(stream, 0, SEEK_SET);
+
+    do
+    {
+        bytes_read = fread(*buf+total_bytes, 1, filesize-total_bytes, stream);
+        total_bytes += bytes_read;
+    } while (total_bytes < filesize && bytes_read > 0);
+    
+    fclose(stream);
+    return filesize;
+}
+#endif
+
+/**
+ * Initialise the Random Number Generator engine.
+ * - On Win32 use the platform SDK's crypto engine.
+ * - On Linux use /dev/urandom
+ * - If none of these work then use a custom RNG.
+ */
+EXP_FUNC void STDCALL RNG_initialize(const uint8_t *seed_buf, int size)
+{
+    if (rng_ref_count == 0)
+    {
+#if !defined(WIN32) && defined(CONFIG_USE_DEV_URANDOM)
+        rng_fd = ax_open("/dev/urandom", O_RDONLY);
+#elif defined(WIN32) && defined(CONFIG_WIN32_USE_CRYPTO_LIB)
+        if (!CryptAcquireContext(&gCryptProv, 
+                          NULL, NULL, PROV_RSA_FULL, 0))
+        {
+            if (GetLastError() == NTE_BAD_KEYSET &&
+                    !CryptAcquireContext(&gCryptProv, 
+                           NULL, 
+                           NULL, 
+                           PROV_RSA_FULL, 
+                           CRYPT_NEWKEYSET))
+            {
+                printf("CryptoLib: %x\n", unsupported_str, GetLastError());
+                exit(1);
+            }
+        }
+#else   
+        /* help seed with the user's private key - this is a number that 
+           should be hard to find, due to the fact that it relies on knowing 
+           the private key */
+        int i;  
+
+        for (i = 0; i < size/(int)sizeof(uint64_t); i++)
+            rng_num ^= *((uint64_t *)&seed_buf[i*sizeof(uint64_t)]);
+
+        srand((long)&seed_buf);  /* use the stack ptr as another rnd seed */
+#endif
+    }
+
+    rng_ref_count++;
+}
+
+/**
+ * Terminate the RNG engine.
+ */
+EXP_FUNC void STDCALL RNG_terminate(void)
+{
+    if (--rng_ref_count == 0)
+    {
+#ifndef WIN32
+        close(rng_fd);
+#elif defined(CONFIG_WIN32_USE_CRYPTO_LIB)
+        CryptReleaseContext(gCryptProv, 0);
+#endif
+    }
+}
+
+/**
+ * Set a series of bytes with a random number. Individual bytes can be 0
+ */
+EXP_FUNC void STDCALL get_random(int num_rand_bytes, uint8_t *rand_data)
+{   
+#if !defined(WIN32) && defined(CONFIG_USE_DEV_URANDOM)
+    /* use the Linux default */
+    read(rng_fd, rand_data, num_rand_bytes);    /* read from /dev/urandom */
+#elif defined(WIN32) && defined(CONFIG_WIN32_USE_CRYPTO_LIB)
+    /* use Microsoft Crypto Libraries */
+    CryptGenRandom(gCryptProv, num_rand_bytes, rand_data);
+#else   /* nothing else to use, so use a custom RNG */
+    /* The method we use when we've got nothing better. Use RC4, time 
+       and a couple of random seeds to generate a random sequence */
+    RC4_CTX rng_ctx;
+    struct timeval tv;
+    uint64_t big_num1, big_num2;
+
+    gettimeofday(&tv, NULL);    /* yes I know we shouldn't do this */
+
+    /* all numbers by themselves are pretty simple, but combined should 
+     * be a challenge */
+    big_num1 = (uint64_t)tv.tv_sec*(tv.tv_usec+1); 
+    big_num2 = (uint64_t)rand()*big_num1;
+    big_num1 ^= rng_num;
+
+    memcpy(rand_data, &big_num1, sizeof(uint64_t));
+    if (num_rand_bytes > sizeof(uint64_t))
+        memcpy(&rand_data[8], &big_num2, sizeof(uint64_t));
+
+    if (num_rand_bytes > 16)
+    {
+        /* clear rest of data */
+        memset(&rand_data[16], 0, num_rand_bytes-16); 
+    }
+
+    RC4_setup(&rng_ctx, rand_data, 16); /* use as a key */
+    RC4_crypt(&rng_ctx, rand_data, rand_data, num_rand_bytes);
+    
+    /* use last 8 bytes for next time */
+    memcpy(&rng_num, &rand_data[num_rand_bytes-8], sizeof(uint64_t));    
+#endif
+}
+
+/**
+ * Set a series of bytes with a random number. Individual bytes are not zero.
+ */
+void get_random_NZ(int num_rand_bytes, uint8_t *rand_data)
+{
+    int i;
+    get_random(num_rand_bytes, rand_data);
+
+    for (i = 0; i < num_rand_bytes; i++)
+    {
+        while (rand_data[i] == 0)  /* can't be 0 */
+            rand_data[i] = (uint8_t)(rand());
+    }
+}
+
+/**
+ * Some useful diagnostic routines
+ */
+#if defined(CONFIG_SSL_FULL_MODE) || defined(CONFIG_DEBUG)
+int hex_finish;
+int hex_index;
+
+static void print_hex_init(int finish)
+{
+    hex_finish = finish;
+    hex_index = 0;
+}
+
+static void print_hex(uint8_t hex)
+{
+    static int column;
+
+    if (hex_index == 0)
+    {
+        column = 0;
+    }
+
+    printf("%02x ", hex);
+    if (++column == 8)
+    {
+        printf(": ");
+    }
+    else if (column >= 16)
+    {
+        printf("\n");
+        column = 0;
+    }
+
+    if (++hex_index >= hex_finish && column > 0)
+    {
+        printf("\n");
+    }
+}
+
+/**
+ * Spit out a blob of data for diagnostics. The data is is a nice column format
+ * for easy reading.
+ *
+ * @param format   [in]    The string (with possible embedded format characters)
+ * @param size     [in]    The number of numbers to print
+ * @param data     [in]    The start of data to use
+ * @param ...      [in]    Any additional arguments
+ */
+EXP_FUNC void STDCALL print_blob(const char *format, 
+        const uint8_t *data, int size, ...)
+{
+    int i;
+    char tmp[80];
+    va_list(ap);
+
+    va_start(ap, size);
+    sprintf(tmp, "%s\n", format);
+    vprintf(tmp, ap);
+    print_hex_init(size);
+    for (i = 0; i < size; i++)
+    {
+        print_hex(data[i]);
+    }
+
+    va_end(ap);
+    TTY_FLUSH();
+}
+#elif defined(WIN32)
+/* VC6.0 doesn't handle variadic macros */
+EXP_FUNC void STDCALL print_blob(const char *format, const unsigned char *data,
+        int size, ...) {}
+#endif
+
+#if defined(CONFIG_SSL_HAS_PEM) || defined(CONFIG_HTTP_HAS_AUTHORIZATION)
+/* base64 to binary lookup table */
+static const uint8_t map[128] =
+{
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255,  62, 255, 255, 255,  63,
+    52,  53,  54,  55,  56,  57,  58,  59,  60,  61, 255, 255,
+    255, 254, 255, 255, 255,   0,   1,   2,   3,   4,   5,   6,
+    7,   8,   9,  10,  11,  12,  13,  14,  15,  16,  17,  18,
+    19,  20,  21,  22,  23,  24,  25, 255, 255, 255, 255, 255,
+    255,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,
+    37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
+    49,  50,  51, 255, 255, 255, 255, 255
+};
+
+EXP_FUNC int STDCALL base64_decode(const char *in, int len,
+                    uint8_t *out, int *outlen)
+{
+    int g, t, x, y, z;
+    uint8_t c;
+    int ret = -1;
+
+    g = 3;
+    for (x = y = z = t = 0; x < len; x++)
+    {
+        if ((c = map[in[x]&0x7F]) == 0xff)
+            continue;
+
+        if (c == 254)   /* this is the end... */
+        {
+            c = 0;
+
+            if (--g < 0)
+                goto error;
+        }
+        else if (g != 3) /* only allow = at end */
+            goto error;
+
+        t = (t<<6) | c;
+
+        if (++y == 4)
+        {
+            out[z++] = (uint8_t)((t>>16)&255);
+
+            if (g > 1)
+                out[z++] = (uint8_t)((t>>8)&255);
+
+            if (g > 2)
+                out[z++] = (uint8_t)(t&255);
+
+            y = t = 0;
+        }
+    }
+
+    if (y != 0)
+        goto error;
+
+    if (outlen)
+        *outlen = z;
+    ret = 0;
+
+error:
+#ifdef CONFIG_SSL_FULL_MODE
+    if (ret < 0)
+        printf("Error: Invalid base64\n"); TTY_FLUSH();
+#endif
+    TTY_FLUSH();
+    return ret;
+
+}
+#endif
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/hmac.c b/trunk/package/luci/libs/nixio/axTLS/crypto/hmac.c
new file mode 100644
index 00000000..9199ff22
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/hmac.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * HMAC implementation - This code was originally taken from RFC2104
+ */
+
+#include <string.h>
+#include "crypto.h"
+
+/**
+ * Perform HMAC-MD5
+ */
+void hmac_md5(const uint8_t *msg, int length, const uint8_t *key, 
+        int key_len, uint8_t *digest)
+{
+    MD5_CTX context;
+    uint8_t k_ipad[64];
+    uint8_t k_opad[64];
+    int i;
+
+    memset(k_ipad, 0, sizeof k_ipad);
+    memset(k_opad, 0, sizeof k_opad);
+    memcpy(k_ipad, key, key_len);
+    memcpy(k_opad, key, key_len);
+
+    for (i = 0; i < 64; i++) 
+    {
+        k_ipad[i] ^= 0x36;
+        k_opad[i] ^= 0x5c;
+    }
+
+    MD5_Init(&context);
+    MD5_Update(&context, k_ipad, 64);
+    MD5_Update(&context, msg, length);
+    MD5_Final(digest, &context);
+    MD5_Init(&context);
+    MD5_Update(&context, k_opad, 64);
+    MD5_Update(&context, digest, MD5_SIZE);
+    MD5_Final(digest, &context);
+}
+
+/**
+ * Perform HMAC-SHA1
+ */
+void hmac_sha1(const uint8_t *msg, int length, const uint8_t *key, 
+        int key_len, uint8_t *digest)
+{
+    SHA1_CTX context;
+    uint8_t k_ipad[64];
+    uint8_t k_opad[64];
+    int i;
+
+    memset(k_ipad, 0, sizeof k_ipad);
+    memset(k_opad, 0, sizeof k_opad);
+    memcpy(k_ipad, key, key_len);
+    memcpy(k_opad, key, key_len);
+
+    for (i = 0; i < 64; i++) 
+    {
+        k_ipad[i] ^= 0x36;
+        k_opad[i] ^= 0x5c;
+    }
+
+    SHA1_Init(&context);
+    SHA1_Update(&context, k_ipad, 64);
+    SHA1_Update(&context, msg, length);
+    SHA1_Final(digest, &context);
+    SHA1_Init(&context);
+    SHA1_Update(&context, k_opad, 64);
+    SHA1_Update(&context, digest, SHA1_SIZE);
+    SHA1_Final(digest, &context);
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/md2.c b/trunk/package/luci/libs/nixio/axTLS/crypto/md2.c
new file mode 100644
index 00000000..bfcbd24b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/md2.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ *  RFC 1115/1319 compliant MD2 implementation
+ *  The MD2 algorithm was designed by Ron Rivest in 1989.
+ *
+ *  http://www.ietf.org/rfc/rfc1115.txt
+ *  http://www.ietf.org/rfc/rfc1319.txt
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "crypto.h"
+
+/**
+ * This code is only here to enable the verification of Verisign root
+ * certificates. So only enable it for verification mode.
+ */
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+
+static const uint8_t PI_SUBST[256] =
+{
+    0x29, 0x2E, 0x43, 0xC9, 0xA2, 0xD8, 0x7C, 0x01, 0x3D, 0x36,
+    0x54, 0xA1, 0xEC, 0xF0, 0x06, 0x13, 0x62, 0xA7, 0x05, 0xF3,
+    0xC0, 0xC7, 0x73, 0x8C, 0x98, 0x93, 0x2B, 0xD9, 0xBC, 0x4C,
+    0x82, 0xCA, 0x1E, 0x9B, 0x57, 0x3C, 0xFD, 0xD4, 0xE0, 0x16,
+    0x67, 0x42, 0x6F, 0x18, 0x8A, 0x17, 0xE5, 0x12, 0xBE, 0x4E,
+    0xC4, 0xD6, 0xDA, 0x9E, 0xDE, 0x49, 0xA0, 0xFB, 0xF5, 0x8E,
+    0xBB, 0x2F, 0xEE, 0x7A, 0xA9, 0x68, 0x79, 0x91, 0x15, 0xB2,
+    0x07, 0x3F, 0x94, 0xC2, 0x10, 0x89, 0x0B, 0x22, 0x5F, 0x21,
+    0x80, 0x7F, 0x5D, 0x9A, 0x5A, 0x90, 0x32, 0x27, 0x35, 0x3E,
+    0xCC, 0xE7, 0xBF, 0xF7, 0x97, 0x03, 0xFF, 0x19, 0x30, 0xB3,
+    0x48, 0xA5, 0xB5, 0xD1, 0xD7, 0x5E, 0x92, 0x2A, 0xAC, 0x56,
+    0xAA, 0xC6, 0x4F, 0xB8, 0x38, 0xD2, 0x96, 0xA4, 0x7D, 0xB6,
+    0x76, 0xFC, 0x6B, 0xE2, 0x9C, 0x74, 0x04, 0xF1, 0x45, 0x9D,
+    0x70, 0x59, 0x64, 0x71, 0x87, 0x20, 0x86, 0x5B, 0xCF, 0x65,
+    0xE6, 0x2D, 0xA8, 0x02, 0x1B, 0x60, 0x25, 0xAD, 0xAE, 0xB0,
+    0xB9, 0xF6, 0x1C, 0x46, 0x61, 0x69, 0x34, 0x40, 0x7E, 0x0F,
+    0x55, 0x47, 0xA3, 0x23, 0xDD, 0x51, 0xAF, 0x3A, 0xC3, 0x5C,
+    0xF9, 0xCE, 0xBA, 0xC5, 0xEA, 0x26, 0x2C, 0x53, 0x0D, 0x6E,
+    0x85, 0x28, 0x84, 0x09, 0xD3, 0xDF, 0xCD, 0xF4, 0x41, 0x81,
+    0x4D, 0x52, 0x6A, 0xDC, 0x37, 0xC8, 0x6C, 0xC1, 0xAB, 0xFA,
+    0x24, 0xE1, 0x7B, 0x08, 0x0C, 0xBD, 0xB1, 0x4A, 0x78, 0x88,
+    0x95, 0x8B, 0xE3, 0x63, 0xE8, 0x6D, 0xE9, 0xCB, 0xD5, 0xFE,
+    0x3B, 0x00, 0x1D, 0x39, 0xF2, 0xEF, 0xB7, 0x0E, 0x66, 0x58,
+    0xD0, 0xE4, 0xA6, 0x77, 0x72, 0xF8, 0xEB, 0x75, 0x4B, 0x0A,
+    0x31, 0x44, 0x50, 0xB4, 0x8F, 0xED, 0x1F, 0x1A, 0xDB, 0x99,
+    0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14
+};
+
+/*
+ * MD2 context setup
+ */
+EXP_FUNC void STDCALL MD2_Init(MD2_CTX *ctx)
+{
+    memset(ctx, 0, sizeof *ctx);
+}
+
+static void md2_process(MD2_CTX *ctx)
+{
+    int i, j;
+    uint8_t t = 0;
+
+    for (i = 0; i < 16; i++)
+    {
+        ctx->state[i + 16] = ctx->buffer[i];
+        ctx->state[i + 32] = ctx->buffer[i] ^ ctx->state[i];
+    }
+
+    for (i = 0; i < 18; i++)
+    {
+        for (j = 0; j < 48; j++)
+            t = (ctx->state[j] ^= PI_SUBST[t]);
+
+        t = (t + i) & 0xFF;
+    }
+
+    t = ctx->cksum[15];
+
+    for (i = 0; i < 16; i++)
+        t = (ctx->cksum[i] ^= PI_SUBST[ctx->buffer[i] ^ t]);
+}
+
+/*
+ * MD2 process buffer
+ */
+EXP_FUNC void STDCALL MD2_Update(MD2_CTX *ctx, const uint8_t *input, int ilen)
+{
+    int fill;
+
+    while (ilen > 0)
+    {
+        if (ctx->left + ilen > 16)
+            fill = 16 - ctx->left;
+        else
+            fill = ilen;
+
+        memcpy(ctx->buffer + ctx->left, input, fill);
+
+        ctx->left += fill;
+        input += fill;
+        ilen  -= fill;
+
+        if (ctx->left == 16)
+        {
+            ctx->left = 0;
+            md2_process(ctx);
+        }
+    }
+}
+
+/*
+ * MD2 final digest
+ */
+EXP_FUNC void STDCALL MD2_Final(uint8_t *output, MD2_CTX *ctx)
+{
+    int i;
+    uint8_t x;
+
+    x = (uint8_t)(16 - ctx->left);
+
+    for (i = ctx->left; i < 16; i++)
+        ctx->buffer[i] = x;
+
+    md2_process(ctx);
+
+    memcpy(ctx->buffer, ctx->cksum, 16);
+    md2_process(ctx);
+
+    memcpy(output, ctx->state, 16);
+}
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/md5.c b/trunk/package/luci/libs/nixio/axTLS/crypto/md5.c
new file mode 100644
index 00000000..b4f86cab
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/md5.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * This file implements the MD5 algorithm as defined in RFC1321
+ */
+
+#include <string.h>
+#include "crypto.h"
+
+/* Constants for MD5Transform routine.
+ */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+/* ----- static functions ----- */
+static void MD5Transform(uint32_t state[4], const uint8_t block[64]);
+static void Encode(uint8_t *output, uint32_t *input, uint32_t len);
+static void Decode(uint32_t *output, const uint8_t *input, uint32_t len);
+
+static const uint8_t PADDING[64] = 
+{
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* F, G, H and I are basic MD5 functions.
+ */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits.  */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+   Rotation is separate from addition to prevent recomputation.  */
+#define FF(a, b, c, d, x, s, ac) { \
+    (a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+    (a) = ROTATE_LEFT ((a), (s)); \
+    (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) { \
+    (a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+    (a) = ROTATE_LEFT ((a), (s)); \
+    (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) { \
+    (a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+    (a) = ROTATE_LEFT ((a), (s)); \
+    (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) { \
+    (a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+    (a) = ROTATE_LEFT ((a), (s)); \
+    (a) += (b); \
+  }
+
+/**
+ * MD5 initialization - begins an MD5 operation, writing a new ctx.
+ */
+EXP_FUNC void STDCALL MD5_Init(MD5_CTX *ctx)
+{
+    ctx->count[0] = ctx->count[1] = 0;
+
+    /* Load magic initialization constants.
+     */
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xefcdab89;
+    ctx->state[2] = 0x98badcfe;
+    ctx->state[3] = 0x10325476;
+}
+
+/**
+ * Accepts an array of octets as the next portion of the message.
+ */
+EXP_FUNC void STDCALL MD5_Update(MD5_CTX *ctx, const uint8_t * msg, int len)
+{
+    uint32_t x;
+    int i, partLen;
+
+    /* Compute number of bytes mod 64 */
+    x = (uint32_t)((ctx->count[0] >> 3) & 0x3F);
+
+    /* Update number of bits */
+    if ((ctx->count[0] += ((uint32_t)len << 3)) < ((uint32_t)len << 3))
+        ctx->count[1]++;
+    ctx->count[1] += ((uint32_t)len >> 29);
+
+    partLen = 64 - x;
+
+    /* Transform as many times as possible.  */
+    if (len >= partLen) 
+    {
+        memcpy(&ctx->buffer[x], msg, partLen);
+        MD5Transform(ctx->state, ctx->buffer);
+
+        for (i = partLen; i + 63 < len; i += 64)
+            MD5Transform(ctx->state, &msg[i]);
+
+        x = 0;
+    }
+    else
+        i = 0;
+
+    /* Buffer remaining input */
+    memcpy(&ctx->buffer[x], &msg[i], len-i);
+}
+
+/**
+ * Return the 128-bit message digest into the user's array
+ */
+EXP_FUNC void STDCALL MD5_Final(uint8_t *digest, MD5_CTX *ctx)
+{
+    uint8_t bits[8];
+    uint32_t x, padLen;
+
+    /* Save number of bits */
+    Encode(bits, ctx->count, 8);
+
+    /* Pad out to 56 mod 64.
+     */
+    x = (uint32_t)((ctx->count[0] >> 3) & 0x3f);
+    padLen = (x < 56) ? (56 - x) : (120 - x);
+    MD5_Update(ctx, PADDING, padLen);
+
+    /* Append length (before padding) */
+    MD5_Update(ctx, bits, 8);
+
+    /* Store state in digest */
+    Encode(digest, ctx->state, MD5_SIZE);
+}
+
+/**
+ * MD5 basic transformation. Transforms state based on block.
+ */
+static void MD5Transform(uint32_t state[4], const uint8_t block[64])
+{
+    uint32_t a = state[0], b = state[1], c = state[2], 
+             d = state[3], x[MD5_SIZE];
+
+    Decode(x, block, 64);
+
+    /* Round 1 */
+    FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+    FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+    FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+    FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+    FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+    FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+    FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+    FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+    FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+    FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+    FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+    FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+    FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+    FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+    FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+    FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+    /* Round 2 */
+    GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+    GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+    GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+    GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+    GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+    GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+    GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+    GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+    GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+    GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+    GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+    GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+    GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+    GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+    GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+    GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+    /* Round 3 */
+    HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+    HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+    HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+    HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+    HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+    HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+    HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+    HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+    HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+    HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+    HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+    HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+    HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+    HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+    HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+    HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+    /* Round 4 */
+    II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+    II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+    II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+    II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+    II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+    II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+    II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+    II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+    II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+    II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+    II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+    II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+    II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+    II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+    II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+    II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+}
+
+/**
+ * Encodes input (uint32_t) into output (uint8_t). Assumes len is
+ *   a multiple of 4.
+ */
+static void Encode(uint8_t *output, uint32_t *input, uint32_t len)
+{
+    uint32_t i, j;
+
+    for (i = 0, j = 0; j < len; i++, j += 4) 
+    {
+        output[j] = (uint8_t)(input[i] & 0xff);
+        output[j+1] = (uint8_t)((input[i] >> 8) & 0xff);
+        output[j+2] = (uint8_t)((input[i] >> 16) & 0xff);
+        output[j+3] = (uint8_t)((input[i] >> 24) & 0xff);
+    }
+}
+
+/**
+ *  Decodes input (uint8_t) into output (uint32_t). Assumes len is
+ *   a multiple of 4.
+ */
+static void Decode(uint32_t *output, const uint8_t *input, uint32_t len)
+{
+    uint32_t i, j;
+
+    for (i = 0, j = 0; j < len; i++, j += 4)
+        output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) |
+            (((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24);
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/rc4.c b/trunk/package/luci/libs/nixio/axTLS/crypto/rc4.c
new file mode 100644
index 00000000..57136b82
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/rc4.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * An implementation of the RC4/ARC4 algorithm.
+ * Originally written by Christophe Devine.
+ */
+
+#include <string.h>
+#include "crypto.h"
+
+/**
+ * Get ready for an encrypt/decrypt operation
+ */
+void RC4_setup(RC4_CTX *ctx, const uint8_t *key, int length)
+{
+    int i, j = 0, k = 0, a;
+    uint8_t *m;
+
+    ctx->x = 0;
+    ctx->y = 0;
+    m = ctx->m;
+
+    for (i = 0; i < 256; i++)
+        m[i] = i;
+
+    for (i = 0; i < 256; i++)
+    {
+        a = m[i];
+        j = (uint8_t)(j + a + key[k]);
+        m[i] = m[j]; 
+        m[j] = a;
+
+        if (++k >= length) 
+            k = 0;
+    }
+}
+
+/**
+ * Perform the encrypt/decrypt operation (can use it for either since
+ * this is a stream cipher).
+ */
+void RC4_crypt(RC4_CTX *ctx, const uint8_t *msg, uint8_t *out, int length)
+{ 
+    int i;
+    uint8_t *m, x, y, a, b;
+    out = (uint8_t *)msg; 
+
+    x = ctx->x;
+    y = ctx->y;
+    m = ctx->m;
+
+    for (i = 0; i < length; i++)
+    {
+        a = m[++x];
+        y += a;
+        m[x] = b = m[y];
+        m[y] = a;
+        out[i] ^= m[(uint8_t)(a + b)];
+    }
+
+    ctx->x = x;
+    ctx->y = y;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/rsa.c b/trunk/package/luci/libs/nixio/axTLS/crypto/rsa.c
new file mode 100644
index 00000000..31627bb3
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/rsa.c
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Implements the RSA public encryption algorithm. Uses the bigint library to
+ * perform its calculations.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+#include "crypto.h"
+
+void RSA_priv_key_new(RSA_CTX **ctx, 
+        const uint8_t *modulus, int mod_len,
+        const uint8_t *pub_exp, int pub_len,
+        const uint8_t *priv_exp, int priv_len
+#if CONFIG_BIGINT_CRT
+      , const uint8_t *p, int p_len,
+        const uint8_t *q, int q_len,
+        const uint8_t *dP, int dP_len,
+        const uint8_t *dQ, int dQ_len,
+        const uint8_t *qInv, int qInv_len
+#endif
+    )
+{
+    RSA_CTX *rsa_ctx;
+    BI_CTX *bi_ctx;
+    RSA_pub_key_new(ctx, modulus, mod_len, pub_exp, pub_len);
+    rsa_ctx = *ctx;
+    bi_ctx = rsa_ctx->bi_ctx;
+    rsa_ctx->d = bi_import(bi_ctx, priv_exp, priv_len);
+    bi_permanent(rsa_ctx->d);
+
+#ifdef CONFIG_BIGINT_CRT
+    rsa_ctx->p = bi_import(bi_ctx, p, p_len);
+    rsa_ctx->q = bi_import(bi_ctx, q, q_len);
+    rsa_ctx->dP = bi_import(bi_ctx, dP, dP_len);
+    rsa_ctx->dQ = bi_import(bi_ctx, dQ, dQ_len);
+    rsa_ctx->qInv = bi_import(bi_ctx, qInv, qInv_len);
+    bi_permanent(rsa_ctx->dP);
+    bi_permanent(rsa_ctx->dQ);
+    bi_permanent(rsa_ctx->qInv);
+    bi_set_mod(bi_ctx, rsa_ctx->p, BIGINT_P_OFFSET);
+    bi_set_mod(bi_ctx, rsa_ctx->q, BIGINT_Q_OFFSET);
+#endif
+}
+
+void RSA_pub_key_new(RSA_CTX **ctx, 
+        const uint8_t *modulus, int mod_len,
+        const uint8_t *pub_exp, int pub_len)
+{
+    RSA_CTX *rsa_ctx;
+    BI_CTX *bi_ctx;
+
+    if (*ctx)   /* if we load multiple certs, dump the old one */
+        RSA_free(*ctx);
+
+    bi_ctx = bi_initialize();
+    *ctx = (RSA_CTX *)calloc(1, sizeof(RSA_CTX));
+    rsa_ctx = *ctx;
+    rsa_ctx->bi_ctx = bi_ctx;
+    rsa_ctx->num_octets = (mod_len & 0xFFF0);
+    rsa_ctx->m = bi_import(bi_ctx, modulus, mod_len);
+    bi_set_mod(bi_ctx, rsa_ctx->m, BIGINT_M_OFFSET);
+    rsa_ctx->e = bi_import(bi_ctx, pub_exp, pub_len);
+    bi_permanent(rsa_ctx->e);
+}
+
+/**
+ * Free up any RSA context resources.
+ */
+void RSA_free(RSA_CTX *rsa_ctx)
+{
+    BI_CTX *bi_ctx;
+    if (rsa_ctx == NULL)                /* deal with ptrs that are null */
+        return;
+
+    bi_ctx = rsa_ctx->bi_ctx;
+
+    bi_depermanent(rsa_ctx->e);
+    bi_free(bi_ctx, rsa_ctx->e);
+    bi_free_mod(rsa_ctx->bi_ctx, BIGINT_M_OFFSET);
+
+    if (rsa_ctx->d)
+    {
+        bi_depermanent(rsa_ctx->d);
+        bi_free(bi_ctx, rsa_ctx->d);
+#ifdef CONFIG_BIGINT_CRT
+        bi_depermanent(rsa_ctx->dP);
+        bi_depermanent(rsa_ctx->dQ);
+        bi_depermanent(rsa_ctx->qInv);
+        bi_free(bi_ctx, rsa_ctx->dP);
+        bi_free(bi_ctx, rsa_ctx->dQ);
+        bi_free(bi_ctx, rsa_ctx->qInv);
+        bi_free_mod(rsa_ctx->bi_ctx, BIGINT_P_OFFSET);
+        bi_free_mod(rsa_ctx->bi_ctx, BIGINT_Q_OFFSET);
+#endif
+    }
+
+    bi_terminate(bi_ctx);
+    free(rsa_ctx);
+}
+
+/**
+ * @brief Use PKCS1.5 for decryption/verification.
+ * @param ctx [in] The context
+ * @param in_data [in] The data to encrypt (must be < modulus size-11)
+ * @param out_data [out] The encrypted data.
+ * @param is_decryption [in] Decryption or verify operation.
+ * @return  The number of bytes that were originally encrypted. -1 on error.
+ * @see http://www.rsasecurity.com/rsalabs/node.asp?id=2125
+ */
+int RSA_decrypt(const RSA_CTX *ctx, const uint8_t *in_data, 
+                            uint8_t *out_data, int is_decryption)
+{
+    const int byte_size = ctx->num_octets;
+    int i, size;
+    bigint *decrypted_bi, *dat_bi;
+    uint8_t *block = (uint8_t *)alloca(byte_size);
+
+    memset(out_data, 0, byte_size); /* initialise */
+
+    /* decrypt */
+    dat_bi = bi_import(ctx->bi_ctx, in_data, byte_size);
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    decrypted_bi = is_decryption ?  /* decrypt or verify? */
+            RSA_private(ctx, dat_bi) : RSA_public(ctx, dat_bi);
+#else   /* always a decryption */
+    decrypted_bi = RSA_private(ctx, dat_bi);
+#endif
+
+    /* convert to a normal block */
+    bi_export(ctx->bi_ctx, decrypted_bi, block, byte_size);
+
+    i = 10; /* start at the first possible non-padded byte */
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    if (is_decryption == 0) /* PKCS1.5 signing pads with "0xff"s */
+    {
+        while (block[i++] == 0xff && i < byte_size);
+
+        if (block[i-2] != 0xff)
+            i = byte_size;     /*ensure size is 0 */   
+    }
+    else                    /* PKCS1.5 encryption padding is random */
+#endif
+    {
+        while (block[i++] && i < byte_size);
+    }
+    size = byte_size - i;
+
+    /* get only the bit we want */
+    if (size > 0)
+        memcpy(out_data, &block[i], size);
+    
+    return size ? size : -1;
+}
+
+/**
+ * Performs m = c^d mod n
+ */
+bigint *RSA_private(const RSA_CTX *c, bigint *bi_msg)
+{
+#ifdef CONFIG_BIGINT_CRT
+    return bi_crt(c->bi_ctx, bi_msg, c->dP, c->dQ, c->p, c->q, c->qInv);
+#else
+    BI_CTX *ctx = c->bi_ctx;
+    ctx->mod_offset = BIGINT_M_OFFSET;
+    return bi_mod_power(ctx, bi_msg, c->d);
+#endif
+}
+
+#ifdef CONFIG_SSL_FULL_MODE
+/**
+ * Used for diagnostics.
+ */
+void RSA_print(const RSA_CTX *rsa_ctx) 
+{
+    if (rsa_ctx == NULL)
+        return;
+
+    printf("-----------------   RSA DEBUG   ----------------\n");
+    printf("Size:\t%d\n", rsa_ctx->num_octets);
+    bi_print("Modulus", rsa_ctx->m);
+    bi_print("Public Key", rsa_ctx->e);
+    bi_print("Private Key", rsa_ctx->d);
+}
+#endif
+
+#if defined(CONFIG_SSL_CERT_VERIFICATION) || defined(CONFIG_SSL_GENERATE_X509_CERT)
+/**
+ * Performs c = m^e mod n
+ */
+bigint *RSA_public(const RSA_CTX * c, bigint *bi_msg)
+{
+    c->bi_ctx->mod_offset = BIGINT_M_OFFSET;
+    return bi_mod_power(c->bi_ctx, bi_msg, c->e);
+}
+
+/**
+ * Use PKCS1.5 for encryption/signing.
+ * see http://www.rsasecurity.com/rsalabs/node.asp?id=2125
+ */
+int RSA_encrypt(const RSA_CTX *ctx, const uint8_t *in_data, uint16_t in_len, 
+        uint8_t *out_data, int is_signing)
+{
+    int byte_size = ctx->num_octets;
+    int num_pads_needed = byte_size-in_len-3;
+    bigint *dat_bi, *encrypt_bi;
+
+    /* note: in_len+11 must be > byte_size */
+    out_data[0] = 0;     /* ensure encryption block is < modulus */
+
+    if (is_signing)
+    {
+        out_data[1] = 1;        /* PKCS1.5 signing pads with "0xff"'s */
+        memset(&out_data[2], 0xff, num_pads_needed);
+    }
+    else /* randomize the encryption padding with non-zero bytes */   
+    {
+        out_data[1] = 2;
+        get_random_NZ(num_pads_needed, &out_data[2]);
+    }
+
+    out_data[2+num_pads_needed] = 0;
+    memcpy(&out_data[3+num_pads_needed], in_data, in_len);
+
+    /* now encrypt it */
+    dat_bi = bi_import(ctx->bi_ctx, out_data, byte_size);
+    encrypt_bi = is_signing ? RSA_private(ctx, dat_bi) : 
+                              RSA_public(ctx, dat_bi);
+    bi_export(ctx->bi_ctx, encrypt_bi, out_data, byte_size);
+
+    /* save a few bytes of memory */
+    bi_clear_cache(ctx->bi_ctx);
+    return byte_size;
+}
+
+#endif  /* CONFIG_SSL_CERT_VERIFICATION */
diff --git a/trunk/package/luci/libs/nixio/axTLS/crypto/sha1.c b/trunk/package/luci/libs/nixio/axTLS/crypto/sha1.c
new file mode 100644
index 00000000..be191007
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/crypto/sha1.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * SHA1 implementation - as defined in FIPS PUB 180-1 published April 17, 1995.
+ * This code was originally taken from RFC3174
+ */
+
+#include <string.h>
+#include "crypto.h"
+
+/*
+ *  Define the SHA1 circular left shift macro
+ */
+#define SHA1CircularShift(bits,word) \
+                (((word) << (bits)) | ((word) >> (32-(bits))))
+
+/* ----- static functions ----- */
+static void SHA1PadMessage(SHA1_CTX *ctx);
+static void SHA1ProcessMessageBlock(SHA1_CTX *ctx);
+
+/**
+ * Initialize the SHA1 context 
+ */
+void SHA1_Init(SHA1_CTX *ctx)
+{
+    ctx->Length_Low             = 0;
+    ctx->Length_High            = 0;
+    ctx->Message_Block_Index    = 0;
+    ctx->Intermediate_Hash[0]   = 0x67452301;
+    ctx->Intermediate_Hash[1]   = 0xEFCDAB89;
+    ctx->Intermediate_Hash[2]   = 0x98BADCFE;
+    ctx->Intermediate_Hash[3]   = 0x10325476;
+    ctx->Intermediate_Hash[4]   = 0xC3D2E1F0;
+}
+
+/**
+ * Accepts an array of octets as the next portion of the message.
+ */
+void SHA1_Update(SHA1_CTX *ctx, const uint8_t *msg, int len)
+{
+    while (len--)
+    {
+        ctx->Message_Block[ctx->Message_Block_Index++] = (*msg & 0xFF);
+        ctx->Length_Low += 8;
+
+        if (ctx->Length_Low == 0)
+            ctx->Length_High++;
+
+        if (ctx->Message_Block_Index == 64)
+            SHA1ProcessMessageBlock(ctx);
+
+        msg++;
+    }
+}
+
+/**
+ * Return the 160-bit message digest into the user's array
+ */
+void SHA1_Final(uint8_t *digest, SHA1_CTX *ctx)
+{
+    int i;
+
+    SHA1PadMessage(ctx);
+    memset(ctx->Message_Block, 0, 64);
+    ctx->Length_Low = 0;    /* and clear length */
+    ctx->Length_High = 0;
+
+    for  (i = 0; i < SHA1_SIZE; i++)
+    {
+        digest[i] = ctx->Intermediate_Hash[i>>2] >> 8 * ( 3 - ( i & 0x03 ) );
+    }
+}
+
+/**
+ * Process the next 512 bits of the message stored in the array.
+ */
+static void SHA1ProcessMessageBlock(SHA1_CTX *ctx)
+{
+    const uint32_t K[] =    {       /* Constants defined in SHA-1   */
+                            0x5A827999,
+                            0x6ED9EBA1,
+                            0x8F1BBCDC,
+                            0xCA62C1D6
+                            };
+    int        t;                 /* Loop counter                */
+    uint32_t      temp;              /* Temporary word value        */
+    uint32_t      W[80];             /* Word sequence               */
+    uint32_t      A, B, C, D, E;     /* Word buffers                */
+
+    /*
+     *  Initialize the first 16 words in the array W
+     */
+    for  (t = 0; t < 16; t++)
+    {
+        W[t] = ctx->Message_Block[t * 4] << 24;
+        W[t] |= ctx->Message_Block[t * 4 + 1] << 16;
+        W[t] |= ctx->Message_Block[t * 4 + 2] << 8;
+        W[t] |= ctx->Message_Block[t * 4 + 3];
+    }
+
+    for (t = 16; t < 80; t++)
+    {
+       W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
+    }
+
+    A = ctx->Intermediate_Hash[0];
+    B = ctx->Intermediate_Hash[1];
+    C = ctx->Intermediate_Hash[2];
+    D = ctx->Intermediate_Hash[3];
+    E = ctx->Intermediate_Hash[4];
+
+    for (t = 0; t < 20; t++)
+    {
+        temp =  SHA1CircularShift(5,A) +
+                ((B & C) | ((~B) & D)) + E + W[t] + K[0];
+        E = D;
+        D = C;
+        C = SHA1CircularShift(30,B);
+
+        B = A;
+        A = temp;
+    }
+
+    for (t = 20; t < 40; t++)
+    {
+        temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
+        E = D;
+        D = C;
+        C = SHA1CircularShift(30,B);
+        B = A;
+        A = temp;
+    }
+
+    for (t = 40; t < 60; t++)
+    {
+        temp = SHA1CircularShift(5,A) +
+               ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
+        E = D;
+        D = C;
+        C = SHA1CircularShift(30,B);
+        B = A;
+        A = temp;
+    }
+
+    for (t = 60; t < 80; t++)
+    {
+        temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
+        E = D;
+        D = C;
+        C = SHA1CircularShift(30,B);
+        B = A;
+        A = temp;
+    }
+
+    ctx->Intermediate_Hash[0] += A;
+    ctx->Intermediate_Hash[1] += B;
+    ctx->Intermediate_Hash[2] += C;
+    ctx->Intermediate_Hash[3] += D;
+    ctx->Intermediate_Hash[4] += E;
+    ctx->Message_Block_Index = 0;
+}
+
+/*
+ * According to the standard, the message must be padded to an even
+ * 512 bits.  The first padding bit must be a '1'.  The last 64
+ * bits represent the length of the original message.  All bits in
+ * between should be 0.  This function will pad the message
+ * according to those rules by filling the Message_Block array
+ * accordingly.  It will also call the ProcessMessageBlock function
+ * provided appropriately.  When it returns, it can be assumed that
+ * the message digest has been computed.
+ *
+ * @param ctx [in, out] The SHA1 context
+ */
+static void SHA1PadMessage(SHA1_CTX *ctx)
+{
+    /*
+     *  Check to see if the current message block is too small to hold
+     *  the initial padding bits and length.  If so, we will pad the
+     *  block, process it, and then continue padding into a second
+     *  block.
+     */
+    if (ctx->Message_Block_Index > 55)
+    {
+        ctx->Message_Block[ctx->Message_Block_Index++] = 0x80;
+        while(ctx->Message_Block_Index < 64)
+        {
+            ctx->Message_Block[ctx->Message_Block_Index++] = 0;
+        }
+
+        SHA1ProcessMessageBlock(ctx);
+
+        while (ctx->Message_Block_Index < 56)
+        {
+            ctx->Message_Block[ctx->Message_Block_Index++] = 0;
+        }
+    }
+    else
+    {
+        ctx->Message_Block[ctx->Message_Block_Index++] = 0x80;
+        while(ctx->Message_Block_Index < 56)
+        {
+
+            ctx->Message_Block[ctx->Message_Block_Index++] = 0;
+        }
+    }
+
+    /*
+     *  Store the message length as the last 8 octets
+     */
+    ctx->Message_Block[56] = ctx->Length_High >> 24;
+    ctx->Message_Block[57] = ctx->Length_High >> 16;
+    ctx->Message_Block[58] = ctx->Length_High >> 8;
+    ctx->Message_Block[59] = ctx->Length_High;
+    ctx->Message_Block[60] = ctx->Length_Low >> 24;
+    ctx->Message_Block[61] = ctx->Length_Low >> 16;
+    ctx->Message_Block[62] = ctx->Length_Low >> 8;
+    ctx->Message_Block[63] = ctx->Length_Low;
+    SHA1ProcessMessageBlock(ctx);
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/docsrc/Makefile b/trunk/package/luci/libs/nixio/axTLS/docsrc/Makefile
new file mode 100644
index 00000000..28266869
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/docsrc/Makefile
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../config/makefile.conf
+
+all:
+
+doco:
+	doxygen ./axTLS.dox
+
+clean::
+	@-rm -fr html *~
diff --git a/trunk/package/luci/libs/nixio/axTLS/docsrc/axTLS.dox b/trunk/package/luci/libs/nixio/axTLS/docsrc/axTLS.dox
new file mode 100644
index 00000000..d9959b21
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/docsrc/axTLS.dox
@@ -0,0 +1,1237 @@
+# Doxyfile 1.4.5
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = axTLS
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = 
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = NO
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is YES.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = ../bindings/csharp/axTLS.cs ../bindings/java/SSL.java ../bindings/java/SSLUtil.java ../bindings/java/SSLCTX.java ../bindings/java/SSLServer.java ../bindings/java/SSLClient.java ../bindings/java/SSLReadHolder.java ../ssl/ssl.h ../crypto/bigint.c ../crypto/bigint.h 
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+
+FILE_PATTERNS          = 
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = images
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = doco_footer.html 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = YES
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = YES
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = CONFIG_SSL_CERT_VERIFICATION CONFIG_SSL_ENABLE_CLIENT CONFIG_SSL_GENERATE_X509_CERT CONFIG_BIGINT_MONTGOMERY CONFIG_BIGINT_BARRETT CONFIG_BIGINT_CRT EXP_FUNC="" STDCALL=""
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = NO
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = NO
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = NO
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = NO
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = NO
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = NO
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = NO
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that a graph may be further truncated if the graph's 
+# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
+# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
+# the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/trunk/package/luci/libs/nixio/axTLS/docsrc/doco_footer.html b/trunk/package/luci/libs/nixio/axTLS/docsrc/doco_footer.html
new file mode 100644
index 00000000..20c4e70b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/docsrc/doco_footer.html
@@ -0,0 +1,3 @@
+<p></p>
+<p align="center"><img src="../images/tsbasbw.gif" width="1000" height="7"></p>
+<CITE>Copyright <sup>©</sup> 2007 Cameron Rich</CITE>
diff --git a/trunk/package/luci/libs/nixio/axTLS/docsrc/images/axolotl.jpg b/trunk/package/luci/libs/nixio/axTLS/docsrc/images/axolotl.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7352bbae836739e469c837a7fdb8114f786b2130
GIT binary patch
literal 3041
zcmbW3cTm%58pnSjB!MU;N>O@=NRbjk3lRun2%sWhXhPVfgr;<mzS7stQlv`}6{IUw
z1*9BBLX#RgoC^d3NSBT%$L`+j+|1n{clZ6y`#$r|cjlSTAMZT#oQ$8$0GtN8`nmw<
z)IXjYIQb3;-^6QQ7a@}Eo!vd|dpNm}eMI!#?d3$wP;v?=;A9Gj0$89>7!<++gTdge
zEO0g+cDA!;+4#?Maq@@=h=~dd2n&fzqGiM-6eNU%uV~0BD63%9F=8@WI+|)aXf=!~
zh!qZJJHy7u&d#Tb6h^B4&pP=4$^`%r1oVf1e+t9|W`;mvEUfS|AOQSlc6$Gr{!7RS
zFoD2eCT1`M!pwZyCiFA|m=Tb3q9|?Xd1G6cm=~8~c;X8d@oSYW+$MvYNVJ`I1S_0}
z_rgWKOA?nQrKFXVRaDh5>N?l)x&%FagF8f1Gjj{eyY>!bM<-_&S07)$2mS$pL6K3>
zF+V^0g_4w<lA4zOBqK97?`3{LVNr2ORrQ;<?`mr6-nX`WXs32`c6ATYhDS!n#wR9c
z=jihbjK!tp&s$%%cXs#o4-StIr^rmq%wT5N@5mq~|I-6TFhfL9&~w_xFk7$lVv6A`
zT-Op`RJO2+qfIus?Ysx!JV>S4OIyEF{{j8qF-QDg(0?)ig?!QsAXoq*;06Yr(j!1%
z1n6WEI12`yKEMb-3)nvbB!TBlVeo%1%vVZSkpMPR1+2MGqWR7gFczIJUnDw#SKbKt
z35Mb&hWO0KGyJeTHI!NRIcFpiNog)_MsCx>3cuve&<vX=3!YsREq^^68F97*bu{QJ
zW))l-T(m#cFVL0k9v8_m^yIt|2*;X;<9f?xM!RLv`=O*j7yi8VhYn;I44PlhCb5IJ
zIL6yAr03vk4mV4B(`2X@!n37zmuWf9COQkDY<hB{b<yMqVw%d*QcL(T-YC;KDI5X>
zY8_v>&G~*t+o4e7x?2ZhL>0|&)UBM;us1U2y+hqnr1zl8MlP&TeKtmuu@xzyFTbtD
z5^IB{EM;G3EEpmmqXCXWW)tsNQi5e`*4;)8rcd85vLma>Z~`hhbuC-<;K-!GCL)Jh
zEBdKs`V}XSz67XOgOjI5xZvM}`wGkrmbP7O4@qf@mW70RxAxL?nSpqg6F{rH(V+zU
zM9oUqH*GSU1=8P5FsH)k%e%`v%Opgmb1$`hxlFVsx*(Gne`&s60CX^#buRD(cy!fq
z?6)oX!6DzotoaO!ym?jfI*Z`9ATNt<^MRGTpBejEn0uX3a@0k?UfR=k;!}#J8a-_l
zYnQAqQ#}w7Wjgvx=tA&otci52@7iF4ZCmTl>vRq6omFR>h`1mj@&@FdKc8HKED|SM
zMlufH?L)6>f8(HW^EzHJ<I64%wh-#So1<U^iz~~J5fal%wPQR^Rnd9)k|Y&F)D`sU
zz+sTzQ&RCh1FbhENJ<{>67AiY3`3|uBIluZaA@EwfvIt-w0T`>aDlYNwO<imnw*ja
zt#e@8%|`>}bt8u5jd?o?J5z}+0Ypf^v>Um<d)gsBXuoCe^~^>dw)Bp7T;JrUnMvzb
zZOxlA>YX1AXRzSoc6;S+PfG*!b-#Bl4mf(`WIk3P$!y@`mh#*FWASuji|hQ)P;;gW
zG2T;z@(}-{Z7ZsN>A9r3jsTJsG4rcg>g4S#r;PZ;G_CH;QGx>_55i?%RwguO_13z+
zW_|k@&LP~Rb$2XP)hDyznX0_qa8N;BwM;!XL9;zrDz-^9hOzR%4DZcR)Nugs`?NJ)
z`ek5Vqo8}i-7O6lL>Zu8*3W(XI7x>4GpJ9JEdf0oLb&Guzvkar$Q<hiI~wD1(a(vJ
z!f3F&uTXit*Y!1L)x>+6#c3DYor~H^)#;IDGE?``QB?^dO#pSy8^8!k*Ga`&_)QNa
zd`O!9nKGw)*tOuPfQqDD*w|RUMN81N+nj!%%TIzR%cOi&$>-ANhu*)g4IW^RJZ9t?
zdyO*sxmQQBAD$mtqqMtL0=c65+TcSo6Q?I{$zT1|X3m;j?Y+;&qbDFRb2ReXjbyv5
z=Evx0in1l^6>c2+ZR?|C(~C;&ZtTDTMydE?%q+56E~IgSy<ySiLWi(T(3k_+?|FV;
zSGAtaL>p&3zw^6TUVk6j)frH~&<POD_Qr*eZPnJ5?;T~#spr~|JeG4)vmon%IuF#?
znl{KytuFffB|q+cC%3lrBh3&{a`;M^D}NI;{wbgIirIsogf<s?-=G_N>EfNuGP*;$
zePNy!P@BM|KyH1D?Ls+6J8Ng-er#uAZZxR`Xzp*)D9u^#AiCC;TK^J)_TXojbr~7r
zzJ53XaB6v0adVg4SjZJMkqk01C3f9|c6g^!bJSy?wUNeDGJ8W0tp0rFd>HTL&#=W?
zg2Sba=GQu6X735!iW;+VyyLo^WL5W#WAS=UX7Z!V%=d)nIspX=waeB?NroL_;V&T6
zt!D-?8x@E5ttq#9vJ+afZK9NI6E54I04sS`(->d16F~S|nFhN|DTc&{2}^ceoc}R!
zuLb-pXgyDMkQiusJ5=Z)OJi;LaZeo?Z|Z1f->*4R>XawF8Fgq<>7-Xt6JfiTasm*H
zwELMiamTvad2>z@@;r>b2-zDqtH~;6deu_QT9?9i_g08WSI49@db4D8jO*gE*Qo)0
zF3EPW@7pY<S>aXKSv`#odI#O&OD2ggeKJWdn_LsHS22g5=g22W-yDJod-*G7Q)e(2
zuS{1eSM5I_kT5M+#i1ol@%o{rNd{MJ+0I$Rxu)7>qtCv2zfIZBtvPz4P6x>kkJk8B
z-J&J<CxYx>XuVb`d*wGA<;3B+TOS--izD3pYJMiZFzd|?)a!ZP%3gtkIATQPdUnp=
ztj%21s>#ysY|6z=NnA!V084S|9F2h0Uy@t<N?8;!ZTWO9Nc_BYeJHwh`<AF;gB9*_
z#D`kI+(yu~1#kK)#ka1vWp-y|t!b=a`jw2t?W8t9h%R2ZKw>w0pjfVJlx*VQb)aQ}
zUQ3)CSFf=1I<QMuw-SHalIPym>RJ_s$hqkb59mKI_4&c>Zsqi(i^3F+Q{Lc(5P7cD
z^3w1Wivc4HCGht^u~tb6^&>m$qLxjV&m9NTPn}CUx1m#ktVOOhiD&L_^577Szxwac
zw~JGr$g)>$5UXkj%QbuaJ;X{<r~8<SugZl&T}@n4Cg}TV7Y^MK{NfQ8)C7(wqh0BI
zw8Cm7rC!3S7g9c3q_tvgS12{57+;@BKs<c3l()rJ2i`A1Z6qvOs_RmWmwE;R;<=g?
z+iJ=c2bNV-EKh)_%s~vg6^i;^t<_y@>^0ui$nMi_gG{ijvO44YZFF;e-rh?P*gO4<
zKVe(17IiCQB=Qkgm4nhcD;idd*ge(qQn}3$(n$;_d$y4#R^AfOs=3x^;Y8w^rT36?
zDm)H9yeKmt7WNZN<h#=F-Ai2$)YS^lNz4wtib$m<xXJK3Fb}|Fivw)k<+Lp}bHij@
zN7DwaqBB0m|N2&2%QuKaTesQE`{f*gBD-?-rMr<QKTKQ+G&p`hl9vU8V#MOY@`7j2
zl!m10P=MAf!`kRa&b<Kc#}wgOXTT~@zgY)|zH@89U0#@<g$vZk5wVV@;sF&8_-DjB
z?kp})u))B_>=WM0;7?)L70FDjXJOIvGbtc}M5qZ0C-AL5W|Tn>-g(X{+`5+quqaA0
zeJe;yqcG7a!21E+l^7#uuzDzTD1?DJG=lJKre<KqB|(D+hJ7l1EjYfkNm66^G)|If
e94`m~AY8k~I3SLI=K@yk{?qpK$4Ui0nfM1W@MwPk

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/docsrc/images/tsbasbw.gif b/trunk/package/luci/libs/nixio/axTLS/docsrc/images/tsbasbw.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cf03b121bf9662b954351cf22aff54b305d0cba4
GIT binary patch
literal 2481
zcmb`Gc~leE9>?z_0YgBWum)r&vMBn1K~d@wkSz!lB1iz2C}aQ?8-W%|T>|<raiPIb
zVFYc}uoM*#H>6kzOH~{(BAYt}7wXaX0*FwLb>5w{=e+0tZ_b>1=H7ho@Av)uz9*rA
zki|<jUO{GpDL_3;CX>tMdU<)FD9Y#aMIsS~VQFb;GMP-NRN^>ZQ&ZE_)I<=3R;wKx
z92^=N8XX<g>2xGX;!ujB1Qfv)!w6Uc01N;e00ICKz9>p!7>VN~L69gQP(Wf(iQ@1B
z$4Cs|a0{!zpD=iWk_1lTfWT24ZV8OQ;R+7{uJ1(XI}z|)-wA`)p_l+9315^XG3bb-
zIsu#jupdsK7!;5gP67<pgpDzP!D=K*Q0?J2isEn!O#qDY3T03Ol~9dhP!An{iiDCV
z^bK7S(3Tzv5<(;Z_0T%}hE}0(Jrb%Xr@-I|Jcn0cW$Ge<!I@zg4oM&zTp<P=-v1!|
zmj~kMk)UbljIu~=p${D12YMt_Z-`=mc+dd^hSnh=HGUWl>_(yLBZA3%g7j%b6cVOK
zLaC|4h$tl3Qg2T0o{ES<g3JWP4Bb;muq&J$p`V>TB5HPU-jJM1<CBOeq`z{Y_@Qq-
zl78ec`M=Wm8%dubG(@3Nvxh6Z{eOC#{$S`Uc~UF&p8!k}AWT~kUra-2bf&qOFGdRK
z2qT*7y|MFvl?Th$3naHG=+^G;a&Y4Me!Bgv-loQpHU!~10xkdK&4QUOu1Zny^P4II
zL*}3n-@TxaY2zgo#K-^xwL8A|%D7u3vcUW31)IBS+VPn`1a2Kw4GGS0J$%?dN>6tv
zA{FDFEOC{rAdb$PesyU<-@(sjE;ewyyd~7o!eAs$syx?qz{uCoJ=#%5s|mPb=p}PZ
zyWNd!#(IB}@}pEn{)Hcnnw=Bt_N<E!zIn+d31Kt#cjukkh%o3UY17ROZyqC6#k1u=
zc4d9#5(`7|d$TWNG&}zx3~@wWbPRHSVUc!ai5K|4akIMDZHVz0m;wyXLy_8aWYQ}2
z!DE}DfBpH<K3K>9n&xdN+-Qu5`2l&>+GwePMT06Oqw=Cvey~$$G0jZ0PaAI}@>3=;
zV=z(L7N^4g+yzdIwL-T0_a)yjoCa3YS>n)Wx}CLSq97Q#ypF-?kjrQxN8)<v&I^@*
zZoKWnkE_{H)!LZP@L%tO4GYDsSim`6ZyEdb_etyIlYS+%gWmjnm65LuY~q*z%`w_?
zfNYXWzH(UqcA3t8y~(CYbwow5B_?%M@DK^zOE$Q(C9(vBvS{f&DGnAgZY;~wVnev8
z<OL_#Y^jpZcxT-TRL%-AB{^>7xx7jp<qYy^Y+<@fPNs9i{p~q(bglGwS~S=$3f^x;
zKNHemS&CX~PZX5LBt?fiS?WO6x$Unu7u7Bc&X*pi@ijraJFPgWS!>>=FigX2R2k9M
zUcz#tM@E&Gw>3VGrq|{LX*5i?GrBetzt_5UcBtoAhk5+gu}*I4nXzAOb6$^Kcii{E
zJC75|N3Oc9lzK5Z(YiOs%)-1h1Usy?kzihr`1i5gD4-!`-0?imFfUsgP`uP?en7G5
z;K3|yuuzQN37gpQvTMaeM0Verfr|5eu5PxIbo1=9nRi8gt&R7?gc*~)V$$=%!1AZ}
z>$~EUGaBz>rDSBvfTX=e*S*x?c1}-_Lq+c6#Cdg#2x+@X_B}~`i!UJ=R=g!#A8z&S
z_nF$UkkQ;_mo-!nZ=XH7ChP3Nu46y%n(SpcJjoq0NwfR9>+HN;c?|wM+lhPT73Rr7
zOJ<48A_R(OV#zg)d4*V&P&K%c_U+u?CAhbmPuJ!=lcYuqo`NC{(E-ZZ{j*EK3D#zQ
z^0DnN?yjNv%8oD!LU{QN0uP}oXdKwbs1rx-79BP{RgbWLN{_0&acNi$s(H_szfJGL
zEPKwBJS*}dhfT^u0+k-P+>f3staI*MQ7m!;0)<>|+Ez9Lq|%!5WnVI5t*5^#6dtcV
z!6*BDI1zo7u|nhiN}J)itfsK|k;6raC5K%IH9LIq`&n!FrZNNp;W3S@53Mhi`$k_O
zTid=XsOg-;34Ff5_$G&LD)q3r80zbtV2p83nO}?)BuuO{4xXiw9k!J$Ta-df82Y%`
z{!vrFZ0enTZhV=MuOscfvxy`(Mfs|jy=(dYl-*%RlvAD8!G~l)I!~zz6c!_lc8kL1
zam#8?sf&vT?-uKR-Cp%xwB!mAuzAFM?+!QTaz%>M?$!8oEEW*WVP@)5o%6$tL+1pV
zUftws=D+B?d+E6Ra=0@Bbl>@{OVDoHHc@`^k=ydpd?(4=l*Z(Z=qfu8K0ZE0*4|Qv
zCoKG?x`3N$wa8mco54A_#k0Ng(xc2EgL0yDm{(md|J~{5=91O#e69<&-3jQ>$m>{I
zP<s20Xl7YLaml!PkFQ72Jx)*U<`ABL&zQSWm_>Mo&CQZU^J&soR+>?6?ZlrZM-1J~
zF36HS{Vk>b>|E=*KnwE<(@9}=1;}xg3d-$yl?IHbJ<KYwjH3|zGpN$XMG;W5SmEtt
z%CcKB;&^naAg*P{@etly_0hgnU(D|_OUz)Y=3ktPm<}4Rof3xmcaN!y;w(!0t4nn5
z_v!;rJL%Z|=5CeG&Tl<ItdCuY&|A{ot2~U793M9BA^PUXZ?DZA4tiKnq@G*5B6!4B
zvA_3Jf=}$X$UKKV;k=<Gkyy`zH#<jfTsxh4pr}gmWYwnrL9XWT>3v6k@OgOyd=wlw
zm3HV0D>N}|x@@XtG_pQ#;MS9O%~Mx(hw68{T=n$*gQ;JpZ`bddy7lzq`>AVSR)cIt
p#1L)vbSpEep}>k5GW>j6!!Byr>lX1FD`~oo+ucz3cs3h+{vVmAG${Z8

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/Config.in b/trunk/package/luci/libs/nixio/axTLS/httpd/Config.in
new file mode 100644
index 00000000..513d57ae
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/Config.in
@@ -0,0 +1,163 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/config/Kconfig-language.txt
+#
+
+menu "Axhttpd Configuration"
+depends on CONFIG_AXHTTPD
+
+config CONFIG_HTTP_STATIC_BUILD
+    bool "Static Build"
+    default n
+    help
+        Select y if you want axhttpd to be a static build (i.e. don't use the
+        axtls shared library or dll).
+        
+config CONFIG_HTTP_PORT
+    int "HTTP port"
+    default 80
+    help
+        The port number of the normal HTTP server. 
+
+        You must be a root user in order to use the default port.
+
+config CONFIG_HTTP_HTTPS_PORT
+    int "HTTPS port"
+    default 443
+    help
+        The port number of the HTTPS server.
+
+        You must be a root user in order to use the default port.
+
+config CONFIG_HTTP_SESSION_CACHE_SIZE
+    int "SSL session cache size"
+    default 5
+    help
+        The size of the SSL session cache.
+        
+        This is not actually related to the number of concurrent users, but 
+        for optimum performance they should be the same (with a penalty 
+        in memory usage).
+
+config CONFIG_HTTP_WEBROOT
+    string "Web root location"
+    default "../www" if !CONFIG_PLATFORM_WIN32
+    default "..\\www" if CONFIG_PLATFORM_WIN32
+    help
+        The location of the web root in relation to axhttpd. This is 
+        the directory where index.html lives.
+
+config CONFIG_HTTP_TIMEOUT
+    int "Timeout"
+    default 300
+    help
+        Set the timeout of a connection in seconds.
+
+menu "CGI"
+depends on !CONFIG_PLATFORM_WIN32
+
+config CONFIG_HTTP_HAS_CGI
+    bool "Enable CGI"
+    default y
+    depends on !CONFIG_PLATFORM_WIN32
+    help
+        Enable the CGI capability. Not available on Win32 platforms.
+
+config CONFIG_HTTP_CGI_EXTENSIONS
+    string "CGI File Extension(s)"
+    default ".lua,.lp"
+    depends on CONFIG_HTTP_HAS_CGI
+    help
+        Tell axhhtpd what file extension(s) are used for CGI.
+
+        This is a comma separated list - e.g. ".php,.pl" etc
+
+config CONFIG_HTTP_ENABLE_LUA
+    bool "Enable Lua"
+    default y
+    depends on CONFIG_HTTP_HAS_CGI
+    help
+        Lua is a powerful, fast, light-weight, embeddable scripting language.
+
+        See http://www.lua.org for details.
+
+config CONFIG_HTTP_LUA_PREFIX
+    string "Lua's Installation Prefix"
+    default "/usr/local"
+    depends on CONFIG_HTTP_ENABLE_LUA
+
+    help
+        The location of Lua's installation prefix. This is also necessary for
+        Lua's cgi launcher application.
+
+config CONFIG_HTTP_LUA_CGI_LAUNCHER
+    string "CGI launcher location"
+    default "/bin/cgi.exe" if CONFIG_PLATFORM_CYGWIN
+    default "/bin/cgi" if !CONFIG_PLATFORM_CYGWIN
+    depends on CONFIG_HTTP_ENABLE_LUA
+    help
+        The location of LUA's CGI launcher application (after
+        the CONFIG_HTTP_LUA_PREFIX)
+
+config CONFIG_HTTP_BUILD_LUA
+    bool "Build Lua"
+    default n
+    depends on CONFIG_HTTP_ENABLE_LUA
+    help
+        Build Lua and install in /usr/local/bin
+
+endmenu
+
+config CONFIG_HTTP_DIRECTORIES
+    bool "Enable Directory Listing"
+    default y
+    help
+        Enable directory listing.
+    
+config CONFIG_HTTP_HAS_AUTHORIZATION
+    bool "Enable authorization"
+    default y
+    help
+        Pages/directories can have passwords associated with them.
+
+config CONFIG_HTTP_HAS_IPV6
+    bool "Enable IPv6"
+    default n
+    depends on !CONFIG_PLATFORM_WIN32
+    help
+        Use IPv6 instead of IPv4.
+    
+        Does not work under Win32
+
+config CONFIG_HTTP_ENABLE_DIFFERENT_USER
+    bool "Enable different user"
+    default n
+    depends on !CONFIG_PLATFORM_WIN32
+    help
+        Allow the web server to be run as a different user
+    
+config CONFIG_HTTP_USER
+    string "As User"
+    default "nobody"
+    depends on CONFIG_HTTP_ENABLE_DIFFERENT_USER
+    help
+        The user name that will be used to run axhttpd.
+
+config CONFIG_HTTP_VERBOSE
+    bool "Verbose Mode"
+    default y if CONFIG_SSL_FULL_MODE
+    default n if !CONFIG_SSL_FULL_MODE
+    help
+        Enable extra statements used when using axhttpd.
+
+config CONFIG_HTTP_IS_DAEMON
+    bool "Run as a daemon"
+    default n
+    depends on !CONFIG_PLATFORM_WIN32
+    help 
+        Run axhttpd as a background process.
+
+        Does not work under Win32
+
+endmenu
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/Makefile b/trunk/package/luci/libs/nixio/axTLS/httpd/Makefile
new file mode 100644
index 00000000..b8c18d24
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/Makefile
@@ -0,0 +1,127 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+all : web_server lua
+
+AXTLS_HOME=..
+
+include $(AXTLS_HOME)/config/.config
+include $(AXTLS_HOME)/config/makefile.conf
+
+ifndef CONFIG_PLATFORM_WIN32
+
+ifdef CONFIG_PLATFORM_CYGWIN
+TARGET=$(AXTLS_HOME)/$(STAGE)/axhttpd.exe
+TARGET2=$(AXTLS_HOME)/$(STAGE)/htpasswd.exe
+else
+TARGET=$(AXTLS_HOME)/$(STAGE)/axhttpd
+TARGET2=$(AXTLS_HOME)/$(STAGE)/htpasswd
+endif
+
+ifdef CONFIG_HTTP_STATIC_BUILD
+LIBS=$(AXTLS_HOME)/$(STAGE)/libaxtls.a
+else
+LIBS=-L$(AXTLS_HOME)/$(STAGE) -laxtls
+endif
+
+ifdef CONFIG_HTTP_BUILD_LUA
+lua: kepler-1.1
+
+kepler-1.1:
+	@tar xvfz   kepler-1.1-snapshot-20070521-1825.tar.gz
+	@cat kepler.patch | patch -p0
+	cd kepler-1.1; ./configure --prefix=$(CONFIG_HTTP_LUA_PREFIX) --launcher=cgi --lua-suffix= ; make install
+else
+lua:
+endif
+
+else # win32 build
+lua:
+
+TARGET=$(AXTLS_HOME)/$(STAGE)/axhttpd.exe
+TARGET2=$(AXTLS_HOME)/$(STAGE)/htpasswd.exe
+
+ifdef CONFIG_HTTP_STATIC_BUILD
+LIBS=$(AXTLS_HOME)/$(STAGE)/axtls.static.lib $(AXTLS_HOME)\\config\\axtls.res
+else
+LIBS=$(AXTLS_HOME)/$(STAGE)/axtls.lib $(AXTLS_HOME)\\config\\axtls.res
+endif
+endif
+
+ifndef CONFIG_AXHTTPD
+web_server:
+else
+
+web_server :: $(TARGET)
+
+ifdef CONFIG_HTTP_HAS_AUTHORIZATION
+web_server :: $(TARGET2)
+endif
+
+OBJ= \
+	axhttpd.o \
+	proc.o \
+	tdate_parse.o
+
+include $(AXTLS_HOME)/config/makefile.post
+
+ifndef CONFIG_PLATFORM_WIN32
+
+$(TARGET): $(OBJ) $(AXTLS_HOME)/$(STAGE)/libaxtls.a
+	$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+ifdef CONFIG_STRIP_UNWANTED_SECTIONS
+	$(STRIP) --remove-section=.comment $(TARGET)
+endif
+
+$(TARGET2): htpasswd.o $(AXTLS_HOME)/$(STAGE)/libaxtls.a
+	$(LD) $(LDFLAGS) -o $@ htpasswd.o $(LIBS)
+
+else    # Win32
+
+OBJ:=$(OBJ:.o=.obj)
+%.obj : %.c
+	$(CC) $(CFLAGS) $< 
+
+htpasswd.obj : htpasswd.c
+	$(CC) $(CFLAGS) $? 
+	
+$(TARGET): $(OBJ)
+	$(LD) $(LDFLAGS) /out:$@ $(LIBS) $?
+
+$(TARGET2): htpasswd.obj
+	$(LD) $(LDFLAGS) /out:$@ $(LIBS) $?
+endif
+
+endif       # CONFIG_AXHTTPD
+
+clean::
+	-@rm -f $(TARGET)*
+	-@rm -fr kepler-1.1
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/axhttp.h b/trunk/package/luci/libs/nixio/axTLS/httpd/axhttp.h
new file mode 100644
index 00000000..73c299fb
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/axhttp.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "ssl.h"
+
+#define BACKLOG 15
+#define VERSION "1.0.0"
+#ifdef CONFIG_HTTP_HAS_IPV6
+#define HAVE_IPV6
+#endif
+
+#define MAXPOSTDATASIZE                     30000
+#define MAXREQUESTLENGTH                    256
+#define BLOCKSIZE                           4096
+
+#define INITIAL_CONNECTION_SLOTS            10
+#define CONFIG_HTTP_DEFAULT_SSL_OPTIONS     SSL_DISPLAY_CERTS
+
+#define STATE_WANT_TO_READ_HEAD             1
+#define STATE_WANT_TO_SEND_HEAD             2
+#define STATE_WANT_TO_READ_FILE             3
+#define STATE_WANT_TO_SEND_FILE             4
+#define STATE_DOING_DIR                     5
+
+enum
+{
+    TYPE_GET,
+    TYPE_HEAD,
+    TYPE_POST
+};
+
+struct connstruct 
+{
+    struct connstruct *next;
+    int state;
+    int reqtype;
+    int networkdesc;
+    int filedesc;
+    SSL *ssl;
+
+#if defined(CONFIG_HTTP_DIRECTORIES)
+#ifdef WIN32
+    HANDLE dirp;
+    WIN32_FIND_DATA file_data;
+#else
+    DIR *dirp;
+#endif
+#endif
+
+    time_t timeout;
+    char actualfile[MAXREQUESTLENGTH];
+    char filereq[MAXREQUESTLENGTH];
+    char dirname[MAXREQUESTLENGTH];
+    char server_name[MAXREQUESTLENGTH];
+    int numbytes;
+    char databuf[BLOCKSIZE];
+    uint8_t is_ssl;
+    uint8_t close_when_done;
+    time_t if_modified_since;
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+    uint8_t is_cgi;
+#ifdef CONFIG_HTTP_ENABLE_LUA
+    uint8_t is_lua;
+#endif
+    int content_length;
+    char remote_addr[MAXREQUESTLENGTH];
+    char uri_request[MAXREQUESTLENGTH];
+    char uri_path_info[MAXREQUESTLENGTH];
+    char uri_query[MAXREQUESTLENGTH];
+    char cookie[MAXREQUESTLENGTH];
+#endif
+#if defined(CONFIG_HTTP_HAS_AUTHORIZATION)
+    char authorization[MAXREQUESTLENGTH];
+#endif
+  int post_read;
+  int post_state;
+  char *post_data;
+};
+
+struct serverstruct 
+{
+    struct serverstruct *next;
+    int sd;
+    int is_ssl;
+    SSL_CTX *ssl_ctx;
+};
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+struct cgiextstruct 
+{
+    struct cgiextstruct *next;
+    char *ext;
+};
+#endif
+
+/* global prototypes */
+extern struct serverstruct *servers;
+extern struct connstruct *usedconns;
+extern struct connstruct *freeconns;
+extern const char * const server_version;
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+extern struct cgiextstruct *cgiexts;
+#endif
+
+/* conn.c prototypes */
+void removeconnection(struct connstruct *cn);
+
+/* proc.c prototypes */
+void procdodir(struct connstruct *cn);
+void procreadhead(struct connstruct *cn);
+void procsendhead(struct connstruct *cn);
+void procreadfile(struct connstruct *cn);
+void procsendfile(struct connstruct *cn);
+#if defined(CONFIG_HTTP_HAS_CGI)
+void read_post_data(struct connstruct *cn);
+#endif
+
+/* misc.c prototypes */
+char *my_strncpy(char *dest, const char *src, size_t n);
+int isdir(const char *name);
+
+/* tdate prototypes */
+void tdate_init(void);
+time_t tdate_parse(const char* str);
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/axhttpd.c b/trunk/package/luci/libs/nixio/axTLS/httpd/axhttpd.c
new file mode 100644
index 00000000..35d36f64
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/axhttpd.c
@@ -0,0 +1,604 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <pwd.h>
+#include "axhttp.h"
+
+struct serverstruct *servers;
+struct connstruct *usedconns;
+struct connstruct *freeconns;
+const char * const server_version = "axhttpd/"AXTLS_VERSION;
+
+static void addtoservers(int sd);
+static int openlistener(int port);
+static void handlenewconnection(int listenfd, int is_ssl);
+static void addconnection(int sd, char *ip, int is_ssl);
+static void ax_chdir(void);
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+struct cgiextstruct *cgiexts;
+static void addcgiext(const char *tp);
+
+#if !defined(WIN32)
+static void reaper(int sigtype) 
+{
+    wait3(NULL, WNOHANG, NULL);
+}
+#endif
+#endif
+
+#ifdef CONFIG_HTTP_VERBOSE  /* should really be in debug mode or something */
+/* clean up memory for valgrind */
+static void sigint_cleanup(int sig)
+{
+    struct serverstruct *sp;
+    struct connstruct *tp;
+
+    while (servers != NULL) 
+    {
+        if (servers->is_ssl)
+            ssl_ctx_free(servers->ssl_ctx);
+
+        sp = servers->next;
+        free(servers);
+        servers = sp;
+    }
+
+    while (freeconns != NULL)
+    {
+        tp = freeconns->next;
+        free(freeconns);
+        freeconns = tp;
+    }
+
+    while (usedconns != NULL)
+    {
+        tp = usedconns->next;
+        free(usedconns);
+        usedconns = tp;
+    }
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+    while (cgiexts)
+    {
+        struct cgiextstruct *cp = cgiexts->next;
+        if (cp == NULL) /* last entry */
+            free(cgiexts->ext);
+        free(cgiexts);
+        cgiexts = cp;
+    }
+#endif
+
+    exit(0);
+}
+
+static void die(int sigtype) 
+{
+    exit(0);
+}
+#endif
+
+int main(int argc, char *argv[]) 
+{
+    fd_set rfds, wfds;
+    struct connstruct *tp, *to;
+    struct serverstruct *sp;
+    int rnum, wnum, active;
+    int i;
+    time_t currtime;
+
+#ifdef WIN32
+    WORD wVersionRequested = MAKEWORD(2, 2);
+    WSADATA wsaData;
+    WSAStartup(wVersionRequested,&wsaData);
+#else
+    signal(SIGPIPE, SIG_IGN);
+#if defined(CONFIG_HTTP_HAS_CGI)
+    signal(SIGCHLD, reaper);
+#endif
+#ifdef CONFIG_HTTP_VERBOSE
+    signal(SIGQUIT, die);
+#endif
+#endif
+
+#ifdef CONFIG_HTTP_VERBOSE
+    signal(SIGTERM, die);
+    signal(SIGINT, sigint_cleanup);
+#endif
+    tdate_init();
+
+    for (i = 0; i < INITIAL_CONNECTION_SLOTS; i++) 
+    {
+        tp = freeconns;
+        freeconns = (struct connstruct *)calloc(1, sizeof(struct connstruct));
+        freeconns->next = tp;
+    }
+
+    if ((active = openlistener(CONFIG_HTTP_PORT)) == -1) 
+    {
+#ifdef CONFIG_HTTP_VERBOSE
+        fprintf(stderr, "ERR: Couldn't bind to port %d\n",
+                CONFIG_HTTP_PORT);
+#endif
+        exit(1);
+    }
+
+    addtoservers(active);
+
+    if ((active = openlistener(CONFIG_HTTP_HTTPS_PORT)) == -1) 
+    {
+#ifdef CONFIG_HTTP_VERBOSE
+        fprintf(stderr, "ERR: Couldn't bind to port %d\n", 
+                CONFIG_HTTP_HTTPS_PORT);
+#endif
+        exit(1);
+    }
+
+    addtoservers(active);
+    servers->ssl_ctx = ssl_ctx_new(CONFIG_HTTP_DEFAULT_SSL_OPTIONS, 
+                                CONFIG_HTTP_SESSION_CACHE_SIZE);
+    servers->is_ssl = 1;
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+    addcgiext(CONFIG_HTTP_CGI_EXTENSIONS);
+#endif
+
+#if defined(CONFIG_HTTP_VERBOSE)
+#if defined(CONFIG_HTTP_HAS_CGI)
+    printf("addcgiext %s\n", CONFIG_HTTP_CGI_EXTENSIONS); 
+#endif
+    printf("%s: listening on ports %d (http) and %d (https)\n", 
+            server_version, CONFIG_HTTP_PORT, CONFIG_HTTP_HTTPS_PORT);
+    TTY_FLUSH();
+#endif
+
+    ax_chdir();
+
+#ifdef CONFIG_HTTP_ENABLE_DIFFERENT_USER
+    {
+        struct passwd *pd = getpwnam(CONFIG_HTTP_USER);
+
+        if (pd != NULL)
+        {
+            int res = setuid(pd->pw_uid);
+            res |= setgid(pd->pw_gid);
+
+#if defined(CONFIG_HTTP_VERBOSE)
+            if (res == 0)
+            {
+                printf("change to '%s' successful\n", CONFIG_HTTP_USER); 
+                TTY_FLUSH();
+            }
+#endif
+        }
+
+    }
+#endif
+
+
+#ifndef WIN32 
+#ifdef CONFIG_HTTP_IS_DAEMON
+    if (fork() > 0)  /* parent will die */
+        exit(0);
+
+    setsid();
+#endif
+#endif
+
+    /* main loop */
+    while (1)
+    {
+        FD_ZERO(&rfds);
+        FD_ZERO(&wfds);
+        rnum = wnum = -1;
+        sp = servers;
+
+        while (sp != NULL)  /* read each server port */
+        {
+            FD_SET(sp->sd, &rfds);
+
+            if (sp->sd > rnum) 
+                rnum = sp->sd;
+            sp = sp->next;
+        }
+
+        /* Add the established sockets */
+        tp = usedconns;
+        currtime = time(NULL);
+
+        while (tp != NULL) 
+        {
+            if (currtime > tp->timeout)     /* timed out? Kill it. */
+            {
+                to = tp;
+                tp = tp->next;
+                removeconnection(to);
+                continue;
+            }
+
+            if (tp->state == STATE_WANT_TO_READ_HEAD) 
+            {
+                FD_SET(tp->networkdesc, &rfds);
+                if (tp->networkdesc > rnum) 
+                    rnum = tp->networkdesc;
+            }
+
+            if (tp->state == STATE_WANT_TO_SEND_HEAD) 
+            {
+                FD_SET(tp->networkdesc, &wfds);
+                if (tp->networkdesc > wnum) 
+                    wnum = tp->networkdesc;
+            }
+
+            if (tp->state == STATE_WANT_TO_READ_FILE) 
+            {
+                FD_SET(tp->filedesc, &rfds);
+                if (tp->filedesc > rnum) 
+                    rnum = tp->filedesc;
+            }
+
+            if (tp->state == STATE_WANT_TO_SEND_FILE) 
+            {
+                FD_SET(tp->networkdesc, &wfds);
+                if (tp->networkdesc > wnum) 
+                    wnum = tp->networkdesc;
+            }
+
+#if defined(CONFIG_HTTP_DIRECTORIES)
+            if (tp->state == STATE_DOING_DIR) 
+            {
+                FD_SET(tp->networkdesc, &wfds);
+                if (tp->networkdesc > wnum) 
+                    wnum = tp->networkdesc;
+            }
+#endif
+            tp = tp->next;
+        }
+
+        active = select(wnum > rnum ? wnum+1 : rnum+1,
+                rnum != -1 ? &rfds : NULL, 
+                wnum != -1 ? &wfds : NULL,
+                NULL, NULL);
+
+        /* New connection? */
+        sp = servers;
+        while (active > 0 && sp != NULL) 
+        {
+            if (FD_ISSET(sp->sd, &rfds)) 
+            {
+                handlenewconnection(sp->sd, sp->is_ssl);
+                active--;
+            }
+
+            sp = sp->next;
+        }
+
+        /* Handle the established sockets */
+        tp = usedconns;
+
+        while (active > 0 && tp != NULL) 
+        {
+            to = tp;
+            tp = tp->next;
+
+            if (to->state == STATE_WANT_TO_READ_HEAD &&
+                        FD_ISSET(to->networkdesc, &rfds)) 
+            {
+                active--;
+#if defined(CONFIG_HTTP_HAS_CGI)
+                if (to->post_state)
+                    read_post_data(to);
+                else
+#endif
+                    procreadhead(to);
+            } 
+
+            if (to->state == STATE_WANT_TO_SEND_HEAD &&
+                        FD_ISSET(to->networkdesc, &wfds)) 
+            {
+                active--;
+                procsendhead(to);
+            } 
+
+            if (to->state == STATE_WANT_TO_READ_FILE && 
+                        FD_ISSET(to->filedesc, &rfds)) 
+            {
+                active--;
+                procreadfile(to);
+            } 
+
+            if (to->state == STATE_WANT_TO_SEND_FILE && 
+                        FD_ISSET(to->networkdesc, &wfds)) 
+            {
+                active--;
+                procsendfile(to);
+            }
+
+#if defined(CONFIG_HTTP_DIRECTORIES)
+            if (to->state == STATE_DOING_DIR &&
+                        FD_ISSET(to->networkdesc, &wfds)) 
+            {
+                active--;
+                procdodir(to);
+            }
+#endif
+        }
+    }
+
+    return 0;
+}
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+static void addcgiext(const char *cgi_exts)
+{
+    char *cp = strdup(cgi_exts);
+
+    /* extenstions are comma separated */
+    do 
+    {
+        struct cgiextstruct *ex = (struct cgiextstruct *)
+                            malloc(sizeof(struct cgiextstruct));
+        ex->ext = cp;
+        ex->next = cgiexts;
+        cgiexts = ex;
+        if ((cp = strchr(cp, ',')) != NULL)
+            *cp++ = 0;
+    } while (cp != NULL);
+}
+#endif
+
+static void addtoservers(int sd) 
+{
+    struct serverstruct *tp = (struct serverstruct *)
+                            calloc(1, sizeof(struct serverstruct));
+    tp->next = servers;
+    tp->sd = sd;
+    servers = tp;
+}
+
+#ifdef HAVE_IPV6
+static void handlenewconnection(int listenfd, int is_ssl) 
+{
+    struct sockaddr_in6 their_addr;
+    int tp = sizeof(their_addr);
+    char ipbuf[100];
+    int connfd = accept(listenfd, (struct sockaddr *)&their_addr, &tp);
+
+    if (tp == sizeof(struct sockaddr_in6)) 
+        inet_ntop(AF_INET6, &their_addr.sin6_addr, ipbuf, sizeof(ipbuf));
+    else if (tp == sizeof(struct sockaddr_in)) 
+        inet_ntop(AF_INET, &(((struct sockaddr_in *)&their_addr)->sin_addr),
+                ipbuf, sizeof(ipbuf));
+    else 
+        *ipbuf = '\0';
+
+    addconnection(connfd, ipbuf, is_ssl);
+}
+
+#else
+static void handlenewconnection(int listenfd, int is_ssl) 
+{
+    struct sockaddr_in their_addr;
+    socklen_t tp = sizeof(struct sockaddr_in);
+    int connfd = accept(listenfd, (struct sockaddr *)&their_addr, &tp);
+    addconnection(connfd, inet_ntoa(their_addr.sin_addr), is_ssl);
+}
+#endif
+
+static int openlistener(int port) 
+{
+    int sd;
+#ifdef WIN32
+    char tp = 1;
+#else
+    int tp = 1;
+#endif
+#ifndef HAVE_IPV6
+    struct sockaddr_in my_addr;
+
+    if ((sd = socket(AF_INET, SOCK_STREAM, 0)) == -1) 
+        return -1;
+
+    memset(&my_addr, 0, sizeof(my_addr));
+    my_addr.sin_family = AF_INET;
+    my_addr.sin_port = htons((short)port);
+    my_addr.sin_addr.s_addr = INADDR_ANY;
+#else
+    struct sockaddr_in6 my_addr;
+
+    if ((sd = socket(AF_INET6, SOCK_STREAM, 0)) == -1) 
+        return -1;
+
+    memset(&my_addr, 0, sizeof(my_addr));
+    my_addr.sin6_family = AF_INET6;
+    my_addr.sin6_port = htons(port);
+    my_addr.sin6_addr.s_addr = INADDR_ANY;
+#endif
+
+    setsockopt(sd, SOL_SOCKET, SO_REUSEADDR, &tp, sizeof(tp));
+    if (bind(sd, (struct sockaddr *)&my_addr, sizeof(struct sockaddr)) == -1)
+    {
+        close(sd);
+        return -1;
+    }
+
+    listen(sd, BACKLOG);
+    return sd;
+}
+
+/* Wrapper function for strncpy() that guarantees
+   a null-terminated string. This is to avoid any possible
+   issues due to strncpy()'s behaviour.
+ */
+char *my_strncpy(char *dest, const char *src, size_t n) 
+{
+    strncpy(dest, src, n);
+    dest[n-1] = '\0';
+    return dest;
+}
+
+int isdir(const char *tpbuf) 
+{
+    struct stat st;
+    char path[MAXREQUESTLENGTH];
+    strcpy(path, tpbuf);
+
+#ifdef WIN32        /* win32 stat() can't handle trailing '\' */
+    if (path[strlen(path)-1] == '\\')
+        path[strlen(path)-1] = 0;
+#endif
+
+    if (stat(path, &st) == -1) 
+        return 0;
+
+    if ((st.st_mode & S_IFMT) == S_IFDIR) 
+        return 1;
+
+    return 0;
+}
+
+static void addconnection(int sd, char *ip, int is_ssl) 
+{
+    struct connstruct *tp;
+
+    /* Get ourselves a connstruct */
+    if (freeconns == NULL) 
+        tp = (struct connstruct *)calloc(1, sizeof(struct connstruct));
+    else 
+    {
+        tp = freeconns;
+        freeconns = tp->next;
+    }
+
+    /* Attach it to the used list */
+    tp->next = usedconns;
+    usedconns = tp;
+    tp->networkdesc = sd;
+
+    if (is_ssl)
+        tp->ssl = ssl_server_new(servers->ssl_ctx, sd);
+
+    tp->is_ssl = is_ssl;
+    tp->filedesc = -1;
+#if defined(CONFIG_HTTP_HAS_DIRECTORIES)
+    tp->dirp = NULL;
+#endif
+    *tp->actualfile = '\0';
+    *tp->filereq = '\0';
+    tp->state = STATE_WANT_TO_READ_HEAD;
+    tp->reqtype = TYPE_GET;
+    tp->close_when_done = 0;
+    tp->timeout = time(NULL) + CONFIG_HTTP_TIMEOUT;
+#if defined(CONFIG_HTTP_HAS_CGI)
+    strcpy(tp->remote_addr, ip);
+#endif
+}
+
+void removeconnection(struct connstruct *cn) 
+{
+    struct connstruct *tp;
+    int shouldret = 0;
+
+    tp = usedconns;
+
+    if (tp == NULL || cn == NULL) 
+        shouldret = 1;
+    else if (tp == cn) 
+        usedconns = tp->next;
+    else 
+    {
+        while (tp != NULL) 
+        {
+            if (tp->next == cn) 
+            {
+                tp->next = (tp->next)->next;
+                shouldret = 0;
+                break;
+            }
+
+            tp = tp->next;
+            shouldret = 1;
+        }
+    }
+
+    if (shouldret) 
+        return;
+
+    /* If we did, add it to the free list */
+    cn->next = freeconns;
+    freeconns = cn;
+
+    /* Close it all down */
+    if (cn->networkdesc != -1) 
+    {
+        if (cn->is_ssl) 
+        {
+            ssl_free(cn->ssl);
+            cn->ssl = NULL;
+        }
+
+        SOCKET_CLOSE(cn->networkdesc);
+    }
+
+    if (cn->filedesc != -1) 
+        close(cn->filedesc);
+
+#if defined(CONFIG_HTTP_HAS_DIRECTORIES)
+    if (cn->dirp != NULL) 
+#ifdef WIN32
+        FindClose(cn->dirp);
+#else
+        closedir(cn->dirp);
+#endif
+#endif
+}
+
+/*
+ * Change directories one way or the other.
+ */
+static void ax_chdir(void)
+{
+    static char *webroot = CONFIG_HTTP_WEBROOT;
+
+    if (chdir(webroot))
+    {
+#ifdef CONFIG_HTTP_VERBOSE
+        fprintf(stderr, "'%s' is not a directory\n", webroot);
+#endif
+        exit(1);
+    }
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/htpasswd.c b/trunk/package/luci/libs/nixio/axTLS/httpd/htpasswd.c
new file mode 100644
index 00000000..1a7a2311
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/htpasswd.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "ssl.h"
+
+int tfd;
+
+void base64_encode(const uint8_t *in, size_t inlen, char *out, size_t outlen)
+{
+    static const char b64str[64] =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    while (inlen && outlen)
+    {
+        *out++ = b64str[(in[0] >> 2) & 0x3f];
+        if (!--outlen)
+            break;
+
+        *out++ = b64str[((in[0] << 4)
+                + (--inlen ? in[1] >> 4 : 0)) & 0x3f];
+        if (!--outlen)
+            break;
+        *out++ = (inlen
+             ? b64str[((in[1] << 2)
+                 + (--inlen ? in[2] >> 6 : 0))
+             & 0x3f]
+             : '=');
+        if (!--outlen)
+            break;
+        *out++ = inlen ? b64str[in[2] & 0x3f] : '=';
+        if (!--outlen)
+            break;
+        if (inlen)
+            inlen--;
+        if (inlen)
+            in += 3;
+    }
+
+    if (outlen)
+        *out = '\0';
+}
+
+static void usage(void) 
+{
+    fprintf(stderr,"Usage: htpasswd username\n");
+    exit(1);
+}
+
+#ifdef WIN32
+static char * getpass(const char *prompt)
+{
+    static char buf[127];
+    FILE *fp = stdin;
+
+    printf(prompt); TTY_FLUSH();
+#if 0
+    fp = fopen("/dev/tty", "w");
+    if (fp == NULL) 
+    {
+        printf("null\n"); TTY_FLUSH();
+        fp = stdin;
+    }
+#endif
+
+    fgets(buf, sizeof(buf), fp);
+    while (buf[strlen(buf)-1] < ' ') 
+        buf[strlen(buf)-1] = '\0';
+
+    //if (fp != stdin) 
+    //    fclose(fp);
+    return buf;
+}
+#endif
+
+int main(int argc, char *argv[]) 
+{
+    char* pw;
+    uint8_t md5_salt[MD5_SIZE], md5_pass[MD5_SIZE];
+    char b64_salt[MD5_SIZE+10], b64_pass[MD5_SIZE+10];
+    MD5_CTX ctx;
+
+    if (argc != 2)
+        usage();
+
+    pw = strdup(getpass("New password:"));
+    if (strcmp(pw, getpass("Re-type new password:")) != 0)
+    {
+        fprintf(stderr, "They don't match, sorry.\n" );
+        exit(1);
+    }
+
+    RNG_initialize((uint8_t *)pw, sizeof(pw));
+    get_random(MD5_SIZE, md5_salt);
+    RNG_terminate();
+    base64_encode(md5_salt, MD5_SIZE, b64_salt, sizeof(b64_salt));
+
+    MD5_Init(&ctx);
+    MD5_Update(&ctx, md5_salt, MD5_SIZE);
+    MD5_Update(&ctx, (uint8_t *)pw, strlen(pw));
+    MD5_Final(md5_pass, &ctx);
+    base64_encode(md5_pass, MD5_SIZE, b64_pass, sizeof(b64_pass));
+
+    printf("Add the following to your '.htpasswd' file\n");
+    printf("%s:%s$%s\n", argv[1], b64_salt, b64_pass);
+    return 0;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz b/trunk/package/luci/libs/nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
new file mode 100755
index 0000000000000000000000000000000000000000..d1caec5a53f93f043a32ec04807dff259223c32c
GIT binary patch
literal 768249
zcmV(;K-<3`iwFQl4pK${1MIyEU{uA`IG#kn<cb*Z0V?X{CYmf}HxCHPLXbQ*B$AMr
zgqMI}vwM?V+1<PB-OU3*d4p&b_0xW~J^;0?R;&1^wXH2a>Z`2<Yg_xUA6jdDwVztG
zR=>af&6&r&Gxy%zBtY%g|L1;RC3hZY&YU@O&Y3f3W>%^3h??-0`^rnR{#m~=^gE}r
z68<eer?Q;?m;JKJ%VtzepI&wj`ZueryrO*iv@E&upN0|lOBu;vLYA|7HKR8eO<!)P
z{D0HmDr@|kgR9hTEutRrHei5fOrM@+{AW~@m)pmG+Ke(Z{$)oT6PMrr@$r`mY(J?$
zu2+M}R6><QdaPUPNhN|wO^-PXN?I%wNrhQCUn-^zNT~XJ%u;eBn2LpZwOEfF)x&B8
zWz-?|im7scuNLa1*{EDnm%CD0B<zzLyX8SWCC5}X45?ZS4NU|pMs<WuvNsr$byT0#
zEMX;ZYA`7W<)ju>eW=2sU_=YcdK?fp{Bo#AE0Mc{MiT#l(5Wbq2ZDXUSW=amsuwP(
zZ3wiTSH)6L{T5s^7-4;h2SclZJ*puW2T^aM(V*8*<3U6iglR-Gk{)N9kyJ3E_w+#j
z(VxcZ2>hcC#1Wq8k2P9cj)p6xme!8OmIc*Kovqci^Q-3t+Rv-9DwaSA1bHzgSU8vr
zb_EU9B$(Wk3btR+BzNlxmp(@aQJW>Q9@5T5{|$GAO60h1BzqF7Q6i%(4f?*Y8Ug66
zYinEt1i)3G!FDw%*DP#os_R50pgr{egQ)jfH?%1my?P2Y-=$(a5Zxm>>Se!{?4|T7
zK`?@`Fryx#SR4&eENQT+Dd+~8QF5P}Fc7{zc?luDIk*M_(XXMgB}G*Ri}YN_i1;X~
zjSJd4s+*de$fl`hbpQdNJfs5uS#YW_glIgXp?^(MKq_jKHru764x`3mI<y6x8;m5>
zV0cjO4fY|1gr;h=STKQLc!35H4RsMCKpVvq%O{!e&w~ae4h@nZY2E5-xwx>H%kh+;
z9FHW+vW{q&(9kp#(3I3zSnHPDrgvZ<sV0EA!)hFrQez>6pv&}b3sl!NH7*Er)-@vL
zC`}m&E2*im2BlUN7W0KXr4g;mD$}^2wrOEqz^xpW9Fi1R(pufYH9)>i=w>znO+E#<
zTnQ8Cg%>uqaxn3y36f<Ji1<qYXyu#mT5225rSN+7s9LHgf}x07+L8!1pwDuWZ#KY6
zlLp9Fpt;4KnFx19jnc3h)k&Gwg*8o$weF?jsji3?k|Z=)8$0;%pb2K%RsqsF{T4dN
zm$AB7S5wQu#h+G>XeR9ud<hV(d=p-Mb$dtcyhaWrOEIBxMF?P)Aix$%ncxwV*EBAu
zZfgv*b4~E6q?z*&1Y23s7N2Of=UUus)MY9)a`RXYYY8=!)D!NrskJRo-?)TeS{l(q
z!HCqpw7s@vK|O7l6!4U)$&e(X#BvxW2*u9!h4mO*Ww|8H541J~+B%tZ5NokqXbDE&
zY|~RpY`;=u`&l3wJ5V963M<vA#k8ak=_XcmaiHcrt0>pDr?fX2)<cFJEkso^q;6HZ
zw3uy7%uM$huB8Reu|9C&_LkcDfsSDSM%)Gj9&tfRRvY=G+LqSpVfLrKu_=JYrz6lj
zobuFe=_FI;kctmIB&?P-H;3Jjy~^+#L&CCRBrOT$tC1zu5P&pN)B0Z6M5na0q<T^H
z0xTDYYQtV~$WGWRq~QvCF*KWmQs~<wwKXo7H%!)PYMD0=l^$MUu=$2nkm=iD6eW6e
zsDjOPmBT3ICTSNDLlId{$lQ&lTai#`$eL|OW_1-vHeOD!^h#g3uYwZ_EM2bfm7ywb
z?axzVY696zV8>}x;CDxYJ#M1DwzjG#6p~t-sypgi+L}9S>zk_QwO4r;M@qZ_E4itT
zrbnW(HxiCWNN06IQk54iH4|uQ;q7j1thLNP)4=nT$PVkzru<+T;T5$R?WL#GNQ6KM
zq7t|O)g>NZFfBkqu(mF)LrOFwcxHXtkrHbV9qmbji=c=D^@tN2s=Rejrmdx=qiXr`
z<%&~VL#j!yh3$b(W_NNV<LfjpWrKquLygv!_QoZ$^<CH0(i&L6B`}b(w~@1Jd3EDx
z1ogBXC?|4+2M;^?53Cv@ur&5Y(4q*L5QFHiSSXb+(CWk6#I-_6CaDoaJ><TO3_m)S
z)@*62!|ZJ(aIMmmx<Jjsd6+)#T;vhJk@~1C<$u&}3*!AaGI<5H#mYI*<dP^fPo~BZ
zLFgA=GCEb(KdB)o=`?aZc!Wjs*sk1As*^}Z96wW8(nJ#|O=egy&BWL(!!Wa{D0mvs
zT*R&hHc_mcPRfYQOCil_&ruGwVU-imrR<unVep5fYZu0WTgw6auR;F{MPf;#Hw_NZ
zd47#Y=q;}3hQf*YWzy3F&Et-FZA4@aK@zj*NT@>mL7C_xtTcf#)P<CuDvq`1kV6yh
z3Z+8<&k=4_3K&57H0>kCUbvuf2~;5CA+A|HoJ`~R%r?86XqeX1(46n64|s7#m1~>O
zN!|m(l^;fnkZ1Rhn6_Ek_Bii|S$LR@*_<cDyc=33xVxN_;1fp6V(h+jF{*fI3)`Bi
zdXvexzqGW!zaLhmK0VP>+MSGZdc{_VEMwyd{bIC8$Hl=dtA|#pNvU>GI|x7|H|GVa
zykURbP!q@u@&{vjY%r>)4FB9vp8@S4<FiNg#nhy~6s06|JqiBOB}<mb;D=83s)kDZ
z*Vy~#MTVxFP$MdK+Xj0i+bXXE*?N8DofVzsRH8yc1Jd<$)o6aQ<${$@)}H3K$tQdY
za3BB8772VB459fA<418S>#UFpETnKsnN(omg;L5Pg+~qd1xi`i^;M#Z<x+uwAcN20
z*jHgD@o3^!NHW6|H&WrsMGa~st|sJQJRZ@~bJF5@fsU&F9yKX@L$Wtn1|!&kM-Ca?
zFkGl+A9l0D_=3-v@Qxftwpl{!O5w$ai&4%Qn6*RN->G0ouy}cs4%fD4V~JHDqeW&#
zNY)H+JA>aH;YIyIVd8>Ed?%qcD{8Bt9b8<5<VLwx)M;2)$p+%qP@2`1X<OhvS7DdB
zwK_3+RWt><f<`aUwMY&1>T+S>B}g4DZ4I1x=CU&H%oS7D6?sa+!9>3n!<4c?Y-wNO
zB~a=5Ax_cq^Og-R>)wqT?B!3SBCamD0=X78lFZGVcqC=e4#PeU+mO;@kwMo*7aQN&
zmbL)Jn0N7$Ee3NOxl%U8=jz7K43rh1RfQsK7ffuKm1Lx};GbPZH$}YGHWHSD^c!X`
zVqWsG8~~cXT0I^#tZMaIL~S25l4{hobQ7g0%mZr9dT7BmE!IN;Nj$n1Zmd@pb}WVB
z$3ERK<SKJGy4P^Uk`*O*vYkkbX>C)WdVz^%2nqL?xYNT@DB9$kB27NrP&TV^2)mVb
zMVAyL$l|{Vs`CX@S2<8!WkYopkLs$lsIGEB)vdINYN$tJl~@wpjm=ySc53Yv=`Jlz
zCSAsV!~Cuehph>%4kQynbGE~bj`5O;2&iJm4y;FBD<f+>&h6lOO7Ij7Ea_;gHs=uP
ze-p{3d~BAmc$q81c*rb;`A957hR!T8-&un6l!=oO_XieTY5IZ`amIc?ex^P^etP^N
z_b_qCd*|t}4?t!{{7H#SJs>60_krXeW-r!g@pOH-P>W~m0pw@GAM(><54nefdo*0>
zia4?v(_;;pX;FsEH26XmkF4ZtZD?7r)K9nZnRF&%k4OSA&SWDNj2pekXrm%88BBDE
z62Gw6QiLA%MG-c?F^1;XeDcM^;7H&xKRGB|N3Bl+N0M+K{0>Zbm=f)w-vvXlF$vSa
z@4%eLKw2e~neUDk-mSn2<1n<@NOYN?9zyQwAww;!9768O!C8&djSh(`h%d1*K`IE7
z%wk`m25%M+n$CC7bcAYmBue+tRPG2Au9K##>@;1))6}IgL6Qoh$(r|WG+kxUv_8;L
z+aS=i8#@pznv!oyQ}W@Ysac7msk5v=Q(DDN(+ssRO>NZ}O`X*UO-;lYO|9-Bnz}T`
zXlj-NnvxHosj~*9Db6tW&FUK4aV$+0jS4ll=h)I!EQviCRV-|jh5?#UgF;-O(02Nz
zv26NeNC9zw&LcoUWJje@BWNU{9^hc$F|?L)381FE?V-c+Sa6_>R?sqyW{^O^fDAR~
zw1<9RX7t!pjwCT%#Ol-zT_-QvCz~{9gW>U^Y+uhBmmDu^!@DvZMChJ<=F&5xXNJ9J
zHk{eKl2%Ix6uLT6h^P+Y00C#el$VIg-bA+xFx2#_u$GX$ZY@c9zEX=-yk0dH?24#f
zh%m_u#bs|>gRK(gHjfJ=S<36yVqv!&Z!8#9<=RE<$ch;VCJ-+WWTiX^`t^p^xS^e%
z-clY=&6`*~e1euv%|swqSB#!W2D`L~mK>Cm{c3QPn=8Zglpy*ySJ$G?&N>9VWodI@
z0r=S3z{gcy=9`9EZLXdlfT@!wr`a!5tPMf}OK~lY9q|gwv+r&z-tZuzwia>}U>kf2
z+vqmIv;A%b^(7WYBE*aS!9l`dnL_J~==!P@B0AzV^mj1K;U;W9D!jm8TVHq=ptGU6
zy|aDcg3cz`#_f*j5R4hsV@^m-byZ4F$m{`iaMdSNwWht!r1!`u>b?b=iNYjKAR`%V
z7-sgCcLdryVDb#ZC24aMIuxuwgY1^1^m%kjVd8=Nm2Qvl4t-B);oM9hIKmIv4w~L7
zS`B!SOqeULT`R+6Uo+4b?;cLoP&ku<I_oSM=?bJwz43B+w(Rp|h=c%P)<x;(L(7<M
zk)q~0z-_P)In!ih9D|{;cW^HqZaRV3;4=>6LhGt*@fOagJF}KG5o{qEB#y&A{H!=v
zpG*aNF}w-K3iUup4ur+JI79uigVO(7Xv4BPT3XZ98V)HBjb^Ncz>)yMnXRLdg7!vb
zIHP4RS6AIp?I<^6`gB&Vy`!xWbt9QbsVs@D_l030t5hjZ>z0?nyv#5TD`vqyT8u&)
z;g}6)*Z?Y^GYh`EH4)KO6wv}~DGW<sQ1zZkGP(+As&shqoWb_RBAVp;4Bh8e1ownr
z|M-Wnr?I@vke^0uTN|vV(9Qrv6x>6%mQi>Qr#fMoOv?yYA)cWE2y)oVwS+joVd594
zVi(}{<RQmoc=(HKPej4lZbp!4Y1FycNi0anDrC?1D13i;>B^JfkdWpCVP|_obz4Ae
zTL`Vi0g*6DrDzyjBq@$AOkX{sb=fQPVv6@|i9#w<huj3!FbUw0KfEVMls?1ZcuN9h
zoa|01#5U@g2qJ50ENbYV<R2XPFY(?KKV5%I68RS)9qKc{#mL1{cxZJQEwIt51|bOr
z%-{fz34`Bq^mAqSxnxiC+iRQ5$wR}ONwIL%@Zj!HOz1;19pf7jE@qi2vR9Rzu-JJE
z#iS|mi$K*Cm<c#GGFQw)!<of6FD~-~W&s~22w*{p_vms{fcDVA>Q0J^EX_MJEf)bB
zFc(H7aU~`nf>VdEA^r>hmolN{x$_g}4`M<1Cmjc3|B%3dEQZCy>T}!Leyf1Md}5Mc
ztZ8wc1qgdF()I(7js0YZo#PmIIw%t72<B)?5OK9I_)sIx%CJ0TWZl<o_;f6V>~2uM
z=vTv<-ug^KaM2aV6W$U0<gvqVa>f++ofT~w)-B79In_@bVy?mfEcx^?Z<g1BY?EPy
z!-DA)JNDcbPCERDi4{FEr`Q3FM8(;6Vnj8^Vc@3K+!1srG5gMhpVv(MFuR53;G@J|
zI0oc!w<FdU5-DFWFE7Y4_#a|VTMEoHTe)N>O_%ZvIAMVVwy}2kvgOOT6L8B{EMI}s
zxZ^2}9Uh#lAbYWJwme71hOeW&kP|J^7#_P?kL=aKtSy}FTDjM)b_gotfG!WTyjHgG
zMvyz>AvDBm(Lg6tMwOMIq(RZOg<fc)wicWBj(~fJ_2lc&E;zu1Y>RrtwI18RS>~f-
zI0avEy0dLI0a<DU<7DJP)(QyWoT(sa4+Yv#sE|`&9%r*ao+0W;&TUUW5d=Jq(KI6#
zAbbFIb(szo{a0q3B{{eJ{4QIou1$dW2H$G9b+~g<*ze-!CCjkSO`6XBb!J4mp(lo(
zwhC64X*0px;kewTt_w2BPA>n53Ia#_q4cyEQZP7y^=5*0gam~RZpIdSGYpK2OcBo4
zc<h420l`(Eq-7u%L`fEp2_N2{5i3MMFRq?pJb?Eyau;S!j=k#XN%plat=r^;$X||W
z=9Hwu1auc+E{AvpyFrv^jtM#<NW*U5MF!KB-O+KC>?4Le9Q0hJyj`9RqrP+W+@wAO
zXi9!-mdX5tGX*Id7G6w>Qqeu~!-Z#DGz5pv$hCwO^1!PIoNCt(kO=?j1TO=x1z1Lf
zUBp`%qHxFQ$xfDYM8!JSX2=EkiXlZg51`i_LOStXWURf&2MphY_dmN*-Q8-!H+2>#
z%K4n)rjlYrF(WC55dTm0)RdPP+8R~wF0Lu}lqjw(E1p?ecQJ)mRpz+_tA~`)8_{}t
zQJR{7%ZC7RpRR?cdJ>*lc0GbJ%hCUpd1kF!Ta=D`bdb~Zzc&q6xM>pMRHQ?bh}CWB
z!FUjTRJf`ax=)MdZ%3fB6}8hAxL_e#uAy}PhKwRb<Q%2Qb*OFnfoD*=W}to=n{L3p
z6fQJKrx)<taw-LD%DIa?`%Me3LKA?9LJ;@FRS+KzKu!vzgDBF%-v1D{=<H4>Nk$}k
zT$vJ*)5!oEMs|T~p(#pRNFQ3%nn$geFNcOHVJ{B-yA!UnOWJS|!p;2V)n^j@BaI`6
z1wrvH9PYH2$AaT%$n@OUQTDLoa*N?^uc+Rq%33U`(?BT6rGkYnP>kU;grCIaf)7^@
z3FiQIt>WqdZeQBY?g4SBN3}jH%(C(IJ1)gdkF2fy;y{gCadJ<HqcoOEcA-SexHAVt
zg=J))%(*@tM2aQ93Z~$Djk>g0sT%78e~(L&up5g6*^n(DDVLeW^FqC7>d0pg3{lR>
zp-x#T@b1veHe$9J*~nVk4DlhxDFY8uA0OM7NXvT+>acevhJ<9>n{a_YY$$kp!ac&9
zb7Hcwa=0&D2GQoYbPaU2e3#a>kPd-N&&M)xjH6BQDB-`rsm_J-`bjjZB;kM3$XpVz
z%1d1H46cXO=g!XgtpdDL+?K>z2A(DjI5@hc=KS_5g+pB#!rSfKc;@ef0B^W(bj}UY
z4Csi`+;I<5Mp^D!UYL<~_c(Vpfa55FnuDJl7>nG*#l%}IL<i1wkH$Rh%x%!n2xS(P
zM?a|~vjv6oH;v*A8v1wo-5D1DY}=aQj$L~Mm|Tnej*J~~wjJY0_osu#M-zxg>FCA?
z!!(lsZgRc+YKYBS9t*a+#w9s-FHH1Z#}FT4=fikbN66S2orSh*F6d618OHCYVdx}^
zW_2X}utBW4ZOG{1d5;OBi95&V=gQb)Qus6z0~W)9+HnxPg9TSuJxL=W#49!21Vs~n
zhlW{zzwJX&%&rI#C*~2we=VwxJvrNjYD34Hu){{SU=!3GPTm|^ADy8k>=cf`(B!6H
zH)f{SG;r*Uk4F%O9*Co^Q6A<_ocPUC6qt|kU+FoS9JjFXvUxj%hlAB5ob2=qC2c%y
zOXV=4ge0xHiV_+k)45<_bCptAR-Tq$#JgM4a14K8i&+FN9ksf{b2Wc-^)OJi^Q7bM
zzM&RC?sbL~qulv8k()^;+_sY)-E;6PcR)<wTFMr#e2eb~;kb5<7H0|+{YiP&JQn4r
z$9*urqJPtKE1c`F@hZKF#ACu};!f}SxiU5$71B%$=%7P8hsT}#JwIu9)4JWq!I|9g
zV!wDC`H&H`^Q7&P$RXvVdDv3qEI`DKuWSf9xXL_dDDV^>Kqp7xyKopgMZ=Ytm(ah!
zNam3`Kfc6WLjOs_KX90gXC8XPj)&AU&rbVU7SAw30%-|G0ze)PpJXuM&HJ0ce&^0^
z`?*uzhlYZ{3AS56hZ0PV;+bWVc`lb@8bH{=F}7Za>|&lowRnZx#_wPh>T@x91^C2%
zXR^c}xAdEz=Gfa{;NiEYk^Le#kvQ^`3L^d8?yk)|1a384M}fa=S`qKO9ibn@B$CO4
zJkbt=7NYyk^^$6jtvmR_QFc>8SWDnjg?4wFN34^{C1*N!c%KS)^RGgVK*A|Vdi=C>
zs-uWWAZ|C&MiF*AJu_WQK-60;9AW36W^_*ftKTvC;&*62?)@L)ockxVk@@|fvU8@F
zPq)ASGi`eL7w`Xk9={|0Tu++EdaRdL4(qiZx=+e>2dg;mY=%dBtjBt~24w@KtB3Mn
zkMpsfD!vkZtf!^jd{-qY8)`C%{e{ILM35e!i*Bg!VvpRU#Zm($sQ3~YebF<<czX=z
z;P-QAD#KB#Z*8otBDaFe5@*)Q^uloNR9Ri1-sMVW=Pk~tz2;yDA-%+Gr2sc06$lLs
z|A02R)-e+nF6XlON(eJ*GN(P+uE5cDWtL2P&=NCAMM8{?68!d0w;qY;{dh!yldX4)
z-~c!pA4IXbCOA1nF1kiYK&YYCl?WyVWvt|jA%z_dgd_llm<SOen2IFvjj8O0+6ZEX
z$};pXL^!8^8U$Vs!blbwv@HP5N({=y{b;(VGCnvw$d!Q0Db2@<Jn(o3GwEdOO%eRK
z3EzS`poUUOxLP578;JjmP(q6*h0-qVQL~9}58gZgo<(GGfQLjwPbESs*A4urQ<nf5
zuHV!QxYIIakU0ueg@eKpvqAYLdBd}eHSQpnD>jZ&!^Wo8M8}=zc6{iaoE#n!J7B=q
zq{aB!)i^!{<X#F*IIB8|eW+kBTTm#dWg5^@N@^Gu2nP<pehiF-3B!THF-ugpwz-x{
zcrl(x6g!E`hxob?mj*z(u~0pd_^vSRp~G%)>oWkJ&u(wEh``(Rd=2wOoHF4>9G4<#
zUd2H(q)N6HbkG2KaEK-#9&pLG>f?ozJ)Z=?6_{_N@jYS7r-qj1fW4xbiCUGbxM&P0
zOq%7x6I_bmmbnF+OObvR1P(dxC17TSG*z+7cgVT}uO8`9Fm|Y~xz#LZ9$LfYlF>Mu
zQfRPaVR&l}$Be*T&MNw^T+F5^C69+rw2nYqYg?cLj0F7b5nJ1pVlmBt*5da(RQz~U
ztxL%eDoRS$5ZQr9(x)bH!}xApk174E%Ym(#rzOGEL92dlB9qH`ZB1cVW?QgHNzE7h
z;t0|r^hTIs{(fS@*+|Oci;B$_;L)LG`Yc)%t&d;jz&GGp@0XAY2o}f;L`^Sw+(gB;
z2YcL+#Fav-ZpBU+Bx=VO!Z|*3tU=w2j|$+|8*zx09M>aS2x*%b8%@N@p@d4`azSFv
ztS`pkwYIg?2HM-D^d)GN9%_sBAVG~8KPdiH!~h^#9ZWAOX^7CE>Ys#q7qB-K!wE!|
z1frJk0;aIzQYEwZ5(|(GHHb3I0_@6qCZfS6fU=>823Darvc@b*ud8nqWGn}`1-~^X
z!-E1&@NTcs(e}893mi?kR<qut8=?q%j1I7CB`+7G?>iQm@gCR^C3wYGyLX*0$-lTJ
zqmuB>fDJr*et^)ZuBJ9q`=n+3T!5`@{*?fyR(85MhW+DS41%Rc6eN{_nGftzlS^Tu
z0f!>_BQ36O14Fx|LiWbhFp^|iNcJwq*KRC^KY9?Md(fQmBC(fB#86TQ@i8*HwI2A0
zYK8%O*YSj&)RTj8csXWqOhsm3*sJ0fA0YwRPGP+t{n4L5<nw~ag3yHdY%GX`MqlKH
ze@l*V4;qk{4Ct*SC>aokY*;qn`?+ud;Zg*cwjNHh<4^7?CU`Ol8}qen00|=a?h^Dj
zw$eQk%c7-l!h&k7_&V^V7>i&E7dD3d^zONmKDpdCy+W=iE1OYTUS3);T`oV@UsmZa
zn<httMhF>_vEHB|2L|GD;r~e=mc##(N*wVApfkV!J#9v1nce?09esV_|M@(A1ygW@
zCQ=iyZh-6ik=U{B<)iCD5M0FA0DsK_FgA41s=*l2sKFT0>cls0BvakpGPc^0d9X@V
z<8qI#heaF4ClTioET9ecFlLov$zO$g;j&7>C*dv6ca^f-dJ&U2#})Inq$-8_gA^BM
zjS>-FR#wF4kE;}{brtJ1-YO-G#C9mD@GtUKDKTA<_-DYXltC4tz&~(HI-^*x+p+}q
zxGei-551yqH;t=E=4(D?C0<i1+>5X#NctEn`{o`{Wl8+0hcwCDgKr9Nnuw*?mJ+jb
zVAl}8$izXVA^Xl0?nOomLMgo15@t(TxBjCx>X21m+d&Tl;Kz<>3T~WFVAaVp%H)9%
zNiur%{!YZN@nVmBi4;Nx`s~?(mU^kyWP8TzlGh96WY-^d6F{~P6+`B8w>D6P(6kq8
z#W^xr%hI)|<%zPMpO)O(U_Uxtz$;Nmm>;!i3>q*~kr{7qS7=js#vL2%#$h2q+Q;wI
zdcExJks)xXMT825QO}Q9^UOx`;>(!~BzF+`iOeu-(MKaeQjr26mEb{fjjTZc8F2F%
z!){zDv_z947ei3Hl~5wnmkg~WU(o0Cc@UCR&!W|G8ai1b7Om%yR7-(_5-;qA%@~%D
z1gg-bS{0LxW|hSbhdv@nW(o+da_|fiFFkY8V;?>9#19u+h8MyW-mUTK)O}yY1U6Kt
z#;#g4zNQC10{6V5r6?<Ix%thViIH}N(+kA&U&1{9CB*X&>SEaaaws0wK?2)LmX=jS
z>(IgAmYkGB*;76!XT<%%imU`)x+`H%%axGzQVDxAZFnQZ>qm*dqSs!Fyt_l(2Ik8v
zGWcqGNKcqR^?Jjakp@bgF2|5%L9Y1M6GMYyRIMT+Asr}GzXa2?$-3uH?oQ}Yxd%}^
zCKJ&;eEDlrpBy4g8d_6)F+`lC3~Vc57YjZtOHhK%vrsUG`ex{|5m!T6_n@pL4Z&}F
zXlPmLo5v1GCsFtu5_W=%{m{@Ob^}9=y?!d-CTNc~_C6~3<%g#*7Bb&`DmZ)`c^i&m
zr>Bx8f?OrS#1>*kDvo!o`hlXD?SQDbaVdaT-$+uieZdfBKt17<VSYvvEPXO+R2(9C
zXavDkhffvLie<>HK_by%=?KVOc%c?QG~7_d;bX?kX;XzDk(U`UFt`r^F>u=8s#Hkh
z4cuV}XF)GeTc07zM00w!r`|Q=5D_-39|qFA{ml?3s>DWT0r7TR;t<iMl@9}HYf)q}
z22y*O8Dn8g8^DghLu3x9dN|BMS8WVotim(Sf9!ESL~Kdj!$8+u<uQDzB`9Jn;0w<7
zLqwPD3^J4Ta5#Z%a%N&)wt0GJl!b%bX3WcQ(X`gcBAQ;h4yNeVnLDE}X2L$PG19iU
z)wcv|-*vD&ZVe`onZ)8ir2bym_F0A&J>`nLLJI59NMA6LQmd4e<iV(NdQU}>QR<so
zwY=Cjb-AZ>d3kBkN(Bms;NeqTUBj<Dk>#|9B5SV0>9;zdCFL^uF>4m7Ko{0iStaH!
zD#VB=w$j{^*sRgMw4I(Twb!z8I@<#s*hwIQ<5ssOINmiPg0phcfa6xGCO9E3)3s0B
z($TEN`@`I8iKdlVQFK$Kugcp!tghhois^0*61&B0jdOryz!KXNW*y5%mZ1vP^kx;y
zjV4wR9ehy74VI~hEgs{&P6Q;)vHO)wDu_)nkZ#RU^=Yvu=fcZ`zV+a?gBYOQEMk}r
zz>LJO7J>pSCdf^2g8$G4k$GL&wMs7Vh$1tgaqdA8mf*olLshaZ>e2`m>Simv&(XCR
z>N>RAVLicDlca6Il*jg#1Yf4uqOAl72I4RlTQS`=mS8Y_+8O47=u_Z@3h&v@G?AFs
z#o`~Q<2*A0LbIY{S**x;*1?HR5*@yE_eRX6wQFPPWwJ{tciAkgl3g1y4^X6S05&CE
zfpbm|&tVY5a=^Gi;h0JQ<6t(kb6ABdfkZ-2_>lp;DyH|x<nBnY$Bz^{tAmwtxd1>l
zf>?GKy;^q?nFTQw9#@s8U{gU<f{I)vV+@e}0H<#x*``26Z>}Q2*&7p<sGr?n3A){K
zOcOW-a&4~~S_PMLGlw&C2uTt=8Pyq2=sk&G6z>BdXh?VU0-WlO2HbrlZ==lAQ3@ef
zvFx4Y#mg@8uR!*W-#3*rc?b-*I^Gym!<GF0sg|u2r!~9vR4i-`yJdU<7SLyu7-j;C
z9Bfi)ZYeR)NERav`B9)86QExg((J3~XEzhuhtk=@>Mv#-))%D^W6F=Q*caLWCI)6g
z`q;IZMQEsjB}*ZilLJGgn|U1b;Ccv4rAgOukPux8F(;wV=aVVa7!F~oTFG;bEV}wv
z@_nHd(se_uNd^fvC6;5}L(|U$kVdkuWT%kKk}Dk&!PIWNI3S4*;@J=a=cx@TUpiFS
zymLx<OAhiF&{Q;1!d!P3)NXS=t>Cv|CI}VRc8I(lstr@_+u`FKPudA5zoB_-=QRc2
zdL?+KeKNeCC>yZr7!=<T*Q4=>7L1u5@oo}WOeQjc7wija5$uUX<7CHAF&~8I8aEqu
zaj6TP;fBnOKpe=-etK6dfCOAMpWLC#M7cr4qzbnTgp!d#;<o4Yo{vd(SEs5Z!P7CF
z)SGHab^O`6N*(Oi6G#|R<;K!s9-+hvB6bn#ouC6z$~48)a`H4fyQvs*7)c6yC)v9i
zi$S4D#Z3r+;KBL{Bu^oaj45}Z7UG3)mBK!4OLCHEY6U0{1b}@_vzvB>VV1A}IJAa2
zT384md1O@*3eixsGAq$kCl>C7_+ME-hnNlw{g^0>OzGn%RTVDR&2*{7x*cjEBN(<R
zz!MWk%P+(gIBZp<t|Gu#s;A^=aL{p#DXjLX5j~D~Va+W@P!O4b(IZiCbOO(4gvg+H
zkfMZDfH5?g4GjgHup~g(&I{}*MChK29wNK<cxGAkd`>IP)PPvrtxN%yEAb4*=Zg3_
zY+uh0Q<U*@45?iN*pgZbXGy2ql7g^mUoR31v@ISDH&NqgkL|iBb~lH(gJXu%vTXAY
z)H?K40Bj!iQt<YOB6u{oO%M|*&OngtP~a8<<wEpdh4*h*n-wMiNJjM~>Le4^Y}jE2
z4hxTi0`zd20!|Nw_lH<p4CFwH)<pt<eFmO2$aZIL3C~D`8EMZh!syu9{2?~;%^_E?
zu>u}Hv{)5wsd!H(iBnl=lUdZ5B9$_WEYod6d5yi7*;rU?f)|{6B*>M|i?8b8vK4pm
z?2Zitx=E~#XimU3Il!7(k@#v3E@z23gq(}0vw#XF8WI@^yPbAeLe2{8w!`C>gEA-Y
z#g4dgtOZoD``*NzCUc6I-9__c7{lxaLr#-k%9^IUooS4P`Z${0na05r#@Hed9tmqt
zk8bk&xvujaQrxSdmV_z{PqzAz@kGa-vLimrv2*Uwr#MFH@Mk#z(?>$PstSvFu!yZ_
z2I^ZVm6W|*a=AySPMZ^;Aa;x-<>`F0ZY|3$vs1QBP_nf)rwT#S3}hdzPH71>Y@0-~
za~{c}=_E5(slelo&Qd1wxKuP5*ii{s$aBaNNC5WF6+)PnM^OG?c#7be=C(4$(>J`p
zaTy7aHjbK#y^0`2tm3XGg5bPPVlWPW#|#i5(KHf-Zv0x}!-<~aQh^E%5iwC}kR68f
z76;v#ukZ~h;${ZF(Q1;BWDz<d;IQG49yHs2SNJ^*Yg?QLYC^<rNYi?v-g0a>(ftT#
zb6`Ev-DJhK;~^JvI~`_w>_G+AChQL|xyngK;^ZH~c_l3P=<Y2QK>Ug?y#R%yx8+_@
zfOe-MkxuHj<Z71kWf|m5l2#OU<`LowUj-*AFgu|nj?shh&Mqz12|J{P#f2s|h`1;j
z3?88<gtK;%3k0Bev2~Y@1xN9e8gL{5M}o`VMNCUIbab@V(Sxl{n7Dna>BNQ<rV7Gx
zkx~RV!&h(sOuvwGpC+>!a^3mi&~b}qH!G)+S{&JhC3Pl-aOl%a93k?<5G>)=YsLa)
zqEsFM7q~HkF#N+C_#-j)BN%=+S`3#7Z0GYu%JE9y{M+)$4|~Q^Ol;<YFceH>cpSAj
zTS2H134@ctpf&^kC$<WudR)0zv>ODYftN-Q+H3LRuuO<Uv>(W15&-em1EDh42ZyR4
z08C9m29gigG4%xISzoVf9vgpJMoK?mU{yE)$gZgjY}(v}*PNvGVFq)At3&J&xS}u;
zb(kUXWG}c)@C_;GKLXrg%^p`i6=#fyOS%a|#*2;`<_Oz87k-oc4r53tPfZ~kRh;E$
z`w-{scMF_SB#Q<}!Z^qPMO;k*!91f=#Mx%rCe5m09WJHO;hrHi3R42{w~_Q6#_)(U
ztsizD5ZHLoFf7NsmW&M2sBzcm2%pn%<-L<KXS@~2i{TtHJ)$H@bc+C`0d(Qu5;Bn#
zoG)1?w&Xdqj4y@kM|N`yzO0}>Xvo1-Qjem_@IKL?+=I_!C#_gL`zc2_+SrytMw-t$
z3QHr_6f94|YBH!r44-w}&^pB8jGAyc2qK1M*v?m2`(~E+RXBObZ^?)!5Cs>id7_dX
z6yx^DxgB+h+dAVm?fIjZ+>RiB0FyswBp!Pd1L&>bFD``KjPA06x6SA+D@0lhz!HLx
zxo{~yywi+&vO;P3$R*ymcbtE8oajii!<g=fh0A84+i?fURY$udN)EMbOK>|v=@!`O
z=0b3$Np^>U_$|5n+uXfYlGB0a^i|=2Q##j$YqChJr(ZUAlt~%(LWkcvG{&-8949DT
z4qz#g6opMzavkOzxfEFpr7>jZ$Q9fN!HB}G(_^YnUP^ajVtT)vK$4*dz!X^r&8R^7
zSD)cNoS)<TKNh7&wv8d~e=MIit;~M@e_Ht$=l?&K-{-G0**Q_C#uU%z+q5MK{uF~t
z>|rH>Qp88TsVcM%&hy%kJ5CRWnK?=Cau*Dz7vX_ZULV@7Bd{q&fW_%T{Ap@I{ADUY
z*Gm9IWr!<qI*<Th$`60>dJiYq^_?Tp-gB<ccE!dH>bq+*hvstARPJZ}-ISGGGo?{Q
zE=uR$S|)#<KTiHb@GD|%Uq$H=ZX@&kFZk!U|93`ZmRxy+@o@e9AD92G<Bz1+k>r7q
zkN@=YX%%0L|L5^bJN^))Q+{OH80!A-vgy-o<6ntNd}0569zWl5g<O~h;~fpg@QrEZ
z<>bb+vhvch8FKjyf7vwuwCQrBx0~LS=IdyH5Lvk#w!n~m=yxq&s7Su{1{rQ>gI9Ls
z<z9L<u6cPU&Tn73pry6Fv0d`j02b0R$=7HeLR>*UiM2`o4kmgaeFd&u7ih0-Ys97`
ztB=fCFjet&p<Z%dsI6I_)R>gvu4)6{SwU_+Rt;Q??yVRllBy-)eiSVxC)I%@vQ61#
z#>lRX%6dZ5@QRgQ<`-s{3q!6?DsHvsusfXfR5G4QB7+*?+Xe`S<PwN=!>zNM0ev3U
z8(4pKspKwVu+QbLU^3Jz+<*#wz}Gb3#2~)XGcxFtd`+!V2Lg<*x!{RfY^W*%8qxbb
z5}-s0KyL8B4nc+w+iB9s#X;OqXa=Srt;8Vs#0K$DK?_!(a#H7jpbpV12%&|b+!N8e
z5S{T2)c6AKFeVZLBcn0v2HXr4KJo211}sO=@*+m=bT?pULC0eTPoE<?z@3Zu>I#6V
z6Rv=J$}qiSBs$Z&ifDC8ha16*yU^&w(4TOLeG*r~Io4&-2^AhLHrGTLq=)p}LQRXo
z2%>KZKh+A?z?PLr<T8DVHsezufaGgyl#AGXYefW_77MEb5WouMB0(c*!iV4zBdI6U
zFlh+W$QP6CSdbe|v>3Z~GD>fpgyBbw3Ip248ZD8C-4Cu;D2{h#Y2zHbmDmOp0gu7O
zlp21^Ijn_LgTqNCY*<YQ*{7ljg6UBr5d>rv5bQ;0MOeE$nk8%+m~)h_LX)_A6gxH6
zrzP|lCQKiiX@D0-fLvzT*a3a(1`jqO8@<1t@e?`Fj37ZvtUPcxg$>i049;Bhz9_kf
za1d}ZOM@!bENB5X?AHvngd1aMJ!lwcXz>137mfHQSK(sh@eMjW9H3nbz1xTI5jfld
z)uQFzA_>oYM8vQPW7q{e3A5TKG0zne8&Ft5rM*RpgjzMU9`KhDvW2ailnl}sB1%l>
z7zm(aCSpBCz?OUakSx~}iR({4olx|a<^=F1h&d>N<Yyv^L||l=q?>f1ka!>zgBUNz
z@M{z%7a(yIjVB2cpspcaguN*PvkJY_$B9FUBnWv_APSPyjLilRm>Ys*W|+GwOu7)U
z96`))4HXq3Xz-AjhsFkFf*fWs&4@>WgG4q;1Uc4{oQfs2h$~E}3hbuB^+yr{J&4*L
zkX6_qB6+D8!n9p4!Eb2v2M5VEC?ZxO6(=(cngCWq;~K>GP`kAPe1IAX0R!@l_@!VN
z*A8M1n^h!BRCGkOaF|>H9Tf2ml0bLB1!V$Ia+?qjRw`BpLTVfz`Ov}$SSo@@fUnJ=
z!XE~RzR6(BqEbGJEHnI8LqrGNXYD<C_`$-H!eFzaO)jb`k}XyRo}q(bSd$&kZP+=+
zlVAW&3K)2X(as|I9t6>wpfUiDpil0wm1YPEuZv*eWe_nOPiRq*F?e}{Kd8bJgce+Q
z-P}rLRua5(qza)nrWikwFdX_G1=kc942V~>C=$~NI7)*jh6}Tf1g8oavmfw}`JjnP
zVIhmjP?J<XClHn5s3~9u1_+pybpYDJoBg3)9cc_pV1;#}c7xqu*?<?4sRiC_1V!)E
zX+(A7K}7w+fnji#qBlrxO9x&;v#>iAA;&0)RwqPeonYvh8aha9i&?Tsa10Z6N5SC<
z=aWnu02yr^j<Fy!UzsB-n9G$p=r12OU5Nt}nY|sYz^lu>5*SpxIpro$u?+}H2e=&H
z097K9<5ZmOhm2QHtHTn?K8ipi!T=$Pr?<lNtu@(+rGUO<GFU7M15**3bdX2YtVup%
zn3Ygkmq^34(0mqEGzng6NjQ`OVG+?H<rJscrwHm3C}>3jZo-K)EVsCb*f>QV(-^_^
zu{mbhMQAb)#;HRbo8bsiJW}ROXdJeE_;yhi*N2b>flfBC@t`a1fq-1y)ZU_4=6`WH
zvi7?Y68J;?rKSD-{c!2NPfzrek~L0a^}Gcw?H!G^?Gla_kfTTj;V>7=dNtHYHx`n?
zSP<@rA<b1U>}Y6dYnR%5a-*6^8NrAaHA20JL7IGWgAehlT(9+{R0vYmv7(d~`{Y^`
z9I~)9gq^y7^%C`q-#_t}$^R2NLJpvz{XgY)|4;e!FZTaFmmlx{37HO{igSnO0ID6C
z2Pni`K+MhI=Kl%V96<6iewk&Y_4|aF<45qLfTt&!2*!*^5R8B3-I3w_gQT@I=6oIa
zi7zBYds0ZkO8A`<=Gnn_7h|nUy)pna;qC`v&X*`&L4;w?6H9Dl_?S*3Y-#kSVyno-
ztvGI-!h=mvSnj}`1^E7A;(7{!;=}8lU?`-)8*@l;!b*tRV+N7odUv;%n8(Bn57Dr5
zf>x{f)C)j1mpfV%j+;^(s3z27NHvCn+?~l5zQ}~`2fNyIa}in%B9wKwy_D+IE)`ng
z2t!B9AngU=i8g~ijAvCQ_L>pw!*Hp|gLjk(%}xC5T|(tK6ro=+H3aH1p`q4{D4fDg
zkoO6lrYfPb&l<QMJqQQfxz};%I$j(qYq$kg!LQrkb%EJyKniXO#Rjn+0|G?h$b2vn
z>eXPdQwfzUXNWNb_6ZyzN9*=A<Y6A55n3OHfw`eo1{pC+I0eoZWU?ZZBBrMiQ;u3>
z%$PO_EdfbkEyR4A7;(Jf_enM8LwCeO$ph33&OwKT2g*fj7BIot31)MRpjllaW|A(E
z`E4%wosJ&{B&rQa;DBW`wK~GRF9%F7lHMxD`)CPkzyO<1yuo?^)-!sv3(pv2Ipb$r
z9JQ!Xjb~q2>+V()um;9!4)(r5MD@tX0!xC?XOs}(VGf4_BI&$~tA==Lurn=~VHLm)
z8J_jSbo5BY=E4C6o~(B9s@?SZFi&TaGH}qKWW^L9E2crwA=O4Pmp#^Gz$QB&L5yIw
zz!V0GvaK*lz_+ZeLhBgWT4?qYcS}sQjBE2o4Ah5+8YBx|WW^eI!3RX+d77^Ic^^NK
z<-lmx*w9JEt<RYM&A#5}to{g_eb_BwB<Tt_X}$FmHm4lBWu^$N>$L>lSBM7T<y8c*
ziPp8`punT3lL<tGE|_U)AQ1l@>9OUzlR1Y-2rn}Y_65^cBD2l_w>9;u0~_$GC>^b$
z$o&sg2w*>c8<7RT=|~&~!>rR(YKXGICl$N%IuOL<Zvvjk5s=;x7RY84881DKIKft)
z?b6_tAzg>_(hAn=*x$;rgiJLXo&^@gs5YnC%SG%_(*cP`%b@_6q5;woYvPxcFhgm2
ziq0F3RpMloPuhb{hRI#!EYu3Wslv7BlkokbFh?Wg;!m4S$4UXeETt0WaY`<~1Zpl7
zhp9{&#uFUzY!}i)R+txY*BNB45jr5A#MioDO&?biWE_H^uM>KzhipXkB;aW}XkXT2
zuJX2qF+Uzbh$qLE6j*FfOEXM&C@AS*w_3tHkA@mEXf-WK@WvPDz!g?@zmQLA(ECAt
zV|A4vN=lcJC6|DZGYZB?;Vqaj_4FcoC-J+-&=QDn#HS0uze;U9I)j)Q1Won^Bb3rQ
zDj&s@G-l|LKG5oj`wo2)0yXTDaDi^E_p!6z^e$7^6=qD6rmAg7INmcPaBs!Y^z2IY
z@V*Jg?fo?J-p2J*UxHjk|J9L6g8e!$>F|zD1ZfV{)RNc<*UflI4~0?*!cmD-EJnS<
zfJU70hqWC?ecfhv@o^u{6OVhF!gmf?xMN+EGE&$<6V`oFJ$pPL7D9Z4?ci7{+6BHQ
zpfO%X;MWWxz|V9~ve_?CY$$h5ePdGqd+_A)N?|aW6Of}~8voDd;r?-T_Sk(w@)zEp
z|9iiT@jt!EXygdAF_izOvhp0e|7S+|IbZmHK9Aq*DPHf$1At_&caAi>p`*D8{s~mq
zp?^9WJDLJ>ASwt!LF%YSon1=Oq}ff43+Bshfu<_ONDd<D(yOXTMebPI8mLmhY%2{J
zh9Wn#1?urDZ9e!!)k+CyX?9IZ-BP(`UTsTLOIwvvP>+8K<TO;w0q+tjS}_L)898H&
zpbYadk#e(Z=AfdpOKavx%cR+jbLhfoc4^}r9B_n^i0>b#;BSazq4_H?M9u-_0Qzqe
zfkbc)0n)B9NL-%|BMxbH>l`jD$VTr&k3|wkY3O()eiR)sNg}Xe#3dopAZS3Ef5XTm
z3;AJ2Clv|w8DV%5Y0VcS#2R6MlF;yx4N>BU5P0;^gOs>=GV(wrRGGyck%>5TsFJOU
zJzS}1E}|OqnBxJXArZFZe@@I2kkTb)3E^DiEyCyyD{Kjurxh~CEkT1r#VsLdinmYp
zY6>IRp+_!ZSavuR4Y%MWjyt{xVEViQn1Fp|5$^eSieUn@tBOp89OIei-zt&`;Z1{v
zOriF_AePC(s)ES<FQS<aC7S81p5!bR&;);zZyz>{soR_y#jV&d_G1417lk)598?*w
z0DA&WeyskSK~7w*TbL8gmWlE_QlU-^L5&y?nWCK>Hm|650ZN2*)70`f?g?eluqVha
zF5(Kf#XkuR4JQJMHQz_9%CufHyc(lEFn-~L7a`yZn_bg}(yHld(8VdH%yCJaU0OYd
ztjjEK838{6ml@QjE;Ca1P{OA0iW)8_!E5AFSi0h+EM6@CtC#zZUt0eU=;5e(L|i~a
zo&T>av&a9;sHprR{^xV~xjS)?fzO_x#?$u5dUCMe1}1q!`A{=`c4PBAxxK9x0n>YQ
zUys(UAj#2D1$T}sa!pHHU7)S1Y!06Nbv(w<B!X^k^kc(<FTie%3Nu@Yx>k^pg_LF&
zjxAw3%y?G#5Y`KuFbU?ENSnJfFi(^@Z7Plm2*HM9EES9psl-=cZdC<j9_J}@DHpN|
zhBB1&`AXrwf#v`%N&j{&rY1u|QR~~aIBXsX<+%h>p%myL;hpFq#!>I?*0AR5SG&+s
zE=l@f>dsU=jLlAAgpih}`Z9vu85x@(^e#msg<4Cv3<J?nl=0e|tD6w&P2jU2ZTqGA
zgeEs5QBW~WE}!l%pXr}AL#}D-07vLKsH?Qf|9*)+vR``tKb>z!ppDG(zr3uX+<yMM
zva)j87xMq}_|0pqKlhyA`mFU?e}m6NR#snD)|#xWbw?k4X<puCx~{KYy}GZjZ_S!D
zmtA&QcJ}&Fqc-H`ZaU_e&Ev*xJnpzH<Hl_rKYq(eCv6))e*1|h?l}469jBaf<!Pr~
zaoTBLnlk08GtazQQFfkr<~1JAwIwCjRaSnvy!`sg${Wke|I_dPir;_JdFS0+Q*&!w
z-7PgWy8?mT=bwLDL&NP&O}8~S-_hFo^^T6OU2wrS7BBwh(xrD@c;Vg4mw)r3i|$#u
z^4?HrZ%@x&O?%+tiyzSSha-^(SFe7!ukU-w<RgQF-@D|JM=!hVhnHUZ=*Ep3w`|$6
zef##SuDWXH&Yjm^fBjd#`qi6nzIpxnAMW10`;I&Axbx0C@44rm2OfCf;fEi7<dH`n
zee}^yn;zS??eWVmf8vTOestAUPwm|K^tIPMbN%(t-FV}VZ@lp*x8C}*-MfFbXU~B<
z?s(zOJAZ!XoiE;V&oA%2_g8!OqW^#Cp@)9+z3;vJ{qMj0#1l_E{q)n%J@?#Ce)5xj
z`~K^N7hd?qFMjdTOE10r^2?7scJS$^|M2wFuRZ(hYtKFR$LF7aegFPH{ru-|{^A#J
zz4X%CzxmBOFTebkS6+GLkAM8*!Gr(()?07=<u8AE_0@M@fBmm-yz$pJ-~8Y&fBERW
z_uhN=-M@YK;fH_y>)-$Ow@?56_rHJo>HqhSfBfTL%}D=$_?5taU@m0kewI~~H@V@y
zU5{<bJ$~x)XYSkm#J2o`^KWX{yXQw&OqzD_@1EIv+tXLewL2y^-hcbE*A=(lwfx!p
z@A&bT%R<lH)Oh^v+rN5U{Fe_-y8MFO{;j#EobqIG+xd;NPCezchIt#>N44kHSGV5&
z%r(`gkH2wBqIS%<voAg+ukI@k?ke!NUn?*5Up{_v^_H=Fqo1}fII;ey)5>pb>+wBV
zRUzl*&i&8()=RT;uCIJ%RP_Xp;qza+@k!71+jsVj%`ID*z3FGSPK?Cjcidfo7(Wqy
zam={7x`Ld6)A!%_?KhquJL8Azr%#)3Q$bTl{or-2*KEsrByje<D}HONKe6KFNf+dg
zUiDmY-j&~ZZ`Pfo-yi+sCqCQOlfQ4?^IvY=b5r-Tz0$_w(T~ddf`5EF@yDE(N)~7h
z5AB<GO4-DVj358{tbKV?XI5;vY}S+$w?>W{x1=-LzpHNE!Y%Kd^XxG>bxUsD{94}X
z(;M3+=a25M4D6}icKS(^UfFQg%srbYPki(C{mtR#x`v}3Y%c!&ww&Ibp{2Fs3ZE_5
zK6%13Q?}1;du_@14}+&}m~-j5b4OpD-?+2z(w$Q_k1dS1ZaC`LwXe?|J$a|RDL?da
z`D@qZ{=GbS{pnpNx1IQ{#{c-kl$FoquMFno?*GHC4db3#I;LX%>StEXUXXYC%{kKk
z$8H{zf6f7A<?Z{kg5TaU=9ViCZke%u_t@Lt-J;Y_eKGrroSIMW%=&Eqy1E}_PoGnF
z!x^($^VjdXrSJ7uZ+dRsjEl1-ym9d9FJ1Ri*?+Cu`OEr?wD^T}PiJ2fcx~GNRY0o0
z*irG1dawR%#o58lS0~P@Jww|4*j?+AzIj=XoF3?Uxpv2EJO7+DcI|IUzGJ*P<E^Zj
z^0lqGfBJT@JXrSqx?fJ55MOlfZExnh{Z@B=GW*Qx?%bV|pU9cG&o{r}v^^UipLAZy
zecPUo-LSE1rgHrgYsZz&yXB<Q_HKQ(y5Yua-hEv8)9+qgcT1jJeR9E74?W)hyHEV_
ztXTu2w&c8BS-5%EM_1i#TpyU|-FMuWMrG6ESMQm%ENe;ssHd}2=iXj<V9NY^zP<jI
z4U6tw_u7y4EvsHp_`5s5u}O_@{cPSAIli>^>YL_%@SDv)|I@12)*Sz-(bsO27u~gE
z$$`hZ*H_3j6PK>3+jji4i67+Vl}z-lF*eO?tr=Ih{Jl+MCr7%c4=N=!#u=gT>MbXA
z7teU_{GI=K-#c&Yx#Fa`M=$?)+0Mc>ukD|^?K`9A*1Ue_Z$7y8m>++ws`A-A<97z0
zJ9omU2C444iK~8jZv7<_+N#E0y6*X#^Hye`{=FXW{^Ra1KYjhUl9Ss$s%h9T{*zBO
zAOF))SE)bnHgC-R(75VJ>EmmPC-0te$-xU=%xZWjdhE($t3$bM-C4Wed2{!ajn5ok
zKlYle@n_XdkXN4mZe8E4?}ztK*>PXin>A(UZ25k6_Sn0&pK$v2l2I2$wtV)|ZEd4l
z@A!IS@9s-Kkmlx}k{IP#SvW!JJ*xJjx$CR556nACxq5KYlAEMS(d<zlAFTP^zUf!y
z?$Pp=KK4lQq`FUY_l-O8*9ZT5)UKSZ=kCcpYwYEZeE+HXv&+AkbM;qq+rFFs-O;&O
zy~kWLzp-K8p0lMZ=Wab=Lty9QV_yIJ`C0PL#ve_7bLzy$q=L5l7k~Q9yN`dVu4Y_s
zU9ME}?6Whzt*<>X?~drcf~@1W*X8F9Osx4}|6PkdIWYIyEB{dV&aTIoO1o-~8LZt}
zSTp+csfFu~dHcdMei*p*n7Q|E|LoJ?1f%u*jVHXKkG~*i?FsMaj-B-Um(Q#DRo2d>
z<JCWIJ^!SgH`m<0Yt-fE=43zg+4&8pl>Gfi+AV)go&U~R2Y)j2v5#&HPDvCO)UDk#
z@y&ZmX0EL(`o@@@*@N|?Je}+FpLoVNYQwijXD8p?UO2n8N$Xm@ZjLnf_}O3CIWMy7
z_8(M)kDheywylY}^T*ycp>k8t9cA}_FmT=e>YRVfTwgU=ov?DrZH@0$`p+AqU9f!i
zaT8ZQSMvVAD_@^ny`%M^JAZ!J`yVXc`nxRo)uTHK+OD7Z+b7?u9lK%k<Wrs;b@%kI
zys~EIL*IIJUQX9bZGRuLXZy+1-@kopVRo&*Ki^-t?`ubIs2kJu+>F|bvd3Sx|EN(r
zK3e$p=v||_zcHmcr+V||m%p}g&))Uj$G)0dxcS8?@v@xYaR-X$jXpbTW&UT+D8>7K
z_V}+;H;m2wkI`LoH<zvt9#d7EJ-Fnhf-!ISrUdTmsJ-jpPgW$}Ui{kSe=h9)as7SI
z{i1hE_6d*vvfkgPjLKU$&~WO;+jdqKKQ!~e_1@?mp2~eMRCdHJ`R#{e@7%g&cK7b0
zo9a&9`jx;-clH0k`%UkKpElg`{jVG+9lZNM;przdKXFI@ci%pCW!>P6>WM#E{DX@N
zem3#N9pkTDbng#exZ_*V+8GBQJh|d~TlenT_sj$Pt{wRJ=J9Lp+y1LD*;4DShmP8@
z{!9OL@}1dh4~|*%QqIJ$tlYHl=G5%$-qrP6uk9>f`=4_vF4BueuOIXK{r5ih@PXPJ
zdUwsq{?6PhpMGFd?p5!U{G<M%DHk+6{#nh8#-A1+^KsylnFp^6{PpM!zdJbV!6$QS
zm%sZfeRNju>)(8$;?$bam1h@@>sS}ve#ieb)IRm=ZR7om?!V#0tW$5AH{s$*ImfNv
zKl(qKU(LVnv>UU^zL8&e?tv-M-oI4Gf7AVsnvWm-@Y$>9%F*xmTV8#B_KdfZ>%RPQ
zcKnsu<#Uy1lQ-uVHjIBLPrh5J`SXRJdcU&e{u>^c@n)oF&+7Fh{;auck8aI+IWPEp
z{igNr<xj{fc<q8ITXyCIi}v2NamQ0Xedogq9@JLs+WY%YX658(7oK#@_N;X`T=dsP
zodcud(Jhm5vOoQ8?yZl0?Tvrj_0t0njCuH;)jvJ=)cGrKh%TF(b+9<P^1$jTQqA2P
zKl|aae<*!?Sv33UM9*0lJ^JbkXRS^a9`oq#u`|Z?jPiUM`S5`=Zh1fN*Qfq!#jN+P
zuYWh^^!Q`r8mf03x3_rxrn@#j^dFD@^w|~HC-U}AerjXahDo2Syx^#D)d%ZW?OT0L
z#rEU9qrNr2`PJvY{y)8!A2aIcfpORNAASG!swEqa8-Huxr=#8;Up;y5m*++w-*)O}
zZ*70-yMJDC(w826`Q!^*N*^D4-oRtI-_Ol@a#QiH*U#R3eBJN!|6CG2Zsxj&zZv*R
z--g^<zIp7D7ax85`qvsKsmDwxJK@DK`G30i?G@7pC*79w%XRrhI~Py!Z2rp|C$Eqn
ztXVtZ>u2m7^LqX2y~osz&D!_VuU~bZ@jsi_Px-;E&zySYXY21SsK4&rX}A2~<IWTR
z^z+-!$(nZVao@^YaMGMV{ABJU|9$SYA4Y!AaKdB99>03?vST-HzvAKZpW1s)aZYdG
zz>F~^M&l<NPI&tqPtNZ8vezfyxcP)d@%6WUn6>%7{7oxIZTe{ZvNIP~Je6J99a7HS
zctTe8gRdohzo<ScD=T>0`oB)eu6uEG*4(V$PRKg_pqBeuR_E=jPgCa=95{Mm$MiS1
zoNz_!=K6unfk}CNJL_H#o^Yw0^J!c5569$v_o!sf&M|*_@2J^I@x=U5?{7X~%%sH+
zR!6+AY@Bq%vc0M9`wO#M&&<E{zA^nfXD*&QD(A6*oPGTb*W~u?8*|Cdnf+P4*X19*
z=-n9y$7fZxPWWuguH|{}9sMOG)%|+@-8blU;rxnk^nCMIb7tgwLuFaT_br|M?W|+(
zD_6>oKKi~5?;k&^<)iGW@f^?o9pCzR$G5(b)4KhPlXi|?zwgv**XLfmD`(>i*;9Ar
zRJ>T3^KSNzoV;tZ@-~-^Ia4k^YVN2TpBQs%&FR5SvG#qJjNLHm4|NMl&pdz23t#&E
z$6p$|Y4XVjvrm&J-94dr(zHp(?#e!6U-nnK${#GuK4Vw*lCNj4*p}bcI_l*2#%%jh
z{>(pJcwo}h9M7ds{cXV;FM0QTP_QMjV$X)FelQ_x!PoPz+?BPXcl^9~<d_2+E*d@e
z#QLR=PG5IMSLthyHIJP#`mQ_1?|3qQXI9xe3)eQQRd0qr3l#o*&KdFMylX~Hx_rW=
z?`Hi!_O3NHj_W#85@|^bv?V1MHJqjyuWCiI_+CCFirR>zD2X;L(j+C<bzEt7XLfhY
z*`3kOu1LxdEIV<66h&cMFcK$7VyCHV2QJ{YXiy_SZ3h9`^he;tb<nhbT(m(E{|Ev!
zE*iHede1rc&fM80ch1Joz~&F~-pl*l=eg%T<~*ve-ulfS_wC<*<8K`A|K#<%fA~*5
zhsW>x+plLX+&uVMD>yWCy7ZsdUVU}=t8WZ1{-o!&tM~tJX7`<gkA0^;`_oqs-ty4d
zg9i`oe(wI`qYvEhUxTmw<H;xYbkzQScJJd0AA6+pwwJq4KiRdo_xP26|ASw9yzAb-
z?mRuX=gPHfzc_nc=Y^rc-K&rN_|fNQJMvGQJNxi$zdN<_>gUg2eq!5&zgxNf)3e`u
zWZQ4<IlK3}kBv-y`lTOU+jiaLo~4g$du{vE)xx#KU8lagXV;%R_?73U-+1YA_jBfr
z>F%O6cJ1n};qC*wp8uk`F}J;YNBO_Mbn>;%Z>GC1KKDl-{dWF^pI>`p&w=#+br-v*
zx*p%y^Qo&Hi-SGR@h|_2J-hsaFZ}VNANkgUckS)zy8l1+Jos?OLPyV$+|H4XZQn{?
z`RI?*>w7!8kMH>HkM}HI?Rc<bZ{5H5`X_f?5R?BGU;Ue&8{Zgy@@vDr+dH=1^0Tgg
z+u!rki%-1pqsO*CxvS98dGl+tpZlvr4?KF$gVWn??&vHGe(o>t>VD{FU;fywnXkOE
zv+zXMC$8=odTo2}i`xhM9iO;*^vds@8-26;j;mkzt(#8|{eJhzt$WLU$HL;5#=o}L
z`u?$npLeES+&FsEu2&xM?Ta^^?0D*bdUh`^_Sp~IR#^M`3qR?1FL(PFzS!5Z``%wX
zwd4EO?YhwE9skp(I(N=4E?m0hk)?+_E`R1Td(JL)ri`xojZg1*Y1f}Uv}gHv*E8RF
z`qyvjntScKg<E<aTI~AQ*=KH;+PQF{bGP65$v3+n>HbDaKwf|5hM`^eO>}?iYUg}+
z*Yee;t}X67d%Ww8=Q@Aq^~*~yU-$Swd}H58*W!zvryjoW*+2aJneJ!5{m;*S@6Bgl
zzVXk0@Osa-Z5>D7<D1_H_NTS}_uC@?oFxA{GT!w5H$FP@;rrja@e`B(<tu=<6ab!i
zPbGl!MuU#|R`S33Ed+p#yLCA^CH31v<~Oek{k}i6&y~pS`%L>Bnzg9c|86Uv>l602
zDWJ!C^^WPEw^Tn@^Szb&x!&)$R|Q?leT1dIS8C|84WN8Q0%wVe=pe1)VVjjMx|HC2
zZ*|cX$-kY7=#pVb9e24{S}CT(NHhuKhO)SAYo>E$dEW`u^r-0vqjl1*W_kmoe-E|O
zalJK)*=?<&9!iDji}QW0rLGS(Dakf0?Jc#{RbM?N0S6V}_8sZ0YpGjmtvA%yptr6q
zg%5(_x*AkJ65;$%cl`sZyUtsh?}!e&BEvu`Eq$oQ&QN1-M<y3F*<(W6v5DPGpM5J)
z-uI&<?=PVN|End)`%C_8`Ti4=Y<z2Vw0{2?9U2`SX_WsR8~afI`(63jQvO#^g3%~P
zY4n9G{Vl)jEU(-(Kiilsn-WKo`%=5%bk~Q)_0=|fdqQwe!TpZL{^5Ip1MF)8coOPl
z9Zg*UK}{(5oe(*0ls8tR6bb#_j-%8ldMvhLamxnw9bFAXtL7JGZoA{`!piLC4KmB-
zWx<=p(P99e8V0<aV|l^A)biY!fy1Lm1~cPF4remBXi*QBW~gs?5C%8wLLLrw{eGnw
z_5r8uSUOkVpbO*_))V$^NaUM4bw+gFE{JJ7y}URzGka_Zcsugt>FieB#%%&ves05P
z(wi_g<G)74Y6WbbW}w%Ysu$rJ1MiRckGbXPGsfZ3KI(H{rZ0oZ@7$otQlgo^dpbT^
z_cW4%Xpb>7KRdM~z^;oAm$CT;$zv!(T<%OCp36KRHyfiREm~g1Bo$W@1P8Bra99uO
zKD^&x&D!(fy>`B)q?}c$)Io{IOEIGMgD#|3I~rx&rxtcP8!hq8bK=OQv-oF=Jgo(^
z#p%ebDKU78$W339&7KiMRCS7_nz0{7>nPGg9|&U`A*C#yo#|V0;HXr!;qV=4eAiLw
z5e5hJz?61$YSJ`Hf~jrVK-bB`aUGkrZ#0c`F4HClOpqT}GT>5>d>BX&o}ME$fOK|7
z8$5X?Iy-M5$2ykwNjr7IKzh@~?X`K@H<Zo}2~Im#so`y%^e-Ca^L4;*Iy)=?aCMxQ
zFUJIEQdfwf`b9<J7d)5S>!96bh{lV<zI+OASz|xc*$=gzBRy0g<`u!J16IwlZmNC8
zv#a^AlLHCR3;;7&u{`i5HFX3KBLcCk)ckmj9HB;zP$ThHkXRLs%LtClv^bb^AQ^%{
zpQZwM8iOV#!>C)>F(A6C=ZX$i>-2n^3?C)<sDQ&oBOIG#<QO5x09mgfeHt@@?SU$M
z(-^lZXq*Zf2MWYH%n3X1n&j>~;86qi0{So;sWY=Cca$b~6eo8|+!sq_yXNGL1s`4$
z#Embh`J*(|qd3(|HhC}>eQ2YA3>A>U{ugltwt*fYw48r<j;)vsULhbfXgF-hGwe#S
zRtl?5#*Yym2mn5N*cO}ul40WngXvyDCM}vBAjPu!dzj#do5(I1dW4`ybm$4Nt>Lsm
zYS?S&^EoGQa*hjc6H9dl|G|Dkuj&4JTAC3_f?<E5x3}A3O|du~_7i$J8`&921Pu-1
zHZUk)r_5?jY#w4_T-Vk%o}_(bP;MoIxSC`seNidc1+l(Lp2cVmEiCve3cC}Y%2u@A
zCr#53HH9{ost4N4Jg8WW8Mz{+e6Z6%&oYbB>d+iK)fLP<XKT&Ccw}%epg6%3^Q*1<
zoq<kgu*aC&SavQaEU66ej|_5;#lWsxUf&#<wn>7G01VlNG2?nc@^+B{j*&rrv1AuP
zKXM}pFb06JCYpz*wwWaCIAF)Mwc2#L*cy8nu!rTipTPIQhKXxU1Y&GP6cN<d#Uh8#
zLG!5PzQLGyJTlOMVavw1Zh#o+Q6d8RN-(c9>>0J=o<=*`v>AxaENnyTVZ*JAHnMQZ
zz@^Ud>n>wU!HtZzvD?X)b5i~h$WJFSv`^7oS3*BWsHZg2i)IZz=JAFXNLg-uxCgb<
z%`t!iQQvNY4Ic86&L8A)fRE$J9zT={vRI(k)RSf&_7f+0<PJj_K;N`m!{9A%1meWi
zMj1z-j3co%5~J|eBPa%8OiI`+NA~Sn*C~2V{Z^l+WlJL=196VHgkPP`(Gv-S3dVs3
z#^vE0rB6a}n%E_1Yy2?ahd05;*WA_xWT1dda{*I}bDW_Rlc`wMjIwgHOdrVT<FT$~
z9lLMJEBKtcg3Fuc%GC7yta0buiIvmG(nEuTH^Vh^Wyv@v-*jr8k16odcRCXlS5PEO
zx88zI(W2-~cGCxieZE!bJAW#jJ%0)_#$NlI@|~MqTAo`tBXY}7G6uc|Rcq-i{Y}oF
zrvpck&L8lQp~sW)mWLM3v-CGPKYr!G7YsTzx6WO(YX!S<DV>!87NV@qeh3R=$ymoX
zovN5m`kR~|KIf&g@SB&HMoNWv7_vr0C<-Uz%DAJXv-CGPf5l!G6a&AL^U5J&j*y?n
zr#<|`$St}j8iIe4b63qZ`=UrmXH|%W5hQ^K@t2i9kof~vezF#nj?4xnAp#qgTRKaB
zIr-&^2)HXEh^>gAtrb!8=<8`Zt3n)%qFEJUV8l^R<QKn_^VTcAIP9mh^fx*Gx+KE&
zI2DRL0(rV(?E5RZz(1P6x%29%*H3bSz%Sz|9FD6H;u29W$I76Tw#uLn>#;&8shv{5
zKvzA`3!#*D%2=zKzFq>v+re)*wrlAHU;<+Yg40+({ubL%6yYMnJth`y16}gGRSgZ%
zHqancprIk!1{&oUG&siFz-yeLIjxOys`8Gj6;su&z06YTJ{ls_3Xv(?GJ^PAvUy~f
zU7yRKy}1k;W+P~GHiAuNqdjgNVj9LVXnP!MRdM&vA)9STNG<`+HWO&PGo6jXOkBaO
z2PKKaFcXL7Rwd3=uU8BlSZtFp2r^NDZLdlc1lg$CrChxb0x`zKqMV^bVwiE7_4?&3
zs1OSyXF!Em7?fg042D=3Ib$ls!hkR+LLk6H;9~({FvvprVMRW>CZZ%6U?FN{pKb(E
zn1{o|k_@mAl6q8#af2{xrG7If=0}CNn7kK)M39RLoQgt;AQx3LE5ix~;Wls@jETzI
zjw?|R<f1%SOkt3Zia<<^WfvtzgqRq6-Io{<Vqyxe2N(D#%*Bb@sDg<g7gdegh+!tK
zRENimFvvu?R#Y2?xj3%~UxcDC9~YsRn6kMpF(Smpgv+bUUR`323JN5GOqB0PjPGy}
z-kO4VYfMblRHRhp@LHL(VtM5d29dUqVxzZWXh>j|Ab6VM0ubb*A`lmI5gz}-AQL6H
zplTlk`KSn#jPU|Eg}{+gg;*F1uh}xdLpX&(%_&QijIfYW=MjN2%)~i0333=?E;5R%
z4c=42APYsVN)SasCJMyfC5r4<Gf?XKLclP_!iJ;I9(i&82^%THoVUpQs#&!A^S&TL
zc$3tkd^G93L~x3?hj*P^ya18FFCpIi_FC^(ZF+`oNZ^+s_!vFX#^Q{3MSR=q2Zc5e
zlMEwlB-nTlkq}`ct$NuHkq}`c3r@ufkr3e{QS~FjVw8<8mcjE=h^8nX9n^CXRz%oH
z7w$1pn2+<;>}YZ@#>U3G+Fnnqb~Ldf+y)Nh#BB|WaW-Bb;C9Bh?)%y}VT|$GjcQ|g
z6hKR7^%xiHROl<89^+!gv9Y3%5a#04=A*~B*uaZg8+ck<8(-mP=sWP1kMM5YJU``%
ztq84aQ?PX-Alr<RHy~6PO-7!eXXP-Mj5v)ih$@tvA4F}6Ktoz28FfZ}mWjg2m?c|m
zY!XA^WDJU?5(I<Eh&$nhLDoXyWQ<w!&59%ER7R3f^jSxR82LegHmKpNW<1Wo(o0$x
zWFX}7j=~I#ul0%X(G>IHXD9h;+>nrrrkzxUlJm<iu3?aYpb!3GFd0#lgivJAfH*vZ
zEs}geLR6H6q)!D}gomQ<RC<hsBezN+kfJPPDP$?E&r4dyyjQQ(Vo*$B<I83cuNe|p
zX!@+BMOY~L0Y#6oaN38H#uOG_;|eOq!o}<4*M~wyQJ94ZKkCHe$yjw*h{6m^kn=p(
zHsy{PMmflQA-3CU2^@4IxE-tux=&zR$r5v~3Wz0gN~t)m!d8+VdSy0kH&!tYE)?$3
zVjP@Cb~3_3mFOFV9^>E|2b4dSt}QxMQbeR;44kLhnS7OnTorpQhz=?$#=>bssbV~w
zHke_Qg^UlUmcT);*Ay&CSPOD_xqI;f7=@ED+7X0#0`V0y^EsT%uLq?VZ_yHX=zN|e
z@FTcNVdCQ~CYHo2p`b5ZErEx2^b^09z(a4s<C>D0B{lZKZKoF@my{7EO5>DKoQG{}
zZab~jmunQ~VYO{Hj53i;gmQ^ZDUo=i9%JE9#4!qUF^&#O_<SQX23k#t0+LZaM+b3g
zLQx_`H!8-#(UV0K=3so+%!eS1a8M-57lo5CLHzC#@b4~xes^IBIjM}%-6de(U4r=C
zCE(v(0{!m75~q?GwR-?hj7sKgxCijXr)2Ipwhf%x0t4oGK4>`4b49c;uN2md!pWGL
z7u$2gC<ocFUup>)bZoZ^qa0*xe+r`<q`u4W1eYnNkIf5#GRi^5o62vgzAvd52Nyp8
zL~#ZdrH53Am!Ce(>9J&-Bxk90)0mQsUyoS#I*)U2M9eKNI^6ikY=&BjuF~OZ_24{z
ze!30@L$PQTNo>yi`6at3AxlXTIhf0|Eczs-$9On>spttjG}x$(pn=q)W#AerZKuwN
z_eD_-vRcGvTZNQS9x{50jG_!=PE0tcy-TEuGLUe8f(=L_Rg{B-UYV5*g_Kb)(y7#R
zWTHMzENjTF<4N2STrZ@FFwVxtNJ>xQmY}izSPB<UMs;;OrEu}lOX7Sx9~i>Sjoojr
z_aSrF;#_P!+)wlb23n~AY7rJH)>(_YY0jV5moaw@%NOD3{2Nc=mk^y0=i7T`7TNJ5
za~NbG;Poq~?>$ih6Rph*Pwz0y8k-%i_914j*lUd=r6=)9h~D$&`44*Y=RsUsZ0dnT
zswfLti?}95*eH!-MhQH$#w}%xiHprol)yvBxMUdTVH+!E*XxVhbc~v#1P;0$l;CFV
zsyT`h80e~9kT4Nq<=0*u=J`(!^YQcYJpaH<SvA(Cq6}oc67>(m49prBOqLi7HyxJ;
zR+jKLD9C5q@B}`1cp{UT7&@|vCvY$iOE|ItKVg)eidQvk%c-TnWbChm&DbsNziNa0
zR_kbK|8+bwJlN#_XDlQBd}#mmUHF;2>BPbeSYb6_rj5n3)AMsPM!Iic;Lgm<z`%)>
z69y2k0k(-wIu+9$7??c+MkF9R(0EDQ@<p`f)LgrTZBY7uYSMKotKbkJZY`FKGP;p<
z*jCvjWhxIr)PU4v&a*bKK~-oSn0aks>@l64bjn2|sOEJuucliA6RA0LZE`F<C~^&$
zEe*XwJt;7F>WMw4<~3P8tvi>E({`omT&&wo)=y2>vde<_qzzPGG#UNFyg!X!%BIoy
z`Y_U}yqKxzWJ98x!<wv$lKt&tZ_5vv@P<ai4^Rh~jS($@?d({32u!Ky);7(ooLa!l
zlNS%OV%Y07u(OYT0-C)wiTMTVjkcxPXibrO0`ymqx2?JihFCO!19uYu=c^9h&r*fZ
zmJfQ6GTp!vlUM-D??unERN?43!OMZ&*FLZ6h_MuPYo+(5)Z=En)?Tzd1hw{ARWR?b
z|Fd897mj`vi+Yo@!S#hj&Ru+vpe@whUIRbW^{v_PCncM&4+uK-scfj?$%R41wk<)E
z=txA?1h#L=)O@T#K4talezGR*ayC!Tydq@GM6P0#)g5rzBc?`NM*<r?x=fu}o+DET
zGuY#qLx&Fbr)W~AZE`=M&8cd3FB&&0ndpC^;?<-x7t=_CBa5`^%|yznk^7`Iueusw
z18s5iv{2$6+K6tWN*<gLT$mm3!{dTy321GUU3z1HG6@HMGRQZT$_Rzv|D+28EL4pu
z_<C?Em%LRwvfKlcCbd3b#vEHPE$NU3yho5nAaeKtBLh#h_|MRb0DAJmqSblPn4z(Z
z)d5b0s850ks?wp6<X{8Z4~{29)s1KxW$CBFtQY0{gG(K8(;?SAruZY6W))rRh%zE)
zN0tY35rE5ux^#4f?##q)?v<U(@pTZ+EcgsCtI~G^7+T7c39o|4Xu~X$=PhWM1^WI@
z4n2H{(apPci+oy{K&*`ufFm#oeTPHn<N$_xQ)?wBUxERMT*FDyMxQIt8N&>{hxC$f
z7&53uzJql4ATefC5Io-qyh3fwtlBhJ4tgxQ<XE(d(31r57u}5rOl)A_6%_rNftwD+
z{K+$tT8w1=kl0d=GNaQI+J2EEsvRd~Do;P6Pfp%}itU^rV(1hNi?-Rw;R$=>tV+i*
z;P<4-<~&TXs7oA4(E$|HYl-o5(7R3^I3$>_#R(I$uRJf2JD<FR24Mw-m7Izt6M;v|
zwa}XiY+G)W`BDXG0S$C(eKW$osV;>z+BH+To(uO5m{^_k$Z;K2Bo7IqsGR4m_TtK3
zY|3jKShmI1Xc@B>nkPLd7rxxMhV_kWIGv4KeU5Eh<n2V7;8YVyr0Ck~z&X)L4O$$d
zJ%OCoh=CXDB9MdB4=&MYZoms%ASa}$TuJRU!G|j3gyfPq2wA-;a65v|O&YwA5!tQ*
z7Z?9_s`4MEbY&%2y&@6lW4Nj0mDSkD7Z|$!K*whFK>2+k`bX{#D`NW0N#NyJIQr+o
z)~4=*IWTdAuMmTRdIJg$0w*qmLzyVo#{(Rx)ZJ0iJsJ>={rhsujk16PoJt>@#^4A|
zqXX_(D(FcJyc>l7>`krO8#vI7xh8YjRrtr`KrTyTN3)`kVkXNuuetOK0(cBS`%Tyn
zj?y|;Tt~TNQo94qQNa_3NP}iZ`DoKtzof=tX+J!oN3hAasWovV%wb8GFfeDxx26cC
z4&VVtaZ!<it|gs<V^=B1!Ibj<D7TBshCxp?=>NtB`;USyEvG2h8BsExfrGr5Jn;{7
zx+JzS^4o(v5g3NZE%(#BCs@2==@tpC&^|EKLC$tWE6Tw5!~LW`bzr3_FSSP``eNYV
zq(i5ZdKGsrQazkVK_B3wnAn5RAwUIOSX6;`yMD>cp)u;*#wJkZ%nuJ_aKsQyJRC1@
z;1mrWQUc}^TnW0MdkKQ&jtmZ8jRSqH6+G~X31bDbq3DqgCs3pqRJ(e~w$vGc#y317
z;$Tf+c~x=eGvEhu(hqsRf*;G1Nrvr;LqZsG3WTvkOu<wc;7BRclqF|F<rjk?f5;^g
z{8SuQra>d=$E#BQs+b|OMxk20ifDA<gg=7E$Tro*cv2~XX@K9O0qj@oav+8wu=~&r
zS4|wLLlT)t(f((GdLD)-yBb2|slDh-jWSL}8DY$1;+YdN5xsZT*1YH})JuGpM!i2Z
zg^dZ9Uaurw^!*S~e??m$a=OXUA*y{rU(~WP4xrC5F|E{;$b2J452kd2!08EnE0So9
zMsr9YbWq%!+-OmY9o`nRWh?%MJIX|ioDSjdKKy;l|FiceaB^f>eJI>Bp2ZWxu#Ulx
zhxuY^rbn6GS=m)3se4*A5~$VcZh?A1s-6XnMvlsis)|--Ms`MKExil_w%I-AvjH3P
z9*oCevxAMz!`Q55HJibJ$3Gj4H!vUO<9UDBVBS63z31Mzk(ni_o54Q|rlpLyarb-f
zS^o$BdmsMyZv5|i@xO1TqDJ~Nf8K}xed}PlN&ncDf0!q!JfZURSquN$#{WK#|9uhv
zdkz14oeI$xXYjur{BM{3+ok_@y}bg5=`utS0j;Ky5&`5B-OmTbu%L{sDaIP&oNyLZ
zLs7~ZoY!Y(W^NRN?qwCTQ+Z((iNCp>4MSsY>t|=cRGDc!LF@P)VN*|}t?hg;Xm{+J
zZS^MW-NYnm>h+F$4UwbijuGh8>ydjs$`1e#N4=c5m%VIa_Qh__hffunx<Y$Ku6?e=
zJi~@qsWSVn%)Vi&@WSy+yeAmNAglJ&>lODJCX~3{VK%v$Ueoh@y-gD>pPg`@Wn-}O
zm18sQ*LacmlWy|3IaiQ+$6Q9KZCxKUBmt(+JVgm<|0|Li`Jo859FduvR~H7B<2w-2
z%i$FYsnEuT>opV|+W_W%WZ33OK^fu(vpjJeQm{4ne7^^FX}?b*tdeAMW`pDvkum$R
zx%Xz6oCf@Ui1!|vHt9;ntb|j^gb1Rv>lOE+5OLC<BmBMtlD4Ea%_-4?<@NGIGa)D{
zW4qK|JGsh~gc%2zA~`2;^S*6$+ti6O(qZuqD`WXReJ-Drl?ZTrJl)h9VkrAzP4<H&
zXomj>bZ0rOE!rAw+8Z6Wy5834B&aI!I{^7fLH-4)QBw_bF=F5z&QY|P3Nsetl!5pS
z75j^AHj|aO+@|7Wqy1u%<D622jpPePxq&)j7W69QPwa8x5nBc2I;3oqoMEz}1fP=Q
zu|l|NO0TH&ERv2=_^+W^Ly-?XiixWsyB!%XyA{klK^|)gXHWDb!N$dRM)>aC%%>G|
z<?oa#V2Yp+7+Fzcpb8UDx1SS3KjMRdyb$yI_)SthJA=DWzS0}neVC%_GiE@p{JlQH
z)kvfVer=dKSTz>!polFl*Q>j?uU)f;dAVxV<JFwi_4HHFOpbswk$$eM!dfk{khQAJ
z9XH4(gQLx4M`ySMwk7g?(5q9?UR?(z?{%wKI8Qb3X+hSfvW!pD(19$_GJ|}FtUJp;
zJH-Tbc=68J9O?LRSN3aV6((GkxT7H+kjZRB>2Nv6H^Rml0fy4)TD1@MDZIg1+p{|=
zG0&&k)G`V>*4&*fkh}x(M>%8j!(Kj~s%Z}fWsc<7)kB97G#|uV7CELRJ&=^A(P>5H
z?lA8c879Z|X}i!t%wcA)yo#p)HE#Xd707yc)WUW679;?Cq5<cxUbu8AX^DU@blNdH
zDD9DsjCRz64;TT_weG)MUn6mnt66WZ=G2328p#f_|FQ`TYgHZyKWn!N4aa9`v-E6w
zA{&(N8Le-eTsh$$uE@jptgNV_?|JY6^L%~nJ!_{P^gp<E&3r*Wp{ncG)vL2-ukkOh
zh&eqTt4inD-O{LZ$wqvd`JRwt=uQ?ZKIHZvn}dhDHTKe6<mJc+DUzkxP?D?%JCaNf
zyJqX{nT3|((gVoM3l;@KO%9op;ah{2XzkFFfs3?F@LaHrR2vY=$lf}fg#UHd@W1P)
z*6)XZte@(x-=D8;n18QzPr}oS>+tWxogMt^^!<_91A9a+Q|1vNxwQ9=#&CRE)brI<
zCsU1%h~tvfmYF>Pmv&fTc{ugXR<;8-cu<oZrv|b|8<zV?3>|d5+5_W~?!ItBhHh0X
z4tt8B94S~gc@ikkK~cfcR25>IOVkIMzVpg#3uMM(1lMd9RTn8Zb|y#~fngC{N5800
zwLxjS^WnIJgbstFt{4C}ID4JaTy3nJtLL)w)K*s3M?Uz-d<a_!c+Vq90zI%=SZAmq
zr6BOVi4%jF%<pA}P{60vCfSkpsd>o#yoIX|qcgk_lu<e+n`S~9G-Powkgq|kI%0(?
zr~u((q28((^Tio+^?1dt_6#dpaf$dS(oDBRZ1J?55TRDaBh2JY*1XB?jMfTF9(Xe;
z8xR?vK>nlBECwm<08azj7!AJ+X>D-Mcm!uqs>YZ-*jG3h8xLZih))=9J>25#=w(Z|
zFcAC5#Ua?wB&Y$)pn3)#k|!We7iu=SGbq#S(Gtrs!KnjHF7|jE4}xJ*Q?O?7g*!cR
z!jLm~VfImXxnn(>AQwr-@JSAG5lysdDBG??F3aFp?96!GsE-e+DQfIz1sz4z8+4V%
zyL}GyV(`10JX8YJwPTS2?u%gtrX8TQWXd2t-ewYv1It0ic+|P^B)S#TLqnOlMdWkU
zJS7WHx-%%z0Jw@_E^Wz^Zp4&JNQUyPLX+F}tQhn|(;Dw=v{NDrZWUOzVYW#C%f?lA
z5>bnh;1zZT^fgGh_%5q9(FBAdkTn#ViP`Dy$$izvfnRkyQxDvn>g)(_GAC=9Q^F*P
z#91_tpGibeip#wAbFhNM<=(ValWyBaz%<>rz8jQ1^sQh7+BE+JLfO_PO4LgMt!Tlf
z7)p{QBcD3+u`=!>DKcDl^yP)5);1<WlGe=+ul+6A%e6!7*+|WHfEdLCGqq-3&?w6`
zYV^mLmWfB)JnJ~qMQp`gT6k)WP!D*Juu_xkz>v;iIXOZm$V$5Ts>nhmWpQGfj)p?v
z%55f4JXWOPH>APH_U00N%y7}DUD`fkz8A(iREYwSWHA?y21XF{vyq6qs$tmFGE02!
z>l3b~TPFKy{~KioAk>~dS<m{UGLhloMK@LM0X*mDpSr}8>P*%69?#DNh7Jw@(4M)~
zNQ8jb+7KVz0E%Sm^8|iIV4r~rrXqN_$Y%n4aB$X<cnDKrE#s-p>rh3Gg+3Q@Fdn8G
zAI>|F8Q4qGC~}0QWb;~OVTRulZ_MsKm2S5j;Z;n<4K>R5Q4WK<1gRPG7~&~p>x<2h
zy}#TLA(v}a_6%<c(hLzF*iY<n!_)|WGaG=8TV|r5Rq~2K*8`!JpzdKgff=2&#arFo
zAZDg0)uU93zAr$dOYoyAXSA_5T}P~4SqL3(M!5FO^bn^ouOT$2fLLbkL)u;yC(%XC
zY7V}=MK$F83oWxaz3nV(c3YVpZ^$W75}7eF$&#VXbhpaEK51?WG^D3y(~kFG6ccdF
zNb_m03;IJ>pDhX7!1|G(!H(>Cq=CY@@A_tPyJ=7d;ooFn=pj0Yq=O{nF1dEI>8WxK
zGN!8CY=U%xi(XqnuW+YuaeSI+G^~=qEIV$MlF0(k1y5*<v_GIp`vd;f0w#@u(p(aG
zqpgHoj<ROT{$Yg(ZuRIcxHLi`wdk4K$=rzBIjJt)J%j>AjX5@LE7PfW)7npAR%Vq9
z*XrnrKWB1H2~pwXMdsl_Jr581R~+vr#YyuCC$_X@*u6nJB<q&jC!axT`Al6fF{@5I
zB}uV3F6yP3@hZ1-fX5ulSf3pp3@M9;pstZytON55Ibh8_1j2!JL$qdG5(BCv8{md<
zJcDxys>rj_@LkjeJdTxjn~4ey-REHKZx$q^f*-BtPr{B^wtYAGE{hZGcZxj2f5IwA
zPn`jVePG0}0_79jlDp_#$$U2oo+oYEb1ixTGv(5tqtJO$37yQdm=<T#67x>d`NC9*
zW}i<F@_fX6A5JQfUAyd4R5${FG3os?m+#t6U7A7CTjq;oU{lC~NIrSc+>~8^_+?3k
zoNZu4oZ-<q->5!LX2>;NpeOkNd^`6HN#92gIPR|8wWRv6odEv*aBMa#xD27L&=%)z
z`MqYfpg9gzIih2V7J)8nFWK)!Y!_grOTkBp?<zbcUd7B%cam8}mj!JLfz2g~Y4;II
zYEEY<8!e=C5jb9|HUQ<d+pf*Z3sGO3^!Lz7P+#yt4)hl9a84g)Xyi6WcQ>-PyiH8?
zj*OEv4bBd0&!h&Cx<lK3hkY*8gC-A?^J3D*8;qDzRF7t%$3TjHc7DZ43m?jKpQvbc
z2adjoatT#6j=Eb);Mdo-TG-c_N9ma}XH#%ZVtpR;7k+XVE9GhfBXm}cVl-DcvSUZ?
zheuZ+mo*z&A8Q`|Yy|LP=+##A3eaoyb94Jlz~QE{6H>b|PU)NTl)X7G`|DyafdRQ`
znc6Gxxb5?85G<p02;(4wUXP5g+m3QpiJJseR+91wYpwV4e%HtQy*urpe5Yh)j0`SH
z1j5rTed?fHn=byMQun#kbk#GR`Cd@SDhabtUwYCjo0&(ixogU6E|rJZ)kC#Q;7$QO
z89Sx%L?Q94`N1UN(Xg(O7)jPo_lqob(i{+Nt`KKpWSMQdmH48%R$Nz_U&z~Nrimsn
z$w(lll7jGf1LTHjYuYK=mYHi^T_F6CU%#WIDs;idnnYR&DJ9E$mT<DJ+RDZg>@b~_
z5%~<glibOTTt?dQ5gL^y<N!L#3^hAS$Fs@Uh(VP#Aa7YGS022XweAy&*)<J61E%r_
z$D7zMuB|+wdEP}^r>nP)A}CG~TiX=_6tybZ5@yU+oIrt*RjbNRG9T?1lah~!6Z~BO
zK@yZ|Vm1}4DU9aD%#cvKHlVwJQwJJl=b=rTQPpn*p3>=wYa<kks8pMv125J`JR@w{
za7<>^!AO#M8--O2=owOs%w{N9@2NkxH?jSa1Xfm0p!cUao%yu(C7n%V;V!F$$Q^X6
zpkw4+<Q9O}?t6l<vX{5Wb#V8l;L*}hQRP=uMJj5&8$TV<?pJJbIEYBlMWQt?m<><Z
zlg)5bDEY%mA8mV!X>wG%wW;r7hf6|AB#wlpuiZoCVT5<KStIbotWhs*p$mu?RMbgV
z4p-WW9J9lcZAqQ=$UMO#PBp5?(?>8Nyedu<9mSC9acU+*R~ArGw4N?WOD*Sl%I7>!
zt(-$VbtW)1lbO{-pyLiYP&@xr@P#3lgUZ%ns0a;@hyv)eOt+uPD&R~^4=;2jw81(G
z7_m`_n!?(PDo2aTIG5~1VJC_BtBmD#E2y0c1+`NssO`;0H>*HQgG**MDyE(iQJm_5
zU=h_O+hGrCV2cqr^_gE#hJ(I*uR1*~bVkq|MzLLeE;=oMkz=B5zpz>mHoez8Fsgi5
z^vXdwa<>_E2JW-xp`P>_TxOf<GQ0kw&-6GmWj-8Fk5qp-qGV>B<u*69`vmODLB5*}
zwB5k)KYe6Uc~&wyt`OTx${g^M8XXPGnK~~CTh;AyvVaI5i1jh1Xo@OW&R3{m=uihL
ztuzlMoMe*sa?+1-E83vx#4470Xhf_#bcThDj6$XF)9G00K*i0Mq1`mH6FST_lg=89
z3_zA7KB+`MtI4cqb^eAQG$ardJ*G?GY0P0{Q*r3ApQ907wUnT@nzo=>55J&B89SXA
z&rh}9!EIu7K$;_4nS|FlbD1Ta;0%q?S7v%Sf(p5ds+>)F6w+ubhYCpsz#bEe4GXwQ
zjwhm0!Si8i1<jaqS47nzy0E}wbL$~bwrgDpETz~8DaFRhxre|K<R}Gg12PX46z5t6
zq|c1p#U%oD&s=%yJ(St=;m$3Uf^&;60(TU8%UjQrE5+lS!q)n;9x7f)KDXU+%^*#H
zRt#0>muTdry3Ox=grP}_JY3|KsEifFc4mWwbV^92aa<@YDosN`l4CXDR;o(SV-0g_
zrb)6slG*KZbPTbNpt{~Zhmj}v+mT3irGVh{0V(as50i%#5wcHdA^Vip%*a+a8E%D>
zE9aahG@{=_JES=uv%$20=u&r=v1%P8V;!wWjE6170=V8%j_Kz3qd~r7BpgFi$RW!X
zWPfTT3tW_t2cRt36mqc%naSD)n?HQZVP-j~T{vU`ymGQCvRO=L;FI-QC>rfW^9IEz
zD#IV7&qLvkE^MB@n7mFt!Ga)e)eD-ZFZ$ci4iP%dp`vxI&1rQZXswM>O(-@aA-^Y?
zZ*r@lIPk0w0;R-(i|=$k+67zRPVk|%DU)j#U#LT;nFFz9gmLqt0R>ZrHAaZS4rH_J
zAUg^w+Q|=`D!5h?b_0n!2TIaiiu(7XR4G?ZR2bTYpIR@p*d{{HS-z1yrVAS!X%8an
z`Gdw>=8{qf1fN(RCvSeiLgSVKCmHv@*mkTpDprKjBs+l@Xy`Fz!C+8rrZsLLSbEQ!
zKxv{J<)G^}hmK{S8N?Q+m7WU<(j<#FjJ&po%tf6~;DUlVC3Ddpd98T@Pm!KYPx3#_
zm2j=NZXOi(u6NRnHMP&dx@b*wC#@#PY`=}Q4lYRvkqJ9H5W4FOf7eb)QEUHlGDTqp
zr;#o1E17r#`f1BFbh0fg#QuL3L1M6vY)x>%*cUz2!%li+24`L$s*#!H#cR9L&Pirh
z_>!gym^%uB%tP&*T7igy?w0g(zP56%jxGfXH)zz<S=m2O(RECbmqJZfeMG3~>T}qn
zSn#H=u3qquSfaHJ-j~PHIaCcg2aLYF<BEr^+mY#)pLWHwgfcy_ITx5gyK2Q~kColp
z%OjF@Vy=v02Ynmi_P~f)`o->n6m^Si7<s^2d!Zaq^aRU>h-=IY&l&1$oe8z|BP%e6
zEA_roeXs@54OwdPi_>_d1)$~X)90ZPj9P9k^kRCAOSxy)<2<u<hTlUrAN(l+H%~LI
zgm`mMraOadznnyzkWT6Q>{R4Nb1s?gx<bO3)K-)NR!F3^&O6Tev*sUay+O&0Dq-zd
z&hu0boLlEPk_L5wn<&P3DBq1#S%%jvn1$#h$TBWM1AK3%;}UTU-mZA-sGn7Po8GP%
zl;xOsreZX*0z$vc=`iLFFTwkaqvy#33Xddt>QD75P<WU3h_QEAH6ExQ5-|vBJppu(
zdZky|7lf4HQz`!?rLRcH)7a5_x<pXj(6WYAw3oO-Fqw}ypBWIpoygDC4~cI>#WmmI
zY%cJmn(5p=M`?g6drhPRKb(apA}Rp7d0-$7QKf4wUY7W@%-by;mM`U?(oU&v7UMDd
zNl=8-p=KZ5E`Z`^;?&J{SP_Wx{z#DBw!0FwtHktD=tMbg-VA)qTq8<%XAKN0&WDw8
zXgtm;7udohLURf4KO-Ly0|*Y=rj}6-0t*8l&6mxI@lQx1SCxwRFtQ2^?;t8v41_ph
z`Jw0+<*;HVpl|nj9z$6$uL+#Oy>%{Oqw-+E^jZEMCP(W*i%~)*@fLQt%}R_wYj8Te
zfei@<hZU<^4-^Noptb7(Zw|a3K=XAbf#b%3Pbmo`d5W-fMNjVyDH3dCM#-qOV>4<5
z@ieFl!*VAW)FXx_(AYX}BUI_pZG*^md%UF-0)$-mk<%dELWhi)Dj|(&0!W1&KE1x2
z25XD=I~K7%<TND=cY*OGXic_pUU=C|Rlo<!{3J4>P4;liQ6v=oWHvK~%&?Y^0HAb1
z5Rt2CKDKC%MqZxyMF@2ur9gz7l!wv%0l*L*a|^@RH@q>{wyr{8@(umtB=y7`lVD2B
zys0^hGUTvj{CLMc#~%t>3)H!vO;m%Zn^eDH{M6vtR8pa|RG-_O;PFQM@ks_1;^vDT
zyue$!12(wF^}#-}-Ds0okI2TYHqHW9NoS+wcN!5!)@(JlDFP+&8*2ku48O;6u?lu$
z6}b788I~oM58ZozJ^kml8UN$-UVk#=BRdQJrg%c)U+qzc-7rH4*+D@b5#)3x^dt|o
zc23cN_fm=B$4VW9#EQZ!CF&WO6!b8Fs4}<`Y+%sa?}JvUZKD2qa6<i4_sUJJed%rv
zZzk-;f+mOkqAGwYda)xpqw+uzl+~KVG#snnTL}Qg^RKw~7Wo|J<2EW@ApUDAcP2hJ
zltV@K!$s*=EPe%W+j;jIVo4TLpPUeDp}*gfMF`||EdtX<6osfMyvd#r7&}7JtN3;~
z4oNjjkXq>cxjg}3AmlZm4p2>!7Lj>N(g9#tS!vb!wr{+1aFnPOn&2SCgVi72eY8>e
zLg33YPFx8L6rD<)ceZxg!N_p4$P!`sq@f^Swx#C?*@TP>7xUd-7(Y}SYexBj<))`4
zv7D?21wDbh4PE6L27(KCYu7StX;jyO#5@vVm~{2?1ateH_+Cad`tbP0kO^M$X5)i>
zLoPN!A`buV*pd<#Ig<Moy7!V_emnZAQ~wSKu<nk3-ymXHo$TN8_|K|twVHa>UUXY<
zyRMkIZ~c;I5v2_&mF2$|-A%W6%{X$cr!lI|wzmv$sx~s2ln5j5B-1dQlNd+QQ<@K$
zFu_2;0B%8IQm{C}71}c|R7#?XqnFiA(^XZ?yQYFG?xnh=?)YU=`D3_I)JC!RZXqd5
ztY%HuOL(K`kQcg6>0&|ODI3)8`gsdCixLCx55>UyjTk6bzy<JK0y(_qaK$QFiD@;<
zLJJDoq17BsK9$1*CnqS8nXNOCAOmB?5n?Z&!`JH2T^fn?4uBts;bOyHlZEmTza!+*
zBp|M#RW=gr8_3QNgp>Bb$~p3Te^|K@cvBU+#S8Y8DAp_lhXvtc)yCGI=bV5avKN{@
z<IVyRzco1#sJ=I^HJZn->)GB(IhL;zZ_i%e1T`aYz7&xZ@iB<0k56j#@kv%6D|8Ps
z;_8qB?gwIT6C6v;FJHO35!_3&lf}AjpQ30j-c&<`f>McEg{6g00URaIg@o48x}9K9
zSy(aI#2WxlumP<<K@tkE{YMn-gw!&ua_&YCLnDHKpFlx$dgYvQYzX`=p+f|gp~WZ#
z`cb<hX@`Qo#B*kMkCcA?1z$V=f`)}~9}t9t`%TCO?zi;<w@=W*X7Qa%^)0&8cePW!
zdk24S7bA05c>SH(C(bipd`n*NNSXNw^|xZ$q;@^pgJ$>%i54?kVh}*o&0Xa%G-xwf
za(k#Vd6GV~<XnTpETE-zr^n6kS~xZ}-sEstwR8(>sYm&CAy6%w?CLGsNht7&T|^M#
zv79=D3fvP6QPJ^~))GlLN;I4yQSyCiM~2N&-N&9d>mEd&ixf%;LkE-lqyXT>Fwin;
ztvjvv#A!?JCix&^7wNelZ|ILV=wm~8b`j@l?w2R^mnRjKWlL1g@B)O#ZtICvb4phu
z9&t}M%?a9j@#U}>&6b}I_Z?88lB~DK9TZo9;cw)PHP$?Qq&n>w6c|#`1R9<law`wE
zG26jJ3uP~1aS>*nj?(6cSt_G2V-av8SLOZss-%#*q=l!zGJ!i<jez}ZGb>w6#S6=N
zf{E`Mu(kjPW8MEa*#>yeW#|MOWAzq{#hOQ2Ec`%6+tLKFC=sVJ?(L{lPG2da(f9MD
z#qp9$_<d2tKa^qUQ%FH{2t&hr5$mRkc(JfAz~hgs8zkV&do#d1F1w&PiLP`G(2rSo
z1VBw?_`(3vdZ*P+gFmaQ-fFCg5XxaNE%QkyJ#2d)KsCWCuJd>D*<lAt`Je4VR85s0
zrsKh^QcBZ`jPs^E!v=P?J3S-ZQ`1W{nznjWwP7Ay9j1mZfn>XpQZYAwe2iRNZ@P^|
zoNAyxUCMgWLRVG96*3>f0fa~|&@>e69yzZfbg>Bl>B0{2aQum($(=JX8~!S)37x-+
zC;jjE)aqShzO&E-jSI-%>DjM+hfxjv+Ianz4?9O4HBzYo9Qa7*(A<aT&A(o(O*zHo
zStn+4A#JY1j9~dX8iw*bZez12UeuM$J3^jcz2`mCKyp&XvrquvtXay%l?EI?JFM6-
zXBsB<xprGArML>~n9u57#QZ753sPX&?Mes~ix6h?DzkVga{xs^y1$y!M-WPDH(kH2
zgpBth7u5S=-D5%rB6dI{0seFtXN4@ldB;3GIkq};EyC;IGUrAXW4g{D`@kV4)W>_J
zkFBiFnRa9mEPQ6Gnr%-3E)C!EhxgdGe2*JO%lrI3TcBU;BPN{v_HOrW*`E!{wpP!*
z*S-{N)PgGBOem#^>%8mXDBsQ41&4259Q26u#|Quu#ssr?qG6jf&_yB$7&R`#lUg=3
zOUAdU17L~!^kD>t8WNjHBte|Rf_=n;gl31&_qJBox~J_H1y*u4wfJC&C}NSADfWL-
zmeaa}Fj&Z8)-@b;R(ZE@mfme{i?e6VKUN_J!(Ml1P?nQccHegUo^8)FK(fzG<;+ZS
zfN|_|<XI|<PxC#2j5-x=Lx5;6$UJb6L82dGgo_ahaYvqR>vR}cg#7*$CmO_$#uj!b
zB0o44fH&+gNd`W&DKY%C8NPdjh2KG$Pt!USp|qZWh=s$CBr19l0MS8f!Z5gJ&k78#
z0B@V+HvRQMDlr(HH@XAGMYt~t@vzxZrV<k%z4Bo#J++qaU0yp(+>?ISlm4~TFD1nN
zh_kSP%JWGAT}oR51}5lC0d|wM8d7Q%TjO?swZwQG;ON76PNAD5LCxcBLoCmcRsEou
zz&fqa_vVb6qjZEgL8$*`z%DW|QkkU1Km_&fBZ;vNft)4GeTiqT4rgk1(tc6SssRuI
zb7iB#oV!E&Lo5m8dyl<0^GSz_G7if2aEXm9@Ks^~65+d*{Mi-s+b8I)I-QHa9C|*p
z9-I-<mjy%;0T>9Aik(QtnAfqS#er>4{VysD875?JWo_l`SwY}bfhOcZXE!hjw-Q{i
zcD?S`Hoa!5vd<Z8$F4<U{)aG6s5fQE1vhFd_)}f)JFAUlHuna&H|}QQEtxkSX|Lu9
zl1fWF;7UOJ3sg(esU{xYLI`^|njGvS|Kw#9!0UriM{BaUPEwOH4tX_7)Tg!QdI`C_
zmJq4KqGllmA#A+CbR}hpcV&>TB*)%_>OwdfUI-__*g@)^=G&mI5K>ox*-sgn<I%O1
zjA7PepOr0Lg5R4)-Ts%1lr)>wOi8^jLbYg_=DL+v<VwyqRmo)l`N2THFqwI~*X>HX
zjh*ty-d4mf&%LXd06b&8qE&r7b+#h7n;61~_ghlzDA$zm3Q9dLdNV2Ac50}dMO>+#
zjZ#Gw?H-#pkJG#5UGu}<MjESiRze44WLzhI3Wi!lpkM9HY<wMSX^G`Zl$6i+bHsEH
zZhhi)++9iovyKTLH`aWa61kxDHC;qJ{-Q-d!(hs+WGl5=%rjR8dcD3@D`Q@<J_vK(
zK`GZ9m!Sg?lyaHwno0qBwJlU@Z=E~~z2S2iFUqhb=3dFqy1IIfFgY{f$(hr#c|^=I
z5X`idmi_Rf(_#40X%0Vf3g{X=<Cu;HEj81&qVntqkT%b^9$4dnyKOv<Pk1{8{9U_u
zlmKN}!SKc)hG9sUCw1#WjCH6nrYkg7kArbOVaL8kLUST$x?y53lVbcys~E50oCK<K
zlBSfEM%3&9>+og`7we*-J)lR<SjOlb+eeVfs-@9>gHSO9Pav2@st-Niz@IKrxzaG*
zIM(JdAi4`v9ipjN91#-<pwHYli6kc>Bsuy*a^4XrJoZ;uuaORx1x-juOr_kt>$;@A
z4~90GoK>()uQinJ1U(YJ2GHb7;^IlZi-3p-QrwXo(W6x$4$S``*<a@<Oaw9Ys|Db#
zN+!_b1ntmWQ4-T(wpegO3jiy>Said_py$HMUTMzCiduFxW86K4JY_Au-*?eV@TQvv
z6M?x0c35?QK*HE*XC)+Zm2>c&*RakxKNZwp;#)8!Ei8WcjaWU%bs({0ZFf`uJl-Fk
z$NN{#Jw<&%X;0BVIh)c~fC^%Y$ILT{!|dp49&{+I3$TAMo@}q!g_#>qiW0EZ{d-XI
zqh{h`w@4%4bO&cSduF%m<>{m!UZPIE2r((^o2gXVLb|~U-uG&EPtIp9xM}29rnRiV
zZ94(c%?l^R(pQi0a_ZiQTnKdY`bsM)_Fh{mQM!+bAZIA(bP9N6M3K-;j81C+%i(?C
zZHfoNP4R#s(zvV_l&#&r92-sX)*7i`@KOn3SF(SmzxFsQPG877%i-`Lvaf4TXDD{S
z-xP}}Foxwsy%PG1oSbzeB3_MYhG58Azhz8#ZNmn=@v1n%(51wBlRU4zJ+5KxU^2Ll
zFJJT=P3%i@TS0*F=czyWn0~*=RhS3Y`2*Y1LKM+>EYk~f;+$R}#}?ZMY0C4NCa)Ha
z-Q`&?2;dQW%JdM^({Y+VQ~x^P6qvs^tVW?vDK1FdKd@^Ch#iw7LgBiZi;5a*(7Fgt
zeIxHSEH`kzu@?vsjD1*ul^}rhUSV_H6(d4XVibpZ3#w{7B(b^+zuHc!L;MT<IqWkG
z8r{!Tsxip`1OE9s3G+I1P@q0h*N9|-fS(;0JNj<2gJlV>XrN7h1f5DL3tlaY-1BBL
zw$|Iw?cGfRDOfpL*-QccU>(ephwV;!?c^F1*f_bFo;sbrILC#3uH*U?+Ivx+O<lw8
z5$+??3nf*g>ky`Dwy-U<frXB|LK{SZZ6U;OSXbf+T70jWs^Q~xSJ}zyXiz=W7S)pz
zzcM?1_v92jFq5IHKV=q5eFoDz4IR%pj(o>?H_(RG5H>EPBC_|ady4Ng5#Z-gBzDcY
zWC>Uu&q`^-jtc@}lpQ;$L6kS<*#S4>{j#8Nn~r2!rSW+^7B7!lr`t(jC9O9-50HoE
z7e_EewsAlAatux<Suw!46~d<~Cmn*$R=F$j+F+o%Rk~58jCL1X!fy*N;kSh@*#X3x
zKMBm4Ee@*jd=h;~VKaM`?{QrNS0bH``h;{YLGYYqxUC`BeStlctT28;G*OWTKrkeG
zCX%$5MFp#6t%<O%trhq*F3NTiv!3W&BZ?}QIwIb4GkAq-iKNtUVnF<91?HeY&eizC
zVO?f*;GR7bhAV|@7BWRp%?jrLSwS372hY8K1~wbU+(0c9Xrlmcnsc-4V;Yy%ekb~^
zO)sV7G##E7jecQg2dg@_7T)HajQdWQ63?&J0W{RzYu#scM_~Jky@-`;pcZ&e(5Q+O
zg^9KkUgrsRo~Mk6a5dxXz365rX`cC=R_!~Pc0XZ}>#cRUvl$VDtD4un6F~w)NlA~H
z5xC4sP)4%dr>@AgYeAXoqETqi-(owhS`UsrP~T(P?lI2p3tJQo=frD5?txWei-hGT
zVBL-m@S&{hn8uf)$kd9n+}3jVvo!+BFjr>xm@d&{yyGg8LbBm@u{$%8NgheR$?-yf
zlabfBu^swnYq#A!Y-JiM3T}miayIBA8Xdu=t2t75Ka9MFTn*P_nOs1QDYyd}Fl+~<
z1`SSaCU^qI1kB%61pT#Ilqu%w;X&BsKU7(%$<mG`Bev2>J}j9W)Tf?jeb;r?27<)*
zwxDa!Ue(tSd|>ex_}a-heOW<do`dC3@9XlIK@rYmZA;Ser1KKIo)~TjZM;M`&m?RW
z<u5s7E~#8q>LQz)%glW5CJ96~QpA+@@x8V@OwS1edZid*E+Cvv3p&cl3(fYP6jqr9
z$nD{w!5A);8c_8*HD?W7(MCs%`d*CaJmEIq23SDTW>W7d$5X=2RMp|-u$PU;`N%>&
zszfVvMmr3JHr)$xXMoQDg)HxLpIcHXV>db75FL3+5*nLO3+h5j$b?J~WPnm@pjM1d
z%?LVSH=*2RVjCh~2|MY&ii}$X_qn!~GHjHn_8s&-*+}m}(IoJt)Zz-d{gO*sX5Amf
zN%*k6DPKj}W!L1q?^lnm8PY&wH$|FJtnY&%>-(T$eIIsFClM=wQqDx;RJ4x9zLtP;
z%X)58SS`SRQ!xYrk24ly29T{Y7EJ&zn$hz(8FlR;COhQ&sbZsu1xdyRfQk$^l6V|o
z_~8@&N46e6Oum+A<VA`jtns7QeZMVtNBCaoHjP!<YI8Q_{!uK_-N;y@YQP>TejTX`
z?pjpK5<QuAv+j1c*S(D%xhn2N&q(ueCuWLk+C0{jA>fes6U8e$Mr|!*dpMWKO*DIm
z^}m-pKwUxL*D`*>xdE#nL!ZwqIDpRvI*{7y3-yUwvq8zRN#JXiP8k%RGUZuVc?*(G
zJ}0O{miEnP3Q32if#|0t<z64D^mI@y->#Lf;&7uNwm?h97|xG=tYAD4BxvC{$WxqH
zj2gZwd%t>xXOo=K7Oa2v$N~wJVZ=>0dDuE|NOkrqtc0xK5>j9iqYOH?4~%`q9M~c9
zAmwvros0XRo{C7Ay{D|tJ@A%rzlTAw#9vJEq!vT$2@#~-auj#05ySl;>Q1O#_hUz|
zvu-?yD0PP-mT`!66IOMmvr7cw0#wLam-Qzu0-=+rxFy{ZC$i{+|GGsl(ea9`k`XY*
zM4T^{36d0CGLB@1Q{l8L&`FRygZ7*kKaCN;@?^Ws1hyGEfkKLLbDNSsDzKi1hWu&A
zJMfsDVXjFW`Y;hG&n0PM=r}!gx4DDSQz*FyQ798Y#v*k_d{wBIf&p1i6n(-Td)a8z
zp1=)iBl(!4LNO|$q_r_{5`)TcM6N_qTFi3|eb^ifw;*&+MXW6wlgGsuHGC(c@O*in
z>=@3N?la^ub}QgjT3ILERtRkN%`U#_K)6%vHF#C=9IkgZIw$Ka0Nez5OyxDq2x^Hu
zneFxlXeLGQOm)1yYg@t}%Z2loFKf%jQ|GUofBfRs#Vc2Jkl9Y_q#q=hojqyBch)(L
zwao8R?OK6T`gJEg-EMe2fq1C(HTQZQUW;oRzSkY#_Zzy8yUl&Xbr7erv;}9tOkvx8
z7w>u}O&5P>#?(pQ)}Hs>=`?+td}0dgp=4)I<2b`lHq!K@CoEi1C_vWC;vCGIfNPgc
zBXViSy4Fs>i7D5<BZ~MW0_JZ{7}x}J!Z&Ve-+4IK(k+Ykk0W3TEf$y$&=fJWB?@$j
zP!3AM14k253FLl0Yn3bB<<iDSVyi*93g9@1+`3ChFzE-Dfn=}v>C&RYnH|DT#7bEM
zK9>oO>pPbaA)uRthqY8&9-c?w@N@slxpz1Skt?%$9^Zs>i5cP?<Ze~ENEBPbY&zgE
zwF``TrUR7S{zPK|;31J>Y>KY%8sr91E;0y?j)I{$>|qkMQ9&iC*|3DFjGRRxgq|+~
zpD?1$*K^5*KM=9(CkGJobXby0gJvE3=9{mf_QSB;iNh1@6-T^-kiQiCrAE`%VcW0V
zbN{6tAKq)t(XlRphDYZa3L)FLim<Hdm@8TDi}Ylp29h?v=j(}II#yPVGbN}=o`1t<
zw0&Td(i|dE8geFXy^#Q+PcnMBp?a=@umnM3kL{co0YUg7ZWI!J;Z8rwrxqPZ`GyCT
zpqOJFSOgkK_K(Z;LwL`^x6?_(hM*7V$lJNYS(1V0_G=^(D~Z-dc?<?JVHmpE7`G{7
z^RdX#AiptjR;clQ?J^5$5ec2rM??1&SB@x49x7PEV2X}+>NDk5;`Ygg@FBn}o7>v#
z#n2xGlE>JS$eD7qD&*+w(Y@<dgL-)HQ4^9NItT**orIKwc)_B$=aZa|>N0jcNugxa
zr2=MuNmVJD4l*T5`x$Ip+UtZ7x2@%5m{xld(1%ie811Sqo4}Fqft7O?A*vvK3=%G)
z9nZUJ<P^w_W4QF;cHV~sQHY9#GK5?@q+r2VBEIR-(TP}NPC*Mj68T0aG_*DcC0W_L
zy-+3Rrwv)C!7RHmMjwK6Ha{ReP|0%Jq!~grPR2mZY1sn{Puia$&m<9q#UPVx2X?D>
z632`Yvt($;1ra^r$WJpv&5R&0DGkj8N5)~E@diO>;H)BIN?A>~14D>O*>$ey)P;V|
zb{w0WPkd6`mylzPrwhzAe(GQ>BC~-%)J&)Y?tvSEd2b5G8_G*anD1qae681#H}Bz`
zd!)o}zrcm&Z7b&<x9O9Dtw)Zi9EwC*J?G;ij3#}`+CS8v)nD+&ttZhY-c)E6YBzIm
zIVmSL>Q~%H$nATELEXK40@}{B8t1(t(?RduFi2IP7cwY2wPZn>0h}8ZGLK-v84nq7
z-t#H$7;I?AaHK9HI0*fAlwq{|0cow!9iGAbZA8~}&&D!KB2_jq5%!IdHF^?|uXT~k
zE`qxiN2T7lVZOBf1ob{q>IXBoeYEm%^=!A)icS!fDf=1G%)aD8p?&bq+{I7c%#S!e
z)iy-8+<q=e&8-g|JHg3*&{9cPlD$aOvC};uL%Yuk4IZf;r>)-iSPB$ZW?S))s_2+x
zn>;&1XKSv`Wg8cC3@=Z2E!DXFM&%n<TR(mjb@P&lyw(9akaJqEBCS{P))UwIyPcPY
za?<x&CI*)R_>umbU1QVwIRV?tS>E1seh5OT__{g&)FsB(&1@j~RwO<gsS4;%_lrKo
z6$w>JTG;?(>|Legi$$2jeA;Wcn5Y`sfb1t&0uFPE#z>ziE4Z7DF&DB)fyhB1S{Bc%
zsak^5aGT0QiEmExY0tS{xQ{u21#h^$@&Jh?#p)xW;*jtVO@%ap6uhls*E@blMaPd4
z!zbk3-!~jJxcumz^e{EJ;odpZa^_KqZEL@03MZ2fa=Ve$x6N%TN@wtJMCWLa*;2$7
z*%XeqK*q~bSwmz5r=2-#&W9J6nB;&v?*YFBP0k@sN@%O;JZ%6MYD+o3+&oyLhYvi3
z{XoiEl?tT7jl-Ht3;_ZU{FYCt+QP_GxX$QzRG1B-$*&!N>=buFdzpIGKtV-pnuf$i
z!rjVCjOFV?<czsHP>_LJ!XFhd1EjBjF7Mby({<R`KpY=N2LhwZu9r|T0$|_;ZA2-|
z^v+g~8#l!0v6<|6_vBPH=~_c_&orF_Iipt|t5^h9H@XE13{jir69p)V8P_pHOO$w&
zkZ~Itf@L9T%q7+KjE=SC+1evqd5D!h7^MtVEDSqEKo16nG)^$CXp_BS42`qQP6580
z6LNXB-s-9cNK6RcW(eFYX7I{)%vmAy8p!2E9y)~~k=#3Q$8;(`wt4UjsSK2czWO)I
zBs(zInA|D!OWh`&;3ATYF7ko=_C5i+M<^;h)nVkVf|@)nQMZ?Zv~rj;YEtC;d3gV$
zBup;PL^q9SklUL`nRc{fYY%(NeAB*$N85MJfC=40x4>;&u^L7ZO-@VS`dAqVFVDZ&
zA#$M|4INk!G9{>;AZwNyjWzNWqy6%xM58Dc%Ashw8U%Spw8-xEbM@_H#UN=FQ}U%b
zvd%{Y55&Qe6rJpl`pp|Wkm$yOdpAJs@(zS^<dJK`GDhZj?SYJIw+017TJ~QEVsEc3
zNfPJc3Gu>S)E+kX2q;fIqz|i6We%H}VD?wA6JakmZoy^%aCamr>iw#Hq=Rl;^X-i^
zZI$Eoj`?E4ZU)wfNG?9NZ^rAg3Da`oz1Xn3Gol`O$l>ZJo}LtVp)^HnVOmP>g+3{7
z>gZ6+vQw5-H;lHg<SF6lhRy;7!|3Rr8#=vHxlW1CHd35kP^s2K{aIxCG^b(Z$ttnm
z8>EUoaqo##I5LtXz-bc#zD}5aTlFmBk)Y~!Y8au6&_HXLQmn`1mO~}*9)wZpWmT)n
zSCUG;VTOsU!$_lA0wSWwP_j4hsCvWKU+|ds>Qk=<H7adw*}gg5uwl-?_RawI!AiNR
zT7s}>$~>ama4PEt#hl6#0YsvjZP$pzYK%xcB)d|X^WhV^_f^TD0duw08o1|9HeiI0
zS_Ajp(Giq&I(qkQG|+JYKlT|1OO^oSNQimm`hDd_`<~K;kA^3vxyR%3pw{C?bi~^n
zLU3i6rfox35y?^|-~n3UGdae1W}~4RPZY>8VDRc>(bVC{Vn`5uTIkU}NAna`P9w2f
zEs4ynHj+8hk2;yt>Ls75bzKvt+!kd31teZ|4azig4KYHfFQ#_)#tqYpTcv%`mORS$
zkxug%2qrus*3Bzzd9rwW@#doPjn}T3;1=*Qc+Ub@<O&H$1Zw8JV79!S`qL|)Z!~?r
z5q$11r(DH`hv;^pYq%zESH{qQ^d>##-O3ZZ=z3jrS-w2GVUUk%Tj9-1lNIxIgscD}
z7_E!HUeQ%CFHJ32R{q2mhZI73Rl-(Ctr&0Q&E+@^{&<a$0;S%@GQ?z{+xwrMm|R^V
z#{nAxl)&x`;sIz<?Xt_Ct!+mO0O{?=xWEQF#Xw?fmerhinh*+z=p!A>if9@|Xh+Qm
zpwf}LkaUW~50fyPkhg(_f3(hjXk&#9YXxC^qAC}G&Q`96+aR{7@ixnC?xYwp`@XY^
zXyWb8+YLaF)cVtg9}d@pEx+yycCO$?P;etGXu5&boyEesX?Tp=JJyxDWgU@Nt-Zxz
zF$;cCgQI8u?7S;#-VDL1b0&7w!Pl7|g2@ZY%C4xNFW|1mI2&*wQ8PYKLLk(7JD8}E
zSTcp&i-jZ20DA@5QruSemW{76wT=9{%*?c&q>#2X-(f!W)Kj$Re&T3VvkKcyz%7FC
z0*RM1n8IxrBpTjtbxsH1r<T9r=JGXB?giBaQO2a1FF}wj<V=vlvjNsor1-@buv7JR
z=ia>acF|u6JS)a~jjcB@LybFV@Un73o5x~>c&njn+M><2O>>nsZnQkQ(V}-(126Tm
z?X<IhP+RTnOT5?eJG$47x3wD@v`qrFf@U|Mf_3l1u;Jrub8n*`ch@hbvD>_EZr|Ie
z?v7Y}FkN_$V@}{8sOyG2IGjEj2yzE(kFy~ufGw0r#x1EHC5=>HPGck8M^iDM$gREH
znvTW%z=j{-Rj%F4kFMK#8d)tYD@T-J?9G>fGG#A3vsiMDgu<SVW~;GfCQ>!lwhvdL
z&2`M1YTsXdUp}FxjfjGS4-UrJdSw9z=<mu~tNPB7Za1TQG@G(E4J2nzPb9sG$YGu?
zO1{Jm;rb1n)&$&M@@%S1zF=dX9#7aF<p<6C(xp@l_hx!FWhdRad$elYqaFJG4{EDs
z2bEV?x???Qm)XNIck{OKaT;1`cQ0=ABV&ViXq?Mz@;z@$rTWjE+vw=yNt;|d-#BN!
zOb~n<V)FPOvX$XC#o>i>1#gy`E_mI-NWMVK!hF=xO%c=iV0&g~=&u&B8ui}4EE+zQ
z9UQ!912m2YSI%8@Vb`G_?L#?u+bh>h@Y-T=v)o}fG)diJ4Y;0jTf)Iw?6^j7pEaMO
zeAtmKLN0LVI^{YhxI7T~p*o{O#wDPRaH*Y}U1DADr01Ty9qC_GJvOJ1S9Q>1-}w)n
z76?onv^Qpdcauv~>q8Sj2AX3vn~>WbJFpKqro^^l!EC2x;#}31>KW$&A}mpg@qoGH
zNSoYSYxaC*6nY)YD{4d?lFy2%V&d8`vx}a>gf8S<b{NuEko2fL1U!&WsPBd|D6{@f
z;e0{m_Z-h1D8iD4`bf~kobxIKveZ7*pJ+#a)W}I9a6$6cVK_PrAqXWn=~Bj?w7Jfg
zSS_wn&79wUay#uGYh~$thW$x`l?=Us=MGLgs#UHd=nYksgZ(_Ah<O|#9)KVok9>lP
zAnLRh2pcA~zO|uyy<If!NJ1%HD~dq6LQdS1OlG4I2|VbOrGhbPKGHj;LggL}Kh<t^
z;R0X>UAFzyZ$D{lf7fq+H`4xA3E4Y}F?j7oXMm<vRG%%E>nq%39r0==veLG2b4lGJ
z+lvTUU-K`s^|h6AkFqcC1@h%BY}yaG(>(v%Y&I<c!mMWq_^<>GX*M!nOF|s*S~P^6
z(bAw>q{uHJ(Ud7Y$_wl{!JnC#EFp~}MD|l{u)AFPvdR!kDGO14n6F~$@Nu*v7ognA
z5#)$~ARF*VrXUvRT_x4q-eVZASxjDDMzssvnk7LsnaTmA9sC;1-vBSbWzgpv^Nqpw
z<PI^?orYzsTyF(=MRl2uG^LGZKm0bM*z-p&Z&X^%$X^`pKerlo8O|j2Tz6{ccxmt0
zSzQN3DHJ~pgEZ$Feu1eXo7`MAU#(ULc|LZNgjY9V@g0=n6pv9(?7<99c|5hNJ-f@&
z-cb*;0ZlpTJtzXVJ%qz?3O4|CXe?-M)3HPh6dX{keRdnF_C2&=E!YoSN*!d-cLr9p
zK;i_)kKH%BEStaza?k;wIR$kfKu5N_i+-t)Yv3JJv>F1lF(HrMbv!m<>)<X9Y8&VV
zWx9a~Kd<@o4r*mX9lhu{#85UZaXINo6c}&@JGx)aD0Ri0(JG`lf6CodBGtq!m|%q-
zL&Tfl0owl9_hwLXG?^B_m9cP6(J9)^X}XQXq$+8@W-uP;BBV0_G!^i0*E<>d-nb6+
z)~02dRs)RH=qG+s`Jg04Jpw#KwMTQu^S0$~(@wh4X<jKqkPt9nWqMHb@)a6~Ok!lJ
znr_$1=Io2#nGm_T+tYEJyFJYanz3C-YTO|AlaG^p?LQ4_LEavdkHNib?vWm>f$8M9
zEQkm4kfKYBk`tICGv@WRHJ+`EJn8LzUx!FjmWHZaF-{Uli914wP~y+C<yTvIcemRy
zTcRZNZos02Q&vpbI~qY5*Vn>q$?(Kpo~!QiOdr?rZyrG7(>9{YUC%D;)37WNI;C8}
z@%&mjY8g=NEu0u#1>7GrEhIY<c=8D0za}E!JYpZ<Ry)86MS4zQol^`FK2Zw;5{wjw
zV+L&N%&fS&o?MVF1Y@HFSm13n%BPr&5*7!<)vUtY4x_whqn|7jU^-+NrGpWl2rD`W
zFJotkaZ+_G<qfyfSrP9AknzntO>AtFxe|wYAJ}x_8K&++@h(9D<3fIEM%l546hO%s
zUps=P?k0@%{OGNY9HCR(*Dz9T2#bx{vBNAl4iegFu;TCbL@6|bPePrhr>vn8U6`pk
zM(n+yrifaF!{0pgGwgX2JHVKJZUcII-ihcK$AF1>F%dN}T%6l<hu0J(5}e{}NLPDV
zsgN~0X_iE*a1Dwqu>J4@;v}+nq!lyHx79@{vPgtDUxft0q5{K9c3?=!Mvb^^tekr%
zpgM2qaBZO^=W*}{@IDB=W;F<5IOdj<gLI?vg~N^H^L{?{pJN=^u3^2MI2YaTEQOd;
z3vnt1``M2MM*%dY3vq-64Ems8l4^|*2PB*}20i#`in-@5o)M)Dd<N0W9r`En5s1<O
zE=Mq675QgN6S1p;11f-hSYHB+2E;KF>{zrQwH7pju1=~Ya}-q98e2~AJNt=L4VfrL
zaI15gT^6dQ9Aanle{dMO-STw04j|W?VSoz^Mk6fozVioW|1#iMpo=45Usblg!bT<z
z?Dj~6vJTB(LR)Qqp?avgGxf(l(GiFYb}IL#O)p6ICkGwgl$b*rpTw=(!PsqwjmH|c
zn5rlI^bA}huTn#uycLnS!%Yb?xXrEQg__c3&v9l!V76szY~HO{Pix6N4hZ?(kNxo@
zNbNcmRpO#v0a0wkK446Ztd<~Tb=Dy-=)_3j;1C$m4gj=dIiXlnE(P!;KAQo%(1`LB
z8A*}@$)b|b0Mjo>1tRcHatP>i;%Gk~n|p*JAyFfQXo-v+(oLQo4JchQ>03=Ds-d(x
zGFSA_P=Y<iYfm!OB2unuRzU-l6w~4FY#(Wm5N4;%*GITeQDv7TS#u3AGeTyjvc_6-
zu`Ye-m}~#Jr&78EnSRTG!fW+17zrL6Zi*qmXgKwjh-6YbfzMHsx*_!m%#Q%`uvBQr
z2BMJwwn&fx46*=MGfV&31VSkUa7_riZ4)B4ZO9%m;9mFi8Z%M_+!}D4=&GiK2@Nv}
z^4c&mqx4*>&66?MlPL{OBxkeJ&3pNtZhIv;!+{+w&OopS&1Tg&a+vr*sH<MuZgMd|
ze}yrT8u_*-h|rs<KG<JnuuMTuG{+l^jWur=tB*o2VcdbDBcBXW%BTca>&T^dQQ0hP
zjR*=P9|Z>&X!b#wLeB9spiLZ7Zn^^jbM;RJ?_j{du!kLDwukbolV)~E%+^u59EkYX
zr1a?9t{LKqD53|DeMW};n-celhD(c$BAXZ!df)aUspRUCOx^74!K`v%Ct<>}Ig5B{
zgdIali-<*cxQjNexpdKoY>KToZHQ)TfNL2`);olcJyOc((_tI-WGW1WJ2!eIS#}cO
zDtX87y&~B@7&$Jm8j?$ZQZq9=Uyaxk+v;cEvHA}LX|TWezUD3A)zY?`Rdxeke|KU#
zAhWR4wp~ojmR@qW@c>7Ibo+3ZP{*8=+kQ=uA|-%|At&h37|S}NN{cg9n)28paNQ1J
zWWm+HWY>A72;l69z+97;gx*`r03t}<nQN}8nuAF;u2%w2WAI9>#<J{)S}NM@sEvVb
z>L$x4b7m0%NER<3%ei>CQhZM^3O(<RDrB6_kB*|3trw)9?1HyK4VeATtkLbws2x0e
zKSl0`JHS}k9C#MC!7Kqn=4_XSgSAv2K51J<{th&Jdy`|CQVrP$7yS|Uw*a)ka-8jE
zQ(1Oa6iwoY>q!IRI<(mYwO*EK%PHCjDt5&@1()CuW+EUPt&Mx6h*i+he|r$X9G=#e
z^BTxH+n%>IH`^;$0c9DQ2K;wjf^>-!K>sYuR(9|D{O>2Rk2`7Qb&Cd(-MektTV2p0
z__!T$B{Scyn8B~uY48g1bZ~8O=dE<oa7(p%We4*3uCKM*OP61ntQ@B_=M28JPl7xe
zc$>|D$HnXrW{dV`J%LTJd(PB2o&_3Xo=%(d*W%EZgsJS|&Lf9l{%~+rddjb35-+vR
zb+10?7Z*_IqlV8Ik=pKKDIg(a40p%3I9lZGwE2m)*3X^PI*yYo=YSbF4;eDZvX(x@
zdEPDoG}BJj%USQSF1X-?8I(&_8iG2i0`rczw{=qC(#WEhqbyu=X0maqLP#`fE16)1
z!`TQEk0jzUM2-U3n5zgaSp%X;=yZs_S|ugNsTiI~kewMJ*31`LF9*4s8T0`&ZR{yi
zVRtXWAzTFR6|YML#{^QD@-Xcn-87R)aO>PI^c<|J+o&DiFZ$$w1kM}1NhvoujS_7~
z_#9!bG~!$_QTHlmrNd;Z7ST}b-@Z@}m%Pnt0&*gI0wKV1+d^D(W^jcMdz9`K{k|D6
zQ1jIsQ-)WH=7aJHmXBANAS?>jcw-a(nsEyVTvr<q^xa&{MIR;(uSs)>n28znj#T==
zqtFhFm}smV1ZfFDcNu~=ktBkYiBYA8l8K@P2=_v9BO4dkOSLE5L+|nh`2qKnlr#O_
zvHPbhI>(c~b@e2eR^dQig~W~#g(Jf^W2%~Bf(c|QDoW|OkP8z=1}zY*;J(0^d6IRd
z5HK~&AgPs&xIlyp+H#0l9k!}>SV7HjXId#`^H-6__Jxk)2$bx$n@>fFhHb0dI$Fs|
z36}{r70b~<HjnvNxs%kWh;=ZkrUhl#LBEqNH&D*`G&pja@66+3nfwG*D{MNKW-=&~
zj%U>#i%611k*sHyq4b!f7{>Gk$#$sy6YN7DYnmqh5jqm$Gu%n=<PqYlh6r>Nhff>b
zg=}!>O?iGGqa*mW0DEukx>InGBqUc(-GyAB-btK_6x;*}sEaWzF&F|j=b7ZZ5fdwN
zp~uI8iW{>+Y**!AHf6IOb%{PQYtV9@Ia8YYb<jMSt+boXt+m|QsdCO>ryOwDC1`9@
zl|gge<Z*NYVwg^?&Eoz5iY6w-<8&KrYLq-l&<F0F?usM7{DJQ!XJ->19srUz>?Y7P
za!09gtOEUy6V;OHPSB*zw6v)|SzQ;^Lu2`d9+EPaYMBDygaul~X<3bT#2b4T;FhcG
zhz~5!nk2GAYEOpk0@0l@c^9V-mZ`Ov2skaKAF8*7*t#HwG~a}9!xpyCrr)Nt<eu&(
zsWSkb^sUh+!4!>zIK5gtmj~3?GMflt3AyI1C$sf#p)dnbpRtQ0_%DpAnOOMTMdrgm
zqRG0c0x@nOW;gZ@AYgX}fFy-_;&%sd>JIe6qcwyR3l(T$<DP18WpKEjFlZ>X2`*-H
zi9cu;aI7}vo?z2?*Xre`&)<0b(i2y=&R_UU>4$!%MN*$0uuqRLj@_j3;{fzwW37{5
z>W&P&H!1xzOg0ln-*1<EaCyvQ!wpLwJ@mvu2m3utGFXo3%p!uWxF7hZ*J9l|60I25
z9<pi~UV}w1SGqry!y|Ewvg(s#vhBySu~4{Sc32E&L$z+sJ-I@U@G#Wkn7gB!T%Dnx
zA$QyPsvt?nagpVfO7J#CI=kZx6S+mK97R6lTO?@$?VtlrLB4D0TeIPK6aV8Meh3!^
znw7rrg8$iW_?fHjEOQ(%(OTMc$*R{7giP{2g#GSn0^<u`5RdRwmCyR+>Lr;QkH|bt
zd#x1HH*8SQtD-dF0l`zN6|u^8Evz%30<|_&3hB$38rF*<yqKlkl#Sjpgo?vbj@yu?
z!o{1Q5|XN6hcb^t=q68j?Rvo;g7oT)jVe$e$a-3PGs$-iIh`Ci;8;#o!(JRAyH<;f
zIpyMFPI)}mR<u89i&(*0B+9_B7i|be7pck!vUbdHONR9C(aTRhbpG<yOHVv}@m-n*
z>gP56eGo!1RUsSUNUeaEEbPj~C*E=C%9Bsjx}u*)WZ*5kb|`H}oIAo<^0R(;v3PZK
zb8of9Psh(j;qM;XY!)`$fgC<w4rA~D&Zp>j(z@J9!-<EG;0a7pd(+pXz;Qn1A7`_J
zE~FPY)lQ6GsPDqUhQQ&C2};${ohujShX;|jGozEkwx99moRH6)VL6H_jW42cSN8LO
zK+7qy;Rfh5=bvxy<k?)s)L#xAjAhI**I|!4;w8>e&to!;%c2vVE>4XLa+W>eFeda3
zhbw;SQ1*QyCyv46ItgMup|Sw>CS_vR7P`%iQ9!;Lj(%P{ro{Kg0rdTpzi>81)QMN#
zS{L*R4q}14t89j`7}*V<IuXIvkr4e-!UH5Yz|F`(0Wc9H_QP4y<P=zu-fV)9RnFRK
zm973Y*dn_WUQO-DrFhyuMW<KJU13@t3&<i(nP@>Kwj|zPl#^SSJ&ue;UssBjbcxRV
zAW4id0fywj6t=u9b6-=8tisvFLab4+?qp2o)&A2&HmMQWD;FQVbam^>yK7X|d*N-R
z^RB;=q6%H-vCr%YEtWU-xWh@GiqjqDj_P3~bIFKy<S*!;$Jm++Z(y20mM1?~r@%v+
zv|ko|bge8fPp_Gcqp?WJ%FPeG0nvRl>eYz+vy27iCqWFrL9x3x4cypa8)p6f#5!d1
zOt5cNF>=hfzOq3ugJ>G<7Af1su^oKgoe%IZhx@CjhK9sQNSG^^%?^t}0e$AaTXti@
z;X}^JQTCgQ939UlW55#hw*US9_P;+&mWClI!AU^n{D|h<>IG3LWz!vwcApuFoa<E2
zQ^A5{i(WTrz1xc#p{-$xp_Uo-$D~2pu|A#`?!9+20dhZ2!`XH@Ou&dh;taOw0wHQ)
zJ=V_#o#o^QrGk~8INuX+ni@)xHe8)Z4Kl+d+nbEuZo1^K;%k>t$lEis;ke5#<;p)P
zz!IRjwb8Y1Qb8)N5L$SW_mELRHwbMbg%+$%5jAtBC@N7<HR*q7HRuB@>GAl1#Q?`?
zN7(T)j->rrF6kDc)5{lAExe*4yV)ppa{&&xz8dJr`FBRA3}d!uqc)4!`4J07evi*2
zKBq9s576qMuT^>05ZsUADCGP0<WqPs=L0XOpMN*l%$G{}NB3~hsoGb)@H1KIOPrp)
z#^wlb?9W<rK%1A1&prrRv;^k?pWr;Oa_$k&ezpa6vw+|{mZRG@C2G&StSbWTR;3|=
zIc(QrWaOanUbdZM^l^%@Ds2CloP#(JkI6a@n^lhlAE=Q~FbFd6(5SiUQ@oJwNn7{W
z^6j)m4`+r^Oy~WfV&my#K{?Qy+%S?B{JmV!5&YfW)bT(lNFI%CY6d!>tLlI{{B^#Y
ztU->LS2@h3O3{iL$(SulGn)u4Lwc`(={eU;o~aonHUTaxF&v5u82MN`!w5#w;5W0r
z;zEtEmOVRT4=|u)5f`juobXL<!z_qv#8%FPl(Ie(ZZ6M9-oK9rhX00exxUneYi4VM
z3T(nf36!<9$~U9hH)ya5i+5|?bqW2Rc>3~X`*4S>SBM5I+G*V{`0TlSQnEW{y%SP^
zlj_)AfQ!%G9<_Eilg7qi$+5n~@rW>MYJzFjaV@tcfq)z6+@9LngWg(4$FQeKFhj*u
zd>VEN_RgB*W}iVc;S%i<S#F$VQW&{z*#t<a6je#1hx)8Ex7^U0=)Yo3O3pjgn13<}
z#sP5;a}_Y{YT%ITtQeqCa-?@VV>Rkd%ANC=cx6+9q}<^iWS$AUPG|(FNM+fov%|jA
zoH^x}V@LmT?CkrX)$kTliXwd;+`#TAs;&t4acJ`*a-BXe-(yqlS$|XhiPf85_uYew
zinDOfeJV_}g;fBw*qW**#bebn9o2Yld}84Q*rzYXLB+Tz?~WFZnD3T^zYFqtp+w6&
zCsBZz*b!(_Q~+qY7?mlxaIj4+n<n0V#4l))+v*&}kT&VKv~*F!Uq5m660rjptU(B)
z`@}!PNkb8SAe)YjFy?Ut{3y;7cn0%S6;E66<0|aA^d2)FzaSRb@o(#^&QpPEa2~j$
zz9nUNpFq6d$O@mAb{xwlp6rqU9=Q4_<E%5+l4`?m)Jr?dF7Q0<`C&0_U3}N2ts9S=
zzjXQOD;J%L2Q`H7Uc7+OuPSryUT7|ygaZT_gXDbFC_n{}{E%6B>sHJV0{xQIk5;Ji
zH0MFpJ=P7erq+viVB2!UDBrw6YRtCJYOAe*<B=lab^!nNk>PeK{wI5I_&eePuTB{D
zwng!NTA^1<73<_JSpKqC4$dSyl-teIu7&~EQ9l6G=#Kby4SiSKHU+&Veh%(P6zV|y
zw~~qLeqpLre8IQ~Y$Xli&6ZdK%TvMhDhlFj7u7JJYtU45=;RKk_)<3Z*io~t6~<ng
zv!?=l$wkG2DAkq9T|Y^Lqz-iR7`kKB>teFNF&1`oHVdJtt^drdV!nzehTqy#%O>XN
zTVyb67WAhtZ(X^#<r&cFksme5PG1~u1x8j_DRS4K4%*3z>>^@GK$BRpDp9x+>*2&2
z;vFyz_)~@U(_>F?uy2!=+pdB|<8Risv+cWpHH&YG?k(=aa@0s}P!Z#N-K_z>=FjH4
z!OzAA*`!}3EmrWylyM$)bYy|u<T1l)WmB|zey~86`#3!T&^4|q-XCS?OP_&LdTYhh
zw_*-^_pp<$pVDUR$2evO{qOjmK66Y9*~-pJdlML=I298vNo+r)42G((TjtY-Kc>cY
zO_+2=3wkuAYE2CSj|m+@g?!K>UD4_~x|X{hneU;;vS(nIbPv<k23pB>+g?QkD1g;$
z#KvUmq9W;u>4|_U)#iwm*HD{Tuf`d|T2D^;@i~I|hZ;_rO1KVF98bfEofD*7KN--{
zbs4L!sG2|7nLlF)=tE}L6WIx<DCRYRhY2~=ZI~0Y|5nTwpuy~~oB>NU#+r@D|4_(*
zVI9fe3*TBf9#qf8?o9F}AQwz{4H$4@R(!WC`xZo%Zeh^D_VRhW#nSGW5v3Gx5u}l_
zAGCd@BhU?jUI>J*(5uxc3yB5>-tg?jY;I@qKLaaRs8C$MiiqQfq&|XD2Zq>;vk4$5
zAs`Y#L^*nmik>r(wm`*Q?6W7Va^z-wKcMOGhHm44z^ARn{79Qp)z|M{3b5`d>nWh{
zm*bWbcr@1@<2|_V5j4-OdcRtzv^Z+B^_E;J*4bCMqRYm^Cy+AD9YnB9f$Fzj+!#ku
zpXg^$@kd_AQ-ECZFVD`r$!)wnL)oUr!;mqO>{;TTrj97(J0_-pb_-(JY`cw`fRnMg
zC9Q&!(VBf6(%67qkS@teBON}Q3_-TCos31G1-rk#V>9a~!sAZNxH;oV7IK|xmLOum
zh(;*FfMI?%JQGu96bK_*24ukL3Q+Pe_qDe(Hkqo%wyV=Wz$Z^o3Ddf%V{KE{TG(Ge
zVp@eMu)diV?BF&s|Gf8JPiX=Aj5k50Ma79eK}c$QWuiBFF~XSfp4<8>e)bV-o`A8r
z7caVh!T|22S+HqFvGuyDL^|L~nUC)qdDoG*;r$t_eX4F+yvQ&YcI{I>pc}Dk*;^?&
z0`lpLz6()IoL%1UQe8T*#D2M$e2X!-{;hLSd+4GOo4ot1uP!SX%!k&L3|eC5=?CSs
z3f%iHxu9Z-PV=<6ffw<VS#|Oz-qLZytlzBm%+9)5Y0=m7#z*%HaLqe1^cKN0o#zT`
z?8UKaknfl~a75l|{kb}YMRvugRsqV)yWt<s%`qtnZcD@4LSJ`_eKwY(Ry1jeosYOA
z4Z;vXkW)a1os=)7ghGFE0@+IYM`m~qyx6%uP-x85O#hPr#Rybvkd6o06k(6aqXXm)
zOtPDk*vj&hmx_Hm?`7!nF>vUIj422x_NYIY<glwGxkF970r(;82I|!Cf&pKJ4l0&b
z#k-M9n|of|2(q-FnPDMxb(S9F+h!aSL^&FwH;Htcn`e6(d|8zs;8tX)7Ii(rD0dR;
z>jIk=*TRr)++=h24kdHdn+KmP+C5k(s+9_KP&Vl-^J%OlkmD&1adAyrCmDmII&ceQ
zyEZejpI7R>R$nUAFsYs{<f7s*jE?@0RXPy<Gq7n`OC25L2b4HS4h}U3-}$z(S&fv+
zV=dNHJ{*II6I<%4nPIuS50Uonx<{Ab3Pa{{!z-8z8QqB>Ah3ohdfIsd;}7ef*tqPA
zt^P53J&x%jebqE20};bVOd+W(?m>c6_^BX2ea8+lUg|=OQG}ud+TvgeRiu|?+(F0)
ze6^HwS70cPLFpvN_L}h6Qp&|)ffMjFAJ=(<AXc0fTClp}TA|Ivy5XZIk@SY_oN$&L
zWP)>mRyxZVyhLpQFg{uM<GC9S-Eb)FlAbm9coD^MB^#9C6RQjF1>4TULZeg2uzzM6
zY#d}wbGya2GL;466KVy~XVV(*(V59=j3;hlCfSh!_OvEf=$;gU6eE5?<|<SROdQO%
z-I)#OCW1Te=E!g+;sgQOx1kDhtOx*&VJ*#Cg7H>C5~fGX#ax-e*H%oP#k_SQ>)xLY
z$NF>lJ)g)xi5Q7_=cE7y=>h&F6b6B9eYORC*pz7lZ`|!-gife?vyoZYD^7sA?B$Y(
zA0^~XoU^c388U<jstV3o;7+@1h)O518gviMDO7_JI4z7APS5$ugMb(#Z4&@MXe^{c
z3nrJXZUK>{36w1u@q?#{*7d$qe?lo`tfwonf>ah(LwOrwOL%!}6*39omaG(-q@jW>
z1Uv)9L?VbxsOrJ)Y$j`Ti4f{I*oE0eRNB()xg~anp}<PKh4;0a^Y%05A@*F?;KBSI
zjYVQa3)L&@>famwUcSOKdtE|$0V2<VoYrI2cpa!-<?fNF=Np=KW7ohTQ*#|2zaeu)
zHH5j!%ZcKWfbYh2QVf1ulO4W;XxY}_nsI1i{E+1VX<5dF&N3qk7n{30i#!Ws%Y$2Q
zjwJLbV@U|TP;RNdJ-9_`NwOJFDO7V?G(|4R#|#hDuI&WXoZGp_brL5V*}TeN9XfGq
zLpQic*Ut3i+QeM0&CFbWaZU<?$c*mR+!qLMjdH3^(>m3@ptDj$K&)d&+UB|uF>sny
zH^Je$*F*gKU7;6t=BH@iXC1MS!#ykPfD#OI%5j=M720;;>eiD_NioDgghT|5-SyK2
z>UyqRyt;M%%9d9Zr!u&O+AchK`SQgJer+xVkeMoT7@Hv6=hyr66JZ}6Gb@oa*|3~Z
zI3J7YEkl$(bNk4gls4xpu`1IAZ9UZ3*dzz^AO?)@7yCuu>KSU?z@`Ce!^@c>3Rv^k
z`r5{+d40LMb@8c&$@FvVU{)1~6Rc%c=(?;cE1=F<sUvaMFU!`z&!hq{YeUNJl8<RJ
zGvpRIQVetw*%1o7z{(wD#85~Mjj8m&hEF4<$q&tN3K{{p&dx?b)MKq<H3N8XA7LYu
zMg>@(<W~0D)r(tCoqzi3MgMexGgGZQ_d${o&UprmIl;b&3m`cm*-S*WWHvRa8M11L
z(7e9pa&goLjD$n*T>^4q8eA|u*j0}|efd@gnCbz>GAO~0e;I}vG~JCQ;*4D#`4mN&
z9q$H_hs|zr=oz1Sg~MBgWPqBQ;ffl{9G`WHw?+1qRf<-BWK{v;rCaj=?y&Z=oDeTY
z1@3Vlg4e^HbvB=SKl^Fz)T0GrHJ57SPW_pEie%-$>jnAuFydJ@CHpr`m9XH4R5px8
zBdqFYON<9Gd7B2*A#^oNQIOtqbJ_9HFsM7zYd0mIx{XSu7lFH2Wb793z}i)HAa0lO
z$SxBSo#u9cxt>mnT}(r#IBZM)I3;|_*<+SSJ2ZCz$Ri?H0eZN23D}(?SOY!r6rz5d
zxo0ZGRg1=D=p4q$-CH52FfyHQ+k7*_c6dE)UGA7$b_qwFs=d%8W-74R8-nSx&lj-I
zs^o1SOji?6V0}|2bqtV8R{SEMBcOq}buqnDp=+{|HRVIrSv01R3r6HTrFvssx+exL
z*qyQ2T}F#2#cq3AUmkjpIKAP`d380p1O@_=NGuTK9Jrab#<QvQx+din{IVVsph+JO
z08{28h(?)VhkKx0pk1Ug^Q3*vJ<z&HwifeU3`MS+JjBLC(N=K&M}d8VgHTk;7(@yo
z-c!!}Znec8MqP`s6FhAfc!{tz$&{HpPsOOpC!U3mo-8;iRA|X_@^~p$Ie(IPh_$WW
zNvgeK2Y1+v)NxKzj_!3hVKn=uj&ck<8hPYiAj`au5ClPY3d2B|cYOdEresz>6JT`B
zo5oAz;i%`4AI*2H8&4;IS#X24AAb@Lv(y3pml<|+sxa>eB48r96|JW8p(C3Cy5P(*
zHvEm+R@8~XD+Ni66s$)0tiY{d7d5id3U&(bkgT@{cP546SIJ7R9GW8yl=Nt2?%t~y
zG~C;M@^Jo1wZ)d)gEeJogxZD|9U66TnA{d=*7&Gd1KRu{_AG9$H%R+<(J*bnmvW%E
zD*~(Qtqe9k)@6tKvW?Utp|&{Z+J%$=p4(*mJl>$uax8{pf8^e)MZ@<BzvOe^+q-XN
zu}8(gA1$Km&L5*G@)D0sq5R&;n95Ne49YxNI4aD7aBIVwKN`zfYedi~0lY|7M!8TW
zDo<-ai2=CPnJ6dqHI~QA%n26!NS>IQxROmZb8-9I3Awjm2JzX#=_9`HrKSSn7(DS{
zjrI+1XHnY(EBh9PPc{0(r)P_X&wY8RhfmGW@MXqB9QoRO&_}m)sA_^KKUy>$$B{~J
zeKuGwzlC8To@6jCP7JtUV1z{Zl8+3Vxs{>C@AYM`^q1{6mxe4ygT}pbLf8B)ur&~~
z3C_nJzz{#1KWZs;M_d~01k{Ed^JM_{-y!1BC)RO#sTww{2(+}X0|Xm<WP3X-z=w)0
zU0FMe0RjcQyFwX8Ciquaz&T!pZ?t|F{gvuU-peJVdnJbmcE-9SxfjWyxxwLb!BACP
z5hu^c`|O~VaeIm9=2cUeseHYK4O6P;INaKkg%x8h*iDbsRWr`e(_jsaf^PJifjzN?
zdwb=|)ptL!b>0WPm4~V^Ha03my0lMt?%-lbGlgccdW$L<7uWvy#m9s8%#&JUO)zf0
zwXm+8ME~6Z?+;u$Kie#2NfMpMF{gYsEr;2ZU?0<dKE+^$gS~tz`M7DXfNm8M4Fci~
zI{DFsLcJ=G!jNl;sRgx{5({9P7S9+jYWjGc)u38J`Bx!z^8oDr7VM<&ocLTG;Svw6
z8d1c*k50Gl!4+MbG7i`5(|&xQMbjb*tTXE6Og!q?6Si7QA!>E+vTr85v`I+F|553$
z7^%`bpX6u@afJB*OF*>0_6(3H5wJaupZzw6pS@VwyrhXXFkv%|)rE=pl5KmZ(NA7G
zEF(z1O*F%nYPm+E*j*gF#K?zC;~+|hp%w?2g+aV_c&+X1vy*pVZm8ocZ6dq^xu)SQ
z7#@34`b)r0D!~1o$$-6OC~(bXdJ3%Y9e=x7d^Na=fwChs)Ddk!i!0)KZ1w|qh|zVu
zV3n8gcaEvcrPw^n!mawDUlOB14Z#T7QjYOpvs^R(@4|EEkG00s+lR~U=@@rEZ_v!9
zdxLdD^}~5RAiXRgVpqe{cr`eRv^%`CE|~T}`rzFAX?yx!$NFNb3_~L@=Fn9K$A_m1
zHa{DsB}&dB#^S0}ZGtTXT{9<-k<;vQ(*|ZcMm+<DfHPcsU=<X+SK`d{DNfJIKrk@)
zo1)pO8AXXeN|c(fS|>p~H{d|wEK~OvY?_$3q#n;XCietIL-B!;&0;u|dO0NWLbep4
z|2Zebz%!jfD#uYnE>(bnR2{;Z>SZA3Fwh)<aqx|-+0#;iGuN=X-8pPu#w38~$K^Fz
zOF@){qY@$jM35G=MN3CptbN9L`7zn&gp%NkjD~pxpg0(5^E?bmB0-2Jl6>okT#=Km
z2saCcCj>Kvh%|=mT5BdH>P=fSbl03@2lT3#9(h>#jQoQ2S}#?9{zU|{j>byJ(#T`t
z;6QJXj1IF2$KTp2Aqfi{ShExQjEaaWs7GSQNdX*C!3Z0om{gcOKdx2QW!_;qocgEa
zu)*jm(itYXUeYt6#3+}#C7+g6<QFKgD(qP?ab@}5skvnlWYG%toj!56L{!Yw*se=$
z=&c$Wu$>!7J+f%-+}M-0mbU7SB6c^O2iqM&9ZV+xXi%Ad4a)K+<5a>T`_4ZWU#IYm
z><;S!ux>(dn^7?!U;`VS57REC3`;84K8ynH;AuO3lMkzCzC>>Rg!%G>8Iv@(y3xj6
zdji+Ud$ZnFA^ezQcBi#+ca^TDcUSL$9G!K!9W0r!|5_X}1-}{Kr+uvQ>+QBfFR(yB
zm2`8{Oh7)C(d;0)=OGxMIT1<-TL8cii0Ko;3J^(v`Qrs7WIo<El4!FI;WjM?b<MMV
zs5cS;ieO|YoraFeh(%F!7TyO|6=<x4Zipfn1I8$ZJe%HfPk`!Eq$MG~&-ISnB$p8Y
z3bI)FILGzO^h+G4c~t6&ngQd9Ipz!TYUr0UI7Y5`BXBe+-QD%)oE18J(NJBT6nG?^
z{DP4WoOkUYl9rU36Uid?p_K^n-%qwmpl~H?^m4v$Mijq46;vbXHA6=37#SV40uX{T
zS5P#!vtiNobkdXfbTZ51iXBspjI`Q(wmaQhY4-1{DMrtrLl$k(ik-M59G=WFROco+
zZczp#ub2WD0|yc;ZIz^H>jVw|%{=N8ZK}!IqWvaAm}<q$`C+#DR;L;ju204L$?991
z7inRvb>wc2hQ2qza58?$WCBd<d`!+*oI88<0O)K4iqZ=u_MjFi72qC6n}eemlG6%+
zm5v30*`$;e-60+{^U1Lj5Lg^(iCiW;>ErdyW>GGrlZ8sxar{1+{naC3)XE8&z(TO=
zv1S#JLGrXt0SuK@8uxHDFCTk|#~%V4GUb|{D!*Hc?-f9s)qF*5@B{B#56yyjxZ22_
z)a(Ig6qSe1Zw2N+m#$RqO)a}=x2~Ak2=f67UNLy2Ii(aQYiwN_dA<NXXt<Cctg&bP
z34LF|Zd;>3_z7Itq0^-pW5_V=kyx86yAaxZU_T{EX3nJ6kjfWt3wuAhgh#Gd;mld3
zDkxj}ePZZQjhbjRD$CE_$U3QmwqXzHN!H7^adUC9O;>}P@ZAiLZ(oTRJU2C)$`a@p
z=EU}LcAwPq25Oht=%6%GX|qm#@e!*9O05Cumi=KS05GD#&j37y_%>5$sSf%hX-SBJ
zW^61|)2>CKMvOmKo_->*#F!^FOHAf(+gg-bq~hB%@nDie+zXNm$*PDgBj3COm+7DR
z|Db>7|7-oD`bjVo9HwR3ogc_H_Px!=O|IrvCp-=v&7%lOD9Hy1LROGo9+&`bu86a(
zdc3H&u4Js&+tJ8~OdMw|IWweB$3|>h3wkZL@Vt>6BM)QKSfuCzxS~;fQDk_aAoO!o
zHe^YDITB_D9a)?bHj+vcspE0eWg^a}>#Xi)#H*NeBwoulWl0=3J822T8nc`nW|~{p
z9{Z@0Q`SLNx9VD^WA3EHju&<8oH&ftPuPQSbwdPGm;cYVrrCo%%?T&ZBKCyylZ06}
z_2P6x#_)LKBluB?0&<IUJR%cyclTZ_b2ytk!GqJ;a4P4oLkORt@KQaC(gmMMZn6<v
z*5DneA#gZYYPcyO0Ub!X3v=QPW!W!pTDKIfJ`P5pG28=Ga>@aTd=lwUP|eS7Os?kM
z)WRcE&<Kv1;<hX-vXWDn6(y9Sh?l_9VA56_JAXGEH#XC&qjkBn(@txo9Ugbq7KdcQ
zH#>DToq8PKvf803_+Vaa>&|f6NxR+dGO>gi<&>Yod1qhMMjI#_(@7;s_8^rnEk>Vc
ztQBdGtp}VKBk|5Lq7g*$04fWoRy9|H$Ad!3m6Ua{q+%$oUWO6TL^(tI=}e+jM1{C}
z@w~z4F8g^IYU&;g+(3xB+&$@74}!WOv+ePY$lsGwZ-us12F;kz4fyP=KzlEAh%8%M
zTGg>L$UvWSQ1qvJ=5I4HvxYsJJhriFP%)xC%n)(bf8BkzD8K+31>)&oGUTOwXDt!z
zbu0y{*w=vHw`w-Tuoz`-({$*vFx^LOnhXy5tSa1zRp=l4CDg&H!f~uZ*|B)a_wvK6
zZ{}!d#D7Gl&IaoHe&qX+b=wpbHaWN2k9tdeM9ss2%*-NB+Dmi!E}KC}D~fsXe%|#a
zxqKs+8%F>(Go0k4USp(3x5h{}hA!1!E-|dR@k^ZHtYKII_-34kKBf)buQOsq=bdPc
z=RBceI;W{-+qoE<JnK0p90R}H{h|+M?!bIbOfr6G4altw9a|3ITjZo!0D#Epa2|9p
z@QUFFSCXcT(x}tr*-)+rbJsq8<<)IdjqAPmuB)uy#vqSxX=PQ2rD(L;YaA(3FYc~2
znk3<FK_&?Aj}~TW1QS`Cd}}DrwCUp5dQ}U=3(`r>^J_1hY1j=mK4D7ERBAU1JsjqJ
zV9UWS2<oaRxPgE_QJ4+boCst#&CO2h13V;<?}ZB&#ANZKB^Im}jMYSBih)&aABURM
zqn+H-Wx5v)d2*M`%S9C9=VIw&vBarpJPGmZd+y2j!@K>7F2+v4CM!cI?IVsm2M^Gx
z67(s-?EICiyD++^3+#Ee+!7}Somr@`y<jw!+vTQx7=*i^MFXp0+s2T5jqp*qBY4%*
zxq&;-b36p$u<_v%`&VwkrTmQK2<j~*VV6xvCbb>AU@#4`+5WMGv;DYqwjjxBD7!5v
zzMtKowBnQ9fZMs~yXe+*HA~B&oislLlRf!EVAQKsVbHhS2_X@N5uWlMswIW-a<I%>
zi%E7+gSVAu^AD4h`p5*iHRA8En40MmXGImo1y@Qro7zP6cRrYl#L6Y2xy&T)=F?#E
z&65QunhGs>oUf|<>fZKT5>tu1bQq5oJUmI0oV1E=-gUF-&*GvX7xgh0OAWf1gYwp_
z)L)3^G<wO<-QarUY_b3dlpUzdraIP%^oDvG7tCT++c?!S8>hPcjZ;N7PPNR&sQ_*U
zXwq$Lo~piis--qhb?nXaaLIgtio>vwsjz3#v+4dzvu_j%*#5k_>e*A~qJS~DXrTPZ
zEo#^1PHxjB;?5$ThWc{m42ASr`*@c;-`$PDtMNZ9+ujokN~p!SSpcVF#rt)Wix`}Q
zhWdi?`Bc^;aa@?2e{K?hMd5_bQ(oeEAx;Wau?Q$$#DHj>&7iACiU9^}KM0H|f#+Vr
z#z9O+UK<1MXdpf;eVEy`R+LgX0!pGS`OPrKz<q&d!$1uyk{_8|`O$U>`#EFhgHhj~
zPhE)~U@f+;8(nmW1LrSrpp{^}qb_3?bw8ZuYmr1FrXG)^@v}uVjf*XDC_)&{XrZ}w
zI7~H<_J%OIgbf?4ffxf=_8o-ol<~GMcSc|vdXG1VR?LEAM$wV<uom{ykom>-Bl4^B
zR|TFdToX*6yR1vE^W9q{Un%&!KE(8>Z{h%YI|X~*>}KOXI0!u>Is<~FKacom;Y4Do
zI|)W8{pI))xDyM=Cn`*conVz#2V-M6<pOm{9E&1Xx->AKg~>tv;ZF!WSs-m;nI>Q4
z;HXk&0ZE5DWLbV<#t26Vf#s>g5<SS*TPY}(t~6!WBjt>EN2rL(NZyI%qfE(Fg>oCA
zy9ILTHh-5>mN-5JvSGpMSlL!p5s4XDVy@YN!#Q0GHKSNKBxo^_dTWpG9Ba3=83Wx^
zSF;MjJ|PXXK;~0inGFKv*ff`{OXreiJsJgDvv}MDD1H=zXCDQ~*@)ts#glyD?OXPb
z8of@Im`E9b`cj<u-hJuf<%hKoA3o6E7CXVrVehL>vQ~c;pGbR(#a$OhtG%+d>n6Ll
zM>g+5r_gpZQ=IZyCR)kfr>J}lGj9=40U&*r<a8CwD}#}iQ5K&QFgG04@eJdu-6=x*
zv?W*&DxYjy;D*fkgP>4A<JMcp=A9Yc;sKjS3#(Y3fNFl80DD7JO(_E4*CMn93d$nC
zts2ZhElq%nzL!oB)c}(nX11xP6P!Ef5VyaYhube#Ky^IWehL;PEt)UzrOb&Fya^?a
zLv#X#=P%wJ%~1ZA8bgnSX-Gy4Tctu@Mu^JB+Hd;d&?;+MhQ;&bT(h<2PUSvaU$hh<
z-K>^NI#AtK(t(&}!R|4@7XP0_vv3=*;buqPLFDi%mffIQGP^-_i`fn62*zdxb=U3)
zzO-^v6{I}y_U|p{Jg6FS9#l)`Jg9CV=fQlc7MoJnL^Dl`WJ8!c@MW~04IAk=qx}P<
z5}o9hNW`Mt1<z3SJMm)0ymyUcWxHfQ7zom4F60jZoe44&RC6*EcpD=gITG0x=W(;L
zAQWs|a9(8FR41|bys~^iD$G);3hYIWLY;XFY3PGA_2mGZ_j45yi0p#ZK1_1dHi%Zi
zq3f#jN_um-h}{lxmcUq2|GY{`nKIXawh$92qF%11lUa{Q5Y4symp9E%67m$4o?#e8
zHf0n9n1h48a=<WK#4v)725Lu59af794+q8e1hU8C#-uFsW{i_;G(D3zk25CuV#%#2
zC9@8r%eFzl$+%5Z+fA?+7bEK>OdWMl8Ffcu_)t<%IvKz@VAvoABPI}lmX2D6ay%Gk
zuD-?8Rs!tSvtUt|XEHQA-c@e`QMz+an<+i3ywiqH7Th~nX4!loTv`%>5a;T<fan-Q
zF3vtRYk28E9>2*Db<u)Y>j|b_)i$-BC*BHXfdo850_reUZfP;w`J=FcV*VMMmXRPc
z`*8kT+hR-7whM&IOjCc^Mq$hc%caN;A}QQl!VWKjj>|-Gz0JYd7?x;cXnSu2!pG8M
zRtXYusTo&`(iDn&{gkEa?Q=WX0Fo7Mb4<Ublqz+*mR{D7-^-Naf!R_j+(gv4kS9`I
z=nxI<r-`IFBV_<9alI(Ms*`|v!k>htQ+XhP$teJg>N`O>HoEP(`zjh&q#nojmT#vB
zJ~{3_JN^#SIEI<TrU^~0l~N1av1=GHGtHZ(h;O=m*gQqzb?z09PEY?19Ku8#EMf^|
z{B5;VS{-+Lh7&C6*v07fp>}$syU|^D+?@HrYG}1YAsJY5?rY9M7GObXkewZcE0Fk5
zb90Xn@&u?6hUi2Rzs}nsO9B$jaiz1x=O{G9GG250zHO>)Bb<a?be`bN={RBXkTj~q
zs`sc5ogcjhxM|*4TukK+@OH*D;{6&s$(~|N<zt9~qAial1tU!qpcLsYiIm%vZJN=y
zBNBiNGFjl)4rS_Cpi&g+c&j6TxnM+N(>o*7S#TMV=q;oh-Wzqy=jGdS!F0rNo4XO|
z5_80fnjSN6Hj#*BLD|3~0c?b|f@q#-(YJ6%?^%<`q;^7(7QnU*GCo@vheXjKBiiW~
z7#S3y<k?S}+&<7rI_123V2yD}=Ac{9cnr>Ss(?dxXBkKpIm;?AA`t<!x#t!qH4)$v
z;xrtBhacu@H$IDR$A~qami1@@dDeW<aUg*%{1S4Ta?vs6irjBY#M8x0Ps@bieWcuq
zOD$96PHbLy-lu+*{BYh4=3r)R@mpE^r7x`Ae3Va$Uc$?7n`CvF>CHV7!bpq73zZ$w
zIypQv!8~-COlb9@oMX5EOHS9kd+K2;oCt<7o^Kd@>I4_Av+8;X#Rs5PD`kgygl3y>
z9|WHj6eyg88a7d&s}nRL6jDH#sv)}1-$F4ec03m7SP6>edHyedQ7P{O#k$x4!DC7a
zb;k>N)=WMXy0;X5Nly?^FYzAHku{m@Qrot7l8UNE^Qe|vV$$YKVk~slJ)NV;y~i)P
z<SaHDQk(J|D(vJ=B7;P(LE~4)IMFaap#IoK&MJ(yTbn_1C3<sbelO4x!6kZp7)-$%
zRf8POnLg5*S?$=?6Hh*IQ4XA_={z-xiW$j9Y739j6-4r12^`^=;zPHpc?{S5`9ak;
z{Iae&4pR(Cmf`TKWG<lCnM4osl9QP9<EI~g=;D>wn}?o!^76&=PsCnb-MVt=iAQ5^
zw$49v`C{zFBTqkZVe8V9(dwSQdhyD`=eN#BD}3zA#q$r_H!j!*-(J4-=wspMi}ob^
z3g=y!Ru|n4Tsn<y)akf+m*PjFK878ekG$3O0#U|xz@!})Vh0Fw%8BQeH`ly5dgr7F
zSPFVF-<kr$Cm($(eH<Ts$HLu{j^~z?L;=suEk!kj&OUG^53p~G-1hskp=Y~;-*epd
z$CI)@!+5XIb3f{}zo2&IwNJebz4p;dZw8DR!vsOGDF6slol;pFG$R%HqVucjIrmO1
zsdEAVQk#0H#@Q^KqS~BCF;dSYUT$-j1uMaDx~YZuO<nSH{1|PTQ^e0Z*5rZ^nn=W-
zn`4O=Xg(E(p&$6+5^ms!H7{^zzoTr9_e{%Z%+bX|*3j@t-_EB8xmjb!kxx0*2a^;~
z2~|kN01JbSh&G_O!L-hPC9?2QP%!a$GY>sqK$muH7{=8x5i6G<$P4{dBWwZ|iPB$z
zMfT_N-RMNBeI(;k!boh4<YOaAaE#0%K~5H6s;qZlh=7L~C-9yQ@(=L$uKyT;VEfB{
zHgn(vi7Xt`+m|?@3?NC4$URj+F(cl|o~6+dh&b;2GOobbGCHUN2_aN_Y1P9Ga1@7k
zWB_l?&LhqPJGxUTQVqj?Yi_N#(tqB!uyZ%go$S6XU3JD*Od<wde;9>RFkDP_Fq{Fm
z?1m&gWR0C6Y}>P9FkO`dWxKEj=7VBjSVl1NU!pK>jIt|tFwt>F7*pAR+zFui#N1Ux
z3C$$P)*v5$AOL%i0fY6tTjblpAEJBffxyv?$Vq^Av85@=&0<6ph5DESj;p!d084*T
zQJzso%P)-(OY;puYv~FrPnD3q;#SA=hG?P$IFWii@WIk99JCIQbprv|!G{NOPK2&`
zn~F`i@1C?Z;#3=9xdSt_%?0Ij87X%)Qm!gzlb&i>mxInSRJFO1yzXJSfhsqejVrH!
zDmQDZ(=i+K`LLft-7G59n$TSVjdiT7H#8WOp_P;AjcU@n27LIXhp%4x?2Feoy>jN?
z<4Lg(^mz<E>i7_LDQzKiJLG&AFS;f4U7VELjUZI_vWelnlx9jI?~;g*42CL!CaWo;
zVK<*5?FfS3@tMar6hM8g6TKc-QtkwvHyxBC2N?Y~gH*g*Dh^AJzK(Xi@D!xtac<;)
zecU=p#4jHL<xP=baPX*sSG)CY*$f0uO64>JHB@V2Me$IGpo-Ydtfz2zw3%~o#b_l#
zvLORny&AeF@XoPz#Q8M>Wt&r9MIlt|UBR}VPZv`U4^;{1fI1D-qlRZqb<3IYMxCWA
z2-1kYq^Y0_+W2y>LmlS$3799yP+P@YRma(Dmz=mp_Esgo(J2O|fb)^u4&DUPgfukd
z(~jG3449I5Q$TrZ^|RKNO01Zhcg1dtpkfP5>41y*s|)%Y#wn_!9CKj^N~@QLmM~lm
zi5@bEECxES*p+Ek41!M&GA}s@?&Ch#*HS3V2`o9e!2nQ0Cm4Rz(L4sxmO35OqmR$1
zx`S#HE2$K40o}@xc1=$zGmmickcl-t8c?XA>k!Q7z8Me!=`}TuPH8!6)K}NzJyt3k
zi+P`CRXHO38_>3hbFbf1XHRtu6vOM13+tqsuJ+7suB=a#spQDRK?TZjXwD!sb0$Go
z4ObZ(d7M%QLgNM1I&|+u4bOnD1^cZLZ6{&^K|;l@>p-4$g5EkscMH<n%X>E~#G4L@
zVB)Z@&FO<ZR?Uj3oj4?%ltB<i%ta_*T+vFM!Pl)<L`U4Te6?c?880!?(J3Z$BWn0|
zVxzUO-=!Q>4*9S|lpjO9SN$nDhTF$d2L%X)g_+ZG&#h{C#U5|U8iOfcEzYaWCJi$d
zTOo_S-hzE;6M^Y!$N|uv`f^MZI?snF?tqWQQMVnRe8WlBj(LQC3@GxlK&rbig=NT7
z!J}sL(_`jss!A^Fmn*~xztNc53p&>;XQOGPhxmNH{y~?#rEcPvOZ0J=Rk2Bg$4m7P
z3f@u&;ll;}Tg+F+`vryO#ZSR0?kI`wo@^5DbkrlBT;+Nygj1t~jP@B&T7|j;fL5%k
z$XBF533U~j&Bg94lI$4+qDLk;^ya*aDyB*}PGTD}4Vt0t7v-#KP_!&7p_G$^?Om02
z-v=OOJWh2_lgENH`j~$}+sBzD8@yjjVol*E7^Uo}x~A1a&BRU5IZQFb{np*-rtsX7
z;0bdDR+fW^+=DhGF^pWO1yZ*$c};;PwO)=qHfDz`ASDJ^UyzAWgJq4Vbue^NMJJIc
zZ`3Q-%yyvh)>=Wg&$G#<d$c<@DsN?Hg;SEkvM@t&V#m*3%CiAAtiS|bUFoE6&4%Mm
zI8Ri}W)|&3Qc=@`u43P<N|N=_8N_JVmGN-P>uZ`+Ii>g|&d3Ut{0&R=;rSuihL48X
z&f?uf&u#V)w{oFmdBWFcpTN6~MR)Eo1?$#X3zb^WXC*d+3zXZq>a~&7+o<C5TU-*f
z+qfn^$ro|qs-yb7xX*(n=cUe$H&i%VcA_1-(NNQlKb`S>9NuAOlYAojY|mq2kniV%
zhNdnr)08mW2YZlhUE?`|EkII)N)AjjQLK1?5=8uYpE{1DMabp!mgW{LHSCWu;si=~
zU{oR)=xWD7uw_~Z6H+rqQoL=XpPS^p(M_JP9t_mEV$>VV`ocfbGuS%4a!5cX?SQqb
zTSr{ri6s3>T00)yMCS+|{a7e&ZFA0zn>195xN`rp!)MFc=cRNE4Z?C1QIp%F7&IKY
z<fuLit*THVYBzk`obf+1i?FpPUP*y5QLX^KLj5@e$G{PAYty8)E?N@`J#>=?W?s_X
z`d<^(tBl|?f|Skz28Z6((GS`Yt?x41OxZYXT_?o<EW+hzH!6~&X=lB|qVi^d!i3C_
zWqFt^wX9aLRgQDi9+}mFTuoIwaY+#@&bL({B&|VdI2v#wpOjj$kWO<*@M3=FY`Y0f
zia6fN@_AR9yu6~B*b@tMWS!D9;$0w8M%QI7X5^BaIxb}p6^~em@n)DSUpyLRbptb&
zO|R%BvG55dU58`TAS2B<u1ei;O0ZENTD0h!JpckurWK}et<(q!8CGg4RngGFeVOUo
zvYT9nzbv4!FBQry>vW)a1sOVmA7d9r_paM3t$tPSS)GRdgl(1Y^i#lDH;~Zbd09ed
zgE2RgNR%YC@4+*=o4=orr+XMvq=GN!?o!bK`F-N2OJ7=CKDK9JBAd}^8?P<Slw}AO
z*KK$Z5OlQS8{$1h*~8q8*&|G1g2U>9NwoV^C5{5j{lL)jXJ^1a9tqpgmv9#D5^x*g
zx-L75AoEm;>;$(C0&vQJZBl0_&d(a?cc+1XGkYp4;DpO!L|z4WN;oT{j=VCH{j|(1
zs*KI123k<`W&oyaPAGVGk#orr&K#4-sY+>2*aD7+yjpf#c_OZC$uj>x*)FDtFMxI1
z(5X90)dM#S**lc}HMm}?5QHPH#SGM?37SEy`X2Zl*Gls_T)?PAd<W1;i#!&gaOkf%
z?~2$0_e~p_uuEATmHM&LnL#lR5OY`-pSGj0cO7?Vd9uBX_8<yTya&;x!7*1;*?d;#
zMYtt&ND1mBCkGyAno@_z{gF!=Nc^T!=_czg#%Gcm!oXusKKYp!&R@Q)K?dZRn)FT`
zn*d5(xwsX6XddbB;w^5SzjQhBEk9n|?&V8QTns;kXI{%FPe;f5<kL^o+Qx^TDgE(s
zl9!mG9$f%HSfe?XJf`!+Y!n7LlC>*pH_wdZydtS4D`448L`q81;)1Yo>s|qml;X5$
zhY;C`Y_MutPwEciUJy}EJ@@<i5=O0@gsOsB4-Ng~q`2HW^yyq+I^9eJABCzTTkQ;l
zl&T`PlH2p1cqdx%xR+KbfeS&%=|x4iC@mj5`IcBfqN)I1wu8AO*iL|jFp>%?hD<rg
zzj?|?j96d`GY-&!g_J$B$101i51S`!cP@lcXvC@J8F3VxSKWR?<P>c@JH*9+iGluw
z){q92=>`I8p>6zJyF2O}*;Am5SNKv{PiziH1lc4(l_{eAT!LMRZlB>uec-l4I5*cW
z;&qf03odTMGis#d@$*+}q*I>FCxK8ZAb<R5@pmEVlV^)bANDOIefFVu4xCk5+tA#l
zR<QpRy9I&&l4UkvQ4;1BtF*Z#qDpxt3)OK8rLf=O44@$ymIzSBLPhbGxV6HUq`Y*W
zD-OuXdvtCxwVSr;4I``>#Y4k+%`sw<Sf>0y$xhn@B<-=%y98NRX>eg*e+dmT#ap`D
z!qB2C<}$tKu0i()c_wJu?mI{bE9@+%Ghsf&;>uFyVjoqw$@yeU{DPJqQBjFRUM9|}
zq-fp_BU59w5QBjl)N(@AndAG+Y&d4BS_o2e-w0kgLSZvg1^g$}&=$Z1;;wK5?`7k0
zj!4gn<SWVAldx(Qc-(tvI*yImMbqm+Gug*pOpcPsDJz^yZ*>Q|?3BUh?RMdt4A&L_
z>l_oWNvoO2ML7?uh!(Coma@0HWo56uVH|69JU#DIHnVn}jd!*rM+8BukL=p5C?aF{
z>PvoF(|s;E>zoN@3Ao3^5&)jKxFjtARtunFmlIl{j+aXjSw)o-)iG5()orMFVw*Lh
z-GLcC?xIPbZfnhIXQ8GqnR_Hqhk2{|poXKd?B`1>zmKuw8kHnAoMipnDIH95ib6@w
z&kl=00UDgk1g^+iYMr+Maaf@2wFL)K5cIC&Nx5GD|5U*>fw@3OhI$n_Z!o+Z5;VO?
zRLBJq{VzjiWs+c^@7q~b^bnceR*9Z3l1xweI*N`a!8$X3D$!~eB<DMcfwg|S`uB=m
zBLS_FYSynFOri-GDnYa}H;mP;04}B~Dx0#_N&;I=xqa_(8Xp+0Sl4HVrmzj1Mi60k
z^fbqCrw~1(*+-XesIazrH+VnShYFp*7$9>aC+axb$!4I|k~DlgGqUHz<werB^h>cA
zqs(VMm+oBU#b2^Z99EH_w`k2m<Yl_ZiwRq>@az&8lA0H+LckiFl#lPq@$?=$Z!lvt
zdd~@Wl7SdyLp&wp19ptjzbbPHSAd1)oOqG_3v(urHXID-xItwUNh|N}c01_`^=v!q
zJMrYrl2CG`O<p`44v1+SsGTa@`6SDe;Xoa7h!;E6UH6VSVCy_$KZcbCEn*eKi#-M=
zkON>nL6Yz`7HZiMQee(b2UYN3yqB2+2-qsD3U0dEF5k%deYm0&nY7R1*P4X3+G2Q{
zUB2-U1tj0|P>1fkUVv5H?^l6y7c;SnU&PZu_0Y?QL?>LQ@zSE#b9xj~_j!Y_!?Wne
zOH6@A%kyU;o+-UyT9(d|PT+NNvfSh)FUjO>xvpuTvZYg+;}pTr!wFVt-{#FO#jb}_
z%X2x3&E=e36!C9Zav~B33b^C1faPYyLt_B5H0F?b@D<{&7>b!iJ77K>Z`V8F9v^2r
z$9MD6n|Z0d+^~ahCA;}cb>@R@+nkGh(R_wHq<gr;Y&vFNO=iRFEyb(f@p*d6W9vOH
z2G*bw2A5SeOEP)xN@ckcVv@n&&`!eSa^Q6^on$s0oA%%od=oD_0I85NTqbYm^OtL~
zi>!jbT>Nn1a&ft3Kubtx4N0Av-a`Jc_*;FFa8`y@khSdsMeP^~19=Nk^^C;jlW}4x
zM#t>z4zW!N8Y5!NW6sD=4gt%mDmBvIq{uy>#-0V__q~>VzUi%l=_ZUAyo_PJ;5XEb
zzgzH2MhZ_BW)#82z>$P2i4W%*A6&7f6nUK`mf*@C(h04*Ad&G|QpzFVC<iryFHr%#
zDv`M@Fn>U3z)vg|n?tW~Q`|yPbh1k^+-)TlHLmP3bZKswzon$=-*MA?Mu;eyT(Pr}
z3N3f<1RsH?05!r>0&VCs94wTsDBOIQXAq1DXlZDpM71-{V-)~^SgXS$=-dc$ML+Ki
zP=In8GZsgb6H6UWbh+8<DrNJQq(sC3+iU>L6a<=*7Ze#hT~#m-P!J*pFi>FIE~%<B
zv6UM7Y%h5V!S}Bz0og&5^$zl<{yl0XMddc3TY5KUoP;b0z&c2Enn#*ddxY=N3OcOP
zGHNRZVo(Yv*OXPSuKIqM(1}qkMuzNiY(#8ENeT85I=QH&b$TEY6RSZ9(lmJTkTQNo
z&`$h)N4&ZbA-uwDpLof_V~k2cij&0pZgw9TXmplAdLs&%YKAr&(BW81Fn8RJ36DJ@
zO=Wz+^UmJR2H@!3cPYV15oWV)X0^J4l!(mWkaY!AJqZUs7sFxR2ak8aXtpL0>-HR0
zixv*%PALBf+Wk4b$z(Rb{szZqS$?kDPR{R4)ea6hcDwC-j@>@iT6Ayt3KKOUO_x<9
z@(6J*>}fSD2BtcVZQcUi&&G4ftsH5upYm`KOC;qYwv|SH_LA*-<u-%QuXckg%4U@3
z{EImy&>m;Kd{Yax;yKUMlT)6_F?)$L1h4}jS(I0YJY2wuNU<0vQf@yJFd_jH$kt|;
zs4B=LKv2DKp0pRFc`7uOFv?xhGxE_as>D5_BHAO#hAAb!<DMYW73`6QwIRk*<@JV4
z2b5fdxfyomVZWQeA<*SaQJ#q6mzlVr9}){fn=&IJ?6Bi7Ariac86JRt(+q}#a`7xJ
zagc!?$dx5dqV5DQ*ebxcn-Bf1!VednH7U1TV&_0a@Z1P+QJvm4VV^NVRwV}uBxyF|
zOdB?lO^Gcba5n$(;xQMaX?@Jaf*5L7?DmJ8`A$GOd9zBp;Q9CBPT-rl2Vo-w=Smg0
zzArWSAT5ahB0dQ)VwIM~|KuZQLT)Wz%c3a*&Z0hF@U&sFfD`cxek4s1jl=bRi3x~k
z>GX@G?8*Ko&C;&T)pF<NhMKI;4L#pXik(nB-ITh8LuBarJyJXg61JSEY|55JQ(MbN
z;5~0Xj4pMA_rV|ZK3hCsinFW_n4T{~f;m!iDX`x8x-DP3W#sl{iqXH#HokWKPVZ38
z1e;BIz*Z0zkjv#FM$yS66TP(Qg;lEhu*<M#m2%r~0vbAlod9%&4kby@4NxsG8yQ9}
zR4=ieQ~OCGKkO0_CB=@e%UOZBM#~z~ILy>9I(a0Q`H>m5kC8t#zcVA#Fh2zHikE6;
z&Qi$Gipm?CP7CTQoHK#7b0KtK)y>9Z7_}&14B2HRO>Ry}#iHP>npuYj2|d1Sb8do%
zZ-K54Aj(Qj1wn3t3@s7e(~{#>IfA*Gm${BlP#BS>A1}rDH3lnI&-qe9O;h>kL@+&B
zxd192mm0Vnr}w57^Vud<?IfTwrW4}tL8^uK*X{&xiAqudK+V>Jy7G?O2vkAHK0>aF
z{19)(UGy?3>(=?jG_C1+JpS!C|8jh}Zp6hS4#3*g)1~%LQ`!XL01%h{j*Jy#3(`x{
z_F9_bnFVPy^y4`ryeBBSoKAmQ&%k~=Yb!}IB$QT9fCdnWDIiAqK`b}A|6*xnL?3Z@
zy?W@;f@_`%&BI)R_w`x3Tmrl}Zt5A|bPS|tiboRA2NsfgGI}zF4otOB1L&D;!|4kz
zpwsRcgnD?hM!+|ZKYe-Y%Ec}7yDfGOyy{eRF4L|sbQnCo*WngGy@Odidc0tUBebVK
zH+hhn<v6wRZ0FO-l2dE}OmAb7sScP-X!j#yhU<2{WsG`Ji=MZEhtp2l?RMwd@yIX0
zcNHT)F?8U>dAB|arbgifQ3VT16f$F5XR=P>7Q$+^LH8WN&jroWPCXTrdhE&2;&%%^
z8KN}b&UXunDq~6{V<7FYU|s^#JKbwSTcy!sT-XHE%fg^FA#}!(4PFwn;;q^gck?OG
z(wzVb-+!@SgXyBTqOX0b8Lud!UUl|hdkM(xvPiGn4HUpud(O_PwnB_}DR%r;g5pl0
z>oP#CrS+ijWv0J=$LSY~*ce@Q-Z_ul?afoKl-~|d33Us2Q0jMh!Xn(noHTPNk6wm5
zeYcuz`?F>qEXm?R(Iu1Y_|AySlxj}Hqe}(X*#&fhr%W5;BeHp_7=P=@XsGNY9}lt~
zam`0UkVd`S88p?0lEEd^3<(vnhvO*+_dupNCpdbl{2<(6?h?UO8gbBbj~CDuS8%Dt
z($fo{H56Nv2r0~G5am0p?}OlBV;FI0p^M}PhB4`T41Rl7&oYHa?D1>rWbKG}L&m%U
z;g#p=ioz`KoafX{&<suHZeh;)ksY(+BH;$e#%>sdfs8)$(ae;%u|ib#1)HnJ)yu;r
zHr8!%_QW;3Y>SW0CD0qW5T$qea*Mt}y-`$$g%O>|?Rrs3qkcAlSdZ~++U3Ls;C{ns
z<c?(m)@OHwSlfic?j!zFn{R%3HlJmr*oMbmlQvgYJvjT~l`D^2y6i=E^CKM~RcI`4
zz!tj?b9>4hScj<Nb~iBQqS=>L!mj)#_;*;Q!^k+x5Zj0h<{mF`CYF%H;>SVM#xKW#
zNapxV`?uvwPVyv*3FM8BggtOv4lA|~bkSonl+0jTCNLYoaXBLGmw9nBKZ@{<ii6gf
zQ<I)$i6AC@D&U8b!z1w0fIG!yWku<)us}byM@XESx}iCnb!!?hlC9z8QBto$M+;9{
zv00iG)10W}#GcM8;FlMzDrTb#R}>#MTjpF=VplqCf#lG{dcr(kMu$zzeRpXZ&72nL
zPOLZL!k(~qQVEHzD-VVkuNsnYFIce_i--P=l2Hvn`r)Le<7}j{$|I4i*%Zs@Uh*R?
zVvvd+;hd`^3(~@*Zk6d)WF5e43b?UKeY0aW-5_yFoLT}?GqE^7DuJ#x<`&8m2R8Mv
z#M3ii^mI|e%-JJwISq>K%G)FIaFGlt<>mq2KZzg+?1W9T5g3W&Oo$qe^C!;f@-%dS
zp+^e{6cw7UweLp>(=lz!jxa6l^l~X;wac~<ezctUCOlU=TMum|I(u}ehg&$GHJ=*y
zcu9{M_rWpp&@Q%c^B>*Z%dtwg=85wMypA<TAAYvT&4-IMpACHb@=QB*UVHcaK~HLg
zJ9dwk)Ev1FUW&uvd4Vh_+u)vb+|`uCa8c{)%dlde`^7@Hrw*qJKo@u4^U^v&xu7Fv
z?3eR`GAkSLfwE7R^MJC&=Nv)z$xC+-|G*Dh{Hz`Ks2%^LEqBnobM}Y({4_4YaiXL3
zGPnhBMdyd&3a3l%EE5Jc%P0~7RoSSH3{)_tx~Cs`<l+@bf2!0l`mt8U_<0*pNp95+
zLDcIV5BBAl7SpCRSc)f{1kTV{p?elOG<kb1h-Qg+en-7<)_k2lOlxmCGnF4<5Lx0x
z+$F+%j}v_pl@naa`5WR93_TO@XcCd)xB?JjCUY8u=|tnS=8n(IwKuSd^~Y-xB}|DJ
zp$>h1L_k*h0g90{-{)w1L7QtwtYB<9^DU86cZG3oMQ5>$4OM|BxxyB6>3nM2W@npG
z@$8JC?|`+wnICmQFDb!j7(Gc@7>C)&?I2ZNL^u^z>G~Y(<@r;c8c}gJk@d%pjesif
z@Ie3KK;m88okaZtA>p~fK~5-e#SPfET_v#)#~YLE01#)vT>}EWojqKTWI|dn8-;_y
zCwf>rlN|LVt|zcWh&<`cq}21qprhzg2RFg-CR^(>1wOT|@V;{KktZ&B*s1iy6MMGi
zR`JA><`Z25KG0nOXOLMoF<<9QigT4Boscv~dL?yW(y>N8mk?aZea^%DjuV1dl(Z>~
zxzKCr&l3_}FW3zPJi;a=;Kt7yqN%~FIY>G$NS~nm%V~Sp7oA=Pb3hN5v%5K`6ZUS2
z2is?CQ=AAEjzb(hKRRNs?9eS|(InF~n2#Ki1#msZC?5c}E5R+1qd00;>tl#_H?xQV
zUY69km%?)M7`^bM+%g=f$G;ZaWbSM(X!lwuz_FrDaH%vNz6TD%!=aX}pYpTd%N<K4
zi+MS!VmKZg*^O5PI9YssA%d1KkVUzt`8%NPG=dye*c3M2FhH}6<!E&@bFuc`SXKVQ
z+JdGr+d+7xRRkL>u7MUH5_On<s^NwXG}XYa7iMtawGBp{ynl^9z8;txWF;^zdFl1=
zgEuARnuWBV-!#e|qh!J0COIda0BXY3Tc>}VUkbj52`)#uvX>B8dKI8FD>MQ2+iKnq
zji(t1HvIJVojhDpu9V_2&adbnHs^W8kF+l{|Jx!EX?D-lv<!KIdTNfH@^At7D#dQu
zx%*MWmQ9$o)qpLTHGm9?n?WW{-(?n<V6jpl4}8W4WWh{DC^7@erXdF>;0aN5^N$lL
zdM&bL42tB3kl75feC(F=`D98CjmpDTBgfQwpl-JDr0manQSJh(@FpFfcs>QL0o&o=
zhSfVl@;y1Ma(9KPaRfEsKGM~Ye5ZoI=WL$EENk>u!$MKHhyF5e!$V*WFA#$o3+^JG
ztP9Cp;U{{J%;)qNlnl8B!Uh_a9x@O+ZB`s^LyA8Z8<_8=oaW{@3<kKnsLDB`DL9)5
zaQuDG>b#p3qnh5*|I!U_dCnQkg0;_<;Mr@!!V+SPcoZyjP+fdTqWg=EXDox<{$Lpo
zRIAtFoI6(QB1cR#zvB8U3H-9DBuJwk?>l`mqt#mwsV*?+fb%&x(keUas^I+7$w947
z_RvGa60S4&NT;QNhl*y!QpD9$!wp=i^%@(`h;hgv#Xrxdy|~XyQ3+Zt<1$%rUJy~D
zUUvzCEuYp%tfyDbUA4wvG5iKd%UjxB?pufjmp2GitP-064cJo*v@>1p7ZY<<ad});
zFZPE=%-*Y|rJ5ePtTbbW1KS65O8I2JP%uk_Y-GgL-CQtj{gbCd%7Q?$loNfZ(lICQ
z2LJ8$W`d}<u8S@W#7a4vR_4))>nwNf(tS^w520cHxQE!f+x~2E%w{pI^1%+d!@-0;
zJA+i(JmF@I(RsZ$DG1`$un)MqNfI|@Cluv~J1yzw&=u6i*p@O05WOJXV~?wH;w7mS
zaA&vp;qvNLEq8W`9xRkwUK}ud!&8O+K2;7GPN#Mo49)e92=o{D;2lx2qxvDXJJNQ@
zLl`3<X_mM)6_OS+(y><-C394aF|SfN(y!?nY<g=b%3cnBuRRZLx>Xe;Fwz><4UTeK
ze}W#FxB<!kM89KnCm86F;n9cbPSz_1W|i|w7bBlr_pYk}yD(Kb0z##tprmOb#2P&h
zkQFt-Ofoevav-pne$9a|S1OBnCXyA40O&wXAT#(LL2&TSwth5QB}ZuJlqr?h6-62L
zO2~sdDR(E?P++Jj^Y31b?^xDn#!KA^DvPr23uAi&5Z#yr642hwhD^wT6u*H^3^66P
znJm)5I^Ct8e#rC%zPJG{Q>uUVneJZ8UoT#hb|+pVFJ)LMKaSQLoPwsBYc@aiG+Hko
zp#{~3-i+>Hv{E{F3+jaP7gh<+qBVMlbwR~N8CF}A(Mk<jXJn~7ebOG^t8{$rZfZwz
zOG(B3APcU07;TUazjPltVDH)_q<=;Tqiic)n+Wo+n$w{FXrV(0eh2*Sux#ZfKa+U&
zF**$>VY=LWK)!>ZH$!UhrZGo_0RMcC9;iyY^T6*=Q4FZ^r+rlU(|{`f5FQwdEgvAt
zZ-qxnrHKIEqX+4pJf-esNCsh~0%dKH^zq1KN<9T4{~6*p9uGJpu?L(_fVw@i6z1L@
z9NF+|C^BM+M0kkAznop-2cf5m-ZM$9ar>~ufJrv7mO=WJw)WF&9pMbGw`-jLrK*~d
z`atvtjB??WVLCAva|`=QSlTgi7T{}jb6_T{5d;OI?Q{4Rv9_3ZVmr84;rO=EiNCOB
z?y(l<0^d$fZ%o#BN;61s9mI~&_)*KB6=oB^X@ywgrrBfBayOf7E8^-uh4kc8m`~H)
z$Xqt??dHk^HI3PYF87FdT5`SI3^)W_nhIA}Im?Sa<vqy3#I|J0lM2xtGJ(R+nT~S*
z!u)S5)wCS1VD7C1{#iBk#82I|GRZMMgumop%YMvn_+vXj$h&2B0DmuQfUtW<JqXXJ
zRWlp89yrC`w455s&Th8_0e~861GK1Retzcm(KLr#??H8jRFCUjiu48w3bcAYPFK(k
z05g}7;K~`n_~cm!lcY63z+lM_2igD9ArKv?rfOsMVpNh#GRA&-kR4eHbO2U7$j`~*
z@l-kh?K@fwDz{021O%nw*(i^xvo)}t&G@r@4gj?&5!;SyfUswQX-^j}N|jH?kc~w4
zRIal7N{jccudRue9rVqdONnnb5WTSqQXw*8uH8+cbNEJgeQo93TPyQ&6aFo!zG~fq
zp$un(+v^z4#}MKv4XI}!<=gEd;p@(!Mn2w!pjg<5wi@Xno0DiX`yAZ{@pzIw4^xnv
zeT3p+80Hh2ZZKo2i}lyNu!btBSoAkov9klHD73W2GUn9KEhl7NQFj0zkQ&S-b?;J$
zvmjK??~=Jt$JuTsox-9CQ%M}0Stdd6jaJ}C>WrYmDXJUIq3!1!&D^+Vo*97k`l5z6
zcLr*PBDcnt#6VT7+93Id8}@KW^S&4261^!iHF$?R<a{Pv@8k;)(Lgwirz;e1I<XHh
zHU}9LFZz=*Q`)wzj&A{mgHE1`bL33L%yYO*wR?ohB&nhOhRimmEHO$0*CNIl`GR&Q
z@(~bm3lWh-25T1pP|Ro%x>^^wLB@AI>!ybeb;1U~Xysp|9asHk%DJ#$NKZjlJ2cY`
zwEi&zWi7QS095vLsIj@_kvtk65>?|?zVWE+;~S6GHthMDakWL5Z8B7f$w~Ig0e6wh
z=cD~%QjTy<!-II^(e8~$)3d2<ugzK8Q6J_`=1hQerSZ+Ax0j7}1*Dwlw*yu-3{;P@
zKdaU|$;eC-DCt(s)~^i9-+H>r1HGWRE_Tc}G7<b!OJ;C0L)*EoTTs&)=XTexmw%?M
zYdaC*pskmpJlE6ccpcyGgB>rdHJ!{SeyUT-p3NwX1axK(n(sk7CCxP{_i-Pd(MO=J
z==Qz2cD<>yFdhu3q&Q{TM!Jsz<q?d>lwFf+$*<jWrmF8dA~u5Sw_{_ubj|Av4#y&e
zv5^wU)vrN7utp~;R=a#^a3+r6EBHVaXIW?$wG&ku!dz2pD>rVqZd>Z+BcLEXah`CT
z8b|vttAYw{S}&+`pPMs>#W*u!i_9MVGBlxS%G@!S<dSXq4C=KZ@gneFcEczYQs6Iw
zWOdEAGopQ+a|e3{BG?*5XCDq2_0Dt-Gy=d8ZkK(|I+>69+NxckG>aDbwA>dUe;ONg
zX1z1Lwk~cQ=0f7f8|Lwbdi>U5(eIbj&G7F|G8>ERNOGTY{}jh`->$k~A-o`G2-I%D
zOai}R&0~#{uEdU0TsNt9c6>%dyMFP-4OE(vW^|K_pn@h<QW^OIr5naca=zktkCr3A
z%SX0}LUe7u1dbW$qK7Sh3KEdhOSA|a9XC-sg_N-w$D@F=n;0aC@zgG$Ap}?_O?=1A
z;TZG`JR6x#m>yMqs4m$=2LabcW^+gFO9{_rE?LvgCVIzfPudJ;@wC)VLb2_r$(f;U
zRYcaa2KuqY_VO@3EN;g&5oQ{<*VSTJ82K5uhIccEd)Bk2gW+sfat70Y@Ia`HrvbnQ
zTrmy!8Aw~riaUrgK}%a=+<`V-p)>H`OC7R1I}46XJA6*I(ctN4I6j;Fn}cI)MioRj
z^9UvB*;)#8uWGkjI@49-B#rVztFDB9n+pKx_O%YVo;1$MdCFImSvwJs#7PFcTuvT%
z%3j4(@KQ}xrXBCZ4crLq<;b}|C5-FlK#s+i&U)>de#cl391ndb4rgdEi};)KEnD{w
zbp(R5O9Z{^%;^L68WWOGFOJi&6+<a2cOqV8szac-f`o$O>5;haH1|cbEzJ7`BXMC>
zcz=%=QV;c|W*be3M0xcX={%cEi{8u}4pO~K<{#G)$50Tj4mx?!#9NokiiY9bE^^8o
zn_35F-1wtD+VtTH0PJPF<oh-?uc+_LG#I`hN5&TJ87PQ~U;LVraJ9Ddc6F|wQW~2_
zq$T3d;h|Ya(58dDNV;|39NNTF#f+dRpjh)rZrIJDoH#Y1UP17MGF_gH7=@F#o?@qy
z^k)-s>fxbe16l@3!>;m(U?>?VIrBqsl?4t3fdO@_4aJZ^!b&6JqdsC-_KO|BoiyJd
zV}VCHTzCrDg7mC|+z`oH>ACdBo3C4ALF=m!61AuqdI6KFLrIqAR&Nrwdh5(85KhBJ
zzSZ1+)!rtp9nA_*ut;ZJ)@>#F9b-0l7x&Ee$w+rdiw?GQH$i=ufz0l-MGLD<iul8@
zwP>|jZ|1F=7M}7Eg?z15+Ze)_xLegKP0;`gYHd%2$OHgQL|_cy9Al`SAT06`_z;m;
zU6)LO)L12Fe=}i!ZqcEPmF3jT>a@4#X+r(zH-Pt;RS2%7FGr3JEG)9R6iQoJx?Ps$
zn2p*xbLj+P)^?P09%Na|`<2xr3#iH^%)mxCJkcJbzos?}3apctLb8)cj<mw>v!^Du
zGa7A4T};+K*~o;?-)R$tfPz2L*76(dijjhf{hSbXU9vo-c}LfsiRc##Ye}-=QZ?<H
zNwz-!B!tze(lkJKp4Ne#m78Ko$pj`-vhYJ<07@GmTn~0B*qCrxkNOM_=yK4LuM=^k
zlpPCp-?Os<?qWl@p>j~`W;C=;GPQ1<7G-c3In_sE_0o;+EAEK1rJ`1SrythB&>Giw
zk{w_~j#MMR)7HKrCHouoHI3%5-CtLe6@>WgZ`jq7BU6m_%bSvnOXoqeCKEY|i@R^6
z0M&UAz+0?ULhi0UfJa4a03@f-hKQeDBkp|pZmVxS(SF;qKbu?zYqn*~_SnuHC$V_2
zl{eTb9BhZB{@R$Y9&^lU^;81IJ2DfU*i1NPO1T68Rn(k<i&oH`!f!#PTF-M`1JtYc
zZo!mOz7VG($Lt|3p6laYv{o<b4Lu5!feAP5RZACwl_i*v*6Z>#nX&!GE1^8wSatg5
z6}!Z4mT9;#;g8%A96=Aj(<ycuNq>Lg1jmdJ$j#s~HEIoHLu>Vsih^K+fv<x92s0a0
zf!QGT)K~Whqp{eY8Fdko<RJ5bjzbZXLbPGF@l;7TouZ9nCw>qNvc8}5u@kRRIxT9*
zMS@Bdu{czo#eu1ueX?+0__&L1_E;Kgz1wBtWgAyb<xl>8;9$=zn%N~Cy5r#|!vY#<
z(;n>5r@juL0+B&;tqY>fVUx$C*hSEZTQGUVk&NyTVVsse6p{Q+Td3XuOF*>00teuj
zD*!s$EB4ECy(2kVqXYSgvjnU&vy^AzwB}r60XisE5vyDLPS($sg(dPd*$x6ClGy6}
zh|@@^Sh#>vY-5ON>C`-=IYZ^jpex>+x#k1J+#xxgH&9+ad4Gr8G$FY&p1^I4cFVTS
zc4A_)Mnd->hn(f<2^#Tv9_k5n6Uz(S(X;WGCT~z45F%RMHe1tl5EN9EtB)&r$W~G-
zwB8Y0zBy&nJz@~#yU(tF2P<{*v>idZz83Rf;N?Ya3E2w!W?CUPH)uvWkYeH>hZ_>N
zw_Sz&a9oZs`YHp*(3-=N@>gPaCDRQ$<T#ytwr3;I@8lMFgmhxy+&`W!yw95C5OXf(
zibrk>>7=fZ?}InCfW^Advk~HaWR)2^lR3lrlN15A8nY2x+?lBqWDv=O1_R=HL8W&G
zL=1%_;t@7>1d$UL5HCAh0qye6tS89Xbj9f0Y&Mlya&#8Odq#uVYKI}GP=?()lhnqn
z3n-Oz&x&Y~xaY5R5Qb%BruhyI5|Uj@q})Lb1S1BE;R49RxU4E5X;xKGGG3QL|H_jU
z);|@Z09XNKhL|?sigVtQDmie+eyFM9ihb-&ynD=&S?#&LJ=|02XuUYH6Yepr48IbT
zWO=z@9cH7kO43Ka(iUP8fTacg^UU=Hz9*7CFSH`@bzJj#hFCN+p>%C|s!B<FW17EK
zT<`Ed?p?n=$LdXmp1H2nmpKJGS=A_#dQwy|*LpB145?>aZp3jh$LG-OB4%BIFXvHp
zlZTFk##+h1@hHNsI@bRg#lX<50_cQtQlPg;g(Y_tbK6pC%svY>5`4OQ+7V&%L*-Cu
zcGY?ZK&?Ibgmu{B-?!<ur5T55R*b?3UT2z_q@a^UhI>mD@LfWc!xqdLZ)6ZFPIuRr
z+{cHWTKCZDbqxczv@?FyWKON?j6H*@-fv=T0{sHPXOPO!@X7r_KJjhthk;gho-(=S
zaw-Zv>n|Af^0e)q5A?_p8E1hCIqYqqL+&K*eyR1zc}j{A(X!_ZyN#YfosR%TbWK1z
zd>J&+(G4+Q70r`Cs-9rJRg^cxMs4`9Q5!4gE|e29Y{>fYxC&y8gh+AlDMXh{@<GPQ
zX?pT`h5XW_Kyzd@+g_C*D0YJPBdlO?d*mC8TTofL{BRqt-9_5)1CMjM8ZxPxOI^2S
zBo47LJFTBry-6_^hgdg=xuH|GSeI~zYMtWehTJroi9Em}`(cMp16bjL(^%8CI7OgV
zx9D`saDKhY69=?Mht4JFTp<Qx#oH}QOaN@TVPpd6dD`lgz%ZD*eU2%u*_nl6hL8mZ
zX=f(H1%nB~HA|%rb_`qA?`>KP39Xa+mFZb=xoku^11u%10ad|96ss(i8>o3i6v+<0
zF8zdQuT$p<fG4c6TeeFAZ6Tup=Kcs6cytrM2C4Io7I3eN>81<8yWM`)XczV&5K3Gx
zF&U?g0TJR=HTAe2Mr2b)a_^}(PGf$gauO!3B5WUDS8Y^YxJtsn5O1y{wb;Zm5cTCD
zZH45xaX`0e8B`~S_F&{l@#btT_Bn8BMzzf;!ctsv4wM@Y&(bhM9}Ch;F4<eUY3rTk
z8`zxxWqQk{=bh$`7U$0JYOKg)S$%tLX$yC%T@XPLgjP`d;!rErrIl({jnPPH>rZ3#
z+hU|e@Euh3{uTFhPF#hqKyZZfzU|{tKDEt{Ks7M1(tNDxtOu|IDOgK65D98Yypcjv
zv~9s*k2Ey45{4S#7W?W7sJFL=&<-5wCnU1wd(SOGtmrs*aF7bXdWmgyFv-UCO$AT?
zK<`v#*1#F2X{~~JLZl45amX)C!hi@}Q?3C==scqadRXPmu_vJ^$Zji-4t4#*1dgW>
zLKyi_2`X|^T1#;lMc0W2%q_j5M>^?j@c1}R5X>3Sk&Cbc!ft!SPmpe9h1gWF?dW6#
zg&<R=*bZGVHh>^p%;<4fw=1kCt)<+rO)Kef=_h?I{p8BI#|Z)_!j=c19S*wy8SccP
z0w4<v4!C4-?h`^3V%t#V3@(Jh<)8(|xb1_|;tSZ|atqnSzIk<r@-vAqHZ$swwYt+!
z?N(ApT%umdC-lqX`Y-P1lOseoOLG7h0EH5ETPSiwpa@V=>S!o)1%OzW(iVDrU%Lf9
z*AXtN>Ue0MKFX-Z?_|>$*Qu=8e*P&9(G&RWIpLfXc!YAhL>o&WvZ6kI2~bwns`^;L
zKIX*2c?ornD6+H1bMc&Iny1|xPn>`J;@rX8l8@Jl$wmmqNkNHi?F?W(f9m{&&piKV
zy)8M%&|1=>yTLFNTsQ79!>bx@34N|X)<!eUW(w-T?R-!k7#{W!(4)9`T<_4NDze?J
zg^Oud$JYYx1z49B$;QRNFS82HJ@vR$A+W3l9;Mb|90aRmG(9uZS(!~{i_DbKjNAEh
zXk&O;n)3=^JhADMoehye1ez-c%4I-A&*FB1+nxw6G6l9ZGAtE{yxyY&865#V%(~m%
zo;u;yoD;08xtMZ&9v$J(xz%mFRJoJr=iBbNfAq3oy8WXBc13niamGXNWu+hF#ZFE)
ziRv01CJKDUxuN2;Y}&UF*fD_30Vh5Qk`r<>-@z-otJ0SFIF5>-!_?fVm$tSvm&TI!
zHl*+**DVWv9q5U@(-2%Y{8Vpr3i~is^>Y$R^T0Qdd#`sn?>VXr?~a0Yx!NiInezN#
z==|d5=|l8=^cZuqj-Kk<#PE;eieTh}J}1k-FBt&CLTlND<1ivFPh}z7)5Kz52VH)4
zmSZD+_r{YPzODD~l9fc9t0>tOV6-h#1T*{+a{SJ&AyyjflfKiU{i^b8f@*KlEFuIZ
zewkYD+GLzTlJ05gptd4gWUMgC^fQksLB;@lz!9xBD+VOv1)X4C_SX8*i*=;8OivQK
z6EbpVH+Rr#F<LDdA5|u%rLQW525*^CI{@Nko$|$-dD<*!f6mhWky(FKEJN@bF}vt4
zj1OS&3VcfiE(z-X7RM2VJ2?;woSs_2driwkWvSJB2Z)A4dp4icsuKkWTF=<fCE#vi
z=}J`mss+o(lt_Y&p_l_jQq3inAcFFEkTEPa1U-#R*D3%r>n4wz{{mIDiVa;89iF|T
zv6&iJ+e$EGDXJLr)ezj7>3dtrko1WHZ;o7dVPopD+h1P|?z<qh1qP#RTNDt1Nxac(
z;tOgU2SmpaJMd%*w)Q9msD~`^_aC1s>MkQZTDz9F%~M76nCIj@Z%-(E#MR?*q`Fm0
zIN(WHPCcA(|1$EY6LonsMrZ!>nTBFYvqs$r$b=eYc;lNX+yMrvL&@XIo18VMAUFg8
zy0q&f{jX-*)K{<>rht8yA7<c2(;=#HAcWUn!^~U7chV^>ET)}dXfw+ogH08k6Do)R
zb7-=*=_<jl!m<DbbSRPRScPZAmQHWx`B;?y))eWDPWIK4m<mW%7P^O16sJ;dt8jTf
zzuct|iOs*?tzCe>b@7@<a;rrfrKmd5=(7&U#@8)(!^c||CsY)|M2ktyp?>k`c+Gh1
zY{MY5xj^!-Av}CnXP@XS<a839v%5)NsZB!=)US;K_QC>5!20#(mQYxQDC?W(N*Nu=
zocdhRyr~e}0jo$&7sV<b<1Y6-AV2~&8&v$hk1MG`fKH6Y@P)`cHbC_#={ux}x51c*
zE(*1v2iXx&zOX51eoi|}Fk(7%N;`SG94lcmtqV_`-+D|#`{M&uWzu3(7-{GQbO!q=
zo<UXxWay>g33e<Xt8)99zaf^CL%i^L79($CM~LGja@~oj8PO3m5MGcEBttEUYjW+z
z#UCI-%N%3zWkD-l=h#X~n@1@wH4$l87(VPeXzrod5}3!}X-B!F@Yb0ps6I>_FUGzB
zlS}>b0I@Bb8{G7~iM$LzKul|_ZHMoCc8IH^wP;`r?WhyDRaSLQx|_7FmYsN2WQZX+
zcT$Q?%4yj%JE)#d#3g9csKEB2n!I+~(_o;c!8EW+IV6-RerjEQ5wROp_?4%egQ4=i
zBn0+u^7IIyjgPstkTbJbP7EuGcLd35NJ?2zpE#Vd*|cPUYRc<~)`ffoeswnLGDsDs
z!<DQ@vqLIjHZv5wEPoF-*$7~GDs<bS?h#}pH*BqGv9;ue4HMX7zSgSf+4}6aoUnur
z+NFLzMy#EYF2?{m6YK+Qe-w1{emkzE66A&1*tL58iK~~=3z#+&LXA6Yt|MRKeIwCI
z8Z!hhG&0l_F<+C`JIy^_9vI2{axt16cGAbQUi#$K^j)3wYB?}BfO+%K)rUI?5_BTx
zPmhe;L|cWUxVbCJIj%q0>5c4-&&V>196FD2X}zTPywiKwkPfzPug=Dlroq34wU4I_
zi}&>Z%U!JDy&7DrhBr%?<38S%YJCZ!-QfMiwU9ZGrT5KEk=unASvaatN}swQ4(zSV
z0*ig8MASK?S*3)_m{cnt!WL!N5MP^J<>sO&2S^+q5oNS|5avT!y!I$b3YH;Mh3>uP
z&LQl`VK%vG;X1exXMhgil$1|q^oDnmS|1!7v??Q6Ap<0!IP-AJ$%?rm05>4BZo~KK
z<$!b8-Xu<2Wa8<B6h(k&<XoT#7lg?pWS{8}%3G+!u*_spd7kSl-TOYRYc|y;{@vTW
zZ&pq2gUn@v`#$YHI12D`Mfs>B*BU=k_`u_Xc1m%KNupzbo>xqeyZ4#W(3<sP@t#{H
zf#RlAXH6N~UFQbF4iJbvvn+)oRc(z((c=ZoCxQw96gEu=qux_|SWgVsVYacQcJs0X
z)>N%szP+btRG2M@qs)RR%9sfU31MN)b2n~y5yxb$p=4(a=^i(`YaAHB4xyb>jLc1B
zQBSMH1!u&7FI5gS6&Qw^(KvX^LOZ?Z+HlHuZ8!y~rf^Vmy^odB)%rIGT)y*5z`apV
z*JEadDFX=N;{AYb89hp-Guvk5iVkPNf#^RlaZP)aJPpMYTock$yXY~DW_2o1$iZl8
zCG}9|QkZdYNJ7CBQwHco=QhZ)gi&-3Iw}JO*e0YK<-3?=CY4-C0pOMG*S6W52Znd3
zI&O^>TA>SxnpGU;n9b>Oy6WN*oepekFU;pMFDX#y-R&n+@q_$oP$S5ZqnV+Kog-ed
z#DOT!IXr^CT&jY8NSuvPGPRlN^G>SK!j!V!%iBtB)vM*CpmbN&^r)_<)y;Jw$v_LN
zH$pU$AQCAPDo~xlvbNw{*A!KI5NQaH%;mUz6c=u<5kV6$s2G&Cu<drk*p6N+oL<j9
zy4NC@&WqWS;?HQ84aWsJpnWP>kGCQp=%(_|gysEeWJ;eXr#TVMaLfeeIkhrSVT1(W
z-w6+}Hz}*ii3p1V^l3q0{(?2a)UCGy3G`e(DN|$;m@Yu5t#(}GO?yC?=NMULk!8@6
zBZenrG405E!4e2bxYn>ksAh|$??smCM5izNjQ3~5aWLcXh)`_N_`ASaITq)ZrQ5{_
z=%0<t&a^Y44>RFzX2aWMFqd_h&L$*KPpaXlB<>EYT@v3cSVQXYbs`P!uGXD@HeL>H
zf&-ZiwGCsNLEjBDPA*b}>MSsj)T~@Ficz4;R^jAsQ@nt|UqzTNtj-?kktWOBgTN7h
zOnw>F<atKGo0waKKsc5=nqX9x>*m`A6b3!=kLu;(7lM3+X>b|*gY!_y1UyW|dBz=t
zAdeEvoz)KrHiGn|q{dSxMr<M{=~F~MJe8pmgt36mIO~YAx)3~ZIRj9F2u=g93aqG1
z4~?_j*<rPr&q%2pReT_ni5In88Eues1^19;%vN0V85{9NrM`!hkEFLnwsStTz=nXv
zc4e6D7QL0OqCeILOAo{%_<DOrFN7Q-M)V^vg&<x=#=nPI8^&gGIE~?m98@v*u&N+w
zCr%M%i=l#j@#Q9l(1sd9Sdc^%=IEcxJ9f$A+6+d3IpoaW67qhW>&W`aTjVtk_Z9D9
zt3ioeIEhQ(Nq4ym&ZF4{c=b9kuc!(wHKUGmB559zFl{A)0b3K%giH}SNEPAgT%zl2
z2se)*J{Igb&}3KC5b6yDa7#FN8*$FwaQ7i*Wnt!oY1uu2P(BELUk-kcg5P7ya5?W%
zQDNCD)T%uba@?doi8Yfw)2WA2@3S5o=06izkhe*IqJbLhYF1dmeH*5FCr1NH)=xk>
z5hWL?1#N8jnM4tCNVUSOu;91!%Nf-9?93cmhC2jV!+#7;sgRP{{3|zGtPg=Xz#j1j
z(0pYCo;`AOcMT?l<1t~McC-013}As%${h(A`Y8t+c#0qIEVWMD{p^WOdctSGR;a5h
zNQB=rLN{9I@`-i`xymW+RX6?2)GL0)@8O!?!&OruTmMR;vvF^^Z5g<R+I&aB?~B3j
zJovq1HzWPt4c<Q*{4RpuW$=3z{C<~KRY@$i-Rx!^Ah%g>>M)Hwv=Y21tyE<<vw~=o
zN4A;(_S`cmIBN`o*~mJuaz!zS;V$Hu8`ZZ!APvshas+)BZ;pVV(?iXJ%^}*6{1`|p
zIQMTYqRCGLf)M6%x#<}6;3`HZ-ez7c`i%pEg6rPDK%wn}y%LizPf3x?hX$4Vx#Wz{
z0B<AhjimEN56W`vALjIIy0T|(^fEmtCxgC)E?aR>$_LPnH{mefD|cu2t^lqwpFsj<
zZ5_1f_cHLxIJ9!o=jn`2S|`DJ(F<jig9Q;!I=ddin($C1`y8of2&tK>x|tuH^)Mhs
zX_RPGfAag{U=*JSP0b`d|Du{OsNgKlmzm)5tUp~hJL!IW##(nD+}l2j|Mg~WdhO<Q
zQ|*2@bF`q3lme<?@v<`k&3Z2n=|sxcF!9KU^e;@Aoa4lF_$Dhm4SC;#khhF2RphP)
zNkb5$2E>CY^Px+gPQ${6XVW~=C$odr4UmmSa}+a9!V3fvE33ouI+4U`YoZ4WV-2^>
z)tY#g6|u7r3L7oI%Q>lH3CEUQNu0e_@n9W`Q<{1n1R{~b960*zU^F^G4g>4KT}R7A
z*`S!t=pGwp{XF9SY5U2xGwvLlfhsE;k-~ciBRlL2aP*)^8Co2?+bZtO-l=%=5a-}N
zIFo=q-`eYnQKVZUu><cURp&$C_RN3X93vo?eQx<8lI9-l5R2-hXV38HzFURB7m+Tk
zY~{OUqkdPq%spE3jMJ_eMSkNS-W~Z+JRoD!xp)P6Q`sB9Mx#-f0IebTg&wiUuN<~m
zLr)VRtiK_Gn_}@5%5cnUM>~L<>J|^e1Na{WJ~Q^3<ze9Un<cCYf%9E)WHTK2`f^q(
z^wd}Bq0#Pk2dgSit5P|#2BI%*!4QyvmJ8PE2na)vkdAn2by78mY{wdJgDJ1mEMNV?
zVKF{fg9nP>Mmu2(zphk;kD)+k!9-<BZUR^5i4<*ZEwOqN%Gqg%!w~VXe7Vlt-a|u?
zC{!vtEQYgTBe4VLX4nW(fAFAM$W%unsyhNoan-0>bB+lzmd7Nw6}rVRcTxEq!J)aX
z)iu}BEYynJ^ze_n*VDV#SC}VSU485BbTd6X%f&U{MW0f+<=QY!;9qO$-D~C_>x&y%
zx_ZY2%2@8M?r~$<h>nTAq*_qlYU)_fB24hv^evA)`S?YIuAjiKr>|bTg3Y`|S}d#X
zuGvbX{rV88hWp^}`zEE?MbpyO#J}hF;ncmSp;5-+Gr!)#ZFg7Ocf-H!p>0)dVc0Zs
zpU(8uQY8!<SL-e{_Mq1z^g<vOlenq@PCKiWz;?X8@?t~h-vVE(zC{q{4DZ+7ea@e|
zX{{5c{#8?{lwKw^6*oG_M*)v#p1`~`+ifg`)6SE?k&umsle%HzBp+jZ#j$WwI9=-|
z7d=^%p-E>W1SYM-C4VJ*&)VABb`Sm=tLOA`JS_s=h66?r+~W^f8!nt#L$0?3L3R<2
zf)IHtc0cNq)5`(9>_Vz9cDPeYVVHzLzB5hDPNlD`Z4q74NI7{xsa4XjDIkI5fmn$P
zqJ%@^)?DQG%M%lm&TGQC7)X{hivUN5b=WN9w`m_KN4clx=E^<eh}KOjm?&;jUAavL
zk2@sf3rq14W<gnIFPIxO*a_wd?t^*i884${VKb?7U?A_};MO;Xsz4DinX?0y>oVpa
zt96^QlEu&aoPI}pl5%wmvm8+4b%|O8YIbj!@7>_!o|-I;T}{N6XZMc0Wza%Fq%+jD
zkWhJXGq4Ft>PklIiBQ`*_F!nd*hro`!+9f^6RFm%6@PVIoTdw9-^jcPCj#HDCBzd&
zb{fv7na=gjGwpx|U@k=r1+D8Lw1<H|94{M&ZXsPQA}v(2on>1nj<uJO!UtQ2P~7kM
zy=AYa*u7<MnmcfBrD03UU0X0kr@N=R>wz~Oz`H+1<hk;EA@)w4yI|cwE*MFsI%D3Q
zI!C^ma3MJ_ksiF}9DppUO-tt`fj-Qri*sWZlbz^ed*u+ED@feY9&zSQBlF-kxnKmX
zf;2K4fP!#PoHLgXbnFnjat1CTI4D5!-D7d+1|6!>m!Oqc^$*MP*?#X^TJ5{L*RJ1l
z@9L-VuF=5%zKfLC6ym{j4P$9K=ekHcm}@#i$%ixWdTy&s0VM3Z`HIzXcji?Re9Rj$
z{$+38mlDObsQLc9O8Q1>o;G|qnA`90D8=g-&#Pk$vdWAu%SEH8=2cXUjYPb#irKs>
zYAkKMj)Qr1WP`CG44emaQEv|C)wE~icu5N}Z;763s>I*zNB{$WsI_>F?qK*^KXyVf
z@m)DujgNb&)7Q1ZUu+H_lRoE`W7RDwU;Lv_F&@z!l(sO1D_X%25yyPl7I)4ufaCN<
zv3|l=be>31S5v2rL?g(c&U|v5U|fTt89IuCyRN6OHXA?~Q;$QKjrbCQyDD&_QPpB{
zbd2`!h_!Gq+A@%EAchN$?dvZj2@+PuVL3b{t1=~Y8)9!Q+>6YY+73+qLH~zf{?HjT
zAvm}7M4>y?hZMVVgHmciOv#~HlKoslXvBcX%W(I>4I6CQvTmo>ZrpuvJ$5<FIlT@*
z)**F>LH*j=>I2sutK_Y3*_+zKt644h=I+7WtIK?cZ6h~W=Ui;J!Uc1E*XmAm>&OJu
zlI#???&KaP>l+4ADZgvp_u%q>Gq>}ctv+W*;^sM9z58x?oS;?92$7I870vh2gY(|y
zPY#AlN<JC=nIKqso2H(M8h5Dc#(jo05zA$!_PTABqqZ2dg6F>#-0rgV?si@q`Lx$<
zGdJ&f-PV*Eb4O^YMcje??yHfV1mghGT)P?7mT-(KQUdBqhb~ic=?D&Fx;rUn<0|nZ
zKtnz@$norGo!uL5#{iXJ=ua={NE)ypU5QmWC46vtX_^m1W>@q!g?UGdPc%`ppNYl#
z2$)o7Go`!<XeA6wvhoH$*wh=jv07%IX%C(7z06L8ZLV3TakG~B)Gdxr6xEI}3t8#X
zIQEJn>9T>jM=RFR5EX#~KXsXR#4>p6L%FwUDC>XdhO!zC1@Et0Um6ZUudn&^I0Hpm
zwg>Kl6%({OIOI>8yAjuYlawddH6MgVdpX5_G@8pdDIN^w!ks~-7xLmGnylyKI;c$N
z(Y|dX<8tKpuEycwoo)WX8Q9T(^q@3XGi0gnsR*qq)^#!aN*2utWqDxxx^1O{JemLI
zh%YnffC{6U+cV4-pAFz*=*JV4qs<irYH<7X)KI83M%4x|y~Xa{w3DEj0+oWMu6x%V
zZXjdH1wC2SB~m>IW;>;-BYP?PigSMMhKn75zS4e-`Fi4f%aU3ge!BwsAzX(D!a$Ln
zGCy!XnR^CKVdb*{;Vsi}!8i%Xi~H8s4+toYZcp3!ZbA4&p6e62IWc4?5&$Znc;#7J
zig`oCA<{PWmar)fG+d$)9g-MUKV?=xf)LGRSs$DEzSaxj{Un7e^MI_hi*fUI2`;eB
zL9c;}TsV@LA53avc~i3#gR&xxlv-tsMmw@X3Tei;em*T2OUe-`HvLe?*G*UP38F;0
z^rbb$ph=$aXj-Z{I-G6Fvpz$Yml>!WFX->c!vL7oo?#sE>=4~6CUj1{4IF^^jXXaR
zHZiucds^N0-3P6^t9#mQm!N@)PAs2k<8(PPL@bo*YnPFrN_c>oKF#9E(_&O&k{>9=
z0*;FfHWc@-t`ytoim!ZIA?F(=@f2pFD%$8If`5!739B)EwiSh)I5{WJ@YI@mWkgh;
zBQ&zsiDrX&25q=*OFU)T5!l58Leo8pE?GOvT5h(9+fID5^Ufg4va!pDLB28q$OyNU
z^zlr3l7?*NivDrhgR#JtC1)_7EZ<YQo2E}&)K#l_N;wCajVE_8<)?iu_UV;#Tj*yL
z4JkivKsmWA>3DLCOFl->vyWZkrDxXJ9yR*><ACPm1sc2BYzi$j2f0WS3b59q8RWH`
zWJf6@O;!v)O<bX^o&AOmpoYOskXdI`;R@MWR*0-q^#?gpR(8D7i9dt1g>!?IDb|{d
znBG+IGtN{E=DaE&>&WGZaqm$Iz>>kz#SW`tvr!U-WV$+${H@N7U3K7EalP9$ZFal-
z^WOFA&1sZW!6oCD%@@kZ=T1I*rh2i=(WvKi-BF=>!TA{{T~_RRwY!LJ4x1wzh4woy
zK2rC0QEFFg&m4z*5-c-4vkA$s86wuXPLtIXihBt^sbp2TkDmX!1}|V&gR*kuBdwpg
zPEzd^J5y4XFzaEr4Y=6>3@Ga<G!WMOMb@p#?i$@|({hRKh@LNAu_ZHr>JVdP)72B+
znsyG`ik{+xhT$}pox>~ukpvD)t@<!K9QkVwPk6<b$qhBgCL(tih<@RmI}qO?lJFgo
zH!&i<(9=g~r41EP<Ya5hh+7o4{!F<Yc;s?mDuh=+O3+CL-U@&bOWqaapF(47FTm%d
zQiP7|&kj9PgwJ%hF>%NhEbK+w=v_?<$me9<p-|huUmlDi2LPE|V%TD*;7Sb{Q8fJo
z04;Uh!g;yX(=zuMP`6rB<#s?bNjuJLH}3Fl?ft3@=^Z>#YYS@E$l_k5lsj0;E&`f@
zXp^G@cL!yPVzi3hxh(sJ8{wM8-f%ijdNI0ws}rj(4(PwWJ1|h%`e(a<+%RhvdsG0s
z=#SFR_6qUmWFT|QJ}_)%*U|k%o>~wglC*4U5gJEHAdan!vPGM}>_j_u6_UWZ7;0FY
zcJt_<N<Bi)eh3b|Hd8Zw{?@^CQ++-oA<^=#7DNZOL^jwhCq~W~TA)Ilm(9ewoZEe%
zg4jtx#m@6;Ya}48q99BX9Hwanif5&1>xRM~Lni`&ru%(n`u>%3k7pn@6YOLv_?q=p
zREnjh@M1KE?0{K-b!lNB^$_6GEE50iFx5kaf;bE_7R*cN1R#6acBQ|C-)ZY`nLEmq
zEC;h`EhEw4a@2xa>y<(C=E1V<PkLrwRK+OLcG@by@YXM~QMCx`jM_Ez_#H71j?s}j
z)eW;r{BD>B$LPisHaJ`CZoelRwXSTKzI4)~Tkp<&N3jld5=iDa6Tn$QKsO(4n>*PB
zjkpXIAfg*G(4S<^b|-nITY{TKDZeWf-Hr+bPVYzkvArRz3}BzS?ImW%(DH#dIq+b~
zb*hFC;Z#ipv51&G7CykpE*kjbAE)p%Eq|Dr50dYAdCXm8s@)5Fw6|oJ_KwWevRw{}
z=3~B07y9|G*8}r=*#m|4op3%ZD2L1gx#bxVav=%{wx1u4z5bZrOZLa{nZN|)Z?9%!
z=okFO+SSFa?+nUv;<b-Ymh6FuC9-pAE8mf=yE82Ne!t9v<*AKfWiybBCPEJS#ePwF
z{^52BZ7A>2ar!q27Y?5+F>(A!-6`57I+&pqG9w!e1oR9yaCLLFy5bGvWx*QRr4Y49
z)2%#opCznOBZnkt^4ePWGz5#0r)Nt9NflCes9J@0OP&6`nM*clA2iI?mfPI;{;{VY
zy?Emt=PeRU!Wpd^sU<iPkO=2QT>N60o(}rq>f)2MH8f1<!UYDO+4_Qs?}}Symw3yr
z+fws5D18!UelK}oN16FIL|>M>8L`^8L_^Kz>uX^b*4LKo#J0I|S54{L?8GoT^txbv
zBYik-8eQEr2{z^IF2j;j;n>*Wr8*X{jzi=eZ?j{?=nizO?C<zJGY^(oG$W!~J@J&?
z+IC?di4iMQn=$d(Vc)mLlFRgZTzGvR7Yiu{`=>$4C9lD8dEhrv9xQj)kWn7a_>p(>
zw%*NnsmOW?XsWY~%RIc-a-5hUWH_Ep8BmXC)iTWIB=c`d^ZU+lG|a`c6?e1DWSV=V
zUk-yV!K1WwZAj1_jmo@Q!h)#i44FvsWL)L5e!0qZqru9@?V%39dl?(c)Hd@0iQX5?
zdOcC5yR!@gh#X`Da$9EDO0XXS3<vmdS0wpE8t{Aq*nPM}HhUkV6$pBy!W>XhLteip
zxkd7bUBn%}g}Z55Yr#Q0`FFZa+3Kd=srUpV)9;0_4fP(Zchcc?ZLQZGP?VvWuNf`f
zt#ERZ=57sP8!dglsk$o9!;>P9=Ny=;dBiS2=Vt|LOe7$+VMCrth$(@>7MCfNXXMC&
z;w{hQG6M?L6U%ESUJ|*^RJs@T=N9C;TbJspXPuVWK3H}}%t}l++hC;erAhf3*q&~e
zn1>3V<@G&tbUnAVwx-^_uuHeFwvF8jRIU&BD%S^A&RrUffs`70^5kp^|9r#(r`GhY
zd3x!-C+pq}<UvTNlvBbbCx-@1ZsGegY*{rsxb2}53htYthY{if2gzAZDy5qyClJ_3
z7M-=C1Tj;UcBR0vU^NKbn8=Hgh6ZmOrX!ZVk6)>3u@%k(T`AKy<hu~?A%u*=k<u8<
zhK-NG%RWm0L5<@zT^kI-o&d1sfHAQm>gb}B-BXlm%XD>vjh!QY(>53YMHgikjMA=t
z{HYpI7fVpH_zjHGc_YfemD611ed~i3RHKa;+C*lDN>oEOq8W|hs306lQtyNVw&}_W
zNaZwh&U<X&yl^H7X17~S`-PqZ{H-RT6Rro8Fq_K%#60l6!TY=ZT|Sxk-<byy1H;oJ
zG*CGl1Yn*Jt=G&p98qV?V2l)pjsQ+qkV|<s$!$JB&NVp%TkCGlh)cA`+4BbSwq%@L
zYL#Lo;H=Yk&_DVJQ4;u@c0w5)h9WpP5<xaZuS<+iJlBL`rUZ?|YKq8c+`0w}-N^P{
zjD%sp2WRkW>-$F8V3Dy@g{)@^7Op&R7)4eV(0bF=9W&Q^s_XbWZ5_MQ_?`8jlYI5J
z)Fq^Vs!K#a7tCgaPqs;n5P}@2geXLYatOfyF$JthBNgXuBEpz!19*Qj9thu8r{)pf
zm>Z=pF~uEcP{c~ftHKpHPSvmhoD~GC)=o*{6B(;Y+=r~)1J6g8s&JAOvXSsTAf}<s
z7QUdS$emanuf=PLc*JTg@i(s}=BaF2&nNA2u|Q@M_5mvc-GU|atme0Y<C<BdU<d3%
zlegu<^2kPFCS@|ix)Tlj1&jrL4^Z7a&X$Z4Fg+=5pzO2z{W379G+F8r;%zbA%OfN0
zo1M|)ur~HEC(a@YN0YY5kXBR@<x`H^#GiOM78QNbyJ>6B!_BZGwyp*(0jakO*M^CA
zv1f^;A9BQ7?K6HQiqnE+qv@#}b@ApWw(~DBwjgeNoo~{4^<ej`s|CygCNNmMvm;DM
zY8M<d9<V=`)OiqX%4EH$FYvtzF^+*5K@odRT$-l-cJ@dSfVvhT3Fznz5xsTwde_>t
zIYCHsg4%b1^JE|k!K2^^)RoDK1km#dHv7;mUVD>5M5Ocqmj)DanvkGC#s#u5#z{s>
zOz!0(vvEJ;N;-szFv<6e(u~<W&j>x)FxHd(ydU;r`6|o~t!m$A_xio`s%h>;#}F16
zI77lyc215f^FvN>vvZpgVmo)iY{)qJ%GgMBL8R3oEh<gnD93RAg7bpfq@L_0YEP3X
zz=>goct>n0fEbt~NQF8$BK#KTAH+WQ<RHU3x?190#p*9{LXqjvXOy^*1)RjyVpt5o
z&#|ma9#PiBW1+XL)TSxbE%8C)fW(Z6#z2nah4kerVK_-XWOg$&zmzv{rgCMPSHS3M
zh@Zq`X2>?_Wdtkf6ywI_TeGlDCM}y*L~lUr-e@R+<zY1i01sAEGo5&>8Wq6DsQ5rC
zZqA5HTQ_wQ0}PuT&};(Sq$D|U*;Gqrg<w9^g5mTWBdJw0i><CmsC4NgFddFz4OO4`
zNi&D<;LCX7DbNt|nU<(v5xz)xS)fg39_bJ(+J?Lt19y2Wg}BDrTUU1Jau@IPXzUHh
z{7hTr_A^Zby0Dk`ZUX*Cj+SBi(3ICUbdUv$zTWS?Yi|$>1XF51--%aAx4M4`^Y<J$
zw^TK$Dy%MZeQ`H@iksOV(xR!wQ>W&ZPT`%}!9@Jb7RG9q+rv&EmTtKx&3pI)F|9Rm
zS!X>$#Th|s)fryeoC&F9#EA^b?q-v1P)2Z00l1~NF<J<2%<LwD8KkojD0_+?XKWi{
zd@XQBAb?Ea)&)jjnUQ<axqH$)@~hcC11d-g8KI$($ynUJC%(BSOHhxG6j{u5x^?HI
zuvRqZeUrHB@duH}in>6OL<Eurh6Eg^zJKh4<DcIvHf$ZKM_ucbgwe9jY6^LgIt;c%
z!V7bH%r2-r+*F#hy-p1gqGz@g1bW+QN;MV)R2!j*#Z;m!9h+i5cXAc=BCc?e@qh@8
z3iV8foDH+7`1Q+t8Io5_IQ<B$ed47SaH5oDGF&RDiHDs6a>G5N6+z|6Foz#a0!YOU
z$P2{+zccn2k)2qnaa>*>9~fxmp3G}%YNL8kA|+4-)c#C8ZIigwcatYap3Wf+)Kh-U
zT-f-a*0`O(v{l_K#$%1D1pqqcO<O1iUd*1>R*OX*>Y2ZIHFzXIy1+S8fQd5q8sKs^
zwoIu*sCOH3$&Ovxu`5LWbgZd?_ROx`t08WVf>23+$A{I2U<>mphuNk#J<0(OjHCpF
zsFz;{d86Ffsqz>?voe`Oe|Ph#A|A3uI>|84DvT?)RJ{haK>80RDK=<}Xp8mOq<&cM
z4%Awpe_7&XYN@epG!!dzWCGJtg*pmTI}7aFs5h!ySJu*2w9}#D!W@vGitxw;ADE>J
zK2VFf8OZiZmCFW-PADnE@`a8T)LC%MYFZhP+>fRj-8wqjF6Fq;7a7=Ys)kgborD*O
zmqX!~T5WTHmKBYX^A=DEd@$MWW*YU?C;nb35Zxr?BAgb}ZhWW4jOf@CfA;KUfssY1
z<Ct!SxWcYx++DW%O3sSiVYK<{I3y&rX?n2M-n4<x@upx?EpAGokr3?;5&5g)xka)A
zH#*(lp6vu=1fQiX)b&9)yQyqG4Z&?U1EU<Os^B|D!|}8yTh{hY_EmSK!Y4H#+?7$u
zx6G(?)o-e>5xgKlg&COMQEit2=G1U#xO&4I4vuPf*v@Pqw;23Ww@|AO2uePIJ1Fnt
z{q5L2`YgqhWoiN52j79-MeOARA%vdE&9aU`tn@rHpIU`>yEY`un@B^#o47tC(@lD4
z#zA1<ndG2EtpJuv$WcmiZXSt(9uvEv9+9y?P#`ni2S<1^+vbxYlB<5cU-a^J97m91
z5~?X<a8!`~l4+pXYCOcmVeFGX)N?jamqyUBw9k*!B}v}wfJr%?z}hc;8a!FrJvlx%
z{!aKTh%iR}nG?(ET#86{B9b2RoVJ|Ar`91MOi9tbksm!Jb%Z2R;ij6Fe!6b?tvxZy
zFw6Ji9K8DTZNjr*>R(eDSofi~`R+q+TRHb69X3Nhu9B*6j{A@wwpj=sB)CrPP0HEs
zUd+M81zD9^zMJbPP*&g=(7Wlrq~A+P)3^l>i=mfdomC5<kw?D>6jLue^)!mt2`bi^
z6JizHf{kl>1nN80LDc58uCah&=r`2d?8;lqeL%WHoIjNq6l=x1%hc9MT+ZYMxzgj~
zynPZR-QuliYPGI7k_SUfD<hORolGD~nQf89AX_jJQLND0zGgz8xSAi;6mD6^5aGym
zCTD@lCy);#GKrszO*)&|4Q|CkEp0(twcKjnY)Be*lv3EJ^CmIssOW8+|DsaKs?8R<
zP~z01IpFD0!59x)*ywqV6-Qk!d-q#`r;`-%-uO8$7$oW*dA-6Nst?|Yu(Wfm)b8-{
z4JjY=%_Yx4T;_hZhG$6E&Zxfaj<pnwY)o|8T3=mV-)OsOKhkebuD3-|YuGwh?b_<<
z#z|M9OOy_8PCsbhn3JgA-0!M8&@CMp4$b`Tq*rGn^S8^cVv8T?;!uPSJq)(3agK|s
zUrlw%0RRi8Rkn{aHOMd<<#uW0`E1l)u!C4}eEh|-`zlk3Cg&aPdKU5^y?AP`haGjy
zJlDl$*ZX<93X&n4Eeu=BqeLNaJL*$hE(yF`_W+oR?MGP?G_T5-=TTB8S9q=vPCYB-
zR_^Xu&V7-?E__q$>;!~K9;L16hN0T)OGS#gbbEZAkQ@lrFl7}CA6!KBe8agRjMAr`
zyn5+fo%Ef>sBgq;5-5<>Bc6f{$4rK822!yL2Q?z*CE<tqU06IV`C;ChdDj^~F*jPT
z91cytmJdqtmut>;#nEZ6jIjoE=XTXJ0wObYi=gsHA}T=cS=wk7B+m;xJixhfR-qeK
z$AR02zK}kuhi*BNVn-?;l_LQW%BXEDZ4INao>;)TdM>jT#nfAfVv4IU$A*2u9PW99
z0qU@FKe^wH-1Q`b?mMkDtQ*M`Q@Y*pFk9AWp6)@_W3M$*y)5GhXY&-Q8K4JgYd@Qy
zchnN+(*qb1i@m9&n3N;raZFu>a!BT??f7dda;lWS2?6OBjmQUavJadSRMU_i&IkEa
z`IG^Z*e?K|p)@?Wz3hqggNnMz!~7ZqIFVjR8A=C;P0BBkVrtPmz)x=;&;_hj4*KMM
zYGmU1OAK$T$Xt-8DpyRkDZ)X|xpGHvUj7-V@+sYWY7*?Tw8eh|?2|coyJldE6+r%d
zs`fk`RceM_de(9;XZI1MNTOnrnN0c++Ul8X)F*;yt9*uGK8PVC%;$<BQ_hz~bdrWs
z1xc#*9K9FpiR7n-J<Sd0epD;YVeIa?B}glH-z!H+N4soSor+X-k%L`Ad)t&9qh+em
z28$EdKsP23#a3Ax+cr?s5n$BT7|hx-g%+Vs5-vH3ClE%1QT<LTN5*Vb0x3p>?qu^J
z=oY6ndhLlJ7d*zcxpDeZV4GA5v8dCznkEmaR~S>~d7R_t2>oH=OAzps5^+d$Q5Jde
z>5NFM=H^AoYM~q-il3y7Z05R2-1k^%p(Q@2T{G1v6hpSzG43o-dvsGIkxyVdoWvKC
z@j5CL)rnCgG+B%=uR<m3)n&Z8Y^NL0@>kMo5d0Bw78?Xe*9PT6MEMd^E_kM7n_=8C
z(l%i@*l?@dB7v){ct;>36R&t2j@`3)B5b@C91<lsR0SZlV-=#p!3?7$k(f_b@^RVQ
zTcM1MwN_lG1r|>Bivxe<Zs-i_b@dOsCZj5hJZKpfn6*OFG9oFey~9$}(jv!nI1ac0
zezJ_iotH#WMLeJ|X-1OBNSa*on4hv7lCv1FhaPKGL2Ya*!l_h+Jjc9INtr(;?Dre!
zTp#pxt`Dx9gXSO3w`aTQWm2ck)3mDKICmLkgJNpc9DS_H!vO%SL1qD}ZUP~?45wn`
zrwPo^gb5S{7*17#{;gLzPyn<{I8+v#-u$p<xFWM{$+d#I0;WBR4-)_2thxz@ne7#(
zMl<>7-|*BR&oJ#sRa6X34cA>JRyU3(9^z(9DB_RDH6#T|IXFW&`n-Slb2Devpgia%
zkDCPq-y|R-<}ZX{^`Qcj{h}P8siMR@sMTyZ<~T=$wuWhhotU)p?ryh3+e^fNO7f1E
z3cfONmwbjok67_db%;t>PAF6Z60D=6&Cu{OQ>xE>tFRZP4{bTlj9m}og(zxMIYbbu
zSVAKqV@~hBy?r5(SpX5Pb{K31S>;55CweCqS5^)y{?PQ6ZzI1Q94C8tvy&KFAhSND
z-_p#afBAbU=o0#dz2|LZb?Xylsqrr2y@`U-j8Y;TO1C~bdNe1zZ$t@LM=p!mK1ZTh
zxeV60lT2o0o<>WQPIN3qz!wTFN>AfqB>aw)l@OImdPQB@u?8Aq$gqkYb_8huG~FGP
z+mP4Vd`COf?$}O38w;8)tjQ|P;U6%sDm#hXY$^CGohJ_?WtYGk0-c}AN#9ETBdZ*x
zc&R)HopXS@Vv5JxQPL#C*(3!IdP>nmJ3mxABTm_%mdcqia=Zrz`62tMjtui{b~Y>v
z`0|gATz_Pck`jajN<O-jINqDU1=kvNXE&ejC=G`9(8#*;b53g|g&|iZ<@De?a=FXZ
zHn>-oH*39shrre1(Kr@ci(eXMf2y;NP(2-D;=#LsHr1J=_NANj+N+_tARN2my+Yn8
zX=Nm4FbnLngEX`%HeP<%$Qmv)i^XWCtj!`kw6oZ`?&Oqf9dzPc!tSRmHc;Dy4VHBC
zxEqD8Z#dt;9;TWL;O#m%LUH0q7qdQ%S)dSOO9t2Al!BCLixV?xsh6o&1}Dng^YIF-
zAcmQ5r&;f2;$yDkJe^6f3Q|$7*#z~x+_p(Zg5z1XvMHuJZExy2)@{xv4?UWtu2?mj
zi6U#48m2>w1|EW*uli@2@3LcP!%xurx<V-`nMei^mq`dFl%!)6!8{(`o&rO?Zv;D4
zJ<?v)iSz6AJ^q|stESN5rZEZ@VK@A%SG%407R?eo92u%ZZE(?!cM`)s=3|wT1ZI`u
zOVAx0S4f$nbLJPsV7ns*+a&AvDJs<T)YApR;z*aAanu?sIL-F_W-c#ohPHzCVRx;`
z$P#a4wD|S>VKw9&kL0x0J1Zk23TpkP3qp&jL>$#c8-+6HVQJ=?cMO$P0^@>CjLpum
zxcEub293#Ut)H1%{=_AX@u@ggD!Uhd#HjYNL>uqz8r7!TT#;?0B^|oum$PrxR8TT!
zp2@*y8xkh+kcvVn`U2W%n+QlP{yQj(Bo=Z}SiPA=JOIU~-#liuz}A^+D&DS>kUN_7
z4P&C_*U)XpRiQOq=Y)+T^nGG`5SS{kGYsTUU<x*xI#iokEDwJgX2=~O;+evrBInKs
zb1?53_v9E*S?9f*HU<vo1s8)1utnb@+Py;tM>YxT`LA6{T0%Mu-v=>nDo2{i^-Lnf
zNHdyA3*%Yf7MPTpgSWa2;Qw(QLz5p){X+06I|Ww$tWA!6gF%Ca(O3$K(|+VJ0L;K*
zH9|OIaVR#-hvThnb;}NClJ6GgYCEcpMqVsdFOklkOGne{oODTbPI5|}W&1Z9BcZ5u
zkDsS4SjSE}8{bKC#Ff|S&}`g9glgAkgEgd?1jvYDXMd^Ls$z0fW#uT`OPzFXmLO{-
z3&g6q8`JlwV@;{bnbQrxs=bew9a*ESqOT|T-9hPyQo$Hnz1Seg0cQ3#!2o4b5ksGO
zs2HYZt;$vWt%&rqQOFpom^<vRq)H*8?X`kE*O^9?Uz&~r3bqJqw1a39u?vcMj)Fk8
zq#HIqGR;v3hzfL6o}qJu6R7-n60UV}+*)P-qjGOS<%8o^p0jev#dkv36e#q9_?CC-
z8`57aAFPX_rl$3lDYp%^AE~Brfuq&3{$#fyoYS0^J3DrJd5zZl-ywx=zyc`)cM=-v
z_en9BO_41!Wp;PbEg$NEI<2v~7qeE=vfEhnma;M%W;gX;TL(po5QrGWR&cVN!TAx1
z$Hi_|YQ+$Q#0HGnec_~hj6WgFH#-qvGD3AOQGiZz<S|MyK^2dp60tW#jKehJHAMw>
zP;>-V3Eqmy`O)T_W)Rht5z*e$9kqd9<>XGXmd<t`Sppx~sDr0VAY!Uwh_IHtGw4Hx
zm!ui8t|PTc8c0KCN=U8)W&X0nKO&t}3#60I{FH}2SCCbd6vi<E;^w4MAo4BuGKngG
zh~$UZiZ3S^C`a`mtXGTXfo!$po@wCIs|cUIEK}q@^gSkSfhS5@;{1d91h=ruF~(H`
zV_ZcT<Cp9t{6TWbAq&J@@^TxB>sV^0r-tdux3gYw7u(00{#;{dGYo3R&Axm%3!gn#
zZ%sqoP0rVxP`N>wZU==$fM9t)iDj!tEt@nHtJXXFd}U5^WDCXCh(*BfmEA9Nl}SsP
z8P_}h7Jvacj@o|XyQHHt!1_5aVcz{K=ioNF3NBNt*`OTdJgMvF#A*w?)$Sf%TEMJq
z=YUd@!;U8OU7&i0(|m-Qx`82PGc$SUy^CI-oGBXttk8j%RRwH8$0&L<oEp|*2ffrr
z;M{<geU44AeY4f${G!5QJV9m)Xb1GL@rzEv^q3Jot%BNG9}4AWpcK^XOV$TTyx5*O
z0BYTe?n*K04QAjg!JCY}Cp$OlOQ?W#v_gBT$|?xH9)MX>U{I`sNils*uhE{W%wZsh
zrSzI%daLW#6)eh@)g2>DMO1)UC5V1-N+(}^EgG<Uy9I&sO2%Z1)d3~cDf{)xR$xhs
zNnWjZWuny-em6+|s9Cm2SP*s(JBL%zT<^YDFRFDb@X^2>tGLPN$E)7Q)wCQl)GVHR
zn&;?;@i}GBG==|6d)DHO$6E+xE{gE7rGW3|lAYSthPl#Gc`#+21R@?d(x;dP1z~#;
z_)cawgvw~MR9KJd%67g-kVlp4X1cnc+O>Cby*)Y%C|sYpHpy5Lc+6b0SF^n{rz-RT
zCh#G0V6m3P(UIr%=^yDHVUlrNd)$Rz-*T6qK7ZrV6PLE+dXwMk-a>m1ij5SjX$6Q+
zhglb&e0`og%buE2yS1i!g7;91RctCQcN?3aoTH8+APlI5B%Cw)vdJtsw%x#zgx(<g
z;Gv5*Lvb_r=-FG4qOIm9va{<a%-`t=JejSmeIljp*);`1yeE>f!3@tvFU3Etb8HOO
z6SFwm!Y%9D!#Z+_QaZt*dI-D$K6W#Ol*v2L_RSMl4I8D-Me8w_tN1OUXETQAfX|ev
zCVe;fcG3^jQf(`YbF1d(-D=hQfX>7{qwYkG8e^VOa#|Nn&cL+n$3n12l(U&Ub~yT1
zTd&Q>9%so{55YSFRRBM7;9`hhU1N+W-<wM1FIJ!Lf~p<p4t}}b(U$S^>P%MR3mH_P
zLifT$i}ho?gtMkr?PRxv_D1<GIiuT@>i*u9Su)cQ+q8o$-G&{IPS?}vhT5ZHCukBZ
z0an{6>uTl$_ifLxywltoF};S(M5Jfa=hJJe8`sT0R?NpM9rJ4)f0+)gbf}>GxweLH
zu$#4a^wo47s-XI&8!PFHY9PTOsC9o^b>G_+POC>Q_OgRqitmnkxZxf)0WBn%0!`RV
z2q%pAMRAcrcWt*-Eca%pGt8T^B=d3acDr)m72tZvYG9-^XsZZf0qGfdJ3>4ZWlM-(
z7Y7*=cGBn37od{bh9Hk>MsY4qIm)EKkB#T!7{6d{Jay&C$DgwI3;)zgOm^MS!M#(8
z8&olz!em2x(h0`X9UOHebYz*HYy@4|SkRZoZjknneU43sk`~OEdEcMWRTWtQurqEs
zm>^0)j9=R{VdBdw&Pp~ASdqbi21GBb6&~N&6T>5F;;p;W&Gf{I;b7G1L7#cU3z^L@
z&I)wYd3IL9*`_dlcMr(!8A(wtV1$`AdQ`EupmwIlxKq?A@Ldqw1r|ILoip7XXs>Jd
z5P9s{zTb505_L}yUk}jl`Wf(7&(XDdK*HJtBiJ2<r_K$%Sn05LtSBi7BwP1W<hVpA
ziYHtF*ukL=N^X|K0E@0tcaaz|GP50Kqnm8))gTPi)i-OpCc6rHMIEx6YMAx0!IGIO
zJRPz~aM;PQoh=%BkRA8lFaaY8!`!ZbKOj@sNzh}$+lFs`(|xmQavv)1?%OU#_xT)B
z>q)TC%qFsK17W^cKY@y8H9;Z20n>{Vopn@HPaA-xLApyq5mAwn&IJ^ZMv))Q0xBIM
zohwoT!YYVJt~8R;&C(%KA{|RF&63OJ{rJwg^T)mC{`1~BGw+-`^FB|_z21tZIFX)y
z7sY}6QV+!t^gm4HAU^BSjO&g#mmxu1hzjaP@KMa;?(=9CbZRo4v<%`dkwmbWkVrRr
zUTOx&01q@=AXGF#k!oa^TC!)_U7bX&%7?T$^ixqrx`h*b-*8V`C>D5<telKo>5T(t
z74|eDs+F6DJ>ZXSpgL>6Awt?vyiZu(=Gd#pYd>cBc5C^@KSPi0sn36Ms>n^b9j`2c
zZw$!jZ9Qo!@H!Zp5q2`A5q4;#I=Q8#Ud%e5W|2bGy1(M+H+xN*Q{Qt79vP|d^<frf
zSWNVNzuxg@?Nl>MEP+pCx31#VP)x0z1kI|pL5WC4Ts50BDP3TM?09hNnVC#bZCwuQ
ztT>mWf5iTP@)%eVvi02gqsMpO-cnHoaY|)n!8iXrLX|$#4i(4jq`fLvOnYe;PrJ7&
z?~R~rX8cbD^(Ou1Yktn}n;W<Mq+1Q-59kLdPqsn@h`i!z2K522kG7wDsj9XWdc%18
zNe0A@lUR{sQO$K{ZgnDgP5O97@XUjQ&P~<2{Ia4ly@b5+{*OpLXCHC!wU;ith}pw%
zWssMswo-chYI0sn{!~bIiS>K3ZLf^=1mzqFo81aj$o-IK67C$i(jJ#vWsgw|KL4U`
ztP-|FNU+Kdq8h!VZ*%5%JrcLSk{;jhMFrDroxNLN7c9nf-e4P*HvQ~7le~7}i}&Q9
zxHUs*2~GZBI@<e=nOxi`H=Ulw^$BafXY;2`q}kTg7rQ>SpkWO<i5qtY)#l6u&VR?}
z$-JVjV0-&gCJk9&D-B{(d#yclnvrzrbVp=}gNAYqZw##w5cg8`Svq9;^wz|Qpi$Ei
zWD2cYF*F%Fqnd%vK*ADvai^(BfzGhqyv19IoB!-oxE{5<N(hOU4P0s(<m=in=EvFS
zAw|8bNkEyFq<Oa#+h@OxQnBZ*z%%Wf$vYYBauWaw#lF_h*2t8e&_C970aJp3G1pw6
zNHG`(x$3>w)7)Ym!%jkx2C~4vm&KqF3Q1;$RLj_T!6vE69@JcKY{+*0Q=gm7;zMj*
zw>~>@|0Z!J|JbmvV*4jBG}~LUb!{!Yd2ua6=bmei;N2LvTHKSGal^u4_cZp<>_zp3
z3)tSbZa1VwSWzL}*nrnKt^edpsEcVu9!Dr+1FyXH+x^^g@8#46Yc$?8orhZ|)UE3a
zW<WKM%s9sN@5J!@!s5b1o^QtwIBTL^NxGn3fs|4`oNV#SAA;;?Mz<L$9R8wuFRfRn
zm(9<Hb{@6mvD}f`?H+l=qWelts@7NOt9CACY&~8?-PlHRG0$O7M5i2;+20kSkj}{F
z#?x}k9rLc<b)=d~+vtX^?z8maE^`*>nx3{&TKx@u-rEbCGL8>KX8s5z&FP2JD%XCj
z{+E<n?=fCCpU3?1$H>w}K$49b-`GUbb+KjS$oXdOQ=>N1wrIi=it^QgLH%-Zi3N*v
zALnWD-Ploo3}x^)B&&DQR$d@n%#G9Vl{8AZu8O{yTVzXPhiQv0ansW=b!AS{&tZmP
z@Oy<Y#W|mEza0<eMdO8L4M&1VZf96aM9jnAbrEAva>9An1Z<eh*3DAPpZ!a6rMqh|
zvB!TwrQR|@L25(AAF|H8Q=4#yDgDjhZ1>S`-1nC&_imE->z*pTFvwB#l?&%*FbX*|
z=AjH?{f=mIvTs~$Cpw1EJHF;wv6J`r5YiL-7uk>@V!_4#UXm^odcoGIQr>yjo+ju_
zGqe53|MF#iIi2cb@VP!|#~{a_<6E!!&bl}h=APVoRUZUR$7&8&H!{VN&0Bd)I_k{Q
zCEUB1KQn1zX4__e>^oSrRJT8A7e7ZJ=lbI48^fr)*6UtVGMk=B<;pB~|6z%Jmk>9t
z*yxLkImy4Ctz44~l)!rxrK($PFEcgQbc`Qiy8=$EHpE+VGd-Qr4?I+D+!X39`en^g
z6hRH19|?x!62^AU%JeV?=iIn})>ghC{GA5Ky)Xvnt|Q;lUi^=T?P*fR;KCF?nO{Ym
zs~$&eakV|Ojw2DaAUb%dKdV#E*mqE&k>|7G3R}-Y(wfT4JLl1QFJ{w*@E;_kHpX{f
z--G80!s|Hymfux^tA`&25N=z_<@|?8LQy<6T(B_`{zoCvn8;kH)^kT1Q?grtd->mb
z%;!dRMyr}&ukyHdi34W^FLTA_pZ~t)H%ga&|9KM_c<7c?p2K~4TP-A4cUoiqxS@cW
zDq&=8{=>TqhEKuA+Dc6Pq2KL0rU<FKp4C_-Ftn=kXRX|`UF4Y^NQ#u(svx<OtKwUG
zfAs?^OmM>b*x)%%tEyL}SsXmq$N_7=ZyDjhFdPv%o^%*fKYhZf*lxCF)PE?pbzGSa
zt^~D~5O+GU1?U-pWm^avzllN`3V$ugaO#jzQRNM8=M}rY!sJd5!kza!B%#uwR2c$(
zNf{5acDZSbsi^-`+=8wWvO0F}oiWvb51O%a>_T*Q;duPk2r^}aNyy-*==fb|*4btA
zZBbry$v&^M5h!Q?zmX?uy*se5KvsN*xOwPpWm|O2Mb9EF&u0mLE;-|Ix4e8vu4kT{
z;jI!m@uUj4Ktd8g@<|F`jsKf%+qajs?PrHqgD+Rjo6OAu^OI!HkVMmx)#D2)qw0P5
z+Bg=A{n<7%dxTK%cRM6GL)*IVml%6`ETvT~#}9B4G9rtV4UZQ@%Q`&fY`i9Mph5_0
zAbjPc#nzAPY+Zzbeu@{*dhUhSkx|z~+d~O~ZV>8S$t^?kz*+|>1*O#g=1Z+)|GL$X
zRTpdTSdUWnAMMa7X{nz+JqvPaPP{%UXvFMH$Hya3RuUC9s48=?vJxV)yeJ7MyAlI$
zV&mxfH_tDq+n-Q13QV87*t?iZ$yQ#LexUpNW`&OGvN1N2y+Cye_wz6uv2^woNxi_c
z^#U33oLw*y1W`^?9~?Vi#^zL}@IP8a$b)U#nqz6#-0m8)+X~~VN|gkHqd7T?xvUqp
z5!2ES<mv~f+Kk+Vz;E195PH=b2{0ZU*ds6iN;(JeI*q3l9C_9FUYC{R10_be3_Ac}
z+vo~>4s2bW?G)*(T-smG2ZsN)1>uJS376i$xhS{=7c1XRL_+}dc#blG9-&113B#7v
zwx5835jgSso!=6`={P10jOiR5l>oX0uCOp%3mn4>KiL2-co7)T3OW`bBHQ4Ez+!+X
z4>@mwTzC_a0+@CITn!k*2uH~RCkO(osqVyFRs_<lx_Q6KxU-xL^kcNmj(`&g+o!_z
z&mM$NHPOq-i<f|u`G{w|-nhdi_^%UAP$1p{nF=gHA<LU05qnU`d3pr?ihw}PBZzC>
z^T047<Ol~xtz)3LS5U|j4w&%;sbbpzJU~3+?A&IRz@I-U882}~B02$I(D9kw6bLUg
z-f?+RjbEQ#zQE3g&m-H{3V?s+#Qqa^J3@lQRlbC-9r|}0@waWYK_`(6vYXYpD**_=
z@XvMn&m_X;<2sKTs>6HZIx)xLTTMh5<g6jEW3K^>_8(3sPOSPPFp=h}K$!q!S_ksS
z9ekAs1J=M{C(d@bI`8`tTV`;q1Q;C)$-wKK?gxegO+XSHcml$i+W{N>w2*L=02u!r
zg6}zlAWz%8iM_@^w{iFd6!P-4N`Tk{a}Qr|UqMZ9!Y`=oPUOL7rm$1uUPCniM2uVq
z!a7cz!j}kuLeIisr#Qs<Ks7$Hx^sULO7s@Epn(*h4UBi3cGZEwVIjy~C}b3dEAWOK
zfc=lLp=ijw1mAy<%@HC7biKFIxf2S$N(KY-#vS|q#=ydi$O<}rM(qlVAk2XyMi|3;
zq2VZ1VAB?c5dvA+gl+x=h{fLXya58un91tkZ5`sG2!3M_jPpIlr9rXB5Q1?#j$Rpl
z^<2W{DoGw+S%)~A1Z6{(<v}eqgu2D!4)l=(p*b$%AtujzuVcH)J9riWG)hAbMdWm<
zgEl7-%}9Jk;7Z^|r~qy!)JXN@A17hf`zj8OdXNrW0arDLp=EHa&UhFa9dRnr9*p;_
z4#KT0@ETWN!2M9O#2!F`a0<icIv`KwD+m_?Jn*BW@h#`htv?{#Zb|3*DHOjvA9%#y
zd9<Ny4Gjm7p!2<1$UzC>q8k};whun5Gw(c#;sxW<tzj5r;)zf-aV~BOep+U(@|Cy>
zBSx1HH%0Bv%8qf}Fx(P?SeaJs36#v2gK>KxV%2|_Wl%VtXdX6pJf?;(0RO@j9~1xJ
zfJ<8dWgKxiK!gHI<>-j3jVhoe4t|(ZjVU#TjJ5$6Fj#=v6)VKi`S2$i?zqp_562_~
z9)@keF~89Vz`!#2WX~AL8ONQPLxNA-!42ry&XZZ<>1tcV#%!k&?zg-xzO)I@JlO}3
zYt{HYSO|d@*piPRxFdkfP~sug^_Vzrbw6WVRq0%U@a#euzt{{GEH8S$A|b$mLQG&6
z0D21y16lw$83aE6#|rJdjd{Jgyz+LpCa(HBTp|<bKtntK;?ZydRAj}C7&3i?85~FW
z&myjTtAXW%>2364F(*Q{!|KR@u~s)?wr%CMQPJ-35!UKkvH59u?^Ca(rjylh##}w?
zVhR-d&S8<0cLM|i^_N)opVhH#Jx5_Gdx4FnPOS7G?DUlm=u#0LcB%|Nd!>Z%nG5Y7
z?A)4yA0(x#?RP>@K7b;o9E=~Rz5?(yRB)eDG02(-821X;&QjZofm~fl5Y`LiucxUa
zTm*8YGjyM~>A#2rUJ-B17l{?z2s&(-SAu{uw+S8*RU?W8hOgMd&esGmoy+h`V=(Tx
z5p+Ujhgma+{QVslv4a}~p`-y<tRfsx1`g$cL3B6{4Ou!SmS3V(&)*369ulf|!@I|c
z=>mkEYC<IlCo)Eu0thRJV2@+(uz!$Nl#g<6lRtdVv~$l?yz>$(Li__E!hsb5+(Z*$
zA98-;evC^#2DV3uCB*I37AnYAAmkVvwpsw}9@_<9b-?^Cl$8mvt3qdBejL(&PF4*J
zf-g3kj>FMuf$i)4kP|XQFaa4sIF4|+xUQ9}1Dp{r!jZ#AgJDa~5M+8dVHSQA6$n`w
zT=CyhmIJ-L?zL|S>?dE)NghDl6d_#l0{zOJ$dLs^Y6DyqNHGQ$fkk<h(943(oh<l<
zel>nBuDF^Y@BKRwf?fa-&Jcv3pr%Vt(B+yuk$}JzAQ6`_=AFl(5xZbwIsO86E-g>Q
znu5_eU>}Sr-2a$tx4iR^HUS)dWCkg`a0aHwfm3J%!CAEl6PSymb%vvRtDo6*q}UQo
ztzkg!`1Qxbp_EtfK)o6OKNPOMayBN8TyCv2Ma;@GiZ9`<y$K2O;r*ELARLrVjVJ=T
zDmP97;c40yVZa<Gaf}xM3Tq770AW+7%p(YJLM4PCEpU;RzJjHIw-9N8tEwak%V4~7
z=SCk@Cq}w+lL~Rx4?lNDoD0MK##;#J>(0Rh3S7~qgVx%{AoIq=0w^3;9&z4wnF7V7
zFy`<_%w)K0Va$m~u;yPU4Ir#7IOzHhDUjIPD-i*364t4JKaAdCligSF+(lwbj=62{
zRvhTW7jgm*1C)s?RKPl-6Nz5A8bt&kc8&4F)#2O5Kw`Hj<a$`|N&}Zr0+BP~1WMd2
z2O(=r!5BUWahMT;;XJRc2e=VfOBi7mwB-!i4~@VQ%LT3qC2$k+1`r|w#+_?$2E#zT
zA$aF1HB|iYpv@KJD0tQwKL-P{7{h)GgdZStF?#?OI~f<@4?w}eJ6UlcY?SvB?gR<n
zO^1tOK2-zj=v*KP){M7YcFw&j2WHLT$KHg$;46_uZvp)2mNE7mL0mWYUjP$lu2b_)
zP9Pk)2*D5`=aB%aNp0-{f_IPDH4dAN5;%e^jEC<L(;=gvAQTRc?GPYd1=?Y8Xngtf
z0XpLNI?7ZCDil~T2Zdg;_ZKimTnb=*Lpy3O$AEJIwGC&`E=(041<weZ76kx;1hH!z
zGMiNe*#}{}0RNM4`G~6#_`V?{kO4stBNlmxQRCQA2+&$hWQ3o2B2YxQR5*A)72JaL
zsU~8*fuGB>#AyM%vH%tV2GT>|Cv6~NkF;|{_&!9r^?F*xR_83^ssh7_NccXL+Saf!
zb}|*R?F}c4hxdCE577`E+%#nO_X;e0a|MJutMulx+gU-lg=<~FfOTMGCGEYePlJ0?
z*`Lbk#)sctaFgnNxUFvS@~$Ax@dmFthlYXX`!Ap4Ey>9X#r?aj)GKE?{u4XmU7xv`
zKYOz=;j5d^;Ck|Z%$z1)fo$p2n5X9uua0vyz&}@KID1QZ@sA=R`z-vp&0FfE<kws=
zu)C#fDF8>yd~fq!%^VV02E`{BSo1fuRua=yEw`AR&2zY#ATRcyV7o3Vudwl=3ctaB
z2hN_bq~9ybVS066+i|N)TMOm=aRGc{>r1T>_G68|Fq@R)qvFUV<OOGTr%7<BPI!`U
z*AF<U5w+97icS4=QB2LBr8Zdn+pyu$@5aWIg_#l^%LPn`fYWlO7-y5JpYwFH^?NbF
zjEJ_SnT~z@Cca-_`qQwyEbLpG65P$f-rP)g!yA@vl%cHjdTKu9-n;%jFYe%QRVe#+
z<evoMa*y|ZVH>W}JsU0)KNdhoaGg%c3(l_nFL5GGEn^B_o}GnEtb;+DPo#s3s``2`
ziPb#!;BV=xj$qNSl+ddF4$h_|QK`cKHhIwcLBsv3qo2Dra57V5Q$vXOii&)J4r-G!
zd7O6IZvLaT^q^=W(EiP}Q-=8B*w(8fV)H1mp`MVxO2Fm&ozZg}`z{R+ZRZ&@d1$Tu
z$%q<&QM*`hZDg35FbSwU+B@AKihWu<@I4Y+ZXHYK#IM?C_!~u|ca%V0*lW9i&qeK*
zMCd=G^URrkq5po`Sn$boi_L|MFAI~pYh+_Cg!b}4eJ^cPhioQ_1{RjEr#~CMMS%!w
zgKGO%_!YcA-PDU?gbgKs&N7!@9j2->+-pHG&R%E5=kFP|U?r{0JLG`ZJICHO=&(uS
z4S$;XHJ*J;TtI4Z|LvV!OIT;o_=MGXjyrq9Z1K?&T)}B)lCv%>Ht3IluY_O=W-giR
zsJn<g(2aqr$xl%{SfTm8AZlBr={HCr{Bno{cXP^zzaibo2IJb~_~XpnVcHyet{CLN
z389CD)>immni`L=)98zWtWGbAgCJRiROHuC72me-wj(4zvR3CmhO8{&D$}s4?ZIER
zl#qv2OD%8JCryO+x6E?k71r@j@>Z)y((Um4xo^xY0*^I)-c4_LkJuQSHHh60m7=R}
z^N5%Z2qx26H3<!SUfm+@>?Ktg?C{%Cq7{Bn`=`AEqZT;-ff0Gpobntlgq~D-QMAB1
z^cWOzzu@HH=II+#iNrM77Eg}K^uONB@^D>#cPDP!=Wp}Ddl&)@V)&iebWu32@$UFy
zM3_z~e(xUzj6QSOid*h>lf$CGMN$>~Edsr(=!<QAuW0_*TfDg?<Yj*YdNDV=EXaFi
z?L*h@H?i4PzAV30hjFSAmOb&z2#r>8dKcGkx%k#OA>{(EWas^EGR`!C5Ku^c$@$5A
zY=>*AG$#^<J?b0EiuCnutu}8BlWeT+ZzMY+&NQ(+q>_P2btmUQa(zO3Pv%ZU2W-Dj
z9*<j3D<*NnDCN_v4+J`mWzVjr_Ue4r<u3TLA_K~AwGKYy4P|I@rB=H*pUgc>S!keu
zjiPxEO#*^)Yh}D=`U<Ntw;QvNn`mkIP?-TGameK8z$gdN8lHV!X8d+D(`@95Kjsf;
z&-~lz@&HI*;o9wB1wOsTTZ%nERNXqIPeh$K+|nOboSZJW(AZBzW{v%6VP9mj+XQB}
zK8pwaxDYAl|6)AdM%zgLV435%CF~C>p)_q>RFr$8>5;W#OL$LSu?Xi8V^=Z-)u5cs
zT)N7krD0DOW;UEM&M-pdt#9L>M;F?j4j$u48J^RuqhXa*(u4O+<&kd=32$q<&M+;t
z`I%%Ko}<D=MWz-kP;zv(Gt&HX(QjuczdnOl^Sg?lg03q)S(>gkw$Z6t=AqDCm~RNa
zF>IcsLCf!?_293Q$!Q)EGODap!ddX^2p+B#AAgki@X*)RslMIW&VTE_o%$DO-o?&b
zY-t1_F&f{y5&j5$*D&*L*6TL?hTGo$sbCukS8F@MB}v%jLLoAB!%l74R4(*IyKVP>
zrp(n3PXku&wzr!!<A+L&^Ak%d2U)}7tN8<V%Tz4e`v2xZotHDVN+@-gudUX;^;JAe
zE^pj*JwU8)Yv8_XfrV|?EZEg`Vq3p1{|D$1$imI-@73McUIr3PCyM;#TC*wqFoaL|
zt6HS9d#+9Gp_FvVT41g_CoJ35SI8`Nj?l;tXX!<R<JML|L~2KYPq%bGDS4!&RW7|j
zpB@cJK0ZVjXlaE<1pBE%E}wZVW%diN7?p$%DZbfN%bMH$4-W81hCJ08y|uVJ<@~*B
z05`ad@cSzoq<Q(}*Ut0o$97k(*b}W5G=rTAQ-hV15HaOio41EDDOmt>T>LiL0F-L(
z1UM9)YwwS0os~#wMHVF;!91;hd36k9V8s<*A;A$bO}NA^3NZ>VvB@WAptqkOENc60
zVu&SgKE<uJzpl<WDwXz)t8Q?T8qsXOVn7wf^yZa=q9ZclbmW7t7$m~<ygRC>r6$i=
zrS(slyJ9ZpY7zH@a{CRaIUI>g->dPQPgL7`r6&hi+zCUy9gPaTXqYm-89`ftuf`Ya
zKcD~dQ)GM|p*LS2lghes8ax}0=Cd8qDPhgmpdC?Vu;Z%l3E54~G?cA#a+1F?<YM3Z
zbvA3_JzD|NXEag@D`-J?pZy^|b$itg+P~~@XJ>8B(3LmM(zA6+H->)=hs1=k`i875
zYwzk@bzS|*?RPi*FDS)l%su>U?B15rKpVuRv8<}o4UQXM2_4m9p8C@ogzgPE9+9{8
zJ?wV%()~Rg`qU-N_K8^ornoezLwgP~=lMjxe4a6_pQO9rr(-_R&JP0ooXWhr`zaPG
zQI%qW{hIEJ9Bmb5_5K6iU%RKoTD<LKw2CR;Gfg-hxXe+yIwDq!-}73kQBWLv_h#G^
z_R7H>NBcB#KfLL;oY{&(m$Ic&_*!O1)=)zfx>~J=uO-ygKGHka^ksjNa0axk5_Hf$
zHMZz~oKAiuFSz|`W+e9f(`e_OW8wpGMCe^3FC*?gx6b|*e&N#Z;j+gb`RnVaLWU14
zrsSrW$0pHjhX;-J`p=JD(0{}odb)VYbY53=-cq{y`@Q$z36#(t^kv-Z?I<g|e$TAJ
zH05UIk*euu@GB1X%a-BTotssr(*a{R=`&+?R9a=lS<NW4c^8!3W+EIB!9!b<_&^ap
zA{@Fg^QA<Z(i_wxhF5c(tJ>+?V|IGw7HDh>>B;+x>EBdF9x=c=_vY2~K(pp*ney_D
z7L{{n`!<(-!{gm?x)Nq4AHmgi9aLc|_|%jY>&jIsqtD>d<ACFMY2r`D3Sh%L4gt7o
zW?0=17u9+1eMJm>>-Sc21@I3-6A;|y39OnD)BH8AW9NP)mWo{W%y(Gs$NywO`5&)7
zChsRqT|fc}9s6m=@TbC!ki<7#fnm*w`f<nbs7c)M!4BODB)!QZj-eVr9z)_bVA?|p
z>rJKuyyHN24jmfO4GlblINMw{eius~;AyIhI+BY1^uCdu@&~mbv){|;U)u5HhM0tQ
zbD7--P)ho99;(9hFG|$(^sw|#GVc-{roMhth|1@l^c}2e7?c#{QD6#;6Hd)$W9*Rp
zi0;*O*rB4H=2n-a>-+IV_I7OAk6+c_CmsmjQe2rkwY1=f&3~<u3Dwd1oe?&3|KZmg
zkUaKVsjG^~Jv4#2ba;>l7cJSoAj9p)-=pJ%5>vAJUibavk`zgJzfLW@^>Sphj)sGl
zRL$iD!}G^;k}(PYj7iQk$--1g9&0A72dPwjxk35yb^F8Ak9Uh$@(%p__e8o?eJEw3
zoL0RQ$TD>H3meA|<(?*!qga2SX=F;ZNL@1Cu_V<uiYb1ta(?~nZqm@f`+qcZ-L9IN
z1JNi(7r}F#*b*O_S3RFl+8ZCpHm4YAvesK7qqG`wV4tZoL>(%B%+ijeAiH`}cl6$i
zP^sj4OwgI|_O3MfzIOf1tgl-X9YT4&k28kn1Lfv%XYj7^5&6F3%C9HI7)Wys0Y-*i
z#(+y~s8ciE5u!cztxO(1Z7cgvFXi70@^Z~Dwmrra3>*)h*yVoR=Oo2-E8Yq%()?3A
zck@14l|JS1Vb??R#2@~4cW4k{43tuSf*)89m%iOIpwPNYL-T<5!=E{m_L4h!)G1F>
z9*S{Sk(+Bi38)khjWwwiEUU`=eDBUP4i%gHo+pl18Y^qR4wwWpJ}|Q<>Qaz@Pt)x5
z$zuy!bi7A&`#EW)lXu!fTEw&Sj1|n{+@<uP|K^`>JRt`%EYCFEKiec{2tKlpmt-bc
z>gJCc4vVEP5cMX@S?kK~K{?D#%u`FnX9PXpO3a%Q8B(7z-!Pa%?6NR3Bw@Zz46)Q6
zb*W{NPW7}uvXF|Aw51H^Ui(W6#8R{WbQ9*kp|<jMooz`q11ptjqOb7KU+MN2pJ>Nq
zlP!%|4Tcbn+)NKD)uZ^=(P`B+fHqC>eZ@O@H>GJx>`Ttuc+5xaUvY0x_YrxkUPQ6;
zAfvHb>H?b4f^r;rky7ef6mHaY#lBFAa!QK73=8DjSqh%df7m?}h*X`5lq2n<_<Wb*
zij+f|g8n}}3YRrOW)9X2@hJf{!3q1T*M&BvCZriZ)YWe5Pv3d%F7)hX$+LJF!O>UL
z8%)rf?^<+>6<tVPszzhCT%)<zZkh{7#caB=<T3qbUf?Bdj<kLF?dEO2LXw{B7hrMW
zF7-WNlW_c&s3S47nDJ^w2Jp?XP1=T}uN`j#W6ht5&;g!3fUQ85JYZ_<*G@;s^1-v8
zyYcoZF<t9!x0${PdX*H?ZjtLO8R_fnKf?*$JXjI@BtvIXGEDzr75PEKq}Jj6%M=Hu
zlzY0;)OiZ*bYxq<iuIyQMx!UinS#%GV{X6Bxr}7vkJtF_;MpZ(zx3}x?9XDB(kQzV
z!ju|cG?OHQAscrb^QLIe>u3kK`ajN%XttCjhaZ0x=*|;;1P?eLPOOqKM&qZvhapGP
zYxwHPtQAde?@Yk9B^Cz}7w<)k0y*z2Z%^|+7~-i0Nn*J;nB~4v)rZiPPO2<r(s)^#
z^bUT|3}09drHW~6W8|!dLaCt>D`cww#W<)5YSdbM!d#tokoE*O+j4O>C4N{L3DB4^
z5QI_ujq5X+d}MHz7#9T#0~;3Kf3P^lSnx0Gt*Bvd#kto`5K5Z)W142QHo32x2u1Hl
zHNS(x$5PScW{w}2_^WOxrbvF;X7TAY(AMvJaMw$k!zG<5N+RYiv-sDWkB!Qge(?M>
zJ6shZsf4aMHa9p%v02EoS|v6(VSn74r0=QJ>23JtJxbp2CNe~w+IG&~BACNTlik46
zmt3##Map_%&Fi_<d4)l{p~!!BR+ZC+#)i{uMJ3Hv(%nJ7K1&E-G9OoF*mFI9EOo0K
zMg2|n>6-8Zis@u=cJU*}m+j&oDa!^WCuqC|Jd4<9J5ppYpY-y~90hxg%(DWn&;?Ib
zs**J7zaF6j6fgsK>cw|-4LBJ31hef>IRAB}v8cS~+Li3l@8$9-H7aQcgEjr08qV&x
zn;W0#>1dODq$ioC+b`#L&(o@UF)*xLnCP4K=K%5@JrYuNrVNZ5wN$)y`;m8vSd)9t
zj;Ai7k!5C4_+BB4CHZ9d-?Po;(P$qP-e%^)B<{f|{>|2)NR9UQI-%e9Q^;dtb%IVX
zG`AKnUAvd4<U>5ZUS_h{Yt@vz7d!Bj+@oTgT~mLR>GzK`O{-`qGH7JszMI&T_M~2k
zT&5Maeo|d=T017Ffi?5q*KSC1YsGDcPApAVLBZ!P^WQ5<?l#GC8BmSKCeh-|J8U&3
z+P|qYQ;gy@R1V2oe=Zns4SjufU;VwEjG1+-#>)x^QK^sAYq0~f=9(HoLgr=?+($ah
z<{Ad-AhEbK%1*9=B*L<K2ZiGI_xB#Z>y=WwO$zCHn5t#=AkNNZb^RdqF8jUSIl=u$
zwhbmi8E+khuc_vrFN|i7|Lr%NK@x0;a=(L835=Zgaj`^T?Dznpv{l<QD9byy>a1fu
zCpork+Z1`Y78$UW=GJ1Pr=EGUAtBns!Ljetos^F;Oq$HkIn=dTcxX77Z8TiJ8?oeG
zENs}g={FPztpKRHma%4~Fu>pXAEfP*{4PY?D3%DR5<FPOA-L0X_$XyS9cR>Uby(X7
zygDqBvUjzm>1H+i7F=o<TpS$zyK0p*+3v^DC>C6B*}RVa>gf3FuI0aCX%)pnT|Ji-
z(J$o1(a!HpKA3#VNH*frP4d|D_&g!$xo@DaUMH1sAa59RCRkka%_lvBsp|uqj^u|p
zH<C3LscgNBG_r^Xiz3cZ_c<v4aiP|#*YDnSX`>Y`8JUbQE`D-{{$Bmqk305{-OjS^
z$vG+2_-HGT75^AzVwt=bc8BT>MH1Orv7OIjT_r8HfhqQ$mo+}zys)19PcK$qFITy3
zygA8qa^3sFaN0|1GHp`j7skVwE8i_G?Z*>;)SX>98gCi^GN7DZ{#AF8%ONJ8LLb%p
z#YcgTmy)-n!g6(12J8M(l%GNDg{0xl7)ieK#wx{^_oq?jO;~?J?Mih|8Mm9uOdCoY
z(UiZwrWCl6*@E1n)n!w6-ToT)fC!F2*8lVKk<Gbx`bjJXw!i7|30T9A5vxtb{fL}-
zHJePjf-Z7~n}t%9>QrNzhx3B{<c0kwMPk}av@w;FH43bJ7d1XX<W$5G{s$acP67X^
zKXn!E0|&n2&M!*5XU4=Q;8jEtDOI>Y`PlpSXS?_Ub5pJSf}oF8G#X|8+YkN)XQd?l
zh<=chx{Xj@^ij{|=VZGkSLWZoC>yIFIgH%<jADQKxbT|4kS<L7grNNwFHUVNFz`#(
z;J4q&#Ac+c%gy&#hRZv&B^EPZ9}3ddOy@s&mN57Xy1*RJajE_-Dwft!P2+Jj+f%jJ
zouXBjt_YG^JBPfk$Of~>qdQ%9(@JZEZj7=^DU?cSu$2qEn45}W)8*Ehh^Ee%c6~<=
zzmcjGC)};@cd#?hq4Ue_R}NIx4YaO-at1YO)Og9>g88rJIaS46Iewa1MuI~3yFrit
zQR&E%O+$^|BU6JyH;i5vadY!<A0ZPDFz?QNlg&Q=aBUQPVnEtKzbG!x3#Gr=>seBJ
z!t{lQg?zOUCBdt+3S)Z69Iehe6wq&=^)2<B-k=%+ebF0gk!(|G@P%dK@qY=Acz!-~
z(LM$r5Nrc^b-oEEv?BksO0Qe_j^jUs{w=Mg{w%1ao?@$&`Oft2-8#cBZYl3te$Pav
zsDFs2aLWHolkg}#1e-UbM3{kW5u+p8AlDG>!Qf_hLy%$4oB(r;&|{Vx!t-X!uU=Y`
zKi=>iOy&zco)g%6FD1Ndpc(ZveB!;o&=``lH}XSytS@G7E{5Z~O&JH+&xh~O&pe+@
zRf2p(uW*~j8$veBCo-9Jk2HjW{ez(grQG~nMyvF+{3+GH6!_004mvfr7JW9FtP$`p
z61N*xlEjt?Y>ZN592tc$@ihHjEu<f2i4~|F3<1=(haqT?=sYCia(5gJ2Ms%?*zDbE
zICfb;gTMWt_s{Rj%~tp?;%|NZZbu!*`>ZO0Km!$xr{YO<$l0%k6@jEoycu82mA`6>
z(NOgbXy66yW?$G}(^pst{SLJ-Gl<S)hjZv;M?rw!u{^pUv}0$*E)acHANqGb+-GT*
zpWh#?G!9j6Q!e2n?4fp0n||K25Gs+m4Ne?Y=yFc#(Mq?5jFqLi>Uk<NgHFy$*m2+`
z0b<#6<16~dzYY&8k4#H-;YX+f2D$^MbFSu4^3Pl%8mDB*WIr@w0pZdg^vn@cjnA&4
z3_h1Wb?S86zk}Dfd~%g07L8KQVtUS8tIT48<YqOJY<5uLIVHH*t_^`hjtR11PJ2LH
z$H9|xDP!W|RsCxK^Mg=_N3(_#w+jH&b2frGo(SL=1;WXh;lzDN5#j=l*(m^!KrylG
z_zU*fy9N&_OaSuA`XPM)<Qxh-gRDaKM&S4ncqtsUIerB|iFju$84#s&OZ*fBxOyLt
zKxC2#NLBm}72pa5g-KtC5ODgI3;*sP9G9R%jl+IjfdI@nn23P^=i}GAaX)&lj};&x
z*ph;M;IaflD1j{FtX&8&^kp*9@BIIF<~!YZHLSo@s4=jDI|b)yoZ%q&R2&Wl*nCGg
z-q=Qi2=S09B!E2wu2}IibvSRxe;05WIQ-?W9wJbHCp0->&v62WVKtrasp^53J^B{_
z)O&zIr5fFNOFsyRS1+600J(lX4aq<_=4~EBiLW`CLH|0hN{Ij-3Jk&kqz<q<4qzt{
zcnn<h>lF}jJ_*64L)EaPMAI~Y@ya+2kKn`@r_WxPSsR;WK?)X#Spa4dcye(8yih=c
zNRElI01mj3OSY{eV5t&Fc^F1KQAOd6qklo}{2`2gs;SR~jFh8_>^fHw5aO)rqY@^r
zeFA12l6Z(egA;|CtW}C4n5LPzcf3!|;gFgpv;=S+KLA|8{xwhQg`dN_ArPW~z|RgN
z#I=CO8V;mGFFWzayw?w#?*jyYAfG0P!JK&?u&Mx{ABPfQ+t~n2HE3raBH)D&1AwV8
z6&$$nXx(pLAO2CWQYlMxnDlGm+o9pNf*XSAW_QwM7c_GY$b)tDb`lKfidiLHlR|Eu
z&u^g^=Qu1#J-v0>z(=>#4xg5Q1M*YHc6W(uQ>i;X$kiSB$=&CEr;dOO_HZ(Bqty56
zf_O5yRyVfxvy2_D9tEdh{8htKv3JRGi!5~q(>=CJ!|*D5>-9!-F#7aDIH(~h51V)7
zjk@>6i_u}AFu=bUn(H*s{oL@SURy8+`wxf1{?w<k^0%J$yfZ{R=yzp<ZOyw_nJ7(P
zlwRW&cn3dYSl@}igWO?kcPod*=g#m-8a5=zYr7|A+WzKeNZKyFUZT5Q@R%(Mit`Kb
z<;a=6LJ{n}f$!w5|0c`82jc_fv7H|axnlQbRO)Lw&l82Es<}CW{GV4aOZNIA;yh25
z9>0lFL5HWA<yz}~-wr?I-A=<!ZLuwNMn@-;DxcqZpTp;3bfsljTvKr|AlpSgQMb_$
z#gbrVT4E`qD_&O~eH1CwOrC4=j^D&0pnZqyUNCDluiw<96+<O&`(D`8eA+$<+<~QS
zoOgSEWo$P&;*u6F2zWhpPiH3gs1f#)Es4Ifd*dT#|67?ytB#JY=C{?o+sTJ#Znu~%
z%o4oZ6~t6=dJeMzei*CUsJ|y;x5W?c#y-k1AXSPBot#YF>DNWhO}xL@LETq6@Vk6Z
zCz&*-h(Fv--zzF+1RuekQsLrqhHjIzS%#z)J{fxGdS7EK0N;)@ZY&52s+<4`Xgez&
z)ZdMSBXu(kVpUD-463IWE^F~T6;0!a8;2&c{|3xPQdk>4(#A9Bm*_;JZ#qO+#@YIx
zt`DaYym^|-vqenUnr>Ku;%!TkV0T`fkaN`Z$T7Oz!T-~T!!Ed1)*J74xTR6mtbDM1
zzkZzXO0oAF?CuWmt4b`mvb!pCV><^tLlTx$B#eFc_hbDVmED#6w!rR72(p|ZNcE9e
zBrv$0Lp(n{b=qZs(TczQ5$$)={;ij`&9Ez{q^`rd#eu2h7AI&v<0%s}#*}0*xcssm
zPcQRhE#QH?0a=F?o`21`nZe_B)doFn#8~A<5?@4_(#EqAH@CH>{6xf7R&LmIRA9P!
zZG||pAj-7Dc_a-*sm&nrVtPnbvUj`){Qj8SD+2NY{l{beEhXU*b)3v{D%BXa^$F0(
z9&dL4dE%|#{fyn7l*=!N+DZmiR0$PM{E=EWvvc2%8z(2j=H*{o7Q%W-7&>|VoO497
zj95cJb8#a4yl-A?>v6d8*$DiEDCn}qd`Jy_k4E_k(=U<*7JJbi=7+d(xR>4j^>5%S
zNJm7!*+DK(_12B73+RS!7>!*!hDD|E$1fpOt<KxqS<coPHSVm>($reJpDq--G*#sK
z2BSt^kuYBUS4`!u$Z*g>DX2W#%zTiWZe6KcKbj~sqkZ~@m<JXwy5=9>3<zuax-ez*
zU~XgU#m&*27w<2(Ubqb^6xmZzEWFtK?Mb&|-m+8$_L8?@2uL+$h_`FG<sn&e%ZtE-
zcVHA`-Ay3hudNuEJ$W5O(RA{rov-a9PWF<}u!G`)-AWXBT3q0%Uy~CUQu+O{^6~ji
zDZ_UwyZ#P5=H)9M_Gp7`>F`xV$<GC%{pCk42F&}(7U333cP^E%44tR3{EwI@7&B~=
z6L~#%Yh~W$)iiGF-FKv3Xgf<E3}68VCL3Qu?K!TqS%~HPU%nIbio2_4ufnRD#5w_?
z;C+ueQ-+|CEi~IcoNxL_?Cd&co$}+aC<tZKM?YPctiO>R-cr^0>>&5jX{g?l*^*<8
zAdrRrH(pE;Z{U_{TF=#<-}ly$88ataU(LtyE`y~oCsyxszmU_LCz`|0;($BPie4q$
zlLo|XO+R1-=6(qLf(FI|SE%ms69Gtq@fH?%O#~{bc;5iy#@3)k0Jtk)48*BqmlI4M
zBR$#P|8+IZa>6hEC74m&|Lj8(@Kv&c$@y;<){TzWq-#LvmpDr9N90H6A7tEk>W7~h
z3)XIY@pi@;Sxny0&RG_^;2<TGlCc%wO5vN+H^7haoJrb333CO++zq(>jWVLTdhR2v
z*KRUHADLX|t#Fa4*j`l9`oStET~(^qt>;vo>b!H*yc%WB<|w*D9cc?jo@)`qV}~S1
zkLRC+6Mj9B`tSY>B}M3@_Wc=hE$ddMJ|i<Qe=`chtcHBiW>aDQuxW&X#OU>Z1#UMI
z!=oRnL@N!AD~RDqJ<mAJS|Velh?G?@@po<s*)P8ES@%(PfBX~@m!>-R9h<Q$po203
z<}_59WNW#(_&=T~5B{J|h`{uxd<B62%vJgm-my$Pq)M|G`Q^6k!2{`00WG|Cipb*N
zp_Omp^_rr`{a9nRv^Y<#apac&VjHkwU!fYhZJ{F;ydIe5(yE^_T=iA2)G)+obTLr*
zF8<)zZrrMYCUc}sd#Ls}EZ#X&ZH@QI@n&c&2j|2uUp;kHzo-7i=gDIlvx;qWJQsA5
z?@y_-=()_jn~CBUMShkq`ix4G-oF#gv}@zPaATfY;bHNw&oX`4h{Nx^26#_Gk5_ks
zk-r8U?wajBheX3K{VwWsr4nYwzW$-qi<mCTue5{3PMEeS$BE$d^%D;MV=rHJRN-3D
z_8<8g7I|;F1+~r#r(ovQksY|kV9fnx$z`ZRIw{?60?FTi?tM4P#n`GW&Z{b6DDS!)
z`hSV!DCOkKd5U;inRG!_YMD(>?e_Er=bh!ApAXWl)hWiGNHy~0#0=!tX&W0g&G*$(
z>O?KXFB-f?ebCh%wlqBM_mqi(&di{W7i0`m$sf(v<jZ@yPFqe{ySLqIT$8gQ^FbWl
z4|FwA<w+wp)<-+z!d!${#Koi-QMZ3_1WX#=Io-EV=62C}ju%-lc-PsvzHCZ2J?UCM
ztGJULz?Lh7tL1*)-gD|tr}7`<JLow=yLZIlORxO8pZGsg?aU`F>H(V{ETFWGZ^b{e
zx7u^;kXrtr?H#spF^XNBOujYLYx9V^>dll5bqwXOxt9L7hWUDru}?R*TV3NZO@>aJ
zr2Z%j#fg{0$5ryB40o@ip0~cFZ`CHK4XF7&5=iO_Tj~u*tHtDmwx7!T$2D2o=87{!
zm*6{1dmCjq<}O6SCM>%48J5oO&Ct@dE$O>Z&iUFKYR++Gf8x%!NqU^XGSxBM9%0{{
z*WH4m`Sb!^+n3*ak5O@=Ggq%vAd|nrvgLWY$)owczaW}s{VYhl)<?r{!lVWFZRsRj
z^WK;yN+cfAvUSSQls~B(T?rlyf{{xOX`Kp-zVWn*cdwZ&_|vRw+qrMWtY*%%CoDAU
z$-`WYWOySU!unwL$xP2-@dKQZef6yd#y1P!v_G%ZFSa2M{1#)BzYB|Dyxh2hYKkUL
zvBesZ@Fl5Q>Pp+cAu)!_1JDm9#BF2-mCO4XFOSToNRr(SCyw#t5*||<>POtd1I0dN
zmLBnz`?Wu*2tp)(tnXDq=4HyhQ|Ray=2O2&z_2C9#lEVXb94ImV}AZFV?|7C?9E)m
z^>OE!(n8v^c_Ux(h2@PTgo9%GCsNNTmG)&UOWkJfM``(JMkD2~qE@Ztfg-2Jzk#pZ
zzV}K?jg|^$NTX``cx@igkMaIx5xtUYNVqT4pasohs_(C-a{<g-Ht`r!%+Gc}=)qOg
zxfG6gyha#T6U6`xkV}B*s>TGo5yoysfcI51&7X%7)_O}TXAb!BKwatdN;@#`v|s0v
zk|UgYCsAp3V<+8&kxnll_qf-**?w_!Kt6R1qs7eU)c-5}7kf*-3=`GU&3B2u{mty3
z|BR}UtsufvI0-@TjzB^w_-C8hCL2eWPI26MT^}M|BqXX+CeVV&`n437`(j{T>-k@8
z*6;kkeU|EhXiw3;{?v?;*0za$tZj3}Eo8r-uYbpHnEG-5MQZ)k<(v9Sqr?S?>4#q0
zvZpugM_@d_ifRaPaf46-&Mia0@#2*Zm>gH1FNW`Ioss>!={kcVwS9>jQKLJfS@Qcs
zbcSOmqa1Wkt68eJ`!e)XpTEnPWfXij!*|9OF*~JwjtO`PvIu?odc#HR1z7#dv<rD=
z%ZsI#0%RXFrt=X0eldrC`Zl4n>^C&BCR^}BZubRC*ZqWuw|i$yYH<=Bw}~zuCsWhY
zl}(b;M)E;eS(^tsq6*&vmLw?ByU#xm_G3ry&cT!UwRq13AJe~{Y|Qnk*DIRI=g?M;
zzvJwO+B@@<k|QY><NH&Ys|9Tg9-`-SFXBXM*#^#?uRZaX>K9BOU!Anh2>eWGTzcjQ
zY@S~=;o?Gbyw6|jZM-c1MH2ACJzye_#211OU@ud$MS90-9h0`1+iFdAq`72^Ohq&n
zuU6eR=6{etMjz?v5ge3t&x^O1BYWvBHP7?hQM%?U##={T=DOWe@uVCRBn|5JsS7d3
z#U!5?f+7PbB#~`yH+4g%`vm>nB4?%<O;f14-|XyK2XYxRCi5TP%5E-DlQ0O}ZoHHe
zBA@e4&ooc$vgdeJex|g$Rx%|uZy?j0O$cLNo-S&hXev9k+JEzNb6fKxnu8NxIcLR1
zaNkmSFvNECknMuzGfN;T*9*xP{-JIFS#qJ}*TT=+%my}ob6pZLRj9AQCrm?b=}%Of
zz1O+YpM8>YwG5HXe$CaH!lT|-_~tvDdMUjtK}_0~Z^4Z!O2EfJ5}LrIAz%MtyGqhH
z%?tVMwQK>M@;UV_?ay}#l94zi1vbx@6#FatOrszA5Oj_g?kSr}M}O}}9eSR^zU?$D
zbiU-=?TbLqkIA=*lqk1>Ww}^dK1@)OWQL4ar3~M=Gl_X?wtN`x(4$i0s=r0fj9*G&
zeAMT1U(cgWxUnzDDs!oeuH@(Ug1lQTv|1f*%kF+#DNN)d;y26t852I)XIi~yki}1I
z=&yNwaeaJvqxBc<!*S!iJN}51sgkQEk|eblY`3P?Jt*T91>)Zq4NuM65kL9YSPh{1
z`tmQkw&_~hUr@3;lr1gnxtZ1%d<+q~@j4q8E!w^qp8q7Qr@EPI@Mk_1e@ZJw&CvVU
zjm}|h!i~MM66P-CkD5#B{hlW$rX7X%nw$hF<PI5gb*RBpn}$9lfg`tn3&ZM3g<gUJ
zU59gzP79*`i?%TwZ2aTRhVOq+7~icSYCuma{em&pRttS^sCci@kQMvhYceeTS+dEZ
ztww^}Nzn%mu7Dpg0;hmlM_%E`Z4>ItLRw2(QX9>;`&*G5s>!12HJ{_=8*f=q_{L1_
z<+pT>SGBj?@EvS@&6;tl0skgpqI0X7#+$kdBDnLVa_6l|WL{<Wkh!&)P3_eAUO;qA
z{GZO>CC(JDx9yVefAq>BzPEn&jz5a^dDKVm_vDnf#~CW>1R*clSB`ZyZaDS+p@;ub
z4~+jhvI0F3CJXnUPQg-6<z$a_omlB}7NgzWNo*L$sFr@-D>7|zQ#-#v3wXFavxaz&
zl~nGap{uY4S?>>UbKqL|LN9TzswvFH+q?o1#D?au?0O`rAM;}PB1q<dp7ve6puPj@
zo#_xc9cyg5)~CP9UZHJ$&QbPE>&xf!K)rHC@vZF|?rApp*$sP&58UMx<2q)!t6!Jj
zX*`ZIAg5fm_>T0I^L~E6n~dyZRt{~(kkF$CbDGnCV+y%7sr$&*9_1Rue&^+Lmldl1
zuA@$E_|~x~KOhs99!<6mGc5FULecNr@PEpVcx%$M{H2TbRY}wB<J-y2^;p{6`1S0>
zP`$oC^a`h?M$Rh>1ujj@Y6l5fCz@^LH&q){zL7A5oTjjJOpqU<c77E^my=@4aA99R
z*_Bg~`?x-ddZ@?jcX;Dw2hA_#9bUORRR&@`?iHp}0YuM}$B*3U&T{D&i7O_|m1*0a
zp#~-C&Rh0yqrgWdx1;vsEqr55UjGZTJuGi?-Qs%IEpIJCPOBcqNBTILB7oV*2-;1y
z3Wa>?>uC?VZ1%NLq+H#T?4GT7zT|c3FX-HA+d!_sf8j#DV1Lr?Xpnkkcp6GA!^6Yu
zx5$E6WN@n26Y4#s4}Ii(X#b_Lt<q{MoFeu8?>s`ILmE%kxz+gEvoEs-N%HRI2A4U`
zH$A;{eV(%@7mlyWG3YqH>_bi#tuNH6J>SW&&!iFjjPhdSqhQM}R&$q8Dbp%(;Ia_X
za!yQCFt|%3bh+!U|DAQ3X^P4b^5<u%d2%O(pzxKknF4y?n#RB&D%=^PaGzmUtTznz
z;WWbPF4F1G6XFFc-GW>CA1(_xyRJo<UYVKmf9JVY?q?tOSwH?O$ZaW8^Ex>Uv*7x6
zTY2Phy&dswG<M^Q(hbTQo~|&;+q|PHmCw*KVlQ{^+V0d-&Ozt~NgHU9kvBT(q`_-y
z_a8rOF;Gsc=zS$z(CNS!GzxJXF=Ag|zSz2f%{8&l(x7v_O^&?jKTWslMw-7b|5mMZ
zwzi_O?Xd6fbCrn7Du#!yWv>}p8@}H)@Ab%J<^Et<rkmUa>iBVktIy)pUSBA<?WHR5
z&g}Qr%V(<0&punTeWUIgp~<=bmprMR%DLFvMMk>Jd|}B$66q)|OWK=O)XmMJssH_S
zDx=>xkYB*hz*06zLSy;sjD(*U&>5F;FZ4@(-tC&zaFdq}H*}ud(48h(HMGki<4w|<
z@V@IazC>YJn_taVmiANY@;3Jgc2HcD!I!KsS`_vr$I&~S>GSFLy+?hyo${AysGn6_
z3Q?w$Wnbbw)5w~sC8l}XkdbieO!cp`8apwGj|w>=2HDj|Nq60IDDI2*EavWX+C)n6
zch*5y&~`Th<LsJE>iY%5hj)pSc@JDqO6!qua&vKglZT5k?h3w<9XZ>p#o2r9vd%dq
zI}(Kh_MG(;&z4n_A`4F5??|u*QdDL3nu;MbOPG)3hotnJO5X{-<2u#b<I{Q3O{M4L
zIe8uBhfGV=j-)XWg|eG7&rVHR96r-QWB_d)`fEClxpR?TZWkY;Ut&|Pp~rc+b4}OX
zgUS$wTH1G9v78QcTXyu;`y}yHbTeDJR^#Eq@5cl4^Svb@E>R=-u0^N}m?%X6O7W8j
z^3|}c=@YkEO2383{^t}z9Ei>T0aHM%zaUZfss=;N&l1$Ir+IT<aO%<e`g-MD<b)TS
zo2r5FZ0k@3=X1L$tNKaWuiqX74np>NtVN%Bw>wCk>vN-d?~N9lYtZ-%Wyldt_6h8@
zT^<X*ZbsJZ1nokwG;%VKffD)81NVZQ@2AqWHQF$&i$<aTF4fg`GU-db)mKwZ2J|^6
zs6cOIKuZ>s^<l1hDbyLK8b0r3byecMiNXw_^Q?-{p1Fj!eujo#+I%KSaedI!7qWZ8
zJ!6ab;`brJQn%=jme`qb)p*D5c;Dr?)KWSOW%i}M+jZz#e!=c7lShULkeZdd2Gy^7
zM*-m@1-o%Djps5Pa3PQ8P4gMQ5XCHRd9_yPIeu+=#>euysC0F-2zIE}2E$}j#ZJ4l
z^mS=ktV?;F+<dS}nqwU|ziQbY>G0%rqY@NU`2CqW%24~Gt*m>cSu`qc-)Kp-IIgAf
z!o4B9<(!6<%Ph`_>bvXt7sBq`vZ}e+c>#-Qgbz4d-e=)RrBJyq(|9t8Z}|Hp>D_|S
zEE6J}0OO=?7#n>L`Y3a2hbEw)h~N)uGta)q4M~Qdn1EZ$R@Fv`kQ2;XQqxC3G(G#i
zQaEMq68qKbsfsJYt0$z@F=uL#Ue6XYxt-~v?P#G=R%Wtad~3)4vQ$;;1Sx^JW!SZ$
z<&tj@P{xBxZG#(F@(*Ak3G}&SzPqro$-7x_%vVSlO#=fo2pLz4C5^ckLV;kLLX$bS
zLDq5D=1N2eti!G9qY-M(L#+z!K?$iA+yBIU<SzGN%p(*VQpJ7b@5g-vnELknvL$&1
zThcDEC6@PZvtnQUBBMHpRzrp>$nh>h^Yb5(fvL2N`q4R?yqdG|;JCJCfp|;MDV`vI
zXFlgWaA+0-RMZdnY*i27dx`H^Yum4e&o%Z`6?Mv(cPkjZC*SlQ7Iw23DhF1;NZF|q
zFSQ_?vM`+H+M8*%CBGHhQpK>`3T|`wma5}TF#%hA<O5JqA19dUCBr>v)~U*#xWXjS
zHV`&Me0wXN%G|Go87kEaK@C2{#aK@xTx(S!wA`v0!M8Zao##>|u5k2N!c5t1#sWhT
z7f5qQQ}Wviv3AY?ye8(DP#P|*Rf*oWVZoT&)@<L0BLyK=Z9$~GJx5n!-ewrrF38Zi
zyxZ;DEAexdJ#_iFW}xK-css%Lm-x8=3ZM5Z^{nV`5u`J$KQV)^Ab8R;GD5Gw&S6=y
zhL9HgfRiIIYiQhZ``=IVLN%r)1X!g+(Y%2nE~4lM+>t5HkIWvQy*M~M?wqm_IeRY&
zhux6p*H-ja^oK|%x{Fnhx<3~y>+r(s_m6*c+|Sm;D6sgN`V%XLeCbX|$_Mk0uy}u-
z8|fZLCO0R*aj^}F4XqM3dh^tsm=2%}Td|wfugeBT=!d6<Y|YM{%KpN+Zv&?<BTDBw
z=}pmoVm!%;q*o+;G>lmXyr59y(XRS^!e%|F`7N^O)u2mwg>0e=8VNep*_QPuMc@yD
zpeOb5w9kH(vgZ{v?g#%>_py@W`eoqs)*caj)E5B+$6U{7l5c?o^edT6p!L8g&D3G8
zQ&f|Ti%EYt7<7vt5o=&i@}OXQY|wehxa6xIDohCUq^t&_@}w|L=kZlyTtYL$mh{%E
z(b#opfc!-X;#$HcpuKfHGcfuy2oy0y>7r<l77e!nt~p%oG~MCQAR4q$ZofUO)fTVh
z+nL*Cx4dC0cFeBWGT!|f<A>e_!ELj<_`a#yIR4J@F7hgG<2GjB#_^tGp`zj*jpR#d
zlTmpgRlYA$J;0D{8(BKKfxFPDbq5b?ODtuO%7l#yA*2^13FXC_4fp^p@OHl0CmL?O
z^(nZ+PWv+vezyYSS&7tSBeq2lx@7mAm93%R*Krc}(L5La=xGB|SD6AxO-b)!n!X0V
z6oS(4_K%`J%!Lh_mWrC@s{%;viyGJXT^E9Nq7LK_O*1?gSR(*Jy;~`Qp{`{+c~_`G
z2$&Gmelr<@J=YujBcWzJPVD@REPGo{-*So?Zo~XQ8Ux}INl?7N5hIZltodkNZ81Go
zTw6vYV_;(1XuS)hNC2WHs-2I?<JY6OPvgm1e4ecJGIdbc{bzifOP3!dFLikH<{~cW
zo4W>rS*K_dy54zUDbD#mK#D@pa7he$x_feZ^xR6C=WCCi?!vWkenC#}&vw4)9=v$g
zc{X2me!6?yIXT@qKAq9rIiNuikIrriZA3r2$=#!agU+sK5(SgNbTm4bQA=hw@#0W4
zpvdymT~6+TsRTK<nmQkcY4jD2Y%}@={=L`!KU*8tNSD^Yc%D0xi5@+QS{sWG=&>Eq
z%x3RK8`t*-gM}JCIqf``km_D0mx=*UG6o*4^nfW(^!ev<ys#r<a29uZw<?X<E2;K%
ztXnc0F<8w=n`{B&6{sEnu6tf2W3lQmXjS~Yhj9onhQ;p5IG*N7gKbMNeqryXH<IqC
z_Lhp`iVV-wcoYo_TVf`VJEzZgl&J5o9}WaN-?G@xPt<Dw`a)~iIfZ3Zf@81)fWYN+
z<aEK$=5-=0QK7jtp8haJ?m5cFmeE=0>W<0Y<uLChqfwkD;HqGR_pqlcI%qFo3sZTP
zjKI?yTe-~7=UBpU+!)2t#(1i|i6<#!Mua(rPRKO5UifkVo?m8@BtU%M@jd`rqm%DT
z97#~GZ<I!;a#S^BTndk)G~V4D-3U7Xa4I&`#K5vQ1dI+Gtl@QX6TDY3z@^EDtrD`d
z7Y893Hg&BuxkD`u=t$ba7pUw)gBM8DDcj>!2L};aH#_xuy5>2=Q_tHJ_`|aDGQp;X
z;DT1UwOSL6-e#>9kSypOdsgd_X2k{cq%gRj&AsM=S3BSyr0>zuS7;Cx!;Cm!YYhUp
z3~+#wD^nW*hZz5X`8{B-q*+@r<kG>a=I|)RuzUf=8=@YR5lP%pf#6c1SSmZ1sP(Ec
z8f0^A8|mr=mRgwxpccT=DQ#^;iK+GyfW|`Ns)EY2YzbiY%7TV~Q*cyaQmy54De=V9
z>n<CaMs?PU4SAn74X3}N3V5cp10(tX5i?BuVAwFh1NC(hirmb;4~7P%1|W_P^Ig5I
zv9Wp!j{g*Nv?+#_b7RVt+KwU^o9f{1z_FKIYq8x6m#@{FtxY{XS7MghQlRY}pj5F{
zJ&>{D_SH%)FcNGE%jGzZwMSRZP#~#|A_uBL-53^Q0x-+?Th%mcRi>-326*H+WLCBT
zqN5bxR8s-OWzkh&M%_8dOg{}Ivv&bE452o%bJ+Gom#w6JRd`H8p9P%!#{rJs69GUC
zhW;UMK{Jzo2|yS&-7H|rOBETUMU{7qKLc@A?9OvaE(Gm)@t-d~NQ~jx@t-#~9&D8I
zzqTKI`g8o}pW@@kf4;!@&us|*{P5n!gM00VQR~;6?FXAmMlOYa-kDwxN5gn>BkuDs
zeBr@u;zIvoI8b|PKyjQe+_26UOH1K6%19{oyKuv6IE~xH%iL1!D$#K`_+LEU{fzz3
zImX_<kJ<bGL3`u=eSiOd_G$a){r^*Zoc+%$u1J8whljuB81VP+wOc?0?zc8Ke!U<O
z@KQ-fs@+Mfj;#FFq2haB-QmW7PbQNzTO?F`e^@Stxl}45$}cJ5>=e>UV)kk!CFFFm
z192F#!C=@MDh?2slWYL9TF2?9cH&V#>5VYk<3%!on0M1rAFdTamt7<&L=BGBzhj7$
z7dy)1b)tlZ^x;Z)LG2IrAJ2<v&#7W+!lvQLai?>ze{$MA?mW4(aR=@^Ckp=P9jK-;
zNd{`DDM!pk2vDqyB8oZo1X;1FC5OC`5E>Fn8WWAPyeq@5->E~a^+(YLnnMgRHf1UN
zcJu|l+JuCc@L}ecSVatWP7e4+|MWveqVG8$ydwoY(%K{$XOlu|u2!m&htF@6m0pn7
zSg4i`x{%PatoyQ8_^#P*a$QW~%lzC5ynB#<Ac`kO^kTS}d$kS4LB^AYiDgaeGf>SW
zeh_OMkPVf17WeJ-<S#zyNA*wgMy<)iGDFc^FnHCZgAA*tHR@H5O6`~4<+vVC)`5+r
ztBe}OPO3GuIt7OUjcZF@o!~Q@ssX&plhI&V#%_V4To*MY2u8ILhbaX?QRVIUhXwrp
zLh9^8bJnpTDNDiMLxKXe;{X!a96`XSivu5?q6Z)CUcql&9}DwPUkxs}97QIFIcI3J
zXra-)t-ws6p^IZ?VI>p!Sarcs>4cXuPUn*xE?DqJvl*SMW&R|e4O#OkXbNVK@Kf8C
zG#Wkt^#;==nvtEhG)^eu^N<!=&KHC1#dh;q7}>_5t{fDUF9TU~p9kGHNc96<j*_cn
zRK3srZH~qDR_FLdAZOZhCgwI}Tp+n;PeyvvVr_8zgLjHrXVXI5f-oMFYO25t&5x`)
zbO_0LVM<Wf4fPp7fz3}84^czBR807!=qfG}e~H%3t&R<BZmn5$vm?0pjYp(V)gHv7
zT%m~~c`%g8B^{peRXiMFZj|+Pq3<tYe-IU_-RXVb`3lc?yX4Nz#XGpkTeWuELwQXy
z2<sFa-oD$J6;+;Dh**3rv=DJn=l%j)+p)U9@1wl<_GMTt1DBVoSqN2wV^YJh;G+@X
z>&@By+WEM(8~QE>l{^%-etTmJM>Kp%QR~fa;M0xXH6x;g){;$z+?zw2ss<a{J>LDC
zJ_@-18H7De-c))iRFHJ073g1tx;vjcYZ6r!v_oe}p|j0IaYp`x9S)k&T1zt~P$<R}
z>NjwJD?ZxiPWaYtl*EdgG$GJPyNAYjYM(*&Z(ZEpi;T0eyWJr0J(-8|fH?%01&gh#
zBM9?wbrbpG&~PEK?e|i$xpxkU6^o(MssLBhe&xb(NCO=i)`>;L26V70V;cyL$T)#j
z5%W0GRlbl103(E%3b&`L_cJ9Ms3YS7)+)9$_6~$wqEs(aheEIL0Vv0$1FF($ssGyH
zF#&^UnkyU|0D&>>hI99MmK7Ja^V~HYptxT8ta|I8QZBCmD<)@$7Z7yhNSwfXgt>Rs
zWu{_IQkHStOI(b(Ohn8c+@fB>6sXcLF?=Ljn!DLoSVn*bXK+2(dR265!ED(<X}-!3
zXuw!@tud^drTxX+-eV<$S9CtBS0|3Og-4motkD+IJZ`N#An&$<$2B8<CN*3Npy`BO
zGCO_bABRxhNQr8>15gto79E?o`9oKS(7b^!#M}FP0B{cF8SAA{=SY?&*@RCM5&*>2
zAynXQIld+E42osouu{Y!n6QaFUG>zt7?dZrTp}N|9*kgsHlQw7tq!Vd5l>X?o8{!-
zvkrTrW{5#tFgcn&Slx1Tx)SL?nU7K}C>B)B6H|96$;()>RiT854Q^pHce)BAW>40M
z42LW6gU24JCfKplfu7{=g2NCofw|(0xWF#lbyW*^9iaEG8}iPSfg_wf;l($j`*A?D
z(30^$X0DmxOqrvobYsuXzW4NDS4v3qPA;D<A;(f}>r~=IWZYBD@Y(%M9q4xyI|g}+
zwn2n4Lu*WuD)<P?zkqj}opE49o^=8a0vpkTknN)0xx^e<{!-Wylx4bjG=i$P1v@z)
zI~rZ-T>NoqUAcq?t+O&%VCKpgR$O<2yb3!Pv^0-Do29Pfn20M+CXHDl&}evu%BH#7
zh2>Rf_&7ON6%9$*S9>B!RYSNhxV>m({Wn+%g)1>UgR?HGS2Ty*8x&xBS(HnaP`dUA
zZ|9>C<WhqItE=+(#x!*m+>jaG2LMB9)J$-uV{vR#Q|6SmGvdkDwKa&*U@4LbDkUgj
zM8xD;EnY5ESqI&LLO`?W1JXpTdvLU~*V(H%`Tu+|1cU}XMk{%6)o=ODOFx8o*Z3Q2
z62NE;S&gP?-&cegfmCi^Bh!*&m#qT)|Kvs|le~&2LlWJAda&fG*dQ2;5^qq<fsPSG
zjgp8I0F=zxBXE>V+CG-5Y6EPMPzi)uNG?Ab_9%zbW!9gn;aP=*fv2Yn^yO;(PRiD6
z_x<%Kt;IG5&UR?t+Xbj4x8qjCwZt@DSf#FTceSNM5@I#FmAv6<=mH3GkG9*gcGAJk
zX|aAtGq$Rw;peI|&WA|h=f^j;S=AB9tYDa0(y3ZF!dA0*ErVks_0fK%ZZQYkIAaJb
z!sB-Af*5bHx&)=1ys!X&j~h4$h_(j7JT{3u0GKeg*n8i?{X*>nx`$K~#%$Hkp6{G?
zpLR|U8xAqn>`O4$Q8v!TmL{hhq}|Ah3ZebPI;5y{8A>R&2?qBre5rM5dsV)!0NuX=
zOwbu=0o6(ko}KLfu5(hG#mMNx`4#lF9J!oRH6?=p)S^(8y3O7x1StY%9mJmB3`Zll
z6(1_1pS?-TTn;0$!}&3j7QQ8TeO0U418q1gx{8b?`YORTd)Qc~S8!dY+L$?mVDs}<
zgLB$uc!v^cHbv8wN~H#DmLRG+){TYFtXbyP2T)oI@V$k>7QH=a`E@Q#_YNqAj3&uM
z;Vdz@uhQi&e1Q2~n%v1{?2w|E04_x)vZJ#+vuO*lC^xsqdh<w60eAHZ@5S7%*Y4|;
zgNDB?@K~C^Q=EZSbLZz(iz{f**6o+quolI7YE|B$)dr`B$X#;1=9WgefVGNE=)r&`
ztXZEUW0ksZ2fH`<$CY3KZBa%N-Tqr+zW3g@Vl#DN=lOIdH=Vmb$L}hPn~xLAyQ~vb
zw3A%2Ij}s0J|O*<xlTOjKAsK+iprds2WRSmaZf(Og6x`ChX$z;Fj~(c6mmmcAPB8!
zzpr&=ch4}MJ62tba_I-J_};<r+TrC@MNw}eOLNjuGU`Yp%0QY8qH$a(<ThIl6rtGJ
zYBbu?>3oV|I#pC@0QB_Lc-iu5fli$vVglbBAaZRG_y94Oc=b9%$jSR)wFr0?%u}Hn
zw!A9D+M;OU+)@)Ok7CvzfQpsTBiRaVNbQ@}&v-!-TJhe+q|S{luP-wx#0Vb7s0E8+
z8OV`Nm^KgsfT2d>zMHL56l(Y-OY~qavyxAH7m=$<m_>pMFy0d!3+ohY1YNeGs;}S_
z)vOgO*HU~N15~vJ{TdMjSXD=#bDJ557>Ty?P6k9=d!P>;C8OFAs8MC^5J(;}9&9s2
zR;qRZR)-3f=^C|oRZiSmq1&>0EfIqeKHA}ngdwUycV?4JRk=jgb{tR8!Vp9qdvCm$
zJZHpbhc6uPrE5Y?PpT<R#>{fcolBlOA4Z0Gnxx44Fllvjo4=<ip*E!iDh>PVapO*1
z{j>H6<JG{IGwikDlmshIDoSTT10*0t`(HeH(m4kHQ&qMtHX62{gZ*dwr*}|bdbWRf
za=Nqo)xCDZ)n1_!Bz4Q02A=uKV~#Ll4<Or%kv`az&%Ny*PYdJin58nYnWq(%+w1Y#
zBZVK2H4Kz2%RA^Xz-QaOF;7QVBT|`#)TL7Fq9{D}YPB>+m<lx*Jp#Vij!+YH8UXu;
zkuZ6V2{YKymTyheE<kfF6#dzAR-bJIM<piGr52I}qO(%)Fr?doyjQr6y|0S6aAF2)
zJT|p;FfJM(0cL5Xo*zY{hUp^GPgl2X{<DZ0(6H4TnO9GGqU&8r9e&P>BF+J8@PtJg
za_tDD-iU+xZgJi!dNH1bt$3(el!gs~T?!On^ktM0XjLhtS&qo>v@#D6jfTN9(uqNI
zYf!wdDzD_LtF!LB4RbT6Ut!!RxVOhu$#}{gS*9oqRu`n6Ih)zJdhN~nR_OBeK&_Ks
zsl$rB$Kbu9s8RE-&_OMH_saU=sWE-NEorJfKMOj4X^Q5|yi6{8;~SXZ7-4y3!%3lW
zB?-)280nPSM^_`kF$I|y^qdk@(Yr6I!r_vlvn@u$o8l}PfDQuK3g;*{<dQBp`+ZRa
zXa3mDKUv-{Gqf05>Ik@fmlhUQ5+VpOo|GuN!JUmC%@R^cE_1~42^kYq2<8jkAI@2H
z8-55?OHU5>*=p#OYIT{JxoJB5y;>n9!6bd_!QqDW;M^EEzNX^^BJM&4LnZc+LkI_r
z&^Alp)NN#MU(u;&0ELQgW!q9G5S;I@C`}mv2W@>U)J|a0BZuXvn%t>P;2JvA1sd_X
z)$*ATsrz$**{SAVHvA2##S=Ni+%BL4JXdkS1@x9<?J4ZK>UGS$$=YKIF|u+4PSYx!
zZfbnC$0HPdB%C)YuzWspRlwUW6T!3!b%J_2J?#Y-vb>HkJE50*e}Uit;?sRFcOtlJ
z0Ba_W+Xsz5F=PiVPQZE|An;`Wpu^D_@Q4Ev`K`zKzf?FuZHTCi@>o=B_oOOvqczd8
zVK8VsD<i~f{?VX79CfJII4}fou=dD|*HAzC(8h;a;mhKd!>rf7OHC{X3?q?b18jCs
zj>(`~7+|tfC<Nd@;{gvO&4`+innkLO{tjP6x^lEB<VGnFO(uikY#VDE)eQyJQc@dc
zNmNUuexZ9;bY^V$j0^O|(yp(7l8vw00C>Jhc`r^=^u$sB-$aKT4m+otRtv5Awz^s)
zjEfEgxZphM93KPzRU7?4)W&&W()~-+8d10r6NZo?DB6&Oc!#II*zqxRr0bvwcm=PO
z++_fnrG7f?(O|uVm56Z$_9ZoFN%Ou9PNu23eHvi=QGDj!UN{ZNW%^rO83PliodKA0
z)a`oJCN-%w!$Nw9yh@Cw*fi9xm6j93;zFdcr08KA_7(_rD8E?NXYh-3c&&&}(p$&z
z*(2D68*g8&P<Go!U2^B>3E0;4;QR7-sp^0=U9X2@W<jtmVTeIv!LsGSzLf)}>$azd
zJEt#>JKt`+gq{#IAM--!>6{HybW)a68NiKtVq2a8`m>thGT<HPtGPwIL6r9N^A?6$
zC@+l#3ffam<5BeL7ay;$uj|XM1!3%iM8P|>aK<QYnqp(UW@G>%gLLAqhJnMep+u+A
zpc&GNGqKRy7Jx_;&OtJ7X`BThjtCx*19lz20D#8Od1^CbdwD~$jk-IzNpq$LE`W(H
zoTnfN>A=p&C%)2iT=rOScg^B{crz_RJY^u!z*&D%J|%=$%QjzBvid|nx$TL5qE7T&
zpXeu*CwfkikzAFYe*)`Lc$%0Rgkt(41s=~nI)n<R;_#sJT>xfLb3W^BCIK*_fWP^A
z&U#G!lZLNnB(8$QUO0ihkh70gaAI{cGukOL?Gy8|1+Ik&I&KK94c=*KR`&g5VW|>b
z8FeY3THPWKyB!r11NV$#n(?pHVilo|M59cD5S_dQ9?@<^g^Oz1HQKl7(?z6FBk|w>
z>o}g2jsHAeZ5*e=UdWh6qjt3$jvCTftyD3nD*~nVzuNiFcMkV=Hx-ezG1l2VJ;hM#
z(9i+JyFrf`#lHrTvYKRS)7XG5IFEnCzJ3$~m8KC=h_QtZ7OV4GHt8VJi=aROrQ!mi
zgg3(Y&EfSpIMmOdfA^oc@qa!*2(a1le_Hq3t%v3KKcD>^|L3Rp1mgc(VEmt7{ffi?
zJh<0_a9|Mrr}gkB3;&}-f>9uxi&AJDComYq^-=FD!v6$f=FGMn4W8m)wpBX6NkP0-
z;g*nBR?&8RTT8#d1J2A&_oV3Zuwl=RdO({vY&6_@IoE4`->~)YsMs)`8QJ(_jNZex
zQx#x1dfquy^KsfY&INZy<Q#-QOiRFqkZTkjj*!g>@!*x=WR_*zAfZm6k@5re|5Xh9
z<FUyj?TO%X$~vwi0LRZ@^43(_S_&vh>vCE@lJAIho2bH)AKQ6ls}i4$n@$i(%br42
zO=*9l_iRQxRR^1?ic(Y2miFNdw>7=2j>fcAW!S}Y6;7j7jqkj>QyzSbi|o9ySV!Ft
zG?Hp>U3VzZ*P(R?bv!y}3}sFu#>+I^#7@A?bgR;NQjCl55pFdww;Ah%Sv|B{fLV4>
zo`oO{)^R`BZ~h0*^WR5bzbV*ZGj`YP(@cBXS2p0y10F|QSB5E>N#_Ean&eM0hAHK?
zSU7k_C3rD-Pp}~}SqM^=Fj)yk6Dq?)%z{F_EJ*7X3%XMscBg72cmsGVo(As}XE8OC
z5<<J05YVX22A|c1S2n^1af@q;{;&x6N}8e>BUnhGQzlPb((DS9)Eg|(Z&h0r^O>Db
zXY(l^!W`YTK;N1(BxC6u#EILOI?pq9Mi!1QZr|~))!w<TM0s|JAwCDwQFIyiCfWO3
z;@XB~6i;SEOga!XzkZXM55sTVff$&~r`N$*SaD;2{G+LCoHOfGv7x@1x(#0haHC(P
zjXPzgh1zPcR>-R_BX6b6zOHW>4O6?`uV_Mec0m7HaB<IKZYIz@*TlYUU3&n_0R+1q
zWoGVm_<oztbzSP+)~@W{Z9&8e95yhhsf-?|f2;5HVYzZY({~Mn6mrhqaY?3rL8xJq
z@NG0@4q8k<Qfk;PUGBB)yt#eTUU&w^w|V}G1p5;3Rq266Ixij!)Pbn6eQ>fI@Po!*
zxnXxuhUJca&;}eU<E=Y)AS^G3N#rQI8Qn0lmE1kP`c{02Z&*xAXd|VvIWt9^G{#t(
zEIW21$s}kwB8Iu;Q!`_v+M~S4hH#O+`sYzy7_6^)ty{uo?RCM7u}LYG>nqgC>MCY4
zQ~fmRJzix+J1@s-RnCT^VR1vzF@!dO8l4tqaCb_>Ezbla6g(zMLBn6&M&zvG7qvlS
z>8O(nyYko*+r(jMr`;&ow^lJ+)^fL0r`pVTMq`V$HLC?Q4_$l$)`&P%=l$=mO33kM
zSX`jNSALTh$t9KobJ$6;#=0&q>b2BK9UdKbo-jXBUu!p<mt>ErU$$JF0%lqfCdjs-
zCR(SzUl`lcATgvE*xcY~>PM`pQSuIVz>v-`JIk|CQY5toohv#_XqiY8!>$@bww*tg
zldmGtP}*xqQT0+wBi9yiMoaGQn<VFVw2sPpa{hed^wWQ;?|&eb+J{L1F(?1S#)HrN
z{4bxjHXi(Z|MOFP<o%CXaY_L3>sHKHK<fYPsP%C3{)5epKpL3GajrNh4yLl;4bSWh
z54TU<V8{zk;yrRFIK@mp1<h;j52BlFI?;!V3DJ{J$CzT^l^SR^EtZ>5Eb7H+1TGVf
zgQ`gSpxcYm1Y)P_Dm-%R2ts7MLZgIbQ&Y(T*=Ur#!Nh^8NzBoi^^*}s%~fZ3dJeB%
z4HQq5FJtb8X~Fy<v5Rp*S>wm*AV$AyXrdk?7od(7b%>_@>`errTB1>Qjs{sxywDjc
zHX&9gQG;{L+lW`w_;D8p8nV66u~kOWVAE%2bxi!+vb;lmxuYsk)FeC^wIu~vL~`Vv
z7DV3JPC4)nnV6KUs%AwfF#*;w77&_uBz@m5-TGBSEgNAMpp3H@<xAnr$eVo>a4Hwk
zmSxB&3`*@L8K}rAfFYU=>H;)TExIJ+!{V{dY6;l}W~pU#OE{gHb|=Jy-j7<12(hYO
z`>ufSTZrvkf?nj_(^1(OME!K8i7}SA)zod(HIMPpO$XDg!Z@G?1aF~Th}un^78&M5
zWwzlFn~DO0_v1;QQ=#N0XRZt~9;Y`vC2RRPb%RG*2Ox_*_AMcSQ+mr?UpB4Pp@)Sj
zv4hnuJwq?}xgHu9Ytyf33dxWaT7!NgO1JE^q^_!sK5+n<yLaiY`hEXXgk24PLnZ-8
zAfsqaqV1AXvTQH1>8PHAn_aGoV@_5JBsE;H|7;sqAIN0@F&QB48HGXb56_1(kTcu8
z4s(oMT(6rckdUaRro=?mr1q*o8`@$L4>A7-RuU1OVGybcSr~5^b7xF0K>eGl(0<%2
z6bh8XN;_*=w--~5)GVXFkbzjz)DGx4WRw*+P-0CN1Cho3ZBUtVd8o5bgg1e){<kKx
zHuW%JvqUGft;W_wmI&|~q?><{o8b#*znCluq?V|l!ZOH`pAzA%YlZ2gMJPc-s--Go
zYK8W2Wz<p6kIydHlC#96xTIc85<hZgi$YWB(ltr$OrmD^l}E`Cqb7>d9NeL<1`V0*
zF@`6^>yv$lV3W^*4c_GF6N)3CwQXn_bB)Loz^G`aJC6@Kwu~erg$<pi1ZQwJHxIBD
zpkeSNszDSFH6a?PjJz$PAI^nnFv>Z5#vqrJ5EsODo!(lw8>20sdHAtawL^7$H()G+
z))8YbF1pCI%a~WOPdvX8nN!By_Noh!SVM<=!tK0SQrXK*=&mI1`)yDQ1DxqMvKMCw
zh8Ibb^BB^D)w~n2BDIZ^Rikv>(GpoPu#$}MCR5!EM0%<UCtTTw2zHrSb}vb<hLbEs
z2iO5(ox(me?lqZqKIvDaG_o}9Z51^dsP;pfjS(Y6c6$;HOll2G;;?JRT?)Wv6H0rb
zKpT>tQ1r<QaA{c1btqCb#C02uLxOsMS*uMjirFVoUOn3~0cn>Ah=9n3*>BFwO2L{1
z|AgmLiK}uf&M^`#ZhX1sijUFicY=!#SbFNjm~%bu&Es4EtnD5VZWQRMwQif67`G|0
zUmQ#pNU8aDu80DFOYOW#pAW&qhBBts7Fb=KlH(SqYUy#?S=X~nNt<!1`C*y!qlKa2
z78(?YO$%XM#gP>rUx@bG5LSWR5ExnhV~oswd_OSY`*Of}<$%k?s)u>PDgu#uUfEhI
z?_pLyo!EYM2fa**)V<<7o}9(!K@KF~-9+Eva{60v=Ki6Ut7+EID+{!DAcxktVJ6Zw
z98wK)nj~0M0bv|Z^Mt>{<I5?eNdvk1?Uvs$AI?Bts86J*yC<hd&zZXJ9(PVocaBf>
z&)uVggU;?L^{*ejI5h81PCKURN$2$W&Wn?d_zkb0y`Yg`=Z;WE)<XJVG;_rvHgpy3
z5bJUI8>WB)m)5`_iPaO#UP2Z@a{PNUEP5AF-M%u46cGBvyf%$!i-NY(uqgJpX>xLe
z1Sc5MDqNRX`RVLlYoq;OmN4uL1^~BN60-$enI!qlw))8+o{oxg8_p<a%H~1UL@6cC
zJUZ#!{){}Ef~d8~21}JJ_8t_+C3-SOMI5zLk+pI-(8&SwbeV*A<CZx>H>7JFTvVQc
z?EvpuDN$9zb{r2URpF8snx(^1zyl6@P0=n)lyDx&IT#7VMK)<xggn)HEi~uy3Q6G}
zV(GyR@(^Rcn?O9=&Hd7f4soLK^twt^8#+|N1XNvAUK?tS31W>HQGnVHy)$sgO%5ee
z1|r~m5p5_zqaDW9;lHJo6u{Vc#{~tWn{H`6n<Dgq6$iB+waJQm^p&4aqqV?pD)Xu~
zIuwP4BJI&-lIL(FyFIiW@PSZ19;rbEs)To{wK58x^=z<!W+~;kU1iHP&?%Cz<?sg=
z)AY3sm*HiQY?HIBRUq*i7#dr0vsDtRX;KGB3r(yX>Y^O)V^BG+mhjA+H8gAfC5A(n
zQO8OsNhT<=p0gp-D{{5bBE_b3Z^w-0ifW_%Bjt|93mpiys}MLZ$Yz$(6HKUWSAK9R
zt8-#K+E-ImC7Td->2;EfbByaw%6-(n(&7)(D2AG#tD0OT{U{%0z-8sbeqs%m<du@^
z-j0*&@|bSn=x$t+XZieER5OZ-Hr_F1U=VhrsACT5A>-gy3sWC?iDOg?hJpyQI$aPo
z3_3RYtoUIo(x1N4Pdccz^`ek*$Yquhh}1z6MX^j`jc}Q9rCh2&LblkK_eCNWGaOIh
z!i#4h6S|smgwO?2CWdxp)mdr7$vCuQ7Tu_A*P+EmZO)1M<i+9c>Hg7SSQ2xt7MnJ>
z2bnk{Jq7m3-5Ln+iZC2<GY}C`1k1#a3D6QgTEdi!EKffS9Sh&`E(x7&nWAyvw~?dQ
zFYOs&it5Z#b`-67={3w8;~WmacexBGG9gNM%&dpt7|JJ%N7O%hCdO*={f}#Yc5?}?
z&<v*OxRe7_@PP`gnsk}B5Z^cBI!G?EIfpcRi93D7x_1o{sFh+|<~7ywYB~6=8zB!v
zLBMrlDMB!Yx1<}zO2V81Vdi{2S#&nU+iU`kumwOvfJ9{A!O-tYc=>j?zP_F~vF2v5
zvlZBsCm?<=Zsj1TyIB*PRECmtg6?u<<k<yKDT>MDFnEF$O-+zsS8j5HhgQi7^7?uh
zeGY3f#B>*{I;)X6S%%RgNIinDD=rCIu&hI^y~hw-fm>n?TtJr@G9I3eb7^_S{&gs)
zF=_XyMXO}uUZI<Gm~m6cvem8X-7NWMZe=xssp%j@6-U|iy8>Xg0@E3@kpzgJH%Id{
zbx!KCHB1=1zQ;i8cHk7e$&Ua}y{~S02+%9`aJH9>*2u=(%;-EhmDvwlG9gYb<wdP^
zb16hg^Tzq7Ha$I+qcZa7hf!OJ0Nu7dB0YY4r5pK*+K-Qp4mvxB)x)U=4$$ZeMZYK0
zq!w*PwLz?iOKr{|5BCrJE}Y~yLvuIiG@#XbUR4=<4<jRvYe7|;2Id%J-}(kRrXOLL
zP^pl6GoEDEH&se?-}Hi%XK!S7_YGGQN6k4xgAZhTS2WK&!4n)@W=EVlRf)f13|?y+
zeRa7E&ad;cfk7e6nHo=CV=WAAOgFy4lwckWk>(=ylA~G!^hT{1w)yQP2A`cwjpCwo
zRN^QI%-fndfzbV!!%_iDv}Ftdrj3^XcH6FV172ZJ;$JEShtDOQL6sKW%exqkzU&15
zHi<agGu(DVw2u1#V+`utHO4U4#J)*{n`{jTB(}VT;_*-z{_!So>bI*k-Cl$XurBMu
zNyT?Vs@f0CZqvrr%>UaazH%?1bP@L{7bU?+7olJL3eQXZ27mAix<J!!=$C%Qx3c;j
z{j@Kw^@%NEo^dfPJ?SF)w|FgIiN}0giI?<*i+}=Hzl87n7>{=S9DnE+Xd0?tzz=?*
zZ*cWH{oB4)(-JS$FZ(KYUghQ$G2HqU{W7l{sOAn-^8i%yGE}v_fG(nco7XPz^l$xI
zog3zr`p%D8CTU9XjbB|mV7(S_C0QP?B$wW9eTYESyV*qX;Ak3e4fNlwIdW?h=UY6z
z2Bzz>6z^C3>Scazc9(rMg0>LzpbjNow<OAn*+wmAt;H2>rh&K_FsT>ST*D-I7rdl?
zJS)C0Yd?9GeXtDaX@Gj-%o-oD%u0{qbC<+j>ky%4b|pE5x~V$_yqf^94Y5CgKl<%{
z=U`7}qfNy%ubHWp@_b-}2nqL_6=qTf+M2!gU@a#H1J})oG`lyz3@4mLD)*RTC>#)2
zOO3W<i?ePls@EZGj}XG(QgFpyX3kt~3S@)?xL7xWnCtJauj};|bdOGm18%mEu22$D
z4HisDJa>^*Z~z-(Jp#r_!3!N^z?J+Iyw3?<Emd$}GSTt`bU+Qa+lkc+X(KdXlvblx
zH2q~`>pEkx6tLb*;_<tzRTX1}t2cKY!fQ~iZWjnh##LmwN5$OSYr;BOqqu8P?Ph8V
zENs|fS|(aEYE_c=C)qeY2T;)n&1&nVs<PZ+j(;}v4@DeO$7-&$JqUEJxhs%p&S=+j
z-@sPF3Dpj!v9R29c2r1$wNyjuGfeVrhcq8nR>4To2T)T@Z~=?_UN!?$Eii?yyOiNu
zVEkgnTQ_79UhY!pQEs%Yw2$B6N$^qg&cyN7G!aA8!qEn&bLd2#Ow-g{6bbqyRVen{
zw{n)zC*XOhwF2Q&KcD8~L{W*pRV+BF1#WG_nhb@EussRTvNjuR0R2c`?4uK*5{WKi
z%m@@KI_&tHR46{c*<z%_(hrfwFmz;PN5J=4AJIj)6JU8H6pV53V$kDc3}hgY6S~|B
zgH)%JGv-)$HwjUCn2`2*YG?Fi{Y3^W6VolEuThxEKn$r~2i8yDP&Y@>!rFq%7z1*k
zE%7jChaQXcuA%iJa&9jxNx4KqtO!fLwKPRMnt4gT^-JDFO>fFtY{LCx-_mb>3G~Rm
zf?xasNsE4iKf*H2hYVP*=p$xhm=P0eM%+xOBw~g(y$4g*^3^$zrj>Mi;Q3WKx#&f#
zcsUJJVw5LB{c}!Ow$txEt*~4woBZ1`2*=s(Q`#M>RqRkng@F5+ZeOU~MjWaE!;|XD
zO`&mdU?4Uj4CQNx`QqM)%Te%aO(Nt3`4x=;GM|x=*fMGhU-5VFmyXb9+Yde*=Mgh{
z%u6zkV87IqMpF9Kv}SfVT3OyH&ZUixM8olwR`JrXfYUPyLNOd+3Q|f)teFm*`1jSD
z<%)$i8dNCqW;hzb<qTXXfTy^pISuL7*4kC;R(pL_t3+M!tjhXH&DZSJ-!#_gl_E^g
zf;;RIOQV71Z4-eUx<mju1gQC%r<_Xy7O#sgs)5a9cADf$C5}@VWYy&1&a+O_kX^}s
zwf`N3$FGk60TG-(K=6-`=EeVb*m~G*`SIT$wAw$%|M)3BGX4jxc=IZ1ueTrS*dO=r
zwOdi^*PHEMZ9e#QIrhgc?0aKXi^dm9K3h1<dpWv?jpPBt@xplQ9vye)#PPsMxKTX%
zz?S>ZGVj58&wDURuDvIh$))#%gnR$t7{-u$Psi~@N$%c5B%mCTo~L;c=ig5+$9X-0
zxMWFV?NI>+QuuA)W$8xmHzeLlh*DklAiB1c`0B~pqu0RcfBn_ri)SEQC(s^5lQ`=B
z-HT_>`O!c;V)jI*k^HI)M!$7nikOlPa?Wz6L}DGt9y<k7PzZE~W{*0ByB6vO`P!p#
zPsu#+WfbQ{0q&lK@V>`s<29QX3GWMepT_NMi)5ijNJnQNAvs}r5ZoVaW4CGCE3TB}
zWw=2Cla5J2y-|d%cm%BbP1M7?FXzTg2%VA5RKFeFg)Rnbk6`t`rD3kMUT%r8JncYi
z{oSLzPTjx<1+k;&-Gif@y~F*3h7c(Mv|}9qcBHEA96#;uh>BZo!6LK89*2vmAy9jt
zZ<9hpt-k)P>aVsmL?H%^;-OQ}T%9SQ-jhZ(TvyYzmReC&)fFU9N~35-y1W>Vfxmg8
zWx!IHgs-{))t$$?b-+Fgt|nulZr$FMa~uWmaT;C@{}5|qT)=H+6u#;L%6YhL?<l?p
zG()^m--M|w=9SF`7GG_;XRHR(;aZW|Rq*h8Qj_pp^2gVDGJp5%IdXw^2bxKvQV)vV
z{k{n!;@N?vH5i;+LSDm*Y}9vjQs4VqcmiICp)Cx__nP|FpfK`I3Ean>(-+5wO<e&B
zuM)6*85$zk2EeLX8RJ=zjj6vK`tz9n>{fIQrBz8)YS*&}qQz5%0^-zQcpV%9?voz<
zRphb=kge}8$Np9x_g-pEaW)tLGrEnn*XrZms^wwnmbngZfMCnDg#8kq<#nnKil1jY
z-@p!0IAE^0zUk&SX%SzOvKFaij*7Chm}Dc4A*vW@w0nfuEySwxUIT1`!8dt~j+=m1
zt!u*iYTR2kwil>*LfZ?38Ik3vZcVNysxN3o?xdWeEP|Y!^rqnTk8z<GjHK_-5lO*r
z_zXjYoncT!H1aoFP<1wn&l3NLp`~%p3f_(5p1=hCz{5gSdIkpAJ#H5CsRg6A_GSfj
zS-ZA;ZeYxe3`DSGG*AQMfE;<0C=e?`Arnz+({`o`M5_E^zG8?FZIuSV)+q3tM}*>g
z3?U(>U>&66$GUcK4wf@`G;Ym;l6$BRt2PH5Ej>7ATX3ipY7?A3Q}3N4uRb2a^@yu4
zgJ)ZTIgf`DgURyd%|(K7P!Lj>3O&7Hti6cUmd+6GlziBq_7XBCno?jhGG3v_5Lx$1
zZB>0E+3@0+fehazi9G}u=$x^WERAtAcE|IBZH<FS$FPz<+a*W=px$!W3ii@gfN_Wh
z^NJ>)c1}*!?r#Y7p`+j2&?a9H(_)(T1BQ{~xaeKLVkrqYIN4OKp^oc+9zckpou?c<
zR5SZVqCjcz0o5trx#QTP3>Vy?Eh78pIm7+9gZ9(>z%oHY#<df}Jq?>U6LWdMyr<Rx
z=ummI{Azv83(XJ$+5uT}OsNnKyT_fK(@qzTE}mf1844cp{9qTywzX8HjYi5#Mq8}P
z`oO5D*;j!8=53Qf8aP?8Jd{Bn#)=`)w<{vr276{D0>A^=2n0(e;+Hoc$I1abRs%D$
zd!}M;u>5-Z%qWPrJZf%6+;)_U>H!nh5*f<$^@To1wf!Qk0}PsWsSnuxFb8$@c>-Kx
z=qQws$3ZZQ+2kWoFPi?{s9-}~#?Z7nXEEj40BrSvtWRXa#c-2FhL_sTs(8i(%r9|E
zpUYtfW=liSD5a+=7VB+jW;BdBd&glzh@lLy-v-<~AGbFu8SH3f)Z!l7;tr|p@DWxH
zGPiZAnk+(OW`v>sd>?u}9XLux9G5_E5&ESQM^|l{hO@~~rXH#T16VKZyd%sITwD%q
zjZr(eCf4dGeAoyd8cdC%$`OJ=o>(C6tK@lt9z?nXX%rMcav5La6YKoxm)r)v`{Z<I
z_bXxSRKa%}rGlcY$u+QaIhhV*7;b!&T<crLK=*3cJq5e&*-ep{{(~T4r$05hFo{p4
zU}TN9@Q^iI+<<4>^H?Hjh~I{qH>WyUhV7qxRmUfMmU?OvowV2XxVE<C?`NpD?W|fO
zO!45Y0&HnmzA6hwX4F`RM~BCqgQHzqKkfjbp^8k`^L4P8DGQ}>zh6eV)350We{H{B
z1+(hHT+q>07aR6D(#n@zHamwR7tM&)`1vGL2f@lfBd?JjM}0<)0cFU3t&zDXOdu=O
zwqtkCU{zm_j4kca+4ptLg}?q5F%8_gQo16-7GA2O%rn6XmeV{VkrU#-GK}zBSk7_F
zHTGB3U~;4B0c4#t?KP<rH5J@Q>1#a%HT-AY^GWvRD(MwuSqNh%z@@L71|oVb!rTIj
z&5y51Fs5PBb(i9lCWBG-M(;`{c^c-Qn;sfC<l%@0eHTH<rB+v8a&1*4Q$Rid!Vd*#
zm<Uueq22CTJedsX+Gt>33CT2ly}D|#-^jdV2liDNBTvXfN#_D*e9NE-h*?BKMs!pI
z%e=S-faG*mW$+*G0@EqsSGiL_GES*C33kiN3$0G(_a}B8m<pEr!#BZ>&TL0#x9Ui(
zrr(d#fx@aQJsGp`SNi&v<qdGl0#&!-?_Vc3TPSmY^#(j=7X}jW(EyfZe5^q(TuL-`
z*N3tDB0LrK7Kh*-2RS5JAZ1N8T{H?iG{_B5$=#iU17n3~&n~b*OzGC&oNi!xZnV26
zS~yV*0!a5nSQ|~#7puFRfCHx2uXm1BZB4t34tP#mLOAnF`e#T~Ix?|nD|oQN4o;Jh
z;&bK!^RA$y2J8W~rJw3UN$T+3iM~HbwZ*3%1dafly^TPv@Nbm$00dwtkPm@@@gi`$
z;4|`wI{0VdBFAxI<2x9D<F)uT4CKJt$%VmGveMGEUp)WXt1ZA8(o-uCV;z*WMR6H~
ztPG{ugCL`t1x9f#MnRSQVZ8Gg(4wcaX9p2reYE|`Y|iKwkmLxxJ|qL(-F7;J*PG%A
z>^mm{o7lmO=ap?5i$Qur`caNerlX3hQy{*Iha-x63}%I#{WENCj(5)?y|i<AaYlbY
z_^A>lc`#Y-DabG58!+1uD)-#E!l}CR0-syF5>b6)zh!>kY~6N<>-UclBLS4Ry?}f5
z1_$q4cikX-4b%jkPuPW6qQaA%gOkpt{&jl%qT@AJ2?T84kV>d2cX>s3Uj<vgmaTtf
zn=b8}s#XtQJX^eB$&T3_3T#%;6Iym;Hkj?rRnUX3=dOD`=q9Za6x0~@P_67t6KN6Y
z(P~{KbPTT^TCitFUw6t7ow-!Oh>R=<*|YIze-FH&%!9w<+cx;fi+#o1U2xWmekNR#
zO<Dzq7ET~peCVL6-ez%nGkd3be8$I8khP*-6=xH<JDOJ2;f~fM3na&=hHyI~5bQ~#
zio=@xomNVfG-Y67;_V(2X9DxzAkiD9(W_!vTzWz4!uUn%dI!Ta9=TQ;Q9J;x{F{r6
z!ozDuO<Rh<<wkcP6rXNw$TgGNNKCLh*%!)bptw~7zU#NWNYcB!z}U{^=L6xWfD;B&
z0T<TM7sh61)4%_wiZow)a#<q0A?Yy9DpaiHg=#J9atGf#zD2k$nt$*$r~xG|%(O|h
zxJxzW8HEeKaAA36G+JVFCTV1Gi`{IwUDzj}&s=01&pantsU@Dw*x0-~0~?zC{v7!o
zN-s!hW)3l|PZRpmkDXn}{D=VSmKKgsD&lJ~4jjjqWnvS^^(g5R*&pzH-TFv?m@*Rf
zMjnvDWQDKmQWICeo&nCt9lGzYyoM3E<nT3)<jI_t$_R87mzl-T86d%HDX3juu~sq^
zf7ObXkmR_ma|t2{k9i?34;dWs8~L;n7gxm=YP-GkHCUQG+xZ5?nd7e-zQ%DdM6(e!
z14v93r+vrp%-z}oiNS16(MM1N0riQjcbEHd%^^8EXB8_}*-H6?iY}~fdjJSocFvNZ
zuk0g6tK+YBPQI!q0d7;9!=YkeK11toHxJe!NGojGbznSqOyRM3A{g&5wmyh$w`>zc
zHo+JaY!f#ykH(`QQWgsA4^QD!WE0pK)yS`2%B^ti>MqpVdD;tyx(n%7lBjElpfU*n
zPTD%o&~acOcYUV%lfHJ3XOGi9G0Km`8^i*Fk+0>r{Wz}0IJEl1AIQ8>l=K{>VH|(8
zAShUS;laWDRBXm#N`-(7vSAz>DO?d?-D|ioRU!tWq1{md_rnqv`HIWYU?#(EzQ0ax
z?2Rd?B@Mq3JWR^G31%g7?&>NzmbPVPN}xV?(!{1b0ncAD7;b4G@UYCb>B-EO!pM{>
zXzS-6dSyX5V7cUzJZY&AG-@078hBsoJ#)>RRDp#L6ZNTXOPYMLApdb)*oH&C^wRYR
z%u&f_nL^Ncf*=$MXvK}%A!x#u5GYG32j6fl(YEe~N2gZaVN3ZnCs36!tEbW>rcPTK
zYb5lnt%eC%TYZf4k=t5ZhMz-_>q#~}zp(KSe2ISM-kC9w6Nr7NO;nsM!NYMk{CPGU
zpy)W4c|@~J=6ZW*G71J7i2T~;?p;)PiiMDBtdJ(ou_2-$6{9!tO^!0}7F%9kIG*RT
z^?gpmt~e{3w{x4(q!N$ifuRY4r~bm8O2WV*lpkx_O{7JU$|F_yEI3*bCHoo!ev0EE
z77+9y1E~)Q3gD<iV9MwSzCK+vm_=HRzZ7br7*M_NA&kNS-wLGysQMu>>VqRrrB1vG
zaf*3}Q!Iiw1C2O?S%?Ev9GLd^(lNXXLg=#|R&$=ZeLlg`tzjo~np=#1%+<)tS(Y^C
zGtL(Hl+PEQ#GG3?bvAyOtIkE(T{e`sh{tdbK8wXgJXK<x&Kd!y8~B?LF#=TO+pZtT
zx->zr8$iu1soC4oWDW{!v2DAxiFOe?^rmd6iNT+e8H`XN8EnGc!bl7OL4-`c3I;UG
zFCnj}yclGoKE@Rhu26Pcwd9YsHAG|EoGbPIs@<eeW2mMR-k&YhE6XSCh6t{%YFvTk
zXwuT!4SdvwM{W7YX8&?_twOY&JtdS)X#PXcn8f{loyMfF!;jkwV!?~YZiRe$HnYOB
z7YA;I%jsxlg}wc+wTcGdan)w0P}iG)okHRQa0vZ$`ok+oI&yXsZ3w<nbgT-@9_i8E
zkJIsGHXEkTkACBVXq>&7S>eUuGq=Jty;K##g%3K1n<d{7p)q3Y1y_URQIam}IT+I6
zk&Fq&&UG|G96txgqOdhi>yyTOz-iZ=!<eIjSVRULzhK7$UKBtv;|X}H&G1N^y$xa1
zatGJ33Y2U+&P-ZmE3U3G*kr0a%W!HzKv*=t70itqQffEakervZy<jt~kPbu!@6W&!
zH){*IN**b#@JZu_igO&BgXJn(<?5~3#}xog9aWivTV^blTA>rFe31$5fZ6ptuTo&M
z+|}f9zsskL2Xj`!EO=l&OHyRuk&X3;!n%%GYOtmA_wrVh4n?|)(aEeQ=NzCDBk2RF
zdG+}+n6SV4eA{eTK5nzt7R@GWZ_%)Aiy35c*an2sm1smFxrDpgjvNfDK`S8^+bs3p
z1>8_3$zWJ^0E|F$zbJZ<9*rm7{v-(K-wF9bwATwf%hsJ6U-g?*?utvqUxs9C%slLl
zyU+FyU!0T_>wI<KnLCtqZIW5SdyE3_rZ7h~oX<MAS8P(E5P+FZY2HrJ3KSRaitQI>
zLSe{?6Wr9yyBSEC${!P%7hK*gX0XVpRrB*lU2$ZXtuOht5Mn$YmNDbXRp$p*b?0!;
zo4HoK;NY(ofb!9CpatY=7j9zr=x}%EG_VBn8uE(QfUm(!p7o6GPhO!H$nrcn7AFmi
zoB4%YnMLy#2jZ9Er|kP9Sr@qvxg`X@c}0op9ile_7$Iq6vAQKUuPk2_L4rs7EzreS
zAhp~WD!f!Efa`UFpjR?hVU@J(#BlZG{x)iiptpf3r6vJhUPSh8g{pG&gP&&f1&zLV
zm(f@55_4m1J4f=|F6pX0t-Pb52Jwh=(bSO)yW#=M9&*C7*l)~<Yf`~^RT*%%8%^gl
zm6yh4_Q*eYNq}=TQ_j7yGqHfdLwh!<S@uayfaVhn4NL3~V;*txn^RA1TfsAo$e3SG
zJ)KjJ2%cY0J)KhzNMpI4dOEMaqtN`+(>e8!)RyY0r*rCc{(jT2%DPtP@6obrX1&8s
zxZcK`dIzWFdIzWT`#T8q2bZ<;>OHOKZ{9ecR`gd<Z*lfSojoIn+7<RNP7@o(WU%%K
z9>6x`;80-X1;Je5aVQimNl&GwovSy$r;zKRbS<~)aEt+i(IZ)Q(BU@090R=khO(a&
z!KdVlNql3p%#KGNdp&Vn5bKrBZg=!hj6EcnJ=^)FyMK6!&V8ykblh|O`rPnZ0KMVX
zk`2w&%O;Z~A1l!VG!?iq0PxAB3I8-};Cg*ZgSRgr1>(C7+*^LT^j<I<a2a%rx>$&=
zlzj;aV#g<;XBCKy!0OC78sqgf1%Do@CjBdJRpzlS0wU*lXL5cBs>L%>ag~ej28;J>
zao?W-x1R`=p++C0H$#s-zD6AL2a!4mi88xag2Xh<hv#Y1Cy*=zjB6Np`8kAWnlbHd
zJ?#Z1d#xusW2%k=TV-Gdh+@iKfZ(3bPa!W&HW4>^aQy^k$WR1LO79&!f#~Na-RGU-
z?vsNTCtqS(1}=UEsw!?oXBW{aS2>M4zx4p3>wK&i9aR`?e}*1~j;XkBsdKOom-jR$
zL<CQdwpcZh{z3pB{E_RD>{Q_y+vW%x+-+>z=B<F|#z2h&VBrecV8j3R!otpp|9bHu
z`j{R6b>m_Cvvw)|YrFMx{MVo2Q;Pq3(Y%UU>koca4*$Aw|HFoV{l##QDo%?7y<T{M
zUoVzs2V;Gw(5pI}*fWfK2jUIKUW+;06zu2qXun{GUu)n8_T>->6C>rNCfXV_7Wez$
zebU4mP7I`nR6)^|*HQgVHXZfpJNS!mEEN+ij)LLonQI4+x)LYNSkEWPII0~T?{$uW
zm#qPDy~(DUZBvuTVH(rR9GZdzWB^onptT@CMOoTvYVoP5<)Nk)aGF|TX=)Lq$@N&g
z<6noJCd(T732@-V)i;?-=f53YV&{-sJvuhc96jDYR9}|f@-QLWnKOFQ{{CPUvQ4e%
z)ZHEGCoiC-=q***647*pppEf#75i&r*I`UuEjzz#h|t4+kj|{R(*#D~j&JS?FY54S
zRYr7l8-n=jN}6Ct)`T0ep8nb_L>{*o*L=SVdF7*9az8sB_k;XPWoz@eN<U1eZ0Z(b
zP`KJ6k%hxG=ZDP+*P9!GC<v+r;&lY;EfjJiJkW*x?}HsL<|`ELc|l*O>dJHcU@8YZ
z+ixY@-|dX0!)@HsBqZF(B1W7QQ@E|)LM13}A3CJ6rTL*Vg3B0+r(Csx7mG+7u6@g}
zbu${77a^{Kj4T%JEeNBkfVUNcT=-`6suH~yzd@@Q!{T==SMrYKs$Gp>?<m^h*{*oD
z;o#qzp!HY!sh0oxXONNMLnHv1E&sLeKltpSFaJIK^#0HC-%s(8@*l4_3V^MR2Ot4H
zyw_^qYyUcGJ>0zC-fXqX65u}Ac@DtXgi<6<W0r0rOuG^7Jl}tpY#_r7l7WO0gve*W
zeYr_Pa1LJ9kc0ilbCQN&BB?V^Y@EjY%+<{I&wzxJ9%yn?l^U^>n(MgpbpPb^__sDU
zS7jPH>cM7m3U_fp%&cPbL@rvL-?uvBydE4xY0()$)6CBsH8V|~8ecwVd`Po(R!Ak(
z*}SA9KO<zJRgI^I`v;(dwGY^ZuN^kxs)6{BO*lAPIT2{i*)2uSeg@l7AUzf*hMluI
zkYv1S?fJD`mN}4|(H1YV0bx@BrgEYt{k0s2$oDvMGCV_re}7OniPRebVAr%U5Gx&2
zx#1*BQJ0YoqVwTZl5(coTJ?;P0f52AXL&v=W#7>KdF5^^n{4+=g1|{uHf&V(Je<=r
z#;$gI1Y7oViu1T|m!c0yx=EQJy`GU@w0Y4@I$@bbRqtCUr|s{YjIQORt6t`2uDRjV
zJP6xa77*tX<zvY9kd+cE%3m!PbOX$7Xl8;*Tn}14*|Aydw4J~R6QAo0yleNJDVP$R
zqPL}UfmbZTpqyaQ?pd^$sMxbIbt~Q>O|&npoiDjLT4>+ZIoc%{2yUE!{h+IUT6|UI
zS0R($V3eLr-Bk4^{wo)=3omIp1^)#o)YTvxwEO})sV1eDZ8+9HKFJ>?S4srQrnrA6
z_5xU-NK0B>d3j{ryv^=_b$0_h@!F$LAd4cyh8Ny}R2MjWkwkkdj5XBLmX8(+D_TDG
zd;0_r9Ygf69WTl=fux*{SOXu>2Vu_xXE4w02Uc7wlBudaqso~eEeTif=v_?ernlvj
zWdmbPMJeHKHl6e!)oVOir|%3Qx70;8DY}Za=YsmDTXu+LL1#w{RG&(V2f^}ukLK2K
zABM*C<{~brFnlx17o7cQnPKhp%qeZ4A8JTEsD|V;*j73n=hO&%tFE0^tOL*<u1{1b
zSi;U(|C&AT13gxsHfyx6#XU&C12fKR)uSHFZ3i}kcYL!?HvTf~AsKN62rS0#sbU9j
zMNxf{>?ic~_ogL`mT7`e*Cm>WmTrRTncye$C`FlI5~yG_Ou{q-a2$6*X%`$!yI~f|
z9+{P=T!`-x=v95L+GM3Aj=(z*WbsysFR*;-kGH&k9ZOjfs-VLC0GsVT51c{eCF2Gb
z#E;ohgOXNtO5p%QY4UUg_YCOOG;bn1ZhH{W5=V<A4$$D8>U_?Y3vhB`w@R*DEHxC_
zw09Bh+Put0Re&qTTL{vCe4#fI7v&+O4GMY(AoSnJy@YnnFCc=m^nIMMfp8Y+QH^^C
zOnX*c0T4#DS}6tw*TG4_X%|Z~=)t`;qoER7-k0NZ+t&&C+$8dd17CH1+x_zB=qm;3
z<%{JlkMY0Ave$zUw@=%2MW=r#x4S~$p#cCZCaA}4_(KgMWUHgDMnkPJV^KphxoHZg
zV6BLi5YO-5%EcOiqG+mCrmsYEm|7jjxzf0+Ct?<G62Cd8Gz?)yOJ$P>fhN}49*Rp0
zUn_ID7O5-*kU57yLl_@Y=M=y!fa;;(P#_}ShR8+YOPgMCZU`xPh=z}xd=Zvs1;C#m
z&mr<LbYXQ^sUVG81!`W#uanC-f6d;HyxuuH((ZO@8SNQ>Wm(b`JP21<?g8I~W&X&<
zWjiNdLEz_#@{>^c<IZVC@lmMw!Tw>#Sfs&dqetMXTN=gDi^Ef~tKhw}Q)%kc)Ph7$
zxGBM6VKJ0|z#4a*IX5D#@a=GQ6)Zs&a4HI;^_^RGQdJga>lYqjVSa{BzS~$9Q_V|r
z#f_$r2M~Ie2J%DiQ^N&76i}V4-rI3>087@WEJFE=(}F{stE7nE<g<of!8HLCKM2z#
zR0Ua@WE0%^A>rF)R3tQbILLs&If>xX;T?2JNhD;s)dLI0u|x(OR>D(sXtJm2giwhH
zZs)#Zx#@8q%(0a@kn(i!0BahOrKti@DE(LS!V<Yv?OCS;bng}jC?jUDff{RCq}w7}
z^@L395jC_?I^j0em7%b(kWkHA&L+r_d@yvwRX&>z2H!q3`ETu#>#h*i0zh9v_c#Wp
zm@b0xPvPyy#HfLfmi~<^*kFg|BAGyJVR&Zvdb>geIvv8f=9H}YmcyZSUSOqNa@8U_
z5aGyx9kk2lYA;Q}>cy)R^WFyeRD0gk37ug*8V)uJZb85s(H&+iS;hMyl%ZR?0K!m8
z$t~j+snH>seA|Aw!FkOG<7tuC;jWAtdK4)(BQN?&<`P`b0K~dFRc@kpL^j}`4J<xP
z>3$;m;~$wB0#0+%yBwQZm<aj1v?ebyB8Sa46!M@u%Hlp%1h|-vi^(WSZO66kI?cY9
zU0%j%zfo(*0U(4mleEF4Qp8ulsRvY-9smrGzDs@BybX}-4Htn-gmG=#Bl1<4JI>D6
zor9CsomTq}5Epbl8K8A5TGK@1cv9#mWcwy;PN{PHPHV%joG0k>AFS;m5sKJ@vnslS
z0=K3iI3{d#TPv9I0{oE9k^wjom>IuXUteFgdDY)r!4Oijx9!1+N`dVeign2gIDCkE
zS)to87a(6mEez%%^zIuv{|Cmy&)$fvLM9eI?`A{`M0%K8B^?x`Pq0z$i7e!E2D}nh
z^7uTl(YJFpXw+G#gMED`6xjYd!jNJT_mVU9ZIepsbgm^04?tse)xEI5$s?E^Y1D>e
z!r+bFf_!xiSW{fYY4nPbd6}MJBe@7~T%l&dL2y;6)HlnigHygvl5upNIWg(VKDGgP
zeOD-4u4z6iQ)7nA)igfoSvwm}?hw5+o#n<N4PH%$v_G!gfgAcIkk?^4O?=7}noLdX
z1bH!1J4r#_hvB&=t-K2QB;O3*K#+XA?uf@_>DXzizZq8gQ)4Sa#|{hz2tEY1Va^GH
zVpIh=5wJrYfu)Msp*6ZPKk+sF4kqaSv2V3`moK^N%XpYB)E^X7r|vX;T{9<%%?>M@
z-dzT>3FlF<+?a`y(H9yUcO!WRhUyqN^IQa995|n=<^81ps5Ue1j$HhT>m`eT996*b
zH%t-NB2DZy?=-(;P^C&j4e|}g$$5kpM4-gNwfv!mEP_Ha%`3fa;$t@QpcnkZzCv!a
zDOhs*3U-Tm1wZU7)DD|>_{+Z37Dwj2eqf6jI~G&MJh6pXTWE^#Z!VC_Y30teayhNs
znO5$MJ$J{Rmj;%X2bOyS%l(0wBZb~G$3ZVil!bp4V+5K_wLuT|A9r`2?`ykTNZnV>
z>*C^T*FG)b?>$y+9PT{pGzlll81$Dm-unQb8TOw5te?RC^ZsY|%l>~4Kl}7&`_G@^
z<Jf=FiZ`#K_Imr*v9<qfN3BmcTfg3X_-WbxlelbS1^O<wo{Bn`j6Kz9P-*NbtUaM~
z&)ReM=(sb_+;cqiY(2^K(RoDB@SbJf1335I-7ygkAirBZPv;?0O8?oV_u%T%HCC0%
zIyj)zQ1On;yX4tbr~N)yMy>QbySo);Zrn(w#A=Ouv)U0k#fSO9G_I>hM)p|K{?wXh
zFwzIy2<oR_SV^ciL{Vz(k!po>5yQ1d5bvRn0hSNU4?&>Ez2jt57X{VShFxeJ#<KQk
zwC<%&6muh2wz;#zkl7IWPD2C^j^5Ddxzx+gHUH{OJxfP75t(hkt}v6%qYDgUK`pL@
z16cURO~5Lsf^~m>6f_#=NV^<`O_9Df#aK^jVhQ-I-lV;YNtQy;{d%%~z8>|bC<`i~
zaCn}^qXz6;*kIyR4ePg?Ruf2RA?#I&e`y5DAxuKS>OjTEl8zArs{RnrOB>!<UN)Ij
z7SM=h2^C(jB2uT5P*1?U#3;xxZlU^1c#}J-v&NQfg1f@p=4UrWg37o6L#d%-rY|&d
zGp>la7q<-!VWDT8--Nx&sc43#J+mDLLY0lN4`tc>0A<eL)iJz<%{I*ea&kjyWrE@w
zUo+%U`v@DK_Wf3*H3AqBQ@wbk$J&LrYNM|?nj9svTlHgC5Fx;*0G%-vqqS|MFCYoQ
z-pE-+^?EptMp<515lLK;Se1p2+3Af?<1!T*DA3x}Rs<7k+Y6Vz!!FJpF%B+E)UP$!
zoK!oB-aogyh8}=+X@FVP<j5E4dc*0$6tsbXbFk^4Ud$E7G!;vz?-zN=1+C>MML@Ww
z@fd&9%LJC|*UjQZUzBKgv`O|J0fCOKl80$OV7KHSd*u9EX*Q$7Dve3us7GBF)Ly+)
z%U-wUU{8z;2hY^|W(3hkyu+f=&{rYOL4h4>RRt%-gET`!N<^P}how;1(H=M{UhhNL
zfy*HfIp+jbP*h)(XslqTUaYpjBc2H)V=`7-!)<^eP#$eZDa<aV%X1#qa=Hvbq9CO8
za&Ndy%3-mccq+B}3dEJoCh_E^QM0NNx0EH^lHka-7zqozunE6IbDTAmi%lejH&V1}
zaDFSW_HcG+1fm7g7DpbrGRAyXTeX9V65<A_E<<xw6~$;grlHWbA=H}%jIc%CUm-BS
zpZM(iyq$-^(A4<2#`<*nsg<r{^@ePtW|A2TFKNX9h;7aO1w3{YMVvySuHHz*_#UYp
zvOdgBI!piuSyZdZ*S5dieOa@FQYfv|+ciN#J<DhBEh*`u+HTDuv4I}(oSopX6s^-Q
z8dXCu<;3GzgR<q_SEZrWOMM}G_C-_!C1p(!lA5AMW;zPgM_trh4*OWuQTFL+kdkG8
z?_~dXoq)FvtXfwe!rt=H@<3CJm-?#)Ee=J(8X7VW%aAC;(l^x7OXy)l-JGdJ+TLmE
zJeBE~4%k5ObH$=V%GA-Yk5=BLvrHrNK(N)4ryh8Ct#)KO9I+t-?zWKQ&?((pv*E^<
z-86ZluR?`w$BK??2lPQ8pbbch=1|P016w!TR$RpJb6r?Q*i+9}R|VZTqcLLlFzD$e
zx(qfW6HIUTvSBTLfQ7eSmpCz1y0H~$J}vD{x}+5jS=9!8gj|^z5X$3j!>Vq(CRM_t
z%X~R&X2ZOTO;9)2DjsLWq08{To<_J8!M_TUdc8TyF}}3-XBZ!I`DEFK*^LavtOJ#_
zfrp(auJ$U4S{OMkl(&v%-t0r>eiY@<lyOcM(^40_Ul6rZZCSifTWPs1OFMY1LSdrM
zy1Tk$gSk%InKtdT?YQe0>`756lOh!*0{8MxkT<upw~Ng2V0qK|Jy3Io&Msngf-4Gl
zb|Y`^WY12cCK9SI0JsiKy1w=m3$XqH8S)+WT2PWSJ57MfV{-K40H?BIF3lb-Hyrkv
zbqba{F_)UdZaf}Z59UHx3Bwm{WlNh-2#^?1`H=~xjQQG`3}Zd2R_1?PKHm}ijL7z}
zP?;$4tSs!!=Jwoxj&er8vB_D<QJZ&~3K=}H<P<<eONk`K(UGwUFTF+=C1C_0$YI5S
zrKQuP&;t^5e_#$NLG(+GR@}AmvML?6(Bxnyt1i);G;Kd@ztabm=Qo#U*+`v9o$I7G
z#YKm>au`<@F)o=vv3KiWn*#5#www_7x^d?YYHHOt={MmP!`vR@qB-t0?ohoAi0?V>
zfn121&T(NQ{WiSX5NupkR)2KuI(%2P)MF)oUdGobJwpA47jI!aNwA7GLT6cgti4>Y
zIp|zA!m&qBPIq>#{V^jql!e?$@g%;?SMldC?<(OM{G{(jU+)}4Ah$1fPSl?UPSR`K
zZ}8))HV!+TJ!(ammC<KTw`_r_rv|+m=NTT6@lkY(S#E6GSrT9aLuEEZ8zNdh6vZHU
zvW>OYOC2`<xO4jA*a>>eI#6fb;np=Xc%wk}v@4&};!`X>RbaIRLHPK9a7spXC+fAE
zx<RIxHS|L#wE|OnC#yyGbZ7sd{FLV7KI0g(mRT@R;w-Zb3qbgk{iekM>N-a0<5LFN
zjt7wVJWe4Je=3YHN_OQqjGf8(GYk*z?Fth0Az&E9P{i28&p>y43ER?vn|-3EjDd_d
zd72ZRTsfdR6nn85etx{^?0AT87cThKrUTUdldtL%V7$<t9=}_X@;ZVnW}k;QqQkRP
z#x0TflPeONDC$}PI}i`Yd~1PJ%HH;D@i!=<O&7C?+LPlfACe6XXHJz1TL6PWku&<y
zE7c@309er7rTT(s4916;%1Lb|WBsX4`{-4gOp8f8T9#cjs6nO#OfX@0SzS6_RVnO4
zT1``gA67<ib{G$fC_s;meNC>dXghK?ofY%q$Rx?wabBF+s~R1dnt#$*RimG)v;G-3
zdeRUtH7><k%3}l;!Meu{PpX0F=90@li$wO0p%80&_QkII0>>ry8V=&D8QCc5<3?kC
zjULw64b`Y-;2|J+)%dTSal+XxM`S{hf7Rd-oyo1VVDEWl_xYmzAG^{InhGa`@x9g7
z>e-ffDOd_DqnHZ(>#-HG3iOL*P$w;WlCGy1kx*@;IMPAq=nBjcwOr)yOXP<h)Umha
zl%~;sEKi=kJ{bAX;N&xeR((Dwobg*RZl*x@*095ne}1Qo?kEI6`$(%aP2pV59Ir>4
zHbt-EWhtxKhED_gh=@pUwOv{UZX38Vlxu7{uxdV{w`#eEzk|F(Vie^pOd>7i(azrE
zqoV_fj=a;f&p<S9kPwc{P5e9y`?*t0Rs4g4=P@8C1V&Y>3xCwFGZ`<*gFg8A*nsiq
z^b8B2(DBvT^1@?L(0uXy>z#v5@A-*-UIL8X@P<WPte2+;M~{Qu@QYGEASSXQ=w0aV
z^|xm)7b9=j?!l8%lZMo<wmcGp5&5_Ag#hznUHQqRB%E|!?HI1Eq21z5rgI_X3$M}X
zlcVE<qod~`Bz?4PT)IprSqhsHg0LbJQcN;?z1MJZExAx>uj=vUV~n|{j&=^_Dr;$g
zJpzEWOH?5q43vl)0f&hZl;bmSHGxfnH#3V)TF<%s`1x_iJTA@QzF1lCsLB+BG|8st
z7lMp%Q%+{?nMa7$qfIfP4eWW4nkhkg4q$o{Px|<b)5{{=dPR)T@)sfCeT+HMjyq3{
zi0d9r+ssBu0-%bmDw<#t*@D97R)oh&CIN}Xqef?1=i?uw7S?A@VlsQs^t5&f*dHY*
zth@e2wvS#Z5lE@Gx+m&^*-@}lqqFMKz^jMdTMKP}z~(u)%%qkO`c}xy0-)r1G>p#X
z!03!vkeQ&LLkc}Xb4I(-YINqohO_NNlsagk9(NCpPF@^${LQ5fjArz`&(TW$aV+{)
zrI}S4E5c95jb9fw1Qx91<WM^Ko}9tHhh3#gt8Z2?p^p(hTCVgV7!1|Z_b(kDOUo85
z<~#IJ3Os{-`t0cIP7q;Blz?m>z!Y7bd0)6pByD{hyvSm`oS+&nS>{9y<2;%6vo#^R
zEq=(5il}_VROyoTPv}cS(JY65jpl2tB<gBgDh-me5=~fy4%~iw7~M%J2dFjk)T<9v
z;U!A^znEfH5$w+S0d&}Tpaug9+vx4P=~B@T(o<LULMj>8oJngR2t<WUkEW4~^C(rA
zG`%J(UfsNt?+ca(R4F}J^T^@PfIVa7O0V(Kja!$K^1M_CVD6in*1o7!4(%K*J?2{(
z^94@t^*GDtX6P=PB%7%UyFR-32-*-E`z;_>z6F`pNmLs1db$yMv{Gs5HEx=@LGXgH
z^l#(wyM|o>n<?_9;d-hUi!{)n?LfN}PHwOWUK}Lm;y}2ZYuz^<y=LppRH24s1Mj>z
z_q7tl(T%dRcobn?1>e(6TrfG9dF}`f8n_N#o=e)U0Y!b)sz@e~c7M=89hH9R>xsx`
z54Z^u-_A&Ui<iqxz~_oP5x8uvvw2JCd*m}6f64?Dz}dn%cuTPm!vOo!d+jN-*mL!!
zydE0LuQl4f4geU#t5(AIX+Q>rK}<tn)G@9q2cnkQ+;V)Ot)IlhZ>KNe?j0$RKThpE
zwy3!IBY^4>Y^=+$THqMN>uG&+JIxa%#%QEqyMStf`>uW+2#XS715_3kw`j>MjG>7m
zRos*D>mW-;c|h37KoxKy@I5_%M%NX(tDn>Kb(*~~3hbegOZ=+j4H6*W%mDa=`=y?Z
zL)&!H=N+<(3cb_Pmc6qJmSW-8nR$7y3pyjB&iO}b<?^$ShJyv#ePrkGWIuWn-vB)#
ziTBM#0$$CK%nV}}OvE(;<Sf(4Tg6q<Fb7T)P5DFka{4tHUS@<XWEL^DcM8$AvFF^1
zfX7E<$rKAb)@EF=1aukMa4yK)Fg7|j$Wx3KkItQ8%Mddn7p1l0FkrK)O+Vx-HfcM>
z-Y8~UfiZ_N!W)O(0vCIT3!y<(M?30fl&O>Qi)!Y@MFy^84Ei%`&kq4D*{rC#H9ZRe
zCydBMf_U1UOj8r$vKAL$Y>gS_KFQ(#+FM<HsmJgD$z&topba(?&@>?`+RZJwQMhOJ
zWgEvx&s5)CTXN72t}dfi%Y18FE>AEEV~AmaBH$PUo61{wuNc1;7zKld9%?*}RQ*>g
z4H8psFMxsLR_O_knSTRt^pdHDzU~$o2Ooi|cj0xzShygF$8DIHc8|l@EjlZ^B9(6@
znGQS=m={EuR%O9gEW#<M(@1S{3O4;#3M$#8pG@9sg3eZIRqZ9U2&K(bv@1)uEy*rg
z-?m=@Xo|M_vH+?>Uhf#9fV{~J7D6cJqIC-#){T6^xm`b@7Sw<3Mwwzs1KqgapJ&T<
znV(l#-}lVHTM}o~s>4|c2b?wIGI6=A5%Ejbh4uRiZAQsv*l{p2`S`4$BaAV(G>EJP
zGj!9`jF{*6V$9J?*38^UAn?a0{Y?TZH4L3MBLL0TlAl}sDY^Kom%*q)kYQl$kt%{l
zdeZjI#`Z`f!g92El+1*ICD9t)3S8~beLj(Sq}u#a$Z#J!)^YlM0|vd<1y%MN9YLUT
ze60R&ZIi7Rgtk$Wo)1>kh$rV$%&no_w8~YXN;5Kp<IL^(g~u?JtluIUrVeXm8f)9Q
zb7*-oEUc|zaAL<V4ojp{@2puHVQ^VAqxJQ5TF0xni<h!$#z-sGZ}7)2>hPc$slsF*
zPaBLwdk|_}3EaX)p$d_G)k>1~u?>3+XmrxH-+yV(`@fFQy!a0vA_4TA{Lk%;2d#4c
zuLnQJfA}dr<@gU582{luMSs|MaIgIk^FKe>Y;BaIKkQ7ehofOUxe+exs3`HmLV)?%
zbhKb}2$L9^!aH2}@g6RgmV!|ftnndv|AV4z+_+Q69PsMsYl0ONgafLN+3c`^l-EfY
zj0fTX?G@|w`k-N*S-?8Yc>tDC5ZO&MQ1T+bQ)ky~?QrgUST~lI0yz?IAqUM<pSmAc
zXkv*p)c@^x^>7=vV5M(2i!xstNVRz@PWN4)Ske7Eo`>NkDwv?)bZ6W^RF@AM*lzut
zX7hiI&y4dw`yj!eKAIc<>A|P1&;0Yh)oT5G{{Ivo=lst&_|yGg!Ri0$J@`MK{`WuK
zY&|HS{wJt81oZ?+wGj~zaK*|7Ah+H=7F1Gve>r}~#Gl#i<3PP@h^KS^!DZqHW4c8Y
zsBt{WlgW=78fu#MrvTVMyeRSD55tTjNWH%sQwPqiwMo)b@~q?z-`96(iHuqSgFtQs
zb9>N=p^X&<cFsw~4XDWOe(AZwD$ZU~db~28Bv-?XTnW*&Pd!yFMQB`hm5t(Jh#@zO
z%OOQ5$8#MIThPmI2|0KVJeBdiLV{3;9QBUw`-y$ZM*TwTul0p27jfJ(Snz(<d1mji
zR8MqAO1c4R3WekoaMu<gKUFoTd?HLcy!$A(8}<Kp>83`28Tz`H+JfDl{Pys4=bO#a
z^WztX&Ty<gL=UE<N}&Ph5XTVlid0?^6f<{wflE1VX`7oarT@W&W>rxabwynYnNpD^
zgB8>er;G}N1skgW>FR|-vsmA?wW#yW>G4h%z1K`s3|4tTi7rJK0*>z4&Npybbz*{L
zq3Y{RoTDR=+Ixdh_T~$z{~M;$Jdv@5Pz6~IFT^TIEUh3AeeQS2R`$^=MP0Jxa%ZeK
zQt%y(vfl1KE007IR_o_Mc1C<D+JppL8o6|8-C8nHzO-_cucv4&o^*SoEY~+Oc>BUi
zFL-QYkB@=*Rdl6CzQwswyE~g3nxXNC=4b@zF5Q>1n~Qn^P<X=u$@m7Wgh4j!nAJ&c
z*eBWK?=HvYO6#pdb5K7wgWC9dQ*2Aq7x4%Ykz9DWCLsf^-07FcN58R(QEFprsT4Wl
zK(u0`rs<Jb?0Tvuy!L1ur^BALI<e~yJ-L+vPPp(9?U<)TTas%9)y_Bjr`;zz`v)(M
zI|Aug5ZZ%G4@y)6%{Hd~^r841S7Oj4^jw+t8&!wN2yG`v->(aId3vBv8Nx~pJL9CG
z=p`fs5i~QI5YD+Pf0ufo#W?;g#=IYWPtt3BWzfK+5fnqYQN|lF4xMBGQ4k1SsBfJ}
zPtON&?tKmB+{h-1BKN|Z-Do&QeSBZOK7k27-9181OD)TIOVaMTIS*_DtA@^+D{M4j
zRZl?-MiY{)NIl|^T=;!k{j>JyymzslCf5aBMxFPv_Vh|sR#<lhow*O@^y$+q@XY_*
z1iI@Dt?4UYr&CypdGm>EY$Yy_-{)0eGGko%XH<CWP}lmwoE}^P#pggJVORK%KArLk
z)hvFr?F@umGvg5+m)p839#gCG@bs>T-}3}kEj`oIxKcRB`O~>#(`lk<#-}k^??>Cq
zwkacDb=kmO|6b+U(N(J5FU<Q8+$(^+yFVAwc0;Mg0;g%^q`3@Do0yWOZrWNOnOQU2
zVis#loZp58!67gbxhJ|hkGtgn7NX%b&7@f%oU0SD8r|%HnDXwke#LCTJ%#v3xKzVD
zN>cDqk;#Z$oW@joD^4^1-E+BugAc11PED{wc5PrP{$e^OdL>(k;bxgN<NOllKD5NL
z&Ah^N6Ucgu9nG8uArAN%BeUnZcO_3trpHz@`~{yztE+rx?k+a4TcJ?2$N~Xd*EF}^
zmNS>xs!SACk)`VHU59hiWO-an`oqDXOQOVf1R;jylG^Yjwq$SE4Hss@Zf|Fu#5I^K
z0mlyv8T>U*-55*o$HJX!keNPYxC5&;Fx6+MtLi4sC&>*uT+9~Opi!WFX+RL4LB8Cf
zxsnzU9Bo_kMG9IfN*1R<0FDIvha9SdB)1d;`dkjv;pOy_vku`F;odFSY<!+orzHzb
zOZ#;dvD=Z@+ORv4M|V@$;-xqx#^acmaVZa&$ClPt5N9|qkyu}+l(b-Sa4k5f)>e7`
zzR?0<niESXP|C)969k785^?|gsai<#4JieibNvqD9>_}~?WI1R)4}i>tD{-3iMIl;
zIj-DA5uXYBJn9?Jr5UNZ6o!z4no%!G1l6r>DKfxaFR@0ziw~rjs4cijj5wxWopgfF
zp6{HpBTa*M`gl(4mLCuez&NN_C(9spOs(a`jhY12a^&k&J%jj1G~_igWHj(Z3oy`I
zDQ0pK8&i*5B9b=NpA{j-V9ze?r>DCHr5La>W*-bnSa@K{%;=SBciGKOC*$)$9g4@t
z)+I%0%xb<_s2Q!IX{T(mA*1)f@D%c_I*~sSYO9f^6FRa6dFv;rP(n-e=vBHb%wkeE
zJ|LJWnI1ygskGK;uoWhZ26}DqHsJd%Vek(~7$Mpw=v8Q<ahPZyI1nl);)K!CODjGq
z;+pkX9R(W9ayBQ~x<V4F?pAcx$RL-H8Up4*kYfu6v8o{~cZ_`VcFCBM(ZU)4*ns>1
zU(uN#auGViA|(np%oPVxBy~UyB{ES%4gZ8EeNBlh6_Xo~PfnkO@1xNWN|+~V5u&)%
zCWnv_=<@7_6*m-`{`46dgEuS%LNU^w+fZ!cAKS(vtZWZfTsDNkqGO{;JyKR|tgYaD
z1hIbLC_x=F9xOJ|UR*@4pwhBf__4s5v0|z)bh9F{YYlhZ!BL3)d^{7d3R^dvsJ0~2
z+6p}OAXgm+lE`%eK(oVhJ2N$P%}ks}<P5>qc&OYkmT77q*~9}<(LiCSF@L$f$x&lh
z+yi8B`c9RrGiO2a8p#A0tr6K{D7A^@@B+Ml5l=`wf&dqos?pa*T9#E&1!gQ84XGM}
zU^*rMZ3yL9nqVh<)=P@$!U1dwBMw^;D)8}|o3t1uvqfG(vmq=>ikKGw_E);<vRo5F
zrkQx%gA|5$o!EqHk48pjt4_ax^Mb&_6m2#TZeKwZ&1@mufXp=JYj*U0%pvFwYj9mp
zKGn;(lC2yELq*NTeZxL~ERS9hRFPRCq2gvLj_s~SCYCA7K5!m9ia6Z0WP_}um|@TY
zr5r^jN?$k-<_LUCPi8-u>5{xS9ZN(Y*X$s9>@K^<v;&(l`qlR#8BX3%J0BDn%<k6S
zFK?n(37q%KF2yhrERDL#My$6ADWU$d2;;~J7RC}cO2^cELBXOw`yc6OVDY2?$r>GR
z<gl#=l?{BQ9&5S*dJ+D*Wf?K82SQ?x(U6RPO<p*0lFd;r2T9Y`RisRAGK%;)>9r2t
zPEp4%CD}&-NO2<3@|fsTJc7)tH+aG%z@a34@AgNF<yz7MSroczM#BHw_Ga9_NYO<d
zIe5cI#q-@`)tr0vK<3{A@~pLa4V$h-bBNO5#`&NU>U*O1ECLlocvII9q1y_`bC7-}
zw$4GTTOve2mQF!SxB?mva{hzsp58j#cQl+>D=c-%bEPD4v&v6rvbX`U!VTwOaqPGI
zorAqCL4f5{6r*0UqfZS|+eUUR9S=y`(8Pp{MoY3bvl$=+93#AGhYEh8e1wa_jCM+D
zo5jdgF3WM})U1lkqr+@c@N{Pwaw1!;r_jU?xK!g}fGQ23bLQ67PpvZ(X;`CWMkoY`
z((akKK2T=q7KArFo=|vkXyZ)`q^?QY4xgM<Zw8})6FuNjZ84y<giAJXGkVA3EOW8r
z%}pL~#bpVyl@~hF6vC8-&h_OkK9F}uc;}%VJLOHGjj7|Dg0_n01)W;DAXe1!wI(L$
zdPU@ZJOW#BA?2#3X~0UrMK2$d37Vnzxj7#p15{c3Rh^LRYpS4P$Y7|dWwQ*+gA^<3
z+Y6&Y+p<VjXGpF&p-^bv8wv>q2GmZl6zj$drch`%C-V5zcOeU}+ER`6=oAvT2W2KW
z;M8)WWg4^sC9P5hm}`tW%DY?v0gdk{zHA{{#mc|ANKzfysEKiupom_aa$|<aQA2>o
znQ9%d4%#xq)flLHxEFa^`nj^yv6Q7?H=$&vEh-*u+lvHk`XUb@V|h_3XDNzz<FFfr
z?i@tGD!2Q(+b(3Xai2VTbidJXPQBorim+0$7c&4^8V$X1bBqa*)XLo!U~1097>N)g
zLHdmTs2rMz6WN!2zwE4u?v#{`0n43fIS_$sH6cjs&g7g0l{!8(rVF!tB!y{-aQZ`}
z1TvCM6>cVSo|eC1wSm4q)RY8<VRE$z9-#zmT^L>OocKo{8@M}%e}Fwj5TP$3c*z){
z37L?<pq<%5m&lL^ImEFuVd2%ucSqg6>SdRgpa#H>1gk?@$6<aEVZ?yRbPOcRhLBMw
z$SV$*u<RVldW0f4!b%;ONO1^IYzQ~zf)RYpXW<rfWCp`x*;TTfm|i7L^#^+UQBr`q
zVSRmFhV(cP?6DE6Q1zJ_!xX&VQ@wy5=2C63p=!&Iw<yGO!%ilB_m*fg0udV&lL|Yh
zr28m^>6u}<#$K4tmYsFk)+lASp{?1S>yBdllzs5%p?IdC2kgkImF@5h+6XBgOMJaf
zI%!Ni!>K~TWW^{uLODS^rr#wTAIq)e9v-&DhP#y=0OFy+7lS;wzLJA2{Rtf)l%hi{
z(yiK0vve(==3tkYlsaPc7<Q*>OQPjC)xw(}qsVc|iZL)`rpi4zDX6`nE+H#9=B}m?
zD#D6CrZ-BlVWG){2<K<$PuNb7O+48lI-Y<o6Z8yGoJX$!(942S&N9e!u0efySQ2OA
z{`5%9sAeIpu!t)mEK&0izB+1Rcge64u9z-VjmU->(P&!cX+&TH8cy7sWO)uc;F$El
z_jcFtxIcsFGV$c5rnz0`W(pQnO9`y#Lj=$|k5L9;V-v70F=BxMq~2w-0J+xkWwQ{I
z$TpbB?=VAA_Sv&?aW?9AkuKRs$sj~1rYU4MR$B@awLv{=xoZLKD)FIlWK7_Y0{sr#
zaqxm65@R8AbI+}r-{tnKy|3Myyd3sbGFWI=5|pO1wxNlQkoC}vr0<19V9WQiB8mZP
zH8sMbnjIN#VNgAL2kZ9q4z?>}mq~1IJ6c*3TBefH%sbCKLDs$AFa@LyhP$#<q}rDI
zt-pw3wJXR8%Z8Ky2v`VfnasXIOV-8Z<T*a#b?wJRi~;HfT`J0?@^|}3(aIm7zh~qn
zgU&J>-j*JagsI38CI>@-4~`&x?^{lb3r;VR``2C0=Kqb62;bxsh|}JMnKw7O?g2T$
ze_=!hom4_~{X0c4v)A#3Iw-(|;t!gR`i2q(B(kd82*)S;PY-uaUmSP7-FOL?imJ+s
zE_qHxoAB$mJi!LvFa6=RUd!GG!WvQ_lrblkGgoi8u@pOX!21O)b_Nt;w;Az;`#Ink
zrwSTTI^^w$;AylcU?mWJZt4nq4#o8s!*~QbYqLvD^gXSS#%A$p{_XIk7#KcdK!($A
z^+shL(53SltHWqRDBCO{o@0Ek5n-%xz*6?{`XAJI|FEULa3nCD%^7h7rcaoU23q5F
z_z~cG#zwH<)rZ2(pvhk;UJQ0Lm?TNKqrlex$^AcP`u~22;2$5&jsJ1~;e&@||KIk{
z{=YxP$MgTC;2)oH@Q+{JYd?rupKi7uZa(<+kL3PqgMDO9q>s!G^AYr@%>!<-#*Ni9
zR=Uzl8+X2A=BQ4TrQw?2uSMcH--^}K#tMWHX}~>SHmI{%KUt<kp2;~f@`@GuPOE?B
z7^H+P!pnXL5Sc+5$7tFb{ZO7IDD|{O*4A5FP13G$<IWuegZjAP&YYYJWONhB45knw
zMVnbQN|3}1-=GI|I!4}XcCSW2_WH%DDOR-_LZ@Hr8NfX+vC0kfHK=iOjCvIQ=`Kip
zcjwN=9dk4SzZH{46cY$ZMXFbI_s*RbRO}DkD!Ww`P%669hB{aVi)hu6_Hzc~G1yC%
z{WEUVO=j075Fqp>dL=~wWci>jY%65G>MPI5_@jz5+gd8e2YL4cIuyy|b_V)^a3!}l
z#i}00!Z#4%alEs9TJ>>6!LryI9>t<Jm|-w1<RCP&YPDz0%-VCDa<)RzkQVT64Z`Tw
zew`J)zmq?|4WaYb97Cs?|HIqG4-x@pHviXZZETd{zdUGv`ZNFcQ+y=<M=OpTV5=Py
z57=toYqyaH{PpI;PZtXSr`})2>2N$9!7jmop>Q1KbhE+=pxXzBDf;R_bA!G>pSKVD
z@&O~d82(dzj1EJ~$h$n(Fp(T3m+Ba2Ul{F-Y1ANE;bERM$rJMuX)kKY6phtA)Ty~f
z!|FQJIZ6sUHns0@oYqsIZKwN3l)JYFW>mv`SGyMB?<57E=EVF?jaooz>A6cG$g=Hr
z2@VH8Ivfr@031dPhYj=Fg~Mn*9N4CWo`9`WPpD7m=}Y19<bv(RSaH%8Xjm)c@X6(-
zSEQkMrf=QwdG)-fS9;=@umKBBugHD<E_|7;<K$SOW9(qCj9lgERe8K>_w@q<)+gdf
z@ptSaM)^8)3CthDS|sbqzcR*92M5wC-%fnIC4nHo4%OIkA1<`eQzBJUFS6+sylkLv
z{-bR<9N*vS3R(cY9798x1K`_jTbu6AF*1Kl_r>`*BPBQEiMVE`=+1C=RX?|D0?A;t
zp~kSlJ47d`6xr&zE;A6~R$CGP%J-yKrp=3FO%4@%iQohsV{%<+opcrc*i?EjwN33S
z7Nf-~q%Fj*04s`uuXqTfG(y3J9U7P+8q(m;9dtto@+|>}<e|hMqoEQ^;Q;V##-Sow
zF>b5ncY<aN3te0tGh@tnAYHQvlf)L#!<ep*Fcby==3M=}0&TIjBt^Gx*gxF-D|)?5
zA*alUpbZ|CX<}VJ-0})JT@u=sE16dUDXSWRqJZXdHgZhxKD2G6#(tW@EP3OaEmaC!
z^xi|50SNn3W3@=OQw?{&E2j(BHT(%`V1v}jn=))t!qJainkY9ZkR-E71ppDdN>jj8
z?soXN-(WZxr$twQ2PQcVn+Mv_(?!}my6O<bY9edxat&#9XeLqxLo{WvF!i)VJ1cKA
z*SUF^pN&9olr=QYl;Ldd+wADJ&F&8%2o#g(Q6jX`3Qr)yOz=Z-$JpCnWqwR{rl`~x
zb7)5P#Kg*>GuF5Rgy<he@RFuhbeNY1jwH$^Rf223^WG%O3Kt~S?wqgOG>d_pd5Fc}
zas%&#z{k}b#y~R|&ySBzkI2<<?a^z&@C-Nyx#qIe?{WF{SiHsnd!-WmbVEGSF`2!`
zf@9N<;TlZ*6eUD2#sy21w7%H(nRFu(kHu)bp+gjvcp{s%Pef5@fF0LmQN?tI-%u)s
zGH*Eu(ZayG8@K*}q5eduFli88f6-zz<r*|){wR$Y<$7aNX>9tbF8$h+e(i+L2^Q9X
zZu)qD(#4E=1oWo2EKPl{c#!qJ=9mq^`WkDRKBB21pJ13ye~MVK5n7H4>B!1J!fu7o
ztggj2xTbdGKv!OynNi3UoLm9N9lDZ*(cq9|EuI4@4i2;rN4i#AP&Px8#~QO;gIN9w
z{#`~Feyt5B7gw}DKjx&mcm}bpCGwtV<sg;IBR|!m7w3Aw8f19gr9cZ!&g|&f9yr(I
zpL<&q?1Bx3d^>!(j>g510GhH63r~BL3m`MJTOmpN*rjG0EJW1oucTZc$7<88qFt+a
zLl${vDQ&hfh<D(2t^OKIf|+UN3MZ@BUs?_I^XD)0nWO*xAQk}g@_)3-`9B`q|M~v^
zC;620zhnXM;N8=Id_e85u?;{y?}exLt+Wpi7tW53)JX-xm-xGU%r+qE+;`QdWvL=_
zCM$K-?pn*e=5{oap<WN(uUExe$bQA0)dC#8yeWG>mG#V)Zl&~<EiIr2tt!5d8ZvY(
zxqy@%t~Q^YuC6zq@2jpmN1Y)n-im`VSKtm4wYZrhb6aSn@^k)>e*>TD^Z)z<-Tuxy
z{~vtT`mCJ)W8>k^=l@Ufk>~%pzWp`%KOUk1;DgQk4>mUfm%mTr$r;4f-_1rN3=O;J
zu|6x2$N4+l=>F7+JVIuNx6ICAXZ&>c<h1h~vS;3DZL}Xu<%{2RI?tc&d~@f)hW~W;
z=;TzD7muIpAMPBeR`|_^=mO#pz`aa<$KG51L;Y-6z>E6hgPq;49`Bzv{`i|O_fI?O
z+lgdnF5}mH2X)@OCd0|7UcYWoP;7JEV_Po0ylV&0i2mqa49TAGS^FH+EUF`n1K(DI
z%>4$N5e{@ijg-H(VECpTR5ZKosAkHon28JC4ObBg)N^+TxvE^`S969Sj5Bi##-RAN
zetp`wa|dibaTL>rz9ef#dd>En@xxoE@~Eq)P+i&f{8i_-zv=9JWe#P%&ivfz>g%0@
z7adVrmo?A1ZD(xke$a%p;1OpXOY>n~Bx&!ap0U|0sp5M?8(<%>>R$%|JnvCE8Qg-R
zQP~YNP8&|OF5YiNZ`~1?LJ*;Ydvfndiw0We-nkQKITD4iX}kPM0ltR$MK<ay<Wz`$
zzV_(pu6YK^H}ym<<?vFGfO~42HKG-`$~*6k<7u8WN-ptmU6G`Pl9B3%m@XzQU9dqM
zxO6zGpM!=!W$T49_|9J^H)Pj}>N_=5%$&@RS^2)#+1XPIt;6Dg+oXEGrSDDXuDI;D
z@4`q;(!D}z%A20j_zmoFeLr^YU-;HZ?`yh0&}nWm+K)w1N_2C2a(cXf_|)cnu^#oM
zv@xeIPCCbXJEuFgG)oqjcsUEP`Blei<0NW2@J1`zU`TC!EkzKUq6-y-y+{?`KfxmI
zJ^rN{t&2{Vg}Lr=U)Zjb)LseAoC;i}+j&T156&@=IeqD^=-oQmtIX}tRVGS1uB|};
z6nJ@Q?nf+0u#|6d5T1@UvavIQS@cE-livDy4=<|l0v!fm)`fn;m7;!Boi*t6bm#Fw
z$L-+)JNQ7&e|fC-l-qvsAv?hPGPnKldpEBLT09*Un{uCSut%c5{Q;4R%V}xX)2<XL
zHfSiSC~Oi<q^5fF_A`5B3iq})Ylg*G%SwQQDtma}fGN8^)l`$CWKehkGM?^Agez0@
zsn&SwEAA;=F5AJ1nd|sN>`G1>zPN}%F9A08bnwPH><%u$D{cmD>oI0%L2OJ8!7LTD
zsFi@OLk)GF<rB9D!%_UFzSWcVP;91h8LJl272ewN*kW*(EbjR0@Ea{=8v2S~UR!)@
zs5X>SY}p@asOqoeT!?~U5p$Q0!+}R)f!TB>T`r=t43bb$q-^!=(z#Q|IAV%ZEbvN6
zv@WPKM&*6Fi(x<Hup^H#l4FwtC@-TyozT$5rV)W!E-_#Sg~Q3!K%L;Jw83b(R=05h
z5dqvG%^x(EAph3DsO&ZWD|o%EV=g6WA0x9Etd#ftw7wSgEf}daRT9!!T#kzy_XH3%
zywUIj89f|A3-yMR-gKnIXSaLDcp@q{WjiX*HwwPh{a24wzj_<G_u{201w|<)u{zHb
zBZb^Tndi}g>I32J-zajc_$s|w^&_&y&_<+A9O_F>rG){s1-8?!a;cf~9x7du#ltyo
z9j^#(m}f_O9m6<cdBuwXXGtOrK5B?dNy-!#<FK)P8@$iV4g9Tp7n3?ge4!?q(emqM
zOH#H>6+QQgN>`;yFi_o>B0HuHF-Riy_)6gFg|RZcyB+<5mTQz`X`~htgdkDa3G!R0
z@*f?cRgdKJ&m$oyMS*}t@>91nR}~$p$!zZn_auiJTb9N^ST`6Zc$;B_wx_$85ZaEI
z>j(p@3!Wbo%QFnk&t{PE7z`mN;Jp?w0&-!l@I%0y_ex8n(8qE;XuZ@3F6gctZ6SE+
zO&~peJ~({oT~z~1e>;3>0wQ4W4Ao4ka04c@<TS(Gv9tt0qjJqiq!F>QlaPTLI<}7%
zg8;9B(iP3I^vZA;Mry04u2~<_%?Mr%t)ILf8`K!RnGUq*CK>dPc_A7u#B|wGQC<wU
zFpoTV-yhms(t2YDV}edz6LSw9s%Sf_B#yJB2hyw}4~p>u2JJ#2mXZc&l@y{ub#u1|
zJ5@=<5KAV(ARl-_^eIY(WivIo<qMM%xphsDEV%`iL7O-=q=v>mwMHG=(xl_Hh<AX2
zgg6(3SvVI}!TLy}X`nSN3TYD%+pIRigDaI>nj#8QA!wLa)SZGXpf^aM_i?$~G|4e2
z2*Aznb}agH4;TG%Mqg}DQtlD2h1QHcOK83UW0c^uD~wi%M-SqSxiBkXjtCz@$m7l!
z!dReNi#Z?Z3B{<V!E0=D;X&n6Z{-a*;9&7%X81@&O>ij*cR@5n?}B<z^bO&4vaREM
zkQF0u`tn>=iAH!Xqj#B$-?)hfQXx)SCv?E2ilD}q@wMIOJ&c28w8&K{q`V9|uX;nY
zDx2z%v}ht%YDx7Za{cLW^$;&owLxA6P9qB>RIARQ#>x;KlN#)-ifr1uur3X`?dHLX
zp7`f7m7O}5+bfTEPWE@ZyZc?Z7;xU3h+mc2Ebg@%Ivza|<>5JJuQP1LLg_K|;8rQ_
zfF5%$hir^r@7`sMX|L32>=?8FhrcSK7&N?!<=F&7A-wmLOsh0}FGQk4XV^WtL}dgT
zk7O{@OuZUj0)YHb(C$%P)JN=?HpHAXCJdd;3OXuf1s#>Mf=Uu$gSL+XLEF)gP<3V!
z2Q;{Ekrcoj0a;`l*@`k%iANY^I@f?RpUj?<SbQ6yU<*qxGAip4hWZEr=NOdgH9%J*
zRB{pZX-2TGV9O0LrXA`a9sAK&zn{iwF)VJDO(Xqv!GessAgu#;9G|N-M4C5G;gz|%
zH%H~o>TH~tt2|v=NWtxCEw!x4irx#M=e6oSBS}c!(2-(MG-R(b5^EK2=7~>{ydcxc
z-T-$%h`-lKG6vYX`feSfh^>!M9#!<fwSkIO9I+r;oh>qP<wHzLz2eIOi|CNWanImF
zjdB@YboRO+^SB8*);!(3!yx!3)}ve4SbIj+qq3Fte0{SZJB3D%B8(qJ2|<dBvKm?8
z|1k9`<1<I0?4XDTJ0hkEa>a!YIbK~e=peelsO-@(2VVrvn5?q84La`@Qmc#1L0ZFJ
z2H>~^KPj`ojK>udCg&JCS?L*}MmrXsD~s(9?I>X@j~A?I;XKw3H>=S?HNj`XRx@5K
zi*?IB6QVvF)Gs({<2PYjFubZ*;EIb4y&M}Qo|M(=hVo<7lpx{fl12s3ItfM(C3%Cg
z*EvDhvz7b4lqcCKraikZL=67~qF27TNKii>!@Vp-`zO({2a$ZNDhO^rpcU57ksV2N
zn5AptMwrh=c{fK|3aXD)@lb`r`FcbUhH$MH3ac@kF2Q%X32LNrD@B&A!wC<KkXE02
z+=P>dm2*5GxVzz)#dwy0>VFH_0|;>os#<7;6a+>c-n3<b30Dxwo6*^{K*m`;py7#A
z93`b(L#ghnSjp>0y+@_W4_cAs8zD3tT+w<UR+GYOA{jzloy2cA>NQy-5F<*!1gKSj
z5tq&p3^aP0-vMI?9V8t`rD4Z+>o6Hs-8uFp){?^Erbz#37Racr40aG^_=*~=#!7L^
z3^C8ko5Hw&mKYa(nBr0dRfbZ1$5t^H)~v-*q6Q+y2dW5#t<>(#Y1`f_m6eY;GmTbo
zX(ZH`_8Nk1Gzc5(3jH>i^`brfM(r>Ie1`!mamP}{=y;;aD~+JyG(7ql%2SbiQ0hJb
zr^q!ZU9(Eg8*kWRx(W~51yzOw5_EH@U!Ln18;yp9shqaaU6v>B#p<7>k44iOL})Js
zt%TdiXP(Pi3oxq=1b8ahy)3}mGw0!2i0k{#F_92)VIN|3eJgQY8yVfI>TEnx_H{O<
zBULq77#TqxUG1%?#gNK60X~&?wP8_F9}k%2Jb8-wyX<YYK}^*|2m7bzdKATl7PR0q
z!;-=`8lsLAr7jfLohR1A&i8H1$isrq0PHhIa=JjLW$UAg*5wuP%(my*Zdh}*HwwAl
zK=N3?YYME0&-Bmcvz>3c2QQv=o(aP=VOd}bSEKz3W_Lj08Iv*lGP1sXt+sD~g8;8!
zAsf~<F%mK^NVUNNU=DW5S(=3Xg1uEPOrm>6Ng}~GHP40#(r(A7jKh2aHe0n1$LKEO
z9or_@FbMW|5kue$#s4$12DH&#GiRGXv=rmT4UnMC=8Q##KEeE+!1nVSvilTf2Ew)m
zThQh;uhHxe-$iwF*2Ro)H$4#M-_<lCnZO2MvxLxm0@JZbux$)YPs%fyVGf~J9$HXr
zIRra6?={4gHfPKR2P259pcWh+!m9eV4pg_?6Q{q%ge}yVsmDhI>P8X320ntL8<!P}
zsP{T4>%!+52AN#GC?=z}8bzdwIKQx3<a0scK+^|4V`{^yU3b6TjPzSnqCRL?J*|A9
zHW%iFJXYrbC~Q~SMlE{+=~q+{q{Xr=t&lZZCM7JOUREc0bBE4R=FO-_5E~m_a%^m{
zZ^Fpfq;ZElm5*OMdD1ynV`02Af$Fgzvz{!qaoEX-W55TSz8AF(2l_jnn261NuH&)W
z5SAfM;pwiQgM9JWR#}z(3(oL7DLe$mIle$cmlbXAqNEXhh@e*0OLxwg!~79dqHrnF
zh>cbu<Bg=P<j6!QwgWIwb}VjmlnIkNrNU^3pG>c8OeE(C0i$Hr#^Wae3Dv!?{IDj0
zYFc~c5JCbG=76_mXLb-Jn=>O3UiwCJBC$sd!j7NMBhsfN#Q&s;3Bz$J;boH8(2`^}
zj?jgLv+VY#xXqvLma=w7UbCu^_6h($E8-ChkCU{-jHs&ZWNfbUWXg6OrXP~F>z7k6
zi2rJfVPymJU?SOVv5hFAu9E|`-Q@g1q0|}ig_|0ZW?VHnfTdgBzU9n#elkV%p946Q
zZngL1E{?Wp12ZE+T%+C+I54PTG8ov#Ff524gm)e>Fqge*wjBS5&gN~)K16>E9FY1v
zR|hEO%tXNwC(N6b;TYm(%vot|8zPe(Leh0{EsTMYII=t7BeZ65DcA`%1IH8H4u=el
zFU#Hq!RQ=xX?^(OS@(43=?M+X@LsU}3+Tf)xYy6OjHxf&^T6Bz!6Q%60Wb00trpO#
zi!~kel<49y8*b?*<<YuAkmlE@b3R+o5__Yiehgq6Ks^~E&%bGOn{JdYBPYqZS~ew4
zAJ~_d1vBL6&VoK}FzekDqw)-;e1w{05m2$NPG~Y*TXJV8$IOFxav!@9`KB^V925#%
zg1&crI<3f|+YTGVtP!+mvz``Z)*vpjOZEL$=*0ZXv`^a)c`6|1hIP_9K#uut)P9E3
zqD6pQPH|55TT<ewU&c3Qiql75AVLV<#d7g@>F>!aSk^B0;wfl6&TgVN6QEOP@nkXt
z4R(sDf|g}7%v(rhyKR}rX*JrpIm~%OY4gb7=5d83*WJs*_eOcM9T@rv1Yw%uWwI0m
z?G~`*&J;k=^gHJ9)^U$F7MLZ@h$upNlFl_;1@#EDPB;>62Ye5J0&i&5G{2aGIqde~
z&iK_BoE|4vkVn8&r`U_sxx515k%?(zVgmEtww5Nj#to}ouJanZ8a=D7)(B|S)ehFc
z2{jsyO$<FcL^Z6vlhqpfI_d{a?(j5I^biHY4fznC*z+?)9(84fQ2bi^2Qss7m@~y3
z$!*T8zAo%K=8?TZt{NSIncw)fq9c?>5ll6cA)()5?tt`{b{38T6UaT7ep+poJ|yc0
z=H>&8rzj#UFP7tEA+I_db(uU$Z2Nqk;}x3`(6ulfxNP&Z5os1(!io3_8dx?sBZPe-
z%4YbS?-sFrd|~pLhsN$Ik@XzJdP|+3X8!#}*G<jim>e`*U47}O>s=guwC(V04Xs|f
z0Gfu-P`ePz`&y4O;&K{lMa%K$8Z&zyWCZPnDL(S%D6i5DKCdDFu5dmG4u-UFXAj{E
zj_Ec~cJ{5*g^D*#;acxNc}3PX;@^VMwOXFKO;KD1x+cON+<kz*{fPjtK(I1r4fKdh
zTh?d|?EQ`rl=K5GYR2}+i&S8@d}$7D!7YD}hF`yRC`9EdAdRz25F%q-sh^CCXxmbR
z*)(Et>jW!B-k!SC*+8azbsImzaYu(%FQ+4|(7?hbj38Gvw*zaf#=W)<4H#kmO3Sqn
z2v*BySy{zlTtK0NwQX^H)uq>uTn)P%8Wqfah;inG)*i7^!K?qVs4uPu?6^M{0X7<T
zv$%Q&cV?@i3ISyeCUnn%YsmG(_KN6h+E}PtSDP%_l^1KyIEfhOEo1dKGK4`0;Re&u
z==_#aiU;=3UBOU;o)k4o&?cHj&Lx^!x~hsgZ3*JS6*j9<$dxsOGN{a!&1B3(|75Mw
z(}8JR-9=e|uVlhQa>!f`@a>YnXaQ`+ThY=R15g$wm|2O_8<Rq}bX*8CC8se>w*w+`
zX#<KGz)el~y~Z$qQ@>quxx^V`ayDwPp%VVOxXZ%lV8%VY{Bbpxl*$_`8KGQDm{)#K
zi_(Lv;kQ(|6yZfjn0QT)U)x=>GO&Jacu{XuMQ}$&hPx^H<QRQ@n8+IBTB2jD>_%^6
z*ps%^v`ft*QL>KKm&4TPrG2ftl_=w!MKioogS>dSnzTcCIdebmy;<n9K&mh{IVx^<
z?P7zz%v|>$Wnlvb*Qn<s1s@V4N3&4Ou-YwK?7DzMfALwnL*HZ+a{-w7e%p=^Y;I69
zQMNk$hcTD|L**hg>P3<?+;+8D#aA_xszCbm+PiUbCoFY_=vY02z46b<V7wKI%3^hQ
z7{@>>+uVcz{FKrGxWQja*Y)DO*yJCIyQ>R-3Y@Zg_y(`hst=J{Z3dB&;4dBi?tl5u
z%=nK#P5$RkTkZRP{Kt*Y9{e2t@u&EB@gFJrbL-(^383FO{v(HVK6ipTpU({GOapzM
z<@pefOr$Kiw(kiH<em(eh_vU96GPFE<U1|-Sn$Dj+NBqF?#oA-+}(L##+PT8q;*#!
z7Tn-Qs-@oRTn<NvBh2g9%}dCjeBFRB7TRnFPUdFx5A{p9eG*~myc&O0()*<-!Iol9
zqizX(pM0iXw?6+|{dL~8>1C^V)>Z{fVX*79RokMDiAi|fR886uijEqkNmF47f?#oN
z_lBj#)PjXgh(=YKhA&#L%c(^$0dG)VRcC0kD#NI}x^keQsy1sze3MNJybA>!0bvl*
zj1lX!tYp4q)ZavJ3H5d(T4SX)y7G|~A4Xl+Xy`Jn$}%lertOqL&O^VtuU<(<jZLsH
zi_VfHwO2-dS-Od#k|-a8?}je)psJAe=b&N_ogoc|*Wl8j1i$I1kH(T`;xfq0<5Q<n
zEuW5)NljPI($Ni41iT;T+d$4F$_r=Wb_#l60(c5ypo4=7G9UwP3Q}Ob55z<1X`l#%
zZGwzB?mRS)jDg3UPu&55A;=wrNAu&261S#yK7K5M-ZFZs7Kda*bHb<EsygVZ&G&V!
zr7Ar<5pC7Ei@Q_zukEBgt>}Zrvn!x;SAL{fr%Cl&v|yT$c@?jTTDo?;+o6sH$9^qC
zvMvx+R-wI}{~a%^=XEeD>a`OY*Ab@fxMziW;=#?Gwc7~ZQas(Q<HZJqX<gKB-tqQd
zi-b$R`UL?3Owd=hpK|n+^h{_!F*vJHf8*ucTYs!p${9DWbf8xO%PWQ)i&0KiP2IZI
z7pX>U0TWyH%8M;4tH7mEaf^P7P`_scy&}+!swXFyQRQ$n+pJMNRS0rBW2&NwS!1Bt
z(je5Pztu2s=GC*dxd?6@IWd$0q0)vgTsUl_7cLvPiK%Ebq(KiCy^T7ix`kULe0UFC
z>C9$kYT|y*`0#J@Q!W1w(_!&pGC<6c|6BJzE9ZZD(E3^a|0zCF{-+ghUPTHUI000v
zeXsrNNQwXV+ncRcSp%@Istj$MRV9v(hG&zQoQ&bxO$q(I#k2zUV1jXYIUo-9AJ0hv
zF;$~D^D-^O(`$Zctg6UaLX|$~9w+A!Rm;DHwCtdn{h?OFI6vU;)rCkrZz1{34>*LQ
zojo;-!<}axTV$+gVtg)2!TpS12-!SaWdEpCVwl<2M<=D%S#DpSoF13nlfJ^1dA4)<
zWvS3*TwK^9d*xxG2LhFVo6aWQcfMVEyG0qMRQc}C^L=wJ9CV=;KreKW?7?|Om7_ZW
zs9+3%w*Xz%9zlcz{OZOy8c*|!o{pXXET}2m*m4T7+omod5+I@x9Q!A<v|GZ@nrHi&
zLH{$@J0Iczm`(rhx7wezeft0Kv(J8}|3AgYq5rhvr~>}%zDWVJ0oi~yTMsr{ffPV$
z*Qb3YJx2TYj-onPgy%Pki@t2|L2$Du@i#evlF1~^ASIAY6VxA;A0cUfG$)%7&gs^N
zi9I+%CyY3&_K&*zhtFR~y^(r!^x_nrwf$p<lCaVD0mjaxgQqr3$J0WcJhg0Ez&E71
zBH{@UIVCqwM<qXPbed^8?GJ{d1WBOrs!8CU7~#qnjWGnGQOkHRjU%Ax5aE@SB2jUH
z32RLR3KRo<s(hAZqa;R}++s>A!v_cKm!K9zn~+vuW}xC~5y}lLJ+FO|Z$_Ww3N*Sf
zrf61k$tLy0#Jx3sh*gc$g4J|c1*7DgZc~%gozMNSp9hQvTMG)Vlk-_Ca_ecr!Wm11
zgRW|xUZ{%L6*O36wzajEjsjzp)!7&tR?xpwuRqy8=tL_k4Qve6LB@fgMM-3!#FsmV
zdk39H!$rhl)<v~);KWC`tW5i6oY-`n-dHS|vR!~0t%+-6Uc&S9q(J32>YLO+jyq5H
z6~pt}{lmS^H>I)ZOL%CO;|2WjkI~26ka60eF3hV*{3iMRl;UEnwFz1wG&L^!F)oTQ
zfI&-P3&&~SW-4$R;$XwLz<jq4E!A+~24zE~Z85v81PW5mMK&Pg$kI~q$Od3&VOCy4
z3m$u;J?I*Qs>MYC(O-Z%Pyp!C$azRBoLipnG=6iTs0;>vrT|ZBWEdqCQliJBH}Op_
z5(m7ZMwewdiVlU&ZNONvT_B{)R*QuNx1v15{2&y%eh4j*b3=sVZ|cC**s6LBtB1Kn
zpg}hpB!ehT-pm2w7@#Qk3??NN*vsL|s03|Os${cmi&?_3SXVo`v2Z}-!j<qbH-Pgn
zh}<i-)|P8C9yl>Ifux%#WN;S~8y6vn33WA`WGNVBHsR{1cM%cQ$Tc{7nHq1eh`O95
z6<GJ>F~F1-uoRyw>y88YR9&!^aTCHdyk-JH^<iQwV+N@(z|^xery>SfdEL~>1>Tm3
z*5EzHQ>V&xh)aSN)bBeU#a)E*&Dzre$e>!5YTCG_2z8B@!`YN|qOOkA1O%=g2215A
zI6^~rn5S9F6x0$o2tbe&LyexD!>{*`j}Dng8~%qp?=uZjYxIV(JJrcG#RvzujV*=c
zi5M7Fj67_<Op6JdZ^d0qh!1j}0&NlGj8anPnuDcBhUpo|AT;;`*w9q|f=gWSQxPG8
zkvn+lFi@U|KDci+9U5Qo&=E`pQ8t=zqvF&Vl*)fHZU7%refsdgF|tmj<nJ;*w5ypV
zusya!{0geTc}`fpP}rjCpsr154w5i4{bsPxvjL2(ZW$>|KqB`D7SrB6UwGSg!}4H_
zXfr(Z@n7xSaanQx2a=ck@E|BI$BP`Cp)qpR`mF{;FZ{t!S3rvbybv+tkP|$)cJ`B|
zs58kJ*F#kmY(R$vaQWA@){IRlc`HL|KFJM_LfaE|90`QfFI=g<lmHr(7U8@*W75qM
zW{G&1mau0NWOk9dYbVf36n10`E%rHboH1^#MgjQD*`~T#i4y!cvVs?jE2i(V@hjKy
zP9Ta(gz4Uf#WI{daIxEWcr?fB5m3>@MQJ(xFcRg}NMyVkY(N|Bt}JBi`N%kz8lwgw
zv>UmS#ujK_D=jox3D9;_LoD7L9r&ufH{tfc3<shKmo7}b=n3lF93kf!(sJ~#>5F1-
zV9&V1v{@ll%&<(JszO&3*4FnxL}0EK5a7)P**p#N3+*LuG|?gwqnMH+&*do(LeroD
zzbiT#*f^@}StwCC1edvUX@GVC)a+SqTwK-jH$zN^mtbrGNPVH*9V0?NF1ZMchzRJa
zS_XQ4X48m$eCv~SHW3PwAbrYK(w{lh$5|uh*%jladacrvSt0F*?RWZM287Pe9{hc`
z7Pd(ND{u!;yUS@-yp6~wsNH*qRIG0fz`PfygZhA${qV)J$DQNu$?nc!GrCK9l9sPb
zq@Dm|{UD4O4-6B{#57i$Bp!~8=a85HSTS{ztYr7#j2`pOfG<c=^y)-lrz!sEX@YB1
zGZwk%X3W`q^&as5ouemZI)IQY6TUJW54w*jxZRmipFt!#xCzBT0cQ<+XSQYC=g69d
zfJS>`tT)AYl8klyyEA!Mt10I7F|Lp56+`TSk1EXB_jy+!bYoQ>bOmDu&00$81o#t+
zh!a=v8zov8B~M;K{d7chTvM>1CQo~jxsC$(aw}son-NOnpxYaNJ6dbKgq2wSE?sWO
zF~@z3xuFKEcBRl5%XqC`DKu$wviRtGfLBR2T7F-kv;-2zpre9_dvWSEZk%LF7zImR
zIwKjSnkF8i6Vo0bN1a||Z=y@gNR&l3_>HbK@sli3U!;W_-G~|sV=Z(YZTtAffsQ6O
zW*m43;>ajQ>+q6~KI2rrAc|v$j{pGNb*isDFgiVUMqwP(0UO2n>%@35rVxO3fU$?i
zMzsgsDhdvbY0415nN-IEO~LtF1Cr7eVYq!g&sXU(LzN=fX<u0w^9JY>QVeej-RYd<
zscJ<heZ_dVkT(DboLz~<a8Pf`)a;vz?OB#KaO_n$N0QbgFDz|M6$_EG<Y3N0*jHM)
zmQQ=VB+vCv^lhZ@;gbmyWLQmZXB)%+R<kGE8idExL>FaXvnbm%z}1!xv1K-6#8+z^
zP|$InOH$NUQKYqe9QR252?m8!i<C(C3@;5859e-r$)d0+Elz2bqnx4%t>Qf(tm!5A
zd7HUuX2eddMGx>CFf-bs_SV(_cQjC=)Y?*5jt_l`VE_#iGMSEOCqz3RE1>$M?=16*
zYchRH<_?d^F$nPb2&Oeqg1aSL_{dV?%8(tB<r@b?P&o#DF@|u4mtz3N_}h(_Frwv^
zWmR0k7~GkGyUxa-9IeSoa8#u6w@U67gWxDA%jxo_B#cf>{1Wn6j%FabfR70EEn6RP
z>&Pn1ZrexfIW5QBvQ@C!Piaa1p{^Hv!$##-yB@-X0L|{6O2QQyqS{;#eU$Ed^kc7d
zX{0)4iZ?jioTVF2xr}NbT*if5#<vbi$)vXfYGKgO&hG)0{f5!lv!;Y+;Bc%!$C`#a
z;Fx6?GFOt3@O2{mj?@E1@bbc(q#}593XU_lsVk)DnKHSFnXeUMQrc%3q$H^>+^UgW
zgCcLWl<%vuXK2#k3A;a|8mz7p57Kd=PYXxUX3-mN5=JnH8`i3Q;m}~KhYOb`Jfd#G
zyR90Jybe5r1ABoFEl>|`!ew#dC_zGIR3#t@Ek+4O?S>KD&yy5{b9Fp$3SI<^7jHi2
z!`MdY4X9D7RsufG^@d<HhK0+smtr2Nl5gKlMvZ(K^}I{5C}%Mwifr759Z`);%^}O?
ziF~qdL0k4f^^a5RsOmsflZNBwl5J!+fq@%A99IaUkwnS0;;j{99h1SV&MIV66X;>_
z7Zbl7K7+9;UHIbmlV_*eD8!ybFh=C<Dix)!IO(3hxua_l@-P~p+_h(UdAMrJ;8N9d
zpP?RUnNwHyBk4QDnHrpN#~VNhkCM?i0tAvTEGsDFEgGIpBL`~lC9gv*Ic8!|6tv-F
z9Cp&_eAPYas3pa3yDyIUTjy}^?Ur9xnwUWw(#lM2e6TU=O(*b2i4!%p@wGQgWHRF4
zf{&fmC+10COi^p5E7F@}kQ#R|fIv+4LJOWkt^1nrV7mhV2_P_)r>4Hm#xD)M%*Klx
z*~G1*NtU(LaTQI1e;q(BHX!0vN;z-UiYvv`-*Vx)`$vb5pEM)&_X+<!c>LscOO|G^
zRN!p{f8jLx0Bc4%EN{uw%=QUBQT_+9Y658YOG+ct-6X+1PjG_Ow0*!@s@?ks$3Deb
z!wKcK-f;G|Z@@7E)~R|Ax-AZ{c)enqH_E*^%l%G$nH8vR-Lr{D(^TPkK-L^hW0ygu
z_%&>v9^+SjtW8Gs-48!T^)o%julyJk-SiZ`>4#)&+O#)5{9<g2k41Ulh-&8YgCFv3
zE<NWT`jt8!`MLVW50O;TQ~X-ta1aLB;8qYDH~`a-890F9ISu5LfFj{D_+p+RYV%|K
z?oDVQ=Tqx;&wDho^PYL6rB?<@CjB<5AV3LZkedU8uL_f)1F%Y)X*WiE8n$EOStH9K
zZS~wMFT)M4wWI)JtDDlfG)`)xaT2nPHEs8!tE}@2wT9(p4!RVUp2!VB1eV+c?j0pM
zse`BW7f{NJe&|}<;S67U_PO@<dd1!p!QrIOpw}|}R1iGo&CCno*XC|31hoO*CB1b$
zZeYYC<0%xhJ2ChnG6&IG*A<I+g^{O(p<h&gGb}DB&_piogT+-YTbDKL8dHM?!P?R|
zZIX;faW4r?T8{^9X4om9V#Pi0C?t^nbkJlgDH`VLQJ8Hx2tYhzf0#NK-uQ$hy-;aI
z2Hgv7dRARQaU95m)aZN78?J=8G@CR)Em`#u?KOb)fW9GtUh<DJhL_Sz)ZdrFXi%46
zTSK-X4QM&kPj~1TWWF$Kz&GgH#MHev_eMCV9$|UE1dSZ&w)-#bIrH!1Q|<pXO0GYQ
z`|mveuZ{MnpZfk^?a%K2?Em#se5C&ut~h#swKv%N>;AosUq`K9f%n(_fcx)3ay{(D
zqi83MM>l^+7L5NTT()|^8M<CvqfE7!%=he4qxJl{c8`uba~!++ndj66b9SHDpkw0U
zIG*Im#CwP_$V$&>q|QU)eB5V$7-pU?8N{ZnkMf2(;BynuMKK|NK%)eB_6G_gW#ibW
zGW+>q@&?tEs_GrLD&2+SEua5*vfQBjNJqzeo#W`ZbJ98fy0ZtQyDXI|Kz^gx)z?Xy
zM~3~5qFRh9gc>UJ;Y%N-Rgk>(-=X4|sVu1*YJ-^Hs?(4}TRI%zyDdD#--rqDB^}bA
zjC|y<qT)Ez$*3#P$pFubi-i78rq~bOox&HqW!2@^*WuAR{n_4ze;?t$pX0y(u&oPz
zP8zgF_zu`J`bNu4-;-?ch>HWuO5D2%P8MG!T?MDEU0ryjzBT2dG@54l8y;5+#iP2~
zY0UCLO|)Gh*6*3VZAAa-oH7_{wiTSAqt&RTxYsj!lZ$xJZsJ6He=dqb=pKFhb9%2W
z%qqU=s;xu%Z5UB)#H2tcE`;k$(D>A>n%QP(ls&9e=VXNGD7N6tPskYQ29n9QFvZo?
zmz?4SRf~$bZ@A%Qzv+TaLeLhjD(RTs5u6W=Aa;5}w)!gtD@0E~?qYqp-XfHKjAwMx
z9SpDQMQ-CNV{V=3O*ZN0B2~OidLyonIL<0x&wE|0wjc=m>Cso6!|p-nkh?4t$cp@G
z-E<^V-wan<p>fDedKz!lqMsb^T21q>Hq=W=8SH4<YJ4FC#h2FN5PwFWD?#k|<kWyS
z5SyF|Zu5dp(|mZICjE$3mKt@{b`Vc1RWPda%jgSe?#S_PU{tC>EA>zM;NrmJbFUrC
zpUS2_>6u2Pp_&|-Tr&K#=Fa|QKtDv_Ev}1Ggu`sW>T7H9h;M#Rzv_Y%wdp+J{Mc?O
zyfn~IFvMy3yNzX|)wk36U03W)OsYy{ygS^|`~gX@T?sIEi)wn}Pua0#&(BLRz&9|I
zZwYB%vS@MC?OjaM*Ta6DlDdN7TR{WQv+1OlD56U>a5$=I+S3)Qoo{~9XD3~158lAR
zOD9AV8ZbI*8s5@u{DBD1YUnj&UjF_BTTlSvl^4*`!qQ&1xR_*bbPFgh9Uq_k_V5(*
z*tp=#Z_*-O2%<)d<k55-4)j&5>s5m;3=zZ{K$+Qrsk#$Y!q}yatnsKO#e8z1FI||#
z0$)WE_e5Kc=!CZ!75fq-NiGGA4b*=Z3V@pOsxxVFgH-;NDkW0j7R4}!JNk@obRn!C
zX?8Lz09(H`s*RS=euzrP#Hz^4$r6G4GYI3t%brG*8AR{~T2f~6SYrAR8k&1xtFza`
zar6p!KbY@#a=NAJa78EC!;dj}P=inGP^-`$wfkKvT3%gscZB90_76|ZPH@nY7zf;>
z=#^?Lph#6)#^|I7xH&W<7w>+ze-y3!p=l9`H#=dS8eu=_jlq^lL3w$7d5fO{5+3Lu
zqbz$JV{S@5jDS#fj!tZb993WqOVAc&l?U+Xz_IIg2D$JO^`OHS&G=LubZ9ssp3$h`
zQU$*-5`-BfO^cgu=4@WJp^nkyngY6OOZL>5kB+wNJ?Y&2&X(m$MC^RCzq@k~?HukL
z{PuU9<M%dHmv=RIw}q_rOzM*qmJRt>?cd(Tq>guuk^^@x8S$39#JiVtP|ofK;IbaH
zG#VHOWHIEgMdldirqQ-NTane1hpS@&7e0Tr1?k$FO_4kPHbvt%=(Z8jFV%5*+=?!m
zE#Zy(B)QyA2N{6ya;U!0s6iEvmREG&x~Z*rr{g}<RE-TUl_WqdvZJ}amQ~Q7_S7Mu
z*5^uzmyq3+1b%o>xAV1BP>*e^ynXAc{ufd23LiqBU3>#pf19wku{p6UNN`lkO{bxT
zHASWw^vx8!!E5iiBe0ll_v^v+XhwG#T5FFc#;wkSS%ms`?O5+XY|~^kq)S_43*t{i
z&Y?-uWozMnrlYyk;lQIFFOxiv&uxZ>fDEU`0E1KjAR47u9m60BmQD3xtxf!t%Gv-D
zVp%MPPU37E=KbOMu&6ux5;`^};K4m<OsGTkL+TGk4LlDG2_YDCl3Igo%3gJrjpdYI
zYIRNDY|$ct;CnsJQs@BW6(=#%FpozHB6CO8Ww(Xk9LtQkj}K~ALBt+pkb#}I8FE1G
z4t;mj_OaT4OOO;CnqKcMVe>zqT6h=pz<xl~*eb?}4C6UZ7*?3cN1@HZ^0%lSqwg=5
z8<k{VC!+I~Y<sye3o#=a)at4h5RFre+fEKLD~*3Ms;}WUHcl%i+y=A6EIsdr*=~Q2
zk+`J5CIMyPREI_zb$G<+LfM(##F!l>Cy&Ti@P1i`RGH?Q*DX)lGK%fAAHDi^7U$Vu
z4+)$GsNogMk8}}J%R(uGP!8wpb)?M>eeWn1jh$VmZQW4#?Hv8i3jbwtST|Ja3s55(
zuTZpZ;*0#b+5`NQYWK2BP?8aSReYteU?%Hm?V{i<2BeWtpd=klzfMZ;XU}&|y9Y|N
zZ^+3h%(nSD+3=J%5OV#1bs8!3XW`}4A3zI0ZWxp|7<Ba$MR5RX^V%Gg)sU~Hkkb%t
z$f9q*U0+{+`4VuipN!RU2?w+SoSL748iyR#O}+KNxTGID<p@46e+2lvT%NZ?AZ-O8
z)%Jk8wzgFPJ7@qm@FVoJ;CXs*h@$gMVUK#K1eNjDeE3MfD4}lCeK2uAB~GGrSzvB?
zk2=u(*lZ^)$0$MD=VcuVL^wcBHv;W~LpOO>y(QIsR*+}-prxSySU3=9Fm5inZL+q2
z&qJ-Q5E>EU(n1Gmv>Mgh>L0+c<{}g%s*n%V8PQ%bO*JZxi||PSM?pUsRk3A@9)llm
zLn|MQ>PlK^tffj+5_Z5aohCB~<y@40he443^gYJ$olA7!Ft&}kRE7Oc@%je>p}qRf
zA-*#KZF>a&AMkQs{w`kLs&W!KGlkBo3k^)6L3N?j6iTZLO-!Llb)mu(Dyj=znL=09
zg}&3iTjv>MgvqAo7v3pmshmgKLVSl=a=!&YY!4w&O*n~%5J)d&ISjQGKu_F31PB<S
z2vE+TSmcq7inB@E^?mnUGx|;;@pno_028Y3zHqyDTu{EdzP|Qf^Ho{oWWwgzhaMV<
z%`e&7Sm^=%6O&n6-jD~0{**~IeT=xbx;p&)J|(26kQ;qa_M%78i`_4Gj=PZhz0_lX
z5+r#q9z&9;-%pdYm(aZ?IHXlj1iKnozvsPr>--Agk}YAs1)D2_$8XL*9G&(8r=j-0
zn8oKPS`XR5wHEQ6&%f3}=U(-xS2o-RTaJY_4pj`uyT}o9Ii?w$QPq-BJ8Moe<poDa
zB=;;<b&PA7`fkg@9SBA*g&;F5fXGcgzjczA-BX5zOVCpb?pfmVJZ|rmuDFb0i2K7y
zK`Ffa*a><_&>b<qE`jkSV?;kPA_nG&Q@slD%O`QO(ZYTf-L)Fx`9(G<LY*=h`*@K%
z8FjiydbRlG4@!e`R;?P$K_DAdLvC_}>(YpahE9eg5ff6EB^(Grpz-%xfxlQTK%liV
zun@~FkqQ!N7c$%Lu*bH=9^3ZE_=8~NEC4!xzvX!+>j8ZJo&)%Nu>l-(ss`}rJqPe;
zu>m}-9Kb)k=K%g;u>l-b4xr}K?`3C1LWuGWw}fs}6c1y)+vj>osIHJtLt5(fTEnBm
z6@@$ssRy=qbPAW5K%&;y*Ihy=qb;eTyGMt+JEx|wEF0LwVP4g&)Ou;9eA>cS2d>&U
zNK)wjp-fU7Fe6j`Ltts(Hn)OJ@^lEp990nBjO4(DR=G^eozaI_+VXJ{fNL16KLYfe
zKI75&B3|U)!WjwNIrr7e;Q$hsXOob%nf?fK4>`_~^e|(8IQKsb-?Yg3x8hwF;akIO
ztJ5c%p7_Rk=wwu~&nt;)#>B*{z819<XYHDpZTUOfgR8^8yNlqU%g(dTJbtItybiJE
zUBc*3Xeo7&OqMv*N{o^<zB5Pr<NB(a<~^WVjSwl4fj?a9k+PM5H3<<07_OBD3{9Ut
zzEQ}>+A2gxUl`^bnLaMrhuBCIux7d&-5}rF=A3;avq50y8>4_Q-yh}xqH`O9!7)Y@
zCS1_7VxJJZ@6vO7H)rfX5LCvl#k11WqY1*&62jofx1}a8JU4fE_PwQMKl}cCz|U;|
zpNkLD$DI6s57ZCe|L6Y3#?SsgKgGxQ|GB{Qe-D3U{D0c_!T+ayfAfC(L;3&wVmL?@
zuSG6A7p_Oo#nN0~9OF4-b85>2?@s&SXK15x8D9@Cr<ajBgU^c#xJ!)7oQQ72*wNpq
zbC442n$ox@<CZkoDlYoX&ha5wQ^NsqlTB>`r9|;OeTtrl^gJQ14BBd{dgl`*=+<1n
zn;HNH%2`hwpr>%BkW4Ni2YZy?T%KhkxCKo!uu(d@@x2L<@+$(nbGWAnsS6d9gC8Gv
zcD`y-p}ixzRyjE7m@oTJ=<6XBf3l-rJ~=w3zb_7VPxp@wxeYGAe~5n$j&^qr$YN-p
z{~n#<U#@-JdEVJM<+{h6(-+57@$}0Me>r|Z{k=Fm<tBdf<^DmZNua>g-erL3X_KJR
z)Zz_I<?ov$deR8#&tXT{HSuuB<JgF7`pOBNd7OBdWteLel3pWs>gc?HmRWihp6&l?
zi%}_xCzJSwEFb6;e1&m2@VW={@$T)M?gWB`xNceCbp+mYu(PHqxZ&y(nPc=KGvn~v
zZ?%4uxvk_fR$O~8kKm*QvmSQlwGFfR9=RrHdlDQ1G_JL+d{#pTr}VDWg5e!>Bbq-X
z?`h`MVYYD(l+C#Jz@~}qNkHFgxiq$O1>0a`<IsRc>khFjGk9Az%pT+_g{W-|asa8?
zraBi7&CnZ;F!iPP9tQ_MqmorH&-jTVC(JGla#nqsXJ}i)p89Z&2t<T@4qdZJVfPFG
zCtGJZeF!=hUs5IO8U`+5Scsp1iklIKX5-pQyR&9XWQ@2?ZuWqK#w?R(j>csr!?L$#
zp*f4Fms~pNm=(%GeM{@_IWn4W8!mf%Z}*1q@B`vUxL_57T~Ye>PBRtYUCdp?9ml&k
zg#DZ;{IBUVgZ~E&dj26qfO-7?gNJ_p?@v{QpZWiv;^XlDyy7SVeEMsf0sOP5_1R{t
zy}7Xw5CO1KGdhd&VK0JHJ|_zU2;|Nz+baln8jnWEP^|TnvD*F#7?dLCG(;=++lmg@
zts_0?Co;Z(o|2b3R@K2^0)b!whEYK(_hSF>R0%$#sXC{M`|U0N^|Q`1czKyz`mgW}
zzd$aJBIly*Y@A2=C4`Vp<6=6A6%Sj_Gm3xy3W^~&U>Hp}tPLZSBLiglJmDM*0|7T*
z>3(i}x9^zHzV&~wL4McT4Y%w8%t)1`IYC+e#$}zt3N}$){R6fX>Mc9Uk<dliZ9wKq
zk@nZu+7#b19wfyLPJ(@l!0|)Pi_^y==Kx%O7IEY`lfiIE5i&309Mc12>F8$5rh-f}
z#Xn_dqvVn^M9TUc`TYXCO5oKS^(`@d;aHahC%>N-&(U^$tR_{rF37-t8qka>7z2oC
zkP#KlEzv_zgCHKMTKdY@MH?jnbaxK+pB_HzDDa&|2i+H{7FO7zHaV6s3aziEIi$ce
z8S^Z}mMII1VDd{{?d-Cj#;7}udxxym#6EELAW4zR4t-4k!ozg!0>bh}m=XS*b1|r`
zhda-x_(U8Eym(5k$Ms$_Y23L}m+p#<W>ilUtaRacJfxU}^$`{pWfQ<gR9o6@En8A8
zlfC*zqq^@T&=vMF?5f}R(=Z^Gpu9L#i?U~G($D&JL-(k@Httl~Wc#gw@MlK|lAw|U
z)fk~Ug+lPHVQR^8?5E$jgOzwgHz5Oa!z~B59JZKV{!mH4V_g#EQ7mGUg97rxs$UH!
zkmF(PGVWbKWuVz0bZFvysZL68cU2qOYzUND>pFu)BYF_Qc!8WHfIS7~X8{79jeA)?
zQG~d$BrsHyRkh(vUz%L%T||-hF}^;gtCm5gWUvB=qJO9Ta6?yD=L%K_w?`CrE)s1W
zKtbo~dP3vu4T<*c2ID!dA%^BZKHYf?^wV}FpWeCOwrd~ilsmMREV^;WPtyrvW1c#V
zn{!VswUV`7JNpA3K)gEmFuKA$l2c}y+ETWR#X;Nt5S+{*EH*^tl5IFIbbmiMjc>{E
zY`vAhK@^I6lMJ>HTzO8i5hYd8q#qfE3rLR#LDt|Jgco0RIsyR`mR+GwWJdet&hZ{D
z{AuUp^u(flmiD0?tc`7njf|595;ME>wFS+;Ygwh5|G$ij3rKkX{xQI2^Z%{;_c!kQ
z{C}(U;Aj5-r}#+z->f(Z0H2Wnu<@&V?N31fxc_PJ4&X#5wS?*kC=KC8fCD|=Iv|*0
z&S3}+!wwC*vA=kvUi`0v{l{~{e^H7S?><2tdh|>cog!U%zHi!nz8}@^ueTnw9{#%h
z>BIXEfA#Cneto}v|5pz_wa4u7&ffmc;Ys(o;_CJ~PmepDsQ!HaUh7vI>l+QvV;x4`
zjn9I4`E<lYkv>F~tdC3-XZxbnXq3It{ciGMFiCB>8&&YVdI<(g4t8_#?)~(#1%ajt
zzE>{`&IU@pdp~N^EY^)G_+Gs%I2$PW?)}6Iqgwo4xE3#r1o3-eLA>zt#P78}P`kZ&
zN9~H9no;O^dm(&JhNA`XU6p+InGQx-Hd&D9LDBc<=`suEvk7#hN`82Vsz!sE0{Yn$
z#Ev1lWAcvym|#PN%3<6cj-7bF_HE^h!B`Hm9VXhpp9I6<1&H?VC&jxjhLWuo>t+mL
ztv>WpjI#5^dRGPCeU7SfYh&SlS{v`)Q=)jTh57+?$UFDaPZot*u!nnPc4&T|lW-2I
zMf+TNmp%uR3V1?^q+)MPszIwZYtnG`q{y9-%-@rv{=(~vMHkpFp!=!XECI?DKEyG5
zlAk%rPZMgA7TVz7IyEpfyIrwxTTA5-oNWlfxt%(JH)VSjjSbn36wEdI(dXE&Hh<?a
zV3y*yL5O1MGK@+fim!hZ5XIL&J%}D*zZOI|hM6FWuNMH(M2UmhWe7^3J_SeSPnJoC
zisrIWUCD__gRJ$zzGi#7MHfh*)K8K=+?R~<EILbiF({?8ltzr|qWmT=l1s%Co=nrD
zlaCwGE9k!7AYU>bXw0_}=(ahbtgpvAhkI~uQCf=$=CL%t8+B^%6J4PZ-E-dS=KvVv
zDk#xFTL)9F<4Sa3e}#?BK$258f1A516UH+h{#jDINs=_$KoGWUP2n8<)^^v@-N9{2
zG#!uOHUaL;Y(-euse@2VRdmveK=#en=i5_EkY2+(1_gdt&E#@i+|*>PAm=w(nKn$I
zTIgNRsfBZTHC>)JtG1ri2vxgKOH3_y=Qf%>x60|atEWH0>9^l?`t|AB2&}_aM*$$b
z8Z9pX2II;S&QJJe0?u*)T&$T;wu@}?Ty4)_QY_pv0ia6qu`w$*5-WH_uAle}BCke9
zfx=03K+c2bMm*HdbBrNw#Z&zp#3)EuX2dV?!d6f}_&JC@<~jV(&oj(16j`-_ec?Rk
z$BL`6kJS%;tj=-!Sp6_5j4}*!Ze=I^LP-m@0{qf1Ce)N=ZFJtFzIcH@^b24{%?tQp
zU)V0x4}Pr3zkRHJ=*I+T!$RoCN~#gh)i0A=>WzJ_e&|F@v6$Dy<YFR3!#9ycJ?Ayx
zp`M6+qBA!QQ?XF+%f4`)>&HsqF$)eqbT+G4wgbQH3+H)7J}1(&9zhlyC}}mM_o{OJ
zV6m!vPk!E<XFI1~n#?)8eJTXR=lkYGDL>43SgWY@<%_4C?$<j9)pakX=a{IaBL2~{
zqrJvbMb;Zc>*|*It%-8<b0U}z^_g-1lU)8J`Cq{QW22P+<>AlwKR?OGx&MI`$Ge};
zHmvd2r%~(v=KY784?Zj3{XoXZ$soqCDABXzGMn5)&*C&be}_~s!Ys?)^CXw=kmCic
zR=hi&Qr;Js>jHUSOo|snz<18FX@P<ZUrQT{giUyjwjnE^C!m*gdNA!b`PEq13TN=w
z{7N~)g=(e#3STX=OCd(XrLwP5=S7;l!50lx3$5{{F`FUfWKULC{n=F6!vW+|r6e2>
z+F_lm*#XyKq;z&|G^6W=PI^W$8KX0}+sDg#XyeuOa=3x9stS2O;Aui5rJAqC%Q!!U
z1ZdNhkCWbT0Q{fg+nW|_Xq&-Q9)}Ji1&ervLQ^Hjjc%G1Lsp&kvjhWGf|(fh_U2-!
z#4=#Pe?J{6Zk%lSad348Od9PRp6o}v8jxlrG>9BK0Kr*_Mr=*SDc;b(nGF=k`$x&M
zG4>0w%%$-HS`Vc#3MCPMc?cK*Lc&!5Cbv3>hog@h9O_zHo$UXvvvYjB^V>TQv_B@8
zTtDlcPqH_Vk=wV6ry>Y;GQVDNunqq}vX;EUSe{%gl)U5`fTIv$k_J#G3Nx@Dt*Q_i
zWkA)iqBF^0bNAXtBBmK@#du+(eU>UUWCfUUlw2hs*^h=r;b%C1+MP^OBkY&~lYC^8
z&|t&t`BFfjt_ujYrj41<3l}gXqKMv(TP>?xY+E$k#!A~NSoF)!oz>Io7F$)m<zxfW
zjL7t>flRXKvo0eRX71xv<`w3)n_`V|@+;h<ULNu~rZBuH|6{CINJn#nd&k5JI{L~<
zZD5!Ct&569mYof&l*jI>)Gq0?5SxR8iPIz@%$91)$@_<a^s58yiFozriRwvF718=c
zk!`h=)?sIfAu|+b@17at8fSN|4v%=GYeO25r*+FGv-zT=yYO$FSCeTog>>cxuCJW0
zJ<=qoQCB~J#_?!)82Y&2oK3PZ2p^Qv{?Wl!M>czi%^dQq^Q<(=bp9ySaEh#mM`Y`#
z%D4~KXoL{tE7fFxSJ0x(Uz+dv`9q)C{Qpnl|K0wq-7fL}pSFMI|9^^)&;OJ2$Nd)D
zem%I?ei*fWz1e=S*$Oy+yf^=E>`sBxzi=7<i%Ri8q;F*Zj#@}0(9Bck8PK|ur*|NO
zpkj|P0w|q7(v93dRnMAP+Dw~@kbSpwr%n#NMEjfSbO#kRBw(}I@xaPG`U20V)mHF`
zf`;xm#|{wV`WcwWXK7=l4k@YX^raDP+TwJu!exRtTwqYtOzM;+FK<+}o;RA2Fq$`Y
zv0|fYQ0(@;qJC7=N7rTUJ#9w7r<J)AY%4|XoLekP6S*W-{-9X|=3tn6tmxFE^n0oj
z8MrGhx9K$~`YhMIQX(HRB&lix;q5ge=V6ACx{bQ60(WYfy=tb!W8;}!G>M@`loFh_
zI=|~w4zl_^iV)2jZXq<=ZftwQ)6741b(iWj&DczLr9tXx>2XF^O(kQd8VnV^Nnl)I
zCY96&Mx*TJ`wooOsE_ap3nmMFgp^Zuc%8wmR+PP^kTq}Mz6{nB($>7XL1Apmy0qMm
z{#T#>S=|3H=HGM9{|66S<^0c|J^1<j|4Bab{MRc^Az&WF90TUFdmH!F*Ui?an-6|n
z<^lF@()d!zT6~{@&2Wf;gK4|~8-OD?1#Qq})}M~hBcq6iX^y^wmt#sOOHv#JZJ=Rd
z2QSj$wYC8uKS3qFqZr>G4SH!a&;nH3izjcu*5z5;i;hmBZyHb#>IcgHW|;P~H|*0I
zM|m-&uF12N`(9tfj9nzLw#1kw^T7?-6%R6=s0OcTtZ?b1)s*Ovwad#jOq>uV(E0PD
zCwK1D^c_?U+p=kSZr$9`latQ#JGHLlwAB2bA9tSYe{-jHaI~|her`sBVZ#ydP-LC%
zlb!v8J2mK@=SblS(6tOlHX3ySqA)f&4#obd>UZw6<P#wAckZ-Bs^+8^PqOp=P#uVl
ztD&1wLG=OtPK1Q4-le-XS!#uc;vX22dXMAc!d8QFyHB)to2s7QT!xPu)teWT;pP&<
zDwJ;C_72qlkDhl98>|@l;T==&1ylQ-vRCfRZF&}i$1~_YFL+my-zi89>(ol=IW~F~
z4@c;zr||1wm`<;o5gPfZKiNp3n%a{4$NS$jqbG_FeSEUlgvJh&0=`B&``<(l*4xeK
z%jYk?iCSz?gdW1G%^O8&K*NVy7-`60q?q*y>~dEBL1QsaExDYM<9alTZ@^pv)VO1q
zVyYf1Qe$?)`g`Oy3_<vwq$mg?Bp!<(BUv1edZR2)>V%zsW{`z3R496(mu=N9Y{5Fb
zY(~eY2YcPaqu&@!6qeB!4*D9IgKB~m*@$$2jxC6);|%aU_kyvSv~3KuS(ka#=#Ny{
zIyOKXh{iv-_2>sUc14cfzS~Mitn5!lq3wI{f%ophJ6D{3(G((a{-_A=q5B)^m`_V`
z%d!O8#bo<Dq<VJJLwBF=oPG(}2QW!A2d+7T?|Z*FI^JWg>9&?=Fl?(6{Y?}FHE&Wp
zL!RZyaFiUzm&s0@gha~5>Z)i{%HQ<IKSubCx>CRDBiK|5$1pD`)r3qjjfTNQt-_Ty
zT+<Y(qhiI*lOl45L27exQ?Y`5K<dCP+tztLJ!6|{B@9_4UjrjzR1tsE+1=Yers*_H
zO(n}+W>*PWXPCI5@F>a@k4M4TIEa$XEH76KHWh~&sxZICmk8hkMU6YO>9*u@CX;Vl
z?O(mr(0zgd%brn^%bog@qvK~_bJ96E*?HRO?ms;|I#z!UPddk^C($1x@BNeGqi5Zd
z-=3Uyo@oJ$77_=7LO=D{l&FzR8co)V8`!w?f=lVua7qnqu^RD_Jnc{V-+@ID{%A;3
z@%bbl&cXv?#Ow7h!B>6faJSR=5GR0XEuvH4K-J`~cIwQ^1Wo|6)O;iIm!$X#o1Ray
z-cG+iQF!73sPYu3n8A-q^?!S?_al(~L!#eW?1}DaNoe0W1b#fK4zVTHvU~lTQJ*Ng
z0w0Vf9z#eVFfw@6U5?I@0i?g(wXq&B9wKt|?4T<I1CSP!c%fyN+fW)$l>#CDw*rp`
zimJl%!xP1azV7sgM2~XVp<9+<K}?Q7vHD&04tztX1b>4z`K#*HF}bs3!M-h7$_o7t
zBzOi9D5@Wx9H9{l90U88iVhwls_w$eiB5v8jnvHpHkvL~-cQxCOtSH0s9*+9b&dqy
z05zC{&IuYTQU{r)YFjf}+)*c---uQlaC9HCOx}I|0t1uGY>g<s-`-i==bW^&htlgQ
z65v;61A`b}MliqGBTypBbi#1)k}T;a?J<p{mZw|W3Z9EIY5U>Hixe=6j{3S<ZTd#U
zOT9fj*gyR0+0ovMgHHG8ImBtjV56tqgPq^~R(*ZaIqoQ8ck<pxK?x9wi#*>7y>Jl_
zirnL9PH(d5sE_evB5(j<1E8~M0g8(&^m^z`IMfrF-CQ7*$aO;5`o~?MBi%6s%1VoR
zLps91J{my+n0SQeE0jb$<<i;=Us@I{8N+vVavYxQqIr+M;%cwK4;Fszs(G6u11oNq
zVQ?}<bkf7q%Ldvm>`1JsYOWbk)9QI?HJ=~vf4y_siT+rnBMw!fK)YS_t#f>Qbj%Y!
zJlRVWX~}N9!PfPRXihlBs)NvgPnGiBh8!YhX%teOl1;~lW&{pTPB1pG;<0lAahAQF
zj_Kik8s0$i^v8O7+AdbPTpRX6XV2fCs4r;2l_^SCvkg{Z86|>t7?i^k=1q<UG*}o(
z<AX68iUEBuo&u^qiASR|9g@jWg1!gaKx_h??OM?n(EP<`xOasnaqj@{b^DGEdPwGf
zQG%qmzs0UsH`x?b(vgftSi21cCXFDluCuL>-kq{i5Ab_tM$rI?LrDDSJ4---zN$AL
zZlv#r<0jaY3x8Mu?JRK{UDwJOWt8yF|0MqeynKuzo2a&7<G}e3a8KJ>9e1AYpPU~5
zcK>j%^9@VPgp`K;Nh2EM<mL;TGW}y{Y?!CR5zFNbFVRS<kla>@qA|&4jJPWe678pX
zGU>-f%#B#xfc7-RMxq;aLK~}Ak%I*053Y>XEiTken!J(yXr&24n9At{I4fLT(?hL}
zNQ%ouEsX|Tt;?4KHKBUQy+Uhk@$wd{WB^J)wZAK%Z)mBheD(^uRD5itSt769?s+dN
z;`2xi^&;zUD&}T1%Jo_==g})kW|pm-Lowhl5-17{QTA4#j=}-&yjKL>Yc;x;mWI9X
zrg~{wCD@|DEs{Aou=<MjAzBd&#$i4u7I$OCs)3@p?^ua$lspIJ?aZ8wSV4YxQfjAQ
zrWnTw%27d35q*N&3ef-T!t%hTdn2}!4f63cW1(m(>mZ2GLZ{G=WD8t9gDW@i1(n~o
zI`sNZ2t<j=J^ccmNnPG!L#ydXcj2_~wql|12%If70~{UaSiAd(R>;B_>OEYzZQR^p
z7<R2-pnAQ)NMcx+RilF2I%5`4F_g*;Ei_JIa^|?X;D*`<qacXb&K4`<E=i*p4Mjl0
z!X|GvesVyf1^rMw2AI=^D3qPGnFApjT90XNC)xz>;h`_7+;?W9dTqMnq>HXMcshv1
zeSf}hc>>N8lf+W1_vQB_#z9<3ipnVw1_W?W{jhFx|DdCuDdZU7{gZyHsM(~(hbkOn
zYMamvHK-@dQ7ROA?v|jkN|M*~Ye2VVgX&lZ&JKXZPp%8a0gp$pO%`G?oWS|e4=1qW
z4W;-QRA=p+etFV)-azzUT@_iF&4qk!XK3nzn!n*NS9*tBf?iFJRC8!_`2cqhw9A~X
zsVb5k%wS+G0ZhLmabc#~!cnY3lOw()bhKL|i~iKzC|YB3%=vB@j`A!SRe~Qzh6_Cd
z?1&^)B6H~DteHhXe<@*Fm=$B&y-#7JT(1%9u(yAVkhHv^ac;#+mcy_2kB<(Ku~0C<
z?x3tCt^VbVrht0AtFDMpDm|#z#)@Vs(y*?Wp@x!CO(0*sq^ZeXL&_7qxrorjz1|eB
z#5E2u>hf?Re?yq#wgDOQq(~jw>O}1HFCVg%H&uYH-Df+;UlH^dx~szRy6C1AIYf*M
zg<-ZE{mKy8l553w=pZG!xNt(!$E==|djct%kFD5@Dq;5ZyY#yv&8V!_F*Hr13(Yau
zkAizI)-fz7iD19aGJqnU<1EjIK#Sc2&^RIm2n#DcLh>(}gOwEU&EV<_|8{%PNwuLJ
z&;_!Mn9#X^Zpj5wRNDmD0rOwl_C5*$2HBG&fMAU>AB$7!f+}GSdnB>ir${r|Cb0oD
zg%gwoFxN8fwybx+wRE;4VpZ)jY41zi0hW%#XprgR-t4M;ylwo5^l~}{oRiY&lzFY3
zbfAOjXmsOYiIb`3H82-AnHkukP#{c{b!8viD6N=Nj;r%QxBnE#h5;rNZA4rIg7ZPu
zRXG2n$c)XSN~S?W^3mw6QLf`}@#jZRYAB-WVul7+Z|P;|c3CF~kf)@bei&hQ=b~!`
z{N|!-2<OA7+xzgiD?n`VM|Wv2rCou-Zg~Ux9~H~xGEA~87<_S&rFdtG;xI3EGY|}x
z*Owgu%y1Z0OfwvNFbh}5XZxgP$BMNxkgLFp;E{e?G{Lbr$Izl^Q4h<T0rX(}VBW<@
zpdW8*S-nw(HafBHh)>k{M}GN`8>Su~P{q&ks9h$(g_gZmcOf=2>=PsJc#@R0*=6*d
zi;nX-;Tm^kv4FLqR`=IxEW-Ahb{yUpTd4)d0ugCk+7Z;k8t8qo5EG{wkGvs$yZlMM
z{IVu`n;~xE-h`~`X)@|6*luhI%Vm1ZHp|gU<E|;$D5-W>kbmzbG(icqzSQW55j?12
z?Cf#2jW^(6e}?Y$YV#-8QQOiE9}gT|tJYO^_QH$R4y;v?on_f5iBq#)CPDYGAl11O
zYapm42U??{*pM3gEE~HK`6ROnZy~e;Tw)JZlhI7>)sa@*P0FZ(R+=MByP;1RvsXbR
z1FaPzHSS7?XMlnmXz(F3khP+w{hL=q-P?U!{=IjfX=m2%n=Nr_38W->ax_c@u~H<=
zN&H4laHu0l4Y@%um5jBEiiZKt4iB$xnJyb5uo;v#EJZGzbM1zZ;9R|+C*HyB0qgDc
z=7L9&jnZhRAXUJIQuT*`8l=UcDF|7WVh55|pQcyA%|Ky_2w{421tku-h_EGOR;@To
z=*H;?38H$56EQnuIT^T%dh1}&`9<N}LFw%)s8pG7NNV*hJc6Kux~j|J_)Ek)HP1=L
z28RKiq^mHexM?A<j+1Gs!7WSAxcf`9bWJ^D06Ry|;<GcWLxE9)G$Bk_XA((8Wd#}m
z*1`73anE5-rIS+7X$=yH@mfr#2u&&Egl_C~o#eWh#Om}KqXOeBu@ihJ@L>00mgv3B
zFy3DgPvHGvdiW?RS<?@a^r|Wl^&UjmQfMyDV!RY##J(F(<S`9tppkMyEJ*n-bn~hg
zN%ihM6<gldFZI=dOMYmc#sC8mS&MSyROrA^D+~dY!F#_PLfILZJT|DCsBTk`HL4L)
z(=)lLOGIF!5w-$UmC9L>7gT}tvmy-QR*(o{bj9wonls$>?lVeD;7~7@{^<c!Hwuv`
z>4aBf5)KYVTY^HT&6|z>dk}aDiVsuWzg1ph)atCTG9b0f?HQv6^>lT0Yl$<O7g6{5
z&hA$`Pdh+QG*d+yCOFxgZZ3zZ;@EHy5NfPZDc+hnz!26J00xht7EmURx;%tA{J7Og
z&1T8@IPrp!qYjIM2?P6`4Lk<@!*Ju&xj+xIeKd{bH!n*Eox@lf)0Ciy<q8^Fov%4=
z_t4-=K?>2NPNB(=?ioROFKk`N#8gL)BL#oMW3LXnz(F}?Ax{sE9`78SFl-E3wCr66
zGcMsc%($Rxkq4t;ufQEp5)dSARqyLE-i249v<esvOrih_79{Juxk%8$kKSuJ<O2Ad
z2sb#(wL#>;z^;M}%rR)9E>gVYAI78MACeNYTH^j3E2b?`RdA01^Cc#*J{@~IgK(O2
zi76T%Iu_E3478*OA2ff-6NrLQ8PgYm4tDQ+KmZP$p6)z8=(qs%Eu~tH?K5GudAUJ5
z1=f_%9TwbFpUGQE#PT|<gqOc7W)Q_Lk|J~V6zlv%A!YYz$d>2>FkewTy&jH+ptMER
zew`BDaw1&Cdp4xw_|A)O;CA57o!WP;TG{Ea6rb6@)l$<Xg5Wr9q*n{yNIOS+GN?4b
zQ5XT($xVlEh^?{T)o_wgW@1ebON_a2c~#w7&YZm*N_J03hbdBGZELF*o!zLv3_kS}
zsBHn!1^E%Y*G*YXzP$9d*DGWuAdC{^_jyp1)pXyEeS=kDxczZqp1;*AIQKHV37p6Q
zRrqeOA>__8(t+>Cue-or<|6Vvn_?*j+S+C5Smj7h=nZ|Z2tFR}Ox5x`BZ^Bc(svzc
zowSDZhJP&BnY214Z4h(_Rb8cWQ{1eY@4HRs-h?~aqA)|DsOg%=tMDuxGHWP^A*Mjq
z29f40I{=H;Sq7<kt2kzNV4OLN<em4ZvK_%I9`Lfqh?PUUbMF-5T_Z}PGTu5DZ$wpR
zvqr4oc+1?4EN>#Q&k{74AcPc*J`5Nyd>91IGPWz`3dT8GBi6>thB=ARaEbI}XjrSz
zY>naMszX_ixUpsMbNEs-a6tjlS#n!P(uw#@F7=PA?vYu-46AM>ozk>`VdJe2Fjy8q
zIAA_}5GnDd%+g0;53|>Kvh(8Ll$!)uh#P|{ftGrrsa@OFuGg5`R!=mBk#xbt3|QLX
zc?8lwc;Xo&%Yd%eT1dfNNzEbH&I2^>!AD_||9`Xh?hkDoN#gkZivNl+cQG1}014Yk
zz&MAo>~QAc1)OBp@yUZUz}V7^Rx{$UiSKX!)~la0Bf$1%?>^sXH%6N2u6|WlS5?=;
za#%MNt=s*|Y3GjWEoqI5xw-{wJC>OLI>|_xv(_*4psGcof~H9%K+<46Jm;3|*4&s&
zT$qBZ(;&3$BGCjGsAi_*CvST?e08P0?LwKl{TcoBf6-?~{5Ot=|4)zq*6uv2i2wFy
z{)a#2<HUcH6>nYyo#jqP!oPJ^+N+rU`{CO9qpI}Zn1)To+crVL==Kr#xPXD?w+#oY
zA_er3Df8o}4Wh|e=~<GM9?c59W+Jaq$37#y#FwU$aGr6$oQD@9NjSj_^zl!eylxsD
z^wLCi8yR-uyg!MWV1H-VN;3piVF3z`@WWXs$wM!|%u;Y5ryyx$lveDzK%O30HFk`~
zY<sj=jTk>yS65+E+zC|93%N8(@}SYi_rYS&`EM>xtQSb02!J1;%?wF@4Jt|wqnAm}
zaoB}zKLD}6=$xJejcJ-EXULx6n=30E4B0!#RnIs>$<;PJzQQ~K?Z=8sLj^+P3gh!W
zeae=5AgZ!X_>&06SHY9uJ8eaDrFBWlEw>R<c;6?%S{VEuQ0!mqWaA3C%kM(1j?nW=
zF0uBIPER`cy-_g|?C(>A{2*9sD^Xp=T(9ra6_o!rT>6gs)rf`7#g6DkhuK-DdKNvI
ztcUB4>1cbMw?KcD{1*U+-EMZ^e{1r;hu;4l-S9sG^0@hB|05vZHoxqDUk}K4%`f}k
z|64$C7wNkOz?&AKu)Pxjp-_Q843;*7?=}L&cKTvnroubHzN>dYwHzb{(TOso9GrYm
z?m$8V7mK!1rRgUf*;}xM3R0aGtbCUrozOB}R9i}gK+zSPKq!iwdXYSYkXS|D>^<uq
zdZl0l35I!z|K3QM3op>1QGM4&9|p{`gM;1f*1iYlL{~<-aH6X-5tM6lzNl7KHSOU3
zeJ7VFf#2PE`Q!1MqweAJt>Z1Pk+IXr*fc`LynrUi?@N-1B=2X#Asj;_oD^*}C=K|m
z??Bc+mCDRnZ#V=y1K05@XL}jRX}ZWaI#xKh#W)>|IarUpl>07(B`NE246j4Qv^tc3
zlFfo|(8`27C#Oxz7mWO>Otpop1&r8cKlx=L6pz^J6S}`RkFP+&>n9^PDQQemYBJlH
z-qMi*U2Q;@i)=cy`rE{_%y_3-joFS}ZFOafvzCoU&~sXK`(RA+e2f|xisP-11)RdB
z8bk=l&)@ijw41!|HK~k$5u1|%U?0pBvJwa|>Vq(;oG+^rP3wS6FyvW!a}0UJhgMwV
zggG6$XxYUyBV$61BMJPDx5_eAX@Am_#LMb*CPQ&;?aI#7Ij6dL|IJ{b3IF!t-)~Og
zzcG7GzW*j)koZBQ9C94>5L-#S76Z?j%KuT(1Wu_pBu}Bq+1Sk#P1Ho@LYcfNP1MFl
zm4{SpjJ65(!Z!<+AF*W`Z6$-fVFHKJIKhis@JH=rXEq6vkjzEmj8y-G&@AK&>-ve?
zYmC1Fvj7v&z)5JzV@)u`lG^khE6g|2>2Mg%n?lx1<yKv5s4DZV>QdkBk`4mdd1qC}
z2dnR7H#T@*IK74C3PZ0#`<)X?(d(WSD)ELM4xApsQpq8qR!LKca*yok^H=JIR!={x
z)nRWM^(Eu=m$W{vS(S&2qQ@2cWnd4!d&jEAa}_8`5_b?qqm2^5ZXH`$kYPAu*p|hq
z1ks%T2J_xJ<8T8}eD>0P;|#;z#^21}1VN`}u9}CnO6-L8s&J6^qW7lrh1kjerpUWV
zGBY3x05V?cC;`fXha^K(ia%NAoas_qFo{w>6Ka9H0$(s3w9(M3H)x1uj*Z;LNK4GA
zq{X)-#mmdf6*e_Fg)OtmwERY`P$5X81_`B^&2UcvO+ksuOMN&&8~V2jlZCD6lxYN~
ze?Cn=CdmCzf3m5UZ7<KJlfKD0hRZjMQ^WE~0b&j|7Zh2Bex?2Kb%Vfh30x3W+w%~e
z=+<~6L9Mq^v}I@=3*VAj63KG_=lv*2BRh_SW08S*GJ%$J`>+vV$Iinl$Zt2-pBcq}
zE||kbMm<y*Dnqdy;ZZ5^{y*(h=-hL}DIqEI!2&e95Ll_#`6xyIbOx#4-~p>9Zr)U2
zH}|LR{M&uP?a~;w+!;o*Cv8lI7FQ*2T-7A(8g3FgYFhntuUx|EFBd3H`CHi%^WxwA
z&NQcHG){$^$j539*jGhIQpj=dk*6}^2Qmvu8qc0))$Xr2j9;NyZvvsXHHF*<`B^#t
z2A&Iu`}-EEy)!H-PXNh6AQd4YvaQW!Pq?$#3}~(Huo9Lf`iy1qAi+$`TMLHL&%avh
zYd$yX|Gz>CxY_#u&g#QQ-<I|N-~Orp|06yX`u}s*|F4SvzrE7_E@-#c*S=j}dsx>0
zAEWUEY0wka{7d4OyD9!nA~?}+pO+N%rF3v|8F1@-a3m2%XWT<#G4kLd;ZO$@LjZei
zXD``0I_@2By_{n+ydMv{ThGn?!Ty^)e0en2Q00IZ)B5)=IV9-T&}oBPytnA4M>&3d
zcyN5+0&(8IdHvJYuJyj-y?+k9de!}_RbtI_<4r0t{n6^s(%G2BS-FQgFr4`*m3_I*
z0YUW_bEmM)N`@a}o!_ShDy4TGMg2)el5~@OGAO?euL*f^bL>c|658{^4RJejx<iW?
zRAfWzt_$lsTJpsMzoX~e(FCJ5O{Q#LJF-VCk6&&}Nj%i;wt-pGFDboB)vO}Yn5A_m
z69Jn3pY@41<SgLowq8_RsnV!o9JzpWn`YvVqq8%Zv!8S;dZt(lN(KS>9BV|WFB=4_
zDDL@V#U@2{ik-9TW5dT*%NUq@lI6H~MU1B^Zggvvih}KUvv5unsTnEzl=?JuOR`d~
zx-cnH-SWa(SC&6IKHS-V>6T|zWMy$Spmj=X^PS2H=**3wbKN@1RjIOyC~@5y+E=Qw
ziqgq?<2Xkf>zaWO33AK3K5v!P91U>jEv<yQ7INq;FN2wDz&{{~6{cOK&V`p`vD}NV
z#-2_%qm-6Vk4i3|^-b+@MdhlIH~_|`ep*vsW0+GhH5Dh(rD(&-l{LCGg9lE(VdS|r
z<EDP&fddcAT{vw`YnpO~=r=YsAf|3pQ`6GaYN$V~X~shFax?v*fpA^}z$~O+``lDM
zsi|x>i?bRh)>PKEt9C%eQk>g)EYaIF0)||$UQr`Tsp9ql^I_|r@;z&)h^u4&Js{^c
zR1n+e5%mwHax|Dq`yig2eBdmZ)}6?GZv$Wv?g{N9{E6wb@rymAv;O&V;iN;Q)`rPN
zoMMiOv*sNd!%~e~wuo~AU<NqXXHCBtC-QVC1zM_=$pk786NQ7=WJ4eo#ilt4oZ`B0
z^NI)do4(CUdf6t`hXbsa={>yJxKd9vSUNNCPSMHVc4ye*3fK<8^qV-ja}y^OO~`rS
z16P`_=1t%^GpyCfS)Y@&8g>KL^eXh*<)c&8cTo*<);FPa==W;+&+e6(>pS(UIR9sN
zj8EJ<c1w}ue_po~gL21?{qv^_IjuW(YFzxYdqon~ZF+Uj=@>N1ooeGh9n~?{{2=R4
z@9<t;KWfvXw(fD(mJSD-LDrG)8}t~uh)+<KsqJ3YmfrDsHApa{6h#;SGM}Ruf`p@q
zoLn}cAR|Dm2f(q5Zk7ZFG=)bISH-Ul8acTS^KX})L+A5OKF8ngacFlg*C2mPf`dv-
zdKi{#o6059#;^E$88!LsdFid-2)~vedPs$ejZA&gR>p3ZicaAUsHU7>4BbOAL9SBS
zw0@YWHB5(Osk0e`VmO1Hvl@TVv8&4aEVaekKlMbRdq&bzcz9HN+!@#|zj_&C&h?bD
zQyin!5vy8R*kz@KXkV%IvTS=SHBgM)?Y$XAR}paVX)u_MM%V6b0lZ5_(@{VL$nDI4
z7Y_^(Pg$+*%HX817eOCw6ekz)fS)>cZs$>cE?3oB$4wVj$h4De%N^dZCYWLuOd7!9
zbJ}<N<^_|@=j1kRcvj8riw0QNSI?b=;CXt3y#D9U()(f7kA@2Y1#iFAT*>QWMsV%G
zRP{1WFRG_(N;5`Xw-q1SjqCL!D>9-#75Wr<S)oh`G-`g-HaBD)gXtw<6;H0|HpdOi
zy^}IjdVm>ZHp~ogLyL=JH>_E%oS`t$M>2>jpi-uGywE@o6&2Bb%=9E1b3S3*E_}Cx
z1zkMd&H6vlEo26w@FZ8e%y_#*CwLV@Yo~oI1%%o-i;GicSEaiAGP%x7QFRZfltj2(
zy0Z05=9Lml!nyGN<AND3K2-Cke(M>qo{c>iV-JQJvOGc%GTr(SY$flptpvlHR@Q#;
zo=&G@nE{sIu~juV<!PcyjxhN2D7UL8c@O#%P0s9xu$PF`VTTcu2~$L^HHz|&qLqy=
zTX}IkM5P%*uu1$+TZdbRFMB_39l;+vbF{qJIpQyvLE3w@-|ar<S`Y7)6mWt$zuAZY
zt*ZzY5`b}1jQc9`HeSE6tu~us>ktMQ8LUqU{qzE%-4<57MO761$Qwtxv|;Ht$3~&)
z_y5fp_VCQjeIXuf*lunPos1076L^$ergq#Rqbk)fghS$7Ve&I*T%!LlCz{Za85Av)
z_{>v^be5za(ZdgK^tlqcGU+OTJCsF?8?jOOh7`_xZ^w7gKp2TG;%iGU4qZYD?r3J^
zp(x9Ly*KAfmxaCC8}?361fjHH5JZW1msV$6n&kzuyP)*VR&EMw(WK$Gm=^bwhO$wC
zzB3ze=`!iKWh$wGT;T6kz-KIQpsOFGHrEXgsfPxD#Vp-UtBZ;cqcv+i?JvV3gch9L
z+rznE0mx|Wk>)#lNI0ig@wM3GTL-zTinow)ACu?F<p*tR%y@quC8^1;8>Ant#Vjs9
z62Ak@RIDI@GrE5el`bMeZt7Oj`-rtZQL&2JjC)nvUm@}7Fgg=@-hT3A9E{>9#poVq
zoC~Kh4pquX@i>7o1Xlea((Dvlm(W0G9g=a>d4#VPf@m^{uAL*fir-NriAqa=IjTqo
z8B|+lR}M!0g$LN_B$ggT>2-j=FfKY>abo`^MJY!jR?i7w)lsL;POBe!JoL;O&?g>=
zMULOAfL}nyCd^(S4xCGJ#0G()Fp-zhHAZF`XP118cARUqA;4+mP0C4)<fLKrt_0%&
z{fjYKHaAzB?DT@}E10JQeO0(rhy_ANPAM*7zk}dC*MJpA0o*XmvX+ekcM=tYudSzg
zksUa$i__d(<ALY&6q3{bP7ifO!7T5n4NILGCqqOc>YsL!X~0hmUq|dc1I2wE%=V<&
zs47|GyHr`$bqcC1a#!z%N+7p3skdu?k*Tw`in-&*v5>y8H+M1ivw?lK!5te2-P5_{
z{?+ChU;Q(~{)gqDuiyYY+x}<u(WBK>&;I9edu{bk`=3AJ<JkYG6>nYy?d7#^(E#Yt
zO1r(X`d!fee*NL2^|i+p4#2lC?$M?^+(M<(t>Zu|JyB*m2ZztQhrz*X(pcHsRmYfl
z-ODJ6P5u@Qa}Hi_A3X0KEwz<n<NV&iPhE=7JC8vcUYW0W6Jvhu@5qmrUADZ@zc`A5
z{z<BC{&nQOJaTFtIYsxoKRXq7U+}lB=g;NQn`iuG?~MR>zVnkjIgm214}Rt^Z}#^D
z?7^`Np}Wstwh#8Vx8&h}?Y-tN-M>gFU7G(McaM(EH|Vjz*xHpo9B=LHnqQnyn7_X`
zINUurc&&fDKJ3bmW9JnB-Q7{GZ0{Z%b<Ni|hw_8vXZnu5ARJ6cAxbtL5hKxznkUVE
zbA&gIz)L)N@-2DjHX``?n7^LD*N6PI4_`a<b%d;j=l;rQgK!<RVWa`H<IiyrY~kN$
z@_U>9#aeT7sNN@Bog?N?I=M>G+YZKCle0tlyWb3wt!LX|FgJ(z{JMt-NgQLdT<Mil
z2^bftL#SI<>5chIE!mY2$?NL*J+$k=cDSiIzna=OcO9GFVmI~kRk=ahQ+~bG8yY;S
zYjE|35gyfy&~MQ1=uu5aZ(2Y_H10YvNM3GQ1-}juqPtcBl6BWAK-}(H1<2r?TRFJ%
zSb((Nb(;VYzH1dA*LU8G-Tj-Y9C}sw2&h9+r=i^17I0cPb=o&0cK0uLt+9K2=NetV
zhChCP+u&LDIdx#0-gSrK*?8AF>P)>W_2JX^R`_EttDMH4QxDJdy5-uh8(mF%{^<OA
z!Y9;K+pn1v;wWx+Qe8QffcLoT0moblscJU<?+b)C%YR?)0CGe8r*9v3Iwkq<;iEt0
zzdzzrCI6k1{MYV05)Y8ImG(mv09PNbKdkToIgkre<@j-tOp0kVL=S*-;M{K;`APYI
zh=_PzmKx7%Ts=@k{LBOhl}QnT;AhM}kx$W{<eV}V=}TzL@DUr!1HQ7%m!ZxUMw+w>
zo<|oH5Q4kUiR+ZV<>TN4JMUg_=RqIiM_@H7nGJ{8C91plR$%?!-21JCU_JPbD#Nd5
z`0IQ1Yuowt><WLjxoptDvJ~F{N)_1|h4l`hSkC2SIM1%`;Yid^oy>%?oSFzxFqHU;
z?8aYh$PDF8>NC&By}-nX!l!z=_$i0kf3+OE!UFMC)Gvm7_pfXq*l>o!ArO4slSZEL
zlNOZq`*m`SCj}03iQnD}{P&$jctatrlKwf?KaYl|PTSlj#;}|~#c`IRP1QZi+C=qb
z`QBGVI?|KGFnzF{_UMWR4;?<S<V^k~v0tK`0*V{E2sS&gt$FB50Ovv9O=PDE4^{W`
zW&3jAXy<R;-uB$w_wJKt<tJBja}6#XEXkwLEwVK?_uW1B(ZTDvxyR<&>w_bDwCX&8
zdJTS~ARoLAof6wpVoMd+a^F9b_quD_-h1dgz1K6vRD>42Vty8b%b3DmH+bzs_N&PN
zS<+<8d5S0ii>}n9=|>!muh|>*l;gOPGWyxh@zKuyajPx6626cr6aeR|n&ec?a`42f
zq6f0K^$VIAKoR*g@ZLqL;jM;WGPjEA%1@uRl^GME6;lG(5Q62{8*+E8Z5AH%pl35$
z(<MZE?ibxEk6^260ME+ho>i6GE|=S;avZCTVhQ5~8Jd7_NZ|MBLLiF~6=t`H)r$dt
z^s3!Rn`88b`5*khMYY4#@X3=jgn!22%yw39)y}H4^FO9h?W^FP3L`enKaYoF4<+qm
z$gxUz**z8|S0jNo=!WlLybWmIggHyXr%!qR;dLLkFWa!W8d}$SM;4eSxd<g>zleVy
z@E}w@frl!%U+=;0<TkD8YX%uiofLcEHmWMy?h!BqLLD;zzM|B<-|{-YRqDIcZ%*rb
zzSU$<v-&-ies4M5)-@|S{j9dr&%91QtL!w?Z=Te5`dO1f&Fb`tbo!aoX<f6T)7!P3
z-u61ZUD@gF*`3~QGN{{hdfVx=u30tHSM^hU<<Iq1^<-b&Fxyv60e7qUzH%qrRIccK
zF5R~W(=z0>)YV+|)pQ+dG~K9QJPjw|k_E`VecwLpZXE;uKHF|&tYi;w+O9O}If;+y
zmWuS|m{G_e<BURmz4&28XRo-ke?VXRW+jc0k8zJ;<BT{se1+!LAm8N5@ScoBfb_#b
z!^SYm?lowv$`cig+cBnxlOI!$G};vJlhKBv;qWm-PPr;Uk7l<c1Kk3(bMy-BALh{P
z0g#^{GZZvorgKH7g<{^f0tUtpf7O`Kj!26Tz5%HJQLwC|m`Xy|8}yF4EWuKdy)wYL
zNlGRJ#k5JFf^_(5i@Qy|{$2N4rd~y%Q**~+!6_cGz;20*WP#g1z<}*@bBg!SfDSpT
ztAc}%UgZ+%)hrdj)IZ3;D5SdBK{O2m#*HVL)0`jxnJ}ae6ru&&xo0uyXCRsc^Xh7I
z9zk4ZQ@q$r&qxByG3M2D<l2ytjDWXOt*`RAhnJ>vbHKmmb0A~)CkZ7sy7zUUw_4D3
zx$J7LEY58O&*lyru+P>vVLF}xM#6`S(A}1lxzdGj9!X{Al*8*RDH?3+vW;h1HVmI_
zP>dKjo5ua6C8yf{&aU5y<>h777yO$hLtR5%WcgLdqH!9(efCZ|b<e)NDvjXf$?&a=
z;@zALobGhWqrk4b1+>}@ZTLqe_%>Xww-p-rM_%Vmrz^`=^acCyOh99Atj?$lsdDFk
z`y}RQo58cDQwJ}jobni7S%$k2R1RKhZasfqF-zDv5c2G<@m*A1*_K~+?@a{`aoI(`
z?DL(U>dLN^;2zZW_Zz?L>w}-`%Ko=s_RapDkBTjC5A7cu`$f>uQk9aO(B1b74de6-
zgcKnDR?&O<4yhVRVdpH<e}~*nsq$ZYudzIE7jv)yH}S6pu=^JS47X{62fHaq76$*b
z8Egp+<^3z2KCZ0yB&ewu1ZKF^HS1cGn)l>3h$~Z7oXQ5xz?03V!M4-OIW%H57f5cC
zhuom4V^1TW4Fm;Y+>`4hch1S8EokDl*=}`0wTBzLkF2-PD5V~cT-`7kP!fl3MpZRy
ze9NTp#H#01=)l>W$1%=K9I9E9n;)*53ng6I#2RR=2y>O3@(eurfrf#UfTrcQKrn^~
z!qQr}NyR>Km*ghOh1*ha0}I*I@;N<WqO)cXptH1Ho=S!X0BbE8x%&VLQ3q2ot2Kps
zoASn8RCBTA(b&c|O#0%B*Dsb5MVOa>aR*Kj@RJhMKGRzfueiAS963Qy^cmw@B<f{$
zwwRJepz(Awq`~n7%6(VqgzB>~ed855%D#Pe^{(kJbsFmB<?AntfHVUOmH5Xq$_y=D
zHMAa|0#-BF7Cn~5jV-C^Hk5Vl*H`cF1HR@M*SfJ720N*`!fg`g@Js^n)2cqhY|z<w
zIoMXZY~!TFyCO&aR++z2Qqd^IXr-&``ev9Qp+9Kw9$=yVoqVKvY=euD8S_j4pqW2s
z-mw+D4c$SrHLcsy5Q9&Xnv&oz-*ZOBlUXq~tPu6-s>Te8*9`MU43tkyj2h2z&=@8k
z=@vr`ixgYi4AE;-^|92ZP!h&Z>aAN*ZIkMipbB;*z-_w(&E0!z-WK?N0LHhiT6uxa
z6B)XZB{^{OO}y(E$Nl6qfh}~20z@Ab{xs{j+9YI22wDu4GcKg{28CV+XcU6Pj2~}-
z-eY9Sd?9Ec0SKL&B<iERv?Q{9n2yF@{W5`t4CC!)w>qAnxLUxVmxE(cD$)%?0-FNr
zkeYI})m{foBs(|#u+v&whb2c}Ip_Jq)}wV;A@6zcc-?6gF-c2nTdL5v>moa2A8|Ht
z&OzkCyyS8rvNbu|LscqTa;iIdcIGhmQ+PU)8z~v$sT+L1lvm=gTp}`Eq!7cnHn1^H
zvGb<ltDvHymJgw#0<vO@(r7T?J22d6jJV<WEA#D8W2BT@)|FAyg)w@E`9&<f7Sw)L
zSy`sHNoMs9fTvG`hhZ7a_T9mBd@#7mTN+Ne=dAX4?A18FvBtNgo$+V+me#^5^BHL>
zv?DGlFARw!e}$xoM=F5Ubi`_RaSDn8WyNA6zom)TeX-NseSXw?-97BR*nM;K<J_ZF
z<74p0-v7_A|Hv_o(pO0Tb(8(a+T(WHkN^1?{`_hG@dtby`ww1mvi{KFKfhmTe;>5h
z)*pSlzWQB-^*_+IK{Oe_{wL?O^ei~K2EsSO)PcZCT;DqWr;6+uPbR6C(u@4)%h|wY
zr1>(>iewafiNA1|o(sb6&a)fRenrzOYR`)-D$krm-&s!1N|Nfs^Hri8w0@pw5Wp!M
z%Wv9`8zZjcL`b9r;Pr{xpnVM{yhVmjD+-g`_NPX^DDe}Ps#s`N5_CJQjfvdt)S@))
zUgmi#==uCN`Fik8KHm(~2q+&1r?-#O(5oqV$grjkyDXhp<4$}k&0~BO_oqc=GT#cY
zIbmLd@>^!(!t}JwIW8r2ft#JgZBU}3SF~5PVk%WNc~V-<+08iEfNv#*v{`lJVa*(d
z)!m}zZtB(~8{OC~yF!u8DBihY6j-&Pn#3Tl&S>O$<!Fl0xOO-?6#_Y1@4epN+I#lq
z1>SzVQ?9gtV9K4HAxXXmcy3btz;_$NXn>5Fh`G~LMGd0Vh1i1#-LwBbjrBsfDOJt9
z=o|{O@Q4$#&%#>+P?EP-FIgz@*kMqJ!jyc0v<{2qL_2O5K(5D_P4zvHh?%>1J8FDG
zL#o#Z!xj7C_U^&<D`r`ay4w}Q=Y!<8&y>m0Umghc%5&_e_H(A-(Z2=PaWvWd=C4hV
zEz;tA^P5pK7(~~b-wc`oNM`Wr$0pj8ZGN){Bp~i@ese@tI6-hp#V%38zNW7qfd1x#
zyx9B!s0|ePO!<nAEIX-@%E~*-G4*47&D5W0buA6!w+i$8biV+Eca+yU()Z8m0qzw(
zJf5H+O@U}qiQJ;&=krQ$NRW+~g)Ni0c+pPnY@IZB8wz&p?Diuuhvg*BRU3Yab8Z6%
zkV}FvjuOgw%7Y)^-(Z~yNoIB2%3)rW;g}lq_S@NAFko<}&QtCL?z-NvsH>Hw!I9C0
zEDys%B^icwup_7et+c2ys;MK7gfnRW<p{ovk~~M&4tTZ!j*Koq=S>$?KL(1KxXaW5
zsUn~^9B#Qfru>tA{+m9NYGn0#MNn7;iMa9e(9l<&M>ye{RHwnbffd1|7-1H&k(&KQ
z%1^a$U#FRPbG)rL2b6;b&qf64L80<xIax~H-(PT3q*yhHxwR`(iVJ+DQexRT*9LZ8
zi!z@^Ys~;A{m~ec%FQnp^AhydV(-{UO{X)56Z?BPXugL&8DW=AkM&qB6rBfBJC6+C
zsP(iM!S?Q}q1%OkE?b4*S5+aT;#MjASyc>3xD5+_R<?+Tgk3I6b(SQjARa4LIsCcQ
z{(g0}s_doPHvX&u>K45A3To;`h3PD^O4IMKf+43J(C_Q?P=w0QrWgqlBgRvazR4AZ
zKfF9pR0BB|%+r94KRA(IamqQs_YFi^liEfQ|2~1FtcQ)9H1Z}BAqDNq?A(b;nL2TD
zuTbOBV1UDDJUD4WV>(reHA<Qzj=KPK!paKc<ZoMD6*Y~?40e*7sqA2smLR>h`y_Ih
z)gPE1Nuaf~WT%tkRyi}yDQ!t+EG5GYF@8YO`?O+KJvBbb=S)N7nhep)BlF3uh{aRO
zf>=pXE4e!CRu!pK#Lqi1vNX;na^&IFppquz0qO5CN*(I^^>QKcG&IrVG3rkz9CS2M
z*^8`&GgPz4Ep#JVOW~84P+QUXjbw;HG4(+qk@!Bw0mXVMbeyw-wei_l_cLE+qJy-z
zOqJ9o=3+p0{9;U(++s*~{BlB?+8q}lY-_(HZ~Ru<Etr*C7W#w?NK0jv<<dxk{Nh5T
zq%@Exy8;mmu2Dr<R9B$H=%XAlxyCX|nM)zU<$!ExuA=&2abFqX!4eaS8wDebUt5R6
zW!S28L-)}?#Rai%2teaj2gblu?jRaeX$AllKYgBjz)E9x+<@n-#;O{)lbstY^rPY}
zg(2A8?$N~`{M|m--Q7Cw^7rGvzUFUx2m5IB`PaG$fFk>E_PU2V+f@8`XRrHd!*9}7
zk3-X}8mIQ>fmQ(e&0{3mh*HJR_i;<lGbRHEF}a?Xw&yYL@g%|hH;?l@&svvHzSdz_
z$H_6x5zZL)x~-SU$SzG5OnRldS|h0IDR1C(X5)9wV0g0zD85RHsx`vr8ht3OA@#ZY
z%g%A{=*{+a_vpw0F3EE7ih!iF%V?6SfVW2K(N_|?y~FqnHCV&s<gE%@^4mNK<1keG
zD4G6KlU@yYJ=81wsou!0!ME0yleeN%qpC*5re7w71r&eE8`e_rJFVc5cdXLV@A#*F
zN6HlQ4u8r!y+W8C(Ap#NT8%-fT4N9mk{W~j<d=v=f_Ze~_NDt6FOzn6p7l`gDiOBu
zhQ62OH8gCur*8i!=`Ngl2S)&4e`~MXloc*x;lD`#Uw{8IjwX3L`5G5MGw*-etKY6Y
zEZzTn`|Y3iKYz%_zW-4xPWj&+b|Sd}g8x4X+K=!C=+XD(8z8)rcuh6$eAQ#_Ys~Eo
zccL;v)Xe)Cyt4IfXDFMC|19$!V6ac`(J;R9o{Zv=_eAB&o39C5Wj&Q?bsr-6_xr1+
z!+A(NFkdm5ls!>C0+9jeN8=+|^?xLx>?bnI!K5?tTkNPD0|JiU+&Imf0lJvLm$3Ep
zwDnZtI=|%yQNMs+Z<BZL?2J3p=&wD=P%whS5MW$1hs{yQhLsoL)5Z{u-BFLEOW=F0
z9!|BR_z5YeIYux2i|N!jnlZiNjBsA`(P#K(J1y+!srnfO@=da-1RtdksU|WqWjf|a
zx)fGanndf4oYJO}=L3iu!%PVoIxH_w23P!d)k`|4sH%=JPHm9L!hJ&##(_jpaD^>E
z^C6hFJR8|@nc3=yCkN%8REGt3042F@%LVtIsxGiSiW<r%JxNwn(XkHUPU|rNCIH0c
zi<oj1N^0MsiK&jOVe6bJj$+W*jj!bR8zL8Gmx!;%6SqJUpP`dMuy{dH7470t+CR@Q
zm-t7Jz+JdnQ9aCCPm5(P0{DIWs)uJPVto0HWJXZYbyckGg4BpqI*&&f{CwGxS%2xJ
z@ue`3*k6+%pa~Ke<@j1w^1O3h$s<O@$9Sqh89=`F#?GF@A652XYAwG`i|C3KuTbWm
zRwp>&E@|AtNsu~LH8J00Fa)-PJ;jE&k<h()GaaOz88k2swDj&&dPi?ul{K2gRi@2G
zrSoadl*7b&7d7J#_bP{R%EOo+;m*_n`GJ@PBMznu=>E-sZ<M7k-2VD(cp6m1@#qmq
zCDfTRVtF)fFE-So!STQ=hBa`)VLDiq;0Y6GutWxb6`0Vk#p=GLrbT?b0;xkOsVeX6
zwY*VUZ=%(AX#GC6P7S%JOlZ|FUp%oGK6`{zMgu5~>XUV>aXeyefQgm*O_<zp?l<b{
z{YD>-m#U3}OQ3T2lsecOMMeL-s*AX;>RYD1#1rdk?7mt<YK8D1wC++kto|lb6vP}>
zE2!I*idodC<Y_)DM^!@zTr@6Gg`ffK8Jmb(S2$*Ggr$v8K}4vZmE;AcisEPBJb7uY
z_2g@E3zbA!L-+k<vThOP4F_9<xbwwM9nmgr5!nkxUfv9-_{Oye8u}E9=|uXNq=Vq2
zSmubV52OGsaG*u_vwzV0uQz+IH~7Uzc=A!cPnYv$><&CiDz+bTI})(C<{X3`n7LB7
zg51vry!+`DEy1fEgLy>=faE%_BJX;lYg<#KT=k1)nyq%sGT~g7iJ1~<iSGf1#UGNN
z&4Qb9P8nImQ(8Jn5`fc8lvk^Lh6C{+17hqY9D%9W>zz%q%L_ns+9PxT81A)6uu}8O
z0Z~Q&Ir&91IQsGMxVN|U3#zU%3Z`)Fr*C0(>g9QYIy}|QCte$&)tk3cXld!)vdl`r
zcX|lODra}vE@~wPfuV2rK<GG$CX*yKLvN}=Hu~G}mX=&13k*(At>G|%1&xM?1sBbf
zGo0D)6%q2;qWSsYqRF0q*(vb-EAkDwgAfC5G=ntskkf`+i#u#dglLf7gg+I+2#=e&
z^`&%)Zya`TRY4FsYNCKvv7lH<#2u$T>fl@t`WzV4qFLGrG$phI6?-xoe3<5iDw<cF
zLMh|T?BQBnlYWsT(6FB`2`DPhw|Xh3C!#;CmO8pzG0+Cl5)jLhghqDfxL?ijvZAkU
zU_~~JFXG`%Lz5k4cjKw9ThZTE%PJZ!Q_dT!pB~*JCvzo4`CPAuc$Rpg4K$KF5i2_@
z6D>iqxw;V~PvAA@IZDhGD>4uWP1ONud-)?W6Bl^MJa`cJFZraQ_v+vYZ3aSRhdp(w
zVGT_nEG9Cs&u+fT#bkG>7BwsO7mosOfz93`KjSxD++V6yZ8_&q>r+jwRXGi@>Cayk
zsn(0tRDp$%63rya3S4NnYLR7^9P0woD|}r?e@`|2)pKjD0IeWuV0I6-w@4+UpU`w^
z!c%GzF~Hj1SZzjO;XR!48a3<#fh(x9z}g;p98LP?M3ZaxhPN36udPkkY6D_pPC~?W
zLuL@cNu=@BPU?sYD=^Z!|3<KEVt~2urs+VgP8<?6iY6avVyZ=2Lx7B;=wvAS_+)4y
z4?M**(L<XGNp-4#Z?uX@#Df!hDJuhI$`?v#HZ?>F8BMQdOtDRSkR2hFRg_zj$Z2j2
zf__t$7bM|QC(RAM<{t^rPZBmj!e7W0JMaP#+C(IIa5l_NtV7W?`BT*^Oj5{>5KSc%
z0@2#0p-S76kr!%YEC;BYx|3*jNEl-ooVXpQtpn_hrduSB(WGeNpckJSztD~2F@Kp1
zhiDu^E?<$+r5QsIHAZU5P(w9L5BL0`Yy`#R8bFTGP%4cLSTet|mYrw?Vh&6Xv1_O-
zAX>naYlc&vbo}53b0iJxMB_;(s4{r!`z4H*Ne}E*6Rg~TLn_0h$W1;-3P{v~+KXj6
z#x<&CJ~l;F<F42IK~F2w-?7<^D~4>$WE?6cTC>A4(e3g?`_t*jR~7_ica5b?GCSEW
z)Zq$h#Oxj(1DNHrj@gs1Feeq#*^Kd`?fX?RiSS$^rmMw3)MQxq0w}0zRRvX228nXD
zkdqk@Cgh8Ur}nnw7RVY{HMXi1q_6OfRve#cvWRPfQflkLNrWR>M*Z?dLU}aLW1Y0P
zAD3Htii<>`CA%x|*8&^gi$RS~eXu&B@qN7JIM{hEAfV|E>H`1<gOGl)Iz;sj8p?IT
zF1IfZJtC=B@qCjQd!{yJeTPG*2wKqKD=6c>uiifxr*y)buSN&Hv_zsGoKoBD74%ed
zV%vECa}?g2bJdh2v9Z1$wW3<QWo?rjAM-|osjqwD2;SgZ+=_Dz{MT+74*IIz^W}wq
z)Y+$Rv+5p$M~H{1zN&FmFZjwTkA%>=1(5<qM6%cu^-`VEtLlL|&K-7uztMs3adj3N
zAXTxYkh0)MvsX12H*h0X^De((WG$_DwnnTihxI^1vu9D^gK^z(A#^ASyEYjBvoRcc
zHOmE5oKS4BewG%K3@|P4XJhhtr)dX~F9qa)Us-V;8Ycjmto#0Y0TX=Rbk3VvXYKr{
z4FYH8ou%cJh?t&FiRC(JEDU^%n%^QrT_p|PL9dEMLtU$c!|;i>y@v3$EG&KnRo7U(
zNoH%i#v-(jwcG^Xq?IbkNr!GFLoPdrSpX<CIUQz~v*oBU2~gu&$!W~0lQF-*`H^AP
ztF5Gvn0qPC5BR>rE^;myUdl$^D;s$+iU~QHQKM+JSdzCHdWF=@aY%xUF0iOnN&aSr
z5Zyymo}P6(v&}~J#>%)$C6LHKsLfR-_+&|hm1f~vZp<T<v5_Fyu7_Vx<OM40=ytbZ
z<V?an^#iGjK~T95H#u|B>K_^>3kBIsOmL`<0)joD))@@pwr-%Ws4P{4Q@4mFXhpn<
zGMzmBK&31K?{0EkJ^kqX8auy4$>}`PM}U4r^wdIE$?MHiU{Y(t8#{3{yzlVr7}B!3
z(xw3Ll53NFGV~Ok^9uZkD<EDKhN#m0w%T>4R`PR-)2(jf>GFmR22WySkJ0dwu62aO
z0{?YR$koZox~%oI$b=r8%Vz51HTqaqAIgu5stV=8rTYYAnktZUHa6ak4qB%gV*RQ*
z7?8PQr4vu0WVA+`1QA9QmEY@Oh!;czCX-Ae`xFpE$d~*e%xu~b_d|scQpizv*1}e4
z)6M;Yc_3||Kb8es6}TPzj~ehtp>gn+Q-0b&KdPhf<4kDIA)$^9SqdB6Sb-bQ9(>K+
zig)wE_bSdD=&fp(oY|J6Cv?<<MscXcNV_eaKYmjc^!N?<`jSOWT=vFk=rbgWY-}2%
zWQ))-4aJANor0D{E69PI_qn^Z(I?sp(nScYWG23VpI}n<OHx)Kwcu0>z>cGVgSMF1
z;JETomPtxd7{`A+Dr`#{bIC3%PHJ7YNb_A4|F&}wEdHYz?47V<(IUIB*oGhGVo&7*
zS7ZUC4LUG3%sWE}^l?JdC?%H>Jo35lM<)LllrEEWJY^3hRk9iUgLr`>MOW2jOJI)A
zhE@83ZjW(7{aQXnj<m-iu22C&=5f89BmSbiPsBK7*~+ObRTRmQJ7?WwsFog9kMn!*
za#DGcyzH{~)HS!&<>Obq?!ghi(^S{1WMiiu5})NZmR6NgihDB8@wb9n4@<*ntBws2
zMx-x{#s+f&Q}yz2Yj1DsFgSd(+dT^C*%tzJk1p}Wt+hTQ9HtWm%e9^cZx@yqg5QIM
z^@Vo<8I{r6)t_Yw7NtuMjPd~lYo&X*sIYf2E}^6r$tYG79Pyb(7Nh+FL{|Q_1fKMM
z@ql6Lm;RxB%~6$a9y*tUp)b5$U}L?7cMCp>m-~#R+5ZcwP%ke+X9h0lLYd7JE)2G7
zBN}KW{0boh{0~KAo({#FaXXVkKAYrU;OJj&gb|JC8@92{vavXb@El)QsxTcZiiv}o
zI9>~}MdhPH1z(2FYopclT=|d`PLRI$6W~@R16a0UOj$>)Dp7S6&M#jsUt~EnDORMl
z#m6ya!9fM+2_9c`G)X`+??Sj=x%DchY_Z?hxTvcEIyTs*GkE`Y0cNWG9?%6%ap3Ds
zd(tTE_?e@$vo<V6CeRf=$`-CSFtrTwN>`$NkoMAZ`$m!@gTWyp0pS=6l`me+2G{CM
z!W_33ddCH_x!tPV1H9TR?X=AWrsOz8rRl~kddP}y4MK0_2bOB4q&CuVqN&NkDAAkT
zLbKcef~!#A;F8oRZYpIE+(m*`o?3AhUg3gbPcKBOXEm`M%c3CjJqjLZ?Np;a^0mni
z2%MgE0?cqXtoCF}VVk8$Zx$+%Dji$Zc;rkeEo&q%7^0Gbh8O}yFv4k2`JAbnK}JQj
zc_jcrNl^)O>dPkB8t|%~;CrPj37N9cp9A&Yo8h}m5?VR#z1clJ>>jIqMsHdz6|{sd
z^7`2nZ|}TYfClhqX?B@f<WCX4(2d$)T|TJw*Y^+iET#Vpy!q^<uU<Q|ZnvkmX1AMe
z`J_!9;HoRPBX3+<NRjEhXLcaAk-BazuTtpq!7dF)#1B8*<|rU@SKl;Oy(HyR6_wM$
z?SoZIfm1P`{XP$KImIh7{Cm!S?d`}V$f@2@bQZ3nbKH0Jps+H_s0&5RGU^Z5)?&tV
z9T#B@ol+}TXr0LwN{CS*QYVG-MHcC-AKE;pJ~V#gLj$&q-lj@az+PFz6jl1xc%N!_
z`ii4;;S(I=q<WYA>CknxOH`nY%cSU^+aS!XTt9++C<pVpT+(ASJm5<-xSS)f_TAtm
zGMHa_Xq*t813zXA>+N3a*TyOyPg1^J*JQ&9a1ofc)y}d2Yu|ZwnclA}X-$x_MUW8#
z6QD+GZH68lSg<2B17&sUuI-3XNL4fAXi{J^hThn7I%DV+4bjD?x@mCC>ld0Z%Yakv
z!;OW|ND*wy&o4eL5VkgHqcat=k1_|RbOJ5$^1x01cHDm_HugXfI;STM+RPYm4F#UK
zp#7Kt8_nD>>4a(AI<wV{(9Tu(HX9r>{0iI`MH=uw;<4=9X`!8OUR0@Yp<VSBMPU39
zjbQoTHy7mlr{LX9q_*yMD<ud<HSg+PR;yTU+-ac>vIKnDd+FW+9pCY2TwLpYrwNpz
z7eO__s3sXaJQ%eR_SL6k0bMdnX{y03Em^qkVY}H_rU%atj*m(`c)z^7yx>t2*RKK7
zLW)mPgWX~GUT+<%F!@$JwB*4s@G!><X!E4(yp*|0^&l-X@L(RQ&ex5vT7UNA))6Me
z{$2gv?{=T#lMNNoxCX%QWewbI=2DZXN|%}WCpgxpcmRm=%Wh*HCU`!y{pS3DJc=CM
zcRKjsK~SPkT3YiAyV(ewXH99Mf#cA7pxR=)6*Sxy-8l`7Easb<I5*@XLsJP8z8nvE
zYCo<Mu1>PS^(@yEwo-}*Xd=|qJe8&$R2>jFc;8sigyem=AkLxP{pUXIK&)e`VHCG?
zXz&XfE`MG29Sf=H3K_StpiLiCSJmFH#c?cTMgOT<N@H~-15><$*L=7jPf^J`ERBE;
zBxe*QZqz^5P!+uYoc_Lev%h`3bFgn6ah7&iTC;2x?71Y{C*K+s78l3TzJ+>F7lj2T
z?I0fu^!1aaZz8K#zTrf}NR+M68q&A2^0b9@$G;;RR<X58it^yWq_fyznGdIBsRQSY
z(p%Jx0B%5$zyI_mTMktcp{SD%ZBq5-zft;_aab{@*U+4v?k=7Zu*cq-Re47n&9OP9
z7Vk@wf_Ua|sG^qh(dZ;Oo1z7j7=tymFD+RIUXf1#ssB+P4h`X~a89k}`$OTJk-V{v
zCHD?;+JZ1jSDQkM?8b&ugJ(3yD%R;#sZDUoXnxvfB*O)wBi1hS4xmrg>ikx@I<|nS
zhh;si=yElD?YUmn3cs-%a2)vvezW8#S+iy=IpIwru?$jvL1i&`j|D9ZD|Oe13pV)D
zd2F1sRf_D2W7z17j6;g+(85yZ{=q&;%~TP$9bfP&)rn4!?wx{!%leMgQb{q|NzgOH
zuv+RQl@TINEhwHYNRan-svyPz-zZfl5|Q~feX%vCz%Jn6mdxR#H3o1#|HLVRDlPu#
zjYFr<J+5Oh7^le<qCeHp`@mJ(a@!^%y}Ii*ON?gndYSPTSwZF&TUY)xrs)t)3JGUF
z2<iARF&pX1@#|j|b<O#Nx8bmb{t4GamJl`p4&aKsk8eDAO<5(L{Ep;F?&uWNzuhsS
z2=lB1sg|6V&e&ViPQs``lB3nYnX>M25AgD)F9~W&x>F|pUSG=fZ%LA-sdkmmuSX}@
za26pdnTSr3Q8c-}?NaK(t*3eym<0x&3PeA1;e{}Q_wVo~`u)1R&<DWp=If`MgmT@4
zHD~M+x}mUSrqIkNv~12gU+H5MJ{Q&@d@KExjI&JxwLp4T>K+j-U99t`>PF0}S$$`I
zi|($Q?v@tf7JV*nrrN7NtG6hZ)O1xfewQgn3g9ypwM>kwBrP9Y7oXi3y(@3tTzN7Y
z598bIEmIcB<eR-`-9y+S!Xo`1?C<QtzZ4hgcTUm<e=(uq?-i$!&A$B}D6xwL+~4h8
zd@It66pZ>~6JX22`4zl1(r3W_yea!8xXhcT&o?uR)hyw~40f;<CQMyT&oP6t)$v*g
z$A@paH6ZZStzf*^+C8cRLho(`#n!mlR$Tb0C!YkN9F0cB2+|6hx`;ya{V0`$bQNkS
z6*DYSJyHymIfwj)f(M(y|M>bfx!Oz@SW6QuklN44g!YW7ERa>)p?bGU0ZmuK+lxTA
z5_@iQ;;Sv^9o;?=#SN+OdbR0C-MIr}V7BxPT@*>g4_PEc>rHw9JlPr4Ni&Rg#&K)K
zLQ<%N`fcs6gJVSuVfqj8_l7mStp(@p-p>A;Bm4coyYF|q`y1{c9nf#~;qQh|ZJ#Bo
z=O@XnyS}jGw!HQH`HX%ay?JK8UGzrvX4ihZ;=X;p^OODd8?Wwx)9!z}Z(kq$yx~kY
zC$V<Q@FTa_e%GD3uKT+C7w2{NFLoE6cuV4e-tBrTX4ie{)_v*Ked*SH>2+&s|GB#+
z`_J712Zzr4gTq<K@@%IPTi66x?!bS$XW|eJ<5Lw-5x(KB$|gy1O{``d0SW<j!8S7q
zKAk9r6eE-_+c;XNu1+xv)h`Z)OpP2IK8HgddML!^x5v%k@u#Nw`)xD$w&E|baZ3xq
z`xgAS0{?xZ$mDNr%zS}GA2oxApPD5~j!b-Z8BaL1Zw7o%5j42FQJ!c0B*JKrp#rzo
z4Au~u{H+2P{~fc&!6*?T5HIz!8bS#oY9l6tSkc?xIv~d5d!XFyPvr*LAO0*skN5_(
zxROmmWx1yuJ>Tqa9safV`f%sqaOe21bKfb^#jNGjSw)=`6Gi5HdP0IJTJ9N^?DqgE
zqI!updPHY*Y0AFD(bL}38xC2SUY9V2vJ6M2JLfR>FnS8>_nwSZ7OdEmLf2F?wOnK~
z&{2JK<U?`HWC$5~K`?!v@(<&itB#~8#VA+g-{A*I4SX6ju*m&Qn-<Rq?<d_>C!D)3
zw)qf?cUq>NqC?MxYe=Zq!aCqst&e!e`ggOS=g~#1<``2USIjaaoEkA78>JyD2SRJm
zOjGbOP4DPz{BD^D##4LdEeqNXk5$$JCyAG!a@Iu9vnRyNhcV2D$!%G;5`<SWOq=jv
z6>bm%5?BlJ-~zUqGXx?7&az~AsTWjH3K2{*8saS+Cu@AF67G%FwH}+{lUu<wEhul#
zz@exmC-T{mSNVu{QB8cmzm_3_m?8WV4ZM%koy0%Gyj$OwksoyLG#d`HOJ<QQX-{!U
zl>%UwgctkQ&I{`|oZ3$DH~YsZbm{j8N9ztls`7;R$M$OJtmcbd_B*e%_~3VVXF<2L
zHz<;{pE`S|8xMchW}`FzYWW7#@$6o<9Qw7xCl}K`@{Lo)S<9)S11MuGOA6(T3TGX<
zO+`vZD$+VfibfI@TCS&9p963pe(>SI&PqQXsmL6(ex;|2%B#yW<=4S+8XW$k$suN%
zDr`zKp#18jYSO2xjD%yb!cm9D#!WJuOs(!weh4qpV3UXDJVQ`us0?x*dxhbVDA5Zn
zXyiT021em>u!HfXn?a7m9mv)hx=$h?1zIA$L{Q=s$p0|vv&$NatrP}^p7*oywVH3$
zraQ;W<>=5NJD(1deknR^#l#QK@8VEz2STyU{P~2tfF1!)1$<jhk~>Z@O@TY3<_=r;
zQ<*Ap?7ZPQ{)Y{pv%jAm*9xC0TgaXL=iOhr&)w8nT)@Pc@x!($`I%aF?n15Zv@Hdp
z2ahLUL){pZFoD7!;X;}<)NOpK>?cO3`ik8oa9`d_C4`gFwKVBi33$p3^w)3NSkbgc
zWQ=Jk%aq+<rJ0SoX)DF~v9{c;klPFNsBqm_w0N2(i5&N2Gf<cY43zr%#2{U*21+jU
z>Dpsnv!hi87koW$286~2XaH!mp4Lm9^w1w=dcjDLUM#El0_Xh1)3rQ+5{fq?tDOsN
zRLpS~eEl0OIfo)WcdMIzDacKp<Rw37P}LYW7mPWDj-6JRh)Q+tGyxZ3rzFcDA+`ra
zCGKz9Yfe43<3q8{82d|0FsKLS4$XjhDp1TObKRTJ`<P3%RKQQm6PXF6_(RJ$?J#FX
z-$wQmSsLTbxZ+_S+$w^Ss*ZNxd{HO031gjM+5R^i=Rg@LT77e_wjW?1WOei3^atN+
zdok^NWW7btJS!>Oi8ag<y<&?f*O^bT4N6w9U4r$_HZ}+f<M(%V!$ACqNU6=$-qVFe
zz96wChO9IQNM1IBI?Iw%yx=f{y09gP3+1uvaE27Rr-&-;fp5VE`r(RjzMQy9PBcY7
z2$0$cT;umm6PAh5qcZT3qW%C($26+A)kPmJOn8AlirAhZdS4O_Nh+Y;M{&GX2qDp@
zV-^wQU@P2lX*$aDU13dWN&<fU{Nv7Um$B{nfw1fq_LNnO5y8RDqaGj>%;QzT&eu8m
za`V)f2B-XGFqmg_5)T_<uc^SJkt=*vB0!a-(5|qcq&ph6=b^$zf{^e{+E2=v>Za*f
zrFVd3MM;CPy#zd|qb63A8kh2;p({kam2(V6lH}*Ys!O7kk~i!ar1e{^zEu>K|FHYI
zyLBw<PO>56g3Yq(HND9p76JEWt)PVzZQKW)>h)`z6rD6+?j2LXQsIu_v^Z>-Rk{xA
zWYkvF1l#7;U0j+J`o^_v6WI!ctRluB&y&z-^)ECO8mLWYnJI^fx2ocbm<-G=E~zLr
zh!_mkW-bjnYxg?oYSUgO=fJhmtHjXsGt}|H!sqcQN&)S16f{%uYsIre2SSm4X!37n
zB{{X`q`>M_sN8ee8-CxdxTAQze#?omi&oE#x82JVgpw*hHIp-=*@{gnCeiJxv(Vwt
zvEWDdglAmCgF9aSsEJ6G$?^jyHvh*8tK@7_Wr=T0ixssfg%G8b@FtjrzySiH4-J|b
zkLu4R7;yBCK^RX501ls3S;wy_92H+kqnD}hC^QrvK~vmD=ymXebr|O+zT1m~!`HB-
zm9?T$7X|AsLd;M`SwsgV`9a(tMi{Ta>tv+^hmN0LDGi#}?palVbTEIYjk>uTm1hr5
zlnfD<0b|w4QrFMg?!iIDtW}GLRcz3)2V=D~9c2?yCD#`?+~OQ|;(PAQ0ve4^irk}L
z6{mVbVS^0STj!7`gA$Kd?i{RqLn@Mr<5nsv151uC(Zqk=(!cNYX1WE(r3{hXfD^Ue
zC**xg+QLvfq0BDKmn8Fwftp=7F93Ju(YV(y%gTN=Cu>#iEF$9K6j&#O_$^wA=)7vp
zs%o5QOdqIa)dLHmP94tj3vJ;jY-4Lj#G{v+LEAY&yf~4&2V2iyd5R#8$V<i|uSC6L
zU*FUze*%RJ)OFq+Opci)szS@M%cX^vwD=~L7UQFG!z6_Kt%-j=1v~pjM{!GxEFD~_
z9U)QegxR=@q@6CB>L~nd6g-PlzMVomWQEMqtuPluUEQgQbkDD3`d>$OOZ!5vi3_RL
zQArd*w{R7;pp_2BoqZ;+b+*}MebHL8q;}FQ2JZuGgM9r7iPcffYM^|KI)1!UL9K#b
zCkbI$gXJpL_*yB;ox=88i8!hp;5eKR6ode2@b3!w!`n!>K5f6{9aX!;7SN$2Mjcfc
zUMHlyhstsnJ}Yp&aGrQ+t1ldk7w(P5`<n~vaz?pCTaH~jkOGx&TBg1``|D~-?aFSo
z*<Q5DVsVr06>VSIB&~3z{WMzwhvlx9zl}i2i_>^d-CU5|tbnU@6-6QV!wLo-w`LFJ
zmfoyePrnrUyYIXJ<m0Q^cPw8Y|JdEP8E0SAu0sld1e3&|<bbT!ij)Wdw&-z`tO3Nn
zl2@%9p&~w*-jwp&o!)8}N--Eebk!g9Z!!e$`KRD5zThA4ZmWnorF6UU15Tu99G9cI
zpUNX|eau8u^wQ|1sv>sr5WFiQqrWp9DJ$<P<z4c&mU!V<;Km+T&!Le~s{@T;t$$vp
z>kyZgwGo}7rySL9vcp_9nZWkubBS*Pl>)&-Q{>KUG*udko5x|gSJ``0^d|k@&I?Uk
zO7W5KY_1DntX21L+RYY=Z*$BuA8#%#E=&p=i@B<oEt%P@cSYAH^MjK*+h_NtgD(WI
zykdzcA381P1SXP=pnwa=(&2TG$E<78hZW<5A-(r`eP^YPYgeU>t6Y-03kXC@p-z1N
z$;>cbM>0SB*1olSXSt#KJg&aQbJ$@WGvuy}TYbQqnyb}K!y?w-6<QZ?vG4t?>aD8t
z^_EwMv(y^i$%z}IoR_saPO2)Z1r%}s!vzudD0?v^4uk4_l>=Wj`CeFF;92wC%c?xf
z*B4Bn2i>5UBKY;~umDoHIy%7ZI9XK?Sy|;Qq^HOTY4&8;xTq*j9aYvaMO4wFQ*G!=
zMxQX4XdQ;#s=og;l)=&MXzi=f?~s)+tB2p8N8@pv<_pRmh&fz3CTa{3Z?V;hK>uF4
zxUHwhW$S|rRxi4S2Fg%?FI?4?EBZo*<@V)#)1jS!&~a#R1<42zBs=M#2xz`S5hU4X
zIWK7~R5N8O3T-N(aubwI8ZPQ>P$qH3)lzA454*>24z(8H&dLK?V8APA%+G~D7PP#n
zNWM1r4D}a0)EBK1vdt@9S?KrQOHoiaG-;R+|Ak#LAurYD&YX@|1XhZd$grz+Qdj5B
zrHP+f%Zg!H6L-S3;)pHG!&`Cg$|mN$VhkywWJp-$7+3)+_6}ZeA3X2c$Vl=&s%y7)
zb_ta?bOp=m@+G73mRB>ZO0J`fF6_zmvL{&+Sc;7xQ^w|*HyD|aO^X>lO+9iS=<?5}
z1jBIVLG`K171)|-FIY%*^aZux(o+h5ah9==i9s+>ZL(0+cq!+QHSG8BJh=ci*d4#O
zBx>AlKnH^FEraEEX3}6-8?k(n8)8(IHLTY8-wvKAmZjvmgL;5q6z6$#riOD1pI0<+
zb}637npTt=xq9@%1=z;SzGooa-ur-!t%QcHAKeZ7^8+7t+1^4HvXZ1hX%iyFz7(QH
z>V=l)2Y2Y?3v}Xgd#RLZx^a1Mx6$+6xewd2MbO~Qv%9rWcI;HllLe=A8vAY6!zVGp
zAApfDZd^YWGn_a|4kK?3Aq+)Tg;vDMW!IrpTHLgez={5;duErIy+U|omRG2>JVg!E
zwiW2-L=5;0xo}9eYV+A)ck7kkq%j=3aZahe7dhz5dsp(|RorFeRPwp1QYl?VlN62@
z=V&T3RO}E@WB5n!U><(s8F~ADW8s}02rbE}^CI$;eZ^FSK`F<^aW(9ZHZ)f-^^};g
zmV%^eMUPJGp$sLxv{p|`@$sQI8bcMLdL^t%F7MzMES0NI(O2dF^wp!G{@b6QS)Y&b
zco<Jw?dA3gpib-2a(lV6l27_8LrxO3eE#KatitE<!-x2{{q3W+{TDwE*E;QgYp*`;
zJbbwNE&Tnr)%K%rzkT#?!RnVcee-9EDyty)xAP=Fk4E+7ZhHTJ^uta{|FJVz5A=#R
zFM{^+qi=%_EZfTJ+REzpLHoP)_QUnHb}-3+aRj>By&4DqfmL^>QSh27;;$pv<=ff#
znmwfVGoY>HVg$Igd`|9l|DK$tK+08Xy>pXqRzHD4oTNCIACeV8zI;A!Kg>=(#Qnm1
z_>UyRC(7~4ituG}t56p(85ec|*<hly9A|xQ#R{=b1d8IF;9m+_f?qiB2!4CjoSR#b
z^w5%%+fM6;gMP0>36A(e@Yzxt8jdGP-?ga_b+HANSq&Y^j!RJvO66K!(E}@$_j_gj
zr}`nu;Hx@LK4TjJd+q3_cDie4M9Tfd0>xpiRc~ETdJGMaEC7n!C;aqZd#}BD)VcXE
zL_ZfYf%0!Esl5cOf)Yy3n?;I<cM~`cj54#-CuBoD!XP&cUWs~2=~Cpb0SmDa;WWki
ze8j7u3d}>0hZ4-&25=U+InehxF-0nN@}GjKQqPD|hAvNZ_RjZo@yM2-lWDwQn3U5S
zij$G^f*u!kA3Yhpfe}{ep{ZyNVgxCPoiQ3C0MSJ^Ox`4QU2ka@*`-ktpuUPPz<iGq
zO)>jA8!W^W=7?m~C^!SrJ2f!~p{mziqwT`(s&M6^%9~CmacXkw1sL~VA;~ej392Ma
z^b6{q;zBmq`gEGdp-Gcu?~qdC>|83wfoR-|W(;<>%SrWs0aej8u83OjeAs2}6n@Gk
zb9_x3`aCA$T&`m~b4VTXutoAE^Fgesl_qN3mlPDhaXOBbv=EK>@6!YpTKrkxr}$Lu
z@kCOta0=KBCR*>u{RM1~_}lk*n;GzX3t2y?Miru}L^j$mfS?%Uw!J`EZ{u*CmQMbo
zpYN)22|0@W%%Wqp+UMB>3ag}+v#LlLoobCYjKeHjdALZk<aw^jx|nUK(+#Uk@N`DJ
z=^njfc&-(=j(owL=7x1upn0mAvYl$_OTk<vuKZ*W8+SHUMmah7+%%KE{4w)WN=b=*
zkYMxwYKH3n*r%TVC%UoR{|ar)=KtGk@Yd)5AGaU=$^ZWmADjP|6$kdev%L0L*#Ac>
zoreMN{_RKWk5<d<|4U{NX?x#J05B~3le`$fIlX-T)Wjm<PW1Zv0q46o>^edL0-JZ9
zkZpq}5DYT!0i|_yAD#IR;HdSUjN*~^geS^>hIWbGL*g0yXCszU)Bt(FsF`V8g>w!3
zlAXfWU@0K7+WqDDaO>#x)^<14bug1K)oTo)3g(t*sDos&2?RF`gI0ZQOxVPAftIS;
znnX7PAKtL4FQFE+_9D6r7VoOj2{e&o5DI?6>_<fY0kM)Naz>XDtG4^nOD#_PE?1H#
zXUJCWQmPO?cqkrD?C9nkIqjyyC0Pkj$*dh!V%yPhxPvS{XZoRIa<|=jidL|_e!`be
zdzgOM<fneNb+ohH+urFN?fk9V)F4PLhIOf$1w=i^1!kBI1oawDv7TQQr{AjCVk-xC
z2z)eq{pW}Ey+1nM+I~gNLld;P{K!c+t^twuaPx+$ss;y8(sdm`JyC1w2TKjNk(LcH
zY*h@G`8${lJ=T8GdP+C>o2q>>6^M&884~-`kjH4!BVN|ReJ`NCcEX{~$l~dJKUr|G
zK%inH)=z0fy)k3PZ%cevy0b6yQZhFI=9Cx6<B%NW4b_g=>tO|2U|c{8J(@Olc$ipS
zk(zC~D{HN}iNiyI@5kcF6BTq>*pDz^2T;Xqa^0e&?QBd&*M_+t3g)y2T_7;tDCzCu
zbif02_V^;IkzY3WZu`yto1^aY1{7q|54Fi@ES86gomCxH{an_(8Jt1UkY@Eql|X!z
zW8YhHoz`{a6%bg0m|V|<qY7ygh$FP|L$VG92@4L7x1QmK@!V<%<1?axlw;QfrvV_x
zGFG*izj(iodK7U?lA|jJ32d>u*F8MkJCY<qXRW6%w~-_R(?7&SG!GZg5KW6{h-5x5
zqbG=~WX;F~+*>?vxp)n6#V|S?Z3#nslyS?hOGZ}Z8KKR8jmB=t^DO&Velm*kk5*O0
ze|*e&J<W4O%1ePjv;&PT3tduX4+<h)s^|rFH#Lb?5Yufm&&aJOI4#rM>x@utA^tYR
z=pr7FU8MC8MlJ+v)hAVivlRxdoc^a`Np9LjQ1(TSYSX@vrEpx0(Ud_;ikcM4F|P1&
zn~BMA*id_~p8?MVXE#=7y{xeUQdd!cYLhH0&iZHo0fjne{fr0b7lTbuET>3d>|FI8
z3By52(eo%jcOD2SQ*I&(!rur2i<}7J0knm`=)I=ILQ_h;GW!I(B`n&mY^?_FBmhCA
zFvQ~1LDOQ<kZ4#;9#k`aG}aQr*Dmg1ned9$b<PD;xGFvlCul^?;{dF-bd6BY^>%NV
zq%=^y4(*UVK8}xnJnU{gSFXBd_cxG-dZ`x7Cc*8QG#Fb*6$!>x1g-h1_#7S7tEn#@
zOxAw4cE37q{jKj)gAEIcflx&Y+WvYc`Q<s#(S|iYq3yxF+vc@nb7ovM#Gk5Vt2@f|
zPHbCe@ZI;K>M(+^C>hfjHL9csn~CnpW9+6HuZ!|+cca1Cj*l%AZijVv#dCq^v-Nr>
zaPb+@*`ifjh@ru$fAo{)d&9%;65qc_#|qa(a@|-w4I8-8aIka|yL-%-4eJ?E3#du3
zy@&XegeMOgP#p*dQWSNRk=oOt-G#D+lT9OMtmsb(fiRR!Qgje&8$bWJbKG5hwsYJJ
zUhMqReGcE$88nI}A2~G~Zcau$_7ea+?Er+lp-Y+C&EUuZ<n343YU<cmlnIU4<k1wH
zn-1jH2;?`xEEtk1azPnzr^`cSqxwKUEf<mbDHU;9j#XuFHu*>?iSuBZa&U%tV5_Om
zEK;rxNB3xOpWzu`t&V+;TAZ6X32>rnP6GHoj?%<FsNvCBpL++#>GshW*<X2~4mImc
zQysgE<1w^+*0+0$59!GRU0F4Oa+}*IJc-Uwwssz0Vr&lQNimuZq9XDhS|^ruVCezT
zC>VuzdM~$MZvm5SjW!;SrbF{uqP5e@K|FRNB_^A&u*sACH+#L~t(Qme9V9G5tm19*
z&gvHJ#%c7tH;FDM({wz^3i2T&TBF2-rtH=GluVv4$q;Es+z5PeW1Us}D4`_o{YYT*
zN)2TuyK8mFcU7_|C3ZyWD577%i$Q1L|7ZQ<z1gyjE5Xn<$GR`KkM|50g%tngHjJ~t
zgq`QvfayLR1hl+jU#}>wI(_&ksbUv)h5fU4_=d5$MRm-`R^3D?nqUz)>x?0r#;?so
z<}oHAD`FZM0@MDv@<PT;GAG5R_NIop1eb+YL3-GHRo|=)ro;(W0YG;kEBX?KS5Afq
zVuTs+Se{kbq?r0$N1>xRe|{qh0HY_+Wjp~w`xDje2Mf8J9pUjRyuO+O)E@n^YV1nq
z?F+!Ff3+6+&(FW=bJP9LS1|v&>HeqvX!T*~{-@LV^Zw_L_>}K|&guTA^HA=8IxDM>
z(fq6P?fRqdzsCKKHUMLO{oKF$Iltkir_%PT@ULjJG1xuJP-2*+XCFr6vf;@fvy4uv
zL{im95@6>V4}hW%duK&R6>QC)DrhmDP@Kv1u&18#<%x>PK{B(B%z@F&p?zQ~_{5;#
z=Gh2(gkjydj?*VgRSsv(BkO9(xnQvF&%g7FSjv3)G&+m6_8L3vU)Hd`l4pz5f7=JN
zG{NE`a^zwT1f0iOCqTBn)+$09TOgl`*E<$u6G+|iTZTzF$)+Gd&=ghNBkB7b?AKB8
zac4jQO}GbiTx;IMwZP%B_-sRadeU1qV-v4OOUpqO<_eXq0U3ZA&}_7@V_A?bidIk=
zbEV=zr~<Y~j!H9Q%EJ%^^QtDuA}mUVggE|mYbUcj00sb=oq=-j=GzZ4>rgX?^RAHu
zrCQE8j@aB+*D2=CB{Y|d{e(;Q6RRlxDwRC#CHd|&;*$5RdH{Dh$+t~Ot6Whexf-+$
z77gkxfaZ4cy?y1l&}6j}paaPg!kOl5FNFc`Yc3`oRm5+k1T)BwLMYERNuvCa0~$??
z*MX%05sBPGu>xI4MZi(_D-vi%#EA{PgP~qDy-J1&=E`AKISbw^z@BZ9t(35h^hB&R
z?l(;JqRB~g7Aw7OX4y>{p;qh&l_413Uf?@2aKh=39vG4!!meY_g$p39Fv+#G#}+ja
zv3XXT48GJV%Fu3`Bxlz&q$O^*iYkqPg@Hm(VAD=eM2d=RgjRXOYabBG=q?PB+6y+`
zYA~SwFh)!a{mR13OMQyB&4iNd<pdrw_G;NrNID`Y%BBkc2tkTR<7|RhBCiZyN;)fm
z92pV<xB-|KSc;ns^VGU7@`wv-8U)dXT242DB-M}eA{l9n19?+DKoCB#sE=73hLm~&
zbrm)s)<Vdh%Pxb_w11A1fLFIC@i`i3=Kb?{Fdf>~ucGx3e3x4{R)n0y1>jN|<kNm1
zjmAmh%<Zb86XD9x)O)~|bUKVM8_<H;;oC3Nb|yWN_Cvx2htV*<Vaa-ql*t#cf#DNa
z-R>KDTH-uv7sgO45Vaf62nyRUv_UonglnO`9~!cE9o@&eR)Nxt*u0L4w@RNQ#(*e1
z3j!kw!6BOT1Ei9w@9M^-7@<kt+vC07zEowS1acQIqO%r@;AB&t^Pyu?S99RMAJh4S
z<6JO=xilR}jkmMWC`*4N+g+Q&@g?1cKG^j+ZJCGW!>p(~*nO_SvXFI8URPB;?2&zn
z=0X<xiKXQsTXKrBQweGYpTJfN@@t{KH{5q)YGKimn}^Ki8tP1dcQkS;U<SliDvBZ}
zl<u7Z#z@@Le!{EnRa2T13oW3qdcR<^g6gJNF-LMI>uz2K@m|0#RNA+S=EbL2DbOA$
zvn?!<b70z+P3oDxQ&t@+T{q!F=K<pAk9hy2s_FfGR?M<JkYaIq;nQ$V(L+Ak=|wWh
zQj38$Cy2fa^3E}5)6?=Z$D`KYItlwKc2`+?g2k5`d)I`X)ozoxpIu-uDMSheJ1!=J
z<n**hMGR~0)+4FMv50SQ&p1#j(TNR<C4EV(D2ZV&4YT(q70#fBwLk*G-WPhTEV+o;
z|5=~J7A~SFT9KP)Z|KmSng`p!OJka<{&2%5qUY8VHj5rxPZZg%B=LpvInatz$tV?!
zqW&by+44SxiAEtvj|HY2(?8`PI3%a2rdG~HS}Kh$&-z)X$QxNW$KL4}Ed_p|X8(M-
zpa=zYt;LC@n|K|DZ;RaG+zpJz0~;h3y9oW(rZ+eC=BRu4eCv2iH#hZKn>vk6xy*%I
zra!#7A?3@h8|n|emd<Yma!kHR3c|SuV0<%x*M|qk2O7ZGAM3>}CXAiH)NEZ?AX0!)
zWCSGm^_~kyX^1ht${oSdBHw0m=sMKk4Ni|nTnBH{Yw}OY9NaZD$Y8CyT)R-VuBK2k
zfTtww85e}x+Ei><b?$zbzo9)2{!eSqXX$^*p!q8}0NmjJ`*`(X$J75lUS0ju{{Ij8
zxcXmSaZ&((hx*?~EA7rorxUavueZNnfAqMl|2?ve78@T?KM-(uELMH6Hk0%%u-U`U
za1mg$de=n&pWWR@plrxrsY{-1-ESHGC<9NQP;l6{OMDgjno)SJl%uu^X|Xs_EM%gt
z%2{cwZ4b!!Kxts0B1glr(`ogiG|kY{l{#haJ(bFW*)i!srB%4}x@q;8t_+J4v{^7#
zcK+SJ)RU`!X~DhxCp|eeOuevc7bk3TDb@MT-}C^lRI!M_<SSLVJ{_wNS~}x+iVle?
zJE)F$=0X&6l`$V)_)EkJylJMFx{{M78YfMdopHz=+K_Ve8jbRXqioPP*HalPzsXCZ
zxv~SOsEb@Y*HBm9IR8eY&Sn{!4s>Gm9sS8=#?RaDY=_Ro8i-W{hpyoSoROG+Tal+c
zlS{P#{H@B!Qa$JHDA7&TGo5q{DKrQ)UIxtax03DY2d|qf1_G;mYllI10U5iDt|G77
zh-j*^)DE5ojlHd3=w{?NXemP)sUL<b@&G#+>I`Fhy&}s_k~6t)FYwl%_!ix6Gw^IS
zv9WN`hPLFlC9sIcULImlJob)Jk7Sn5?PpcCW!jEY6*8u5%=6ptBuec-*)0GG?T@b;
zMZVOgn5i%jr`K!{+u#KYsazPo9U{st{JOfJ+@Hyfca@Q|ing3v8%g1n(`UhZO%~1_
zyvN<9?=%9tlx3<_<Qi@9c4}!!t-E>xi?2MP=n~873f?woe1EbTAdc+pAFp&Y4%o*3
zs^nrvxg2D`22ZlffzpqPkx?OL_!>{NUH@IShJWT{8}};c7!A#Sihf?o2uJlxKuW%i
z#_;LWN8yshY)Z7p0$TWFn0+rjYX*ZXT`2e>gp^%?{n*Fc0XS^y6J*%l9B#mar<>Rc
zerwUUP>jn*<0)!n^ufW%aUT3PpxOD8C(xh9`O~MJaLFAIwn-TJ767*2F=A4KnKp~k
z#)EGau6cIk;X6epgAC1YOqfo30=Q(TusXLa+JeC+Ea{kQ5{B8k7%&~tsexN-G;YvR
zo?$qz38E-@-;pW22{}ocIch{=_YJglm1-f$@fq#)W{^Q$n2+=<7Q<#gTvn00<X=b1
zCB$Q!a@^`oAfU?3s({&?a!NWxSyqf_gk^gq4`UTJHI<fG*dwVsRT~g9o>ov@DppHn
zrwXS9T8YHw!IB4w>!F-GgHSTA=R9Iepba2ovbm}upGu2iz%rT6t#*_a-QtY+O`M{U
zZ7i&kKEHuo;JM_4GOT2^%=SXND?$~0qd&G^M#$A~ETTBIZ62q8+J^l<|G82A|L4d5
zYCn8bmjB!BKjr^F;!`32bNsJ|YpeiReYnzj6oB;KdAQ!L2mnx40DQUpZ<&aZq<>zL
z{m<{+o9V?rTd=pB?}3^#$VP6Q?;ZU=Fc|Qz^%Q8i&!dMfAhu?n`f&KPS%Mb?#HyrD
zOFEvQn$7OfGdg&o4s^g$#a4KGR@I)LM*zRxEGVh&=AJy$YKMMj(b*K*8e+ujlceC8
zF_MPm-Eyx&yLuaiiLI6WOs2vH@rA7P|MP)mX43y*a`MmD|2}&3@X@0`>Hojz<I#Uw
zaiah2wN4}^z;FU!G??{=?e%tr2{7!VbP!F@!sLW*sVx(uY>e^R*klugg>h5>$x2%k
z5*yy%SsmO*ixboaR|S!Ao}vA(_Xr2)J*!kMLpe{myu0)42HkQry&~}QZZUc0-hjPl
zDRlwuSAph4eF;vcTAbq3MnBZ_*%fQUMxSoH+yL;C-q4S+z|xhXWnz)A%V}=pASK_M
zX7FIB9ZSa399E`?&)7R|XbS{wM|WrL^~YI0iHDeq!g*%ss0tQON?<66_Emx*N-Me!
zC%_rM8O0Ic%L(58lcj5%x@wXJ)OotOipg-{Td;058{#Pq50}~%G4dz9e0p-z6gg)B
z3xu<#%nTUm2x*mNG8(3)HJ_bO&8cM;kq%1rFe8Pjwbl$;ZC#UOWNPgRW>HWLx79m@
z_tcq`P};Dcd5|`-h!(C14Xgp@OH{1Yrp(YS`mxkDNsM$A!;;L;*Q1VFk4elI6SqOz
zXJXp;8H+@((f(1z4Ux<@$_J~}3b{-)7|`CsR66<F;X6|s2gl~u4XHeHV8iUvk9=1i
zmV8hCnM1ViS%!SUqSn|QZjn)+8%%uix5+ybGvLm{pN_}>=Y~&x{=DIruzLK@#%SW0
zonm-*w5zf{-+=IGs|5sN)tw5}4&lBcHJ`KiWG?s5qOy2g+(0Zl=uTRuvg3@rG;biY
z2;UG|oaLsuk)_6;kYlp+L(|*_k1nKEo}$uL+8a8RpVDI;i9noI<I%W4J7=JsWVKhF
z%m~-Jfk{vs1iBS)Czd2Zlx|}QN<P_?hREF)i0mosZk?-whR)eukx<J?oDUQ7Kw?e)
zyjg!MqcGkP&#vKI3%fhc=PlG;!(J~XT1&4+Ux{3VG8M>WZHV4kTol<@yH;D#R3~Rs
z&*i9^`rJTH+Bmq))VZ&wRIyb%GBKGMV4qFS=$#pUpVa$(C<pVJV2I~Ll4;F56)jq&
zD$@H;pRr3XCrMEb%*uNbW%b42#0b`O)yq$x@n9SHE8Nu+Wf6~tHI<8D@T?g$?5!RO
zT)TU#mFqmfkigY3a4MFH<`hK(AsddZpJr`y!3&jA&0l4iHVIQeUBJRTTZ9AbgI%?U
zrl|@KO+9ymQqSL>mWm<kZ=aX&0;|5>IzH|m?gx8Y$J;;d?7zfkpP4^Hq%RRmwzppQ
z-t52F+21+(vHN_k0UW9G?)AaZ4$e2c>4YV3!95iDjK#il08IK6lf#N5gw8$Lbkf&i
zf@K<SDgi61Z<K?^`(IZV!kU^kA}PvFSx3}`Y=KekHKFK7V^|dQ)zR@uVCS1?C86Up
z!34nW9F2yan)3%F6WXr|_*?R?-1-Hk?)c3i#%jLz$(kkG*m<|tJ=&g|Tli){KRSBd
z-QL;SJ(`>U@Bdg_`eC{8_M6tcyN%dRQ(6le)&eY!R8~vbR6%PqSZFV3><7VOm2&W5
z-j@+34a2#@C-_4RVE9hmV7jPbTPE521ncfvR8Dn`OuQXwVOXLGQnpuQD&U1X9xK%u
zb=B&&xoXB=t=0w?d5UM0JPP&ItTR4*SvN-ARn^4J;}z|P8q2&J-_6FK{t(TA5UKrD
zvrCPIuaeYki(_*dQ7R`w8<Q^yhlj>gY>E+Ty>La3N6`?SZDZ4C6e=a<qsayT%{Q0}
zK2!&lo`dmH+gvEC6!mWxD!cOEuxH0?e1RVwl4FRD6CC0H{W~WmU)?xvJCae7Q|x^+
zj(6TLq>TnmC>l27MB*hqG<(0?EOy^yzv9HzIi`I)TMpiT^KKzDz1ML+1k$^O8|JQ*
z^-2}9Z|uFjLfW++;Se#5#9iQ@q1h#qm`$Gqca-#p=I}NOEkp~!Iu?cvmE_TId>#Sg
zvB5dLHmq`eyIemlCd2A-1H0THIfH|@vfR)vCw;3bH@3@-@w}}rm)qsY*S@;k)Go&&
zVP&~XcV6J=s4jP9m%ExV;D4BcjlKjwv`cA3P)e{q1vcwzCQv=s(=|i|8A4nS?!%w3
zL{kY*PA0(D$Ayb64wZ3##(jfCd2(jUK)7Mrq2ASuMqEa6+qpZ1Qf~gY?CnoRJY8BE
z!vUlkvNt?!L}LhJ(G8;A2Jahv#U=xl49#YhNrFz<n~YRgB*j@nXf2SL7d+^2Z|rtA
zJ9fj;QezB^Pl&QtA8YpUo9V=D`=D#^@_NOsmA+4peBPO|sM1W_YBft|h`arl7uF4f
zD$(1ZAiC$K*8*dubmB;j>h+)*R)(zRXt3+pIEgi()A6{~4!xbAQQn)f4WB65BbKR|
zb*`3<*^L>XPNHFy_AB@+7ov4s)P5??c7yuFj~VnVOCjpSo2JqwedNt+v1T#HQwM>2
zp%AU)x#ZgzV5trL8x<Mcws{7<)mmq3>*laouq(o!hwhnA@l#{-kRP{N42(1@3g6W^
zXp$4_Ey7?x9K&jg26)D6G&0*(ju;q>8iF3?vS^Dd^=NX1E>6)+JlJhk_7?lkhzW^_
zWk!yqIc$lmWHcQG(jDZ9Kp-9Q#*=w(<V#8T#F}>`Ko%{~Bnr!gvZI71B|L-BAiHlA
zlWVf*$aph~<2FT$<Bnjov?AeKJ-ZVLUCNZDAwJc(A2@&13G9HuCs<TGqSWFEcLFbv
zT_*_-*M5);(72Q!p_Xhgg*9wj{h>t87$%V7ChBv=LH4=@Ptref!AT(5*tpGf<yBLq
z%u&^`;!m93EBP(3BKI%?&I5H&<7^TFV2W-Ei)YQYkbY{*BPg}>m#&WLrP8}oO@FpY
z!F3*qL9REkj_mIXi6r{ci>H$3+(_qP6{$td=ZFqM(HAhKt&kx}sUeo2bs{G9S`|<o
zq`yl>%?yofI;b%YwO40o4(Q-Cf-O1F8ea`k?Wbu9l9pNp`*L;S#e#Q`7rp+!+R9ZO
zcepfU$m>e`Fxb$)Hjve<Qb+`O(DGjx1rzHJoUyB^_4nQFC%4oES6%Q0lP+A;?WWz<
z>X^%S(mvv}+8QAmqulaPkITdGFE<(%DQN+<#-zYdRc8+t6ZVRk=PM;N12DXcKIo;T
zG8y@bES#WM0&F8L1StT{vI1jHz?p&9KqE9vqaaz6xIdlbCM#bJZ`@e0a%4{mcVQK&
zwgifBA#@`cNd+f`xSAB3N@{Fe>NFiqtJWPjImTy$Xg7ULR#{aO>XG4@Q5u&tU{M1L
zd>NdlhSJl?f`G*ea^okuam~jv2j|Qaz)_o3idnN{DRPuYL0t@R^#PIY;RazuU?_!+
zkuF_WdI-|F)tyh?AWrolPA9;lCh^4Uy~`79@HdRKon+J8=~%F|8Fc&siTdcRqlc<i
zfR(geZ&BMN;acWzqSHpzcS_Zg)RijKha7~I+LESe96I4)U}EunBUcK?!;%Im14rct
zt(77)xE83!K$Tmt4l+ot#XvI|Wtoxr8U-~p5+n#w?uhT#RbI5K)uYWOF5Yd?CLY&e
zO-aqC#-@~HuJEk9Ue(rAfdL!ethT=SKJ;+S+AIEst&+*@=5O9Oq7Avj*6D<9_dZ$Q
z3CiGfsE%sfOfolB6Zfe^x&TjX+C>4rSnunTuiVmSaNMt0`{TJV|HIc@8=6j6PU0a%
z>a71*V9(=7?QXMSs_49n?IbV%5TM4+h_7^LtHIcJTKJ)9Hj`#`U1Jo!P*al7{)_aS
z7&($g>(Hdn-Or?1L>}x;f`>vWeLBSB^3m{vURyk{vospk6ICq<nROeHKF?>N@kEUI
zC{i+&OH_T)O0a$tE8S)9<Jmat%vjW;TgBT(PuR-cq3R}-nnLd{XFAKREa_I-w{8Vy
z?uSxSIB(pTpzDlATQ>}?0n#_B7Q*U5YSH}WLDmw|`=eSCM#Ao0C^@4{^=cZD#3FDN
z1B;O;IE%Eyv$l=FZ2Lw5%Bk5gH9JOeIP7>TwYF_;q&##m3lExMUSFQaip$g50|4<9
zdgD$VM{h$T5TqsAZ1?@Jy<k<ZxfNFd5%V~jpeV&Rd@zIs%&wjc08ZZ4_kF{T5?I>`
z%w;khQaDAVi|kqS9tDr{iK#__7}~92M}^D-=n@^{Bo@b2W`HQefK*fFpy>9$O0+`6
zcGrf58*AWl(aaBR(qRq?s7gu{r}IdChv<2Et^4nY3nD>@$kahZ!xc3`leI0dP^)c=
z0E#QfCKL4hrUgNT7R_i`HO3zpZflc)<!!Sqa-2hB$Kal|C2Vl~fj#XHXOo-e=e;bA
zXPP4<pQZnqwKHO~8xqHs!M<BcWSbB>V015=m{bT=JWjk0+b~*qY^3h!rYr|!G#CIX
zWy4r_3rkC8;M~C`;*-0hEQ=CPXiv1zZe>35%@!(e478PtWtvceqNPr6Hk3u5fb)7p
zTd3tQ^x9<6pOmV}tpKOg7Nv`CLNa5!a|Z=MZ1hiw(h;VF2PBiYSV7DTGHPu&`5X<R
zZ!Rfg5J>eJL$)hq&3_U+Q57unNpJtqIg~K!IYyJJqHFl5XgxxSwa>n1a)&2UFPdIe
zdFSCfSF1#n$=AuvHsx)Xba>;s@*OPS@ho_S8sA{SOSZr5P-V%b4UQF`;1(AUt6JaW
zsJB?!<O5HUe#>J*!=tks&j*~SB0I@ovqzNZ?jcH;Dt!Ae=_hDu@%L$*7Z&#q!yKPX
zJ~n`hQD$65&8S2>z=$;CP>#UnYCoY|!@(2=7%^`=M1n5Isk)4Hm;(x?!W;))z3>id
zxA@DLP8hS@^Nu;gDr|Q1PAgwBB6wYiq0zwzW_H|LI*XuL+jOL^eNv1M*guC!*mNv~
ze!%<qC0u0KdSX=I@=%*RLVh*MmoW>{uKuM-km%y|L-vn>j>{1^$n-4KNEJ{~Dd|^j
zV*pFOctG4@oAt;g4#D73=y0o5bK2%vx3rB8qg+u1deNd2Nr}Q$oV7zRxx1214^w_y
zS|`I`JF3Q6fN<Pwc4C9j22go>X^F0imn{+TJ}<g$*i7R}6O(V$V>M>FA~2I(wj$Ol
zQbYBWS#Sju(Kp{3%xW3T8Eaok)Rp0sc7P(Xc@2RDqGJ(Dd?0asiEU^g34AatUzv<`
z?HQFjVW}Rh5MQ;J-Bhuc{GF8RlMNozrOZ;GNG<om_A~Umv1X~Gu>O-xs{#9sW%Ott
z=z4d1o0PU_tS@>PRVV$LJ&N7h;a&!u%#vK~;#O{Nd5X>lKtf$cU7xb3MNRzx!etQQ
zeGKY`@H(|RAe^_46-0;Rg6xcupl_PE8JiPF99z12>zaJEVxLu_bFF>8a6tO-FS(NF
zW4^*R-#qhXV%2%k?{nm3%5|xC7jOWxT_4V9qhgT2(-}M3HSSkBaB&wV5Tp#hjB==f
zf$TA~e7!Q=2SDAOugdQXvO}+ebG5x57Eiv0lvKg|>d<=30^21J2}_hmnA<h&rR8(6
zL)SqDCLG~lSjhXzl+PB3l#9y=BR#s{S+)#Xu69fa(Jt2!pzpg1a|I~$%$;l7ve-h^
zS>!z`?2Ik1mlInCbmVbesfvGB4Ybhq-s0umMmU4ci6vYr84&{}_xsb)bV!*t_!7Xf
zHTE=7KAv%O@IL_8YVgh8eIm(n{#H=|6Sj#@&zftNO#VIlZ}y&b57)h?9K+D)|7b_i
zbf0)rETK~^wT6MBe1|N>KT3o?+bfBX6xG2G-lV$(S1EuU3f`v_>f}vlxM|DW*Y6O;
z95=nGLZ{V=X3!N59h2NXmf9(4O_j5nrh#kP>u*JQHLY;WAC;#HB-x;5W<QDCbiX7o
z(cKygJiz0j&~qBW#<4vWdt=*YtJ*u=RlraXqHF?W0B;BieLJD$4&9d|H$W)bjUK!4
z>{6N;Iddr!k8GVN_$CkMWy>I{;!&Vr(QMRjV%e?s9_Ca_6%6Rv?6?JRn3tVuC;eHn
zI99nq8uw3Wwiv(aX&Ij-Z<2b6p%{u>cn9H4d2P~<5*K`Hx6B!gspecQ))aU~HD$^n
z8YK}N+nrd+YA({SnU<YvYAn??>E&AFZtZhpime2ZD1J(eB{5{F%TF4G0xfoIor@;&
zuQ3EfCfb^b%Ci@Hv&c-fb@p2H0wIZzW*&dKS3VQ<xJ-*J9Eo1XvL|E}_gnJeg{_bm
zNinr<tBi)>69roN^m*Qn!QzSv)WUYID$5MTmFDDwc+S$LY2zuHGd1{WW8s_czhD0T
z`_l#7`tjQ8cX&l_MRcL~u*coKxkv2|w!jqSbQqmcB9=&?>&zWGA(sO1Vt4E1(cFA%
zDfsu*dGQgQ(M=CfBggz$z^pEO(^{pT4i+dBTVtuciu8vKjgf!jfm{XS;S?>8CqP39
zHj=~eo;Rcy2ZwuG$2!~@buu(zHu2!v**|`9xVPKg$LH<Uu*`@2eVXB{mXj?wTnG`B
z$=PQ{5`da+s0fSyTbN%c1q0!2tM8(7vyu5ebADl6*&F<7zNQQIwPUFrC|beZsn?6S
z_0rmKM)xAEOe$NkSkd`kf1S)Ls(mxO)my+@U0t0=<>n0#D=uH}I!yjIXL9+ecDX)P
z+ZOjDNfLTPgtyblsA$ShtWdTU#<NfgTF7Di|L6{&nBYYqp?#B#47L8ib#&s5ZY)ie
zzIlvH3pYZ>l+Hey$&9E`a^mt>Xh~>1Jv_T1bb|6ab(su`bJMAr6&js@-sY&l7-e}8
znu>D3FKdr4?Ui-AevBtTs&Y#W^4Y!lR6ms4%q34qHnDo7LR-khE)u;br%)iJ<Sq@%
zmtsV8e9;UvYFR6*Z@aJv8uNMY2r#{q80qFj8&@g_fD}@wFCTpsRb<RnrxSB|SQO6$
zc!v+)4)J>AoeV(rA9_R2S>s_Sx9U99s-x|#po6j1v58xiZtIBfm1^6HJ!~%MfS4=4
zBgFupmX89N;F$*k)GO;cxuW6~`PY)PaBGfKDY>N=PXY_9<JPE3%+!c5S0-I?I5UE=
zw4_IS7bvuszWK&s6n~Rk8aVx)aTv}Ht*bft-x+I;0!@0*@=dMX`)`()mu=T)0)SKX
zR&hi1)is-?Yr}#W7TPSXq4*M|oVTAwd@8MvaXt2uWm$j0wHV6BfGNdk1N+P1njCw_
zU=y>Xf=sUMq;sy7t)T|cn0!sVcJ=mdI76uIlG#|j<FC@U%=B$)zFwKHzkFejbtuEH
z-u2jYva6Z0(}i`f*qMI!@-~akNmRc|2mfB4I%a;Ea4<j{9=bOs>C_hNaE~lNMWlQS
zc>du7?|RQ~H}}VBvCmdhcVnZ~hjb~z3GtK>D*)^fxly%OSKZr9xm&OfSxRtU$|NC4
zb2UBKaA3g4)$;g;vHU6N>HHb?H8euLZ(M@+H!Oi`)$HklX$>lHE%(~?(8-2bW$?(V
zrD2YCUceO6;^)Epak@J^U#PtPtzn4RxYmjD@lBsDJZ4>TsE?||D>olD(Q01^HXQu+
zj&W@!t91xGLBi1B4+X%=Rdnm%SB&LU<1ju8IM(Z1<VA3Gew)Y8b@NRf#qLv+p5m^M
zr}$N#Vw@*=ieKd^-3>MMm9TosbJ4W88+mgk6|8$H^@eYW)a{mfnomyz4t|xVFgNlL
zzNu#z1wuW=@A6!M)i>Mn97G9u3g7fIiqEN^(=T~vI%4`k0W;(&edp(FQ-J?|;zXu4
zN83kajZI>V>Py8Q7t_k@RZ<AExg)(X397C5!#b~TWpq-up_z_G*ADq85sj8}O{v>a
zuOw$qp_8)cju>!Sg)JuZ<J-1td$3D<W#Fq!1!(s)iH8F&598|fl<6Q<g~H;RATOwU
zl7f3y|C~{L(t*hiFp03+AJhuLrr+Ip*4ui$!ybs!2(u0Mq+s1WF{e3?^(E`k@gYFj
z-`eXoWpBd7|2v#8taBPPIMLtU>#gJ7%NINQ6lqGXIm|48{Gv9Gy>9L_$tCWFitZlx
zcqnOQ95V8+4%Yoo_|(ULr&;(K;oonF|GxI^<Myf-|NYUUZ##d+fBz#scKml)aZ3NW
z){)@v?UnX-LA$;F@cZ@EPC5Ad?lj`uA9>KgR9d&q@X77&i~#%aMve8<*{OyVeT+D}
zd)`#ZyPE;!3D3`^P`HdBj=2JHgQyaU86YP(zXU!rniTmuFqx7p9)A<d88IyUO@Q{Z
zw55F+<O%}7UbBY;B@~Bh$pDB%F3c%xo<ilCB<Ki-00zhSs9#KxH5L85E~T8shIqjW
z{K)%sAs`JsIU_^`LSZYR^JvKR@?i!;I*E(R80haR4IrhCLG#l*rV;#z<C!AU7X_o_
ziUJv89x3#o?UTosq-mjm4$m<A`a&LDM3aQ3pI~fpaw%j5;c;3>$MaaN4D~$%85_tl
zOsY(`WXM7Yl(#BpFxtYYku1l{%sDHTeZjn?abqP~5saOgBP4XiDS&^3YCOl7(LJHu
zfmXB9UUr$fZSs`F80IC$V4Rl<$}o!t!D)m!Pl3Eg6wL_4ly8~=Ff7EJVVy~g(DL9c
z%LdDml}6<afWzhd=1c-KVRz3`JBUxFXI>(KLFPRuCA|59+_t>!B};)^ENP^*HVw>m
z=fC&1etEWYd_*@vfB}?f1s{L_UqGP0Bp*BtI*;x9A$&eJhtJ4pwDhK7*T$HkDxtPj
zato8d%{AJ=lP9WTXhp_Egc)a-okr12C0|1047unA+BjoYzeXCea}+-fSsCmAz<fDH
z6aEDV7C=(pg(kUX=u}ch3`KLS6E)bC$Dy82;zzR)Y@zFMjCT7pm#~>>M`r9w6+maF
zc<FWm(@oLiVfKMjiFhlV$JarDLMD_y$27I%MbHsE&X?`0IqU`w9p_}uOb1Ry@QqwQ
z$ZWLQ;qT;7T$)pgMopueGw_0)w0MoL8spH6&s@$XOnAwSD<Z~gpWfNMgVI=RZceAX
z6(zALuJaI~#*I>4sLI4OW8VRL9_Syv(39}?F$u7Ft>ilrL_SG);Qbx^8t`rGRG9VO
zN@YZD`6QMllv0#r7#=%OEL>pI`y59r-Jy;wVj&o|@*|T(MMcx96i9{)Cr@YeRwnD6
zGL|6AycBN{+R923=oRK9RIAWnY-+8BhP{^@!!oH6g{YGsDT~vR*EMPe57K6!3%X`~
zZE;TFK8bN(^mg?f_9v3m%)&5RID;iZC%Q405szskv({OVxyK4#j*DE#r$kQY0sBWG
zEW|o>a?nDCrRm2O%t_?0f&Bi7kpNcMjfhu}2^v10ZGq;D9K%5Z=#)h{s=VRV6+5+Z
zU8Y8uITQ#_ef?(#2fN*^{R#kvG6g3y0POC({86W@tN>$3Krk+WQCg>&)z11}y-$`P
zY2yG3rif?nq3i;(7V;%0#%(;FWMkw~V%mW~0*B0`32C%XDPgn-XHXanGWa>UOo&HX
zv2U8F5;xtbK>|wFS|qvXd~GbSw=V1rYpLb(6I%FaEY=u82g%(>GHcOSK=3xf*YV#u
z2{_`;#}LbSvAwjZjr?v23E-&$&Xi2HC7uBuH!!GyHZY$x^SI{(3@!riH^~|w4fEyT
zMKXcuIm?i>91anP!)7}xApDwNz%bj$8zYDlkp9z@vP5C~x;<QVB!bWqyZ3^0>Mb1#
z@3M04J-^x3N5#jTL10!=d-ka%O@^|b-gKVQSV>c4jPsHF8GO;pjKEfbBqpfurqmDx
zr+TKcIx>VHvz&{1rnCi@a_CiExQ>CkBDq_zSE(U>y=-j09hQ8pnc7h(CyV0YPBdt#
z<12Gm31EtGdzkHph{KNHvTh_n811nff_CCzacD+WZ6Ul(_7S^?IkXd^;qNg-gr$QP
zyg%pxm5culLejy>2b|PS0o#Z;Hd;6@Sc}l&GkAyR7TtCtC41i8dj6{WS6YJ{WdxWc
zQsEE~9i2)(iYnP)97^SQXh~LK;!^-e0?kdWhT7WnS{5itE%DS=xUUGGp!Wm{ZcGtk
z<%rH`k)^Q{f<a+Mu;gHtZ+JsUfD3<y6WvhcMLS!m2QcR^dy{Ee*7*xvH9CI;G;fd5
z^SkohMKm9K8BJ27dS#L?I>8@%6e{FSdloGg)NZF_>VnO(S1~M#x&u;712xQC3!01|
z&*Ds;cqQoghP>mgGsH4Pxvyx&0{}rq$elplwxCgF3oVxke{7S?xG+aTGtiVhS+Z_G
zpb#cr&T(8&488rGW;WadzzPih$?#>ZO@DM~ZeUn^ceqHJH7Twf=oxN7jpm6JZD{6b
z?Sargyq6t7GsazRb@t$WUnPzyqBodx;C*H?4V?sIF*uBI&b}a%hK9A`r8VIE_LPQ}
z<23`4<Zs`x!Q)~o=ZJfP!I$DPE3$+K-}&#v<g<xP_*f&B>1oL^9Xdz7NZoqr?253v
z&nS1Hze|h-w~os*QaUe+?ctR-K0-|y1Pd1YeFZ~p%cu!&b)m)0pyPNF;WQ=hD2<iz
z^*}*H-YE1TgJmeD8c@hQVvCa~WhI*)>39<7@Wlz%gafo^+!<w~z<?xacIgDKq4|u&
z+<!Q%S%Q?KnN&}$A@If|Ji^mTqXl0Om)p=GM$oP|)-gE(RTKGDbu%Kep}fHb*u>7m
zSqlF?F^yTWT^g0sb6`vOrOZhyRG!*NIzG<kr#@o)AF+9*0#eJSxhYRB5XCA&(@RH~
z(2rq;v$GEH)bEr5A@vsRp-JoN9%pUEWot+0+B`)7f0{GZEsK>EgC3sg?OVWi*}TIu
zYxhnmXP9iJd^#Fw#rS)KwO}Q#3bYP@hePpQBF?9X*uecF1-99F!?R7?c+fm1u^OH|
z*%YN3{-Es!uNF7;F2PD<SI()v)Omq}>3e~y<B9V+L3>6Tr;&8v*;9{0R$EufI|muN
z%6yo@ymCT8D3lZ~7l|p=;IZ+}v-U*kRDdbsxpIQM=^3;|mPwSJ!QSrtH%u9&-o%A^
zrz&#vX6E>zb;r-Ko^PNGXS$=qz8$$-uoc??8aC|n8^Q<u+dB8~MGZdE>0XbH@^zd>
zl!!|sC#67g(9chbWFM}dg|0SJa?eB!HwO1cfWcYAqMDGGS(Mb~)YU{OI^+ryv<=mP
zpa$y4jaO4b$}E~*J=>~E*&G)*8Cu+nn649QIa^N6@DD%C3>4q%0m1@>>N5ypaRp<V
z&VFc0DmEsqmS%3#WB;Du4=Z#G@uJC444i!a(ylCPR5?ssjk}L>$nYez2+l5tTKY|G
zP<wA`zEo3i!2%J&8jK%JquCWP02d!PsS%*wd;QKt1LJntYs-s0qF2Hc(+7r5R43Gn
z-aj?B5VDO+A{C2&D(RvMr6kaajbK>v!i<ryA&oB$Ch&^y(?|{Bk?e|Qne{d>8^~g%
z72+$|FxYe=;Mv%rWa7$qvgzDi1HB)reXV3=G@Y`Bh(+M>=_HQrj`4fVyeM@A3&&L0
zb%rEFoW#s?&B8$5#`68VV%Oo9Y&eM2l6Zo(ygoOt^$78`%rTVUm-L(oAl}R1b3$Zo
zrbFy%B-o?cW!;d)@{RDAJDXTpI$hc#vagVB?1(Xa0-UjgI=bDpc_V6?fI9nFK|EJ0
z;r8{3)z{xDdz+t6lJuj!S#3(fU^dhdJBeFKimayD@|4{BBEryPCYz{z!X}#n1h8Fo
z=9XuzebTbHS#%1Cm+>Q-1EDa^6M!OlrQogE10JZ1-*_g^B;BgNO^uHh;r?`Q=A3u}
zx|W%kcqrWD5LW@kwL^m7pQDVSh^R|R-60AuO>Bh9c``Z|K2NEJ$m{f7jfYSN+q}PN
z5oj}4xTR@s$gdL$HvRD^N+)r%W8O@9){zzv5umOyB@pKOW^!O<iIsib(1h3SZ}3B~
z8m#-Q3OD9#!6pN$h~Y627ObvQu7nhSw7RA-M$sW+3gyIEYQNL+IR~b&m^0$@m3;_s
ztqBIZMk^6V$~XE0&C$4LiV+8BmzkD?$3x+`P>E>>Y^unpB@NNt7x7#ccTGJ^(vp~K
zF`jC-t23cE$4m{{2FEeVaqBK^THLQ{9xpQ^>zHx-;cYS_1zdp`rEYrl_-x)X{%En3
zE;~t3NTowWxmFEA>H%B%)9^a12n0dU7h1?AAzZ0B2v~6>UeFadswb!gkK9YxPhUZk
zB}gr*-OH-TfvM0#K8?|gg3w)U2aD}#s9mD0Hn)32AiMY&wS{N>tbx`*CLD(1E{v(F
z;cVbBdtKT*$^WdXi7n#MI78!Am0`O<wp>{{yhcJs*JmT5?Ud{z7u}8`?`}i(skf>)
z9*Zeb&u(C4@6{gpS^-mie&eLt(#nQMDv6ZVkR$7!Q#yDX@-1Z@!y1cEt*lTf(pYDr
zu0-Wsy2`VKR=)5aIK`mh_FqIvi_@eG_tH&UZ>Uc{<aDj_p?}+Iz4K&mD>QpH9rCR!
zT|`8DXi=CDbzsS6<71w~C11*w5vu&G3!@FbhiG~?bExbRYdW$nRCWwWPOU8mJEzzK
zznU?XqeV4#a%D&qX|h<y=}D9!Uo#ki0OLc!9;+A>JW4!a2-vi+MpiZe+%VVhsGGQL
z-@>MbN|(=02b7&(U|kNYQx$4qrCXlC`o>A@MaDC(P|G~j2qVW~YUHuUN;u3I4qrmz
zSW=qCXu7CDoPtLsL{i9`nrsXz|3g}deU|o`xslS%8A=-dMWyiy@;JY6!(&%90wb8z
zh4V?#45eC5U6R6c!1GZ(&&+7zv>LWm$^)d)*wO`is3htAO6X_Jhq_*`!fzT9&tfSw
zpO6?9qPaJr>W&_a^VYhe)cH*`I2R7;<7J8mnRV?>q8yqB<5&nAP_;H1TUY6XM}V@5
zB8{(Sj%qo8i3PHV_pszEhWje?`-Owrbi#XIa<f8p+<Q((LtvK8%4@3PlGp6}lI^au
zTu1?^g1Rf2wM>?hLk~se(ZCiESY0h1wGQ${WWbAJMaKq|YdvM7!A-<h`LSWWEeiFj
zC^R>70*79LJHpyn_nfU#qAT{ft{!e!SDPw|zJ%oB<dDoJlNq8*=V)i2k?d<uP-e|E
z3B>pcZPaVy9>-f4_*1fL(RvNyWo(;88WzePPlAef4iqN~m=V9JK52a|J)LcB^-=M3
zWGSUBTMSjTE$}{mCA$~T5=<M9pr5NT;7VOJ8ns`F+b@bVQL?j@kA1CiTVoDGt`B;E
zG;Htfo7q(%i1^0U;|CP5@#FYNywtpNQq8qkEUKmWvZ+=REiRz;L|Z12w($<Od+!c2
zTsgnq?AFZfC(B0O1l?AXTR)-pY<`Ko>CWzY{jyg@L9~x_UfA2%mWo}g6Z=p*BHv{A
zILqGg28&0>2n!E*HmkyOqNvKAWYIH1K<hd{0;dD983cGI>K`hSI0>+0l1<OfUFM|}
z$LKbebze?nZfh53ha$ZtO{t|S6?A0=WwFDFIyjD6p}R8M?qdl)Nb6}&tR={=D*l_I
zFuA>R4ih?g6krvT&%X63*?`vF;%E$nqUt6`2VU_kgYB~bUPNibL1?o%X1BB-?a#Xu
zo`o5YYp7lXI@xDwLvJzrYByN|&zDZPyb>B>Y~vn$Y`RDJjDbJ+IAh#&V%3eie16pr
z-aE_wDTB|ohc}MjP>>r(ZQb=x(-XAC?8y;ioiC0D$%hKB61++Hz?33Eg!@N4$pT8l
zB(_h2i$pv=XuT#0GVc?~DD=U0StKy3GQR#GY6ONM^hHa}9-@6P7x~;Z`uc%PzKj6)
zA$VHFQBo|S{bQ3hL#|z2iBH@fqdYj7CPTR*JBctY(FCY@oa0HEXOn_`3(^?FWjPr&
z0x`I8rNO!(q5Y!Dt8T4qqLPvrfkK2U%H(m9q^OaUhLtiO4hlEd`v-u6W-o0uYtHJT
z8BHTu`Vg*IlULKt5q9$fo@zE_Q@<^hS7Nh1#}hIY7NrBBA$B`adVu%E!g8<`yjO3O
z8;4TgYu6ovKm}eh5X!K9DdG@3TWY@(+KWL)2f->1rg*ELhU6EZjf-($zGl$f4OO?j
zf?Jf;r+kt4fr6E31Z5N2Nz7>!ov}Mk5bHsMS2MH|otYE4v>_#=Y~2#yw8-u<o9>TP
z_pMd-*V#+zl~@;)RFLj^D^}aPKrzQ+<-M9Vf>*wzq{Z`HAU+rlhRQ^_33p*9<8#R$
zQxUn{@Z&{1?>>9;GQ4+>c{oCp&vFRUX#lGjz)zNqdy;c(57F_XW1lAN&ZKO>G%KIi
zf0h6LP4OSjzd{?c<3Fr+I%^Nh@gLfM#((%DKIQli=M?{;y=vk=tOo71b@>14<F6L~
z0XAuhDLBMQ{@nMPKfhP)%5FS?l^szM&NUvOC$q8_G;Z3WBtTbT_|tlt^x(mA`q3)E
zVv|(@9$2qMRGMoz^_TH+Xu4tvXl_%*#YgmBCO3D?C=lF99k*ds{473y<HnX}DSBo#
ze|vWO=042Ujm+xBT_jEi&fRXUhw6saK=^z!lxiq5Z)oi*cXp(ztn4vL8}+BAsr&`U
zXJsEsr=$+W^e;aX|Nr!vef}pWUn2n2?DN0<=yAL4pa0*kJ^J(f|06#B`Hw3O3_yE%
z?K@-u9>M9q(pd}I->$EHx88nK!2oa&IFfIe2<$~^GRAx+q!PbXG$=ce&H%_zIgn0r
z;ziQg-FbFHAf0G>g~M@!-Ap5SX5d3PqKJ)MikC9fkxy0fq0})tlH3GRgWU8T%?wNg
zddwts;j6U`9x7w4wo7T!RP&vto0G^k{cnpCO6r)!mLdtNK!W-j$QZHu88?#9<lBxW
zXH(-*E2-zAOXzSSiDXpi4oZg=rB#}vj>+F+CEua6j#lO!-`TSwG~pzsi+fZF*!iv;
zmr!3<CMz;KU7eckcFDr*mMfy>(#}=Mp2gahP^Fl_`w`?UX<VPZXeLhNn&qZ_V<9Wr
z%~xKdj=M(O5bAAiy;7s-Dy<6uDtAs8oJ!Osw_Ln0UzJJ}bmmbmZgjpfya89?3HUb6
z%_%8^xzI`VOjPNX$p?l|FM_8y=1>NH;i?by@N{)7Yu#X0WI!b5uX>I>THsQr*<kZ}
zus1A{mIbjSf>E_{)pXN>A}OaROX<IhkLIvCT_aSdsKpqN;v~<8aS=NaKTCV0J$s0S
zSU=Se_P9jPDZPV*a%{Nfgeky^z)N!}z8u7`cia#PCr)WQHQt$I%yjRGJL}psjKZgo
zrkl)KJDNaSW=LpDsWV4av|1J2x;jhUntNTGY&b1ctY5{!A#oAQ_BnJ71Av|eaY*y5
zr|dmipe-o(-&5#(KhASxNOWcGJ`t0%1lMJ63GoDn-8>z8{*7j@dMBQ>KlS^(d?FTX
zH(!w3r|-~xn-qN2F}g1&7#rQ#{hKv)qId98&R53DwzieBjMuj6I%JqTD3~%mEclKC
zyHHl=HKe={GI{IGvSD^ZIm28><ww)$c2`5wwspsY{^7LE7W7!$5mO9usj*B346U{^
z?6az2%L%rr#&7&`f(>}^1W*h9xExps){>pV@Wu(IFG~t{Dzaf$u2ihS#N;3Xe3HFR
z6+{i>^?r4-m7$;QM5m>W$7;0_pv_TE#sN+Wfp}~!qLo4bV=vEBcItRs!(EjR@uZ9p
zYnoriIH~5fxGouDL)i%(j$KZ&VNL25$G01Y=5y914p_aRjG5G~^uo_CNfqS29}^2u
zfKj~j5{s;P2UaO30sFh(=Wh8aUYxvp@wgf28NPLp{4Wcaf>r-AP5K}49+i^Ioxr&;
z2+%2aYj~DT;3OK6$>-j|^EbO&t+j<_a7f}Lh=_x;_!8=FV8vi-Fi3KkmY?H%hyf(p
z-+#Zh96G^Mlv{GAN_&?y?aS{<8eREZ?vQM*2FB7uZ=0%SBK~t?d?;L=xub8T6$`Jg
zyRaTCg~dX9oPYI;sHJEZ5G{&kFdD~cj-9$uN;uKs<XfG(x^%T4E!-d-K*u%T>gIB-
z65H(SJsGlg!se(#Pl6Nw9uPqc;ULE-DKv2Czq2@;3~PEtm-ZEFGvq&0$3J8UO-=34
z7O(?Rj_gkz12I7%F+@QB&&+nwjNT64VN}b;aA_K@bl!0^>9^B&^<whSCH&T#skOH?
zvZ*lkEyN(2BZU5hT6Uu@b%@ds81Ct1G^S#3%-LPi!AyLCO*cMm4e?lQJ5gnXar8MO
zq{lM)x^X47BOca{xFh+1dBn-PCpF_u3=k)?O1-Q`Gos<tuflEC;R$xlu|~A|WdK<-
zUODHV{F(2RXMU|T^Yt2-*U3dz)NcM(yB-7eJ9`}ZA&nYl4^G3^*iD!MWN4qzH`oW%
z(KP0ugtSq}g?YF{1ZoPj#zLCm1{op%1P0D$?S^*fP*KO%vCZY>M4F|>J}fU!twp58
z#pH*<(ozzjXXcQQ2ECzQm)thW!-iTI7`k$)f71&`NAA;U=(FKERnBAp%#mwd4Itql
zp4XT#8!?j#;lPZo)%u{v_CaRj=CMJo(%9BivTbK<AD#^ViDUavF*a^Bu{&acP)aJy
zKr%**ZqgJrJzzEYM=b>Y;B2#5SYJ=O6u4>2+Gj*zscS)l_d+NU7p$e^O#=w5w+ae_
z8kLi!wvEgt%n{~pLem!&B#c6nv7Zd$f5K-C<qeo%tVnt>v|$m#w&<X1S(E%>6SiKm
zNfAbeo5@ngo*jpXet@^ARo<L#1k=qAEvKX$xHu^v%#<LDpia??7{~!-ERZ2!FIj@I
z@fu4^vT1?(cRGkwIs{#z%!k#9k~itm0St5G4_B?cKT)28;A|2yc%ktgt{Nv7#nnO2
zvWdmpi4PhZghh@j!%kp-Tjg;s3LT>y8ATsqBBz`hk&VtUrG=-*u@<GROzj=9eB}#M
zVpk{60x_nC#38rxXR#~^@|{SPCjAvE;OCo474JSz%!@>&xkBAtlXR6jZPgV%!9Vgu
zbR12km(w|`kow?b{-)AZF~r<J#7UcHGFg+RswS(^tUOiaq(&&ls-#AG&dSo)zv%vN
z#{KW;t0e#Vw;S!h*4mFA`}e=?&Y$*Qf5^wV{~by4pYI&oug?0T)%DfY^40HgM9I$1
zvqAnD_q-JeQ$}~smU8PXC#u2f)F<|{5nm7Av-Me;_8rp|Pa2J4L-*#<IRuUtk%jT=
z6bRBFDkA*O%G!A(G4tGud8GxyFN(qPs}<)M#FMLyCs~nE0Sv`I&(uko4;}YVgH=V3
zDpI6d1Hr5~1&)LVLMP6_;q&fcaJ;9EFP%<~GRvj$rTkJa&-(mklnrA37XRJ6jRpgL
z$hiWs+;qra2FZo4X)27fOMW^{NBo5|8{(HjJut=faf9FC_{Q9npR{Jux+bUCHphFt
zeMg!1vayS<x+9tc($>Sg9H~$w-W=(uP*mnLxoUXTwJQBW!Y=?`O6nv+7p2EFhV+`X
z=4?{aT;11<qW&ZU%!u-$7|pM9yjgN(qgXO0Ib}7<PAUC?y$LJ)50B}h$QT&Xi1H?^
z@e$=kvJLhKud6&{ijn6cqo8mN#leUdGrdGk7iPTs7p=Be*6GDa>&4Q{>c8fh7`XEL
z`rVG;(w;tfLa#OJ*~i#8=jfLn^$Smnq++yaeUpmqF=B;h-DI6y16lF4N^arInn5R`
z&4_g2t~X~^;mb+dZIwTRa#@SCo`qIK8ztdb;*J5~C+{FA)7wGu5_nKmM(9!TR`vRw
znmn1e1{C|j!2?XT?d$`Z5D<yheUGXCR}(1yAOFnc|GtLt|G(YH|Fyq;T;~7Q*8b%G
z{)msq|FQA^V>bOm7Vt6J{;#dBcPdQ(?#%xgtN)Q>@{hl24gRr*!OvTV`{d9L2g!9d
zMP>%$Go#vo)l`)B2R(++ubeZtH1A=Un|K_|E3Rf9dx5kKJAoycaPReY_MdluY4Z2|
z?$7qmm)r7X@8Ee?zIOk@iNomb(HvkBt_6?ng&^vqAp##rP-W}+bE$mv=9z-{W>>yF
z-}%Y3BHvyg{4C$z?C;69-R{2ncB~)Cm+gc7?Jf0mduvz0-k+OWsf_6_PHQv|sBpmp
zZNpBscE$`y<E$AMP2dX}jkpL^2qHKL=+AoaE3`we)QSBdpmVx`LA6XVbG$-X;2fGk
z<IFlYFkq){SsEU4!*i-5FB`)UYGUnB+$!+=t7C92PJLsx8^+z4q?vvVcVQ#6M)Qsz
z!+lh_6jaIt8x@xI_4FTh?H?llch(+tzAe%J_MiEG|B#PO|8d31_PhO9d4IwGJ3;%=
z`r5-v4Z!X+LLoC9w4x!aql<Vl25u2kKHgO$Kq<fcw5o$7D?K6$?whi&;??yR8i*^!
zr?rXB;Ao15yE^{ky$TT<g!MC|5dqtOzCJv7iQ2!7d!F^eFfX!_T><`jju~Ks#c0A(
zLjy~P(L{oqq$DRslQTC9{CSp<lAD#7tC*lltHJHN9ax&lbX>%P`}1KrcI`0gOTJ!|
zphb&73)4uN!O_mk-t!k|MvIznOw>pL%<wtpe?5=JXi)&NENXLkd^gcI=*}ofar7{4
zbYeC{GzqvXVR@9Y2u*2$W_fSx=oKD%!SDL#VfWbjwSDkr|Clca{6UWady3vPk1*o{
zO*W1Dl%Ah90OMfJNDo70)`M^I;4RAJu;}lCw|Re(jEmqcEJ^<E-SV#~sv+jLE}~?}
zk>JNVuKBvW41!in+8K~bui`$2i)9?PO!)9Mny;EFLsBH5H1_vtf)gyR7go|Pc<<Ip
zWS(P6&_T<O^NI;%(eH|Lk8vNo=4n(eunPf}pJ$gks!ozp&SV^;DcMpb5ygR5gFTCR
z{&*%#F@*(Y5(Wudq0Fd=E1~unTWp;Ur}??8Qx#J8Mrady7At2p*{2Ag>1^FmerAk$
z#;gtT&>)!qCSMQco59$$UoP=0-Bkdz8~Vp~K;s%C7A!Q)O^^6D1}Z2U=PLz+I~r}L
z<Jh4Y0}LvnVoGxP`38{-$-1rrc|?Ms;k;<U)SNcdQkd~pSO8f{1Rg|%y=c^rPon<E
zI@@%Nm6^oDfx1_DxqI+zYxjtG^<bXTX3uM7lS~lj0d%LR-aJX?{_)#uk=>r^VW}0R
z$g6LtGovBj1f4IyBOrym5DIxU9rUd9)oo$^F&T?0%(mw;6RQEZHeKcpms5{>6>2R<
z2N_kW_MScCZ~bAcjxmGKN<)kGfr6mgn4JPuPtH8g7b_r*nt;AN>AK5m_NEwBSC7NB
zjiWWA8$&XSgHGsLl)rMCqCnX{pJK>=zS9*sPEJBT?wabbq@|Uu$)g#o3Fe7t&@4z~
zc{-2Y>>k7E6sp$Cp!G>B{pG7nufJkvQ8!Mual;_JWb23S55ZY9IYC?!{WQ-ls}xZ*
zM10H5#kUOVK3QASGWGTD+ulCd-R*84D@LP!cUxzyIy0<O)({frToCwScelHB)WsuW
zUM_-O|Md{_6_=^!8HUV;1@gr#qJY3dom~h{+F|x5Iun=n#zWIx<ya(!HCP!>_5Qn%
zUc2eT{PalPtvohDNzMRl3q$uV>AhBCy-!vX%u5*4b=QJ{fG(l&^L&wIoCDs0p-ye<
z?jv22yxrIpD=m=PNakdq@yb01kqOE!qDd$tvkb(&TXCR!{%qCoOXjy|{fF_9QvbZ*
z)hf}R)5O1ncaL&&m0<{vvJ)R>(E#i7sIc7czY95QF!Stq0`UQjZ{$F(=#H>&Gdh&t
zt$!zEcTbICyOUv@HuCVR^;hwZx0*qr(9Cy}93d>|yyIhMR$8-0r5-utu`Pm%+d;bz
z&}t7DjM2D~KO(Ox4A*7fSqXEuaql*4gN6Xqc^*Zzz1PR{K&9394v%nL&qr~DIL$+0
z$%YM8L_mNg#9siLnX5FO<GFTD;BjdgL26Zm{r23WxFvQE50C!3f4udJ+ONvF1Gu=2
znXKf{o&$8{Fnpg~rJyM4InpaEfkY6S$W9wd#CQTfp3a9MyX0t|6u{HfQhsK9`E*g}
zeKB@@DLr29b{S*wI#41@d6SBmOlx-wgu{XIMt#e2<}W+@uiqTgy&2EK2}}Z);8ULG
zc*Dom30=S$Y{vna#uT10ClH}b#Jm7VAy6}9e<+*5G<k886xkX+P%yt6Q<4({Q^h_z
zc{@aFMF6$%Yr4SJZ8Q&YI>=eIoyM2=L|@dZDo|r}!9iaY=?q&iyMbC+<u*2@3HFSn
z*Qkjrq^b9t3xRD!M+D~7VBWk8^qU+6t&=6q#`3*DLV^6=bD0GbKCI?oI?<aE1F`7Y
zo$U>ZM7oS8RlKfi+_!3^2Zd_lm1HlVN(Jw(pl2^F#*}Ozj5o42t4Dp437mDj_;jt!
z5e|BSDe`1~lVtOGYoFdX<i|Q|94mIoPf&2gz-Ta_UggFO#-D{%F{@OmJ8A4rHUl*~
z&QcB&)NAn3^lPe3JO=|wxPjnx964VC(0(yc!V0=brk2!Q#~p@DPHa=<4_RUdX;e}j
zCWA9;Tjt|EdT&<i21a_26~*<<IA>FrY&fuVlIrV*rAD#x*$D63FesBLf)i50gO(0T
z=pHH{BIr5}Z?dXo-x6C=0Y#$dS`y(?lQ0tbU2(+(d?J~`LXI+<LM4o~y1VYKpS{DF
zI2~vyHiZQtt<bDefs`qgE?)DQXCWV3b`@~acX-nHCJ*Ot1XRJFRJi}TgormONv9-Z
z2$g|7mpA4~hXuPnn--oLOFgmB$HK7^r6e_8+!NX64uV=WI-e@+Rk9qPoG1k<DTB<Q
zb<PP?V|mh<%!Gw1P(Z{c84*b<={rTNVPgBEapRQNdA>CtYIK!XTmcS5e2wo}Zl)DD
zwRah7Ye?0}YK2<i<kT^*vPf0~$Gs$;to}Z9Nxs>OEWq)0bWcM@2z-yzhMyay2_5E~
z92T?-|9O;CT31S<hU*pefi&k{AOUqt1BXMD3>#PB+;2Dt`0}>%4(AOSiqN9=rF7%8
zsx0`IFlcd{s4x17p953}1%Pu_<Wg*x*T<4#Dd{@DN6rPi)>=?!6b3sM-E>uWdWnIc
zY{3*5^cay~#bY<j0qJ1?{<?-F6XZ(HRul3D-Nf(fdwKW?vc{?|&0t|h*K2yHiX^vb
z8D=-osmIF^^cAd&+rhf9qbhrDJq#$e0Kq!mrtP6s#a_UUu(ya?zv&Wz9jV!?Vgx&n
z^H5~9qT4!>gU8Bgzba?dOX5lCdSIH~Rl!xla8%Hwb$D&Yh(75_I*ko;B^I654%p-!
z@Oh{WYiUiqW41x+)=j+^mx9iQvxcgKT0f`4(vr#(?sc3?$<_#6hy&}eq;kmRHZYGg
zIa#6LHSeGKzHnJu{7*h2){GY^ynWDA4%rk^qxP%S4qO+k8@nigSkUCMRf#3q>a@zn
zSdp}Dlo9bpXFR<Pyig}IkzH5?7)YH>yFH0ih7SKYy&$#1&i>A^J`?%1w}Dl%dOjWx
zUU|W*v5rFX|6FiHGS)ege<2i-U>^D$)rAaFVKKxh=INwsJmAR`c#<PZBBM4fDNwcE
zfHt;ba<nY4;i)PJK&9co)xaWh0S)(2$lRjxH!$q5)jDbmFpjv@58~j|FF5LZ6uP`g
zUoXs8o%GU}OYEveA+&`F2EIwY!v8~?m6XR?foI)0933CLHjFDFrLY1(>;_X(!Q!k_
z=9kF1^1<jJaSB+U>o{QeKrYdf*kTOr77x2e$6JT`mIEe4GgdCHN<<do#dM+jZk!qf
zz)bL_&B8R8h(DkSmA~q@QT|BHCq^1l2MWT_{D)=C&`?y`>U7(=hg?;<c5Hx}4c(iX
zMrqV?92rhqb&SNcAJhQX1$X+lniVs?u+(EmdN9pO@!LYDxn<xaLCbRKeXrI<So-^n
z#_HRJeQdIF1i1HJlJ^jl<yBoVd47|Q*R7!`Or%*i$<`3LGKWC54iVm(0D2rbFA=L9
zoOFjhsFJ4~YM_-=iin7+7xza)$x)nXKIaljwYO^}q-35!%fzyaf&PgS$cC^^%yXO)
z^EQe{+2q>GdDH!6=eYM`YiIY(VOJq(zATq?id52r3n3XBo+Q=lYjOSo5lZ;0{4OgL
z5maNC<*_W2Vz33|@4rK9N~8XR(>=g-`g!zbd%Jsd^nc6IVW$1(A7cOCdHiVY(VzaG
z|Dum)|9MXKpPlx1(d`XDTfr9W*DK(`@&xVO<SU%LyHR>J1!5p2mowBqyneIYI!v-=
z@N5$O12emv7sYseW##hna(T#w>XQgqY6NBRkCai_lIlQ`wtE5naxF;FdeXNlRbhu+
zV^Cl>Pu+0A$QS(7Jv`bu*q@un@xz{(cixKmf_}T)nXjtd+kdk+_h_~4xx9*{!`!?X
zd}BMr7+4QmuqNM@X3_<|_2&4;gTtd>ZvJpN*oh~=2@I1_-ao$vmS#ElaTyr%;6-va
zjT1^X`ylvvIoOVean8;baFR?ulJGd5#Him-FpOj$jRhO;pTv3pDYU;3T3VbrZ1!m9
z<^I+&P{X<TUsu=Gpv*i$6FCs!jX)YmfZ7OYB?pA}TJ0)%rIdNnf~_X9Y-Z*ft#+tA
zD93p`9b~N}9RPBW|D(GOFL#cP5C2Mcy;u>+P3RQq?*FuNc(8AmXuBos`(i242_57j
zpIn$uv{7ncItss93!ZYH19s|F2QelzQZk6$=3jTZyU*ub#ONL#9=_S1>-Z1(5_fLR
zf4<k<n|tU#g#XVyf}SWJ7-0j<*{{ECm_o=oG|;V~xBWs4jKZ>Kf#=hjvtAHKyK*^6
zpxDVU>wnBK#%W4-3c#zc45olzz_a5<ArU;cJ#=hQPkL|&@Zw46D?{jJWN|uZsvFkD
z{2yWE5PrtKlmT#42nLW!L&^WqlxNd{HAeErM$nAb#J;ouXR|(w9C{Ay!EhI)7h703
zWHTu4H-8%!6Ww@*fAz0avPY;soJ2VYfe5^W_Q(4N``tO&DDI1$-MP6{_t~?91E5y>
za~`@K?;;UW9;P1JNl4>459=iB=$wal?CLrPi03?2@lWRF9=k7eqjTSSaDF`OZatry
z`|h4lDv-NI(~<H*=zk0%ZFG&-jls5K5$8~ooqdq&wqMP4R`ryg#c4c&NoC!&It0}5
z;wQ+!UiN+r&1qpCnnV`3;}K8btYV`tB6`?g3p21HPbh6a4h_9w)wYs4Tl>p{u(N;M
zeJLPzxbTLF>BxNh$cfCqa*xi7*E=@vFJZ7Rse)`1!q(u_Y%_K_qN?<WKMl=7m&wD7
zmY5_~P!zk4raW9MD#kFBerX%KMXAhbY11&O)XfEwiolMrTt65dd&AtSmHI=<*uhnG
z9c}k}w`zQ0e78D$b9C2sDC7JsDp^xz%oQu^F;%W;?5aE_3?tXH5vItLqT8&fcv+fV
z(csl>Jq@-wV5r+k^Wk}s{H?bhWU0Pb#ea5vZN~ihAe0jCb0HuVxkX*;G{(=OuFH0U
z74?g;z1m*eRGxAi*R|c&-#Ya}P|@$c5+oIK^mdRO5+x!1t$EFEja(Mdw(ASg|LlcT
z(OExxb(O7O9RR~`4dc{;CQse&WG5f6)a_=&P;ot&yKEICEpyVi8p|E_iFxlps649b
zXH%bzs{WW(bk=%m784y9EULDR6piVseOP&?38qB7&1q#aMpT}lD!Y4q<vPT)@pwk{
zI;`@{rIod0J)qmbsYdcea|EB>0?O&A_*_rz3!o|qC({|<)R)_K1x?lJXQhu!*mP1R
z%I?NGP0e{)18ElhIGM4&sI{owZX)VbGZ0w4mLt@RdSUMk(m~y@JCKz_x!`Urkg^@G
zCx7<Be5~Q4D7NSwc`uGfTHo%Bb+f!SD(hovL-{s|`#ucKme($ymW`_y5c;j-4pp`f
z#{j8H>Zd$TFK$61a~BIV-v{VWhXwg(VL|?tups{oEXePK1=cd;pRo*X^;<5(d(`EK
z@{SdE)}r7$&Hy!Ku^07-b*qE5>oE2#*C>nDpLq@OxC;pW6;CGE-x_JA8lXo;;Y+1x
zYyrY~s073MEK-xj69r{(hqI<+Ln9W0PA{lo)U{RifmLDwY3WQKaO;~@?q@n$udUp2
zhDxBXYj;ZB(uuH%(Rgc@uCk80jVm1!a!RnPW6N@Nbo^q)r<?;5*$Q8>GVt|e+7iH5
zlxauEIZsK3FW&4Q`${r-{LI&qVYA)WzLpH0c8_0gy*cXoYBG9*RrcQO&V5_4-e+a?
z2)?^Kk0c|lx5Oh5M&scyN@L)Z-DR#qX);@$p|!D!Qo7_Bl%$FlkePioKKOzctEbfI
zL3-HJ8m6N{cO}%0t5t1}D(x35=Wy0OFRrqaG$qeQ6#VgYI^@WY`BwqF;s!%u8(++I
ztxiHV`fXvpYFkq*=fAjpN_o!}l+5AXDpuIzw5jI5<fz>^4V8O|ZG8=W2t9ay)zfg!
z=WhjIxi8vvC6Vs4=t<=hzahtcUlM@oJbu_Qoybo|?Dp!bX_;A>vl)3c9Y*;k2#!YH
zhs2Q}D3y6Ffc>3aznV$kGP7y9Bq$A>81)-RPHOv7hqE-kxyJ|lr8#rLuva$xWV3`3
zo|8}>&i#5%<CEpkI6sf>w#rd44_D+H9<X6~pV&y8hiYfd@HYjJ?s(415N3O<5(Ec?
z<@Av-1jk3Sfq5>-M(3V&oR7v)k(?wjC)YxB=umXYzTFBN10ncbeLv9fdICLXGJtla
zX20s-7Ntwsa{aSDdDpAzZomPG;NvgtHgY}8K=Ed0o~m4i85}OdJkJ;Byed=O#ekzX
z!TItPsJMZ<qPyCq=(@;Amu~)kJUE~rNFMKkkMZifU3$8^v)}dD7J@;H%UbFA@z%~R
zMpb&~b!HUhA4{E45t-&1?cm81r+;CoAl>Xc<uE=*sTlRwEr*ZF1$hKs%lIs;y!_@h
z)8E8>5aT5AjV@Y3Oa_6hLh!;|a#Q4H$+daHnJ*}c3I$sV@^RcxPVr9hLirv!_rZJ{
z{9~4tuS-m~Fc6r;FSJt;a0uQ~z#K_`1q}|%Kq^3B_@-IvCgvCG0NEu4AYOx)qQdB?
zj0Q?seD#6lUlSPgObj)u<_qZ_iNm+*)!hJ<W?kZ#RjoLpf=HB!Y%B?+gH+MeP*Y(U
zTNz;Wa$`A!dfT!b>!hrSD{UTSV@jCryX=w29)=-psCaJvTSPNm;yoXU3r*B6^!W=N
ziTH(MtuB<o7!XGQVs{#0>20bKB`N+zFQkf!c{ZK&V_kJo<>l>9CleS9dV=uFq4hGI
zj`Ix)t=gD|R!A4Yjog&P`eHdyZUaNe))t`d<>#2kDWCKy#K6w;qn*EX-%$iUT@GUx
zO^{Z_!8n>&nT3;HKe33Jn<enm#+Rgq@jr?<e$~&t#o)G9aLYlkg=vVeXpT<8@#G>N
zEZ;*IuQAAA&e7`f08{AzsXm)TX%P>a0s8#o%HeFE#Z59DNw0%(JjtO#c7ka-ftR|s
zNZ$41Yi)U$XQ#zwG~pcQQJ!c01eO3@wEN@?Db_&A5U`;ECj&s3Kax80AvH9JfxJl|
zUiFFsAY@ZY5D8oytyfd*QMezfz%Usl(h4P1;<01ewVVRmjjx*+<}W$LzcCGNJUtmE
z`8mc$9w4KZoJ<R}GQ!9GIK_G}nib6T6~lA_40Mg45t|-1Ij~p;K*l(=g-jN;eR-aZ
z-0@IEGT_+rbIuYsz(jG>CPkPdI9TB{15x`D?ZIGo4k!h5zD^5x3~!?o^po#vbV$V_
z6nlcJF*b`Vukv$@Pj-UyE=D>7oa@LM*93b3r)Y{UBLSL))3NT2m$B&h$8K<R@Z$LA
zt;24xa}>NjJostndG~oRzjXw^=bORLJI6mByg9~b)rVXA$A1kDUIbhFe+^y%vx_s{
z{pIyx_vk1%I1G07UhnR7pErY@{q5a1&v*7;2G5}8{=spuyR)}*3}BBBs7V2~(}j93
z0LWhVaQjDiu=Q+bcjx%8&EUn(@jgO*0bsX+*IS3jJKJw|w+>-v9KJp{>OvQu1K|Cg
z{TFDS)!pmvAH#^CWq2BNe}bRE(T^BA6Pr`^qX10Xq6R-6>^|?p!)IOS9SXAC*#2K}
zgYIta>@|buTYFnCyHxK0;2csx>EX{mcIgqcxCQ?wAsXjq`(Xe05Pss^93LDW>&idx
z9Ce$)*5S?(PRxtL184vz7U~=j7^u15WjHwL*mHoPR|g8=SU^}d{dwNq0$%au5mvXC
z5~kv-e#jEp53~Hg_A|@=pKYJNyp7rR|Bu$z%JKid{q|4$|3Bp8+W+&4lMldm9pwV>
zkg`C1x8C`7y|Y$!0oaB*$=P&bPCGJKg!B2{Z9_nd*?ylO*{1vYiDjx!hhAQ9zRx52
za)yR`A5Hq_G@kkY{Lgtjyr5$PIYMOIXl_a!<`ZlA>ojj<{{Q?>HtgR&B4MPMWJ5|i
zh^IVRmS$-yO7kQ*jiX`;Oat`*&xn^@jD*yX*-VO1rBAqo1CQ?Gkk=te)Pe`h4+8MP
z;$bOH!^^%wY_Er=zuU*u$zIQu$MKmliN$L7Z9`go9ipe52KMvL{#wU{0gp6@3QOD`
zQ1&;!xK;2m9Dh5%l%77{J$T)fv<PuLK+TsJ{mS^(gVt~`^lgT*Drz!G38Cwf_TH{7
zuB5YiySKG{aCEEgKHu#<|Lg8^>gynjITkNv+jTl@H)!LG2C5jKoKROu0T^?pxDL=f
z1w)GG!7nQZ=o5Q%4G%{5{u6ivv{yQf`cToh^)!Bg6}u71fVCnp$o~C8sLMLXVO&BV
zr>o^@*?V<#+}(R!dcJeCb$tBSidlr!Ej@j+d$9lVzYvNs&Q{a(dJ9+xWF+y&Hvi(J
zo07Uq_`x{6NG4fIfleq>@d>i_=;(lRMfckr5+x(+1Rzr&j}_;zA*CVo0hg4a9LswK
zV0NHDGWwqqY9$v-aL2zH6@m6zP$VjQo5NsFW0YfgEX%&0j)p6rdG)~cDcZKm%<Bhk
z864W&y!tj@n%~~@?u)HAyL$L4$~#Vw9x9R`5+a7A2gxRCUiH?}Q@Q<RK(}p>m9sZN
zz4$o}@0>hvksbp1MfC=49hle&Ii3@>JWt{Yo)y<fChh4jFo0W*_lpeF5Q!vJWVRA)
zqSnf$vqBpAjN3_rpW!shF7qZytnpQU7;z+a_Tp+R++PTlcu8}TplD2X-AY}FfasN=
zq8^pTP4Y%2jHJU|9*c5Bh3zk))$a41!@2qUzy1m*{ja}z_@v&=moQPUXz=U3xw-k}
zUw{1py#hDp0}XY);>oYS;<k|ISkp0*P;I(3x4oJbIInvHAh|Dt;n1xwPxJ#c^?=33
z$Czz`;zKA7hweWP4vt+fHFz*LzcS4yE2Qk2R}`u=o2qm$zXH7IBt{;61vvJVirKZw
z0>;&pteWtZTg~^%jOm^=+bg%8Z0JXxc~eafN;92j^HoG0iX3%cYs#R}I*-Q@Fsm3H
z=al9DQ8t(YA@`3opA6{p7x|?5m3cfcYd|9)JWnKezU<QFpmCtLEK#OtT4cCk@dDwR
z>D2tM^UGn~zIRvy8sFSJ?IK3AinlA3bA!`uO^%M!CE3S$7)UhZ5fF=lh!v1Pq!Y^y
zQQzA-e5IgB2xJ0*<VT*OekCcU?2&^8&<qTTumZ1Pc7N&O(sFBRqG|}2MVJ<Hgr?WQ
z9Jeo3{~{)cNQ}=?3@pi-A<9#d6zr6EG93<h05O6aO15XCGsW|>>aZX*LN;&`N2oHi
znI8#$fGAU(XE~8u6BZ3HqPu*y+(amtKZj^5l(HkIB@)$hgonL)j9?O$wpI-O@c|zO
zuR%zIdAX)jXpkAE5yo#ar;RFE0m7P%3Oa#PIXC}<`$iTFh`GlNyyW67ml04-YJxFj
zMm~WvkKEiSuMMoNx;7Rg^A*0)mS67tN3=`F#RQq0o=H|QKzEP=<}-D+FmJ$7mKO*`
z9>U>i0GuTk$Rh`5SvG*F%1~NWF+s^{5)SYzJ(C^kus<}iIStB{-SA>XV<9DRB?%I+
z4`1n9cZIn+>v*XS>M94(WS}{Jt8O(Ds1{y2%lKt%H1U=aahI+tVJR-7Yl8HGSWRrM
zA2)rDMq+s&%Bo%Ze0P^4_Yy(LSSyZz@V91qngnJPU29OhGi>Frk)@SXfnabNpS{`H
zecszT>S1G0_l%hAuu`6|%Z6n!3{y*U7<KC*OuHw#!W#5?gSbD$>1n{39$%r7IIN(!
z<+900l@(Et>iCuB=0KE-C#lvNl4~nYV0KziDB6fL+G-+m3VfI0{Ty0tI#cc<rC`yV
zG-P9>q>C%#7x%??<3?$Sx`5Z+NE~?@7_qWxktYL6D1^u8vTlNM^VK%Nxp+cPkg}S>
zc245iP0dDmrup=u0?UK$@O0&@-$x(~3E7heYs(!vy763^gcb-m?dQ*v!5~ga52SK3
ziwhzGp;H8pbr`dboItVzv1@}`^$Acon3!JQK|WrhIS%*bz98>t3=}jP7bN>5YB}nd
zm-}zFdp%OCH1yBK_UdY|6v)rLo&AGDEc0|TSX=E-*<VfUHUZS#ec|bIq+h*WRLJ#F
zuh(c?B)OOqHPkF&_D4bOa_=>ud*!VpE!5UkFDeusf7yk;V=Si=z$eU7<)qNbgTGHR
zPBjL{&Pb=itYrL{LPeJRjOoqb`~`woIywKci$P517v_Vj0RDB~9nH;2nfY(>`OrNP
z={{G^9o)yG=!%@$(eRA649m3~p9*QB$X|SEje7)Dc6O>9Hb4oiyj-^&A2wMU8Fz5*
z@#@#Kl_K4$l{c_&>yW>u{?yxLu*GbeZ}y$62pf-@&|Xlo0N#qCRuH*mK39%l4$Mvj
zZUG7};3Y4sf)Y6BRF%tk0Z7_pn&Krgwm@u;WMLa#S4$nid31q^dw};qw%j@r5hYM(
zK)SLO{3a(bf?=k!tT%8qW>(OGC(|^60h2b}F`%`>o6RM8gkM%ekIsl@)`nM+u2CM<
zgYOCa9tEPz8uU8!&)ABJZ8mMl(RV<CrO|2>g{u*@1Ru`C;j4={!-!%)a|<)k%)qVO
z@oP)eRMxxP1nO3bItGH$!Cx`gafEl)xy`!Y<0vFpC>UG=+s_hY6Xya19Fk%(iN2Tz
z((x5FfHL>WFF^c%8q8O`=-?ZC<xM5!we+Wh^qPurdE-}<w?@*=t5b=J0?t)rD)!RT
zG!y$T0YG^3GF!n_Y;n6R{m6h|u%w`{2dgrBsKF{K4fuLi@C8wn3PGSy{;YIET2M2n
z>TOS)3rZOAgmVv+dZ~Ic_o&^uXVWc}7({j_AAhKc#=nt5Og5K@Q*t>9BJM1PS|EA6
zMBSD(Rg`oFKJ<BfF%N(Uo*H_DtWu6L>AZ%ZQfv4S$oxh+LO?_WRO6YsXHcLY!O$=b
znw|MBqKl12Ov3dEs#eHyW-$QPC(tv6lOg>KPNP1uFA3{`s>!Fi{RwBMs8#S+^bo3F
zOVd7ev@*P$G{@mwgR`ZfDR<)}+|;kfoR5J`yB#WNQcs|V4eHZO+)CvcfiEazCx<dm
zTg*(V{4Q82zziBa>1D$+H7DmCE71n0Tv4-WA+5dkI3#;O_#DPmMe6-ofc{wZC_}+m
zrzdE7$q6_;J7K=yJ&))VZDt!MO=l-H`RFi{$<f8*LMP>zF}ZWUNiw_L4fz63H-b+y
zhF_|2LglrPsD;2!U(N&t?j`b0@8vdmlj%+9-kP8=uGAf#{~YG1xbB0{g@l6W@i+zs
zG%cXa4E_?~zuZRDKo?NV<Bn#MK(RsChi{GZ<P4c4wwWZYObmo{h?aO0?hrCxN&lQ*
zNHycrw;To)XC&(#fF7`&u60EE^i<EtTnB_BTzL5VP0+ZEU?3dYi%r(1c&LcR5FOfJ
zRAI&J?!DQqoLdk)V~SZ=k%4g%V;CYNVI=cPt5!g<J50CDC6I~Z6y_3Xp@<FAJgFhg
zBnFKi?RDU}?q|^?cP1M+l2ug0qID&RO{|0@&h(o2U6`6Uf~A5*9%Fw|0HNTuQ_^<T
zteL1pxzo2@GxU1I6@vu>^a9+<fd{`tbsZgIINJ+2=JI6HnpsEtHgGsw$Gw-`<9%aZ
z;X25Wk|i4skSL^p1i+jpnSX-UnOVeF!0J~46h2OY!`|iqe}x*6Fkz3DS9$bPeSu{4
zw_+H(2Y5t1s~bslf_9^lT#hsQoOt6vom?s>A7WmfF$Vg&<Vb;85I76>toVOq@M=k=
z7|b{UEHDw;0OZ0r>VHIpRuICP!OEyA#{1LO;nv~H8yD^Z<o3y#GG)2_h$o6;&DlC8
z9bN|u%gf6PWVNc}PYHOuHW|gFwQr#A6uBAMci4#qC<7JACBMYiIpe7q=-$Ee8%H_9
z`<YQ@+_*k_pbG@*bcBZXe4Rxm3-M*J@XZ1SPUjmmYmf`7@rAmf!3e4l_UQQV#(^P6
ztnQb9vSO-oq?E$5U6+U1DIG!xMz-2?(!?W3O@&m!n4}0NJLMIN1{X<=w1ZVhq}-FX
zgST%12j0D_8!3(n{lqJ%%!{4<o7ZuHhq`=*#%2qpd#4*V>4XzMct99m^+Q;#{(0?E
zQ8z2PkCrtvsEZlE&<eP}z>3@eX+W00N}@S?9CY7@Wf-1vF<#JeAF&6Bd~SQygObkQ
zv!$k_7mX7(+7Zc)^JlP6q!#1x1(4&`HeT1*L-0V9t?T3zWbLz9@rZ0lh8LP(Bn4;i
zLs^V2h4AQu1NRt@M7%IT)&~giWvZ{vM3N*r6r5nLiIZtTWl!SZ?^6uADsJV3yrdR9
zL-gI|c)omprY*ckg^eqSii%)M)t$ta_9;>B1u{>|=e5ETjA8r7?)EENSW=Z7fyYcB
z@W+|MA4@WmEMyMZlM!ZA{8XX*+37voIX>FiKXw>2<GFK^$kjAm_1UXToDB?-EWG$a
z*S)#dnuZd*>{KJGzJ$Eh^=!hTKT20*pa~-G<aCHPZJ4kdx7{SkC9o-U4TgmRO{=pS
zJPFo1-#%V-IVKtUT>G);@T3CBfSvZkZy$cQ_W0rI?mfyX!CAZ_^dba)9iZ`0d?rkR
zT<fT%VM;kqSA0{bY3)HZ^_)kvX3p_~x5{2&r}qZxu94;qN&>T&oTcQ<!J)<osNY|6
z4`tWATg^9n-MzX-Pm(j0!2s8dbAn^qNX!dv@$rg=SenG0o`UQ5XC_dAh_D@?Wkl5$
z372s)87R91TOP3tmerLT!l8R_=>P)pZqJX;9aCpzTDE}8zaRt+_Qvosx(2Z=n|#a-
zO}a$c4>)rq>13eBx9_|Jj~}*R<`DuO^|!WRNQ|o6+2DAk)p4<vF=)<SMz;XJFFhtL
z0ltw9<3YtR+Z++gs|L@FEdcKi*j(+$IL;tREB2G$L!61KE|#C`KBA3lO($o7#n=3_
zV&?%gblE;)XEUE>B144X;pwcZ*JuI)GMNOqa1!^YlN`le`-CItuqEg)o4_35Md=2a
z&=S)<o=(PSxWESxr=w!gGgc6@ROEAn5nr80Q)bq9*OY}wH8PYVS69oUrU22^!`{^q
zr{PpC)XlXOZ<=g&k!s{M(z+;m>4cyVcA)}D8$|EDZCj}FC+oH|<pN>KlG3HgG$mN^
zz;3;Is#Lt}hu?kGunE@eG_b!T^rcsdh_Kc)B=@Y$$p)A2+7SXQ1q}!-ekLWG6UzpQ
z?1D+#gb+mi;Tf<qTq>pDDm{80D+Gxc?}{u#KTJ5VWeI_l9c9|mJCE7(I6?v-Tr_Je
z@Vb|o1!_RWlSj6AGC^``^P*y1K$<j<8*Fk0Uy@|-{!w9zeQRM5+1rea$aV_^r_>1H
zwy?I#!B0GEICP#Qoa;U*6C*WY1V>mHb3CzvC_81!Kr@4G<^L=n8b)L$XWm85ARfy-
zj*zr%nUMzhUx#$vgts}@X@OU_7?wavqVl{z=hGA~+t^T2UvpJ#BqlmYbxM5$>A%!7
zvsfGq!Pv`;t$6U*w+1m?!27FBM5aTXN2?`mgKn(48*g6!w6*)DJEJSw%l!-cpjy)Q
z1!Di!d-mqV3rv&pH+{dz8OwR2*n43ZO|L-e)9-1|`i<ED=jPx$eEGUM_OD42Md+5K
z05bmSL;~LJSPiYDgTd1ipG*^w)WuDY`Czrc)RehyC6Sah;LD`B#r;j%c45dY4K7}H
zFq94o5)Zrw+Jy7VXUPq5X6CE+{NT;A-EPI3IUa*6SZr;((=6%5$qz1AnC4U1ayq*)
zIcgBAK}roIXnNMl_^n~<hAoYXboOX_YhN|Z_Bup_@b-(8UA)-KUac2<#}$<@z>#0c
zntq_IGJqnt)*2IKh*rp^0o+mtwR5C^u&k0`Zr~U|MOtpnh`A~*CLIB8HK(k@v)T!>
zr(|w!{+r?HeAR0hJHB0RKRlbawE@;J8#%@m%PAS(X`_*cO%DJE3M)|~GiDHK17g=<
z8=NHt1*1Mon{2?&;SYXYEnN-jfkOwz(1Bu7WCLy=Z)^4XqZmc{3n;y)!f$E&T(nQa
zBO6a;*0k~-Mr6}VTcLCzlU7UFLJC=5)dB#b!JrZGJ!}*%@%5`$B%hv`BCX0Iqv_BT
zS*$EFNG?o~m1-!N)t8_Z0DF*4bn$Ai<LpxEsBh&m({uztFbNL)DZh^Y&Jd{C&CSYY
zhJ{t;Np+FfE>aC9$<rvszBKMzt-}Mri6{(1U+D4(sF=^9GLqSL+)s9tcJePP{JpO9
z3Ad?^zjmsu>y53&$CPYH<oXt*dmCEh!sA=PB53fLl3oXsY?=;O62s6vw0l$t6U^XE
z#}(<0a`IL~-rHESEu){?YjlqT`eSVNfr><QX9{OkAC))ODJ7F4P7-A1jPA1WC?2vN
z6}B@6d5MN-O3Jsd38^gbVs3Ix)DX`XAOZ)-(MboIcs@WOreheL<zrB>6`hlaENiP>
zp7qmS@93!85sO{6!flv$$=Y|1ZNtT&(cA0o{Ng^8asVSV-QG)(wq&P;X6Tz*dpkNo
z{>=9@+B@3D1a*EuP>oiNq&Wzod%a$ik6^zJf`R#!<ORs(H8l~zptcG@>VOQ=Q1YY6
z?K)2_@ZM8s0X0bhh3&mI3xRqi6e5ZQJ#_oSC<pNhXHIyT=j0aiOOOnb47m3GB+A7q
zkgV{hDJl$TOKv0j{HAbc*c)u{h10M%+z38x%$x{ZtKWi)3~%s<C{MdkryId^86aW?
zW+=TBJpT64qqXn9fB3My`smTO4<9bCZeWB)c#q|VzU9arX3t4Fg<1khy;rS`Lk=B9
zF+CwO1_|UX2{$phYzTu0XLnE+x5x@t`)8ZBQ1Y#<-JO^F7~!UOEViJ?%StY~zfS=t
z3^NlA;Y>%quFf2h#eZE-m(P`f3JEugGj6=d#4pSBn$dvr=@?xZa>g#MmMcxdbs&-x
zX~2d`Nl6;RYfPVqL{xle$bb*&vg{AEzp`Lj7fghYch#mkJghgVbBy77w*Z23T;yDB
z8bo1dU5<Y|JotHqzaIWo@i}Olg=#eNs*JDtF=H!bduHlec@hERdCJEYk}+)Y!)Uyc
z#|8YM*mJ!7x0jYga{={G;#nC0&#oPgda7biYFZcBllTm6W|S`4fL{)tT`T>0llso7
zsdG8IxMe*QPIbtJHb{E$kc)Ec8Qs1$xp=83bX6DSA9-!WJ8INa9;H;t8#d{AE|a_*
zSfSVJkB8G7|3jy7YTW9ezu2@=jooHHoTGEO;d`XO`r+#)urqK-0v1HUr=X8l$qmd%
zf+lvqQDSJQX;OGoLT=|t&}w^>F6qHYK!l&8xZxP>0+_>V6AYp3<f85wRbYpZFRy|(
zX>!%XGrT;v4RWiBPfwG60^2y8H36zJ59Op8wCm>rM=Whf@lZxhGgLWF_|t>G_srdZ
zx|&g2z^rxf0l40o%XP=jetus|7WJe>e~p=6XQ+$%(U>CBC`I`=D#(RLwB$gL22&Cb
z<wc9k6Ff5DDbHyw72sOMc$NLM>hBz0UD|wiF&d}QNK4krcu6Zo5013krHUybo{-v|
zIit61u^}^by!U#4YmaqKU4M?0KpnA#I)l?T(A=RqTF5>ksl&vgAq$V9!Df@>i<Y9-
z+$0{z@q|j>I4nh~Kr0#4U1Jmq0RkKsxyt#ZkIojF0xriyg^8C0oXL%?mog4a3a&Kz
zi09$B><5?SFu(OqI+d|>I5^B~pO(@x%vsliW}+J>%^1xHfQ*6c-XCA1sqp*?yd)>&
zU+6O*ZeW2JsF;ic<h~7MWF4awajP8$oJ&47h2hmEy`lrM>_6)EZ&$ih+e_#sK~>La
z7nAvNl{K-2<YP3G!Hb^Dl+-}+rHbK!h>`-&%twzM<Rc@+#00N}m7f5`0)bhIqfyPx
zpSUoIw3v*>>}^LS94Gl1@qk`;_x(uj6o?#Y*~qpe=g0Wa<xj`F4!ce4uVYIuZ|J!!
zT3B_)kb~20y3o6OA9}T&upNc#+LS;2W-vmFcZ|b9c2LBQsJQ9qbx4)x!(g8HK4C-S
z0mdM0yx7_8E{3Z!d+arc2Ke|~VzFzkUPs>8?JX)ckBN{N^R^WA6o#0tQJIDHE=p~S
z8@zr43<Wwe%F!o3%Oy$!I%H0=@dTr;V%?fn^j#{(njmAWMx2mqo_NkJp!0e&*o*oL
zIl~za$U+cViG@5E3~~O#<zS~2*otnkJ|>)wUN{fzI}utdkO0a9VsFLPH4KyV5He*P
zl?)F3;gAL1QxPW$Aiu}V3UV#lUAF!m1OPY(`5tl7U)hU3#<V>fV`2M=dmNAsh9aBE
z_69EFBOcJq4u;$t#gh}N#Avb|uw{npJrx9vpOqM5nVgSQ+tjN8H78F0Qx3a89j8~%
z)jsE;qg&dd%(0SD*hdw_el^Fk#_Aky8Y@n`^`#qDV*JM@CW3u*aUd18wA1sxOPuxI
z);1pSzql{|y8FDAJaM<Zs4QwBYXiWs!=ztjx6=5c`^)j+*3s*&?JilcU$SAOOfBXO
zY3T^_m_dXuABQSdH{HjP(GR{m!$tjoGUg(iNl0i09obuDr?mH>D4{~uC<tK}YYs*}
zz-eK=*lypJV&TWINX8~;R7vty!u6nRZB!CP&17J5CdY^qr-Cw4Eb=^ga})K|HCVtY
zOKKwrC<R+-_5ne3AdQUmPUqrM#*z3~ZWH*#bulZqGJrjVe>ug~V1+VdQDo{Bm)X{X
zU{Y_$?rvC9P^k1RO6p84yY2AC!sL~88>l=a$^UXg*=tE@;uQ5_!@M}$+wJP>F!8OV
z0M-d!Gh1oU&9xKxBLUtk%Vxe0TUd6%_Vj(3f<Stqeg^zaKF$VmHN}@Na<#?nlO>;Y
zp*B)nrGkh4fj%2*%C9+sOvyc6s0vE6_+RMWZR*)U@6@3mdXI-VH>caJ3^wAxm<8gV
z6I<bH+|>rGOQ%3CWX0fk{4Z;NAl7%_!8#VxZ=`fI$F?1^wpGR}1ded7cmj;|&t`~1
zbMQ3c**3%aS4Z9b-}9Lj{~3LQzC!rt8{$91_isz_pC7kZ|BV0qM||A)&$Qwc{(0>&
zIzm2LX?IpS-v;e(*V~=-)zxzJXR(B|V^SsTN^qCR&(yLV_*p$LQvE#DW3T++Rea5{
zn1^wTm9R|DJzWpVHbAYP@1jpX2|8Hcbq(3wc}7nE^E$=lJmx~t5x6A#359|?iE=+j
zB_>00r1-688X|dm)kCYw&FX{OG5t%jdQeGr1Dt~+4JXU%;bc|mG;KIX$A=maAGr0v
zDsx%;0Qa_zf7B4sVxb-$zP$n3b2Itm?NSenUf%#sybc+jxGL5|lmgXhs{@kTP((58
zg&i&00?LV@Y=@@uq6GKc-P2=78ApZ}-<d1TZ>?Ik20B4OJ^jBJE%(0;jkzKI|06g6
zeEQ#Bd-Ny$|06y&{l^st;@??*yryFR!~Y)z?MLg6zFU9veKqyJNG1gu$%)){Ytla>
zfCfCGlgNEW>^+9~*I0fr>h(Qxe%P%#Gpr}H@$sSkEb|_q>fd{G=0C_NdyW5aOo{ot
zrz8NCp7D5`hjb+P&qm&ZixHoLNLKj5gQD$l)SKw6B~~{5bKrz?GOA|}vSF5ubLY-$
zZ|j%iEs!=2UeC4344AWG9g{&fWjp(+S7dUH({NwH@SFNa8dCl*%MJ)CVG=M@i5EqZ
zi&-303Pa%J(bpC;klRHhvIrJIBN%{nKo)g_M$QQ&@l7*$0H8u{E+Bt-ewjA0$#8=n
zO9LtX`UL-xC}h1rHTlLpyr!0HXFuu4CVo=3qvGSvAfQhDCY`<S56A|+x*_dJ4>^U`
z+p>k>JMOAIWx-~UnxUHaj$tFEl#{XZ#B_4h_0oDk=_Aa}$vIBl*=X}@e4^xSsK(=y
zrkH@Bg`sq-v+V7NNj^nR828mW_sAxJ63J}_yRD}xt(-~x=2XmvgK?irV*C{Nfd$Pk
zc*T!!ehKPR;SM<GBVJAhD{NXJKwFgY4kqCTPItz2r7P?>C)b)1(-4DJn3Q&nU6~!4
z;^&ln9$zZ8xlS0_q$?XL`bp49ck+SXNh<bwlEI!^9K)dcNe@X0cB`L+t*67~F@vHE
zax(72c-R>Co547=-o=*`d}b51ksR%(i4~;C$|89uP=Fem2hu*psJ@dc9d&ux<X3os
z9Gq~nNFW2DPB5=L+wHn4?2VdK>L|=5-paw(Cz}DUC;U|Xyzg|B$3%s2Sh7QA%rs74
zQvnOB5f$ql@8KnK<rbZwVT?<nPW32DAGhGR?N=Rlcr{IAV6h9|3=n0>r3D87PpP|r
zTCf3mC&FSE8O*||L`T9{#!lkBs^Uw~g>hSIwDZE)oYz(8K!uJ}=wMD7rvgtk`J1c0
zu7$Gc&?RhXGg#ZWXDx|=9JGQpv>?FOINh6+h%TErqlUS#z_nUt5_0Y(tp~pinbuaU
zW;M+*>sMZ<$`$q3u2gT0SMz_}Dpgc~sfX@zg*7x}ylGh<ddvE-epw&ljU6ura|C$u
z!M<hQVdh#C=CJ=5U#m?A=TE3Je<ESQwvihlDg&6ax<QYFCl;^4kCv7cz4RIyZD_)S
z2Q4R8FG6($ye}5Sun%8o;vWRZY$tRMtxCq}LX&v62}Wud?T<M4#(6V<A%&DubC8ku
zmNLJ`AYi%ybM`0025x*LfLKXL14SPU;HA|mGUP2r&>Y%M7b9Gb^VU;f(V~JaBaZia
zoC@1q;KN8)$aW3D9q&2NY=nV98Um!wI6Ugr?@#g<BLyQzLRX7u7)9<xk+#Pc_*|Sy
zYPJnVO1+24IwnjRom@i)u=&F7yG7w&QZjaZ2MxvMDIxBB=q{|<YtTSwPH9c$^$3d*
z0ih+jR~{z!8VNICjv4DD9>-C^CRFc>5oUc2<oKpOPNu2u;yj@!$R}zm%$GJv{{Mqb
zqB;BF0A8sb0wX7+t=}Yh?IvMJUu~c4cYnV7R-xW=M+l*;-2&s=?wv%FNrH+J9;931
zkKa#bj9+<6QANF#+=2eH_EYZdCt(06w=&vvoh0c^JU|s|R?F5|oZ#`^5vQW&dGNPS
z^%7uXT!}}HYkQhZpeFfYrLwf{YRW>@!t9h`<}oI?oek6xC>^Ru<HM!I?jmz>&zAA5
zd3Fa4-Rhwwa(TvuD2$4>^}T+Ut<Md!+;;Xe!I!D1DBRJ?0Ia9>w=J<ts8ZZ!k-gPO
z9xJF4^jp^fI9w%1%Sug3;Ou{D9x)ur)(xHTdfc&l%$@7py>q0?m_(PDm1KATcmZ9*
zCG3Qu+d=7#reoGf?p0_n{QZ<o2Jz&p?x<TW@$8*6bE!4Lw++U(+7*-egS|qtx0zDY
z+%)UP!Fk5ix7wxsrz8ggSKfp7hdrRg(GV>&Z1KlhtRX74`e=|YGjqhcr^TU>Vbvq_
zi8B+=3G0Wf7eIy3P~=YvK@$w=*v_HZ{9<_+ryE|yiK#eoE8?4pTaj3ljSY2>V8_wg
z6-8j^eFm}x@}Kq*gm3SY(nTRIJlQbEATuYdXydR$v^K$X%>H!me_dTLN4V-*oN|*G
zxOga3l#V~V;b-zp72&`+$%=Cg-{DCJ3e3%f*Pc8h(V75rk~?gJ^juc}_T`6QHCSi;
znRB9BMG)rjCYTDbsh|@d0Vet+=7<>+6~$aZ3JoNv>x@tWg%gPP(3^z~%ng(2_+Y5c
zj7|&5TY!^f0fX{OOIinpk|VA=qEJh|PRzrJdT1%a9Q`TK)tve<llBb#2NS~?!|pO<
z0oWZ_YeXjgK5@0I#Bva|(@clPMVH}XHSMreUAg#*!gUxnmF{&CmcfW_+6N=sxB)~)
zbg=};`U${*tzUHjHdy|&DYhB_v4FeBp|S<GTa)>@aRz)^0}I2u?Elot#DB=jY~FQg
zx_W77H!}4>mJYVxf_HStwA}=JLh#*nH+(n4E_~Sc?}80_lM)_W+=L26i9skj)rY@m
zn$%S@BSg_A@l1Ync+GMU9Qx;hDWc`tC>O(t{hi%)=dQweN%tn}KAOaTS7-ttHJ+$O
zZ2->>4tBd+`x?TDu7;gG(G?YwZY)`Yc5wf`ntlUtcjx7g$LJl2DTy@Lu>*E&z<RY!
zMJ1&nhD@E>Q!^TGUPRh396c_$sqDzj28#W77Qff){zXfMCzCk($aA8lU0^UB3D=AY
zjbFO%kj|YUo!@Op=hZ_xuN=~6^jyrs_3EAVo!;u7olxB*vItO;09G}}s+ABmEF=7f
zOsGOMy2Vl5x`BZ-+9=qE{iyJFF)?TuCz8Joqg;6QK_*MW@^L{*CjgD+Ou-Trgg<TT
z_6gp1WJubFPbJF|uh#*487G*ZGtYs~P(d_1n#Uk6+@{iaQ_vxGkaYs^Lwb7O&M$$_
z+m;%Gpc%D+D$<dX`WK+V_QC%4*0I*0h>C(|&1g}q%Ibp8I$PwJ;Mc9E!s|)C3@yM@
zXbDW5VexxxZQ~6kXa#D`jT%hp7GU=BK$%Mk9P195b8M*jEiN+^OowA|ZIGHeLcey5
zXaNh7<#{4bvs_<T=>o-rijiqGISC0INJ~AVAS4^69}>o2B9e-Ywr+@I21FlVbyMJc
zxYUCOfxogTIl`qz!D)5V?`7)uQ&@To^SQV6OAj69j$wie;7iKND48qisfs~2Z)y1o
z=6-!Op9B;mar19vi$zAs2=u|r#xA<fLWw3et7+IU5SBtuMzRU~bMh1@MAB+0{j6+Y
zPUz`LE49;*_>(Y-N93bO{ah+w-#ev&2e^5Vo)rO2x3MEYD;0dqP0&!SyYN7k7es?p
z$u?&oxx7yo^stPJY@6<uWtc>Bq#lx14qAxDDhTjt(AIl})Q;1%NQNB6tgZIXFg_){
zvwu&#H9;L^^&N3k;&M+ak3z3dpY@4Ai3wTdISRKYP5RR>YdPS}qBd!0oG=<0bD9RU
z96TTpCXEkl6h%Y&<qCbN(6{pb$mX%FNKT9y$qDjAee+wH4=8R-4Ty$}hXK&et>@3z
zExQ_=vY{0?Dm_7vnD~beSg-ccn`d>kF{acFwfEla*44&vQ#aIpzVlOEZHz>9Q`-l%
z<HjIWH`IQ8@N->l3{rJN?Kk^-b+s{&ReDmYsW}&m{a$qoDQgvdq<M!YA|T=vww8_M
zuq5({31iMR0p)V)4xjA>$?Z|%mLZjs^wdR^b9nprEN)PO?s&lo)HlJsJc@fNZhO!V
zC1%9^24c4GZJ$hy!>vXV&NYx*S$f$$-a35Q!zUE)ffCYkI7n7>=(CT*w34fumH9=(
ze1<To575nV15VIqd)XjvKm)yl*V_lryVwLC`3K{z$=M;$K&$;{)V>C`T>`d!2VmPS
zuvd5N+N&md{_Y&TYS^6%eh5A;(M^)~e0|nHUfppdrM9<g+TN~c+a33-XIFO~_eVX9
zD}rTkW{{!96QI|)-vp??HPCbo&Oa!&!F!86;>0U0-1uZwMguNjaT=7}%QsRBe!JTE
zv_S(gTr|hLQT1v60K)+EwONet%>Pv%GUnic+Pu~qRj>Q>dfR*LDNiORWGZPt>4$E6
zwP(Y`KOAt6I~84m1j8{@%oO`%eJ4s|Lr@b*M>5fp$j}|U<T8+mxEKjXNJo{3lj1vy
z&C7?^?)EUtr<nY@PuvY3^|UJHtX{0MOr)cG5`$nfxn5_r3w~v1SZ#BoNNketP9w4A
zqqDTas<DrJ+k^g)r;f_Dp5o0cvTs<xLmha6MwI<w>*=`ll=_JYz|oD3?omPXvLi23
zmps*cd0YuVgs~|FuVR0UuD)RzZ3Yj5hHc0g{I2a9$pkVC4PyeVNvl<|vP9v{1?U(?
z8ZJXyo6?<4U-PG8yJ;c@Vg0}Eba$UCmU#fEL8gwhWgYdpw?#n`&`O26EBx{rsCTF@
zh$fgq_5OX>0w6A+w<3jt#<*#6pr}-t5(zxPjgkxyP2W!<qpXW?7vo{Iq1iOSB<_F_
z!(kh%uly9ThWw4Ht3KIOW?ftpzwtBf)sp^-(nJ}ER55MgFIYvEl#vLdzyq5;2|cFK
zBgYQ^c<>tdsGlqqkZ%+S`=5?pOE8i2xv{@Q3LtvnyedO90Quy&BSh2(dO%MMv9nJ{
zSLk%kGumLR5crskIdGw6q70|aX|NsIsCt{Oks{Re%snxlX=K8W*6ip(q{&dxcMvyC
zNiAUk7!aE$(H-Us#!PX#?Oq{u#12_AwNbl5NZTl4c>ea}UF+$^-P(S+d+=<lYD&&F
zswasN!s(8v3{iAH<Nm~{-3>>Jt@Txt6MOm9Y35i>Dv)%lMR&nM7@4OpozVoXds8@q
zyS8+6yE**qX_5_CH&wYeRb2ct22n!7H)9w?usFSt^HXrl!pV0&QnIETaIop_0oxXg
z%QWw{Nsew>PJ0@N4!*M2^e$7e-~GAN)Xe=z1|sI=cKz-U(ep>;L_#(crzaE&6d6YQ
zcfW4QxA_2hxebi<on~<Ng*_x;S}Mq%cc!3KHf+^f>{Q&PpSOodEn@nnS$s=3(iHW{
zU51S6k{M9*=}A-6DtCZNYLppJM^nCVgmQO)O6rvvPzT9HQ`9hb>FdGlc^zduuTbs|
zP)Qv#1L_z<K(pHB4p2!=bGw7NEU1OfNnJ0LZCIslPzjmC-4(&?hU!Hy#w-|9HKZGf
z(7~}!f5fg{-(Cr)$M;Cc8^O_`;{H&Im{QVT*L>Gv$Xqk`8@Z_NzTG!p<y%2eoa^b*
zYSrFwRxJ|-BgbWGC<lX7U4kOq&{^QX)#|w`V7Gg8e7Lj!@|F#26NeMNF}PEkTC@0@
zHdpmc8qG&xm-Ddlst(bO4i8{Z*>jdrk&G(#t*biqDVsebh<QrOE>}6H^WMP1$}!y@
zr}^IS>l~}j8N~NJr0r~-;BnPwHB`+>>6~vQKZ?fi<PMwQzxH0+BhebM0G;xr%lTbJ
zr|w_sDc~!2cB)iarP;9-jG||vfr@ZxqIX6S)zSLe3tl@YbXB#QGqsFP<Tk_IJ+5Ns
zyiPmzZ?s}AXZNoiK_x@#k3iXo{cr32aremGj@Vg!z5oY@7h#S%`R;wYdyjzCzY8B=
zb@-&zVPAfCbtN7@aN8k$`pm&$X0kg`zm)G{bC(FZ3OJmC6EO=`S|?=MPb}{e9TdgZ
zo}gb5maf<Il@D<8djx38^${mgb+YPEf4zMO=c|9N8WpoWd-yp+*KSc4Yio`oniQ_u
znsfEU9O2$|DlM;(>B_d>5wvv1Aegz6Trz09mmw~YW)f|2(7hxYP<ThRCf-?1p4{r)
zQ+GLx4$$KiD%7NP$m9>oFcMBR(Z|x*NR?YREuZRk;MUIW-4OMUKtM|~;_U>b%?4@f
z_^^9i!F5(4tzF~Rc#Hg6l(4#bJs3|54h4WY#_?8`)2Z9pyRtO)(PSIy?xd$#u-H!&
zX3&OaFKJbif%+(h!CI$RE}pO$kGM+#5%?~os>oQ%H2TRB8vIZ>uT`}J*#5r)!=b;Z
zxF$^ySp&W3saVE=r&71pRPbCCusRwnVKM{m5WQ+~KRp<9Ap=8aZ%!()gg>7M#%<ud
zps^F(?Era@38Z}P-Y~p#K*4GnuwLUzeZOhYTa^?mLkx4-FCnvsx6YM-*aoU=EOmdi
zJZ?Q5MOXgCg549dKiqpUufKq&io#MK5fvq*KL)nQ^1|;b6RDOWyEKaizrDf^p}qy#
zy&J9dTl?QgCxLRjIo$tpD%tYR@>x5~+g-KPQp}-%>Sej1dR}i@EprZAwwIR_4%{aQ
zlWB@~cENj$zP;di7Ta@~X4>4>Dr31PUB~&lUNlOp%%^(k1g9Ch@erMLdt6b*x?Njr
z=(sUz7J&|n1q3r|4wPz?uS1U)2Z!iqZsUigl*)^EY^kN9rB1j}RW2D^@lqNCF;xY_
zi31dN8BfywM56!ul-q*F(X8xd+deOCJa<+Fe(;0sH3A)KGMutX!T+q=6{$`W2jrc%
zGX-bD7!zE_!4FqEgMhjCbW9h;bg7T2HfTncmzV2nV^9!NABy6gb9`mjw=3UX;Q>hS
z`mp=DURj3mc8Lyb)D#%2HN(ZKEhOlKcvMdvjGhpS^L0C=AyWC3tRZrk0c9GAy<~;H
zyQy4DV3iF4&T7hqK(T}=p|TaXTxTb>bxX#CPB%Fgd?6gYQ?oo_cWn-*gj(y|tu>nY
zS&hvw*0grAe5Y<WI?S)5RywYrM$8oUPY7>-6<M=9Cg{8^#d;8isegh|cRZTqmuSn<
z)t2xMBu(X^uJnY01VYC;7^4Rhg_D^Qn}fiPbeIH78))M4U?a9JpsKm5Lxtvq)PiPO
zOhR6qA4j{c3{^_oN1U(wC!uAR&c_~F9{o@vNcQ}o$3_1nR37#hu})`i=j<}oZ_r)T
z6VlIBW*l{ocXy6T+T8TBw7JTm#!_!eBo+63QcfcF0g{r_UtaX^(p1M{nna$S<c3B6
z<h0Y5cKSAKGWfEim-wc(CRB`j`DulNaWBQuN`DgtpjJCv+<k%eSVz6rm_vE@&C!pD
ze!foz)_97cTTnWPCX?to6uKS{a%S+!i^4-Lx+|H)x{^d=As;4<;4L=20_quIN}|4l
zVQdlyll>GWu#|i)tOnFk#F1@a>!%wf+~!y@D(Vg1q?ld+JU=+hZ34*L;qGDg;Hc|y
zV-{z9CtC!B_2#go`Ng1w28cGBO#4F@(Sf&b1|KX9sWDF+YvYP5*SZ4g;3?jE3SV;T
zabE%ny+DhC-9ER81ENOC7A7e^0x=VTZMcj3VG|bi!xN|of0mY-L=W6m77H!SL67^2
zTUItqE>|e6iQUMDcQtk-2<M%>@TF_kS{~l?01e|jak-*-nyOPcK<J^8sbHfyopIn)
z-E;x|Y711+g7$5^{BmoJpSBL6KR1Y%o+cOySZGzHY4Q-!rfym})6&WrgfEDRm-^8p
z8s$~WXHNrHc|l$gS<kyTwX8Wm<H%*9*P%L=nC(*1Pafj4R_R0VBsd||FC#s^OG6JO
zz3T*M<AYIx!91n-qz08Laon*ljAqoniR|eB694M(*Z;r&%#8p3HIje)+l~1@I-S+E
zQvCPMpZP!jkdGJt{hZ>zKjPdUtKY43Izjup^+ylaAAZf~?>ckA#mG+jLBH<J49s2`
zbiI&(=n9bKYm9j@#HuF?)j1&6G~{yL7~0XlDOO+@hBhn}>6<cFl|XS|3WW5lLn@t5
zqd`?XhfaiOJUOj4Eh~tu-OM_aS6MY}N7ukt94g(!_MjnvY?gJ%A&LTzzj(919ejDH
zo{cJKUl3EohWGiA=PP@4b2xXq+7|}Hy;0F<e@sl!>K=Snq|vY1gWLIDRoA_JWQq+d
z3CW+If7z%0{QpOieWe62H=O@#?X^|^{O^3*`Sbk$BR=-|Pb<#ZzuLk9JYHE{gRkrD
zN9&ym4j>B7;xwL6s4+A*;C#@0wQ(BtKPMSXIm-)l>+We@NXzc$VHw4KE|sdxEI19s
zPsnNVH;~6cz-#<%=O9@8heVR+5FPjjB^#UE!8!kr*3(^lY=>UN5E`oJG#zFrVv_WP
zFSrgmB(wJk{J@;8&ESE)WXF0|EfQ?0ri6|F4uo>aZ`$z}y9a;6!T^q9DB^n&kKqwY
zo~l<;9=l4u9g7Vt0FtH~LhNtQh3sQ=jww!^`M~aQE0+3GF6?;z8vh{11$v}ZFm4|`
zffIo#(*UyueCt1uz&V(MWP{9HNN1c_76aIOPD)?`A(Y05g}m5Gf9uhWmv?^gNJ%x=
zJETPlc&(az^ey6I@u+d>QJEog%*9Z|r!Vr9^6_p`T3%~;R;_h0F<xQ(tuOmf+Xw`w
zN5z)Gp-!x2R3kZQD%=)zg18N8<$}Dm0+73SQM=BmGTh)_I<C|x$tj^XuBN`@!&qRA
z6g^sTa`28f4c6&9Lm4IMa&QtCmvIcR=+cE|QB{}7IJA?-m>-?HOJ!P{s`oV6OZw*t
z86VMZ4Nrn4_1M&~uxOQ5=gSwztP*rxqPsfbhJ0MyldwdK9DK-KEWUzxO52*l6A}He
z_9F&mB3;<d{<AkPUUUyb(y}>^c-Vp>2!NYZfq+yBB5O8Gdx+zRw*TsL?a$BcKC}71
zucH9EiT_*eRPcX)=KuRcK0g1)*<U+~|9iC3{x)cTzy9!hU;+O>_P)KZZ6sOrZ~Ig9
z>Rcuk$R3+Vau%ZG5HJ&V3FKljk0tzAS(ZT)S@KvmnAwy4Hur1Z->pY?tMxEWCK+bW
zT{IJHx4NsVUscuB)m3Hr?-i|hV8|@^eRkYe6z#6_l3r!Z*Rl+k$%nvcYK>;cuGMPf
zy<>n(MGB%=8){0hGPdg#e+v`j=SHYcEfDy24Nn^y@SSf{HD)nhSPLka9x!{l@|qR=
z^(vV9$nQ|W^Q#TKrP;J!w1HXW1Sy*(DK<CK!jN6UOi^|u)<sWzip(3|6?F%CtBM+p
z(y~mRcB49sJ{7f=vW6qfWELbrkSoBGuqbD(0Lac~HP}W)cH&B9*y!QAkUK8oKw;cW
z$XSbGiF2ty1q)-oh<Y{1^yX5!^|%TADcjNH8&~cghTzaZ+2jSOq64{^d31)8pn!~B
zy9dv9UWxZ55<->6=5yuUPgXP;a<N%&rTDojr1-fiO!0H4M&cr5BBQW4lMqV^zp8!7
zPQ4&Ki?@^T2AlX6?`u>`V0D8^{KH&#OkEg*bc%bCSxmUGvsYuIH{PMF{%k_A1;$Al
zN|SZvQBr#q%JnTSZSDlx7jT8%U_hn4h*GnnYOrL!BM!rjT01;4WQb&e^l_(33tZUK
zJ}Tq>U7yAB-(WTxe;ozj68Z0Gd$V-@w+Y!F<-Z4bO!<#ToCLtmmJ9&B{%z+e1%Teb
zBf#i-m<fMm^oN%tlF>NCixEhK{Oei#;S=S+T)=1Gk$JTrV)OZWzsdu`DlOkErsiVt
zf*b~PUsKps(&XUJA0{EXU%RCbNHa)vov13RF30*i`Y}VvY#%BiNQP{NX>Wp2qwmBH
zNfG;Y4bxtcey{H|VtchgvID%ymHOVBH0GFH)D)0!=1zy8B*Vs>3go=uW^kED71=CH
zF&fKN0RW%_P*t$6{IR(%NFh4Fvs7NfTh>Ho*&3_xojb^;_fB87k5yiIJ*EOcb|6KR
z_kfk694_uEkRv`jcS%)a<5dT<Yj&!@9mXWpi+KgKrG<}Wq>AjG!fyieJ<FDbVW3mB
zWuu{*5EJaG`BPaVhY-rg7=mTHV7OtJl_FV&2uf{El7nyH=#s8dHCf|;Dj|-wUCf_F
z7Fz4De56+5bmD~(>i?eT;6G)!#x&NrIcBvV^Q&tQ{e}){p%`61Y`(zg?9Py_Q|Y^0
zIfn1V>NRwrLhEsFk~!t7$RgCL-W?Zucc)@*V+k*wrX^VAals2SPV7pIKkSs|g7h(t
z?!}*@qjA`1)=RNERz>1|128_EhZm|hX@x0s2HDGbHz*0+G$7SsK1xTumU$2<N7$&>
zG<fO2MZ&KvB?EhKA-U4x<;A2w6fP#`xe?r@TvXk%tJe%e&9*JYXWxr4<kGb_hD{Yt
z!mQ*+n$>y;#-B6<`6)9*yV>x9=3O$I_zM^8K5YN4K6zH`AX<`41M5+7swAQqNjr>(
zi6W1B38)v6c);Wbcyb2Z2M>0~-X#5u8E6a*R?Fp~A6oDkdn0pcBe;AXx>P^*@67`{
z7M0`Uy|~ZDGE%}Pk6nhhDvJZSVAy^uZBV3LR@Tt-!*$6Qr`Z}J&D@}D3g!9*hLtJc
zp#08Dr<Lz%l@8fxyDC-M)Rtd`=_QPUH@PamGOq_4Zxuz>zZDTQ5_$d)7xnXNJ|C@?
z2d>Y7Fzj8v?(Xh)Pcb6I1q*KPF0Z-RwW@{r$hA|*uWDt97=^>U_XfUps)bz=bWx0z
zJL-3rRHR{wj%o&EGs2W49Ycn6G7-|47Pz0^N32^%?h$>mbmiXC4=m_P33R_jg<U0u
z;%^el+OpNM^S;rYoslPpG=Tg@9_Xmz*du@R7Ul8z9iPSf|C#4Mi2Y9ow)|VA^PkOU
zkNf|Jc+CAjjW})pw>IVWA2k4?^K5(L*><Os-~Q8XpQ$16P*et_q#s4Gn&Q3;;Z3?D
zyeLgX6iRyydTW2Keju1k;sn(LIh8?JPKv^QF|BM+1nvAZ#e$LG&E^E#y5ByT?u0Hg
zI;zxBBxCBDlIDWZU!=OwAq!4VzB}H1)2$)uzC}W<6nTMbC0D@3MJ(N9$TGE)cV}<k
zoz-fptgu?iY-*WB;WwJs;7CgCcotU@Mifv3{=y=3euU|IpOG68#@rp5n|S5I+{DDj
zCUi;xv_L)(D7;Qa6w<>iNK(KFA$)$}{zGu{#K)aQ4O0D)i<XU0R%JGqp%DPjCo}g?
zERS7|uU*x*CXC{E<m8+ou=A*4!Wso>>RkmS77WKQ9j3zu%yd{1j<u3*i<R_!Y&oh%
zM`Z_I9?ZjOqx<9G+2z6R;nBO(Zdt72jZdz=+iP#Surj$(T1iDk)mYNu9&+#imhPm}
z(zQPkof)FOu=S{=Sd|H``=t2<_or1@;?ax`NPz^3LE1=sv-oO!Pgo1Pi!>LX*~f+4
zbzxB(u!uP4s?!T`juQrprWY-M1i5x^yf7j=Z<z_hA#d|LA)4wK4XX5^GJ(`C)^8*E
z7T26kOn5@6DJluDYWGpY!q?;zprKYnn2Pt%zW0``p^R0<u*V80;+B4u%2x~4qRw}t
z@?9sl;wG4+eEL<+*wg@%F-H|dJ&^1V?C`o?NDeQ>d!~`1YKOf>YS$Vv{wwTIZgA&@
zs;su1BVdCBukDjs5We`1oN!d)BHL$6jjn75iPJa_DO>yEPp*vHC02Dx+s@X%Ow4wg
z9o%VRedbP?CbmTNPc*S}#tgDYcEpDu7-wdVT1BD#ML^rFX4A446sI5ssyOL&*4FsO
zB^H(~v>{P`-O1JRu~gH-iZG5f&Di@fjWhsa9-Mb=O>&lU{zT_5@Fm$ANwujXp=B4k
zY4U~EZ?38Y7%C<?YK>qWFgN+OIslrX&l>42!)&*zi|sV4I%lkr&6bjEqGE>aauZWs
zYQZX#ATkcwDFeC5fS5~A^{+9ySguy%ys({((Hohhmz<k>M@~(tXu*0y7rWWViQkap
zMFBiz(`-4hb1fw(&1QI^_^O7crXClP6cq@Qkc1aU=d^p&-R*T97T4bXbc*qJwJEe(
zo`e+!P|m1C@7>;Bx7U-%%l&O=(hT&AhCB4ekrUdYVTA617i;L5gRZ1!<RiDM2N}2z
zKnfdw((7xk1&C2FZ&`a*ABP^zbmpwuV^>*9Yv8Ku^Rf`DYJ=%`ngwo@0cMBx4!K&o
zgdZ|vrc{blP)AfD&_yxJZCD}`|7=T@Fm*UQ!^Xb5z8bTOAE`%o$#Mn&YO9&C@0f~o
zRlU@;yWA|)hL(%Q4mZ~<G<IWIHO-$&MI*0#sbO`Ef#e9I@+DS(j_v|3+`ZH8?pgP8
z_tm_Sc}j5FPIzzTy@vF-1vxuTN87*Nmz^E3QGqrUkfT2=9D3oHvtFlCdBjShap8=J
zQ)e{8-W|W|b@zF^WgU$nL2Qiql%(S{4i1mHtM<(P6U;<fw)g^>l@!A0=(9&*rzGnm
zF2&llRpyI3WKCkAJ;wYwtO+3#8W15gtIj3aSYnz0o0y>b3ay=}OI59STvV=Irruy`
zPOY|MuxfN{gV1v~`4JY-Y?iI9X_9cLT)wkH+f=Kl3@);0QzliyoGZCOrk<6AQc)#9
z<mfU=yaAQ~JXArOgak&1yFy<-#gNBLsfMniEV2Qzd6L}PtaKz|*%&%9^+iWzQ<Rv|
zr_mStZk`t+=D?>R302EzP$pkH)@|R?#C2cgmb(QDb6QomQnVfv8|(0-cJ>|3t#p~(
z4H&Fr$h(DoJFA6?XIKo`7mAsKQmi~>XT$uELJYv%yhpq%9P;OuK&s}HE5$^DfrYU)
zVlr;HL(tY-HSsX{c_vd>abiv}aTVUkZaYHyM+STiHC#ukkL4uAT~-h$v#V>o%#cj(
zXm*kz1A$0ev{2+Kp<g$yTpe=iUHW6`X^NJq^G&*Z-cd33Ib%>0laD@Xg#W*K?$Q6o
zU&{h)iT)Sf7483@w%d>P{}1xy^uMuT0rs@L+yV?)+gGyytI*TNzs&}WHcbVc=~vX$
zF44(W+$3FUU`9sJcnwn8Zm){ImU5VHq1b@-WJl2D+MX;NB2+rZJUe~YJG*>!c)WXh
z*zM^aJ3MIkPHNZxgSHrj)LM;P$=U2*v(dwhIdz=$Dygc35p_gfRd}a3>B;4ImR=7f
zKk1?Im(-k*=kemfspUWxsWiNkjA#FnynS+E9O~}rY44}wv)vy_MwJH2*<=8;&<d*O
zC_5;-hG~4fi>a9%owlOm9CsiY_n`T}1TRquZDT5(U-#@Be6&L9IdjOG)s{E7E9B?x
zOcA95n)y!7aL#vhm8Bj_*Zh0pYAbr|vcE}VJM7HE1JRfOuXltsi-Y+Xu!4?<{<Cr_
zR}^q`%gxFSD?5}{jE=};f_W7rv^OXLBE!2f97J;d9C7S>1G+MPB|Vc?)nHiPAslHb
zRI1A~()%>jwRHx=VsWSlHh<kagQ_~5?B{T=OqP<W9;qD4cK5t$Qa68pgC{)v$p%oE
z6FJS2C1AaiM@u*=&3SOgTdQT>(aW}VC1Xn(f3(fWPd>G^(gPT~YJ5qPvOonuxWq*z
zfT;tBRsX4#qKxw5DpS1Nbd@+^X>GfZ$2zmLDcap}GnL87lC~<_s$z>jENCtp*%>YU
zK+UYOEiyf*DT};&ji{;(_{gD(Yf!Bn(|T`_*&d|SOazie)^*yHPnJ-2e2!7$QiHzC
zu`rjDOLlQdZPN!O*^X~L<}PLca&Z;`WR`tMQ96>I_;RqVTxMm=R~*@rLQ0NorjyF4
zq^d?%si5Sdzb{K}2KO?v!18$*=47L&-#BHJvEPFBq2*uJIGwp_kye`x+SRqPjoyMv
zj}jlKr&+Jeeoxnytq1SvXkIzhrE(K#r<6^a9p+n9$U|m_`5cv#N?8srq8gG|86BZZ
z+|v_=J>rtNX67t3`!^C*oNWuV(miR-pVLb###W`BRs}NsbRI|6`D7N6Qahp(#@Pgy
zW{u@(m^XVYy+^A@*ANI*s<e76ztUEZ<ySe4dH$_tu|4d8dVv=iiM-Nf0unRSWXfpl
zKG{#&nz{{G4Wv7loSkF}<_bC@4FId<yh`gydXs*VU1eTgDU?vnL9ZO6apSro2Mep%
zG=^%KwwR@DrnbG5labKj9azx-lXq5*v9Y2{vBj+w^@Q#k(UUUWD$xx0$$veeV?+7N
zCBuVWi+<uCIu_Aqa55Y6wBF%&$Gd0mPP^yr3!{wH4`Xj~CwRAHX&KRkiGwT6K6|ad
zxqqY2zAGK}7z6rE&k${M>-d|VQ+4L^(z3JO6(jFMAUhp<R9y^K!^;j)R>gHD%F}_6
z^squ!v{^G1Yse+qd=PWJ<}P>(FITVE*5rjAni}8Zyf`_ocyn-a`eyem|6-Mqw7;3}
z)bxpT=*2ObPN3Lp<TaSrPSpz*^{d|%<l1tEZ2M7o-)NZc+N~|JN02vR(p*Fp+z7!?
zk!jQKuWDVY|N9CqK$hJ9>})+<FX{g}kNUp{c`EdO>;h!7%`QMX9r#~#Hn-aw+ntTC
zuK$ycK%}bgx}^NOUVgh%Y1zJ&2qomx1CZDe!$~sA^qP6s0bh@I>`>hXA-%ui#Uz#i
z5h|rdR6+XcR}V6!qBN2vH|O}ih!3SMZW$LUU5LTN;VeSWqe`8JfmA?#m0ghxh2)KV
zX4Y(ScyRb1=N6DB!-7?qtfE$H&$l|C0S~>jC&OXrV+<g+uPMQ1W&@xJE_w9;hznpB
z3uod@t=3up7xl2Pkp9a7{u*^Gv;W^J`+wTp+IXb@5AhiEUye9m0NC>6@z2(`8$kXy
zwl~__?X5id=S8lqxIg#E$H!xl1xEd!WvpLy-t!qY_EqNe*fJ$Y*D{Kh<>;vcfLeoO
z$%+Gk?@tc*8)H0XFfV=EkW@GUpxUZ0Yfn?&qZuqGb>$W4X-XSzR!!qA;c0fu8eWWN
zQ!LPUVm-N6!$@(D+*E27l@ig<D-i+6wl>Ur|NgxN8#GZ+;yro)KA-7*WhO6|$*auM
z&*kY?<{9Sl3@h`*xjb=Yo=Gmxq%zMmmuFg;=O&luCZ9(sDe1&5OxbED?_SLIIkFpU
zVARl|%}=dHdqYgsz*pKEGs`Iz&orF*vHw^x-IM~Nl0}Ecq^ndwS6mdQ^NqqaafNXl
zMtMDK)va-vS>G8KFNFoWt-uo7!lL-;i(qJ#vjl;OoOXHe=FHL8$rlvYdS`PT<}Q=x
z3hJR;bah;{`lZ0$aaRVGqx;DKR62^0<1z>eV`2=3u>oBrC6FtRPj+~3KK3(b0Wz7^
zJ(*C#TU_}RHHpW|04G9M8Zr_YIH3!>Fz7}sBeswvgDO|X_}MiQ`)(nu8WWa6I5o;S
zcg-kLDml&4)7%Tx;UUq(&&JRh^Gw&vVY)JaB?-wgoF5y>#lZ_Q#OF-sD}xKngz2y_
zWz28+u6glZ+IVZz<K~}J%0BbnUM6F@xpAIc<c?VYp_B0&9Im3HgmCxO9-W<J@L&$8
z0A7e5lzk<O{>eQV?@q3cGh7AcKJ5J!gUh}Yjb^8Lc)Z{J5r3l-!G0dj-f}p80gg{_
zR0!(=Ap_*++f|6VT)|&$qg7Oe=K$#byx6V!ZGXO~rqrw|fePMU{^iYEJJ)ULJ&@Bf
z=#Rz-CHY|i=tn2J`+v<3&HL$&Kw6!rio=Ci8?nT;&BUIWn1jBOS`MqS4HZ95&X>y3
zim9ycU*O=NS?N91e|L29s$9R3T0$T-&m8;n3;RCsXS=VCx&`P*2iZ{Zq{5()%X%@J
zaXT{fQ@O%kRfW6z`*{T3y~_Q5^Df`~{lo8bzu%txko(>J-?^VhXZfGqeB=5Q8%8#h
z-q18E%^FV3O4*A#pl=r^u^!-Ty_Nv_ivjwJ0WRuiSX#M8tC*{WGzth@nnTk>$kn(8
zgm!)5>`|cy%ad?yIV2I&Dd@d3P(|+4L*l!xLCXmm;6idYF|9Sg=|Y0b^@++_rgi$%
zxI{g4*;rZ@8y7`-J(Bq6c%9>=Wo=ujmA%7PbBD52Fm|b}U&z`E!o7JY%%=)zb`Fv1
zLx_|jqGm@AY4y27>ROFHpElUWaRVkBsaeZcQt^Bx-Ch|uD}xuJv4ZwFT2xp`9q3f)
z3)7pz$l82auU7Cwf}{4*Lfd2LDdk54=8#jb6&#jS_$aB@dJRL8u}!Z{tGx=ZO+2}1
zR%MI=8bXJ866Z8Zrt+&KxcJLrgfe$0=272EYYnisa9qtiwnET6__Lj!@}^S2Lqv)1
zMY3vTn;?Ixp5ePrM!V&ivxG{9CC2x0-a4i%+86yxE%GR(uvBQJIN&x3jw@rllIp}}
z=Pukx76r0U%40<e7Usn_W0{qja)iD1DecI-6DhdV;a{gIFfjZ%;CT)eXREYqV?a~2
zY*Vn-DWsDf0rydL>)%P4;1k+!csNqHtEBt8K%TN|%L94N&c}(L)kOf=>=(oOz}8L7
z+P2VVl2#E{v=Yz!O=3z1<=M7rs2fD(3C+Ta7-ln4&MhNF_xDiRbW|Bu<gwSTy;!OJ
zKksTprT!NP`}EtdR|jf&pKWa|I{(9`p#R<6K>x2>Uk`=F&%e3;ck%cK{&muVv@fq?
z$@y=)Q`Y}K+j{z_|9^<5*%Ua?c#C<2QFKrQ(-+^<dL2n1P(X)b61IT6$9T=n7K21`
znnsA%;*iSMfua46qksSI&*JqTg~Q-M*8f(gQ}X})?CInBe~<^(zZ&Q|d`~9fRfy3B
z`gdX<{d>PkBD_HmOvLkj{r$ht-~(@O-vllA`T~O-;0=>$g6DP32qBG<K{yOK5&ePe
z9`_E#G?<JCe31IyI1p*@%PfffAgwAvqz42yi~w&ykiW8!3^@>4y-spH-<Nm8gdHN*
z>$^vX-*;W>|5&yC?(V*8{a;HZov5Uy1=LJAa~uSbch|7d9^m-oth+6GKlRSKZ<_nv
zx839Y?(vx;yur^fH_+{49H0*#Z*o^>Cj_C}aXL72feNCfS)F{@Fk+#bq%EH;A?>ve
zBi+c7o`<$7g#R*xc27@te_G#f+&b5|VP{}d;fjCUx{&5xf0UKqLFLy(e&Ly(-(6rH
zR{7xTIlR7AuQ|i{{K9RsZiH~<zseN_<8isyJv!<!C>#sCt1SBAWO|LG;Ry>S|2VM3
zZ8*ISW3rv_gD3({G4bxQRxp_DbnM;64JzV9!EowKld-MwZ#(p+b=~YJL>Y7S;x>DM
zjxM6%Ir`y%h9Io9IkuQGp5Lv?0&DZN&PAb#)GmyEH)DMFb}3BUc#;feen3eSSA-&1
zl5dq#JA#`ex(OPXEgO`(QOCJ+?#A#pbP+pjh{InT^`))?=iP<kg=nkhFoZckm^*WT
zFqaT+6@*&_;g<3<jCl@*f|AZKNFH?$pai1~f5e)ZQ205<_Y#EpaFzmqrTNFjD#!UM
z$FfQZ0Q->VB6@>p0P?Q8Zqtb93NLJd8!mpi!7n?M)|ODro&z}Y>$tOq3C)f%14M3|
zAg}yNdG9!{IZKq+tm}a1G*0`}p9Dd9RtzTIZ6lixP|~$5qyV1p&qlKd4Tz!iB%paV
zj6(lIFfmpy&k#ABYR&SXXJd>|;a{uOfd0@Ogr^4BD@5C<XOOnpxpwQ47CG9I>Ff>!
z(rw*j+Ige;ESY3&q$cL6kPp3AAWwdamN>lNKH;DAg4ay;hJVv5?6~X&{>tc(uh2rw
zXjP{$!$S^*jh%!X0jZB*;sX89PXI0yc-`GSJwwtZI_#ZA{)PW`#I3sl)N=!N^WPmE
z?srcqU)#vnF6Qh0`1a^zzbi8uz;yPu%DxHN4-R{;b>1vzTjo~ZIw}RrZppH*-kqIw
zPY;fM(%82hv&yys%D`5oDNtL2i8fAN@?J54aRxa)8`Y!3gRUAo9QjE=lk_&>$)08$
z2gDp8h=5PUM8Gv%dYOZmCZmAl2~LF}f;EM#(x9>_GIPMpL40EjAsmHhPDhOXu1PK~
zpt!_D@)90AXUo~NOYh`>IqO@%mCLVjfSgUIv#xMOhA@k#VZ?fW-8?AbcJxxQ-nZAE
zov;7JvTIO=q!&L5@InMr1x1`St5UTZOap$}<~t|rLHW&*Z<yK}6~8v>y~bYkXOlFU
z<Z9A{NEbbVt`|+CvxVhgEu>|ojM&I4jKZJ}SK!BsbsQlY4eAk1N}5e6C)E&_IAO8L
zq?|OdHrviRbo?JJ%0527;aR-@8;1R_v;A9Y|KHgt`G0=ee)RwRAP=l-80aJh*(J<;
z-4mnrJ^wl&#&Q!(&|6kO*3uZ%u3RMJHSn$hWUqGY9s`v@gSYtkI#HK;t)`+s*OgV9
zy0V6anjL$MzW}YSnbMhzGw(&s@oWN{%|MW*UZSY0rk{-=6qb^U3)>l8h02BJvo)FH
z&h<g8s*@)SG~>Ech}Q1hA!n>%4)+cX@c<i*@m(H6WGX0`O+%p7;WWbu*HR;OhSVeN
z46|%csM2nr##sNF8abN2v?>EYv2){0ontA+#pv_t9HelNkk&VeOrx-rKr1HPN2!Aw
z&IltJ@PZaU{s_gUNi2h{*mVYNS&kLMKPm;E*b?{%;CBklgW6$@BRtJ@0F+&aKd$U?
z{K*+8VIXt-(Ube}S^C^V|2^CpgkJQ;Twodf-)I;0f6v;T_9Oj&hzALVCZAD~&L#o5
zq88)iHkb@&5$`M}o{mF04Cle1IZo(S&=}=RAUJd<NCC=xoR7lzs*byxjQC#JIW2~l
zdpWfA9cKKl<WRj!^crT~vTj0VyK3Z!eOZNJJc=F<D*;vj_m_YKq)YE9jR-dOre0aZ
zXK{-(2~fO8HhNI#k9_;HH*u*B<Y2;eg_PuFiB1U>v=vfpcy&lz*XZaBVXaiCXZX6}
zr^bOTXd9KK%F9$VF@&5LLvcWDjgwnqfn}bE%vC9H8*|6{6F>*Pp`c<gL*BM94lv1L
z7dE|5alcg~2=U{Q(-%MYoc~}rkOw*c-PkJL|J{1_?D78BgFLWA`#|oSAkPPM4;`I(
z;ay8yyfTyl3XN(u&|OD5Evm~PdMtqc(~ZN3Bw+l#e&OP8$GQ&!EbXByfdC;Occ>J;
zgu;-p3tC&%GTdfDA)W7$k6HOjJJ@ARY<#j}?9J4E6h^C`#p^#!CesI5|Lf1zpO)_b
zZ$94te~<@-yW2#BBbWwg@{y@%J%KYI+u$2lr@dGNa}SG9Sc4Yb&A!HyQsDNU=+DAv
z+6)bG#X?XP2?W6$gh}#8NHXKwOi&bW18)++esv5qLv%XrOkns0%Y%>*IWyczqpTA>
zpYdK@iEtx#<V~+z6QDuKs4;6cBJ^pz27hr^>|ZCSHt+<$7vt~-w)?0n_hP6mYPDtn
zX?`AEIP>$-g^Pb2{8^(-b$aWKWf=;rG69KZoTMZZXUcO|7QhmmnKsjqVdO?STj)ll
zer5e}_}rZ-6*3eH;~NjepLn{B$gFi*t<i;eE~etS3kf4k2%GX$4SHeNn4|gO)K-0g
z5A?*ElKW&kLTpjUZOa;jNkp?TId_N@y5X8SBKzcS@vyleh=7sj%M$?A20$5Ffu)Ux
z%&^XEXdx2~u1<nXa=gpu<!KNF^iAfCDWB?KKwbB4%)KioiSx4?I-$}3KkFQ-KY!-7
za+gA9{;YcCXZPo<Q*?K_x{GTIdscR5MKi9G+s4Sj9fg*KM=1B=jkJpP5M07G6P?NS
zDjPCr1?3{_buQqiQp~46S-K%&o8mckYf3vEdG=%C5F-wd6t8s<+zx()Wk%~PnSuBp
zFfmE%+(1j2l~~kLHNG7jwQQs2-09ul{P~^SM{#*?h;A!>nT7rbq9g>SVhU6Pdr<{!
z5@5`bAcG<@$X|@0@UBQtHqTC5^{H|{pqhd~eeV9l`iqA;w}YS$f8Tf$_`5rv(Dys|
z`<Gcve<MtvUBTa8FowS;J_<<3$qoG74}9xmy`CGiPpAKj`TungMPJ7Nbh-U!iT`)t
z^&|g(fJYu1OO7TZ(*auyNar5`bDRM;uGcey@fzoaxJ@R}z+oP4Im!tO?Ba=@{L!s?
zd_MJAy#7zSyZdjtU!#s?^8flqrxgEnef@F$Kg4r(9iUh|0j5NI0A~Jlhy+4?ONbsC
zAHa41sKf|OhNfs>GE0NuEFupCtvZ0XBM76wi>H#sk=0$oPO(s_Oj`ulI?&z#3Qi`#
zb)!4h7({7Om&F1Ps0!L%1%bfeWmrs-r4&Sw<U^}oe;oik+=if6swP>ir?b%rJuv~I
zf#+YVBHL*4A^Ks8zF=T}*J}J7`S~cAUMB+%tCB=FxB-cin83k=2!5IIR){X94!Q6&
z7?Hvo+XG#p0;{o+Qo|3TG@NnhTj-AXIta;ZP^g;}c@675R`(=`-;|1AVmL`+%p_==
z&_};hu<!C_(_}=q$F8EJk7tSME!mivCpoqIw9lBCPYG+a`;Ub=Cv;vhGaoCaGH)VH
zky09HX_t~r2rWi6WdM_4jB--}ebzu>W-X1tD0~9H5<;6b*J^u7eCypkNyT>_&*dYw
zP|_-?ny3|&VEC4AxG@OW@#eS42!=D%Nj>ikXeUgWY0?)5Lg&H!X$bgct)ZV3L2)R$
z*g+`@??I}MQDC=R=ud(oH8cR^)3)$XhVOA?Xwq*-Tmf7R&;)BSBCl|?E(kY|4zz<2
zm4>Z*(8Q=hJZ$t^(C_TEIj)?+OVjX*rZz5)swp}jFizLOoc!O_A4Q0Vc^32kjB0*q
z9m~#t*V{$=pQjt0$NL`-@}U0zvsq$&5JXeY?F7xIxaXfHFonF>4-6dw18oe^|BEy9
zoMB(95`4Get@Z71*9|p9>{yU)IX--PF8X${L?1r;%5*Ut!h6?4I~Vxu<0q;6ynfp7
zntl5@p_DuN^qqdwV|53qDpdVLJnZ!u=FnRm`p@%6rUvRhp^g!9j8jwn-p8i-*tDD}
z`7i`lH%SsY1sw``T_Qwr;RdQdhaS0T$q=){hG(x18-Tx|?M%sll)BDF+}jHCU!B0s
zcPtclu(+u|l1C)$(o(4=(D}hM7^e<n2GY|?tMlxN*$Tz^!35w0Ll-~!o;cJ8(0|4A
zl*~?kQf2c+nj)neS%v?a^JXXCBfka{jE5)AJI?w=U9}N@JZ=~Nz-KZ2XQB6N)Uize
zv$<Ka|J>Ys-2XkugXH@+>}tp!!*9FI^|rIsZsL77vdhTSM0*0rc8#*Re%tZeYn?XV
z>#Efjk*bxAR(mMWU5~W?tQGXsH8bVlo*IU3<Imr2*{lBA#`-5zIIOHttH%H6LHZq^
z#p|C%@~=_Hvh}~UwOLyKkN1Bc=7IIE_gs044<3K<oa{B!z1w6sOoJ&%BzzQv{yFJ5
zN?u9C8@UvauJe@TtCZ|Oa^h9~{HeGg+yD8afCb6*pjaa_T&1&qBXz7s%O-bC`cwvl
zv&F#He*{=E75!DA+caAq+!RYqf-(AFb2e51`=(5cg1C{AL5Xo>mcdk5t@xH>wJd3|
zChDr6_+zc}^k0^YEMEV{HvS9iShoJ3ZkFOdY(Cq3T>lU8;ME0Ku+sEPMiFOi9joNh
z1v)u$9Dq8i+iO(EdMX?2EO41j1JeJJTG*R>Pzo$-)gnWZyK#sFBO^DyXpTiQ(#B!p
zzljJLlMqr!o5e4*9;;qA@8K2cP?-uDH{2vi``}zUk&}#_D_0Q^*ssvCK3{3RY^)4c
z?Ujp_bhUB*UGKtHel}apot1R0(OR|tm)xKxACwga{usNi)w8%#_yH~FT_k?Dq)CCM
zDOW%_(BCYgA$PoLOZoeb|KjyuQs({UI+oi1ZxsFiJllHuX#e>j4;%L{*U{E-b<s^M
z6*L}Zwl@{O%o211$w_GoFHx~?1-!4#$3~e`5mmIM)}D?)@2W5AjeemxeZ#YPVUa6s
z&xX|{!)IyJCn;bQrGQ`1_i|k*r<W?5uA3oi+ZcsGlw_5Q2E{5)qJa|!w}yibmtzlH
z1yhWT*w}EaUSwtO$#eCz<<BOtb0YVa=Axgr(rch-m+8cpZ6mkUZo6o^vn?H07paD|
z4WbBPW+B~0>pRQQ%|cA!MdQ{>&17f<B!d)X&>7X{E4(nLh$zS}S^KA4581PE`>wc8
zuFmn}B6}kfTxt47C<ClfF!hLNqfhB!5Z^Rx=O34sKxu=yd*xhWlrsJSnLiqKGuqa$
zUiaKiz3;B$XB)rZA0X`XwJoo)p<2v;R4IMxvyA@hvz{-gV=4XLD(Ziptv}lTKFp)(
zKOf?efiA5!-UK!yV;UF->1sb11vfzi+d=tL(~IjQ`OtuO@l>n*OSID5QxO~>Rxe(>
z$aYt1M@BDgma(SUMS~n&EmKW{x;jWfbJ-pAw#~Guh}Sw-M92e^!Io<l!_B3?WY5VQ
z#Yk;-h>YV`b*dn{$TYr$X0&dBdjfd!j%<jHmDL&)zaIcAMRK0!9g4SQ8KI_%Y=i^k
zHBmU4d9o&)3?x?r??f{Sp!!5qZIkH`hS+}qJf;KniLe>~1X+rBj>)DUXYP7qC|(fL
zA$*s>+#`tRn24x4)`d_EtI~j#$1%l2ESP=x$Fckgyj8RGk6vv5g3mqlU+u8IxQ?az
z|Bd4P->038NB!S}Jm`1tGwnd=mI6A<0+DlF_(?Py#i?lEJBP~HiXH4$?9HRX-aNW*
zZ+;0|a}elq`|`+nV!dpfU#{F<tl8E}+?V4X{0W2e{^{;AuwB>7Qwcm&-d0pUr_Jj#
z0V&XwKYC~$<hj@Xi!|^0(mIyj|9n=m|K3=C)c-xmlL>retpJOi^mN)%Pm6S^Vca3#
z0*CL*o9N2qLfNOmLh{DOEqvQ>e+Ua&xT538yXj0KJiHeaXa4UpNOxfn4S0`^kLL(1
z-gktz);I1fWmoLUMJHMs7-%-o2^qQGlunD84E)i(|HnUz*MDaI_@#9$TmS1@Mf>lk
z8=H^*pC0644a-8?)@;qocn_^sYq6~nzLbklg@@qVA}cB16oF3w#la$y6t`SKd}F=q
zbx$o4`O$4rU|c7GJRnd!Uf=%xo_qZNvjzHBsAK8+e_Hnc_Gtg}FpoU{TYR-3Bpv>p
zxW!Yx^09!_`{Xpmp}r=m*SKQ1%M`)Gk9JY(tJJzkC7idrXRjY=!B>3l@&BOiD131p
z%k;mS?ehK4$Me63dF1`i-*N+`@*H0@199w<%U?Z##D7aI0lSu$QaPy@$P2r?F+>u=
zI-Wkpxvj=$Z86wC|GI-)iP9z_v`d=>vQCcBLfS+{;fPW0#NV%;I8gg2A%pnQESiR6
zB#zKke;+?F9bXch#@G>8pN??Bi?H^!411ibhT8Nf-(HorR4NDA!;g|dBX-2t7XQ?)
zz>3`vXAZxL-Er(5qacRk$Ic{iOw3zq^*JII#EoNi3am#H$n*$0Wj4kEJkBY8j3&*c
zFJYKAA7IbN{VlyQ4-!5eEw<J4NzBY3W*{Ss&(O!cBULV;p}z`rqDG^EeKEId(h(UA
zB5JYHY#9G#EwdixSxo=UJ8fT9$5Q=oyJ-LU^y$+_`R_p<rT<-gU2&0!N0&y>;VZ>I
zpU4BBlC{|1tyU{+wX7$Wv(9wKFg4(>-?>^6EC`61VECPBA%Ie1DvNZStCGk#@owQY
z8dc3LXTz?~-SzsN%YJ|g=>Glg$-nXHU$Fl7PTu}>didSzv#(Rfvitwfo|WSNJ$<zQ
zewYXE*B^y`5T|I;sh@gX-q(-#-2iy>Knh71#3@y_U2hK0R30=K<={FXHU&{~i>?6x
z1iA%C*;-5j9Zmvtf-{`nqJ1ce7O*Ullh3dw6yf>_$eNz-4T4eV*C_`GA;HAQd+X8%
zI0YZ}`YDK((;&LT_yj)4t*v_f03Zy2iiDB0WcAoBZQ!t9f$4O-{q486x3|dKTFK<<
zTiJxx^>h>ofZ%@Jr(WMn#&?tO>Ut^~d$#EO`Ollp^>+IiIavS%9P#$uUh_0epzgOA
zBrBymIM7$95d$F<gzy;TQHT2uIv?XjUj^hV!He(27{pf8-1X5v10CQ&XN>RaG)w>{
z*V|s2CeV{8-wqOgmMQ+w`Zfjn4g+iTWC_crN(O-!)#Y7A^~&%dfQmrk4j94Jk7fhJ
zLA{Q`Q7CJ`;?xgmox^-Ngr~#Nzwk4lW{qe42v(dU1|fp(!w|#ZVImEbgYEbh@2Lh+
zR0jxQpr@q5&S5K&1p5Z+mt92Wjknhz*5+CgrXa{qVyKb>kiqUDO{m771D~8)klTSI
zf_aTi^OKl8BB$GR^nk(PXs9hb%)n(rpSzm|V4RJrd<FCbc0m0=c36Nxw(FRrnlr)b
zDR3>#`edRn_M51~j5&MV6}^*#vmbU(yW+4X-kzR(f4JY>7uIeMep`<C;qdJB$-6W0
z0|xRrKKn_W9EjcHpTu7ekM|wX{qgN-x7QOVr}e`(Z;uYUkal>ycl2)m@c29N3d$Xy
zoQb1DSnL4w>_lLN64YV0hrr%+PxoHK&)rvtM~7!WIrW3XvtxvLaB?bk#oOJ}v%|f2
zN4uvm(NEu=^tw>}K7c(wJU%#uTDot#$7d}8)k31^eh<Gy@AdA{5!O}TeFx~DB7#Em
zCh_{@Xuk`IueyNR?yI9N*9EQGJK8;b<B0v;H@n|;sniKTIjv(hMo;|kx{FCz-!A;W
zcXoJkjP2MvIX*jupAIzh^h_81;jq_r#O~=~4}0X`^yH0G$Nq#8Cj<n_9d{WD_O-|j
z31q?F?|NMg5Cb<I0W27w<J|cD9>k}C#y~J_bl+tvv`YT}^<4kZvyA_5mF|CRu5Ug1
ze}9mNhg$jj5itJsdJj0v;c@Q_SDy;P2y}@FcqoI0At`E6*4KwUSSvqKR?qar11u`O
zLgR2CaBLJFc_}iBDDaTc%bTV!<5$HGC>{Wr1SDRP>qtWu5lU|Gv{!lucnVP2=50X4
z)^InkeZT<6O2eyI3KYS73X6aY%!M}|0~=vq1}zOcN)u$R7?2Vj6Okx_u62r`M}R2+
zNgg!4i1ih!zE-7l(?SnKD34&s%qW;5wdd0^;*~dH8j@J_Bo((oAG!(^W78@T1;i4D
zL>ryJpG`4FqwMa5f(?b>(qfI!o?81s5OW)Wr;kvA0QNf!&^{7-6PX^y0Z3-VzXJC6
zrZEs?&qvpV7S;^FQ(f_@*u4R9%<G3yIK5jqz}R)@6pHi8$Zt7WP%MxI5jC8Q8GFEt
z%Ot&FCMdQf7E%%&B)2g-mc~g?IUFj3(ZoYzoh)pkK5FHzALFfSit@GRsJ4ws3Y*0`
zAS&cTx!^;bP>{VbRDp9y3f0#brxmbfC<?%&1^9qe1q<$79L}3j2)le;(qVUBI1(V~
zSf~Qv;GVRCW!SwbN|@7@DAEJ&F~ZBF1<(U0bkjq(J!|y<EijWY_okM4Jy<;bgzQZ2
zlvuMLjJ?T}&Y_TFVW8P5DfN07ddMf)SIWvPsJ=}=J{po5dd~xS69yPtOvGhMU@_|;
z5P$LFAe@lz)L6Wlc)x~`t!DHnndDZc3|&XzAZGw{k}h6h{9exk#cY|f{;MBWRq}s1
z*k7xTCH(){=0;Kfx4F6gxc`5U$6VK109X~TW?@8IIE)0ah?KD}Ke;DNCqA$c^y-%&
zJL=2TgLx?EE{0H+#I-KSk>CV2Q_2lE=@pW3lPtBx8z4t?5fnL=i3(beAT<-|T{;bb
z00JMHMW}Az7-b+=+_l63Ifu*Wnny<mxO~H*xI+&%iVm`d17lYMwH(rpkAgm{vSL1;
z!|sW%xWad&9ccjs+N-w&ZUHm8tZo|I0Wlqq$=feph25qz7Z33F;xrWfbU+*rKS{_4
z@dj=@n*&4klN3In*|+3pe2z|myb0`50mNZND^RJ)ErH$o<c=dWW9S2D4ah0DnIt%l
zs>wk?2(WN?07Kkw4uEUaB_kyb4owRmdL$Wzzn0}cVpvK-)QNQc14Fx_OGg@hVk{h!
z?1wN0&Y5a1mA0}LiCgJE(!UP;51GbD%Paqnz3%{zs%rjTiW07(fGF5rFAK^BH=Ar|
z5=bC~0HFnwASiXqO>$)$dv^&DQ50;54G|l55gTG}fQkzGqM{-q0)l{u6vbXp@H;be
z&Mmu}gr=YVU-CT4?%i`woik@<&dhHTz$2Z;I>C(vB)cWBBd>{MTylN@)|F04gph<Y
z2<AsPKI-_ADq&xn5A)P}0Czz#oJP=XteX19iaPOG&{M4shs)2hikrm){#B4j&l8}t
z+y^HQttgQ-p4_-3J`c#7`Y3rtb|SZ=T0BBlBcN%~EE#pc$iZVWpgDbu$>&3F*%GsA
za3H#c#$>Y4lIlyfY_!<W3sDpqMF<HH(5IZ1jinFAiD2w}i`B5fQZ#371TPYRBJjpg
zZv`LYbU|3U8i2XtscHqU0!xcm)y-B4Xck^4h{VpMp~NWE9S{r25~LBpC{&QsSR^?i
z0DY<rpSmjXc{o%~pI8I%!4sdzKS7a5gj{4*FMCJz!ZQy(VLi!Y|GB9uH-T2Vp<M&J
z6{BoJfojXBV6FgVjLU2&fPq});_pTk9-be<j0*(%3WLDAUe*e-29&--QATWBq7DXV
zVmx@ojVgl=Yl%bje+Wy!zy2_*022ahw9No5R%|h<0)Az+a5Pyh7B5G*G$rOEvh;^T
z?P4^B7>?CEyi}vw9}0n!NexlYh$oqjExfL_Y&IeJjwvf1lACZG=(OsqWSll+RFr~?
zT394J5S$Pug8IP^HDo^pW~Q6SeQ^Ci%VbOf&>FbTA{aHfEhu20L_;uaSUP$#n4Yb0
zBQT)rCd?5ygR{3x=P$j~kBZX%HWy@ver94}_`O^~I4R9iP~QVMJI4BYe6ctz4PWRm
zy@8htylP<oJ`Y5c3)ZSBSOQ6q$qXKg*IE_E0fr`o$DzXps{~stCP9Vfx{^(Slgk5o
z!;}kvNW(k~Wa;e!0W3%dTZ&O3Q-<fT<-q#^7!Irp?M|Jd;D{!XgjFHRpepXIMq56r
zp#ha*@!=4JKH}t~C7!9T9I8u$13%;=avKIbHX069u$g3J2r4q32mE~{ggTwSnz2)m
zGnncMp1Z^vK|>>JhK?kRD}p8+)<HwEAsK^PyAAadPb)rMtQLoWbrw{fPFkd8!gTEC
z1TsnxKS7?Tajztu%eDOJ{GlD2J&>2;8o?OA>;v;c$ubrWLk=1|M+mpkx^G!6X7Pft
zpa?2_R9c8NIOS|jk&g+=LD2?JAM|A5MivLeT(F4*1Y^!kL?vKCNhceKXcDbxsy7NY
zAD~3+A(MF`QHA~AsmlPO4ky^K%!d_!nVlw{i0Wd5fFR!NUy7cD4`KX&JQ#t0;npAi
zt-${Wl!-1MWX}yUF$JgyuSf7x1S-<tBU9itCP}hSn9Q9%pr1ItN`Zy!VGOH?heT5o
z@cTt-n9A|<kv;M<F^GTkd-(@7%s+tJ6aN_2@PlZC9<rvz&mO;cIi#{qOK1wvClAkE
zoLD@O@n<oO*56<%&=ZLY@lyx*(|IaVQfVyiSHrSvaA6sVgTSHTcXqVF2AH6^ydFG;
zRD}Ds7jPG=Axs&H#O&fQgT1F8XsTu~VOU}ku1sq$m?OmI!JDj?$UVv8;Q>2r1&O<`
zXig^o`jkja9Q!aR=mH;@OD>L*G9>!Vs$`E*c)*)G>;PIw`P}GYY`7|<3)L3h2?GEt
z7C(FpX$%^MDyb$o-ce_;YzJ&QAMTSwup0#zGRBQO*<ddT3|&8yyb6RjC+uUB;f5dh
z|8&dE;rUBx|KS$>!_`LZ_8)hb4jmKYe>-;Ud?f$N-|}a^yfN8-3i#Cx8fOF|XeU<|
zY$_;H=dlY`B7QLfqUYIc`&Ypof1EKOuI1{FH6;jl+&+?vxoOBG&rx8aR?`bi77S%p
zu>Y9~REJ`oiJ8`NtU^z;!c<Lw2}=UG$hcQvQkPL=EbDSRBh9g6?3oZ}EZ$c_6=2v9
zzqX0tPrCn_rpr%&Sp;l2e@Kxr8+v3VI!=!vPRQf1;Q<?x13(bV!D*KsMdDheBNk2v
zwqF4p5$a-mGm3Vm0PszAFoQLnwaOG8>@&Ow$u&WU4hJd00r=A4;hau&ut!j2OnakO
zx_hk;Wmb0NM8ollN@AAmbh3nu8KVN`t5(Fx<wn+gm8_6FLG{Qc@gK@E1vyIZ2jmJ*
z)C)IuKClR4>r}?8#9~}lM?(x`_Xznj!sV3ogIgY%Od_U&sgWrCvTDI!MkYx_1}G#F
z=!Fa8SP%yIQu0=~r4HAubH@xXJ4=EdUnRJ@b9(ULjT;vuEaeAzd~$KAJe&&R{h%l6
zH+)yfa7HRRXaeHEbZ~2chumJk+Q2p#>i+39Zo`gZ8)hBEHe{29S0x%anIIAudx#2$
z?%1C&2;)eGgFE8!jq^}X2{V8fk9jJ<XA})lsK}Uh0m`JF3Jx!yT#P?=q5{cO*eJi1
z)N7z7m_!i)7c`F=Aha5KjQL)S9Og{WLX8BRyg?4({-}IkRaL6KN}(?^hR&KYHoM_r
zYU-9#&_8OGRj3dskl_tq8K+d!nh8Wgy)rM`f8%tHlEW5i#0c5ta>=7c8HI$^7Xt0|
zhgIP2ZXP&R$J7#qbsIQIBA=7(R`eY^6>yY0(nTbe$j}XjaRlb#&uJ0L>4iz`g~=c?
zg4-O&f2KRZK!D!TQoS~k(RM{htlEeX>^t9$m=GN9%E9^^Rl`v=riww~jT^sO7vm^5
z#ha6{QYD9D#l<vL{TGjGqN_TGb(T#hgf8r7g@j>5bvaPV1*<s5v8Fq^rl-4-IkW7D
zsX-+ZVo;e%7>s~8?Udso*aZ+1GCr<?pBb=(_D-~0VJ$kF_f^J2<H+{PFO$91T<ruV
z49~jJQ4;qI93v7L3j-WI@y6j^UNFs=@UTSx2k!m=CjbC%I8n$)W1D?KSoOEJ>n?a6
zV>=n+B;0?Uy|N7!3o{;^!!<}$lkt>PqNEmR{1tYJK*W#MjV?48dEj#zDdC2au#XkN
z{)q|=nei3hIMW%-roj`7ctW%bm}0;v)CZ&<kLab~wz?wZ31n!VayH$7?88r%+D;;V
z)1L!As-~*SJsN6DQKbTG8PN<cIisjiFhdER&zYc!$Abq+6i^H?bcCIT3R+OO;9zB*
z&^$foHkz1q;$*sL=BzV$vMD))U5ha-(p70EIU-bz<~~NjhTbNWI$Q@1xu{X>HCh`G
z&ON5bHGxV*@{V!tGqn$6W8$1iq>2QU2M*02Q#81!3{7TC-_*e3Di_6om68RVkz7w8
zUa;2N(M|;^z{vRMlsSkD?gwDaN}xP>hEb3~M;*FzVB7@zN0voyMNSA+uV6=Vh|7(p
zTw2`tX{<(q-AlKjfb|hhb+#`V!||}Cl`*^Q1Y{$+-HUgYk)IG&GPtmUi>jYt;-pfz
z(h3_srl4hnZnYF~Va5cwDEKEZ5zhzaJg*u8iNMcc8q>uo%%xLSf`l6;FMv}MZ-}QL
zX3G#k{C?Gdzhnm)6+*C`cI^Z0((&NKa9<AHi^)G2Y50LPL4po$d`=~HbZ}v8UdMwH
zJ75Xy7|4a!v9g^_f?Y-llrTpfbk7hE!g=Tk=r@aW4)WQEhg7@~ih-ysTtqlRZI1YW
za|IM_ND>~py)l>{Bcf<{0{hX*&N#V*=`3m27ENO9a&YF^wgLl2d)Be`^Z<V~JB=9B
zhI0(hb7=MllNB$-h+7_vB*EJf=M}yX@qi#2B0<Zq02P6cHj%$Wi-D=waE-#n%jjKD
zJZMOM*%<IPVgHsDmJBX+kz5OGna2t8!y9HM;?aa>o5(k(V?3dIo;h2X3}~Syb*qLx
z0C(X1$S>(zQdmYENEYiYVxY0SDF%Etzii{Mrn=;8RDkdEJ8RRCJD5#Be9?7*46Y1t
zmnUH)#U)no3KegU#JjYrtcIG77CJw`_Dxyma_G2Xj}nd$YzC;I(xX)prd9=rK$SxE
z4Tmy#>b(i6*h)fiM$35ca|JIh&JpAK8dn2-`2-xVmDr7KQ;tM$Ruo}z=nPMI$;_bL
zoh@pS?5KhyjS-<l;sqb9Rw^GhxWk7n&b`!NZVJvmo6iJ4p5VIC1A!f6<Hsp>XCc}0
zlMDh;P<&z|jD_O?W6Na#<hD?>aJz@~zPD-3#D%CD5t=>XjRP;_o%O<M#b9$nw~!N~
zoLVz0bVK!wBkmU~#I?h#L6`@&ftaiip<77u{KV6rRXC=wq@=iHP+@6le&0gu%b5Iu
zg(YPsjTvPXjHeI+6_23>f7@^fqXl@fMa~XEXR_{T3bY>W?hI{akIwGM*AGd*0%jMO
z8W|2~JJ5Y$c$}6l2azg-o;n6uxK8P8+h7xh01Z^6`bik9P-ueb@(!+@STm+08k+*u
z8V+^M#ALBg9v`|80g=<h8E=xRVl-;!_?0RXMC_E-TeinYal?-k2n-*=Ze%xVQp1*N
z0&%Sp>rj+&_S)zni|Aqh3}cMZ6b_U76y}!=Eh)@lQxXnU2g7mA)HKD~2f`X!tQ}xK
zvBx9C#_c9eh4dV8xl3xGVK`&+L>h>=n-!)Gru-|qp$*&WUCcGs!oj^oX{0B(`vS>c
zY!`^PhC4eB@}DD5!rR8EKLh+WyWs^Pev~JRdiGN@L*b2v$aE>DrO~it%r54t&UN#z
zVW#>)F7})X$3-GQzFY?bhghdLW2V%CLp)Enh*NM|KzpC^*)ra%#?T@o#4vz9L{-t5
zARq~C({mxpoPN-En0{NqG#Kt7g@QjE2^sN7H-l}H?GrC-=+02_sV0%b=mPF;O>FO2
z7%XIUZ1QATTEw>t`v;7aF*wa)SmSGvQV4==74-mxn=A{))-uF6_{K=iZYVQCkVcV5
zuy%gPhvQ!1DuCeu$ZgPB1GJZNCZ5MI@(C0nd<$Lr`0>I$=#vC5lc>jJhzwo!Hi-Xh
zU41Yv%*dXF7j7Eq9%$kLwFOI&W&kcDdXi%3Hmb`Y&eQhED4^2Oc!XxC0sxay_^6p-
zWV<>M!`MGrnixhw@!*2OA!Rv?e;HDgo#wJE*}TRCl|aDDlx>9Zfpq~rB_pW7ysKK!
z8WzF5DP)td2Z?gQe-2$n;1*f0uaXI?dcuzoUaL9Hq8(OL6^@RRF(i@hxhp*r#055D
zi9&h4!w_|p0^1C6UzQ6eQaTdaX6S4HH{zy_aQ9DaN?1B5>cph*r{Fvm&NgX;GBGkr
z&SjGkaiWQCa`JxCjU>8CY-~wGkY)sEvK{dYhxFvy^yop{nLw>X$Bwp4y@npN#Z)2m
zNw;tbIn!7o)*d@@Nw5VmOXKzv%*$PaZ5tT3p#j4?4&jNGZg~kzjij^+Gl!K?=$^k;
zOL27y84FJge$ijcrs#+QiL29oZVEL_;sm9mFvcSkKr-wAb{#2JfRF-`YXzCD&@Ct6
zPk1p=#o?v}R)wkuuP{+5tQ+ct#;y<6s&nDlt!Jj-`fiOE4@|<wN)s+1$k078!hTAO
z*>!TUAJrLhXw_<&;%u7Yj{7;qy3tGbNug^h4Z~4!g7}F^ep<Lmxp|#iJV{>?=1V17
zj=Tw-_jJ(?-40+%DL{+c3z%$1JjSkX`4lEv%kI=264BO$-b2KGQoM+^5`%QHgsx{o
zAg`WHo-Z(n7I@GczU6S!a_p}jVRRk{4Wt+dRZ@HbxX9qPdZzx_NsO|ScLrGGYSPEy
zYE=h#P2^G$HBw9G-J<jREA-MzWPtZ3MnCbUxKhnoI(0(uGryT>$3(X9vq{NCY69Bi
zx+=0@!;ORAZ2xb#aUArY)&E0d8h{eZ$aZD1?}x1o4D#vJsYd)C_Lu1Y(W#5uCU-h)
zJ*egHf8770mi4Eb{KL>jUGd-U&WZTHow^+H|M`3V+HeNl1`f+oTz>SJM)Aht%OSOq
zB%^dOnXs@J955RDxo~({E>n_9iwg!6mW??t7s*H(R5YlNeR1O#{#$8rE|Hq6t%JRl
z&i)Z^rOWgND-u+Licx^-NtcEWE*cKM#zX2v{;RoT<Q0j*7u=*E#5>l*fkX3)1{dUJ
z6lKP>XeOFVGI?Pj|4vy_o4SgCf0WT$0ZNA8HfK2hvv$ZBp6k<pjdn7>RThrG35DK`
z)L&EJa2vTq36QG^d%056UBp=_)vxHmcCo0Uu%=Am31dq8<(CxZnmUdi4$$pP@D?!_
z9az-MT#!wYUaZZ2SLwEvt+7rvWujc~{IdL9Uqt_2IJ~d`z9-Bnikkd3Zyc&TF-%O!
zem48tu<^GkD9Ekw`J^_z3;X2aRRpJ`-i5t}_LVbwBfa#?FC9}lbnuvgg@f4}eFo<D
zEzOnNI%u)e<&2`X4qCHx_LSAc9z_&CYFTo|FtFKX6lcpB<)JWG7lN=%1A9|78QwS;
z1mp}rNTT>Ee%Uw%g3aO)D4NTpMG&h7<rfr}4rhHEGO+l3fIJyfmS57huq@Z^&T@6I
zcavc#2R0W2A!1PCvygfcq(c~SMD<DfP>baZa+=Y9fL3L5j|)lqs*#8M|7Lhc{w#mB
zoc~O(IXp7pfy;lLIzaxPBl6#0|5wNQ`$Gh5a7b;`A^&ym*dY=Brwb#2Bl6$h@z=d|
z@8W{8^M@45{mKRnl!pxMHL$2awr6B!4(m{mnc2InH~rAjmF3RNEF5f?(ROAx0bx{i
zKpc#+l1!kKj+q1n=kmw=_B^ROJj;{Vzlz7tzJd)J1;$)E6VUKd7CaW|ej*gZY;+`s
z=E%JVmkJ|+-TLY{rMfB{^=sDmoQ4eRgqNN2U?m2&VfKS?_bD~%i>a}Il9#%@?wRzf
z)Ey382r`6pv(*7bt5lSjU9OBO<+*m<+T`+StS?|N&9%cdOD240FK5!IrS9IazZ(8+
zosl8KGj@!heJFo&Mg~;pS0~86fJf7EsZyA4_@56fEbxI$bQ~neG`Wz!HH?!G&FdcX
zlUGqLf33TRk1rYR1YS{tfb8dwRpz?0&tanh7exH%MQ@DUELNL&A?+Zp=Gt}k;);Z@
zo=i_3n`S@!FPge1U_*s(v2Y}hFQvsmC8D4N1e0X0j}q9i4-q~^UJpFh#}*C}2#`Gw
zK0<Hgvx2JMAC7fPQL2r=`?2SVPc^(^7Up>a=0`QYMV_6Ow~R+Myk!s|y`q1|@@x(w
zFcCU6AZ=taq7kIX*!!W;p+Sn3*|O@-WfkVJZNvyao3+p8K2I79mpxGhVLB0GQnz7p
zt9W-Mn8#+PdnWtWa;ryRmL`Z039ErPNp$KW;^w$P=xs$KX4?&}vN1I^qp4V)c+W5A
z%9FZ#*({tD@@kQ8^nXk^nJaf!^L%g>ulh3JN%u@O&zV$~(W6JB!uT-*uDeqgRU=eR
zjbwQIe%1q{FqWMRBpS<;yJwnu%cqQzXmgkf7y&j$<)IQ`VpoEZShY)xx;5gl$KVPG
z$8?A*D)tT5#n#qTHCtQ0mq9@2?#(m(=16BF$`gGOm6(`)o>XG;N!LyAcyonqiLI^s
zQGpekyEV$@!N$UeJl2{9YgC;yR^ulJjFc}f`=RcE7mybdx1<*hk@?GDNY}^jN~|K{
ziGqKr64iiB#`5xci%1SY3Fwp&GS?>yS8771Nvx4}ULFFM>RuQkQb5eLOcx5|!i^il
zv_^c_q5Ca%%46!3lSdr04Tmx9vN@OlJ)kW6T#qSWg(av}7W*6kLD}#C1_du;;QrA`
z+dZ+@Z2qAeAvJ(qz@^Z8fr0hb>q}O(m6X_iJ!m4TgOt=r3L;V?he$rgVle74*8cA!
zA6ehXDM*H5P0V$cBbXp;?j(AV4w_zME4@gEKrV7Ba*=d$F;h!<I2=3dA{<qkB*Gm&
z@#Wtmx^T$_{?mf2`8;VLxF+k)q-=qDt4c+f3HX&BFI@5Cky=(6m-8c0IXg?v%F4;^
zl#|s(F6>>#zGro2Rr0D5r6M5^Ws;EIJ(E<H|KFO~-}6_8{$C!8{MGt@c6O)EU6S<w
z4oB{P{+7SLSpSy~$pFx&Y{<bI0NBe1Y5*{`_YXG!9MS)e=>La7|7Yy|@aq4p!aTN%
z%=$lUD%sHo?t;pqo{+|RC<D$7hMK0!gzK%xp2~!Tg|VZ0X+p8_G710`NDxdl7ed&f
zB+1$&Sr+f1BOb&EF2``k$}nLT2v;LkE3ySjW}*kn>V9d2;gt|#2sc=Swj7pHZ4IC1
zf{06>5@SoJ_~V(E_(3+wjF$W0zpSpEy1HT$8OJH<Qy{Z1ur`K}o+tHV8%QSLQ^Pib
zp;{t#f_GoI&j!iI6RsgS_yhqk6CPk?P1Tu^r@^_LE};P#uZm3uz9E@rVyKRe#R_m>
zR{duuI!sekfa1~AK(#>fVK1mr2_o-})*(KgqBqdi6RIX#kKT6^N-CG=*(ynbBwPg1
z4E7MG4h@>PN+xxV{jV$x5p@v%<yAsTxf&BDBuGbtj`$ENT@eoRyf$cr;0O~*YYezJ
zI9fdBs?>36W*<y0r<I1|Q8ujnkiV2262R~WmJQBwXS2hH3dkCjAU{<ogBuf^;T4z<
z@Rl|8TZWF4)l0YhBvZE&T-0?_R|JBikiT(v!#qfa1^h`9Gbv&Z(2YG*ZE|>3V<L!M
z6KTF;V7B599d^#K*;9Kuv=|j8s-YzVHF?m`(lW6<4sv(6yL325-yITsgBfy?^-I;j
z_g-dg5tk5tm?6XBC#Nv^p_VI+D91jG8gW)2)(zJ0tcqB-5jpS;Vjw|$fG4ARj)F(P
zR7?dJG2)LSGO2v5lD>9V^WcyNBVMlOVs#WQjg-QKSC*J9h6io%z8kDcU{NSB9<Yru
zIp#15uL7>~5bRhkSy$8;eLR4YN*<ETko?lpVZ|lAv2!_kJw}|77{AN(PH{<DLU}x9
z^^8murB1zL|Axqcw3|^wS<#@v;-R7vHXfos08jw8d;x`1lv!+ITBi3Qzi*8_hV^4*
zGhv*@*#*gk4~H0)!qS;1LH%UeL_1A98W1)b)HRKtC+W}3=3g|QpaGbuHnou$cmkDT
zoWq@sJfa56GY>L=vf(I{LHD4#n;3ziEs4cOC6^OakytiGQ4wpuKeYlCVL1wzsHq%A
z8|+7YfFo?4u}C}^L2%)kUf|~vz9Nn!V_0knC)a6r6Osm7Y~sbbISHVtnOrIpNB~L?
zT&6&t2tOkVik>Cb10e)Cz<7lisp(q_LrCyQ29Ae`%eb|Q6$c}@B#hwDjtM&^h*7+N
zkBJ9tARMCu7QN8<rbQq~Wnv_NS1J-u&{m77u!t<YI^A)LZ|Zqab;KB}y-i{*QYsOq
zawuTKA={u5VB?0WV4HB8F?=QZ$FGR>8B*v-27@8*2(`?uh_D6dfg`z0%rlOiYY<hg
z_(3R6ci}tzM3ac92rH&U;ZBLzZ-~-;QPEP-9mo%cqi54f3rsV7D8d5LFIu~h3*d=|
zzJAbQl_PPR@{mAGB6TZ2VJal+R8)wUDS-#^2@b{rmQv`49=wBNM~adtej30R^nfM-
zF0CJBT<*{h9B3KFYg$9WM>sPd3hW0tD~5RpCL<0O3G!zEqN9(?alMK8qts~U5>SqQ
z67<wR!31Ly_HKGlIA7u|m+`|=a4T#wrb}2fpQh#{Y>w?Y8jYQ>q9Jd9K#Ip*V>HJN
z1)?ovbri{1+nH${Vz%3;k3<W-K3xF{LOhpT0Ps(MOwA*Uu(v986^H=8d+58h4IN(A
zO7Q%cHQFaOitQgB!q%Cy!70Qd03lGAt$w>}>_hA%tIRqKRQHkT<K#myncic)0TVGG
z<LBea56L=t>wN(@RYhb$VpVy-bx|LA%tyA*He3j1-)WZgul(wON%U0$E*NMn9unE5
zWGV~uPQCG?xQ|jy(q$YZpopWIgbA)<##tglZp>I-a6}lVhUs)LFo5+FBJuLWP4{XE
z_aunVASGYVr?@F0O(Fr)h>lFJ2qwiJ&1zYViVATUrg#W7y>3+mUL6>&fN`UEW7pY&
zo$z~*lI$R)#S~vf)Kl(?#C;i2HSF?6?M})U>_<cb^il=ul#8)TSH(qkB1qkxTee5y
z=*W!WR21#zlFFSj$P`=%b=XPSNZnp0uOQQCq#K$FRf|$p^ZWoDlpaF9Kbjhq2*g5c
zub9f<1N~<v(Wa<?J>~Ojf=k4+$+#aj<|aT9x;oX!p@0^1#3?MFngQu=(qz*E=r(J`
zh2V^$Y{X^Aly<1Z&L49L8M}^OT$CF+W^N;DU5yC+#tAse0SFOwIviqKlfBGdz|8OZ
z^n*$P5e<jQ9G0k3u&Q;PfqfP#g;Q+dRJsK#cSyPg9rQ=Ei+_oB!It~*X&3Pb=@z=t
zgrFl3ijD(TvJ)g(laLNnli;bI<s>J8{nRCrM}63I38epjk~U#<=r7eLz}Ez~zM)cZ
zQ?gan<l;|+^a~eF%n{w<kaP<TqK|9PEFgINh-Pt^Nc@OuaR91CFF;;PlI-08=4n<r
zfDP6m?MtbpeYkFc{PPI9<WU3hsL74-FBSY*$Jw?`lKOd5AXSpMPq1-1i?C~IV1mca
z^H2e*1IH?r?UcBar$g15CDdWBg8VvqB~Ch2<4laTn-v0(?}S2tz01MIdM5OXr`cwG
zAeV}oE8jmY;lL-e4mIH~nQKo3^X2GAMi6|RY2pVK_q98bg9;roBg0}CrOQYh6@Q^1
ze_#f@mN5O3*o<-^Ik|^0-CSxFBLe7glYlBZEXlG-D}kQlGhK|y<$Y$)bYYt-D)`j}
z-E=S=5U}+frtUgrd(@tujy~YDu>WSi!hfe*#34Huy3hGP;9OXT|DV3lhtftJ`CmGB
z>6jG%=k9zY|L@=O_m7MJD<hvS?xxm{(H|tIJaG5F8a@A<auEUtDXDz`_s7pn{)c-9
z9&rym;vRT7+yg<oQx7ph(Bd9Q73K{i=N@Cb_CSY0@|-b<kh=!fN^h(*4#vnEAYce3
z?m~pnbzz=f6Rc?fPOIgxnhQAaGL+*65=~B`pt6D?5=ekUdk-PK8Gj9Us+oeyMOyUU
zA-GIoq^DXvehYxM)lSD<_;}(|9(Dp*oP>slRrnQ8z=*05tjlHbb`uFCL{oagY>UsI
z7Uo`6G_#1ttplKAMpABEBtrw-5#jt9ScqUY<oQWW9c2;{*nEs;CCbzj0Ejj<rn13a
zWO(+O0a(=#HADmOD@Mm5N3i0@dB?;QRSLjn8;Kdr2|+P!r;({aHYO%N7#4`5d}jFS
zI1~LS1Jztt7xRS$^qr&yc^pJu=^*fK_2fwop{K}7MvzUAmhO~|7l2ghg??q?g<->n
zaW}|x89Qzi7hx9UI}7A2Imj-DEfCBku@!iL{;=shN38BANfu&F_Zww&$tJ6s09tuU
z1!3wnkQhl3OQ1{vWCLl00RYi(#e@JWM%5}|9b#@u6?1}%T(g#WLj)%r7@#-d$Q;~p
zm9e3)A2X3Sjq-3UgvE!J3?v@q(9@n^8cl?IWxH8ZF+PmvdG?2SiusU|j>FU|By9|<
zG}(?E<z!!Sl24}7;-(44AH+GQea!vya3%p}vN~z&>De#MTZKG~b+FrHtCxw3WdhhF
zrd;QIT4J3Gij;I5DV97(Ig+pWR3lm*R8%Gs-f$;o#yH5z3|qe3l7*C~W%n4VK;c&o
zri)mu5E1CrS%GXYWwYaQf#|k;7L1@9s6rhxKp!$IP%b$id|IF!Sf0>u;CGQul^+Ke
z?Hsv#{(d`-+Vf0x8?j<Mo}F)!Lpidn@$9_9yx#h$p5mY~@I0B`B%rPnFl0qdt%0k;
z!U#}VJ<gHUN0&;FXA#!k^uSFg4e&?yCz*JpDLpb39zMiLm{9bJo|+C(JQ<No=nEc0
z&}4(LA}<7}EF%kfYAWaZ!Q_{O$<)#MfjnHdxte()nR(efR46WXd}WI4$A;3GX$avG
z{}t2H6WPaLGWy`_veZk_@TjKCA=du_F<sV<h^!_;0YHB$Q%XLG!@q0#u_6##o#ZMG
zR-$&A$Ze0gAv_x6o-p&UcYKU2ql#s!dV4}@AS{=~17s9uM+3G29E>efhipB)gh;t5
z6c$QN2aAJH<0k5X2{ne#nLH)Mu#%94_trJ-q8~8tz4&MJy_S#z)Y!ghusrcGbcIZQ
zltDC$C{J)_yfQL2i$@+GSAFB87%YjtVRa~g3{L>=={!+iCA^1sE0}K$ldbTx0B$fP
zlOF=(;GSwU-TQJz>Li60Y~+R^l+fUJk;sbQ>4njBDv8TT1F#QxGnEk;E5zGF^2_?^
zzewU~f$<nC4UZ#RxEe5kvVHMr6hsTX+c~v4$CyVl61>l`7oz{UJuSamJ6_AX*w5S^
zE`K0UODSFmsxmwM_o1!riJ50!94s*bo}Vb?!2~jX!;cq~6qvRn@u`VXvNIPXl{Qg>
zs&Bgp=DFcaMHhgb9KIeWi%AgvaLT*H{hV3Ce&p2a%9ds0Xmb>#%kHjS@m%XDmyvUi
zQywz3AfrSLOZYl$HN$`|Z0zvVP6aR{n*)VHD8$&u{)9*XBsP;4Q7SVrN_)DLk%86X
zrr}q;VVblm#Y;0*0S@>8xXu&tF^Ph0@_=PMYuLYTvpf)Lhd}^R4co&d_s1OJv_%a-
z57@+#d4HOAP=RF&C2uTbACgHV@#6iGznW*2JFvAqXv$AbCN4Lp6L(Ei(izhxFlPDx
zmr4#3kwE%~kWMCk;LS|eszygcyfgL?w@VcLlk6PHW)95&At$&O-0!R($N*J9s=p(`
z@t8zu;$@RQiB*`7b#@?{VLX_OGwyI&EU3b~(um?yp>z1vBm|aGR%D29(T_MLGO$@D
zx<{n)h!VzBERdI0i&s>zl{FOnN+rOiU*aI<j3K&A;ci9LqAv9FJKz{-A=W<0OeSWB
zVs8&q{p4P8c2sK`2o+%z8mSQ(@<*E|4>fw8%NpYQ*h-9#lL`o15V<a^BFOrINp%B?
z2Z1+W&C%ka#p31V{748Z8ZZkD7A+ouL$9Py0TYfA`ias7Yq!7?4TLrJ52M{sn7Rs-
zh1Gl23bfORqf_GM9gs(u=%-e|iLQji&)kwjCKxVffG{qXC}7=!94>=YMyo^M;L(i?
zFe#XR07nxGhg&mQ0sF|hhZG+Ow6@@Wfc;8?={j8G#p*(97$cd%N|lAKR7`(!A#hhV
zAMuKea&=;6JOa6B!Qc#;z+B1kUqi8gKL=G1V(M1T9qoiXwwp}li+G;59P*$t@gCi&
z34On!VK4NAQCQFu07DB~CX4}e<oly4JN`>m#!G^p^lpjun*5k+XhOF|fJp@$nbF^*
zfGqnNU^dS&+nX{cW-xx30iDQ*M+0a`P{=RGE^+I*W0)EUsGgu)#w4zBN;J7!H4axF
zDHAx=0QVf>dlkKV7>A4iM`FWfOX1GS$^borX<Uk)8bxwg_MvFK4>;@9)N~bIvkQL;
zNKAq^*nB`t(EvYNkw}isd!IlUC%zYC4v!`@!LuEq2NmFC`=|{_+yki=(4&Mxqd`;i
zMKPNWwZZlmV+G*|TEQHHJTX?HN*<y_ed+{HAYBj+Z-`vLQQv|Agu)Q7$dd`PBL-*@
z_9pZh`8WEuvQtV<m?4w%3T!kO{vk2(#Er%(%qwP<o=2*>nT3OS0`f*pP$ANg>+*ns
zM8}eer3kJmlwh+K+}$JXckF8oM>gxDJx_vcOBf<9=LaC85v>u^_>8W>No>j%Y=lpv
zj#~{L3W}5}kqv;faf3JVb4y|yM*JEh$A2u+(ZBGH<#4$gWOw+hTn*~F|BoF80H8YX
ze>!J(=$Lr_pY6^*a{vE#{QcwZ|4mo%aCLHk_&@N9>B@iDuwhQQS2SFuLE2y4B|ygj
zl2bSUm|Oja-}4{2=Klv@^B>G%^8e?W9}N?SbiyYHTTmgt_%v{Ua9=t4RYN}FGRU=T
zzyTR(K-`Ty0SyRb@rjhzQ8EKT$^sGyEE*YJ+UIm{#vN1zPLM8h6JSRYQV>t^o<LP}
z!OH4_+f*(N;xJ_W(p7e-F2&_U3o_GTK#)?!?SGXpUePEJ+0xX}1O%IO3Y16yAChGQ
ze+ZKnhDGW^_6L2*ggk7RxRV3vIu8bhCA+h`vjM{b-x5)Z%J9M*abzf$i8)=d*@c2;
z$a<d)(bj4?Qe{j+Qv(4Vc-dLu;h_tCgo&3ci;@Uj68Yk|wuF~6q`UCj?86gLfY~DH
zMuL<-Mpp=pB(RUjSnB1u$+?l=q(+%9pG-5C3e-oZ#Dhik!8twvSRbqH(P1$@rU3Q{
z#?dq4F97zD4h`4``#FO5;;=&d$YK^!fcb#)0za=w`HCtLxXDJcM09FQIFF~Sc?_ws
ziL8gQrEZbB9*P*}GGUmDGN~ZUF$gZhonb(kizgV-lR9*hiex9flwJ2r9g<$^P}@r`
zm#c<~LP-^cjEc-K=_$|j<dy0Jb<n1w8&U{yhs5t8O~sU24!A+rz#=IWFyqc5>QCpX
zo&%;Zcq6;8O#A@rEH@g0*hgxYhfhJn0i_&nMTDl8gtQXEJ_FEuj+{hZYKUhDr%*{0
zsPJ@PdoUa&j}IsY_7-5fY&L@IU^K{*Takj~<)M>QlIuz;gsKAvq%tw1nh>e#LYFdP
z*fe2a!uLvwho7JLVl+Ily3RKb2O3p=-@?I(-NwKXCS-<y#d6F#4Ew`SM~e;1Y~nje
z@v4Ska$YIp2{DQk=MO|wxje!tgQ_vg5>=j1ICW?_fdbSO^j#xtRf-5{$_c(d!Pf?d
zV@2sp2GVVf(b~xo?mWa+%^Q`f+XoumO|-TjT^Dv)D(el0AyxNZ95XIRYk$MV4Ztah
z5T*=kGf;fr!ZJ%R^pN6G{(!F_-s5XLtF{Erm^dX`3OFjZqex^0xrEq*rH&L%D*Gp}
zCCY32gJ4BS^r>RcE%tY7{JFqVQDc&E3C%boTGXQfe)nC(p)ue{aDs&B!2+=NNYP+*
z=_sBabG_!kb{?WlbH=MkoPEh8JsRy7!$DA`V&gH>tXmh9UX{$R?oYIS!o0zK6pv)J
zgy*B@7$Y;t2Of%vczig<q{I&E$TSII?}sTQ*a9FX*NLaaEk|&C=ffo}TsNACL+>;{
z5W|eYN15u))B<lcPcaHtG6-y7x)37CfG?NWqjdbj%vwXzEqM)0#FBt~z~+L^FS!>w
zpygXDDfO|lp2;>4P;R)(x3M;5&jXnQW-1+UZ~^8@Wr~f=r-gEuGm<X10<l4_-~nSx
z7!>Ty<31W@uVHYj^D+5JOPphhga`hhhe#WgCJ+FmS`h$<{!PK_$WO$?(ys}T{fzSM
zTo^!Yi_R52T)SHLU}oLH+Qi8t0{C@rI^K+_G83vq&R-4R5Vqhph#>=a!F56@P(pSE
z&&X>Bys6A@GU7E;r=4zt>1s8ggeo|&gIyBUbGsyxF@}UEvno$42APNS>4Fl_1IFU$
z?$%cs4~-LdvWzanuuSN=u2c!jjIg$(Cr9FAS|fgzo2UNo1Q7^=GX{~bEFCaZfXhH~
z01?7Oy>Rd%#v{oV1~36eLYNyO*?wZRX$FLt!Rsp}8J%y>a!){0^bJZh09Fj{n4^yn
zy*hvog@Nz*5GL7B1Uh87VbMEeWsAP)vW>XiHg)LV283WjJ>xJ1HRXp%W_bzuVWfm~
zLN&v;;jwPUZevPXg!P;)3g0y*!NA;zr7Tm=VsQ<vOHRu#x@AC|u8FS%)R2-Oq$Lhl
z1S*)#t4=VwDv_8;7~sGWsORe5DeyC)FUfA%A$WmQ5mxm5VmVRLlY}<0I)xL^mMhko
z(;qC9mdFefVF5VzBCizL0sjME1WGzY&Z5Fw6ar2FAxVoP=^L<S0@?x>#o;mB<Y-a^
zC;=kxfwKd)Kv|7o%gDgy*eA3PGJ+3a)+4AO9jwq{8IvM2B8k$WD;fCbP@9=}2<4m)
zj3+zdi%I<3uW$*l51`!0loSr;f}{jJLPnS*$R-{GY<AWSrkjA^?gWT51lR|w@_{%o
z)NVCS5-u&OOFuAOcnEKUod&|?-Z*m;LHYN?D2nf)jg!m}-0G=@%{EUptV3SZZVufK
zSPTQ&Nk_s+HD7jt;)|k|X7+1_S`fto*|EKL&k+3@o+?B~QIPnd`IsL)B~8YLNpwd`
zs{A4NqZqAnh>~P1J^^q+y#PRqT4u+L!a>Xmt<@%B6hT&4chm`tk7t4zY$A1l5jt`K
zuj2DSKvJR<t??L2m*i!;$0-AHoq0+e=4mivu%u`U+^c1;&KGc3i|vf;Af^NY=r`yE
zQxaLmLSRj#=sqW6#Z(%MrACQgz)<@1vbYI|y>?^=u_HmyFCkj=6A|jumukKNOvVMK
zZ@YPd+3eaytL2s%#T^8y9Qbh}XHzCJrs9$~wqokp)LS91bQxn_*r7=gAWEun*(tG{
zV4Zf;?L#Vdkq=={+}a5sL>w>6uw5jDG#(7UsGT9eYbE^l$)d3l1$cDz$%zAnXXbEC
zmCYinVW_4cbGHO8@LMH4l2O&b2NtX3u@DuWcm-YZ0Ey$ehvjkL-bu{zBK>Mo^a8EE
z{s|E61*?~0JIDZ#qZ{Vz{R;DYBZ^Hj%SeG{%H#0ZUKb1QW{tqV*;zdFr;^`&a(TfL
znIV*|9NHzhtS{_?Ec?kOW-p7gX>p&!gxd&I=w|=R>6o39?UwrvDkFR$ak~q}^CKR1
zT4uUk9bAlEJ0KW1U6vgsY&-Vz#4<4wE?vAf!p_JcmLaV2_EAv7Fi^L%IvEXSb<T0S
zbF#C{4UVu|l_q@E-Kle@Y;yr_iKcpefv~0|zh71zQK$gAh#<>>GLw@x0x0YV9?EtM
z(^lxVU>JonQSh-x21AjMew;~XCuq8d$D>vUY{Hg6oFoTjw5kKTCcopB&|Qd|AbEfZ
z>ZG0!zd2=vF@21A_nH#Vq`E1ANwBg}eL6~kJ>#V%Pnp9g)<`6yMs){XJZFuJ5@LS|
zZ+mczgle2-(G%}Mx%o&U@lFeqnJAI1L&S?Y|D~?3gJh_3OB5Uw)snuo4Tygs-Psw}
zCo6FcoZp@-UC~t%dO7G00eV(l9?H!mK(Gua^qI2&EyrYAk`fvg#wA^XWW?NCg%Acg
z(G10l3M6R*A{4Iwl^8p2zybJRyc4oI8+XYve6xBdm?r|}fsABH-P4Cce&#Y+49$1Q
zr03~@eTf&!{O5Rx?T~17gx~#`2}T&W$u<L*br56<{v&Md*o&H{96~sU!Wj~ahZxI)
z*aSwa`t1}K;$d@HJVD6Cqzd$(py$GH6x=Ex0E1IE2B!)K7~#hf)8~SZ9DoimPn5Vw
z<V|6hX>s|fAo6fQ*XV~>I2;%U*b%6pK`^G2EQRp{)W1LAf1<38YhC*x3|Io@U*S7H
zn+p!Ryy-Lv7`g#J8E7;XMq$dB28*SxE?Lw94!B=}DYTXkRxL(3j3oi>KtPs{M^^I4
zD6_qfb8o!XHgyxl2$M~bEIdFQATXqo7LrASI(iH8gvn<ik@v8=h&1i8%OyJyDZ<;i
zqr+~V6?=L*I~PqS<3G$L{r@~T(4l*-cm6*BlJ|f3uMYqJB!WDcHtN9tb9e60$?E@~
zoz<m7ha>*~f5+cH+5f-D#KeUD0dbxO4hC3OFvJM}Udb^4PN~R5;;AD7iYzSn9~}{J
zBqZRU91`#kJKSpt2{3o;pb1is3COeVAQ5?)5UlN%bvFkHu?9d1u(lE&kwD7<;05&9
zV6rZ*Fb~P(L94>608AM1D0>|>G#)ig*B^$PGzY|klozI_;O^lIqw!OYC>|de?E=*@
z2l<Z*2T4m>S%|hIg<HLdn*+eW8ep~X*h+4q6UD6l;b?r&VsRh$Gvz=eWHX=({S?SP
zu>0uv=CD2-OAJCfGfffSwB)2@xj3eufF&YHZvSdV)p`IvmWI%CsJb0nGQ|@l!=J9R
z8aQQulp)p<^pddV384EJPe3eCR}9=f8Lx<{6dFH*^KrC!#WIN&FejIATQYv-fCNFt
zn86GcC8QZA)J*qYV4LFjchC!PVu@=ULsCOXCcLW(Rm-Rc85Unu3u#P}MyfUTHK2}D
zfK~zoSAsFN2sPjdX;okXFwiP0JLL7&(<rfFu<aa&z+d*9CZRY)$c7w`%USc#`M#+N
zqfeZUx}pM(6{v@>b@(na{E88NhvQdr%bZb8GJ7CnNtZkjfh~L-enV4aQ#-P-mK5|Z
zDlsf2l7M%Cp9Y$La^fX5SW7{Rb;%MK;gIQsAQVCk$-!#Iy(5f900aZ9h3%lC%(xcK
z#QV8Swqr4=7NZ@kvK=C9rtS#zBk_GE&PA14YOwUz1<S!<)|_}H1hyKDh!f`6NQp(b
zVSa?9lG<@hDn|GfQBRQO5@2OU>W#XH+(iNnvA_mzlq_rQPbQk2nr$uSfn+9tL|J~L
zJH4dG{9qQ(3#`vGK^j9qofI$8^<fP)X4djkc`d&o5NAz40(xZ9Z)jLZ>OVX+dT)li
z8BA!IWLinsfpqsyFOh#|m4Qzb39z#Q*{NPk3v=Qz=lCuPkwd>OsF<;`1o(}IjyFyL
zh+rE6u8Ofw3ZyQZphm+XyzQC5&MlB=G~M@$-1o`lgB&+fmB)KbN<);;1^tSwCQLLD
zc@zVBjmF}U9Jyv1G$6}rqegQKlDJ#Y!Ewduuj3=OwtyqT1aS`n$;6rk)APpF09=Zh
zQfeecLh!o@#zRw2E$}ATZo&b{1e?GoBNmo)*f)PQQ%zK#Nvgo>P#vOJfQxc3QIo;W
z%)JRkPh2QieM|!iS|jx;wc0GMI<S>x0TAV?8)01;09lr8f@oRYdL(U<{0a|DXQ;-#
zLc9z(tX~(=jNyx2gS=Mk5|euv(w)A^T*iqxRG^fVa)3Ymv>c{SlNTKK82QH|;&ii+
zH_m55&orS68ZdQi3n?D0S^%IL_@{(-#&(sGw0XIRs5@J8Q+0xSIUpiJEFd`xSdu7l
zN)lIQwea<WhN|Pva!FQpd%78ejI;eQ=M|Qe78MWH0p}6~b_-1u0#Gm?fgY%+Ms<<H
zhZJr0I)sB12W#we+(exDh)n_|gngRV#w7Z1s8*hHc%b|e?;vV`X>%OBlMQ5n;geg*
za~;%;%J%QIg8zGz<ilkE?~wJ6Hh|Y@|4o?KgK497`)`M=Y<IH#x8srgFMrG5|Em30
zN=yq=lj%2g7mk>LkC=h~C(OVm@;@|EL@Thl!~YWrU!Xon86u}l7eZJvDH4P9!ROWt
zAX179AbRQ#%5O|oygG8sNc*2-hV*bV4Zs5F7SI9-tsIt&5T?i+j%HD+hv)G4RMv|L
zs)s`Fy$DAy5|{WqAxXzDFc4!{-)V3A!(g{&#R~{Y9aRWE+vZ4HSV_|=Qnp<%auP5l
z21RLnx=a@bXw26w*ig2#bRauNz+5Qx#<rQZphm!M+6P?sd-D@4%wASvK9_k+rYtPN
zre`=g!chWcJ-%oda@Fc1<s+o!r0@{djT%xi<PRwlV7LJ638Y>T_5{$Zz%&MMZ3N?w
zlkP1reKug}fR##L>;kL>9H(%ZG##d0Q6RH$5d73Ap@~)Xc1fiQ<R&o%I;lR68%+Mb
z3gHPS@?b;3mLf(rkg_nFi%RrRC*v{>#3|n9Gz488rzjDT`hjcI9PR^g`hy;DG15$9
z6W(fiPz;d+DW`Fb;(M@*Ixuhr#F4Q*L&HM+4&8)@vtJz2ovuY0v7uBE;zcpX5r~zH
zLeyErL-rz<lyBaEaGM0T1+pn)F_WMaPf#ZYhZcv-5E{^Qx-3CB7dqy_2R0bMK*8_$
z2}3sHY!U(@PKrAvBX>ogWWNiq&wv1-Wx6r*#*qg7`U3LZ3I=(dKp{sC$J~+(qD>ep
z)fZAK*x9Ti>WJCcmd`I6&_O+hv(J|kZ_5G(MhAx;k%9_9f2mr~CFdh;7dUn74ik6>
zjRK|s2-RCHAUh~VN_V(NU&iF{L&lvc@KE6?z7eg+l($DO%16uNG4Znzqi9J!q`v~p
zJrct==%euh_rR4nHL(@u%T5<cd~vbUU^9V<GiBbQg~n6H2qqIpU_b!}Rfk%RnKN3a
zyX1c1D)>lI3XCz)We#0{rI?Z!UkN@j;;Y_yi8}A(F~&x(fTjs!r&?z0S%FK}pb9KE
zB<X&xY7EPPr42_(=e4ofF_IAd)?;BN9r0LV-iLIjr7p9r9O^_y8^Z8DfL}A!kGFZn
zr8IPCf?VUVL_!m=kq~hmGNqV->VeZTqDF(4k+cSD45Fb)KskuCGQ2&!Ig<4(S-`Ia
ztsBTe62z3VJwgHHV1{D9ahL*Q7xhs?WI;3HcE~*y?$yG9ICpqPPh=EfJW&i!5wU+V
zbpyd0Ojt)izMLXuqEt!~Cl?I?(T3HnaZXD?JOqDKgi8)lS(5%3nuf$LA->~u=;ZNn
zg}iX#DIIL>G~R9DK`oJ^E?EI#FBr}1@sKVV{QqTBHWIYGvL!P2RTB8+dZIhaB|w?^
zTHVhi3#9y5Sfwar_+V^Ry3I^33}c2N^H;=I(~HIg>v>Fi4=&YjQKBXvV~XZt6A{zF
z4UMVBnKuv5dW{jTP=K{M`4LKhi5f+n3K5E5L<TwBnz3(!aK=#h2#Bp<HRqTg$ZxfT
zAReB(K_fN=nE$$Tf_WHxhm0txD-Inn4}&j~$C#sG@t1&AI&=t0@Bv4lDhrk*DCTt6
z#g9}YksaQ{!E{MzJaAf5FPcKk(F>eF{-8->Zc0c*Z_v?)XSYX_fca2dczG1SIC!(@
z)bFj1!HV^UqS!f&H3&*i2yc*Os1vE5y}}kZ$hz$}?_RuVrcFUdr~)EhS*3`l1;79=
zgw$~mK;n<owHTi#frqJYM-MEh#ywleHQp+Vkar6g4p~=qre>V~jG#jC0BaSXFLMkr
zfTDcO0OTmUz+6YYYK*R4C^saqUk#(E?bv~M#1z*Eyo>}FJDvP^(N_@;`^`d1jd}Ut
z`kbv|T-7RxsldvBEe3<fVNLn)a%2Sb2znS(iX#7o)P(FG!T}|Yj7$JvKQPdMp7HlB
zJs5<w=wdaAL{)4JIY@!IVI#<!2mR~7FG;6zEdU8jJd%UvRuO55R-V)@NSlSqE5=Ar
zA<0vYsW>Usr^X(t*gY;Hz);a&f{&haVZ<`6ReWHFCP`HAAyMA3LMfOlN+CUgFOCwz
zy6B^6#0AJJHH?JtB#d6-z&*qV_0e-sS6)b0gm}l2o99HB$AMEq0)B%8M2V+u6BDOV
ztd~A_Q6-3|JEqCAkV$dKx*SQ2h^K5!JvDU-mVoqA<xx4{ofx~ZufVSbq6B60USouy
zXrT4Mjsfvbvd$T4xH4z3oN_JLgFLFp+zx`<65rA#44pN|1kj*IQHhpxWtvhNB#j?#
z%2-ML^fi62U5IDWEJ2kB*_OT;FCC0L?5sijN8UyB1D{OfYc`#jr<kXBNCZD7wyc95
zV?>{sSOB6*vYK#`bWP#Fr3e3|oSjtK5QW7ZkUAs@gdntPnGZ{T4p|67vL>sLQ&Am9
z7CSgfNcmbs0ad|xO?)?R^1q3GQoK|dkAdBfUg2M?1a|=RW+Jyj(uW1$mK9`|Y3U-8
znCadksLq*W1HvT~u5G~QHA)dJD-rOCWKx2JwmApLH@bBeyj?@$q)W1LrGt<Izi^}u
z5Po5l9$;fyG6&PByoV4)T@)VesfC?MF;l0x{R2%YhHx$u*Omq4QoJbRqFxUeSYTEK
z@|&fhAUkALjOldA=ZE7YD^j*l5cG_YLU6qbQKD1mhKUi>94@INMRR<TT0A)bf`c$7
zJti@OVnkKS#>h`wW0IZV&4tOz*ffeJM3g<qqfy;01nO|u+cRM-3%wWgd~H03sUCX@
zdN2Am!*-4fENV64q$0VzfgICjbzp@AaAF|x7yvv~lq@SAk;o0hJ_Ivi@d+j8HP#4{
z4O<dy2O|s-YD~P8k1~%~I)GgQClhqnb!Q<F)BO@B405T1t-wUkbXt*c1V)91MW9SH
z$^#rN(x(Pu0oy%p*&mi<88U~N4q=00cuab=NaZc_1>sb#PY@mMY;LeF14gI{GxD{I
zaXXQ@BX|N+J?#hrN)jA3$KX8<cNVYI43fx8a~vGBGBTxxb%(#t%ZmP}9Ey%-fFcFR
z$&+Q#rqS<C#W>kJh%pkyJC~5rGe%lC=WNOBBSZFd*o4#!<{m`RiVD+4q#o1ZV2lud
zVf}-bYrypeH8t)(%xWsDFmGsYvziLGNRFX^8VrgbG95!j<riL|a4199RQ;luNm(rl
zanVUmrL5MVt>OiiCbUW&#(=A;7LaMuzsxy^adj%<9;Q9SxL0WuQ^D)%r-bS!LUswn
zu4>4Ll~@iIkmseUp<=Hh89K92kadlfw8&UEsQSpAU7sK@V0qAl28sUgVobujE*;Ag
zCRZ=6V^j(rkAN9rVG6U_H{f6}0d#Tr1`mk6LJ4R39AvQ&^@~gsx?!6uz@Uhm?nfLU
zi(X5fiiA6Ewzxwvkz5VHz$g=fB+{*6LNyhWMwkwD!y@Jpsl!+``ef5o20a`=4qW&>
z)tbajL-eZ#cSvEsOz9^ni+u<>#h8*B^~HnaqR(gr!MmV4OoFUr^hntlBbd*@XSo&3
z4-qL^v<K7=xGKzL0bP<|yNDzi*iI&Gmwh#4OC4$vD%UL(K!8MJ<WNZ1W?ti<#%ErH
zKadG?k*^z9n3DPcJ17>`#o<`k=mM#jMurcw1R#@MO=HBBj)f(@8x5L-&Y6sxNChay
z^fQcpWIG7Q$X28HB>~yQ=><pwO|B->FJcVAHUw8_#gvMK{oqyouvG%plE&&|;~$i$
z2<T(4Rk*imJBjbW(Pn-Rz8g0OTs0R8jt);HCWc@A1<;hll}sT#!F=&~5(xCj=FoVo
zp<_VQBQ#ST0nZVujB7kMp{xbKP7j;{P`xDGIBeZcC`ww<CS~hAHfX&_!cY~Z2=D+(
zS_SB|ph!4jmL$vN2*3YCJ*)<@*Alc6ErnJh3>Kha@v9b(#Cpcq2XJ)YfFZ~lP|NDp
zLfK}$;(%6`wuF(JkT0@+=UVGFOQCZn5DIP}Ji#R0C75#JAQ|vE7gv~xHl6*WYl(P0
zo+N^Zbh?CeG!=Ls#15NsJs&!>D{Qg4k3@&8Gc7zF-M;;CBM);bW(hap!k8puk`#k=
z3JN2^j57_qezV-a;awA-kd(w_(Ui3mnzGEV_Rxey%#vF=1@07+S@k&q7HUEw$6Ik>
zfRwB_vt*!_xteI`iL%ZD1#iagQ}7D5M25_uO7VH<9|3bp^%<&+sD{xE<sud4Ke#_b
zKF_5R-TWb&?NDfUfEkx{ON_<xq|f6184glR|Nfb*QZCzmn-9z{)oP}wframv!Ae*V
z<ho1<Ovu1XS|PR9YDM6uG#L`O9?l`WQbYLQ+Vduyq&SL$f`TqV1*r%l4p%a0Z|!<F
zx4Pl3<_ZkAN6_hGM(zV|1-6?dvqsIeT)VE4GL_lg;b1j-el2KRv9eaxh@f~~xlU5o
z;i?jDG9B<{y45-Wf!09oTz{fEKr2eDggtYli+;dB^<{-xC0>}7%AupgVP`A?9j@4z
zg~m@6SXPd&k%4N;#sUD?k{WhZMb((%FjcMVo$2YdX?25ue;iJ&4sMY1xSz1__cO&F
z<r~5_Sf(bR8x0TbGJDUNT#`lJISH>_gWM}Igw`72duVawL*JK}ajPXM6X3qw@3got
zn&Y@}EAuRTz*59-<>IG4{1?l;HU?PY&)~L5xZ4W42SE&-5w(r_gYerE0AA=m07nC|
zSe}82&j*+BMLSl{RKqcqqvKk+&5?MQe^I>45x}Q^(_bC&KNJ>zhzX$U$p73aMgC`Z
zmm~R~|CYaha{LcZ>2*K}piMzPJpYGNrVJqLUo|w&DGiASBL@7F$Q6yTE{V}U)B!r(
zjzs(%iTL>+i1?wb2Zuz7)?Cn7p~$(TXM;wa4?TL|=Y&+ai6}y<U-4)<1du-!i0}cV
z|B+Z<vfSA^f8cqBcmM&EA>p&k$kjlatbsy=-7>s7T{6FfBvc_IM-ad8^D7GYKqDTq
z#gkaF#_H%!peQS&=PF`0)t*Z@)eIh3GGW%!Y_~OYMvciYtTE_(1`h|ZprU1`8tr*}
zZG@85nv`+%;IYUojV0#O<juOU2}U6#_3($?y?OW?lWWqm?poZN=VsC^`^PDpo@LWB
zSsLM#T`rgTr@{1-o|3cH94RGwP8zC#8yP+1ejNyq2~^cXFEstq4~_niUkZ#SD!DkK
zAGTPmWc+Y*>OUZ;K1pNL6H39)$z$ReOHq-!MXIqWk?5zaGDXTIydSP4P%=LEHA9_;
z6m;suL{6Lvxv5z9EhS`k15^s?7kNDB9m%T%!c{s@m>-OiWVAqYwJCc6IniQ9L61fY
zf%a%M=9J=W`^J=m1--6gztPXNU|;K|98CoSs|xqIz)biERllCF#Z2T5$o~Krr-b$I
zu%iLRpMf?Q%s!p&Oe_N6Vx2phe()=G{E%F!l)yoJ)xN-?+G^_B)X+q#O%2a+Qv(gK
z4eN_dbkgO~fo{@DCh+hq@#g)CEdX8P&IGf4m9><&S^`p{93ixIF>@Xv$pB~}<#<35
zccKvyfCm1$H}b%6m7c<pEaVC8lV1yV)9)lSd^QP|chry?Q{nQLcR?V!;XLUj!RCWc
zBt2bd$_6PsCgvHJoaUiU){r#G`{gx--N4PYf9IP3Mkku4jmJA*?m^r&iS|QmL^~?e
z4sv;j9-~W)e)nkIcSvvE&K;ey-EQ$rp{)R!1P|>fO*~AYMtdIUJC=hK&W}TDrsh3|
z=@3~1`hLR)Y&)@MxYsnUi(xjn{n=&MeY}VA1h^Br5u8AYZcQmU>Ds`OZm#B2C`HD;
zB+B#ftVOt?75I!!-mx&`X~uw`Xk1*7cqt<=ghD|)A9sVQp<4brPuj@er^c*F0KuKo
za%o|<iem1{zj7_1fuzNRhljeF;Sj%4B#y`C>&UVi%L;19VdVu-qdl*b)SJIYsKx|w
zR*@PXr4XnOfPxB8-qB3Cb2NUBh1u!Mf-)D{qWt(Z39m>~{GwT0X_Hf|hfB*f&>GAc
zE!$r>XV^f}oZ(ZPGfpvwFkQw}dA#8$sM+Srbv-5qo0KRCGc}2`VY!x34_SVzeKMed
zq`APfgE00=HZF+jKBy@%O#^v&6TyT@?NaI%u=-)^h7?4zL4DFQX;)ecrOc(BG{?eA
zs6x2pLQEj{>*9%P4^X>G9<8oNa)X6I_@*x7ogR7t@CZ;CA^LlQJFb&rq?5@B!kZIG
zO43P6P8@D(J+CM+bDSQ;&wf{ZaP>?{@X%2flaQ$zN5mlYOahGV5G%?wBb}<DaW(7;
zM|dQeIcf7>B2W6lk!nsH=7SVOBJi>%%ErS^&!-8UbJ)4BQ2_0u>8M|&$h}Erp%Gp#
zQOOF$4_)G`b&o;=NqZC?Iu1mOGN_2HALGoaEge=~%+WWh4`q0@4ox(WG(7PG$w7y9
zdT~b?oB-N|j9NS)Uv+KA5E=6S!c`@eJ#pOl6bC&5KklEdoRa6p^hHJ)5W|Z-G%j)q
z;*Y_w6Y!wItQfwU5K0>kK{BflIuVQDR`R~2blOQ;W+DeKgT{2;EW8XW!vQ}xM?nXG
zl}jo4wnYf^@i8LMMO8=)<bV}joFU=DD8P5P`(sSF#)+QoPv8(CKUob<hnxY~V?xKF
zY+)5j%m`f8M<#x9#MAYV67X@FG+F-&Q1HU-3DOsvvKPmlH6$J;GK@i;P?0dz;gl0u
zH~=IBt9J1;Wa2BR@5%c2Um$ZMPiIm$T`*YWZbtuy)>JK<myQzFgt2+)5lG%_VhqjA
zY~%$KnCWS@FmJnDE~jMr;eZU;#=b`h9cz&V{+d7T<5GpOkxeiw$oY9Ozl4F}Jk31h
zJ)}9UTShBQ8mPsZojfqZnvEeW{0Nq6Y_QJ#Y>eC@Isc`q7bgL$@?{W#u6_vxp6f*i
zzNATt`u^)*5?8<s?|wCQ_@-A0Mq-B~7Suhx*hGry#pnAW`lJ*FLcHg^y1!5J<YThx
zp2nCCr}k-L1OI6K(~!wi%*f%=L2KcOF~TV<|G%n`nubn+*j(VV7z3r0dZ~q^jCf}7
z0dPt@K)V)&H3bD8QCa^%D(hdW*HOQdH9LK4TXj1+-40#5BbrO0-x<eef^v&G%wcg0
zt8o&riBwa7KhOl=$HT<$Yi4oCa(G+Bgy?2~34ZwDh&%Yd(H*>_`-nUEKl!gN|8KL4
z=E1g6hyQoyF4-Lu^FL&<pO5%|{|$fF3>n<FiF69=wI)UVdY7<&r@(({_1XUij{JF!
z&6ZJG)H}ay;@Yn#SI5c<SN}Ty(ND(BT+!$4{>|U+wdVB|4X@rMO+BX7ZRh628;;Mv
zz1byOKA(}ZV%{Yyx^`GG<Cq=CF3;LguXn`OqpfuAtTW$yvTf7L+V<+#>+Sw&MPE5T
z+dF#b-hB`MxaGsUzKQkfciYDIC++znHu}|J3wCUHbW-@U`AxT-cFDAT4c2cw{ntNF
zzoc!?9&g;x@T-bnZ?f$@wny`O@7dJ1{*N90=r`q(qaS&-+Xn@ajjzbl_AD&Tz3fk0
z{fA%dlQw?EQTIRB^0}(%lUn(96sNWRdg|hj&;0N#TV%tBCr``SFs13{(=NXF)R&K{
zdVR;YBcHr@>cmyvua}*A->fzbr;WY!xBT=*wq6&{-7~+REpvG3tGhmZX5Q0J&n(#y
zIVYC$*&E0A2xQ;h%GYYkW5X7F`NbE*owGmx{PTJZjvnqjY3h=DgZTp*Y`o^t!ra!U
zzrQxnf6#T$&0Ts~Q|Z`_y?g(<GuF`7YRioAW8VJYPiMbw8=u?NYxdSFue@^l^y$a6
zbj|5;=_ULA`0bHL9@#P0e}3oN2iB`sua)nC5BsH^d+M|6zFxX?>4b%!g<cpjfAu|o
ze9`XOmYL_BQ8xavrX^j6-rBKgm#k%7x6Pb3;)2t<Rh<;vIQq7G#*~g&XMd-K?bxG7
z#bP}#xZvH%zg#z`OXj%?+Re(IX7h!={$-ssWZr$#k2<lL*S>ArwoCu`?yV(DmNdh^
zEz7REcE*e!mFFLA@!YzvZ*`5D**3j>`~FQ^`4&~YfA^j}dx~y8i*@Ma>-vm2XXf<D
zww`JGetZ9qTSu=QGiq{UTfKg^hPHYU+i|bi{I-s<%6G>tc<-fccem(&a<8|KX|m^L
z+Xb`j??ej=3rCKe)3#`HyT?9WyJ}U76HhEm8-LT{_MdiKx%-s8&#v#Y_XXdxX<OOf
zmtU^__~X{oX5M^rhwSWuXWiU?qV2U-k9}79>X7AWOPVwZ9^d^*-|h{&o2~Rc-stlg
zqps?)?czquPO~llerxHU`+oT?=k!hMx8!{F=ZPPzTJ_^+RU282>C>OS=%*d`-Yd84
zp1thNFXEqEo^w~}+Gf}6ZsohR^N0~6jydL-0RslKbd7wte_DpRw9SgMPxF<H3NGIJ
z^YO<Vli7b}kGb`~yL)w$w_5p*o$kG>L&d5mM*XQ|Z=Z8|<m2o2TyOiPa%rn=UwpA^
z{YxF3&cNn3uVM4~%y4IWd)Xtl#Sd;-I8gig;uae-N4{vYjUPY$oBEH;A9QzD?Trr~
zP-cFyz%l)+2Yz{>o_yE!Z-4*sJ$nPMKOg+Xy=>^2Lnob4y?ySjdyf8TZRU>GS`-%b
z>o<JS#P2>|GPTLkQ<o3y`Nr^z23*=Q^TgBo#QNNI@%<gHI_~tfPb&io3JPMeXYaY^
zo?nXw{#kMNr_X5H8sFvWd2S2asuO?i_VydCZf?6}`$sK%^{T&e<<aLZcTYHd#h@|u
zTt7T9cW&W=Pj>!vQ9S?Q5$%@vpN+lz>E};;Hhb1Ae|h<NLx;|tH*cf%e(vQzozb<V
zYxVb&Y!CkaaPtRz_uaSb^2^8c={w@hoDZ)5=Am_$mpOeiZun2`o*j=ZxI1t1DIMor
z@Ijx)`u=?Txl5Gi#;-V`dGqt;U+~ip_x!oO>xnko>L>PIuQgiM>fVJddd|^$J$U7n
z5B;?Bh6YoH%pJM=#p*U?6|3hCxb^w)#?hlk=T&{P{*lso(o0o4hlg`MyEg6PxzDf8
z39MN+XwdWjDL!vn({0x`Yh#zB^QPaWjagtjfA*h0Ex0s&`uDq@d4I(nod#^}vG}UI
z7nhv>;DkQ?((bFe=F>aw9P#O@*onTCTi8yrz1*Q<$NO_$Y8blq-dn3)zu?TiclCe0
ztm!GIJo?Gb=RTP{@3IdzJi9FO<A$r#J0Eq=*H5VL7H-)*r(Vze{0!S0tzOcO-*{Qm
z-j8f~_x1sgJkrdy_?toXE6;rNofVGk?3wPf+Ri`k)gR|}T9LoTmept4SljhYf8O`(
zy|adFI`N9>iyyvsdhyZO?*&_Cj$S;z&vi}fkG<uVVN2e-al^QVA9(L+S~7fiW#>D$
zY}qn2<L$SuS+I2B{X;H`4J~1eM%nuDqmMpz;)(D5^iz;+iD2;QH}dQCT+r^Un?tYJ
zN{8RJ@!tH)KK!tr+kMi_MOQUF>G;y+t$c%<?|Hdlu=Cs(hWKA7{pH%li|U`VZQ6|w
z^t~apVNusMZ3>#&<}5mK(S_%<@6+On#se~YwQ5~9W+R)Y>R-QI>U-<a6?ct$_=)FB
zcG!k=-`O^;r@i+XC!c)dtQOhhy+6)MpSp6T_w_gSy1#ky?8pYshr4DTd&wm)Z+QKN
zPuCZfE_OD^TGr^e)7HGCZQJ|H#vaw*`-eXA?Y>zj{nV<BXX*ThEBF2J!x?$MKmP06
zH}!w)W2tAotACXrd}H|TN6v5EBVAz=(*Eq7ukL-m>6Bl8Z#3|Z7K_K`FTeb#f-Rdb
ze^Yv3R<(WV2OI0jd3pUFzwMiy_kJ?PecY5STc*AilzzVclt<T|a>MD}p0EDlOXZ!}
z*Zn8=0;Sui`$xC>)ZM35oAV!<^z*F8$K3Ph$HUI-JmMJJ(I0pQPIJGr^w+JYH~gsO
z_cyyGxk1*{CE=fUO?&G<r!r<eb9C{dR^Oa>MN#t=%iG`H?UymFP7U==YY-{wRk7la
z?5@>Qnoe6>WSf8H&gHk9J?x2*MFR)!nz{Y4J<aEO+g!PB-PY?)J!ZqiHZQ#RVso4A
z*lA6t9CyY?*EMLJW;?fky<IjokBcvguYKeA8-D)bqsJ!O-n+1ApQ|4_Yu&e-#*Mr1
z@wA`Dwma4~#qE7JPc7MXQ=7Bb2e0n(?D3HuSB$*t?bfYZH*Vbcm9b+gubOUu(0=i^
zORj0wX2ayo*94a??bPbdG<ReFPbd9cZ%WDF^rL!CyDh8pUEPK)jBcIx##OH_ykzo!
zw)IRquf?+4R(sQ?zkd1UGp;?UNuwu!scd)b;GgGq|Ml}$A2z!6o=LCN?|$;eqcXqu
zyC&T8>s7}Od;Egu+GXzU-mCetqvMTYH{bWhEAQPlReS5J4+}P2G;YI>+rPVT!K&Ow
z%N~C4i{)#c+WqXaL*{K+`b$RJw_0^Lt6ke^bI$qhohi1-3+CJAN6)|Df;;ZK^Reay
zSuYNL>DBYrG{1b^x?9HV`~KP=fBfb9@0X{2SJ1CG{p%BUHL!VSl=g2nGwr)f$HTX|
zeS1$R-W3YQub%t)Y4sh_fPu$Wf4B5}TQFzT3m+`K>*4eE{W!0>UcJ+2tT-woxAl~q
zPu<Jr&!2y1=U`6NH*<CuH{LYii+)>w{ch)m$yGgC=ghcn@Ty;)il@1co>elV$+WLF
zUi#<fYo6Nq^fPC-ZCtwisBZR#?q&B(?mYRs&5fT9e7wDFyXeAJu3r7-y)o;8PaePh
zxryIJ`k%b)t{G3XYxu#Q-#Q1^ez9%a3;zE$|EXQ(nu-~v%i}rUujtly-r&i*cYT`E
z>yPvkkN)tIj_<Z!)@tsYrhl$nxkvqI!=-zF+TFJCG3Acc^|oF7(L;q*8@l$Hedn1)
zfwyyS%AYp3>5P}0BksBA!Y{`y`0PIK#?yP`j;vSzzT0oVeePVw9$mMzEqd~S!Dmii
z{m6Chi#A{L{-r-Xc4>pLGk%&i{XI{Qv1ha%)}Yzk7QWnND?7ZuYvl90I(YJ%kB+a%
zpV#Kk-(MYY$=;paS}Yy>NR!q#w(WKGlabiPY56mIH{CqzdGE0cUVY`O&#HE}ShM@R
zhtr16+_mn7%&e@)>(d%Pded7cY;1Y=b*s<&t)j=eJzH-*YG#Xj9gp8x|LdbKYal=M
z_5EejGOxbOH^aTmJ8Av+JKK5+pIUKuZuG6|f6q8+>Q{@_xcfEFyZFV;zis>F^zOr@
zu~pwRS?XwIJ8JB-+jhS)Y0Vjbo-^*(Z?g(L8y=W?Q9oO8>$K5NZd@N&xbulYpMF|#
z=6_!eKeh3)i<Y(8Ho<n>y}$g>;r92M&s~4vbMHLeq-VVkJda;>T%()r&41^?qQ+w`
z{_ffjhTPoh^0EEBIoq}l-M#+&IX7!hEn0MLlXv^~OS?TUH?NIvcr^O(DX(w+?3-0h
z>c2QCW6{pv+izRa>iqfFSO1W={J-fpwe3-O-{h{}-8Cxs(e@e7l%JU~@;1it%3{wh
z4Xi$Q`5kuzwyhZT+t2HszVy$9Pd@nIDXkl~&h@phwY|pCf9IRmOnv6**+(CB^3tBR
zo{v3hpXR^)`4`SkyX@1)wb2dFKdJMHH|+SeNwc284<`k#zUUd}Gu?Kt|MjO&u9*47
z#%*ifvPs*Pzkg}ozOA=bJow<Tk=@Tsf9vaY*N&dJY3It7r}TPvR@COI%nDxc{f5QI
zpL*=+n{q$z*roBzhi47RY<{`>q`VnV1fO_CVtUMyeS3c&H*Q?Fw68vXIsMtI`<}7)
z@i9-{;Qn%bvsRUBUix9v{1GkNwY#ch`I{4l{eIu9ce2lH$jJZg(s}3QegAfg{_E1}
z*&cM1&HUrI|NP<EzVh@PJBE!~pEK&JEBgO*oM%QXr)12f+t-DEIcCfYC&jz;wmo;>
zGZpWDv-Y{i7BBv6z(<2uzu$Ptf>$mYyJcCMz1hE<eDeeMI~yIJ_e#Vw-C4S6WwYTQ
zU6Picb9%E$uBn#=);#(7EyKPnz3`1zUDeNDjqiM_<(Tz-(;h0j<x<;<y${_e?U)`8
zhc`YqZdg%K(XDH)3N1bAnySFsXVbfOtzP@AdiRXGR!lkLtfF%|{IJV+!`H8^`Rdur
ze!OedQDgV*dwKDsTdzC$gx2qr&3tlR#>;yae85=vdvm(JIJfY>|LxlM>a6Q*%dTwD
zXvISh^|_&ydq`l*;@e)jeCpH%BVQ^RGUUeDv%lQ@WvtOX=S_L}o56F=Ik&X5L&b{I
zcK>oreEvfZZM~*lUW1-<sy>+(ePD{aeq_;aU*5Ilt-f7PE1NcBQr~G>_=dD4GoJcn
z^qqI!eRpql;gd_oA7@)xTD&)0Solm^Pv+0fzni`;{OaQ8pYNQRS-f-uBZVupZ7T-d
zmgV{UwadJF7H+(EZQpvIZ=Y8+Y-p#Z_itO2+2!Te_bGRF8u!)rTeqYuIj4V9(){HQ
zdZw*oO&lXPZqRt!jHaVTjoPx{lIPYbw|(<kD<;;S+T)T%pZ6NIXjR{gxBt8Pk^3EM
zFTQH$?(JEd`ZwS3^ww3E?){{^*T7jnKX-e*)^EO)+d<p@$8Z0=zr!o-j(wzZ?yLdL
zSG>LEX|1AO>$C1_(d_c{;P2nQ@%tH<Onm$q<(n&~9rx~<uP5}n`jlN?Z;!w7wESI5
z->y!NUZt%#vvHSBpN^i``k0>4_Vp(>YSm!d^|NMOy)ImAv-NtS@xU|kyFGi=e@<yK
zWmWp}R*gQ`yYH7VV_sSR<rU4Yx#hu6b{3A!op|EXQB8Y3Hu>d6uT9=F^`lMSe)4Mh
zt+#yqQ`aBP{czs9bGi<n*XGfoFE#o)ZSti%R;{^LKE_veb;*jZt@kWnzNg2ZzukEA
zf1Y?d-gof4bAG(VwsyjE^%p;L?)Vk?Gb7d2A9dUPMg3O4-~HReS)q|XUf2DJ3wky>
z?#JT((osX^Y&r3gwjcG_H~x$DFCD#Pea_^OzrWD3vv<Z*^GCced-iO5#hhoZT6d1^
z@ln5z(w@1c>GnRar(JaHoCdaQu4}St^Zga_l_#9wt2cIS<3VX^FgSV3b*FvhTyx&F
z9j6VcuKsQH{1JEc**N&MQ|p!OedN(ccl`R@mYHp<7oX6!@vxzz_I~@u3AQWuWq+rw
zsCVOsj(V|zZ!fBpY_IuOj_PsqoA#{0+Oi>|H?%$JvX&=h7Onhl%UfrkefE;6c{@Im
ze%<%`ZlBld_4yX3#oR6P_I%ab=R2YG%J&9$`?jHd%3GU;lpVW4UK5zUZs6u={m$F@
z@$q?YH+cWro@rBWgTGeIZrYe0%eOr>$=SaBDLFC6#HMXF-_h1{)zr}1GTXg7kKcBG
zPQZ4rT{_|7CmT*Yy<7b$OyIP+7LESav-ivQHoow}J2R){`mSuyGa8Madv3GJ*BdOD
zG~m{~PhK#8`u%D3Cr-KkoGZhxq-V5$w6NdCF&~W?+sO9)592})Hty8*-uv#G|KJyr
zZT!j2woQ5Jn?HUVaQ^vcesKPi*PL|a@n^W+iI$d@&U<yj{40-c*zobui*q`6KB@aV
zu@4s)_sDJ1vvBsdLCc<g;kX9<e*fiG_p(Lr4%)c(vi0k)ZPMhuRs+5XUcF{ME4Jm4
zqfQ*=cDtFze%!Ig?)tHFxZ#lTU(cNW&2clQ%|CC_d8>chx3ve;Df{-T+EMn?Wer-s
z_So#rjaS|4wyjz8+oXBYo1cwoc<-NkcCK8uY(nv#hi$#C{;&W0FHZfopDn&QYr(qn
zJ6*qH%~OvqUw(Gl_B{)Kp4O`Ei5K4g)xfH|2G7badi|)Qo?}|*$+iY_?;4oCqMq-O
zC!R>}@<Q`_+e}?D;GMhIHyHJf?Td!re)UIv+nN^^wCK6L<BxO0_1w#vWl!Gs+xFnP
z!2_C~*W!jvr-T~3H2V&l?fu+a&wQtIX0vN9U-|pbcl~mCPRoWb7qo0x83;ICuGOoL
z`s%^PGi-9ZZTByHa!0$S%Bc_Da(0g%RZp<f{po>2FP;5X#hf*_DrXh_dc&pNzhy^B
zn!Ebb4<ak-y<N3&RM}0RZ~D*J8H@mrzwWy0K9i^PyvXC(^n7sLqCKbA^Q~I5=8`Yp
zJ=3;(M~_CfqSrT1{jN#j`bkH5hR$}4d45CulV#JVm*+S5xM=4?D`S5==9p3P#3whu
z`sdy?yDxpUrLT0}yW93On)~|e@7(HoPHOY~TgSD2HokN9>#z5U__nXnKC;=GG-<MF
z)27k0pL}uj1sBbI<&~x5+G|(c+W*`O-n`0vRfp9-J@mm8_mxj=+V$yx(uWq^bJwWW
z7iZUBx}sx`Ctm(gxm{}4eA!noZF^<(OVLKlE_!O$;zd)no@re=JvVz+N83d0czK$=
zO`FV7FE{+;trIW5_1Kf$JMX;Xj>|8<{57rp4V8~R{8jdpfmeTVew#kFj&0xk^S-Md
z%3Ahbd3v{no4?((^3L>UyHySu`f+#PvOV+ezT^8pet4m<_pb{lW;fk2{LQrc7)6hG
z=B%@OygIAt33ETcw&n4@-j9qdi&Zb5HGFpiCWdd1o&CX4^)9^d!amoXvh^0*X|@&j
zyjuUYMPGb3c19~-vu69kuXHV*{m9_H`~KLr>y4`}mEV+SEbDT^(P`Vy*~U(SKi@e1
zhnB9>*a^wx=4P8V?K`@GXT}T9p0j-U9moA=(UZzM+aKsVpx%_GJ^D|+?$i?s@-E#c
zO&ncs^UI$GPC72TWycBmQ&c8B78d3Y+w|qut%F`U=aX}`*|U1jYqR*a>P@E?&grnC
zS?f#Adu;NSW$Ujy^@guvUp|@D<K`mo492fdJ#|Fy8(S~yV{2M;T3$$*_Vt2AiyC)-
zv8ZfOlQZ&0e%t(>;Ww^bJ}bR+)tqCFuc~ibwfgyA&l!`pWag@KS3gmlX1m`vtHd_&
z>f5y&l?z6F_SKv%X;b>me6{J(pEdbU(+_(-_gu#3pZ=I}fBBZpn>TOSGU|h!H`(s!
z{>b1*cfR;}3)?BD216%3HloR@hkG@g()8udk(<)zE}p+Iqf6(tw%6WhvDh_r?cCE^
z#<m|n<%x?=>Gfw&9slFFDVKJ+aqDS!T(JA|3nDM&gf`xJg7e|$K5l*gn#l|Q%=vcN
z<<DNcalp<Q<In%5!S01`58HlQzJ1_*9Ufh{ep&a81&*zAN^d%T*T|D^Yr1l1VfL`V
zf3tlvCOtj7y6;0TOzt^gz&o=uM(o(RbID^}3p+LX?A_p#X)EsY9-pt?dBX3Do>|vo
zTkz{UF1m6@lgl3{DO5MD4|Uwprp;8Zx0l^sf6!UE+n&Dv*~s99x16y3v!-n?c{#du
zIjfDSIHQ_w%_to`d+W{ZiXWOg_lhg7sQ&H>&x~oCKIwb&fa7iK?45brIg#xv-P2z`
z<<xZ>FZuo9g*U;|Id`0*ZJgZZ#4Cml8#8(L;w^VfI%moNQb4W0+v`Ht&N%Jc&!_q>
z+4Iqx4?g(8Ydsq*>-U8;Yu3n57yj}`qcgtvc=hNdYreSCcgthrZ@4>cO4AF2!QAni
zr=_)DW&h~ZdTooc?|g5=`1Wg8?)>kdpX!aB;TSq|X0Oo`J^zorD}jfqd;cRUCTS0?
zW3*6=r6PM-<1Hc;+Ke$6&B81xT2$I>?RhIAZ3-z%l(bV(QfLv879^#zmDK;7d+&^y
zv81>9{eS<@|Lv1m?mYM0bDn#i=lPy<?)g3=aC;(j+uGjWEKN+UJXcgyUlo11KMs%g
zE)RJBcb|>YO0IXBZVahe*H*iD-MUA(i6PkohYizQ<NuYl&Vcv%<Gph%4S>9&`dsr#
zd^BX)9{rRjYG2=6I({-ZbF|!+g}u1ktO1dllX5JAgQ`eNQtG@kD52BS+oHcuVU%6S
z470R$vVL0f^5e(joT?Gt-U+5V^hXuBY0;mqC}*UP*L?lgTAg$!S?|G-6VE&WajEe9
z!`k|Dy&C+pW|`M{r>aaXk}Al;rH%=_kQ-$k9CbadSe;yFk@GSmV|~&^?GTQw^acOo
zZ<QhC?;hK){LCJCtkjjTv2S0Kwg$T~0rZR4XEyqOe4CO!THkTfp{B1SoU4+OW%a3g
zn}7fV(^*N6{5IkgUfdiLFuUkuL*zO<Zs2If2f{Gcuz{8b4c^UaXx2?lyX}$k?pv!#
zSxS{u&f3szaol5P&b;|>(}c;`yD-UCGVsHTBfWZkO<XY2^jZ3JL;aH2*lVMu-t5}7
zYs|W@zRd-PNM9v@OEi^TS+Z$c<GX~K2jyPx@HwH|q;M(DeibvG95V78r+RDui>)|K
zr9QY96Qd)C>Mm02vu>SHpzex^^qH}8VSZ}+XCL3XRl0fPxc7-6A9>!Ef46?Bw6U>K
z!PUf1k~EUY(T{9QOq9dj$|v<5*cvFeX4&5s5<ZI#R%XsL9ooyrS`qhXiVPz-(q^OW
zplXJ4&NQm7;rhoi14ioy4m30AvvGw?BnMY^BKlBEL*WZt;EwQtk~pilBklvMLOH!-
z#v8AV+dXc{_Dx!STzv*tjCeEiNWVDC3%0s$&tm&$;{h~SyLRoN%E1=%e0^tv|HqC+
z4BEw<A2P64g~CXgnL(~w%nqlP-Cn90NFrQOfPL$W-O|;*7n0P86_GhNqy~%`C7XXf
zZqB&*pSS#Fn%3kdFBO-Rv@D%j7Cdb7wd>c7K1{dSf0Yn6dZfLJOUT*NNpJ5MN#xJ8
zAL@K=|6K{n%?V*+MjLah1Fvob2CD}At7M<Q8^MryVaCSCD?-5_!N&NcVuG}i{o(V8
ziHxfJr~!ucfwN9k9Pr=uCb|0B*ntWPxAc+{6Z;Ps(072_jM<+Rr&Ol1OzxK}G;LlT
zq*;}G`7-(LfhTzp+rz@oWxO=(ceJQDO-{je-?(KfReMzwp12u5t0F&kXWs#1?&Rl(
zhlZxQBxYx4`}+D053v}RuAP&cn;RP&d*j2PXP~rFuc@0iZQ2_Vv3-nD$&_Q$akHb1
z6%K#9BU9aLzO*mN%EGznt+T#&(F}6dOzE`ry!rDV=H|vzsbQY?bl#RPvsE=<ztpO~
znrfjcS#U2>PeI@5Yz12ZcYOB#!DGip@7<fN(E9b$J%-M~Y`1N}!8WsJ%gV}rZF#Xh
zdi6(ZU&2=1Uea!IBc{e>WGEO)k8cd!V}In@&9IPLd6_G(H`XzSrnYJfGe2Iixqox`
zh-n2L^Fl3a>YoR%`})GkHa{CwB$?iKu4bQ{>RUTM7=Ij_GwO(?Mfm8Es^54IaMP=X
zhm2QIiMwz?pGb6jd246Yz39s;KU8k&C*SnGyu6@b$F5z26%}PjYq#a^nCy6GPgB#1
zv@td({2X$}%an2KY?dxnG_?#om??L0+`(S;w`Q3{#0L><>UK{YuwPf>_VXCaBMs@7
z*EAn2e`~tc_w>A4*TEY`%VnxGlnmQSl>WHHuYb0}wp}W=Hhw-do0>>Hj#SRz!Gkx;
zDiUw7DU>5m=zXR&7x!!GZ8sa3j;(FeyU0NiQ?xgKzxRDq#wx`Rq!Vcw-{r1IocVhf
zi6Rk0qiNw{9_@bPU7M%jDKTr;(Ro8Blxkno#a-!bRfjh}u-W%R<)C*_zWda#Y>^wC
zo0n%M-G9VXuQx>}iB~30o$9#vQ{*R-p_|LiqbGt)UMAetW4pJ!eX>zv)FmkuVi4}k
zh!d|~y(lFvkvw9ry?=4(*wN0Zl70K+N9r9dydSisHH7u*)xv}YiWF<}<tKG#4VLhc
z9Xb4zVy0C;!@xB;p)I~IVvBm|kXAkggJ%y94}jLen8DUI{QC3ht3Domv)De35S`#s
zLNPH^Z0lXVuHn9nx9-IufgHsc3wxL1x$1Uf^M_T%df;MI)C^14m1aoe4lXUXZ<)DE
zT1g?MQTOtB#uZ#j+=RMb3zlzj)+G{WB;AbUSUZfh+GRc}d|!Qi!NR5I%k)+}e|e4h
zT&L0iT;M~+@IdtyNjx6!X87nuXWg>De*QFM@L+%q`t%>M=itFi##5aP<F&E153;Mj
zl*~RfL-T6yew)Ka3|sTYv44)gU93~W_75-m8hyM~Cn3=%$$6ctwsodov^wdu<c>*`
z4p8?8-~8TiVio6gkyGMbVrmE{S1)0)UclW0+_W>>hpXaRTHi01xbi&4Y;%xdlT%6N
z`*)Pt_Y?+~C|7CH94d3dnuB8}1-Y7P=HLUPI7iO8jyL^V>t?~>ogu@+aOw4O>yITT
zCl?gV9n{D7?c=jSK~lJk=4S!rtE!@a`GRp(TG0%7sksyfxiN;1OG{Tbm-+d*9L4G7
zDZSyYEIxI6yYYqoN*gm(hHt9QRy#Cp`K?GjnWg6puYH(oopI?>T1HFkxX*3%W@XQ>
z51Zm4d+zC8>)o-RK1I7^>gZ}DS=u|9n$~Nq)$(|D(H!?U<7~z0%w1+?ci-%rd*kE#
zr+$}?9#zuPa@<!_l4jC&+b%YpVK8suqu58ggMxPS?&t9C;*{I2I{?B6v%KwP-e+S&
z{IX-0KUgxC#~(TW<n^e2Hx=fcGHh#bf9^PN+S$}N9L~h#G8jbZkCMw@MWwz<a8AKp
zaXYIJW-0$YIBC^2|EzDB?=PjeBzn7UI$=>?U`BD6*Vn#e+hnuq1fakjCnjw;gri7Z
zd6@9z>4Qp5g>lZuLC8&9Vqjv>x>MO|%+rgj?vM5xhr6=u`+-lnlUp}z42#+3^m>%$
z1O|f<zi^#uvYz6L0Y+2(ADtd=6>fMaD(ma@0rI59f4gbU`uurXP0h&M+!2FJS7au8
z&v%($JY|51VV^6O(t~pc9BbOMCyttzbAI-^#6#Nj$C^j(XMh37#ful$OZK(2vXZ<~
zQ+Pu4SY@Ui$+`~U;jp~iT>VuaUoz6mUf))mG<^M1yKnVd_J_!`*!%Nwafx$4*x2ws
zhnVB!8gusCx!$<R`0I~-zP4;~PBCt&GLb)id~>{SeyqveyLB3uS6AHCy}WJvc0+F5
zHTuISeV+Bxp*cBs?i6yW)}}JcjLbGm8B`6Fw=ay)NWaw9bpO#ZlcJK6i{$IuF1ImG
zyM)e|zBuY?|0{ZHK4kBou)DTl;VRyuMF*eI*S_3orNb;$X|c1lwVg9(4wK2WwA_5v
zwSYY+x>BaMd`VV7^X=UeqXXXQ)jiq3bb7bL)UPZ}Ysx2CB@fS|(Qi)ITwNtCg^QQy
zANpjx^#Nle-<;5lj0{3l_~J{Y2cnl{1~d<7Z0xUaP?3_KPQXoDHtOUi$56``k$ToO
zHD|T7h6l}MBsNyxf0K}~D<@~N!a<xSCA@b(%V!+B;M?Qo&v*XbnDjL^)+K0M&_GHZ
z=k?Lmjl~XiSLu^XdpBKfsSN4eZ+JCV-+7-MPzmsUU%vRKJc&GXh?K8fY|D(6CcHbH
zlvI9!SG#NcUqKUURTnIj8Yw@l*e<eV`@;p<+cM=wG+dz_S+INPcfA2K&q~J4j5K{*
zU0hFZRA)Xns`Rxt-l?Z|=1Ycc&?{ol^z@TTjX3{_@fDWJxp$Xn`E!F@`a6znv6QCK
z>8ooK(-$N-4H`6PrYg@wddTUU8|+kVD*y8Gs@`p9T+_RCw7T0-75d{dXBIBqFX_tB
zlHIz*F5Q?^Mh^9r3sM+=J9^+0r3oK;E5+*9PP-SIKgKHm#Oy~Vw#7GPv`&U8kK6Wm
zNMMu6SMtN^`-8mi`$;r5Huh@W^Pr-l;>;P%oeHueva=Es=PXevu`bVgsVaZ1C1<Pc
zkjg4|^Y4eR$SCbOSGG35X2HX0ua$SWraW1?uB|aJFc9cYcEnU^rG~q@<)if2<HnCa
zcJ}Ojj}*O8;m403*P`U8EzT&&%3su+yI@1k%Gzyxh$Rk2>$x9a@`eqYqfpzLIfHxe
ztcFd2m1UoouTO6c>p#@2@Z;{164+-B>2W-&3l8^_CrJgSKl7h#XlSUZS>Uey`SWK*
z+08{oMYj8`n%$m6I!C6arA;Fcu1x8Fy133@W&O2Cy^-$Djrcat`!O#X6oQ-<JWPI)
zvL!=4*P+S{_=|UCnScHD*Ujx?m)YB&b-lXb<x6)4<Eica;;aL{v3tRQJiUDFBB={p
zo6B;Z2ZM%fnsab?I{7*gml@~0GA}2QtG{?q?yd7}ZO!kai~_dCU8*KI_BOY&N^$}*
zBX}54YjJULU%63UG}@p^8+VYRY#%bmdWH<d%gE@hZt<Bnudx34_2S`WQ_QAU1-V)r
zrrfmr(t5D@oza}F-~9K!UeHG_aGZ>N$(NfZ&(3?#KQQZU&D6ffv$EP!?ioKlOR=)I
zzkk$v_i<3EAw%XlI_}xKmzw^RLZMg~E;!+AS*9FVu!^U@#L4OL=_Q!}K1eP5H1I(1
z4L!>}9~&B+OdHBqb1Zj#Q}!xYzs7>L=J}>o-`mQkqy~`WuS-(iwl$Zt==9lkc8_Ws
zw{6?j%Y;Uw0Ze3KvhK##K@)b%7*<!5?USe|@-hC_@&bev&*(M7FCMQ~s#2Z5D+mO)
zw^fH)BL^x|GT!Ii{%mX$q?r@>pebV6q3>HvW;Z)-SUUY=_-KQDd-tY!+#Qh?c~~tk
zpy{o(o!tOAx#N2-jLLb}tIXimoTmj*e$Q6D3Qm7JqpmF|Ft(t)jbt?LMygx3T)vjl
zg+&g!uM~#lQ*CMt-m5J=&yJn=Hh%MtQ>RXW0Y=tRjXdofC&y`eU|boi0^%Pl;(hJs
zK@*0DQ0ptMk_Mlg=NGoSkJG-I7u&ag|Cnb5T>GALf9>))RZ4Vo9`|ubPKjhM+30nb
zxUX`zCC^@RCP{9$-n~5`!NI5E;=CA)VLR^y$5wMM052VKw1{-i=dF%JYL@+Wb>D4o
z>l?O?BRhjp;)GEq-->Q*+c@mlrh(NppBHC^t_jsricwLg<lGoz^6ljkzw!N|ZWiKX
zl-!cHk2ZKn*IC!{d`qlDe8#7bukyS%WH!tDE$X+SHcvZPBZ9QVVQ99y_A326^FmgF
ziW<-Z{fSd%l)Gni)nX;{_YKueMpkcb$y4rJ)mxI~|9WDy+L-AD%c>1aK6tln)j3!P
z`kK}DF=;M|_wV0Vwh9LT-*{zx%+jQYajLqy&EQu61eVR6yCXujJUoXr?&Pd#dzg>U
zT=h;fZfhu<#JCtj^>q!IzMYyKTz0}PLfQR>6Z>@SB_&BeOB>b5rw$Hoj}kL$zoeAv
zZ<anVuy@d03gyL@##+^5l6~dWCQlx+uWHAR9U7OvCdb6g*hd9%8${*+(3xB&*UV80
z3@!j+{L+V<kzlOxR|Ki|J)50PgXT|5e!AE1nO@VI_|}65MzjXYK05r&O=k7C&o%K2
zj>!y&s2{v>_tjH{%lcQZ{@&Isqm&n+(KqnixpUi1zGbAQa*I#R2Lsj>nORv`Mg+o)
zX&Y83zIr@lICr$fAh%G(upILB&2>*wsw%TXj#zDP`sSu?Fxax}<UC4*`pAAUCcIPm
z9x1&Dq2u58cJ<%vhkH5n6uzo%?b_FSCl{vEoefz_cd6`+*IsirS&<^Iu{0quvGLQV
z!rDgZ!@%Jg1vII-q^hW>Y<2L~RLBV%xp48~)vxdDx86NrkZGu;GW!s_%4na}m9Rq-
z6IM($G+h1p<E!$ut%=v4YbwZA@J7cK+C&BcM5}h^y~eupZI3S72E5O@*jW4NRD7)j
zZia@`l62d%b#Hmsj8tv=@^CZEZv<M69i8r$9aQbrk5X#!Xz0dCs;W=Ub50a{58J@_
zP?>%5<jKl~(-?m_eO>pZF#7be%a=}{CK(zoR{6HnyI+I0L~2p^_U+5g(f8}iUbVg$
zp*MGVI9|=%yybGkgV1TqkGp#uYOOx9yR|tYEzKF!pfBO%bcau+Mu!*q$nCxFdwT9E
zoX>7m*OJtiTgHxA(_Cg|vF~Vw-nDDWBZgMz-@Ety<!(EVJAdyybjViv_MJOJvpsrA
zO1`M9y!7Qw{PXKuhL{eukO+*4A((D0WA+Wpx@uKEFKKjj!s*3{7ulC9pZgA6?QFEv
zSvKZE$pt^w?L$W6_4MQ?Pd<pdq3U|gOx5_&w3?}G%_=K;Lxa8j%z4LU59n(6zAL@)
z_ut_$UX9YUW`&xZoSe&FUuiU#a_n4O4(Lpncjv^HFJE-aS5Hw=dVaO<*rFP)^kL9H
zKfb)Z`*K?yYfW@Z)@<Bf*+(T7DjFIZL?TgN|3Y3}hJljmE9oT$@$p$pzCGWv`QpVl
z?=L4!R!c}qxaeQw5MTUe2i2J~VN9<p`cW_6Cykw6pfMpwo9^V~?cLJy!T$Q@{+j!_
zF1_y*e)isQ%-z#->~x<Bzss#r`VoUn)z#J0($XgERs~l|PX4%Yfbra+RA3@uVPT+y
ztp?}{3;`?ilqyLD2R(B$6=;{ge`{qtJ*U3toZ9&D7EAD#QgOI9&Ie+HLhq}DDGmXs
zVmf#0nrEf-<;-)sx=-mk7LKP1YR=qO>D_09`f#(kJML4xLsD9AoZRG6yZXdv(Df2Q
z;GZ++@ZrP3v3nvS#_F+;W@J3}NU^s$F?)Y97y)}8S~UT93osy3Qc?n5_5GFglII5~
zE{T#oFTXGl|EB&Dz)?xyu7(@D``aks+@mA9hH1*zW|%*}D)&&MWwZR2xI&Ayb!v`t
zKF*aNUmVr%bX%D2GuP1Z6DI77h|rxn)!f1YE->EOp+u!ppQf|EXM@4SinotRQR;1G
zIQ8b63ef-!e0qKNuYGEY)4ccWi*8ED^kx~&cb|X6FZKJ1^ff_q!N3g+Bsm<8sp+*F
z+lE+7-P=MdyTDt&emywJeyBy+tERx#a<yI=g)zsDWxHwu(AWP<(W&uEmglaKaaq1S
zPyTuFu5mSW>E+?!;rX|24NR`<(^`IA`EJ%m{mf0;r{*LN-8_`nTycBtqlg&q=_Of{
z{U#LMPQDZ6DQ~lj3y=y3hydqqoHxC^;w|uQ3BA)6xs0}5{JHwbcFi0`MMcRzvi0`U
z%f}TQ;LV)!s<^ky!iCMC3*I?oWH4=7<D266)~33=yu5&l^?ixT%0^K~A2Q4vpS+zH
z!J*M=<d?0sx3`BnaZd5rCiS@XOOf)2g0lR$!o~A<raiUvblsA?{L$&s(#5-PA62n&
za&oe?w4~D$A|w+s`>o0PI$t}|C}0H`*;-p$hYVL|KY1HBp>*kqppaYk-_<oV?%laF
z%E+JV?|&ha$*Fm8?81c$02s!_sa(~|EOmJnEH(G$kp*s!LoMuw?j%jlp`<)<q%5%d
zUb>?=rFp~V)JgB&t_T3|f9=|}Yu2m*H(<11=^%Oe6Km31lk3ZJUn`fYDOSk6(U~JV
zLu%eB&$|+VcRdzmu1L&w+pkGBb#T}<ooyPw#mh4?<m&ap%+%(MPgO}o)?_WM4~Msm
z8El|hr%W1bIxIUYQ>E2P()Ur5)OFx$-vVvli#B1UxfDKlpslU#f9AZOJ+b#xUEPHX
z77QOgJbbK)v69kEs{f?S+GNu=b2eOBB;n%Y=iMuCoHek>k;bbtVpXd0qd0>kt-?nE
zPpLT7Yp$znOtzbhoZRq{{nTR>DZ#OGZ7jl+c@r}zH|3o7$tZ#D1SCmD_VZ(m2Y!o+
ziCxF@k#LdgXKQ)*RT<H`?(tcQ+?MMeDYug^vR~y^S9@vgeERh1qoif!4;~N`q(Nkw
zyzsQt3G#WMVSp(>kKeg-r|Gl6gHKM4_1lmxB_ZW?B4tH<0(C*?*@q7o#24$kUcoU4
zMIT<=9AsLFD~ySWdHmQZG011<@HXv2qpRxXIJ=k&eyJr&ErC`MMvMpv$+lkKC8P$%
z)Ons@j#YOlTkc+-TtC(<@cY8&#}!_zl`4P!z1MSxoA<uiXpF$&aE4q9Coaq~MP+hv
z1ZxINc<D)H!qju<Mhh$3`2;JNW&_=6Lr`(2uAot<Mm|gio9w5G{}M9%6MUB2+QQcS
zw5jWcpLzcK2haZ_bdJAB|NevL|EEmR(bnz2|E{C+@ALoviGTmi{O@zD=UDu6`geG?
zfZkm|_)df**d2)8kt_Yn^ZqZ-`~MrBcZAsVmpY;t&pRy87}}8#%R8RW@(zC#Cwa#*
zAo1Co(Y@F{kY*j-J<4FMpd!f^Sxh`;<btHI1cZZ?#`NUC{6{clEr(!=GPc5#?NQ$0
zxqRMX65bkS&*ZT96zd$p25Kaim>Zi)UQR&xZ4nkBn1C4F#ENDBL$`r5-PKth>PT{8
zBo`MG-GGhw4w^7OJ%dbxxdUlTLI<9DXiyXm2{Iy6s9bP5)t#rY)*bGo)L?s1;GeeU
z)M+H{O5mv+EX@e;n`m;kpDRiSEed}6m11-S#pwQ?Vy1V@U;lGOO&1iUC!X7WCY?^`
zj#-~7?C%M9bhEy2ssSH1l>;ruz0-U62XYN`&+y-g_52*czi@Nmm0{L$jOQF-RznB?
zINfuN^S9@t?qgOv8S^i@4}>fUvO62k5~p|;;Y>o)5YzmB&2M$JAzn~AxN8XNg`61t
zV<_Jlh@{J@>>d&yq1pOi4hIewb7LYd1T759bBJberBN_;0Q9#X(|ycA<V5(oAsY_=
zbl~*dsUBpQP7hwj%we`AN?ArBGg(Y<HGIbk!7~sBeql?24EpY5w)@YKc8eu1Kog+~
zHvR+caFFcHofB!mRMz_K300XaqyU&WT9D(oJ&P&}_;?11U{3Quf*@B|(RjY1ku>7q
z9;~3zF(!YQ<`td{LIiLTbh0Op3YrgkAI$sBfj9#i3JK;7rL{*4HOS!se^5h9K(Gl`
zIZzIQPGBVAC$~mOJdmV#Xs+TPbO<#9jYK7(x+hZzcJl}-W)7<8eVfmutt6<-wgg}C
z7zi>)1;8<(pv1xQveSf!w7h^{W6)ND3U#6!F(x~tT^z2Ub$(PjU9CN*IE^bvnSd80
z7e{r9bU^`07s_OWMpL9r$TpAWE*By3LGuOt8KMicY$2n@k`q7+=4US8TQovp(3xC^
zL<YZ*#RDyuBSLqLn!NzsU~mV|M>(RzR?I)AEVOJPWnsA=eyA*Axem&L%yJ<5^pGmD
zbFHBlz_doDfL?@<HVZK}|5$sSxlxR;M;tLCY~O;EA#8+#lAmVV&x?v=5Ehsgjf004
z4-*9et8}9=kpU-gp#0<xf<O+MfUzkdJSQ9i5#bsKCnJZ6;CwuC2rUFXNJ7q?BRE&s
zr;DB6MZy$8f>JjYBoq=;R6Ce%&m<0vmO*PDY9YRYPGx#>y-=m_PZ7X(cNW6x4z7o?
zx_1t#RX~AwvO7d#9(3wTni~zmGnjSV6v@Ow6Tj^gei%g+BEnaU0sb!UI|6l(dLRr@
zLe;<s1~FFzfS5nEJ0c}47etTpsC3AM;>RZYv>z7cIqEdvL4_fWgxUl?8`UP3r~_37
z$`i$p;V`J;#nW`7Y3|WFb(@x^CrxWdK|RO`({*!EMkAhw#~-6>gM|zEF66sPyRZ6r
z;-XIR3sNkWdI;vo<@3IAx-dQglIfUZS19Q{JOsbBr{)$!V>}Nf-=^^g%LI{}>Lh|Q
ziwDWgKsbg}uSn-WxFu;=#`slW(1GVOJwpC7WR#7ProrF%Eg-<TDwro-DB8gL`KN9e
zEL-S)AzcTFAkb|fQ3G{3OF9iX?c&`9rgo{{8N)HJf_i^}U+EsO!yX{+?%`?bh>Ee&
zu|#uN`Qq*qgcLlD3DaT2{s&QCr$Y*KB8ANYO@*nUd{`VBh6>TNK!{SsVu`K}f^)Gd
zq8jb0k`NPe2;Mw^W9hWzSO#{qAp8$oi1bKI8oR&PmD`DwL9j(;YmoDh62)(xQ0Wl7
zl9xk;Pyoco!yMd#DIHX8*iahIq0y-b*BC(F917WoicIjZ$rL1;5CR2Y%;ATAJfc;!
zjs(Q|AbbWAKv|vJI!rhwVElu2h$ZJ@iU&+VWbFVvx{S_9)Z&K+H5hP3m<GF>4Dj{&
z=N`VB#9*ke?>@;_r@oMXdxW|+I!YqAcQ%9*8ri6!&I?Z#%m$#8!F<Q)!KJn%7VIkG
z*`lCZn=Qyp^~-JzoxcD#!FaY<x+{^{3pWsEf6<S2=}1A@z>m&UBbb8w%=diYAmaGU
zpd&T!8TJ-$0qnzA;N!zB0jloc>_kd}MmtkvW&%Sa1Z?2X2VrzF8^lgX3`hm`1&<=<
znvqE67)>x{lt^+vejz;2b~l<QkHzD_2nf$GMaAJb7v(2~)38V?zg1im^NAL$Mi56$
zLQTV{Qq8+(Nfm9R4+?CNo{Sd($yif6sS;A7F7g?P!v~Z{5~vE`0klY=SqVhTEdJn-
z%;%0oER4pT$ia7kmW3K^i!ziVHHW#}K!czqdQmwLma|zrl#(6~Q3szs8|iFrSg1f;
zo;wYARyN8y$^k=N0iZ&YAaw^u5f`GO!Y@;Wh|Kxw!%-Am>?5kGs^ZnvCwOuV2rgE1
zx{LO79g3BuKV^#h3JSyCNEB+ivwodn9W}U4<`h_5)ZUmv_6823{K(MWOn=?p5Ns&`
zo5-{+vpquaS!!7xcs~9_ZYkEmQ0@Ej;EE7|2$2E_z7T&rrzmQ)$n`~yw%yi9go*GA
zN=Z8r8HS^oaocBr1mTr~PIZXX3jr`3n9vZ5(7@-5T>+0=fq`8C;~?fzVF!dIftsr!
zsXF=L6m)<UG~g64%Fs?ts@<Z5aWA@rgU)>-!!1u5#zc(=t_LB6r2xo`s1lu*gpNZE
z&B_2rHDp0?*tn9u3PlkfG&V5W_IB`_;YG%%l+jdV+TA8|z-$9cYvIY^xuJFfd!4o#
zfk;}+Ud)`w?=9T+#vwnTFCcUii0~5;zJoU*gCdc-I-N;E{(cbB|D(ejykG=F_5>YX
zj3k})=h7R3vO5M^a8M}Fsu6x>nV>rd(8=UHV*1zuGXX`Lf~28hbGT4fNJv=DgcB?L
zU<>D-`8LVVLM>`Ep!>q!34$$f4O~84?pPOaanJ*>JlUwb!1J?&iY3RxaumCPNaD_?
z{zWN$2{V~!qEitcgBOqk!|@LX3m_1CBlr$!GhFBp;|1=SOXKUXqgOM>yjpuu=C^C+
zJTq%+%uZR|s8Y=Ts6oBc(44_!5I33bG}u(cTeSmJWK6C}V8Ka6KN^RM4bx0T9Wm^J
zWR6hXL>(W6$A-ZgkEuj_bx7cw5xsSCH(`7cUo83oxwt@)e0<ljyRr!LZLOW~Jh*Ow
z84R=*O*nkvKqmxz5J5C<`~LEDLzmX;>(kMAeSQ9j?RFT}bq$-l@2&r$<{zPEM>N3*
zi`R~2fkjbJgP@=%AV`CZ<QnmzlPT@Xn`oYcc0*Ak_<7MNaEXgUrF(Q^5q|`u_k1z{
zw7Z9JozMZU`}+KLv<|F@$RJm}5JnUXvXO<Zk;N1var^dT|49=ErK48P5V3M_7%_Av
zg3de4EdI2iqf-kVZ<y$e-OpG%8BMw%f`5UJXS0?g09knPg3Lu%k&zPULeqJug{TO3
zTU{NvydnbBg<&+zN5O!r)99(tM(9+J_PBzAS9B&!q-sdS5JBf6NqGb#0JK~@QYZ%V
zk<ckz;>;e5fK4&*fG8dTsiLY@6SFl2c{z~g@UT2i$O;yJ+7<zm9?&j&G&KlU>*4wn
z3cF^~IV?52=*3vf_DNgxE}@UJfr|rw>xoVqqd81E+%A#DT^{o{%oBBG97y3ELm+ba
zPfQgdE8YJf=AkR(zZmoQh5V72C)Bck67vwBjb?d5LI9FvRj6isOY#Hlflr#CkQ{c}
z_J;kQ`6BGe3qdSG2I)PVFZ$;Zh{yZ`F$nF(#Li}hgu{~PoRVm4g7x}y#@8AAghzji
z>0!^y{@juR9=Y9cJ>g#y6*EyX&y#^Z0{Xu?pWC&4{%5e_AF)&vEn?_U6f#!55VgoZ
zi4{9Vihl+tiZA3MeF_<r2p;ux#O69csXPXM4w8>g_)}}jf|WXCT21gxXj%;%`eD}F
ze?eytL8s$CL3y1k2+e5BrgDIepd|~hEyJfN;ba=9D}~N;M-3Hr5A69&{tf*%_0|8W
z)K^pg52U{O!TwK?eQy8s8r|>z)YQ_^(dm%?NlW+N{h$Adf5_5T0J^CYI2%tIQyqFu
zeS#L1VIXpt4R`wqANK$_L*0YSpwU<96Nn3_Y<Dt~OjILq01i>-P}wvOAh-sP=W+=F
zot!X}=}rc)We$tUBEsi`nJi>y3wn;1mKwoJ8~jZHe^WsPMe3#r>j0$iUQ@tNa0U^0
zRCO-P2df_V$w&Mg!4D(^00eZ_hOVmwWjkD_qtcLy!TOUIK}WL$T!zA;v)K9sW!Teo
zJ&-E6(SeyEkIjfzatgnaY$^$ZPMGf8$du)t2v7rMQ79Ax;VN}i9l_C`X(l2IABoi`
zAU?|gxgYFKI|*zrUPh#D{C0xF$fi&r<g*e8p}R#vo!~c6B99JAq|-RyT5xx*I^065
zk04A$1L(dz8q=M+63Fq30w)V=Qdo%V4&)%tQb%@<>LZB401i-)g+%^QaP!2^L~0^(
zbCKJKHMIQz(k=B7Yyz6k<-#2xcrWc99GN0=r1MSz;sBPXUX1`hV^O~Ip8xyozsLUn
z7f1lQ_y1bcrfO@8`~QFU|Nn>n{WtIbw?+*cPHtem5RMvnWctsO0U$-G5#}JLs}Zm*
z<?ZwUc#Ix^FVZ<pK$jKzFDDK7mowmB&Vb**8PMMAf3+uiX&XDVUmSdceO`cyg!Jyt
z<Y1LGx1C2&0b_ZzSE!-`wQkQ*=CWu$L}U0Wwr5>P0@CV0F9PNGpSzOwq;lKEg}(6j
zpNrH+<Qq0{=l-_ItWF#5fjxIcG`4h{+l_+wa<D;2L&O>^_}zyGeg`i-Z6NdjziIxw
z(~86Lu@=s9?6!#lNoBZ?oyy_D-j00eX<LxT<^N=3(C6{d*35Ra)za>!IqkB_=+q+7
z7=4H5=yxNBKIl(0M&873b0@;9D0I-Zk+)9u^rOo8@EAU@$1r@lt{D841pFJ(7`${{
zB}9zFrGoO{>p!XvWLN;FgV(OB1ApzImJm@Yo6Q31N8WxQ3baZ^Zj`u35f^0gpgQ2|
z4+N1V1DeMw*eLYV4^BXLWEf+6X8wr^k!@q(ddNGXMnX4&Bnlar8hGiZUYKCdRE`QG
zi={y6@a@OKJ-b7waF6a0D*98($4)_3ZD0?E?>%)rzmc1#)7vW`bt7VgJze@8fuu6z
z=K$D8K+qv(Q0;<3JQ_mF6C!$Q7v^uyN8h^?<8Mnx-@6pUHh>~;T?(O_4&iIh?V<f_
zI?In}Oy{rjbg2a7ISXW4L{|-mI|$ra;$|Y$WcZ{pc<E9At|t460~_IHBCYIN0DDpj
zdBZf(Q3!it1bOSSBy?pPT`5FFe%Qg`<KTa?gA1NOCmO?D6y0?2_Gi_x=iQ0M*axxZ
ziayj1IvMgXd(Z3{g{;42!KU*@paUhW!N`~Hn%pi8?9Yt{+|x313)A^lUBO=P0rXWS
zM_eO9<p2!HrD3R;OY4B3g+-ZEKQ0^iQ1rbUK_51#Hw6Mv^g}nI94Z}=MBlp;6afTX
z2`z`i2Kd^Y5S@xZ6ZqDhScmW_B*>*;T?%{vF`Cj{L5R*eDvalj6#+f~8+7lk2<%x6
zaJv^+ILx!Qv+ZgB1vUGV*2-4{(b&;!ZV$(J0@aZz6sixn_2_$73U;GGn}x4kNl@r4
z4urn&txFjelZo^*>_b;_zzBS(RJLH8$p6xfJZ!N*p8usgc`ljDL51O`t|YOo7jW={
zeCSF})TebW!DXRSb;g2^-N<6~<NTn09MoN~c!=@xKX)nZ#p9w&$^1_}?ZN-U-kY|!
zZC#7P_p9+d`41>lSENl*A~iUXEa%9woaofHd@Q+XukGqWBq*UK0R{jqtEu~c-hcV7
zX-@z+Xmrvewy{WHk87{J_S$QNjd7D0taf4T$=hf1VzA!1Q!r1LnG>Vz^7CMnE<XcL
zisjG>NteYRlgdxTE2l)BaG5-rT*{h%Hhcb=J^yU>{O7=KyX*v<oeLAwYx7R4Myqt7
zQ1Q)+Y3L{Az738kpc=qQeJf5}l{_9t1Eiw(XKI<FQIMZXLHa(aG+SB&pG$uyl^O*p
zZV>u2wT$#@zE3JWj#ba<+uS0&tJ~h(ncm!j>CL0xf$7a};xj}4tFJv*>0?Ix_tnn&
zaxwmUr@eZo|GkaRZ(0A#5fCmL{~c>L{oTcvK{Qa&;9sKgCAu{?z4-#e+e7$`D|zp<
zymwmO>(KIEqi~KR!()RYhtrYa$r##Kp&^Q);Y(54If^%i+Q1MY;o=bXw2phimeocy
z?Qg%{L$Z)XS<bN@&k_^weFM0Lkb+2Xv=8$5qXt#T3yMk(|0NvdGx38i#`YYXbMJO=
z3=>&17?5#1`cF`7aE^Bi9rScy+$^-B&dU^mwIK(^AojwT8giyA5lCa$LW6Vi6-JXl
zbWGu}R{=*ZN4yUya5S_=K^W3x0Qb;7hWDeOpUO!n5I>Kk7dEU&f1@V|!b0QFjznzc
zP-6%5-bZ@sA1Y^)*J+X`-DGgNi16Qa+E%E0_{Dtqw!j{r!umyss^}<#t~-HuiC#KR
zFCD%Yu&4J)@+njf1bf&~43zMtL~?nK8jQT<>2pH|d-Ut5{ttDOQVQ4}<ay9NMF?gM
zatpvJo_Gs6k+eB@LosE52W?y~8veSTpr=Cp^FEXKw$@qeA7iN1CQLl(F>2AE#ILCc
z-wOo0_Y1-9y~<$s^ed;`FEiDe1g(uyvFfAD6L%QERhUU1b|P;H4!p^w&csO!VTdT6
zVLUiK38K{ZC<Y&S?oJJ|UqOd17G&QZ(##<HL}aZX`*I56<C+~k?+K@u;FCO4Aq;eS
z0*os{ryZZ^G9BEtdf3j5ws7=2Z9`?<lHmf#&&X3{w)|h|!u6;4I2&#9zi=@d^cLHT
zWLCZ9KaQTLC*&0Ncqw|)oKUG#s??cXX{A(YWm=_Ht2LpaxYST=8lpO1JaMe5;2;XZ
z0f6;$Y=g0f77F7?`WUV=#`v3`Lcb2nr9%Ci5EP0eH2ByV3_Np6NceU176VK>3sY*d
zZ#qI6&i&HJEnli}tZvOygI1K#3vHrDaL%CzA<zS2-`s##c1(T_z3<V+6SR~7QbR;2
z3pwp17aZ<WMXsc?8h`+YwK#@mA;s`i2bmRL6yBZ&pQ0pHQG%>px1oC&4~R*B!fv1Y
zFSqwz(L!$cy@aR)P&D$eJ4wSZ7k9=K_Uopp_Im%#p{gW(6OTz%b<`bJ1i)HZH4k>*
z{AKq|p)R*SN9{vcko~vCu0_g7RguToTiW+AO94@~%&Pu>_h0Q+)b;-fTn{3`c%b<_
zWM;01&nvoCQrs`!BjEuCVuqi;>d3s#Mnrd3+JMSJqG}7L-BDgFg)x)#gGI4#sjAF}
z5LYKND_`m2s!G43Xz#@leJGbx4&?Kcm9?LzRm3nV$G(h{$_X0J({~<@?8&29mCpuM
z)fFUUEmK7yL|B%K!fJk*=?8lN>z!Hg@F+-s3S@5-Ayq-Aj}~x~Xh@2vfh0h)RS`Qv
z2EaWqyBT1-4!&G*97O-^n-?l?!gJXCfCy*|C_Ahe2E<dDDk$1sAWqlJQUW^xWa%fB
z%_9p#i3uc(iLwcxGf<laC{J5KEaXX&l=FUg0s5Pq1EBy?-5(EtH92Q5Zn|k$HwPuQ
z$c$^}q?pkNBETM)6z4gRV?*vNL9Yj7SI0QUk+MPtIT<=AB%Iir?kKn1eht$=rwiVR
zU^p@l3b1AtOzvCK6^9U4kt?E@&pCZ6P*`YePS=<4&T7WWdtN~T4;?)-j(g9G#D4r&
zNx!7cDj5W7<CEL(0WLalVnKQ`CXSs3!m6KOAncQSl3=e^umD8@gxtQ(B#fFS4V3I)
z40Daq1&Mjk!&06VxHO<$oBv|}$Gun7!0Q*=_|2&aw_Uh!z_x-*orpUu7J>;(ozgqt
zG{$ij^uvaAE^rYU>H(MMBNmS!_}cQH*?A?1O+^Fen$?I%!LW(fNU5eY&{?zUF}aeO
z&zN@6Suyb(cG|)Se3F|A5EFM24vbpZ^sOlpRii$x328L3G)tyNjEiigaKRx8L6F-r
zPo!0xh|gr0ps6feWwS~b3^y#mq*$i39c$z?qv0R{G$xcM;q@N)A~kuVIOp31{N`w!
z`lq30XQyE-Ov!LKjs@#7WxE6$Tk;tZAIDroAqx}*+Q4*t0L~1kUm+l+^3-p){CySb
zu(}AIG88%h<8#mekDmy;$T*K88?^2;a+oO`E{kw!H8g|CR66Q@JZJK!ZcPF4ye_>X
z0TaO)_f(Ukbzmd_{a#TtO2t9p>i;yzHvs}cocxzu7Fz&UjBz1>>nq7MCBuU+sV3Ei
zI0^RfR+c!b8gLZ5UYPi1Y4|khJop%zctRAV31veVzaQ=pmEe0Co#0t)r{M}%YS0TY
z)lJ_YMj7mXG`wMICXm$eOhOO%f?OhJ>7$CTFM7C`?uzk%0y`Wg9ND4CKX<zF6JsPb
zSzHFE15h8hFi3=5F8Q=8MOD+V_X<gAU<7{PRhBO1!oX;y-2i726*Gl#<b4ko7U*6w
zqVx(hVFWKhHT*oXQ(U=V-ACNfhht`42rZ;AD1h7&4?yfKte71*47CM(f7d;=IhYyW
zk1Xk?3CCL54#z?c21$Hk7F4elo=zy6BbE)80(w0(?<oyUpaSry=&{aOkCLEM9bcA2
z*>*6-n>gyNU2<3rT@))?XyQ#8IjsV6r*uV)>HG`gbGcbnEcN9?q7}kQj{+f`F*<AX
zSKv$qy)(W{Vqn#k)_Q9N51-QZ^Jx2JHL6@&Lq@1OPEov0BJ-ZQQ`VY3;_<)=D2^#b
z!qhX{I}6QT`$>}s5ijW-0UIa_&a(;EbJ_13N{GtBG#P9?%o--NZbZ#$46kPm&s`;p
z<q*2D;n&ZIcwwp9PPYa{1L&i+6QsuglpWXsni`{|CZve!9AQvx5R_w}9`6jmM0a>e
zHi8X|0su+F8NBBl3?#|MP;LovW+a8@eQXUJ$rwrha}`86E@9vh?h=B0y$Iurb1o7T
zwOI33bj_VOJk>LQIzXia&)=i@Tf=vTZV{=%Sk6fHZ3^SeRN@t+FrVOnU_OZj`4d|b
zk%V8`I)|*r6U}7xv1j7ubcuIQ`C2zhg_qP~OQgwIou%%8j~oseAHyj<(1IpZ1qjY&
zyu)#mcrXo^@Q{*-@$=I4063p48HRZ8;lN!J7P)k9v(tQePRys`h1rU;&HRVHC>kXM
zOoC9&Lz_RBz!&z&USF<k2)QAtHwIRpKttjrR{MM?Hx)ZByYEq8aq3!4Jsbd5oFE?H
zQ++ZWGDMrzg1m^X`q3arZ6-(Iv2Y78j!`liV<7=xcR=G*7l1uloAF4_aU#vVo^DR4
zj5_S~$wu@a8)xF;+2?Y?(<osu<pK<mG1#>Gri?`s2O#vQGyqSH0OL;xdtWgKQYL5+
zL+_dCe!It#5!JQ>K9Z-93>sP2ctElO8m~v*R1Pz)dtvM?qymt%pfq#Q;?TM>Cp0)W
z{0|~E1zF{D=`7&0@-!HY!uSuR`vdRzJ-F44LKfe^^Avd^Ny?mM<Iou>;3^6oNVQG6
z+-p-ldY8>eU3qTLh@g%_Ek1cr9VFNKximyrdxx*y8SBOAMsHo)nK>v+;)tKZ>b3F(
z1<(B2aX7$Gg2fkDg;<6x>Xu%&@GV}q7$>CZnj%-Fqq}LksaXsuwj$>$Q7&RP!-zJZ
zqC`k_B=DLVif#f9ME@9%w_-!ZLr3J!HN2;38<gTzt>$?mdBzYtwaIt7T2sBRf}LBU
z0(#un7Y|wR6V;uiaU+8(SUDK)bL!vk1^z)a_!Rgv#^n3mE>v5nJ(Y3!&s+X0w0W)h
z(}ugim9z2jKTx&<9lt!6pnS?r3JQF|QgmH_0`~5u{BSKiVkA>=)87-S2@8q@LK#=I
zmzS4ug<z+*2m~n*A!ttL3&F|DV&Na`QPu?iG|?DM3;3y$jIU0xY>)=e3MZ-d!42p<
zl&sjOJ=9PrDG(0lf(Zu;lF;k99VsCd9otMDVkeCyt!NXI24)f7c8A*Zp$;1=0(?m$
zyab2gs4+X?VS!Omf)XppsS-nrEkrT>4Cgr~=s6K#jrNda8THsiI8E_FlOgk!<>|N!
z;0zn{sl#di$wO7Os0!Dcw4^#QTlR7Egnvv^Ov%ovP)j+wE%m^ICweUw8K1PC+G?D$
zU%CY=hx-opMKHv<&Y?zXf8bKO-wM@PXLgw?W&AtTc9Di@b{F9&8YGyey?V%BB+u)-
zI{ONwea^}a))E<mu)#oaJCs-lg*9~54RaMvR92rl_mqtb<<f+87M;VP#Y{P`lw6Ya
zAY|1c`V|~b1u?iTS&8_mqoI?v)0GU2Id+vDOYKwygr_$d(SkljLnXBlH4qS4u}ujy
zC`W@ay;Q<%+TaQmO^{c7s#aT4ffY!NmO48sm2?vMyk3YgHi!T#a|CEw&lQ-2V#nvc
z=n#dDH6_;)yiiGueuDE8Z=)j9)CA5`fdGm9#<T`L3E+@R4uiDi|9r|B)OyMI7>-2E
z6q6jq$^(nWVL?V$9wTgYY)p+Hcz$-3Rx8RezgvXo$z1HKXmcVmztLszw|>d-SFE@6
zKv>_dO4sZgr3*0^fpuBI8`fDu2q`wA%)$_c;sppABKa1D4Qz@Ch@x7nB7y(<)sH?f
zuZX!Siw?k$^W(O>O5UT2eFLV!e-jQv3Q$bAW82(3h)&`p4SNp|A2jdNVpDs?|I`kc
zbp)jH_Xn`^qLdlHNh~EZahK&BZSK#=_8jP1=8i>vkY{b3Ftxot%h&nd?klytF+jAN
zYx<O?&TqANEap>F;`l7be|u2|OL#7~4Czf#UqwG!6B~Q2s<;w<yr%|YQcG4$WF^Jv
z7ke^;mcR*}!ZccKpiz`sS(dli7&gupgRC1xEme~a1j&l!4~pT#b^MI1D$O%D!Y8xD
z=G5S~Gi|+lr>Ffwr9%!JZcmBigTYyFPJNjG<q8RXmh{uMR(6*Nvj?yC4<G2nA5MNc
zZCF8a4%G^6Q%$ZPJlo$rcu<}55_2(yXwPXggt{G92uQ<F>-*tDgT8&yD`ai!4ZS|f
z`c?<bXYpI$kI2xP_Pl8z7F^{caaM8+RZp{}u;Z2DgvB5kGzTc`2v~57S+?eR%k+;f
zY<yIRjUUirqT(=UAS-BrLIHYx&Vk@22_-3}v}7%j9!Vm0ql0rns*ZzHC1Qp}YBFaE
z+*-r(3k0(zfZnEf>Cgjm?T{O#TN5|0<R<3^3<cQ4JrK^<iseSctpE&yaUP)o4%Mx!
zrq*sztr=CWJ>5RoU0<z9g)dEaUvY#VJAzSNH|@N`(buD-1!sC(w`S1vYw2;V(P$Q`
z71MI7kCTd9^4wdM?L^!S{ZxH(c7eq@*GQB+By=IEWrhLy$0HVxn;hCj`i>WLB6qRz
zhKTaYJG(ixW}i@Up`RsSv2XhHrCGe)-v!41eR$`tweP%he=DC^{=X)E%;o!-?*H3)
z)Lw5F{eRawD|i0CxAFNc`~R}lD5{o~N6sa@faPx~;`4OBU*dIH_pCd=^Z&i`|NY<K
z|9gGW>csz-8hlc{rL;$|r;M{Q31H{C1UuG2L=;@#;G}PMz3pmL>FQV2!^NEaWFm4C
zRx&SsSdx0#9(@R5j6-%s&zlKKC~TQzlmv#y#}x966j0iDpEk<7CM6Vs4L@IIv%_L)
zx`6G@x?{2R&;mJ~5)R8?JU7uyCnQYrjycsFI)pIHa6M#fuJBjenm5U9nfxd`j`F5t
zNXCCEYx(;kPad2%J#ykfkviXQ$iVX42;_O@u7#}<n3j#FNnRS0@`t|~qiMFucT=CO
zbSl(hrPO~mP)vGzlBkfQ3K{vZSuGh9ry<M<;UxCMp18<KCc`{MDY>LFbP~!c`}`Y0
zH)-6#IC)l$bhzg5jK1Kr8^=Du6u~|jTi8=BNkcSQAni?(DU<6Qt(-{@<Dj97VPfVy
z0m~S*m5CSmgowKY?nkdqxWu4vkzT+;4;#)pQl!qCSw(8vSwj^Mbe?rl&YNr+HxVh(
zZ-ou6i2Wj`ZMfZ!qCwd6NZQCVl%w34JBJFrmJ_KscW&C5JU=4*B}qs0&oG?}O?N7>
z5Y<qqsELbOC=Tg~u%fV@LQ_2B+d;VnO@Ie#WIWOWJ``|&R<`#ZK;KV;D62{gZ0R@I
zI{LYumvIPl`z1<r%n3p9W>0;3_F$o0%9c3RI9g~6SEx%t4PfdL#x?9QAmHdMn@vyG
z>9PI*E^NsV2G2W2564(}&rIkT^+KQ^0ox1V&<4su08N&)$2A=Xg_sy*D##Hpl*hcf
zGE89|`bk1kE9P_=4s|tP5!_j{8qFz5^i40Am~>48h@J9P5!;%sQfvCForY<Wy*UG)
zT>G3Qrht=~ztCMkNe%haSp8vn-J@&?Gh)BHLDk_~825B<y~K`sfTDZMzutqvYn;GZ
zB8<i+yBjDmtk+IMKy<c9{eiSKG6kWeadt)yv|L53z3Nh?C5j!pJ#teyJ`e4-^q4&w
zvtr4Z#>lE%g~&`GG19U_V-yY$kpZaAM_-Z{vze7QtL#L*3o}*=1mv*fxIaXhp)X{b
z(+%?OY3S6Y*0h_c_Ju_<St3?+ZmAMNOUZLff;%flNk=pw0%4hLL+_&I@;$t@5gKMQ
z6WBgSm`$QxNOv;Ji??dzem!ABS!g}fjHW!3%mH`?lkqn}!~#*7#0cFo##^wV;0gd&
zRpdV0;TcCgZWy<UX}jquYFCk@db$(bRKoW(JPT4$L`9;C)#DQNTSk<}hpif(po5o+
zFCZ2lc)Db|+oo~}VWM7eYUP!svw_BF&P3E0SOzY}u3h<C&BQw074rF+pp388gx%91
zj<TU&xp2PCS8%xS8{sRsX=l&#Biiynz&_<oQlJo9EYTh2<A#3@$l8MJluX8B?uTw5
z2!IocE0T{ZaJ9IX-r!)&W&(CLO#{m>(rP)!AWX!IoI)dA3i1<t3Zel?l<);!)o4`@
zq?Uc{#_6hC7j}UNc}4^X8FG&-%ll%TzW-<JFd7cS9vZKpb$Lo|cGTXm#lgc4Rq)+h
zr>6IY!RKf=9{Rx$?wagHgLWnqm6_DQSp%Cs1275{1z=b}VCHXol{w;L*ccSb1p|-_
zqdZq!h&>L9#G*Ji9FgO$ixy~P83oK`gcIY0_tq+?%YX$hb<6PJ2qm+9HpR*m#VQQ6
z<-bbeMG;3xU>GEL@)eiXi=hOdPnZBqK(oI_T^vr-MOQ0XEn1#TAKDqJV$r}~%v2__
zZ4)f9tT+QULh-d8o#X{;nsbyTG~hrGy$V0zLrrlkoqDafL^Z^-KnGPpq==Yy1!%UB
zYfs!F{Y{h$f;c|vo4YIrVl)6G=|+SmO+sr)7DMx)9Ymdr+h<ovjnJ@_5wT~`aDrRm
z@smC61Bj1sfE&;z+Q!4l4c91G$e*JaH=$2dH4}{D{0PLpCw?FOXgruU;sPNi0+xg}
z4E92}0`x!=A|9w=2bqT}LaRphGRBe3@*Q`)aLrmu^p8p2lgCd~Ah@Vvx_Hdvc!i3y
zMUs-NsIIju6**%WLu9!`1=I@1_#?>@u_n%FPsUIw&cm=Q8R9y0KB@Er>WC7DT|V#(
z5d&)cws6E%#KLDMeJixMYE^<js9kS$D%yOeE;u!cJun%6{zgd7z%?Lc8!cwittFP2
z7G9)p_ZA{GwSzRet`!IbowBGbxzZUs@sNd<-6Iwru(>^4E}Js`3*OzY$4=CvSxb}}
z;B>-ZsKCjxsM+W8OG<TwYpd*Q$@0j=zv4ZHS-yCiYJ<^4IC-K*>Uge<XhKt5B(tKh
zR};rkb_<}`7RW&1ZdRB;rXj&-#K9=>Y$Ndo*SF1~dSsXl@0x^7%Bo-5p<oleB(@!P
zYlL-+_-YYfxuXe;|9j6JT27HSSjjiFD=Sh+?PC~@7ST56GQAAK;FCo4!zN4@Iy45E
zNI<(P7mwjiDse#v718lUvG2*Zj0wjqp`1QBZOdPUG%c6?{TN*}(Ceg)2`#%D6CTjU
z>>;}gLw=l%kDs(3FX12apu-RFM(^u~ulV77%<(grbLKF{R(u~zF2|?Bke%CSUN@gP
zOIX!526=+66))$^Po1|M+ryoeVuwTFyQIAf3dZb)dk+iU`jfhy8a1UPa|awngE~Aa
zKP6GmS79{~4!!Ykcn;hpU>mYQGqh+YD%1~gITVXloD~u7InXwun^xQw3@(Ts$07=2
z;!bhRlvz3ASEs4&lo)omj<&K*zxMa~{T}|WQE&awKv9sRilh8ZH?#?`X?GXk6WRup
zBWoUfex8QmKSSk3nVbM#!hJUEj@k5eoU-Sy_>DL>o@rRkV&Fr{)K!Vua#JFrL?G%D
z^>DB+PvIM#nu@=c;|iHjQK!XWz>#}_gE|R|1c>eVZUp$$v<rQDRALWEEfvNm`RRNV
z=K47Wi6eIlyn;CUTr0Pry?0G8EQ@bM7279qkeS6QD5jjLnmWg^S({BbK40YJDh&X7
zk3K`&28)l+aiy#PU2Gk|=C4S0R8(HkV!)`3LYVY%)Dv~&@DF6Vy~x7sDS*%{v@!K2
zmfOQPD@p**1`SG+ePtfP4m@!=HiGf-0*pj{4f#qZZDdI(=<H;9R-fOQmag77N+Se9
zu4BN$9HCW78l6P3+AQ8Ujxb~x?3ce`_z-rHfWtFK$rlw7af%iKkjUIRHc@trhaEbC
z06OFG$yHj@ltsBY*7QU@R<4j|goj}W@_Mm|59<JolV8)c8>Tlx{45-KS5~D?UaX=j
zRq0U+44=&d+AQCtIKD$xexN8wYeQ8~N{r=(!XPGj<~@qjNc}-t$}!%Yy`sKDscqOj
zQ8G{#CD5)q1H&Z&Rq<H+GAl-1Sq@vtHBMyTl+UR0%0Blr`zVI|7zi?BZ<1UKs}$BE
z`)am7i9tL#IPy@Oe{8AyL>e-KA0>F%3vW$FzmqxnQQw<bPolzBiaM>ZAdyo3xLO>N
zUf_9BYG1H#MwpJS3baAyg=KWBB$dwMdo$FxCTvI3|8BX+q)Ot>n}}K<O}o|~Iz8xx
z>_1K|txnOKzdKG-JX4LWsdVffBzF!RzY_<J)jJ1{|B%lN{|_adzEU64{XbSaD{HGo
z|BvNP=g$A*Ha@>~|Bu6+*Gqd>$pR;Tp&iTjLwkcvcLH(xzH|S$bN~2X;Qnz9$=+S}
z4~#kvJ4w5G7$1|?mHL_}`O~q^ovUbfG+SQaPq5)dmG}@iC2g|b^0(awco{?E43=vp
z=}`IR2L)SyeOC}wt}#=a;%877#hcbvt1MlV*q*9zZhNWFkXWeLy<-8--FsI5x_f2I
zPl4xEetT(;@6U8&W|gs0L_3)Xf&xfHT4iQP0x#}>lbz>|A4O||oNCY9<|Vj18j8f>
zS-C$YilKn$jtHPx8C2e?(wr~CJYuid3S7q)DPpgf6rg_xV$B8&njg&}>|(<(qJjV)
z<=tRJiz>_mH|+`3TugVdrI6Dpuw8B@si-gsKw$TZegQfs02&d+QI0p{UbEDnvw}Xi
zRAHrq<q&6@zP*!-^r5`ap1rolDp4-03q|{&1(7Of+rkvk7=WQseP)6JZGKd^2(vh9
zn&M5FwWwWVd0>AlR)tm$2g?wHE_j?O48bO3$5*fgsKuT##Y>H~nPn8C1n^j$Ne$AP
zlBo&GyS!=}nQ~#W45_q)@r@;n5VJWfU?v*Cc(wryi`yw0J=?hOFa_B#+69IRc4ZIO
z;FLGRE03ww#ze2Yxx}4MBZ=thkUo*CO?RY|{V!Tnls2{eDe}l|yD=qejD28;m17eb
zPwG@Gl4t0(?rw;gfVh&V|CDM*nPrjL<-6rpYkl?4=ry<3FHHj-TWEhiP-!8Egq_3e
zhqPv-qeNWgY3amHnK#z9AXtCz)%LSzZ;rNK{Y_>hax02c>cR=STz2|#0$+RG(<D)r
z(4*6ENNI$~X{l^*RdI%yLkxRR7_EpGrbj8AT@qi;DR`|pQXDC673I-<hCFoG4e~xR
zcEA)6&T-Py3GXbM0mo1;bA1-c{_IA!BC{a&UKF1Yot}<~MAaK}BwKH$>xx;!Cmf_=
z9S=_>|5$8%hDm!TXOlS$S;45INiv4(?Z?!av)Eeo&Vo$bY*EVzS3uud8y%6KthiK`
zAG8;S^-uYY$t&p9S;#F+g(|@^b~{?T;pYUO8$Rok1s{{x3zYAV(!x%|M+vEJ*?r<v
z#V!#K6oQww4#pfb#0#)ZIqC{L4$}!NLWV)Rn@Dp28u7X8=?v3bV7y9M0H2Ix;o!r_
zO*&mJ@{J5&in$dHBV+)CD!?MJR=?%{7^KIr#}>P=0ofgb7lT*_&yAZeV34yG6Xc|P
zp;Jj9+;izV9C&BA@7lXzlK1XhhtoEvGRy45U=>G|_PoWjqiOC;VpPW$7tdi00VX^4
z?@V9%RbDi6&7ka)PR0n%_pA$uiu{RiLipVjvl_xA3V<C5E-GvNo>YDm;<h&B)$gid
z%w~6>amT}I(gkX!Zt>R6^0q$9XCH)?8_`A2HWeMWlDqb+E{qkuw6As~+81V5pLex`
zQE{n-gRwHTSstWxHzT&+Nb))@;9opPojn`b6oV1;`<zvvU_n$A3^d8JK=v#do)C}E
zR}js8SgLsKaM9xIBNzmg0}wXZ>>MM+=j=TO|EO!hg)Trv&k;dSui#H38Ho=qJ7KY4
z*Uk)9LOkm#>jAlj*HLy_uyVKd`lU(rWD^)oRxI|!dVB#(m?-8vcN7-#I2q^46c*_*
znI$FG{ar^pRb+Uk<D<G$>vgbcj3jajF(_#9M(z<c7ox(^l|xQ@%1BmDnv55QOHz~R
z+y^ip7-pF=Tyst+JkK}=c$DcoXzYsivLZgHv*HHuK_5%j(QQ4hWM`}28>Y7Oes0Su
zH{6ATVd4wLrfG&roo<v?SU(r1xHAi@$Pr8-j*)Njh3wJ@Qe4YC0Frpwg`B>Y*mQ9r
z@!7;xEWC7=u<&xOR1@7U8V(aFw-!%{3q^w_2H<@$g30p%S&#PpV^{%F{#<BPU3+7;
z)KtC~&C0hZh-~W15DM3{U8`*fX-xcFMw*4{H*>8N*}Z+Q<VVCvtAIoEu+RsR4bllS
z6|pZSu{p-V(+Yo7V50HF)6gg@AzHr509<6IU3vXv|F))o1vVLY54Jg0oCyD#RQ8&9
zWOY%f5YiNrmKcd>DO^<MERRA_66?r8=~>I7;t`N)=$COgM&r7G{a4xlG5r*wMK)(+
z<03v;kYc(u@^F>wI=Aix>V{={5h=JUamOqGct@TrrT^^+q;PX8oW6m*scw4~5mf<1
zaE$Lp2vcBO-!(CUd_Vg9VLrptH(}6ojlCUKsYzrt?a8L4-K;acqG%f3U_I%a<kNte
zulZ*tfYaJ+5=!hX?Mss4rVer6i~6G8MY<<(90L4#9Oh>sI)z|hd(|wZFF6@RClT?#
zv#yP=)##jSqfV!#eF!R2d$P<nV4>}XPfovLiqB}K<u2MZ-bP_$wOLR?vMD?Ky&b?D
z<|A_sdz*I0gF?rFPjwO7(HKMf1ZZg#-36!&^bC_8V%k)7+w@;NHz5!F`u4%j-X3S9
zX)iaLI+e-boKhZiDL)KW^mg7%s<+bM>j#v;wX{1h=`^FbI~a4Ach6Yx!fza?n-Nl_
zRg|T+JSLb%iIalz2Df)Q9VtQ2H%{pi)xfIhdnI=Y1v;;o&aZ?;w5#k06FQN(Fm@bx
zA5%#K%wwBfJPuEyI2J|&QO|YHbUa3;X(WqT$t#!<-LinNN{3v<JeF;er;<Gu*m|;?
z#GONHAsOcxd3};u@({`!1jW1}O4NEga&xc)|LZVogAjp=QXZ>IudMi_E~&?yvV)$H
zQLj?LioY2%@=8kF^0o(A(zN2nJM*281wQ9<HjgOZWrnDm^u6K)CPxOS3V`7HES^~b
z6(|=F`oxEWbD_0+EObX74J}GkX;3x2tfL+M9*1O%DRX)jl2`yc3Iog!My)g`Vg%+x
zjZA72Kv&6;{o0vmrhRpetu3u`5aX%kondqoTW_wa%BCNn*{&MErzjclo<YR|#x_%-
z<8<VaO!=>fkft)WMXcm!(8rjvgjyg3I3)$|z3|2qrX<0&&TES4Mef76>EWP`@SlIo
zc~BpaZ#PaEtDE3;=+`}6x>522*7c1imZ4vqv4bpS6n)bk8B{%T6|?^k4LO>ysT8V%
z=%XSEP%KC}42ih4X5(Y7LM(w5R3^~O0*k{$k{I|NR4I?~YIG7~*L+qi03jlt3ncc7
z7_;6*xHt;X0lNkq<HlhSVWv=(6{V^CJ|Yd+HVLDT>AJ^T4gMdJRFd<J5tT^tVBl3<
z5uyEgZv9pEK+|o2%v<FwR1FG$3Mjk+DA2WxEf-XhTy)P0PB2`tK4=NPCgCBrBMggs
zvdEcII!HVvge}|?aC;ZjQAGmmaT$Grh!9S2s={){*C&W)P7vFSXVM`uMIN_5&PU^N
z9GT-W@xDFIUdI`7cwlgq@ghmeOeu|k8O}K=n#E+`2!;~G(f8_FVo8%~wPZd##3XI#
zgu22l(3yq)f^jJBQ&wa*WyNFR9i2ZISrGt{6-lYwfv-SMCz4Wi*>>ouJS3tjT?0iW
z*Dy^~3&N%OD$St8sH_!#V<phFRpa}XFEW`MO0q@RZzeldl6nZk#V$sIBFUqp%C@{U
zsR{CKIX7&lgunAW>;&Ue(l6`?j=b4-qJ1N*5M@q5;4Qu20yH(PCm;zY%}Eh;)+H%_
z9C9$Dd_%5L)^!HMl>`H&ro>y#0SZD0zaj-uWdy`wcd;i<SeCIkG)yA^MAzjH0aI13
zM;wkV_g5FA0|q5t_{~e?+|D_E6x|-OQ4%YjJ=6KDM55p-P|)rMm=p{PdYmR7L(Wb$
zN)tSHLM83DgkN$QqHD>fZ-WJQnA}eQCOZilM-TXr3gm1IKB@pM<Ct=I5eI=vc@f7X
zb}TEBB(s%)eX|r|%W>VTM3}7U@{W@PL-PW-k#^I_1VI*zaGK(*aS4U^;*boe1uakD
z#kC|;Bt&lO0Fpt^1YY)><##NYSiMEYafA&FZiRwkSi!O-zL6{XDMllLH7p?{7{Vm@
z>RvH$Jmk>lk_>VCo;&D>d9i*lP$nY<xKq0KUTOHA8nhWPXR-?by;9!}muydwX+CTg
zjLDb5vPa#I1LCeF#W9NC(775f+(GYClrce|a6CD0FmmUWsJ1MRgWh8ApJAG~80m&-
z2c)dprxb0Etjr~PE1V|d0U50EJpf%C0LB#BgOwa1i)aTC7chq4Mp9aB32svRA%{rA
z!%gpKY{G2Qo<rUpEyhVN90cdnW>KOxUN6cx3LehrRd6y07w`Z+Nq|nD4yzP+UP*Q^
zMPbmkb;(*}iI$)hf=3gmZ<dbVI-n5U6B4WsL&JRmegQHAHER`)?3>aFWfeLh^-P5i
z6*UR-$S^qP%ytg?`Kvic{ruIY%Sf@Q8&oh=1T&?<TIaK^86>q*cs5b-#OcQ2!kAyM
z0l8P9sm)0trVf-2PVC4N6YpPhBE4oRrbMSKpsHfNZva)5dd5Xoc}fVx=O%E97;@#q
zWK5m2j)SJN>r6M$B;kgM4?-6d36P-ZmEujGo+}}1(?jZu;&{tek}VHa6it)^0Br{(
zXp-1c6Kv~7kj*q%^XIi$qXeIG=<Pf<$1ew=ZQ6o(6ZlzO{4!>Nyb2wh79*?3LvYt4
zLrJy0Rahz#zBAK9+$6$J8SmlEl}9D%tc}c3xErPLFcNAV?TT&##B)f*6J{OQjtL5?
zPB2K8KORw2#JakcO5Li21Vz<gA*is5BaDO814G_I8y#7UzizAPaCV1uP39PIXNf^W
z#A4d(z+l2S<#I2g!;_HM5X8|wDMiNd6g|wbI>_<<Okn04w6@3cU9~f?8ql~}MY=y&
zi^xl8tj&1wLS8=-N3(Q9;SpYIh>b&2T4b9o4X7ZP5?G;mF1!+Dmyr(Gst!-7IuJmc
zkC$MU4*R0-NH|#%6BQ=w&UMOUNn3=Ib?3^vCm^wb&%~r0x(e9`kNLC~jnSW~Cqdk*
zWMm9J6tGEHU7G?CeWB5LZh+}mDr~iCOh}wgHAGTp7O_obn1X?X_bs->O%2gVL2@mV
zCM?P%9FOtH_69+Eq9`Tre2)80>P;=LMs6IZgLg|Z8+QBajYCgVM7$ACO=_8(Y`2Kk
zswiX98S(Kw!`k`#2W(GLc#bPe7c-axrsefn!%;}h!d`&dW;UayR3>X}^G)x_R(!xg
z`@~Vn?3ZH|o(GD2;!W)h61>{dHKRcG96-$EZj(VpfN~+&5vIV#RYK(f3$AIbN<`@?
z?FpGG08nv50G%N#lN^o=vaBZsGhd3NT>=I?rZ~@@ByNLdU~b3gk?>J2_z}f*ChSG^
z3M(^`<4;jCF7Vo?<D7yD-T<#HO*^cJJky~9=Vo^gpk~JL4^cv*Vk`{?i@h<BxzEKo
zZxfFijOXXW-W_D(-+>AtkuzK36uI1?T>li+bJ#H=AzGZ^E}-&+C>!QTplIlLq!2RH
zHhjFd(e+UIcStZ?atxK2c1l(ydXg&5Gm&G{gXUx=_uw>YRkit>s@juAHTg1W>jlf^
z-*=&hen+8)9^Hi=y3Wsx_&?*`jmQ64X}8zc%kh8i@;~3o=fd%SZa4hT+h^Ah`v)4i
zaO@we<KKATpS!p}cX5BN7Waoy5lH>@2L6EtpTIV%3jA}Gz6zXt4aq?b`>UD8Yfr4u
zKk&QSp~WFV6Y_VW;?U?lkt!&8;9KkYR6F__iTCoPrX_rNQYGW7DIs5NmS?Iii8ofK
zG(M=VVOizZ<}uT+89V*jY(xE;WvO4AVyf?ySMF=NLfKokP{W-;RyhMl7FuI}fLfK)
zEC;W>;E2ejQ`zq+A7}Rx;^G)%Qf*ooqiPKErUWyp6ctShX5>w^yuXHE3zK)G0N+>+
zRK-=WravRNLUF@#c!j{(mWQXM=nCGn=n7i0?0T`GWLHI2@JwU{-;JzL5m=!ZSHV-a
zR!dN)!YYvX)(NUm8B@ViF%{g93Vt!9LJ3?b4XRmQjd*FdBPy7H3S-ku=219>Tt!nr
zNt_C%U}7n_p%m;$3TR*M1*JF&{v2@>ys2>%{3&r1ys9_~*X*A=8O={@%HbmWOfTI6
zPQM9(eGXB$QSGUVjd_+^rKCNpJfbGkBHMej;7Vz`;aU#6vyp2)m)UXo)VyxL*{SPf
zPLR?%Rd~l1NYhLg+45pu#YuMZ`c-I(tG#5s$zHOwvNN4zy(#WpGjM{gP!gd<5fUb!
zY)_+r;Tg^21rK{MN1cz;vc%q!nOyD-UO!5++++!5LPZc^)t)uzLc}L^c%WXjx7ZER
zo|;tSy4~9*W3}cQU5s{|+_LDO1vPpBwI`RJiQ_u`3fhHHh9a#<u@B}wcJDBc{3tVY
ztI5WistNL1QF=6s@Zl*ydKYAitjPbl?H#4ZLCPg<%mXOrQPi{2jEv}A_Ler_Cp-dZ
z6g0S=>j$b*&SFVLH1!~~p9j(Po&p5U1pXVc)pZaTx?-~u!(WJdh-#Hxk&ummy)9)i
znoyJ>5^^uT>17~xbFnv9FDhKW?u~HV6f+%KJZir%12h%m6uIIqDnQbJA!sRXy3V@}
zQGz=sX9(sKm~-<mk7|hC6oE28`>y?chX>QRAmg2v2`F~qc$eWI9pWhWnR&elN+B*L
zhnuXR6@;=kMJxE;IDrP>%Zt;2pOf@sru|qX8~2=7TNO{XDM>Yu?xqfl;+0qwH20u{
zO>SC~x&+xF+$WuUHbAKqq7$AqVZR@BQPbBbnDbrPnQ4k#0vaz;XUC-pF>OvTvollR
zkQYT(DPT$=e9I(O!XbIew~59v*|OcxRhGDBa)qwm*?79*sGzC!)j#_{&Bqxsn}gsS
zhxsW?QBc|Peu6E6YHvgO$wI(Vev{ahtBnG>V^9YYvd8PE!3mNDBs5G#Fi~+2Cl@6t
zI(pcC(SRRIl&E|V1;^1K%Fm~fj+q`&j(5Cwg^*UW!ZjB7?U<$7>awV{ty&3BFlD<3
z9W#TDSX3oPY{^1aP<SciBMZ2kFqPD<XgNXqjNtBZIDt$jDK!CZOTO)Dr`DrZ*aD`{
z(;+$K=oSn8Dn5x>w(E=nP}qjZ8y3kPKX*1GTyaO!<KE4=Ee%*EU$d@db9(=|n-iwI
zH*#!h%Q2<U)@T%wOC5|^S>zCl;`ody=?Tu??l=vD3<Wk`A?}@YXkUtz$-eIKj(q%f
z$j1!|d9uku9_tm6k%b2f)9zZu;&TPsEXqDD%Vl%!yMoXtQ!!d*C^K}f0Q;SidIC~m
zkQ&O^6_oMH9oBQQ=`09%;BGh0PZG)trs#;L0`8GlRtXC@MjRrZp*)&7C)-Mvwqm(V
z2k+C@AH{L+AGFXftTf?_0$QS6xFmK!R;^@-T~sPe=Vq0`vE>gsr--7uo9SAfIgXF{
z!hd>J_|I8XP~Z2QkmG=GcC2nKTCcqCYs^*hFL4m$l(D^H<>L@<@+BlzSq#u)nrJC`
zStCI;)XhZp*2!IwYMsPMS`i_s^5V$E^%D2K5@DVcowOKEsT`fuCE*8=Na?G>E1H~?
zXqW4;2!cKGO2)4H2Mj534XdILnMb-MSO5SXZZ91ilMIJVphjgZs$88dUsFCt5c!Pj
z^mv4$Sy{gCoW;15WoN4!6AC+$#tKrcCBBy>)f}?FAp0VE>&S#}WFJ@WQYWH5ucI4K
z->V9!Z@K2`q>mMm^+~`rBcT4|5c<C*X3Cq7nL4yI9ByV=k}`{H07@S<4<2Q5?nxLD
z7diOg<8(V{&|wKWJqw7gI_y|unT26hX%T1}PJ%y0ok>V3L2a>U+#0vXaVxfUu%Cin
zgS>T`ei*Sb)Ey$r@nrabs+cf0>P9)gtCI3dPS==p2cfb^FA|5V22Yqu9Fz@2iRGI&
zghH95Tq2G_>AqPJNx|m+tVjyplt>Exe32BqsgV>a11X5TZxt=OKo|vYVi<*)Q4|WE
zP(<>26eD1q>p%+gcs6?lhi%Qw>d*<w4*wjFSP}Jd_#Pj7LpN5~dw8FX!c1J2^q7v*
zB<KOr$}cn~%v>L4IYlW@(Hzw6O1Ee+&yxE^Sw-;>3ik3-^^23-uP@92P4Uex($)FA
zv%O01?CW-Ub%}yDbt+MXl1J(cS}?Kv1ulRE=cuCRs_nX3G)<d+lex@&#P<qLu?3%4
z<r1qrV$A`aSz#(X*E^L}#1gzCMSY_L<*4#V)vg}mlIjJnM{3cD^E9*^&$NeMg(s>v
z!xPn?&lA;~#}l<2rnao6oW~nA$aL1PxqMM8xg!BV(W6y-5Uusbn?}jG*f=11mvKOx
zBD$J&Z+AiiQ>nZ+)jA-vC0~Bs5v&4O|AA>R%sq;)PZ}c#qt(UG%5~NdCtu_PZJAqM
z<&}rn6DJ<SLNInX2c?|u>E})L^z-NP^z){B`uWp5{k-`+{jR|a>-L?nexIh`SM<bM
z-&k(nd1C$kKePP5(!ovpe|45u9+mUIudLqrf8ECCx19g|?VA_K-$$b{6UmEvfI$nE
z=hurU{y4Y)7xex6@c+7V0K0PlyN<-~K<cmA|0^9lfo-JyzeXy|32>(HPND}94>>~h
z?kG(@MHutOx{Xm754fzLItL5nC>|xQ{&*Y##|!P_brNolAqF-IGOI2*=nO~b;(+0V
zG5$tK6+Dt29HT6QeZ2<Em`Y=I+6J!*|GQahlp;r*!}^51@zTG0$S^IX{Vx93S^0jw
zm461p^5*%Dhre7k9RTAn0rnS}Wqlja0MYPh`sp~<Vl3d^1$D#E0UAO+@i3=N5-8OI
z(n`P(*x{1k7uR#kM>$cHhIQ>6mkw$TY%~pdFy3}dl_?rXpV)U%o|=fmc>MvQp$9{^
zqhH1xiyfs=e;VYQ(DI*7@=bqZW6OVs53(*wmhsufhj&X$_$U~|y&;7w1wMs`_-qv9
zr~Gr1f1<pKAN+t1ei?_Ul>ZigD~l3(M67A4Wiy6x7N%%xk5B*W13p3J2>yDvLA?R_
za2v8~P&?|ORSA{>Pae0Tng><-l>iXxfi8V1Jdju-2s~hpEqF?bd4;c6-;AXc^V0Ma
z51BhmFfR`zR}pSCwI$|DNsT*^bP4t@Q%O;1o8fQvK(II4>~MZhgDjjPBi3yvsTVMr
zAd;Z+`}rIaQ0AiB@rvy@gPInduM|Y2JSH0kGsE*x+)q|npP<o|$~cHri*wzh0IeTH
zDLOn+tgO#04G&VCTb^Tr_JA=$bDa3fB+EA>>yV7hiQf3fAq8O(SvQHWFdHc58%X;8
znG?zshu4}yx@2U*((zJvskb@$;TO+)=y@j_n7kf7TfPt9y%XQpznv;4UTf)O(yNoD
zNwt<dRm*vI;w_b1JMn%vpU}<^=iZ5WS?U8`ew$6GNHhI5^G;NWQf++s!#TgMXc}H`
zexA_y=4bCjy)0Gbm)vs2OKQ0_3EBYciEmn!Z{YdTq~|9U&rk3Lw`ITJr%TmOPl}7E
z4>cs9%pP0|H&Y~_)U>9a^ovL*)1M<e$>+--b*u@erk4?Fbb>U`=1I<^yE7Eh3QSER
zRU#!Znu8kmnB#Lxq)&rpi70)w%!*zlXBZfdG=-)eOxR$=%T10mrP3au`3BN4SQoen
zNL_mn6jD#v72ztTXAPW#;vyJxhumreIKo5u+M}MDrd=$cM}!J;&}XQ)$b$aG&QUtG
zY>q<gJroori&j7x4bjp;mABaoCFLhfddemU*16J@WJ(lFwP)v^>a&A0g+=G~=&XT(
z1|vFY^28&Nu42bA;v))*n|_wCf>h2_wDQ4)qBUUjq{!Ajtv){W^qgj7<>RQl3{wl+
z1pq4RgF%T&5b*>eViqHd!xs@sO(j9Tea!n)nIJ^N%q!&U8iaicot})lr&IFo(G5r=
zwaKzqf!Dsrm^}j>++e@FPS@(suh726ZPzr?^KU|Uk-*HCC7uGAn`;X-gEN;#Q2!;@
zFP-Rn7ahzgxeDfjiBUs_sx2rm3ezrC(s|a3Sz0ivDpfrN{-XzkYe=b>M!1s7nGBE!
zNw3On?o~%uETZI&%z9!<AQ@=|HsI!%K;f_zHATt%Gy4`u*FC-fded%x9<~c_aS3Jp
zYD?e#unDg)7zDqp-S718cUJDN^zW}6*W81ZPKld2SgC1^UG$5P3m!C;0(&kDqoYwD
ztjMayj4ZM^V(yIMBJ046^2|D_W-k6)>)=(WtPCyF%(!53<|!FHCjw$$%ghrLY>J<;
z3M-Q3Dix1hX(-PFkga{R!r>pj)Kv-2>4uf^>5Dnc0WS+$M;s<~>_!qMb*6%@XIT(X
zOb6=hqE{k2JH}w3fn#7>B}jNI<XLzcz`|eoYEAhP`CoqiIFf`|kC&n+%~By2JIpSp
zB?hyL(g`+4DYCSgS&jr6vx_M?$Lx|yWHGxWS%%J@2+CCF>UAEVu&kt5k_vwD)XC}y
zK(2wxIf#S=g{g^sC6=~ZfR;<$lV~swmMEVWino6VwmRRE3n|k@7ccP%Mt&ANqeg2@
zerjV?t<a4sBj{8sbz9^23PEZx3RTC#h8hn{UdWPCU!!q%F^!VeamsJMOa?@s;E*Os
zzClaW`!8mONR=}hA1{51(s2f(4>w7b5zPaL{scHwcT)m~)2(?cyQ(JRkmnZC+wB*@
zQtnRhmMWP}G?v!vcD_`ceK&KbFipD$pt)1vm-+4yX&8K*e2;KQu^fd!rSbHeeUq5h
zFJDR}u5h)$jzH%el9P@Wc5i?y1zuter_FKl4Hxc9l2jJmV;|?_+C$72Us*hKRv@Du
z>&TpW$#M=)i7{lNyUW$XIpXB3HdnvgJsr`jCG#}1%i>YAsOhtbkHf}~<Eu0Blh}CG
zwqfMelMA!*Z+KRco|aI{H~hTsYnI+uOua9+SB)H3XR?8%pTJ~K;ZpKbT~Q6hS%ABE
z(7%Ux(CZt^Yj;*iSNTk_{|WQ%(zWz~Rz8o`)+X5h(5GPkv$nFj`hWbjYw3N)=YP5V
z&y4jyUSCDV^lE)fxBpshudJ*U)*njW*?-;2XYo2e$TGi(@_azX94Zb5@BqMl<&NVi
zDt6absk}Br%2>~cfg>|~vrSis4f`Cx$8UBH{Jm!z{vY>x8@}LY^ON6heTS#O>eBN1
zQhVKBUft+?x6x_)r04W^Kac!Bde=KyHnSMyal2z*MCk$CmiYBBqN|a9i@)_tj(Z8O
zsZNW3wh#byxW#2Ta7?-=nx5%`@WU>ajB`~^fbB(nbaob1@yWaP2Y+kJUs&uda2PP*
z&1hY=Xpk-DhU&FrS{fK*ILJaO$Sw18Rhk8qR%ui4EDc7g7=Eue3f=J}VEmX{2blXP
zu5&X@stY~GJ+C}rE-B5BP5MWeHN78=hocr8{dESRdik|C*YDsngZ{(SzWZ?z?H;qs
zp93@K|N3gt{<pK-0e0bz{@=pqdP!mh{YQl$VNph*f>6i87R5y8o8na7P1sRVGTuQu
zaS|^o&oRmk_9+VZ))r-OXYZ053P}Q6S35>-=2(~}o#YZ~9(FPHOcz4YVnsV7acp?1
zc<XTQ<?jC5Lnzr^_HcF>jF)|KCA358e~i&r>ohsTgE)#mB_HvHho{6AofS#y|M~?F
z4z`{;3G=uP&l~<@zimzpG$YFEwYTWXx$!;*qOZt?UmzC#yT$l}|LbG41N|Z=MEE(%
z>rCKrm<x;Xf<Fv{7!5c%pyW7?Sw-Vw0A`nxLro5|+G1QY!-B@(Z3$^GWVg7=qBkDK
zxJW|__!ziCxyDmFJa?AX;Ov`zn@4^McsU@+p@w=Kp2^dCO(U><aPpuS!|h@5K>D~w
z69+P*zYHf8=TU$NMc`zFiStwR#zKK9W5P+8E05%SoJp9VH!rMU4rU0R7L%NC2H<g4
zAJ9o^PInP=*}~)j+13AQ$$??-)xK~o0Dy@4)O#f{H;acKYvB6pL%*%x%gi^BT<3K)
zP~k1qhliLp{ch7g1ug&@!>(F_0>3(i@gt6GFr=S$x1ZITr2@Q<X@;eDT}l{%eel>?
zd3WR#`r`ZoNTi&e4PgMhDgnR;77i75VSV9!zR={Z{Dt@Nf;%-tstIK`eE6OxEXJyL
z8&cgzw6L3~0`Z~+Vkj@W6e<!<Sz@!GM+_&5OSzDU?GX*M{LsARmB1=Z@oL?|(I=xY
zrczD6mew?eP_TFh9faphdZ<9a*Bdy5dhJ0_GjO5jk}p6%lz5<6)zg5JhjBDe!zs@Z
z#b)*K3|t=rqWc9*_rKVcu;ZpUcEI_DY_jxOV5YI%3vCf@nH!Y$3ka@;FRijV-{6{q
z4NRO!mqcU|ZF75Y$YA`D@u-KGO{0X<A`SZk3gDDGEyyHfC@q{B8&jn8%El{uR2&Dq
zcU~TnLKGZ#sWz@-C8T%_Dj=nrvyhkS8Z0H;P{l+H%z@eKwQ<bbx~G<V;eNJIYq|q4
zn@ph{*-u;j7my4HD;<z^E`r4y>a0Lgokl&5!Zai;f~RI<#&?p9kEM3){^R?9xW9OR
zv9*Z*-hTqat2uWuX1TWTV3$rPXfCWJy_w$p!n>bNKfHUBet5SVet7r1|KWc2U<>}M
z)!+TS_TfRJwqSCi)=}nbkdKeiC<ewOr}F_hJ=jFr)|}x)l{C$1%$V(j;Vi&#7GOBI
zIM+X%`NvUjEjFIq$QT5-c*$IRBA$yeN`*u$keOy-HxQX~$`<#e@OV_Ap*mN1F8tpP
z_KO@u%|>Du=_cYjnwK2$@r8_DGzy}WIgPC0_Yw`VDlWv(ZEnP5R8Z{@&nm50;BjD0
zL}R0-t2cy+;tbXLbbR73tCkG^5srj|{n~f8>-fxd{~rQ7oSt7=05IeJzr0$^|JYfE
zuXp$V+xWQLPo_k5lz!)gv+>mJy&d4b?xNv^JU;sIUG~AcqRwvOxYz`fl+16n{MyF*
z+^^xc`tf4Wphq9g4F@^E!c`g{8Ih|gpnqzKt5un9&(4!<SbiqAZ0A{@9)0aqyS~qi
z{og}R?yD+*rtklDdwH$s|G)m|(Ov%6TlrkC?5k4$qf8R~XL~z`KABlbY#<5?dSxAu
z!ckHJbvk(4SzBtim*DI2cN;4!8=dcOPz!X;%^@@pRzgmDBIC?%L`W$YxT7DHl8Mb~
zY<VL+(c(z9?6uz0152Mpi&&CZ>H@Q+qLt!KqPYwR{R~$fEj_OnE&%=?2gz|TxNd;|
zw10r&*%~1$S|fU|_ut@?&U)uNuPDF0&YlUQRK!Q@-rs(`cO&S8u{m({fAx=!$flJp
zo@j-txeSv3plv2c(6!kDT6wkL>3KaLwIo&^RY0i%0+B1?F9cxI7tl2t#annQ3v(I~
zqG<hBYCa!*Y4R`|g?kh|Y{|GcPSP;U>rRu_$g*(I2b|m>=D6PJEH|dN#^n-6jLK3R
z5z1~&ZXIel!=QRb&VlpH6OPGUSFFs(XjJbswLAj`QRj}}?)vxpJ^Y_vzu$ukd}GGQ
z;Q|Jv8US%m-|WKb(W?Am4P6#0vf$w!U#h6?zhMisYIvu*ch9*HLutAY!VU4>z4^Mq
zf!`Cba9e;c-9Xx^y^m|tC&%Fq>KNaR@5y*HF|gG$l)kI4fN`}yVEXfWRg0Ajhj2lx
z*PiV@-+Q$S7fVwSd06IYse>{WbSa7-%oiGyWpA%7+kg}i&ON;IMo1-8CAys6yXVww
zH!6S&YfpvLiVFO2Hl}U|d$o`a>rDmW5cLKY1OerOd~QJcT%LtJ0qto(j#&_XxqZ0v
zQvtvLUjQ$+qJCMxcEHoofE_Zm`f?%c#`au<UT7`YLJJq4OnX(^5}N>2t=~U**zoHu
z+L1+3DU9-+YV!ljXWU0bWNjI%v-VC|wKVq#1?S#n)3F44n2IEDmLn~_S6a#cdAoNA
zdsOXVyNgbH21&Jq{#JErUS5fg@j8z=I7)wtPEK#*EER_=^0FWl)+z^LeE0}ZP7a2t
z_@eZH8g3-uulJ3rg=FR|FSpbpB~?k^NZJZ5iXy~0yInkT)Fm<#wH2)c-WKBXto&LO
zvyZTnxf9*gC6Saa)GAsMm6EDWx+zRBK%AvTZ->36&l>M3yHYpz_oaHPf!p$rwes+x
zEgpFd377gc#7R6B6n~;4L&Hpl3s`QUS22FeQj1PVY=h!x1A!WZXczq$_w5s$(%UyL
zq=CF8-8A8=&TO%zCrO25vX&5=l-jkwZ`9xYedEK!hApt}H=re<T763dZbKSh&o#Um
zJwGV-Y#kN~Yt0}~ouy&yYI`o;lR9_G-6%R*ZcR1z$5LxCwB&MPc8iKbsoYCBoX2(e
zFL${DY>`-HeAQxpnZ6pP845XUD!_+I2u>)}tWc^lV}|vG1EPB7*rK222v?m68Mhx5
zRj+Ccu|r*;mv{X5gHh^Plm^FBQ1X>#Qe1NT0LPIqBT_XHVM#7ODeIIgj-1rVn&`-Q
zYZD1)hKudcO&k@>z@exLUkqkYTPLAKWF_>1F@rED1kht#JRkAOHVA-nk#`m*bCJ)U
zndx242Cmv)TUK@Vx&F^g`LEa>T}1{wBmV2^a%a65|8;$>b0`13jnDP+t|+nfPcaQ-
zuWYCJTQt)wN<gnF;M8V-b{X3?P)RW@OHWTMagxLzj=QHE%l`xucpaaUizx=o$8bFX
z(E3m4QXOHEAqvu-j8hpDT=35b#1y0cV?-{!mSA!HCIpK=hrZ6r?XOVKTQV^;YoBef
zhc#ZpmBpfZqT!+*u-ZK&``<%lw@OLeDPIu<nIlhLoPCr@PMaG+3{m%sfB*-iZe+?Z
zld{>V3FtH4ve877RX$mV99D(?ppe5Lgni<xF5h9f5A{Yh4-x*t7La(|Wk%Ft8}NZ;
zU~7P`$DQGdar%v{ko$u2Edt`j3psmn>@Dq^sj2a`Or!1%+?ZG9U0ayj9T|xw4W49O
zJP&&D<%TZnFT<07$WhCGmf)n|3d0&Hj)wy5Bl*u>f6r$WW(9gY#{ep@bJHZt6wDJH
z$reLqogvdjR-G6IhFr?K$>$N4buGCuyHby)A(VxPf&_gfJA2Bp>avK+cU=N#pn3;s
z1_H&bY>}(PRkiSmILub7<=#<<^A<dAu_>$)Gq8LNlNA}kn3(2L;3E=en#%Za7}mQ9
z+X%JBF=i4bJD$cDr@EGxJ7(I_s5aHsqBAM(+#Hb7B5N#_-nBmvgS<d3E);DNZARbJ
zfd9KU88Ve}nl$n_^NlPr)uhF+shbFYKF&szTe0$PYXOT8s&2zcx;3!U_UG0Nswxx)
z$ba?a<=Xee0UZ^Xn~4+oz?Ed&#Z(|If4|-akO5`q_-og_AqzAVXmqCU%?d9uy=`bL
zB?aHY+&r47TcV72zgjvkgKQ*&MQMuKMpTxfEV<_0g0V7=cbp8aY#~d;)fVqgYL5r(
zG`3|sc0j#?eYqt-hVM-afpC+}GY6GwkfGrAUYsnKs+?bG*h)NE?ki75MPg8zm~@Cm
z|GmY-uI|_F8%kr(G|I|?(9Jt~OK?p_r9wsH`vQFV-1~A<Vrp~r)*Ez`k0>x+D)EIC
zlWMtsT<;JHJFc6MBdF=Fi7bNHq&h~Z$T<{5)3(Jvmc&3jn2sy2bQ1DY%t7D>X91i4
zLxUSunzdzZZLRk&!G+kJ5rwqC%(>y2P6$PL#7Gdu@Jli|ZO^om51+~ydM%B5p_SIM
zWzmu<?YQ1jG?1qMF+49A48Ma%AMBF)99AFY5#<-XPn0O9JEBJFrL(n!k9IBHxjGxZ
znAswe4@?BH=Vt-u?*^WV@)e%NB`>TWEGYalOp$Zw2bPbN_|XKs2r7LkftV9}Q<^Zk
z*9@YMA$cm8%NUopx)A^4UzPt2vtyj@+0G0|d>F?OqUkKFG-pi;|B3mIQ%ZG=QexGT
zcBjL6XEP>FmGmaSaoMOyq^RkeYl3V8CQ-l?h=Y)T4B07{>#$*2wT5j+qD{8}4((dr
zG>G2Js-jR@vb|M}KJJmax5=4doBklkEPBi7Vz>M{e}Vl1=eq4;WOISGR}6ltxJLfK
z(6#vk#+{+OftGxM60n7I<He;`D47*$u=wMRbR3|fLn$_baTu``ghCIKeKseIMd$0o
zynCk!T}&nC?>H--cSQ!yblSpU!a@*9WM)uhmz;DyTEb^lbmCc~@D^@9(oum(SWD5=
z3&>Q{UF?VL;&L09iuWcE!m#P{F{9jyFkd@RM2-~9-4q)*#)xG^vN<}$ASoQEk;=gS
z?;>;*G%Dv&b>>>zLDbwA+!0VQ(YI*n9mAtVgxEo^$v&Te4BGKjr;tRaOl-s5RZ86s
z2$6?r+*Hjq3fo3`aFiFF-xJ}ux$Pvw{2lBl9_g*@DczOxQb@ZXqrwi}R<l>z0QUN~
zRm+FdB58{2Uja{x4bTCj4@I>|fEZ^epv;RaQZMh(29BDWnF97oaLweNt(`1}f>%1*
zY-2;)IuSn=$Cj+-v|5^KO~=0(+p$G^kQpH#<wP7^x1tpp3rTb^L37y4T9@Cg#B>EE
zoLAUD>{xJ|q$M=?+D9FNh6HdJJMtK~-6p$%@z^woa2H7)>;Blqwu>&bOq{DxVtc*p
zR&rEM`|KWDZFe#y-Liwt3d=ENa434_s;chrE4E7jvmRY-w{R1dnw*cD_65%x2e}ba
z8oA4;XRV#e0sY&;?%OzaMEW|2C~mloprsX&0Z(9@CXJ=ys_yhQRcch`u!fwnJ<Vf2
zgD4>A=Suopu)DCyMji}D?_iQeX;7K8pk!`CL_xR+(~8otW;CnUbe@Jy;fYO~OSv=Q
z3NLb3#)u$tP1mnqXtY00Z%;Oa)On`60Gj=gzLemp?B$y#<2dg$B|w@W?`QNw!lvt$
zw}5^{3oX)BXQACv&I;3yNzK{FD{{FLmIBnvA{a}ZpqpqIp}dC7#|WJRD!?#dgbD}U
zY1;Vgwtp6U49BC&9<-)A7c;d|e`@<{*keZe9H~56N;Ro<yj_e(YU#L~vnms(Xl)e1
ziwa#5JlCSW1Qp9?5!!?iVMkjkg<2_#9Z8O(^1tYnD0WALS_@*zt3oHnRe*L0NL0_=
zI!_9I^C$<(LzJ>Yy%UaKO_l{hr!y<KK;l|mi|@NYm6<9y_q(Uc27zuX6vqhe6BH;L
zty)bUdkYlmux}ck))?i6=sV2j=net4^vL+mqWN0+N3okznw91!4Cj!s8gCeKT6&qW
zqybeZp{0h%hEPaxW{8lNL`;#ps01KDiFG6-TOtssj-6lznwH7da%abj>K+ExR5Xm7
zsgNE!q)cBkMx^S`9+AVMm&P+n1`)7P=YEi3Cgjl|=(6z#2HP@*1Q?8=H&6%#Ff$B+
zaHz;Yb0l?}$CMaW$=M`QNg{aE91vC2v*bzg`0<4^O}y%MM=gr6%{*Cm^egi;Uuv}U
z*x{ly`9yh?m5&JC-DN0EDpXk9N=B&=&7-v8RIsZmDpFRz>w?9Da{_@ZQhjaWq02j3
zQif1LM`|(Hw(3)rrN8#RjX4gyT^2tSo*ot9T%Zt&ixsg-aqGTQ;P~}Rp^iNQ{pO3U
z*_8E}I2c{xrib&zWr!`Fl2mx*W3R-d+Zw+)c}j=JPi)@uYg;AWeQxVB!~Qo+1~(u7
zyS?5n#(!Av+{J&rmCyBF?JDCx1U+K9QTLei+3Ro^q#rS4+|`3W2!fgb;I|n1VU7sj
zv!a6&9N;|$Y@89Z+b*0!aiZ@!%wkS&DCTyI0qh3RKf^lLm>zAMqiRnHK;D$*FA$0R
zE++Ty<}-u-1HXM1q`j-10W;|T>T)Un1H8SX|F`l{iS^I`rXPHQKWK<Nh>p`BJ-<+-
z>Z$RH8yAd9eUT{CH9Lw}4ZmXWX$y1x#}QsPHxks{Y$W*oiQj6qq+){k=AyjbHfHn2
zKQr-3f=vdiB)~@31F<~H`TCuZeNe&TjpS<mgiM-KH#nlG&?^)s0&X(7DCv%&F|9l9
zEU$iNX(yvkD!_uPd@5-asE8?9)U;NsIbj0E7NiuOfI3f7v0fzwSn1-7LobT=@q;Z_
zK1ap%<m<A?MJPdOK91vX&=kLdfGqdOq${NWkx|qCG$Ax3O0a?v+8--i;bhe+`<S(6
zM@{@cAyLy$SOb_ymQ34m{1e7<V7Kax!e8YSosnEwn$oVL%6mJj8R;4u#gT&#%}21#
zzK-+rE!C<OhFaYL<qela<FkY^x7Fch3)>HaU)ETlSy}!VCslh;let%x!9;jrTwm!l
z^w1S4Q1+%WPBH95D}+o`kO*;HF-xjNjm!-8Jwe-OYsU;+WTZ+#R*=_l8Ls16ik2)g
zG}gIecCk--mnk?+%oW4D07O8qFq1Sor2R#+#jwz@nLECkiV+oa$2!wyUM#9q;r33b
zsKN?>Y%Cgffl?-5((_|GJwsuu+7Xyen)=*u#Sc+trP9Ra%Eh$reqk6vKM#2p3UQ@p
zAeJcfMoNR|t)*O3Cq+wz3rk}um7sBA8Kr<NX<jQOik9yeo2c=C@^Ca#0sn<Q7WUA8
zXn@<h&(zNh{vX({8<+n)dbH9h$$wTJ-SPjo@wr}!$n^N1B-mjt8uRsDUHBu|$$>vt
zzl!u{rbqbn3_fyes4UXAO3V(NIZ@Ii?D8<+qn85Ipdc;_;T-Q}oB{fDJPcx^Fvaqg
zPjl1_Ne7piK!BvGsd@MCg!iBL>ylvN-aU$D=r5ta`MrBoYzW25<=lc?@)S#|qOhQ<
zs4m-CrJq!|S0grQI2__L3I@pk(m&A1fE_CfF;Cni5BJwv%l-QqaJX61A7HpM%Z{#G
zwquno-bYFRK0eRGdBK~ZxbD~m?^6cvF~Fj|Y@mVRvyTB5_)LNL&rb!$#lpqXT>Rxz
z1?W=wQU$K@<I}0oo&c~%2(S)9?3kddprw*9mlK3{$7zb39$NB*k{VkR5KrAthe3o%
zqK+sn{QXQ>ruUlu{cI^ymJK5`<h$R&1->sP)Kpe#*QB{{5R5RVJvQdgY%Wvfi|ks>
z%JC75Pr~|1l4J0*0bb^DdG+F^oHPjD1DL4*ZzCu}vS0f0WJ`%V?o~tAf<n`v5H#9o
z`sO$G)o9|9wU?J4z}qE!+%#Ldj=vYN+7gwOEikE94Xk3H*hQgN(+N#d1rt<Az!zL~
z9iS}KnDU(xRLKe)b&uH(EDJvIC8!r=AF=YsD3&}aBg_`f=Ix4qS;&0YZezR&27>`v
zZG@lcc(H6-5W})MFAT1q)^Mj*oF&)zKw>r}#*d@uB;P$9t2`CL<ST5UpdJ||wKs7O
zOrr#$ihkKF!77dhLfA>A8F`-M7}JF4jzVIm438cEeW(_85UOFr`(lGA)CprU6QT*w
z1vrDRuyRgW7#2_Ai4Uw}wSg&X2*Nbo;2c)9_b7aruvsd6cy;yuV4R)SOV=TD8?r68
zWF{nLQubyS8&N|AldbAYDdZ7?B`H-81xZ87YDo7k+}MQQ#1tT_<0J;cr?h{@hE{MY
zGv7_~<o{aCTP6&`_zRH|C&8H6$~rvV>AM=);l}wQEdNP<TKiDgoQmY)_N3%oCS4qj
z9YaMV-DKd5|M(o=Va!LY;%uwnlcjjlIwNWsrF2GjB+He=aC0SzuHO&C9_`@>!`<ZM
z`kP63hn_MVvU7-4^u|gq-tsP>VR5mz3D__rg`EGZK)R_EVbq&~`@h}9ZVq;36em)U
z$)6M2{mH=Ye<fI>AOxuIStx$bD8eTR{&6H@#;&65q6;%&DI`Xo6;qT)&e8qM8kmO|
z-vhTsRCDYNS)`4UbXZOk`tBav$QLpnHKuN4ibm>YOQc7%bID5>z!s60)@e9SBOsYw
zl5`~lbUUC>flyD0e-Wid32=r(8V$qSh?QZHYfDRjGc?38P7QuyFw`-P^4`>JbtZBw
z-8sIPfV)m6Gd<T6vg71c3nSERU>qvi^?*JAJ6a~P-OK#PXesr?fdqDnPi>s+v-2aF
zRUz&GeL#Z0s7!$P048^KT+<X!57z}MGDud+H<cUD-3f%%_aug7WiGt}nKBiW`UuE)
zjIP{Vn}BR*dQ(6`-b>waFO)*{o=)NDrchOPS^qKGWar@`W=-|qJtm+m;$l4cK!?yh
zTU~_%N076*07ZR$*OBNm^WFbv$bSZ-tBZeT#s6DhT`R`_TVH*2C;z#X&-KbgP@?nt
znV*eEq#aWVpcjDGgCIT`1H!vfpFBwhAEUhGNPK|0^!%se^d!tk6!bFbMSW!Rfeu;X
zAP&>Or6aOAhSMbF9vm?dBQZ&d+Ln~4?JqytSYF*&UA;jm(c<E}cb;OAF@hI6p2g=r
zu@k8A+VI~z-|^e+N8fuNKDcUf11OjvatNWi1V@Q2>xmLA2P#H1OftJ*l3BJ#xuem?
z-zL!EtV}R7<z5rzQH4A%gOSLnRD3<e9F-hpt-a<Q?7sQS?i+NP$dI6h@uzx?pB=s0
ze!0so#@4%?{g<!b9`3#|FKaX+R94lz*KhV-9TuCDhf<nOf-tR>V(%%vmu?PqU*w=;
z9d#0uonN$6<`N#TRZO(UQp`?iVzY7|ZFMiYo9i1Q+?g>Rx6yTxuI*zkjMm3oDb~sE
z&W@rjT~eE<;B_x+=r&Fd6W{@?q1M?Oy&J?uuW0&Lrt_#%4E4cs7htHY8`CHZTy+<Y
z+f77JGG<mEdi&8))UFiumAX%C6v~ns+gda|;>r+QSiAZHYtPhte^_whl?hcEHkip4
zV_MNs&JO$b^>Q5NkqzP}{-YJsoei;%%-&j|oTo!occUO$;o$5>cT^2xPmGKBua4aa
zbWYQ;wbqKiyy7qV2Z((@>Bgam^y=9u0bb_t5Q*eNA(r+J{w}5dg^m5o{~v1SU;e>s
z_~!*M)%fSR|E~+RwIfl*DL3+>zao$K(Yp#Bx8d1qCIB+-Sb5h#A>xJ;E{eIc-=YZ<
z7NEP`Kayh+|7JA5JuAjSRUt~0oB$O@uPHn;2YATQ2Bte1#hSu~piX8*pTY*IvWQLb
znQBt`QfF|vZ_y|)kZKxcBRFY7xsz-k?Ck9!jSqvNIB@mCteZy1a={td5NN4ZqymZ#
zq8Lsu!A=e-rhT&s@3WTg?;?!E;+H(bupQWnQ8&Pt6*PDr2`r-W4#y)r=%W2ii#z4o
z!{D3(S6~xZ6xnaC`_o}nT@O%j)n8t%M8QE4pIjURS8oUdSMM<JKN16hm($m2v49G?
zc)1*eJ@T0=vKMLC{d9!E*}BY8@N1ODP>zEZ5@}@sNY0M<kf=Ay3b6C~GKC$Wpcgfc
z6Jdq!DUIWV22!)*1tZAB+-CZ4v1oa?ndBgm@si!3J3eRRRGRWxS)(O;pjl(&tszo5
ze7x4`_{$yG5^rR(fkq<0UXO1l6Zffk`7dn6Y<1e+^VKYD?2dV(_IBmY)+2kP{m}y2
zq!eMA5Np7fpFothJ|`fOJn={g7*(a6UJ#OWDf3SN4zVtTO(@GG^v0!#h1!GE+CeR8
z=#ci6RHi^gvPUV399E3O&p8f?FrvQRXqnk;_j78UX2F0#H*hk$q7BPPHbmbL)Qloo
zC@i|Pl)#S4S;s@_K$;%RcpJEsEF#b4LPeo6TrufOI~0fLILb4s8;2*s9Chig#wNbp
zio|VdRqh8`R@@OyUSULbUg|CRi(EcmH_V>NQ_GN4l&9}I_p|ry<(k#d)E!o}tt=G}
zmMCvBmio#js&Uw7n+O%if>1e9T)@-y;*Kj6n7VDIZoVB#ZYSsLD@4vYHsWPBB_6o1
zN?QBUY~4yYZ5kMD!m4TW<}q&=(~raQ@u!sEp?zFQE9SI<&8yBTIha`8S2j4{EzONb
zsv*LOKq9_#bVi<vG#1Nb^5U>%(?VToiA@NR4nftuT;;f8)v0x+*1G*|%#{S>D>+jH
z3?ngUIu)Hnxy6pSWl7hB*Jm0T^9ZK_VIfD3W==)gvWJY@yRfH6X@X{`6y*q)A?bF<
zDS~61p`I8GJ5y_V1%lObSCxofO`}hZX+>5br-wVQ-H=70HC#LdFxs~-dbq3#^e~To
zR2X9b0P8gsM=_GLbsUBmq81JDQ#4wziI*mM)-qxNK`V}g66Ds@Y0ZyAgj6Qf5TG#{
zggL>rbOKeA><RGB`8*gU5%Gqavap@3CM$AzRAj||dpVl2a-%e5Wp0|{%yTk9shIHL
zsRajOMimo^=hJt%#vDeEvKj!!RL}@@oK{l`Y*X0wN;=WxQxL<bIOu|rF-)4f?jQ_O
zK4F$CD2tf_S5d^NL_2ywJE%V5t!}-7mKZ7`ZSh>CZ$n%rv@(Ip7^-5^8Z&&Pe8|U*
zQuLaq%*KTc%D**7rlt+k(aJ<UfHDzC`M%VXuy05bq$$-qnh}_0S&dKhk;p+d3cDmT
zZyGkuqF6R#H6PuYNU@4DB*+NcM_JgCX(WtBtD3kH3A4s>n<T7~3q0+m%md2OO=sS$
zLJk8*wqW>$Y{AOR+bQPCNolr|ShuRdNq5&h!1DO)ql^aV-WVqi5K)On*FSA4`z+CI
zjQgJQ{b4IPe_6RNz`N!U)+;!nTm`2ac&Dg;*Z#g^^5TvAwqQ3?6QyjP_JpCJ7AaFd
zTl@!&v9x?u-fM_Zxh;Pg0ig#tjIyD)Nm4zXVxzEJVr&(Pz2g|IM2l!y1YmK+O(tCE
zS;vTb_f7{~qvbg2^>td=+E2AsOD+kR=u+7x13e_oe7m{QZnRo8zK6&M%|H`^Lv81B
z)hQAW*8gv}K7vgue*b-`qNxu=T|{EF7j6qEm#Xg8ZGrDS#{p0|^nyI0w)UVcZ6by7
zcjA0nGpa2v3E&-!hj?p1E~CECUmyt@u1f8tJIEny6BuN>^WBu@*~VbNF{oIM(Ic_j
ze<|R<nh3o1#Q7tZ$!RRn0Eo+g)?Qx@kXo{cZ5+C7<WWAr;XInSmc9ht%q0nfEJ%G}
zWI^v|ds)t+9vpKRSAL~4y;UjMSC&o9L32cnqDZpVheqkNnz6oxM)`7%OTn$yb%0AF
z|D(J*wZY{&pk}dta>@FD94Mk0Q6r<v4nijCFDmtI<{viw7uaTcX~^Zkd`QFC(A&#3
z^fn%#%~##<K8z_}jKDPxQ_d&xDM-)p{5D*m(q4zZkPUA+F%T538}3JfX;EqXSLymp
zPT12{e~=_;y=1uiz;7=vFQc7p_)FtHeixFgETRw&M|gwCgc=`5aX@Odg~0+wg~B+g
z_^VI9Mp$ei;qMd$WJKQ;VBtYZ4+f@%)I3eB+E!(5-{TB-gAv6w`;|4sU)WM#mS42S
zL@qo!-X|xcHA-<y`N$86XE6C`r6fD6Q>I1BDVkrhOSF!25*nqskS?nad}1{~#gRDK
zO`N(qQDuonRcq-nC;B#y`1t%tcmQB3vM~Huufg<dbY!292}@2<QT~a8(M2*eg_w-R
zCy9<G$akNluSl__RTo<V8E!8oiv@MO)~6dj5S|u{AKV1fQ_LAOsVm7ObQ^dGCmaL~
z_e{ebc{FmzohQ-AbfgQb37SL042Di0-6|b4PD#N6df@`%#p^e355$~<!C>Cui%PQ*
zUBj;haT1>olQBB3xT6@11O*GiTDYy=UumuM?k{2;0!`D*u(4^-Z%Em|tj+&UVKY7Z
zKsn+E3udV}YGK91`3)3T09Ritpm)?fYIgHMKQ06;V61OFcz1v4{`>bIFx5R_PN6LJ
z%8$qdG#V%_Lm6#$87$sCzX+M103`3@9s2jb>EGA%@BLOgqc3mi-&gc+t%)s|Nzmfa
zJn4l@9H}`jlQxc$;C#fh&^Lf`Q`U+f*xzX)jZNmTV%Xye5Z#gNL3pXq91|KykIa{d
z{jJPZ{<d2F!i$9#p<%1F04Ldk@b^}IVJ0Wl--G&Y{&=_E#CDNGoY?Bi1&14R>S*?}
z*f8NI9S;&Ond%USHnF3_>W;XQ;{S>r**zgn$*+O)tH02&he0e|!(8FYL-~0EB%54S
zh9Orlxy}}>iS+0>V+)LCeXXG+l|&9%kHfcbbt$v-KGJ|_ZS0DUSY6k*c2IZNt5gKR
zUD^;B+$Of~4%z=tAUcjTLUqybCXPx~v1J6@fm_EgUxjJ(CQoAprqOe!;T*8@Orcjj
z1tTx@%OV7)lLnvB#x_e~fIQhWw`duSQ{5v&I+4l(y9A32JjAa!*sUh5_?GCL|F!U7
zp(%uZ3()#s3mN>zU@2Q)5Gy>YI)#a%c(Hhjj>M|`t8xaThJA#25^Y`Y`H?I$onA0e
zATOL%HIvwNeD1BVVH*Ef6>3l^fhl^DcJF8YeZm<g?xU90reb^=n$oC+;H5{v#kp);
zg``KBQq&#<wMGRh7)-zhc;&ygwf6OYX4wD#a`X28%N_Vxvj1OSzO(<ojnCqBeyZa?
zz`pu~S#Z&$I2K>s{}}_h>n)Ns4Bq>$9t+|ZW8}YvHvX$i%j-++M}DWhvAVv|>D+iE
zh*_aNr-ca>5S2WMq$;P6FT@5#I=2YSFS;9Xi7kF$7$g-=UE+cIr2wI};rcHl^*)U8
zW>T;H!izLgi&V3VOO{QlK*6Xd6<5oz{QfwasCfSAp){fYCN;`#P41+QOOu*ov`xRp
zB9$8$w>wy?EVbJUCjrn3+Is15tkT(CJl4C<)ju=N|2Mna&tC3cv5y(&|JwS>YVrK<
zz@xkK{}w)EV9|pUsY`MYF)GQ}w1xEQ@P3GylgC-uAET{xKxQKzAJSQiZ8WI-gD88T
zod3ce8-M#bx?7`XYgr0<m`0y4xasr5*D4C0N3F4sn2!PMNcWlXWfS=EGzvdaj0?K>
z9b!%89^dlz@{B!mVXTzj4<odq(>|7c`|LH1lHCR+6h{KL{5bUb$r!D@a+&0y>F@c-
z`iDJEGfv)6GAIR<U@$~YT+;7HU7Q4*W&U_XZv0LEJj@$1|6bJ1C(QpDys{=9T4kj(
z5)La<b#fesn>t7KQx>$I^0M@w?d=?DXmDN~xc?!nUW}uE`agwn8o{;6e;%ETLs;@&
z(qeF902a)9&nZB}ghY-Rvh`(eFb)cg2gfiP1gR(SZ+|+3MIg=uSA$DMVb)|wbpc(D
z344U~!>L5Ehh|Hf;`jl&9<VhBAQbvPlKWZmQ8EYl>bS%e^e9JRGS;pJ6jTXD(}#(r
z7&A3j5rq*EB5^|yKhR2fJbJB)L9&W{Oba4a%J^tmFe}+1dAde`P0Ggm8QWo-6(Jx{
z+Hq1zQaCgy@HUP<d&8i6iguqZG^wNwH3r~k=h(925&H+<KM2`SfMMcwRo=#&Mx4@+
z#kflazA<}TfN{LOisk4#^UiFc!145H_8DiN&7=5S@$(rk>L^U{YVJP`vT%L1=@r>|
z8V#^Ii%Eac3ivNLg?N_9FqGSS#hTb#K1_u&4ETDX?-%e0w*{{R4-TN5v2ogSK}?TP
zlxbRGmJw=dQ%@Qu_X!P?1=)YY+2Ez)*!R49RWADEm0$4D_dGk|9fdN&vfOZ8;wfMh
zg^i^pWZ^Ls0eo#>jwD)AWw>Rjyu_AGO_|(K7>9VCp6SnyRb_`BYKqC9N=K?{ggp<A
zdA~O%cVG2X)`k*%Ee>G<fHl@4ElTb$Ahz_5%;bQ(#N8{)1plX`4`d4z(rz4%yQiuG
z1<{pFh0CQ$r9=)dU<7uk^Ae(bw`XT3)IA1bu!wGnXarfRWM@0|th_}?LG|rZ=#P*e
zXlH@pfNJLqN47xp2VYn*#ux0V+Jxs`q4vFd7$D@Q!<R37Qe@L>v_g?!5)PWHCC`A0
z;{2!@p%R&&@*<GsM4Ehr`w{md6hz20UBRs}jOg_I?_d~({{Icm;IRJ~H9b5NY2%=!
zUO(tYFaiubtmvA)n+ti=^akE|%D10-#sdWXXz38adpjZ|`jSzKX+C`;Wi{@dCFw`r
zX+G>U*=Plj`R^9v5B{%@F(k$p|A|DV@jS`s$b?SC9_LjEe3k|F1v0)s=B0A2_wfAS
z40c$1VKH9tGdP+6`EU|2maH;AZqwt~JQ}sKrZ1M_FW>I`1fYXirhj03wqwxGz-K9{
zV)NQK?YuFEswDBvkT|jkL5I+$wMhYG`sk1ccmR+I;xHL!uns(aXJVMVP1e)X16wR^
zw3h!jgc$}h9LG(L1;(d~9Iu6_``;~px4Z!u{Q0~EM0R7P-TBTZ@(7#<9Y%y}S^y%0
zr}GhAow2$Ku}|V|Z$US<fZLBsVXHzt#&C?bx-=2`dTK#2Hbh^W>*BGiz0`?q)L9JS
z$mrqOo#iRTsFO_{enuNuYcmjA#sTao=up!42<|vEy%~5T5ccC~4=lp?Gpn^?z{jq?
zf8hTWrto8u0MQ?JKQ=v*bG2^eYChxsr<nIE^)dba*KW5<@n0S-uiVLhZ{>5nl2E+U
zA=7om05DU;yb2*Xn#=kv$NatioXaneZ4;qzPfNV7vy<wuFe>A!mPaem=hqDmGdtRG
zA$&~EQIfBJVO|UCMJ^x#u-Z4WENC!lbmjO<t=D;O*%{$4PX)zU|6a=Mzdm~N=6~Qx
z+dTN09(2ruXWNI{sCqR|ws-!F>R0n%_syGqjEJ*l9__vQ3tA=Cpna61|IB}|E&K~D
z;2)}2`*IV&4+w!ML@b`xI<xGJEP}TGgxPB8I5K-CR37`THwEMk3Jb>q3HYWQ@8K)y
zEX<=yCx@SJr59MEIx%=AsC07H^iQLcQ+$9KcFBAd+TwCezq7Uug|P&@<cB_{hdOI4
z!K<oKLMPm0lZsUi1a8eo`>*Rg+)cJ3CP6g}A~wIm1kMkj8~>s6u;av_Nk+;g`8u({
zAY2d!gYyg+##=(TYy{UV+M)_RvQ`Xy7d|Uh@LAPW#LU66%8(*!2Ek;Zl|e)0TG6g9
z45!N)$P0{Sn4Ng{(CiSu6|4@Wa1G53-vb9&bH-RO{opKAG=TeX{!{#Q7UM$0jT=G-
zj#z@)Lb#sZEDGc%5~<l6EcL<+-wY~_nt;p3cDneDQ%I3K)KnY<nTbwqnK@HjRIXba
zM(ou_mOs`K$Cc5d#yuT_YpyV4(2gB?%;d8Y6)DMp$q5A|aU+Vl6^1B?x~B)pp{43Y
z`(gbaLy2QQmf4<_{hee$Bi_&$07Kl1vEmYOrO>gKNCR%sTYX)&W;$XfND%S_w-gP5
zo|BmoK=bcQ_^--A$2Bkj>o^XxZZHb#_)HTqO6G*?b5Fvc-Mc3qcVe1E=1+N2$D;^q
zLfhmCS!*<XYY}-I9HZ;rJ;9PPez4h-GIc`GySb!gIO-d^H{9cpI@F{u(4jT?x0O&1
zU#Ln?fN!{mqc4m?FG!HVLPqG3ky*E9cTKnjSyN1UM0RZD37I5gDqJ9Hv8^=|ZMX>z
zj8@S`H6D)#gSu`*Ts%n*LE~Yp$-H|N`NgPDqC;E?;4Wm*J>l-jRNxhWOtDwZ5^XgL
zq04V=DUJ=6eH?Q}CX{i}TM9<oC5FKo6S^Q+V<&AyhIt{(InvZ;L+QA&8j|pLjF%{=
zqcF9)1o}_%p|nL*=Alkcpr(KT<{W`;&^w_?R9nBWgWRDlWnlK~F>bfaAK=Q6ws8&a
z3M{@B-+0L<VvJy^SN}1UEQRi~cUIl7MHPVsE!tHPbr7c)M}xvEIkno8W=1X|$^~06
zr@RA~DN4IggesCi14k$|XveE9&p{5YJzg)3u4<1LH#s&lb${C%oT3bxXz{{*$aZ8`
zCSS$3#4AhFB8{~rG1fFusp$rX9!Q0Q(Fyh~M~{0#IdQIK0J1t(sk~)Hf~L+a7a@7I
zKzmD<gzvS5T1888f~wkbf?8;hSGzS+SZpVW1P3*rFh{cXbt9ZxG>mTQb)l~X_CXDU
z!cPNQbb*D+g-bdKE%=q}jZGW4)3t{dJ?2C@e8*>dUd5}qz1zui%)nIOY`CR=ZE4rt
zr}&v7|9!Eyv-|4cs>VP6XAb+{N5%YaYioD$zi;PbB(b#U{vhgxaTa<z$>=<Vi+%3@
ze`HO&2>+}*l3DLHMls3AXasJ|r(qf%pQG+PChnn+v02cgiehp%+4}b!EeA4GzZ~bB
zy~q!|E_B6uMpRlR{rn8A4oJtUIL96^V%@RP-mvLJ9naO;fz$vFnRM@XZ4=`M^@=!7
zv<gW>q+*h^HHy1~aZjb6!q<an7;z7zi>LW#qRqvt*65rhHc=n{hBU3w_;>)A(L_BN
zG<`hI(XtXB5*(YTi(5)Chwos(*^0DIRgI1nh?LtD0GbPksNb_wj(O+lnUHKEjiF06
zCFx;O3F`45k{p(z@=$~u2_DmnILtU(v;@cOu&$ODc)qBs%ttV=iCI;71$fV9HViN_
z2=W4JIw^KfLefaWMUx`0FwGY9|I@C2u>bt<=j}JU{@#KA`py1d_MYuN^K07&@EZ>1
zpZ5-b+JAfKLy0%ruMYp_??3mqU;WMh^WLjxO@H^Vuixw*9QgZhyuFvNU+nF|v%Ob4
zFWx@ed-bFL6zaX&KlEShz1%y5Mi2LW>`<E8+daU>Uhclx`3Zh*Kizw=clfua_k8d0
z6}I_&|Bb)xzutaxxVQ86#r7Nj_1ibE_YZcV`)APXtG!px-#{<BFLz%ZwxCyd=I{Om
ze)tDJZNGSdU3uGYVf1fseE!b<>%YC(`|+nk|EK*I&vxPA(_I+Z_R|-;+!ah}=f(Ek
z%clQq`{nkJyHsl*T6yDPF&>@&^H00@2>aWH|L+{`?Z3il?Ciffd;>q5Fv~ZGy6Vq+
z2fIyw`_0|~4Ap!7W*?eIa6*lJY6R-N+T~Ud)V{MKPy~O!J=is4dA7U#0@^yj%68$~
z(N5ldZu&Fj{MWx**&x13AG6N?we{lp|7ZpN+@1fo@Oc?^(*zG)|1S}RLOjUfOiX}k
z55{!VKBt%p&)L22FJdJ6U2A#y8}D_R;Gt8m{rcV0o$q&cpMJOa-P6_W#diDI^5S>T
z+U>>V<?ZF2@7wTpwezLc!0Vo90-Nev>r)r*BLBb#zpk(EuI%i#R~NtgZuQyX>h|vT
z;`h%x%Zu%`?d7Mt+t0t-S=;_n`^LK`Js+^mNL_wDg9|izOn2c_!oDyVioAk4yK&F0
z_KjyAU2-zy#M9)z_C(s9?{>d?3KiRrpo!J*o<kFl9<>+0?>ueqLSx@OYOmbXM1CA3
z$H4%~@fX#!TF{*&CNtSUB5(MkG*s`P(!FQl@fZd6^cNqz2?rr7kL4Q=!D+qJn~bL1
z8O+4)ZN4RM(O_EJU5wYe)7QiM*UwSB(z$RuPsh=q*IK@GD*^{+Jo4<)ZJ9BZTbc`-
z=77;f+L;Wa`C6F|Mi*;qGK^;8<1SimWzjL3HJ<aUtO6e|*3NdXw-?XXjDGUXZ;Wr6
za{gl)BD`o_xsO@re|x>;|J!-gzB~VK<MXX(CBJ1$q^?b{y>C6a^2u}0GsS;OM&v4U
z4%bA|;IW-?5T8(bEA;U=flDJ=8su!z9EZ^0-m8N{xGo(X?C<<}_wWerPH%R%{#aL!
z5BFd5v&ItRVzI)Dy{CoZ@T64u<=)HPX>H?q?G~QUE*0d<E>N6!!@Jk*`B~cC^#53Y
zx&7zehX2R^vZ3;v1QV#)M602}0A_r+?@V@M%YX0Pqm-g(Bn#hBj4fZy!@l{N4f(r=
zP3cK+J1iDf1tp^v|0145RWksAdiH?#c$}6+UeN6(Ddz~F#1YAG7-E<lg%DJJ19fHw
z7{iafDD@XdeigKBn5nm@g96yq?HM&@)UN2n2JEbUoU*gqnA{s8Mpa+Cf8E`|hE;?6
z6}=Er0er*OAM3k+J%o0?ozkIMHM?Nt?5v`b8kp75ta))``=$0vbF$EDm(z5sqXZD>
zYZJV?kMo&!{+mn9)%uum{y$n<UMZgckJdVO=l^Yd9{=!pI8e@?TeWs;x#m+u1vmh<
zYQSIjlCx~F-C66@et7bY_n4&wEF>^jQu%gxJ_@&LB1qVI_z-Wne^E_8YPFZ~0S39>
z;+wOn`QzKYXImGzH~%?2KZ8?>M!3?!Mrts+dyiiaf*dW!GW=zJ;t%PVD%6&!^paEj
zv2$CM7My2RGuExBMvwQ&De0N=vfQcx73DV+D1I3BP?1sf-syrtC~fYjbW#Uljt^-_
z_Z}Z6$$-AeSpKrJ^I|6%j)1_X_>L>z+aKl8F#0DoyH#73r*LT@eLyhSW8O{;DGD<h
z)O(DT9^{K_t#-QB^iMb53lsPr2*jFd=5-p1^-PjJ1KJ+5k^$hm_iClHdGu`e>DwPS
zkKos{{htpukKP`<dG_MPCLI{Ne?_x^1OBo7dT;CKs26qz==xai4F=(7vh<OTUP9Bu
zVDJXu4Y$9o+TokGyYlL3kVV}$Xv#1QcgPoRtF|KV<naskRx{7vX5njMY7knzpD22n
z0nX1sib|;$7#ZHwc^0Coe0}w4l)r|N1$_Ghq{EEenKL9pi@lhQ7XctFH`}VMGR9Re
z9+049NS9k$y~!nCMDa&=i3#bD>D;RQvA$3E$4qMr04asA7OZv3-cJLKT^1?`m>g7q
zg&#!6QuId&s#~0&GkGzYe-;3U;C5a)tWi%jc`!acIM4EMXa=-5#Ff`;R;X%5bBHR%
z{3Ux#1JRlSvX^_$Ud({%Yq-1<^mji2fMyj=!;6$f*w0h+O~{7c&NiN0{O9oaAWT0+
zT|nmK^SP`}GOOBOU%tS_nYTFf@(kF6<a{`L0xyF&I0<_{r@?3xrt|i&J^l=P2^M>H
z^~XyNot#dc9r@62l|J7NC4MyzCHChc#YLLhxdcsJy*`?{{9B@_?Hi)06;x8r_3%yD
z4^!aPuwnIXH%7~^o&A?^HGG~7n2Wn3uXp7266Ce;h<Rj#bX=tHo8({I;B$(XW)bBB
zc4eX>jA>kCtJWQjHoKeM&!0DYVSh8}4K^eA?{xH!&Ep{746-5q_nGUwjWLGJ9tK9n
zI2lm;*VX4ck5(Q%Z!hjV+Fn~+U3s*=xV^l-zS!Ab={$p*<aX!z^Dl}xWA{SN!T}|K
zd>!PcTea5vBE_|Sw7RPL64sy56gEU#s-hNsg-K6<5fjfU7@Yz<Mw_PqqtoGL6a$Fj
z?&jyLHxVk|uYCXg+RArugZlpIv&GfpWz<CNK3!bztUZ6ayVlu#`uwRtWyYY??x`A9
z+TD!0$!2$)ZXORuo4vuwX4>t*fBEKd6mO;{+2%>q-~7ku1pW)@pUpJPCNJjtqi5Ue
z+fUaQpMST!ytvw3Mm_AK?Zxj_o<41N+S}XDmfMqt&8tyZ*VcRZKM*%QG?9iAsWUBv
zjL8~xAB%p7ADbVKmnts5Pkw6(oeO@Z$bVk#{(L=s%#i=ISJq1QpY7E<`;S}s{CpbZ
z3z`2aJS#-*34Gv67W>iXrSYhT&O51SVL8~w1OF{O?rr#Sa^|a`D294&s&c?}q{$~N
zNJ<Y$Hmk$R0mmnSg5Z{qJW#0IC*Hn!k@@xQUK$0le-MRvHVhgS%~IGTj)>;=fP8&F
z=!TMHGLUv_JDh=T5e?io?9gLNpBK;0&K7YLi{o^_kwtqo6XYB}^`D~w9I8YA5Y9bd
z9jk^^oT-^)_$eAlC>M^UC9P5{^C*VFq{%2HZ>cuWKb7g+m(*qe5GNRz>HK;0xzzI+
zB{-FI&pxn&97shH$8pdnPdSQkOcv<i`5+;XKSc}IwA6zH=apzHr$Nu}2XIq}RqQDa
zjRyCkkD0WsqD$coAQ@5Mt@_I#hjM5B>oDy`pMpWD8_VzWOh**LW)MKZ2^j@bp2TiG
zIG2v1*jIY90+?F<@0(2D*k=m;zn0ja_?bcfmphM&@jusA*Y4tf-pWVOd^gA!A;6>n
zMn6aKUtc$M=pr(4=cq<4-+#@<Vi^8R1%APdBe-!XA{XhD$vF(Y0pN(qe6NnawEZy1
z$G{oZ8Wh?QY3~>bIP6^SC(IPuAIB0Ii5(E`ERe6`GiCovfY+rf_rXfOwTb&5KIQno
zYyZbzyN3DA{QNK9|8uN=x7RzqQVg(J_FwDEkBau+>#KM6U$^p^Ghh?4l@%eG@G(YT
z65nx2Tp(X1NrC#+`CweLDR^nUX5#-U9P=LoCk`Y&J%8dq?nPO5G3sH6RpywVd{EhI
zvR3#xqNop+zpX?_q)Z9#Ryad~#8*XcH0VM8B<ac0zp+ck?e0lb^SpxN@o~~SxBYU_
ze$7h6c0!R%un+|@S!}#d-^Wg(0l=$#j5VmHlWIZYm*{N8%FW_qG^%%+POKDe1^c+)
z!~ZpWPSU1bb#<mIiVT2W+@1Ea>jW<zxp6dTx?Ov=zq%7eMm&%)JO+8w@$9W=2r`jE
z@;=O$=eLauI*hN2Lt6Nj^NI0~)<W4ypWFKw0yrs+{dA}d1n65fFw{rax8iotGpO{Q
zQV7-bQq5QA{d=nP{z8?=$KicmsDto*2h;oj^{8wqZh-o0B_Ap*n{Olij7(5cN@bg>
z-OqmL4traO_YW}?@WcBV{Qpm<;b4$#X$BCVnjdf+{E32CZ>`sy2yJet9_phhyRaz~
zpecL5>2pjF2}?oyhVP+SQ-v3zyDPcMrvoM`Dk?^2*+OZ9s0uE8SKKP?Tp>#w;Kjx`
zraxRwZkfh|U6(@akD8wl|3^WTW)fz?+6B}}(xONi^{DADZ1@X+!0_dLywIpzTJn*%
z`e*m}uSWmpIRAUWIja4-gE+q&8!$`$w_42q)M<Ct?#};P`CM;oE6mUQ?6ru9HhjSx
z9RXiuEVy#ArvgfHFwnM6`_yUs%j+A<k2cmG-FVukBI~3$Cr=17{XtHo-FXDt3N}{F
zli(=yhjN)CtwZKX6Dg@|xG2f`t^=zGM+I*vd=k=-@<~8ZvzYFVdsaqXis|JE6ZTdI
z1LH6#_>BUf(1}gm;bRJE43Ar_R*jl-A~kVf6fzc2?^I;2m4?UR%Q#jIzlAfrro058
zIha1a&2_SSq>T;D<}r<QLf&9ACghDG^qg{RYAc#tO9Z5^y#c@SXAb%wc2ASb6aW7+
zhyLeL!Tz_iytcY>NB?i*bG;<7K>rbQuAlhZ_{fxhnZrOYx0jYXey6jsy1D@j<84!Z
z>(X4L{Z^*c0_}fvTckh8fHBVtQ61&s6lz{LCM285%+rFune)Pmr+1Gst!yFRj294~
z-uHxj(+j+DQUSQENU$lFfZuZljh8_vjzQ6w`s<lGCj`9ac?i}2syz2^=`$z&&(crn
zjnV)0_Hv2--}!&u&gXgw<5c=DsZFkh{wsWB`ro<bGyoT-|C4$D>!JTbqn}2xa@@Q)
zKR@3Yf$z#^gj+^&{%i0i8a36p@$HG#g07~@=(FbMAj(PA&*4~6=}3o4G@>JAW7Y{H
zH-$pqZWLTRbj*FhyC>&EZ5OZ$`{t04T!O&|P^}&X2IN$yQJ&Nby<@CQTdKtUM5Bfg
z34O)GXb$?1dRw#@y)pW~`lw9**YD#0-OA^B2_uG1-!b&RoC~}+9*#trAltFWsoF45
zcgzIs$_Ipvu$E}(w|qf(P&ybe{grbz+^aqq?%m+2kd@AaW7NJlq(6dhK*!+nF@d<l
z`x0R{$;vn$d>#xi2cD+$Hi5NheAgP!2IoJkn;XgwHyZX@{!bx?N+i?3eBAGEpeD2F
z<GrJ6$&L8Xz`I9C2M4z_z@Yf$!Um+_e~#E_9{NAJJn5&;4En#ayjsftwYGYf|Layh
zqTH@h?hi<{UkGJAMg=4(vw15lypP}FqYX;`r;^XULwb#L;De9KPIA@$6bxV&e-Oo(
z)cy;_(Uu|^rJLQb-ZRs*z)bO$EqnkvxA)o)dc73G#Mf2$aZA$DfS!PM=q7#{hvQJS
zK|hFCO0HhYNMV|h$E8M)=&3e{XtMI%)Ld(?73++FU~M69h?Eb1P-lfgtV7*;R|5(g
zq~|sNUw$nQKj-vil<}XG{y<U8R#E$4jaO<FyFLzpB&J(=Iu8HU4}c3TypJ%-T)rif
zz-Yb6U_6W^f(^baR6tw4tq}jk(hB@g8e_%w&;2tkd*>X+NI~*quXzMq!500iQl+A*
zmFCBAC{#F$dim)V{mUg8GH#u$P^mkBqhhP@@E^%>@ewXY@fl$eo^>wh_&uVhF{xl(
z{6qs7xz<T}wR@<J=#f=6BrEW{PCtSg`*-)V``!Da4-e|^?w@^l(AcWKdtdwT1N^w3
z9sS|IzWw9<`+xt_gL>ofla0*}5AogmAKtfqXw<X?M}!%{ni3Qq4(YfKgKISH^cJ=W
z1CBiU(8T_mdgIp-Ok$hSz|p?r?JZUeCe@45bsLB{mOmv>6zT}rFc|^a6VzPAJ#^fn
z{I`k^GDa@VaBDDXkwg$mSvDw1E6aOuAKhTRPoD5(>!kV*8%?9DckXG@AdTXJEn4b-
zohAX8)LhctqbV&ivrI8t)*q%(YF87{(**6p6%<Wj+F;>y+ii+%L#B59wNI(L&rN;i
z;Qy}d2QZ8O>y-JwcIPhs&#ipO{=cW99^l0c1M_1Xe&C1X@-6pw@g?%?OzEd|%J=B9
zh2&lmzlJJ>ynPk-tq)McOeKKznV51q6S@eN5@u8RyoX`^6R8NCsogfkuQ!z`gTOJy
z^tar@fRI_vUK#lrU^;7};=XuF*@@u&H{%#O_q=-xL@%ulfl0tFeR^R!Uhq6%l6z5~
zyrN-t7)?J0_MzpYryb_%rfxY~bWAmAz-Q55;2n!)SlGi9?c5!{RlpooK!$+>uath(
zN*&%!l7W`K;4Gm%Y}xURqRa!>tH)UtjKkOq)Wf|N2KiZl39+>_zlls)Na@5mApm95
z9&*e8m@WE_P(FEVNDdk|1$R@jG<ad&H5dprRWf*nt(x>>b)|UX@lo|ycyxNUp!3la
zcYx63Nl7MlZC_jl-OjUTPfM`lmN1bVrn`fA2g=3JD&F#6QNpZXFgW*Mvi<RZ)7vKi
zw_b3LY3_%VWZ@X2V_;T#&R&Z?E!ca(jL9AqRwvsjH8Kqq9GWFj<1|g5LdlapP6-m^
zu?ee!8dl2mi@X5KTF~!CETy42&cP9r+D4gc^=PRD>1=I#0diP}R6H_9Ra_}&CKWe1
z?n7YxX{#37T9Of>-6fKl@SIXHQl<_sfvGBVr`alh${_R4!ofgBo=5R{ly*zYj=9d#
zE^M!lp?{nvL9dI+$IPJA?vVwTk)W?8+(d#X&+rW}NkJSY<7`0ak)I`=6jVv%Dfe|a
zh|#)Ti@R`V>_RDtj~eBk$d@u+99l(HizY~eG2`Sot3DEva{+{E9vvbDFLCz~mnq~g
z9AI(~eTm2X_StE2mia2PJ!RSrOOuBC9Omk?NFt)4M`&n4mnb2t>PPSoEW;47tUP-!
zV5)l-#6<b=tjI{zNo~NFHZ0zcNz(HN<L*cC_qy}+y1CCB{GU19F4@Oy```7V{-@Kq
zv;Vr4&$a43zL~86B0qN&--s3n(?W^zM<)aQX0i(Cn+ZCgZ%RragSDgr`hJ!M=$q?R
z0ev%52lUMpE3t2?v_aq4>Y#5X=!3qQpb+{7r4ZjJRmnDRg2Pc!6?0()(Kn7phEE7-
z&ruS6Q&Q3VK{*N&BTOn9zm7vXXX`Jz6(pm^26i&At;N0(rOklGH6Te*jlL^2&Ntdb
ztSbg$q(VZUAE<q=&>Df|YwyCZ_nC+Oo0I->eaxW$Yb&d3Mf$(Ga;N{fmCv;jJtV>h
z%xkI>K=?^b@n>3rwdU3GTWHBj{?*^Q6__ab+d|jdTFsBYI`XtbPut(MFK8InE|L7U
ze%En)V(AGBrFk*hv()_UMnj5rW)<z|qHQ-lJ6^jm47{I>F(D%o>UbfSoYGP3vpQdO
zQ%LP@yf$hFa@RXf#&M7QI1w}SwIwe|8A$G4aRurnVTS#8jil%dZ+Msi5hqC3EV#eJ
zg=LW76`8D0BD~6<26$bg>tn!56@0}vD7-hu;Ta8t+zzum9d|LXh4C+j_wd?r2u|@n
zM>&=p4Nw+ZN+FeUH_V4&9&i$1_|f!#Jvu^N-DjP9nRFB}E)qP_3LGlS`Wx4OQRV%n
zA-tm!AIc88bfYE>5;r}uJszvm*p{t(f_iQRJ7G3_Z(4rKL(Ek<#~c`33JPxT#mRE1
z%K4RsjrzS}AxYDmjP$g4oaKp0hgkIAN>5hVuiZD4#-3@El?9=jcl4Ivnv6<?Y<L!b
ztM6aFG!z9uB+)2oZL~dFW@HhScqJn2qdf<IH#8p5Zm)ROf%Yu3OanY6m1_D&#(7t{
zd(%ecmBwuAT8nvv0>jZ5<9hiK`{Sy19G_g=rWtKr-;v1tV0)!=OIusMqJXF-b)Qva
zk~hFnhD<mxk<*lX%6YCx4Ys&#ZL(C_f8kj*V!(?6B`lVxS}&1|S<6*{Lu#p@i^<!O
zNgm6Rxls|m>%z9i)Jz&rdb6@T`RWAq?D?0Z)$`|?-9eHS>$!7(gFDcgI?2+eO<uMv
zwO^QiaYpw{H&2xmj>8$nm^i*EldUb3I=hF}7|)AHjxi0|%>vF-fCfVRb|IvJ@{pMV
zs(Z9YV3Q;izu4L(Y7`~Ub-Q(`^>10N$#hD6xPtM((RZwgwTg6!x-LE>TWM=$Unz+&
z5sh=nNrZ^>hd=xQyJMfAd-tlS+}Ad){vCX#-T&<ToLA{%`u(rnUTK%&|E#p{{C{rc
z^R@E7$R+8UVg{JGQ^4M3fSH|P;J26o=Ed7>$%Uqp511!+xnQo4x4<l`oj!Q0c9wOH
zRytOA|LOz>%6IrTmo`QQcDckc%9Qyox4~U*gX>Ej(^{HE+N~1*ndxILMaDOM-;|<;
zuQ9XCHB#ss$}Dr^6#93agyxP^-;wIOG&D%J1A*7Yv(6lk(eU(Q^{zSbP52pQoENVL
zd;BuBl8e{Ta*m5vO-5|Qcj1aG;k$UfygRx?B^DQ7yyCcbiQdi%z~s_p_Ntn}k~%io
zn8Ej$Gt00pVUG_>eQ?Y0%Y5HmE~dL&Om`pinI`{DyH}6>kDrUj|6f~KU%rd~e;c0}
z>u*?*EA%l#{=c$XA^%^yv;Vr4&(edf>-s!+?>+DpukWY8fslnStH^^a^H1Sa3DWNA
zIl2c#qw#<(bRJliU^$%gAEVrR08brjFN27#vDfm_@*{tFbz^mTW6d@8dVh^GTk^gY
z*@^#HT%}K+IM3h|!bj#=O^^7r=6Tl*=H1WiW~WVKvTL62(t~R=l%oOfp<F2#ME?|*
zFm{B3L0?}tOCE+DP+&hoSCl%?w4;L@U0WW!Xoz`K{ZkV48vct-+pKDN)BECG`>b~y
zqcGkD=)xox??a5#-^-xjOaA7cohDgGAqg@}Ad%)={OE|>q{K3fo#h6k3@2DBd$86u
z!xI5z018u}88|@25d3kL``uI6^AG4fM+$&KFOJgi#D9P&s$fq~p&?_!hApUCjZJ^)
zfj`WB=o?GJ4{=OVCT>)RJckCD*iQhc%HzOB<Lp%2@uBIORIH)w(dX8i`k`G91|<XH
zqRyvKuNmPGeKkh3m*BOfC?bG`iTu{noH9ZxSyP>sdumFF$xYbso7zNEm$Vy812X=C
zh89;!bFZAao;c1i7!33}kdvH^w<Q#9lBqt{A?Gzo5%@rrvsYRA!SkcONrZ0k367n=
zKYR!{HDid?;4&>WHcQ32+SX8)B>Z(t8jzXB-YtJX<FSRK1^)+saczU3$;NgU0JXEq
z$q0+K8#h9m$g!7+F`Fi0Ko`MVw8!=1sEfH5&u@}Q>(Cihgqmo|@woqPrSoA^1qiAC
z0gIm4R<H!4hJTV^eoeHH+MG=dbO~rlx3bu26#9uW^K#BU)PA132UEAQi;R3{`gH&V
zw0?h7Biag(!%#wKV=VJ`2h_JlbU)kh?`OK6(;qr4_Z!Yp*xvN0`;AF6jN(rewkbKr
zTeoE|y<oVsjU(ODf(;C68EI^x#~VO!Hi*<14dXijrgU_pXJpXpb*Pv54oUklRU@io
zpOr;Kw`l!@<uUEJC60l$4ue=xlxmW6OSI>ub_590lQCt4B_mTA<4sbWE*gg@Sh$OX
z<p8In-e<K0)-JWcCuJJ;k?`UOJ=qw!RSDT}@SH*-!t)nzw~r2=?(e_Y-G0?@_W<wB
zaxXUm|2HZI6H^d>lyHy-Gz8^MeH^0OgX5n`sMkbi33a?fOOitg&+@Y<yKaV_HrE4p
z?JmHBmKT&8lq6@mUD#w)Yplqr)rMXMjSrj!%D7rkx5Mn@-Rjy0!zL)Q4KI)cw^r6N
zKm0r*@5fqsA8Ry1rDqY1pbdwWuu_BlcF=?9&euneS=3jP#|xnc)zau;wQ)n}Q6%EO
zDfBo9bA<<l#y5JRX0kUgyW{6NMRDP{n*Z2eZb%c0i{?Dc3N73ub^b9#=aozBzLwg#
zuin0Rf!ptvHlDjdF1hz6^7f_UHZ_yH2onUH&WUh3HW$vvdmIfk2mY(Q<rF8>v36o<
z0AI*$WbTS({@o!XUw$h{Mcd>nB9(P0Uvl>wfWP45VeCTOB?Vvp_vsJk)&HDcp^q8<
z|Em@8|5n!4?({#m@%c9D$Gx!cZ@>NP-iy8MH%C8t-}cZ9G_)W6Hnl{49fPf@Aj5-m
zk{+^QWscG;4v%H3vCbiDkalU?dLbeLlGCGb6n-ULwCL?IBMT*s1QQ6NT^E|7!)8kL
zKoQby=?Q}lGPxyc8=tE%(nwwV++HTp6?xDYLg!P|6Xl7LQ3hz)3QcU#jC@~tp&M-j
zRFF48ucsd=QHXwtUclHe4=+(?LZ(_p%1P0A<5{N#I?}S3g{z)O%lhE4fCF{iemHQn
zJYyl`2q-wr5yg-X92_tLcSN4SAUWe1BrzIdqM!X^2HlfiA5+;UUt0c4#sFvtmq75`
zf<H#U78s$J+AM@pSovg-)kJi~+s$VRT+x)4G6O^W-W~lq#E5O_mnQvSKgKT{sStj%
zn=$={wy>%!iYeT*%FtsNtDc6@{n2d5WAlMO3R8;phhm3CS~zr8P3V1;YI#eBaUjD;
zBI(%+*D3(oAie?^4pk{+@GVRKF;v2FNZ|y<FP;z>r$*xZ(;%b3i2W!W^k~0_LHATt
z2PSYRj!T14v;|xTT2iVI+ExZ(5es<Ov{J!nM84VR1Z?SLM8(ie(lpFQ3CCkM8X5^8
z35}>|45}eiz4dVD92#=~hvFbQZuwKR)TegPsasQ0TiR!g8hTo@AIPXt8$Cl$x_O<7
zzhYxom5`Piyz~We^BToV)ooo)7Ex+zUQT%a=B{vC+q{f8b#orA&nDn6W=ZIyCd@D&
zs1f_xT+)B;X9oYT49c(6$8`R`v$D3bQsn=am+#^~-pc2?Ir}|~9<j8qVo(70(?>%M
zJnoT;R-we_Gx}24M~7+W(bqEhntqs?r!w4|u=m>INY_>(9ty;bOx|@{eq|Uqt4q{7
z4ZEMx;H*A6;;H$hgU+IVhDSNY@C|!%-aqB{4~~I~7aG9eAcYoYRS5=z3)J9pc&rsF
z*@qbk_4U{vbdzzMn`Y>Qly)dKOXZ9Um9TFNe^Q2!-LcazwO~d8wXr=9Ek7a(%M3gx
zMNv-^GHOz{^Ot+C^tBwm*FQJ?^M+rqe{T4X{W^U8!T;=Uz%w~PO~viMnu^<hwJScU
ztaxXsXj>}Yn3ba7+Hb)|(Vp*)iC5>}gmhP?jZVgeEi*cb5<g1ti?}cO`4FLT4_+@m
z;aL1zKK&R3^nICuLyw>`Ms>BG<d_OPA6idz!bxcccVD5I<0#EfG4%eHFQXvqod^>e
z-U#qn)<KyQ0Rysn!<?Bnhjn=6KGI#fOuM}*mI{s3D=Z{I;kg6Pf}KgBl+d{95+xw}
zi|#_WHWDj0xdz$ouR%8d8Wb_Oj^eilpNq*THz4hlR>wCD2+B{ayy7gHU(}K5a;uHT
z><t5J$%-z!-Xu(DyDNP&7GZj&<KC^VGKNT-xxx{pM8K$$%4iVvhXNLxDq64}2I)sK
zx2+4!Q+myqV#Ptpz5SzS`>%Gzl#uxj{DXuKgU#6_u*kOXP(*PyFv?Xxu|HuOYB5oc
z%|^e|QLAlNz&P+zim#F`)@W(DeNxUBx~k()9@4{yb`9)+$~!%AX?XOos`YlM^|ssK
z6ZM?t?>3E(N=<H2W;|I8#Vyi_hY;prFSeUlYEkBZ&^1I8ZQzyo9i_Esl8e%5F|84E
zVHzLw@dv%)B{eo~H&k+07(JV%mBV!L2^*Q{pWXa31u<+Ws!+X)aolQ7N|{}$8lP2b
zo>AM+zaYnp3~wR6h%wR6PC1`WI0#1ML@`cDFg^;|I~c{+l&c7t3!y@67hSNspMH8-
z&v;|Po`f+9cU`an(3>19CZn6Ac{=*$t&u&|<9w9Qp;panBZT(7@wh|;%VclFn_tl*
zi|7IUs?}V=2Y3}}=2_;>stJx00N3^KbDokCs~>&#m9Imcb49VvGl{zZn>e7DqEPTt
zl#DS3b&Bl*vSi~yo;55ad_fQ-78-{2r(=7jL9eHV{HNn4wZgYeGh$g5QW1`V9K{Nm
zO-24tJnK7-MT`S111RTks680eto@3uj+A%Ag9ZOjfAU8d!5n`M78GsNq5>k0dRqA5
zkf2jq37l3?dY~Ke-By$h9g$QV?lO;9nY1hD2xRPO0PIf4h6a`r=!el59-pI&R~>Hf
z<BWrd6NMgdz*1Ss!MPcUuUDa`7gormnT0+l>Wr|B5;N6lEaEE*Sl4k@KpSTvDijxT
zrkX)~PPob0+VFgY4vs@W-jE7Nwm5rsm_?9uj0ufH$?@R3$*u;_$uRvp$FpTEzGUVr
zxbM6mvdcT6?jXiBonJ)em0eiH@m6vEq#-$=QKi)>C*AC^-<@ukJ#z4L!(d;SVG%Z<
z#(6Zvh|f9vz921bMZv<GJN2TB64=zMjyM5}CChkX2{QyV*C!RL6dC{41#bs{MdSoR
zDItJ#&<fVaF@qC`<u$LJ5{w=k?!G?Q`@g&XckS;x*DT$Y^%wD$5<MwNRe_rk-o@cl
z@+1!i=8iVuX2)Un>s<ITj|7iMDq2bBrFpb#*epKG@(|gtIyJK>jc#c;HGc4|Hyir7
zbz;*9k?_*xS5siR^H8lObpmG>4xs64h7CX5;lnL!aBSHAK<=wlz!KZh<A=_3*>EtB
z8}g6{2v;ZY0yl-RSJcf+;<u+ETmiGV<+)IcaAdQzU5Z#@sc)ET<305!rEO8A8K<{M
z{~<d~2D8XxF1bn=X84#<ujv;XwRJwSx!nR97kM^iFN>SSu+ZcR#SobTW#gt&wqg2Z
z%#P5zHJqENo12bgf=-i>r-UvpI$aWZt_LB$IQ%n@f9J*i!S1t$LI-EE#1GyQCE~Ps
zoNijo=mLM|jsM~~CDBFmzJFi}VS4`JIU6;?dsI3?8E6U3+&B{u4%k@Y*=b|h7B0%V
zLE1x|9-7!04*zB`Z?+=&im2xv<D(?IKH>$98Io!Z2A^BUHP(Iy&pzPgY~g*pU=I&J
zd^?LyV!VA}6ovQcLT2BW6oM97N*5aHI+EjT)CQm;);MLX4<DLGU)+nl88F6QfbsM(
z5f=@%IF8a@!j{_{<O3gar94SW6@g#>xG9s>)|XZxxoVL(BY-O}r~XE1taIa>XFye+
zb2qhD51`{r+e;U@2HH&4O$F17%Pl73=W4s5O>G*)8D-@h1m`!k^Dbf*QK_eL&rR$0
z<Gw(|DqN!Q?$q#YvOG}<d~*)4`WhL03Zem72}iL2q)7(T<W+zOilumY3Jdc9XD3jD
zb)?zd9G$$pEzES<d5QbW#6>L;+>@kquH%gXX}-BSP}@B4r*EGh;e7+>EL1IA9vn<r
zE<6{c(H+XQLa~;n%%ar}7gZWDJr4h2sf<fLzP4%KTmX+iaKE4V>_4yK{Wa77Yh|?*
z|8f1%qepl4pSST*hGMv<jO!Qu@^3&Sbv5JA7dSSpw2*|WLh~>tA2Gx1?h+EMqwETP
zfKq!Bk4EvQWbla`fRODNB7x5+vc2C0Zi>BrfJ)=7%g+YMnd^k5Q;TMD3Y%fNv!NVn
zOOjI!IOnd)d##+CnkbOXLf`^`$>xUi^u@7ckCPo{zPi}8d<8k+_<&J=px^k%VK*3O
zp(XT>6Um7REu97D$Yl%zas{HWD~3nHF>$j*)XtLephwqEXp}UwmSc@T0f!U~Xkw_R
z6P9alY2Ocy;eHiJhE+nP9wnknTBnwOjXE=i6b@cRe<2=EJNBp;)~5!tt%(N0>}}KT
zd~E|^>j_TTwiwp)A>&}h5RfGXvJ}JsS|Ukx#IZ=ys)4GNG#OZSdQc0^fN>M^LqC_3
z|45G7UNT13McL};xMNG`b(SW1j+t}W{|W}vPd3<%kW#`&=>8#Ww2}^@W17}rZBjct
z0e*uE&A&AtC=Cb~QHrkz4eagvy);6!8>2LX)j}HiO#_DC*mN7HK&pyH?#UeJ&~B1C
zWK*@k4sC$V%so(g`G9WBIF|&$o8We#eS&QfH$}H7wOk)m06r`V!|=0_A_+1ERr!lv
zrA@tj>WTkgq~A@q7Tvs@S>@)1ZIsG2=1}jKE6rncST(o{)~eLRIPOJ!z}<Nk&Eo&;
zv=EmL27dAQ-;Y+?D|hj~Z{u^3^|#Z4T%?Z~{QvrLyX~%j2V;WY@&C8+SpuHwfxn|y
zmVb@T)9B<h_y0`T;Y)r6WUp2i;h%NCewyc_jisftv$GbX(1^>llJrCnrGae`n`R>p
zvuZ2Y*80+NXQ{L7ciJ26&c^B^;K9>0JP8KEtvMdeCdT&EP~1~}wai0nM97iZ@-8@|
z$lbico0S8`SdtVwT%-M*?LuLA-P5$rF0>1+g@W<3Hajtqf0T$CO-9QWla@6aw~5^>
z`W2CED?^T|my-Ls_^LV<5{ooUDe|Nzqt=IQOK3A~zF(YKyK|ToCbeR`U)<%&{*#x>
z1i<DP1(F7wMedexdsZAPJuDN|v-rx6e_gIO_jD>D=FCZz$m~h4S_Qt$gRM7*hwjMj
zn5fQ(D}tp8cD{JK{bKJaW<g{OCA|yZou_!)1Bs#mJ8&w0xQdCfFkn=V$0J^E!US$g
zA%G@m5`gr_7yD1QUmWbcdbayl%wB)2LWgVf!L!ql0)xOiZO0gXj<Vdb6s<rwC9o$c
za{LKko2kWd(N9@ZrV*)Zpb>-48sQ?i_y^Q_O=LaB9<#V@iWB2521)XfZeL1P<aC07
zfl<ov)tKm!lyA5dTwG-J6FxC2(o#RrSlN)-YSIZiZ?-$dwb6G+TnF7^oK;&!y9-Uw
zuR#kR;TqZ+Btb9i)ePL-7jD4y$*XI|H@$xKdJC+yjWb(CmTOI*MCHBdlCf;|?4`6K
zFxsxTD%7`YI-p~2)`;-HF6<AYZmw1bb6NWT?|!yWvo=%#oeja6R6@@z&Ws&u72)C7
z`}XACNt+)4H{z_YmnQAH>5EuBDntQb4=n`M6|(v0Old#)vSJRF;J#6&(VEUi6w#ZY
zPzQ?l5Tl-R+<dH})<Nfpz!+6${&++)5TIaVl2Krw(g_SGmw;A(MebQ(t(%iIfLe*R
zmN)(AF$@O&U^5y(x?2f5gp$(9ur>2>`tG7}&o~XGcO)}SqV*FFC2D1bTfv!H%TKj@
z3&J*B;MDrs7m>TqSNUA>{(m8b;EenK^4iLJ>HfdAdUyZ7jn56<|CcHS0IaL|ZvOi}
z>nC^iU%uWxJo@Q|*=zlo!e?)4Esc0Tg)uT{);N@;`FB86FS-Ar?EHPq$p5#xvi_*J
z{~xvQ;=kU?XK~S6T(tK;{kkUkAGEdI?ItPd<be-DEw}VhBnyC09ObDq4`qN+dq+$X
z*4n`G*31O_H)}P|8zfyQj9lomy*CHDuc6Gs(t`DP|G7LpQcw3^JUepUs28vIpW{y$
zA#U{}yA|mFr=yqKZ~lx0ez4!{{iq&qEU4jNTu^k#q{~E8-8F%*pn+}%93JrD{RrcU
z;y0ivO<&$*s;C`?zDY4YF;T%yv@2r<I@hCcr^5hxIN_fs*%;b@e^}UpGFX10en@fo
zdE&g3%KQVqdmiIpK-3&K)ATHja`7rucN8Q4it+{HTuJs0SYH*}(iMO^|MiPZ0@i8g
z&)Yxln%ADH(E_wNh39HDv0jq30EQ?AsHw-b2E1_3j(V-N^aJAUX3cN43g=2~X`H1?
z)cX?9jWk5+y0q3>zEqXVRYG+z)~oq&nbq^{S`*%xFyoyGQ>GbbNyR|m&0x|iYlwh*
z79cKEoSLsGWEtuNLQ3LtmZTpgxgt>XxEG{7xe-QTW}%3>?QRvXzl<>M!&Wam9-ly2
z`dfU-IIQ<T@%4}ajem--BwSJPF&T*`S@ALB{+8^4;@jgO!<R=t7GD72<>=Zz8r#Zu
zwIg2aZ$I08R)WG@o3S-YLo7b$rqso^N)5Q1^vy1gs$9%dqe5{WhYCl}E9m<FAy2n}
z7Bp;9jkt|vg?1^a9MT^uFEU}y4B_1qAu>`V^{RHiRcl%Y2bAK*WZNiG@{Zd0;N4^5
z>(`NH*0E3ny$foL5;a9Sfm*0Z-Ov0XIbwt`3tfzd1ievE0Gbhw+NUOASnvM6`QagK
z$zI~!yVuo&?&64Rt(J2biAWm?3LFU8T6lUv4SWtu*5`oH_wL>6Z;%U-U&lB1#D=vC
z-+_nq_#b(QVp>=Rt%C6IrCOYl=$M2tk--bWu=4WIi}Xk#MO{YkK$ZpCm5_yz){cXo
zNhS7e8<~y&CzN3UW3kXiRrz(AXaMZr&l)v8>bUVnu}g)J+%4fcRH*&G0(LG~%gKcr
z8epo4cZ@7HxR4i8Kw<z)h76YdicnFUz#x<jQ`}EAL{gl#(od<Pf?@)VelW;F!6<37
zDfZrqMe*yZuGN}qhNBqN^^W4-Sd}7qvvnd$Vf{K!L-bVW_U|HcUzVZ(?%_xLN+YjN
zArXIXJy3g&**pvlGK-uLTWK%@n95cQ%kW4F14#zGql&>SE?&!U98P!QkmP1CH<IrB
zwo$ZuX&hCnuvLX06?lxo0FA~?UB3dMt)?fe_`Nw>E;W6{%~GcQ6Sj<6{4{~yU7(Cg
zh+2R5_tu98jn?8Hk&xbR%W{keJ!<YsxNA_gu%o$G^^)t^#M3Md=ULW%5sjcrKqPp>
zP5gTcW6VT(?fPh$Y*M9>`+vL=P=O91ml;g6BBz&9!iQfAXK&LwarF0{rnAaT|BJ&!
zzBwqjtxq{p;lk*UleE03RIzGeq7X((5#gKFl0$SbA{$qoaCB=}RUF-9zppwc>vg&;
zTWt~#W>_mJS+};L*@gxmtSwbse0#Yyb0upI%dJ)#&8vZh9|+9UPuvs=e07RRr=X89
zo`jg<6J6@)$CkP_)uHbyvaKH966Ho(A$O8@()9<S4G2l(Ix%!m&X<cH7|KL9G!!Ng
zKDacD5ZATdxpJ#5u<}+-Ta!SwfFm4&k}Z^(TARS&J{Ppm;BD&70xcIO>YG`pHiB+G
z4h9&himrAo_yYClFFg2FjT5$_R7gYI;?%XZqyVIp)6yVlD*A=DGIrg#>6+@7E0tkh
z(QuxQL-znFEwAE+iKH{ps<^lD9kUK(r(eX;eq(FP;ARbXPT+GKFHSPUlpS~@op7Sx
zXtipMnj!SKf&1{RRa1|Wk3eRD^vhWTm;|T6LcO)vxZhepHM)0??Y@$aHYFejLQXMA
zqdl`u<v7>aNyXsK3t#hhXQZyr5!d*zplRg|Ixd(X6$uHQr+7R)Y#SWSRWmcj&Xw#%
z$-M%(P!uu?Lv$}!OW~3axdW?0b>2f7s1%|_hzLK|%jVMK3KCN2zs}3=k`Y``cNtN3
ziQI-I#k58xt3ZVWoKk@nBCDv?q|ypl_`Rhv9+9ZUzR4ljhHgftBDIy*h8nb5Ej@TL
z=&2-rOewP}e4t9!{y6&45HAbyvLab@B($(M%H}My2x7%%j};No-L{TiZNJ<#gO%S~
zsy%u5QYzCABcx@nQ3I<+Y$NfEHMJxnx%TTFGEC9OcHcg+0k`C|?)!Brr5LBLt#<j%
zd}iqX!q44sl;3Fnm*usU<<(ODm-hOd{_i$E*X`naKu)JV;|)?jaV(rK;fq2yV<WJ(
zwEX>2=X-y7eWTspSZ&{iJEw6qxOfg2nZa%6fN9-a5}1=gat!<+_628f(f_bq5Y0E!
z^C{(|rLcE2r4Sr#6jpaikzR5Hhs|kK9<ikdf=X77L^CUG)qyYH;Q_|Rf4|mv>~PS)
z$C=KTrj(GuQxO+3stBe@ZYpgS{`lg3*}VP`C5P#`-v?ejNpC2e2x)-M(qL4Xprq1J
zw;V*YeKo^+%iyz9wzqFP-XN2)rkG$nPgKG>YNX0{Lyr?5h@~X4e|2r6sf%Oe00||G
z|1Z4G#7f&u1Ws@*hJ6(y<8r?6WhcOFRfyFhASUe%WuiYJzl>jKX3Cbf@W4#bj;Ze$
zkRz0}QLEaM_`(cyis`Fb)>}#w@tQaE&2BFQ?>L^gzYGK&tMsXH^ozmsr+R@+ialJh
z<y?T5F>$$weUm7BA)m|~o6H?i5xw-*bM}J2=(kzt^78GA!#BH!xG6CV+OiEkY(wDx
zLi@S-9m|(U;)P%5ww!jB7Jy^pzk%m1?EuUPb#uwD_-LM-{K__~#Od>i%Es@@jRMK~
zy#!kNjeh34|J`W(r_TENTIv3`(z(0;-Nr}RSMUCHXZQ7?6#_~>xc-EI>S`#lY^tt?
z7&<QJqyS+a4$dh!3s8g}#dX0rdkLADFpbI@5~C=}kXC+*dKipGBHEx}C@b7bDY-m!
z+VY=qpnMKY)C)g_gJeYFNQr9n)8XOkrRVV9!OO$fs?8>9A~5FCF!X~_kcK4S4e*l7
zVm6(39YZnY9Cs-|*)5u;QDTo^NHOQ6mu}Ld_*I9eVTJ?IH@p*6?!okF0#Tm>vgScX
z@zHfJ)M;jCKt~~1FAO-@LSSEmvQvuiWLfkCs94D)>WwH&A4qn9GgQ7r#8~%CCJB!5
zld2$zGU;KMWvCsg!*{CPz?me2L2`zJgsxg}u=riHSHoyJ<8C+1I1(0Rgpw2mJPz(Y
z%2=Kl4VoA?3f}Uvi|0}=!7LR+3J7LquP2`PahRF8ONcKWVycE$J^fZ9eQ61<_`;UP
z#B=ASSZiCOKv<X>BLs}@Ng@KN6Je||n)*JD{4B~s!X5@*MloDvHuRJOCP@e|oXtov
zqsGNlYLehtKc;0q4o`zm&{X&tSXV%sLG&>c+|~t6HyK7%B-Mo5R4)lL1S|%JI<q#-
zhL18EJpjZVUS1O`*u@0k-10E!@zVS(aK|uZXNm5u$;N|Wke%a-p}Apbp({;`2I4)i
z_iv(6k*5&kf(;ZdEFF({UgHd-Y<1HJ4l#eCyor5MI=3uus)!#pl{?zJ3Ad6N=YKyR
zUCh^`>N6w%cYD44s2Kloef=)~_pN-cjkm`SYQvtJV^SygAzQ~FJ{hCsJ=;FI$9;=j
zMaKDQl5Y6VXve(*Qg)1woeeAaNc(klRa`|@mfEZS^7k9ds~hb#XTx6a?5?>vnA@|k
zJHYtXqI09@lS2ZX;&!@hy?&kjvewa<jf>J&jLgM^qh3=6F=A|@Y~A&HQM{`HV(qS9
z57{tFYV&H_wdsj2Fir>Mw=H<8OXQ=90{KY4ALMbnV;7+Z@LF60Rh2%~x&Ebm&CxsA
zaS)ii>t3}*oqY*;S7tRbm4_>5Mu7%^mhhQB9^nxgSh*s+!@ZZg`)>~cM(fMi95DI;
z24K)z6+i<Gr=Oy3=)K;5gC#rUtYzozQni9OiO+|et1ipVk`$O03f)L7W1Q&6$O575
z4D;m_4;0q5r5Mp;iqsmPU;u)|KTpP~A1(p|J7{@t4|d<6a~Cd|_j>!_;OG4}=pInh
zegBvKhJI(Y8(7vCzyS^LT0n$t`}N+9Y(}y_Aj2MGW$^14|BGj=2#6oR)xpr?d<kL8
zKaNykZ4$LN((^h{OF;mqDw;##0yllZ3Eh_67@Ec)m1x-p67^rX6Zq!~8%g9`$8pNB
z(w1PzN0p-_;@g7a;y8=~4%CcVM9o@6-0;Ocfi2q_w(v(xQjPgGjz-yOY~V!I<hfcF
z4yd;}ePMuL+Gp8Ubpb}hDlI|3D{BT_oJYM;)i~CxZhGpFgX~kqkV}J*1@4Y6+WCaC
z21not4kB+wqo!~DL}1Ps{2)1rVoYs`NG5x~s>gf;{SAk3*41lRy4GYa9dHsiyn}*p
zFAg!(>}YUaS_NzeZ)m^PIxVznUs-8?X(;h9RzzDPc*sU5N_0DUEI8(x89MC|p*dDG
znCdaqX$(>ffn-Z)XD)dqdKQNEsdiz&ID^toOsGRf8d|^Kd)T=DZ04VuRXu>)7Lbaj
z-vc<c;lGaAxRf8F)3p6T>omTm>a~b}0Y?hv`!xOAqkl(j{?m~OTGa>{wZ4|tdSv;a
zl2KE=cE8tB|Az%NgKik_f1-k0(A9&^+PeP`I<rE}0RC9}yaIoO00>>GdWUvR(Vz+)
zrth(t6s?YxXg8LjqIwi7tZ3v8UDd2Y7@*Q3jjK2C2QDfaU)77Kucud}M#s3|*u}C{
zWnz~C!D&5l+37S|!B(()AnulEZ&&9t5|-E50LY`#D<4>rL1PKt+X$W-cTRFtt`|`&
zYu@iQ39o2wr%h}{Io8ygwV7KPx<;f-Pb$fA<=&l(kWd6?{3ow!mr(>Ip$7VBG8@9F
ztT+NJ!&0l7KGL0}nm)H8PU4uFM~t8;|6YLP@-M#3R5bvlDD4!Q#S;67XPKSAEC#Mm
zpG3~~lirY>#NY1esFxo4P;FD{6%6;RZAyu>SOe0l%&$2kd*0FyEQe?0QO9wZb%Rk@
zcQAsgkUJ;<4Rb=*{{C+1{reAWpQw)@(~EX)v3o}8nTx(MP(3R38+*Zc;x#p2eC<wH
z6{Y!-A0}r#1?o8+ALVaTkL=RNZ><e~zEmO(8)g^Khu~r17UQI<juWXsFuau5>nW73
z8eMGuuL@nVDE<fp7;YS0zIs#IOC_^Vu(iM;X)$?q=m+`{;5D-~8V^VG$SRIQr^8C%
z)#`q+VN23wZc%f)SqkS=7JoFPP&?M57I{p13zY)E+C^-T-b>D6aceLteLa-(+&Zko
z0fL1_*d*~fkZoHv&K2I}qYn&G=BH*5D-C4(xPuuMrsZNiu7Wi%_*Jjb!McbS$wkZx
zQEM6sp%Kh%_Q61sG->1~$*_y~)-s{ZfUF^{eN!+&uZY>hHZ#MUfzZ5R&}<H9;8k1a
zwkXg)m&tcH3UQ3U>>U0n+(Ic?3Fjg>!(D@W!iJ*|G>aQ+TX5UZq4z7UH;Qr4EJ{3`
z5mB-KF+<b!9XA)F`z2CNgSi+f=PEZ!%DD@hlmn23lwW}=Pa(%`CdVB^jxSCnmDG+%
zqd_YA4YxMTM7qd#`tsg%XeCd78m*kTLuGGD3rwr8e{)vvy(ybxIv3VG>(zTvI*SX0
zVgNWSIF$+PtSw)J1!V6b_-9u4SVkQ2W(;8YLIXHS!%#^sE|06%vaWND_m^>0EgQ0d
zg@tO@%&gnErpO+lo0+1GlX_MaH`A&cY2}?0M=RZm&)0RzG2yiODLOg5QCX>xg~D9Z
zsE4j{3M`~7aPPZgKs+S<qacM@Qvt){u)EMFO1^|LPVyK+*SlV#%TOclA~X>HWXuA~
zJkFTe8p{YU_qB(1!KD#1ZPnpF899DK?|(HR^Tv|m;=|Tyf(eUi!zjy8tcpMJ+FUD2
zY)MXR)u69@7pAYa(75mH*uIGHsF=v{sInu>L%&;mN`BUafPE%B`l&&`zAfHz*pxos
zSIu<$_Gaum8>GaQa7#)NfzqIR5}l{ERBL+oGT4>m-_M$ZFQr9bj2JtTb60R~@Mhdp
zJvB-T1Lu--C4IpHouz2YBF`5vzLl?w!S~uit)iKE7I#D%g4*8^#9Q@N<Bv6i`!LjC
zn7QaLOEgtLr)rXn&KAJfgX3mU?NY--+<Fkz+<2O`C}#ItDxoG%KkTU&s8e3KQ8L^p
z0Q}>mckY0JcZ{=ygnF7=VMc;~wp6}v-HPhe>_h4u6X0o3Df?V~FT;ZNP%xz{QVosx
zj-Nbl3x&3-BfGvsEA&Vd(P)&Z1}1bxt75K>-)yR3-dGEV4=+YFtQz!{sRn(WO*N<(
zQw^?Mq#E?JL^br&2~?x6FB@i(4y{nSAop-9A``;T+3y0v36$X1FB;A*xu6PG!4Hnd
zrp}(i(x^qnBB*=o26<iKm?hwufM?yI65ruBdx^~(Yl-pUj3q9X)>jK%L7r5jgw+Fm
z6~!a9G!rGL7^4JNc2I&DDfiyvjF5g6Za}Eop+ZW?6+7(^H)aYnY^0ijGqCAS!f7<X
ztg*BE>G9;<?_!6u@AWHd-`~3Z&kXx74D)(r1F#wPU+bNfcFF#G_0IqIRzBCuq2nz8
z4W<E|{O%w^UT>N$SnF!WU<x_O8f^W0u?AaRYOnaqk2aQ<H#)0#)?l-HzBUuBi6&TL
z<Pr@X12g<RzkS)<_G$%tFGP~xtHGBg;V;{M&9>+2C0!O#qR24{fi+iVUEfg!GP{6n
zNRG1@FNZE?5oa+9vz!dDwtw7xb!d*oqrdFFIoR8Obprs!<lUM75@zL}h8&`dJUwiA
zdD9=q{bWFqn>ex>%9JUp=yi^!z&;8KDx)HecT<hgW}6049I8ld;w%8{8x>G9+S1=R
z_AR~>ofJC^U>n>dHO9gJut&`ZYbFHW*~|v%aqyv~c~HFp5hSrKK=T;L??-ALHE$fq
z6-%=ciJt$P<lL4hL=O?rgo98bb)q@yGS<AO-#U3_wZCIrqK*66gL>;hqh?zTu)MnN
z_R}cOwKfa}sF@GZ8D#|fFjVucIdU2a_a|dOhlNz4wH4+Uho5-`{5sELNMZ1gF%8!M
z(9FsTrB|nVdFEXr>723JM->nEBu*i^3@=U<6z^xXlGI8q0{?}(x5g@a{F6t1k<k}s
zk_DLKD~Kp`9!K@ET9oDCc(~lQ`)I518|4NtOZ@9%8?n;Gx;$SsqJo@33g3|QbN6$e
z2BI>_Se*=a#p^y498FCAu7;=EV)t|$e++xI4~{CiOr!)36*iq3s+c>VXE&ogqX|>!
zHOrTc<fj*<`T68J^xBe1e`#9gTSrIeN##^_kWls|&5-iX10?~9;=?}07<5VOBDF<@
zClbz!;<srS`&Txxc_M!Iwmwm|<YwyuD-fH0d%e^tsp7DuGC5P?Gc(;<X((t@6R1##
zoS>eH|4{6Q`gr0myHY``86Hd10x)4Mf;SJ-VH5`x_<iTii|3{4%7$T#YB>s(IttRf
z2yh%iqf{5~@YEfvFPs%BO&32ZB)RU*DS?Dw!t?-00IMchGoZl$kkB+^lOuI5x)e%%
z<gLP@+2?=78tWeBL9i-<`bES>mTAPy9sfJp=%|!xT8mn_Q7lBUyCUU5ZTWrrKF0rQ
zWxR2AY|)7CuT)7hB?A<6VMh&j45c2aIXH=ASa>#Z_Y>Fdda1wTkAN5LukMf_I;N64
zf{9Bk_ewH;p$msF^OgfBaKdaG!xtD^ee7ywq)D_Z(I)T>N4<19!Dj&*>Xtngq(K#5
z28je4%$?5iN;oZhC6Hxau5W7MnxpP6Vv}{s6Paw%stPEh3<F{1wb9Vs(FMrzwZI%G
zq095kv>BDV9v)qFczc@k;Et6>Hc+96Vi$|nus-}>Nql5eaU*2v^5gDd&1%ijMk^(H
zm$#PmF~i3Iiz+HyasMI}APs|Mz8n&=sN_`@ZKfG(Mzo<fgxNH^8^4`83}xjEPA_V$
zi|U}dK54Wq8rrys=w6%O&=+k$BdV=%I6`{MWyLgcilGf3iD#ksNq>xilCT-%KST1&
z>3s@f8bKHf3lg$L=_zb=Ex$WP!GHnzkPSTCV@X|56?<MolSSay7J<^9<fk>^{8inL
zVK`bua#E`{T$pSeWLpgm$y9__q@itv<}hPp%Sze+t_2erTo#R2x`tV)GIW`I>*e-<
z%cK2rzxUvN3;yxz_j~xiM!|kWcj|JR*bPk%+nQ^3YP(doUgT^TdUG{gKwo2^#Rw^8
zo%qKfE^5!>F)ZNRSSu_&;Z2G6o`_#XeV#6;tVS2Zm}71LE+XANMKic@6=KVwRP$YV
z98rIT=WJ-6bCiD!Q4;0nH5bRr`$IxL&pRWxx#M&7X8tW>+wj?&r77UG++!SbyLk<n
z>;ZId&(`Qh`5-;*poeY@aFpRmmD~6=W+8NL5n0=1B27M@ld}XFzfxcj*Z}MTo0yOw
z<RlT$Evlu^3K?K*xkZf-j^U%%Z}$KCx3Z~|;kDr-_AnOj#0_yWDRs}JQVVb?S*SId
zZgsLJ*^=(rM#L@vJOlAZ^qzh=uls3mqRn!lg!-+^e5n%9AWV+O(V&M4`6@L&F9JcM
zv<wWREgN9SFCnZHJo%{uI91Eo`_L1^(5vwO_*7X`(Ram>t+YGe>HS=+MuXv6JT7$c
zQZt`CLq(3w94+y_5@T7^5e1qK2D~HB%0-gx(<M<$@|#u}99Zpxf*B3ddTWRsm0_d&
zrhm9wvrFY6zg4$urfpxW%>by6L23M8jF8WxZXk|7%tg`-04)RXwjN+0AhldHD%Md@
zw4q;&1%bPWH2-(CfK-OjKLb5x=QdY+8e~zIxjVm(%BR-x`fA<uLfjv{cKRx~n!%)$
zQHFJ?u@|M<w2)zJWdAg1hX>_pI6~^EVT=z8n}rJK)F28uP)Ub0B&#rz!^*hGxLmS^
z;+sdl;QWB-2AR>}Ph&|(YP1SdI!0KzM7Rh``-w)xdym}zEwqiXw8B0thRbX=qIzuX
z?_8Bh_<1ylx)DbSOJYE+%&ZL5o3R!MdLDvUc-ls`vEHq=$-n*7|8Ch_2Mm>stsSq)
zECHRZ;pDUzt29%(;TXsft1%pnbDT(o17ai#C@hnjByWIN;1n51MhGZ#V8za=1a#8S
zkjTpxXH#)xS#9%doXOjSxX^r$+ZRN)l!;b@S{LS$JF6unFQbFC(xQu^N2FmdO4*a?
z7nDE{S5qbPmS-(&h4I#v7uizWVp;U=%vhi+im^gvMpZQyEJInu8l`gDD}A|*OJsg_
z%4PN8Z|>9fPee<+UROQ;X?OdXC6j^=uC!?}RzuBnZR^ove{F&hoq*hM{|4#}hiDha
zQj~$(TTKC>v%KoUWOZh(CtH4dd0Cu1F>X6rfK06A-pkRuDoM{UOKgwKE@-J0*;E9r
ziQgD777Lsg&`u$WD>KP}WED`dX)cwj2kX$LKr5mD=J}4F1?QQ#a0*hree(kMKgLMG
zbXCV$G63?x(a*AE7}~9{GeAZJj@CTG>?s_fP!(fq4y3lKEsNml30XG+C5)g_a{qSj
z3;G@29gJW_?{$0YTaNf8wykN7Z3`>6WS6<PyWH>}`fbyi$n&H*{>2Ol{AbRkEYnkz
z0Rmy}e#8ibfq#lY*v<^-<;*Hkkgf6~I@bBSjdD|Qp>VybK1$Cp(OEJQ6+Zkzoy{2r
zy@T&(L7X?0zZ>b2r4ZT@Q8*UM6BkNToIPwHvhTa<G@f*z8wnc;eyfiL^}QepCW(?l
zcoHR&Sjpm<PD`@L*rFs&bILWW;?B9zs*neYPzH&FJ%_>q$ROQA5b2w^gmMH?_PDXC
zXf{E%hQpGc8VR2>x~5Y{|H6y5Ut}|*lNbfaXcGW4SVW0H6r)W7M_1%guw8(nnmAL~
z^=3ctHD3{((}^N4cdMRO3y-X^QBX#VwwlOpk!ViL=>vN~kvG|MoQ!xlKBn#B4VAh9
z@-v#o@nu2zd{Zzfs-}f~ye)|bF~KI)ViY)nxQZpvcj##=R}AZ+>~#xNzqtELFd}4<
zZAcmhfCV}N7YA(4Q)|qP;;1U6Zn2@bHYzzIIjs`Xw5L*|;=!+|0lH&MFqPMu0yjL1
z95bbpVv;qz4#0Bk&fi|H2_7B|x3IxxM=;`72&1=bMc}b339-tP*CbtbgAramXw{cK
zFP@#9E#h5v5hhDwMJ3@g6VjtnoRMF9y?=06a~8^uxlm>p3Xa__g`VbnFm<IBQJ!q}
z&L}y-^@T4|6OG^PF-~-UaVBC+;lH+F^#7924EujLA+DPJYo`7G3MTt1#D85~U%Rva
zzm3n$B&iB98Z$*9*O8p(O900B#^IPH|5tl?Y59@Ayt=Wvys`HE?dJcoAJGYMshnUm
zssEsiU^t&6NoA5J(P&DJF1M)iO`A}GGEPwqOn?HnreyFb>^X%=r8@4i01Fii4^Bsu
zdpyC@wz^A95%%oW!Nu}}`8Av_#{Mcmz*ot?u!Q!&E0$9)tkTv93&pKBx;Q67v2%)D
z-wJbT2IQ@Q?KZpidXeZR^3+6Rx|7{px*A%QayWL+&DSGrD6CJd7iTpqe^FJMw3+#B
zCZ<JmaxPsr0{lq0M?PA=7ZiA7B~q|-N+#a0WF`=Dl2Ux+nC_^+_fjs}2Pn9KO&s*#
zHkM^Km+y=BH*f4Z`3+(0<J5m3J(sB)k~g6~@+yjturv+UWW%DCgB<vE-PE7(TcdQ1
zWfo73;`kg()$2Tr23Km5O;FOOw&4CiBv$k7vl=97t4Bd~Zy-a}?{C?sAA+*T6-a^i
zT_hM1o=j00l?SYR9zq4AD4QY~!ITnY#q408K@+{Yh(}oR4_p4;{?W7jSG$$z<|=Z=
zx%5vE0=q#$B4tlQ``&T_HOaR2Wdb2R9W6dNJt9XP8DWVxcwu3uY4i@?rtoLp9j28U
zq5;Qw64W2m>jgp!RFM&p>FLE$@!E0mM+~Ws$YyZsR&Z$|JFQR(kqO_v>#RNcz>tui
z>&QhfykA~02w=Cyu7en>*MID$X`CM!Y+l;$qcuveHW?B4EGze8+Oz16RbM5*q=mh9
z{tFo|77_jq*e-M_#yo3$r5}Z1dK0*)kr3g6D2N@EP_XHbj?_Rhg^#k4@j33@qbR0P
zZfc{AK^PzL$dBMFnX3}tgHIX`rs_@~jDV8W54MR}!lzCCgAH5}c~u_;<edXm4f(=0
zP^>P*sv_m9&K3*hPcu`2BmCQB@}|#I7k@+xc?$@nBaUANfoPaT45EiF3eh7MhjhOV
z4pG6T{JjP&QoURSi)bttLL*aSCLUcMRjU+%{niQR>mbWQ<|8$)Xfu>~LZ<+kBCvDf
z&1HALgsjaz>K{A^22qeX+@a>09#|Jt+<{Fs-Cnh1M89S()Xt$i0oggq)uh*@%R^D3
zqWYWMK{T4&e2u2A-lOrIa0c`ob?D49;;%59A`C*}K&9+0&szQZgVKxYJs4R#w0gMG
zQn^^Aj7fc>hYvS-Lhz-a()=<HP%XGrPM%O@%P+Cq4$plwh_c)Q7LueYSQVaM7F5<<
z;6ai6T>xrO^AbS2fs^(S&RMb>6XPh(8;Y}(qxYH#jD4{rSmx<DcU`xR*d|d04*d74
zeN4!mPT%L`w`u_@Za+WTdxcruu{Px!xna18!zz4D!(oCTl>4%|+j2&hTL7eZg*uR|
zlq4Dxj5v!<VxX(!<Rrejqa)>}nh&RNJ3L=Q#bHVK$1ofM2G{?@1z-`h%#fcn^hFqd
z5o6E~h7skFko7AS5ZmI@9Hv7lTA+=4xZ`19-QmapyY>JhJzF_|pv)htB%oH~yps#$
zVX{P{s#w+0ramUx#AH#Zk$>0&FUmpOZBP<zxD8yCeyR^FUw3p~F9N8^_@md-ZPq4)
zUu>pw!Xm$Yb?|z3M<mBKd^8eUY_LKk7mJ#Ro}1Ii1H<Gdw?8H}QkN9?dHZ{wGAqsA
z@D=-fzI#mN#+GY|+1Grbk;PbgplM)~`C&v!xzD0OuN!dYw7_TA2P5u8{VE-P&fTJw
z9SIKOwjb2@UTr^n_U35&)!!87<y<U^<iRabO<^Wc5dTkq@++xE@%Cd8jX4O$3}SI{
zLUAP`aTx-kh=U7<`DnwJ@@{AJE#G*n@TzLA(o8Re9+PuuX%2$m-vmWCNZ?kTox{=(
zwQaqK|JfKeOE?kvS*V|5I@9DVZuxtd<Q!^1JHsIT6b_PchPJT*8c?GVKgOy_(vKN?
zg7yJ1Th~lmzK#05u<zr}INCnke`O>iv;l0Q(j7HRh#bZG_NPfrL}{6}kW3u&pDzEw
zTimiCFEKxreW0tOw;#8`Xeu=bd9rR0_v<*2+Wm1${r^5jnD|ow{~g1BUHGpD|HT&i
zq-c(~?EmXu*y$EZQjEqN%XCNn!!18H6=1T(GIY)GpZJ}%HEihEeC?XAJ^or%7eQrF
z4VoQv8t}EifBbmM|8BGN`gr>5?)29^i(<sEwF`umHfe=arj3WEq?P{);fL=&U->hS
z{paZw`<QP3x!hS@>y+$2AFbTkf8NFi4ux2s3P1VYx9|fUbky&!Zy$PyN2`QHj)s7(
zLvr;+{U-?p#GBI&&XM%-RI&Skb{MyT4<RAz2n(@y35N;h8vOu0O#;cUs2^cra`uL&
z(3BF~wtN|3Xe==Gfr^~5whmCyb4G(8M_F$s(QDz<j}%`Jd<vog+3r(|Dhl)f*owlu
zopI?0&@r@PE0S;?j!HlqI|jh5gkg+U3n*=t-0@jU&&M$V^U21Mpkj;|(XGWDT-YO@
zm(~Qc-cvH`ZLfbVv);0~u3CHhnaD-NgqJv`qo4O)t#sV2K@5~SH>X$$Zh99Nh;81U
z=%>1?Id7cP`oW1`Ms>S+DSh3hcOBgAre09~i`QJCgMde0n^ND*XV&?jT-p0$_W9pg
zFXn$(Z?CN0o&UG-x&HHgG|rdy$C%X!-PH3m;6$hMxql?${2_<L^7l)f@BQWVjdpuu
zwS6mx1Ui1)fUCyu+O&R0$mKY_Zf!KHp_8KsdV>=u0&XH9(vBYE_z(WT6rdP`_Y?kL
zr(gQF$y)3O-Tbq<Zbu2+d_$c?ds9E8HaH)tdB|;Tackx=w1?qB^UpUTSl(OO7tdwZ
zIbOFRsB@qvMldE~UTsbe{A~A>#BH{$qKj!ZME16!gaodHQx(~Hv461pOc$z2LfCRa
z32<sk3Ik#ll@LFs$T-FTl`%uACKje>b@#Oi=6~2{_W6I++yBh-f3>q#^8akFKDs;q
zZ{wry|NBQjnHvuN`0AX2eevgk6>q;JZ8w#}&m#&9qXJGq8x-%8G)IHrJWM&12T;Ud
zNYZN@Q9>i)J2%|b1H6z^!<hIxK6e^%?%`2p%M8fzodV>J`~5I&bsf=0FwPS+@aj?&
z2o&_A7y@%$sSCGE)QBS{cg5m~F+)S@<=s*16q<sP7!TUdsD9N|JW&_%_HW3)R^81f
zT*UDrrcO<aW<c7+Fdh%(<dOr6wG8rsI&dB5xK0#KZ4e^=m5sYyxV>T!&U2-cG-njF
zu-I;vs^eICKHiy44L<&`LZ_)ZB%zd%Lt((CV-&OS(TJ7rLCv?X{`_kH=T}&DMf^Bz
zq)ud_66eK;mY_Py2XMREhkX5ka77KjPJ`22k%k2gj^bE+&Lv|KihhVwk{K!Q4f_L?
z49u}$qhhesNYxmzMI0LzxYE$<$zodUCRd`^GnfTCkv%6-<SCDK;<SLe#v_arIL1&(
zx?462Lm}GndCuB?o(&QZY13`t0j9{B(gJ1B!i;x12!_<Rr7qUQ)k6e8nhYkvn7G$z
zFvbEGhB39OVC+CwSE_(9$t?-UXVGAQ(a6ryC=cU{!&*Yxa6*o1aGxZ(y`hVZNDIB|
z0XdMEUK*i6E*&>f5!fO#%Hf)FB!ox9dUFnZUa|ph-ElUpn(l5=;MaBZRmiTR;5fOO
zb!pl(UCGVBL98z{y-hu5{N+Cw(X;Ejt!>V{rEEGvxP2DE-7){y{+Yr5bEKs!CV-vJ
z|F<7KD#`yIEw9}1|F`nFHpv5iC_&BPt9Hj<^q)tA+)8XADFQe%8V04$u9*B)V<s`P
zD{Y<qb$NxD*|m+;&hI$;>y1RSpP6KJVp7#&4px<9Rb_bf`n22}4^GEv!|xpL4Zh)`
z^EaGrXL<EIR6!0^NYmpm&&d@A*owH9oMo+6%X|7_f9KB!d;b?Xd#vH9^rIL-jWMl_
zw5oOk>%j;NFayTq`dd$xKe>NuQW*#k>Gs(@?+(yU2m^gD+OJKlQ2yPbl65H7^oi*U
zF%u!jeV|Bf=x~(gSisGGu9MDF>MP^oC6WA0tXTL?O`~T{a#p8KRNgMrm({eYtfSmx
zK<m>WqWK;}zo*E;@$hl|(GC(O2BqpSccc=46F)~oe<vBAg)y*vCyny7vB5fEi5-y;
z4b3?I9kdzO1FUG?=E(@vtenmYu6b?GnJ{HEsMY2Hk}7TT=FyXaQws2lVKFr)rlsQ%
zY>^p4Wp+MpcFTwHzoXJ0iUY8klfo348qEx#QTP!%q4=mwsj{RXv68GQ;PBsv0-<7^
z(nI`EzxeONawQt6Gz}%njTY14Rdq56D3ofdHWM_JfVKz5e-|s}Z1?W2vprx3lGQy~
zYd_EWsFusiQkf@_iqe*6Ub-gqg!>?YS1=l-$taCbi5^FTio|(UnFy_Ye9dI=fRBnB
zBC^WkDfTH>marnl@TPViEfY7q5SO_k=a!VEN1DtTx~_xE0x>6>UKTWFG#p%?a^u>7
zxsn8x$gIjHS*Eo#ZyZFQvIg_Ci{0V7I*{AmAZ+5TPIru%yXbK-2J58p;K#}cibkhY
ze*+`=*7YGiE5oByvJ&e#6)LxiMo}xIr~^)(7}1DvOzaJuEoi4hu&Fg1z^S$C2XR-S
z3yUWLk*H1rCcTaN=XJO>mCs)Na54;w8C8#x6#XSpk(qX_a`1~amZ|_sw9~HbE>N8~
zQ(=qLGZ3^O$F(Z9y+$cvAtynBy(lw{M_Dmb3r>=}LNA3@5`_`7G@!v0{QsfGuEll%
zzmQ%6t<(jI*vF0j+vN9{NQ-R{*(n8PAs`crN;sw=vblth6JW_DX5dpP4)YAYrGy>M
zJQbLkgF+vyPdYO5O#E`ubUJ3Kw@z{H6_`YvVJ<9YIkl>WW)Wb_5W+B;e!miA#HaOb
zz+w92qbP3j7nBN8ZXCq~nnZw<1E(K`lrqkGr>O5_Bo=t-4oX0`4(tU*aWXzt{;<&W
zJ7oyqXDWj!BesTI&6DWqi^EQ71*N^Y^JMEr8I=9H^e{0=@?@}B1*MV6Wr|>&$@eUj
z2ZW!Aye)n#)}XTP1cpqFA1C?m>5QmGw2(4y*XDtT{y|Mw4Z<3`8p!4N@3|M&6r90$
zo2kqw=|IQXhNYQITf%8LQmaiuipdN6zXOA>2cxE6D=e1P=9^*4y>S;FOAP)D<pvpM
zJVv^#1d9nK6zQ|%1O;cDSFwpk?wr))+&>FB6>}Fli37~(GN-UXoh?CL6g4m-<{Xu9
zGsSRuGfo61-B`Uqxr;1dB}sPg>l05`DLOaho-vyV%XZE8wF49u-soMB5G*3-0eWS5
zl7^XL@HyI!S@}|O3Z#6wm4r_2k^WYJ-72KBcUP>M%W>92XR5NHuJEbp=aa50IIqHG
z1s)Y<WG*U-xpKH9^{|qUEKE!b&Wab7_~Rr%a6YPh+Qq~HMMnH+;kILO=Os{0x&oI0
zan<W@)eNm!P7wvU_uSHJXHI(aS-iB=C$)RM0)Hy6Bsk?u+=#2TO)tvO&p#t8fTA?T
zO7A=&6M8WVv_b=TGPPS0qG<U_S%_k0cpV}XC9bCa$*?3S3E-(qzIMRAtlUt2x^!G<
zTUA_5D~<^s3x&(-R|$tD|0kY}wwSu+vQ3k(5vC2=;4lL@kzjMHzALcb+5wgOT-vGP
zHKM*XsVyG5UB6oB>A(T&6z-sf8)vz(n>)^4qsHrojx$oB66eEfYm#gU`;_o6hwkar
z>U>MqSm`hx@am|@e7J~kWH7<4qv@xk7I7D`M41>Zq*EsEM+!yMZsgfw%setYqR9r<
zR0GLaKF&}$6>vs*HSNOuDH*y<-_BTHB`nYoDrBm6bJSOFBKLHZ$_2nz?3Q^sxQVAj
zdpfUO(Erb}|4`4a;s!Ru{`=AT>RQqMV{N5#Xa8{<pBso^Tr}nOUxhhZJd@lQ4fWDo
z`$MCf@gRs##=!}iYug4N5B$#hQoFs>{{H*#jXn4vI!=T1oSdrz%)pKZETDJ4PgwyI
zc4ZE;Ecz4<pjeEYL`DaRAM-f82iivWQ<R_k*oGdA9!<+9vut{3Y%#G1)eg)Dnlet(
z{bVpm&e$rOVUYRTulIbm{vDiS(zbI10-Bi$7fv)S53-MFBp$_|I09w_tVNik49Fjk
z{A0MzVj~gSmJ(IsT$IMpIAiN|onxC!8B@5Hqs@HNKTXc?%G{I@nz?5AIWoV;A@-!q
z#-jo52R=X0Z9a!CF{%^RKz$Akfp||d_X<06i*k^K&f3Z?o10&|1H*xWgfdY_cKN#9
z_~uS7)%X9vP7%HOi?`d#F6QXf+m{WDPE&k{X`PqhGH;qgllUNCTx+$d8}WR;IeH)+
z-zdPU9Qpxj(I5&^_i6aK8;&Ns{+oy5&fz>$3B9bU=zd{8821VffC9i~6>o-XV+CiX
z0lT@(0Fo4d5>if104Alz@gNC$Q_3OtRUJOzx}o)wOxM^D(RRkYzFst#*vMI@6B{Ny
zJDZrs%v#e|UkL;%-<Ke14b80Zi~CYJQ8txDyZf5)w$>EGdiNzFu*x^)HrmDXX7I23
z7_b>0!@urh#%XxNU!0f4TxGLztJM&ZYGUkf;g;^~NRSB2I9TQOC?7jX+V!n09RnXR
z7K+~w&(IQSOfFhqVV5a~XXFWn=xgC*Z-K{l>J}`87mPw^ZGTbKT~uM3jRl|o1mmdv
zKwmd>zOn0@Cc^S9Eg-W@!r9$8D62@30JDxB3Jw2-iSLimN?A<jfahkQaR7~vkP^ax
zNo;W45dde?TZL5^Gn1!JWt<?G=oR*vxp>X{){&YHLd^b+p<1#LIWCcK(S%!q?z<lw
z$}5HL$c0RJ5|O87XTy`gF2K(m?C<<}_weZ1?$ftF+D#NgvvUbM`HL!a40n<+i0!SR
zUZ=qs20m2*y@emL<~$5OhR7smB>7`A7#*^Sc=~P{jq<E8ztZ4@DXSWuDQ0FX#ix%}
zy(%QBnVs{&k^o0K;Dg$V#UZkA^+mbAWh*JpO~#?X%aXbPvITl}-CM)}9<Oe=Q()$Z
zp+`D+aax_ajp7Y$YEcqz90e@A@75y<aY<}I^r40OWD|qMH`Eivd0oSf&v=9P|GDKq
zR|o?zEB?>Q%1TN8)47ZPb1NU^|8MZ#gaNRh{g&lK-#cQW2~r4ldhe{x^b@+_`~0;N
z$enSTqGU+rQ4;znC)IVw5H6vHa>#*C%`9q%y>iOMclKZZ?akhgKOI8xon&;LMklAa
zU*Boqx~wkZ;@GQO)x`GO!=Luw98ix=(d&-^PZ21BZi-?>7{+HggF+R|3D1a|x<i(C
zCiGSX4j4oD86^Og5a;>^Qapn#R{b|{_Bw9D7QOn<4cK?hpBd*rGQB9~yiy-C&i|Fw
z<>iw9@7mhk`F|UqZ+Z85-}*1$R*Vv>esnVCuqWQPo;tl+ttEa1`%TyQ3HBz(QHc`@
zbwJs2PT`nFpPTdi6i@QwkW~((yNN?+(`rG<;;>MBqI4sSgt*zUv~219r~iGhvE{$_
z?wK<^!JkTMOFu+fOW&h}|7rm+{YplxvEU-HZlycoFDSUBFCrnP?;^bA0=o0*Ga16T
z)FfW+z1)=<KnwVWs!y#yj-$_hU72xEuw)5g+<+F}zS{e%Y0;kcl<7L4Qs5cez{E~l
ziRZy72OLygV1KaRfFCpo{OWo38><|Sr{UfEWBtW5tnlL5^B3Dc9yI*L#Q)=e6^nVM
z#SPW^tOl$?P@P~P)ipe(RksRRpnnl%q(|(9aMbj|xEqBTK-j=>LyKoyUGw$SQ&8V9
zF`tySfWj>KTA|=6WZDo>E)-Q72#=9af+Tk(R<acc%4x}0%LVlks+C|Jw>N8tIEpx%
z9kwQ-hhlZ}9xkEoWQya`1L4?HK50CBrRMM$$v0>lK+p8&)YIs=;j6DUNcF?X^T&ai
zu6a<N+MgS$|L$z~nW56&-=JwYgPGlgzy!x+M$X_+!1MH`+t5uoy_jVq(z8K;ypD0u
zf_S{6H;9~Ev{};@K^<GLCN?%WHr5z68*RNVir_Z9d+E?$>=%iQO(J|#M$;a%>m711
zadYp+J>1)hk0~8+U;F(1+MikcAMM^N_A#CRTkou_td{aWtl#B-xRuX!%XM%|8tKi<
z<PMIohLMfsG~bD}NPDTX>@Pps=qzt^R&FUcA^Dh|KJmV~F@|~1$L9^irGA#g3%P$5
z#AG~`r)XmxX5C;EQgE)Io3o`6ngQk4ZM&g@jOqLV6c6m}&ZetCr>8q_UOXp#aqWHj
zKCV?2+5I0=XiG}ne8OqV*rIjK@UirDhyX{T!8}W+SzOp9kJne{EIE$nFZ;{9-H+qB
zi~cg2e^y~Kn6qRr$xHGgDJl^Lu>{uYHq{gIGi<VI@~H$RWS+<LLy_zNU>Ry`>u-0U
z#QG|LFvvnvNZNxpaHmLmA(n$~urx)UH9f+g86BFoMnO-KSzNK9UU=z2Ibir@WT5cN
zs5=NSH3<JGLPW~{GEQ>U@jQe5WpstH7Mq%DEwqBu4pTS`(vN6GIbT1xP8WnK1&#!2
zUphX0LklL_&-gV!<yy0d{=Tw~@oTW=h4=8pdJo&G@E)F6?|&H;UjH(3-ogeh6@X_}
z86q-;GW5(TQ|bpFStZK-IK3FdBmZU$fc^*3x3@R~Hi0c1coa8e1OzxFyXswMZT-Wh
z^BlJqpLfgc&dTcA`lIi@-+sFDZ1;K1Eyz1jTHwIR|MU9j^^5JjS4|(j{m<L|!`)}}
zb>|KJ*?WHUV*B9mCII*ph5~DTqhQk{60l1_N$=_!!|2DK_Wt|NFJ8XdfBipi4i4Y`
z<>$Zt?f(YHUEoMgPNRQ(91P=R^h=uM<4<Rw&;My4{BX&Et|t8g-n-l(w!TQh8D8%q
z)5X82BqEAXRuM_g(vqnW7IzGdE@|g8hmB9U2u;8>?U`WKL!qFJWloZO9FN$tN{>LD
z!20yHPF^xcQH+Ysq!evTt{rQCr0wk{lKai$Z8xQu`@!JcKTgBoBYA)_4v=RxsxZXc
zLLPSmbjbY_(gj5-wV<u-CIurTuD0nvg+o7#Px8|SzC!Pn07%s69A#7R?l?_8QuIC5
z1^KlAFPi`nTi}`t9P=7;4#J}aY~wUJ19XkgB^owH4;_SkV>Qu_QnWuteKGdKRpSND
za1fTFX;WQ}QbB<obj@w3d1ID{Q*SmZfw|$H+{D5(<Sop&n>Q@;SDu+|=2u{uu@3%d
zD7ugj%;xMgg^BnRc35hFK(oc!Bm9RnD0@J-R_>6Xbu*xqrvGT&Y<bNGG8?G(e8_T3
z?&Nq7bU!YhCWBB%>+k#ZKhVp9Wu^oh;ibd;1L#{wISAm|I*cgxMH7<-V`Nb*Ll|q@
zEMn6H*2fBEE9e&@yJZK6$r3Q;##xjBdwa&oA<2Q)YM6`>Ra0>^a4ZS+a}6lzyku<H
zQO1o1ga|u|Nseo#`DuL3u9<ZP<6{Dilh0j}AU!C7l9n7D#}?kF3mYY`V}jadRq42*
zGz}79F7T5fmY}GMGg31E%C9T>R_T+fe5z$JDHZmwr2=#GcZnH%sRjYS7_U;My1=~}
z1dEF^=WhC;h8{k&Gh9oT*=ZVP0Gzsu8C3|^&j3h3x4+$kv2!D4-p?s*0`tIpu>~SN
zx+xMnO;q7~CDT>gP&GoV>8!1Zm8#)$qYq3!8}zoSp1;0Ys--yb=!34V>}7SCg{_4T
zOyO?;@Y~(-a6F*65`5rAu_CZcgU4|m4g3}BIJI)}qCFTU0>TF9h+NUFz^N^F8qDoW
zo<+e3mB}V=2C@WiBz6VHF)5zCFcekrM$q7b!YJ25zaXm6SOfLmVflv-anZV)#&>`Y
z>Mei8COOz6^!#r1gW14Z@{3jv{-<Ctwhnmw@S}%v+`e1>uqlro18#mdv0Qu3a-9#G
zwy+0Aw}MkqsLG}P<S&0->FXAsJlXQsH{DvDOVw&$s@8I;mIY8ns1-Y-C~ci(SPg2T
z>91Ne*X635Fp|vM+`v}cjX8}I?jzYc#J03Cx<W^7K-@=g=J+G{7kO=<4nFN8q~}dZ
z(A6YvnzmawVZ$xo_@<gIm7QltP2CM<`=HPdK+*J_f4+#<lCU(yx)u{Vwp|WE^`Q0^
zY!-jDz|~v|Pv^tcOX4ej3VZ-ft}}gdE<x}s%KodGdUPu0b>aQ~`+;R8FKLx=2*g)C
zs8{Das8u-%8}s`)sOM68%tKc2T6hvCDTcBJyoq{7wVT-&O2dYAKlo38g=@Iy0F|pg
z^q~u3WrG}mY&EJ_fz<*lz{PuT-Wt?HK9mO7oXiSr+3cd)+s=MnFIM^2R;fz+;#E2q
zud?#tgT1eK!X3^1*3I_s_Z#;1|E^rEeYtAOx*8R8uIxEVI=i@g0K4&wr9;-bu`{x4
z$^Dr|zJ*6k!~X$J>J9aL#eUv_=PR29yqrdqWTZ{*ZK87_W`9Ey<6)xG&&fc)6yn_7
z5XWN41_$RzH3pH(zfhLYK3hv*tWuvCZLw)qQbZOEK4n5)-)Z{Kv_KG>V&1%`#m`A!
zgmLLfnC0Sxf=_q+R?B}Tc}mf|rWbvRvIr&A$LIb^3%Wqz4_1az2T@F>*hIi|ZMc48
zT)SkPKhR@sNjB0j$Rg~KZMe^p@t}uEdeFYx1W~2t^Rq-HvL<@!Nn@dO&aB!o(C#xt
zHncVgFj!BI2M_EXN{G3K-Wb7(&0{MRkcK0PorOBp-wpaiPqmy7S_+g4DV!!-LX0ED
zL}S!hho8QP;IXX*kI_7m$H<W7>5|07q`zoM5@!n%XG-Y`&kLeC)%7S%FxRTcp;f#l
z&fz;U$y6^R!_!?WaGRU$1Ca$aX{BUAij7`G3T!V1i&!(DS(wKRX9Qc9VzO08J*$Ch
zjTo;DQwFJlGf|4Ad#OLbwaF7R{>65q(YUUa)Y4tOrW9S!0)tx1i70v_%Q&Bm&stS|
z>{yN7hS1MFJ~+bioX3ZXc6f^i$m$gikXs?o73OLM0=;@ipnr1&T5dGAN1!iEn}1`}
zw&{@DG|VQf&((?UMV97wLv%})TAHS2-BX~(Pz2q%>+Ju;8hq4$ho1pTsMrUVck8cz
zMJM|gZ(iUl)TUBq=OG$O^J^}#vI6UpCgYP+e|?#Q-C+z$)y!xBG!%-hcXY9KXMJ+H
z?}?dS={V1u{x}{WHi(j5l*FvbZAxlxYh;=i?}=4`dKV`oV&q(tvHxhDLzZJGD1;6I
z0z*G0eO4qdvXU6L(3ZSAOca}sdkPN*+GWZMGz(S8O@I|#5lAZYbAnWcWOcAH&oHR%
zSx80Ubi;^2O^z)II~Oy7;>37KF#p4Fh^OE69xm4&zzJ?Ix&KQM>nv#t>59loC&WYd
zHQZ{FA?!HZ+<0b_Dv*?E3RQ1VD>&P7ccy;O@2sthqEA^Vl5$X+6c%c&tcY51eR)DP
zvPmq|TJK0L*fO)LsaFf{^96Y;#*8AC&;|VB`$GLxz2A8=d-k?&RI5ex<Ar5WY+8@n
z^r&q=>d>Q3vGNK%Ua?EA(xX-T(HcD}^}J4x*X@#z=+Ptl(RcLdyJF?<>GAh=$!#9C
zGnGI+D^!2V&z(6QS3KL{XQhdE)pP6FGk)ekqo<w~>hJP%2TWnbv*-M*1iQX|egntT
zJ|%>dAnwZ721q-}rjdN#<kp{Mgm0ToD!UCOyF*dm=H%C6m)!NAJn>gQ%vBPFnaj_y
z?2V`sls>^G#jHaR&M+IJ4&fN{IH6G;5b0hR3^?xtoMS_ji|xnV&@SJUjGijizM7OA
z&fO#h>Q2UZ!<#bhxM8n`>56`m`70nHA7ufTWqoWIDNL%cqQr7OagC9b&QcR~CDt!m
zETMTW1q?c7_G0G^^FPEUWZ^I45ZB0(VAE`o;UFSjZ68G=0$N_7?I;#i$^(*jzmFFt
zT2#5_QVKH|))nSX_;JPE_D3Y#YR@X@sL-wz?NykF*`O14i?}V40MJ#R(y%l0qRj{a
zm&r<S0!ZcDoC?>K8F1wbTa+si2KL+Jao|(p2&)YWC$CJp;Q#4Q+QehlYFz-Z__>kA
ztt5|XK=ZAz0FzglcAm4O!Qd=7&nB%Tb8F>=yc*IuLyD2Ztr%EgL=$ZpuLz=otsra0
zjK1F>kTDH11PU-$nIqnU{`;AI_W1oM4jkfo!)M7wJ=a_t?Fsh;+WX8Zn@xxt*QNPn
z8)z8%#<WF`>_xAjkWmp?zi7daIfN!`W_BgMjiA4-U>Htj*d)2-b^u$Yc%d{h;9o{0
z0@lO_9q{R!BBms(;N3RP_-dYpqX80s=gh?H72}vPPi(iYEKtS_8!Wa^)kRJWBz%0F
zvk${>Tfkg&Tm~e!u{<#1<j55#7ZrrJBVI0ZbSfM;^k6zzaV)lfPcrGN%A-p%Pt7w=
z5P2%T_&29EWCHy=)fy@h_7%j}*R+zq8zJ_M-(F9{-@*;{(k}j1`0bvxNiTI@rT2oB
z>QbsX%#x$kS;*Wh=AtZyOtF|+b`08D*l=x5Cts1=a!8E_5xZ^~k$l;2OSL)QO{n@p
zV$Ar2HwR_`_6Kq&6zZgSd7#}_HmvKFpLafdD0QW;eL<`&6PrK?Nf#l*sF+_D7`OHs
zhSllOH^akCGBFcOS}EKSCf~cD5441C05SUi+4~m2xT-SY^xcG4TR{*|Z>J=gNhgz;
zByAySOVcK8gJ}|yl=2QYGdIblGjoTzcajDuwtxsei=ZOD3WDO|D#)(S6^o*v{;RN{
zvOYmsMO|G)SJvPC@ju^p&bjxTd+$7w&ZGr0N;-4zd3@(P-}%mWzVkg2u1a3K<?#~B
zuUYVtfmf|i;*gq)Lg#y$a{7$2KCOC;Q)EBfsI<f!!U4;0CDyzy<jwUtokQ8IWD5|b
zX-Y(r4{vc{TC%5L#)&f(e|h!87k{y(*|e|l5rARVj#ByeRW8cTx?#o4MA#!Ml`69>
zmcAlwDr6382T2gwDq(n@m<diq1QzM*l@JpFZKbo6`oRtw?()%o8Dd?uF{r7{^N8jQ
z2pdc3WOs+%hh{M4ijocIpC4v=c{JwWDtkxfgA@dihqHp2vWf&|do>4TnD$muQaA-k
z-3XsD$4YQ-NO1Z&Yzsf{{avNQC=`xUFwGbRdHder)3q2!p``+G6g&jLKYJDbah5%l
z0(|&k!P}=e{@ARJf0l;-vWz6L9kvKGrBl(pCSkNG7pLj|ad8&6CE$>Hf|N_ZMwHMK
z=v4`uA!cJ}pm>NVyPzR6N0=Fr;u_HN5w{$sOs1~Z?D&&{K23-zqb3b7JT$V92pf}2
zlYT~~$VQ&f0YhNNPD(()B(yUR6YwrhGx!LElMo7n_DlB98awQb(6y;(YJ8k}5J5~=
zY$B^@R-D#0(varc0llVyRm23|XgUaoH)V$!SNaCS>|cfKvghp}KX*cw1%Rg$UaFu8
zB8{pbuMlQALQaTNR9>WxXU2#b&r!5akij{*uj5>Rh_iG|jw*<z*Ji92vvbp{by}Vr
zAt!VrXF3%sl(I=Pk~Red;~`LTa19YT`p0eEgD41)It*?eBo(()yrK6qB9SHiJk}(H
zmAGJW@0ZeR+-%$|hbn>y$aE{3&Xv4ZN8-to=)<W>X)^9+Cw>VSz1os^UZ2N`s7SW>
zT`}g;I$E7|_4Np}jUp}++ac(#fkL};*J!Ir*tKOTijvJ#M?w`OuyE|ExwM)Z(Z_OR
zF(juVO1)7pG>;dV6g!l~NNWc*F3Ds>lH>^sV-;sfY2t}XESS&6tvyPC1ifxA74NMc
zmyk<7uZxvu>Ef`66zLn*tf&N?M+)}tx>4ulbj9C-2YNbn0xNV5^yJmy-7h)Nlcr`v
zWEfI+!%3Ri?BmXdsfJM#KZ^GITB5?2J=2Q0UC0iVb54H#h<gH_;ITvTW7aW`20xvr
zWDuc)%_bH)TWN+|*ov!egjDsp-Qo3`Lq()`+psoLFKh<By8BsIqH|YwGi7Bct@!%1
z!ybX*)=`B%EBw|I-Q8u0<mjl`Owb#d;gYlx73I3Kt**Am*gVTR0!Kx_W&q~Q;h${X
zA0Fq#M*Mi^k<P91a`=>z|K~7LKjWuZ{^#bHJOAU_)-`kae`e*wv&>>Z>g|esTI9dW
z9Tj>DoT9}fL3vXH(d4@rJsfz_gbp{kPD%vGSf3)a3;R@l=Xp5CgNy@*8`VPRM#unW
zKqy??#0Iu*QJSNzYa&WF9?8*4k{mCP@X3k*uSz{WPSpVb1KIY*^)XNgB((_*SR^^J
zkAguZ8qw$ujA~N1rr-$Wo9Bq;qmI3D^HJj@&rUXKF`7E;0s-thCg-5WLNiW3O(V{~
zx-w7mDElrXc=Jt9Cmg?&v6*q1xn#{p>{H7APhK2WA4T^6)-`L^dGbFu&*gufl~39D
z27GE78(j$i*`+&#_)4njv79=lMW9qi&KfteZ6dFQ$6MTcvx%EC;mfUO!F%sE3R|>0
zVPLZoJ+rN)rLFlaX(KJ~P|MsL8C<6pPr{WAlX*aFArcOtQOZnQ-hOF*X)x3zhqK{r
z?03>i$C}B5tae3CCmcM04+0_f8Za-urHLB}tG7$&hWK7L>=#VsEWD&oNC7%-+8X%@
zD4|vnVLP@Y_yT6t4A~0DjI3^rr&uPG8d?xe+gI(ap{3amD9^q^i}9?6H(*Xu5~hzH
zHw=?L*OPc_Go_?eGE5eIX-uDh913VLNJnDVr&WXaE+n2pd5Iu26ozcNG5p)?=oZN~
z2)K_x`amoeQm)ycaGb!}NlV%vcS~eo0j4GjgoU?`AwfFfr~@e6qz=M*5sr_n&_G&G
z1}+g{0t;MJ;HMQWn>Dh*KrX#IZA_+>-P)8A41jqeg_|2`QP|1jKqvsFwz4GyM@Ue>
zfejk`3;)6NFhRriJi_=_I3e~NUsO+H=c8x7jbaJ$NUafCFA|@M6RH|n+Zt8^gsiY9
zyD7IdsN5)_NUd1IS7e~wusvR^1WLcah@K{*Zy<zZ8`u!-+z{;uAigm-Wyo*P+|1J+
zG^6F24H~0l3B$G<D?IGt&C)@$R$a@19<_oPxG}_)Ry2&GM9%h8z!fER-e;h`KHy70
zEH`UXOSASJA`(g=J?A4UjAw&PgrgWa#6|URQ6%GmTc_dL;U+}v3z^1sYm4A%GMnM1
zIgY6tfW&$frc{D~zh?{ErvNW;c=L#+U10fy)=xIF{1~IOBEt@u5;VvRnJq2wx}a>4
zEwvCMKIa7^#t@Fhd5j|qd6@xfMbR!G4Fs0ducR&sbVM~a(EP0y<oA??k)RpLFsO)m
zX^sUr<g+8bt@L*Hg)fStIboosKDK<M#XZlbi2Tnpz#mo$@WS$cEViz>*)9J!lSgy%
z|15mUuis0h;QAlwMo^BGmI2%*H<anu9{C*LN=@FJ-~1_gs3&zbE9VF2Bat2w?qy-^
z%4elEg|yU_%Suf~Ic#cHN`t!?b6l4Vg~Li_m~s>)V=~hrV5syfN{sD3t&I@s(A0D}
znwn-Cf&mjoNotr-le}O$G?&?vEN?ZL#B3{Bg9sgfSGLl}iIAHtyX_jE%9Lh}!+g@t
zJhMt3LosQB`DL(pA&Und(F#Yn%?-8Fi3k6Xk<0m6Dnd>)vW*Dor*R`TR96S`Xgrm1
z&Uf^U;3h|&aZ^&fy2Uau*^;FK0GBeyE^1vP#vDPZZZt?<gdr_5)2R?*VJN?>Hqx@j
ztY_ywxAQj`Ug6P=UR9G;q$n6nT(RMSVgzZ-=7h*wG{b0C%bDozK!toYk;uZ`urM`P
z0-onzYkVr4KE-8@9fy^{zMkR1zAbO+8iMb`16?}@yE-~M2gtlIm=d~4fdYZBR~;Jz
zC5f#F5J0lxnc*~%EtBfhVFK0N-#^ed)Hgh|r9Z5YKf}F!on1X07ciiBhr2Z`LuAeg
zt-LsRQ&(4iM^E>8U9RpDM%v06IjhXwb@ufR4fO3C>Y`M@dmG6bY9g+h1(@kfdfPnE
z*U`D9V{l0BP0tLc$eBln4u_M5QD8@z)(m#{!}sAGJ9~z@q1WM_zP^6BYjU_COQv{#
zWYOp1=m-P>RFitU;`@;q35^6QT5&)>x{1%x!Y;(DQeeyG3%3PrqVN$k1CM%kb_@><
zb!_hG3b`yIgapJ!T1-7WrddKa?QReRjDeq>J9US^M+i6pR$8ey()Hv(q$Lw@DW$~;
zW3v0yBgtVSZH$7dDVQ5J#|ht}ZZDQ0_m+1AmY&iGiBDq~jzLHXqhM}c^{ktMBViNm
z9g5UryALhqA^o22-fdk2f(u_=Qm3YH#%M69hYG9+%Ssj}P?kogpbJ(D-S1=~g^G+s
zXE+cPnAk|jckfWhPBC1HxahyQg_{2Bo9r0FJGypk?iv`}-reu%Jwe14-hBmn?;Pms
z_jF%wnX!YNH!3DGmQ%i$StgKjR=Wa-(~oH$Nsft248)jea2(k`xd_K$7a#R@NBMXT
zGx5``Vbx-?uFDlVjO#3-r?SI#YeoC#slP-3^bD8i@@J|K*k|}kW5(_%A7=QV?Sc^#
z_zAG)ae}I3u)7x|#^H|M3j~mujP8raKtq5qtvcz7rDWXOV3dw~VTfMb`?FlOqUf3^
z#%S5ntvQ?{u+Pa?@Z2FSLIb4nU_*ZJur}0G*2|Gzi&?4)bm#P>jH=}5Ws`w`E6H}%
zYZ>a=m181~4qxHm*=@Ndi0-w5pwkkP*`3VjpkU!`cUm+sJ^f#a`rpGc0WD_#*|Mh9
zqyKG*&gp+=<HK#e`uc~u`+5h5x7)^E&XXgqBla}~RWT`q)Bq%&ptTv@hN(R##Mgmf
z6;t3Gip`kH&dz?km?furKO0S(@KF=p$~4i@rsz7f(u}sPIje%2Xs?;3^MH<!nQn3<
zX0<UQ8D*z{kAUn0Q_6%c3)N%5tK6zEV2;4Of(@vVDj*IM#zNa^w_B&pHe~2i0L87K
zlGH?{=q%c&rE_SXmI|tUn%bfEX(@NwOIISy6zpjn1M^fWqD^U^(J`%kM#n2kFhnde
zb~AlmewDIvn0jE_;PmLbd_4+2MfQJFOA-<M@UDN0-T$_%S>w6?jmBbg`~Pfw%DuM_
zBEdMW8EB+Y+T|~&HEPe<eB>{G3vR>ym%+~F>^x&SM%OM*2TOPH@{PmyE?Bq<j#Nfh
zWO05wrdgv2x52+~;!5aQYbwusyOFq&1mq06TB1iUOC1S2MN{e?QcSqF#Z*;TW;6ji
zh0;L&$S~mPY}gBl&_05izZE<p)1#UfNTEh)fJ(grH*)usQg>^^s!3Y%hgTjRbB?71
z=JCBC+pc3GfZ08$gAT}pG%1KPtEkH$k|ox-2u#c9iT5f-y@9aY*<NY|c@=ewg%5n&
zTeElW<{Va~Zs};4#*Z=;xGSggFbw`T^2{rO7d^Zs(+<i7I#Yl`Cwzh{+d=to3Ru{N
z^n(5XFPDkirRo-qn4~JOu#Hi6$mBt|;UG%nOL~|kldEA?bI$cE=L%n7p$jpwv&dQ|
zDTBekSzt_Q<bQO=T}+BTWNa*pY;2PJ<z?Bx6e~raKulY5E*HJzrNDaj-PqR7;S0M4
z`hs;?WTwvVNy=Qg4v+jI0=}qOhNo$5l4+btRTv2E4>i$HI$zOj=|v~=7Nv**BUNW>
z>cM!m^fqj`yZ5|~p6*VLVm3sqOEHZGuFk$gD`!200gJ4{MkRW-5{*RL6png|_+fOv
zud`BQcM-75-+~=0ZX!^mF!*2=!nP#_wlEV}bfBPw!D)<^UL9jFvkG<`1iL>_6hnP7
z1c)u=3`kT3JNsvk-Ja6{BUSuM>wC1nyy~QHRZ8(fOc-$+?V(NQeK{$=bO(|}V{<;p
z4IBJb-1#rFg(h31CJQ!#Hwp!ss06$AnibBz{K&9k7ePXnmtEewD{L;`y;WngK(5?~
z0PZE&t(A8+Ce&n3uFBs+^eMKeW5O#8n^@2~fwEe-s^<grw=Pf^oj4<<EYfww0o+@@
z<M5HVh24SdS9Y{1AN*nEBZ)tg@ne6xk)r6(O%WXxJYa|@#hk7-VkEo(TM;IoK`Cy#
z%*s%Tu_=&#q1Z0E3#Z~-$^6U%mutTAAeDdehR#Gnrc1cT)g5`Y(!FfmT@ry{uxls?
z=yvuYu@SzHxf_B_hP_))fbfa7Wbc3?3jNVI>Q4Dkn0k2$Q^2+^qkFGBX<noP$>_>z
zPBxN-CMOPgRnPbgD-fzJm_QK!X%lVKL$As!o?yY`m&tGb-Alt;z1kzV%#558GBV&p
zmdci%0iUIEShU6u1rDuMT+`v*-P!R2@(1GdMB5cy*K8q>AKoN_1RdRjBJU_=cDSmg
za5-OgFqVI@`%R!9JJ{>Sa#1ahdyj#90_sSfvy7VeEaSJs9PZjIxce9HKrB)EvQYgI
zU%Z<FjpPdjJ8jN_%WSp1$d1}*WToBz99{&lBK9A#*t!<){m-2L->iJN{l{QePuG?q
z!TiI1aAa?Yy43hM7)wDFA#kvgQB9W56mE|xnK~C9ET1)vmIQVsaB*xT*j68+F}>Kn
z#uGi6@vNS)Kyzn!Iv_3N2%56VDX>&@^%hY&(kw(c_7Y|?LWpcd<3=vYH&B4X%H~jW
zK(l+0<4uAvAO+KT;Fbs9po<_2kAacPScphS%Z-sABYE%6sI|&E3})37UE35}t3+dM
z(dM@3x=LEB6jVJ+0iQTk&4qkAN<PK-f6B^KIQ~;?U98m||8ZS(&D{O}tbEFLHvu1r
zn=rUzs9%XEbqE1iGz^r7=NAeNB{MumnAALP4U3}K(iCe|qGz>5Tiar5=7K*J>(@W{
zQ``VUJ&*x}C{6amQX)CAC{Zc~OmU(_k>B=9!xUc`rqe8?2eDavVi&M7-j@+8W51t4
z>?$Gn6l)L2i^iZTC%(x%_h*f<teT>>m}=T8_mq+@_yrxTI?_#ALn)<ZsC!3O-_9X2
z_O($KT?L}ckc~S#L1Y)69^Qly{aRy6)stq;VAsHTT>}tg3XwN%m{vfnive8w`v#!Z
z<~8`n0ApL)8u@p7S5F_>=>kE+e@?II1oQ!Qx<`2mK@_qSRoSwwn;bK<QvlEyXayh$
zmzJK;vql<Z#+uH)9Ua}hq*ud?kOJgYFhGGF?(Nvo6$oLRC4Zm+KgyL50za72)U-)6
z=RlG+2yqpvxv;Od3x?bXyHlX7G=MzMm}GHfkX1r_%`*02uWBNTsu=f786MUNTK8ZK
zG;$Pm!q;Gt2z%W&men*XNav3_uoIDPG(u(}NWWy-Q0o{BG)E$VP`)B`u7iQD?LB>g
zFsBDH8+6J-QnVbt+IH)iU@TmuLl&DS5BNY#L7<ajfDtHq2w;J&1ARN%Fp?S8lHn>m
z@<MQA;~6Vx8O5L&*wQ})Pz?1^7)XtBK>$aJAQ9dmGP;&221sYeP)GjRq@A`Dm~hj`
zW#gLAU%ql0^ahd7A~gJ2xrR&lxD_lm%5!&i50$UWcoHI2`Lvd?UlppJG{*FFkg&*X
z7>}8gMmAAw01$c@=%uG`TX*l_%olGFV>XVgZACaj<!sO%QrYmGNve4e#==tMP|^tW
z_rRur>&b>DaB&nLKy8dq$bL@~@z6!t#siJHh7*RE%67Osh`)#c6TS)Gc_}GMUd#@D
zr;qZ;c%!6)AZdwE3IKl5r5C3!S<Prh4!<Xiq5wgHHnd3Vi1b3O=bt@j-L7Ke6LSg&
z07sC8ie^(qEZ7bv0ajgz@P}ecN;6Gzv_SK#@hsVAA+hS7xQ5;W`6dGy6YL(ALke^^
z!G{rNPmzLk(wD&PLm0sjHOj7togjhf<b*;tK&+@|R6T1-RTGA!PsYx13z-l?XbLe7
zYrG|e=4!;^SOPZ#8kCN5>PUPXrh`_ZkHU1duxNH6u%*G5xO>QSjOraKF@{n43$uu-
z;&Ma@oeSn<Ldi*u$)T(&Oc0gUXe00&q(~=<CKFce*2U)G<bdcz&vZ+ry8NrKS1YqO
zOy`%@Ad~_3Dui?(MQ;W)Zpfh%FquT|1L0C45=0z8?F<3#Rmdn@VHL5Uv=b0a$qa%M
zXZb`sh_4L(JeYo)Q#+l+@}DEPdQ?@$$+VB=AQ@0DtzVJT=pkyvAmX~3o#F>K?TR!+
z{f)W<f)f1kqV_&bi_(8rD=`UejMvaGqV=_AZFEgy!v^v<S04s>AF~41*CuLHwHMTG
zuia5QSRZmI2TqxhEMeV7Di{qbXTb+FvCvgWVi&_4fuyTRH4A4GID=DtG#`^w4C_sy
zV>;+E#x*qoc_kq#zY19{VIApKy{U|<CPayJVF8<Bm4fVFk*aY6L&?a#{}fpV<s7`8
z$Tr6DLYM4l^=(Q${5wInIcN&LjY~|yKF3FJD8X?DCv<En4}Faopq!>*kiBnxLn2eW
z@v`KYWsdnRNU{LO)d|9{b6K03Xi75R=4`M6jz-`<*h@|ffowuHDA-+u|0amMir&ky
zCl}STEFq1+$T4JUzBi<9y*-Skl)gtx)X%V~NW`A8`gVJ?8v;0GFfy3IKs{R@`Dlgj
zbQ!`HQ-FB3FVP{xOhx!Bc`I_yyHABs-oiX!u}DZ963EV~AVrv3238Nx0Bf@chn$s^
zXDhV9kZ9T$fW}4|cRJzFx4?>pl^RU>gNpgMB(O^8r?C;93BB0^&*(&M%K1$Je^v4n
z@Cv0*foswFELFBG_^nKKW-GQVRYj!XiZ3;1eL$4sCKMan(OsEr^cw=YX*8aB=9;q_
zV<oQ=2OSI<@RHg;;6<E3aZL3IL8ZeG^V}XAv>|NyWTN3M%Hi%gLcx{1m4ly4(XTyq
zgfQ8>0yQe|4Ub-6wrMIp-`S@2oUf+YrpPF~=$wtuB}ln;G0syQ^vUM{frGiu0R^@}
zMi}{<;XsHjd6zAci+7S;CnJlgKJ6XVMI~zD@|<be$Q9aW8g*k5<DaqF_7_b&w1Krk
z@){#gF5)rV;YUyp0hLTh?3xw}fS4D6xAJd+a=0uQSXrxvmD+?-JEGKHpww<}tKHF7
zJE#OOApwI76}|*4(C&uBe)gcQTg!@l3C~Csb`IbfrZ~}Ivah%bisKQ|G&$E~^#tSh
ztR0Y(8(HovY(Ef-M5%x$<BRp|(HeMYFaKQG$t_TV;?|=wX$zdrKz9(nIA~4bjN?cA
zo)eDGk%+dAE=FWdMx;(4pJPf3#tn&`f)9nL)_`g<KjhYlz+P29zF5{{&vqy9dxaGA
z$gS+-B{=88(b&m4;pifq11}!D*}0q@zv(Y}2&dn@M{&rSO?qO=eOgLV@l#zCeL+<;
ztXZ#K%JiyAMCB_#zKJT((43LSQT{1r|H1s(537$N_J3=mYu0%4f32Id|Co)BZU09N
z-39wU{-Eskf7}Nrl~FByM7J|}Ft6x*mVlcFJ6T;5ceq`88h+xvv8ku@q)M3ANX}xm
zb?{hKMzu*rC;Kv38DggDgpQ_k>9}S_l#Zlngi*B&TAYTozDFT)s0FGglkDjz7NdEg
zn$jX-6e`kC5MaQ_HDI!><GDA-mkZ5Q#eapAQ8jK+8yK>k2_Qf@(w38y%86yg@k7ok
zle#sIUFimCnnK`b1IW6g@iU@FDt<-)psYYxi+(mUikZ>k`lufFl2F-)Gzv>&cvp9C
zOS3RQdtw7Mt57HJyvm8MXmZSQ<6&rA<7OR5W@;RC*FsbW_CU1_K^Ud#SyEdzyEW<R
zF;dzj+SU?;CgH|KOGK1i8l>bgF{)aMNVj0UO1kEa#xbB5=D%fmZ<*=Rs7>f%pb1i&
zND~@b*O~x?K01Z%@px=#+?%7BhEfrwV$>-_V}W28%<v?sUOB~L{ky`a!GvOv(ZP-i
zgt6Faqi94+k|ThS(-`C15oFRhxSTI3aA`#i!qBkUC-_~teRR>fm->OD6bjxdEbbS3
zOeH?{9GzL%i-bn7XiNp=cwAx$b3A7yjLCG+6K-?dm;|?1p&JlCEkiCT#<YXGE*cPX
z80a&XwgfLE_PBvGLLLuxC=D>HVQf38rO7M!Jxsnr_%J8PfjrWz7M}nWgA0h#yB{<1
z^xlxSdl_Gvl{V5NM7rM%=lueR)vP?F#PLk3I#|SekZ(>F!U78iU^{K49bd5QXu@=U
zO-jEs{AHuWJxr0H*ma=<*L3Dgq8oO&^$e08gqVXBS@rZA21|+?NqNX4aP?g>I4%H^
zx@l=XBtD{&ipH4S6J_6WVdsY`cI;4BDP$xr71kHn#*r0DgB1e|puKGOE9p}T*e7N5
zz(F&F4WW~Ufm~dWSrm1I)K=qykcW_S0ZR66;3Z_ngD1~&Ed0VtyVPYZt!7t~KFHGz
ziaQShFhmMajDZV@X^l)_U`VkoH?83uvrP)Bz=qJ!FrJY|Ww(dX(0$tTZ9w$cVCR52
zkBwL4r?m6`;dy`*IsdO)*Wx+<x2&Bz|If;&yqZnPrDI%6X22<qo|sGZ>#zyV69#fF
zt#|4D`g?X9p36o)&kUaVTXvzSi1&mY^-uLCK`C!%PIhl5in3%4-0Cf9|4zaKNnKCI
z&+m}A6<j<Ml#Dy!xpeEn?~X;APTq%XM!;`aOtFtPluunip(nn0)dD?dX~5<D9Xr=>
ze*O5OLmFDq4g}kO*L@cb0z?sxWiB9>9lJOdCy;c&j>R1aqiH~>018}CPIvHfW9(=k
z4Rpqcq-KlEUNIyf_LZHY9>Md?Q=d0Y{b6OPFDIV?k4ef`=@l*2ZJT;}H$CHk&Ifol
zIac)y^~RdZ-#xoDwgbR|w$9WOny{1G?`kNJ7BvO{DB0JV%{}CtFxY(|cuqA(ThFYa
zZ!Zd<Zm4mR%u{2+NYfjAo9cjcC3^I+>$T?yo%f~u=Hd!y<G%f5k{oML9^xoZ9p<QS
zPx9Wd5c*>nqmoJBYRS>CU?dch2%iz9PpW(Vp&V2&85Td>s$Y5`(k0_rX>K$mEgX9U
z%&diBACea|g4XVpjd#JoDi5;qVl`F@8ae+0BziGRi#aLmu>@hiY_VJv7@2A$r}Z%+
zOL=Ai(<G5MFQeJ;V4sdaS-(Mvx;HEdx$t3|xPB!Frf928*jtco<TewLu_D)%Z1fQR
ztQOZGKL@nx0nWD8%eRZ#t<zC#;9nZKB|7=-M?|bWe3PGkI0;~=;700ukZ&#0@d1~7
z850A5Um_JaGZ{t;VjZ(+$y4eg3}24xo?>}Qa9XIj9nuUDN7yvXfJx)%Hn^CyFj;IE
zdAW@*^|^`0p&E(r_>&SZEwCS2FjP{=sUrFxB3d72@{g)w`k&^tYuCBsf2?h3UNfiv
znT=1`Z>P8P^Keb2W&J=3qftC!vz%qiC*_ASgPb2+7m+VbmtYx@c0aMxj7bSY2ufx<
zF-YZd$g(i?>=G`2Y7orr#MKK$im_93ky2DAQn(C?h(*efZ4@4v#oH>a+!)Pli8nIE
zi)J*KwBkkWoAe^(_|{sa7`uinHea|;7RQTE!Y==U>?*AUycEnc!<#E!$TuSmUTwxR
zoRiVGZl+&q6jDmcj50ht77v8^&hFrd=SCp~xH1BY*(pQ$L%STsKW|Ey61xPDx2r37
zWWUFL?E*fau*JrTi0jWTLIZ$HZQvuj0FAIN6~ISg0Zzezu!pF{Vth>q#rPws7%VZ`
zqqI8hGN!kT=`KSVh=g7G$S%Q_iHIEbNa)Bj0q{r!#ElzM!i~K!u#mh~#6oTax@XDs
zB2S_OXI()@uBGObVhlvY8++u<?1LXMy^oxElPB*J*NnyU^GOTFPOpgFN(mQ*xp1_z
zikv&qE<+Y#BTMTT2)h$K3iA%>8Tp(z2^&ipU>Wiz5s;juNpwe)dlow^o0f0(@(%&Z
zy%8W;qU0uS=&Hn%5M0ybNsnzNnARro6-}BE&s>#4SL(f>l#gdv=-vFKY1Fw=OH(%r
zxwH#JWh`stGF~_d;WgtcA3*V^nx5Jla6{m&<p4aLS`OfzS_FP(zRl^=AzC(wA}OF0
zQT0%n98eGiknN~PdFrQga$qe38V}n>sk={ry?nhjl^~chE|LMphSJFfC5S&luFT{4
zR)s4$1|8F|(;MdSA#8Lbc@uJH9LO&_RuV4WVR6v>h4f0oX7^YeIRBGDWhXQ*aFtsn
z^4?$Z1>$?Es3{exGE+q^>cOZ_&f%UgO)*T7iptxHV3mc*<{?yPhw1nntIC5<Z(x2f
zBn>Gd5(T`+7)q&Q0r@}K@TQc63Zj~kGpU~siv$kTHpRRS&|Lu>3BcfnY=9G*qNR=8
z*tp_PK$RJ+Jt$9Fryg3{!9ug|j$6VRwY<|JBv)F=xQK3QsSN4WVIKZdR6cTaC0n$e
zn87cK1r%oIan-T_IJg&g0-W+#@T3(UWs2z`E4ya=6eZH^Flb6+?v8NB=SVa!2D=Dv
zo<CZraig7o&o<15e^^!@YHjSK^kZP#mFZ<<9sS2SjD!`tRmj*rN*EHUXquzBWLN>x
zv12{c9+{L0NkQ0cOLyOJC-~e8*GLpE@nqT(u)<Q9fD<wXE$g9X*2ZWMk8+&+B;lAW
z;e2~zqnN4#lg;z<53_lO*cYP^6T%ja;p6XSQ75n{_yFkk5_gb{BR5!rMp{NU!Z1RR
zuR@|RJ3a-IbNea$2zxVEkz#1tVwYpa<YcZKC<M^tERnPb<ce&Jxp2bQxloQgvYQ3K
z?dsmFgFLfIzQl!?3WhT`@r9FJ&h1$M7yJ2>E>?ouY}V5WFu1W3Oc?NkTisQdZ+NxS
zCG+%rhh#pzZZm%v%?3r-fSgI-Np^B+Qy)u{1CBWk;s(kbq<i_X{~p%j(<@~)aNjX(
zWv6hcj=&UFWb46pk!AR%C8ESsfR?BuMLyDz+Opw}&Blf{#5OQGNup929VcBoTLrTP
z=f7Slk0^0uXs-C?h*W2Du>3U2QInTU<(-iFh8q}N2c!<FFVZHoG!U|GDWecTCZQy9
zSd45YjeIxZGK*KQRA4)c&CV(Tk(*{6L~<=as)9c0NUW<ZaFbzjsRP5!k4(*y#OHJA
zRh~8E@|u;7m`4!T{W*&!NdizTs{Mw$63`=;TZ>%EO>f!uNx=sb+Q1WO(v!oynXsE?
zp@t+zGx$WV;dpfl3l@?|`bfg1uia@%OGOv6d`2qDiM;2MBSegY<D43WqaWN+aoelp
zRHYS9z8CE?BuX!b7q_T!W0EFuM3NMCP*Quu0N)(OI3{%~KCT2w`HP~Lhy)e~7ohr)
z`Znoc0Yph!i>ESB#cnL5j2VzN4G2umbLjTg7wO%dr_q%YkwRb=g8(m6X9z)&tc(<b
zY%vJ<jqePBh~@{PbO{vuY;!JZ)a)2t?rhTa^aMG>f@nk`V0yuT+)%W_dR~y3W=|vO
zZvazPJueD@p8k5gTHcaPc`65<-JcJ5m78)RUeDIOm%j~ASrKZV6I?yoC`D1f5_g~O
zYuTgx26T%ZnaX>BtsEf~Fd1ZI;G^LzaI~ZCFx@5uG#DNn8tCfS;T-2!t|>z4MjS(E
zD&`a!Z^}olxso2g9L*M~Zr2mgBPbR9h;|z4PB5;~AcwYzVM-L$bcu9ASNSD4NBk|I
z8qI1D5(Sf-9=4KHyavgmBgG<>RFS$*PzaZ#A!W<Gn1Ynwg77v`Ju2%K<eeP%{UX}Y
z86Va6mMs)V3HJYo7yPlRX#9ufXmp*&{y(;M&i;QkK0N;8(3XB7_#^#QIp2W1t^p9-
z4rz{uOVCYlfYRehNGULu%(4633?2dvh;Cztm@wIjjf{sORvnM?X2(UOp%>5uA9#Hx
zYfONfD@#nufB_hT9b1RHd%K398F9DZm+=t>YF2Yh+2F#NA}`U#xO12*%xFdnI6p^l
zfQ)%lm7#8uwp4K1CPSn<RYKTC!gRcl&>CEwMl|quh7<;hlid-b^$lYC5M>XmQGlFg
zOjZel#HBQzH;d{wBgz(0vxjwS8l>8qj)=B9v>W28Ud&w$Oo}SvFfb<GFgnS%jZwGS
z!6%3%PQH`H`bc<#aK8`X2`8+8e;`3WuMc+|L28ex<P~3F*CHDu|3P~MisnxoMK_U5
zX>;vPFZf$&$gs!xjWMO*PPoqJB0If`KgITcM&yU(16U;g_nKI<C;n6O-2Oj1pR(`q
zj7z1|v^quunL20P(i{Rg$>A>05<P-Wfe8p@ys>O9fnw;{Jh6q>PwMG}F=;}#uGqrs
zp*lWyAe=Ir?5B3PVI`%fQRYagd&qzBtbvC&F6r&)?zQDS@;$gGtW1TJU~o@JS+4}i
z*Rz#9N*j5`o3tx-obOcZIA5%|(YN9&#DS5Y7hxM6qq?F3PGw?gGpT7A&-Po)OGF8<
zUcfcM+qc3!Mu@Zl?Ym0hGpCGW$)#|=lJcPm=EM%kWiRu{QLfYK_OS#jvn~q*@k)9I
z(NF=hV&@>JGpbJPUxbj=B)_|{QjHt&H6*)CI#MEejOD=C0sgIs+P709>x^&_a;||J
zs8lXKPP3--Tv17F)Z&4@$<bwx#nok?D~4l}j-i<#P2GfU<V>nVo+O7D$9z!1sUQbA
z@-Gam%@bPOnH{o4P*YG^7COaC6gX3)ObQNxrZL7k&f>u_ZBVF_dWvi`<(*+ZXKaqi
z+LWf4Pa`M{ovB=}L?cn9u1=Und?a4jF;!2atU~f>N36u50jjW@ZWN(It`$;N<9jrX
z@o1NTr<3z0H0|4WVSsJu@~FPb10vb4?2f`B#34sDR`%t<Xpa(;Np@dg9FXylP#-y9
zv5cWJrDoa`Dp{eyO0gs_!BPV$KdKd`l+DA-i^-^HeMM3IN@6i&Ub0iKRzBnEn?hKw
zzF!f1Y6n<7BI(*(iE$UCQ9UhO>P%y0l$WXn>h&0F`cbxxWWl`Co&@<)H&qcnwG9#u
z*$51i-jW2h)cW%rHJyX&+*nwNowY8i1a}T?2`O$~!t0jXx>r6!df5fy2(xl9TyE{|
z>4MDa$|xgQUWfi7BOOEz3y1g)bE}@z;9Ib6)N*c0chLhX*|1n=WYIeNqKJ^S(HKQY
zh~FJr3WN@`B8kZ!W3rQ+h@knVSR|^gBg+Y2K=wWUrXkqcd{*mOYu7cOwKfu^<pf7<
zBR!#I(P)1sWNzxp7<>oG2a!ERHbjhcf)-igvDn(y*4A|`YonAs>}4nL5)jLEyyW==
zVHXn=NLJDqO{i1Bx`{B_8}V|OkFp_zM>A(ohdq*sh&3^6YH@;3{F)=*5p!$lfcU|@
zd~`T_!3Ed^cy-!r7K*sGSKdNukh2P4VT2HJ8uexC?sGUY(}Gd%+lJBo=mB22D2xWR
zm)J~$GG)bX44H^V=srOi3zTkC0wV$Jgl>qecewMXkLd=+RZmKgg_I*bhblNng-m%|
z88g`A3Hz?E32vjGeI#JO*FdrbY#QCxkyyOAain<kw%TQLgM5~S?3?A&lzm(;Xrsud
zMJmHh0MV`qh83kF<5qwii!iQ0C~y1Ibbu+J?gkaYn(25kzg*0o>=PeLct)+?>FEQm
zV(}U_mkF~KiA%DAzB@%VkTqB3nPQK`G%F_BsDcFMWAm$WBc}vSYmLNL(wt4W9Eo5J
z$Z`}^!Vv_~At0D;h()6)xKnY!wckTFLWS^KW+`m({g?X_r0H{V(%N9Z6pE(Bvca^{
zpv0p5BX|%vWjAgROGu5J#XqzjO>`ejt7(Ixrw+mvWJBPJAf2oPn6nauZYZ<-JLfA*
zo^WrhNBUB0?o;xo#QWdFvH>e<|J5Ax-v2hw-T%(U$F~0>$HKmyVgg|2$<cd9Of7|C
ztw-EcsHq{p0>vk(sBO(NEK9#sf$j)#aG9&_(Nnn;6+>(}AKggRWYRXv74MMb2B`cg
zC^Pk>&UR&N&(RghO;OF3+!P*1Mt!v3P<O90tai~ZiQ%Oo<Gd|$o@+mx3$*s4cQbw^
zd{nFLrR%EvS}d`cqf2O?=?Mx<y4a$%QD$DLWsM*luM{N+|JrAo4XB5dtibq6pR)ve
z)qRTX|Cz(g{Rf|7`TwFVp7`%;qI33Nv+^n1p$tBdPH1OZAJw&lGPq-?ziI1GKRNr4
z(37*A9gywqkx~-_Qc4t(0<LX}wltBgKYCUh+45s+=8^&y>vx7p0rTbkvkN4xbgWr?
zj}JT<0V7tXB1r-Jv&L9fO;N?5nzqV~Hnu&I0j`Z!0Q_#A@tv9xl)ZfrMY!30mT>zi
zB{*roMIi`(uu75o$V%nYX&cv#q01Gi5sZroYT`yh3oG$lHj5dRO)Vq5OcE)CC+CUV
zX<X!VdH}-)EXnm7MU(W<K1o+j)<1K%o(VRGd6u4045x&>2QCfPCg6XeVC3vjAS7kg
zgO<E~IgZr=q5@(vM(lfo5@@7pV-$i}IuhMfQn{q1+vB0ykc_5UvNE>-X8311`HI8|
zm^oGifN@snzmbR%xHuhvf2CpBgVx~mfH}TR$j}E!wF_Z>8j5FvFa{=bf}uE60$A9U
z$B@o3w$C%|DR$B$q*in$WFAB;VJW-^(@ABR91{}S9!y84>=kk!Vvz`Y-9}aE#%?b`
za|}3C4{66D@e-)V#tAR#BupedVY);Pjw|Vqr!1fc2keub2vDGhl?l)~V=X<S>RA)(
zB@B;Sq&_N90UhN;$Up0mFb^zaBGZvVwGf{ccMUg9x_^6+WWTjlsRf~hk%`zY5j0Q6
zC3%8GNX4SY?qL27LQV$Ae57ThQYwI+N`w_P>m>6e-({rpd|OCgEK6M~fvZlzMMrAj
z63miC7_#9krM_6D2)vM{E@(mqu8b-ru$3~bIjqVq#k(if#hiQv`vMrj&slCk7yx})
zsExdE&{m|^h1y|R(R`ZVZwl3B`O$o8^EXBMX8Iw&CJLhv(|WP&UclhBjFcCbrXb|o
z0L-nBqcE(9%#3fu7N2Ak*dm!+DicwYNv97TCKq}F(>I}z(>a5mw`DW#IE~K*_hvZ)
zel|IUDyzI}N65Fv(8(WF+levlwy75)+kfbW?SzX};(Uwn<Zu>K3)>gv)aO#7e=-!f
zlVPa<*v3N>4Tt1R!*QRz+7VjX1pN)y*O1njKq<`y?K0lx1y#-oEHje0CsCaQiQg{k
zlTHw>cH(=(bV?Zg9_e%G+-G(^Mf5+pMCJ4Ut!rNA_5W{anbZHw#;4qOJ3Bk4ng0(d
zjH-3cn#=!(4*@0YQmMSIe9DY{`IJ|RGvBnb5tfo15Xx9anUe0YVxw6jb%c@#mfosa
zdaJMCEP-ULmXIZol&VaYz@j<+j<y7TC8X6876ETbcr=add$2I26o2$l<@58IKKSv;
z(P#SLr=(PUC8yylo_;TZr_r3{5RpRj;@K~pe3My2O~h5xau>B<<Vn~k6!qrq(=&~z
zK85;?mX)+q{OOrt`^7MM;a?+Z7~lcztpP8@Dx}lKlm==Yb6gjzkQc+w3$aQfYh>g)
ztO~r~b(|^{&K*d2$SXQ`AQ@lTatD&OuCiklLC8DupkP8ks6Y_zUu8yF0X-ln^jQf>
z{(OL$PE~iWCT5bl3eNg7>DjOPt31!3=z;)bYX{|K;la6aEkuS?>TyF()YEvviU9(>
zA|RQ-sB%+t2={B*F|{UX&@ZanX<+fRocLN+mej*L<D@#JW&Km{Z0YG6?CK10OcTyL
z3c>ON?H=v7Ux4undC8Ci4XAs`D6*KG%fSVRQxuRRmtGNIfd4R7Cvbth0lYn{El<v-
zI#Lh<MKX63!bgYUDk(>A?=TBeREjU}^>jgei6-nxDH?bkw#L&xd5qQU7?o1&dc*;R
zjfO^rPQo0pIumaf?W*MpWG^k45~A39of-hJS@C1=5URLrXO&dlC(IcVtBbeWc_#``
z<V=ZBtfyzBT7sL_;b($rEosS7vs;)hV6MYD&GO{4=7>~B<n3S`yheX37L*r$hlG`|
z5`zn?7CEl!88UQu54SGEw4jvtN)F>LI&cxhFlKLW%)FgZHKpTyGz&)Qdd*NYP5>~2
zLKdaztbIaM#a6#`tr{Hc0FPCM8xb+DYBn)I52q$&6>vr+yFTbaXN5ZyPRU!0J;<V;
zJEapWUK)t<A~K%g&W@puZ37)U2D>lpx<uj}V}`{j2YR9p^Q2N?WJ8;^SCqH}3$A3|
z38*_czw&Fb)O7$MrKMFsn{n0w4(+I+Zh_%)KnZ}ePvz8_2QGGx6v2CSq-EX{3vC(j
zG^wSBsjNOsz5+!F4Dsk)Km`^?scXx#fN(B~E}{Z^NgYR{&r<VGAzIRc@LzklbEhps
z4Z1dMZzTuur2M!Ul(t`=HQSOWs7z%T!z(!Jba^(gd|9V$O7&-)vz>LiJcG3dRZ`Yz
zull8gE06L3$|9$bH}WhANvNZ<v7;Sb`Hae`ekhvNNL&EZ$!b&{0w|i*$OT^ICZ67s
z;9^c{*~(`&^1I+HD^B5p!qr(1UR%s2R*!hDsIsCopF^fis7|h^@{QFeb+B;Ld?Zo_
z=e_PP53-9K`lg**7~tj!BGJ2vrTVi|`UV=f%Ee##Bvd}z5nW46POP*Qt0GDDEzXWt
zLV{vJ&d!&hxbj(o34}x}Vi#hB8XdhT5s5@KDfMRqG#XB7b>XVQ!E-22@~XVs917X_
z>*P7u%_S@@->P*dEOralM+nz0&RHPwZRMHfVG2?uk@S(ty`G;{jp(k6C5cbX4v#uQ
z;m%(62_6M8<A@}9%%34?S_vLILC@w`D^xnaqjwn>%I^pT1oAC;3!A0HjiM$&PTVL(
zWZ^QJPwK>%T^ht!?WY9)k4oo%gh0XG{EzGA{6A*n!yN+PdcukQMSoS!H>6<xN2EC(
z8G~hMG==ii?T<$kCC3eD7kvlfMv}B)r*9N@0+zFJ((upN=$u#JW=mkZ5dmtR7}3b;
zV|tqG2~%=O0{j%$4+re$0o-_$F?~XF4nU+89EQp?CI*c#>YTA{0fMHCG{r}}4?ILz
z25Ad}y<!vmI7KS@``WOOX-6!rmQQv?AupD1CPg@Is_A;jeyJqUlmgW4X=Rd?iGvHv
zmhC%x-?Vb&O7xEr$XL8{Q_hT?)$Eg*5iVT{WoC3#6EyWAs;->~XRz@%Wa!fZrmRxt
zMO<M=LA<SE{6DSlIcx{O!u-D_+7k2d|25GybNqicK4s_e5WqfRfH2Bs>k|C{k<uu0
zYH{K_wJ6bbZLzg&Ew3m?K!3MCz<~G!^ZVt}6q;9|`yJPK7Acn0$w{uL*BI&~%Hi)f
zp0g6hWYPXg^!TGj-LFyyI=_2I^2jX3OVO_!FDTjPlT{_E&&fUwEGm}{OT{v(HSYA}
z*8mbw;o9gB2=7bq2uxSTA&}CO<n=}$Ic{9K$8QcEmF`l=Fe$q5u}9_gI>afaWhCm5
zT<Tn9Om`W|93*_uN7M00EbeMpAxA<tUVWShrMWA~doaLRn20y_Xxbiz{O-KCry&HR
zQIj0ga8Ur4Kxn^hKgr`a=<hI?)WIHyV;joQC#8UH<ajI>>d^%Qu=l@`obbr%F6@Qp
z)A7sGACDjb&M@pegnZ9eQ#)PPJkripRM(7NcIm=?c~F|(bC+70-tS1IXXd~s14@6F
z;({lGJiU4j@ZNeD41Bkyn4sH*v%XEa7>zHN0pC(gh^WSQt7G6!27&YP_~Y>)p6&!m
zq!(`ZAa<dX&5o=?2>K1r>uK$JPaiJ*EnP6eZ6HLv#;8N&WuwautwJ|46>|fuoCOUv
zWz`apIcl~{Y4ZESQHh7$ZIB-Y?kHv2cip(rQ4Kr&p$Sd8aU*%*Z-`dJxuFt(@h*$P
z<}a*P7C5`lqR{z^$d#Vce9*mGEcl9H)y3^+V8fTLqzT{AXZ?M62+eE%ojy9vzYlM;
zd{iabfBX2~Ps;$jJQE|Be6M7jL^rim#sXU+#z1DnU}%@BTQnfH6Gzf?TUaWpWdUp$
z$kM)M;deKr70I%w(l%XwiX(Y?7&xV}ct`ZiW0UFi9IB&rm<cRY@wq->u1Su^5QE&V
zOszJU@rD!1L@;M;!d%~Gj#M<w(OfdD0P*nI@tSbtcN=1;i6^O}6-P`#V+|-#+*(84
zB@0+;9KL-9K%d7zLpPXh1}&o-VHhL`TOq;m7axM-7JmreT@G6CA*Ij}DZ~NO4g3wR
z-Zl&ZV6u4#E#hk*!q>V`jy$rP1+eYvGd3$xJTIJciC?gb+4Z#Atiz#=>?Vv|z$LM8
zKU@*!F(b96oZ{H_ha}7&L)S`fjLZ?z%91ZZrW6%;fMfUv1vlC*lh{zi%%z91juWi}
ze!`Uz=_)<OVwP|ZeXJz9=;H%Ei(u}ZnR2y^k*+yR&MVQ?erIp@`F2J~_%Xb_V{mwI
zXYX)NSFfv{<o4-q4idzBUXdC?Xn@s-uhpEMB__#CDASxha(_uSYPm_gS%$SR?RKOk
zUtlD(7a`rFpCh!#8rWCN@{Kd2_z581E1MagUmQJ-pUo_iSrLO-ul1p{f?(;01b>tm
zx0a8I_<5uVR~@tHk}}iVotnIiEUTpqOY>n>#n_sMlhKx@%gSgik(bdYE@tLxTp~E(
zotK@7d$S<D!TQAgwGg`#8kYE-r$d3^$#qKPc#eOIhgos_$nCP@Fdc!NA7Q#}`f)(t
zv3Yu|6fg8+g}zteHAf>i<dDuTLxfX1JoNSWkWX=Lt$!gge$HoTX7pD0^j~Cc93f=)
z=PVk94?wYKoKCnXh8wnW->;Qo!cxZ74gHL$@!d&d%+59L8(XBMSr*tGPRbw@7%6K|
zUf+iu7-yOXv!ZKX*2xrK`(7=`5hBOIaZZndt_iN_30KX6E+IKpX>GT!rPGYb(#uuF
zO=R4d<T2t1QA%Ou0wabs&hHS-N!^N%D?w8JqUa?ejm06aVf{#bo3x_?T{72SQpIj8
z1W{rP8j`bJs=x`54_=`7=8#+zt*+Z$0GP!9Kx2}b0T3$%fNU`UxWUWJV2I|2q4cu}
zcG<>@%klA=#cX^G0Cp7-kQ<7=dg2(A<zlH|B!jdV$e?_;<gW~$Na3J+lsQFuHfq@y
zk{tn=E6m`~Kv%~O$<|{Uj*%X%y1$F0h%DJh(o4kC(Yu4?8370`YQRWYQBBv5FLYL5
zgLkB(+481L7t_^42~kro#^`iZ^<u!a>FMfS@-<SD?8uoeMNiKz<XD5Kqqn&RuTVC}
z&uJ^@kF+Dj%k)!<|Igt%fEM%rY>xWmf1mUJnU#<2|B1Rk$8(PUtfY5PQBP2v8@GZj
z#^oTDscA*qqe8xHutS6+1BkDCEQr(X@()!Nvai6UJnhZT84^hw9gfaAQvOCh&XAPl
z%AP^R93;ICji8Jx<k6@bWc%SiXqUk3`4f-BBWX|ac!YUu$gt-==E7cUVcGi;$?GU^
ze|*({it+z!GD4moULQsBKeo2Edi+1vu4|s-|FiKa+gS!akeqktKsRWpOd`j@9b777
zm^$jNsAW}>9Cs$j{xZ-*ewaow2k)SsXBUXT(~cZDe`nj2PUOYC+PFFbk7Y(qX%snm
z%bARow-RoSe(h`8TAL+SUfvOxxj8bnPK}&c$a#Y~c9ge$mMa>?Y;qvUYFFg+tQHI~
z*Rl{R07-($>)~zeH?{H?%F`6}p&ANgkZ(q0D#*j~<75Yw112Ef7LrRj+aEr!YhbXu
zua}H30CX7x?iZ-QD7w;+P#*LOYywb64F_7yjH_gCRmO>UlhERN3e$6E$O_TYmdck%
zcRG`^;0rl=wkace8k8!mDbmmg*quTT30xx7h>;fO?aOU~5XGv~#>zZo$3F$T51Mky
zbLwh6X68nM5RWl<(WM=Y7pjd{MjOu>z9hsPQ_%c5?#XY>Dvui3lxhV7wY9a;W^l}6
z&qt;#jntym;7HALhnI7B1hf5F!=iyf@UBxawXqb<nqw#g(-Uy*s9Q8dz77u8M9u<q
zqljva!|De1#TjPg<v7cfLpXWe)!iDXM1oeRrkb%EaG={;Qw{dDI$_f~%R;VaR6T2w
zf<#EKsjfCJvM$mu0dKolO*PCH&-`xMncoS@Amk(Aj-YOuBx40k!qD6kpn{nNI|?K-
z<7zsWf(8uILKd$a)VKv+izzr)08T0HID@3kz&Hpvd`L{74m5&$)-e2uz@L@y=b8Y9
z6eWM^;ZHCSuBi?H5eM4f&nEa&2Y)uepVjc^4EPf!1^3ptk(i-$HO%0El~X<KWuw5l
zsjddgS!XyG#V?Uk*2hT+DGOL>3k$Q#S66Uly=r-7E?pA0tgQ{!?y21)u}OlFe2fw(
zK8TCXGT6loDIHc~Yb(zrH|KOvoU#?l(uJUefe%0~R2|6>p1CFv$`14Aie1!xBu!u3
z$dYNx7&PXrI)XB$-E29B=32A7D+DWO!yK034RLikn;4i+sQ{T1xVQmLd!Q*GtyQTU
zu0YhCA{fkQM<f#gguq3YHeJ$y3@1P#VCC_jNW_Ixp@7&RYb%J2)kd0RW@9?E2g6gY
zAp?lGMqo-A2Ll0n5J-N7yKSnC-~gJ~2<W)8S|S(MXd{#3dQ#(0pnq(P>@Cikps(l~
z=W4>+Co5@>mULcd!1ACYO%eCNVW=XPwFfQ@o<A%VpwJn`X8?dH5f&Q`_6CtuA;F0V
zJjmTa`jLHZ=vjm9+(~5lVDVr={!1g9U<`a<>lUTC<*c>P7z9WgH9#PMmt$Eql_E!a
zvU|j{`iMr2C@|M93&O@cc0kt0mZ6RH1dxqNTiXU@y%`_ZQrgD0rl$2O9zS(!YGc!S
zz{bXQ@(*d>+<5l-D{@+PYU8T)qgfSq*NxbWQ-d}JS6g~|)Y!Ob{kUOT8{5`{YaK0X
zzjKOiyoeM~O>>frbmJvh3i~A`K!{q;cJhr)d+o0-W=Y0@x=q-@@ra$v#x-0l7GxhC
z#WS2{veF4{RLv!=HWBOWnKGd!NkR0A($x4ky#Vv@TcM&Q%>%tJ3zJo;5qS;fi_8J@
zodUralf{m!6B=Xkng()@h6Xr^Hu{ik-Z&XVp5u58D;#a~8(0}qe1#RjFpGuG>vKa{
zn6$8hb4Hd7n=&ZWH)68R0Q{t;B8AmA)q|LN6`S_Gpn?W-6+MA&*+4dcOZv7_q5zx<
zv>=(#FrO2;JPEYIT_v9`9HRz8t+Xv<O=NgiQR57^2u>w%-UN9`D}Y4Kz7mm~RG+Y!
z1nC?d^l;_sChvi)skENtn_Jqj@IAzWC;z}+Ci5UtRxtAbwSm|H*xwRSfbesRCdlS5
zurY}*B6b3`rm(e<a*##Wo@9lt3g3#Wf{_M^iv~wS!oC1Qi|~d>1EX&7DiDx4C+nM1
zZNZ)|4PI0`c?tQic6DuIZRC=MP%Swr*zMc!m>~`aZ4?@7mv>O9YkQ#-?!Bpr?jw=_
znf8p`ZjH2(E^+X<$XK7`{{`WwJsT!Kgy9Mg479xs$`vK{PZxXPZrk16W<1@}W<XXb
zp<mpw$!eG!S1k<;4k34QQX94SiU3Hiah8GI2X6H6QWob#yt}7DTx3o;adojZ$(s}#
z6LI12RG`L7HxX*s<VS)zn*=%Q1(<z_uy|MGKur2-y9Ae=x37%d7Yj+B@$H8U-|5PW
zSJ((hU8jhQU11omfk_OEmnwi-p(TmR>@BL~(Xve}?}!CJ0sA7n5@;0?*aox_=NN}5
z0P%?`wk(q>`qP9-nyACtV*f;C4O3^3N-%HfDTQzIG+7AO<p^pSs5NTj(g~MzL;G$M
zU<iXD5XAsBkH=RYF-3J4k|V6hXGPLjrFL?}U6Adq;`VGG!?NtG78E%H!A?Lr?NEM(
zt+CS5nNsFlNVc>F{3WNnKzjiGk&AIscIs1x>r?$~u{te<dY}?`R<+YSE>38@rn=gv
z4!ovnE0GZ(G-7GzJ3!VZ4GbzEVAVy}yVwz~Ee2S%e;s%uBAP8)UP-KFfAzx0szD73
zCjATBgv4{i@k-5Y!scZ5RxM1VYg?eR7-(v8RU<#dt;ZP{6E%d&@(X83{`GB<$%lwm
ziKws(3esOmLLTFJ<V~fuR<;VsW_V0{<x*V1>%2!)w>AslmX%rTNh!K4TC|+w^(e7|
z9Llf+q0MQiDsd{~6r>s}dM`-V1K;hK9*P}A?BPqV1;!Q>$}_bH_wDnxMvq7~43ZXw
zD~N2(mQ=@gSg`Gj9r$YBIPd@#tK;rOtS1ea)p3=V)?1<O1WDAlfej+`5#bafjL%(F
z<`t4kD}PbBBUv;p(jRq%b$8|09ornmo+Q0p(T?nG&{M^~J0|eU9omP961#PFPv2U8
zJ@XTe*fBoyZ9!BW=6i+;KJqCQ$G*yImmm@@5sO?P@q<nLZbuM<Mel0HS;-aR?%=gz
z-$~eaOH8L`hWRxNvU1GKKwo&oQJ)(KR<=#nWfF0ij0eo^GepW@Wh$yU;_@WSN3~ZS
zR4rZs-~`uHH#X+izuVhyb-p`+)o%Sb9e+em6WPULl5JQqL-bTb?}OpGH_Qr>(|ejr
z$@ETG)Ir%dWA?)kyC;^fQ}W%SFap)hVS6VfeJgoeVAk+?+DPbGa-=bE-Lghz;~XYm
zrrF0X=OpHkuuZ_u@yj`3xlIk6gOziO&geOpHq}wB4fvgv&1qr#HJ;Ld1v(v!Xk=0~
zTO9&x+wv?Bc-!U@ZfL)@&ZxY2lh0w|IV;RYC#(>pe^?Ck0r;zUsS_!NR^`IKK+WmK
z7$sk6joDH!p<JJLgvP{^Kw8<TMD2rxe>>?*<nxF`mW*EAeJH|-14W7wA$M6Mh->ih
zhT`9Fnl^kGV`IzOXVr_f15NBW!fsTn-FII{+Ca0ypJMjEJjKr8^id@LORTkJt;_y*
zU2`ltXa74JpK^P6FdJUjn20<#q9^q$sr?Ld<-mMhX?;(@3}9fG1KUU1n51TN*<8kI
z1ZEpyB{EuCO_FnnF^aCb=&478mx43ngrSqIC}&PJPO7>EEg9(~Xa>pSNnk?_DAaW~
z^-)LPQB_a!;Mt>k)+9SxQjKd7#m8%eF9>RGyq2ZWiZwMiE73FCT3XtgXFXGm@K7Hk
zcp(pK@@3L0+oo#A&BQ4s;&cKw$)-ti48$)^Mm1A#%VCZsWp<)v@r%I6wQFd&zptmq
zl|(0FBpFtif77mx?xC%n!vp**0(H83-LH3vulsfmx!-T$?}N1d)vR0yJz|&(Baq-I
zgxF(v$Pm#CUr&am2%Fr=7v7Og$d3F39z6j6XhO-1CRk+7(L`hv<oJe+={!MuQ#iny
zlg`7e{WR)C>ag8E%`3I65hR`4fvURuhKIU$bdgcCqgO0MAWp$OGl!Ij!%-S)fVsjZ
z3<5dXszKey!;9EG5TS`QoSlL`8e$sc4z7kh7B+4&s9+s|5ruUNqG(0WR>-*tT~Mp{
zGJBpNmfk>~Ds^?>>zp>=XIFRc(0~wp#4crz1dDnKMEyo;7cwWIj6J=i!=Q-7I%%f6
z1_nYB;<ohk4R&=(KKIO98vN>MjH<jO7|Tn2&H3q$H*z(v6RIg2?TseT=rucvRvh@Z
zA)6t8CNmOoLNgQKBrrkVS?pcH$idOqswB;EEI?ueFyjSiN8k)Zje?b=VGwXfw78lx
zHNHQj)G4$&felF?rMkM5=+&KtEWVTQ2cpml?%I?*>g<UF4|wwLg<S)E!8*WFs2zR}
zb`1p^0MYyzHi$pkS%?h3=5|TVP5Ly)o*`)XLu}3x0`!V&PH_459}-=6k*F9-1&dEa
ztO-H@alWLjcAxh-p+GQbHQKevVvj_%wXR?x2t%DU;XK_ds)K-a;Vi+3R}-cH<TjbH
z;{j(v+^_toU=8Ho?m^ddPlp{~0J+)74pZ)+6#|FBG?yT63F%-USBRPfB?Sx14?-D{
zOh7Y0B$SMv(Lmv(gG@lAuXt89$BAIY7a<j5f`i@L`n&tP!V38^+`X-L)&j0o9%(eT
znuxVo7!_Ps>FJ!M(<sykNtuU;a<?nGo3QuTy9`-PWXV9RFeb8f_nz0$)7>fZASbwn
z9a)34AOt%?95zVLpiy_56%66b(j|z3Ef@)sVJ9m`JB&fvUft<1->4htPR)N!O20Jx
z<=8kC+x(>s*0a$&DChfp@$JXGpD335rMQ_WWH(V7omwHKL2>UW5Wa>B2t+<eX=)nI
zj0zt5#2sDSSqQ#FiH72ZZ-UC%usgNke&e^-tS8;%+iC23JF7B_m<J^y%NP=^K)xrn
zGRs)xR5Y59M}VYJ73g=k2BzP55^hdWbUo6lL0*Lxw~MwHV+pREQ?V~Y<;`5FT#$A=
z-%|5*3`RpJ%{0}qN+ewqqjpP3hp4p>u9!x~Nor{tmRMZ7Gz^q2VH9JcfO6~yr5D;Z
zwzwVyA=(&6t=yIv?Z|G<nT(2%f8}t^B3pV$oX5A!i(xlf{87xBM<nwmU-9S_1pzyV
zpa;X_#-yEHpa2%_1`vl($xYlIj8%gFQhnBu;08``^WqF4|GC}{Y7W8LaDuqz)JRil
zicgs-MtwsbUWhA;ryNMM2ntmOv64#@ag%HoX%zTD&B|PM0lX27`E^qLE_ve|?xANs
zY&U;$pVS<7$9C$Vu)0F-ZJOqi5n`$`sPt4yOXy^?OHPG_)keTZZL}*6-b!q=f1q#M
zK-b_PlL_!?$F`2{Uh$yG);H-F^d63&2-*y$=umn7QQk#qx)R<l$~zR*lNwcSfF?Vu
zndsCp>W(7I@)*ICaA;WHQY1mHJR;cVr(Pi^j~o$@5`iec({puvf=*wMMtKb>b)*gk
zx{nr`NdGOK$z!e;6<O^an4_qYI%{ElvxG>}@^*fx{%gG<?_wvV6HwaWlC(xbir<e#
zT+&x5>s+yGti%>@Wr9{m=o8=KTBTjqLDx*FNQf?|w6`k~t%&T2H$Wg#!7_;=$HfFf
zB}j@6B?+6Y)CHqo${z6OMh?iDw~W26#f845ueY~jbKk&FSEsbx<v|o#Q3JT5LQ>dl
zcUyZM)|#$|BN{m4p;H}Owa&PA_P(jNZ&z=Hk^`m_v$P;EIjFQ8#8A-?DKyMebHt4t
zgnMv~s`PP#iBTY=<xx{;FHEVs@e+{+KZQ-qEbqPu%4mm4!w5;M5Q!Ie;4C}@?^HO}
z8GPqq-Qi%I3mo4igyAkScoGi6_YihLmkmW2!&Fp0K$D?Ra3H$g6hae*Ct%ux`?he7
zhG9b&8x@bXn1e`O%NpN&YjSVl)rrAg(+P*<lgTMN>@&^8*ag}_cIbC)aNv9;LcwOy
zXDE2FaP`#+=LFDZzDZ<o5#*qZ1Dy!MOPGcz1Oq>H4B{KQdMn0j=v**iWR%Ppm@ccP
z0s0D!dNhbM;me-<`H)9KfE<>-1n80mcpt@>*shls6SIt2WMh^wJw_(;FMAqFllJ{M
z+_ZVs%()F2s}H{sx9xVpB6$|M$xK)KjAVqF3j?LEquE(312j><EUgwiEXZr6=qedA
z+?%}Lfp^+VAV1Ap>TZ;18Pz)noV<H19_O%@AEA>0pnd6XE*~EzrLzX3e*L?TTji&A
zWm@E3MD|sV1ieq79rf%HJajiBqA$2J<UbqE;<~`0726NymdVR+ne^xEoXhAq!&R@9
zNR%Zhl11gP&#f|eK_t~NxN;her>!I<zOBRCx`wv)I82$AsUx&{O|Wmcx370|4<UY@
zTtKQhNNZw^%4n6{xJ(=A##zLtq&PoZlwQ3-aqxLWu-Vx=NX`_=3`7v99N!*;oIs{E
zG6j4rC<^qx5<0s)hbkb|HZ+W9?EBGiu!oY{vza3%Z|Uys8WNRsP}h&=p-vP^j1M!l
zH!H<{yGqGr+$H?kh#v+Zs+J!HN**#c;MPPQ!9kXrBD?U+Ze`W9nWS2NCkax6vV&|m
ziV4YO^b{QN)igilvpXf~Vr7yS2{oH2Gf9i{#wHdf#ZI}xWChV`2ezv9;{K=`?&PIV
zlqYF(CH%xIkL`VfLxf8V4R7t++1uG>hdRNi5a3LPVLt+bg$WN)#wXjSLp1O48Bc}B
z($&$~Indp^bFj-92hZTHCc!3t3fu~ErY4Ms*6bbx{jpGu6}QdiJvBPEZ0Q<wDi9`@
z(oGYy0%~d9rvh{^(6yC7C!kr-l4Z3~NGa-Dk14i=dZ<Fn(+A<~MN7h^RcGH$p&&@7
z2_l{rm}_x9$XYHu*(~9a_nujpI%agot>$?*{%LrXSGx08RmuKehm``TNdBMZSj#%E
z|5t3z|7$ircK#oB0u)jJ*-wr-A2DB#ESkz^9dpQvHbvKA{)cGWno2rkl^r>o2Rjw+
zyELjNwelxR6wDg%M$2)PLM{t_QlO_tqhZ@~S}K=I>!y`p1xHDVv=|2&!s3`@QoxuZ
zK^5L=+H!S;Cj-_36Bl6~@iJNVbDJ`oz+}+mg(*4s0|tdTIfzYj%T;g7<OM4#$)q?6
zNicT=H@TIxW+g^=Z_KzI&EDYzC--MN=aHh_{RFn$=%~9bvhu7ZJq@Lt=V~^iHo+TK
zd1y;NnvMW4!L&M-gn0O45P@YpMQGgw2fUC6Ol;bUXV4Lj=W;>=PPSo+8J>9h$Bg~X
zW(=~fNC`H^LQ-xg&Nt@LJG~4(MfU&6S@8c}+tS?X-TzzW_W#-V9ErVsm!58EF6aP$
z#N4}WdZ+H)YaI9PC?p1Kj<z+o%&vQPUQcd7BcM-77@7%p>S*|<+GnOnB%(M8hQ;&J
zq~}=N{z~&g+cntH*)h~X=2PudEtQ`3cJ&Q(DwF5YBvJ!33_3<b+R^c*E_fMiMxCZ2
zUX_s7q_IK5B&=K}=&22UnY0hZWf-|q)GY|U*TJ5?%@+)H1zEKSZxS{9&2T-vy*qya
z(qvtoeO@luR;*ZCv5=_IAfw!p)YLQ?r8m)T)bF0*73PEIML<Qzd9=h%IDB{XF8-#q
zsH1w<EIF!c++CgdJfqjT^IemDq5U1%r6LvfXZLk3w-=$?%e<z#+Q-q{S+jz}xv*->
z=yC3DYKzpA=F=2=hKR=>VpBnv`yfT8*DrkrK7@rl(q(USo3%N<f>Fl<UCRjm=l)LR
zgnw+)tRB_0Q0pJ`7CuY|b8UJK<`wmK#d9O0W+Gap%$K9btJkkpkrum`Dk-k>(&6;|
zSYhJR>>k1)^ueU2WrD#@5K2fBF>*|5utI*@G9_I(p^rnnc^zG4Ki4^*bNb2Sg{Ii*
zFtD5jD-j}QQ?nOB9bm4#tGl<QSu~r);>_{&i2A6{IrbGA(41qn-xYiQ{cO&!vanxe
z!hnM~DjnR;BZuQVqMEz8XNqOm&Xq!g(|47Gm`S$v0Y*5c?dvAEFt7;ruAc1Ea6U1I
z9eYU$a-81T(}|Wqg3lDZaJ(kH#?6)Vk<>&d2*>eZT+L*(v{?xU$h4(M9(RsS0fT9b
z8ds+Y4>ajkLU0bU3(N;y1HmZ`3@CMTEN5Cem{tm#43!dME{`5^{z@o-y~*(@7&db$
z5$X|H21aObx4OZ;o?%Lh@O`*zV4!cnaoMCEn|0KDU+jpq4TduSZB|2f7?n9LMF2VV
zr2l%LrzkoUVW=NEKh9pL1aj%!X|e^-dI9R$qg(YR3$2cRKSmCGhryRs4(h>Z2P{U<
zhA(ZRHIL#W86ly~#fd0?oQOO;;T09rpd2A1N<y|@#E7FF*)JD|>4N9M%6d-Q6)NaB
z4Iz;rKDL3G@Zw2bv$5v!>MNUnbxE5}KH8PG6zYx2D)YdN&i<0NMG^x9-rZ#T<I;-1
zTVz2=q^JWok7nU__2daMRW@&LJ6uHRo{|-bedP7`ZczHtTwV#ofTxTcCpYvbjYW5C
z4x{waH%K@9k=*F0mQ}jW>l(OVXnS|>HU%%|Ae*Xvluj$^<Y+EQPSiA5h0e?`xX=JC
zlQS8zG%W$Qc5p|S#Y_W`Ue>^bi_~Qso3?F3%yA=^Owbess)+#!b7L9<Dl+H4eiZqy
zJB-WKG--pz7N+i|Zm)K#WGm|1Znrnf&h2m}Btk4*N5I!|S#8=}k-2QsOYW=@*JvU|
zi7!HSI3s7uh%d+u^YXmIWO5~WvCe?W&AEdgweH~Z@|4}c<prAG`L9y0;Dy%KG}lI%
zsejIiyP{6qvX5t8y5*j$ZddNS8%xDJRZDk4EqD&B5Mh@dsc6nw`>1f%o&o*4UA9Z*
z-E+&~h%bku)G0eRjQ6B!b}S=gATi=r(zzTBD_gt!dN+6Xg_Sxe_-gdDmhlujf_QqB
z`%o9W`#efqpxKLAx}YuO!u(2bNG4c3Y@g&wxle9&cSM|$VTYTsUozK=&cJUNFL$Tw
z)r`PS)3Mp5yDjE<><p;{H)Sa7@2OnaQF(G2PU*$`l&b|NWuA^QkB4$iY3BXh7N-c+
zKr|a?(A`2{W?Q2Qip3J<u)mZ!+}g3TM?mssHK8yf^(8Hkc17qW)Fjzq$wruiyrF(o
zc5LnL5mvyEVJImzJ*9xR0QIf(tK~?CPSpX;G;-Ovra<6iBdcch<dl+2s}ri8#Ekd8
z0CPhJr=31R+?0pX)P|tW8_PH1j-COskT3A7EiB?fEfAJAD2;=;+Zc932uYe!mtPB=
zU4uiwOa{8nbz14vz!rf)!q`eyyCSD&{U>_I;I_f;3x%23LGQ)E?Fa4X{3;RT4fPFO
z&@WW$XQoZcWEPF@rZUu@C_nhUeb`K2zl+YekreZy%-er&-{8*ve!^yafPj6$%w-^M
zhySnv^+P@_aGxgtzi1<U{V<8734bCgQoDa^p%IL#DWKz`t#pX3_?_Yc9gGV6T2w}+
z9DLIP0YL{>XwT{>dC!8%1W_I5b#x0%VvCvvP*f9KZ;?c)$4>z^LuAEHaz=C7=+&%A
zBfA?6S-@5?Po14)d+FG+-M3mUjq2@ue1g<=ZB4vxB5Pza)P<Vwy}13F{>1LPCk`5;
z)+F3_;9aWJmO4V_r^MZIi@5z`o;}E8uVwug-R7NJ1*X?)@M}ObqY@rkm}|Nu2)0;s
zhX@MF5`+fw)dxx_Sa)#yPS@Ns`oSA1b=1;0tFbLtOA{Xi<YCMcMV2KB3tn4F61+fy
zm0{lwvTFgNg&JO}HI%G@DY6Yby5wPuTY9>8`0T5AH)Wc>+v?y2gJf=88yY8cGdJRx
z9~RzL&+8gs4ADjCyL8;fB8g;DnV?Q?XpmrxD&*)g=GPW!sJpj&sJo-58&U4d+6HrR
z7!+JkJAQyjOj97bX<4!ZrTizQ6N%XYaa)#<KQzS2r^x=D?^v=u-?4;O92&S_7{d;V
zGn-a(<irUsW)|EB<UQLs*cl!mBndb7QZrdCZV&{+{3sYIA!!)92}-C1pATmz4S_GF
z)5v)!xk249TwQ{$5!8=HHi5HcvuW5N3&`Aoos#XKBXl2WpX!&>r$qn%O2+?*HMhh(
z{{PW6bN>Ic@!|1*c6s9e>^h?He+tJ4@b%fJ0f1Ux?g4<fTYn{k06B36CfT;>jtOHc
zV4a{alpYQ@S`7Qb49=y<F}vm>$ISYt0ROkhF5Fa(K7h%uTeBt~|A&u@|F2oICR(Me
zDM#nUKCg2AUu^zCV&BnqczqPv|D&yInqBk1wzXw0{@<*8hQMH!oIxgZhz19yy9zlc
z7%7b11{9!}@vNQ!w@6SQSO#?)bNt4V`bbvIPSucR;4BBXsiZk_E=o>CYHEhY*#^e@
z0FABIR)exSG;d}nvJpag;?b+Ik@c))$w9*|8c(LJd_}3HJL!)cU~?Gh2MoudeU_I8
zo<d!Nh5@2YqnR=JndXmaGZCexW}9IoNQL<Ba7`!34v|;rhE#0*i-@0TABER{Yiq34
z#s8b5vDn(V^*<Y*q!Cw>T&=Z%tMOT+sX$E)stGnwZ2=L>16UqaLp7L`YJ-CRz^gM`
z&TJty?7Jc`xerDnkr1w6))Cm$(9l+(H&Lx%E}c>1yMt<WEEHl^4-wN!fIA<=!_k6d
z1qUup2SPPOP83=PW9l-r9zbu$HYE^Npre)86FX3t=wI1FD;j1*+oM}SHyo2{HeC)l
zc6AK&cK2?xA@Lb<R!bSA==3`iij0}L5sp&ww>^-*M6J0RiYNt&Tv}^3Kp9p95@BSG
zWE&dkn@S|Yh9SPoQhQVn9)ZyW;ZGj?OwXDCMrSLI0v29ajUjH~I~%@JVA_qlp^uMi
z@!i~nFKDI6945nxmQ*t)#0WzdS|gJQqoq+;QIkpVKM3)Ae=DV|CpB;{63x&^6|jB_
z073)uTUG)zcwjVuyBN}9AO-u~2zPVQ5^Mta2TVvvMdrF}-)++taLoqj2F{Hted^QI
z7s#cxJsBFPiuxVY*P8W#FuijI1W9$=paTTgcp#uHGtV8G%huMJhZHX){t(N(v+qz|
z#4gMQ#erd|Nq_vZDO5JX93g;GiJ1?@(@d$O5$BKrx1Ix+4>kuJoSH&?8@u!L=R0sl
z$ayg13qfJ3@ol3Rc)Uy@0P;*vNuA2`krx6t(n?tXg&^@6w&Epf@-Olt#thirHQd>?
zdFM8VC@AXtlNu=HnQEqIX9v@`(83@MgC0JWfi&8-=8ZGEa<Jrpqt6=xxxF8*j1uH5
zVba$#V8mbogMtVf`Iu(GM3D_f+&OuKj6AywONkAq7rc&eu1O(`X253D_!8#~zO~UH
zf(|**9a_2QB9YDHse_L<C}}+@Q3`uZ4=8QSJ2xb~Ci|;J4Htp|E1qdg6F!zyr(ko-
z=Gdlk$t5+scvy;R5#g8sAuf#4n>{+99|u|&RSMK-U!$%RmO?3zAsx{+1dKD$Kt?*j
zIeT6L{Jx8+rVzxAs8SH%n&}Z_{*Nr^41+hKkuZZWCL$EjUvwTo`#l_1CNQiTeW4@_
zk)S~DiZw5qxFm#(jW-_fVZ?|J)bYlX-~<cw%o<ke1MqVKpVhOF8)FcD0L2D>W&{5s
zQvKVcDQkdV(b=vP0`)ywA_%SsY~jfZoQlSno|jM#5sJqnMC?pLg{D@qNG3+!lPyW#
zqaZGrgqtOTe_&4_Oq&Sd0F#7g5{@HQZidPU!}Qjj@~NA3)oy{>S#{D|`%1a?$P^i~
zRJ9eVqEP6nIa#FUNG290f12S>3;b!VVN5G1A0h(eC+P%NHJ90I6QMv@rY=?~3E?ne
zq1EEgX8C7}{IfO04=3o_NS8R{A>ch7i$pTb<i8g3U#rcbe6~!WGB$*OQ=fDdYL^%;
z#R86B=*&5e6z+l6Z9a^;ExvVS43*YWt8Ytz1~pJhee!k$unR{ZkbcPufQ^3yupK}e
z#iz~eX$$^pVZU1OSF0>+G9d{#I>f#q)Ds_Ppa_Qr`#lYk#Y#EyONAJPYQ}XPmR~Vu
zL1qHY_G3{Rb_J1K!)V+&``VlVnF={V1kukR7Ukp&Ex3xS7mh^Ys}ddB*}UFp(lD~f
zjl_zy8e7t_s7=;BOOcVY|KcI#>HN-U-H`t4FTOZk&sPk`#Z1T^h>g?-s)3e;GbT()
zURt3qXO~b2BQ7(Uu&-d19c*0}nhwc`Rb$Q3aC0oYZe6%Fye1qCuM4-V4Y#(2W6@~H
z#f^`8+IrQJRxz>~SCgY$QgJ4*S)x3$bD7N^s*CyXCTNY#e6#B{2qvWIMp|ULdq2ho
zDnuQzQl>6X-R7BX^F?UMMtteyM0Q7lH-VzibuTYTvA45JQ>e3I8VO;j;Fb!?$D%9@
zRgxKUa@N(PBhv?J!Cu>fpo6tUl*dlE-h)2MfE{swdDqE(`H+$l6wbo@gviyTgrw|u
z9_CrE)<cJ$lP{ZeNBAH$tYAGmFDt0CheIVCqX@k9LKmV|Uu@ac#H6ts!r0Uo?D~>R
z!b)=kjGsCvCJ_-K=_D+wgPD#oR70o0S6{*KAkU4hMRwD5bAwIUrD&f6tX{x|MT|P+
zNTDzh1a+);3?a&Tnk{NZL{FQPv4x|Ckln0vR>`#h2)<-1vh{+r>$^|`Y9Oo##E6B9
z(6GFgN+Msp0`a3=I<>Pyrrd?Q(tOu;OrK-Dhs%0rk*)GsJE}OVi)1UoT#o>?zJmDc
z4A^QV_^Ly^v&~uI8enQzCP2@H&2+9&Dtil4{AMK(D0r{p(wm{G+}&^Cs~UQnSY1sU
zkQ0~k2-LQrj>1vQsSEE`u$jsoQFN2~*9YT#KG9_--bR2OO$0+Ubq=sY=~1xx(w1h(
zCn{T4sBv&vVkx`w5{TU=ATi`~1rO6OqOq8m?wc#IaW-W|8_d@jB`ATD<`NlaR>=<^
zpvlwez)Xr41UXN0eoYBvSjmlu0VZxR^vv!sGp5q8cOQbY`lN1INsZBNz3<%90kA;8
z;3TRfG>cv&2Bx{?5cUby2rl_UM6}Nw1JehlOACNWsuO})RY2jS$SMkZ%z5=*l39<}
zj%3WREb^kB;<P>@=p+Pl2R74UBM^_PJ`jnJB7_apD|*_r0Aa>xzQ$l0NMjsep{<0T
zps_n?fI(g&tC_i^CAPvQXpFl*@}78Akr)fkEne2=n_Tx~7M-+wrxo{RYVXLoF_rv3
z0GeC)g#2gA#olQ!>ozd@fe@F>6B_)PA-0i9_%j!#FciYd0F$<g&#2wejHcENXa3n?
zuFp1@lMtpARCs}~Bg|HMLqQfo196Y!#!QKgWYJ<$b2u!^fJLS{tl*z$gy|*8P_-<P
zh2RD~8=}Tv=xIz%!SQ0<^Vr5zP?JsO$o55_P!H6QNU|e_H4dG(DfR|ma4&E(^n8Q5
z3LDrPR_rfFU~qC+X<>)}Zw7+I1SP16e2FnTVC{GT#%@McLX<@sxoU4o^(l-xix8uy
z$+~N+s6_&m4{b@C@db~KkvBzx5(E(dQun6EAPA7fV&8|_6p3bJO2BL!0WiFcLTFME
z6;M#Dm|xE*9ztSbl{o85mU>zH7(@Y14UTj|i*aiaaY}4j3cC!HDKW@NQj}n=2{#NH
zBQ!tAA(5U$>B@Sg+0(dX7`tKnr5V}`J1lvyb_{#4_zi}%-WV4&j6~(=gl%ob2!*Fz
zDuq&3x=AJPjLWl2OIY!YJil?9e&Qm5*ekB2KC-lrc$<A7ibW&vzZk*(nWQCp!p_=#
z3B;9^iHo%mkcr%fEGQ-Lx%W(dgwtnSo^%9+T31$>IUuo{`KBDkO7p%@J9QDAiF}J+
zLJE{(fyeUBbh~G&>5~M^H93RXXR(m;n3F)W&kQH>@(Ai$rMa+-2KZV56xcz7Tquyo
z;%u5F52Y+%SC}glrVwuczJfTim!9LWL-tOY0&sy%f1>2bA*De9bt1YMVViP6Si-YC
z0a*<e)i8RXNMmuYIuVyqv7}BUVdQu$wHn6s%)fzq*sil}o1#T(RwMHa!Kz4qf_#(Z
zJG2+7j4wk?scEvqqW2~p>q?oS&N99MNtSAvBF6nS&=|lPe}n#3htRlTrFo5L59>@7
z+D>E%2^pzi3=e6};jg#?0Fhr<w~YM7|0)Dj0P#?sYYR!G>nX*1iaXCSX120giMvKg
z&jc!mk>gP~<gy7x*B;Bcok-9i-b`jdqfyJCkOkdd2VgeZBp0zlo*qoz1LkMQ-?~|P
z>$X11*_0^-R_Zt@#$<+g?IFcOiVT(^>OiIhZ~)B>P?{P&Qv+LWNaM1jVdRyc7zlN-
zWiMVvL?dfL1uBlvijI37>YoTi^sltzQT?<nhzoBr)M+9hJ|n$|{W{_wZE|uP{6b>l
z>XYx)ye6qhrXz6ZC$BrsNLEvKdo0a4xmifk9t6^9bJ;+T@E0L3Zz(iS1(v`6{P<L8
zZm3OAZJ>7s^UPEpZ1X9hc#Y<pfvje+8Q?{wKH1~du^G>R)0|`V=LWe^Iv!9vDmPwm
z#NwO^)_a7HP*((eM!gXxOy-`z%oa%rkI-J`9jc}VcccLGj-b8}G}b2R%j3Agck(a`
zrpr$F>;^3W8!i8ihYtG(JJhhB2|a5~@gFF)3O^voB1jX$BQ9Wwk6;_%zfIR~damHV
z?E7k7*a6ZM`?kdp;ei_%(+iA46!sGyD=}QNH&o+`MHJ|5EHYdvd2w*K2y?FNrQeYK
z!hXiCMV%j(A^gNHm2x4<#!E23QVrVvJdElj#V0GuwFE+0uYSROx9T}-u*RrZ$j_d#
zK+KBJOE`Lcgr!`!avUtG8WfHzw!R)~$#+3^+o&4jLt)LklxpsSG^@+WANO=p&n;bY
zxW?5ifmqApg$xJ8@eYW2pRDsdY6h9o^{h2|mbdPi(b!pM`8=f;2c?zvZP*V2A3$UF
zxY1Ec;m#K}8$<W0nEY#<^wa5y{uaQY4-o1iW!#Op`f$J`1gB=Fq`Bb+`7!tJb*=|a
zC;W*32Y)2u*m)+-N1>8F4SIX^0Okx2yu2`l!l;%N#wU(VsxG(g>fQ~ZcO0G)t_I}R
zrH&n#r3@)<;6>Rv=J#x!&qJqM@u>it_*fi*{9G7oDHZax?+=VG+zw78J5sQ$z<q*M
z@ffiJsAt9S&Z4DQndTD8tRcmUm1zOhN?vgJ*5}g-m(+>??JkxFZg;U3f6#r32|U4N
zSLVjIpJ|&9^o5EwmsU)GzDTjc(7Vu|$DFkI7z#{6k&^jGQfMk%H!K+PK~F2Sk>*h|
z5ca#L!BYo0;2i1rMsuISpHkv~@fdA0?W0)yzqQRRp7>u7|8Xw<SLHwM$X`Jo`YY64
zAof?gfAFvN8WvY?gX^je71e?jBWaxK2tcLKUgJ`0umiqrfUD{jH{oR&?Ol-~=uH9-
zBjI!|TW_*rPG>@>awC<3y9c|fCt8(|P0&>YcK|XPu?QUjYgKq2Od4u}sXh7I5Wkn>
z)-$s@|0S(|dMh_$7EmnycZ)mzXLEGzy1Df~D<9z!Oie(f&LAi$LN(P?l?Ohlx)Fhl
zNkJO0Kad?E;!8ENdK;yhLuTH~t*EP=$aJG^&@c;5P(5njzT1hdT&BLJp3;+QHb|Xa
zg>uY~!kE;uTpXcc=+KH7Os)g9CXGdhHcq07I#11JZ%w}-gDG>2DjvxfxMngj-#s(z
zqv~^-Zi~D@>B<!v4#J!h#)@`GVP*#?s!NTmK1NQzNo2xo60opzbxpG_psBxIN^A?F
z#qox&*&vh`EH)`9y2(anhlZm@nu0BaZOBJE-$pte-o}2Ibh}U|$rttr;?BWl04>xw
z#m17x2o8(mB8YZpVP&^A6;>wHBt+P$ra|lCVAw*SMU5|c&lK#M<yQwmBkxk0rQ+-0
zHm*G!9!_hMWVg}wp!q(70W@q!dZitmAA$eJ$8^Hs%M$Th{!BmqcMJJ87yo-UKHm9H
z81XXG!1U+8HMXX8ZvJQE<3Il+*>aM=4Ca5$nz{8qE1$gcPkuGVn$L`k>7$3+M`8It
z7G1Np)gAx8rFky?_pE%jb#Fa$ow~1TU)787Gh0<PQB`$iRn^`lORlM|ese07GELL6
ztf{G~tFOL#-n@Ma7w%uW^txk?x&HX$uRY;}w;Xre4a=9m<+ZPU>+<C{o^;YpuY29w
zUjO>Hzu^t<JoVIftX%o7+S+#q0taeqZw`gt6AIlL4&Sn7&HH1q_pV+0fmrOewzk{b
z+CH>#<A*nI{%B|CM>cOhxPAM_&N=5}J9gaN)AO<Z{!a`Ief->W@7cBM-U}}HhYK(K
z)TNhx`r?c4z3j5jjEvkrHg><RKXCcw4;aShlgWR&;)>5tOnlk0zBo1Y<*Tmx%A4Q(
z)oZT#%3I(1*8ThU-+1GV?|kPwZ@u-_4}S22AN}Y@_wD=Y!Gj0yzWeTb@4ffapZ@d%
z4?OVs&wu`lU;N^O4?cL^bq~GutzWz8rmw&4ZQpp;yS{ngz$5Q@&!g{s@3%kjf$x0a
z1OMlvAN}4PcYN>8J0HLM?tlB_C!hG_C!hSsfBeDy_y6$z`=9#ffBw;zzx>mG`InzQ
z^w2}!_{KLLee}_P{nvjzbm-@gJ@(iSe(-}I|M<s0{V93%^dpb_@{vcL{nodh{r0#2
z<GbJe)nkwS`iUog^ZoDt_Nk|S_tT&L;YUCE&u5-_=GkYTefsJDdhWUB{_DT~>leRx
z{y+ZXh3B68({FzB=Rf@6FE70C!t>9+NIrl1(_deF@o)I~e}Dh`-;Xp2y>dQb_ycR9
zYUxW=tEx}me&4}|u3P$=hKnD)?~bp(b=j(OKD7P*JHPSvQ(7+n$)opw?2&gXTi$kh
z_h;|=)-A!of4KNtpS}A#?~m3tzpdN+<%a_MFOOXRaLYj7hZmkyd*g~fKCWyse{pQ!
z(dW)RXZxl_ThEQY=9!P(weT6G|FVViPP(>lg>vrvuH}zx(Qf?7f&Cw=xxH)t9iKh@
z46XXs56xe&a@;&{&Wcsl?};9F*Nx{6Uc3M4Pwjut^^YC8x3~URH$Ss!)4uP#f6>rW
z&wS$U6Blm3{q(b*9zD3?j3pmlzyFv2Gjed@*4qz#@<)$7{;qlR7Kbl8^uZVB|Kzw&
zead>zrgt6Mmb!4;+ss2>*uFXaKIOJwJhtqnsxL2j?guYjv~IyqnofV|j>N`CF3axU
zcKdBZiTAAxoG|afzklSbd;j)_s&N0t<vq*#S1cG<`cI4JfBVCoOIIXMe|GcL$2|7y
zgV!Cq@agONYD0JYY*YW~Rb8i5SFN}yP}BeZ6{`l$=)eB7-j45gUHzATe(I-J|Ec=m
z4c)!Z*DpKqilsvf->g1<!-|`h99r4G>eMHHeQ@ueuc)u8QEEST>!#GQJ^d?|d}?{M
zGSK<C6)S(yHGlEMwm1Cd7ZW+_;Tx?Q<-Y3&-*L(_5662KU3>j$eNQg@{xS0(U03&x
z#^aaWvFyarhnKF{R`s<TPrJJM*&F5!FTZ}_iRW$@NL+W-slWNfdrseQ#r5x7bgsH@
z#TEbOp&OQWXTJSdU(FxS_+jU@tp_i;`=zTl2KOz#_tHP#IREa~J-oH|iZgDmN?x#b
z=y#hAw2o|FdCiF<+gE-4n<qW~hM%mgzW1L_YQ1y$%9>kuJ@$_$UvuV-pIq|&n(8;k
zm#*AWefm&UhjIMSp^ob2r7IV|@fU3mKXTg>Z@Azex4!$7n-6yEKI7?M_AWT-g|{5r
zHBz^)>N9Kq<v#6;s`B-d-?Axj<ATq8v+W<#^Q}WSzh>L%XDpfD*LLfpCpWZaUN`yR
zn%nOB&V$EQ#TGQ|*}wGunw(N~chj$ae6Z@Tsk=@-_uXBey<z^-uRY`BH@5dLtNME5
z@BY&K;Gh0jXI8Cv?$EY>xcSLLcYagddfFYCe?9Nv#rqZ>_nv(>9`nbQ3+8?C+}p4C
z-uf3`S9kXpzjfbRU)ntSpX+l^<z92&<hJDLnTJo!T>Y0{ZNBl@s?UEkVqCrM!JmC=
z{ifq@IOB|Ke?IW0H>^B%N1J;6{I35!?bDks-G1P-1=iP3op|uai>l_G{M{8pTR-x?
z`43()?>h6(+Y|3T_EXjwZ@K5bD}Vi^`V;;(@$*FoH;>)B`MnF?KJ@uh)YnEjcHZ#Y
zPyPD%FTZfh*Tef3CKjH0@-fGbzGMA&=KW{YEz6GmVdLLl{PVq^d9dp2Qx@KI?7crs
z4gcw{zgxQUJvSWqe|LW`{pSU5oSb;#v>$vWxH<ORijFTFY<u4~{!jBM!R!9oJpay%
zV|OhN{?F}iKk=STpWM4-q~<&Cnh03)zwq?2%XdCkl|J#C`<7=Ox=?%I(G~qq9N2p6
zrt4oC2|V*+_?K0$d3N8@^ZsZ5v1ji4;CH*m7v8k=hi`az-=futJC6PEyqnHj|M0SH
zAF8@>RnNiSWuDmInCR8_Jle5f;#VK8y7kb73%~Wu;&s`D+t=K+=(1z)JmtT)SA{$K
zb}szub$|TQ$#)$5P2bM!)b$JB@`I0Dzv=EJQ^$U6*>%CHW1hNW;uCLw_=Ni&_*&I-
zhgNnkeQYrB$3=@n#=F%I9s0qur#!NK+5THzyyNw&S3PvY!V@1oV=A-rcVDaj=6Ch_
z<IHD&bnKx&pEm#LJ67hdK4<Bfli%(R81q)teEh2LWpA8!<7GE5z2fWh(%m<&Isc~J
zpLz0@@BQ}0gY$--9$m5joY$WDn@?0N+`sbO=WkiHI=lLFwP&2L@TKvm{`b#IA6(Tn
zzWITkrGbWh>*KfIb=;7;^qAXT*LbM<@$~$ITe=Q5_xv@ysj4Abz2dk3bl}0q|M3Gq
zUp=<y;xm`uli7de*{grP{lxtXQ=z*SUSp0{tJdSo&tKSZ`DGt_a^bRTZ#Z`3BP&)O
z{QXnGCk~uiJ$}mm^PW9(?PC4-GpZ+!?XIyd96IpLM-QBI?r-NeT{-`T{*{T94_)`-
zKYZyE@2@`e@z=a_;p=bw(x!R0cCY-*Gr!oT{QFn--ua%7{`gx}r@!f(bD~>=OM1V*
z{PDo%Meh&Xwfy8w$^}yweDw3@J-qwpH@|Puo%bwT_v}5v>g_|DzkBeB|86|*{;%Hj
zSo?x2pL%%fAG+p0c5vIT4pyaqk-YM?sh6I+<U5z&_4CX2eRlc&x1D_Gj2|!ksdC>>
z7v8&S!=dy3{>K;YP;07Qv+t^>jyrMJ<tP8XN?-MF*Vl#@UijJfzV_1YGtauN_x+pO
z_SMc`a$w23kG(VTe^=FRdFSeHUHZO1-FfOgr|5Tl_AS4DA+-6DrQy>*_2uRFT)(UD
zjsN(wGyWRdcijKZyX80U?0oHiUi8t4`RBbWv+VqBy_<Fp*Xf^n_Rrx*&RBNCnSrcw
z<82*1`c;pw2%oX6W>eGF)A!GN?gxLl^So&18=tS5_ut2z^7XG)@2mdyz8(AjXaCZF
z_+9VaZDaf2(9$*UyZZL$UpugL*S~+^@_GMr?WPqS^N#!8(AVoOzHQOSriD#ccO0`J
z+Hw6mzVx+lU845{^}3hdxh(L5MHe<~9(dQn_l|w%(v4qyT}#b%KY3x~+4HYo+P8A>
zX?63z-S@M<cTIhJ=jVR+yLYYr@!~bn%NM-1>eMq=EUG=Tc|~H`XU;yM@z<U8na6+h
z`@xTW<CHs&fAi$ZzkTt~@Bi(O>d##Dqi<_Jt=-YL`}5n{pTBDP3-ir4HoxVbk57KS
z>T_@S#IOJNv2)iw_08>@)ta|_>dQ;N)x7e$OyltW4Zr={!ykC6=K88d!Ka^%bzS!3
zn>YNnYGdZQhH>?no_qFx_mpGrs9Jy8$~T>V`qqOhZrFaq#8V&X{aM$)Dj(VL*)O&4
zx$m{d{o9MD&HJaPZ~MO=`})$S{`FtBeCLYl)4%`d?|=2f=XckidUf-P?Posn<dXeA
zIdtpEUzxw<r3<6KP!=D&I(x=3+kST0aPXq5zxTSy+J}Dsz(0R_Z)4S(gUil%EV}Rw
zRr`;5Y}KXjyrsVCvW91uUZ*Wx8TsI{|NQOa-~aG8uUIp7#-HB2`xC#s`G59&;XA8;
z-Sms8s*4WxANv4?KzYB^U)w%ie@4yb?2V_bP@debj68ST?~i}-rr$qsoAJNf&;Q~7
zHO^E{etp%`k1q&rdhJ^-`>&sGdiouw&g<NL@|`Ug?)u;FzwIMm`sUcrKD=P;!yRL}
z&cN}pPu>ta^oLtNQ}^?;<_EqQxc=FBpIiIv?|T3H%bySa*OT!>pR2uZ=g${zx^w3z
zPTjiU&Z;Nwp8VyHKK!?D{AtmZ_cm4i<rf#<G0}hHxnI1#CAs|DKmX+GzP9*@6W;wm
z-y@UT-~Q6sb>I2j>$koyR$qPTq3ar-oY&BQ#aBKx^ucAFQ+Iu<?+?#@XVn`&_Jg-x
zQ}yVsf2%rg*$o?>{@i=FEW7g7f2$h3VOjTMji-00|5<zWkH_Bp&|gkF|E&u?-nx44
z+GRH#ShDlrl3QNfcY1u}m~$82e)sbJhZb&nHhb^3tB*gw_kBw)_^LXu<NZsu=NB|>
zn!j*SRp_b9|8U~@*Bz|-!6%ka9k}GhwQv4Z{jxJoNiKM->LhdOQ@>2#{Pc+zD)W}T
z=IjNVa`PVD|J5s&9P{|%t&dGC?O3$@{mZ`7y5`t>VvpZ>#?Y?ox7|7Kk~?$TZtGI3
zs($uN^U1mEjvv`^>_ba8Jhd#jul4<(>&<D`o?HLcYlAn&c3pqN+66D2cxP^Y^vatz
zWq*20Z2rEteDR0rz`DK1?{DnBVc89vt}@mp`=5#)yr(Z#zxc@q23zKz^tR_>^Y8D!
z`9H?zJvP{X?xMSci4&Biftwe;@V;e#|BpABkIehg=Te7GdB=%W^UnU*h3~v?-ovd`
zRm(Qr^JrkjzTS(gsun8i<~=>H<Hd7M`FhJ^f4(U2(Bh>xF1zYL-*10;dH>Bzf3@db
z&yBz9-J6#DzIA2qLrYd&cGgMDCf;?R>&p77u}v$_e!Ah<Tjq6ax}d+~Z6|&F^`m1a
znTOtT^5gIL{O3-auV_!)y>mr>?2@l7(fgNV5{o*OW#M4e8<w8*)=f(;Kd>Y-v?O?P
zwb8%m_$QTlmn}GU`I4noLvMWir6s*}lk=(;f4Od1@8o&UC6+xN%%1aTY|Vi!BhjkR
zre)VGOCR%C)mLs=_NGI_fq5r&RBe6Z!TG_1^Us@l@A)^q_m8KndhNbNZ&u!L;IgIT
z2j?IA#JuymcdTDk^@dHcUp%w)T4izFq3D853o~~uj=rX9-d)Qs|GKs6ig&E4YdPUH
zw_O{$?XxGn@sy|My}oMRF<U~%JTd;h$E!|#e%|Q^o2OoAS@Hb5Qy+WV124RJ>AXc>
z)0SWN*eS>E-+RT9mUm6ue(h72H9UD+*1Y|l=Vd<it>nHhZkl)KnwtG5zV7j+JO63f
zm+v`$vTOHe|GF-F=H{FKw5#Evl~H}!yY4&d1ylX*^~vLN$%(tqQ106my!j2sJ+$P6
zmo8JS#k&ulH@5wS(@wZ=-TQ7_o;hGGI<fjg-~aHB*KGady1M!O@A>?{2Un{DORm4z
z`pbtmPi*+|`xfs0_=<jY(Tn;}qHE-JuUYw>llsrSbEN9j>d$`Rz*X=2==@*3?RBr~
zzb^Xvz#U6>?>q3@6VLw1_dmS&!p!-ZTe6QWTv~nml1(4Ic+292``VXZxbri=eEs}Q
zRU?^O>hIWbLr&jwaNhi<F6}yL_wsA!X#*cwHE&V%p@W~eWoi785C48D{@t5SYs|EC
zwyk*g^9%R<aoHztdB;2c@}Xt(cPu-&`-F#<_Ga!r_nGhw%7VB5HSqJl>ffrXiYdb<
z+`q8qz=yQU-*d$mTb}vV$DVz-?U<JNLra!Fy#KEHKQ_L!;)=zS|1kEK*L>*K!8Ko4
zS=GLF`GWVn^@o3b=fYLXtW67+J>Po8(huF2?fC4L1z%XV{Q6BF56@d#{q(IX_Ad>7
z?6%u~`}zkTYP;{$mR+l=mi4#Xxa$)q#FlQ|x3Io#{rvq)wW@`6oBF@~m*}2vMo+wK
z{-*xL?fOk$xqZd;%NBj_xA!i1eCbvFi!XS7!I{ezG~PFV_4D)BJ-=Yr8Si<rX8Hd9
zg;(En?}_Jr<etFt^uDSc&yTg;pZL>XUXz`-{dIp_xcK=Uzdh$o+kfzx`5lWsaL=dT
zabRWdrcYG8{oZve$JgAy_^#XUyY7zHr27|EANcgL4=&3ppE;vr>9**Jr(Sh`&$$b0
zltuqmx8fa}7S$f}*~Jen-5nh}^)G*3{*FV77u@^V70Z`=;GU&V{KK;Fy#!%Z4{m$l
zls}%lL%DB7Y}10+(ypf$W)3{C>8g?B(+k_LJ!Rm&#i_>@C%(P-oC6C3f4gtTX)87c
zmTcP;tUh?>?#C7mKDKztzyI^)U;bS3$Dd38?Q{R{)MZueNA!&A`sCIB;T>9J+)5=6
zyN|;9zvfs=izol*nl*Fzzh~vMer0FhmZ1y!yA+serGMw<p6)G5ps}fGSId^Brp}>G
z<^1hKJ9?B@B&rNrSv_twHFfpkwRd3LvNCN=O_P(8k;#^bksWIq8fe-B4aJ})``Tz?
zwMfEB1UA;JhiCAQrY1JxmF;><x02e%E!(<#a%!70re)Q-cw9^9$@V(c(vu0T-B1#m
zorpA}W>rO1c4;F@&IET)NL94HiMB#pOzP>~N>)p52$<GXQZvUj%?c>vS#5NK2s9=B
zOxCzuBk%$Ig!m(I(+ps=lnnt(+haAs@1~74)$8H9S%K<}U@JATA+W_rTUy#`93q7S
zXn#b0v05<9b_Ki+OwHP`b7*Vhnb6AmCOYu-BSvCsV@=Kagg&9@i4EY+VX1mr%Mu(_
zJC6x)iCo-*hwf*?Nn^|iY+SFFFfdX~PmL*Rl7QDks#$u*01GIJ^nhY!;{*gp<xfCe
z-=vcNNS}UPqbJM8^&|Qi`NO7eebWf3fRFN3OK5Zw!ChtJwi!+|woU(0)~{@Al<=f9
zHi}qH5tPaZO{)|77<K6aDva5{ldlBg9HGtXYC=F8*Auce(qkLD({;KU&skb~TsPJ?
zv8SXEFU*SbX>b_lDzLzq(6!0H#`AR386r@4lA@PXEZ72gvgFLb#zFkIv^wBy1$JhE
zjh*aUY4r$)vyALiVB>c3rOu#ZCM(w{t-78@^AbxR(UZDGn&}oFBvdl@r8N}K5|XgU
zptoe}GztazZIoIY))6e2t!h$(HEEcx5v*@wlgu7SEv3|SPEBG{fsH%x2UN~K-9iO|
z0zw=xa0{r>L)!%gAh$whJ(*-Q+Ks=w3#G)y2m(fRvi!H;zd4^3S7JkKQ3f`W#i9(-
zA0<|WL|<e$8mru|juj*Yu_~|t!gjSRsoSq+>(scOjkl90Sr<JNoK*5h%WCPk#^!YZ
ze%EQ(RywY$g=bi<y$bj@!m~vk(Kt5IF1Em!Ty3ze!Ysf9u}EEx(SM;?a<!ewYMIgy
z?W#DTW_2*8B2b-2zSgO<?+Hyeovotu=Flc?c%1O<B!rdSIFwZ_GM8x!hX-$`0o#Z+
zPWZNw1wu}NF)D9q`f%m4$+(fwprwR9s>l7&zjL6c^d{BZ9>U^O0^QbJ+HTIE&1t5>
z-%n>YkfjAS)^*caNGJ5TM)vPfb%ZlT%gve#t^t~-UDr&u1~%&>N!_rtxM~(Af4L$d
zU1PTnG_r+$DKH{eO;aQEmDH~!s2}8Cr&HTBks%J!FQt#%R5Lmo^k7GSw^-5DVO&d_
zoJaJ)FMD~5!=#<L1rR~5aLFKSu@iBFJREO^4ncg{5OBl;Xx&dlAf;>8XEydRB3Jm-
zE4h@a5OT@lGEkK(a+;FSvMC6UNmw&E&}8`X1&dG<WvGOn=KPaTy{Tvl;k0@tmn6ki
z2p36sqTf;=Teo3?-M*62bbJDSK)EFEA*&nMK}50P<gl0;Fz~Emfd8PgW=+<n2H{b;
zq%lT-g7ut%l%S@G9pya>$isu^IB}3VP)LLVrk0*Ck`ubkZ`2H#Uedw@g;mi~AWTMT
zYIYJ#CI~hrRD#GcEiLdm2i+$5@&DPo7Wk-&bH53Jgn*hv5Jc3I@Y?8-2M?ium?bPp
z6q1kx@C|2oPm+b*J<Fcm5D=9JB3K{bTk9jBR4rCfTdnohLbZx|YoWflS}Q75tF^_)
z)q2}&?|k3PoHOU_IhzfrecYt|VX`}C&dfL8eDlrs_<sR8MqUDX4EE;-WPlJ%4bluk
zK|&r>RLLMitH|uiq=jmLoiT)X_!JwJ5+~~?j0gt92?r`K`O?%Uk(Qkb83>>A_%J@Q
zoSc$m;o}fe9JdUEYF=D%?NFe&CVxqpG^0EQ3~J9<lBTvMRzMNQaHxa)3%o_tZ?aSo
zMI*#=*e_wzegTFiWCa>alglc~*c(Oe=c+9<<?1ctcdtZfB<u$Ar5rZK=-8#9`9i0L
z_6yz8>GBrBBIDW+;*tGCv`ipufU{&U)TR<<C)=020GYtVcT!X}sKIVu;iOD<N1IX>
zRTAaw0;X}(3IuIaC1?(`fkCoqnCGEu;?N>h8>iC=hS_B|n9%Pk3r%DrRMPJ&(m4|*
z0^cr85={kunNU$N`8*=T61*3F8&9%+*+rTxMi5XiLjGjPW-A(Glr>}$at#P4$-a<d
z3J4w*>Vd*-nf!vh*Puavz~_Wl$=OJ#B}b%)3cSm%e5q8mzpT?w%1dURfxj?vf{Zqg
z->)Ba8Ft)3_G!7OhU#ZC-o%KGg!~OtR+D7Tz&)Hue9r}C+;Y8mAyK=0(GG`MRIBm0
zVk-*CjwM}@F@YchtV7D*3a2~aQVYq+iV>M|rVJuav3b`F(2r(Po-GT<%5X`8io0}1
zIew$BwHzQ@MyAp%;)l#E1t+bdY+_Oi){_qfbW<wcK|&gDrbjCMO=rY(d@cFG7BeA*
zy@SdsCE|~B4xiKmho`5kNLJ@PFb#5DNjpf7k`(fL2O&%nV6l|LouDwi%E^Z?Jvza9
zwZqB*b)X0l9w2&HM_5VN@Bn=%P8Kk(!PAQA1ZVoY!*l#GL3tq4Llhdok9N~7RBH3|
z0u4n<W}Akdab(*>plCB)F*%?n=;jP6?C`0ylL=(@uvfICpu|YMQ9X(7M6N|zh}>)y
zJ35%T%D4)^AQf_?!lvZ>rKRJO^jrcL0%@YaCsV1AkG7}s2yjT|y^33_l4?BhP&iGe
z<lnIMKu)m<0qIigLMSuv#22niP{TNc%xau5?nz{DiZrpTvy`8LI=Ki1b!`Ub04j?;
zCxKK$lPGIyk+}5CAS|kc$$7y=p(y%L=2I1y9CRIWm=6=Js`SY+salN!5WXVyXxL~{
z0*c>IRbw`G4t6m56R0~9In#;Sqn+4F$l-Q5C|hTwk%6_*jm*t4?Ch1vAc<g*wVuZ8
zWXCz|!8MT8qDGH)IRYbLbZ;XBf)kOGUVlr6)jk17T2Seriky}t%6TYZ9K|Z$UX0Ei
zuG}<Vn43XL%;%u_OExBfb?DADv%hZ1gmx*`OlLLDU}Jq3ngzXy(_7ULEg2BO130b_
z_VcSC>T%jls$Yo{&Z<-5WKV=c5iQWZ(j$4JL480{wM?W{8ywkEiyGmS)uftaNRu@+
zEPG&&stDz$WGtaeW;Vhf<lTaTCV3?kns{+dWf6Ty_BR;)Mj<IU?*Oym1ZA9Sn!!tW
z$0K?m`HZHDn@)3+g!U5MelEAY1wyC*%u|zb($gH?zn>f!^JFbRE=tjMyiLz0w`p<=
zwIs<@;VztV3stSFMkYwKA##&|r9yFIL)KOhykv%<Hlk~V%g9v9{9tL)2Lj(pv+37B
zVo#dBLQy4F)~0rlF37<-r>@@Dh&vcgrLg_72BNX$w0U)X<8sFFT-k79-ARtD>quLP
zEMhD{WUEf5iDeV$re{5R2yg4W14205mL&IeKrU%lQ2?87Zsg1&J5URlT9bQ8oZR&I
z!mCuJ(V#dpSwzrl&3DhJ@hdEujhe3#1`M&?mjP+W>DAM&){^nIP?ByrB2Ebpr8*Os
z>W^v_k-0SYSJY+<_Tz$pT*wF;&LOIs5+YQc1$R(jT(c+$^QlEcs@)A2c!J!e+TwC+
zSu7bCPu_(L*`id}kk9BQuQyBzF_o~V8_qLXs{GD(CYOpNrTTINwNo`}>~<p34fB@9
z3?yWzi6of}Ijz`b9riW%7Q!vQT?vPaXZYh%`An%%)h87J&|Jt)4uoO=7M!yC4NHT;
zd~~_FWbsA`-`0}hDsc~*L`Ww@wh-DTiSP}=ZAh@kiN>BJo{4Gh(9jc8j&(t0R)!{)
zRifH6L2?5_vdt4w;*=)|8z>q%%XOZnyGB#m;37_ThUpQcl$pn=p{BG<@}=@Wyg-I?
zpPnw<z9qw&z{J`Baaq9=S>eVp#*|u_Ni(#ZjoeQM3}g1yF)L7`ao(e{9f~6UP^!rG
zNMvYn1x6(3EunBiod(a0uWuON+~}P*zNOY%e@1ha%{hgGNvM=}o0TM-5HMepiBlj-
zi25MlI#bLII2L;_xB4<;u;p9yOIz&3<j_u1M}I8EsgJ1XWQ1`ZXo0o;PD{o^r&1**
z&OH3+$WM*Sr~@XWy^N<(85Jco8o-F|=-{&jt}ZT-+LcgSJ83bovP4=D3MSf5EtxvC
zMB<SFF*Z^yB8S5>N7n_XNroHN(?PnNh(@OJ%F6PJiBjd%X_KZ-n><Ada9zXK8Iwj6
zQHalDe^x3{ir7=oh?n5s(};>07<n;M>dW`f=*Kbs%X|kutatPf|5Y)0(qv2g*OW;U
zru4;seH%Z0@n3!MUxyk0Wm0bi)%M>f5-c^$sKgo;md=CT7ZKJM5!M$G))x`h7ZKJM
z5%y0I5ylQ^Qvg_xQO$i(U|(Mp7}!CaqP<K}IW(36>^tP?rAf9?jBo}`BAO;tn$S!U
zV5-Ge%NEPSoUwcbSO^x7)ZolA3C%7<%Zj5lR1;t4k^C|_d+4_qGM0$jSSG38gaOK$
zyf<Jm3xtF~CenY@2oGQm7d)82O~;?r_q1KmkIstdWZ~?{ohwp+yh9WAQi<Sh;a#*T
z%nrr(hRO58UI6gc5=F<<y+8J5Tz^70Jd(9Q{~#Ktu^$#7LEiwq@kzF-@hCZfATEMj
zzh_EK3emlyG8)+^Y$bct(xI)%Sr4+xXl5Fp8ADh+$0N~_Cfa#D%yqT`E(Lv1w0G=7
zSUX|jgq2fg9>j3D24IB<8l-iXDtSmI!d-*#E0af-4UhLA?4_iJd=36}87-~}<{F^H
zl6=6xt%6V%WIXd9GDji$pz&EH+7Y60ivjBiFV(iRG=isrww0Z)uX?y1Es!qj3tewC
zi?cP4QXgsBb)^C-leNX0{Xcwtoe2*lLnAix>_}*Ep#6*uCqTKA$F?P=v;I7Qz#NKr
zBw&Y>MGGo1HKeidonUfR2yOETxy{-uXl+8T;u=D0qhYzVWdLG3z+VxhE}uhQ#UPn+
zLdjqeX+ye(nJ=EN(>OkQULnaHG%q%~pJ?08&Q8{}w2Zk|($7~91|g)e#(f$J0ET`V
zN<c<3+m1|nml8*dRg(z-oh7si;VO||h!)%$>O8L}qVe%i!AoD05M2J;0Kw!CeUHHz
z=&`fqau7@`z!w-EB8PQJFr9Tr2W#q05dUf{K$cw&vvVLO2jeCQ6AIe;)OqKW0GW1<
zjnj22xlz<I+e|znuTr9HR)Hk^3*iLlmjQ=6kG-IwVWAFLD`gv}!H=O8sKK;z%>cc%
z5o{0ROVyyKfnUoAz0olCMw4bJk(nHAct$z-gKTT~EJ@x0_2}qlf&&twe<L(%L{N*S
z!<gxTqj7Ivf?W^EZVCa4HTgc`HxBw9`UGcK267_pzG12_-8D@8?UkNGE2}w+8}^Da
zY$v&U*eP=qvZ@&Us%d7ov?;8vOlp?H9Wr=HRg4E_vHuat_T6-qD321=ko&hWo|W<#
zJtM&Vs1YWNf=`e--#wD0J&ijq?bV^r&JS30mDwMq1Sr<P+$>U@1-8PehT3u)`6mjo
zVDMB3au-xMBV-T4aFekG<?))r)n>;#V=#z>*9*GMw0?r28iKw|jRFo<oWnVn$Qoq8
zCc;uVut*El*^C{etHqoRG}R9hqDLk=tYcIkFgr#=!Awt1%fKM4M~)N8ge=Hpc965H
z9z&s0nMos)Kv%bRbLdNBq&K9UDaL^JJWm$)#nu8NO1{w<i+38P&*O2!xxxAvImfxS
z5(?|eKEyQyRX$uYGEHtH;(*zZ(vmOAv#runkF@Gh`c)Ij4$4#%0-i0CSJF;i&Fq;p
zvw(688B7D3^*9f2X8TXV`N}DAu@3T}S0XnQAuX7}LeRod%G#!!P_axyw&WOhOlXpx
zJSJqCrQX<rx*ftsXnxHC9hSf(&&3bEEpe{N9hpc+Xa+LFgOz)GQj_sar~QaWHj4@}
zvy<uGp-Yd<ZW507UpDMuD4xmO#P*UqCMVi6z4?*{6v6qWV*IokH-*||AT;5XDPl9l
zwu6$v`o>;qj(uTBlG$e57mAebCr$j1VFy3Vcl3b&KB=O@ivKi)wC{`m`8Iy~;(z+$
zfBNvB`l5dNqJH|Ke)^(*`l5dNqJI8Oqkj5upn8e`VrGDpkRRPV@O8xf%(cMeq{RF<
zBk@cF2e|=PL%nZcHfRk&USmKGat{?@2neG9OI4hRH2^9ASQ~QHQK@6COf)7KPPe$a
zl4yv8)L?gY^1SJZ?qioH)x`9G8Y3EZYl8j-rjVNY1p*Y5k<becDrWEG-bZ7Gc3Ldh
z$}}|@CtHE(=2|)Ws6$x!nJ#4m7&)7<724C><{VHNlb=h=q~@foNoJ5DQ%aXL-#DZ>
z;<vO#lQ<xDMb^sOVq8<GX`D-w$n^OOenFiSkR_)^#5~Iwm+)jW1|V}a;}mO}S}irw
z&log?$<;y@KZ!Oa$e5IqM7JZSD&p{9IzCy^u+j!hLKfT@Y?vs2Xp@)ya;Q@+(=nsG
zgspk+kiIKhs4C(#1*u!N!$87n4Z#N#St_PSn(0}WKym}u%D+@Wd@SHzP%GncaK3@1
zUyCW4OrzH#;GSdgZ(!WR8HQHbh;w`&SaS*ctB~o)i5`UvYNa#OCg=jjG)UJTiHJv4
zoCmnKSw^I$=;OysME!*xgd)TI+ki=hC8J(Soh|~b8VmQ+OqOmURv0n@*=BJtgh?`4
z{umLPLG*#b+Tz_OfzFaBK&S<h4$1Y_z!hUj1&AagO&t?pjVxkFYc*2$Szhedf-cY#
zC_q#^lH;KcWGpT^*scx$MKnD?kowPK<aFY68w(_y4tBta<G~mxwX`dedG{C;X*AI8
zG;k~vDNY8ZfYBeLEJf>f8&PPIp#)r2b=Hjmf*o~yLI!KJo%+0V*%ZUXcP(K|19FB%
zu&iL(l>`(Ln6V5Q!Bq4%vySLrrIgzfak72G?Q)#imw6-HH%=1X!vasqjoX6_$+Frx
zOFZbfqk@Hc56NBzT9Mh2|3;Wz1;3Jee;9s=B|*T!Z+b#B`CY?LaSh4-E+>54p%5O8
zo9KlH4<Ek=Q>+aT7MW38!$nXmQ(Y<>(Ulk(0P$l|tGtTs=J8>eXmY7S5d>kC$I4_`
zJAg~k-H1M^0C*2<LQw=bJ-huH2mvMvrn;vx4>-eUtO(NFfGoiX3CJwhFn-2F2tpw8
zC4zAP22ooS>70P58j(n4!oZpv=CmyGHu<EnKDI08G&I%ws_SMqF#f4;kbKQ8Uh=nZ
zo-}`f5B{oK=xd_idZcFZagDdhTi;UWZI)*HNE`25(ymErscUTTNWL>0=W;Ezx~_$^
zX;>iD&9i*yk?QKJ=PszLpWQ&aoLe`Kd_K0CQPoQcL%t*(m|j=iFwfUiUFV%!ceZWw
z**-F$lrM;6Sul@0-r{STS62_SYnXMqk4%hAlPE!Yv%2~@O{q_p0WGTQnyMGnH@A%S
zBD2(!F-YFIH4El>rG{q7yP&0^$%m6|XvP=S(+|k2sv8>5YO1TLZ6PylGTv3)P~TiP
z+t)-!(=3sujpXmKUP`2ezPe_qv7rg5Ti1-_ZSvJEB=oAQHpbULyYdlo&i2+f(6=vW
zY4Ym*d1uwlt(#4VLYhE#^L%v;l#2DFSxbZEK^(|jZ*^TmJ&uZe>;tk@H#9Yk^%?Uf
zlUmT+0RPb$%6PTS_$0zr^L)+o8aOZZxu+!2v(o3B>ihYJ{y6&o1nb-3z9YT=Z_>mG
z6DqCsU#3jx^Z$J-KYjkcKL1}|{(qk*u+J0dkS5E0e?4Z%_BjCi9Dscez&;0Hp9An;
z)dBb|LjcS$P_pr~fS#RCj1)&909@PYej>azx`S9!B5b}SPn6I>GljY#sAOeYJx1_w
zslcv;C$%K(M@0;X&*a>YV#zqG1=FiTLvojeW2I%%0<7f1depr(2vtA^$`Zq9k%TsK
zhRCe+3r$Lbqy|V#lT@pm<>@8niXXHbixGg$>Qw~7So{D6L(ytslqOfM5aSQm1M0Yq
z$nk&;o~7i58<$5qlU%!$M4+scrXhd>j8Is%pxiQE0Hv5GO(N1a_{h-tOJP0Pr-IU{
zS7MMgivG*i6IQ}JYnG=9-Y$Jki~_+F8W=`rO;{LQU`?lu8BLS$C3B{=^7jUmknU2z
z5veg7hn|YHCm^j08pptC0Exb#2%KPS>0x>SGQ<E;9=OV`C9ncg(0QVSXwl_K8IBgG
zVIwFh;hGL58lsgA80;#od1NhZ1Z;x<rU~je5ou%Xl_(bE<$6IB+f5lnmqI+50PJM3
z8Uf9V0hR#>4uJZlIT<(|3b=3b8BofT9%vepIfVv1AMvQ@{#8Y<3*llv8I9e^sc9H1
zK*kl(4=P9j^%&mXppov24kQkl8|3H@)~ZdI?}Y<x4J(~S0RfmAY-098gdWk*D`oO&
z6O9P#a&VLr1G1i8N7EqI<7gs&n!#$G5GrY8h0@+&6^=ixbb>s?>JNPOaDHp(W3+(p
zJIhS5k&}QF{ktfB5(@H)O?@kJLWP1M3hEn7;)aRPiU18#RK#EpMO(2fgD3|WRdo<^
zEUqD(EADg$a4GH!%JgB_8DbZNMBMEKX*Rrk6&5cMq70BnTV-+t(R_1DEi8~8tV8al
zCqoW|sLW(QzAE*>iSBI(nUOKI$JCi=@mXmYvP;1m9|MDZP%TTXuaz<e3z{&0E8z<&
z%fSc9N+`(^tJWesBH;Ze;&N1jS(x;6N(ocZ7e%7rKR6jhv#k>br^ReUK_^Erhz^h8
z(-uxyHEEo3rhp_G6rew1yx$JF$9%t~>W|YMH%0vcw`|5?GS0PP=yo!S#YoiIuPMvN
zCX<oybRaQ1NEp-LT&Yu(PJm30{wdVYfL1oZNWB?r>gAnmUP>zGJ3KNNK0lsJhN@SF
zq;o{jW@*@{DY8k$X|xE>$|QSK*E*76&f+PM-e_W=KupeNhLp90dI(&LB<HyhmXl#}
zq=)5_IzmW6ynqEptJU^~MlFq45rv*_j+C~*Zy4f<Xj?|{Eq!+c)UX<0K|A{X2q)X*
zxB-PQcY$|tqqn8jgqg)l8^Um~5T0#plOR|WD3if!pxD=Ja{}5TXDS7v7tRiPY$Y`c
zqvZ6YA)9zOgk511y!z{>yT%VR+XPH&`9zsqd;y^(j!BXl#W>UZGA>0?u{=p?MlO9R
zS|iXMEM|*ZzZR;zNN)XjHsgLc8Y+^69OPUMMeW~}^1b*nrH5{*ik7ZpQwy<cK^%~?
z#eNg;t5HNGGSe<g%hHrFYayF3+D=s>n$h3b(A?sbc@Db_4<(E*qU)HTJqSfYp@*K<
zRZ|iXxib`vL1=&_0a*VgGXm2Guu>z%C`#>(e<>CLN<$PcM96{SMPv>@rs$?GTjKY6
zH)u)6b(B?#Rf82DK)vIVH35~p)XX=HIgQ=AXUsY6nGiV@>crZo1^2`tG`q~&Pgu~9
zI7SO;YlknO=s;l^0SzcxMAdH@ED#kC%i?jYkz$1%U=LbBeT1{pY7~XJ*&0UqVOgu+
zl@i=y?L-A0`Dg76M#{Xb!qvbQqan@iz>(XF9?Q2PFX-4}fX2k73LhDwGI?lGW4qCC
zpa{Gh0LOyo(~SIJUK6;tSYHBp`%tkG&>VPlpA-v`+a0#B=K&pz0$(782V)(YxGI3r
zF;$p?d)XnA=w_NUwM@_^0fQ>TiJH%vn5t<Emd2J&OkY?9sveo<G>*@p_>*mAgdPFK
zF9(+C@C%2@18Op1D{qA_Z8*ST=y2o&AwW}+_#Yi&SzcQFD+TLC@`))CfYYc$lIa#H
z4@Bs8FxAU!iX(i4!Ia{2z(Npws_XA`13^I<Py%2W^3o)R=h{{O)zrW;B>}3DQ3n_=
z=FRv8l7hT4<0_Y=BQnZ1A|z-xbLk(@j|VSX%%D(u$m@ygMc!dqN&d08hWe$OhtqOE
zJ0NhJ0#`6GYsNJJLhE8kG!6iKrfqd-Zux-snyerC?ZMH6X2ei)V{0meTZ#$Q6xYX;
zc!j9YVTOi7x(%uc8pe%#m)XkDrtGj4;f9T-4SGL}^WzuIk36n6O2fuYCThXD0^$0a
zakURqA?Oe!lg^%Lp_f4m8Bv6zn$y*Wa)qGm3t{pGnjzR>S-iT66E}?59%&K$Q{CLm
z%-JSdgFR3%E#SUa{R$BVprRtZ)i?m^fk8XYjscb8t|FBg&L=e1WTP${H3Tc6IK^+}
z2Erb_xha4_%!vY*VK69qnC9RSx^?W;@bB8VaVbV37?C*PY%E83YB9UMv$oDJi4g|c
zOs<PcD*!eN62jv=ck&ONzeNTZU!+_ibgHW<5KF8yoxu(mK<2Csrk)~}qXS=v)Q;OZ
zY6JpGZX#P*l}d%y7#1=*bV8(#4u}XAWh~?tmmvcH_h&;`*SjJ~vev~c&rLsbfcse<
z9_DixtgI_pU|FH)j7lezQUh$p6au?T^Nq>7&p9U_F>1-zfIOQo0@ji{0sM*aZt%Bt
zh=^IMf17WDu*JV1^i1f8-Z$)eD#mAx?`dE9<Fscs#PiN8C5kSYE8|}Q)l=n!XSomz
z@7F4<C}mqiolG=NBZn^3F-4qTOyX#x`=1;w5tXU7PTIRC#fc>(5t*?Fopmuf4r{Sl
zZtSZAO;Y!yu$j`Eg27zCC*WihSVcS~88Q~TTk9t#-7s20^bkPO8klv#Se?#+#Qc8D
zI;`LL6a=+o;>s9brlf$`2^56oKyz9<Y5~+)1Ex|FbRRqvNd~FDCKD0LHVXA?nPPZo
zO?k-RlIp>Agb8;Z;~*s31|n=3pj(EXZO2AtcQsowL%Jptaf2%jrz27E^o<=+3FFIf
zJ_Rv#r$brg;Tk+vIo6$TEJ!D=hH?9QQp*zqXQ+63(fbIblgZ>@NIk=QEj02&trGdX
zEG$#^zI5uT(l{mB77l6c<D^8p5+&QbEv_gDKp7+7)hb~!=S4)f3l@*dSHhZN*8?~d
zl5I&vQ*1jCB*i?G6tpKxt8<dkWl?oSRN`HqN18>0`J$v7C(5~TrIM8TC6is_OcHXO
zMGB59E90*&D;sB)ftDvt64B;6F5qlmXh=hwHws_cywagxlNcRmlA`q%(FwW|E0s;p
zOSnyoYlk;!Zj%i`tPmAU(9YC`)gRV0;l3njVLU&($5=eeJ~qc;d7vyUum{r!5X>Jf
zUqs3z!{Tm6iRUIKJlgw8@roov@Rf+04W3}5c7#gX*Z5jWg=iF_H?nXp%mj|e2_6L^
zQJ1uh<cZ7HH02oP2PZY*ZJJ><=zxe)ycAj@9CZJy-IYf0)ACCV^VRYzO(xMJ%z@?R
zy_KRwHLf{Cbm?1DkMK}U0Upe#VRDqxG6qD&66tG=Zm~;h=kI{3BQOYN2_c_iO=qUL
zIz_tZK`Jc7g^UN2H&gFt#(fezlsZN;Rd=1bcZhaTSVC&hTz&+vi<GK(!0Pbq=JS;r
z3pB^L7q1vE()(*x%z#i0n;{Bl^aHwOO#vS~0Kx7wG@pZT9YCsq#hq{^85BKOL%eh^
z*Rq{TU64^lXt=t^J}Sl%r9v-(+{rG)e&CBzwy4cz0(vlrTMdFKbC`IE$MC4!g{3%5
zj0}ya90-BW{JrL#1ioLDh9f0S5od&7iE6;Z#W+n&?BK+n<USXq6{AC%wSx>jYDSrg
z)5w8>az4;bj$JC`PZP>kI5-v>`Tpgb!ovA!?c<i$q4E<|sXarsOj}S;b-h*spD3#*
z9aZ(+2Y3L~#)6*MD26Es6*<OOUpz)E&tbKhis1?A>a&|kc`Cj`>4fMOO|K?!NCYMS
zgPc<P03ob0Ve=+>wixE2Z<3t$bL}lrxtqg$`EwjMNL$_`!0W5l5(=0x59)Fh6$`3C
zz?$PGHXRTuEwavLV042N<jx!H5U!EDDn*P2IK}j&lJUlY8Rsz}RKT%NoK|_2jc481
z&~0JW4|`c4zK5TM^xgoch6RTMPj#pB5oImCw56VjmVN}+F29KC8<|~CMY#oso*dTC
zE{WNlAg~5r$Q93^eJl$o5f}+(Sl_{Bn^46&k}k|ppM>>Hd%sCBdB8^eSG?ey)}zse
z?K{1*G5o{cSZ?4~cI9yFE;H+mc<J!6P+?}Z<B`L{eh@00Ad(L~yD<!p9OV8G4IOM$
z^^FzrP!6DOI*@HDxq%}f6Qx^JGizTEY!M<CTne*JILWWd=7>p?5{k#NIouX?jLult
z$kIz-NT05SgH)9LYCMPzB^}p2C_-={zB}FedIcND&><Rei&4=`P-!;#J7`YOm=A%7
zcQkhBhDnrPN!ZaC0Z0X?y*CHta+{K<VQa2SYDAmSDAWmnWzkSZ6-^$bXX;E-)9pj<
zcbA0j-KB)-@O;s^jC_#E-b}YUC8-ztv&S7udrN6)w@W2(@{xbz5EC0UrUah~dqFny
zJh$YL)+p>`W*cH!dGCZ<PohDj{h`SRWAFFSXK#gsc&!z!0dTKvA{PpONRK?QUbm;&
z6p_#ss+7n;BP!6i`Xs5rmBnP^c^zl5LfnYRjzUcjzXp@BDQ*|<yA(ptUE^y34FU}h
zWl~*~WfJhnPf&Et57XzOf`?fzZj@qOz*_|0v^olrrmHoM)G%%k^<s%5{Y|vsl?{cd
z-XthmAy5&l$aX3#JV4}Nvr+SnYFSpJPAko`h;k_wQR3{LFW!+b6(XJh!Go?x9v5yO
z7tgC6*dvk|(JoB<VpO`)8BlBlFRgzHdKaIDI4q&o42EYm7=A$nbu-SSWDHWHHL-S-
zc%9J;)|iy8gzzfRFEv)OGTo&O0?26jJ=+_EiiI!{{*75CaJ>u&D>UX9b_d5BjS;Bk
z@E#-DPJb1lgMVcLEm&#$b?g(a5_$j-+#`g}Q%YyhN*Ubz!t25SfEW$Ur&=o)285|1
zkU=jnhY<pV!MZ5`dbWXBAYkZuh#UYffowWn@D1NZxq^9241+^Nzp67<<49~^V_-@*
zUA>fz$vj3fDg*(HkigfoOCSO+(mFt48+{wBd>sPi^y+uhC7SXj-p|aVS8eRA<O&G!
z`CvvPq7P@q%WrB7D~?Wv7g4pT8tDcrDd~r~n%HtB(Gf~+ye!-%_1)+V0rKPR7Wf5%
zp;t1QfJ{T=a0?f7yvm<RlA@_F#9-2dEsoi;a*$q}S=>N`y2#bI5zwj|X#4P}B*C=b
z2S@e)?Z*-S$sD6`Snuco|7l9aq?GzElPV|l;Xi#FKYjR5efUp(_)mTKPks1LeU)JT
z9{@oy;gpK|)FZrCANW%r_|rc>_){PH)4u}xli7f-ixSM6PZcNJDDHJi0I-Q^F@+5=
zh#xVt-M%ogLi0_)4n^a^s2@&CpcTciXmaO<&a5SZjZ;7afcffq1?3JUdQI&lHz?j%
z5dePasZ2Y@5Mf}UW%^)L;@UZML@kjl_Lv)#^s48m4J-Ik@*69+>*Z)KdL>^|oD;L2
z^Bg<+l9a0GT+g-+a5{U8&C}*dHW<5y52F-xkE_9#f&LdlnZwCLUxqfacN9ZyOji{g
zRxB#0AZR(}7GWU<RL?fbaLu8DJo)cjH6SN=Xv-n3uqh8lTq$m>PZ<yo(nT8TKon51
z1vxOIWwcpBF<HlP8TCdz7J#R#=a|J~N=a~AX*^BRFT2ccd+59gN`71cMcr{)youx{
z=eGyeO*_=t(Og+Iu74Ou{{r?8QGhIcgI+u#4mpTcWuAA>vdL0>Z&8as4~EEjCa#1T
zmX#h!99288cSbhBH)YfhchjE8j9EveBKQ#uP45mpRp5T>Kp>*Hv4ez}1yz(UEX>E9
zGR{(SeR4J(HHHs|X{9BV>!t`BNMtE)U)TtzQs$<cPY*~oycj`N0!-6aAVT*uOvGf&
z79cmAWQLA`MGhequ)6%<YG=&CRJ=0bJ4Br7O*!=xfE%W;Lr0k_?U|h5j%F`wx|_qv
zuIJ;?P;kb$`gzXt(g~H(8_tmEOt>}R`#OvRKe9~rYigJblTbd*CN{N`+%Y-P-oqxY
zj)!Q%81M*tSZ4M%9g_z7;X5s8Y+1J2O>BuReFzD%=|odx85t_PAnmkR8_7*?#?m=d
zLY<e%>_9?ALeX~J9f-p;7y5&uY|&+UmO9fQ@Lhc3W<-zF&5N#W{jjsy`<N$ee;y`j
zXhoEc4abur{tVAP<y@q$?Gj{2d72yQM04^jp*FrSqjP{uW$tO@++u@bnYoNGiHLB_
zF}ow(?zau4w`^|~>7v_CgohLs>P6FIO;=-#FEinj9R5zH?tMO0dj*6wk=#7kp{E66
z;iw`EESAIyT0wZiu`>3BkRwb%FBPZL9<>*i_hN)2*hc;yqFQE*)rlm=xHBe7W9k55
z=W`Y?g45hWa0of}>3fYZ6LzjEI)RM1;6vbh`<<#O32NPqs6COv)Kqf&RW+>0(H>~w
z#i(`Qbd3hELl$t59g!xhGDdbnlhpIHRTkrwA}lI8lL&AH4;vZ6VfD;U+`5>GfFVB=
zN5&k2&Vu<ZtxTcZv<ctr<h>nATodg^EYeyL3~-0HPHHj%A)Y-h5^G1ei~O4byUyky
zKlDoEptVsm17klS>Nj05zOfFNJgx`hGBw8@H3*|v*j8W@;3D7HE^at%*%5LWR7Dg{
zm_>S`>di7dwiaMwU5`XD-Hc`X;5tMDOGzQ1xCaQ8rSq<kegL%?Stv70b~NG^?T%6%
z7shhtn?_}y;FqEh*s9=yc^c@P&O|MoyD16T2KX6^Fin^HPQfvGEE$$wG~s<=jC`t{
zaTF%O#QBIzW~Pn;F@-}s$drtTL7Z97XFUoFj(S@qqL(K)oyuZ3A<{6c&?-HfHl#!>
z21Rn&Cy<ft?oY6aoL0!=#Z1|@8I7RlGnC^rvd+|557RVt>@ZEPq{E35RuXEjr;G+L
zGb4lv@$>*+<L-^9=*HE)*ZdWBU@x|B0cUh^OOv<0d9Js`H`@q0?wOjwP&(6-(5feD
zA`*t-SN<pCnvRU-*>NcI><GmH$@Q@3+u=OnjzgJoW*eoWH#>z-_0V?=zZiV8TcNIg
zPD4hU!15+%VwoCBZt`0ODwN}a$>Q@<g-7bt7~GkD`0LkRHUvGv+ya8nB9LXr^U@BZ
z-gync%U0F|B?z>Hg&I9FWY6Xn)*{n$iN%3`3*6LP-Bj1uvbf$m&u8YRuLTA)oe{wf
z^3zasXw?P;hmI@MT;O1DjG$?oJ}+X<v(RbKcMQybM43%$NmEe&;TjkONJ6Le=S{w5
z`;P-=;o;r4ERd<r62sJzUb`~8a>*%hr!2|Gxc(Th5{^DNUH3=<Ts1-88Yrt|ogs5l
z@hdjqoE)x8??g$DYpBNA6-G~^1alVl#L)N5z@SMhu*ui3NIIrzPisUQ_HK!6Y3_vZ
zD5p)I`ubN`xI&8NAqI1M$o5bpWQSG-a0uHm68{4BO++Al7PrR1#26xyhHz><;QRMd
z4%y&TJ28f}X>VA=5zyD2vbd$Z$WUBgLUR(7Gg!xAZ<16X@HE5_TYihQ;CRhn3mI%l
zU@ah!h6bjll3VFac%*NV5;k_CIE`;$fVdQH5R5np&<3!4mlc(W^-exEd_vyL3t^bb
z(v2ee0n)&7N8umap^CC$i@;iLeF7<1w56s}NP=U+&Kc3e>!>X)^<^=g5QoMzcBLSk
zxF)4-?;@g@r!)m+T`#r4z4DHp62mg82<i|N6`?L;8wSwSa0uWPf|$;kVO)*~B^}`h
zIji4g_#dY`8h7J>GQpJ(He;T6$wsXQeW})xGCZ_G*EA#}Yg5+%<sh9mjhRb5OKeP>
zc0)}oQtiumq-PFO>wgaR5P;_XjhVsL3{N$v9>P;}=b()XQ=a*CFcQ&A!y$hU7AxLH
za+7~D_2r}*=@iLtL=E>)2Z@?3L_`(tbEJrMTz|EeK1%jPTWp4f{^CYLvhAnBr9%fq
z5pE5K<Ml}?7L$hbLPK(ACI4o+04%_irt0%aMfioGGekJr&9nAPX)rKoLL53Exm0Dy
z1{6dY>nYf;4%Xq(FI6Zc7(jsebwOHb4_<?X=;+>Zry7UMg?a2s@<2RRn)`~z8IMAH
z5CPB;YE$8oqA4sYRQKvzi?9d*z5wkZq7Xt1CfphT#E9t_hTWZ9HN#4WeAwP_p(0Uw
zw!l_j15Yq#v}tKfD<{*1V)Z+NBH#RrFM{3GQ%~^#^4q6mpt-B3{Ev*{@11)|HNf$p
z0~4iq;FQMRD{NK@5J$mp802Sf?P+3oWIB_oHDHpc7x14R*peRV40Tu66je$-48j)C
zB{=9IV_^tT(}SboP~hNk%=}Fm3=eJ~3!WX!SIc03%2UG7WCriS(LbDg(FRD3DO}DR
zCCAschaInI0Xdctd9h)JcFP_~Ymm}p)J%!F)13(!O$OmL60IR69L!)wLTk7_wE=7n
z=_a%60WXWF)_olA)TsGVLGP4Rh9k|OKJ+rssI#$$;dlMnG%?u>{D^kA)F`oq=qMcH
z#S8_DAsk#!HG_}PA`tqy8YQY`NKD+KudmdrEux~?p{8#>K_4oj);r*#$N}<EfScqY
zz&C{Po)lk&R>Y9wad{=ntT4umy7OV2bTP<qM*x=$IK^lzx$!?41@U{yRG{*zewqY?
zFmm&zz%z)5;2?+F(d~vZs|!NMg)g^;3+wJkEYM^sKxla*gzQVz%x~Zj{BArVoNElW
zCM{1M`dTET8A~DFG($Nw+kjPfkT^Pwk}9r;lN>T&+S8ulMoy*kAui@s(z80lQ&BKZ
zIZ=x@p%I%IgsS^kER~Qs;|_8mWrSr4u1lhN)hMj)82CDf_+ZuS5Nn%5M6qn;&Jd_h
z`bE`{2J9nDtN^xhaHpr=$$@3*g00EdlDn*|tQRh9%x__gj$oFAF;*$S{2bj$IB4|}
zAZZorSU8mEDNcd6$tb&kj~5~4xDtki-ZUyQG`*&X`6kRt0r65nY`xj1ws{HqDVB!i
zS;{X=uE(@r%I^AYE7e_*T1k_T40ojIDYIEWrKG3rGZs5|YVF+Ar)&(NHf3;~p0ilV
zZ0p>nK5I!sHT`MV-Vh3gkvg@NNuf6B%S^tO+CHVbwT<F>Hm#Tl=khsSk9=Cr^AXbp
z#d2P$Ep;Q69;F_R*}l}I9GY~$bVIeI2bun~Z?6Y|=)c;vqf#q|g)QyAHMA2^`AADt
z-HTv24pLje_x9i5ou64Ztlt?)j{G;fR;KVwQxv9STS_TYw3~BVv=f>F^&H!Fh;2K1
zXloiohvO(L;WeqTL8(ueatkc^0}gDO5_pkPp4Ryp9tU78XKMQdH@xb<I<zyH3azE2
zot|JOB#Y6^rmY^-F9z;Ak;XVg^<VAU=_VBRi)|ZS=QLExbh}I6)z&@ThsFqKjAj53
z1Z14l2gum>^9}tt;y>!qkca<{^!SexPN|qU#e)BM%B0H5KK#dT<EIb*u@C>T5C5?b
z|FIAMu@C?8{{jA^J<MK-4IpH?74E}=?8Acm=f{HVgMxHGf2Ht`x}Nfn!GHvtKN$x)
z9a#}xA=E^&d?mSI&?aQAo|7G@$Hh-3Du={czo16Z$UY6EDSU+Cc4g9ni1;Dt7v3sj
z-9-p@L_@ruB8zB|(0OI<p1Q%}2q76sM#-j%LqRi|u)#~fqW>pGh|OTp$deFjjxRO(
zrZaFXo~aoKgBY?2miTZxnLXB{i$V>bR`5BobP-cU8H}-sBq7EIOQ3)pF>1_(JwiwT
zJcq7-lr?dq4+h7?d|hy?$+Xy}7HXrFs(8>2uR=}K85Uk(Lu{t%3jN@mv_vSXiY1|>
zh>8MFD5=YfWkCTs^!H2Nm>g(VJkq>SfCyK$H6hj2HG8BMH9|;E=zpe+Ay%v&6k9+A
z7s3N+el+QGj;tl{mxvl%9EOsbbvRV?t9OKz1j|G+W@8k<P7^jILM<xzpp3qCjQS-5
zC!$CPUlemmjqnN6cbG=SgFZ5hk1{zAP5G*AN&<k>f@BpW_c_s?FuWT4dM#5ddgBkP
z0hI^jnIhmQ03{%uSc+`v7+n}mV2O)X&BeDc1{dP?D7#=BxKPbWVedDG=9-FP(O7Lo
ziYn1|hl*b;$SSB}gsdcZ@m1D8s}ip}^)au;)_3b*`A@R|*7Rw|C<Qs)Qkd$R^_V-&
zcL1$Q#pA+_Vz&{R9c{gFx2r1oe_1r3$z{n<GEk-jlVD9NSE3#42uVq(<~hSWBAG}j
zCE{1(P>?%fc*li3i82I52;!%3;cw*CD=BH)7=dpzr0KYrjf?9^NtR><%9!EAvL@aI
z026Umqt8lsX*@<M7-FAF9VnQYgfq@bjWVYSOCqj{M#HYi1wNs)g`iX>CiRKOkEskF
zte*3`u(UkCqqkzHKL%YU2<L`XF%q3R2I5jm9y2}VIdRfZsk))Q#aG|5c&@L$Mvq|^
zNo6XvW<_*NU)`;jLvUCt8gkD7`KV@Kl%{uvzLBF?O-sYLU877XqC;a`6cK6*T2dE^
z+LuznEA^<V%qLdkZSgJgp0&7+%&%#Vx7u!Yko(ag8dM;!4c6a5od=KvjPRg{sTi}T
zGqRB*i^dA0aALSjnnNR-ra=$o=67a1AuHU3IFU3f!NMd%1|AWE*g#YUcuX<imozgM
zK_C&UxEqthaz`9iR49*W)bo{DS_?%Yizp$wW^tq@)zTo+je(AvAU-^ZDa(pmW;PQe
zP7#-Ybx3qTEkjBO+Z{5Nf-+M@bQ)u#gPg8A$S0?B7h}>G0S)O!q-%&M5D^nTCyjbX
z-T_o7j9=oYWV&1<tdcpm+r#phMTtHry4>t&1JF1D`;67%MD<aphKCg?#v<{wW+uc#
z5al<f$VPZJ$84bpy?g^`AVZ@%+hsnd`3rnaXDx1SX{xKQvD>`qR)+;l%9<(7S!E$t
zr?FrwhDnNL{*+bJhbmZeAT1iVI0peimJrC5o<R)3NyJ@LJk4x5#{uL?$1Tu^5REJP
z$*<R#RFiP}Wi$>C$}L<v3bDKt=4gz<=Hvx<7bpx(5kBCJnJ-|IZ(c)-Z?Sjw>?T`=
zglf5Q-SVYMb&V2ENK0VFP6pgSZefxhoZH)X*P`ld^KK6Cf^SQC4Gr(sH;k}&RM$|_
z3kO={Hb}E>1S(kh0KZpkR=wBrteZ^^@g8+8Jb&4BFRtJBbV!>Jfb=;qLerdT={plE
zJ+{L&-4S#KrI&V2Xo~{J7MP4A8B^j6GD1|OIXXj{9iiu)v0}gaL<qktonr86?})je
z*=NVFW?DLv@f%cRd48#-6G~~SlZ45Zr!`CUar8=WYVr}e+uX8vp0B00!TumItJA{E
z`TijT2=RnL1d9U3^GM(pk`x25mrCIpUkm-k!#=3>d1sqH0hN(Q%_ahw&m|R8Nt_54
zgD|6wnNMIxbTJRR2GEFpFv}*?@yt>{YanMjKwr~BUz5`SEmBI@AYi>Ahp~+I^Z<51
ziND$P&5(IuD^F3YQ948Z(APNJ#)c*bp=vfZ$TVv&rOtrBBvk$C#TMm5XliI_sBW0+
zOf|(uyB9BVX?0C;L%|lb8L^?$>wO-oX3yr-+%TtQk+&%gC%~M{3L9q5w<cD|ag!wi
zjj2>;<5+Gw+1&<mt17k031x-6vQ(H3ys6yu7GomRa1FnC!-lm4wQzFi5q3mnL9;Du
zf@$`sk_Gh}2I&4wgYifvJv6LRb($!Sx~YY(3Q>YuL!CTK9wf_RZrWoP33!21b(Jz{
zzOKFo$ZiiL6s$vm9gNpA!rOHVfD$c*K{!@x5!FFNe9&uDq;#*3)2$`_NGULqk+V);
zHnbTjoq=#N6c_aD)S64MwnE;S0xFsTE?~KKgJsa0Oth<UqQ2|ZY&;I23X19Tuo7*9
zU`w<<HiO|WfH>9q;o}hxMI65x19J`?0i6l6OC=5UGs(HeW^Nj=dB{?eophx@SsFRq
zMxMo!p905<b~uEMlgk7%Rci8P3fzjFEs+|9d5tNcO|S6cY}mw}))o|X$;(Zm`i&gq
zkG{@PR``S+i<oI2icyS;a`=l?f5H!Fn{)}<x*}zUK?2^=7fO@)P6#r;2fHzwK(y>k
z>SZh9WQ~O6G^v-_X=xUwmneQLQA#$?hU3lYRWGcx&uq{c4fq?akCnnkw)KGY)pizU
z7P&z=s98yjr!HE~Q4M+(AfZoMn<@>rMQs?5CTYWMIO!+aZz5@fEy=Y9Cx1{68<)#m
zDClL=(nzQ11)pZL<ffuiha)yjHOOp4hPBR<AUq603-T|sotV)aaf=_;COpi|$1~yj
zG5{n!@*0ExC-w#Z_x*fxKlbteNv-^Ad<R7NPnkT~A^snKEb;%7PN|sak|uwRV{rWW
ze;)tuxc)*g_~E`Ief~#f#pF{aS@S<8PM*-0|M6}7)YQ$HIz?XNTI2cx{*1d^9WK`@
zm+QjZ+=~Vdyf_kxXquKF3fRh(t5>hi%370?)0LOEcF>@8M;>{}QAb^R#1ZQY3okw9
zn9B+aHw+!R@z`T8KmPddo^ZmIBSu_NTzu7-F;|zAY#K9Wb7|={rKQ(-Jl9U1d}C$h
z^{1S2b7kdC)27`rZQ89fXWlkz)*Z8F-#%+rcWv#Rr=Nc3ym{N^&b_m-@$QzE@6Vrq
z&!R=!&pPV|XP<rF`RCt%?z!8SEP251f3U6X!BFVorAr@H)knkOA1z=0Xh+B6iNs?o
zS3Z8h1wXs^;-6o1(a$cs?6R(|t_>SDTzTb{*Ijqr_rCYNJMOq+&6=NgcXw~wwr%_N
z?f2h*|HBVI{OF^PKK9sSPdxF&+O@kbyX+SmH$Hj!<-fe@s;4(?dghvIc3*$}b2s1o
z{LMH2=N)(addrqyZ{50g+qU1_d+&?)-uu!IfB4FS55D@~gZqB`<JTU4{Eh$kk2iMh
z+V#s{{&M&3-M{+PuXgTybI+bVue|cg>#x85#vA0T{m(q}&NI&(c=p)?&pr417hZUG
z&z|>QeDM!2zx=_zeILH@#-Cn$?T>H0_11v{2lns(^ZW0=|K~sd`R%t4{{Hu$y#M~E
zfB3^^fBMtspM3Jk!Gm9rpHDyi@{2G2ia-DR_rL%BAI(DlK0hA#2lj$1?<?1+fg@{o
zbnjZ5cl1f;?%uKG$;%2xoqlWWgIj<3-Qg3L{&x3+cRq8qRDJo#x`*z1_F8xI56*q|
zp>5CKSTSb8<#pOSx0ZA*EnD~0#HNPZa)yrCQ1tO$sY-i$aLMlX=bv6%)ql?Xilg7U
z^RAq?q{byVSwk;rD3a!9`wE|_RyO>0Q`epOxA?NRJT!8&GVr=vv-=gdYnx6l8a42m
ziX-mYFu(bduKo9QU9)b_&h7Q%-rf9GRn?m3Z|vW)@2$JH4aup!W#o7Ew{{ne&b@6$
z*E@glcjwHxW#_%G?b&-(R@MN|lAYiCBKx;T+;?B%nyRaI)<n*(xm?@%liFF)8>E}w
z-czvA^?2_4uY7gRlzzW0ANkdm;LK;1#Jg&4xv3?1LvhJbSx@}^_Mcz)*FU*DjWY}9
z7Bm+1Ys&l4fb8dPo1Iq_9(iEa>Op(n>s~uJXaCxUF{N96SJgPu<vVVmt7v0Me&dZr
zqnbuHt~;*Y`?7EK=Re-}#_CT8cCW9iKRB*n$nw0FoQvhX>x(w#?ksK`HR7fBx-a}}
z`8Zd;H0F`(sv-rQjYYZl6%Le|W<OF?{I)N9Ku669e|WninRseLB466EuK9}LZ#@;L
z?|;d<;~HMdd3jLw?kQuh7=L8JmVzOzPvsTWxPGzWxYYv>tj}6pxGrbN{8O8PYcCk_
zhqtd8dFt|YH}sz`uPIvopS#u<*2SLN(~$r1=vQZ7GO7E#ZC|aP>0UEn`}v=3$liAB
zQ*-K<kKXJGpLI&hhgF*<`D=?W8se`V_2kn-_nz?E;(^<LG<4F|!s7hv7VY`ru#2W{
zxHtFZ{DCJ1@`|emj%;yx)gxPWdIwI(D;{v-+tZ$U=B5`<IO~UVt{%R*+q-P^{&(v8
z4gKWO!9M@kHLeFv`HvmSW3u$*uuH3g8~Q!)^t2yFvlBZvA6+wYbZ&OTwCi>cJ84qv
z*cDGqzUi*#pE$x*+3%#zuDl2Hlagy&`Ma-oyS|LvHEjOXzK7Ol?>}bruoI^@7Py`q
z|KaBop7`|Rv6`#s{hc*G*!<GYtxwByj@uIZ)xxI+tjRgznl&2+eO%lx>#_N_EdTY4
zFOD6%?XhQfT=vzh)<4cj?n@rMV?|APWbCOCvDKfyJ8Q!M*Q0losjH_v@w;bdR2{i~
z^yo|8Y&zqF;=%K#$?LLxe>?8}s`G0%9oH}M<cN+ZUhnV98umg_%beS9$bRCythL%_
zwZW?g-<KGD={-AEz4y~`NBy<q&Hml9+P2TSzTbCS9vv<pQ|4W;{)7A8JM!^Qu6@$8
zCMTFPV%VU;tyj!=KI@OJYYPUyI{xope7608CtRlu&)GP5`>T<~pMLpaUhy^SH~sIn
zUq?UdcjAhU7ms`8XYN^*?-zN0(mm~lU;gKW;qJ9xPRQPRZslEt?!Vmf-68i>-FsoK
zKmYlwI!Y4RKiNOHaKZbo=#Zz^6vlR)tvtNDsPV;3bFQme_m#iotuH+9xQ;%sCU4<i
zx&}{O^Su{*?KvCsUOnNdHT_QxZW(-A*2aZ1o+_xh)wN;N-0lx!FLsR&)`vQGd;4{~
zdz<UJooDAf`__Od@toSpclBQ~c<b>0u6224H!R5ca_z@I9k!+W4-E_AE7#>*`pWI=
zs<!2>9DHZNTDNP^zAYVhfA^`Qc0BwG*ZVt*>+<$AmweoRK&g7QeCy6v4h(;$wxH|U
zFSZ<i@~B<wbB635y)w4o!(WVh`i0QABeVmr4c__LaoPK~6em}oo;P*Hb9E(ZR#E=<
zFYqimF>Aw;&3Vh8%!<}+o_yxUWe>b`?XN%hqC2Z)e``_K>Bmg{!`-f&uHviDtR8i8
z{NzW*j6N#otM+|=`z-H?QNH$B56{gjIcd#|z%6$j(IV#!y6M>QI|uHKW_MTnx+l#2
z(o^L+sbXN!2S3{M#NHp?{N~AR{m-3Rcu%Zr)oCZcSv#aFCsKM>&P7`5Ksm9u@XVZ(
zmM*#TrJRCG)(`gIUR2!u(LVQ!n??+5AKta_z|>O)gpM3Nuw!ste&XzwO;7LMG<5z4
z+2yOU*Ebdii+8R4;s-yy`^JGgzkl?VImd7KX;s#Bb;S?7^>&T)Uq8EW>os@0{;X@{
z8K<9KF~^--|8n8pl3D$4EV-+2Se10v%Cqixbm3FW-rRgc|E>2FOgV6mdthzLtQWdp
z{O|D#AN={oJ=6QG+V|9)Kl!rvbl1Gw?TWq~UUf|5tM|`)e(7CrE?M(XVb|ruc8-2M
z?+t0k8#&uYow{@3-#`9ji=6K|dd&s<ju^6N>9CJnp;5nCH^!55_CwbnbAH{_@2suA
zan`goW3qEM<z78_Yw&+Yjj6u!<Y&*n;nS@n?in81^3bL4eNsB>ygbjy`yMa6XWgQP
z6My)-(O;IXIpS|w*Z$$k*~k3xoI5(Q7hV-BIJ2g{YQf^Mq5BSe=6Pmx!TPBsacRR%
z-npR*_7-_Y7vxu!&l%a3_5LfLZ(Ue1`^1B;tp7e@_>(^$xMtvUYvy(Rr7Q0TAJ%W1
z*4A~xL|@hmq1uDTH03S&ub(W<`pYF%Mc%9<e%<oq*mG~{@2|=!U+o=qYK3>*6+iuj
zXKb+kD0%HyR~D4K(*Nv}W;I=vbA8+M=g)lX*opaTfBT95z?tjv8j73u%d>v7<9C1e
zt$c35BOiWv)yc09m|U^6-!ZNcQ;YhKnL42;Sn$AUM~#1P_PE&I*FI{#^OwW79C`7I
z;=exj*^M8(Hg4*u*Pc_}7&EV7*`qbn4_;9CNw#+4giG)F{)$IkkDPG#dw<(Af6Bh6
zYiG&%m)`ey-m?>m*T%*#?mG2@zdm*IzWjBr{_gz;Dt${{-+bx^u9>m5C$-Ci=HAow
z!tlXcTr-X<KI6=hbGnPx*RJo_cYFQse7}-zpZCyDr+4l+=7`^Xaa`7q_TThBcRrc7
z?^pj({rvKQBVXSA(Yvo6TsCgR>Ip@)Q=fS$x9hh%uN(HW?CP)1u6SD-(7if7dQi>p
zmMnIkv-;P^t{AiHqlbTd|ApgSle-H>@2SW+!PPZr&#3dSymp*x$w>$D)+%|$W#23K
z;|F_RzU}GdliNmrdhxQm-`V_^&YwJg@_XfPuXLT$-8gvPm(%VaH#&b-e8X`?(o40H
z|NSFAI`XBBA3c1N`nTFMU;Q6-sx<6)*Z#fz+*QY1y5!GqR_(uHMAqzO!?sR5d(q!s
zzWnx|KHc`a+xoTL=50&PE;+LD-u0C`|8(60W8eHvcFAKU>kec+a>{`Z>;L=lN8NvZ
zDX{aAF*_E#nNziO!QCU~oVwNZ;<gp<yms4PfB9+uRoly5pTB+XmX5{^^B-F`F<kiE
zoA)03ivcelb@jsy&#b8Z?pLRceg4Da=iE>^Zs7Sl*N%TF>!ilzKfABxdj+#s-t}z5
zpAI}f>cl%=x$Gj>?nS?GEi71n>i$QruP#`1-EUm2>kI1kj34Qh|2Ss#>uneB`uw;v
zFYEXHNhe=;O2NiWxeK~;ul-`p$bf&){G4016*lh5sX7qfUbFhhGwW~2J?rOkmiNXy
z<zT<^s_dNpuF`!=|1{*xwcV~)?k-%p>AWvax%j?u1*3<D`|WWJ)mGm3PIUABA!kcj
z1xKIOuPT|fyX)u6a|i7mFlSFkp0|JDjRnt7nmqWP%Dr1hw=7y$vo-6yt;w33e6q{+
zySF9`ORhcAKX34^yi@lTgx5^E@sawZa>@L0mtErCP`PN``cwLSHDqftyJFSms`wk%
zR%Wlc^s!f?B~vauvTJ<Z`hxXU7pSL%8~0Uo-_uYzZoo?qH&4tSdind6*$*~u{(XDa
zp615+{kOS;M@e}ln{z(7q2TYoKSO&a>$OKBJBME}#Fcg0oo8RUBkQS2E>}U-J-bVa
z*3_Tta^*-<vi4_rzc_vPlN0xRc23Ez0eKq=F4)xY!8=PEH|M?EdDZ*vS6y9|`_ZK0
z`dzuBmV9SuLB~~_e5=N}+Nz3A+kevFYqPvnXEk~+ANu{{Tib?eJ1-r!_lid!IWAjL
zUfi~zsIl_AU*v`wb7R5&v!w!$+jT<T(95cFmu||9wdA^o4OAQZANi7$wWQzR!rVMp
z%ZYox%B>%}BFi=4@v#N<D;B;VEZFOgpT4_t@}_Ekg{!ox;G%-)pgpdiU0ZO*&c!8J
zL%ps!Cw6DMyR#Rry#CCM*MB^G)G=%NUo4%lX-QstclO{HvliCPn=#6DLRID4Z{=Mg
z4H&z#qF+@`?5+V7N4v7_Dp>ktV$||0Mva|#)X_IxQhL)vLr)yOKkIl`)}ZRrK`*x7
zu-7%>VAja)2`fLDSadLJ#GcC^{^a7ktp2}H3fJx#KDg_`<+&5D>bT{SeM?Sy>87}L
z%asdb_dOe4^H^2Z&WrN9h8(-MeCv-29>3?z6~1K;eK{pQb=Kxj7oD`LxFS?=)sF9c
zqRB6;3m=&bcWfIi?O5dAe8LgCa*z6IiJTa)tb1Ww?I*__wPVT+8wz8a68(n^y!GYV
zUY|VY-YH|V8?SlvzuYIwO}XpNO?-aatd3J3zaeMY_lp|k{$GSzf<FJTM;AXov~m7c
zziY(6hkml@f*bD0e)sZYk8NCAaeT>^yk%=PeK6#--@bg?fU{#~#;%R;$;lgdOK#O2
z=T;BMSu?%x>;(_Jb9{D{%OAUT+?ILklcCP;tn7W~`-Uznyd+C$x_wku|A9NZ@4hxK
z@XT!=tqi=d@woA^iL<8_U41a8^W%bhuf5`m&u=Zro>$Pl?5JIN^|5X9-}0=N`hEAy
zk~hB$Jv-J_DJ?$g!JPa}w<=4oS^n6>x8A+;z*Ex(P0Vh|Eqto$u5lla|Eg&DfE7Pz
z`~2uzuWO$ClVaEOQwsZCbJ?q3UYRqhAW_w?;NYa?dAII}dmpOq_me4w>#Dx*$;unJ
z|GJ{CJolY9-SWZlPwbkuW5mQoqg(}z6E`fn`>4viIcsvpO`DP3m8ZCJ##S{x_jyI<
z(-lLOWLGr~m>$~rvs;SR74-l02iyDY&AXs+z*z_TO)cm*en<An2eYRf?6+w2H815C
zb~Wa#-nf0p{M+v-DU7ah%{$mO?ZM!upC291sy+7OoB;>teQ^32wXZyo?d^Z_J@;R+
zskpxCZr69WPbqGn{NRAQZrQPR%hA!soPnF}FZf<TTzX)%H?O8*$cPIboI5`!U+Vvx
zu|-!@^&d0np#i({mQ}Qk`24fND|Qa(xBa1_!rYth$$Rk!1)lAMV6G=>9v=SjuzAvs
zqROg%m3hAXIk8O-S6$!_@6VZj$?&Ef10s6{1fLsl`lg(czwVfKT+z&u+?p!)!0xTf
z_T)708Ib#5KVJIyBjMK{iT?GG{~b}_n*I;H<63?k?SDoB{b9eO2mBYX_FC<KX#efA
z|9$g6|9to_vjEo-Jctnb#47-;2qoJ4U|uqSd4Wu39qEPTg<=PG5HFCxoFT}IUq?sr
z_X^sjht>SH5L}oeyB1-=*&n?GY-wP>{gcDAr~qqy_~<N&^ojiT;4Jt{FF{$V=`T{U
z7w8>dBP5G~aC>MlEMd799i%|7^y1ln3bYmWyYaAO`El&Xiv8h(zolCC_hACJz~6_4
z*iuV>ITV~0b}C3U3X$eLt>ia=$ijsCLjK92<FKSzi%cO{=vZd44-Nr(1=6>CfTP^2
z5g0HlUiRBciNjX+9$Cd3j<w5vB@qfpb@0idL#fQ=fB%~Tsic(5E@7Z5#)CcKsc7N=
z4+BTV44!Tr*U-ChWCO6uj2P!rs46EVR5gq^2jl=FFM*l_D@iA0@j+FIVJ%3qC7|+7
zD3%P<CbU!&phD!g#?=Tmg-BkljDv8HBSBrENr`rap;}-8RJ9efFw!^lh@cXD`$^DG
zJ~VIB1qn3A0eHyUm*IO8k|Jv>B^Le}R%6l%@@hH8&{GJz>snP=zK*?--vHI3S|vFM
zI3GAA@|Qsca$GZbl>mP)j3f#9C*hS`ZKF^OW%*~RNhu&l^%2PWoQ+{1MOE@v<3XHr
zJQ;;akOp#erKFO##PfwFiFP>w30RP4qOop05_u1Ks+H&lFcet|hFWQ^ixig0E^miV
z0RlQKPMM7f1`5RhH6=(XL-Ws+#7dZ@@oHRT4-Q+A1MTcn4?dG`eIaQMftvgeAR(*Y
z90HIE=mhA8$TJ2>>4@@y4DhY-ZuZ(v86X_kEGe`Kd9bdoS%MU7in#)xP&Aja{FZjb
zfC)BmA!PIWj3JX@8bt!q-izob<s~!Ez+bR9VJd0KtXt!XVkE4<%#x4;fLu>DqU5mi
z!^Y0fmo+T9I=QSue}%Y{xdIJsxf0Fck*bq%TohP7m@^p=bW>^5jiFORM}}Ulcg28!
z)MPw>WxN#5Is8e&Ke*M&UP+-MSs1c{ZAw{GNt81}YTS^5*xq=`&w(}w_W`?_j?z3#
zU4@5Mx*E@`nWQ4tEMzlh)8+|A=S-+5Z&qUE6DlfBInNxmYY+CZ09LIU)&B95%POTN
zB~0XuLi#o9chI&PxK9%*<#N4}7tOGFre0ZLlnzGzWZZ7oxGq9S*nzwZIl0J9y*aZa
z+GeFq*G)=<^i203jeia*{-j>I2C4^;Dba;S35bc>?79kx5`?}mE}O0q21A$Tq*JLi
z)CqNj;|dTb2r}DvEgB85-UWX*JIl}%Q7ZIrq-e2N^>j=ivcSah)01Iffyo)M0NVk<
z5Uip<iHpQ4KtR^k3L<&JD{%(U44K-4f9mo@?~Z7H3fVeDXftZ7DOfp~%biq8w}||Z
zwm))ibd-zN4*~tDIl-$8=$$jZkwSFBIw|<k(TkUs{2zN?0v}a%{U2N^8C#duR;*SZ
zBOx;|nPidx5(pR|Kok;8f~XMVWacFqnaqsyW)h;J*wSj1y4R)dw(i!YYPHtAiq`(L
zuEnitZR@_YTK8iA_ndRL_vXzcKoaf0nU98<_wK%&d+u4jXV!uBiQYUNn9mkQ)Sy8W
zF*#wu@U;%8BtS|9DwjHQa*MLXyHVj}eZqDhI}(mWOjy8-plNFuriC5HvN)(3E+pi2
z2ILN!7lZS<z;c9dg;pe62aL<9v@gtgW&{>y^#BVKIyg^Xk9=3vFiHcH2l2m+K6Zfg
z#4HOh3|rJnt&O26gKeXtZ**eA#I+C{nz5+B#6b@Gh0Ew<{AV`pN)jP;3Yu#njX=(k
zCpUbwlKn2(mWso8a4VPOKIIfe1?V6$Rkkexj0zpsA(#4EkO@f}OMz@|63GTH6qoYA
zodIVZBVmdA+-A>m7;bh(l{V4)Fd~_7o98@^K{=)A3p-R^mrCa^%stAJL;41zVVA)5
z6Y)ubGjcL3xMIQdumh$V+QODyRdAJGFbi^E6lI4dBX{Pu7=V1B;Fza$P%cGkfcP?U
zBghLyJ3=DEFFg1F-Qlbt=4~;x^_Nem)NDq~STF2?luf*Z3ogtSV%o&Q0M(I^r6}Vc
z*y))-Uc%8%XrW|D*k#9}^C-g3<}Nb|POntdU}R(|A(qkFA=`kZ6mCb>!h07DT^H*W
zoC*BAX9H#d4Ni7|CIG3v6zgCiR(CQRj{*<MsB%0UVZH9?w>RA(z{tVXvqeL5gxBG|
zU3_z6b9fJEU)dL`6z@U~DdNq~nW{yXF9y9@m3;))1o(9(<1rvUH-Khhe~sp3hnZ%>
z)L^EwRyZE(u_E350rFW-L?sZoF;}=k!B%KZ%6P|?u^=0>!d5aK7LnZe{nkE|h4m@K
zkQhto8C{4VJ4~|U<`uIHv3=Q25Vvun7_4d3*{GV#JZ;5{u>|ZS+)}_Fii6OCfvHP`
zG5;a~(f|lY?B24N-C@|JdA=yLBbGE4hph;^p`kB7G-6&j5sN2{)@&Ru^iYa69sFL8
zJOZ>9FScyq=Po~O%sRszX@Dk)b;UAlGqDi}b^z?LYz4eE=Fw{yzd-(?VhJ-9>`L~s
z64+rhzoD^y3GPAG^1PWMiPRC4es1HEBRKiWdnoYUR_9%vY;fHN)(A(#Dc}fs5mmuT
z*u=av>QvfPAdOLWr|jW3N*MWYG)lZ5JJDnMMTgBSTa+={`r=00hlmNVU^`>16>+vZ
zG_G_IJ!EG>;r$0SbR^RW*c-qpn7t5;jY|-KVGO5PrB*+9;)|7`RzkCxfB>KKO}6(S
zEcG0?;nEVbZ_c<3Y0Fk)IFol8GiIbK9qtUKvXL@?UW7H&YR+B2o~cb&m%*lHVi4#T
z(7nP&X!`Uiet630b07Rk5V{{o_gH&+8NtR~1T6#9-Tn+njj*&nM6gKkt!j0fjOE~0
zzVRCJz`|soiLx4~8g!7h9SLhd47n;1cPU#*3juTlgh|~=BDS!h&<B;@McE71I21*q
zWKfQCSmJd8+o$ou)O2XEWCW_%#hv(oO2Y@GCbB(@c4Bj2COg>~hFpJV63%KO9*UFT
z$sq=OD_e)QHP{!60%b-i8p!U9E)bT|QdQD4S|yg<mDh2M2z?(OBbv@n2x2_*QP`E1
zXf8OqDHKO|v?Dtf&m?OgNm*l4S<8~T#bvDv>l*iO+1G`5M{K&qpl5EfhxS|;S4*4`
zD|5Ui-x31OaNGhXWe^9Vq*BbVm>v=uqL9FXVSzEHgTliPikvlWlN3QO%4c__li5^z
zELt0?sP@i+XTS!<V^+o{cl**kqG``=mRt0J@JtzyY?eE;QW~Q_^c0MSHnqHBI%Bwv
zP*qJRR8v(s>JYt|pS<>8_RHHA)iHqmSH+Y{r~TKoYL<M|{%Zt2qxN5;_Fp3t<m)S9
z3Fa2di_F3{IfU1!McAlC*r-L=s72VQMcAlCn8VOmGXNXV+IZ9oY-pls*{!{Fb1$LI
z2H-;!0yECdOheoOIR<2bq#19C&ENrp8k&iKA%_(tshKcW`r&X{L8CQ^a(|Ya{Z%C&
z&aN09lE|llqfAREJC+iHZy5c_tducu(LJ6Apq-IeaIv@<bTM#|%Y_6he8~v;e8K2P
zqKGb&%Vq2caa?`CD}abdh7U3f2oIN`5ky^(Fe#%_h~GnFw;0%VQAJRw2HU3)KeOqC
zr4Z$0UYCONgdO6hM1$&|CHluf9hV0H02O9-px{p}qQ_J&=9XxMx!n)v?Yz`1P{nM0
zl2(mU^45rwV-|_!GD#>-4Gft0VL_^1Hi#K6JGN>-bH&ymgmejKx&uZu3G6fg_(rm6
zlgj`F$#m$WKv@JrV6zhhbx;8!(euL-#cCFufUqxkA~g5QW>Q&_8nUvvoue6Lbtb_m
zu!n6Bly(byJ;qkWKx{5;jkIN9YaY}VwNO}UUtVbeY-lue!uB!}CfTE)u_tMOWG-Hv
zW`oJniW0yEFJ_xWC<+yL9nf3eEmZ^oItGvw<XdP!0p&b0u91zO%gSd%(yf4Q^R8_o
zr-NDFc*XzkT;s-&F7kZKNlZU1DQeKfcm_hEg(r4pW{6gyJj5hD4=rK$Z4&Oxm}za$
zpe)!bIb~(SUD}q>`jzIe-$4FU8Rd>b@^*(7yQQym+Y*i0_XcbxZ9tW#LEljY*Y(h>
z>8J?`;Xy2EN=Peu@Jo3f=5kVvyero5v5t}PH`@ZZ`e=p(a`~!Nt9Vj>(2YbnmIWr+
zJPK-~o&yf9G&_N04&z$IDWZL?;uZ(RIJnJ;EYk4dh7LfRVG!8F05_e;urCDp-Zn6?
z;bp0Pn9*z(xTQ3w7*vaR#kHBX^NUEeBqV$QF&&NT3|<zsQ!6T*P-Kd@5c{T}3|v*k
z$PZ&GMOoC<f@P77x!CQtvM{sZi)C~Y2%;Qnb~u7jF7zzymeL27m%_dQ0<w@E4=p_W
z+Hz?D#WdT`D3(PHBA&n<pgd&@t45Jnl#f~nUMxnGz>B3up8Wtd7#ODUH>iWn7;-&C
zXAp(w!oEm<1it4c+p_h{?=G~O`Tb>+nBYh}X%(V5yow;EGkgQA;JJ{>(oBhYZlfjK
z3%!rW$(ApcFkEY)@x(V`38QU2TLEC7$JO#3CafY{9=@!VMKb|h{a~bvN&JK2=hQ(3
zCjdXrMeGy|F@bHbgGGfZR4`@e3-^nrv3pz=S7sR3YX<K@1r3(M(I^h2XqR`E^NBQ2
z5@(jpikxmkn|Hdfp&i6LYcr5%j$4s$>FbU~x{dB+JeoV*ILBLd)XC=Xqb?R5^ywzo
z9B^9#K3-6|sK#QEuM)LbgpM-Pn>oD7*`i>7(Dr%Y-YjCtEN=Fi#(<5R(<@p>g?bj|
zTqv1>XtM|GKW7PI8ZJA?3CK(h3@kuehQ;+j*p9Bkx6y>~PAfP*EY-k7MzVL1dQdZn
z)**Qk7ie=bWhMsEXh=3-tD9INH_9k_gBCv8l_3AV91ORG(iffGlJv|@=g5EyY_SwE
z<QDNjV|m&%1t%`G1jFV+6dCy=15r1kSco9P=-KF@{$SY1p~ViQK};<qgZ&!7T`>^<
zhKC&Yvr+Q}V<0y$=eiTlt?LN-vMCo~UUD>+9!!Vy^o9?vi33trFi^CUOHiaF(RYMm
zL?qMw+*Hj@nV@)$Hs#8+U{k6h2FnWluiFOMMc8N`R5_j72klcH+Q+D@s)3jZ(?{)t
z@_Y)||0rSo7S=HU{(EJ0MWxgJClngRe;<+0sQu5V{m=gZ{?n+{&#2YUsMXJ?)z7Ha
z&#2YUC=S$!TL4L`C~op2@7F_N_ajSnn*BInYHGmNK!*ha*WQjKNFgF@_xEsgCKTqR
z!RgME%BE8&#|P7(4htOQz#A$7agD7EiXcHhM_y;?WItoNKo8A|UC_9+EFN2F8mzG?
z#+r6!ydGWSBH^MSJ}b!ISRL*lJs<=kbQ;0ATIErYM8r@iPlFCJHKPSn;Yt%-4jK&^
zh~<m}L`oNji>hm#U5PAKCNh?HrNk+_V96r%PSQZ6K#dbiAcR#4!XZbvw%y=>M}xy2
za&xscR+?rC)vhp#X^;*O`cWLO^5l<A-Rdyo$-ba;<$^?3Dwd83pI<QuBpGJ&35svX
zh)aYE=Xjsc<vY=D@agx2Gh)hd$dcI%c$NcG3j!@`CCf|VXhcfkHeM+F5tVU8dz2I-
z0^W)>3vIuI&=O4?vX()d6bP5eat&(&X?Kc^SBh<G457^j#KVT4bq&2u`*1x9gEG!W
zqXA0>91|m1>8xxYDRECwFeuUy8|F}VYR&JMy{S&w!8|_HtUn%h7RP!8@DiW7sNBfX
z42~3mY{QGeFebvd%m4{cRT+qZunzmeQe9tSrV&7d>V>gmz3WN?_6i_^!NOpR2kv%V
zW&r0J76oGyKzNMK`vgk{b$W1_v0`kXSYgXbMq+4BWE+0c(2=vIw}t2M`U8aT#wZV$
z@`_h--Dxx=psfz^8pCN*4JfXLF#*xDhb_ARwle_O9<fgN*Tin&mbJh{M*0^A3=C_I
zqaJ{MlqW$>ACE%`j8u8}mJ+QC&`yWI^lU&ge27rw-Pg?lm1Iv)Sf5U?DoLpwO)_eQ
zHKN}nS9Fqw1-cdi0WH$Z8rzx;cO-kYZD8<iKs1L{l2Vf^c1SmZikQM46zt4E6YHT~
z!9Kz0#cci=@rMY?q#SqjR@*uY>y4JC`K`<9n(K{*7Gp_s(}4~1>gO5Wx)%1^8!(nN
zv@UE~+G?;A&2^2f2OCZEjk?Bzjr|)M=LJ0V2Q6u?Z)q`_nvI6VOBOZM&kGn0jdK?*
zo!8K~z?j4GH8!;xiy9U;w6a25n+&Ls7u8VD^3C@wu5X^Zko~Ni)3B(a_27UpzoE4e
z%AC&%tuvO?HMcg*UAm~Q*;ul)c}Y`CJ*$46r?IKAp>cjQtEGN%ePb&-B^p^(M*V^8
zhtaaIZqXvFs%|N3eKWRiZqt&3n;RA^Y&8}(Et*%~+~S#2&stVDXHh*>#X2>2QC-90
zfHALbaovJ?%+<t7X~tx{b;}mk<0DpIU8ARNZfiqRBaF%1rpDH0_A|hG+1x6#E^BD1
z4;XdL4J|Mr^P8Jk@i3e$2aH*xhvjRmr&3_34cm;cB=CD_OTB8#y!yIDtgIGj0ej#P
ziPfY|OmtYO86+4UhF_yHdtI=M5_=HSk4o&nq)%S?zjkTg(mD#u|EE+}SA?ALAEu4Q
ze;t|6sQiCa{y*yfJE{rzFVzI_btq*21Nz#HDgZ_m0HX?kQ3b%L0^t8k7vPx+UKMFO
zlx(N(5^jvI)IkBG5(pvLR0Eb~89MuM-X_uIiH8$iS;P-77)~N+%mHmfDx0<;nhi|a
z(cNN`D7xWWw8T%|L=;qkM7PxGpr_7IHGo78aGz1?74PR>myGl3VpN{Q*AdM$mk{d&
z^#eD&FovRl9#W(SZm}4X!aQ;}15;ViMzVoqh4ezT;1c8M38z<PQwA{Ah7WEW0plQW
zv&%&M1W1i7F?%||`4R&>0J0)^0wL0(l`>Ij1IVu+TLw1`M1h4-P~g^b6nJB;Y&=8o
zv(zkVzJzV}@WxB|kTx|~f`Y?`ddwrp3qu6!$Z`oPyCEc#WJ#P5uFE~1j<6Mr5V)h6
zLQhsMxP|)!V}aNXwipqzl=-pV+Muzl8wLhqOQ;qggdUA7G+f4{$QO)+u=WDlg0MWY
z9CjwM4rLq*n_{Do!#u1o4*m=>Yct)0tp$YxW5(F7V~aiD=|Isn>O};YF6b9xoftKw
zmp$xBW)rBZ!Ppt#Bc-gb)!^3&sWAE2XZn%`V??@>(jOOd_W;a#Kuj}0ZN|X+f0-j-
zibsR<!+Qu~8ycN)bCm>O1`Q3W2sN#aSW%{hs~T_%!ybuGtlfE_JD6Eg3fWp1d0e$3
z90F`4)~Q$;6;YNBojgdgke3!nbxHNCx^$#FmN9Ww7%i-})55U!7L`CT7&sJ@!$`-&
z{b=!y3b<q+oAEddAZ;2x9A?zhK|V+=6xaoz(S3!E3BOPi8r`w3Zmm#{R;a-X<qd^G
z*$Ok`ok0V^*SWg~&VFY&V(Q*-NS%mo%MdK89N~kmJ9X>&E*Tfb5zj^jpz+X@qDEPd
zm9m*pV&rIOQDQu@L9m3d!~b1zV_F?kXW520%jqH`gAz#}9VRkJ8sYQ;zSaX5@0<`o
z0*jOO4nOSdfr~8e0|&ktputnS$iqSH@kr7w13D<Bs6qv(sn#5wVx1;BGZLH8Os*jY
zJSHc{+zlp9Axk)tSTeK`VAg`*Db>x|<P(99^e`Jj)y@tLw#$+T9Pa0b7%vR*&cj+0
z`0-6Wi)5`#vIoIS_;%uld=K<co1=72R|FWX49lYQa~33q^#nMu88c<cE#u+k)QHhb
zYS{F3Q6QC_VRoJo)Cx?bm1P@^;sUuIu@0d1dUWM6H4l4t*pvX_x(GG87zerT$^U}!
z9oT+HB@{WvhysXw8esUl;>nJ1+%kNkwYl+R{H}py^2CvWN>DbY_rnRa@6&vdFyIV~
z%Yyn=^2TwLHWv}^Ir|}N*St&ej$+#E0?1*2{07fnustEKUU`=)m>H)V6!lc2bZ+56
z9109TfkvQLXyI1y4tInjD+SM)Ovk!nz(&Y!3yAw<oNvl{&@1ybQE2%f%LaQ$ZXo>(
z;dkFG+d>d*Ez_R@mJUzxJ_X}XJ(9KA#ulbBUq`_ZAeoMWLt2tYGSJ6bcTp3U@StZI
zjXU7c+m<?clc$mvokOfdNrut?NW>vAz;ekWT%6c-gYCT@0ZNcc$9jPy6viTAe943f
zOj-IMeh?sSpu@4^Px1=A0&rd-$#XWzqXnm9EK)Cb%%eMq1Tseq>NsN~1K4t7@qu&8
zIzdF$mrSozRHZ515zDy78nesu=+dam^qiMQqJCCh<EB_b2Qn`|CQTMI<*8V_vYgFg
zimipvlwc~_=@xQD3$+p;WOH<0WV5H78%2}Ns5j_A(bwREE%9hCx$;OpCG0Y-MFfjD
zXG_eifm&CC%{NXPwTD2`*>xLOTCi4vID)W<!!j0vP6XU0Lo5@*v$9q0oChc_3H$(F
z&Dkc1yE#S%gez#CO^#flga(sa4-J0e!WUGWRXMw!`=0`xU^K$R=7xvtU<`z`$I9^N
zSxXR%1`+?05Zcj%i(-r>FPma#aa34`Ns}H}^nGcfRA|<fk5u(@@N%F$VR79vJ(B*>
z9WG~dES*u~U`fQ3aI>jcM#GVz$|uZiYMd|XwO5eio9dxT3<>WptoHD#i|7`x{MpEh
z0pg(V2AVEt*y;`oHq~szvk;*xEds8{H%fMj2v(uI7`Ip^TtKpr^C$U2MhFHbAEU3J
zq&f}BU6GrpM4V^r5RhO#`H~~TnHUI3fsR|A#}WL+`Pv!&#RpeS#JkTc+y&kQBi6as
zkn`SI1)gsO3#UV@Q1P}D&I(|hwQUP5FXrNs2|1b^o~J<Y3}mek*{=oAXYx$Am^AG?
z#*By;U;%%Cc6fuCJw|kT!mBW<Y);f3`9|w+ZYUJj0&&j~yiabK;-yyXfCB>t#&}U-
za|zfc@O{3LuNNF9SldXsY^0TJa^(d>T|Wo4<n6xl&J}NWoFDw)<)V@}OLjn%I0mp4
zrBbS!C=n#i)(%7f!-&5X*nksmg#ZbVD?%xhz?m?T5diiPrwY$z6PD>7;y~0B82l&}
z$;QJxj7d_P&Iq4Qd$Y69O^T1KuH5K?&JK(ghvZ67Uc3VWx24Kb05>_L7-fgZF2dzY
zKZcfwkY_T)i6)((kgVb;V%$Uyzb-Cc9_P(R48O)T$1;f9Y4&6(Y#0g(fPdCl41ThD
zP%@VUc@G8ZSZT_uZ3=|0gfhg(g>g~t3)1kZZ+=fPPZUkE>%Py+yW{nH%tX`=rKe4G
zHe&!AG38QXg-|MC&ULA4sRmPE32xmVkZeLUS-A0B;OVu)CU`xCU=+ONnVwX+H*d#X
z;6nVKJew;gHNLeE3EY|*lNo+#Lc*_ue;I?I3myS|B|x@-S9C`np&J{mvko&7CahN-
zTuDxeb~5C<(8IZ#dq)~fXgs_i<V4C5>=ajnP&IxJ!4q-OQ9omGRY;_0R$fSRKvD9s
z%DBI<?U+ioTN8%43Btkvji>haG9YNAwBcf&o^Zdw&XqSyV3RTY4!vd_2zYSy;w1=u
zV1SYuY}2s*fC5|1ypQ^wi*$u6#Dn{&gWbv#36AbUvA=0&;X;ygN%DBwNB&{oGuRhX
z+`VfJH(KF<+mX))yM;_p8)(}I$T`H+vg}ByoQsFsg#FSFSA9FzkE5sQRy^HF6a<Mw
ziUP>fRmpw@(GZs%+t!Yi?1AuAF_1sdec3YP4OrA78mXFwl4RZl9>`3*LzNVHF7X&o
zTJuY-+`{mfP{Ik^YuaiYfSSgWAQWO%w6h^>2gI3L<0wz@a&I}i3<H*5IUvN8d)wG^
zZ@KU_qlYX<xi{ch%?l9%gIe)zaOaF{0n4bhW4Tx&xb)k5*`qd3F*}POB{(Q~ii>$Y
zL1+!-4hBohX9Ha*W#4A7KY9{RF)T3q`DFv^6Y4CW3pSOOyx-fDtN@|}(pmDE;Rckj
zZP7wq>Vo<5LQ7EC(Ri=)gxQ!tAw)2}>2RMHRi2On)z(}D&dP%@Z6;str2Mwu=RD#*
z2a1@q#0u7^rc*zwcZ193xg3Gxf$OXbV3H>+`_0zVs^L|Jd559d;wr4E$^*tS_%pYq
zg_Pz(=D<}Qc+QdFij#bHP{1BV{81@mB#TQE6}SYB8DImSwlatg%g+ms5a<qQR@JS{
zs)U**VJnFvS<3zlY;GmKIh9PDVdL^3JY8%T4wNZyy>ZxDX$6E}(37_p><@LoaS>22
z^xH)y=@Fxc>P$?)<Hw>2wd|x#Z|k%O%ee_UZh$&auPD(Y?J<0;IuYtLma(0>^Oepp
zkkceOFQYMw-Q@cP^9W_K-gp<9Y}pvglIeJKyjO_16jZj9^DC{8T6lwEk=20uBtyu$
z?OVRwgP_UmHQ*h4bOdE~KZ2iV4-UVzMj}YEeBrTSCgU%#%GS!D>#L)X@t94$qGDuD
zDwH>@t<Ax!>#|w|RaM+6Ij#xit&TYD?F7RGFA|R$y!v@S2G~V|D-2ZBxQDgtA_c|F
zkiZeRJ;N)*0edt)5vU}~*JFl-s07NUdj+G;YC%Lq^HqIx7RLKM959)SSHQ427NPZo
zKy)f(rcMAm049%hoHM8tRg&E?J$Sv<SF@n;mW{!+ak48DaBrmR9Ef*7gFsBT#YhSx
zPf_lkn+l`VkK&-o9EVgP2@|e?z-wk~bk@sFw`eMCTKxnu3uxaX=8)@G@h%%6&H!ga
z=yvIZ0yDI@ZWJR;I0I7Y&r&fC#7yv0B?S#irZ;&D8HUHhj&SxSC{5F9YmHJf(FMMq
zrF5_xVDMt%amC*0E5FoZ#x2vW1kkQ$yBL3Ox)#zD7mmKh;%p+C<Rv*$Ezc%s{zTDj
zrO1=&JHJ%l_odLIoR@q<m)a;sse>vo-b7T*SQR^AaOAX+372<b>$_H{=!8p++Dn%z
z^OS2NFr^Oql5im<nh=K04^%2@Gl<t@1<@V_ZkO#BqymuEmJY+e^4-J5b(+l}7(=>S
zB<eR<VfG*%k+P4G0hBipo-2_J;K({-W<2Wg^~S;|PW8i{mU?tB3l>*&&<7%O&UP^-
zUr^ubmxu)6Y$gdL0}bmuQ4_k$m4K>kVD+ObOu!ru=xJY!-Tsr@fj+OPpR3+VGrtmy
zEjPiEY^~D(64_cAvL5f&MCGs<9j<1J9w&4>H%g*N7`aB5B6MxiB-eUgB&Nao$&d<f
z+wo*_B{D3!L8U>KnF7gxe5cXq5G^oc3E{Ghq`wXYnxqK?3rvyOZiES=iT>w`dGOfA
zA)xWo8Y;fMZyH@zR+x4^+Yo$qDwoX$acw`AEsnCZhwxiTH5Zl^ym<5~k&ilKb0R0`
zVE#eRQjW=Ow-Ln^Pd1d63?5C>M@6vLoO!gZWxc;Gu|z~P1xF_b(w$q93VoO@%77&<
z{GPDBsd3fe_-TmwJd^|Ju0%()rnJ({JsL*MTwJYiZRQK<*i=}H*<h}QG^?8(5JZG#
zYhf<(s2P?>qbj+oEJ>~$#VK}4EG@k9Neq5&gv=%vuFIMPLo7}XI~_+GRkU0M(nW2N
z9Vu~ETcSt&kO8Lo2p0<GZXcXlESFu}(!xA{sD{W{rU?-M1lwg2wIP7(p&20eo(yJ~
zG`$8$eiaML@08F$&btDi7*3_kaM~VF2q(rMBMXme1L<0L$|JI@aBl0Wb}vg>#)%lq
zjtU&06v8IVgYXftOxCso#mGSL8MLs4vkxzYY-iKYR5+G~4JNk?V}^uuK^U#sV!=rJ
zcRUTdV<wM{gDgBPZLR|Fpbu*}4%Aa^b=tp%vd*+jz}b+jL{do9xE@BBe8@`ySR^ny
zDp*`ee+Quz$+^(M(*AE`S7#4+CFN^f7FHr2Zp!5pzH$aKZ*haWrP^3X5qQYX+Rzhz
zp#cP(c)w;-uifmzxW4f+q)u)zK<q{n1CVsI8jYeQADGOby&5oY5nQ;iKjA=STQDAr
z#4;XI?}1|iN7hDmO4uzcko7RzgJHT0a``+O538_85b%U3gK$RS@(~a2eT$5~xxz$=
zL@X=YL;DTf0PND}E;F-$kGqga1A|ORTto(uf1}jOP*K-+TEcLw@CMPMQOP=eezqD&
zge#_>Js8ZUDYR`2V-q&cfLn)3%Sq|BeE=OFRPi)Ds!I;dL`I{&iuR;Upgy1ySCByY
z2o2H}xWuH{RRI*GFiBq9^mzSjaJ9WW7+I6piTVU>-tJaAcYrcCV~Y!61#V!r`|#u;
z8&73#g{l<IeS&Rtt`Za82tX-<AkvCiBq+jAGqClfy}5<*Mjkc@t^Ifms91(%D$;Zl
z(xSng)y)ObEJ=?%EOX>7I)5ruEwn*}bcJ17QiE5<!`0dgLzczy^7>J#AH$YnEY27l
z#+DD-=?8EsSkBJ8@fhX}1|d^0h|kLTLsG9fbCk>K^a%pOrk&5&6V?Q|<b?t8zy~T7
zPi$6+QMgM+32}z1Cw%E)dbQ%{ohTD-I3-jW?~J>4N5B7*Uqr4JyQY9<JlD!oSa>pS
z13boflnuC#M1&OwT3*?O6<o{YksyzF1Jayz3?JCfv$rU02pWxW?Sl|r{0`2O0+q+)
zNrE^OvGd@HtH~3z8@q6tk`W=@JE|{paZ$v3Gltw^-E%2jDeuD;4<TV;h)WdW^025L
zP2xgwhD5ff0}kz2MwWygg6I|s#=99&n)2jw8d<_(<(Ex7ZNVeVToo}X=AODH@Mg#s
z<7%c3BR7r8Bu@mCG2D`g8=@N76cA`Dpp|9kdPRsHc}wjEot#iPp!i4~t!{TssD>i@
zxn7fm6a!Z>j4(w6<jykE5j5{@O&Qh|E*?z;V^DAgeOd|@SfDT!d<2UnGe<GX?13<C
zL3}$AcaVe_(#V*NWtu!(Vs6%GiKvx(@q!BIWQmYY4XLqdsj0Ta+=6W1BPAw1B)Eb|
zcnPskG>Am0N5X52T*Dri4zAtph6`OnTEEdU>O_0zIKQLdX@o`ffHD@YGjuS`Kp7X~
zGx1ufHIVDB(mjSxDsmagNt<aut1ya7otxZvc-T+N(b(Lmkun&m;p++acPRN0biI$*
z=dcHBMf-DpR>K?Kxg)ZumBD?<=u;h=Dt^L>&BbU8?qM{rPhdE}Rj{LRpYT#hvl|oo
zlZ=pg(Q1jhiZY$J5J1PB*bstBE3%O32E<IIb49}t%q2>KW^kA%yK|tlpekV2ibc8G
z2s_^D_Q6ptXb;L9RD&QPdjh&p+tq=jt++jGhL_!8%Y%1*TsmpE4&ec=mk5dYxg-uE
zC3CVe;Gm@Bw;sxh+*cYnWO7Bt+ZWm|%c^-?G2!lx<>*R1ygK2smfp@<rx0Zmw`q;;
ztQG{%8WWtRWIV0SoE0(@$TKPQGT)r2MgkRynh|V#A4+ww*>a!RMgoA1i68WIxXFgu
z<+FngsRgH=kX2yxDR#f)PF-o44Tia_hn=jRa5M_iAj2nX?Ka~nI8&XjHLQn>Zml#k
zaD`wK!J3pXGv(-d-GVPrS<h-2qzf%8hPADW%`X+Qh<;!xnzyfilP3wsjTP;f9`RV8
zn3$#b7XWXCYnIgdiUEdR2&Dtfi5OG6qEwg=OPLa(0ssk=S2;--vI%LAf@QK>|6J~=
z;r3cA1GUK#QF3+!65mDqCU-~DwcjGS-PTLP0pK^Gt|YtQ@UuX27#?<tlAkM#*kJ6v
zVqk2g;^P8bn9#{L*Dr2rt#7ZJH?P^tQ>$jQ_kd6jwg|Tp3r(*KhNkWltO!<Cpp952
zoiziFH`DUHsnYWZGcvjHVBs4+%kL@9F<%r|GU^py^HxtL#h#Xx8On2&Pl>QJ>#^YW
zf7EJEF)@F1R<Xm->H?T!I@VaVek`UHjSAW95Uw&7*jzuqzPY{`RDT5v(aaoeLktXm
zJ1@iw^|+Mbp0lOC`M~<-_Qtx!_3V=8DK5^FY;JSIl2%Ga-2g9c#kRZF2%vmk-IkLN
zGIS!KnR{A(!zDL+iiUNC$0KP$m_*a(&(mv_GM37d#LJ<FYP<s#QDE@rHZ|?vQ11mQ
z=tTr|f;HlEJ|B0bB@Z{7-G(HiWtG8-jw-RL2nnApENvkMMFDK96bls>TY3^xy4LV=
z2?8=P-hi>1?T})Spuo1k&XMH>?_BAMM5&)8S&i*%k*Ybz5@%<Nvni+ugm$3fnpF%B
z%=ErJ{Xqi7hf~4}wWlK~Y?<2iE{U}6!WV23h!<j=Zq#CVEY-$sHd(Xhi3E(o5z)+m
z8y|45HJr3_YRIj=v^A-p+`1hp8y&ye4&n&O|9oKD=bBBeU-eemx1c#|G0_)VguyO0
z)ojb?KWG)NNU+&P2~0;CWESkVA0B7$F~Ty_U%esNY3dSgHWX{ZkS?{{M-yaO6x5NO
zXW?{IfgzDvS27r2BM1fIsEhd-#JF1p20}F&``I0We%9H%g&40&Qo;})1ADes<)esx
zi!qBwmZp=FF}jdJof9-D4kPkbwLhQ$jp>5Ua%N0mS_t=bun4or$b)c^JhqW31<QY0
z+bHGWR$Ix8y!-`}8CohChczwsXiQw+c?*y`AWvVdnL6jFSIeghNK%%YR|>d)koyQ1
zdIxKP%pyoolohBI%Vh1Ml>c@7Z_QYU;J>Fy`0vU}qoT5=B2-ho&nW!&$b9nRf7@>n
zTU1A3{O{^1)m2lS@jt7pt48s^0AxU$zenOTivK-||2>NTJ&OPRUyA=d8VU4&76_b^
zAPx6>K=k)f@b6LZ?=1lT9!3BD>Y{(!6_|2oL*a6F3za2*kc)T{bznE3$%sU65~4*4
z5{h`3MzT}cwhJwQTvlGq0zpGJgC<M2Qs}(R*qh5`Z0QUi@TnLi55D*dTYHndk_@{A
z>k8S($eNcZ6<j1F;fiHYd9aicD2G*uS%Wh>Al4#0LJ0G4x+|-okhvj>P%ctk+{?()
zePQ9v49ymt_s2c4OWn=fniF*83hKsgI$>V|1x8p5E&UsyAsFP)qH#7O5R_M7zzK03
zcm0I%XDy{+R|q3yAgP=U-KQym7UJ-3Q8L2M6>a*sF#$~y_<l$<-10uNql^RJqOwiF
z_t;hQ6eW>DoNm(m+B~1dq@l?S*O*ZPeWGz}wH%-b#AgFeuFJ&gUfFpkR~M2FW=^$*
z2lgZh<<4sOoHJBo$g3YtihnbgC~(K1TP@HJk;L$^Gco}4Vr^=705~HFS_FWeqtY}@
zC~bc@cf(QXln-TT)@PuPLz5C}8Z<&$vQa4jUB}AM#zC5T$+g7B5%aK)NSIu{c%XV+
zN-TY+u_)1M+&we6YdX3sfXvvJ(<m$!Y>ZMAT7VjlMUf2*sh`n=3@syRr@{iRHTX)E
zctXO|#ssc}4hZScA^;hn`G|?5Y{n%p4&}oZc*Uf0b|<L4BZ!=VmJzqX%E8OzyeLP^
z%;866Tx|YM1FmpC0=WW$+!K?+6^~9q3iaxd1dMfFS}dvf$vxo=_pjURld@-}fI(s7
zRbY$Q(iuKLAQ@nb%oT8!2^rNJ=TMXK+qVYQ2PF$jncSID{)(t2(8?`H1A11nRzt}J
zd&twURYrQu<wOeF2H#QW1{R^Y_F+U5l%b(%44*xIG-E}=)d315+aok7vu!M-m-4)D
z*^b;LOg~b1fy#Xh36NzodDAG+fWtk|D3f(kzVSt68@IC?EODj9!N&@-I!L1Mzjb2`
zh<e2P0BM6yMgVM`ghvctZ>&@?1E4~ur?F%ZmA4Y{4wQVfU(tfFFUAT$_hp(w?zV^c
zSq1<ilQj_<^2;Cw+}L@r1jugijknl5F3-xxz@5?vZ)BBDiY7!*X%6%S=aRT;8Y0-X
z279=L)Q0T$;;BMB1y5r5gdOn!tEFC<_Uqux+=bd<j}=b^`3oKFr6Wrd=<Xh@xq@r1
zi4e5{tg$waDFKOJOawJ>9S7D@o@kJ}W-d=1Hf$DDd=F7vCED`nOim`_V!cRYO__#`
zLpq$W;?ic=j_J9#e49JM@|6=pmMZ2pxV$0>ID)xI6E0dPH?*oB3q%WcogAp<D{3V(
z0~#8H=7`FuH~l=I1JTA#%^I4I9QmW5<2_e!yUepTdil6$wFnDLvvBqw?1EpSEka9k
z7grbuK50_V9p$7&KAja3Fjy^k?#}9P{Z~AuibiE9ihwq}j&-3{w)<*!AjN`zzr6Bu
z0D{fjQ<j+_L3&Sepdq&<HGCb(WZVoV1{n8NYzg>d0%`2zt`nLlAJOF*iDc;r^whwm
z8;=vxf#CUVp3chAISVFCXxpO9sFm9^`CZ6R2Gl6<e}@j}FD3MiC4;P_@&mnULp_gU
zIUsK?r3`6#qulICVdo}nlmTairz4A;LF|Khnt`)^G3MvA-2ZqDmwv8xXLGuQ>C=Go
zCHZdd<eIcwQQO5j8etMG7i@zsEIkW0Z}@a7TVV8LvO%5|ODzqWz-2Akftom_cDM;8
zC7y%wlkb*bSz7tz4GgQc94)NHnzl6WEfUw{<Mv#MuQ)%%Tqw#f+EeI0rwRA*LYE`p
zm)AMR8{sIY8zoVU2F;^~47+SdENF9;E6d&6VYLVK>A@R}UR~$FBiMnNG<W564VY!7
zd7vx@w?-~{VeT?Ryr1M4H<6X&P?nvAxfm_g0L0bi6($^nvV<H<r38&8G+PGFE1m3d
zoIAWGe#vubgLbjx@!ASdEn8s&bk0_A-p;{E5oh--x*z80AYNm{j2jrXfm{~F7O}X`
z+!ih-$&pcimejQ_Y;SF@YiwCm*IGYM?z%yY5Mb*LJVGqhz$2s(WxpcR-#e(z^$x0Y
z9DsI6I@z1Qm%W?Q&A~16-c4NRqQ`~SyZ!Da7Woh_?1skqO@ms}jym!Wh%KSvW8VhB
zuH-+tgiEoI?z#4iUrFc)7WVr>?w{6}4jwC0;sro~@(>YGU(!67(O}0L6plfTIqv8`
zH*U&1tOHBlc#477mVP#j)DqI%Pwb1xO-i#VE}fjQaQJR&0vrh<oHhvnMSvg!rUUtJ
zp_GsNnDV$`B9^CSkWD=AW(#dJ*S35!sGJIhTEOS<ecS9yh{LZn|JJspq`Sy~y~z~v
ze6@Lqs%wHna-oYaQDBkZLzaB1(Kj=Vun(Nq#<wJh<fiuuRF)T{Kv|s;lr$hL6<#{V
zL&RhRNB~3^w7JS^a&8s)ddntBy15QCN4f*YrcaS@m>rrK(l1PE+42_hAiA3)_Ely-
z+AXC+n*M0+;f5}@<q1VdQW0YyD%A_<lwps=wuw~1C5lhJ3CoR`Fo-D=w|h+r=*yWK
zKVN_%?u0~EknZ4Ep6$p`5i~b*q2>lgD$w!VSOLS(Z%slyG#z*Cv@-x&fnM8^8a{JX
zhMX>ktnZp2o<}Sov~1#%%rv^UN)S>}3VUEzmkIn*d$bHd*>G^)(Ij=r!F7wr4&-=U
z-y)*DLwUa3cm&vZzdd@}-kO@kO*P^atGjA=WL+tHRhu#QZn5d|O@2<=O|z<+t70HB
z!pzsL?KDLhljUF_1duD2onrl1CW;i)y2nW`Xt5PTvz;Cly%}Ihq*ir?Iu5a+QC%j8
zATM|x^X4nDJ4$WIAO~T6M1fKe&vPSAo9dP*z{n;t$t<Wa2BU^>r&{hY01Ho}E%lc$
zkz6{f>)W<yGHLc~6S_r{Ni<fU(7{ZmU5Ti*%*C)pDv(_Cmtl9g=%7|ZP5{FK%$Amr
z@%QZSV3{q5tk{$75$wGRhG_T%E|XscHX>jup;lE)7u}A*TQ-?RU`oC*VNyg57{%Ve
zFpdV*1Cs>SLQV;a9tqMd24t9y2A$a>ATB_l#lp<aPT+%Mot*8ZvsZ<t)YW75$iieP
z2vM80GXa!d5GNuAadj;>BaA^Z&sv1b!jnnEv`I6WXRK+MbEg-tu7Ld}r`e5(R^!UX
zbnrteNO0a^-Q*#4W4xuYJPan-&6wO^UblI7UgZ-Jt{ic@#cSaZ8CwQLa*I!ba^(Ki
zec}F1y`Jl~Z-rzms1ngqGlGuM>k6*{n0nUOGRi1OH)AvfL>B^sacv>VPiPS!Q6=1B
zD2ofdoQ6>_4xJcHM_~+>YgUoE!2n5o3h06)te&u;6840WJQEB>p`Bz}k#K5IBZ&zI
zDe-U{#qc0iU3y12_(Gu$5P%4(ga^?JEw$kTd$Ir)GdM%-x~Pj7$7Y2rqZUB<0y$0E
zC1_GhER&n5xfs9_vLT0Hq|(B1w!otOgat;;4UlkyC`7I~i9j|)v8y~;Fx&!b7_T-Y
zi5S<i3(H&A)Rj``+JtM=0UgJ#LKs0v76ia0BKRX)1L1T!++PNfq-aU-SArkmt97$Z
zgcSJ7qNU#;R)I=v`0$@W89^_BT!vcKQHeMKyI2My<S0~XX0Zl+-bE-a?XC)RfsqBh
zaCsgCje1}hDCmeXg~+unM#T4+B@z5o7>#^OZ1cuCn;10J5J@+YZtwsrn@%|RAlV6r
z+kvOtyPyxk#Vhx;8|0}3k#-9V2L<8<PHzyF#P!0WAk19_T+Ev^1%e+Ki5M6n#H@@J
zG;+p-Z&KpW6+@|lLK|F;Ix~}*m59Y>ma~63LK!8`feefZ$^;Q#c@P-UfPB|#O{S24
znD}-WuAvGV&EXh@tl&Muv7?KPkTWMF0;rWm(8Yj6d>_nk<{bbCXIaQ#81NT;!C-LE
ziZvk98j<JFbON$i*+zr6Hd#f-+@WSATb+u>G6ShcMVdib#mjZbZlQwzlZrsE)DC;`
zBI!lz3M7v*0JziS$Yw8}cXxBIOWfKyo|m+-<sB(kvYQ){J<QF)Y`N@G(VR%ou6Z0n
zMduT@TrT3MoJaZdIV2!158d)Q913ke-O>~JgTL-?#m-j(#N1Ri#@@!a^TWjNnoDZy
z6!xS`Dt=yx!>CY+qSN_%t2>M7Q9E-}N_mDfdX1-CE46X4HYT-DQytzcwx90lrFL3=
zbxTK-Dup1fZf_N<rE^jR2UUuAl~gx36})$UgBN`+v2eaq9&h5CTPm9Ym(5NqZ(15D
zn?X(fv}inIGXTn)wpUNvJ3v}nBYN|;!lCVVv02E;VKX0gm<Z=tra7AB9FXMvd4!_V
z3E}ISBOdFZK@wl{q_au&?7#Ep;Bq5}Aj~DLH09OJb@L64Iy>c8w{%j{!oRqtkqoxt
zp9}3SxvO*b^e8f%9ghLQ;i~qL;BX=KwW=nxPfhjoQE<2+`{c!cljccVUPod4x610u
zsnZ<zZ!C4iDE`|>d`9u#M)BW9@!v-A-$wD@M)BYNyYS!KQM|l5AY7pZFp32?iUqd?
zSa73IaIR>K1pg+vgOSC61G#bwc^qOhbQ@&#-0(po2_z`T)R;SpCfG&Z%EpDwbf0u(
z^aw*fv=b0MjX|T%fI^j%V@w2$05rLn)kEc?$puuad?P)Xr0`4Sz;Zo3*#yL<;i>|@
zk;p#Y!kk+48Y@T@^OC_{E8JmaFv>2uWI!J=xC+GI;V1(J$ZKP9a<k-Fc|BwW0X$=d
z0-ix6Sc>IoVa$2>4P2Z`PudMQPcWJp*tb|@G}4b@04Pi+Hggdl9}fYLLAc>`7n=f+
zIj8~%?T@^z7)ZH24KzmS5djLJSGJMo@O%*SAOS&(tZWKeY<cQZfV2=W7RMs#q?PQ<
z7!3_AnE0S@Z#a=b=S4LyRsi3zUIvW$VJm}QdXmxhIG>CLsMf>sh(58Y5G9e~pT|G9
zH7{TECQJ2;^i*1Z5PJZQU8N`POBx{Zg_EMj!@YqtKPb&mz_7g~45vKdzVesD>k<ye
zP`xtF_YBS`$flsOIc>28kV;w^w5RedPYeWVv;a)M!bV3t8CeO_4~l51fJZen*<VVO
zA{7i1b@8OB7Pc5*LV?jS(FwUfLs5vpegj<Og%vhcMsXWCdO@rc03!52o7`XkG<s;u
zY`7@Bsi3d`$0%qtlSf{htL`h{0yjuy{sLi6CmsI6GQ^jQBbpu2i92&}lT+yiN4Pyv
zyO|@uymlv(?7v_lVugd*ST+(gqgjwYm9yIT$pB7pHckdYu4cNE*)GCc0W~(LQ3ceY
z+&?0&9KPdmiFq;9Zg|RF&MfpfQ&WY9vW;`K4Rqa7@J2p(NxgG4jWS^Y#79k%9Z?vC
zAIY*Li43RR0cjP^Rq13*m_ew!02u-i`IDu<>trMuFSAl+B-Y8;5_^%h__k~vbD^)P
z9PaE)dV#*qZE9?-Z)|N}RNuIub)id#VJPEfqD%VF%EBZZ3wjsj52U(@Ey*+R;8O}}
ztr*4)j77R-Q52p!lMxU*5*7hW#UtI&FhqDo>H%}HWNEAWxQiYkII39RVDB^NPAsTv
ztzTAmaC-ymOY{7?xo$ma#e=RlX3@bWOB2qwV$x;284=PGeWq~Tp^r1LaWXSS*{Xp8
z%0=OWZne`(+1Xli6=OBfk6IRD8|FMy4~82&+-Wim5r2h!tVT)TLxD7<;YKWNbKNFu
zK;8I-nq$Mi$k;|v8o9w%V?_kDUg+6GWFXdlIRt7*(RxfzF7Ya*Q4{YkpB1wD(SjX?
zWm#~`=@9n9NC9k7tZ~}8b?GKeS`KD{bLx20M7&Tn<~q6-hvk7Wlj9H&%MR_M$%+L`
zS`tyRFA696Wnp}}$}-8aRCm7>!@z)yedYGHu}$dJ0ZZ$f4{mR1ZEk2>kf%%fl-MZ&
zEfQ+2ceYnY9i+}kmL<x!lMZ{~AO@sE*Tb)Z!z*6{a4c!-00Z-~8)(?-#)LK)4Ot@3
zs}KR<h!T;BDRgp9rC{mQ6;4ONj$9`eaDhO)6#&h{W)O!l$YIuEv*j7(h9!mwlj@-R
z5J(!hU&hP<u9Pr!=BAgM+=hjWEazzhRDnj7RE=$qi|QOFvb25Up~LN480~X4a7LUJ
zHVN8r5Q>c{b7vVRz3H85n8%K?{OkjsNBm|e+rfDWqj~;ZV|rDHU3=lg@04srhE|FW
z&?3xyp${7PfHq6Wkl+}mO~xXcy&Tv>8?&IX)FQUuUb=JLvU=jNo*4J-=TU6YiDHw7
zXK72l+qxT0<_dGeK<KNepED1tOmqv_l>RV+)zaF&xW08^Q$8BZxi!4!+X<GokTE29
zPZ;pqfYpH&qT26WP~Qrn3>Vhd&4Yh|m0|yynaJRqnu{Z$x3kU;m*QAVHdHAt$6&*Y
z{AVYISdMp=3F69;S~p=7wLq)|kFioql7xUPZeAn1-^XKN3#?{!vV|^kjP*d8n@X8s
zjE_DvO<mH|oR4V1niZE#!Mx?2aBGuTWKnr@Q)|=QrbT%gfV-VA6o?O$C32QlKR{u#
zu$u<0G#RfEN{A86TrP_#ZYP`0XY%&9G|g{aR@a<wu4Vf<TjFfK64MzV;OPU&31emY
z%(UYuVpn?@1rGUxwySJ|v%}Y)+bO8DoL8v&LsClk##mWEPS-HiAu1)5$z46;=s3<@
zHZ>Ycyl?=RL&hQmBrI|&9**b^0r~}8+T*6!LX8Pm4~(^|@PHLREOshy33MfB)Fp(;
zb(wUC>JEd%P++~Qw$q41fNKnjA;T9?{`TDbL7le*)M0ZKSyKWRB+xWDuqqtI+|!Ud
z%xK<;;(`Vun>t2?lj+!zDhxuv-Mcnm1E3VI>5|GNL+m6;m{3U=TuCza#zwl6NeiJv
zv}TiBBaOlaT4-7<5a8_5UX(AS9!^$ReiMOj`VFh!%CP6!G-8Q(Vp?u;qOiM51O`=)
zYCa-vGCilLt`j7XLn5oAYD8QTya;b9q)tJP=p5K=-Jsl((7!S$d%DN)LV>cNa&+ew
z5k=T{uhU(&Cu`Bz=ipPoJPAk?e)S_f61O4H;kVu9uaI9(fsx%rq#~|lG%Y)#i$ZCq
zi?>)x12uC{O&q$ADQ?s42p0jf#l5qfL`;zfZ;P2JBjuP^&>jp8A&XHwstP)S<+;Xe
z;nz1IKTDfPjb$4K*b!nACP=%HH;XcU<}_Pu&>@;9Thx$E+Mce#X7X)K!x_+n_NpB4
z@Ss=UAh!rbE#K7rv4uNB(BJ=c>s)CNiiWwB(?$(*|9|-8+W)e}RX((JfR*pGDO2*;
z|Ki7C|63iJHnqr@GPKQb|NM{J|GLjV|2jl<Z2J69sjjXZo&S;e6r6tn?UM~}Q5^%s
zf3KQ4r8+16d*zf-`~Q*nlnvp>!%lBua*p<7{Xq{s-8XF#x-W7PYFQyGQC$hF#I*8?
zDdnMRBUD{8Wok{Rl5w3qjKN1f!ZW0;^u&{(hiYFCAlsZ;`IW!nCW!0>$cq>!?X^QC
zczL>bDmO_yCEkKfOYVDkD)V<*S_1Y<yoj0|*)HuB{uVDmKbX!0=-L-BVi>|MU=Re_
zsuWyoS=K?M;^lR*J9B`?YzqKa+!;$m@e9b2()bONWRm<EUMqNK%F2IeCE!m{3j9zd
z!7p2BVm81do0S|(2H_ijnj!yMmKwAcy)Y$&h9RHhFM25k59}RkjieQXZ~UQUnlvt4
zJ`$t{Y%SOWe8_2Htf}9V8;=E|j`%$u_9F|%H9R>>$`^Wru&@Jbe^awOku!@1MeQ~y
z-&&e*h?NmBJ6HpG;+#aedEJWT_nle|s<OxG^3&BZMiE}|iE&J=;iXw1uYUU*5><Oq
zy(Gn=>@AdxbItnS5!SBSdxzkvSc;7(71uNftHG5nUF>pQV)?xRRS^aJF;QygDP{w>
zh-;4sGPpROhy**7_pR4}8Oi&)fW4GgQ}}r|zXn)&K7XP7D-u`$>#_8UK`j=C?QrI_
ziQSav5j2rz1h%5#qrdD)z<?UqUv|Bn1$DuL3_O^a=&({V=x=Th`3)O~7iL9Uh;muE
zEH=k7)N%Q0jVX+nPclLkmDN0%{k2P`+~Nost`<wlDNMX{ruS(6;IL@Jam)00+UGVc
zIk>rD!NOMd%sV%k>QBQ}*znEu!#Pw{2KQQno1ZQr-zu-CeO^83$r_p(F&~|CXhfVz
zCgZ5>lE7lo{zSMZ7D0Q`6oQ_@_UZ{IVkxjHrch_lXf%36l>lrhb^x>=Sl`@YuVYHE
zA{g=t3Pb)0N@V02+QX66AS8A?xG|pJXy+*8K`o9b0l5jujL@0R9;Szj;)b;Kyn(fb
zo7{5vMoJfIyNm`tb`FMaN|u|2%dvBEiRU>Php=Pv*eDo-ydZ_bxZT0h^3q^XrU!B|
zOfw)YCwNme0y$h`qrgObg@?jMtQASs0#w&(KZb3MCTs&F13`0%s0h5QVHz%NUZkx@
z2(9Z}ix6~GO9GH(Myn2Frw4uY33F`!aLtHYsBBL$<99eqi;umBg4ooWUE}o=UsGJn
zxpnA+RqOS#C$UcI3{Ox@?|>rD_6FVXDt)}NVwm6JVh*tDE|Z651cOv0%VNTrG*A{B
zT8vNP!C;TDYG5^>?qS(unqHDrrP2;aO+G4$oeRVk6vdu3$Zv(z>q1dyTrv(}_Z-&p
z^5Age4TpYYm!v@n3@Tci4o@s;ZG3^r<HO`*35hlLt0CiTqrM;GX0MsMX?fHVd^h}i
z(#Eg{s9LsE`Q;97bK)X^JC!}rZX}>Y!w0sDNO7S%fvSS<E9$Q6J>@V*gqVCc7PjRx
z!JrqeEtSK$&E|_iD`jh-l;e-b5Hwg4(T*_M(8l{ELL1v9sMUc}#t+2^Z5=lvggYtA
zi5Z=~Q!(^)0f=Hf;I2`Mmw-}X=Zn8AEE>_U!H>+|D%lpXFfELPfG~gUO-oysENum6
z8u*RH(B0L*xIyTc7**?&a0)qY04orU$TCs3GyFPxly@`G78<VgOz_mXE7;on^(%Cm
zo3v(eg?zcowV4DmUGZcGyH^Q!9JD-&C4?A|+x6>YDFGnel&%giX3>Ms2{#BQhsAvn
zNw^aoKDGgh7v1ow=CQ$p#n;Y;74aBRf~LPWqDf*Fa0#?8Sl-n}f)j}}C^-mx$rei@
z7KaI@d6rK_df+74hp48{s|W&{(=IlrrLbcQ540DHAT|X54%__K3#U~PXC8KTL#GDU
z2_X)$AOvI$EVcA-V&vB;LgOU3&Aoo?DRXV&5wry)qZJflH;|0b`jJLuHlBlgZ7{Ml
z&mvJl^)iNQ)!E@wF-D&tDy&r~wne#g5HLR=iJlH!4`E~^i^@rc6wA#GCkW=1=IF2z
zt2D@F41IBfD-tCZqYk1#tjwRoibCnW;Upkp0m<niq*`)!NF)hjlvWMi;_|I76*&yI
zhAkhiJt2|AG77A_ugaRkb2Jvm7zGG#3#LS6WyNj~zD81d7txe=fa9x~02frf>V^!5
zyXL<O!UQ{u8oo^+pqA|mTaGq5Ht-gM>lXX4J|&2?5c{Q5?iOgRTXD8>*vL|boC1-V
z$R@xP6)ywu3=V-BM3{xWz>9F(yhFW3=;}_Pn?-yJF9x{qYSBbo;#ufNE%`GyO8;iP
zFbbNYqMZmE>h5G*3ve-{Q?F)T!*lc{c)N==NiIDbkwL|AfP<cG39pFs;^hm%HmZwJ
zObpI0==;Q0&=KGk0f4|#3LV^n;SUe}iQ^n`Az-%+x+aSsrg7(&T@l8e3xmm}7CYV(
zgXjx*k->on+RQJ*VHvj<={F^cCL_ca``G(ZUHn?AMOc#H`YH+?m7yZai(36dMeK)g
z%#^H=<M7&Or6xcG(xk#K4JTE?iA04JDhN0)r^U+(I|H5xbR-){xLoL({MMOJ3^07>
zO93VV!r5!_YGRp@7PQMFRkG(k;X=wIo`%&53afjvpN5GL?eIQbtT|c`^h+vc=4_7K
zK^wx^luK;D;CS-z(?Uk7#aKLmsz4mo-O@6_@R7z}m7<cdF+wGCcMY7yKJTP3UTfHI
zc@h`nO&k&qCyTmCE8QLqE=VMg9$9KdOX!a!4sqRo_u5U_dOA|;wO|y$EnTs$1a<h<
z8igeUE(E;Ng|DS8A{D}&BH)tk)~~M!;!6t(;>okUfZ|3;_E=ql)3u3;os#=lLPX1A
z*U#aaa;f$(eAFnZ<6#X_(RgSt+QM{o$Uqy>q&5Z~o9YMDJ6?}d_cLhK4+>jI*~Au+
zXkjQ2@}mf_T*`v@$cerLgJOu;H>%Bf6VFMCK=gTX4*&8LswkXtZm4hftPl%WTVvP(
z=dwfu4m}a~A1%0kWg?#dXR0M2V(*u^G&TJk1zQQohO)&W+gz)f&+ZS@Y+N>wr3Mxb
zu9#zLjneW`wFc3A1-0oothCq!b;F+dyd_pmc{%%2Vu5rAvhkYWyTiyybF22|e+{n8
zR1yS_87?6ZV%6cy4isZ1Jm8`VYfCDRZc)~O<rYke=e0;RgxywmGDmzKL6F)5?E%)#
z05+gj>aTHGc@Omk%ly9Oht`y@SkX4gKf$ZXC3qe&RnR#KT&)Zdab)rIL}fxLx1h{(
z9H2N3PJxVw;;m6uA8Pm`hz+2Xh1-x@ImoU8#v74RpCa1Mwgo-Kc8e|j7lH}cmZ<~h
z#w+X_LFS|9wAn8@DzKM0uW9bm#Q-(c+|<<SWpvesX6xJ~3O2#3Suv_AU^>JPF_mh@
zwT8%v?{#mMgx>MW0TL;Di6F3E_evBV`UZ*!dFbfphOHI7y#8Ww$mCRR>!vuF@|IU1
zv%MBLYmtnB<`ck504WC#URsZMmO4!{bw~{_o~wv=Aqi#D%22>SG^;xbR3V7u=TPfw
zfP+BZilZ?r5>7{j@F|=kT+CFEzi8*M0qx*~hB-L%*p6&=&XDPVWnNo)j+d4<2Z60o
z9!(r3zKZ9X#76stZ*dH3aVX*UYCg(t;S?Qh&;gdbg16ErNej>bi!k?WL9;D+1tQ72
zh;464H(Cx@(+|aflf1Bo=F3QyQ)?WxS|eO|y7QOAAT1cQoX3rz30qTn`6wWo8Pwgk
z(A8JJ`Dz#6VL6fOqEV^SvkksBYVC54bH)xW{mW2op%Uf2dZ5w0yo|E><E8<qmsuGj
zv^GtNJcM19GwBTMM$@9Y7{FGtkr$JP>Rx*qzpnTX7~c7|jUZjwg+sL0W|)>+VQERQ
zG+>0JiJD`~YxylBH>1$_yXL^DaW>r9E$AwCMk=uZU5Jm2>W6#_M(mDlyxd-e&~Oin
zG{30>t{+4b#QfRKj5$%@KHs#gb1ojajATwqr{n}BB2*>936aunxE3ipvK))l#yG?R
zpaol%QQV@qg?LMXj9Cn}O}250&KZ-d1Il1MDJ}K44a<D#N?)219Q!;b;x6Q86Q+vP
ztvvK64+W|a&Lk}wy8bx?_KrEy>3^Q-WYg8EX~4xxj-(4qS!qx-0!g|mFWnB&_D9XM
zyju*DF3mE$wlH%xD-JuvhElzE^rHwA5e}s$ng?|yi!~*YR7Q(JRo%sr9b`Gm0sz;J
z72~$40%V+x9yp5d>?HA2C>3If=&MZZ^5Ij)*?hZvoyw%FQ`nSsa+|VFJ2|$Qd?@Fz
zPN(^pv;}EMAR+`7S|g3cjKf5UrDQh-HX`7e)j3?Y#OgN6aX9r*gM(T&Z2gP5*OrB{
z_#5Hb<9z03PoDDA8?L$2D6XX)+MIAE>?T<@zRbpyNw_38M!223oNB|6Tp18{F13by
z9kBT`()c7-I>e%s%|0GtoatR|54DR4a>+WVKI1*p2w?+|j)bJ25w{Oa+^!O{+lOcM
zkS}@0Pus?x##2Bg8sW|iHP4MZcFscD?21_|{Sd2~ZM?88obqNZZtk>e_#6Yw80j1%
z*P&eLb8VCFwpQgO3QmR?>(1UeO$-H$vJhEzI^HdhwfPDzKD^Tna_vFdFMH`JtB9}4
z+S8+QZ`snbkMD4=ye56-aTMpmf`I=8?*<Jjvn>u3Rj38h2Yeqokh;@ZG;Y(EuCt5U
z%C*08U%1Vt1>75H5=$*|Sa+*94GB?@;pR?TJg_rwaUmC7kpJ1EO?jNGjjP|g;|O*0
zNrs~N&DF}eq>`-3K2rRd%ek<6ShyiBkJKbo!?d*kjSOc{ldI8%h+Y44#2;QjGzds5
zN56ZT6iXrulc;17!%mA1<jbV{`6V0->kNS_gDC+3gymEWgxvXluzYp^XYfdQAZ6!{
z^K;{77&VVNv}Up0o*!hu-lP@eL=PpaUT8`@)<HiwAO!s&pbhqQwQ|j83w@<2a3ffA
z7X$^yCR-Q^Sc1L;jMYlDfu7(}-{hi#fdrc71Pf<B`8sqR7)_BviTyMpI3NJh3T3j3
z6j%?bx-+`on{9TlK;!p9B0**$YEnCi^y8gYkOxtM2flpsgz365iKh0@+61H#nk4yq
zRSxVuN<=&=B(rPgB@^jdx47Z*%eJOz@!M8O(#q2S+~|I_ma-{WK7!im1IorPnT~bg
zJyMS9z(XPiRE!5Zxp<e*BAL~|Wf$^HPOcp9!VGiDJskKyh4G){KHZ`^3gbUjR903w
z@xP|AZ=?86Bk?JdkWCRi1gUh^BfuuP4iK<uIzc~%D$7GvMyRSLR9RECj}5O0FP=RD
z>LQ7P777H3=K$_U5L$U5-V+=*PQe_bQEH!+l`UWH;m1HOm#DTLJGv<mITpymQTPQG
zzHM#TvN`As>F6)m{v)B_u@5be;{Xyd5k2<bfDpvL;-2@GXL?fQUOx#kOpeE`Qy?iu
zSJE)E7c_F57@%Z1VVY4(v_;$+I8JuEnSkRWDw!~K!Qn2g_?~CRfdR87M`qi_TXM&_
zRRH7>*D5%APD(5_?76o`M+Q!CIWNT+1})mK7*=JQ&FbdQ1fL<&aKk)|SS}MOgFP&K
z9$!9SQj1QcGGdk%J+ahKfiH6>3=d@;Ko~-Rs^C7hxCmUur4<h4ky$UANYQIyJC!F7
zTlQ=#mT~knwFTq?NTu4@OMXZ*=4LrtZslH3v3Sd~R=OOM=_EYE7)-DSS}jn?B<~_P
znn7(WSv~5<Wh0i030C$1ZM4`}N@>1Ch+F*Hz}^Id-tyV7GiRX8TD_J>oqrVIb%Z_x
zoc|bgc1sz60nY!a71h(6=l|4D#pwAz5}zTwZ;}v>mW)C1j{7~X_>XE?AwMyV<3CoH
zho%DlV@0T@YB=#9^PxKGXlIO45d<BVhH!90iFk-Q*4jMShjv`Vm<0WCg(ftuNEmF-
zvkCg9PBdw5%u_fXiwpu$h=cMIpny9BR={upACM4<n*xR6KtK$NNY#E%uHcF+$HCVC
z#)yn$$WjjsZH_^=cswe_Z?6VA=rD7gVU$?4=)Y_)4cQkhy%%iqq{z$JCNhBZk^3`B
zLIS*<mS|cs!|j05_?<9mWUIJ~KJ}V2Yhe|jCQRwQevdE<<Tq?eUrQ;2LBm@MW`=wX
z_$ZzNOU>H?YlVMf%{Xc`HH|+CnyXSV=>v`-MI<N%;tzVqm(&G}l4w~;M_I|iM#;jO
zlEpP8EyjYy5F*M^3IQ?7_VF*QX=3^qJ54D;2&(#3FbACJT2-Wo9w1LNiP-rn7d;p-
zpJjs7L(4}GARk{6l#4HjA*Con6&@DLB#CZ|P+dUTHjur8XdYxzF$$zNksi<j;?ra;
z?%a*>)TBQM<0s+H*5ZP%F_1+YwQFFsJ{t;CZYHrX9f)7zvF<QpQ=R7DbsSF3J_5K?
z-Lv?=qEne5m(s=ct##}Q(Pf`S#{_~G*nidZ;hih*6ykZpRV%*InLTEPE$mDtRR$++
zZ>>JH!i2Nd%c%LR(tu&JwZ<qt1*U$u=H4w3cJAP9(j*lGISX4>G7>{$7R?5VGTW@b
zXw3bNlf=q3CB|T2bDNs>Z>UEIB0LCHYVQm@aKr;Rf@auL0Q2JGKf!*?nlyv`4`zTf
zynX^q;9$%YH`ih}IE)`FE|?jBKvq?$qYgY5urlH1V6?aMsny&ZWYxSRje_$rV+X9@
zeZ-MDJgZ@z34Z66MgiE>pKSsHa24T%fJS&%ty<;X!hO71TQZ7G6gyJeiuqXxC;w1u
zgghASlox`1(aIVw(evo%EAT0J|Bt7(SoRN}!uS7BMRoO5$Nhiml&PcfA4cRe)Fe|f
zHAbu1lY%JX8t_Ll?H&+<))~qILX{&d3~&vqzz*C_GtnDBZ3W%q13)3+VQz4RLaD{g
z6Qd#IND;t@zt%NkLLrF)`z}n_l8FeU5_T^lJc4|#1xwH@kF+=o@**D$2K_^Sg6g(M
z(WGHRix)u`7^lEmgRG+$h31innc{3%5@Ttm(p;6%88hQ-y&N{-Xk#X<H1%qharA^z
zIVv(>16N;o9C!|?m>I#7m=s@8VHHg6qpE%2`pHjgzddH0?s3l#dHq>TVE)K6oI_ng
zOc06`%k=@d<#p!dCF^DPoSGAKtx*<o^?-J<tq0?P0zKC{uC*{nu7g;Z0V77%RhD#1
z5f6dkU~M8-7qr(Rv5w&8EJHW|_L&@=46sNKD>(u{eA2*eWiw>y-WLV~DT>M6VFFu-
z*N1d6P8E0YYQ4VYD^{#XtSD^*{7dhO6(u1rsq$F@D-+9r?xl1^x)d0>(iNqXOW9Y7
z>z*+VQ`@%`?9UnV!xm2@!#F)hEi2MgdRjBI7Xm7y#PXGvSf&0M1~5^y#@W^#E*`Zt
z9ZpzrVG^AYM3?P1F~e@l6)i$U&it!Jq=?FbhOqI9HpngrAXRM#3lCO({3jd@SBaxb
zCSZh%+3f6KZ%abP>{;k#YD+tFd`VeJ*@Ov@W5NXZK1=12d2l7#^Ocl9mXZ>;<kCEa
zo9b{0Y9@>{I7GK3`pNcDHlYn9ZZ5Wo53@==#cc0^w;Ll-WVpw@c~Wfmq=0&-+0g=y
zJ?saMNQ74;YTs;MN#7*@a$`lNZIZ8cwjY~28=8wX`w5&BgqJZ=#u*)HGrW>^oiLU3
zA>1Tercfy6gJ3~y+w$zx1}>CEKTq`l75998V2>f#9^3S6;mttA4UQ%k;~Oa^Lu8AC
zpxC_~GyvEHftAXd!iE8<NG&HLILPV*n2q46w&L_XSz@ufr?w$sJpF{0%BsM!*sALZ
z<KW~k2R5~qRROIQi`nl?8I#$Kik{{jWxt{vbXfaP2s>Q&Smk!1-$5OC<Mwl?pjWK)
zB*4Q%00T*144cSE23LY(LLK^@!{fi&idgk<J^|*QxNB>M1{^1voi^O?r7C!kG*8io
zAY#l(Cc!QY6#uB8hg-i}iAboFoj?|`;A~@{$B+VFQX7jh^sbTiSX5A1EKYVVk#M9N
zWJ{b=f?v|@dT6Vc2NQ<K5$6(ywGZ0>$8pT(0j_CdQ>(<R%}B6R-F61kF11J|gN=t3
z$qTm$QaOW^gQ%q)kPuv25@y@XcV`nT2bSPKDkKgRzY8q|Q`t0Q)kIUAPNT9M)icoo
z?3^BZ1?Ef!I}WHe`E!6zaUhmcLNdRwL!NdL$(QLBp92QE>g=Vk%J!=47^>WMp8XRr
zs{B-}t#<Ne67>$#4%Ze|A}SV)W0gU~aXZu?*!F0H&28;1$6^$q_W((uJ4--`XwoC3
zaPfX#fo6TYS?B^z3?<PCy)d|TI>drnwHT>9o5;Im)T+usGz&mE#33V6Mn*!wx*;sM
zVj1LvGO*H-!bk=H2BD@>4hN?Y%3jxojG*>KnjPY$`<4cSISAVAaPLNrfejnyPul6`
z&adhcI<VN%ABfSwb&VDJ{(l#L7L@-Xpvsm@01M0iDl03e<=Fp(Sn^T%-w1q$nmBXF
zOFM!zdGt!FMl*#tF2ETjdvteAw0uQ6B(oC~Fx$i!$^>Ir#S+Ai18p;mI!311$&2JO
zX4SA%#lpUaVy&_V4xB&6?XZVAXhH0mfC~zz03@hA5|06DPY27t5|P%EL5{-%X>(wM
z^56wQS_fbdFP}8t-iU@@j5@od1+N(`azY8|MM*3n_rmCPp5i3V5ESShUQxbtjpRsg
zIoJ>lEIwN8D&G}!<jaxpI?TObirI}k7WWQh2<8y;iV(U<iszz2*it;xT)FT78AOcR
zo)kw1W6O*G5TSX^Od?mf%b(_oc3q9s9FctEW@7MWYkA`L#$|loo>&4gs50F__LV=3
zWynQe+Of$I5As(zahB~9fcD!ue*-MG2IJHN91h4)%Ao^gxP8f+kjm|Vzz{%b$g<4f
zF#qx~=Y2VtFRWf*KrpybDHL0ZF^;qX9U$pgCMz%pLLTRlFywQilj=>e<pc%`fc+KG
z69Wl3`PvY<foWn4ViGASzC(vlNJ(6u7!ffR0O%e!J2Un&5)zc2K<fL=jP&!Bjdu_&
z%#MsAQnyme&<PjJnO#C`39CmtofO6J$LJ-SHhVY+tPi_fH}<w8ji%>OGY%2dWE^Bp
zzU5GhnMa2Yd@0$=91BJ~E&K{LK><@b7Y_QW=#<$2Ll-S7o(uY+EW_v53?SMA+FF&!
zJ^Hu@46jI1f(8^5yqZCT;Vmok27|H?n>##5Y~^kYj#~zu793a8Z9}1|#icJOLln7v
z-O)6pR(%q0YRT4s0uu97j9>RHKeQxLV%4-w_SckHliAM|3HH4-pn@P_uY1FBvPcvN
zdjg<{;F;kKuW30vfqN&*LRN{|`0zA#zh{2U(MABTWdMDYcOVR&+ks7zmZ1>~4l?=L
z290_kF+9*G6h`JF7^%SKS>ixJ5<yLYJqQ|@vjOk)l1>r!4P3;*sx@i!fMY*4+|p2k
z{9uG8n#{qfa=pDF-Vn<ur&wOA>YEmVu5LwoMFRf!!p@pGw|UmgMe}Ege<j!v%{T{o
zl=?nH4@%DF)UPGv--1E*+z@ceiUjyr^(aD>sA#NuWZ&d0OUKDPYg7o6QB*C46{85L
ztQesy2SSBtfmjQ8gZClqdD23(A$i;P6LA3BAV%M$(oW8~3uVAEDd3rpw^?l`t&n!s
z4;UuC>?Nb8CGob&jNwd1?Lsz?&Vr=TFe*G8Z`no#n=ja`RxR6}wO*h+UVWEB`DnYv
zhLx3q)h&m=YAf;&-;vTlo10FP(|_SpJ?OPTuzFV{7RM;DOXvB>Xg1d())BNVNYW1a
zE@sP>F6e@fuu+;eyRz|cx|Gj7$|mR>D71TIA!_>wJ2$l<1lf)Q3NGJS8Z|GtZ$xPn
zMLXY~(QB}89^InO4vjI$sacU&nvh@_IxWJ;_PJ;i?xPDcVH;WpbK}!kD!<Es!)tnL
zL*N8ujy(Qy*(J&$s5Cvs<4(x8*b^Zv<s3P8q9ksNI1E0LI(y@j?3P~*ClAJ!r$IrS
za|pqPgGMV|t`I1WGc^@MuxzA?(Tej!)l_d{omzd9A;~No=PNXQHh#|D;~a36#hlT_
zaif?=B~fD~4|-&-ikM~;Y+t+8G$SYifvxDZm(#t|&;^ZL^9GM<L>x`(i#~AnPARDV
zLG2SP+cM3S2DlhxSfeWZYWvVakrm{{nAx%&l`}lH_<e3jNXZ^hLhxuFe0!DRUN1HB
z>>?s4xQWQ!R*w)UA%+d@geohO@@j2=QD%7#2|9HY-#Ug?L5{_@p`_-us`fm|_-#yn
zUG3pY+*Chc3B|bA5kKZR+=+qvACEZprx!0-bWfLOFKFVS4z@zzpaey?+fl1dP|n9K
zXQ|tWj}hk|9YeOmhzPDWS3+Rs#(MH3PM%XkMx=|Qyhfs_Q6$-uXNd)nd4yEC(a-eD
zYk)g3rOi$=Z6+ez4I-n1!m~oqz>AeFI8CJiMZEZ^F!q}dvC`1PomL_@VUjIX9S)Nr
zb1hkQ<HP`K3x&vFUZ@{XP8cKyF_tffjBRZg)VSN!IW?2mH#3Uu6*vR=ISA40hEB=x
z#ps#<cM*PM`C>sc7!XGo)KiMgMXUpqmwjO#o|0OQ{9yhH{kf+UfF2SSlp*}cRj=e3
z3ZP;@_cA6LR>U$vqai^SQ-Ht>5;-<7IGAi?y2I+Cg0c^OTe0$QW31e_((LEm_S>Pp
zi4m5saTNSPqbX(Edln4>YM$ieQ%^*oXBZ3UOgL^Ob7nfmLE*7GVaX-q^;lmimNs#!
z3LY2KK79dgSZt#pFMD#3-7ZOs5l;zeGf_nXOCON$(4okYu%n=+SeNz$+_(;URfzA9
zZP{GDgBow~;D`l;Z%93INegSICat3Ho?>14B%A2O4AXxJSr-0a`IU4;lcD%vsGX)$
zx&{;P@-&s)smxNWkCIS0@47zCWJ;v6+f5atU{amT9;&#D4;%S^3MybJ09r{TiN4`3
z(t}Y^%hXxRk3ie)P+bn~mD*{7ER1vZf@ziURDnxVT&{l9YX>SF1Gacs#o{EF%);P#
z1!cx13dy-B`2;&ho#P^J$KVk`KmxXWIqbQ%HVP_%)`^q{Q(};jfT8)0<uXYPGW<MN
zBeYYRhYvg^WfkrNA=X44lT9|NeQK5Gn0KyCuOnpuP7O}Myh4qma^os@`Dna8QTK4d
zp-Y3@cII8W6y@X=(pg((Db3b0Qq?Gig@!A|oh^8(ZOiMqwX7oeDy|^5W9=n4X)u^n
zqxrL?Vc5e@R5v)E>C=UlcX%_9$?1uZH46oX9Rfw(kC2|tWEV1<kquC0x{mP843rIy
z37IEgR2~|t@&l6!Ux1wN6PjKrZY!Kjs_$in4Hy@$xCvUubShx$h00Nzy`0lQ^i+Q)
zuPTm&s>`+`MH?Sq>52+n66B`_sc`d7WoOO=sMgB`#anGhid65_rA<6`-b!;|C~c{R
zF)-Q^6hQ*1z@^WF)F|eb_}WM$nHJ#)fEg553S>&WoUsvDp<D{AD;4bO24D01xnRBM
z7gFguEi8J>va-ND5fdb0M!Q}S_`YU4*f*HENoy>w?RYj)ZgHE)4NN^u7UN27@1y{T
z5{uK1JQ*4c<B0)Q+;oZ@25(BWU>5WqHkD3Ov?F%lLDYFTz6OQb*G_<lp8J8(sZhKf
zW|?I;w*zowU?H*0>@Zr;&6jb%@z_e!XlQ8h8(e)&1RK<7Iql+l0mji5=i|i&<RgXg
zbF1yDX|D!^I{VL2D??zbu>~d822Vn<jZ~-0Nvb1zPGTOv&Xnp=qX*bl`mU0wmh_Ah
zqZ~SfEV7m)qan2Wyh{^eV=OkKv9Qq!+tqK_;yrS&WmyDx(3X_-_4SpM!Pu3QWkJja
zEK1ZX<w|Y=nTW=#DF_&9ArrmMTcMpJFF}@ERhDyK$zQJFC^*Ad>GD-QaW5{}LWwYX
zu&Pr+G0VCFhO>iyr{sBQ!pf%DB_(4U@EU{NRJ0oX!wZS|KlLeS|ECN$w#W!@ApFm1
zl~s28zsibG^(g+=h<t|heCCQC#6Tf(PAsFa#g24`Q4*KO4cNBa&{k~9m*NaeZj25K
zD&1}>znzrnVpyUK&W6FkcCNHycUZ8e2R#weZ8ee7JQcJ;=-`z>R&tygoFT-eRgS8M
z1j-5F_r)%Rx<|(l4vD%Sic1`8xnD=P2L6DwusQL;S;I;DBX4o+iJW=%1yaE2FT-vb
zaCkXIQN{3FM>L^Y;n<BMPJhVHUD{%~etF{hX!a4G<`ZcVk&Hdf%@Iu&!=;joY&$Th
zfQ4Rc9APdIRUPL(y0T4W)WylvCaGe?zy!5=R){xEd08v48<ew*=Oi8i28rkJ8#BfD
z5$gc&SYF$6%vvmmiYnGeN(!xz9Y)-lco;zQxpU=VytY!{0bzX5T9-29?{!FaoEl$D
z<8ALQdxkIhF!O)Fi%;~>W2=PHQ!@1R%dONGL(bpNF8AbOnZJoXQyVr>p&xt;H3cLq
zkMQ$0mnSNC{xb%SBxJ*S{!f_}nwES1PaQq~N8&T2#23NS(n6@pV>*{%Jh#4NdZk4e
zb|@96NC+ZEYotFS0wah=$}1p=#&TJ<7`dgd6^oiOmaC0}ur1gx1zS{jaFgk`umGpK
zr^{2D<+jr>Td*U^v<t)sf2v!7D=DcEvx7C;kh2_eilsVH=OWkx?y3f`FQx^Nf4MAO
zqM2)$SD@FDoP>xMY>V=i8{Z9Xpt@IG3<dOIE*T>DF$Ijlj(Wc>f@IpvpF7QN`>R|s
z58((p<k&cX(QHr3@UgGtpdK)gsZ6DnPn%_?+7o~(lL{E^h^`h`fw5WXKlUBP5k7SH
zPek#y?n8`P>;rKPgjwtL&Y<G36odVuuU=_E28E<Z$&X{Ay~PRhd5=;k2mlGr(gcGs
zj^+Uf?x4(#$1FUdSDO8nNDSZ68l;1}R)d9NK$xS`4{l`*KMaYjK!y%z1qJj2bk4$Z
z0|(Aetd~ee|DqqhD8S$$q*zvgZJ<Z(m3)R2TtHic!eN8w5_&9nw>;Cfoc#+nAB2&w
ziNJ;Rf1+PDW|lEU4lcgH(G?TH{uT3J*oL~D$4HT+jlIkusy(h=HgfDmgby++UKTBT
z-rgB#w*u|Gk^<p)(GawE`tTiJAXH_Fd-iHQVb!qgI3hGxD%PJNLqVZ(RBKx}3v@Qa
zT8H+{a^_Gahh`Bu^T(}_*gy82;3t-<6QY*m57r7X_-L|Qj1AFZ6;O0RI8oGK%Mq2x
zGq(1cs{n{UmT@#!TWG9S-cWs{9m6K}$a1f0HD5mb4dV6tRd-qcu`>nw+@27AsrlD}
z*i-t3%cRA;@wdxijL1tolNJkws*&buB^IS30)hQRYiAxB*wJ!KI;f^|(ie6%3D*zz
zTo31O6D1p5qbThb4k)KYG@fwa+K7UmR!Dn5EE2Jt^)x&nTTWj}j>yvyA~l=4INX+H
z+VtCK_iC@g8Ob@%$(|VANPWM&9{1)wodj`ZX-GHeN?M(xa0KgquMh&uOhjKCnS|$@
zFE>43M1#*j>K-YlR_Cu<|2V;SYr0;Af4DS^GJ=X&ptXu)0M|ym1*#{T%>NH?|09NN
zSmQs0s;j3|<-~ue8jb%nBA+2$tVm1<sgIk}NI`ET4tP)`8YONVEs`7og4}L&atY#n
zt}-MqbQRS`MRiTp)Ef3|xG!|^PBIuHe_{5^tD+{zjhPcLioeR|P%Q3)?F$GxlB~(W
zcx_<c;=$(~&^g!+LOEEMU<E?yyqVg3lG`14lfq9E1bJ|&?co72#1r-v9t!u_B&#qT
zPVm2$i4m#D-xyxuH+YlmvHgIAV$7vEUI5}Lv1BV%h(rBl94%zh^aT^;it<GauwfA7
zOSC2o#Hyl2iqKE#WHQ6!J^{lkhQ7y4a?gEZk}<Uc<iPA}Pb>kQlKueQW@M#h#NeVE
z>x`M{Qj4z#*C@%5x;+M(+NeS)^GV%rj19c^(30rn3G7}eq>pxsc0vOSYgWP?VYu6a
znXj7|fK?_4hiGIZoY5$PE1;z%Q9*evZoQGlkG9@utXO#oMxtQ{x)@@%yQ2Q#u@+K@
z;+r}OL)eZS@bH*!FK3&6zX+(R+^hI=JqETJPP1H=?nuDRyv2~ZPE3M3ZTW4uLPRlq
zA}0h3^AgApcfsnGzBwFBh|Kc@FO=3C+Qe+r{nY6tBUNW0{8yX9w&oghUOD^0GUI5e
z#RW9T@J$z=VOmP|=39=1<LJi7t}AGea(s+MNjD-!2`!R|kg&<62#v}uF~xd?8ZSK;
zF3@7qVImxvGe2Y%2ZWDNZK6_Y3dH@04@Yd6i~%uVEO*Uu&IlWFwmrCL(~dNVh=}ut
zSs`kfnOIa-PsXkMvW7P|{OulAolgVZ1&7g=auER2k!ctD>1@GSp`oRTiNJCpoKp;i
zPv9W~;z?wvY<U|TF9YP4B0T5OK?1EUdn}!GSkvG8|4l#vQ4x{05Rp<+si_F)8w3^U
z7#$J=i2(y9ARQCw9F62?MvT$j-J@%RksC0!efj*Z-yi2X|Guv4oY%SUbD#V9c<OZD
zu6InZ44>1ZziUN%H+}J%^S>&t&cXHFNDt@dxu7YBN=M`0&0j8U_@C!XdBpMGiTeY}
zy)n>cs;L-cuX34N;v4&|moJ;dw@N*B+~#CeyH5%lyNv)#t5FJt+HGQo_X-OGVJWBL
z7$fwfpH1NMu8C4YpvC><s8^*7p-=9{`Z@>MRzA6xr7xrVz}9s0QeVi^=llELmR3gI
zG>04888vI1xK>&quQoMw6~5)3xZ0ZZUQgV@1n74SqbFc+CE$v0p8w>}arS6lggkRH
ze=&P@ov&+Piq(0~)Z37y+U&0`%E9cq&lcF4b8Dr1rmD+lLpmWpMsMEKfhcJR{nFwy
zzWbKkyoi)!fB9QzOdVk4pFj&#0+2<0q?WSkfEG&b3{^wur0u)!H`f<Ke$2szCT~lQ
zSUhl2`1%2D$~_a`<g-Zo#JsmxyU1GMms?~L`gOx!SCL-tpzd3YVjV-4s!F8$%CYOp
zd_BJz^V}8RecF1jZa-{(Rv^#q`C0mXOYm0wy&qu{SA1$|=m5JzbOEiAepW_`gYC7w
zA+>#%f6o=B)*bY;_+D;s9@b#z(s-0tC%)GAlpT;|^es5K*-Fg#duYjw!#ls5U2#of
zyl<Kw_9~zQZC<mlS4m9>mC#nvgs9Bv7#j=7ouQ0h3*JjIR&6$J>(HH=-;AyB{2gQ>
zB@^xCbnq7UN@baPYtrZMqp^KiUf|V7_jYs>KX*C>J<L&kJGCpzO3%ory=L0`^WBhc
zoHDyn9m*o*nwz1hxaoCfW!_6~=}K=582YF+N3VHN-XT~<Z^s_63cGE~>esZ#C{Ev1
z<0E<dY&Iqa|JKmb>Ztu<w#e@Q6dakU)bzPfp9?G2fA7)=<y>N;PA8kIMA=KFGtoIs
zfH(v73u0I<=h%|ld&Ki^c;q`yT;qy%(jA>Dc;ssvG|e|xn{_vKDoXWv#rRm)aJpod
zz-8FFWO&fsk(kf(AC}Z!61b-2vj6c2YB`b#wJ^Bsn|qivz6|9q9vAUa5q(WDLAc);
zU@2R?Zy!^btGV6*MR1N&BigJ!);!H(QW3j%S0NG9(tmv(^8o*iTVjiT?rNN*$lpI)
zZaMJk-7i};gYl+qpL!|{ZUZ9&lc>c%pFEP0yv5pC`ycm3+dsFmq48}d|3I6x5bOGI
zX3HnQ4!OG)4`20)Gdc>C6eY=z15{)50+Aap4eu{BNN7H3H10bzM@prKd|!CV%iH)@
zleh5UK)j10p3pmG8guzv-D~7djm+(&ZPt;fhU-sK*b~3Mh?0j$$aWSb-3$?UE$aNL
zD{;{*DtEXmnIZi#DO~a=UQ<@5?aibA@LJ!#ef9XGT@c+YlgP{C=r&~PdhoGN^=h|;
z!J~Ww$B$z|TwjOvuY<eEnU#y2Z%q7%QY7B*s*!RMi6&gZP{qvHXCc?``%i+{avv56
zsL%*UbxbzJ=+>c7FWD5CRez;k_sTWpLDNUCFp(w(b?UgC|3$zhPHx?pFhyoo(eYn`
zC=MAN%plUnr1u0;JFH*WybA;BhbU)!SCe}WbuDjiMHJSuIC49eo6gg`2l;L%ia(BP
zxfH4}&PF3<LU|cy+|9-m8g`@i2u7SSmJGbp@5lB2z-!SO6L=~6YAK!0^VJFmdX`U|
zfGlgrH^aS`tnGcaR(`Pr{|@i_#pc@S<(&R&ZPsp#fn}_;b#?LfJ0e&2F!t}YuR%L;
zQzi<pW8AWD?qXn6y3&`AJhStBY6AFQ@~*1g_{Us1L4IT4;F8&0c<oH~PL$VH?^9~q
z^zXKG>#CQ1>kD4BB#jOO+N<Nggs#<x2TG-6TJHS&z+y0m`}(n*6Uu?uv*Ycmh>5!<
z9rr6C@%~G}ufHYenRD3$`+pj|z?s68x?NuTzEeKQ<Te&cWY=jZy{D~Gm(Ca#I{DOn
zbxAKo+(leXUeBNI=cjkFbb7bi?-h#5honB<TX!G(^)!bjvXQSH>2)H(ks%zA)FW_N
zgqJzxF<9Sk;kTxx|9p1A>-A^qjMR&__mE3p^5Qrl-wM+lf4djZH)FmGjCS|*Jz!=G
zK<4Ade+7KJ{-RbI*W2jfEg@e^g#JnPUv=Nyey~Vky1d9mr1G<5QQ%Jwr;{D#Oh@+X
z40(5FHF^|A!+Uy?wrwO>G#J<~`z#Rz_4Fp?5gD};&j<Cke$L_6aNaY5L5kwM4-PKr
zKe_vPZy({)*w>~{fT|Q{bf-M-UhPQ;dFF9ucJmGhd5ur(;Bwr9Q`tmDFf+K-@L<ix
z;l~eG8@~C;GJ($#haC4S2SGaDfxQ{9z1q&JQJ~g+_lUfNnC}*Ln_fQ*rfk@T)82CV
zOkOL$;bZ?aDnQ2}T&hPElKYdOBGC=1WD^Sxt|+hMe*JAaG@+R;zti7zC+X{dr__Bu
z0GWx<epf-G^X(Bpynl=O%Hqdy%-1u(T^?F;(5Fr@;{xd`1m7nQ#ZkEhJ;A?6Z7S$Z
zn_u7Z{n&rA+U>zOFk{$_b`2O6ba1#Kz!?LS)w&qN{Al+$h12#h&K`u()N{0Z3jCng
z?UvtxKnvz2Pb>Q*&)CpN0V54qVJN@$Nsdy4h3RbfOLYG9^F)xiIJ-RQ&a%|H#GPC6
z5c|Pvs?|bpX<g1*n$Z%L$S3A3mXm=6LwCeHi@aFmYmb1YQnz%u-md0-PW%g}Xs_*2
zH8U>0{xKZY84qr|8}4i+PLJ#^S987pbhJ!3%RVsJWq1_p&g<jxOI!TO{HNC0q}`2g
ztal@i_$p}f0xa)cv8SCD;x2qV_Og1>{1gX~u~peIIT$zD=6~>VoV$aP-sW`$>X{G}
z6x-7;!z&&<H{^J7`PsKx{G&+|FN0^n<{j?WTEDcu=c2tV{GX8Ke+aJ-8lRWKrfm%k
zHtr?`v2Qq8pSNBr)6@-DN_ILm!fswh7`|w~rrSDfB%z)8Iig#hf!%24s@qSm$p28L
zZ#5A^zZm}zuPTMQRLZ{U_?-9B`nIp|<>*w&|KTx?AWr6JT$S7z+ex$vwb^Cp1y7GO
zO*(bYX^6VbkE?oR@th+He+W>c9`;ke{CAlaN!3)%cTA&d2q<KoAf6mJMN=Pb|8Vtq
z{@thyb|*<sLjq+PI^Vu9su#9C>^R(vlvjG$#ik6~XwuVCQk<$F%DR~}Wd);B7WK=i
zSD>fAwP1NU9uD*tAX*aD7@W&jLjFxkAP6V|j(Ri5??QX?n|#JLe*@&Yts`jvh_$^N
z&-bQ9FgU$A{BSw*CZ*{sD1IcQgZ>U@<&4OMFVJFdTC33M>MV8G9C#)CbIllmN&YI1
z`l1?>N`SIx6e<y^AH5z>5f45gZ=|2RzhY?KswG-JV%|{n?di?1`<Hyx6HfYI?*Jz-
z_Hej=q*&w4>&C2a&HalMAD%xh7A!g#`Vs(F*wzp&ElxMhR+9azS^+Qn&4%OauPnY%
z7lbH^jPdSSOGVhWPNr6hUgmCo^(m@w=oXyhW?kaRS>Lj^Z@xO8@iw3;TU_tmg5cL~
zd6qxYEi^Q9aVYw2ea79Sb_a!ymWc`8wQ$p(rXI@NrdF-lKTBVRc^Qjqst(vp#wU6o
zm184rX41~i^*$cayd744%J{P|$>EB>l8n2Yk5glmYK~b5Lz4Y81A2Y`M*8bG^S?m9
z7htw=QR52<yP(9#Cj(hiM#ms-<pl1=OEgK=qFSZ;*gbg~9WI}Zx)9xb$7ffbU2beR
zjQ;cBxt+n?a@i&2%g$ey<Zrytx(*zOb9{X%$AjUL{1qj?Ru%ew={}Kbnx%GGSMFb5
zywoiK<W^YWGf|Iy1`ykY1lz~TD`XO1iC(_L7(@6ka(IM2tl05PC^H~Tl3mZUT<8zu
zQhkT$3ex82_nZ6bW2biPU$|ShO4c$YnegngS$7WwQG%~+C!2owXZQLdb?lAAyL63)
zX?g{1uJ>z}F#u0*nzb*-YG(3v-h%~g*CfuAD*p-_N$t+|tFZ0qt;KQ#HQ#80{^0%b
zONP#(NsJW7qqiVAjTc~2JCHeWdzRwynt$2j*{|->YMp=6rN%!A)>e-ngzsN>08Ro4
zHsWV&Tk7(ZLDi#M*Rerx-y>-3n=|x9t5wzs=*dBpu;GJr{W|9hZrl>fjfB4~Sz*cv
znw0X}C{<WnTPrs6{-Zv|=2(Zzaj}5S{p=<S)rK2MH!8n8OHBd(IsGolT<RfyFm@u_
zS@rc7Z(!C}bK`qJ<CWWQ^=iFptt@}US>=wmvNuy0IdFT}qT?A*&VugkH#U|Y?)R@H
ztqPy~xkhuDF#smoK>zXua?;J$f+_MQIGxWf##_oa`N+)`qRmlwRd&{(4&75Ub3I-z
zx_iCC!)B{S)DosTofvI>$8TpVr`?Qe-~*?c!n5HcxM%s*>w5{R|I)jb`J;YHls$ex
zKjPFE$Ic8f9kvz~YyH#Oqf@WTd!NCae<JJj_j?wcL5`E5(fIlX=Dqz$qQ0umoBsRB
z^yUkVxZ*=<J0B0(iqoV{%92p_2D2<pQ%9{IqS|OEWF0}D%8OaG2Jom|{w-%Y#v$@q
zfEjnz_D*)%8J6zNPN2(T+1Gq~`^$fhA7tq)*$izSbDn=y2apQMYD%UgYrr%W*HeIo
zxqVpVW0ijU6qV*K-3|{>wBLVDO~PHNV)xn!QS*gHhA+{p1bT%()iANXb4So;-Ep4=
z3qvl4Mn0BAp@6Mp+)izZfA`IkChMg#V&B!FHkN781D#Bk%fgrGej_;3Gw9qZmz*z0
z-pDX{)~cBP-<k1O&E9>FWD_(dw<Rie=h}yupVIbD224KhZj|>bl`^nv-90$tYH!Od
zeDKLin?YBJbfu{q-xkK~O|16cyUMfo?@Gn=4TcS&^VX8|3QJ4VMC6+=QoEy*kkeg1
z;eNq9ak1W4L7ie1PuO;(r0Ytft9}lpcMV<QExRTNP#YG6ne_E#TV-VQsWyF&zkX1g
z=$f7w=v?tOw6^;@RC;1OmH&@r+9%w-*f!7B?QB#Rh<J}Sit}&e`_F<59wgu6ej&!s
z5k|6sFu&um)`8)2{^r|_X|t8?pA4}vw;O>%)y0f<@OTDEVv*r<Y2(jk;lp;y8(Ept
zO$~j5`2l0R6%7@Oh1Z^#Xs}y#f|KDW_J^1zMEgtQaMx+ht`^Z!$dAkk{r>GiHbI>R
zgO}G?7k@>K$OuYFJ>uQpSNs#WmM;l=Rv(qz6hCs&xKjQhnfufIJL!8iU;2V>TfDu2
ztG#){gf+1V`|FW;>>m2&`g;)BbimHANowGRn50F^REN3DltA3z!`!gL4!!l-&nmYZ
z9CS)cSt{t=?4rXGwK1YKwI-hmt%J1wNLHCLmMT}inwFYc-urFc9`Ef!f$n#AQor7g
zca)L2BoM?#ee^xHkeVoM@trF3m`9t;<o9~zoa0lLC|esxqRlUu^aoQlb`zzLmXMEk
zxfNT7p9Y-%Fo8{H+>d-Ocqr(>mAwD*x5e(Oayb(^+G$(%U*lJQS-sNolAXBzYu>^{
z%g@Sb{@qUh=U%;Rb5@<-Ujn`<f4ZgdQr$9BTch#y$(N2hr*i+5l<=BQ|Huvvtnjd)
z+qn)l8glmcq^<iNe-j+=4%vT8cGFHY`BMexHFr_>mye9`u@4rkr4#R#zK>nFBBEf#
z^ys7`{V<R{KVA9p$L+*;k&S{|QJ6iCP~X(<m(S9#QjSli@5mziV*k8p5mVN*l*d{=
z9<i5Z&k2cL<IK+zr$M~nYZpIJLHXo){hD7rb^4fwdh|2A`r&)`rspANR#O=5^#+ha
z9`1q6#uDHJGk7^4jhjEh5WAJBVmNK<;HOPjXQ<x;e&V3Hk;~NZt{{6)@k@UXBksR_
zRDP-8-wQ;F=`XA@9p@$c`)|w4hk8D+$vs6?fQ8$wM0$;z+`{RY>}Eo*{mxzS@<6zd
z<a!`YBWLUWv-*0;9PF%Jq}r?@0~VtjdprN0@3!mQF??27IXM~TZk@x-%%$~1iJy;V
zprt`fW~8E2;(X%IwR)Zw&8*5-rOI^5sOXl3l({#bhbwqAO^Yq<|H96x5+mIWBsf`-
z?d0~@t0oGfBxQM(np<v_MY=eS40e}=DMP#SnhUxeerFTx$V|m?&Hl8M#s~lHGT9a|
zApawPJe0UzRNT>d{GDSrAsF+*_Q_YgAmRS^Yv1*1pAS?Slx_;(8T7xH-qyDF$gObP
zN=^PED^SeGCiLY&iyN<VXx2Oa*TE`DdNdCd^*x8hAId1f61UWpY*AkV<M)>z$`u^<
zeE6f^m+AR;0=i!O){AccNt@nBrxo86e?2?Rj<8E|RYvSgZe{q7^;RXE&z*BrEF~Tt
zfIZWFUKhq6g58l)s>@XuvHb7#gxlG(69=Ky4|%Fbylg96lpMGPW{0m@J|ajYA$Amo
zk$&_Ij?6O31ramC{Bw^x9oXhlRGMKYH?D&w+{C=-YW{xq{m}{#Plg#rTe}i3dC@mL
zG$HjY9#MZd^dq;rLLxtk@{uSxJ3T{|xSpYp|C{kWL%|pGL$HPQs#}g~*Yzfs-rEMe
z?FTD0;rVMUqv2mHK3`N{|Gh_BeC*!)*9At(2b@p|A4Tu5U14kbb%5a?O*z2yY+uN_
z@0>bD^G_M2f0TH4hc4Zizhrn>+oGvQE$23~Ov=sN?@vV-Sm57+*JY!mqONVqD0w_Y
zXzL`ZV1<wXjh2ToG?shvC;wr{IDsWZrdwiLsQmX1-I2_xJB2;?xW1pC*1r}ndY(SC
znVym``bdXlzq7_tEiOOuXqzkK-AdULy|>1M@OVY<p>2bm+X^54>e7*eCs3InBgzoH
zX~a#~Hshu1huW7Doy+h1z3-e#_$iIzR$k@%?|#m|<Z%6W$x!|4sYY^@f4;9O-$;rL
zZ?+ek?!G%s)3oR6x0k98p8(IEWWM!)hlbAGSu2B>#ytJrJUV5Y`o<@25?@_vK$9w0
zto{K-mH3tzMPhhM4S>yGn9%+?ubH_{MP+)%P+)D!Qdx_msT|!2=snMM;UDnXu}Y}_
z{nY@GyPpPzWUIAeSUzlAP3*_t8Dz_UhgLrpPN%y&lbODxCLq8_ce5sr#Uv-7U+q)z
zqr><<)A1QQjdXs>-MaBHU9BR4%ZiHSHnQ=V|Cm({;vzf0_dnA^XLyTAfdlW|?vKb5
zsQSnyL7_5#6Gf5%MQ7AdeoZwh)n@d9xT>^%n1eg_s$Yn1jkuDW&$D7oBmYp>+LoTi
z;(D`jezTrtL7CM@R=?)8-k=cCUy|hBw8>_lo4Zi4RPM`E5b}~V5&F;c{~g9PBzQ-u
zRC@<R&cdS1{7+?r*4?&ryNXM!A_m|~W%6m}2I$G~^w@%Fv)p>6+8t`3dNUbQ+pY}o
zq4`VwUEq9#9#uL<KRNu`oNE>m`+#?(lX5LQvee=~G-TI{cF<i%H%^I$v+X%jDMjeM
zRhJqduuJhxRB$Xd*1`X7WRu)`RU4y?vbpqtTWDk!1Ix~c&Q7Q5?c+(dRd$(2T)nib
z7kKH7%RV0W&(@|Bm}2Cn#G)R|?F7tMqQ1q+RhZqko#{J>)P4R<*+Y7L5(PkV(#qVN
zp*x}BW_kCwB-lOkrI4xCC%5a<X3+|_GH!tS1tn`94rPXJ)#$LzEpgub%WppVb5-a)
z1qMRnH095_iTod_^<o0be$-^Wts^SO8dYig$u7jMU`<hYPS|hk28_L&TwF9%<g>z=
zer<ur0fOK22%!xRC??VBZ}<l3w}p2ys+nEEVOrU|*F_DK7oYyPIyl=G>J%J(=vZ{&
z3oK}7*g(gbw+Hd&`W~?+UMXA<WLeoEI_>_~@F<*jsYK^7PNGYU<8HrA68NPw*p?zV
zavdhuA*$f<-<=zArDeYOg&aAPC&#SrwwzInosYO-f;m+Vw`?OfU!-Uh$`vXn=-i*9
z&V_lYU>^ii3kRC1T<ui$e5Ofu8+SF?b!KU&gLFCXY}zMQUoOG-UElvE{%s^wcN?)a
z1PLUG-m~>P)VcjO*!1YZy##v?U^2sO>!>-Wj*96{29|p&@1v4<?Y9pGV9$esm<G1)
z*t_DYRw{HaGB62=-F>EB_sgXcn047#k)jp%)`hfnzFu>qYY_J6`YfXP;@a_B*B?!@
ztedDm3qfpXCsl`-Hz+sW$ph^0nhV!6Z6nKb&UZZvo}$UQ=sI?>b)Jt^Hnd(pHQM`C
z`6)xG?f2yi%5DWYd*oSwQ3F`ZNDQ)<Q1Ja_8qVp&qIJpga6T9GuIb0Y&r#>uOcG}Q
z*~Loo-tLJT|C&GvDkym2d`>M8P~L|st*)$tnTTJEZTbxOAf^m5FaNWSL^SMX%h8!R
z?RD{et(#|;K^!9^OIIx8<e~s#GC7LIjelJg8b1rwIsYn`DtjGzshD+BTCZ!wvM=qs
zY|1MskEU;}l15kK8a}m37~7mG6)x({-Ag8IFICqfC_PhiVSSnsk)464mt#L&pK4Fv
zEIRmGS2&TZ%2s5v2UZEoZ!>*SQ<?BWF!x8VP~!aa7>dtFGLuWv{`ld$sml8oYP*(2
z{T%DgIFSh1RrhOJ%G-sFuW76o<0~X-tj8>cBKnWMIK4@c98}2J`znFsexcy==bf=>
z_3E^uX9M)Nmu6sE3+tW*|Hu4B7iipP+og|n6%37<K#!Y%f8$Xqg^i|RX1{2B-q@P`
zQeqSd5c#lJ8#UuN7w9@P)nD5(eZX{(Y1u2*7q4yctI=X!#oiPD%^#OyRvv5E<k$z^
zSXX!5$nF2Rk*iv2#_)P%&ynHRExm>}S;oD9u8h*P>6HD1`t;^Mr9D@}d)9aFaeO>n
z4-ZHEdUq>AZgf37Vkkx2NqiuKhnun6U4ynG&UNuo884<N;IHZ*#-G_xom=z=>vO8#
zUWhU!{Rw3_ReFpFDjkuz{ord(xH66P2Nns97q+=Lv28xtr*Pk6fc~vZ^66x&TNGkt
zs7=<{MTkRgLAN2&ea{215^q^!3TYlc)T%bV4ZkqTNVyGsFyoud`P0x1!KfIIE&s&2
zK>s#!A*(@l`RnVUNA!Mn+0`8%YX2B>-V3+Qxmr|oN#O0Nuj`4$gACK>88uQ5j!M?m
zx-Y$=pQ=<Uq3VdFkFr0vPSEvZU;3+?HqO1vG!osHp!Aykvlt<rM(pQtb-UVS0uO*4
z)qfn8tcRV&uJ_v#u51fif=a{hEq>JhmAL+Ia<6Jk$c9exsdRL6LeAe)i(SW?<xLl0
zE5^J_cM_5~@Y%JAx~A6rd-)4_dj4zg#aA3(O!ZSD{3T-HPn^SCZn{s#s&#6-uwIQh
z2>nkfFXD^DwTL2yh`U>eGppN2P~<+(i^AOXO{zd)UgXFH+2!N8vUg+1&imV47uiF`
zL1_L1n(6|}9&rvja}y2Kqw!ujL%lADLurtTzP_;MDztmpv?8F#-<)41^7@f~C*15S
z!tsgSeXRlKE)IrUUJTO=mZ*|7X{P5KbqZ;RpK2H?SnjKhZ%dlvvU`&64L;ZZAzgLE
z5S+@OXKdZ)Tjuht*RocAm_vn+`5|S+vQLh@(``o+I=-T`H9qd=kx7SaYUQ8lqqld;
zdRkYebt&$WiCoK#QnqlHtEE+195y-KlztFGPg1=_vM@OHw(O<k<xN2;FsFHRju=SN
zci&)U>)AT*L)e_2Osf<9<C}ggS#tEcihe(P!Xt?V4Y%VT&RG;V{R_MF_BFEO{iAb<
zwP&M`COXV{Se75M+>R`Knf1!LC8qVq%g66y_xY*i`McU18hhuHPl5X1I^Pn}HX581
zbnG9KqjR1R*xu53EB<oT=;N!tAx=mI<Ac|Nq0{toSA@B<P)Vod*jm-R;z@zNm|5NY
z9nZ1@o!l75f;u={`DGIG;;DqQd5@Oocbk`V9xB@LJsO@G1Lm&F?dN9*BiZy=>_cNg
zUncG?bbj<4gCTcEW%S!q2NkUpz~$3P<VnYB|J^UerTa{3E+UZ24ZPASO^G7SZ1?j1
zX`$s}S3jnBq!v31^d>$7PFHvK#z*J)mm2*l4L|#>#95M28+D5udC=fic;k=S@(H7P
z>%*OXgQTVnCeZMk;~TBl_4l)LSMkWWJ1v~jWz`>UD~Gt7v<VtmE-g3;M$!rvvTz^y
zX2sIA*eIb+8D{85sZW-lEK{{(u~gOzUupIzSZE+`f?{5BdvKfHl5T~KP@Y_9aJ(|D
z@{kPXDL^q2FD@3f>n1qB0_fOknNRBbg*O#!PU`z8zn@)jdrHmGzbDsr@6l1gkng(>
z1=nh=;+<QqY&vOpL;=;&n!g_X$nYNeynj_W?83tOl*gJ1a@xzweAfoOwYG>3_@DDE
zd(>b&v!0D}4dhw&Pb)_Oe|MRvovlkiQBw7I^#ibNWb%@#D3?m;^F*8A#<7)FKgpcW
z(I3pN+)n+6m{m=txdw^+`+WWZZ251`r}CC}QMuB^9)k6KcF|sYY1gE$L|t+W){8%E
zRXcL^x3PGjvt3>;Tgv3?*rWoKZi^2-xy$JO)r`I`95Nm-%+vUO)!}I6<X$$l&ZG1G
z*sF&W=XUW8GT<INiVEvee&9VQ_zL+%IN8OOIS9Fb+)q0pRrCKLUj|GrDS#hE`r!c9
zv8oA?LK!3~qpYgY!)M+=uK(|P?nG|w=ddH?&;7-F6}6OKImbf9J7HLTR>^*UK9y}f
z*79%bQr$eo7iPyoVLGQLY0H5<o?MTze+NSz8LW<}$GH1j|KyJW@BQ`Mng2HNbjPZ-
z;Y_Jdx+cUmr%dx1E1Gp&O4!<vPW^s$wXhAS1P;Wg@-BkjbB^grqkY#Fi&H1X!CR)!
zvupG7W0e~+pBMSj`M<xfguVtHf4tvcs7)vn$<9w@OTI4E_;0#<YG$+VU`i0wEhth`
z#^3z9fVcW}!9$yVshysS+EUoe@QnOJ=yI_hi7g_h3XY0|KdwSXf;<uN725V4zsRTM
zHN(&yJ`r-fiBNSz<mG)}-s_8@r5&KOby0TCrf3fkA6~tbsps(E{iXG|dW)}@40{Cb
z(S3O~X?FQm?q_Pw(xt;)=p6-1y6uZZ$xI)>N7<<SdLDG=w2LgV4*4?+NV)RRs`Ma0
z2y;t+K>#c}tBdnaGQ2L-+S?c~YWTpYwUC>1V#c#G{S6(b&`oKVOZm~8JM(1!!S~5#
z$=&}-eHH~*=K@qXhzR(k5oT^~45t{&+&fYUfLYwFynryek416#y1qaXTC2Ua=^GxY
z^54T1r3i19qi(CeGDK|E&{Glx-@LVX`&r`O&##BAGfer&a=HvRMjqP7enijue502Q
zx3I^d&tLrXviBa}_+W!{8Oiy~pxP6UGF1jBoDOe6MOmtQf--JBJV;*|?4*{#{3+U+
zqH#kBq73%kr{}OyYRW0>*%Jj6jifiFP~g3W(#FLNz2p$ir6*d-b~q@Xb$B6g^*V$B
z{PI6c-X8m!Kt-fTOAsl*Hw9FV#6eiRxbR8fMt#$`cb3UggCzmaegeg5;qaL(JgI{e
zel;Q4DO0L&8+C)~vnJ>UI<ahRsGHCnL}_s7kLyvf0wros;X?AeGdD;+8%G+Tsr8IZ
z9wGAaz;IaPtbM%(6B4@diWNs#(u9(|U}4<zWWRatqS^I@tC_a9bY3~c*Lh?0Is-Y>
zgl<R);@qu+_DMjej(YIC=W$pbZZZu??xtst;DI`B91+Z5MqY}`gWCF_G+@QK-<u76
zIPL@?XVmC82%(G;yCcmaIf?Ca5)jHJK*rGP9B2tT^nAcW_CpClPR~)3C2~*q6v<OO
zHF)v7Y61b<h>o{X#m-J-WgIKALY=V7_yt160o6brU!meQQ?qmE1T{qakV*JFtHDOn
zZ|06%?quNnPol)EEaAUd3rvXM%v3op@T!)ZJeeXPQBPSRrwIT==&e99=3n<sunQiP
z31V7Z!I~`qxmt(4OZ6o0GZ~Rq$~S-o^^y=$rG8@-=I9M6lC0r43mteqvlUyO2Zbz5
zNWm+6Pdv=PX@<2vxRVv|obALN#2mHFf<!%z)n*s@ce>@VQQWXKjezdZPF_o^mzZ9_
z0LbNecWWABYv<2fbvJ~QkUn!~vlnDnFHOx@6N3ianL;Ow2VmKkpi%>|n$zf<8?I^<
z+Az|4wK3)m@;cj|m~eK(kW<Uz=PK}X{sXoDoZby5eaV92?YFgd_Z+BN+G$RBBqN8U
zfjDW3RmS1G-6G!mq$7Hk<@&4xB2wOEn-5;3N9~KHJwFfOgEy@8FfQPOqzlpY#}oQN
z6NA*#%Q6xOkL<&mL@70B_F=BoN~)B1oiV`*h9S1@fY@rVPY(ZM@?K7ZN&=+GxEms}
zqhvTEm=<<Qyb~lTIgz|RcvVP|WkobEmC!!OD)?MxwXdh^{E*51AknO|2)$Q9yemUB
zMN2?LUVFfj`eMEDsFT!aAM5#X(!irmZW6q<6JL53rVb2iH?=c|9ws}33;G%;Qy2=N
zhRcT<0q2%HZU8R$kRIhx{rWWs|KfM$2>_nPs-<o|c({v8Q8M+=rfO2Q!f<#d9wS45
zk%3-yL=2VUGCbv7BO2OKGA*rnBw>aP!}>UGWsuifK>*T<n80LO-8@*#!pxzO%t1Qe
zs>cFMm{0Y!s5^-|&WBP@KvG<!>1gUnFTO;_%V?u`5OY)rGz4#^^6h?qvy0{NIeElE
z9Y+9vo=biXDu$dTkboX%d$tQHhk5k`szSd2QzMx$J81;j8P`_Vt2ZA=AyLR%v|)T{
z`+FmgpJ?o>Eytt^%Q<i05who2c#35060#ULyA{$^HH&K4jUx$%&eghR*KFcD?TNe2
zQs)+f^lEA-$V6m~$n?5Y5L{wIJ<3&T-euHH2In-8Xyu?W<}un#o8mz^-C%{<E+Y}t
z&0us1wR?AzooA}_;7n#vnuIeX&R|i=`aDy|`#_(K-3^C%&;Agh>6?;)kU=20^_?$;
zLgAt81qI>Vx16lJ$@N?lDc`A}GmKXO-k*rDeeI3tosfV`6d}*CR=HtnjZTAI9UIY|
zKBfCB`ohxdV%YG&$&TXMd}6--K;6=|KNE_SAS2RvvRqj5<F)tuVSA7vaW*7k1199T
z7lWc4o~r;=KU3{Z<|h;f=RC$bfp+I!v&N<55*C$swNI!9&~_zA*x+nBG*jp6>Wuy~
zxvKpfMvgNIVaSHhJ1;z9BUy--msf;~1fMw`Y>TY3nv3B_Qy0g<+-I$;aJARfl)s0?
z79fNyCCy2w-hjAT-RX5k<Vk{VqH2mZw)}y8_dt{L)adnDZ3pBos$L${aDouwK3-VP
z&CLxAtSjRHAU6S2%JLy`Kv<uW3i1~CIa(2`smW9_yQ7ae9Y7RMa?ew7iwWMWB0j6C
zP!(sDUI?GphUZ}8WW?#(=_qNzdr1T>lP1))6?Kd?YB>BC-B`UF{07EV@6?L2iZP;E
zTJ|AI3?)D-A|S4cXD?5W(But~P5@~F&W$827ATb1c^;+C%D5SP1K5!Hh@3UYM_Z#*
zN3CgE9<RM1DhbUxb=FWx$v(!qRV+|v@zmGY!x}{0atje~?l>!<52|UM9mMF#dwT*P
zuc#XtHlw+xUX5R#uO7;|yxZKojtxWClhjr&pl`LlI}t$gwl;R67(&P`+2H{YVm&}9
z%+d(!C4btOKIl;wEYC=X<N+4fyEnb^_bTvpoy%EcG_~q5<?PH;33xY%$EV9af3Lw~
z)*#MA=wI!_vZcCe40)47sD2DCzcio#7MzhlE>~v(yx|fr-8Z@BSytppd&P#}*?#E6
zI7@vahr5%_cI{Py$4&<a$Xvmo{;WdPn_R7EHfe}%z<b$toYZ@A8<9I#dpDrHq$3UW
z`O_u%g8NQp*cJFWMT*G_Q9@V;7|N`twH0?;IUrXFvjEbDKLph&?Wv3HrJj+dcOVny
zM(8($)ePmvuLp;nojc_!*vqu%(ft#B`zu&sBcq?)<AeBmEC?n`EsCZ}uavq*KLd;m
zIg$hOn9`iA>cKnmHM__SZWIqnj$hV$&33CKf9c|n>iHywCiw56Fc^ZiuOWEaqW|1p
z{k&Vf=ZdcwUqcygcQ9_Z2GeRMNs!*&;g~F$w**k-_qSgKxuiBM0*M5J4b<AyP{Hv=
z%9-MDKETkktDMpHJ;>Zh2J_;FN&{($UWC)AaukkGvzNk;T?KmVR82;bkMLID1#$1?
zHf;=f2f_#UItXA{BJGl!-GqdMIHVlr2yKTxgo-MtfUvMUxK5%B(mpWh?Q$H#WlQwN
zV*2fajxQQ3j&R*I2mp0RITwUl&n@XT>nMi)I|;_yOIYRg%6l#aNOcaP@aLz6^@M5S
z78oeKeh79zE(LZ%8`D#V)AQo1Djeqa_rsKn<<B-*VP4qyJUFG_e^A;2G2MB-*2qI4
z%+C^`r+(|7w2eHElY{1rM#(bh(?Z31Z!Gy03sxPNT<oztemxI#xZlsp;~7USk8Br7
z)j<_(bqYv%Newre<Es>D+f4!Ph5y#69R|d03zE^%(Gs*V9}C-1ubEmtnMclB@f_j@
zG4-Tf3X>6PInylC>wM%4i>EACOasrIJH>pcWAq|(W!rE>sRIbwG{}S8X+nW@YnLx!
z&Y0cm2p{kgDr5_}#%_U&<n4hga{Hi{&GqE?kdiqGXaJnGF-@i&PNONO1AzyjJ$#nx
zNiOO~A^YmCb~UR@PEl1sTyUSYyr6^{)w*L^<v2NJ=yoeDc*+KYk@q+$rhjjh;+~mD
z`GxRash_=P=y~ywpCaxtlDz;<s}B&;tfrr0)A!j!Ji}ECzRRPUZfj~==6NLbY=m>b
zr`;jltG1Nmz6b$?_4yVCIP17Ry>SYfo&nFF!*MmhVHj8swOwrnlRx9p=62LuZHBoa
ziW9$+$0DKRfq8utp=G!Czfk#8Tt67h=6p0fi1KkYhlTOT|0KVQ>Keq$;mT^{=eA?s
z5JmK>?do@`W%8YO^1~NPD4WwI`5VXQTQmO9R<&H`L5pi^v!FETmHaMxM8ns0^mb0N
z5rjGqfX}-(f_gk)_jbzHe{*e&6_NJlQ%k1s@#?Zp3l{PANK(ZonUd4hQFR2;v^i@d
ztxSC~ixuu1=>&2gOvG+**3T!2NK%ZGX+iaw_(MpCJ$SHVutsK=i3ioA_KyvJ?s8BL
zTkxs2I6a7Vn?dAnIaG_gg}vndwKI?<??dFvOZiskhQs@7#3KM3Wz4zHfOBRDlqKS<
z)1=oDQ;JVzZlMKIPCM%t_LqENyEBcw@6hL;hLPSd^!_hz2R%|VWg0W*g?+?4VJS^v
zhG7~uin1^#oxt7as7)Z)hq5b%Nt2~sFWib$NVeQP+`Y<!Z>Xu+WE})R=Bk0odn9Ky
zsOe;;LJ9hC^~77>dw^!CAzv<Sr-pj&dtjy}vs0OhCZa&NJ*DF^;5kVda5ns8<8!j4
z>$cQJTb}%2+yGl1ywQ5OM!4`+K;#M9`F(GRzSD2wwpB;`Jpd2%WL&xAH3d7k>pZ4x
zHO_s!`3QX!j<(%FzG8`Dp$)IcK?Xqp?|P__*HBW`N+{K%w*rBwI;)!Ge)B^wq?>M<
z1t2qMhs2YBpoSW!`2j`r#X>N_Fv2b#>$P0FTvF>9I)VlUvW**o@Kk&63Y+b*d@zc-
zw>s}OyVKpv3OL=BG!v;kKL}C8=@?M3Cz_K6&LefMlSbhA?u)>Ilye?WM)kT)Oa9y$
z-zb(@Mm`}z+z717UM@IR1j=<QXDf3*NM2$sp#<Cm))6E8nmOK5U5_S4Cc5?I;i+p!
zRkORE$FHJNX9rUpJEM5qP*qD)wS1KTo%_O`9y@BJoyMj3jd^c#LN=SW4=Ixpm`N^S
zub&MNBVnxgnzcHCWrFo&$l(0JgmX=i!D*f?)6^PX<h<jIbdeUGtiXV-<C=qVM<XJj
z<AFnvq4)-ml+u4%4(>!4Y{7Lo-xgF<Z_&TA;y{|$FPk(<i1i?+)k_hIfcg#lTUSex
z>gLY`M0`%iq33JG^I-H3Jhb5(DZ+aK&YUFgy3I!g@A^e>02+3iWa2$olQsbRZOlw^
zm3zo`XSLURF^Z%eDgFm3<0QhH2yL7^c2m7X?j)CIXAdRik2l)UuNkEmF_1Z|n8fSV
zIP6ypP9Vr_q%eU2+&m@gm14#*rME+}h`j1IvvyGoDEB%jH<Jc=<(@1si=gHz)<-xT
z>UY*Ag=O(r7<suHr?9W>W}WJVLsQR=&0wg*W$eHM()ybfAQ=mUd*RB$l6mNMz*Hoe
zIE$~>SQ$*wA9qzhnN9*b_&BWi=22HVF?DwMQ?OT^5AnJg4^yWYE5<d=bxbYFo6ICz
zfxpq|wfEydS%#a`jD<lfmKw!ImtbHD1&NmImnL?M0q=9m9vAm*=~LHJTM6vcFuqoj
z+=#f?7&V@hNlGQDVo!;x3)?*&^@9en(#ydd>aWdlXf%KtX<t3NdwMdKnM%R`#T9B_
zTzyXK_|z{lg<RGO4q<o$Zo7<n?tyJdCK$N%r?_U2b76q>Ai&(-BEJZk)NjizXmgTn
z<{^8!na6{w@ZQLRsGhe5<srBr_<A&Y1F~X7(L7H;r%pJMxnje3kk}+CjPR@j?so_;
zFJ{UNKDNPwYMrX75vj-9t%xZtfT!`5<N+DmjVU6WgLnv6qnykrNbMR_Qqm8S;R}Zg
zy3XA5&Gm37ISMNb*}@>IsY^IwW5vdAl}2#eEeQ<i2xMhYxnIGkzI)JgUf3u{8N1=E
zcG4NHAIYr`K5IxddUN<Elt;)GMCv@7FRUhS4${VZ<Fo9g8s{Y-yHgQ7Mo>H5m+p(x
zqm$4Uof$agD9<WJl1s<y^eQ+a*=qiK?SVQU;OD}8-sc1q<}wd0)q7%?vSMZ6{$b@v
zAe0cyDaGsBszt93-KxRwco;qZxlpk`VqfBcwZldODuEQ#%phgI8xS@K%D>n=`9aVX
z6gie99^<ul8N=9LV^r^T+zF+e@>f`Kjd(Ani4o6?dgpk~;wx*YL1otVV6Og?EJ~+v
ziH!IAS^Ipn?D=SSI1kCl;^=pwi0pYsZrP+E6q^O8w^+f##O`BnVyb3qglG193`OLq
z!EF;FtX$IzJ{|mdeTV8Yhz;$1`}iWV9jUxVJ?V?A2f8atxzT%an+!X1--eORL=sC!
z2ZgOk%V%b@+!VCTErYV<q>xmmBC6i#8`!I)qp&JlV2bm%!OAmiwY=qoI@)c^ANSHE
zZyU|F;!L51$q}YF)Q$G{AtF^G3y1qb+6bAQ=@Z3_uAYH`m1kbkHt3OLjJx>32rqLX
zrmKibW`la~47Wp66IY9i8aA4*)1O})e4~Yk<`Lvkj4qQp;q<;>O2r;*rCR96UfNXI
zY)mV@mPpG3s@ZX1>JykDCKaM=vo_RHB|UIXc_{~*0HV*PHWj&D%F0yS_~Pe*F9)Rx
zNWQE{@+n`+*8thu$i8tLt<|h4p^P;+w&YE-@dQlF5tE7VhRs!V$wqByr)8J}Hi6g#
z<e4iZZ^F`qFg~PiGit5#MmsB}cipU>>x$;eEsy1Y5X#?^_1{;|<GsopacBO!2>0C;
z%#r-zs*F`h15P>5D20(?jxS$9ACoKmIke@dSP=O%W*qxI3MMR>CR=C+nJ6>tfa#uP
z31DieC{jrzm(N)_7I=O#%(hV?XSI;jF{+NNly?7kOyU5@6Si|wH^6-|=Tl|z2HwZx
z;5nyG0QGE<P&GTCiiez6Iu4@Q!N5|NRzuQpx%XlB)%peU?f?jna;p&|5FA`5^AJV{
z99aGJT0S3d1iczJ1ji)Lf$rx>^cXBUnVBHN(PF6c$g#+HuC8E@L*Z!l$i!jrQWTzI
zxjWNJ&_7dLUO@EgBD1TCiBZbjCd9vmjgXcgvG@imo{8d)#mx^=&gPh?vRgg%>UvO&
z^B|e95~O}k014!#orHlGydTM|r-TW664O>FlzJZW9x)bkOWP9ev8xW^CbceLz4!Sp
zybJjN(})V^i4#(;orD9izVQUNq|pf{`0vP5+%~wx(omo?h&r&sH`N&0Q0mqZMfLRF
zUYO)QI79B#fl)gr10?R(d%rqCDpa|zE>NnUB&K*4He0`W7&{3lSMGuUmv16Y-^UX3
zZ;<-(gB!@B7V%(3Jjlbr@E>ueiz81cVT}l^!iEXSI0)7S8A|b~r}gc+5z`0}@l)eo
zo!xwrJnoBYjm+9w=Su|~fGx<X71ZlwskKwy0d>+lX!+_fWdh?v^_SD;s_wT4D><2$
znT!x1@7{oUwS~f$xSahYsK2o#jdjFUDXKeV4dgyC|JwH03fmE|F33skjECx0DGa;X
zqshmwH~^&S!NytQ0$3hxn-_tfpC+~ss@K}$NeJs3jeF+_H;7ark8oGF{@=vv`jZfE
zCinG}p$=`HX{xQ1*C9z!#?WnDja8z*1SLV5aKO7Xo+D=EA^06D(2RuRmtmQBxzuTJ
z@;DsrjGX|I&Za<KPawp0Qo{vy>ig_<9{Jg-6)k$`G@%~=W2-r~<(Y?48MUiEbQHaD
zJ>89m8lYBp5Bvq-1v19{x=e;=4w!j38cpG22A@+}QrCg#r6dJz>}lComq8?>I)F@^
zG{S}|O?pv?ToEeXRCjxVkwtWgPX$o~fUew{+n!45xL!P&rvjKg?bn_?+pd{)yP&@@
z$)0bYV(Kaza04O>)K(P<1gzF!*etd4+`NOUrccNd48QJ;rxs@{9f5qX`cQ|nvZ~fC
zTXpHJVt^sFv-m|4Jgm?2Xg!(7vk}@JWGnBvQEW)`v>|%KbX@kxc|tSZGXYHG{j<?$
z4SU<I&;x@R(yG-UO3S4?m6w^XTwv5pDshFWfl9#ngHXp^GXXVeuc&2Hy^woCedfZH
zff80buDZn@fv`|v5X5drjZbcm5?C*TMpFZpYPjd@2V!gHtGBC^MW&WQR}UruDR11i
zAXqi|Q<=f)Mu;UTf=X#^#dtd%cLIUV-7EqWau3#)hZv#j`u#9)yf-xTS(?*)5Xswl
z*ko|7>XlF19ahfj@yG=Qb!vOGws@-dgf0f-eXN0DcRt+ZlRX-s4YGG`5t1^;NE2%}
zeypD_*LiyaDIGUvai_D@SKk*7$l&5;MZ7lGs_12kF{zpaTrcZ=kn?=biHWzzX`NYg
z%>z7V!z4=ubPkP?f|AcUcu=Df&ot@}Lnj0pzmBmpLecoSFbvAnaJYT4T*a^zuBLaA
zWyUQ#ePC3vLm&NY_v=wV$S2y6tCL0rF0<Osw=mBqf7}o!mv&m(xH1dr)4RAVa`8IL
z*YEuisZRRpvdt!>+-F^Xa8k?!IJe?fH!VyZxP=1`zVqhcrYxZVQ-rln$;L17YSb5d
zL3Wa}hwY;lW_qyR^5g+^H~4z(aqi$GE6a{+U%@L|wR3DjHP1z?nHe})I9exldONm`
z$zW!7wb6BvhHszvV!T}D)D)#~uSwK$4j;#3==%8Nq|cG+Dsm+fn^<>{S*$L*-&S0`
za2CYWI93g5^-h&S9Uh=2$JFGjtv_$BYGBC3JbVRYAWe*kh=vSCsKfX@Nr_LmQRanD
zByrN~$MsZlA%_ncYbBB(Vbib16}!<m<UAZ;CgS5-$U|KmvF-JNEIt7sx{bVd`l(5;
zHwg6pfIW4)lchl~Amm_QfLLcYyhU{<<idBW&iZzk>QC0;F|seorA;F_>dEWsXf!ca
z1UPcMlf^9uUP)t}i17Ao4YZ);Mp7uGNlw@1M~RvU5jOOC$bb})>RuS>3Q>mFZ&i`1
zXKmZn+B@+co%?9P&**WK=5SvG^$d#hz9IYFe)i;DK>ko>wj+ZLhkiLoH!v5c5S9JP
zIU)a5t6=r_7rZJQHXiTwz6bw};pJ7N&xwht8uI%s$lDEuCuSTS$>I;s;Y0`;PoyRR
z6P+(gw2cVT48nH6AU<){g5j`eiFGqW@q=a8w}i7C3{kY-GsQBW`2wA8;*>Syw9uIS
zq?uSdZ6EsWcTA6Xd<2iDq$5MA#XyC?KmUpkq^Kvq^ON;829j@aaQzKso^Om6DszFg
z9FI<MR98&4U%HwKK0UCAa=K8>_+Ggd$oYFhC>h%#J}T<PGdGwp<hm=sF_RZA7G-0g
zt7k353!2rFuH8t{-#J*bU*QAzip_vNx~{}dRuR8C>^?Q(DPj#RJ8tKMyr`9Zts^C5
zSoOMGVKdldk#tZl8kP84u7k|z#%|dtVCe5DPt@J1l3(^|c~kJS@l&63ZG$S4bJVxQ
zk<=!(dQ_f#WjuQ=c2}27bbUYdKq6%IV|G2U%xZl*C1kbbH1jhB-<mBtT9KzdxF$d2
z<GgUs<FtyKJ9^v?-_G4%G(KuC!ouozUYGn#K{<Q(zFzy=?`ZmnGUx7!q|d4^cv4d!
z5SU9-;pp-DtccM$=bPeJ*%nZ(fT%e3l7{8o46a+udHew?&;JF8D>_V0V#*c{l4!O4
z>=M~$<|}2wyhf(De`nQJx0wS?e%Kth1nR|p-&E8e|N8Gdx6!Nbp6D&@g+z@VZ!0HF
zY^td1^_5@XFc!WBgM)>)_vOb^E@k4#z7a&&gKZi#qW<_`{j+me#wX@bi-aQ;v7AE5
z<2fqb1^gnee*Lx=_78JK-qD2bp)Gwo1}j27Xsp%!lu)iUFr4pMI^!HR*Ow@klT-Np
z!(h@tf-V;)v0R7R=X*V&v$)=Crk?jj>r~F!l>YcpZ(|j$vzKi<GfzsH_FniC_xA7F
zazM06^=&S8Wi7v>K7V%04|F0z{7a3m$xFtRY9tc*H`adNRAZ@}>0u-XJ9`2AN`DmE
z8=n^IdHg|fa%wzQ<)+))y=#TnSHfBVJE8Tb+nNL1J90z9Yrb8iZa#ddvFoU?QOY-|
zuU^!Ei*m1AW1~e_<?0N-3RfQ7>!`ZoB57gkYWBWbGwZs!G(w^mN^X4G9~?98bw9+;
z5dCQ7I<{hdWr^Wx!+hafrrjI&{??>F>8i+@vaug4MzQL?f0EnsE4=T9*9MJPc$Toe
zaA@s+PRCyyygT?YF8O`;Pl+U&ccT5Q*k^#7N5Evi@If&lpTnomU^cI)npcK_l<5fF
zpqx^-qKJSz!cygb&WsTU|7reI^G5QTo0^s{KP;&tgnCXTT79y=Yu{UC5Q};JN09S}
zUZ`rqmU7ZR^}(F8l<_E0K)GY>2uEsk<jsSF(VU!(zJzy%a|O_k(iVXFoxm;?)xRma
z(J0}HN0k+OX8I6F=9oZ>xqafNhb_I8=JX`i?vgF4_48-BClBSNh%=o^8XU^nKuj9p
zu=Dj?z9VuWBltr3B+}n0Q%6IKk+p{?&1y5fh#U5jHZ-CrRBmK9@1puY_j4%nb^Xwh
zNY(%0w$d1E{cOdfC`f-#{HMX9R(#)N$LW86PPq_8*SxF2v(aNgkN%F$ejB9$>*=>W
z4<H79&$WL4O5<BxP@tQIHtr6i?T;R~?5yx$6D_>h+Qdh23UVvP7?-9DX)r$c&A+Y~
zREyYcPq;<9!6P&A*7@$;nOYS)9j_Uy(MCS*ze=n$$wV#pVTk<)qjh<EzI%f45DhS?
z`k0w>-kCEZAq6>&KE8QSZS-R9tA_nxd3vi2{DrN<=TVrur~W&WljC7ndA(V^scR+v
z$}Y!)p}080zzlG-?3(a)-6M9xIvI9;DC+9u)2HGY>Mxr2-rFl*nPvEf`mn%qegm;a
z$zBX~7u8KkqHB-uR#ZjIZyDwNw>`z-tgYc3ZFSpbKlxfdAJe407aS~~zGCD{?f%FY
z*dhNY>JLLrTJ%WR{{d7$tG}$CbvU1&XK$kazLq($<njB)@eoe$*;^sJFmA@gQrGDf
zRP6;7TF>*j?Wx2wMRAFfA*orj9^N0QkQ?uKfmCxz&(zd{oxM$J_0>-|t38K-eSP3f
zoW5f<?()^E7bE09zu9meY3&;aS;g$?`uLH3sw5bapEWD_#0lFa!b{D~i$N&FHFy)H
z-4SHb-rg?PCsO<DZIws0<KvVwkLu(n&7L6vnV96Czphqu-E>v#wmI>~ra&sUpmm|c
zL!Fk*VbJzt$K;FRa;IH`9V1E$vmyTnwkmOA>3Un;4VQANuP{B2>*pD_L`Xr(D*Y4S
zdKV;FtH^c5g$A!Ik)lT@OQ2#2DrwEj8RLs=ZKFQc;o2@JgD}Hl|8i+x+GN#S7mE@R
zGcz;nnUcbjB0@#UW{Tl5AsVwTdAvvvd28~et2{y>X#y0^36}v1#4>2Bo=?IeX!p>d
zBx~QPp*)RJXp)3*(E3#4n=SE*DzZBwBFHgS*<HTcBG9f#@u)~~Vd|<i{V)ve$#Oi?
zqa`aMRq0q`LyJ4%Dw8d&v1JQ+&6>9slJ$k8n{?(z5J#OnAv|Hy+wt#D#sY_N1C=U8
z<;1qc4mM1IPMtcXJa=xYex9#zO8L5dJ0&F-;m+N1t@hab`T_JNd43emeN*U{2+6$)
z21_^(lL7s=oj4&3bgsF1Xm7}goyTiBY!AzUcwyjkTYXiNlt<Omr`NhmXD?cLPD*!H
zQ2XTZ5D2=*2XpWcWRvi07_fWqlAXqowHRA%a9~zaP}6%+c^Q<l(qd^HZZ3$pc=vu~
zX3#95E+8b^XG<^h$Z>ITIpDPa=qs0{rQ!)uWc|s)iW1N?l}Ss_&Z`)AY5PJT^B`90
z@4RlRopZjc0S^D|=&Os1*)*Dkqhm+>B5mtE(~0-&5?qDW=3btUK%WV56P8Bnv3%y4
z`TP4XTej=`d8X*q;~h!oIZHO=&BkhLFHu#+84k*p?o4utxYU1W!W5{ear4Ht>(_gx
zyJ*U$kZ&*7VHm|93C_55$?TvngefhOu_d&2rhFllC;cXC5*n2IiFs5~d{yzQvP1YK
zR+Gi+*1vcux5r%MLmvALZbo#(LG$+&Nr`XuY$|icb@@G;9u^TXXfU)~O!&gySz7B#
zV}c42Wp`J4eq|Xck(+_;xOn#MP8<=i%co_r3So}ZLwqH}mG}AFmsPgw%~M#|l<={=
z+J4Q<%B&}rLIDLsg&!M;6`QWyJ$#~epeJr_>cqWxgZigUp93L@u##9#u`ncOY=D7!
zL!8z!z7BPQ_#?I@dY|&1myY+OcL@6_I@XH#+uY3cd%4c<I_%6DZkcCFu(4@TE7?{%
zFD$o%{Gw=U)AEUd=cnZ86P?UEuWf|F>W_}Yhf6^#doCG;&QYmU)sUSVcXz=TMV0}r
z@!HlnmC5wD(BsE9H@W+F+h)6!x=ww*dc6n%3-zBm)!<ha_F>)7GZnjc#}3YTxjOVj
zO2O0H?nS!`8q!5%w~I=u&7Z#ydA_~c{mzi6!kkozBKEO_GH7>{mm@K!Zj&BUUuj-K
za#S&3%F4=O=v>IA6)!~z*zk2w8FP!Fn({4c=ePjj?B{CN!gma`_Z?=d5!#xU#qO$a
zkddt!+%faC!P5va7HQ`3h1Yt({6dVW7xbCjsAnP#HIKGEIS^%UGSC9Fjr^WS@rX|e
z`h?Wf{ckE(tveTZMS9{_8O;-o>Ra@y8XJr16jZz?*{HN;S7ffqcODPNA9zx>SbFbp
z_g<~jHmMp%+wtpXzB#~l&1ri-FX@iM#6jvKp|Fa?^l?x@qQo4Tt6n8<bsO|<9Zu3z
z_6kX`2nngX?AtSSYDn}4oA7lp($MTTR=ziuhij1g&9)cM#K}xrdn%BcW6kuKQZr8o
z*3j^4txVa!fBy?B^{J}TJ6btG9W|PgCZB}NCqO>&&Ic}zhw!Ahd6Ef>=RVzj_of_|
zc;55MntYCJY^b_tra{0tO4BVNoujcy@<-x&?&Ndbo<En4D)u68RP`{Rf9`dKo@F)H
z9atc8^X5?1g{^m9nR4E)H#4(cvxez*y8Y?UCu`HFFE6&&rKMRFCfzEXP;n$qkL`W+
z23+-2XZG&cN4q9XXnka@wRWRwnO9bIwYwbqr3`s_y!M9DUCG;siYxE8kz|@T4fY?g
zIZcRDp-qg;G507)J+@kMr%!04PJp4D_WI^L_BQd=RQSN<mX=+0buJH++Up{rkB!6U
zGu*R#Lre<_gIn&rJ%8<U%CTc>FKi=bDVuiz2f#D5yX#fi-hoeVuMcLjK6OntFZYU(
z$$pTaA5@X#30>;N8TmIYyRgim{BEl2#g=AC(=Rj@%k!x1lvln_GlxR!^OeFsIoy*f
zPN<zWZSZx=xy46L=}2~@nd)e37xq@JF#QTBym)cllw^^Tf*Z%j=dHb*j0hJdefhY>
zes!*2L0R+JRKnN(+Rj4B*;=K-BD>?`cS9#KFTCt+?VM-d@Zsb23c1C~&MtR@R=6Rx
z3SYZA7M-7inK;oT;M}EE>R{6@8PzBKI~yiGKEnk5?Q;>)e%3i7wTq{jbr-IF{d{+o
z=g?EH)GdP@T3ZInI5{#~#c~ZOVt#hVHZo%Gwge0)S(C10`&6`X^7kuQZyRj+Dp4KN
zQ#5&@fktVzw{LBM?keIr3tO+Zw>F85gVMz($2?ai{HCGEXu5Uy@L@P{PhIXK&TE^J
zhQd{8X^eGruSpO^(-7*rs^>H@Rc3eT0%DWa;uFBaNSVjSzmA(%CMl0Qn^72<B@StM
zAJdwL^uM!=BP?8`b-l;#K}mGH7(q<2^tUrMgfC6egC#qhANFTGI@lDVe*Fu}%d6>X
za8I4;7N&SIcBm$2gP7v})VJ^Jw;fVnd(~w96RT*v{|gD)@_~R!<J@wvhuIJECNH&Z
znofL}-uk@FeNE-YTg@jzvF!O<&F$L6A4OhT6E5{;rFM$^(oQMqI;y3co1~<i?CayQ
zXWPPRv&grLcTBulTx@h;X4gT;%cJvImc^PCDJE6kZ(R?Rh4fXGH-7QHa@zHI$1Pk=
z1q(WLaQiq>LxWg$O$C<L*?n+A+c<pE!TItZBTUOfKDTyzZA%KYBprfnHLvKn2b|+{
zA6P(4OG`u325RHQa-Q^A#bkL7hrBC4k{X3&wKKH5ViK+qYgi}4KI7rXWtm1M4V6oW
z((hC_A2^*#j61eD<Z5oreUE&-OEXG3E{2LOpQ%-9ZebBId3L~yBB3tI8n|j_-PK?Q
zha;BKpd9#Ro!Q&O{;saITZRXXxI29>Z78%3S>S8va6w!@?RfpwVB&OBzc(|R_M9M2
znew&v@{scxr9HF7hdZbbS+kT&skN7nSz3!mIo*0+88FVg+&g=<e2T{z)@`vOeMt$4
zwS^&EbMtKxoAE3BEjeF49lp}I7FstgUgc{B^<nJ2J9)l6uY&^{jUAjldlQtY+0UPz
z_f*e(-RHff!?lmo-SqIGgZ7POi~82ou9&)VdOqduL(?IePRjigpK7j)Pu7ECl`T_W
zr5t)6{9@}8{|je49&G`8bUR3Naw;-RJbx2=r|;C6xMsrOIB3_z1)B$Jvv|4B83glT
ziHm2)4@P+f_dlNnLeOjX)5CHOPjP4X`*&Yy++48khH%{7TUQqyu0E1Jsj8!zaix~7
z6R3vCngxf8nMD;RZDbS=f9<5>X~nJwIA3p6hAD-M3*l*>hdO<(eQKgqHTB^_p>@@n
z9u_+%5eS6tuQM7RC?81ozVS4}ee#5xO(oG)AM>;(mbi%%ut#-$OuuxgJ<wFlXPl?D
zR<&rTB$OpQ?rVROv06LL<K6aB2URsS2@GcHA%~lCGtDwJyvq+0&)6Y8KIuq-hnbv#
zqU*s{3(4J|zVvwZw;`u4xy4#Kyb>+OG{L5%bI%(aFZfgprLWu_i?j(1u70Fm)7#l-
zs-f|)?A#2YM8z-%)-1BPxOler{hB<s4~>=@vZ_E-c31R=)AoCfH+|mkcyhx0<w}ZO
zH#Mf{m72d>A~Ac$rq8|Sz3(rVGT1Bn4g`X0m}2jy3ZJDSF}A-gS)i{!@YvpT{N6cd
z_P8AAnWF)}eU>Gf6v~oKSxnY3Uv^YGIA63+Oh_?Y(=es~wtRu%q7C@aQ0DO-D9q=b
zQn;+FY+8DH)o{oWTh>IaL__COa%N=m$$AFhr>6$Hj5=2xSnP;&Kg)`ZQ26?;c!yVb
zjLeFrHQs@~lT=+k&LZkvQBkqFKJXfMrl77SCrD`B(C5Ah+g~1!kpHmueWQ?Y*lc;{
zp3gNYTV<J9&kyvq+ZTRn+Ml0a^B!xl=!xjKaV9<G;W-<uqs0#O>sUy#XJ$8C_I2O9
z`D^oD(}wg_=OrS)8ZHgfp}qKAGL-k*%9*k&U9`UrRNU6}HK6HKi@eo*syHst;QpnO
z`*-y<R79R_+9a~_oJ?O!9J%V#T*ao`V8drKx725mtr?8>ZB^+vZ{GCK%FN#mt(H>C
z4eIt<ySCxWK+lbr67*`HMXqM&3ZgJQr){4z3*$Z3ZkB_fUaVHmj=2UCv701UV`e-P
zf^oQ(8={ZpHwRHDl(6QenJxEUr>e=h9lXM9G-1@`=H}{kRN;+nK)l(sd$#WBQ>W?z
z8#gt?5Ih*Gajv-j!i_yw7(?&x>_2f@MGJ!7Ldw$CZTf+MZ)a>gzT5-C*A@9L9@wkU
zxaIl9;~yIgmnFnH)6SPh)W7s_VLb_^WgL4z8n&Cd)I&BtK7O_iT})Ea^CBhk*s)`}
z?s1D|-BNn>>a~a{roU7DPWjc9t5=J{454XLmUq*tvXlZ!=O~cgwklz_mG0@#C0o_?
zw)#6dsuCV$I7%ixpT1`Cfx_n<`A4BU{*T=~JnDB&o?Tg430VKQ_PxTp;SPsX&96A`
zf9*Z+;ni>N-hE)dN&E02^Uy&Z=T+|I-UYZa$Yxq!i9uq^n=_rY)w&B8!V6L>_9-4$
zva(d3yW_BpL5A?_!Xp1$WipDVKp1)M9KGev{?(_rvVDPvA-g3~c$FvV33<&A7In%r
zt?V=3f9S<@GfE6_LE77W`}$U<yG)5+$T6TVS-y2^X&7YTu<sF#7F{r?QJO~mFx7wk
zyn%s%&Z|9kbo#sPk|xjecW0N0C#P%;s0#eeCnu1r&xm90pWPvQ*8I1~`$erE&hN3a
zKKKeaA#FVsrpJteKb&*RW)NTNZM_m~wsu?FVeX0cnVzBh4;+{-Ej^bLs?MF@+Ys?g
z<_TlGPi}sw+%utgyG*&u(f;$a^OKWb+}W>Gc1V4uE>hglk^eyCTK1fWuS4gjxL>B{
zg${fuKcaOTP?WYiV}+Sg<LbnDc(Dahm34LRIy*bNPdUsxzCk=W@!8$Dd8Pv`ammTa
zCDAj{K%pw}<sP-Oc9Kr%$l_AE&e6M+%Eh<j9tE#?DG{BlGf(BxuHN2W5E#}M1nO#Q
zr*0W<%@Ly6-Q%|Is~MNEDC6{L?~m{6SEh5T(p-|KgsfdJCAXQY>$mi%;f3@|9Vh0#
zCN0a5+UmgN_O0^V6dxBiZPu*d3geHrN=mrnOB0hf=r1)4$=c>Tp0G}F(W3T(&T9p4
zk~W?=c`~tlhoMQZY6JekZ|iSIIm(%C{sP1b-Tv*!{0O;%1d*DA>-pu;(b1A~^c<X>
zp8&ydJZY73=FIF#6Ea>nJsOvY-ML6Q$Aq0;wO&K!$qm<xmFBzb&Jf9&^+iJU){x}0
z)XdBW<>gmdukHbdKG8hHH`X@#w!0S1*N>`DomL`t{PX9}U%q^K_wL<MU1p|Rc4_M;
z#uY-byh>PHlMobjLdx9PJs$|-ym|8$ELecWVqthGUV*dRAT|1PoV|&Dz`MiOuMdX_
ziR_eAFrhw#{q=Y0uI<eXQ)?8d+xnC;jpCQKmv*H#Ix6ZxqTy}*>Q)Z>bveP-)@6qi
zo2^yqdggIn+r_98Po6&2S+e9wRaN}KgZ-_KecnCGT4)y+8{5>3zIL2_WF^J4e#(`X
zG@ifhQnK`vWVdEpTU#KvJ9g}djEpSaH)C8-&wbspd-uY7ySlsGvb=We-Me>PVpLR=
zZbOho(23rVO{-V`7Gk+#5L5M{&23RjggK;|J27DW7TkgbsTmnLwH+66O5s*}=A>p)
z3+gvFmrmZYWs8D>LPveHUF5_r5e?{N1OcMjinxSs^eZyk;FME-KTB~~BT+#(gf7`N
z$v4Vdm8w3sGA*q}A!lQs<g~%A?XSXyP5s<cBZs%vMhuJS8}G7dSQ2>@Ld$C4T{#v^
zU$h)C1QUGGBDp>Y17VRk2nF^EhVeuP*qX{@bNHna;Q16JfJR1){TRM1Qs4qi{A1@F
z^!aQ8-p(@9eBHMHuIIo1==pydgMtM88+yN^uRnkOUsH35uI}%C|F8Y4|HpsiWu$0n
zZ-JIMfl*q+4ld?41Pd6es;<6D%R*h<(%BMr<uzT>RMUWo92SktQCG*?VbR7vSSp9(
zXP~Yg7#OG)sHMha`KUWPsRyAGX`&+qhpKGeFf|H?f;Aai5?;_gh*tpK0%bo~6}Diq
zm|PBxfxz}G^cS%}UL2S#ex*J$b})lXWic5{E*mDI-ImA*n^(cahD#c$B+s9ePGf9<
zSqR-2%jN{r5jGV;I9NfCqVM45^S>X9xgG%^qFVq0phjl1vENnxR7cO%O)%m{z6gf|
zqr+9vx@iH%qcsnl(H}s=f}cYhfBPx4AzBlh#YQ;BF3wh}dgv@8mF@+F?u{t40GLKG
z#-f8sVBah(TGV9ZDgcebC3CRo>OWlbq%(b(*l(?u{%l+5cyS||uMbS3b5O8RWb?+u
zY!(?^T=07z{yurln!s{DTNSN>ik2#+`Is01(lQx7eA*eQ3(kzxd7u5!cnZSTc{C;i
zYw{1M&6}S81{*1=s*XVytf~sI_zjI{1@SR>Wsm}BJ|sR6fEzVO_5hABMqK(R7me<5
z8PgXT-Qu?nkt4T`UO<P8P~@8yRYIGCVNFKbobeG1Zv9JR`6b%1CPd!*-y2I|1~SmX
z?N}2_!O`CwkN6?rj6tR$00PVJ&i>v!K!0+WtYECkGXBBe8%<^*6dDHrV8K85o1;<5
zLS@K;e*pgsiAL(9R3E)QW<p;QgG-|GX2hD<@=nII6a8~m_-?ckjR7c12eT0P2Q-Gy
zU)a#t8901K=kYJ$yR*MJQ6LqNWEC|Spag+=B4GMAXW+5{_*fGc^bHmW(chW?r4EZp
z=Tiq9(Entje@P_p2SFR?Ap$x%jhv62Ys?sd-lTI$K)3iHY7B&<E>N9<A3~~QO&s_a
z{szT=HZ6xmB5y!g>ZU$G?fH2EMWm^rfi*Gb`oPZokNyJkel{_i?EB-S7AuMW4+x|K
zCCgxspwEVX_H7>i_#d_IcgmEnc*htupw`jC+Ca-LM%Uq2(dO$zbmDJ15q!=s=fyWq
zG&WkalE(HUamZAJ1$&X$z&tP+z|0Da1{>y3NgS9=V!&Pq%EG8`jd8YcP$xLR{Ca6@
zHJE@3Ji^BO%uten(PPm7e{h%#HH5-d-%Oz)K1`JU-uznIBsz*|HWLts1NZ=#9wP6U
z#|b190t5!)h_Jj#WCZ5*aYrwW00H#P1~q^%wCEc6Zzcc>xF$Ym+Z3SA_+$86<`*h~
z!Ri4t3R<&M(3Oj4_0U?aXmK81nNhGK0h;)r!6OCxdEGbIXq7Y+3>L!nW1{qgM@&A`
z4}}>Z(1$u^MhuM+z}$fFHv}-uA4x%lQ2+!$r4`yh2P{RW!yv+>BWQfXqdUy>1|RU(
zKx^S)1ltT|a(U$8$tABZ$Y1eR)PqO?B!E+_i7WqL1leFFB#4BrEWjy>)KPBnW+4bb
zhc_pX#6m`}#NQAbFdh5{OiusC<meh`XCiGi{_JCUcEk>&caGTN5uUZ+HSXlVD9fSv
z0N{Y2ipP9`U{Vm?A#|o6ptit&0ZV8I7WqLkzFBN^oo`nA2k8(n{m9+u%xG0wU>twP
z=wmd6H;etFrU2krp`WAc!G0iC{T{h1i7<)Z)diJDI-B`jv3cH#Bclbo8M~J;-UDwx
zV?2ma?D4jQ79Qe{U;{Cy2ZKNVW}$@_t7-7*44C7uu_Br23ltD)ozQnxZ2+SaLPvlu
zg0*=Fn@{uRu{p|fJYzUQ-UUCy$fzHLjve)d_;{euVKSY>W`B1VUqMqiqi!g`(Wn;+
zyD!#ICnA38Xg?eepp-cy_f!7ZBJw?b5`_Yk0Ek28FW_wgoTIfPDQE|-AD8^ActQ;&
z2otdYMh(8j7==?)SKXErjKZn?_uvF7((m^mqJw{e84cJR#Al<+qN`dVUO!vaipFAd
zU_Y)Gko^&n<xdU%(to7csP~D&G3tSi<z2pzvuQpIgkJ}GR6p_)K4uIGO9dgJm81<}
z3ldNkK4>Lppm&!8;|X-5H5XyANHCbjkHq4j`V{D`pR)f?g1Z&GOYnD23LHqKk*OFe
zlMaLlzzbBmUoea2L*<N^0)a|GK?E9}0;90gylG^h&jS!%D9fUGarq{NC+L=_kim8c
zmE?uP*wQv2umf;jaj+%W00lPZ0v*8S8z&nCh#-r?gsqvtfKZt~S9GIpIS;Mhx#lC7
zMXil5lZDz>ew{sDKN_CwVZL)EX><<L0KG-k&R&)1U}mf8yv)pQ1##(55Jesn0jOaF
zIXX5^dIJ$Ukak3IRQX}t1m=sU_kg&NsW6j+`XT~^kEnIls8MF2s*7iG#?s`^l`^`C
zF<N;E)&#wVY7;t*&EW$pfa?e6YsAG8cwRqz$_spdaLPztz<uIn6#RZC+yNvyje=Gl
zA4%zu(dJ{OTo%okFQKdvrGzFEc)5e$r-29nCN_U6Relmk1Itf5tVFMUODQR0VJd<$
zr7>1Z6AL^cpp}fVdU{w`-Gr|~`~+Zr*AnboWXCI3w^&cm4@@6OI;^Q>ps8t~r2)t$
zkg+i>!T65Y4>;oE<LCJMmX+asKH8#;-&yQ`I(_$#Uw@SU{oX_Rr)&JH{I7=2kNsbC
z&~ib)^1uIq*Z*+-SA0zJcQo4kmB{^-$o=;xa(|y0#0s*ye>tb~E1~-<q5CVL`!6Q=
zmC*g)kkA$A@KKvOs?+~j8W+{DqjU0f?DzTFF&Q}EsgKRgq8i@|#7{7ZOrjvZAoND#
zUoskkvB)&E5<8dW$7J(+vyr^mOge~`>A^6A2@EouqlR(j^;$whHE@Z=3<f3;=q<E@
zw6&d!Djf|;Q3D9v1aDwDSP0+qKqFW+0gV2DOF@u}F7fk(FbL)tY$lfl7*60s0G}9b
ztwBTQ5ip@WxCtim?&9&!$d1)81P<Dpk%u0BOvz6l(NHsp=6Qd*rVoS5TWn;Yx{u$8
zTC#Sq83|McC`NmI(D)IiAb&w&qDGMyfc~SD0cHb&`2CP8Kv53Ud2tj4xJ)!Ue^*{0
z>J8*Y^)QbC(7V`vG!|_naWR4f6k=YEek4Q2;}8z>n|eaI0z+a1j}RZFy@236i~+9#
zrUJ$UIs^<Ou{VIBYB0JWnj*vq8kq627$a*55^|L9R>AQ~X!9-$a_l~6mV?X2@GTLV
zqM<R!bS^L9jc$PC2hiomqLDbrH+-Pj2O9${?u+mnf6*8iFewWb_$w$cq8J2x!yQeI
ztBt1r|E;+qJ{Eq+!wWcsg0R5;_&H&WfEJWd$@~ToPxg)f9WPiAAM-PwELhz{kQ@_W
zP6b7xAum+t!9AA$zCq-GuzYFkksLaTV}KDK7Wyp!1;=L}z+$K~?t|cXEP?V4!eTQS
z7^WBMc%u{~@o2_pMjCtUmjWa<n@Ohep2QkMCJfr^1}%dQpu-XcBe1*{jsTy40s^rc
z`DlbaG2bZ~+;?0w!o75wFHJxl-d8dxI@kgk!13V3VSJesns+b`2AUAv7EiL-R2=&C
z7e5ULF0y&zj#3hb?n5208k^td)ek5%j6m>4pu_PM0u#jzSYLo5-nxNQw0+(8JE5^L
z-dq*~EQ#>O0MTJHc`KsCL9d{<do$7Q?daCX=r=<=#cD80IFzU)FJ{0`#D%Y#03H0k
z5qCtAsA$`IF9gHK8(1DyWuv=7<q1FmyebBVXCXjL!OKYgu-k9^<Gc(Hk2I@-2}Ibz
z$$lll5^o7(&4}O}i-T7YoR`_VIK$u$Co?-|H`v|^HnVesR}kzhaTvU-gA<-egzcSR
zf~|uM0dI+e33e7XE|vs4YuFr&v$J=GZ3wmmXE3R=J&Z0Wn2LZ0<E${YcqfZx;MB~V
zU_)?r!@*VrXFGIGD=?`U>|o~POt5gVF>?a(wv&TB5f7HP#Ms%}5$vqcW+-^HPm~&1
z6)XkgSAr9mxXjGPhPM>j$I9M`2cLz#gPRk<dYLo4%-+Tl??l9y;{jx5<~Df#QeaaS
zHf97{9BgT3Yi5n-jj{)`IPq>1K(}fco_7hXXJ&^nvv4NZ+o3o?yIwhgQykc(lk@1%
zRRkg)2b(z&h$up=ob18$C_2Fi6lZoAFwPFop9MuVJcc6R7WCYOi2nwQCEm;i%tb^Y
z02eSLH>>?LTlar1-}!wmj^CbRi6G;tr;Z+K8ffW)fB%_`C+1fJi2t8nf0Y0IE}r|x
zYy6A)-&#M(|LSP|dj9u6^7{4s@2|A+ue9;6wDG?l|9?JhEa2{uMDgEy68u-T_*b_0
ze{;6@zy0ywv5)?YiU2zG_hRtFLyr861N#s2nly&Dnje>}%AzsVyjbd+Sxhg4#bK)Z
z(ddgoBuDb&AS_L7H9yLKvG*k4QB+9>J`|=wWbr;}MuZ7WCX<8^jD|IkK%ybRB!FCo
zPNtI#naqUg8DazkS4COzKo?mARCEzg@jyYr6Zu&|1Ox>ISCn7T1r`s)1908Hs@{8j
z%uEu90rlVXrzGiqXT5s$s_NBIZtqtE07gH&>VQXO7d?h4W)kTKp>?u03JD!ysVa-1
zsvf&bDm*?bR;K$+jKKDCZ$&sLP9Bq0q2&{qaA_*-X_=%oxiV0TUGwpf_5-F8MwJz6
zD%GH`PD0&@Fh7)4{{%14DAaG63_7LUNOMK5i8G9@eP|e1C+jmO<!Hz$mxh@hw_2%_
zYZX80g`{vzMNsj;P-v3AI+?VgtSxR>=aT!YvO;<$QqPhm2-_%AknF(V;k2*Tn10-1
zUM1$Ih07|@GLBmVvt|rSQP!P4M=PS4DJ8=;;|;=7ocj&ip6hnzm8!1>KKTqSJe*0o
z2{gAk*G<(=fX%r}%2CNy4FIQVsP<N5;6=--WN)mQk?u{Pj!+dt6>gtRw&z|8eq?G|
zxEk>Sm%7RiRimoov{8YL*6X|>7<?#D7VtTlrjYC_VWD|5mC6KFVtPe@S|I3Q+lWA?
z>W1SCYP>;M0sS+7#Vy@KXo^>+qW&J~0!y5U+sCi+%O1Iyx*|jq-D9;<FRFiK^t)x6
zVA3ZVR=W(!={hj*{)QRka;tOLv3x8Ud^9d>(}68Isj+yh9OQY)i^ZLT7=S(_-L9Wo
z?emKZ0by>mZUrs7jESmQ>m>y$U?=TWT2V#!3IGyEW{Xi!A`@s~o{#(RiZURK!t54y
z7Mk7CD*~1ID~G;OK#X5sAW6L*sIMQWE#(>2y&~8sTspF$g(nBC69-KIkkzuvfIiP!
zPKnbSS`-}^ST%>$bZAwu8nVptvxb6UG?u3mk0p2I8BncL;&o)aLt+IoWIJpxkSHhz
zD?3I@VHvCFcTBB{KTTkRCY&-$yvn}g|0bjW`it}%K~GBuh^oVf0}yX4(1Qa3FHoJO
zkQL+?q&PL`CsSP?ac`1&fog+Fjj=j_cRn@52s6H6Hnn9wyllh!6LeDXdz7HZ*aFyM
zlK~Dtbhy$;j%^{JRJx8?O<4nMfL5RZ;7i2;-Sx)2$2j0kt~i#PBIF4SBsM$8NIIV4
ztQsaAy6HXZ)WLo@%`mi(kAYr49;tKzg=(shd1#ykF!>RQ!v{t(F06%!AT+p$Y&_@^
z<goOciK+p-MAKvyTCCIeBDvGh7<y=&A|Sw{=>%U#{=q51#t!=c%TyHQO_W+EUaSWX
zV29#|Ll<3X0Iz}X(C>)(P>lI<N^B4lsR$2MgOAbO#Mr^&<aC}drOqm`5!WEJbb1!#
z+v$4CYvN|F2hJm)vRl^LK(LD81@T;RomcfCQn+N!WcgKgpN906F1hL23OAnNuI2T!
zt!Y9eCR+jkv~Wd*s)-Ydvp)d)<8krngI4ciB1%6e-Hi&!XiB*%37;i?r^e=jrw*(V
zj2~+X-!I+&O21kSYsgeHt9+R*PsBK5GGrui;y5CuPMrb6ei)2u;TRCiD4n1>Ct$iT
zcgpM@o;!!t_!Pg+jzMR1ZO$2(YHtMw;Lv#^SSCb*P+g4|>5xJFcrRg%v9uw*2NO#u
z;l7c{<|IVM2;3^-7jh2<k<=+EtCNmiST!LcjSN*7U5y}c#2hl@Wu*l2((sRm-H2q1
zdT3IltKqR75$4g#vdiU?&{jaMP(vCSQZOP<E+z(#AScLnM&HOq5f#qxYmB1;mIIGM
zOVb(&21eWb{yMT{<{D|2Oh*U46vqcP7j=A8>H>>65YSc$ZAFmF5*8@LARE#Hp^6u+
zLYQqrX;?!E${QjkjKm6p5u@9PN(PN2TPQi?tyYPx)dD`o_Zp3mtpW0XehD{}X~6`I
zX1J!QK4?<s3!Dsjz5WJQu~CG@?TI7EkSDUTldU-H_1A<$MtwdAUdvz?sMs;$xHOz~
zP)P<Nz8a7LQRW;nlo2DR8Jm%n3gIEcn#PfG*Fu30QoXR|i$d%YEUVvC$=pRXE?OxX
zKj5GO5*~HlkfK#Ng-w=Brfk@OASvi<3k%7Sv<l@CBB%%#O*dvJj)6vG$5g7KqY|sl
zq%2&^-{wO4)mrXqXj;<fHD%^h3}N*uX5z)5Ylu)#hy#r6IrVxKEv7UHHNH$e9b&{g
zN@g<g3<zS}H3syBT#xM&#5J~3q;L^Si+~bz0M#PElS^V`e$rvM<RV;JIFCZ;yrvmk
zL!i8zum+o|6i`Q3H>D1+2zUX>6Y%#42^9+sPmB!_)aQ#(=P+W<J+~D!57J3@56$c?
zkCKC-z!2!EAZZ6gDMN78Vq4rn5C$xq1tX4%NTg)_89l*CVFo<&R@Q;1TSkSVfFH|c
zmaCYNX)vjoxuA<@J}`v%nqjSplMtFND+>_}`~607K6G|gm}Vu;bwJPwUf^0KT})+M
z1h+@jnN5^WR4%|e^=*!JA$)W&N22aHQB^{}R?WPO%p;XVb*o51_JL%R8N(%CHXX8D
z#bFi+BtxG0WwfC_$%PHWB0LnSXdK2j9&cETwo=jf7!?odW_8|}vttE*gH%dh&GPj)
z<PB>q1pbYVT9T@xS%P1SkBQPf0KA)nor%;&n7Nu*Yz<k{lH%2*SCH8PpagHxP55<v
z9mf{A7!G1dVVZi2C_~x?S^~0A1~Cj7ZGjuGxtjub00^D@K9paOqG{psax^7GA<@!3
zj$W70Xvhs{C!kr>b>inz6?c=yh=5|23)l}N_$E>Kcg57kT7I*h0jOgnh4=c&{9R?F
z9x3WCQ!iwNgTly~T4Yc(_sF;htEPZJ$tKI<l_=p*0DZz4Mv;(Of9w*2B*Z#l^gBr5
zi5_te8F`|30!;i@NTXWAs2b7!IvIsh5|piAbLgkLAk`8dCDv6Z(6nfdY$Gxs1kI`6
zeK0L;(1<k??=+dSOVlV~f1uXSx<rDfuas52%cClAGRn^#7;8|7&XQQ2hQ(RNAnMk@
zOs{9|gP|^PN*F-|A&Q%n&Con&8n{*mb*f36w_s?C%e!p4LSz=8eSSR)&|lkRt>tOP
zr#|~nt0BcN>!T6>|CByyNfGv+X(?`Zi~Z-xcv|c~e{K8E76Z@|XaL$`|Jh>y*%CJ3
z7#jNjVhGA9kjd`T;`bgkfEMG=lVSXc!nSEiB8@zCZ5^5jYHE$b(j=fBzBVA!%rujO
zr*2<HUr<d2=R8wcah-^+Q?}|cLYnF;XS#zR4@nR*nS%)X3GO$`?-Q8bAJtbRR70~C
zeX0?&QD>QBL~S$+-}PxxgQJ{u^#sS^7$KXR(AONkFw=uq0dzwlw4zM)ZRkZ&Wo*6%
z4w|fitZ>osgK5I?nv2e6Md%Fppm+nWD@w_^TgR#x1E9O+sOxmDJ!97-9@brCGba6W
ze1jcE%qqt1HrJ(Dhr+dGtRKBevXP_)g$k*<I_#%Vh-6?V?s<jzTC4$Cp(L(j_*)kG
z!Uw$~h;tJQ5V<wdlxr@%A+vd(FpS|?NV@?yhR>(^*oc@GMZXy0(H}%xCc7a05=JrX
zdb}YcHg4=N!Y)oJVuu8^;xoVBgC8D1VwcNx90)9~@FLNYqoa<CIC)^dF${48{1I%t
zmERB4NG-~-qY+>gq3M^oQ>$jtxY&-igeAPgim_&Brgt=3rj<p@8>@*{OuIMHpb;E8
zn+&vYPKKe5(BvwnCY`c~V9Zsv#y&J6Gl+cv1vQ~9wrpOQNhlojvyk7`ttc*^1py%p
ziMdO4q{96wP|duC_*;YPNNUbwTgPmELCp<3XeD)(>u+WihogPL|C{v_;e6R07o)fa
z-@qfr$Fvd97!MF>#w-~V(bxq#)o0`+GN?PBjv$c65gf}tn(O_!nCogXe^KrWYn61X
z)i62^#By{z@^z^VB26g`qj`c$j&3sEbhdG0b9TQ4YeKCe4aeON5Q!pndS$#k^OC^?
z5^6vxRnrut8v%At0pBQS4K*0c-W@Lx{5pRp>;{f!&&IrPZ5UXEw7$ljo)Uq~fU<$0
zM+7Mnjk4<(x<=Gl5Xr!ERyRG;oSxyk#f8Q&9w8<|SO5oVH62bC(-aOIhEm2!MyK8J
z!z;q9y^+(3t|`S0Wh9&ofLK6a@i&Mue`XG@apdGtldLdtGJptLa{|Gk-x@azh~ZF7
zi*<d>too7oX%ScHQD&KDTfWR8xzskleHPcIXaE-QXurUHgIcxRrpBV6|Ls?B)*BIa
z3zzb{zlDps{{h%0HdEW;!CM{-=p6h0hn|T0pWg12v^Y7nna2_H`7gi!iMjslw`S|(
z_}4!*sdw*|^*<R;1MAP3x3Ka{`)DNoPw$lEK2h=C`?SRWIVn#<^FC5Sg52bbT&#@$
z7a)%p;eSoWn~X<7S9gU;XfZN^xv+(y=mwCEzsbTJsa~zCu5^u$EN^JF;0LL-;^hHm
z>vO}6imRW9vkUumZ$Twkp;=nBXng=inA=13bB&IQ!EP<ZEy@Kbu9`IntS%WZLorLe
z2s1(ynf&4EQZ<N;=z3AJG{Y65md@1>@7lq5cm}C>bj!qFGTafpG3LC;dxL7}2GiMi
zg`20PJGmB3{_*`48Aj!ZK>$c)Vf@IX3ZA?y=Ag-170TDv$9$VSJUQoVsn4|>&;kh+
zJP(y2Xv$%K$m=t^=U|WrpBhrF?U2L_t@QM$H2?`ziS*=VgXpdyv8|FBh7km{bc*<@
zT0*_bmQb&3U-67QRKuK%M?S7(Jd(amd5}&D$(j%mkX3fXG$V-TwTUIxPY9NWCDq8o
z(pOIElb+HyJ;^PPt6+(Zh#8ieo8B-FV!pN+GLHr<+u0ktgkvpKDS)$T5~oaB9zqDK
zL!^*8X-OSqY^>;UNW|q5zp6kngkd#zDkY%A8^+7L9CxR5;QM&8`$YlJ&}ul4yht`1
zn^2HuGm)G&sfrU24+EGufTYC7Pu2@ElK?17bQQK@bpUoERCgv}Yp_*$3G$q_*=)RD
z-WvRc#n9SP|K#`joYwEck2-2n=%*8`bCjd~FznnQlx=uk`fy<yqmsq|T`E_6n#xA%
zU|%yb=v}-Rv1MjZkIgJ5pu{*V(30b2gqIDlFc5UGj-9eQYTl+Q#*_g8ROXvy;7(9A
z0)lIj#DbK_4rW4QM~xB%ngQCS!l>d22M43!kU5PN2E%3HyU`97X=<rj!D1H+#}<2u
zT`DnRyvi_9yRmB>1LASN^-iGeYu&t1FDtufKw<6>io#0uj`J{vCWd7f7GZT+@0#W4
zqg~a!+ZZ5J#9}{aYA7<KwSLN*wIMK<I&ZKHsgH0;##R(|u{1DuV1Yb7tcF!10>%Wz
z7gmLHmqzDC^G<?cq>lNpIiMFF%0OT%QWh04cCzWU#*o<jYP|6RzM|O~trajYa12kB
zOG?PB1q<oAbFUvb8*E67fEA``$6G840NGG&#z!-XN{lhbRxlp6`B>BSwuetdV}c-6
zs397MwStJ)z<+m2ri%^S=EpJ#1}6aqYxj|}Wu;<HFlyXD{-O%8zCwYTNJ1MmGu|N<
zy)lEMT+DvWeM9Ln<T(kWj9C!68AV?Suz{MWLS}$Q{!IY3+2Fq#<ViA2w3%RArPeut
zW348t3S%EX3f_#tpc?=R{oJsL*YZRt%Lpo?+=4=L{By8^Mw5)licyGB)etbFhhhdN
z2RoEwZJItIj1j{65Tloi9S!E?g0tKyCq?ar5F7}W=~`i{PdpMcB7x4&k)X-2AZjJ(
z_sNsl7<dJwMRdHfahHf2y$qd%F!vuGT1qwCT0EkP;k#?8Lc~&&%UEt&45&esv9zd(
zmp;c{6H9~8aY7D&0oHIGf~iAe3DfoZ3Fw%c0_c}E)(ajAlZ0_SG-0D4fQ@7ujZK)4
zq#4|i5Qv1>Wb)?X1m7tGH{vAG2wsYgGh~y%X7A}^{$VvBak7KJR100$nCoJMtj9j<
z@pCAEKGed!V&@}eVRUrtGq-AlGvaIEqN(dMDKWWwGf9Z?Z-l;xH<)G_os}pL0Nzv(
zGo#h0l;0(U(lbR6t7Ri#fGn#F`>Ql3HW2pfau+3bAc>Dp(c_8&@en3k{wk2R!q@@C
zrLM;Kn2}*;BDX!BPzam4F~e@x|9}-if)kIG1%)_?3l;O0j^|Yo3YN$lH>_yg3W9pn
zyA|jriVsS-AX-)iBiQNhXy;|fNk$>Wl?>S}(UqKOg?LH&(M#ry7z@Yi@rBcaLOH1d
zTR6cis@I2t6cGmmG!g)7l^Ri?LZQ4PBF}s!Fy2i4fRPY90d&t-s?-RZA|9-10t2By
z5(n`8l`d$`6R371x!v({Klw8FS3huU^)4j`G8?v7_~Y5z1dT>9#?(zLjKN4FTD1Cu
z;w&)@h{srVUVtu*&3@!I=98)`mQV`QPirU6h55k>HH^gx9hnn6)Ek>MHbo_f^N5@;
z-D4Y*wH;%}4k!bATEr6I<y4P7Ua&~K_ar7f+9C#{!?C;}vkTc_=!;A`1ZIE1%Euck
z!gX9mSVY5FUfc>h5ci#eTsm1xOq;5&LcGp+RE0{aNfa^57dFztS$Q>Ixd?G*s1&Fe
zeRHu9=|vdthah30?4sM!Nve%&0<aZ6yo?NEo7jx*B2EBHza|Q;GoTUm<a%o8gJqD4
z9IAQ3tc1B8Q*{Hp(bFY0DmG-9CYjObt@D;9Pc~^?NV&=U)x{Vr(xL2_sB6NY)MTev
zQXOZS!X9O#-b6PoYf2*mzhE2a#uq5wG9s%Q?W4UIg$>|a)~s<-Lo^T`Cy(}{PCUv2
z<kBxTI*;(-U^}-gAa<x_0HewR$kgN3G!$GBB7BJlFa2?Nj%uv}b2T|-27V0S8j5_|
zL?Ac10>w=A{0o+#;Vz=59Vo_tvJO5ocK1QRM7;qAs35nry~Iicswmoo6Qzlg@zzyQ
zwQ#j+w8`{sGSg^c3($O^id)Ap)irB`uO9u8E~HE-60g4`!PY_jmIZJV>N-V=w^PN&
zOG-l75sd|~zWPe@;fpn8vm-rfRfsi1#{>q?bcnC9@Ct=R1Fw+Th+#=7>#9^1HYsW$
zxFsZg)NiZ|v}XrMRLmv9dOb`P@E|su&IwtL-q_oR8R$EV-fR|x5XX?smXILWOuj7o
z5oI|7d6+E$2p&~SuuI73GgV#G>_gBe8r}(-rw>E#7PScU(Yym=H8Y$J*{F6n8xXsl
z=H6y_;ltFEOqNeHY-GJbBbboMGo!gjpu^-?ZbM}ec+iA2;z)xX<93lIMQAHVv7d<g
zyea$`fgY^Pi3YEqU(SX(M{jr-oKyhExIV7uyy6><l{DigZa4FF3?r2%3VLWQY1lBI
zz=NiQ^+X!($lZ#7gRgAchqNjH2Mo=J$|zQ=Ohmo~imilwA-2Df>OpB2yrjROah-hN
z*}}UV1!YKwiXrV{5ewcuCl|lGe`@G>2Ed9r3=Yo^0;-dP?1U{n`L|IQ6l(+{x*{$T
zQ;7#L(n<P56CPb5?L>@2p+S%>I7O0W!WKE{0Y0#ZF=m}7j;SQXuR(Y~8Oz-Pa_k@k
z@XG?ON{GIsWRe1Y_sYFU|6mepfJZM;C&1cyQ3Gvbf;4gGq?O>y9Vyb#nQZD@5c>>+
zWKt1o6Ao-WXqAw3M7+iNm;f9K@;O*mC$vJ*ZS>BB3>_~`U-XGcunjHy&IH?dNosIm
znDlC08G$YJuZ-NJrRmiy3j;(~KtMnL1=vjABEV*Ru>y=!3e%k9qd5>3D^u1@dBizD
z!iNdiG##fIfcy<tP*@^wiZwU18K%Qq07=(8oQU0;6%hpz?U2a+DvwN)2wNB%$^)Kh
zk)D>-C+-Bc*iPvRMFz;|1tEnReXLKbL{PNxQd}fqCIw6qWuky&BVR48N)`kaqy$d@
zzOWGH^jfP*=Q~1t#IqxvA(}ctw@fgJ56ufC>)NTb92%|RaV{U;uHz-<iCadC#hhfb
z<`4klW?5wcv0vM&^7r#Z+5Zk!s#MH_-Hd%SZ2#+ar=<3dwEs^_N^Y_LJsHm>%#u&6
zI&*7bc6>?6iSFKL$CunUJ^3<V3$-%L%YZRlnJu4`H#D;(E4MI1P7G_oL?W<>0HvUc
z@hK8hT}hI}L!6{bw(2SmNVy46(ZTD*GnA8TWi@gPv-21QeSSGXi+bNc6?`d4Wj<B$
zr?(_7j`7sH|6R3Se>3&b*#1vWj*S17+B+?+W&fXyCu0BOsuK;M4C85u?v%u&RP=01
zPD}6IC&IJML;%XtN5f8o9Y2~jTxr<r^T>SLnP>o@SRHQl(S&QGW9{2t8zBE>Pt^Vw
zSqPhv0cgbkD=8@@^88OtO6}9K|4+tqN!P?uuOCir*rw(3C^@0rpap@Tw?ZCsxzI>d
zPl)&={*ubQl0-S%?8U)4?gP)#IbeWdBaLKUSaG>rcIpZk`LaqG_P*Xe{9XcM$r!7D
z8f&~Q0p=lNEc}DP2jy=3?O2IxK%(oWCLKd<960_F3<N^a-?7$M4wr7CnA{ZvM7s$r
zY~q+R$xEpt^pbY{;{XixfN&8Iv-6=5vy`FNh+v*j0q>C$ybRh2=+!W(QI^Xn(M|7R
zlHFJ<F{b=LEx9W7s8%Qm46RWQy8x&$E4)D~4}{T*fG2qp8A$P~gUp%2Aw7%Lkj&zo
zcsoJ%*T(IZr|~C>{)bS`Z(a}ZCis8%M)|MB|M$c{^{jtcfa@BY!Tq-}{y#aTcO?Jc
zCoQ>!|34{DbL;Jz!~d5xfZ<cn7zp*IW?wtzZY9bNX9npQawyWzQT8bEfUv((X?EqL
z?q$e4zH}EbyYL}3dmlFD`Ssg!`-%Z}4smEaKXY)l@MRDVVW!zeI*hr=Rm@Q3hRSN_
zVpFRMW$+b+SNNuu+o@%k3=iRrWSdME86_eQVne2GwYsgFsN!nK25*AmBNIH!ZIT|1
zNU!I>ax!;gk!?oX!ca7-VT<7?YoFVfT0M*{_J@&`cw*d$L^WnZLn_AJz{pH@p2D72
zH_tS=O5&_DJT9|Qwz-_iWEBe1J7G1f_r}d9p%sx=$?}<H6*dC})`bsQ6vTcq#A^X_
zZc$|^WcH>JgNYa?-Jr3>F>E6F8qwX!uT5Zo<4-;3KmOY+XFooT>HpG_lOxZ6;1^rY
z|C8~cbt&EKnRDuiJnY#h1Ttd<?)G2EvqK?%$S6<h87>7`<BlObd?dz3RDFK#9a71I
zE+d^IgCq2mU@0wGixeG>?8rqFUTmJ_{+7hCtDm|Nx9q=%OynY7L9BdxcKU`Vf!&Em
zyxR>_{+LpRTQY4O-};;OKgJXXu&^vl%_#vkA^wv)C8<UJI~h;C>yLSWnyHT_tbb}+
zpO*DM8Bc@jA8sB+(DAQ-pXB7!mi0dwPh;!PLu+WiBn?<2{9kHXTAFqJlim2ah5tJV
z&##>S%f^#`<%N}jfO|!Rd%w3tUd@-uOOF)Ml$2f;81k%MmOZU!_o5y|GMnQ`^A)j7
zO-T2J)n!&+&hwTAG4i*FZjbj#LxO>dpi*5;>B|*=MOdj&o0RFx)<CMSh-qNTFB|3a
z0dO{&@ylitW$P_XNxm?>SFA)|4b`hJ!B<0d8cOWdP`&ySaWzz{{sdeN)@ms67S>DT
z(C06XDc@GT3vs*&vKnlFOj#(iRe%25F;?Waq>AX-`0E%OFva^f<xXl0YJ5*-^K&~!
z{wq#Zk1+?9l`Dvy3yWHe%!hSM-9+ca>eJ^KQequb+t##L*lx_MSd0dmM;{Xl8_A7j
zYkG1lYbt6zw=%YEtRhR9RhiN+%Nqpn!+zztLjnLIc&(?nC=ZAz_`D@v4ughLLJ!%a
zx4>L&%fdm;J3;l;QAAOe&_fBaP?J2}BE?T5bq`>**Mn`k8cGW-G&R0*)YBNwRnRIL
zfnt!9N~T!B)_KD+ly<>q_Ejimxb}t0V8jO(i=bls?Xu`%*uynLEX+%#%he;Xhs(vy
zAB>0laN9?Ru$l5$;l*&o&<c*s1QJI?S(rWfBvSwwEEmt*2=Jo99u;m13%IHS07WdM
zuSSe%P}>4#5q)wy4eNu@L^N_5!S2wvRO5p(fiwmjOckSJnl%z&OxJ#ql1m>mtd=SB
z`+s`|0gEg}R+g!*WM*xhmgr7RboZqk0;%aqNhc_WKx7gDsZsgQIK-PSV>B%PB_*Y}
zQzGTR<m8t8&nM++k^frczZUr~LjL3PVj>^^Lx>x4i{RHH`27|IKhctf%dne7h^TbH
zEi#~`t>2CeXiyPs+@K^PZ?c7cvDCM*4h(<<J0_q!HU#n=5nRcmg18r`Vd;-q^uB5y
zEQm#NEH}l+r`*b{C`nKZ3qYFWaUps7M8I;tM+uUVKSo$#!V<Kg3yKlL4u~utHNqgR
zR-uRj816vRD9>UTC`r&qE(M0v3QfaC4hL035Hw`7`g#K(l?PRfUr`>aRd`)Jmn()X
zmFih$pRvps*%YUj>Piy*n3qiuaV#nbxmdCRERe3A&(DjI)PebT$+;nzxF#EGg2!P4
zy%=O4`!Ps=Y~;`a;b0j^=n5Jd%A&5w+z51BY6=OUUkR_|fmoI(K@G;dmvhU>>4PQM
z#uzd&+AsC`m7rH8*Dt*<YOX*3LeNG4Bm;sBhXVzZFHp5QNq~^W<TuTgPm-J!044O5
zrDE8POhb$TQ~gN9e)VIKLDWdVsh47WlPNpkFg_$&Qk`XxN4fhZ4p!<CQNSBxO%5nU
z(MzN>xEFy^;AWt_BV>-laY1&lU)-`5uE9OS&?XqD0i=mHWpp=Xd5@We*fdzvP?J(&
zs6iZRpJN)T;z2CZvokBfiZG)gfoLYye7G4~)y|VDT9qq$PQ_Tq73);criMETRs+c}
z_dzcjY`zrE97>O?2WK;Co9iAksE>(_kJwu%irY<#l*GoWFI0+K;8f~yER?Q;GiDSD
zgv%=R9P1}~Qf|wn+!2#XPD;E=@yD1H=J{>_gWYm}5ai5g>`u%NOu&YEM>ix=S(>-L
z&es58K%T$ih;-gIHZf&%TJu)0ti^I+pi~XQiIuAc!<yprR%>OIbxsMB`E*wm%+z$b
zHK$K;pt`%lK4|iwuvb&GfKS0=g@QV>G^J4#vmW8kYWt1DcS_9ttulZinlW5&nXns=
zMfG&%oThGK(8cV5Xv)=rplUH+XHH;}Y0r6mp+GtoNyslqC>oMEIH5QvGym$MD`O10
z%pwQ4qyd3ymgy7^j9S$P6j1G|pW!3mBtfdK_%sRuRVK0|^SO&dlP7b9^E{{tOG7Jo
z8b0Q54kkV^$=%!D58ol<fl6^2D<9Q=yB5=s?ns51;{Mfjm@QA!pT_jRW?s0deKex~
zb@z#k|B&oXO=+?JJ}FO&{<lT{+oJz%vHxjN1GlJwThzc7@t6G-ZCa)4eJz$%zfAd?
zWVDLZ2xT9sVFhM7CK=`$FLJ6vDq0#q_pLI;qgH#%Bov9zhe{1n@}-(^uqJ>SPbDNP
zr672QG2gK4M-{NfQvaY{6#n-Iq+p;94i&FTIc5gs4^8l4idl5Mf-|@rh;C42$2w)@
zvMS=F@qokLa;&UG>lg7T1Ch<oG?U__))I}JnjB>dppaZdr3l5u%w1A0$cvmYWrCwg
zZ-y$fn0;3G!%Q*3D<)Rd2%<7*NFI|$qd<<qPk6>i?z8O)P^@I`_SSS+U8+*mng|(P
zLIW-ziA)~gPrN=hyHb#GYhALWi^W(>tMLZCLS-PJfkUQDMM4EjD8mxNL`)9R1ruy>
ztU#pTm_Q&z-{(reT^7s-L;r>~Ha=2Jasw~Y_=!HfO!MnuX=p6HIawrC_$+DAw9g|~
zU<#HnOrDMrRHk_SWxg<_1H%a^H2}Ywpcj*E>j1*#fQbSoRI4n$kcc|Nc>zRL1Sud?
zSkE8ovcSy>1%4xfbI=t#xU_l(Qj4NTvMPGy<5l!907hgt<yhuXgP7us>E-!ydi33{
zt8aqHch>YX;sJC==v=Oc1W2O{URHE705C)iR(myZ0f7*N$yHE}E02>Q3m_CSx)rLE
z79KG~4Qc_u6evZO7S~6i6=A3c%~-Bf6io}1dFjH)vIr8L9GFZQs7Mj7VUMRyJSrvf
zq;(gc1QJRnI^#6qh`>=;3oi#GrRGDJXdL66G)^Z*XYiK8aseU4Y0*a3DxJnH6};4F
zcO%f9IFCe(exUj=QhyE5F^O+8F*+yP{{e&z^v^-0vA9>TewLYdF&$da4_&fbG}s_o
zfO;Hfa+o#jHsN6Ku-wAw7R+Ti^&&R|r$iW3!dP7X2_#mSLa8b-xIy<wx%64#Zh=wY
z%^f9Z$4dpe@{5?QX#?eC%S8nPi-%_xX3M!n@{q!UVYyk^S+YH|2>!M^<>9%-IR!(D
zWhhaYnO{6YE*L0h=8urC&dtwqO4-*ADa<Y^k_!su+`&Wga<j9Xa&G>ByrEgS`Ge&C
zP%porSkB8GoLdZy78l6aA#W--8|n>|24@!z$bmmI`{(B67LRbs19OY>vCV<dXr??Q
zv#>aKz|g$RLXc$(hZGcLL-$!yenEb2{=h=$C3|poez6OBg|6i6Vep4sl#`j4M_pwO
zh0zz%_>2G?IR$xH*@Z<?|7;jpX8*iw))h=@Kwf6<V5gjwIXH7rHq|PCRtl*YAKmbr
zY<dO#W#&tn11K;Dz+^x{esLlE>4aGp7VA}q=N4rHT`9~hLVye`EP&<_oKOQ{mM=lQ
z{A|_=f?Bq$2o%A;hZbcUW68?S%!9Uya0Ku|5`|mTnM|E&R&bF*^RlMvGaFE6{#Lb_
zjq3j*6$nk}qhbADvO6_7(*G~1PfPr#lk-d;l0WD)>3l@H({gjN3gPEe{J&jm_&0C#
z_w(Z7<n6gxnZ?)dJTSlR+M@SYef|EX3*~N#baRKUGkX4M;8KU&S8liX_5qu>Na4i~
z4x9Y^8tp;thA*opPCR;T_3~}QuBcu<?ho$`Tlh)4j&kdsvV7m$a?#XI_ja20_R*td
z6N{wW?>D{v&R2(iXj|~X!~@HJ82Q!tAAk2$ZKk`!&3~MeUQ_h%R{z=iQ~cEU&kI`R
zB~6jW{`qiGT+!QI^5WiqYRrc9>*wry+TG)pB|pdA{D*dJ9{tbIp0no9pC4TLk1bnf
z4t&)6)Eak(%y){XIMd(hQhD)^QKRP0o!hJP^vd2lS5$vk*?VMd?GFpDo_%WDwz=Kz
zE$(?5Jg1*N=-|IU-#9m~`+fO~fCydQx9{8YE<5AyHw(hj^X|b_aUIrd+_>@9TW=jR
zW=yxv-o0BFe*5{xHM?s%oI0Re=e29sUbCclVPW0gt(Ts2&g|t??{}X5KX1MD)}ce8
zv+qdNKF^E0vZ|_T@ZdWaE$T5RZ_~PUi<d4v&1Q@5)$3+?-TUv)-dJ96-;ty{kHnoj
z?Scy~xV3-RxQ7=k=$e|kZPO<IN2|iScI`^@|D%(1YrlT|v@bRdb)4yPx!SZ|uySSH
z*s*f=?$fgDnVou9Y`QQI`0DY;d&W)8>wZSNHmg^!w%KgYKKrbqDBHGe+q-vf@AIq2
zj{RiOLpR>=&Ht_~?(xG}?=C)d-JXN*z4zYIQ7<IVdHaja4{3epEne(s_otU%e))dq
zh&RT<Rt%+&Sy*^l$BtX~9(wS>i!bb0yMKGa;0~>Cn%aLsT->UcUfMP;46Qzq)w$i7
z(xpjBTefcPJZ*R2wSTWzx$?Xvj_!{XE;)L1&@KJrJGS*zC;T%cb*#8{?E~FfbvXU>
z*|TOXU$NqUYhHZ#VR_1wDc#<D;)y3FPnzURNN5$;sg3u6Q%=44nvo+%78dqj^lsO7
z%bt1WnH4Mk{^>W{w{MS|decp<(&s-l?1}ZBWs4Rq8o6}f4au--?c2AHi@W>H=T@v(
zv20oY(oes+{^E--UN<T(Zrt+o|FCGwj2VunuA4l5&sE{f%!wr*KlAyjJK85)G4GYS
zZ=d{UWuSGdqW#I|wO;(h6C2j8d$@4Pg&hYu&b;o`Np;`t+t&UZSMieK!-o%_b=Fy<
zUhuE|^qWUddB(H8^MWCNz3;wDW?iM6J5BijR_o2XE-LOhE2rC^*Om?+K77=uQ7cDZ
z+^N%*-8#=)G;Z9u#l=129){+3>^N`wY14K;^^|LH^*vWDw9j0(e*O9vpI=<OFQwwG
zeuulg@Wj>0Kl>{dbxU1tPhI}T`|p3hZsx4<<6m8zvGJDn4=-JM;NYGOyLa#I+O=!n
z3p>UQ898#_zI{?04EgETem=7I-9^tm_uQk8JW|v5!Zw*#E$kdOR#BeyzT3Uqspn3c
zIB{aZL;c1S6|LD5+#5Rb`s;CVuW#6JM^3k0E43c!>F3}5<_ph1KYC?QT{G>poV(h#
zX(Qjg!L#h=pKq+FsQ9ep;=9|fd1id;Prkivg>U5zKloF|ty`78dgt=lyC$Xl^RxBm
z_MFvsR_k?}H-Ayncfo=M4=i&Bc3rV?3=o7{Zn@=-a}v|j(@#C+6z?00x9#gu@L=D|
zF6+AHtX{o(wfj@2!&~+qI(YCPpzOMJ>!5JSjfeNFz2lrSrEI|UYoB@j<Bv;Rv)i|6
zJ@_tI<hwVGzxeJq$GY$Nb7`kBWA5FvVe|XjzgMPw_OBfWw-39f{PU8fPv#VLkDH$L
zzn^^a@cI$wPP?>o?!<{NUA6Gwp+nCvTXyi9Z$>;@x_0B-v;zkY%yga_cV#Eo0mau|
zyKYZ#)>W#iE}TFAqbEl^7Z<l-c4A`Bp7u`d;^I2qrhW4IP20B*yS4xB&pz{1RJ4tg
zXXdm${o?mL;{$=jn^#|X<kYW^ZufS$=%S0dbzZ-Ewer)_1zqcWzQ;3H-hIz~@2(2(
z2ddC#|Gs%WCfV<wKYvVd@$=)h_3Sxo=awy7{_&5uzxa0M>_W$1(so_HX6@QjrtLm-
z=n$a!%$YNP{PB9vBsd{MU+sDYw%_@8etzJ<MQ5IQi)Yn>*WJ!pSEU~8JNd}-4?R?p
zle6x}d*;lU0~2V~suf^IpFVva4IKDr;<ulzFMTv+_y0`)=j5Z;%{{->j2Scj_P4)<
z!r@kNPcB`Wk&$uPg?HU?#~sBzU%BDC#}_W#GdJ+6E%ToK3;Nc6Il7|ai^m4feLMNe
z_fF}sX58|T`=2~_+U}h@cg~wP@6}iPxn{p~!*}EU_Q+pm*J>+2Ub5})6=%-Rf9mOv
zzxrhCWj}AfB`veKXZVXv^Pvk*@|^XayPi4<+vw%muP%P%`L3O(&rJ*TyYZ(Vv!<Nh
zCUaG&bEh_kj~+dG<jAmL!@mFi`*Hog`+E1JqF|Re`Ron%-gn0zf9^Z!r=_+zwhem@
zPMbFE$dMc7<eeJ#`tF+i{Ct>b*~sgjy>`Z-r`El;E~m?RrwoRD;c~lc_PjM~-D~!l
zy)Sum`=QDyN0yAPDl7Z>{C7V1;I9upc-M@N<IjBS$ani+dHH3)v+?7<dAaV}d*<})
zum-j`?2&E7THMrYox@-^Pu;s_&239Bxuo22Mnb|PtI}_J=%J7Py1)GFxa7?e9334y
z-oIf_?U(;p8QNP|T56x4zj^cK#Kgps7i)lyKmPdROP5w3KDg(Bu1khE^78XnyzoNB
zb35*v`Sf4odwn{m*W+6YADnXvY~2Uu&V`ZmUiji8kG!#K*Tv_3clzn4e|vaRAP{KV
zwr%U1?)l4KLIBHu{ma+-CYbhwuXb%LeYW>CN$1W;7`5WX7hkM=Z27yltXR=X%igwS
z!KFR#YxB<5t@qx4|BBMJf4=nU`{m*HwCd6(6OeOuVo66y`t$9#zZl+s_8n_SJ~MVT
z9Ers}&r1IEqBG8FlL_>4ao`r^#V4-by460e`mApb512f8%_WyywWQb<_wbOf&y==o
z+5`i9W6jO0%TvaTu6%6&JT>{b?{b4H?_ZqPIqtSK)9<|VmGPfWD_qi{efyi`%D>Mz
z501yXyZrISAHP;Yp+oa7)8uyd=5%}D=QnR3I`gJhBd*)E;ZJ{B(W4-}XU`js93ABD
zx6V`8y7jepoV~G~ZG8Lo+M;*w+&jjZkUQ{-g=e*IpD^pgoL0rdhiiQ=lx}@vPtew;
z|G<IMM!QO$Exq-jhq~Oi{_VHkf<t~ToV0OQE-d`!@T9b~v;iesKFYZMz{ri;o=B9W
zop<({)_+0o#IIE7`jSD?I?tq<XZ9cY?q{1VW&V8c2bX;F_1JS~XYYKZ^sd(`XT*7u
zcYO3x?FHwbzkTVbwsGw`bm-Q3`tYZ(1CHaGYp%JVj}P~W-|y<MrcLXvfBa*YX}h-^
z>GE&KtbHH8aKVi~?%r|W!#l59xO4RM+3Sl}u3QTLwLN{;h~;lpz3=k-o;>~RJHL73
zR@di8rk&D$-kT-8gWa7obL4h~ONu*B_W<PLrmkAG3W(vQz%O_2{@81;{Rak-kdS}`
z>5OyE8MNr#Yd-zURkOa>JiE)~-@o|kbyLs(Ak_E5&sX2P`okACZ+m*_h38$<_wp`h
zP5)c>S6%LRo_*5y!u^{z%dKwDdSv1cU#|W8-|dfn2Q=)=v(J7C4z=(9wIgooV~;&{
z^=ubx#iz%-boOm)x<2Plo-<?T8IKq5`}T{6rX1P3X8W)$ZPXWBqsJ`$&v#ER#BPc%
z`2NdR!UsJwrzalyeD1c1Ke#TO@=;u?*WL5(z1Kc_!wZ3r?^>LooVyA5Cpc<uzx~Q-
z4<?qpns@cp-yS-Ymy`4Q;>&wEDnESfKNGx5c1-(lV5f7}rQdi(y7TQZRU^DrXB<5`
z<?<_@bf@1qeE9yIJ1394T>0tEE>mVC-M@9~){4y!R_|Dr{oH%E&A6!A=UcXH*^#41
zUwP#f`27Rl1VveJ+ih)^O<LS`de-;5CXV>(W$o(y`?h+vzMFFB-Ga?8t?H&IU!M8a
z2f+c0if+&P>6MB9-0xoX<K9I-PK~>N`>1QHrsi}@5ATD6;jiWEKHjlo`kSA^{#pH>
zgo!(L?)2|^dB@hRg$sr}ylK&c{SI9J>77-l{U3W@9th>uKR&HDQreSBPZUPhk;+;U
zN}{VxMbj{Y2{Rajl(Zr3t|aXx6|E{Q+_(|lZlq1xRZ5Fek`}`EobxR6%ox#od*9#t
z{e7=Liu0WFIp=)NXFunBPPc~mgv(pzpG;yht0!+>JNRVk^w%p_?pilZ@qAO`Q-kbP
zx5WM9S>2<bRF)pQfB!yUYmHez@`Q)i#cMfljC}auLCBjsMl4oPMd5%X$NghJb5t5X
z-QRos_{p1kpW89?^m13N60sv{!yM0DEDz-K6%Nf@I6(DD)x!tHW7&JO7@F-i0fs+y
z3g|AolODB?FLX$qt~%iBw)p@Zr-fx|{rcIdzuI>0&*y3GSx4X951p((Yl=sKDzM|0
ze13TN;zf3x!s*UkyLtc(+Fi|U<@NU~9W@7;pMHHS)zxAiTQj*U!^maYp%PP5(_XP1
z8P^^?YJ7G%{>~lOBC{dw6C4JgKWeTPJE7meZ6OtouQpW}YPz`Ww6|xg7}pJpdw*%Y
zt!4NrOR%WLC&vuxGvpn6UiOQ}7v|sUiS4&yL_Yz_|L|emF3V>gnUk<<*SlxWPAzE&
zUolc|{F8}}j<3rv4W5>CEcrv14Kedo4o+WSIlwS7yXNivxo_X-7P!T5fXsaHx@4>U
zhI<Qq>sRLX?6Q2&AYJdPr<9dH-#HuDZ(GqHTTDAE+5FPE^HFxrqifd~*4K7gF0!j+
z{n~R)%AuJl77_PMFAuO(wNRULdhOsL?{dP@M{FzFcYUHx-v_0m-DckvH7%)mex+oN
z_t2UO(}(A?iV6zmk5F8zGOFi5_r81g?(N||@bxs8RF+xYc!8j@V@kWO+eR1HJ&W(c
zW}CaW+vHH2FruXC%cX{D57*!C)K)$8pJQLW-*c_b_-TC?M?`pfdfLx@zQI0ad0ANb
zz5F!^y{l_o=d+kEt{$0tvOszA;|tbb8yn6P@6;P8if9OL+7<ceV2*hS)<^Nml`AIE
zAL=fc^(?RX%1Tl)s>0$g1N9G7;_%_apFe+I^P;#knQImN@_KA<XDyx3>j6P~pFbNG
z6`kp+<gEUr^l){4d7!E3k>q1JVb>4L%)7FgGv`Qe#VFt{T)lb~n9&E9UGK!m3kV7M
z1nifcRuT7Z-}d5gE^t|aW40$Jmjh|;s@sp%|E5DoNcq(rNz*bqt+dmy4BL3nS23+?
zm*u&+4~F;px}`cd+1}tqk?6+FRqMhH))l`1#<A#}+bxHs^A60JJ9o|M)ua6HZQ8Wy
z*3FyoTesG|i)_j|eArPv&SKFgrF7A42j}AXE;o*8ss?Y#jqQD1R53=i8tZ7iD>D0O
zM(L6RtD-r_J?%T&9l3mhccrebF742vUv2hw-Mw$$Fkl2!6eg{z{v6$H;DZMbSS;3h
zHOqT<?i`$)YpC?@u4u)jf!kMY&mTW=)m#scjn_Byj{Op^<yla8?#s6)JIsyK`!MIu
zy}xuR5R00(HojE6QdK3G&|zr5HGq`9H8cSEqt|Z@kP7{EU3XWe9-8I5q@hHqVx(OS
zyD8(=#ZDakQqxhlwTw>+KIQ{;aN~x~8NrSfbzzQ<O8p`X!@JFACE42A2A%soHT7~)
zQMXq@z^T9{6TdPa-s|qN4xxoxcSS#Wa=|tGfl`GY5VeCNtIvNvar|&`kJt&i!x`?3
zL$i*BgoJ4Jij9bf;IalVz)AsMSFLMWUQCU-`2m-_L4BV`1^#((SHcL>VK?ryn<spC
zt*KGC^PE-Rh7q7MsM4%Au2_)=taCMsu#G!+>i1g%1ZYO|i|S$Q$cBq<W!{74%wn(m
zBX{{2-^~qQDz%*ZWn{z_eNc>O|MKNaA79^Tsq<3xI&|m|w_~S;nh-d}nG61i)97Sl
zQ(&N$)G0KyV5Qyg1RdqU;VYk41H%p|msd$|Usn#_IW}^ho15dFsTLL%z>A5=Q&3jk
zuxiz{npNWrzvU?x7bb)yU(dNJ=#e?H$BU~8k>3Kxtl>p{8h#6ypPxR3xJR4Tbvzzk
z`}*3oYZVn01qB5U9=LJeol8ud6%g=#OG8)H?E0#^oBBu2pD8+Rbf|suv0WCkzm09`
zy{9P<xMjcm5|f!}=HC8VX-DfGTz`LHQlH}FMSp&@NO*Jq6qnRKcPAd{o8l5t_wiQ$
zNXEEDSqoKt7)y7aZoD+)%GAUJtPAiWQV$)vS)#}ptn)bFY?86Jot@ncpONnQW3>*X
zq}XzgZrYZ6(z_x(edFa#GiIF6tO^O~&h<`q&HxOb?_qRevx(Y{_6H9hyyjPN;}0&&
z++6(nqrtqxtjQ;)06Wj_<iT-4L36|=)?N7gmviRz@1Lk_^<`Y?_DPF|V2M}WJ<N*n
zn`ocO9<^<XX8dFahv2@EQR8`=cMS8|lRa;$>m9XT9>=X;t6beNqIAgPilVx>o>7ff
zLt^q?&DJVCr?%8@gJ1#r0qdue(6POBiVKhz{I|{@KFrg14-fJ9a8qS(@_E6d2Og_O
z?LEDDNRI%;5-XDtmFxbTxc<8Ex~bxFY*oHTy6a)!r2&&1EG%$NfW=zW`DI|)b)O2|
zk?R1#M>b@PvU*f@_EO1$u(Is?u7_8gJfS+JCu6_UmI>;CV+Qq#-RC_%F7fk?TNcKn
zvqE^IMi1nN2fw_gv37sJ2DLp}gQA~AM|X~!II^+d?O%H+<!w;2d|G{KgZ@63=eJZt
z7uaGdv8yxZzued-`pLT-gRk$J3SK8weXZGf!P<1eap30wSx{Y?t~l<<OpSTrryd<S
z)_;pfmRaD)kpR<+_wU}_%`+@&d~I>$qq37PI)Ad><aRVI^+~022kVXJ&s**~HeBU)
zH&q)O8=VA)QrEN-Cw`ecEZEGH$?Wpg-Q~uNsn-Nk1*-P;m&S#CId`UP-uovpoH?J<
zG=SX`f3vQ!em0NyFgklLXeJ&Kvu@qG+oo@X?KfU|Zm6VDl~WL7V{!3iFNWO+XLIu_
z$8y%&Eg539eXMDF1_PLmy|s4kv~tf}a(=8w|7VZq$L3iZDvjv#`rf_l`p?^L-q4xs
zkhykEPI^zvufSWHb6{$Y0`N0*jE&>R@4-gs1)D{DWOI!evz1kxeGfS`T>Quha}9hl
zK0m5!Uk1b1_e4Tpg}^cUr*6sYsd(kvuDmB})1OWFGKEo9RTUT*_-AIatFFM`-}dxT
z-}ZOz-sP_qT{4XF%_%T4#0IKtOd2stO*x_#h^r};-(HPwcjw-{_356=IAL7w1dU#n
zBeo|u>~Hu*y@$%K#SuFUpXwFo=C&`nkT}8P^o@`97dQRIRTDB<cSo9h+BL{=Qnpn)
zEPLH?l?_gNY7=6|_1JxVqN8S%oyLG8qjP^-95-=g*lab?;1q@2gN5q7wDLL_#N<6V
z!RyYLALd&9JTWSBd8dxYpO!Z;7>gU<r%t=qu=ei#xx+L&=U@ENvGWO^k*w~&q?WvY
zy!-Hp6Q3)JqK8E4KCkKKb31)lB$vDI^yyJ%X5oe6nzM(7#%bm?9ZXDotF>zagYo6t
zP|NmRl(<7LELiYmPN(DE#osjSXWsD18R$|T&|`&lw{BwPZsMl;vcxy{5*F6#%=}!y
zWrcs}c|W>(W?=>M-09Q3Ga@g%88qg&wyCLIeEk9w-5yFcVZS}$MD0)Ku~PZ`f&KKh
zE;Dk{y+8U{kZDKja{J$!X15OrI$;*<)9J?1)%iCX>V@g9>^pY{2ZmTJ;ML9^H}1pd
zvP7(#S?tQDm&qwx;)Tmpy|~<!<FK{tB<r5z931{S>HV_ujX?17D7L?Y@9i%`>yMW#
z7-Q9VV{};`zL%k)Qre-fS)pZP0-q+#xcl31fl9+z&q>*diKR!~vkHp2zs>_frM~Xk
z`Gf`Hi>z)*mh}lq_scK6^*lY_XX2#PaZ6lh#~qyR7%^~L(YS6ln(-N#D{U9Hi@$s;
zbFE?L$jFcWU2iUnQD(26z+#LGOn183zGz>s`k;z1=YTubJsB%5T!Zy&LiafKoptn<
z+c}ryu}U$XEA&p3Z85&|<yrDbYoNvQ^70m#tj-Q7Q1aE%>Z5U<-+kHAnvdM7yT(n0
zNg16jeLQVyKThB;<EW^qs<H}%FW=lf2^8>=$qH%hVpc3);eO10oBoUCyT@aX&$?;p
zm)<QdzIx?KbdgtP=A5~%^H01SlDF5^c<PiV`5x8P<(JCBE00vqG3nE8x7YdTRb4&}
z8PAwGbDy%6>xo69XC=BHnK~wyt7@25a6)_{D{J6#?Bcn4mBLXgOmgG@d{+L9D}Fcc
zX<<^1@z-~62mATF6#Be8mikIh=k=S)fk)HAFa53n9Cz<@*EzLcy?QS_bEfF<>`x^n
zi*F{gdRngd+_nF0jdRL*@8h)wA8<-|kX1U;%jEL?`%9hf+`sR&c1*^N+qWxTzfQ}D
zun}^AhhS@)|7VxXGgsFQ^iDF?SeJkO*G2bPk=ddN7Y|iDy_0@v=+LqI_gRb%)Dz}K
z&p!CbcfN{UVO_=}+x|=E9JyLpc=1Ge(3Q=m(P~de_6#_8FLA?o8}_-Cy}Lv=eJ!rf
z4F2;@Ji~hamCX#L3%hG8OY6UU@rfM#x(2wtB_$c@Js*D9n8&f35VmD_?^>IbUg8X6
zAOl%0i)MSK&%3*Cq=`c9om$UbH+AQ|S)I~wU3tIt`dz!&?(T!ryd%3Tf3(nh=;ki#
zY*H5|_|BX;%suTd<*`a9Pu~_~?n!5FGs>GY%P2J9xJB^9T`}p`-#pB^7F>2~iy0>}
zvgz>Q!xa@??zIzb+_oP(bH?AML*|Pa`lb9bE5{p|i_Q!%wLFlX&KB9dE@j*6%?(*n
z=<#N!WldScXxCEHG*$bLSFfIO&#H*{{LpoH`SMOzQ&Sb@&C3zzPT1?DHLR-Y<I0Z4
zgEE$vxK9y_GqSR>3OFfhS9j{&&$hIw)a!m}e|lifo?U1C=Y~7{C3+TWePMn68uz%e
zqM}@3_QE;SZ!r@Oef#$2w0~E(^xWQz_j$@G!t?o^7`JY{_bxI^jg4_EC@p<wKQd7#
z!A$SShu0<j-@f%=4S4s$`;6B*w%c}PHDG7%3$7dCeUiQS*MK*7Jkwpx8kJ(E9q{<{
zX7<v$>e;hr-@biY)jOu3E5lqdN(aNv9d(*K+|ZpNdSPa@_)Eo>eBEw_N|8+sCxM~2
zZJYAi{tU+a5}jj(g*j`>79H8MckiO|0(MoI^LC^1(F6bZTvluq{xP&`fZwQ^{57Fd
z`{(X+d38P6J~=tL_UzSBO)lzjtD3&mBve-?o{HGmK5NI}&Q_5VYk&>D=<A0X@2iIg
zm(A#|^ruyw_KPpoTDqJ2e%M@{eeA>uRZkC>oF=RFMQVr6_l(^KeA6#~#<fqK{<UP*
zhMaFK7w7sVFRumZUfGzCkkF&!&`Y~sd5mA5zML~g=XLwd-TVrc<ylWo%#4Xy6c%PU
zahS!fvESYdFwjWum%PTmeY^exE-NSmio_WOPXa7<K6`cZDzGT*<|ZART|TgP`IO|i
zxpQs%>rY>MI&xm-ElVveg^c<che|GAzU(*3TvOA|*)Xr;wbD|p_{(l?*DNzfkNWgW
z=bc-3j;h>0Zch(~$)WZ2$s4R})qe%DligG|t6|AWrMbO<z{m<L@0=E*%6R;oS990<
z%6_w~!eaX&QJ$A07(kHS$qF?{D`n+%?4hc9@8LuDxoh~NpJhiJOFFS|fod<cs_F~B
ztVxd<y&-Gsb->HNbnN)-*|Yhn9m6cDzI_er-@n7vu1QyqyUt`XD~q0X@*dgQzJJf2
zL;ENi?Yvy|(x<kjcw2$_%BDPP^(O}GM~2~kX)zZrSiiA6bfG<P6|zF!<}P_u@ihPF
z*v7NBpAD$*Q}Zx1aB^b!d<ABLL(c=zDxRbEk56~iT@j2$ex3YBBHPYGdF;b4Z%#gs
zja{bFp)4nI2xIB_rB2bm>M<Sz=X-jw{>^y6kPVl{jyLRg7I=HV{q`F$>fdO2Y#qi(
zaf#i2YlUJ*Yk-|QPx3}Iy82%S3UYDXE7sa`$7UWn#?Gm#tn|IM@K4R6l?L;EpQs*p
zygogK^QAE9#F?^ePF?od*ywS83?8f2a3-f{^uhGEZ{BbXRW@(ld}oMJYUkfS-SeF>
zW5ylxL0y)IRBaEfsn{G_(^=S0MajXgpi-D~{*S5RoHc9KSf5jN?6dU1ffqMYCJP^C
zMs0Up9|ydd{Cr{Hxr#tPpOE$)X4~3k%{=zW$Wljl%RPmdsHlbE;g2%KS9b3&ycs`x
z>hXpZ%9|ZyOt{^8bnHIJ_2ZXnC!sL-*bCL@=;)7U18pKxU)`IUI$bCJ^6^14$L!3_
z{dDG0<~;X@z86nc<QErLWxeyr%e7Dnci1y^``Ade4VScr@2RxUU=4lkvjQ0RWlQFM
ze04xM|7q&oN{8e)t8a#WO^u~W;*eCA)Fq8yU#wrhez1AS%b;P=f8FZJSXMlw?&+H4
z&z?QK{4t!*v3_uVQDa$CcE^&27h$&+)B-14RaLcD@7`k5^xWl1ovz)!J#)?+)&Bjx
zFJ35OEPeE74`?~<!0JVdV%CNYG7kyqx9C%0Wc}MtPEK~O6`u!veSRe|4>;Wq)76Ui
z^fm6f8yK=CCM88h{^bSh>~?iGh-VrbR{~L&6`7O&`wPIeXIFIzadDZt`1hPwI^*3d
z`gi6uYOcCep0aNrFzvD%>nfwWufBAxboAnKyN7S@uTxe#wdLvh+}oQ~dtO+-{?qDp
zwI$^&ABQa)t;S(J_NAnJ{rdHY+qoOMJ#`XZ*VScT+F-7u6P}h9zHM97jvXB`_urhL
zel<UTYmrys&bNl%>&t;k2BOqZaK>iJEbudqk!h+PqM6oPO-)TRZlcPDKBL-4jUV1?
zQhi;tz1^l&2Ygsb<5GJ0`Rl1DtyatHoeZ3?$<EF|)5gZe-Z?X6H_P45`sRQHhlKd}
zX;Y{E@jNJb@7}_>X__{JyXC#li&0**=)jWGyg{|KwfXt^mA8-Nh3T%fcC_m@Rl84r
zeK+9JcInown}R~p*%1EnrJS&UfT>N(mf0CknzC`u5q&1}Tx3&rMn>&c6JIxXcdaKW
zb{+DLJ8I@-AM{X+pRN)(=0R>$SKy1EJb7};5OZhk#a2xhR{YY?(2y1SZj`6@p*75^
zm2qdBd&hO@2)9`O`pco;n!W=Dyn6D)NMXpR{Gvc0`ThO<fd~6+-^{U5QBlC9&WrBW
z*w`5V$!MBehk4nHleTTUf8&OSP&hWU%1uA<&=r$c6M*q%U%w&lG8cGNy|(VS?zm>*
zIADM9`TQwUipm;4jed6VL2QQsH%5*eIepfw(BR<T>#MTjnIEbhySBp)PEWgTcI)WT
zqrin2J$f`)gx+F@<jaMHx+6wt^oq5zvO4Ki1l(OCr$Ar*{c(%};Bmiyd|}0-NAnUK
zY!BSj(9p1d7YrPmFblPqymi9EGjtMMb^EQ!SC2cGle6o>{D5<AMGrS`?w2v=ZB>=k
zl>HhvpK6?X`WF7^#b3_M%nY-5q+<Tg*!yaij_uXsCSpC_hkeVAs2|yBHr8X9mR1MG
z!Rb0HE~t2><aup-veDU?72&&d$-Vpchxdwg)CB&kLrT!~y|!D^c2C#o)P7k;hDp@;
zqz`d@bt0#?`xcqEulu=1t_5|1psB;AJ}=sD?2!45!C+Vf+qwo5S5X<*B!7-K5A)^;
zP~Jpz0My=T24)YRX27qqVA@<Bd@ji{K;R$531uo47M_lR$0;V+I!!n_e*W_RXXiP7
z^ryA+KeP)8|8gI#oc}R4HZqaD|7SdU<Ui+s{u4j{-2eOEeE;vqFaP~>?eCv!fB)Ur
z{s`(KFZ#)(-}~pb-#@qg{{Kw+CQZAr18MsGC;3~OlfTi?D&c5|1qoM^=#;q@M_f<y
z;9;;~uyh745q?$2k5Et)O5sqTDZs;XnTsgZ77Q;^Ns_+#!{_Zhs0Y;HOL##rdyU^h
zeaYoM#TGC{zTl2uvjR&MzzM={#|gan-r^wq5)`bVtB5Cg!oLt1p2*xlk_kdVjxVi9
z%n!!z(b2^isN)5b{{)Ez0=_o^6TTKt=8QtO+0c-DIPe;nKM#{!;)FLeeR(MVx`@2v
z1Z*i@5X=^aBaY7#=_*1B<ipEqcq%aw^`IbZPN7AbQRt!;XB4`)C0DljZ9k$fE|E!&
zh6{8d3gLpDAD_5gDEE>l!C!=fWB|y6?ki~oaJ}>bfFOej=R6@2fDl5+pr;ZFup(32
z;hBrzbzXRP5>B5OVoS;H6t!uo$^86?C1GNm5DwoDF%+kjoJXyu_M<ZU$zv;;x`I_`
zDys#?BIsE9sv9L}%*ch7WZR?lAV~m5b}yAh4$5NECY6&>4%3Eng1E=#!i#$VfIE}Q
z<whB^^h|0l=pk9ib%bz&QXrV5b{c4uElv~wZ|tF)vN!|;n(UP53DX8L0skW4lj}vG
z0vDuU@p(Z(Fy$7IfPilBhbIMqDn#g7Ci=+KN5zx82zd=J3(CpD2h;+*VJjdm-l99Z
zumS!o0Fh@50)p7!N@fHb;;-m}Qf+jtP>f$IMs5<vkCx(39<C`=GxZUoN#O&eX)qxX
zAwG#aufVE=+66&_Y>$R16!4mj2Z##lZY+f2tUpbkzy!J(DOnJB;S%>eJm9=U1cpWC
zcqbHGLYjep$fZD<6lyMkw=TLQ2|GgB#&D<tvA+lSU6&dynhqZbJyJ>1hCy;MN<T?d
zBFGtFU$G?@uMI*)DAI@U$i#-kpR}}wW|+jD;nIy8dI~>O8(0D@vjNEpK=#ZK@WU`d
z^XuYwO@nv=fbLP^HaJZ@8irp3hkx@0@OcYRgU^N6Oa=Owvw%wDNkXE!kp%`XLKEmF
zuc88*!WSdFYVwLWBsDxmAqnU^a|I*%Npr>Lh7V8PyzoX)BMO9ol{o@rZnSZjG=luj
zIB_bK42-%oFS&dTq<b)t#u7a>qD^r>6k52}lfa||7R9dwg^;RHrX0p(WQy>YY$;<y
z8Z<6t0{8*49l)3hK|L~GJp2Ga=}(w2NCqxqPg3`_8OZ|L@MW+JY<~bmLVG^YsD;%j
z8%9EP-|0cj=Y9`9)b@IOF6;pK?w}`aM0Qa8LD2(DVG(8s^B5AO#cZ`h@9%eroS~oF
zV^E9I1MjjKFSQ^t76$Nik-aPm;Gr}n#A`qRut=ZkUk;nez(bN2FkN%e*2+Y1kK=n&
zLGl}54%j8Z7+Jj)s3_+E-;*#&+Xx#yF)iJ)m2Lq42)tX67;-v5xW%JQ7}>Oy9z^``
z@50AHf=Vzu12AJy3g1>>BHsQk%5m-oT3G0b#2NWalsS!X+s^PFe!i_u1Da6&B=zAW
zhD|bX#_*wn#&UWl@~A;2t00>zm&&o~gJ&U@Yonr%#A{gJH%M*JV&RnTNu&}F6$bfA
zJI92GLY5!RM59@u`W7BRFcU8PNE*3#CHNRRWeQ1*PLUYVJ0{O~4e%2~cMX6030bbV
zV$zqhFj7bXKCx#gw?(Yr^Fyd<vz<<;M9NTa8A)<xg5VLeX=x_SXYrkdZR@h4Utn~B
ze9H}gqYe4W0%-N3TpS#HMJ02<<)ST2hl|)7nI$9yKJ+6|Z~-{=L2?lUX9>VBq&or>
zaP#I1O?L`Hp+6CfC*Q$M92g@YMvD*3g~LaQnMhpny_ypu=>l+MXZ1adLtbnN<w#&4
z_XDsB*AIvzX!ihz5AN>;ga3i+;vMYc-kR&@2>Bfh3kd?4BZ*4Q%ttx0U>+_qmo_9W
zlyBIA=WhjbTH)az3j^?{IfYpwLIMXxi#Q;4=f%gJ6x^@~g6f6v;3Uosv2e{D7EdaW
z!-wlZV|dae0{B2P0B#o7Km=?V&>O@PQ^EwH(p3?V&>%oe2D~s&z!A_CM@>+Eu;!j7
zDLxRE>FfkOBw}?C;;B*7QkKEc6GFp6M4$iyoN0g%K1atP9+iXXoNx%{czQDl3JH&_
zjWP{)Bw)A=k8Z(a-h_1X68o70p@$$ydE2^l9%@PcNlT1YiP+!wJAwm!#I(UbuySik
z0lCkRSOvUL8Xw_4F)b7TCl29}-V~@V&GSD8g>nNH{|*$Asr}`m5PfVb3SD^qK;q&<
z2;+-_rBp@hi2N@_;P-Hcvi`S(JM>W|UWPOb_{AUo(yI8J#v@H+BmwBgEYekkLW4cX
zN>jcF7aTD3iDU!eOVQ#RRAqc=q(vsNK$OhI-?OBJ$*77%?36=;%p{kW7(DzW6YBBd
z2Q`P`FAqkuS>q%<9*Qp<2{51pT=Wn=k(3J`p$OBK4bn?aA)&;Eq`g3GxX8TgAOyAt
zs7($?Dp=TTRB*ULe||7Z{w6bb+UQU;i%Srv7cPV)vycKnT3sY`*zmuLHCmM|V!`*U
z4E!tI&iHW)V+Mlpqc#TKyahYshinX-s!2Pe?P{G;$$wL=qgRI@od1Mc|2NPL`HIN@
z^~`Cs$h71o2-ZI@LHw`!Y4Q9gASr{N)CWA}Ioiaeh4Y{2NBaDyk;y3d{;$bT>i@ex
z|HsdNes}#*H0JO3@%{6^#>OV#oAmmRG8tv`&-vf~#E*fFqK=Nt(E?B)$uBION|?$s
zJPOlp`}1E+01`sAqXk!i_TUGIiIXP8K^lEn37J1+US`Ru0ieEVrv*SgU_X3so1ZMl
zxBDdx=rLDXDLv*WDVA52FaUk<02A#4;k(OJC)`n)(zZBSlG>Ej=|f@?PhAQJj;mf)
z3rR~2WmK=Cj)9`029XXJn3F+40-?T-6|G1FkkG6MnLtuy$g7dAwNPXLw-#V2DE8v=
zyfF5xNlwNrS|!|JmTuUrI{*mIw^^U?gP7`==O^OPK8gjvedkIyfV~N1dh_xW1p76I
z3-_T!(#5o{1i*8m;SHXw*7s4T7jVR3fM#V1VH$kdGO%W#K+!-4n*h&B@h~lbUSw)&
z;oD%;E;1(=riw-x=&3_`z-|RANMP5=nLTZ~i>-@`vx}kz7l%dy(`GXj)QO`vVgWjI
zfii95CnN9(Gpwgh&5kxAJU;)gjK|(~y3MQ!)M#)(+5x&Erh?N9M@N|tY%~M~bvx48
zp?ZeBP#&nqLShu^<f_YqLd_fzHB+)`MCA#ST-Z}=r&~`)DV)_M8v^hu06LbUPSu@a
z?aGGr9c`WLr%%L;3|YpCkV4=r@e_zJ^utE`b&C`gpksr1`U#PnEKT|fe!v05e4ykr
zS5!dT-GJfYF}S(Xos2MYHz%g207@|((1AHQi3qAYb49pPl$@m8L{HiV5xM7~O-MDS
zBu)kSA2KQ56N7`sTd|RZ0@TWe2he$#jw2J!3OWy{N)V=lgp?%)>Nv8ICxXiaZAV?q
zhzTYJ+%Rn<S#d#!+ABba0b-F4@U1XyM_7$2@*<+z0D$@oiahb*$lut~8ZOdu6ATx*
z3DkAbNov@UE`~bADFAhVdvzEK{2qZpY)Xy9Ln!p)0oRTiH(B2Z)>n*>k6Y4Hq(?Yt
z7}bFR7735R1D|qhN_m|CCrG{%hdFU<5bQ}F=RmWPSup^;rR5@M%V#dj#AF1^omdr;
z1rfHu7ba$Di9ud$wnj2bBw1lPn>9nSqCzt)OIjjgXc^5mkdjCj9^d2Q5rT!t=MQEM
zYf!-wh%OR^{9t_=a_lAnuGT@c$wpPBFr<r+$LEH@HvuGM4VM^2iQ)Kh2s&Pn(6xy_
zm=cN?BW{PYLSWQk4IOoo_+cv<ygK3-Lrv6&i_D1qE;u-KU5x6Qh8{x+)k2s$Z2^jl
zowh-hlmXD@a2@c4kfAYzKQ?Z1NFx!)3bcLbScG;ES%SnJiuvf`zx%;Mh%MqA2_ewD
znb-u{$j=v@TteXs^5_zL_y+B}J5FXhI@?S}@lX^^L)1dWyU;lVeKPWi{(>PYxB?#d
zh87vJ48U(50iEX0<HEC3@T4T#dF6PchhDsZu*Qst2rUGuOO_czE0gCR5G>MdwHt&1
zj)1l!O9Yto$>}(acSQ5~d(&x4KQ5@FX~cmUHrY2-1OF~v10tKMFvAJ2K}Is=3|1Gz
zBiZQ4yALM>zG4H|J0OS`!WW7~0Ll2M^%W6N7oImd{4I$B;-B#&p&np8y!;j-?w8cS
ztzy_Aeoh^70{%P+8CT_n@u{<M#5xoG5x$GRh%3<d=X(YT;Ugyco<e^E!t*cy#K;l*
z1?zJ}0b|8MewNe+o<L75G6?Ymf1|LI0oyYun9U|FR#0D20q_$dZJdMw|A|8R!O-AG
zyn-_`ib!e&X_=9PZb?yrIhZkz<7-aU3T;y@u}m$rOtf0WlrS@bI52tggfGAu4uX*p
zC=s}*8wyw&pMsZ&$0K|pL(qPjt?gvCt<wZtjeym*!~moC`60&zZ%=DM2np0^n(cI0
z!4n@kiA&r+5(r^)U1DY^%Fd)LCBhi<Lc+@Hdx(Z8^wRfZLo*KaVaJ~3A`gc_vejHB
zw1jG@YX1gYL-_Etg(vKRM3XsQj*tiS6mXE)!A$fg@d-yf@d5lH!7Floq>*X|VLDFM
z#WcN`l(k7J32oGFs3oQcZ6!)uVDuvr$Ymb~ucG*48b-K>kMBcBePN-y!{qrBv|9MF
zRIo1aw1F<fJdeX=O0_b^obZ#Fs1-iv0KnwPD$^!6Eu`Cwlxl--F-X^y(seDUI+{U%
z>;bx60c}UHfM}Ztr&?)MD927ljaZV(5-mwq1_MNeu%a<wCs>!%pYrOAB<ethr0Z+&
zi409pEQVAtF<#~m*u%~3=kHtckf_ylF&Rg!xy2}<B<ZcNHq+9NQ-$%rKow-v<p=44
z*g$OSVzb(?*v8*qY<01^%vzIU_-|Ql8fxJMvVYy-l#CrM6Nm5D%yNVugnnFq_-36Y
zCPx2jBlN-QP`%Itb(AK79K&wbQXA98KQIk38VHOA0;n+dB$pY}T(HIPw^`J0uGDWX
z_AXPg#rS#AW<RhE`i|OAzqvS1pGcI!-)Pbqxf@^{EjZaE+`qA83Ix^&WFYcviH0O3
zM7ed;p&I(xJ}K6oKza5MgR<NggxddHBB7R!9*>2^tzh$Sk^T>1O@b5hD5nfsV4wqj
zYK{~c4j_yoASnb~=(GZ|_C#VsLPJ#aN{0)L1<9Y#;bjL4;SB}K--Siu0OWz8%l(+P
z5tE<^M>Z$O8=)T69Lm+R!W~jv781@WMFvnR%CalKKWK#_WYF6+gfqf``-dOy!Oy8e
zdm7cGRmJCr*Mh}FSPhsm_+*(V(xGQW_|Ec{RwiPBra&$#MqgF>veG4`JOFs_`ji(=
z7qXBh$mVd40$y0NDWYki57cBObCRACgdlwY7qhg&BLcMG8G@{Uz~Y}MxcK;}H3K*`
zqL0|{XUtZ{QpZE`m=2mWq0+Q*3|OLbs`%kOJ$Us9tl&_2u_{{ks3oY(mJNEysI(uz
z6pjnpD3CcXiz9k$g^JQrc8!f6dT5v1jHN|#c$!$0W|HoQc+^NfXGs_m)6~SMbw@a9
zks@R#ORb??h!91%pVbz`MaViChIG%ujzgT$_i7{V;5W7x(dut1i<a??B%pv7Dur=)
zDMaW+RYQV;K3l_P3qq4!hK{8C^yURq8xRPt)IJ5NdPTCe^jM@p2&MsyK3t(;Rx(=`
zOgT|Qgot3F5E-Us7*b_qpq7XdiUI&?g1w~WDo}a`I+D5sP5k{y;M4+;0#CNll{2Xu
z&{skb$e9lj2t()MpjS;zNUks^$&VB!o^ZinJ_!hmBq@1Xnq+O_(6yZXBUw8JF*mBt
zM(L)S(<hn=Agor92c#Fw%mI(Wv)SIBKsECGxJX*b5sB)siaOn9^Q3k%$T=b+r7a6>
zNsN(IBt3I!I>x}C0{AzuO{ameLW`5!I3tR*@#qU~JZrK+sU0X~f~Gk3r9imY+RK6f
zMRGuZ(iT8CI!%@Z0g5OPhAlLk=4{if9V~0Lq1_}qXW53Ztks4#6Puw66v>$@C~X16
zc*kaA21W9ECjKMnRwxMJ1<|i(%U%&i$uG#`j*?wnV$}({mJN2WNXioni089KK0?q9
z8Ggg1L~D%+=S$KEpElYBks$~sa&QRxR7cw$(C48xO=L(=y1K*=ZQe#gFieX6)#24&
zIdy47BHaOg3tCPK8g<aXOYTL>X(AyES_|5RX*o?Kgg|RTze!ECk$gsXsMYBrj&_D0
zok?kSke}F$Aunah4W6Ku-`B`qxGrp2BNH|wgykXj0{?sHVmjbA(r<&%f$9ks20)7*
z>IfqyMhHu|olNe)g8mKAc#weyLE+lOoVIxhfa?Q00@eb`AN~)+r$i)%xDZZ{*PsRf
zE3LOM*2N^iQB!;bnxIq?RVNUJ^7mk%!Vm4C%Q&Ri-}Ol0VG#L3LbB8$LOvi}0E#UN
zX5+zJ>CHl7^<Z^OhcECFk}6MDV@ZhuSW(Z40LesgXD}GzwzzCwiI#=~s{hz%Xv>A#
z;n6}SH5dSp910qPmWWJH(ZUEot)Dvr0FWF(Yv~DE8WYNU@N-9nK$7EXme!z!afre1
zKXnuUAUTHSnGRYQg!j)Lgtuf6ZOCoV(y)SlI_U<{Xje`qgO&!uX)eHjU?f!U975<d
z@4i{GgBE4W&l!n-iz8{C6``e}{11E2+MPC%>}Ts&bmZ&=GQ4r@85m|419sS8-~b*c
zJINAR$e;-z4ibJ$Ci~mBs=8Y*1lW#;%-)NRA5yEjy1La}RsE<c{b@+i{iH-VP*_zw
zLOpHgK#W9))G&p%2XtMEt(hes46CRU8J?6rj#D<(MkfucN&EElZ6}cO<`ahv<sm^T
zJ@%6D^yTy`zPbD&?v?P>TTF#{BiTZQH7C>?L1qWhQ*D8mRXD`|Uq68E0r);MRqQ*<
zD<I6jBnSkUhYunkU<CxQvnU7@fC7Sqga;E8M*;>|coY^C6#`-y4Kef}=0RcuELDJT
zp63DunVo>~^CVnJ2(Tdm!`Z|V9^DUvog;!A>WBam8gZC|_v0n3VqgihqT5NRa2H3+
zVu|B3DY*&y%f3*@;0pe!;Yd*ggL*<WjZ)(Ab%YL2N9jEEoVqW979XbG%jGN05nAte
zGz1=|_sYeeOEe7g*M~ccBN{&b&3=K$E9ClSP$QNT3DXYj)pIhis@HVv!#{PUfyArU
zcdYOhzg(5mConDHun95NXpWMJvuk&KFwh0|+}YexcKOx)7_vEUIg4k-Q*)N}iCDFu
zlCS<_LX7ehT|RLAftKxy?E3rf<8-8!4jqPGV|gNt1MRtIT%a`k9<n6vThKe9$&2=(
zBVcT%?*y-lTCL|NjOcrKt5WbeczL?(@<2Eeykb*y7%2T6@-oG8t;{c%&|u<kkU*17
zfC85T;c-)#MGCWie(DraQM;M+wcK_yWxJWsZmTvXLcmm6Us^;{Ad<OugL7ARArAXz
z)FNcrwigp|+S~Q07*PlRiX@37z`kl!%Sw!Cy?rd!5-Y9tyH5S|buX}@7=ZC?g<_RB
z+MwjoK<FrBIppSFUT$1bbhXy4bn5M1z13V@cw^ZcG9<b7Lto?Um_5|l@x!b5ORdv=
zK=ra{<+G*~-%$(BuLOrC7CbkG?8=6QaTNf+7uAHv@k!1I$5jcRiGWCVEv3|iJdMuZ
z@TBmr41Y(*Q4-#1E1t?-p(NZhAv~3P_el7T0q}J0xgz0PU*hTFuuH;!YKPu<(hnX{
z`q7chg@!u?{qdE(V$UtGWZ!T%x-l2D9{(<o8w<qd6zf6W$ZCX_Q@*v0-@0p~{U^w$
zuPtM}09`<$zx^jXWDi63pGWYtv;W-2)u<nL%AI#i_>oq8OgF@RR7G$r&W4oQ+jgtd
z>ngqh^_TAHyDRG2IQ~apU&f~Kf0%o<Z2z6vjsI<2Tebgot(HgJY8kN|rZf3;Hp6oH
zLjI_b&qWz5`%F_wEqRP(YUMR<Rm)vdVXGM5izT!1VCu3_swne*HmQCbt4vbY>mkK$
zveA{}Uxu4_f-*LZe~|X!@qe(3|F)fLpASm;wP{@D4p(>+2s`polwJwPv+_$xC<T>P
z^Q3-SVyQF_K7xInTfRS!@po}W>2@mJ68bDkKkub<rFHyI@6l2e(5VajF$UU6vwT*A
zJi+Gzpu=o&WzV?95HjqnTxoUR!kn?)XuUhDHGBPDxpP|UmDFq|l~;>cKFm(x?@6P4
z+QmCS)^Cxf6K6>)RH9peBEpR<k+jFpfG1~&>b%^C7j(vDPoFL03IYs*DMdD(vg8#@
z+RUG+m$IQXblj#bz=UFgAS;M`{P*8D{!=&R^eg+==JB5o>;JjKSG)1QjVm<%@oN(g
zICwM*a7R4n0Ep2y<lhH}JU&{Nzj=fHy?@ZBbbJY&pAX)&&eA8=^MCk9@lV7W-bb<q
z+FwY+tcIaAXF(K)`as%RIE7$7navxTp|S6$Y_EO-Iz^Aw-qyRl;9wS}A>knp`V?C#
z&=2Ac^no#6hUBD)8sI8~xCQR_b=tzp@!zSHt7o+*>0=wle>S%?|9^Fq-T8mo$`xE-
zOmd^Uh(MhHr+AYBZ;`isUP*RLOS%7KKvDimYqqISh_DTT>DVI!)3K#GU(F35%er!I
zG?8av8@^B$BJ3dA-#0|~xr#W?CS!sD7Gk+6V8WIR-G<u$4RgA<O@ls^KJHc%3>pxP
zmNDL&^br7z*>k8tA)?S{yrSSrEd7z_6bkZ2$0UIA8Jj?B%rO=e28Od}Mr2+Cq9Hne
zSK7QJZV*Hck}aM5iSjKun5W6O(tL{w?J<0NcByYY8vg%XEBQa~Bu`StCjOr}IttJK
za=F7D|KG;7&-}p?U4CX7wz4nezzf@p*XUz-u^S2kA>tHz5Zc@q;4-dwI!=kfz@MXQ
zH*JjGG_b>Ah%+b%Ih;@%eML~-db1M9D8MlDD^ND~S*r^Y11(2@%_!cSt_0I59`RtG
z<QK9;Wk2x#azXx*lgQ6;?PkCRcT;U*>V4cqU(9&UGfjsg-YSYv$4Y!=mU{jRmR_Nd
zlK#dsuc7TO${j4Bm1D^ZWXj2_cD(}k_&6M*{_Ge@u}74=(1E=swXr$Ghly#U8<QlS
zytT+J9VAW-_!5I851@$&P`80~12+_`A<1{1Z3S8j6zgQ2>z42oSGcMSRL77gR3;G!
z(xF|4x{j5gDF7evr2J=BY5z;^1iy9n-CbXKZQ%b;F#Es9`v21U-x2)m`2RMpt@3}p
z@E+NAD*GP5@4@yxcmXBy$hgY_w;vG55w|!^4l-@r-`vEq)2*CfqUrlGQGFcZq3$9|
z{;$tQH;jLn&wPCu8~lG~Gx@Op@57_~ZvTHP*Z#9K44Je&QWW!w{fcYMq7wrX7_tu(
zUIK$pOs)ej#Pa@?sVIg%vY6VN-|-O0jPr#%YvGG?4x=`eN~u%`cMJ!;&Bcw|UqD6a
zqx<Tkmx>2~N*_fyANE|NepG1JEh_J;>^*WL;dJ5-=CI4}G1o`YBF`llIwMe3Uz6~P
z6BDDOgf67&zNEN)*e<-i@C90jCr#dpNrS2OAD(vmhl}D5RW`9i)dY2KzL>HXI6Z$s
z6ZaSXnfeP=Hi<_UZdqPgpx?TS0CJT8-^LKfY~jc_=d4}sy^gEYHs88m?yl`zEBU_z
zGY<P{B0xMm{=;GRD8GyUu#IcO_s72&mHey9*r5Nv%H^|R{r~XQZvAH~7s!8aZ3Q&}
zt~`Tq#1!UCW(=fW8vd&y$u@YBd|u3EWDKE_d>3oObU;=iFCr|4Cw}Bn=eVM{_DZ-u
z?hB5v=Ng!SJQC3tgj<t=#my?{?SHT=)mvu&4=<ZbW%N=+WTAyMITuR-!KoD4siW6$
zPLlfGDgBJut}y3MB{lBlM6y_EIl2UaXts@B6k@nA6T{bJkfCz_@dN>6VtR_Zf-L!+
z4!9)lxmD*_h1(Twr@`aaacc@_iJ4~3ZBZ1pgI5b5B)82lrUS+OM}P4T{wm2NcehQ-
zh}25_(>-2!X)|A9vZlfC7_oR<K+cUZciSRdMhxx6rR#D&!PI}JUj9uLt*^#@{kMDn
zA^u!Ni}ftDSD+9cnS=UM98G)3(J!hn!YC7TOWxUh{=}j%aLOW4T%uuz-!;H0Ouh=^
zNA#-24eT9P+ZBj?Eg4Oe>Yz_~B53-8+%{`40(55qP3fZo3!9o_mv*n}sLf526s0mu
zIsdp))5PQJ<Oi87aVFMv^p}Pq&A%Vq$WH_G_TdrLU)2K>hFm;@1Vu3Nz7eRb@QcVn
zgI|Dj)ljHXRdyym&=TmXdSVYFMxVf_kim~5;Kg_nJ`a3lp$~pvZcA{EkI)BYEz}o<
z_fvT0CB|uxc$~wuQg}KqCTb5AxdB?Q3gkE^=4<gl(8NGfh!8I>h93?OGFf-@Kr{4#
z!q7Mi)tI}nbFqp%DN!Qy6v7#3WjpA*LtV}tFu7idV<}jq8dd4Y5T6@cA<zHi{)EQJ
zKS5*U?%fz2gKWwI&Qg5Lg&6ai)_~ePP0cyHNZ4FS0q#$h^+Agp8lvvzu(vEH(OPzj
zo91}L1zKz##1dkM!vAIzhwx=w#g_y8C5me;Gf=YT@%tjhIj}h}!VJ}#%FpU8Wi0cN
zP$p6<R(-m4ET6YbnAm%j=W7zuLc+yz0qWOFBz~k~xrk+%ijB~9<_2v<MR?*<02}ED
z83h#<w2uT1asawKX($nT9DOpOzsSt||Mx8GX(^=FsI5=W)ZGHacCMB4zia*Q8^(Wp
zl{?za|F?0i{r+3C|67Xxcyzei|J%y-Nc+E?_22)IYyJ55r=$k<&Ev}0bp9)Q5IX;#
z%VzWW-T2?ebtZ!!v8p(BI|tQoF)%H5fsyBDnr<-egZzY!X|i9$>C?khCZp^#+z+oe
zPYbNt;z#1E^&V?=Shd!u^=hp5y540Mt<IZnyIiSJ0I_F^vj4P~q6qWE0tMal`fMLq
znp#S|UrL0|JYz}L*7Q#rOlMo@DX#R>!Owt+CzXDB^|SK%^Jntzd1(wmm9?$KTsJ6O
z8Sc$Fb8D=KKnuRp&6twn;o=PpR~3=z%a<>{at?Sol=$TBayqsywQ*s&T0t7}e<lsz
zx{L3wHP`+5zZ^CXFJnFb2ll_r|BnuL{C_LgK3gLJq|rASg(O*1n;4}C1{=vp*CIYO
zrnr(|4A}9)91qqC7z~Z#6D==a;%O^1?(Ds5*O+=?PV+eyyZzxX&Z_+QZnA-fU&4At
zWtrPdHj`77%E@VIiFlx$W2hRJi=p!Dtk&(8Pis5^Ed218ogz$|G?HUIi(L}ow8A4y
zUD$$_OPXipH?@R^X<_ql%Qa!BDv+RM%Y>r8;xheW>Sgfm2o+0TMM$+25TmA|GQG1F
z7#mUqWV{3F<xwua0Ei*wu)wKHte5u^t#7W(sSKJp(clv@XgC><RT4cmr_c;16k}0C
z3!TDa=ts;E9V+-u)F{kt%eGCl&e2DfsS97!!Fp1t(1@&S%Ig?(NJeF`OU<U>llSOf
z@q3}>Re3C8?DEH?goq&t&+SgD&C27kb<;NH6{>nwoP*c#9A-wsbalOt*>Lzq=|_IJ
z2Cm1qF+c=u=T_S7l0Hruw}x`oYm_GDfIoD)mC{_NTjg2(gfSIOGEd_wEjn&)U`3XB
zT<+G`xoz~%PAVS7ZYs4}zu}%O4MMaQ&TQfItLB`kE@nSKed-u<5!Q7LSWlayBP#-M
z-z*WemL5MTsT5f^fB<!oEfccTM(HqV_2JZ-8-30;uuQMCFu~<&mDdEm7fVmAu{E?<
z`mD#&7kQRGeT%1BS-J{+4*d+Obla@fj?Yi|J^CN4wl2Ej>Fl^7Z_m4(YNNp)8s}wH
z-@EU+z1mq{EC9f(cYyz-%F?=^BuGRxNJO352Y$FIgEmf*qnU;FDkDuhR38+Y|7i|7
zqfxh40cuL<?_MqZ#Z5jrcQg3FxeQe62D`P$_V6535R4_39)pxR$R4uvz|ALMR=z&&
zR`R*hrLCh_qM_(RN-rff@<kx6QE$G1{AeQ`&dgu2Pw;(=aXv@(#^~Ey+ztn(xP!Xb
zGs_y&1AMB%cqrazgKKRj!R(PSmUyhO;oWHqN1|Vt1D-m#)FlAi>ND}+HY}NQgIpSc
z1S-_?KO73m1<}-#D98T@`P>#AyE~q~aaUbYtwJ_}M_3B0hYT_r!Na+H=n7BcT(9au
z?UZioyi=)_fJN7*z@(77$5jO+s6#;g%4A@d^a1lo*!$g_VW$XAZDEp-OH%hu!FzYb
zaG%vcA&4kfc~)z5YY&hPLfk)6He^@I27!0IWQYKIyj;jWp<D<O_5@O4AUN`bbLD^4
zfin-n+_nGY-1YQdD@DW#ik?nZ{JFJ>lo$O6%Ztr9qUA+@y}an}<VAXbV<^mbXM;=J
zKQGwE%=sS_B9V29kR<~lO#Ib-kZ1uu-mC%}_a-5n)8O-pImNQVzZul!bG(dG4CKMo
zE?+;z1p?a>4OJdpy${J45LMM@v!Y(qZ*Plpy$Cbd;=E`L#zmN}6i2h)ikF(>laL-p
z#g&bz)O+~h9OOOvR^hivv?J41DdT)O*I@%ph=LCPJv8fkvF93@4^yaJ!mae$&<4;B
z8(L`ujWH{Zpp{0GqB$LZMVpMiqD@8*t6Rsg@6`uP-74yfdGT^GE5aazo{)oIrwBu#
zI3L=@p?OvOZ8n5ogZ`+YLh)X7Z2lmp+TVJK?oYk^>%ZD!s*jBMQyu$ouZN%i$R8aX
z?9P8|<BIzJZ?$U;6w}^ZyL*zp@Cf^#TsF7+{@b`VeSd!T18=+4Hz|;_k0@jP{tw*c
zkHY&u2f3a9udQ6^G{cWu*R3gj-Gb*qm#?CWXc85#A25Ba*>*}vr{RY+Tg@a+hsD_-
zkxIKK1jpTbjmc}+&0M3SrrI1$QVB0;&jahmmcg7H#BV!`tE&{NJBUde4Dgsa1L;1M
zG4A}pHzo!%#zflgFb%%=&@*Su!5HeeS%G-ay%iaMOf4rA$TA@;l7Uhi&)7;E5yaZo
z=p;8MQ`Y%>h7lzP1(wUQt}#Oc{|u<H<pDYdJ~f=Gbuk^3r=|!*lLR8<y)_-*F-r$M
z#m3krUTqNXiVNdBpmP@r#dU*@jbmq;16glaZ9F#ZcuG=4_<#WXOh7^hwU^a+T{|qt
zl3p0NN3JW`RxsNz^>At7MmS()n1`T8IC39%i%!=TL++LNMzb;O%4~)kO7saSD$k{X
z&vS#H%^uK})M`R&x3e*jHD~%<gK5-YH6$;6E)_<YdVIn&$X&z1{tfxacxsRFZ)3#b
z&>L>Jw=%wiWK3qx9VZm3>flG6I`Gf~oSzm`>)MBdzBV@awK-on+L%><l~@z=cjL^M
zE&%t$a7NZ35(ie{Vs1K)ff3(WWi*G*cczhJITnK%I^F$aqM73qXx-T6K9}4vJ<hT}
z{`ez$;LD3n`Ggn6duIK!ZUv3@*v~AR!HwA2TpLa_=)t-n99c7<Dh%fO!KT%hexp`y
z_RGy`{|s*S_8>#;miM$djI8lpa)H}nG~#*JxDX6sL^B#2Bi^LlME^9W091-j`;*`z
zsnO2_USXZZw1>tR{tP~N+Zn*@7Qwx=2?e?fr5P|D?t*C!#()YWsX-YzQoVrLwDh9v
zlY=Qb3f0F&B{xP3Mw4<=fBjJE(@no$bXyT^AqYvoS-Wukhs(H8<!-mu>G_D`b^%14
zK)^wSb;%NfKApk0u3T`L5W9`Dn22zH8&Au-Uo#)#aX%J9a^9?0TGbk)lOdLRJ~ipQ
z6Yibg84j}-xL9cnR4=C}uGcBQgS^dtr2&MpelMm<X;eY!fwl-FP7I3u2cw95OPCby
z6h_CCqJC+7u%flZc<hQZDO(aGMnDX3>jm752l+E3sWC~ALj>q06fYE+Gcj2*pJTY4
zKQ>5wxJXHU&1PdEK@^{0eCd~xg~FsiBQYpL4J$k(&w0Js>$iKIFfeu4dA*8!ti%pp
z9Uc`Ggk6F=({541Ip(ZkOot%-0Q~TvNDNSlUi8w)EeBJnl&|3BLN)u-r8eh5?FVOM
zdRHiPVEzqYb3X3Q4BOU*MvT5r0A9uTyss~sKy(Q42*gi)dTr7sJ;t4T8qP#)aLQe6
zLhGlihI{{1MJR!q_#R?$g`WnjPff?vpv!>(p_of6bG)uMyS;L=Qez|ZvXs~(4)|Il
zw{vLH>2)OTm;-q$7cbPRBd&g6zCAGvc&8T9)f}T4u5KFF2G@rC%8ji=%1G)4i;58O
z;@c)<@1ZjuQv6T&OQh7svyAY6Mg&D;ZnP`CE_7`BccFoKu@4b5(kHYy>b=oOUL!jo
zxJ39>py?1|T?OmarTm1Uj&1@`Po((CE>Y2_j$5q;yL@eesGqX*%hE}?(XG8qCj>D(
z9csi)ZmsFxmr-nLs$=9g))e(sC;&MH$BzZjJ2W_)vDi)S6Y;0`y%9QNBY;vO6c`->
zK)fqZRxeteDjVF0OvL>VU%h_P2dy95AxI;A+%*XKhjHnf7}ml;jM>b~blm+w9*rD;
zBa9k(n8F!Rj1Mn&yhQYGU#H}qi+YIowh2GM{%?{9HE1H(9*J;uI6t6BdjY24CtTD8
z`{I==!??g%C&n-`x|CEB!3u%3N?66Yr(c*-Nd$C!%>@^89;AW*JPC$yz{M%in81W2
z_T8lKpj)9#f(hk-65`^!O!}9#DcT+mAU6#gH(d-HNbhydy<~2CI&hOkx>)5!mAVei
zDdl6P82$eEu5H;aj=f2Lf-eT4o=Ev+!QGK{gVk@NZZaKu^a=pzC?uML<&L@<P)p6`
z3V0}P#8;3(`nk!Fx~K>SaWdA1wkTd`Pke_F6`}rlw|0?xLj|<DVnSVSp0pTM>9cHT
z%Z{@zoDP`liPMs`+t_!O?X^CL?%W&56~mc%zuhSJPFkHa9%!@=<FHf$tf|3Gd#wGJ
zy)OZ5tg0F=2uQ;sn+u5Y2*XS=lcrg^O*@?-ZPRI(v?)nC3o}DVlh-y(niukt>6Bqu
zRa8I)MC20$^;2XJ1Q);!P=6QP6>(tz#RWf56j0fr|2cPg@4h8TJ5vUiK6ul-_wGIS
z-gD1A_uO;OJ*SNRmjOqM7t>dR=`)lPH^N-mEwxJSE*9j*1e_s?Np(Q^p=4~(Ncmip
zAmW^PLd5wF$3r7bc0>XUua~AW@;1aJ{`F=?6ByIBn>Srg=kAhtBDFl7mtltNhLTeQ
z@o--}v`#u3AJ&QweLd0M=$b?q%at#V6`-4jOG*ZEBIMzCtk+FN9(>!S)uA`9hPS~~
zfkpWA*O1%#T5A`+)gJV(KroHQ484_-s+5fHMoT@wyvB*1MEsC1s%Igo<6fHiJ;5;h
zV3ey3r6(p?QKU1O3tB@jAt_;c%FM_dXq0d$&ov7-Mv<kOoWaB!TWLX@`}JA8+9Yg0
z$<&`)=aA1lg;vWti>b0&)|!(d3=O`<q62qbZ`jISDX-H9DCg@WBy66#@8>J%<*kwn
z9w&0+6By6e0?Vay6qj3CEcv#Ljk%Etv{24MqVwuG+!Q6-wbs$)ri=6uV@3j*2@`=9
zGF@V5wOiSA>+4Z6yLf?EazzH0w-pVlVTlRL!YNrwlerfSfnm}sQ|+JvlUj)jvs5Z(
z)ijeQHgw%!Dl|OoX5)h`{U{<~9g7QDl}oTx!&oVj#i+IVZnD5nXUeF@5K2vzGiqKg
zxHQUlODno<0cdlO#z-W_RM;0IcO_qhn)fo-2e`OkOED%*aIkcq;zODeiOa}5JY-ew
zbbF+AiPUgxcx1Tx5F%IaI-JP*!u_F<XwqYRdbM)WNUy%Cql{dPP5A^2<rR>pumeHt
z8Hyz%{iNZ2p=3yp=fH4<<Y%6aj9IkF7n2gyqQu~09MQds^G2zYp<Ya1;gSvfFu)<q
z1U=HgUqc2iOAG;%;dbI@lPAJP>Ca?j*pSIg@ZA;`P30ItY+_X+Pyi`~OmSKqjRw)W
z3K7>7b&#cKG6l#WBHwm1_F_;-t^lq?bd9`Y+0uBFuN=hDi6<dOWj06yt*vBCs?hO;
zaj&3AW<xVHwk@Kr#ls#6;?&Azs0_*+rVM$&2p!8pI;dfwwau*wMpY|HCKziq+k%E#
z^4ugYykT<E7h2m*O7U5=2lERox^|;5F*K{KMaZ$k&@kidH(61M!xM6F#%so!HZh_Y
zYRm}N*+{xb#whw)5}bXud61LD>=>$DdYT{{kH_Mc&zu(sy~7utya}Unc}fP+!|x+n
z#Gp@7WyqOTEzL4d<1m{*CLn3^2VnO>pIEeENS{r|G&WyIg0qHU>_rM=ipR8C1p*g3
zs20Ig1<BUA=5=pdPynon8piqy05<wC$T-X#OE&qI2sv3pIU*#&UQF0oN_G;uus;CL
zThY-C_pCIjnjmGTut?4d4P9%JGfd0RZZ1-GS(a@&1Fyll5SlIf(u&}`%eIec7lZtq
z44aXYouZLIF$t_^B7J?~p(<$x)9MzRbb6cZ)}CTLx=^i{DAO=Jz=TvHL=|KjP>FBQ
z;kOu3758w}FGVL6&Ev8PD{#Ylo{NbL*)Rq<ip*Hib0^S3GBt!6OrnkeE&-xgAFKeV
zuE9V>Hmi2AZw>l{<5?LTIi&06+^=@ilE67ml}n0*)LRxAJhFD`9#K*is<g#$RV4`z
zLsBiRG^L<hrjne^sl|MHS_CS<@|q}sjy1bsruV+M!qaeI)>ofnr{bo_BfX$WHTV<-
zY14~=>Pq}QMH3Ddowsy$61}`K%>+vJos>O4T6(UmM<G|ROduM_$#fxCtWf{{cDlHP
zT<%vg71bpyuk0lgGet@+328DBPWH!oM-rScCAX*ov96Z~0hLK5j$5}i5X|~1l+E(D
zw!pOS3=kh_jNExAoNg*XBx$~OtIwb6i<Mdx>W*IH)MGn>b^d{u%_JiXYH_q1mX!i7
zU1AQFtQuZLbTQP{)eV{!!;H<DdP1v>L9J;(wND>PwrHfTG;A<g6(d4f_PD?V)ldOY
zWLp}uZ6|vY=R9kpXT1P;Z6-|-p&AY?T|ox_V5|?8e5N^xQXLHgu4y$S>o_-e2rsL4
ze{do+^hXUs6Ih7NWc)ACMZUR-Gk8^D#m3%{>UM`2HMV_GlTR>PA{W(FlGS;YVPZkF
zaa+NHGz4f}`FGPYj2ygXPik#9eYIsR7ILoHXs#kfbu+#|Z8Oo|3)n!F2YGaZ91vB~
z*~las4+uIeq68K}c;GoQ2onv#0r~82^GI;RuV_3KjfML9<FP?Bj=`R5B$#HnZ)`N8
zw~<tzzUw6}xVin8Yl5x#8Z`mM_?iLI^VUHJ(cKmzef)&NZlVI6Bmks%m>!jIi4g0d
zhN;JTW6@Zgpk}YMKEa}?nutOq2_(GwsGxc~LJqr042_NAKsL8^Rt>Q0#@SW>RqV-n
z?UEd{dWM#*X35+VG5KNb5SSciO{)w%rjzYd)*^P4{3)g?{kf7#-r?>HeHBgfH*N_B
z0S-_xowU-BrW$8#WV=3)DpW#qI;w3IvPw;c^3i*&#!>ATDCN>L-=x58C$bwt8-i|Y
zMPOa<W`&_Nc(ZJoS#Z^gDOS{p6lzXgyF(kfxlx2+YRja{=tkP>^;#!mdn{OyO`(Yd
zLZ^?qL_pfQR4NYeH;f1hLzPK<rRwstwJuth*!G5xb%6$obpY8gv`4*Ojg7g@uPu_e
zRWZdzpA3un!CXF{OHg$oni`f#)7T5#=4<lPZN5f2vupJthR7Ie!92aug=twSYWC$C
zS|?Kl79pCkEGB26@(k@Yfa#UWsASWY^aTybuw2S1xQY<!XKU)9u^1e#s62w&6{R#O
zq(r(Cl@^-8JJCRK0}9+}g7oBpDFw)u0keGc*dh&ClW~dc5<ni`P4;u_iMA|@STag!
z8m4h8$K|dgtci$SwoKG~7*M{lTdD!su7B*9ybfZcG0W!aEmdq<YSPY`SFSo1-E=JK
zNjp2&Kp&X<NlVTNL+Dta0kBRndh7Mp314ej(+HRml~=E-0?Dv-WK<;CGDWu2m4xJ)
z98{#6)T|Rsd%o<Ww4&C2?;b8BH06v%zfblEitMjV1)BWs*L<NNqLfQ!9GS`9flwS3
zsy&slF}bwS?+dhS?h^5gZ|E?rja{6l*_N1Lq9!tpRzNi*)$9>{G>c8qVA7^XhY78i
zr8hB$QHYxhO|atydyFl!eLscG!P%&u2Vs!rdZx>AQdyVF%DodXxAqRFLcPPpP|!ez
zP5yd__ONYzIs-Hc7A|}n+K^v>U5&KGtssUs4a7V%7k0>}pPjMlBrI@3;Tu%!Gc3e1
zr5rig&`EZ1F$o@+Gw)?9TV*=4Y8K1<FdFgcLo-9`fp9vdjk&^R34dzyu?d`)C&#Ti
zo}O$*n=*JMdY*vrLp&b`)kA9%X;jH)rSvFN%ee7Oswgs17p;^VAPwVjK&KN)8H0mn
z$-c)_x=<$K1C&myl_kn9R;vU%)n_;Zh^GkCC9H<As!<YAmz?QSsrx^hlVaN5Gpu@;
z8F{r-xC7fM;XX@=Ni)?_YEF>xbW^%cVzLw6DfO0eFiN4qEPN4$s?X#~8DgYUo{-j)
zQ(qF_D`f})@obdZuCrZen?A-sDtIo2+57-zdei3W*lui-b3|%xtIUZjP6mle5s6$M
zJ5Q~UI5T6Fyoa(Ki3Vkw=aXnyCOu>~I*q<WC(?3W>Z=qAz!8A%2paGd+<X>UMf=JI
ztxK?31e&gGZ6u^6BTFzOteKD667pdnNwYO1Bo~=5C7o!vC85Ojx(d}*yvBLNU`^PQ
z&gIG8CI;`7mz3zqE~wl(AhN(3uVI1`bi`J$9O7D7Zj50d9*jO)OqbG=GFr)bb)&mI
zu;;06`$9O8+b{*{wl3tOX1Zfrk=fhpP}2*+=3@ISjEy+0h-Nv~YFcb@c4(EYYlCBN
ze^cG?#>V2tYHd@^%to}Y**)7DZdYS9sIgemRMn~zD;oS*)qsYKW!CMseOEQNW-G&u
zWO$bt#Nt^Q$Jm>*=yoh7!<lX!1>9Uls$wuBtOXMl7Bb9cKgCu^=Y2Q7)(v)+4YjNq
z3`;@Q264-M{w9EC>ypsmFMyrCBj=T?tY3zN^ssPtQLA{0X<{WYcX{4m<UC|kACSz*
zAlD)51>(p&zOyr;GGh#(DrUXd9E`WceJW}-rNgzgQuXc4g(bncd2MCx7+WQ|X!}Jd
zOBzU*OL$~T&eF5xH2xvTT#%!b+bRogEVP4?Xg$kaWuvutm6a~HIb$@UJ?jcogI${b
zU{HrKjih9xTT=<{Do7DhSeBb&@s^$vKUVKC13E1=Ty3i1-W$jKWNWQ~Y_f}X*&b-w
z<Kg@&oLQKIsdtr0liB_3%^_<&oxa-I1vQ4OwQaBV#6SkQQAcRo2y!&B59+>M+hgVS
z_0_dtEE54p(~|s}VScy7AvD(Cm|*bOQAs=|$%q+$@&i`n<fQ$Hqei>60ok!|*&WdA
z?xv94D5+Ufup^q?yhyjCZ*nkOltx>y6l#~vSAOb~LPSvrU<?d~heo6cOhZ)KsPZG8
zSqut4^R^tvFv{S}&HyvnY{c*a5|vS{4Crq5=pxzZX%hyAeF0F=llm^ao|<g?nyeY1
zLmO>-kc0Es9g?+qNs-;<aF|Qx)#|c*VXsXjrpsMc+sf7Ul(twTwZ#Ih;V>qji2a(S
z8I-S#^6s^7)7}{Al!HzX?*r(Rrg<qI-kw7CO--lK1r|SaH${9i$V;;5Fc$r9^n_PO
zhB#AA4TgqY0(6hmOXk<c=H~6&L;dShgNfDVH1IVxlmafFj0}e3E|Pf14k5Ab&_x)v
zG)p3!Ou|yFcOW#hI_z?b7EzEO4pmDe!|`w*ub&Hx2_@F_gyOyNa3~oDVv3pkgt#5y
zp*}-{+>WKq4o4J*(MZ(90%LT4PgCZHx8i9iNtihKOWe&9cctbco%*5%(G=G|sj|d2
z&k&xt7b?6K4->LXMZOm*B$JvXVFT5$0chSsT`BqKIRML-6%4ewWtQ#S+HEuKYZ})_
zz9<)5c?27D=fQkz$(k0Kb|?AFd~mtsaVb59t2f!`Z%gI=b4oJ0$}6j0X_z?mMUhIT
z%RYo@p&M=7@PnvD^g=}3cY&asj15cC@Y--xcW{u;Z6RPz841TX429PXhoV5dVRu!!
zG7zN;(#J!C($p~OlRQ$CKIX}zMsI}k=ktP5ugL(LA<$+(RjEaSx@V&c18yRN!jwl6
z?d1}3hWcO-2%igGupS?d;7G+lc_F}_E@j!*x6x2pzO7LWP4HJ-{LngTXo?N3HY2II
znJRvzGb_2w7U(&sY_3d$AyIWR?g<!tr(km^NIHtynMRAa=;K?vrZo>WEfAIi!a<T6
z%McA5vTP8ax1chDNYK<(+GwSWzSl-e#DN~MRDc@O?Om8e$iYJDiz@5VyV?!lU<m6k
zP%Y^93!0QrzC4WavFV{{JT<*Wo+d`DuC;4YC>Y@BX_sGGu|o5sl^BS{lkTM*xPj>A
zmJ7U*(HQD|UA!Z@iBKQy8A&E%LnFh;P=qqwf_}DY<~Yx6;Q8A%Zbv#{k7XndNfebN
z;o|)y7+KF+ZZg8w#iz#Yh9YdG7XGohxreQ^fakDu5-GPw9>a4_l+uAb&@+Kv+r~zF
zCZNNmi@3~$0!x0n7|0Q?l)wtJR7{avWSeXZ2u?g4GmpZY`GBd(2caO_i52gox;Vnr
zVHBgcOQ>{FDZ=<5qk^X$jv=QgqKsv;Drlrz6^zRliHOETK=KBvNO)BveDZF?0Ul1K
z)~6_6cInx)G}A222HP|z7}l4#IwX!Wu$09`TWqkiJ|&qt($G#Lah(KGiI6yns2D~p
z7?4M{u1OQ<pK0<!=SiB0l8EA-k=6Z?^_@~emL=zKyr+}U9NnxlXz+-co76|Nq!@5j
z>QzAK$dvQbPN8ZTtc5Rv_4<2onDe9WlHow9og9zvcSyUz^6K#?>RF`*kHR0bgaUJr
z$gM=2W|azw_=apA&nC*btuo+19B^ss(3JWIl()&5N?HG?jnTOgh?ZJkGaFe`mC>oC
zF><T<W4XM1JGP6L&dkKOc9oeuE7r@@*zxR&<*PhhB|>;xZO$iBG+x!H8m}GNFU!HP
zx+_crUW}tn9Opo*y|KZ;&`_U;FK9V#j7Fk<vkZ<jI!;3If;2#^bKJU{J<Sg<G6y@?
zUz%Vy97^<tOv)YIVG&a!ld3Ys5p%jzQ!>{5k?o<IO$Mc!t4%L1nW^Ci5g<Kirl3#-
zI<SWzi7Cl8{tR9<i&|0L+$EVVH)$W6RwCu5$K-)2qRj^RYQj!pL}_76KpL}d<f!5}
zV#v{@%c{=WEQp|9*09UR6y}@F%OXMp9I-V}V`6{KU%A{o)zk!r2-RDM%^}kaPoQ<$
zZ1F(k-dv#~8^#p&I$H})q*ZAYH)D0b%uR-#R_V5F5wM1vh}ef-0Tf|{T-V%P-_xj>
zbFlsq8e&=D*>{fC65ZuCu|}?5H?B#+DT^&y;H?pb%qZFAo>e`GhGWXUS_$sIn|fr;
z)~uI7T{Ca>Gp<oN8o51-yBb0xlymVK5(mxrf*4|H3qfAcs_G3hR^6i3pB0MDtJta|
z6)w{t8-n$oKE}FuLfvp;P}A_yMJ^c!jL=cWP!%pkctt)xS6))ZH>7oiFZhU5b&Rt;
zbg4*_c^Io*BGg%xK?qVM=LFfTajr6KPMJ?L*E+e&%=_aqLL|J5s48GSnBtDziR*6o
z&Ap$ZV&1ToWOhCw`qY|cDkbJ&g13?FNa?3=>mMvPuxNsfL^2YMN)!c*8&9OS;;96>
ztv0Sm1=Ii_m*AY)_OQ2pYL*qkbdc4Ki_W_i8Urj(!h|!KL)V_olj&{jCmoAIAOybe
z6N*NALcMFGexOPg27t*0Q%IY(Q$I5l);$Pr479c}OJN+Y{I!e15E62aGrR}-fViiC
zR&p%7!yw8Hl-LQIScQG0Dy&mLt|DqB)Q=Ey*dohC=p9^)bGk*lo6Ka<Whj*U3D-;x
zoNlt1@R>EM(cyTwH!0<d7zzP3HS`5%c)IjQ#8NtvF)3>)&1Y4}>U*9$sy3aqx;L+6
zwiuh8&YpquD2e@mEoUJ%aMhPa|E-z~Aak<Kq9P9c{v$Bz_IVVg3yh*cb+)Fk81C8O
zk5q0Q^R&K)7$nKC4FqUC%r4ea3fP4<LzQVGF>DB$7aM|oFwCVh8Ks0nG_QM0!M18J
zy`xIG4C7-3t9R2%`l6{7m$_&|)-9C)t&n7_lEs+~7LH2EYnX<3*0NH><R;iP{8aFa
zR0Any&C6ru+IBUPIKA*KUCB-nWxM$%1paVoJ%{C!ja}w+pPegA;b#EYmmHA%tv>tD
z1L4T(fut1liAr0-l37uBuqdZ3osqC8!)Bk+Z=i633wz0s-AryKS`m|acvEx?h6|O+
zUXYYo@v1q4zyyi3gS^jefx;&|)&rCfV{1HQIHz-Y>I`X|&4ZX(mxPFd9EK@$t`yFZ
z*+ttv$*F}UWe%@YDUfvoFmy6UrAcUqt<1|VV*w;cq#n|SSrySZIt3WHDu>1-NkAri
z&!%CmHkiwl6jd23vu|uw1sp=jR4|+mT9@m9j(1B51zX4=;+afnC1GD^=tpLGHJ8=c
zlL|96Th@rXM@pdp2q7r)O6xRmTMFDsy*XeHWRfYO6bg+F6K=##2QDpBs~atkh+$JQ
zvAx9@rhvn7MafFz6<m&>P(oI%xMU?$=2`fgPTRx7J)t;p>zFPUd(x%8bU95sTz_WX
z9lM#fUjHD_Zek!rUUSJc)H9e`4H7%u_Zp5RJd1^VHg2NU$s9GZBxh+iRl_G~FKwJg
zcmiS=L;<&6j72PMO_y>Csu~5(M%VFxGMGj3in4_uPJ^NX#bqXh7JDn<?6_>F!6Gig
zLOtPBG~A!;w7!lbyXZ8qL)vO`&coO>)(+>GFtO8;#)l>J7bn!Slws_+$?r2MoOm`?
zK(%ab_PLN#+Z1MG;9>?!#g+`@wK2yiNW5E&udH}X#)fUM+Y?JBV}o-+FB@FDja_)X
z8)%&qPDvH3_g^i<TDs4KTU{q;<?)=k^yFa`Fin^}WX_{Q{gRB@c#vH473Av?<kv+-
zr4DonQ%mE@x0J=B3*~9bwmCc)#GKa)p=J1_;H4@-%IGIa(_opo75OalF3ivKaCpM_
z_TWhvnw+Yj3{x$iE?hL48B>s}A}nrCsGS+gk@NawDj;luXdvyuq7*uX8x$}*XpGr3
zAEwJ*^ms(i<`6{jb^`_lE=S~Ju@HmuP%T4mWnlW^69t_MvuGAcA0}jxtm({zvky)U
z#M(Ts8Je?6CTQ#|TqGJAnZ-p1g+?S~=zQdy9yZ?y^SF!w+zQA@X%w?`VVa2XUV2nS
zR?B>j$|~4aBC(F<0f~?imds**Fw`OnJ!l&;kuItd&||L5YeSojSYd4@(*jJRAhAj6
znH8W_O|v+pnPafXa;8QL{;OF#iP33pyi!V|5R%r!3r&P^X+$DTC@M}%fEc>!(&Q>F
zcwQPr50J%ptMo7x22{HVPN$R#9w5xakjqZfWlknt!3F|i>A6D8TvuMStS;(Ej0n)k
zS(=ReX{C*L?5@tvx+OC-Yj*q683S!HaNw18(zku_bXj77W|QA$kE1#}jIHrX1JE5f
zj@SYdd0k=Li}8>Nqe^Q#YGmw>rcn>X##x4%Oc73@jcMp)@|!MJhPC5fc-F&(mM^Py
z%NLK&L))b9t?VYk4Kv$pF|~sk`O7o}q$<mNFzGQIHAQ(gr&5P_#t4bhib-$TE91|T
zMswq1ic-cPek<KJrn#1Akxcg&8j1{tl05!LI!9D2>6}?c%@GvU!m9?zqvru3HRoa5
z#cZhwpmT#cX0ax(!j)$yTbSzhMb*3}GA%vzi^lh$1RW;xL(h(-+xns>DoWv$iYbDa
zCQ3Ipn!cc!p5VMbyv^nFNX`T)%4y@fp2VLpxt5>HBgwDrxw9X{NVbuwS&bDJtV*m0
zXcBUnx`gMNV^e0MX`g1{ZC&~gQXQe3RA}5Wu@kBov0!a&s82&Q{?T+g{V>0K$giX#
zY!aAw?>bGhgXsmXYtl?Crho|6@N-`&J;f-GBv2WsNFPvdsy8%D=vRl#ei8@*Hm$_S
z+|D*8cs-*^VVnV9y)K$cBsWCE9=#cMpWV{pbC7)2MiP-8;&QB(0rVi%(8^fN`RWRe
zMXfim52{XpdM8i}TXJL7YIhCmJ)sOUp)!@uJoO&_YtW)qEpSh}@@!*IQmV;91Nh-M
ztuX#?ybp%|a9=1H9*SWgA$$%+qrC%>XkR=$#NPDBLxW+-;+bB<JtT<?tqnyZ2#Dng
z$3tY_fOAQ76AV*s2A1yWDQ2BT>;ux{s6|JEmI5_o<AQXCn!0HFwHh(iWu%PxgfeAV
zB2-D)<*-Y|h7|i`v7KR`wIT9ahqqq1>RfY+|30x>Wz>%U?r&-JwVC6;`&!!<;=k{W
zt67NuKGBIT>f{ove05JSRU^Oeas28I4v9vKM{lJVw-((hsC1<XS&KyfjviR>1unLc
zHxe@<S<RJXs!%~FV`wqM0Fd+M<x+06f@{`FVN%J`*zlv%1jeMCh9&KAJhnE{hkgul
z#Jdeb!JTxKTJ4rl*D{u)Co=ir_jCn*msDwrwI0{TB;FYhG_UJtnEE?Mw&!yhx{)Ws
zKutWB%fdHjiG`Gd=~Y+^bAlFVIR!-8m{T<bVO#K=v0TdJ(s@HXSq2BvWKiRrM{P6i
z18BY%Cev9>O-O4*6)L<K1mJ=)a3_Eq93h>6n4f~7;5Kv~uNTv0WhG}C?cSVpFQb6A
zm_=qTj~gJ9P)$6Nk}j2i(M)qt;cZ2-psb7&A|o|mM@>+1g6NYAXDHL!0hGLqR-II%
zj%I0q4b0pO-K{o5DJAq118r6rHlRPS{zTnC7PpuvFSG3tgdd^1t7Exs&Cn}Ksi-hJ
zHW}%!OfA<qwRxra^LRspt{=}0bMb7K7Kdvfm1+t4eJufhAk`n}^{4#)zCbFpJiI*B
z5e~Jq_fkfh0vV$>I?@;JOS$#<-+KngVgnxu>#@T58_BoL*Xr{Nalv^!a-xk14M#|1
z_C1Lz&#V)(GW72_9!(;OK6)TeQl}?JmAooVqCG$KazS$pLxZpB-eD5SC=d!6w?t%8
zwY->wDlH3Ckx5t_jvt-^ciF^L#xkfKGEg+t{HmIAz^k>9eRQ!eoh|JhZD{VShn7cs
z6hpB2tupT3taMa}%?H`JD<X4N%h@hRdAcZL&(K6Gh+o!~68^guWc^rN_uyuXQ<hrm
zPbDI!h9zz^WB-|1D==jy4#2TWft{G=Bw%$VM2)`rciqv9PooaH3n@%1j_sDX-dQ28
zcd;@GOpR`O7-E%lSzhgCNJ^uyE;??i8kEwMhaL)=Fa)G9dup<cOWDnq8C8N$^3Ntv
zcJU^=b!793n&K*<^Bjh>t+`UU0u#nLCWK-~#5CtE2Go-#GWP~}m|Z`9&z&B0v85bI
zxt6XX#FT<Hm0&m1s~dnBPn1z@)1Jf{HTER+B0P&2qjvo_U!Au{J*T0}=z~ONPDql1
zpDZ1NlGzib=%-YF%?QIji{^)uCSuMj?fq5Ot)^(o$kwd1RJ+g$T{hosqY&67v^aJ*
zC93DfzE<)ouxZ^*e%KjGh_*=5!w-qz^_VM$Lbb>r;#(nzh5phSP>8-a1Rv@WoI%y_
zYiIFY$0*rey}?Pk8ZB2LVl-_eq@eqXw)EhvozAnsjMmKcos}E1&e?@`w?rI^3Wb{w
zXN#ZgymspYg`7{~TPxZ*B}z4Oa;#vY+u8d5U?#spZJ0xTUOHNv^8g!?y_1r<qu=By
ziBN!@YaW%`?r5debF9S%AikBVyL*~z1ud?e40WpR!pT${i=U;M^{9doTxjwYo3MAH
z)n;}ci)hWXj;-QjM?9r18Bdgu?~*>RyKqfJLP`)<U@V#h69%xH)G(VZ_>lz;LX;x7
z7kDBY(6EGLyNI8TGD;(CFNq9}s+%8O)}+<d^Uz?i0JP|3Ly@`tpc;{CuA~fN6+f?K
zb83Md#UfG%H^!zOF_`oPEA0|Y2HIXcvCdtWI}0WrX<ROlb5&WbB<<{&V#-H-iL8yp
zlOv(1$(IOs9>Ttoav8QQhtgECEY7COX*>Lz4yNt#Su{hB84iJI2fv8VW4>yq^9HQ*
z%fx7|Q|FkGLav-k=b^7T6K1cgxqk>HV}qu6+9s(JPiArk$MH{hfDDJO2k7bl?K@^s
zRa4Aq>NlZ_vfakUM%_;ol`VL6=p`H&6}gRm@hH=cHXn57ZR{N`cNyzLJ&BR;;o29u
zk03u7!0Af>Ne7ozfM>;;6Pjg{Cf~2B28J&WL@)zs;Rp=bcc<&Dsz6v=w65Af=;6a`
zRVb#@AYIgug_&*=FsQRYWN8~Rnqh#rA7cZWxX2Y6iJ;MP6D@)<1nC&$u9ReT6-Bqc
zqUR8}FvDaQjmK(5a34C%a<x!yB-A7ZlhFO)q{`%@*}ILF$>hdH5Om3RJ$8dWvycx}
z4%;F^?7lN+PCD&d4iD*Uit;1lSYlj*;JcPxg3(DnoryFI3iFVdiq4icZsoh|VM%re
z9t~;fkTmVN8LLKGf*YEFHOQo@Y#xi#Tg?*yU3Rd|d(OHO1>IawnoJjMrr}0mma}p2
z#FmPBnmIV@v2CnS-W*--==+iAC|K7r&Y!mRwcf?q{j1*opYYoY=-I6@YVZH~0=_ou
z{$Ieiu>ZGru6-KzZIGnH$nXE#x1nJ%{5|Y2`s~`Lq2bWi!C&|-!F>`*zaRN_-oDi!
zo=5&~IPX0A2mixY@XtN>+yifB$o~y9GxQJshp+IT*<AZNo#LYtFUk0*zu1>OJB^=t
z0_`(PV1C9QPYW6F$IR2FXZk|o*=N`b;hDS;pJ!@+=lRX>ZOa$ySFb(h_KWy&iV36!
z5e1l91F^4GRUPZrXFYwD=LXXwUIaD2MM^ks=B0+$&pg-gx|t^%_L=!De7dKh;at4W
zYiL--Z^&|-`4+$PJdpp#0OxhjHSD|3OAQC?Gt+Qv!_04Ag7RM3hu$-<gZsxw=Scb3
z5Kia!SgXmd^K9uHX&h;Nj&#nDr*-VpjG&;m>E9Wr@XWt!=^Kp5H@q_cB~@y8>D-2f
zCjn!>eFMGkdA)w~cliCKGa>zNh5M<h2wAxP?XJ1Z|CwTOx5}tJ{|EgbY?<eOe_L>2
z{@)uHh{2{VmO4@Mg}!*`Da8UF4J|6D`PRZa>UJi?c0=3mrP6vd92!c6h=<q^tPzQ2
z2i?#vrSbes6ER;QJIVCq5IeprO~~mi@vrO9v=OQ_Kwe7yxxB1)3VY+s-3~D=Ks}ih
zuaJd^A%l=!Eobw&QRDvlByNCYOz&XrSeiDzE8|AL@fCo}DaKdkXSq}=m|iiTB8HdF
z65B)aPB?|PCd)ggL*7=FO9jc<>y)+&>GGAdF(bSn4K=(=SGKX2JM``v46P^elwrYy
zR#1MQb_%?4-5`ldo1z*j=3#!BUq2?E2uJbY1p3j5jU**M>4eqP$JN?&DTn$X=r5BF
zt*en;c!-&u70EFrmSX^DCJG60qa-22s&hgq!J1gKK;yP*T@GkviUyQl8trl*b#9|{
zoFZOo<t!vo3geQzEmuyJC-9(Amjk<Tsg^LWz?vN6NJ~qFpMWW<Yv@;|Q0bbLGx;<R
zXQGS=no(}IMI(`EHf&0^l9xLjs8Ga~4o=TTtH`t>ji|Teul1y4;|Wq}9$uN7k49L%
zYwA|2Y2_MLzNWUz6&h74<=T1B#WiV8x>8n9JCGq~BXte*=(IGND+Dr9Q<KyeLrta>
z?u#U)rOgh5I;2uibK?a(eGa%c_R+@8-P;{fpxq<2w|V@2_`4kL4xdMo{BXAjcN^Rt
za4%<fhsWO$Aiw=B?H-swJb|F!6KHAmIQ)TDkJJXY9~1iYyRF6J5BNwSet!r1>w_B#
z_d$WnTj6&rd8Xf5$Zv<#f(bhG8j3(|ZvfujVtnThYQG)k7km1=n*hx<Y%v3DH6^I`
z++OwBQ7^$<pBcaoQv%a-z(4C}3NR2bB``m?&ia`FG&Nz)&&$mKO++2^?e?={PXUm-
z#SE~edV<+Kn>(e&Up2v8pJxd$Q0Lh^^jd;d6U_B_mH=C4{p^@s1~XeTGY4}oFGqgp
zXLp;%IFV^m=E-qpqSyAIr67m+0y#0|ye+c^V8{>o925v^Vz6~?0L&GD{EpfHOt+cK
zkOGXYaM1b0PjThLQUh?e(s{<`7cv?PqxfzWzPAgVLaHBRO=x3(eRQ_t8T=+<ZpYbj
zIh}T48m7Mk01&1_($w}2`nRJ+2NGyA0$C23T5(FnR<yH%16pfHr_}mL=3Z<**4D@7
zVB2X|M~TqnR*Fj#PIR0x+Vt6x7nd$XfFL=LM7~xHkJWmT620Fr0C-Cr*cm$FO*ljO
z1(Dsx@ynmvDXt0ru`^ofa|hOtKUC|@jt(mObhOdG*m;;90TY026llAjH(77L-lPES
zQ9_#?<kp+tVM^P=a2g~X<)CeEG2zUVsg@L`<p~%&MQ1^EdYE)ZJ0&5W-ZDuo_t&mP
zkkTi8Pro5bP|(zAHb~MzrvxoRqfX2;5$Tv}g|)Qlw_j_rUB_6ZQ=Jk_d{UqUhdn7E
z&Efd=nZ`N(7HHFkejT%-HT+Egx6^kbF>|0n)6ko*j&amQIs($hEaOOoEBOf->Ez}&
z)zHH312*qDAqRxt#`F$rVxN%7G+JuSH-=7`(`~L9peWEG05mURB-2#dw%h~^aJk&C
zJ^Po7lNXE>e``=k>?a+hmk7@R-sBErI`%uDtpIqZ1Wc26ONR-739lW?g>L~?U_g84
zpiL5cuZ=7m>AL`%E`?`;65e4grovHj(3S*jN!zj9SR+Y9NkCWuuxC=CfR^4th+0h0
zVJbD)Vl1HDZvbEc=nn>k7eS$hG^3x)y#fHz<e;9uO?-xl9(#$_hS$(o<A9%z3a!Ql
zoVN%#4^V(Q(gP+WGnyldB3^@bD1ehqkOI?s-Op<nU>U2_0C{3tn_i%$0)CG!HzI>I
zm0-jf<B3`gf$O07yqp7sXVM1(Knj4rXcs8oi~^B__;)ML9dku`J)Aq{igY^Es#m~K
zzXpDf&VlR-FtIOU?tzNIP+l&TU82H}1XHB?DWaBIDwj%=Xra?cf1tk@NM2TGcw<)-
z<^v(@68iUVq_E?1Hizalu}ZmEu_+`s<`UG6ZfUF}%Z4`q6*G;?Wf~v=%W|#{tqlz&
z!>MR&wG&ea8PEqSQDeHP@|qOMqJu-$Cck?bsVcm}aMeOikEKl*i3qK}DOjkQQUoYs
z7H4{y(}Ty&luDUEmCK`*F&BNo-7+*f8q<|+^&kLdjS%34?nxqBDF$3AJXKjx7<jiw
z5?)|-G4d7hgn~Ulob`ma<?N9k!2`|cd{xedw^7%auEl~*7`?ZklNQWdtf&*CijtSp
z1+B+vtV_GkJ`+JOcOcP9I!PeA@Np@rhfp33h1`hFcv5BJI1D?0_yO*gn2R2Rl9Zd}
zbAz0{Q+TA!7BCvy_QbYrn;qM>GqG*kwkNi2+nQ)HnN0f6xA*@3=UkkdbFRAIRaL8M
zt?GWOmI2Z*65Mztv68SuxR{6c81JSo5~Ez^E2H>^rx?d<6|g^d&AR!G{lwx8@eEJX
z*d1y*D?O3o%Mmn_$%>`>pI=+J99Z#qHfx}omBNY-y^@vrIY2X}FOt|R6s>fAZKf41
zhJNSq^O8XOn^YuiLcDW+Vl_r8XD2`3q)bNF$izc*7lRU^)|7PeAibnqOMBk5z$(C0
zlA&E$C?qiBu;W^_%b70C1R51}|AM;BKa-<j#2k-$!I<}r(H&npu`~XW`-k&%jnRRW
zT}{~NFUq#b6HLhfvky>Hka8)*BS$pERS9j9?{Zm%B`l07V!K;o3Dcd(CnB5;T|qLF
zVf2K`jDrn=)?~J%h@G}|)CjARWM;ErsRpfQ2Qo}8EF826;Qd8mHYIwl;O3R#s_ZMp
zg6O0@7W%vqL>g!pn>z7v`67f{xJf9uqR9%y$C+aWBl{pcc}BA5Yn`T6+-O9yV_XLw
zv_7UC+y2!qjdIdFddVGYGK7SR%<w0EO`fdyvzXOoBQ}dQAh3(&*>7-SqzYs2CSPSN
z1ZM@l6-pU4lsGdt=@dUb30HP-5u{OyX2s?zl}9bwk!^FU!yZk+HP*{&?@8j;9Hy<U
zhP;h*<Nmcd99Zlav_I2xDGy72w&{wMnjb1lR&_ybxIFaY$AUh?M2>jpEFHQgi!vKx
zfB<J@bHaj)WYu3a-Xvuw;2P)|c8T&bL?Prq;pTtbm@Gz!`4f>W7fD@qh<D83*n!MW
zZ-kj0n^ZLczw=W~wi-qOo)GQwT7e}!1gq6=qvV-I+wHQHm?tNDg4m5!=xHP?$9cen
zfO{4fR%itGGUfp+5bsz<j@AQ?VF|l}aZj~(5y!c9WdaE;i5Oxhou`3XVgNIyp#-|d
zl>zE~iJ%*`D)2C>5EG8R(wmq7l!S5Ou<Y&za>Q5<&OKMMZR{pa2hc>m6fKD`lEG+6
zNpI+}F!eO7qCAJ;+JW3aIHMoFBE-59GuOsT!3NspoqUM;EK7K|qS#)EHGj18Cp@&N
zE>M%4_cweL&#wc^SgTIdXF*a)cZLb8#YDy=>Y@<=n4c0ezlL#3n}Y?V7K-2#>D)gx
z^M%VX5SXz$E(FM>^fgQ|GjMb;_S!>1mu%F|oTZmG>D?FS7$nm>ikA(Jw9V0w^O^T2
zIzwhZavr?%g4Hp1HM+QmBI!_`|MZ!`?N%JYq_)VBV?sKfVPaO7o4K4cLWfCYr;*)}
zMM4Ia+1|7RgZ^^V<6m9JnfN8WEUAaHGJQ<*3tkNs<s&83H;dbN^D=>p7;luVfWYAX
zMB$|iiD-K+ilLan9*3K;06`;b{Kt8G*1+A`{Phg<^i&m3<o(NYeD2G09J&uPp8RJ+
zAhjxo56-&6o2*$fgyu4Cbcsqo#2FfDR*aN92JXnlGR$Ho?u&nA8m587G0j<D6Bkz8
z=&sJH6@*MJ{#uk^lMLu@9hi-GUV#^@DyqCq(cQeHv*!^hG;jxO&}eAPca!Ujt(YPm
z0eEk8A_~V7^vF*c_;Jwv1v!f2;6P)ngyFz}k(0e)Vp^ZYyCO;`jx#g7^7>INYa*lw
zB)B{!+&bNfS_K8&)>gdXAvK9=3;YrNUSjy8dR=A$d?D!RmhA`T9#Y8T0V=`BRrX)f
zMzo<L-KMV30E?+m3V0Ch4N@1*WC?T9q~=E1(PY+mk{?#9FjU0j_BRT?5G=9zjM(O+
zM9v`u$HP*|T4)itJQ)ChZ2PP-ErqKXH4a{v*mLexGlgh^bdGAOb|h;;byM4+7dtyY
z!ClG7{HZ_+xJJQfS@rydsmeegifmeV)`?(27ruN9lLqJHb~ozcnFB37vnA=vi9r;}
zgxX7uc>ImZJ=u|r-S)JVj3qdRx!5hvM=NF3K&%FfL^_L}2O$}U%*ZM@d~)<_HhUr2
zrR-62UcNyMl1GA<JSi@IJ`<5ziKm-(LT;OT4xz5=V<9+}RLWp~1?LD1XdFh%J28qP
zOm^>`PAFr^En$aiND^wyuf@(Q01HB%RZ5{t^(t=vz&v}FJTlML2D!Ka`xMQH2DqF6
z!O(Gvf^cq^=q5rs)m2D*^f)K6G~_YO;)81LgOw4d9e-WesQ<#k<1QTcR%BXEc5LCF
zHyIa$MEW&p0yG9EV$1>W`D9|8u_iNw(7``339s5=2zGWSPPo~8N#soyFlZ-Wc#WA-
z9;p|as-|zeC{6xlu|e;@D=I3h44|P&K<9L$!ccxKn579{qh5wY+g-$k^Ic9%WTghV
zq}S&>uv+1EZ%l7ZS8O!ei%!Eu$I_;|K*#OXX4n`stum!IY+a?-)a^(QJ|n|l8Vjpb
zQgJ4iQU@Dcg=jRg?v>cNvYab}SzeV``<h$}#4785UtASGqmXQ@WtM>_G@+(qLD9vI
zt6P(0rF&9q^vj_=iK$;<PCV&WhB)J-YIN?(obx%gZ(e@1QXY4mRegaAU6)GsD04L_
zq)sNE496j7FlbKd(2g+`v}_IDkj~b%liM@J(-UmOX(3r)X?~;`uzd?&mtwQ=9?8A|
zFp!@qZ8gdXgZnML<#*F1u)p@RSKB@5;O06IGblWtj-Su$&E&?~ps{0dV#vHoh~k;!
zT4dAG%S7f2mPsikJdds!;VAuJ>ZR6~j3Nqd%5)-;8;_3RoXU(z3NK<kQ!EqIk4?D=
zPB{-aw`Dx<_n80Vy8E=>2k75-`-CUj!o!*ixDA`W@&G7f!}Otu{y6pam^Zr3n%4UB
zq@nRw=*GIm@H&2H)|T<OKXtR0_3AC)SI6&QEFf|pB=Fw%)W%_rEaG)i_q0b9;y1NQ
zy_svY(^d>J2|{~1o$8B68fbYO@KD^PlnG7luwKiKx|<|zgLwlzhVo26o|DJBQbQwV
zHXETqsTq_OvK4EgI_H`jL@w+h5g^uUy+xx|aU2TgETblr0803@t>sEc-<b!*IXN8i
zB4S|HBijpIuRBy}`>BOw;$}y_hp+fDI0SX78WNJH?B@=LoxVfI@p5|{86FNu2n9q?
ze1O6Nq{yN`6H;+5Q4LEa(eTd4?aS0r*O5PkZ3pUH-JpJIkTC1DCb!J#=}UR|JWgRq
ze#AV>=q~?`rpI)?#<N1{O@kxRMflT>fx=5HcMeB>QWK5$EQ%XadANqQjr_zbzvZhB
z3{$jl{*Ep4Y@)ZFPyGT*b!S}CK~yo^gVX>YR7>BhETy)$;q-S&Lo0Ntwm}vdL6sw8
z*jQa%`s7;^YkdC0)dY%mb)s2v%7?S+FViiq9%e^!T%s?r+wBidg|<Qsjm3>iv1Vr_
z>)neF!*6nx1f!G;dUlEyybQ4=H$qOH#cmnRiS1SFG-z^DugdwLj^R@4EUp=v(dx)Q
z$b&mIq6@(cpe42;3}NE(`a?gJS+SI)Lz>!*m!yWtoW-PgG;y~JId)f?m5aI1f;@|;
z?Q>eZ?|vHy=qZmveCh7nQY!ODCTt%dAh*PzznnffpkePQUMN&Un);MeM~{XOX|eob
z1<5(d6QKw`D9VT{N`yF5N5Ez0218Q^8ku3cQt@5kaN>)}NsPp|J%0LvzpusE(((V<
zQAGA2W8O9^U0+^1x+ET-<h}7^LyKBbw&NzcOQ`K&l7Y!yzD@^g1ULi-Y?V@4Bckp&
z3xVE_%#=at+`x~pu@Rog8FmJEk+UqYCCj6E+{M<35I1oU0UrY^%7(!wUOK!%oNJDo
zl8lp~aROKwJ6oQibw^y<8e<k}^QB#w*>9|WwR-6U=O4KIIa5fT9-TWotE!@5(vQTj
zcI}b1-q|U|DuAY48?;KCM9C(`z}3OmMZfdauu?-IhYf;4C^pCZysRZNb)dDU<<^!}
zaKRW+sK_iVKe0xZK@pWu&hb->9z3YUGtNkf(nZ@;YIPf^86g^qny^7bSRFJu-FW@H
zN|H9@#>0i93ME*@v)mypj2*KmCL_6p7V(NhAen}>`ew!M@mW^4%51tKl6>f@0qg6}
z@|(66F+5GRi`5`WL)+ygb;<Jd(YIR|NAY#VfEZ!?XfkP)>`+|GknG}KRp94BRgx7s
z`}0;kmXFKnq+61LrGOs*8Z5?oCc#A-pC#M=(MyUdMv<&&Me^52`|+xtOgODgSL)pP
zl5bxw!tI$0D|^Pvi7n6Oo8@SQyMvG}r~Q18ov(#|&gFt>^etxS+9CpETy~MS=0>E|
z*g^1GzL&yFz{_(#uko!vuKR01@aLMx)2EWrAn<;#i&=F<nSK?U2&x>F=qfH0ozDZs
ze%fwjNN<OH5ruFiPQV$_Vuuq&qn>&N+2Mef{2CKQ^%d8{d_z^)@cUb=bsI;?ZudAg
z#uDX1mOd@6jO4KUa<fF!cXJZ^7!n2>q-yf8*1B+BgwT>jt<_e0Q5|1~!u<AK#yXMx
zii%t2XL0+^>DxoNZs9+zKUa)k$Q_$eI;?dIhZ6zHr`pR<-@|!{ci(CbXDICpZFKq-
z2rB`#9y)MbT9^(4$?at}I!SXkVd4UH(w4Q|EX5Ozg=9EZj=wbJ?7y;sB5A2bgp-Eg
z)a+2US-Wje)h1_Kfz=!gXJ=ajtIM&*(Q%hFBB~vAH};R%s2X^6WL)}<OO+);zt84W
z{+cH7*42hTkaz{Jbfy}6QJ!!XMB{C*=C($Sq5r|BbD<%fj0Z*|nUS;}UQC8(@pllA
z(>jwsk(o-|Jj=<U@|vl-%-|(wQfah-fYYX+v!V2Q-j;ud#kj1Y^tt>R@>&?%HU3pn
zM+fT__-m=H<4EYH+|cj3?OyZ)diY87BO>e#8UE)ttoq&Vt9jr`xvA1r=F`W$qob{1
z=GTB1M=s#K>)YYc@u3%?h2M(d&2T<4m;V`T>pXqXZ|#6m+=F{(ZYd4#Jt;3iKcf8W
zG|MW(-q*}+rlawNqhUM*YVKMQUyHZ>@j&<Mmi)dc*N{up2H?@}0urSQEm>tYB|?X%
z^<2eiNARUbPvcL+&NmImPi)Q-&mXb8uRxD$ppouZA)bD&`uxH6l8c7+zZd)gs^A6Z
z$fe&9^bCMJV87;|rjGEi2HAG_4)cS4kbuoQ-G}-@-9ZWO!2AOeAvZw!A1HkL5ce+6
zX?|e05kCKL5BAp#qt3)vCrj%4Auy?fF8~5oAIyJR5Oxqzy~2H|cG#S_<cI!;`_ScI
z(9ZuwssDiROR>|^V^K10pcnlPcWnT*({o55Bu*dV-&tY!hyQ8m#HajsdMBQLK@Jg?
z|8xiU9A^A4?jO`>|6PgL#ebK7!WjI&E@BY>E-mH1lO8y968sD582;ZPjj{iOJ4?TH
zS@J(5UH@-Id0qcMNmC)k4f=-@u}1$zh&E69FCWAY{>M;e*ng>={=Y=>{Y#|Be>Z1S
zBFY8gAO16g5&j3EbZyMP<57bC<pcS@qZt1$Yi|D~cLVZ2vshpgLXiEl%i)NTU))x$
z0-O4`@Bc?0xh?#&Yv#B<OnUI^{YP!K>)_8{HKLJO@3CNJ{QjJVrC{IxxbKTmV$}2J
z3(iz~-G=|VS2v7?ZCfIPR6ESflFZbjD!-jl-JA9*_W5~eY`hGdo(*YZG8QO&R&QED
zgKRlydas3UUxRra1c|QR{JBy4`qDkBStDRA(hGM}t<4W8^!VHwO@Uis{Cv#b{Iyx(
zfxS}W-wVb6Ap9~{vOdY-dk_R|!}SeCnF`qF{&@d~DL+7I+c5(89p3Y1%Uvo+y^izK
z{!hUE^yT<8s_^Y+M_E4@FuL)&5rpr(KO~^1gz@h-r!bw9=HH)|T%Tbd?&JN0K-4S4
z4B*C3A;N%`g8<GC&FlVM^MhD_X1+Xtt)e)``8RvPddR}}kBCBSrh2{<jhq0E$J&TU
z+NXZb9-9QxHJF-@BE<Wxk_`k=v0ponx(z%l`+brvqlT*=E!X`zAXm#u3Lr0+o`*V}
zpT70K*Toq18fH1<{tCTtU(8y1oa0Cf0EI+iKKJ*x_L>WU`}pfbq2BujbPK)-jwIbb
zz6W;+GKqVh!(tWx`1&-Ayz4{R{Z7*TN7T&|)DnJi7rXdJ&c?c^+pn;TyRSzD4&DDp
zmtVlbi#rZeoL_JJ^cE%w^9<ok29a7thOR3>z|s#DNqwMD-&bbeUmV@pXTMz7ITopR
z*ky4&Q@a(3($u?JH5k1K>67T6jHG9ot;SuBrS-^PaV*r~yxo|SG+5JQx|GZFTNX2*
z6m)48xwN}-=T0?{*wty2s43diczJp`s4_}dF}u`@g~h_`WYT?>%aZx?=S)oo+ib!+
z0ro}p8gcO&xF-@xb`@s0@I-FEuf}`qXZ-_O`o$hQJlmo8LhP5!bY_kG2BKPN!#Xg_
zB;tRMu>)dO-PKj5E;{NiCg`%<3<6%I13{{Er|2%}->qC|sy+1>r^D(P&$Az#*a@fx
zBXb>Km47&!mb;>#Lf<ICnaZ1raXEVMxtQ|m-IRbmxP6HNw*$<^5406tL5reId1_^P
z+8$|`cxPLX4LdkfNfOAkCyz*7iSERD&oNlYza)-ub_F?;35aAK(PkQcynqbU+dIIL
zpiq~)F`mg&VaC;Y@ZsplHcz3dj(kVblo4!69<IFFIWJzWTZKk@;?2wnCGIhp?1HsG
z-@EyJrynY9!n_n@M(%qfE4oTcXk(X|B+pLe=uaMWc!UmqD43kzuP6yMd_e<EoeCKV
z@w^~hL>m{DD}zl<PTi%a`iRzjbvB#@AxV@*#T<BraRB2lhAj8k-mFKPh)AAJ$7I>7
zL6@pl)`~Kh1r@1iO5_&G1m2Pv4mBkqgL_Qj8#~~|=7J$}x>FjfI7m|o=PChp%wOkY
zn8sKf3M#=m<m6!HM*g$QjqNl%l5h>8VO{P*vN@Sd$X3E<)ii`Pq3aZ8Ot!(D8jy@L
ztFyex5$MUA55Y90jTDUB1F3zr|K6Megj&`$Gh=zukR<#)|ILnN6!^2F{S9jlc$;<&
zLA&+9NQI_=@65h`W9x_nK@NPJ6ZWNw<h1%WV2&&0XjduJ+>M_Jm$GNHXVyoI-E|?A
zDN9(ArY9%|u6F*E7eAJAG80P5zzh4Eq*RwMDn3+oabZIFUYPsNgWaN;v*Cx42@P#o
z^9Y=~Xps(yBEoM00@-q-_w~L9YzIqh7!zHyD%fiG<l&^r=}S>68cMeO9Ij3nNBX+-
zb9@U$1?+R|qtax=89HH%t0xz41LI~It39K>HL)AR_vT}u@c8VLHWcgc*R{3kpWhBy
ze*)71Z)9zAmK4?cz|)U@9U$3t787ZvFR-J%6$0x$z)_FmkB}ygnuppsm4W+-kfCl(
z7w|A4K;&~9f4!$Zva2|DIj;Vjt^F%>Huy9}fB*8g3%j5ArIX%uA>d}YvIZWcpuR!L
zy;`^x!$mZBsl|GU$}ixLl*<yvUN`EFc3$97FJRZswmTHX1a@uW`a`kb55*n%MMGqb
z*H%$!Q1RlWyJVzmteLF0zEn9wxpVg~NeMh{)EQpX0}hGQ#%XthncJOn{%!C5XKzw}
zGi&eaw+w$=#Q|T}0!M+m(?f6jbn89w0)n5A-QEgXAR50^CAebA6)tB56XS%vl-dlt
zg3~M;p|}a3benwmBOQ|LzI<sf7kdymN>?S%K>DNMRyg$)@!bv}0~aQY6W83*Pu$YK
zgUqQ!gsk8KZB%F~ABk84eclTI{XCy+cW{icz+UHBy6@M=h86fjAYc<9TRGnuW<RlL
zP%fT3+}oiH+@X|dFqX5v#N!L(R}Xm_g>vWMvOlT@@3k#ZUFwh0>U9l2VICEiU$=k4
zZyof`GCSo!mWDmLsc<@l!5V?OL^VP=hlsia8Hu^D8>cHyUcM}q8Z@}71y#P{E)Vp7
zDUqk>j-e(}uDCZ_Crp)b3<BGOg!^KcsoiqAy{!Tva%h`Boq3eh`O45WDpRFc&rsp1
zCpYzA#aYBq(^U8BZ&kv=jVN!!**)UQttE^M8rGq3e02*3KVuA6-++F1pex6~Agq>;
z^)pB91>k+!v?B0ZDHdX1yhVS)CD5J$k6_YarDVJM6aD9&ct<Ps<t(>}0M&9qbP2Xg
zs@elOC6tt7s#!(9rj*a7+SnrBK!75*Q<!*a&sR}wNabF+FmzQH_NA1Af`<-#|6dY^
z*mr{TvK}UBP!ALUFerNd*Q2j^MD|uZRjxw^2w<!e3e<K-;EW8&(N$bGY%cl9xWFl;
zwoA38<5s72iIHfN^;7xm$u4Qe!<vEtUl}HQf2%6#0gSp8OBg=IOEA{+)yrWNlogtM
zOq36)7^qHwA6Xv5<qImq;oMkA7G~S_!(3EZL1><Yr)i;k&+{b1fOr|@g&Ouam%|ta
zMes$LRi^11X=z0C#Uw2E^mOS%_$%Ii1dW2Mf~k%`s|D_#n>Hd6;HIX)=Y8H3=4)&0
z`{({&i_iVO#?O7ej3}U~X9`bYn#@hzNVPpr<TZ7ZW#(Uk0+7U8FeTB?+{+yZzv9(v
zDkd_q-uD~@JAWr;C`Lb#y?L*Wp9~*A&s<C1n%3VaLJCgoA+kA;{fYHd-^7s`pAx`4
z@9J&t%a!cgpEfRVpV(9EMWKE~VVuko>+R&u$<5+cbr}Xl74l#uW|OfC6s|CE{A%hf
zqw%6(&<RQ*;GAY%Jar9YP-TOw9s3=3q?3CD1BhKFNZ6NH8ZL#P%X85BTljS{n$gG;
z$?Ygwr<5c`2o2xcad6ZFB=xH;C!_F{Fe=8;xe7YHqbyB-jm4G2x;&lD?&i!cM1xe{
zsO~l#jdVqs@Aj@8j>y`zr+cNtxH5d#=;cU<#c`h3MZ2un!(5X>lX31&yRfs(%}zUF
z&&uUuc+s)2d{hakLssb!{AqE@fA9UC0|@$CDs74kzBM0q`6l#G%?Tu1pPEs_bw2}Q
z87|lWPYoM^`*fO5s^d##s=+rJGAc$C12reAP2?GifNz2nMTe?QrLkWDvQ}1dGd9!F
z>eU#f?2{t3Nfj=quqL53<y7WXfxy^en!C_g;RV*tLNs@{CPn~Ns;poPpnIZkr?gO7
zdkO@Zahf(HCRXDWWfi+;>ip|i9?b}|>rPD*=B6%_<7q9Dn6{`y0vp7$a-T9rEV?r1
z38}X`8Cuhmp*e`pb%S!_vxe0CW-M9!AWEImTwOlCSO_@G7PhgE%Vw;lrzCYj$EAeA
ztSDf}*4^gQ)wRQ#mCIrI<k4krFnXFAksba)&yKWz$&?pJc^|6gmsD>@Hkmu7zQu=T
znhMppZamCyNo`B7Mtwd>hgYBmf6IfTQ!pg4jWYIt*xGJv<hFFvDIePmQ_o#24GdFn
zW2Iqxaz@PKhfPLmdZawt300oDoWWu`3h6=xn+o|PUeM>xp=<<}l{GT&+*uKjwOnML
z9BpaY*;cTphgYShuh8WA7k7tN!n1G*c@lRO6ID&#dw7B-Hu*u8?5N?qg^O`qN=yqk
z&W`%=Y6?RdH!Qvx(5t3-^F2+y{mhy8$x3(;Rb9m@s-KCqo-n?MfK!R#B*|qoAoiV>
zVbnNm!zhm~GB{pxMot11<Zi3_q}f4!kAj0KZRw4ghYpg}E5;gUin}jwNxfTLm_USz
zeQ8FO3s9x<bzt`K624QSGn_z}NGMK0B9tl{!{N$Es2n${lopzQ&VFn!6(`d%zxdLy
zsU+)ZDI~Ox{D4?Y2JaC8rarn1O62^IH%U-D!Bpge3n8@=C5jXO2%eigFEm~dinKm=
z!plTElrWbFBBG5=`9yWvhnb)<U(#VPpeIBw!<3TKy}$=q+U&7LPmeA$$}SF;F22lx
zaf5*Eg2PSxp||0YAifPDlkt1^rsWk=CzLt;a8i=W8m&r->?p+n94?B68WD<i?9w(I
zF&nejOQ970n00%51RbSIw3|H+tAMpoE4}4JOTr&-9v-FsV9bE4F={N8HiIREF6^VF
zuoH&8LrQj3IUHe>tMdnU1+!@`F@IWYgwIz<${t6lMP_MgK3>N38z#l#>Y|nsbvB4M
zd(Yl31&Q;JW|f|-<%!Bp?c(#DbaHO}0|a_taO#ARo{I6u0e4jS+i%LH+sJPh4K4HK
zA(1erCm{(R^FiG&?KcaZ_+t!G>7jXiu)~HfhYfDl{KMnKAA8--Y$VXmk<GM6W~VN;
zWGHNN{t(IK#1IFEwDuIql;<!DV5*&tY$cL&^fI!lIr0W7=AXgFFd=#s?_x<8(){vO
zqq(Z`nK+lXh*W6s5oSQSdYi`po>2_ECuPaqzXgDnk9{nyNMNUD{qM~R2b*N5Bwe&7
z0ktX2X)p4Odcunq;>Y7DW4G++$n6vPve+?3gIO=(5`Izu)B1BFs8D|WONU3h)^p<1
za^x<r@-@3P(xu9lc3y{j_L2hzriIs0`)86af1s3YBp_ay$)kAH?(f8Wf4+5wIGe|k
z;^bDv5hc=yRTI8tAq+!mrmreIWXJd-PQ?Q?%CIk7ke~7kGV`Cur9$G7qL5kX=fxQG
zCR>rG=W0EVkAgh&><%{KAI89McDCAIFE4z}y3c|JHe%O%V7t*k#{$szxOyA-<OEfk
z|6zFxe0_!dQ_$-=8*?#2Q5n$n^er~|H*TUggH;0|^<{+Q%&T$~3B$qOosmqJ`r>@r
z3gLf-?!Eo`L;t#e@^L=&7Vy&GO^CKS7XXndQq;eRP0W~Vgu338F&E(VrYgw~Q{3BX
ziS7IJ23=?Ck1&Oqu79$r{l`f<O^leF&X&r5h@<?IJd=0+N*Xq-9Uoc_t3Dvc7V9G*
zVIE{v0Jyy5a0ax$?SuUMQU`gPJ88@VA!g45f{CH}uFwO|_7wPF%zV`Th%2X688hWS
zXT9t&$G8gPkrkXT3rimOdZA6!CqH=+O<+O$deBZFo%Ann7V3Ni^v!{+wg8ddbZ4#u
z42=#y&JDV5=76p9habo#X}p$!nK+X`MQJEcg;`wl=1fMeqNsK&3w?pKqsZ5izt9SD
zL35-$I$5q!0O#iz%ALO|s+7Ms<pL}S{(|4EhmvItSu`PBJkE#|{8oE$mBkBxre#m!
zow<5e1?J}(3~BbLn_$%mx!dgH*qzzgGOysv)hfM&MU*rlh8z}|(c(roAW{9u^Dp4K
zxJjOICoU^D5!V&5B~LY>hsYsYD=*N={dIphSnY4|ZBI#||4)^>SAU*6w~}bx@E?Wt
z!@oa#OQV<ggJdp877G16-Y)Id{Kydj?&&(s0@<rd3F0bFLrHX!3`13PWJ9C#zD~_G
z`##YzYtld?&%~GtXZ)yjQP|c)D6sE!-iHCl967%Ol;#6hbAa1m_E<osAjrS_23^&8
zK%33$^M3hn7n=<MT_MI><ca|-=sON2^y*>{Ecv7@NhYlw!HvnY=Z4>{!}2ATx0t7&
ztWY_>F^jJV7OnOBQmvekjwx3LGQUX?U7Nk7jE5#yOOuB;BMwdWuQ_*mV|jj-Aq~B3
z6NI9l;NDW_sz8vQ@7lnK_&%BK_UDkR+kT$&HV6nn11vw0+o87^KEG{)!9M}_I{z_w
zE&gV*kHlHoIYH0@A*T$mEc||mu+hJQ+o*XuvfjUA%$P^O9mbe@sKY(n<`iywh>&qv
zO#y6byC#~(X*=yV8aVq<(*4q5&l_}IBpzCXB#AbuI>c*CJw(W8Ekk)nB#CQSSCmAz
zl1)&-kc7$0h~P>jiWw<m%NN6Lf@ClhCus*SmX&R(VnV@`uwte-NxQnp(wdT4%o@zG
zl9%}qRgA?+R!~sW>rW2zv*%ArYeSxpA#8;4KRrL1p`M3RAWe<KPfSRm9jd!H;ham%
zZL3wSijnnJr2?Eu6iN~ljy?82as^yA=gI-hNvG{HSFJkfR2n*Uq%O>IW#Oj7ha`2f
z!%gB477yyAoM`tH931^A01r7(u{Ib8xia>yWu0`21|>&W$LZI*-ENp&sbXUqKx$QC
z#Zk>J_}XlhpFHoL&R^2Qm3kH~T2VdX$g8*mnMO+RqM|;l&Zb2f4A3`=Dm5k4s4`Nq
zVKSMw{Ha53_viwv4Y7~%#Kjm0YM5f~$qX~h_ig&vqxD>=CGc}uxu}DIQZ+QgxwH}?
ziYR!5lIUPK<lK2>?jfaaVM-Z3twbKRdQnCt3pz9(qyZa97EF94u5w>FBfvM}g{P5=
z+zxSaC+tHU2PkED8%@Oc79GVppR`F8G)b-E0>oRmC6C*MpR$pbm#Qe1l^Z6bbZ&}(
zJxS+r)r6qLLzDhpajifau9mW3K&BS!>=Eikka~y_yp<XrUeu6Dq#1-rFsJ0i8G(W&
zY<Vs@e$5}P3@yi{W7%jNcx^20mio#7EO&Ny-Xa+JHgzS73lJ3q3NcB$n6-Y7Dh7pD
zPwgMowKGj6TI*LZYg^XK!B(=@h?d<5J+0F02*mWV){{$kfZ4KITO2ywh(Y!!EQnJX
zRb4GKvnTQCqykx`n&9{oH#oPb%=iZnZ+Q}D0dvx{BVN8d8qI|TL^KbX>Z3u<fj`Oe
zAx?@@DR8xH(tic?EX6da-Rh^NP0hhjj=isH+{3Gb`OPJ2L9-;-ILe5Tjmk%=q9Cuz
zX)ZcTvrtCe;z(N2YSOAwg{P>8O{9mx)ni{E<V}ckDkdjQARLR;YXfa$moQNNluf*c
zdB|-Qt}$0Jc|9*KyH24ovZ>^$i|j#>DV+MyBn#8236p7Srk*(S7pXLpsYIu<kY!Nz
zC~xOvzEA{Ds9c74V15Je&YRT$F5uRNnd28>;*r6`JorHPgOX;^N(4YpbpkHFFOIFH
z;k9$JD(5u$ji6j!6C&mGh@^8>*s-58vxp>Kz2Q~kovJbpWCiX|oL}$~u2p`(VulTo
zz2l%&pcDvCWVwMtV}<vW)dsOkXR<W~!)?`eyImf>Ijoo@Y5dH5MVoqrb**j=n=hC9
z$^}*%c|3d18Cy5$W(^-hTZ>0qx~jivk_Fu0SH%p`!uQKjgO?3DL~dg%<z)VSfd8RS
zgBDGUuy*R1f>o4Hl7;XhKD=5bm*N9KyTpO%k=SK51l>i6k>t)(0afUNY<}ypeCAa?
zS4ty~=kMIdov#!d%Kh~hE(x<1IfcQ#CUGJ!xFx8k;jYtIYWpfsJbqTcsj<Xdr9z0c
zuCe%~ku*uGR`bqAkI6n;mA1#*=7=#*-Oa1)&Xd1Xb4RjND1Tk#oNYrjsuGQmVe~0#
z9W{X}Ha3k)GtpMU3#3iA${DSaKaY5q=a77s>`skl9$o8{W>ti!kzYAqhScj=vEF|!
z{=TgcgA~I&1aLJY)ufYH;ri*nVtoy<R@T6S7xNS=DI#En$CtwC@<YR>sfKL&DqF4h
z0@`(bsW{N`)GkczDb&!jI-d~T%ze$Wow7e|Gp@oylPVz$%I!0tM-Y^nq8W{NC-CR<
z)riGI<~bKE3g;|m9To0}j)08C#1?o)2*)#hL{CJGhW#RO{n5v259HD_AHjQna49h^
z1qN$>Vo`M3d|Fi`GJE1Qo|zTr?#6^U!9L%JwMLy#ooLsNGd$+p<!=N9#sci@w$oVg
zZzf#H+LVe@@^-{N7<0*X<v7*ATn=v9FpwS^UoR`=6e)o?RFjPS#99!iqj9t9x@gKD
zai7G?jY)_w@Wwe|@y<__L<WR1<j43McX7kze~PGwp+(lk;4R6+`*WOCi_nNUzy~1d
zYtvk>Ah1bzG7%_iQms&VRrysHqFY(`#1|y*1?z0z%*AFkGis{=L)2S%Jor^=B7@)a
z;kNK9Yu=PwFpXgu<_v-<7Ajmu@W58n8|U_EGdfu{i@^t}yAyr_Y{4~*h+OmUZJ*SA
z<EPI3^G;D0U@%w{=PHLN5x<w;e?vpvHTc<SD)>C~)2Y%iA#D&UCESfuVl_r%?e#s9
zsCcqjKeQy-S|M!pDAP7J{-7vnFyDzk?E(?eyL42$SuZ$j)nn;W?_wVZ!ES7Kj`7pM
z8ucAg@F0c-(q?hBY<38J!#q$+Ycm$Mg~lPL`=@CKM*Pc@#wm5Hc}zacI*b*_!SiqM
z!SuEE*Z5Nf11hZB_Q|H!PCHx-$?LX|3AKk#vlK^I!w`(G{2?zVY1687A<fAYIcHl#
z@&roVdz`v**!Fs1DZ@9WmwE<miwLRaZMn&5P1$)8oh*n;nZ}Vd7!zVpX93{wv)3gs
z*N#U5^$47J&UVJ4p-#1~5ovbCRYWe75_q>qOinyu9@AP^M=Bi(^CfEx8tISvu}Iu`
zi8rIkdZp)jdh}fA&4p3bHPVr&vV@oSQoqP5!kcD;GsP1TsP)WI*o$dI7$qCu)kznJ
zo=<|^g`=|)l!K&oqTbNGgl2dvXG_0V)22L(ydFccgrlK}(!kZxILvVU<|6ydu%o4S
zj^R+SY>6bUq--QIP7y)>QCn3?X%Cp9H5(k|f>O#z`$!g$2s0$!Ww$Y3rqwCO4Z3e!
zUPj>^LTZP>&UQ#b6$?Ux_7(M86s1a~v2F&t3DlY`+dP?LOS2*!J2E<0Xs+Dj5n?#W
z<ft=QRPD%`vf?>iY6Tz{r&4gFENk`dkmuYNLATF`HOd6hp@P<0t+|v}lZ7c1uR+Pu
zOIy3g)RWUChRlvQbyw1~G-+j)qu`uFbF!;ZH!(q0Rq2YA>WtC&llE$?ZF%$3AJPD-
z?$9gq>E{~f1XpT|DY|8xW7BCN14#$pGu$FoMdD0g$4eK`TS`O(G2q3wBjF}!LzcS3
zOBKbczcRo0(o~t}m0$_;DkF}GR=PVB_vCJjYOvyJYy371nkS$qvk|j}HKym|QJVLn
z+uUFDDau*1!o|0P`0Ms8V+XCVETHBf%%cx#uG>ylh_#HH#jMM&Tim7IOd-67Y8p&Y
zZJioJs+kQZRVp*>wDc_&fg<@!#3Yt0!rd|JX0GdqgV*#~{&<Eo{-qPsP2E#YNsbjS
zQPpUd)mM4y!k{^i<z`Ng$v5)CR3M-%r4Ya-(IWT_J9M?)fKM~ueVNw2xJ;ke9WFMy
zXNiaD{Fsu+F4ZW8a|^r)3F~J|WGA)5v;7zzgLXGWGI+ErWOt}?^vGoTMr4&9ZYF{}
z{^u+yV<Db(<!bU!vSJdd4Z=<=m<TaORf1vg1i9!u+l4rBCE~XHx;t?NuGx1-iGF&0
zm-v`p9SIH66Vy^MiYJRzr4yAm)fW{|?ru^k{hVd>s>?KhWty_owzbrEde$qUG!;y&
z#!gkzU7EZ;Hyc=_>*b~;xm+lSCU<p9jmF|`Npj4qGEs>3Vc~W@oM~cNmNk>%HK<3P
z?+UufRL1&Lr_RCHUGbyo!KGuCum;jz#gaMJVR=ZIx;V&{#rc(0H^fhP>Wa&%c<J?S
zBo^8O^LW*rg}<bOx~!Dt@!i`vd+1{>1Gnd_MDW2Yr6)|AmhDn3(t?z(SIi5xszABo
zBs+}lN#%)&KcCRp8EavxvE{&n9Tc{i8L^eIL3Z+Wpp{P}R30gFN>eBN@X~bLgjN?q
zGmK4TQ7~N0OG@h;X_-YZRPQ!=!&=P@q!TJK6VmX&AQ2Y3BGE-R(EEgs(9N-jmd>S~
zZlvL=IfX<^lJ@1#=1lg?SwAM^05pZ?u8DCX%!)Oo^1S-6{K_?0f113S29h^KU{WLt
z1DGdY#@}ax-N~D?DwjBB3dbZ0odq=ztBH*<;f+L;*U!(+%GTh92T1cyRcA?^^BXWh
zh2yYnzv`W|x31`;CkD-K-94xdaJ+ihTTPF&T79?kBH50rA3`_>>15<12uY%MYyuxc
zTSOvXyO#y*MM9x$qaQwGtCJ!?i2A?8k8CzPDDTHJx*BZ#e&!kyX2_QX<q3-8cIN6-
z9TIBnbW#nyyKq@y&mI_+S`=1v<2~CB!6*daX%tX5Mr)3Z70MgyqVAj26Q7%5RVmV_
zs=>l#DJ{a}JesQ}v51o)k?4Rh_?D>d)HXSkSuyW7?k|?)Cg#JiZaZmVs+*eg6nMrt
zm)mIQ<H076)>O-KjnOVX0P1N=Wf&x?Re&3JX%rqUZ6Kh6O)-jPB6l=fgtx55vZDF%
zl8q$EgQw{`9E#d18$07=knM`go$}k=och(x;~Ub;AZ^NZMB(;@xK0h_EL>+pO5@jj
zLGMWvgec_BIdfoH;+&6*^$e}Wq1kee+|NSv=$Dlt1{-&!lKn*X{k9PiJr=KhMBmS&
zzZ3hozUP0KHB6Q&7^W25a9k?AXMdb5#JB_vh8y0Ps|4s`7?e~VuW)*9$hB)K?zcdH
z!k($T68Se}grY8WoKX2H&_LJ8L5P~{TWMPFUy%KkY^w_u;_-mNcc4^Hz-5_rX0Z^4
zwB5_x;Eg|K0gp~<Nz8Z~{t{%wTB_Y7X*u$X9LL$V=oIS_%x|hZ_$EhW!bDrkTJZNE
zU?IJ$s|U$3Utkb+?ib@8BTq>2s#KvSB&^hjX|-27;jOr>(@9y&m;Le4>cC%C;|waH
z6!%lt>^@u74WRJ5SF+Xk3d^pKlR)_Og4!w`X{+hU1Za-xe+XA1Ov|YV#e0;?=>QwQ
zv(qttyo*z<<aGr<D+2~Abb_0k)#)dny@b~`q?9Sbwu<4jQ0tWRbAO}#k)-~z-Di8y
z)trK0iMLRP(%{BDSDP1CcwZt{G>)4dBsaXMQ~@VyK7R`l7Yopr!~>xV8dlMOgZ&3U
z=X<?@%A=w;s5x1J!<XSEFIEw9);wDVgg)R(&F5Re#xd(vTtGm~CQw)RA7OXepeq{@
z+Lvl1lA(_{+!p4I?{A-?Va!DxzIiwg439qi&avTZHOJ>P&1`R+>IOJT;oh60W5*j1
z`3-yS%a(Hual{x^0G!A9*i&AY{z~VysuB@xO^n=d3^5L?+Mhg6r`A~!mu+{%FN;gY
zNlMDCs1n>yWdKG*&L0H*fiY?4K`?>(l|onKsG#7Fk*td6U$nm^oWq8Qjn&)$@iC}2
z2%jiA!Z<4F@1;dv5NO*`Qe2q)qf+yyC=!I$i(ZVXGr~Giz617*N?0rb0Tcxp(HE6a
zi39jb$8CkfHMvvsFjqenVeL9#_(Ya%8@s3^1N%8ONzb`tP_-lsB<mZ~yc?(z(a2Y9
zs0+Z^2YFGno!Pco7Y29%?5^^)5KRsq$3j4xu>kniR^20^FXyVGfSWX1|6<J>hYv%=
zakrUd{-kF1G)X1L5%uthWYRG<w`UNpV0z^xw6yMD#*m#4L0u{6CP_GvnammS+V2cm
z-&Sq_>W4bUAq>XB*OIX1R6kszNrWThmi>=eG&+pv5~r63hRVIjK9cOzc?pqh{3TDv
z*fp0M#Ge{#hr}{aTruSDB}R+n;H``824VC@LbNOae8Zhhz9l7#NcwS4(G8MxLwIpG
zwxte>S4Xvrf$RuxA{$PoFNrf_fuW)%IU6(SR%YQR>BO^ZFdXE)San&BMB7sKYkh#I
zJ$k>6gd=&uVygBn5nF1>MQkPx3Mcr6QU@7?ilKhucZDeJU+^lHZy9=nxty9PDQ9p<
zIvTDM)~`zhp4li2?<el;)p<9SZ16pQbz1JcyKc^aJARO#=IcAh!1nipFE_OPUMG#O
z(C6sSuc{r`AY06r0Xl!--}if6Hb;R?wSB>PpQqug*gij~)K$sukfA5LXnbBty;Uzb
z8OT2JK}h2GQ4_X5JY|SHnW-Mop6dVVkX?USa0EYJ9JZHPudV|AS^)R$Z*LjkkH0L@
zcEF0HNfEc3Ah(8FaKtb7PiD`30X<dLII7=-aW$vSuPzKw834FADoBF326tDidLDz-
zaiQahEKOfvMH#~d+c?nH7Cgzw_~SkdUcq<4R<1kv$(JXCWc(#lq$^iK0x>F?Y_PkB
zN%Gk0St7X;yp<5qyz_jSVr5lN5mWE}SF|&@Q&$^Do>T*hxx|nOF?5Ujqzj!W6%}tQ
zY%uA98k#TJ<>yl6PXJ`*Jhx5<itQ>9@GEw;aRRZ`xAc`0S)PW-nrDYlFhP7S<Nqyo
zwZCB$9p+siC>@Y6{LSh`+TQ68YNS&Cwhpl|9ma|*+~Xhc6K$KIq3?t~kR$v~d^1ea
z_B!eKd&Y<e^ZtgbmQuYCuHW-1gah)<196QCZNT2`99&*3$Mx72&ey8v5sV^ef-ZRu
zYMuz#K@l=-P^@a6>=gGMpsYyIr(Jz-??qfIAiy=y7tRlA3vh+eldlCkG{1XnP!t|(
z`f+;VA;=Vb`vh~yz>lEB_bGSYF@Ye?g3;IciagBOvu_1??0^Jey=cds4OHN$XtP_q
zTyeBOdI3qKY)`>U_5@XXH_9RGK+V~*Pz%gLUpz}me=iL8|0Y5C```&4SD{qoVU^a8
z>!p=R`jHQY6_#;?1R7T!LDWV{vM1NY?cm|rGw{`g4`Xjn<de5F9*Z#2I#OnuM2(JI
zFTT#o5)!&~Epd+dyDN@RJ8S#BX~1@Mqo3e>q(b>}*f6u9)hvfIdbrmJI)geDcC>D9
z8j@TCD%cBtq(*~#qfbTSGm@g_ngJ)ev+_5G)g_~px~Q4s_ApR5H2$Tnc6ElGqC=R=
zCa65)gk_y}z-1|bkQlN%SH-u6`FeA;GYwRC4({-64Fpdr)cx(ZtzXEG;SID1bMZF?
z$V?0F={HURaAEX%`gw~zD{{6;cJSb5a~stG^<&}2IoBB6!YY|^+_`tV`a>5sVYT4G
zhB?>5vlcN{g{ZajHJ*QlF6nMx@#idiW`eY5mCx`9<=9&Ju>7)QGtM#4D&RYNz9DuE
zArZ+t_dwrmhgJYlU@DD2^?kmn%rWkYx=V+)738ah)j4~!yE9*gzi#oisr!4=SQ~yN
z=(*zOk!e`yr}~FS>uJ+iL0NaBRUTH5)A(`-t)P|XPQG``_-ujlcMiNRLU>3_oBzSc
zd+A=eQi@1G9@vb++KG8M6R8bOj<I!E)+lTkw_Q$A6q!AO6*T&su^`f$KsU?;oE1wQ
z*wtaw+~BPpkwtRo8s0Zu$b})A0e~SPf7TieCGq=GaY&S_d`}~0u1?Ky43@<Wdjx|)
zIy@NaH4a=)8KYA~6Ah;<d~gLwTF(bU0Ys(%kA@)tLcwlEk@OnoD)peE8c#|A6^RcX
zTg>bDW4kZ69;)@ZE*<QGTp}H=xYO368&t#&o*8cyJISXHNiC%<R!?Wu{I<Hy2Dw>9
z65hoMcGiV>32QF!)~;!J5R2C=3EX=7u%mO#n0wuJV{I-Q&B$y72NE?z*NOo(fq}hl
z<)~twG+)>FkgTmW+W<-%+Ns=Fhv%>Zsi05tC(B&u@X|gd=O({)+mcLf?PYK)pl1>S
zlA-qZ^d)b?ptIJRC%M>y>BV<dx@*4Z<kN5f_XNB>2Q3N>E{Fee^Z@^H+tQY?$n9+@
z$EvS)I|s*N{jjo5L?hBzEGKufmAvx$#!`6|Hh~A>P!_~!+}!8OFMCOL>pFx?Nw`ZN
zfuhW)9ngM&ber+j0#<~eK?@f6SL7SPDkZB_8&NH9-Ik5yGh|mt!vtc@t4-JjixFag
zAKU`kyaA$-!G2VXD|DXF88`AeNOcscYnHEjp@kk4BxaDlq;X#z-)^(Jr~Ph5T)50g
zh9IGn?1OV}To(;z489;ll6@O&KWvEA@*WQiA5{+nF$lsOBJt;Kp;}nugLPBw8Dcly
zn)7NnWd&Bm?Hju-Z<0n^+Z6+g)rnv0E8aL~&8b2g>6LoiWj3ZmtD5+h+e#hmpi-do
zDbg6#_On}LGv{#bQI0QSR&re5IT}QnlKya2os^vqE=65DASj2)vJLr)!HC=aVtVzx
z*A7EPXM(%p9#Wva&S61*10rHtfddgPba!r#1Zg`flahGNVFBOP1^{|BoY2f<@8DqS
z5{p~0Mo5%r=z-(k(zG))V#vp6vipN=2ebt(#E$-91~ft9uO(n!H-DBE>`5`q%s`_J
zP?cxxJaPa-R`%Mw+HJ$38M@Tqd|@qGfyiZDBsM!GAKMW()jGO@5KY!h6EnX6>(54n
z2r_%cFXr0F+`>6$`1F-eAV|W{DuNG{Sl>lua<C8Af>8W+&tpdWr16FjCyXJYx7ECF
zwv}2CoS8s>+7`9F9QZh2ZAtMoM>ad*jQXr4O|zkT-nELbu#;k8U8FOv^@NLkU{U9@
z8f(FR`J12zs%_l9cRP3(%hVo0XI}WPqV>-#P&kDF>z37(5v(VR+TWY4#teOh^Mkwo
z79g`VWKXWwwFQJN(+hy}u3?165}U8=1x#GvdIlVWH~F*N>~zaBz5EfD5#NIk9EA98
z&|7a_TZRQiuD>2UkOQ+&b9^_8Lomx$w5h!*<SH`9%14jJ)j`%HU~L4A9anaSEe<Sf
z!P?<qm@fxcz#_h*&*YggjzCG&qC@~><1AK~25NB}7qMCNjLTyNec+#mHd@B8XJ-a`
z@~i=|+n81ksO_y1YSL@zvUM#+Kgull3rZ{`?XhY#3pYtC;SQH(&i-1opg3ZkpV7kQ
zWY~v-eT?BP{g^xJPv5K!f`eIuW^l(i=FEQ1=H&8&uj&?v^mg7WS}e~W>v`JPB8lu}
zNY78Vsg#$%r&NH}ZF}z-3wPIdfBB~A#NEn(Sl?d-$jQ#;X{p-2yUERR<Xq&b?QAB~
z>bIs7F!DjNf$|1J8YQwfci}Xw5}l1~6NX2>*7>TugI(}fJX@H+#>KEkxdw@Ja~YvK
z3PB;}z7V{%YW<$&D|J=+GlKj#N=Q41Sz-p}M!m`b7X~4HeiKW2<SW?1Kj8j-tOp!+
zm{x8)x;YQ`>DDXk2B<g(iEHt7(ulhE3=oz<fJK57tV(ydQSBIIx~4>cDSV<NB4oQ3
zXtKC{-6|*^?;!aJe4b6Uu@e`l=s7B4)rOg#LzaydIZeTWc#EBBCKwK(HMcRyb)CYD
z1uJ=hG5#EX7E{5tYmPMM5d7awI}rzePCEZtpBq|O3*e3kSmzHs$`;I^wA1x=(@M*+
zgT@Tt*_54qMu+QStolBoOXO;sX35ML#Ij{|Q5MwfdxLO{@X5p$*w6%vN8#{{Ge<fT
z$bu9q&_K%3v=xMlj{YFWqH#R4ez1PBa=mH4kVRJqmz@405wJ|Y?_iMKmJ{hQH*ZnY
z+gta~wWeO>>soWe>NfMf$+C{{19riVN%QOXD!(xV|8DnH(DE-ExK(@U*5C782&=sT
z7FT>Zu$H2D?|`!RuZHx`YXML7?;b01%<Gm=3q2le3Fc29CdF|69Xg7PnOQaNo@?Da
zwg%VQ>Xc`<r1;mgF@1|O1T#ZPqnVbk<$74)_dNIOIcK)xMD``y8yh@l?Te0{JtNH^
z=ihFWNN0S?rfPpemMmPsKY+0K9oeRDfd!Rpk$zo-91zz_<gRNi^A~4q1!Mde<_@j6
z7q76*Ec+~;aM3OYz=8px^NZ?!sAuMCQFt_wbTpp?5G*6DDjOmh9=yUKz3zdey$n_$
zl^w(vEP%qW+x6>dR5e6h8N`>>z)nF}uUI`P!}n-R7p<HPV`-z2tb#+W8yGfW`1lda
zJsIBktD*@OO#)mxBZ;UIUd5SSc^T>hwrGz}tZ6Myi-(Rkd5$|~zXmA_BsnT+3l+^3
z35cxLD{MG+mv0fyn|Nl`L3m^(d!NmlBRf_QM*8a6o_(|PCti6hgZTpYh=FZX-q-BY
zUZgE&jfRj~&$X*I<_2EbvuHDNdQbJE^tDBV**vXf)~<TWP_0SD$8+2P8@ja%j&^hH
zEIQ8WEtQo&3RAaYuZ7wNRy-W*=;V)4Mo`Uhk_o|>z0Q6UT9_w51zKf;5#?P+wjpM-
zE4-t)s}q)3uypQ527?q=GYr^C7jlRU+pIXM{)U`DHKPwCT5ks`E-opmoUu{6Z*uzR
z#&C)(;<Yj>Py&$z2%cg0e`b}C6MM)eQW9$*XWB^H8u6Rk8?^q3QXzVj>75j5i8LlB
zs|z$TN(afn=jjM9F>0g)sT;GmAOO@Q2}<CxlR*tTJ?SXbL@8SOAa3lSVw7pL3@uTC
zVYn~)S6^bN|I~md1{bkJawBeaHOIrAOt%Gz!+pRVyL;qBEOe&6x^&0Iw`bXQORHiL
zi>V3(s4_DMV^>4)+L^=Y$6s)&rEKGZ?EN1At3Xu0Tz*pBb}LiQC`z*Wb2VF><&3;K
zNCBpy*KTT32d!-z+v;F0KycV`0Os_xQ<ihtrb8%kxqSh|-qq)^q;D}+$YChKHiN%L
z0e(w*ho3A}t2DtTgTE!nI!Wxb4yLIO>P_}*+?gX>+_3R6jU57H1ym85^r06pPfDWD
zWZiJ^n+^f<XGiq}=9On1J-4sg(##@6ngN+tp+=VsbxhE$0P4-p4)Z#so`h<431T*r
zvzT0(fmxqx8w6PP0(1)j^IdIBb6i%%VLdy!J?@lRR;X69IESSZ%obB-TSJqU-Msd5
zm=}Nk<;J<hA{3dVE-q*aD|+J)3;4}sWZW09st}Co1c!0sAjsrAzy7XG+@<A{6=x(t
zwn3;*ucp;#t7#*l#iU!L8`OryrD0%LRslhexyD8@j!jUa0jcS`!?<tUVv=#pTbMq2
z;4iS8jTn8`R%<dBa%usf5(O*JBvJ59R-uOCx>v-R-!=oCzpJNbdYho0f%IaFmcWct
zN~c14OQ)Dd3W-(7;_`M=Phg{!u`v=W)g{F3bocl@Eb?!U-)(dgwqwC9=pI~k{Qps3
zt$SETZU2A%wzf8F{I|A+_%D0qYF_GCx>Sk~FYz$o3M3AS1ig*{P`vn!_y-n<fw%|`
zpo`$PX1~AL-y!+iJ6l^ZK#Mho0>;BUfrg=!)<uSbfmAdc8cKzR`ci}N!@=DLN-NZI
zmiPi*DZHD?6|%~dYJ53SE*Ir(Wy4FS;7r)*5Z<E)TX<u5!BPqD(v@vmR#w^GfpG5{
zjQ8u7a$~OJ$uBqe_TL|hCc<5g=4PAJ@Q)ElY9JA=1_(Z-63I|<B#{co<FR;`DQk2j
zgc&>-4|!4@H-Ol#g$dPz4`Z4x@}2~w#&Dw24h`n&a55F{?U9zcT;cV}@K7QW8%p)Y
zhLZ7EG}RN0^{!dE)J+2;S5&!_O=Cb(8dAPeB(X?IOjVcP?RE=|=U`n@HL%iBw`-Pg
zG0-yy+#e5zUBz;VG@JY#E6FnX)us1TU${Rq6iz`clHs^(40xD_gp8F-9%(Em=d*5U
zlcP}#bqz_(QCKlaW7XOhp?O^-3I3A0=LLfdAgL)PLeNbsX^rVOE&3@w?a*6HMr$e>
z=@|+Qh8gWUg$|+L<KfkjL^8f1wI;klawaw;lHtKkn|doH7@*}|rBE&@`Gj2Fv<U+b
z<ubCmY16u3Vr{R}Q4>zAKe;Xx4+A6;gk{sFR<F;TWiS*OO7zAf!^z=La)4&U_%Jj+
z(QvwqBaQV)-?~`5Pa4loCG%<ok<+Dp>WRgoQlyY8Lph|cjJ@XAu1BdHO{+4Et<B%C
zP{!h`oML?D<3@Zp36(Rx$;zV@QzDEzLPGEgQOT3>k+3;1c?5eVF4H(#*2>qWH!*Oz
zw6s#n!yAe$l!P!KIU`0k{@}CDG$6S($T>(($Vi+eRwD^hO~M3-QF+o5i!P0A!V)kz
zOSzPn3kZw^K-a-jTBQ-I5|v_6DV6(SRAC@0_6-QE5b5&}4i^ufl1hYu<&VUp@X!~D
zhkKLoBQfj&DtASP*Ty1!ZYaegEyj{r0AN~K!pJ05E@aWetX6d%6a{NbOUzE8tLg-i
zC414OZMPKk1+d<%hkWMlNdV9RIh~bDs)--WrgsSM##Rl4Lw(_RD!e`w8S0No6Y4|`
zOU1w5qIwpsQMHisBvmFep`~(>K4wg$P?;R1+##SP29UJUHXwr{NG(+rkS$u`u{E+>
z#2$mhY;LPbUAx)+*yFJwc%xwq`@eB9)`17&uG;exw4<EvT0OdsMCqCHKtrNS!AR?=
zjKLG7N2y4jU=+e%hH5q*c;5*Kp=mfNTYH+eC|w$_OfnD1B%qKs`t-3k3&fLF_U3Z{
z$%JmK2Mi)oWs3YrES1<W)JrM=$Yw|_m(m4wGFL7Wug!{-A;7BRmV}WfH3r@{UVWO!
z+ISepBJ#@i*&&x9mWVHa03$ZxEl11ji7qrej3gJ0txgSx;xJEwaDWI9Fr>v9H_}j4
z84nZT>ED8kpgZ=2l;$6u;@HKCA%(F}h)~zs!*{h@9)|Yzq1ZHM>>~h%dP1&CO_+B<
z0t*i$9RSiLNwcC`@@b;E&#q@C)A_uTA*oqIGZ@vbu%s-JFIZiwz#!r4iqII80jqQd
zO0@*jao}zB#xsb<jz&O(R@;?OS!ADl6_D2n#h^N&FbD`JlZ7_ZvlViAD#tWZahs>p
zgijPbS+4DtRMsU3>-uq-G8YjAG`Y4iAu_Fz7L2kykV8@_r}I72Wm)xT%N^Q#(4<lQ
zD?qd4MHv@Rnw&1m9@AP0o?#jl64>U)aHm-$M!W2z_`xn4z7K6p=kh3k+SOY7XqOv>
zV+_z{Ut|8YTFxZ$^*lQ6uby8|V+ZAwid>pb@GLeUgamf^S@^g?xjdm%sRaGz?lKR3
z%8S;fOF1IC&ldw|B*Q>b&l*Zkg4o<B4r}@nnFAdw)i~}}Rw=1~$?ZgDo8e7|vbABx
zAx^8n#h=A|oT^i~a%KWC8cnNZIw4`iLBK->);bbV7l6RIHWZEY!QZ~{`cA{Ap;)Rf
zlniz1Lm4@mA#Y-&zdzC&2@fSxJ@7Le$HaTe^BAw^7^CA}<8-sdhJo<`fbDbRbWMb>
zo0*l!(~zkdKf?+(UCEa_XT#NO8);&0jiV(wy@j$*y9tlh95O{yC3#%eux;E-!ZkK-
z*B5F|k8vp}?eLKAC>y7^VC)gsGdu+m4d4?I8Tm_?hiOIO1DAIAH)vr><Jlf@Mix_)
zk@2QRk@M0-IwuyBWhjG9m4U<3bOOsYln8t&MPg#oA{m>rBq?jWOHZitGcoy@$fno|
zpQaTUmza<(BvX@wE77C|CMG7P{hreL-DBljhW3*gB&Fk0pHjqR_&t^8vjR<Nm_=A(
zeT5|LAUh|bbWVDBP*&CSxLj92*9VO>Nwc_FgitEGQ_hLcI#b0bn#3rxv-~sxmtg6D
zWZ&4Q+G`gwc&Q*Mu3N~6X<q7(mLgUR0e@*U?2<AmF+DMeZsR$q*0e(i7Q-eNqxy+e
zkbv+=x>kkEGnj)0r}b$n7o=cZ^P?(ji#$z)H^~*3$74mgutuH^Z*$={5RiLA(bQn5
zcL1hEkBtV+gF9cCG7f8C;BWxUEp>M@o}3uz?F}aql+QQPN?<93cGsf*5DJ1Uo~nvA
zZ6YZXv4=L0XjN>Akyc55sgpFb5lZRB@TSlhEWvGHT<}Ne2p%GKB3;Pl<r2X*Mbo;-
z5N;$`VusZwNDb>MSAzHr+OMS;?w3vEq(vJCL+ex6;>}bkr^yLjHKc^4m8>Sxqe?!?
zR%58qgQ*q18B~pghgY)L0ku`V1$j!)^|D>cYFS7*O9@yewU7w_>p&EW9;0&CqfZNL
zt%4;2&lt}uqv^aQJsX8K^Ow%^g)}&wQ8lSYY6@`hstDeh3Pr>5q?oIy6#3H0aYAma
zfPoz&L%q?FJ{Y!G8#*{FgU&^Xk@p>mIZZEBRFP@Hph#Eab^u*`m^OPbGMN*;6|%W8
zM{{$df&URU=Ug#Sp3JXYF{)&zS7HNfQ<-&WAUae{>Ri!GfURgIkQq!}FTzp*(aPf$
zIVYvhtmNR4h=(8o(Pk2*NF$42Y$=-y5;TZ$R9uQ#H;Wo~NQfH(uzn^s>dC-{u}rk<
zY{1%t^K)U&wc$7+VxrhwT7*wztl|$;xSI1oiv~k$!qM2!YM0;RBXVrHRLB&kT{H`d
z|5~O#S<L{p=sp75g48}bsonvJ1;$dUFB(lDfv2M3Av>izX$$}WSvI~w>dWVm^jy+F
zXs9n5mL>*Ce0h(gQJm?b+)JwDK^#b{N+AW3YzkwPRnNlIJNaT<CQ?Bb1<b}q2@!<f
z4K-{W8H$HNzzz@fhWm64ii=guT|I>kpH7AIz5hF#{r^3U09Y^nr!Q!Z|J&|wU5Nj?
zS1!)LQ`$U|8gOv7`dU|R;d<4t>f>LC$-IYU)EWP6twD4A-}ZpNePR6XjjL%MFGo|8
zg!8V1^Eq9ldGTGOEXmvCOa-+A<q4VZ-NJ(1nlPPL6;!jRs9chUV~M1Mk~M1YC8E5_
zAuw3wfgA<P4=Do^c3D@&!BP-bcR2zMArj*yfs%>wQrj$zm*y2W^9v1{mSDOl#Ar`i
zg{3YqaIXV3a(QCof?GKf2=gguy9<_-^b1oLQ5{pGw(aZ$lt{5PPO|DFq8Lp8(nk>%
zVyGkCj#`LDzWC$ML{9?`7$6pZmoSPf6pX!wA`vWrhBw3`s|S);O0QC!F6G82%95+s
zjor}Fgt6wOHG~aGuvR>S=(|YHzA#<ef&_|rsf0-W$xT9X+yWzIvE;-W#*mJEU{Wl8
z^Lu^tWlk-k%&MX`3O<xe6&c@SlK=tG7N$s}$nbJBc$rEISJ#kDL$gaoEhWS4MkiBq
zHKCr%iTXT%15>IQm}bo&LPBc`RGAWz<tf-(8yFLOmtTi4;n^zIW&$g)m1TyOvC65a
z3TM=kE2-ra-A1Ii5WeY@q$?YdoY;35cl@n~JZOtKpbyFE)Dz<FsGbs^w4^?d<b#B$
zKi=Yzwqp3;Vj3#tV(HydRw2DMCT&4AhLh5*6N$e-1aBie$_%`ypCYJeY&6ttE570z
zVTN%5AGb(eujK56bsPNMN**>9oFpY#EPHc+_EOnpXgK{riXv!c|5nd{FfqCC5>Zdm
z1C3?UhV&$*fInjsO$jOG7`jVuy#ezcQ|}2SaAGr)8z&MI<wM7aM8vzrNLXWOhH?uj
zQEbtQlhiJ4Rjj)0>7FPvaQC~Lhlu7H4hJV)K})TrGHI`Mz9{Hw4T**KdSau-){x%#
z3A6A_q(EF?qV~rppq4OH%*++<2K*NEu_k;c0}HS&0A1N_Xff{twh%4k@@)6lm}{9-
zz>RNHi+E<CL`HCGWz;3$#AAfzH$9WeHyT=Q{4Ugxmt|Yc74uj_BP6<sPVmcWXey~m
z0Dx&x%~622{JDDTSPDwrwUJ=L0kR#PrubVz3kZ$y@kpUqDYH=Rc`2vQy`13a3LYtm
zP3EYJ#NEDVcxZKUpxT)52q}{rhQr3;AZ+PiLZWvj>LD?ewx6RVNybA%iD)Pp?z1M;
zcXcrNDI?+dhEyUMj|{Cgq!qVxh$Iq*q={r|Fq|BS8NnJibu^hq8*6kQN88mk47c>8
ztdF=c4wj&CBYxbh_tqE@LC0Kf2_`PRbki;o2Z<d=I&Z!u!DMNg*>Ry^Dyb8bw~27*
z#7z?_WjnoCI+wOa6{QU5Oc$BZs6Bfmrk(_FL>a57*f6=U)#Y3h9*%}__c)Stl6G(0
zD7@Od+3moA%OTNWD(NqPA(Dw#GIMR6<HIA-4GWBmpiLKL9Uu)z5@Yh|Q6g)=3td#9
z^C(o=wZ$!J<KX?qEt}yD0<>mOF$2gSG!IQo#08px)B;HhL^5Z7Om%7xneiMfE}RYr
z{ozH7V?F=%H7NDh|0Q{R56h^h|MLf1Ec(CpwuSZo-nio7)#1KKvc=)pXx+fvq*?nj
zWB*pKZ?nT}%HK^?_#>fIUnIV1leW}${_7L}!eu-DCzWiVc^=EaG2Y(VT3!F|GoSx!
zY4f!<NUif&hpN|q`S`Ee|AXl*GS2<;P(~g89}Kpd_kY>~3;REN=Q@F^NO^A){ir{v
zDM$k?L_ylt>2I@9kUEmx5)zBU!T07DxnSkcA6X5u&mep(rxqn~E^rJ+yCwd!m;TH+
z1_#)$2}cs`B>GtfSYwPi=reyBjP;>SA}KC~5|*ksP6!RdG!+iurd79;F5;3efFH<C
z7EDHv-Noi5cQcV`Xk`)DKwmteLz|E?$|S5snp(Ync;K)mNYX^SS4f%>lV-G}8Im;C
zbFz?B5tAxfQd08(tASROp$0SsEm$kTP%uqF%hLcG%5yk+`=g=NiDifen8b(N@HaBl
zo4~((#t!$BN31*j-4t2m;&_F`#uuUCIC%+z?Pw*J&$65V$=!*+2i%MRI83Y`{uX))
z7ed?cw1EUdMl7)&${mizHVl&0W+=Wooa}b`ecqt63t{yVh@>6(3%4g@L?H|nQ-tD8
z<s~*Guq@K?`P?XUMyt=8b~sKjR;80vjiS-*IAK03CKh8T#Ub`0n(P({&IVzXObOLM
zUS31`i8|>gOzD+QBe5DttkK+xrVLiyK(Ypkb7*wdDG;STR;mEhsZ$>-4(P5ZrI{oU
zgeqsHCRnJdXK&iLNnB2D+PrBqdAG<Vymgb;PH6?rFRhdaI0ChoLWQSBGWdIGf1D&F
z8K6meNs^w(P=Hh#o~5%Ty(XeJinDDzR6zMq?nwxdP&~q<T+GlQT{J#hA9c`etokem
z0|m?Uayp-9EijEGM&`z$G`S_4D@jd7#_1T%11S?SF%hAdLd?nerJGO}VU$ausg^Ic
z^?+A20WAABO2?ad%Vw#I=l~>|KWdY;OB%xilbO7nE&zd-CZ(n^X(`alQg0srQOUpg
zw8miuX@|`QLm~yQT3C=+ud4E&H!By_`6;8W{f|ZdZ*2`M?EmkTt7`ufHZVVB%zgdW
z+S=k@SpV&ft9JjR3V+WHfa;C^_JGCyFW_5P|Lv7)zV{-iw;)C~bTx^K$<}6npxM_Z
z`P(`J9i1($QdyaNmF#RLiAk-Ks3DP(z2sbx!=Wkr(b!&cmE<$snjJB2j_tOgirG#j
zM8sSvAkmsswOA4DQf%{ZV-=IFN<k@0C}5#kcQ`c+LNVJ3BepBJNim21uRZ?RKH46#
zfO`6$Hos;3x3?_#|Jp0pypBCS{spojETDzzlYIW>0I-0L&eoRBV8^S-0_e_QT1B%P
z7%=n)e_Mn%eBX|(NS!uZgFBd+|Lxl9`}Vws!k&F-1UJv=E_}M^O;>QgobJ6_cJuX3
zY|7j?cY}PmEzK;P@FO0(U?ysLxiDUyaMJy00V*qVw_uX<o*Kl}z^2xPHo($78IJdd
zdaYpj_AG8BH3KVhN;Ky{GC2%vIkqNJJx`U2C|hz+1rZKCUJ;)gptuZ6eYvDT63rbT
zgKp;_q5b3Wrb|*~nVl7Gu9S266ti{BIBbj}032#y3*`Ls9HE(PCXi4{<7mhc4-dv*
zk_h$nSsQNXO!WPiD#?>dSx%+1*%D7eo6W!spgC?g#}rFFp{Qj&$#5*rlAtP0e?O8S
zsE7A>SdP3mS#Q86YOVnv>3qs9Ix$lzH)o_ki7>+oKm^+if@Lj<UTGl-t3OW?k0oQh
zu_$X>NhvECC9i+yJEaydTj|j#4<6o`S59Ip&xrP%+;T`W=@f*WS_UwJLDU#&4zqpP
zEZAys%NIsRgi7FVO&d1dNKmVpX1>XIwF_{kLJ7qb^+=Q&g?en!1|uVx-hq*!HQ_#b
z3eHK+wL-qw8fxijX}o53h!wyBCeVL@wFI|xPPgRK>tteeHZ`KnV)k9SLFp{>X@;V^
zBe%`hRZsq7)|PuD0M?QJ{H^BmUjZNfS&;ws!ZoifNtge0veDhewm17)n*FVke|cxH
zz0<e+RTls&1rYDH00*Ey<}3ixM$ESaSZ^I#?Sz3~Vy-h7)nt;%7>u5lb7sL@S_e6)
zjuTVAyu4M;n;>h3c?_f_Er)D(0D-*nNW|l*2`&g12$!3GrxcKd#YzjgcnP(RNi;Gf
zSiw1?=$nQfCFY6sY7midFt!$^kz{xf1b|RH65SvaYBhBCdc7tfC7Otq$3DNt{Cuug
zRsOGS*6n#2wfTRG-ybmRf7=4Bfd&4*H!kY`TT?$-9Di$MK=^p8nU62;^!p8bd}*`j
z(|cNNMy^CWcnc1<(S>)`=!2Wc?y&wT%O&FnObaZoB-^~^Vz}{Bx>#aX;;Ky^;A?e#
zgzNsm?Hq?2iej7J@D>}2C#j+63h*lCPDgj)3)j*zS$OE4b;wmt0mtid?2yQEu*>8i
zioBGHrJRD!6lImUhr*28o${nyLia|J6dFd~jN!p>eDw|w`<jN4T^7C)PafJ=SSQhs
z>?<s}^pD&<lm<8+*S<}qO9e3_+Lpk&Q~O>}p!Vp-h<zW5B_q9I?K5-pq-Dp|wDyrW
zTNcXg3-^p@kf~=Iay9vPkl+!5lON{4E5%SXjsAZHH{oc3!ChwKrBD4l1s*nKj?hwx
z$f=mj)z%^{mHfUy3);NUvC^v)w&Gd^P3yVi7YXKvvQm_kG4dK}1#(AOk<wfh27iHu
zvt(Q)Craq7C|!`~{Hj2f(o_z_C5P^|h@W79e9}^=XJ!jO)F7FCm!tF`Bu4SZWq4!q
zNG=JEFC|wImrulVCv_qcC2|Cv_%R(!q&%Zj@VrqZ-Y6JK(D9grql?Yqq?seC@whLk
z3q^HSN|W|8pXelcT+Yb3t&k;6PX*JnJPxBHr*tupvWh&l@qwa=0fE#(3M^}FgeQ-L
z+@lDkXDdZlscB_VfmObXdc`uh2b8E+X19P7ANP?&sYC^8)IArcltO-*I;2N35vsU*
z*uoMyvPPkja=KuLEwOMbqPU|V27t85jH{-V0t}(Ge*4yPp8P5`wK`pB1y^sT&~w&S
z^8EFih#D{A2y$;XQ7d>io5=ImZz9#i?ezw-Vt2E7liaaroyOsEu%yb_RHc;L>rFHi
zzMBmdVa%eruSF~OpmDQllcspz`)o!ld3X5?2T;G2sKnpv4J3u`X4^3DEchq&8@Tt`
zCo6Y%xhKtT*FMS6K7&kQ-$-e0jg;&gNxhvQ43dtEpW-&0CXq>2e3;Mk?k-|P81=Ek
zH@RL5%oxkIMT(YWH<7{fR~ZIGRMu(<O9ZSI-6D8ZrDm?Gnxm{NQDGUO6bNJJ)*MH|
za!3D|%Wi{D0eC_m9<DC(VnsL2M4px{qmB<*kOYioV+e4=Ku1%ge8I&t<n>64^URMl
zZV_pXL8tH@sYG^wn*7`wel(>oUw9yb3Fs9q9D!0P7b`S$jM+Cc>!qF?4LX8LII>PK
z?MTgAS9R*UT0^l^Ppof)v+72dq?7<oqvdN~nEY~*QX*xxpRMwhD7rk!C|TK#D(v>!
zc55|Nw<qax$s_srx)WY!CX1vGEhr!z>T?U8xT*Ji0>rjM$kNROhAhp9f6Qv-*=!{4
zeyIjvvoD+X-aM7gz-i?>43QorL&z$TL7OPvx<$GtoY_K&=3V^Vxg22tN!0Uc1^A2t
z_1H>G0gwzQ)7dmSi&o*SRGCamTjjI7j+g|smd4U&$>>M8l$PYJIn@5<)UvW_ekx@%
zquA~@SDjo;y>6G+JpSBO<{D$4n)jmjkcY8)D$Gj@7J}|fOad7j{J?^d`d}=CV+lJ(
zWZfv=JvM|4h@Q{cXjbPf^KWL86{&Du9xHQ3r4-Bfp0Ox%Mn1=JpGgHCYeK0MxR-Do
z<vQ3E7)NHi!#W$$wvp&+JcvY5QDIiv%3=rzp&DRnqSKZRm;y!rGeTi2treD5S(TZc
zdb7KT-znw`%Z4%tW1(0?TLnJx@+>4u&UUGJDcVFeDPv9O6B+5AT3DdgtR$lc4D5Lx
zrG{*4<_Z<L3p1+aTs|-1K~h!0RXd|n;tz)c(u^r+6a}F)ASpRLNs}@E$Hv-$B*3ai
z)vGYpu|9xUkhCT$g)In)6=UU%=I9Ti7{S9oP-IC2Sx!S}i9nZLtL>U|Akt4w-Hd_^
zg^1H5M>+EoP0|q}TegfvtbqTaT{#@G@J|6oqpGG$)2m2p5DO$ZpG2r1F)F8$_j8#O
zj7v7XL+5wV#)KitOl;*=t>9U)Op<7bJiD#3xdv=j3^SX<^Uhh#nGllso-I%7NMm*d
z&U&V>&pg|y!lJHL_i%bJFT<FX0AN;?)1}M=n-UBN64J3%n>KBr&HEV8uxWnD>;5cp
z2ZnFGRGVSAZRZ|~xSGuapFWI2E{iM2vfz$Fx>QO}b7g!P0Ax!lz9bB|M1z&4<a}8r
z?2{Wa<O)V8ELovkn&v=Au#IX7+!8ORX(a+@6BVyL+xMZ&l3O(hC?zbCtnL^C>Ecrw
zK@Z*K!Y1pb6tEcJmt{o(@vAT`hHa$&9bGx<?@^yUr5sF{CJ^wFFBoZ+;q%7aW-kes
zv7JpQ8fUcS*<u!BqC6}f(e#>dc07IIt_uW1F6)T|#u}urcToP!hZe^cp9#pEN9i7M
zke0?_m=rj%>v%RIX;zpyUTmjvrqz<*`XjB%WDO!D*X)EiN@s-tF^Cdx_YTMGW|V|n
zMxH?z;PbOtXwPVts5DepXs8d<LoylAlC7Rvhdrc}<xXKV!NRK`^~J&oX(*P2o-O8B
zRRM#<3YPLJZgEg$$I@V*WZ^&6c?%n9!j7Yf717eGqz=-ZPN6B*DM4p9P&cy`mU(m2
zwjY_bz<+9gQV>$0lS*Bzf8dw12uaY5wTy#VVf*<i0m4pfN$E^UQB?$jNlOLdWs;h+
zsZKO#CjpG8{S8!`S(Y?23z;g!WU-(77b7TB{pt`EGeOE`|Ls^qI-A`?)_~TK{}Me3
z71=Y^VAqTPUW{SRz4@=j7;Ft||Ha5@&Wynvb;nSGtAxur8>mj0pPJYiFqAa$2LK10
zF*3zaa%j~=XlGB?bVfoG!CJS))!pBI#Jp9+Dr^p(3?yOd=C?T_SS!i#(}=shUtH8-
z)L4__ve9(nY<^ow0TaWXs(ojwz;3Q0ZP3Cra0b{Vva4E<iRrmVLPIoII0AdXwZ~X)
z92NiCkvz8GtU(;CeR*Yk{t4a!yB6kHs@c(t5iu<5oV4GZaExd1=C}PU7Obj_m8a4r
zS<(x!MTD^`b3%kMt7{GopZ{KGt*+JOLfP{=SY$PmF2X=5Pv#}fMAL*LLMf%W&;}m&
ze63JKyw2?zij2xY6KuqUJtAVGWenIOjN{0#gy(-{bvHGDb=ZUfyagxLQ^@m0HwK1E
zG{IO#t~hJF%s+h?0oTMu6#^l)%J3-#93KC6%?>@y&E$xLlG%bdrVz$)CAXMBsfH{}
zOwdJY(_JGKj!9A*+W}lk<;qH07`g<Yl|oJS_M*{DS|Z2LY&GeSDnP%w3|0vQV_eH7
zD%pgy6}in`c0_|{*|d!>ZTsFXt-f=w8ONJak@FokAI(P=w6rGEdb7O{-HpPNEH&0h
zX&&0yLsn!(>?K%aP}J}afzon(u|yUlID=`&O0*Ls{IH02E`%Qf(GPp@a~<pmhucG-
z6|#oH*#=1U?H=LO;T|jLS@UbIZ?Ig7k#3Q2Y}EQe3})o!s~p;pln}DmCBAlR8v_Dg
zZt+OyK$QnyCXmDi(-SX)q4*jPtrOn~Bm<JNbC0CQ+qTur0lO*X<gJWF6-x?k5lXqN
zTqx(pa`Zr?<Qk6j(eP=xvWk`v@O24g$R_~7AJ4d%3y<^XvTpK{ze{N^*|8b=EV1`I
zbR_#@HlEGZGVZRjkH-oi@{U*&d{1gJ8vr^4x&vxaSF;KW8@X0<Fn$(P6)2Zd9O>?o
zJWh!?H_A?FVT5<{DHD43$^Iw{3kokBxL~QZEaG_%mYN@25R<ah+L;Irm>mGHNvfSK
zU`eSly(yt2TIsWdqA|LV++yp_lN(YQlk2H8BWYt=qX9NcizbFPAT?WN-gaufYfdQ|
z2D6lAyI7&eEGDxo3%B~TL9Av_%92v!MO(x&yGEAKYVk!fRk7RSnXCpwn5&u{lGtK%
zK|+gdvS@qh)*jOL>{(j7y=kYX`kuE?D@yN%GEBR<I<`b55YJ(^|03itsg5*M*(ljL
zwHY<GVmW4Iu8^ZjId(cbK2B6Ct@3fA>dn^FC)RGzwKD=f1ucVEb+ZD(nu9IBH4?O0
z)C-x6OI1TA(*oF<NgPLZYe{Pklpm|)AhIgUVP0JbRBl;#*kln(v6atR7Hvki_J}^&
zb2gW=a#)rYCoGzZ9(%=qr5$+Y)q2v{AokD`#zeAV=ZaZvVZth)4FI3H46iZT5q(mH
zxhuBDu6pc>t>Mk+3-?ANL*YK##QY;qOgu02g!;JGLPI9=M?<FmSiC3F*B2f#m1F#9
z$TAd5!k3XDbJdI=4Oyr|D)KQDjmFmTW>xuU$V*(D4TYj9<`s$>7JH=XAB{zu{ZX)5
z+kfO)L(uq0G$|A(T&9l(lJYTn683b-b_2*Sl1><DdeoU{-R;gfi(>p%1*n#=bt0n)
z<YkchJXYG<xVh^348OuMij4i^sm+RD1Yxtp6f(HG><y|}5^mLiDS+qGHsbfDAUz$h
zLzk<^(E(>k8a2y;M2;q>ICy)=sw|YxGc--&o`6MTVAT{v<usSuYa^R1S}JMuACqFI
z*zKiiT!F|1>`rWxa01@L<y2yjkJc%9bKz)|V&9V#eT-R{SM9I0KZ}KHZdYCZFB5xS
zM&0;tEq<&2m(~UUFMH#v&r7<118RI-6@qIb7c;SSql(7e1x)0%Zs5XI^Qt=jwRlH+
zUPkTlAMmvVE#p7fzTp3PuUz!>SA;n<qGC)*+q=T(DM~>mGL0m<cCvHf#5^_O_VipF
zGTA$EntxwSTCA_C9-L0djTLZRH5g5W*C*p45S9{}n$!4_Dhu_Gq4lYO&`@7A98XA6
z(8t{gqWC=+>l=xN@nBvw6o<c|WQd%hr75}uO+Q09BCt|Qv%s{t#H*C3gqSEp-%uef
zT1iv3o5M2{&SC1J78T1<QOV~r(@r8PT9=AC!<M9_D7MR8TEinlz0r}rFb2{wtSP0X
zdI(`%Q_5D@$m;=8X)7)@C-ZFKt+%U>*fc4n>De?bE#=WT3PfJIGr=@-YL&)t$68PU
zo^qqu7yQH*yI=vpb$u$UZI;(guW)ZkM)asP`-ASWunin)zNA`KLQ69QR7%4N-6g<X
zFEr0DdL#jdY==ruyR;xr;l_gS#!cN5WzzY)0+TNS$ekrCV|p60L*c^G-6|36)1)TO
zN}+;5sqoa}qzvmAr-VB=xR60XA4+OkNr*vW3oQPwv=w(obRpkG8|Ieav#25;luP5l
zKc<vAcvG1RELnJk+ghWtgqu!KMRG6>E$}8_MS^RjTp?EmVmJ%FX~b(qHOXBA(=?Up
z*M0@e=!UlXE%;W^&fS<OU`-UzkY1cU(#h5$l*uu_c(H`g*&|)uR^K7g{IbzqrSR(T
zP#CzAM`9pLTRoCfj|@Jk^$$IK4kf6^OKW7gND>g=2qheO1=&l_L+oDBfq5u;hj?^a
zz=(dnf>R-WwbCYHz_5c%2XqnSoNPU2RApS_6qzgM5DaG^1_oAj-0KCJ36g5-;JaFs
zGn^Ln<ih9|Ub?G~e=U{30vPl;G6IoJvh%I89{qI@OtFdKRp?nGUJfyL9aRAN0%LF$
z6uQexHvLKA*-A0b_Aym=4K`36@iZab^(68Ne+7*Kw31h|?vEM_+1Me*d|AI8ETK-;
z909u=LY2F8?OC;6G#@R>`i;pns|Nx=n^7&`mMudSG3M6N<Tl&E59|^AfEm7t3Qa^v
zY|jxRJOJwwm6Mm(vSG`NLg;oL(5dbmC^MN&K}SrgghnP+P92ln@=^qlE{)reN@i@_
zuCo{feXc<8bDJ*!vbkrw4brE;B$?nz^u8ntf^aI2<#wXU1cKD?Y$<^D1^0jm?bZ8%
z3JL<BB_lOQ)s^go8^bCZ#S@9nX}0>vsW@77>=Wb~^#~m079>|y86)voS|TWoMXR2Y
z)_RX*#6@ni)wIXoW#cr)PJU*>FI^u@!LnMW=eA{ZO9A|lhN-AQm%7Nk`!vZ#6iSfH
zFpw@h7~KQULV(=9q-mw$D>~lMmMZ$R!U=iSq)YHBG{{6yMv6kH5#nAUpVf|~a%ZXB
zsD~gFK=07jV!Ed(VcMbeLad|IN)fl|ppv80oI{B2Iv5I-Nf;qnLV18dKs?_Mvt1;G
zhDk))R5G+C>~{g3I6=l4gocv9UB+(2H)P`l{=$e1(O*uTSqX&UbTqm>+Dgl|lmTwf
zzzQ<*vATt6EP#~MNSy1^?I1?F!xeSHXz9qD*pjV_(s%`<nNedrl<W9@h-FH~ofmuG
zwHAFL#WD$Q#$uzThDHW)47U1w#PtCc<w*H#pMuD1)(WCw6BR3E8h4G*q3sD^faT;?
zqcD5$O(4;bG>?(s4E}TZ98}`TO6e)+g&f^I3J?doWO$UuH~Nu)N?HYIN|F#;x;h%`
z2}Ki;p}z2XnkTgy!}ma*)8Wq&qIWSGE!C_JLMT@4I|7VQ)s9+xE2^Zk8na@97WcVI
z6<Cj1%vJM{Iz>iJrBJ(zjhu=C*0?x~aHJw`_QntkENeWkjPl;Xph>;qo>1=^(rGM@
ztzR-=@|s%^YN3S{9m}yjK32LLHx+%tW+DNgbs+BWBm3Y5k;B@ID{1wlemPKE2EenD
zvV|lwQa<7Wt0mTmN{-yovfsl?(TIu^PQD9YOr`5AkZ)De5^ZE3#IiWsTF0N@>849m
z7A=hm@+Iv(sya^L^4ub=(kFX)*=`cDIpAWNd4$;ve-gcfSv67x@~oydN-xKo#1S;O
zBn@y2f)%%Dz)S)Xph8f-T-fSz3c<>qloVY;!tQSBcR_q5<mhr}T+kBYQDA~Z(iJ)g
z2rkN~ibfVOGBAPR*+O=T$whzAej|sg!nZWLPfN|2T9VWp&ms}7La@F>rP=_k?zCgs
za$i?8V#h=UcNMc$PWU`JM52=z19q9Gf<z}ZsL?bMUW5N7y@z3F*XRs!k6mSK$DZRL
z)`b3cOJ|?0GXVVPqyIB%p+JuBj;)!u_ELEY9jRcQ#L8fpp6bnSv}_NG=CaVKabWto
zT)}v?Y4y+KSQ1zV(z)qo!k9&#vS*nFB|ZSipthe*i8{6oa}eg#v7t|5l&AZUm||;$
z$xw7~MW+MJe-w4XMR_~(Wd=nM(UwpTZ5o*tw8~Vs_vvD~E$R|P_o&63fQ-@UQ=iB5
z1&9Vbwg$V3KxyX3`_Oq0RiTLW(ctA&!S<!euQ~iM%td9zn5c_5_z-+q&9Z%hr>Z_`
z-3jv!9tYQyo?5eM%r?;%nY|mM5;Og-J`7WtyrRmsrri2GS%W)iHgSS&Kg$0UDwVEu
zYjyTo6m{I9&lADUpOh=g!w3~fDof{#x*Gy~@1n|_Yh2;YW<pf!t?|T3-!h@RD)U{V
zhJ*}GJC!1u(o=IQRH<>{HtNy3ME~XHDh$4T5!GI3dlx{7F>C?KT0mgsQf{<@3qcy~
z29NnK=7DZ_1RNw*j(P)^|MzF|8UZthcLwaS%^x=GZCSrAZ<@%OcUo#fQMRZi(k4xu
z^BxJH1cB)SnJ%1p1jAUm5it;ptw}{giKH#J(Bu#fQyhhcL0Jc~wtS)r2UV6k4elAV
zJ@8JxQ_02~eIh!C*=`S0OI&EgP+utC7x3}qiR4IsKP=mAHX1x+DN=pQL)5P$ime)R
z0)g(@%m#pYlha%Q!-inh(uKTw(Y3Qu^^Auty-;nVZzr$>Mw0Zv+=Pi?G>)S0GE^Dz
z6g030(k*J0y8c`2mg?I7>;?P3pgI00+W)jK*#GQ}iwWU_p~w&ox~$o>^o9FFBhh3^
z|71u-#P1quoy`@s)J#HdHUs8Lax+j<bF0_aoEgvIPrep#YD-53jJvdshkIl3J~9J4
znNA~4lvsMmF3T2&q}lm&O3we5F}x>Nt?>`@kLsP=vd3lA8~-hSOZ>++--7+$Ub#+i
zoIt%-!T%_TH5X(#OZP}nQ4<;t^$vss(r5*QBT1cxnR3!`g2Mp=4;SpHv!TO{%g-r#
zcx1AeE;qG${lpNC%p-Xik&Cvoe4X81HLt)Lagi%AkcvizKmuOm>W$+0goImaD&Zkd
zcmu%XZE^<nZ&DMJh?<Dt*u>9|i7*kQqc4(3_C~{@p;R&yUmZ>+XeAjjgV2i1C<`wo
zy=spCT2@hY{F8NKz>A{So|aKB{<kj>w2c2?%fk5I8`lX$iN%H%%EKYH)H5pZaCPf-
zAhYOK@_8P<a$9<`m?yz?CKS!;LZau4(V~yTkWmAq1(^jnG`6fjVkEk35TnbsVRYF*
z3;gVC>FD&efwW!%86B3mG{7wGObycN3d<xmz%{8=RU9iKV}sg9YRbOS(Rc#glF!iy
z++(C+#J`zJmiwV>mhG#G(7j}<xW?zA6|jI--Ns2NnG4i6as`M8t-q4blQ3tJi>y-e
zY23!f{Z`E<U`bKRZY+x<0r!t}og{&O0^5(q-@U6NxFqh2#5Li|v7(uyX(iKk{MWL=
z|H`W#{|6e`<1*^;|5l%c|F^UU7x@3)xSHniax^tbgGL_Y#dndigi>6kY&1!LS;3eP
z(~1)V&>oo={C*a8JlGuYN&fcEpuaQdGlU(V*Je1#s#PLBM!HFDb0yiSri(c*sTc7}
z!V<w(+cd0=dNQ?2GPS4_RN3ipBtpXxqV9{(a<LRIRlIw>Ubn}=_w@-J(-#Vbd{Pac
z=;p&H)g;10Rw2^@trdKrukjT(;E`y0@3>rcZE<T#aJI972dB4eCU0TYZktiXj2>yL
zo|k5VqPA)o@pf>0P>le`m9hn`MzEb!Z%)5@advY%9Jw(xuOMfxVG?ygLb6BZq<dFR
zB(Q>mRTlm@P*1@ENU(e*x(Quy@UuUH(jAcIk$8w_0$g)?<>qy!25BsBY|X#-d@1mM
zazLy3RVV|Qe0yta)%8DICjK7`w6!)!t*=5|EZ2WI|F`siR>{ma4a~j&TYSO5LjUiL
z%eMb3^UDTyqyJml{0sfRH?C^^pDSeLZC>=TyXR%pmjC^}mVib7+tRuq|L>J+#qoWy
z-sFbiutfYR50CUjBfXNdskwPwu(!FnFWD!pA4m>HK@9gv2@s1i<>uz_kP`(ta!9+g
zxp``8$~zVGDy8w}WW0GB0`g-{_7fxaK{ju;oOP~rtiX5pM^0x~5^-=vIakihE8|Fh
zozftNAw#Vat__G8in^kirl6_wxxyCIhjcsD@^oHSCuF(olqO2@ShrXqO4!Aca)u0L
zW8HwVy%|+?62Y<CS(dkzoAJ4MrK54hq+Cu*n7s*Q(yiT29z;8dzSVe0Z<Y(2&_yhA
zK-TRZN%l8&Ae0r&v{5V2XlbRxu_Bw>D&?}>=tT_O34?eFMd`1ha@k6zj4#da&=5p%
zvKFUj(K-auxFR<>E~WEOO@d5`0Fl&ErrSwR-xmwxw7Jdcl`EQ|OuM3q|FxAXMswpU
zS3uV(g>l+9E1KEUie~byTK=p|mvrd(ZKZ8@l8p3^wBmSJ^@-S!nwmu1q1bOkTOqwQ
zH=d^8fsXvVcJK>oQ^^xd<a1i(2b4)!t2>&fu{10d$F9!tPEfYWrL8%6%DFPeeo=%$
z@|yXmL637~g8ZFbo~$xeKwBN>%0BjMcKIeSXl-fQxpIL1m|d<6#uzC>6?^HAS>{6e
zMMCYRKO|G*Rx~rLvlj+9lj%YwohN{R9LNJ^uHF$sh7)pyG9?Sr+Y#ZZM$JV4WaA3G
zRIcn{zh;>+hyJee`7|$Cf0`u#cp;bMLI%cCoc|;ZmuxPA3A+!B<=Gc8nI^U^nkzEI
zFR_}_-sp9mGjKJZ-YSc*6Zm3&Kodm)87J`92nbM0@;2LHWEN;=n-WmpF#A=5RBda@
z*lfO%9s|ZIdkb>8nQ>Z`2}#bC!}NuvLv1^<F8FdOo!KInnpcgNlu9uLT+ZLpjwCxS
zCF!T?*scp)%}kmB_pVLY12m%Dc0A{E8M&a!Y(PiplYnCi!pz+Trfp*IY-)AlyNLjn
zgA-7<Q)j{mTxZ0P22vI&*T-$^v}Ut8HId6qpwsKExh!!eGL@dj9g~cHU_y66K+UD`
z_*kysfY)BsQ>OE(A}JV#m$*~Uk^L<WMVXwe6!7f1ERD+LDOsig0tj?e9?{`Q9BVtY
z4{}y=k)h;f<$6~%7fme~E6K7RKm>JE6&_?jMX!fdaG%$4??|hpX{}yAhcDuiPfVDU
zPfi?<4q6SZ41H$dTkNnn@cKw87<5>flG0n#xja!S;*OS{Q=iMS!dzxoAw4Cg&}Tkl
z=VsCc+(zVy={BOOR7x3{xc;YI2-BEjE`t|$-~bnZu6|5H8dgk0S}8InO)C}R1HYm|
z+F62yx1+fNF(hs#aC_Jjg7!Gl(mI$+anH1fhw#`LF^*hiOwt=m$Zu4pp>Db7O(X#a
zudPICYJ*X&*RW7cCZPDt=A}$Nt*SyQDp_XBnv}HG*xBr@v~gAQs%G4l-3%kT%(G=z
zhO+4*(l(5XDW$Z99>dfrFq^Gag3nNb-`6~tF4+~*PY!SvE2DX|GN#!*q&!tD(8mgd
zfAeOvXaWzSMH70AWHtqZ2lz#9yg&_K;>xI8f`&!pQbkSYbCYUjf<}N#DwB)TY23-^
zQl-_EoSIgZd>RK|F<mNiPo1+A*w>I(k}#8a9q1T`FdaOyO1Ivzc1Y}`YW5W{vy?1G
z4^WEa*ehlyy8}vzg0K)ZR&Ojl3Tw1<HaCvGcDz8P-ceYs^z*{VSE-MFt~RJOF_GX}
z5EVJP`|$ubx);N}jnX7-A2c?t$_`;N&*jTXCnjkciZvyMLxWApfzZ&J#7Q<t%orq6
zucH^3v`pOAqAwRY4=s_8*U+;8Mz=Q3fIDLxYUr_&#QK6EPG+(C@QAGzS=!iLwOIqU
zL7a1aElxayM9vSPgDVk(riqeIhisNKeI=_Q(*&9xMUUb*^A;_F0P(qivlCyS6K^W3
zDy3XEl}}5Y72wj5tQ4(_`UsxcrJ$PVlHTW}%gnXJNtdP|I37bi;@RYGXVCA2A(|~u
zbUQmboKo{jDj^hEHPuOwrdN{9K7E~G-0W*@_AQqJfzDt@XKT=81p?fI03ZO(IHLHl
z$Dh6u=iljCeFa(5ul(;beyFDZ6D5s3Eu)_Puf4U!r2lJ2mGFZ8Z!cW`V){QxTTlFZ
zsr<Ok&sOC(7meR*sq7o&nzYf^M8!9E1)o(_<z(8vTKc60Mc;p-qHjT8x1g_E(ANpW
zlC7_`302#?nGY?U2GydCGw8BFx-WAr4mswF`Xb`wF%64Nc@j_D!#WE!YjP=*OXnTM
zN~x%z@+)1I(xb4rh1F+%T0%dN81)%F$D)c1Zg^EvreOla^V<M+_0ULDKDR~2pgl#9
z62{6-M@go#2hzWn=~>Q1=g?!ADQ(po;dG1Ub5zO1WeAXpHQR2+-^h9L1W83`inrJ+
zIU=z7Wa2YjhSK9OIqt2>w$SlHg_OoKHjfuMD_uPtrE6Oa$7syPqLVV^NLC@n-z*e~
zZ3(l|KsdI@a*=w^LM)bWF-MRt<;m(R3o=tKPn$IgOXVqD^+0_37IUSXrUzkdp?>eu
zWe3--5fUjYBrFPT6Osk`C1kyiozHrlU<|`zO#o@K;GgOi$Vzo3Bn}=kBP8k$Ru+08
z#Nx6-DIQeH7RYOML;-yi!gq;ImZ%(|=eW6F+H?`nRV)#=uNpce8uAi)d{Sn9{Rq&K
z#KapUMnoVGPDNAW81cj;Hm0`D3F;>jl#wfdYN(?e)zwk9S|mm_S-Avl&QirG>z}MP
zTs5Um2}RrD%3iI_i?R7#<a|aGF3(Nc5WRK7a%nQBs;o#v542#sl*Yz*XwL(6pd5{X
zNwGJv+vSpqs!$Si7m=SP=ynh~0x$;Ecv@AJOpYkl4HzaTD^$sa9p_B298NbWBr5}J
zVIzir(kM${5*~p7_-8<Pj+H=+mk}STgOaa@)YF3pFmhw~S0>FOgHoOF2+k%vl1fG@
zA{+y<W}AUZR5_n_00hFp#tgOd(6Ou_ZlHXIBH}80Y6AMs(2|_$7^{>DP$bpJ0@bSu
zDG@t|M~xjLCwH)Ez|6CRnW>!yvP_Snw=pxNGp+*tP}Dn@eS$S{K9Ag;IY2-Sy#rtI
zR+X?8BytdNcM|KE#7r`^R;M3Fav&@vV*SZ=p?Fw|B&6YZY;B}3+$T9h33zsTq;-+x
zKx`x_L5g^2D7it3^-H0l4bqy(P@hK%uOE)17yMY<5g8ngM#Aupx)_QKt(JNqANm%L
zMg}8E0Gf<RSRexx2`3QPU^w180FR-bNHmh%;BoXvl0yiyKNgol(r_rAjP#B~LvdIx
z$A@EyFcjYhV22_@{c$KIJQyBIdL<|pUP|G$@FXP$LeVIe<p_;H_2XDUsW&#fAs$&h
zkdy{u(LRhF&=ZELg?gf4S{AgbHyVlzdZfP4U}$xi<ca~5xC4{X>PhPc!uSfy3&H=r
z$w+Jn+tC{vLT7nN4>U8L)UvLNB*Gpk6pthjBmME%pvQsugd8yf1o91qDHO!DWatt|
zg3lv~um(`-3x}cr3;Jis(0{X0an41<xtj{ky{FsMRhtf?+Z45EM7!BO3+1L`zO<Vr
z<)*D}vzq=-5YhKo$5coE*WMnqIsduf|6#9O|6=;T{|NiP{|IH^zl`PIf?n|7R4>SA
zhHC=r8elHi{moV%x1dK{&?ElG+Wi@aJ{Djc{tNbhv$Ox>@Wm$0a#W(t8q9ms907PT
zxlBTbVCV((@IhSY&~wGiN{u$2Ia8)pF!rm?k+BG!E1T>P4Mv9qIe=Q$G@|Z<ekw>x
zDGP;R+%V#pC|4#3&!-FH6|5pB2;veDWHPzLv_l9CQ=-1D#15eI5=r2(QQ5&}0CY-O
zLR%mx(!p1EtdgkFE#-)QS3*NUKtnG#Or)+-P@SS_e~6irMwN~gXwC&Jdy9-|S2UAH
zN3kRqDOwfoNuFs@^|r985f}W)30f8dM}4huV7d<$oaHG{wUVP<g|=$BOeLQ#<;sHU
zsf;?gvQ&iG4z05sqw*NqYB6WWte8otH7f+Gfc=vrE>2KOH;IVligMI%Zjp%#6P2r=
zKzNo*1z6~6o>x5%*4C1w6pit;F}v3hD-d0#QbHY)0G>xv5qi+$pbUWNI;lF5D?2f*
z-m{v<(_v%BW)uM^2NJ~qjbf7%+%Yt2YSHL(nxaE=fm6&;^rwZ`SWIJVtEb1a?zmi`
zL$n#lUR;cyP|S`s6=7;XGtdko7r43u|I$4IU6IC(PN@+aZo=>|<Thrgs&0p>8~3K`
zSh>}=s}<CGj9Mj1M$A<JfMdk8w@^kg26eRH%t!-*6o-ifNsjjZL{Lv_6~{1(RV0Hv
z0$&zp8Nxs`Hwu)9Gd$9XaoXY@3@W99>PVx`oTzw#ca&rmrc+e!=Gc}E&0qva%^lec
zm{W-_RGCg!jDu_8?Ah$46!<n48#*|dvF#U@B}1G+5f2~KE}LvcO(RX=MhMLTthy`_
zlS}eUw{C!MIA|YB=}bme38%n346=*urNGLFfpP2eTL?HIs+P0pVjMA~`*X(n;yxbk
zs8rBV2rxXT{xl7jiWp@v1}HxCj3nqJjYr8$&gE?wa4uJdX~3W?x5IpzwT)sPnPOU+
zl*<ze2mzGvv&^>yBYQVvSt16pB^-+^ATM<jLbfI71WQ>j1C5yhg);7D@xVMPpbimC
z-D0R1Q-zFDkHlg-=oYRRM253Yx?NcSuD~V@L#P=y-GIr1K%{aagckB>5x{UrWImWI
zrY2;9SX%$A%o~@bt;qm3ac=<Fw1@3W(7i5sE7ZM09HtOA8#Dl;gKQ5PBS7)a$mX?E
zl5FH+Gck}49flS&bgB<Q5^%W%#fE5i9@m<N@%5&)p`b^Lpa$o51ryKORf=9APf|zQ
zE1Ka~C-Wj-trop`MUw*S6w0Y;cIEQaBnBG%^+@O|rb;cs+;dNwkq{?KfzrL&%7N@6
zX(X88ES-*RGMLh&?=eCXj6{9KF?X&W@V0uFJ6CQ^!^j=i0C6sgc<9vLGM_}PUY`f+
zK27KxwI*c4iU}ulfC4Z+C6PI*%L>HrVZscKd?Gs1tbj$HRpSaOaXPP|M8_1}ULcO(
zkWcDJ(-}OYeyptC6gr^!c-DrqM=Ip<h9NDvY=*S%lE*x>^_s01E$K_ac#To6k!D2{
zU5P)G?-#8kN@!PEMoF@h?93#J@@0~;#$-#DjD4Mjgrq1!vP_bY?Ae*IWZ(DQ*mq{e
zVD@=`e*eMyd7gXUd+#~-IVa(oiS5lN@%n_bc7dh@DEHa>{F54~B_DHpe?BXH_8+*v
zGsQTFTdDZIvksremAy;!z0^Bf5w1fX#v_QZq3{P5mWxz@hgcOxV}sGBtb^h^Hz&&m
zURj`AstBJY+J~i2YsP==6{I)HDhUiYOX~DogLk#J+*T@Tpw;{_ldpdOD_Op&8S@}1
zt<G&t$!3_x4LaqgU2;XS`%ulPQE~f)F857e>Vwu}ig(&wS6lwOcrzjI#YY`8{%6@y
z6OWI+z7dJf9i-GG$aa+9&nQ$qe=WWv@LJs)&N00TzMzw)mFYqjvctjUk1b`j{(f*x
z9I*fE(0D^!(&}%!=)KxZ+e^lWeBF`3g^Mq5*nh$LIf<BAo3D`)lfAg}hj}Ich`y)}
z&oIcmWajns6T;5qcRU&C|6JhOlhL17^hLR{S63}s(xjE~PL6A8!fQ?zUu1;%?gh*Y
z`gg<)90~WV4E!lv+}(D|weYP14}5yfz`Vi)>TWQizQ*;(r|@fUqC)J66MNlKu@5G#
zi?ujy`HG~c47#fdhLx_QDoJrZ-}qFt)03(_sbsh7Q8_$(Bhm0;idocC={e6EcPx(!
z=!#G9bxlu6n;4aZb?OWGYGfM=q7(#VTr()%P9L_9+&Vh_%9ea<al9@?f`jx!^ru+d
zWzu~?E92j}k3P#+N%OVutLyzx%^^PiK6tx>uyR=(E@bhiI^k@}q*c>Vqi~eso(%lm
z)ax;V6|2RA)T5CN+ftdT@%o`UW->YS=!CoE3XXLnRWyAt%e@iJ%5opsg8a2v3@TR4
zbpQrN&;6yMPtmOfwjc+s`x*0@BT;IxI`--}ZubjB;a2C7b66tWcSvch0n@tBaN;7H
z?^7)>D=RH{HMU-KP~eeA$Xv8rj;b)Nt9IuKFnyL`gW9y7^<|>)7Pa_3i39ZF^&&&C
zlLd|3=RZq}DIe4JBKrksBgV@3r}q~uRe^<sN?_jzf}5)($^R>=Tc6PvzIY0MvwpdO
zgOAp3$H)L;anp>EXE+8MBme?^sM{0{V9_S}UV>hOfPvjw2zmyd0a<G3w}Xn1)5(1@
z1WG4sNL96tO~~2tS<8Y=Q^rB=6S&1@obLrB2Du1_LS9d3!+?!R@}bh`ZZFc=xJHq-
zS5cIKX46*F$2_OK+6ru0>6zr)mXtOKtpmc|N^s+wA`mHiHY&u30eC%y1EeNH^$nSC
z1Q=vYQI%>)cQy+{bzz%V?)c2_wd;eg^gWY;)vf<Z1@C^2d+s-qS`>>4*{gsGDF?X#
zg)li98DH2*?X6w=F*kw^Y8&ed8PY^EW*iFR@D^KY2Ms)rV8QEx1g%?M&Hd$#BwhZx
zxlZY#=f3~y<&o@SR+2mn)%o#ZUup$nZl_@+83Dve$k#9(K$`58a=12qO@0|Ie9O7c
ze0oi7t;XE;Nr+QW*6zeoH9w2mR>1Dc2!1){M41giw3UF+dznZpLAg(I+i06+Z5WQY
zAFa2ru{J(DT$Y?(T=VhH`~v><e{#YPvt!*}1ybjuVAL|1uB=MGK&@m1Yp<Da8r~B@
zfg<L|aBO?mHi&90o|tbqS_BXS*z|rpfia<Ktg&UPjhn23GF#CILZ?%kNbtbJ!F6n<
zO#N=xY8_&<$E^}Vo9a)Lh=P!YAYZT-Y!FR$Tp2+tDJUE;lwX8n9XMyuSphdCB*sEs
zq*eZ{z>*H8K$^^kfP(s#MK6dqlgkt~K`)EjuMrR?5yg|;Q4YFm66RcON3Y-*qb;BB
zlXwMDEC!(tJ>xtILUk(|#s&6GnWrySZ!pGeeR`C~Y#GdnRma;n^h&f1zc%#+a55$&
zBt$i+h~7&`HD+wk@&BQzk$n<o|FM(<)_8GDYAT$uPn#!}8l}=9KCPpl$@DZFn@NoW
zQ5TZhI@5W1qqYwNh^@HWfw7^F9<&9>&B*U9FUr*sn*=aH3s`0T=X+ToUSY&tf&?nK
zqtFoIUxzrD&`p5;vGi|Tk*~6)&s6SMu&B!U0d*`oqpxar3CiA&HJTk$ohEO>;DHA{
z3?!0Hh%=K)RML!PIU?xmkZA^W(OD?4kw+d&ofyLU?=DCi)4I-r0(U#~v9#zB0%W^)
zp>2n{TmS-7BBn#6V8Oc0+Gr+Qxn6*^&sxsQs<^Wy@E+;glHAK=)zZ_<E0-2>GUyOD
zc<@?`^=Qi?gmG^Ni#~3PIDi|<2~rKFmY!5HTGKUgBm>e{L%gyt$8#91(|i_$E(YqM
z_oSh=WhX@7?`&Cn@+wks>A}qbvl#j`oq(7hhH&8pZKg*H>-<L4$F%&&l5JR?*2W~*
ztoOo?`x3%tY_j|}`x20@{2qk@VU};3LKyh=ie!(PY|;-nn+yU%*_xz(=bKrqD3Rbb
z%c)8UkN?;kd1KnBjJ+B6xh5VtwUw_9SY~1o)2B@pKB1L}3((hXKFTHJHy~)HP1&O`
zV%_=ByP*ku3>u39kSI9dAH^C!;nUgrv394H&@L9Mwm@vAxTv{!dY*apa(j{=$tI(L
zbqO;Nl2{25!BS_CxDZ;4vz`0>OE$CQl6{!gVyD}PgJ62HHnl5{q7U(_1;#n#5OjGQ
zma&$flmt^FAPFJ(&xVoTBjf6K>$g@jQ1tbH`pwW}!9v>TnkIg~P_=&DDBZ@UC$AP8
zOzufQhriS&3k3L({kA(@CboWTq7ZFKwP_goh9NBY7=8YytSXY;+Wv0>9x}!5(+29&
zdg!y>#2z<(*H?kgP{*EcZ#Q!<^5cCG#D+sKbovSmag;l6x_Yq>R~6I~rS;ihX$)34
zy*JT^QmL_!O#~;?hx4=(65wFvVWipUx)f-{vvGZSS71T4@D|JN1>>MFGP0Q;GEKhO
zUhB1&mm16dw+bnW{rK_qY@PaNwcXON00Y8~5BNzPIYPj;in-eb;DOCedUMV!b%`us
zyoCmuIde9}(&G?^Ie=VADad>3>T}&9uz2ySA;fpaF942Q7+zWF+d=oIW+2$v!|Huq
zXy$Ap4E(oaRT{Nf4?k`;)=yljC}Q^kLL6^dCG(h>0GJb*ozZ-d?~Ww2ew+uv0!SzU
z#Mb<f#|PAgE*^)=%ybB%Pr79=*Ywf8lP(YqfSJWtMI=F3>mRmDtRstn4rxHO&es!S
zY3uFzDzG_{cb=#T&@21gsmv@$&B1q`LdgEhqAtI$i|NG7$G493!h$z6+gKVvH-90Y
z?PSP!3tnR}rp>)xVw|)NMF&qw3huDBWFz`!_f~Oi+WSR$OW);1{dz?NDSM1w@kcw)
z8Sj==iQee62>|bRi6z&u!rU^VPQGN6#RSyt4L1td)*T3}YO|?}c*ZOR#U?whmggLv
z@*?!`b237Vtq?6CSX#R@P-Qn#E*%i+o1;Z)5D05yu?9eLKDC1U>Pr|X1lc`B(I&pp
zFVdj@tp!)D=i{t!>}q+$jt_*nyH<o6Vp`_*N<u$^8Dk0QQMmmcbj{927QAbgF<QG*
zvs_!`rbR^;;kIb<Fkl^yqpb*1)DQY0^?OWwCZovWoaXn;`8S(kaf~8%qfg)K+Dlbk
z^@j!KWp*ho#<`BvA5*bJPOf9jNX*cp;)-UxNi8s|+kcxDWz)Qe1SE{Lwt3+i?X~O-
zF1R+(38=5sPr$V)Yje%=+PDn|D5k`F<*iR2YkI6%07sIb;9*Bk?2aQ<nbgTbKT`(G
zlf@~pRU4#v`YZeclAZV3S+|d$m$fGRQ6G%xjY%M=Emas*{+T8<nFefMrp@z*T+*KL
z|5q}Q3=qx-pjMP9;2Mt<p{m_7wB~kcSQ7!z(x8vXT2G>9XeZX*vnY5V&8N4c^0gMF
zl)z+n%fCML9Jytp&swa6;m%lW*#s24by@6m+B{~iFMwoyNa8B2UI`1pF`DB3=6J-g
z_WgLFY^Ub#`)%p|{W|jC-Dy*SkK0-++5`inB(XsWSEpXSVLj0=0QPBU_|X-{^}66G
zn3f0SWkC%WQJG{Yy`g*zyZsu@!G|Jp=7et{d)14WOA^f!TcFSx*g<15E?`%>5{hyo
z1z>CU-?k7Y=~D@hv>D(p$TqTkI<S-=aH5bsy9mWHcXfrwrkPnF+1a3OB|IEkOW2M|
zM-SE>2A7x+p-z|9Gnu*rS6_)1EYw_G&&jBv)Z$qWH%)DeC^?5&as{@v7tF&y8?=&D
zuW!q2^?}hC5Pb1&Z;8*Z9qqqb`;p0j7am_&e-J<zCv=%VC$(!6-g&TE32-;_G=7^U
z^j_rVF%UrgXYbUE{D@}v?(6F6PBiQ~b;*fX_--iTS(676Z2z%?E-au&*j?%1!J$}L
zaj~qqZ&^@z5B5K3z2KuFEm<7l<GN1<mU3=+r_n*AHe2~C*c}I3tvsOMHkY8NMPJNf
zI-W`mh=mmUOeL)DAr@z+z<c((%>o|i6*3MxpMpcG%+<KoJClC<5b9q50caXe+!Bb2
zme-<xUN2$o=7^Lo=HZc>h8vjo!u()X8v%sc7%G$oa$FW=9TxLrt0#si8F~2UHO#b&
zkUCTl!ez5t8m&p%j{=V~s(Tyn<EH3iZrD->hI0lQ4@HsMfZEN%TDhvZV{^wL)JFac
zL@AX5|1hf(Ojt%kNdG{<^6#!mFmb-pJ!H$-M!%l&IXMH^)U5;pm(5igK2h;w4Ez)3
zdK;#WvE0#Ap_$BdS|k?D62n5u;0GR8{e?NVq%TkJQ}KoLCBW8au~%tld;y79&L0cm
zJDolTM2|`zJe(#rrOq-ZasU&LT5^9saizy}eUE?{_dCc`o%RaY2<1UBrcH6^z$w*a
z8mk3{_LvLhk-r7@nU9<Gdk9DvdkOD1@k6_WJR3lK!9ySscBlN%SpD!M^;bB`cV899
zm<d3S13jBq6e}5r(CbpfU>#=i^6>89{SX_|O0C_xLwn-re>oY9IW8PM2ZtrBF2h@Z
zc+?`ve8#usA{w&VB9VcqV$^a;2jI48j4{^os5L*n94`Pxk_Zs+QjM@%AGNzSmJj=P
zWhpAW3m?)}o-<9F#r*diNa;fW{h%$2V88(icx~u|X0$4(6UeJOLH{U~MI!3)HP)zw
zun_*L#Ug&F2l^m0CQg0HnNUYcG`FQquO1_)c`^F%)Fu8Yf?7L?x*?Ei9JoZmK{i_o
z-1;=~vz+NY@STa8{RkiD$pF?t1l&fbmXVz^h4*3ylwm>$A;PoyayyKX)k5rk0{<*+
zs4u;2u@uT&E=yHaoi(YVZL90Ao*fK}5nwG@XJMH13jK_rg`WO8esl$TWnyUbFdLz$
z-Gq<_a7~spPIFm_p|#h)TwvW>y`3|LCL0Cx{CPf0Ybc~(!M@{$cQq(8#D!}CpvyI@
zU5WX8xMg(cNxWy9Z~$V<f$@hmfn_wmWe#C7&~7{TTowp%a#MA*cOSDcbuL>`vHLL1
z&0Pi_VC0}iLQI%*xH~&If`dF$NsBnkZ|gg-;kdhs0ikbG55i+>R-x!Pn;|cz9T#e@
zK^2#`otPu<VN>C_khl3Vi9kQNwyuiA)tB$D;)Jz_@Yszi(?WXxax&UuA*Xkr4fv%=
zAcI$XvlYbZ_ohuNuhZ(O-7~dv_ye;SrI4xvMx{TDLuhjfo)L6dH$?(pGCN*N%Rv_E
zmcUt+GeL_VcPc7W>sKFslGV_RV-2cet+d$fG0mVU_UC8$U_?B;r5S>gr^Y=~iYAZU
zlxG~QdQ?Z8rh=g019Tk7Yo{#L8j9Q?6S`(7=K&+@N>qp+V5y&DmI%O?{qlPmv!(np
z+JxCH8-Ur;8kSk4MIx>&%T6SNv=Qr25yqTkRN9serIITLA50+VAcO&uzIAwZfA5L=
zG;2ollx?NT27Rt=*>mN)K8EEtv<6^FGtq*xVCDTD3Pibh?OhBuWvX<!;BzFz81G}f
z!VA~j&PK*Vn0`U-t|aHUO{RXck~4Omm%x=m?SnA;vorsJoe`uIf)J%**pPAOKlk<e
zc_zozooJ7`o%jEYI+Rew8~r@Sn6F<AZtMtF(Ta<97>x;#>W*3sg)-lXq>c_%)K=$U
z>+3$@gNjO#z21yu;0%q_@YH<uXlMAUO+c$Ap4O|&2c`mYthsBe1+}YKL3_Ab#Ui~g
zpuFuK401b&<~UZZG{tXK^B{g1R0LjpQ|i0Vg*lv*B~X6WheD>lQ*0<0UGd`<E_j0_
zf!?hE8KuqMHVGVRhD|9~)GtP6?o_NSK>D~*D{fK3o|!N|k&p?jXF9teT@zI0Za!2<
zCZK35a0J6GhTlfJj%|KE=i|kwJ_PBYk+huy61VY^fA?M<$MmNA!N99-czS=uW>l{h
zdEr+KRK0wiCsCFy#zxSs<Fxk9^I|@LkXt1KP((egHE!BpkCa<kA-q3aQ4Wv~B))Ti
zS5U-g8>ouy4J6$VHhFj_S!ka|NnUe(D2EsEms9dvY{hy~0Y;r1*{&IkVtouSMz8gA
zdye{G>1#7Z)4s$uTl&<DsoSOWI(9`Inz`7Jg$7muM&l-XRgCZfPh~)|u{O-X*f|UT
z8LQQ$oCis4h5bj&t|2sf5hUk}yp6&a@i7s2LAfgS@BG3VN@rPDR0gT*Z~@nodeXek
zxl8^BB!reE2x4?Q(+9^0wJ#YlIdSZr)?Xhnlcdf)&chCnWW3&x-Bp3}Cd9*LpMN-=
zgCg%{fz($`XpM(c5UE8#p0y<b9w5e+i<Yz4g#z`088hrI>zWL8&YxFBLj{0?%47_K
zC4nM_a}>=m&(B3;D~0^Se3v`$=p_({-aiBdSbf&LYjw2mwUBC{bJgxq$kfy&U~Vx7
zq>Pw!fkRd<w<S4a&@RD=gn=$&k(7+W27s400JTo+N#)zByH&Q=nF<3+_?a(GjNS=v
zoA&lQW^ub4M5vvQ6vs?Z#x*fByA?e02*TK5SH9E*d5)M?@2e4C&wzZvRl0OI??AHl
zzv{+TG5*4_%)DfNZxO!@KWCg15G|iUFaM~20?#Ud!f1KVdZ!X%p0yD_c0@+vFJTZ<
z0wG|3c48kU<l#{Lw(1=<`Pwq31!BO(Tu8G-7p$W}?3D+R)|cY_Hsz|&1<rH3D`K<c
ztT=!9+AUdY$lhAVHXIH32|H`Zqr2dk;9r5@JvM6$yWE+eUjZS{O<m8(Cb0UQqCk_L
zvk#vHtOKk?Q*&Ft5j+S7ybr9CP}1<~l0|ZXh-9T$G!!qHhtCC`Phyv#$?3kqYh;4;
zo|a51j@JG|+;FzWWuH0)jYsYGAhpc34u)BqyS%&%8&5<(X@`Q?Dggqzttl{Ot91^*
zCP!g+bBYkOL<V-&hj<jw)FKX>0)ZY=JgUzrSzK_|cn%ynco?xDc7_CjwVZ71p}ox>
zQDx5md7aE$ps~>G&Dt7F(C+6ff2LoT07PLcc!4A~itt|Vf>zoF?NU%_8Y=}hjGquK
zBDlqGxg%;jz-6qj@AV{5y}HBf3h#1QtgN8@#80#TDJFw`$h>H&pD40&k!raHvm$X7
zQ4S=Jfr93Wz7goeY~em&ZS?NkMz}nEWq^Q|K@M{rB4Gj;Ep~R|6x3BMc>C)r2MEcK
zwdq6B*%?`JA`nWo{*K0K=vajDMm=$l0WRNCUF}7{o!JARJ9UeRn{w8^GxZa?nEjbu
zx{uimIiG^)#8F>Y+MKh}@~vR5O@3yK6(Uy}fsdC?jj{KC#PDn2idI(xsCe&TdRBU}
z5pzok9_$M&4Kjd!|3+{Wh`kgrySI%5sBJ6YRW>g#JdhzirNUcOQ&LpCJ_zyE0(-`7
z)@8&Ysf{SSHpH-MmQo9`p^W;#)PuLgwuNz5pLsA2YgNfo6;v6_ibEf1t10h6E-h$c
z&^x`GkP9KO=KJ_*IAA)N7{~4_kGchc`E3n9MNo^^bhx5kNHOj%y+wi%9|+xe7LFoR
zy(E|pqqVM6rY97ANU8Fgd*3RBgV*k_PxaaoXgvun;|q*J7JXm7j+(e^BZ1ffCbKIF
z7^qg(pf+XNhrMZwHw*M!$gdPS-Mp0sSG|+Qre*bMdjgsSE%!|rn3+BOS%AW&+9i*@
zB@wU#M7Jg9<38FDN6IjeW0xjN#8e6B2cE3biv-$;*I@%OqCYt{!y2wMw_y#I0hg=D
zjfu0G;E<`;=-}mLiZ)`>!CXdthaRUD#Mpk__FThk($jI1O$cmDS4jC=VUV6#kq!dW
z^U?GyX5e}iPa&E~ayGU=KA4{`Yx7{Wo9KUtOcDzDM>sXcZ*z2df7++7ej&Ot1KBUJ
zpxSiqrr@~$knk=g9l~mCNXp4@30XT>E005?w|123`n0@;fCj`Qdu!MlgQV-u8sbUb
zA{*bHTUqXH?Ipxw(nu|yYFY|^*OQF&q2LPoH}+WlIs;If`%nh6@_$yc>Hxd~kFhGI
zujxZUUW0a<xC@?XKoUO;xj)b*<kLDddss|&uyJ@KrP_^;z5&j;h%{#t`?2Tan07_v
z&m+zs(5jkOam<pwee{AGCgwi~IR*c`G-za~3mw=oP;^?$a~hxRz$V7V$h}c#wK9<S
zD;n#?$*2%J#*#QljlLRJ#2C!NZ3Y?cv>qn-q8JFFFzL66tOaXQ=kXOSthNG;)kcsF
zW9_{mA8kk#PfV598lI(-GWl}I0rE_8pY&`YlVAzd{><wrTLWyUtN<`$w?3<H6%<Tp
zXgv>oPU;sHzyxpb00!Cs6NcM0-XCzAMEP~-!qQPp%{Jt!B5e-ii)2oq%|vRHS@l!5
z2{qJs26&&TpNwV;Q?P%7JH+upz&|br)#qM`tITJzMUY!4kF`&_e3Aj+y#iJrZTBFj
zEWr(Z4d&IxDFFUU8lF-WA{RJ=*qvOE-34>DhB!d#(&vKK(m&wfAweUD`m^=ByP1cT
zns$H#14MrS51K(^A{Pj3yo4NbGcqzVNhON>R#oeuXECm7I|?%W%+`NIF}b3khEZsZ
z>3%&u;yF>vAJkknFfM3+csHZD_@D{pftEN4Ovpm4Gz{@_=~Fl^WPK*?0-!*w*GC89
z*Co;zyF7^p2bw!|We$sieVPZI32_LAWpgw&TM4(5afq4{K|s~=r;0vc@n>_Vyf&q$
z2S(dWnDV!ww?;;W$c+PBhf^yEcPJl(W-|{(R%%%C+SP3$aIM`$r6OSQVo4KBBv|oa
zbfJ-pNiJc`dImF8*^h(S^F^<53-6^p-q{LQG3NwSu+CHOoxwk}G&1Uc?SE{;l?<0>
zhTx0PbBTE!5?DZ7Sp_^RMBN-bgwsFfl|jSA%{Q~-PzXj#C2RW^1n_pyVrMy+Blo6q
zaLY+i_!-Jxm;CJCeRw5;$e`e;TQw3W<oyFvO%z#tB!spU01KS|(|n*g{}yCR&l<tU
z$IZ(7_NRihQ8aA_ct}^H@YGZd3xy$YXb-N7>Y~U$dd!vcqmVT7!}r|+(FhjVfdQc`
zm=9w4@e9Zew<-KV0bHBfKB*51k=gbKp}S-O0u;j6?0C>4Q78zIatdp9SI8K()tDSG
zsa;iGgFeSjfT9QkYyxOM!KU_bOs(G=G|a(Nk%kZTeeeMtbNW((G1+im%sywO58j78
z4_?p~e`Z5T*^krOHK;i>ZQDdG)gNM}rGAwLT`bB=9Ac*n(DL7>roz-1dBx;iE*SpE
z>Fupmk?J**{VMAOhSvVD=^=K?eyp`MS)@%|?zALP3j|K|8u01yqlgvVN3++HqILkB
z1O|1rLDr_?kLqmTCLN^Zj~@Uq^*OxmzuPZe_+o2*=|a$Z3lDg{(W8VrudNisUsykq
z{0W-+Qk3-V*Tc!kUk_D4e-Rg+>Y1B-iYk83UHXSG|Dz$~9XI&#T^&cxqen5)#TWGU
zj{ZR8hL-xgT$!B?@zEV9XsJA4x3|?RIrpZekQIGa)0CVZ^>t|Id-ukd>&HC<@~VA|
zfDBcS0^0~*;73?>Q3h*w=^?<Md`a7D>{r*}`wMBvRA#l?iwE?-jn79LpE=0~7<{Yk
zt)NA|jYyh<Vbtqh_5Kck3V#DrEg7RTBbv2*E5qn%u=MCtGh47&i%Ig{p2|!ft%88H
zb^W$SfWF2gV&|ixbFkx@dp!vkot*xQ;)B6dcPb4#HGD4z>Xa{LY2wz%{k=M6au^Hc
zUtLD^0^83?gNC$-2wjvXUr=Eik65xFrWEUt^D!BhzVF#02zB9As)bh(sT2l&`tyEw
zOR0G;q0+dX_AAx<6K9BX&#&He&43y?IoWM9>$oa8!nOr!4hKOpmz;ZaceZAfi4+DF
zOLZF9$Oim&sU(5-&!ib!bq+6ef|n!8FaokdpZthKj;&2oEIN21*F;I+z)c3385lOI
zk^PdPHKw(#Du82nbPoxD0^`@46v##iy+wsn@b2NgN+;uV@8HRg0kIEJ4)5g-Z0p%0
zG59?O#z!nUqx=0-RZ%he`SY|#e$2%YKkcD(OG^-zGTRm4WY(AF;r(@7Zb!FdS<H<8
zzd#0^Afv9XPU#Mo#;#{4bX{VM#o9b)4p$(vl0~e5$}tq$v86{f^#R}4Ol?Hq{Ah~&
zY(jtD>8D90>u)kwKfHgY`kxD3VV+sZuYEg{%g1B!FI)~b4(x{uSITim+zWuR?V5g#
zZBSm_TZBzMt92OouFJ*mK@?KBxin+aKRr$htdxs$r?Sh7pdc)XIT4M)1TOUF7s`LK
z83;)Y8iSv)OvR@tnoW7`#MBF_Y%zX47@>rvV|c#>nq?16Gspj&V*HDa^W9cz3D}!)
z;Sp%v|Jb8@Vk*UfU_Dxe(f0qxc9~d+Pd;%c?P_W|a)un?wu99lp+uP5sz;Cd32XXK
zgP{qFXvT|UO30bPYz%1TfV49srVqF2CpQ)x#7$eT<n%o>TAns5q*NHDR`J*I7g$&F
zDZX=Q2n|0Eu63h+BuslAFpDob*gUlAo9r*G*A@)^*Lu@YOEshs*2AfqBm5Alx)W`O
z92e<MQF2y+AEH;i_sb%+6+HIc+{OxNU9izZLey(2ZG8M9T&{${W>#PGA2oMAc5q>&
zAX>?}M+-vkSgmcz2;SP;45%KvqNJ3}Tqh6$FzIFo%+A4|wY7d%f;+V619tNM=&d#S
zzIfj^nEFtbXlBr>rZ@T^qtw~0ac}yz7kRaB%<PX~o#R;hMG7QnJ<GVm-<iL;&ZhiC
z&X9V*&h%1-UzDm51T63J#M{=ma*#oQRIRpG0-ExUYh&=oi|d_5-|!~+BZidPo5*py
z9R){&9Y~-;1r(#>$FQA!MrpgIXe08dN_=Hmo(F(uFONb9!se<T)5Y`6{D|F-9qo{p
zxLG0lTE8ch7qQ^vJ*#E32fewqGd!WM4(GkxsmTZeUsVJ9>*Z{!V4q-Dnj(0v?1LcB
zpCtqtj+ydD)gc!WYLtfHwc8awtG!o(T^=(eB|*O1B1F#Cq+~c`%gw_BteCUaEwL$4
zU|I2Jhdd+iPnbnAKS=x<saIaa`<lvSJTHUe4bnYYD%7L%A4rHzxes>A;S9gk(ijE5
zMNU7-h%+18t2A#x6+8E(EY>EuPn0gF>Y57h?)c3$6mvkeOIbsw!{<ko-G159T{mfi
z<-sBT`dOJ{jGQ6Jbcut${Xmm(x&|_Yw1Bq-_?wUYm7!A?OOKWygZDT5+Js+-361}h
z47pxN-i9MLC?Xb>0eu<bwXS$Ss^KGlOvaGkcuZw?V2;%CftYn?(iWW;`$@aRuKDgu
z4XX~!>s#{jFq>aN*kUL%V}ib;=p)ja{JU*2cYe96e9RdYwD2~>iv+3=p&@};ZD%11
z0jr9zdKdbyo;daaosZ&GX41j6>Ysiv_p2@p=aV)*Hs76}Zw@&y9@*P!5lh|{7Vxfx
z&3^jpOQ>pTX^T5dk-fEnp)$B(hSel(FjX*lRR)i)CH4|_{RA?qnXTB~ddBxdo0%6o
zYoZ@nQ(-+tQMzxHjroNh+>qe+k!^9eEl@pkL!|Rh=e!W1RMQ9yt;dgkf4Q<FX~Rp<
zCHwGj$@di^*1pw!s6S!;j{$@N0-pidnf?qQUskS#bV#ZT^`bS%n$=eAK<b-r{RwK0
z^X1!<edxa}PQ86{9a2|x<6_mPJzjbiis#(GU5)~-4ct(B>F5#7$=)oN{BLJ%;Ya)v
zo<+WixetFXjxk4Cdf4XGhZFz7sB2aP8MYp|cUt|>2eJ|axF#4T|GObxGT=aHFhx{-
z?mdYpR^;G1Hk`dTl>MtLI9zerHtU*Ae4OA&sam?bTIh>w(E_Wx2KM%f4>cmAb4nI1
zV$;+|M!gqO=T5xcG4QCec~%-y@mQ=rdc$7cPJ*XoTxRqMcaGWDXP>%ub3SDE`ILG`
zt}LA2SW<V3>h7I?k~H{d@VT3g9K9)QLe2ZF(6JMrIXZIhdoJp<G)izByK8K3e<t4S
zKOL2hw2nKU7c0%w-lj))HcMJZGaa8ToN~RT``~8Z6~}c8qDa&mO&?|BxMLY7kIdS(
z(d&+$%et_3O15U}N94rMtInT9<zMp>FA9V|U6vy8Doc4(EO1m_Td;C$mFRQ&sq?CB
zE?x!AEBB#`b6oAbwOZ4Ezdh%y?RcOHa*xD&?pn>R9B96dJt+hB*b<#-Ok7*vx_fg;
zO=9?*pWv<kYR+7Uy$z(LSJ3Z;O}b*mpT?iBY5%=*kf%N@adtHL>}Z4dT<{}SCXpEb
z-r!R6*^u3~v)u37{OZP*8#1pJ{LQEe$#uUiO^-Vw?hs$qZr;DyeEbNU<Jrwkd#<l@
zBJ`0;dDNNnuRJ-o%a7mc_RteNt!pIG_JSfqekbGRGXL()*7P~C*xsh|Z`ATK?_Y}3
z@9)AdG&(MvdiKh5^LF-;vY7YX)s_)Y-qlf3F8}l_a{8L|<b}UjqxK2oFfK2qoZi*j
zjyF%45?ii|p8OZ;cKw_FpQ-h{lcR$_az*L#((MkLD~&JQgK%<BAji6HO8yp;sTL0(
zn7;i8o_fvrC-H;7-Ye)<r$nX+_2r%G9pB`;RTq;!tCd~z6BRU17Sv7V&{6oNcfN*O
z-}VUfT8gRW#|cqA&?kEF*`k{p2@wrMl11@dzQ?PLN7inY;6?1uyc05sYvrENo4)`2
zslxHH^R>8#lNY2GYQVETpA8;g713Mx$Q^3%?sjQn=<+eODD#Mh2$*z&#@}oC@xw<c
z=Q@T>$u)02*!QnjR+muEtlzY45?wc{^O#fr@a&<7E%@8G!!8fkYOI-asm5E0W4dei
zv&uxLk5jL&A2*T?8~J%o?XsS_)U&W_RlhBt30?5#Jia@>5G=(X=p}fn!MB0;`k;OE
z!y|8s#Qr7mHa|;gaC&Aml7bNZK5}`(+BH5Qjc|;8_c>=qg6pK@E19TBXye@@0jIbn
ze_VJgf1y!K>)n?I>XYLwdZLxb?1Nukzj^7`mtp6`(1r5&yF4%CkH^q^KNAIg<xc+m
z%ej0U*Yx#d+`G1maSF&YpFaG$W`D=1>e=*z^JG&^IZ?hBui{MqU6ma)y7&gnbA{0~
z$*T#A*|$Eo>3wI{`<VWBo<1H$QS~wPFMkof%4@Iwk<D5^GXHCS1p9sRF{hq=t~KY6
z__ZT1gukvlz5e4Kl3{<W##L+XqW<YSvmKuTh|9I#FIgDM-3~0sd}%a)r3<?8V?Nws
z=x)<`d|1PHX6v8OgbO;uTw1y}4vx7*9LS{<J$!jr@h*Re{=NU!?>_GS7OIl*Zk&0e
z_||dWejTXZ(?)I|mxmrMxA*Q13!vM>89IR{h!4sPj>2_D^u8Xw46o<5)G@ojoAW|E
zy=7T3NdXlq^7?b=t<P%H;nrDrxpREr_a7b`ay;gCt-C*FE{?o;jK|oAJK{|2o9{1?
zJCE<KEX1X{o(sHPnlJgtrbkxN<N~oOayX;0J-lkA=UJxymv?IqLVue#{q$`JH&#r}
zsc2u`T@!x-b(0(#Y*2q+=VsECWWxF4dki~&`9y5Qp88Vr9r04#`@#Q}@T)!z-3pxE
z2Mr0&60FYA?o})`gmGWceEPj=iCezoRJ)o*DD(wQ>}Kt)2S;o#U)wVkuUh3EcysmB
z!v}s4;iKn98X(ua_d}&Eqrb#G7q-c^T<}sMUezZheGhFieA)5yV)*Kx(O^Ay<GS2<
zts+5rtpwMaJA<G4-zMF?cOg>aUU=@4%Q3|pA3}3p*h)T0jq7pz-1gG`VV&%4Wv}+*
zCI)BB73^o{T*9;i&`ha|8xa#nWH=ppLh@TU6$R!j?~g7pf7CuOj=PmVb;~#FOy=<|
zr(&t`>LWf}?#e$Tn==#FE`Rkh@zo5KP=bZ;RB$V4yF15cb3D0n6#VWiCf-!Wdbl&;
zJ&{KurtMlfEWZ4F-iu4g#m%!Ef27xRQ^v1*>#0QDx_sy3Zuk8O%R?p2m`?-O>@>qp
zyw~Koas1OO-0@Tc#I1-&k7c44UP(S}b1Y44uQ1ljm%Ex3A9*Z1^l3cnf)nk&O)c6o
zRc}1Djr{S;QzgagQ|A*f3q}vGs^hbRNB-k7{!IMR9Dc5(ML+Jw@KXzjRGIP>&$EEu
znM?9#)(Y(l#&iNBJZ{?CU%S!^k>(N;8GW9hcFs-8Qp?q-gBq<cl;9*4ttIg#5=zB?
zk!-np<0mZwbH%YcQJm9~`~8ET54*<}VxuFDoVeegdB3<oEZ;TZnfVhTW&e}bQ{p_&
z&PM#$;J+#L%H7c5d)JsP<lKwL56^TcB)QwN->NhT4x5y(Uxwd0>pb}8<E3*yPo`kc
zBs|a{cy*_|leOk_{1W)k!|%J5nZXVs@e-Hw#nPX81OuvexRm}!m~s2L3pOX6m(A`M
z>10(3vg$i7c3<$7RDFmqt>_nu{tyzu7kw}<ns5a)&fWDZ$yV#Jo#U^PPjBB@y+3x6
z<4m;JyXs^i6{jE3S7l6p7(6Jm()klp5&zG-vEZHKThGt+oR40*2<gc<{jB-=iq{VH
zU}M>hRZ+Mv-$KF7ul*?)e895`d9r_^UW={&$TftWtWtfaAW-otFYjrmpRLCoWy9YE
z6FW~rB_qF_>u}Rd8awgvO@CxOb;c(UyfD_cE{jEZjMxsmGA(_DyqOf2eFGW#?@otF
z^kRES;$Tj+)umwb2)a@jbn#a7t+u?(F$)<TY42lAW+lG*_pik4dP{#UwmV{W?lj*u
zk^Qr`;S$Qvp5|UTQIM|dac$|+P|a~(H(!ek{WXu4>IOyokEi#)IA4}(1DRcS3Vrom
z-nyFqO+lm>wffWO^|F7~`r&IjYI2qc{n+2}ulD4}T+1&C)%`sGm+wSGb1mz?wZ&Vn
z<b?F(ZXUzuzB`fTap$HK^7h-`$2mf04O&#c^W3wjag&{!ERwc8OUFPB``^F*>&q^K
zebYg)D`DTTHb7;|Md%$F$c6>(*ICwY=t%Zu3uL6?efV(Bo5_+XrZKeOyHm=OtKOfk
zxLnUacQYr~(*TtbJ+ff{KBcyy7yC*)w_S<*nMJ&VV#$y2$p1_Z6gq_En;S646V)Mt
zAN-Zw^p1SLaL%;%LHmiuOODGIEFXv!Ja(76%5g>Y^G8^GvbF2Np5){mx${<fr#O*(
ziq6ZHa{_N($~K+S>v1J&ig=wza3GGI5j$@RTlJ(_e&pYXZ7==tBb;n_=9E9o(aGg#
z)SmIp&4c1^u4d<7v?M+%KML2Aj=$OTD~>AZ5G5<~_B&4G`-AoNkq_vn>@k%pt%5sk
zR!cxT8MD64#H%EK0PKdHZr?@Ar~cMIQK49X(=y3>bL0#)od{_-ugDzdj?4+Dd$xG_
zfm;;(PX5W&jjcZ(?^Nf(iah)cZ|we*zGz6f=Eql=8iCk;@VxlK^ks{5)eCnzr3PK?
zz=@tH_L(#ZwE$mi_S4Qz89Q_JW-;lckFRu|=pA)Du63pOQWbvQSHI$6@O@4GRM9<&
zbE&7!U3&v`RF!WCxrG7yE?0K<aYtj{R+7<z&q;sODnEaMw=JJmAO&hB{8B!JYvsvV
zGEtt3D74QzA%GFky8A>f@2r-Pb9&#@+m}AZUS{i$Z+73fX(n)r>K7=Uty?TQb7l$o
zJ@;0{e`SX#cv3{<a=}7if2n_-!FfMn^B(!`&rh>kzI)eX==jCR{Apg-jS>CpZQoQ8
zb<*<ajW8>%-q$O;Z?C2Vc94I6Y6}}JxVjfX(GdRQ@TSd-P-;D63%6<4cfB;el^Z>9
zTDKancly-pCWBY$X#(f?^WC(rj+j`A_un&-%D=*?A8==+g{Hoy$}Gq`x-R1Dy0&4e
z)ak)<Tv??u{{(w(nvikzV;_Mx_~FW_o?CI}3r-7Pji2E0_>NVt<6YAa$4A^H6}c;C
zA#4TyjgQ`)EU|LjQ4{`jakf`f<GRiF4vBMoEK?=D*(`SM5t~o0kGW^`FBFwbWrkS1
zK5HjFd*N6_V($h+(Dd{JWaOKH;DReV0{-_u0|l>G<uZWj^#w>y&eg%mWwiBkoB|E5
z8p}zdkz){<*Qhn8)IoAk!vT#w@eBBqS6&#jML)VF$)WQiywAyS!OHy0qn4jLt}Q=j
zWE0}wxWLc+7~Eu((L+A2yR?2eUG0J{Sao8IsF+`%fp#kwPQ2h@1CMrLm;n!<vg0Bs
zN4HckrT!Jkx+kgG<J?67gOkI>7gIzb+NZll<C3+$Plb%gMS4xT)ytS~U_wpb1X*6s
zl?c@Rfyg&_>RN8ar+TlKd~N+!Lu4|Oo5wVpn0p&B_WoyP-Z|u5S5cL)*#gJ3olw&f
zj~cd=E62k4A$iRE032nN_~rUZgreGyR<G;vpJE+)!j$YzimT7t85i`Ja`;}`d&4!?
zlIwL=%C%wL&pVJ;(ej95%HqTBa4Ee9%4w<4w-@T7sedHd9j5A^7ayK$<(XA53mK5Q
zo^s!v&-pm*bQAF@rvf5V6l0ypc`<KA;dSADojY!F<^3l>=WhnjUytKoF=v35Bdd_f
zMI4i9{)HqVIbyYb{IMYeIDxETGUIgcShib&p_;we>8d~ma7y3(`jbjl+7;s5Qyn*_
zh6Kl2vG&}mAM;+*BlQXlf!e}$V2RlVk>#|S1|AwElF+yhU;G(3BRNSRic82aY#1cZ
zIeA`<4H(W*^9A1E7Np-Zqx#IW0pS_;SkAs-au;wK`8(5wefWa}Nd$+V)YS21)ceJz
zE|hhveLZG0W)$1ngw-t`CA{W#Mg=_6HTJ5Ddoxt#YJD=y^8>GpnyF=C*}&>wu5`X&
zW7U)b{^8sb^HW<%-yx165;sqvzK#FWyLp0;PgL#CF-uh&<)C~X=)epwb1G>w-RvX$
z4U7ts+(OePza0PVZJfVcUuz()EcGNz^;Mb*7xj7Ox!l6X@3^>^htp~<LOGii2IlO)
zlB`ckX`i)Gj-||omxs>%y>(#Xek$&~=!@+3+<w)oS5fEek`eD$j$_WB)xZ4o$H<&q
zA;;coAjZ~R*#LA__xSwW?)agl#>Dj#-Jey$n__RKk@!NAV!pBRM0^z_{uPd0R(i`f
z&xsj=5l$_T0hO)Z7zZIc<~fcZ4L;s?I0pLvRAin^>mIZawugBLov?e7VD-SsSqw~g
z-S#fVI?`@9zRFJSPTH$&@o`rXt>=GFTNVr`k(NZHVl$GXy1vwYdU#3f`b`LznnwIj
zp#$!i!HZVMLQa=OAI+)N_`E;CoRfS1=cZ@|zvAgLkGg+*j{kX<lB4|nmTZoAo#=R^
zltuH8fvb;h&x}nHEzfHC6+3Ie@0=QXeWtm6T|nhbwN#}M=fcm3>kH@JPU&$LA5Bpk
zj<yIDUf!=2_KN=ZSv(43@^(+omaQmPbP2<6;$`qv(GGu7dh6Ib(V=T@OG^d1c5(t_
zLtWW_Ehj4*@~<RX{Ie1as+K&mTQ%J;`bMd#na8}&*XtVZowF<vIJx#6?D~uB)4YD?
zo-5qn?xf#*&1co6f1ve-@9cHQk2=<8+}dJVxK2YXmacmr5eYUv`iuDE=&W>=mI?(j
zUVHGX%F77|_$7tc@se^MKbCq$^r7PE)ia`&t|vW}mbNAmjJ&ifUV45ldC59bY8?V$
zY<oPcV17NcBT>oGs(r}(WL036Z%wy!y<#VMI{A&G*X?Wf*ao-dZ<(b^R>)u-!JAag
zzh;bs*Ae^67nbj%;`8F3_|zYH;GlTq<lc*`%BGhTFv!QjmZ$Dzz7>zQoZ!|=+dRtc
z=i&$v3|r&XGavjO#`=>`cJ12r5)-jlnVVKcw`9C*&(=8>OR=o`JyOUXx|}B!yZ^yn
zeQA_9RPB!c`b4I@ySU(bS_g73Mx*;2?UMOjyxpxTJ7-jB?4t?|$i(meetGqdhWoJd
zjIz?Mz1l41K%3clmg&iB>~d=L%g?vKB9EmHRpi;}#Bg6len&R{GwS`rGz-N9hW2f7
zBSOFad+{ve{kZX)lll^wd;Fch6x5jK??irPx=0wl!A>K}tj7CP{;YXaB=Y8aa9E1+
z8O1nE9?>sZdi=MdNz=0I(vOmNEj3~u(9Ej$hA9Qu)dyD6f~tcG^9Ylu@xOM@kBx+0
z!1X_7c-5YHDGg#cUsKobpMQK`TsSZN<-^;qd2*6pZJs!rJ&eCs^7H$zpZ4jIWrkL)
zG!5Q-ao*(Iky#8n^ys*$kmkrav--X9Y-P*?nJTSzla-!DD=rhBL$KcKZ_ym&82i!4
zabz+)Q?K*&l*&^7ko511b+_9{F%#B-BrNMFOq&z~)hvgayI~4Pz&1HKmrF}`Gmnnv
zp<X>6QS15liL#ON*k|O_Hvh(tEP1p2mdU7=KMS-AQIS&`FU8KbHE@qvzkJ3`d`1b2
zu=u4IVm8|nza;$kMygxsd4)5iPYEuA<ouMZ@M-Q#?pN=WjNW-=t-#w9dmi@lr0%ts
z0Vzj1emP&fQb86-Z;COVwf(vZ1b;nte5fr^xT^YokK^~6pli2|LmIySc;2=dU2y;7
zJFIux$yRiX=i`ftr|%0c5>E%~99N+plS4&;)gB@PnqJ&FTCbybr?7LF`gBCrbk8J>
z@4K?{l)7}oMuJV+7ps={d%@qhA0*1@<u^I?h{Q5I6~5%28I;;caFtXS8}WIAh*NKx
zUpbO~@5Qi6c0f|(>f8Q&v#vl2O;mV(nt#!$;mCH>Jb#P|{lOX^r}nK1$XS_Nk5+4r
zU*wf4X<FHh?=n5K+p>?cNA=6G-rBrhOIsj)mDCCEx3MnT<DNs8y=H!ewt8h(tG1%A
z%MMAF#HF~3JNv~b6YH0w6?f7_st1lR7lvBoq#=_2zss#Go!pDgPHlU0ay{n@ioR_W
z%^SZt_E|5bpfAZ%=krnqWAfoAOSpT}pmS!+k3>v4qwe^8t~NWvpbbnCcc^(P#xd;k
z8U0`IBi$R{bD5Zqei>W$tIzj+Gc^3|KQQy1)s?<JhGl%<hqb@g`TF&mVjL%J(bDw%
zVp;F$?w|10OeuPULP`yV;8MMp&5i!V%UEmX5>o#1tc3pk*Eaf{bW@SCOcYs>Pd2xC
z&~sc!=h#u=wUIEV*E_Xl)sH;+J`_pVl)-221rTWwf+t9pVZHMLuTCo$`uVckzmaT;
zc3G=UAqU%ifEAMMUTz8afpC)t$umTeK0vAnu!5mSU9iARTah<=tht7xLFAi6sP?da
zsJ2YT(Su@34I+!RvJX&qJvysASmq)1LI7tC+UIaRf;oHK_J+OUf8%nvIfu2LvmX|o
zK)&;<uPT1{trimT*=}4qx}V9@rl`;o^s*>aGO*io^GbR_S;&n=!L1!kaaN^!0O19}
zF)p3?7w?P{s%KTB>*~weY_~yM+QH**J_Imy<E5UCM{2ZhUigzTQiksGxSN%8`kL(3
zTcufDpY-c{%4IvHK?f>h^9Owp05RUAmd*h_b*~=(2`dnI{lDvqNkxeh&4yD+z;1sL
z6c~e{FLqiEE$0frbVQ0yR^fAtY*R2JMSXphqx&o7tey&>rfnMg;c(Aj#&-MZ7*M3T
zc=%FB`=yUo=<QrbpwUyL=KQRZyIZ|%x*^HW|0bpD&SeH!yDJWI3DFq`iMO%8yt278
zwy6D*b?$Ax@WI|jOWFMjX%0sj(2Fyo7jfhE(&kllLgekb;F&H9u3o2E8$I4b-k^SB
zlTryIIHk5a9SOFIZoR3Ya!&KC`(1Yl=W~GAdV61d6ubgGYkk`wTT$YLCp1FZ^eGWh
zd=jObNx0?mYDqyZ`l?T4q;y#re^()too|q``X=X_xBO+4z1+}Lpp75>Dt}3_!s2kd
z7WIahl-muTg?nVhPs!kyIzC!__s$%<b7|51?{mZ=`K$i7NcIK6#@{)9G7Ddm?gu(w
zCssYzxA>DL*kk|m*PqI?10Aa^$qeIphl@q#SuM0X;sESF6W4vitFE~sQT(xZ5#h4e
z&!75tX9@o%6`m5Ev+EB}lrh1RjTOZXpgvos2A-jxrWEhJOnTj%pT4-5p;|$^h#n92
z@$OGOj;#rq!mr=Ys5_xTfhoSU<1QSFIS2bD`_%Hh)b6rBI<7v3ww`LPc_M$pA%0?A
z=TcMVm!(@qzg)a)1oad+dva4H54@^@w~V9qZa#zQRRiy&AJOuqoXIJ-X(g}U8y%0m
zonyXyGa=q|-VI~SrI{FcG)C#v@8a6}T50KHysc@EKeQMqtoEGrL0LNWZlWFBxmUK{
z^lpO+{bg#jre{KEJLPrYh}Bws+}_AcYO*GM*9O?$X$-6TtTQ-LCnCZ+<qO-s-8Lk1
z!4NN-goWM<1Dr012Go5xd(ums^gi~z<CQ#Om6B?s!Q!a4r*RVpZ{LJ!S4x@$=2w4O
z`o-Knao4h53a4f6tu=7>mGD(dH;6+l#%VbEB@R7-x7^-4Q4%Ghe*g)Ws~-_^g1_hI
zKj257ICq)5C?1A&Sna=ysGH2}_oQAkv595gwb4mj$UEau6IQX?Cbr+YFF&1Ud<jD;
z`6bq>h4UWLOMr5~!24Vo#z&H8pUyb$W`9S{1@<<yxNj9<1AkeXKTnV|Ng}*OU-3S3
zQAA)w@cXIQ)PB^Q^ZSnzGbdy}RLl=5?+sMeIw*T;oK?%)0@a7qmW^?c>p*Xi_sCdo
z%LbR5U$%Um7uvM@oYg`6Z0=vVg5JBQIDkZ_K|8^W)LU~76<l(-!pFpuAzZ9_K`Q6=
zIBs0}uX6~eQ3w{AYv?B!_y7H=#|s<A%&?;WcJ;n316$!P2VE=sd%fM8n?ScepOQtj
zraUR}x5=iYF$8ZqEoxYwqgLN)nx>L*FDf8{@2N_aDLNG7rD_j0!s=5@tn;ko7o=6~
zN2%nrQ<KDI8-@9mCEdxZw4Zm9bFXal87HKwKBV~F7?dodpS#o|iFVhBun8KZO4c<j
zW0O?V{p$+@{6;?3$#wr%Yhq4al<S7pI1k0mgr$D9Rg`#tqg?mzHhvE6au3yfq-xju
z3P)*>*~(0JH(BzSvKWe#e1<B^_^lzP3chag>;~n00P<6JdAugaQKMRC(dx2?s@!dr
z2}2Vy>OC*_WaHrD?O_r%wpabQ5?lm=FW>RwV&6Dq$vy78ug!Wf&QcR@1R0|(6W@>?
zxc#Z?y4i=n`jioiI>F{qIritQ$Mxz(PEptyActIM33$ol=m(UDfG7<jZ5xLztr+|Z
zAek>K0nr-ii_|v<Fl#qDP|sYcz)3V+e(?9e^7a+{j}LC6Xf5mYFMU8DA8v(#M>17F
z+alZjV|Uyg{h2$<jcmTMB;l`31hw9s4mkz|Dgo#7oEO-XFq!)w09Zh$za@^dcZh*3
zVZ50n(+$VDyu7q8S8WlEoRhcC6%uM=PIXBk;Jw856W`iuZQ?Wh2gbBptp}S)kc|1(
zLFyhz-P>U4#AVyZ`z#Ld8&gahx?!pYtt4=HEsPptxbQgxZDo9d8(lXYNrskSY|=R(
z5g+%gIQaw=&Nxpjb{6qr&tzGuzWRzs+=JTNUL0Gr2dif#FokmP-a$rj&pgBI%eaX6
zqG#=h5LfdqpJ2!UTId0HDi>C=i(50Im?yn=C$E-YAeBu=R(o?G{7*o%wdn^JEbx04
zW_MxQ7lDZKr*exyVqy8EXQw!Gw6-?g8&u3vf(a%g=8l0!khMsHDeW}QMQ`CzAw4U%
z1Iz8s3wsJLoUKjAg+IVU9V-|+6<8SrBlyc`%S~qhndtGXtUiyuD45c=|E+g3TYgrv
z6IJ;S+kCXVT#y=DUN(g}0r^@5p@;58Fmh$tppoqY>u?MFrl6}29)L>alBUz3$tGG`
z`{6?1dTGMDULa6LkXUD$neDN-;L%0EFRiVA1@QtfF!p&D!$w5zSPB|4&ZQtX*jihC
z`uAped~q3$g$tc<S6$sKA6Pz&g>G&A1Q!cJRu_7-xLI~D;(m|-uRGBKmzm*S+>mMN
z7uW+{x%BNk6mhBGO-HqndQhM=aYN8%)mU%nW_~Lf86F3?bPF|!6l7oCEqET(XWY%2
zZB9Lk#PTrvNDS}XFC~Wk6HUd@;3Ef7GI@W)%<AJkw8-8ShpSRk+*F>A-6?&Ij)2g%
zzN{B6H~<ljwsz!jV$)IgGkB%77P7^*<u1E96^nn@t=s>fgL&zMcg_=?RQ#UugwILN
z!B}X*dw6|w5sd?nhq11~0p96mb`2_$M%i>37O7;tlz$=jaMsBr&g2?HDOY$7Z>L*F
z`VrGTjtQoli$Qf_ZDMV<hlk3-8#iWXiuncHVyKrec1L)6xX)Y4;BMlA#;t6>;-*9Q
z_NFtXQX^nw?8Y$&PbwI&n(c>E4#ie{J$(-kj@<+i$`6Ym1;~v=P$bHQZ^`2FbgI0K
z%|XPREw-?yYBm*dtc~ymA44r@5lrBL+ejxwZtD6`Zf41=sCAh*s9+NTZqO4GkddzV
zB$pgHsKm8pxkT?sZuBhC&2mW27k*Dg(tYCNUbH7;TnNRUOn8jce+%WyT!g3+QX{B!
z^Ny*Sv`)BcGm|7$60m%z<19+^z<QNtSi}_gZi9AB%3Qc3iz`Q4rMakc5L~UY_<WjD
z=m6WcOUYyq3;7VQAL;j5qnEmXR&=HRrMKk7OI^bqfI89`X<8W%(Go5f{Ffe~QjDX2
zq*2g=WIUn)S2j4J@lSPByN?o(q?YBFcEyqdseEjFvEa()heYBL3^zIM)a_ZTZHrw7
zesb2cUc9iF9!X6VyYU2^!j?X!Bb#mI;WyWvcH3z`$20gk&o|mHSd!wg$P|7PEGcCt
za%D+Lsnkm`A8qRQazMK2$kF+?o|QDe`})nD|L0!tR%Kkf{<m`e$Mdyz6aV*Ke$D*9
zng2KQ|7QN*%>SGD|5uy;>)hrD*UI65nOuKMBtT&lYVu!3EdFK)0GC|q`TrhH;IjGt
z6!#&<Z~>OoSJPh}UIbuPLH>aUliN%Wh15fy8QLlC_Ml;43$1fDJ=TR9^JFCHyJ~uk
zR~71+rIW-z4?2*={YjpTLIn1}p>4@{7@JP8wIsJ>defx*2IK!`50)unMxNn4E&{92
z`XJv;fvHOo`Lo_b){8m0ao-QUlR@CjcfLS(G%M#BE%=G$>zrZrHpfJ2^8YmtO+mSp
zaFipASi(`UV9sCDzzUo|IwfK#>IyON=SdK{iJlEdfv6|TP@Pm%7m?DS4=T#XGE6cE
zOe+?68iZ>m`3yS>+*rp{n#~@zYlXcuPEF28SKSnA52aM}bT)CV7^MQXp`V3k?w8Y*
z3RPhn9|t~0P#5g?luphFVQl9{w!))sfJ6}#bSA)s*I-X|RRry=R1Y7zY{4Bx?gh~Q
zd|o>1*A^_hMnwjpm~b4g!fQR|3ZV%Nqvm3)Y(n(3yd+ESVpqa@Mb1P<5~ac<1~^R<
z7X?kyn$4r?pmriYw+AdqRzTm0q#XZNEhMhqgbdenaPuyG*Cod(MQy4S4qYP+lVZ15
z&cSBKdQ&`)a%eX9I>aG0=Ys16k=KQKM1sx0f@kyi?O|i=Az0&Y02_ZkYD^~i8q7HN
zzskqT^!W6j*nw;ig?xmLRe9*SX>u?3r))o^QCYtCQUD)HJRm@=s9-({qk9t^8%Br?
zhW&Lh>>M#{5bW>bHy8iS=3lof;~M-IkNYX(zn!&a{nx$x8vM7xe;fR_!G9b4x50n^
zHu$eXTQkge{(7-y2^iPm=*=ZyZuNCN6f9SLMTIqA%E-3TiOwrmia|aW3B)%j)t=MG
ze-N=FS`o+7c)(ucgq6X-iVxk-LwRw?`4s;`pR&Z><2+a|6kB39UN)vF%tVp2M0~CQ
z8^SAS(q4t@i1@YywZW%PGMGE!Be01PK?Ww!lGD#-_wIm4i4-}Jb3>3q4f?`{9Et!A
z0~tKP#Zx!9f)QAsvoKFQ6beKsVHxfqqSFepW+!y4w!kGe2d7s!5h+6ih9(MKJOBfj
zOv~Q_U{*W_(aRgL)F3Aj)NnbbX*%dy8TS!WaI2v^CVF_%LcIc;$V~}d!S=<I5->C5
z(-T~U@5Baph{5~oB~UlUf<Y1u8KpsV*6kIiV4#CRAmUG88l?n8Y@-lV?a4|i*%FFG
z_#}R65oHC{4Zk19hB7Ur@&dS2xKtFlQWvs=DO9`pfdNFu2(?qY1+k6FB+7_5WJd84
zJ&l7IeMNr~0?k~4`wKo_`UOa9d-=&^`H5e^uw=|k%qZ)fn<@g<%=`)Xswc4x9NZAV
zZZN>l!T`}^UIPJ=aW=p;vpJSnT{GWofoWcJgUo#`WG=&U8ep#Z<-fW3Up^1JRT<ae
ze=E-``#;y#n)AQ!<=5bU4gPnh_@A1qn@CzVegAJk0#$`d;GcThAb<@5*dT!a1uH<m
z2Otn<d{A0Qk=b*jg0$-li$(`?>xLLo$UQ#C>(*ObyG2W#f>Fp~&M@?K0DOoFSfb~6
z?i9}sBsU9>);^-MjUDq_3Oz>7?badAtP%JUONM`90;g2KYn<XbG)@be2*Mz2Vv|pD
z$(y?An!35^K(Zy)Lhvq5$GF-n#wsbzjF&P5Wl64PfPZ7DBan`vj%h%1>&Rp-o5QCQ
zhQaSIU6^{0gA4c@!6!sc5hH+U6`P?S<BEQ?6u7z$gD=j8?jP7J3E@LGbo@WlBOMxz
zq^sCBHAg!We6Jmf)|G7rYGtSrymgIbzb=dn;Xg!!Vjf<I@kOA~QOSARZtVg65|u2!
z3^-?^FxaTN(ryyD7dmZ>^={p$;yQXL+L$b$T{br^RzCNNm>~CzS^zWQB4`heAdn_d
z98CdrP*f0wp1Q+B>>-s3z<3Kf;fUKIPaIW;*qn_GDVQF1S`5BF;<H*YbJLih>Z)aZ
zOsxF<YTKE(k<)?s*@sdCQLE<I8YORcoKRd~^0m6;E2ZQs9p_^@u1%iF0CL$Y))xJf
zTSNoT%4(O5A~0EHB$0pjFj@eax&jLqn93;#z}$7iU@X`PAs!sheQ-yD9iw4|e$U7V
zq5*PMdNaWc12D5rH{jqYnbx(Bi;TA_WtVu}4*jh5Y{!ivK61x(`jCyBkcr~xNsH?k
z`>7ZtIxGO9bkU?{KL7{?MnAZCyJZXof^i}U*;_t5TJ9fjzga%{Y5VZ!{y%Fh5pk0U
zY2f=jrNy2=v;a>VDiTa+u`$RyexxebV0jYD%e^Lnd20yfJ#$u8oz*sidFyK%>zxM7
zYkoKQ&Bg!B;mIw^xCa00tUOz-#D80F&i}iYUxWWO_+PXBuUY@spnnbe*PwrQgZ}AH
zASF1bxQg+Xi~q{RYv;eSA*l_<$CcGo2)qnIPnqkv{sNclu%MsEEjj~`M_xdo;}9)_
zVUqw~GD;^lJIqbknV#FQNPGfUgJ<T56rr}n*lU>0DqB!0`60P%!xK~R*F&|r3m4?Q
zK741h`a0377Fw*Mm*5z+tVN0NsB(Eef%f*XBTqg=fvYw?f<)@T1Dd-(^|Z<JgOO0n
z_!eOXo4U~N3awC>zLs&VfabdyNKhC&jlxs{qjJ0*JEN&qx!1=Ba>iT`LRbT&;YzpS
z*4U|DCN==VxU^8PA{^L)?wn`>6WTYMGCzoTfQ_4i)rY>$j?n9ZwK{{g9P<&X0B*p`
zI2eOlAQaUdxWSdk(UEOXTunW2u{n$KGC@RNqNEqXQ;G+ghz}%yY77Beh8R$wxCI#!
z!W*=OxN;2jGYCBqMF^MR^2B(`W0%ldxJ9gkmJ$LJk*sC#N6p$tDl>><0SYc~Ijfdt
zh#S)RRWMSVhR`kYssQOF=DD#j>w@cIX&omXIny%7T!gC_t1%JDCWy!@cuU~?BT7&q
zLK7}G71Oavxzb^G0s|u9aO_MGA`8rg0ns!HFf-I2+n7d3Koz=X2xNtq65do@j!IID
zrvgu%G=Z;eHV8ng{-3=sfrs+@{vT2?T4<4|JftFH-zha1jAce+iwa{5Mq`GVu_f^-
zl~7uwluF4*qD4i~MoEj(BBfH=q=-t1i2nC^W-*r3=llJ9KfnL)`}4fM-#%vMdG0;;
z+;h)8=lz^}4wFNrko&=&{lG5rU=WrN#5M4D3|bg$`zhcBVTGC*NI63|29!k$Lqv?P
z9(XI40`r6|fX-N&+`(B0I5!(+qA3io=&8dPOTYEg%MVAvq`<Ll@QVosAczV_wgyvK
zK|qXz%sdvb*=QX2b$~#4fq=4^+$dETje~Otz~{6Dx+fT3KS<b|K##-Aoh=mZIpjP7
zRmp@$OGc~km8}!6Azs8Bca3paU=h=S+roRb!oLYwIX~0l7&Ib>z-j{m4Btqn1q~KX
zjDa0Eo_awnd3Z&`yaJ;G{|#dLa$_$s@M{vF-hm_phr+rG{>m2)w5Iul(!k$r<XdF^
zfHY|WDGuX?x(o9Qd0W7zAI5Zjd2_*`vCw25$JxjvQ2PxPEH&<HF?b=uF{xmq34-B%
z-g;K2!vhTs1OtJ?65(0qr$k_**;IeP3J!9Zo#8tOyG(@O<H1%dg$CRpIIxyO9w<C;
z%xw^|XCpl4t9#x{EDqC`%tnJz^<@NL5H*PV>IlyK>d!#<43uSGCJE!(PDCqbH!KO)
z8!T%@BoS~HcuOKreh5Se=j4n9pK%V*A{QL|3Ga#{@xwu#z}MDT5|-eM$2vilIP@YH
ztUb7o1Ucg!i5LjC*wKDAp4+$u-Wl9Obb;^={l3INc!Gt!3tZ!k+oV0-0enB(g2z=X
zmoY>P8Z;o>9b`dtz>zHQSbMz3Ah$zUOB^6*zz;yHxHy2vopB@wJOLgZ(cBgX21Z2V
zfT1I}4NtHl4SZSy=7j~GWZ^<^a-NMvgoOZTfUx$~E)H0T=mcS1oQWhHGFYM$(h&jq
z0u8#dAUe8}@YXiYV5FqpzAT6YC%h$&1gLR>z^#tp^K2}aNv=4&6XZxFff>N!oe=ht
zaCle1FT6!BeMD|kI42C+5=$U*dv|drVFm4B&GGhlOTZMsakx1L9G=MKA_3gy3>enu
zL4*){tOcG(K&T?Rpm8wUEQlo1Y+UcS!Ju56i12>|0@d5~AoM{%svK}m4n&P%$iENd
zFAT*Zpua8;^w-hU(So#%;0Rt_{bA65`1)(t(D?rVB=BGAV`%(e$52ndAO5cce;CI9
z|A}jZBf)wsS`J>+WAQeYB=Fx@`2XUf;9vWtU(-=2jl*DLaE^G~9339vf_vOys@qV=
zF^49TY}UpqE>uyPj$Megr0+YV7Oy6g*Y&Qa)<3c3bn(&R*u{&TlivDZ6P&T$iu>2?
z5;Hd!e<wjRY)jSEy|`d@d&C)aLq)~+?af`UUli4v`d8lUsyz4kD>j|oG5*Vp=g(%8
z{0QwBFS254k43EKx*t**J6<dhdrLi&BT-`f!%OqvQ%f<aGjATQ?#%wN9cufEdi)1_
zlhg#8tFn?wGvjJco$e}kc(r>fBVl@mw*pG5+$u9aD=X{5g`TSlF)7qXN3&W>w_sJH
z;z_ou)Fkcl6wR~YB{yVcU!~~SUdcVvJcoF;aqaYsJVvE4WsIV-+03|`exJ)X%71Qc
zJ$LTh%IIi2TU(No)8)&Tw_B%BH|1~3nz;%mE^R(7hP17y;t7r;iaK#qO4M8n<@T(?
zI6GxTu(=e9B-bt{QYJ1-5vAUUE!%<qv+NR9Jm~SMoQw?b>sx1uh=}~?e0Z_-^XJ5b
zgiDt%Pj9#w-SxG#m1UcA#piB-Uh=%w_)>50Byy6xyu7ZiZuj@^onPKfoHXfmLqm4e
zyZfdKBlqmm+G9RnF<vT8N+<1gLc*VK{3Ok<)p<>s@G|qR6iVvJYN>;(j!zMX{+#1@
zEXjiWB{Vd&;r71v_I9GJty0{n!ooMNUt^Y@(V90eowVZW^zf9Fl-I9c*RE(f(kP)~
zS>4pu)6*kMIq!MQv(@k9w@Yg!{Z2lj8yM>AZ=5lIMd|91fk|qViE5W8%GG$@FmBiy
zw|lqxg73jST_4!Qy?KZ7=!G7tsJEP5AA{?(DM~G8H6!2LTzn+e@rIOW($luOHDZni
zQFy#W`QjJKs95dF8#f*ohvx3s;fBLqxu4_Ia5Jsy{{1pzK(5<f2RpkbXF@1;c8RA?
zpPt^dQ`djfEBTRLXf)d6!b;<YTDpOoo15L%gXOK2drXgcp5K+4Dl>Iz&cmi^wM>im
zBT(f5w|3>#{a6(f8L5vF-HZ}Pi9Yu`nRWbQAesEl&1*W*CO)F8nHK(ZyNxR4=Jc@)
zF-eo)=L=n2suMLYsL1rZxV&Cp?p8kKs*JkFq=^&R?`!fm${RidoC5QRa`f_A;9Y{!
ze(>>QaBj7Sv$LM>H7Wh^i)4;<(j7H@KVh@0#!fSGG?u+W?Cxwk%XxRNv#m+m{L`mT
zpBru)%8m)ko8Y|CVr52(^y=lymnf_Vcy)A{zx2HcFUOVy`OiZ^s5q(e#g~m=*Sp-@
z)Ai_8a$WI?Hq6F#TII{`W{j4|I7few=kDO(fWFY!*!Z>OscCpi?arOD<%>N$9+$2e
z-Tt92ru}Jnd(*=Y?;oAKyl$*h*_gyDtataa6fM@(w5giaOurJAjz+!Tq)-_d7}yvu
zJ=4R(gT-b`N=j~@VL9UL#0o1qL0m(Vxy!8kb8YPeeCz&{MYbaE^RFAnTgXz>%O4jk
z{}Ebm+nuUDUT%!s6I972vH7#s&6Qk3l9QE{m6I!`R-_geo1k`Tkyn>`OSR6*a$d=P
zStgNNZ2}fVUS1x%p;F>PNXN$)85tQ{w@%0peIMMMz=S4yCtX<+s2Z>Rrnz}O>-Dv+
zmb1j{Dplg-DO0?PSR*O)@Oj=z9!rjd*PS;rJng)7B{hvzIX(Z_3{i@GYLV5ei~hu~
zGn46)PQ6GUQB#rqy8Ysh=+l{=kIrRy9NcXXboj`T=_Z^*gzV)30oQKdRxl0A+Zhxb
z{PEMPtLicpJGCjk?$1uqoK~&sd3HWZLQ&Vha^8wB0fB*sOYXM?EJ?7;NOC&j0>zD+
zF|VWTq1VF)57w<;9~BjqxKFG-;?tEqU@6#Ue%elT58gelZWJm>8-LH=-%Dc5m+88G
zsH|y}uF$GmV#l2V9A;Mmp|!BE7(2=$BBJBLktLa#nO$F-<z;0%KHpxje*Jndb;MLE
zeydSKRC^0}+MdN?+1jEh7)8Ywm8Ks~Eyi5kG+loFic_WDX9%LPwu>B@P`!n@xjCKw
zK26s@?0wDM2M<zr?o`=%`)+2I-42G8jkRh!sx3@h1jYIuaouA4(+N@;Qzp6HKG5a9
z`9z+^(leXW($cnU$zT3Z0~Nnv!&GgbvNyMOPo*d-D&q0@uJ#Y3pU6x#TiNlvbd9=9
z;v>2S1~bhx>^<Napz-T_2{gK~Dw{~$xn`1%ihoB2cFo?XmZG(iQyv>=qe>DcuQxvJ
zoiu%_&3fkZ^odH<4-E3$*`la8m8^9w{#c*c@7}$eI(4d<nc1i{ifU@P#C>Mc($XVF
zjj1`!R46wxF?n1EB)a9Pwzf7<nbf3roZ|f!>*dCbvV8}Xc6;*^x5bM)s)!4;%V$J9
z7tz$ze2ZV6JpIX-@#B+|lN+Xqmu}zgP_g5KR+^Z0u~zI?>%hRrsT$K~;cFO5PiK!*
zWl5U9{rKYY+O=yn&wtr^?3gBsUUwn-Rr$vK`}c3zvPIYLW=%c?JQV2c><lJ?N~O~2
zdBvmm5Zb>~5gXpTk=s~~-!>bE!{yv2X6qeqZaO;NGw6j>wjN6STlcjs_tvemN*cQ<
z@wD#FyRTm_y>&fjh5;r{n|vr>J;NIt=3$0fTFg;ZR4je?&@Gi(UX$m3a_iQu7dji&
zwq4g-^}XXlbk{1doKYX2uNe<3pkVdoZ_=0R?E=bMV&d$wva*^-!INI?!06^~Pgvmo
z=Lvh4AI%47H(TPQZtpdAk|@!-aP*e7xajfMuboZDy(t#Y*qV}dA{bTj@ZsqT7iKss
z-Dy5u=ecBw+D9|yvvVCC5h$q>f9gcG$@v>dEx4hxjat4_s#=7C!7t8KB>Yg8pd?98
zxG9zAdic(WdAf;*H_FVKwQ==!uki<@%u#u#PTdVbE%V0)=I@dsd3s(5dQuqm;k+RP
zdDk2#0}1=~?ORAl$O#N3sk^&-^tfp|_w0!VS^(%-D;%y!?oh&Q$aZS^LUGsBKd&qA
zNHs{^t}io1{+MUbkt0DtK?NR|NvKmEK3V~*SC8rLj2tifTwz9wyz~oytpKS&|Ff6O
zj?`$*KUJD$&srZePwZrx$*M<V{ZWbs&z$K18%$(m<Z_@mPxxL3@<}3*E_A$1^xqd<
z=yh=wD)_~vwXw0WTV`6fJUhQcylqoC+1gIiTvn0O7Fe-mX4cfHv#uuZsBd_fy2Ef$
zpvdNB70TiZl`Q4u8s(=<F$#3<I1@6WJZXdYxUZ#Wo*peRZZC6|Ks|f5t3@ex$Bu1B
zk0zonecuhn|0;RGCOQ4UH#Y$@(sEsotZ2;1Zn^lQr(pTRp0;B#VB4c40Rfx;<&K5L
zx-pN=M}-4^EnS*^p!3Q88Lz_Zm?8NgO%KjF?ADkz-{bN9`(g`4;yWyC*5p5!{4#}o
z;MA$3r@k~^h%Q2vUA=0kuD-IRwycOfQEBFgvUktReUhYJri(0ec8<OEvMyAkOm=k1
zqD3Olp^DHwXE$IC4Gk~0Jy-&EC<U{XMh&&TI?+Af8mg<SF9OPd2G|EE-m@o2OV%oR
z#&iV*FDIvytoj>3yR2KgR^p{<*TR4evNLnHx74~H_q%m{->SJ<X}d(UVn<PwlHBLM
za=Qv`5=oM#q-&$SM|zv=X}_PdCKWSPd%0`6tDWpCb4-Y@?TMSp5+9x|)1s7T%Qh8b
zMoQ4}6K-6OG%+)?u|Fp-4w)2l-jP<U=!Cau-x>I=7@3M2+tq-%v@hbN1bH=s!T9>=
z6D=U11FTCRToE76xA*v%TgH<{q2itw8Z2MYnb!Wyl=Z?~6@_{$u86vH_5N7soO22Z
zrHd-NvR2c}?9CQy#;30j=2B4A3@NMlb)%}Dm#WR3yGu%GnZ@Mtcx|@F<C0A4eVi{>
zLp`KV>KdR*fFe4OnYm{5>asub?gns7o)&?<ZSQ=wyq#*Uc}Bs{OYUY`uOBm2hxu&Y
z$hJ#iD)^o33yi1lx>~vn=6BmTIH;AcAm6V~56$dRGZ9-D7a(=-{sXzw%mwZBI~t-_
zo>Eoazcr5PUW1K!gic{;YC0@h)SXXR8~3*C)t+ee@}2A|<|^IDFK@-I*^Uiiu|9@w
z5r*X*FoV?9qhG9@@@2*RtQ090FkgVBx$U~Mr)SS4NzMBYAMQv^UAJ!CsF5R83EtGZ
zRNqMp+G{KG^6bR%vQ1+9-WlYby&`EIuPxb-x`eUeTUVVwAzd~r$#xN>Wi@hS=;igt
z0vR%28whD@jLLUvH)UY|$R^BhZpsa<71?uVL`p%jHe>nnii!#~4Gq5}b+EliwYHr7
z;9104E9Ijn*Z%&|#0e8vx97J5O1z3WIY8qBabI+Nd^5wP_QC80-Cw?bdbObPMzMXo
zp}B|cyRoHaD5%^hYm(vyseQWs33D7gPIBHQtE<bHKR&%$O4>K=O8KY@J)M(cT{r&e
z6gctpevh6CFTc*tLfzt{3YXANjAMGfuNx~bOF4l7JNE58rocOS0oZh{qC#@a7(Ka-
zV3{SGbsoZ0FfVq09Wj2MR=^#|J$3sU=hQSSi%m1smz@fDbtN$?E+RzZ{fG0DYi5Rx
zaC|&r;>1G6)9;^NjYdb>k6HYFP1J{{AD@QL(UV({yM4v+@kZu0TaQ;i?r5zz4O(qZ
zDa@@}HYe67ba`OlvzQ;<*SF0{R#<Q$KVN(1ObXa?!fQjW-b~X?OiZk}aU<^TSX3eX
z5y{#4%lnhJSKl~tLw1MqxxniD`ij$}8{&5t-7qOS78N%N6)$C<Gga|RrRhnp2r?$i
zUVM=#PDb*4!``t^3ioVP_PX-9o?g?uOvKT4$-WhV_eLw+3|rexkXm>*!Z7Huvx`ds
zSX5U+feBdzl#qtUDHVPF$*9V7V>VDyg@uL1#l^GiQsXbXhXjr&ITq9XYR<lC%4H?S
zEnvYo?my!z7IRg0W|?YG^q0FK%OBL@Y|btqjoHiYxuF*IEINDv%GzemCba(TNux1Y
zDeP@lnK4aAO!vmDN-DXa_VnyTdxv>+J-M}~ZKPsJCY-l-z)mp3Y~^B_mFmX$_=q=Y
z{*&G(Vow!ZXTQn&@p@Yfe(U%w!=25+D5+2LP^c24>~ts8Che`tN_o?hv~96lSDO8p
zM|pGe%b&9)6&Jf-Out;$6V|ogf=JjYb=!D*y`QZ^dc^^?$|EU-*IByd0ng6eugc!H
zs^^>b>g`4OD>=JHPB&W_QIV<+3;`0DkhR<GGVi{Ba{2?<Jv7gKT<uZfMp!9L^48n+
z=H|E7JNpy2zMffOxV2e)FN9g=hZ>jB_SGOF5}(rg=j@Z!fufs5^kkRsk0vYPFP*4O
zPc;bW`ihJ0k}I23wqlC-ts8THyjU-pmNpBAYqRx!0G80iIaas!?VF@f=N7Po;Bro5
zLP=rjJ8Ok#XP{~$KKabL-*CSD8IX>%pDRr#uTiNPlkQXI;E<Z8`;h7<W3%-%rb@o(
zW6<S*>VPj!f0o_ay#s7aizCkL+p%LE>A@ZE8@G>vp|pnA)yqsunW?OJkeVbKt1Ru#
zn5sW_MSF|&2+=P-N~jDO7in`>wV>tOq(wC~H#XZH_gL$Y^-AScrS!rt)ejyNk}t1&
z|NcF&JB}Ye{{B7P{Mrd>g=PA-70rp`UDbBaH;ul%cPYNL=ta#{lukqIrL{AAKCZ`a
z*nr(6yXa#_cY8xj*OU2c*G`U$*r4lr$NN%T$Fj3C?!JqcT3_PFn4r8!W&cXNc)6@m
zyULqN36cB7M<3fW*VlpzxD7yKUAuNI$0<AExqdyh@c1->xaX<2U0=Rr8qVmFrIcet
zMAqFlTcXAEJP<6QGS8AW=fWJZ#E;wj_de=*mz@?Tt1?o4?5+=InXec8C~{Q4885DY
z^K$C65O;BLseki^uv6;~se3QR1^bK*{c=0!?%@v9sPQwVO`Mon9az18Ut`Q#?WT=}
z<G!H3N?%HHzkKO?Sj$TK+dDn3YLi*#Pk6h09vOGs(UD_vBCNUg(4pA6ZpP^HQRNF$
zbCkc)Yl7!#9R0AbN6*FnhQ>YTclOVLHxdLyjZ7v>NJva?LCq<IJ|*1^xLH{_ZrnIm
z(Vf+sOp@|36)``$>Le6_F??J%Xl_kiVe`wav*fiOJQ)*c*m8fQx0%^4z&|^@M7~E(
z@U}lr#%t7Hyd*oPg5LW2?HfO1UEO_BWI2(f(9z?TPBXx)ytcW=d}DZX#+&HQFFCon
zreKi+8~#3rg|4AZK{=90Tlenm0WQY0`74|w3QA_LNEnq(+-D%S@lx%dH*Xb6ol$;~
zknkqU&QJuZG+l09<XIvsviMm{%-48nvW(<p#aAuT`^8G7S5KudFV3fY?=Z4`VyTC2
zKtc1{?!S5Ilc`KL{5s)N!n>+$H&<6bDiv#;#?UyjzqGVeRaLd1pkTp|?`&6B8AWAf
zWy|I(-Ho}&fT0Ey_n$QnCq0f&``+j#pFBfdxh!~1eRPsG<xf?o37~hGtee^s4qC{?
zXR4{@)IBc9HkuL=oGz7<laqh^PDjaz%W>h4T~4R76%_V$c6L5~{P^{2--4#=GeuSM
z%CBC9w>aSBXv=K`PMGPc??$LEAL_hvtM{5kcY=jK-mD|T^O)O4Pn+(gTR%SZ+SgUJ
zZ<SJ6;ywAiCiKd?F1alUiA`#b?;>rsTryX!-?Bx-|F-M0Gmcg^XM@tEn%7EZ-Mx#w
zyng+n8+)eDxme~>R$e}Cs!rJ^L!-#dC{>$xM+*yG?<~x&db+Bs`D(I4aza8e@O!84
zSYUo=e`(6D&eHmdHgQ_9uf+!w?=ea46DO{@y?5E4cR83iqmlb9@DqAotgrp{xk~$i
zZh6qrmBvb!e%#NYVzHh{Aul-Wg!$I@Ocah+xp?m$<LbM&q@-k|q|EpBm>=Q5@dutK
z*okHn(ho5(&s4@e34dnH`No>8_*gzE`bos=>)SH*<qj;~e)dkXlp*tcsQ1EH1&VVX
zz0z3m@x6Pw;2SA=$hxpIVJY3!iY0_m?>(iRMmNR=8Q#BtAGk_mrkmWa{0MzXIdEWI
zN{WkBW|kXCO9Goxc+{O;_wq`PQd;hEF~>rJ$KyFylcy|en)v3~v)6$1)mMxeqNeY2
zs_zlxU)^6MncyKcY0|-T_245PN1)VPry0oY7T<DoPEtk%bYRQqabMh$FD{4voGATb
zbjf|mT~hb%-D`aomG&G{<Jx9qAwGHX<e-}4*n?Q3k;yVS9t!2MiCVh)*%K?gwg$Vq
zziQaGPxMY(>K^xlgtu)<n(s}{ilVe+^&TEoeqmo7{jEOjz=2WtONBQj8zB6>4HM_s
z+S!$^o!7Vtm0(W`Psynwyifg69GczOBrm>Yh0?CtiBcl-WD>_*tm!-^X+QfBc~(K<
z!F|!GBaa&Xu{c8-xgI@wbhPuswB2D7(=qrOpZ#8|B1bK}y!cq;8B47-@t5M7>^4tn
z0JP0S6`BT2rJx?SHQg>Oa9_Lk#TVSmijIyBV4<%`eBHW9!rNfCy!_MK*-zEJe7?Q5
z;kKL7!R90Nn#V_=<`7+%5~n0AT(snghoj@@h41~!jJ@-UI5|Miiypte>Ztd}=cTT>
z1^f4xzB{HNkrBK%Jw1K=g70^Z`mM2`pkkR9Z;i@OsyI1kQLRV|>R@-5rfzv{p2O|V
zKW19n1}@(yYqu#{{L#lJO!m^YjE@cR@$vN)I}*S9TfdDMy|jpR1-P;YLy7`t;?Lw<
zKNr=W^{jpYszlb>hTXFC+aDv`N{*zwMAKVGqDng3{DYLF!dFVihTYzKsk74{WYSqt
z^Y~Klw+XUyJ$7v0j<d2_?Jzlb+R>e_KfR)6Wrd2<R-8SRyi<9y&jDHchV!fJw|-31
z-Ch^HW5n}$hRN)b#fJ|E8nF&eq7z0M&R45Bx%`2M$gbVHfkkC$ba8p;2$c7SXXdDH
zCc60I5mJ<CikBZ8c~rM@o4V+@J&#AFJ6PtIqEP2L8yUIPuV)()9ansKX2*~cABRs1
zyCWjGm1=Bk?0#P@q&jio3O~OMugKMQkW$z|YDM9jhKGTAWr10NO{t&#={2W4(v)8q
z*3COkvECHrq|q=fcADAJ15hbW-aDzjzJ5cVB2fYgo-QTz@s7p#4Rgn7c%o!8fxViZ
z9*AmxxnML3f9d7;S4|0L!X+;q##G<eyOp-hb18k2o@4r{aY_zdG1Rn0HwrvXtZ4i6
zqy0x1nI61P7BlX9ZSAhcMwz57yK`p78PIDs@7^srE`8eB=JT&kM814@=~8j7+isCs
zvEb8DIle{i-?jbnuM~e3A1h0dZPM_}n_<|p&0>ARTB23P;<rad<K&+PW?kA4r@f-B
zdVWP}P}yR&bRwf+ocN1%>rz**_6Ux?C%)S<ARr(#RR56AWHB3!;;@z-;U?lJqnHb$
zN^Ij_dnj3<^tA3YyjXu#yZrpQgP?I;9duOd9Y!|RJuT$kL4D$U{g#4<3`vPk`Bjb5
zfpul#`}f6M_}*G^mbe$=Jg;?n0$X;b?U9Dt50m5#?{r&=ju^4$uxO=3hMWTHL-p(C
z$ed8rO@|rdfpaD^;pOL^F5M%phwpAa{mdj~%NFZ+g6zhqO{2tVMh$9iEkC}0-uC&;
z*u93DAsrt#KlfJHvq`Ib_iptanugz-yxcDIm~_?To1>tzC!d2|wCnA5G?uiDld6k~
zjGR1al9A87r{hquBSwz{3f#)lvS!wU8hy37fghF2;y-_#<h5}f$L*QjdX<;yA)CZM
zF#>h6vlZ~f1&8lOv^6yZY1t%wS~rRv9jzNXHP$<C{Z~<qy(zC8Hzy_}$d#-ub$2ga
zGkUy?b&fU029?FRy?4H+rzg-AM>nf^y174k|6+xrm>nr<=bN#LsQ5n?*@|c>dMdHc
zoICfduv{9oMOh(4mSYgHFfQKN)nJYMzA5GDpRZlBnPu$u^u!3!w{0t=6Pk2RNh_ib
z9WyjuoX0S5Jb=d0a=m6(8Xv0hb~}u{|8O@7byh0ieyMX<{h5;UGoZuFzyc4$pt$c(
zYU%HqQ8C0VR14d)R~*C&HY^xP*&9A*v7=ogPI+R)gC4oy(<3l4c6N4&l(7U;@1!M1
z=7(?Y(TON6EqS9CzFi?CNcT<g*!?MN0?zC>>B~kbC7q)Ao}_Dm)T9u%2vXDKMyA-A
zCnBTPym+x*VVs17NN~dwr<>UMIiuJpW%E{QQQAG%Sy`9dbss&*yY*mQuAKOv_TWqQ
zNzY?r$BvDU7at?>$x!xG`V#od$2pA)TgGB*T~$9c9lHn&m#}!&oOKCuW}7Tej!4=v
z;ro3HJ*iJnetx$?v>q<iJv#cyjqO*bZ4?t%tUPjg9j-Rq>jdUxYioJ(0<-;rmqjd}
zg)I*VxD(Uuc4K;YS^1T=w)ThQB+H`<vDl|am+dg?!sMPfF^)3c;>MW??QauM;`>um
zQ=PI24*SfeADutK#IdZb=!L8FD{;jmsb3C_M^P+urcIgB@uZG`iUk{Eb#Ah$oIma)
z`SNP7sAdC{5&O^9SINn_TJch%<@R<vHpMjTnQCU{aTfpW+q+AbR?Z<Lb>3n!qQ8G~
zsEdgiML8cOCw{rW)y`y6qfrBp8C&Tpuk!bYy`H2Te`+|cyKsE>C?oQuq{K-QhE9_e
zj=FrZtS3}`zD?|Sn`zp%0>2o)WXTa6ZtS;j1(PQ`yo3rCAKJICWjC|sY;z$tDQ*69
zT<vY*dS`qvq0}coxUxEbk0=;X?aItu>WxnxqDrEQSDiaiab;=~dex(+6I^4i@6^{h
z@k8N<(ONb^Jdmz;v8VIGMtSz~Ko8Y=lj$2awS0bmGIIxJDmmZrNb0%P8$m$m6S9|G
zlteA|&UiL9LG0A2Q{G9_aW}^KonSmQk)F`#aeEX>e0=*^36jH8k#g~p6<y8wW@g2O
z22&L|Kf3FVF8$_&!>xIQsn7|cX*aw{o&TxK?Zd?w%iLKgEg#FB$BredV=Bjf{207o
z<YdBKanz?zpX_#MR0q6Qd%*D?t1q_^7zocVVGgGk7w*zHzwyl`Xx6MrsB`D^fWiE%
zNY{F+D1G}rY1C}X(HTD)77!E5SFJKpP*9IG4Vy#99vHW=VxCQ$QNyS;ibh5?pWJq=
zh<$rB=0}e?i*-z5&g`!vA;ZHr7P`gehxtd_C5}Xmn?6@mYQ@5?^2vUSP_>WeMqSvA
zQ_LtUgWObDNzJF0KPQcuJYGypEPkiV!*%1tP!bZ@!u0mtoGHPTB6@YJq8gtti71r0
zoH++IZU5J;*mT`WYV4ashs5OZCVM3*V;1_)j6Iv$_+2S^lJ;E{J-ta3d)3hMBTy)%
znIpjeP$s@R&WkHadmg*n@wRQ1I87xe^OQ^K5?NglEibQVI{o8BqW!Y-of^a_OVq-d
zO5YD;cEv6~ri{`mmy?$tDc5XN^tw1)40Zkb^_O8I4drCA?6bG68$VtZlUKHwo%#Oe
zGLcGbDiv&<_4TGJBWl%8i_K9M!&#5EwCor;x=U<iB(1<Q#3Hn2x1%YEWNvwVPPUlT
zvg(HqV?LISwoAoGNJ^e;I=5z5NSqW|lC?Ymh1#j7+Sv7h*k-WqDau-$&1m~{_x$(P
z`&ShdX3S{G_7hKNad)YnFzNLy{NDFeu@bO6M5iciJ`tFE_^?Wrl0n7H^-0rfmK9J8
z#p8@n_UW=4H~0KGe^lIdCCp7`L#6flam|`}hT{7R4VJsRJJD#bfUP}6^Fd3Um!+!d
z3XVjC_u~U8A^~%Vo7RPey|yK;K5*bbMg~+rLn>MP4tZ795%;K#$M##SadNUaal-cK
z*$YqGR(t#)DT<;x9v6g<pZ>VccWc`U)tQ+cm&Ygj`=zF&8h9M>LrtZ4C(WK?9eFKA
z_T-r9awaPyR8Bp_hddrLVxgz!-jC%*CNieuh^IY{_}|_eM5BdNkv?{xZLt;G{4`?S
zS;^Xi=R`i<ab%ul;_9F0Q!@Q4lTI!^<f+-+%v^sp`NzlHW1E&;SV}1%#p%UG;J1#C
z^_;Y#SzK(+@yfJqvD&Ox4`k?+l2{So@;s+w!@uh!UTJN6=q0)SM6Sx@yUpLft(kSb
z;@#63PemIIO}7_`7@=hB?v0Z~ac=GuN8Jg;M@CjD^c<I8xK)`MryTpW^^X(wB4?f-
zn*N7P)g8^nT4GBz#YaAEe-_2`@lk4MUfXDbMTI=Ewzt2zR&vVHO;=oZ>lzzJG~N$D
zCC(8^5LZOymC=g6oy@Vh80)Dybxc@G@>g4p?yfH4-f6E=R+g5Uy>wc%XqnTt$rQZh
za@DcQ8&He4Ztc9JiB6GkzB-Raat;jKN%^$lYm0N%;p!;|YQpP93dq+sD~=pF(lxhw
zWA&1c-B%K==Z*-jo73PL>*vl`WL~heJ4B<#<E*rEs(bKpVql<nEIxPE0ns>RX>+ZG
z6?U3WWq?E-#y`P2ZNse;m-tj2sNJx1Ys%Fv%F>Bh#ztp801fxF&@677q^Xw6r!-B^
zd7?|jyq{zR7nLp<P1-zxlpp!|P2v>Igr<Y(GYl_5X5ox`clN(%sC4np3k{u=*sbkT
z7VFg=SbXeQCGAeZ#zWp(HVb+pK3!Tn7nO6SMkSDeD)H*kVLv{V@aODI@#dH5tZ@~o
z4!|GzWJ^}iH$i=TbaFe&JO9qkoh7sE%2$3Y^(;S?r1+xh)wFx}e5$HGY)by1c0*Ts
zwRWn=&Ge?Az50qfy~{BY68qb0b;ah1e{i%*-n&cbK2bFG;>8~aaEU2W%iPqdX*9i#
zqK0w}&+lW+O;Ax=Qa*oeQ>vifNZCoN8dbC?GKKyw*KLW$Qk5;rAI_aSoRstuzwN*+
zKVx<E@2{_CyXF~f-R`1TLBEq>mIyrZo!a842geqe26@;A96I*WKq~)xRJ-R~l|vgh
zHZL!@H(9MkcD~8?-AvZu!@CMRbOIco*A{I!>3{VdhZG&X+f(yhn@#q%y{lGy@A{xX
zqvgwPoc&~}QTa~Nw@3b0(b=nW?H4P4q}N?|>aAtJcb@y6yQ{`F&bvM_Y~Q=X9#m+W
zT&7iY#MitUv1UCf^C!<s$;QSN88fSjri;vo{<1!_X;VOfnT*|&Yg<ONH+OAMPIje_
zJnMsxdk(h!Pv!Cp8tT>CTkq{PTV}knBe2v@+bSu|@Aixnp-nLxSl13TCM{lMOSpG^
z+hpJ~b)T-&m^Sas#YY%QlAc^^E!)&JuSWBR1{7y}T6y-@1(B?@QposLncD?=P*C*e
zTZSLbyxR2X)zz~~vDwvC)%nGZ%Z;ZS{^4r3s{QPBNtu=JJ{koE70j3yafN+an{u<x
z%gg=Im{@8WInOlY<&6~8eci7VKCc@q>1wI-%+sp&d&2^Sm0iu}6&3%OIyEc0^X=`u
zM~cJdH=Yiv*sD!>YOU~e^2E$qbQ$hG$HAcj*gDUm+r8})Lz*8u#dJLxlQlOX_{`%7
z@nC{iO!SG;=d5otmxR2~^{))j+qGq;_3EbQJ%ooz?3417INnJOH}Q3a>g%O&b6r-;
z76&Vcij>$c96|BJZ=Fp@+M}ncqocDhQ&C_4NH)QR{v<5_@L?-wchTbsk3>|yy|ht1
zc;I1EwnL))f>qv@aSG;#PMmmGli&LEtYl+Tla>JrNGQ8uc3r63fl_GucKztich^5R
zs7Y^?GEXXS*qz!@MNCeZ78zW=t>{R}=OxVZ+js5^a9fnACg!-=lSEoAMN*o)=faZr
z^`9G#ZIWvv+a=O3FEbrm?5#1`*X5*lrE!BFYF50HJvKMaUyT_e{y{o9v30}E*<xt3
zoLQDLFR`S}(|4zAUV%EY(Ixo&jOoU$uhmb-sZ=jqcI19%XJ=c}L(Rp<A!X&V$;CjW
z<sW@`%*$)pvhMGnZ>tfFL#HRQ+&^5{{q1GqZs#jEj$ZZ8S(Q2h%9^HJQ<$l4l>JI&
z>!uk@W`@0E8EwPMkeHs&>26+oyxq>+oIEzJ`;qEZ*ODsI$d{K-(W(v~K78Wj$z^L%
z8$RH+R8H}fHH`Y|=q{5V`tY5$RoFh&dZj1k-=2S(?={`**|UY;wgXFROZ|g)RiiI<
zHj0J3SmTs_c)Moy3g#3ERN)$2%H0WuuZmnXHXpE9)q4HhA0yVNv?-r?_2)>%a1V2f
zuJ5lD!qs#+_gWt7-m_pld3WzhRW|WhZtlb@<Ci{KYt(Sba<a^u-Fq)MW-1omOZ*Y0
zCuKyH&HVBuYV^1-Q?lZht!);M)6>^itzTrKH#d9}D*bawNs0g7NUNn{Z_1r+8&6R^
zFmbl!(PdHNW8G8QJ5C?KMybqfctbQRifX(syD0i@^yZ95bkBmo>g(I)l%Di{L^uxB
zUnwmuwT<1ftI4=<hcc$(%Zv5QZ%tkw4xDnRec8%1A2BXgSz^)S);GIP&WM@kqWqO}
ztuws&F}1*B+qP|`x@pI%FxRxJswzJoTqTMsTRTbfyk1LkOgfI1sJuUBwCDXz(e8|I
z%}oCbUmuI@XBU+w8L@yHHV&+~+w<FH$BZ&G(9q{(9p1_Mp76wfS(-{2IaW$Z?7B`=
zciV;^pBIE*XQ`DRIQZGYZp0?3*<!v$ZR2Bhc9+XLP1^Wy{%4Wcjq--$<P9*!#_r1)
zHS;;MGL|lqd~jq*cGbI<i$7M?M<2a!zC}$D|9Tto#NL&xnGHLo9Bvmej*jk<omhD!
zy~-uG#j}v^yuN1i_5&Wy&Xc6z>$%nE6Kk3d=Ng8+uX%Mf*`G?4Saz8vPkkHbox9!a
zQ(63U(^b{k$$Re^;3p8a@Ag%Tw_J5;@$O^C7)=kXcc{x#3rL1FZYNjWojrH%jk>zJ
z%ZFq{mMO+cv8GahLCk)0^U-m#1&x+Ny7Xl1SY?SNM>yq4*g1rG`hm`;FoqLF4c8}>
zXv@&Ejb~AxZ<u&-ukIYrYx5Y#KLkv5in>tjH9pu<jY4mIeH}Ql&rVP!&pZveu^4B3
z`|aD<q@=4}k@aD=N0QPc6bZ{)Yh~}x6pNE8$E0|qYVKR{`r6hrXD*n(5ka-rSc~f$
z7`VE*sr_iv+Vy(MO^$kw&HUAG-uNY6nIJ2B$Uv%S!7&x;fg3(nR-d*Jdv@+w7Pol@
zWkWuJdUe@?Mx3-w8r#X|Wl6HxE=u^0CF|uhQF$H(w%Jv{C78JPb2kG*ovB%4yVPsF
zp5u3Qzmw+zt3Me&tEs!=7?XJ|cx+?$_wQa&K`+_2H%iaYsPEJ|T^iebl0YQhzI{8U
z=UYS9mv>dF59-E>1>26eI{xVAz@tUiPaZz}ZBO{PnD3wR|C~KDR)#Xx{LWMIpUr-R
z%0IN#Vy`@T!o0q9(Xn$ngil@*l<wU!ExFJU+TGb^Y;1gc-e>!OfJ0TJaq|f%{dnp0
z1u<rZhT%Qmzj^D94huM0fA}n2ZSF3!9;4;AcICCU=Auv;legsTDZcXHy0UalOWl5y
z3`$%=!sDD#+x0ot>(+M_72SRCZl?%J(YL_k;`i2yCycY|fS=JZIL(O}hYr2HJbr;a
zfw1cB{`K>wZaYzXe{ldUpZ+BEBID`1?k>&Kg$5$1*ij2f!3SR#oi#sgBssZJ^xDf&
zj5Vd<m*Ngt&nT*|G@WRfdeA)T%7XXk4+)zyZ`vK{=8Wxnibqjt&aSRUJ<pry>4C+n
z@D<3^>j0MWnuvqv&e0woUA@OtQb*U$)=nN(rtW>oLbd1UyP7wql)?r3-_kB$5-r~-
zuf_IzpENaJTDlo~_u+vHYeZ|GOYMJuofe)c0m+OkKeK;7xvjA}CnpE&OwMZcdo9gX
zDrEM1S#ANAyQgQ6tLwK%CtZq)-0bY+b90yM+J$k=ogABU?!w~CEh|@^>h6lNw(OWS
zs|~Enh_d+O2M<DPu$eL?^ZbnrVy4cFb9Q!4*}i?_G-J}nQyQ5Uc1w6$k67euUW*x3
z*u7un<_yA;4Kq)ChIGm|T5Y=<U?Ar(dmCo1OMu?uV>`Zgx2;-L9E&>t^qx$3`-UY>
zrUic639X+$FX;YKg<UgB-Sga;<rDmqCoXgt(RTPl>t2_->RFZK7mXoo(@Yb4o7yi2
z(o3#|eRK2ArWAOzH$OQ|xw=W!>Cc;Kx(z0go2Ey|O?j=Tvd-PKxaUh15!mbpT3y%Q
z+j98ySF=(XkwYA{uyvW&AFiA3`1W-TdA;oEiJ6jU^w$q{KWZq+8{`w8cM_I$iG+U`
z7i^+n`_6w~bn1>BhH${v#MvBopQc5QpH44t#Y>x?z??29_}1B3d}~sp(ie=#{fVYP
z)x5d2dxWScthU;oGVdIbJY2EH*)A<f`{X0Kmh64`1512oSikj?dCl=LPq4AGv$M5*
ze2V6@e0grGTFp60o9(I(Gc8!?Kqrr&pyodvcH7UcIzg>ic;(By6v(8zQU3Ud^t~mU
zY75t=?%b`oY>jx_;oMxnfpDNmK7Rb@e$wwsdHGkd^5zWx@Yoe!!ra!NG1H7$ufak*
z>32)cC^%zJ@tx*vZm*V=<*Ba7ldXPndA;Vc;xF*XIS1rVPLEnS+Gx+k6E}f&4{LrL
z`mMFTr@JdzPJgbtx<htV&eR>NXTP1GJuT-@VH%)q4<UO@xv!42xt`p{m+bQ*rq9cz
zOU8x)nsjw_HNiA;-jPgq>~%Vk^Qoi4{-}%5{p8#$K5?7x2HXTH;>HbdW7OA2{>}Ho
znX+@<Q$=eeW}u)79YxE#S%3h--g#*$DU)Pm-ZV61XN)f{+mnJj54?n=q%mGzb#LFk
z1;o!$R*tX0&dWd0F7~Bk>T~q{xx1k?%cAWQudo2^C;e};D)r@V)fTbWkDGp2E32^3
zASvG}GbDvdbw7IS7?Vz?2L!07t2aM9R(B@k)ui;<vu0gEE(zDnuaM{XV@)PAR%{uW
zgT1A+u%LX&k|k<tYLb$Y6DLkwtE4Xe@vgPP_U+pxS^%p+RKH%-*BAI+pP;F!nIAfL
z?p(8u=Of4)?gbWr)n}WK+BvzgVrtYP$s%|0j8Sftgti@^gSNIdnZzrB1xj&No2KRD
z1teY}IXS&*YHF&l&$>|kR3lh~Av#iuK@cq|&~vOgEk9z~QoF-niyn=8y}PPIG2>w+
zs{MJ2el9jzb&H3yOH7VgE|c*7vcuUCJs%coF8$V};CT7R=<}o~d`7sbGYW;8$H6V;
zP?$mRiAWTL4<h?hA%7}^$|7^9zK~BOe6}32hO3ftGmt<k@X1>Wb$&1-h(!)pMRz93
ze1=2h@i>CzQFHIr|8qh5|G{g>^B+Rl9{!y^esTUoTSrH$fBq)}E#2YsAOFNPod0P!
z|I={(_u))X|FxN*c*4ie{q)Nu{lf{Mh7&;juSx&jH{WkxafLhhxyb&fGr?1X{>e=6
z&|k>rj_#Yy{a?-@-<vH%h%O|Z6qkj4(glT)S%NxzaO!Y>I@5<t#~?Ry$UanhZ(&J6
z@jCA2gM7lE;mk1by!U2nf*&2MWT8+&K#0MFQ^WKQh_5z!`+$`O@_{X!RXo@X2j`lB
zxyWI`8Ilm*4Dt{x5>y}RPl-XR2!;h%#%ChJKh^#<8TlMQvw>3LWz7#@hQg&u`<I)9
zg%5};QoEGK=`Ase*bRd+WkB~3nF6P8fjBH)QWrRvjz5w=hbc(W(x<Q}Z|h)F>3)KJ
z!~}>Al6Z<KP{G0}(D~0GHT?QK#1Kv-&mGa=kMipN2|X;t3Nn%jhF^u$m;CeW>3w$}
zu5S3*4m5~v=*=?5OT*Kfct((W4M<C1DBzw@6-PFb$RD0%e>k(zU(MYg1Z0ekv<FlM
z6D(OIBb%Tmf;I-?r3hzY&~QFGq#z~C5pE6|?wEl};C@63UJ51ULXw#A6XdbsL_Yko
z14z4&A2|&Ci-s2g&@5Dh*@FnyUm23{?g`rUqxpxjcvE7*|2VJ<Kv-`T17w2@?oHeN
z(~Rv9o9V-%a%YFf2^Ke>7q6x)>`ny<lG}ySg)(6Y364NzfPVX18+<`=3F^BD1nL>-
zfhRf~CX%lTkp(!36TG~6wTFWS)E*Yftc7SZSc3o&^Bt-|=793CT#Y4ILEMU?f~1Fn
z<XhZ|oLos2N*hK7+5*n$2jrdM&(?qzg(5Nn?~!muCPCJE40^DBgezPyfDYr(xarqm
zRmN>nINj3Vl=IXEx4qtEjX`iGICj51g$C<lIvJ^#>r3wC3)r36+!0dy<R>Hp70c!p
z89;VSCd-$rTe*4ndDI}e?R=?Vme>?3QX2uug@r-)(_lh*2ZQ?LB!sgo`u3^j$~Obt
zuq1+DdlRf<(7v!R0NNORawzs~15dCb^7%tW_x;ThXYOLn|50dKg?P}bI0d5bOXrtM
z<z@h4P^f(G*_YF+&-?ZvaB#sbynB7Yr1s$uyaDlUhj$;Y!2~2O4B2q_%b3F}-3zB%
zL}murBYP=kvXS<YS`C6Cz%XAzxWb84QiiLg!mEWGOy{Qgf^#wgiiC>f4l))lFMoF^
z+`ENG(r4m&hePI$0ZwX&By59?EkG)wf_Md{nL?Cumq<V1qB4Y;@;ig!3fJ!rhI_a0
zVAwQH=wLcE80<puD0tZ%eaV0_M0kEl5spM6l762g-tB{l3a{L@pdL1uXka{(1<CD@
zAILnO4qnk3wj^ncP%6)Wphf`0p7WcmwZb}M?SFqDyxWHwNKh!8;S$N8$L8kGgmqJB
z5Dm0}@EOCaat@Cb=tQLQvXIE|1_72Ti`6>_@GsX2(lvAFvt@vNOZTrWbt=mQwm4M~
zeT-x$gvDI-Crlvmv`SyAmFs3O1}``LYtHjaB10;FSMP{2`i*YkrTq8x3hRyE=ro+n
zV*Gub!t47tIz@^}|9!n8OZYds^&<nt_V;y*EV$q3mQCf@Bc;W;V*Rsz5l66(&DHDV
z4rK!%CMu$dg!ctFw<fo+df&ab&w>@QK6{}m*#7K=t9sL2Q@P&>>>b4Og=yoNqA&@-
zq+!v5sAv^95hhpH!3uH^OZz9@BiAfqQH3&bs`fX5sKSmJyoHbjJ`%Zaxp#r#H$-iA
zs84bBU({u1P{UOK-3aib0{f>JsGq7rSpL%saEHO^uib`z1b7jlV2N^Aq12&n1pfAr
z4WS1LqtFg6DDw{fqatjl@Qck;8DTWU?m@7fAxq9PkW{S@w+a=qgRo)f-IvMgS5h8U
zJ-nxS@8NB+3}M@mn-)2Ah>G+=&kH>%FyzT}3b_{$<h!Xtwd;e;u)%x>jm?)_m~?^A
zgUu0mAS}derqdV!LWVyVTH){dK}_Ca`-NyiL?4)DDu3y+nP8h0PUb6=yPb=}_%esG
z4hJ{90Vy1W7-07!IgcUq5UNDjQSawb2pexhE-Uyh=(pw*jp%LYFV0=>r14dk5O|2d
z7F^9H1e7B>3^-?k8-=D$s0>>FG{11dZhkK0!N9*hv)LcR`b{8y!2Lr3@dIxD2@pT<
zz9E750k;nU#0w!_ShzgpU<ut}<=($$AyS}^zn54c<s8Y}0+)lg!0cOH5Io-N>vFAF
zKfa_=0Ig^u9~T(}JMDdv!{qQCiUHLyH6U{`oCums2P+-Pf8Vzr0fGy|J02g06h;+<
z@Y}%%7@Q$IU^EQbM1??XCR%`x^1vIem&srTQH3Bs4G2MO_)KJR4S|6@fxa+kAv6xb
z?zpIRXwX2m!I~cyLOx;unq_k_J0_0;CZ7T{q8bFmYCw24TL_cjg!(dvvkUjlE-Zvg
z4xU_C&qQaqqTqkyHDvskkb?eq`WQO?OUqDOcR>9=1D)aefB(oe9RD>O|216yZ#e4f
zzbxu&xc=X8_*cLCc<83U&+J={?|)s?7oX+)s3oqgh5#YGE-eDy^5?04xj#g^A_y95
z2$+Ybap5<#uw&M*E4Vlx`RA0tFC*dKAm71bKR8s1Ka1?A5gbZUXVI7%+?o^I29#iJ
z?8Iw}AM?=fZ56oR46>vKGieB&NSMHYp$Mb6U?dncY+wLxQX>YbqKDM?BV&ZHTnv{-
zzGMX9?fV=C@}q)H-j_Ti_QZ!~1$ZrYfGT8PUl>y6MzKIkFyLoLG6(qijAcR~U?2Pj
zaejHv@mygOzy;vjfr&t7K@g(C6pk1e@EhI{X_Of%@ShPtA3hEPk(o$r1T-+_N;q1J
z#}$oUw5A`K@TmIHh~)<C^ako6?+|zxLlBh(!(ALIjRnsYtZresfg6RtWx+uV&=PG8
z4Ff$p)t`6U%f)`33o2O!GuiCH-^0NKao;rx!)UySIwnjJ9l>9Nn0y3Mh(`h$g5P8!
zoI(0U+9UFUO!~Gfc!Eng7yq5*O9qQ}7J|k@vv_FyQU>=&-jFl~z+OC6E?D|Qyjtk<
zW`QS*zj(pG6IlL};2u~|_?5o&ffF|<>fZNph(qN+BS6cMcbdGrk-w4qH8h3*)sepy
z2VmvHP!1Q$5%Sp)C`Si|a`ZK|wKcU3AsubFPL#IMFqAWVaj&8ApOAn5@E__|_>Z=>
zp4Nc#f7-+KpZ=L^82=f@e}?g&Vf<$p{~5-A{&(U(d|YRd{jV^c|F(mF!VnNL{NAWI
za^If@hkm$+FIWQ(U+|A9a1W-zaXvm|1_i-Se377Z(4q!}1M4vqh%IdenO8d;c#gk$
z!UqO<Lg<=Yh=+^T^`7N{&;q}>zo(Au1%h)M{ix!e1tj|p9bY#Pj0vGf@q?lnROB~5
zpmBi40}k*!ni>Crd73mcZXog!z!*9e-t@S4aF25!zc1t70NRGVct0AI?mNUih>!oP
zn|KJokhd+TQiFkC8O9^XhY8jd8KHO?1|2;VmNa0{{Xi2(u=CQ`WZtP4GK<DLJH$JP
zg0wbh$fO`Jr8k-bDRbTjcH>UJ2GR-+G(UJ#gPakBgw6=U2LXc-GMU@}5~R6-Am7g+
zBf)$QfYi9qnBa^iBIgLa!-B}%qZq$LPBnf3{%~m#0)T)8;tUfs7~(TH-X)N=pU@BZ
z0>q!$mwYfR1c~Fy{_h~C|H?=#0cpQKklqFH7e>N`2>TzX{JjzVRd5cB2#Hhu{UHf2
z-@h_F+;cuc`0IacKn`3Ae{)CzRnu=UxFCqb{4Mx>@YTr+W$&lchsNc(r+<+Khs5T&
z6gp9nbKapsNB4mKpuw6f2nnR+F})vM{GO35R2VAm#}A--;b`dp074tW6SsapBYUVu
zpsx?5FM3O5gkj)=H86hLdymQ-z+jD_Nd9LHOBNuSHAnU5pl=8rf_KKj_C-OoIXAkS
z+XA?e-!Y)Ug!i1v9Jo6Zq-P`x01rLZgyG;hn4!bW;cE_u5<CY3&C%A;ox|-8a1G3f
z3co*9-hl!nA{~5*M&i!lmitc*ycrG}9S*-I<H~1Wmj48(hELcrfT8hApn4dm{wYo!
zLLUaH|L3ot<G-P7&A+J+B*;%+|7Y=k@YN6h)z>pHL_zw0Q~yI=|Htv)A?IJ%U;j7y
z_(lAufu6R0-}wj1U^xEspSk`&#Q(88{1<_OIk3ql*qDJyM+Un*6+U1-jQjr%?k^!B
zg!=cMT|pWd0`7;gseb_Q|4UQ-KaKU<FoUT70>n?`{q;Ws?DsdOf7%8&P>VsK!N9Pk
z(5HXlB>@5>{l#|!$RB_4oqz@RkN?Tn0X%5%Uw#F^{qz@Me|uh*9Upk155=^f!T#L8
z{?o8O4~-Y#{6nMjLSVlYZOGRG|6-y)ek9@F0QV2Nn)qq%LdkwW_fj<&RE{Q38MB3r
zD<v~W?zafn`YcX9KKs)ZJ6Ina78wkUrMbYL#S9Jh0?JNbTgl8k)E{!@{_>mJV6e8?
zl%Rg?TDUq5-X51jy`O&XwFsN~_q`9{2^!R!=Z*hDg#QbT4RHdf{P)Wo!JQfqo&yB}
zQxFPg(csj8@Llkm5FUERMhgxj(wG`-jxTUHdx4(6@UnqtQL8NZ-B{0`MKdC|VWD8|
zZxDsdfPBEfxabts7v4;H0gF%oGaMNYZ!CZb$iwhR0r!NX6rBTL6vU4lO6R}`Vkp8e
zE*(lg2}@KO0`KB$nO_55O8xkw^ixoZ&%l21hW#5rVhxr0p*Kpx5r#_rFdHRqT%l5*
z<M*=}KI~vqF6i(d`1HRU4RVFQ>-7%)B@{^5!$goEBi_kVBTa2R_~fa!j)|TT5N{TX
z>JQ{$7!3NGuOa>a-YxOp>f=}Oe>z&){p0`ibPb37|9|2d_Wy_d|6%`s*#95)|A+nm
z{}03d{!t`=hfnaF|NdyjFaq%ZKLUVE-5~zIGf+>xF_AoH8EiI)pUei|BF;YSi~_e2
z_Wr?m{R6mJ<uo87gUbCA-RnZbPjR?8=*g4-;m7|PAb_+BaRU(jSj?aS5q{j*21+oe
z|1S`n)rtRwIugPr6rvc)M%?B>qXpsAN#RV^PooKu1aLop8a}Lw{Kg0k@`1VB`<pKl
z-gtlZBy0o0Y0i+JdkO9hb>tx(gFHWE3?t09LC_Hx&0uq9oau)kAY5kiCh_MXPB6EB
z(jFXU7)*nwe$Xai+Z7=jo*Xg+7(@l8FVOOl5VC&(frHbGBVz|1GABTgUHqrSz!NzL
zF)r}@!s15`1!OQdNG@C^V~EqZyh$IVEl0jQ{FU~&LNZ8ePF(5X0#I-O5CrGovgE-^
zy?~M+5J>5lF=qo$5_9Q>CGl7N=;;5ld9KtB(t#ycoRLUhzP9jZQQ@Pkh-|?F6?Dml
zf92waU|`(vJ)j!kOsUAJYPgl3)4*FB8XV^DN*+(<kkpSrp#kp$mUUl9$iV(}cfY-K
z{+8a@p+4MQZ}1MezxL}9QM4KmqQPOs&2yOe$S0ikayd7K6@KU^peYhs2^={vU4Qx9
z`2QND^)CUfh~D}+%-Xvx@wOh=qoOZ_1zCf_3{rx38Qyj^$S=K$K8nj_{?vlImv9HR
ztY23MUW<Y6jvf%CCm<S*Nc=m1-T&*TYcH;cV6Mi)nCt)9Ye@W8;E4Tuef$Fdg+KMj
ze{~Fp>%aaZ*D(G&jQ<Yfzr*<NF#bD?|Nc+ozdXd1i~0WIDEDv(*f0P*2mlPr&Y<`&
z74j4QsXqpcgnjji_=3MBBM-sBVQ6q8x0oeflL!H3aKN68+~doHfZ~DznLd9F_=Q_m
zf&YQ`QVg^NcKZ1dVHoJQ<HPtZ`~*`$per7rf-nG342I1^BoM@m$lyZQFiZ(?OE?Nn
zpK@Ug!NW8*#031K@{mG=m+)3iX83{;GhtrRf`Wi12V<c}3gaCRUWf+3dj^vO(=ljk
zyx2R$2;gDrLI?cV5CewzL60yDg;Z?%C7>(B+d=sR#zjM5Ehb`@0H0TY7XfO>oB?kP
z5b!6Gdxn||KJnop<o0kHV5JWgsZqdv0*r}E(;#LWSZ#<E%2l$O`Wjk&>V(p1J~Spf
zlFhH$%VcZ7z48VkP#^*UL-44eU@#j3j&q^Mfg=Xv@e4&J9c;v8q@Ep(9tmUDL10-0
zfInejfLmZ|@MjRlqq(RSnZd<8dCxK#RKe|VEjrLxBoxq#l(BhI#Yef^)n^5%&+=93
zh3L2(M5b0ib}zigdyYd53ZBK*06qO0H~zl`>A@`fIiiQ?8zmS$<8coI_0GZ1qA9s5
z<3AfpISj`MU={?8GaN?ahOd9@8WR8O^|}77K7N7!>F62g4~YLX9M1pvk6gp}-!T67
z@8N$uM_m|B6Zr1`1xO%oEL`x9_hA?T97X_#5y1b#2+(05@V@{E>{CFxR|~^!_iAE3
zGAOhsg82!f`BITGtiQV#X`t~OHm|Tf6i#MCK4cj2VKN3J!sNTu<X|%JK)G2knf`i#
zu<;>mX)Bo_U&GXDpoOTTgaQYU!J$XOc`o6AI5tKQr^>@+V4x2!z#`~cc%_nsS1MAR
z1p}dZ>k@;wpcrmk2!>Ze00Cm)h#TNd28VLky@f@E$)d3#KNgh=p7G;^lUY>cDFiG<
zLgZis=O<H6@11f8P3D5D`WjluQCu35`&keQ_M66z9r6_<w4yZ7Jfej~g1^DSH}E%E
zzBr&QxNJtsmBMHmpaiZ}s)LXPPcU4%gw71+p_W{twIQESKr})(w}LB;AK;1R4QtT3
z`mJ24+y*sawF&>B4!YAow8bDp>$L;mJ9=#a!SI9yii>*jAAtu12Xuiwc%bb5N{t~9
zA(G7%vVw0!CN&twWCx|PkEMZ7+Q-@$WNivRBEajYFiOh-g!@GD+3MR{P1%Ikvo9Yr
z_vH*?tU?w{7La_w(QzQXecmCkg{)c70IwxqA?4OrPY<R=g+N{|kH8cn98wWTkQNk7
z4`mCt^A}`8STrCKl}-gZ2-1gpQ0=!x3Dhze3>d=zzBu)+{Jx>|e-|4lYz?^BJcY_(
zGBl{Zp_;3FX;gnEEL46}HX8xo2Q2{w>A<C$`|mZs9?&9tq1Qow%MgB+&6uCe`1dFU
z|I+)f3xNd<KQ6GMxvRmK&If=6cMTXUqNoI;gqCRQX<|eDHDNe$S>G{R(cn;YGEiG!
zM`MOEkR@b6X3?2!2s{$XhF^&VP+9Q%B5s7biYj+|qk_MYX22vefvTjyI})<+kZ^YH
zkpOtF7<4*d3blnO)YaB>AhQOeklO(KY0yTrgoml4NnnP-jp+S;BZ8SlYF;au@oIs?
z(<W$GOGnc-l>YOE2b)8IKLfWV@M#9qzwj_3cv}i=K5+GzC7D5^Ga+Xr^&z|todalO
ze<tJzn>T3q3&b=*k}x9=2>&k7wtaNxPlq~m=PG3Gu^7ET)xr85Kq!{sD@gDU%Mt=t
zYYd|P1<o77BEADBsKSoCeFBmPzlmT4A+{b+j)+bZ@<wQM4ikA<p-v#GJ2_$<)SYdx
z1UsjNgV+U>UMCTVss<WpOL!c>&;#9sQ|Um9QWblx8+T?Xvc-_;Y$n7)-i<QB_QHaA
z_66SpV6pke4)_ax@dmb_z9z`f8!0>pA%j|5OHauR{tm%sz#{Ks!2Dl-N78E`BQHs`
zwT9o4{4Ljz_`k5h{%`d0%lr=px&!h*YUvE)|Nq1_jQ<bg|HJXW!|}hv=>IVKKaBnl
zqyPUY^uJF(d=!q40QZgc{x?H_1+5O|boYm=O<>ekIJy%Cb$x)l2azdcUuqDI0{eJq
z3hXhmC^R@SG?WF$Rs!FT1Cf1zB!|MWt`Gwb8Dt{|m0{Qf_AJ3yEM_Fwd4Uo|gJ!J>
zF6wYJBLpZ82KI>`*tNj^h8Ra+SZocUQjAEED_+zj8~DBG0h>J>I?HB;vM5x(3B%U(
zrTWnrG~_HcS9*!yCbScB7vlZ$hYh3I@X2X}Q(Ql|A8sx1wb8<z`ZGegh!^ikP5)s2
zLa}y47GR%20B$pw95jvV8wZE_faf4yjtJOw9_TS66+4iCYM4hX*h@rMil!rOoiDJ(
zXml>YKEMeN7eYLcBjmv}7ESQlfJY@a>nE75NZ{DRPa+b)vo?CEMI%wjj7a_r!xPM#
zRfHqJU4#OF5W*44OfW0UVJrcO`eZWbk^E>(7+4T=Nb^Jb^zGjj{N{$rKz?I`cIm#5
zKP`-k4rN2!4H3pyXbcKHR1gmhlrD=I%z^`}dpQF$7Yq^1Y7iAc>tIfUM&WW;$kqf$
z^1{3X!VwA+#!u-W#4%x;kmkc8vm#;YheD*#LjXaTK5*0kSO_hEg%G|88sdUHTxkJ)
z!-Z*hZzFh9=!+IeE+0^0X_|3g*a)~W8)l3tj0@<g!{9(a(Gn6BM=C3b#^%4@fjI}p
z;m?AL0Qq9L;sHbmw&LN82k>meVgdF!CIij%f$eo9>K&O0uCT!gVT9j+k=bC&p&>6P
z`Y<1jyeWZH;5k)t;yt0Hige;j1rp9%EBv4Ml7|*j6c{1d;0q?57DVH*5q=zD2%9J4
z7=%s?I*92@^NYklK$F44LY5;t00a5b;HG`R1YzKV`aG6n;BjaI0b*0>aA}`lM2q?L
zp$@}c#Y~ttpno2Vkbc7h!0h!I35|{R3uQ4tm)r<zuqxP0j36}tFL{O^lMa?O@_vfR
z@I`c);7tx!V#z+hwjQ_$xcUTsao9V#{Pht)M&j|&T)x4l6kv3ZKPq^Y04msU@j*nx
zGg(NtP`}X%EgTyh<V3V`cEgfz5Z(!LBoSTlmN-jD3F`ztD`6lvyt56_#Tf#3kgx=2
zcZg^OVF~V#9iCu`LE{!Xl5kE=5RnAo9USfPI7<wKCs^3KSmFuRkU4mcKy-%e@eX)r
z(5N#Jf;;3jg~x&Ctk4cPl7$WUh&9LC<DK0xkQLsU0Jmuc8pT46Sduf|!o?m-0xmtt
zk?4d2-CLpwL;{{*MFPFx9B>3@uniDER}jt>e1M#6u=e&yS6CN7Jqe-Dg6QZ@!du%o
zLpDTvOB~4wZH@z!Va@Gv+^)c&EbOs(2MlD1b--HVkf(^C6%ukAk2*IS9P$<D4@*E}
zEu8U00?ZQ&BEgviJ_5x-BsmKnb;CR1Fc6l6cY+yWMIwUcVRnKiV4e}s;5h=0+X~ET
zsLzamTj0+wPPkrLEOA(S(3TTS0r&#Vzqxl(hXd4q3cd>CfWujO|EsQ{@!tW^(7)8j
z(D<*8p`QK#{MSHVYZ(9iC$0^S1naSAIe1Zx#oJhtz<*=m|BH))f9;okO-G?L4&yDc
z&JmBBqr)RyaF07obsGvf=Fnu4&DvPSg(^zZu?w-5^nHia;?-pGy59BF`X{!WE<Rcu
zyLhp4(pw*Ff-}}zasRqqV&>-J?<8o3ZK=At7Z=QKk2s@lsHph9y}9f4i=tXn|H_+P
zmFGTx#ip}6#($ad{Mn3>AE6!NMOIAhv556t_d_aU$BPAGZ>eW;Bub2bcxfJdYAGgl
z=FP*^o!LLOLv3GCkN;qAlA2(1RaP=-W?b#5(_Q5buXaymBuvlnRzPW$TV>{FWo2Es
z&~sHGCWZRwXjW_K|6}h<;Gyik$A?sm7Fr})9upyB-`BELc3Gn=V+=-PhMBP?<t=R}
zEmBHaR1z&JN-HHT+NHE=lOif5Me2X=^URE~#rxLV_xJyP-Ou}Gp8MS8+;i_a_uTWG
zd(K)@#h4XN){2xQ_0km8laWPNBqd*@Xjos!IbJXCaI$vk`0cs$>-yv&GO{L<;;#mL
zEL|o2v9a;gsZ$GLV{NRhot&M|pFh80Mhazh-um5>7Fr66n~huKw7#(Hp(R@oclfH9
zpqU!Z{YjaAR?2`-GclZ#RI`*oiLfMDka8uiWFvl0$vIQukOxPzw{Q2oyiQI)K;TEq
zy|axUKPDz5oI8Jhe9hU|*3XTNOzZ3mez$_Ol8qWy6#M!nk&>jPr8PA*+rE8k`SfPw
zs8KI#YO>1T+%cRMy>+wNRx@Ln6=LyX8fh;R685|b5H-70<uhi)^UPafII)L|#da+`
zG)5TNBky=H$(-~lJUqPS#<u3>W(R9)Lj2K!f>$qJ66YRQGcrndntyS8WJ*fP%a<=7
z&9B>EE23agQP=eS`*%t5Y43yHjR8l#o?9v!aO6HsM^{^W)db`D#ft|9Cn=FfDxDuG
zRq1_2zh+(hmMzLtzlDBpeaCXh$laSuEAUjry=HHIA6lhOCN!K>jed1?_Wo4ID`J94
zkDIEN2s!G+SXqgb&VD9~i&MXT<;sH-;W-;Ox?5UaxRdQ%b2Y8}&Yco{0Iqw6osG@I
z<6&eQo5W+sj*YL|q#3ySh4erlJRa|PW`TaqBbtu8ySvT0U8RlJw;CSwKD{|LRbuSe
z?0a<;N}1+w2jEJBu5He(`mu0PbhI{3a1BlvC-^kr$nHb$gGr>X?mpukX0C{8t*1sl
z-Y`><e0BU#x{#<r=+kMgt`&)@XA~s9KRdr%Tk2XK`J#lf=cth*S#K-zR!QqV0hj{w
zh;#Jund)1FQ@{KEeP~XFr;Cf0|0OZ);j<(Tw$L0^{Xdvyl@A@K=cq4v!J)0C=_LEj
z?UtrGakCE}K76dXp({BgB6oz#0`mpiQ^Xg~n>T0T{Gb;HyaL5<k9a<`C?wDbhv4GH
zN@t(fe_8E%b!+SW7s*v8<~I>nEmJG?y0v|<$o5mTySW~Ac6RtPwY9aM8y*`*Hayz2
zNwRddr{{y>C4-yaRV`|M9NAoV@7>$`N6s%B>Rd7;@dESB?cFlw%PN}`O)AG<h)Bod
z-mac_JvunJc7^yPPft%KizO;5x?zIFfRiK3rqk?&Ra6<9P1-&_dNjhSaYxE5Yk{|U
zm-SbeOOlmKALP&b5ngTGma05lYKYWBT+wPFW4UEhM3*>8NlHpeNu8jSrJgupfZL=-
zT3qZa)+o2zWdZAXiAYX`0U(In++0@8b&)e+U*134zJ2?;btCe^--gyFFp$x{Nf(v`
zE3Qy~RbOw+e0iz0;iN-WxuV19F=KoRnFGnRNF(1Q&pG=et4^Ef9&=f@fRe_%K0fc@
z1VOTGYT@)3X9FERPfDhZI{GYqKxJ9h%jUB`Vvl8d-#@k8bJrG~kbV32k2hfNwa=Ot
z6m;pvjfsX4xtl^lL*IXRaZy>KY?C_K-{Z+qs`J8y-=Cb05s}dhylyoAQ&4d5zM?x#
zL30u;wkJ97cSYidO)&b>bkFDB-Mh<{FOP|dN!%vX9QEPCRzM2YnIAS#JVLh&s~Ut$
zQn$Jt80aH1<kNV~0Nn0z<ks-=YeI*dgX|`kgGFm@Za#F7c~sPwyZh&4W@fg2u9udS
z{POX})aA>UgQ;^!rC6=gtBGlD0JUwIOs2Ipo=lXHd3N3K-O<^^i>t>=8_z#l?0ei^
zFwT0GBLk^6H#0M%(cY$M21dNCymj|(>ZVN!n{M37+-<XwK7Hm4#b#Vngs=dP`7P?Q
z`S8ah#I}za<$hyltH+wdxhivyuSrWwTe~)I-aQrEij^zJs{56^y0&F3Sw=?2%F3#>
z`Q6}$5@Sske0f^DL|G#7K23#49A_Bu7T^rP`1!2}9$#CY<>0Vs$tVqlz%ScPmt@2=
z6fPAV^FT)(SClY%x&ATVr14{CE@wPVA4#aVtCQ=&62!$T>|WLoXzDll&6_u4$Bs2I
zF&VT(MoB5hVVjA#xcGoULn@CkCYI_M7(A!~E4tyay1F`GnUthA>=Qf8mrD&9Wc>y(
z?dJN2?z3lqDR-EvUOFM_ser1g>T9cc$>Sdm89qEYIk{$>aPfu>c4Zsisig_2pHPeY
zJR>;xL8{7lIjc%K;ql~wicC?n*YBU5U%GUu>giAG4jxp+(W=hGz9?O_W5<rQYu9Q9
zT&>I_gG#|JE-qjqC=_sL&OI@Bt9|pQa)+8%ucTI$TCJaKX=#~#!y!xSP<`Ej;oc$7
z#Im$-!e84it-ZZ$+4Q8Ls}qlDZo2jI<=ktRvnS{f<JC!fgO<~MO(Q%_aC1+v6=h_K
z@7;4xrIc3YdK_7|Zrz!dTBY@uwHAK+awfKQAs}bm`=?8WLk1M8JnvQdJgv=ud5esk
zTvAd}c|Ua2i;YChoDB(6J@y>7b^TGllX|rwUhGDOzOzV?+L;5_W(W%&dim1DaM-I8
z!rRxSq#X{$72Ugc?97=7E`*!)$Ev*N%u#x8!gzA(%a<se*x@}I(M?i;I$~3=XsoA{
zZW5~yAQP=-XUf?BkQE^(iI2D{mg~0f<^Utj#C@wI<m6T@-rzHQr<fTo_vq1EVK}cq
z)8M?#Vou)PXF?tp#JoGLiy*$0he%+Bef|11EG+CWk(|`l);4(9xJ_HP#sV$?`0R8`
z%R;HW2{#byv8B_5-BR~lmfe`Dle$4$VvO`b?~wibLqbCGJ&B`mM?L-2f)+0x($*3^
zT=MC}2@TTX&jQtg#DW7)o-^5BscL+*IL(&1Jj6)oNSeXI`$Ge9GP{l+{{l9c=;-Kq
zfN>u7zYNx=late#FV7PLx5XCtoLz_ueRghXTwL7RNi!OroSq}xw7Qfu!$#FiQik0W
zT()-7?y+O#E+%iRuDO@GQFm6bz#6YIS>b5}3u&oZ=`myUf?d8G4;xULv{HE3=i=j!
z4;1M)m$-=Fo;=yyK#1G8as7b<iMVs$wt(@!NS?Y{N;~+~Re+4N9Jl@RYqPT&&i?qG
zKkwf6rh|*Xwnt6^3(WY_O>^^QL++oBi3IqXJ2!o2%flTLUPRb1!t%oE?w+#SqB73d
z^TC}vLem6Rd@-N7B=7F%=P9h6M~@yj`l<FzY$2}X;zeC$<pm9oN(xyc36lntym?yc
zmn8N)U0|AvOWd{RRpBZnl7ow8%@TNul!b3SxzbcuSNCkw-8o=~nrN~>ujY}zM(p>m
zH5C;VX8~k@18f5jZ`~TACOJKM!uW|3eVm<-FsrWs?y_v@QjzD1t<!>5N>0kz(D2CP
zP{6gz+ZIkyOWQ1<7B`4YNb;ES!u=w$S|CZBoUV@d9q4PYwfRo=l2qbY^?7dTZZ?uH
z%!pzB)`zdkioAQ`rA98zlB_#H94JDw8gb=vw1J7qOxsh^!id2M_8X`9^IPB+?LWb4
z9Z{m}$_6DME^Ui?E<##Nr_(=w_&^N``U2<@EUu_`r<=d~nOUrG8ib2~TA(v;eoI>O
z6GP@RGesQkwXh8C+{HUXky9=yPB=|m$%Un=J|?f$&Y*wze0K^NS3wt>zGB&+@~6d0
zQ>JVdBY2sQE?uF{@_bN~Ib$39)5UO4@gtf#xFW!ac4lTSS-iO9uiRTfY=g&zU~kJX
zR?6L^<d&-!`n2d)=8WY-#%eI07!7PX7olLaiFJnl_)Tj=tB!HoOglTJ()px2)#>4x
z-<1r6ro{(|-M({I>KJ2cbM?lW*ab%w6?d$Qr+8GFF1n9TVXCUy&6?GgM_wBLy5z;y
zSmn}9ta8Re&FD|Bg=erFYa-(OblszLOTRz_DJ#c5TRP^`eB<3IVoV^u07-NGWfyPn
z@8?8S@7%k$F*SABvSot?4pg-FrQD+UkDA*2=z4Chjj)wuozS*7I=Lq=h?=cX7p+O1
zLtpu|wJOj)U2=Dl^(;hf`oMwV=a(N0rb~RTu}@o~SGq~PZoBDUS@y>DbvfaW1h(EB
zkdmLQPM<fgtgK8)MI|6f8Eh|NjSVN?c^5L5iuq|tHNU+-a>NMc4dZ42iO&gkHsJVR
zxz9Q@yq@m*=<ejHZJ$1Wcro?*l@qorbj>`i-wZ7_!6Bu3yGO~a6x*g5m>_TGd4&BY
zSy@@a?7^|cV&eX37fJ`6`Q9=r&TZ8m=irgYc6fd-^9g8aDbPG|VB$IaL;XeHzbzXo
zElEC11UvSPt%l%q@(iHqQdybkkRe)9s{olLo3!jDmNCw@eI78}NG<3l;*q*xiA!qQ
zbo12{l)a7yy||FLJ3cB*<?XxEqbnyx3~+ofV&upI`r~gOUJS-Z+YXuic1g^;$L}9U
z%4<nY&Dk*j&~QDond=T!JowUBb_}#ypHh%h?j;|m7d|gI_{pLlZI{=}Cr_MuCNEEY
z(j+q2av~pvUA&s6nV6VZcI8U^t)aLA+I=S%mrrkx+*o{N{}suNvZsP8@~X>@Ib9LH
zHS3B&;lY^rLAVuSw%KE4K3z9F;uA$8?zR=4C1@!jdb%cK=);1o>tuZ{e5|Hb)_Vy!
zTF==wKlt|GiB}_*w%LnKyA`Dy^1#K_H6IYwg>WE376K-u;(1g-TYEI_db&OfFsXuq
zf)giB$l0W>IPVb_JfP^{qP7?E+s4V36zMkrf^pn&++S$XMafAeiXpL|ZiUUe`^a+U
z$*E35GFacQD8)R9jhu>`F;jjuUi-$V!NlDuto73~7uD@I%viKAspyQ-<C7z8?Tlzz
zQcI7`6pM2*V86Zzc7h2e3uaTNE3R6xBI;FI;HbBWrbqKHvtH%?c)5O&)w<!kbvM<A
z;>11};c!KIS?SKW)#~eH3Ay8w)U8d|Ein0EM1FPk)1JwqGP6C-rk}6+9?`nP+`)d6
z*bV&+)dALa>18{WuJ2DNxXjcn4SI6wPI=b0h2OubFWyj?w}8EQ;CPb-QDv#hKoD>O
z6S8!JP3En)50AYAyNBwj_lrG?-0c^LJNasDes%S0<INq3>t0SO(_L3DoPiLR1>lBl
zZ~Ckg6>XK$xM%W_ieSMt0$P&ucEplotj-;Nl%A>+)cV;nwpFTRRLT4?!q=`$`SEPI
zXj+<_rDc<~?_EGbBju-G+qP}g#47iojrOjmR7MmPq`sLkG1djJ+NckHa(8M@H$MTZ
z<K)NdhNG7#R1Qh^E3vanP1C$b36Pk%?ijILy6}C-`JjrRPtJQvu5H-}Hm2E8$G2_V
zxXkJ9P2Vdw4uYXHMpjizj7pg#E3=D|Bp4?v?m-``J!O7#!;ArfpZo~8?GmoyW^PI$
z^VW+Cs;aK4w>jjw)Nc0+g%{Vwr+uopd$)jee%af%Z-Lx#=+L3JZ)s+i4pYi3($~+g
zPaN*1w8hvk_D05BtH#1-l^1auHI3(%PWt|Sxz);*rmH1qz5mkIT(hY4q4CnCqvNAi
zYP#L@Js1DQ>*R!6Z&rvcFAAWKke#KlV}X@$sia=B!mH~d0(VXvcwoy|{s<&+YyceV
z(xpq;&RGdhwW}!whsN0pdmnw>`sq`q?u1rJaw$<jVA&0mIcf~=ouMKMMix~0Gx9=-
z@7D)r-2eV2D=l79VW9NT&F@Y!UQYc{=%{>kh44g6ALkZxVOLkz>Q}GqH>v$4cKg||
zP`{z!pKfH|+V=%FX!wM2BS&Ud1Xt|XR=a4adfh7BVW04y#m^;qoIm$1qG18;_08{Y
zN~4*l5Bs`)92kGd(UEO%IHLa1-o0^EZS=vVgG#5RX3Ku1RfZa=9C)|wyOyi%6_wjA
zZ)~4}(?|$dY9ta#L_}nK15UmG`H*xg=<4<B!-frW6Wmm>+8`;9Shna#Yn6x$5QYzF
zhD@ofDyV<HPEK0=?!zI$x(#;*`kI(*2KckF63O$-4qgA(krgV{XU|E>m(dzuzJ3*;
zuc^6Bj3gzH6h3&^+;KX@1(()*H(M21zx`Eg%cty|9790lK!(4=X5uTUV{nd6PU|u<
zzJnviIOF*)QTaua=O+xxa@eLLwd&lXJy)+4h#i-GmXPpjw~ej<a@}yAS)q54q`>Sa
zixz!eAx@GI9WC>sL41c$vH0S#WX4%z^0zN~)(<VT@HIHZxarQT=YE;8B;C&=J|w&;
z&vJKj3!qR;XQa_p_U|YzE>=`j%+JrC`r{kR%}qi^R#w)c{z6-A&Osok0mi+j^4_Qi
zE7HEzx=SZdP?jwTT~ZyJq)y(W=sW`SF0uQn`iNcTQY$i*6tk-y<Y(!P2@6dZ%g)Zu
zJ9P6)(SY;ukq=ytrL!hZ+}6_4^5DUPmoNSE>n=|cRLCv8coA-K;E<y(wF(@<3>SXW
z!+m;J<&#s9VG`Q{2!FWAm+jsM-B)?fY@568{XL&;t>xPm5=s(pOXt?%7u<5qX-G({
zQ*wM0J#+0jGsWt)YXt&txOp9SoIdkpNV-`4QqkSFZke86zI@h|t>fj-mbjLbmJS=M
zQL<WBFFG?uaps!?1qE(5r)8BtUf5cHF?nKgLc$4f?j65zs@dKh#VMOximS_-gsCU|
z&EFaL4oUJDIdaL346i-6*u;3ffji8tMtpy^{L$Bs<?44eOG6GU&?lVxaVMK%YU-U7
z_KeL+FrIPSVB(>2SKlo|-25|&ii!q`N_=Zx^dk}+{K3f+>_n68)A!PePZWkdjC`Wc
z{>mIJ^FTT&_F>e^%j+|>rFPEVaPnrdm@eaVxbL*MiDZ{t+I4-I2e)tMfE+Pe*s_S@
z5h-mIGDY@--g=8W53Y?1(Y<r$4mc_e8E<gs`g`P4%Fdn3Qc_%}XYO`)QWG&vDLCN4
zs(OAQn~;_>Psp*r-t&R{#pE$wbt7LrdGZo~zW9PZUC{7tcExRb=@)lqi6(f8jT*Hp
zT{(3B`vEv5w{bdBTZGphkWboPhU{EBc-SZR<g@dTJtM`R4KBJPx>@Y@?c0q{V$z-x
zE8Uv(%!Nmf9vxD7$aI&f-oRvuY|n|Ml8I`X+F2vZeAb0}c)Y0DwoUM6Q|eZaUG}e=
z2&!)lP731GB(?4xkbP!b5&N||ZRgHGR_6+?iq;@jw^xpox3;k<UTRdk8kb;8jZDcd
zw||@Z<3xB?ZJo66+WCadk4B0K7)c}!Ia}FsP}FwveUe;$;;wD6sRIw_{xy5MIGXO?
zzki_R-MB3gBh!gim3}*X7Df-6c7FE3=;Ib@OIDnVud`V*rUt+^30GhkG?t8e&{TJ$
zAm3wY#<NeB&&$4i`2r;LC5bN^SBv=SY>}3Jd?V|z(x;C%me$;GC+w=<U#)s*08ZY)
zZLY(ZglV(pJoI#Q96ar9K#9I@ZXr7x@Oi;Qmlq!JegCxBEhm4+j^Z~5RYbOjW~8U5
z51;z&=7E4E=44zP<LtFT+X-by<Yzq+Xu$1iYgN@OeUxi=qvfwjGpvK>t&+4^9V>kQ
z{X+(8ZqxSnH7i!Es4m->_$_e8>!`tV3z-+dQFd2YVellY<Jp%_#We4JQau${BspUy
zt6}cfzXrG$?N51*r!@}56}2=4h7iOe7l_A2+{ifB(xMYK>ZG9Aielf_36fJhH*VNq
zIeq$KyV0TJ4s3e);RR*)?r>r1{F6tMH_49n+bL;Vb9$ley7y_C8>(VA4tQ#$o6IVj
zy>DNz9&^_yn*BgsW2MR?^X>`=Y~Hd3NK_VjXXk|v!1=y=Vut%_plNktfEan4%=x?f
z?^i8YuPiuh>w`h*b{2WXINYh0T6#{!%gMS9j`QC=v7w6z53@>(xG5mIj-s!x?{P;d
ztRivR{D6R!FGv+O2q9t@rL5pp&Ani)lHlFJb*Uc%X_d!3(`29NRv8^4&sZJftWq;B
zZk);7ok+2zv~N;%b@j?z83z$0biA0@`<v#&S56tG;*FEc1oCQndN8i}`P9KUt8>qX
zzo<(%9w~ZmAF<+&*0r?t-g9ZAv>elq4kOsLE~2E(x{~jCcz)A|AI(1^NVL#xlEh)(
z9zEJzTPu;Yc1!l8cpX~hnk`#Ihoz4@S%3P);ppf0&Ye4v<Gw}Ukx=Ndm~8(-k8kP$
zc^6K679J`|maJ3p&Yhs!u-<%m!cvFn+h@N%AQ&(GIC%HDmGSEHn<|XUQbS5+E2TTo
zYlaCwTed89@nX-=*xSNeEP{f9!o#)q`i&Nvsd6HsVPm9$FivmLnL$O?D_(jMrsK5K
zZq__oeo?*j^r>B-aZL?;Oyf;@mZ?Wt*zH}~4#wII`S<9eA|LX~YsG`BN`!Z8TXg1I
zW7$cE45Eus<M;%Y<Rt6;H8<`hN$cKhvk)9GVCz1?>mu8wCNkeuysVGT4#!=!n=l+4
z&Ll=W|M<OCbHCfZTWgLzF-TdvcE$>O$yG6{2MJU4YLwg?eti45{^P5m8M>-rU*4~I
z>N|1kYPHfWTa-7d>VB*9aX<6jptUm342P6F{21!0UTw3nwy0^CSXE4P^ypEe^!#o=
z9)^n>FnAbX;L|NED&_80YAa0%elJ_H;^XI0KC70o-JjSjS9qQtwp#cDJy;_vYoe9I
z)P1+2n(Aso)Mh4qST=|i8><;NHqJM9`Da0ujFcCSYZ4O@q>7dndw3Kt89ZEKM)nNi
zOx$kvjSORNZ*RaW4y;k~cK5jd_St+HAseTdO|OQ^;8y%K%UVE9#+$%8e(Kbdf>LqZ
zTG@$Vl5Cx*Y4Iyu+;o;mZyQsZ{_)bKnR5E>j}H$JeBCr(JfTkGsJIMn??GMt*|~Hb
z$DMdfYL3t3>-u{ueckt&-nq90hdU`2bf?%QqWXBz=?Ta_MsU8TZb<yMhmUA)>T!!4
z)>6!^PhPMS%3nEkAUPvaezv1cqNVJ}sJq{#LXQm~O4!)gB$9{P8~P^A*>4=V=DS8z
zadFWrt;h`%!$LG)ofx_!g=KGPa>(h^Dlvjap|Q8qrC>@@n0u5{-T7LE(D8=?gO)sd
zwtV6+5fOpVnupF;O^ve$v2e0xjg-Q)+ir5Z&v|IxzngpQ?y?*y;XSq>lXb-V;LxE%
zSF8{oBJx33@@V=TnE4>Pc3Q(w(?@QK@9GYo1%gY&3a0$B1Syl%7DomotsU|0j=7fD
z2P7}AZDOpJWvWMP?87S?E{<CzBrJ1%|M_K>k0N~z6OS}DmL^X%*%5qRz~V{7yr7_)
zi`v|;jE^iSz0lOue2<i5abTLM>Ei=l8%<h?IfoAqBM&#fa(qPd>ja$ej?~mt=PY}>
zZ6@On7!NRTEGa2`<|h6^SZ06fr@g~*WQ*)^W5#@WSY?lk0~=#SPO_m?pyd(L`Ncjl
z^*T5`)}F=}$;mltE5rm#ZEZHLUR1Mntci)|Nvp44-<&(QK;Ay7<r;$?`|X2W)uKg%
z$fskZgwN-@*%*wf)vEz(##+4Gr}XVUpNA=j9_tQkD;VB3NRKosDRGpDuJh=L2V6f`
zRNI$-yy5WWb*5p{e5=`3bLQ-~v>f{NYyRlbcF&Rg*?YHbYuLhQI9Xp{nv`bz)bh~{
zhvhC-q4vdod7;-U^0o?s5j|RvxmmgP;XPbY%!!4k4wqdRTZdnG|M3X7MVB{eYaISD
z@rT}0mc4K=P3!FUmNToQS@VKD6{`)#uUy^m@$He!jl{8}Jjea1ry8$>fJL8><#kpR
zH`{mnlc5PhM~@!$O&V``Wmv#r`eOs}5w)H-2H}K<H=h)7vU@C0DqJ+bwLZ_p<V1na
zSQ++@wyFbjzdBo5F1b%E(+Hue*StzK{!rrn?(8Cq966ktpT(ww2a}bF*N47;A3Am5
zX!~2jxDOvb*lbj(2zsk@m+d=LTWS>$5T2eR?n^&Wuvz8ws#mKKIk{1|Q>V0m!2G08
zbH+MB+J<f7xXBiSxBsY_>X2BvaG}A(iOO+?5%M(Cox@g@8O@B>s~NOJMo+KugZsw$
zajy?7`tjY2$vh|`Kl$@OM0eknY3^}(5rMHbi34%N#!nFxn?J3!bacQh+@l9mV$N)_
zl-XWVg19R%lj@Jod+Ib~^l%{|p%t4X?kyW8gcA`lEl6+P!X6WPT|ld9VNC5qh64^~
zCS}IPjoa~gooTw}bxPc;y?ceEtqd|m$wQ_EPKrC3TKkQVJWBnRf|k}OvaMqH=>a$#
zVbTEbAI`vk<7r`nxc9+ZUtTvY6s9VKWFB=*og=9!pyuNfOQXFX>0s-1x<$ny#sW8O
z65-p<%+|Ph2W4?;rBc$;1EuQq3SXXx6vAD;eEE6AKwT+`-L_flmkl4TNX#vn&B}ax
z)l1;IX(|P5oz>Nb3!)w=9}|+76|$T$*uvt=z`?CT1EZ<=7GdV$m0KJQot(@pF3V>L
ziFsArySM0l@nD-&qKK&Ik-Ae$HiyNFkwlsE5^%UpT8g!;?;M(RmOaMJ5N6SvKHNI}
zt?|yqi4!MGXvhi>PH6COtr#)trJPm9TZ&K-AP>PYgf)kQbN201*iFzWo3uP>e5F@D
zSywn-4`-V$xoXY#J;sCLHxP(d88z2uEFV^{nyV|kqd;e#hlewj`U1$>V^r@pRQXsa
z8qQ~nMEO40nIaG*@34AVM8r#Lhs8U0?%ci|sh%K~EPRu+aQA+Xm{kXNm@jd5Ha~pW
z`oPIEkDC^I{&12J#C>^?A31#dgDU@ZP4g8eWqvt7JUK8RH6>NYbAJGCEZH|{viywb
zON%6r3>hzFupmm|=sl~j2SWx-^Y+eoU#e#yVK~g;nCJe$8yO)~YFN3``?iw})<SC@
zM=d)k`e@fFf%i8Z87CQ*)lc)tnSs}nj?CWct=d-4Sbj12$NQXvtG&+5CFeWEYsE)d
zts5TaJ!*cvu#o(r>uKxb)R`~tO3=tfaRT7T^OR;9`AsA7LSxfCAJOH9a}-A3s{i(N
ziQMI~H;*Sg7Od4Z+)yZ>hm)|mJxmnGzPd>mcQe>3I=Xz~_e0Xt*2yyBW#c|K{&m<^
z;P}(M<Numjep7X}n$TQT;en5vpTscy{0KGmOKS~GabXW<*xFuQDmrHF>I-gLH1+kP
zYVQQ$66FOFgk^BKCDg*NN3v(0jq_F=J0zkZ`Lnf3TWhOB#<&+L3yO<Po;%N)<>kD7
zG}+2xp5jp1mAKjK*0r2d#ivNuUo@gRxdaDqB7a!<xxr=kzKStBD<i7~@=2H0$P64f
z&@HE8RmGh5Z5I+}Oc@YbC12wf7vMpkWtKm;Elj1-^Q5>-sz>M{hu~o0IIA4For3YQ
z;$~{o%4}30OMn%%&+4J6^Lon#!Xh6kg4Jv0u1mSNR#rT5x4z!-cYwn^E-;B-FKVdf
z`XNo#+emP(knh9Yp@qeB20N`8;glEs@m1m&)r7iT=@WF%AtsUZ+c$SStGVv#n;RZJ
zDzQ!7uO!Z=E%?O2gV(7y^H=TlRhv2Wd(?+>OQ+znk5?)L({V*U-!)hdjwbAxoGD!Y
zJe@hLEY%L2M?P4SCTbht-rqm60q2`{bJM0GIh)c2?~A=lk0!}HD}OQW_HDoN@^`C~
z-zi<u6kn{KDsVNuE+j)+W|MCzQAA`%^CL|mBjI<BHpv;A33nU><IbM_vC}d!Ma;`x
znUY4;`cha^s^a}^sF?vSW^KyH&rO6f+Le?|)bc@vv!YXIZ*tt{sLWMZEBo%$seMUF
z&#l()ycVFZto-fe<t(>cy>%O0Wy)wbx0@t_6Zs}}Vcgw=Qw>8rZG-k6e6Ayw_bsN`
zdy2x|Rjcaf<=-By)F5eW@NEl&xo_X*d{2!a$ES}9R~`wx_=fEi8@t6@^-a^vto0cS
z=YMN`H<3!slUz0V;at7aO-^6$2VTTyEzYr>E%TmMb>^|Jnr()W$JSd5ht?Wh9vQLi
z%|1^GG60G|b-zw3b9!vl=iEx6dMz=thfj-1`ub(tCzThD7nl(HX?b|v>Y#iR37dzP
z)(&W{Z{3ib>_!`S($6aXDcJTuluA#nsa9@oyq#g<rN7`yaB+b8^rW<a8xszP*DYGf
zytK16Y4$8@``ee-j|OL^wqsQ)<BX1<y-y@3X-PFcVi~&SR;pf6LE`m~$xi+}HJX`L
zjObr0aX&)~35or9P50gL7pp(KxOkEfmsL?-k$0kYp8j~<zuasVHlMsKDzV_rd%fV0
z{0T-;7g)#C$ycj<d_3+CiKC>Eat*_tUrABi*7joJ$7MrB-7GYocu#-yt!C=P1+Dd`
zWn}&uJ9c+$%j+8%`%gp|*B%Qg%TOmjo-y(9=#iO^@FkXa*mibhK-PH@+w5zT7*_wl
zc~R@bA-ks}gdTqoB^+w+vncj(@l)p4Npr%UX$D>o(%QUs(u~D*PruvWOJW_79>w-e
zs<~=aRiM0F%yNqBV#yPs69ol|tfvhi2Ux9}Y@f7MOHo5ZV_K$+w)Xxkdso`Sh`fFK
zrn`6u9!j_`pz!tiOvPP0@6~15B}z|S=xY%_(QNPG!*43{8Xun&t*xt5)4_oi%Bq=M
z74E*X7}>BvJGSM`<&QN=;_JlBlJf1gq<$%PNKP0R9a_4+aDUOqIgHaAHf;)WpOvX3
z<haJ$$!W2e6Jhk$GjrZnf2=vUTB?a;lSn)7WjOSNugYkD*CW2y^=krfax0u|O>^P{
zl^9{d@5GZ68&_VPEQB}7ma~|2jwx=Iz9nVNeBAz3uA!$VjMr~`seCM6p<<fX{yQx#
zElqXzRA(PTWMxZ6p8zZ^@4&r-K0aPvZQnlLP;$@@AD_tdcz0&Y*XM~_TrONWa4|4@
zVd?;6_c+<gf=p$-tQQLFR!?9sw%a<EP**+=TlD>7y1UO-U-#ozM-Po}yRUfBt*G2-
z;PdlGspb3j?K^zrh}Tlw%6FD)uaEJT)Q$P<=pm68e(#O?^oVVW)r5y;U!Q(3_8D*T
z<jJ(J8-S#>w)*ay^1)|YYK6j{EpblYw?Q>)K4Xjsu3(8}%B>N)FACjM*6cK2*m(KW
zUjvpXG|3)+v1g!6q^FsA>$evZBb7ASw;LX4-ZrN{d~^Fkd6vV$oScythR?mfRIlco
z#b}9FTQbf#X37-YPW%y}C8kG_%>48zX7I32V|K6bT3Rn0ucfW6SUt-?Yf9v5T>8hN
zqN2cz=;?EXUX?oE&>y3?bL3=;170!1<2+KDzZ~0X8ly0&=9Pm<VNC5E$yu?tV%KcH
zPxH<XuDHBjzW9jmefvX5^@ZZ%V(YlIo9pxoHp&vqK0RB`_*&=lZs$?EN6#A>W&?)B
z$%@Q+(D-W0kqL{8TxCDAFSSJ0KcM7$u3x{tSTpTlIq{NudHMDCyA}%KN|ugNJ+0M{
zyeQq0nkc(t(O~a8t7ARrU+WoxXFfj=+QBL;PSRt7W7sf2aW{;cC5H^s)lt!A@7}kG
z`7PmLpjVng2`NsDAaq$Hrmbn^kB?I$FEf=&ckcRVXER{6*kmF9!lvPiHno*XJC9m*
z&-kN2+$w3^VbVH8eSHrvdZjU2Zu{I>qIdVt$tr)-aQ4T->evH!%+@N&SiM~Da5!TD
zb5hMFF}oXu^aF!iB}ZQ0pI+{o)8Jh|b6H+Fc*9Ol7nf0DFg>0A@$izmeL1=jZ!2G1
zOb(<_M7+*Zr75rDeRDRLd?;Bl-f&?>R&vH|9jg)c8@Bi>t*}^lZuXXg2kCWpXKYlK
zrsO;6R=OWqcx&>MDOakhs?P6~5b%<T6Jw4g1A&<J>gxSNBy%b?+v(iHp+jXw=Im#e
zCYj3H8)*l-93|?G6x3awP^2zF%hH#lJY6~RY=)-1_a!6xp?5)Jony|N@EIOzp+u%N
zzPt<$u}=<DM2|lXyE5BS|HkXraY;!ReWI%)toJ9SiOAT`YkVYmXOd97SSc~ZGgWol
z{Fj&39Y21??3DnnxpIcEwvLXQySvhlCbi8k$6RGAXU{ZV{OVOe;)M~Cl6!T;3a1`a
zpzOTjH+}kt^$y=RZS{&@Gl9G^&z^G8Yig~f_{=nxv)}WgWRuP0$c=NBOR3^=J@c)z
z%E6IfWX8ufI)Xc1xx{*|&vGrtZ^{8jP6bzd(0x)_b<=TC=B3b~wQb+N`NV`gXWdvO
zK0&3rMeSH|T>TMy2ZtLsZY=u#wWjscn{vgwRYQeBtp{8je&A#9fx^p2_U-$+HFDUZ
zZy)mZOr8`cK^|&$^D${peSrP-ztolDE<Ak5xV&!G!BZOcAACj-ZeKGjI`bvGt))p{
zU;l>DN86yFz2#2BjO}sSE5y^ME;7;8jr{)YtFPwZh@d0Y`%co7rffF(t~c-6=G?}{
z92{=@=(X8fPh7ZrSysHVp=t+C0w*jY;(1E1>9YKcWy@O&3vb<hvq=Ca<Dc(&_FH4w
zL;6W&fX~=PmZ~GS@7??Q{P3x^_Vx>3?^td$cKzW;cV-7s^JouK&(a^iX=_zIR-hw*
ziyJh}DRkG%!jopl^h8J33SN3Xh`yva@?8Ah850VtuN#iENZn-?b7AUR{JVrTnOAN0
zx3Pz|KDNS9s4i}92fR-kXlVgro%k87sh2@a*(FiCPMxCOJFs}Gp{RzYjkS$5u0+}Q
zoVnun18*u{8IlX8?s!c-e@?J;m9!cw;BC^_JaO@Q(_8m;o>?OJ=&9I_x0k7rnIee9
zz|!M8c95ECE3&h*!OrBORGndArcfra!^dJRklek!L)_fH-aq16Sm<tJBb}2oXY*#F
zTh8dX>{DlEXRcka;AmTG%nXY!a&k?8E~83T9NM)DSz?+gQDhXTr?Y76q<9w>my`_~
zR*lnlT6I(<^UM|z-x&jD`I|i=4k~Edp>TDA{hXDP4u3>6N>@!^e=A5w%5L&{;uO~)
zt=R`Rers!5xbQ?A?)2l^5|Pa-=QtbY2W+r!{P=Nd+oy8VC4-c`PaU5(A~1R6G`j&!
z``$HXxK>rjT_-)O4PzN*8raT!^l4{$(WQv5?txk4e9z|khsVelS1UU2xtgX~V-UT1
ze3aCfmof^=JPc2K|5WY(WcHnnZp&}4-FNJ>NwI{$Uba%ivdqi(mW_9O{j!p@T=Lk+
zOi?`k^Si1amE`1=(uq%7?7dnABHs-QHJE7qCU9G9>c)+_&|quiWVVN2-7Los$L2L!
ziJKiJ9?Q@F+R}33+NfH>C!)Zek%oZPyt=k!fS@2`TTPD{H}{L~D_i1Xla{1@<UUPJ
z@{aV*IsOx7ybh3f$@Vi#m}z5UV{QH5DAjr1yqrd*%2T2<Hz?lAG-u+2ojpTB>i5`f
zv7KCgm{K<F!Y88?#GtKK`p|&%jH1<#3YMpC+9Kn%L^yt5P7c68Bw!@(-@o@b5^$lk
z^s`WD{r14fxcQ$V+?U{q<Mf#?0U;g<xF)3+x_#@3oAvA6UwD<|D$dW9tax^QxvJNR
zPjKYyozh3f$1E7ExApAdtAM*l)ISLS+F1R)tu<Lndy2BMT~>Ma*o})PzaF7JE_-i5
z8h~x9eb$gte+_XnEvZ${S*HaIpO%Uj4UGUWX=-Y!f@x&GaWdSP;e0sz!<RDK1Fm{^
zl5;Nj#jm*)bQQ3OD_20ln9uhE>u*OgB<0^y1S>@*;E*y68H-!H0RZ+HMrkQ2qa-9=
z)zoBdAAX`_Yl`J*a7su@8sg(q_4@T|0KB}c?20l|qr9EXLZ7~jeTu&`Wec*zE7msg
z0u#V~B=83Fy0+A{M}@5A!^ZDZ+g(tglax0-Gc1Kd@i=hsAcIDu1qCT6E7#vUSam$?
z#i;bja&i~YB;uC&8Sx%|u+Ct@{IvtKO|KEA<(JNxGe=2DNmNvH<j9dr3ChCnZ_Svv
zVZ#QIhG*5)`TmzjsH&>wg-@9>#pKJ=0i>0;gYyCPStq2njIJ#k8#7C^&_j6pAouI`
zO&dW6O-)S_i5G(N3GvfckIT*tO1$9Y?EIpxuCBUz_nC^vDxm^&!GU6Qd%>c7Eyv1Z
z(gViLwb}Q%@cyuuTgt!4Y`=FM*Zed^JI6FuajmC|>!NIv9ESbd^L8f(e1A7hb?(>J
ziH_%g3_k4?W3@ff&;^IX8L=&Av&opNCmdoG0;6{XQs@+(%fK1-uE-1+w-$3qfhhP>
zBB*4FaVR~6Ns3g&w<Jn@geLM<mi870%zPLB=Zy6K#q`trAAHyTf2EIJ{Qu}`X=!x!
z|F5If@BinIq<;TD{r-RY{r~rS0{UO^1jJdIT;D&v26X6m0MzdQsNVt5|4;7!J35=~
zNVBkmj&%E95C;J1ix+=9$BX|j#tcyD&cQJ1b_n{>pi=<G=z#!Zfi#96iH1awm{gJ<
z1d4>P;SV&*D8(Poi_eJdx>y9r$RH{?2nk}){2}f;1hm9LOwuWl?fB#|!}hk|`sPK&
z<Z?%Te>YSXH!vc^8Jh`K0fPxdMlyvOLE-NduP~1ec2MYi2@OC1hTiT*96ay}D&jjt
z{KSR_y#aTPsmd3plmn0{{U<HAg9WCH0$oZ4qJCs}?oc`egXL^wED9}vx2qZOLaFlh
zigsG%uZ6~??4}wjDPr%stHv2mr;5C&v1p`Ow0Hk5@h$o2lYdLZ=#zh2?9Pc7<|783
znJ(l7<zOm3KqWMstjwe`RQ#B#3z-Z*3X{!H4W-gFRDo<B%BC>YwN*m>0|+L73g<y+
zL%_1Zd;#)>bwK?zf!0xX)NHP=CNL^4*c5+)3f>8N>43xiTk#zDcT}(#1E_)FOs-JM
z=gz;wE6j%%1zR4d3k@tjDFflagG~V7ZqUgP^cY29(xRbPC=xHu0EHew1+xWLQn$ew
zcvJ=Y>MUk(C&RSkq5?c50Q$i0=)VV?n}Qhr98Xwid}UUL0L$%U09}4#ZngtBD+sHJ
zdiWw@zQcI&crj|{Ej^5Lgpi`)v_LmaV9&zBuM+Xln-uiTg<vl1St^J-bh||dbOmZN
zqq}bljp0EDqB<M%Q$*ra@8~zHGe8_N!J6PWl!N?`GbAn}WC8pGD(2{*Fb`%f=z9P$
z=GQC~>?)XZEiiBJjKm3x49-eyDqtv7b~I$}(770jEGnHE5*~ulDRi=gabthfZyZ0D
zRdF|UvgbmG`XB4~+RA>q1NSv_^VRXKg{7J64DM^RFIIb~Y|Pson?vj>yucgWkOi0@
z8#<ZNP0)f)9dsL_!G*(uIb|T1#D<G)xFoo=;GmTQnIv@Ve7@tsE(D6Ap^CvmM4N=*
zhCsJ&?eUM%aJDc4G~mTRG~qf*>oI&lN2L7}Xsk%LFn0vAJ@PoDm>_Ck5Dj&3#f=>e
z=s6Iq4W3^rK2V{rIx+()9e5}}JL}63ux0VnAz($i9YQDrid|H|d!msb5;FwilSO5R
zlQ5TtedyoP$;rW~7XUbAx`hCX0nRtafFvN=SZuf_lOQ|dp^zVCoFLCsdN>7PhSTX7
ziT4WbbW;~o+g`xsl<5{+z*qo70=Zxjb_G2W?l7F$rm(_80M7s{jY9J8GUJdl`2q1y
zrBf^lO%pqeeFAo^`S-|>!Zd&kS^<Tb$X$<$Jq#9X4y<;e26Gz84&o1^-KQnU4JnN%
z{Db~bhS2AJAi4dcZXgNwxtB;1lm3r-fmGJ#Ua+O}Pr5;Asn7ickbqqAkNQE0pwIoV
zC~RAlRIt_8Q%9%>kI4ssh}dYS9X3EHy|pt^J`uDto$!e~?TQg7^t3BSxZ(~ZYfc$#
z&*q#*VDB732qj(^*@%saK^QRb?8N~F&+%^vy$t%3nEsroYG??kNKhFv1WeL_jkF&E
z{23IMB2V=ANf>y98??RW5b)smq`+-h0iG0yNGDS7q7~?nP|!Maho4trQot!0Fe_#_
z<!1$fi1X8i@Lg94-|oc=KM(#W@bAn-guvoRPw1hzOPqT)Gn(Vim7_@ni;4+mqCKKL
zq-F&ImW%jP{ZTmwu;x$(9XgVXrm)+~qBO}X98O1L$3UqM6ah2Hq+rX*H548XqbTHX
zbcVURIqKGuyUaR@(lqpV4bPZ(78Lk7PC`4aB^AUT^LL3ZMs`>61MqgZSSTzu3(pnV
zf<O~AR2C(ZpgN#CkrGlGdcNTo1%A3FQC9Xdq~S3x)D>0jh~iQwpFRSM6^IfqpXL!I
zQ<n}1<JCcBJ$|>J9q`8Ud<vyKgma|+JDSVBX)XJrvFy9Hvagy-zSFjAD3A(KGC-Z`
zasohc*;}W#9YR!rf^Y$#LJNh&ipHEVccXFP9tEL;?Qkdzw)>M-L109s;BX*t(<$hg
z3J>O*9*8YASQ}fhT&4<hvDP{sxw`9>Uyai~Hm>T#A64N&g%qBvJ>e*spo)%!>dW9F
z1EXRf;V2qVy#*R!jL$tYo}+&vbviNypwrxO`~V&xt`Wfjk;US8Z^m=`foC!<AS#F{
zi>qHmwM<mriTHor-6)@G1Pk`0+3#-j-%3BV|KQ_8ztYFg?LX9XH8gd)*neni_uGH`
ziPUfZ(Qp6JAOES}>f^uL>Z3pY)BmRVM~AT1o#PDkTYdbuS$%NBm-D`-b5sN1P|D5g
z5bO!;I8Z;-K{LWLkRWj^C{*yBnuQ_;8a9O9eUKzJg$z!T9X>&K7ttJ5W?*qp0O!L8
zGyGJH{FvZegvS&_@PjBHU}(4*I-T?J7mNr7fP&#__`kWMx*9qg&ke5Bu?CsO0Ha0~
z9o=eecuGg^`4)p&f#mNGzdI4p$SBAhB6#gcVzVhsx)+~ftAjZLdM4)7<D8HUIHQAQ
zOtClI$pHUaIU=0mFdPd&EBro(o|yws4JkadbIcOZ7TQ(KnBfH+wo3b&>;wq}yc;mk
z54mtmAy7Gi0Rp%@1u|DGk~vpp#6<NKbJSH-bhK;~d+w+mHQkLG3B}%V$KC#^grk9E
zGHBQr{SI@AR)$~D!CF`81in8dfD}$+V;_*=Bx7(8<ouz+LJm{m$#L46ODAx^Qt6^2
z;%o{$wa`yg&4iBYqi2OPXZ;Y+*KkG&L_`~$_&Td$JC;Y-V7a$zRnf0Q3Iy~IT1rKw
zi^>)KBhyjM+G9MI{#Y+RQ@-$>`BCMIZols3zd8L}{}cA>mw#}5i2tpj*;)UiuC3Xx
z|M?TCU;opu|LNEN^y`26^*{akpZ|aKKU}@eEZg3cI{g=a{>M~6vur!-e>mm?{BJsI
zfl%}G4%X?I<u|B<2j?{syv>7MV1bddVKr7Ct^J|qCyb_w>3uLAB@w~5Un_tn>%1N~
zH+nGl1Xu-rNPlW_(^YvBMvFnGqFo6TK!S!6(cpw`L^a`7FjA$O5Yd8j&=I0a7qkRs
z_l~~z!U}-4p<W??N}>7xqztNc=&cY3(?2Z+qk)4nZ3G7(KL%hNBotyVB0lzKx~DFK
z?pFN+jS0D`AHEAm{MINW-bA$P(m2*B?TzrNcDe@yt@@(bRA~9ZUmu#maI6!t8AAK=
z?^&(Ho0uMySm>N_49T#2R=h>cQJV4en<|J!CzTP_7p67>JBtfyvDQ&f)V-#Qw-ovS
z6*kQsph7iN;B{wBCx+L~Q1U@&0V?(h!1i_c&mhFKXa595)Jm~WF!GbZKZBC1DEudI
z+F^Bjhm=Q&-N0x?#}<0e>S~VhE0582R9|;c=z>=qRVOF9cu#6<egFcv*BO~eB#Dki
zK8Fx@u8nnyz)ZkaG4*RS-}>k0H_&GF_i9VSXoU7mbYD;j_V*+6^rsYh1QFf|fEv{H
z*9!7vMu<vCH1}D>f(Za*$}9G)b`7H;ko9-R_<8ofn7u950vQIC$2tZu7;x$-$iwao
z(4NtYs~jb+D%8))6Mt^_3zIyX94b#l<kdAa<+1JnhA2$70=GXblVc+cGV!P-Fl@Q=
zL_luegU%QX_ID_Z|L66-VSE;M`u$4Z|B=+a{uiu3)!)|#YUHP_-IM(vOr7+<+TaO?
zX#YMCdQSi2`rn@CpZojQ`}q6wucNK5)<6G$BK1E1T<r~b{SW)-#r{`aL%Y-W9}P7f
zZJqw_KYt=A|K5ZLdps&m@U0qDqR`+-6dI};YEYt3(>2i2N7&(D@nPZw9;@t#-J#=t
z1mL?N&9RYyt#ZnmhO>hhOqK!sjUL2FfegePNT?*l5sGh!0vpYnM)jwVs4NvINBaSx
z6RT~`2#sc<H-#0*iV!+2We6f-gHi;-(a+(3H-b7J3xM?BMRmg&rb4?l2@v-AL}mU9
zeF*XkSNf<76&Bkch-wDtaguj=4#>ozBqjwO5LtnIU=R@oO9h_W6%@O4^z)wjauE>7
z{yn@?#DjPLX;S&GOuh4eOeg-&xqq+xUsFv>r!)W8RO`S0@ki3{W^Y{n&s#Nri~FPB
zTzcgGP?-}*ji8{ek*J|mXzBQ0wG&|47*+^76fs7)Z#iGEU~YGN1&U||)Ey0rvrAwP
zpb5?o1`~;i<$I$7jS=AGSmVwa?IqEFr~%vp=-o<VV}wpceGJige44}8>CodCK^_*9
z=ktw2WpRh$k6MiISbTfSOmZl@4=uxDy|&!r9{CGfBxg?e)N36#N6s+%wnzSaGY;r9
z9V)DF>{4k5y!4cMsM`zNor?cs;CtS?`Oz4{3IqVfAU!QWA_7%GAe)86{<JwxH5MbB
zNrpN?NF6F1KovkQKL@rCkTQt~uU%*(&ZDrORRuGM-gNKVgz+!%pL$2=6}kVm<khc|
z`>##C%YUdf#;=Hfy~%$X8eQc-b<O_s{~t-eTd3j6f815`x5PhZQUs-Y=?`^b2;2Pc
z68O4`b8w6bTz?Tn^cy)(uIQo;fGz-|L)*(MA`6WX0%k@*=(q{-Tu^`l?Su}+mX3lM
zUpbE3Lu?ZGVB$&$e6T70L_hJ%vR43rh00KY-){M!Adm=s+KdDK{$|{9;HWto;w#6J
zN64uEPuME-?udO$Mz1G9*Ngz=L>~Hnhp^PM%=sIH%>a(Zrx%GPzyST)uJ8-;RKNW3
ze>wHO|MOVIzoh?HSJTw#vj6L7>Gtpce<J<vJ&wEo^Q{_G1kmejQJ`+1t>4L_09NMs
z>VkH6VD~`S42&6fGS0)ima#BfH>e39hcj7J!2P1Tl@BaPfUh$U7gXR-K;@3Ef&nOJ
zO7~~JLCm>8DR9A?*2S(<@&7Nu1KUubtU$zY#@*zI9FrU(;=@C=@y`o#%i-~uqiLQg
z4)m@E#%Krc%kar=cpq~IM-L~f88cm=@WF=y^PW*a!24KOI-5ILIl5Rm*u#2%<EjX#
z>}KiY%&FMHpBa!v2`H4%t`74aYTJt^;SSP37l*<;XTq@2pZgQWWBmb;&>!t^w7VDW
z=p4A4o`2>e7_{~eTm<9M-T_eXZ#zuw&Pe<2?H6<V2bzL^+neHZIQmcg_JUS=aofvr
zCI~u4f3)|^=YsTaxZs7|w|n1(ZT-{%FCOa!^p5`ES@YRix>>^P7`(_Fbi%#BgE|pB
zK}>rg;7J2ML1dv%n(zr70W7HnpU@WJlQwDq_uCl*WJx?bXUK19{5MN}dv`o04i5&H
zEk58GBHUvPCkH*maEo$|F(M)z)WO_~C*4?Ys}S%as4iHflXYZFEX;xrD%grJ#uxxk
z@Z`M2pa5^NA9!9Zp7YUmD@ug_P@@Q-<QO=jb3X^o_3Cn-2&Z#hv}16<qXnUzuW}sV
zD#GSq>pW;Nauw+S6STPP0UW-Az;A~O%ou-Dh!N+p9bPZ)ym2ND{DOds@FtrJT-PJ3
zh)BCNuyK3$e51iy;yY|om<HHvb@5Ky5nUKt=0_OzqP+sru~q0%7F{KLCD7hE4Wcfk
z|89erYufG`M7>A<-3B2G>8U}C!Trq!Q7+WOkTH+Yf3rc9k#%mcLoxK6_pfj`N9^p(
z;$4N{x@7*{eep2T`AZAusP511N}7CD*fg{_`b`A$5(4I}M?W4NZ032onm|^#AD2)7
zo0O9yp#OruTyt+u7yRY1Otc{Ei~s@cTX7UB0+0Rmr3wc)LMJsv`%(Y}|GlMPjs^DM
z-0I<6h~SIyf$vldy$gfgxj=<W5-l`{<VQi{aDeFnJJ7$kh<J<-g%YBPqZVRAa+a5e
zO9wDh1(cg&Wgst=N5yt|#dft<=R(Gy5Y{w*DTLE-r%gdF3``Xd0tBJZSd<RseY(QQ
z)#vcaVt|vvqcD6Lb3Za;H|pR$I1)Jst50m#7g9mTT)h)I1_tJnM}dkCl&aWKvxhYX
zq-MC$ar+{IVw@6ukoQ=aHx??-oQbQN;<+fts<Ie-6**+gL!gR^e2hHb$XSpbK=Xen
zB@*~v0I3tbmBGpEfDbCd2Ut6^r4q6AXwRo*gxG0EPy1^{^af3LZx9niO|cUKxxjRs
z&^g`I_Uaa=-1@w7Dk=mxHWiglE%FL@bw+Xr9P+THqJlQfEy0gWz*9QT4*wj)%Hz3B
zbNCC$@7E`GNWJU-IQA#M@CC59?|+&aUG#t2YW?5;{z&@W+ZR{=*S>20-WNbXojgIU
zs|{Eu*L+Ag>SCSeUGKl^;~;16z((5H9;~}>huyjB>*lNBA2yKc<HxGL^ns3#dsC6K
z!nl_eJB+$dUk16}=Ki*=4wL!sS?lmFWcqg;rvYk&)HnMhSo_Zpivwr>_rm|LQXlsJ
zuwS$O?sfmyR`2Zp4e(p_e*bTOB>nDfjJN-X{eA0i%>1XP%^x)Z!kk;QZ~I}i|E@j1
zTQ@H4*4-k#ns)QMaOsi-6-qo0AN;jC`E}_oms1z@z0s*^2X`;sW^*cIUNJh=?&Jri
zhZmd{xc(}zuLhj5-S|1c?8!kTRPoVMxxRdAuxIeO>E&}J!R?Ay8&frlbmLZ`lf`?x
zZ-WkdG@lcOp5RsB*RF83(cdi1K~(~jAv(jV2$2aLH*j#P*f#;A?}O?ED2`myw_f@1
z(kIadrryMx-yqe|F!BMo;L5=SIS*yI5M?=kL~f>moSlK3b1z11SVNfJ3hAn?v$A)#
zbaFwg>|GoXIToTI2jpSwe?`R2)YjF~8BvgzV?n1Jynhu5eQ@Q`W9rOfh}|&{Vz*p@
z_;Z}~sozd)g2=`3-&^#3xew5O@Cb#@oggWwU_tyqXXrA=W~Fa81p0dJ`0t?~PMh4(
z09Xt-=u_wm;`oNqXXO1G!}ujOz!|{L_ko@g#8_VrSN)eo`cvOi_vb%5(mV<@W&S;V
z^m6`F)7I+j|65yEv;Y3@A4!w2;~ICu+if*<Rn@dr)pZdK4FfG*18{J|5WqRG;cZ<_
zeJre;j1kpv78COgrV8FODR3F7YOAQDMVyV19$bka-Ci+Ay1RIUbpJI1=|)L`cXDuW
z@#)$zpEW9i$NPm-!HI$lT}c|?@f@$b26&N>dHz%;q725Tz!{z*w<cbM%*l3E?D;jX
zcm6W}xB21E>0c$1O8@mfdZ&NgF8+V|>Hp89PV^5a9OVI;93G&ls;-S_s2gbLcJ%<q
z#|6j+bHVZfWDo!Fk^WrHikjPr^m+LmNS~L>Px`z}ej?`2@5mC`vpFoGM{>8Cj@Uc6
zAeOVOoL%_nmD>P<v4gHJ@FLS4oDexGIA$RV9G;+vSU3O)Ei@YDcT?p*J<UC)?&;sj
z($vDv@^|&o8~v;4YIWZK)wQ+y>Hkk8yd$6s=z5w$LHrqH7Bmy@&7t-G`9<BI`kcC_
zf55E+sDa_k-*W)y#s8nWx@Kqk*U?Z@@2CGiktWHg`cdgXbO$?Q05S(r4rrGJ7))v)
z;$_HHPlQBtdc}Rh2T<{N3OR^@5L}qiaO;HrsiBK|B$^S9aCTgZKeV}o&Un$Tu#kRW
z&GFg?zkL8K#=g8)zU{d_U@tcI1^=KQGGsZqzIcuWTGzVT>V2pU0f!Gv27}%8J*?%+
z!HX=n7$O7B_4v?&4IG-2Qc)XGUP%J)rFjsEj*1jqj1f4Xp(iF|UX4yCC}`{Ek0?_y
zY%5a`0&799=dSh=vb-J^5ZdR83zIz~65gLd<U_z4?i|SzxCm_@6?%!95e^L!Lb1Jq
zQy4X&Re%<Tq2X*eaxmFU#L?7crXm5w?0<S~_ov=d_xv9^)MouQ55WJx|F0H2|MmNS
z{rA()<{$q1i>4oF>P`OF(CIw?y6Wov=l?&FxL1Q=$OiPTA_4w1Z$GUQh@8CX)J_?8
zoRd2*!<lywZ_k=#%XyB)<2#$T!vbAQ+qwQTMEn^Ye4(J<7XFVb)BZn9z0tq<FMEIP
z3;lPo|I*UxxBvPhsdJDLj-IaPn9f|^#687u=Dh!vm>eDJaJ&*kQrSU>oED*<1^m|3
z8~soJW$$l&p#Lu4|8#ZL`|p4Jk<^*~vD0Z!#E<UC=*BLG+TNhoOF1S?gq}D8>Oboj
z*uj4qMgP^QH~P2xRp;Nh-sxYb^ZhSC{~G=D|3^}1`bWRV^~?a!*GNon#!8q|X9UK{
zqD_M_!=Sx&?{<cmm+8M<Ev65KgzfH-33KE)9x6Hx3gu9}+a$&k5oKkr1LJ=yD%qc#
z|K8}IbAbD$K6;^lbv4b--~V;B)ztdw|4*d<WRSw2vynbTFYGz}LR`ac!WQ<Nx(#U9
zbLtT4u;;`Hg4lEVW8o41)626z{mZFW{{PFj|NC<O)99@K(a`Ca|Ncno!vDFq%X?zm
z*d22Mk81*v32fGCJstkIm#q6)(ErWUk^W(*`rqHj-~axnsRh_Y|M$N?kh;#lKjU}C
zeue4p&%c(2x_bZo|B2N7{QEI~=Mwk_^RJ`cPyc@;^*H~WIQA?wDEP1S@pJi4T|=kK
z{Of9}_xpeUBgsg{!ol3d!_g9f^NcvUn%P>JBLrntRd-EuRaFZYi}twkh%=i>C9_pk
zE$z`u{N2Q;cX3k1Les;VoS(`pw3>=P+n->9H^PFv8$k^kC+0ny%BE3FY{N;;vuq8Z
z^F?^<kD&UK{3!_d&yPeWLyy`B$Y8M0+mi?hp#ixuoD@h2fp1X1*Q5~AWHOoJPo)`7
zCb6kBe~KXk+Nc?+VjW<efqL`6Ih<xpV6mgY`VOK1aTf_<QUZ(#KQ(*?bfH3Ku?VP3
z0b>H262(@9&#ESP5u*_3^c+@KhVpcTF~J-<ouIRoT|i+1>aiL;acV&f7$W2#=!~0f
z?CLUISr4{iq>ACh2*yA&!Q+kmsSya(-<SYvLyz4|fIgA-Yyg~pIGGJIJLmZTS(-sG
zF(UP0V6eW35j7+bA<+PY*fbz$1MohDF;@!|N)N=ws!B33QUx7$*Dtix0R8$=15J#;
zv@_^|oOv};<vbdxqAz=Dz@Ne*GpV7dM+K9AVJV>9Vt)`L85nSY50i+pGC$r!0Ma|6
zoKA|M29hw~z!FyH4G#PSg9)dhxTI0rF;AuYQ=(8FN-&wp2%$jiL9fW1vOSib#E76U
zBdC-}f{7cI)jo(B6efv=O#!I*(-r_@V~4W{CeG;JzSZ$(MAB&t5+GCy&ab}JBQpWA
z*`PCX=41*9-s(04&x}6yiY{=tk|EWQ*o+Rfj8r*j<z#edB!ol{C($_gwL>3%j$ytE
zlc;nyHu30uT47IJ*3D0bz~2~|5fVy;D-n(Y{v^@;`&yS{P)p(h0-w4r;665n9-P5U
zxG+g<K#g=X8UgC({%5nn--17?y9G^PO5DCyqtGL$fW%>!K9~b}f{AH}9}Lq<=`#|!
zI$vH3kOxHl?a2sdvKY+vHqggD)(vH_*f5BK4`9_4ItvCiAecB}nJBIIsTEYa+@T4(
z=)TuxFiB(@r9*WGG^=;Y;ILWCC<+kY;FR<DZa3rugc_(>=kh1;G?{@>FW9m9kj>RQ
zcdU$UDqwpE0NV&fg-&6sa`qJ#SC|BtgE<&UcTj1g<k?xT-D~@7fQ5M!rs~u{CL=u5
z2k>Nd4T6bTcp&0}z3B>bpW9}ULprr<?&jQmdl=^1pSnRUjY<Y{N8zB>7Cvz)n#4DY
zSWBHZB))y7)1JhUB(QBMNCWl<_grHFS6&CZFKE4e`au~`J=Db1k3@}P5RnK5c`}7e
zWs(hH9E`~%Y`T%~5F`|cE)+Tgp<s0pe+EM4E(d>VAes@*VjzCpN-Qeej7f+e)sIGH
zuqkAc3f?jVVNn9Z!H!Kt7~x>)@tT7{Qowc%_#|kTNd-bT=o8Pw*CZ;Ng1Ytf;f#b}
zg68;Rgp05keoP9&Kww}F8XIIot`;6b0)IfU5GtMI4;!bWZ&i#`L&2~ChBVtT<VOMk
z`-HP77>Zmw4+Y>#6HG-Y=!Q%qu~<Bu0%U`E;oN;?0vIp`$^A@*@FXM-=OCcP(IGO>
zP#PEuCUJNn9xzH6UIP7egeY{Xte}X-79yjf4`>0P7v8zx$~<_~1rx6_|7R@@7|NKg
z6>WtHx@OYRR@fvz3XOz^e(*bZUm;jHIXEINre?O5U<EMXa5;szeee~YGY2esb0<qv
z7t0P+5CxPN(AzUe1c?b{TLo=3MeHjU_I;f%8xLKDczK~9lKiP;7~2L&pMl|Y7DAy>
z&`pblr%^dJ$?yw5Higy<7FWCg=wN}fLU;tgHxcW?m=MfhQKpg6Ow4oui6!z?2Lb|v
zLPM+>BrtIy?bSlie3f7<e;Sz-5Dqr)?ppxUigs<mVDk4I0$)t?hnem5V(~CKAeD%O
z!s{`iBr1~y<{J!45zrFqmAVH!D|GbhgrXfm_`N$}ct^9lI(Aa@@&bLTaQrc0_6;b~
zF$XOG>kL0O5SIY~Vml=s{OKMNg0rQqrMU}&wS~<jYNo+iE9e|jLqeI<5a>xCO63d~
zkSmZ1_Z=4WiUh<wOj@S^hJ?_85X^$hnG9$P%rcV^2^VBI(;$GtCI=x3F|nNBj*&so
za16djkp;S-vpXS%U=La|KwVr}Dnr=dZ-9GHi8Ffm3mZQ~07??!K$f7+C-G<k0>k4f
zEI2KlK>`^Zm^kPQpn#=}u)_ghuo%}Z55J2ZlrlNL0XJe&FgEPafq}8$&0F-m1GpxS
z85>~St9wp_jktS4Xvab)Lg3Wuxc=Kq_q_gj6+0|@{+b<@J#VBPId50i&Sk&=3+-GU
zW4}Pw@`v}4naJdDY=ms+$}fPzq>w4-ropX&o&U&?@pBg(Y><cGpW=~s?Ep+J3tjRY
z$&(0uSNg!i6UvC%1215t(veI!b-2`mD0Hl=*zS71{hC9Eh!<F+*g`|!z!e7n=UX$D
zaGCH1&71dd7P^Q?*oF&zT%uHgjT-4;*q!$*R8A#yza^pX;C|HOo<j(U_VM=vbb<0Y
ze<FuXaC|XCrpLoBARrdt?PNAG1!EwbLm!Kv$VcBuM*>F_2y!eAO?POT!^!xNWQw5S
z;UL<(Is22yR3Iv}Q$CqNgBlyK&}cv^f`8#<M!25vC~d=?8=D#x#1gQGQ0|%xq0oYW
zbncJV4FUWPG)98a!eGBlJm?;}o1?S1XD&b?R2G05pq&KiM*$6R2$&*}3=rNzL7>Vd
z6!2k=u%rlNCv0_dprJ&;z++VGKu6&LhbRC!gc?94!^0*XtP&DvnFLA$VgURd?Him)
zgGekzj!4v5(&WmM95J)gTT}zmNdhJL0l5xUI)!$Trz1!-Ao;<N4IF(SIfz1@H#M9|
zH3r211v3HZLsb*1Sn8@iw1NU0)`~KwJX9lKYAH9E*RG0`As|5%=&;q8ps7wkBB}oD
zAY;P+WA9qvqN=w3WY(vX<=bod+MyZR0K*#r$pHo!9y8N0fQBJwX3oH|dBB_*5XCan
z%rrGk$rLe(ylSG^clD>$H6yJ|B769LMrvAMrsDPS>0NuDbLIhqdh>o=`@Wf<0&~vU
zYwf+(+H0@<U;FGG73GJ5;<)I#h_4}QhM6^v&dEL}9;i0i=p=&QoHjftWCY&mBrFX6
zwch9i!gP)fq1#$YoJ71!(1qOz_c?SgHi*MP|I_$yyZFER)bI{@+yeg(4h;=%jsJ&8
zLwxxEAMx?w|92h!?@Ivq5&*sgfG+{yO91#10KX#vAdvG2b^Y8BVJgmB!k{hq?~yq0
zWdQEJ41i|>fDhO?Y{gTXl#m86m;^+?`7{?58SG9&2nm!1hB&p4azkKp6cL0cNzXtf
z?Lq-VT!!H2G3<wKvlCbxW()}sNS}g1gVp1SGoD5ZusS0BBrsNIgSi}GCgUMuoPRJQ
z%7!B>V5o;Vc^tP>S!@vb!o>r^Ei=F65r5MwMUpZgTb+4{7YxoSr85@C1XW^uf;*7}
ztIfs~Fb-TPe5|m=`8d>{!C(-+N?WkPFm!___$Y&UmPTrvvS4Y;Ft6mG6oyGzo*Ii%
zfw2Us5)@I0MzTbednql=;?uhYSi;J>-%PaX9qj-jP8`GidC)H(lY6y_U^lCfhVWJq
z-pVSR%@FW>JnrCt8(5dXUoJg!^1L}qsk<SD;O$7guvA)0oJ2u9ASC_2vl2*$gZohT
znuG=g<HKyEVeK})h_+Cyz@E>n@%3=BYoA%G{udm4b7t<1#M^U`IA$W;A$WU<n<?>@
zi8t-SRuxEyWjSFnj`r<L8iH`RL)pQ-!^I+U&JK>fDZLfU(dp_*f5gaIcwlfK%BIIt
z942LeMw$x2ZfUb8%ik9i1>T1B62ZEOHCW2)Fq9W7{4^2dx+qR8!?{tnpc|KWqI^W&
zX3(zLY9QE~vrbm-d734@fM%Hj3+RKw$r0#ld|Jyw-4v;WNes5rwl{`SFs&(}V_H=W
z=H=014wm9ZBs>O@9%1(I&!8R7EfT1i_leP*I>1fpNt6b)B^Qh)2)P)pbO~*W5yrn;
z(T4df<*-}9Hq4Bj=iyN}fmn?jX`Bz{Ekp|3!A?A%Cpest7{SjQ7#QwA=sXbWKs27_
z2p8Ja)Mfg_7RmgPbxk0-pb8lCgAOUpjmX##hFWxNQ4A;Dn|!+qP*u+4{}a$E!BySS
zLISG>OL<%s28jq192p%P6&)Jh3Re|SRlfV)99q2vvU;}xtACPDyZEnbc7De^Zh`-X
z1-IG%AtJ)J|Jxt)@!`Kd{MU#7{x9Ia0<1zHU;c{^_x0hvKHS%b``#6}uWt?bpC1AC
z0DxTs2d3?9@W3E2hBx>j-nEj<OkvcBwizisjaULtun1V#xOGu@p*38_Yl<jT025A&
zo*`?|+K$NniSZek!}vv0cwIJ3(u*C0fG{v)lJ1ZNkr^NM(E)f76VPchQ70IvEKw!l
z=j;-0$}Zs{EeXN1pr)=48zYDplb7=g^uSwV|I8xFrn5120a>syn3)x|E~bG}Mfe~C
z*8)+D?U03EWMNeR6+nJ-tI>sJS>CV&FH%RW)o3rJY<Lw~i4DULt`%x#8s^5R9aA#3
zF(t9VD!?d#Vjh%mHx3~tz|RVC0dEei!7jd@BoBc6-5@;aFbuXhUl}kkY?0OCj^&W`
zbFLNru9(8$7E?H@hZn>0D6C6q$Y^EAZXp;jhkz~zFO@50B^(5gff`D$%0#2#FQ*{&
z-asX>8_mc-Trw(fLZATNsNC`2c6cIxH`Fu}`W8G6{24tAsGv6_1NpPU!a8@F#4vB!
zkegQ@Q7oqx7p52%D3!pEU;>j#y)=cxvf63PEg7m36etSG)QYy0dDOUF%D=lwA>LGy
zdJ~oKXkjW<LXjCM4Ns@RUtxl>IN@_jK^|mrW}rQt@MIHI8RY0QCoS)~_Uu_ME63LD
zik<~$3l-q6wSA+;NRFmAIQyJ)nW>S6AR3VssdmOj7Wq0TagosX3K$DMm_vL!<8TmL
zXf4HgFgCELu*h?81GY){dD1VDSWVJrEOM}p){YU~7B4d9>!5NrhGv5Z{doQx$@qm6
zpQ53;b3{VKc;NALK3p_S*4MgWw_YUV%&TEN@ZQoxKD<XH?eppqol_TFwKmfiE@4_2
z7Uyz@a4{^7&ktm`$q!)L0*W|CP>5@Vvwa$?j<$g!6|~L4QYOaC>I=(Y7_%6h>`(#^
ziHd2YwVItTB%x#n!&0o(#J@6yEdiTK8$Gl$r{`lXltylGj`!wkq;JuCT_8Pfsh-b$
z@D24|a|x0g9Fz?d@f2R5?qnrF+Cqi``&VQ8m!KrD87p{pRu5w#Uac%aiIjygS&`NO
zm6sqft^i|!p39hB$pD5Wz>1C0IT$ZF7z1(Eg%s3ZW3?9oQ^GS5A}VGg@B_a^TP>t|
z$<P{0q19z3PPGTStDV1w+fQU|7qYr)+F*kQFea!i(%>FoEn)DhBeY-wVh<C*svxh-
zFt%G{gSa>5+EE9L2vndr!@<~Zo{ci%>=W@RShP5GWpT@L;}<7DgaQKteg-!xk)c6c
zO1hBJA%8qh4wHz%Sn*3d2^7mh8zt>oEY2@_S3UA~jmyJ$dGlTp_nZ=|sf2OPUESqP
z!6aSJkVODR_@y1M{lG{;PzOfI6hKo=_>Gi6oy{*UNvI>a3k@T;ai0L&Qz+$X&{Kj^
zUF_XW2p9!%69P^lyjIEiOp-Li8=u+CUgR&~LuuM9cANAuCcBkvmKLB?1!Ssa83Ec9
znKCVNl$Xw|cfljr<gKh8Y&F4(1?AzW-CUB{fkzM>Z4M~Gqa6FFE9?T}yQwqBb#tEu
zNyBi&$)|Y1T=Wi>^_ZArS6k%aZ(Pm<zXVEgZ>A790{d(m9(?&W5o31ho+hsnfh%k?
z1c9G1QFe+W#4&NI>;HT9&4sAB&Tn?6-lC#IMnp^RDE0QId#l0sx!q5@`9Jpw=N<C6
z)%zde!EMif3h}-F@rQiwqWqr+rh$aS%AYfL=QVZb%iR6ZnLFQ$8@>ddFM;Pv;Q11G
zz69RClE4$jzgB4$&#koXENz$0#n&z*fgio`>RTI4J5xi^V#W@0Hw#SVVNy&R@KhS<
ztoA}g>0xL!GkSuy;3c=TP0zsmuE=47o<OsRvLi~zT1{XIrZSwi(&Hm_#9DGPH_kf2
zC7ZPjVh0AE2C~V@tN;^!K>_Mo1Ob*2##QJ~Bz(iR94H`Q#bED@5tpJ^uRx5o2pVT~
z*z~jzf3ZOZ+Q?WKOo%sC6+DD8$y3C#geC`y6?VLD0TB>OYRX|?jLt-pg8;qqEU-8T
zGofHmL6I=NB&*Xo1k@#De5^HN!H0N*z;sXs8LT*JAku`Zw~Mp#c!!$1M%sZ-=Rh!~
zA}mE4p3D=WBNLf^<F)UMiEEaQHd#vpoxlu!h%I7lpmD2_RE=*7uCTq3vWxL~>bM{=
z5j)<G%MB&7LEXy)^<(YxDkma?$vi3q+vHAXr`TtqELSb71+0VL7ldp^!81dQk(}Rd
zaAzYC<73asbrxuv45$DfL*jtOl0X9K$`IM&!az6`;^pu74FMZNk?bok5G;OZ8mQb%
zb0@_M=ZEtF9X3ZSLWA%M3$YsyNeSUDqq9-AGDKc0z)S9-k6;}-VO97JmAWI9B0Ei)
zIcd4jTC$r9Z%GCk54Z+yXA@p&24^33rj2Yt1no?4ieV_0NDRhnLIW^pgD?wE{;o!=
zaXy`8dA3+;&@PCWaT6t+Nr2hlxk&*nAzH@f0AT<Wu<GzM1nYz%S`ZTh12WDOG?p2~
zvQ|CTl)+Q*<Xm1B`D1<hW%4Ebh7l$Pnlg#`o+R9ITAZ8rkhs}}aNER~8J+_!PGrK0
zIlGpSdP+E48~>(Bvq)!U3nfn68Yd7~(u1+kCAb|yU_2~sGKql#acxGA+DW)RZsiv!
z@FHUImC{1cpGQj=R%~?GEWnZ`WuP~(R*CaGF}Q*sH(E{5lX26)%NvN3W1~H+mD0hy
zpiKwhy$!>1b>WoD-(m|PvcztmlN+#SEMj~~Xq64u0wPX}ow$9gjj(OqT9^HZwJCCx
zsY=r3$TV`K$V6(5DqE2#PegvQO!)36K{*O-iYiNs;0cXPsU3q<Nl2y~gVGerL<y3Q
zR%_&$nMkD(D>BsS3OQU;C==4N5*5m16c6Q;DlJM^WGJ*iRI5UmAx}yn&&0$s<eG#O
z_$rH6q${*zB;q86R*7jQsWeE2)H01$k&u-x(;#)0My<+}1N%fEt5hhHG{8lkAy;Yx
z@m^?f5y`XR8_G<PrKe+FVp$ecUxO=%5>)Cj8bxx77Nw}t6XkF*UJg|wo7NFt(5i%V
znIc1i5@i{(WH~9N0xB9YevGRg%1M#qOPHSw{v~J?DkW}5f=a2?z*h-0Q=@ej%~52^
zB}k@GWMYXVX;c{!F_tHkP!S?fPATW8U|Ay%mB1tTdse30Nf0H<W$8c*^rQ69-|g(@
z^RGbPcl~ZYZkzcK(AyoLB(Qh*?d;_9@7l=c{|e&WKK|>3j_#PpE%4t+X?W}Ne<LD7
zgMIk#AMu%~Rwh3vegxa^gNl?y4g8*h|99#DKhwvyEES0ctX3q-v=a_ARhEs-%sKMw
z+4`M5QsSq4-UCg`8Z}K#cQ<q&?q}J~#58G-Zh0!X@<4J`S@h&M)k;;>oa#N<2Ul0`
zX}WK1v}Jj~;8!}m?4LU?W20z8LJuU_Z*9Jse8uQLWOL*f)4wjbc70(({pM54*yjqK
z+<Nrv6ls@x*RAg#mG=0tag{k8)=SrQ%%}1?fBeaZJ*G@Adrb5|=-iIWwZk6}i=$&=
z0xIW?n4W*S<F%f#0~;F88A29UR8-V_8&bNfy3drl<NHh{lO|o=`rU!AI|Sq#3~z7Q
zvSrPhv{hOt$!;FoXI9PSS#`(1`~Lfx+jWn;YCJuE@!*qMk+e&WR{P_rQ{SGpKQ!as
zsrk9NxfvN5>FK*(>HWm0ZWmfw?iVfp=%bObv4@JZmoHzgtE<zj>NOR0n!3?^@TI!{
zIrQdZJ-+yMrK;(dUw&z7s$9DCuiD`Q=T_D9m(80vVRUqeU)^!h{dF&;{_T_FqpEdp
zWZv`Lo;@c|oTz#G?Zl)cAR`)Ov)PJ^&s8VSHJMC0oi0qi<J9@?_lfG(FI?EWQu$fq
zxo>yo3}3i$<3?qAdb(1%`uj7>moI;{U!-nH_f^`m#vQYM-rFxV?Stv@Gg~$<S@KMI
z?A7|n7d4raJ9pF`j)^K5P@7s4J@G<ee*Ur5S!=>-)&=bRp!96q^ViESH6PXv4-X1j
zS6gd2`uE8P9x*>6?efIJoyU(;B2gd7=;f31Mvsn)i)%i6w!!$mV#xgWcE``V^2?Yb
z1yv)@{M;|H+peQk#XqTS6Sv&>Zs{3A^Zm!KU%x(c=FIi$*E389nKU@Kd&h07R}UA7
zqWaHC^n18}|FH8c>NG#)?fV|+lO8Y`dRy3=DMPkQym;n#-HaR8FKtb$(Of7NcU-V)
z)&7{0L&0OOh(uwLv-Z?}w1G~Wqg@@=-`2ck`OKM}MI!%RJ9lk0naz{S%MTnl(4%Kh
zP|&XvVyhZTi;H((dtzZ~Omy@c=|f-KCVlc@ihLF<Sg>~O+NP!^L&(D?W=)>ls8IZ6
z$(z%D+UmGoo>6eB(9&!j*6X7Tb9P5m@nu<Tp4A#OJ$}pvL+486-q%A!qQQd)x3si`
zjw`m=&YV7dkLcr_J9pOC1IhZshbtRSZQ8Wy(#4D2J59TA!Jgi6`L;cKO3wYTeb!%s
zuG8Hw9WRO+x?sfnN8ebgeK&9N7k~X`uX^;p%grA|T91@x9z8bu#`&rnv(2ZsmS6tu
zlj#qP967R=czVMru*+#Ly)^#|L%)7Ye*4YV;e}(3jiKQmrVM#=>C#`CoBPb#o>mcf
zpD5pCdiR}oPF_BLDz)aDg9l^c;-33{byjU{?Y?)|p>qe0+`^ukGYaL0ERKkX$h>jo
zr|Rc_Jh}0WK4$j)uXpb@p4OCB-q6K%x^(GMRZMB1pP%2bVKYae&rkeT5j5_~l`G@V
zX!G*&9FB`$RmOyy;}aAL#ZyncmRhr6)26wvydv(>Wf}t0no@6selz$XUEdCM09in$
zztXCPAb<b9{rh+6+I8ID#xFGbsWU@AKCw)*CL_py_`*ZqZ1`;d{*sg9`fi$%yU8*l
zI=c3m53)nUhji=I<^F`+m!aaZ1J|ux8z7acW9}_3Egduve@@yq4;V1O9$mRzHzFpc
z=gdzxOTd6eb+Z>0b?Vx+K-$-~d1>A8!ewU<U!A*U%cHDr(U*_r=4#46te7)bx35Ef
z-?$0C=9ib3gIj1(6ciMg%}x9Ey)k1(GW7Ig$BxycRgCI3`{kF5N=iVk;o;%B_o4<5
zuG_n}^sAkZjI6E>$=MrJqglB4-1_}taW}e#uIaVtMQNw0UGA^0tqlwd)7EIh;b(TX
zczXP#Nt1GO4<^qY*tz4>*|TTw+O=!NiWO(hj9;ZqeM{Y;Lx&aB)s8v4&cCo?h4Osb
zAkmaLb9SFJJ~e7e<A0y(+c0(h{P`Q+f4}RXxGr@-|DJp9VHjrFvSp~#qKb-BCr+##
z{od51>Y9}+>!j~yuPKf?)c;cGj!zmd>U(E795>#5;Nyb_Cw;jn;MG@O?InIJDr(<X
zUn#FvR8@`3%R2(iHC8{^aohfbE4Iz6tqp#6#hKH)yZ3JSSrmysn-({K3TGy+fQ~Za
zwL0mcy^%+D2Oro!VtBW7@$??6w2v)VB@(UQ@Ja5N?gIvxmo7DZ_+g<b;&6TaSJzHH
zR-ym;Mxol@o;dvlQGVa%rY1APoV#!V+~=Mj$GoNP^3X%$TNYD&YuBx7XlPKSrf%4{
zF(Tsnd%<PJ=f3>ro7$DCN#mdWuNgCTTLyl8I{VQ_cYU66iT*P7haX~BX`kq6D|q(V
z3(vh4XEMDUI!K46z>srf>+@BqHH%(<eaPdFC(Gq8pwUl1edQnL8llHQ&;RXmd0bW1
zym`wj2fRh)=l^iBen-E^yw?|%EXjT_Imxhnd(f;|;|4}+Q-?NIuNd7gqT}Ds?TF9G
ziMjCFgtFbcf>zuZ)O+&D1a{?H0RaJfYoEDVZ+))u=bx_v{i#!@?%TKT(@zuozBK5`
z=dNA5%ubI#-rPK}XV1pw<~c*-7p7KL?45WrJu5G7NoviG;pd<Jb;7R~_fFnuZmi8~
znqmCxAKPAR`SHgav%XmQ!IqW{qrYRi*7yDx`tCDh$7a`#?JOE4ll_yuFM)@0efuA!
zViGE+?I?3pqQ;P=g;cgkh04()X=Y3evoH(oT2-e-PN^uVM4=s7k`}EeLefG~DJlt-
zk}UuGewLYM#z<#--{0^5=5szBo_Xfpuj~3=%Y9u+G5I=xdV2OOdOQB-;%>LS6SwsD
z&u&UQ9%sLPYG|*VX9b_%ZClpXV(jmKc+H|&33rPdZoWE}o14EOl=iefD3_`!Op6`f
zXR}jW7t%q%m(HFQR9xT2zt|G=>#xP&pwkwlAAF=_ue|nN)t&k-T`%6w&9WRDr$Hjc
zOgiiTz@@dd{J=y{*1?2%9(~J~`h<UpDa|xr;3GDhLz+2rX3u`q)s$DCYDxj4k4m00
zGGb)7<NoMqbIXIF28K2B&%VgrZ8$zUI<~T^Xl~~D8$oZ=`}Ph@Ja%lhmrq@7+mKjc
zvz^8kR$J>=x<#AGOj2}obkuK<!h82FEG+z`-xl+#O%)Xt#%lcXY%4><yny~@6KUnC
z)i=`9KNJ`5H4K_w@#Vwit5>%~Mh0JF4EEf%u}4FZOGV!1wo?9_*L@Eeba5RS0odvU
z@f$Zj|5WAX%H~r?k2>gvKh9oRnxC(6=5xrW;~Q^ViJO;f7=M22fWz)NM_uM@*bqI^
zuqNtD?Zp<4dnKt#@z=8WUMXvWXFTe4t)l+&<;!JdWg0^!tfp)N+-Kalj|~k!X=&|>
zh<Nny;c<_&?UM^EFK?hXHrD@^R-R4Mblm#o?E+(qk+=U?=6q;}?$ENM_kYn=UyywL
zVqzlL+A$-q47N=73b}B1b>jNh$&>-1=JVCvMvBWa#nbhYFI@0E;VvAf-F3Mdxm${`
zD$FO}Jzrcn=vM8j{>z#~nGwZCiQzU%EjL0QPYQZFFv@+JUSD->$ELa*$DHUjfn9do
z^7b}a>bI3~rt$sD+ct-c$H1Tab)W7urZ;aJd$R0eewy2vLG~-M9-Q#t7y1@G$ags)
z3Tdui_x$;uriE9ZT}t)u+WLOakw_1|>1Z30Uux6W+KWevUMIPqh_bi<gm~_qJ3%7R
zis}<-YWoAjwmKHwrA0(E%sn?Zm9_rHI%BoTJ4z-i+1aI6zPwQV%Gb1Jyjo6b>bkK!
zv)#Ky=H{vnQ;twnEG$cD3tnmI)TRb9HTTW1&FF4&vYSXOe);0XP4BbCNppHAEBj_E
zSr>#4b@)_U&VRa-aprBqgX9BN)v1dPRn#wH=q_(*y7bDo-@X}X$wRF*saj5N-gNIt
zE;+T3TQFWjT_ZRnq|K^FkJz-+u8fZZ4!Y_OnYg0y?W5!!J9gZ==Qe88s3Bo<+}+O!
ztDIMYHFE=qBW#HHj^CF-l>j|W{7SuC?!}KeI4j|l7r(KwVr?X2)Aq$>7uya*PE%UB
zcbrOaP>^5L+9}b)h7M&uyRyN;)<(1We0f>(vyGXL9IXbu5+(KQfB(e1b$)%uk3RG;
zc|>jV(kCfZfYU5If3A0!gSo%Xz<~(~37f;h9Ey5IF41?1ExdB&3Poj>z7`;?CMO^l
zy7q9&{!%$G=p|d5Mhn`oVIPxeH8XTXc%A?K#)|s%D_8C$<a=dlCKd-Ubbp=!1~N2_
zS0)gP?PG6xXS%OnKm(|;zP|p>ojXleUR0%V%cA@Z#37cJcXKxGv$5Gb<wCc$ix%v!
zYD{O8tT=S!1#3zAmNm|tKZ0wNyI9-WcHMK^+;eP7R#sMa_QDhHKdaO|z1+2{)x)Px
zuU6)z8KxJsRPMWHzop;aI$f2uAuZLv#Z3zdJlP}X5+MIg^A8OIkZgku9kj!6EbFqG
zo}Q8MrKzF1eC20Pd;1Nu#(U<t(ExVe19<oAeT_NB`y-d8UDPS&z2cnaMBa#>v1P`p
zXveEMlMamGb{nPXc#fB6KRa%K+7w4em6))s=Y?h6)=<)Y3w4c*j1IYieKj2t*28+o
zlzC2l4+3eMl;q#i)X=0HP%)*VDyDz_!Y{gl%G^OZIz5Dp0C8&4$#;BS>$OiyJW5ZW
zGGZ3$zTj=kc}883u6d@X&E9U8jVA!?F@Ju^!-tN;`V7_8-A(iK^Y>r=_Tibjy1K^3
zCDHtCVYj<>y;xmiUp(KZtC7)skJ2H#cJ}M~;)U4>k6>1bt&dM>Wo4P^oSX4$0`%0@
z9^A5J+LS5R>*@mL&6~G$=@+0c0FJ^kdG!16X&*0$>z*=u?w&{@jhfT6*9&0YVIzc&
z!?J9YW~>}%X7*)L+wA6-dkppt`-wYpu(tNyyLVgbHcqm0aPSw+Ir>_||8=d-q-7rs
z^fsGDK3JGDC8Fed=m4!Fwqccx_3uy8M(f2GpNw+V-*x23kqgT|)4Z}5c<r^_=rm$P
z#PzGcSsgf#GH;uc-t58ST-R1MynFX<)SQz8URBLtAN4kw7qcwPaoBiaJUJ<M-_~cs
zpxA=6u7S^N@}5%OYv-4gWP$^H{=A15X)E`tb9Ca_B@I1{fAuLkR`z<us^%r#o>!}N
z&w2DHBO_y;7m3;p(9*@WC+~~F$$rP<Soo4iY9AYb0E*w1Zwd%KKmQbb(P%xDl(B%e
z^H#yzM?dugd}b>nLMS|zc%^ce7i~`QgKG1<S2crg=Q}L)`||bcmTS-J1IvnRyp_z%
z%?Dd8yLaip`rSIKj@=kmTKOR?B!zyq+pM_{6HfKK8}P;CJ?+%KeWk4}UmFHart~~`
z^ytQ0-nxmukBV@0cHa4A>Gk!y`xWjSQC4|F_{?V8Gt#8ihiiRRx8^)ko4Y=?4{1>9
zowH|$d|Y;0c*(1E7AO8bYxd5k*SAf{p<loLV)$^+SI>)jttFYwuk=+8s9m^k{Oe2m
zv$D>Wrp@4o`<Z7g4<0h8W|67sb_yxM?M+S1wkf3UDazDq=eQX)HP;jBea8nJd~tbQ
zkl8QOoOYP1=LGosSHF7oD)*wM^5nQ#fNIJTc2BVgzvb3%j?w<jj>9}NOiCXb7^p$v
z)%qahr^9M(&0n5gUEgK&TxVzJX<O81^EvmG3=MTRUwvPFDl+Aqx`RVZaRT>P-?%<a
zMKNR()7rx^b_QCm%-Bl-12mO^-m2VX@a5BIdM72>zI?piX*mB$*4z*0&z?P%qP1=_
zS=Y*nSzq5j=-rB%oi5KsC5irkq)(p~mS-=Y@MN{>Bd@bp^8yC+=&><8JUlZ0Oz+A5
zqY_WvFD(4@s?aU3c3lsh{B0x>$u;3#`HBy3zt$#=<*3|y)or|G>GJ@JT8>j(X2R6D
zt_7>U2s~M=7<PSH>MuSqHivx0kw@23RzH8v(9zMca~K#MJ@itRgYL}5J`ccuT}X@g
zF7d98gElgq;xa;Aeebtvt2<P6&;CW}lJSE1^POS~HM=dkoa|LJ;OCuT+isot?Zic$
zFCTB^z#nF%(01MF>pBNMX+I>*Zi#Q{soN*=z)IULu1Uq3%7+4vkD0iA9=FMy;mkA{
zMv9xInqxdj>E=sK#@@DTdv}8ODB+F+2M+Z8SY5d}GF){vWs#4=;i407-#Y4@H=n$-
z1%MeqNx5b}o13WsW##G9MP>$+K2=w~>Ta}sFn6odus@70t~hKo*HJ~-0w|uO+~wA-
zotYXZ0IVLvoxgu~W&c5cq$Cfm2sk*um&^2<)o(&qHJ@pCoZ%Ond$hpYYh=V2bMv_P
zc<1HY^DI`|MfI%RGI8S8{E5?mN<`UfMp<3p8m~8(89VtX$;5Q1`e3JX$zL}Zs;c+6
z>wEvqnFHXzkY;8sIDKPzS(77;O$Ltts;R6*G8WF!*%x(tQSR=RE|n`9=`S|-WtZHY
zlSB`9yjwnr7OtOK`aqP~@bdP+@bF_RMv+LXudlE@<hq(Nt|+M9YZ{40+tsy)yYIbj
z*BFluSWOxoxpDAdjf~78hg`E&RL2K4iQ?jIfdGqHm8s22Q48(G7yy(aiss@wzM9HA
zA|m1fef<Y$XpCg+{c<VFTxn2_L+YS~7hC^GE8p!u$JkiS%uEH~$**~1C;3NQySn7y
z$F{9{UnfqSINNHgzxBi&y~*JhBHoCunrNu1x6aEuas2r5DAmy2$B)m?(;#o~=5F)j
zFq7Gv=m23j+mhF76ucHi-%u%1QL`K4u~$RurwiJHBf64YXC8X6!1eqwyV^J1wvA7m
z2q-YNP&8!d^qje)w5A2NEURd!R=JU-y}i(>#y6$7VNF3dpu;*1>th$K6&$?0e}8hF
zf9T{(OP3d!nhw2lz|;TU7IpRePoAh)8LQ<0-O3_DS#$p60Qh5kcvOhC`qtkVWm%hp
zo^t|Kl(qL%UwN6?U3pwn<G9n0ME!0*xqe;C>q2<=yG@C80Mb1?!z@kXKge9)=HsMx
zadT_G4eOOZow6Zmk=bpndjYJR9{*0y(nL3|XxrXjV@F484;VnQE-0LN!*$Ig@+Y8&
z<c4{l3k*CoVaaLsvnyW5nl*aO0L&rnoch=?>JfWBlQ;a{)Kt#gSO4xEPj6>J(K@xo
zUFsUdDrAA5ujXEzh{yqZvwVE`1-pQH>Jsy5|Acv8o+^cuuzx>ws`t9nr%vUV1-?0w
zl(gj<Bl6YR=?QN4@83V1@rGG(okHz-*R3D5pezj_L%m_mk3Cm3{QBrDtLp681N)Zl
z-V@$?{Ss~;wH%Sf%90bR^LKPR=$<4L3Jd2h$o_CgmuVCj)hm5L|LA;xfy~9O!+vjm
z?b5C3(~d$PCFM22PgJdYt35tVUl$V-^Dh6FY!|(q^Qi6~KcDR~WTUN%W8IY_n!T9Z
z8TTIKyC%HYrBx>0cB^^bhz<EVqYpj^TQ#Ha;5?h6wgKIXhmD|64gx7u5tmP*sI<0z
zo>pMzJ7{Eaeq4N@LA+`1h?uL7N~=H3J5uZ=3{HD6CoejhtD!x2jfvIyAj8q+W6cw-
z#~B;fJ-M*FrlzK;Bz*TrQHYn<6#r3YYh7p$Sf6=rcQZpSdJ3021K@Fe6p;81VJD|g
z&l*=_JjT@Yd2HC>6ngw2F*tdCX<U!SgxN)72YM~fYq%RXHa;r2@8)F@@2#v7_*sV@
z*sCrp$V_7U`qq8?cyFm{vDuxNstawaw%@rpPJ83Ib5_^&>Mwleu~=3QnrVh*eFnFD
zxVE#VW@!1Uug9~p<{VnxrHgj?awE|-GM_}cvp?ZUc63kDWM(Wy|5f^!AtnRM@1Au?
z7OGmmxxJ^F_jpNRnW5g!dL^ap{`ZxS9R2#NKD}_}z=)<~k8?R2r(JAHoKD@HmzDGE
z#jTXw+y|O{Lu#K`<&}-AB$KS1hHLc^Frqe0a_^$j)5F#6V@Ukq#q2fo#*eQPfmBFK
z3mG>XaKEh9Oc&m}(qX?pS?1|sc{;G7yeD}~#`(6QgRJuG=AjO&0!cR(7kOnhT0OVk
zJ6+FG@WRp0FLBMjfoCQG!mAHy@qgdcFlTY=@SO&Q)wle5tLUX(T$;7!$dN5R`6r{t
zyKUcgYf?)}-NQ3Sr|a2&h=|NS^{&i++O+ecCXvNHtCgP@i`)Qlur{hk{NbH=>LTsy
z``cPwTfVO8I@NdkFV%0}Ox9E*o0wU~M4TT+AFwdP<mYWl``Awdp1yy1puT?L!i8pi
zRE;zp6BC<+f+*L_hkBX;1_t|Cw<pY{F4tCnP(G>k?L7X%h1G6`AI$xmi|($dd3zJ6
z$d4YS&Tfd=WAvFyeY|yCb7JwEz9XDZKYE*zV%GKY*1oF&XuJK=!szDSDITQ(zOQb5
zNl50YySuM{^JegxH8+#<fs8qR{CIimr?k+9Wm_%#(rC17fba%wnX03+(J0$7MHEQS
zKN@pA)&McJmYnoFubG;-weMsO=k29SlV|rGS(;RKeoy?70IHj7vJKD(TU!cW<;2b#
zK41iC#E7FnRl0J;#%voY?1pDn`jfo8O<!#)O{eP(ALZXwZ(%?@LnKmFRRwy7(ZYiz
zO<t#03u;RE@k<xAn%n3;JGC%xuf<sNOINQdH-#7bDiyr`$SplLux|GFZLfUqX9)eP
zKC`$t_gh3{ugK^hwZkOxEkESz&tW%g`wlRkF?w3nw)5SWe67(u-aKvIdN7xg6ay{R
z)3s~6kVpk{3dU#NT~YhwSX*oD`iw9A&aHSq_3aHEBinh;GBYzrjv8e?Bzop`{%(@n
z$cP2o{}`jBe7UVTKYd+~In9|(hk=l6Z2n-kEAEtgQtji6irU(+?53`ZPp%JXeAc7S
z<`jBP_gz!h(;MH;dvYf_I4^C>KCX)L<1@?zofVpNH=okd(rK}U1q(cnTsz+HwCMHS
zrlw^dyQ-_K^+*eCYpk$LuIe?Uudi9s{{3kHE#*C|Sv7X-*jOhW<JqJqPoCV~W7PKg
zXiQVn*3+kFI9Iy4ajFD9E!&qAsq|v)-oy7u{Ug8mSiz!q6z%@~t7>Xmid-fQERF!O
zWZJay@{5xePu%~DzmoOS9F3v3|2Wswr0c<ANABN$kKHBgQ*32z=pWuD84H}_q7ENw
zeKGa(r<&kFgK{&^4DJia-6eYd;Qm#tdmc`4@1I}WvSh-l4~t*4%#6<cBPeC&&6kO_
z*`wN;Kj@x$XmajkP|y*ViJME4eG<;xq5Yzg8B{ah#U+2Yp@+8i^pCT-OO<>zRrEA;
zXjXxT8MF%vOCD+lzunYWp~L)`U@&O%3HS1>rOBzO;-dH&n+_<etv*8n+me`+R8&+n
z<NV1LzP|6TZvJiOh*6=TdNY;`w%WdZOk`wl%i!$F=ZxnI57`__U)JEaV8Q;QBTA~r
zi`If~pFeNpnfc<`vonDeQ_Lo+i*)xS355IdW2%1A5>YHF&B(gF_w2azBx`AXQ^T4{
ze(yK4FB+5Io<G>y+IsvrwfnmI`yTv(mIenxUG+1Tr;Rr{Rr4%IUHEvW@qqiPs&DVP
z#S|yC^h#GdtCDQeeUsf`ut`0Xm4}TO!R&L$DUQePy*r}e-hK7^4>VHK!ajc5{@TO2
z@8)r1$1WeUub=kYEZ@SlHyuB(COPb?4BGVNO?7ooRcm(#yL?WsD}6Svx6>V%ez$1)
zE+=1+o1T`_ky#PfXPZS%KYdQmc)%F5s0gKNeRr~XylioGzn!-pr?C4jOIEe3yiN6;
z*wxyVPN%ck277LMW(bC#OZB6ji=_{sjT|{>(Aj3c+h+6U&mTE*<oy#Kdv@;*UAphU
zmVO7_MkXgGFJHEd!DQ|+^cb_e<t|kzrw-8I;acaSy|FaM6Yg`|-TP^2JuEFfH7_~z
z8YAzr!;J2s^o#}DTV1bdR~|EY9*{nK+U~}$U#qIB_Du>t@T+o{%Q+i0Hg4P){Py9R
zXN!_FdTLyWI+foy94yuI=g%`UE%bIq{{H*(moLqGs3r#l=T_85MMVKEyizYMbm{vS
zQ$s>Rrc9Z#XwlRC!>?a4eERbCp0FWSZ(h9$5D3UUdsYZCy1#pIU3-Jg=;DyA3uq(y
zY!(*OOlK`T-ZeBd6daqMfBtz=<I}DyKbz7wEOsg?DJdx^C@3oWQ0SnO7kAUg#7Oy|
z(%ORw%a5&Gxw4_5VaSjn)PA>ft>O}1R93!UGC?=|RaI4gEv*+-RX!!x4c&8xDou|~
zO>KCVv(eVpR#SOq!o6L)b|vgqCvWHycB3L7Ju=!{*_v@?F126S_U-B#8b!Wlv^_~J
zX|b`kC)~l>-r4!`W|rf6=M^jA&r88lFE6i<kTx@`+GL;n-|TdC!yPG_bxWGxm7P!h
zY2L6t(c=OE*YfxGAGB@EjA<M5rie#<+CMtPV>KNd>>D?3ycA?O#m!1^1FBO=JkXNu
zbi*%PxDXK$am~klQ}g_8br(a&M++`6^l;B;^CaHy!J9rSC#C?=IYDGUS7ZyrLU|$*
zWh$5M!=m`Gc(4*18WHE<{42%5moF4y73lQ6SwU<j%PN4!70`nX$ho=aHb58gRC{N;
zlQxUi{x5l`fBgKLKOM$@5Q5tOZXe%{|1dL$m;L18KgNzR{Sp81Kk@S)bpP*1{?8wG
z2!Grm{BeiyyKCIzw+1`SuKMHZ;E$_=Kduh`xH|a%RqjvOEJd<x4R+8mYr`_r{rN1Q
z-Uw%ad4|wjph99YP&DI~eBMqpA1Eb&A0Xz?VQL?JAdcu9w0eh>z^GV)PqfsLTxL&6
zkq&D+7fZ@iI79}_AIGB1UW)!ABqW&PAt^eAaF_vrAM=F<l52m+4MY|)QES(!6uy9s
z6rX}10&)!?v1k-GyoS9b_Z%w-Knv-$F9GOIh&BM&znDuU!-YUHp^3TD)kHITq6Mk&
z+T|!|OA|v$ujaHLAYS~O2QyX$(FJT`5fmQ|pF!tXATMG?>;atQ!ZBc#SWx=IOJ9-g
z;gGR6WeSMXF%%`>(wDJ#u<o@`wzvzjmuxT!HXUXrRa7NQx>l%6L&{LWE?Mo`B48P$
zd^rZ<0Oq5^((Z)hp^5|xogi4KWIl2YRlXj&Onby^qzc3gvz?fMiP>bIq8SI#`tG1j
zN&Z;4UEpkj!@-jrXsV)#$cZJUL@ZJ9Y_IsJ1!%Hax&Wn}cBkXpnPY{2A!{s!kTq6e
z>N5$vL6e_JA&%UwWy#RmWs~Eh=?le3!Y@BDhD@*`ZbB>rrY%K}=S>&-T9OF`-q4R&
z#F}qRaDpWh;P@hK!_rsaY|D`?S)WJ;G`!#ug(X8DG$!`k03U#Cf9Md<BZcIoL>i}&
zZKZ!8`~k^GiKnjQQ{XhQ0!1*p8DFkuom}5!q<tS`;~_ya*bEMvFJdw2Gzvnu(g)J?
zmr#v`gOF5(qQe653doZ}=8N%5P;k)1@<}v`HD$4wr+}uvP4f6|lO^+k_r1L^p2Ol!
z<N;j=U7iU>;7{q|came0k0y!(XGGy$UC;rdileB>$ecFXNCw1tFE+&PF@pn(bP300
zh}{szMuDDtM5HM?^RloU6{H<ObDRj;$qbAtge)I1kR2T)E9|JITE`{TWXq{d2Rb?x
z3M2d_=~2{`Fk)RAG^oJb)qv>0XA1ZFPYusV4!fh(6EUs$+tn1&>R*QDu#zAhtJWw4
zBrQOB1U6_y24T|%XP-yR14#CU$rgD?-b`5Jk0qi5mMtWZh)|kB7MI;{Meqfo!<uuD
z#J#~OA)sA8CP4XQ1@aSKq!+Tpl<B`(d)c~LyE#f(^RIGw3h_k6kWjfegO{0+giR3B
z+REqBhS$pF^Zj}&po(vTZ{*UpY?5E;U2?egKxPQ=5uoIU;xB+zMC`@vKrxbz9sJKi
zzQ7y`2nor+0n~(o0cqy@P7@fUA3cbUW(kG~orzEz>BEKM2W6pTk%;|)^*}0_g7f4H
zlS4|<kOJ}tp8@Our84|7+O$lw#6;8J4LP$COh)Mk**M_g44h$cDIIo?>j52(LOv6`
z!nH?I+qYZzZ>=*~;X(r%01{y_EkMjP1SgWl5E!izfOZ4nf`e}%%Z(+vCY%T&3&f2H
z@MDDrg^q+jR`n7JF(!&e=?nk|=qM*cWVJ#WCDAd+GL;6}S^Q`~V-Udm?vU>x)h<yo
z<0Gtq3n?3H8On-fh{=KsQ(<t>8i(z797srM@m6$FQVO?6Izkwf4EW=M<Aq2o@PJBz
z5)XmO7|4c(Og_(-#bm?xSt2HligOqt8Hz}B{OzWQ$V)0@S<>YZu;AT(6fLtj@Nb~B
z^9W@Zd2EgZOTf+*$#f$bBu+(S6C17F2=@zYu@JYR!l6+h{zlXT&?EU9J3?3<z|ZyQ
zOtye&$z_S)Q#LOMKe!w=vP^WbP>+SY0<}gmaw>>un~E!9?Y=9wh7_4K1j-n?aAX+;
zL!xL(UhLRB%t8<t7kiZe4!{Y3A{Mf3xC<yP1kpJdE(EIy3%v?u7G0v@8MV`;pnV%D
z0}2cGO0sN#i6eUeUV&5(84w`*0I*a@l5J$c37K>i=Ap+8ct{$0+=wU1Q~WDe_JB*O
zbHIh-L*@lFS^`6YG7{D)=AucL+fgFU#2{oxTZUkSh(d7G$%pI`qYFjaDd5N~)KUfb
z1)aTwFG*DlGykCVsxiwJfEXCUqu`DSzBhxZ3%?;?VN=EWrN|Wd?Q9Ire5_IlWGRsQ
zf~n)hYAKQ_lBIJ3a|gTtsaL}BLA4x<zcBE2Pnqm-veU7Li;6FhtW4taA$vuJ%|}=e
zp=LD?K|Wk$D3CoufB`ixJ{f;ec1zL3;6gSRR!5d^i%(?AxbjA$*ujMWy_5NJMJR-@
zVhS{SNEH-#ykHG$a7sAvQznZc9W~C$;Ouc$M&~0;fQ6?Qm%fBqMKRk3A+I%B2pOXU
zDp)Kw#+vxJO$p3F1}q{pELWAnn+-<}_=b?&URI#RJ>XJd;10qjsCG-If@^!23W`{T
zaXphpc1DN<^vx$`VVB5I0Q`kAY7u(ih-Xo*W&&BdPw3#jebN=>I9FtBfow!-$;bJ~
zuZW061*ue-6F>_f%9|lLQ7nNv(JBekfajSAdT{F$TI-?XxnUrdxEpwzWPM0(FtI&q
z=!fFO0KpSDX;HsLyI_GRRulr^>KhPgRD>7?CF8}dK+>f`nT0Gzg4(x?m5;TA*<L>*
zOEakxaVr(&Re+4xLR^W0Pq0@IJ1(GFTmhkxQEf3$jEn=yGcZQt5UB{?Hbj(3A;hNm
z3Svl?$PQ3xkJc~XljX!d?v_<}1Y`^#eqbFX{Fks37T>)Sumy@fv{TU#DnlO7P~oRb
z*dbrDi8EvbF<R4sJi(iT_kgl19+QP<bBE=_3H0H`<nV<olq_%uBsv@Lp#}1xzJbKV
zAn|q+3${;T0SbZEApBHFzAssY*|<h3B`yZ!<6^jw=*CF^2Y@$1i4OvWQBoe}CpnBF
zxEQbv`2EFj2*~&00bv6yf!Kj2FkogfyscRXzNA}V;}Z$QIJ2c9iTfezf@UZ&tck<7
z#OsRFIYQ}s*g=y{R?@n3WU!n^5K`<04vJ5#;@-g)peEc7Hv#=vA5A<6zve*|10aI_
z29I?xU*PTO*~vDcVFv`$8djwTmjDD@Mu+Qxl|GkriZdgO=A~{T<S{-Vd4nWAJp4Iy
zYe4@C0nh^I$3qngxeasaa14mO5PA>jNU=7c017ZAUB;e?H-rgLFmf*L0K)35Q#t|-
z2rnQya!?t>!n`+@lD1{hSUdS|H`|%O;xHH?_ZB?=f*?t)7jX1g?VEQZG>=%Fxwyj2
zm)i<m$So}NI3i1LprRt4B;itsa`b#emO!1B`2?;ie6A}w;&T26N#n@*z(qJXCj9mW
zWZCU=hiG30*jY$b`|oj06P7{xy>B?9JEC_n(Rc8@4ihQSf`6ffqh0wF`Btz(Dl#oe
z@daJp0Rvs0Qpih3lm0<EY_D*(TY3p%BFjixxgHR;R>&e~HwuO!i+1P|v;(lOjFN{P
zE*Vdjlyeb~7S69wD-0?Cr1gjXmb`*3cPy~rr+-FbwOa~lGk;QW@udO_Is;iSZ7AXo
z1B_0AoZ`#LDGH)kv>Ohc&GV*9qzQyVBKkir(ul7u2HXjz%KWy(LN|fW1zL8;yMTP$
z**4fOW{JdbAAqvQ6DlxXAPOGh&_Qe!IE|p}pP*#`OvYrxnpaY0#g#hq+eg?zL`nF%
z)Cta&9}2;z{V!n&Ns|CVK`&|hRp7}vZJ`Z9z(TYQa6X`sk6`X0s29>{dDFjROHp5N
z$CQPAt`8&dkY+pEUDUTs!Rbo!J^bV$4gv^}I#^mh<-5Gi;9&Uj#X-oT;KfX-a9QBW
zVce0+5=a-?8wy|_=+K3P$N_{XwLxNH^*feJz~^unbf$lY>xIA285P*Egp29Reo(=G
z1{DZdB05;yPWYS5Tlx$>pTnZ_I@xDyz{in+db5Od^mnx2t}bkfg7x^_n@rqX;?e#G
zHko3t;M@@VP}nqRjzQ-D^njTwz(O&Ra-ZM}y2wO{^F+;ZunEGDBz<%=G|Vr|WijbI
zHnfIFq%vWf`6wwX#H9btCsr{Im1T?w2F0L<jCBjE;4BL|<*fLMqIGbl3eARiF=$Nn
zz=DS$x0H4uZ#;t)7r899#37@|d_tComa_6l3bk<=M1+>)zpZAFS%mk$8Lj${;aIWY
z8!%QZ_%kRLAqaHw|4n-b+Jj<ihvfI~vUtGB1K`K>?P&7Ihx#5sLFKSKsDN`I$<}#3
zomx1ss^*Zf1_*HAzJ$%?OXNM&wIwJ)Zn<XTCJUs09HdCkGwPv(zK3=S8kHg?6rwT!
z6GbC@6b;URcRH}}mmoR^k|?c{UZpKzy`vs1+*mBvFGZ%{Z~&Wln*_5ivn0PtnwHEE
z^}j-<Ly;QusZ!pB1|o{3Tw2~j$`3$96RZV+N;ce6AlX9PU4ZK3LRO%jSj+{SfZ#hN
zh#4jrIupP%7Id3>0|gg1co2irc%WrMkyq(dy@}QBX;OQYwZeYo`t!zQGctK3I9XsJ
zHAZ;L#dss<8#|J^JYCu22~VbEP*QFR9dQ!E!N(7033}&=C7fA+X#4sBbZ@EW+yEu5
z4o5)$`y-%p7SrWNA=@h|jU<1`8tza(b|<q!T-z`TKmg06LPP=`SA3zuqQ^w4qH_a~
zU}%XXnr%Pb-qy{M!dKX@;<?E6O;q5qpa<yxN4k<@6xR4sO3piW&Jm6!iM$jNR#$OI
zvK*I^bbxa!8f7YA%<>*>1##5acu=RGG;Rw9jiKSwLe#7$wWlHHn#<z&@&(99U~mvO
zfW`CWBk=+pxhXpnkjfIs(I`H20aBoWBIGj!EVybSb^sq;H7VIypvGP-oJ9ulVALA~
zLxUvh7v|I=Fc`YDX&5s^_htc+gb=jzw@XYT@%U6?^rBSi12%{l4GAlbus*Id-WFrf
zD7!(K7gF#T3PgZn3C$vQUlwlK#ij&VJ`yO7wL?_NB(v#AUK35wcw_|yFj_7h(QD;{
zW1t4iliwgN>R6R1x>94fBq9KX(lRza<XB*fA!y$b9`Y>NV2VsIOXqT*$>+d7gdK@~
zA0Py=S2{yKGS*%EvH(;(B=n2KOmf6Ly70RO2JgRiGBD(ozcDb3L=+DUgZF5`3d}h~
zK%pH3wJF56@LeLt#q|JdjuiWQqp>|G2Scu+3MmXp(Q`HoB0w*Au)PtsENB;tPL+m7
zxZ>_->`n;c$Aghrh}t0E4IS`h_%~ZpOQsXt{1;tf9#ohH0(-_6h&(+zg^<qjQ^Eo?
z<q1VXVBUPTu)V<^lMHN3!$rUgLBwE`g^y0^GsE5gaJ2YSh?4};pj)^HJb7C&(bYxR
zVzv+hIH^y&9b%IWyCHxbsXMmA^6xT8O)lCEVHAYR6Cxy5N>Y2NJ-3!+`QP-iyUxUR
z-<v^*V@9L5A#RgyoTO2G))E>8tFj_FMDqR$eO+$`LQ~K`hD7@#TLbZgj|hrzmO%26
z)Z2-DtV=joNH+$5#uwJvrJ#S#uceR?w&QjHEeZI+opQQwPfDT57LEAt(BLa$u$48`
z@(7w6jNV{~h0M;)BkjF~uz$>B_^-1?)Mt$PasL0|j9AE-0{HM(xFSW~ef@86#UJGN
zKSh3koB+TCts&u^*oo=ndK4fDxllzjnlTmpGa78ZIn5aKM}}dR$ibsgtkH1%_TNG@
zAQ2l034ve6NDjJd;nBe(n>(~E)4@lwfte_L6OwK0Y#{QU>g){AKD>GaZ$HUIE5aee
zSA^I#92EUyfKSp8wf#L*GVWG@W^sw#4Sk5akmQ4EWZVxDA=utYz*Q7bt-!(w4+U=J
z{MVTxrYOmBMa(oz=t05@Ie&!}{<n}3&?f@LY@tF*`c?_NKUD)y^*_D{o+_aVo+?rX
zk8m3gse(7!SW*Vh6#QypVQgw)-mVOu>OWNnPreWy<-fKP-v7-X#rfaFLZg4M518d`
zthspy`QMNqx%_WtW6X?66!U*@3?2UbAJ6~R;r`2{lKFdmbW;D(WVDI={*N_<`~M^V
z-@pI!pO^p74v)CS6@?(SXem<NT!a?=#xL=4VYy`v9ZmlB-<ISL%kif;$)D<fPnJK1
zBncklPv!RetGoOc68Ne9FK6&`!G8OX&fACl@>lZpF+~))VSY1183C^9N)q^eYe_rJ
z-G}`3SM&8DuJ*s2t`Gg|Pp0UD7p4UiUpmkGPxSr|X6Lh)KKok<`mjeolJk9Mwn}>p
zP!Y82@5;!>hnZ{ssYHC}ZG->oiTH%XUHj`9_*CUC(PA5nnu(;_jT?#_;dN*>ywX6y
zUZwCCBjOGSLN*gRPVfg<#v&TodNJZ-@}-NY;Cp=VnLzSop)X7{1OB1FXi))+4paQ_
z2${#&Fk%~=A1}%6N&E?NX$VRvq&L*i0{f<85hCP3F$;8$+LOR6O{KF$#_A=;L-K6!
zp@VsvPVC^$CRkG_l<=qp`77@@ee1#(v562k7X@V+*v(IP6;&Xj=*xXq-@pL*Hp-Xa
zioly&6x6y8(-INBN;LmtV=xr4gd$zE4H)SHIu#2jNSq28x@)aq%Xn0!uH7sbSBjgp
z&2)Q80E-Xjh`ogOKzP~10~}A=S@za$_A+15M@}tVQwqGG2Z5r#xv>EidCUUPg+qJ{
zo*IxnJ(2Ozy}hC1j};7KM&JSo$uL|FbiW+DwjA3hCqBH;L>E$QVa&f!mx?xOrRxVi
zn9M{T(qKLqDrF^=@I4@t`792_iBAWc#Fc)Hi#(_Kq0c8X>Hm+tD}isS%K8z}4<pJd
zgR))AVv1>-ZnU&eN!zqdm!u|XfvG@~=B0V?nuNTBQfU<tL<9jrs0gJ<tqdRq@f-Mo
zI;a&#5v;hduU0_NmO&6cmJjBh`<A?f7EtEr=+EQ_ZS$6M?>*<-?SIZa$L0n9{}w60
z(PAh%6%arv34CK12^HykuR;!sK3a)fh;|^CnRc^SxVSx`i1-e-%2);GY!c2z3{wz3
zBc#<CH3k#@WzzGECYSTo*?AfxQasY1eME`iXXvO=xXf^<GW;f0By0}Fie}~X02cuM
zb7sM*6aQ+tE+JgEK^!$sdN#MSL{JYRHy5t12d}>w1Zb<0>w3_IOKE(~LJU2a9?8vM
zqbbHp$gy(#4CtTW@QD<YDwHV1jER=oX@=0?SVam5U`vP&(?~%5ae10Bs2BW=IgelB
z+YWzmt%v55c6(V^bVL0}4}g(@8zaD$eO-0%1-?E!<A_r(L`HO%dF+^yT;iz<T~Yj7
za&lUFnqKX&lER%{kIU=f#zZ`B@@XpYu;<0Ru~0WWCeAfGpcD9b5YP$u$NhER_jK#J
zFTUuf^3pf`R9<YQ|CoCHKuzM#@mHmzE53+nmVvh5t2QqKBc0P`gL7{VB+wD}QJmC3
zn4oAkWEdC~V7lW}QsG<kDG{uje21B^3NX$hGb1>%`*nx_|8u19e>aqLXph(JKw^1{
zP|`#B%N$YOwHfY!PQibPeh3pOnfh=m#b(oRbeXbp?L@a2hJ~yPLt36)$UT@^TAe^b
zO3KDqEm-%-C}vgiLjWG5G4H`C#K%wENmx8$<JoB-H#qPcDK;cj(tnYE2S$pJ{w&{T
z{YdlUl!PrN%nGvw&*~C)KTe_)LxanagK(?Z?6yEIm?9?wl_54LuFJ~dHt!*iu%Z?5
z9S!KYF<mP>S&XM}e9Z&v60)U%a2pUhij^y9M-k(-3S$R}fap^jt{`e6#Hpk`Oc_5+
z_{x+k@W4l`D?p*tPLb6P{D6=u6med`9f>eBR4~~6S#3X@@y8FO<;*|PqWLFkFp7#y
zh>5}felzn=(E9TS`?QMxOE;poS;kH9e^pFObRhm86&)GG|9^{55dRP2|Nq@AKS4`C
z&=L@|1OzPse*#NDt7&=!s5l@^4?miURscW4LC_TNJ2D0MTLSpCGY8{{(&Ov^KIcsF
zsq0)bqrz3;QKGm}0p8C=;eU7)J<8uD^A^>cckm>rKVHPxomM~*xcxlmdhd$?fp}L<
zHF?17i}hrqg;UAm<jkL1Hjkqq)VvtODv*d@k^u4LJO@3I90|O>Y|tGWJrVqZodT3V
z`@EzT7P#;9ItWynLyx0SE<`G3DM#oH$#8))AqXwPgD!+z7u;^8uW3cJgJL~?ck*0T
zk~~*Dp92k&KG2HCI><B9U!JNckY{XwJg=*<AA?#au96auj)-cJI42BWqX`dK2&`xM
zb;SY<WJb}FvLkW9(NK0wK-oF81B+cO=cYuZ+8-IoYkwe7ky~&Mzf@2XXjP`K{`e-p
z+I2WfvDPpQ;BmN-9GPE|_#!09g~v0%&fuUvBMzUS(R@}8?tGSlr6i#;Zhh^5SZ*dI
z6baU4#mt}?0(aezVg53RQ~|r9d3N~@9OPqm0C{-J4(DsQ*o!P(?0}t$qZrNxVD<&z
zhdlg8OikR$1UEN!OyKF^y`g|D`%*-JNLq;4z>Pl%T=Vd_Q3R()NU7wCjiDye<aD?%
zV}p-Ui~jr^Md=HCN+UuQgu=-$kZfuhmkNhr%7}TAGj+HLW+`08`$)<fSQp_yGe}8r
z(#Iw7BPqX~VFR;13~*RjS0V?v-Qe5r0Mg{N?7x9)5>Qi$JaL$26pv}bG>9VO5+dUh
zqGJOv&7ed3ullr#|M|9gw_V0f@W1FtRUrO1Xi#)8|Mze53F3c2{4a?A-3b2^HsJ*F
zyJ@QFAnq5${erk(5cj(++%M=1{6|LsePcg4GA@q)VmdB<1_pOvKGT9E_crkkf|(D(
zSs}=vP5f~v2W(N{4auyCpApke5!E9(4pV%7uv}tol3tM0*X#0YbFdg}VI{GA#C>d{
zz#5>d;r+VIZVT-J7iE7hAOD99f&(S*JP6)UW^msLvy_E_8zJvOW;3&P0;C1(m?ccI
zxhcw*^BAh?C1C^b3V{U|+8bp&<^(J^vtp{_mQo-Ivo1U<%)Eipn&87v!lRJFhx@2P
zp^^YFnJ1WOh9C)W*XN7vo1m?d30ji83cR<Z?B^glKxr%#<seujWd$EDKEtRIWz!Dt
zL=Jf{7wL^?1c%+Q61YQNN_*^5vT@<u8}Z>2!v*lc<PZ4WpiHE|G>ll6dGIiYE^<3T
zDo9-fu~FsxBo*pMTZ%B>h&WL6waKp?h_r)ezc1>AoCA1N{!QT!nOiHbg;Mk>S`-i2
z%KWJMBhdemRzwBJAoJE_K#1@uQ^~H313a_v-!VubWwyT<B*5=2Q0Fs*VuArO_NN_?
zf>2a)l7moGbm&LWjf}(_9|3G9fTkqdpxFUlhQiypLSz6W76!fp$!|2TMZif2lI%9z
zWq0{c7SiOm$b~l!;RtDMsLbglK83{7`PQ@QT4;wE4{0oyv^JUlMrg;9F~LAF6zpZ9
zlybAkQ$GGPXn-(+IBfxq=gb*qk2s{sg_`rVZfVRCSMMa6wXlNcMlE}cke)RP%mWa1
z8AKq3fJ@B~_mIPXIk$6z6Ov~*k(P3MSu;bIutoMVJb5^*ZZR}X3J<%H&S!FpDQ{Vn
z4goq?Cu2rjVm;n<o4U31(jiG%<PwssO~U1%xq)!>^?gbT_?D8WfmYHWdCT=vB8}B+
zhD=D0LwqSoJT{Y^HWx!^G?Ec54GY|fM_0B8>x#op(q>uZsb&YwIFZTAK*~!}K3*r5
zf%|R|MDb(^5<tSzlYUN=8FwSQnPM=9J$76SDJ2!(rk|v7vALAh4F%C=!qsdF0@vf}
zr8}*(!|s%X)8=IwDacfkh8G&{bkmS48nA1rTzUF51N=3B8aweWyU0!$)}qik&f91=
z>j~t4skvnV;8EEeF3$m0l;C<pf-H^!rQpF^0-<U!OYkh|fq;7)gShIY(iCQgj<TCA
zNC8t(s8WvAjB&D9+gRL1K{Bmq8g4+#!bA$+ycg<A<|-uI#_JNs=_2Qgph1uw69U$d
z`n0I9HnYVIIlnN2@x~9l`NJ*lkfb!BR^%>j3c1Z?+(^^vG`XaTDZ1S8EsdDsPMXh&
zB<`k#rAL}z3F5;G5(&7tK}NDop&7gkgh#@3`Y>azIw#DOq1I&?hqchniu^Y1;c~nW
z=1e;<AeK@LZW;Bk$gh!jq=Yfb%&-uW$BdPRJBG&hR-Tby58;<(Zqe1;zeC@6n1wb-
z7y7E0kR-T9Kp(6w(y;P>b_<CQiXrxqs7OEiNPI%n-~?6BJ`()g!lzaHk8~q-n`PX@
z{u3D;Jt)xsJ2EyVX#e>wKEF5n4-zq%KbAd5FzB>s&-vq+bN&F~T!Jp#K~ql9loK@N
z1Wh@APE(HHaUiS{{G;jodIJvZ%SEEX_PZ4eM1q|52*@3rI43im1@DWIxyWp#O6Vf8
z83sQ^%3Va`J($bu#+nbt8xJyDSSRE4P)r$@n}_ufw8eMK+3hUD^Ex@R?MCUkyf6lQ
zoN--Uc=2Py6Qi5r)>NRo;evGnvQg7Ec+1STh+yDdx`PXdBCL(r2rFfy9W?P{=2TOU
zA3_{ZOH@i|a=2XUVG+M8;IM)K5U9m6iydB4nDAmmu}hdR(sQ|F)DklfU_&&A9k{#}
z{0_1@VcI9$ye%YAK8~VXh$arKt}-|5xH*W6AzNhL&z3aHLNU(La6iKg>!RJX#}}Q4
zv;`^*k$L0-m`qf}<0OH6_%?xF5NwbWKS-Y!Ibj*zb>qon0y#17#9|wV-{q?1bYSh^
zLlqE^iZ2Y&9C&S&7Ndld`wnuQkB&i3=|gs9vK9bL%l~Y?*@gM#a?=oMM`Q@FA2&@7
zZo#EQA8A6=jrbKAs3Wj2!2ey!DPbwf1u%kIi#Vj8XE6t~-Ihp^hccJ6h7c2!k%IY^
zw<hpHvx<FKgySGMHLiV%$c6#Hkwm~$qQd}KL8j}lEMKE@A?Xy$^2GwzaJz~j=M!aB
zaw>t<2KEibl#)mp)B(@>U<I(i76D{pCQ^`#p-!ZhPRKM}L|=dK01=Z1Qh+=|jQkrR
zp`;KiWoG1jPZDm48YdY&loGuVZZmWV&6hx8hyYJmIj7f3QcooZ@WOA3G>ddr)~=KQ
zyGq289t=z;#^nfbt)>`84jK1I1{}ZIaRz9Qkj0B<5jl}iYUiy%VoPXNZu7bwxJb?s
z9nuXtNr_{5t2aE(Ir~G?@F;I3gPbo0iX>b{U<cqw8_3My6E1&?wVQ=tJ-|0yJnfLf
zC81Srs0HgGIlmYP@y=o30j>4vkKB}@K}LO=X}H>;L0TiqHR$uTshU(2qBi31Axbn{
zYs%2)nGk-$pw^j2B7GWC>qeq1tu9rGG$V2i8lw^E4RUQxZnjo~uW5BD*?Fm2T{=p}
z@9Fd=l&#ItnlMq59zlUTDXqo`#Bwx-lnne;ovh8)nno(+X<CyGXr}26NR4vU29q`=
zFI#Ouxp{_My-|aUPsL<)T3wm}m!iqh=uBW()8UIqlaIe4V}?3A8_JTa^KkVIP(hTU
z&mC#dre~N?hCVx0gD)m)aMegyEK(M3RZ6y6o1;Xj>Kt{thP<W6R19)>jH@0Ro}qzD
zP@Wq9OEGEnI%r3VUS~4kuS(oZgGqdKxYnpqBDFzl1dgN`^f^j7@DsnGCq(djIt@n!
zc#Zr-f**nJc}9&$5T$C=*_alVkIqkiw*pZA5`6l1ACp89l7t}BQq=Gl#3T7nfz!cg
zB)|02I{qsnNVi?aP4M41RqXZt|FN+_{P(x`%*fTH-zR?vddhv;j8p^uJsJMDYlDAg
zKXHDEOxA0aHdSq!xUZ?I><Q!WL;pIxV_WBp<jJ3OMpN^KP0gh`Svw63acrd%n@oo{
zKb~H-FTJ`fp(07YLSH?*W>^0HRW-Ys?pl-JSQggzg?7&?3g+f)kgZSYjFfww&6m?J
z*%bXY#eF*Mi{dL+7c}hHbYdy{RPke54xgT^YJcb2bv@&=9yv0mYIvJ<s<mwk&7<#m
z|HF4XPo7rRUv_WwoVLqM1Mii~6A}}{s^$)!R(P`Ql`cbiH#DBHMlGtWtgQVis&soz
zx5@QK_b?MCO}f10>wRCe2`jW(U*EiW^Xk=ED^2)KcGDBxX4YPuS%38FZ@!ta)$-7b
zwv+P~^*wHqsoD=WnZ7%5;;WOM`={SIrLdr&ASWj$JA3;J4?H@o<GJ(a@0Kll@4cZz
zh8%F2E?&G?Ute!n*>wtPH)TV~{^#od|G=yLJAeAs3VqX$KmOR%RJCNu-%JC0&#A8M
zsh<1f#1RQmA@xUPch^6c`S%Zx4y&=eV!Y$)UAvASJ68Mp>#1pJn2c<g+wC4d{!C5!
z9EM>m7E6rg;}d5)-6gAEw_w2oRl0vRp80Cq@PP|9Y}la7&d%29R(*47*|KFX_K34A
z?zGZW*7)(vA9nZ1%z9^9@{IGF7B3!EKIHO_xMvN<ihJ6c4kpGI_o~aRO?dL0y|D1e
zs=U=PwQIw+y;FKR>FKNG7n%>62F6B2tgWka9R5eezK2R4Qni0{!M3AE%`#ax<%ne!
zqeqO0PfBV&eY(N+wzl8Aw{|Aaz4YVAL&eoYPyNs%uH*K@)#Ja<bw9cJ+Sf}?S)1=Z
zdiCnn88c?ATeps;+o)BMk)7IpuxiynnJm8N?9`A4d-jYu%c6GkGG4#y-fr1p6}Y#>
zyqeK(^OHZHI$A&d+SLnNvT6<I#>?BzU%7H`;)DZ{Ph678V&Z1*s(Wuel{MS6DyFBq
zdGoRvGwzYe6kWG%-@=rXRFs$R+qbWCmo8X9|C%_Yx}kLZ_?=fCU625jKx@C5n2_*F
z_JC(UP(AjbnSAEYpTB0!nx>{EYt)0sW>!=*YPEk^{OZ*2w|K9X=M<l?JDQ!LUEj+o
z$#07)KPwwD+Ubm#mOOI3^`0u-?w6xvvc7%$o<Dy+ddzsY`_##kcgWt~wr$&v9hl^f
zg9ob`PHfz`@xsqPcWO8F+&NEn+hrf@+BM<Kw_9iaCE_a8>B3Q0{DAp`-#+}x64RTb
zD?a_(m%DRE?77(dPMq^lx$*FkS=Y{1Uz=5Oa!dKepFW&+@6e$`yUM3EoWOcH^||Nf
zeQNE|WARTvx!XK*q_HtN_T7wruP#~gV{>!2nOn0e!|#$6GR&KAym9>E*%O(yU+&+Z
zn3VL?H>>jM>gx8q!48<yd+28N#Oz_HFly1DL4%CfE`49~^moTMywa_Nefx`@J8dTo
zrB&A~L)u-qaG^S}G(03EBs6r!F!af>pDH89T)K2=>?zae(WAZIpFgikj4eq{(Q37i
zKmJl??fQ)y=e+QOynXwr2&>lQ9X8x=`rdEp-lkqv-4LNrbnn@-eTNQX{yuhrEhN_%
z{r<6~hSfO{ih&Cbe7XLgd-qN_KBoJ|$psr7gA)?!M!l0C9ow&CyY_dd6g-bBKBV{B
zHEY6Ds@%jo$CsA&=?$Ob?oGXV_3|WCZM6(eOzbk_qfJVzK*KtET&{K<IuxtAyEiSV
zKWblk`rzd`n>RnqS{8oxa6y5g{N2jgb1Zw>6n0OV_^-n9@^U;ZoYxi?7nhVY?b-9n
z^y%riryn_Tq&BN^SjSn<Kku3_0rNFBHrDc1eBZwHyLXp<zU`r*H8oMgcSqD37A!im
zZf{J|wGPp%yDofI)ox1ryKCy|!ee4gwT4*yGe2KGEqT(UNd*P_)93WQr|pzkvu17I
zzJ2-f<)==KU1`dEEw@dZHp^>jytB8TeP;P`-Px=@vdOb&?>ugMeAwj1|2@&YVamLD
z^VYxpc85Mm?dvi9JMOrHrs<_im!ftHD=SYNJGN%TTT{|%YFDhNSG}3PdVKtWo)@A&
z{;=`qq6hN4-fM5(`~Lp@lRjG*_Tq~#c9r*!kKgn8=eo<4)zxE0k3NK(Ypc1h?FW1J
zFaKa}U0vjx%TJx$+3A7vKgi<XvvE-a7U7K4<+!5^eyLt{V0YZ1oss+Y4j$MsTRyGx
zN>l&&D`m2E>pv_Q*{N5rk|j%+ci*)$gAVT4@%feG{VR*UxMt5)cv7c5BP;CQ+|*P;
z(`U||!^7vU??%3s+y4Ih$DUtg?q0WcZ9_wYJ~MOuh7E%TU41LEZ2XzezWlOog?`f5
zasM-Y`c6mhFHYt^{P6ZqGA>Y`4f*!lAuCOfc5xSv8+Y!hmy#If`RG0tG#O7hhqgRj
zomso^<(K<C@<_Ty^9&mC*S}u+zcY=v$Kjs;)5Y?n>gu_3msRz8&0JXc?eQHS_lO()
z^1=y=^Y2Sfvu@oQF>~ga-U+760gW}wNAwuf_8(_HP98oy@!U%j%XV&$SbnX~0~N<p
z*cGpZg@x^|8+Cby^Qp!kez=V3Pnj}h&z?OWeU#e$xjv6Qb>+%Mc3Se$=H}jAx->R7
z|C_xhfroNye?-M3wA{9<%$-Wq7_zkJYC(|-#nobKFqn)PW+81_soNsAR4S>YLc3&1
zT9oQWNKzz~qLNT4$?`wvyze{nj_odA-~ImI|KI$|k9p5~mghYCInVQK(=?5+irQVY
ztYY>rE-w45VzWknSX8^Tw!UcP1>f>hF4du)Hyf_5`}E>P>*m|XE~b4tx8OcUHRp#b
zfOegooE%O$DN&|Qn<f{Xs{yE|SFeJ%6Mro1e#awz^FW`B#`qJl)7Q@o>7Ds3@AJE@
z%UYZDe0&bCSv)W9USa*MSI4unb2o%ApVkFrGt`91F(dnKvWo3SISBaDxpRW@tgZaZ
z%>lpsQV0;8>6CKtk=%5Jwf8IU)^(G=d?!17()d_a3MG2VIiDh%mX@*ulbzWI;}$yh
zD+}@p{}Nr2X5{20Hk?nHJ9loc0gTnOSD&g&0HfcVIAe6g=y1#ZQBg*d4u)v!R4+RB
zB72w4#Hgs4ipqioX%}w>yiMuX$3On~aXVM9+M3p3F~TNu)y?eImai=1R{gn@sHmvD
zzd{P{(<eVa|EB?)jVd>mmzV1)^UE?!baZn31{zLgmL*l)OiB4rShz<gV0QVJ4_B{W
z-y9hkc*AX|^VZOw^#wNNIh$Hb`14=)JEYysc60<_t3Qk1*z@_PD>hX$oj!KVf*$@j
zV`WKhuIky(!Jkfq-Z2q3E!{Bj;+8>&9WsyE%-^sfYP3%E-Y+$mn;q{LC&?YXk<NEL
zzb0_bquw{l>#knCT3TAFI_&4ww2grKOqlSozW#^){dY!0JbL)>gk$oysd<yGZeTSu
z)cu-VmcdlB-16nElb-SDJHIcpKD3=ay!6<EpVU>H60<JH$AhgMH~QMpNhz+um+q~O
zU;jFhHYmhsk&69jacP=(wr1j`OU@@9gcH=|mn&1dpBGk!dF49fit~ruu30s3S)(W|
zqEI(J+*GdlX7J-F0dEKIb(p2uPet9bu{P5(Gir^0x9zt*JoJN>Y;il=@c!i;(?fdW
z;O9Z@r@IX)O<TvGD!rVWY=3sh^cCqvCms3u-UUUuHU~t(O?B&@Ki}Qxa{bwrBp>;f
z_q&foI`R$1no^b|HGZwRe5~Mgg2TzZ#+QH)&%S#%KqOjGbuw9bzkk>k%Yu8%h=}?H
z7ZxP3*WX;Hr#y9g@l-i;^OTC0m#SWQ8&pqJ&P+;LH=bv>Yp2M_NXcTx5t^d$q!Omn
ztNt1_N&fC?`{tOX_Rv4oT_hI2eDUIz$GO6U`8^dByffsc<%JKo_*7HIf4al%?A!XH
z!~-T(NsAAa*DZFVFK=$V^2&R_zB$Q>!>6e+`dhtu)1w!)__T{}-b7Uu)xgx?R+FAR
zW0KF<x_umU&{k{M<P{BXA0=+zzWx4v`!Qq23=5m@;BY}$X}uD_%pPbQVZ+3CmwXvg
z0ko&dUl~`+T=~%l=f$0N<u^2xuZ?uuxXrWla_fP}S#m4)Oi&CA2w1Xr?Tn}q!-u;+
zySBmD%v7!EVp(a^v(U6hmL@}9i4uAZd~kB%x+Q%ljy?1+aa2uH(3A6(fYZ2KywE4i
z!pKKs@Zh+(xJ_YU76rW`mulI><X^jXjixwHt3M#DMk^o}<a=6We5n{5@RFm>WCm>5
zu+QDyWNyf)@LHb-4drzy*RI`-%XLjxi!bzZqyIPuOk{X6uT&rwPmj6fk>;@8i3zmE
zy1Kf%ckeb{dr_I}Te{arTO2%T(!I>keWs>+W?bsNcCpj`%7zrT;uVLEykIX)*}TS@
z`+H!uLbqvVX7ao57&(tWpPrtck>PUE;YY>Vr&s0WO&&gddc7hiStlj0xnke_>6-`a
zsiiBf4Q{UbHFj38|EZptR{;5MTy$s%P{}r!vOqs>mZjZRvr<x1zckiYm96~jJbn6x
zc@v#8?U_J#-wk;8>wOKGdix`Tk}qo%@?LSza3gOXowIq)swm6r8dDC8^X)!H&GG^-
zXS!YNAmtgBmWt6~>Cf{^yRV_8c<0k~b#)Kff_*g@7S?mx_8AMU`W*z)HX*^Mxv{=c
z!LNKqd1ds#T$e9&K}Gfu4UL{cH$QPw!l`$BUdxS7OC3wjoYr;Er@!EB&3wjiN>Mx8
z%XClot9m~J-DA<B;)f3{NAw*|r|)7qFY)nN{`TS7+S=NNhNV&btzmcM<u6xNPcK~L
zC9kWy$gyPD&K(2fU%W6p=@`f^HuLf-si-J5n1Ac&8b3|twFftEo;71eR&A}{!i5Wi
zg1!KI0dN$y{-fVU&iZ&sT>I3$*RIJF%9#0$dt8CeJ7Sd3azwhR+?<sY3=O|bX|-#5
zxm$bBh#!1M4^>ycckf<HZRiwp3kx67{9~_GeO}jSOj-6(TXT~^WRXkejELf_kU{;A
zn1xj|)V)8&9IF|vcWSS#*3KhGj$B&)ndzG0<hsW!)N0hIh^*_snjAQAe&JRtO}n8J
zY}Z!QzkBy?%=}Y>URBQF9P`j$7`-gaa>PX8QEEc=zAev$0Wo>W^8U|EbDq-PtLGLM
zrvU`Mc+t_7vc>nhbyWPhrS(1ae(@?eUix~)s-~sgpI0gO$b9rDH8pjiD}~V=(9-4B
zC+`aZX20WcjlC%p<&X7103F?$YXAs6H}^DbsJos)Np)iGxSjX*(GLRvpV{ITAru~u
zzgDr+l{vq#sLCkkRrSz2xfU)<zI^?<`Ns1)|Iz|e4>?04qoF3t?q4~uewW6o<2Of?
zRD1{vKF>PWecpnHai@FT^ZTOzo_TuTzLJ*aul0kc(s~^{b}aO^2R;6`F%h=b);qog
zWv$;eAb-cG(u$kHXQo@9QKqy!T<fj0CG(l`g7q<dDMOO(o;x?}<FY%#E3Pf`xJMtb
z?RGrP+BzeXm6i2k<VfdN&kK65r5G-%@K*4vaoIQV^_BhU=@&|p=kUXq7^N={95$qS
zv4O!h8YRyDO?CCw8I&I96&N=z_@-7@XT{ZdPxL$Z;_A8p!=GkZZ8uQK^z-qldiCm6
z_GLANsj>3_)s)8VnqeG%+kU`&-Tj*^M>wbImps(gR))f>r6~A^!^*8qU!GoH-)-yy
zYisLSn^o-i+y`<xI`mD~-&dWEJbyvO!Xmmb&i8n~*uISg(Nukdn#0lN+Wl?aW3KoO
zQd0nSt3tP-SI?a7laOHc^6`4Bk^Cp=3qD*tckcB0{_8eT=_V%bb#(&+-mR$KVe?#6
z9Pa~2`pg+&S;q38pR87T<a+LUj^Ci3JwwC8!y|Lg_L=H4CjQie{QOU^^6hhK*7elL
z-AbWQY~${it@!ZvYfZv<uHyYy-6u{edG1G3&a{e6i<`N?HgDAzfis&O&8bUH`pGNW
z^pLkW^4MD1>gUhhG&D5KEe1zL4Zo6ZL7(gCRRsQZqb%mz9JRF^66$Uhn;K&4{h(D{
z#iFuD#!qrr^qdwgvWm%9>%RDEqHDpRA9sXpy?yrAlb1EVe7v0rKkgMmvvp^(G!A@H
ze@L-wKHA)i-Z%2VO0#aZ359A3hx|{Bo4jqIZ=;c$wY&ZZO6)wPOuZp;w_d8b?P<NS
zX9s9U3%49Rc(C`!s)|jK;YzD%i@huk7o2?i)>8AL(bOHyK$!uQlx_H<k)a|mR-Qgx
zY^Y7^TY2p(J=Cmd!4|6#zw2IJaaebOrJ}GIP&`GU+wI#s(o|0ZwR)WIqW!xn1`hfC
zeB$tOzk`c<+swXI^(JIh)7kpRsY_zAkL7u|j*b{-WE6Y!sP*z~ImWBa_x7sUJbCh#
z+{v?mNkrRYNL!s}dsK6Qd(6~h6n%r?DnqR<B!1nXqomUFp7(>ZXAgjX!A<Vj0Q<)C
z(x*o1=?|XxRZT&Tq9>fMv2X94#o4=>yH%`cV7=JXk5hbaegZ4p@?O~#X1G>TNs%b6
z{^gy);o-+ujG<6gXRR<hWV@O+p&+2nbryxm+$rDF!TWyq8*Yydm`oWP89H>RYHHfB
zL$(=;N)!DXMX^WCfB=hLm8Q-<uN>0bZ4fYuXlkB!z10-9M?}Q>d;1JhRUPfN=gXD7
zMsh<kEs}<~TyFV2xonrud_6s7LqkQNPkzlAKgB2F#`UEKKeles{5pB^WIK~BKGP;|
z??Vm06!AuMU0+p6rDb8x$rC4*?^O!fb>hUL998ND58tgzxbBIZjVz#HSesGTtLD8H
zMcq^^P*gS_=eS3;{|}echepU#Z08;-a<aX6+`Q&Z_pKA-Cj$zM$rlY9K09;4nEtc;
zo0pZ>S1I01SKpRzRqcJguzpQmcVNR>jp%D0)ju$B`M`nHTAz@qSAv!o7#Iw{d%)S}
z{$>@G2Tz_Tn&>HK0^7<sLP2fOR6qF9J3J;>U1iI!Zl&p)0-kgI6&2KXS6zFV)<a=J
zW5a|qk3<9RJju%H?|Lab{N2X*TA<QBJnLSP%r8n?-|A(he0fvLfDP*vKAkqD^rv!K
zTlN68a`w@8nv?YDu?1WA{1P)ZN`25E%Cx-vxi@XsJfeOAc1U)Z#|3}?Lq9J)!+Cbi
z^>~wN?>T@uBwtV&KTaiL_h;&c-x?ds-1pVJd&kq<5m&HI*|S@1y;zYdSmLd=M<XI~
z(4KTJFMi%mV4m7Uf7<`^!Y@zdf{Qu7oj%=X-I>#;GY$RU97#yne8VmB)w$Vm_75IB
zIGp;%y*!J?=ylJ203)w78EA%@BbpvNuc-g!(K&YIxpN2h1?}1$-e>(%-@eM3BIA|C
zCzTd$?|#rBK`0dFFL28EaF_0`>%X^miqpWTT%ZFPiET&x*7Vw@d*i3=`Cf7gYXYAr
zP3xol_zY`ZbaeE)+@CURG<PgyI5_@zuG_FsGaJj=Ye&?2yZg?$UzBSb_hM)NQt{T?
zO$$eD$kiBouqbTRoPI-dObc2E^(Y)MibgvKq)>TmE`_Gp((-v$p1Jps(S^CONBy;r
z8f1@(zW%7B>eIp_g|5QD<f8dGQBl6C>I>HBn_LXg8Cy2qD1O=mJ-yl|mzGyoS2q@i
z@A@bTc6FWMGv-{44YP>-nP-15E%>staJe;5JhH|BiEj~hYWD2(3DtVz3=E#fgdIN5
zI(kS9FmFk+uVX`;UBURluFG@k@5PQkx;L=jrezWDO-$nW>4%D@D=o`QOW=5W*M9tX
zKS-(2@NRVFrPfv3?p~gt9(v(|NtR~arO!Mz+oY(8sZ-i_X!C~~JF2UPm#zAGB0YWn
zq1D~Gsh2I+72TlnDU`eW<DO(h^`cC5kD+P3N*Omye{k8oa~6q0rD<>O?5^THUYcL3
zqq(C_PHvme1BD~UzCNo<$)7toqA}6&LT2c!%Z>4~8M|`QGoQV<eLg$8NUdLR%@dQH
z(g_t*iiy?8{(S{*dpAsR=%(1q(boQB@X?{3oHeY5kFVo_R7g$^o?r*KUwTWL4ewpa
zh~J(pb9S6`#=pF*7j<0f#nys@?6Qoe;TEg>DK|X}T+<s&o=@8|TXT}&h2@eZ@oV-C
zK05^vUR`jr&-=#u`JOE!cWCEV-Coj1Q8VdsQ2Lr9M>c!qo{E}izisR7Db43=AD%rn
zTXXt{h{%l7?@E1U&AKRR6dCU`S^3#hWDkgg9jX%XyGQ)#%gnFu@AQ{%{<=nfruVj=
zs@}Yrs-{fUH=Gn5ad8A|kV~rmk6Y#Tai01;egE=6U7d@Ii(y|ST{X-2_(q{%uWi~x
zO*KDl?fvXKKQCY`S63-2o6_=jA>YNN%3kM#kxx^>y%p7OZvhke(W4~0`sm%dpBaqD
zTP8Hc7ryB?%KFTsx986r%3s~mZ#7Wb?z}YCy|rhCV~L;ltJ`1V5_u{P4(s2%8M<c8
zt;Ad)V@{knQP%P)Ii!BsmP!4XOlAhq@P=%jsi6_7n_+og<j=}I7M&HNja;q8r<^aU
zCB<*)H<inMd*#YhyMCif5=t-bK6=EDVQ-sg3M|5w=KNQgF$+fy8buj3>KHJUu3a-V
z+)4?%>71VOBqwL%SJMiE*_tEA_{eLz_#Jf<iIkL-fZd_%a<I73^~`EPbus^F(Bc*&
zQ~I;hE;)OQ#~WR_eqEt4ywF=N@AXIDk_&@t?Iv!0<^3R4=u`Qb?R#s#aYV+7)PZ}q
z>qoxj2Y>xB?50`2L3(q>&Z^vcvB%P{)oLf2W-VL~)>3?4yFdHs+O^#%l)U+Q6VvXk
zsCja{wWVf#>X!i*R=l72_NIoe*}`XOX=$U!j4>J(H8+dDi()@I!fD&@<Kz^swl?La
ztm`?yDXsA^5Rwf|AIx{go_0v6d7N5aQxlfaDDQb{eQ?9Go_#l+XJz)-IdeU$;qAgF
zccTJxk~i=3RaAI<);&&Rg&ND=tE8l4R!n}Llk<@qCkC7my}sAjxa_06isD+w<dD{e
z@=1x6y@&PlHcZ&RKN)CCIS;E>jUPWg#!5raj`HNmlRLY0TVEfGZfx9g=FA-H3VVBQ
zrNFCs+tLEX-t1kw`Ho4y=QbVBTl|iuK5$@Vb#-%r&6L4~5kQvAnpIYId5Y)c{XhB0
zO?#TDI{eP>7aAMsj%-fk{{8nk-NHV_RMdq0?xCORWF5Qr@S&C$Ge3W-4jeKhJMHYy
zet_I<q81GuSjoQcXchbZ`Hjs>e_r*$^F{OAsO;YZ&d<H|GQK8bOl#8z`q_v27fuBP
z9I=_asU*=W?(ALWPl{;))r)Lwa(C%Cs;kfbXy+Rw=dGrwsj9&=@jvXwyyQ~+P%ZH7
z#)fhY_m6SfL#Cc|C`%7YOiB_L9G$cAfP(VsvlOr`@d*h91qE|1o?7AU{r>u<Uw4ce
z6B431XX#LrZQI60M)sK$m{IZE?YYY#(?coC>X$e<?LRiExN4$kEqMFlMP28#7tfxZ
z^)H`cI9WwR-<=>3?#qp?{Gq>yW?W%NrT5vr{mPT{pt{ETH5L3mZ|pAXQQuxX*wWH+
z;sm3|y1ECB{K1p74}{oir7lmNsC&BlS*D8c@m#$@50sSN-nWk~Ola<%qI^y<QNPDV
z^TS}1dMYT47&Xeh?;)#L9;eT)i2C~vR2~$mCMAb`{Iu=0qjkSc6UL8UK5pLt^|$HX
z`D<@keqK$n*jW*<@yna4s$NRd94yRpxxKIT-L&4EJ~-uG!R(z@-XeR={#HlkMP%6-
zM$SHSK~rzgIK#aWayR<z;P7}E;;I2VZa+TH>9;IV$-LqY!+Wy)G+P#n#o=i0zT=!K
z7<nOS3G+e>YY=nv=pjSSH7&VgxM<O$(W6H{IO({1*RGJDeFruVIA}jQF)?xZvSn`W
z?z?py$1QKZ$B@gc1vGfL#=2ln4Ab(Y!+Zya0sZ?wEGap?FfrtYTh3LBIXyyHsZQHk
zY;UMn9M^yDmojqJu7<B)D=RDaO$j{ki$b@nnW3top`n3qAFg?}I6<|S>b1S6bNht@
zP(6SCJT1*wb4TQFzde8X(x|6WqF-QkdEMT<dw~^Rp_v>K^!~-n;NajHGiEGa{B-}w
ztZO<?U*6drHq7MBt5<#k0kv1JazSd3cQ3NkH<*qs4Bq0z9MyM|Ft2(x+vS9ONJt1k
zn;(DtaZ1Be`IVmySQ|X83W|%1^YZcv3O?jpXynA+^3vB;I4HOFVBGTKD_5?pudg3A
zY#3v}ootiXxEB=_@0b2e4}VozIk12K7nPM>#aTKI*~8^#$0Q}yKg$d?Gc!|Dm>YM0
z=gysRyHuzfx`o{=_e+V4GE$i4c6I?{K-jizDypgl-iFNG3C+ndF=i(n0BrB>czG+`
za=rD6mGJXY5ajCW8XVkeXi}5tmHVqXogQvUQ>$It^se+`(hmzq^o^R}54e_(kI#^;
z<L1l?&6yz{^J)LsV8_)gfY>*0-h3%YwThh=XAexL;-kPyHm8SQx^yWbBI1UZ!^WmX
z-D@w0OpFp-a?>PEMw_Paehb|ASt0&B5S>4ZrY{iTv7Hp!OkbF{)Qio7rIN7AcNW&a
z&@8<9LJ?kAOUr{Dz;S1r`0;!NtUzsQcJ_r0@Q8TkbZhfdri<79hfb)!fBv1HPVaw^
z?#utHV|0E0!%)v)T)X=3;Dzt^KmLi&|F-zQ|1bF;|Bu8A{#T`c{2n^^pAQ|xF@y*f
z{KI^j-y;UUM+|<C82lbF_}`TLQI=1kQob_03Qvdj7g9j-#J+B90SqD`(lWx7Q$P-)
z&@f?;P{j5X!U#PgECuz+MiFa7wE__ztM}l?_Y-r0$}36mNYw(=DF7XDgGi|Y8F=DI
zEIDMGjFChlNxX{6Br0ttoH?2p{LU^2`xOfzLlI;^atpO3v3@A*kWE@S#u;?@0uB}&
z2J`Pxr*XNG>EnTIl1MKsKnF%x@_Dc|g9?*NVfl%8Y)QnXq&%{ebUVleg-r&&2lK&!
z>3DJZZY)%Rodff>!EA0=0ykI}0!$ApM}bikQTK*w4`+lm!z&RZpo?JoCRC>w23oSX
zoMl*W6;`)`2o0j*sqcuYB`~fHZZqBpOIC;V2*foD6*`f|&UMJ@N#Eh{MI;~S%>h6n
z&5-Di)LjQWU-}iPGq6Xrb`MZwEKvbkHa{rB4t4<eRSc7qQ9Bx1R#f0QLc5y3q)<CV
zX*{LoUrHZJ?Sw^ioj$Z}CNGI@f#vd&=ojr{iOK2DSR_(4qhaB>SY)3uKsrAb2a!FF
z=lEl|0BA-4w8moq$@s{W)LMb<WS+R=PqZhYJaY))r6VG(8&MEm`iDAQ`iHdcIt^PY
zm^(`Sh9Y9|?y+uQm1x}21lER!g5u;s1cu_l(^!EOB4Cf@2a7{v)B&dA(WXEP+k;8N
z!aZdPNm5E2^e<U140d+K36$+S8CwM0s-JbipJWJeL>LbS`_o}CD(D2+hL}E}Ys4I@
zE2Exxc<SJRx?t;3w{UD7e5LqEC}5QoFip(4!(6no$|fd2$O<QcQIJ0pJWNuP2F5)8
z`M_Gdwoyl=jmTw<@c3)c9b{%wR3N6x_MkIq^I-fLzL$S#blo=UrnFiZkgaB@i4IoB
zhxACMU=kRV%Vr69SWS374WAZPT^vVOD$3r8XEv1JF!rSkcKdNKlw<)y6`&I7L1<$-
zWcySiMtb%y(_GDLr`cOd<qMGj6ibQ+QC>_`JST>iWP_Dv1eK-`X8l3Vytb+xVg|A~
zPo;6DGa*fRU>ih=P)9V333*t^jV2T$X~h!ZS*1x8oe(wvQW1!GJR)HDPgc+Z6I=q;
zh2>3!nQO^P9O|1CJiY{ICmbP>2ms}|b>Ik~#DJNOy@9O8O6UQ!@NU-!Ig2hHbPFTU
zVP;2(?gYslrZdDx2*5k{?YMJ1AvFYIS1?2wwq-%s5x}S&LQKSV_Y$x?nSNq-9RY{W
zbQ9>V0&H2}4<QGT1;Gu^$xF(FD9bho6B9OQYi1HDc%?#UiC75hZozC6P=!Zi#AOA+
z#lfjVi6iDgZp?<sf<=KaUod2mC?s79OHBF16IdYbfK3CTJKr6MZ<q}d<;LK`RFOgk
zp2tAQ0Hh=2cwht}>Cc^u3WC8*1K3j;21k<a)3ITMVwlEM2q4de2{OSp%W519nwaOq
z;|KC^%?yG{NMnoKnN*a+0@vrDh#;nbEda?0l<+l>gN1wx*f5-1lDR;_!*%hRia-y6
zLFr(lF+RcLaHSO!AzOw#2zwO`0hBwT5b|7DUX9}+?YJFq+pIMZI!$1PU9c8d_mBZM
z5kgI>iow8s6y%F*PS}zeRML8Z(o9||gNo^xNHLRSm&Z2~D-}pXkPxsqP`5|OjUJOW
z1<80fHq2=O)<*!2SUp@H<jMr#ggE4cRLmvlhQjGF&7Meg0Jab1)I~{01L4SMZ#_B`
zoDx3?%0Er`N+fCAr^zA{oC{tI5K%MEF7P%GJczJaT^L<doK}GS1T)BbNGd4e=t{H4
z7zK+M66WXt&_PNP)M=3R!NVkGd*OoNEE6#{+<$<jCz0fh7qE$PqWE(lF>!5#MtF7k
z9&YY*_=bRu0|JgLY+LD(V254I!<sL`Ia?5(78b3=7qf66!SmR75_nu=Bd4^ci8!#{
zARkf)G)2KaqvWnWY~#PNo_625b0)~H5+Nf2HpK8@qHsKqigc3@?x2JrEN&nxNJ!dF
zLYa{`sbNzFN@Fau&sY~Y{E!ZeQ!dR8802iY$tXA<q6Za$9o8U)Rx7p%?NZjmZ&9DP
zLJ8JJYz0(pfbI{l6~`Dp?uf#zP^rYXL**SYDqu*MhlohY&%ibh(^FyY3Y4s-BVU6=
zNkQpu2ptA(DOxO=DQ<%xKO13YFljS!a&|{@S45;{@#71HNDl_^Kx80;LgX~*lIi|w
zEbWLfbYvbQF-bC!Z7@bjQm=s(+s=eW>Bo`Pir5+Cr$ka6Y=WbNZR``O#6H0VALbJ9
z_`{VjutdLPLkn4}2;BHi5+!jVO)zMLs}wSO0DPD{8pnS|mlOt;Ni(65$V*F`Oi753
zi+~nPc0P0j8<bAJT?JWbLL>H4ceWp4s)=N^H3khc?0IZ9#zvvk#=oN?#~6=AxPx&0
z3o%Aa>ws?q1qICxCDf6bAA?3E0Shf3Lt0;`1i8T+`$8dRjEf{`&n5DepmiAz&0GS&
zBoXg~HAe=y@t=k`?24uZT?kA>KIjW3Cco&Uo$xlCJO>k)MDllOHEAsQ2VgeP9jSzB
z#FCKT)t$>1vN4<|&S0?BfQQEDp_aD9RFxd#!Sb<6u+**@mrpoM$lEUILc)ENY~Vfv
zUIS}Ic#63&Ulo=fhtNz=RvjYm5j53ASb}&o2@eeRu%<FRhn$BrDxonxkVqhAOW7dC
zQvi#=N1H^Hn+2?1(hOn+RSC{pO1>;Ez!Hxjd_=sou2M%p!zSG+*s#Z1m<t8I=E#7i
z9`+kVsX$;YI6HR<Sga2rZf^pPOL%02er$J`&JFPiy!@?XAYyqK!GW&OpTywp{XfKH
zB+x^QH3+#Cg<|M-fq=k(ZZF|U?Z@+F1wp4Mc+nk5Ne_GrWqd|TNbF!r5ANLckQJXO
zn;qHHjPZBmI7SZUN!X5&brbedKMYKSV8lg(xt%r9T1JSH+Y8~jt2_1{-q@;xuEBIg
z0zxCfAwY+eXspQ<O=_c)YkG+$0ozUH3G5$!PsgD}a5TvAvCVXE=VHTQZpX$n6k}4!
zpg(c$#h@xFp-q;&)WtEEj0?OCeX(eN!}p8Vq{iz@w<~PWwiCR>0nt%=aodq68M_rh
z0w7C-yG}8qL}~;<j9^i5|2>(Iq`h|Rt?pEy<NRL6$u8vyBtA%R0?es_xrH#xhE%!Z
z?{IF|Z|AHVKK*OFo3wao7k|vVkqf>9zK!%pR7ePC-ng5PJPuNKp#A`zqJN98lh~LH
zYbUkzWO2A+lvNF9<sHHiRSoYPkmzyOkVH*zP-16hKrLeNge)Arl#t2c36Kf8fP9IZ
zax}nteV`kp4HLml5f46=_>wr<0xU|}X?t4zS71gGhkk6#j|w&mdOqO{pd!Q;;BFLX
zzeANus<e}mH+Bta{OqSwP~*?FBwm`XfR2}(!=MiHTJn&G2bWMp4+Ii-$=LqrWJw7V
zi+CbdylNeThTlb!8b$(C=*!a+yeD<qK>R_6Dukn=YZwXmT&^3--KSF^5e>S;$a$cV
zkOrH5N6J4yN+Das5{vkMzy)MlX}R(FTsDi>)ehLh_0zBeE50YDl+a-pG<+m<qVjLr
z1<10yeiQRGVJsQiUT{0e(?heP13d!zG{8Hg^L5fd49tl4WxE3log?%`?)i49T%{`D
z|6=UuL|u_(4M<hN*h5EZ3Yl?8RTSc=zU_%L&PbrxM7KIvJSxrrJ*0kWCarD1vTBLM
zvTmo8$Z}k%<R!Q)St*g8IuZ)!U(+|KvdU(cx1u_@aq)MxAhDneB}gpzD>@K_DgyJr
zi-Y~4mD$1KJlP_5@6Hy79%?xvkB}n+k}GDWbZu7>wO4VA3G4-wT1a?dVvSh;OiyA#
za2(0fg~Z7SkrkM9+JLQ;DC#Ob9f5#^$86}(lp932O;AUWEBu+EXe`3_)zKK(*({LL
zJiKr0Oh=-20`BAm&u&>*PIB3a!5NUek?{5sU@4FsSX_K!Qs@%1lRAM&>E2;aBIy|#
zVK;Jk9_aQ0_|+RbgC~(bHYf5iGY`Bbc1K4U$mWKF6J5c<aK>T`Hxyngq|p%K;CoHy
z(Pj4??s`W<A}}B^02CNDEK<kCW(x0(c(6TLptUxRoo$9-{pBH8TtBb}ZO6fT$2hMN
z+0DTAo!midbnu2>ngU#jBa=eelf&kENKS|Crq7;kW=~a;FjCyWhdp;T8FKg7aiC1s
zWIsq7{6NcXj~eLu2nGrydnLO}Rce0=jG#qAC1`&L#iEIM9Dgx^-Oy!#3QQuhVGD7$
z0#ykj2@r4sJ}%<nRdZ;s;R2Bbm?>#3C~Y>(KJO)Fq4eY^{k0f734!4b5-{LYXN<Xs
zpvwo%AczpS05QQxBK(qs2iso^J;La+BI>5CHZYSXqnyenYsa|>sYWrXEF46>)Phkk
zvPA<}TrsL}fK!T)ssy0HWlNpT@O2qqkdT-#Yy<0MOQ+gS2tawwKzFiWW^knXw>!&~
zF%keg(a{Ao3BXdN2V}Uygbs!=bp>BVyZ+D(Fzl=rgM62=!ky1WINO=H@B&DJH|g4P
zkXlHvydq5tA)7XK*^Ddp<zb}pM{_}7?0PP!$-g)ke79sYI4n6f?yV)MAf#(AWEHPN
z^#-;jq26@KBdNY;%7)hvFaiZ?HuT})S`^qaQIO2xJxh9F71d-Q&{`-xaTekiQc;KS
zvcXcIXcKmUBt3n{dXX%9{;Q5?M+OY`#J}SUM9$8gst|A>kI6XQwyR3ckU?&i2h@23
z`BGjfRTa>EZ0ytvlZ_ai67#@3czgjmO~n_%MDI-F!hHT6oyCwOW1E8oa*0$1>IHEL
zq(S4-qD}n-33c1f#k=uvYkQ=FI^wj01a@N$J=9_|y_hsS4Z37g+WH2y=pJqe5uwW%
z$vxsOB6Jy}D`JvIQa?Wam`>U!G>kS4<6Ln3j(o>|?m93Qd?4xQU-AaywAm4gLRJ98
zFl3RPu>lO>I$B9rPMgl=-+{LV-$5W%1wpcGwnKZcy&D}4g-NAv&Lm`xxBnYC1bG4f
z0CV_`@ZSRA0oFooMW!MOM<S>?D6%fO1!Bn5V}KvntzcMo9gkqZ&;Ukm(9lT&@^%nc
zIbeIN0Zt1-bnpoG7X^EgyiF2+2i4Tv6slk|t*wD-hpEFt(p5u-%*5clkP8U6Sm8wy
zY-U2Tf{QvqvV}@`YzY4!bcjjL?yxTjFD&Uu75Bi%cnT$s0B8vjZawKm;F(y_ChUS8
zw43ldX8I74e*t%>&|Z*S4@Oriz&;b}2fZ=%Aq2R9mINJM5$(WZ15pasm%lk@lRcA_
zWo_tg7KyX{b;kDJL1zE)V&(slI^|R)R1b!9u^%f{t}iJEW1vUV*EiNPFg9ve4o2yF
zvGRZF(?0(Pz!cqYI|j`1G2Y0ill&j((<c9ip}v6ug=X|^r_u4}|9Sq8j`yGC!T*Lh
z@Hh5<{P=O-_y3>xbiV)KKMZ~Q24i%c|3_bc>{$J_^`G<&^}px;`6oU)-{M0B(s!D<
zjl^~!oeWFVT{D|G)NeBwar2*!helDqQNLgj7zvOfg}zbOTs}O2;Bwrop<!!6#4LcR
zV^3@W;Gq3$LR-EPe22}#1Q{(_t`?5?i_Y3K6YwsY9UU28q-Rj?M=zre!EV?iiwEn`
zgAWv0><P4Gv75*6y0IBLVaCq5wdmk2b5o}DjvifG@*129^sh-@wP1_j5HrD-TCh{u
zwqRQL0^nQ5c;nd|H!W#9HqfPocq`D}7$|?h9Gs3$Y><aeh#Eul(1$?_fVwt}hZbs~
z7nv|919l2u(59g!(j*Ia^l=6~2grUG0KfAA-?0JgXjJf%fEP^dgzY*27--<?O8$mU
z<fZ~f+$aGND}seIp<rjJyB~XpPL*sU(^XpZ67(dkGOJ~#O)4=fTV9qfdD(oro!PvZ
zwx~9xWFmhmXN0-w96M=04%6q^$@YP)#cxSGvSAL`X$L$pN34P5i}^+)N`}Li2;>z)
z7XrIDLNn}AB3LsztS3E#cM&0)<MaU^NWNn7PzDhbnjV$(26kT`Z;O5a`(Lu(03!n!
z((TulwgL~BBw{3fl{Ub-mn;U|7J&1BG)3wMd7(WK=1FGi2%0!U^OGl&2?alAlCBw>
zhlk{M$uDhsGNJJ}-1ZNdkYAAh(xHuQ-xoeAygxxD4~Tw9mPd*<XuB*Sn~R(^JS?bC
zi@uOA#^N(@7X!+Z0NO}Ah;(h)QSi<r8xQSy(zI8BE&W%ZCF$2hy2`%`0vUI#P$XcW
z0{{k!Lt#K?sqi0wPdixP9g~Biu-hwi?LPpGCnl>T>(PeLrejC6^iBt|lX#;gfjGov
ziZ&xk{`i|hjQlbm2oo>?U!fQ1!Vlg(LGp`f18{|bx@OS+)W&oK21KAfouU~aFk<jO
zgeaO6O#jA)V!w0LMSap|;^Dqh4?n%b5jrD(ME^2)-8lmo0~o-c1ga_9i^H>r&Rq<&
z+MSXOt^+Z#OK;Ns)53N{!WgyN(-z(Xpe#(Le><6mO-3Tcqz3`tT8MSEdVtyZ`u~T$
z=KzeWIM&oy7YKx2lCVA-`_7zBcWO40Wss$lEv$x$3${6)?w+KFule4cWnm0~gb*OK
zkU|MPv=AV`2SP$g2m}Za2n0yzCG-|ThY<eGmiP9RYtl)U;9i1!Z{L>L+1c6I*_qiE
zoZT%hOJr1-dA@Neqlskbe0Hm%xF`zWadS*&gfzn%7Xq(xVT}_?>56cXh%&El1UMJf
zxn^19XdhP5d}CkfOx4*ecLLIk?|jL#XXzL-MPJpju4o!u<F%$~#1JOaTAb6E8ok}@
zR79WHI92aEeXnaWp+qBLm$^WJODMrNbJrMOgqu*ysuaAK?AAv;za7`jfm-Tgk^!--
zkD++XX7v_Fom8D;1+{PA#ITFi{1`@B^A=ebnIfZYi|ZtuI;In$csiCcBc1uUaExR5
z!=|rU(N2VbB->bIL^`X9LqQOygXA*`3SudN!J8nkl9TQ1ET9)6=@|QA9=IfP0>u9^
zL5c7~yXs+iG_A385hBAvmNsE&GRk=3;(@bU1SL}*o8@CaVaFtkOj!qx4MSd&hL3aR
zIioudO^q3oKYz@z^n4{bq}6F@k`Mc&Squ$=D<E!jQ$eoL7xz23e!AZ&&R)c3yF-m4
zFpmUhe@tcWao+YYmTch2mOYQ{7KV)$1-Jn*>oS^}l!eU^AJ#~an*Qs%0R2mfY3tyN
zbst1l3_D$))+;d6n=mcc7^MHCnngzE3!{ycUL;Kzpow}nrTRTc_r2LX%!`svVT?;k
z4hB=?prhY1K+Mf7(Ai>c(V({pfXgt?jXz1DA>4jWF%DWK1WLS<LHCyGr%E?=JY*pY
z0w<dU*=p9u!Q6r{LfO@OVim|4%h4M+-%&vP^l+TDP(Pd|5QxhC{Afo+JaYnSFqX(5
zmXgdG|7K1;ttmOmK4CgnMkT3|(ivn`8(d;c5KkIoqGX#IlWd1@m9n27<WJJFcNsXt
z6wtmj_V#JR^u#eAFvQ;(S5!KN?eX<;hrA)h$zT*4pqw(5?U=w8f*k45*=#>s(=mvU
z3$rYfB+r>%zma$3V1NdHohiWhh+>*Ao&+>a8sVw7m={-EfeWz{<9@PlWI4V%EW$jY
zVP4r1umvMVV#`Hd%mr)ekQbG}%;ZH=Gm=+Iw|Fp)u|{4g?d%nOrKn4@fS_aszt@bJ
z&IDxyq;GCZrqVN-$KL)AqMjAc0JL!X&l-PKP09XqBAzVcUo=DTQH=k*%IebiPsEdB
z{7KOMv9?k8_}A7}m*)S3Jo$`2I0}uWjl#!&UUgMz{!hr0@Aw<8^eB)T3LgK;$|_%J
z{!hp=y76aO^K7H=@vo}&mHdAu<QdcW=ebQNeEh3x{JzroPsB6!@u%(tRL$ds{FXMd
z`+xcUK7X}o{O8qH&nx+VO~k{meZymHy0%NWo1os|P@*JM1B|a1lDmnkdykx|&-|%f
zPD$XTW6gpICcv+Puzn?~D!olx&`4&u8mxtBJL_|2$CPSqHEVWiQ=VU5Vt|C9u9!R5
zf#&iE4<yh$(-ERpW7Je7MlUz(mqSvTT#qtGrP0LXfdM51_h5OUDhNbJ&PjPxm0<{M
z1lRm2<Vr3N3a811LL^F@L?TtnBn~N5PpW|b4wTZkbP`vmNP}_I1%U`~dW9pA?vE%T
zb}fcDogLr`m0-SUyo(66)eFhmXrrVG>G=Ny0|>X+V(<t8lPD4_p-t&0fn0FYhy-ZD
zjWZaO7|rL>T5EITG9=W3IDEL^Mxuml^Cr^jkVpuwm^_RO32p9;T*1shLj=4gZtY;`
zG_xq9-b)G#Im4laM*x+ZCT4;Wo{gF=RYVnPKrZdwjk_@@rzo|xB;(OORZc=EI#;E;
z-m2@?`^<bEpvPhtTx}lQgxjtxQ`-9ZC#ovn#IicfSvJuT#pIr%!LE(XXoKW2bk3~}
z54gp7+cdRu1En37j<KMnQ{o|J=NkFYzXy`T2Q9o}rl6q6HYTWcA+I$Us8~6i3HH!4
z!J@UWpg*~gHUejiqmRs~S0m-B#y;RB;)vwBe2A*4#Z$8ew$!F3BXo@qQYPfm-&v$q
zhB+OH!uTgg9O5KU29Rq8m_*7OQZBdKOqQ{9B*H0^{X_3`0)ls8B6XN%5?^9aG)#yH
zrV&qbY4op<tMMR^U=uTSjfNp-lb)t$hSMMylz<~4e?9(ZL4#Ntr|h>Mhg_fBPy&vZ
zOqIi0=2FC&STR>Cf{}p-)e8YMBWmkl472_wNu`Ds43pxq5S{n*gG+1#jty}mLMx`D
zX<D*_gsuT-G+rif26b40CB_Av&|BRo)Ix$Glf~KF+R+<W9O$kS(-yTZ#>s}Hp7zGJ
zHb}Iur8&^ligOr>G<WtbY6}>WTG~1rGgZ;i*B<C@Z8GHV4w&lfZS7cTg2G^XYC;et
zqvm)Tti23qg{L2{8f)t_RVB3Aw4~99pk<BSB+Wj1TW7~&p2JX0Tj!!WhYhrh5Gb_l
zB@?vvO)hHfXzX5ThLNRah0><vA_8X)3>#oxG=f*(JP@1-cq6SX>g;R_G<M_!VG)h#
z&tYJ1iu(ZMM|H?II$)X`djlqtYquu!^ftD46^0|s$bbgDsW?j>H92<lwYBA*0ZPPG
z00!71RalpDkSc%G5Aj9g0D(7pdE|XyqHcSZRRGK6nTa)%tGv?mNtIK*#Qd|o+HD79
zM%ZH6Vbhs%u^<uU#CXEx*D~=e4)bT0z~uv|oR*;_LK0aR#7!GwOT@;kMK_7k++x}0
z`YyVzs$PS@$HP6-V8G^p#F@ntgDDl4$VI4yT>}=GDH0iWOhOGvsz5ASva4J}RNle|
z$!#l6*ohyySizCX<f<5r8Dc}d+Q?-fB?I+CHNqF2imKe=V4JAIJg`OyT^mzF{BSm?
zd5tLz?3`;%nf=n2dQ5>!Z_aVuRI=dt3O+gXzc_8|HXx%o|F0>X|4q!3$M}=WXvY!>
zE=T+~f0eJwr2qH%{r-~ve<GgZ_;Zz)8}!}gIB*h+m|?GiE)ED&KL}h~Un9m~u&X=J
z(z-&7IyN3*;*5@Wpi6GzzH|Ic1MX#qfNjpKXG305Bkc4bC#dh8?o#+O7XA#8%e}`x
z{24Ukq7#pKOX3|Vn~2Ph%V0`wbV37LeJ^TE4wCCJ&`iG;kO>5O(gpGIbT4)3GMIyB
z^6uf})UU+CO%W1CiG#_Yw6}G)^Xsv*KQ~fxAhzD+9xt!haUV;&z6i)2?~rz1?O1eL
zaXjQL;IhK*KTt@VdvenNx!aY8xEFCjqo2u<f$Tn*)F;Nk=)GR2cuxhrj6AQ1Yf~=H
z9liaXUpqo$s=>7*lOO%IXdgxOaI1#d5sG%%<P&TTz~{C1p~c|nsI_JD!gyth6KASh
zd!gKbV!K_6NrSQ|9cb*_<<tx}n#H_M8^>{RjR?hKVm~-p@Ltf%-6?@&?3q@Rw%QoL
zrOFi^l)_`|i$_2~MxV~&HK7we%-1<{bn>U~x#xR+E@2{C^JBCH1pTvAmPhQq?4kP#
zne5hxs~e4Rdd*WW?{K}F1Qs*_!33!sF_nV}8YRAb#E36>$iL0Ddg)Y@&*H@*^YJyz
z<t~0mLDqyh{>k_S|C<V^&k;<B_Gff~gfa#`C?KL<b`mKZ9d>e#EwN1cAyZQ{q8%Y=
z!cKemO~ZU|W*%Qf?e5VASWS6l9^6k&jW)0!RGAIRq^#D9wGt2tiGru5AX0#K3g&WC
zXa&}7iUkDEgv7<8ko6_PWF;fVYKC0+J7YEV*-34*vGb-5t!88|yhjtpVC(|YeF^Z0
zyVZ!h)nwq-9%LJEZ%im1n`lgg?jnlDqF6kRG3S_6OfAogQ+@6@a~hWe(S-3hL5R&K
z)?6l4x+|%Q_fgnHq0^(?=ohC5S3^Kp(;yYE`L515)y#3`Hs2JZxEPc6q@b{MX6aI2
z1#ARPjHb;M#BK_V$k-#v!6R}`^4$>Hiy(+c*MSTkFp4)W<XQQqsiT5+4HBtgI@r}v
z+jvvW<^VV5W?9THWNFb7`pcLFB$kYY0HGP7m^88X3LdsBQ5tivc*f9ZnP*&nL9N7?
zX;WaH=@HXx@nZ;lR=`*xK3D=$Mi)Vk*PI;+9>Yz@H_Gu7gOW|s@w4=hHJ5oD4H3pN
z3zycpCg5ZY0T6SI9uJXL;OLE76eU4q$4L||1s*HHlg0k4U0N#-C=q$gZDhCq^7*T)
zt1R|^^Gg2T6Y|U?7F&*knwK`9S+0W`mo)~LbhZcFj+yl63Wb%V1F{5rx|<phj|t$I
z2^TzS-`ZLiHGpN4V`hI^iG=kJi~3sInj28R5_8Oia)gCon!=xPQ%%M;D{wYadkBB+
zw*8jG4buZigkPw27Um};A1TAWVuJSdS9?hT+9a_-gA2UiUP(t&XM0y`TcES6w*i%h
zp(PDkH!3GKE|}8|@ejCv?uuD1p(TtU?mAC^Xl!fiYHV8CxH!<$fU*WmaP;&oYHsbu
z*`#ndk;GGM18)YS*zLhDLS=48PiJ3uQ-GEb@>SSoYr&lY<>M?Du3SwIK;;#4NmvG`
zSg*_N1|0X`pAE?CVAXUqwg(!RL6O7Z0BD1hwbwbyl2KHi95ABFQ5Ic`$J(4o18OQU
zXpwf-U60UeM_D+ITx?jI-1vt+3~miN(giny8$DyPqYQF)!<eimZBv+`_X5mr7-&@9
zWEw}Wqs$Qk@2-r{Lu!s{9bfMCB@h1Z9adsvY9lBAuQBugc~$eOOZ<N#p2GS6>T%=$
zt8q3`dkD@<tZM-Ko+Mv4+d8niv<{TkfiKOIh5wVO?A;KJjJ1s%{J*BMs@g37&#SF0
z@&Ac<794;F7{TTp^TP%wW|vO9^$*3vN^G#f+1J}rKHqu3LdSv`<>jcMI1ef>XB93Y
ziv`FSXiSe*VNoGuJe%<K2Ie;4<Sy?GPRtXWs9#cL%=j9dUgttbS+QUs?bF&?V@gVq
zBFYi6iqv>iM(d@d0@@HYH(EsW6dN{-oP?ZAjWFzBrs1VdBTBy$!x%~9M6b7k{+}(z
z&Wda$F&g!fTJSmBGL$nJ3t-v6Hg8z&PY-JO;`W(99Ef5Z=gJqB@j@LUB7~lGV1VW=
z4uXZz>PjlHlnQpE1L+8&l9gypOaRDE2gMwERvBiOpqrxz!QcSlmo1P(Lva+9RTWD@
ze1N#D2Xe?pW6~yqGIKFP2Sah<9W`sC_GX_M%xU$^+FO>Isp|@n=d}9uH2Z>dXe(%^
z$7hOnCFO*aBmvwQdPc_qiw&D$pc52G;C~4@7FLC!r=lO>f_#|q%ccpyToXeV@lk@k
z04ya1FvbbN92-*sa~zihdt|=@`znS&ksoe?LTbv2T12=SB$6K_LE}s`S$oAFIeUXI
z{P!l(eAxnRk3(L|77!F-;LYG*#*S-(crvOSQ}Lp-9#=OatF#(i5Z95ClQESHHce7u
zp-4I`GepdtOLibhI?v#Hg}Kav3f4S@t-=7@0;(GvcdA+}$K)iqSpr$%9YNu<aRR7{
zNFN$SaT;S3m4r<(U=kKa?jHyR(!`8T7&r59i!{bYPbDMAHV1Pl!(^-y6tbq_FaQ~r
zBXWvCMSmk3sEm9969tvK7JfN5T$Ajv-~UC_U~~k=Csd3!vhV+@s^`@JL_oX0)SCBy
zm9-`R{|R|2<~ru`V6`69J_4@MRMi9Njl^AFtwSgfPD{yf937m-GN}}Yk3F)Cbbs!S
zcuEO@J2r~oe=$q<4yB?I$TzDsT!(au@~lUGZ)FuYf6uG%RaN-*NB-)%n%cTb9~Ob4
zl8OQw5@?oVZiT}!ldm8PFw?<uxEC)3dK#>ZaZ3_jsLW|3B9|d81P9@egwqD_mJTg%
z?Wn30G7Kv*H6B`9Ns8eNN=!x_ox!HI)<8#Z5Tf9bKaQE00V@Lnq)yt+A*Yyzrxv6L
z2~v6k0TdDk&<sSI2qVxfa&PruM_;=e9eE@&rJ)6=#^)Dmqv!JFHC{idkbz`uUjvGD
zhMmF(I+nF|cXqTxui96_=sPJ92pbKjxlmJQM@OIuobrujbW2-nk-qMp&Tdn78Z!Vw
zCJW{T%&q|Mb(mHHReOC99SRWTA{A)JXl=&0sP_4NJ~z@@q*;1bb_IgV8oPr%z1^)H
zi}9M=(i&)Mwxrt?(~2Ntu`EScC`(Hbo^IRBlFsg4WYY{uw<`f8hipoabh`p1bf!%K
znr_<>5`WWLf~9AIN`uS<RYu5KJ9;atZ6KrRb|qE@1X)ZdLDKCCK-f>a0wg_Cfgr@O
zv?)N-?Mk%=np^wYSvjGUn4Sr3cCG2@cBOa$bEh&EfY6k71xUJGfsVj(y^K(Rr)O#e
zB3#-vLelNg-EIq6)&eAkrcD8wZdWP*EYqeLl5RUM1KN}^&dWfrEx!8N+U&AJy3TLO
zvJhk*5kWU{xz@*(usi5B<<PuOvg8qbD}tV&A*06qVS$5%4X=LbPzr5yl&M1y!=60U
zIji2W3D|rvOk(usSE3BU-mwRltw*K@v+|@oASdNmh-frKeHG^6Wpn|6XKr)^jN4-X
z1^hc|Fi0gizz}>u01BaWEFBHSBWk^=bd1E@(*qT%=5m6qB{SQrw`rBcI8<T-@nn=9
zJf^7bRzpRwJJ3T=L0q^t!J5bs!B)=3u2vFU8n5BtJQbvCIUxiD!Bv7Z1pC}J2<_*f
z@*Lm7f>#BL+d>Vc6Ol9x*hpWQnu~_cfn;bJblOk}TsttxDhitlC@KO410JX_>K`$M
zE}{Y#2yiU8KLZ~~cR*4itP%t8#Pvc=q0kVP#^>V3j0sUUi=YT)AoyWSiMXK0Wjuj4
z3X$&(z}RQO^)q)d>$fN`g4+*CDM;dx6q(^+B_1dZ)lEZkXf25dN#iOA1n(74z~>p7
zi+8!=q%aO4kh`9hMrd*A32vOZEf|6((<B9;^LsK1bF3?ELA<#prAPs&c18mN{zOV=
zh=5^Rb_UK{zK~8sYhl6f6PMOK>9ZkBpPC}RG>$+JCQM%|zJ#ps6EG$u<v^KPl(p|Q
zsn>uqTc<L6j6qf-%IrO5b&N5#m>Ff%WLQKOV;dA()TY@6Q(7+ki{MF1$b}|Be9wR)
zT%!>~X3Odf*hwc%$f4!z5tB}ec<I6um#{5z5(3P6rot{;hTo|)1PDvUheb@mLWy9;
z(=sL|M83|&MLZ}Hj}21JCC3Q%VEci;fM*8u((NcK6Sxtg?1*@=>K`J^6@%Q!L2AX7
ziCtJs%$!*mvlzr%VH}uVCcq-<4q_G_W6OzQ*a>r_rsMb%DT3KWI*Q;=kf4I!r43>I
zaX0XCDhB$8j+K!p;kMf*7Q)=JH>v~WAsZC#i&Ae>lQF`-dGBLQ2HCgHrXG3)fF--(
zvH+VMiCtA>gJCTKy9jG4Nd9$5>?{=wY&)xM6Rh<JdjUI`G?Cw0k{8hc=vQJ=a>O3n
zdK7xAJa4E3)W8|5AhGMsxl>BizJw)r)|@N^z9~B<=V-#V3<&8q)D!46QlOl&Elp$I
z8%8e@Avv|k^}@$=jA>yY$0m{gG8a{tiV(k=M7m}-z*B!1h*rcBSVU_R$Dz)lSf+@8
zG-zf!2F6V0B<%#*O`y57W(*XW@6Z6Wx~j&vhDpK-{#Uz^p6(Hd?-u0%s*5mLDr9o$
zCMFM4hYa9bMB*hK0m0PvGvy-inMS`BFGqpeH8~nWUK6fj6s-sgq~NSl%KdA+EN(T;
zmz0L_7%C)Fd6fq#<cpes6Yv4bs%Q`;=f2)bpX%B-5_UU1$i(@?>Iru<wupJ}U}{Kf
z(<t`wChS3~WFT#Flwn--q~b|N4w}5Lg6fk*Kd0*#-M*xgGQk;L<=94nM$u}+qcMP(
zz>2p4i(4^kUD?{v93Vm~FTwq-a+WZzDN>Aj=D>nwTtqCg1Gyas6Ck}}EVtAkNEl?v
z6ZSFG$625@{5c&{l|fK#k_B}x9RyV`*SVYkX{1}6;$p;VUUm(%#kK)-%ND1Xr}5jH
z0PlQm`{~%R#!Zc}RMsGE5gNcVolOA`s&uoZQrMKl6De(E;I~faRn)%~NC_&#UqV9|
zU69Fx=EUZ>xu`@d1)2g)I=AS+TSx0HPNX~9Y%kNNp^r?%OtY}8Ob~Xc6tYTLLj)1%
zH2zJ%w9-6~{C<A=5u=X$XVV$U(it7Z3NE^muriF4<qd>`vhEBZmx<DegIKVm6K~%@
z#M1WL1_sI`P6{1^e2_zKnH?TvXv1A!!DL6C0>IdhLxwB0DD-&`fdC<4Cw_)oAln2N
zVyWOtBE-SjM;V2u5i=1f5*g9+(Xpfu6h63&nzdntHppy>Cy2-olc_77Q1t<$H*moL
z4~ofT$4}bcBuqmBfnKpT>8M6TziEJ!+(e~hf*Orh^z8?pbo!P;L#Jt5?@Yznb%#tn
zLnmAA0deGuGkwP))S!1~CQIX_LOUji46t_**8|Y~#1otslTLaeV>iQ<4MQgTpUu3D
zGh*FtPp3~|vRyOs=YD#<5~<o}qz%9qSxq~zOr{Ks2rDLCw7tU0$s;vDF~+)+vK*wW
z-bTD>3#MZk7fX#D#9{?y=iH-^B4oiQtBM^;{KDSWZ{FDw?Oi4nVn%vu9T2W4RMgm<
z6tNskp%EEEoq)$Up-Nz<5IKSSWrGB(61fIyk&KE=B}Lk^k!~!4F6kp%H?s)29;7Nq
z$U(RYW`ORlK|u@%ZJ<}H%yqk5beVMnP3}iB)>DdU6_yinZph@SaGZD%lNH9pRt(gS
z1tCgGK&i9|(;Aa;Z6U3(u^`eOIqGJ;vjf4c3D7wfB!GhmZCtajp$!)Zd7^IQ3L2Ae
z|1tZH4`{O;XL7qWis{xbcjQ;>=nIN!C+`UX18kU#FpO;;UFO5mmIsMb!H#+}!eZGQ
z8DXKLSTHPnj%A!l^x7#+qYrlo*#Uubkn4r40BGVStplJSndr?tZpx8B<3h`e5NeDm
z6M%GciDw+#;>v>X$LY02BnB?P&*q<Xz8m|%$k;~x=V5nX#$q01l-Du;<R2qyKFbSi
z4b%L7+BQ0m1*&v2{s<Uhp#b<Cuvvk~1RH=0O!4l?Zp*|Ozfa#15f!gCe|b7zkI7w~
zs?7$<QbO2{S-#ORgBzd-hJ-@|U2x#*hX_{AU0MbjAS=Cu^iZvg1S~@gitUVYfl(3O
zkWCF<6fL+(ILM$9Cjx??124LSAk@u7ggn+~Qb>-icWV*_Lo5Bl4kyLqqr4XG01ftt
zr!L%5MsBy3*;$ar7bVj)SF|}z^V0h*)}`g-h=&H)7*^<!oN$A$&d!LM8<!XupjR~a
zj~J`7r6CrSGOyzl(*X>j4sjo>1I{J@ljF7RFxeFt^#E!Lw%sJYV-o*xX?1XlVW;7;
z6bTYc7{|q<chAG>!W(o4+0D?CO4>nyfD|`q18mMB+xRUQ=7L^o6jz6w9;P&)fn<zi
zqO1Oawk;YFT9AlWn#^h@GaW%NNU)eNe#YcoqRS7F2$<%wY-bLu4BAMPb(AFdRn%;=
z$hS1cWr9v+5~zhYO2C2r9o?rvjT8vX_c{D-y>?JFVSLpibts<3t2|z<;5zC9v^~B{
z?+xbU48~a84ovYF9tM*RUO0}kfoR9NK({uyoneWlOQ<K%hB=s<?~9EqHaXX&rW0(I
zkd@kI5X(gVqX9xT$^;qqs9+r@mvC#np>wE0tTQX&;XFx2UayBS%b)ZBK*R2n7>96y
zJqc4Ym6T$tWI1Qm7ZqA$wEVze-eRF`)_tErNMwdC1wqNJW5x)lW@M8Wq;RRd6Krk}
z?Vl5AZeiMum)aRNYKI7EsI#M@v!%tZ3x?RJqwWXSQKsVJvc$EN7Be9e^JJ<g=op5f
zv%{j7$yI@mDZ@=`W7eh7DCn9cozV)r87u>+OiL~ape9Fi>59dNIzPjKOtLP|l}p&Q
zidESJUZWi2tLI7748$O#ilaf62xdxUBc?JLN31IM>4WX~QB+g4DCKT6Mg);<;7LeH
zDO!g|Pi8hi#AZR3LPMef7Re>2$n_YK66S@WLRz2Q9Wfp>6jvFM#FG}8225mF6ZTU|
z7gmJ(QY_MnCaj1h^qWacs(z;FC#r8#8U5xGn=;k*Wk?6@^4FO2LyrLqLT;P{S!>zU
z)M*}w!f0~DPxOc_i4>O2HhP3ad-19Zik}!?Ml3rMjb=3w1v0xhq+IG3%_Xd>U|31Q
z{Xk}`Ew&=^Mq`6@s54FU2vIp2$3mG?JE)l<2#PGfi}EPIr#&gb(V}oM3!u`&b~Qe?
zo62xxOvrj0jH-jH{62EnT82j@7D|jDm-fknEQ_<-gZAH_tjm_21w}pG?-BISi2H<a
z0U=yi%P24)L1NJH17pQ4M?|qfgOc%UlL)Ba3__(qwhEdzrXqpZ?@P)2%djmq*t1Q5
zIh&D^GTOEQ@d(Cj1@20PlKP%A|7{{$3$@sWs=z71!462>ifPf3KqzWKIj~b^KFe7B
zpg4w5b|@ZJS3$&n{YLtYPSPKzM<2~i9`P%s7XF>S;T&aU8!7JLFT8K6w}n8bwwwUy
zY7PSgY}3j!uvZh1L_+h3LaiYK7yWn^{%*)*kkNQfL!wQ;p=hSAlf72%Zu3JQ12BS~
zmgNyrY;qE%mLVreG2|o%-z*RLZTQL*q3k<*%iLow0a3~{3qh7y?6IRocdly8vXsY$
zo^n?rXdgYMQPEUASn%XVzg80<Jh8>w*+3rQSA8m0O$(i>V>0*6AcFEtIV4a!7Meu_
zHF7myR^~-dL`)nEk|^I&8Eys@6^nW#Gn8f4=wQi?DB=myvf8=_?Tp>gM!bxh=NYY?
z%`Z%?)EUp|u^EXBjH}Fsz3S@@00n{11Pu2!E@~rDqWIl!Y{AgSBuFj3+DsPb5e4H#
ziqQ3(4i0l`b7sj&RZBgAZk(69!3o)MbNWF^d6jwjvHE{z^#6^Al=;PR|IOk5TT@->
zGsl0bnO9wk|2H9z(f_wIDTOfc*f;?963^VlX+_1Gw1|YsUyjF!NAO~Z6*V*}k6=n;
z)FF7@<Z%e*Ub7fHqt|XcDbW*5V`@l|5=l#1SdLCfFW}Cm*7?ZEC?QWTU_+VQUckoe
z+zU9n=NGbf{z8aLdTFqr#~*R!c!g%)U`-uLuvD^VqN&LwPKBM=j2Sav<uf?K<qwE4
zIT9Znl*93u<pYR~OcvGr%y8R2vSdc3SenFzC;C8>ml-q$LZQ|><G0ax;9*SktPeG%
zHV{mx>qCGEa}9WIt%u1wgcosUwv`iuq7$En!gLH&1{-z2!P<-Lt)cOH2nCsj^$LZl
zA0Sw}1c~y>ejw8Ql>(&jy`F(=besT)Q}PBKS#v>L=6RV_4Y#$!wN?wYLUKfo)thrt
z3o%we1S2YKsOOl&zm;e@O5`+>RW)P<19T3BqLSAGIC`7uTmfL|w4rvbYzhfOA)*O^
z9!J1k!8B~0Orv+EM5FhoL<PH4ioTSVDU%G6!=-uy3_uUmDG1lp4@Wf;RktvLWRwDQ
zV}k=iPPhYxb6ssprJ@Xixhno?o>MTTv?BRWsxo0v5vcP_h@~}4$)q%5Lao7*)Il~Q
zpfG_;%}jc7s;30#(irm^Kol4(Kynt|*n_3cUMyG28xkIHphO#4Q7moaw0cCWgZa6j
z&>l3xd@d)y-z2O}Mb$Iq;X|3ZrYY@EnHiO%v?R&LxiVu-Q_Isb3+@WG(9Of^(zcSk
zT`<A@k$9F%F{7V2LEPw>kHPd#bFt+9i?o#B!HA0od-|H10zEx-jxwuvCS$Dn!%pY>
z@j9@!-lmq|^48uZ!PbtJPD6cyWs4DSJ?RkcH#sIIE7S~Xm2T5OM<CD)zIKiIRct7d
zxzf%;tL)5LU!c3Yv%8MEFp$L$k4k@fU{#I3lAMKL(WV;GLh-Q7)J0|5iUv+dE;5WB
z<ihfm8_3K>s+sF%)H|CM_7EEhT0758^<1P1oa!dT5nMuj0s$`F^&?w1Gv;E|YM(>I
z*<W;y(D1QI#7S$%vc|U7=HQaXj^?&N{-`#V%ZT!x-qtp}9<2y8_4RT$+q~)*3udk!
zGiO|FUjcCQ5~eEkqa<T61aO|A$A!AsjAbn$Nmn?6eh{O5J>JH{nLo}3mp>(mv#0gc
z1J@j6(h#ZDC5lEM8F{FHM&x|L6b$xMWZMyslrLl_xttQCaOG5p)JDHi2ko+`93{tm
zTDk|(zvhe<mlNT;=5nGXu2RS?$#L3KmzZu)H#ZWfFoh0)?sR}!m;?H#yNOxROgh2Q
zLrdkbz9%>#Xwo-1N-QjIKuIY!2-;i-3F2q2XvB64m?fNDGI`UQ+b85M_gmyw7$n^J
z*_y)_b<1?q-FX*S1;D{M{->Vp-RPdp;V7fBCm~UumGBo*6P33`2GP^o-pgDtC<nqr
z;0jaU{<-eiqz!QB6!QQW#%3B*DayrIeyG2h)Zf+E-PkTx>YnW)WJj47c{k7r<b~pm
zy}jK*sw@^-HiKbH>y-Y+3MGMxxyCY3eY6Y#4VDAqISs`!L#VI8dVTsbj5$beuxUwm
zogty8*OaiVsmGYm*wSQ5SVj^G@36JYcvp@)Vd-j5>mdPJAj@#D>5FHcmzbA}90S)2
zmzWEdK|Ck3CN#oMcle7&y5g#dcp02@ujMww#1=(`u^-X^`;8&k&rkDnJYzXW8<)8i
zxU2~opmd<)UrENFVvN7B^_QSE(9+n~)@y?i<I+MJ21k8ELQ7k(F`>1CBml$F()wCE
z>X;Z-Y*fwGM<eXEj!@VwU=71MQFv-1VIGK3W!SMYN;7P|H1Q-q_f}>|T$W+i7EHzY
zNg_QT^5^eAE1Js_z->+{vsBLyRV(dhg&ImKiBvpEmpy8hK{U74L7|h2j)gw;F-~z-
z>QY9=M&tHAn^74@N>hPguw3kB<i?>FXsw9?n}gU)WS1wIfvhTqwjf(Sx+Sy9cS?+I
za*4up-!PiFZ`jGW3MBC;3^qca!92EECL9q24JJr1xy3A{5SLAZkfKg0DFxscWHxax
znsFUuJTD7ZWPH<>RTOa%1>i+8&B~s#&CwPe3v?Z_PQ`2#nm2W(V{2paVS1x3+kI5b
zr2#=)PC`nIhFtDC)JHO-UYxfMNSPd%z^~OYrw0bntEA-UDw0fNgLr5j<gPa=0XB(|
z-h38Shs0w|<+f1H7-VWv6FIfp<P3>WGj55U)saw_4GZDCm?(V+>Z}?XQ`C)|lf)uA
zWSTX0j+nxNo{^@DIFD?0&D>AfD*a_&{z3kZ#QVW{DdXaA6%j@)4vd2YFqT!nE#8mC
z_%?c`#{3J&X{34QhGj0Ay$u$bIPnM<q~O^Mg*HrwI7!g2Xd!VtqDwd#F8Dw>NCQ;@
z@T|-Y2u4SW5+2c@4-@&M9fh!dbjwmWdk?H#Fi7&VX+yfEj1}TC0@8uyc^E{3AmQVs
zKrQFOh4>c_YU=Fh=|$Qrt^oe{-EO26!qNu3LG6AwkZMy;u(iFbt+lDuPU5hQa3?}Z
zd&Dx6#Yg{2Q#T>a-NbfUIT_dAG<pdq9pj2{s+V>e&7l38F=~>i`Np5w5n>Ci%^-z}
z5~rVQ5?TViO-q6uffc<T!xn^_#q)|AM9r|q&O3OhByd;Hhl$gn5-Oh2AS%kWikbRe
zuwXYH12RRwk(xH;h`FQ%i3t@s_!5;V@(sO|Z`?BqFz!CiYVsH-%RQSD)MGOR!1&#C
z5^5LQr}Q~y4#}j?i5$V0>^qlVJfoaF%u|@qagmv62pU$iZk1ull?9jX{P1UvdSq~u
znoNO<a$!Cn(y~&P5iy$_lRCVSuC6zWLzC)Mb<A;(gncvLFc%bGQ6~l4jkS>|7)=mz
zFi^uLZC}f0udvmHB+$fjtMNiZHEB4aYnhuaUQ3Am3*AR*(n}Uqz5&~G)yP#5TP|(R
z3<=^xNotA1#+8}Z0TEmL-0}_RW01LXN!-k8LAUHHFR%Yn#I4F6g$PLy*dkl}sse))
z<r1>2;RR=yLO<m{vN{%R7Xf3$)IwN#-fL;WtEX9h(88En*FbUaW{#Yb+g;dRq|Ozn
z+T3x1j|n|l$`rx6I0qV;LPi_)Y&J011t&JgB+edVYt%C>QwXj?W*V(y3^Pp&=(V|L
znxJM<GMbWDsoHIxeu6trep4_1IKdfqvqcGeMgq~;$X({a&u~Dit1q&i)9WW8F>+cB
z>J9Ov7SBV765NyZ%-m+gVwo1H;zZjrYvv}c)#RAsZ;7RKafN8p9HN(cW*rPDR4}&j
zf5hpJ5{~N3Q>3)U_R;|&x;7>YYl++mgGjnW={6W27%(dssWMYjXR%uwGRu@=VS#>^
zH8u6}S*U}MTSV2f<sqZ$!z#$BR+s#|1yxazn?sFD4V4A|ntbI{p^edb#!o~z#JC5U
zCas6-;iwhA@eU%g5fV4377j20ffE^bu-QWFw_knX(G>Nli9&$I(S=OZoi4=MDAOl#
z-l8d<NGKmsMkZ9Pnv#eO7>N)UPA90vp2+I;#WU{KYsohZqZTNRdSfKVWBQ0^Ab#sY
zNqGaYc@Wl0!T7-;nyqnBg|C0Q`H8?ibR!6=*%yivLkJ_^!#E(9HQV~;<XY6}1R+qE
zR&<AGe`VB#={9FtL9)gZ(=EIT_I31TH$5{Di*W~`*>dWZKK!E_%{2&xtn<vXC7w<t
z(kZlFN-DZXk$&h2YzGcJ^`lv$GA-b6){@`mc(!n@kFC*X-ddk8Yxv6CVp(y*S&HX3
z_0)qf0iJ5Gd8PahlE8DHe~!k(ay@k&Bz}v!-xzlpb7)i2?6g@ZV<M4}=y{5nFS#A!
zp&3rJHwrR%A&Gi1>eNtx1z0BEw~WkCU@~@=V3?_}tpqy@Gi)X@+JG5ZpOw4ySh$;J
z;+2iR@j+)<t(*;`m7LX)Eet)xiV4gu8(2UbT}e3s!m~>|4itq)ZpN-hL*+XtYhYDz
z$>``^7VKHs(c8Gf){fBxrg;!G58Hg!2;BiB8ycxePNwAn@>9EH1Hx?JRM>4n{N$6A
zWU)bkA(B`mbbd0SpC=jj7J|z*l#5aq7wQqw-rm|9#5*;1_^DSV<YK6#nB&~a=rw9S
z`{lgXxK*(ob^^1wS$5GAeyAxXCDfrf5Cz>Qy6h4GQjRVL$L!hW!(D!AOc$O^o0-fy
z`|L-+#&O$}edzf4GK=ZYWO~Cnvt3kMD${ca4KaoV>jVAR%cv}&^^*k`ziFXkp=SjV
zzLo9;!Z%bc%m7Cj8(nP@U<Se@B$SnhjAo>4)F%eOtcron8En>w{a$E{0g-W=@5#a7
za98YSKMPrG8FSJqhCP|3QLmTueiDVhwdsQf$avxoHnsiopc3Oj5HsSXpkTY~!jn08
zt1Hj(z*j8b^8VN(l@=I~@Z{$uR5FTG<B)3vCL(&T4Ias)14h*s3&#<_w_Y~DN_o}j
zhSy=WFSjsfjak|O=VQQ`N0}K-nDjr{)j#pfL1qhx_-c*?U=AK&75XPtSXhY7jOADo
z29jo=ixImsM~xX{=WDQ&jS0;I;L%(z4yhX*z>DZfb!7BdA%Kq+;-CtJ^dwrSg8M1j
zADZV@i02btIg3s!i?YnBPS>_awxN^_8s<#%&#DF&qcn5HvmuepHbJeW&nrFAs?YM9
z0UoVBYpnVvgP0+NB`M3Td_pGG6KzJ^P8dQAC7If!C=k<w0gnxwRAZkNP$TbS${akn
zO3VhOaJmpP_$wLKO&frypbp!%xo$l+F`KQH9D2-RHZ?6d#6ZS`FId^PiNt+&ihZIz
zwh*#E`-L?{j0-$@;<bz=F0fEo!0lL0%QVi)PRy)vhlw6jmB5lLStm?0BnuNoyZ=m2
z%632{60|VMJC+#`l=GZR&t-eeHHvegDII{7lWGCsSFN-pq|=er))8Uoc^ZjFHqy^x
zODt*Z4m1;t!E5i5?m%NRPB`Fz12poW!SmP|oD1_WfnJ2&ERz&1&IkMz+z)i`1IBB)
zvw?l4jJZj=T~<Ad;mE^y=E1a`#(48K^DYDzxWHwJOv4}sK4fE7^yO8UM8#cQCqCl1
zB@%DuaN`h`*DlaFNss3rV%*ZC&MULDsGD@KCNstqr|{TD6NgV(;)uiNQAH59@0MNc
za6^}bsNs;FD_*#sCv&85$YU2H9MbcR4qjGJXmDVTV~z|?E3pzn?mG0-_0h!zpRici
z5HmNA`DclQ4do_JAnY7bsY}m9J(=Twhx<bl692op8h<s#|E~4<eWm!{6Y-ehe>X2`
zvWx!RC5Mx7)GhTZvG{t0oOX7{`{iURj#}kp8t*=os2Um?@t|f!9*m<7c}VK_KozFA
z;iHNYPAHK?39qV!DB-mgzWEiEl@KMoy0Wfj|A~tdo>HPbNcaE`*6j)|Z|$h6bPL&r
zl~@>zZH@J<i{K4ANs}W&aR@Ki-QK!FsKALC<%Up%Mjtn1?(1k>0fQuFW-+}D2{vKM
zdHZ^3@F^FW9H`St{^lE(TrZ&u1sS7~3z_qaNp2TIS=_AQFS!0CxDW7U$R=7hY%7G#
zscs!nKtOU^C^7{NA5Fw?=mTH{`he%6O&_$_+kz%o?2D$+9bISQV~I&U+JMwt8rH8n
z&l-(78I?%uLQrbJ8=SBL-iZ05r3-d;F~-QvIMXoI2SubK$St;<c!z+jfP864Nth}6
zH`1)|5#IH$Fqpze{HlGUMnRGrx!})?29l2%IuH{9OR63u)r~N~R_PU_Kg>&r5DUEA
zD7@BB{)o`PZ;Pp6v{v+$i3pt$m80}+utBA$?VhX=p&`p?+?O+>kJed?xX?J;=tD!}
zZ)Ptf*c>O*vO!a8b_a*U4clAnGO38+o1K=cMN%Rv8dg$6#z556>=y7xEC6DObP9{L
z^y<+R2^vK#kML^17;#!9fn#BFo+ON&=A~cjvg9&GJj39a91oaF0Y+(0dt+N$Yez5Q
z;iy<T<;tuHjtB_IvZS#ak&0H;uBqp#xPrjqKsV};z$Spi-_X8kEwrnHaGvY|w*~gC
zJJ8$L-9gQP$#Mq=)HvTN80_}O6~T7Q+Zz`Lf_PKExOd4K?T)Fo;38^k+;6<4Du%mC
z*twPuY?8^Hpt#$!``M^b6KC>sct`;!K0ogx8&pJ=m&J0bS&;_2<&cZwhvEZw!9$UN
z>lFIz0oXmraDO;FOk0mXx^V%92e*E;H;<LjK-V-aPzsAT!?V$;5)L!hTi5J<)}XaU
zk`>bzAe7{rvpP0MY!Qyy;KwH95b~=->^5-?Q-%P`qSGhUHWAwcOt27heO+3?+)1YE
zEhS~(SQ0VfCN~=y`Mz%UK(`91IFxhQlcsi~B=gJ_(+K4-pVnYs$I_0@<sHOOvrbP2
zx)olRHFnb!YXwBvjqxv*CTYE`?Y3z>y^ZZ%b~TwQfl1Q6tg%h3BU|yd&W^<#P6J6<
zoOLZl7qu=1w_vfMj+Mp~yhRFhw>H_r9cXH8H^9l}w~)dI$F6)!TW6!#RCmBoS#xLK
zB8XaU*CowM*``Y!jomAaLug53C}ZiiE%YlfDLLY-FVo`iV<L`&A%G$=GZ%6aWdlHO
zh8pRzAONkoPK(*87Qp2bW}#3EJt`wJ(&%5EROIz|^&;yrSwCRfDZ$i`F83R(_mc5p
zZFSL?7QD{T_<ZEJ4=k~?JqPpECR+x!zQ8`A&ay9{AC)>St~wbjfg{w>96sP@YB~hh
z5DcUv5f6&RW93K4$++%_QEwBbka>~V_{fR7Aih44&BYM)|IrYNKlEvAL*e|v;6F#B
zd6Q&FpiU6*%A6hqq%eHz=*iy;LiZjwXD{~?zZf7t$io?^5S*S7UrM*@3Z~+^g;qHi
zJ&1b+$yM03)~#a1RfTO9z5KpMYWz%FU*%sTEU)ndGeHB`@taEX5-@2P{fG%y9Is(n
zicoookg*gB#gk!nVKg`6hpd^HJM5JE$WGZjG3TV`)R9X#%lI8$m@2^{qD+uV2IDE7
z#08F!zP`hWI-?_4)nTn*EDEpHxHb~8dp53v`qL`|?AmQtGUPS{HX?Es#?TOT0wHzk
zWpD-B`i|#1UEv*KJSr}`l<BU(CX;C5P@ay`Ji6U#8H*Qcd@$1bJL3^6%HkTz$PDNo
zJGwAy1mS8@U`nv>?9YZMP<-?fZz>CdQgeh=4ba#MONKR{q9Ib0R#Y~FG&cfVAJ{Ka
zR1x{PPQx3lQ<?Bj85Z@at9S4ygSy;n8X`T5MdXFhg|ry6;!7mu1Wj@A44KDRrJ^s7
zsfd{ghN7>f1$3>41k59DJ9?)0io*CAMu$dOBmrp2MJNiW4x@5d0rZE4(y_HXNF0;e
z0qBf+AlfE}X<>sIa!?wJ&~^rUJ9``3c)>FA&0L5A%{}Cjn2loQ4N+<lfQn@cx~Y#b
zQ3CZx;&`#8K=WvMj4pJ7a048~tDWPZjLZ74bsz$~hUDBsng3W)sIrWxX+R<pSxE6f
zur86Ei+K>fw5Z=??J~6^Lpd3n?%spNx#UP{2p}Am2^J`bwp%b;_GJ?tdOV_s5=NIL
znt(Y13lqQu$qX?EVybwiLJNz;h|DSgMzSRKs7o*9W;u;m7ea}0mTcxNCi&XWx4T*l
zQGIF3F?!kKf*M86ddFx2gvN;bJGG_H5GIu8BcU^`IVEGxyn_+xQ5>1{t%r`(g>KG1
zbSBT;xy`{Y;TwTa<oJa~HnS<lgk~nAtCp)%%WR_=RnZdRbRwdJh=EK<xW7m&XpGNE
z?%9NaUIh(+^@^o{5KuvrhP9X#`d&d`86dZr+B3&fHOex23y8NMfMFlN$rM0T;5zmJ
zM6JXtdYw!_B+=s1U#6I%%vDgZ8i(KjnHgdxV{y|7M1A&XD}o149_n<HHgs}C2Q4(z
zrlvS0NTv}Q49r~P<&68{aTGSMCI)OMsMihl-PFw0Wt(wy)t5qY78H_GSX#-sNt@dm
zfs?9;Dd!=(e}Qe=27xOe$YwS{WK^q8=0KvEx<Sob?7NX~1jAx=LsK_p^IAv^Yu8ni
zesBdowG1VlBw!oVQEDbjZ2Xy;QX2Jjh8~hW^HU?b=~z`+0|!TjEi;Q3>LKbOcI%G~
zOH^3Y2bEq!r}D5~JQO3vnh>=R?1@uk9p&gWW))(K8nfoRerY_3-b~XkH^n0Yzav{N
zzSm-hK<x4Xn^U6M8X9Knc+gE^b;nH1t4t?GS$82KpEHEn7o<_)N(8ff!fr!X3@-Y*
zI#N8madEiawl%S_Q<yhz;SpX74oqp|xx;xoozFn{cokeP^Kfo33C1I&o31*t)nHo>
zy?BtQd^TcPyjTm1>qcdf3~}9<Hmsn~ZfwC5d|g>*#Heq&m^RATZ(5yv*U2`V8KSgl
z+4bc(569N1w3gC~nu1#^GFe?wY?xRi<%|4WI-@TmAx~Q~nVf+@&AieSfr?RH0roQ(
zX1`|wjAtfyV9?1N0dq8QOY;!)M7Z?zO;H&F7`nj*Ge2P)6AZ7F7qS)QZSsw#^6Y{s
z3vZ+{s|35yaw<K=42j|8>R5a^Mk-W8hXti1%?r9VcG;ULc#jxRPKZr6fMRi8OJR}a
za!lee#g)@E2;9~dPzpLc4Zrn*Jt^n0Hj9>x?4}JlaZNOC-=JnJ^c1jxBg4)HT&SCc
zDdYNXekGcYd3s>g(c5Fwj3CfuRO8z2KK0L*=!QbrEn{>-7I=n&t;O8Rgn@AaEi6;T
zxonQn&B)sTWJfyMP12iS(dH<gEyS{%0HB#7jmQmz$-``iu4vPfgni^4VA@*QJLttD
z&w_a68Lx|VQ0Si+stdO#aSL-*n9RJfzAiBSVT}oAd(2U>Ufer$$A_DMd5AcLOjI{)
zgVbDD&4pGQt(omPvj#+d!=#1e(ql`hh(!I7j8THd7>p}7!!s}+HpgONh(u&rX4nxn
z38z<(^2o4IG0m;bx|3&|EnA!v6liN4u+rVx*0!jzY3cakr3aMxfD<9s76}VjoTyg?
z;-o%TOe_s=7;Y9L3Zm}0%!nhA@*4YkJ1Je!fB>*QbrKsuH_fDd4|aAi=~jpbIBspV
zwD87?KdQFj(=D3QQHD^@;2WUrxeZ$$f*ehV$%{U+?4re3P&8~%%0jZ-+r~V{Oyie%
z<lr<uFDfZiKFYH1w`}aPMQ^u8@W~#GDpQ;*CRQ?m(teL#Smdb;p@g!BaM3*h#9cQd
zQs$6K?I`P5_&2nQ21$Z{f$Z0;q4GcdS|>(|qaPqM&1(1vv@?X4063MTHVc{(fwyZk
zskELx7)>l`F1R)mx@B}a&}=Tp7Q9Y$TN+~|JN>9Klusx-eq3HqEIVWhW+!q3E8izn
z52m*4dP?mkc^gMU+pP>@ODLhkA;N!V=iJ3wY&C5|!e}5cu!sf)s`F}E3Jr2ToOaMQ
z@u8+1NZ%X@vAfvrh_WJ{K@Sk7eb&C|p}`8<ScweEB3~Lm+U;Bz>3jH2-~M#YB;<>0
zKN0lFFtK(l$HR8IodV*DW!1-J_X3<iC%~x|X3R!$gy|WhNSJw<C{Vbml2f6zV43!&
zhqSU>RhdzoErmDws)RSn6qd*u(#RCg$Ql>P7!+wN!Hf6`G^XH1+D>qk!Ha15Q3Nj<
z=a_o+dKiQu?bR%+8<dlTJ7{*y)FBd<b$cF@Wm$KbueYEKk@NvX7177sY1C-q%>zaX
zY#cD3<J%g#a{x^9fERSZ21YX14H-I@k<V538wO!P&PN2H(BgSTfCaVrdO4|r*1~CB
zy*WG97^=uT!E`m#tsTP73+Y=gG^!AXY?&-ph(op<FtW*NVKHF=xL^x4ngCq5+~f?v
zg-Q{)zOqlo_+N>*ni@>XY7t_9Wsm<=Rq3m&F~|R!S6x$z|1}YhG5%K<9duY|#uNpt
zNlIcCkN;6soYy7}m<I*IX(<_wql43!$4c?h1P0SdlmrKx53#}KRrqQue3i&wRaY~=
zuBLY4VuOW<pFIr@rp2{V`V;HQ2V@%AYKn#1>RODP0zu>%a?4aIci1g+0UmlQuP{+#
z43jmQXjnpV;fjEIp}3DoA5kfmmLgnD4JEr46XiF4<|YP%EYQqUjg7@@6Zsyi(AZeU
zSY_<u(0T(9aI+b`PZZbI52hbdnBkEg`BFS4!5Y;VG>c=Ag^nhIR6Oa<ZZBJJ8@x)C
z{5ZdvY5}ae78g}>Wv%F|622-EBEMR}t40&KDkJ6!cC4{Onr;AFc*H7mxGJ)1qz7V{
z|IJjWSs(dLnNc!6Y*8T!hiFC?qp_;FNn(E;V=RsSROofmc&puYFc>VV#HH3nvhr;D
zjh)=bl5ODFQLv3gIjM|+W2sB*Z*iSgEmUH5sxTmfJE(FFUZ&xOe-YLNW`9IKFKoa)
zjL~ajT|ymhqYj;Uqtdk`j-qkFdQdb(;yzcVHpwYwHt$n@3-~CUPKiHsCU;Xe^H~N-
zm=dDOZVQ%^N=S-m7Yb7^$GrXh%8Vzy2Ew4WNm=|OH`#+N<pi6!q>deSTPhzQXO@)2
z8EqHZPr-H5>ep%G)`@btb!t>GVcwjMJi2V>nJIK-CO7P3<3>AWzU_w@P!ZEyThkHk
zhG=tmzpRd(lV@p}aG%YtgG0E^q=AXmPfn-90&nYqm4!sh0)=i2Pkb#xFpsk+EHs4R
z4MGXwrS!Z8e<DR(Z1=>RdJJm`{+BJN9;AnEA>-Fc<j1fw7)P*d4A8o?GQ_9>N`OV>
zD!<Q1qAnR%DsUYsQxll+qz33U%$Sv{as*WNxH`gwNVqCIf~5Lka<~d|K?B-1OisrD
z0Ae9uMwh;>gW)93Mf<|7If1!i=1Kh2a1-em(*n?g2`VN~xO(V4z0eOgIHGke?hf<>
zd;7ZD@IReP*#boh@P(3Og%e`RQ7M|3(T6TDP-g1mB(CxNXac#YA%e3%0cD-;h6W!f
zBTQe{OG)js7K|iD%(N6d8Ip7q@S8XYs2o*O&a9!C;b32Hr4RRW->}<B-Qhf1O*+%o
zz4tLNF#(0NKqc+VCc>!sluH_XHX(baLxl)l{DENUR2IB86EwJKZc93o>!yvLt)1_t
znZj)aCZ*o!Tv?zKWsYT)4i8^h&C)@6rRGqW7v`w<*jO-U<Jvna%-IAJ-~s7q>@~s%
z3<xg7)tp3!qhh1kqsYxAgG`1QO3b|Hb#jwDn{BJT&r;C{0;)7|VY)$O>MIWth{U7e
zuK;pk0fME>K7E-)jn)CdHyrPr=A`f}R`6ht$l%l|L2M!rSg7s?4Wwhtl#9C&5@#dH
zsI$^NQJH+8t>hM}BxqtN&O(s<J~P~b0gnM1y7!9_Djk5aCBNM+Zr}y-%YIOdlN8A}
zL$K;}JMxP10_6-&6wtch7)iwT9)gnm@qrBP%tGWBLV;zhPr0o}ff%@6Si>mJ9r8py
zcm;O_jfof?n4kpjT2IuC^SMoN1FY;PbL0cTEW}1U6-Jp&1{ztT&FvAjpho7NNh-<+
zT*i0?f>BH1!12JHM*f)zI8FIs^rN$biaDs*KxA}gVG9ZqL6A#?P~Wv@J=o`#?4nEH
zXsy^YdX3wQl=*B=isJiCb}-qjzw>qQE;D&|W7N~Nmo4UQy=b9+-e&cP2nZcWoI+cv
zw=*o~Yh!`V-$ud^`7betB4;Zu({fH_04C=Ng0`@1IjLR0ldHqb73-In7g+Bi+=C9N
z7TMOzt>{KmHFpVe8g+PdZ!TGVJqq$+pQIY{F?py@h?_PRmz9`;S&?zP-1P-+n7Jb=
z&X>tM8V1?G29*JmYb)`<T$h%UBOcxN04hl83y;p-8CMqlqz%>C5>O%T(PMFl))jMR
zt+D;|(CXr31DR*fM#dd8+4eOw(CsqtfX0qyZNE(Q#0)DGV{+Ii=jc9~5(pu9#zw=v
z`u>^<zHA;NzQ;7#Zfj8xb3>?a=qY%%ux0b7We|w&vvlJ@N@fDo&WaMy4kg>EYm156
zExSN^=$*;sa*ST6c64Q04vfr0IHw0~2~$iM89lIUd)DID-2<~RA6tPhm-FeEeNQvt
z!m!dz5^VIyDdZG<_nat^gqu@RBYNB`;iQ-B@#etYF>^fdHHI|I*rSpb7?3b%yaX6`
zrI-wv3-5(Hx!NH=yBn*`2oSztH)f!q?~8@w#NB<pY;;;SpF7x9?5npKS5nM0Y*|;P
z&EQc=tgQuoFJ3V?r^!!P$;+8EFW=0ZvUw)Y%uF7b*0DFRQV7Y(ZG&vYXeM=tP2}EV
zXBMJk#Kta&ry=-s!MZ_j700q04~#{ZYUa^MLt>FkZk(r{{bXN3zl{-vKLB3=QIFhb
zC#(u&(CN9L=#)w3ZtoBlUzkNU257w!W^wa|r4fUNow+n|)P!4v29@>XW&;BwK?x~|
zw>re^TLSqAPW>>2CL{%?s1UUTlU|s*aUu|chKH1ttR^Hlr&K`d;u6UKE|Fq};(E1i
z(tM@Xd^{%e61oeL4LF!8B}Ho&`a`?p5xo9%AHSiv%H~=;X_3sbyOW0Ubq*CoF8!zl
zzuLH*!h|4-N@&MoA%|&^fT0KW1A@RPf(r!s5whs~IHy54NOm)JMr1wKt#H3sz#!9v
z@^NG}`LX8b$ZGOqH5M8qBVt#iCSws8JKG|)S`o4Dm{P<2ZE@h;v^h)=qz*%DLOA#k
zacQL<cfB6M1=mXDOv+91un5d<QDbvq_n8E!Hw~k1daDRO>7y<xq!-kbw~KQbcI;(l
zK04Ymd5;QFVr=%nR;N+hd6HoVJSk1>#^NMu=fs)kmUKdVDuL_e?^ekTL+za_g|7v;
zSlU6L6I)IIbcKomf{Y%QB9OLzmwJXQ-j{l&QTbp((M(;p^Tf32w&0Jcf3-SS3Mn=@
zML$g;#gH?TrzcZCvoGu|b6@j!<Lp{IW+zUl!b(H=x^R-x`8aS+sQ+emmq9_k9)-hT
zF8SK(FE}Zj0J$l6er(O+3&@L4PJh6XJK$I6$>{%wf8uRW5xoC$`v3W>YpTrtf7QO~
zlK<aCJVyUN{09%Z#rLlc^(xX}95v%5O*uk|7sY#z6BzN`^ZS_dUR8x}f8?*OtEsK4
z^ks40E3%^=17<3^=|PCg-T-p4vCGp<&s0h<H_G6qXD(pxrsrS_pzgGmm#ZEwCOW#=
zySk0eUC&T$few4=n5qoM$Q9rGdI=JtKmdYh+W{funM;o$ays^z`)k|X(3o8NM(x{I
z1m`}AlHmF%!^rxm$wM!za79axlat+;HvXCS{d9I%_Ws54vYT{HcH?J3kOh;YG$OEK
zQdHV+E-$-r@Px>Qy0Q7$70JzxqN_!TVKg1VwrlI7f`tQkx9tZ<)KPU1;o9IGixA|_
z*Ek8gD68hE?E|d3TxP+9wGl-utzW+oi?J)MBGOUHw>)Sz%}vzP6v5;?o@glan?>{z
zTJSRd&E$_}Nr$$RQpBQMwaKb0j2TdR7T$-XEJx+2%kmwn2$7paxt5=QVPjOuuRyn4
z6)R-2_;^f&_n-!ZzO2k8cowj(U9+KS+vfsE;#klibSk?D1jZdI;m&I&Z1}YMLcrvN
zHLRxOgbQebPNUhl1zm5?msg{wp?04=H~47KsHnNKBVcJ)qe0C&*HBug!S2rG`4rCN
z!N};h5HCi96QjW$(AJ5O!?tmh?u<TSsBW}V*K0LSzs&Ol578=Rjn%!8c{lF2pXT4l
z>)2%5HK~BEWp;Tq!^#Y|^Yq%vi5}_>Xhf0eN>6H{?ZG+y0t+Y@e@3@S5p`p6ptKTY
zk)0@Qkp?v2u(+6-IzL$)D2;5>VU@e;3z8$oUyR7dr?QwXm08zv?TmHu-Z&{5pcdx*
zS-9`#Xk9<EnhTA|0mDMxWL3{87!=M+i|?K>?x5#!&*Z3`B_OVI27if+?h=AD#^#qM
zW@+5nERdN}a3*pD;m+c(k?$pcWo1@?vH+ts%|?nZIT@K}@!UN${z~|e60_q&+R>H3
zinO4mDX^4cxdj_E<CTHq;ZHK=+XBms8znBgJ4E3_lN{oi{6#Xli!d3S(od$_Z@C~Q
zdP!>2(JU$$B~R;>_qwpa35rS#CMl1LoaLI#N#!NRBW&;D9Ca@#-p9F@tjK<&?XCG9
z(R^KiM(y;HQ*z3ou_{zyHSTUN8KtK2zL;?gE;V_0)Buq%PEN;-e&mXE8^@Y2lV43f
zRBBYjj_R60zTy#mh=6gbTB*;ZE7Mm~8+{9B4R)FnIO<X&=CKsKb~K%esB+UabVl8W
zRsS~CbZnf5GuuZ*EsL3-QwpxMOTiH=r8&bX3%M>FJn<QSw^vZj)`T90R!!W|*AKjW
zL}&vC0FLEoB8AC2npWWsll3wm=@|_^-Kf{7!2%r=9CVt~iDnCIefbT3nDK1X1vH#l
zPPv5rn7t2^VC?BZkXsPsw9b@mGAhW-K!7<q#uzKw(BSi+){dS)cdv(D6X<CUv;}$t
z#_J)Cv}N8=3V`!0x+1`Ox`t;*Y>@hDS*TU>CganD<W<cq&q_#sGa+eSU6~*@&MCY3
zlIL8>F;BA15&QX}&y6DZkJ<0S44f=Kj%whJ2KKrxf=h4*VnIKf$+^l<pq@Gi+wn-j
zt5IN(>mtUB==0}|mPmM$o-3B=%J(9<&`lUQXwKRB69g|(B8fstVk-F&j#8krcoCY<
zZ8A8M2`f_C-gOX_BV{lKM^t3ZFq}(dBRieMjnv22aH9^N*Ju?Y361jEl+kZdr-xkA
zfrVViHYKu83nRb<PKG=uL_U)u`^4a1>0L77)ZH}MJUTNubTUIJ%|<HcCVaH6oc5Oa
zMzz~Gdvo$WG9?#3nX&B3X&VOBSF!v&bNgIo@*%WeHEq2JwG$V9`edE-Cig)tCT}M9
zK{8kJaZ_Ya#dHP%>I#Ejq0er0q-Dgz+^M^f6w)TlTh1|gjpp+4mm9si+-CEZ<5smL
zZ@H4UT%q1_`FX@;@Xn$$G=HbKY%6cxesP&j%qD?rTpp~iaM!r3xX&)HOj7SSI}2`N
z@}A2tjutF=#ZBCk!~d(Q7!F{$?tiQF)mr?&YD@lK6Y@;3|CiMPtcrPnRWS#!>WV5K
z^7-m2tLv&OQB+bxQc{i$O{5!G)tA5ztZH<QU{wWsf>o7V!PvvM!d3LO<O?SFf>j0K
zl7o^vSjio%<PKJH2b(nRV1iE5-YKlg){;ECGZ=%HYbC3KG(oE|+#ejG_uPwB3QE4s
z?@d;i0@4nq@pl+wn99p%j4eMI+{VW28CJzDZ`>tEu+8EKR+fpf`S?&7C76;oP|G8Q
zUlwOFSuOd5S#R6Rf=3%PehFQ}MnPC5f3Yd$FP34MFS&}9T*XSRV#RV5<3iYE@)k3}
zB*Ihj3@dqt73?#WQ&510TpG2ByFQa7I;C92a&|i`hsdapx$7mrv6A1I{Y^|7#g)9q
zG}E|TcE&7UF?`2#6^pgnyq(BWk`l4iuOyOiQA1V-GT6dW_c5p?4{LbNeKP6mEF>hd
ztI4E;<7~dT-ejUu3%==#y@|IIPGMAjZ7$!kD$TjfunW(}t;{`v&SX`hZ<a8yMe-x7
zDy}1$9kluDxOLUG-L%Pb%H)_X_EV+gSjNX@O1lwN5j*LUUs=BNklU}UL=i@cFpn}G
zr--By%U~sJGt~J>R++goR321fs+>$=iW<gk*zxJ9euLf=^nA-OF*d*JTPDD!mhW4p
zd7FLi@~>0g^R24n`u62=eG@3#;Qp3n=c}#t<LMM<<Qx{KxY@#XcC7p3Nw6!nQT*hv
zS1CEnl^o_u4s*qEm?Iu)y0pym84^p5btT8Tl4D)*9P6q^?O9h<a;+;ph9`snAN4pY
z#^rC*a{2%Hsw->enf(81@V_PhzlnG#Bcm>PY|x22UM0DZt+v89zoN1dE@Z2&tgG4I
zcp+Q9cfOfC_P8tF<n*wk2<aV35JO#lnKe5XQI%AhoSfOSYSnmMw#fs*xGm%+?AcC5
z4Evxgry7Da8rdE)r3GDo=BWDGL{xmeU?en<j%h9}X_cNgAC`*K7U!7PZ`L>d-R|}l
z=vRMwU|^Ns=Uao>dqS1d;W%5rF(j~{8`9i1){cI@C&2}@JqeudrIMk<2y#IK9^@2U
zN{HeOXGmbUQUh9!eG_=4!<C2!{{tNOHpqY%vwc-J&PBn{Pz|r?1W`vQv9P?s<#)S1
zq-QymN*bEUijOxy>*Z{kBzyW1?+4CIKy)WhQ?x~YE|=e6Kmdy~$R{i}>5xI^p|D#p
z>hLj9h<SUmTDT#rajB<L0?R_zcT-u(R9@WtQ``rGgCVClG9ir`U3%r^3n7(f!@`5!
zf$}PYt*NPUGHizWb>&id<tQrT)M2PoASQxOu{%JYAW6bU)6`)!ULXY8_!&SDGa2{$
zBk}Yc+<q*M1@lNGK8)vgDh@g)Y9VN?&JGqkT5qPqY!G-&@~$1do5-E);my{N*@>Od
zG@-^pTEIlkdOwUG$$;zd0P{c$zc;FCI?5z=nhB#Lj|pmmn8~pgE@(e|O`TmUyIU78
z>CHHLPJIz|HMwEsttyA*7cC{?8R|;L0kv6%D?`)Gfu5%B)-KpBW^TNVc>hy-B~^(g
z04t!P9gy&9K9Gz@AwB@rqBbvT?<pJ#wl?R4pwjE}R%NNav{5MflU4p7Doz_Y<bOYw
z`z`W+>Hg=5d93pP5WSGuuU*JoiGNnr`LX;z&n_NELA!u~7z92DGR~?6n9vfmEIRKs
zN1-4|OoTUmqN^WgCw0gY!9vqeaFO4VLr@eUX8?53Oi`m7uSqe(S%AKnW{$Fvu`1Du
zKTAbKTbHF0YKSUSV2UvTYZHqxp~v75q;cCA4949|wgsB*PR383tskrKkgWo{wH)Jv
zk=W**pX2@5^Z)1wZ~{y}MQI}k|Hs0PCH|AIW?qT^Ps9^g(bd`A+e0KSQPWH);7d>a
zrN@5$$3x2eqD}ui=6{V@{;R2}D$W0icrwj@pn%f!|MEW>=6|?9v{~nWZDr~FXF{Hg
z^B+?{Y5srtAN%>Ah^wi=q^uT)2jrap)qb=5UsF@k|4hh}Y5sExDDi+V_hUc*skKnC
zB!JxOzuEqyw$fjk{}b|Ln*WpnO0)mV{$!i~RYhU|xz~U5`A==-Jb!8aPsEdb{#TV4
zz?b~7&i{64tvsMa<l?oF`~0`cy#I%PO7njLo@EWx>cY{~+0oLvxB+=9Lh;yuGU#w{
z>&RIy`pu1#2IO_fIm=>%=|s*NpU;UaY42+64R$t=LgaUIYqz^XFu;sE*x7C8qJw%G
zkYH^PN9^j6S-tqTRzW9j*U{76WXwDyzJ$<fM;R-uZC%AgqR%oUfP!00peJ5p3X_3D
z4o72m1Hv?t45c02jU8>RiyBZ;0*g2d82(#FK*309T?9wV7+m9f9qtQs*6k>hHzeQ?
zw!N{bvu8!HIndSCxsv!K^fq=c4)iuS{a^r751nsv!{3&+#>G8uRF3g+AR<);JBc-q
zn^%heZSHQxgAv3ZaT|`zn6Jw`Dj`Q1ZL>UN(`?2<m`3pQiA3rgWzn@^C5g%th*Adz
zhGeHB<R}XzOjxqd=QtdXRFEEV<4QweQVJ65Q4}*K43EPR0^c(HH5o<a1LkVsb*`Cy
zW>O0W&f18DLrtZ2<A|>oEF7w9>wMKV77m+xijM1(ng4r-m6#VM&Y0WC#s7V^X8mt%
zZOQ(BVjh@-tsPAbp}N(0{PC<_&DcIzOu&p6zTkfx`kWO%U{=UJ7_$SHAbhg7fhd$6
zj8)+l+xnUV4Gw{IksMW(G{3eutmcbD|KaqNE)V^OI~?8+{0m$nf+|9&q9u-*RYhkd
zs%WLW1-Ifx70tn>?%rTepsBAr5bWp#uG<}GYU~Z@oRfirdC~&HyjSBU!kDY+j60&l
z)}jiWhX2R|bv%zefGXnYR2|`xcI;T^a&9DY%hndu(b<avD_VPcjhv8m7*T#|_X&LC
z6C+56(>|9iD_sqVj<OixrI>k&lik2u!*WDufxdHWe7QN|SL?Cz|L#Czb9<neZRFzr
zwSF`Iudb>r+5b$)Bieq0l{e<TNht}jC#4hw7h11`!Pz%N0t=?%)bbyT*hq<jC@aNM
z4(_}mVR?B3N$VvgLM`hdzTk-NLKT%_(x9C5q86}Kgg8858A3HeY&$u$)-jYyCF&|F
zhKGl}lqwU{>fIYp4szmjIF>++(ZRS(jMbx<o8ns3P*O?IKrYmVA6S|S0KiLF0oRNE
zH1XRaK2(@*dsERwg!_1-@^a*D4z!?@j8ml)4doMwOJNMIo)PCFC?e^my!sA8%iBHz
zm}PhAu}o~=p=at$N|@!M&Zbs0-<+3jT7<mKi<(S%5`%gUlBbJqe@rb);dsSdgbX<w
zn>)oU;drPbtqQqtmgaaU4K}XS<qZ;H`7qRka~)&`i*L$=JP>ye4-Y35Rm?bKlabiJ
zDtcDFPKjByH1I#^izyqBI-=rHp(PS>lEk@;g=8;oh$2T%!^4M(m=X@jPuZTaXVg;;
zH$ieh30jpfB<sP6A%eiJRIJfK_8YWLvfG#sn~fS`PF=}28#M^;G?Mb56xn<`4J-er
z+y7#=k%RwN&YNdG|EaF6Dd~SF<e7<@sXe)i`YYlIif166^Kuw<cC@WzR~*Dx+;Fpt
zDV_Fi$IRXaL`_EF7cm|qKS0`qAKGy;ys)#S-UhB@#{2VDDjL(UwAA7}o>ZU!>LIgw
zj>^_1oTz0OL9SsEbh=-O!K$U_fGE^V+y)m?VcUW*n@d(i;vp$gf%5~|SKxh$p&>lU
zEludFV}|<8m1BBI%0l%}0oz;&J#g?Hm{^o$gTgg_2P=yatpavfY*-f!^9!z~s*ERX
z7}q(dq)6BtOw!=&$4XG}1btlt@sGyUcJ^RSn~-B+Jm8L*x^}4nl@sX0XeKb%HYJwc
z;4pmdPeXK9RGyA;&+PCBCJZGMjKt$>(+OIzT?*kQRyZ6?J=1{jenO2qbcIp_@_Lz0
z2~M5>D7*wD6h;XNDGC0hxE~IUQq_bUQU(-ESnQ!Itz)LRnMCDn0zL_8!f2!N2>Bg~
zDB!zM9yvlQhQ|PkwOWet4YAgozGlz2HaZlK$`x^vqXK7Kf?xft<s<Nap-3#H4p|$u
zEtU-TM^(JxjK*_hNu>KDB0_X2ARAT^gF03c>#`w&=CmM!-T-TEg5B6@tj}Di3OUSx
z#S<xgT58o)Im}?``K%*@MUiYhrWI4JWURKiucLJZ5wHv$=PfvvH+BQrFNejxe0fw+
zRV6l9jwRGooL)(wC&FC^m~4sgg36_ssyI08x?aLTb*wnCvl4Htp?WvTAm~~R3JRi2
z;QwM-74O5FFw+<eg*5dhUAc+4QJb%B)4KkH7^7AcbB%#TeqK#Y=JQ{l`TV!K7S4Za
ziU~xf=PSPcXBvNbg9MJiAn%U3ja>4d-(PLk|IVwfEXjWp@!&m7eiygnjIi<L8@;5w
zE{#PP9yx`}cTUL1uA8w2Omxt|UXlu-kBQ5jSk~oslhV{95|j->%uWYR7K-AE>UhXb
z217Xzu9Mb5ZUI2JAa(M0(1@70KphXC*WBINg@`*S-YLct;4?`x@fL*4t5)ItUlZQU
z^#%+@T=ZT95QouvDGC0Dt{R`4MuU^1k`fV<ajM&~W(|Q)3Wt$|2IOHRN61Y9s)Jl3
zMnm0gBy~184}wsVVa%(W;_3AyOdYAT!Ff3TaA1feda>+;Kadb~yj;5!i^~yoP+Y=e
z6xEAGNxJuNntotN8h}X2_BA9Gi8S3DPl_!^;lqL9cv5V6lLKTu#e)(+HVFyKrFd|0
zf7~b>ckp<mHi&hxU_kUj3KzjMVs|Rwe|kF^qDk_y#<spd4|2`fSDoWQ@YlU&4Q|s*
zeMb{s0wO`P8_t+19pDCJ!AI6X@9wgJ#n}^R3pDj2S{ofb68nIW2N^dKWd=fO!2PwV
z11_;8_sQ0=J8Cy>@*t<=beG}0uswoYc;kfg_rsJ5<F-ho9pRcg$M6v7FrX@eEYgGt
zG0qO0vkvX6dQhMoAcNl+_qY)2J^Z5m2LxE)BA2Ogz>;!WrI&^A7#MiRz^<v~h@)Xl
zG3JsZsUe&h@K#3yth!+;YQM=uWWP5zFDpHTKbh8l2{VRbto`uhvj6k@Ea$(zn$r32
zggi562)mtrB}P;ZK8NGrz5s;RUL5S{?S_APS9S%0ByvInW+dUZcx-T)lw96~7dK~V
z;!oWt)BLBW8O7lMx#WLet;PSpy0#?$PsmeVjK`s!c5&StISiqZZ>d%y%@iVD$V;>p
z8if&sMKudI>944)!9VLN=hs#F4B;k=18H`~M%Bo!+M1fG8aG5yAwd)ARV~QX)Ylzs
z5A-hSZ0^C*R4g3@@eT`y#$16Fy@3wUwDyp@#UPK{Q6%Uw?iQsLEII<NK~YaGaEogf
zd=9a5Ef(ytIE|9E0R^d^H%KMM1|+^}N5F<u<chhqC~}74_yh8KkrM&(ab2ykSiE^r
zy^~0v#X}V(Nu~r>QMK3S-GGH`5*CkyIU`$B9{jw>=+bW5Y0z5G(WHIEQZqzqWIN$t
z`$`NkQ`A$<KHUeX>3)}89un%m$_*DlIdS)#<jNjLS(y^|4ks17!E&l=l|%xheXU7C
zATBcdv?B$A8n;uA38@9v3>rX%@qzy~H`gjX#d<QW|HM$CNE?7$@_()0vi|#PO7{N~
z@)U>X>4q!?2mqYK$ogN!*8iG{DnF|9*Hu^5`7QPl#R0a6t9o;wrM07#-o;=ePH^pC
ztq%(mSp^RkV0PliKjZud<D-e0|CKdW7X5!^Wy$|{LZ0GGDQ=ur$n0kXMx)J((!YQI
zx|-^`O8<mQ|7;REh~<~eH2ySZWUxEX+t=L@BuZ$~FE~K3`!*a;u2rE5VlPwfhv>rX
zJ*bfwP&Tt`F`xn;d;tNqM^1uS1O4X6+-d`^&5@~D^09cLb1w*q@d0`QLl3yA`6f|c
z3x<frlA1GfTRk>77C@=uz7lioOla~T2)n6i_4&?-Y)F7AgJE3%fS*J-9)z(NsMJnr
zs(fzzUWNLV6e7|v#zZRt39L=2-HiwAPHF6K8de;}Qi82x%1Kka0+@aiIIM%X@wf&J
zDWu}OJ`bAHxTvW)FbAT9<Ms&vP2`d{dYnL&^tve)tqu<gtpm4AcOUeW16H=qrO0J~
zK$RnKx;B>{ZZH_2ue2mNDUg#%`*RJUXHFVv)I+EP4jA0@mI8;^dmlZS7{F+7E>FfW
z&Y1C1Qcl1b9WyO8R!mU9PB#WBwUP|!SxUl1r>t0&Rt(0{QidS5IT=p~k-({;EUzoW
zJo6dH)8!1~N{rOybR%;9G&RmcGOhn6^Vu=Ak$wI5`)jJq_8;?V{U!b1ggkcoe@EU%
z0ll5Qjcvj1&gDIrU*ILYh$|4i+mhIJO9H1&4Z-0igkUBYvM2*^!-fL3{^aV+Vl7A7
zqN6bcer=+M0^>n&FC|glfI0~-$Yi<~dROM0IhqQECg8tb@0``KIaG_n^<w-an)a}v
zLA##OLrZ$S&SApG*c}$DoL;YXTM0>X<1A~4EvhVqVa>)la9J%AuMqOVqEcKP8@uy?
z*v1zd_k^Lc2H-{*a-$262~AiyAre>>I2d>>5|>{mzg>o}Q*b2=UK*5GD4rxyt%ZVY
z!A~Ve$muw}FGILGN2rzu7|;8j4H!-F;tCE3rDDu%qe?0T&FY>u*4uk50IHb)BsX|_
zP$C4T3NG<d3=ax)Ec2j^o7^T0${XN*I`E9puHB?<1GaJ9#KZ%x`SdXDGVV@{42yQ_
zOgIjghY~S@rs3@R_f^Uo{8`5#A7)`_R?)0$+-~C}0e4SAwitGhXc`2e5D=+lv{KAQ
zq}>=PT;92fP6JrV$5bD?8dJEGQ@mT#a)l;umda(LY?WU}X}asubfM*@Vo&sTNr@F}
z7lxT88FDE(xXQoAjgHbcUyO@VLmQ(R45pbr6>mY%zA9QkcOMJUss)0P7=HDj1u*C7
zuLPzxydMiMT(f2k#tAg%Bg7R~y_nupE`}sZvn;TF1EOH@R9ro+oqefXgYZ-^7@e`K
z&@j8688TLpj4>s`K67Z;=W6XUH>N`zAr7O39H^z@?2G_$PQWT9_lr|`on}}?yRing
zOM<l=6VB<q@if0+Lx)^?H$7TEJQ~P)RaynKE-nZogCtByG)V37fOgmoS^Ciw16~8g
zSk<ak{O(CheaMA*$bi30+_6DQr6r}xl2UC+sj;NgT2kg&Qs#>(jxzTeVZb<U_&Xu<
z7(Jk&TOZ0e(vfg%4!;*w>>nRqZRbfX%>?c%$Xvj1vtkm1YuIuM4e?#)oB{tF&zylu
z_)`Ucs^L!!{HcXM^We|?Ic|NYrT4N->?X?6PetzvlR(%6r@Kgohj2YLnB%)zCpkBT
zGerq+dmY-=*1oT%ovnceHR@%B0lz|89n<K#NC$KT<1P$~yH>E1qg|k|r2MeLsb0*R
zLu*}7sW48)dSR%_%V{yZ9me}wyhk0V_6*c`25LP6^E?Cd#Vt3f4DeJ)32I3=;3tjc
zS412NhUYp2SLbP+LRjGN8!%YM?l>pN@*BvRd|<bc&;^W*p>A=g0)rHpz~mTE^H8z@
z28-NHxyLnSRF|aq=o!)>nGR8k6tjF32SZ2GgpCJPD@l>Wkc9guCzTLdE03sO;$iX-
zotDi|!8fY#$~a(p7ID}J_6XW0c-Z)e5pCpGYY1am$1s-1AjT}C7#Y7YBx@bn>P-PQ
znCFUSKq?tVKqp1JkPc-;JjdkW@#1l!yqdGHeg~IUfx*!vdvU9ui*st|e&NZe|K(xy
zif{&;%l@OrS83M&`b+WOC*~>6j@}q}q<~Xkk<4sQg8en)bP`-NBaqEKf@6C!&3_jC
zvM3fHx#B-n&a>EmmF|C;pr<&q2@Z^iTYn*QUneoc%oi-cs;b7x0<1XI0M|>#!|4zS
zMnyPZirjUH1pzGkVDS<HTSVlP92vpVnWU0@nr${ZkVLnj2|=Pb?4f7ewxL#pa!gMw
z<~Fom^phBf2u?b{ExUD?b+xrwSsRw2>r`spS4A|6ir?u$Vqv0x)!HGa5q+_>vG{PT
znZ*rr1v-||vkI_frUxrPTu^j#&z`COWas}?6XE~wud>L0wY8=A{}b~Rhf$1y|5s@X
zfIrWeCB*@`v<BqY!O|M=rG7H;e;(|x7;R+d|26)3R{6iG6#si-9$Wu!ufI?eu$I<9
zTQeAeRr`!aVbwlVUY?GnRXLo~T_PoKNagU8pjomSN&B+cNEg#Ut;F{8W&3vQzBo{p
z>;yB}3EG+omaGJAtpusvxMm+nj2JY-K`_!We&UAjB`d;-v?5$(uq4cGN=WkoY?(U4
za!|{vIjS5Pn4`xUCFn~~1C-2mh)i7!=a%+1hNG}n6zUZ$6f?C{sP*A!>>Wh_bn8WX
zi1M^d9EJU(&}ISK1#RqON`&B6H+OSZq-l|InB?V9$O+UyCY(A12Ye8+i?1I=XNb5#
zyhqli&A2c|(gw4dbL*}|Hs_UiVq)yz0bvyDvX~ND-E0UtY2dG{N1_&X!^ePHo6rJb
zu|#GTgxmD8;*103Fk1wM$+#mw<mFP6UCRtsDk;R*5@<<(w9FJ=9@L*sAp#rZq-2Y~
z3d<`X$)+O$)@WPZGTgdIq&y=Eau0|$pqBG%-49GK_cYLdE_2T^@%-F_r5aoXM&g_~
zM2rCGLa%{I3}u|VkTO<+(NE&-C`Rvtg<!ZPge1z?h9T4oXQmy<<7HKO7-Edxfg5lp
z1a_UcH<ONVMC=(RGl5Z6QfZ0xKO;jdqi%0_3C7Fwpp@(fTWZXhBNTO<W+ZBfQzowW
zE(tI8!C*8VmK&Vwott2Ey?L+<FVF<oJ9`VGJ_Z#B(q*5-a75WVX#y5QfxCf3#mdpe
z+*AUf)7NYgTisNmxLkkYWA|hU%ww>-5(Tpu6~T;0-(V*-fTz6z^B@14Wh-wInoKUZ
zbZbKD#&{1&wC*{cIdtbiF<v~BGt+ZPw3RccEMUS*A&~k=P)@bzn5W(6m>1`+VdD<c
zF`F$KBQ0dou!<S3^%Wo*HU(>PiQONCOEu<_(XhMNQ=^5L<5g;o%*Cl#8w4VnR&w++
zqLwfN#yhxh7Kd$2tp=BEa2*Giakp+i-w)AfLtr3JE7xMq!hq%Bk*!<!(W;3DI(5!=
zirXt=eL`NNMYrA+0@;AykQACjpf}6L167tJp-!8%T#p8u$rjJxnavk5y_jhr*bNrN
z7>_WFhs?%fRA|SN4qWgAaeDovmO@cZAR=pRB?{p^gs_vqds-EonDQNzd>Rdprcrrv
zQ9@FV#@EY?0926zDlHTsY8O-NOo>Ev;IlDIN58lniiE_VR>MpV)XY~sT1;iW&cNDE
za)p(F0SsR(<sjr9mN$T+bX?e55W{0!X4q8WF~&zRuYe%%f7QbLk^sYu>FKyGM$H3I
z-yr-Mf<H<Io{BiCHT;i~%R=+nr@UP>43L)eNuUS6(DZ_$Yg8pe7|uc*`%J6?k}KC(
zI5Z?zt+C8;NUmOEnV&SmhJCVig46IA_Q}<tgUQ<E{CYfK-{V319uL{~Sed9EPcXN$
zA!sooyYAS5shY=e#MEozFkX<B3tivFO7LG5dM5$%-CseP-?(Wr)4bq=)-R`&5W6%%
zHO>V+6LHg-z`0-zg_IX{aO9h)Lrbo-Pp-00Hc|(lZzk&C^UXvZe7>2egU`1dbHWk@
zYIFB}z`pN;_I)3+@4GT5_sr0HKPhHNe;ohGJU7Va%``P)1<sA}TrVbiZWP@2aa=Vf
zes09ZYjO}B2wY4rTEmQXhe-A>1LLtnq&lo9TzXCSG~=_)BMlgLc&6}wRFmo9JF5od
z8~~e3=bZKaIZj>ITj?>XLW$a!mc?JqHa+{Qo`HSCxEfx&f<Y+Lny|?}XZ^n6IZh4+
zEkHEGqH5Ay&a_$FSJgL&_%|_uFm^BN-jk{-iB^OR4zCKhWIUbX(zLsv9pqdKVKpFv
zS_6Y5hvNc^a3gW!$m8AU@e_duXto^8V_7=`8!(fWwF@wdEMY>#k<};l`Z->&LV1R=
zh7U@H$xUV9@tfDyaWN=SSWpU0b>g;@1PxoFaTrG(85@f`hL+xac?OZXmXothBBemI
zTVb}D$56{ING;<!l2lqTg&rOAfSP;#B^ppeREhis)v`sKfDx5)j3|ghg^Z|Ow?{du
zSn9yPC*jbFyNMh_YTj8)#2n2vq=imWvAgaflZ&P9QBMBJOhH*hajWt_gD9?#eNkob
zV$@=POAi?B$%A+YkxEK2RbnPHCJd9l8|*F_77YjwD=L+5bn8sF-MKXLo+H%&w&Mvo
zDVeRD@;GiW9NxHv`IgVL#ZbpmuDNdUNLp+>6=y+YT%xQC{blj%1|&Rb!p?CbN4o)_
zC^OZ{(5Mey7M#PtBYIg<anRmhT(nnCO0)~pMXWd(kF$%XEV!q34K%7fVX3-;D;|?|
zYk*?Xsg5s-u5J$X_#%wNF(jOD?39+7rAl-1wtC2lFJA_Hm8fY_P*Zt1gh<V3KSLd$
zh{FP1reUEeXB-f0IK9-u7Hr+g<<tr4$_Av#;m0L~h(7d=3swXE1Q&qNN`{9ddR2S;
zfH8B&FDYL%$pi4k(1IMZmj=E{^b8I?1xl7C$3$n!PWvp#11KMXV1mXk78fj?#*JG~
z*!UG!jlNhWHrVNCj5xv4AQHrTsQ9+Iq?w=+8;EZXo2i0~mUuK@lWpjrjxFd0Xwj(v
z!2&}A20iQwC%U&5yt81;^(2zXU|MLr<cAb-8~wZN2+LTC)T)=Fkl2)}7F`1Mwsa>;
z15IeIj2X&nty;=c0JQS99*L}Z(<Yr7z<VeJc$=OFbll1ww;6<1NaNy72=tf`zBQnX
zp6_{dgXjY^rlSac<9PmH`LJK6mnVTEzD^vlU{)4R7L2H%xPcakOG`gEIq-99>oAep
zpji_|<W+VusxhQVuEih}5oA3l9hbPD7+s8#GO<vFPzIQd;Uz940Y3X>=DTD(uQRLj
zoOW!?WqS%Ys&Oo?&l2;nD9{^8>=~`Y+_!vPmNeH6S`C4TR*(O(mpW~%SX<gV%?VdV
z<lzn#f|$Tgibty_RPOS*oudSX!<r$N>Lr!b2$BZCrAF}j<nC}<b)t{r7@S_jIV%QE
z&bH(5yS3X1=w;x18wD1{R4~h=+cw5#W`s>M#@BMg5Ygq3bew_)<Ik%}i`ORzLK}fA
znM{NGxxmacvS5TI1T~(-tOu?H5iHVk3fK9|)@*M|Tqxt1DiD@|<=DEk1fxx^r{o{X
z{UT$}5E{nH?uBdpCOLZtG6<4M<Pu0q-2Rw$r#2qk<KZg-6F;yaCCA`~`C^&E=n;5<
z<2yF#c#yTGbeDG`+hI{041bh_q$E`_hA$KE1`Idb7as>KP%sN-;ib3BDn#HR5kE8&
z2LRgx>u)rzlI2$lhiNDf;vFucl9Of}vN5VHeoPxJ);qZxGsh}#kqg}7g_?Me8WN+&
z(~sg}M-s~Q`&NmHBR=dkUdx&FK2@8ujy%{r17uXa@)z2x)KF5EQ8b>E=~XwbR6K>T
z+JLIvW9Vsr{yiO4{h@KLKRo^;Rc#)rGP_}FCQ`mee5SEBb|~wPz|b3(li2an@R%}a
z{)fldrK)_1kM|0M63A;DsH(gaYhwX4_uLoF43Hjuy~w`cU*;?9%$L{Yb!}b73+pmp
zRfo~o7MI8#oi(XNeC6wg3do^=GF0&U@9<_*Gx!`-)BW_qJ0B=g4t1?Mv|`QNeJkAF
zxwByU?CS?n57$JCk=TDUBqc|18LQCgG?<kRfQ?22DdzREOUk`YQc%mHU73fwLh`%d
zuUiY#HlQ`ZZYrUny2uh;hcxMQKmiLy(nPr-@GS+xMPsa$!3$W+cvr`|lJSr%hqYiL
zgK`W{wFqMOx$sbM7MTP!v2cPUS{H-~fhe608e|tFp|Xw0X$&faktjp}+T<Zw#8?bC
zgCRBn%R<jgQp0h^pTXjnde0j&XwH}XyWoCm$Oz^!S{`C6!#)eKs<dM#_Q_tU2>=TU
zTb5TBjKIF$Bn9$rlf4pEdO$WoC&IJn5<mVfY+MXA2vKT0qU4P;Z4$0=WV6ic<OG=C
zjgA?Dqme;&3zz*t%np)B6p1?POyP+S;W?OTRtn}k(2>Yo@#b^JYJT65!!G{o`cQ2}
zabt`^l-GGRH5u=J!H+5aYqh_+avG{BE*SRDS3Lf!{rKZ8i8qBAPI21Eb^njwZyx`e
zn%de@{NIUq+FBQNH+HWqD{Jm<T^8u}h9eON{uegLi2WPv=xbjT=*D~RuFme>9tWlq
zh*=h-^g_!`@mp}dx{v+*XX{s39WF*2Ip%*=Wwqu02Y+o<Y5q^d)2@V)aWy`W!n?%v
zas({UP){lyR^n)RJh@g)NO%X)qCkw37P^I5CMQ9_LbYC>&oL7%Z|v@9?O0rgnmbWP
zXD<pgxAvmWZqyuT3-kt1?~>LYw7j!>X-`*UQvkKJwgqN595ajiI2>562HCETZ*Za`
z_)oPjh}oI5!Moa$h)Fwv%25}VIbl22IgG{dh6U9NaZNO-VL{D8$Ht8t9h)|75)!M0
z#0lzz->wt>snv-ZyOF4wIwKJeDf5jz;3-oB{BVEB1U^fd65#Vo0*ze|Q>R2X=zTZF
zPUvZqvI~nN@qQ^%mkWlf@q}S>uaIBvC!73dS}#Z4Mt1qn@2|zb4f0>55C1O7e-rV{
zL|G(2#=(gEhj~+n6qOrn1T0&&m9^r<MC}PC4m2cgHUV?)T!UyicP{2JsJF3uF__08
z=W-=hRf$|1=GVGW^GHmJDxvZ=CAJo|Dg8+)IpRdV4L-lG(&1=oS=?X&9>Y#+XqNla
zgN_;Pfu5em#R1b1Ex9uUMWwYe(dDAvI3lKM)P_F6&_u(vbhI}v4S4jL(kear32aEj
zlPT2BD$zm!6E~1_OfR7SB2}S^0UN2-i-B=^?Fy}or%C)rs*oO`HaGeOY;aN)g9c+7
zuzK145gIC%o8UzyJcI}%j(ZYtpd(5QqX7>Xk~c`8nXVfR{7|zEK^e!yX;*VsTvZiN
z&xVHL3RtcU&`8}vKc%ESP+8jRmLoFU1b|!+G&>BP&P`wLysD;M8EwTt@{5S~A)Au;
zy{o&k3pK)hAzgB^iFCbLPROya91AHJBR-y|Clm@oF_^w~`y(-58z`8&;9SM&^*S9*
zU0n^K2!u^{wD-0(M3pdo>F#N2NQTHy$Bfn%gq*Wncr4vca!`{S!4BT$qQ;&8>Qm)l
zdrOlJv6f1(7NiI<^oiu?Os5j*RIph|BBxffn4vY6l9N$6tiT~h=4`!Ea!_XVXkRQq
zWrars#p|tzDE-1Zs?}+Q$AYQ~GlZ>!v3ODrQtkmw>y4V>ZftI*9m2zgDq`_Sd@znG
z+IvyO@+wrZcm=BHtV9*fnDkmZsw$o2XGe2jQQu<vJBZVpJD2ycxAsL%{AXWJcXL}C
zeX)QXWQsxjc_nV6r5RO(7&KV{X(gz_|A#}HWK4>btH}_#f6P~*#6ppD7|+BExk&Tn
z)n1>svbKB}Xv?k$+`%QKDsTbk`1ZS{+uC<B5_s0=2oRf%u1$?3Fqu^PFh)oRSh2!O
zkcRM#L=_Rd)>Zp!QAJoQ$MR(Syr`$Cs<NS94Z-3@CbUo~`N*N+9}H=2tsP5odAuB~
zH5aCz&{{lba-^!#i$NzQob2adSYf|#U(`fA9w9Gy$ik69_C*S>ml8aiIwVJUJ@JUF
z|B})vUVT~#lOGxaf%#P6Rcr{aS9Psb^J^J|3^+n;qy+wt3@wF7jfd8<Iwu+Ys3M+D
z)d79OWqmr2sbGZZB?1{RAUFW8%RIw?Mdi+GGtZ!4JOQ`x%?Pyh1Pb8(Y&jn#@Aqfq
z{jA>XoZlwX==r|C_<Y|8UlF)|m~q=E<+z8mVy+uDv%%oFu>Zw}WLyF=K($%dg7HU!
z?OG5lcrD0X!hS6XW?u_}U!k=i4AacaQWN2RFy^XL<wR;KE)cez%Dzs7*+L<9ecYFg
zFk1j-1Uj1Wx}ooCC{Kg;44V||4kC9}jib^w7ANEB1akIJqd3qwsQOyeOl`1(I2rs_
zoS{UbK2#stu%SK~s>fU6`ec1P9I40qpZcN1;r0DeO0QU`(c$Rn?CWj{G+?Bx#{Z{G
zXEjC%`&nM&^?O55Hh_20V##c^;hLa|h#I6M7#d}Hda7G+>D9DVjE2#b#8OGpzEMaa
z<6<7AC9(u@XLF3w5FU&~{SY3dp=iAli)0@YBNm1V1E^b8^CBE26t54ZllA@4L_MD8
zn0zYnf2n#r3+t1EYW<)xP=9!05dSBWKTcDl@SDvB`ocH-<D~z~t^f6pyZ(1x?L3SA
zx2C3~|DA|uZ2DjSRM!9cr>OqdKgIRG{w(@mn=u(z{jY!g^uKmpnPmE3|M=^F?Gaqk
z|JvvQ{8LZ=>)+h^Uo5w54*jpW-zEL;WZv_Ch4jDvank<^^Q;j4ukCVP(*N4={i&$`
z&BXpUkN$VmYr*&<p``zvENekY|4WH>V)VbJWn)zO-wZp5+*wQd-^rr?^-l`@Z`Lsx
z8ts@&acy!={cp|q+yBm+S7p`zR+jX?6Y-2m|64Pa?SE^gsQquv6u1Aa$zuO&Hzwn$
z|E(E6`(N9xOfLOz&G_5@W<YRB|7+C))J#45-<r*A|62nFCO&E66~LB`mlVL0dDH*Z
zQ2^JBj{&f8q7|S4wqMXo8elulKLs_w85e-fp#dJtYB2s-D5-!a%W6<k0aK!#2o<n(
z;TVk$IMXg7ch-^)c#`OVYbJ*ca7hPj(gA1F|B5kg#-d})rT?w*SDWI0&8wMLivKks
z&uI0(T12ENr~KuRPbtl>HWjC$+SdTQsPnZSig8l-S{f^owl_m3CXK3Bo2lcZ=go-M
zl9Jc3)#rGcDjHr6Z{F(N=HjV$p>6mxK{{QVu9g(KlX(lDk3ts@>SWxg=e0uzf-JHk
zSDR9hJ*ut`<xt;dTANF{TMI*<T8i5&d_A+)ws{=1wxeY7<J|9(o_4Y@`BCd>Cn@JI
zL`4h4I==c@`}H6%oor@_KS#bVqc)Z-)f26ZrSd@rU2I9Ay19*Nr_hsC|0@IuA4?m#
z^uJY==KCM!)mD|_KTOCoYW*({DL?h}zYOxJrT^tqaZ2icMc@tkU)!M=Fa58%v0~|e
z?K?4f^uK(jj+g#76JAUDU!%H!;c3d~e;K?JWZpX-YTevDD5-Qe-)<j<hiAY)Lkad$
zxT<%GfS-A{kINUV?#-dT&9JnV)VCIXJjK+vnVH(S8{LkFR@T}b@#w9jnVm|!dej=*
zsn(|~e0;20+x)e#8RhOA`M#7|SXe<PTnkH<?UEL@q=lWjPd5Fp`G&>Owvj{sTj{T@
zHOGIb^_A>@C*&Ee{?~9P=aka{i_lLgJ+NU)PDNd?r30cqIP<WKlTO&S!6NB}vvg+C
z=!Olmc%1aZS#ey_5gT+8BCe*2o>+u=bJz;=_SZ$q=XtBW{z}kKjJg!gG9Y1ILUwHH
z##up~C+bQ{>d9h~mS-S|#Jb67f0maDgOg;Dt&j7YZaT}$s@u*cCY1Eswrk1M(sAeD
zixX?6JPFp93BY4XxjtFen6ZSXn4AkwAu4oEvg2#~Jc{KgFP(h$y-pr^zl^$hO{AD;
z{k$&AlyvkZ9ewGsd$Q^O@&6SpQ;yjJJiGqC(qCCyX^H<_Rnq@Y$TM2~zfK!dPy4UK
zKBaX3!gQR9ntv1cqTWB#fQ*yY-=?`D>HITxWYTE-g?T$p`u;4~Eou7=8X6r_Q$^RW
zL%cbHKGW9AE4}l*{(0l9nz!v~DJaNfR-ELcoS$Txk-StQloX4skQe7tO`Z{*GcVI6
zt-B3RpISQitgL-v!#R(J&yRbzOA7MI!skb=AfIH+zYw)JCDZX$iW{cgXks;Ill*h$
z{4#33*~&f9dT%Z;l(gQPMeA*76vGLFk*m$TkSNa9)rQ%+T1urb8!4Pt^QbwU8kc(e
zQ%PAKzlsYctvo9ZCi}+)XwWB)N5xbzHXi5*#S<gr0dZJLjSF3b@lrHCHOsM3JUl)%
zZ%8D^quzmZEHobV4oT{`Fbh)eIM6T_@#JJ`JRpurN^CspjVFNC)bXr(9Pk_;AArXN
z)`T=DkIST^6^{$VNp)P<53P7SAWlkyQE6O2PAaj~z<AW0lw#p{bUbQS@yZk$7cN9L
zr{hvF-C~RbY0$UUSZX{fPf7ieahWNp_*yxp95Ft1CzZi*VoB-5cu8C7lrk=aw_XaR
z)8jG=*N6MZ1rwy+aiC?WS4wXfFObJ+1`ZF&$&6?&*^W*4V{iYZUG`O!HnQ7)fd_bv
zDgI~8yxLOy&k1?jS{HRUcCRceV?!Q^IGO`JP2H_sy{(-c$k~>bdJb+w;iR%&P7+fa
zlF{j4rzH+dHSvTT3r6%i_)1fB>O5KIe>Gg$SBy4t%>U|nepCDhf345&FU|jncq%Hg
z*l7-GcA819J6A(VC6V$vDk>Z^**Pw9@~<E;IA#(fLK!u7_4M{Nw{`}*1C7m{9c?Rv
zJuBN6b++~3vPFCx<o|+6=|D0bCFY8~ffc>29ZhY0%>h)Y^}qzWG_WB_bsj|qYi2rz
z5s?K8MMnebiYHU)!L+Q($h9ab9ic?rTDMg^Fv<X$K?f)7YHV47L84+?u(_?xjgCAL
zi66nlHrUm>$PMM7CqZ)B?r3Z5SlkDuiSQ!`Ye3)PzCcgFgL?WFnbLxIZ8@a1t+lbk
zF_Uij5vZ7gpb2r|RlgEfF2}+cu8Im)J+wv;7i@2A8W&1o_Qmk#Sk@C<7U=H5D_yX)
zqootE7x?W!Ev;<<mVhcfJ`euS0jD?3eNDZVbjaM&*0{K*y|HI0@@=RZXwwi!&gO+I
z_;aNnf0iSvY)baEF^tgkPDrc<9@$0{h|x37$6hhYSqd(=D6qJ-!-4R#sI9YUDRTDU
zonveeWb4-0K-@_`X_<tKlnwX$ocaetHh7jbw)F*&vnd{p%CVH{^dM*Z2#5yNaK&%+
zYN4<(dqRqhz}YX9SV~r#40!?2W|=Y=JV212twUJ~u+fCfl^*2tAo!ahKe5@t+Y$~<
z_S)OzK`GJ{PmJL0_fQJ*YcJ>uREd|gYz2FhQdo{k$+ZMi8FF^w+7t{BbR=d33M8=%
zrMj>zhB+NEozGG^-Y<pIp%m{d6XfWaH4||zd%;35+XLq2QbYrZjx*n~iG>0k%?|Nj
zMuE$uWHvfw&0wU))QH5W0~5Um`SCz#6~cd<qu>Wm_8EkYIQUf5xN&R8vd*P}=5b*#
z!n#A4jNh;lHMjOOHFh^QE@}%PVaf_?D4>h<q%yC9`dX$hX3o{g)iH`lr&e86Ue(!^
zG@#UiL*wV{i%@a#?a-Ht2^rZOLPnKQ$SAr*A)*;PQ>-IVxcrw*{`YTA`M<Ix|4+nI
zlK)Hce@Xr?$^T=K|MB9HNfs`O{O=!E`9D+bn^pezm*oGF{9ls)bKtuq|Bt8qUo&y~
z|9MvVzZCyrLY|WRUy}bz@_$MGAHDov1NwiTG>#j9nsGe<$XNU4+yK;+4gg9UfYJsa
z7rsjyfU#}>?B#!czkG3I%$)XrRaIvDzv|kO{m+Cvn*ARg^4#WskPo>!lTs)myEB;q
zLZ*@x;8b`r%zt*XS#jFPZU0+op8qwK)us7A5syCq*&Vbw=ReMuaoXc=rD;E<9{c$(
zMou1k8@bni%lUuxJYQ-4PsF3mfAQjvTs(m1&BO=z_YyCd^iPiYUz7uYocjMN^ZH*~
zRb5*DC*&#V|4aJ+lK#J>{~wM1ze~GC1;H&UdD;NAhGj`n^FIRMYtcBJ0pzHDGaUkm
z(%5*M0tiD_ItnNq1(c2g3TWv|brfJP|LX);3>h=m{=e2=ZI=K2)g}9%33)0iHg4?b
z#3D);p51|trq)2urcFTKd2I_gyCL_YK&d{s<f4BB=?>(C`tg?zc|!^WObB}kH>#xB
z%^fj$7{&WxX#kFZGID3j<hBUZeB%+sS%MvSF6sg<T{GC@_xWw|Hg&eQH+D1|vm%ha
z>~nYYc6YX!a{GO7WsM~>1~6c*n1MlMJ@(J$7=QcuuSbwAMjN^He?H6n_m|>-Ovt0@
z|MXi1a%ul)&P=*L`n9C_n<9^K{>vL6zJ9UWfH^*|rY7V3$B$|LSIw)forY?P4T#<I
z6`%ih<Iit8D^?ph_`koh+HbZ0DCvJE<mqidkqrsQvIc}n!0U5h!KS5kaRY+OHXw4e
z!@*^|SuXm`jgtoCb#OsUTVJE5KkMjgcRP`@#)mhGSeEK)><xA{kV52lb8EM|LJ0jH
zcTkzf(YffLo(4qjD%b$`VR++up-#60r__<JxV6?r9gXb)+`jQ0)!`CQjoVQsvupMm
zn>u?|fK=PoiG{C@UZTzn^foyCK5vz?9-3%!qw=_^YD9hpJIUJT=GCI|2$>iTN9OL-
zW$tRoQO24JK_;T>BW=$*Fk2yvcubm+NS&iBx;CsNQF#JUlw%MfyQ3_Wuz}x@A#6;k
zN0AsRA3)_Q5)1Wu)wrb<0@18qy_MdINIdGrT*8#W5sJuC41<}BLfsaK=+HQ3qFJrs
zI_(-o&w5O8RaHcVRssK?kAK!x`|GObqf|U9sc>Z?npF}c#`m$~|FE-a4-~JBT=IX-
zJhT5#b#2YO691ow2aERs7<9PpR6;A-+Ykx*oJ87vmF)IXoJIfYb+o3C1Xob12-g62
zpbjRbsETK9ox@QM%HEKy@*2bOP#O*mKwXfO;TJACf;_nDw2Jy=xNsB#^WxHINQ#B=
zuc7pytd&#Iu#y^zr&A~@N8`y6gm)WKB&En|J%ZM{<v~S-YcyzKyh};PLZBFif}tU}
z4itrOlT<YU{b79!r<44$(*%VWUgHBKg}3gZ)$)v5XXJ=Xfx}y(l)NG3#mfUQI68X>
zd-DT#tE%w(EBy13zoriVziQs(;%;{HpRWAHYa_?}2OOE@Km5Pa{GW(tCTgW(2E92K
zO8{~x6^9$~@Pgelf~Qq<j*24MHF-S42y&57zNlY`N%&3A0ke&XE^^rI(4~(CRFPJb
zSct%Lkz6l@39h2X>oYWjnTe$d;4oS1H&>2FDk%%qLj_EX6?#C5wstfbin44FbC|M4
zYq7uz5ZE#m#3eg>P?%lFn{w##WCIqv0I)Ec32Kx!C6?acm}&UlpC;U|oY)S)Q9KIM
z3xb1@czkU-K})tvA>70Yhl2@O4OD{j&RWL$x}II39ZN_1<s?pYNuf|Y874d|PO@Mb
zlil_V<6ejJ3@Ax8r4<b;gGvg`1(hb+52-Td31Q<$TtxN`dRc8gZzXD2h_LwY(dsAf
ze(haLp@SxD92%gULzjf{_Cvhv4{!>H$O<D;%)O<kj2XV_Xj<Ob-O+<E>Xu7znOH&&
zOR<y^LaVj&Li}ZLFewj8DY-l;r_#xo;bTZrQ{_@b88jwG6|xwV<8>hwhs)Mf!)G;>
zR6?mtUt=;R=Wsa<gKhkjh%0aaU5;rvHDs)END9Y?4N1dEh@7pGV|*2EFehdLWLHJ{
zjdu}JOjS^MXC*3crBXSjOE;|qQiR<FdDm#y?PzMkH4TPJ2D@MB$8P<{B2H0tfQ9S-
zs%xsMO8UQvcruNDS}h(46h8hn{@TjY_)o->W&Gt0QWSqwy+f&JWGroDm;e2hRh8!P
zpI2Mb|4z)aU`BIi6R{zLQAS;Ti`rV7kh8p^VtG|lMMZOOGg`5v7jNSIULWcqQcp!i
zpo3TiIfqiIL|sM2@bIvAxXK$(4p#JbS8RZa{7{npET_VfH=GJP7djR|8vG+m;f0Q}
z1t}#Jkr#3`L>*BWP|+JU=^(L!$O}7fLD3L}^oSH2OiP3Ef(lv(5u6sl-Nh&=M;e@J
zY6Mg7kSwR1XecQUG>Gt0x=&D}Gy*!NdT&Tooe1Q)1}ALkE8x8Xpv2;)grIo2ye_S*
zZ*Vrnu^1OimG|PzP86bVtQ7RH9)*TL$&hO3>uo8Y549|)pnYD@9}kZ#bT}4-mGwvo
zH#niRgr)r?Mo*cZoS?RMkZ4W|!ZpIqg$txSI_6xcNt6qe=pd3J7*0*?Ln;EDZG)4~
ze{Ui-NPAr&EnHB6o3?|1SSl`D(60<GT!05S9vjpKaX|%3SWrPeXR0DB7<w)o&A5|#
z=|5<}jPh~=+E979h-A2s&nYIvr1i=mwI2j>^b6qQ7YuG1lWAEQCMX@x3f`A(ApFp|
za7jEW1BP%Oo;PFenQ^>zTCd2%&V`-q7ey}4p0yliPN}r&T-ZbY&94mJMZ_X;2~W0W
z_A9?~n8U&T7Wa()$gdQB$9wcxNXAfhYrpd=8^W7mC4~z%(I0u1g6RVDqKW=6lv+^1
zhK(f{Dv3(5v=m|E*G^utkDyRsCf>JE$|4lgD!gR@+gO3FXn_j!w>&GLT1)4`E~>rk
zq*hb8yU%80fUW1k^t8bdobgZu!Mvkwp!RrJj_3_({6s9sco60yc;XJq-k6-KU~EX$
zWeW^FO(TdG%%Kn&0c3h|wvb9np|x_d;($T8H!6rHw!g}`a8Y^?_0lg^sPnE{4Mk1$
zHZAM1uaDwgf3riZ5|U$ZogzgpeG>+cR$=C50+%u|G`8jto;Fko?Ep(|aB{H?GiO}6
zKIk|P&Y4))i&-joVIX-!2rm>V)GtTk!wAnsDFx~^t{exQJE|m#^L~s;{3RB449IdA
z^5C2)L=_XDQBqP~)XVhhf(qS`i{4_VI^cs=sRxk@8@X~lDXZy7O7$+NNDyE_aUYRX
zRqGY*Z4y@Cr0k4rNH`r1qI|>sNyk#C0r?y{xD99{84%1mlc@kz*5gEeHh^5TpB{oX
zw>EZ4+)LChF6Vy8>0!`&lXAl4gm==Cn-&72`<PQN%AuhD?uY#3iyRAks8xC_oIe=G
zy2@EyMgYqT0T6@X*yL~|5IOM2^gZm-aOHM5V6lxLB?i@F5lU8FZWN9q1Z0>Z)}DwY
zle!Xh1ZY>pt<M0QktC{QAR(_ID*?ndD+Ubcg_Hmwc?qFzUJBHeSfEo42Qj!nC=$0X
zKt8C#kq@3<n5gJPXu(}JQgTFDD`z9U*^yK|9Q*iZ52or#_dwnwKlrE03hi4oo|I_@
z_*kJA6kvc!!|F%F@pL3i=R-Ci_9G`xlpg5sO7gp${Vr$Ug;qM^c=%F7Shk|Gasv^v
zQdE}?*5mZxER68v4ap=^D4xWVF%ge}(pZ~S$hAO@E^NY*Enau!WV4i#7F6IAH?Bb?
zHTBDKjQf#!QDa1nL$d53ty6_Fnd^$GF##kEz~LR|3&2kpg))?Y$pEg!5mpA6eBnil
z(g1ZBiQEK{>pcx1AW6-J%M!Q9%q=JwhOxGVgjQ*XlDXMhr0G@;WttppMPQULB(108
zo6iK9tItlmc`{d+pf+=+5tHo@CQIY&?5DFMt;)c&U@{Cy5m?6YFHCDlawH;BNFItu
z!pvG$Bv3EvNhcDRCDF+^%xeX{17uI;z9SxsjOY^;cP<`Mh_yXgk)ch}0otZ^3XNy5
zHpLyVnNlg-O4bR0@?mM(Co;S-RSC<+TouM_`7plaz+#~9%vv7$3p3s{m&bMbDg)#d
zH8db6>46i#i0KC~<(T{^e5z?8^vjqOm3TU-PeBfgx9}+=Od9L7;8Vl+i%if$8AYxR
zXXyh_IYkKU4KY3hI?o82eJ#cZgaM(dVlV)aL^G^{c=_QI8yCiM1gu_&&3J7}CBZI4
zRzb*MbrP&$+8oqmRFk~UrE(^$o4yhygh`H<`r~P;<VjezBkQGz5|%K+xqdA)B!|`>
zkWMNMbl;74gG8xA6gXCOTq_1grL~k(Wt`7R6+p`%O;_#BaH1g@oLU>4RemStG~v`x
zgLD3TC#qOT_b3Slp&G?Rf`1cR7lVqJn7q_5gTAVY$|~gZ)%o`alb4W`gcH~ZvwFdM
z9a;^k){G>I5PJmbsxtnaD$^DarQ1SOI?OEa$)f+)RW4&}BbWZ)Uu%y4GtXbT|94`Z
zlKy`R>;H9yQ+@{l1?m4a1zqU~Kv1Gmtv`Dyss2l<|GYH!{SXWT6E0|`>95ItX29z*
zNO(>`oh+4(55APg2Rgfg%5|2-j}MFv19l6KDs2$gRm{N}S3q5vybBz5l|+<&x){+a
z7+1!XP($Dm?TEkt&_Gg_5d<w5hP@l8MABUUtHQ=N12!W%HXV|x*{iZ9MC@>;3|Tp2
z=9p<p<4sOXH=)Jw5T80PYE7YGTyK~KQV5fEtsn0;x$!Ikl{M=jFQ88)ip&(TCB>+6
z5QAY4T8{Z4_+7a0M$1>RqRUP4Gn-(lBck}I#7+C`I-#!;&<%a1unaMa`4*C5p!nj&
zc*qmXwJk%JWBP*Qmr7Ve3*;gQhhShBMFVIgo+exFG%WpgH4{^F1@j`Y6;j(G_JvRg
zHAe2nTXjrisL~;6C}Xzje1PHuNb4%=<3K!(k;xS0985$&v_Yh{Y(l%*(n--6j&Q|<
zmWxVL;glv!u&_#$Of;zitvaCMpmeMPHqvYGgii5-Va_59ybid86qXV|C8;<Xjwjc`
z#L7fohH~jdSYqV_nsJz!5(WadodtZ1Z~^?vs)}|gSqS`CsDl}i9vo0Gg)e~P$%S|&
zSx`ZK(ZdM5jzsaY8<D9F3(qc=Z$rYX=N%2~egSr0EysOLL9k<KKQ_ohno!GirC*6C
zsS$BTuGbpfzs5U%6rhSou4tA+0B5xkPE?V-3baUuLmRE0>Waohay0ccMiN6}MSdTL
zsLEOsPKcOik0?IE1QJC^3oGJ$+`<<Q$FnTC){Ajou^}3%po<0<R?Lfr1J3-y7y(K|
z<-ToAsIjXRB`CKbFu`<yFH$n4gd+Cq6K;#NnMn6nNEQD5_us$5w?A!NP@Eh9oTI_-
zT<Gj0`xyd}6F{<Czd*90nn!58prsXe!Hz*`QZ{7LByEmdaWv`rq$-0k>Lu45@0XJp
z53O=Ctx6Fks)mL}Jg6}iPR^F4P&y^oJDRvw57<j@JUUyVA5^qBt*DY3k4SJP0!NM9
zBET37&M`a${&}GKRbe^7Gl#|2qviw}MyTHhzzCBZ0CZ#kP!lX*!zhD_p7#q1+2NFE
zp9wmTip3MK&NvqyB#j{4yNF8VY@5MiYdKN716*)as>YKPHoIm9r2eE5l8Eb!L}<s`
zkLB_fjx_QWHPg>zOu^owrL`l_WjnHbCqzb;?}qru0-2Lj7$t@oQk1#P5E6F?+XN+&
ziq}Dw@{Z2(p039B^4=wl9ZP!-w9y@~1`*wgdL29vBw4bD<p}POJVV3NO1zfCk}AOg
za1s;D5L2!*99?@nQ~&=jD#@)<C?QFTkdOOyN>K?>?zbYzom__5R)pkM$~7#h$o)RI
zZRCEP`+bIC7@HXzn{7Ye-#_PZ{yFDy9*^_7KA*4m^To07^Qpy(g`LIs&o?gj$hzoD
z+?SlS-f}qYv8&>25|<C3R^9t1>B}FiYd%5nj(f9F+(2SBf9myoI&N(_G5-A1{9kE#
zW;**Qh6vLhx_U~*var@(WOk0VZh6(Oqh_(-=<@Ff*I+_>Sg4@WcP#mjKW;oMZ&ZL$
z9+mm3(O)K*N0pEFs=rT4$O>o{9#YBmupBcomOO1!{-JwS`GkG*^%H?caY6sxeeyTJ
z#{w`vjg$9!b;A44y?|8W#N9>H{<tF*(0gqZ4gcDBZF+AUIA2hWb}sB#;OjfrIKLdb
zw;LKPwyE`Gz4urgInQ%LAhy2#Znn8lW|sW4XS8@n<T)>y!4KgN74F$KPyUFFeR|`B
zNf5SIHTVVgQG(poWwC_ckGz^+b-akAeC}}cc@-OX|9RA<n)6Z+{<t83LiE1?8*oP4
zAB0}d>uEJ&)FbPO-naiu&Cg4Eij+-7=AJ9yFE^O|Y@nc;cm1Nt#kNMyvx4~=We}Nf
zDW3#It>@*J#IJT3YKR@XR8cwUqWu2u^}SPH#%k+TqInZ+8~RQq9`DF{R`?I#?cHs_
zd%j0F_@m7spDf}1L$RRJW8)VRYyLSJ{yJf3ca2-9O3Ug6?}hr(Q{}@dF}&hu9X!q}
ztsje2J1*WJcs%ok6K7q}xj0#Y<8Mt2P8t05DB!)U9D7&Nt+>lY<$Rjt9|i3vFZ0h$
z{7sbur(D&#A+#}R+8^UP@pZ^zr6NkkL?o^we)kJ0<?HnfZXc1)@85U)yU?<gm!Eix
z<Jb7zX@eMnPFvF=a)#8rK;*4B^n=gF9$eP08m@v*zVYn`ea49|N4|VZtvGM0?s5IL
zaXaP&l5Cd!?Ft8U`*hpDEk2yp%fjoX2JbGWekqA<Sr536d+GL~J?ai;l<$|gLjJI)
zHt&lVN{pSWsr{z<+M0pI@1~BDZ*$!F4`F;FKl1T!U;O4fZK8DHOGs?&6yGsBvkT)&
zpH0vEU9>p$wc)aie9D7ww=%ev&feo|Jhd2nTHqOh_x{a2*Ph|Wli$8B1Uy`e>U#t^
z9dVQHCJq;jtT8B5n~=L2!Fw`I*X7o~DcqyWw+6=SUn<<@{*gPFHouaHIX*VSslIUA
z%ZFb@%H34}0t_Ge--^i`Fyb_R?FejhjMK7z>e}_VrlvN3nsYIwkyBT<uv)aX4p>`z
zDogj{e9F*FrHK5$6)i20xxE+2OR=m5E_gSpq-f%p!sOB$fgpAH*7C%7yIDJsb@)?b
zFF&ra=}0-B`;LhiM5zhbClM3Mp23Vy3$_fXYio5s(8JWH9{X^tV-v-x9?j9W&9h-U
zGBshC<+<551QguQ(rU5_fh#zT#HR(-sd6=fuEcYQ{P$Mzl*buh(cjX_T1-@y=>L{<
zJp60wV65KL`NJN0T|dPilqi<edE@*;QQU_UiCyL5bA3do(zP9{dfmU3O|@KSM@BGl
z#auy4=igQHf9#n#_oMb$(U+I^{e?nF1n#v86|T#({*JoGj+^>#_kT4MY}E8gdr&K6
z{$X&^Bn@0xRaI71H;88xW!ygEc9qD`exIY`s(a%$OYBLj|ECL&V9}%gJcU*Mi!JxR
z+ar~=-k-b5YsHVVP>;MjyslflX?a)?2~K^P@TIu48e`%E`ublW<d?lq^W78T0|+Ux
zzmf^x?s~e4oMM}v=NgaCxa9rn#J7Ye<9QZv_o|D;bjiX^<PXR8F)oIGv#62m@E03C
zpCi?sv>cJj>o~&2k6m&d{hk-^;5WTxW~94*JaPERcQhTloKjDa$J}kZnDRn`v(xB4
z<*t^2PBMbO3^4-sTwgg~k#BVlcKwv-eZ|bY{`2PF6-u6UziMd%y9SWHomC(H@5be*
zy8AuHJo0~DbFq?2;119iZhQyt6p`fLc*J+=sP53`d7`*>|HkS1rMuOJCz>qeDetZs
z{nPo>SV_6%F*N5^w3Hv>_=Eg`F7i24|M>B}Zwq^A+xzDpT?N@&$fnl#B{WJu6QD}k
zzTx|HHahu}L(%Q2@qsavhOj3JKcw~C)^&>*{zC}d=ygYQmYeU^mpgwVe%_ZJdK1&W
zP@N3_I`U9+>YsTRbN}6`Vl}&8XI6!=0(Ro}Bh{jIzC5@o>1pHnD4NTuU5@A0kFzVu
zrqa*VZ#|9v5%h1oFv$C3K*WE1UYuJpD+Vpki-J-vl23m07@Jqhvx*CU{pIzJh<=AY
zJm{3NdSFYk{!%CTdS~=wi{N9Ck`pa<VJA5FR9gJrc3o{g7XdQ&%dQWX(R5Ne<JkL7
z>W0A_G{FTPOXq%ZT;jfnIQF>pBiW~W0g^&d5&mM-sJ^jZ@2s_&gF-F}6~!4A=9MU6
zMO0sDm~-0Ip80%rFZT2D5!6A?d05oWw$eH-J!jx_`F`x;?ZAiGrw%!hrM9l8qwcy^
zEsx3)Wq1^RRo>IV&G{NkaYY(zjGA5e>fPN__W09Ttt5A^k7`xs_HNeaih|0Nu6s%_
zKNG(lnkMhrOEaxJXnZL>_)cCJbF<opa)T-3HI?vMk|HZ(`a5+&aX(6O`>s)hNa6E%
zT@LqW+k=0!5)}sx0{mlIkgJ`!FF!i)KfXnXS$XAoqO`5OieIo#>&b1x&B`|~^{%Vx
z9OL#cy7yD=Y1PZWDpOpgF~eV8uI;_xU$x<X@Pp%%pKeIw$Ms&`_AiNV)ut1)d<+Q9
z@-Nq-K2@f?SKIk96>NJmBuDpAnd^n`>&p34!I?MfKD`{uHC(T->-lCh_Ia{T$>(o;
zPut4b!T1LqttmpkmXz|jv*z+X8UK#TS^YS-BUe`Vnr{8`R~b`Q?r4uxz3%ibJ5ta8
ziO=#78(mzagk`Ii|LL_pqP^P#?^$;(ZHa+e59g7=j{?<Mw5DzBt~?oAH!i_)nW-VQ
z+kF=Wsq2s@8l>dH(*WdH;7s~l05xD`a;q6aaO_o}X((z?V`ER2A;@uU<w2Nj`X@^~
zEVvhBWXPpx!p4Hj+^|+5OzJadpyPFQXmwbzYk8A<-R>qD1zkv@Wz)vA3-rSLCR1KT
zz}KN*c7B&S0<%5*Y(rThhZfeRZQq}PTroE>lAy90u*_@V=V&0B@e3R;<&+B_D0bJK
zhj*lPT}gWwqzmdWuy+VtNsGPmw%ZvEScqRR=<;!>CLFD?x7AL~VK1Ns8ka|tzNUe#
znJ$A)AQD3DGLs5NAxP`SLJAHVY<p|0zk!M6_$2}4`JJ4DS?plBHf;k~B)}#prkTt(
zny0NK&xeH!UZU~y^3H`5j*h8sX3wmd%Ba9V#D>0dCng#z;2by?F#7~R9ZiyRn#YaP
z<&mH148_Lf6rZFAl+^*k`g*3?78=T;%$l(wv>YH(FM?#M?aS;Wlsf~Ndko_9kpB1X
zgYi)JnVKBa{YgH6{n{)z-6OG}bi0{JorRZz0%kF$Gkd?9s8hZRUyNtVk@Srm(|QWI
zE0!I)srH6`Z7x&rUn(e<(vqk?S3yb|Ein0x+^Z}HQvjmA4JDMrYP1&NyNn76j)iFF
zY%`naT#lp==X2BktH)CZ0aw(v2+jgqL8K(C_I?gdq7mHJpn;xikdQb)O-dkkC};q{
zcbFoOtxQ@ob8gz4NR-F{4{DO3hlZCg(-$QKnpV2aLbB9+T7lx5D7Ev6W#8HIyy>`l
zqt`3~!c07L;k~ePL;yYqSf)c@HIZ_0A@KQM&4=@ja@JPQEfJOY<awljXBZo?H5X{D
z=Et1iq^Rx1=FUT!%7T`dU3E;9sPFzllt7X;v3?6UwOD1WxP@FI0S<Z;P>%a1T>;h(
z0Ubj2-j&!YXTMNdwEpdoy#qV|WWMlA9UES}G-Mw$QHBBGbKss4YcoR_X5J7n_oDEA
z5`F7seNyQk6Hr8hz@+e*=s|5#^9G_0ut$_b$2kl)v9`vOiQ;oBQ39q&7kXd$EyDa^
zSGnH&P#E5+=l$=|L8!lzn;WewolT#lu@BI*rr%dJ%Ao$+`v6_G;z`_Y-K?+n!SYuD
zz5RtIVq<Y-<uHlH2Cc%8<l1L`0RJO9H3htVxeZHKC5GaUWJ%9W<#|vq?F9#0bNK;Q
z%2+WcdBmH-2U2r!;$O;Ofv(H*STQhz%CdEzYufn(hfVDd%HSurv_x1CwEEZCdBg({
zh><-=xfUzI!nr$xC<EKIax7+RYF~MSjKg{WR}`8>PKGwa7f<WlpNBya0bLkVEnk$>
zpr?JvS{_>G=wp-h=%W-gHZPz{Fe`Z<jUpmE$4#JsHS>gD?rO+D!e6dKKjb7M@hh=W
z%C2s*0LD5<0_g6*rCXDvk{*^rHhu#qb09y<i$HzOAt-7A4rmiTbQeG=3uEq0ilHIw
zp0sKAX6m3eW3vIzs;!k54$+10Bdo>S(W=&td#y$iVr<i;)o~LO6K!8i%^UOoGE0if
zk1Q|&C&Uzd)+?1B?2<CoNd6#b+A=n@sk0Ai$_B4yN<gX8V6KP@>{X)_zvKo$Y13Y&
zGJ1|&q$=u%48f!n0H=cCdtVCBdbByTB7%sP1AH=N9DoH5R}?{8wUd(S9fOF?RIgPv
zQvmg&RMP%nB%gpT!@I**Mr<1kRhM^c+{HyDYb=f8b3sJ33<>diZ$l<G;y>1ypQs{e
zc`06T-epD{OP_#Kr*M%9ld%$z`Yz_|78PBP8@|ylXm+@auomLtpb?w5_S#4~n84|<
zUies>0F+W^Vhpt1-<G!jxqkH2K54}7a5Kf&iQY;D0pOE$@@0;!ojrP~s04U-_^8!}
zQa7j30QR9$*Olsjltn<f#1#lW^D>Hk096064uepqRprXr6bXKNtMbkIJwEmM`dNi0
zZ(5?CchlYk$|;Olm&{iH$Os{t_q_&GHF`~$3OnV^LE89eN7JW3nsH8!z<dRjJYH-K
z2pn@C{?bL$qee=w_qzlDhui!-09IQL&{x-ICdnRl^aH>>A<k^A+{{2Z*~m$%1aQ=(
zEmk~yZDSl&zZfH07LCVr$6=>K2!{Q3Ay_6J2BEJ@u%|SBj!BSN+_eHwpP83`=lNhr
zC^L#HJA9R$b{K(`$qif0Y$72y=>&A>iv_bbQ6U}5T56w}7P&oMq45nB3}_%p_dg?Q
zdC-8l&Fig3;ti}uLSs$=KxG#S*l(>9!N3&`mfq#CLZ_f?2G-5GoVA?etd-J(@YUFB
zqoDTpsxGo4YC$|IOf(RSpl}1{q0rfAM|SA$@NTRhi?Tav27p6E^7G{D9F2|p0-=!Q
zT#!R>uu(I4%5t$6s>j+lv33~N@{(C;cBMrS{e+>eFSmc1@XUvM?QJR->7lm1$rQtN
zR%>8~%Y*4D7mK0aLs>~ar?{LCCQ<(ap;|yLXGhGOSOGg^Z@fzkIB6E+hgeBlx5tu)
zJj_(GoAJ^px~2a?E4Xi!wf!TxjNZ{B1BcgQ*t?`yC3VnYktId10aUS5^4-Nud%K!R
z#VdH1wO5g2pa3{Md)%)X(k^Z71Zh9lq%zqbK{tZ#w@H|4u3Sjy#ph~o;*z&7R}QGn
zI=t<X4n5<-vEN5pWo|FxhF2!rp<qIT8EY$fXD<-49mQufKapViU2Ur(Ph#RZwqfTp
z!m4zx8p-1QO>YlG>k`@~fdRjoko#={-^GM=Bl^?O9m^9Ff(p&s2Qt1kj6)?KBk{0h
z$ylA?uogTUP7NRdO_>L_?ifbIPc>HmcQgRHIPMrb-#F^qBw$Uf{6jeuV6$jj$jUYl
z7q)KspROKrc>xCUn_47nglO|>n_<gVa|6vZ7UO6fQ1Z9}WuRdjL}2-om!6^R?^KN{
zG#xU@T_hrk+Sv_IQe@23a4N~PRxivRx#v+#2Ce^{-KxingLL*Mr*xs3OY?0OUZ^Qh
z!8$vXSb-yXL);k%XUI-mwW1CkBUgSfsK;aNygh;&37*s)ouIP9dU7pio7pS|s(G_&
z7R&HrIv=Hg2f{4IILc9nZSUtCJgVHYM}X&qw93P87Zw&~sCrGzH6*1&!i=jaNX7(<
zbbvE!UP;54zCrFLI0yNHM%40H1(1kNFE0teQe^d^5t9+QmXFe+??H8|UJvLo(15Lx
z0v6Ic-c0XcdA$Hu=FDEL@jxS}-EOmfD5h`IR+?!6`EmSYZ>F{>*0Z?ueAkta!$^AC
zMHoOg;t_}eFM^>K2aTX~7)qXn(}rV_%Te7(y!BjY8y?W)H_2mayU3;!p@<!8GnF~|
zdcHalJXDgyy3`O5jn@WkRxUEF*)c{g_?(b%%7A*g-tI&-T95I0r7zj<poZ~Doz3W(
z+t()T2BE<0TO>avpPTe8D2tWfI>?27`ppra8%kZrCSYjQK2CnDy-fUsU#;<$x!Ixj
z4EKNlfVpe$hdhX<41ySYlThHYOpnLtof?r)ngaBIj5G!|Z?@_}g7)w*1iUY{Kp;0_
zZn8XMGypG<R1Rb>FRUaxLq?4x<Td;{;w7LAd%#gLLx=oDxR%4fw7p3IEES|YSPyL4
zsuL~JW9aX05XvRAL+53T#A`#gX7cj#?k}mwqCz%$+$0cS!aP=!w6Wl2Z^EGQ0L3O4
zv?j>TS9-i+$f0NX(fh@90C#FA!nEAVkn|{O*qaWaRCgwQr_ULIt1o9WHo?fijqK6%
z7v`&3a%J_jT+n&KB>Zq`<P&qge)|g-x|s1}3we%|b;(_2X+F1RwxNmyOc&oi=u*^6
zhv3pSzUpb_2bz=Qt&=vx@szkJW%%4IbnAhz^P%0w$NXfya3)=V)PRqjbP(*)*=SEs
zGXd1$=A`r@XvE|!#m2BT5@7#pP%m)e7mU%?Ml?c&ZDc3a*(ZhLhraSRP)prs1RkQ9
zosYmUr)KJ~5BVp2i^fmfVovfX9`4tS@@pUZ8{v{hlXDnR2H6D#;yNT+`C%=o9Irar
z>`&bGO?P@bIS*ozwt0>QWau5JWVW|ymzhEkwqmamssmnyq!ZJFnu#o;BQq3(1Rms$
zWcnz&`T}>7At$~Pj+|wMN5X*sWpT}-L5%7Be3@F^#&SxMnG<B;{q~W`l+Dc0hu!ds
zL19=TbEsj<%DOy!CCVtB1niT~m4D4d-~|-t!5ex!$#bshjx5E4k-Jh1-|>3fvss7T
zZZ8yfc6H(J6<ja@f(%;kq|xj{D9Mm&moC==$6?U=PmiuEfw=DOqMe<-GNO)u*L-e~
zGL*iC0yx2Sc9#rjPq6NU&RQ?@{xYICd(b(XjFXBjl4DoliRun<uVDcbn)urfwDm$v
z?uaLo{HObXq`=)|Q;nC7vg3?J*K((%*J$MaB+3aAv@!{){-;iB7fo&q4($<uYc+H@
z?-l$`*V!FPnw+a=sS7)7PZUT*g!ih?L)d@h;R(&m&EaIgUTLwDHW_Fj;5R!lK^+^|
zAk$)?@1_}QvpV#B+)-v^=urf@a)bYoxqb?oB5UC^5@au_1yzw9GTSv6E3s}q_@Ds$
z%y#e8>*ujd-|`3X$Y_E+a_1fK_xKkQI)f$mM4yH^lHM=14xK>l<G+&s!@bd3ONrgU
za&!6V{(|7;g#3aX*fDt0R8z_3PUEO^1o@iINpZ+>uQ6=H8^o>)R<`Gi;!IU`A8hB@
zQb!#O<h8jsAM_p=Ib%Zi-fOd5oDQ4+7nq8Qe<Bb7O|oM7Tp%4|?I6h}CiErkcL4_H
zg5fsXos7O^J|1M?pa(j~-x`G@>{Y{b>0g&qrm;<HKl3F2S8jz-x<Tnq!Q=KM8itis
zOgdv@0-A+8g!i<W>DFE@_iW0AlA_3FzHAp1%6a5)O@f3a#(O0tAsNKlzWJNj0D|H?
zY7>iP%+M4-8}aNp+P`PT?l1(G5YRbn`|yReu$F6Qlp=ad+yB+86Mej&-gX3o*<nj@
zGQQ1~A(I7Y22KJCCiLuk5fn7=n+OPWN<!Ehx;Bx>PLe=utZpMF9q0p>M%e*d{T=Ex
z&dm5eMbzQHBWKzjl_KhF{csd$-uKI39^w%+Qw;uCbG>4{R}%&qxT$9Ex3$qa%LfPT
zkD`g<I@{{$X6#1#SfaoQ=ZFZ*p?dk6?Ih*(G(ZY{xHtEmMaBB|izRDq6c(2?x~~F}
z*ta**bc|S(zT$FLCmAXW*iGZ3u|l!fxdxgO$PtJMmOxUx3n;sezS@+MR6Ki`X$0AA
z!ypqIx(2Zjg7r>`y10Gd(MqLQtbgZv0b31$h1MZoMi)%rweP$=Y?Zjeh{7df1Dn!<
z8eh+nQcYlbh?33KJ-?j9^r;8&NeCP^Z|GY8O?6+L{etA2y;x}O-dNk@mXx#5)N3}=
zED2ksKu@REdI57w^%yMma?$#QAMw7(u;p$kHe=9Sf+?<8gQAa@hvbgF|1JIGV;~B$
z%P1$#`48!hA{lF`W^624*z|kIO4WDgP`G;-t=Adm&tUu7R5sW8;ouPvc57c6^B|Sx
z6tNiXSO?zA0go*X2BIU@y3K@q4hap$>Jj9Fn!xWs3>jO%+OY1b$G@BatunuxYPwDI
z2s43`ZK#%ebKbYx*(>SVPZ({rd0Tp2J|^Fl@c@A5G_Xs$Ai`_eND=x@-QG(AMgNpc
zGBz4S;t!w_d*tYNUpwGF(AlgUl~){69E?_^FKB+7!?zwG1Xuc;P;6#V>L?O{4fJD;
z1`veV4BswJw$3J<j?<&tFT+r+=tOn?=d9gtcnj-=;Kep!Gv;nQ8lFMjn8k+GlmiE{
zq7=%s>1th#QNXFjfLO7R3~=W~)V$Ad6)B`4BonzeBv_6O=!%snL(w;u$7e~61d<i9
zrpXl>G$RG{ofC;zPtDYxtN4-klDyObWQV0Mmcx()gQIFbh7D;hqklo9Ia8**s&gZj
z5MD{h#qkPUI_kh=wAT@C<^1-rD{!CzuLpiPN(R`j8!{aIr`@_Fg5m<pF{aJMj5&38
zW@!n6DGXo*Y?cc9nL30%q&J}?^zb+-lyg(tktsHi7C03%>lT0iR!w&p+1{`Ri0Z6n
z&93TExBE~?>Tcjs;5`{kb8a|HYBFOo4S<eyT@$m16$jUDhgxYjiUU-F))BN)geGDa
zku&G60--J%3p+6qyJVfSiJ?S<S+f&qNI`fmVCa3TZD4L<DTYz04$E!W*XHuxCobx;
z!DJ$c+WvNYKphs0H5N01vN@W$S*TsnzM`T!*8I7yE1|>NAYgM^1{-TsUQ)l*15P$5
z+ksQrD$G8NT-{bN>;Q9w9??qF{od$EQ{9^r=~gOL5!>I=ogu86(dS*3v!snVpLOA*
z7;)R_oO3B)DvZu{4DGiJo;3l4Ojo(F!{{{k!>#uu2S&Rj0-HImMMx6B(y=H&=#fXw
zG8aUH1EKpY20VMe4a<66LCM3jcbjqf&P;9!@gh5vHm@n+I1@&Qrm;xTO@9;_`zz_r
zoe6|5!1*`ROYgZ9*yEDM>AB=3OdcLvA4)!;!KzkjJPPEwU1Ne<*jCxWtHrZ`hJjv7
z{FPM$dv&TagWxskm~?5^8A5ND6M$HON4C<vtJ&`9PT}jNa4jP0O_yV%RXK#RlFl_z
zhN$xGSZXR@IEAq=+E5}mXpa<5o}lhZBeR-VyNOMt&E!G*pv7G0LlzMAox!T%;h%Bo
zDrJJat-~gg6<`zod-z!PrDXJu7n0qMAt5NM{a!-E<c`%1cYa6^eZ;u2d`*{ZrmThC
z*x$|;5XgWWc1TH38w9e!h6HKMc!3Tb4=B*f1`=)==(<xI1$H+lYH&3BI-A|YjRJmJ
zxtNygGZ;=l5!pm*wh6qc;YUsc$&UW<)4WsB8Zc=<^8*gl7S|QA@NzxhB~al5^NehE
z`zL2H7BiRv4H!_p=uX;kSfb<Mkd0xO@4=wBA_9c3HljK#Yf=uuBQObbC7&6<HFUOR
z@DkCQNuLBX-lEU{l|jIl;00oOLp!l;{5oDu2<kMmva1Zl$XxrE@5dl>_9^JSB47G0
zl*`@(uqwOeL6fK;QE?I<J29g9dyx~H%p)V;8jP^5E9OiGM)+(Ey=3f(hYsCEJBl{$
zuo%fHv!+ZOux*mLrPY8#!nW84Y`w<qd5~WttI<Hwa~79DV!4b0Ru2ix)bF`0(m>Oe
zRdCyIVtIrY%Wodau02pkDO$6(&Ct;8;lCu`wW9=(g`+=HWUipoZ|gGuyRLg7Oo&uJ
zyqmO`gKc7_cz{UE?*5KGV(7tCyrLeJf=)u#FsPzzzt)x+bXnt4EleVK%q>|bVjdP!
z${73$LxnMo)19Fk-}AmoM7WW3sc%4dzwYSQgU$Ot<&6d%mEEa#Cnf6FrZ9eCw1sIb
zXftbek}VTK`C{)k9=h-+CQ$<62<^C-gPwE_UA$F>7O3B!pB>b6xBTw_Mni*fx#iaU
zVh3$Z0_c<#)4LpxwP`ZhmI2sf574ge{h49pI`~VAX%L!60D7KB=*Z~8`d<zg^EY|-
zX(Lx>R@$|fNlohB*$0Cd)IL2@iUlDVC&~Zu*{|5D-AjZyRE(BN0{6ahv3E0g{=5uO
zsw`O6*eIOW25%_Qu<R(tEK*UTF`^+089Ly{A3++(L?i+j(`cax_gK^bl8{M>xhL5r
z55>49w^@~kG+?@#cP5L&=T8@I^kaZ*mJ{d-sFhpho7iO4$}X6_t)bJz-uk^&hw+>(
zACKiygm|$;vGbnATZ4(Jj@0FIQgTor#WtCDYp1r{F{l*fTC8cL$UG2KMk8@!&rCJ_
zSdEY;PN)V3wADBZpn)F`T<MS(kf87R4C*kV#gJQ}^oc+%g-im%ceP(i?EP1PQcXsY
z^0vZpf#Jq=Z2dmn&u|73G&q~?P^EU>W7fSD;F*lv8iwZJ!n~vCP8@8MN3on=gInlY
zY+pJw=w-=9W&z9>^$RrFsLp~+q?ze5TmDEvnRHQhgbP`kF<1)1<LAMo7VQ>mXV7wU
zQ7eUiYWr!9Lm+9?%hdOvYt&34%mq^>0HCiKqjiC;eo3B<c8%3gM-Zb&hUGDgdcDQy
zDaI7!I9>vfqOn^9P+{E;003o1V^M)aFycPp#eQ0B$_iQ7p4y-sbSevCo-QY(O(rA}
z>e`!@;Yaw7pC60*m$2*#0UjQ5)tNGh%i4NPBzG99V)Pa?oJ9eeVOA9tVN`gle4XB(
zh;e9B-Mr@!BJFEa@ghARMJE1{PYxqC;KjrDr@D`7Lgo)a$hYv#4`PgaizM1@&~}Y9
z78<-(rbwl)7s%8~)KC*8v>?ziMqahqEZJ*ZB0D_PS}Uwi9-ciNvc4$btL!ra9PUC(
zKu7p|3N&9cHTL`7x0yLO&8qJNxUkmK*#?^HfAhsdSDX8=*}&1nT82y;gSEm`hq0KS
z645N?4&qnnq1clO^*R425UQg`*vUJTzP?k9)&!3Z3!tnR)3L&Ohf{di12%JpwXy=G
z4~%ShjG9i%>~A@a5?CV=t)qL%SOyLnp<6KS95l+OYOIY^g5v0t?$M2=Ai{436|(V{
zt@|Idqy4T78$aiKd%B6r>auRmiMTltIIcR$EAthDCN&h|K1zu*H*>5Vj97%dHdxqx
z<HBgQFJp6y3$mM!VLMU~Uhad9f$_83S=H?BU=(sCZKWEL(8CKw;tCk0nQDAMilP^U
zy;0*aK8~6Wdewzc9GoJnZ*9SJp%Wu=;YTs?Y0$JQ4Z)<g+WV3_jdyGdbm0U&(v?7K
zwx6|Mz&#3(p~qSvOCSPgAy^i*%!li6{eXd{Z<#?NiOrO0tN^U>)kK{$V+P`kTBy#2
z%}ql)4$!h)jzS`ht4;5}I{9iWG2J0=)7{x(aO83d(oZ#l-d8+NH#ma>b>%oau%}~-
z#Shko7-jV?XlX8Rc*n`uoInEJXp)8f!uDWdP0%dTw!EoF!+x3+Ad~#>r?S9(3F!VS
zoeO7tYFEr$Vs)rtaEfRbl(k&lS9V5Rj2X15#Kl_6Omf3&6uj)*vSxdhUz|j4{~Op4
zO&?^etH!2@ZBLi8!FcZUJytIh3qyv?s`>#C)DK@F?0DGLL|6c$0j>v|TU}FBL&iks
zyYe5Rjo|FVLfQ<Q)NTeq;ddQlA!?i?Em2?u8xti_3SjRN+y^os-K8*M5S99+I{5$x
zBr(FkKf)kj<|UHvb~dFYH62A?Ks=^+G0j*nFQ>`VX0}$WVcOe+Z4of2c*=^sk)gN-
zu80Ag_h^k*)Y)rcj-r@b1!=6q?P)Xdr{^M?fE|7)@Rke!p&nt2KS*c!yz$-Qvq$LB
zD)REA%N!NLX~Y7FvSw-Wp{=^yq%%TyzW#8x0EOC{7*)?j&1n0r_6uVh*QecvyA&a-
zo9&Ikq+ENz;m~*YKV!1D5lw12HM{vz0EdP>r%-6ZWCNZJL&ymv7j;uVF5R*2I(gE1
z`+UIK2U8Bo<2NMl-s8A$pnvaza5o_cYpM{`2%^v5;Ew<An(xP65XUK|e(trUn1xTG
zvQi4~&eT^*(H*8vNq*|n2@M|n+X(knyskG)7VVMvJZBHz82elF44+*@(e6?#-#0iI
z!dVSGcE47C<LT~htJ16!@(u0-CUND#1F%B3E`=V63{+@>H1D*J{C*-sS`86Sg@av|
zHzo_VW~v!Xy-Z}nah}zEuww{|`3o39!sdQSy+}SVy*U*^Oo-w9oi`xij)EM%cl6Q5
zkVk62>M=K09`qgo0XB@yeAh-3g>39^uSp;tqeQH!p4~bvLB~^|mnQMVMA|A09<fxF
z8%TWRMU8C3@)Z@n0pL@6Sfb_6V|>d(_cn%TU-@}G8n>>4SAY!bTI}wV@L^3f2IyRD
zRhmTyU(#SiO_Wkg#dbG>V-wIJX3e|P6dtEJ1Z3^g%h-SUhKb=oCzSRdGjxx_Ot7sj
zTrH}p<~wwT%ie5%zd6T?M6znwKTs@i`*UR;FdIDCIPG_kCU36>B+e<8HxZXCm8nVw
z2LyVYrR6O@;4PhjInV%CAcc@S6JkZ$ds3B-0a4h#u(#w<kMDK9VmafXJ11##6U0hm
zrvr4n0;VAl4?-{seQ3UVG7<iyl1@$;1wEVz_7jNYsJu8UD750kZE3BTJs#u`&e+lp
zxt+7mWQ9$N+0})v?Ixk`$fI8TQy%TjmDf8AdErq{8C9hE*aQ;)f{2RQJN>)<U}oUx
zpVDwRcG2kQM@Jat6)+|sfBO1EYbZrHx*v4Kk4NZs_iUA$VGh*_hXD$J%1jD$qjGa;
z1ymoio7sR8@^caw5aY&j#q}4<VIAS%u{1GuzG_4h2#56F8?~P`0WnMZhoR+mRqN9{
zScKGo`gSV=a5D&_O5XlOk`ve}S2EiDe#diQ1FW7CJ_@LlSG;Vg3)=trCv_Cvheo4C
z;Y}ctoSLrxL`z%mEA&@KXFU~sIY33XA<v^(yxwQjIE=xs0I2=PUN9&XHFj4T08v(j
zz0~()FVARgA*4%T?!9(!-~aI~ZaIed+VwjjMx)l_<D}g^g@eElaMz)2wN;hR*GjLp
zE>&=ue{ItWxpyT;D>(cx7X9C+ej^!W+^g};{^q$kfOF9BVL3Y->p_Wq0NET@X8(>Q
zHTjKI^UxyBBN+p&qM4VQ2>INujEjI8IxKqqwcB?;e(@6Ofnm~>OH=fvRQq0}9;H*1
zK%j;ID%eG)C*LPqg=A|5Z@3{9))9Ion85KN>ZNB{PEA{Xaf5)Bc({9rsBZYKR63xp
zY&j+buG9Dsy7sp~NN)|gM4kogS4=jV0Gz5MBZww)dh`B`xriY0l3$r$;0vqHQ7)RI
zyj|VOH}TZ3H%uC-GwJ};L0{(sP7(w+YKAO>g)ha-v52-`+$PbaIS;2*>`pxT4QQ$5
zy-dhj#RxnIc_gs9o?Fs6pI0it>s+&*Idi<v%N}i0NBpH(d`i)VHscj7W4ey=XI_jq
z0@QgNWH<@TV;i>i|0tTl>K3+VY+0Mx*@xU%V(vVMFmPmQes8k15jit2?N$r%SZ5Tg
zrzPfhzlc}Ft2&g=EMeM02W)}KNF{z^*(Nrj0NW3aG@m|Mga;81H;T){wJzw);c5g~
z8nqQ3b~ByCbZXOf`z>pv4eHh6zYVW)@WJdO=WONRL=?82G?h>Ss0SMRUcD2@66Qqf
z?Y14HGs%B0{=IZ589)^oEuAcLWE?TwI$`d#L%I3?aT9uAtzt&ck@);Tds7y_xWjO8
zhqkq)s^h4Zx}x7qDcpCiCe8yXHc~EYR}XpJWlYa)z5N%?ALe&+Gosgo_C)Mij@$Db
z_T%yMYVH|Kr)>-sr`U`N7;{x`{)~7%kaYy>#|(4=vS-%kC6!~X(i`mfo_x1e1GeNk
zHXRW|=h{>T{Pz(LGjsR6-^}8UNX8kNmujhJ&YYP-1;%*KhY_5`GqSTVP3nZ<oN{ZW
z6%<C^J!CTjTjAfkpipipugQ4D4wVP5N=I$GPpg7xTZDNV`U1V2syJ8eZf1qsfX|Qk
z0m6px4{o^=r+5ID++_i*?KS}bt9~076BZWy<nFXMv29lo7%O~l_6!o`x+k+(6?PKp
zsT$UqFe++{w~`m}XCKZ{1@)R4(eVm{M?F2yY|j}y%xatYp?pGqijCb!Xax@f+&ULF
zH#ccA&Bguug-i8qn#D)!WX2h-oU|HWJ28uSLfHOT|2XUdv7`{1`=|~1n*8vq6knZ%
zv8V2MmR;#dB?(C<Z?WfAdHhA(mu@^b|5pK~W=iusSbX8r{w%$y#EIGeTw_(?mV#V(
z^ERN2Z7o*Kehp3XXB(W+JqYu;a=<b|J0Y67R-o&d7~B*y*%^noImB1)qg~0ct|b7w
z6bCp6x^NCQ@S1c0jsc5Dff>w`P*%cog~yT46#`NZRe~T^+KW-<SMF+_)H|*N*gRQc
zqW!al^R9Qyl<=|WTh@=xwsg-MgbEXKuW+BqusC7VS>*AqzWnAZ`@7k4y!t%kgee;{
zlbV@9HD8;X&ui`E1yek2c+O8bIz^st{b)7t>Xz$yOW{hFN4Bb`!O2&HF09#%UtPIn
z4L1Kst-5z23~=Yf5a}V5_^0vYm8|gxa`7HFU4HKcpQ7E>NIQM|GFKyS;`IvA<BS(7
z_xE!wOS`{DRyKdSUm^bLvYCp;gg;NVwwF}7i^FM`n%r|7uOLSEs2^9ycLQ`r(B($F
z&pdf$zqRaLyL@8dvQ@{!y1e>?n-wYegZI2G4>`<kD~fz6q6c+f<LF5>;Lu8ve-tSz
zINTp{#^HmdpnPSx%b(*)*9s4U1<%c0_=g*@1$rKz<!#w=eY&!|_Zs*4;HJ0rkN(AF
ztK*sjgHasZe)knF@FqP;lU?fmsr{1oXHFLHr>XUxCG+d0`$qdGaK9gfXFhFb6&uA^
z{HsQXPDlJVr}5~+;Og3q!nU&~@81cyhv7`nJ$-tq$Kspa>%6<g5fW~G$F|MlPh_-I
zylK<n)Jv2%lvq7iQ8m3C+}V1fGQ&aG=wZ;V@(J73mk(n?J3Teds@#a_e9hU)dx{wz
z{4GZKFHla!YBxq8)jptRAnT-bY~(^>q3<Wl7aQ|8zos<CZF@t+Pj=K@6})C*a{8%t
zkqY2f;K%z>cb_DE;2R6?{PZI5jJ1)Amw(Q<XAxh5$57<!oMNT+W%nihc>NmH#E<+^
zCnXQGKHfUhp;nU03v<6|5OvzEJMD+eo5$lknOptEuM!&;IJ-EmKDqlIbQ(J?<@H`d
zHttW+v#&qFCKG>_UxdwHgmoW$D5*5!Xx)yuKrwSU{;DCV`|Fo>?w+6GbDWQq`(6p^
zj^_P3I9z{uL;dQrZ^9x2&riP6aO*oO7k%EbyZQ^T$nD3E%o8?eiWCoFxttC0%ZJym
zjb5zf{7=^N>DxW2W#rrGtEZ6q`u+1Z{$u&+U*s(J5-4lOA8*e;iA)w+IUC3Uypf)R
z8rdJ+&Y$))Ifj2CB&*wu^8`OE+;b7K7BL?(^%o7f<|tAaC|Q_a+xKzvmN%a=LoVTF
zxp<|z>&F|D8E2IQ$5TF@{4S}c+hJk$%OpMCKrS}-Ca!hU>K*2NL#ECrGg|(EyB48*
zJOjBL_-Zxpjq~4^b3VaQ2A2NNk9jk7zdze8Mcw~&p(W;?ka*5h{x|BC-||IjxlfkY
z^e8JF4~e`ty>NW4?lI?m`<8@@3vlz-QIUGZ2iO0deBz~+kzX=up7GfGLUqogg_5%C
z4>`Gb6br{2^zpT_M<7MKn9PMs(VzT^mTkT$e|-dg@n4!poj4EmcogmAOks;soX2EQ
z>NRK_?A$<tVWi6DPs90BIK%dQTt<HO<h3tPPqd_x17r2vX)%UERKeqvbN*{hYO=B8
z9>-r_Wz})UnipR6S2g+^ZRu9A!ZmA`q55y$rgCRnHp-&d*0#HfCuX5U1u~<5uC!rZ
zzkA4`$Iw;(>h-s#7GWII4{(uur_@D1haXc`JGUPd!%gs4bIBC7(34XtY`z{%E=YlN
zcD4MoKE1OjdCI2lQA9yT<8e6^4|t5RAV-Hl$(f0#H{VsD&+&yU24vYOHMdvTYg+_P
zEWa`TuJr8hNt3hA39nM~=cG-zpSg9MK7F3=N)V^jpVs`z2LJP}9d%}%r*Fh~>Ad7L
z)KEqKkvle;^*xLOC!**6*lBEH$%pWbFW}f>io;c>-<B>J??{nP^{)P?I4_%(H4H!V
z`R8KK>9ET9=>9tKW84#*vK;vpZi7<Pu<>h)H%l7|)43g?Drc{HDb(E=J&cG^Z8)a;
zNCoE}sGk*OsGzcLcxvMEc=tVeAIIq*07Tv~HqU2#K*E&s;^$V_%<6x#<x}4B$KY4r
zs1_AI(dIMsDxQjzLVn;Fp1BIWFRQ~<W^G&BIK|l9sK5PX0F!Y2)};<!p4wMLj@6V7
zzU*Ed^O8FX?}O9}CW+81wF75ew@>o2uS*p<DErXPT==DFQs`iH<K6Y*%Xh{C-l~ZF
zu`1rso8Wp!NER7*)_KD7^ycIA{gu-fMm}%9{m+MAATB$wMc}dM*t;|jEzyVMhQ-$%
zd{GJBcKzOGEo6H~8R-HyZ!NwMz7=GM`{NwG`#8@QW?`YHf-r++qkhpI#$oTCI{p4S
z^(>E?Q;OxA>mGGCB0Y$QI~La@PEieyJBsb8&BzCLWl?4}qJ3~-5x5Nb)%X4R{_Q`m
zJZf@nela=_KX&!L<{Qnsi2{vJGw1?x<}dstvsDd^bGXEAJeeME>o--c4PB9O7=pPD
zofaG7;W=6vB<$_@3Fx$RR<rRH^o#FhyB0H!DU1EAXM8@G)G<e5p-b;&{^S2t-^aKY
zNPixEdhCTZBt|j&!rSZe!@^}f8NY-iPa~X)Z*hdhw>OVoi?fW%*d0UYoIJTElc0h6
zdyXy5d*w0W1vtC!y3VSFoACt4C%GMcHEZL9ou>1<Cya$WAOeEA7MEDRL{z2M!vcoX
zj}^%Y54l^3ZJJab6HbXw=dLaOxZd$LjA(!JHOD`1k+Or|=-zv;8+tBNPuz3ie7YaF
z{KxU4ki=_EJ>&gdV2Tw#5gA%#Nyv%vXM8>J%l@J2#k&q~^{!!M7et=5i9hiA)1z!r
zW!4g6_)rB!w3LK?h~477y#HwW+Npi1-f_wA*LLi<6yHY<sW|*?Ute2E`4^YkRanBi
z1aC|?__98CJHZ@wbur}M(kXA9HS5mb@3z$@CV!dWn)gCm`>(gkYDku!?dZT~{{AvK
z-KoxDEvcXTR8s$NJF4jURntfJt~d|)s&qeGy~^|P&gC;Ffjq)4=hq=YS^=lNT*}V!
z4i1;TaBqSpYf}3mwp(q>y)Dm{U$5>&4_RFLj@Gdl&M|{s&wJ%RZ*UA=y0ck0TY0xS
z(K|lD<wld}QlkBA#!fdYpdvQI(u9Mv>(s}yLRZh2LH;a$`N7JbXp;0P$-tZpesP22
z5?5qhu6y#Qt95Q^DToIe*Hg3n&MlnpJZH50<h4maX@lXv^q-0zkMHnD7e&!S2O=3)
zo{mB9Lr116Usr|*dfq&rb6pe4cLp)`?e|LOXy#B!rN@dKVQthd%IKVuN`Q~nJ>tc@
zZ>{vNpPTnb;NBu5lL0+kO%~PxwG->73OOA_cialUiHHiAwM*J2YV;mIdEfQS$z{T#
zf9B`sClQ*E|MsGlM{j}muKMVEpNqfvWbzc}iA?TDvAHx^Z`rIaqo)~frLQj4uXbZ(
z^jx&WxX=F{IKs7@7$hwx<mcBF$r<OP4BQfV#+TrRQTy{(D;vU2MOrLX18Jc`ET}Es
zm1C^0R1#vbCOIvML)CrMFLSwm*@+m<;e)$*t{0qn{qdD!72jGDz}Hk~?kx%z_epPj
zT5)AO&~^pwln^y83%w}gc4)e+p1mcj@B9waKT#$a5w)HDkG@z^J%|wteiT;ru3o4@
z)k?th=JB7FOV$<Lm^q{ZnOtHye;$ioQM(tXHE|U<ydC@yDOJG99sTL*zy#k`;L)Mo
zxA;5!>9$gf+_T{qyY&KMu6&3;eGe8VEplc=k}s1ow=Ik`#kWfDU6;!Bo~?Z8^|*1l
zVYz3kd;Bhc(yJuC+7p<7n3zm_cCOH`x{0W8m!|^Puij61b>3xZMoPB(c}32wgXhRJ
zr)_oyBx#!Tq$BaVhkbv}bstLq2QBF-o-@j=Gh(>eub`Q^cA!WY>O=o(%S=_@x4#F=
z{YoWi&(>_>O6hm5C)LQ_AjLMzUX{*@u|2Lk`1`KW2Q|h=%@4MuAIH@0s;HiwnD}#i
zl|Sz5=d6(*mu}6;C;J+H?~q^m>vmP<8~RZ9VUM%vw`0>kr4Ma3q9l8~<3vgprev90
zr6V7ZsrR47`{vgx4YUns=u>^v4jth3c$umX!n}!g+Q~kwiRf#3nSvu2jlVaVuEG4j
z#Cf)mx-K3YNfq;~^nD9%6)BEwTbfE*@47L0!rO;~g!2E+QRtbwvV1fwc+svoK)BrD
zi^t}3pYKYlZW4CNXUgm&SJ@}EhdF}PeKW&;JvkY`V`8eS|B&F{ywPv>5@=H2GG*5m
zrK0ERIyYJYKVec2Y%h2ATwAR4I%g4OZ3Y**EBO0+{EfMsb9T4Vt6x!!*9F#UyBZ0X
zMgug>@0~a#pF#;8(|zhVsL~kz*(W|!J8{d_P&P;ZWMzG@-D(w2$5^6*+HA3mqA6KP
zMNz_ns{ZN&2;(PV9DUE#<J*bAq2AidHFGy|3vC5IJ!CoYa;B7>Hoo;>LDk_GC8I9R
zTOfufR#*DUapUoHj+wtN)RO{=w7L0p_2)SevcoB`rH3qnkmmbm&#%h^+%hh7{>x}z
z6_eZyd=i`@HD@eau)QtPt)a?&Nl?Q(B4q;esU^v5NDuU=U7~@*Mf}@22N!`#>qi?G
z^~v&raj3Gro^i$EL7NAw-E{>IiVbLz?y-}ii65JJC$iMMgO%>OM+-kFkZt$zZ`}3(
zKl3g<3HfqGr}{HnM#La-6$dKn9bNLjmWBPkl&pLHOhg3emGtP}1Qu`CElre|><!=v
zL(R$*#bi@A{VN>=!@1Y`m~54ZyLlV3QI1NfN#|0yZ^F+`g-SC|kNgM>nEse@&f3Kx
z#}49l@Nr4f^ArF3zRyo<wZ55`GM+v6PFW9PO^qirGCN)_MM<BtxMPFP(f7Fcp!?V-
zFVidD9Udzdn5TC*Q4$|#&&-NM`>TC7w<>+CPw=+tf<K<DJa>28#zFV)N%7>q&lf{G
zm!7Y7__%8z{x!S&NZt7JHS$REgD~?usFt_v^WsU^eR$t8CBlp6(bNA9xDoe!-66p}
zvh1(Kl3S0~ICDCF_I3!=fB0^Hjf<q5^5D#WZN5VfAB43dFE}d+ee$AG<xR!Mua08(
zvWSjQ<p#|+X@_#>gI<L5uTvFYuXUflr4{b}+N~JVgs1lR4)nOZ_Ll!Xp8><cGjgQN
z4*{<3tHbek3ijFanwpQ6*kqX-EP!_GMeD$%8|Qi;5ImXP(+PMg!M|pCX+D40FmPW$
zxB9IM1?ukRCea4nSB3mH`mIJKb%&2EY2+~>6>D7WlxeFwRwCY@3+jBRygwM@b4;-D
zvA~GqfBf?Lc}`Eu97e~E=lL6)_)uae^k1-IR?FM_B`IltZ}vvNO1t;ud#jp~a{eFv
z@Yfl7SCv*TWk>u|X1qKjpknd`cJ~Aq=$h{KeL|&H=$f^*{cK)w%}?mcN=I9taZH+J
znkDZeOBvJWuDO4~<Jm;rUo*{C5BaT57uZ8OhV{t8A1yA(i<DX#@kiA|_$coxv6(_^
zR^$CDmG6_^%V#n&cF73}oszdjF8B4`y~_zGFMj_~H~?gNA#&|@{;9IwDe0bI>G^hW
zq;<gDt~To6%IxF&lpkpQR~FHJGAp;v+|s)fD=SGoE%@&qTx3-4?^loCpC2VnJErO^
zMTcj`nmjb}%8F?G@NNCG0RN$!H=$rDrMgqkZHEV8$(m?&-+U-;ZfR#La?-@eq<ASf
zM*lsf>ipf?eH8sAu!$m-D@vPh*!3OvOF=`EvA_cXtLN`yT9ZXDD3t`Q_pI#SEY-VW
zlIVK5x^;@O8>vBz6V6UNto9!(eEGPdSj7@@&vivM*p;tiC{$B762;|lL+^4+ke9WF
z>Nxop1||fn`l*BRyJdgNZC7EgO7YafNq2&1?f04d2iS{h8Ft()fNqIlaG<J;S>`Ls
zWRIy<<}0)aOgiSRP}kesO6AuY7K_C{tYmVJxt+3)l|<!V4Hl2R_r$_V_+k8F2WQ{o
z#~vYfLu+EoXiHO~mo8mWG5CG=6*krKTbkWoYNy_h)C_cVwCdMlRl#GP6=6S8{+!ky
zwc%BB`Si=Z$NN>Pwuq)e`<Uy*qXc>XDzq3{3p8RFRYH4;h!Pu6I-OSU9Q-KZDm!0y
zmdj9OfUKv;jr$?+>E3rc_8WxwkkbCMxq>KF{&~l@2RkBAwKH$wV9DF(QEHfaNL21=
zjiBwx(-{^<4iz<V4a=>4GTgbcjftZYStpP$x9;>{Y?|!1a*IL+W1+XKUv1uQX}Et$
zE8vC=r~ancE_4&j6C`DnT4-SN5u|=r&re;Z;_1<(vW=i^)%96rSNq)Vy3KRssicyg
z{`TC^U5~zjZqG!!%d@;O6(=65h4s;n@#sK|9}0<7>Dy?CrWw5Z+9l(^zsY@q<9HSR
zT-Egt=<{mFcZj8Cz~Ex(J{bA>f*!@(+8SdYOqeJ=B3m$zpZrNNI`3*gZgT=#%*tJO
zsC!ngvp1<tI3YIu*5ajUF7syw#r(m8H6ixKbC@V!$Q@_<$L@%0SK<oG|I{bK|5yhJ
zjt@0=7UYEgtQK!=fTd18{4dF#le^=rc2VoqS8tAYp7Z&3^4^p*LQdU!^-jpU&wh*M
zP`0?ri;NhF<KLcMEdO}y@>9iQlbzYh4f1Dmh<$p1WYEjYCyE~><-zc#ai-lVSGlRm
z*-nSXd>5YQ$TZoETfK1hvI+k@f|1S`wuYZ|yDWjVFZiz@DnL-Tv&H6<&!~MT+NqJ#
z2<U3#X42_h`}MM4{O4f(6UKuNuHZ^sUh(Gt_#OZJL`;N@rkA&Qy&*RsdVjm3=y6zf
z>vYUP(CB{&|2;hadHB-ImBV*ldT%#f0t>cg`^;Jk<nw-MZJ=(eekST}Z#=cDWSRwd
z^5QQHyuH%dH^5V^XL!wtbXNFd!ZWi6le;g>JD=TPIf#C~X^-iX3J>X==au$R@vv5%
zJlu2`h|8_b$mKH^-CUVTS#vQwXW04kH0j?*X#o;HC{&vudwBNva*UN#WRtn&gJgmv
zmwAp94DEEXv_6dvGI7hM>1N4nj5ts{-IPUfBPY_|KhQ3^Un1`E`~Lt<K(fD)@yR2!
zp2V`Dq;t7~Ew!LLtnB=hBAx{0uHkj)Nf&|Z=LC+WIZC-?pdbdVN`ooO*)HKm-k@FU
zVii{dIl9#~u;9@`(Nn8yCilVK+{QAbo8Dx{mSLS17wHzBoU#jd#Ld+<zW(9?iJ3Ml
z=qiPynJIOX!f`4lw%-ShYO&&2-IE{*3kW(C4K<SVyqRknH=}H0*;+Y(w#QcvG>Mr!
z+GM)0dg!DtYPHR0-Q!-X$?BJ0%9j#exH(`sgDI_D+9UkaveKx$g`%kp9tf6QY!#+#
zMaf537MA)%4KD0>5#t`ZBDGyX&@$pRb2h<=8#9%zhZn?fvlycBNJHL)#xVy{wq;J*
zWc!S>jok6s&%3&rM=nlx+Sgdt+Mi!zdCPUQ=`P|!{h-NCeYKT*4F!eEYy*QXCq_Su
ze_F4@9q#otoepBdtJ^7jz;Bs{_+Y2$l0ku5${ZM2&koXZZLEK3pHka{rDtq&0Fo9R
zwpL)X2?IuE(-^Btl{FY|Lkb&|v;|cWWrRB0TOoB&pPo%qWz=r&YIJ;0DM^D0cz+V?
zRp+zCJ?<gZDby_1$E;#C8kz-ER?LKD3R7tNWLuVCnL4wg)A^>3L@EJ!^u^T-80V0w
zmi3LBM(fObj)tst_G1mL({<PicdvyTC`hXy?Z$}v^^-sdeTfcDEwCKU`1PhW*&)A4
zR$8mfUyr<BpR8X!_sX<e^QukuFWXF!<+%!Q9(Qq>2b|N`86&A(fo3N{moZ_j!gxio
z>wV0i&Y<B(4OS(2T|B%NeS9^<_H55u8JV@W4kLQ1^K~V#hyP|BB1=A;Yo6j(yCPlx
zn$%lTtsR0xhMYlusqL4wGK<}BXIADlA#Y`l?6No#8nL`K`!J#QVOgxsrA-#x#I^k>
zcj2t9I<mcW)4Te!4lQ5a9}qGOMIN{8)9v#W<sHT49)#3O(e_C2*mvf+U8<p3VS!eT
zYfI)7dg?Qaf?9K22xC;aj>Kb<Bgh6#V8%od--=tK@QcGRg$c3|g@d==Sm~N$%vLeS
z0*n`Sr7;lloR9e&6BZ_T3RNpSSIr1gnbNf^hMZs)s$SV)V^p6t!X&=1{Uf-6hnapB
zE3A{f_k-vNEo<|}NsUL)1CCv@+YrLHHl>zIn%Ixp#x}-NppPZSMxeYU-Kf?^<L)u8
zX7jVn;!xUeGm#JQbodmhsI7hKMVgI3KDIZd7hPetfVv*wfnwXWf~naWEoFD+ip=t`
zUXkn3D?FjZCb2ZaQL<tT>lv<ddkh!Zpu&`N7%`@X&M&)Y6#%<kNthZ{RcMGclH9HE
zyF6%6)>Ft)>gMbt`-odlZ=;Gn>1k@paTgw&Y-7X$B(|}jv?c=qC%xdD5L4t+so211
zoEtM_LFDoVlJ^yrRr>(&UYV5bJJe3$^BRn<%{Ukk@>hBH%l7#I(6WGIb7>i|$a{u<
z=dPS5c6s~B311eN4g{izH#~cf#tDw4I{~pYPdL(6hyxB!cfjFkjo{e33=N>MOb(bV
zseZr7=G5ArlfF98^7Ptn;~)GEqp&CTTFagjgL^`9;Bwex>o=~}cu?EKnmmqbIKI|4
z*YVl!VIuLYn_D|}Vw65Q5Xv9wfpuz#Zn*YWH(>jVC*->7kOPBfE(a#h9G)1x7t{`P
zwOJgvYCp?MyHF#iLKLiC^A+1X)N`vaZP|jnD*OwfyqEjl=nSZdG$*$S^PH-~Sr%SE
zVmhV?S1~cyiQ-b!a2iEeZR8ZF7X_x7e0Ci^mF_l&nrv}sh4xBDVKE!o{yVOAh~N-S
zwnFN4d)`F0<m@(pfp;DBwc9BzPkdbK^P2KO`QxF%@p_O79{$7{s*T%`-+*>_I|+}}
zw#rw3knp-RRDD)ep>lcw;OR}fGS;mX1wNCmF0Sat>h_YUv&usk;2GIXK=LKe)b3kZ
zj=Y{;yv+BI`Jh0`B^l9v+@@u^N4UvdA!nduE7~wMC0JHHYhmf+R@0A%`zt<Z6ucml
zI<~Yn(gl#5vNo2f!a-B_3ICr}cRdA`r=ffFypAU#=goXT2FHh(!$Zh!Voi^T!x5qx
zjC2m25XOpR7j^jxh6El|m7uYf!z{0oWj?Tu0a#S?RFGKUtMv>gn_;PDAoI9b?SmFo
zaHvsCQ@KPqop|=Ab&TYaOMqv#34%HaW$W6KgNt6lP>fXUWz$7;hh(j6cLa12@Kq;)
z!-By4-5TK5MB(MiCCKUF(e5_W3x|`lJDs^mzRf{$HiKBzttA2LzmB>Sqs`f*AK1h_
z88ME<Qg&q79&)j%u54|sF&r>7mxg?eXEMs`#`-3XCXdHFsZX>-JSiiE&|epYoVx%V
zV6@I^rT!{X76bIuT1c`hmBd{YkVlp61#xi+fMf2lZUm^y9<0*hoE5W9<eBwItIXL3
z(^G6ctNLxhx$LLul>d1;{ms*7U?r>i?Nu#L20j!(43noxJ;1+7DLjw70)kBPtDS?c
z>ilBmW<%%crku`(F|~B^Q+6v51YNacf)up{UR%k~<_%k%nxPjUnNp~Go!u>Eltj=>
zdPX7OKA`~>pV5o6MlFA~x&%LAR@%Ywi6hCx$o>>EiFY3R%xK%74-ce9+VNB>xtyL_
zCj25<tGw`SBbIYp9n?ed$-!h|B9#~)tB-utaXl(t!$o74G46KUdg?guy87C1^KcV2
z2?audjs^&D&`^<4O&cYxI8*QN8?p?r#!83A+>`ap484X~b!4!tiS71E6_#*NImyM4
zuQIeE5Q$coai2AYt+~pb4^L2V4yL><GTPjRs|%L`aJCOsKZTwK=l=saZFWO&G(P_i
zPq@>4{=Xx#b^d=-p7`O3@nmX}3KStS&UT%)p3Qq2jQ<Ub0kit}FI|!Dj;;7FoAEU2
ze|~%Fx^b)^|HIv#A-DYR#`r&5^8d^~?d{D4XMubyNDSi%8Y6}Vyz0UbF&%qJXm3ww
zPfuqDsZ?=k&O*c}WxUR+%z~e&ic&zYAyUzccu3n%D$JjPDnl3vmt9R{eWh<A3wy(i
z911(>4If~|iVnOw4N&Wm%Jbt|IEw!&%Dj=Q;<6cQ6@V70K2bI6s0(sM1>>>eh7tVF
zg4?3qg=J*tw4<cty2&y?KUmpdk*!(5b59|>s0|IP3;&@li<6{{mi9}<d<tG`;I18{
zNp)Lwt?VlC9$<J84nIFHBFfSlN1aFt+DQ#VLt<ap1syGzqIr&5;eowdL2m+}ZCI?V
zqYVtBRGXtV`9(FYdQj6B^_$>HQ^linS4L%)4;2+U7TMg+08pftKmaSuExa_RXuBph
zxOs!H(X`=KlewX@&9K{xXX8#egM3CU_H*0Y9Jh@yE^udYU%2FT?8x?zqC8No@#GYp
zaO%|Zvg6aTRc}6;=*`7hNB32#pr&c%vP5j74vnSUw96@Z7<GuayNlZ?v5e62=$)ci
zhTZvLbp!@lD4^^zNX}5Krg)$z2<ND#kr085{_72u^H*~KOX7}STYJqiCZ7r&g+GjS
z&anJnA^zLkM&MXs{trdEcGt##>)x9GH{)SOzoz4}ZRZ!7+Qy<*m71nh`<uh%tF^V&
z!;96*D>-msPPc2Tl}~cy!hBADS38&Go<%cpA6V<N?RABpg-@*ev*k=>=i$z>&KBD4
zPgWa+->lp`XEw>X*3RU1cEWr$F1JqPZpS211E=$?Tn~>DHO{(LewPyx*4*L2D`#}L
z6|szxYp=~Qb=-tn>$v_}1wFle0FQ@L@Jhzd-Yv_Z`|*<hxK%K#!)kj$FKz^mmE?c8
zv%5zAcW>!`oARKCMPh6)n(di}{_hHerg^+d1-}d>lF}FWkEV_$23#NXjQHTpj=?bT
zqcT45lF2B>X`bc_3nTMVMTsAth@}wy=)s|Qbg*ZdP9^Q(Ku4fsdeW$tvl@lX@*#9r
zo>4txVh$GWlVS>F5q6K#nk|rEmIQ~59hZ^dc$fqeJKA__ee}hF9g>D-29v3o$@t*G
zWPE09d}b&<k&F+<QgO1QPf>W?1Gz$>hwNy>2KkiMf?hmMf{+IPXtO<5CT*4kjcTO_
zaPz!GAcSV%3#XTlpwI#yM6ePLr8O~3#>P`5emF6ivhxGsePsT4PA@ytpuI4E%Mje(
zJ>cO7%<cdv5}gpIx#I86q-4<#2FRTQozPK#k+6&P^>)IeX4|rbh0R7I!tP*4S1_~(
zjR;-go~{m(O_$4B9@GhDM>yM~<WKkUlK&OWte6`Z0elVi-%w=B{<|qp{r<;)+c(4n
zypsJFgS|WZe|Klcmj1UX&-QJ>s#y+F+f6W|7m*8up$<BqM2T#|rN&arjEihSJxyAt
zrux#EEJ=r=YAmFZbQt~*tNr{U95f;xgYP^0g79zu(W8D^;>3bht}KxgQ0N2{Ist`F
zgz0?{X)`z5PXj}u@d`@eyV4hAB`APp$*9Im!<N?>X@dlG$Inq)9I7`o`dceEP+^sq
zl~$gP#y0-TC=*pxT3JCz=RYuc8uT@4>60wfq|Njb_0)7x^;yQJqJd$NPNu05s+88t
zCasOnHb;5D;P?XphR|o_<a9<G9U9RPI5eXbjcVTJwE8GmkaT{FQ=2+<@d<h%l%LpC
zqu_mr0PSfO66VCFA{kf$_kCR(TC*-%0mL%q)rBfiNSNkmK0zlSzn!CoSXMhk!&cvn
zi%+PulU=p8P_aXlO#rUpTmV|bxfWk+1dVF=*KhH!$XA~~)n&-q%59Y_8w;5Z*?cZb
zH~Y-CW$Fz`-3Tn;eR4EI6GNEeP;jK_=%|j@HPTVmMuia_X07e*Cbgi`KFgcc3~T7r
zbaA>oT{)`KL!v?&<V<VRh_vBs#|`u#pY|=z7syGij8~aQRdl?vd=;Z=VsgBF&z`Qm
z?ICp^2&6#3#F0ar>uyY2&g3;e+rr-CX*~aL$oB6F^M9x-5{lI9|Aw~o|4n(k=6}%I
zmDTPG3vRJDhUwiQ9edzsPo&d*cZk>+X8XciO5g%RI79jr1f5BndX~awu?LF=MrumW
z!}wBacA;QWFZD=Hxoz?w^(lO3lW*0)_{L>PHeHIUU26ZF-WP;-7|A}x-j`7nfeo-s
zO)0Ao35wFUZD@Qjbz~w=@?}k{pj4Xz`PwILh+C{KR*6clq@@m~_`Xl2H}v&wi=|Sd
zsHa!>vH_hWjhwi_m5}YjiNo<BqE3uYrf_A#i*e9&=`LOL&L43d9s3drKw|{HvGG(4
zy<th}aLUS8S*)lYfUT?dL_U!azykbkJNW5p%A7u@^V)!zDWr?+`aKSLdoq5-!9+4X
z1f`DlD@TutRpw!PO37;#8Xmtb5D56lVHDiuJaJAti&mzrw6A7;rbTOJxi%<4eb}=e
z-wyi`jbl3(ShL~77`jbGa$&#I-P|A)rME!>FWTqin4`99_m{T;H)S0gzE(PLy1e@;
zph-;b+&jlriB~SRYbluASMvpVzJg;;H(;J#0+t7kU&PY|>YT1(H`!$l2a1R$LW6=H
zrZ<vCVR*8)@KLrfGNAE`c+hGpa#R#t3|R0P0xYr^SggV;VBxQ91V9pHc?;_zN2CfE
zJioxWSY-*e`$*d&B}cfXu_}lFqhGD1g3l=vR@wQEy{aJH-tyo8_pbdax_X69RG|m^
z)0QY*tl%}3ecPs}D4FW(n@jhD*z4zww|djN17$dUtgPIa0G=$#u@<m1M1+7C$Fr??
zpcV6(cu?_}$hWhm6TImUKxz^#*rl=o4WCEA?0^)hEWjKUAn8Kdr1wMO4U;^V+2k0J
zdVHl0U#TyJOj5J-{8Y_$sGNlzv2yK$${FyC2r$KArp0aqZ`90<s>L01I&g;lT^dA(
zDZL^Nei1{_R4p06`KBc03tRcJs>NI)pPdk4c|ZV2Wg}KuO_Yt);;@>*S$Z9V*L!c$
zHGI7T+*xC|$zEcz7H_re+lPksIb(r{)j<if=8(br@Pd*4ePkcnLohq8SQ?L607i)=
zmI8+@+BU?nD#FzWJ-+wuqLhfF?-&!k^#@EvT^*-$8d|0!g<hfAmnK<;xSxlx#_yL9
zb7?+ffIz}KHE9wRQq1Ipq*Yw2K@V21NG$B;>WGxfIZjx|2)=iX0m0IB*_(pkU1+tG
zYVq<I;~7?LylZ&zV$($@LDZF4z|8<o2L=`OUv^J3m6219H7GR+_08$QeiiL{4vulH
zjAS|KTpP&(5+$hHfr3P(RiGTa*>Q>WkQ51zju%cF8e{<p6J$Xd<O9hZ5|_22ol^qh
zQNDD9mNjPOlDOr#&BD^G9OrybE|FILy|n^@PI(lA&(Rp0$5)W%5osCcA<#{AP4e3_
zYiDiNPG<#H$B;RG*#*B!2+C9UQ`GAy>E?8D394Ydgpv&u5Zn5ysxGb+zCv!MGJVVn
zi9Vtxb~;)26y1i^^m+6VH8qN2fdI{>D7?C!wdFTpJbCIY+34EXU{qNjppDM08T(e-
z<JJxDj(gyd0yUS%BR9EMaUS7R9h#XV1hk8$>~;i)WXaW$ESQz@G-%$8(M18q>5F`d
z@sL2!S5T2NBTxEJU6&R0sOnJu)u78(B8dZ5aYt@zuuDyFu1PxCC#NlemFhm~Bn8(r
zyOAMQ#}U?*>oQBY7bzYdc8-~+SQ7=ICib~J9o1%UFsC(g_jb&1jn_pmeD-;myp+C0
z0uyf0?4ebS?o0<QlI)}_Px`Yb9mLh;V!vwv#1!|Ct+-oqzbLeBu`EF_B8~T~gsYB9
z-sxc*a7`^11_|1}v}IK2tSzWDRj}KmV1q{0R6W9Zk<g1&d2|<GImKz8<f<{9uG4u+
zaRaYv=z~dz{-CRR{9?^N!qI%*%=<|}FVZ`E3LspTXv7*Zlxe7F(FPG1B#JKQtirf2
z1|Xbn`1l1uQhNxylF=yO%U%f-711c6S<pqq%l>7s`cQVdt+2wN!t}3IHKai!L{&p_
zRlAsUTw?Jky4WN^N`|RZX>9j|bBx#1*(5QJB9;y^sG4E6`If2iZ&_KDDgw$JGhd5~
zA&&v9oi6>&bN$6y>QLpn9b&ZGM-3nrDXa5EKS^iIfYo}1TCg1=kX=5jQj3Zd2-dQS
z&|o|?v@>s^pRU1~y&_71Elbly<DCB5gC<y5#%*1*?BbzXYrWCW7iM1eA-5F?)Edq?
z44nvNQ!QFii$tiQCJ-aen$s=Fv$Xl80PQ`$q@qa&K<JFl_mA~rt_@1o39utpIBdTI
z_c%ueMfXh?MF-~7<qY1t3LRe1EOP{V;osVPy~Lfu>yOedpT)olkVLmpqalBY?!z$`
z1wfyxYG?;Y6LTJKf67$zxa%`oO$P!2cD`jkU6~8a8@V>!PoOZ1YR8VcxbgB`Wieb%
zEwi1_CMwKHNpS&Jw~1<#b^<cDk6Lg!d#mG@t7rVA%%A4twf}oE+r5F_e{1po>+J0A
z-17h1jHh1zi<dyoTv#uT70-W#-RHk{cSJ&4`~REq9MH36!!%|qWC)M!8YQg^`bjmX
z8|08tKF+kIVZ8v;+c0x~x{_^wlkPxAhq9d<iY3PqV<SCeXq@?%4<%A$JV}P)qw!Rn
zr1mE!$)WM&<&zV!!8jRCjK;Sq%Jz+Y6op5E>fs^v)TkN=Ov4|In*rO=6P<nnR^Qtd
z*n_7ArUi$WRG3sIU=@cG>-a)ZD@Xe}`vEFTiuQH&E2mDKQkIvOrNmAt@eDRdjKrB-
zp`b<s)ABpk{Yh8#k%Ey)7kXBzL*z`>;cO49r_57N{wL$Hp#$-a!Ld^Or|wR-{O^i%
zMYiPsW<04m&D2O5w|V9?a;0uoK}+BhKsWB0qZFc>=O^_X3oVQpodNh11!o8ohJ35M
zZm{2ktdde#=s=dpm<=R{2J$Oi0W`BU@QT@t^k$R*X=@-51Tl_(sc*WTaV6!PX^=<5
zb4}8_>wC_fp$0-OP|9T(YU(W~PCMD}x!MH1a9mM_jD=#sNP{*=54MrnvN7MIw9Zv3
zrJi7LVPPS_#v-SAz$oYKA$i97f2H-G=(+XaSi%1@)LnD_b9Z-lcx(J`#<QI?SON0k
zP1k?0%s?A=)VUt<TzoWyX^-)NDqdsTXl=P`mt$4AYZo3POvRET)U8rIq!%M$(zdv#
z+ee0$is^Yh+dhg1GDmqNPSUa15$Xsl%HZ%wRIWEvn-w0?GS$4Y?Ld5TGByIMRorlb
zKWM*6vs;Yp6N@BekPNLe^O)eosZtZp*n!yPalZ|zYHA`hs8Ozv0~`q5i>J3{!{2hX
zXcw@5QBWi}>s<N;pdM<#EB_IrO0wx9G3m|fO9VIki?e#Z%Jw(V^jJh(MXR26SrF&+
zm_2^N>dvR3;|P#Tgf<oRMJr<fyNPIv>3NVDJ*%ub0(CNvvlCP=coT+c>gax(oip^T
zW>Tw|vvn|ac~-?6RZ=TxbnmIn3gEgj8~Ij(${Mg%n8?%vT3#<&)9H3HksO~Ou|mOE
zn9$0Dw82AKNyGCHS#+Z45P2rES-d&rr8qWm<5x-^MT_4=x-y69gA)_cYyqY>O*xPn
zjn3;i_L7_&jFz+Xr?M?EOo+Op4SLF_3fH0fG*kq#f!Ji695l6=1H*%M&8$>Pof+0}
zN8M?T@oJ@1t;`JRWujV;<qU};sBrUIP6wgUAX|!Fq{%W^Uur7Vus(8C_>2!zp#`kA
zA~Jb`?ph`CMWd|EFadz*Y((z5#)gJiBcPW^uxJ#Fyg`BoQY3gNLV_cQ+4=P$V5`Jf
zB&^b(V?*(QgCp$s45SZ@ADZNE2L=Yk&x4c6q0v$HGI}t^PM|}|43GN>UycCy;UN;t
z@`^a?FyyR5f>H+l$clAPR;-b1YQ2njxS%7*BMiv7K+N#SL+YkAlu{f9gWXyg+dST`
z25kv<K=T)n@p-Y;m!ODXppjq!W~9zgHwosfay(Dn&jXW#k#IC)W^o>(<5U7lKZ@Fj
z5013a#MtFf9^(|a3$st;ICPIzh=g&ai_=z_|IFuf{tMb-mJFjnU!bRQg*^X~&Yet`
zL^g9yD+oA7L9>6Qs}%vhs^?g0E|V1*;AghPUo67XkP0vx&B46WlZfo;<~8S)ri?^O
z$k893Ds5r0Aylp+(B(GMBY=ybB(!F(r~dFkxwLX#_n4IB6Ps-&alHWA9$SZ{fGEo3
z_`&30JPLC_q6nf8Cl8;hz${#$nPvv(b7nM~BX-SOU#6p0r4b<u0cA%Z)K2+703V4^
zk+!2ZgBMa|TYPjf-rU^7mkMi~c|vt(9uBwhyyKB+?Xym3V`d#^oi<?3$#H={&xHO}
z2@w1_w@jYdXqh~6Row}wPKD0GOms$D?KvCGta>(DxrFy@G}CxCn%SC-f;k*&Zb4qk
zWze^#$J9!dr}`A-*+7q(D#xcPx$S3g;u11{TYPK?W(iweVj>OSnfB9ITWOff5~B?A
zNZF{Ch{{4xQ4@t}PdeP2b_SB6+C<HkO1;_M?BZf?Iok``bZ@!W$Q61)!|I(Yy|g!j
z!4a)F*M_KAvn|`IVuEKHH>%jrc8s2tRmH?9m23npAOcXWwp?IZ3eT1GER89YG;Tue
z*U~v4#R`O)1A3Ht=YUXi^Syepunw}!t(q*3=FP3Hc}dM|iWBs#(VMN7do%N;UKq8&
z4`KLQ>4mY=Th5!kd40C`rKLRl)#yK}3n~8QOwC?|LEy~U|5mjB+IIRi<5*$;r#rmc
zwf__D=<L|C|8B~&4*M_Tj3<u?c#>U4<uv|wx{Sa4#;T{7{g)5Ir>F^7s=dn!?A04*
z&JgUvwvsK_#ZR7AV9y4u9^hu1fSa`X)*;xI;nzi>8ryGk%65~+T}ihbO$@ALv8}b%
zvPpe$zQ9gJOS&#JqrM8<*buv7rOvL=b3oEENjvW0J5<eq8UT(oTkGMhAh{T*E845P
zh1!<MN*XWDYOP|lG;fuv%b;~lP4%rz8#RJfU%|6$tT{8IC}$0$X7%}c^Uz8epFCRq
zx-|O0lU6HVr$*kiHhvZq<3E$9uKvG?_kV^$ZvU^Y-JM(U|2E|TiJgokkF>UmZ8}A|
z8`-{j7{mt;%tvs4FHB?i(~CnD>AH=r;rNt$oa6sx`o`V*X+Nt!{}t)%+`V=FYcrnO
z{?8fN4d#J0oc{}lw$A@;%H!St)s4LVVJ-dN-5J^H|IK*n_CL4rnl#Ms`f#kY|I-z&
z@&BjyKX0x7&irFXDaL*#69)%I6N5x;4+alK27|$&)DStmKXqUfmwjZCMsf%S<74zT
z1XVh_vJjyMR#M5}A_59wN&d5)1%L?TDmk@Z>BBVq50uk>8t$gAqE`x9KP)w`(n~#{
z-KR00GCKl9_!Sc9NJbO-f-E;HNv~fjYlWz4R+ixFoTgP&GFR4SqiVy0HNfP7tZAw=
zFbak?TC4=|J&4y&%xjf2!Q$;0r21r39mEK4#Y#Kgcc`*>Z^a5Ph0W<D7|+zyD$#?f
z;r2Z$4WGjr*q1SKOBfA0r=KKxE~;Ybv|iN8c+-WQ43*1OvlV*%g)40ajVWrs6&k27
z-9!u3{yu#^PtpabC!;K(VDL&Nx&Z?eZ4ZU_1WLs`)VD8~<|GXQcCSic)Eoes(ewR%
z(4j^#&wH#d$Y1+{^kY2$InB(L^%9L((Z5nBQyA<&LSs0}G@=0;ZPLvHIi18Trcdhm
zG{Xd(7P4vzKcQw-;J?;ZV4i-9lz7v?A{BLN|9)d$qx5KP6?yCC-fo=K$|rSgLG2&s
zzp!Xu5VAKc$D)I%{gd?n=E~&w2{N@`oF!|n9Eh%pQC@<Uu^-Kq%9gd9UV$nOvL8*B
zLiR>J9%MfprTT)L^gO`<WIkQ2rVG3e4$zmzy&x6Xt`{qeIcT3Jq_+mub^@Sxu%!h6
z`>ja;kf4<@k_|F9|G9GG`Ot~;$yORmn8_OPGEzS3VF=H{IM)J2tr8UHG{qdQ_HzT7
zHLfjCSP9~KR)k+Er?bbka&TWB4RSLu#`dWF1Jyi9u@81bR}I?C&O5;lUODLvjuFs)
z^WY)*Y67)?l)Xv4z(Ba=iX<*vqJ@ikjDinxB#elP)CoeYj#Mf+dG~>Q31jI}zcN`Z
zl?+oO3mTbApJc88vj%SF3aLltbgi5&XXloBph6{D4nt%Y(xz#_2gJcNZE`SUwLFV%
z)sP;hDVcBprlByrNAO2P;XFVy0pPNRplP##1hg#SbCAiZg_YS!1Mcl)WWtObETI7y
zg<uv1g{uH7nhghYVOMcpnP!S-BEf7Vn2Wd|*sZ9ou1R+C&vQHd*6%F-7LFG9n;k0_
zFlpB-16qMaJr?1OOiF0L0TWP8H%o=|lBgdGb&j4K#w<-Ju$}ury}q)p%7W@x*JQnH
zmb$mFh*4Niw3fB)wA;6ng{WeeV2CEtAaw$-W0u4O>|6AJpcK@L3`Y;m*2XTuVR56V
z---aoZ_fc#SOdbSLmg2VYQ4g1JR7pAOX0E#b81?VutFFuE!0znnY>Nig`xBqPBR4U
zfe#|28G|7OQ)lQY!-+OAmgYC|xM_vu+jgddnP4`^*whLR#q#=;oCo}{j6jSMjv`zK
zM>v=X2W@`FKwVJEj-<#70>ZEd#)ynj3`dSJQU_xs=-_`pImJ*i)Dd;r#vKv3BNlFJ
ze7hu?kXu}wxxUf`lS|U2Ge(uIK1((7n)*SdVdWrJ`Pn%wdwgHDtVh|bSLUlty0)xU
z3KCEqlR;@`Dgj>dfGg80sfU%NU~Gf6yN0*TMAb-0B@244G8a|%>`@6@p;9?XYe>f~
z{HAx$I8;@70Zk{rfF=?QNALog&aR$t$bG3O%mxe$1?wgfBZxNv?KQmk&Q|$-R2%3g
zPa!*aUH#u))2$oF3g`bjI(CO^?tkjs(*HN*+0y^F^#4C&{hwEzsr>w9OYi?P()+1H
zHwHuQAK<^9+y(;y$+6~9B?E$6bKbHYoORnltJ8L1iw=Ztiw|Ku;NqI<s0CaNFVHoy
zr`!i}Fli5k5E{XwbVYiAf-9>;sq%|`P*dXq7sUZ2y5(+wq(HfhO(YOG)N6^D`n+C%
z^$`?Dy%U(cm`j&)3ZNs2;JAeZ$^?WJLu$ZmS%X5xY-Ir>jM1wXOpWRBCVKAGA%4Lo
zK1rJxdYGV#8Al+~QixN`DnzQF<6sq*`=HnI`x>!6p+Gng36MmEECAdbKbVrErwKAf
zWsaljpjB;v)|SYK*p|w!F65`i@MK0tBcc%ED;x8mZ=1@hMkehe+SPapBhQS~r8MLw
ziCMB_RB0SHdLG3Ka7HguKi+_hgn}F3Uns%5(7#9cSdy@kMrTT>yGba3C5xWMEaC0s
z4V*Qqc(SEp^)Ipsttp|k^dO`)MImZynqp+k6@-Pw%Egu_xr#M$i_=21W33sSOzjK4
zq*@H35_l9wY(*5z^~ZAQQiY9&1*3c%&uBF0cqpJW#2J=whC71?(q%8C2lOH})-0k)
zr)Zrh;$iIZWJeRILK3QuJ)(VGo~ZB~FGbe`+zuHotlPCL!tHdytplj3wW#1<P%>2s
zbqIS5#j8!hF3~JE`eD6nR>%asKt=E-s}lTMaC4QlghBY$GR8GHnFKKPd{N8sp5Orv
zhtfs8V31T5LmcAGf$4IEo8oH5Rh`ARGd?0#!;AZ^MH8*3SU8D#;z=ud0T;$S$Fp%r
zwi0c+BCRO&LdEF8EbU|C?UNI+1MR8(v9Zf1FY~BY)?S=}oCqlVJ~opIjs>ldg>~>Y
zOOA_EW$A)RXOHY0p_f#M=#N5vmQ5kr%ceLq<_ZwmP|jf+q<K8l(W&-h8Y&0{82U2#
z&bpzCvE<pXc2QfGz2v5buD#sQwL2K@Bpsoi@SdJXM80Wx%f_|!G<xdV|Kt_fI&rLI
z|LY8e-2OkIt}XlDraW8rzb*UUpRxUK%l~J~4!C8``%^OK3E3n}NDhap^*8{b=4L^)
z9DVB8x_a=|d2SY=_BYGIl+LDe+B|5nOyvaqt4sqTma1j+7&6g*lFpb$p<2-jOL)C~
z)-WppB}FfgLp=?W%El5%c07}fw}g!yY%l1?H3GFQ!7Mln60)qZNf+<842Vje0A|%^
zu@q<rUb6`LB`}+nm?X_0iw%N+IB$-luLC=(Nm)uXIiMs!k>txprctuvp)_s>y?WXU
zXTDfvHUeHSm@f$-FfuVpRX>Ty7??$88Ya6<mE;VR|Ll^(Ijz~ru~t7<j%!*8ZE^&u
zSVp~!nL`WIWgrJ@0=>YRl|dh(faSH-k9|YTl3vy;wx<wn4ZB`FT~UN_jxtHbpiV`+
zRmd6X;*wwh?0??rlxU!#p$i%HNiv}0j#I@QF&ahS5AJeAuLu>$bY=|9$!Povy`Bxz
zO@LX*k-UBqd6O_Xk9H4skX?8`rAt7uQW+2N+a$pbfTq#w()pE!6lj_7$r%|Ei70N@
zqoc}AE3qKq#^V}GjE=$&OV`?C0?LGKjbUC})KH$&%Fv!1GwM<EYK0-PY}T^9+Hbdr
zp-5@jd^tVqhXwFpdr~*78qbw+F$X^fEfQRUWqVQaj<lopO}WI$P;!GOwDP=e3JWyS
z4DbOmY@MGm1hfVhka^8d`xu!)E1PIy%?N+FG_A2h+YMkGHubb=8d;qNRC17=uddpV
z66z!`q53G2oR%&qd?bla7Qac-!!L1#_*~HEb&dgxQ>vH><7!4(Kbbdj`Yish(Pq)X
zYR>u5#STDcs(6X0Nk=e_6F;^i2&`jjg@OVQbldq&)XvYwxPi0*{G3E4wdBt6{<d18
zo62mp%x`+c<{CgUijl@_;@cUvM<&Sm92IhAkBe8+8Cc@g3;-@~FbtI4z5EmCiFj?I
z#wkblSrkkX?J8qEkS!}z@Z<fY*brBH9fM|noJ@`nrw+xEagvzCgZx(}hT=m+jZMP4
z>L-U1sr};zQ+OR$GB%bvLdJ(lZ0rcRJTW%pC-K7*$@t_X8BZ#S0~4c(IHV=U21gGL
zCB{a`0F=WBTce2si4*`$jT1!3K_%jo2<$*SIk+EQV*`oNMCyoN8BV0e5a#fBlElbF
zESX9S9vqD&VF)EB#wX)|eh9#hCB}x6fF*t)K9&j)KnsZ^ekHt-$^Eg>QN*Rh4np;l
zSV1y4K5-<O7}=j9`^QIz;*dCi!6sq@qj81{S~WNtOC0c%q1b`gNSu}$2PjDev$5)t
zL;K^Hg!p3cXONy}hIR~&kEN3E>W5|~Q&!PKiOIO1#FB|gq{wh`{D5CUdP0eD3IxiH
z#TgW&HF0zaWWo1?lW_|m8H&e70T%Snn4|x!em(1^%(LmUC!3e3C9}(R+3O;q&YrHl
zJssgKm%TIn)VKdROa$w~(b)bM?&=PA*4Y1ccW>GMHsiT|Vr=Am<sxMN^Ar1rlJNgE
z`1ic0!M~%^zkOFr%cajt48>B5-+L&kS5oo2KlPy>{@2AX*!D&LjyJTN^QH?f_`FI!
z{*2gVmv!&G|3}JCzI4l;f4b|I$bJ9#%LiWm;(xgR5#J48y5$SxesaUpcD>X856@LE
zctiUI=UqU0@9F(NA9(!VKlIouQjgw$)1&?!cm2<2ZhrR7Kl_glAFBT1^wh$Kr>--f
zwJ-L6&w2QPbAJEI*S+VwZ`|?7^UmqH@D=K1&-}vp(;qnYyX#y2_OJFm=e@6vJ@~*m
zw_R}W*Z$_(iIHc2=;BA-6Ki=@@!AW1I!&$`Z#n<Je{$=)%sb!y+uniwPaK>2-y^?i
zZF$#y7rlG&+=1)N^B$Rh;90j_`^lf}&3`F$=QrNca{7x`{a5e%-m?Aa*B(3nRp0wX
z%VqoDoBBn|(;gVPclsmx6F>O(QwzH8`{`#s_OUl!@bP1JJna+r+;!m>F8t2jchAnw
zzV<b*sXlz~-f%eV_un<w`QWK<e4CWs|KJtl*WG{5ox`8}^mmho@+0R}AI#l&ed`;w
zr?uR8;?6~qo7?xC|NQ)Sew3Sk^q1Gqqz<0`=YRIKwSD>(e|YRQfB83;9C%0PvCp-f
zzwr0(C)fVnt6$x_@bC*?_(K0%uWNbd*G~TU^MCQqug!kq9{*o|HTvkik^I+R_)z=z
zZogpQ9Uu7B<>!9$n$XwxzHP_!q5KoS|Mjn@KK1|JwdacIWb)>==eOKAyf+Z2{O*z8
zz3#<h@9f+A<zwV6;cHv6Gk^HhACzyDzIfrc|MS-F@wu;j=|w*cUbwfn_wku09y@gS
z@Zq-wj{e)phk6R%{g;m(z5N-VKYi6tyWe^GBOe)k(~e)h_q~rk{Da$#AAV*pe7*MC
zr@#5j&%bWyTmSOxmh<ko?~f;c^6XdcNu^THxTa-C%hRrD+0*jOV=YR{gWuo%$J3t*
ze{g*KgKyb(?aROMqm$Q@h3DV!KU1gg9(>)ij^2K<y{G48KmYE>j{aNaIS<_Z`tg_F
zdiwO~TW-1Th8rRm{?)@fo`2VeyYBwQZ7=%r&)?oYaL+yW96562rkid$?|uEtkKOf-
zuCErld#|{w<ud;ze<;5Gg7?4WIe&NQt_NSdl>7d>qc=Y%e5}y&qZ_;Kc+Z>fdsV3S
zn#cZQ^3ji89gV-W^`}>VCpPum&uJGOy7lUZzID^(hY!E~wQqdwYhQct!&jzneDj;$
zR4$hveDJ})4qkol>8ahZb07U-XW!pH<3*n&kNSR=-|^YwPrv)I+papjckkXqAD#Zk
zz2*o1b?|}2r7t@1$Ipj`<MFp%|GX#O{bqCUO#^NJ>$*q(wYcZb3$qgkFCQL$;%|Fj
zG28vsub=bjmyXO2x19g@J8n7p*_SV6GC%pkv-kNwaK~qtAHV3LivaJtU;eAaFTeHr
z{>N^)?Y7_C^tP+N_3J&IKWLwR`oar-^}5I3ar?=KE^67aW5?XBckjP?=GGfu@aT`f
z`A>%~_6;38_^O`!jB_vh_~`R*I{EOu+upPM+m7t?Wb(fs`rhZBd-n~0apMUf-O|$D
zmf!z8zwh=(e|Rc>?wh}yy7J1CzkB4zcf9(U=U(%n51seE*S+`^pMKx_e*C33ZvRo@
z){*mCKWbe1hoi?PrxKa;iJdK<``Nc|KJ<~pA3JgXonQINOAcJn`pqZ4f8WE=m;L7B
z{=fYB_E&y);SD2Kq!P*xKC}1nA1r*LV|ZY&`l`F1d)dwJy5hzYvDp7-?>*qDe%r_K
zV<faRj26cz$9Al;v-c)t#&K}0gL7;$D@7@aiYU@h%F1X`(I8YLQHlx~6)B_gf3Gu)
z`t&^C=lOj9-`DSRUX63!@B6;5>%Q)5-s8G!3T!Tv6T6n8US17KN=$rSMzGS+S%5Om
zR@t78PpV}^@!$*z`uh5Ib}x>}dYrs5xa|gEBZfiAXsBi(pF@e8L0H(t$h-QG!RP!5
z%lHANX5V_LK@+ph!V`6l$aq)=^>pAeA4dG*5uuCQeSNi1H{KbrK6vmTZ2HHyB`jJ&
zL057yD0KbE74J5HJZz|dfPnt~e!Uc4PG*kWlce6ptrxDmWPNSAjC;+O53K{cxSft}
zB4%6hFruzc4KHsT;=#qd-{*Z-QCPd++&QO;;mxSTu@(j9W+N|6{jFP{y}06i)+96i
z&>;(3Tj5V)^&_|x)%46vvA4#$x^<5-H!WMYIfg?Z0ky@?&(GR=70T1jWKYa1xi?wM
zR?E1(C?g~X7~I~lA^q~Lo6I{-AC}Mfv0w>L4{9V`q8EcteY@{d`dZiHma*7Z0Qvx@
zaEWh|cDsMD=U&Q%0^sx5^Ymd|Jw3A%N<sGytT!+)u&}TIM)+ff^Uko*_m9TM$Df`x
z%gD%RI-zVkP?X=dGNmF5_2NS9d-2LxY&8!a&uMMj=IRsd@hWD|J%+cWUcYQ*TZJ84
zl8X*rxmE79Ao0}nXwI|>xvx2OgVFBAs~J)5rN=D2O55cG_VcPL@$<VpJ!68B4*$~k
z>C>m~?rt&LOWJyRQjS;UHg43F-5ZtnyowZPc&tE1=TvuIfwj%~;aka1?58e#4UKVY
zw&z6of3Rjl-Kn%$k;=imLp|hDLzJ}d$py7{?|$#*zSY-yA)~n|A&gMbG3NXJQ6`|H
zLSI+M78Mn}xwEIkr+i|xx9PaNn2L(SO8oFrHvbR&hXFXrY^@y9b*TyXW1-*mSJd$c
zzWrn<%HG<?kp2C+8ioP2$*-l{X}caPLs49u-8Y6ZL*~81bt!z8+YM1W<km23xrh>G
z*{-d9_u}@_a-a6p>})lc+X)Q~4L_#7nE@O-_-a_R>b0XyK98VgQQh(V`@J+Yd|h0I
z#s=g!5ue#wx3sm11uHK=#m63f6zFz(;?lLaYe566xVhKx@c~+ZRZ->qVVOD}ex7RC
z2dbL5yccU)25Q{%hSke~fnk<=svC(tW{hfn{v7jD$iNbhfA_4={;ct_k$UH!G8jxE
zhfLVW+d}(_rE3+$1q5!__ANx&;BP-o;?QM%d7bd+q3Gtw@w#H%t_(?=Rh-)~SD4Pd
z3R=O8UhbN>f635GW!Jvu%0q(JmhkcNtzREkeCKj?l@`a;1}*=h&aKR>>?6%K-nKD2
zzjR*{uTS96KpCX&OG;|H<hYiTlarU17cfj*zyL5wa3z^1IGCqkS2%SJw0Q>)H~i>M
zTBQEnd`Iy%6b7}NFTpK&$t#Yt28D5P598u87cP5`I(YD4v&)@s_XhoJY#vclvvQlu
zVHu*^7S@196dH?lxOnvaz{!dj?9!N(EAP~pw0Saxlo_S4#K&@2Iy)~zRaI5-MSZad
z51+gqHj3IpvgX-emz=!##x3KMPN_w?%`dNwJ}Xo%COSLeaO+Vl2eArl9_ju&1C|~R
zjONi`1r!30U|p!AV^1s-_tJIux0j2D-cE2z;#!g|lV4G@h55WnszxNAN~Ks#i!0}S
z1Jp)?Gi7BMlz%|@l_-@h>3D-wOg^Ca`655n92T(}zBRowHvC3Go`?mYehvzCHlOr)
z?*HL(^rNf(rvQ&CIf0qU->@o?C>J7hdyuS_$cAM=XYSwmW9-=FTWU|Qg>*j2zrz<X
zIQ)7CQ~u(Zl~3+26P3#W$b-Y(NlKDnJ(NCl7r=M0zyIabm%U_XFW(%_SnSdzOCB{e
ze1Dr}_P!}68qjW5hA){)d2o#yHno>n`Jy9BoNw7AaYqNg(ZtrdYc`+~Ek8Vtej;=7
zu$3VL2fusrqYTL-;@e9U<%3$U2DN7~@o%#^W?q)nz)<k;_8pT_kF$)=?cCVnts>8>
zPfu*YvSg@N6f3VmacB-aE3B`tj~IC%JoR-*EK+;8F}!9x;q{$8mv4Q#Jv=yA&uYN4
zHb^DHzUIvlTtj2kkKt<(KR-^J^2%<sSbM~M%Z}uc5z&Q9?6%wLoruk-_GLVPbvN#B
z73+Tcz<Kv>g@DO&Rfg)Sok{!l4F*TJy5=f>y;4-bI{4#jMb|~UAfA}zuEEDo4)w3<
z<`GPg&fkyf>p!daeWGc#i_1nEyxnHo#bbpPH>V#F%j*L@N#6t3p_a#Ce4k&Rc&tdW
z6v5xVae>$p$QWwO`B?8{nGXy1;04h%{K%bU3sTgs4t3WuYQ}BW8#)lqEwdvb#?ref
z+p+C(j=Yz3$f;F{C!8<FSCKaPwg)<--&wVbrD*A9P0h3Cq9)!=b%hV?jE(Yty4_9_
zl@YU7Z%rk0CxG@R|3Zf_a{rSPhh;Pq(k^Ttm@IEb0SJj);ZJzAGvdSLo${J|jSEoM
zPBdoU=)Z8;)X?&r=@PA1R~b(pex^P(_}u2gneaP1jaXmvhAfEQDHmnF7Pa$pl9c-R
zYh}%bte&NAkytn1D)xy3SlvV`yXo;B!M4Io(?mfbG)t4BbNOIq$SXzW>g6)~3N>%x
z*x0m0-d(pyH>uB1|J0pyNB+T6cdW~spvuUJKvUDk_+@IWYC{H5<{e%(?;Bs1dAEre
zu-mi-yGQQPX4xZpJ4<v4;KqnI;Phk-ZWnkRljisBD4%d~(Zz=PPVlNl{%E!RHa*p4
zi}Eq;FmH%sFh}X?H^(nKbA96dcuUK*FC7MJ-E{iaUfxzLfWdfv?ygniishY>m*4;N
zOw`DaZ`>P1PDd4g+@gw0Capy+lxAL-86PKPSXJw4byye0xuxzoYH8EHlNv9JTyEU_
zIr&)9vB8x+u4{p^hX;4m&xu_P4QnSRZ0uaOUUpiJs}pKGe&oqnGj54p^%Y&`+nG6T
z|7bp?74dD@vE1j_`^GQ3qp+??wQ6A_lMM|j2JBl~-4}kfi;pTc!futSKl8aKqABZ`
z3fZ%*va;wT`k3Wb$Csh~mhWofZ7X~pJg67b)YrUU&9eYyAW-17Ua9Qfs~ahM_GI4G
zu3nBOpDSSH*EzLhiKr&WDk0@)W}W3~oP)O7n^I7k<EuD1Z;Uo7m%2Y%qZoKPVrvTT
zR4z%!#p<lz`1{Ot2JD28K^*D`Dd^Spn&|I6&)>e)4@ve6?Yuhn-TQJB>75~#U&A$p
zQ;tXVYE!mq%If_GzVP~A&15!^GxStn5r<`IWO`WTy>~-rbF(yHrz3`|7Dm1w+snY8
zz$N)TSF0!m`@Zwl`LxfYO?(|?1k)TfM{Oa!lLk}f4>@<Oi0f@KQzp4TNHaTdx-6Rm
zwWYvtgUEQ-bYs-_&%Vclh2JM()A70e=Nn(6Q}KbL?(H@4d%m2<sp%U0{Io}%Sxq>$
zFEKF@2xa<v^oGv?e&fpb`#0TmEbiX1=aX8mVcR8_sc%y2WH)M9oYS{o`FMfH%_Q9T
z?ezjIDkOJy{@qLqC3lFEhCk(<P$V6(lyT9NGOVf_dGW>3a`a(+{q*OQ=r4oqvNAH3
zPh0GDP~5d$c?(`Y0hE@|o69$^R(d{GNH#I$)1Ml;iV_#nepTALH<k&vYS%vL)uG)y
zL$~4<7d))nKVV^d*4^DnK)X^Gh3l#4a#|;izT|uh^XAq_@h}i>IRMV_hnDkzOEG04
z?w!s0MCpkzxpLFW4|V|oFS~1<QRv3Z0ZoF$j%3uJ*jD59DwP*rn(92PBx-MdTF$|L
z6#Mm=eVXq64<>~8Pc;EcQBO*n{BG^Mp_^K?jCdrp_U_)5MuvtZrKL6JtI7Zqe`jBA
zXJvp^r9#vuu4%RD?-{#xaVGF=CYpI0jo(^xFXiJ@i&eY`z9jj_aDt>9N9K?{(Iilp
zk)t=6qpGazLsjoh^070@(sjdE2QC5Ld+)n<6H$aMVq31CFDmkXbX;EG(W9PgwKt_s
zzdf6i-CpuePctrIVdV`VRMS7Fc<blbjTZ+Q`C@dLZ194*<cPjg)-k%82S4p!xuOhr
zuYYX7Y(<<%kjahRXDn_5K0m;4Yp?sHJrazG5!5?C9(X1pD*8}aE1<DT=*@=@b!|=^
zi_ll1%Q@?+t5g*g-MjBPp|&JG&p-Y+ey7(WuFj#;m>9tl%=B<b*Wrw|DGu#8X#ttO
zO`L*g#vRELT=jqhr<csb@T#3Ji(yYi*Uz6HTAu`StF4)A3FryGFJsYauQzslk!IJe
zZ?A^mym3jksA<n4X)a!{U{i+FbfdvCe`jXN#UEBM`|vW9$rS?_a%fI|`}i@+FpG3h
zC@aVLMj)Om=6rrtq%W$!KcFzo;r`;rFl%f5kFOk2*1d;y);+lH{%9HCDkZwvr=$!_
z`xf$VEUN&#>_)&{P8H%Szw$aUq)XM(3dgVQWwJ&iDVBsnzq}Umq$d}TKC_aKkEQy{
zViVS4yTa%n-Wx*=%Ue|&IW#9GCNdR#a}S4mzu$v8UXlZNKF5!L(3;>Jbl$dY>f5ax
zX6fL=Imbv#V~jVl*=0zuo1XGgs5enG5NGTW&dGY%bouMifJ+MvQV;N{JDHoKoW58%
zGdB~_0u@brdNe-Wo*WYfe1En>FBG1v-kiwHd(E*``njQ}kM+yVdshl<7r(+6owei@
zcWkvyB>4H>Ug~jUjPD$m(DnDP2^L9VhAYZD`T;<U2X_re+H(vp<6uOImPqp#8JmB!
z(nXnX+qUSnz<>^_wJ4yce>aPcTULaH@n+PQ{-?d)Cq`eddVh)dS$XNTmwv_DA`7ez
zoNJC{vTe+f(zxGjF(_5Ugc3GgRdHsK#8L+fi<}Hwwk;0scNKStJKuCD4<Yh~8Y(>2
z^71Ok#k97z@=kv^f;wKU6!CTNL+gboAHmlS%$b{V7Mv7V8m(+GxG)6u<dl}}YMffA
zY|&1%*Z>e^FR4q7;1iGt9(_-G72f<M2Z(U;jWU8iv^>DcPK%+{)z#(Xte-}!#0j}1
z)s}~Re0Si8I;xsSPhX96rmur|Io3>~cJ1a0B~;A*wPwmT=;5CNs5_gw9L^VbeL9oE
zj!roG$eq}6R*Et4*{)r?_U_&L`rWESTu0P`FBY9Vxq`ncFDW|F!1B~aFJWcIsOPJ-
zjtE75uzmmpYpCSI;X6bc8F1&z%9O+|pipI_3tv^+hgL6R5a%)i!ZJ-w#?ZF&I(w$R
zIWw5shozpDKw;~a%Y5t%`&!!6Xt-jl&HLf9&oYPX^;V)@AF=%^YM7UjtgX@iV@hgj
z3%bvhg|}mTxyHWS)A{+e_wL1q<e8#XWk+{UxwmSdWr9y{Fba0MYRzA-ZE=pP?$c!Q
z%Bg*~h1hOQysx+xd_wT<;GL6ivX~AE>iK!<e|o~gg999D8ylNP=oqf=;cpM=UH3)5
zZpgk^;I%pA(&Flh$tH#^sYT;EIt!8`a?mQrEyJqtFUpp*U2bDt<Ede{=}6sYXB+(C
z!1&mUPEms)w>sjB+w(pVCQlwtvvS(%082o$zs_mu!*{<Ei1STNmsT1C4wi<f*Dx2h
z9}znO#7GR|`mckv&s$$HjpQj+COHxpE#blOtd(*SU#mD0|MAu>Nmm)h+S|dL=-aou
zQO9>A**Z<QKS=fES<A!Jb*E<?$L-eEXV+COONRST3c2EN^$#Cz$#}GJ%gB=})6IDb
ztf<Y=H`i_9*B-gFToAQp`SOw-HTrd-<_Ew0_|~?J?`EL#Cf|ii*cW-%9dP_MSSsio
zHFoppQ4VfrF3kfv$s9`luRqjFeN+wTX6JV|<UfevtxL3g_kCgn2%Dy|^|iGV^sK67
z85kF<#-$BrNZB$<^Yw;G>n0Z;J$jH+Y@-<a5qwGH#J4@mdRMrvGVSTmV@hyqoQU|i
zesZeItRd@|63Kn!qz3l!V}4yhm*lqA_RCI%Kfm3&95vbBo~L&ih2pP?J$qrF2p}(P
zuWVz+RWTTS=KG9Fxu-u*RdnslJbZW+AK%Bq++@%69Ow1=`<C|}5WHDp{NmHwUBp!Z
zjhponnC->Om#i&O@EO-gj~~7&_S`3(r>C{Gyr4kokXvFg8!C(cdQ6Mro2mMy%Pdl>
zmDVggd*;mUJ$tlb1oTn)Uowd|+1T0lrKEh@?eO_(YU)+g#4ZkTgLUgXGCCF>Tv>SZ
zAUYth^4z(H4|-T*^eq!dS6Po<)IYSu+R}32t6d5D4o3R=9PbYs8L2Z%A2Y70sZk5(
zzGZ78e>Lpluv~Kq`=QOZ&g$iwE-pX4M%%_lu=2#sr(@9<PVY5Rl>Fqo(A-cYpC!IV
zZ|$k+XRYnZN;T@{Zi<H(8<Q2b-2ePonkzI!lX-h#aKKS?(N~k|Huj>9p{*BelphT&
z;py4;Wa;A&Ng<xiUsqi26+Ethd)2{VsMu?rwJ`Y7Vq@0Nwuc%P9L$xjtK6hgb#LR?
z>5(gp4eq0H3l_P$x}qX$zsiL)56Q*r1TN)NV9p<VafsdQk+nxDi=(PmVJyc(Yny@1
z6~~NsKY#vdd_3{!QB(KQSdtF#@a!X{mHi#dg??IZ-#*cQHs@JOOC|bY#u_iVH9D(a
zZDP2~;O*bh)xp7`nRUUyz#>Im&D>_Yjm;f^CxSv&pc6LRvMf%F9)BZegV)iy;@!sE
zcI6F<6?b=Al#kEbrf9WKu?thfzYRY*pJvgrvUHnISlE$>uMR)Qdj?Ze4U-?mF4$U?
z{;h96ik1IDYxv092YXivYd%%2PT_y=bg3C<6d&99j0XiU@s*H|iEU16m!KvlS})l0
zkwO~xxihh7-<tdo1<u1fcyZ+(nMa$I0k=PiJ0*N-$bg@pCBtCXuGQCqm#mlF_<7T<
zs&D7d-h6&_Y*pRHE;)_^-tn>HHXk<kYG`Pr3TdDP`kwI)30)-GdTu*fygp8PO<nDB
zHa;s(=i|pi1$v7<*K+IKn*JHTF-_?D>9H}xojb?!jW}y-xrz_H7?Klj7;pDj))nF`
zRmZ59^XSg)<Vh`m-WtCOQsV-KFR$-$jDAk?D?ew%ExToOMYA31g(!E##Z8r0t_F?O
zaA+oru(4SHk##o7l(nGn%8#Gl7FPJyi%4BQdwA{s(|Re5P3qB2xjOMf!Cuk_@%6(~
z!`H;R2_HW)qPUj3jKm5sY`wsV8@yyWdF;XD*g(p9WtN+RKByQV5Kw-7?z~hr4+G{~
zSI(*xu0EdT%QZ)Pi90{uh^nn^RmdzTXz{x8?(HhIA79jMFW#5oVMQ(G?Ua|3yL*hQ
zmnqc2;plGm6i?<DwWvvPr|a9&9mSrFf8GtS$SQ8`c<zdG<pWCISIKh6f7DdR7NdaR
zA$n@4_2soD1Ix<MWI@L21Re(C>B+W~+<<LIu|juIuZ=p{oDZJU>KR)nq?tu3ZC|&3
z{m@U_%fT^ylA@x9o~Ab?-n@M)i8}4*rBcShLt-8%+^UR<oQ_h9DPmf;$hK04!9VK8
znsG0#T`{R?f;Ud-=k5Dx%BC7>qgBiF=FJ;{v$faqm>9Nn-8|GN`!S?X^mP`~eZVGn
zUZ2>ELJO^QWq!@N{LO;ytbj|5EgLp|4NAQ`?ZAUW=?XJMUTL{L$#If@<C@yKx_zP*
zuWV7MEt;C4nwpzqoCDfp(MxY<x+&guW7pC@Qx^Lq+~$hRGuCQNEfWKS$7brPE@L11
zW4|V%V(RYg8S8tz`nui*h8XNtdwa3wK7j`tKHd;S=^Ggt0fk38RT=XeJP)%h*;f^q
z&y1_O@x4KUp;5!eMu)JNoqfIBxo<B+^u7(P1r%y%WaKt7S>Mg=V9k~?>BC*G656r;
zJCZRIZx5kz!6{Um3tJ`Z%I^PQXIAGdW#zxk{q`v*14=sBr~6r<u=1KaYSjULGD3I9
zN9tE*hkKa=1L}nKEcYOsmzR;zPi5R*&l;1mI*rxI8ol2eKu;uJpp4giOWlGmAug2`
zjQn>Qb~GI2Wes|J45fZfQ$Ne@<&CM&KY!#Ud}HBnX+F7%%Z{Dh3orp!LyNncPemHG
zFH;wfLpj(VmO<UA3{b7+KXAR>;9yP;-|E%pTg4YAqINdfDrG7T@9yhTS5j5os653|
zS9ic>Pv?Mae7x4g9zL~}ThZ3IJTDo8J<FV(OW$vEf4@I2&Q7P8;T#VWPEJAsyJh0e
z(Hqgz&o$y*Yb=Coak7iS*)_Ys%%rya(cxEfF=x$kxa1pe#2%b_dRAC@Sz4zP<M?JD
z_G%n1-f<`Ak$Ao2K5SSZ@!E;w#!sAo2D-JJlb`<H`}l%wJ?Aa~p_MCy4ERwSE&5vd
zSPf1ZXFjvd>Kj$FzN`50S)sk5A$zE6Urb4!`j0PG%gw*0=L=jtAunc=>eo}OpV490
zIlZ)+p=gHzw>YZ#&7B^G>K$kuopkk|0a7tS1~se(-8{Vc4mKhv?iH<kiMTaq6iJh@
zA-kKKRYQh5-@bJlzOI(Lnt4a^f`tpe4YrTo-nGc-UR**-#@T!wv!l&S)x7#~0-CHS
z?=U+xHPe;-Tt|&l+Xq+t<WM{zCtC0nptowOl#-HmBw!iKwyjFuaHud}{-6-!4l{#(
z#)`!lzGo@EgU|1N`EtpQVQt$tdDT~pPMu>6>zn)9E;~CpW#?kluD{Y8mU7svy*B2f
znxZZ0gLP{`zE{|k|L|r(;jEJd4|DUho;<~&)+}KW5WQxwf}fdbn{#;o&HMM!7A7wi
zh;!+wem;8CJf4BnxWOP|oxzIYj)B~~YuA5HY70jvqPc@t7IZ5+SNcnb8dN{yPGXSK
zlVu)%99MRD-%v+|^YzeT=UY2pk=@>K<X{E!qo*rnJ@#Q0LOb@=PV%T!cBGk^E?y!(
zS$Q=UE1j7yb?bWQ8%>cI@{jQSx#pk8r@uG7O-^=A%GW&|9AK)rXM@qk>)%H(g+(d6
z>rvxh`d6TeItWeK%agd4IA8Hn$FbBMOzaO>dS~|r-{+qWVhS`_H!|ZcGCtqDNm0;S
z6I+wqKJ|6~3Ds+S%m-hcYU5=J(&@`#jxjx<q&nG`7Z4EeT1QH=;vs)Gw-ZmX{~Hh1
z)eH_cmW}Jb=N9;UAJ1OB`bOkYmCo%lBkxTHb}iZ@B(ix^#g|WS25|Sj7PYsy-03#W
z3jO*rq_m_o$>zw|ht`S5dJ9dDw=6;__^F&Y^jKCw!Fti!M2DY%|J?h|MrcEj#j45S
zYs)%GW}O~6C&VNQWqI^3J1v)W7cx8XqQmoWLBSg1jSt*3b@RT|J0Gws7O3~S($*rU
z)O#CScetQQU0suzQ`<z`tn-d^opbb$EA2kKoBXoQJiM0MNc<q|WtZC&vM-C(bMgAC
z@4pa=S=Y&N7}|SzwUK($W7ONK7BTQfe;*wiC|$gp<Jt|E`v->?E>l~*!j;3QCV$%s
z{?MTpJ;dt)=uII6^Mh~h@foo!v6HwfUYA&0ciw7hsB?mZ(rdcCQuqLK5_9cJ;eFiV
z&##7!UT<l^WSVe}MLUJMv|aniD<G6;xtrsCXLi=QpzgaXO4~<IIS$>MoSfX$6*(Ha
zke5f^>+mK<W;<oOoC^cR+Ue!2i&;jTr{(<`v&=eq^~S~?hIBbDQt@fv8EAO``g1Wh
zM_hbVc7A^`{+Vxjh$y>oapE&;8SK%kN*y^rzr3_34yEkfyE(G*B+27x|I>VviN{}B
zZ9Rld?52NCJq4n=!M7@sC1>jE3qRfn`EnxUW~rUG+V@Xyoqx(0i0PskFPW}p%zD~2
zy)&zQ@W_utqiR>I&YC_b5tropoZi`$EPb`B_2elgoQm&@-Is4FofUg_Y6G_HwHh;H
z%#{R|I-gXb{j1aDf_*eKH7mu_Mn)#ngp&Yo#+5)&taGnJZCPH*)ZCaPSa@*X1Gk6w
z`&7NGzm1PeCzu=Teb@Im_eR8ML4hb%foVtGpsf38lbmcH1*2WN(o@uw0)9raX|B*r
zEZ&`*{5EQe_ggSFb2p~$`N+Haw6rw7@IHRxARmT7?sQjW02BXdyl8l2#kTt1rml5L
z<o&G$N&&qmH5PT|+sPYzRxkd!xq`vdAj_4VMMBj+BFR2HCDh@tnVabb^ZN!&{3ZJJ
zI;;V&&gHi-@nq%3Wg26|2990(c;NH4J=@G;0Q<Cm?WV?KvU(1wOs~qDP;BV&@SeK;
zcsyR}=6LSc!}pqtF&Sfx%ExZ~9OJ&~iZ9%|{X@<>l)l(Pw#IjT#*LqIbh<wV=rQ@m
z378qBCKf#V(Qo$DDGXnB^yJ6&7SA`_-(GfWm)>EAqO3!QEbQ#UzYcCEifri)u{b?y
zduxqikXN(~XH`&PGLK-!$HRdEFEpnF4zAu|tHu{1*ZlLLqHw}FuOD~!p1*uu#;#NA
z-SV^HJ@t7nJ2V+%NVvTR4)AXFf1RxwQJoPGE4OweewlmlM_vO$QqspRHuM+M2p^x`
zTR(>QeRuP|kbf!2bh!Kx=6OO^YqO}Bn9gS=;!gfyai!KP-hI25jJh4$EG0FOk{4So
za)-zFxpYOuH`CmLs}*JIV>yy)b5D4G8?g4{W!T)ieEISw)o%_tYEhA2#O(G7=H}@M
zM~=VoL1mtk`^=}qq$euaTfR&!)bn;icJ5^EM<I>ON9BR<9<CHN-Lm6B$s-Pp7fE?}
zc~_VPZ?uqzQU=>>`r{UaOiwgD74hY$ZTqR^S<P@zh~Kb~cvJD+`Lj=IYj|(vMmJ@v
zcKb*%pBa_6XRgZmLJm;r&q4WjJ{oyqB<LI+#h$;_Ky#X{<bG_F&6S&9U%a(-UN7Mz
z$#-<Qz2DBAKSR2rHbs2(0erdFW2YrV954Fb3cmKzy)=wuk@yJ3ugz*{^L45#W#Z#>
z_N9U`o}|>q5b-6OHIH(bw@w14@xxkT@;Cc9r>Urpa$hEv#ekReRB~`+k;HWkEsn?^
zlViGh0YAS_OlCHyE;Y?Ma!_cbW?_4iO6h)*abo8%rv%gSb#)1(U8Jjl@3f547mp=H
zHLot1n3w>(!Q5PxvMScVJ<A1k*C_{!D=T;0b3FH=nXP7@X3oy=PnR6cf`@%_%QRB8
z&EGBE&fbkyce%(f*HTI9?EzY{S@nTwD*Un33!#l0gFm#0RA1y`kl>Fo4_u9ln*4H1
z!S}@(lT3DY_AFk;%g<H^I(TUbn|uiRK3=M|=c{?ElIH71>E)a2GzVLjtb6`r{IfIQ
zOX&5fs1<!2Uj0<>=8IQL{q@9fKAn{T=g*&44jx41h?%avfawLizVSDA%p~lC)$`eL
z3Yv-cj;jpChbP2v+&+53a_UL`%90YUvEi3GeJZHeYo}OGy?F7Wq(o-u7K3|Q=WXNq
zrJVhG=C-yT6&<xV&V`ewo?pJZOQKsX-6MNqWUxIl!I;M=S8hjy@8SdAC>|?CqOs}l
zPe9!{3<r*Se`c(HctmW!ZqHLQ_4SpVL?*_V4Eb~K#wPM(xroK>El0#sZhWpg_2EOo
zR{^b+Eqitag^#sjrLIdmXjhgE+=<-Cq~w0X<<4%S49Oeg-AN~uL;TYFfL20J$4+s7
z?DabC;JMAt?%UT6y=RwHy^32<JksgQ<H}8CgDMpj7uKypMfm$a&(+b&kXU=ZR*G%;
zy+=QGIDZcUR7P*(iHPB<URNAWH9fF$h`BkQr)FZbmlPQ2{^<Au(~y(SIfdKU<38?7
zlJIVGzigl3XiZ*;LM;}MZ7mkEV;6{8wr;_qK@`Wzl~w*Old?^V_a-eOIem{~Y*&$g
zX0hsBnweVF$D32Bsj1f;Pd{Z~zTed3T<UIOXZJ!dMP<ePqjJGdaW!67qQ_eE#|ENR
z$bDW>Hx{5!ZYYC0hk_eluDx38bk2f%3+E>P%txmHp;i0({N*yW=eAj?EuNQa_uP2n
zXcbr%)?b*D?s7|l?PRg8fx&|htru`O9Jly3juk6b+<*4gl;yL&#UXrC_Vt(7MrCA)
zt5#VvCE8bOCs;-vCl4l{!1n6#gzvuOct`KRph8&SlhXzUpFbZs-FN2P!mj#Noic}+
z+J|0bqT)oP>sniZ82PfPnOTlXSjj8QGNF~4IQxK#1L=3NGVKqYa3oKX38syY;^JPE
z$Xuv(wOyqXBFxKJT_V0KfhRXNuBYdYrRDG%X>|Cf*Ox>@4!M_Jw5?|3-rN|vS}*|!
z{kXZfmadl3PATKcySbn3wI-8=+if?Q{zp2Gb}aROVaI#Oi1`rK$?EAgE8K<i1Ro!3
zoqYD~bsN)K&ZmipH}LTK1-keKgydApU)ip5At<o_Nj|u3$o8_+B5p~aV|8I2Y$wmg
zW)Ik3ch?bF=@Fi<^<`1jo3<^SPmFz7UYMN8z4P8w&*E_W!ezrRu6TbR|NQifiFbZO
zK&-+|D<@LJ)#jkCn^7VnBDo{!&O`cbnR#aZ?kKO9`;NRB9tm<?D5q2v(#PE+=|y&O
zdUZ-`Pj+bcUIr$Xvg-EN9tV7{F{(7~v7G#TkFWRrd%)cb`qKAU;@NXQvA(zVX``oE
z`E6|0u34k0r4^OE%8MTeF8YLnfg*qdyJydyrX2NK_7#4|hZp-kG?(B#?NslU-0q`L
z+J4cQ!#8)dQfqAzI%VZbySqg$0EI1Y0zxu589sFRb+RP-r9oAPl2FRYkbE0!>&VZw
z-23<MH%b?0IMKYwJl^x`g$|bmp`EcW^M`z0v3y!yajXdsA3j{ls}kCMcW-57rHIuT
zp$!{eE=|5xJ><wR`FPRNC#!^FcU`=AkuUmtz{A5LFRz7!V7XsJj)Y%N%94L{fHO}i
z@a_F~^%*&#-E09_=c3Yke4QD1doLG<0a_g}e3zVVtl{L8C-*f2BE5RQ?v2+^nwcd8
zb}Ms^sg2gv>E=B?x8w}C&rqPggp1_6hqHMn^QYJoB_$;d4Gl@$Qj$*BpKmzbd&nnT
z<<)Tmt9Y&HN+$_j*4CC5hpS`}W#wxnB_k8PIU$NSJN#0M;@Mv3hN1wUA%WvjdSg?Q
zdO)|fp`l?L!0)$j%YD&EI-OS6(osQFj~w^+^z=;ORb^SSrlo@D9H6L=cKXu6P!YB4
z6H9oS$-$a@wKFgMZiNF8`O~wCy(QvJN3nU)(?5@!dwF_R^VF9NUaBuBu(PqTvA4H(
zbaXT~_iu9y*}qQF@(uxj`0>?^h;PFZ+WXbwp0C;77N|l#$@(PTNjv7iy@7!NBSXVW
z4ppgHS>lTc8ZqCxqHh%ynd_&VJb6+liEF`v1$*<Y92~BDwTiykE5oz6zrX**a)}>e
za`6{%g$I>)p~63L4Yo{&0%i^H-mbm8gkjh8ynm2?jb6vl*O8Ht=H}*;C((tCNzdY6
zH4phSaSR(XZn0Y9+1;^+Y3cFQhuBTMyCXf6)S1c8d0($p+2^j>C$-_pg@Q@Gv52t~
zd!s6Gw$;;oo;F_HX3gQ_>I^*9+`)J1G*Kv&3R!0x83$)lL7@$N!JE)Ms8^i3hJgq4
z(0ZOk5*a=KjmEg)g9$jis=uFapi77d`(zT=D7Y8bK*v=3lID)MzjOcZFZX}boo)S}
z!uX5*-&pCn`@f~7|GEF~Z~6R_|KXqf5C7zU_$U9v|6cwFgnK9%AO124??35Z|H&8e
ze=7a!tfYT4c@~5)lW+e!X<*sG%m6boQv6{?SOYSgvvp1izi^-sczZXTFoG_jDDncr
z13r2U9)1RoHhY4{@WB)Mv|O>2gtPciF!=$56?kZ$F8{1Qk|>jwkCs47NE<{70xv9q
z?$ZGZK`8^--Glt#%oku%f?xuY)$v!^8xh(e4zHBFq%^(nD=06i0LZtL+00x52vy<q
z6b621cR<yNLl`01b4f&6?p%=aU=B&-h&S*S1^{J*07eQB1TrNlEG26JTtXbp{#S_#
z=1D6_Q)(c7G{rVMX$cO>0|D>@Sb<C-J(vZR7)bktg*pi3F2T6~oB(B#K>N7(c?5xx
z4kd{LI7FV%h4UnYrNG1%U{Nx3aXTe#EW0n@al@zMA)Sc_ub%;vNcw~!C!^^wB)Ypp
z*(K2?^eIz;alixggcDPM*;9i8Y55Ms*;T--5NedXs?ZN{_7G13&Xbb*0)P&hG??8;
zK?E|K!h&9>17+O7+?#<xetrZGq)jk!E7BsIf&*bZaJYT(Xj-ZiFb|41nDv(INusbS
zD3XDGz^KC%BY>0y6QmHpyb(lyxEdvm30Pf{-OLXU=E5Kbg1G|dnujxe;AdsxrH%=u
zw@AJeIEe&3gV9J&nw@N5rlz8|aj>SMw{sMJqD$$4bjXd8E0{)bDER?Ia2K>2ArLSy
zfG0x99`a{`iJc*s{%-CP{(uPqGYjKDN(1^IqBta!R91$wk|KB@J^C{jS_)2I1G+Nc
z{}S?G3SKZHwGW9%Q(&_*FQaYz2%*p;UzaenAD)tb0(RK`bv25Xmc+_R$|_LL($5PN
zNzn|epkL-`MiNqx&`8_t7?`iaf$v!G_IHH2MI_PlumhdP0wP1_wNUak&&|(Fx$Ovz
zq25A87cbCf__YT0B1LmU7b?xTIt&zyKs-4p5PIx~523w+6hD{)+YeGuV1J=j@qvL*
zG8$?<KY|aeKm3q)zIYM|N}p}x2gxf;4M3@a;3=vDBq@|p1P~?|TUZwW{~$#`<qq@=
z5N~lXvl5w-n}-Bm0v8CX8DAt%jR0tI1%8!Sn*M4i8o|)^;xuzka&-LH2sjV%{;v|v
z6->ngwl%Y-)MP<m-+~E&WU5C%3L}y6zTh=(Kx+_9zzTr;he3KO5a<XV@qZ+thC%fP
zx<mjmAjcyNh?$ArP@D=TX+nre2EKvGll&lUBMw`1DmorSK)wL=76b@iFqpwB$RDOG
z*%R<oJv<?22&_mkVnjeaVFaWEL}mb^dSEamp$zZ9r~nqgjb1LqDQ(lE0A_uH67%4F
zk?cVbJU|UWq6ohV2*Q)dNcU&Z7Eh%UZHUk+cwaRd6RJo7Kf#WGS>a(f4B{Y&KD1&;
zwrIfr@k2uwynz7Rf&wWSrojFN`9m%y;+TRSRv?^@ClDAOe=sW#ocM}jL1CvBN|^=c
zLI(A#i>nVFY8=WkMr)cL7ZTWGKwJG%_-NPEp)r3ZV^CpeG@y=y#D$$SM5`j=j4=Ff
z;Ubxueg)T(BD_GS$#{rqXlOwG<xJfOQDoM2i%?^<j7RiI#i7*RWCEaT2v8O=9ON7*
zvCoP6poj_T4MjU4ol}DIDFsn@8(;=lT;_>J5%-KDfX*aB_{?VLgcE#6e+we$Ft~=1
z!AN)hb^)UNre*rKf6_KBZiGh<{Pv3x{GV7k2s$*3gxQf8a@!;NPdIFr7*h=h=!hV^
zFn5@!y{Ak}&IS!-!GlGY>b6l;7n<VD3rh*pfuCU-+?9T18UEZVK&}3TJ)L)Ops|7C
zTnx<bSaGzZq~xy!%>~l0G$yAY=7Ixs61_HpO#s{|;CLYchCd!ha1R51xsWLlHXU8S
zl>U&g!PUf(;Xv4dCc}spq^dJ;dKnB714&Se;-CTq4Ku+V$ukN1`QRIPoLtB*w7M`#
z1ULsJ08|of3uXd@Wt^JRjoJ?a67Pd4_1s;8d?>FdY6hSWVsZe5>_-N#JM{z9ED*5(
z!3u_iN75sT%wk5DU>6`52DK6b33Og(X&5$|7=sszQY9Ax3IPo9B>LbH!w0V0kfGFg
z@P#8d<hmDsA_-1ci8cc?o1YuSFo9iz!BFT7b-~x49EQ+ak|y{wQ1O`$75Ywl6a4)t
zMh$@oz7Y|h;YAT=paXjxY>+}g!nv6QpC20)f|_5DuPZoj20WUH)=a(u%pb(5U_MEx
z1|`iP%t#d6!14fgFq~N^&Z`J#3pxG0Kv0fFm_y<GdJyMO=;%kGBPBAW3iPjxG9<kK
zPkEy;_9332`E~@|VWPV`2~Yl|Cv1f$!;!QH_=T$AD2xFnC3GPL1=2^vu6PfEA4Cf}
zl_*XTbxKWG=HY9XDLNR&g{r=Mg1~VAT~0c|gJ+*8qXXB2yF=BAE+oV@ljwwkZKiFb
z!BK)CfawP*s7a$S^L9c+8JWPGWq*SL=d?9jg66LYFvy&mbWEc>AJfo98KfW_4zR!C
zG_^<R9NwEkMS1}RJYI@FKhFSCOg60ee?Od%4?WXUb_a91iq8sn#F0^?1U!gxpsF&8
zm<GG}1VKDL--v=#LHHgZs{n1B{oLrP%w!&*iZm5WAT<93%MlKmv!I$JNFqRAaW1te
zLpY0G6fF;kzn=$qJroFpKvw>B>jD5?0#pzriXc(h4Uvp_35~|k2b|I($`Clp)Ykmq
z01o;Ca0s8#1e6{Sc%K&JCIEijZxzbF=j6}tfl+-wst@)Xz@Sn14|@5K^`Y`S9DL2|
z$<NPJKvYByL{=TBN`2mo%|V8RfDzz1R=6Y3P2-?5g@#lDbQ3ikgaHE#cK{$*FnEWO
zj}IE|JH0s0yua!H>1>#E^O{gHOf2@V?)CX673M#m|HNnR{x3iTr2exoz+GOO<mG>{
z{|oxe+W#ddBddTy%l~K5nE&(t`2Mf?#~=PGiTlsM`2GGrSy^dduxF0H{3fjIKl}gw
zj*pZmJ7sl9;xD$|0bazP-0}$cJ{m!QyBVl7BXK`FnwCKygA<`kpFiuWKz1~oAR1vo
z*d9vHwudrGax?9rC;(UxS>QseAU?aN+Kgvz;6fYyGXZcR3|fMd^c0|bi~yhc%q1uk
zst-PNNAtt$v4As(F}Bfg-l}71WngCNY-(d7f{u(t&w7SdLCZ^H=~}~4*A$@!0S}7c
z4s-x+6K!W;u4`bdqpxAAZL9<OR02K#KDxjt2+)@?FtygPG}SPsFAJ44@PpTyXVw64
z0xCJ1Xl!%V*=DU{3L<BPmX%>=2X~_paKMNI!Cw#waGgkCfP(?Z;0$h1!=puw#i6$Z
zaoBH!CKAx1)ag!i1mOAsRKXD7uV`@moWZtSi9{c~iysDP0E<KduosKQg1@4Gzjz<O
z9iLeX;2VrFQXFiS3J96<rId4r2O4Z$U;{}By@4bkPM!D^ht@frfg(^Khk<?pU;T&}
z=wA^L1OkY_ZyOf)<EE$`fTmo)>T`?Epn@z+g(&JE*nwlDZD1)X3h=i-98b+12zO}l
z112_I4R^FE8bkXn0#r11hMe6Xa8?k+2d*hTlgA*OAVQ;6Rnew4#>OIOs4lp71L`qd
zO#xRIH>z3?fT|*$aaW$NBS1g?jcy>FrvawoC`v<;LUUthDwYB+WHLCbN4aLj1rFhU
zfwAaZltHS%#3vwP^vBpERcWIDKlqDbm@CHrwc&v90lM}->Des8{5=B%*eL)!JaZk0
zcOg^E6ta*_5(mPu5SK6#{1yt>cfidG)0YDqL3Z|lK|A%X8yt1jSQ)w~gy2qFr*J|0
z;(ftY52y!F@C-HsFB!oTnc$^M$lQP=Xo=>EG7zuNrS%-X_n$|8oq?+0CKd|gfYTd9
zcUmD>pNK+LL6R$@(Nd!HeWsh*^9iF-1wa!S84o-e-0}`B8iEk!Y6cJu(yUSvGW5gb
z|4TUn(El~J&E+uv`Gn_pG=NI|SBUTnx%^{d(3@4z2*68(bGuJ(QGs&QbvsowO>fZ5
z5o|@JMCofm>tRT7qCc5dSOyTcKtP^A?`STkAxw!_T9|r}xpE@}LfB&H&=E&w@*n~C
zpCRGDw%zlYQ+V4Uv@;DP2sB7LHjsotBTEA}(@M%vd<B~C5H*Ls$h_WfBn;7C6t#t=
zc8J<*s11y}2-rPoTHi!x3niII&yQFUD&GNY=j#IAK?Us<A;G#0=Cj{8MHDyaSEZ!s
z*=tVc-G9kiw4Mje*Y){)xnHoI%)i2RvNX1vDcuA=gzsir5TI?40pYjMSb)!A77TKy
z_vq+&5GXA&%b#SQj|=}r9-P5|H1>mS5S?<Tm+C)JYyi3tg7gFgH>k+i&+C_qVI4sP
zC~hZ!ILVoe76n%wRiSEg8vF0*jo*$MI2K^f2_$-Ep@|M45Hy<%Z%m=BO~Wf<E|jI7
zKmapvN*`MD#{fPwK9GQO@eu)J1HR&pPL2R{5cNAt*FftsG?s;51iFL(I-3CNYM2-l
z>;i%K(*+0bw4z{ytk}(uE)p2i;es?l0}9IX4BAjF1wCnyh{{(S?MFk$lNbWd2ZzyZ
zcM1VL5$bZHIt8*HW#|Cg<wt={4VnDVYV${Yu+T)%0v>wbj7%iXf=;4A7C;CZ1w#Rs
z1uz5v32C4Y;D5?!0ubo>0so1K&4B_Afd?`Kzz7h;DB<AzEF^&yp#*!BMj-OQp*a;N
z5)i`^`~@g1M8#Sh?HWX;>~jTA7l3D6&;pWBVT6A4Ohcy|Bn7C5!S8|b#s`w=%slNC
zAWS$H@(kKT0VOEbzK-zt0JdUAw`eW+iiuHvMA65eM1T5l8Gc1;QW^n7uP#9)<O~#X
zCJ-@n$`bgapdbhBAEl^HI!hBVZ!?(L$~KB3<$u4%ouz8Q!<v8LLH|JjjQz9NcUGUE
zNs3<tH&9U@Xvxb5?(BR4%^dqqUt`|bXI?Ld!cFsflAu<14RUw4mz9Cc$FE~*n(s5a
zLqPL5|1b>L47Dq>dO-3AFd(~A%53llMsYr`=$G6;-O`5HKoSuUhj9MAi{t)pbo}>0
z>;EnVC_4`SWlDfN;DP(S82oOm`6)aOYEy!T9}!ycB~rISQ?w)1qecV(!AE*Ne84R~
ze-+;9m|Ba1JH{xU@?7r}ehfT^e*J~Z4L%9-hipAG`G7%a4fZmKPLio{AQ;K}fQW`6
z-BqWv;PfVN{?Y=leup~{PU$odG62wMju7;ko|R}+W1rV;naBRj+Q13`o@Z7OJdUpB
z=8OYNAO!&bh8B;?{#EOMjdTV=SWlwc?*V|t|0Mu(cHsV|eG=LEU+w_KTF^I3dySwC
zo0Iul{cRwHY{dRG8>2<%3#1T+032k9CERBqPp9YSpIU)EBk(=AY+$LQXJBP*x!u52
zTW8yhhHxM&1_eTJ>BWxXb^fYbE<vGx5gda^QF`_ZJqff!^aiaf9G}e$lqr%&^cJCy
zm*HmrB4VCDWOjq46X_Dsdme-E%Pvu-VW>+PAVew=0Lc@FC3K!Pf1_DpYw{<?<WE&B
zJxae-v5?NklW}NzvI4#s)%4-$sv`pgG6!ZOjyhQemJ@-zAIhMi)zLa;x@aZ9iT5Lm
z;OL=(g+-A_9Na~Tf#XF$&fxiBuuXA#)&W;WTzp}SzybhV0w8K^v={*n4#0{MSR_JV
zgFR3jMWcdU#2_sxv$L^*<ODGUu*HdhXX23_!iIv44Jc|)a8$)n%3_2a{Dk4s0O2De
z(ZGX1<bkLZ*a9V#fNF|~IjVv+!0K$S090@ATNFF^2W}cbOxQtM80-iF8hDP(1%Uh4
zkqxZWv(&J9Bh48*cM{G8@Umx&-mH~0WJ5T(Hyt9PloZ<9Oxx@?TmeFKMz;3On!=yK
zB@hRL?@i&dZZjsmVAL?~u<kLnG11hqbhgscFcn8{bb}ZLJ9|lwro`QTx1vYI8|n;v
z)*Re#33LOTR-o$%84nl&fJgtj8vxlss(=E-h6yGT01QD+K)$;FP6<Nff;Vjc0kMpo
zHG{yz$7ok&$^+0d0}tSW9pC5*^&H}EWn~J1K<0KPqkUkazys?~3DN<R=<f=(i9u@9
zj{+oQ{?H%*plx(@!L?&M9g48R>Ldap06-{pS_libP1AH>+wi0dq#a?1wBi&U0a-?J
zAYe+7s1&URs&Tj`7%rhhJn_)+Eok7t^UY*W(D_DMf`d{YpmRto{&ZdPxA&32I)Z8t
z6fY5aOaYe(q!NH8;KI=@zs{VGm{AHX0cuwWGdCg>K~h%Hci@RW!v9lJV3m<sAfTHr
z;8KnYGzm4c@hJA0i?mdRf)fAyj-$jWT;T_E3Gxf1nKEs@CkW?BRU!~bN~J)!(99kD
zBxJ$LCycJfA2Tfo8W^`(oCd=o2ZmAcfOechn9+8XLXdz_i1=4H90I5Y5&!{>^qlV8
z3fdR6k<dv&7m_!{_@jaTQzwKWd*(meoPjNZLPDMCo5?(Wfyf&_w1g^^nj|u~Mb*<K
z7*Fl&4#050q=g_yf#-R^cm_mV8ohBNgo!Ey4q>VwKcE%Lj$|A$2=tEvLE)qujz42Y
zicI=JW*M|wzmU#Z4CvtuA8h&^^TCU`fh01rMFaTh=Mv~aLZ+qwwL=DHn?yh%qqup<
z7JbT3KZ?CTDnhOUtcm~=2s{gdPTx{>5>g$2KvlWW8ZmVwRAG$75Xpmv02W0wvhxHU
z1BxL*)Se&c`hrJI0OdsTcfrAX@4>yra4iybb3MFMN0>BA<mqR{fkr^2pe~7lme0h%
z)XG{z%ZPpsl-f7Sj3BLRSoi^C0H{4uhTD^n02zitMYJE_>QL1iWvUaL%7PGp)H{fP
zHEerD=%za<_5}30;qQniO|!s$bkm76>@Yr5507G7;UPdP(Wx!y5ls!#CLw1i<e7^M
z{`1Uf(&Iqcr2vr`eCZF;!rxxn5yVJXR2V1@keJ{HZKg(!8q-g>l0pb%K-&N|1nWpo
z3p9L!MA%1I37!WAEjisp?jLX-<%76-vs-pST86@qSuM{Y+D;5*M5IMT=qw00)efpt
zXKQ+OG9QXqXsr<0wLp11tMnX9k+UaCvyg+NXU+x@dP2kgB|V{|W(;~1B5)vo@*~*H
z@cXE9(nw!@iNRnN7!rAg%+8q&hDw9K;q!{f0eh-^Bd7z~8Ihp55!qZFHzUY{l^}@Q
ze32_08P7jqHP;seCkK#%phF48XULh2dA7p2g~DGTg--Lb=SKX$*+=lFkw0}!3xGP~
z1>G7kj0c^OkpitNY;GW)1`jBKTXhH|Pdv?O_~pz3*mH5T?0ix3JVb#BFz@UEol^-P
zawZEyxf)=`q}!tbp+qG*GFSimrSIPi=6tgoe>pEPXIfE)Hm&$ynpH%cq?sB^WJXLy
zX9mG|7=b{wB}6(dn9~7S5fO^HMzYcZHVa;ng{eO?n1JTXU}2Z0YKu8+_$xAjpBb|n
zbS@8pJTrKp#kF&NYk<e#W1n+JlrlpB86~hRxQJ~JhUyVkIyy$qRyx+=Xy}`kjV1C;
z$5cB?d3Igcpuyk4Ho!SU65J4U`VE{c4GIMR0}rRcQ$|tBb9w4lGiE+S=vW+h!jEo^
z9ej#xkpSuYZ*L_=X5^^OH<TF!Hp%lZ=YxF#^dYsU6g4u_TmuaPVVeXNu0ydNU?q@M
z1(EfSnV_M{uqCGlHWL=I#TgCPgSRz+C;!|j$9du6_C$Y2+H9gf&{^pj6X`SO^rR^h
zd9a5F9oK|-Y`!hUGk4^Y@jgBn_gR~9v9oy*<_@Trfp`xzyqpa42v9OY09?z2_bowd
zr%~e2Q;6S@$Iy4=Iq38ukHN3NQz<F%IW#E<ydV(a`Ddg!WoHQ;0PrXL7VI~|lk8E-
zze3o3UUc361X&7F?lW+5cJ{y_g*|Z8XB2Oc(mCYkzl7;5RH4ic;uHs97Os@ZU*s{!
zNbpne8}bmcA@Eb^>&y;7Q@!)yPq)wrj*lor3Lk)f;CIkhq+UoMVCLb+(AOw&i1+4n
z7}>n4K_UUs1c`2A31AMOv#tJ=bCFP7LcfC)azg;&a0b)0%+-c$vm6dIWNMtX%*?l2
z8tCa;gEBjR8M?z5TE9MwL9I_&L_t$mQGNkhTgOVv(!ksrP*%SN{`+$#|2j}aJN_D=
zF?_-WD=8x>`<v#YX1af{k%Y2A&tr!m&h^8G{BG+k-R>vo#4fcg6gblFUxw8d#jAi9
z=14PrH2UoV&d!k86`0>i1h=Ws9B&#>YIE>zC`!NK6&Ok>Nu+H+66e-5hBOBtsThRA
z#UT{~+p^yfWj+`9x3r;{)cJ`t^X>mBYSG9Aa2v8e3(6Vl2Ps2nBM&GF^KEjV^5d+<
zV_H|RG^<Vr8uTClIK~E=rWz(X;)ofe_$d_iGIJ3M^0fcAPpAF!`EP%Id;Zh&KLg|U
z=RbjWSed!!KV|+o|M_=({{Mdd(-S)XDTf^Yl$DZ^1->fD$tlUpqH!*PfaeHU0s0f5
z?tnISM`}BJQqMk8AIv=E2_C+rR-$R+*+(XUM{J-Hg<j1%t2tA-vO(KX|6H*HRugIP
ze`oyX%0DI5@_!D-U&udJMn-<N{9~mz{UiT>$43yBHp-y?;<UA#lB~jv)7I?Ps-R+E
z->M2b)$Cekrn&}ts%S|mIPo?+J4MWdFz`DO;E_8%04*RiXO=?%Eg&x~EdVrPVy<EB
zY^DlTg1&1TSc*u|9hN4tBjRUesb!^#MvRq^wIq(+Ow(}26C$k@GXOX{;PNOzuK@&L
zVFjMf{H+930h<wFX9E+`2a?ey8d_#n+kmjf+}LcpiH@nYv$ck$o{qJu09G1^C6qxJ
zKmY~&t81*GX9a!(8gn*-A|Mg81aTHb3IMc(4>%3M&i?D3D*c)YICeG|t^|$_GyqI!
z%kL_&Bl)lAkb%wD+l>&2mheZzg9E$(YqPWA{O967vw+*oC(39aKeU89T7rb8uVgJr
zBC@mNz)4CacD6uYu!xZHFKF|R+xho>=IVb-9Sv<0o&O|^zw-ZNWas36k(K$!|NC1$
zl$#cybI!o`xi^RWE4PKPn}geD@Mtg%s2dSS0yorv_sP*N2m<#={DBwwj|%vkK6B+C
zw%`9r7=Pve$;)n<E&mE~|J?ugw|oTA^mlqtQ#=#!Bz8fx6_h|<m_)m>gf0g(CIm{5
zfLt~~D*;|gLA_u^gq`LasG_BUNP$v5M4XF{6i^;yIPkii8GwRZ=7Ip#(r??J-8e8(
zfq1&+!3L;zUr?Kesv4MT&8UhL11rk|HSLfCg!9z4vjZKyU(^SpI<%P;+6@mxeQtO^
zGCR#FR0Vt^5I;AxAUM%!Oz;Z|Wfz?B-ZcnX4wne>qbv-%h55Po5^&B)UVEsfi3<(@
zv5g(+AmzFb%8p>#X<8B<kZGU|f(HS)gJ{N$JTMLE{Bcz@;El5*UYRQFyh#deWvBU-
zfS)gkxR&625r~2obn^>67ZHL1CbHGA1bbvAgO;!bw`xhan;U2W-@%_A9$@%R#!Dbm
zjuN&w7ZO>*#fRVl{_rJ`z`IQ(0P8>|g6m}@;GrLMYk>rOnGW~>prsoz1o#3i!AKxS
zrP+aT0fGSu1K2qQeu+RosDlRor1O;7VJ{jCJwTj6XB2D$cn%D(2M+2Z6e_{`5ek$P
z{xVMb-xlw`{LIz=;D#~Me>4N&zmfk>0gL@7|KH#7`PKL%({I4v|2d4`+kY%}ll1KT
ze+mk63jf&uzvE+W#KgP`_@5OelGiTXb0*g;68Mz^{AB_D!m;4`{mM&kOLJ&P7**ZL
zsvcHkS|ER-Ce3XFPVd!z)~xI$k5u}HJkI#P9CcJk6v%s6@*>mYwrVI(rXf)+ELlbE
z`H=<ButyiUpSM0Y_Qo=@n8SH`>{|eP#lwpUshA)A3xZ_~#8kSyF7Hz-I_{fs_(S#&
zIi>e%Ty?reR^tpb{8Rw^DwDdLIvG%?*G%9O6pAu!RcL8J%#`NX>2&)0p0w0G(tCA}
zmu2Xyn5UZ<%USbVO>M2JGdHW#E#IE@bMhqvp-+h*rNuZn`Yr0)%L%R`)$mg%<klz&
z8y;NqJq`6}4Z|764SW)%!skw}@KdXQGO%ap2Y;NH#}0-g#Rm;uu8-|sv8G2QvSmd7
ze(eIgY;(MJmvlC_zj_Wo<BF$c=e%pmvKNOkU1`28BUP=6O$u)4F{@EUm#Ul+e$aG)
zMQUP*|53>D1i|lJ=}xQjoQOjwO0AWf4!hncw6y!O<D$?ZvhBKV@d$LGRKHqWQ177K
z>c*BeS2o7*eU8|2@5~XickiSuZzX+uD>2RdX8rp;MORH$Iy^1ERCumf{uJlU(luIH
zihME~ykE#YQ9M6Tbfs=>wAZdXC%GDvWLAaV+iHcHvOezNpklw*veEwS7yO0=8%>4X
z^WPVUEjad5C1-<k>G)dBbg>bh*EtxC=p}a>UVUZI+;#npvd`K`ql@}CuHWYxOJ((H
zoC^M4aW<qhiCDgT|K8i$^{t!tFyKYMT5qVmEKS<^<HvPb@(bMF^*%)^N;*&Wyc0Dz
z*LjMe>}s+F>QwBap@ub@Iysh0)5?xjn;)(q5~7V;S@}I$Y9CBUTi=kejq6_`AW>dE
znY4uQ2Mdh@h{>^7+4~tBzROT3=FKn%AbJYdy7q@vhwfJonY3w_flTIho}yE2eBG%_
zO|sI@YsqXGe({z^@4nbYt#rB6b()xO6<t%$9fuy4VEezQ9bI+$Wd*V8Tf|gZ)OXK{
z(Q%8jf~NVaq@E0JOp!dBzuB}Nb5OugdvSD{=CE=7_Qf&RQutJNe#yYFbx&yT`<Nt?
zl3IVFpA_Q1LXZ1O%`v`vgx5>UZ$|Ddar}No*0;Uqb0?AKOK%R_W!W{SOB<vrrmsFd
z%XakmeQCqfq0wKywm$Y8AAR$={;_$rnHWpf<=k!M>rUqNl)icJ`OSTnjm>$d4~KQ%
z^Lo&ur_&#Ay#<qh|9!1oMy-nEu7!6Gn7J74YdmLEYGKPvuskeqbh4^1AqM@~qeQ}w
zPkn^|`!4SD9{m3DuGjRRZkyb@5HmT%(Dbe(t9NhT(}DFrQv>)1#L_Tdb;H>NHcfpt
zU$DC5s(;F}wC-b}mStBpwL%t%x-Le`G(GLi+Z1YSnX<E@BYc^VtNe#&llK>MkGAh>
z2>2mzQS3mJ!~ta^k&hZ_JsEn!J09SV^P8FMV>n^<)?-72w*h8pg6)k8mv^4)jPd^R
zIpg^$)}NnT^4@B^`hml`b%{M8c^3A~uIjhk8VmCa7ex!iD6R-gY7@=AU9%!MCiAk3
z?t_yrZse9(9rBWsUbEKKe&_aw+qW{ZV;AB^bvVxMa?lMudnoWQhqr*GX_?weFW>wX
zyp?*wNlxE;KkQCqWSQoOmY?`8d?i2kXV+Po<r<Q)#cxx&63^!tyKX1%;&Yzbw4muB
zqj|JjXQskBm#Tv<$BhoT%V@~GTgA%uu!?Wx+bydI+{a=AV)k*g8aF=quFJvan1xnJ
z;C`Q0wyJos(QS;da#jeJs_LP(q(EnK;>DU9_lmff)4i=kbERaKh@m;jN@ZNN>Kv{W
zIMRUxmQj@qgVkNuB^riD(k1bVX<Lp&*Ie~wU9WFo!PN1JL{2Xpk$&x3wLoE;<FmJ0
zFSu!#N2f}sPYlK<bf3mItn-xJA6R51gZglNp}5Vd{D-chY#)OM@ug(f*H15AJo&Af
zlk`dcQVLh0+4h3Qr{V^N<TQ+Ms%p~dOMTmyqe)uTg?pKj+HZ-hUD&UZebDHTn?8Xr
zXI19WybBWEioq#PAI0~6^WJ){)}+8`C|2}YKS$f;P}vn|ai{0HrV$F6C$4s-pZ6{J
zQC_Sseg9aFGd6x_O|1F$*99{5EjC6B5eNF^*#sQ?f{v_uzu(nUbXCUDx3A)j1G{7l
zHnD2&1^%5t2g{gd3%`85II~x!%t)t0jp6zbkC`*Sm-OR>YtDI}NcTOy?)_;NW#)^V
zOJm8mFDBWb&+}yD3aV#ZT(=@XuX-xm^#jA?B#!?ruf(aoL)Xp~Ex8-K-ak<^#0t&X
zW}%q>rNO(|<dZ~l;K^l-Rr)JgyLel=Wl|W`{o--=S2G9QONrUYnK2O1o5t6ak1tS3
zn`+}|6kOV4D8BoygL^UG{o5M{x_7@iPB@S%aJ=$Bq5rnEX;#-<WzOF{lB#t1(N%%s
z2glE}ahRsAwN}lF&XZf-w(Z8MV~ca8Q`7hsFW9?P_;lsn<{i?Ht1`;W-R@#q3<cUh
z*d9Ig%<zr)zMlKSyJZ<fb9C6Y$@?tc=i>9}sjzha!lz!UW?q3icv#sz?U#MUPIStT
ze2`mMzF&voxbWR=3Q^g&3$L?oj6kEm%W@nV=VjiITPX2vwBop2e!o#Z!JJ%%H!XSe
z_3BGvrffk?&()*rw)Lnysn~5E@jCulVxZ*xm5pj#%+*Yb8*ax753O#$EVMAqK0-IR
zGN^+^LS~E8?ri3X^5DL^1G$XncOE^#q_*c(`?K`0Yo!}9@{e)KG`Q_L<5A{%&m)<P
zL#@#}@1f%{{_SN*S8zbpzSg>RcN`2aH6L*_J&fb5ixa(4defu)<^q>biA8-5Y2I~f
z0zdf5w!hL;sJbA~5iNDT#nK=w?PbKxZFv#R&ZPn79{VR%>l<U4*XePHem{E5Pi0Et
znZnoO@8i2myv!nONU{5WhGCc8SvD2X8_&YO-I47AtHX{Z<*X%Zmtj|*;R=1c^xVm8
zx0CH>CjG1SdN%I*cG~lf*In{uj@zFuxD`z{PphLBtAz`9Ur2~c4_MvVvr%lx>$O8n
zJh{2`%pGhGj|XUQW;Ptsibxc=P>~>xiP?C;NCWK`8p$H>Wci^qL2Gl{kk>koz8~2n
zwgU~aqI=Gr>LIiX-XhiaK2luMA%L}v$m5x=kqj72H<JxD(hGavljP28YFl(F`|c21
zburdx_Y1WT^4aC9h3__&IB*qx<0%#5FxQcO+OX?Ud5&2fgC+)bZoviIkDoXCPF1gN
za#J)Bz7VqI)1Dz|vu7TsF!z>uXn3qyOO!8U?X@mr9*TPG+3>3PVWrO5&z<KNGn;a|
z37o1=IKrP!F05?Pig|qP&gTc8&gMNWP3t;vz<FtOki`PeoYAbW<*H9wK8THv_U3%_
zmPY#?uf+#&O6S`iJw0JOps+UC{*3Lz^-9^hCbBPSkvd#*BW;V*o#gu^9cqsI{eSE|
z2V7Iv*MJLB5v4AikAQ442_T9XNPs{fk%Rz_hKvV9LxKrG6mixC?y7ZRkyd4hd(>5N
zAd0(CXVogs;-{sGRa^CY_q|6FAV6D@|M&lW9LO&(_nmX@dFQTk?|t_i?V5|+?~9jp
z_JzNGx8Lr0VeGjzNyV%^Y5aXwhkRTFyOzR`(p9!I#4GB3SEXZ^BFX!9MM?4Lf*n6*
z^$eJQcU{aqyUJ~x>)pm@RMZ4B81a7|ud3+yy@SuMJ(90_yZ)8-;G)+!ON(_O_rL02
zOR(#s{zJFs@WiuHtJDF(Y5sF;x+|5rGnR>Rhm~~d-#;sEWrDZ2S-<k?*(EbF)_n-|
zo@|~}^~aq~UGI<2-5nlUxlc%+Y8G|DCdFEE?fV($w?FRjW#EUJZX@qK44AU++$y3)
z!k*vaiyV8E4nO<j`Vq9;ejUqBNk?s$^mxsGFl=pc=4TNv*4WHjo|7}s^Tw@l6JI@i
zurA|i0AfI$zh|F8FHY4y_gFk|XMsZrwF7S<XN=<%`?BJyN!zCn*szc%9x!N9X@yl>
z)bzVIl`B7UQr-y<INz`Hd{0}^<B*BWzfuy*?iH+9Dk@ohHQuu4%s@?5nBcVI(9+k*
z8J@0-P6Y(c=^{PYcXf}gZ}J@TR=;>TYp7H9;I0dkF5N3jc_q3R{~+Pu=N25sA?Wai
z;P|2$e~}%mOWr^K;z+*@>jxbfJU-@Ot~Q)IJGC${^l~DbeeyyMiLmMLmQLGcmT=67
znkD&zp$)Rfk2a-8eSTH2;LeuVM0QrME>~XnTj{r?Ecy|&`%U?XlQ-XK7p{J+NuD=0
z{}_MtNcYM)Q<lB6KWY`Jlu?}CI=SY^Y8TC0LR;kX;rr0H9e$eDAuUsx_qx(z>&Byk
zhqsd8{Fl;|Yjk_pIF_p_-OJVdz1JTetNgO}?O5_zyRZZPz6AA|!F{UwXPoJv9Qvpm
z|NPtZBHB^vo)v=bT}Oqy+ecgbWS>JmtL!zy`kPl%7ti7!ayK7I34HM5G&*<34uys8
z<jMm3j`Nw$wijl_`CAdgQU~q5GmA0gz=p7suV(g`Fe-SW$L9CWirDv-L+8Th*4>#Y
zzVyUu!Se-Mcnel{xG`$Y_2K4T{Bx0^0Z#^G7Y}%MMRacMtAbmMjSCmYsTNd`M&BRO
zYgJM4vT}!~y6SblzioK^2HrSjZuhUlo}Soy`OnV%@>X{-U*F?ghSWA|ba-i(dG4XB
zDBfkOCXXuhoMWCwy=-^D%Ds31W!#u@ch114n*+zuqu!Q?2MqHa?i4$Ewo|61q*A;&
z)cV54E4?bOY@r_X-y2uy5U9*NVCE6pw`T90H#N1FYo1)cn=Sr@BG~LY>7?~+&xq-z
z-#pVr9i%9&`&Pa3?zgn}meAbT!ob{THnJ0ol5&MJyw*=#zAwJ$<!rWpKoRXo*iQ>K
zU)XdhJ7RBs1-aUSQ07*6d1<e0#j4`|2X3kMW_5^saebqM=nr1#ZQpepLwDI6(SA36
z_in4-plX*l_se>u3+E0t8{N(M>L{yYmbAzZ>sc0}_-Ph{lWuaozloFV9vyaeoM7w8
zUN_eLViU74`gZ<rWrToeJ5tHJeb4g5tY_}`Q#TYki20X}4ljQH#i3+)&((QH7gO_>
zTwI?bdUws~tXT1QSN5Q7v&m7zmTk0oU%NFDnp`Z}t+;V5?1AmIQH4}eZEgkWP^nLr
z+kO&baMzw!clW%PzA*0R1${posI@4YWZvO5qj>9bm*j%<8N!W+_tz{u&^P(kx9(*!
z$DL2cZtM2ptY2Dot$SeqOFY;4J#2C;_w#2$c}c&o8SHW<cHXSgho=h1xJ>XFdTt)?
z+O?dW&w5ZiMZe!Ht-PpMdhXqnuy5R!=dTVc+7@>snEC3EbULR`F4H%x`=T7%qTZX2
zJG=SRoY=YRdj7#*Po&z_RQ#?ZaklbRvVcdoy}K^<jkw}pbmr}r+Sq9SN1gZY%YgRK
zyav6fb#f}(v?|&oW#=7LwdP)wQ+&Y?N5T8$7qjvQ&d*OieK|L#)5=a~$GUm`HPO#k
zr0X3mVa;)>o_{-?W_H5;yTjv!J5;6oQ>^&IU2DuUy6@j|;x4(W;%;2brHbrH&c7<s
z|N33EW5?<W&j1HoWnS-v1)c6CNj{`+s2c3T9rLq?%*$qczqJPkZHEh24Dz}CbIC2J
z&~CJ_d+1%uHFNEkIu;Ha?3-2nYSHoD<rdfME-b&98N7|&MH=HB`dv+*%%$G@=;{5P
z?gp*RiP=Zkai?fZbhux(|E<XTdA7GkJ~>iz{6I$Zp%oLK&Z!-9V>A7p*WFOb$z&3l
zN*u{4A0PDiX76cRA7m?DE_%J~><Rh8@#{C#b`)igA24`g`lLS2`AjSNsB%xuk&$BS
zUEarH7>fe=r!2m-StS_cT`_Q5$X+K>s-piAa)(aS?1ZxquCAO~c(uz{W4G7^^|d{A
z;Be#~6|Z`t7k$tvXa6v}8S|d(JVmI@>pyho58p2T(a-VgzFV`MpN!gm_=3Icg|Gi@
z-F4q}t9@eD*<@QRcAca9%JSaiwedIm^9rYaYuRo1v;UF0d6q0WHOh9gHB<Smh-Dep
zr>c+o_WLx=%ZiJM_cxp$`O}ASRY#Jtk9?t?-hW!A`?O_oT_5e-Klv@sZbdJPcZ~U>
z7msp>96CB+!w<egr(~qPe3)MP-Z}R{=&j#LUmgtJbo7tj;@!_{?pEK;vJTOH$Xt<W
zeeb9wJYfj^UCxo5+hLVyKid~;2&H367oAx!V92toMcb6x1jpg&bY9<Bzu!i)mycjR
zE}tC`|Lf&`A?IGK-ldtq8Mok%Z;Hx~+}Iy@djC_e4;?3zr1eZoc|UiPL)Pf-1BXB0
zj>}SCIlmF!r6|ma$qIG8Ib@e+%ZKM*CU6#QwdrOZn>^qL|2&O_=yIm#%LAtlIh-0<
zExzTx_^s$ze2*DrpI;lF`qJU8JO&mC&OM$X`g6pV!k5!K7^dW0!Zgb9_2W)YM}C!<
z)tizhRXvEhz&#tzi4dGFDEF9u@s|ftoi(%<QFo{2h9-QWiByCY&Wegu<b5&Mmen=y
ztaCXXx=k(le4~xi@h6}EYPphgKKu-~L-niz^Dy(3Z_@qV41If0<7QrLv6fI#uyjpK
zp4lF^qY#5U$YoQm`Tdh!zII&oom<kIq|vh@X05d{<A<AD^fYUFZ3}?88H8V9D_zDk
zrq-JbG`U8rPsUWH)+h{Ac@~Bh3u7u%YBW$WYz<1~hj&7S?}+?eLB4O;e%$(BQ|rGH
zItflsrGFfA99nw+!;3+0^!_icJ^o9Z0BFkCE>&Un6sqwZq{^E~>0|@K_67)@F$9@0
zPHOs0D)iF5x(jj*K3(-VayltBJyilpA(=G+tNTsoi$Qn%8<oO9U`h@HfxVGb1{zax
zVE`c?b^|Hv8d(SA4|Er4EhzE77@BGSt+Mw6pyl>YZP@<3y(sPNzb&AZ+y88&on5jf
zo$iEOgOADf-{!5~lvEf%W-Yh=)D~3uUky#R|5khh;GggRGbr@-{r@(BrpsU2YBk_r
zls}C@YcKz{fac0y)=DNoOXEM)yW#miZyL4z{7;*JVd!3n43g{Vlhk1B10OI@%JpM5
zWIUdlLd5{WzvadQsX6ioW|FRL^i1vW_o2!5Pis8`;9vCrR1p8Qz5oC8&`kMDX<!M6
z_VIbN)c@0|4cC9#`~S8AL;pX+#7s;^Gn(6d-C!1Fg(1jkCMR~L*kMpNu|t^~2u!iZ
z05ZcScKXcf1{MqC5BMmEXaz<5KZWMof7{r9CfYxh-roM(1pYz$&-t|N-xPZcAhY)N
z|EZv<_K&&^20Knj>c{5MLi?vv8}0x2P#Nv*zfHi?bIcgeRsw=?r9po{G7w-A99F}R
z^?G`a8`o;tA>1JB5Sl`&P%2U<8?rM#5XT@<pcIWdO@aEhVUVbh6i$+)DbyN*A_0%-
zNCNINA(y&SaG1+DKuL5(kI(^6x+xOb1W6+BQV**LAl?W_1gFdROkpUVYNh|}52>}J
zL^u^zrMVF6QW0*5a6}S00H|mfkzfU@<RG@lM4dtd6AjK9kUMyGBpH&F)R<jR1Abcd
zFz_W;DzWd$N`;gNoMjLQIC~doqy(H@34{clN`{`(L(2;b9qUT4LJu%PQ?P(Sum<(K
zkCY`E6VTak9th!JMX-`+(U^z^Y%~=OisnKL242~e3Z(p{aH2v*bj9Mp=tG`?3qSP4
zxQi<!S0ie}2tg7_9}N&!P9vV+M5P?!h1&zZ*j?kyg~&sJg2r+|JznY`E`h3lGW}f_
zXKe2uJQw~{I2y_oC#0DotlN|~CZ*Mp;^G+aTNYV^`(Khy#!qn?BnL5a5~zNtuWKrj
ziiIbTLDT$E$J(e86>1WC2+{=&meY^|tqO+B@vM2_#v-9OjjIP1+Re3*yuf9p{(iC~
zQ6VE5=}g|R7NPEOozay=GP*!yq&Im(jW?=;#?){FY8ZHCM)c5-iJaC17hv6z_4b4_
z@bQaGb%{pu&>9KU5-+$ZUNEgG@#sykq?3&|q!5-F7*C8hotSAPD7}%OEpdfg<_gmr
ziHw)MAX%+O`XjWo?Hkn{eU(8H>Qx_?cCRk~C!w+ZmnQRW)ziQK>ijPi_<v|$|NHb{
zy8Q8hO|G5P8hNx}|5GWHM*Ba=U%UO^77(G3Y1CSELMp_9(_kgiU27mgs!py@LosU2
z1T4-@Flyulqaj2f5pGs{lPJKq25^?Zi45_BSUf0_CxqB6ju7HSK`b_xEo4K&P>ukK
z;YEcD_{<<S1pNQn69^8i3j_l0Jkk$!>IfV?B6cv*pETC+3#rV&#U&p%;(3!)u*QG5
z*9e3bOY$Gi7(vL$$RK29W*Q}W86~#5*da=_RHF22Ne23-l;J;J1KZ(038wr1*7X6`
z()zCtqmln#^!=aq{{Pd1FbUSes81y@nG-3rI%Ecc4*=c}?wC!Bub&{(Ze(f-5F7gJ
z1tWwO>Bp?<cewiBm|K10Bw$<+tgwoPbc9%Bnz{hF22LcEOsc<DryyBbkw~cbDAZ0-
zNYUjch15i{yiq#9h0{|SrJ2B!n?f|nQBF#cOEIye3YDHGqJf5Ka?^<l<pctOrJkfx
zs?kWBIt>VIr%@;S5v*`mc_|t>eqT$%5E9gyM3|(4Q^`{>7gcrNo)i+5M)F0bcoGds
zI)xTcM`^nJo3;NmvR0{MEwq0xA4;SB9}1=Y{r@%rGPxNGFj3zsH85T;wK9z&C6z=V
zlZ_l{*WJauY2$venS6mTn#JLXK^x~qa^u8;xQIX=SAfvAA`sAj$fyHBS`OMr3E8ni
zPGk@_n#G1_`X^{0x+EbTxq}Mcx?(w?&fA*NLaVC*;;S{Ox<no5&|LyGNDEfF>K|K6
zz(P&o4&_{!!Lf))0$y}f5L?UwA<d>vg^X_kH^*YWFwhmyfhQ5ia3bk60+$&X63q-@
zL*PQp=S2ylL!#LNwg)7L4s4Jn4vb=s=5RU8NP<I(Mv|B;L09O-DTr0;LZvZiuDJ7a
zh)l-W>z%QSBbY&-q^98W7x0T966pQjaUz3x5dH&P6VSN|o&ZrjXdYA#3IXCr@mSG8
z!ba%;8Fe5R!4!l;lyrImSFbo0J1{!L2nD%KqjKwlY1K=naP@(*Kspa3dVxNYizNu-
z_-ufO|3p-dryzuZ><~^Q8qF$@%L@vJhyrwL0}Ra^Rf3v`-O?i&A!6OIltMJzsD}nX
z#N<Y^LENBZEF!80L>y~GP#+~lqM95jNe01@h#WaAQD~dM1;VjltWyDjK=rYDn!(2l
z5a42A%0Q67Ch$3UpqM&guz{@!WG)CMppQ}j(CeEyPyz7w$7qgPsFBFwWC=2HZbm^o
zguen2Dj47CFbD<=geHji8bun?zXj?PN_jK95mDtjS!&($Hmgh=_n+ufkOIpT5~W@W
zL~Kt6i9(`bQPqs>4`T-GNEX5P8?SaEiKe;AiD!wZRHelnOCmWUH60NUDF!`5@Tu!Y
zAT-pxJ=%8=>e`>a3+6<Mc;Rf;C+Ss;1{<_zq1GFISR6qRGm6Cw<gy{7c4{<m0(GHJ
zLi<~Uh5^hlf)U4R#;Pzy67}rpe~X<d%6ckoq{I5Rn;&^vSKkD~7||vr+k$05uWwnj
zx*1`tX0YMhxFkNx{%g+uubahvtc}^c{ZFNPc{QB>`%q}@=l|LS9H3_G|GIGx-Fx?h
zz@Xx9yufO5J+)bmhQ@>rA<eEVySdd{Q+9I$E_i`iikdvc7=?;XgIv;my<H&|<{sIT
zt58jVxR~F1A{Z;E6vU(q3J&o%NR0@Mk+NW^E|Fj#!4?RBJu5^?7`VX)jjS#>aWa0w
zp9BfjkQ9|T6`<kkB9IO^D25^<nBi;>11FspTTNl(Aw+N{;9Zqu@G=SbXmlzAf#C{e
z1(6es*Re^66hx9K>^QX!l1WsM7L3XXlOYN2oLHy9{4k>dpOKtYdMORG(#e>)U$>8+
zEI|qlLR5u@q)akM3xa2oKoLQ3x+EFtE&TqG;DDuZrKzueqA6Z{wN|SDar9(KY6UWY
zpl|fle=>>2v>2u`ih|Lg1VqS1DgmJk5b~BQk8AThG2#C$M^KRi!J9Gq1vCdRvEV~Y
zrBXeK4{L(Zhh^d3!)3tjIi(IqAd`s!8EB2j@Nb;V1^fSe@VXF^9>nMS%akNI9VSEw
zx&FxtIrbw;5ah3sp_c@EPA~)l@*rj8N(4Lp&FPO&msKEBz=oo=us9+($RL+K71fQH
zt9RI5AA_e$P0^)_Sqcq^1B!DtMnFyWWLU01x`}4cgs2a53_*XVkx<RbV=RhcO;69P
zu^<NJkQ>UxNmQvduo!FdATvWY4JBo=SlA;VB?OUGYNa|+4Ur>+(Eqacq|J@nN`AI}
z1;V6KlX{k@%g2mlXJtvYwb9{{<e5o!wp<iROMIq8K9cg0Z2tRp1K>?vw(PMTvSutE
zK%>!UbOViUK>Si7;@MXs_KHMo088PFSfICEI)`NUI8$!)z6|(N=cMl5UJm*&m1ht9
z1hVE=oQ`9H-vRJxgNQOmAzXSRTzZRA1pcv&)+Ig5&sEyXyIb4~i&FiGgj|^@JX;8+
z^Y@jH*F8XzN0OltIMeOu>Pk^%9mVGdXjFFO(=R}#ew<vi#h@ekGz+3Oy>T9}KE*r`
z@eaEU&$f9ES`c(nBI-E#FYFUh@$&IB3qPL>>ZRh*$d*xa(LNpkN<X^TxF16A+O6(y
zkRL?;O*Aw6L~fu7RlQV1OE@Yzi{FkFjo(3CY|}7w`T%XI=wtpxQf?*FO=eG2-GyW5
zs(&ZV9T)suQ`lQ&B)bXVRyO&AM_3eBB51G)=&Dbx(&0YGoFh&7mge{q)e_#kk$Mo(
zm^+_@_}T(+5adMH&`*ndDt5%xX=#6@-lDEn;<J1{MjHYVGR#tV1iGR%1EGmZ<`*FY
zn%bd>uIf|8K9UvUW4gmuTil};vv^KiAxk+O-AIYMNb)0T!YCu5$jlGT_Mo|rhT=ns
zN9w1-LjA<yF4s;8i5{<;3fs_4VT`t*nG~)Zrc6Qn(E=r*#N_ezRMgoY3)R#DR9=(5
zy85pADoDFToprUb&RU%#S!Z1>*I8Go&Jq>us!@?|DkD7Z=98_O&RbSwiIq#xX9`zn
z!FoT3dIN>hZGb-Ur(a9};xn5~Et~x;N#hAz2KCG`<|YvaY{itiM)=C9p<YXK-MNC-
zfFu!Q)2zr9`To9Q$rYH9SFDPm=oOf)RVL=YD<jDX=w%;b#?#2T+&B2ggwQvr@VDTR
zpMtAi138yL14szM-J@{R+}}LMfyA8nh7u=As&iFRfEX)CH35p4l?jk)GOcJc{RxDb
zJdH4u&8pXTSI<{eP?L>{Jhv*Nsab(u3LH^{|4s$^O2r!6m9chR`L{WS|0?|>EGv|2
ztW{;MMZ{o-`W9X2!RK#^W^K-GYeQG9=Y&oze9s47n_U~v2;S7^0OJ`8K;Nxr1W!Yj
zo)JD3WXaHjeFyKkI$#g3Y3_Sl=%4pmy8h#P?LDcC75-lb`=xSp{b#S7p8xwI*Q3{e
z7;n6uC7=PtC$jic4lVvLl;76+5AT9+atSDaduSCXsU4ncAt+MTs<og97bUC$B_h8$
zxR+i6T5Hv30kP7BpAdawYd`Cm(bint3D||&t&>Nu+u-5H2{x@nTh~h4R?L>Q8OGmt
zMdKu393okC;15}dPGSH;?|g$rJmx@HVWLi!bE%cu>qudwHt0s{8=@C7=M!wq&)c^)
zNB{d;U!SLcDY?x|c8gTk@?@{aaQ8%`-BN?ycQm^_(d70xbKBM|U)!~GZP&83WlPqU
zEmvE&RBhQZwQWn(o3%V8+kbq&^lg-}D*ksrVgE<m|0A{kJpUz%fBn_%!C>G56m7Fx
zZ#4&h|BY_%YlQ{6Q3zD-V6ID>#R&WBK<E<>AG+$jgVqL=z-U~V^V$4Ny(7km1{q_r
zg)tj3m;YEiof~&}1xc>D&96g0zKuna@T-t7B&4nPI-Od#5l%`l^eQ=Zci8W>BdH5{
zG+M<H1A@&cV2%b0_2NI@rTvro|G{h6|7Snl|K}yH<o18r`0sKddj8WsvP3HXU*HN!
zdcOTb{a^n|L%*MZRvP;KxX|xyQ{_p~-uVU5-uZu6w0As|d$U09^~1RH@Na`4?k9wB
zmmd+9y?(UyMzPilE4_ZC^)B(PEYRtx;foYrGWz-zMOtqZUA={f>NJXaRZ0JZDC)O+
zC6E7Kc>lLp{CB$l+e=-`_J2Eg+Wv31GG>o%0T+Iov-R2XUEpY<xe?s=?I3yIw}S=y
zz8xg&`*x79@7qDrzHbLf`@S6{?)!F-u<zSJ(!Os8uVCLd_gXsthsN0kkFDtc#l5|Q
z*!f@iwEw@z6`TC?zCSSZId!l~bk93P_dMSDKL~#vp430qn<t0a!;^9?TPQU0*~3Pm
zkj>|7`TEBKd@UFM7Jeb2=skaU9gr6I@~_i_Qn6Gx%x6!_&BJW@<HvILW20HlHcmbs
z?$u9=rF^OMw~*Q42n<wuT)_wa7<8G!B2B|~TsgJVoGIa48UM|bD#YC(ccad4!D^NF
z4j}7(wp=(YWXp|%diJDNtYyokkB5bFzFgjG<e#HjY?I;44*PY%x(!?py3<j>mg;`X
z?Cj7La(K&}C3klC!aBU+ceL;j=x9kCk9a{)gFs2^HG7UClB)seTeW`eq4s}tL4Q*)
zbas`?KNbilK?ocE?y;bJjN*XS;h#0=vjLdJ^jQnYdi2={)I$2K;=<;=qt0x8P!RiM
z$GLDLC^bcC&DH_py?A}IjAi;iAeWz1#&Z2%Jix`CnE!t{)&DPXRe!yo>h4ilM?xW&
z7YHaB1J5BkLSJSWM%r04*b2WMXR2(Fz{Uuk_Te|f2U9%~{51qnWuINR2f0EXo?|;m
zd6~~HTa6>(uj0o>xpq)K&7PEtdms!N<?LY{gk`z#u?GCnJp5SOM;$qkWuB3NWUoBu
zXLxa(*{NRWk^=+gsSOYQ6Wnt|sOS(xOezM`Rztdq<qo~_L4>4`fbW@4WJ9w6Im3E5
z63`#YojA}GLAS_Ix}^POAbqH4MrBsirLFd^JE!#{Ay1!c!*)lTX;bY_)vovFv!OOs
zx$pU<jVB2Rr?vK=$$(BIOOgSRf$AVUtmICWZoIJL)$Vh>-bNcRi~%kDM04)+Ob5%L
z=(wmrr7%k1l%E~dyf>v8XDRj_gr$aGB)!E9ZEnqBJaZIxtlW+JRPM&zDR)Djl(d`+
zO9g=?tF~=e4I14*+wh1x6j$h4L&XioukhgeN;vMmvMT1DmBmc%7eE-=TZa8hM%x{r
zz2no~qfv7vjdYJjZS<?aEutcsp;e(0G9$afeDpjJu`f72Pv)JV6gTAwZwA{|r+|dj
z*60~t*kxEdCW7D%P8~Fsl;q-Oj4f%}kR0g*-eP*jMoaR1kt~cqp|m&>N}R596Gox7
zJpj?{%*_*NhLJ@95^<ia*~t0gBGv`bZcOQbf%5L6bl3zz_Vzh7IOe8eiw3#FFZ_g~
z@D~KcbMjG%z{wZ07O*sk1au5b#ocu!-Rm|hN#SG5xotte;sPkxuRH_;4L9Nq7ZzI-
zS5x81TT|=<9&^VMdT^OnTZhH}W0e*)L8sMd`wg(73$sL>8<2#6L!BQ0i75M2SxGjA
zT61=*S;h=$?ok{CEU%l(y+IR`-=`d%SJUr^Tp2B@rng;A^A<{6%9KEZ^;07AtWM}g
zp~nUKS_H4pb!Tp2Gv>?t3k&(8js~iAtH~h4jQa;}(KD>2n0@WEk@wb13?)Fn)QyMf
zstR|c87MvFizS(+YOM#oHou3lJ+%GG%vCX@mzNC^0+XjL4iUKX`l}xx<X_1E;A;B=
z08n$9%$0q8qRKb6r^BK{fYO$fJ8ku+sCEWmg<=mTT2HM9bDUT(X`n01Xf+Iu0w1UD
zDeM3^W{o@&%HMZ1pag~k%2vh$$}1TVxC=2+!UxM)YtW#qJ!(*%Z`g2^4jW!}*l?8&
z8#Wj=MBY#XL|?sDEf6&-eG<cubg`AfVxdg_KqDNv2CrFyqjiGSSj}jB3e{gKdi~t0
z%$%|~R*hv7G2bc(Zjc(w!&1gZOv#27mLov;<pYofHi}h)5I5DPHUx~)eC$A?^3#W|
z(V9(EOM_8`$Vnr{XtNH@g5%65QY^nEiY*v)ZI5Ccfh8lc1>=zwq+WxiJumraC!lxG
z?-KiHIOsCaM`Ll8kLr<=NA$=I@_Y+8d~Z_gNK9s++AFKMBnmSXB&i^I2ZCgIaB#}x
zDU-irCg(BhDVL{Q{*JkvZ>5lOdCKMQn9IE#K2knU`TQO8Ip26D<?@uv-!YfF`yr)l
zp0fEnX7hASB4zTo#^g(F?a|{#c6?*|#wUzK3S$`1RY)E~L0@|JRWZRs{P^{SJ){@E
zmd1aCV%Q#E#)|lld^sQ4|F4)Yru+ZB%=I1PKX}OGI}hfF?is(6=&o6QJ?@%sC7y$+
zZ$A2=yJOSzuP`Pf%mNYNx{3Q{1ke&6&cu|f9XS)Ty^0VGy7jy?3ovcii88)3#A-ZO
zx)r_~hrHM5$N!GK^TWp*yn2cMS{(HGge)r2U)ae$*mzHu)hoU26Vk0Mr-PZ^f@l3^
zLR?9u`0ID8PMxKx97>&~<LvtW42R1Nd)qPIy#@E+)YCWZ1yAk;|1@vdlo3*o(UcQX
zuga7YQqRMb7oL+B-nw^Q$_c3lTgnQlmsiRNn;BD5=cLWAWdENRJ^!<?Uo6MY|J+OW
ze}9o{jq^VfPla3W<WKiNxK?9ub<ywrcemCFo`LCIg}}j?tw#UqOQ+Fk_s-6m{iL*o
z5L`%iHE4cjM|wrB;)1kaYW;3JZ80%zv)}JU(J1Civ9yiausLkS>sQQ|<8b@+L{b#<
zd!e+A<|(Gf!@pu_OOd)^+D`53p!G*m+F~s2;Jn}J{x<AIGn68A<2W?CwUc(U5rrGB
zTjz4v{Cb5{=v@vYIFte3*L4zXaf6d!OT~lz!?jO>O@{m$4}uNI|EaRK<%3`OwfXt4
z#r;w~J^%G3u1NbUhP-_q*u4EqrGve+{a@lrX#ctW{m*~S!;mm-{};HD+g}3>d!L&)
zQ+*p{EFb?D@}<4#`EUFAVlf^6zr<Djq0y_;Q)RKW$;IVKyHzJbRusRK>Y~^fHptiW
zVW&+BxjaGNYS|IRW|tmwDezOu?(Xh#ccq+Rjm2SKyhlI<%*k)FHqDk(97TXhIKIOl
zRZ@=WVVPA&b6_stY3zL>b?d=&(EH7tXfok`eRO!(o=a7crDVBuZFYmlogN9c^8nNS
ziK;pRnON%eQ4lf4;QSyviX-rNPPT1<IMfl-f$^w_&op#ksyY(E>{<0cbM5v>s2ej!
zojF<b+7yV)o_H>-N`=T1$+A`F=yG_PJwzx~kyWlbGL(noOs1-6w?tEp1k5eLn9xES
zjQ`qXXT#Dchse7t-549fv3DwKRa&El!f{obj)|lLo<LPXVG!Grj|AxBIde7!EUTi#
z2`NIENkz}3sS2P*+W5E%O=!%<*hW>6-&aNYWl?S=a2W9Mie{xC*bk}xkj;juLbBN)
z4W~fBF!^TEtu~feL6C4#U}(ZGpf%U2kx19PI-DC*)vE-xC9yO-l}lh>1pa8;q7R*V
zCmi?q9TKl9Lh_~ga2;Z93&#WcyIvmm)IQ<ZJsEJld?23C30XKkXE*ERk}Xxy92*;m
z-mIAm*%<k?&TdGga#fL2oxcddnM$*{q*Fk`afd!oR$SN+feb%tGly{nZR}RyX$j^*
z03-C`)Sv?#pYXdiGiozvO`RWv3?=(dYXY!buSDV4b5Qj9VDzGtNczAfUvd%pT)L7>
zO*n>51=Hh}kJ-kcWCp0d8Vqaf_}fHYNGz9&GQi$H+|oUGlnzRSV{WUB(JPToD}g(f
zB;Tl(`0Lm*=H?a1kiy;`a>SSn*{8)-UJ2Zmr%}N5&x2%uVcI2j7hRLpnXU5v(q>Nq
zmSZ5IvNIqOBjS@QFeWLBSk8>v{(TvTz<oIfX&|L}oIyomTm$3UWP}!bB8O!9wIt)2
zXc{->WResW9-u<i6BYW>G1<!%K4l=GWKYNkMH{QO^9#A=p;)^_nkhsgrleV{Fi}zI
zZw~5f2GG)=OiNV>S}X7HC|k@pw*eJAs@8`3kp=YBeR^gj8<mj<J4hT?kYhSmn7f2Q
z1bFx)j*)UjSFK^~5Ve_cN2FUx(=pBrKl-!@NP8t9?Q;nz_$e`kuNy+`BTF+fQi+?E
znrYpGWo1KQr^^zM^Rebx-1)Al8z(l|DJGz#G9^e!TG!;knA5X^=Qc>vHG#t0kv5ZX
zl}My;PxzC|61jV5dcs3bGo~M|;nCT+CT?{l-8Qh!*Tx*V#qpcm#h5T`F#|AKW~8b!
z;sB=sygSXA&=QM@&F<+`#LUyHjN*z;WL>iDKq@wxQXFrj@j1vA-jIX*PySHsNDpEW
zX2t&tJ=bw_^6_v@!IlFgrqYe-)j7ab)saO+mX=eAxD*X0%N5=69ROa6Tp@s5u^`sw
zV?=I089B*B(m4jXGprj%!jS=gSgCp1`8Gl{pDV44Xg)Cd45D_bS++yW`3O3+OR*e-
z2Y>Zw!+OIWY*=sT6YSA<APryytBq&a6i_2=3WIFiI-ag_WctQPwSWdK)tcLqu1#%u
z@<0=IB<O9rM0$VzY)JClQ7aZ6r#pvk@@FnH1n!jQ7HEHmC>l<TM(mhfEYL*VLl;qo
z#`I^2<+jP$T(c$H0GJ5>)cr65upP;k0q_hNn*y*L>>St!)|@GX5At3leY_DLC0Jn8
z=h6&%8krg(2{b>Jh?wkv*uVfo(;edzCdqbt*}+AvlO3Mdy1xznD*-b(G`P%V>c$l5
zZ&QJDr|KXT)E_)W@H<E%PaasRBu@x1CDe>pP{Ft;!$kGPwFBG%jtPgEFBM~0hoFAX
zmxW_|2l9{T(4avIMwGIvdbvi9e5Lc6h_aSO#+*$H&Dfyh7PwBqXc>3vE#unxuX9T~
zVna>Kl}I=jq?5n+biD;Q*$h;cP1f@Qn>T*OcmCA>2bfu_+IRwAN(BLWy@I|Lhlc`T
zGf7%wil#k<f${NAE#(vOrwqHd0HjbPDDuSoo|r!*#lok;;ip0wS`E6xSkg)J-XuRk
z2d4liz$lFvJ(B6?&#m3>Z1!EHv-D%~&tB$VcqQBaf}^CTm$AzJS3Zc@|4QY2YX5tQ
z>s8tRh&R7^TZTT@(wAuHOYMA5vGZ+i=8GGw1a9+NW@SpveecoSms;&otKC|_w`8^B
zBGXf2o(SEBt<HlQviU@fUoh-;Ttm<teezKH(h0gGONu%Lxr`Ga8D~?LtVw#toLi=W
z)-uT<(g-G+FuT+r$jpF5wv!_;XGNPD{D)VT@c{Y;C-4CFtb3W&wHuWHswSxBYe&df
zDpU99<jbrs|G@(iuQ7`hH$0(YgK61}`<rsLZHtQMD$Hd^4-yd;vQHVxt#6KGS}-Z(
zBUUy$l)c0KsC^=_(D7_eOLH@dW78E=XBTZY<>d6884eoKaH_~n42ps3i4yYSvYzd0
zM&?FUO&e`%1ZiR6T#1s7=yY<Uz;Hv;8G0j_iQWZ`n3&8qHB0km?;I;E-I+*E#x=Cj
zrgjW$SxQ@MTxs?|cpG99@^+&&hv^cT0Dr;c6f#Nn4P<0S2xA6KY~j#{oiOQ^L^NjA
zQ@k>EGl0;HzO(_Lu8^^Ii@ZgcIzf8{^9H5G0Bp$wL10?AJC08bq#{%b+HI=dQI66m
zP>b*Z05TMk51M~Y&%C6KA2Ic=u*;CA*kwFW%zD8aUQsQmuEI>Gyjc{lxA}HMOJr!)
zy$b(~b+6!@x0J<+ugfYqLTb8BXd)Zhz=lDFs^q+iUZ~bovu%z8k_svYV=AoUF5>{;
z5*&<<)m_@I$N;Kkqh)l2<4$Y{iIP4;`3b;;Y~zw`8?r|Ictg~t-n=&XfQ={&cn;wg
zT8N^8sNlW8{p9gjpwsULn8E!F?V#}zFgvSxhOzN3#dDWT4Mn@gUzJvib~Jmk>s!g-
zrA>Puwg6om5P@TCRo62Bfl8$75O!<<0ZK8EpbjUIO-+{*Xv|PeG&^%Ww`NczGj0O^
z+XgKWRT#d(<kyA{T^FkcvYACc*q^+HLne|&Fno-0J;Mas!SoxKe}ZWxaKlJ-U8>P&
zpTSpdtt`X>MlLf4q&30qX0h04ZF2!}a^56^-s$j5t=}ZA0lDb+KDQdp1`%olcoufa
zm)7tcJ#-;Ozt$c8PI{-L*8QFQ*6KEPN%QMPzd0C?UO&_7T(nzFc-QLI+n0@2_l%rC
zzHV<w+O1A&2tbEDf(3F=t>yrMb(;P9IXu=*TJ6^G_ub5CYuH7Yr@cO@k&9Y?*s5Q)
zYklYx{fpk93B@-6Y`4`t?L#TePP03Nj?(JFOVa!dPh@ajYqzniOzjfT?<0bw-n;m{
z-#R-VlJj1>(S(;LO+XEOm04L(t9rZE>g<w6ty4Q|(p)`&($D-qdshMv)!N37<;tEE
zDdboZ8e<nySwe#(drAy*WC}BPW{^;nHKNk4P_|N9rA3S4rc&C7sI<7LM6Qam<U8*<
zX9nH6-S7ME@BY5;{!;jvdEe)KpXYtH^M9Um1`NZu2Yb%50WX2|EYbhgZj=R1fDf#_
z7yXljvgzW+o9an%wIRWlE)-WF5nGo9^GTvWp6HAP7!h=ylMPM<$QmAXB<K+Ex4Wwi
zk03nP#?ld`g`SVosPp?XSmM6}C1NSd{{@=J-RTHGaU?8-L5jwIBck{Pp!g5L6TgoC
zjku`z3)c7!{%53bG~-MBPha=P{Xc)p*Z&m$_Ydp;`vD97Ww79%#RY%Bg8$pFAXkwH
zAn?0gm_M5T{s_tX0VDo1VZ^_?`ERskfdxie*MHaqNOS@HU$poQ`vx#_*gt%Ybt*ic
zx&i@M39)}R!lbfrv}?qJ3NSQ<1e=4-yV>|V<~rCPB+&>|TtQqs4ZZdUeisKG*kN?M
zi48RK&;!DPsVrQg#PvQ0z&;$9$^HBTe<Tp}-LS$!G1v!R4RnqXYvI@ywpsKLU;w|t
z!{90aPFH}nI6-VK$bn`y2rCr5d<w=N*o&}9qC^WG3uZ9!X*i&PVAIL)f=~=TW3T{9
zF@ijfDq_8O+_o$(?*zPt16Evo4U8q6?N>pzQ93))C*wLh(l7H44r{sMb`WCiXOXx#
zhNX`oEtvGFFpc{>Z}c(}+XW#}nh_yTQ7&%zM?J2@6_kz<xUL%ETA8#!ZP4ZgS`q_*
z)Pb7?zcKy9n(2THLNSFV6bBW+Vm2e1798xuJyTvg9p1+T;C_JCf~f?DgtSG8R>|Q8
zRO)vcoW9rmNgfSbW0K^F2(VA=@w?(B#Q5Jz5f>s*Fs>NCsxBiUFc>o;3ge0rWH3CI
z7fQiMUN}WZU~B{I7K7diCx&DCEMys)a-lQ<e8;BKP(h=n>OWFA+`}VwM+^Ra$0!gX
zJ1hj&2tnB3aqpVn=ywE9X$j*H-Vbbs7_W_cSgx;NW1oe=-2py?=N7n;#|^-eTxQTc
zufPg5C>Q7oC=<jqK$6Pxr*p8>Js1gH1}aKeAqk5qJaXVQ7QzW*g<@nF*b}}{I(qsh
z+URsx1@#Tf!1W3pz*ib*m{8#^fp1<#lShkS1KSFDL^CPAZG=mlj)j{L49}(l_e|IT
z!9HeHddApw8uq+=_Av7lY&OaR(D^WMdUz3pco|5Uia+Bf7-(!Df<`@Xr~p;Q0wlsC
z#fe~Wg~jF-UAVz%G>aqv>JF0t06vclcO*f9id9=e(V>Vo_{=d-NTYFsz-X$&Txqb8
z5%Dk(Gb{8bna-w@5n7lIJyaX@y$D-}6&Rprpsz>ftVELn7h7u>`~|dL^N%`m2`vpm
zR#LyKsjl=8)bU{44toi7GB*;!{#f|{*B4O!!JY_#9V3q&;v7+JFwlp=s%Vlx4*^9r
z`Z9D1`FnfCG78>KN$?6J5?)L~WkmD&*0yazu}MIg@YP9pk2_{;sOPe_wSqOQ>C7O6
zr5%V8@<+W9C}AL)!>8~yvjb`cx>R|VG+I?TST8$*FOJZ@q=jz$-=Tw*e=&nVCw@r_
zu>YSC12bpxsJRel2UI;E5(or9Be2Hr4N>z;6CSq0Kv1;=bir0os|ZIOD2;@dT)3Wz
zm+i3-Hh6RhBk&837;G|lhLnaTmo46I$%LI_w-SUPp){_YgQ6x%mq&<355(dE2b+dx
zu~;uLaf&lx+@!Ica@a_4AUBUe{aHBbfJmeKAQ1uy*az@P41;M@4i(jXB!CLyHtKGc
zF;MQ%qz)a17uk4({L#pQ=XQiU<f#XDSKpK?UVg@0H8FR@2@$E;==ZrEg&7>i9<__n
z!!QA0V;G^xckPeJ=|@}Ow=8ci@`dH$RdhTYebuBw!qAB4k9<QnsK9lG(;1*%4XSE9
zM}#fIOQ>v#LOQVmdpK49mI>k)FTXP;5*&d!Zv-#g^Jb&F7%2=5o@3HL7sDh%!o;eH
zO9!4c3&wT<=6z4V$Vzng8f-n3g8nz<3KR@jBuATy1!81n0D6F+l#fnE&lQ(8o6C_N
z&x(e*)c;-bU<DdWxHGYXAXq2j9<Da1Ot73kf{s@@u_pad$~PQEd4~uzp3s01{PS+-
z7?H093}<WBqjNR4Q8nAq85{T%Pb!|TjR;La1dD%=q@jrmc*+&%TJc4v_<{@_)&NN(
zfcOwt%kf)h0D4#mt0OQ_JX^w3NBkYUfDE$E;q4M-cRUjScp^gF+`_Z=k^2j0&{5Yw
zGlDfhJ&uFrJ+Kzf_JSGURs{sT_{QJBlc@h9)BNM~5`Pz6Z$z*e?RWmne0-B5;}x1X
z0AG#!an!LRsBlKchv5i?>iV!|qJzO*DIAax`bPrBG|<cxm<3z&D|+_hCXNx;U0BK0
z^v6vc|D>;P)PM0h(O<O2_wN7DHPHK_{%fSK_v865f6G^jvy+{K=wx765|nv!UC`gL
z;9FP-{aHDiT7&))@^`SC3k`vPx#x>A(N{#6^A@ooh;IS-=Bt{s+YNnDkz?b<;kF||
zHm=UFT@ZuK!RvtV46^Qw!gJY05HxlpWv->$%H174)3-FwlRbZD(a|_jhumE^Ep~?F
z3JQeCX;dZ{AJh!Ilprf!`ou!a$xAHIOH4gj&|uz)+@)vgLt~2Vl^n|6n$G^@we3x@
z=UaBmK~Ki|eHDtQ#M<xrK1r{6MuujjmqQOtI{BH;Pm5J-c>dKF*7)>^xy7+Np+<-)
z7w{SCZMowc0!c!<=OnR11&&S%Sk!XsEq~3kDY54?yqc;9)u%#+FXdMukX2>>N~m=@
zE$x?O+pqT5Tr1f{8(R^_PQQCnB;dx&nL8_vpO)~Wv>=f^Q=nGJAEGQg*SEobM;gSe
z-46A<zhx9a(m!qIeAZ49-aE%PR<FnQX}Bh&<ln_tQF3--+W@4jurR0T^6}G4gu^Ql
z<5<YTZ;`pc(R!KqYr;?!+yu#{O*%N^fYCF_UI@BP3zV{|i&yZMHs1YC&`K)JLzU_M
z!A>~tUYx)abe@)InaAMmEX{&-rfmzPGEWuMlj@fW`PIlpo#Zcq^nDzXWyG#DuDcdP
zN}VZ{`Ia+auL)h$XsT{k;kPhu;@h~*Q>!gn;MgwzKG$7wkd^Sj0ns?Ywuh!Oe%j40
z?}&=<`V^L&y0)Z=JlP$x55ExHAT6Agv#EDTaIc3_YwpjrKFOC-<N})STwpGMZwi@b
z6?tCvTNFK3`DKg>Y5j}eCT|#%d%GPvR@|~lwQTLik9M_Z9Hvi8*zxinylGo<*PD$u
zB^C=yl#S`CGHu!3l7IW~+iPRu*^RApCEp5ejxo1zd|&(q*1O`*+C7EujcMELfZ#jK
z@+(RP?zb7~l**r0hCEN&5p9vyAY=ti*Gm*?v^exIY-@z$bf4vGHw>(i-mSl+G^#aI
zD1a1@7BVTS>}G-28V$q8QQ~~U%5{B*{ayIZIseATWC`V%w9Tyjl*s-ptPGtvF(fL-
z>gKCBMq1kL)kB8bGM9Kiy*r^!S;&uFJIlX0|E90ip@F0Wc2MHW$=zYAu1L*B^&{JQ
z|A2y2aR&QBVQ;ur_JG3q80)mB4X35V-pH(yfkYefi#nOLp8D$QNjmX<H|~nAsaPjG
zw2H!Vi+fYzaHK45d&^XJWj8ZFaS7+t$C1#pE3=Z1R>#4N>$D8DnX)b>_6n;T8?F~!
z>*+Fo>SKLXP)$ne+V-XK{<$BA6i!B0NU8gYjk`~g|9sU{XIg}Z6zvwO{LfAM8zQ??
z?0xPY)Ulm!6*%$N6E4ChCr`8~QoAj;dVa`zL*emW`#2N#@9@)?$yn(GxhEzUA0<u6
zRYA;DX!ag6*U=Y6rv$d09&27F^2*OmHzAawdF(`z+<sKcrztP8+GuS%Jz0JAI<e+E
z(oPTNDUPQu8pwHiLHh2#{nHxE65=N0H5_O%imz<j+~;d?=&tHiM=RkWi>Pkx)VHM6
zp`Vo9Tz5uWL~oxJJFUjdUGad$Vs=pOCUb-PP}MSrHXCVE9cjg?p{UJ|r)qJ=ZfdIU
z=}9rjY096WEO3-8df!B(wcOmu=ibv#sp=thHjue_^I>7DJu~0;#$TQ--zpWZS)h`!
zI_c^8U-wE`y0zCi3DVQ%Kk85PI_WMP*3CC>utw&UwF&30*!B<0O{>Nl_;&}@E9u^w
z>nvhg6<@bppyrv~`|ZEE6^p-a71%hrSJ|;*+`jb@5>NOpPwIv}4j=Nl$6vBu^~Ib|
zu^%O>Wn26bRwwKJdi?0)eX*Mtbg5)dE5BH$$LE>b-R!(Vdez5{5*rwKKUv5lA?j?e
zT(05r;-Ev#s`pN<>oZZ4vMMOBOw3(daI-dd(({(vtq!HK3>Pg={VZh2;)Ry9u=Mq-
z9PwWS?c10&UTk4Cz3OYe<TVLxrp!lUnU8vlhHkyPxT&yZliH+bALWl9S~yP2vr96L
zvL)eGNcXymUjpBaOV4|eWxH^_?m!+zimWc^`at1qwYYjqS<ADP18IYwGrL;_to*XG
zKc~X`2UEyqtpX-(q4bM+vSczeLDokrB~QFzFt)lH%3kJV)!CbKv}H|kRP(+3j2fn8
zX?f=u9W7{!NPE`cYsIobkEr?v%Uv0hgM%DPEzZcEv6(M6aXj?wVsFVrCn%}1J0Y_{
zrhHFBKBdRd_-rynY8Pd+-!_szo&RXIx=D+&A!TLuJxWId_0++TD8I^J>ResFCFRQ@
z)hoqr6?&0|``evRmghU|wF}4>f3{fmEM-OjpGHVm-F0O9{@QDmKfkf`xESAN6sq$0
zWJtSN(!%vVy#iAOA^mkOhsz4bWL{!@YOm-WDtHxgreuY)oJg!=S8n0`b3N4i2YPRj
zo}5(@T4S4<_(0Aq{<^L-bbQ9__fa2j1fu?+Y$)c{5lAj=($?3SF}00?x>uz41S?Ux
zPZmaO*qe*+3uxyaqF1-_b!Pg;84ez1?d)v47PGA+r(CSUJXc=&x{qUt!iH^Vm{4pw
zUQ%r=vWhL6y=D?cKRV;8;ox4@&Jc@nc91!%amC()eC9h$StsC_TD?-J>bIP$?{bQ_
zx2IFZ7bZ7<ROR#vT`wy(tIb(x`EtTW^wg0^9ZIg2TFQNo*oxyT1L%>H4DCu9UN48_
z`$D_}&-6{b+?8S3nT43{o0oOEJ%$waQ$_ri9npL3#_!WmteOyf%C;kYm6C%GU-I4s
zpKo{zKo!enRBsJ+cC4m;l=*q!W^0~z0L3Zl`7)sr5w-rI2EVa#;|}-pRX=a5ed9Nw
z!0X7Gx2)8N;?>Zxxbngmjn?m=6COiI{;LR*Y*hWx5^3tklkKens{(fM7io3ai)%yd
z2frMQC)GUd_mxWYJ?Ut*nbtL^(-@i&6D_evZ|kmo#%VkAp@Da|7&=Q`t+I!z!lSAx
zD~FCQ9ZEO(e4_g-sb*ZFFFN^2zi%H$ZEJO@o09WEzAcfE*359D4CWav31{2vp}7+Z
z)b}p&e7UP$u727+=(g%w$2Xteylh!veMUP(hBLn+U()$(-b{|5g)yt{QvI%2v3(7C
zirxYbf6866#1=|+)b0E=q8hR27aAKzr)o<u3m%<4qDY>bw9UR_*83D?5%tYt8t+6H
zj|V)W_PknFCAn|R>CULrok^Zse%?&GdVHYHAXk9%yw)~TuYfJEOr-kQ&nAbwdnK=T
zzlE8b)W}nJY)Q4eu6yV5$qQM>Mc~COqlc?~8#|&qHsocuiI@F)h@ZSlWo>Kv6h-x}
z*OBYGJF^W3<8%iED4WlFJv!X~)bQ0^L(=w(J6;HJs!NXr>_~@bw;8QWSEuL8!}bRY
zWEQq8n6++-l1<o>Bz=Pty^v;|Ah+@R<L;z%A5+dWr}yQROxp5#O04mFvqCd|zwRdo
zXYgGZviaoQyt=tsHA>M{aSAN3@ukVyy7JD#8y1QR)mK6rW~mr=jPV+SNI1V1JCrJD
z5X4_UQEd#|`?<U`$|U`fC;g1<c!v+McF9-9ZCz_1G&Z-?hF;55kk7hlhi+B!d|qR+
z;BuB=wN&gPrQW7Qn3?5$QMraiTa=FSX7V|FJ-;~h__VwR4GVdjOD;9fx`odiT-#=P
zM19VB7t#LJ?|=Q^Kr`#f>0yxXsE&mh(eWmeZHs0&r#&!A3hHfK_v90)5GC}XulK^V
z^Wu*j4+*dyW|8&pK$7okDphVcLT<aPw;p*AnqloUJ698;^~#q!^98zJ(lgv+W_BXf
zBj4Ft?9}+{k~#MEj4@N-j+q0Qx-w96u4U^+yFB_{?QtiXKQ(ncb-R2{(!9biphz3a
z_htp{;xlu9=YPX*XW^p`^Ect2Qz>i(dCMojvEF<!$G(^JR@!XJ997|m_LfIGPBnH6
zczWAxlE3Qcq~@M*=dp#^$2+YRc9Hpxs(p>((uuylwC0}v1@_B*teg%ze(;cqFHMLo
z4tij6TwC;fXHM&WJFQs?<)tYGaptz6oZwR_-4`xs*rV3qEoRIyPDDjnuXT9$OQFmy
z)~<u&-H!yXuq_eR65X~~w&fYW&*gUm(_~X;8E0h_1uU)Ia~hSF#;V|(ueU0fCB;}v
zk(^2ypRyNiQ%%3PM}2k;OF`1X{lk%m<MQLDLi@v+=dW(ko29hTWQ9q(M8lx7`?MVs
z67CzDQ$Cwpb{X2Y35EZQy=Q@rtGG@!5TeBx8ypA_@OX{oecD~={r2rglCfk-mTJi|
zl1%I)3GsH{TWjT&R%lnY{0%s?7*mp%l2ZdIP%tz&gkRjGp-l@MFrPZX;g>_guV5G3
z1VSnC;nNd3cV^yicb_a%9nmCu_R+pKZ|2^ad+*%2bLY;y=Suc|_R1w&R+V;bpRZ>w
zyrKNQD?fPo8w*Bft?W9wMn124_l)xwA9!iUZ@)I@`SWgDu=%7fx4yZx{nOv={npXv
zw>))jUG;6J-+M~z)!|DI9%yPBS^kIWYu<b9`uo<Lx~wwP_fA8{H^1`UDf9J%vl8NY
zvGDfWv)ekps(rfM`_k{{-goZW^Uew$zWELD?%|=`XV&Hpt-6KZde@%0y}!TlC9z`b
zAR4;k+RV$`jH&}a+f;JT(+5vFYj(*S2j?s=Q)REW;~&2L>qo2j)6ShXBfIgVGv5r%
zn}5dZ4}Ek1R6wi0q4aJredYIkd!uto7XI^RUw-hD)*U0$X52aLSjn-6gNGLMEgpPS
z=)Pt7qM>J=tUvtK(2Sj@y+7}JH=MNpnWrw96L=^vbNgF|?)%{{J7+%nU+b0ibFLbx
z``vk0c7AsDn-5HX>%XU^uH4*x&gzT4eeG?3eZRE*tfo`$oEQ7?js>w7o*ao>GyCy_
z=bt8D@ZxWN(D=QR&$u0?DOZ0(_{j$!%&0rG{^<Sn8~(7gM4h{*H!iA|pTA?<f|9d$
zozpvO`l=84k7r)p`{JfE2Rf%6-t(_JwjG)yU3~eklk=v(zhch*-M7DWO5gsOA3nSC
z_3IyQJgejvA7dl;jPoy@6S#BM(P__~`}DFUW&1ANvF+R|J_$WAZ~v{Y|NWf%&%X2H
zlE+ssYd+R`?H%O@9-Xsn<MlnM8yCM2+t>5;O&3JoKDHwGN#n@$r+4oB)+?80H{EpR
z;ax8-s6W~3*FLGADIDP*-~H^vrTY$FviRw{kGxkYZ_}?h=h>>8x;NhAX_zVevc2nx
zCGQ^CiQc<tW$@^4cf5S{Ra?Hfzwv^$oip$H#XE~nOPsp%)FYu6);{)g&m%W3R$rS|
zhkljlYrM8O=LtUX)3wk4%d!0rUiJQU{artu@t54}+Gzc*Rlj-plN}E}aZ1_TUAsze
z-}0r0<{#+~EbVLg&JTZb&GsX${DRX<_O05!X87$rEz{n9rR<E)N*{aqmXpiwns)Q$
z56|D=i9Da4ef8g7eC_LE>B1GWH+^vWW5Ul4-a2b>-`;mS%PxyApFXSZ-aBgUd2aW+
zO?w}#J@)E7L;rbpN6mn)lr7$N_~3%a7x#9TH2Is4u0H$mA1iBa_9PdUw4$HCan+gf
zl51A(ee=+f!<>(kL!sBNUVB!_O|t{x2R8m=;;)V#kxITl|5o27PP*;}aqD;g?e=$`
zyJycwO80k5nhrekAu6jVzyGNpt@Q7d_PzFZuO?3YkL*)-uZq6<&Ys7f|G}J+uY9Lc
z{r6wZn19`6LqD26bj>5XcRf<I@5!E$!LO~K_D@&*&s_hPKD{@K{$>Om0?iG}>+h?(
zeA^f0keIqA^~&@AWrzQNoc}Hh;i>b#C*vx@fBc(H#VZmMhT}N?Us0Cw&;OCb^3?vH
zNx3S^%RS`?(WM^7_##{D#2Bx{r2KUrDCykW0qdDf5bJ9#Ub0AF$h+7$%n(+iNP;?&
z>%;Gh@7wm2S9(02`NpS)s<Sx_>esi(kw#XC9cd5+0x7m62q<*qNvk8H3>bV-2F;^U
ztGb4KEh}q#FKuY=Xl`5HyL@FUhc<6Ud1<H`h2XO-1~{+d3+u*rTx{>j(y|w~hSA$W
zqY5*Kh6PHKUH#^AFI@r$YC)9ofUyD_a|_s^d1*`)LbYb(9RY1-sr0}?GG-ZB&L+#n
zjwNig$%E($F)Xxp2}%#FsAf|e^<JDG?u)E0qZ(KlZ|Nn=m}!d3*AhTN0F|XVD1;GN
zVIb)M0Zv{3@}ZGzpRE+U!)28gl7TfysPb&F=(sA_He7++V;h1rwgF=ESd@aDl3C$6
zL}b}S*K9Pn&=%?dK}T7^$%3K*i3Me7#E=+(qKKZ5Kthk=DKl25pjjle8TZKS5Nt=s
zpkW=G9QrB*vtmA%_0e946Dee~!Bxzrw3yFYT(hybDsTk_M7IJW6c7z|xAfN0CH%OV
zpboDgWqb(dP74qOlNL!iFC|shjP}vtSP?I>fPu6?*f}67i<9*AeGr}OOAEmuM>7qL
z<e-wivUmXbaMS#L?lSx<;$I6Ah#?Ik@G(G6*<&OnaTcVyBpj*;U9nyvsj2K>W>ANU
zNgRHIP-VFh@OCl6JR*TFSZQG%<OVSDNEqAll`UBCNnX$gmk(q4$P6r`u~)26kxt{I
zOyJ6L0|CO=OwyMdpsm|Ns&9Ols<n32vWC^AVn{KQ>RQ^CEQ1e%l?sZ-YAFa0kT#yq
zB-T0`8gQ~+hp;`OQRppACgq%>wpQPeFE<dDIhNo+SX7lkRmi-EHGwl|(bB6A4`+s<
zgcma8G8r1~;#-6kXq-1-6d;;NAIR!CAE{da@d2yx#_Pn;2IDnt4QW)tTfbS5g>jiR
zWn$yQ1mPgj%2`B^G8!DBp<{hB27yVem_b8$aNXVIyli}6{IT(*cwZc&KVig}_&hDm
zfJ6Pe%=Y!r@EamH^cEC9!=GlqP=upzLBf5h8ommps!brMtPB~r@C&~`Kpt^tX00YT
zQ$6Ui8bTSrzsiyXRnrUsg3b<Eam#UsqP1~w*LsON+sKdxl()Ls7B{_+&q7Tf9}{U1
zro~70JO(Q#mVFf8#BmT6CEHj`wQ6ASm8KMDEq(X-xl2K(NQUF_li3vo@!u8jflE3H
z_t|YX5@_cV5DtJ?O!)Y%x55~3t1MO_$19f?^KF&wBJu7qwt)*<@Fx=PO#r1nXOwoi
z5ya;josAskQs+1#$@4557GLac*<kHZV6tMxGL~V3-*a}8*9d#hAMePJWOm6a(`tq%
zt2_DW$kRjLGn>IjEn7lTm#Rom6?51jLm$b$$TnOR8~#Y9!tu{J#^G)YQPm_bu|DC(
zuu17IL`U>F<0<Lhw0(RJt~fC{IFmq*u~8@-JBwNROszm3zrZv~4h}LKOsMoIGY4`?
zYmC~oN&t!t5d+C=Q$s03CNhGOp%XcjnOQZ8lUN<@^Nu1>>P7^)J;*&^k~J?Z-0TxZ
zIQV!%!C7Ri)u*jq5;G(BY4>Gd!7L@mPPxX&k1ss_|Ez=TeVgoZfJ*20VsoE>dq1{X
zoZl5~8e^<pZDlLy+_;?e7E5-q&hE(L7f!tIJEu7<0eh3sq8g(MkWrE#tgb;e`%)-k
zC3sVVB>0!r3^vY^HhZb`Tj2dBcv2JFo1pW}iS#bJ(F55msE)Q3>uvcx%Tr#CYO~pq
z0XBrt{gWwrPJd>|+SQ21R=eyF;|tsJz3^p$Lg^_r6;3Lr595)KD9B#(<S?L9@jTX9
ze!eAK;X!_8L5!Q$6-osqS9rbk4IN9`n^(ZOVD4D!#@tzd;z*g_${iv3KFJtxZFVl^
zGaS`Oq<C0g!(4`4FbY67-Q>mG^9G1NX-j}4z}^&`LVOP_i8KwTkzba^`aVu&cQhR)
z!2tw+@!Yiv*JB);FD#=Na^dQcM&isEIIS<9?y-T_keMPbrZ3tvJ2_Wz|NjI!|4WYR
z|CdE2l<)r+m8tXpC*{iX|1;-5`3DM5spLicpKSEN|3$2a2k^*ldjB1MY}g;<@akJ<
zu4b&mRs)u^zoO8?Z+P>I`OXb5)z{nF>yaed99bR95I@?;E)SgR1z(6C8Ds~=5*rvw
zNn({{!@<nWF_&|hrlsP!;(lRlDO+|IHJk0P>7J#Sxlt)&Y*Vskkz}(o>`u)ROT;kK
z0Eo}nsl=hC+Kwg|{t3B0-|jAGHXC8vb!;qbRIzn7oWUchnxV70!CXqqAj~!uSfypM
z)R(NOxRS#uY`CV;!uo}9E^00{lws7Y0Dx^QYgUC*VzYR7SD`p&-NM0<frV%&gU7Rs
zo`u>QECbXz-B%w#I17hcTVGvG?l$AwMT>j@J_rdMRJ&D83}c8_jIg6ibWGeKJbnRG
zI06ngM}yBF>FEqo(`&G><pwg8!8V+YzR>`}ru9Y+`Fy@n4wWI_29BWgZN<+dVIzl8
z8YPw%DY222*g&4Pk^)wVCVL57;4(k~e>d7PHQO`M*N}I!1r8d$PS0iFyG1}D9hyIq
zOOcjl3R(&c1(`$oKpg+1i46)Yv1}wNER<`gvrCbCYBm*jIPs%eSW#6u9Kplns2)j#
z<Kd73_o6KFVP1pbb2K5uwS=zgE?z5sG#Lsf_@tVI%otWUp@=Hns}YHp6+wdgq$VrT
z5MRuwr9hNugpWovQj<trmXl!$Fo~~FJT8#*XegnD<L)(4;!$1@M3G{QM#4grU{{rJ
zRF)z-sbMrO^AXX#CP_um#gIaPBzT#ROEOPrqJ;F28X`5(qj4n>R#jIZnj$6zKBPfr
z9uIed93nN*BC4P(5eg)%Ny&I3;tE6*bRnVXgd+(_3iDx&+$Uu%#A}f-X-+7l3Nkj-
z-GHc3UDBg`h!jldNmWV`A}e7f$%|T)5LOdaIT3Mh4rYQXMP)*hNH{DcSrZg3swpPH
z^^g?d6Ye#U<GQZOGO2bP8-GcaU{5OXxExmqk>h$ClO)W$(<Bm&hxG)ZgRZKA7)}yl
z(_}p<@e$HYUXDZr4L8}9J5f#6c!^-w6)hf(>ZG8MRK;+D(kCISiIAeW14+taR1{fr
zBvDN!ql6=B91}`X!<67rNd-i%5*rG|L(v40jYyJDBoa|d%%q-7%3&fukx)bqY1$Zl
zC#golx=j0vE+%wEC&W}GY+p$Nt)b3G1VJ4`?86}`tVam;xF)GdQ6e-ERV}QEaiR+J
zctp{ps6Y*L`<!fjW>}NNT!wA5b?BgSvZFt5n4+s@*u?M06AIquv+l2!%Von`%^<A9
zc_<XaHB6y&_51ynTgtZ%>uDezSA|O~!c*+X7o6E#h_jOlPqh=hbWgR<ppZrztWhr;
zbWS-WV(yV?cb7mD8yc6?*VaX%G*P69(MVlw{gTE8nkdmkftSRP99E3!Hkdtl$c9ms
z9etlu5gBIH+;9dDDA_CwHQ4G&q=wWKoXl?<b6_uc-V~fw-^u2I0Lp6*;V*SR0+1E8
z9UW}~_3M!pgML^sAPmPp{u-0*j1KVQ$AdXgAV8WNAZ_IQXrQaV2l?^v*56abL>O|{
zFlz(u11QXvoCus6fMPsL6uiX1^8~Pggn;+;bAExLz&BMSw*_9pc?FTP-~oKzgfCL~
zB7-jx$OaY@zG%P~34GB8ADSvy^%n_z$%HRZ_yU7(5Qbtg;Y$X5iNF_Z@S&}uReyoN
z7ki9F6C1z86Xn;^;{5W3$}u6iGOV7Hv|hgcpn!=S?y0f^v2!pq9tJLTVIW561B?bz
z&cN#D9atp?Rv=<@JbYd1!dHq`EP~eASkZx&@LL`azn8l3o8py<;1wNs1qWUt2mE;C
zKsr%5XmXJQ3ClsKP!1%?T@H{u9zkew5d?|JK^{^N0~^vpF%X3D$U&2f97s$I^07Lb
zT0{zz@kl|Fixfyq2=cLt4y;9FKpKw>$R{cT%`P$!F7Gdt0698_1SsQ?fMyp72vZ3t
z<i8DN5&rYz;eWFW|HG93h1|E{EW-WJc(~u}!u>Giej)E|IE(OJaN&Kv<wA_RT!z|u
z$TVI?oiPtXHsg-O6WD_T1cihF7{WpfgqjqVA@Vp1aR4<i1E;V#pXt~krqxi63}&dh
z8b#1%yCpkT0W1Y4SVB0_5{zI46vM`0FLf8$sbzR>C>1KpA*ui-@$+c+8toEfLIwk$
z56;x7mcR`G4lu$koGIkUg!3#~<dei8$;Xd|Is0M@^>>p6BRHEp27V_V1<@d!rkFNe
zTfXE-I*k;WvYLZj0?wrmW=7WZVX4Us5N_f*2~W@Sg9FhZ#pxSEJ_y5<g8+q04Jatl
z1r$ABEFXk<eovGg-vh@2bNS%_nZb3i>@<cn(lDCAkpX&>No&272$q-*>g!pWF&VMK
zVHLT@SdYgrsufew8H?W}bQREm6U$uBR$0uTI=F@`sSl^{FQznGK4oz;Mr0a>;U_i3
zWL0G14r4(%7_C)fSRdw%xEWGAoD-yAVYkTh3uzHYV+5Ku1WTn*z)<Rrt_)79p&Vyx
zCagvJuowifEyNW<6>Uo>)(a|cpVMtgh{|}VbupU5>3j~hkiseB$v%_P>~T-5&^%nz
zyqTodi>b-Ln~Ce~anHyQ7b<j^4!E+x6s*_+?=Obl5kn-6X0I&Is_AuPKDACwXNGk$
zePTX6QaQ$KiW^T-$VkE-g&sPXu}86o>R<LK_1K00lN5%~`_@z8W3=_B0%pAfEVoUJ
zED^#)u_-171oROb1}H^Yy5<~sSsSX1!GblS${4U%E2@k^lQn}?0~V%@DjK5ba2@!x
z05Tofe>O{VlXAJN|7m)1;&6<;{)Zogg7v?UGPVC_Qm&Tfy7t=k)rcH3uBFo+TZjVk
zwv4FQ%=da&2mvCI0-lCdE85ySJ3RU8@KgQrkMDBn|9umQ<9PjFR`Sn(lf{rS)&D2s
z%3uHQBkTVnTl<&re?0q)@p4R#=CA!bcm54zw2`!K?Dne||L(rzAgtAc4(T&jNa<7I
z{yi%Oz*rM!voP4M@_ARr#}QHl3ma@x-xtlW3BFwVKW_cR;W$qJ7eu~b|F6PNo&Pu~
zS8xI^PcUdH5-dSPmB>t$L@GrA3DKA+$M8+wKH>?jg$E)~(!`<xrxyLjHHjjEBrki-
zrrcHr7BuVeFiqwoA%mP}Vk?J9WCT)^&nX()K}}bHai%-T$!62`jO3JdBXWs;EWw!h
zkx#4?ejmZ(F$1*BuQsfO`TJTjYs7XRPNpfwhBX%Jv?e<e_pJ>eZ-qBtMS1xW))zXE
zS%wv%AL8(N7x3b!H(;c~EDjg5mBY#uKjOcCY6|s_?8?*s#)qvY6vuJ(zbF;Pe@@wd
zlXA_c8r$HzU1bYmrO4ykm=KQPn>>~6>8t@g<hitl%?g*aEpKdIT7xPo>9@`xR-0OH
z7y0NrtV>f#{R-s0sNjqRFY<<X-iv{>uBh$oZL1-L$bEftJ6CBtUm@dRrz^D8{Y6I&
zGAx!1vYlO$v5L2G9*oSE5f4n@kH=5A8qIafYg-#Q6vG7o9_K05N8vkWsI_)UTgR&2
z`i2!PZL8sH<h`A>?MoXvYrFzqA$h9+!x9euHn!9*?SMNBt+$QLoH-Pv^|7Ha5O~~M
z7ISZP!c$5S1`{@%7|TVA$13DupGk}5)y7jguvSYAqu>yt%)l>5X<%t-VyLk4d6_Ed
zz>z5c1Q`ef^4P)IlRb&Ft`5dLrNaX#m^3JoU$rl~OZ-_~F8aS>eQI#Ra2!wn^9Aw$
zA%05#PtKL6|AFsh3<z7t|3neb$9OR&MUFcLm@1zR0RYXWr@M)sj`th)L{sBOOF?&A
z3c4Zz?_!49t4yHE#tc<<hQh5TYP`F+8YiCzuhi0M{6|m5XvR(sJlm)e&;4V0MGa+S
zYC6uTJiG16v$+v1Z|g)2tC~AH3w0x+D$$YNO%-cqXag!hoR_WJ^u-p#1GyXsn8F3f
zW2xN6wsy221&hi))>IDFw;@eW<77`M{N_~*9!XU&pR5NwJWgroKb<R2|F<{P*0(lH
zFplH-f0Y9NuM`rbDg8eg*Z;Ej>|bpgOaEN|6&t1J04=s9*_Lg<oRioj;R^&lOiCZQ
zhpwcRtwxqyN#=2H`~B_T%<Sr6WAjKUz3o8>pvTVa?Ck99tTa1=UR>3MSGfl&IaL<9
zt=I;8V+(Ahl#WP>lFA<|)3<`o`@)>jY$0cKrJOT*dCF*VNp@y2<?qWP&G|_-HJwIT
zYGK?@eBg((t2$Wt_1D9}CYz#DiA=++qH5v%#qu1_a4)0{@|6naR;FJWx(X%24bUki
zNyU^+_;vPD2|Ze5Za_c;?Wk2M$Fe5c|4mi7ku#eB$ueg&Pg$0PN4n79TP)n8imz30
zkJ=;m|HAl}?SAAs?y~=^){XVQZnmDs|5F?<SvhTXo}L+oW920qUV}hS){-I<cqxDL
zx{Oh$0zecccwEZiO^a`3-1HbobzG;{uXQMod8aY8GgO45{sv~enMAYL5hd(d3c*qh
zFJ%hjEY&#F2W#PX6=ed=)e2o0i-mfX$y#a}f$o3k&w;992;4F%0DCk9<7tY?M8mXF
zEd6_|O0~G`CFwKNGnJQf&+S?0f?lc4!Yt;bdmZwL@0<rw^m#UwkcZrXD!#8&ltI>G
zU!TH)yY}^WittRuq3eu@;pRGbz(jLZAP%KTOWD}Bpp56oNueF-1u^@E8M@BCWr={{
z@6JC25K$Y|6gE(#thdWry1tp?r)wj>&hN;sFTLdHQOwNZRYi~0YU*tTes@Bi_9;($
zSrjp=U*+u83G(g8WYsg&-&OB;zYphlIU3=LBo$Tl9=dwwfF`c;z#rko#7{79ZxyDc
zG{TL+3ET`}MiFjRCc4KP&|_|N2`87a52&()mesRqgrQ2}DhOXXu7FIyI;FZV?Q6K&
zpo`Mmmx^4R;Oi?S8clHog8Lv%BZnGE3ofZ>7hbm+Er#jzT3gT^6Q00oON8V6lk1-{
z{+H_iM_v8j<Na@QG5&MYGM@c^p5%B^{qJmjLiJfQK0)z6TkV%B0~_{kU0;+}r83gX
zkD#^c6j#M1-JGx4|IWJkE)84<4Xl)4y`%(hReDaap!4!qOpS$1qIzem(O!JT^jD9M
zfBLah|Igw_{Q!7J{C`7l+|d86#<Tu^lH=uzI_NYojPctX`w2hGs9}m83G83nwDheo
zHo2I4puX{Wex)Luam2LK_*yA9sm8CPS)r}TC9GD{s1lhA9JFYT8-1;Sir&xpqo0er
z=b(mqKf^Cf_RYRlcYm&kAQ4MpTgE-0k#M}g1^UhB2=%k#$k$mh+&Q3WC6>sB)4W1K
zxAT%({;;2I^^p9+2N)c$>Ps$G1=Et>idDvMIf~!3jKvwM4`86ivyiRfyN5M;E3sC7
z4Y8(WEGg)c8*yNrk-y={UV-4#b;N-IAc1!1u9)Ejx}gzo{%W~=KAz@S(EqsqCwc4)
zFkg`WrQJ54^S?aBv9$m3_anN1-m(5`8EtFv`)|{Fe*gC*2h9J)J1(>Ya01mUm6F>e
zhF;@IBI0x%KhI)7$Mv<fO}4g1p=sgI&BvVLQ$<+nlV1L(V6x{MnYU){UFef9BU?{O
z{)jo=B=;zc#dLk`li6ym<+lP60+jM9tX#3)Tv^>P8_ky0?sV616SuD4r21;}im02b
zLRZE0jb#9mS_&Sv2q<aGKr>hcp#BtmxWSgC<x60|OsGM^67Y&==)cNvK*ORMES%3_
zbV+`oNx3!3FLYhg2$kkG4Y%XC-Hxa0wy8Hox1;ObZbvv?r)jo@wy_kND{$R$V1V0Q
zNB0cd;+=-!G`d}3T3yiVmSwC0w;hF`tD_G{x6^Q3v+3EoYjv%L*LKa0Fxp<*T!A3l
zEG)knDO_IHvY}$P?bz*ZqvN*B7B{_y!MSHxhO4h823F^zvH#2GU=l{tUtw)NySTi%
z{<p&GG(5*`xNXbmnxY9aoa@=muH`t~Y73)bufY52b$_t;=Iy)v|9O9K_~GdIe@}*|
zAHO^M{)Zn|*I39dAe9|tw42=Sc3iXFcDr7Sw=BbOOsDHLjV|0kzvaB+r`(mvVWQX-
z@zRbjOD<pAY&E1zX`(CI&~Liyh)&b<xFvMBVYfWD>o(e+v%Hau*qRwON4Q;~+Z{uA
zrfqXeZ#lNp5~gTdd}UWGVrymCJOjkZwp`Eaa&#hXby_X6+iG%GcRj0hKWvu5*06P_
z!=1L?@H%G4)|-yy7~M9^T)=D7=-dxmTVb<WrriZlOXnbeon}+mt_fqI-SiqQ(QVud
zo0au~tph&8YjllP!?g@(rf%t$EzEAaX<6?5T54sz0LyC_#BQ^r+pV_I?6!E5>kX>`
zqr+=AtoHq|Wxe3En+@J<3Eee?#k<g<omQ8-T<9iL)3_gPX5Ohy%XZ9Wm$!Jwb6T!t
znvQ3fP80rH4M2KNbXl)<3`6e<;j}n6xCtU`w;E>KHgwT-49mvxv<zQG%SW94IA<F9
zz9UJkws5^BH%(hKoGz$or`dJ6DNI9egMe@(34?B>Z0*}M+&V8O$TR{wjfW2IX#i`@
zyfJaYa*=WyC2H=Jk2ywW{$0h}@OwJ4ngV(Kq<BW@ko*k_5r$s*s;EO*q|`P5&ktRk
zd)I0(eY+8P@$;V?grPs*GNZy2u&VZ=n11EFT*o{^i)0WcwOykCP$bD}Wam&dJAn3^
zf)BWQrTe>Zzn<U6G#`o@G6WQ#WOkvotJ&3z+1%kFUn}=~7Kfj<iO?CEI2eAv2*ST$
z>8u1%Mh`|xM}y}f2>8uPIRMEf$cz;wSw|^V0tOWtpUh7UIrVFq;gRo!aZzrHii$)7
zlqo`6N|(&4Qc6LvQOSjj9?lP*QWKD9_J8FH<!ze`5|VE1=)Ly*mf<fy7S?|kj`d%W
z|FvOS&+GrEIF|H3?tyiKpynpi$EoA?^}hj1?8f@P@f`o*X^xld(8u7~k(aW8xDWvb
z)@H+W=K2vkmcD%K4Z6Wq*#|xmJxz&+1~-nm^BLD$N0*_9dpphD%B|?$3Mj^LpW^G8
zAGm~e6Z7Uwc*?$0UpB3pt^=BHzCrI~a(*7{pTZ@6MZ_IAr#~F;G40F`G1%Bu$J$^6
z={!?CK#y<byQpEnUqc5gssH9}Pmv51OSplsXQRrC!@c3~)!V)NJ2Jj4$8hJEOJ$Nd
z#Iw_g*+ecS(oyb>Y=&MX?8D)!_j{WKrdc9`yYHzzL<$Mazmo}>EASJ~!UCW;BUG&J
zv5dhrAVI4wEBZq;V_?9rWGWory9S!G&vx>=?Ik)ZLN#GdVgYMktB=n3tp>M}VrX>+
zOrj(!<AT({4~0x>1O_pNhuykA)rc<_lzFae%di|rN#bM55oa9vj`9SZZxfG~6L6!J
z6G0z3G`4PY{L})lcT3C0EeIvqUy2UJ_BH0v$_5i$AD<i@vsXb7T^@_LPt6=CPcjFc
z9rUcs&~eTY3<q9Lm{xvzfacvXPsdEd&ujhT<DL`L#FeNVo*wijzAG<IhW%db&}rqx
z{u_o{@Su-2G+L3YVqqn#>GiAO9_GJ0KYY_KsLSsXht3ajXN~z1M-*q_eBj4S%Q2S=
z?4yU(M7TbvhFglA@^~Z^p8UxTqHd+9OiHarK8P^k<;ZRlqBv7uBxrvWMzJ`T!yIcW
z>R2T6)nFj$hrVI;Fbbkk#OjBqtbW#D^|#-XQ$>9MQnmk~VQO^xVX*i5<6C)t4)+H~
zXG3*$_`08+ejJ_*4i4nS!N*r`_7C=kKMYUz4$oD99(eQv;D0k<bw^P$PsCuJh<)M;
z{Fjb#JgDN%JbEFVxj$;9QibcD_H+#(R)TC7tteMF`J7%)p<7KInstf7tiT=)K^4Kc
zVf6q5r5hHjyE&XHv-0ulVZUMa?8L!ogoa%SDLu@n$sWwzJJ|p59^i2c(;~2Z1dFmb
z6hXtJy*V)J#Oie9`sxhYl1!s0pbO|KHyEiW+`Zt_tXMJ@L52rb(8U>_r5XB}@5;Nb
z?PLYu)S0S_oUydq3TBis%pF_%jgF-#S45K}5yanwe7R8!#T~zlplysQBj5c>RuJBT
zVKClWJ$4XCDQ-Cx3~}OyWw|tiPNA8V;nByF{$3CC@;*kiN0q*T0DCYMFDYJmv3D@s
zyHk^^DfbKYxUo`?E4;UB@g;@6T!$NfSclJ(^9UN;RoZhRHRzA~phew9O?dw3n(*z9
zE7kc5iXKm||GBMMs@u;WtlRH~Sgza8Z`bYT&$_+t;uu=gkyF=3$NH^AOw+%i!e82^
z+w{Jx6o0wh51Ix*d4Cvy?k?5_Qsv<FoT-1)B41S?S8fvD+c=s{nKqPe)VR)0idkSF
zJU$E3bGQvOGR>Jzx1DY0>S{Z7wqbF&9dAc&unlX6?eX-NZJVd1nXAB9$>*$E?GyZ$
zYU7jKC|rb~$S1K9<ZajhQ??P@c_`>76}t3`tHd4Y%WK6u#MMO}zZ2XAF5bc8F|cyF
zJq8|+C)<7)`~i-R{{TnF4{O_rNbV&;z7uUbvv}K{Ot)d&f*hIflWxQ4*^Woa_Q?0P
zf0>TpN6;^Ap;A0oLqJ|+YvsTC?btv6SpNR^FOUD*Y(MA!e3Ikg@qdly_`m<4W7YUi
zE+4OsyY~MX`px*?X8U>kKgDs&=bE!9{+vv?n*LXPsKFgy`ybwJ&3&#pI$?vogS}H&
z@xR+2Vn&7c!{b-|J%($+7hp#`?op{IgJG+9OD?U!>_g_#k5v_QtGCnIt^DUdG9`pf
z29UCQ$ZrCD9^xpFsX5#h{jJq1DvIUOqQC$CdkK3}VyByr-txCWWb<I_W@F}QX#ANp
z{MADIe0=dy(*IZdf`_U2ukin%{ol|2AAkO_r2jGe%%j%v@cwT$TF?GJPjam2|Jh@1
z0(*G>w{$QGpZos_j@A7yuD}-bDKb@18>f@ti|e@E{%^L>*>A4@O}+UX|Nm)@ofm_n
zKKWE(7qjD!uMhV7Osm%GXN`WnJ~$n)@86vs9^lfS;?O&3y}tJWH!?G=6#VV7K@s0h
zPwH2Q$UsPSO5t>zwC1L+wp-c3d-z9icbAOlozzbQv5P^}zLz3MyOYm^&4wbrfCb53
zNfg;3h38Lp>Jm(%plF}52zpwQUc=L|5UIw-vG97@ts&|_*lSLbXbfNF_q0@8rFFcn
z?^eFrp^VrFUd7#T7d@>H_B~KhJ%z%wK^w0W6t-)da*HG)?R`9bQ|%y@ow{skWyg-(
zYq)m(3+B5$4WYRYYY`0}W_N)$cjly;YS+T;bNp_h?e6e<G%Z8nPezOfKxM{U!hr!j
zdzu>ZwUO^>tiHQb=L)C}6|W!xH_8JEwm;h4fu4=R(XPV0Q&-nJb$WUW5?3Tn>`&3P
zOWS?5*x!`sp#OHCLcz?Y_=#2_lYiLGi)wX_U94Iyb8!NUonvdrFZ>ag)q(681<7y@
zJv{@F{OT(Zqk^}7=!z>+eA@22Xd-gvWCsDUxnl)_m(c}w^AY^M@Wmx!+Nnd)dqT?`
zecJAj{yr4ijV{9=;xP6G>g=HyK=om$9AJYyc_=)7yof>=DbR+pquWFApd4@;qeTKO
z$Hm2i>4`DUBM{S<Cl7BAj9eU}eR;xGb;?e?EF$vxf|N~oI8*bhwtGky4;Hi%j+ZLF
zgSM-}I{D$~Ud=1xP_Zg@`^p3JOK>RnQ*HM|p4^{7bEuU<8S-EFRY|?vD3_5C_>Kq@
zq4;?quZp@Cn6K1lFykI5Oi>F(T2~r0$;}}^GvjaYdFK3E!Y3QBsFh0EMk=Oxtq&tX
zL)fv2q=e*EUADF~QpC$AJ%Fiv1+Y_W3{07cpnzMPdE%0lk*I`RNfz_Um0DHlJ&Iv+
zy#|mT_v7F?-$up*z>7J2Clv5?%r686ow{Z*W#|>|2-ApSU{ZRHF4Kt+6Io`K2yYf(
z3{whaRYU$vOZ4uCY(zfb!6w!Zv}Z)3JF_hifh*mYF%Td6D2LFjY~mVojGGuIHO2tb
z<eH%}1+?o#g$%lAUjxo0W$$S^WN!9SGue>IPko0?`3S?5g>E**AOoWin1K0-r#yy2
zvw+8d`I28J7}5qb24(`g6n5gL3K%Z<bc)2BQotL;0wds>MbI>u!xSjG6#x;?-U!+|
zig=K00%pR14V8}Ms)?JD_{c-{OpxF>mHn3SgR^&%3pbeiD(90bfiCU8fO(6;k!=!8
z$Iv+=ktP((R%Q%JaMDF5^1#Q)xw!Km<3C`t0Bwep(kV^RxRC+ZRI#;$eLOkXB#vO(
zAq=i2Bk`!-BKARDgby9O6A=R1>}f0<ff2?SPZ;Gz5-COsF4Z8N=0yTi2rw|RX>@J^
z-$2(upIr(<FXagkYY4i7Z)11Y0mCLhZtT?Qx>SL7gMCO{Mihr(aIG4eh%#LiF^6mp
z#Rh1vk8+n0xXFZ1{qIQS3z!RnpwJdH-(7ck%5$pn&WT}e#O)EmHH|PZBh$=HKZma=
z1)_ifz2}QS4Q`%gwTfbjk{rkU8ih&4vn;oH+$eO96Gfk4I+kijU10bR&^C<{hx+n~
z(l@wI0BH7r;u($~PYOSbifquK9%9pgrx?6gjuVhbm0b(Ya6Khp@F&4FV0WUa4}A3E
zXhJPkW7Eg22YGm8DQ7Z63-Uh}B4;0swoHc*noM78<?Y^?0;x{GlLR#`ZEFBcEVF3!
zSY{1pEP!#sNQQ_{8<ompfkYNaWPweUj_W7rJ+f?*e=UJ=p~;w;JO`UE4}`{|#Pl=L
zEm`;fn#l~ZA(x5#W-RU=IDixH$-sUnX=zFDM;I?E>w)sf-&D0B!C7@G@*=eXL)ntT
zq@geOkzjlCz>R1)LcjQOlZhQim!Nhsti-nkw33%;1V{-M6$DpUH%skTtXt%PEC||3
zJ>O&_Xm3bZ&<x01)0?jyY|20^RSv2_3SXw~VJ@LbXRcK^e-gQg^4xVeY6joSYgSk=
zn}T2JK_7u+%t$DX%C*St=7%8PvT3pGRSN3h;>4u(1QVrz10)PUF#=n*AxYJm)KV}H
z)^DmFoCfmUM6izLC>;z7mw2(DHb6lpw4g$@p)LxwQLwHU^Z`yhNS5qT3P^&gkh)XG
zG6Ri)-xp!#3zaCs$|09%oKHiVU(rgDTu)H`<lI$5yMS1vqQEa|4=OJy1qLaZBns4A
zi8C{;MoA8&oWUcq4hj*ThzTr%&<yeNQ39o)S8&1>F2I4*tBMFe;KhE4mKa5+5l({9
zDD?lWL|4wkpkOIz2X{Vi=8{i(b8aZf($E?ueKZqLGh!e<ngHRWeBWJ0(*A(05BCQf
zD5d#etKFd{hb0x6bvOEdC>@C@?thXht*rO5l1_m3Pr0ZnsWe`Bs4dksa>&47!qFvH
z0@x|D(TJisqimqG=X2mJ^ncAX2t~J3N^TQN0&D#VG92eDXH4+~A`E>9lQxmdPC#yO
z9AfDa4F)A^fR0q&y6++M22;aQ5<S=4n*(jBW+7Qq@WTw^GMd4(ZexSc29{;89vLMT
zhh|w?E`V&B68!|#FxjS35oH=UA1e}-0K*ixXD2wc%4T1_yHILf;Lm4R`vP|WF9qzS
z;S$R2kjvHO85*`&-;4wj<Um@{BmxMgxU`v@ZujP1Srr2jh^!EN*-$ydx|><zhFt1p
z!;50Db{{KSL78b3>^r3FpixX&gOdn#QU(KtO_)l%bHrmC-3d@+U@{f%YU|1s&>xv~
z<%<7j?@QpLs?NnH3rhx-u&B7<WeQ{lhsnZfFq#z-3IRd@5is1$+$6V|%#3qqNa7j<
z#jO<F_hO~hs?WN$wNKjuTD4VMsC%m|T70#wt*EWl|7+!czVAEd+;eA1LbclVkzXsx
z%-PR(zI|C?v}WM01Rm*TPf|!N2-HSfn;C>VW|I;KGmvOC+c}*8uoaAspKcW}W)Q%K
z4ND{n-Z^vuz7VoGClWXc$U0ou04`o5Zx37ma<xLXDZ<#;4q|7!;pGv($)rPgX%<^9
zlj-C#@PYApH4tyYG(0Sh4av`dh#gS|IDRNy8jc}(;Dt_^sKP-{@WSark41t2bwPb0
z>J=@23JYVG^T27Tl_CxqJw`AIXhcsS$H7h}8KYMQU}QlX_yE`|9$9Nd)|u=qx{&ao
zL<+JSkb0aQ$ey7`EH2?CP?{nz7r3#$xp}d6&UqQAaXBPDi3TBx1?TMUh{E#+eisp%
za~#+gKYTuxA0IC6*C0Lt4~V)2!Z9&rG%g1tnB-hgRCCS{Y&Y50>2ri|9=u$88aZUK
z7|%HvXx$*Qv~##DOc%ilXCU-Y$a09YKs(zRw_wE6pwO><DT>7vILk*vAofp%dpOsD
zgan(9rx(nYvXB=FW-@Jp38e8b1OPA*9>}0>wZN$9^i5^xp<^oBYsLY=Xz&%6DyS_V
zKBYONie-bUZ#dbCU_x1VF~pmeiC`{H3(zBt+vVUr2}PO_jt@a{6YW+Zy{_nxx355y
zN~$?a!C?Z=8X-kOMMp|YCqK)tkJJS=&5uHeM}$wu57(A~y={7!kroPW2iJ5)m5p%N
zVk|eIL?Pf<9Y|K~W8i$cL{ff^BLQN>Q8L16gxfMPZp2=*le4Q6ky1do(qTOb8_)Tb
zYauBX=#La&nM}bCUQu<SV#3fv0$|0eyqVzw*Xo1YbV?_R&V{RfJS{C~C*gC*M@8eZ
zTZua0+$P83^ekX=VZp>u5T|V^TZEiTgl>r?13ex3*F_{oDrzZ`becpyWMK5{98;Z0
zM?jxvd9J+3H>dov%D3kAq%fu)pF90KzIpbYC<d;_+X>yp+gFvY!K{jyUym)j2u`s`
zvo%_T-H;3h0)b+*96)<{!gTPO)K4jCu;4CfxdBwRg<9AJ2jEj|WC~?YfPsPLC4@7z
z6q7A^iak`PijM*R1Oo6WW#-Z(_YQjRkVL~=7r~q3YCSxOrr0Fq$AFSt@z7KNf)J2Y
z64F4O>ewBQU~~HHtYGeRor$Nb7e4f`-=@!)$^JQKm1m*eGqtMS@IY!Y&&(3fdAzrx
z`C{L!S|zprlf#KQ(u9qMYQ==zP}e+{Y}oisS)c@M*OS{5a~uP}x9}nUURPD?XdoIj
zH#9G(gKuhx0>Ed*@<YdX#bOZnqk2*8%8Ucnm%_*OCR|$Fm_QxzGq<BH6a~T#(#~SW
z^-|mg+zj^9;V-|Vn=D(F+O>>#)f0Bt0RGw<&$v+0nSmT!Hg<<4+ue&SA(taKI7V}x
zj5rP2EkE})YxpH&wpVu7Y0yWSdC=RFjK{T)lCzKUf@&ymkiFCalXzq*OxiEbvLLBi
zMtK%s)I>4bGZ;AR7mPkN5MqZVQGpeJvUBUqC`ErGT!`%S^y6Hx`d1*Jd0_AujLdb<
zfLPcMtpLC9ke@T7u9@d6`v>PELR_>C6V3pEi*v~~+w=!L1DLKNMQEOi0GG<(s9ozd
z5);yg2VfiA(3#=aL*3Qm5w}5*?100v&lL{;4Pem%DTkq_)9CGkI16Gv69J8QhTHqp
zVN<>Zu04RtJD(a@(&h|qC4{{p*ngH#S>{Q@uYg-M)KKa`+<|rku@VqU#F{D(`=Jvk
zmK2fMR?xBrFfJz*4x<X!e6Sf>g58YS!YuQ_ZjX=Ah*Yx&YK<*q=7ju0welFN4azua
z+Tq+Paa58;6~Ya&BKD_J1VQLbYmH}Pv$?j7f$v6s6#&IAo*PDeAjitpv7CACZh^(C
zB6XW7^vS5<0M5xwaFdlD3>rKG78+7O5V35r4y3ShjXNuVDl>p4+c-PZu3|bQe_GX2
zF6oGZ+&U)oVq=EQPLf#$V4(YvcRek@v+<cde#u*V__o<ciFne;pxOlpGX=<Np(u(*
z(zxXu#FjJBro_R~Qbk&lDv52d;5c<D!=n7CUP;#dq^lWmOd;a1QRz-#D7k4Vh4Cxm
zVy9Dl_kvgqa+b&EM^#*>z$sEwmUi=8bXIJZs&iVuFrd1)^xKdmlEF8}*K%;p%Ld<^
zKQ4zuO+mUf!12DNu!a5&w!{U>D8*K!AOTy+1YRg;c@myJ;w5u^JHZ!d^1$>KLG3zL
z%E1rY!bT5Vmk%5~NEavNs3-`3U3v^JFrzvv6IQZy6QFRnjhp~l5lZ$zauOmBl95qh
z0x>xu)$Fzf$S<4$y7V5iE7_$1B4&flEa9|_YZW2@+x!4g{bKQsXpQI69STmI-efjj
zFwR_pb0+Mn;L#KW%gr^MhbOHBcyI__2X%F+rb0CDv(FisN(MP8g|zly4X~}xC<g??
zX0Q`;_Muh<j1S-^EW9`j3$7MN)+3Q9mapO!1p2!@39ruEOA5yrUa3!UjNmAz+$O0B
zqYE4(GR#vYRi2^^N#2OlL7S9-dyClC8~{Vm=_mEYC?7%UMDm@O1MS-MV8YLpN}O0B
zAcuQ3)#HMC6v=TI0@ouJn?4%n>LJuvgiI*pZGg25i5}|Db$h9teQ52KN+bu-x38XD
zki>DIX<L`7KS3&jN-aX+?$e>i7;9{$F(qKAA>Rk??|`a%6a9+XbTaH(oasvQCriI<
zyRal48pra$u>kKP_B#Lx1#S!+5hc3}ADjl&C<W6fvU8JTO(rds@Xhhrax|d>zt$D(
zY>CEzCro!(5jcYcjMLIq0316tAsxYKX-q$IqBL+hb*m6Pu(86gI{GEUf)T}e03190
z>i`s?WV@w#`LZFAe9E+9h_DGCvo>;KF=vJNU>$vcYoO+iMc~w+eYRUA)2{&;_-tDz
ztqfYe1VT>Par#7f<HhpIQ`n!zD1#W8Y*yD=^^nM|>X)<WVI(tbQjU2;WPl1s*@IzV
z$X=;mi?&)phFe0m69oER(VLUY0+9umW&5_YXFxd8`4R<Xj#|`prFkFuGrJ#g4<mSK
zU^rf<v$rcaF^MK2m2N^f%nX1eOiNQZ-~sG2Qp8rIW_AMf06@&)2u;Dhc)BPGW$;08
z_&tV9E2bxc9pqFAYHXxC;1vQA9HK!uMKos%v@!?T5&jp_RNyeMiBOhFV}}F_gS!kN
zewO?P_iYd+E~^X8=7NZj^;CFyXbh`^cOpAF2||8_yW}zI;G77dAZ8F+vb7gQnJ^bG
zQm}BExg*BToTxAp#=A+clG=~7<msf&&wWutz(}E;Lv^ccOYqeV&eM(K$&lijiJV;<
zHy>Lae*BG&oZM*92Si>yaym%+@ri*{Gze@ikvA{M(2Mhz`o(W$3_~R&F+JD`1_Ph_
zv`l!QnLCuw7{KD8sQ}k!^e{Me?kbB@0U0Q`Qvv>w;!vPEULkYB87-Ww(=cN2B!ZoI
z`^Yc($<3L(jA6`V0%Wy>;O{`lP1r^|c4}?mXg7o1`Eapl=|WQ)3hmO_rWNZ;GFgf&
zSVFLZSxn?iy5o#vHWPvg;G3}rNE2AIVSrR)1&mZLeSQQ}$hiJ?21)ENs5SYu%Pk>X
zpve$DYGBY{baARGgG^%r;=LYf!Wh<cEac0gA@Zo)0sIc(VMzBPMu02O`6mvl;!(!q
zu2dCTFZuv`4|*=fynkkMkv)RR%ybzH?M@hIX4XdWh)rk3Q!XNtU!&fs_?8o{A*sqs
ze!|f>H;zg%1ZlmGJ2yzI=2g576vKBvF6KVr<}dUU<j5uATBtPuLwVcmJnKH7#Xwbr
zOEn|OdWs`NMzO*1Zfq}gj^yZmyxg_M;BGT%m{qP{E*}V%knHg86*ZXCa17`G9Tbxm
z26=^~Rto1viNWIJ%;7I948U?Eq^#Uw!Af?Cpb#na;7b<gibA;R#q5nnq+3dgi!S!&
z?R;$gRSB;Dj574&cR1-d_o{m7<Fr!BhD!ybCc7?4y!`fwItX3AQ3tqR?m?>HAs8R`
z3%+0xK_|(>Z%&$z8y+&c&nagnW`Ml^R!0V@vw^$wIoQ4wM?+i#t`V=#<bfX@+_OX{
z9WwX-@o<M@z-9a(Ji`4J#bX>+^yRG)8`-VJ*4SKeV0ANf$$(VE0OX#FA|Y^=M7Cn&
zl-9;*ExZF%XLI4WHwao&IDWR7b|&p+cx1L?2fbTV<3h=6PW<Rr1Y`u+bpg9pgl>ai
z$Bh*+Rv`&xsu@vZBhFjapg|B3dXsbM9$ppqg^Nanb{<S05nD>g<V+@zAx_qx=V@l@
z$)Pp_nWNPcL9;qq65!qh36dFJ$mG7Oc*6)KbgLnJPPll1$^<x%IY9ZH2$J5C+@7F3
zDN+W#4R-2OAA*Dof>`<7gb0tQP94xWmQer0-ZD5tf%jpu)%GgmU<vAZ;hjYN`I$I|
z5PnNup&&*_C0{ydMaZ{Q3&k-^A;n*bHpZjS6rU3WXX&!zKso|-r;y4N=-`k_J8d)Z
zjwFeYYP~je6NJHHqEd&>U6#0j2FQT{ZXLRx;zyRD9-H)_<#52!goESvXSijjZy2W=
zh>2(c^vHE(D#aim{f<0wqm2#I;X&^%v(1J<dCo>c5kH(asbX+sf8$AqV4US><tjKD
zlQ0idP`IJtvh1(Xc_JO{aGu(5dOl@)$;6D74T51U%fhj$W%;5>q&XE@N$RI%DIX$k
zsL;-ljG-BUqJH)SK4moi+exLu>qFiVAaUE1C1eaZ#?=1CIFB~Nm@V|5O&X%=U^?f@
z9jn?X&7D^<stavTCbl*uAew&o%F4A#mgb#g`LcP}h=GNN4Zjx1%8p((>|fi-W>7uZ
zd0|iXZ<e0fneH`f{9@(&moi1|DDRwpIjPj`kPZe%JABf#t@8FNH>7YKB$g7>!>u%S
z3`cjAgWWnkZUXwU{PI2G7M!S1`KnBf6=NJx!qmg&*<{BqQKAMUN^t~eC{%)idK_3&
zF@}^&YfmtfEreZ=%}9$EZ6AZg7Gx!*P)BsZX9J@*x<lJ7pjd=~62d_8;6*_LE!1cV
z7V>+Njuj0`gr&$h!jUXIULMq|B621ev2Wt!>gmAX&a)M_Lg(47LvTtPg{2})q-@z4
zF@lC0aQq;%b*GRcR9c{1kEy!vOX{2n8050Z3=%TiOcCYaxNj_=C8>ywRtQD-WuRkF
zmu4TDE(`NTj_Qb`%r0J?0^-f1X_SEk#tdY^Z`0*uEQESYfeGacNI6tcIFoKN!GohE
zISxg^H41c!gHpJmc?Bb_*+LDSM?*=fh;9WIFlAk_M6aUFl<Y#Qfk&l@a39;0Cj>Kv
zS1?t(I2mqIp1S50MR7UX4-yYTMUZjlLU`wMMX_QC<1G!aO`(9qt)6(yb|o}^(waAw
zO9e@B1v^K^d3Tu>PQ;^RZJCLX0Rt9Duaiu85OC@ADU>VBSq%GSv(=MC#>1NJ;3A5Y
zA~=SpugmBnca}sr=*gXu1xIg%g%CKT=DffvcWB<@nVZmm^0Z{!tYFQUlmTgp3fL=x
z^g);_C_ULz16YY^q^XqZsl-F6hL&RuJ()Oaf``d7kT0UbGp*Fa06CQCsPN35EpiUw
z&Qf<otLIxv`OeOrB);d#m5M35)aRX5>)+=md;T{&;ms$VV}SafGs~u>=6{}5QhKQV
z=V$Ws?~woP-!;|S;B&nde8NO;98V7_%^SzQrDd~itPFpor+-Ud)xqX|OCRB1IPn|b
z0Ofk)fBfG}_!d%<w0*LaZCO*tIlCW9-1eWAxJ||kLFP7oN<533OrDn3c#!$n7Tamq
zXb^eU1&%ciG&I`3jd<~C?NEoPg`ta?o>Qxn?OHQ^k+Rf5k81_HoMYB3Uz%Yo?&><g
z0S=VWZjc%1G9;jLI}*?l#)5%utOd#D+#pLTNlqv|3P!ForV)`h`Sg;kgYqyBcV&E)
z9uIby33gfF3W*hz-Ao!@*3`hnpco`LumfGC!wuzb0oNLEHk8hfQuU)thhL}9iJKD+
zC4xB0)8k27FHb**BU*l32)gXX(CYy_fd)fyizytQfg+!BMxX>vP9z`D)C@}jcNLsc
zZPjv3QCM&hvm0t`1l+>!#BtJXpz?vz9Np+o#kOesn1UHI3y6em5OFifnJrI_uim$y
zG0;xX8FAk=JblhOUh0D_rZiASnjBcLoo#__Jdj~<n*_n|HW^9-C`a)Oazhh+g=;Fq
z^J%xzKZd}|wbM4@&5&k2(^4I@4wvhocVfw6#cF%oa}HD?30s?i@Fo?3eAZA{B*RUl
za!*=KG_JBxtOaixQqY2vnq)#l0Ilq7h$|HL(~}8>XX~8-*0J;)5EW5^PLw0mW_;3-
zV>%FX_y+*&U`7jCff%E2K_d~31dLF!`23J*v_}CL+Q<~HhXG8iD8u9lJdCCID?|aO
zPh`_GcKE=;r(P74z!8ZR<wa>;VFL7hvO7yZ8-Q>C<6bLabP+7GKbPX4na^s#EjZER
zXR!%FlPZ=BlzuXhIrw8an9(syBIA7E9}sv4K4kXaFh^-1zbYAu!3?S(^APAsyD%RK
z!x5kjZ#5%&yjQc6BWqp>q<*(^XMlNeRX+R`6C+Ym3QCiK&ZNpniaP;N8rI%T$qO*M
z53Mqczbiv!!j6)Ehog`@JmAEB(HY)^fUi|$CB;jPSaDfN$;>qwK+FMNa9PWM08>D$
zzszMuH>qqAy+}*zN`@J=1ye?dc#{q+%W0+es0xKdn_x#W0`VbTKz)QMCA~)@I3@5{
zgDxY{5e@lyPM<H<EnZO9)Y8z{&<s{(>GGU;j3DRADWHKKop3;tpkhyifhg%CHF4et
z-7Aa;=EIp*QpSVcRaZ;+yj1f-hE17M4vXBj`_hN4VQ2yTqy!D+aa!O<o`}j%g(5+C
z_6ti>Tr~xPXRc5=c$~hUj_-IZm?wQP2mtg7mF~;yBI^X-l#0tzM_6b^qTp-}!H_+M
zHBh$!ap&Ohhd3t27<-hrz;T{@52a<r^OIqC4>Jb!9=P0;@syBw2G|+JyqJlONsiHO
z^sp9=-oi!0)(b^rfh?m1qdhTn8YvCT%nZb#XfP=gDiR;aC0F`{TSG+FE1rg#B2p9a
zBnko<pbz;!@RUi${E(bay}X0CCgsevY9pbmhd!%#p&lRnq0c2>qGT)Mr$OBa7%0<g
zga9kd$H;y351#eOKxN?4i8BV7i6Mh{yD%~H@xjx!UuGE6bwQdJCZvd8Gf$L`nkd!`
z9pveCYjH|G{tw(kiKg7aT%#2(V0yn7fNB;@>CI0)B+Ptt8NTf6fZrrZR>_!D9KjJt
z<x!e60zwYt-;-%WiCWKR!ZbUCc}XK4*Zo>mBov=)=wNT2qt)n4RBG45e)rtTI(^n^
zMzw{y6=c*l(xH=SeSyIktavD@&5MT2NJli2$Ok|Rv$N$Hmf0TR*6jWkgAFpSC!jSX
z+#GJGOOb`b8(pjbiL?P6t%x&+Cd!2d+_E#q!gR}YYP?bAy_N9HhS_(PaUa}w8(jj?
z%sx1cILAARrifh55GR_gNpfC8`LfA~=nTMW;*5WYL~&uYdc+JzwdN$M5!5}Xsjb<5
z+{iOTdE)s@YirY6<7Q9~ne8UjQDQt=pf&C})dm*$R;#72NoEK8dxnvKXjyUqV0;jB
zWMtc<q7&g=QFcm@p9?Acqv!xb4o~p#WBA_OieAtRC!*!hWNPE0sY@4EEu7k1U)A`<
zrIi`ZJm^rW2HcE;>$15~BMgaNCMd8W5{>F%3%n!Hb<h!?X(#U&+K;$JKCuQTETZmb
z+JQN6B5XrZ$d#5%_dqx~ML?NW!f}ilEX|-U%WQ}Kr&!$)pM7R#cU&e0l$|=UAylr}
z>T>@&HpsLx4fyurl9L(c)=H<9mzI{7&0_b)pJ!c9Oq<A1JPz<l?f8ex_@DVtcKg4o
zRs3Xg3}F8+En&Z>*#D=MPCI1(|15s~9qj*_w0a!!1NhAR01E!?od60Bm4ExJyaAj8
zeNx|mL*4*~ya5h*12`t&cvTWYM<u*ZQiV>%hBloAtf(42Q?1eE5Voh*Yy)L*YZPJ+
zn5=7bnHW3ZhAgc{94p|&lJQs+eFGAj-fBg|N%Vln<SM+_7_XtmK8i<s83|(u#?6ME
z*SKsd<^W);jxj>t#_&B<S^=H{Yv@R>;VcHW;L(o(-{MZ(D$Rtnnq+booPbq~c?C@j
zCL_RH1i3d!{f0m#HVrBj$X|zNL{cr;M$J~CFUvS-dn8G=E8erXJti>4yu}Mp_*5-L
zp!qT*Zd>7{g`(&)K4|xZOzICeW_&O)q%PJQ2XargqcDnbPz=Ki)23PtNb6t=>KGgm
zGvlVrna_7Z@s&EJ*1(=^RG$F#pkhZ5I|#wp901_{`K9BLG1*X*kpS(r1u1;FQ7aPe
z6{)$qD1Mw~GbzhQ$T5$ff;O<Y5Czv^j*X<{CNhCmHw=Ig{{DK59a$`HQX&|BCUE*}
za~L#FdCb{WU}g@^YhVCj!gA`t1CFy2J6Bj5vtP}Zd$2k^v@tqs8VQIA84x(iT_*Vb
zgyeg*7wAUxQ1NN}Xk2C|?NeL>&Nl`sZGM!K;Z)~<`e52r&>`ThIw8|u*J7}aiV${8
z2h1+4Jq`yM@)KY|CN;)tw^I!VgefC#MI-KLD=^g}Z%M3|z!VY@sLnI8phn1fd2Tc)
zYhHi}&r;sQ<MUIJIrcWV?MQqjz}BrGA-@7!0;<Dim&xx4L$%;cEdDzDxK6(tLy&s?
zq~Q0{dxvn4kZF;c5)zvs5-_l~AlpYVRt5}*DSaEmkZq3D@%XhUoJ|+6rp0r<ba(K=
zZgMB4<!(#HF(&}!)Qhqs!x>Sj#?|g^QLrh&)*x~pF{SirA&A#oqw6v}B8tU=Fd+MK
z#rx{eF&@}0tCIqPle@z5hsjn<L5S3Y$pC7&@zON7ZmzG>mM)sxyrQb9PHR}IEpA%0
zyrH(PR`XOXWq*78+KPte`bEo{HP)i3s<C;cwrH+a)wojoVnbuC-(7e5;-<Q#OSMH!
zTEoJ{3mWQb{aQm~&4OjM4UO}(YSyoDQM0z7VPQiv8?<?m1{3n38tPcTx$cE^O*QrG
z&#LN%1r5zB{o34y=0+HEE*rE;TU^!D+)%S@K~)ozvYQq!T3W}ZuXQ&rYHVnn+r(z6
zTUgiF%!o`Qn@X!&&i>Gr)>kc9fKyd1W2<k%_0=p|yt1ibUVXDxzi2^iUDHx`bsbw-
zRrP{8nu=|zW<gcMLcdm9wXkYl9rjwpMrp!ke03}8>+mBsUsa>Ks;0SNQ6rp5&7#KU
zCibVF?Xsy^c3si1w9c<pH8m`S1DV^jhz$?N$$G$<HM&{9#yT1Wj#_iv2x|g=FI!q?
zucfxGY5^N-DXf5f;1-Po|0<f;&qWFAE<iP`s(nL6Y^hMh&Mq#Up_NQ4FDWUXUY4SW
z1y=B%ql!JGi~Z01$*%uZ#K2EDNB{cY>1ETVr^SDj&MY~k|NSg}{w?&sLZNa<{d-9L
z`_GL5JEZ+Rr2QSd_LqaZKu`Zj%-|uV?;)k{ze)(0gg+Qtg~2pOIZ_Ew9=c4#$&9oG
zV#(mtxET$!#*5F7M_Y|}B3c|X!(~j;(qjoDUOFQX3$=Mpg>1QybpyPx$!G$~WQrFk
z<tgvl&{HX)<dYMNHA0?%y9p#VEckE`5iP~(&xSidvV&2)&mCV;loxluMsZ5(h<3x&
zd_78e5({*OF(V%Cbz=%o9s=R08>_fOtzgIr&XnAoK)Ei8x5whfRGCj%#AMn2c10Ot
z3EWC7ftEd%Ksc;J)!Y8y*%?e_Yh9$;T6F<7Em&l)ER`XOsAKpa`EP+bkKEX!aYjjO
zZ4xD(nYf^#TBM_yis!~R7&cqudK_s_N{3}t&JI~yuBcOn7VF1w0HGDM6m6-UYgU~?
zEWK9&NVTRcl`5h*jm1#9k=N>EL$oZeYOa?l0wV$_MD8m77y^!xo}yK$&n=QurJvKm
ztf?k-Q8j~GRWQr4Krs!vedS7pbqJE$D9Ohudut3bXxa-l+eFr8x1ICcFEUNr>PPWH
zxQ{t(RJBvMRSALz7RsDgJcyL1ALRK)TR1^!!Ke$RS`(YxEmMVO3(>#<y^bWDX#@EJ
z3J7IuB<oW17!-UoFe|SZWF@Jds$0Ml`9s$5U*qy}{i04bS!tp{9%|A?h#Dt5y=r+?
zV{=`L@($X=(N;aIc{3(kOn)}=;s_jZH+Hc!vUfNmic;=IYPS)IT9Dv3J1NO(-9l9C
z3@lIz00-P68N6=i&)1=ViGiW5%5#yuS@R;y-@gv6SZFq~4=(HN=|OgIaAXkcYwy^R
zeM{Iq9Eg(gd19VQ9zd!r3+!g;Zuyn~xQR838s`ciBl|`OvRcubk%&iG8&zfRGz2*D
zh0&;@8jj2*s*dkQ+g>yo;fYAWJ_lx8$pf$#-5%GePKvl>SW;?Snp@aLKqP|rGyyi0
z^-bMvD(uL(60}a@(<gvaA7lR)<)(<GOgF)B8CtIehJnQ|i<muj?RHs;+O3dpJDnWO
zti*%K6xkUat)nv8om-}jPVdb9v3Y4z1&W-;$7~o-JsF-KPfb-v532=i-zqdaZUJp$
zWC&}+S^x@c**M5fnMfQ4(%xREWxyC!H2N^CFUU>E&XCJahUZj_N=&HaLAO2Ir=2P;
zra`?mUJ07&9^n4@o2QU}xH(D4bQzjNp>bkB)}R`A3m{n#pIRoP4a?lwxElnAh#~XW
z(XD`c0A@dDpc&y{DpK~j!Oa{dmgX*cb{J95%Vh%rrB6BOq!(vK4u&&RV4)$B74g6+
z^8=vNirpPiNEgYz*0JQfNg4MN+%D(l<#r`@@;eFX#QH@G>m<Zu@;@7qp?g2qd|8r=
z5kOLgNC8#Ev-L`F$^^-&(9X9fu2V<_abZX_kQIg8f0}@0<y6v_@3t4t2$Wwq8&IlH
zArWaLI)vFdAi&yLk7ZFgcWN2~aZUbIGJ_Ut8x!*dI%u)FD5rBqru@IS9h4*)pv))<
zuovf$`<Z+=IB}bO+RERCl2buE7pW4XS=fc9&Z0ENhG~ddG!z%@b$BskV9zLhEJ?{o
zp`^gfW6c!}1tBsy4a`%cR6HBp5%5GGeD|c4M8<=`MFhhgO*B&5>)>l1{6Zv_NgWY~
z02W`46>hUqZu4O7(hi(gGh|4?(4peQNO;FwgPsYyiWyMQbc|fw1tnrtNP!AV_EZP6
zBTDX|?1m&>=X}(t{~2Xh8@@o^bK4z+IzU|GpqI&&4FZDjFUJDIiAZUg4IP;l1V3<W
zj#inQSycU0X~>%4Eu=n`e*}uMJqO3>LftX`qs)n+g#XZ-(9=FY9x$77pAZDCKL27F
z$*jzGdfL;}WW=+xH>xaCR-36esWzQmDa(kXYx*_ub4o)S1I{Qq5sWgaOnytc?QpE$
zA+YAM+9p#YFp+7F9~DO<(&9#9U-k`wAu7ulX`MtGa3JbcAP<r+R|-+*A?L_0r4w!^
z&%$N4VEJmI^s6zO2bb*=154zXve(^8j)0hUo0kadkMOb`a=xN98ci^{QjfVQPqF;l
zuNiSjT@RcAfV4M?RU4U1;q@p2fXBy};}ms$`p>FWY=6YYuTJ6S*R1im89|ZrqIV=4
zP=4U`xq10=Ga9fGjPS<Gv5JW|5v45GUiOg>E|@2-j+kL88?I;&u=c#;kXLsbt!vh}
zWi@A!2SV19#-sN79Cto9%Cm<#ZhAmbh2qqOvP<5Sd*GV_prdz*8rc{sQrx1pL8NU)
z37l_*<Ah;z@ZFj<0LsLDP!Hgfn8d(3rT4(QK;TD$!aJC)**lo6vI8Uij_1MT9F$52
zkb<gGWF732QJAqc?IryPHty_#jrI=+Hf|x<^h*G;3pP@*^4W0bsCUN=W#rV|POX_D
z_c%_he|Ute#ye*?HC~KBQp^AW4x||F#@1`O3xEk^5|tCPeyU7h0daroB%hS~D<HNH
zEnUcc$-zG@ey>0<dYR|2Nw6CpV(MXA9Snvt9``?k^(z>F=PMY1*(>OW%PaV2uy+NV
zQi~B`mQS0Z<M$>wxq^OKINn&{-3t0;+OWONtrZNwriuNshW#;SvYATE6s-gzUR5Q5
zxWp33#HpWfYAD=k79M{FLzG*wxCEeV7%F%HMd8#ik6@ytn%g3Eq-A!QVLk50NFGu|
zyA^%E!ddw<sDza&5t&Q_upA0jkeeqp5Z8EHy<M$Q2yLN~BW+R>s9Llz-X(R*1K?3u
zcFNNx+FD$i@~;2W)dvL(b{PqQ=2VFyN(=>j%!YD&%ovmZSb3s3O$RD~(Y8EsQ;1V9
zslZ=$(@)$`6{U&}JcbrlQMH~;KqDz|*=k0F{l<?0FB&<XhcJ4L;J&({ad2?Y8ZxQ^
zinxM;0(LTjsge4(0>>U?6LEs-i4nJ_98t)5L_$rQqNYB$-LpXkvwIsI4153p-34r1
z(nng+%m<MQ8v+g&GR%qi7nAIAyMz&vwbP?mx*STv4q#=XV&GA<_DFRuMaX2*#XB%~
z3g_+?HN8WFl2_Sn^nXfUn1DCHAg`E7oTRw@9HiEC<or2GuNf&t@joKPHV;Z(We){u
zbGqC*2o1yF<<`vGBKb9=*qV(QwwpVI*35zmYn+CEZPzI2Jr?JIXbwjJ>9HXsRx-49
zp)Uv~qU&`Fle{cB2Bgt(yxh_+O(?+xKPBKXFp$%--Jn9z{*N2DDg2Mvf@5d4fuB~R
zHWX{>(tAbPOHB`TLA9p@m{!+;ENZS}D{eO&`M*<T_pBR*{Wt(=fTypKfLCPMu2G7x
z>Lp=4)y+zktc{S*4ZcDQ&DJ(FRb&xW-Hw@(diop=@2pG{q>k<YN5}X!vCh61h$KXB
zb4TlxX_u~C+QKME>db5im=7ekFhh3;NdRH61u%*7qIob>0(?}k78-1!fnk`Y#Z7hW
zzo`Qj6V_$J+G)<HG_1q-BgG|6qAg%>D>AdUFs7t1ysDw?IpS6jb*2GQa25=<$eE2z
zaqc3YBgIyyE>Er%<m?J<qF4RW2m6;TfCtae1i(E7QKvRx2s+DSL|3v*&xS`z$Bi&j
z)D$^uS(S7zwmELarY$N{nxcN9!!?JOkyiyiodSbVNrv^Cvvd`YS+HW<TaqI3ZN4&M
z^dyAmX||ky==sf4{@LE&(tEd=tFE-c?3ufKki}lsW^gRs%<5s_r&|zyZ9$S(oF@)<
zFQ!j-Vie9w4Bs2NWs-X@cQbP98MT>oOO}B(Cm1=6#=+~5VNvO^f<=g>h|FKGTUJ1H
zBq!#_Y2#c`qaNN;hAm_`!B+BHPVLq2v16r0+9&Km?9;9_5A`0&1=x+-!E_N_F^FKm
zP4UtV{d-g?s0Z)(6r<}@Mr@(_U<YHMtW%2F2e$UqVw@H6wI)6Q9v~2)de2HnlnJ=6
zkj^W4<KR4jtQeKy7&rEX&)JP6f*t4w2ThkXEf59IsRQ4;DC=PZV|t+w5s{%543Tje
zez)BqwStJ9q!u8;ZkH`*e#TlN3*3%cA~J|6V^I)!8C4L7W(M`J18J#nB+GvA(!{7x
z?vL1~@~r__BHx22{aeyfWdB|qmTUn$Xf53`l3F6TnVqRs8JTmE40qR>AWtYL-p#+`
z8Hdq*UeuC42V{L`sTNUm6TU|9fqclt9;*3_0Atr8PFX&+!P=!bg-0klJm=vz=lM0a
zZDPf_mE+4Y^OVd}D;-m(1zws?fsR8=PV$pIx8rg$&VCM?9+vOd@Ry|SIWOa493uq)
z4c3c#;IssvSi*U9!=@Dr>%CachqBQNj1RHzQIYdT);obnJ<BN}weXH!yMQ;gqM7K%
zp_VOMB@-#(H?L>aq?J=AbxoZV(k9iHPg+<$Y3UjdwTFTq39q9}x7Rbta{7r;hyl#v
zwS3wn%Oh%u!{~l0<qXK30VJ)39UJ?f4~0c6N-ehlfJ_j`-J021BbH+~&Mq7$VZYBV
z;pdJ2;oMw3wWIC@0-hD<w$EB&V>lOs2dYWWP`VvSRiea%ijwu1AzTtpxA0b1Q6OR?
z@r4sBA<?u9E+p~L0q(7b)Ee^EfLcan{}i(ukRRJgma_s<*R15{Ai0dw3Js|Y!H=52
z2i*!WkVjQ_;6(`aij<p!ykY?yg+qky4>Nw6SF3)d5>I*UsO|886FU%4;L;#{vu8~v
zKyaTYz`)7X$yhvK>tsBhWa;=P@(FO<P2_?E9y<a+NW_d{GT<3Nx5@oDWl<*d{*6bI
z?Ldp2eFLp}B2~vB-Af@cST7`FBD5`5B-7z2Mu)80ttjbCviO8^lQh;Q%epSo$|)Jk
z0Bm3$$xcM&q7{I~coiqt%fnJgqbJ<b`}fGKv`zfBv!wl5+P)o<O_R}ObhV25Y6F~9
ziiqKi7jq93_Ck?b_T!dD4m&i}HnXGAE={GwwK!xUSF&-T=7#-`0ti%vM_WP>GQrJ&
zusDO9m=O{80L&GwUf5fJcEEE}U<B1Wt#NjPfP-jW87Lq*X-Y)S3xaWnafwTK4IeF%
z#3PsC5a~>rvNu$flh(<!+-iSLFWKr-VOL#-h`z8K3l$f~l?<Iym+UOT0sJbY!{R7K
zFx_C7aVnN51}dVX$Y4m{2|RAQIEdLv+i(O~!EInHjcI#ExI0ZA?HG$kp;$Y;sA$Y4
z$55V&;x|e5);y`u8;vPP>It|x{os)$?Px8ufkPBDvC#{l7J96<NSJ`wgH}E6W~^e^
z3<_T&Jt4#disY~)2GA&qNm)76Y-hW(gE!nHjU(d&s+s{~F+TU)MU*7tbIT&H#MWZ=
zqUohFdr{eRt)#5Hw4{96w0}|>`9pc+2mg~j|BoHE|4HZQKmSkJw6bZl((At;%K!73
z{QO(w|KV99{?pU{;Ku%CG63OfDDh6lg&k}jpp1hYN(J<vl?v$pQ1YKcso%35kYi|$
z3OEXP<}FW~|4{ay^a(zt>_1u4|L~h3l~TvFQ>)q5VeOHS9a125B*M@F7}?e=WK7%u
z`F!FLDwqm-FJdT*l^js+G^I?2U}qRg59u+mn}CuMhoZ#jxIL>FRLs3rF`E6>8CEgl
zDW}bz5r}of*cPkiSDlU?mx?rK1&E`doX<;1Zia?TB#eeT&4dqY)!7Af-HYoNgQ(fu
z5$%GSx$J}@5b%wCC^CYHk)UApR9U@|U<U*8XwrhhdpdVMz#@9=0>KCsF}hK^$4jU(
zaeS&3oeG~Oj9^D3$_RF^tvMBwP_`kFH34-UXylu>tN|oqVAA|VG4W$`NzlRE1jUGX
zf)GeVM5SP-T4u;l7D#!c+j;sBt`ucLCc9=+CzB577D1~(np#mW*WGGB4|20Iph_D#
z{c+U?hLb~D2*yI%F39%o=psT<!-^Coc#@8AG$FcBA`w5tV&ibI;H7k;QA$!RlzHf@
z15I$PY^9{B7OntnuzChiO|%Eq*b04$PA`&ncDNWYG%-A!x=fgZyKIxX*)~mwq5vSe
zNL3^39nw}R9VGE&L1WV@v(cdPOxYQ%Ewvxr8v1yLqNL7%bRTS`?Tm!75fLElY2h|$
z(WtZ$j)dwoMOGr&Y87c-l)9C^FuI#e2RJtzX0Omb(FT0B?FUt)cxqfTN-YS$<e&;X
zqr#8kcVJ#nEQx3vwl&l_qh<-?hUB88hLM*tPJv&yz2OdC6B-(K>Fs9FP9w35YAOq~
zmQjhEV3!=>PTr*Z)5F1J81*gTn1mde%?dQ*T)!@pltih11FZ*?|K<IuhbM;<b0#73
zm!?<5l^(J~O4}J0xsHW<y*+-d*LIcW9*#ZQ6s;FOL_bIPg+zF8>GArM4~!nvQF=XM
zK#yOJP3_D!-jvR=h0eT%V*m|G4MVjBJ~PZWX>xmFj;gmN>j6Nra5B&-Em#8l-gFz@
z5L5*iTc9IG(BkS|b;Z&$K_CQBLSMiel7ND+)N0`JXi!jJV!e`Z*m91WaeJyV97=;&
z9UPcAD#vtHpwxuot~im-Z`#dA2n=-FAR*#`6~JF8*TSC*=@J-9fsc#j=hTd*xBs5R
zI8oXL=xAHMB;SJ9$6C;Z6u1lIIftSx;+9*2t=_YJ+Bs|lp}z!&-a0BQQQg}R@_Nqp
z_ySl_U8~T}W+R=KZ7?qlv`&v}0GO;PYgo|3x@8@^M~n@Pd;4qItG4WEaXbNk%9ebz
zN<2H|u<&nr;tmiMmM8U2Wbz#)d0LE&-#nKXm>U&D>W22@eB?A=X1pAkbc<tT4q7DL
zx}69-h2jCewx12s07UMLT1By%PEaHuv>_jptz^K$=nE!>;+c8u!xW2*vom1}?2c-9
z2bKs0>Pe5$k$n(zBH3><jc|xZJK@`-giY!u_;9HcGcGBF{!g5wus4(--w6X>K91MQ
z*f2Q~chMVQTymL;8F5@+7TV_L7zuHk+114)OdXEbzGBDB?zGcmpeX(FO)PUED7{TI
ziNO+M6j@?EJZHBqVsY7}%54WUOzC6WX8h?Fr%WA7l0nJMzZ0eq#(sebgYk!8HL@>i
zK%@ogEF1fnkr?n~Qi<l_2J0RV3K{Gl+)9O~%)=<)+3c5T9_l@%{{ebwfL=MkwA2AA
z`XAtI8sKa>Kx+Tg&WyQCfSknrD8ZN_`_^#cZ+IB~i82ge20JS}4(vBa++CX<wv0I*
z8|lasOF=sDxj-%CoY-zSQY0ZaFW!%c#!kToHm)FmMJpsagy43B#aq0)tZ!VtAjlX6
z!iL{o0n%?1A_gt+8c1M7AG#KU*tQOYB&39?%&RGUvw`%w$wG&ID=3;kPRIn|1^y0%
zFoBi3@M_RJ2ia2{1(q1&1}-udv2aqW0`jtr%m+c*6_(0MDDP93j0J2}@efJiW^K~1
z@)#hbaGy`8PDI)7xPcc<q~N!NgEq9;-Yx_@Y`^g&cY@)3hFBZtK|&H2g+V$L`U0`{
z6gpucG?Vw85Nj-+h_k!H460~|Hs|0q*~P-W3iiq`oG=Aml}Lt(>Sj-d<q+o}r9uwA
znGTa2gd^;8?v<@;<l;pu0w{?wY($Y^M2rO;z{V=<aoilx76Il2&Rnj57DU{w#YY_Y
z80GCKbbv!ijJ*lrp5UM&3fRoyLQQux-pRXVJq7?Nv0A?jV!^>OQae3SMCVbY>KuxQ
zZ!zg9^9_=U2%k?q2ssH{ka$IilX&qxAoU@$jVH;J?+=qRTbQyzd1AKdz8n{VER7iy
z8hfa2#p_Yo)_HJ&HQQJtu)=ro00o;ZVJOHsia*PYv;&eTcqp?te^AzN-INf!qKGKq
zj#q%(!aeL5CW@fU!F@CYO6Ke5VBqCBG5|^Y{3>!#n6<ddbIn0az};2)Lqh_%kZ}0L
zu$Dli5e8pL9xhG>4$dv|bbUJHt8f;zOTz+eJUfVxy+VGP8F^Cq9N?g;6kN^8NHUhn
z`uaI80VM@cKnQn2q=xPIal)2hEso(cy)_YFscM^2^bE=^2~T&o#!muUO5_008bY3j
zAB~M~5||VgDGV%@gQ&#VZcRZk9QAPg733L4Qs^C~ex!ieP{@)k@yRN1A^=oujWk$(
z#3YvEn+*J@3}tlSqO>#R+7UuXP)QHrFXU7|NpuWHYCD7S01Eif0o_a{OQUnhhq4!J
zD9lBFu&y3Mh@EVZ@0bK<-WDq034VpELTt&N>zG7ZS@o7U2V^rl_G%TB*^nTu1%jDq
zM|_73W%8H>$$*^7kr3)7L~6z`&rdC-1R~y)1s-9};L0a<>TEy-naDtDanq8K5En&q
zAB9?Q|FQ&>&x^28({5X?U%6=kswrw-TEHBxy>Rq|ql{W6XxRNu;C0aG6cHx%n9Mf&
z0QuNZ@luDXq7eunjv^$pcVfgbiUh!3(%@5yqhU@0+Ona18*X%GuuHemYRN*I(x2E&
zP~?OTX)**!1G3Qu`FK7($}o7sAYP%82s?&O{5;`+xWqVxtFno);vpMRsM5<%X~jaD
zn&$9^L?2^30kX720YSvM5+o3g6~l_){qUnq9i=}a1-f~#QFMr~7CqbzQ2`F(H4tvM
zY~6&yVscP2<2GBs_UzZV@Xz<Hp!CexSk(w4I!;|o+IgdpqN0lwT;m6CMZv~sYQ+XL
z_b_~zjAeL?4puV*@&yFO&dx7ap88PTHm{fdE)ue`g4qRZIZtfPD{9I|A^asM%-Mdp
zs7w$+0B#}1p?Jb?d=5Vh&?ebWpN=UM1^Y~!k>HYpokxn3CuM5&xQKm^qXY;wAbL6H
zO)12?3_YT}XNNdq!wC~LxorsKP%(=l{#sNH)-rej*$|uAZ0m(NI}KS7!HpFWgd|}P
zplDeBRlGMp&&rdw-yeEz&iY)-PJZ6*asTl@+5JBiU$IX(NB{nxr6u6=nOgsG`XT?%
z&*W!b!`#`k^gdUg>#y)9+u%Bv>-^!vFNj1U$z<}}bI;Ao>pSeQ4Wmb2Ja+6Q#~pXM
z$Mcm*leSKoa`p7-*Ugx5!<;!cS6AO!S9ja|`P-K+y<^$3Z?0Z_kFI|!6uLhg{`OgC
zeK(Q#-Z|$yx?#hHE3UZWs;jQL>86|d`hIZ9B|qH0efvH4-1Fdr4?g<nqZ>EwyzH{a
zue|cftFQj?%{M>0ZQD<`Z{KszJulpU|4R=&^va`;zV`Uzk3aqN(>r$j`uXRdfA!T@
zckSBy%rkH9-u>I>pa0!!ul;G?zI}W5zVr6mZ|~dp-rH~g<<Ic*(Z?Tu{CS`4LH~Fs
zeb{|~{S5zqqg^G-KkRO1|KF1H_wJL~zx$s!(zToYf8r@eyIgz!eu3ySo3&kb;)mTI
zE~maO*BIBheEL72&qDTp_<bb%HwW4e8H4}t<Nd^(TiD;1-@D>m=<nifhqb@nEq;eN
z7rUBVAD(=)s}R<}eokRuG_!v2bKil{uIt`haqgXLj05~9+*rfgj&U{faVpv09XV`{
zS04WHME194Y`Dm!Jq};xtgSfO6=vhX`k-As`@fb${a(%;jsKtizqIageBHI|@5WiQ
z?%}Snu5mf`y49aQ@2YimvGGoM_(<1T?BCa|dKdJEInI2HzMJq-KDPD4f8b424nN?!
zbolZ0_ifv`VfdIStDm~>w#POVeqsL2_4j}6N0*OmxY|2m|J?P*)t*1@zN+n;){m~<
zxaDOnKe%hWHuBWrvC6(@Z=7kpF*c_44Y{tMA~v?;u^l5l)u)c#zdP<3c}$=wvAc3v
z&8D$|*#2>?@8&*x)5*zSz52~*F1Kg3@79u7aBj}%g+rdGyM9BJ>(;f8{r=fUt_z?3
z!`YofJNojvsz!AG=uamc*H=@wb^7p+A09R4woATM-g)I;?!NB*H*Ot~sC@LE@3n8b
zxMFzo&@;Zasp{V2MqlvpBM*NNzBMPb_MXc3`~Jsu%(xG<(k1mdSGrF=_swViHuKCM
z%$YT;N1yGv=vO~`x_oH)?!5Ol7G8Vcz+X<-v2(}R>vx|0)A84@Yx&C`KAQ5x;p-pS
zQMmQUw)*1l+|j$<yZ^6eE*d+0Url1xkl6al@~e+Le#J{ap6qf>8J?e?dy4tuO4m65
z#EqRF6imM=dfdnJYWs#qE?%|1_W0{hi0mA-XK%Fhu;#~x9RBCAJ2oFU{Qk<b*I)DG
z?qM|-)$blL`WKJ8j#%*G;=HRC&%JcRVJ9!xy~;K6lI4pFe=@bw7%}mU$vGp34%xHQ
z_2p69Z;n=cZ^!P#798_R;bl{P@!}1)+&bg8XI|X4?2au3L!X({URSey%Z|-q&%?hx
z_lnDobmjWCU$b?|hUKB$ORmW^9y{xXb$9JPeA3IBw{DWZZddoM-?;1dciq#J*pO2+
z;lP`(RZcF9jjfuzaqWc#MfD%7A2$BcAH7x>SiHk^>9CTuIfvyo+&G0z;`-x~>YlZ`
zDl2;W%)5vEeajB(*k9bR?b5*3#g)TLdrKaxynXz{{1HdIef@2>zOi}I%WF@X-MOW3
z#O%L%&a9}=wieu7H}|n&wWF@vQaEbu@;lCX{ex?Ydb=lVbLEzQ@WkY6tB$|AX4n}2
zw!YlM7i`JB;r!}}cNPv^{m7OPxqm7cxAwr?S+~?Zdd*RlBM$ra-S7RE`$vWEpVR&E
zO)I-9%-E7bcjfV}2fzBnF`j4iU)|tZc6{yruU$6%r2oFnb!_71Er-2c@ywYnzrVS9
z_=NH;ueVp{UcY@$ZvGAigB@GGc7bo-f!9{JM#QwdLSI47#=}nV_TADoqjX!es$#5b
zdd;xn>G^qY+<3{?ewcs8%V%CV;wLY^l9LxYcSY`Dp}jQ^{{7fB&*fGu$}g&^&z(GR
z#TQ)n{pL@PzW=M|^7Cfg-0_<4u;;bN9iw(Ww&v0gu6F(8)CV>l_p@8)ZvImBOZWSJ
z{lT*6JLi4>=D$wN`R<V3t6OTyG;QrUe@LF!{=dfIt{EQ{-jILc&kp}+Z}pJB|LM#`
z<D+AC<ofT+)pozrH+<|<Bj*pf@P&!{*B4%~Ex)LKr@QgK_}jVbbE?<&jokZ{WnZ~_
z@5uVSIS&tiJn#FSUEi8tx#9L#*RC3S+xnr0uibTV{?7Tw*1Y&c--gPq+wYrr^OX4o
z2VR`C@#ymly|Wh2-}<GJqhg~DFD@uq`;F=yGd<V4@@va)+co*hqZ%$+>{&hG*#l#Z
zX|sM@a8Yi~^M`lrxOUTrYln<k{M7?Dt~mCOFLcctetn;N`}GfO$iFjDJ8jjXJ2z}S
z@o{7J3I58^=1Vs0@3^O}=fcKk^WS&9cKpU+d9gRXmUyD?3uW8AQ%}zM<ugZ~^ml(_
z+m-ph-ZOt%@qPQZXseeT@qX@aZd&lGulF4J%GG&yznPQQS2<zy>AxN`qu|uhAJu+w
z_*v`MTsU_9ljrU6OxLQ0pFiZJksH~0Y|A;U;EfIE-~YgppXZ%kx@YdF*I%#8xqH=9
zBgg*umXXb)CY<2<`Co4xcj8UHXFaFZS6+Yi0|#yy7TFxR>FUtAqeBfhzx(9$n)u4v
z`TM_k(f-bk9OL=NuD|N0dn*$;t)0sXe=zCZ*Pngx%&}d4IbU75<;bVrZz-s6um0MQ
ztz(${xO%6nwzGBoy?=Wy`SBT7pJYDZ8tUJ>>XPbf8!s61-y0u#bHX1I+p3Or?Y?pP
z-c#P#^Sejio4#!OEB9X-4c_b;w_~bx{t>e#SO4s{9~|Y{>nmPedu06)ACK-kXXc3E
zr|iAG@|l$n^-bNk?5b763%+wn;kem{otoP-WyRy}pS$jRs_r=VYgarKTt9YuUvA@e
z-yilTrd|1yh9Nc9UHb6O?;Lr|TX$D1@vj=C<z5rHG<n0}uE3bwpIma^+vg5{W&KOP
zKkCIF9{A~|Q`+kMs|tEgIo~~T__&|ncERNTJvC>awshuGf2cZr|B4@1KYr4TZ|<yI
zw{89K+P%3mJh>y5e|Pz#n#-v5zL@9Pl2bkOHlOc9->Q=yDm+u)KCF1^Q%78Q(=p}W
zX{!0~&86@B>c#I*{$O)&!Fy{K4()qp<KJBQKl%D4_4jTnoSggTnaw}?-G;5#UUy;n
zLrZUc=$j?)m#vD;?Ww$X?9Q4~cf2(JqHVX0T=LTwwaG7R{$Sp`NY_&%-?(YYabpWS
zrxxz~O8n0Gmo8b5bHbLBYIh&G^XhTF;iv4bx+=aU@5Ip9Yws<;Zph)go*23N!@gT@
zE~}30*g5i^r<b1eT>R^oz14JKN8#yzeQf!R)ArYtKJw9lXJeZmy!p2aep~*_kA8ah
zvDX~_z@@((_CR>(M-$c$8&ci6Vc+i`H?MuVpl!>mRg+c@tG;*b^oq)<$y;2PYu8s@
zTkzg(T{raQ&w6=!)#>*IUkTll^L~wXX?tbO`kQy;<xa@C?9v@g*A1U=;}P#xJ?fb`
z{?#+S(=<uj(S2vnSEu~Kb^7=Z`<nh3yzsmGmgU`WWQXhJKlo<%YLmaU`HKaGb2oO~
zKL7cnZ(Cn|+b@GpO#D{UD@R>YJY?7JAMX3*(r;UvZ_SOZ{=zFeW=wnQnu4`|+<MI4
zb__l2h&|sL^}vZ|9{pg^-QQmH$UC=}n19!H78L9nF}twrxxXL1WW@EZVQcq?E{=VD
z?}6J(BBReAbzJksFT@Y5zjoN#|2_75JNj}vZv1-e-R%{%OZE==;ZbM2F!UFl`~Q36
z(?eWUBTL@ea@5O1=KMMLj%D4C_Z_KiJZbmLo~O>L>AL*pZLV)G-}{5>Uh{9SJnnZV
zjPLx4`OVu8d+74}#{cx0X9K&+uADgJbZ!0Ys;0%?{dj)Q^^ae%{Yx#@Eekd;DJlKV
zQ{@fs<y<-O-Te58)gOH0PpxPD{MpTye((41jNi1O;MF~oySH99WL<1j=dt@<*ch>@
z#vQfnzvf=KYu~6H`OCL#c;B;f=<yw{zO&x%EBeFJPffV-e}2%m?ROh{Cf)tm#;?|n
z+1U3{g*9Aza^aBUf1bBz#m0?ATV~udeDB}Z5AWJ_MSJO{Atilh&zX4b)5nAk)Z|xe
zJ@MSW$0zUppC6oX;ka9aKRoTB35)Wlys<a`{`#&-_g=E<UVr{GubuGDUE5b4H7a`Y
z`X%?o^LAZacuHl<**{+yoL-)@H*xfmnfiLy&3~=@D8KKB`f0C@ab0xQsC~=VpW0ox
z^|55->oX@@m$>7vtvP!q=M5V_%$Rkpk^AaVqo%t$N94qlZ=C<$yZTR;jVj$+?jAj7
zbWX1OqQWw*@$J06`NLXosTuX!q-i-@)_hP}9WN@}8S2)SMe4`6ewH^%AKO(?dclZ2
z9Ut7ke9rL7NAgbl)0p~w_q$H~Fp)QE(HRdPebyy~FOBuIP9MK^$g(LPE_r*2H9VG6
zvNvzxg#44Y<Zga^!^5wS``K~%XOGlf{`SJ<?=Aby8=Fpkv*It!Ey-Z<j+gr0I1oJ1
zAG|R4{?5W_tB+m2>Dq@cy6MjGC;#QR)jv9+TAMQB{ssGA+O%QFlFMH|?e<`~|KhVo
z+~<mK-`MolY<Fq(JKrh%#<<4Z#jDJx#`$ye$4)w9Z|?Cwo0$K{@1AG8+w9gyuken#
zy#2UW>+?JAxOCB-tBk5I_uTJVI4b|x`&>U*?>a(TU%Pk3wGWs6byMM!Lr0w$+c<2(
z^4`(2_RU^ujQa9(Pie-4^)q7ggO{A~?4B{6wiAmMZ*b3EoV#*!Q}^bMy78A?Q<K}a
zV9YL0&9>Pc*Bm`$=-6AYo>tMbb=aHJH~nZvjko-vcfF&w<xDBe`>z#+d!Czd@z)!N
z#*DG|=Y6++{7*a1UgZ7q1-Ebh)&Xn%v+s@d@6H*y_{5Gq)A#N>Z}?etW2*Az)oyxc
z$<n-)n}+=E<O?1=p*%L}{p&6-o3*-QPx*JATU0P=%9v5PAI-aT*S>4sT3?!&e#)Y^
zrvCCeSL<`D&a2KJVa_@2{%e=ijsMM3--ag(-)-{bO~^ZDN6xa+8<y?N@y^~nTbuXD
zm|$P;1uaj`DcozF_JFlvR8`I1nKNqwhv&pc?q6`yHrJPieA&G<?}#0}=BVVpJ+5p2
z(tcO`gh$>wEhjN=^aG`L73Bu@=T6y@bJ~Tyx7;~?dR5NpqmDc}=IyD<@fRNX$Om%{
zpD^~#>a7J!HlO>{rPE(JWx@5=egAsz`X5i(_heyZ$&GJ*@4|1*E+6&6825of^RC>h
z^K+*C{5O45hhDPoyO&i|edUO+2Sz@$>DWuUPkeD>I2q~wk?)!ZR*bwq_uhvudT`Ih
zW2Sudx#g$*`mNC`Hhnd3XWq2ed%pbSMK?V^=C*Gd)%V>tbba20pRBJ*t{Oji+!1T_
z!*g=q$!}lnnYUubxxZ*HzHq(k__b#oku!Dt8NRL7?Ni>*9b0n6z8gHJ-dNhZ(K_#m
zKu7-Eo3G9DFJ5!RwneVQn1a2oG23!Z+Ll-R;pnSofBmQ>-zeA<{&==AVX^Cl6;(gJ
zzOuS9H2TkZMHhb~zclag+S4YLoOJe=3P=1oXUbh`rx)g4ebk*}w$^?>|IWC+wlkF5
z^5UqRJMIkZ$(vc3_voynD@yLTcG&;><~DbGPL6BNr!EN}`uU80GU)%Tc(C|WoddLd
zvu4c5qW{C66#XCjt;D6x_*7Ss<>&vn{x8e@gMqBuX#I5H;Nb6nCdU6Cy8nOv&j9xi
z|E@4v!3zJ6&(XjBzhv61=_&ai${4)NJf#2sEPkebnm=x(u0st$j+;KMN+vp@@p5nr
zfPlGqNh2QD-Bik=7juDW-k=XmjWa}I9UkQC{&ZJpXSbwuh=Ew#h<U(O5i*f_^*Hx&
zh_|mQUE{+%h*jXzrE9zinvTKY#7r1-;A_l~N&%@3e;LK?1N)$*o%?sNeg%-c%Absf
zF{yO9sFsD<(!oIn?BT*21e$lTHsmIPZWF5WH(wgG5|g&*R!bso80F}egPz5>PLU8W
z!}`?RyHRO<2VabZ{BUr^8eg(s>+)-<)A`&5Y`(5QOG_8e9~gnK9d1bkTXrbG29$Xx
zQ%B?-*)R}ORsh}#o&I&;KM~W-xTSf!d|D{VhBVs>z;|EscKWo63e7_v!yb%BDJUr5
zIU=oOD{J8|^_Tjz^I5AF*?>B)qt0Tl;Ns7hTtK-gW0*jbuP+er6ng@JPWXDDEyZ9v
z>wM6Z9Z2diiGvx`I5@2sY_J`s$R2o*^k4W7#s)H|ttKZpnc9}Zc62RabU_(t044-M
z@wetx%cWtKzoItqC@S)imlbz}(yZP{Lhpg@Jdt&ZZ@2wK>;U0%`wlcOd!YWfVfh1r
zfX@Ttumgl@6`0>osTfUhENZYVEyPR!JS#pZd<+x(rFF%{2R}%0?SWVeXM4)zhTdeB
z5oRxhdtIv??buZGeNE`WPCiJqtII_H`BE4iBF#<s%d5ICDM3KWpg#Kv!pXM;yEQK!
zxF1?E%v1n}Qh`Uqo=K@2pB}+AG;l(;fH>;YZY0{^H*ClT3R^~cU)p#-Jx?m-@6^p-
zOB*~EaIk^kQZpKW1b%$cKA&h5i$~j8v$l?M2rlz_rsy8_9s4sFj#`G7{jMP9fMq12
z$pmae^Lp5gmxD8A3&f>EFFuyqAraRj76B}L>t|;Gu*%*otwVP5h@hQ}fVY|*Ss*}*
zW&e6sN7%d`JYxKe9}3^MS|5eSE{NGHm6@S;o94tYZE&&dIJ^Q^!0Do!swIvZn$V?d
z^q338(%BbqGf)WyUOKo~YFPLr?Zs!M{{!-W(N3sL^Uvh}rkBhpN#*}aryt_~K9iqM
zm%DQCe+W4?Z_+Ot$e5lOdSJHp3jaP1dY=oENN<zTefBi%n0%}a7+{}z+}RmM{;UO7
z0VLPLw}L2!y-oJtfcOZ<mw&PMdk)4~i;_NSBM4At%ph+JZ9N{*5&~rDbLh>E41D&1
z7<C%G6`pl^*h3tYgQwzLQajc*@bbz0T9J3vnUkzJ6>CoNO|qs`u>X75C!RG^e4Zj=
zzX+9OV6uR2Oq3)8)?s3xAJ4fd-A^%|*8;b9v1lC8-i6H}(f(L}bpNkNnYE0#BJ~Vc
z*`urph+Lnm_yCZ5d7Z)*anvamim6%bB{_!eguds9i1>AWnMV{-L7#^h-Cll$)|rNb
zB}~BGAhpprVZhpb2?r$b{bvFn9MuUTEsS+f0VRq~P}Yyz$GMa~avCHk_7?%})USNP
zx0`807H!C)4f#bx0PleiZ#f{|N`-j!qgCRf?8A192g%~;xARig5i+n$kGd4O1}(ii
zpIm+eX(ljvb_HXnw6tA$dU|?1%7|%az>djMFUwM|7H8wXrr$Cgf6C3mfD)SEjNtLm
zO5%z{qzuPpBfC52MdYL5^&`BiR!y=hJd-TXoaGcJSK%r3tXU&A8mHU$Q6dNV0Qup?
zZAgIK$!xm7v;2Sdo&&JW;%eE>vXVd+G@${$C~+($8kScQCr)r2CvldI?M&MUS^8`%
z)`~vKBM{1N36#B|p=`p2LfEtHSs;uOpp3F<%P5<c|K6?dz9GvYPUzoSEsk{e?%jU(
z?%f-79}`YeH>##wWp1u<?0F=BNqH4cDKF^CYjNeR<<S77Mavu1Y2et^O%07UxjOQ8
z(_z9b?Zl0;!Q5!Bge|dHSoTMScIIjal>czM4TC#7Pl3VgAhe0mn4QFc=Le(VcR$)a
z;YJ5tB@qp%)WEK;8mCYNqZ+VS=rJNS+Un(`iyYI~C%qUNK}3XC`p?a$419LaCnNu#
zi0y9qZ*f7XLH_G4EF9qf_r#}v8E3>tp;gn+j{U}z2~jDOR0PW|Rr@wDxdCIm|2P3L
zJ3fgmk--1+$TlRaw@UzOcMLTed)tRCluAOZBrdb1b;NvlV1P^U^?<JrkYzAvH_KB~
zFbqb{;%NKH(8?ZC98Nm@1;iIiBpC*UNe76y0{%jXFOVBBuEUq~w^4qBaV4tLCv-<}
zLV#t5D!)iLm83#=<v3~+;l=?0?;R<XipIg96o$&-kTAQPOJb#{{UiQu0iK+9?2yJ>
z6B<~;V?e9ziN?ZaE)JnbAQ-N70{7?iYRluYN0gJk5oiAjks7BI?87!Fp7Su7r2S-2
z?X2ku-f&uPDw+(13HEY|9imNA<UzCtY}T}`qb#?IoSf-S&3Lo1rog;OP?v5@DNBHv
zQvDL3k|E5?k_Dg<rAc-hxI)HIWj41PeQ~>O*d?-!vbk2a8reG4Ei1g{wJVcu7vaf+
zM!zb9hl*T$ouk2=98wwIa5$Yram8@$5)U4Qz;ctAwg3RZ3)KoPG^i|`@UiU<Yp$u3
zPofN?y45j5h8sYomJE#F(Q+XlaYszvP6`MKv4pUc$uLOvcFIJvt)MLfHK?s2{Iqd9
zXv;X%#l;sbYdRL8nzfxXi*z^=vZ8qouo8)ZLTsP?%y?O$u6p!y7m9+Buw=(88)hXR
z{mfVGC^3-I?n??Fc*4=Goxf@EDIqQ<>;x&|T2VPCw8rNThq>68^@-n(QZ0)iA!$`9
z4}(E-L-z@uHv|c@1<h%M8*xI$&pFLhiUHZ!=pOU`@H36<90m^%K>=YI@!`b}JxLC&
zeW~FA2gxo(fDU?9q0)DZ9E+t}5k$MKZ+OU{xxvC#4*F7wup7EYX@=Qo;HDD71!NU>
z2FEhQ!wp~c4Y8_=hEBo2b>P3}lY#$dlx27F|AmEm{hvaJ05ZV;?}<<UGS7nipROE5
zIRF0>`FxFtT^AOWWMvli`*>e5<4hAH{%#*Uh?h%6r3D2bVg`R??XeVN(S1R=)kme;
zwl%97s(kfT_4PKIyS#dZufBQ#$Rg>7WmK%88MEle!0<)oE}s%26rY7v1*WaQn%mV5
z&!O;h4yyrpR`h!=LyUg&9yOwzW+E>mC?cQ;kwAkGi%51_LX|Gza{>XH$VS<4*dyHt
zUKpK7w+=cD14c&*^LDt6Z1^1bg%%oO({`6VUh3rSSP(0W5NZvdK+@lGNuL6eVqlfa
zv8Z3eH|jvGgi+LpGr>=i-62iqivlWTt<#H{5fZ0#7%g8eBHM%;%SIV8ph>#XOUDED
z+wegffNu%~8H-{ZzGx`SrP&OPK{!7kSNsq7WH|p}<tBFR^v`_$7Ze%%Ka>^~51jvd
z;*<7hqh|_U0KNzgcq{pQIED^B=A=y`1Uw&5NH>KN1XcK1m0a_}Aw~6ajnnN8fu<!P
z0vAzpv>&!U)}jExb#mMeuD|9F1_?&^(Ta$x>gXs60fEt3i-QbAsgpXjPK>Jz%G=RB
zvy~r_sJ8OMAhR5j5p;PgC-otGw!1*d3Wu*J4@)8XvIHS2+|XFAoG5i-nlH_j)cYX8
z5rVHRXjC-s!<eE1z+9<-70|!y&^qAGhyI|iRCB90PzojJ{XxIc1=yd2K%YA?fYDgj
zbPQ^zF0cYI>=iFcd@>PNP>RE3n9&6_%!is!bhwpFfp|I+7;Q`8Y9DIrrKJ#_Q;M}F
zvGX?2G=QL^Sl5*_cjsCf*DVSTMAm6;EBQy)4c^5rJu74a!1_nK5SJ677&r|KhkNvG
zN`^qZ=ipo$n^=%IVn>L4@aC3la>?owUV~9Of8k@2NMW5|ktF)+h6dQxCG&Grr-9Gz
z{-ino)fmy>C~g-SfQ<KlZ?WP2?;X(p+an)Dh(Ot{#O=kN-HB#5oN@FXPp|E@h&1|H
zTzL>N5)YM76bMlzRr6Crr-PQe>bMca#@LZ{EZPeHx^ywsNw{#TG2#z9CF~Oq)B%Y*
zb>=9a*5aV((6WRuJd#VyWO<<$npY|0kQ0pefqDi6NvIsfei}Uv3Wa^)8MguUiC0K`
z;&}@_-dR#%A^5~ADbf4HvkF6tYvU4!XlscVnpiG1Hm<2yRj~qH{VQu$ENpJ3Ahcfy
z3P6^vte9U>Usd8&^GV-We)W8wk1GweB>agUN$y66qC)lJRVS3hFQh#Pj*pd?Bqsw7
z6)h^maQdp&Gyq1{!qrvtH7!QJNrm)-M=;hZy6ZF(xTs?P0C7N$zwS6%I<;tI?9dq}
z9vINmqI%+fY<ppYNVE7^1g#wG<QKjift7YJqXYv<VTq9j0Jz<ajh=ZhU$apgNkk+a
z7}Ti&6O+sn*&4to=?M?WOds7y_bPe+9BLV%YN&w>J0xf;4ELTrPYXaAp{ivPrB2_f
zs=E5>niWpTM%SXv!Nv_95B+Vjn+}UGAAJ2e>1uTd-~kOh=^$T_h`j-pR3eYcb{mcY
zr4kn6v>kgQ#a2wbO}O<xH!b{M{A4`;;dtCd1|Z}4Z`A)ODjbmi?~%{sNuHFF@U(=Y
z9xygR^W493c5;~3!y-~NzONz7Gj&-_PuzOMGO#sB*aKL0JP;P58lXhOB8B<6Lb;Ze
z2+B!+D6F_O?+uFX!2u(!hz1dBQAtm2(>I7>7aa7)hX@k}f$tN-Arz}DLW$&^SyoU~
zR#GTM{0ia{<S2N3CtN~*4>q)nHn$}fOQOTTAE!qX|1Fv;0a=DicpEygqn&meJKd{S
zR5#eLs9ZhqA+5RD0f!97#SRmmVCP3bDCSm@K~z;41TB^A$rw4Bunv-N9D=YIA71(w
z7@Ku>ti@$9Ka0^|;6bT&5MHcW2AGdQ{X#Sh^^2<(kdUr4xuJS_Rn5u<?C+g%u~J(&
z*5VH<ED}=`-}+<GWFi)p+GAaOE6^ZeIB;PXj!=L@ssjI(h~i+Xv{YCQy3;f!r15C2
z2`@@iEFexwQjX)ms?<Zih>CR}M1}_B2M}(SAYu`y(Ejk_oz=gS!WHXa;O)lFIrXh{
z46q9Q^+_xL?~cRr=@$neKf(V;VL{1&|BpTK$u$4$%dT*Mnf!kg6dL%y67P%w{%=ow
z`kR(xE{Z8UEB;o*(&6<(0zu$!G&UC#$5cfF{<wl;EK>1OA_j3@WERkehMrUPs7dJM
za4Z%l5)8O%D(rx5fq=t)7O5si<A&p?<n+2(K-%G<4GSp>1lhv1@H(&*39HSK7~D7{
z1-I}=ry?nf*dw|<^z3F`tVK>BxN13(QvBgiL<zL_n6RCal?@tWJwf$_u$?X)<0;u8
z3<TM+agqcPAv6*zalh)~Hxv{~-lDRig0g}cdRbL}uY%pdw^c(Z(g=<mNoUSDW&K;J
zs#8G+)!s_=r<sr{5Ys5Ilh;nWAjP7}<X~h--f(cBs9+3>t(ayj__4scLwe<ZL35rc
zd2bTRQT5<*hM>{gjB|DB<|GrIcqBB4G?|u-wHoXVSom+O97>?Ln2mGnG+rGV3aT8>
zs&P1Y0CI{)ug(n0{ieG2qyjo#I-3VWEo2<%Jws?1@pPku7Mdiyg!b=J(XP)uzC8Kr
z#0CR=IMj7ZLG2Dcg?4dW!N52PA$3Rt4}bqdpEUd*4g%C)ULbd#|1T*){|xZ|d*IXS
z{PPHWyH-c<{J*!T$XlY<|0)`=|J*Yl#y9e*#!O?8D!ued-dSbn|AnQ72TsZZwS}D2
z1rzbb#C|dTFygX{$o`yCOks*BVw#mb`h_5vCz#@}V;ud8F*wTimG=!!)!Vk=-r2aq
zHVJF(16?#xWt)b<^Q96Y{F25j*nn%-Sm96=Edd@}IB^p*7Hm<_6rwJwA|3t~B^FL4
zW$-Oy=c&vMAWI>F@lJmt1OsKOudJ)CZSbwASYCzQQrSHCA65^f%u6Wc3B~46{e$SN
z;&jm+HF`{#pVPUY5IopW=XIooy>)Kax}kS%qVE8SHLkVb(>gS$B6`x;n}KaP_;^FB
zc1bFXmhh|@Qb7qk)E5+B2NGBd!6hvK?L_)A9``Fr1IlG6(X~7l47G+3s|tvje+mg4
zRQSO`g_PGK=^a!+<3Ndx#LA3N1P1h#{y@9zswCoF((Y)?6@XMH4gl{;$TVP}Y{M8K
zII;(kYXhp<gugA~Cr#u?Y`Ns47Az3GdTdDaP`5FH1sRDQOx+7H^E(CciPXM<IM+xh
zK48`jZiEm@r(`4Wd5w9^<@Uxyrj|EPb4;CQW1cs(`icbBNinMCip=Z`XB(F_*~IFC
zBubmOxVpU?S#C4kp``cey(mUQVQ1PU?@VJy%0?-q#5$bxK8EU}<jSrVBEY$#RjO)V
zoNk#rXerF2Ga|?Q9?`1k7dB~F2NhZ)*fkSJF*uSXEVJolc=M5hI!7fsP?r&u8eWU$
zq&SuDVT`PAB$7GX3K4Y=(YF*?QYZ^8sd-Fu0W7aEF#H8FG8NH2+(Jrr&?3fRU}YuX
z2b)f@GS*2ghIu=KL1#+~rv+8w?E}fRa*K9Ul{-QG=1^1|HFnUcz@rh`!;C(`R!4cX
ziDcs=BE*QEGZV>kq^Eg$oLZ{q>?6rbOY`*TwN%g98_jd*Xr3MwrFsGmRHRp$$L5kS
zD{k<KCd`UC?O^MUd74Zmndv%r+JkmUo<b%TZF+p(In|?0TzYCVh!%~pKEb^Lqr0f)
zMoLv1n{6Tl-<4LuTLLM@H$SHnOusi*>-3YrYhCG@7v`|N;=lwxJqqshfE3}l1e&5c
zI?B}#JdiGjK9SU5wm(58)PJW3-sl9GUgN6`drXQ%Vo~3EMKo(@Y(!{19u`@dMCAs#
za+ql9kz7zY2xz3hu!ZDAG$JS4V?ogShtmsjQ-oRf1?84hn-5^1b-=>SCLLGp?o>E?
zQtnPVq{HYUvFlNg^909cx7+IK7nDgh(8z~EC})!qD=2mOVl5zqwo|-fb!e^XK*(#f
z+ihcp@3<=!voS+}7!Hggx1t<uLMj3fjDAfGDQjD<bVtI4?lsGo!G^XuaG6aABSfRN
z%d~m{OBytxKq98ZT9Z0VDymq(Az(;_!!+N@{)AfXlPaXCQ}LRIr*wn}@ep;C!cRhL
zKNSt413Zf8CK=NTu!lp9(Sq7Z)i4#4DhQxv_$s+#Dm9@&=W$e~29mfxZrXaf$nZd#
z%u_Jt<03#GS?TC>b4p~h9>(SYov__bDT*-yduNB^v0%0olICDgcUX?LCEHzIlr(+1
z1ABVQB@Qy-?{s_$6Y5kBD~Ft%cAOGwCN0&2C!#?N3!?*vlHCDnC=J-60T%#EBa_ue
z^01>0yKPYwc!R@Tf}PGYqu?i`2ZYXY03FBJ)Kn0I9>%yNd$$`y)&nF=U@`3+9oX5%
zxk<<Y8Lg`z-Xc(3iN_Ex+W?z|fa5=Sr(&V^Z2lVzHYr9XzSkmfqsAsGlJ)|M3HxU;
z04b>!s!LNy;qacOD1l|Ov0l(EU4@;y;1&Z)S_+7+!~kKcG*jJdS3x(CVFjNtcGwss
zRU8(+z+iT%?^LJ`eai&g<qsvXBRsmKsi|l;UDD0XdVAvbSeHs_MW4}d6zJ(Nb75mb
zu47S9+yYmk0*5E^qayz*!f@KIX9F0m?@IXNad4}S_EMgrqs!gCJcX@61RIE@5Tgx4
zKU-=6zwFY=x@E$MksXW<zC6t3;lF^wjf!AhIK{y>KR6839%=e-n3)#%5|;}%*+2x~
zH=RUq6v>kCV${@aPBMNfz1THkp+9tf21<dN@ZUiuV9m84Hq93`BNmPRogfqHn84C8
zqYXNUOawtnv&=P%+w7ae0rvt%P;?XllND2vpeHXTKn@Y*dd1i7S9~q99Q6U#DC5wy
zUVwe;{hfZo4hp^+)-yQ^_a19RXKEw5UU3?jP;A&|(i$ySjCOBp)aetvr3zdymD-rs
zC5%Lr3m+M6)Or+MuQ&`&b791FgP<R4O|~8ZHZ8C-3jcEp)BhiS(!Bq4$t^*DXFojv
z{)G3x(vpGrUwh=!`~0K-7KXxdZ6X%mg%}W-^#4rkKOuYI{cjI^`d1}I@c)EX(1MCp
zpt^?G;ADtt*kLVuU@L%P@1#E{JxqVLTs1xjxAwv1Qyg|guWm6g1UywzNR3+zsH+pP
zTv4oHpC9Q6h7yu1j;#sv^=t{w^~EJSb?ry8yZqq}DlmuRJ8pc5Au+XVjfZ%er?aOQ
zS_=N5;jH2))t^jadyrPd)}ybXmK5k>+5yU;ibgRMk6wddNwYZ^li(q60Ci)@6j*BV
z$YL6aAhZ2&>b=vW`-UWU!vl=e10EhwQy7L&3~}(RKGV=veAMu`mmvlMR^SToJ;?`<
z8Zcu22Z>lLxgeBqV=G9*%VV2NA8n{MpZPd3my6;!p(*Kg5Cr2Fi98;VX+({MnS?6v
z;9}hL*-RI617MvJ4{qibMpvglM_|pyjPq)03Anie=M~lSTAC4M%L@`U_vTh`a>8Oi
z8HbpyI<*)bwbnGlLa?IE0xUF+871+cQDxNGl|$_Z0yJ&5V%}^Tt3quC2{}OrGNx#q
zWn}1yK8^$5xW>Yo;WC8G%2*lN)?F?5!39PEn^#G8))Qe^v?CGmcaWnTMghFJ;=KT0
zuu28~!Xwa-->elJfG5CHqr0}QrncT=6S}H}5++9L+lPQTIdvTH1@<$2`o#a$$?=#H
z0^;?Pn7|DBUxi+;-u|NyOhN|uzdi8jUoOhX|6zVF!Pn1!Fw1A~{}~BIWFdKH!hb2T
zR3aev${!LCU_%(J$|3TX-OOkh5YYiKqEbaII1i5RIz*ebUf0yqh6+;5O0kOU0J;*S
zsG5T;7*aY+7%Ln_QDCjouu!bDdJuDNQ&f)NQ3{+sXS@|Z4~dE*yk)jS?CxnE2e7`b
zDWLbKWlGDn{1`F%6&NebBDg4D<>7pl;6Fsd2QokD&HdM*BI+!oF>z{fz)xY+*jJ~@
zki$Q?5bi4aYt7x{6zAC>Pb1Sso(zAs83R_Bu`;|@h-0xiRL&&rr9;50(FWZ4DgTe0
zluEGTW-4SqZCYr*gd3PTW`Ydb7Y=pG>=uf6I;)z{XhWo#Gzc{W>)9|32huXASS1jB
z(*ALh*5XY@o>6FP^wpxq#>4&|U}Mc|CCz7!k=gy$k2qw*6&F`&cF(1yp_Eo84H@R`
zBGc6CKwx)%h!!rclUr4(vjI^m4zhDOh&s~IE563YISa}FN{%KIJ#($}ml8mGXD<37
zcL%~L1!4Eho#PSn7$j&R03f~rs6aT`%6@5)r>P1tHwih|5B0FO6~nNgaf1Mf5mA@6
z-&P#K8o=v0&AMYd6dG+_Ioz*BjD~|k8!gd>1|-0@vuCc2`{QH)HbF39G8|OJGJS(|
z%dV2ZH(+%u(#!N%$?M$C;H?jBG`TdgVKZsKP7fGXxAml=p>CH7ME9pk<+0x~J)IYK
zdY;?fc!;}sngi&3E(0h3QVm#IqsYp^Fe_3c25Y8p8N15HBu!U=yVdtn1yfLAvL+Z0
zQ(z{kGO2a}j>_Z6B#$!6T7=^^(P9&XQfl03u3tyRPSiOJ>|m=H#tEkgLYJA|StQyj
zxPQTU>BUVrUywJc0Y_Lpf{<dT1yOv!{K24Rz*_nsRuM+XKb^=>TFVq!?m)x_RYT-T
zRHD+-n>2;Df;l$lm4gyE@vx&8AQ_n^RYjYWFsPF--B+o&uvj92C20&V;Z&nF_Oh_5
z!RamH6y&(TYP3Pc8h3kqo2BDM*l!+}2XQCCP=aNX3i)jUcN5o%w@U%vD{Xko3X1Xi
zFlUrjQLdjVnyQ$*=`k@qhdxmzqf}L0AI1v+*0eA(hwL(to2zQZ8-%sJpftHxXix$F
zgAZ4YWSFld7S7aACoYplLTt8cg&EY|_{geg?RHY%i5M|6OHkX%zOaAIr<73zep(vr
zjRGkUd}Bb(6@+bQ{gr{OLEw-bj6`LgdGle_Amc;3QzOfIK!vtsv`mNSCryDvFUU99
zO{@uceQ;?%(I{z?qneAg8O4=)Kc;H2U5rkIpt`~|EyI{*;iOlL_c`&LKg2T)-Ra0F
zuc@fD+wDeWduyQj=%W^<sx2zd)ElouUkmil8>}p9w{XE~WN;+FHV4vj20WQ<gkA<&
z(YHW-sn8hh872Jnbj4&6@%Kr<k7!W_3BLB)`*Vvk2R=Lb$teG);hT1!|EHqD!UBW-
zM{(&u{Et2I>0gn$QT{JP|NKvp`>SIA?zlS~i=>nBGd=Jy7Sgkf-lP5!QmJ5fRq-Bh
zu!DVWlc4X+A(cOh-$BCYS_R1vdp_Y0g)vAwx_BsYe?Zo2fgltSbZ|I~s^@K(CDHzX
z(=$(*2I}HA2i6&%Hii6915hNuD`XPdx~yioOG);C|4YVJp<X5YJ)oVkX8AJEVvpz>
z1fU8wM@2)S-hEQkq@D&!!K|AQE5&cBO^Qkx)Ijp{6smll?<7K3N%A+smu9`9saDSv
zBeO|1wWla0o?<=49U=<iSP=<Y2T5S-L^`U8b}HrOc9-eO;rOPp)-sBikBJjJWhzn}
z^#d%P=oPOG9s5!J=%IC&jCDuCk{z*hF)Do`hIHMgc6jWj2YTqN`!TrYqCZ%11l1{u
z>=i0JMLh_{P@_Ug2|E}?i%*?pWgf1#8?)0A3$aXP-57&}&0@v5CcvtA9#ue`h9(Gd
zDu1Gw1)R`y+Z>Fq+YP~z8DeaLI~PkU@S+jdOE=@eg#l{}HPbPp{4c=_ytay&Af#7}
z-mCTyP$5bVj)lw2c4>#4#DyK$$>Y)VE3hKOO%IENE)c_=W`hs69ev?jMcGJg?^PRq
zT9u0l@6`B1IMN%whHT_-EK#cU4>$;cDx)?BhyrX>d(Q#2Hv|^c)lgQvF)-GZkV@hv
z0AlrGm47~7#237RrR$h_p)J`4j^ABMD47z+2$Mq)&Z~nZ`CF4RR(%RU9Jy$le)Q1D
z`JxKmDZx-6sR~cJjn>n>?IH%)EzzY5*zi3*kW>|4Na!I2uVpYc5&9Iv%?EIB@C$~U
zDv=}BOybHV`-CiC*oAVdAB<o*J}bYc(kPIqxu~mAMZHYomNnY26qjvMUZ9z;e}o+p
zf+}u>->c!CB}Ek<n3d@6S{##;R$RufTX=*?A#GboV(;xy2?G`O!?cIMI65fjE3h=I
z+Q#V{hW99a(sN*AU)&tL0a-IRS>f_4qx1~Uz%m=u09_(Gp97JTl2(O^lf?y?8EvDh
zOj9w;1+AFjQ!^NO5r+WZ#DQd>)e~qBVWZ9<%nvLb)O%=!3B6-$9%b`YuaT2>^Ua4i
zhJ-&EBerIUlfeEpfv<ot3%E)g{mL)WCsYhr4e+apk0+QE>`KPuoT|hq=Jz!C+g9M9
z?PwoTaQ#-aYFu0BNDb5J%N1YpwW95Ab_V#Ia#)U-9t3oU+X2Ab+8jYZCY~OcIsT)(
zoHbk!*BE3l7_lg&>8sA9*k{@u3H!vzG*e*RCo|`PeVr=UznDl7nXcK)RZ*P(!*hpa
zV`_3gPo)gOOo(4tvd<8sK_(A2Ilv)?5OE5ak%X~9+Zl5BBw*1a+hUR(@?fmMk0T!M
zbi0uZcfZb`I(<^6`IC$jsF|zu4?_Ur<bY;VlKCA-yk>zjUT{|rygTz)qn!hj5u|Xv
z4Iz8FHC}6U_<*y-r;FKzh8-kySPA(z8CR9J#UPZq?e&IZG8P0#ipY@`#7^N+pnlef
z>Ivprp}(>ml!Mw^4r+fHfyO^N%A^jt$6$!yM{FX%P!V9#32%JK#tvWy@IRD^VvR;g
z>V_fhA*&wZUxcElJBXfviyR5eS^WVB8b!Jk4+9fJv_4QzP+{r?+8&P~9<e2ic{3ab
zOy$oKax1!oL<6$EZ-}$WRlx-Q4QHZ^vRqDEVhBwzMR2g81vZcZV0I;>dba@{7dKWI
zSp)MA_z204ssWkxUXCau)>!75H@R8$b)?aLGLx9oa)?#RTkWvtbxn8J)E8oS7bu_`
zyMsh6rE4$BqLt<XOmw=J?(a_6)u7v?H`Op&X_R40^bWMpTe}T!610A~3$u5&a0K1X
z03Sq&#;MIrdn!`}7@Ae0)v&<YJer%Ex*OoSjyY5+eL)K&hUG1O$#gB~W2h^*upRS`
znrA2`+(<K?T0%es7lv0|!fxj&<sjdHH(fM}oxO`S2qsmop%=#lgXF;g5eK^M)u#ja
z*69zERY!m5_-C-w!jEC)hJCJLwDH&I!h!;+W+}TWFqGwLT((^ONbnj=hGR~i;+YG>
zz~5W&<(?W8rNx7nrx~)jdCD9Q`Ug-FPQfr1`nvG>BR)v(?1&T>6iX{&$%U~L(IVK@
z?(<b`KG9&sub*s4<Es@Mm?^??#Rb&$%HhpcEiUVnC_X$k1VD-LY=?S<p_tjRMzRTB
zjTs!kHNxL!b=fFsmW$dmtR=_F&xHU)eF0{Gq>aq3DkS!vKkuePrn8#rtx}J+)^w1@
zsb5e={4wAq%YVRPz@wk3vmV3HXzk&2izn#s^Z`6oo~14ZokT<5*TM{PTJSTYLVdR5
zxLf6#%|An0o(d;Ju6hj6lxT|Dta{g$RF>7i)Z6lbOY<PgHya=KikvLBrIM|#nYMh+
zXHg9gQ7q=hX*xX>$WO>&jiw59fk7|M8j%|o&gWtoDLPo76o>`LGqZroAwuD50gUR*
zh<SlnBnCB=p>tYg-mpweqA(CbU3Jk$9!WRgmgAAusnnx3M8E|V*9B&d+|;6429<cO
zloJUb&>hhmrO39bP8>l2*s#f|ToWy$dC&nGn4{e0br;z9dC4Y8nnxB`dL#?VBCsf^
ze-U!TEhxu&i8fMJRqZ9mFKri7?0^AempxpJEma#OHr(1F6cvWXpx=b|wJ=@$Ro$j4
zYBMuDf!bsGL|vTnHo934n29E|hd3T)-+ala?jA>00%`?iszgY!Z#r!hpLzo55HbX+
zMvB^OVjJ13?gG78!-`@hurQl!c8x9)M@TbOe8NW2*nMhrfT(D@9i0<Y2V2AbvQaf4
z;Oq;V2&alf<X^b*5cfWqZfvoFxpsWT!A++vq8s4;?upH&6;H5JP%{hqw(6#WHdQ2C
zst(vsZFV2qt<hl0Fbn8*ZnDVt$Ry}@N9OIZlMC=aYwq;j-Ko91GhNp!un9LlEzyKK
zWhiVl;VkKSVa5qD=T#DA-T57i;U&J1cLHO3LT;s;75)lX^-5`Wf>py;bEE=W-OI`6
zQQJ-qIyxe~mJkk0TnHEpategC+%ztQ#e(!e3p2e~t)pi8jo%-^Epu;7V4OI;{LkY8
ze=3u=(;S+PLHo(<*?$akX2M`G{)NjfwX9AC?hEDgq~gRCGvUDkk)V&ru<<t|ufmxh
zLJXrpO}_9Jp<+@QBK5f+lS1bG4rqx$Txqd1%u+PSX(~jZVy$G|LQ76m*JZRat%nFv
zWXvmP+Rwa&2GIy1ljL+Xw1HR!>{K(*5cIK5dNLCUqZ-0XcT%L2Z3y%f%F;T2f-ob~
z+2!c{k!>faym;;C_2}sB?xH2&yXB0@c*N|)3A1xY%PyQ0B%HC*hjT)u`e=!hU>06y
zp-o@8V4u}ny=dez)Vb5dTXWUlMH-&rnCs1K&b;U{)nG5ZAsW1}6p-4>z{#eM;jvTd
zOf0iPy;+qJ+Q=~kiRl!z*b?Q>z48w!v)OTEKEZeXtj)z2e*$W-Y}Z5MX%(bLs!mk`
zY?4*&4U=gu$#hf`wJgCBrFZQuhcq1?U#NkdveBALVnAxK&6NtsjNoXA+MMEoS*1jE
zsRe6`;osPxko?xd6B3%%I?hbh3!%YeSl>bIZx?AjT^lAVuMZ0*(h-P-_tcWXYe2uP
z(=xI!^UJZ5eGuSF72$BKOAb<Y)`WOz!k!4mtHD@QW|n{21*@_8H)|~v?L$io3%pV#
z#>kq--@|(8U6HgfmS_nDgL0IWqBFVkRGAq&_JJ_>^Mq!g)r?e&x>qY|8mh{O?isq!
zf<t|(wn1dNu2yuxN>a(9o@P>kqOCgG3QlHwZ2YZWYvO5U25L0!{0a9c{mL_QG@hH=
z$IAhM4VnmOgG@k6_&fx|`3x!^KuMg%p<mS;;qik1pqM;*RFI<OOw1T1X5XrdE<}hM
z<C4{7XfR51V13Ajngun&I!`<F@Mb4bGD!xWI7Bzw(Z-41nVoB_$=Ds{_~a*VYV6zk
zr|oRaIP^lFd%t?`+{HUhd!QL`RRR|wST<1(-q*p&+`{S=AW{;aubd>OwxXeOv5<ue
zqP&{ghU%IX^)!bvu_%2}RRc{!O9pVPWWNzhgMKexT3NG<rr<LRr7fshR@G2N6Ukhm
z)MYi5OKBR6ozuEWXNkvyikb4uI#n%|^8lq3I#NIgVL&46p-KqT#viOqlo15JM3fsL
zASOA=RY#nf=+Lfc#=lW$0DZF+OK4pRXtH`gAheH^Ker9k|MDk|{U7_@FLms^|L@X*
z;(_?Td*qX0{)sdGU9<ts;QtZ+r?da`78MWJf9{b_|C&|`_MerDs+Xnwg8ipz0;=e2
zK=E62MKqW|rD%v@Q?t-w7epnNmf|G~p2ewtyp;tpHmp`0%(&1?q8S&=^b{6Kg@t7W
z-m;>Z`e?@eI}lcCJf=uIh7dEnSECX$??jqrW4)9>hrdmBE3)hlhaG~WO1J@tt}2PI
z@_ubP8P4iRoY^DPSJYPTjw(cpus|%4z?NV%s1W#h!2UY0(mbrA5_bWNUy0jm(1)XC
z>`{jmB3$bAYJID!>go|I=#*>}5mT;}=!fZigCVcY?PeiX5kj}y)@;LYm?hU2Ag#0;
z$~ZxP-$4s%HL-A*AsnO#tqgS0V96L0@uDLWYc!QLj1qjTT4-jpnecJ6cqr(jTCU|%
zK3i{%wtQ5sx!KKQHQBwWb&ZW+r<8AN&Nl|Yk&`}uJS2GOfXOFZcy1kgoP}p2Cr%*t
zk@WW_eC1wDxK3*>lytK)>^6dp2Q&`J9Qd9CaS?-T2-VI&JKch`)I`o|(!G2^^IqGE
zgiQRv>{1h!#fY1^ov)q-Efp(o2esb}_1mC+kmmVV)KimMo!X`p;zS2piL?gX986U4
z02(HUc)T)<i_U<<ZmX|avB0;WqM^c;wwp4<kP64zbl4<gH}gX=biqYkN)V4*W*u{g
z;|Y{03Zm!Qn)(Kb*u>Jx@mhqCVCb@uG}yaF9jdg*(5Jep%Bt#BRiJ8asHjbj$_Z?N
zO9U?no32W2kn^;)Qd&_6_aW^dPypDhl40UE!0CXHD~%>&(~O&}svA&Dm||n{K)0{3
zulqzD;XDTUm9Mg9Il5n$cvX7ob4trrR`^irVtlk|x?<ywcE|w+S5zCJ%Jj$r@c>G7
zAv$iea+>OMYKrt3G47*KIMBD!0a{#b6N%Jqvyy<_ApXYRtleq?`Kp$|XSU56@rR;5
zSWy^AG+ENvkkO!40Bxt1WY*?pQvyuqo8F)Wk8wDfHd_vqDA!ljp$YWW*DP#UT~SxX
zjKT4egh;1d{sf3B7~G1A<qSrUB($S}0-!||4OOcv*7~YfG*s0stf&M~8{*?Y;$#!B
z)YjEB)DS5Nmq=;yYw8+|wSZ4ld~8%5yt1mk!MD7sVR6j@3de*TC?A#<YQn-AEV|+;
z4RsYO>X)GwVmXlNc}>DTwnY6VXh>yUb!|hM?lK_MjJmbH`i8pd6^o2eXmcleNPCyp
zG*tN(1I59L2ts1Tf(3PYi(=dqf0xpc1fgVHmJ{R&9Nch}<pr4^4!}~e5<0fFw#tBb
zB^pXKv9bou$chFAYX0g(+=z<c%c@o^qT95$XDV`bV^xjbgh-f_sq3#1PrVO~y_p-5
z6b^og2%r;!45B|in*+|v&h)D38ZKCr9~qq{rt=wXwj3O~w*tm=_x`>s@zC{3Bj@cv
z(g~e73<i`8D=tHX!_uZ)t2MXR9n5W_e3%V{a=_5LQ3|kJJfn=0E|pz$N}6^EW*&){
z51k84U&ARuR2Y<CRegEta-?#}q$)-wIYk4$R&(IkfS+LX(Ps|ugogI1$`*((9_j<L
zotB{bFtijqc-8po6gi_~n%7E>0}eaYqi8Hn?d-#{AA4FQVtPd!Pwc{z$eq(oDrgu{
zBeH(K>eLBW9mBo2e`_-rKnrWI7s0d2A@yM^4hV1mD?XXzf3aw5sBKrAzgaTI|MQj<
z=;OZ>6ci4`|Jx&<{-!^I1dyzqR03a`a3B~r5!UTKNuVGK<O`R`0E?&$aF(ZVrsSPb
zR!~&tEtb}|k!p8?2vCeKqv1JhCK;W;f-6h{Xv{|pY5GhY=_P$O41D@rt?bciwQBhz
zlHp5mQIBbh;VQzs6d78K?<tLlEfcfFHcNIJyfb)knmZgPym2E*)RfZ7cQq&6nu=8w
zi0k#OuA0w^hazp-;=)L13V@$p1dQw51h2T-F+j@@f)PSH!J*#Ff|&(~p=GNatu1tw
z{JFRBPyS?}|4fx+mrj5T^uM4~|Nd84P*hYjK>zo|r+-PF`2It0nN{HC1D24|f0Tbl
zFK<BNiY25Uip}s8cs<@ip!_8Ti1_d3*B?eeSYwE|Mv|1yHc;ENb-UU&hT=A-b<@v1
z{~7kbKr(k*{O8h=q7wc4Z$Z&O{J%Z&>EDGf?0<+Gxo2O0b!(Mu{sOxD3q9T<$vdm8
zsGzK*WOwd<Cf5qLvbSILrB?JPZ0d73Qw%~qU9qX8Mh$UOZW8u}JUyF{C1V<Wre<zX
zL1@7cNv(-k1gF4YgIqITA%S;5{nX$u3YCHaSTv`NUY$11k7<Y>a0-Wk%|&^J=spHF
zL0~;*@b3!U;7);ds$;Cwp6Hx9FMaJC#60#Vk|C^UO;rydz>UKDCnaM5NL*7>7hCXy
zg3Cb(8%yAwNuTK%d^E+pi?#HC?3EXB)2drjVWD2`K?^m~;B+oYY9aC^HS!xt)kv)y
zZPa>0)da^tW+9_<xqn@!?35C|3ivZ$KNYw<xXsE7PIKfb(_H93{GCn-@%gE0_WCLi
zhGdL(-;RD`c^O75CeMdtA{vD<Ot8sA41w_>ZWY#W#!&M$-GJZIC9mYd<*8Mi8d;r#
zYl0RzG5CB3gBQH83af-I5Rl3$M4y*0dmJGNuZ>nb)iJst=$k+F)C>B$90B$(3O$E~
z-~_TkgtBB`1!0Y}QqOM;3OuKoECs-a>$bO2K_e@`7X^(QMSgU($M8!l_RdNnd4LYN
z74E6}WLzEsa-lqkWJP1400x4MSlI|r5eRh?2}P-G6r?&ab_ZK##F~c`N4>{2b88-b
z_$-b@un$nfXtCKR^Ji!nwumJi!~eM0Vh+nuG1^w&+RwG=d$9o{+9lw^*N;%Jb6huX
znhUimC2sL6G7bJsjj`zS9*&i>sH(w6DT_8^aaF|vy}NU>*P8TZTJ-ss)-TccJ6a2r
zjFx+*r<Qq{Ds~J*xpapDJaA`-rJ6pD>P|gcaZ7IOW0iQHR$X*D=#tMItk3XTYW{{w
zU)y>&R46L&O3P!N=t!xR6A^zDjLLdM(<*bl8mOZs1@1EK+L|3ki!7$qV``aY%{A2@
z5{xZ{P<>+bI36`l6HZSbO>gJsC)cnc%Grj{IOD^IlP`=J2$N$HBjF%@vM?%@YAH*g
zvp~r>JiH=KHQ+(fK(IL&v`-V<Pqk$+SkakS5^7H^ZXcq)Yncl3IK|-}hFOZ<$uK7l
zoJ_b`ifH=U>+@J9viJY#Z7jq6pDgHId;ZCA|1T`?7U}i>XOzw;7`XrMiBErCeKq%g
zAU=Ec{?FGczWEmwlNTRvp{HP$R8Uk_R9NPniP#whUH;`Lcp%;_qQ8uHe3y$StBPkX
z7tu5mbkAHaqxP9mcbq&andpqutEg5LjF4V!9_VGU5aDPj$&^vGY#hfM7<uvTg!sV{
zbf};!0!_uHx>lwJ6rq-T+TXDRPXHuhc=TjKiHAc;tUJW{{jOLd$h?;l<)kh#{5L@g
zCEz|?&*Oe;y<%V_PN~aquHX!n$6fA^qOpS;4SuzZ$~2l!#NX3`uE-E4Nw`ewy-O<{
zNvTW<gs~%QGSfo$RD7tp9l(5}3HGC-T25AhqAY*G!fLa0!(d(wG{_JXF<nGco(#lY
z;Cd$P??DruOr+GPgi4|lEdlV&ipHHNo<T#X;+bl8y@9F?68$s+46kLVJp4ddz$lgA
zVfuQwxdfWDocLphz7WkZRa1v4^U)GCOTPkjYf`;Q!9~dzA%^%^FGsYvCRV^0g!2mk
zW3`Gwi!q}Jd?E|AgV_v;c)9WM>nzJ87gpUPr+Vb$YY9RQNNtqu(ITO&0cD%1zEW#A
zrL=1d!GZhfkmb0~4>2G)%hrOr)1kM96xNQoBqV!8X#@2ur$m+!Gq|OcfB=JsOC20p
zMj-QG3}FFv7le604TRnW_X1F!lJc-gI)--kEi^m!c9RxuW21G>V(;9ly1JUWIUe-Q
zIwy`T$m4UZ#PO}5P>6eD!&Tenv?M%pq0K@RGc3vzA~OkcED0E4{cc5hWgI{au|Wk@
z)E7S5TOhWGbrAbnh_opY_Z)05V+J=!gds^4HDm0_X(W-wtjR=cvkV^(s<6%O2LT<L
z%$6QPb}=b&Xo^t_e~Op>lI$rZg~)x6l+Sqme1{lJRJWfPA%IZP3^R<8YT|AZ3`&rc
z2t~|AZw7m1+GF(xYdN~&Md8fCi-XdC0lmYaL8cxjRIyadLuW%ix<lm)MfmZ{e*usu
zUpN9_j{CHTsL@3$*a{eEf11^#T@#dE(Etl@oN917A(R;L4mOtrdDTs!mfq1hWQk%_
zig-fqBrfq8N%e{(H0<nknqijhSiKfYvxqZyhj71Cm59q(^{Vx^RqOblM0Qf+*6QW2
zVI1D6@sKj9c{<2n%Rv6>rm+jC^Ghb<ign4<lNX-Gd`4KsSTN9a;`@?|X;@4u;-`~j
zb4O^bQ7i*w8BQD^j?94Sm`sZgbeI_c8*UIc;!$VntvrKO$8oTnX0f4aBC0-YI1l(@
zFdS~oXLc)H@OttMw4%)8$y0C~1z`fQ%0G_qYjf(iiOt4s4OFoU70J->Z>&Z(8z!3m
z=KB8<cIC7Ie<#I2$deRmNGJ3m&{T>?VN+2VG4pX*4^CYpaQ04NuRSaT8$ZI?Dpnm~
z5D5L2qcj8aP78?UcHhoHY>a@}9V6p|xhL%mgOL|%95?jBas_I^rEYQV@L3f}wv(3;
zJIjX63l0NC&m>IB)6Nv}$zmk|eP}_mpiFw#e;ANjm8rrV4fexSs7*R~GI=}DJT9<V
zFwj<|O#cEwLn^5dZa6skbd|v=4V2x<cNg%S{xHzd9(>3;NjOYI=h`9EAV;H0&V)*t
z;yh5B5b6zSJmH>rQMGb&`i^f((0`Lx4`H_PVpE6+%dYR4&Wb?{=gyVmVzCYqYL7&x
z(<Z}x16Rht>{_{`L3*f50K%a2Hc3T@v@AJK2*0N->!8LZ!eJm9nJ79V6DGkU;m!^6
zJCqE~)5b=@u;@fV|97Zv(6o&*2`@uATbt&j5~8r^FxVKwY&EXDa=h$j>)zOy#FGf9
z!#JKU;qJ)I5d$$4*c%mDYv@!~NPHswj*w=XY>C`l{D4!Y)(1Z`ExRD~3I}@qIGQKt
z^KcHDGGaz4#&i*vpXilKI~Wu=-2zwFE@>wXXNrBcxdZK~Xa{17HDc{v=Wz|4L-9!r
zcgW!|ML;@hmcu8QzqqC?oaTr&y=L+YEW3Sk>me8<@#ai^K(e~7Ophc05iEksbti|D
zjlPOTKN%c^+RAE{1-aO3UMo1`E*kxb#|xV{vJ<F$U$k1bH6;8|rBzO-?`CMf(qcC4
zX`&*-m#;K_DfvD_#|>sA_y(Zw*L<%@gbO6G!ypa|umsxIjxr6^HevK76HcG($vzxY
ztYK;PsP4|7krv=XjWr!gKpsL5YAZaPu6i}K8g{ygxPomqHe7rQ_O_q#$wb%%p|Bwg
zAVWdtP`yFu9)YwZT*N4F-<&}))ToP(o%tn8qz~q`kxfm5CTAFno%Z#Xv3&(P%?%wv
zMD!Q|*u@jm#Ct3@-nMFQYuMzIt`4XPwRI_4Laqu}Ua;|uOd`Q7l+hHi8rCS=^uiX_
z<Z>mY++NmR?@NoT(qI?)ouZ3;O_3l(@YCoubUJi;G`f7<Vh~qBZ*P?52bS?rDd5sG
zhuM(<M#7lTu;W4yw&?AV&804sN>eNvWg<0MqZ&oi%4xJl4pdHan9LphikOJqO--dG
z8@kR<ZH6m6VdTIiUAg9s03Op55fZG>Q4W9bVcTK2&tYwrPD64hz4>>5U^W^Gi-d_Z
z9LJ*6=H&`GaP7&}U3^%sc|2O(<%a=Nw;g;%X(~BP1ly!1FPeu4I^5b7VWvOO3%Q|z
z=Oi3?u5UpYY&Zx*domI>c;_~e)lOPaQ;AK_7dI?lCe^N-zpT1avbj8->Z*o?9?yb?
z1th1?UEuLlt+36t&Vk=^=YU2J`q5C`u&ipXrkQg*B+)v@gMsGEuUW8mE*1+5Fd!Ok
z(C8(utXqbdcB#v+5IqclBO!Rf$1A>GyXVvbT8t2(fQAr9qk^!(G26&Y=!U<f@5A4V
z_uxG?wq|YExk0Ao^N5lj=phj-*aZ_E_dbubMhM)uVdu_y=#|8vb)``d>fNtvQ9+?$
zJD6$=>6^eTy|7CR@&qPnr8b<Or_vmWc>}l8N8XlDG$@pZONj9mR{sPhzQs1e-)4TK
zl1DehND~k{1$7E6pTl^h_%JFvsGm`iuRili67d)+`S?ZLE;azuZ%|tkiJu*330?>~
z9Dp1<OJK(h1|e<vx%C<bK7IRS(EkzbG=H)hP$v8DVsEM5{->~TK>ufteEL`WMbQ7j
zE2mEiK&IM0y(#+W7o}?E_j9THaLTK-YgTmwaXO8;MqTzn%1ZIsMs**=UrlYE#zQ>K
z*kzE2!B}=DpL`esCd<^yY4|~_0ql?C))+p*%o(^r*Hb&H;z;yGU9&H9La${%_io(t
zpA7ULl;L+({WFvQ-@@V<g?jzZ67<gi{oezh{w0S3{a;?ayb52j`_b;Zw?l!gRD2ke
zsy5$VZ1e3cD=65_Hs7crRo%&iKLGbsY*$qg_Xpa+kPx?xjfK<zH>g$?2q+N?qx)<-
zBHq<#*b-4WDMb*y^pml}&zFipq74i@)>{d6GP5mitY}vpZb_<_vC+N8yRM4YC?7{n
z3Ppf__hThS$nB9jqOmTi9sP&E2?3?}2x+HQgUquF={{|Dz>hA{A(WkvT4Z>gK!bvQ
z;D^MP9xA;?FcrZdj*CT32-F?in5fhfOC_ii7hHkjhIkiJB$kjxU!0P^C6+QDIwuz4
zGpAtwpj5Z85=65lPWW4j|IWaFXFBmJEG(EY1C1Qqg-!4gB{8@kCVF7B(1gvQhiz9^
zmpkN-`rWZan+IJ6Lv2y)I@yCuW5;}oXRh1aRu|j?$k-`>KOPT<$jR&R!;a{3!PP5i
zb0QFb5-lh_5K5cg9SLKA_6^<o{D?o`LbuU&xx2Uk!vx|<GZ^fXGmwlYVi*bx$0A`P
zAf)o@g0X-BLIJf}oQrDJ=f=>!NV?GI$^HnzfaQ(7!-U)YnPE1zXM~Zv<%}?aFq*oI
zP)aOw$HIoeGwFO=MwnR8*!iHJWVIQKx3%G{c(7HUg_6h`3K??1iBBLAijzeq#|;CZ
zgUASwFjkL}__9$VhBlxio@W?1p4pc08`i&)Xj5orw{gKjF0VHdGBm3*8blkBj7)dR
zP#kB+Hip7szZ+$9Ox<C_5MWTnC3gp80uwjxGYS(2UAA~E6s4nO=o7#tqAs)u!kBts
zu&x%9{sCl{Kkmkv1S}FZY)TG=@)(fP8x)yK0^4a;Z7dX!y9G+n5{QQko1)u=lL?kU
z(3l+nHO~$*T5Semf%4mB1r1kQloBqpDtHY6#Xtg3uF_7nS|DM}WM+>9B9sxLJ0nD=
zVPPYP&JbDIal<fnyIND|b|RxJKW%6mFro%9NF@Z`xU;%l?R0B*gDl^W4T<W)Z8t1R
zEx>xi!tQphM<<rByOoZ(5vC*NkJ4O|i57B=^^3WNtsvxv{Ylwyymh;9GU=R2?^(Z<
zv{}KVvB8nB3nk<1s9~RUyAV?lpkp2|n-C%2Y*EswMpp@wsfJXN-DQGVX^#auy8NB8
ztCcSq)HmaxqBND>hD-)sNv2v`Lv%(vi_JF|&EP-@lffYA7{qk#vZb30n5=)4NHWc4
zmdz{r7q~rB0Lb7#86Zru6R}n@Pf4?u^IZ7STYkiELcMUdD?(Rq#K3%T2$=ww>^urU
z4mfg2HNfCxGDBw5)8!8-F5(Rr18oc$b}#Wlg;;|W&PfGBF;9zM36V)vqCvCdNJvOV
zKSC@uWRl!L8?FP6xA}$SxZFmQ3r$mtOj7;yNXMz&F7%UeIjw0k0;U;}qLi2pHGria
zo_)%7(5yH)nek7W-)lD7u3|p=NqMvuNJeK|1WiO3N(NiVhVI#@%RwpRn2q4c3q|~G
zvIqSjB&aQ-CZZqY93cZk65A+;6Ox5Q^n*}*)KfKeJsa8ear0E!BsCrtVB^s?N-u;&
z^g|^_)c=_=CrM|G<RsbDBtvGY!S$UfH5r%}NMTuNa=J7lsB%wqC=-4~%|+ZpB;`U$
zNtx`gP#`AeqMuRP{fL;3FVHPv+2xP+MEnGCyu}=(C6weKZRQ||=~dCh&0*r9ZU&NQ
zYY{=vPqL=84d@ms?$#ph7Lav!1vOb+p=dDH6-?3L3Ss9_Ht-`6_JrDGg{I18$q{lC
zlGKPy4=?y)lB|TnF_YvjEbgYMoe8>Z;EPFeD1e)RwH(kklA}RNCqu0*<{1G+D4~#M
zGoDISmY}J|L_guFaU$aALS%I$yOSoViDWlVO@spN@P%fysu@YjM6?NQfFCT?n3z;L
zc_LaHE(Hu1Aylvn>oqHk{pUae*Uzs8W|`s*QD{3l|7G6x2qh(*p`ffG-R7yXN$Q5A
znz$hq3Unkx?0k%Mrp@Y3sag1vB~WiaVaiD+BJ2wO#!!Z2F;i&^xo{#~KsXc8fmpOv
zPRP*!CJM1wIOz|=wPn+P$qRP|`9FKQ*`+7o4DY{%MMZ}9-x=P4_<wuk)2~8s?F#@`
z=-H!QAWT*)eiE3$g8&wkNCm}Zg)_^FcCQ;))F@L25Jo2sx;C4+b3ok-g628M)mvmD
zdQZr*)Pas=qBibtQDWf~*lV}QZK0?lb%m1cVD#!FE*!A}W?b<0hb`$s;G++nO#wMb
z3P3G@j_76Ukd+~1xEUY-kH^vR35u^Vjt&YYWOOYLb)t5pgG8Mr#++(9^zZ1RG8hj&
zfzUbhzP?N>|2RY|oK^IJ9KWpt2B+k8dYMr(1}O(GR!rlQqSZXfQx8yw*lA=LJd`vX
z3TYHK{G|BG^!S*+EMsd5Rl|o~>Q?mtz$BMA-hzMdY^ge>W}dsqkmzkK)diW><Wg%)
zZBSC+*kEWH4=HP&Ugp8goK9LPXt}CB6pYp~-2Vkph3(^;zS;VqTDRWj|K<1mo&97w
z{}G{5cC-FhadC-0{)e})WWfLX9{Kd|c_*CypfQYBPv4LKh5nXMOj@q0Z0)pWn0~q9
zli#b;3@eybR<Z{)!?45L5Z0#ltDym1;3Y07g_1J5n#B@j#Lg_)?u*NbcnWlnlZYrn
z5lp^eSbB&RF*=WBthg)t(Lv7inL1=_RGP%bqPe-)h7_vA5A)!PmmSNwQFK*<hwdJ1
z_)HFTZa&7f2Z)L{P36uZ%@9yPEexCzaZ-EOk6MCG3l5+<n<a-D@c{~+dxQeXt{7y)
z^SeTN1U>HdLp)+^8w-%c76yy}Jh;OiMTQ^)*jv3DwNe82NFio^mun7WmNzYJh9=Pn
z#`47+l7@O|(r)OLUmZIs9O{sDoq^%-pq_-1y>tcxnPq6w=np-U#nxQ}uRG?2R2LrA
z+_$yVn`dheb8SuI-NlmRh0QK<Kcs}qOPnlu2){s_mf)2SsWxIr)K|WUTkS!0f@u)6
zmmBn$b`QIXo#saT9fB3j4|{>u*a@4$VgIv6V_~kh<EI;eImt$>J);X`Py4|}0NfX#
zZH%W03+)xtdE_Nkm$kZRx5RIk7?sp)0g&LNtf7KG9L(v#p5@Nd5nrE(#Y5l)gOMYK
z9UHWQYjH&-G@Kk!G~k9I73Z#|V=-bji(PV|MGp%L=paWOOKAM^P~S>=pYy<*a~~<#
zNJ8~2F5DToKVa%j2b%;_qc>s|VH{Jk8UX`fl^WyCWW}{>eB?0ycX3k>U#d|xfz$YX
zh0Ue8wNPK>3>sfT+|xV`SoJQv#kkL3<KFUWP2v$^2exs8FVsR*^`~Mit}i>?t2##5
z;AXQ@F14po+7-`Ybas<@ptg;8{9rz@2_DYF8(wtuV07!=>%}0=#IyOO)6Uw1>NfS+
ztKKl$4eopYpLlfLxlacEUk&563tGUL<bU20ef*b#0r}q^`t&c;tK<KHko1lJ-)T-?
zyD&uy5H-YKL7BH;cZT>gSbvc76wzX*6jzB|Ttm+kZnGUPFSn(kbqrR+@gVAtxgF0u
z#_xcAxp^bfaRa1<PI4=dO`<UW)bmrKHvR(#XulnxLI}nGlH>E|CUyfK!zaV}uL<+{
zQ(1sa@gHXx<G&Rb7Y>~Nd*ai-2cmHPcZL$l6p#*BK)Z(rFf7iWiw!W4Zf$g2JNcRE
zX+tHo1YT;?n{PG);boaNh=#Sxx0MY0pLJ-LOaL?N{}}}Z#d`jK!2Wv=efo7LXej`W
z97W!`>8@Q&V+-Ke5FnUmF7>G_n0P9qBBM&|_X3KogtW><)yq<T;wm|bov6!^I4FQ4
z_NEQQTeOaPS!UZ%h+dDSN7{hoK{@FUg%x+NG^yXz5`>L}sgyoCMPX4{@os;VK<&}%
z9+>GG2=OV<6qtmcq;bqu?FQnC%?K#UfK0M=Vb5W(mZMqG82E)0DV}NxhXRreGE=OM
zz~3+YQOV}BS$&l?wQK9D7cFj(AcBTXn4Ze?(}T(_sH(55tFCRRu2}))D#)Uf$QunT
zx7BhB_0>WbC0T_^Dh>*m2*awXx_T%rk($M*;A)%=5QIi#Me*afhAQ<Z-c~@l6MXq=
zJzLs2E?iv3ZjPXUU2#a*xL@?2$Go#(52(yLzV2%0!w>y+FeP?8F(ft_^-c*1KH|WZ
zI*B1}Vth`Vr@C9CWtoo{6$LxvS*q&M4Ha<1@DUeVtU*jig2G}b!G{^ikR<h@#PQe#
zSO<Y4g7~y0C=hm5Lp~ZOV7eBHPQWDLV}e+WLa%L>Sdj(`4%A?`;piU{i4a1mlp7nL
z;^77g0Pg|OPJcKQl=7jjeBzqYZ4;0SJtDKfZqK+aBr=O`LhLxz#EGKVNQUMx6%X~~
z%pmCEKqRX}SR52LT=W4*SXPYyiT$4I)(Jz({$(m2YEkwa(Z8e+9~KZB74}yOf;HeB
z+VAxUk#0~$K3WX~w!p5Tw8R0W?zZ06G51#ZftOG<&6&9Sx(+A4ozz7ZFKSK{=v+9o
zkp&ylv;<)2#^8Row7(%tG4^SKmhm(j4}UYWfY2_1wvl5-ByLu^9VkZXVs|lM)9eJX
zBrx1kx#{zUT_mkWoCMb4;H#Wfk9Q-5r}rgtQ%FmNVABBz@mGzz&s}(#B4Qg+(-VfF
zPyK1v_dvgA@fWQ)NEcD3-27r>7aQd;LBss9*)=ooCeGEgX~b0<JB}T@k7AHVO?3zD
zW^!Q<DGL$9qqNIGbmE61ax9h9oZF!JM#6gF5Mg%8WI0tXiwqP!G*q{?+J&V#l)^DT
zb{?UgOjy|v!8kOOT0^|-+PM>a(2+vqZ6Al$;j9B{joLrVYpXx)4jQl#B*4N!N5f|&
z<+xol9>V*2|4s<uO50<^lRw(m;QmMrjm_^nsx}8YRZ{`5?(O%ssH>w(2F)7m;E%S$
zN0M~XWJOL=&|nBp9|c1Th5`TFchG^)&-XEr|13uwEhtI#TOAqXKP81Tbo!s(lETt~
z_uoD8nM}kJY|csO%o6H8sl?-*Ar%&t6_l107fECUs9eHYS+inc^`dggO{FYWYbY8B
zr-A@(K#{+)G{sKx99C<CufCz8t^q;|20Te0U18+dfMdnFreamaiiRo?%m~!rt6ouU
zK!T15lC5SMvMOuV)K*q3TjpD~vZ7uhKrEOh|AHawE0$EO5y2GydVe?hivj9tY8u3R
z6A7ury901qus~Y~K?t&HZLTV)5|dd-aYKd>f!L78!=OrLj@+aS)?HGsuRl_6zCoq*
ziX&2QI^}%S$g<ImuR1i=)m8J+sG{SGRP7GO@sA{8G0}JHf|^Q{9gGD$DTP8{3r?C6
z4h7_>B5Tqj{wQLVHA!T~#S}KfZJ}0c_3}lm36VBZGgwQr1QFDVmKOM`MC%wLw@$Ic
zI(3wx?LpQvy8MBZ$p!MW!<!nL8quPeUr}FG;%#bfYQ`y3>?qB*pt{b1lWZbz^?Xxc
zlx_+yj<HZgOg62=SGA^r!z;10c+uRLphc++>m0S?(p-s-1`Laa1kmvz-#L_SpjZjW
zG^rGq(bP)OLABc2ths^qNGvE#?>1&xgXr#2Cc$4Ha7wvwPPhUaTLEQ7oo`|FvMOle
zg6jGPJV(}CaIoM?Y(R<Ys%wn^o@v(HL<B*!YKmD|6=l}kNC&WHuDBL&AkGOi^NFU(
zH!B6tIJl%{JayUW3Ub;=F=*(h0gnKk79rkN6q`zGji@MGT0C@zQB0gDJB0Z&N6ZVF
zqDC8-q68x2Fy^Hz<v~P(mIV4^C`t0umPSN_mIlgVEDiZqN<*~EgHeXwM#L~}+L31{
zXi@$68ERk+ap9x6%&=u7O#|!K*8ApHuP~{AuSOAsBPR=7+gS~nQhSW9kB!nKpbTk1
zJlb@`lSs|dY;vy*=n+G18a%V5){r$f9F<&3t1vR!K@<7_3`m(uzRcQ5D517BBuxi{
z>*kozqA0_|=}O>JN752o(@}#AlXYsywxTMcL4P<FmHELXHEG1cniY^Hk5VY}Oc<Fo
zS+LKnfw1h4mJvGHYC^ABIz2vqZua^A{im1vpSvp*?Uy<--v5gA_rKDDl9GY@-=6sB
z?td`ns=2(@gKptWy}3NU@=+!o71rMQn)-I<YwGpR*VNmcuc<G0z9z<?H1&GtYr@P&
zlX~YfT<2JAO{Uj5HCJ<;<H`E#9M3Sh&hb3Wb&jWs*EybOcAe7#=x$z`Oz|Qsrkh>@
zd9K+dkY{Qyfu{F7lQC28c}?OyugP%FYf33i+It?P=<j)urn~1slJ=elDW><lCd7d?
ziT6C5V7TX*-|q;gP>uRrS6f$w{yGp3U{lINF*kT5w&zbnW%C_2k}7C>+ZAViUSpnm
zCCqEiYtDBzmNzyEm%`@e=JIA#y2+ZGn-&ARCmJx&n_^#(h!dy5qhXf%*c`Y~5+wPJ
zjlpoZxjDa&)uVM`T01Z>+R7yx)u?dn;>B~9XHaD2OdF3Y%GCPw7g*tPP`yxEQPUt*
ztwA>kkx3;Sp~&v1f#lTDP^3w?560p>W>*Un&~(+{t!J!*T@gtI=2sO4ln!+_(>>E8
z=XZvMHFZ*6NUB~T*>zVQhqRzZ!nLD(6P#N9*yK7x*UZ2??B;pU*D72id4<~BC+SLW
z_fI2Mt!PZ&A=BKx;b<~mJ9Q0Aa~oBw>Ba>-Rd65~Zh&dpfMs#uwq4%^mci#F6oom#
z*F@c17;vSnjnG@#FVlOide;leVUwF4NgcT7?cR^c{f}^B{a8oF_+K-;`u9Ij2_Lxs
z?ST)y|B*Q-?ox`lYO=RP^3E(PC@L!{G*L~qPL}F>l%yQVSEO*LCE*7z6@nIoy$c8Y
zXbDCA*uw>b@Z%63m}`-P4y($GmP?+LlJH=~77v2=pv!=##O>AAl=2(v0G-@kE6`&H
zSKG2Fez{u?q_9R(`o6>x67h+tf!0;49xj@iTi}j7S*nbIN0TIVc9D$XE(Btc2q>1|
z09zr5K@v|On1ofwgz6DOM*u0;L?OCoLi<5)3~SvZqMgFQN%(DSan1574MHyNoy-)b
z;cguQRXw7T4cArc(yH2JRdw{1ZY*tlixqFv=<cTyd}x5fqrV`UfWRWP3P+F$2$msI
zC9rbP!nW2fU8L%txu)2;h8PpH0}=$}u(C%Tmf%K&!QHme%HDE#`o>WFzve_rOaJ>#
z`q!8Ej|Tc*GGoC0Z;yO5^q))r1O<?pl6MxO|79g52I*h_)BiwO6QTqCNb)(tCQ2fA
zFP+!4e-}x-rs)*rE)aN4(|V!nB9AUMVkhZ&Q)YVJl$oA44bb!5{7FmyQ;B|40K`U~
zB_(O;e?d`!f&P03=>H!1OrC@pNTuCs#jn&ZZWIwqgxaL$*-TA5(y7UyN`LS)EeG0T
zlC2@pgX0axBtk-aVkwnM0_k(R-8NiFS9>VX4n&>fM&Es?73GKWtV7jQ(2OZRl=%#v
zLQ@a5QoAZ+*%EIbN<+ip2e=(G=0mAN>4;2WVA3S)l1?2G(s7{b;N~%^LfUv{WxF4&
zQ`vYy2G(T?kx?W%O)B?%I7e}~jSVqFwIbFfB~no-A1u!Du>v~&%0@Zg#)d>~7pVHT
zLSSAei-gFY^&!^|IO3@!kGEJ`(XiNI!(;PvugihYp81&2e^4vw*E%xLfB5L=e{oT1
zsYNR3*H)zY{EyTBH1iM2to>HU&d+~|7yQ2r%>VBH^fLeK)q9ug$PoX#sAPtI{!2@X
zyaW8-p7{Lu%8zeaMlD%bz0i`Cm1S9s{%85|?GbCLD=U4qbv1BLLKzmzh{el7(OC8<
zizO0GCh8W=m)5LZCk=hZl5NSg46%4E7JopAFRx$N09dQ5DkTL0Y3usxB}*3k`+{q6
zEgJEi`-~366G@9Ds}_AP3d%|VeLog`4|gTwkp3z9KCYz$zGn}D?+MgE^nE;hZzJEG
z7>0a52)+j+;FK&I+8hr?g7Ezz^!+!TDH(mwS%$tJ-x-p-(D&`=JL1kFA@uzlC>ufi
zl*KY=1f(Ys%Z0wff*p})sH;TZ=U6PmMzjgvTZHcrHVHbV^&{e)HEX7{SndkT$)u|m
zymBOhSc>3}_E;>W&-gP2##TauT<V=wTIwovdxe4OHM5T&m|ODgi-Yl;W$pWvnq~$U
zyToFd`6U{gQ`NMV^DLIzj<Z<CzpAE9`Mt%mH=4I?&kFt77uJgyOj{1PVL<sOBS0TM
zLVa#P$A?E+K&2@#Zh=@BIAJC356F^BzleWwLGyMv>tq^SN?L_h8Qc>pW6@xUI6jG{
zo5Y`3O!pz{8hyrI_HWBLpW8C(*>RSfzddCcG<LWpr)dky$>Q_2EO(U!cHZg(-zV!H
zf3l2NvrmCP3cB0CugbaxDUeEZl04X!mcbUQWpB$k%LK~-mdO^o#bqh9%&^S19Av4o
zEV0yB8Z2uqhgbrZc1y&Puyk1tw;W|T-g2VlRLfbG^DP%yF0*X4TyMGAa+~FD%LA52
zEKgegWO>oD!}6x(UCYOoPc2_rzDI;?Xx7NAu~`$c4$R8Snx0jdH8X2&R#n!rth%hV
zS%+q|Wks`6S%+sGlXYU&=~?GzU7WQw>!z$bvL48KJnOlvKWDv_^<mcMS>I*nWRJ)m
zm%V@X)ND`o%<PKnrP&SH&Dm|)8?rZMADex0_PN=YWM7-TE&GA&C$nG7elz>y>@RaH
zIm2`I&6$+r%9)u{nNyRqE~hmok#j`O=A5&0F3Gt*=gyo*b6&`KGv||>ZwCz-G<J|Q
z$Tev8pv8k$4hjs~FzARuCk;A(&{c!B4SHzM3xnPo^y#2~4<0#q;^66n%LZ2uUNg9D
zaM$4D2cJFoiov%Iet7VUgWnze)sP`W_8pQxWX6!iL)H#iKjg3>Ck^@CkQ;{FKjgU~
z?+p2J=+L1PhE5+^KD1`2e`s>(@k7rWdhO8rhCV;^-J#zM8$Rs7VTHpM4qG=YI_&6S
zXAir2*uBG^ANKyR?{i1x=H-^<*5n3rdvZ_7y)5_6+-Gy&&Hdgw+L~`Iw>DVUTaU7y
zYrWq3u=O?T7sH1Sw+){){NUlC;YSWXcleFN9~=JG@NY+q88K}{<%p&csSziSxN^k(
zBmO+%i;*KoP91sB$aN!=BTpW=b>tsMzA^Hfy~gh4-m7}A;9kGl>w>+u?e+X#f8RTI
z@4US$_C93qjeDQH_aF9tcJEI{<&K&<s&bTn)DfdD7<I>}mq&d$dhBTL=$g@y(I<_*
zdi3L?KNvG~%+xVeV}fIj9dqfJKaP24Y|hxpV=Ko7#vU{Fvat`3eRtfDarxt_$E_cC
z;<)R^Ju~jpea7rlyw9qAy7#$YpL_OsbKjhOr|w(5Z+PER_Pu%Em-hYc7yJLB;urES
zPWZ+3zj*!^UyuLg_=CpF<2R4LVf>5ZzndUUsG86*;j{_2O?Z93LHkYH@8JEq_S>@G
z!~1>m%W=P){mZ~FH~;eHU%omqd*ZZ-brTPpc<IEaCVsj90sAl7KfeEY`~PwOPY&4k
zfP)TLf54ds+<U->2aY{(?t!5L&phzH13!}Xkt(FHbguM}^y#FDlNL`(O}co}Gn2lz
z<=a-;j<(%kdwsHX^32Jtlh2&|;N(xI95`k9l*6Z7Gv(F1+`O52?Rn?qJ(~CR)cmQd
zr~Z2CZBswUAD>^HzcK%s{MYOw?epv#?3dWLJBB!BIyxM`bNp#q_Oy~|?b9xp_U!cR
z>7~;{(|<SpIp<*KEN9etiSuRG2v>!x({+vOE%(0eW$vThx4HlBnc`XJInDE^=idb-
z1>u6r3U+wMc$avO_TK6Jyl`4!pzwmi?L{Mt78d=g==P$|il-OL#aoJBDH&U`yyVv<
z50?C^bVg~S^!m~dXH1!K=!^?zygYN<%-WeJ&3tUu;92u${c6_Tv%W1WElZZ&T=tLI
zuGt;4ub%zEocuZRoXh6CQ*JBwmtS1|=3Hs+p>uyf_sw~e=K1GcGVkq!CLa_$=!%2h
zuW(eXuei42@AC`hC+6Qe|Le-K%1xE`FUVQ2Xu;+M&s2@6T3K~|)f)?K3)>c6v+&bJ
zC5sMQbpPVPi<d4wZSl+1`&S35w^o0;WX6(BOCDM}Vrl)-^OwH8Y}&HKvOAY&FJH3!
zjODMb$XgLzaa)b0rn=^gn%8UdYd6&1b?}gbYY)EQ;P>jhb%)nIT0gelSATW=R}J$U
zPHEV&(!Mga^1)SmuWDMgb=B9a7py*g^_y!vYc{QUa_xR=Lu+qeH+0>qbyuwWvazc1
ztj2enN}7&udZ{_Txx4xCL-so)e8@e%y?uV)9}XRS=;}kSKJ*8FjsFt=mo3#T7q)yF
zs0^GF_&9h_@XX+ca=CoE{C;bB>*=i@w3WA=(e`2cy!Nx(KM7Ta&JTUIe)0N?)_>hm
z({W|TkKxtf8zRFZheqy*j)`_eABr6i>yAAapB_Ix{^o|V4QFlmG_f>sg_5N-E4L@d
zA!h2Sls$D^>aEVXofmX|)3vJW58b1?quo#SOzSzJ=lzWfH(q|&pu+-(J$U$}!;d=r
ztxXl1E<Pgbh?XNB{MF=N9s8?yk6d)*RYzHm>Nx7@qYI8c{pf!lv-+4jkKO;+BaeOO
zxJAcZbNpV%Cysyl*Ry|p(QgL*CiI(UPAEFzyc7PtIk@?W6AMl}`@|nk3Y_%BZ@s@g
z_qRWu+<Njer<9(u<<udkMo)d|w0Wmpb^7SjH=h2^8OzVucBXXZ<}?3!mhY^`&n`au
zqI0b0q|SNs+-2w9e%_SxPCf63^V`pV@q+mm+;HK<3s1Q4>)!=`_xzTFwp@SF{uiBi
z(RaTO{r;7U7hSyVlBt)Red&-(J1>3jvQ?Kodil)Dw_dT|6(?TtuPdWhzIj#MRS#{Q
zv32X!6R$qyn(S***L-+w)3txPZozf8U+=p9;v4q8;lvv)H>Pg<=%zz&dg<n+H$V7?
znSZ$cmb_aoymjoYo3~|c>)H0{ZSA+cdHdSipSxqp9S`0)`_5bMa^H33-IMOV;GTW%
zIptpKy~p1B<9!?N`||$y{hvJ0_P{$2`X1cz$2EW4{?Ne>J@fF=haY=n;Uj;1wBphG
z9xH$B?#Ig>zvGFSPu%uo>66=@DtYSGr%Rr`^_kLVwmm!J+1vj#>rZz+H|M!~pP%>q
z11~Ii;gRjt+n;=K#f#6qwDP4_UT%8%%~yi2eDLS+pFexG^VRQn9QoSd*EYXC>h-hV
znE1vee{uZfhBr&!yyvY2Z$0&P{o6a<3B2?1UzNZ9@b0nijePIy_YZu3>j#A&-2LIg
z5C8O0<45m)9RK+HPmcfF=)Ya~cl+OO`Nu*3c<R$NpT7H9;<Fz=Kk17JUtIam;(tE)
zW$l-5d=>fX`>!{DGvS-7zMc8)qu;Im?)~q(ei-`0x&Lzf>&|~K{r77>Mt=P9#~qeR
z%djCsh7K7#44q85xx=g@#*G{?eE5h7W5(`1ZvXubJYfI*CQg*5xbr2ObMnNA_8AUm
zfw#E0_`v*G<ueQCxQmJl0ZCSFZtjTTBgT&$Ild4P%fg-h{CK}*^e{`EC7P3Evt*CX
z${C&Y<3pB-h^HA0_aOcmV#ygacxcwJY?NCv%953nlaoC-dvMO69LxY^=M1t89zA4|
zcTC05v9^Q#<BpnKIDf;%EvMbI&%Slf6(t@(#rDgx<YZ}(l43(p-sI7i?Ch*T+1WW_
z=IB9VCV49k9z3>i!^J<oY8jD}g_@W%+A_~_@eyBKal`7;cc1Ke?B?+s){cC4%0IT1
zf4Jk``;OXo$$6h&6dxS0N+$&->^S4#lEJ4xx8FbCKL5;ZzPkAMN0yxYEAKM}_T?wm
ze}4Ir+crr@EPmqj&y_oW_1CPcXB91d!g2i>$9{atUki?Wb@Q`}4|;SHqLlAF-1WtK
zQzQ3mpD=92#KXg5@BQnqHlOoW>q*m(nfkuFXz3T@2FZ7y{QJ6jwFi8A>FwX0{$lL*
zdEpP%ocp`&8xu{BZrZx~#zziVd;0o^?zm#@8CSO4^27yu4L$RwyN;W3;oylQ-ro92
z*?Cv(ZLi*Z+|6r0`0$Y<YF>N$lrOKn<?=DtkMO>~?fXhuI;HksKK~hC?X#ukrc0)8
zd-&q!mX_?(kG<A2`=pb;dhd?=4mxw);e$6Sb=57;{IT<!>vEMT*G+q((6a8fdHx-5
zZ`uCp{Y{q^J~?_v<gs@v&N_YmQIB4;&D(VQtK&DHo7i#sj=_(PdUb8+!J|j5820|}
zzP<X&Pa;jh*I(Q(v1ZiE->gpswwK@7l|Q>}^C!n$aeLnNe|l<D=`&Z&Kl=JfZ++AA
z&x^}X_;%*AZ=Ckom=9Z9gZb+s!#C}}{Ps8Y%ANTBJqNFO>-Ed4&VKo&VV_+jx!hUD
zZMi@DR}Xt*FPzZ)_VgKBttXCt?c1oO=DbtB`Qd<~FPiWA)7{_X-txjP%A3BJF=5%|
zOOL;y;hb{EqqDbsGxx>Ht(RZ%S;=ocxqQWI4?fX+_{@FBUHj?jvo86tY~9$>BW}Ow
zkTb{sI}!NBlJn~B{LSNE&wS)B#ruzOUe(oIzvc5K!!NtoF=yQOzrAtZM|U}0g)h{6
zuy(IEuKViayXE2oQc=&Q?XT8f^!bK`-)(;O&=*#H^TEn{XMHho_SWBDy86}iC2t(Q
z-RBuude&VNCmp|I{D@0u&3fkjnFl^RqvwUMhoAZKYP;8Q<P8r5w`@7;?=_!Q%^7j&
z1F7lD54vFTv#A?bpY}w>KhD4UmQeLq&Fi*Cs>fV+^O##_y?^2DPduA7?}ZyLwVeO)
ziIpSInYen%*gHz{3wJCybKCQE#~yp}oV>~YudY4iq3O%oV!qX1e&m0<@YrKcdS}a!
z_5XP2$xEMJ_vfZrPqZJG=XXs!>&nR+zF)PnRDS8>)XBfTXk-1b+8-Xzs+jfozi$8c
z^xK9z-8s2W-gHODN&k9q{Ysa2d+jUMTxsIi``(lGnz#AxTfRAL$Y+5uKUyXXIcUkb
zYgdgsGjPTyH8=jP`IzX6>wojh=9{M9eCy;9cV1MzA?L#Etf6zZ{BZEo4>pw_c=?GR
zoV=j>x+Bkie&!DUlK1wR`1$a4chA0U?b|clilgbFt<&r7Jn<;&(CF{3iq*bxUELdJ
zZ(s97;j6wSC;s;HYyW!Ifm?RGea5{7_rwpMI%mW9oA14L`u20`_C9dPG1tG`e&@-D
zMqhjI?Iq`aQ2$o`q(#3y^0f^Y9{%#w`(Isp<jGHmf3)<xvE{f4Urrsn{M#Gmo?5VX
zFh6p~Uy7@@-f~Oh!ynE1(X#B+F@FrXAO9$K{-{~^A9&4gkG$l%+{<2hVc+=KuccPp
zd*(TH*N<6r<D*|+v-FeW9@uv8$F8j_w$5C<bkku!Z2skgmu`7#$rsj_r!HQ3U+s0<
zCLA*6k0*XuH)QtMXFpkAdh~PGKYP!jjs7LCOes6_%fW4%j{bGzsClvTuYd8zsf)Ip
z_4IG||Misot;=sYHTN&ES3Y|>yl!62>&}-NTbh?z55M91B`;lj>d_baXa3{<D_)!W
z+GFkya%&ck&)F<La`gA7eLii;jk7L(dim9BUf42!M4P<$uqlO)J#qA+Y4axB|NV1s
z)Q=x_T<!XAx@Mhy^96wiZX5m41G7Eft^ah|?}prT*T`Qk+x+fZ@*@>3z87b{^RLOn
zz9<cE>3Qa$t8V&X!nqGU@|?TwqR4B5?|kCBrH5VkNyRfS-a6%ltrve?7`^@dOKw>H
z%E4DgE;?xY9fjlP-#2V-h3m?j7g}Duvgxhc%3l4UYuy)hw~RXYA9csg96b4!Lrxm}
zx4lc>=^o|UR<+~&*j0`%Jzs=7KN|o3flrV7aBu6Yx0UbvR{7EARXa9Rf03yDea(ia
z*T0@K>;9+XoBwggG1F(=|MKFR1HS#e%YWU}SKfDz9d-K62XFuNxQoBuG5fjg_y1^l
z{*HgXKDV=c|EAU>|9)rrqpwxH@$sBl?pYs&^KQEBksrRk<hr$gy=>Lub#2ubJX!Pl
zt<IHqzH{~P(5++dpEc-|zuh|ik$W1?+ULP1k1T!k(#t1rIQf-pkAMGd`HdIfyYbcS
z?^JaApFh3q_(acZ`(1nUUvButVSjFY<;=U>2T!Y;m_K3mSz}+>u(I*|$BM>%I{xFx
zA%8vgp?%Le^X#*04$es|3M;G6x4!Ykr>i&JepdO^Lvw?7-LZ7?DLeA>zhBw#%SC_M
z(QwG{U#wg@ddwGFb3e3B-nu;h#s^kkbH?U*n}74!+a(8h7RzTI|NI!`$RU>NJEt6d
z$&SZAKPR;Pj+OQ^&$870e$nm4-%Z(j;}@^}`JV0TE>3>8a^-Iy+sAd=QCpvQYQp=C
z3;tRE_&)nzeoWnIbzKwkA9&;ZZ*9N3;kerGPq<>$v*))2kDr)Kp0#nviWkrO%jAz<
zum9`ik5wPHPuq`{{a%`X`oa}Uer<W@+v`@om{mLF_T#o)HvQ;=&|620OnrXSF_t^p
zKRo4)KZjP#%De2o=e938sP6F}F1>KW<CnhYEPefe7lt^N<lj54?Cw7t=dql2+WlW$
zb4+BzT_^Q;|601kdB-W9Cm;XtfuTd^oWAL*j)T`X%<l~R;k@LXJLJ*N7d?OPrLT=V
zVf;VVy?FB$+uFKIUOOuE>Ls6b-&6X<vg;lgHE!#Ke_sB_Q};UT^Y;7xc)|8>H^?Qk
zE`90MXKxs){O*I{OTDT6jw-C(aY|wH4~OUHK0frquMYgzbqgOKw(jC@JCy5Q9MiCH
z!!xg)v2t6r>#C1B&V1v&o`08az2~9%wGThDWYig_o_fz!XI-?<4Ue_wRiAw8;GFFT
zKlbRj!ArJ1an;gWdg9v~54h~<Ne6gdfBx(TPB?JVLDyBzz4*1mSKhUy<f?I-%C8(h
z`I@J?{*S#c0ch&j{=Nx&KnR=ShL;GMU<AS<2n2zI%_2J@f=WmNL_!jiAfTdQ6I_a*
z;x2+>U8~~mQ(M3V_kvs9XwhO_Y898dyteYq+?#|1t3Lbu+yD1{j>O#DJLjC4GiT<`
znYs7;Mh@a6noiwT6uV@}hW53WuHUXM+?{)gpC7)KCtxhD{blT_(UI3>e{MW(HmBdj
z@lEDZr22lKq6@L^c(y;p+Hb)6+N0I$3dU`FdDoBIIQ~J&g5I{LOZ=>xJXiOQjj->u
z`1+oAd+11y+Z+G&4Np?H<KNesBnzv!)+5a3CS3V~aMH2j2WiZ`b2I;#+wjcui}~`5
z>gr{Oj?b96!2k4$#dj{nogZ3Mc`5OaQ5H4Hi^-3Ya~O**heYHTY>Jrdb!V2_;2ZIo
z=f_A|znOdgdX;^|;mHNP92Z!J#(mpzt=z2(kz2L3Z8_W4EBuMe&&2CP9R_zHocfW+
zrcSTu_@V#)J~v1aS8N)7k3D{SGJ65j1ofGpty{2Xn)SVF6O2bTGwYT<bIm$F*zLCK
z;@VNxmm*(pHk(+t;NfP@_%G)_*}V4r7cJ*6UHn&C{OBsj%QG4_#jH=Zyeo^?P&B$~
z7|pb~|4`oxlifGPIGsBEIAr|LEi0B?-$qdEF+1!ScgKJEz-CkFo<TP*91HPX5x2Ru
z?;5?3{Il-s2gycPMO&nIU48qy+^0?N*#FUZ$??CF@t*x37r5u6z5nCs>iPNo?@y9K
z!h*d#ISNF9ynsJJ1*am&Ohdz2B9SONJA1~A89F)&6O$qfi`iCIW&Qilqfiz&I8-`1
zE_Qcc>fy26$7fYwV0BPX?dZ{Uv9TNC<2NNIZ{={d^LX__;hrf|_Q~Z3rcXaqR8%y7
z{`^IY7Oh;lQla>!tnAymy1K1fx9-}t>(HS?#l?+t=N?_SuzB&~ldD#pt*JRzSJ%3A
z>!teo?|1LMdgxHw(W6ICpFZ8t@Z-gc7jN9S(bUv_=FIJumOB?O-fL@n*wN9^-u~#p
zg9jZQPaZt@?HNq3UcY|*PwV!B6V>5m4sepY4F7F`xQu<769+yOgg<jeg741b)<_HZ
z*!%WDkoG@ksc5`F-uOW;b6$?cX%WN{vC+jp@F^ZL_`qW`1YfWB(zC=q3MHLNW(D{?
zZ(G6)NRKG<8l>OMQ5{2>QNUq-IkFEzhGhWB7hH$~bTIAcvOt#JPMEO~@aR$|VFXK=
z*Aj_S^6>}1GYCM&)%_>!!EcmbRDz&Ku}!8FW*<Zd_`&kQe4*fj5^%aJL<{WW{ySc7
z8)doK;CF;4UT#Cg3b7${ms>MEYhoi=fS>PvYh()ez9|buAU%{Z@d$p+?iIF0fxvx2
z1ojDk!!Bfw;egN`HH}4vmX66McGMmzB@Z6GDztv>v3X`;i>Y><!3F)<Gi`PR)Rh)k
z1Qu6ZL3O!Jwy2q(p~PQtcEt$UEh`DC&|7N6lvrgPX)vP%`dM|hNGWE0onquI{_(6*
zD<?^(P3mLf*_9)+f4H&94IxpIY1J+gZZN@OjNb8}Wkmr<b;^<ZXAdqFj{DXtQ$ItY
zlNDf`bL`>3{t8x5rMuzl{pOanW!t?o7yh<o>C;=)#&Z8dTMwj{&So0M>5pGq8nCUu
z#jMu{_dgd_6L=|G{hum+M*7-3M;XzfgoUJ$Gj5;xW5mR7d^`<uIbM{KAHF;7t?%8U
z^Q4%(q^s+<fenofR?8ZvowHpwb<%IYymCC=tKeV*xzai<)OqiQyaH<Hi;0m|h8--q
zr=Fz1-+Qt3fQ0W)4nYt{LtR~>ui$bbVneqt&U|j<zDV5vbqHHwD4LyAz#gz{ps3Nj
zwO!0Gi94d#>zP$Uc~`G`|7itP%`FD3lF$}oi)%*_)9}ktI*X!$=M<TY3~xz7%*w__
zkxvcx=NsGK8bUDB*K2J=zBI2}C1xIIXfX-zdzC!b@!I9(tE)ZkOq`t-zoEiN|BOR=
z5UZ}Dp<GDWe`m)0xz-4gR##OST{M<QEUO~&k4#xUb#qHEhbt&G$blZzlvDlH=KGts
z#>k5ZL+!e5xA_ktORNHh6sHs#4Gn!>U|@UbSR2_XssWi};F3ZxA%?AR1VWHsqXTnO
zn*5o$3c(hGKPwt!{jM#qnd4L$<!{Kyb2;L_&emSn*!01&+Ui^74p&l!d1Y3RjlEt_
zCNi05rO}q4;3EcX^Q9GJ^OUh0rr&&CH8d~Bt_C4`KR-TXNx*=`ECWk=je^)Kyn?uV
zW}y8>vVQWx3S;6!Bb$`2V9(V-hpKw}8=LIe^5kpMG4j*tIj>hHW-$elXfnxv0J3Y%
z@xGKZoFA4W@dMbMYv;NT`&TW}Prj<c<R<gXM1)R{3pBLzuDF>VNL*IeO4MxtHkeVd
zb{4Ipt1SUBmY_Ohnh~McWFS?sI?IDmBMx9%A?_>#XLntlTPw=eeycnF%EUtBQ&+AM
zba*ooh$g&t)~-MMO}Id0M(Pe_g%XF@Ck#e*{Pgh9(;qJA>UgZmXrq~2L`56S8;?ww
z^L#OK%5P_B|L>}U%O?kZUr+n-dA#^h{^3<G><Rny@)l2GxuR&w^k1^`(|_mpLOfoP
zm+KaO*Xvb#px&PkC(0uZSvC;qJBVn@BZZ;W3A539g_rC*3&`_pbccpEk|K6U9}o)&
zfhh{J_66|^wzQjtwiEUn9@RNaY1%&8zi8c!lq9R#0{vboO|x|yNB3i0KCUS8udLf)
zzshm6QP*XM;yyFURL`i<m6Kh1OU!#Y8@Z%>71%I>vJBB>d)GD%S=c+QB#M%3cecxl
z@8)^ZsDwzk*ej!9N$JZJJ<F&yT`Lm${dy@Y#BiB{RJUwrk?ux0+bt<_V^QUxqkOM{
zbbnrXSy5-k*0kKhh_kv+k+uQF20D^kYvsokgI(*W!$%UXpRpeHCp{u<q3(~Zqurc$
zbXK6r(WXy{KdlV^VSTRk)x|nnZWDAA{&p7Qezf#3^0Row{=#rd!GuDqg68~IiaQ!$
zI8$$!SuxN@4Z+0dR?*D*ozdrY#xYuh&2QceB5X-IVP<u5wOO3G-9Y60i)x!eD`{sb
zexd%$rtR!nZ6GQatz68TVZjSq^|;xcB~4_H?);*pGc$w0zj$QXqLthH<%HDCc=9(6
z+isrSHPI?dL0FSmVSVE1B%{#uz_ognmO>et+=#F<Q*F2XaUuKl_{GBnI}v?)ds128
zl89NB|0>>n+wK>6O+Y`SWrcgY@2%E*hn~2{*IlijBj&C`Y#N5kW}12q3H<KP^WI21
z%{iHE9cud8LNR@Wv7vAKI{!0?yA{Jb;uj?u8tpA3+jyDy5px|Aj*`wJJ5B`kC$-H#
z!7Z?=QxGHSXuovI-4>n-(__gta||>0TKB!Xg&9pxGDnG3qB+^idm&Di#8YKE9?USj
zTJZh--j~1aI#=qO7DP`n%JZE`vNyCjUps5a?|y_1G<L*^UjoK;CY%gBI?Q8JqyN;J
z0z-B?(St%X9=mVsAr#@Wsh4#q6@)<jS{m&oEos<p@<dLZf%EVariCl}dhd;4y}TX!
z=!eUPhdeLOGkP*%jK1Pb@gIopsr6-{+e*nph|fmE9lKXlxnyaf_wLy0-J4vVx+Y12
zbN#njHM0B~z8_suQ)?D|?lL;$Qu*_c5K-0%vs)`2`&$`N{K$<9q#H-ii4G?WtQf{_
zv2I*!Lo@Vk30Nep&>6(DTC&Z1sa~(9<7O={71gU;14RvuW?N6k4!a;-Klg4-VFr2J
ziz8z_Ms>0n2VZram6Y#Vbtn9e_w`rjw)Cs&wR6rLgPlVCS9S#kdV#4$9ruq4mYg<9
ztGE&1kZ2INEybPbKRkOiG7nuAu*B#|ZPs#yuICl^fN?vxS9x0rPg&@kbbnUCss<gR
z9bxXAhM1*>b}LLD2OOe|u)Q&UZ;S)lkh3v&jpH?Bob5|R%&*+SeI4;S%dInzE5FdZ
z^3WmM%fB!p2N!3p8-1})Z9!n|b?$Nd?J-w-mpSV--QTac9=k_YUQLuF55C&q;dZym
zDCO76zJE06o0zt4H{UsEVxL_@x9o{L_-LJr;7_#C$f(KKi|l&g&py${%MgQ<PTp+E
z`u47ME+UJW=KbSlUy^neEHOy=z2AWb1u<jAddcHDCOf)a@7vzvFX>;)?EF{pX+0#s
z%;j!H?<;yf&xjl1bB-#k(c)n(BXUnnVP(x*RfFsq+y2ecHhP_Z|9b;%GZzRptuxs@
zZ-?!<GiRNeTo>BwjYA8(0%D@}y&j#r?CAWu$&+NO!^@*x7<*56hdm)Iw12EC9TfQd
ztB0vm&YvxxbKw3X+tMPV8?8ffDwpa_m6&Jt>$p@bk_FiGj{iD%VN-{BgYMXhqNkKZ
z{Q((>V#-s+&|glUuv_u-H)%EZigO*d94TJIwk%e>V#*BB<}rE$&g--$6c-Pz@YrhD
z{zrjfR@3}+MyZ~QVw#WrlGA;8T`XN@<)9ggqeEJL{$^mIO*Qx1QM>ITbscZD>(+;6
zIczIS+D6ws(>CzY=DNh*=HihB(OacDO|!|q{*$JiPvp9L6WZl{qDOEFkX0}IU+F4L
zL)~szA|+GIJH{6H<&Z0nWc%M7VYgJi;YBK;eTa^MtpVS237>eQx4Ao#X-tr2-<tX4
zG3Q*oIiua1WZ`2$Ad*VRu4u#q9mQya)YUBWHU~FC#f0aKK<Q9&BQFPy7lm3P-|3ih
ztg@JlS;nmy&+Etf82TU78THUIw4)vw^ir;49yxx0pDAVJ@2x1Q?zSm<@s2N}A4JOx
zB?OmtoiTR0BP)pIM~n8~wE3>T?ldzFLQf};eG>oEt<sUVnZLzN%H}#Ze6P6G#T`WF
z782_-$!^L0#+EMGU$Sze?a1HyCm$Oah&meAhj)HoTBH{}@8+m=TyOg9DaJbxX<c#5
zT`v+N@X=oKS2hvEs3gG&8#+<f%3*vvalm)>y1(wr=Rb}kaV!$3=JV3~-w4&s*f1w@
zV-i2$%iMZojJa;V9mqEYh$&jYZckXUpYfuU+^latNK$NIH#X10v%@QvZ~o<l6DZ%V
zz(X>cTQ>e|t0g6E(9ozNl2;Tlu{<WHJR`_<ZWW7|7H-)@VbyqLRQ1u*x2j(3#>}lW
zxb0qg%!5Vs-u;+rUPEvs>wKL+ZoS|!dwqnygl|=^voF;4T*kCW>X)<Dm2dBo6`Xxy
zMQ<UPMGeYmb#L#;H=Gh=8K4uwE`1aotCLu&cW>mZT?4%(4o{cPbM;KlX!YKEA=1d)
z(bAmwDr8PmN7dZ|hTPpZ^6v2KOOezIN%?`g#sZ&F^-H3IY=4TS6*ZF|$53?abow?B
z;u*{18wpgeaxXOGpe0w4H)~R}54l}7YNxEoJb=|cVg$>n7eQ*)89uBAnXLCEsZz(Z
zAx~hQ-O-9H`7M33bl}0eqX_a4i=B+kLy1nEM8^uksKUI}8*SYK2;<DH`$(v{0R%eP
z`rvb)UUpWu11pW9%V(UJ<Nm#G__C#kmr)B&I(9UZ{asevK2W&b%iH{tC8>)n*i2lk
zOK>~?lVZ4j+0=b=nE?w-*E^Z*F6~#AGw5=$Fk6&!j8?TX!K|LRZGXwG*4dVhYc7l(
z_2XTOgwi!SjXG{ObH8jZS$Wa2b`w8vN3DK=j@_vOR(6u@5F67JPA>xSk#2f2B_zRP
z#<g_k!UAMK%6L=4aNF^;O4&Ncr$j54`5ntCek&Mx#j^b4P8qtvtCr}{qb8WvL?Uua
zqjtoyhA^x~$N8njBCqwmqrWn06~6Z3+eIOl5&}*x^AGgrSv=DjI{PbKhE6Z`C<m8e
z(<YORpAj54r?``ei+gXhtYjb7-6-XxWb%lUE}IiJY;<bX8R4&U$g>aAWy2DKe{ZTG
zr4tB<&qw!!Kc`QW-m?D3<p{aiLI~aLB$WKOGT!(8H+<Qz$NHa(hui1%zfX~T9WXd*
zC5|5q>O_H9(cO69*+RKMBFv-a($PFxH{fV4>WJp45xMbTdhpd?Dy{oBKNrJfqEb{$
zD0DSHJSwg-2p^6X#1#toBDoqgNQM8R6o^Z5@biTs`}|105Es>tWaKLs$c22rF*sWR
zU+U|Op8=Qfcemk@gQ`ff3~|n+$-vO@YgC#K$;iP^tHwO>Bvm0NaZ{<&Xy|lMZPjbl
z5Z5M1$cKl4d0{*%Wg3O%G?gRFhR9OW0Jr?NF{9#)oSjj?0s|0A6AO8KDGJ{_1Q(_P
zGlWV8JOBqH2x9(Lp}8udFmv9!a^`8~%$=mwob(=brQyZ*byh2m<m-&<**8_p%Y&K}
zh~Nu@5V(p-flskhu;Md8iBJI#`@*C#DXtV$CYS~e+$ey~@g1ajIBA}m)J=<&`3}-)
zIO#MssTQRcS!%Xi4lxIDLT(11o2jN^DMvd#uze%32pA$alS$EPJ0F!Drg4Naz7JsU
z>x}CJs0g#jf4V3Cz4W&IA7$Xpk0RrJ<G-t`#~bl~-9Eqn{YjFq9Xpa0mlzd<Vxdr@
z;se9OSSV$<vvYzQ%h{P7$41A6#*GO_8BQ)}tXwMK%AK8qBH)Y6C`IFqj2t&7u{7N|
zF2*?*GGahV<>7D{M&`tm^I*5p8o!mpcLHC?6=(6`+vCa*7k27#Tr~u##vorVABN2U
z2ZF407(x~T0QTIlq@d1F2IH?egY%@YH0%|17|a7k^2FX<&wyaFoOC`N^#x@Xi_-mk
z9hfK{>sJXh2S#ZD3<E-?#0JHT4T_l*8yOsz5D*hYp`qaB<gBD4!7y2=d~o}cWplZF
znJg_^D9qD%AzrL}<ywZtBXROgm0~5vzk;RWEL8m#J(mMP(8M`1K6cme<)9f-ej1Yk
zW43GHoKXDK(Lt0q11zeCuQSJw1S6TicgJN=6>0{`fV$m;@PrH!IHB4F>V8j21*YqP
z4)129VF&nlBEb=Mp-E8uv{82<dlhqMbyI4OrT=uN`2Q%qW&9V4#gdOT{J(GfcX9RX
zIsf+<@p=FM(<JTT7)6x>vJ&SSngKQ{yfGT924jg|5EdE<#zg|z!6*u8=x8<!bCH?{
zgII90rSN67Jk{_b0b~wXz#;({x*2rT4H^L$wZH&Mf~QdX8G;%1V32Uea)OyZyz>9X
zeCvN(dQ1OT-WooRjQ8O`jCeEtrzhjH|NlwS8~xt_RW1iml=B|0Sez-~%P1rjVk<cB
z1iH6W3qV#oGng#NA!9X&J@EWhWJ(ZW9MIL_%@IXw0MZ_NQvFzBFs%`Y;OqvB2Y%kF
znS=u@7&RB-CW{0@<;nqcp&1zdI(C?g4ue1O(IhBW0wyD1j8ggT3?La!?C?QQ>W7um
zSI)y(=b|$qFC3}|uPSgYsYyv_YC3%LSIVSF`8>*m2{feuKc!*<xDbq4Ed|Uca~+ht
zo#nX3o#ogJNGV-=;svT4ES6@W7{WZ5qhggN`KG~hSr{lSlOhqzfJ4l|792Dtb)<Ni
za&f^MReHj>?+Y7&f@X1Yg?v%EJOjAuE-JSf9Ql!=I5Js|Sjy``CIP1@N@rT4%<?Wa
zTHd!TJ2gunS3BHM7;v?`XD%rp*o`_<4E77E23FUPG!~wgd84piShOZgo!#aLZYUIr
zgC8ALRX`&HEU+rWn<{4ER;y`IZwk>g?{vPr+q7voV>tcq$v75=Dj%zK8nh(f=7y$%
zg7Sg+FeoUOFBD2RJm`xsDIOG+B?2S#>)~u*wgb<@vdP6b?f~^abyRRq1yVcXhTcO;
zM8KH8B>~dCgL_CoTu?$lA|B;1IDqwGGTxwme?6jNBI6=ik>P)*E-KppKuTmx+~1M_
z=-$CSCMY^SC^l}=n4q}ONcIN_&?bF{3>fbVC^R_ogV?L7-p4sECLkg<9JJeq6~71V
zyIO!16BZTsH|({W?j78L5@Ql4#m2>iMTC41driW3w(yupEYM}_huMz?-TS!*u-P$x
zhdZQuKlcx|eGR&Ia1V%w7LXYAVXdmBdVjg&K_C1(<%V?c=N`rmiuhY<!3f{MpA`uP
zzlgXGSB)m&f51OHC?X^-^lwSPN#Bt1=Jdvo&5`r9=Wt9^EOX+4(^T4D-Au!>IO%-l
zj1ZD3m;aa)t!P!0HwoDSsWMb>p0+?3CK85SMB!9Hm?m?=T~#^6$Dk^2>m*cj!bb^{
z^Q9a)TrCvCJ3Gb6iRa`*!8uak)E4@+7*MM~gs}v?s5~0<ZZ+8q5v9r`KAQgnP8a}N
zH#2OCtTA2rA6X;Q@c$r6>PO<LojyGNo2#eW=lE}*B=u;2)f&J@mGL*?Ke~fcpWFWv
zq_?zxHyYnZknx`NA2&CTp6kCO+&(}5@oCcVkDExthpU6stKx`v2bXsu;W^?mdS2!6
z(*z>E4BOyR(ep)91yV7#)&q%H;w*T`=K)rHArFtkFP1=Za0iE>jDe4zoz)#2A6rI{
zk+ch?5(HSog&7Rn61!*fIou3XCIDHa*&-3V!RH9%87ewhax@5L(ICWj=5U5s!IfB-
zI6s+$&lRKzxLCy@+<=@fl7X_yoV0X=PdJ2ms5mVRl5(*8p*SbJRw%v}rab3FdY6{5
zy+XL7i5CmoXM{yl=>(gZfSFu2SDp=V4)Wkt$PQ-8mH~yPp%94x`e1Za#^<A1Vksn-
za|A*x$TiF;7GdxOTKkNuas_0|GsIGvH#(X#RRF3GlFgS&Iao~sL_ENYr9_dy+f+0D
zp=xh&1ggDdNKzV>CQ=0$nJ}aZS2a$p%Seb*>&EbAc%pb`RpL~9WD8e6Ev4FS)<AEi
zym?g%DfTa}_W*6BkYG*OxKUwSz<4-yRdZ`&JSgEQ@V)@2vY>mA@F{H$KNZe<nWzT9
z0!evICV<Ek7#b|dFdbWtoQ?vy@iAe*cCt7U3G4v;Tn@~KUC!djf$_tgb_yLkf%OhG
z5JS&u;CUn*DJKgPK~X(WLdnOj<kL|ScF-+bLyd2d?D*HBH3)l(P36e=xE64AsD$H-
zv)!__8tE^kPY2>*@#!dbkj<gw|7Bscfq`Lsc2!@d;zgjTija@Dv_K{ia`Iru&*IBu
z(8E!7GGOR3G3c$B0A=^&q40@18A&A#!%Lo|B&4dJI-_E_a7juB2UrH$?O#!n91@2+
zWDR%Vp$?(m4r9C>Vkc1W{7UFi9LW?eymElM;viESASMzYSfCWD4ESm?Wy7GD96E~m
zdQNcb4-jKz0crz(G#Zov+!`85T?J^+xCP=aCDb)GxPlf34UP!`$6hX8E=rAK|0xHw
zP&_Bjz({4$8us0-?SJ}C`@b{wnE$D8z(1;t_dWl`@Nj=4{=4Vr`QIl=J@DVLd#ac6
zp6UkvP**o^hO4(nk9#U9j)~%?g8>4ONDwSYKFK}~M`sUbqRPX-un1Qc69Ou^a&auz
z*!bY!uyHgTHya{+hC^sjEFT8T41Qy$AqFUhm4RVoBqt?zqhTjcNS=V5(LjfVrzo14
zRlwIhGAm)P-^j1Tvx87Y8Wb95|55}5vsP!9iQmYgar4#Sss*EpllbCQ#u2K+F-71i
z@y2!M#D!qgEEd!iD>ytLB$kE_7poPg&ZNeJ?x|TL9QJiMXgyV}Vj?4<lDQIfUJXz`
zZ3=BTT}iiG?MrG%S7{bRlIc-|f7;eRr#DlN@n301A6LeE#(!71Hq>MMXMDzg{WQth
zk>sczJRISq6U@QnN~cvW1|A}q^8t?yPEny-%gL6D!ITjAwL&rW)GQzh&lXHWL-``9
zU`jUh713bekn({$z!RfXVMdz2oX<^{a?+e6+1%k$f!HY(%z_<3u3Rv@D{=8WoET2P
zL6nO{0x=p3++qPrmBFvK5Qp$Za3LOB4S+?>5eR|LBbH{O9HC5%6%}Xe0y4XJ0gs9c
z?`j?-M`sdgut3BWW`lzIa^ZsqP8oh0r(|*-kka#%P>>4GK?rzQ`Ke+759MWNNvIGZ
z!4XZPLoh#7L?gkeC^m;qqf(Ta;Y?nRW&`&>9lGS)3}A494!ooZ%<0J@3SC6=QSKX1
zMNEc|k7(F1I8Daqw2&*8na-DUscAGHeC`V$b>T9ZL6N~=+?Vn>nLgb!cOcclEt^iE
zb7?;6%pxY!)rAIJ9Z9wvN~aD@77Yd5L`)YS6#7K@8ih_4<@+RyK*0cmeC-OSVKv69
z1Nne@i?k}PR0b2&M#2|S!BvVh6)-X~a&|<sKvzTIdFbIN5f-z=K);|#@N%XxnGx~f
z;oY@QQx*y|0ADJlQ!qpIhN~P9*$U%DQPxueGKi%>r1CdES0JY{uph8?N@%R<TABid
z0-lYdGi(JlAy&sUy6R^dS16Y8q4F_KJv7440#e?g5S1jXdSE^jJ_&Z4)NHueLk*{E
zlG1=l(Bbnl;xsBaq|uXs+m%eAF`1z0AS{>!IC4Tjgu38=G#|`*z(1_)`S9K^2M()1
zM1=<&X*!p#EEPDOnlwSXNY1dg1MRDOGzUJRp04g!sd@Og0R3ZjBo6Y<4vWLpg=s^@
zX}anJtRxic>)PFfm^xvf646~$O#_uiVPYpK%Cm2@5v+p1r)P7i`s7gc^ZKg2HV(=H
z8O30z$bxWeaG7N)N5}_Uzz75D1}IeJRQ5Ij=xwOL7nT@&gI?F&T-xmgWdOy$zd=yg
zBABuT6KL9n?^fGerQ_X8Nlq8MJ2R$4?Yx@3IA0}A`P!0;&tJR1J?{VVNgA{IkF@;%
z-uu6sYtQ&^BV0XQKHvX8MFO2$d7p$x=olg_-ld?~;mfefh21DAU&4_p*XSXntxSEF
zg^Rl^IF@7UFWEA@b4vMqd?^m%+seEl5BQ*{Sd<38hyTU?fDEOo7WCoB#ph<iafqJ=
zm!P3kC`&1Yrep_96fW|i!!<9et_f0=*H{`?;6-Y89b_5eY#|SOY7>ki&NO8Xw#J5p
zYVkaWpV|X)7s`y{q{D~bMHt8>n7UvKvLuZa>o@uo=46lThFJE5PPVIuH^ZfeldWzX
z23}a@@-0-H2LslSi6&_}t`jCGb11a}GQk{bzq$K5t{K&Jm8%S{V>0n)CA#-4@TEuP
zx+MO_5=!L>K_h{w7MPmQy4eC66;J3JD>?SWE!NVc76dRxta0Kk420rzEwtkB$PjH(
zZ~`Y)Cai(QX&MHJYOU%kYoK02<>yL3lSTopQ=z8ln9^zL2SzYRXD0r5hyaI7#Y_M@
zn2F(ps-KQl=7nEQa8WeP$tfwxc@(q+A5ccsqtIH}piHf7nx~vqhJ;Zo2Y5(Ff}H-k
zCM<PTXx%g#QlJF9`EVxi<!t2|umIGHI!TGMOviymfk{$mswzq#R8>0PNm&C8)v4`}
zt~6SjMs}`Ne!PHc!=$OfOtEPlB`yQQSXGTqaHcPV`%roK`nbAGc<KM?QT6|xq;dbx
zkn_Y`+5f;JKp+16hnu^r=jZ1?K1F)7{XZ)7Czk%k^FOXGZlBx#Q>4Fce{g#h|Mzj9
zRq5UHe};=I;|=^*@Z<CR|5KzM@t>tw{O4&1l5b!z)5vI+SS+40Wy;j4Q>RUvHfz=_
z0zsjxTVQBdWNch)YFcP!R$^*8+uXdQckfbj^D=AexqbW2?bmPqz=87y4*b&2uH3<4
z0fkcG;801UEu_;Id3Y>kFseK}mNOX3yuDX=d#@TbYIR`X8aBH+Ft7#-BE2p&v@Se+
z-Iy`!qoOv%#eEeWy)hwSOJd^Y@#D89CvTZJ@#~b7?ObksdV0M;uxs+<U1IS*p>X$<
zDf^~QJt&tS$jdu8efr^9v%Z}<^KfBdVM$3zSy@?md3i-eMO9VR%9SfuuU@TCd|O*v
zyMF!pO`A4-{q@(ocJ11?Z{L9f2M!-TTvXIpTG}*c&XIZZj+K`muc&BVxbQ?()v4vn
zPcL77X3d)KYHPn+yS8=x`T-Oq>)Z32HeJ}X>EhR4U*5j``}%tDcV*9>YX=Xu9Xix@
z<j9fc=H^qUPMtY(rlH}-^XJcBx^(Hvl`Cy+ZH<lX&CNeGH+P&o*>URB?Q`dTZfUu5
z;ljO3m+oJ=^2@br58B!u-n@D9_U+s4?T_x?zyI*z!&|pHfByOD-Mdfk-Fx=%;q%9j
zA9r@X`0cmfo<4o`;>GW;UcLJL_dl_?&!5wOo78ci5yRKWP@}iSeYSC%eB(s@y5<Ea
zYwm!sopmP{QDZkJpWM0r^imh@sa0W?wRI~ONiOfUnG;>>J=?HfzoXQc(P2LQ`wa{Y
zDTvjLH4F}jsyk5`U~9hIPRi0Z9X7e25qrh%n!(<&3(-XHIpzZbN=)jrevgf?4%QjS
zSRRw^bd>3e8XEd9+o2%&5UV^+=muEOWKP}-3y;#O$||Os7`mhoioRRZM<|l4-#Qo=
zzLa-S-;~WBOw6@yS-$t~Ig=6JD%{;HRt*l13(i{<RauH02pYD1!gZO#+O^Flnyi<3
zifS}}|6`v`dQbFDA9-DxPHqS}w=`<)s<e|Cq(Z9RVN@K^wO4wZc!eGz2;I{V($A&O
zMA_-9LmG@6N4l2G^0Bj?Ez~g`Hz_Nph8+@L^1$<?F_ArPO>u|O6x*<v0c5=#kD#>y
zrMA6oZWas~xwd#fpL=yJV|ZiOp*p+AP=6>TW>jz!S*G?U2bT@7IAK@j8`Ck){5MYj
z0>7DF{(1|@VHNf>E9{C*>?KhJI=yE6?5{VV0xcqQUotut8NOn0s%%sH##nC)Tl|w<
z$_a7`hiKUHQ%!;C@kD)B#gr47z7a;YtBItR#?|^{&sIuGT?@k5TcTe*uf1f1qSmCY
zvxE}tc#$xV82Il^$m^DT_A!FHAA89lpD41Trh4knw^p6XA2AuRxZB?R<)SMtKjv3l
z4xT8GjAu6!DuX&oO>`yCGZtKT9mXkMARWRQM5=AvoG*6@K@QjkrM9u=c2xX|n9R6F
z-!Hp0;yyAGT^MC}XD=1ab2-Gm+{Z#PcKf<}#9!{Gk>v!3fHcF30Y`{^8l1ie9k{lz
z$z~LNN9j4ylET!Hl&T{$Or1ljdk?IieJdbzd1Yr4<<5;;`PD{fK;OaTdzx}?{M%cC
z_~h!A5P$KoFRpoBzExHg)Mt2unSL0hsA<7kpCn{lj&3s{+pEr_)$WV0_bRFj#%|B=
zIM$F9Fv0%Drj12>$?Vr5C8#8kwP2P1vuni{?qrH)6TSOqbu356Zk{`?wJ}ZMiU#&c
zoW?G-bnElX(1_m0X_~BPWK^IjJNa>u$pB%Rdme=zC>zA(O)2S}Mji2Zbj7kA5ALp=
z*W2IV|Fm}=P*G(2y07Zo&_E}k$vFqf&;)665@=e2ASgKrNDd0xL=jOk3Mv^1A_58m
z3IZYs3KA6o8N`67qX?o1j$CloJ7><Bxp(fl>%8;cS+{?z#rjt5+7<TRwX3>n@Bin#
zzCTm+$cqumiB>p8|5eTOr)=i?mvmGI%5a%RgBp04DU)Fi=b=X$#z*lq9n7(~;frWj
zkpHHS+z4BfB0rr~mW%dT-!vY#v5`a=f}Qc|l(S4gt%aTGWm?aY<Si9CI&U)pm^KHp
zxU%SZplIGe>AR&;p@e$`V@wu+6F0;Qy7Dg@Mi#GljtHeS089D`>dCi25L25<<WH4_
z9SBJNK2=VGQ!A^?d`pjgVxnNVLt#>`qIf1>sKI9nT@M^JfeL5DkoH|*A_ao5^?Ci-
zE|qjtnIGD*yG@d0xQXgwWq&gN0agM@(I`WSV@|f+>NA#6ybQ@WkD|3>+u<m{mpRMA
z%(SaahAEwrLX0=c>_NQxY7Piyn%(7HlIHAY5}`FYY~EY$Ic=!V>T8H%k{uXOYdIXt
zj;;*s5&;OQhFDZIr~aprTKkPrN_P5l(RU?1j!Y%`%rOQjqWW-tY0)_5w@w1Ljf$Bm
zS5v=ly5Ym9<_W}ShjBKLSmFu_LmED-tN$3tbi{eROfl!kyr^GM0z0Vz0h_;@n{vy3
zz3W%B8e#rUeEtEs`*VStP^hGcVQeDj(iK^9tf53TA`^@;hDjZyWAEGxgT}YO!SLl&
zQEloTKlhNh-AojMc44MTKuJZXk|&a+aUvzu&>T~aS55S(RA~AXoim~b*&@?*c)jqh
z`^wEes%q*Y{A`@H**IMXWmlq~Rq^VjQJZVVkFR`kNSOr$7m&6hv^?@m?;8V5d=f8r
zFRV_b@YxY^bNzw|#C?kP6;YPTrLt0yA_^L4MqxEYyDlN)4H52xY6b^D-0=}8EbX)1
zTX+e~yIM#OqL-BP^io1uBi);20VSF=Ar!0tabp{mG=a+iuGsJQge6BF_B@Hm$DnfI
z?v$imbT?)lNib&LlnCOrypU0YtwHVl1DDXZ4lhprEb4vVxM6V8HyI>$JTlgd6o#Sg
zqD^@c$}?3Zo5`bja)Fgns$FBMwn0Z{)-W|G$=cqf5*G})QVNZxYNI;kF3UM>nikzE
zWMi7I8x`dzTHdLQYJbb(Y8a!Y$9dPG(_iEv=R_JV-TvzBvC8^D1GV|<TuL`n8cVwF
zUF*t@UcZPt(vbQX0WwibnxSd*(?4<5fU)xk`zZ)#p=+Yu#RzTCH^ew4`=Da%x!p<!
z4okr4h`Eug-8V)J@_kEogRPYG{%eV-Gw)=#jGKjQOnbiTtC<Z+GOrtLkmqxZR*~_u
z^IF$?AqLLNj}OBE-&dFKDDmjSRb@n3ZQ}w{E5Df<^gTI&)3k5OX9svLnBe_M5H|V<
zJlApoo5NQCC{$xbHAaO3ec$T^PkV3auXn5sWKaYHTQ#j0hPBn+gvXtI3I;#ZR-_0I
zgkQvpn&O(#f_1|BKRa#86(%?3UsGEO@F@$S%W49YSR@sAigp_|PNaXt;?W{6Y=n|C
zA#M_lwFzl`L+{pXuKT%^G|p{kL9n1GM^-8jmw#Z@{$MmLI53$60XJt*#T}PkZ`BTs
zUPIit5;CO0W8s<~xSs;dO9r}*h6pj~*Cl+v&GLL#&;CHLKh#J3K*z$Ecu2S?b4Mvg
zjnxMxwHdH>O`vE6{e<VSi`K_H<7Ehca5t-|UK(4YBt5Y<sX4b}Xuu^e6y3<%m*5^x
z+Hkdjvg*wnAL<HGS4t(w!Rjq67ly08`JQBkA){HdqmWIhI{V_;aK(|Eu(vopUdmZY
zV9yDj?{8B3+JD~1ak}Fvmy`9b9*k~uH|iD&=uMO?c_ouXFr35wEbGZej=OQ$=s{#W
zs^~JyzKM>vc`wXJUd(s};sgS_c=fG|N(`wS@+b}~k?9~LmGu5Kmy6(a{aAdJKqlgq
zaY!SxAqMCgsyd?^_AQAn)LDFwC;dCUPQ*B8S-Gfl{UH0|c)2>Dtie`~w&K|R`~juy
zgGTmRK&L6On}raPw4Ws*_0$dXzD9LPh_BJ88bUVAY$KldR$U5GYOL^zw;+jVA51S^
z1CkoBiLS83&$#_!4oZEXs<(%*MgkE4ufGVFpVWf_fLl3zRR}bkfCCg@1`qJh`=MR{
z2P;DOyi7z!k#@E!OUcAj)Fk8RBqI_!GSl#t8}XPRWRnKoMxfiF;gC$k;zy{qup}oI
zwvt3dkQ}b-1;{;1Am#6GjPPy}1*u}#V-1L?OtJ$72I-E5bVZqFp(48wM>EM$fNu^K
zX}_#Cj{{Vx`0vRj&ghTG)4~znudsFbhYdZkO4UA>AMaMf%6TXNk`0d9EdWb{qOc+o
z*$}@%fLVVArGp_-BWd;PY4z0*YN`N7CY;{IlTAnYmp~H6K<N^Q(u68x8BBwqvjKFH
z0zyns5=wy;+(8uU^SdPm?d>{>iHAKmwAv+Ro;-GXZv8YSk(X;8<P#*-;U!7RB$g6T
zpbI?ju6SJ(6et1rRe>%iurw-+>m%aCT`YOgX_O=lkvi7*#p?BxT-hg)<WQHg_%oe&
zz^V$HUIL`~;!J`Am`CFez$xs;jvXp-0`9wBbX#JC;I);wv|el`pzzKv*3wI7$@9CB
z==g4dU`uosjC2xzY#9ihG;et+Coay-Mv-?Wq90A+G}MoFRw%oQDV*>OlTkGFUCo)C
zR4QImqAuYq=*Pb)qa76TdLxY9PfAHA+et~upc{@;RO3mX6~-rwOYuPXJtIPawLlik
zVgzei3a1h%aW4+A6u|wPVWtZBxSX7?b_kfOq5}F*-plMZBfz7?-Y(NZR1Zl%d+<mJ
z=-O{fOfnkI0@?9)gn>L2y`=6(IUqtCPvZgSA=RPYIaHL%03KDIP}HWs)_nxq;KnVC
z_3>28p`(<rlBl*qw-_@B78<yI-gq9?B8&}bNaySExcw<-4KFGD9qWVDgBQf$6X^g|
z0p~}#IOAosckJAmY@VA5jszV1_#!?b6R-wwWOt+r0Nxai<9i|;O#rYID6a&LN(T}E
zLPW4Xu@vRHUHOg0tvK#ArP4AbSqK11FT<aU<KBmq+<uY=DMfh$FtK@~lh<V8vt1JO
zK`{X4t#Go*5u3bxQNUceXdLNX0@tNO73U$cU65VDP+huK+&+8N4Xh3Q9H*G6q7zod
zoDdicSX0ldmk~Tib*w+Zn7U%LgizyI!CoOk#=xab9GXg%^NP3dj;gr5Bp+}D8|+#r
zheP{+y#yUapj=^xDV3LCNF%Csq;wW76F8ERg14i>m;~Vw+||%-R8=y5F9lxHTg@s2
zH=9RTOXHHM@MlIfBt4|HD-0bBbKbyaVQZPTv%IMxDWZ;QViW1GJy`f&`lTEy(vAYR
zX@K#+IYJvj6b#misKBXRFq2Hz6KQ9yuysAtb;BEVBivWU-ryJ!r2pUX$M66C&t&R<
z&OZL+{hzX``tRTWsWak#{!7@J+L{Nj=Ei2mz>Y<=>GmJ6wSd`YW?--r17&AG7qDYp
zjWONh7jzhc1%SYy@KBnGzTiGbCqd*e00Gbd0#Mw(i+h9xTkbX9@%aMGj0^<BwpaSw
zeSLoPtCQHcoGEp?#Q!mH9>JmE002_AwX&yIn8&tG+SUP4;lVr0m$x<1{m_nv?6`Ol
zL$?obTa$LQ&#zkc$2z}i%8vF74D#I8JI5UC8R)sAd$)CJWQ5nYhVI$cDUp6&QQLZA
zTZ;xn1p003^_{$dUT$Fk0K@Do5BKu$-PSt|787bqGuYPJ0D!{y{6@R~M(@Nh-Z`ni
zo&TmtCTj?qdPN0zg@?;gcfOK_dhSen40a2O0f1l6`3Lx&vK8DeWHm*ynwp%Fyy9;P
z>c33<Z?aRjzp7Q6A9V(DJoxLfKU(i_831UkZI?~vUzfQT0Kko803c2Ob(v@h0I+S>
zTg$`WoDauNd-+WeQ9mya`JDp&3xB%8e}mubPkv`}e<_}wu^vAL73`GTPB5>Xu&lvu
z9y<d^{;m=Kk2C)9amdoVyuEf}BYFwiZ@03YVKWAYgFO9ye7E-t`p+uyf0*s>__bYc
zL#X%;5D&@&*oQ;_`tt(-Mqmb@&PCfP;9u%(5858sx$+zY7JqH`KLCHfRY=Cpzc4?a
zANdSuwmVZ?BY#c%VXg-Um;g3_2yg-XfCwN7$N@@#`u6>w0vG}2+s{_EfFp1K@Bn;)
zKp+%|0%C!9AO$!DWCD3WAy5od05w28&;;B7ZUNmuA8;QS0VaVNU><l0yakql&%ow(
zM}`DhKmy1G3V>pu45$QZfV)8>a1TfW9YI&n2Mhuuz*sO5JOyThg<vUI12%$fU^h4b
zj)G6XXW$aJ0&YN{5DbI};e&`nc0n{CdJqeUEyM-l0||i~fh0lBK+ZwRAa#%yNH^p@
zWD+tDc?(&C0#Ifs2UG|u2i1TYK&_!pP;Y1`^cXY^nh!05)<fH&{m^mfJoFv(D+~c6
zzyx7(FfEuV%ns%O3xOSjrNatg)vy*=FKit447LpW4rhV$!e!u^a5MNmxDPxEo&wK@
zUxGKo@4_eHFX5jN2m}X00-=sDMK~h-5l0c}h>M7;h%Uq^;yGdsi9~WCWso{ZYor@8
z9GQYFK-M8|Bgc?0k?SaClmJQzWsGt{1)&m9`KVe{Cu$6}h}uMB(PC&#v^Clj9fQt5
zSD@R`5795tn@l(+2__vTTPA;|c&2kq^-On}W|>x*nVE%|$;>v)e#~^{bIc9Q_n4nC
zf5qT2(ij7bGbRFa22+LU!aTvOvaqm-vrt%^Si)J(u+*^JVVPrDXC<)8vzoDbvL0tW
z&)UK|#`>NO%_hdC$99122wOheHMWOr@33gBIMx8`hCPNok8Q&~#;)NAI7OT_E)bWF
ztHllAUgME?al8@U6Q6`H$KSy}CqM}z1OtKxA(2o)xJ!6RL=Yv2W<-DDDdH94Fmah3
z&#uC5&mPTwp1p&8o&(Au&SAz8z>&ex#PNt@gOiU_kJF3uBxgP680Qxf4~atZBBhb8
zk|s$TT!LIiT!*-_xNdMg<%V%fbK7u7aTjsl<$lLQ<k8~s;7Q|Y;+f`!@JjR2c#ray
z^FH8R<KyQu;S1&~;Jd^3j-P{{!tc+Y%iqbrBtQ_@E#N1RD{x!jjUc<Ao?w9BIl*4R
zWg%W6Q=tf<QlVj?O<@UPJK+T3tHMu3m_#&0yhU<FdPJ5*1w<`HV?{5EPK%+%G{k(x
z&WiPmeG!)scMv}zenb4V1WCe7;)uj$iCIY&NnObh$uh|aDTI`U)FG*hQX|q3X;o=o
z>GRSLWgs$YGJY}_WkzM;vSisH*)rM3au_*1xk$Ooa?j*B<oC!Y$ls8Eze{wN)2^&t
z{ky&^s44^~R4B|S;uXym6BOGOSCpicJe1BWO(?S{8!I1IZdLxMBBSD^Qlv7aN>H^_
zJ)zp8`iq*nTBusR+LF4cx~uvH^~V}S4XQ@E#yv8etWQ2pzD543siqmO*`)bFOHS*M
zR;|`+Z3%5J?F#MZI>I_`I;A@Ey9IZ<?k?FquPdbMrdy`FKoOyMQZ7*z^`!Lt_3HHA
z>nrGo>No3uG0-%KGw3pe8k!iU84erajqHpHjpmGnjeU$S8!wxvnjAIhGKHI3m}Z$i
zHsdq%Fsm_JHdi-~Gw-#)SnRbZv{=|9y(e@}yCuZZ+%m^<)=JDO$m)hQU~OidWBrsW
zK@Fkav_aTVZO+@gqAAj1Y5jW%dk^ld-TT>A-!{W`#!k{M!mh`j&EDC*#{P?gp+mOA
z{JvfL;`ZHl<aYFPY;{69**jfwTH9~5KX3m_XI1AE=SMCQF3~On2e=Oe9OyX6cF^tM
zHCMQ+gKMqpH#cjyGPgB%GxrPb%N_<EXFc9}Qap1#m%Mbmvb`3)b-c5^U;F6z<oGQ4
z>iXvUzVkEiEA;#5Z|Yy{|K*VNp{he$0S*CI15tslfo(zfphH2uhxrdjA07>s2~G)~
z577+C3t0}e2)z^rhPi~bh7-3RrXEB{MkGf(i`*S~K5{+EKI&RDE;=asL5y_F$(Y3>
z#z!iT!j5_z?THnNjgNg6rx#ax3_Rw3tmnAM@ucG~=_d5*c&7M6@k0p;3E2ss5*-rT
zllYS8Nzao_k}s#Qri7+EKB0A@I2D%ampXh>`DDS#?`fWCgQpZu<)8YN?vXxtTJiL`
z(_3e}&kSd%WfWy1GJ`T7W$9*BXXCPuWIxZb%xTFL%uUPvly@+1AYUcF_$<@eh_mzO
z_MB@i5G}|o_*Up!IC)<G{M8G*7fxRIa?$hRSP`YDzL>B0RPjcMU&&OdNoh-&cv*fq
zqCB$vRfT;;f2Brc%_Z(jr!M_c6;w4}O{?y$QLm|~<*m)Q47nU}d8y91ZsdyLmDYN>
z`qHZ$S5Gwn4G|4*8eJP7HCZ(ET+_H#e_ibQg=Ru?S_{|`)3SWS_r`pyW9w*}d0S7r
zR(tbJ`I}X@gl?VhVDHH2Wa>=n+`4___F7kP*Sl_??&m!RduHzJyED;i(>r|E;_kgZ
z<Gwrndi}TW>D;?DpgGVss4;lszS{kk2dWR6hg64}ht-B#9;!cV9U+gjk7|#0j_Hnd
zj~kBnO_)vGpR}4BePs7&>ap|V`6<t-*G~eTe4LJ)-khP&!e`T-VxQ*E@y?a~B=ytP
zdA0eDXNJ!nEbLvFdG7K2?TfG%-(DuYVtJLnD6m-bTIuzzCF7-$H~Zhbd>j0B^Igi%
zxSub)mwbQy1Lebm<$cR9KZbtXT1j8!TCMt|@~LNyx;FPY@bl)Ev~{la>aQAK`!^gm
z7B{25A-|pbMe3LK?-t)@w*t4ewq^hW0EIvx5pdM@oe7ObF=2=-7-nV+7oNaI<l`3L
z=i}z(6%>`15EPab;pLT7my+EH2c#k(LDtbw(w0|NQQFxEh(@C^%oq|23rT6avsC(r
z+3EstD1Zh8K|x^vf&-yAaH|*K-F~Kl@B9w>3kU!TgCju{WII(A3xH546at69p)lx=
z2OtO(2EcI$Aw|3%k|1p3MvNCx(hn(h&uV1npp7brc5i3n1_3DeHyiym8)7?61P4GM
zAPfS5{x%T@!wV_u*}w@(A*EZ>00s(fA0iY7=mMq3Rxe$3P<wel=3Wyi#F6Et=!X`a
zrJ2s#@f_v_E5*TZ4<^BM53ZRU8&!DrDEFs@!rYdFv|v)7`I+O2!wQm?r}nN?n%{^M
zJZ3tWy%N@b`~_G`R<;<Fs?SM!TlPYMKArZ^l+qu!-BZ508@2jMJg{Se3uVO{8$jrM
zaXjtpGw*bnMDay=Ws6lJ%<I;f5}GcR|7&^cM)u_4R^5Qt`_5gQI1=jIA6Mhh(8uqX
z?cdvW$uXzO{rcc}R%CAD&1BIFa9+$p%{$G4YBou;wB#no*GqlJtY;T8*6OZT;_ESr
zi!GZ5UV<6aUk<wEd}c4QZY+~&xm)Vu?heULs@tWNp8ok&+igm&Q!M;Q7|qOm_)g^d
z6?B;B73o1G!0Cpr+ss1I#B`T)xzc^yOyIqjdU@IU@%@)u6rEeANonUoXR>GD{n%+o
zzn%oF6>9O~*V?LgfzF;!C%HrSVIQyiM|e!=G(<^g`J}x|zSJsKKk^_>ZMa%Lp<d|O
zdd#O%os(ZR9?oTb#4mY!drCM3GRN^*w$8Dlc^5lu_C0%AX_Wu?5$a>HpqxCIT+{_Q
zepm7E_(_)q8TA^bQ@Gi$L4b8Z#`-sY<yDuPBe&Mk*T*?^oLAMk_EcJ=T(v!`Bh{}}
zw7z@Npr-QDN7dAKl~%JogD$Ze9K^ciY;xI>rV~N!SZnctT+;VY4^Hy}T6^li7mdE3
zRQT|+)lt!Vi&o5;D@vubiJPYzbl=>Rl~WqGe(lIQcjfcjTV5*s5kb4+CZ_imuY?$H
zq&;*Uw_ks4*GXRG)v75ecbN89or|3~xQj(C?<TKM$_xopP9_g8Y6#p_j~V~Mocq{8
zQc;S2wcE3(DE__mM<Z=ad3S`2CFQ)x!-xiltU<jGg|*lH%s#s~)dZU1uQcJC$%_|S
z2OomE;|=9N;oDONEN6Kg%n5C(5=t|Mxh-R~q@+@9F%h@Vbs4=fdwdQbbXa@iwxE=h
znEt#7;s2rce)*8o6KC?EZ?c%19B*EgNXVwWotoF9w-IMf6d&1(qJA3y^~eLiw0@Vl
z!7M8eMc;31JCy!QkH4Lq;skYy2`$J=xcy3yRX6R{_4T8Oj~@6ffD1t}Kj&yq%=O55
zXWj6#OJa~!eJYPjqfAq?2&TQ*EChN10wT4GzS#`*IO_;ho_c-8F!~BTe@tV>&HNQR
z?+UZiEv*}l3+nP=QqH|KGPL$n@l42|i`9pzb603{`4jsFm8K7xpE|u#_aaZAXl5a&
zQ=ua`R$M!T)YMrgGjW#2CV)t+f9%_S#x-cRXTkj3>%Gq;giKD;XG1Q;J{IqqwxFLG
z3fKZ-=8BTJ*2D>xU$5@YRABRz2yFXF#jNJ~_5F9>khg$6nfN<?@&j+s`dD(8z~$5Q
zvMcC{sd0|r{MiVr&fK%Kdb~+P|Ch@a?~=P)I^W9GSk-8lTErdwmd4XlUi83xmFcm#
zsoibrl@_i8_&cYTXb3IB!*~8_38VE7J4}wanNNvo=B~kg;u1~-#_Jv~te<QUHz~>+
zI?Z=NRHDZ6dM5g(!&4uJ0-SWMpUOVk@9tv36nnMa{83$I!UZ>t4_%jL#b@uyzeZb|
zlAvi`eF>XcE7Il-<kBI_+I{0i`WPQC)1#tF_XZP8q;<KvHb>|7l2FN1|Me(xe$#o6
z?i;u_-CDag{FkLKA{uY9@a#!@`OK?N&;8(}#`9l9P^)SIMKQya>c($e=X(1_<!Qx%
zv+(x84U3}}-sufbHj9qelzvePYF#Y5YB^<76<AD}Xj3BT-$w1$ldEbn2Bxc=pWV=$
z{ubr5O1qA=`9Mq7fQwu|kPiQuP3?I!R<6ZprtomJ)Y`7qfXFwbMS&sW5*yR>4IPeW
zItc}4QXyumq0|!VkRku4P;%E$aN38qL>Y3|V^eGXuO)JBSH!0l<q6pACYy;9#L_P_
zTB8$PTfkV`r>DCkb@-gU>F?Wh`e%*i-fENO$!`M08gKM{`%-qr@kNEbsgsY{`TN#S
zn`Q0VpVu<`H50nXu#BIZNqrsr^Voat)7ARRD@8)iOx2|<E_lsNzG|4Bc&-=iHkPfK
z5*jnhUDx!}RnDVNyr*(+%G*fOcqO>B@(5EQcKZwODHE4TZvzj!Nb2P{o133+Z37K8
z2?%p2WSU!Dc8F`u(-C(?d){ob5XqR4kl3`d<uMtVu|2@dX=j1MuhyWKm_%wUB^tUN
zF6X4_rlo#dQ03oc>Xn-^h7Y47fci+$gtD1|m9u^mZFZ8mc>t}%q*Y}@l<mms?30cO
zr_%5ZJG;~O*yV1-*9<=3THJ5=Y3~3#Uu7aKix$Nt(LGoARruo7Wa{S0OZE>7-91xy
z!^88AAgm?}eiC`}bnlDGduGY(K3f3yBmHb+EAtb;^RHLzCPAubYjR74OoD>nvtuj~
zD~*Xjo9|M_+!H@5vRK9K(Fqd@ZQxt^g^+>rSF&nP`Nt7b<`SJm&0E)!cL7;hU7s%}
z28P^Bk5PP~HY3}XvFrZ8Qa2K*ogG(w$j0ARKhon`L3sO&7j8^>th0QU<s|8Y(_~YT
zup_N(Hr{W#>|=C?+UlMw-B@A`*Qd%mnXE@wd~e@5Kk+rhOO;&yX!_w*WZ1>m%od6f
z-0@1(nG7YDZ?O{S0px|x0>4}_9zZ#jemxX+WfE^|95OtcW7lFPSN-Nt?%b=G?`kz2
zz53L<!{*qW%*>AJykhpN_k6|7&NRcJ6E^qyiE#6l!D@@^F~Jl2`74Hm_;)=W%kMrZ
zAVj%hu)B0N*6wDJYBe!Vr-~$U`9Ty}z|E00vOaNdety+_+2qX2qJ-<wlU{Lq$~^rP
zb4%aa51L!gg#A+8$99tYfKv}H6exP5Pu~LAUwmpcVc*SLS=w7v9>1@C{q=5-Zl`z2
z865oglXtWCs9)sRYbCmjzp|t`Z%S5uS>4|08C=n@G2IiKo#(->#+K$VWdROIXU>Jv
zmWGdgOY8ciZjm1DTU2!JR$uI~49fk&+{H=TF^R;iNyl%x_!8$_><8y4#hgbbR&nt)
zR{k1`$CX89?GBAu29I{8y_v}qwd(MXXOYfeH?_SzGJQsQ3kWAZeR_H5Da)P}g;$Un
z2{Dl^z^##dH}Yuai#eWF&RHg_DN@(w-oBUqh8a2-L9O%%SbXyl_N8eTW^%ty#o13v
zfqf#%FO_mjb=fDazt^%IsK|I<>*jPieWkW+%wlA0a-!Ya&OA^0QEXQYt<stBI?Spn
z(L7H^inX6dLVMg_rG_Ryc>kk`lf>o1b2IfIy_u~;+IEprz}L?j+AJ_Te%D01(6)Az
zs~Bz)H>6T25N4idgZJ5b@}Iw#``7aO??3-k>(3wjS^S^h`+uq_Dl*1@|4U%_e=__(
z8UCLP|Igoi|Nm!NfBxW4<G(5Vef%F)1;+gUe+~cN`G5WzbKoDe|NQNowLh}{{L4oF
z{hUAl3){|rz^+sM|E68%ziHRU0QjT+|DS68`GY^{|Np@MQ$<}_jnV)AD`5D4{_p1Z
z*Z)7&`tt{Wa{a5S{cilHiaNvp;a>y8|C8bW$?*SV_<u6|KN<d?4F6At|0l!$li~mQ
z@8<u>u>WMhfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM82oSMKL9I<xXJ*)
FFaS(TVi5oU

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/kepler.patch b/trunk/package/luci/libs/nixio/axTLS/httpd/kepler.patch
new file mode 100644
index 00000000..dbab7e50
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/kepler.patch
@@ -0,0 +1,64 @@
+diff -Naur kepler-1.1/launcher/cgi/Makefile kepler-1.1.new/launcher/cgi/Makefile
+--- kepler-1.1/launcher/cgi/Makefile	2007-04-21 06:41:49.000000000 +1000
++++ kepler-1.1.new/launcher/cgi/Makefile	2007-05-16 22:13:38.750000000 +1000
+@@ -16,7 +16,7 @@
+ 
+ 
+ $T: $(CH) $(OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) -L../../lua-5.1.2/src -llua
+ 
+ build: $T
+ 
+diff -Naur kepler-1.1/luafilesystem/Makefile kepler-1.1.new/luafilesystem/Makefile
+--- kepler-1.1/luafilesystem/Makefile	2007-04-21 06:41:49.000000000 +1000
++++ kepler-1.1.new/luafilesystem/Makefile	2007-05-16 22:06:25.546875000 +1000
+@@ -12,7 +12,7 @@
+ lib: src/$(LIBNAME)
+ 
+ src/$(LIBNAME): $(OBJS)
+-	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
++	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -L../lua-5.1.2/src -llua
+ 
+ install: src/$(LIBNAME)
+ 	mkdir -p $(LUA_LIBDIR)
+diff -Naur kepler-1.1/luasocket-2.0.1/src/makefile kepler-1.1.new/luasocket-2.0.1/src/makefile
+--- kepler-1.1/luasocket-2.0.1/src/makefile	2007-04-21 06:41:49.000000000 +1000
++++ kepler-1.1.new/luasocket-2.0.1/src/makefile	2007-05-16 22:36:37.125000000 +1000
+@@ -47,10 +47,10 @@
+ all: $(SOCKET_SO) $(MIME_SO) 
+ 
+ $(SOCKET_SO): $(SOCKET_OBJS)
+-	$(LD) $(LDFLAGS) -o $@ $(SOCKET_OBJS)
++	$(LD) $(LDFLAGS) -o $@ $(SOCKET_OBJS) -L../../lua-5.1.2/src -llua
+ 
+ $(MIME_SO): $(MIME_OBJS)
+-	$(LD) $(LDFLAGS) -o $@ $(MIME_OBJS)
++	$(LD) $(LDFLAGS) -o $@ $(MIME_OBJS) -L../../lua-5.1.2/src -llua
+ 
+ $(UNIX_SO): $(UNIX_OBJS)
+ 	$(LD) $(LDFLAGS) -o $@ $(UNIX_OBJS)
+diff -Naur kepler-1.1/md5/Makefile kepler-1.1.new/md5/Makefile
+--- kepler-1.1/md5/Makefile	2007-04-21 06:41:49.000000000 +1000
++++ kepler-1.1.new/md5/Makefile	2007-05-16 22:06:44.593750000 +1000
+@@ -15,7 +15,7 @@
+ 
+ 
+ src/$(LIBNAME) : $(OBJS)
+-	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
++	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -L../lua-5.1.2/src -llua
+ 
+ $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+ 	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+diff -Naur kepler-1.1/rings/Makefile kepler-1.1.new/rings/Makefile
+--- kepler-1.1/rings/Makefile	2007-04-21 06:41:49.000000000 +1000
++++ kepler-1.1.new/rings/Makefile	2007-05-16 22:05:28.765625000 +1000
+@@ -10,7 +10,7 @@
+ OBJS= src/rings.o
+ 
+ src/$(LIBNAME) : $(OBJS)
+-	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
++	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -L../lua-5.1.2/src -llua
+ 
+ install:
+ 	mkdir -p $(LUA_LIBDIR)
diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/proc.c b/trunk/package/luci/libs/nixio/axTLS/httpd/proc.c
new file mode 100644
index 00000000..3c897c98
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/proc.c
@@ -0,0 +1,1238 @@
+/*
+ * Copyright (c) 2007-2008, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <time.h>
+#include <string.h>
+#include "axhttp.h"
+
+#define HTTP_VERSION        "HTTP/1.1"
+
+static const char * index_file = "index.html";
+
+static int special_read(struct connstruct *cn, void *buf, size_t count);
+static int special_write(struct connstruct *cn, 
+                                        const char *buf, size_t count);
+static void send_error(struct connstruct *cn, int err);
+static int hexit(char c);
+static void urldecode(char *buf);
+static void buildactualfile(struct connstruct *cn);
+static int sanitizefile(const char *buf);
+static int sanitizehost(char *buf);
+static int htaccess_check(struct connstruct *cn);
+static const char *getmimetype(const char *name);
+
+#if defined(CONFIG_HTTP_DIRECTORIES)
+static void urlencode(const uint8_t *s, char *t);
+static void procdirlisting(struct connstruct *cn);
+#endif
+#if defined(CONFIG_HTTP_HAS_CGI)
+static void proccgi(struct connstruct *cn);
+static void decode_path_info(struct connstruct *cn, char *path_info);
+static int init_read_post_data(char *buf, char *data, struct connstruct *cn, int old_rv);
+#endif
+#ifdef CONFIG_HTTP_HAS_AUTHORIZATION
+static int auth_check(struct connstruct *cn);
+#endif
+
+#if AXDEBUG
+#define AXDEBUGSTART \
+	{ \
+		FILE *axdout; \
+		axdout = fopen("/var/log/axdebug", "a"); \
+	
+#define AXDEBUGEND \
+		fclose(axdout); \
+	}
+#else /* AXDEBUG */
+#define AXDEBUGSTART
+#define AXDEBUGEND
+#endif /* AXDEBUG */
+
+/* Returns 1 if elems should continue being read, 0 otherwise */
+static int procheadelem(struct connstruct *cn, char *buf) 
+{
+    char *delim, *value;
+
+    if ((delim = strchr(buf, ' ')) == NULL)
+        return 0;
+
+    *delim = 0;
+    value = delim+1;
+
+    if (strcmp(buf, "GET") == 0 || strcmp(buf, "HEAD") == 0 ||
+                                            strcmp(buf, "POST") == 0) 
+    {
+        if (buf[0] == 'H') 
+            cn->reqtype = TYPE_HEAD;
+        else if (buf[0] == 'P') 
+            cn->reqtype = TYPE_POST;
+
+        if ((delim = strchr(value, ' ')) == NULL)       /* expect HTTP type */
+            return 0;
+
+        *delim = 0;
+        urldecode(value);
+
+        if (sanitizefile(value) == 0) 
+        {
+            send_error(cn, 403);
+            return 0;
+        }
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+        decode_path_info(cn, value);
+#else
+        my_strncpy(cn->filereq, value, MAXREQUESTLENGTH);
+#endif
+        cn->if_modified_since = -1;
+    } 
+    else if (strcmp(buf, "Host:") == 0) 
+    {
+        if (sanitizehost(value) == 0) 
+        {
+            removeconnection(cn);
+            return 0;
+        }
+
+        my_strncpy(cn->server_name, value, MAXREQUESTLENGTH);
+    } 
+    else if (strcmp(buf, "Connection:") == 0 && strcmp(value, "close") == 0) 
+    {
+        cn->close_when_done = 1;
+    } 
+    else if (strcmp(buf, "If-Modified-Since:") == 0) 
+    {
+        cn->if_modified_since = tdate_parse(value);
+    }
+    else if (strcmp(buf, "Expect:") == 0)
+    {
+        send_error(cn, 417); /* expectation failed */
+        return 0;
+    }
+#ifdef CONFIG_HTTP_HAS_AUTHORIZATION
+    else if (strcmp(buf, "Authorization:") == 0 &&
+                                    strncmp(value, "Basic ", 6) == 0)
+    {
+        int size;
+        if (base64_decode(&value[6], strlen(&value[6]), 
+                                        (uint8_t *)cn->authorization, &size))
+            cn->authorization[0] = 0;   /* error */
+        else
+            cn->authorization[size] = 0;
+    }
+#endif
+#if defined(CONFIG_HTTP_HAS_CGI)
+    else if (strcmp(buf, "Content-Length:") == 0)
+    {
+        sscanf(value, "%d", &cn->content_length);
+    }
+    else if (strcmp(buf, "Cookie:") == 0)
+    {
+        my_strncpy(cn->cookie, value, MAXREQUESTLENGTH);
+    }
+#endif
+
+    return 1;
+}
+
+#if defined(CONFIG_HTTP_DIRECTORIES)
+static void procdirlisting(struct connstruct *cn)
+{
+    char buf[MAXREQUESTLENGTH];
+    char actualfile[1024];
+
+    if (cn->reqtype == TYPE_HEAD) 
+    {
+        snprintf(buf, sizeof(buf), HTTP_VERSION
+                " 200 OK\nContent-Type: text/html\n\n");
+        write(cn->networkdesc, buf, strlen(buf));
+        removeconnection(cn);
+        return;
+    }
+
+    strcpy(actualfile, cn->actualfile);
+
+#ifdef WIN32
+    strcat(actualfile, "*");
+    cn->dirp = FindFirstFile(actualfile, &cn->file_data);
+
+    if (cn->dirp == INVALID_HANDLE_VALUE) 
+    {
+        send_error(cn, 404);
+        return;
+    }
+#else
+    if ((cn->dirp = opendir(actualfile)) == NULL) 
+    {
+        send_error(cn, 404);
+        return;
+    }
+#endif
+
+    snprintf(buf, sizeof(buf), HTTP_VERSION
+            " 200 OK\nContent-Type: text/html\n\n"
+            "<html><body>\n<title>Directory Listing</title>\n"
+            "<h3>Directory listing of %s://%s%s</h3><br />\n", 
+            cn->is_ssl ? "https" : "http", cn->server_name, cn->filereq);
+    special_write(cn, buf, strlen(buf));
+    cn->state = STATE_DOING_DIR;
+}
+
+void procdodir(struct connstruct *cn) 
+{
+#ifndef WIN32
+    struct dirent *dp;
+#endif
+    char buf[MAXREQUESTLENGTH];
+    char encbuf[1024];
+    char *file;
+
+    do 
+    {
+       buf[0] = 0;
+
+#ifdef WIN32
+        if (!FindNextFile(cn->dirp, &cn->file_data)) 
+#else
+        if ((dp = readdir(cn->dirp)) == NULL)  
+#endif
+        {
+            snprintf(buf, sizeof(buf), "</body></html>\n");
+            special_write(cn, buf, strlen(buf));
+            removeconnection(cn);
+#ifndef WIN32
+            closedir(cn->dirp);
+#endif
+            return;
+        }
+
+#ifdef WIN32
+        file = cn->file_data.cFileName;
+#else
+        file = dp->d_name;
+#endif
+
+        /* if no index file, don't display the ".." directory */
+        if (cn->filereq[0] == '/' && cn->filereq[1] == '\0' &&
+                strcmp(file, "..") == 0) 
+            continue;
+
+        /* don't display files beginning with "." */
+        if (file[0] == '.' && file[1] != '.')
+            continue;
+
+        /* make sure a '/' is at the end of a directory */
+        if (cn->filereq[strlen(cn->filereq)-1] != '/')
+            strcat(cn->filereq, "/");
+
+        /* see if the dir + file is another directory */
+        snprintf(buf, sizeof(buf), "%s%s", cn->actualfile, file);
+        if (isdir(buf))
+            strcat(file, "/");
+
+        urlencode((uint8_t *)file, encbuf);
+        snprintf(buf, sizeof(buf), "<a href=\"%s%s\">%s</a><br />\n",
+                cn->filereq, encbuf, file);
+    } while (special_write(cn, buf, strlen(buf)));
+}
+
+/* Encode funny chars -> %xx in newly allocated storage */
+/* (preserves '/' !) */
+static void urlencode(const uint8_t *s, char *t) 
+{
+    const uint8_t *p = s;
+    char *tp = t;
+
+    for (; *p; p++) 
+    {
+        if ((*p > 0x00 && *p < ',') ||
+                (*p > '9' && *p < 'A') ||
+                (*p > 'Z' && *p < '_') ||
+                (*p > '_' && *p < 'a') ||
+                (*p > 'z' && *p < 0xA1)) 
+        {
+            sprintf((char *)tp, "%%%02X", *p);
+            tp += 3; 
+        } 
+        else 
+        {
+            *tp = *p;
+            tp++;
+        }
+    }
+
+    *tp='\0';
+}
+
+#endif
+
+void procreadhead(struct connstruct *cn) 
+{
+    char buf[MAXREQUESTLENGTH*4], *tp, *next;
+    int rv;
+
+    memset(buf, 0, MAXREQUESTLENGTH*4);
+    rv = special_read(cn, buf, sizeof(buf)-1);
+    if (rv <= 0) 
+    {
+        if (rv < 0) /* really dead? */
+            removeconnection(cn);
+        return;
+    }
+
+    buf[rv] = '\0';
+    next = tp = buf;
+
+#ifdef CONFIG_HTTP_HAS_AUTHORIZATION
+    cn->authorization[0] = 0;
+#endif
+
+    /* Split up lines and send to procheadelem() */
+    while (*next != '\0') 
+    {
+        /* If we have a blank line, advance to next stage */
+        if (*next == '\r' || *next == '\n') 
+        {
+#if defined(CONFIG_HTTP_HAS_CGI)
+            if (cn->reqtype == TYPE_POST && cn->content_length > 0)
+            {
+                if (init_read_post_data(buf,next,cn,rv) == 0)
+                    return;
+            }
+#endif
+
+            buildactualfile(cn);
+            cn->state = STATE_WANT_TO_SEND_HEAD;
+            return;
+        }
+
+        while (*next != '\r' && *next != '\n' && *next != '\0') 
+            next++;
+
+        if (*next == '\r') 
+        {
+            *next = '\0';
+            next += 2;
+        }
+        else if (*next == '\n') 
+            *next++ = '\0';
+
+        if (procheadelem(cn, tp) == 0) 
+            return;
+
+        tp = next;
+    }
+}
+
+/* In this function we assume that the file has been checked for
+ * maliciousness (".."s, etc) and has been decoded
+ */
+void procsendhead(struct connstruct *cn) 
+{
+    char buf[MAXREQUESTLENGTH];
+    struct stat stbuf;
+    time_t now = cn->timeout - CONFIG_HTTP_TIMEOUT;
+    char date[32];
+    int file_exists;
+
+    /* are we trying to access a file over the HTTP connection instead of a
+     * HTTPS connection? Or is this directory disabled? */
+    if (htaccess_check(cn))      
+    {
+        send_error(cn, 403);
+        return;
+    }
+
+#ifdef CONFIG_HTTP_HAS_AUTHORIZATION
+    if (auth_check(cn))     /* see if there is a '.htpasswd' file */
+    {
+#ifdef CONFIG_HTTP_VERBOSE
+        printf("axhttpd: access to %s denied\n", cn->filereq); TTY_FLUSH();
+#endif
+        removeconnection(cn);
+        return;
+    }
+#endif
+
+    file_exists = stat(cn->actualfile, &stbuf);
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+
+    if (file_exists != -1 && cn->is_cgi)
+    {
+        if ((stbuf.st_mode & S_IEXEC) == 0 || isdir(cn->actualfile))
+        {
+            /* A non-executable file, or directory? */
+            send_error(cn, 403);
+        }
+        else
+            proccgi(cn);
+
+        return;
+    }
+#endif
+
+    /* look for "index.html"? */
+    if (isdir(cn->actualfile))
+    {
+        char tbuf[MAXREQUESTLENGTH];
+        snprintf(tbuf, MAXREQUESTLENGTH, "%s%s", cn->actualfile, index_file);
+
+        if ((file_exists = stat(tbuf, &stbuf)) != -1) 
+            my_strncpy(cn->actualfile, tbuf, MAXREQUESTLENGTH);
+        else
+        {
+#if defined(CONFIG_HTTP_DIRECTORIES)
+            /* If not, we do a directory listing of it */
+            procdirlisting(cn);
+#else
+            send_error(cn, 404);
+#endif
+            return;
+        }
+    }
+
+    if (file_exists == -1)
+    {
+        send_error(cn, 404);
+        return;
+    }
+
+    strcpy(date, ctime(&now));
+
+    /* has the file been read before? */
+    if (cn->if_modified_since != -1 && (cn->if_modified_since == 0 || 
+                                       cn->if_modified_since >= stbuf.st_mtime))
+    {
+        snprintf(buf, sizeof(buf), HTTP_VERSION" 304 Not Modified\nServer: "
+                "%s\nDate: %s\n", server_version, date);
+        special_write(cn, buf, strlen(buf));
+        cn->state = STATE_WANT_TO_READ_HEAD;
+        return;
+    }
+
+    if (cn->reqtype == TYPE_HEAD) 
+    {
+        removeconnection(cn);
+        return;
+    } 
+    else 
+    {
+        int flags = O_RDONLY;
+#if defined(WIN32) || defined(CONFIG_PLATFORM_CYGWIN)
+        flags |= O_BINARY;
+#endif
+        cn->filedesc = open(cn->actualfile, flags);
+
+        if (cn->filedesc < 0) 
+        {
+            send_error(cn, 404);
+            return;
+        }
+
+        snprintf(buf, sizeof(buf), HTTP_VERSION" 200 OK\nServer: %s\n"
+            "Content-Type: %s\nContent-Length: %ld\n"
+            "Date: %sLast-Modified: %s\n", server_version,
+            getmimetype(cn->actualfile), (long) stbuf.st_size,
+            date, ctime(&stbuf.st_mtime)); /* ctime() has a \n on the end */
+
+        special_write(cn, buf, strlen(buf));
+
+#ifdef CONFIG_HTTP_VERBOSE
+        printf("axhttpd: %s:/%s\n", cn->is_ssl ? "https" : "http", cn->filereq);
+        TTY_FLUSH();
+#endif
+
+#ifdef WIN32
+        for (;;)
+        {
+            procreadfile(cn);
+            if (cn->filedesc == -1)
+                break;
+
+            do 
+            {
+                procsendfile(cn);
+            } while (cn->state != STATE_WANT_TO_READ_FILE);
+        }
+#else
+        cn->state = STATE_WANT_TO_READ_FILE;
+#endif
+    }
+}
+
+void procreadfile(struct connstruct *cn) 
+{
+    int rv = read(cn->filedesc, cn->databuf, BLOCKSIZE);
+
+    if (rv <= 0) 
+    {
+        close(cn->filedesc);
+        cn->filedesc = -1;
+
+        if (cn->close_when_done)        /* close immediately */
+            removeconnection(cn);
+        else 
+        {                               /* keep socket open - HTTP 1.1 */
+            cn->state = STATE_WANT_TO_READ_HEAD;
+            cn->numbytes = 0;
+        }
+
+        return;
+    }
+
+    cn->numbytes = rv;
+    cn->state = STATE_WANT_TO_SEND_FILE;
+}
+
+void procsendfile(struct connstruct *cn) 
+{
+    int rv = special_write(cn, cn->databuf, cn->numbytes);
+
+    if (rv < 0)
+        removeconnection(cn);
+    else if (rv == cn->numbytes)
+    {
+        cn->state = STATE_WANT_TO_READ_FILE;
+    }
+    else if (rv == 0)
+    { 
+        /* Do nothing */ 
+    }
+    else 
+    {
+        memmove(cn->databuf, cn->databuf + rv, cn->numbytes - rv);
+        cn->numbytes -= rv;
+    }
+}
+
+#if defined(CONFIG_HTTP_HAS_CGI)
+/* Should this be a bit more dynamic? It would mean more calls to malloc etc */
+#define CGI_ARG_SIZE        17
+
+static void proccgi(struct connstruct *cn) 
+{
+    int tpipe[2], spipe[2];
+    char *myargs[2];
+    char cgienv[CGI_ARG_SIZE][MAXREQUESTLENGTH];
+    char * cgiptr[CGI_ARG_SIZE+4];
+    const char *type = "HEAD";
+    int cgi_index = 0, i;
+    pid_t pid;
+#ifdef WIN32
+    int tmp_stdout;
+#endif
+
+    snprintf(cgienv[0], MAXREQUESTLENGTH, 
+            HTTP_VERSION" 200 OK\nServer: %s\n%s",
+            server_version, (cn->reqtype == TYPE_HEAD) ? "\n" : "");
+    special_write(cn, cgienv[0], strlen(cgienv[0]));
+
+    if (cn->reqtype == TYPE_HEAD) 
+    {
+        removeconnection(cn);
+        return;
+    }
+
+#ifdef CONFIG_HTTP_VERBOSE
+        printf("[CGI]: %s:/%s\n", cn->is_ssl ? "https" : "http", cn->filereq);
+        TTY_FLUSH();
+#endif
+
+    /* win32 cgi is a bit too painful */
+#ifndef WIN32
+	/* set up pipe that is used for sending POST query data to CGI script*/
+    if (cn->reqtype == TYPE_POST) 
+    {
+        if (pipe(spipe) == -1)
+        {
+            printf("[CGI]: could not create pipe");
+            TTY_FLUSH();
+            return;
+        }
+    }
+
+	if (pipe(tpipe) == -1)
+    {
+        printf("[CGI]: could not create pipe");
+        TTY_FLUSH();
+        return;
+    }
+
+    /*
+     * use vfork() instead of fork() for performance 
+     */
+    if ((pid = vfork()) > 0)  /* parent */
+    {
+        /* Send POST query data to CGI script */
+        if ((cn->reqtype == TYPE_POST) && (cn->content_length > 0)) 
+        {
+            write(spipe[1], cn->post_data, cn->content_length);
+            close(spipe[0]);	 
+            close(spipe[1]);
+
+            /* free the memory that is allocated in read_post_data() */
+            free(cn->post_data); 
+            cn->post_data = NULL;
+        }
+
+        /* Close the write descriptor */
+        close(tpipe[1]);
+        cn->filedesc = tpipe[0];
+        cn->state = STATE_WANT_TO_READ_FILE;
+        cn->close_when_done = 1;
+        return;
+    }
+
+    if (pid < 0) /* vfork failed */
+        exit(1);
+
+    /* The problem child... */
+
+    /* Our stdout/stderr goes to the socket */
+    dup2(tpipe[1], 1);
+    dup2(tpipe[1], 2);
+
+    /* If it was a POST request, send the socket data to our stdin */
+    if (cn->reqtype == TYPE_POST) 
+        dup2(spipe[0], 0);  
+    else    /* Otherwise we can shutdown the read side of the sock */
+        shutdown(cn->networkdesc, 0);
+
+    myargs[0] = cn->actualfile;
+    myargs[1] = NULL;
+
+    /* 
+     * set the cgi args. A url is defined by:
+     * http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME$PATH_INFO?$QUERY_STRING
+     * TODO: other CGI parameters?
+     */
+    sprintf(cgienv[cgi_index++], "SERVER_SOFTWARE=%s", server_version);
+    strcpy(cgienv[cgi_index++], "DOCUMENT_ROOT=" CONFIG_HTTP_WEBROOT);
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "SERVER_NAME=%s", cn->server_name);
+    sprintf(cgienv[cgi_index++], "SERVER_PORT=%d", 
+            cn->is_ssl ? CONFIG_HTTP_HTTPS_PORT : CONFIG_HTTP_PORT);
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "REQUEST_URI=%s", cn->uri_request);
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "SCRIPT_NAME=%s", cn->filereq);
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "PATH_INFO=%s", cn->uri_path_info);
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "QUERY_STRING=%s", cn->uri_query);
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "REMOTE_ADDR=%s", cn->remote_addr);
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "HTTP_COOKIE=%s", cn->cookie);  /* note: small size */
+#if defined(CONFIG_HTTP_HAS_AUTHORIZATION)
+    snprintf(cgienv[cgi_index++], MAXREQUESTLENGTH,
+            "REMOTE_USER=%s", cn->authorization);
+#endif
+
+    switch (cn->reqtype)
+    {
+        case TYPE_GET: 
+            type = "GET";
+            break;
+
+        case TYPE_POST:
+            type = "POST";
+            sprintf(cgienv[cgi_index++], 
+                        "CONTENT_LENGTH=%d", cn->content_length);
+            strcpy(cgienv[cgi_index++],     /* hard-code? */
+                        "CONTENT_TYPE=application/x-www-form-urlencoded");
+            break;
+    }
+
+    sprintf(cgienv[cgi_index++], "REQUEST_METHOD=%s", type);
+
+    if (cn->is_ssl)
+        strcpy(cgienv[cgi_index++], "HTTPS=on");
+
+#ifdef CONFIG_PLATFORM_CYGWIN
+    /* TODO: find out why Lua needs this */
+    strcpy(cgienv[cgi_index++], "PATH=/usr/bin");
+#endif
+
+    if (cgi_index >= CGI_ARG_SIZE)
+    {
+        printf("Content-type: text/plain\n\nToo many CGI args (%d, %d)\n",
+                cgi_index, CGI_ARG_SIZE);
+        _exit(1);
+    }
+
+    /* copy across the pointer indexes */
+    for (i = 0; i < cgi_index; i++)
+        cgiptr[i] = cgienv[i];
+
+    cgiptr[i++] = "AUTH_TYPE=Basic";
+    cgiptr[i++] = "GATEWAY_INTERFACE=CGI/1.1";
+    cgiptr[i++] = "SERVER_PROTOCOL="HTTP_VERSION;
+    cgiptr[i] = NULL;
+
+    execve(myargs[0], myargs, cgiptr);
+    printf("Content-type: text/plain\n\nshouldn't get here\n");
+    _exit(1);
+#endif
+}
+
+static char * cgi_filetype_match(struct connstruct *cn, const char *fn)
+{
+    struct cgiextstruct *tp = cgiexts;
+
+    while (tp != NULL) 
+    {
+        char *t;
+
+        if ((t = strstr(fn, tp->ext)) != NULL)
+        {
+            t += strlen(tp->ext);
+
+            if (*t == '/' || *t == '\0')
+            {
+#ifdef CONFIG_HTTP_ENABLE_LUA
+                if (strcmp(tp->ext, ".lua") == 0 || strcmp(tp->ext, ".lp") == 0)
+                    cn->is_lua = 1;
+#endif
+
+                return t;
+            }
+            else
+                return NULL;
+
+        }
+
+        tp = tp->next;
+    }
+
+    return NULL;
+}
+
+static void decode_path_info(struct connstruct *cn, char *path_info)
+{
+    char *cgi_delim;
+
+    cn->is_cgi = 0;
+#ifdef CONFIG_HTTP_ENABLE_LUA
+    cn->is_lua = 0;
+#endif
+    *cn->uri_request = '\0';
+    *cn->uri_path_info = '\0';
+    *cn->uri_query = '\0';
+
+    my_strncpy(cn->uri_request, path_info, MAXREQUESTLENGTH);
+
+    /* query info? */
+    if ((cgi_delim = strchr(path_info, '?')))
+    {
+        *cgi_delim = '\0';
+        my_strncpy(cn->uri_query, cgi_delim+1, MAXREQUESTLENGTH);
+    }
+
+    if ((cgi_delim = cgi_filetype_match(cn, path_info)) != NULL)
+    {
+        cn->is_cgi = 1;     /* definitely a CGI script */
+
+        /* path info? */
+        if (*cgi_delim != '\0')
+        {
+            my_strncpy(cn->uri_path_info, cgi_delim, MAXREQUESTLENGTH);
+            *cgi_delim = '\0';
+        }
+    }
+
+    /* the bit at the start must be the script name */
+    my_strncpy(cn->filereq, path_info, MAXREQUESTLENGTH);
+}
+
+static int init_read_post_data(char *buf, char *data, 
+                                struct connstruct *cn, int old_rv)
+{
+   char *next = data;
+   int rv = old_rv;
+   char *post_data;
+
+    /* Too much Post data to send. MAXPOSTDATASIZE should be 
+       configured (now it can be chaged in the header file) */
+   if (cn->content_length > MAXPOSTDATASIZE) 
+   {
+       send_error(cn, 418);
+       return 0;
+   }
+   
+   /* remove CRLF */
+   while ((*next == '\r' || *next == '\n') && (next < &buf[rv])) 
+       next++;
+   
+   if (cn->post_data == NULL)
+   {
+       cn->post_data = (char *) calloc(1, (cn->content_length + 1)); 
+       /* Allocate buffer for the POST data that will be used by proccgi 
+          to send POST data to the CGI script */
+
+       if (cn->post_data == NULL)
+       {
+           printf("axhttpd: could not allocate memory for POST data\n"); 
+           TTY_FLUSH();
+           send_error(cn, 599);
+           return 0;
+       }
+   }
+
+   cn->post_state = 0;
+   cn->post_read = 0;
+   post_data = cn->post_data;
+
+   while (next < &buf[rv])
+   { 
+       /*copy POST data to buffer*/
+       *post_data = *next;
+       post_data++;
+       next++;
+       cn->post_read++;
+       if (cn->post_read == cn->content_length)
+       { 
+           /* No more POST data to be copied */
+           *post_data = '\0';
+           return 1;
+       }
+   }
+
+   /* More POST data has to be read. read_post_data will continue with that */
+   cn->post_state = 1;
+   return 0;
+}
+
+void read_post_data(struct connstruct *cn)
+{
+    char buf[MAXREQUESTLENGTH*4], *next;
+    char *post_data;
+    int rv;
+
+    bzero(buf,MAXREQUESTLENGTH*4);
+    rv = special_read(cn, buf, sizeof(buf)-1);
+    if (rv <= 0) 
+    {
+        if (rv < 0) /* really dead? */
+            removeconnection(cn);
+        return;
+    }
+
+    buf[rv] = '\0';
+    next = buf;
+
+    post_data = &cn->post_data[cn->post_read];
+
+    while (next < &buf[rv])
+    {
+        *post_data = *next;
+        post_data++;
+        next++;
+        cn->post_read++;
+        if (cn->post_read == cn->content_length)
+        {  
+            /* No more POST data to be copied */
+            *post_data='\0';
+            cn->post_state = 0;
+            buildactualfile(cn);
+            cn->state = STATE_WANT_TO_SEND_HEAD;
+            return;
+        }
+    }
+
+    /* More POST data to read */
+}
+
+#endif  /* CONFIG_HTTP_HAS_CGI */
+
+/* Decode string %xx -> char (in place) */
+static void urldecode(char *buf) 
+{
+    int v;
+    char *p, *s, *w;
+
+    w = p = buf;
+
+    while (*p) 
+    {
+        v = 0;
+
+        if (*p == '%') 
+        {
+            s = p;
+            s++;
+
+            if (isxdigit((int) s[0]) && isxdigit((int) s[1]))
+            {
+                v = hexit(s[0])*16 + hexit(s[1]);
+
+                if (v) 
+                { 
+                    /* do not decode %00 to null char */
+                    *w = (char)v;
+                    p = &s[1];
+                }
+            }
+
+        }
+
+        if (!v) *w=*p;
+        p++; 
+        w++;
+    }
+
+    *w='\0';
+}
+
+static int hexit(char c) 
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    else if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    else if (c >= 'A' && c <= 'F')
+        return c - 'A' + 10;
+    else
+        return 0;
+}
+
+static void buildactualfile(struct connstruct *cn)
+{
+    char *cp;
+    snprintf(cn->actualfile, MAXREQUESTLENGTH, ".%s", cn->filereq);
+
+#ifndef WIN32
+    /* Add directory slash if not there */
+    if (isdir(cn->actualfile) && 
+            cn->actualfile[strlen(cn->actualfile)-1] != '/')
+        strcat(cn->actualfile, "/");
+
+    /* work out the directory name */
+    strncpy(cn->dirname, cn->actualfile, MAXREQUESTLENGTH);
+    if ((cp = strrchr(cn->dirname, '/')) == NULL)
+        cn->dirname[0] = 0;
+    else
+        *cp = 0;
+#else
+    {
+        char curr_dir[MAXREQUESTLENGTH];
+        char path[MAXREQUESTLENGTH];
+        char *t = cn->actualfile;
+
+        GetCurrentDirectory(MAXREQUESTLENGTH, curr_dir);
+
+        /* convert all the forward slashes to back slashes */
+        while ((t = strchr(t, '/')))
+            *t++ = '\\';
+
+        snprintf(path, MAXREQUESTLENGTH, "%s%s", curr_dir, cn->actualfile);
+        memcpy(cn->actualfile, path, MAXREQUESTLENGTH);
+
+        /* Add directory slash if not there */
+        if (isdir(cn->actualfile) && 
+                    cn->actualfile[strlen(cn->actualfile)-1] != '\\')
+            strcat(cn->actualfile, "\\");
+
+        /* work out the directory name */
+        strncpy(cn->dirname, cn->actualfile, MAXREQUESTLENGTH);
+        if ((cp = strrchr(cn->dirname, '\\')) == NULL)
+            cn->dirname[0] = 0;
+        else
+            *cp = 0;
+    }
+#endif
+
+#if defined(CONFIG_HTTP_ENABLE_LUA)
+    /* 
+     * Use the lua launcher if this file has a lua extension. Put this at the
+     * end as we need the directory name.
+     */
+    if (cn->is_lua)
+        sprintf(cn->actualfile, "%s%s", CONFIG_HTTP_LUA_PREFIX, 
+                CONFIG_HTTP_LUA_CGI_LAUNCHER);
+#endif
+}
+
+static int sanitizefile(const char *buf) 
+{
+    int len, i;
+
+    /* Don't accept anything not starting with a / */
+    if (*buf != '/') 
+        return 0;
+
+    len = strlen(buf);
+    for (i = 0; i < len; i++) 
+    {
+        /* Check for "/." i.e. don't send files starting with a . */
+        if (buf[i] == '/' && buf[i+1] == '.') 
+            return 0;
+    }
+
+    return 1;
+}
+
+static int sanitizehost(char *buf)
+{
+    while (*buf != '\0') 
+    {
+        /* Handle the port */
+        if (*buf == ':') 
+        {
+            *buf = '\0';
+            return 1;
+        }
+
+        /* Enforce some basic URL rules... */
+        if ((isalnum(*buf) == 0 && *buf != '-' && *buf != '.') ||
+                (*buf == '.' && *(buf+1) == '.') ||
+                (*buf == '.' && *(buf+1) == '-') ||
+                (*buf == '-' && *(buf+1) == '.'))
+            return 0;
+
+        buf++;
+    }
+
+    return 1;
+}
+
+static FILE * exist_check(struct connstruct *cn, const char *check_file)
+{
+    char pathname[MAXREQUESTLENGTH];
+    snprintf(pathname, MAXREQUESTLENGTH, "%s/%s", cn->dirname, check_file);
+    return fopen(pathname, "r");
+}
+
+#ifdef CONFIG_HTTP_HAS_AUTHORIZATION
+static void send_authenticate(struct connstruct *cn, const char *realm)
+{
+    char buf[1024];
+
+    snprintf(buf, sizeof(buf), HTTP_VERSION" 401 Unauthorized\n"
+         "WWW-Authenticate: Basic\n"
+                 "realm=\"%s\"\n", realm);
+    special_write(cn, buf, strlen(buf));
+}
+
+static int check_digest(char *salt, const char *msg_passwd)
+{
+    uint8_t b256_salt[MAXREQUESTLENGTH];
+    uint8_t real_passwd[MD5_SIZE];
+    int salt_size;
+    char *b64_passwd;
+    uint8_t md5_result[MD5_SIZE];
+    MD5_CTX ctx;
+
+    /* retrieve the salt */
+    if ((b64_passwd = strchr(salt, '$')) == NULL)
+        return -1;
+
+    *b64_passwd++ = 0;
+    if (base64_decode(salt, strlen(salt), b256_salt, &salt_size))
+        return -1;
+
+    if (base64_decode(b64_passwd, strlen(b64_passwd), real_passwd, NULL))
+        return -1;
+
+    /* very simple MD5 crypt algorithm, but then the salt we use is large */
+    MD5_Init(&ctx);
+    MD5_Update(&ctx, b256_salt, salt_size);           /* process the salt */
+    MD5_Update(&ctx, (uint8_t *)msg_passwd, strlen(msg_passwd)); 
+    MD5_Final(md5_result, &ctx);
+    return memcmp(md5_result, real_passwd, MD5_SIZE);/* 0 = ok */
+}
+
+static int auth_check(struct connstruct *cn)
+{
+    char line[MAXREQUESTLENGTH];
+    FILE *fp;
+    char *cp;
+
+    if ((fp = exist_check(cn, ".htpasswd")) == NULL)
+        return 0;               /* no .htpasswd file, so let though */
+
+    if (cn->authorization[0] == 0)
+        goto error;
+
+    /* cn->authorization is in form "username:password" */
+    if ((cp = strchr(cn->authorization, ':')) == NULL)
+        goto error;
+    else
+        *cp++ = 0;  /* cp becomes the password */
+
+    while (fgets(line, sizeof(line), fp) != NULL)
+    {
+        char *b64_file_passwd;
+        int l = strlen(line);
+
+        /* nuke newline */
+        if (line[l-1] == '\n')
+            line[l-1] = 0;
+
+        /* line is form "username:salt(b64)$password(b64)" */
+        if ((b64_file_passwd = strchr(line, ':')) == NULL)
+            continue;
+
+        *b64_file_passwd++ = 0;
+
+        if (strcmp(line, cn->authorization)) /* our user? */
+            continue;
+
+        if (check_digest(b64_file_passwd, cp) == 0)
+        {
+            fclose(fp);
+            return 0;
+        }
+    }
+
+error:
+    fclose(fp);
+    send_authenticate(cn, cn->server_name);
+    return -1;
+}
+#endif
+
+static int htaccess_check(struct connstruct *cn)
+{
+    char line[MAXREQUESTLENGTH];
+    FILE *fp;
+    int ret = 0;
+
+    if ((fp = exist_check(cn, ".htaccess")) == NULL)
+        return 0;               /* no .htaccess file, so let though */
+
+    while (fgets(line, sizeof(line), fp) != NULL)
+    {
+        if (strstr(line, "Deny all") || /* access to this dir denied */
+                    /* Access will be denied unless SSL is active */
+                    (!cn->is_ssl && strstr(line, "SSLRequireSSL")) ||
+                    /* Access will be denied if SSL is active */
+                    (cn->is_ssl && strstr(line, "SSLDenySSL")))
+        {
+            ret = -1;
+            break;
+        }
+    }
+
+    fclose(fp);
+    return ret;
+}
+
+static void send_error(struct connstruct *cn, int err)
+{
+    char buf[MAXREQUESTLENGTH];
+    char *title;
+    char *text;
+
+    switch (err)
+    {
+        case 403:
+            title = "Forbidden";
+            text = "File is protected";
+#ifdef CONFIG_HTTP_VERBOSE
+            printf("axhttpd: access to %s denied\n", cn->filereq); TTY_FLUSH();
+#endif
+            break;
+
+        case 404:
+            title = "Not Found";
+            text = title;
+            break;
+
+        case 418:
+            title = "POST data size is to large";
+            text = title;
+            break;
+
+        default:
+            title = "Unknown";
+            text = "Unknown";
+            break;
+    }
+
+    snprintf(buf, MAXREQUESTLENGTH, "HTTP/1.1 %d %s\n"
+            "Content-Type: text/html\n"
+            "Cache-Control: no-cache,no-store\n"
+            "Connection: close\n\n"
+            "<html>\n<head>\n<title>%d %s</title></head>\n"
+            "<body><h1>%d %s</h1>\n</body></html>\n", 
+            err, title, err, title, err, text);
+    special_write(cn, buf, strlen(buf));
+    removeconnection(cn);
+}
+
+static const char *getmimetype(const char *name)
+{
+    /* only bother with a few mime types - let the browser figure the rest out */
+    if (strstr(name, ".htm"))
+        return "text/html";
+    else if (strstr(name, ".css"))
+        return "text/css"; 
+    else
+        return "application/octet-stream";
+}
+
+static int special_write(struct connstruct *cn, 
+                                        const char *buf, size_t count)
+{
+    if (cn->is_ssl)
+    {
+        SSL *ssl = cn->ssl;
+        return ssl ? ssl_write(ssl, (uint8_t *)buf, count) : -1;
+    }
+    else
+        return SOCKET_WRITE(cn->networkdesc, buf, count);
+}
+
+static int special_read(struct connstruct *cn, void *buf, size_t count)
+{
+    int res;
+
+    if (cn->is_ssl)
+    {
+        uint8_t *read_buf;
+        if ((res = ssl_read(cn->ssl, &read_buf)) > SSL_OK)
+        {
+            memcpy(buf, read_buf, res > (int)count ? count : res);
+        }
+    }
+    else
+        res = SOCKET_READ(cn->networkdesc, buf, count);
+
+    return res;
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/httpd/tdate_parse.c b/trunk/package/luci/libs/nixio/axTLS/httpd/tdate_parse.c
new file mode 100644
index 00000000..813bdc57
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/httpd/tdate_parse.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "axhttp.h"
+
+struct day_mon_map 
+{
+    const char* s;
+    uint8_t l;
+};
+
+static struct day_mon_map wday_tab[] = 
+{
+    { "Sun", 0 }, { "Mon", 1 }, { "Tue", 2 }, { "Wed", 3 },
+    { "Thu", 4 }, { "Fri", 5 }, { "Sat", 6 }, 
+};
+
+static struct day_mon_map mon_tab[] = 
+{
+    { "Jan", 0 }, { "Feb", 1 }, { "Mar", 2 }, { "Apr", 3 },
+    { "May", 4 }, { "Jun", 5 }, { "Jul", 6 }, { "Aug", 7 },
+    { "Sep", 8 }, { "Oct", 9 }, { "Nov", 10 }, { "Dec", 11 },
+};
+
+static int day_mon_map_compare(const char *v1, const char *v2)
+{
+    return strcmp(((struct day_mon_map*)v1)->s, ((struct day_mon_map*)v2)->s);
+}
+
+void tdate_init(void)
+{
+    qsort(wday_tab, sizeof(wday_tab)/sizeof(struct day_mon_map),
+            sizeof(struct day_mon_map), 
+            (int (*)(const void *, const void *))day_mon_map_compare);
+    qsort(mon_tab, sizeof(mon_tab)/sizeof(struct day_mon_map),
+            sizeof(struct day_mon_map), 
+            (int (*)(const void *, const void *))day_mon_map_compare);
+}
+
+static int8_t day_mon_map_search(const char* str, 
+                            const struct day_mon_map* tab, int n)
+{
+    struct day_mon_map *search = bsearch(&str, tab, n,
+            sizeof(struct day_mon_map), 
+                (int (*)(const void *, const void *))day_mon_map_compare);
+    return search ? search->l : -1;
+}
+
+time_t tdate_parse(const char* str)
+{
+    struct tm tm;
+    char str_mon[4], str_wday[4];
+    int tm_sec, tm_min, tm_hour, tm_mday, tm_year;
+
+    /* Initialize. */
+    memset(&tm, 0, sizeof(struct tm));
+
+    /* wdy, DD mth YY HH:MM:SS GMT */
+    if ((sscanf(str, "%3[a-zA-Z], %d %3[a-zA-Z] %d %d:%d:%d GMT",
+                str_wday, &tm_mday, str_mon, &tm_year, &tm_hour, &tm_min,
+                    &tm_sec) == 7) ||
+    /* wdy mth DD HH:MM:SS YY */
+        (sscanf(str, "%3[a-zA-Z] %3[a-zA-Z] %d %d:%d:%d %d",
+                str_wday, str_mon, &tm_mday, &tm_hour, &tm_min, &tm_sec,
+                    &tm_year) == 7))
+    {
+        int8_t tm_wday = day_mon_map_search(str_wday, wday_tab, 
+                        sizeof(wday_tab)/sizeof(struct day_mon_map));
+        int8_t tm_mon = day_mon_map_search(str_mon, mon_tab, 
+                        sizeof(mon_tab)/sizeof(struct day_mon_map));
+
+        if (tm_wday < 0 || tm_mon < 0)
+            return -1;
+
+        tm.tm_wday = tm_wday;
+        tm.tm_mon = tm_mon;
+        tm.tm_mday = tm_mday;
+        tm.tm_hour = tm_hour;
+        tm.tm_min = tm_min;
+        tm.tm_sec = tm_sec;
+        tm.tm_year = tm_year - 1900;
+        return mktime(&tm);
+    }
+
+    return -1;  /* error */
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/Config.in b/trunk/package/luci/libs/nixio/axTLS/samples/Config.in
new file mode 100644
index 00000000..ecad25ee
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/Config.in
@@ -0,0 +1,63 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/config/Kconfig-language.txt
+#
+menu "Samples"
+
+config CONFIG_SAMPLES
+    bool "Create Samples"
+    default y
+    help
+        axTLS contains various sample code.
+
+        Select Y here if you want to build the various samples.
+
+config CONFIG_C_SAMPLES
+    bool "axssl - C version"
+    default y
+    depends on CONFIG_SAMPLES
+    help
+        Build the "C" version of axssl. The features enabled are very
+        dependent on the build mode ('full' mode will give all features).
+
+config CONFIG_CSHARP_SAMPLES
+    bool "axssl - C# version"
+    default y
+    depends on CONFIG_SAMPLES && CONFIG_CSHARP_BINDINGS
+    help
+        Build the "C#" version of axssl. The features enabled are very
+        dependent on the build mode ('full' mode will give all features).
+
+config CONFIG_VBNET_SAMPLES
+    bool "axssl - VB.NET version"
+    default y
+    depends on CONFIG_SAMPLES && CONFIG_VBNET_BINDINGS
+    help
+        Build the "VB.NET" version of axssl. The features enabled are very
+        dependent on the build mode ('full' mode will give all features).
+
+config CONFIG_JAVA_SAMPLES
+    bool "axssl - Java version"
+    default y
+    depends on CONFIG_SAMPLES && CONFIG_JAVA_BINDINGS
+    help
+        Build the "Java" version of axssl. The features enabled are very
+        dependent on the build mode ('full' mode will give all features).
+
+config CONFIG_PERL_SAMPLES
+    bool "axssl - Perl version"
+    default y
+    depends on CONFIG_SAMPLES && CONFIG_PERL_BINDINGS
+    help
+        Build the "Perl" version of axssl. The features enabled are very
+        dependent on the build mode ('full' mode will give all features).
+
+config CONFIG_LUA_SAMPLES
+    bool "axssl - Lua version"
+    default y
+    depends on CONFIG_SAMPLES && CONFIG_LUA_BINDINGS
+    help
+        Build the "Lua" version of axssl. The features enabled are very
+        dependent on the build mode ('full' mode will give all features).
+endmenu
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/Makefile b/trunk/package/luci/libs/nixio/axTLS/samples/Makefile
new file mode 100644
index 00000000..afbdd43d
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/Makefile
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+all:
+
+include ../config/.config
+include ../config/makefile.conf
+
+all:
+ifdef CONFIG_C_SAMPLES
+	$(MAKE) -C c
+endif
+ifdef CONFIG_CSHARP_SAMPLES
+	$(MAKE) -C csharp
+endif
+ifdef CONFIG_VBNET_SAMPLES
+	$(MAKE) -C vbnet
+endif
+ifdef CONFIG_JAVA_SAMPLES
+	$(MAKE) -C java
+endif
+ifdef CONFIG_PERL_SAMPLES
+	$(MAKE) -C perl
+endif
+ifdef CONFIG_LUA_SAMPLES
+	$(MAKE) -C lua
+endif
+
+clean::
+	$(MAKE) -C c clean
+	$(MAKE) -C csharp clean
+	$(MAKE) -C vbnet clean
+	$(MAKE) -C java clean
+	$(MAKE) -C perl clean
+	$(MAKE) -C lua clean
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/c/Makefile b/trunk/package/luci/libs/nixio/axTLS/samples/c/Makefile
new file mode 100644
index 00000000..17cf9e7c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/c/Makefile
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+all : sample
+
+AXTLS_HOME=../..
+
+include $(AXTLS_HOME)/config/.config
+include $(AXTLS_HOME)/config/makefile.conf
+
+ifndef CONFIG_PLATFORM_WIN32
+
+ifdef CONFIG_PLATFORM_CYGWIN
+TARGET=$(AXTLS_HOME)/$(STAGE)/axssl.exe
+else
+TARGET=$(AXTLS_HOME)/$(STAGE)/axssl
+endif   # cygwin
+
+LIBS=$(AXTLS_HOME)/$(STAGE)
+else
+TARGET=$(AXTLS_HOME)/$(STAGE)/axssl.exe
+endif
+
+ifndef CONFIG_C_SAMPLES
+sample:
+
+else
+sample : $(TARGET)
+OBJ= axssl.o
+include $(AXTLS_HOME)/config/makefile.post
+
+ifndef CONFIG_PLATFORM_WIN32
+
+$(TARGET): $(OBJ) $(LIBS)/libaxtls.a
+	$(LD) $(LDFLAGS) -o $@ $(OBJ) -L$(LIBS) -laxtls 
+ifdef CONFIG_STRIP_UNWANTED_SECTIONS
+	$(STRIP) --remove-section=.comment $(TARGET)
+endif   # use strip
+else    # Win32
+
+$(TARGET): $(OBJ)
+	$(LD) $(LDFLAGS) $(AXTLS_HOME)/config/axtls.res /out:$@ $^ /libpath:"$(AXTLS_HOME)/$(STAGE)" axtls.lib
+endif
+
+endif    # CONFIG_C_SAMPLES
+
+clean::
+	-@rm -f $(AXTLS_HOME)/$(STAGE)/axssl*
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/c/axssl.c b/trunk/package/luci/libs/nixio/axTLS/samples/c/axssl.c
new file mode 100644
index 00000000..6892ee45
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/c/axssl.c
@@ -0,0 +1,883 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Demonstrate the use of the axTLS library in C with a set of 
+ * command-line parameters similar to openssl. In fact, openssl clients 
+ * should be able to communicate with axTLS servers and visa-versa.
+ *
+ * This code has various bits enabled depending on the configuration. To enable
+ * the most interesting version, compile with the 'full mode' enabled.
+ *
+ * To see what options you have, run the following:
+ * > axssl s_server -?
+ * > axssl s_client -?
+ *
+ * The axtls shared library must be in the same directory or be found 
+ * by the OS.
+ */
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "ssl.h"
+
+/* define standard input */
+#ifndef STDIN_FILENO
+#define STDIN_FILENO        0
+#endif
+
+static void do_server(int argc, char *argv[]);
+static void print_options(char *option);
+static void print_server_options(char *option);
+static void do_client(int argc, char *argv[]);
+static void print_client_options(char *option);
+static void display_cipher(SSL *ssl);
+static void display_session_id(SSL *ssl);
+
+/**
+ * Main entry point. Doesn't do much except works out whether we are a client
+ * or a server.
+ */
+int main(int argc, char *argv[])
+{
+#ifdef WIN32
+    WSADATA wsaData;
+    WORD wVersionRequested = MAKEWORD(2, 2);
+    WSAStartup(wVersionRequested, &wsaData);
+#elif !defined(CONFIG_PLATFORM_SOLARIS)
+    signal(SIGPIPE, SIG_IGN);           /* ignore pipe errors */
+#endif
+
+    if (argc == 2 && strcmp(argv[1], "version") == 0)
+    {
+        printf("axssl %s %s\n", ssl_version(), __DATE__);
+        exit(0);
+    }
+
+    if (argc < 2 || (
+                strcmp(argv[1], "s_server") && strcmp(argv[1], "s_client")))
+        print_options(argc > 1 ? argv[1] : "");
+
+    strcmp(argv[1], "s_server") ? 
+        do_client(argc, argv) : do_server(argc, argv);
+    return 0;
+}
+
+/**
+ * Implement the SSL server logic. 
+ */
+static void do_server(int argc, char *argv[])
+{
+    int i = 2;
+    uint16_t port = 4433;
+    uint32_t options = SSL_DISPLAY_CERTS;
+    int client_fd;
+    SSL_CTX *ssl_ctx;
+    int server_fd, res = 0;
+    socklen_t client_len;
+#ifndef CONFIG_SSL_SKELETON_MODE
+    char *private_key_file = NULL;
+    const char *password = NULL;
+    char **cert;
+    int cert_index = 0;
+    int cert_size = ssl_get_config(SSL_MAX_CERT_CFG_OFFSET);
+#endif
+#ifdef WIN32
+    char yes = 1;
+#else
+    int yes = 1;
+#endif
+    struct sockaddr_in serv_addr;
+    struct sockaddr_in client_addr;
+    int quiet = 0;
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    int ca_cert_index = 0;
+    int ca_cert_size = ssl_get_config(SSL_MAX_CA_CERT_CFG_OFFSET);
+    char **ca_cert = (char **)calloc(1, sizeof(char *)*ca_cert_size);
+#endif
+    fd_set read_set;
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    cert = (char **)calloc(1, sizeof(char *)*cert_size);
+#endif
+
+    while (i < argc)
+    {
+        if (strcmp(argv[i], "-accept") == 0)
+        {
+            if (i >= argc-1)
+            {
+                print_server_options(argv[i]);
+            }
+
+            port = atoi(argv[++i]);
+        }
+#ifndef CONFIG_SSL_SKELETON_MODE
+        else if (strcmp(argv[i], "-cert") == 0)
+        {
+            if (i >= argc-1 || cert_index >= cert_size)
+            {
+                print_server_options(argv[i]);
+            }
+
+            cert[cert_index++] = argv[++i];
+        }
+        else if (strcmp(argv[i], "-key") == 0)
+        {
+            if (i >= argc-1)
+            {
+                print_server_options(argv[i]);
+            }
+
+            private_key_file = argv[++i];
+            options |= SSL_NO_DEFAULT_KEY;
+        }
+        else if (strcmp(argv[i], "-pass") == 0)
+        {
+            if (i >= argc-1)
+            {
+                print_server_options(argv[i]);
+            }
+
+            password = argv[++i];
+        }
+#endif
+        else if (strcmp(argv[i], "-quiet") == 0)
+        {
+            quiet = 1;
+            options &= ~SSL_DISPLAY_CERTS;
+        }
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+        else if (strcmp(argv[i], "-verify") == 0)
+        {
+            options |= SSL_CLIENT_AUTHENTICATION;
+        }
+        else if (strcmp(argv[i], "-CAfile") == 0)
+        {
+            if (i >= argc-1 || ca_cert_index >= ca_cert_size)
+            {
+                print_server_options(argv[i]);
+            }
+
+            ca_cert[ca_cert_index++] = argv[++i];
+        }
+#endif
+#ifdef CONFIG_SSL_FULL_MODE
+        else if (strcmp(argv[i], "-debug") == 0)
+        {
+            options |= SSL_DISPLAY_BYTES;
+        }
+        else if (strcmp(argv[i], "-state") == 0)
+        {
+            options |= SSL_DISPLAY_STATES;
+        }
+        else if (strcmp(argv[i], "-show-rsa") == 0)
+        {
+            options |= SSL_DISPLAY_RSA;
+        }
+#endif
+        else    /* don't know what this is */
+        {
+            print_server_options(argv[i]);
+        }
+
+        i++;
+    }
+
+    if ((ssl_ctx = ssl_ctx_new(options, SSL_DEFAULT_SVR_SESS)) == NULL)
+    {
+        fprintf(stderr, "Error: Server context is invalid\n");
+        exit(1);
+    }
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    if (private_key_file)
+    {
+        int obj_type = SSL_OBJ_RSA_KEY;
+        
+        /* auto-detect the key type from the file extension */
+        if (strstr(private_key_file, ".p8"))
+            obj_type = SSL_OBJ_PKCS8;
+        else if (strstr(private_key_file, ".p12"))
+            obj_type = SSL_OBJ_PKCS12;
+
+        if (ssl_obj_load(ssl_ctx, obj_type, private_key_file, password))
+        {
+            fprintf(stderr, "Error: Private key '%s' is undefined.\n", 
+                                                        private_key_file);
+            exit(1);
+        }
+    }
+
+    for (i = 0; i < cert_index; i++)
+    {
+        if (ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, cert[i], NULL))
+        {
+            printf("Certificate '%s' is undefined.\n", cert[i]);
+            exit(1);
+        }
+    }
+#endif
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    for (i = 0; i < ca_cert_index; i++)
+    {
+        if (ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CACERT, ca_cert[i], NULL))
+        {
+            printf("Certificate '%s' is undefined.\n", ca_cert[i]);
+            exit(1);
+        }
+    }
+
+    free(ca_cert);
+#endif
+#ifndef CONFIG_SSL_SKELETON_MODE
+    free(cert);
+#endif
+
+    /* Create socket for incoming connections */
+    if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    {
+        perror("socket");
+        return;
+    }
+      
+    setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+
+    /* Construct local address structure */
+    memset(&serv_addr, 0, sizeof(serv_addr));      /* Zero out structure */
+    serv_addr.sin_family = AF_INET;                /* Internet address family */
+    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); /* Any incoming interface */
+    serv_addr.sin_port = htons(port);              /* Local port */
+
+    /* Bind to the local address */
+    if (bind(server_fd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
+    {
+        perror("bind");
+        exit(1);
+    }
+
+    if (listen(server_fd, 5) < 0)
+    {
+        perror("listen");
+        exit(1);
+    }
+
+    client_len = sizeof(client_addr);
+
+    /*************************************************************************
+     * This is where the interesting stuff happens. Up until now we've
+     * just been setting up sockets etc. Now we do the SSL handshake.
+     *************************************************************************/
+    for (;;)
+    {
+        SSL *ssl;
+        int reconnected = 0;
+
+        if (!quiet)
+        {
+            printf("ACCEPT\n");
+            TTY_FLUSH();
+        }
+
+        if ((client_fd = accept(server_fd, 
+                (struct sockaddr *)&client_addr, &client_len)) < 0)
+        {
+            res = 1;
+            break;
+        }
+
+        ssl = ssl_server_new(ssl_ctx, client_fd);
+
+        /* now read (and display) whatever the client sends us */
+        for (;;)
+        {
+            /* allow parallel reading of client and standard input */
+            FD_ZERO(&read_set);
+            FD_SET(client_fd, &read_set);
+
+#ifndef WIN32
+            /* win32 doesn't like mixing up stdin and sockets */
+            if (isatty(STDIN_FILENO))/* but only if we are in an active shell */
+            {
+                FD_SET(STDIN_FILENO, &read_set);
+            }
+
+            if ((res = select(client_fd+1, &read_set, NULL, NULL, NULL)) > 0)
+            {
+               uint8_t buf[1024];
+
+                /* read standard input? */
+                if (FD_ISSET(STDIN_FILENO, &read_set))
+                {
+                    if (fgets((char *)buf, sizeof(buf), stdin) == NULL)
+                    {
+                        res = SSL_ERROR_CONN_LOST;
+                    }
+                    else
+                    {
+                        /* small hack to check renegotiation */
+                        if (buf[0] == 'r' && (buf[1] == '\n' || buf[1] == '\r'))
+                        {
+                            res = ssl_renegotiate(ssl);
+                        }
+                        else    /* write our ramblings to the client */
+                        {
+                            res = ssl_write(ssl, buf, strlen((char *)buf)+1);
+                        }
+                    }
+                }
+                else    /* a socket read */
+#endif
+                {
+                    /* keep reading until we get something interesting */
+                    uint8_t *read_buf;
+
+                    if ((res = ssl_read(ssl, &read_buf)) == SSL_OK)
+                    {
+                        /* are we in the middle of doing a handshake? */
+                        if (ssl_handshake_status(ssl) != SSL_OK)
+                        {
+                            reconnected = 0;
+                        }
+                        else if (!reconnected)
+                        {
+                            /* we are connected/reconnected */
+                            if (!quiet)
+                            {
+                                display_session_id(ssl);
+                                display_cipher(ssl);
+                            }
+
+                            reconnected = 1;
+                        }
+                    }
+
+                    if (res > SSL_OK)    /* display our interesting output */
+                    {
+                        printf("%s", read_buf);
+                        TTY_FLUSH();
+                    }
+                    else if (res < SSL_OK && !quiet)
+                    {
+                        ssl_display_error(res);
+                    }
+                }
+#ifndef WIN32
+            }
+#endif
+
+            if (res < SSL_OK)
+            {
+                if (!quiet)
+                {
+                    printf("CONNECTION CLOSED\n");
+                    TTY_FLUSH();
+                }
+
+                break;
+            }
+        }
+
+        /* client was disconnected or the handshake failed. */
+        ssl_free(ssl);
+        SOCKET_CLOSE(client_fd);
+    }
+
+    ssl_ctx_free(ssl_ctx);
+}
+
+/**
+ * Implement the SSL client logic.
+ */
+static void do_client(int argc, char *argv[])
+{
+#ifdef CONFIG_SSL_ENABLE_CLIENT
+    int res, i = 2;
+    uint16_t port = 4433;
+    uint32_t options = SSL_SERVER_VERIFY_LATER|SSL_DISPLAY_CERTS;
+    int client_fd;
+    char *private_key_file = NULL;
+    struct sockaddr_in client_addr;
+    struct hostent *hostent;
+    int reconnect = 0;
+    uint32_t sin_addr;
+    SSL_CTX *ssl_ctx;
+    SSL *ssl = NULL;
+    int quiet = 0;
+    int cert_index = 0, ca_cert_index = 0;
+    int cert_size, ca_cert_size;
+    char **ca_cert, **cert;
+    uint8_t session_id[SSL_SESSION_ID_SIZE];
+    fd_set read_set;
+    const char *password = NULL;
+
+    FD_ZERO(&read_set);
+    sin_addr = inet_addr("127.0.0.1");
+    cert_size = ssl_get_config(SSL_MAX_CERT_CFG_OFFSET);
+    ca_cert_size = ssl_get_config(SSL_MAX_CA_CERT_CFG_OFFSET);
+    ca_cert = (char **)calloc(1, sizeof(char *)*ca_cert_size);
+    cert = (char **)calloc(1, sizeof(char *)*cert_size);
+
+    while (i < argc)
+    {
+        if (strcmp(argv[i], "-connect") == 0)
+        {
+            char *host, *ptr;
+
+            if (i >= argc-1)
+            {
+                print_client_options(argv[i]);
+            }
+
+            host = argv[++i];
+            if ((ptr = strchr(host, ':')) == NULL)
+            {
+                print_client_options(argv[i]);
+            }
+
+            *ptr++ = 0;
+            port = atoi(ptr);
+            hostent = gethostbyname(host);
+
+            if (hostent == NULL)
+            {
+                print_client_options(argv[i]);
+            }
+
+            sin_addr = *((uint32_t **)hostent->h_addr_list)[0];
+        }
+        else if (strcmp(argv[i], "-cert") == 0)
+        {
+            if (i >= argc-1 || cert_index >= cert_size)
+            {
+                print_client_options(argv[i]);
+            }
+
+            cert[cert_index++] = argv[++i];
+        }
+        else if (strcmp(argv[i], "-key") == 0)
+        {
+            if (i >= argc-1)
+            {
+                print_client_options(argv[i]);
+            }
+
+            private_key_file = argv[++i];
+            options |= SSL_NO_DEFAULT_KEY;
+        }
+        else if (strcmp(argv[i], "-CAfile") == 0)
+        {
+            if (i >= argc-1 || ca_cert_index >= ca_cert_size)
+            {
+                print_client_options(argv[i]);
+            }
+
+            ca_cert[ca_cert_index++] = argv[++i];
+        }
+        else if (strcmp(argv[i], "-verify") == 0)
+        {
+            options &= ~SSL_SERVER_VERIFY_LATER;
+        }
+        else if (strcmp(argv[i], "-reconnect") == 0)
+        {
+            reconnect = 4;
+        }
+        else if (strcmp(argv[i], "-quiet") == 0)
+        {
+            quiet = 1;
+            options &= ~SSL_DISPLAY_CERTS;
+        }
+        else if (strcmp(argv[i], "-pass") == 0)
+        {
+            if (i >= argc-1)
+            {
+                print_client_options(argv[i]);
+            }
+
+            password = argv[++i];
+        }
+#ifdef CONFIG_SSL_FULL_MODE
+        else if (strcmp(argv[i], "-debug") == 0)
+        {
+            options |= SSL_DISPLAY_BYTES;
+        }
+        else if (strcmp(argv[i], "-state") == 0)
+        {
+            options |= SSL_DISPLAY_STATES;
+        }
+        else if (strcmp(argv[i], "-show-rsa") == 0)
+        {
+            options |= SSL_DISPLAY_RSA;
+        }
+#endif
+        else    /* don't know what this is */
+        {
+            print_client_options(argv[i]);
+        }
+
+        i++;
+    }
+
+    if ((ssl_ctx = ssl_ctx_new(options, SSL_DEFAULT_CLNT_SESS)) == NULL)
+    {
+        fprintf(stderr, "Error: Client context is invalid\n");
+        exit(1);
+    }
+
+    if (private_key_file)
+    {
+        int obj_type = SSL_OBJ_RSA_KEY;
+        
+        /* auto-detect the key type from the file extension */
+        if (strstr(private_key_file, ".p8"))
+            obj_type = SSL_OBJ_PKCS8;
+        else if (strstr(private_key_file, ".p12"))
+            obj_type = SSL_OBJ_PKCS12;
+
+        if (ssl_obj_load(ssl_ctx, obj_type, private_key_file, password))
+        {
+            fprintf(stderr, "Error: Private key '%s' is undefined.\n", 
+                                                        private_key_file);
+            exit(1);
+        }
+    }
+
+    for (i = 0; i < cert_index; i++)
+    {
+        if (ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, cert[i], NULL))
+        {
+            printf("Certificate '%s' is undefined.\n", cert[i]);
+            exit(1);
+        }
+    }
+
+    for (i = 0; i < ca_cert_index; i++)
+    {
+        if (ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CACERT, ca_cert[i], NULL))
+        {
+            printf("Certificate '%s' is undefined.\n", ca_cert[i]);
+            exit(1);
+        }
+    }
+
+    free(cert);
+    free(ca_cert);
+
+    /*************************************************************************
+     * This is where the interesting stuff happens. Up until now we've
+     * just been setting up sockets etc. Now we do the SSL handshake.
+     *************************************************************************/
+    client_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    memset(&client_addr, 0, sizeof(client_addr));
+    client_addr.sin_family = AF_INET;
+    client_addr.sin_port = htons(port);
+    client_addr.sin_addr.s_addr = sin_addr;
+
+    if (connect(client_fd, (struct sockaddr *)&client_addr, 
+                sizeof(client_addr)) < 0)
+    {
+        perror("connect");
+        exit(1);
+    }
+
+    if (!quiet)
+    {
+        printf("CONNECTED\n");
+        TTY_FLUSH();
+    }
+
+    /* Try session resumption? */
+    if (reconnect)
+    {
+        while (reconnect--)
+        {
+            ssl = ssl_client_new(ssl_ctx, client_fd, session_id,
+                    sizeof(session_id));
+            if ((res = ssl_handshake_status(ssl)) != SSL_OK)
+            {
+                if (!quiet)
+                {
+                    ssl_display_error(res);
+                }
+
+                ssl_free(ssl);
+                exit(1);
+            }
+
+            display_session_id(ssl);
+            memcpy(session_id, ssl_get_session_id(ssl), SSL_SESSION_ID_SIZE);
+
+            if (reconnect)
+            {
+                ssl_free(ssl);
+                SOCKET_CLOSE(client_fd);
+
+                client_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+                connect(client_fd, (struct sockaddr *)&client_addr, 
+                        sizeof(client_addr));
+            }
+        }
+    }
+    else
+    {
+        ssl = ssl_client_new(ssl_ctx, client_fd, NULL, 0);
+    }
+
+    /* check the return status */
+    if ((res = ssl_handshake_status(ssl)) != SSL_OK)
+    {
+        if (!quiet)
+        {
+            ssl_display_error(res);
+        }
+
+        exit(1);
+    }
+
+    if (!quiet)
+    {
+        const char *common_name = ssl_get_cert_dn(ssl,
+                SSL_X509_CERT_COMMON_NAME);
+        if (common_name)
+        {
+            printf("Common Name:\t\t\t%s\n", common_name);
+        }
+
+        display_session_id(ssl);
+        display_cipher(ssl);
+    }
+
+    for (;;)
+    {
+        uint8_t buf[1024];
+        res = SSL_OK;
+
+        /* allow parallel reading of server and standard input */
+        FD_SET(client_fd, &read_set);
+#ifndef WIN32
+        /* win32 doesn't like mixing up stdin and sockets */
+        FD_SET(STDIN_FILENO, &read_set);
+
+        if ((res = select(client_fd+1, &read_set, NULL, NULL, NULL)) > 0)
+        {
+            /* read standard input? */
+            if (FD_ISSET(STDIN_FILENO, &read_set))
+#endif
+            {
+                if (fgets((char *)buf, sizeof(buf), stdin) == NULL)
+                {
+                    /* bomb out of here */
+                    ssl_free(ssl);
+                    break;
+                }
+                else
+                {
+                    /* small hack to check renegotiation */
+                    if (buf[0] == 'R' && (buf[1] == '\n' || buf[1] == '\r'))
+                    {
+                        res = ssl_renegotiate(ssl);
+                    }
+                    else
+                    {
+                        res = ssl_write(ssl, buf, strlen((char *)buf)+1);
+                    }
+                }
+            }
+#ifndef WIN32
+            else    /* a socket read */
+            {
+                uint8_t *read_buf;
+
+                res = ssl_read(ssl, &read_buf);
+
+                if (res > 0)    /* display our interesting output */
+                {
+                    printf("%s", read_buf);
+                    TTY_FLUSH();
+                }
+            }
+        }
+#endif
+
+        if (res < 0)
+        {
+            if (!quiet)
+            {
+                ssl_display_error(res);
+            }
+
+            break;      /* get outta here */
+        }
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    SOCKET_CLOSE(client_fd);
+#else
+    print_client_options(argv[1]);
+#endif
+}
+
+/**
+ * We've had some sort of command-line error. Print out the basic options.
+ */
+static void print_options(char *option)
+{
+    printf("axssl: Error: '%s' is an invalid command.\n", option);
+    printf("usage: axssl [s_server|s_client|version] [args ...]\n");
+    exit(1);
+}
+
+/**
+ * We've had some sort of command-line error. Print out the server options.
+ */
+static void print_server_options(char *option)
+{
+#ifndef CONFIG_SSL_SKELETON_MODE
+    int cert_size = ssl_get_config(SSL_MAX_CERT_CFG_OFFSET);
+#endif
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    int ca_cert_size = ssl_get_config(SSL_MAX_CA_CERT_CFG_OFFSET);
+#endif
+
+    printf("unknown option %s\n", option);
+    printf("usage: s_server [args ...]\n");
+    printf(" -accept arg\t- port to accept on (default is 4433)\n");
+#ifndef CONFIG_SSL_SKELETON_MODE
+    printf(" -cert arg\t- certificate file to add (in addition to default)"
+                                    " to chain -\n"
+          "\t\t  Can repeat up to %d times\n", cert_size);
+    printf(" -key arg\t- Private key file to use\n");
+    printf(" -pass\t\t- private key file pass phrase source\n");
+#endif
+    printf(" -quiet\t\t- No server output\n");
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    printf(" -verify\t- turn on peer certificate verification\n");
+    printf(" -CAfile arg\t- Certificate authority\n");
+    printf("\t\t  Can repeat up to %d times\n", ca_cert_size);
+#endif
+#ifdef CONFIG_SSL_FULL_MODE
+    printf(" -debug\t\t- Print more output\n");
+    printf(" -state\t\t- Show state messages\n");
+    printf(" -show-rsa\t- Show RSA state\n");
+#endif
+    exit(1);
+}
+
+/**
+ * We've had some sort of command-line error. Print out the client options.
+ */
+static void print_client_options(char *option)
+{
+#ifdef CONFIG_SSL_ENABLE_CLIENT
+    int cert_size = ssl_get_config(SSL_MAX_CERT_CFG_OFFSET);
+    int ca_cert_size = ssl_get_config(SSL_MAX_CA_CERT_CFG_OFFSET);
+#endif
+
+    printf("unknown option %s\n", option);
+#ifdef CONFIG_SSL_ENABLE_CLIENT
+    printf("usage: s_client [args ...]\n");
+    printf(" -connect host:port - who to connect to (default "
+            "is localhost:4433)\n");
+    printf(" -verify\t- turn on peer certificate verification\n");
+    printf(" -cert arg\t- certificate file to use\n");
+    printf("\t\t  Can repeat up to %d times\n", cert_size);
+    printf(" -key arg\t- Private key file to use\n");
+    printf(" -CAfile arg\t- Certificate authority\n");
+    printf("\t\t  Can repeat up to %d times\n", ca_cert_size);
+    printf(" -quiet\t\t- No client output\n");
+    printf(" -reconnect\t- Drop and re-make the connection "
+            "with the same Session-ID\n");
+    printf(" -pass\t\t- private key file pass phrase source\n");
+#ifdef CONFIG_SSL_FULL_MODE
+    printf(" -debug\t\t- Print more output\n");
+    printf(" -state\t\t- Show state messages\n");
+    printf(" -show-rsa\t- Show RSA state\n");
+#endif
+#else
+    printf("Change configuration to allow this feature\n");
+#endif
+    exit(1);
+}
+
+/**
+ * Display what cipher we are using 
+ */
+static void display_cipher(SSL *ssl)
+{
+    printf("CIPHER is ");
+    switch (ssl_get_cipher_id(ssl))
+    {
+        case SSL_AES128_SHA:
+            printf("AES128-SHA");
+            break;
+
+        case SSL_AES256_SHA:
+            printf("AES256-SHA");
+            break;
+
+        case SSL_RC4_128_SHA:
+            printf("RC4-SHA");
+            break;
+
+        case SSL_RC4_128_MD5:
+            printf("RC4-MD5");
+            break;
+
+        default:
+            printf("Unknown - %d", ssl_get_cipher_id(ssl));
+            break;
+    }
+
+    printf("\n");
+    TTY_FLUSH();
+}
+
+/**
+ * Display what session id we have.
+ */
+static void display_session_id(SSL *ssl)
+{    
+    int i;
+    const uint8_t *session_id = ssl_get_session_id(ssl);
+    int sess_id_size = ssl_get_session_id_size(ssl);
+
+    if (sess_id_size > 0)
+    {
+        printf("-----BEGIN SSL SESSION PARAMETERS-----\n");
+        for (i = 0; i < sess_id_size; i++)
+        {
+            printf("%02x", session_id[i]);
+        }
+
+        printf("\n-----END SSL SESSION PARAMETERS-----\n");
+        TTY_FLUSH();
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/csharp/Makefile b/trunk/package/luci/libs/nixio/axTLS/samples/csharp/Makefile
new file mode 100644
index 00000000..46c2421d
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/csharp/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../config/.config
+include ../../config/makefile.conf
+include ../../config/makefile.dotnet.conf
+
+all : sample
+TARGET=../../$(STAGE)/axssl.csharp.exe
+sample : $(TARGET)
+
+$(TARGET): ../../bindings/csharp/axTLS.cs ../../bindings/csharp/axInterface.cs axssl.cs 
+ifdef GO_DOT_NET
+	csc.exe /nologo /t:exe /out:"`cygpath -w $@`" $(foreach file, $^, "`cygpath -w $(file)`")
+else    # use mono to build
+	mcs -out:$@ $^
+
+endif    # ARCH
+
+clean::
+	-@rm -f $(TARGET)
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/csharp/axssl.cs b/trunk/package/luci/libs/nixio/axTLS/samples/csharp/axssl.cs
new file mode 100644
index 00000000..dae2b8a4
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/csharp/axssl.cs
@@ -0,0 +1,758 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Demonstrate the use of the axTLS library in C# with a set of 
+ * command-line parameters similar to openssl. In fact, openssl clients 
+ * should be able to communicate with axTLS servers and visa-versa.
+ *
+ * This code has various bits enabled depending on the configuration. To enable
+ * the most interesting version, compile with the 'full mode' enabled.
+ *
+ * To see what options you have, run the following:
+ * > axssl.csharp.exe s_server -?
+ * > axssl.csharp.exe s_client -?
+ *
+ * The axtls shared library must be in the same directory or be found 
+ * by the OS.
+ */
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using axTLS;
+
+public class axssl
+{
+    /*
+     * Main()
+     */
+    public static void Main(string[] args)
+    {
+        if (args.Length == 1 && args[0] == "version")
+        {
+            Console.WriteLine("axssl.csharp " + SSLUtil.Version());
+            Environment.Exit(0); 
+        }
+
+        axssl runner = new axssl();
+
+        if (args.Length < 1 || (args[0] != "s_server" && args[0] != "s_client"))
+            runner.print_options(args.Length > 0 ? args[0] : "");
+
+        int build_mode = SSLUtil.BuildMode();
+
+        if (args[0] == "s_server")
+            runner.do_server(build_mode, args);
+        else 
+            runner.do_client(build_mode, args);
+    }
+
+    /*
+     * do_server()
+     */
+    private void do_server(int build_mode, string[] args)
+    {
+        int i = 1;
+        int port = 4433;
+        uint options = axtls.SSL_DISPLAY_CERTS;
+        bool quiet = false;
+        string password = null;
+        string private_key_file = null;
+
+        /* organise the cert/ca_cert lists */
+        int cert_size = SSLUtil.MaxCerts();
+        int ca_cert_size = SSLUtil.MaxCACerts();
+        string[] cert = new string[cert_size];
+        string[] ca_cert = new string[ca_cert_size];
+        int cert_index = 0;
+        int ca_cert_index = 0;
+
+        while (i < args.Length)
+        {
+            if (args[i] == "-accept")
+            {
+                if (i >= args.Length-1)
+                {
+                    print_server_options(build_mode, args[i]);
+                }
+
+                port = Int32.Parse(args[++i]);
+            }
+            else if (args[i] == "-quiet")
+            {
+                quiet = true;
+                options &= ~(uint)axtls.SSL_DISPLAY_CERTS;
+            }
+            else if (build_mode >= axtls.SSL_BUILD_SERVER_ONLY)
+            {
+                if (args[i] == "-cert")
+                {
+                    if (i >= args.Length-1 || cert_index >= cert_size)
+                    {
+                        print_server_options(build_mode, args[i]);
+                    }
+
+                    cert[cert_index++] = args[++i];
+                }
+                else if (args[i] == "-key")
+                {
+                    if (i >= args.Length-1)
+                    {
+                        print_server_options(build_mode, args[i]);
+                    }
+
+                    private_key_file = args[++i];
+                    options |= axtls.SSL_NO_DEFAULT_KEY;
+                }
+                else if (args[i] == "-pass")
+                {
+                    if (i >= args.Length-1)
+                    {
+                        print_server_options(build_mode, args[i]);
+                    }
+
+                    password = args[++i];
+                }
+                else if (build_mode >= axtls.SSL_BUILD_ENABLE_VERIFICATION)
+                {
+                    if (args[i] == "-verify")
+                    {
+                        options |= axtls.SSL_CLIENT_AUTHENTICATION;
+                    }
+                    else if (args[i] == "-CAfile")
+                    {
+                        if (i >= args.Length-1 || ca_cert_index >= ca_cert_size)
+                        {
+                            print_server_options(build_mode, args[i]);
+                        }
+
+                        ca_cert[ca_cert_index++] = args[++i];
+                    }
+                    else if (build_mode == axtls.SSL_BUILD_FULL_MODE)
+                    {
+                        if (args[i] == "-debug")
+                        {
+                            options |= axtls.SSL_DISPLAY_BYTES;
+                        }
+                        else if (args[i] == "-state")
+                        {
+                            options |= axtls.SSL_DISPLAY_STATES;
+                        }
+                        else if (args[i] == "-show-rsa")
+                        {
+                            options |= axtls.SSL_DISPLAY_RSA;
+                        }
+                        else
+                            print_server_options(build_mode, args[i]);
+                    }
+                    else
+                        print_server_options(build_mode, args[i]);
+                }
+                else 
+                    print_server_options(build_mode, args[i]);
+            }
+            else
+                print_server_options(build_mode, args[i]);
+
+            i++;
+        }
+
+        /* Create socket for incoming connections */
+        IPEndPoint ep = new IPEndPoint(IPAddress.Any, port);
+        TcpListener server_sock = new TcpListener(ep);
+        server_sock.Start();      
+
+        /**********************************************************************
+         * This is where the interesting stuff happens. Up until now we've
+         * just been setting up sockets etc. Now we do the SSL handshake.
+         **********************************************************************/
+        SSLServer ssl_ctx = new SSLServer(
+                                options, axtls.SSL_DEFAULT_SVR_SESS);
+
+        if (ssl_ctx == null)
+        {
+            Console.Error.WriteLine("Error: Server context is invalid");
+            Environment.Exit(1);
+        }
+
+        if (private_key_file != null)
+        {
+            int obj_type = axtls.SSL_OBJ_RSA_KEY;
+
+            if (private_key_file.EndsWith(".p8"))
+                obj_type = axtls.SSL_OBJ_PKCS8;
+            else if (private_key_file.EndsWith(".p12"))
+                obj_type = axtls.SSL_OBJ_PKCS12;
+
+            if (ssl_ctx.ObjLoad(obj_type,
+                             private_key_file, password) != axtls.SSL_OK)
+            {
+                Console.Error.WriteLine("Private key '" + private_key_file +
+                                                            "' is undefined.");
+                Environment.Exit(1);
+            }
+        }
+
+        for (i = 0; i < cert_index; i++)
+        {
+            if (ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CERT, 
+                                        cert[i], null) != axtls.SSL_OK)
+            {
+                Console.WriteLine("Certificate '" + cert[i] + 
+                        "' is undefined.");
+                Environment.Exit(1);
+            }
+        }
+
+        for (i = 0; i < ca_cert_index; i++)
+        {
+            if (ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CACERT, 
+                                        ca_cert[i], null) != axtls.SSL_OK)
+            {
+                Console.WriteLine("Certificate '" + cert[i] + 
+                                                        "' is undefined.");
+                Environment.Exit(1);
+            }
+        }
+
+        byte[] buf = null;
+        int res;
+
+        for (;;)
+        {
+            if (!quiet)
+            {
+                Console.WriteLine("ACCEPT");
+            }
+
+            Socket client_sock = server_sock.AcceptSocket();
+
+            SSL ssl = ssl_ctx.Connect(client_sock);
+
+            /* do the actual SSL handshake */
+            while ((res = ssl_ctx.Read(ssl, out buf)) == axtls.SSL_OK)
+            {
+                /* check when the connection has been established */
+                if (ssl.HandshakeStatus() == axtls.SSL_OK)
+                    break;
+
+                /* could do something else here */
+            }
+
+            if (res == axtls.SSL_OK) /* connection established and ok */
+            {
+                if (!quiet)
+                {
+                    display_session_id(ssl);
+                    display_cipher(ssl);
+                }
+
+                /* now read (and display) whatever the client sends us */
+                for (;;)
+                {
+                    /* keep reading until we get something interesting */
+                    while ((res = ssl_ctx.Read(ssl, out buf)) == axtls.SSL_OK)
+                    {
+                        /* could do something else here */
+                    }
+
+                    if (res < axtls.SSL_OK)
+                    {
+                        if (!quiet)
+                        {
+                            Console.WriteLine("CONNECTION CLOSED");
+                        }
+
+                        break;
+                    }
+
+                    /* convert to string */
+                    char[] str = new char[res];
+                    for (i = 0; i < res; i++)
+                    {
+                        str[i] = (char)buf[i];
+                    }
+
+                    Console.Write(str);
+                }
+            }
+            else if (!quiet)
+            {
+                SSLUtil.DisplayError(res);
+            }
+
+            /* client was disconnected or the handshake failed. */
+            ssl.Dispose();
+            client_sock.Close();
+        }
+
+        /* ssl_ctx.Dispose(); */
+    }
+
+    /*
+     * do_client()
+     */
+    private void do_client(int build_mode, string[] args)
+    {
+        if (build_mode < axtls.SSL_BUILD_ENABLE_CLIENT)
+        {
+            print_client_options(build_mode, args[1]);
+        }
+
+        int i = 1, res;
+        int port = 4433;
+        bool quiet = false;
+        string password = null;
+        int reconnect = 0;
+        string private_key_file = null;
+        string hostname = "127.0.0.1";
+
+        /* organise the cert/ca_cert lists */
+        int cert_index = 0;
+        int ca_cert_index = 0;
+        int cert_size = SSLUtil.MaxCerts();
+        int ca_cert_size = SSLUtil.MaxCACerts();
+        string[] cert = new string[cert_size];
+        string[] ca_cert = new string[ca_cert_size];
+
+        uint options = axtls.SSL_SERVER_VERIFY_LATER|axtls.SSL_DISPLAY_CERTS;
+        byte[] session_id = null;
+
+        while (i < args.Length)
+        {
+            if (args[i] == "-connect")
+            {
+                string host_port;
+
+                if (i >= args.Length-1)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                host_port = args[++i];
+                int index_colon;
+
+                if ((index_colon = host_port.IndexOf(':')) < 0)
+                    print_client_options(build_mode, args[i]);
+
+                hostname = new string(host_port.ToCharArray(), 
+                        0, index_colon);
+                port = Int32.Parse(new String(host_port.ToCharArray(), 
+                            index_colon+1, host_port.Length-index_colon-1));
+            }
+            else if (args[i] == "-cert")
+            {
+                if (i >= args.Length-1 || cert_index >= cert_size)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                cert[cert_index++] = args[++i];
+            }
+            else if (args[i] == "-key")
+            {
+                if (i >= args.Length-1)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                private_key_file = args[++i];
+                options |= axtls.SSL_NO_DEFAULT_KEY;
+            }
+            else if (args[i] == "-CAfile")
+            {
+                if (i >= args.Length-1 || ca_cert_index >= ca_cert_size)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                ca_cert[ca_cert_index++] = args[++i];
+            }
+            else if (args[i] == "-verify")
+            {
+                options &= ~(uint)axtls.SSL_SERVER_VERIFY_LATER;
+            }
+            else if (args[i] == "-reconnect")
+            {
+                reconnect = 4;
+            }
+            else if (args[i] == "-quiet")
+            {
+                quiet = true;
+                options &= ~(uint)axtls.SSL_DISPLAY_CERTS;
+            }
+            else if (args[i] == "-pass")
+            {
+                if (i >= args.Length-1)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                password = args[++i];
+            }
+            else if (build_mode == axtls.SSL_BUILD_FULL_MODE)
+            {
+                if (args[i] == "-debug")
+                {
+                    options |= axtls.SSL_DISPLAY_BYTES;
+                }
+                else if (args[i] == "-state")
+                {
+                    options |= axtls.SSL_DISPLAY_STATES;
+                }
+                else if (args[i] == "-show-rsa")
+                {
+                    options |= axtls.SSL_DISPLAY_RSA;
+                }
+                else
+                    print_client_options(build_mode, args[i]);
+            }
+            else    /* don't know what this is */
+                print_client_options(build_mode, args[i]);
+
+            i++;
+        }
+
+        // IPHostEntry hostInfo = Dns.Resolve(hostname); 
+        IPHostEntry hostInfo = Dns.GetHostEntry(hostname);
+        IPAddress[] addresses = hostInfo.AddressList;
+        IPEndPoint ep = new IPEndPoint(addresses[0], port); 
+        Socket client_sock = new Socket(AddressFamily.InterNetwork, 
+                SocketType.Stream, ProtocolType.Tcp);
+        client_sock.Connect(ep);
+
+        if (!client_sock.Connected)
+        {
+            Console.WriteLine("could not connect");
+            Environment.Exit(1);
+        }
+
+        if (!quiet)
+        {
+            Console.WriteLine("CONNECTED");
+        }
+
+        /**********************************************************************
+         * This is where the interesting stuff happens. Up until now we've
+         * just been setting up sockets etc. Now we do the SSL handshake.
+         **********************************************************************/
+        SSLClient ssl_ctx = new SSLClient(options,
+                                    axtls.SSL_DEFAULT_CLNT_SESS);
+
+        if (ssl_ctx == null)
+        {
+            Console.Error.WriteLine("Error: Client context is invalid");
+            Environment.Exit(1);
+        }
+
+        if (private_key_file != null)
+        {
+            int obj_type = axtls.SSL_OBJ_RSA_KEY;
+
+            if (private_key_file.EndsWith(".p8"))
+                obj_type = axtls.SSL_OBJ_PKCS8;
+            else if (private_key_file.EndsWith(".p12"))
+                obj_type = axtls.SSL_OBJ_PKCS12;
+
+            if (ssl_ctx.ObjLoad(obj_type,
+                             private_key_file, password) != axtls.SSL_OK)
+            {
+                Console.Error.WriteLine("Private key '" + private_key_file +
+                                                            "' is undefined.");
+                Environment.Exit(1);
+            }
+        }
+
+        for (i = 0; i < cert_index; i++)
+        {
+            if (ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CERT, 
+                                        cert[i], null) != axtls.SSL_OK)
+            {
+                Console.WriteLine("Certificate '" + cert[i] + 
+                        "' is undefined.");
+                Environment.Exit(1);
+            }
+        }
+
+        for (i = 0; i < ca_cert_index; i++)
+        {
+            if (ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CACERT, 
+                                        ca_cert[i], null) != axtls.SSL_OK)
+            {
+                Console.WriteLine("Certificate '" + cert[i] + 
+                                                        "' is undefined.");
+                Environment.Exit(1);
+            }
+        }
+
+        SSL ssl = new SSL(new IntPtr(0));   /* keep compiler happy */
+
+        /* Try session resumption? */
+        if (reconnect > 0)
+        {
+            while (reconnect-- > 0)
+            {
+                ssl = ssl_ctx.Connect(client_sock, session_id);
+
+                if ((res = ssl.HandshakeStatus()) != axtls.SSL_OK)
+                {
+                    if (!quiet)
+                    {
+                        SSLUtil.DisplayError(res);
+                    }
+
+                    ssl.Dispose();
+                    Environment.Exit(1);
+                }
+
+                display_session_id(ssl);
+                session_id = ssl.GetSessionId();
+
+                if (reconnect > 0)
+                {
+                    ssl.Dispose();
+                    client_sock.Close();
+                    
+                    /* and reconnect */
+                    client_sock = new Socket(AddressFamily.InterNetwork, 
+                        SocketType.Stream, ProtocolType.Tcp);
+                    client_sock.Connect(ep);
+                }
+            }
+        }
+        else
+        {
+            ssl = ssl_ctx.Connect(client_sock, null);
+        }
+
+        /* check the return status */
+        if ((res = ssl.HandshakeStatus()) != axtls.SSL_OK)
+        {
+            if (!quiet)
+            {
+                SSLUtil.DisplayError(res);
+            }
+
+            Environment.Exit(1);
+        }
+
+        if (!quiet)
+        {
+            string common_name =
+                ssl.GetCertificateDN(axtls.SSL_X509_CERT_COMMON_NAME);
+
+            if (common_name != null)
+            {
+                Console.WriteLine("Common Name:\t\t\t" + common_name);
+            }
+
+            display_session_id(ssl);
+            display_cipher(ssl);
+        }
+
+        for (;;)
+        {
+            string user_input = Console.ReadLine();
+
+            if (user_input == null)
+                break;
+
+            byte[] buf = new byte[user_input.Length+2];
+            buf[buf.Length-2] = (byte)'\n';     /* add the carriage return */
+            buf[buf.Length-1] = 0;              /* null terminate */
+
+            for (i = 0; i < buf.Length-2; i++)
+            {
+                buf[i] = (byte)user_input[i];
+            }
+
+            if ((res = ssl_ctx.Write(ssl, buf, buf.Length)) < axtls.SSL_OK)
+            {
+                if (!quiet)
+                {
+                    SSLUtil.DisplayError(res);
+                }
+
+                break;
+            }
+        }
+
+        ssl_ctx.Dispose();
+    }
+
+    /**
+     * We've had some sort of command-line error. Print out the basic options.
+     */
+    private void print_options(string option)
+    {
+        Console.WriteLine("axssl: Error: '" + option + 
+                "' is an invalid command.");
+        Console.WriteLine("usage: axssl.csharp [s_server|" +
+                            "s_client|version] [args ...]");
+        Environment.Exit(1);
+    }
+
+    /**
+     * We've had some sort of command-line error. Print out the server options.
+     */
+    private void print_server_options(int build_mode, string option)
+    {
+        int cert_size = SSLUtil.MaxCerts();
+        int ca_cert_size = SSLUtil.MaxCACerts();
+
+        Console.WriteLine("unknown option " + option);
+        Console.WriteLine("usage: s_server [args ...]");
+        Console.WriteLine(" -accept arg\t- port to accept on (default " + 
+                "is 4433)");
+        Console.WriteLine(" -quiet\t\t- No server output");
+
+        if (build_mode >= axtls.SSL_BUILD_SERVER_ONLY)
+        {
+          Console.WriteLine(" -cert arg\t- certificate file to add (in " + 
+                  "addition to default) to chain -");
+          Console.WriteLine("\t\t  Can repeat up to " + cert_size + " times");
+          Console.WriteLine(" -key arg\t- Private key file to use");
+          Console.WriteLine(" -pass\t\t- private key file pass phrase source");
+        }
+
+        if (build_mode >= axtls.SSL_BUILD_ENABLE_VERIFICATION)
+        {
+            Console.WriteLine(" -verify\t- turn on peer certificate " +
+                    "verification");
+            Console.WriteLine(" -CAfile arg\t- Certificate authority.");
+            Console.WriteLine("\t\t  Can repeat up to " + 
+                    ca_cert_size + "times");
+        }
+
+        if (build_mode == axtls.SSL_BUILD_FULL_MODE)
+        {
+            Console.WriteLine(" -debug\t\t- Print more output");
+            Console.WriteLine(" -state\t\t- Show state messages");
+            Console.WriteLine(" -show-rsa\t- Show RSA state");
+        }
+
+        Environment.Exit(1);
+    }
+
+    /**
+     * We've had some sort of command-line error. Print out the client options.
+     */
+    private void print_client_options(int build_mode, string option)
+    {
+        int cert_size = SSLUtil.MaxCerts();
+        int ca_cert_size = SSLUtil.MaxCACerts();
+
+        Console.WriteLine("unknown option " + option);
+
+        if (build_mode >= axtls.SSL_BUILD_ENABLE_CLIENT)
+        {
+            Console.WriteLine("usage: s_client [args ...]");
+            Console.WriteLine(" -connect host:port - who to connect to " + 
+                    "(default is localhost:4433)");
+            Console.WriteLine(" -verify\t- turn on peer certificate " + 
+                    "verification");
+            Console.WriteLine(" -cert arg\t- certificate file to use");
+            Console.WriteLine("\t\t  Can repeat up to %d times", cert_size);
+            Console.WriteLine(" -key arg\t- Private key file to use");
+            Console.WriteLine(" -CAfile arg\t- Certificate authority.");
+            Console.WriteLine("\t\t  Can repeat up to " + ca_cert_size + 
+                    " times");
+            Console.WriteLine(" -quiet\t\t- No client output");
+            Console.WriteLine(" -pass\t\t- private key file pass " + 
+                    "phrase source");
+            Console.WriteLine(" -reconnect\t- Drop and re-make the " +
+                    "connection with the same Session-ID");
+
+            if (build_mode == axtls.SSL_BUILD_FULL_MODE)
+            {
+                Console.WriteLine(" -debug\t\t- Print more output");
+                Console.WriteLine(" -state\t\t- Show state messages");
+                Console.WriteLine(" -show-rsa\t- Show RSA state");
+            }
+        }
+        else 
+        {
+            Console.WriteLine("Change configuration to allow this feature");
+        }
+
+        Environment.Exit(1);
+    }
+
+    /**
+     * Display what cipher we are using 
+     */
+    private void display_cipher(SSL ssl)
+    {
+        Console.Write("CIPHER is ");
+
+        switch (ssl.GetCipherId())
+        {
+            case axtls.SSL_AES128_SHA:
+                Console.WriteLine("AES128-SHA");
+                break;
+
+            case axtls.SSL_AES256_SHA:
+                Console.WriteLine("AES256-SHA");
+                break;
+
+            case axtls.SSL_RC4_128_SHA:
+                Console.WriteLine("RC4-SHA");
+                break;
+
+            case axtls.SSL_RC4_128_MD5:
+                Console.WriteLine("RC4-MD5");
+                break;
+
+            default:
+                Console.WriteLine("Unknown - " + ssl.GetCipherId());
+                break;
+        }
+    }
+
+    /**
+     * Display what session id we have.
+     */
+    private void display_session_id(SSL ssl)
+    {    
+        byte[] session_id = ssl.GetSessionId();
+
+        if (session_id.Length > 0)
+        {
+            Console.WriteLine("-----BEGIN SSL SESSION PARAMETERS-----");
+            foreach (byte b in session_id)
+            {
+                Console.Write("{0:x02}", b);
+            }
+
+            Console.WriteLine("\n-----END SSL SESSION PARAMETERS-----");
+        }
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/java/Makefile b/trunk/package/luci/libs/nixio/axTLS/samples/java/Makefile
new file mode 100644
index 00000000..b10a79f3
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/java/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../config/.config
+include ../../config/makefile.conf
+include ../../config/makefile.java.conf
+
+all : sample
+JAR=../../$(STAGE)/axtls.jar
+CLASSES=../../bindings/java/classes
+sample : $(JAR)
+
+$(JAR) : $(CLASSES)/axssl.class $(wildcard $(CLASSES)/axTLSj/*.class)
+	jar mcvf manifest.mf $@ -C $(CLASSES) axTLSj -C $(CLASSES) axssl.class
+
+JAVA_FILES=axssl.java
+JAVA_CLASSES:=$(JAVA_FILES:%.java=$(CLASSES)/axTLSj/%.class)
+
+$(CLASSES)/%.class : %.java
+	javac -d $(CLASSES) -classpath $(CLASSES) $^
+
+clean::
+	-@rm -f $(TARGET)
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/java/axssl.java b/trunk/package/luci/libs/nixio/axTLS/samples/java/axssl.java
new file mode 100644
index 00000000..2057f296
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/java/axssl.java
@@ -0,0 +1,760 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Demonstrate the use of the axTLS library in Java with a set of 
+ * command-line parameters similar to openssl. In fact, openssl clients 
+ * should be able to communicate with axTLS servers and visa-versa.  *
+ * This code has various bits enabled depending on the configuration. To enable
+ * the most interesting version, compile with the 'full mode' enabled.
+ *
+ * To see what options you have, run the following:
+ * > java -jar axtls.jar s_server -?
+ * > java -jar axtls.jar s_client -?
+ *
+ * The axtls/axtlsj shared libraries must be in the same directory or be found 
+ * by the OS.
+ */
+
+import java.io.*;
+import java.util.*;
+import java.net.*;
+import axTLSj.*;
+
+public class axssl
+{
+   /*
+     * Main()
+     */
+    public static void main(String[] args)
+    {
+        if (args.length == 1 && args[0].equals("version"))
+        {
+            System.out.println("axtls.jar " + SSLUtil.version());
+            System.exit(0);
+        }
+
+        axssl runner = new axssl();
+
+        try
+        {
+            if (args.length < 1 || 
+                    (!args[0].equals("s_server") &&
+                     !args[0].equals("s_client")))
+            {
+                runner.print_options(args.length > 0 ? args[0] : "");
+            }
+
+            int build_mode = SSLUtil.buildMode();
+
+            if (args[0].equals("s_server"))
+                runner.do_server(build_mode, args);
+            else 
+                runner.do_client(build_mode, args);
+        }
+        catch (Exception e) 
+        {
+            System.out.println(e);
+        }
+    }
+
+    /*
+     * do_server()
+     */
+    private void do_server(int build_mode, String[] args)
+                    throws Exception
+    {
+        int i = 1;
+        int port = 4433;
+        int options = axtlsj.SSL_DISPLAY_CERTS;
+        boolean quiet = false;
+        String password = null;
+        String private_key_file = null;
+
+        /* organise the cert/ca_cert lists */
+        int cert_size = SSLUtil.maxCerts();
+        int ca_cert_size = SSLUtil.maxCACerts();
+        String[] cert = new String[cert_size];
+        String[] ca_cert = new String[ca_cert_size];
+        int cert_index = 0;
+        int ca_cert_index = 0;
+
+        while (i < args.length)
+        {
+            if (args[i].equals("-accept"))
+            {
+                if (i >= args.length-1)
+                {
+                    print_server_options(build_mode, args[i]);
+                }
+
+                port = Integer.parseInt(args[++i]);
+            }
+            else if (args[i].equals("-quiet"))
+            {
+                quiet = true;
+                options &= ~(int)axtlsj.SSL_DISPLAY_CERTS;
+            }
+            else if (build_mode >= axtlsj.SSL_BUILD_SERVER_ONLY)
+            {
+                if (args[i].equals("-cert"))
+                {
+                    if (i >= args.length-1 || cert_index >= cert_size)
+                    {
+                        print_server_options(build_mode, args[i]);
+                    }
+
+                    cert[cert_index++] = args[++i];
+                }
+                else if (args[i].equals("-key"))
+                {
+                    if (i >= args.length-1)
+                    {
+                        print_server_options(build_mode, args[i]);
+                    }
+
+                    private_key_file = args[++i];
+                    options |= axtlsj.SSL_NO_DEFAULT_KEY;
+                }
+                else if (args[i].equals("-pass"))
+                {
+                    if (i >= args.length-1)
+                    {
+                        print_server_options(build_mode, args[i]);
+                    }
+
+                    password = args[++i];
+                }
+                else if (build_mode >= axtlsj.SSL_BUILD_ENABLE_VERIFICATION)
+                {
+                    if (args[i].equals("-verify"))
+                    {
+                        options |= axtlsj.SSL_CLIENT_AUTHENTICATION;
+                    }
+                    else if (args[i].equals("-CAfile"))
+                    {
+                        if (i >= args.length-1 || ca_cert_index >= ca_cert_size)
+                        {
+                            print_server_options(build_mode, args[i]);
+                        }
+
+                        ca_cert[ca_cert_index++] = args[++i];
+                    }
+                    else if (build_mode == axtlsj.SSL_BUILD_FULL_MODE)
+                    {
+                        if (args[i].equals("-debug"))
+                        {
+                            options |= axtlsj.SSL_DISPLAY_BYTES;
+                        }
+                        else if (args[i].equals("-state"))
+                        {
+                            options |= axtlsj.SSL_DISPLAY_STATES;
+                        }
+                        else if (args[i].equals("-show-rsa"))
+                        {
+                            options |= axtlsj.SSL_DISPLAY_RSA;
+                        }
+                        else
+                            print_server_options(build_mode, args[i]);
+                    }
+                    else
+                        print_server_options(build_mode, args[i]);
+                }
+                else 
+                    print_server_options(build_mode, args[i]);
+            }
+            else 
+                print_server_options(build_mode, args[i]);
+
+            i++;
+        }
+
+        /* Create socket for incoming connections */
+        ServerSocket server_sock = new ServerSocket(port);
+
+        /**********************************************************************
+         * This is where the interesting stuff happens. Up until now we've
+         * just been setting up sockets etc. Now we do the SSL handshake.
+         **********************************************************************/
+        SSLServer ssl_ctx = new SSLServer(options, 
+                                    axtlsj.SSL_DEFAULT_SVR_SESS);
+
+        if (ssl_ctx == null)
+            throw new Exception("Error: Server context is invalid");
+
+        if (private_key_file != null)
+        {
+            int obj_type =  axtlsj.SSL_OBJ_RSA_KEY;
+
+            if (private_key_file.endsWith(".p8"))
+                obj_type = axtlsj.SSL_OBJ_PKCS8;
+            else if (private_key_file.endsWith(".p12"))
+                obj_type = axtlsj.SSL_OBJ_PKCS12;
+
+            if (ssl_ctx.objLoad(obj_type, 
+                            private_key_file, password) != axtlsj.SSL_OK)
+            {
+                throw new Exception("Error: Private key '" + private_key_file + 
+                        "' is undefined.");
+            }
+        }
+
+        for (i = 0; i < cert_index; i++)
+        {
+            if (ssl_ctx.objLoad(axtlsj.SSL_OBJ_X509_CERT, 
+                                        cert[i], null) != axtlsj.SSL_OK)
+            {
+                throw new Exception("Certificate '" + cert[i] + 
+                        "' is undefined.");
+            }
+        }
+
+        for (i = 0; i < ca_cert_index; i++)
+        {
+            if (ssl_ctx.objLoad(axtlsj.SSL_OBJ_X509_CACERT, 
+                                        ca_cert[i], null) != axtlsj.SSL_OK)
+            {
+                throw new Exception("Certificate '" + ca_cert[i] + 
+                        "' is undefined.");
+            }
+        }
+
+        int res;
+        SSLReadHolder rh = new SSLReadHolder();
+
+        for (;;)
+        {
+            if (!quiet)
+            {
+                System.out.println("ACCEPT");
+            }
+
+            Socket client_sock = server_sock.accept();
+
+            SSL ssl = ssl_ctx.connect(client_sock);
+
+            while ((res = ssl_ctx.read(ssl, rh)) == axtlsj.SSL_OK)
+            {
+                /* check when the connection has been established */
+                if (ssl.handshakeStatus() == axtlsj.SSL_OK)
+                    break;
+
+                /* could do something else here */
+            }
+
+            if (res == axtlsj.SSL_OK) /* connection established and ok */
+            {
+                if (!quiet)
+                {
+                    display_session_id(ssl);
+                    display_cipher(ssl);
+                }
+
+                /* now read (and display) whatever the client sends us */
+                for (;;)
+                {
+                    /* keep reading until we get something interesting */
+                    while ((res = ssl_ctx.read(ssl, rh)) == axtlsj.SSL_OK)
+                    {
+                        /* could do something else here */
+                    }
+
+                    if (res < axtlsj.SSL_OK)
+                    {
+                        if (!quiet)
+                        {
+                            System.out.println("CONNECTION CLOSED");
+                        }
+
+                        break;
+                    }
+
+                    /* convert to String */
+                    byte[] buf = rh.getData();
+                    char[] str = new char[res];
+
+                    for (i = 0; i < res; i++)
+                    {
+                        str[i] = (char)buf[i];
+                    }
+
+                    System.out.print(str);
+                }
+            }
+            else if (!quiet)
+            {
+                SSLUtil.displayError(res);
+            }
+
+            /* client was disconnected or the handshake failed. */
+            ssl.dispose();
+            client_sock.close();
+        }
+
+        /* ssl_ctx.dispose(); */
+    }
+
+    /*
+     * do_client()
+     */
+    private void do_client(int build_mode, String[] args)
+                    throws Exception
+    {
+        if (build_mode < axtlsj.SSL_BUILD_ENABLE_CLIENT)
+            print_client_options(build_mode, args[1]);
+
+        int i = 1, res;
+        int port = 4433;
+        boolean quiet = false;
+        String password = null;
+        int reconnect = 0;
+        String private_key_file = null;
+        String hostname = "127.0.0.1";
+
+        /* organise the cert/ca_cert lists */
+        int cert_index = 0;
+        int ca_cert_index = 0;
+        int cert_size = SSLUtil.maxCerts();
+        int ca_cert_size = SSLUtil.maxCACerts();
+        String[] cert = new String[cert_size];
+        String[] ca_cert = new String[ca_cert_size];
+
+        int options = axtlsj.SSL_SERVER_VERIFY_LATER|axtlsj.SSL_DISPLAY_CERTS;
+        byte[] session_id = null;
+
+        while (i < args.length)
+        {
+            if (args[i].equals("-connect"))
+            {
+                String host_port;
+
+                if (i >= args.length-1)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                host_port = args[++i];
+                int index_colon;
+
+                if ((index_colon = host_port.indexOf(':')) < 0)
+                    print_client_options(build_mode, args[i]);
+
+                hostname = new String(host_port.toCharArray(), 
+                        0, index_colon);
+                port = Integer.parseInt(new String(host_port.toCharArray(), 
+                            index_colon+1, host_port.length()-index_colon-1));
+            }
+            else if (args[i].equals("-cert"))
+            {
+                if (i >= args.length-1 || cert_index >= cert_size)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                cert[cert_index++] = args[++i];
+            }
+            else if (args[i].equals("-CAfile"))
+            {
+                if (i >= args.length-1 || ca_cert_index >= ca_cert_size)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                ca_cert[ca_cert_index++] = args[++i];
+            }
+            else if (args[i].equals("-key"))
+            {
+                if (i >= args.length-1)
+                {
+                    print_client_options(build_mode, args[i]);
+                }
+
+                private_key_file = args[++i];
+                options |= axtlsj.SSL_NO_DEFAULT_KEY;
+            }
+            else if (args[i].equals("-verify"))
+            {
+                options &= ~(int)axtlsj.SSL_SERVER_VERIFY_LATER;
+            }
+            else if (args[i].equals("-reconnect"))
+            {
+                reconnect = 4;
+            }
+            else if (args[i].equals("-quiet"))
+            {
+                quiet = true;
+                options &= ~(int)axtlsj.SSL_DISPLAY_CERTS;
+            }
+            else if (args[i].equals("-pass"))
+            {
+                if (i >= args.length-1)
+                {
+                    print_server_options(build_mode, args[i]);
+                }
+
+                password = args[++i];
+            }
+            else if (build_mode == axtlsj.SSL_BUILD_FULL_MODE)
+            {
+                if (args[i].equals("-debug"))
+                {
+                    options |= axtlsj.SSL_DISPLAY_BYTES;
+                }
+                else if (args[i].equals("-state"))
+                {
+                    options |= axtlsj.SSL_DISPLAY_STATES;
+                }
+                else if (args[i].equals("-show-rsa"))
+                {
+                    options |= axtlsj.SSL_DISPLAY_RSA;
+                }
+                else
+                    print_client_options(build_mode, args[i]);
+            }
+            else    /* don't know what this is */
+                print_client_options(build_mode, args[i]);
+
+            i++;
+        }
+
+        Socket client_sock = new Socket(hostname, port);
+
+        if (!client_sock.isConnected())
+        {
+            System.out.println("could not connect");
+            throw new Exception();
+        }
+
+        if (!quiet)
+        {
+            System.out.println("CONNECTED");
+        }
+
+        /**********************************************************************
+         * This is where the interesting stuff happens. Up until now we've
+         * just been setting up sockets etc. Now we do the SSL handshake.
+         **********************************************************************/
+        SSLClient ssl_ctx = new SSLClient(options, 
+                                    axtlsj.SSL_DEFAULT_CLNT_SESS);
+
+        if (ssl_ctx == null)
+        {
+            throw new Exception("Error: Client context is invalid");
+        }
+
+        if (private_key_file != null)
+        {
+            int obj_type =  axtlsj.SSL_OBJ_RSA_KEY;
+
+            if (private_key_file.endsWith(".p8"))
+                obj_type = axtlsj.SSL_OBJ_PKCS8;
+            else if (private_key_file.endsWith(".p12"))
+                obj_type = axtlsj.SSL_OBJ_PKCS12;
+
+            if (ssl_ctx.objLoad(obj_type, 
+                            private_key_file, password) != axtlsj.SSL_OK)
+            {
+                throw new Exception("Error: Private key '" + private_key_file + 
+                        "' is undefined.");
+            }
+        }
+
+        for (i = 0; i < cert_index; i++)
+        {
+            if (ssl_ctx.objLoad(axtlsj.SSL_OBJ_X509_CERT, 
+                                        cert[i], null) != axtlsj.SSL_OK)
+            {
+                throw new Exception("Certificate '" + cert[i] + 
+                        "' is undefined.");
+            }
+        }
+
+        for (i = 0; i < ca_cert_index; i++)
+        {
+            if (ssl_ctx.objLoad(axtlsj.SSL_OBJ_X509_CACERT, 
+                                        ca_cert[i], null) != axtlsj.SSL_OK)
+            {
+                throw new Exception("Certificate '" + ca_cert[i] + 
+                        "' is undefined.");
+            }
+        }
+
+        SSL ssl = null;
+
+        /* Try session resumption? */
+        if (reconnect > 0)
+        {
+            while (reconnect-- > 0)
+            {
+                ssl = ssl_ctx.connect(client_sock, session_id);
+
+                if ((res = ssl.handshakeStatus()) != axtlsj.SSL_OK)
+                {
+                    if (!quiet)
+                    {
+                        SSLUtil.displayError(res);
+                    }
+
+                    ssl.dispose();
+                    throw new Exception();
+                }
+
+                display_session_id(ssl);
+                session_id = ssl.getSessionId();
+
+                if (reconnect > 0)
+                {
+                    ssl.dispose();
+                    client_sock.close();
+                    
+                    /* and reconnect */
+                    client_sock = new Socket(hostname, port);
+                }
+            }
+        }
+        else
+        {
+            ssl = ssl_ctx.connect(client_sock, null);
+        }
+
+        /* check the return status */
+        if ((res = ssl.handshakeStatus()) != axtlsj.SSL_OK)
+        {
+            if (!quiet)
+            {
+                SSLUtil.displayError(res);
+            }
+
+            throw new Exception();
+        }
+
+        if (!quiet)
+        {
+            String common_name =
+                ssl.getCertificateDN(axtlsj.SSL_X509_CERT_COMMON_NAME);
+
+            if (common_name != null)
+            {
+                System.out.println("Common Name:\t\t\t" + common_name);
+            }
+
+            display_session_id(ssl);
+            display_cipher(ssl);
+        }
+
+        BufferedReader in = new BufferedReader(
+                new InputStreamReader(System.in));
+
+        for (;;)
+        {
+            String user_input = in.readLine();
+
+            if (user_input == null)
+                break;
+
+            byte[] buf = new byte[user_input.length()+2];
+            buf[buf.length-2] = (byte)'\n';     /* add the carriage return */
+            buf[buf.length-1] = 0;              /* null terminate */
+
+            for (i = 0; i < buf.length-2; i++)
+            {
+                buf[i] = (byte)user_input.charAt(i);
+            }
+
+            if ((res = ssl_ctx.write(ssl, buf)) < axtlsj.SSL_OK)
+            {
+                if (!quiet)
+                {
+                    SSLUtil.displayError(res);
+                }
+
+                break;
+            }
+        }
+
+        ssl_ctx.dispose();
+    }
+
+    /**
+     * We've had some sort of command-line error. Print out the basic options.
+     */
+    private void print_options(String option)
+    {
+        System.out.println("axssl: Error: '" + option + 
+                "' is an invalid command.");
+        System.out.println("usage: axtlsj.jar [s_server|s_client|version] " + 
+                "[args ...]");
+        System.exit(1);
+    }
+
+    /**
+     * We've had some sort of command-line error. Print out the server options.
+     */
+    private void print_server_options(int build_mode, String option)
+    {
+        int cert_size = SSLUtil.maxCerts();
+        int ca_cert_size = SSLUtil.maxCACerts();
+
+        System.out.println("unknown option " + option);
+        System.out.println("usage: s_server [args ...]");
+        System.out.println(" -accept arg\t- port to accept on (default " + 
+                "is 4433)");
+        System.out.println(" -quiet\t\t- No server output");
+
+        if (build_mode >= axtlsj.SSL_BUILD_SERVER_ONLY)
+        {
+            System.out.println(" -cert arg\t- certificate file to add (in " + 
+                    "addition to default) to chain -");
+            System.out.println("\t\t  Can repeat up to " + cert_size + " times");
+            System.out.println(" -key arg\t- Private key file to use");
+            System.out.println(" -pass\t\t- private key file pass phrase source");
+        }
+
+        if (build_mode >= axtlsj.SSL_BUILD_ENABLE_VERIFICATION)
+        {
+            System.out.println(" -verify\t- turn on peer certificate " +
+                    "verification");
+            System.out.println(" -CAfile arg\t- Certificate authority. ");
+            System.out.println("\t\t  Can repeat up to " + 
+                    ca_cert_size + " times");
+        }
+
+        if (build_mode == axtlsj.SSL_BUILD_FULL_MODE)
+        {
+            System.out.println(" -debug\t\t- Print more output");
+            System.out.println(" -state\t\t- Show state messages");
+            System.out.println(" -show-rsa\t- Show RSA state");
+        }
+
+        System.exit(1);
+    }
+
+    /**
+     * We've had some sort of command-line error. Print out the client options.
+     */
+    private void print_client_options(int build_mode, String option)
+    {
+        int cert_size = SSLUtil.maxCerts();
+        int ca_cert_size = SSLUtil.maxCACerts();
+
+        System.out.println("unknown option " + option);
+
+        if (build_mode >= axtlsj.SSL_BUILD_ENABLE_CLIENT)
+        {
+            System.out.println("usage: s_client [args ...]");
+            System.out.println(" -connect host:port - who to connect to " + 
+                    "(default is localhost:4433)");
+            System.out.println(" -verify\t- turn on peer certificate " + 
+                    "verification");
+            System.out.println(" -cert arg\t- certificate file to use");
+            System.out.println(" -key arg\t- Private key file to use");
+            System.out.println("\t\t  Can repeat up to " + cert_size + 
+                    " times");
+            System.out.println(" -CAfile arg\t- Certificate authority.");
+            System.out.println("\t\t  Can repeat up to " + ca_cert_size + 
+                    " times");
+            System.out.println(" -quiet\t\t- No client output");
+            System.out.println(" -pass\t\t- private key file pass " + 
+                        "phrase source");
+            System.out.println(" -reconnect\t- Drop and re-make the " +
+                    "connection with the same Session-ID");
+
+            if (build_mode == axtlsj.SSL_BUILD_FULL_MODE)
+            {
+                System.out.println(" -debug\t\t- Print more output");
+                System.out.println(" -state\t\t- Show state messages");
+                System.out.println(" -show-rsa\t- Show RSA state");
+            }
+        }
+        else 
+        {
+            System.out.println("Change configuration to allow this feature");
+        }
+
+        System.exit(1);
+    }
+
+    /**
+     * Display what cipher we are using 
+     */
+    private void display_cipher(SSL ssl)
+    {
+        System.out.print("CIPHER is ");
+
+        byte ciph_id = ssl.getCipherId();
+
+        if (ciph_id == axtlsj.SSL_AES128_SHA)
+            System.out.println("AES128-SHA");
+        else if (ciph_id == axtlsj.SSL_AES256_SHA)
+            System.out.println("AES256-SHA");
+        else if (ciph_id == axtlsj.SSL_RC4_128_SHA)
+            System.out.println("RC4-SHA");
+        else if (ciph_id == axtlsj.SSL_RC4_128_MD5)
+            System.out.println("RC4-MD5");
+        else
+            System.out.println("Unknown - " + ssl.getCipherId());
+    }
+
+    public char toHexChar(int i)
+    {
+        if ((0 <= i) && (i <= 9 ))
+            return (char)('0' + i);
+        else
+            return (char)('a' + (i-10));
+    }
+
+    public void bytesToHex(byte[] data) 
+    {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < data.length; i++ ) 
+        {
+            buf.append(toHexChar((data[i]>>>4)&0x0F));
+            buf.append(toHexChar(data[i]&0x0F));
+        }
+
+        System.out.println(buf);
+    }
+
+
+    /**
+     * Display what session id we have.
+     */
+    private void display_session_id(SSL ssl)
+    {    
+        byte[] session_id = ssl.getSessionId();
+
+        if (session_id.length > 0)
+        {
+            System.out.println("-----BEGIN SSL SESSION PARAMETERS-----");
+            bytesToHex(session_id);
+            System.out.println("-----END SSL SESSION PARAMETERS-----");
+        }
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/java/manifest.mf b/trunk/package/luci/libs/nixio/axTLS/samples/java/manifest.mf
new file mode 100644
index 00000000..b906ed29
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/java/manifest.mf
@@ -0,0 +1 @@
+Main-Class: axssl
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/lua/Makefile b/trunk/package/luci/libs/nixio/axTLS/samples/lua/Makefile
new file mode 100644
index 00000000..a460da3c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/lua/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../config/.config
+include ../../config/makefile.conf
+
+all: samples
+TARGET=../../$(STAGE)/axssl.lua
+samples: $(TARGET)
+
+$(TARGET): axssl.lua
+	install $< $@
+
+clean::
+	-@rm -f $(TARGET)
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/lua/axssl.lua b/trunk/package/luci/libs/nixio/axTLS/samples/lua/axssl.lua
new file mode 100755
index 00000000..6ea26b69
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/lua/axssl.lua
@@ -0,0 +1,562 @@
+#!/usr/local/bin/lua
+
+--
+-- Copyright (c) 2007, Cameron Rich
+--
+-- All rights reserved.
+--
+-- Redistribution and use in source and binary forms, with or without
+-- modification, are permitted provided that the following conditions are met:
+--
+-- * Redistributions of source code must retain the above copyright notice,
+--   this list of conditions and the following disclaimer.
+-- * Redistributions in binary form must reproduce the above copyright
+--   notice, this list of conditions and the following disclaimer in the
+--   documentation and/or other materials provided with the distribution.
+-- * Neither the name of the axTLS project nor the names of its
+--   contributors may be used to endorse or promote products derived
+--   from this software without specific prior written permission.
+--
+-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+-- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+-- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+-- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+-- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--
+
+--
+-- Demonstrate the use of the axTLS library in Lua with a set of 
+-- command-line parameters similar to openssl. In fact, openssl clients 
+-- should be able to communicate with axTLS servers and visa-versa.
+--
+-- This code has various bits enabled depending on the configuration. To enable
+-- the most interesting version, compile with the 'full mode' enabled.
+--
+-- To see what options you have, run the following:
+-- > [lua] axssl s_server -?
+-- > [lua] axssl s_client -?
+--
+-- The axtls/axtlsl shared libraries must be in the same directory or be found 
+-- by the OS.
+--
+--
+require "bit"
+require("axtlsl")
+local socket = require("socket")
+
+-- print version?
+if #arg == 1 and arg[1] == "version" then
+    print("axssl.lua "..axtlsl.ssl_version())
+    os.exit(1)
+end
+
+--
+-- We've had some sort of command-line error. Print out the basic options.
+--
+function print_options(option)
+    print("axssl: Error: '"..option.."' is an invalid command.")
+    print("usage: axssl [s_server|s_client|version] [args ...]")
+    os.exit(1)
+end
+
+--
+-- We've had some sort of command-line error. Print out the server options.
+--
+function print_server_options(build_mode, option)
+    local cert_size = axtlsl.ssl_get_config(axtlsl.SSL_MAX_CERT_CFG_OFFSET)
+    local ca_cert_size = axtlsl.ssl_get_config(
+            axtlsl.SSL_MAX_CA_CERT_CFG_OFFSET)
+
+    print("unknown option "..option)
+    print("usage: s_server [args ...]")
+    print(" -accept\t- port to accept on (default is 4433)")
+    print(" -quiet\t\t- No server output")
+
+    if build_mode >= axtlsl.SSL_BUILD_SERVER_ONLY then
+        print(" -cert arg\t- certificate file to add (in addition to "..
+                "default) to chain -")
+        print("\t\t  Can repeat up to "..cert_size.." times")
+        print(" -key arg\t- Private key file to use - default DER format")
+        print(" -pass\t\t- private key file pass phrase source")
+    end
+
+    if build_mode >= axtlsl.SSL_BUILD_ENABLE_VERIFICATION then
+        print(" -verify\t- turn on peer certificate verification")
+        print(" -CAfile arg\t- Certificate authority - default DER format")
+        print("\t\t  Can repeat up to "..ca_cert_size.." times")
+    end
+
+    if build_mode == axtlsl.SSL_BUILD_FULL_MODE then
+        print(" -debug\t\t- Print more output")
+        print(" -state\t\t- Show state messages")
+        print(" -show-rsa\t- Show RSA state")
+    end
+
+    os.exit(1)
+end
+
+--
+-- We've had some sort of command-line error. Print out the client options.
+--
+function print_client_options(build_mode, option)
+    local cert_size = axtlsl.ssl_get_config(axtlsl.SSL_MAX_CERT_CFG_OFFSET)
+    local ca_cert_size = axtlsl.ssl_get_config(
+            axtlsl.SSL_MAX_CA_CERT_CFG_OFFSET)
+
+    print("unknown option "..option)
+
+    if build_mode >= axtlsl.SSL_BUILD_ENABLE_CLIENT then
+        print("usage: s_client [args ...]")
+        print(" -connect host:port - who to connect to (default "..
+                "is localhost:4433)")
+        print(" -verify\t- turn on peer certificate verification")
+        print(" -cert arg\t- certificate file to use - default DER format")
+        print(" -key arg\t- Private key file to use - default DER format")
+        print("\t\t  Can repeat up to "..cert_size.." times")
+        print(" -CAfile arg\t- Certificate authority - default DER format")
+        print("\t\t  Can repeat up to "..ca_cert_size.."times")
+        print(" -quiet\t\t- No client output")
+        print(" -pass\t\t- private key file pass phrase source")
+        print(" -reconnect\t- Drop and re-make the connection "..
+                "with the same Session-ID")
+
+        if build_mode == axtlsl.SSL_BUILD_FULL_MODE then
+            print(" -debug\t\t- Print more output")
+            print(" -state\t\t- Show state messages")
+            print(" -show-rsa\t- Show RSA state")
+        end
+    else
+        print("Change configuration to allow this feature")
+    end
+
+    os.exit(1)
+end
+
+-- Implement the SSL server logic. 
+function do_server(build_mode)
+    local i = 2
+    local v
+    local port = 4433
+    local options = axtlsl.SSL_DISPLAY_CERTS
+    local quiet = false
+    local password = ""
+    local private_key_file = nil
+    local cert_size = axtlsl.ssl_get_config(axtlsl.SSL_MAX_CERT_CFG_OFFSET)
+    local ca_cert_size = axtlsl.
+                            ssl_get_config(axtlsl.SSL_MAX_CA_CERT_CFG_OFFSET)
+    local cert = {}
+    local ca_cert = {}
+
+    while i <= #arg do
+        if arg[i] ==  "-accept" then
+            if i >= #arg then
+                print_server_options(build_mode, arg[i])
+            end
+
+            i = i + 1
+            port = arg[i]
+        elseif arg[i] == "-quiet" then
+            quiet = true
+            options = bit.band(options, bit.bnot(axtlsl.SSL_DISPLAY_CERTS))
+        elseif build_mode >= axtlsl.SSL_BUILD_SERVER_ONLY then
+            if arg[i] == "-cert" then
+                if i >= #arg or #cert >= cert_size then
+                    print_server_options(build_mode, arg[i]) 
+                end
+
+                i = i + 1
+                table.insert(cert, arg[i])
+            elseif arg[i] == "-key" then
+                if i >= #arg then
+                    print_server_options(build_mode, arg[i]) 
+                end
+
+                i = i + 1
+                private_key_file = arg[i]
+                options = bit.bor(options, axtlsl.SSL_NO_DEFAULT_KEY)
+            elseif arg[i] == "-pass" then
+                if i >= #arg then
+                    print_server_options(build_mode, arg[i]) 
+                end
+
+                i = i + 1
+                password = arg[i]
+            elseif build_mode >= axtlsl.SSL_BUILD_ENABLE_VERIFICATION then
+                if arg[i] == "-verify" then
+                    options = bit.bor(options, axtlsl.SSL_CLIENT_AUTHENTICATION)
+                elseif arg[i] == "-CAfile" then
+                    if i >= #arg or #ca_cert >= ca_cert_size then
+                        print_server_options(build_mode, arg[i])  
+                    end
+
+                    i = i + 1
+                    table.insert(ca_cert, arg[i])
+                elseif build_mode == axtlsl.SSL_BUILD_FULL_MODE then
+                    if arg[i] == "-debug" then
+                        options = bit.bor(options, axtlsl.SSL_DISPLAY_BYTES)
+                    elseif arg[i] == "-state" then
+                        options = bit.bor(options, axtlsl.SSL_DISPLAY_STATES)
+                    elseif arg[i] == "-show-rsa" then
+                        options = bit.bor(options, axtlsl.SSL_DISPLAY_RSA)
+                    else
+                        print_server_options(build_mode, arg[i])
+                    end
+                else
+                    print_server_options(build_mode, arg[i])
+                end
+            else 
+                print_server_options(build_mode, arg[i])
+            end
+        else 
+            print_server_options(build_mode, arg[i])
+        end
+
+        i = i + 1
+    end
+
+    -- Create socket for incoming connections
+    local server_sock = socket.try(socket.bind("*", port))
+
+    ---------------------------------------------------------------------------
+    -- This is where the interesting stuff happens. Up until now we've
+    -- just been setting up sockets etc. Now we do the SSL handshake.
+    ---------------------------------------------------------------------------
+    local ssl_ctx = axtlsl.ssl_ctx_new(options, axtlsl.SSL_DEFAULT_SVR_SESS)
+    if ssl_ctx == nil then error("Error: Server context is invalid") end
+
+    if private_key_file ~= nil then
+        local obj_type = axtlsl.SSL_OBJ_RSA_KEY
+
+        if string.find(private_key_file, ".p8") then 
+            obj_type = axtlsl.SSL_OBJ_PKCS8 
+        end
+
+        if string.find(private_key_file, ".p12") then 
+            obj_type = axtlsl.SSL_OBJ_PKCS12 
+        end
+
+        if axtlsl.ssl_obj_load(ssl_ctx, obj_type, private_key_file, 
+                                        password) ~= axtlsl.SSL_OK then
+            error("Private key '" .. private_key_file .. "' is undefined.")
+        end
+    end
+
+    for _, v in ipairs(cert) do
+        if axtlsl.ssl_obj_load(ssl_ctx, axtlsl.SSL_OBJ_X509_CERT, v, "") ~= 
+                                        axtlsl.SSL_OK then
+            error("Certificate '"..v .. "' is undefined.")
+        end
+    end
+
+    for _, v in ipairs(ca_cert) do
+        if axtlsl.ssl_obj_load(ssl_ctx, axtlsl.SSL_OBJ_X509_CACERT, v, "") ~= 
+                                        axtlsl.SSL_OK then
+            error("Certificate '"..v .."' is undefined.")
+        end
+    end
+
+    while true do
+        if not quiet then print("ACCEPT") end
+        local client_sock = server_sock:accept();
+        local ssl = axtlsl.ssl_server_new(ssl_ctx, client_sock:getfd())
+
+        -- do the actual SSL handshake
+        local connected = false
+        local res
+        local buf
+
+        while true do
+            socket.select({client_sock}, nil)
+            res, buf = axtlsl.ssl_read(ssl)
+
+            if res == axtlsl.SSL_OK then -- connection established and ok
+                if axtlsl.ssl_handshake_status(ssl) == axtlsl.SSL_OK then
+                    if not quiet and not connected then
+                        display_session_id(ssl)
+                        display_cipher(ssl)
+                    end
+                    connected = true
+                end
+            end
+
+            if res > axtlsl.SSL_OK then
+                for _, v in ipairs(buf) do
+                    io.write(string.format("%c", v))
+                end
+            elseif res < axtlsl.SSL_OK then 
+                if not quiet then
+                    axtlsl.ssl_display_error(res)
+                end
+                break
+            end
+        end
+
+        -- client was disconnected or the handshake failed.
+        print("CONNECTION CLOSED")
+        axtlsl.ssl_free(ssl)
+        client_sock:close()
+    end
+
+    axtlsl.ssl_ctx_free(ssl_ctx)
+end
+
+--
+-- Implement the SSL client logic.
+--
+function do_client(build_mode)
+    local i = 2
+    local v
+    local port = 4433
+    local options = 
+            bit.bor(axtlsl.SSL_SERVER_VERIFY_LATER, axtlsl.SSL_DISPLAY_CERTS)
+    local private_key_file = nil
+    local reconnect = 0
+    local quiet = false
+    local password = ""
+    local session_id = {}
+    local host = "127.0.0.1"
+    local cert_size = axtlsl.ssl_get_config(axtlsl.SSL_MAX_CERT_CFG_OFFSET)
+    local ca_cert_size = axtlsl.
+                            ssl_get_config(axtlsl.SSL_MAX_CA_CERT_CFG_OFFSET)
+    local cert = {}
+    local ca_cert = {}
+
+    while i <= #arg do
+        if arg[i] == "-connect" then
+            if i >= #arg then
+                print_client_options(build_mode, arg[i]) 
+            end
+
+            i = i + 1
+            local t = string.find(arg[i], ":")
+            host = string.sub(arg[i], 1, t-1)
+            port = string.sub(arg[i], t+1)
+        elseif arg[i] == "-cert" then
+            if i >= #arg or #cert >= cert_size then
+                print_client_options(build_mode, arg[i]) 
+            end
+
+            i = i + 1
+            table.insert(cert, arg[i])
+        elseif arg[i] == "-key" then
+            if i >= #arg then
+                print_client_options(build_mode, arg[i])
+            end
+
+            i = i + 1
+            private_key_file = arg[i]
+            options = bit.bor(options, axtlsl.SSL_NO_DEFAULT_KEY)
+        elseif arg[i] == "-CAfile" then
+            if i >= #arg or #ca_cert >= ca_cert_size then
+                print_client_options(build_mode, arg[i]) 
+            end
+
+            i = i + 1
+            table.insert(ca_cert, arg[i])
+        elseif arg[i] == "-verify" then
+            options = bit.band(options, 
+                                bit.bnot(axtlsl.SSL_SERVER_VERIFY_LATER))
+        elseif arg[i] == "-reconnect" then
+            reconnect = 4
+        elseif arg[i] == "-quiet" then
+            quiet = true
+            options = bit.band(options, bnot(axtlsl.SSL_DISPLAY_CERTS))
+        elseif arg[i] == "-pass" then
+            if i >= #arg then
+                print_server_options(build_mode, arg[i])
+            end
+
+            i = i + 1
+            password = arg[i]
+        elseif build_mode == axtlsl.SSL_BUILD_FULL_MODE then
+            if arg[i] == "-debug" then
+                options = bit.bor(options, axtlsl.SSL_DISPLAY_BYTES)
+            elseif arg[i] == "-state" then
+                options = bit.bor(axtlsl.SSL_DISPLAY_STATES)
+            elseif arg[i] == "-show-rsa" then
+                options = bit.bor(axtlsl.SSL_DISPLAY_RSA)
+            else    -- don't know what this is
+                print_client_options(build_mode, arg[i])
+            end
+        else    -- don't know what this is
+            print_client_options(build_mode, arg[i])
+        end
+
+        i = i + 1
+    end
+
+    local client_sock = socket.try(socket.connect(host, port))
+    local ssl
+    local res
+
+    if not quiet then print("CONNECTED") end
+
+    ---------------------------------------------------------------------------
+    -- This is where the interesting stuff happens. Up until now we've
+    -- just been setting up sockets etc. Now we do the SSL handshake.
+    ---------------------------------------------------------------------------
+    local ssl_ctx = axtlsl.ssl_ctx_new(options, axtlsl.SSL_DEFAULT_CLNT_SESS)
+
+    if ssl_ctx == nil then 
+        error("Error: Client context is invalid")
+    end
+
+    if private_key_file ~= nil then
+        local obj_type = axtlsl.SSL_OBJ_RSA_KEY
+
+        if string.find(private_key_file, ".p8") then 
+            obj_type = axtlsl.SSL_OBJ_PKCS8 
+        end
+
+        if string.find(private_key_file, ".p12") then 
+            obj_type = axtlsl.SSL_OBJ_PKCS12 
+        end
+
+        if axtlsl.ssl_obj_load(ssl_ctx, obj_type, private_key_file, 
+                                        password) ~= axtlsl.SSL_OK then
+            error("Private key '"..private_key_file.."' is undefined.")
+        end
+    end
+
+    for _, v in ipairs(cert) do
+        if axtlsl.ssl_obj_load(ssl_ctx, axtlsl.SSL_OBJ_X509_CERT, v, "") ~= 
+                                        axtlsl.SSL_OK then
+            error("Certificate '"..v .. "' is undefined.")
+        end
+    end
+
+    for _, v in ipairs(ca_cert) do
+        if axtlsl.ssl_obj_load(ssl_ctx, axtlsl.SSL_OBJ_X509_CACERT, v, "") ~= 
+                                        axtlsl.SSL_OK then
+            error("Certificate '"..v .."' is undefined.")
+        end
+    end
+
+    -- Try session resumption?
+    if reconnect ~= 0 then
+        local session_id = nil
+        local sess_id_size = 0
+
+        while reconnect > 0 do
+            reconnect = reconnect - 1
+            ssl = axtlsl.ssl_client_new(ssl_ctx, 
+                    client_sock:getfd(), session_id, sess_id_size)
+
+            res = axtlsl.ssl_handshake_status(ssl)
+            if res ~= axtlsl.SSL_OK then
+                if not quiet then axtlsl.ssl_display_error(res) end
+                axtlsl.ssl_free(ssl)
+                os.exit(1)
+            end
+
+            display_session_id(ssl)
+            session_id = axtlsl.ssl_get_session_id(ssl)
+            sess_id_size = axtlsl.ssl_get_session_id_size(ssl)
+
+            if reconnect > 0 then
+                axtlsl.ssl_free(ssl)
+                client_sock:close()
+                client_sock = socket.try(socket.connect(host, port))
+            end
+
+        end
+    else
+        ssl = axtlsl.ssl_client_new(ssl_ctx, client_sock:getfd(), nil, 0)
+    end
+
+    -- check the return status
+    res = axtlsl.ssl_handshake_status(ssl)
+    if res ~= axtlsl.SSL_OK then
+        if not quiet then axtlsl.ssl_display_error(res) end
+        os.exit(1)
+    end
+
+    if not quiet then
+        local common_name = axtlsl.ssl_get_cert_dn(ssl, 
+                            axtlsl.SSL_X509_CERT_COMMON_NAME)
+
+        if common_name ~= nil then 
+            print("Common Name:\t\t\t"..common_name)
+        end
+
+        display_session_id(ssl)
+        display_cipher(ssl)
+    end
+
+    while true do
+        local line = io.read()
+    if line == nil then break end
+        local bytes = {}
+
+        for i = 1, #line do
+            bytes[i] = line.byte(line, i)
+        end
+
+        bytes[#line+1] = 10      -- add carriage return, null
+        bytes[#line+2] = 0
+
+        res = axtlsl.ssl_write(ssl, bytes, #bytes)
+        if res < axtlsl.SSL_OK then
+            if not quiet then axtlsl.ssl_display_error(res) end
+            break
+        end
+    end
+
+    axtlsl.ssl_ctx_free(ssl_ctx)
+    client_sock:close()
+end
+
+--
+-- Display what cipher we are using 
+--
+function display_cipher(ssl)
+    io.write("CIPHER is ")
+    local cipher_id = axtlsl.ssl_get_cipher_id(ssl)
+
+    if cipher_id == axtlsl.SSL_AES128_SHA then
+        print("AES128-SHA")
+    elseif cipher_id == axtlsl.SSL_AES256_SHA then
+        print("AES256-SHA")
+    elseif axtlsl.SSL_RC4_128_SHA then
+        print("RC4-SHA")
+    elseif axtlsl.SSL_RC4_128_MD5 then
+        print("RC4-MD5")
+    else 
+        print("Unknown - "..cipher_id)
+    end
+end
+
+--
+-- Display what session id we have.
+--
+function display_session_id(ssl)
+    local session_id = axtlsl.ssl_get_session_id(ssl)
+    local v
+
+    if #session_id > 0 then
+        print("-----BEGIN SSL SESSION PARAMETERS-----")
+        for _, v in ipairs(session_id) do
+            io.write(string.format("%02x", v))
+        end
+        print("\n-----END SSL SESSION PARAMETERS-----")
+    end
+end
+
+--
+-- Main entry point. Doesn't do much except works out whether we are a client
+-- or a server.
+--
+if #arg == 0 or (arg[1] ~= "s_server" and arg[1] ~= "s_client") then
+    print_options(#arg > 0 and arg[1] or "")
+end
+
+local build_mode = axtlsl.ssl_get_config(axtlsl.SSL_BUILD_MODE)
+_ = arg[1] == "s_server" and do_server(build_mode) or do_client(build_mode)
+os.exit(0)
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/perl/Makefile b/trunk/package/luci/libs/nixio/axTLS/samples/perl/Makefile
new file mode 100644
index 00000000..5200c430
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/perl/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../config/.config
+include ../../config/makefile.conf
+
+all: samples
+TARGET=../../$(STAGE)/axssl.pl
+samples: $(TARGET)
+
+$(TARGET): axssl.pl
+	install $< $@
+
+clean::
+	-@rm -f $(TARGET)
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/perl/axssl.pl b/trunk/package/luci/libs/nixio/axTLS/samples/perl/axssl.pl
new file mode 100755
index 00000000..e49d5227
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/perl/axssl.pl
@@ -0,0 +1,634 @@
+#!/usr/bin/perl -w
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# Demonstrate the use of the axTLS library in Perl with a set of 
+# command-line parameters similar to openssl. In fact, openssl clients 
+# should be able to communicate with axTLS servers and visa-versa.
+#
+# This code has various bits enabled depending on the configuration. To enable
+# the most interesting version, compile with the 'full mode' enabled.
+#
+# To see what options you have, run the following:
+# > [perl] axssl s_server -?
+# > [perl] axssl s_client -?
+#
+# The axtls/axtlsp shared libraries must be in the same directory or be found 
+# by the OS. axtlsp.pm must be in this directory or be in @INC.
+#
+# Under Win32, ActivePerl was used (see
+# http://www.activestate.com/Products/ActivePerl/?mp=1)
+#
+use axtlsp;
+use IO::Socket;
+
+# To get access to Win32 file descriptor stuff
+my $is_win32 = 0;
+
+if ($^O eq "MSWin32")
+{
+    eval("use Win32API::File 0.08 qw( :ALL )");
+    $is_win32 = 1;
+}
+
+use strict;
+
+#
+# Win32 has some problems with socket handles
+#
+sub get_native_sock
+{
+    my ($sock) = @_;
+    return $is_win32 ? FdGetOsFHandle($sock) : $sock;
+}
+
+# print version?
+if ($#ARGV == 0 && $ARGV[0] eq "version")
+{
+    printf("axssl.pl ".axtlsp::ssl_version()."\n");
+    exit 0;
+}
+
+#
+# Main entry point. Doesn't do much except works out whether we are a client
+# or a server.
+#
+print_options($#ARGV > -1 ? $ARGV[0] : "")
+        if ($#ARGV < 0 || ($ARGV[0] ne "s_server" && $ARGV[0] ne "s_client"));
+
+
+# Cygwin/Win32 issue - flush our output continuously
+select STDOUT;
+local $|=1;
+
+my $build_mode = axtlsp::ssl_get_config($axtlsp::SSL_BUILD_MODE);
+$ARGV[0] eq "s_server" ? do_server($build_mode) : do_client($build_mode);
+
+#
+# Implement the SSL server logic. 
+#
+sub do_server
+{
+    my ($build_mode) = @_;
+    my $i = 1;
+    my $port = 4433;
+    my $options = $axtlsp::SSL_DISPLAY_CERTS;
+    my $quiet = 0;
+    my $password = undef;
+    my $private_key_file = undef;
+    my $cert_size = axtlsp::ssl_get_config($axtlsp::SSL_MAX_CERT_CFG_OFFSET);
+    my $ca_cert_size = axtlsp::ssl_get_config(
+                        $axtlsp::SSL_MAX_CA_CERT_CFG_OFFSET);
+    my @cert;
+    my @ca_cert;
+
+    while ($i <= $#ARGV)
+    {
+        if ($ARGV[$i] eq  "-accept")
+        {
+            print_server_options($build_mode, $ARGV[$i]) if $i >= $#ARGV;
+            $port = $ARGV[++$i];
+        }
+        elsif ($ARGV[$i] eq "-quiet")
+        {
+            $quiet = 1;
+            $options &= ~$axtlsp::SSL_DISPLAY_CERTS;
+        }
+        elsif ($build_mode >= $axtlsp::SSL_BUILD_SERVER_ONLY)
+        {
+            if ($ARGV[$i] eq "-cert")
+            {
+                print_server_options($build_mode, $ARGV[$i]) 
+                                    if $i >= $#ARGV || $#cert >= $cert_size-1;
+
+                push @cert,  $ARGV[++$i];
+            }
+            elsif ($ARGV[$i] eq "-key")
+            {
+                print_server_options($build_mode, $ARGV[$i]) if $i >= $#ARGV;
+                $private_key_file = $ARGV[++$i];
+                $options |= $axtlsp::SSL_NO_DEFAULT_KEY;
+            }
+            elsif ($ARGV[$i] eq "-pass")
+            {
+                print_server_options($build_mode, $ARGV[$i]) if $i >= $#ARGV;
+                $password = $ARGV[++$i];
+            }
+            elsif ($build_mode >= $axtlsp::SSL_BUILD_ENABLE_VERIFICATION)
+            {
+                if ($ARGV[$i] eq "-verify")
+                {
+                    $options |= $axtlsp::SSL_CLIENT_AUTHENTICATION;
+                }
+                elsif ($ARGV[$i] eq "-CAfile")
+                {
+                    print_server_options($build_mode, $ARGV[$i])  
+                                if $i >= $#ARGV || $#ca_cert >= $ca_cert_size-1;
+                    push @ca_cert, $ARGV[++$i];
+                }
+                elsif ($build_mode == $axtlsp::SSL_BUILD_FULL_MODE)
+                {
+                    if ($ARGV[$i] eq "-debug")
+                    {
+                        $options |= $axtlsp::SSL_DISPLAY_BYTES;
+                    }
+                    elsif ($ARGV[$i] eq "-state")
+                    {
+                        $options |= $axtlsp::SSL_DISPLAY_STATES;
+                    }
+                    elsif ($ARGV[$i] eq "-show-rsa")
+                    {
+                        $options |= $axtlsp::SSL_DISPLAY_RSA;
+                    }
+                    else
+                    {
+                        print_server_options($build_mode, $ARGV[$i]);
+                    }
+                }
+                else
+                {
+                    print_server_options($build_mode, $ARGV[$i]);
+                }
+            }
+            else 
+            {
+                print_server_options($build_mode, $ARGV[$i]);
+            }
+        }
+        else 
+        {
+            print_server_options($build_mode, $ARGV[$i]);
+        }
+
+        $i++;
+    }
+
+    # Create socket for incoming connections
+    my $server_sock = IO::Socket::INET->new(Proto => 'tcp',
+                              LocalPort => $port,
+                              Listen => 1,
+                              Reuse => 1) or die $!;
+
+    ###########################################################################
+    # This is where the interesting stuff happens. Up until now we've
+    # just been setting up sockets etc. Now we do the SSL handshake.
+    ###########################################################################
+    my $ssl_ctx = axtlsp::ssl_ctx_new($options, $axtlsp::SSL_DEFAULT_SVR_SESS);
+    die "Error: Server context is invalid" if not defined $ssl_ctx;
+
+    if (defined $private_key_file)
+    {
+        my $obj_type = $axtlsp::SSL_OBJ_RSA_KEY;
+
+        $obj_type = $axtlsp::SSL_OBJ_PKCS8 if $private_key_file =~ /.p8$/;
+        $obj_type = $axtlsp::SSL_OBJ_PKCS12 if $private_key_file =~ /.p12$/;
+
+        die "Private key '$private_key_file' is undefined." if 
+                axtlsp::ssl_obj_load($ssl_ctx, $obj_type,
+                        $private_key_file, $password);
+    }
+
+    foreach (@cert)
+    {
+        die "Certificate '$_' is undefined." 
+            if axtlsp::ssl_obj_load($ssl_ctx, $axtlsp::SSL_OBJ_X509_CERT, 
+                    $_, undef) != $axtlsp::SSL_OK;
+    }
+
+    foreach (@ca_cert)
+    {
+        die "Certificate '$_' is undefined." 
+            if axtlsp::ssl_obj_load($ssl_ctx, $axtlsp::SSL_OBJ_X509_CACERT, 
+                    $_, undef) != $axtlsp::SSL_OK;
+    }
+
+    for (;;)
+    {
+        printf("ACCEPT\n") if not $quiet;
+        my $client_sock = $server_sock->accept;
+        my $native_sock = get_native_sock($client_sock->fileno);
+
+        # This doesn't work in Win32 - need to get file descriptor from socket.
+        my $ssl = axtlsp::ssl_server_new($ssl_ctx, $native_sock);
+
+        # do the actual SSL handshake
+        my $res;
+        my $buf;
+        my $connected = 0;
+
+        while (1)
+        {
+            ($res, $buf) = axtlsp::ssl_read($ssl, undef);
+            last if $res < $axtlsp::SSL_OK;
+
+            if ($res == $axtlsp::SSL_OK) # connection established and ok
+            {
+                if (axtlsp::ssl_handshake_status($ssl) == $axtlsp::SSL_OK)
+                {
+                    if (!$quiet && !$connected)
+                    {
+                        display_session_id($ssl);
+                        display_cipher($ssl);
+                    }
+
+                    $connected = 1;
+                }
+            }
+
+            if ($res > $axtlsp::SSL_OK)
+            {
+                printf($$buf);
+            }
+            elsif ($res < $axtlsp::SSL_OK)
+            {
+                axtlsp::ssl_display_error($res) if not $quiet;
+                last;
+            } 
+        }
+
+        # client was disconnected or the handshake failed.
+        printf("CONNECTION CLOSED\n") if not $quiet;
+        axtlsp::ssl_free($ssl);
+        $client_sock->close;
+    }
+
+    axtlsp::ssl_ctx_free($ssl_ctx);
+}
+
+#
+# Implement the SSL client logic.
+#
+sub do_client
+{
+    my ($build_mode) = @_;
+    my $i = 1;
+    my $port = 4433;
+    my $options = $axtlsp::SSL_SERVER_VERIFY_LATER|$axtlsp::SSL_DISPLAY_CERTS;
+    my $private_key_file = undef;
+    my $reconnect = 0;
+    my $quiet = 0;
+    my $password = undef;
+    my @session_id;
+    my $host = "127.0.0.1";
+    my @cert;
+    my @ca_cert;
+    my $cert_size = axtlsp::ssl_get_config(
+            $axtlsp::SSL_MAX_CERT_CFG_OFFSET);
+    my $ca_cert_size = axtlsp::ssl_get_config(
+            $axtlsp::SSL_MAX_CA_CERT_CFG_OFFSET);
+
+    while ($i <= $#ARGV)
+    {
+        if ($ARGV[$i] eq "-connect")
+        {
+            print_client_options($build_mode, $ARGV[$i]) if $i >= $#ARGV;
+            ($host, $port) = split(':', $ARGV[++$i]);
+        }
+        elsif ($ARGV[$i] eq "-cert")
+        {
+            print_client_options($build_mode, $ARGV[$i]) 
+                if $i >= $#ARGV || $#cert >= $cert_size-1;
+
+            push @cert, $ARGV[++$i];
+        }
+        elsif ($ARGV[$i] eq "-key")
+        {
+            print_client_options($build_mode, $ARGV[$i]) if $i >= $#ARGV;
+            $private_key_file = $ARGV[++$i];
+            $options |= $axtlsp::SSL_NO_DEFAULT_KEY;
+        }
+        elsif ($ARGV[$i] eq "-CAfile")
+        {
+            print_client_options($build_mode, $ARGV[$i]) 
+                if $i >= $#ARGV || $#ca_cert >= $ca_cert_size-1;
+
+            push @ca_cert, $ARGV[++$i];
+        }
+        elsif ($ARGV[$i] eq "-verify")
+        {
+            $options &= ~$axtlsp::SSL_SERVER_VERIFY_LATER;
+        }
+        elsif ($ARGV[$i] eq "-reconnect")
+        {
+            $reconnect = 4;
+        }
+        elsif ($ARGV[$i] eq "-quiet")
+        {
+            $quiet = 1;
+            $options &= ~$axtlsp::SSL_DISPLAY_CERTS;
+        }
+        elsif ($ARGV[$i] eq "-pass")
+        {
+            print_server_options($build_mode, $ARGV[$i]) if $i >= $#ARGV;
+            $password = $ARGV[++$i];
+        }
+        elsif ($build_mode == $axtlsp::SSL_BUILD_FULL_MODE)
+        {
+            if ($ARGV[$i] eq "-debug")
+            {
+                $options |= $axtlsp::SSL_DISPLAY_BYTES;
+            }
+            elsif ($ARGV[$i] eq "-state")
+            {
+                $options |= $axtlsp::SSL_DISPLAY_STATES;
+            }
+            elsif ($ARGV[$i] eq "-show-rsa")
+            {
+                $options |= $axtlsp::SSL_DISPLAY_RSA;
+            }
+            else    # don't know what this is
+            {
+                print_client_options($build_mode, $ARGV[$i]);
+            }
+        }
+        else    # don't know what this is
+        {
+            print_client_options($build_mode, $ARGV[$i]);
+        }
+
+        $i++;
+    }
+
+    my $client_sock = new IO::Socket::INET (
+                        PeerAddr => $host, PeerPort => $port, Proto => 'tcp')
+                    || die ("no socket: $!");
+    my $ssl;
+    my $res;
+    my $native_sock = get_native_sock($client_sock->fileno);
+
+    printf("CONNECTED\n") if not $quiet;
+
+    ###########################################################################
+    # This is where the interesting stuff happens. Up until now we've
+    # just been setting up sockets etc. Now we do the SSL handshake.
+    ###########################################################################
+    my $ssl_ctx = axtlsp::ssl_ctx_new($options, $axtlsp::SSL_DEFAULT_CLNT_SESS);
+    die "Error: Client context is invalid" if not defined $ssl_ctx;
+
+    if (defined $private_key_file)
+    {
+        my $obj_type = $axtlsp::SSL_OBJ_RSA_KEY;
+
+        $obj_type = $axtlsp::SSL_OBJ_PKCS8 if $private_key_file =~ /.p8$/;
+        $obj_type = $axtlsp::SSL_OBJ_PKCS12 if $private_key_file =~ /.p12$/;
+
+        die "Private key '$private_key_file' is undefined." if 
+                axtlsp::ssl_obj_load($ssl_ctx, $obj_type,
+                        $private_key_file, $password);
+    }
+
+    foreach (@cert)
+    {
+        die "Certificate '$_' is undefined." 
+            if axtlsp::ssl_obj_load($ssl_ctx, $axtlsp::SSL_OBJ_X509_CERT, 
+                    $_, undef) != $axtlsp::SSL_OK;
+    }
+
+    foreach (@ca_cert)
+    {
+        die "Certificate '$_' is undefined." 
+            if axtlsp::ssl_obj_load($ssl_ctx, $axtlsp::SSL_OBJ_X509_CACERT, 
+                    $_, undef) != $axtlsp::SSL_OK;
+    }
+
+    # Try session resumption?
+    if ($reconnect)
+    {
+        my $session_id = undef;
+        my $sess_id_size = 0;
+
+        while ($reconnect--)
+        {
+            $ssl = axtlsp::ssl_client_new($ssl_ctx, $native_sock, 
+                            $session_id, $sess_id_size);
+
+            $res = axtlsp::ssl_handshake_status($ssl);
+            if ($res != $axtlsp::SSL_OK)
+            {
+                axtlsp::ssl_display_error($res) if !$quiet;
+                axtlsp::ssl_free($ssl);
+                exit 1;
+            }
+
+            display_session_id($ssl);
+            $session_id = axtlsp::ssl_get_session_id($ssl);
+
+            if ($reconnect)
+            {
+                axtlsp::ssl_free($ssl);
+                $client_sock->close;
+                $client_sock = new IO::Socket::INET (
+                        PeerAddr => $host, PeerPort => $port, Proto => 'tcp')
+                    || die ("no socket: $!");
+
+            }
+        }
+    }
+    else
+    {
+        $ssl = axtlsp::ssl_client_new($ssl_ctx, $native_sock, undef, 0);
+    }
+
+    # check the return status
+    $res = axtlsp::ssl_handshake_status($ssl);
+    if ($res != $axtlsp::SSL_OK)
+    {
+        axtlsp::ssl_display_error($res) if not $quiet;
+        exit 1;
+    }
+
+    if (!$quiet)
+    {
+        my $common_name = axtlsp::ssl_get_cert_dn($ssl, 
+                    $axtlsp::SSL_X509_CERT_COMMON_NAME);
+
+        printf("Common Name:\t\t\t%s\n", $common_name) if defined $common_name;
+        display_session_id($ssl);
+        display_cipher($ssl);
+    }
+
+    while (<STDIN>)
+    {
+        my $cstring = pack("a*x", $_);   # add null terminator
+        $res = axtlsp::ssl_write($ssl, \$cstring, length($cstring));
+        if ($res < $axtlsp::SSL_OK)
+        {
+            axtlsp::ssl_display_error($res) if not $quiet;
+            last;
+        }
+    }
+
+    axtlsp::ssl_ctx_free($ssl_ctx);
+    $client_sock->close;
+}
+
+#
+# We've had some sort of command-line error. Print out the basic options.
+#
+sub print_options
+{
+    my ($option) = @_;
+    printf("axssl: Error: '%s' is an invalid command.\n", $option);
+    printf("usage: axssl [s_server|s_client|version] [args ...]\n");
+    exit 1;
+}
+
+#
+# We've had some sort of command-line error. Print out the server options.
+#
+sub print_server_options
+{
+    my ($build_mode, $option) = @_;
+    my $cert_size = axtlsp::ssl_get_config($axtlsp::SSL_MAX_CERT_CFG_OFFSET);
+    my $ca_cert_size = axtlsp::ssl_get_config(
+            $axtlsp::SSL_MAX_CA_CERT_CFG_OFFSET);
+
+    printf("unknown option %s\n", $option);
+    printf("usage: s_server [args ...]\n");
+    printf(" -accept arg\t- port to accept on (default is 4433)\n");
+    printf(" -quiet\t\t- No server output\n");
+
+    if ($build_mode >= $axtlsp::SSL_BUILD_SERVER_ONLY)
+    {
+        printf(" -cert arg\t- certificate file to add (in addition to default)".
+                                        " to chain -\n".
+          "\t\t  Can repeat up to %d times\n", $cert_size);
+        printf(" -key arg\t- Private key file to use - default DER format\n");
+        printf(" -pass\t\t- private key file pass phrase source\n");
+    }
+
+    if ($build_mode >= $axtlsp::SSL_BUILD_ENABLE_VERIFICATION)
+    {
+        printf(" -verify\t- turn on peer certificate verification\n");
+        printf(" -CAfile arg\t- Certificate authority - default DER format\n");
+        printf("\t\t  Can repeat up to %d times\n", $ca_cert_size);
+    }
+
+    if ($build_mode == $axtlsp::SSL_BUILD_FULL_MODE)
+    {
+        printf(" -debug\t\t- Print more output\n");
+        printf(" -state\t\t- Show state messages\n");
+        printf(" -show-rsa\t- Show RSA state\n");
+    }
+
+    exit 1;
+}
+
+#
+# We've had some sort of command-line error. Print out the client options.
+#
+sub print_client_options
+{
+    my ($build_mode, $option) = @_;
+    my $cert_size = axtlsp::ssl_get_config($axtlsp::SSL_MAX_CERT_CFG_OFFSET);
+    my $ca_cert_size = axtlsp::ssl_get_config(
+            $axtlsp::SSL_MAX_CA_CERT_CFG_OFFSET);
+
+    printf("unknown option %s\n", $option);
+
+    if ($build_mode >= $axtlsp::SSL_BUILD_ENABLE_CLIENT)
+    {
+        printf("usage: s_client [args ...]\n");
+        printf(" -connect host:port - who to connect to (default ".
+                "is localhost:4433)\n");
+        printf(" -verify\t- turn on peer certificate verification\n");
+        printf(" -cert arg\t- certificate file to use - default DER format\n");
+        printf(" -key arg\t- Private key file to use - default DER format\n");
+        printf("\t\t  Can repeat up to %d times\n", $cert_size);
+        printf(" -CAfile arg\t- Certificate authority - default DER format\n");
+        printf("\t\t  Can repeat up to %d times\n", $ca_cert_size);
+        printf(" -quiet\t\t- No client output\n");
+        printf(" -pass\t\t- private key file pass phrase source\n");
+        printf(" -reconnect\t- Drop and re-make the connection ".
+                "with the same Session-ID\n");
+
+        if ($build_mode == $axtlsp::SSL_BUILD_FULL_MODE)
+        {
+            printf(" -debug\t\t- Print more output\n");
+            printf(" -state\t\t- Show state messages\n");
+            printf(" -show-rsa\t- Show RSA state\n");
+        }
+    }
+    else
+    {
+        printf("Change configuration to allow this feature\n");
+    }
+
+    exit 1;
+}
+
+#
+# Display what cipher we are using 
+#
+sub display_cipher
+{
+    my ($ssl) = @_;
+    printf("CIPHER is ");
+    my $cipher_id = axtlsp::ssl_get_cipher_id($ssl);
+
+    if ($cipher_id == $axtlsp::SSL_AES128_SHA)
+    {
+        printf("AES128-SHA");
+    }
+    elsif ($cipher_id == $axtlsp::SSL_AES256_SHA)
+    {
+        printf("AES256-SHA");
+    }
+    elsif ($axtlsp::SSL_RC4_128_SHA)
+    {
+        printf("RC4-SHA");
+    }
+    elsif ($axtlsp::SSL_RC4_128_MD5)
+    {
+        printf("RC4-MD5");
+    }
+    else 
+    {
+        printf("Unknown - %d", $cipher_id);
+    }
+
+    printf("\n");
+}
+
+#
+# Display what session id we have.
+#
+sub display_session_id
+{    
+    my ($ssl) = @_;
+    my $session_id = axtlsp::ssl_get_session_id($ssl);
+    if (length($$session_id) > 0)
+    {
+        printf("-----BEGIN SSL SESSION PARAMETERS-----\n");
+        printf(unpack("H*", $$session_id));
+        printf("\n-----END SSL SESSION PARAMETERS-----\n");
+    }
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/vbnet/Makefile b/trunk/package/luci/libs/nixio/axTLS/samples/vbnet/Makefile
new file mode 100644
index 00000000..0984d4e0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/vbnet/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include ../../config/.config
+include ../../config/makefile.conf
+include ../../config/makefile.dotnet.conf
+
+# only build on Win32 platforms
+ifdef GO_DOT_NET
+all : sample
+TARGET=../../$(STAGE)/axssl.vbnet.exe
+sample : $(TARGET)
+
+$(TARGET): ../../bindings/vbnet/axTLSvb.vb ../../bindings/vbnet/axInterface.vb axssl.vb
+	vbc.exe /r:"`cygpath -w "$(CONFIG_DOT_NET_FRAMEWORK_BASE)/System.dll"`" /nologo /t:exe /out:"`cygpath -w $@`" $(foreach file, $^, "`cygpath -w $(file)`")
+
+endif   # ARCH
+
+clean::
+	-@rm -f $(TARGET)
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/samples/vbnet/axssl.vb b/trunk/package/luci/libs/nixio/axTLS/samples/vbnet/axssl.vb
new file mode 100644
index 00000000..1b423c86
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/samples/vbnet/axssl.vb
@@ -0,0 +1,702 @@
+'
+' Copyright (c) 2007, Cameron Rich
+'
+' All rights reserved.
+'
+' Redistribution and use in source and binary forms, with or without
+' modification, are permitted provided that the following conditions are met:
+'
+' * Redistributions of source code must retain the above copyright notice,
+'   this list of conditions and the following disclaimer.
+' * Redistributions in binary form must reproduce the above copyright
+'   notice, this list of conditions and the following disclaimer in the
+'   documentation and/or other materials provided with the distribution.
+' * Neither the name of the axTLS project nor the names of its
+'   contributors may be used to endorse or promote products derived
+'   from this software without specific prior written permission.
+'
+' THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+' "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+' LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+' A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+' CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+' SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+' TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+' DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+' OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+' NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+' THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+'
+
+'
+' Demonstrate the use of the axTLS library in VB.NET with a set of 
+' command-line parameters similar to openssl. In fact, openssl clients 
+' should be able to communicate with axTLS servers and visa-versa.
+'
+' This code has various bits enabled depending on the configuration. To enable
+' the most interesting version, compile with the 'full mode' enabled.
+'
+' To see what options you have, run the following:
+' > axssl.vbnet.exe s_server -?
+' > axssl.vbnet.exe s_client -?
+'
+' The axtls shared library must be in the same directory or be found 
+' by the OS.
+'
+
+Imports System
+Imports System.Net
+Imports System.Net.Sockets
+Imports Microsoft.VisualBasic
+Imports axTLSvb
+
+Public Class axssl
+    ' 
+    ' do_server()
+    '
+    Public Sub do_server(ByVal build_mode As Integer, _
+                                        ByVal args() As String)
+        Dim i As Integer = 1
+        Dim port As Integer = 4433
+        Dim options As Integer = axtls.SSL_DISPLAY_CERTS
+        Dim quiet As Boolean = False
+        Dim password As String = Nothing
+        Dim private_key_file As String = Nothing
+
+        ' organise the cert/ca_cert lists 
+        Dim cert_size As Integer = SSLUtil.MaxCerts()
+        Dim ca_cert_size As Integer = SSLUtil.MaxCACerts()
+        Dim cert(cert_size) As String
+        Dim ca_cert(ca_cert_size) As String
+        Dim cert_index As Integer = 0
+        Dim ca_cert_index As Integer = 0
+
+        While i < args.Length
+            If args(i) = "-accept" Then
+                If i >= args.Length-1
+                    print_server_options(build_mode, args(i))
+                End If
+
+                i += 1
+                port = Int32.Parse(args(i))
+            ElseIf args(i) = "-quiet"
+                quiet = True
+                options = options And Not axtls.SSL_DISPLAY_CERTS
+            ElseIf build_mode >= axtls.SSL_BUILD_SERVER_ONLY
+                If args(i) = "-cert"
+                    If i >= args.Length-1 Or cert_index >= cert_size
+                        print_server_options(build_mode, args(i))
+                    End If
+
+                    i += 1
+                    cert(cert_index) = args(i)
+                    cert_index += 1
+                ElseIf args(i) = "-key"
+                    If i >= args.Length-1
+                        print_server_options(build_mode, args(i))
+                    End If
+
+                    i += 1
+                    private_key_file = args(i)
+                    options = options Or axtls.SSL_NO_DEFAULT_KEY
+                ElseIf args(i) = "-pass"
+                    If i >= args.Length-1
+                        print_server_options(build_mode, args(i))
+                    End If
+
+                    i += 1
+                    password = args(i)
+                ElseIf build_mode >= axtls.SSL_BUILD_ENABLE_VERIFICATION
+                    If args(i) = "-verify" Then
+                        options = options Or axtls.SSL_CLIENT_AUTHENTICATION
+                    ElseIf args(i) = "-CAfile"
+                        If i >= args.Length-1 Or _
+                                    ca_cert_index >= ca_cert_size Then
+                            print_server_options(build_mode, args(i))
+                        End If
+
+                        i += 1
+                        ca_cert(ca_cert_index) = args(i)
+                        ca_cert_index += 1
+                    ElseIf build_mode = axtls.SSL_BUILD_FULL_MODE
+                        If args(i) = "-debug" Then
+                            options = options Or axtls.SSL_DISPLAY_BYTES
+                        ElseIf args(i) = "-state"
+                            options = options Or axtls.SSL_DISPLAY_STATES
+                        ElseIf args(i) = "-show-rsa"
+                            options = options Or axtls.SSL_DISPLAY_RSA
+                        Else
+                            print_server_options(build_mode, args(i))
+                        End If
+                    Else
+                        print_server_options(build_mode, args(i))
+                    End If
+                Else
+                    print_server_options(build_mode, args(i))
+                End If
+            End If
+
+            i += 1
+        End While
+
+        ' Create socket for incoming connections
+        Dim ep As IPEndPoint = New IPEndPoint(IPAddress.Any, port)
+        Dim server_sock As TcpListener = New TcpListener(ep)
+        server_sock.Start()      
+
+        '*********************************************************************
+        ' This is where the interesting stuff happens. Up until now we've
+        ' just been setting up sockets etc. Now we do the SSL handshake.
+        '*********************************************************************/
+        Dim ssl_ctx As SSLServer = New SSLServer(options, _
+                axtls.SSL_DEFAULT_SVR_SESS)
+
+        If ssl_ctx Is Nothing Then
+            Console.Error.WriteLine("Error: Server context is invalid")
+            Environment.Exit(1)
+        End If
+
+        If private_key_file <> Nothing Then
+            Dim obj_type As Integer = axtls.SSL_OBJ_RSA_KEY
+
+            If private_key_file.EndsWith(".p8") Then
+                obj_type = axtls.SSL_OBJ_PKCS8
+            Else If (private_key_file.EndsWith(".p12"))
+                obj_type = axtls.SSL_OBJ_PKCS12
+            End If
+
+            If ssl_ctx.ObjLoad(obj_type, private_key_file, _
+                                            password) <> axtls.SSL_OK Then
+                Console.Error.WriteLine("Error: Private key '" & _
+                        private_key_file & "' is undefined.")
+                Environment.Exit(1)
+            End If
+        End If
+
+        For i = 0 To cert_index-1
+            If ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CERT, _
+                            cert(i), Nothing) <> axtls.SSL_OK Then
+                Console.WriteLine("Certificate '" & cert(i) & _
+                        "' is undefined.")
+                Environment.Exit(1)
+            End If
+        Next
+
+        For i = 0 To ca_cert_index-1
+            If ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CACERT, _
+                            ca_cert(i), Nothing) <> axtls.SSL_OK Then
+                Console.WriteLine("Certificate '" & ca_cert(i) & _
+                        "' is undefined.")
+                Environment.Exit(1)
+            End If
+        Next
+
+        Dim buf As Byte() = Nothing
+        Dim res As Integer
+        Dim ssl As SSL
+
+        While 1
+            If Not quiet Then
+                Console.WriteLine("ACCEPT")
+            End If
+
+            Dim client_sock As Socket = server_sock.AcceptSocket()
+
+            ssl = ssl_ctx.Connect(client_sock)
+
+            ' do the actual SSL handshake 
+            While 1
+                res = ssl_ctx.Read(ssl, buf)
+                If  res <> axtls.SSL_OK Then
+                    Exit While
+                End If
+
+                ' check when the connection has been established 
+                If ssl.HandshakeStatus() = axtls.SSL_OK
+                    Exit While
+                End If
+
+                ' could do something else here 
+            End While
+
+            If res = axtls.SSL_OK Then  ' connection established and ok
+                If Not quiet
+                    display_session_id(ssl)
+                    display_cipher(ssl)
+                End If
+
+                ' now read (and display) whatever the client sends us
+                While 1
+                    ' keep reading until we get something interesting 
+                    While 1
+                        res = ssl_ctx.Read(ssl, buf)
+                        If res <> axtls.SSL_OK Then
+                            Exit While
+                        End If
+
+                        ' could do something else here
+                    End While
+
+                    If res < axtls.SSL_OK
+                        If Not quiet
+                            Console.WriteLine("CONNECTION CLOSED")
+                        End If
+
+                        Exit While
+                    End If
+
+                    ' convert to String 
+                    Dim str(res) As Char
+                    For i = 0 To res-1
+                        str(i) = Chr(buf(i))
+                    Next
+
+                    Console.Write(str)
+                End While
+            ElseIf Not quiet
+                SSLUtil.DisplayError(res)
+            End If
+
+            ' client was disconnected or the handshake failed. */
+            ssl.Dispose()
+            client_sock.Close()
+        End While
+
+        ssl_ctx.Dispose()
+    End Sub
+
+    ' 
+    ' do_client()
+    '
+    Public Sub do_client(ByVal build_mode As Integer, _
+                                    ByVal args() As String)
+
+        If build_mode < axtls.SSL_BUILD_ENABLE_CLIENT Then
+            print_client_options(build_mode, args(1))
+        End If
+
+        Dim i As Integer = 1
+        Dim res As Integer
+        Dim port As Integer = 4433
+        Dim quiet As Boolean = False
+        Dim password As String = Nothing
+        Dim reconnect As Integer = 0
+        Dim private_key_file As String = Nothing
+        Dim hostname As String = "127.0.0.1"
+
+        ' organise the cert/ca_cert lists
+        Dim ssl As SSL = Nothing
+        Dim cert_size As Integer = SSLUtil.MaxCerts()
+        Dim ca_cert_size As Integer = SSLUtil.MaxCACerts()
+        Dim cert(cert_size) As String
+        Dim ca_cert(ca_cert_size) As String
+        Dim cert_index As Integer = 0
+        Dim ca_cert_index As Integer = 0
+
+        Dim options As Integer = _
+                    axtls.SSL_SERVER_VERIFY_LATER Or axtls.SSL_DISPLAY_CERTS
+        Dim session_id As Byte() = Nothing
+
+        While i < args.Length
+            If args(i) = "-connect" Then
+                Dim host_port As String
+
+                If i >= args.Length-1
+                    print_client_options(build_mode, args(i))
+                End If
+
+                i += 1
+                host_port = args(i)
+
+                Dim index_colon As Integer = host_port.IndexOf(":"C)
+                If index_colon < 0 Then 
+                    print_client_options(build_mode, args(i))
+                End If
+
+                hostname = New String(host_port.ToCharArray(), _
+                        0, index_colon)
+                port = Int32.Parse(New String(host_port.ToCharArray(), _
+                            index_colon+1, host_port.Length-index_colon-1))
+            ElseIf args(i) = "-cert"
+                If i >= args.Length-1 Or cert_index >= cert_size Then
+                    print_client_options(build_mode, args(i))
+                End If
+
+                i += 1
+                cert(cert_index) = args(i)
+                cert_index += 1
+            ElseIf args(i) = "-key"
+                If i >= args.Length-1
+                    print_client_options(build_mode, args(i))
+                End If
+
+                i += 1
+                private_key_file = args(i)
+                options = options Or axtls.SSL_NO_DEFAULT_KEY
+            ElseIf args(i) = "-CAfile"
+                If i >= args.Length-1 Or ca_cert_index >= ca_cert_size
+                    print_client_options(build_mode, args(i))
+                End If
+
+                i += 1
+                ca_cert(ca_cert_index) = args(i)
+                ca_cert_index += 1
+            ElseIf args(i) = "-verify"
+                options = options And Not axtls.SSL_SERVER_VERIFY_LATER
+            ElseIf args(i) = "-reconnect"
+                reconnect = 4
+            ElseIf args(i) = "-quiet"
+                quiet = True
+                options = options And  Not axtls.SSL_DISPLAY_CERTS
+            ElseIf args(i) = "-pass"
+                If i >= args.Length-1
+                    print_client_options(build_mode, args(i))
+                End If
+
+                i += 1
+                password = args(i)
+            ElseIf build_mode = axtls.SSL_BUILD_FULL_MODE
+                If args(i) = "-debug" Then
+                    options = options Or axtls.SSL_DISPLAY_BYTES
+                ElseIf args(i) = "-state"
+                    options = options Or axtls.SSL_DISPLAY_STATES
+                ElseIf args(i) = "-show-rsa"
+                    options = options Or axtls.SSL_DISPLAY_RSA
+                Else
+                    print_client_options(build_mode, args(i))
+                End If
+            Else    ' don't know what this is 
+                print_client_options(build_mode, args(i))
+            End If
+
+            i += 1
+        End While
+
+        'Dim hostInfo As IPHostEntry = Dns.Resolve(hostname)
+        Dim hostInfo As IPHostEntry = Dns.GetHostEntry(hostname)
+        Dim  addresses As IPAddress() = hostInfo.AddressList
+        Dim ep As IPEndPoint = New IPEndPoint(addresses(0), port) 
+        Dim client_sock As Socket = New Socket(AddressFamily.InterNetwork, _
+                SocketType.Stream, ProtocolType.Tcp)
+        client_sock.Connect(ep)
+
+        If Not client_sock.Connected Then
+            Console.WriteLine("could not connect")
+            Environment.Exit(1)
+        End If
+
+        If Not quiet Then
+            Console.WriteLine("CONNECTED")
+        End If
+
+        '*********************************************************************
+        ' This is where the interesting stuff happens. Up until now we've
+        ' just been setting up sockets etc. Now we do the SSL handshake.
+        '*********************************************************************/
+        Dim ssl_ctx As SSLClient = New SSLClient(options, _
+                axtls.SSL_DEFAULT_CLNT_SESS)
+
+        If ssl_ctx Is Nothing Then
+            Console.Error.WriteLine("Error: Client context is invalid")
+            Environment.Exit(1)
+        End If
+
+        If private_key_file <> Nothing Then
+            Dim obj_type As Integer = axtls.SSL_OBJ_RSA_KEY
+
+            If private_key_file.EndsWith(".p8") Then
+                obj_type = axtls.SSL_OBJ_PKCS8
+            Else If (private_key_file.EndsWith(".p12"))
+                obj_type = axtls.SSL_OBJ_PKCS12
+            End If
+
+            If ssl_ctx.ObjLoad(obj_type, private_key_file, _
+                                            password) <> axtls.SSL_OK Then
+                Console.Error.WriteLine("Error: Private key '" & _
+                        private_key_file & "' is undefined.")
+                Environment.Exit(1)
+            End If
+        End If
+
+        For i = 0 To cert_index-1
+            If ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CERT, _
+                            cert(i), Nothing) <> axtls.SSL_OK Then
+                Console.WriteLine("Certificate '" & cert(i) & _
+                        "' is undefined.")
+                Environment.Exit(1)
+            End If
+        Next
+
+        For i = 0 To ca_cert_index-1
+            If ssl_ctx.ObjLoad(axtls.SSL_OBJ_X509_CACERT, _
+                            ca_cert(i), Nothing) <> axtls.SSL_OK Then
+                Console.WriteLine("Certificate '" & ca_cert(i) & _
+                        "' is undefined.")
+                Environment.Exit(1)
+            End If
+        Next
+
+        ' Try session resumption?
+        If reconnect > 0 Then
+            While reconnect > 0
+                reconnect -= 1
+                ssl = ssl_ctx.Connect(client_sock, session_id)
+
+                res = ssl.HandshakeStatus()
+                If res <> axtls.SSL_OK Then
+                    If Not quiet Then
+                        SSLUtil.DisplayError(res)
+                    End If
+
+                    ssl.Dispose()
+                    Environment.Exit(1)
+                End If
+
+                display_session_id(ssl)
+                session_id = ssl.GetSessionId()
+
+                If reconnect > 0 Then
+                    ssl.Dispose()
+                    client_sock.Close()
+                    
+                    ' and reconnect
+                    client_sock = New Socket(AddressFamily.InterNetwork, _
+                        SocketType.Stream, ProtocolType.Tcp)
+                    client_sock.Connect(ep)
+                End If
+            End While
+        Else
+            ssl = ssl_ctx.Connect(client_sock, Nothing)
+        End If
+
+        ' check the return status 
+        res = ssl.HandshakeStatus()
+        If res <> axtls.SSL_OK Then
+            If Not quiet Then
+                SSLUtil.DisplayError(res)
+            End If
+
+            Environment.Exit(1)
+        End If
+
+        If Not quiet Then
+            Dim common_name As String = _
+                ssl.GetCertificateDN(axtls.SSL_X509_CERT_COMMON_NAME)
+
+            If common_name <> Nothing
+                Console.WriteLine("Common Name:" & _
+                        ControlChars.Tab & ControlChars.Tab & _
+                        ControlChars.Tab & common_name)
+            End If
+
+            display_session_id(ssl)
+            display_cipher(ssl)
+        End If
+
+        While (1)
+            Dim user_input As String = Console.ReadLine()
+
+            If user_input = Nothing Then
+                Exit While
+            End If
+
+            Dim buf(user_input.Length+1) As Byte
+            buf(buf.Length-2) = Asc(ControlChars.Lf) ' add the carriage return
+            buf(buf.Length-1) = 0                    ' null terminate 
+
+            For i = 0 To user_input.Length-1
+                buf(i) = Asc(user_input.Chars(i))
+            Next
+
+            res = ssl_ctx.Write(ssl, buf, buf.Length)
+            If res < axtls.SSL_OK Then
+                If Not quiet Then
+                    SSLUtil.DisplayError(res)
+                End If
+
+                Exit While
+            End If
+        End While
+
+        ssl_ctx.Dispose()
+    End Sub
+
+    '
+    ' Display what cipher we are using
+    '
+    Private Sub display_cipher(ByVal ssl As SSL)
+        Console.Write("CIPHER is ")
+
+        Select ssl.GetCipherId()
+            Case axtls.SSL_AES128_SHA
+                Console.WriteLine("AES128-SHA")
+
+            Case axtls.SSL_AES256_SHA
+                Console.WriteLine("AES256-SHA")
+
+            Case axtls.SSL_RC4_128_SHA
+                Console.WriteLine("RC4-SHA")
+
+            Case axtls.SSL_RC4_128_MD5
+                Console.WriteLine("RC4-MD5")
+
+            Case Else
+                Console.WriteLine("Unknown - " & ssl.GetCipherId())
+        End Select
+    End Sub
+
+    '
+    ' Display what session id we have.
+    '
+    Private Sub display_session_id(ByVal ssl As SSL)
+        Dim session_id As Byte() = ssl.GetSessionId()
+
+        If session_id.Length > 0 Then
+            Console.WriteLine("-----BEGIN SSL SESSION PARAMETERS-----")
+            Dim b As Byte
+            For Each b In session_id
+                Console.Write("{0:x02}", b)
+            Next
+
+            Console.WriteLine()
+            Console.WriteLine("-----END SSL SESSION PARAMETERS-----")
+        End If
+    End Sub
+
+    ' 
+    ' We've had some sort of command-line error. Print out the basic options.
+    '
+    Public Sub print_options(ByVal options As String)
+        Console.WriteLine("axssl: Error: '" & options & _
+                "' is an invalid command.")
+        Console.WriteLine("usage: axssl.vbnet [s_server|s_client|" & _
+                "version] [args ...]")
+        Environment.Exit(1)
+    End Sub
+
+    ' 
+    ' We've had some sort of command-line error. Print out the server options.
+    '
+    Private Sub print_server_options(ByVal build_mode As Integer, _
+                                    ByVal options As String)
+        Dim cert_size As Integer = SSLUtil.MaxCerts()
+        Dim ca_cert_size As Integer = SSLUtil.MaxCACerts()
+
+        Console.WriteLine("unknown option " & options)
+        Console.WriteLine("usage: s_server [args ...]")
+        Console.WriteLine(" -accept arg" & ControlChars.Tab & _
+                "- port to accept on (default is 4433)")
+        Console.WriteLine(" -quiet" & ControlChars.Tab & ControlChars.Tab & _
+                "- No server output")
+        If build_mode >= axtls.SSL_BUILD_SERVER_ONLY 
+            Console.WriteLine(" -cert arg" & ControlChars.Tab & _
+               "- certificate file to add (in addition to default) to chain -")
+            Console.WriteLine(ControlChars.Tab & ControlChars.Tab & _
+                    "  Can repeat up to " & cert_size & " times")
+            Console.WriteLine(" -key arg" & ControlChars.Tab & _
+                        "- Private key file to use")
+            Console.WriteLine(" -pass" & ControlChars.Tab & ControlChars.Tab & _
+                    "- private key file pass phrase source")
+        End If
+
+        If build_mode >= axtls.SSL_BUILD_ENABLE_VERIFICATION
+            Console.WriteLine(" -verify" & ControlChars.Tab & _
+                    "- turn on peer certificate verification")
+            Console.WriteLine(" -CAfile arg" & ControlChars.Tab & _
+                    "- Certificate authority")
+            Console.WriteLine(ControlChars.Tab & ControlChars.Tab & _
+                    "  Can repeat up to " & ca_cert_size & " times")
+        End If
+
+        If build_mode = axtls.SSL_BUILD_FULL_MODE
+            Console.WriteLine(" -debug" & _
+                    ControlChars.Tab & ControlChars.Tab & _
+                    "- Print more output")
+            Console.WriteLine(" -state" & _
+                    ControlChars.Tab & ControlChars.Tab & _
+                    "- Show state messages")
+            Console.WriteLine(" -show-rsa" & _
+                    ControlChars.Tab & "- Show RSA state")
+        End If
+
+        Environment.Exit(1)
+    End Sub
+
+    '
+    ' We've had some sort of command-line error. Print out the client options.
+    '
+    Private Sub print_client_options(ByVal build_mode As Integer, _
+                                                ByVal options As String)
+        Dim cert_size As Integer = SSLUtil.MaxCerts()
+        Dim ca_cert_size As Integer = SSLUtil.MaxCACerts()
+
+        Console.WriteLine("unknown option " & options)
+
+        If build_mode >= axtls.SSL_BUILD_ENABLE_CLIENT Then
+            Console.WriteLine("usage: s_client [args ...]")
+            Console.WriteLine(" -connect host:port - who to connect to " & _
+                    "(default is localhost:4433)")
+            Console.WriteLine(" -verify" & ControlChars.Tab & _
+                    "- turn on peer certificate verification")
+            Console.WriteLine(" -cert arg" & ControlChars.Tab & _
+                    "- certificate file to use")
+            Console.WriteLine(ControlChars.Tab & ControlChars.Tab & _
+                    "  Can repeat up to " & cert_size & " times")
+            Console.WriteLine(" -key arg" & ControlChars.Tab & _
+                    "- Private key file to use")
+            Console.WriteLine(" -CAfile arg" & ControlChars.Tab & _
+                    "- Certificate authority")
+            Console.WriteLine(ControlChars.Tab & ControlChars.Tab & _
+                    "  Can repeat up to " & ca_cert_size & " times")
+            Console.WriteLine(" -quiet" & _
+                    ControlChars.Tab & ControlChars.Tab & "- No client output")
+            Console.WriteLine(" -pass" & ControlChars.Tab & _
+                    ControlChars.Tab & _
+                    "- private key file pass phrase source")
+            Console.WriteLine(" -reconnect" & ControlChars.Tab & _
+                    "- Drop and re-make the " & _
+                    "connection with the same Session-ID")
+
+            If build_mode = axtls.SSL_BUILD_FULL_MODE Then
+                Console.WriteLine(" -debug" & _
+                        ControlChars.Tab & ControlChars.Tab & _
+                        "- Print more output")
+                Console.WriteLine(" -state" & _
+                        ControlChars.Tab & ControlChars.Tab & _
+                        "- Show state messages")
+                Console.WriteLine(" -show-rsa" & ControlChars.Tab & _
+                        "- Show RSA state")
+            End If
+        Else 
+            Console.WriteLine("Change configuration to allow this feature")
+        End If
+
+        Environment.Exit(1)
+    End Sub
+
+End Class
+
+Public Module MyMain
+    Function Main(ByVal args() As String) As Integer
+        Dim runner As axssl = New axssl()
+
+        If args.Length = 1 And args(0) = "version" Then
+           Console.WriteLine("axssl.vbnet " & SSLUtil.Version())
+            Environment.Exit(0)
+        End If
+
+        If args.Length < 1 
+            runner.print_options("")
+        ElseIf args(0) <> "s_server" And args(0) <> "s_client"
+            runner.print_options(args(0))
+        End If
+
+        Dim build_mode As Integer = SSLUtil.BuildMode()
+
+        If args(0) = "s_server" Then
+            runner.do_server(build_mode, args)
+        Else
+            runner.do_client(build_mode, args)
+        End If
+    End Function
+End Module
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/BigIntConfig.in b/trunk/package/luci/libs/nixio/axTLS/ssl/BigIntConfig.in
new file mode 100644
index 00000000..04c7438c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/BigIntConfig.in
@@ -0,0 +1,132 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/config/Kconfig-language.txt
+#
+
+menu "BigInt Options"
+    depends on !CONFIG_SSL_SKELETON_MODE
+
+choice
+    prompt "Reduction Algorithm"
+    default CONFIG_BIGINT_BARRETT 
+
+config CONFIG_BIGINT_CLASSICAL
+    bool "Classical"
+    help
+        Classical uses standard division. It has no limitations and is
+        theoretically the slowest due to the divisions used. For this particular
+        implementation it is surprisingly quite fast.
+
+config CONFIG_BIGINT_MONTGOMERY
+    bool "Montgomery"
+    help
+        Montgomery uses simple addition and multiplication to achieve its
+        performance. In this implementation it is slower than classical, 
+        and it has the limitation that 0 <= x, y < m, and so is not used 
+        when CRT is active.
+
+        This option will not be normally selected.
+
+config CONFIG_BIGINT_BARRETT
+    bool "Barrett"
+    help
+        Barrett performs expensive precomputation before reduction and partial
+        multiplies for computational speed. It can't be used with some of the
+        calculations when CRT is used, and so defaults to classical when this
+        occurs.
+
+        It is about 40% faster than Classical/Montgomery with the expense of
+        about 2kB, and so this option is normally selected.
+
+endchoice
+
+config CONFIG_BIGINT_CRT
+    bool "Chinese Remainder Theorem (CRT)"
+    default y
+    help 
+        Allow the Chinese Remainder Theorem (CRT) to be used.
+
+        Uses a number of extra coefficients from the private key to improve the
+        performance of a decryption. This feature is one of the most 
+        significant performance improvements (it reduces a decryption time by 
+        over 3 times).
+
+        This option should be selected.
+
+config CONFIG_BIGINT_KARATSUBA
+    bool "Karatsuba Multiplication"
+    default n
+    help
+        Allow Karasuba multiplication to be used.
+ 
+        Uses 3 multiplications (plus a number of additions/subtractions) 
+        instead of 4. Multiplications are O(N^2) but addition/subtraction 
+        is O(N) hence for large numbers is beneficial. For this project, the 
+        effect was only useful for 4096 bit keys. As these aren't likely to 
+        be used, the feature is disabled by default. 
+        
+        It costs about 2kB to enable it.
+
+config MUL_KARATSUBA_THRESH
+    int "Karatsuba Multiplication Theshold"
+    default 20
+    depends on CONFIG_BIGINT_KARATSUBA
+    help
+        The minimum number of components needed before Karasuba muliplication
+        is used.
+ 
+        This is very dependent on the speed/implementation of bi_add()/
+        bi_subtract(). There is a bit of trial and error here and will be
+        at a different point for different architectures.
+
+config SQU_KARATSUBA_THRESH
+    int "Karatsuba Square Threshold"
+    default 40
+    depends on CONFIG_BIGINT_KARATSUBA && CONFIG_BIGINT_SQUARE
+    help    
+        The minimum number of components needed before Karatsuba squaring
+        is used.
+ 
+        This is very dependent on the speed/implementation of bi_add()/
+        bi_subtract(). There is a bit of trial and error here and will be
+        at a different point for different architectures.
+
+config CONFIG_BIGINT_SLIDING_WINDOW
+    bool "Sliding Window Exponentiation"
+    default y
+    help
+        Allow Sliding-Window Exponentiation to be used.
+ 
+        Potentially processes more than 1 bit at a time when doing 
+        exponentiation. The sliding-window technique reduces the number of 
+        precomputations compared to other precomputed techniques.
+
+        It results in a considerable performance improvement with it enabled
+        (it halves the decryption time) and so should be selected.
+
+config CONFIG_BIGINT_SQUARE
+    bool "Square Algorithm"
+    default y
+    help
+        Allow squaring to be used instead of a multiplication.
+ 
+        Squaring is theoretically 50% faster than a standard multiply 
+        (but is actually about 25% faster). 
+
+        It gives a 20% speed improvement and so should be selected.
+
+config CONFIG_BIGINT_CHECK_ON
+    bool "BigInt Integrity Checking"
+    default n if !CONFIG_DEBUG
+    default y if CONFIG_DEBUG
+    help
+        This is used when developing bigint algorithms. It performs a sanity
+        check on all operations at the expense of speed.
+        
+        This option is only selected when developing and should normally be
+        turned off.
+
+endmenu
+
+
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/Config.in b/trunk/package/luci/libs/nixio/axTLS/ssl/Config.in
new file mode 100644
index 00000000..d047d420
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/Config.in
@@ -0,0 +1,336 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/config/Kconfig-language.txt
+#
+
+menu "SSL Library"
+
+choice
+    prompt "Mode"
+    default CONFIG_SSL_FULL_MODE
+
+config CONFIG_SSL_SERVER_ONLY
+    bool "Server only - no verification"
+    help
+        Enable server functionality (no client functionality). 
+        This mode still supports sessions and chaining (which can be turned
+        off in configuration).
+
+        The axssl sample runs with the minimum of features.
+                
+        This is the most space efficient of the modes with the library 
+        about 45kB in size. Use this mode if you are doing standard SSL server
+        work.
+
+config CONFIG_SSL_CERT_VERIFICATION
+    bool "Server only - with verification"
+    help
+        Enable server functionality with client authentication (no client
+        functionality). 
+
+        The axssl sample runs with the "-verify" and "-CAfile" options.
+
+        This mode produces a library about 49kB in size. Use this mode if you
+        have an SSL server which requires client authentication (which is 
+        uncommon in browser applications).
+
+config CONFIG_SSL_ENABLE_CLIENT
+    bool "Client/Server enabled"
+    help
+        Enable client/server functionality (including peer authentication).
+
+        The axssl sample runs with the "s_client" option enabled.
+
+        This mode produces a library about 51kB in size. Use this mode if you
+        require axTLS to use SSL client functionality (the SSL server code
+        is always enabled).
+
+config CONFIG_SSL_FULL_MODE
+    bool "Client/Server enabled with diagnostics"
+    help
+        Enable client/server functionality including diagnostics. Most of the
+        extra size in this mode is due to the storage of various strings that
+        are used.
+
+        The axssl sample has 3 more options, "-debug", "-state" and "-show-rsa"
+
+        This mode produces a library about 58kB in size. It is suggested that 
+        this mode is used only during development, or systems that have more
+        generous memory limits.
+
+        It is the default to demonstrate the features of axTLS.
+
+config CONFIG_SSL_SKELETON_MODE
+    bool "Skeleton mode - the smallest server mode"
+    help
+        This is an experiment to build the smallest library at the expense of
+        features and speed.
+
+        * Server mode only.
+        * The AES cipher is disabled.
+        * No session resumption.
+        * No external keys/certificates are supported.
+        * The bigint library has most of the performance features disabled.
+        * Some other features/API calls may not work.
+
+        This mode produces a library about 37kB in size. The main
+        disadvantage of this mode is speed - it will be much slower than the 
+        other build modes.
+
+endchoice
+
+choice
+    prompt "Protocol Preference"
+    depends on !CONFIG_SSL_SKELETON_MODE
+    default CONFIG_SSL_PROT_MEDIUM
+
+config CONFIG_SSL_PROT_LOW
+    bool "Low"
+    help
+        Chooses the cipher in the order of RC4-SHA, AES128-SHA, AES256-SHA.
+      
+        This will use the fastest cipher(s) but at the expense of security.
+
+config CONFIG_SSL_PROT_MEDIUM
+    bool "Medium"
+    help
+        Chooses the cipher in the order of AES128-SHA, AES256-SHA, RC4-SHA.
+       
+        This mode is a balance between speed and security and is the default.
+
+config CONFIG_SSL_PROT_HIGH
+    bool "High"
+    help
+        Chooses the cipher in the order of AES256-SHA, AES128-SHA, RC4-SHA.
+        
+        This will use the strongest cipher(s) at the cost of speed.
+
+endchoice
+
+config CONFIG_SSL_USE_DEFAULT_KEY
+    bool "Enable default key"
+    depends on !CONFIG_SSL_SKELETON_MODE
+    default y 
+    help
+        Some applications will not require the default private key/certificate
+        that is built in. This is one way to save on a couple of kB's if an
+        external private key/certificate is used.
+
+        The private key is in ssl/private_key.h and the certificate is in
+        ssl/cert.h.
+
+        The advantage of a built-in private key/certificate is that no file
+        system is required for access. Both the certificate and the private
+        key will be automatically loaded on a ssl_ctx_new().
+        
+        However this private key/certificate can never be changed (without a
+        code update).
+
+        This mode is enabled by default. Disable this mode if the 
+        built-in key/certificate is not used.
+
+config CONFIG_SSL_PRIVATE_KEY_LOCATION
+    string "Private key file location"
+    depends on !CONFIG_SSL_USE_DEFAULT_KEY && !CONFIG_SSL_SKELETON_MODE
+    help
+        The file location of the private key which will be automatically
+        loaded on a ssl_ctx_new().
+
+config CONFIG_SSL_PRIVATE_KEY_PASSWORD
+    string "Private key password"
+    depends on !CONFIG_SSL_USE_DEFAULT_KEY && CONFIG_SSL_HAS_PEM
+    help
+        The password required to decrypt a PEM-encoded password file.
+
+config CONFIG_SSL_X509_CERT_LOCATION
+    string "X.509 certificate file location"
+    depends on !CONFIG_SSL_GENERATE_X509_CERT && !CONFIG_SSL_USE_DEFAULT_KEY && !CONFIG_SSL_SKELETON_MODE
+    help
+        The file location of the X.509 certificate which will be automatically
+        loaded on a ssl_ctx_new().
+
+config CONFIG_SSL_GENERATE_X509_CERT
+    bool "Generate X.509 Certificate"
+    default n
+    help
+        An X.509 certificate can be automatically generated on a
+        ssl_ctx_new(). A private key still needs to be provided (the private
+        key in ss/private_key.h will be used unless 
+        CONFIG_SSL_PRIVATE_KEY_LOCATION is set).
+
+        The certificate is generated on the fly, and so a minor start-up time
+        penalty is to be expected. This feature adds around 5kB to the
+        library.
+
+        This feature is disabled by default.
+
+config CONFIG_SSL_X509_COMMON_NAME
+    string "X.509 Common Name"
+    depends on CONFIG_SSL_GENERATE_X509_CERT
+    help
+        The common name for the X.509 certificate. This should be the fully 
+        qualified domain name (FQDN), e.g. www.foo.com.
+
+        If this is blank, then this will be value from gethostname() and
+        getdomainname().
+
+config CONFIG_SSL_X509_ORGANIZATION_NAME
+    string "X.509 Organization Name"
+    depends on CONFIG_SSL_GENERATE_X509_CERT
+    help
+        The organization name for the generated X.509 certificate. 
+
+        This field is optional.
+
+config CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME
+    string "X.509 Organization Unit Name"
+    depends on CONFIG_SSL_GENERATE_X509_CERT
+    help
+        The organization unit name for the generated X.509 certificate. 
+
+        This field is optional.
+
+config CONFIG_SSL_ENABLE_V23_HANDSHAKE
+    bool "Enable v23 Handshake"
+    default y
+    help
+        Some browsers use the v23 handshake client hello message 
+        (an SSL2 format message which all SSL servers can understand). 
+        It may be used if SSL2 is enabled in the browser.
+
+        Since this feature takes a kB or so, this feature may be disabled - at
+        the risk of making it incompatible with some browsers (IE6 is ok,
+        Firefox 1.5 and below use it).
+
+        Disable if backwards compatibility is not an issue (i.e. the client is
+        always using TLS1.0)
+
+config CONFIG_SSL_HAS_PEM
+    bool "Enable PEM"
+    default n if !CONFIG_SSL_FULL_MODE
+    default y if CONFIG_SSL_FULL_MODE
+    depends on !CONFIG_SSL_SKELETON_MODE
+    help
+        Enable the use of PEM format for certificates and private keys.
+
+        PEM is not normally needed - PEM files can be converted into DER files
+        quite easily. However they have the convenience of allowing multiple
+        certificates/keys in the same file.
+        
+        This feature will add a couple of kB to the library. 
+
+        Disable if PEM is not used (which will be in most cases).
+
+config CONFIG_SSL_USE_PKCS12
+    bool "Use PKCS8/PKCS12"
+    default n if !CONFIG_SSL_FULL_MODE
+    default y if CONFIG_SSL_FULL_MODE
+    depends on !CONFIG_SSL_SERVER_ONLY && !CONFIG_SSL_SKELETON_MODE
+    help
+        PKCS#12 certificates combine private keys and certificates together in
+        one file.
+
+        PKCS#8 private keys are also suppported (as it is a subset of PKCS#12).
+
+        The decryption of these certificates uses RC4-128 (and these
+        certificates must be encrypted using this cipher). The actual
+        algorithm is "PBE-SHA1-RC4-128".
+
+        Disable if PKCS#12 is not used (which will be in most cases).
+
+config CONFIG_SSL_EXPIRY_TIME
+    int "Session expiry time (in hours)"
+    depends on !CONFIG_SSL_SKELETON_MODE
+    default 24 
+    help
+        The time (in hours) before a session expires. 
+        
+        A longer time means that the expensive parts of a handshake don't 
+        need to be run when a client reconnects later.
+
+        The default is 1 day.
+
+config CONFIG_X509_MAX_CA_CERTS
+    int "Maximum number of certificate authorites"
+    default 4
+    depends on !CONFIG_SSL_SERVER_ONLY && !CONFIG_SSL_SKELETON_MODE
+    help
+        Determines the number of CA's allowed. 
+
+        Increase this figure if more trusted sites are allowed. Each
+        certificate adds about 300 bytes (when added).
+
+        The default is to allow four certification authorities.
+
+config CONFIG_SSL_MAX_CERTS
+    int "Maximum number of chained certificates"
+    default 2
+    help
+        Determines the number of certificates used in a certificate
+        chain. The chain length must be at least 1.
+
+        Increase this figure if more certificates are to be added to the 
+        chain. Each certificate adds about 300 bytes (when added).
+
+        The default is to allow one certificate + 1 certificate in the chain
+        (which may be the certificate authority certificate).
+
+config CONFIG_SSL_CTX_MUTEXING
+    bool "Enable SSL_CTX mutexing"
+    default n
+    help
+        Normally mutexing is not required - each SSL_CTX object can deal with
+        many SSL objects (as long as each SSL_CTX object is using a single
+        thread).
+
+        If the SSL_CTX object is not thread safe e.g. the case where a 
+        new thread is created for each SSL object, then mutexing is required. 
+
+        Select y when a mutex on the SSL_CTX object is required.
+
+config CONFIG_USE_DEV_URANDOM
+    bool "Use /dev/urandom"
+    default y
+    depends on !CONFIG_PLATFORM_WIN32
+    help 
+        Use /dev/urandom. Otherwise a custom RNG is used.
+
+        This will be the default on most Linux systems.
+
+config CONFIG_WIN32_USE_CRYPTO_LIB
+    bool "Use Win32 Crypto Library"
+    depends on CONFIG_PLATFORM_WIN32
+    help 
+        Microsoft produce a Crypto API which requires the Platform SDK to be
+        installed. It's used for the RNG.
+
+        This will be the default on most Win32 systems.
+
+config CONFIG_OPENSSL_COMPATIBLE
+    bool "Enable openssl API compatibility"
+    default n
+    help 
+        To ease the porting of openssl applications, a subset of the openssl
+        API is wrapped around the axTLS API.
+
+        Note: not all the API is implemented, so parts may still break. And
+        it's definitely not 100% compatible.
+
+config CONFIG_PERFORMANCE_TESTING
+    bool "Build the bigint performance test tool"
+    default n
+    help
+        Used for performance testing of bigint.
+
+        This is a testing tool and is normally disabled.
+
+config CONFIG_SSL_TEST
+    bool "Build the SSL testing tool"
+    default n
+    depends on CONFIG_SSL_FULL_MODE && !CONFIG_SSL_GENERATE_X509_CERT 
+    help
+        Used for sanity checking the SSL handshaking.
+
+        This is a testing tool and is normally disabled.
+
+endmenu
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/Makefile b/trunk/package/luci/libs/nixio/axTLS/ssl/Makefile
new file mode 100644
index 00000000..704d90a9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/Makefile
@@ -0,0 +1,123 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+AXTLS_HOME=..
+
+include $(AXTLS_HOME)/config/.config
+include $(AXTLS_HOME)/config/makefile.conf
+
+all: libs
+ifdef CONFIG_PERFORMANCE_TESTING
+	$(MAKE) -C test
+else
+ifdef CONFIG_SSL_TEST
+	$(MAKE) -C test
+endif
+endif
+
+ifndef CONFIG_PLATFORM_WIN32
+TARGET1=$(AXTLS_HOME)/$(STAGE)/libaxtls.a
+BASETARGET=libaxtls.so
+CRYPTO_PATH=$(AXTLS_HOME)/crypto/
+ifdef CONFIG_PLATFORM_CYGWIN
+TARGET2=$(AXTLS_HOME)/$(STAGE)/libaxtls.dll.a
+else
+TARGET2=$(AXTLS_HOME)/$(STAGE)/$(LIBMINOR)
+endif
+
+# shared library major/minor numbers
+LIBMAJOR=$(BASETARGET).1
+LIBMINOR=$(BASETARGET).1.2
+else
+TARGET1=$(AXTLS_HOME)/$(STAGE)/axtls.lib
+TARGET2=$(AXTLS_HOME)/$(STAGE)/axtls.dll
+STATIC_LIB=$(AXTLS_HOME)/$(STAGE)/axtls.static.lib
+CRYPTO_PATH=$(AXTLS_HOME)\\crypto\\
+endif
+
+libs: $(TARGET1) $(TARGET2)
+
+CRYPTO_OBJ=\
+	$(CRYPTO_PATH)aes.o \
+	$(CRYPTO_PATH)bigint.o \
+	$(CRYPTO_PATH)crypto_misc.o \
+	$(CRYPTO_PATH)hmac.o \
+	$(CRYPTO_PATH)md2.o \
+	$(CRYPTO_PATH)md5.o \
+	$(CRYPTO_PATH)rc4.o \
+	$(CRYPTO_PATH)rsa.o \
+	$(CRYPTO_PATH)sha1.o
+
+OBJ=\
+	asn1.o \
+	gen_cert.o \
+	loader.o \
+	openssl.o \
+	os_port.o \
+	p12.o \
+	tls1.o \
+	tls1_svr.o \
+	tls1_clnt.o \
+	x509.o
+
+include $(AXTLS_HOME)/config/makefile.post
+
+ifndef CONFIG_PLATFORM_WIN32     # Linux/Unix/Cygwin
+
+$(TARGET1) : $(OBJ)
+	$(AR) -r $@ $(CRYPTO_OBJ) $(OBJ)
+
+$(TARGET2) : $(OBJ)
+ifndef CONFIG_PLATFORM_CYGWIN
+	$(LD) $(LDFLAGS) $(LDSHARED) -o $(AXTLS_HOME)/$(STAGE)/$(LIBMINOR) $(CRYPTO_OBJ) $(OBJ)
+	cd $(AXTLS_HOME)/$(STAGE); ln -sf $(LIBMINOR) $(LIBMAJOR); ln -sf $(LIBMAJOR) $(BASETARGET); cd -
+else
+	$(LD) $(LDFLAGS) $(LDSHARED) -o $(AXTLS_HOME)/$(STAGE)/cygaxtls.dll \
+    -Wl,--out-implib=$(AXTLS_HOME)/$(STAGE)/libaxtls.dll.a \
+    -Wl,--export-all-symbols \
+    -Wl,--enable-auto-import $(CRYPTO_OBJ) $(OBJ)
+endif
+
+else  # Win32
+CRYPTO_OBJ:=$(CRYPTO_OBJ:.o=.obj)
+
+$(TARGET1) : $(OBJ)
+	$(AR) /out:$@ $(CRYPTO_OBJ) $(OBJ)
+
+$(TARGET2) : $(OBJ)
+	cp $(TARGET1) $(STATIC_LIB)
+	$(LD) $(LDFLAGS) $(LDSHARED) /out:$@ $(CRYPTO_OBJ) $(OBJ)
+
+endif    
+
+clean::
+	$(MAKE) -C test clean
+	-@rm -f $(AXTLS_HOME)/$(STAGE)/* *.a $(TARGET1) $(TARGET2)
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/asn1.c b/trunk/package/luci/libs/nixio/axTLS/ssl/asn1.c
new file mode 100644
index 00000000..4f2e6db2
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/asn1.c
@@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Some primitive asn methods for extraction ASN.1 data.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "os_port.h"
+#include "crypto.h"
+#include "crypto_misc.h"
+
+#define SIG_OID_PREFIX_SIZE 8
+#define SIG_IIS6_OID_SIZE   5
+
+/* Must be an RSA algorithm with either SHA1 or MD5 for verifying to work */
+static const uint8_t sig_oid_prefix[SIG_OID_PREFIX_SIZE] = 
+{
+    0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01
+};
+
+static const uint8_t sig_iis6_oid[SIG_IIS6_OID_SIZE] =
+{
+    0x2b, 0x0e, 0x03, 0x02, 0x1d
+};
+
+/* CN, O, OU */
+static const uint8_t g_dn_types[] = { 3, 10, 11 };
+
+int get_asn1_length(const uint8_t *buf, int *offset)
+{
+    int len, i;
+
+    if (!(buf[*offset] & 0x80)) /* short form */
+    {
+        len = buf[(*offset)++];
+    }
+    else  /* long form */
+    {
+        int length_bytes = buf[(*offset)++]&0x7f;
+        len = 0;
+        for (i = 0; i < length_bytes; i++)
+        {
+            len <<= 8;
+            len += buf[(*offset)++];
+        }
+    }
+
+    return len;
+}
+
+/**
+ * Skip the ASN1.1 object type and its length. Get ready to read the object's
+ * data.
+ */
+int asn1_next_obj(const uint8_t *buf, int *offset, int obj_type)
+{
+    if (buf[*offset] != obj_type)
+        return X509_NOT_OK;
+    (*offset)++;
+    return get_asn1_length(buf, offset);
+}
+
+/**
+ * Skip over an ASN.1 object type completely. Get ready to read the next
+ * object.
+ */
+int asn1_skip_obj(const uint8_t *buf, int *offset, int obj_type)
+{
+    int len;
+
+    if (buf[*offset] != obj_type)
+        return X509_NOT_OK;
+    (*offset)++;
+    len = get_asn1_length(buf, offset);
+    *offset += len;
+    return 0;
+}
+
+/**
+ * Read an integer value for ASN.1 data
+ * Note: This function allocates memory which must be freed by the user.
+ */
+int asn1_get_int(const uint8_t *buf, int *offset, uint8_t **object)
+{
+    int len;
+
+    if ((len = asn1_next_obj(buf, offset, ASN1_INTEGER)) < 0)
+        goto end_int_array;
+
+    if (len > 1 && buf[*offset] == 0x00)    /* ignore the negative byte */
+    {
+        len--;
+        (*offset)++;
+    }
+
+    *object = (uint8_t *)malloc(len);
+    memcpy(*object, &buf[*offset], len);
+    *offset += len;
+
+end_int_array:
+    return len;
+}
+
+/**
+ * Get all the RSA private key specifics from an ASN.1 encoded file 
+ */
+int asn1_get_private_key(const uint8_t *buf, int len, RSA_CTX **rsa_ctx)
+{
+    int offset = 7;
+    uint8_t *modulus = NULL, *priv_exp = NULL, *pub_exp = NULL;
+    int mod_len, priv_len, pub_len;
+#ifdef CONFIG_BIGINT_CRT
+    uint8_t *p = NULL, *q = NULL, *dP = NULL, *dQ = NULL, *qInv = NULL;
+    int p_len, q_len, dP_len, dQ_len, qInv_len;
+#endif
+
+    /* not in der format */
+    if (buf[0] != ASN1_SEQUENCE) /* basic sanity check */
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: This is not a valid ASN.1 file\n");
+#endif
+        return X509_INVALID_PRIV_KEY;
+    }
+
+    /* initialise the RNG */
+    RNG_initialize(buf, len);
+
+    mod_len = asn1_get_int(buf, &offset, &modulus);
+    pub_len = asn1_get_int(buf, &offset, &pub_exp);
+    priv_len = asn1_get_int(buf, &offset, &priv_exp);
+
+    if (mod_len <= 0 || pub_len <= 0 || priv_len <= 0)
+        return X509_INVALID_PRIV_KEY;
+
+#ifdef CONFIG_BIGINT_CRT
+    p_len = asn1_get_int(buf, &offset, &p);
+    q_len = asn1_get_int(buf, &offset, &q);
+    dP_len = asn1_get_int(buf, &offset, &dP);
+    dQ_len = asn1_get_int(buf, &offset, &dQ);
+    qInv_len = asn1_get_int(buf, &offset, &qInv);
+
+    if (p_len <= 0 || q_len <= 0 || dP_len <= 0 || dQ_len <= 0 || qInv_len <= 0)
+        return X509_INVALID_PRIV_KEY;
+
+    RSA_priv_key_new(rsa_ctx, 
+            modulus, mod_len, pub_exp, pub_len, priv_exp, priv_len,
+            p, p_len, q, p_len, dP, dP_len, dQ, dQ_len, qInv, qInv_len);
+
+    free(p);
+    free(q);
+    free(dP);
+    free(dQ);
+    free(qInv);
+#else
+    RSA_priv_key_new(rsa_ctx, 
+            modulus, mod_len, pub_exp, pub_len, priv_exp, priv_len);
+#endif
+
+    free(modulus);
+    free(priv_exp);
+    free(pub_exp);
+    return X509_OK;
+}
+
+/**
+ * Get the time of a certificate. Ignore hours/minutes/seconds.
+ */
+static int asn1_get_utc_time(const uint8_t *buf, int *offset, time_t *t)
+{
+    int ret = X509_NOT_OK, len, t_offset;
+    struct tm tm;
+
+    if (buf[(*offset)++] != ASN1_UTC_TIME)
+        goto end_utc_time;
+    len = get_asn1_length(buf, offset);
+    t_offset = *offset;
+
+    memset(&tm, 0, sizeof(struct tm));
+    tm.tm_year = (buf[t_offset] - '0')*10 + (buf[t_offset+1] - '0');
+
+    if (tm.tm_year <= 50)    /* 1951-2050 thing */
+    {
+        tm.tm_year += 100;
+    }
+
+    tm.tm_mon = (buf[t_offset+2] - '0')*10 + (buf[t_offset+3] - '0') - 1;
+    tm.tm_mday = (buf[t_offset+4] - '0')*10 + (buf[t_offset+5] - '0');
+    *t = mktime(&tm);
+    *offset += len;
+    ret = X509_OK;
+
+end_utc_time:
+    return ret;
+}
+
+/**
+ * Get the version type of a certificate (which we don't actually care about)
+ */
+int asn1_version(const uint8_t *cert, int *offset, X509_CTX *x509_ctx)
+{
+    int ret = X509_NOT_OK;
+
+    (*offset) += 2;        /* get past explicit tag */
+    if (asn1_skip_obj(cert, offset, ASN1_INTEGER))
+        goto end_version;
+
+    ret = X509_OK;
+end_version:
+    return ret;
+}
+
+/**
+ * Retrieve the notbefore and notafter certificate times.
+ */
+int asn1_validity(const uint8_t *cert, int *offset, X509_CTX *x509_ctx)
+{
+    return (asn1_next_obj(cert, offset, ASN1_SEQUENCE) < 0 ||
+              asn1_get_utc_time(cert, offset, &x509_ctx->not_before) ||
+              asn1_get_utc_time(cert, offset, &x509_ctx->not_after));
+}
+
+/**
+ * Get the components of a distinguished name 
+ */
+static int asn1_get_oid_x520(const uint8_t *buf, int *offset)
+{
+    int dn_type = 0;
+    int len;
+
+    if ((len = asn1_next_obj(buf, offset, ASN1_OID)) < 0)
+        goto end_oid;
+
+    /* expect a sequence of 2.5.4.[x] where x is a one of distinguished name 
+       components we are interested in. */
+    if (len == 3 && buf[(*offset)++] == 0x55 && buf[(*offset)++] == 0x04)
+        dn_type = buf[(*offset)++];
+    else
+    {
+        *offset += len;     /* skip over it */
+    }
+
+end_oid:
+    return dn_type;
+}
+
+/**
+ * Obtain an ASN.1 printable string type.
+ */
+static int asn1_get_printable_str(const uint8_t *buf, int *offset, char **str)
+{
+    int len = X509_NOT_OK;
+
+    /* some certs have this awful crud in them for some reason */
+    if (buf[*offset] != ASN1_PRINTABLE_STR &&  
+            buf[*offset] != ASN1_TELETEX_STR &&  
+            buf[*offset] != ASN1_IA5_STR &&  
+            buf[*offset] != ASN1_UNICODE_STR)
+        goto end_pnt_str;
+
+        (*offset)++;
+        len = get_asn1_length(buf, offset);
+
+        if (buf[*offset - 1] == ASN1_UNICODE_STR)
+        {
+            int i;
+            *str = (char *)malloc(len/2+1);     /* allow for null */
+
+            for (i = 0; i < len; i += 2)
+                (*str)[i/2] = buf[*offset + i + 1];
+
+            (*str)[len/2] = 0;                  /* null terminate */
+        }
+        else
+        {
+            *str = (char *)malloc(len+1);       /* allow for null */
+            memcpy(*str, &buf[*offset], len);
+            (*str)[len] = 0;                    /* null terminate */
+        }
+
+        *offset += len;
+
+end_pnt_str:
+    return len;
+}
+
+/**
+ * Get the subject name (or the issuer) of a certificate.
+ */
+int asn1_name(const uint8_t *cert, int *offset, char *dn[])
+{
+    int ret = X509_NOT_OK;
+    int dn_type;
+    char *tmp = NULL;
+
+    if (asn1_next_obj(cert, offset, ASN1_SEQUENCE) < 0)
+        goto end_name;
+
+    while (asn1_next_obj(cert, offset, ASN1_SET) >= 0)
+    {
+        int i, found = 0;
+
+        if (asn1_next_obj(cert, offset, ASN1_SEQUENCE) < 0 ||
+               (dn_type = asn1_get_oid_x520(cert, offset)) < 0)
+            goto end_name;
+
+        if (asn1_get_printable_str(cert, offset, &tmp) < 0)
+        {
+            free(tmp);
+            goto end_name;
+        }
+
+        /* find the distinguished named type */
+        for (i = 0; i < X509_NUM_DN_TYPES; i++)
+        {
+            if (dn_type == g_dn_types[i])
+            {
+                if (dn[i] == NULL)
+                {
+                    dn[i] = tmp;
+                    found = 1;
+                    break;
+                }
+            }
+        }
+
+        if (found == 0) /* not found so get rid of it */
+        {
+            free(tmp);
+        }
+    }
+
+    ret = X509_OK;
+end_name:
+    return ret;
+}
+
+/**
+ * Read the modulus and public exponent of a certificate.
+ */
+int asn1_public_key(const uint8_t *cert, int *offset, X509_CTX *x509_ctx)
+{
+    int ret = X509_NOT_OK, mod_len, pub_len;
+    uint8_t *modulus = NULL, *pub_exp = NULL;
+
+    if (asn1_next_obj(cert, offset, ASN1_SEQUENCE) < 0 ||
+            asn1_skip_obj(cert, offset, ASN1_SEQUENCE) ||
+            asn1_next_obj(cert, offset, ASN1_BIT_STRING) < 0)
+        goto end_pub_key;
+
+    (*offset)++;        /* ignore the padding bit field */
+
+    if (asn1_next_obj(cert, offset, ASN1_SEQUENCE) < 0)
+        goto end_pub_key;
+
+    mod_len = asn1_get_int(cert, offset, &modulus);
+    pub_len = asn1_get_int(cert, offset, &pub_exp);
+
+    RSA_pub_key_new(&x509_ctx->rsa_ctx, modulus, mod_len, pub_exp, pub_len);
+
+    free(modulus);
+    free(pub_exp);
+    ret = X509_OK;
+
+end_pub_key:
+    return ret;
+}
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+/**
+ * Read the signature of the certificate.
+ */
+int asn1_signature(const uint8_t *cert, int *offset, X509_CTX *x509_ctx)
+{
+    int ret = X509_NOT_OK;
+
+    if (cert[(*offset)++] != ASN1_BIT_STRING)
+        goto end_sig;
+
+    x509_ctx->sig_len = get_asn1_length(cert, offset)-1;
+    (*offset)++;            /* ignore bit string padding bits */
+    x509_ctx->signature = (uint8_t *)malloc(x509_ctx->sig_len);
+    memcpy(x509_ctx->signature, &cert[*offset], x509_ctx->sig_len);
+    *offset += x509_ctx->sig_len;
+    ret = X509_OK;
+
+end_sig:
+    return ret;
+}
+
+/*
+ * Compare 2 distinguished name components for equality 
+ * @return 0 if a match
+ */
+static int asn1_compare_dn_comp(const char *dn1, const char *dn2)
+{
+    int ret = 1;
+
+    if ((dn1 && dn2 == NULL) || (dn1 == NULL && dn2)) goto err_no_match;
+
+    ret = (dn1 && dn2) ? strcmp(dn1, dn2) : 0;
+
+err_no_match:
+    return ret;
+}
+
+/**
+ * Clean up all of the CA certificates.
+ */
+void remove_ca_certs(CA_CERT_CTX *ca_cert_ctx)
+{
+    int i = 0;
+
+    if (ca_cert_ctx == NULL)
+        return;
+
+    while (i < CONFIG_X509_MAX_CA_CERTS && ca_cert_ctx->cert[i])
+    {
+        x509_free(ca_cert_ctx->cert[i]);
+        ca_cert_ctx->cert[i++] = NULL;
+    }
+
+    free(ca_cert_ctx);
+}
+
+/*
+ * Compare 2 distinguished names for equality 
+ * @return 0 if a match
+ */
+int asn1_compare_dn(char * const dn1[], char * const dn2[])
+{
+    int i;
+
+    for (i = 0; i < X509_NUM_DN_TYPES; i++)
+    {
+        if (asn1_compare_dn_comp(dn1[i], dn2[i]))
+            return 1;
+    }
+
+    return 0;       /* all good */
+}
+
+#endif
+
+/**
+ * Read the signature type of the certificate. We only support RSA-MD5 and
+ * RSA-SHA1 signature types.
+ */
+int asn1_signature_type(const uint8_t *cert, 
+                                int *offset, X509_CTX *x509_ctx)
+{
+    int ret = X509_NOT_OK, len;
+
+    if (cert[(*offset)++] != ASN1_OID)
+        goto end_check_sig;
+
+    len = get_asn1_length(cert, offset);
+
+    if (len == 5 && memcmp(sig_iis6_oid, &cert[*offset], 
+                                    SIG_IIS6_OID_SIZE) == 0)
+    {
+        x509_ctx->sig_type = SIG_TYPE_SHA1;
+    }
+    else
+    {
+        if (memcmp(sig_oid_prefix, &cert[*offset], SIG_OID_PREFIX_SIZE))
+            goto end_check_sig;     /* unrecognised cert type */
+
+        x509_ctx->sig_type = cert[*offset + SIG_OID_PREFIX_SIZE];
+    }
+
+    *offset += len;
+    asn1_skip_obj(cert, offset, ASN1_NULL); /* if it's there */
+    ret = X509_OK;
+
+end_check_sig:
+    return ret;
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/cert.h b/trunk/package/luci/libs/nixio/axTLS/ssl/cert.h
new file mode 100644
index 00000000..7a85d2d8
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/cert.h
@@ -0,0 +1,43 @@
+unsigned char default_certificate[] = {
+  0x30, 0x82, 0x01, 0xd7, 0x30, 0x82, 0x01, 0x40, 0x02, 0x09, 0x00, 0xf1,
+  0xc3, 0x87, 0xc0, 0xd4, 0xf4, 0x57, 0xc3, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+  0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x34,
+  0x31, 0x32, 0x30, 0x30, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x29, 0x61,
+  0x78, 0x54, 0x4c, 0x53, 0x20, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
+  0x20, 0x44, 0x6f, 0x64, 0x67, 0x79, 0x20, 0x43, 0x65, 0x72, 0x74, 0x69,
+  0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6f,
+  0x72, 0x69, 0x74, 0x79, 0x30, 0x1e, 0x17, 0x0d, 0x30, 0x36, 0x30, 0x36,
+  0x30, 0x37, 0x31, 0x31, 0x34, 0x34, 0x33, 0x32, 0x5a, 0x17, 0x0d, 0x33,
+  0x33, 0x31, 0x30, 0x32, 0x33, 0x31, 0x31, 0x34, 0x34, 0x33, 0x32, 0x5a,
+  0x30, 0x2c, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13,
+  0x0d, 0x61, 0x78, 0x54, 0x4c, 0x53, 0x20, 0x50, 0x72, 0x6f, 0x6a, 0x65,
+  0x63, 0x74, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13,
+  0x09, 0x31, 0x32, 0x37, 0x2e, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x30, 0x81,
+  0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
+  0x01, 0x01, 0x05, 0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81, 0x89, 0x02,
+  0x81, 0x81, 0x00, 0xd8, 0xe0, 0xbf, 0x15, 0xde, 0xea, 0xaf, 0xe8, 0xd5,
+  0xfd, 0x0b, 0xa8, 0xa8, 0xb3, 0xd7, 0x46, 0x5d, 0xa7, 0x26, 0x6c, 0x0c,
+  0xb5, 0xd9, 0xbc, 0xc6, 0xf8, 0xc0, 0x78, 0xd0, 0xf6, 0x56, 0x65, 0xf8,
+  0x29, 0x48, 0x0e, 0x7b, 0x0b, 0xa6, 0x25, 0x7e, 0xe8, 0x7b, 0x79, 0x6f,
+  0x38, 0xe5, 0xb5, 0xb7, 0xf4, 0xe0, 0x9c, 0x91, 0x60, 0xf4, 0x06, 0xf3,
+  0x40, 0x1e, 0xf9, 0x91, 0x19, 0xa9, 0x2f, 0x47, 0x43, 0xb5, 0x9b, 0x1e,
+  0xdc, 0xf6, 0xaa, 0x1c, 0x49, 0x79, 0x21, 0x28, 0xcb, 0xaa, 0x49, 0x73,
+  0xd9, 0x09, 0x05, 0x4c, 0x02, 0xf2, 0x4c, 0x4d, 0x6c, 0x1c, 0x80, 0xa7,
+  0x14, 0x91, 0x44, 0xfc, 0x12, 0xb3, 0xe1, 0xe7, 0xe3, 0x4f, 0x44, 0xba,
+  0x8c, 0xc3, 0x74, 0x39, 0xe8, 0x4c, 0xd0, 0xd4, 0x4c, 0x24, 0x61, 0xb4,
+  0x40, 0x95, 0x8c, 0xc0, 0x0a, 0xb7, 0x02, 0x39, 0x31, 0x85, 0x93, 0x02,
+  0x03, 0x01, 0x00, 0x01, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
+  0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x81, 0x81, 0x00, 0x0b,
+  0x47, 0x24, 0x52, 0x7d, 0xb6, 0x63, 0x78, 0xbc, 0x80, 0xdd, 0x87, 0x6c,
+  0x90, 0x4c, 0x33, 0xc3, 0x5c, 0xa7, 0x97, 0x09, 0x1c, 0x09, 0x4f, 0x9b,
+  0x6e, 0xb3, 0x5a, 0x3e, 0x46, 0x92, 0x1a, 0xc7, 0x87, 0x15, 0x59, 0xe1,
+  0x88, 0x5c, 0xce, 0x6a, 0xe2, 0x96, 0xaa, 0x32, 0xec, 0xc2, 0xed, 0x78,
+  0x8b, 0xe0, 0x90, 0x66, 0x93, 0x14, 0xc3, 0x98, 0xab, 0x33, 0x35, 0xd3,
+  0x7d, 0x5d, 0x51, 0x0a, 0x9c, 0xb9, 0x10, 0x58, 0x47, 0x7a, 0x98, 0x95,
+  0x64, 0xff, 0x4c, 0x5d, 0x82, 0x19, 0xf9, 0xea, 0x0f, 0x5e, 0x9a, 0xcb,
+  0x32, 0x27, 0x64, 0xca, 0x6f, 0x58, 0x8a, 0xd0, 0xc0, 0x36, 0xf4, 0xb9,
+  0x63, 0x34, 0xa5, 0xda, 0x36, 0x50, 0x36, 0x49, 0xd2, 0xb7, 0x3a, 0x21,
+  0x33, 0x5b, 0x3e, 0xd6, 0x5f, 0x0c, 0x99, 0x83, 0xb7, 0xb2, 0xf7, 0x8b,
+  0x44, 0xc4, 0x5e, 0x73, 0x41, 0xa9, 0x02
+};
+unsigned int default_certificate_len = 475;
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/crypto_misc.h b/trunk/package/luci/libs/nixio/axTLS/ssl/crypto_misc.h
new file mode 100644
index 00000000..97cb0f2d
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/crypto_misc.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file crypto_misc.h
+ */
+
+#ifndef HEADER_CRYPTO_MISC_H
+#define HEADER_CRYPTO_MISC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "crypto.h"
+#include "bigint.h"
+
+/**************************************************************************
+ * X509 declarations 
+ **************************************************************************/
+#define X509_OK                             0
+#define X509_NOT_OK                         -1
+#define X509_VFY_ERROR_NO_TRUSTED_CERT      -2
+#define X509_VFY_ERROR_BAD_SIGNATURE        -3      
+#define X509_VFY_ERROR_NOT_YET_VALID        -4
+#define X509_VFY_ERROR_EXPIRED              -5
+#define X509_VFY_ERROR_SELF_SIGNED          -6
+#define X509_VFY_ERROR_INVALID_CHAIN        -7
+#define X509_VFY_ERROR_UNSUPPORTED_DIGEST   -8
+#define X509_INVALID_PRIV_KEY               -9
+
+/*
+ * The Distinguished Name
+ */
+#define X509_NUM_DN_TYPES                   3
+#define X509_COMMON_NAME                    0
+#define X509_ORGANIZATION                   1
+#define X509_ORGANIZATIONAL_UNIT            2
+
+struct _x509_ctx
+{
+    char *ca_cert_dn[X509_NUM_DN_TYPES];
+    char *cert_dn[X509_NUM_DN_TYPES];
+    time_t not_before;
+    time_t not_after;
+    uint8_t *signature;
+    uint16_t sig_len;
+    uint8_t sig_type;
+    RSA_CTX *rsa_ctx;
+    bigint *digest;
+    struct _x509_ctx *next;
+};
+
+typedef struct _x509_ctx X509_CTX;
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+typedef struct 
+{
+    X509_CTX *cert[CONFIG_X509_MAX_CA_CERTS];
+} CA_CERT_CTX;
+#endif
+
+int x509_new(const uint8_t *cert, int *len, X509_CTX **ctx);
+void x509_free(X509_CTX *x509_ctx);
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+int x509_verify(const CA_CERT_CTX *ca_cert_ctx, const X509_CTX *cert);
+#endif
+#ifdef CONFIG_SSL_FULL_MODE
+void x509_print(const X509_CTX *cert, CA_CERT_CTX *ca_cert_ctx);
+const char * x509_display_error(int error);
+#endif
+
+/**************************************************************************
+ * ASN1 declarations 
+ **************************************************************************/
+#define ASN1_INTEGER            0x02
+#define ASN1_BIT_STRING         0x03
+#define ASN1_OCTET_STRING       0x04
+#define ASN1_NULL               0x05
+#define ASN1_OID                0x06
+#define ASN1_PRINTABLE_STR      0x13
+#define ASN1_TELETEX_STR        0x14
+#define ASN1_IA5_STR            0x16
+#define ASN1_UTC_TIME           0x17
+#define ASN1_UNICODE_STR        0x1e
+#define ASN1_SEQUENCE           0x30
+#define ASN1_SET                0x31
+#define ASN1_IMPLICIT_TAG       0x80
+#define ASN1_EXPLICIT_TAG       0xa0
+
+#define SIG_TYPE_MD2            0x02
+#define SIG_TYPE_MD5            0x04
+#define SIG_TYPE_SHA1           0x05
+
+int get_asn1_length(const uint8_t *buf, int *offset);
+int asn1_get_private_key(const uint8_t *buf, int len, RSA_CTX **rsa_ctx);
+int asn1_next_obj(const uint8_t *buf, int *offset, int obj_type);
+int asn1_skip_obj(const uint8_t *buf, int *offset, int obj_type);
+int asn1_get_int(const uint8_t *buf, int *offset, uint8_t **object);
+int asn1_version(const uint8_t *cert, int *offset, X509_CTX *x509_ctx);
+int asn1_validity(const uint8_t *cert, int *offset, X509_CTX *x509_ctx);
+int asn1_name(const uint8_t *cert, int *offset, char *dn[]);
+int asn1_public_key(const uint8_t *cert, int *offset, X509_CTX *x509_ctx);
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+int asn1_signature(const uint8_t *cert, int *offset, X509_CTX *x509_ctx);
+int asn1_compare_dn(char * const dn1[], char * const dn2[]);
+#endif
+int asn1_signature_type(const uint8_t *cert, 
+                                int *offset, X509_CTX *x509_ctx);
+
+/**************************************************************************
+ * MISC declarations 
+ **************************************************************************/
+#define SALT_SIZE               8
+
+extern const char * const unsupported_str;
+
+typedef void (*crypt_func)(void *, const uint8_t *, uint8_t *, int);
+typedef void (*hmac_func)(const uint8_t *msg, int length, const uint8_t *key, 
+        int key_len, uint8_t *digest);
+
+int get_file(const char *filename, uint8_t **buf);
+
+#if defined(CONFIG_SSL_FULL_MODE) || defined(WIN32) || defined(CONFIG_DEBUG)
+EXP_FUNC void STDCALL print_blob(const char *format, const uint8_t *data, int size, ...);
+#else
+    #define print_blob(...)
+#endif
+
+EXP_FUNC int STDCALL base64_decode(const char *in,  int len,
+                    uint8_t *out, int *outlen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif 
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/gen_cert.c b/trunk/package/luci/libs/nixio/axTLS/ssl/gen_cert.c
new file mode 100644
index 00000000..94b74903
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/gen_cert.c
@@ -0,0 +1,363 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#ifdef CONFIG_SSL_GENERATE_X509_CERT
+#include <string.h>
+#include <stdlib.h>
+#include "ssl.h"
+
+/**
+ * Generate a basic X.509 certificate
+ */
+
+static uint8_t set_gen_length(int len, uint8_t *buf, int *offset)
+{
+    if (len < 0x80) /* short form */
+    {
+        buf[(*offset)++] = len;
+        return 1;
+    }
+    else /* long form */
+    {
+        int i, length_bytes = 0;
+
+        if (len & 0x00FF0000)
+            length_bytes = 3;
+        else if (len & 0x0000FF00)
+            length_bytes = 2;
+        else if (len & 0x000000FF)
+            length_bytes = 1;
+            
+        buf[(*offset)++] = 0x80 + length_bytes;
+
+        for (i = length_bytes-1; i >= 0; i--)
+        {
+            buf[*offset+i] = len & 0xFF;
+            len >>= 8;
+        }
+
+        *offset += length_bytes;
+        return length_bytes+1;
+    }
+}
+
+static int pre_adjust_with_size(uint8_t type,
+        int *seq_offset, uint8_t *buf, int *offset)
+{
+    buf[(*offset)++] = type;
+    *seq_offset = *offset;
+    *offset += 4;   /* fill in later */
+    return *offset;
+}
+
+static void adjust_with_size(int seq_size, int seq_start, 
+                uint8_t *buf, int *offset)
+{
+    uint8_t seq_byte_size; 
+    int orig_seq_size = seq_size;
+    int orig_seq_start = seq_start;
+
+    seq_size = *offset-seq_size;
+    seq_byte_size = set_gen_length(seq_size, buf, &seq_start);
+
+    if (seq_byte_size != 4)
+    {
+        memmove(&buf[orig_seq_start+seq_byte_size], 
+                &buf[orig_seq_size], seq_size);
+        *offset -= 4-seq_byte_size;
+    }
+}
+
+static void gen_serial_number(uint8_t *buf, int *offset)
+{
+    static const uint8_t ser_oid[] = { ASN1_INTEGER, 1, 0x7F };
+    memcpy(&buf[*offset], ser_oid , sizeof(ser_oid));
+    *offset += sizeof(ser_oid);
+}
+
+static void gen_signature_alg(uint8_t *buf, int *offset)
+{
+    /* OBJECT IDENTIFIER sha1withRSAEncryption (1 2 840 113549 1 1 5) */
+    static const uint8_t sig_oid[] = 
+    {
+        ASN1_SEQUENCE, 0x0d, ASN1_OID, 0x09, 
+        0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05,
+        ASN1_NULL, 0x00
+    };
+
+    memcpy(&buf[*offset], sig_oid, sizeof(sig_oid));
+    *offset += sizeof(sig_oid);
+}
+
+static int gen_dn(const char *name, uint8_t dn_type, 
+                        uint8_t *buf, int *offset)
+{
+    int ret = X509_OK;
+    int name_size = strlen(name);
+
+    if (name_size > 0x70)    /* just too big */
+    {
+        ret = X509_NOT_OK;
+        goto error;
+    }
+
+    buf[(*offset)++] = ASN1_SET;
+    set_gen_length(9+name_size, buf, offset);
+    buf[(*offset)++] = ASN1_SEQUENCE;
+    set_gen_length(7+name_size, buf, offset);
+    buf[(*offset)++] = ASN1_OID;
+    buf[(*offset)++] = 3;
+    buf[(*offset)++] = 0x55;
+    buf[(*offset)++] = 0x04;
+    buf[(*offset)++] = dn_type;
+    buf[(*offset)++] = ASN1_PRINTABLE_STR;
+    buf[(*offset)++] = name_size;
+    strcpy(&buf[*offset], name);
+    *offset += name_size;
+
+error:
+    return ret;
+}
+
+static int gen_issuer(const char * dn[], uint8_t *buf, int *offset)
+{
+    int ret = X509_OK;
+    int seq_offset;
+    int seq_size = pre_adjust_with_size(
+                            ASN1_SEQUENCE, &seq_offset, buf, offset);
+    char fqdn[128]; 
+
+    /* we need the common name, so if not configured, work out the fully
+     * qualified domain name */
+    if (dn[X509_COMMON_NAME] == NULL || strlen(dn[X509_COMMON_NAME]) == 0)
+    {
+        int fqdn_len;
+        gethostname(fqdn, sizeof(fqdn));
+        fqdn_len = strlen(fqdn);
+        fqdn[fqdn_len++] = '.';
+        getdomainname(&fqdn[fqdn_len], sizeof(fqdn)-fqdn_len);
+        fqdn_len = strlen(fqdn);
+
+        if (fqdn[fqdn_len-1] == '.')    /* ensure '.' is not last char */
+            fqdn[fqdn_len-1] = 0;
+
+        dn[X509_COMMON_NAME] = fqdn;
+    }
+
+    if ((ret = gen_dn(dn[X509_COMMON_NAME], 3, buf, offset)))
+        goto error;
+
+    if (dn[X509_ORGANIZATION] != NULL && strlen(dn[X509_ORGANIZATION]) > 0)
+    {
+        if ((ret = gen_dn(dn[X509_ORGANIZATION], 10, buf, offset)))
+            goto error;
+    }
+
+    if (dn[X509_ORGANIZATIONAL_UNIT] != NULL &&
+                                strlen(dn[X509_ORGANIZATIONAL_UNIT]) > 0)
+    {
+        if ((ret = gen_dn(dn[X509_ORGANIZATIONAL_UNIT], 11, buf, offset)))
+            goto error;
+    }
+
+    adjust_with_size(seq_size, seq_offset, buf, offset);
+
+error:
+    return ret;
+}
+
+static void gen_utc_time(uint8_t *buf, int *offset)
+{
+    static const uint8_t time_seq[] = 
+    {
+        ASN1_SEQUENCE, 30, 
+        ASN1_UTC_TIME, 13, 
+        '0', '7', '0', '1', '0', '1', '0', '0', '0', '0', '0', '0', 'Z', 
+        ASN1_UTC_TIME, 13,  /* make it good for 30 or so years */
+        '3', '8', '0', '1', '0', '1', '0', '0', '0', '0', '0', '0', 'Z'
+    };
+
+    /* fixed time */
+    memcpy(&buf[*offset], time_seq, sizeof(time_seq));
+    *offset += sizeof(time_seq);
+}
+
+static void gen_pub_key2(const RSA_CTX *rsa_ctx, uint8_t *buf, int *offset)
+{
+    static const uint8_t pub_key_seq[] = 
+    {
+        ASN1_INTEGER, 0x03, 0x01, 0x00, 0x01 /* INTEGER 65537 */
+    };
+
+    int seq_offset;
+    int pub_key_size = rsa_ctx->num_octets;
+    uint8_t *block = (uint8_t *)alloca(pub_key_size);
+    int seq_size = pre_adjust_with_size(
+                            ASN1_SEQUENCE, &seq_offset, buf, offset);
+    buf[(*offset)++] = ASN1_INTEGER;
+    bi_export(rsa_ctx->bi_ctx, rsa_ctx->m, block, pub_key_size);
+
+    if (*block & 0x80)  /* make integer positive */
+    {
+        set_gen_length(pub_key_size+1, buf, offset);
+        buf[(*offset)++] = 0;
+    }
+    else
+        set_gen_length(pub_key_size, buf, offset);
+
+    memcpy(&buf[*offset], block, pub_key_size);
+    *offset += pub_key_size;
+    memcpy(&buf[*offset], pub_key_seq, sizeof(pub_key_seq));
+    *offset += sizeof(pub_key_seq);
+    adjust_with_size(seq_size, seq_offset, buf, offset);
+}
+
+static void gen_pub_key1(const RSA_CTX *rsa_ctx, uint8_t *buf, int *offset)
+{
+    int seq_offset;
+    int seq_size = pre_adjust_with_size(
+                            ASN1_BIT_STRING, &seq_offset, buf, offset);
+    buf[(*offset)++] = 0;   /* bit string is multiple of 8 */
+    gen_pub_key2(rsa_ctx, buf, offset);
+    adjust_with_size(seq_size, seq_offset, buf, offset);
+}
+
+static void gen_pub_key(const RSA_CTX *rsa_ctx, uint8_t *buf, int *offset)
+{
+    /*  OBJECT IDENTIFIER rsaEncryption (1 2 840 113549 1 1 1) */
+    static const uint8_t rsa_enc_oid[] =
+    {
+        ASN1_SEQUENCE, 0x0d, ASN1_OID, 0x09,
+        0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01,
+        ASN1_NULL, 0x00
+    };
+
+    int seq_offset;
+    int seq_size = pre_adjust_with_size(
+                            ASN1_SEQUENCE, &seq_offset, buf, offset);
+
+    memcpy(&buf[*offset], rsa_enc_oid, sizeof(rsa_enc_oid));
+    *offset += sizeof(rsa_enc_oid);
+    gen_pub_key1(rsa_ctx, buf, offset);
+    adjust_with_size(seq_size, seq_offset, buf, offset);
+}
+
+static void gen_signature(const RSA_CTX *rsa_ctx, const uint8_t *sha_dgst, 
+                        uint8_t *buf, int *offset)
+{
+    static const uint8_t asn1_sig[] = 
+    {
+        ASN1_SEQUENCE,  0x21, ASN1_SEQUENCE, 0x09, ASN1_OID, 0x05, 
+        0x2b, 0x0e, 0x03, 0x02, 0x1a, /* sha1 (1 3 14 3 2 26) */
+        ASN1_NULL, 0x00, ASN1_OCTET_STRING, 0x14 
+    };
+
+    uint8_t *enc_block = (uint8_t *)alloca(rsa_ctx->num_octets);
+    uint8_t *block = (uint8_t *)alloca(sizeof(asn1_sig) + SHA1_SIZE);
+    int sig_size;
+
+    /* add the digest as an embedded asn.1 sequence */
+    memcpy(block, asn1_sig, sizeof(asn1_sig));
+    memcpy(&block[sizeof(asn1_sig)], sha_dgst, SHA1_SIZE);
+
+    sig_size = RSA_encrypt(rsa_ctx, block, 
+                            sizeof(asn1_sig) + SHA1_SIZE, enc_block, 1);
+
+    buf[(*offset)++] = ASN1_BIT_STRING;
+    set_gen_length(sig_size+1, buf, offset);
+    buf[(*offset)++] = 0;   /* bit string is multiple of 8 */
+    memcpy(&buf[*offset], enc_block, sig_size);
+    *offset += sig_size;
+}
+
+static int gen_tbs_cert(const char * dn[],
+                    const RSA_CTX *rsa_ctx, uint8_t *buf, int *offset,
+                    uint8_t *sha_dgst)
+{
+    int ret = X509_OK;
+    SHA1_CTX sha_ctx;
+    int seq_offset;
+    int begin_tbs = *offset;
+    int seq_size = pre_adjust_with_size(
+                        ASN1_SEQUENCE, &seq_offset, buf, offset);
+
+    gen_serial_number(buf, offset);
+    gen_signature_alg(buf, offset);
+
+    /* CA certicate issuer */
+    if ((ret = gen_issuer(dn, buf, offset)))
+        goto error;
+
+    gen_utc_time(buf, offset);
+
+    /* certificate issuer */
+    if ((ret = gen_issuer(dn, buf, offset)))
+        goto error;
+
+    gen_pub_key(rsa_ctx, buf, offset);
+    adjust_with_size(seq_size, seq_offset, buf, offset);
+
+    SHA1_Init(&sha_ctx);
+    SHA1_Update(&sha_ctx, &buf[begin_tbs], *offset-begin_tbs);
+    SHA1_Final(sha_dgst, &sha_ctx);
+
+error:
+    return ret;
+}
+
+/**
+ * Create a new certificate.
+ */
+EXP_FUNC int STDCALL ssl_x509_create(SSL_CTX *ssl_ctx, uint32_t options, const char * dn[], uint8_t **cert_data)
+{
+    int ret = X509_OK, offset = 0, seq_offset;
+    /* allocate enough space to load a new certificate */
+    uint8_t *buf = (uint8_t *)alloca(ssl_ctx->rsa_ctx->num_octets*2 + 512);
+    uint8_t sha_dgst[SHA1_SIZE];
+    int seq_size = pre_adjust_with_size(ASN1_SEQUENCE, 
+                                    &seq_offset, buf, &offset);
+
+    if ((ret = gen_tbs_cert(dn, ssl_ctx->rsa_ctx, buf, &offset, sha_dgst)) < 0)
+        goto error;
+
+    gen_signature_alg(buf, &offset);
+    gen_signature(ssl_ctx->rsa_ctx, sha_dgst, buf, &offset);
+    adjust_with_size(seq_size, seq_offset, buf, &offset);
+    *cert_data = (uint8_t *)malloc(offset); /* create the exact memory for it */
+    memcpy(*cert_data, buf, offset);
+
+error:
+    return ret < 0 ? ret : offset;
+}
+
+#endif
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/loader.c b/trunk/package/luci/libs/nixio/axTLS/ssl/loader.c
new file mode 100644
index 00000000..4232f7ee
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/loader.c
@@ -0,0 +1,465 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Load certificates/keys into memory. These can be in many different formats.
+ * PEM support and other formats can be processed here.
+ *
+ * The PEM private keys may be optionally encrypted with AES128 or AES256. 
+ * The encrypted PEM keys were generated with something like:
+ *
+ * openssl genrsa -aes128 -passout pass:abcd -out axTLS.key_aes128.pem 512
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "ssl.h"
+
+static int do_obj(SSL_CTX *ssl_ctx, int obj_type, 
+                    SSLObjLoader *ssl_obj, const char *password);
+#ifdef CONFIG_SSL_HAS_PEM
+static int ssl_obj_PEM_load(SSL_CTX *ssl_ctx, int obj_type, 
+                        SSLObjLoader *ssl_obj, const char *password);
+#endif
+
+/*
+ * Load a file into memory that is in binary DER (or ascii PEM) format.
+ */
+EXP_FUNC int STDCALL ssl_obj_load(SSL_CTX *ssl_ctx, int obj_type, 
+                            const char *filename, const char *password)
+{
+#ifndef CONFIG_SSL_SKELETON_MODE
+    static const char * const begin = "-----BEGIN";
+    int ret = SSL_OK;
+    SSLObjLoader *ssl_obj = NULL;
+
+    if (filename == NULL)
+    {
+        ret = SSL_ERROR_INVALID_KEY;
+        goto error;
+    }
+
+    ssl_obj = (SSLObjLoader *)calloc(1, sizeof(SSLObjLoader));
+    ssl_obj->len = get_file(filename, &ssl_obj->buf); 
+    if (ssl_obj->len <= 0)
+    {
+        ret = SSL_ERROR_INVALID_KEY;
+        goto error;
+    }
+
+    /* is the file a PEM file? */
+    if (strncmp((char *)ssl_obj->buf, begin, strlen(begin)) == 0)
+    {
+#ifdef CONFIG_SSL_HAS_PEM
+        ret = ssl_obj_PEM_load(ssl_ctx, obj_type, ssl_obj, password);
+#else
+        printf(unsupported_str);
+        ret = SSL_ERROR_NOT_SUPPORTED;
+#endif
+    }
+    else
+        ret = do_obj(ssl_ctx, obj_type, ssl_obj, password);
+
+error:
+    ssl_obj_free(ssl_obj);
+    return ret;
+#else
+    printf(unsupported_str);
+    return SSL_ERROR_NOT_SUPPORTED;
+#endif /* CONFIG_SSL_SKELETON_MODE */
+}
+
+/*
+ * Transfer binary data into the object loader.
+ */
+EXP_FUNC int STDCALL ssl_obj_memory_load(SSL_CTX *ssl_ctx, int mem_type, 
+        const uint8_t *data, int len, const char *password)
+{
+    int ret;
+    SSLObjLoader *ssl_obj;
+
+    ssl_obj = (SSLObjLoader *)calloc(1, sizeof(SSLObjLoader));
+    ssl_obj->buf = (uint8_t *)malloc(len);
+    memcpy(ssl_obj->buf, data, len);
+    ssl_obj->len = len;
+    ret = do_obj(ssl_ctx, mem_type, ssl_obj, password);
+    ssl_obj_free(ssl_obj);
+    return ret;
+}
+
+/*
+ * Actually work out what we are doing 
+ */
+static int do_obj(SSL_CTX *ssl_ctx, int obj_type, 
+                    SSLObjLoader *ssl_obj, const char *password)
+{
+    int ret = SSL_OK;
+
+    switch (obj_type)
+    {
+        case SSL_OBJ_RSA_KEY:
+            ret = add_private_key(ssl_ctx, ssl_obj);
+            break;
+
+        case SSL_OBJ_X509_CERT:
+            ret = add_cert(ssl_ctx, ssl_obj->buf, ssl_obj->len);
+            break;
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+        case SSL_OBJ_X509_CACERT:
+            ret = add_cert_auth(ssl_ctx, ssl_obj->buf, ssl_obj->len);
+            break;
+#endif
+
+#ifdef CONFIG_SSL_USE_PKCS12
+        case SSL_OBJ_PKCS8:
+            ret = pkcs8_decode(ssl_ctx, ssl_obj, password);
+            break;
+
+        case SSL_OBJ_PKCS12:
+            ret = pkcs12_decode(ssl_ctx, ssl_obj, password);
+            break;
+#endif
+        default:
+            printf(unsupported_str);
+            ret = SSL_ERROR_NOT_SUPPORTED;
+            break;
+    }
+
+    return ret;
+}
+
+/*
+ * Clean up our mess.
+ */
+void ssl_obj_free(SSLObjLoader *ssl_obj)
+{
+    if (ssl_obj)
+    {
+        free(ssl_obj->buf);
+        free(ssl_obj);
+    }
+}
+
+/*
+ * Support for PEM encoded keys/certificates.
+ */
+#ifdef CONFIG_SSL_HAS_PEM
+
+#define NUM_PEM_TYPES               3
+#define IV_SIZE                     16
+#define IS_RSA_PRIVATE_KEY          0
+#define IS_ENCRYPTED_PRIVATE_KEY    1
+#define IS_CERTIFICATE              2
+
+static const char * const begins[NUM_PEM_TYPES] =
+{
+    "-----BEGIN RSA PRIVATE KEY-----",
+    "-----BEGIN ENCRYPTED PRIVATE KEY-----",
+    "-----BEGIN CERTIFICATE-----",
+};
+
+static const char * const ends[NUM_PEM_TYPES] =
+{
+    "-----END RSA PRIVATE KEY-----",
+    "-----END ENCRYPTED PRIVATE KEY-----",
+    "-----END CERTIFICATE-----",
+};
+
+static const char * const aes_str[2] =
+{
+    "DEK-Info: AES-128-CBC,",
+    "DEK-Info: AES-256-CBC," 
+};
+
+/**
+ * Take a base64 blob of data and decrypt it (using AES) into its 
+ * proper ASN.1 form.
+ */
+static int pem_decrypt(const char *where, const char *end,
+                        const char *password, SSLObjLoader *ssl_obj)
+{
+    int ret = -1;
+    int is_aes_256 = 0;
+    char *start = NULL;
+    uint8_t iv[IV_SIZE];
+    int i, pem_size;
+    MD5_CTX md5_ctx;
+    AES_CTX aes_ctx;
+    uint8_t key[32];        /* AES256 size */
+
+    if (password == NULL || strlen(password) == 0)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: Need a password for this PEM file\n"); TTY_FLUSH();
+#endif
+        goto error;
+    }
+
+    if ((start = strstr((const char *)where, aes_str[0])))         /* AES128? */
+    {
+        start += strlen(aes_str[0]);
+    }
+    else if ((start = strstr((const char *)where, aes_str[1])))    /* AES256? */
+    {
+        is_aes_256 = 1;
+        start += strlen(aes_str[1]);
+    }
+    else 
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: Unsupported password cipher\n"); TTY_FLUSH();
+#endif
+        goto error;
+    }
+
+    /* convert from hex to binary - assumes uppercase hex */
+    for (i = 0; i < IV_SIZE; i++)
+    {
+        char c = *start++ - '0';
+        iv[i] = (c > 9 ? c + '0' - 'A' + 10 : c) << 4;
+        c = *start++ - '0';
+        iv[i] += (c > 9 ? c + '0' - 'A' + 10 : c);
+    }
+
+    while (*start == '\r' || *start == '\n')
+        start++;
+
+    /* turn base64 into binary */
+    pem_size = (int)(end-start);
+    if (base64_decode(start, pem_size, ssl_obj->buf, &ssl_obj->len) != 0)
+        goto error;
+
+    /* work out the key */
+    MD5_Init(&md5_ctx);
+    MD5_Update(&md5_ctx, (const uint8_t *)password, strlen(password));
+    MD5_Update(&md5_ctx, iv, SALT_SIZE);
+    MD5_Final(key, &md5_ctx);
+
+    if (is_aes_256)
+    {
+        MD5_Init(&md5_ctx);
+        MD5_Update(&md5_ctx, key, MD5_SIZE);
+        MD5_Update(&md5_ctx, (const uint8_t *)password, strlen(password));
+        MD5_Update(&md5_ctx, iv, SALT_SIZE);
+        MD5_Final(&key[MD5_SIZE], &md5_ctx);
+    }
+
+    /* decrypt using the key/iv */
+    AES_set_key(&aes_ctx, key, iv, is_aes_256 ? AES_MODE_256 : AES_MODE_128);
+    AES_convert_key(&aes_ctx);
+    AES_cbc_decrypt(&aes_ctx, ssl_obj->buf, ssl_obj->buf, ssl_obj->len);
+    ret = 0;
+
+error:
+    return ret; 
+}
+
+/**
+ * Take a base64 blob of data and turn it into its proper ASN.1 form.
+ */
+static int new_pem_obj(SSL_CTX *ssl_ctx, int is_cacert, char *where, 
+                    int remain, const char *password)
+{
+    int ret = SSL_OK;
+    SSLObjLoader *ssl_obj = NULL;
+    int i, pem_size, obj_type;
+    char *start = NULL, *end = NULL;
+
+    for (i = 0; i < NUM_PEM_TYPES; i++)
+    {
+        if ((start = strstr(where, begins[i])) &&
+                (end = strstr(where, ends[i])))
+        {
+            remain -= (int)(end-start);
+            start += strlen(begins[i]);
+            pem_size = (int)(end-start);
+
+            ssl_obj = (SSLObjLoader *)calloc(1, sizeof(SSLObjLoader));
+
+            /* 4/3 bigger than what we need but so what */
+            ssl_obj->buf = (uint8_t *)calloc(1, pem_size);
+
+            if (i == IS_RSA_PRIVATE_KEY && 
+                        strstr(start, "Proc-Type:") && 
+                        strstr(start, "4,ENCRYPTED"))
+            {
+                /* check for encrypted PEM file */
+                if (pem_decrypt(start, end, password, ssl_obj) < 0)
+                    goto error;
+            }
+            else if (base64_decode(start, pem_size, 
+                        ssl_obj->buf, &ssl_obj->len) != 0)
+                goto error;
+
+            switch (i)
+            {
+                case IS_RSA_PRIVATE_KEY:
+                    obj_type = SSL_OBJ_RSA_KEY;
+                    break;
+
+                case IS_ENCRYPTED_PRIVATE_KEY:
+                    obj_type = SSL_OBJ_PKCS8;
+                    break;
+
+                case IS_CERTIFICATE:
+                    obj_type = is_cacert ?
+                                    SSL_OBJ_X509_CACERT : SSL_OBJ_X509_CERT;
+                    break;
+
+                default:
+                    goto error;
+            }
+
+            /* In a format we can now understand - so process it */
+            if ((ret = do_obj(ssl_ctx, obj_type, ssl_obj, password)))
+                goto error;
+
+            end += strlen(ends[i]);
+            remain -= strlen(ends[i]);
+            while (remain > 0 && (*end == '\r' || *end == '\n'))
+            {
+                end++;
+                remain--;
+            }
+
+            break;
+        }
+    }
+
+    if (i == NUM_PEM_TYPES)
+        goto error;
+
+    /* more PEM stuff to process? */
+    if (remain)
+        ret = new_pem_obj(ssl_ctx, is_cacert, end, remain, password);
+
+error:
+    ssl_obj_free(ssl_obj);
+    return ret;
+}
+
+/*
+ * Load a file into memory that is in ASCII PEM format.
+ */
+static int ssl_obj_PEM_load(SSL_CTX *ssl_ctx, int obj_type, 
+                        SSLObjLoader *ssl_obj, const char *password)
+{
+    char *start;
+
+    /* add a null terminator */
+    ssl_obj->len++;
+    ssl_obj->buf = (uint8_t *)realloc(ssl_obj->buf, ssl_obj->len);
+    ssl_obj->buf[ssl_obj->len-1] = 0;
+    start = (char *)ssl_obj->buf;
+    return new_pem_obj(ssl_ctx, obj_type == SSL_OBJ_X509_CACERT,
+                                start, ssl_obj->len, password);
+}
+#endif /* CONFIG_SSL_HAS_PEM */
+
+/**
+ * Load the key/certificates in memory depending on compile-time and user
+ * options. 
+ */
+int load_key_certs(SSL_CTX *ssl_ctx)
+{
+    int ret = SSL_OK;
+    uint32_t options = ssl_ctx->options;
+#ifdef CONFIG_SSL_GENERATE_X509_CERT 
+    uint8_t *cert_data = NULL;
+    int cert_size;
+    static const char *dn[] = 
+    {
+        CONFIG_SSL_X509_COMMON_NAME,
+        CONFIG_SSL_X509_ORGANIZATION_NAME,
+        CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME
+    };
+#endif
+
+    /* do the private key first */
+    if (strlen(CONFIG_SSL_PRIVATE_KEY_LOCATION) > 0)
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, SSL_OBJ_RSA_KEY, 
+                                CONFIG_SSL_PRIVATE_KEY_LOCATION,
+                                CONFIG_SSL_PRIVATE_KEY_PASSWORD)) < 0)
+            goto error;
+    }
+    else if (!(options & SSL_NO_DEFAULT_KEY))
+    {
+#if defined(CONFIG_SSL_USE_DEFAULT_KEY) || defined(CONFIG_SSL_SKELETON_MODE)
+        static const    /* saves a few more bytes */
+#include "private_key.h"
+
+        ssl_obj_memory_load(ssl_ctx, SSL_OBJ_RSA_KEY, default_private_key,
+                default_private_key_len, NULL); 
+#endif
+    }
+
+    /* now load the certificate */
+#ifdef CONFIG_SSL_GENERATE_X509_CERT 
+    if ((cert_size = ssl_x509_create(ssl_ctx, 0, dn, &cert_data)) < 0)
+    {
+        ret = cert_size;
+        goto error;
+    }
+
+    ssl_obj_memory_load(ssl_ctx, SSL_OBJ_X509_CERT, cert_data, cert_size, NULL);
+    free(cert_data);
+#else
+    if (strlen(CONFIG_SSL_X509_CERT_LOCATION))
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, 
+                                CONFIG_SSL_X509_CERT_LOCATION, NULL)) < 0)
+            goto error;
+    }
+    else if (!(options & SSL_NO_DEFAULT_KEY))
+    {
+#if defined(CONFIG_SSL_USE_DEFAULT_KEY) || defined(CONFIG_SSL_SKELETON_MODE)
+        static const    /* saves a few bytes and RAM */
+#include "cert.h"
+        ssl_obj_memory_load(ssl_ctx, SSL_OBJ_X509_CERT, 
+                    default_certificate, default_certificate_len, NULL);
+#endif
+    }
+#endif
+
+error:
+#ifdef CONFIG_SSL_FULL_MODE
+    if (ret)
+    {
+        printf("Error: Certificate or key not loaded\n"); TTY_FLUSH();
+    }
+#endif
+
+    return ret;
+
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/openssl.c b/trunk/package/luci/libs/nixio/axTLS/ssl/openssl.c
new file mode 100644
index 00000000..b6b95500
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/openssl.c
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Enable a subset of openssl compatible functions. We don't aim to be 100%
+ * compatible - just to be able to do basic ports etc.
+ *
+ * Only really tested on mini_httpd, so I'm not too sure how extensive this
+ * port is.
+ */
+
+#include "config.h"
+
+#ifdef CONFIG_OPENSSL_COMPATIBLE
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include "ssl.h"
+
+#define OPENSSL_CTX_ATTR  ((OPENSSL_CTX *)ssl_ctx->bonus_attr)
+
+static char *key_password = NULL;
+
+void *SSLv23_server_method(void) { return NULL; }
+void *SSLv3_server_method(void) { return NULL; }
+void *TLSv1_server_method(void) { return NULL; }
+void *SSLv23_client_method(void) { return NULL; }
+void *SSLv3_client_method(void) { return NULL; }
+void *TLSv1_client_method(void) { return NULL; }
+
+typedef void * (*ssl_func_type_t)(void);
+typedef void * (*bio_func_type_t)(void);
+
+typedef struct
+{
+    ssl_func_type_t ssl_func_type;
+} OPENSSL_CTX;
+
+SSL_CTX * SSL_CTX_new(ssl_func_type_t meth)
+{
+    SSL_CTX *ssl_ctx = ssl_ctx_new(0, 5);
+    ssl_ctx->bonus_attr = malloc(sizeof(OPENSSL_CTX));
+    OPENSSL_CTX_ATTR->ssl_func_type = meth;
+    return ssl_ctx;
+}
+
+void SSL_CTX_free(SSL_CTX * ssl_ctx)
+{
+    free(ssl_ctx->bonus_attr);
+    ssl_ctx_free(ssl_ctx);
+}
+
+SSL * SSL_new(SSL_CTX *ssl_ctx)
+{
+    SSL *ssl;
+    ssl_func_type_t ssl_func_type;
+
+    ssl = ssl_new(ssl_ctx, -1);        /* fd is set later */
+    ssl_func_type = OPENSSL_CTX_ATTR->ssl_func_type;
+
+#ifdef CONFIG_SSL_ENABLE_CLIENT
+    if (ssl_func_type == SSLv23_client_method ||
+        ssl_func_type == SSLv3_client_method ||
+        ssl_func_type == TLSv1_client_method)
+    {
+        SET_SSL_FLAG(SSL_IS_CLIENT);
+    }
+    else
+#endif
+    {
+        ssl->next_state = HS_CLIENT_HELLO;
+    }
+
+    return ssl;
+}
+
+int SSL_set_fd(SSL *s, int fd)
+{
+    s->client_fd = fd;
+    return 1;   /* always succeeds */
+}
+
+int SSL_accept(SSL *ssl)
+{
+    while (ssl_read(ssl, NULL) == SSL_OK)
+    {
+        if (ssl->next_state == HS_CLIENT_HELLO)
+            return 1;   /* we're done */
+    }
+
+    return -1;
+}
+
+#ifdef CONFIG_SSL_ENABLE_CLIENT
+int SSL_connect(SSL *ssl)
+{
+    return do_client_connect(ssl) == SSL_OK ? 1 : -1;
+}
+#endif
+
+void SSL_free(SSL *ssl)
+{
+    ssl_free(ssl);
+}
+
+int SSL_read(SSL *ssl, void *buf, int num)
+{
+    uint8_t *read_buf;
+    int ret;
+
+    while ((ret = ssl_read(ssl, &read_buf)) == SSL_OK);
+
+    if (ret > SSL_OK)
+    {
+        memcpy(buf, read_buf, ret > num ? num : ret);
+    }
+
+    return ret;
+}
+
+int SSL_write(SSL *ssl, const void *buf, int num)
+{
+    return ssl_write(ssl, buf, num);
+}
+
+int SSL_CTX_use_certificate_file(SSL_CTX *ssl_ctx, const char *file, int type)
+{
+    return (ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, file, NULL) == SSL_OK);
+}
+
+int SSL_CTX_use_PrivateKey_file(SSL_CTX *ssl_ctx, const char *file, int type)
+{
+    return (ssl_obj_load(ssl_ctx, SSL_OBJ_RSA_KEY, file, key_password) == SSL_OK);
+}
+
+int SSL_CTX_use_certificate_ASN1(SSL_CTX *ssl_ctx, int len, const uint8_t *d)
+{
+    return (ssl_obj_memory_load(ssl_ctx, 
+                        SSL_OBJ_X509_CERT, d, len, NULL) == SSL_OK);
+}
+
+int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
+                                            unsigned int sid_ctx_len)
+{
+    return 1;
+}
+
+int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
+{
+    return 1;
+}
+
+int SSL_CTX_use_certificate_chain_file(SSL_CTX *ssl_ctx, const char *file)
+{
+    return (ssl_obj_load(ssl_ctx, 
+                        SSL_OBJ_X509_CERT, file, NULL) == SSL_OK);
+}
+
+int SSL_shutdown(SSL *ssl)
+{
+    return 1;
+}
+
+/*** get/set session ***/
+SSL_SESSION *SSL_get1_session(SSL *ssl)
+{
+    return (SSL_SESSION *)ssl_get_session_id(ssl); /* note: wrong cast */
+}
+
+int SSL_set_session(SSL *ssl, SSL_SESSION *session)
+{
+    memcpy(ssl->session_id, (uint8_t *)session, SSL_SESSION_ID_SIZE);
+    return 1;
+}
+
+void SSL_SESSION_free(SSL_SESSION *session) { }
+/*** end get/set session ***/
+
+long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
+{
+    return 0;
+}
+
+void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
+                                 int (*verify_callback)(int, void *)) { }
+
+void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth) { }
+
+int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+                                           const char *CApath)
+{
+    return 1;
+}
+
+void *SSL_load_client_CA_file(const char *file)
+{
+    return (void *)file;
+}
+
+void SSL_CTX_set_client_CA_list(SSL_CTX *ssl_ctx, void *file) 
+{ 
+
+    ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, (const char *)file, NULL);
+}
+
+void SSLv23_method(void) { }
+
+void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, void *cb) { }
+
+void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u) 
+{ 
+    key_password = (char *)u;
+}
+
+int SSL_peek(SSL *ssl, void *buf, int num)
+{
+    memcpy(buf, ssl->bm_data, num);
+    return num;
+}
+
+void SSL_set_bio(SSL *ssl, void *rbio, void *wbio) { }
+
+long SSL_get_verify_result(const SSL *ssl)
+{
+    return ssl_handshake_status(ssl);
+}
+
+int SSL_state(SSL *ssl)
+{
+    return 0x03; // ok state
+}
+
+/** end of could do better list */
+
+void *SSL_get_peer_certificate(const SSL *ssl)
+{
+    return &ssl->ssl_ctx->certs[0];
+}
+
+int SSL_clear(SSL *ssl)
+{
+    return 1;
+}
+
+
+int SSL_CTX_check_private_key(const SSL_CTX *ctx)
+{
+    return 1;
+}
+
+int SSL_CTX_set_cipher_list(SSL *s, const char *str)
+{
+    return 1;
+}
+
+int SSL_get_error(const SSL *ssl, int ret)
+{
+    ssl_display_error(ret);
+    return 0;   /* TODO: return proper return code */
+}
+
+void SSL_CTX_set_options(SSL_CTX *ssl_ctx, int option) {}
+int SSL_library_init(void ) { return 1; }
+void SSL_load_error_strings(void ) {}
+void ERR_print_errors_fp(FILE *fp) {}
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+long SSL_CTX_get_timeout(const SSL_CTX *ssl_ctx) { 
+                            return CONFIG_SSL_EXPIRY_TIME*3600; }
+long SSL_CTX_set_timeout(SSL_CTX *ssl_ctx, long t) { 
+                            return SSL_CTX_get_timeout(ssl_ctx); }
+#endif
+void BIO_printf(FILE *f, const char *format, ...)
+{
+    va_list(ap);
+    va_start(ap, format);
+    vfprintf(f, format, ap);
+    va_end(ap);
+}
+
+void* BIO_s_null(void) { return NULL; }
+FILE *BIO_new(bio_func_type_t func)
+{
+    if (func == BIO_s_null)
+        return fopen("/dev/null", "r");
+    else
+        return NULL;
+}
+
+FILE *BIO_new_fp(FILE *stream, int close_flag) { return stream; }
+int BIO_free(FILE *a) { if (a != stdout && a != stderr) fclose(a); return 1; }
+
+
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/os_port.c b/trunk/package/luci/libs/nixio/axTLS/ssl/os_port.c
new file mode 100644
index 00000000..6a71000b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/os_port.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file os_port.c
+ *
+ * OS specific functions.
+ */
+#include <time.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdarg.h>
+#include "os_port.h"
+
+#ifdef WIN32
+/**
+ * gettimeofday() not in Win32 
+ */
+EXP_FUNC void STDCALL gettimeofday(struct timeval* t, void* timezone)
+{       
+#if defined(_WIN32_WCE)
+    t->tv_sec = time(NULL);
+    t->tv_usec = 0;                         /* 1sec precision only */ 
+#else
+    struct _timeb timebuffer;
+    _ftime(&timebuffer);
+    t->tv_sec = (long)timebuffer.time;
+    t->tv_usec = 1000 * timebuffer.millitm; /* 1ms precision */
+#endif
+}
+
+/**
+ * strcasecmp() not in Win32
+ */
+EXP_FUNC int STDCALL strcasecmp(const char *s1, const char *s2)
+{
+    while (tolower(*s1) == tolower(*s2++))
+    {
+        if (*s1++ == '\0')
+        {
+            return 0;
+        }
+    }
+
+    return *(unsigned char *)s1 - *(unsigned char *)(s2 - 1);
+}
+
+
+EXP_FUNC int STDCALL getdomainname(char *buf, int buf_size)
+{
+    HKEY hKey;
+    unsigned long datatype;
+    unsigned long bufferlength = buf_size;
+
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+            TEXT("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"),
+                        0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
+        return -1;
+
+    RegQueryValueEx(hKey, "Domain", NULL, &datatype, buf, &bufferlength);
+    RegCloseKey(hKey);
+    return 0; 
+}
+#endif
+
+#undef malloc
+#undef realloc
+#undef calloc
+
+static const char * out_of_mem_str = "out of memory";
+static const char * file_open_str = "Could not open file \"%s\"";
+
+/* 
+ * Some functions that call display some error trace and then call abort().
+ * This just makes life much easier on embedded systems, since we're 
+ * suffering major trauma...
+ */
+EXP_FUNC void * STDCALL ax_malloc(size_t s)
+{
+    void *x;
+
+    if ((x = malloc(s)) == NULL)
+        exit_now(out_of_mem_str);
+
+    return x;
+}
+
+EXP_FUNC void * STDCALL ax_realloc(void *y, size_t s)
+{
+    void *x;
+
+    if ((x = realloc(y, s)) == NULL)
+        exit_now(out_of_mem_str);
+
+    return x;
+}
+
+EXP_FUNC void * STDCALL ax_calloc(size_t n, size_t s)
+{
+    void *x;
+
+    if ((x = calloc(n, s)) == NULL)
+        exit_now(out_of_mem_str);
+
+    return x;
+}
+
+EXP_FUNC int STDCALL ax_open(const char *pathname, int flags)
+{
+    int x;
+
+    if ((x = open(pathname, flags)) < 0)
+        exit_now(file_open_str, pathname);
+
+    return x;
+}
+
+/**
+ * This is a call which will deliberately exit an application, but will
+ * display some information before dying.
+ */
+void exit_now(const char *format, ...)
+{
+    va_list argp;
+
+    va_start(argp, format);
+    vfprintf(stderr, format, argp);
+    va_end(argp);
+    abort();
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/os_port.h b/trunk/package/luci/libs/nixio/axTLS/ssl/os_port.h
new file mode 100644
index 00000000..262c4dd7
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/os_port.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file os_port.h
+ *
+ * Some stuff to minimise the differences between windows and linux/unix
+ */
+
+#ifndef HEADER_OS_PORT_H
+#define HEADER_OS_PORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+
+#if defined(WIN32)
+#define STDCALL                 __stdcall
+#define EXP_FUNC                __declspec(dllexport)
+#else
+#define STDCALL
+#define EXP_FUNC
+#endif
+
+#if defined(_WIN32_WCE)
+#undef WIN32
+#define WIN32
+#endif
+
+#ifdef WIN32
+
+/* Windows CE stuff */
+#if defined(_WIN32_WCE)
+#include <basetsd.h>
+#define abort()                 exit(1)
+#else
+#include <io.h>
+#include <process.h>
+#include <sys/timeb.h>
+#include <fcntl.h>
+#endif      /* _WIN32_WCE */
+
+#include <winsock.h>
+#include <direct.h>
+#undef getpid
+#undef open
+#undef close
+#undef sleep
+#undef gettimeofday
+#undef dup2
+#undef unlink
+
+#define SOCKET_READ(A,B,C)      recv(A,B,C,0)
+#define SOCKET_WRITE(A,B,C)     send(A,B,C,0)
+#define SOCKET_CLOSE(A)         closesocket(A)
+#define SOCKET_BLOCK(A)         u_long argp = 0; \
+                                ioctlsocket(A, FIONBIO, &argp)
+#define srandom(A)              srand(A)
+#define random()                rand()
+#define getpid()                _getpid()
+#define snprintf                _snprintf
+#define open(A,B)               _open(A,B)
+#define dup2(A,B)               _dup2(A,B)
+#define unlink(A)               _unlink(A)
+#define close(A)                _close(A)
+#define read(A,B,C)             _read(A,B,C)
+#define write(A,B,C)            _write(A,B,C)
+#define sleep(A)                Sleep(A*1000)
+#define usleep(A)               Sleep(A/1000)
+#define strdup(A)               _strdup(A)
+#define chroot(A)               _chdir(A)
+#define chdir(A)                _chdir(A)
+#define alloca(A)               _alloca(A)
+#ifndef lseek
+#define lseek(A,B,C)            _lseek(A,B,C)
+#endif
+
+/* This fix gets around a problem where a win32 application on a cygwin xterm
+   doesn't display regular output (until a certain buffer limit) - but it works
+   fine under a normal DOS window. This is a hack to get around the issue - 
+   see http://www.khngai.com/emacs/tty.php  */
+#define TTY_FLUSH()             if (!_isatty(_fileno(stdout))) fflush(stdout);
+
+/*
+ * automatically build some library dependencies.
+ */
+#pragma comment(lib, "WS2_32.lib")
+#pragma comment(lib, "AdvAPI32.lib")
+
+typedef UINT8 uint8_t;
+typedef INT8 int8_t;
+typedef UINT16 uint16_t;
+typedef INT16 int16_t;
+typedef UINT32 uint32_t;
+typedef INT32 int32_t;
+typedef UINT64 uint64_t;
+typedef INT64 int64_t;
+typedef int socklen_t;
+
+EXP_FUNC void STDCALL gettimeofday(struct timeval* t,void* timezone);
+EXP_FUNC int STDCALL strcasecmp(const char *s1, const char *s2);
+EXP_FUNC int STDCALL getdomainname(char *buf, int buf_size);
+
+#else   /* Not Win32 */
+
+#ifdef CONFIG_PLATFORM_SOLARIS
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif /* Not Solaris */
+
+#include <unistd.h>
+#include <pwd.h>
+#include <netdb.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#define SOCKET_READ(A,B,C)      read(A,B,C)
+#define SOCKET_WRITE(A,B,C)     write(A,B,C)
+#define SOCKET_CLOSE(A)         close(A)
+#define SOCKET_BLOCK(A)         int fd = fcntl(A, F_GETFL, NULL); \
+                                fcntl(A, F_SETFL, fd & ~O_NONBLOCK)
+#define TTY_FLUSH()
+
+#endif  /* Not Win32 */
+
+/* some functions to mutate the way these work */
+#define malloc(A)       ax_malloc(A)
+#ifndef realloc
+#define realloc(A,B)    ax_realloc(A,B)
+#endif
+#define calloc(A,B)     ax_calloc(A,B)
+
+EXP_FUNC void * STDCALL ax_malloc(size_t s);
+EXP_FUNC void * STDCALL ax_realloc(void *y, size_t s);
+EXP_FUNC void * STDCALL ax_calloc(size_t n, size_t s);
+EXP_FUNC int STDCALL ax_open(const char *pathname, int flags); 
+
+#ifdef CONFIG_PLATFORM_LINUX
+void exit_now(const char *format, ...) __attribute((noreturn));
+#else
+void exit_now(const char *format, ...);
+#endif
+
+/* Mutexing definitions */
+#if defined(CONFIG_SSL_CTX_MUTEXING)
+#if defined(WIN32)
+#define SSL_CTX_MUTEX_TYPE          HANDLE
+#define SSL_CTX_MUTEX_INIT(A)       A=CreateMutex(0, FALSE, 0)
+#define SSL_CTX_MUTEX_DESTROY(A)    CloseHandle(A)
+#define SSL_CTX_LOCK(A)             WaitForSingleObject(A, INFINITE)
+#define SSL_CTX_UNLOCK(A)           ReleaseMutex(A)
+#else 
+#include <pthread.h>
+#define SSL_CTX_MUTEX_TYPE          pthread_mutex_t
+#define SSL_CTX_MUTEX_INIT(A)       pthread_mutex_init(&A, NULL)
+#define SSL_CTX_MUTEX_DESTROY(A)    pthread_mutex_destroy(&A)
+#define SSL_CTX_LOCK(A)             pthread_mutex_lock(&A)
+#define SSL_CTX_UNLOCK(A)           pthread_mutex_unlock(&A)
+#endif
+#else   /* no mutexing */
+#define SSL_CTX_MUTEX_INIT(A)
+#define SSL_CTX_MUTEX_DESTROY(A)
+#define SSL_CTX_LOCK(A)
+#define SSL_CTX_UNLOCK(A)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif 
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/p12.c b/trunk/package/luci/libs/nixio/axTLS/ssl/p12.c
new file mode 100644
index 00000000..6ed92e43
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/p12.c
@@ -0,0 +1,486 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Process PKCS#8/PKCS#12 keys.
+ *
+ * The decoding of a PKCS#12 key is fairly specific - this code was tested on a
+ * key generated with:
+ *
+ * openssl pkcs12 -export -in axTLS.x509_1024.pem -inkey axTLS.key_1024.pem
+ * -keypbe PBE-SHA1-RC4-128 -certpbe PBE-SHA1-RC4-128 
+ * -name "p12_withoutCA" -out axTLS.withoutCA.p12 -password pass:abcd
+ *
+ * or with a certificate chain:
+ *
+ * openssl pkcs12 -export -in axTLS.x509_1024.pem -inkey axTLS.key_1024.pem
+ * -certfile axTLS.ca_x509.pem -keypbe PBE-SHA1-RC4-128 -certpbe
+ * PBE-SHA1-RC4-128 -name "p12_withCA" -out axTLS.withCA.p12 -password pass:abcd
+ *
+ * Note that the PBE has to be specified with PBE-SHA1-RC4-128. The
+ * private/public keys/certs have to use RSA encryption. Both the integrity
+ * and privacy passwords are the same.
+ *
+ * The PKCS#8 files were generated with something like:
+ *
+ * PEM format:
+ * openssl pkcs8 -in axTLS.key_512.pem -passout pass:abcd -topk8 -v1
+ * PBE-SHA1-RC4-128 -out axTLS.encrypted_pem.p8
+ *
+ * DER format:
+ * openssl pkcs8 -in axTLS.key_512.pem -passout pass:abcd -topk8 -outform DER
+ * -v1 PBE-SHA1-RC4-128 -out axTLS.encrypted.p8
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "ssl.h"
+
+/* all commented out if not used */
+#ifdef CONFIG_SSL_USE_PKCS12
+
+#define BLOCK_SIZE          64
+#define PKCS12_KEY_ID       1
+#define PKCS12_IV_ID        2
+#define PKCS12_MAC_ID       3
+
+static char *make_uni_pass(const char *password, int *uni_pass_len);
+static int p8_decrypt(const char *uni_pass, int uni_pass_len, 
+                        const uint8_t *salt, int iter, 
+                        uint8_t *priv_key, int priv_key_len, int id);
+static int p8_add_key(SSL_CTX *ssl_ctx, uint8_t *priv_key);
+static int get_pbe_params(uint8_t *buf, int *offset, 
+        const uint8_t **salt, int *iterations);
+
+/*
+ * Take a raw pkcs8 block and then decrypt it and turn it into a normal key.
+ */
+int pkcs8_decode(SSL_CTX *ssl_ctx, SSLObjLoader *ssl_obj, const char *password)
+{
+    uint8_t *buf = ssl_obj->buf;
+    int len, offset = 0;
+    int iterations;
+    int ret = SSL_NOT_OK;
+    uint8_t *version = NULL;
+    const uint8_t *salt;
+    uint8_t *priv_key;
+    int uni_pass_len;
+    char *uni_pass = make_uni_pass(password, &uni_pass_len);
+
+    if (asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: Invalid p8 ASN.1 file\n");
+#endif
+        goto error;
+    }
+
+    /* unencrypted key? */
+    if (asn1_get_int(buf, &offset, &version) > 0 && *version == 0)
+    {
+        ret = p8_add_key(ssl_ctx, buf);
+        goto error;
+    }
+
+    if (get_pbe_params(buf, &offset, &salt, &iterations) < 0)
+        goto error;
+
+    if ((len = asn1_next_obj(buf, &offset, ASN1_OCTET_STRING)) < 0)
+        goto error;
+
+    priv_key = &buf[offset];
+
+    p8_decrypt(uni_pass, uni_pass_len, salt, 
+                        iterations, priv_key, len, PKCS12_KEY_ID);
+    ret = p8_add_key(ssl_ctx, priv_key);
+
+error:
+    free(version);
+    free(uni_pass);
+    return ret;
+}
+
+/*
+ * Take the unencrypted pkcs8 and turn it into a private key 
+ */
+static int p8_add_key(SSL_CTX *ssl_ctx, uint8_t *priv_key)
+{
+    uint8_t *buf = priv_key;
+    int len, offset = 0;
+    int ret = SSL_NOT_OK;
+
+    /* Skip the preamble and go straight to the private key.
+       We only support rsaEncryption (1.2.840.113549.1.1.1)  */
+    if (asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            asn1_skip_obj(buf, &offset, ASN1_INTEGER) < 0 ||
+            asn1_skip_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_OCTET_STRING)) < 0)
+        goto error;
+
+    ret = asn1_get_private_key(&buf[offset], len, &ssl_ctx->rsa_ctx);
+
+error:
+    return ret;
+}
+
+/*
+ * Create the unicode password 
+ */
+static char *make_uni_pass(const char *password, int *uni_pass_len)
+{
+    int pass_len = 0, i;
+    char *uni_pass;
+
+    if (password == NULL)
+    {
+        password = "";
+    }
+
+    uni_pass = (char *)malloc((strlen(password)+1)*2);
+
+    /* modify the password into a unicode version */
+    for (i = 0; i < (int)strlen(password); i++)
+    {
+        uni_pass[pass_len++] = 0;
+        uni_pass[pass_len++] = password[i];
+    }
+
+    uni_pass[pass_len++] = 0;       /* null terminate */
+    uni_pass[pass_len++] = 0;
+    *uni_pass_len = pass_len;
+    return uni_pass;
+}
+
+/*
+ * Decrypt a pkcs8 block.
+ */
+static int p8_decrypt(const char *uni_pass, int uni_pass_len,
+                        const uint8_t *salt, int iter, 
+                        uint8_t *priv_key, int priv_key_len, int id)
+{
+    uint8_t p[BLOCK_SIZE*2];
+    uint8_t d[BLOCK_SIZE];
+    uint8_t Ai[SHA1_SIZE];
+    SHA1_CTX sha_ctx;
+    RC4_CTX rc4_ctx;
+    int i;
+
+    for (i = 0; i < BLOCK_SIZE; i++)
+    {
+        p[i] = salt[i % SALT_SIZE];
+        p[BLOCK_SIZE+i] = uni_pass[i % uni_pass_len];
+        d[i] = id;
+    }
+
+    /* get the key - no IV since we are using RC4 */
+    SHA1_Init(&sha_ctx);
+    SHA1_Update(&sha_ctx, d, sizeof(d));
+    SHA1_Update(&sha_ctx, p, sizeof(p));
+    SHA1_Final(Ai, &sha_ctx);
+
+    for (i = 1; i < iter; i++)
+    {
+        SHA1_Init(&sha_ctx);
+        SHA1_Update(&sha_ctx, Ai, SHA1_SIZE);
+        SHA1_Final(Ai, &sha_ctx);
+    }
+
+    /* do the decryption */
+    if (id == PKCS12_KEY_ID)
+    {
+        RC4_setup(&rc4_ctx, Ai, 16);
+        RC4_crypt(&rc4_ctx, priv_key, priv_key, priv_key_len);
+    }
+    else  /* MAC */
+        memcpy(priv_key, Ai, SHA1_SIZE);
+
+    return 0;
+}
+
+/*
+ * Take a raw pkcs12 block and the decrypt it and turn it into a certificate(s)
+ * and keys.
+ */
+int pkcs12_decode(SSL_CTX *ssl_ctx, SSLObjLoader *ssl_obj, const char *password)
+{
+    uint8_t *buf = ssl_obj->buf;
+    int all_ok = 0, len, iterations, auth_safes_start, 
+              auth_safes_end, auth_safes_len, key_offset, offset = 0;
+    int all_certs = 0;
+    uint8_t *version = NULL, *auth_safes = NULL, *cert, *orig_mac;
+    uint8_t key[SHA1_SIZE];
+    uint8_t mac[SHA1_SIZE];
+    const uint8_t *salt;
+    int uni_pass_len, ret;
+    int error_code = SSL_ERROR_NOT_SUPPORTED;
+    char *uni_pass = make_uni_pass(password, &uni_pass_len);
+    static const uint8_t pkcs_data[] = /* pkc7 data */
+        { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01 };
+    static const uint8_t pkcs_encrypted[] = /* pkc7 encrypted */
+        { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x06 };
+    static const uint8_t pkcs8_key_bag[] = /* 1.2.840.113549.1.12.10.1.2 */
+        { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x0a, 0x01, 0x02 };
+
+    if (asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: Invalid p12 ASN.1 file\n");
+#endif
+        goto error;
+    }
+
+    if (asn1_get_int(buf, &offset, &version) < 0 || *version != 3)
+    {
+        error_code = SSL_ERROR_INVALID_VERSION;
+        goto error;
+    }
+
+    /* remove all the boring pcks7 bits */
+    if (asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 || 
+                (len = asn1_next_obj(buf, &offset, ASN1_OID)) < 0 ||
+                len != sizeof(pkcs_data) || 
+                memcmp(&buf[offset], pkcs_data, sizeof(pkcs_data)))
+        goto error;
+
+    offset += len;
+
+    if (asn1_next_obj(buf, &offset, ASN1_EXPLICIT_TAG) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_OCTET_STRING) < 0)
+        goto error;
+
+    /* work out the MAC start/end points (done on AuthSafes) */
+    auth_safes_start = offset;
+    auth_safes_end = offset;
+    if (asn1_skip_obj(buf, &auth_safes_end, ASN1_SEQUENCE) < 0)
+        goto error;
+
+    auth_safes_len = auth_safes_end - auth_safes_start;
+    auth_safes = malloc(auth_safes_len);
+
+    memcpy(auth_safes, &buf[auth_safes_start], auth_safes_len);
+
+    if (asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_OID)) < 0 ||
+            (len != sizeof(pkcs_encrypted) || 
+            memcmp(&buf[offset], pkcs_encrypted, sizeof(pkcs_encrypted))))
+        goto error;
+
+    offset += len;
+
+    if (asn1_next_obj(buf, &offset, ASN1_EXPLICIT_TAG) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            asn1_skip_obj(buf, &offset, ASN1_INTEGER) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_OID)) < 0 ||
+            len != sizeof(pkcs_data) || 
+            memcmp(&buf[offset], pkcs_data, sizeof(pkcs_data)))
+        goto error;
+
+    offset += len;
+
+    /* work out the salt for the certificate */
+    if (get_pbe_params(buf, &offset, &salt, &iterations) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_IMPLICIT_TAG)) < 0)
+        goto error;
+
+    /* decrypt the certificate */
+    cert = &buf[offset];
+    if ((ret = p8_decrypt(uni_pass, uni_pass_len, salt, iterations, cert, 
+                            len, PKCS12_KEY_ID)) < 0)
+        goto error;
+
+    offset += len;
+
+    /* load the certificate */
+    key_offset = 0;
+    all_certs = asn1_next_obj(cert, &key_offset, ASN1_SEQUENCE);
+
+    /* keep going until all certs are loaded */
+    while (key_offset < all_certs)
+    {
+        int cert_offset = key_offset;
+
+        if (asn1_skip_obj(cert, &cert_offset, ASN1_SEQUENCE) < 0 ||
+                asn1_next_obj(cert, &key_offset, ASN1_SEQUENCE) < 0 ||
+                asn1_skip_obj(cert, &key_offset, ASN1_OID) < 0 ||
+                asn1_next_obj(cert, &key_offset, ASN1_EXPLICIT_TAG) < 0 ||
+                asn1_next_obj(cert, &key_offset, ASN1_SEQUENCE) < 0 ||
+                asn1_skip_obj(cert, &key_offset, ASN1_OID) < 0 ||
+                asn1_next_obj(cert, &key_offset, ASN1_EXPLICIT_TAG) < 0 ||
+                (len = asn1_next_obj(cert, &key_offset, ASN1_OCTET_STRING)) < 0)
+            goto error;
+
+        if ((ret = add_cert(ssl_ctx, &cert[key_offset], len)) < 0)
+            goto error;
+
+        key_offset = cert_offset;
+    }
+
+    if (asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_OID)) < 0 ||
+            len != sizeof(pkcs_data) || 
+            memcmp(&buf[offset], pkcs_data, sizeof(pkcs_data)))
+        goto error;
+
+    offset += len;
+
+    if (asn1_next_obj(buf, &offset, ASN1_EXPLICIT_TAG) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_OCTET_STRING) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_OID)) < 0 ||
+            (len != sizeof(pkcs8_key_bag)) || 
+            memcmp(&buf[offset], pkcs8_key_bag, sizeof(pkcs8_key_bag)))
+        goto error;
+
+    offset += len;
+
+    /* work out the salt for the private key */
+    if (asn1_next_obj(buf, &offset, ASN1_EXPLICIT_TAG) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            get_pbe_params(buf, &offset, &salt, &iterations) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_OCTET_STRING)) < 0)
+        goto error;
+
+    /* decrypt the private key */
+    cert = &buf[offset];
+    if ((ret = p8_decrypt(uni_pass, uni_pass_len, salt, iterations, cert, 
+                            len, PKCS12_KEY_ID)) < 0)
+        goto error;
+
+    offset += len;
+
+    /* load the private key */
+    if ((ret = p8_add_key(ssl_ctx, cert)) < 0)
+        goto error;
+
+    /* miss out on friendly name, local key id etc */
+    if (asn1_skip_obj(buf, &offset, ASN1_SET) < 0)
+        goto error;
+
+    /* work out the MAC */
+    if (asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            asn1_next_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            asn1_skip_obj(buf, &offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, &offset, ASN1_OCTET_STRING)) < 0 ||
+            len != SHA1_SIZE)
+        goto error;
+
+    orig_mac = &buf[offset];
+    offset += len;
+
+    /* get the salt */
+    if ((len = asn1_next_obj(buf, &offset, ASN1_OCTET_STRING)) < 0 || len != 8)
+        goto error;
+
+    salt = &buf[offset];
+
+    /* work out what the mac should be */
+    if ((ret = p8_decrypt(uni_pass, uni_pass_len, salt, iterations, 
+                            key, SHA1_SIZE, PKCS12_MAC_ID)) < 0)
+        goto error;
+
+    hmac_sha1(auth_safes, auth_safes_len, key, SHA1_SIZE, mac);
+
+    if (memcmp(mac, orig_mac, SHA1_SIZE))
+    {
+        error_code = SSL_ERROR_INVALID_HMAC;                  
+        goto error;
+    }
+
+    all_ok = 1;
+
+error:
+    free(version);
+    free(uni_pass);
+    free(auth_safes);
+    return all_ok ? SSL_OK : error_code;
+}
+
+/*
+ * Retrieve the salt/iteration details from a PBE block.
+ */
+static int get_pbe_params(uint8_t *buf, int *offset, 
+        const uint8_t **salt, int *iterations)
+{
+    static const uint8_t pbeSH1RC4[] = /* pbeWithSHAAnd128BitRC4  */
+            { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x01, 0x01 };
+
+    int i, len;
+    uint8_t *iter = NULL;
+    int error_code = SSL_ERROR_NOT_SUPPORTED;
+
+    /* Get the PBE type */
+    if (asn1_next_obj(buf, offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, offset, ASN1_OID)) < 0)
+        goto error;
+
+    /* we expect pbeWithSHAAnd128BitRC4 (1.2.840.113549.1.12.1.1) 
+       which is the only algorithm we support */
+    if (len != sizeof(pbeSH1RC4) || 
+                    memcmp(&buf[*offset], pbeSH1RC4, sizeof(pbeSH1RC4)))
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: pkcs8/pkcs12 must use \"PBE-SHA1-RC4-128\"\n");
+#endif
+        goto error;
+    }
+
+    *offset += len;
+
+    if (asn1_next_obj(buf, offset, ASN1_SEQUENCE) < 0 ||
+            (len = asn1_next_obj(buf, offset, ASN1_OCTET_STRING)) < 0 || 
+            len != 8)
+        goto error;
+
+    *salt = &buf[*offset];
+    *offset += len;
+
+    if ((len = asn1_get_int(buf, offset, &iter)) < 0)
+        goto error;
+
+    *iterations = 0;
+    for (i = 0; i < len; i++)
+    {
+        (*iterations) <<= 8;
+        (*iterations) += iter[i];
+    }
+
+    free(iter);
+    error_code = SSL_OK;       /* got here - we are ok */
+
+error:
+    return error_code;
+}
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/private_key.h b/trunk/package/luci/libs/nixio/axTLS/ssl/private_key.h
new file mode 100644
index 00000000..96a52533
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/private_key.h
@@ -0,0 +1,54 @@
+unsigned char default_private_key[] = {
+  0x30, 0x82, 0x02, 0x5d, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81, 0x00, 0xd8,
+  0xe0, 0xbf, 0x15, 0xde, 0xea, 0xaf, 0xe8, 0xd5, 0xfd, 0x0b, 0xa8, 0xa8,
+  0xb3, 0xd7, 0x46, 0x5d, 0xa7, 0x26, 0x6c, 0x0c, 0xb5, 0xd9, 0xbc, 0xc6,
+  0xf8, 0xc0, 0x78, 0xd0, 0xf6, 0x56, 0x65, 0xf8, 0x29, 0x48, 0x0e, 0x7b,
+  0x0b, 0xa6, 0x25, 0x7e, 0xe8, 0x7b, 0x79, 0x6f, 0x38, 0xe5, 0xb5, 0xb7,
+  0xf4, 0xe0, 0x9c, 0x91, 0x60, 0xf4, 0x06, 0xf3, 0x40, 0x1e, 0xf9, 0x91,
+  0x19, 0xa9, 0x2f, 0x47, 0x43, 0xb5, 0x9b, 0x1e, 0xdc, 0xf6, 0xaa, 0x1c,
+  0x49, 0x79, 0x21, 0x28, 0xcb, 0xaa, 0x49, 0x73, 0xd9, 0x09, 0x05, 0x4c,
+  0x02, 0xf2, 0x4c, 0x4d, 0x6c, 0x1c, 0x80, 0xa7, 0x14, 0x91, 0x44, 0xfc,
+  0x12, 0xb3, 0xe1, 0xe7, 0xe3, 0x4f, 0x44, 0xba, 0x8c, 0xc3, 0x74, 0x39,
+  0xe8, 0x4c, 0xd0, 0xd4, 0x4c, 0x24, 0x61, 0xb4, 0x40, 0x95, 0x8c, 0xc0,
+  0x0a, 0xb7, 0x02, 0x39, 0x31, 0x85, 0x93, 0x02, 0x03, 0x01, 0x00, 0x01,
+  0x02, 0x81, 0x81, 0x00, 0x94, 0x07, 0x72, 0xe5, 0xbe, 0xad, 0x79, 0x3b,
+  0xf7, 0x33, 0x2c, 0x8e, 0x05, 0xf8, 0x1a, 0x6b, 0xd0, 0xe8, 0x91, 0xf5,
+  0x16, 0x07, 0xd9, 0x82, 0x5c, 0x5c, 0xd5, 0x22, 0xa1, 0x9e, 0x42, 0x02,
+  0x7f, 0x8b, 0xcd, 0xbe, 0xf4, 0x85, 0x52, 0xf6, 0x2c, 0xd5, 0x09, 0xd2,
+  0x2c, 0xf4, 0x2c, 0xf6, 0x07, 0x85, 0x80, 0xf9, 0xdc, 0xd0, 0xcc, 0x3f,
+  0x22, 0x31, 0x15, 0xf3, 0x49, 0xf2, 0xb5, 0xe2, 0x69, 0x99, 0x04, 0x04,
+  0x49, 0x21, 0xdb, 0x9f, 0xa1, 0x54, 0x5a, 0xfa, 0xe4, 0xd9, 0xf9, 0x07,
+  0x05, 0xff, 0x9a, 0x65, 0xa4, 0xeb, 0xf2, 0x47, 0xce, 0x56, 0xc7, 0x72,
+  0x49, 0x48, 0x5c, 0xe8, 0x14, 0xd7, 0x8f, 0x25, 0xcc, 0x49, 0x29, 0x06,
+  0x6a, 0x54, 0x7b, 0x17, 0xdc, 0x9e, 0xd4, 0x53, 0xf0, 0xf5, 0x9e, 0x85,
+  0x25, 0xa1, 0xeb, 0x3d, 0xe9, 0x2f, 0xb9, 0x9c, 0xf6, 0xe1, 0x80, 0x81,
+  0x02, 0x41, 0x00, 0xee, 0x02, 0x78, 0xc7, 0x78, 0x85, 0x04, 0x97, 0xcc,
+  0x36, 0xbd, 0xd6, 0x11, 0xe2, 0xc7, 0x39, 0xd9, 0x34, 0x51, 0x72, 0x6f,
+  0x8a, 0x0f, 0xcd, 0x88, 0x32, 0x33, 0x9b, 0xc7, 0xa7, 0x03, 0x77, 0xd9,
+  0x82, 0x35, 0xb6, 0xdd, 0x1f, 0xc2, 0xc1, 0x13, 0x40, 0x83, 0x55, 0xeb,
+  0x60, 0xeb, 0x81, 0x8e, 0x0c, 0x16, 0x62, 0xb4, 0xb4, 0x3c, 0xeb, 0x08,
+  0x80, 0x9c, 0x79, 0xd3, 0x38, 0xca, 0xf1, 0x02, 0x41, 0x00, 0xe9, 0x45,
+  0x5f, 0x2e, 0x16, 0xcc, 0x93, 0x50, 0x40, 0xb6, 0x79, 0xbc, 0x38, 0xe0,
+  0x56, 0x68, 0x50, 0xd3, 0x2f, 0x73, 0x8c, 0x8c, 0x2a, 0x0e, 0x81, 0x4a,
+  0x8a, 0xbb, 0xcc, 0xf0, 0x64, 0x34, 0x46, 0x9f, 0x07, 0x7d, 0x22, 0xb6,
+  0xf9, 0x46, 0xac, 0x57, 0x23, 0x8c, 0x1e, 0xeb, 0xd3, 0x05, 0x4d, 0xa8,
+  0x83, 0x6a, 0x67, 0xf6, 0xa6, 0xb1, 0xab, 0x8e, 0xc1, 0xef, 0xef, 0x7d,
+  0xf0, 0xc3, 0x02, 0x40, 0x2f, 0xc6, 0x59, 0x3e, 0x18, 0xe8, 0x02, 0x73,
+  0x01, 0xef, 0xdf, 0x0d, 0x30, 0x4b, 0xe8, 0x17, 0xa9, 0x8c, 0xc1, 0xe8,
+  0x89, 0x91, 0x19, 0xf8, 0xf4, 0xa4, 0xb7, 0x0d, 0x46, 0xf7, 0x34, 0x50,
+  0x03, 0x5e, 0x0a, 0xb0, 0x29, 0x14, 0xae, 0x00, 0x19, 0x80, 0x32, 0x9c,
+  0xb5, 0x81, 0x9f, 0xe4, 0x42, 0x82, 0x14, 0xa0, 0x3d, 0x8b, 0x8c, 0x4a,
+  0xd5, 0x4b, 0x13, 0x9d, 0xb4, 0x93, 0x4a, 0xd1, 0x02, 0x40, 0x64, 0x8c,
+  0x83, 0x77, 0x61, 0x5a, 0x73, 0x11, 0x3f, 0xa3, 0xa8, 0x1b, 0x8a, 0xc4,
+  0xa0, 0x5a, 0x3c, 0xa4, 0x9b, 0x2a, 0x8a, 0x65, 0x8c, 0x67, 0x4e, 0x31,
+  0xac, 0x55, 0x41, 0x04, 0x49, 0x9d, 0x02, 0xe7, 0xdf, 0x99, 0x7f, 0xd2,
+  0x30, 0xe6, 0xd6, 0xb8, 0x84, 0xd9, 0x0c, 0x27, 0x08, 0x81, 0x9b, 0xb4,
+  0xcc, 0x58, 0x9c, 0x51, 0x84, 0x0e, 0xc7, 0x6d, 0x34, 0x89, 0x50, 0xc9,
+  0x0f, 0x73, 0x02, 0x41, 0x00, 0xda, 0xde, 0x5e, 0x1a, 0xac, 0x1d, 0x1d,
+  0xd7, 0xb9, 0x65, 0x26, 0x00, 0xf5, 0xd4, 0xe4, 0x28, 0x84, 0x86, 0x2f,
+  0x00, 0x9c, 0x41, 0x00, 0x52, 0xe1, 0x47, 0x91, 0xc0, 0x52, 0x05, 0x4e,
+  0x0f, 0x2f, 0x0d, 0xca, 0x9b, 0x3d, 0x89, 0x41, 0xbf, 0xee, 0x9f, 0xa1,
+  0xe6, 0x9d, 0xa4, 0xeb, 0x45, 0x7f, 0xe3, 0xcb, 0xa4, 0x6b, 0x0a, 0xe2,
+  0x7e, 0xb0, 0x87, 0x5c, 0x40, 0xb1, 0x51, 0x11, 0x1d
+};
+unsigned int default_private_key_len = 609;
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/ssl.h b/trunk/package/luci/libs/nixio/axTLS/ssl/ssl.h
new file mode 100644
index 00000000..539d0a30
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/ssl.h
@@ -0,0 +1,474 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @mainpage axTLS API
+ *
+ * @image html axolotl.jpg
+ *
+ * The axTLS library has features such as:
+ * - The TLSv1 SSL client/server protocol
+ * - No requirement to use any openssl libraries.
+ * - A choice between AES block (128/256 bit) and RC4 (128 bit) stream ciphers.
+ * - RSA encryption/decryption with variable sized keys (up to 4096 bits).
+ * - Certificate chaining and peer authentication.
+ * - Session resumption, session renegotiation.
+ * - ASN.1, X.509, PKCS#8, PKCS#12 keys/certificates with DER/PEM encoding.
+ * - Highly configurable compile time options.
+ * - Portable across many platforms (written in ANSI C), and has language
+ * bindings in C, C#, VB.NET, Java, Perl and Lua.
+ * - Partial openssl API compatibility (via a wrapper).
+ * - A very small footprint (around 50-60kB for the library in 'server-only' 
+ *   mode).
+ * - No dependencies on sockets - can use serial connections for example.
+ * - A very simple API - ~ 20 functions/methods.
+ *
+ * A list of these functions/methods are described below.
+ *
+ *  @ref c_api 
+ *
+ *  @ref bigint_api 
+ *
+ *  @ref csharp_api 
+ *
+ *  @ref java_api 
+ */
+#ifndef HEADER_SSL_H
+#define HEADER_SSL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <time.h>
+//#include "crypto.h"
+
+/* need to predefine before ssl_lib.h gets to it */
+#define SSL_SESSION_ID_SIZE                     32
+
+#include "tls1.h"
+
+/* The optional parameters that can be given to the client/server SSL engine */
+#define SSL_CLIENT_AUTHENTICATION               0x00010000
+#define SSL_SERVER_VERIFY_LATER                 0x00020000
+#define SSL_NO_DEFAULT_KEY                      0x00040000
+#define SSL_DISPLAY_STATES                      0x00080000
+#define SSL_DISPLAY_BYTES                       0x00100000
+#define SSL_DISPLAY_CERTS                       0x00200000
+#define SSL_DISPLAY_RSA                         0x00400000
+
+/* errors that can be generated */
+#define SSL_OK                                  0
+#define SSL_NOT_OK                              -1
+#define SSL_ERROR_DEAD                          -2
+#define SSL_ERROR_CONN_LOST                     -256
+#define SSL_ERROR_SOCK_SETUP_FAILURE            -258
+#define SSL_ERROR_INVALID_HANDSHAKE             -260
+#define SSL_ERROR_INVALID_PROT_MSG              -261
+#define SSL_ERROR_INVALID_HMAC                  -262
+#define SSL_ERROR_INVALID_VERSION               -263
+#define SSL_ERROR_INVALID_SESSION               -265
+#define SSL_ERROR_NO_CIPHER                     -266
+#define SSL_ERROR_BAD_CERTIFICATE               -268
+#define SSL_ERROR_INVALID_KEY                   -269
+#define SSL_ERROR_FINISHED_INVALID              -271
+#define SSL_ERROR_NO_CERT_DEFINED               -272
+#define SSL_ERROR_NOT_SUPPORTED                 -274
+#define SSL_X509_OFFSET                         -512
+#define SSL_X509_ERROR(A)                       (SSL_X509_OFFSET+A)
+
+/* these are all the alerts that are recognized */
+#define SSL_ALERT_CLOSE_NOTIFY                  0
+#define SSL_ALERT_UNEXPECTED_MESSAGE            10
+#define SSL_ALERT_BAD_RECORD_MAC                20
+#define SSL_ALERT_HANDSHAKE_FAILURE             40
+#define SSL_ALERT_BAD_CERTIFICATE               42
+#define SSL_ALERT_ILLEGAL_PARAMETER             47
+#define SSL_ALERT_DECODE_ERROR                  50
+#define SSL_ALERT_DECRYPT_ERROR                 51
+#define SSL_ALERT_INVALID_VERSION               70
+
+/* The ciphers that are supported */
+#define SSL_AES128_SHA                          0x2f
+#define SSL_AES256_SHA                          0x35
+#define SSL_RC4_128_SHA                         0x05
+#define SSL_RC4_128_MD5                         0x04
+
+/* build mode ids' */
+#define SSL_BUILD_SKELETON_MODE                 0x01
+#define SSL_BUILD_SERVER_ONLY                   0x02
+#define SSL_BUILD_ENABLE_VERIFICATION           0x03
+#define SSL_BUILD_ENABLE_CLIENT                 0x04
+#define SSL_BUILD_FULL_MODE                     0x05
+
+/* offsets to retrieve configuration information */
+#define SSL_BUILD_MODE                          0
+#define SSL_MAX_CERT_CFG_OFFSET                 1
+#define SSL_MAX_CA_CERT_CFG_OFFSET              2
+#define SSL_HAS_PEM                             3
+
+/* default session sizes */
+#define SSL_DEFAULT_SVR_SESS                    5
+#define SSL_DEFAULT_CLNT_SESS                   1
+
+/* X.509/X.520 distinguished name types */
+#define SSL_X509_CERT_COMMON_NAME               0
+#define SSL_X509_CERT_ORGANIZATION              1
+#define SSL_X509_CERT_ORGANIZATIONAL_NAME       2
+#define SSL_X509_CA_CERT_COMMON_NAME            3
+#define SSL_X509_CA_CERT_ORGANIZATION           4
+#define SSL_X509_CA_CERT_ORGANIZATIONAL_NAME    5
+
+/* SSL object loader types */
+#define SSL_OBJ_X509_CERT                       1
+#define SSL_OBJ_X509_CACERT                     2
+#define SSL_OBJ_RSA_KEY                         3
+#define SSL_OBJ_PKCS8                           4
+#define SSL_OBJ_PKCS12                          5
+
+/**
+ * @defgroup c_api Standard C API
+ * @brief The standard interface in C.
+ * @{
+ */
+
+/**
+ * @brief Establish a new client/server context.
+ *
+ * This function is called before any client/server SSL connections are made. 
+ *
+ * Each new connection will use the this context's private key and 
+ * certificate chain. If a different certificate chain is required, then a 
+ * different context needs to be be used.
+ *
+ * There are two threading models supported - a single thread with one
+ * SSL_CTX can support any number of SSL connections - and multiple threads can 
+ * support one SSL_CTX object each (the default). But if a single SSL_CTX 
+ * object uses many SSL objects in individual threads, then the 
+ * CONFIG_SSL_CTX_MUTEXING option needs to be configured.
+ *
+ * @param options [in]  Any particular options. At present the options
+ * supported are:
+ * - SSL_SERVER_VERIFY_LATER (client only): Don't stop a handshake if the server
+ * authentication fails. The certificate can be authenticated later with a
+ * call to ssl_verify_cert().
+ * - SSL_CLIENT_AUTHENTICATION (server only): Enforce client authentication
+ * i.e. each handshake will include a "certificate request" message from the
+ * server. Only available if verification has been enabled.
+ * - SSL_DISPLAY_BYTES (full mode build only): Display the byte sequences
+ * during the handshake.
+ * - SSL_DISPLAY_STATES (full mode build only): Display the state changes
+ * during the handshake.
+ * - SSL_DISPLAY_CERTS (full mode build only): Display the certificates that
+ * are passed during a handshake.
+ * - SSL_DISPLAY_RSA (full mode build only): Display the RSA key details that
+ * are passed during a handshake.
+ *
+ * @param num_sessions [in] The number of sessions to be used for session
+ * caching. If this value is 0, then there is no session caching. This option
+ * is not used in skeleton mode.
+ * @return A client/server context.
+ */
+EXP_FUNC SSL_CTX * STDCALL ssl_ctx_new(uint32_t options, int num_sessions);
+
+/**
+ * @brief Remove a client/server context.
+ *
+ * Frees any used resources used by this context. Each connection will be 
+ * sent a "Close Notify" alert (if possible).
+ * @param ssl_ctx [in] The client/server context.
+ */
+EXP_FUNC void STDCALL ssl_ctx_free(SSL_CTX *ssl_ctx);
+
+/**
+ * @brief (server only) Establish a new SSL connection to an SSL client.
+ *
+ * It is up to the application to establish the logical connection (whether it
+ * is  a socket, serial connection etc).
+ * @param ssl_ctx [in] The server context.
+ * @param client_fd [in] The client's file descriptor. 
+ * @return An SSL object reference.
+ */
+EXP_FUNC SSL * STDCALL ssl_server_new(SSL_CTX *ssl_ctx, int client_fd);
+
+/**
+ * @brief (client only) Establish a new SSL connection to an SSL server.
+ *
+ * It is up to the application to establish the initial logical connection 
+ * (whether it is  a socket, serial connection etc).
+ *
+ * This is a blocking call - it will finish when the handshake is complete (or
+ * has failed).
+ * @param ssl_ctx [in] The client context.
+ * @param client_fd [in] The client's file descriptor.
+ * @param session_id [in] A 32 byte session id for session resumption. This 
+ * can be null if no session resumption is being used or required. This option
+ * is not used in skeleton mode.
+ * @param sess_id_size The size of the session id (max 32)
+ * @return An SSL object reference. Use ssl_handshake_status() to check 
+ * if a handshake succeeded.
+ */
+EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const uint8_t *session_id, uint8_t sess_id_size);
+
+/**
+ * @brief Free any used resources on this connection. 
+ 
+ * A "Close Notify" message is sent on this connection (if possible). It is up 
+ * to the application to close the socket or file descriptor.
+ * @param ssl [in] The ssl object reference.
+ */
+EXP_FUNC void STDCALL ssl_free(SSL *ssl);
+
+/**
+ * @brief Read the SSL data stream.
+ * The socket must be in blocking mode.
+ * @param ssl [in] An SSL object reference.
+ * @param in_data [out] If the read was successful, a pointer to the read
+ * buffer will be here. Do NOT ever free this memory as this buffer is used in
+ * sucessive calls. If the call was unsuccessful, this value will be null.
+ * @return The number of decrypted bytes:
+ * - if > 0, then the handshaking is complete and we are returning the number 
+ *   of decrypted bytes. 
+ * - SSL_OK if the handshaking stage is successful (but not yet complete).  
+ * - < 0 if an error.
+ * @see ssl.h for the error code list.
+ * @note Use in_data before doing any successive ssl calls.
+ */
+EXP_FUNC int STDCALL ssl_read(SSL *ssl, uint8_t **in_data);
+
+/**
+ * @brief Write to the SSL data stream. 
+ * The socket must be in blocking mode.
+ * @param ssl [in] An SSL obect reference.
+ * @param out_data [in] The data to be written
+ * @param out_len [in] The number of bytes to be written.
+ * @return The number of bytes sent, or if < 0 if an error.
+ * @see ssl.h for the error code list.
+ */
+EXP_FUNC int STDCALL ssl_write(SSL *ssl, const uint8_t *out_data, int out_len);
+
+/**
+ * @brief Find an ssl object based on a file descriptor.
+ *
+ * Goes through the list of SSL objects maintained in a client/server context
+ * to look for a file descriptor match.
+ * @param ssl_ctx [in] The client/server context.
+ * @param client_fd [in]  The file descriptor.
+ * @return A reference to the SSL object. Returns null if the object could not 
+ * be found.
+ */
+EXP_FUNC SSL * STDCALL ssl_find(SSL_CTX *ssl_ctx, int client_fd);
+
+/**
+ * @brief Get the session id for a handshake. 
+ * 
+ * This will be a 32 byte sequence and is available after the first
+ * handshaking messages are sent.
+ * @param ssl [in] An SSL object reference.
+ * @return The session id as a 32 byte sequence.
+ * @note A SSLv23 handshake may have only 16 valid bytes.
+ */
+EXP_FUNC const uint8_t * STDCALL ssl_get_session_id(const SSL *ssl);
+
+/**
+ * @brief Get the session id size for a handshake. 
+ * 
+ * This will normally be 32 but could be 0 (no session id) or something else.
+ * @param ssl [in] An SSL object reference.
+ * @return The size of the session id.
+ */
+EXP_FUNC uint8_t STDCALL ssl_get_session_id_size(const SSL *ssl);
+
+/**
+ * @brief Return the cipher id (in the SSL form).
+ * @param ssl [in] An SSL object reference.
+ * @return The cipher id. This will be one of the following:
+ * - SSL_AES128_SHA (0x2f)
+ * - SSL_AES256_SHA (0x35)
+ * - SSL_RC4_128_SHA (0x05)
+ * - SSL_RC4_128_MD5 (0x04)
+ */
+EXP_FUNC uint8_t STDCALL ssl_get_cipher_id(const SSL *ssl);
+
+/**
+ * @brief Return the status of the handshake.
+ * @param ssl [in] An SSL object reference.
+ * @return SSL_OK if the handshake is complete and ok. 
+ * @see ssl.h for the error code list.
+ */
+EXP_FUNC int STDCALL ssl_handshake_status(const SSL *ssl);
+
+/**
+ * @brief Retrieve various parameters about the axTLS engine.
+ * @param offset [in] The configuration offset. It will be one of the following:
+ * - SSL_BUILD_MODE The build mode. This will be one of the following:
+ *   - SSL_BUILD_SERVER_ONLY            (basic server mode)
+ *   - SSL_BUILD_ENABLE_VERIFICATION    (server can do client authentication)
+ *   - SSL_BUILD_ENABLE_CLIENT          (client/server capabilties)
+ *   - SSL_BUILD_FULL_MODE              (client/server with diagnostics)
+ *   - SSL_BUILD_SKELETON_MODE          (skeleton mode)
+ * - SSL_MAX_CERT_CFG_OFFSET The maximum number of certificates allowed.
+ * - SSL_MAX_CA_CERT_CFG_OFFSET The maximum number of CA certificates allowed.
+ * - SSL_HAS_PEM                        1 if supported
+ * @return The value of the requested parameter.
+ */
+EXP_FUNC int STDCALL ssl_get_config(int offset);
+
+/**
+ * @brief Display why the handshake failed.
+ *
+ * This call is only useful in a 'full mode' build. The output is to stdout.
+ * @param error_code [in] An error code.
+ * @see ssl.h for the error code list.
+ */
+EXP_FUNC void STDCALL ssl_display_error(int error_code);
+
+/**
+ * @brief Authenticate a received certificate.
+ * 
+ * This call is usually made by a client after a handshake is complete and the
+ * context is in SSL_SERVER_VERIFY_LATER mode.
+ * @param ssl [in] An SSL object reference.
+ * @return SSL_OK if the certificate is verified.
+ */
+EXP_FUNC int STDCALL ssl_verify_cert(const SSL *ssl);
+
+/**
+ * @brief Retrieve an X.509 distinguished name component.
+ * 
+ * When a handshake is complete and a certificate has been exchanged, then the
+ * details of the remote certificate can be retrieved.
+ *
+ * This will usually be used by a client to check that the server's common 
+ * name matches the URL.
+ *
+ * A full handshake needs to occur for this call to work properly.
+ *
+ * @param ssl [in] An SSL object reference.
+ * @param component [in] one of:
+ * - SSL_X509_CERT_COMMON_NAME
+ * - SSL_X509_CERT_ORGANIZATION
+ * - SSL_X509_CERT_ORGANIZATIONAL_NAME
+ * - SSL_X509_CA_CERT_COMMON_NAME
+ * - SSL_X509_CA_CERT_ORGANIZATION
+ * - SSL_X509_CA_CERT_ORGANIZATIONAL_NAME
+ * @return The appropriate string (or null if not defined)
+ * @note Verification build mode must be enabled.
+ */
+EXP_FUNC const char * STDCALL ssl_get_cert_dn(const SSL *ssl, int component);
+
+/**
+ * @brief Force the client to perform its handshake again.
+ *
+ * For a client this involves sending another "client hello" message.
+ * For the server is means sending a "hello request" message.
+ *
+ * This is a blocking call on the client (until the handshake completes).
+ *
+ * @param ssl [in] An SSL object reference.
+ * @return SSL_OK if renegotiation instantiation was ok
+ */
+EXP_FUNC int STDCALL ssl_renegotiate(SSL *ssl);
+
+/**
+ * @brief Process a file that is in binary DER or ASCII PEM format.
+ *
+ * These are temporary objects that are used to load private keys,
+ * certificates etc into memory.
+ * @param ssl_ctx [in] The client/server context.
+ * @param obj_type [in] The format of the file. Can be one of:
+ * - SSL_OBJ_X509_CERT (no password required)
+ * - SSL_OBJ_X509_CACERT (no password required)
+ * - SSL_OBJ_RSA_KEY (AES128/AES256 PEM encryption supported)
+ * - SSL_OBJ_PKCS8 (RC4-128 encrypted data supported)
+ * - SSL_OBJ_PKCS12 (RC4-128 encrypted data supported)
+ *
+ * PEM files are automatically detected (if supported). The object type is
+ * also detected, and so is not relevant for these types of files.
+ * @param filename [in] The location of a file in DER/PEM format.
+ * @param password [in] The password used. Can be null if not required.
+ * @return SSL_OK if all ok
+ * @note Not available in skeleton build mode.
+ */
+EXP_FUNC int STDCALL ssl_obj_load(SSL_CTX *ssl_ctx, int obj_type, const char *filename, const char *password);
+
+/**
+ * @brief Process binary data.
+ *
+ * These are temporary objects that are used to load private keys,
+ * certificates etc into memory.
+ * @param ssl_ctx [in] The client/server context.
+ * @param obj_type [in] The format of the memory data.
+ * @param data [in] The binary data to be loaded.
+ * @param len [in] The amount of data to be loaded.
+ * @param password [in] The password used. Can be null if not required.
+ * @return SSL_OK if all ok
+ * @see ssl_obj_load for more details on obj_type.
+ */
+EXP_FUNC int STDCALL ssl_obj_memory_load(SSL_CTX *ssl_ctx, int obj_type, const uint8_t *data, int len, const char *password);
+
+#ifdef CONFIG_SSL_GENERATE_X509_CERT
+/**
+ * @brief Create an X.509 certificate. 
+ * 
+ * This certificate is a self-signed v1 cert with a fixed start/stop validity 
+ * times. It is signed with an internal private key in ssl_ctx.
+ *
+ * @param ssl_ctx [in] The client/server context.
+ * @param options [in] Not used yet.
+ * @param dn [in] An array of distinguished name strings. The array is defined
+ * by:
+ * - SSL_X509_CERT_COMMON_NAME (0)
+ *      - If SSL_X509_CERT_COMMON_NAME is empty or not defined, then the 
+ *        hostname will be used.
+ * - SSL_X509_CERT_ORGANIZATION (1)
+ *      - If SSL_X509_CERT_ORGANIZATION is empty or not defined, then $USERNAME 
+ *        will be used.
+ * - SSL_X509_CERT_ORGANIZATIONAL_NAME (2)
+ *      - SSL_X509_CERT_ORGANIZATIONAL_NAME is optional.
+ * @param cert_data [out] The certificate as a sequence of bytes.
+ * @return < 0 if an error, or the size of the certificate in bytes.
+ * @note cert_data must be freed when there is no more need for it.
+ */
+EXP_FUNC int STDCALL ssl_x509_create(SSL_CTX *ssl_ctx, uint32_t options, const char * dn[], uint8_t **cert_data);
+#endif
+
+/**
+ * @brief Return the axTLS library version as a string.
+ */
+EXP_FUNC const char * STDCALL ssl_version(void);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/Makefile b/trunk/package/luci/libs/nixio/axTLS/ssl/test/Makefile
new file mode 100644
index 00000000..56c711f1
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/Makefile
@@ -0,0 +1,97 @@
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+all:
+
+AXTLS_HOME=../..
+
+include $(AXTLS_HOME)/config/.config
+include $(AXTLS_HOME)/config/makefile.conf
+
+ifdef CONFIG_PERFORMANCE_TESTING
+all: performance
+endif
+
+ifdef CONFIG_SSL_TEST
+all: ssltesting
+endif
+
+include $(AXTLS_HOME)/config/makefile.post
+
+ifndef CONFIG_PLATFORM_WIN32
+performance: $(AXTLS_HOME)/$(STAGE)/perf_bigint
+ssltesting: $(AXTLS_HOME)/$(STAGE)/ssltest
+LIBS=$(AXTLS_HOME)/$(STAGE)
+
+$(AXTLS_HOME)/$(STAGE)/perf_bigint: perf_bigint.o $(LIBS)/libaxtls.a
+	$(CC) $(LDFLAGS) -o $@ $^ -L $(LIBS) -laxtls
+
+$(AXTLS_HOME)/$(STAGE)/ssltest: ssltest.o $(LIBS)/libaxtls.a
+	$(CC) $(LDFLAGS) -o $@ $^ -lpthread -L $(LIBS) -laxtls
+else
+performance: $(AXTLS_HOME)/$(STAGE)/perf_bigint.exe
+ssltesting: $(AXTLS_HOME)/$(STAGE)/ssltest.exe
+
+CRYPTO_PATH="$(AXTLS_INCLUDE)crypto\\"
+AXTLS_SSL_PATH="$(AXTLS_INCLUDE)ssl\\"
+
+CRYPTO_OBJ=\
+	$(CRYPTO_PATH)aes.obj \
+	$(CRYPTO_PATH)bigint.obj \
+	$(CRYPTO_PATH)crypto_misc.obj \
+	$(CRYPTO_PATH)hmac.obj \
+	$(CRYPTO_PATH)md2.obj \
+	$(CRYPTO_PATH)md5.obj \
+	$(CRYPTO_PATH)rc4.obj \
+	$(CRYPTO_PATH)rsa.obj \
+	$(CRYPTO_PATH)sha1.obj
+
+OBJ=\
+	$(AXTLS_SSL_PATH)asn1.obj \
+	$(AXTLS_SSL_PATH)gen_cert.obj \
+	$(AXTLS_SSL_PATH)loader.obj \
+	$(AXTLS_SSL_PATH)openssl.obj \
+	$(AXTLS_SSL_PATH)os_port.obj \
+	$(AXTLS_SSL_PATH)p12.obj \
+	$(AXTLS_SSL_PATH)x509.obj \
+	$(AXTLS_SSL_PATH)tls1.obj \
+	$(AXTLS_SSL_PATH)tls1_svr.obj \
+	$(AXTLS_SSL_PATH)tls1_clnt.obj
+
+$(AXTLS_HOME)/$(STAGE)/perf_bigint.exe: perf_bigint.obj
+	$(LD) $(LDFLAGS) /out:$@ $? $(CRYPTO_OBJ) $(OBJ)
+
+$(AXTLS_HOME)/$(STAGE)/ssltest.exe: ssltest.obj
+	$(LD) $(LDFLAGS) /out:$@ $? $(CRYPTO_OBJ) $(OBJ)
+endif
+
+clean::
+	-@rm -f $(AXTLS_HOME)/$(STAGE)/perf_bigint* $(AXTLS_HOME)/$(STAGE)/ssltest*
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem
new file mode 100644
index 00000000..7c8ac8af
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCnZdk20fYWh8O6kDTt0AuJWyp0YIrb7W1UNNMPXI5wA4J59IVj
+Nmk5wocm9+Hqzbg7rORAN/mHPBhzLAjhnm1HODs36hW15DtbDkkH4wCM/Tsyv79m
+n0xq1V6peK3t9vi2D4p/IRjHkYR2jm+BeknopijhY0kHHfpGTHa2DnVirwIDAQAB
+AoGAd4Ia5SxYiBU9A0BYyT8yPUm8sYELIaAL4YYk+F6Xwhh/Whnb8MyzquzaGFP4
+Ee30jYYNHlvX5VheDDtvy8OTN5FgKNNdzvW15iA4Hxje04ZI7W87G7OIxm7aYRid
+sG4XqZBtsOdj33IRd9hgozywGJ2qRqS6nn2KxRv1w07RniECQQDZAlKxijdn+vQ7
+8/8mXzC+FwQtzeTUCuLrBJcos9I/591ABoxYkWcYLxpFqgCEVwb1qfPBJkL07JPt
+Fu6CTnBFAkEAxXmUBs47x5QM99qyBO5UwW0Ksrm/WD4guaaxzQShMt/HzgJl613z
+/x4FtxiQJHAr6r2K0t5xTJx89LVKuouYYwJAImue6DAvJ5wDfzrtXo28snn+HLHK
+uONdKL/apgcXszE4w74GJsoxWwGlniUf3d3b6b1iP2GtPyIDOJjpjduZLQJAE4jS
+VtYB3d1MZxxQLeKxqayyuTlcr0r+C79sqT5C//hZGIzuLhlOMLd0k0cvwxsBjSgQ
+2ok8pfp49fAVI1z5xwJAVmJgLc/mSti5A2q3c8HW8qvMJEDPWbpb7p8pg4ePtpa8
+EE3TO4O4J2H+k40C397km4yZXdkNQsiT1zVljJZpiw==
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.cer
new file mode 100644
index 0000000000000000000000000000000000000000..9c9936b8e98d0b7475e522377e64ee5cb7d9858c
GIT binary patch
literal 483
zcmXqLV!UtA#OT4q$uKvs*kYO0(kKI7HcqWJkGAi;jEt<T3<f5KMg|6K%%Ln?!kUQ{
zAwIzh0Y&*)smUb@F8L|xl?u+OMJ1VOnaPPIsS1vzB^mienI)A5a^k!OW<Y3eXlP<$
zY!oHVYiw+2U}OyCl4)w=d}P-#vNA9?_A(eWb}}_KGAvKMX?F3OSo`5!6HMM-;O>mp
zDoN<N{Wdqm<T8IuUjcJd<(JlEvrNlF?P}j2zB;?Zdd(9D^PlZD62&?k59j5&TUeXF
z65aa5I-1Xu{V_w&Uu&cN`_tz8WL=G0S+Vx*w;$X1yXqAsj!$eU>&tJf@_eyO<6*KV
zyX-GFpR#RyrAh0Vm>C%uk(~z&JZ7M~WVst|nJiE@P*UHyEW+SG%xvc~wa?bgyU%&o
z__O9cjynut$9A5`TwES67IMd>m+OQ}^u4t{;lgJg9l!sr<hS6(t0&gyeEuXn;qTl+
zqd9e9cYNGWhP3y5*xUak&Q$K_U#W+44D(rL9oX`UJ$iZ2>3OSV*OvR3NHYY8-f#GI
I<)^zO0PSqO5dZ)H

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem
new file mode 100644
index 00000000..86f65971
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB3zCCAUgCCQCdbnM4pjqlWjANBgkqhkiG9w0BAQUFADA0MTIwMAYDVQQKEylh
+eFRMUyBQcm9qZWN0IERvZGd5IENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0wNjA2
+MDcxMTQ0MzJaFw0zMzEwMjMxMTQ0MzJaMDQxMjAwBgNVBAoTKWF4VExTIFByb2pl
+Y3QgRG9kZ3kgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQCnZdk20fYWh8O6kDTt0AuJWyp0YIrb7W1UNNMPXI5wA4J59IVj
+Nmk5wocm9+Hqzbg7rORAN/mHPBhzLAjhnm1HODs36hW15DtbDkkH4wCM/Tsyv79m
+n0xq1V6peK3t9vi2D4p/IRjHkYR2jm+BeknopijhY0kHHfpGTHa2DnVirwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAB0LgNo0oCcwIie5plgwwFybQ8x95q6e3wndM/Mp
+3gjcAFbGuchpo3dfFlTcRI0KyERb3q1MVxPM4sff9nT7EdHVyK9s8/ITkP2dcTKc
+flbcTEfJVIeM8L2P5F41Hvn9GuGcMW8EmsC06gdbp1LLnqsdrXdMNBsAUBXfgPrU
++UcZ
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.device_key b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.device_key
new file mode 100644
index 0000000000000000000000000000000000000000..4e981d143e1383828b8a76e18c57e0b0f59b202f
GIT binary patch
literal 609
zcmV-n0-pUaf&yIv0RRGlfdJGZ4h<43zjh$NmAe*gFd;CkIEWYaUz#Bpms2~d;TZ=+
zk`Pe_4BeOCv@NwmC65?N)gXrn?#|TyB9lU`OINiLyb68LKj!YuC$?l`)u2L1ZuNgc
z=Sux+ln*4$Nfhl{gttWP`YNkiPpo0p0h3)_$nwg2s|lRS$t9_kyc+@o0RRC4fq?*^
zL=H=j!{3Frp6Ni0WB0Agp#h-CLCM~qOnu)|K)UjF%r<fVRLj|liDwP<SptGae;VJ_
zMhe!}k{!Dh@96KmOI`q<?WRqvvfO61H={0;KF%Ej{gR}3kHpi(rVmH`Y?3%o`Hd9A
zgG6g{q(Yvh0YNF%rC0uB-yx7-xur1zK>+-Ic-(fn!L=2LAE_OnV2@ezYPqfv?7EVw
ztnGa>p_(hpRr+n(N$Ooc;-Ug;rmFgzfA1^_2-*k;^0%11vl#+G0M`^95MJ-`(OR-i
zBA|9yFh78sA*+l|0wMujX*I%@o4%O>ok-BGDtQP3_l0oh2@5c16ixpA!QhEf#zLZF
zQvyK%tS>_pbrT+q^2G&mI(6scS|AxC&V>TLsLms2K>j$f{xgTlW2bz`iWbV^SZp~M
zSQa|OOK(li0kpVqV}#k^0zZ3z5inI#a)-o>oxVh6us#Gh)Z2ij5G5&LpFzr;@!ous
zU+nPW;~#)v8B_>M%wA;<W+FnTDWWP&usbLS7Xm>5u?2*padHnE!MbMQTY+(0Wgg|0
v3cKQF;e2bA5N6M*E~R!7Tl|5&J97n<934}R7|5Rx8jwm@UwAr_9k^bwbVnG3

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem
new file mode 100644
index 00000000..2bcf5e37
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDUIg4NEiu/diDAlbsWbTAhMKw4iBf2X5ohGJdTO6vhGQdEkhBR
+Bgzdl9+0LbVDJY8YStUghwnuztT+IpNCrUtXtRK8Cn3QP+buzSe2ZGPVoEJIbvV/
+QudK/WuUDyTNSRTtW4S3RO36KqtbT6xh1QGTXV3I8sp7qwmcysklqZW8GwIDAQAB
+AoGBAKBEDkuPw9+Ftp7pQIxj963LoQGgyEHJ3p9Mfd9TQLrydsw2cf9Uy9mKiWcN
+9VkCgkZ/Gt/VRgrW1pIduxXv6O+8S14An+2mTayy3Ga1N6MulD7OHQP9kqR4j8TT
+xaYPR/1skjhQ+Y0Uw4NEa3OkQp6lAUEp1aVX/mTfIZBguaUxAkEA/H543Ha6wbUV
+iB+pHaBgj1nzarmuEey6kqqs7X0zoZory1X6bdpJ6l0/4qICa6aq+pt/7ywJCNoI
+CPK3mL2zGQJBANcUHRBe7/HRWrJNIqB2WDA/gJshq4xOAiIBXWk1wpabvpkCnUjQ
+rip5CAL3hXDnCQswZxRN/v7B4IlSxkKiY1MCQQCsL0MUdRMejfLFBXI6defjWiAZ
+I86FAr6oziNnQP44sf4zh8pjp3zIihbK4lhsORhYFjrES29NzgG0uHBjhNnhAj97
+gBEwVVNyh8SMnb5EZbA+BDjU24CmECUpYZ9Bypzx3nyTX+zw4uMfgGAZVAhLzF5l
+DmYiQqcpoipMsDsoCBcCQQCxBYSicXIPG8G6ZuFbgXFcZR7llgq74mbhfGuVEGbP
+qS6ldhJb/IG9O3MFlRwdU44YyJ8QGpBKWF94OpIduF6w
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.encrypted.p8 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.encrypted.p8
new file mode 100644
index 0000000000000000000000000000000000000000..8b0a7eb4117de421cfb917de7f03055fdfe2c28f
GIT binary patch
literal 385
zcmV-{0e=24f&qOn90m$1hDe6@4FL=R0Wb~(2zv&jLbrq;i2?!$00e>oTecB0S5Ch{
zHl7H=qA4HIOB;)ah$8h!;8it(u3j>D`liQs0*+k*%XW@PAMoO|ZVtaORrZR~IdUoh
zNf*1NZ0jCJOsIuor2Ouh<c)ot>Y5SBS)gmT$Plt&Ub|ujkSvY}HF3T6ZV$+;=Cj1_
zqiV0Xy#~l}wq>xTcs~vcY@+sZ^yo(jDeDIm8}2%S8s3H&bnWkZz@9kPK8*&28D$i9
z3|2M?_7i99)`(fX3rvXr@m91pnk>4N^QQR5XPP=(qj)V!5qKV+KU4NR01UFqcL=0O
z<WqeKmP8KC*)QM=McME}H<QCTa_BX@namc)CF_|xU$3*#>)<VdUvKAmO0=-igR~fl
z-mO`%dym`o6F9p4n$=wvn!II#&PnKR3lXVbV;jds=xH2us6!2fitgX)P5>N0{uLA$
f>0oNt1g(0Zzb?&!uhc`Lu&kDME*dK^i&ZfFoN%%v

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
new file mode 100644
index 00000000..19ca3c5e
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
@@ -0,0 +1,11 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIBfTAcBgoqhkiG9w0BDAEBMA4ECN+YmhCv0ILdAgIIAASCAVu0QEfMkp0xUsNq
+0Ek4Nsa/uxcs8N/2P7Ae7qCakkvsdRvvPPH0y+wuj5NgrG6WpPeeEx9fI2oNNTfC
+pwncH0Xm99ofVrgMX6XC45LDZtzXNSZd4TdBP6xvlYXbuGegp5GPJ8emzscHCFhC
+JfPHemRAcB7DhiWukPosuSUr5R8OluEMJrQLHuQtlDAvMjLEI98lSchPxF8LKCk3
+SS2uCcmc+4WiR0nHG9BOaGi38+PytHAnbfo1mfVSQzLfgLicMAVGysfQ9QOgpQOO
+ygYfM/s7Duwbl0rshyXVJP+7BpYJnPtHvO4BTiizU7ZEr4WBiEnnANDrupSdsxeH
++cxZo70YJVdoPdgMd2ke6EIkUhp7HughFg+okldlEtJA4muKeEzwAxZu0TqxOtZ8
+UYRS4Ygk+rN7Y0qTKSYwSkrFBwUDkpctYjRUOeAZ/mYMKWmMn1ejAb5Is7bjEIxl
+tw==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_1024 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_1024
new file mode 100644
index 0000000000000000000000000000000000000000..5b6ba1d037b002b0d62c9903a3582daac05f77e2
GIT binary patch
literal 609
zcmV-n0-pUaf&yIv0RRGlfdJUxzZKr<ujtkN3#h2G*G65ZCTt9~*}TU1z<AL1R%Q4p
zNDg}orX_ypdwFj-<+Zo;;GB_Q^ak@l9{G_OsV_%EwVNK?_Np97c_Apvs!4O%2?b07
z@=Q%^9Dt`3kwp9wv*G9CPei(m!*n_5OwiO!Bw@5bm5jg&w*omag_8mU0RRC4fq?*&
z2Xf`Ut$925Gc1k;_!?`_=#ljn2ibyLT-73>o<ahDi_O0Dg;Mq`)d|up^epxVg@F0o
z(9Ay~F%|Pk^0ne=nFIt$A={s!R9gDv+4%<r|C(i_>+(m=R>yKlNL=U?*N-L4Nht<u
zRC^cPp43zD^`3<#q3b>AFS(rd;edexK>+Roc*l5!1eeS<z19)p$2r+FQF3pJ56y@&
zGn>b!19#biHMZR!!od?jgH`Kb>w%687GkutJnIO6oO#nY%JBk00O>_vE*8v_P(ZeM
zyg1-iXi(EHbBv5C4uMLFyUg%pG)A8XeImB`MyyvOj2`RL1x=`fYG?MQv8#^3@9%x^
z!va7r##ufX=mK*A@81nDOXwG=jKS!Mks0{(q_+)5_cTxgUJ9@&6s`anfHIu5fuH0;
zf)t=Vi;POuOB0>6lS<J7KxB-AcVSv{5kI4-8;ZoBT0EqiDvD){XHGG!RY3$vodW0I
znSatS=GM4`*$gKLft$3<Se#LW4##aYiBQQ8a{@sC+TLCotQ{TKxn(8*_0;4jgoZBw
voIwCm;YX3cQUy*AFAd6@J&8fT?w_INouunUf8)!fYYO6iu!megu~88nIFuu9

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem
new file mode 100644
index 00000000..4f5ad4ec
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDY4L8V3uqv6NX9C6ios9dGXacmbAy12bzG+MB40PZWZfgpSA57
+C6Ylfuh7eW845bW39OCckWD0BvNAHvmRGakvR0O1mx7c9qocSXkhKMuqSXPZCQVM
+AvJMTWwcgKcUkUT8ErPh5+NPRLqMw3Q56EzQ1EwkYbRAlYzACrcCOTGFkwIDAQAB
+AoGBAJQHcuW+rXk79zMsjgX4GmvQ6JH1FgfZglxc1SKhnkICf4vNvvSFUvYs1QnS
+LPQs9geFgPnc0Mw/IjEV80nyteJpmQQESSHbn6FUWvrk2fkHBf+aZaTr8kfOVsdy
+SUhc6BTXjyXMSSkGalR7F9ye1FPw9Z6FJaHrPekvuZz24YCBAkEA7gJ4x3iFBJfM
+Nr3WEeLHOdk0UXJvig/NiDIzm8enA3fZgjW23R/CwRNAg1XrYOuBjgwWYrS0POsI
+gJx50zjK8QJBAOlFXy4WzJNQQLZ5vDjgVmhQ0y9zjIwqDoFKirvM8GQ0Rp8HfSK2
++UasVyOMHuvTBU2og2pn9qaxq47B7+998MMCQC/GWT4Y6AJzAe/fDTBL6BepjMHo
+iZEZ+PSktw1G9zRQA14KsCkUrgAZgDKctYGf5EKCFKA9i4xK1UsTnbSTStECQGSM
+g3dhWnMRP6OoG4rEoFo8pJsqimWMZ04xrFVBBEmdAuffmX/SMObWuITZDCcIgZu0
+zFicUYQOx200iVDJD3MCQQDa3l4arB0d17llJgD11OQohIYvAJxBAFLhR5HAUgVO
+Dy8Nyps9iUG/7p+h5p2k60V/48ukawrifrCHXECxUREd
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_2048 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_2048
new file mode 100644
index 0000000000000000000000000000000000000000..0af642de231ac7143db034bbf595842a2c7c9f85
GIT binary patch
literal 1191
zcmV;Y1X%kpf&`-i0RRGm0RaHQpugMt&u|7rv!C9LJ=rhBH$C@fYh{Ath`JqsrwVq?
zA;rGwdz;vW#=#sA1YEwE5j|QuiSkR15=5=(@4UbWOLeF_S#o-F8XALLbhnX29W0$0
z`^6U}4UEEJE#HKhq!Uh&FZ9AsCOsK;yP?!b@<$f99GRjI+k0MRvI+F2GfIq-0(2*<
zI@+{M1%IXd(F9**b0+8=WCc3!R90Z=+`AS3+BF!K@+u=)cS!#laK$+W*UPbkBh$%E
z9O&R=BhkV~W3pb9<VuK(GMUN@H5A*RR6xg^y^H~c@T)cVq-y`~U}DSScugVtmfbA2
z%+ls>0gAIAV!eeFdnK&`0|5X50)hbn0KrYIAk0gtB;cu1_*7~DLp$s41j1L{dy$8u
z>Q{6SrHuFJ5=4!AZ6f&-rB0VNk}EF%GnIau0>!zBGX8BCm(}Gomw{5otF4q+j_!<A
zA=h{AZk~4g`j6L?T^{Yz**r_c%{<Uom4VGA)ElHC2iWJK351mkRrSyH2>p^p<y5Eb
zOBjO$UMpQTviHZfS$yQJ6M%Cfuhel4SaiLNcOaOyoHLWio(XzMG7twCcX0Y8M|39W
z+&6JA+(WFM&PHD|dMS(Io@O6sR>1sm3^l)5OV-`8fG^47KzM3=dOYqWQN}Mx08R?P
zYG(QI^V0Ya2D(mOH<Fm=JM%WORRV#50QFY9`olPt_GFIfpq;w+5p8)jmLY&XujUa(
zNK6FB1Jl9zg3g{m#gz9CDvkuEY}qmL$s~q<;8&D)3AI>Z6n3J@*&>6Q$zUudW;ASZ
zQzH5(Vi)P&Q`Izs^HP*fY*{R7YiqEtv!@<vIoO~!5U81Q>=|O8tlwC^M*Cwj0|J48
z0LvBOMMw2v^dO~mza7xFv4n50Qe?_on9muo``SJVw9twDxz;$tm3C(+A5JQ?3KbZA
zjJgHmx*IBX4Ilw`JwQ-@w86>Eta4z4TXD9^xK10mFm*b9*FGd6pGoDEYM0?EA=1$?
zAh{7-VIk);QUektIB7B1=h0D7V+h(3j{<>!Ay@B-IXxJRi!d!JY9)Q_y>BYaL$g&;
zytn>PR~(ZYzYOl@OGA*<38Cgn$53>6_^#wDST1{Xw-R%AJ5f%kWK&JFV-I!P2AUax
z?0^i4+Xou6@<J21TN1ArL(%FosgLr?w6Q0^2j_=UV^ON-YO<(4)L3Q_Ev>fpn6>Md
z0)c=X@A}4A#y*Q%XsE;Fq)6I8SgLZZ^7^m458-?+{^(mFM#e>F<Mc@jEJw)Qpabk&
zk-(@&AL%0<FcdiX7v4DpOBt9>-0j)c{*7c|js3Dusa$NJOJF%*s<_@CX`P5&9Zxl{
zJ26krm{pSK35pUk>#y4J{_H2XK9P;o*ErV#fq*qDV<*E0RC9D5w-*D^YaVVcH?W@L
z7s;4%??z;ZXmnf~khf-nE#R3RkTMy<Ys(iy6@Wfd0%%ES+FRK!(pr8S74;YA5qiqe
z9XPww4_waym1wD)8+izPSjO)UCz32VC$bSAw6U1h<^ul<(2Tl{`W7ruei79MT3KX_
FDTxquHyr=~

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem
new file mode 100644
index 00000000..beddb721
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAwqC/2/rPcAZEs5/ejT3ZL8Q3Pfdna2WC44i6HYCnCnbOIcW+
+6Xub2IXGwRwQBFy+mRE9WjqJ8kuOEkSt6e+8wAhLdag7WXJ6cxoag110t5FEHSyd
+GfvFFyUNjMJhLd+EmaQTTpEv9MJPJj0Zdruh1EjyRxa4HJmiD9t7XmWyCfSmM0qM
+kgJ0J6s62rRMBX+l/NEEX2VzJugdZAU671RWYOncuxX/2jUYlvIqI1l3SP8acMU5
+BtfLsYMj08lNHOjgZCPRwkdjsl6U5EqIizKZygw1FNugVEDHnL2MAYXwqzX3pGr/
+72Biy+J4TSH6lt0stszS5m8BirMgYr2FFHslrQIDAQABAoIBAQDBTa0gzEupJOCp
+UvhUagBDO+vuBMJX3XuRh6PqV3QQpYz36BJEjXttIvkTpU6XNpIrLv8zlX6bAsW5
+iTL+bRiX1eU0l4FSxqutlFiO7oxVIdd37m6edvv6j9eUXR7t09k8S8TNPNBXlYHN
+JdQbpCIH2OehCYSVC1X1z/UI/ZJF5VSn7UsYgwReK102svfHtll85K0TgHMir9Rx
+Dlh0vYx3IJi2nDOTyJ4JekkyEAcYd3D6JUd0JujcN3Ev3EOsns5GXzN6KYvinmYf
+Z1bA/HEMNb9ZS9bdsoAvyeJAeGp8ejzuJVHGL0kATgrAamb58fPS+A8Guk5eN5KY
+5zvzNrJVAoGBAPVWvPrDOJX2ZI7poJ269xFteTWWIYA+r+YRRkhMBMcD08H5gs6e
+QMWU9w8qjgSmbNkx8skkhn/gV5R3CbVYYRR2osrZIoOayWAsJmY0bHFTIvooYhfp
+3lPVNIPzUpRObFksamtrsK+zpx5qOdigNhComXLsGWKfrN9Yvkb7YzIDAoGBAMsV
+4UVH9WH0IKV1vx3QtrGEb69SZMpbmM8ZsPvaPgq00In9udY4w5V2ZygfTiq0ChUY
+fYy6BeO6Gyp2DSABdz1AUH+0wcnNrHJghFtxtsq4Thu4MHU6ftc+JCGfSeWUapfh
+KiHS0TEguRFcYSHnM1IDEiU4aTHY59FRUWMI2hKPAoGAIVfviTk9GIyLMC0qaiV9
+7L1vKsxDs1VRvLf+UFcckxu/DO7nS0OQ1Amh5krHUHR5+K7kK1gue3S3EnN3O1FO
+qGRTTbRjD3XbBpoZgeyADIrbBxqz8kITuFsSrxhD0eoyqY/yyrSxJ8AH54dSY1Gq
+52qyqD7UWGYRLa229pi165cCgYAd7/rGWMY+i1toqMPkpEjaQFiqcq3y+q+7D+F8
+Lv7oWyFGxkVn4/RJCyxHyN2gA+xckcCoRx/pIx0wFDj5F945BEsZmE7c7dnW/o1k
+YY39sk+pXGygS2A5YKq43h9pnYhdHU81rzsxT86YVZLoCYoSM+uv2vH+7Ce4PpGN
+1Nc41wKBgDUrYyfDB1RzdB63FwPRax5uLjewnuMXyZhy70ZkiGh0XBuQt2aCLeCZ
+HpAyGcJryxdDFYA+UwJoSWjaW9ku0lp+GxX1F+cResrRHTi70w9czwGVaKmcG3kI
+fFjG7w8nkiw5J7IRH7SxmNbmAv8L0Iy6jvoWLFB+EdUGWllkjCmJ
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_4096 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_4096
new file mode 100644
index 0000000000000000000000000000000000000000..c205382ab7aff86732f3dfe2ed465797770e4de7
GIT binary patch
literal 2349
zcmV+|3DWj3f(a=C0RRGm0s#R0C$yPeD$39>4Ep0;5M@#wpmeJ?wh-{#-F%}3)vYB3
ztJJUoqYbWSsq{2`FhC1&(<a<tgeSWWIw25pr1RUCV&A2S4ez6)T=|?mmuADrvY&pF
zomJ1}w+D;tT#z8mUzcUMuk^h+_r*lQN?s#%9QEsbW)ZIp`UhtqP#aQ!kEnM5rgiw+
zVXhXV##-lf26+ze(d0CgK;T>maox?BB8At*_qHegN_Cm(UerlhGFqSp+Cz&}#6X`{
z2H3(|N2wGExlD97fXsOeCn^W`4Pn++s+M#D>;O(~wfl~y;qgj?b^u`WqW``cC|ig?
z96y!M7XS2>*B=ru_+Qy_9la*KLK^5a-5uR~wh=@#U7Tn=6AH}gihl`NTe>q(s6__@
z%!kaMhJ)^ct&_f>W0CD_-U+Y4I0SM3pkv<ZUM50cmf`*AW}TkzA-Px;K=#PVY$>J2
zC5#@2b&4ibCx^XoK}a?;7P^WLB95^r%-L{Z^TI${%`T)LB<vl>-5txgX;UR9*9tfG
zp0JoMr}gZ3&ElIoiQP({zW|?|<qCYxgEPW+m{-!lKyNF{i?GZ&5?H4HS_o_rv^_g}
z1|s4$-6>Q29=N}D%WseeY63jXE#yASA&jVGam|+W!jT0{up!{AH7z;XMwF|1&oLlT
zI<O0vxi@-$!>f-10|5X50)heo0Ic&e?J7A6sOJ1oEf|dfVdPFl7nV#Utbk!IcE+x|
zwzL2mzN#?8R)=NF$soY8eCHCB3H|LyF9zTm1EmhU@HP^xA!jo7)<0XT9bP4MXZ}Tg
z9vpLn130B*c(tPYd~`tvpU+SK#<q6ah=JDbVAYrknEh8M^Y1I8UO9}IVCyR#x|!&b
z>>$+(${mFip2Fs^tL+p5xrw4e0R9cryNig*Qm99AT2>K`J_ZtV`sYF+WVfz|JC5a<
z32|_d#wA0pmA>Jqt>Mq+?{md{55I*UK^tnI4QyYb3M%J`W?RySWV>v6a0W~ptFc#8
z2+k-`_?PuZljI(Z0ycu)f%7=#+3so6_4~q}&izudsVk7dFnzrcH(x^A=H{OU7it9{
zgYY)1WTAuDc>i}P!P>*jVZ-o?Z5mw5N5SWmc^m+(>O|VI_8zn(F&6&QuB}9w1$fl;
zoTz0hq;ReN$w<NtWWC!14hB^a8Xi9!BaVwUp?j%epJ~(jIRU<1{B!Qc1f+CVAfm8X
zzW7_DFc$Jt_)RoWa%U5x(ZBv-RtVCp4Ca9IE)qxU-_?f`G1C=o_xTPu?ec}uqbMeG
zwDwt>nV{J0^Im88if^GkC^Y=)-Cng#lZ*eux-L-x(rbUK01LbXkwx0H)&siZdBsGY
zPMq(uI&?)?UC^J;$pV4_0RaDqB(do1D>>Gq+(e`t>wW2jmbau)pXl!~H>zdxJy}70
zFQJ@~IHF5WD^efq<~`Y<fk&Y1BxqN_N@I^$i0n?-tb7Fb-?WQT_bb5M?{l@sb3v~5
zor|n7Y%h;Yg;T)WVfpdNj5+jQ^`+Cw6yG;WJ`5xSo8oXW1pP*do9sLY98Q=2*WS%6
z(eO|=Wc@Y6wKCe59xhIQ(j+u4zQBSk60*m!T{n|YMBStyr50qjdmS6L5*HGb1n_@^
z)IFU0YSN9^Q1r6#E2Q&)vXf7?b7S2Y9=dUrsV%6B_3nD>-ZapdE=Lvf^%`bxIV>8_
zpi17`dW!e<P0=9v--`l*0RaH~o%(S5)|8yA%@ZSn+}<+{P^X!XdlTllVU|Uu0T@tN
z@fKl-Ilj&F4kT$Ch4S8iUd!V;PV7GYdR!%(VXU?VI;vW)70*A4ocnPvw>m{S$qPsQ
zzinB>N&dd23n`lgx*LKC_VcD7mz0m(-cw6)yAq_15GEpUr!x{xm4s%+;_{m6IW3%P
zUSyYXejLf2KjE=<FLDIt@%w%ER$XQ@Tig%q&MX$6w1}w3x)8O19*~1WDbY1eQr#I5
z=|wC;T?1)bZJu%-6IZ$uv0M3f0VJOG*wd#j@&zmbI*~?~v<4w3$y7mKk16}fU|5fm
z!y0(4l>QU6-!scDoFt6`f&l<M92oL<Dyz4=P8q69xgpd|*+`ZMbpX;E3E?ju42rs9
zzy^61(O?4T5xL=g0}+_-2gHLF$OCxvt7hKfbRgoYgoM*?_`8M}-?4tgGtvwZ2kzHl
zc~<%bCm5kq8ql-T=3`3x_~20|(H|8SPB^KZHe(u6E{?<-VvV=xdzMdYm*Dj#!l$Hv
z+TA83c<SuuL$iFs>+0&(85wU;4{*%q6qPV8GmC(8`8*ZrUuiq8z;<uqrK>aBT#Uur
zDKGrMBOFWEVn`AV4MGdUv>t%IN_x}+7WbM=`KGAls{0t4O86`nN}ZmdaAZh%0M=q=
z(+Zh=EN$fYA?`prE2p~xf&l<!N?Pv@tG%xb!nN1gQvz*i`&$@+rIHszVbjH3A`wHj
zMg;j<i~Q@$cXBog=`6PPPiAFUE$JX&w!K&XT2jn0P?DMj_A<eNtn5uV8oBJGW0ZJn
zP-J3A2zzp=?#<!w>+H9=lOdxG5_)MY;GlVN!q)iERlQWT;`HHkO%rFj6$8Eo2%|Sb
z{rF3nAU+<!M5+{I6($_L6>bOCGW7&gx08o=COjKnG9OXBv*(*XA_7DIoHpF9f_YHl
z6Rf__Wk*KocnrQNJq$tmKXqr5#tV-L-)jzV4sP&t6|KgmadNx7o=1RY_L`XR=my%F
zxJ*{_68OcU5|vB!271W?f&l>lq7j)r+-H%^f<*}JSZVtPV&|7V_uzNj4B0wPZU%(I
z!-#xJMnItAM}A*#OO?#rh~@QE<UVabM)xiI?Ll>Q+PsjlRKVqeTyM#dxk0l02_r9_
zBsL~(g-PWYbR%PVYD*$Dua&VxhCu}x`T7lBNtJ2|fQF1p@+xlc!^9lFEq)(oD{-AG
zM<Ua4@j|awSC=6fyN?oZ>v3>^$8)&&Cqm9W>bB2ITLy^6lMzc_-U;tIQITU0U)4vV
zu^PNP`(&Igf`#YYx+c>R;XC3`YZg5g(tGs#J^3oGTnXfccDQZ1E2^{1-{SxQU()Tj
Tbx&XXcZMQG44N=;lHrQ{Y;S%h

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem
new file mode 100644
index 00000000..9929467f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKQIBAAKCAgEA/Ce0mV0qytAwDPrjXRBlUh2gdKs2thDw3N18owXVrSUFq9Sw
+AaMNrmep9DR9MEALcdMm3GCEJ7sOOiEQcqTz25di36WJDe+jo1z5nD2XZsPIsp9+
+k51Vz+W3B4vsXJAgzV+XZbmv9L0598VEwkpeI3Uc9et8ZhGvDPoHZyBQG1KAj6h3
+AKZ1+NthrhajxlrndQZ5Du/R5DSUQOBcCHHdzZgihdfF97Yn/kp1mele1ElZMlqg
+BtpDi1TEQJ9XBtjCW0epFAm5THQ3gMx5DCcqB/cNYdZWqpZ0AuwATm61+46m4fFK
+g3YAYPOi/74aKFuIQBw/lc8W//SV1x8SL/hf2XIdvSa9QhroNN0d3Xu2EUQzXZxo
+PRMKzOqKfwlZW7ozT6hFBwPMh8yfhoPugq2TvqBjke1s3gmvwTgEcf+gY97qXiZC
+X5bh/ehmnZ7vIblYFUD2yMlsKaXGJYweh3WKJlQnh71wQUg2Mxa6ig8ijrEozNlw
+YfPCQFrNLqQfJOwdx90dy7hpUyUn1wo39p6wmC6n9ex4zeKbO4ndSp+/AJ+d5Qp8
+zoMzwneYV9LBQG8ry4uwzDkSWKb/WghsEbQ9O3sGIuI13SlT/B64v3bLb5AHagI8
+zS3kPsshjKhkcc2W9MKRBU2wIeCsNS052kaUq3rPMSBROrALmLk3en/Dq48CAwEA
+AQKCAgEArPMy7So5Cqjm/FAtGI0BYeRORReWTCSsgGEudsauu7a0ABq+qjDDVodl
+y8kgwLJ85xKUCf3tRy8G4BoDpQ688DYSrCFnMvbWP1urHV4ldWf+RX4eHHODAzil
+ZHi1ovt8dEEHn89P/8a2dtqIgdbuYNWYCpj9Vyjz7yujXjmMmGDrKx26meiS7CDV
+C8odhRSewuawq+0UArmJokIA/g3Tu4uIylKoR3JaVhGOPgYSc/rnQiFkt66HO47l
+mQlxcJHGJUOulb7hqK3hz+bvc8V9D7+FH0EbaqANbF+hCirniWZb0odku2x5cAZM
+G6uxV1MIzihR+Jf1R5PkHowCNoLegfM45tnuadP1+8Kezv1SsqkrkMEwfb0QN19C
+2+bmnwYXagUgg/A2q2Shg9h4/3cpwdrDzGHD8IttGlzLR8HnlHkcAK3qRNqy9h60
+JDEW/tOurUSZBXjU9ZyoZSukcK3+yUjCDWS92wMOBlUQGh4/HCOOizahe6lhn2nT
++jkBvl38c+7GBKR0VyCisFi++FukMBbyU/hNNFByZxOj0b/+YVYI0qwM5oDzLhJH
+69/VhxMx0xVt9/kOOO3yhdGjKCZztPZZm5mg2OzzXmf4im+hPSg0/OrdXrVNk4v/
+w7ouUQHSa3+rAAu8BJFF2rTWA7rjecVEnk6c77I6dEVYXdCfz8kCggEBAP+IJLHo
+7Cs51qPcRKQc633phJa3pFGf6O8xN6pl8z1ZQX0voZyROKJLTytSH+zmPdmggUeg
+7CRoV8BKY49YiOxO2Kx8BPfftItS9yvA3O9ztcdzQa72nYusMWwvj0yFU8DbYfnx
+yYw59F/1pdPKFN83Sj4MJAOb4nAxBP1GiZvsPAgcTpf/197NLNHwUDdk/TXDtTLa
+lx4uTn/SJDQuvsCCLBKyx7FdN5NPRN2kIKUWZLd7HRu2EhcSlATwf4TUPZz7atKN
+2FD0svErpPOAspNPtnNj3RgeunGVqS2oi/XueuveNNCYLkcV8/UaZm85LBrPoEre
+23qK9/ZN0SD534sCggEBAPyd+nD71pScrM0TI4Lc3jMNUKeZj3sT5rlhlkWlARhQ
+WPEWYYg5vs3zDiRpG4Xy3n9ey+M6Tuw+/XpcJZxhrLYFOqparxXPP4qc+3EvtzpF
+OskLR/2/bVnESf6+pQspmwW6G4IJ9vOmIJeUj9zeU0txuxKkjhAmInCnMxJOlYRm
+xeLymuo5LZxrXmSXcX4cyZ0/4bF2L3IE5vH7ffdWXWYzW9wP7M4sFp+0iKjHuhC1
+gB6Qg0Mp0TVNUt0ZEelFLEJdA2lbbZ5yHhNXuhOxW/l3ASSe9tjTpy7yBSwBOpFG
+l7QGISfJVEFfjyn7yWBYj5LDGnitlP4TtN8zyy6cJI0CggEAPRwY8ncqq7e8Thmq
+TLkh1E3ZSJYIdQDSGwnhLx4MirpiwAZ5FtFgAugRueF9AxGY7wfEgxXIA3j0q2be
+4nQg4qqEhNNv+LuGGN+xfsQz0gwRB+7XYXlW+gUnGKFTGtCz0+ZjSvv44FEn0R8V
+Fk44qZ02YxpSLo7EG2KNt+h7lk9rl+D1JsKnpH/a3SYkeOrs50OzfMLr6urWGRlv
+UQ9wzOcUlTAuM4uAc/k8FelfaTuuwHZv4qWrM9tcjMXbKS/8wCMcS9hiSBINDUIL
+w7QegL5KetQCFveaTPmmqOWq+xiaSvgsF0qdnqBwZEh5ANZiZtMKmX0sbeT4Ie5A
+OiunuwKCAQBlSlrvDqu9rwzCtdfZUwJtaftbGIGlkhdDYdPFXSIRQ7ZGBPlai/zr
+y3dyNgrpLLb2T2ZlWC3pIGC2vVf/WlLMMVCSmgX2MsGBrOxNOBq57KRjlHhrUGRi
+SAh7cqnuzeHw6+y3uZMhow0Semks4KB5ccLW+NBVvVS14vThdE0TZ7oVA74GCKM3
+Qv34S5kgPh7BRKoUZBUmHL0VbgfWMvUEU7eTh3cmPBteMh9RvbPnmz8iAkP/nDbc
+roJ5UOITrL7QZUdG6XgMvik9DEH6P3Vnk8YLjwnfaw5wDm7wdBWtxqZxcru8nkeA
+ZvaamPDoBtqauExW8xL4xaISlUv1BnrJAoIBAQCiEZk93GeRzYJFCO1YafsGYueX
+Pffgd9wM2TpObgaEw8OIfEpGQKDiR35fb0uVzNyI5fVU5D5tP0b3LfvtQXV12ryQ
+sVTA5YJcb8mRuUGy/AkjL54kNiZthUnlGHQjY3lqSyI1r5WxRIZBBRn5+g1eSZVq
+CYCGjEryKm7vw8Qcvy1+H2crcZ0rRyLTcfFCr1ZXlyEZu48ScOtxcIDHc7j4J0LO
+Peq2z0tbBojGkxFLX94J7zpRkWMPX9VHorEavDv7ZJwtgoXn3Lom0xHhO+JQaxY9
+FtJ79Ps9+SquXAnkhna4bbkrqrPM3+MAAV/S7bd1T1/8d4YiRQyaMHGS4Yr8
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_512 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_512
new file mode 100644
index 0000000000000000000000000000000000000000..7ae50f23bdc90e48f165aff330220508a99699f5
GIT binary patch
literal 321
zcmV-H0lxk)f&o1O0RRF)0MR=zU#S5?J%(*^zCdnK!AXBtb)hXb<-t7<AR5slZTfW5
zJ|nPj{Ge*y>_Lcx{!|rfVZ|0=xRXKgPd)!Gy#fOP009C)0Fimb?T$65*W6;Z_#YNk
zQ@#a*O7BqLt*OZgemVyg$o&?(z~q?GMVVlAY-DAL#~wAJ%@hSVITaeX4+WM10RkZa
z=<C<0-`J3<JRzh6F>2Ex*d>@xxG0k=x#?fIqh)t}0wDn9_HXM@#5)1QLVZv(dI{VJ
z<#zME>JR1d(>*U^;<!NqApqUavgw?9b&=SA#N9<+P{2Du+98<Z^7}$5uflGNb5#N%
z0K;8s)v|{ZPCF5Jp0h0B#d0-gs!3GYZqw9HExe&OK>{HF#AygqJ2JGkYa5*N@$(u=
Tmj7@iAR3)zxTTMr$9H6O@syE#

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem
new file mode 100644
index 00000000..1e2fb41f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem
@@ -0,0 +1,9 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIBPQIBAAJBANE7MF+pAUI9hm1yvkBuUcFJf1d1oS025cE9DyAa0SNt+nTSPiOw
+cPygat7sQYiE/lQVa2HFFmK4k0HxTz3/Lr0CAwEAAQJBAJF5xO2ONajX3GK2+B8W
+VVO+BYNK71DfranJCX46BxXI/Ra7wOSY0UWZYHVsZGWJxx41os0UBTg5FRq4DwWW
+AQECIQDo69eo39iQqjwhpAQxatMh2CWYT7gokyu56V+5o2V3fQIhAOX2b+tQxDsB
+w0J9UDN6CdwI5XbzveoP5fHTPS9j4rhBAiEA3c+y6Zx6dZHYf8TdRV5QwDtB2iGY
+4/L7Qimvwm6Lc1UCIQDDXWrVsocTTjsReJ6zLOHFcjVnqklU2W7T1E8tvKE3QQIh
+AMRpCFM7MrS2axuc8/HzGkqW/3AlIBqdZbilj5zHd2R0
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem
new file mode 100644
index 00000000..8961bd9a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem
@@ -0,0 +1,12 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,B3A0D2BCEF4DE916D0BBA30A6885251B
+
+v8y74AGReaPLmDt6O8wir6hX1Ze8K4fVNkrLqfDMdW5E7jBXKO8riCMNmSjQ9fyh
+eTicej93+8krcIvSXKW18TdO+EWezQevgnLrAZQWaNPH2j4B+K5gm701uiiKFKVa
+1zngAOByePYlN6z4JLbiCyJRhxSo5zCaUYkKC2eGh8mlE64QmokPSCAj0wcCDzGh
+hdhBg1vm0GmaQwIDVn+8zMfahscXVMtBmyQf5YP4PQW2nqOt7aZHjBNdg9qnBpGw
+b6YuY7eZ4FgQvYcsNCi34NroJb9pkTrrF2F9Meb6+3So7jtMFG/YaJdCuXtf01g/
+Qm+XA5pJUtIUr/hLQjhkaOVUtXv/k0o/MR4k5CbAmboLt6YHf5V8+01vk0bvv5dI
+70pVdXMmx26xDZOGmjYzd93PWc+75jak3GN2fbWryQs=
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem
new file mode 100644
index 00000000..7671a302
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem
@@ -0,0 +1,12 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,F076229CDC2BCB3B8722E3865855B45C
+
+WFV9QWzr4tNmD+1OeQ7BceQg5LVQHp20Jo1Ax29lq8JTPzeObhtaU2MUHlcPKHUS
+vK4FyQxJ25CyMubbnaZqCCz9pNbseFuJ1tob9UqRmXkZ8HV3snRjJRbcctD+V9x+
+Ymi1GreXoDQtMp0FtMiFjPvIYciBQnaRv2ChMAnGXNbZXCxWWA9E5S3a+yWzo+gd
+wEcowL+SUac1PEDGHokhKn7nctvI9cC4hE6JmKM1sD68/U3rRPXMGqmC7umqyT5P
+gjWBb1uu0iRjFC9eQUsaKPxey5Be710GFlyf/Ff/tep7RhkryIWEPvIzYCBf6rhk
+3pysFgTjfiUuBYUNumjXr/q5hgdtb75788XUDxKwAoUx+m8gi0nJg35CN2nmQ054
+VJxcZlNv0wqnJ+GTTZeN6fiAhTpVtHsqHQomRSfaBiw=
+-----END RSA PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.noname.p12 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.noname.p12
new file mode 100644
index 0000000000000000000000000000000000000000..9d27999fa053e524fa4ca893c2d13ce9ed49bb7c
GIT binary patch
literal 1483
zcmXqLVm;2p$ZXKW+RMhN)#lOmotKfFaX}Mn9ZM5y6;Qa$poyspA;q?!i76W>l+MJ+
z0HhKSGK>Z?Y+O(ico-QC_*gicZ@+tPGI5?Z6B7qRLlcv+>xsu7BXuG}7WFyS3yN1O
zJiB%z_haDaFJk>AMt=^4KDj&FlSO0x2d<QxS86g>f3KgsbB{=vL6^R#b?e&OS-QcS
zGCN$<U)|R-j!7>J5|-cmTV%e54S!<I%v}PPV|KXlHLx*$yLR({dh!!ry@wxHbn`4(
zrtp2X+e+Js(du58+nw_ke0kN+V{!Xvi_Fs7aa@776~ZoOpZC!@dwTJu`zsGbFtTzU
zV+vj++iuruakX9a|Bea!8F%F+h9C6ZcjM}8$+$o7GhC~-@P|jAoLB4`x8g`>)2?UI
zWu*`8Kl-TagceQVV7aLOe%rD0rav=xK9;Py<7Mxpy7}0RueYwx?_+3MS>c%f$vi$Y
z>qPY0e-jNE!}i!EIz_nZJDZx%Fa4AynB5}RZoGR%m9)iXor<N;f=u>?9S-~7oa}kp
z&%|qA>g?W->CVE3V>Q*gZY<JRHEFfbz3(d?tL<){;r=Jb)zq$UYu|_DE{+Rn%agu3
z3%yNqDAxJ&KPvBHYVlpK^9Np3U%31K+EVcXONOeVXMz#IUMYO>|2(~y2WNWEVzf?I
z<(U-KKKn^n)b)LfN?Z=|E{NH6jr(|qli}4W=1uv^j~B=u=E~*SW5W}$okLAO`S{IP
zm&N{b_Df#*<hYK*$5%h?%<kN2Ykj=tWHF{M&i$wP)aNUE=q~qX4iZd{IXV|SGrD-v
zIiS8g&5U6OdnH3-iVSmG`@wrZzP^$SjQCnA|78E~>e&uoyfd~wEuSU-w(_`~mv6zJ
zXND(%Y3vJ98Uv=jrz}lO4}rpWf%qmHH!Q_*F){%q7Xk(6VkShcPs!1(#%Z>ogb37L
z{j#quvpMaUTGqUyQ-7E)zkJ$hUr<88Ndd{X+aJDG=s(t#T=rr1MYoSPrQV;Yy}z+m
zy?`~c?A~9^kPHi*)!q-?Fa37Dv_6naZgJ(Ox~e3WYP$wqCBy$MnR+L9v<?`a5ep4p
zld((SiSlf=yCE(gW-`xKRMt!}E(zZ|gL(1NxWndoJkcy0{rF>^ugY2xd#-gtrp&?V
z<qeLLc76U^Q!xA5inNBn{EAOMlBSfKT}l^~i<*1fHfT>%1b_dxY9+VRUwb~ASsUAx
z{&$<{bAPTu(cML_!?$=aJkI&ra-Px8)p5DT#2>Fzt$sAlbPs*aYTIDLJE^z&&fe?l
z^Sk%Vzox!;X90tFQ`-xh6V7XQZrpS%wK>%Iy6xiU|AVYWX5_w_yT7M+A7@N?Xa9pO
zC+yntHF^4$pPv6HK!{B^ccmIv%Zd0HP5-EE{lWK-zxlMywZ@@flle{ob(fXKCWfJZ
z_vby)@(Da^SW$QG_ddtyKiO82(qFgbfBia<K{WUK@v0@8%M9km7`g9Ml!=JFY;&07
z;BMK#GCA+R%hYCcIoDjVkM?JaDL&9)b2@egzt_?YS=tt76H~+8`^8zdojJWSHhA^%
z%R#?3RVlUWC2Fm&Okh&DaIf!hu=-Tp`d@1<h2LteH&Eqmuql|-$1K0EC+O?j|I-Sl
zo!#B%5qNOD*)pRK5gQ#jCfw?r^|sf%cEZyiQ?*+jpV3SZ{+~MIyXvK$Be(3gd@WZ|
zFD@!s%%x_{^-aOxVSa|#GK(|ZzovbydogRlJK+t2D+C@|{!TM|Xc^|NYQ$^#)>rGH
zyBpJ1of*Za&nY)6zS(c*82^(q&7^aotL?qtXSb}Jp<BOf^9f^a&mD!Q4OI=4;R%{k
z)KH8?#Bf{p!<{BM|00^2HDfq4lGuA!Sr`}^C>n6Gv1;=%GfA;Bu!uO$<hdKxZPoGP
cR^P@Mi2?_#oJ#kwaA*sLUsS1SO#mfq04q$GivR!s

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.unencrypted.p8 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.unencrypted.p8
new file mode 100644
index 0000000000000000000000000000000000000000..d04694b1fdfe85f10841cadc6681a121a4c3c7eb
GIT binary patch
literal 347
zcmV-h0i^ygf&o_o0RS)!1_>&LNQU<f0RaI800e>oK`?>=Jpus$0zm-LJ1}3V0YW{7
zZF0UqZc)KWe^+&(EjH!BJr5un(Iaj8bkaT}uyFjKYToQYh=l%B6>DL|7Gk)QLGe#L
z|1P}(0|5X50zm+gdBp9GHK^CzVz&4n7FAQe1%pcOP~WYo$q9Zs2NlTu7Q4XYn9)U<
zV0CO{Wr@cgHKNTF1vohs8n_PymH`0*Apq#>*Qnpvkg7Z(qy#Z)(;?U;m`}JUlPkID
zU%8`YcYOjO0Oj^?>rliy0mDLlP&0Z7+z91%^S$a1<?+)!FJt1kK>{HF-OsY=oO*SU
z*nh;`MP5+AJ3-nZnB(&MLMgApZi{nO0wDmyU24^`hZ9aa5qO@nEaAm+HD{_xRM~FR
t)K4wEp*KMSAppc_2va*Uw6<#-ob&PX8cLS`a3vrbon^SCkDSMMWONLcmL~uJ

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
new file mode 100644
index 00000000..e07375a8
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
@@ -0,0 +1,10 @@
+-----BEGIN PRIVATE KEY-----
+MIIBVwIBADANBgkqhkiG9w0BAQEFAASCAUEwggE9AgEAAkEA0TswX6kBQj2GbXK+
+QG5RwUl/V3WhLTblwT0PIBrRI236dNI+I7Bw/KBq3uxBiIT+VBVrYcUWYriTQfFP
+Pf8uvQIDAQABAkEAkXnE7Y41qNfcYrb4HxZVU74Fg0rvUN+tqckJfjoHFcj9FrvA
+5JjRRZlgdWxkZYnHHjWizRQFODkVGrgPBZYBAQIhAOjr16jf2JCqPCGkBDFq0yHY
+JZhPuCiTK7npX7mjZXd9AiEA5fZv61DEOwHDQn1QM3oJ3AjldvO96g/l8dM9L2Pi
+uEECIQDdz7LpnHp1kdh/xN1FXlDAO0HaIZjj8vtCKa/CbotzVQIhAMNdatWyhxNO
+OxF4nrMs4cVyNWeqSVTZbtPUTy28oTdBAiEAxGkIUzsytLZrG5zz8fMaSpb/cCUg
+Gp1luKWPnMd3ZHQ=
+-----END PRIVATE KEY-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.withCA.p12 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.withCA.p12
new file mode 100644
index 0000000000000000000000000000000000000000..ae029dee0fd45e90460d0eacd15f9be1882756ea
GIT binary patch
literal 2089
zcmZXUc{J3G8pmh(F~%Ok8&kYBg)D;*2FVg;ghXY@z7*Bimm!Rd?1M5&G+}5ak!8F_
zUL~QSNLh=qC5Eh7vS05x_ulR~_mAg%pY#1b=lSb<J}3eY5(0*z2(VdhxB}6PxGn&O
zfhh#o5I}$p?Atvk0#Nxo;-(OQ!hNd%0tW31`F8?FNpti5`vX51j1mNRU`q0v_oM3`
zLLfY#SOReU#>aa*<b&boMl-v45~;e*m)|5biB@)h30n6OJX#S)!Bgw3TCJy(pdUw?
zVM`g2w!@~{P2J<(fWkB|L?cATFVb==7Qr5v-51+f1@?0fPE5|9KWyV}_!$Snt{=m3
zgwb$?PfVQ=-c;7Zs;{vfHf}wiNpL@m-ava>^%q)Nk&KD<${~X$Bs$!?=aX(DX0b)`
z2=?1scbxjAy)u@r^s~g4M|A&HpVVc(WGVgvy{ikEfZFkPEVjjJr^EF8KrD`+uRA1g
zxA*y2re}A&5n``vH!1gLMon>80@oAn!BCe`J5Om7!JOHvY0haYo0>t2ZHWFv)gCwC
zcHV-}4cAM&Biz&hD-yA&@oQG74hLy%SFU#=+jVtu(u<Qf!Kaoa&$k(EC3IMsCw(rE
zPr;KtE(JZF5b&zusi5a@E;B`@T-&ALYzZ6VRa9Dk5Q^ujm5)jsH$Yj`y32if$=%Rg
z<0-|8lGI>IS_TQ<xCz;U%l9AnWR|~Fi+k^9C*&m#zTQlI-bWz44L3-MWLP4F9;DV1
zuT7>#f3c@C?6i}42hDFampl%liFBWzzf&J5c<bU0qQKpe-*mZUDNzzOKugV&-SH8P
zrbj7B^hp^%(liuyV_ym-<*#opYp}x|^mUy5ZB>(=<<RHFuqrmn6$QRHSMTAe(8$v7
z-@LjokSJo?<;J=srD`+HJ6KL<@H;0oBW<HOE&)fZnV}l*5>%^P?;lZI3p1Tu!DplU
zM4rNsQuFrc3#-z1@qd+dl9MV4j%g2~-kl!f*tk(>xkQmBR(tPOebymRY#7>NILs^G
zFd-|{;yz<Rqk?jVZDxu%H*vV0kJ!1@av<albh{+R(|842^$fgxoQHiw{6r~tVbQ~K
z<ItD)+zq%YGe24x`rw@d%Hv8>g(q7!s)AB_98U&M**RwaoN8`WRQk2%$o_`8gBYUQ
z>bS?Db1c-A-gmLeY}Ob?-;`}5!ofJtZS#IT860`^oOnbUrpyHd)iXTzc}Xntnd_EA
zzU5U9JWN7Dz-4^pns>eM`I0*SCMnzRuH}%O#6|~pMIl&Wfp@gn^DiZ-!c)6CxQYd)
zJzRNAA*1aW$MR0a5w!1vE6WIu=xKqx@7iUvpuMMs?kTPnQE%qQsw%behcY@}vw**a
z`foo$)*9kjLz9hUoP?ua1DZUDNPw}ee-$X+4*&5eOHBzATjgjS_UgHl-aJqGr={t~
zYP=pu70=og;9j?fi#@8a{zI!-#dZ+&97Xd$&R6z4v+AAQY_#P33i_0F5*2yVfg%t)
z)_nArmLs4ZQR5YVHQ7*<cfyH@^478&QGt9&>}S#SyVn-<_%!7>aQ8Hs*0VQ%t)J|~
zYM9nX7;4R-{w|0$=MJHW5-(c4O~%Dbulq%Bh;Hx)GamO2{@G~$sth9yaULz2oIPXT
z*t$vbEzQ*7lpg)IE#F_XlK&DPd@_c%yi{D8JaGDnF6iLnVfoM?n#C;?0V?%BXrd6H
z`~U&Uvu^|Y1LEfU52$#-5DEeE1Vw=4|3AO()}EQTmcLW}55E8c1n=|Zf<}W~uH4Uo
z9{nEovqoI>)r^n1_hv@)AJ%vEGgA<XL-|Th78#gJxU8P)N}7v=G-04Ulk!SY&^jvL
zW@r2lv6JwhgDup$KIY9$uhXw9);_B=bznQ(hCqQNq&?bY@YlNCt8J~7<=OYeQ)bC8
z*Usm}DMl2jt0{~AjP4K*>*~_PT3j&lA-c@fq-U_6%f2mPey71uU%KCBI%+J9&Aro_
z4B*w4n26|vcZcX8WE&_U0XIty?`^rvdtAi@Fvsm3>>P4m&}3uLbn;s5sM`=7JqPui
zS-mGzw#%6jhKm(xmU1~$5cQrmU6oQZ#>yC1FgAuU7n|qQG0mBRX7WF+kR-PoWkF*G
zVix7BqulQN2=t*;OR02T=~bpiO{+|*TjoSY-+EVCvq$Ws9yukLrI|yP?b$NA9TaX(
zmbgo4-r8v49<fi9r_Qfv{h(EM2>N~hEIpNWB_$2(I=#r?vK^#tNN~s`2UnH##Vi#=
z28)5ZrRXj+K7Q=MqC{}ba_eQ8>4@qxCdKNYjPd0UVU7lN5u5{4j0>Enr6=OGdfOFV
z>N9e~d`$HD0NLT=7J8*SA!dGDkUWFi#F{?9Y8wC8TceHzQzwxlwzkp*b1v>aNi7NU
zm2IUX6$AY*UB|5NmMy1GMaFk9O<wfwjSV)FdX+-nv;J_2=M}M%6UpN8B1y_wCL=>R
z2C*z%H2Xs#Oysq(Q-;Fo{qQzK5D)pTIX)d&`0O7%Z@aDrz)WltjghNu3G$S60F?&5
zkQBF9=)*zbx2k7asM)2?BaI8GmP?=+iOW@e;q>b=$=Su$@b>}_0*>HTII*M%RV?c0
ze+vyis45PKsn({9F;DsLUM9rLJHdV3VQKW!DCF-WF;&UK;vgJI6{H4o0fm9Cfr3H4
z`<oHS5T%NeMZvkbP6|RHhqyq1m|EG{iDfV*GP^eMwK-|VZ?BCK3h?;(36|unm8<{L
G|9=4=O4!W+

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.withoutCA.p12 b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.withoutCA.p12
new file mode 100644
index 0000000000000000000000000000000000000000..c4eb54c444ca361efa2c3b4e4d5082607b2bb693
GIT binary patch
literal 1573
zcmZXTc{G#@7{<T(W{jD^5R)Pl-K-<u$TG5)rEFQtB(jZVG>k0G5y$e$Zjfb?Mzm60
zsjiZwDdM^^5@TPYX|cPNopg21y|;VL{o_5)InVQ)_pjdr!DvMgfrMb8PiU-q%HfnH
zF@!Lp3>NA`!9x5^y90v3@}Cj93<irftpX4MYzpgVf`H`ExW7M$A`lQBg}EKq92wQ%
zRS$v~AOQxwsWnbuHnE!~2n^^^tELifPhZ?7B0fA$KYos%egcv9DeU@KN5A~k-oUYf
zyUT%HSry031dhxnC09jT9+co)M$#>iD+9nZxp(!m{a{!^3zqnH?H3?JvYK&a%YB09
zJ2xN64qd9L{rE_p$ONMps@`pG@6EKNnLn~iR>6LRDy*IxtM>K<((D-bE7=NFnBwZm
zVDTkVmMC}syBOh=Jkx0xrI)=3*Ky}{1WKVFJ<xG~E?94}w5Hx5yID`gV=FCtcSgyP
zMz5$5%|Yuz#}0a&Pd%yWOW{hm-9oPG=fDr46Op%}ilB!ZrTa?cc*)V!bI@8a8^<5H
z<3{ryBc$=&p%r0UraO0*#9QZiNh|p>zh8-1K9d~&$_HC({W0Pt@N_i9?)3x-Cqr3T
zePAM(ichfVdaPV7<C!LzTF`gg>n;Cu0cwFN=i_M+Czg!NZ=B0Lz{jy3Y3K9F+L*^p
zHpP`Lof=}%FOqs<b@6i_XKgNp<{5YAADGhZ=$ttg(cnZrFC5<PIrK5X-HMUpP{BA)
z*2<KWzAr4rL=4}_TycIa-N0>{X_La@CG5<S2+Yjd;sCApgxU2Xt)cc|Ow+SusUB8?
zQECkX@CcCKFIGe?%)OQ#!LCWtN|jAZAI!8~#BUL>ckFU13_MfOQ*`js^lXj{zgSo8
zpvvyhZz0}5*o2+_@ZA>_+oOj88U4s=;$?^F*ci`49CnGbkk*(B?PcZZ=S>SPk@3ok
zHW3DNLRD|`myKc0^uUeAjmqung+^{+3d{tGYU^W{TUf3p?UXw03Irn+{{v(hjFd#d
zNc^Ua+dMQ{<R3h72ym0*%|2N2e`>XehcPNg=u$tZMZsW9R|};@aWS!k*BfVEX;Lt;
zHwbaQChOXxWnQcvd&tJ}o4rk5=geN#4DcKsZ(P$Uf9(}#!!S$J_s?VzH-9;@1v}xc
zUqgD9c3ha#A1AHv?NVY#m96HANF?^*G&yWD{q2GmcMsfa{LNbS^SV5igD{Z&Dx$B&
z?{%8u%3LI7ASp-pTao)4cVMLNg%y+2csd-s?%}d4`+cXH&-CM4bxkl%+;P(h+vu6r
z{vMBIBfcqkqD@*{Zdrmeo#r1MQq`(-v;A?#&AeL7!TDihKUhUbdC^4Ug3s4ohYm*6
zy6b@c=5^0<Pt~}q1-`p!@S3qm6FAgZ%n<t{D7KD~^io;0eNr+>()bcf`szv4@9yKC
zxN5m4Qj4KC&t`J`pr#;YGsh~~RY{EiFS$GKk*s2u`sy`QPFeMd5AuLp>V=#eYf|a!
zMt>T)w&M~9LewX345k?d$7SS;>X02`zQ1_yaA;27pcoS{8KQa?2@dfFVp=DbyxP$Z
zy@ShpXm-Z>TlR?dt0i{L`d<&*&dZT?TKZ%|ZsxQQxEgWP_tr8b4IRflERA)mm&3ZA
zqw}F{Ls$bchIiGF()LDiRUGD;5|77bcQ;p!2twN}XQGY1@j!dS6xXL#YfY1tITuQ7
zT?4)x-`W{_OS-hKMK@rylf^LPET?D**hk-8FA{YOZQJ*C$2##>vAjy(joiHwm*>m*
z^mewy#f3g$JhJN>vzJZ@4z@L3lCV1#cs^7<ajL#<44hx_J+X5e)1u8yFcc1#?xZ&i
zFrT|2y6sm?pGsP`O(}hkLe_C%rm9Zqok6`i^?2n5Brz(eRTPf(8x=qM#-8L1?fw^N
z>{gOAia>glIaaGf-=M%rY981iUt!j5GNkddL?9_B$N^yh3D5?-046{KB7q=)0Yq)8
z7hnz?fJl%cghdN!;E|xL5P%|3Be^CIZ5L9{tv0y}@`==V{HJadhB5C~zBA{V$Bz~K
E1>TCewg3PC

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.cer
new file mode 100644
index 0000000000000000000000000000000000000000..fc92d056429c92b14fdc609505a5528a38ddd3da
GIT binary patch
literal 475
zcmXqLV!Uq9#OT1p$?)-T`++N8!VeqpvT<s)d9;1!Wn^S!WiT)?G%_$?V-98E64p$t
z2=NJ42q?<WN=+_NaLG?euT*eOEh@=O%S=uzNmXzxEy>6)$}FigkQ3)MFatt!Lqii2
zW1}c>USnfJ10!Q7*FeWm%s>QUDldwuhC&7cAaQ14PD3MeJp&*#G-#ZU>?%f92Ij_I
z27|^<rp88w8xQu2-g~wF#nr#uD^_g2?iRaTEr)08%{|9{9H_YPEiCnirUzd&_cGPG
z7uA*d7EiZs|MFnY#Dp(wpB?0WPLy1!@9w;Hw%na>t7JSY6*W$;@+`i|$?C)O$;UTG
zreV3rM3+B8n;$-Z?C-Lx=WvPT3!e*Dd{h#*I85z1z_p#p(y(<h6Eh<NBeL^=fyNAU
z7q`1gQ0=zliaiZ?+jA!P7$1&VKAlsB(|>l}<|sS2Nm9q#MI#?}#GK1|G;Nj9n?r9a
zx*tqPn=Ep8#%g2J%eAqATyu5`M7USYn40q6C$>rQ=PUlWS*MNEQ%>babX_=L_GM?X
j$<kY90cM_;wp%G0N84SC=b72Oebe`Dmm_h-jw_h};#;++

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem
new file mode 100644
index 00000000..81f3eaf1
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB1zCCAUACCQDxw4fA1PRXwzANBgkqhkiG9w0BAQUFADA0MTIwMAYDVQQKEylh
+eFRMUyBQcm9qZWN0IERvZGd5IENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0wNjA2
+MDcxMTQ0MzJaFw0zMzEwMjMxMTQ0MzJaMCwxFjAUBgNVBAoTDWF4VExTIFByb2pl
+Y3QxEjAQBgNVBAMTCTEyNy4wLjAuMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEA2OC/Fd7qr+jV/QuoqLPXRl2nJmwMtdm8xvjAeND2VmX4KUgOewumJX7oe3lv
+OOW1t/TgnJFg9AbzQB75kRmpL0dDtZse3PaqHEl5ISjLqklz2QkFTALyTE1sHICn
+FJFE/BKz4efjT0S6jMN0OehM0NRMJGG0QJWMwAq3AjkxhZMCAwEAATANBgkqhkiG
+9w0BAQUFAAOBgQALRyRSfbZjeLyA3YdskEwzw1ynlwkcCU+bbrNaPkaSGseHFVnh
+iFzOauKWqjLswu14i+CQZpMUw5irMzXTfV1RCpy5EFhHepiVZP9MXYIZ+eoPXprL
+Midkym9YitDANvS5YzSl2jZQNknStzohM1s+1l8MmYO3sveLRMRec0GpAg==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.cer
new file mode 100644
index 0000000000000000000000000000000000000000..c0badf7288617f5d618a62e1ad4a1343697a98ca
GIT binary patch
literal 607
zcmXqLVv06sVm!jc$?)-T`++N8!jBm6vT<s)d9;1!Wn^SwWiT)?G%_$?V-98E64p$t
z2=NJ42q?<WN=+_NaLG?euT*eOEh@=O%S=uzNmXzxEy>6)$}FigkQ3)MFatt!Lqii2
zW1}c>USnfJ10!Q7*FeWm%s>QUDldwuhC&7cAaQ14PD3MeJp&*#1iDZO*;$ON49rc8
z{0u;GE~X|%MutNR_TT<>zJSeT^Za|gwm0>UnA?6&&rWT6+_6ixVL4aXImM&<URKY(
z(R%Eli~vi_zL|oyQC6Lwy!(V)*1mkd=KzOy=?d$}qN-vkspi;{?Gs&Ob>>R`J}R!t
z+jA&U_kPRFCBl9a^}ihQSF@EY+r99L$0v8O9WpZ)@!zhFOWnlzWtp*8&m^W2_0?9l
zw)n8tFa2|oB|f!S?S*U#tJV9Eu!NU)c8mVMWhyc4la_L1xyOI0f}@sf*H3S3R=#}F
zSLVfo6y=MD+><xOO?l$g(QP#I6pyLM?FAtY$LH+rVQl@d+VuO9tpD#5l1@LW@KyXZ
z?XJ$YGnby_Gj?rONZQ*fQmwj{iJ6gs5jli_5y#xv$Y7%%R{UjM&z~<$iCOpOTHLl-
zX13O#)auLBi#|qA7WF%dZ2i@=w_J|vQpWV(Vfo5oFY5Py%?LfWG579L8;L-TlY5Po
zy_rL7Ry6)w|M38C+PPyV(vCfEX%Y^;mu4~dqnLzDLb&InW8Lp&W%`?+J34>iH`Cet
R9GogVhX2<0z0YoW4gkCo^O*nu

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem
new file mode 100644
index 00000000..1ed0141a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICWzCCAcQCCQDxw4fA1PRXxDANBgkqhkiG9w0BAQQFADA0MTIwMAYDVQQKEylh
+eFRMUyBQcm9qZWN0IERvZGd5IENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0wNjA2
+MDcxMTQ0MzJaFw0zMzEwMjMxMTQ0MzJaMCwxFjAUBgNVBAoTDWF4VExTIFByb2pl
+Y3QxEjAQBgNVBAMTCTEyNy4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMKgv9v6z3AGRLOf3o092S/ENz33Z2tlguOIuh2Apwp2ziHFvul7m9iF
+xsEcEARcvpkRPVo6ifJLjhJErenvvMAIS3WoO1lyenMaGoNddLeRRB0snRn7xRcl
+DYzCYS3fhJmkE06RL/TCTyY9GXa7odRI8kcWuByZog/be15lsgn0pjNKjJICdCer
+Otq0TAV/pfzRBF9lcyboHWQFOu9UVmDp3LsV/9o1GJbyKiNZd0j/GnDFOQbXy7GD
+I9PJTRzo4GQj0cJHY7JelORKiIsymcoMNRTboFRAx5y9jAGF8Ks196Rq/+9gYsvi
+eE0h+pbdLLbM0uZvAYqzIGK9hRR7Ja0CAwEAATANBgkqhkiG9w0BAQQFAAOBgQA8
+L1Zz9K6M/PQCYWrfnTjbPKY2rTB1OvSV0Uwy5KKPQRS1+oK9dx4K0miX+1ZvI1bo
+f7/1aFXOsW3dpTwYUSjJvTMjSwNUPKiB/q/xwA1mzsbIZsbnhIITU95mOJ3xFhgc
+YFdJ4saL7pppTzfOxZ+h9jWbDwgJJAwx/q+O72uE5w==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.cer
new file mode 100644
index 0000000000000000000000000000000000000000..40bbe94fdd8d5fc57dd7463e4e9530b9d661e7c6
GIT binary patch
literal 863
zcmXqLVvaUwVmiXa$?)-T`++N8!jBs8vT<s)d9;1!Wn^SwWiT)?G%_$?V-98E64p$t
z2=NJ42q?<WN=+_NaLG?euT*eOEh@=O%S=uzNmXzxEy>6)$}FigkQ3)MFatt!Lqii2
zW1}c>USnfJ10!Q7*FeWm%s>QUDldwuhC&7cAaQ14PD3MeJp&*#1iDZO*;$ON49rbT
z{0u;GE~X|XMutD?TV}>;ow{Ja^XqY}Kx&Zef|Au{+XOz`xm&ZC_3Bzx*40-wFfQg@
zm%j3gNv(kccj0BVI|(i7yZNjX1&Wq@zCAtZ{?bm~_lp<D{G4MuJ?-#`P4nv}&ka5Q
zbUS<Zo0tg-XXB@*?p*(6ujTinE{DA0luKp4zOG3VT+j21JzXI{I;f$4MLEN=(jT`I
z*NH7Y7WKT8t&;Ek#V00H93I4Q6y7~ML#g%p(eK;T|9O?pd>MDeGtww(0oyI-?vNu6
z^TXM09Ex^dDZ;tar^LMBOeK%H7W;SJ#A{)zrj;<gVere_`nzx0!;fCgWef?Q7yaKS
zr4ilXAY(uEyx9LQQ?JVl>HmnoStPqxZLgEm3zNIDcdNGvx){gK$*>jXI`gWlo-;Cf
zm$Cl}S9azz?Pun<HNR_GJ9*!N<cV){?s2X^Xu(qWe?juSS8-}i@zWmueUUbI-h0KJ
z5uy&?PMplqTzX8kN3OlJOD#mbeQ$xIhncb1t}cG1zKt4ZZWbhdKI9N}R&R;C${X3^
zcV$oS$P89hzs_a;ZQh0%ddt7QsW|&+wsq%Sulf5K=Ffe~RdcS{_)z(b@Jk0B^0iNQ
zZ#ZKq6tV1o6i1HW7F+9THl;_VcQu3m$nDr)b~=9odlr+;S=}dgrxklvq!gZ=_T|t-
zR^JVZ57wCKTHbP-vbyTLp+cb52JRU<&8zAUukL4JW@KPQP9eaA%iP$=P_$vKZRN}p
zU%y;??9-n5HOxaTsQ$C=%SBbY^xh`?Z{Oox^0K1x(P9y)jt<@0`)8M3G1}1{SYvp6
zRmKV7oew&fY_?`jH!!b``uxkyKBpy2JhMHPf8rH?@ed*&W^SAl*1&h%>i3$k++BCg
c{uLH|{+cssT4etA3m$>ump}GawD^_-0G~{BVE_OC

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem
new file mode 100644
index 00000000..b7aed1ca
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAsQCCQDxw4fA1PRXxTANBgkqhkiG9w0BAQQFADA0MTIwMAYDVQQKEylh
+eFRMUyBQcm9qZWN0IERvZGd5IENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0wNjA2
+MDcxMTQ0MzJaFw0zMzEwMjMxMTQ0MzJaMCwxFjAUBgNVBAoTDWF4VExTIFByb2pl
+Y3QxEjAQBgNVBAMTCTEyNy4wLjAuMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAPwntJldKsrQMAz6410QZVIdoHSrNrYQ8NzdfKMF1a0lBavUsAGjDa5n
+qfQ0fTBAC3HTJtxghCe7DjohEHKk89uXYt+liQ3vo6Nc+Zw9l2bDyLKffpOdVc/l
+tweL7FyQIM1fl2W5r/S9OffFRMJKXiN1HPXrfGYRrwz6B2cgUBtSgI+odwCmdfjb
+Ya4Wo8Za53UGeQ7v0eQ0lEDgXAhx3c2YIoXXxfe2J/5KdZnpXtRJWTJaoAbaQ4tU
+xECfVwbYwltHqRQJuUx0N4DMeQwnKgf3DWHWVqqWdALsAE5utfuOpuHxSoN2AGDz
+ov++GihbiEAcP5XPFv/0ldcfEi/4X9lyHb0mvUIa6DTdHd17thFEM12caD0TCszq
+in8JWVu6M0+oRQcDzIfMn4aD7oKtk76gY5HtbN4Jr8E4BHH/oGPe6l4mQl+W4f3o
+Zp2e7yG5WBVA9sjJbCmlxiWMHod1iiZUJ4e9cEFINjMWuooPIo6xKMzZcGHzwkBa
+zS6kHyTsHcfdHcu4aVMlJ9cKN/aesJgup/XseM3imzuJ3UqfvwCfneUKfM6DM8J3
+mFfSwUBvK8uLsMw5Elim/1oIbBG0PTt7BiLiNd0pU/weuL92y2+QB2oCPM0t5D7L
+IYyoZHHNlvTCkQVNsCHgrDUtOdpGlKt6zzEgUTqwC5i5N3p/w6uPAgMBAAEwDQYJ
+KoZIhvcNAQEEBQADgYEAcrCtPXmZyPX01uNMh2X1VkgmUn/zLemierou7WD/h7xL
+dOl4eeKjFBqIiC19382m1DK4h1F8MceqaMgTueCJpLM7A2cwN3ta8/pGP2yEVhdp
+h10PkdRPF/AU8JmxnFaADsc6+6xWbbrdNv5xcvP1bJKWWW+30EhRF9PxjXiETXc=
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_512.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_512.cer
new file mode 100644
index 0000000000000000000000000000000000000000..48c6e13aa0af5678668c7d4a3245a3304030f01e
GIT binary patch
literal 406
zcmXqLVw_~q_=ky;;p5@<16RI;A2Q%&<J4;NX#38~$jHjdU|?csWMII?9LmBateIF5
z;uEY8P?VpQnp~pblAn@Zso<PiRFavNnVeXXs^C~!l96AOSyE{rC(dhN288B@h9)M)
zMp5Ft#>R#QM#fOCfsUb=fe6G@UKCReg$x8h;>^OFhDPRk20&<N5QFR}Mpg!9Zw3Po
zCP#*g)&}t_8J%p~a*Osk<OLq|tPd|;sB8B0pe?_G)J5goUnQ69ls6RoS&((_jblg4
zzYx*v#G_(KJ0?4R^tb)5x0i{Tk%1A}Y@mmk8ygw8T<y9KM14K_+%vyx^*)0-Vb=Of
z^Mp;VUh%%N{nBP3u`f~Uw-)Z%{B_zi<u6}KRZ?ae<R5$`QgP~KtDBA7^o#xt*Tp#V
zm}6L1oi7y--zB+a(l70&CztXn9MJDQdVZoyvbRyt?vfp=#N@B8oOG{$>Zk9;ChBUA
P9b0QY{GW6AgzOst>~fQg

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem
new file mode 100644
index 00000000..8191e489
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBkjCB/AIJAPHDh8DU9FfCMA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNVBAoTKWF4
+VExTIFByb2plY3QgRG9kZ3kgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTA2MDYw
+NzExNDQzMloXDTMzMTAyMzExNDQzMlowLDEWMBQGA1UEChMNYXhUTFMgUHJvamVj
+dDESMBAGA1UEAxMJMTI3LjAuMC4xMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANE7
+MF+pAUI9hm1yvkBuUcFJf1d1oS025cE9DyAa0SNt+nTSPiOwcPygat7sQYiE/lQV
+a2HFFmK4k0HxTz3/Lr0CAwEAATANBgkqhkiG9w0BAQUFAAOBgQAKRT6LwFr1xedJ
+b4qrvjB+EwV/0p4TNNXUS9S30rMSFvRar7VxvLP1lpYj9PR1JGSZMG/B6hR4yumF
+Rjwel9FPgNcWCW4DXAWqz3UQF7oZtJL6K+XJpQ0gwC+Nxc+RRGNLMlK7dLiqFh/V
+qZLej5Xy93M0JyZBiLV88P+c08gd7A==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
new file mode 100644
index 00000000..9a75fe96
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBkjCB/AIJAPHDh8DU9FfHMA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNVBAoTKWF4
+VExTIFByb2plY3QgRG9kZ3kgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTA2MDYw
+NzExNDQzMloXDTMzMTAyMzExNDQzMlowLDEWMBQGA1UEChMNYXhUTFMgUHJvamVj
+dDESMBAGA1UEAxMJMTI3LjAuMC4xMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMDo
+g6K2iXFftW+Qk+rrzkMGWrtfY6YSxPstPRrI7akluUEoyWGITXbK6L3QfERrf2eu
+CnWyciQiHVRoHC0EgZUCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBT6YhR8x/bBteK
+lr8E0l4mATOnYlsmge+z/SFYs4bDBofqlwQCVJXNSBA4ZsEjgP9qIWTu/85QrVGq
+LrkewSM6Oeh95LGnE+uhJVtIX++O+Hsex3H1UL067dCG99XmDhqbEU9AI6YSZu2p
+cjoSowFELtOoG667+id9QObfV3EQoQ==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
new file mode 100644
index 00000000..4f3074e0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBkjCB/AIJAPHDh8DU9FfIMA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNVBAoTKWF4
+VExTIFByb2plY3QgRG9kZ3kgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTA2MDYw
+NzExNDQzMloXDTMzMTAyMzExNDQzMlowLDEWMBQGA1UEChMNYXhUTFMgUHJvamVj
+dDESMBAGA1UEAxMJMTI3LjAuMC4xMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANAW
+9PdXa5u4gWi5VB5p/eQmOtteRq9/54JkiEs8cVNrTQgZsjjU1LGedE3JwBqZ1EIW
+HGPjcGg5dVxFjkn7RekCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBmJMt0Crdd/BPn
+EdmzsVXou0zTizTC8wyUPMVpg/KzzP7fhZux/ZIrH9/RVcJd9y+B2/mXc3C+K99+
+TXQoYKsLGArfDPzmpy1wPrdEcB1A9gkWDl1Uq6xRyvrVm3gX8NTITRuGKL9njgWx
+2SrApIBtOOUOinYtfH3745cVVl5HOA==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
new file mode 100644
index 00000000..79eb9ccd
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBkjCB/AIJAPHDh8DU9FfKMA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNVBAoTKWF4
+VExTIFByb2plY3QgRG9kZ3kgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTA2MDYw
+NzExNDQzMloXDTA1MDYwNzExNDQzMlowLDEWMBQGA1UEChMNYXhUTFMgUHJvamVj
+dDESMBAGA1UEAxMJMTI3LjAuMC4xMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANE7
+MF+pAUI9hm1yvkBuUcFJf1d1oS025cE9DyAa0SNt+nTSPiOwcPygat7sQYiE/lQV
+a2HFFmK4k0HxTz3/Lr0CAwEAATANBgkqhkiG9w0BAQUFAAOBgQCmPSs9EceViMZD
+ZTXDZpQWJFcXaeInrXWgYWyVgnHBY/eSuqNCxkV/ehv/Wc5pWBGnrX+4cSvQ+TpQ
+FdZegeOjvgipjtJb/0TJCcvgcdHTntEM0h7VXjfbsJXAHwJPFzWIKxV4jeFXnaaw
+W+YHrj9GQ8PnFmapPuh4h/y6LyHAcg==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
new file mode 100644
index 00000000..fe72b541
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBkjCB/AIJAPHDh8DU9FfJMA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNVBAoTKWF4
+VExTIFByb2plY3QgRG9kZ3kgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTI0MTIz
+MTE0MDAwMFoXDTI1MTIzMTE0MDAwMFowLDEWMBQGA1UEChMNYXhUTFMgUHJvamVj
+dDESMBAGA1UEAxMJMTI3LjAuMC4xMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANE7
+MF+pAUI9hm1yvkBuUcFJf1d1oS025cE9DyAa0SNt+nTSPiOwcPygat7sQYiE/lQV
+a2HFFmK4k0HxTz3/Lr0CAwEAATANBgkqhkiG9w0BAQUFAAOBgQApbldYefE8A0ez
+SYvAuCtYxx/2KHwBRD/cR0q7widl9WGjVC/dsnbFo109vHEr3FP1HVYSI0aweiaK
+XZmpUyJ9DprbbWQqaLuDnqIH8X7kfiMuO7/LGQc812iDJI2Akxp9cIlPBFBD8GVx
++0EphzSodDDlLD8bPqLaWTE+8Ydtjw==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_device.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_device.cer
new file mode 100644
index 0000000000000000000000000000000000000000..c966743c9ca724ecb81928d0f6ad7e62b29eab92
GIT binary patch
literal 401
zcmXqLV(c|&Vl-#sWcYZv{lJwk;l~Vk**LY@JlekVGBUEVG8pI>iW!KoF^95n3G*ga
zg!lw21Qg|Gr6!jc3K<B1#F>RT4UNq841mzkKu(<3zzhh@4Gm39jE$nid5w(?4UCMT
zTmx-GO#^j^X$mN&DY&GTWhSR8IHwksWTs^%CzhldG|oqM3?nN8b7L=qL1QOVV<W>A
zB|csu?fqp62d3^8%Qa9mSYy#4{w;o%qQvxI>(vh>*<B_H1hVnmoqm6d?p9~jehIIu
z3hkWl&RzMZG}&pbclcJJJzTXH?4P|mtG+EI`RW2EkG!w-PS3smW>4W)IqNC%Ho9fI
z%iCXCtE2tbBwl5l92<M$)2Zs!oO4c{R9!iBk2DiABLgF{^MGN+?8qRnJ@DK*r6kRQ
zou!f8d$dn2ktz*-u-<dx)#DCf4@GC2zl%QMx4GT9;@g7M%efZ}Rf5VD`U~Sc_su=`
KLZ@nBTsQzLwv8$P

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem
new file mode 100644
index 00000000..e9cbaaf3
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIBjTCCATcCCQDxw4fA1PRXxjANBgkqhkiG9w0BAQUFADAsMRYwFAYDVQQKEw1h
+eFRMUyBQcm9qZWN0MRIwEAYDVQQDEwkxMjcuMC4wLjEwHhcNMDYwNjA3MTE0NDMy
+WhcNMzMxMDIzMTE0NDMyWjArMSkwJwYDVQQKEyBheFRMUyBQcm9qZWN0IERldmlj
+ZSBDZXJ0aWZpY2F0ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1CIODRIr
+v3YgwJW7Fm0wITCsOIgX9l+aIRiXUzur4RkHRJIQUQYM3ZfftC21QyWPGErVIIcJ
+7s7U/iKTQq1LV7USvAp90D/m7s0ntmRj1aBCSG71f0LnSv1rlA8kzUkU7VuEt0Tt
++iqrW0+sYdUBk11dyPLKe6sJnMrJJamVvBsCAwEAATANBgkqhkiG9w0BAQUFAANB
+ABC3Uc6uImIpcLl1WYu8K8qkGnVT4K9JkdXHQFbhFZs37lvITrOHQ3j2oGXTbdAx
+JFJ3II9xXkm+nc7oLHqhXlc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIB3zCCAUgCCQCdbnM4pjqlWjANBgkqhkiG9w0BAQUFADA0MTIwMAYDVQQKEylh
+eFRMUyBQcm9qZWN0IERvZGd5IENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0wNjA2
+MDcxMTQ0MzJaFw0zMzEwMjMxMTQ0MzJaMDQxMjAwBgNVBAoTKWF4VExTIFByb2pl
+Y3QgRG9kZ3kgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQCnZdk20fYWh8O6kDTt0AuJWyp0YIrb7W1UNNMPXI5wA4J59IVj
+Nmk5wocm9+Hqzbg7rORAN/mHPBhzLAjhnm1HODs36hW15DtbDkkH4wCM/Tsyv79m
+n0xq1V6peK3t9vi2D4p/IRjHkYR2jm+BeknopijhY0kHHfpGTHa2DnVirwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAB0LgNo0oCcwIie5plgwwFybQ8x95q6e3wndM/Mp
+3gjcAFbGuchpo3dfFlTcRI0KyERb3q1MVxPM4sff9nT7EdHVyK9s8/ITkP2dcTKc
+flbcTEfJVIeM8L2P5F41Hvn9GuGcMW8EmsC06gdbp1LLnqsdrXdMNBsAUBXfgPrU
++UcZ
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c b/trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c
new file mode 100644
index 00000000..2a5e836e
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c
@@ -0,0 +1,43 @@
+
+#include <string.h>
+#include <stdlib.h>
+#include "ssl.h"
+
+int main(int argc, char *argv[])
+{
+    bigint *m1, *m2, *d;
+    BI_CTX *ctx = bi_initialize();
+    char cmp1[1024], cmp2[1024];
+
+    const char *plaintext = /* 128 byte number */
+        "01aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeeee"
+        "01aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeeee";
+    d = bi_import(ctx, (uint8_t *)plaintext, strlen(plaintext));
+    memset(cmp1, 0, sizeof(cmp1));
+
+    while (1)
+    {
+        bi_set_mod(ctx, bi_clone(ctx, d), 0);
+        m1 = bi_square(ctx, bi_copy(d));
+        m2 = bi_residue(ctx, m1);
+        bi_free_mod(ctx, 0);
+
+        //bi_export(ctx, bi_copy(d), cmp1, sizeof(cmp1));
+        bi_export(ctx, m2, cmp2, sizeof(cmp2));
+
+        if (memcmp(cmp1, cmp2, sizeof(cmp1)) != 0)
+        {
+            printf("Error!\n"); TTY_FLUSH();
+            break;
+        }
+
+        d = bi_add(ctx, d, int_to_bi(ctx, 1));
+    }
+
+    bi_free(ctx, d);
+    bi_terminate(ctx);
+    printf("all good\n"); TTY_FLUSH();
+    return 0;
+
+}
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c.old b/trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c.old
new file mode 100644
index 00000000..a5703fb9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/datatest.c.old
@@ -0,0 +1,280 @@
+#include "crypto.h"
+
+#include <string.h>
+#include <stdlib.h>
+//#define DEBUG_TEST 
+
+typedef enum {
+    encrypt, decrypt
+} CryptoMode;
+
+void hex_dump(const char* header, const unsigned char* data, const unsigned int data_length)
+{
+    unsigned int byte_count;
+    printf("%s (%d bytes):\n", header, data_length);
+    for(byte_count = 0; byte_count < data_length; ++byte_count)
+    {
+        printf("%02X", data[byte_count]);
+    }
+    printf("\n");
+}
+
+void do_rsa(const CryptoMode crypto_mode,
+            const unsigned char* data, const unsigned int data_length,
+            const unsigned char* modulus, const unsigned int modulus_length,
+            const unsigned char* exponent, const unsigned int exponent_length,
+            unsigned char* result, const unsigned int result_length)
+{
+    RSA_CTX* rsa_context = NULL;
+    BI_CTX *bi_ctx;
+    bigint *plaintext_bi;
+    bigint *enc_data_bi, *dec_data_bi;
+
+#ifdef DEBUG_TEST
+    printf("do_rsa:\n");
+    hex_dump("data", data, data_length);
+    hex_dump("modulus", modulus, modulus_length);
+    hex_dump("exponent", exponent, exponent_length);
+#endif
+
+    RSA_priv_key_new(&rsa_context, modulus, modulus_length, exponent, exponent_length, exponent, exponent_length);
+    memset(result, 0, result_length);
+    bi_ctx = rsa_context->bi_ctx;
+
+    switch(crypto_mode)
+    {
+    case encrypt:
+#ifdef DEBUG_TEST
+        printf("encrypt\n");
+#endif
+        plaintext_bi = bi_import(bi_ctx, data, data_length);
+        enc_data_bi = RSA_public(rsa_context, plaintext_bi);
+        bi_export(bi_ctx, enc_data_bi, result, result_length);
+        break;
+
+    case decrypt:
+
+#ifdef DEBUG_TEST
+        printf("decrypt\n");
+#endif
+        plaintext_bi = bi_import(bi_ctx, data, data_length);
+        dec_data_bi = RSA_private(rsa_context, plaintext_bi);
+        bi_export(bi_ctx, dec_data_bi, result, result_length);
+        break;
+    }
+#ifdef DEBUG_TEST
+    hex_dump("result", result, result_length);
+#endif
+
+    RSA_free(rsa_context);
+}
+
+void test_matching(char* test_description, 
+                   const unsigned char* expected, const unsigned int expected_length,
+                   const unsigned char* result, const unsigned int result_length)
+{
+    int test_result = memcmp(expected, result, expected_length);
+    printf("Testing %s ... ", test_description);
+    if(test_result == 0)
+    {
+        printf("ok.\n");
+    }
+    else
+    {
+        printf("failed!\n");
+        hex_dump("should be", expected, expected_length);
+        hex_dump("but is", result, result_length);
+    }
+}
+
+void encrypt_decrypt_should_yield_original(char* test_description,
+                                           const unsigned char* data, const unsigned int data_length,
+                                           const unsigned char* modulus, const unsigned int modulus_length,
+                                           const unsigned char* private_exponent, const unsigned int private_exponent_length,
+                                           const unsigned char* public_exponent, const unsigned int public_exponent_length,
+                                           const unsigned char* cryptogram, const unsigned int cryptogram_length)
+{
+    const unsigned int calculated_cryptogram_length = modulus_length;
+    unsigned char* calculated_cryptogram = malloc(calculated_cryptogram_length);
+    const unsigned int decrypted_data_length = modulus_length;
+    unsigned char* decrypted_data = malloc(decrypted_data_length);
+
+    printf("\nRunning \"%s\" ...\n", test_description);
+
+#ifdef DEBUG_TEST
+    printf("encrypt_decrypt_should_yield_original:\n");
+    hex_dump("data", data, data_length);
+    hex_dump("modulus", modulus, modulus_length);
+    hex_dump("private_exponent", private_exponent, private_exponent_length);
+    hex_dump("public_exponent", public_exponent, public_exponent_length);
+    hex_dump("cryptogram", cryptogram, cryptogram_length);
+#endif
+
+    do_rsa(encrypt, data, data_length,
+           modulus, modulus_length,
+           private_exponent, private_exponent_length,
+           calculated_cryptogram, calculated_cryptogram_length);
+
+#ifdef DEBUG_TEST
+    hex_dump("calculated_cryptogram", calculated_cryptogram, calculated_cryptogram_length);
+#endif
+
+    if(cryptogram != NULL)
+    {
+        test_matching("cryptogram", cryptogram, cryptogram_length, 
+                                    calculated_cryptogram, calculated_cryptogram_length);
+    }
+
+    do_rsa(decrypt, calculated_cryptogram, calculated_cryptogram_length,
+           modulus, modulus_length,
+           public_exponent, public_exponent_length,
+           decrypted_data, decrypted_data_length);
+
+    test_matching("decrypted plaintext", data, data_length,
+                                         decrypted_data, decrypted_data_length);
+
+    free(calculated_cryptogram);
+    free(decrypted_data);
+}
+
+/* configure without CRT!
+
+   prepare data with: 
+   > echo "<string>" |
+     ruby -ne '$_.gsub!(/ /, "").scan(/../).each_with_index \
+      { |b, i| print "\"\n\"" if i % 16 == 0; print "\\x" + b;}' */
+int main(int argc, char *argv[])
+{
+#if 0
+    unsigned char stuff[] = { 
+        0x22, 0x33, 0x44, 0x81, 
+        0xF1, 0xFF, 0xAA, 0xBB, 
+        0xCC, 0xDD, 0xEE , 0x01,
+        0x45, 0x44, 0xfa, 0x8d,
+        0xfa, 0x20, 0x99, 0xFF,
+        0xab, 0xda, 0xac, 0x40 };
+    unsigned char resA[sizeof(stuff)*2], resB[sizeof(stuff)*2];
+
+    BI_CTX *bi_ctx = bi_initialize();
+    bigint *bi_data1, *bi_data2, *res1, *res2;
+    bi_data1 = bi_import(bi_ctx, stuff, sizeof(stuff));
+    bi_data2 = bi_import(bi_ctx, stuff, sizeof(stuff));
+
+    res1 = bi_multiply(bi_ctx, bi_copy(bi_data1), bi_copy(bi_data2));
+    res2 = bi_multiply(bi_ctx, bi_data1, bi_data2);
+    bi_print("MULTIPLY", res1);
+    bi_print("SQUARE", res2);
+    bi_export(bi_ctx, res1, resA, sizeof(resA));
+    bi_export(bi_ctx, res2, resB, sizeof(resB));
+    if (memcmp(resA, resB, sizeof(resA)))
+        printf("OUCH - difference!\n");
+    bi_terminate(bi_ctx);
+
+    exit(0);
+#endif
+    encrypt_decrypt_should_yield_original("Works only with Montgomery",
+        (const unsigned char*) /* data */
+        "\xBC\xD3\x12\x6C\x93\x13\x14\x4C\x00\x5D\xFD\xBF\xDE\xE4\xD3\x60"
+        "\x29\xB8\xAE\x47\xBE\x0B\xB6\x0A\x39\x88\xB7\x93\x19\x14\xE8\x88"
+        "\x4A\xDE\x00\x46\x89\x5A\x11\x1A\xC4\x8F\xE8\xF7\x27\xAC\x59\x80"
+        "\x03\xC1\x93\x14\x01\x00\x93\x15\x07\x00\x00\x00\x01\x01\x05\x20"
+        "\x93\x16\x0F\x42\x34\x33\x3A\x58\x30\x30\x30\x31\x30\x31\x30\x30"
+        "\x30\x31\x92\x6B\x10\x6C\x69\x62\x65\x6C\x6D\x65\x74\x72\x65\x65"
+        "\x2E\x73\x6F\x2E\x30\x93\x18\x02\xA5\x92\x92\x6C\x03\x96\xE3\x0C"
+        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xB7\xBE", 128,
+        (const unsigned char*) /* modulus */
+        "\xc4\x5a\xcb\x35\x95\xad\x32\x4a\xcf\x9c\x82\x45\x13\xb7\x42\x35"
+        "\x22\x32\x6d\x2e\x6d\x26\x2e\x6d\x00\x9b\xae\x2d\x9e\x78\x1e\xdd"
+        "\x40\x23\x17\xa8\xbb\xa1\x07\x86\xb4\x3c\xbc\xe8\xd5\xfc\xd9\xeb"
+        "\x3c\xad\x63\x11\xf3\x1d\x64\x81\x96\xf2\xf5\xfe\xca\x5a\xf7\x8a"
+        "\x15\xcb\x90\x81\x68\xae\x59\xb4\xe1\xa4\x41\x99\xcd\xf3\x98\xbd"
+        "\x3c\x48\x37\xdb\xa1\xc3\x1c\x6f\x43\xd1\x89\x23\xe5\x3d\xa3\xa5"
+        "\x92\x7b\x19\x14\x1e\x7a\xf3\x88\x8a\x36\x21\x3e\x16\x40\x3c\xd7"
+        "\xd3\xdb\x13\xaf\xc9\x68\x45\x84\xb3\x39\x8f\x02\xed\x28\x02\x5f", 128,
+        (const unsigned char*) /* private exponent */
+        "\x5d\x19\xb7\xb4\x66\x8d\xc2\x84\xda\x3f\x99\x3c\xeb\x86\x3e\xec"
+        "\x36\x94\xb6\x54\x07\x08\xcd\x86\x7d\x7d\x53\x6e\xe9\xee\x86\xa3"
+        "\xdd\x5f\x46\x3e\x89\x08\x67\x2b\x25\x96\x8e\xf3\xcf\x52\x9e\x78"
+        "\xfd\x42\x30\xf1\x37\xd6\xbd\xea\xfc\x09\xa3\x3d\xf5\xf0\x7f\xe1"
+        "\xb1\xe0\x69\x13\x44\xf9\x8b\x95\x58\x2a\x81\xb3\xa8\x15\xce\x7e"
+        "\xd3\xea\x97\x0a\xa2\x14\xd4\xae\xc7\x75\xbb\x9f\x68\xa5\x53\x0e"
+        "\x85\x29\x88\x48\x6c\xc9\xcc\xde\x72\x40\x3a\x4c\x82\xde\x3c\xfb"
+        "\x08\xf8\x2c\x26\xb5\xd4\xea\xc4\xca\x98\x6e\x43\x3e\x67\x54\xc1", 128,
+        (const unsigned char*) /* public exponent */
+        "\x01\x00\x01", 3,
+        (const unsigned char*) /* precalculated encrypted data */
+        "\x93\xE8\x1F\xF9\x70\xFA\xAA\xED\x54\xFD\x48\x37\xC9\x71\x9A\x11"
+        "\x69\x80\xB4\x22\x0C\xAD\x5A\x95\x65\xCA\x7C\xF7\x70\x56\x92\xCB"
+        "\x45\x6D\x58\x84\x21\x80\x23\x76\x21\x4A\x61\x99\xC1\x11\x9C\x0F"
+        "\x40\xED\x80\x9C\x8F\x3A\x4F\x01\xB5\x72\xC3\x24\xAE\xF3\x6B\x98"
+        "\xA8\x60\xAC\xAF\x95\x98\x9A\xAA\xA4\x28\xF2\x02\x05\xFC\xF3\xDD"
+        "\xB0\x5A\x4E\xDE\x3C\x41\x4B\x1C\x5B\x1F\xF6\x3D\xAF\x93\x43\xCB"
+        "\xD8\xC7\x24\x97\x8F\x49\xE5\x5B\x10\x51\x3B\x1E\xA6\x39\xEA\x4E"
+        "\xA5\xE0\x71\x8C\xCA\x34\x8C\x2F\x6C\x5C\x78\x34\x86\x7C\x54\x6A", 128);
+
+    encrypt_decrypt_should_yield_original("Works only with Barrett",
+        (const unsigned char*) /* data */
+        "\x36\x42\x32\xe4\x1e\x78\x02\x8e\xfb\x64\x5f\x0c\xfc\x5a\xd7\x5c"
+        "\xe4\xb5\x91\x5c\x4b\x00\x87\x28\x87\x9b\xa0\x4b\x09\xc2\x6b\x64"
+        "\xac\x4b\xcf\xa5\xee\x8a\xb7\xc9\xc9\x90\x02\xc1\xa3\x47\x5c\x6b"
+        "\x71\x5d\x5d\x49\x27\xe1\x15\xc6\xcf\x37\x9e\xa7\x0f\xa1\xad\x96"
+        "\x83\xef\x4b\x53\x68\xcd\x77\xfc\x14\x5f\xf5\xb7\x78\xb0\x10\xeb"
+        "\x0d\x61\x94\x01\xf6\xaa\x1b\x19\x23\x39\xa7\xcc\x6c\x42\x4a\x87"
+        "\x79\x27\x04\xc6\xec\x8e\x50\xba\xb9\x26\x89\xd4\x00\x01\x25\xe5"
+        "\xf3\x9e\x98\x0c\x8d\x2e\x43\x1e\xe9\x29\x90\xd2\x75\x61\x85\xe7", 128,
+        (const unsigned char*) /* modulus */
+        "\x37\x0c\x32\xe4\x1e\x78\x02\x8e\xfb\x64\x5f\x0c\xfc\x5a\xd7\x5c"
+        "\xe4\xb5\x91\x5c\x4b\x00\x87\x28\x87\x9b\xa0\x4b\x09\xc2\x6b\x64"
+        "\xac\x4b\xcf\xa5\xee\x8a\xb7\xc9\xc9\x90\x02\xc1\xa3\x47\x5c\x6b"
+        "\x71\x5d\x5d\x49\x27\xe1\x15\xc6\xcf\x37\x9e\xa7\x0f\xa1\xad\x96"
+        "\x83\xef\x4b\x53\x68\xcd\x77\xfc\x14\x5f\xf5\xb7\x78\xb0\x10\xeb"
+        "\x0d\x61\x94\x01\xf6\xaa\x1b\x19\x23\x39\xa7\xcc\x6c\x42\x4a\x87"
+        "\x79\x27\x04\xc6\xec\x8e\x50\xba\xb9\x26\x89\xd4\x00\x01\x25\xe5"
+        "\xf3\x9e\x98\x0c\x8d\x2e\x43\x1e\xe9\x29\x90\xd2\x75\x61\x85\xe7", 128,
+        (const unsigned char*) /* private exponent */
+        "\x16\x3a\x76\xd2\x66\xfb\x4f\x0d\x2d\xb6\x7a\x2b\x64\x3b\xca\x7b"
+        "\x58\x5f\x79\x33\x2b\x96\x2a\xfd\xd2\xc4\xa5\x15\xa7\xfb\x3a\x22"
+        "\x8c\xf0\x90\x09\x11\x2a\x32\xcc\xe8\xf7\x9e\x25\x53\x29\x9d\xc8"
+        "\x45\x1e\xce\x6c\x9c\x0d\xe8\x1d\x3f\xcf\xd5\xe0\xe0\x0f\x09\x69"
+        "\x2d\xe7\xd5\xe6\xe5\x10\xd9\x4e\x20\xdb\xbd\xa1\x04\x6b\xe6\x1d"
+        "\x4c\x79\x28\x47\x30\x11\xde\x14\xb4\x6e\x35\x98\x38\x50\x44\x82"
+        "\xbd\xc4\xfb\x03\xb3\xf6\x5e\x5a\x29\xfa\x29\xaa\xde\xe4\xfd\x15"
+        "\xbe\xed\x4f\x93\x9d\x0d\x29\xe8\xd7\xa3\xf4\x18\xc8\x98\xb1\x01", 128, 
+        (const unsigned char*) /* public exponent */
+        "\x01\x00\x01", 3,
+        NULL, 0);
+
+    encrypt_decrypt_should_yield_original("Works always",
+        (const unsigned char*) /* data */
+        "\xB9\x42\x32\xe4\x1e\x78\x02\x8e\xfb\x64\x5f\x0c\xfc\x5a\xd7\x5c"
+        "\xe4\xb5\x91\x5c\x4b\x00\x87\x28\x87\x9b\xa0\x4b\x09\xc2\x6b\x64"
+        "\xac\x4b\xcf\xa5\xee\x8a\xb7\xc9\xc9\x90\x02\xc1\xa3\x47\x5c\x6b"
+        "\x71\x5d\x5d\x49\x27\xe1\x15\xc6\xcf\x37\x9e\xa7\x0f\xa1\xad\x96"
+        "\x83\xef\x4b\x53\x68\xcd\x77\xfc\x14\x5f\xf5\xb7\x78\xb0\x10\xeb"
+        "\x0d\x61\x94\x01\xf6\xaa\x1b\x19\x23\x39\xa7\xcc\x6c\x42\x4a\x87"
+        "\x79\x27\x04\xc6\xec\x8e\x50\xba\xb9\x26\x89\xd4\x00\x01\x25\xe5"
+        "\xf3\x9e\x98\x0c\x8d\x2e\x43\x1e\xe9\x29\x90\xd2\x75\x61\x85\xe7", 128,
+        (const unsigned char*) /* modulus */
+        "\xB9\x77\xEC\x83\x95\xAF\xB1\xF8\x21\x21\xFF\x05\x5E\x0C\x91\x0C"
+        "\x2E\xD5\xD2\x94\x1C\x38\x5E\xED\x5A\xCF\x84\xD0\x12\x8B\xAA\x4B"
+        "\x3A\x63\x65\x78\x13\xED\x24\x4E\x83\xF2\xF5\x02\x66\x5D\xFC\xC1"
+        "\x80\x5B\x78\x78\xB4\x0B\x45\xE5\x22\xC6\xCD\xEB\xCC\x74\x0B\x0B"
+        "\xD8\x8B\x91\x99\x48\x8E\x74\xA9\xD0\x1A\x39\x94\xC2\xD4\x2E\x9A"
+        "\x8C\x0C\x35\x0D\x97\x8F\xC4\x62\x20\xE9\x78\x40\x97\x05\x98\xE6"
+        "\x22\x48\x3D\x3D\xCA\x6A\x3F\xEF\xB0\x23\x14\x30\xDA\x35\x46\x65"
+        "\x55\xEF\xEB\xA1\xA9\xCF\x83\xE7\xEF\xF2\x83\x6D\x38\xEA\x88\xED", 128,
+        (const unsigned char*) /* private exponent */
+        "\x52\x2A\x68\xE3\x9A\xAA\xED\xA3\x49\xBA\x6F\xEA\x86\xD1\xF6\x68"
+        "\x79\x4F\x4D\x2D\x44\x9B\x4C\xA2\xC6\xBA\x6C\xD2\x69\x84\xEA\x7A"
+        "\xCD\x71\x3F\x80\xC5\x03\x28\x34\x88\x8C\x58\x33\x29\xFA\xB5\x81"
+        "\x5C\x46\x29\xC6\xFF\xAC\x86\xD8\x8E\x61\x98\xD4\xC0\x0D\x20\xDE"
+        "\xEB\x61\x1C\x0C\x3C\x19\xA3\x75\x10\x7D\xDA\xA9\x55\xA7\x64\x5F"
+        "\xE0\xB6\x35\x62\x00\xD9\xD2\xF7\xA4\xDF\x85\xFF\xDF\x86\x75\x29"
+        "\x66\x16\x03\x8C\xC0\xB0\x3F\xAB\xBA\x41\xB3\x3C\x76\x58\xB6\xE2"
+        "\x1F\x36\x47\x5F\x1F\x0E\x4C\xB5\x29\x90\xDC\xA1\xF8\xFA\x58\x19", 128,
+        (const unsigned char*) /* public exponent */
+        "\x01\x00\x01", 3,
+        NULL, 0);
+
+    return 0;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/deutsche_telecom.x509_ca b/trunk/package/luci/libs/nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
new file mode 100644
index 0000000000000000000000000000000000000000..0f4b96a0d5b66ac34b258e34a8943630d55feacc
GIT binary patch
literal 670
zcmXqLVwz>p#KgRSnTe5!iBZLXmyJ`a&7<u*FC!xhD}zCyA-4f18*?ZNn=q4$tD%g6
z6o|tmEbNk6T2h>xk*W}qnv<HHpR3^LZYXac3zFp)77Nh@2?wVpD})r47MCbEr{<NU
z78xoVD1sC)3rk^W56aI6DsxmYG>{YLwX`%aH?TA`G&V6Xh!W>D1apmyO)Y`kfpAje
zeB^LpWMyD(>}4=$>||<eWVmp5HqQca7Z?8ZiVnr;VIS-=GX!_tH2>7N?y$<5%!OzF
zERzTg``<m^=-}<=6*`u;6B-?tzQ267p;yA@Q4kOJ{O>9Ao-X*XBQfdA{s)V1MQHyO
zWy#)aHLqswC)*oOrXGIdcj#m4Y98-5?oH8;9tM=&_?EauBId2}0&ltI-~KIoDw&uW
z85kEk890CgUzU$Wj73Dm@KODoQ$kaJe=JbA?W-YN=#+TOfFBt2vcfDJ25gLs|CtzB
z4fsF;{6G#13o!QCki7_udS;;C=E@5EntVbwMZq<0PCjey;-LEFE80^xr_VBLt0)o^
z{eRuHSc9>xWA4OP_pWJj^Vlt(S>nKR=8eFEls^UAc3BFke~M!W*vfs)>;B68FPk|v
z8vb08JMyN$t<~qA>juWD7Hh=jyLr9SJ-zpI>PD-l%e+~<`HcU|RG(;Raeo+<;^qYa
DuXy4z

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/equifax.x509_ca b/trunk/package/luci/libs/nixio/axTLS/ssl/test/equifax.x509_ca
new file mode 100644
index 0000000000000000000000000000000000000000..79b0a3f98764a07fdf6cae1a80eebf704d1f8796
GIT binary patch
literal 646
zcmXqLVrnvIVtl=TnTe5!iIK&CmyJ`a&7<u*FC!xhD}zC>A-4f18*?ZNn=n&ou%V2B
z6o|tmEbLlXnwgeZp%9#!Tw0W>;F*`KXQ*bN0+MAGmPM0Ibt)~+%u6jUR&aLIH8hYD
z=e4vnFf%eVFfjmvC~;mR10*hOENz^R>^DYM2Ij_I27|^<rp88wbNZ5d#J88<o4hhU
zidWp<M2cs|7p0q#SB_-3eb{1pw3S)m*m~Ecih-_<uf-zFjPf4^B&GcP8#rf`%FQox
zo3+}x6fX-|nB?>_<V7vG>GV!Yaq7<?pU|kI{1*OhzjA-*nO>8vdHv|ahSG);D}~qW
z>v(UKw>n<SB8h2(Q1!q5Wz0;>j0}v6(+pA!1lc$f+B_KBemDWcpM{x;f!%-~7^bqq
zjEw(TSPhtglz}`*K$%6tK&(N;tHLNq@OGq_S={}DB4!R*?lnFO4P-$I_*lePuuG#x
zF*DHrrO_*9GYdX@8Rm2L=SrUgyt6)^NzHtwT6QLK`?Zk6vS(+mk-WR5_38uLKS>J9
zTf8GuKR)_7Rnh+ImAVKy_x2FGh=p6X{?K|~_<YadZyP<`9$jCM{WPp<mimkuw<MA0
oC;#Lz3sp8)$a*yO{t^GDHBEbK(z0c?d+R4fo{iFK+GJh{0RBANs{jB1

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/gnutls.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/gnutls.cer
new file mode 100755
index 0000000000000000000000000000000000000000..312e3654048b040de7fe4267a0a16abbf0ddcb49
GIT binary patch
literal 599
zcmXqLVhT2BV%)cYnTe5!iIKs8n~hVe&7<u*FC!zXfuy0hfhZeuC=0VNpL<?uh)=LW
zNosM4g0rK6oH(z6xq*>^nW3?Pk)dG}kZXa&H83}nHjo5q<q{S`)>@oeRF+y~C}AK5
zF_#}?pk8`jX-Q78UVc%!LE{``H!w0c_AnSUb}%(IT;CP5elgDny_M==tAhJhysmF7
z^~s*G&+FB8xgXw#vyR;2W!Uk`M_ArWZ1TOL_s5pRZOYqrimM~Ebi%Z^%fk2YSeNlm
zm)raDP5tGSZ+^F?EXZEqajv|sc#fg)f7=u5mL}xg+}0B{D}UR*`B{6He^_9w{&l<T
zq^Hy76bD_Kf9*uyMkZ!P2FAsWlMNat81MicFDuN*_@9NzfWbft#1mu@HV|yW@QyG@
zPL+knfQyYon~jl`m7ST<fFC5t57N%c%*?)k!9W%yz{euSBJ%pUYu?izs;7E-n|VuK
zwq3a!x~0@W9we>I0t~bUk(V|yzt>L6d&agTOlQ%<1HtMiK21dqF;?crMuy~AZ)cCC
zcar#4F@K*Wyr$(`<HptT7O&4J|9f&n)qSPYC;gzEw%hKqa<W{pkzIUC@@MwK@U^qF
z#aa!DpH8{)sPR|c_u?y$q{^z4PiEbye|q9%ZPT9;e}l~Ux~wgNHv0s(Rjhumd^F+7
evq?93r>=edOf)X_qG#W2@k=EugP0m@R{;Q^*WZi)

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/header_issue.dat b/trunk/package/luci/libs/nixio/axTLS/ssl/test/header_issue.dat
new file mode 100755
index 0000000000000000000000000000000000000000..a48d23d2b937820a533bc1394d6c155fd28c1959
GIT binary patch
literal 1159
zcmWe*W@Kq%Vqj2XW^_B{aBjXp>E)wm*3`MA7YKbx?VUNb&ow+D@R^CtrU!`(45kd+
z3@iZ*EWQj(j0R1Ne}Q;86SDvVivceir&gOs+jm|@Mpjk^gU02C@&>YO%%Ln?!eYS%
znMJ92B?`{@xw)lznaPPInfZCehI|G*AO+mQtO1U?;Q@xK2Fh?lI2pynic1R$@{39w
ziXqyQ^K<op*igto0HlpwnA0_}BtNetzdX;7+kg`!#v#n)=LO@i2{VNT!(72EECw|O
z%@qc6;=Gm?28ISkhGs@4CMHqhyoTn6Mn)D;u0bZMc_=oK>_r&^DUdsvg@wz@%k`ix
z(#=UO2Kme&200WNSs9qU84Ns_92wpo`5|5!qql9!X6NU%!l&1>n0uS&D5^(1N_N=q
zT3#1Xo$~t3DZM?rcUCRjoTpWPC&fDJUdopHOj#<c1G(LwuVi9oWMD)#8yG{(jtrqD
z41)X>EUEFSSFWs-_7#%qy;W$R;IY>2#oG<fXG~^lsd#>L(LO(Mop($Bszg1H5j-<7
zYyB}vW~D>tw?BFLXek4en?Vzk6EF?DVd7-C`OWT+eQSgcnmt1@C72qS8d)Mz0)#t+
ze1a<>?d5STc=(BH&V_n5t}ZuuwkKi#Kd5eDJK@OGejq5*ct+H>r89oKDBiP7sKoTQ
zuBR~j#n<b<tD5jM{jdpG`eP!lgv7<}tK_qnn`h4s-YY5TZ~Z?0UHbX&QZpIN-d7Jz
un{I{ue9ZX$@8k2^^|rJ(9awhqU;wwnhlMXaQ!Q?q>TEypxQCB{fdK$z?p#a&

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/killopenssl.sh b/trunk/package/luci/libs/nixio/axTLS/ssl/test/killopenssl.sh
new file mode 100755
index 00000000..17950fba
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/killopenssl.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ps -ef|grep openssl | /usr/bin/awk '{print $2}' |xargs kill -9
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/make_certs.sh b/trunk/package/luci/libs/nixio/axTLS/ssl/test/make_certs.sh
new file mode 100755
index 00000000..dfc39d4f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/make_certs.sh
@@ -0,0 +1,174 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# Generate the certificates and keys for testing.
+#
+
+PROJECT_NAME="axTLS Project"
+
+# Generate the openssl configuration files.
+cat > ca_cert.conf << EOF  
+[ req ]
+distinguished_name     = req_distinguished_name
+prompt                 = no
+
+[ req_distinguished_name ]
+ O                      = $PROJECT_NAME Dodgy Certificate Authority
+EOF
+
+cat > certs.conf << EOF  
+[ req ]
+distinguished_name     = req_distinguished_name
+prompt                 = no
+
+[ req_distinguished_name ]
+ O                      = $PROJECT_NAME
+ CN                     = 127.0.0.1
+EOF
+
+cat > device_cert.conf << EOF  
+[ req ]
+distinguished_name     = req_distinguished_name
+prompt                 = no
+
+[ req_distinguished_name ]
+ O                      = $PROJECT_NAME Device Certificate
+EOF
+
+# private key generation
+openssl genrsa -out axTLS.ca_key.pem 1024
+openssl genrsa -out axTLS.key_512.pem 512
+openssl genrsa -out axTLS.key_1024.pem 1024
+openssl genrsa -out axTLS.key_2048.pem 2048
+openssl genrsa -out axTLS.key_4096.pem 4096
+openssl genrsa -out axTLS.device_key.pem 1024
+openssl genrsa -aes128 -passout pass:abcd -out axTLS.key_aes128.pem 512
+openssl genrsa -aes256 -passout pass:abcd -out axTLS.key_aes256.pem 512
+
+# convert private keys into DER format
+openssl rsa -in axTLS.key_512.pem -out axTLS.key_512 -outform DER
+openssl rsa -in axTLS.key_1024.pem -out axTLS.key_1024 -outform DER
+openssl rsa -in axTLS.key_2048.pem -out axTLS.key_2048 -outform DER
+openssl rsa -in axTLS.key_4096.pem -out axTLS.key_4096 -outform DER
+openssl rsa -in axTLS.device_key.pem -out axTLS.device_key -outform DER
+
+# cert requests
+openssl req -out axTLS.ca_x509.req -key axTLS.ca_key.pem -new \
+            -config ./ca_cert.conf 
+openssl req -out axTLS.x509_512.req -key axTLS.key_512.pem -new \
+            -config ./certs.conf 
+openssl req -out axTLS.x509_1024.req -key axTLS.key_1024.pem -new \
+            -config ./certs.conf 
+openssl req -out axTLS.x509_2048.req -key axTLS.key_2048.pem -new \
+            -config ./certs.conf 
+openssl req -out axTLS.x509_4096.req -key axTLS.key_4096.pem -new \
+            -config ./certs.conf 
+openssl req -out axTLS.x509_device.req -key axTLS.device_key.pem -new \
+            -config ./device_cert.conf
+openssl req -out axTLS.x509_aes128.req -key axTLS.key_aes128.pem \
+            -new -config ./certs.conf -passin pass:abcd
+openssl req -out axTLS.x509_aes256.req -key axTLS.key_aes256.pem \
+            -new -config ./certs.conf -passin pass:abcd
+
+# generate the actual certs.
+openssl x509 -req -in axTLS.ca_x509.req -out axTLS.ca_x509.pem \
+            -sha1 -days 10000 -signkey axTLS.ca_key.pem
+openssl x509 -req -in axTLS.x509_512.req -out axTLS.x509_512.pem \
+            -sha1 -CAcreateserial -days 10000 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+openssl x509 -req -in axTLS.x509_1024.req -out axTLS.x509_1024.pem \
+            -sha1 -CAcreateserial -days 10000 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+openssl x509 -req -in axTLS.x509_2048.req -out axTLS.x509_2048.pem \
+            -md5 -CAcreateserial -days 10000 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+openssl x509 -req -in axTLS.x509_4096.req -out axTLS.x509_4096.pem \
+            -md5 -CAcreateserial -days 10000 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+openssl x509 -req -in axTLS.x509_device.req -out axTLS.x509_device.pem \
+            -sha1 -CAcreateserial -days 10000 \
+            -CA axTLS.x509_512.pem -CAkey axTLS.key_512.pem
+openssl x509 -req -in axTLS.x509_aes128.req \
+            -out axTLS.x509_aes128.pem \
+            -sha1 -CAcreateserial -days 10000 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+openssl x509 -req -in axTLS.x509_aes256.req \
+            -out axTLS.x509_aes256.pem \
+            -sha1 -CAcreateserial -days 10000 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+
+# note: must be root to do this
+DATE_NOW=`date`
+if date -s "Jan 1 2025"; then
+openssl x509 -req -in axTLS.x509_512.req -out axTLS.x509_bad_before.pem \
+            -sha1 -CAcreateserial -days 365 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+date -s "$DATE_NOW"
+touch axTLS.x509_bad_before.pem
+fi
+openssl x509 -req -in axTLS.x509_512.req -out axTLS.x509_bad_after.pem \
+            -sha1 -CAcreateserial -days -365 \
+            -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem
+
+# some cleanup
+rm axTLS*.req
+rm axTLS.srl
+rm *.conf
+
+# need this for the client tests
+openssl x509 -in axTLS.ca_x509.pem -outform DER -out axTLS.ca_x509.cer 
+openssl x509 -in axTLS.x509_512.pem -outform DER -out axTLS.x509_512.cer
+openssl x509 -in axTLS.x509_1024.pem -outform DER -out axTLS.x509_1024.cer
+openssl x509 -in axTLS.x509_2048.pem -outform DER -out axTLS.x509_2048.cer
+openssl x509 -in axTLS.x509_4096.pem -outform DER -out axTLS.x509_4096.cer
+openssl x509 -in axTLS.x509_device.pem -outform DER -out axTLS.x509_device.cer
+
+# generate pkcs8 files (use RC4-128 for encryption)
+openssl pkcs8 -in axTLS.key_512.pem -passout pass:abcd -topk8 -v1 PBE-SHA1-RC4-128 -out axTLS.encrypted_pem.p8
+openssl pkcs8 -in axTLS.key_512.pem -passout pass:abcd -topk8 -outform DER -v1 PBE-SHA1-RC4-128 -out axTLS.encrypted.p8
+openssl pkcs8 -in axTLS.key_512.pem -nocrypt -topk8 -out axTLS.unencrypted_pem.p8
+openssl pkcs8 -in axTLS.key_512.pem -nocrypt -topk8 -outform DER -out axTLS.unencrypted.p8
+
+# generate pkcs12 files (use RC4-128 for encryption)
+openssl pkcs12 -export -in axTLS.x509_1024.pem -inkey axTLS.key_1024.pem -certfile axTLS.ca_x509.pem -keypbe PBE-SHA1-RC4-128 -certpbe PBE-SHA1-RC4-128 -name "p12_with_CA" -out axTLS.withCA.p12 -password pass:abcd
+openssl pkcs12 -export -in axTLS.x509_1024.pem -inkey axTLS.key_1024.pem -keypbe PBE-SHA1-RC4-128 -certpbe PBE-SHA1-RC4-128 -name "p12_without_CA" -out axTLS.withoutCA.p12 -password pass:abcd
+openssl pkcs12 -export -in axTLS.x509_1024.pem -inkey axTLS.key_1024.pem -keypbe PBE-SHA1-RC4-128 -certpbe PBE-SHA1-RC4-128 -out axTLS.noname.p12 -password pass:abcd
+
+# PEM certificate chain
+cat axTLS.ca_x509.pem >> axTLS.x509_device.pem
+
+# set default key/cert for use in the server
+xxd -i axTLS.x509_1024.cer | sed -e \
+        "s/axTLS_x509_1024_cer/default_certificate/" > ../../ssl/cert.h
+xxd -i axTLS.key_1024 | sed -e \
+        "s/axTLS_key_1024/default_private_key/" > ../../ssl/private_key.h
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/microsoft.x509_ca b/trunk/package/luci/libs/nixio/axTLS/ssl/test/microsoft.x509_ca
new file mode 100644
index 0000000000000000000000000000000000000000..b90803452b6cd92749d3e34c60420fd20e5b1c4f
GIT binary patch
literal 1046
zcmXqLVi7WEV*0g!nTe5!iJ##hL${4hhu}rKZ^>`&I~ee?acZ@Bw0-AgWMpAwFeot8
zHqc~a4rSpMR&vfSs4U7%&nQvQNY+#^w6ru=@Xbsv$}i4OD^YOHFDlS8lrxZlC>BMP
z$uCMQ$;{6)R5XwW$ukQ}AmoGc^Gg&QOG`5Hi!w_p4dldmEzJ!K4Gj#;4S*m@oY%;}
z(8$;j${hd~H8Cn72MZ%B19KB2KZ8LNBNtN>BO}8~ro9IXo>_nLlh&9&y&}%w)uNTX
zs_{SmP4!v4{omY03U)Pti)JtCPcX{9=#*0VZcW+AkXxT#&uNqCpWl+U`Dk`klJYfK
zn|u6>lU__avR^lC)~pP*nHQ{d_Va9wP&?@MoXgH)n$AiM%N1`to1GrF@b8|L6PmcD
zsb*n<Zn@9PnOjn<X9dU@a;S*RU-^8Zw!|~r8Ob6E5v-~6WzB=yzb}73h3S~|<^7?q
zn>!o!TfGUH;<xVa@~Yetzx5Jlrg3U0GK5b^$TZ*WEyQjU_CNafk~A)kWtSSm!ryPR
zjuUGvXSwxl-@1mW|2CYhzqVYeD8}a0o(~+0l?*nswVvFpP%hkhpNW}~fpKx;3WLU_
z291k=@hi*7(m2bYae9M5^o4@=nML!I1M5UK`S$%ky|9S>@z+EkjRPZ-kzwi!?gPD_
zr%RZ=-NC4Gqg?QFOoGw;dEBS%SSNP$pR{_W_~}FVWSy-G+)pIE|8xC}wRO}=vyjYx
zD!KM2&#bz~T65R1*LJ=@LDuenLjDq&2mV}eek>TJ;QuPAdi^TN6WZpgy8BWW3U#US
zColdUBJ)%6<TcUHL2L4yjoAM-iT`+-p2HjXZSTjR<9nYUG5Dik$k`z~Ra46Msw~se
zj|~r)w?u#0c=ts3yHwBPK_T0=Flz|?pK$F1M}OUp=|@+a>pZD?vZDNP*#d?OS@s7n
znRPvI6k1`LC7pHK^x+j5mM1G*Sx!V5Tjcr5@Fs2NTGVs-YKXntS((sf1-FH)+9#LJ
IUw&x;05YnPSO5S3

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem
new file mode 100644
index 00000000..478e60b0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEEjCCAvqgAwIBAgIPAMEAizw8iBHRPvZj7N9AMA0GCSqGSIb3DQEBBAUAMHAx
+KzApBgNVBAsTIkNvcHlyaWdodCAoYykgMTk5NyBNaWNyb3NvZnQgQ29ycC4xHjAc
+BgNVBAsTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEhMB8GA1UEAxMYTWljcm9zb2Z0
+IFJvb3QgQXV0aG9yaXR5MB4XDTk3MDExMDA3MDAwMFoXDTIwMTIzMTA3MDAwMFow
+cDErMCkGA1UECxMiQ29weXJpZ2h0IChjKSAxOTk3IE1pY3Jvc29mdCBDb3JwLjEe
+MBwGA1UECxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSEwHwYDVQQDExhNaWNyb3Nv
+ZnQgUm9vdCBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpAr3BcOY78k4bKJ+XeF4w6qKpjSVf+P6VTKO3/p2iID58UaKboo9gMmvRQmR5
+7qx2yVTa8uuchhyPn4Rms8VremIj1h083g8BkuiWxL8tZpqaaCaZ0Dosvwy1WCbB
+RucKPjiWLKkoOajsSYNC44QPu5psVWGsgnyhYC13TOmZtGQ7mlAcMQgkFJ+p55Er
+GOY9mGMUYFgFZZ8dN1KH96fvlALGG9O/VUWziYC/OuxUlE6u/ad6bXROrxjMlgko
+IQBXkGBpN7tLEgc8Vv9b+6RmCgim0oFWV++2O14WgXcE2va+roCV/rDNf9anGnJc
+PMq88AijIjCzBoXJsyB3E4XfAgMBAAGjgagwgaUwgaIGA1UdAQSBmjCBl4AQW9Bw
+72lyniNRfhSyTY7/y6FyMHAxKzApBgNVBAsTIkNvcHlyaWdodCAoYykgMTk5NyBN
+aWNyb3NvZnQgQ29ycC4xHjAcBgNVBAsTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEh
+MB8GA1UEAxMYTWljcm9zb2Z0IFJvb3QgQXV0aG9yaXR5gg8AwQCLPDyIEdE+9mPs
+30AwDQYJKoZIhvcNAQEEBQADggEBAJXoC8CN85cYNe24ASTYdxHzXGAyn54Lyz4F
+kYiPyTrmIfLwV5MstaBHyGLv/NfMOztaqTZUaf4kbT/JzKreBXzdMY09nxBwarv+
+Ek8YacD80EPjEVogT+pie6+qGcgrNyUtvmWhEoolD2Oj91Qc+SHJ1hXzUqxuQzIH
+/YIX+OVnbA1R9r3xUse958Qw/CAxCYgdlSkaTdUdAqXxgOADtFv0sd3IV+5lScdS
+VLa0AygS/5DW8AiPfriXxas3LOR65Kh343agANBqP8HSNorgQRKoNWobats14dQc
+BOSoRQTIWjM4bk0cDWK3CqKM09VUP0bNHFWmcNsSOoeTdZ+n0qA=
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/ms_iis.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/ms_iis.cer
new file mode 100755
index 00000000..250b926d
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/ms_iis.cer
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5jCCAVOgAwIBAgIQWPe7KyA+U7lLUohulwW2HDAJBgUrDgMCHQUAMCExHzAd
+BgNVBAMTFmF4dGxzLmNlcm9jY2x1Yi5jb20uYXUwHhcNMDgwMzE3MTAyMTA2WhcN
+MDkwMzE3MTAyMTA2WjAhMR8wHQYDVQQDExZheHRscy5jZXJvY2NsdWIuY29tLmF1
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9JqHlQjrQMt3JW8yxcGhFagDa
+D4QiIY8+KItTt13fIBt5g1AG4VXniaylSqKKYNPwVzqSWl7WhxMmoFU73veF8o4M
+G0Zc5qbVB6ukrSV4WaTgHrIO6pWkyiaQ4L/eYfCo/2pByhl0IUKkf/TMN346/rFg
+JgrElx01l6QHNQrzVQIDAQABoycwJTATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNV
+HQ8EBwMFALAAAAAwCQYFKw4DAh0FAAOBgQAbH94H1fryngROJ//Oa0D3vvTO8CJ3
+8VW+3gQEwrPBOWmN6RV8OM0dE6pf8wD3s7PTCcM5+/HI1Qk53nUGrNiOmKM1s0JB
+bvsO9RT+UF8mtdbo/n30M0MHMWPCC76baW3R+ANBp/V/z4l1ytpUTt+MHvz0VlUs
+J4uJA3s3uh23Tg==
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/perf_bigint.c b/trunk/package/luci/libs/nixio/axTLS/ssl/test/perf_bigint.c
new file mode 100644
index 00000000..a4ffab6a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/perf_bigint.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Some performance testing of bigint.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ssl.h"
+
+/**************************************************************************
+ * BIGINT tests 
+ *
+ **************************************************************************/
+
+int main(int argc, char *argv[])
+{
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    RSA_CTX *rsa_ctx;
+    BI_CTX *ctx;
+    bigint *bi_data, *bi_res;
+    int diff, res = 1;
+    struct timeval tv_old, tv_new;
+    const char *plaintext;
+    uint8_t compare[MAX_KEY_BYTE_SIZE];
+    int i, max_biggie = 10;    /* really crank performance */
+    int len; 
+    uint8_t *buf;
+
+    /**
+     * 512 bit key
+     */
+    plaintext = /* 64 byte number */
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^";
+
+    len = get_file("../ssl/test/axTLS.key_512", &buf);
+    asn1_get_private_key(buf, len, &rsa_ctx);
+    ctx = rsa_ctx->bi_ctx;
+    bi_data = bi_import(ctx, (uint8_t *)plaintext, strlen(plaintext));
+    bi_res = RSA_public(rsa_ctx, bi_data);
+    bi_data = bi_res;   /* reuse again */
+
+    gettimeofday(&tv_old, NULL);
+    for (i = 0; i < max_biggie; i++)
+    {
+        bi_res = RSA_private(rsa_ctx, bi_copy(bi_data));
+        if (i < max_biggie-1)
+        {
+            bi_free(ctx, bi_res);
+        }
+    }
+
+    gettimeofday(&tv_new, NULL);
+    bi_free(ctx, bi_data);
+
+    diff = (tv_new.tv_sec-tv_old.tv_sec)*1000 +
+                (tv_new.tv_usec-tv_old.tv_usec)/1000;
+    printf("512 bit decrypt time: %dms\n", diff/max_biggie);
+    TTY_FLUSH();
+    bi_export(ctx, bi_res, compare, 64);
+    RSA_free(rsa_ctx);
+    free(buf);
+    if (memcmp(plaintext, compare, 64) != 0)
+        goto end;
+
+    /**
+     * 1024 bit key
+     */
+    plaintext = /* 128 byte number */
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^";
+
+    len = get_file("../ssl/test/axTLS.key_1024", &buf);
+    asn1_get_private_key(buf, len, &rsa_ctx);
+    ctx = rsa_ctx->bi_ctx;
+    bi_data = bi_import(ctx, (uint8_t *)plaintext, strlen(plaintext));
+    bi_res = RSA_public(rsa_ctx, bi_data);
+    bi_data = bi_res;   /* reuse again */
+
+    gettimeofday(&tv_old, NULL);
+    for (i = 0; i < max_biggie; i++)
+    {
+        bi_res = RSA_private(rsa_ctx, bi_copy(bi_data));
+        if (i < max_biggie-1)
+        {
+            bi_free(ctx, bi_res);
+        }
+    }
+
+    gettimeofday(&tv_new, NULL);
+    bi_free(ctx, bi_data);
+
+    diff = (tv_new.tv_sec-tv_old.tv_sec)*1000 +
+                (tv_new.tv_usec-tv_old.tv_usec)/1000;
+    printf("1024 bit decrypt time: %dms\n", diff/max_biggie);
+    TTY_FLUSH();
+    bi_export(ctx, bi_res, compare, 128);
+    RSA_free(rsa_ctx);
+    free(buf);
+    if (memcmp(plaintext, compare, 128) != 0)
+        goto end;
+
+    /**
+     * 2048 bit key
+     */
+    plaintext = /* 256 byte number */
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^";
+
+    len = get_file("../ssl/test/axTLS.key_2048", &buf);
+    asn1_get_private_key(buf, len, &rsa_ctx);
+    ctx = rsa_ctx->bi_ctx;
+    bi_data = bi_import(ctx, (uint8_t *)plaintext, strlen(plaintext));
+    bi_res = RSA_public(rsa_ctx, bi_data);
+    bi_data = bi_res;   /* reuse again */
+
+    gettimeofday(&tv_old, NULL);
+    for (i = 0; i < max_biggie; i++)
+    {
+        bi_res = RSA_private(rsa_ctx, bi_copy(bi_data));
+        if (i < max_biggie-1)
+        {
+            bi_free(ctx, bi_res);
+        }
+    }
+    gettimeofday(&tv_new, NULL);
+    bi_free(ctx, bi_data);
+
+    diff = (tv_new.tv_sec-tv_old.tv_sec)*1000 +
+                (tv_new.tv_usec-tv_old.tv_usec)/1000;
+    printf("2048 bit decrypt time: %dms\n", diff/max_biggie);
+    TTY_FLUSH();
+    bi_export(ctx, bi_res, compare, 256);
+    RSA_free(rsa_ctx);
+    free(buf);
+    if (memcmp(plaintext, compare, 256) != 0)
+        goto end;
+
+    /**
+     * 4096 bit key
+     */
+    plaintext = /* 512 byte number */
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^"
+        "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ*^";
+
+    len = get_file("../ssl/test/axTLS.key_4096", &buf);
+    asn1_get_private_key(buf, len, &rsa_ctx);
+    ctx = rsa_ctx->bi_ctx;
+    bi_data = bi_import(ctx, (uint8_t *)plaintext, strlen(plaintext));
+    gettimeofday(&tv_old, NULL);
+    bi_res = RSA_public(rsa_ctx, bi_data);
+    gettimeofday(&tv_new, NULL);
+    diff = (tv_new.tv_sec-tv_old.tv_sec)*1000 +
+                (tv_new.tv_usec-tv_old.tv_usec)/1000;
+    printf("4096 bit encrypt time: %dms\n", diff);
+    TTY_FLUSH();
+    bi_data = bi_res;   /* reuse again */
+
+    gettimeofday(&tv_old, NULL);
+    for (i = 0; i < max_biggie; i++)
+    {
+        bi_res = RSA_private(rsa_ctx, bi_copy(bi_data));
+        if (i < max_biggie-1)
+        {
+            bi_free(ctx, bi_res);
+        }
+    }
+
+    gettimeofday(&tv_new, NULL);
+    bi_free(ctx, bi_data);
+
+    diff = (tv_new.tv_sec-tv_old.tv_sec)*1000 +
+                (tv_new.tv_usec-tv_old.tv_usec)/1000;
+    printf("4096 bit decrypt time: %dms\n", diff/max_biggie);
+    TTY_FLUSH();
+    bi_export(ctx, bi_res, compare, 512);
+    RSA_free(rsa_ctx);
+    free(buf);
+    if (memcmp(plaintext, compare, 512) != 0)
+        goto end;
+
+    /* done */
+    printf("Bigint performance testing complete\n");
+    res = 0;
+
+end:
+    return res;
+#else
+    return 0;
+#endif
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/socgen.cer b/trunk/package/luci/libs/nixio/axTLS/ssl/test/socgen.cer
new file mode 100755
index 0000000000000000000000000000000000000000..a4278705b77b573b2d248ed305c22b2d09adcacd
GIT binary patch
literal 980
zcmXqLV!mL|#B95OnTe5!NkD<!UQA;3LDto4mHbYXDlatPW#iOp^Jx3d%gD&e%3u(0
z$Zf#M#vIDRCd?EXY^Y!$2jXxEiw6ZeD!3$;Bq{`_CYKgvmQ?B}c;+SR8R{A6fK+e`
ztAZs`f$~LVsYMFTsYNB3X_?81C7Jno3XY{E8TlYx26E!O24)6kMivHO5C!C#gSbY<
zrk19bQ3j2jNG?b#G88c21DVeu%<fuToS&DMYRC_CGf;$Gge@d9J+-LPP|`pg>_`!T
z;QZvw)RI&M_td=9qQsn3Lm2}pu<JyGq0UZK2q?-=DNP2s%23Wg1|-WYBASz*o>`Kb
zlb2eeSDc@mo|>nZoS$pZI3GE97+D#Z8+#dmE@WzKWVoD|Jf%l(uZI1`=4qA=*RJJA
z?chpsFj>bp<>2Cnn~pKH_~~}+WSdv5Vp-g~=R*{W@9c}qf6Ug-cl@<zX_h@h&#s5_
zP95G;wIrV{?S;w>VZLQQ_OCeH@^h`o<PB{5Z=4HR#CYf1F4l;a-L(d$7mZJ<#e@s!
zzd0@DAZ6m9mE^xSn2DK@fpKvYV~Rl&V*)tJWQAFn3>XZ!fnJj3XJKJxVqIWh1LDZD
zm>L)x7%tFXpxdUMQBqQ1rLUh{l%ofXrp)5Zbg*Cbf$<B8KuG-Q0TmdyfOIRc*cw<H
zSh8^^w0SVL{cvSu7iTumGSFb-&}IWB8FnT{F&U7d#XwWb%ga$sEh<PfkOi5d$|7bU
z0@K3G2xl=Fn84VKj4T=kY6dDWz5!#K1k|<p$;AaI1{>tUR59|fBpSpoj9n0I5NQx@
z5Gux*nVXoNs-K>jW}s*wZ@|vRs?EpDB*h}q|Map{+nV0K?8E09vaWbY=u}JU8K{aW
zL+t=2fqWD@^vjCDVjz=Ha|v@D1Bd<W*UzIQFRgLE`t6&3ThaZlhnD-o=gUg<+?cuZ
z^^+-U7b_WT5Z@E$ma^gr@3BSw(#sXrX|GaFi?HZ)yy(ZX(I(=vnp&g7?>A4&`;!%a
z`ZjicJXrPWUp61x_6yT?-1OPGnCp)Bskw&pd3$HgaIL><mUR1kql*6nnQ!JfoB$9p
BGXwwt

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c b/trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c
new file mode 100644
index 00000000..d525e1a6
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c
@@ -0,0 +1,1983 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * The testing of the crypto and ssl stuff goes here. Keeps the individual code
+ * modules from being uncluttered with test code.
+ *
+ * This is test code - I make no apologies for the quality!
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifndef WIN32
+#include <pthread.h>
+#endif
+
+#include "ssl.h"
+
+#define DEFAULT_CERT            "../ssl/test/axTLS.x509_512.cer"
+#define DEFAULT_KEY             "../ssl/test/axTLS.key_512"     
+//#define DEFAULT_SVR_OPTION      SSL_DISPLAY_BYTES|SSL_DISPLAY_STATES
+#define DEFAULT_SVR_OPTION      0
+#define DEFAULT_CLNT_OPTION     0
+//#define DEFAULT_CLNT_OPTION      SSL_DISPLAY_BYTES|SSL_DISPLAY_STATES
+
+static int g_port = 19001;
+
+/**************************************************************************
+ * AES tests 
+ * 
+ * Run through a couple of the RFC3602 tests to verify that AES is correct.
+ **************************************************************************/
+#define TEST1_SIZE  16
+#define TEST2_SIZE  32
+
+static int AES_test(BI_CTX *bi_ctx)
+{
+    AES_CTX aes_key;
+    int res = 1;
+    uint8_t key[TEST1_SIZE];
+    uint8_t iv[TEST1_SIZE];
+
+    {
+        /*
+            Case #1: Encrypting 16 bytes (1 block) using AES-CBC
+            Key       : 0x06a9214036b8a15b512e03d534120006
+            IV        : 0x3dafba429d9eb430b422da802c9fac41
+            Plaintext : "Single block msg"
+            Ciphertext: 0xe353779c1079aeb82708942dbe77181a
+
+        */
+        char *in_str =  "Single block msg";
+        uint8_t ct[TEST1_SIZE];
+        uint8_t enc_data[TEST1_SIZE];
+        uint8_t dec_data[TEST1_SIZE];
+
+        bigint *key_bi = bi_str_import(
+                bi_ctx, "06A9214036B8A15B512E03D534120006");
+        bigint *iv_bi = bi_str_import(
+                bi_ctx, "3DAFBA429D9EB430B422DA802C9FAC41");
+        bigint *ct_bi = bi_str_import(
+                bi_ctx, "E353779C1079AEB82708942DBE77181A");
+        bi_export(bi_ctx, key_bi, key, TEST1_SIZE);
+        bi_export(bi_ctx, iv_bi, iv, TEST1_SIZE);
+        bi_export(bi_ctx, ct_bi, ct, TEST1_SIZE);
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_cbc_encrypt(&aes_key, (const uint8_t *)in_str, 
+                enc_data, sizeof(enc_data));
+        if (memcmp(enc_data, ct, sizeof(ct)))
+        {
+            printf("Error: AES ENCRYPT #1 failed\n");
+            goto end;
+        }
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_convert_key(&aes_key);
+        AES_cbc_decrypt(&aes_key, enc_data, dec_data, sizeof(enc_data));
+
+        if (memcmp(dec_data, in_str, sizeof(dec_data)))
+        {
+            printf("Error: AES DECRYPT #1 failed\n");
+            goto end;
+        }
+    }
+
+    {
+        /*
+            Case #2: Encrypting 32 bytes (2 blocks) using AES-CBC 
+            Key       : 0xc286696d887c9aa0611bbb3e2025a45a
+            IV        : 0x562e17996d093d28ddb3ba695a2e6f58
+            Plaintext : 0x000102030405060708090a0b0c0d0e0f
+                          101112131415161718191a1b1c1d1e1f
+            Ciphertext: 0xd296cd94c2cccf8a3a863028b5e1dc0a
+                          7586602d253cfff91b8266bea6d61ab1
+        */
+        uint8_t in_data[TEST2_SIZE];
+        uint8_t ct[TEST2_SIZE];
+        uint8_t enc_data[TEST2_SIZE];
+        uint8_t dec_data[TEST2_SIZE];
+
+        bigint *in_bi = bi_str_import(bi_ctx,
+            "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F");
+        bigint *key_bi = bi_str_import(
+                bi_ctx, "C286696D887C9AA0611BBB3E2025A45A");
+        bigint *iv_bi = bi_str_import(
+                bi_ctx, "562E17996D093D28DDB3BA695A2E6F58");
+        bigint *ct_bi = bi_str_import(bi_ctx,
+            "D296CD94C2CCCF8A3A863028B5E1DC0A7586602D253CFFF91B8266BEA6D61AB1");
+        bi_export(bi_ctx, in_bi, in_data, TEST2_SIZE);
+        bi_export(bi_ctx, key_bi, key, TEST1_SIZE);
+        bi_export(bi_ctx, iv_bi, iv, TEST1_SIZE);
+        bi_export(bi_ctx, ct_bi, ct, TEST2_SIZE);
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_cbc_encrypt(&aes_key, (const uint8_t *)in_data, 
+                enc_data, sizeof(enc_data));
+
+        if (memcmp(enc_data, ct, sizeof(ct)))
+        {
+            printf("Error: ENCRYPT #2 failed\n");
+            goto end;
+        }
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_convert_key(&aes_key);
+        AES_cbc_decrypt(&aes_key, enc_data, dec_data, sizeof(enc_data));
+        if (memcmp(dec_data, in_data, sizeof(dec_data)))
+        {
+            printf("Error: DECRYPT #2 failed\n");
+            goto end;
+        }
+    }
+
+    res = 0;
+    printf("All AES tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * RC4 tests 
+ *
+ * ARC4 tests vectors from OpenSSL (crypto/rc4/rc4test.c)
+ **************************************************************************/
+static const uint8_t keys[7][30]=
+{
+    {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
+    {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
+    {8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+    {4,0xef,0x01,0x23,0x45},
+    {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
+    {4,0xef,0x01,0x23,0x45},
+};
+
+static const uint8_t data_len[7]={8,8,8,20,28,10};
+static uint8_t data[7][30]=
+{
+    {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xff},
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0xff},
+        {0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
+            0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
+            0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
+            0x12,0x34,0x56,0x78,0xff},
+            {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
+            {0},
+};
+
+static const uint8_t output[7][30]=
+{
+    {0x75,0xb7,0x87,0x80,0x99,0xe0,0xc5,0x96,0x00},
+    {0x74,0x94,0xc2,0xe7,0x10,0x4b,0x08,0x79,0x00},
+    {0xde,0x18,0x89,0x41,0xa3,0x37,0x5d,0x3a,0x00},
+    {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,
+        0xbd,0x61,0x5a,0x11,0x62,0xe1,0xc7,0xba,
+        0x36,0xb6,0x78,0x58,0x00},
+        {0x66,0xa0,0x94,0x9f,0x8a,0xf7,0xd6,0x89,
+            0x1f,0x7f,0x83,0x2b,0xa8,0x33,0xc0,0x0c,
+            0x89,0x2e,0xbe,0x30,0x14,0x3c,0xe2,0x87,
+            0x40,0x01,0x1e,0xcf,0x00},
+            {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,0xbd,0x61,0x00},
+            {0},
+};
+
+static int RC4_test(BI_CTX *bi_ctx)
+{
+    int i, res = 1;
+    RC4_CTX s;
+
+    for (i = 0; i < 6; i++)
+    {
+        RC4_setup(&s, &keys[i][1], keys[i][0]);
+        RC4_crypt(&s, data[i], data[i], data_len[i]);
+
+        if (memcmp(data[i], output[i], data_len[i]))
+        {
+            printf("Error: RC4 CRYPT #%d failed\n", i);
+            goto end;
+        }
+    }
+
+    res = 0;
+    printf("All RC4 tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * SHA1 tests 
+ *
+ * Run through a couple of the RFC3174 tests to verify that SHA1 is correct.
+ **************************************************************************/
+static int SHA1_test(BI_CTX *bi_ctx)
+{
+    SHA1_CTX ctx;
+    uint8_t ct[SHA1_SIZE];
+    uint8_t digest[SHA1_SIZE];
+    int res = 1;
+
+    {
+        const char *in_str = "abc";
+        bigint *ct_bi = bi_str_import(bi_ctx,
+                "A9993E364706816ABA3E25717850C26C9CD0D89D");
+        bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+        SHA1_Init(&ctx);
+        SHA1_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        SHA1_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: SHA1 #1 failed\n");
+            goto end;
+        }
+    }
+
+    {
+        const char *in_str =
+            "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
+        bigint *ct_bi = bi_str_import(bi_ctx,
+                "84983E441C3BD26EBAAE4AA1F95129E5E54670F1");
+        bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+        SHA1_Init(&ctx);
+        SHA1_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        SHA1_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: SHA1 #2 failed\n");
+            goto end;
+        }
+    }
+
+    res = 0;
+    printf("All SHA1 tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * MD5 tests 
+ *
+ * Run through a couple of the RFC1321 tests to verify that MD5 is correct.
+ **************************************************************************/
+static int MD5_test(BI_CTX *bi_ctx)
+{
+    MD5_CTX ctx;
+    uint8_t ct[MD5_SIZE];
+    uint8_t digest[MD5_SIZE];
+    int res = 1;
+
+    {
+        const char *in_str =  "abc";
+        bigint *ct_bi = bi_str_import(bi_ctx, 
+                "900150983CD24FB0D6963F7D28E17F72");
+        bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+
+        MD5_Init(&ctx);
+        MD5_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        MD5_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: MD5 #1 failed\n");
+            goto end;
+        }
+    }
+
+    {
+        const char *in_str =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        bigint *ct_bi = bi_str_import(
+                bi_ctx, "D174AB98D277D9F5A5611C2C9F419D9F");
+        bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+
+        MD5_Init(&ctx);
+        MD5_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        MD5_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: MD5 #2 failed\n");
+            goto end;
+        }
+    }
+    res = 0;
+    printf("All MD5 tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * HMAC tests 
+ *
+ * Run through a couple of the RFC2202 tests to verify that HMAC is correct.
+ **************************************************************************/
+static int HMAC_test(BI_CTX *bi_ctx)
+{
+    uint8_t key[SHA1_SIZE];
+    uint8_t ct[SHA1_SIZE];
+    uint8_t dgst[SHA1_SIZE];
+    int res = 1;
+    const char *key_str;
+
+    const char *data_str = "Hi There";
+    bigint *key_bi = bi_str_import(bi_ctx, "0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B");
+    bigint *ct_bi = bi_str_import(bi_ctx, "9294727A3638BB1C13F48EF8158BFC9D");
+    bi_export(bi_ctx, key_bi, key, MD5_SIZE);
+    bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+    hmac_md5((const uint8_t *)data_str, 8, key, MD5_SIZE, dgst);
+    if (memcmp(dgst, ct, MD5_SIZE))
+    {
+        printf("HMAC MD5 #1 failed\n");
+        goto end;
+    }
+
+    data_str = "what do ya want for nothing?";
+    key_str = "Jefe";
+    ct_bi = bi_str_import(bi_ctx, "750C783E6AB0B503EAA86E310A5DB738");
+    bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+    hmac_md5((const uint8_t *)data_str, 28, (const uint8_t *)key_str, 4, dgst);
+    if (memcmp(dgst, ct, MD5_SIZE))
+    {
+        printf("HMAC MD5 #2 failed\n");
+        goto end;
+    }
+   
+    data_str = "Hi There";
+    key_bi = bi_str_import(bi_ctx, "0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B");
+    bi_export(bi_ctx, key_bi, key, SHA1_SIZE);
+    ct_bi = bi_str_import(bi_ctx, "B617318655057264E28BC0B6FB378C8EF146BE00");
+    bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+    hmac_sha1((const uint8_t *)data_str, 8, 
+            (const uint8_t *)key, SHA1_SIZE, dgst);
+    if (memcmp(dgst, ct, SHA1_SIZE))
+    {
+        printf("HMAC SHA1 #1 failed\n");
+        goto end;
+    }
+
+    data_str = "what do ya want for nothing?";
+    key_str = "Jefe";
+    ct_bi = bi_str_import(bi_ctx, "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79");
+    bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+    hmac_sha1((const uint8_t *)data_str, 28, (const uint8_t *)key_str, 5, dgst);
+    if (memcmp(dgst, ct, SHA1_SIZE))
+    {
+        printf("HMAC SHA1 failed\n");
+        exit(1);
+    }
+
+    res = 0;
+    printf("All HMAC tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * BIGINT tests 
+ *
+ **************************************************************************/
+static int BIGINT_test(BI_CTX *ctx)
+{
+    int res = 1;
+    bigint *bi_data, *bi_exp, *bi_res;
+    const char *expnt, *plaintext, *mod;
+    uint8_t compare[MAX_KEY_BYTE_SIZE];
+
+    /**
+     * 512 bit key
+     */
+    plaintext = /* 64 byte number */
+        "01aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeeee";
+
+    mod = "C30773C8ABE09FCC279EE0E5343370DE"
+          "8B2FFDB6059271E3005A7CEEF0D35E0A"
+          "1F9915D95E63560836CC2EB2C289270D"
+          "BCAE8CAF6F5E907FC2759EE220071E1B";
+
+    expnt = "A1E556CD1738E10DF539E35101334E97"
+          "BE8D391C57A5C89A7AD9A2EA2ACA1B3D"
+          "F3140F5091CC535CBAA47CEC4159EE1F"
+          "B6A3661AFF1AB758426EAB158452A9B9";
+
+    bi_data = bi_import(ctx, (uint8_t *)plaintext, strlen(plaintext));
+    bi_exp = int_to_bi(ctx, 0x10001);
+    bi_set_mod(ctx, bi_str_import(ctx, mod), 0);
+    bi_res = bi_mod_power(ctx, bi_data, bi_exp);
+
+    bi_data = bi_res;   /* resuse again - see if we get the original */
+
+    bi_exp = bi_str_import(ctx, expnt);
+    bi_res = bi_mod_power(ctx, bi_data, bi_exp);
+    bi_free_mod(ctx, 0);
+
+    bi_export(ctx, bi_res, compare, 64);
+    if (memcmp(plaintext, compare, 64) != 0)
+        goto end;
+
+    printf("All BIGINT tests passed\n");
+    res = 0;
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * RSA tests 
+ *
+ * Use the results from openssl to verify PKCS1 etc 
+ **************************************************************************/
+static int RSA_test(void)
+{
+    int res = 1;
+    const char *plaintext = /* 128 byte hex number */
+        "1aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeeee2"
+        "1aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeee2\012";
+    uint8_t enc_data[128], dec_data[128];
+    RSA_CTX *rsa_ctx = NULL;
+    BI_CTX *bi_ctx;
+    bigint *plaintext_bi;
+    bigint *enc_data_bi, *dec_data_bi;
+    uint8_t enc_data2[128], dec_data2[128];
+    int size;
+    int len; 
+    uint8_t *buf;
+
+    /* extract the private key elements */
+    len = get_file("../ssl/test/axTLS.key_1024", &buf);
+    if (asn1_get_private_key(buf, len, &rsa_ctx) < 0)
+    {
+        goto end;
+    }
+
+    free(buf);
+    bi_ctx = rsa_ctx->bi_ctx;
+    plaintext_bi = bi_import(bi_ctx, 
+            (const uint8_t *)plaintext, strlen(plaintext));
+
+    /* basic rsa encrypt */
+    enc_data_bi = RSA_public(rsa_ctx, plaintext_bi);
+    bi_export(bi_ctx, bi_copy(enc_data_bi), enc_data, sizeof(enc_data));
+
+    /* basic rsa decrypt */
+    dec_data_bi = RSA_private(rsa_ctx, enc_data_bi);
+    bi_export(bi_ctx, dec_data_bi, dec_data, sizeof(dec_data));
+
+    if (memcmp(dec_data, plaintext, strlen(plaintext)))
+    {
+        printf("Error: DECRYPT #1 failed\n");
+        goto end;
+    }
+
+    RSA_encrypt(rsa_ctx, (const uint8_t *)"abc", 3, enc_data2, 0);
+    size = RSA_decrypt(rsa_ctx, enc_data2, dec_data2, 1);
+    if (memcmp("abc", dec_data2, 3))
+    {
+        printf("Error: ENCRYPT/DECRYPT #2 failed\n");
+        goto end;
+    }
+
+    RSA_free(rsa_ctx);
+    res = 0;
+    printf("All RSA tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * Cert Testing
+ *
+ **************************************************************************/
+static int cert_tests(void)
+{
+    int res = -1, len;
+    X509_CTX *x509_ctx;
+    SSL_CTX *ssl_ctx;
+    uint8_t *buf;
+
+    /* check a bunch of 3rd party certificates */
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/microsoft.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #1\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/thawte.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #2\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/deutsche_telecom.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #3\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/equifax.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #4\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/gnutls.cer", &buf);
+    if ((res = add_cert(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #5\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/socgen.cer", &buf);
+    if ((res = add_cert(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #6\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/verisign.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) <0)
+    {
+        printf("Cert #7\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    if (get_file("../ssl/test/verisign.x509_my_cert", &buf) < 0 ||
+                                    x509_new(buf, &len, &x509_ctx))
+    {
+        printf("Cert #8\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    x509_free(x509_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    if ((res = ssl_obj_load(ssl_ctx, 
+              SSL_OBJ_X509_CERT, "../ssl/test/ms_iis.cer", NULL)) != SSL_OK)
+    {
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    res = 0;        /* all ok */
+    printf("All Certificate tests passed\n");
+
+bad_cert:
+    if (res)
+        printf("Error: A certificate test failed\n");
+    return res;
+}
+
+/**
+ * init a server socket.
+ */
+static int server_socket_init(int *port)
+{
+    struct sockaddr_in serv_addr;
+    int server_fd;
+    char yes = 1;
+
+    /* Create socket for incoming connections */
+    if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    {
+        return -1;
+    }
+      
+    setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+
+go_again:
+    /* Construct local address structure */
+    memset(&serv_addr, 0, sizeof(serv_addr));      /* Zero out structure */
+    serv_addr.sin_family = AF_INET;                /* Internet address family */
+    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); /* Any incoming interface */
+    serv_addr.sin_port = htons(*port);              /* Local port */
+
+    /* Bind to the local address */
+    if (bind(server_fd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
+    {
+        (*port)++;
+        goto go_again;
+    }
+    /* Mark the socket so it will listen for incoming connections */
+    if (listen(server_fd, 3000) < 0)
+    {
+        return -1;
+    }
+
+    return server_fd;
+}
+
+/**
+ * init a client socket.
+ */
+static int client_socket_init(uint16_t port)
+{
+    struct sockaddr_in address;
+    int client_fd;
+
+    address.sin_family = AF_INET;
+    address.sin_port = htons(port);
+    address.sin_addr.s_addr =  inet_addr("127.0.0.1");
+    client_fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (connect(client_fd, (struct sockaddr *)&address, sizeof(address)) < 0)
+    {
+        perror("socket");
+        SOCKET_CLOSE(client_fd);
+        client_fd = -1;
+    }
+
+    return client_fd;
+}
+
+/**************************************************************************
+ * SSL Server Testing
+ *
+ **************************************************************************/
+typedef struct
+{
+    /* not used as yet */
+    int dummy;
+} SVR_CTX;
+
+typedef struct
+{
+    const char *testname;
+    const char *openssl_option;
+} client_t;
+
+static void do_client(client_t *clnt)
+{
+    char openssl_buf[2048];
+
+    /* make sure the main thread goes first */
+    sleep(0);
+
+    /* show the session ids in the reconnect test */
+    if (strcmp(clnt->testname, "Session Reuse") == 0)
+    {
+        sprintf(openssl_buf, "echo \"hello client\" | openssl s_client "
+            "-connect localhost:%d %s 2>&1 | grep \"Session-ID:\"", 
+            g_port, clnt->openssl_option);
+    }
+    else
+    {
+        sprintf(openssl_buf, "echo \"hello client\" | openssl s_client "
+#ifdef WIN32
+            "-connect localhost:%d -quiet %s",
+#else
+            "-connect localhost:%d -quiet %s > /dev/null 2>&1",
+#endif
+        g_port, clnt->openssl_option);
+    }
+
+    system(openssl_buf);
+}
+
+static int SSL_server_test(
+        const char *testname, 
+        const char *openssl_option, 
+        const char *device_cert, 
+        const char *product_cert, 
+        const char *private_key,
+        const char *ca_cert,
+        const char *password,
+        int axtls_option)
+{
+    int server_fd, ret = 0;
+    SSL_CTX *ssl_ctx = NULL;
+    struct sockaddr_in client_addr;
+    uint8_t *read_buf;
+    socklen_t clnt_len = sizeof(client_addr);
+    client_t client_data;
+#ifndef WIN32
+    pthread_t thread;
+#endif
+    g_port++;
+
+    client_data.testname = testname;
+    client_data.openssl_option = openssl_option;
+
+    if ((server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+    if (private_key)
+    {
+        axtls_option |= SSL_NO_DEFAULT_KEY;
+    }
+
+    if ((ssl_ctx = ssl_ctx_new(axtls_option, SSL_DEFAULT_SVR_SESS)) == NULL)
+    {
+        ret = SSL_ERROR_INVALID_KEY;
+        goto error;
+    }
+
+    if (private_key)
+    {
+        int obj_type = SSL_OBJ_RSA_KEY;
+
+        if (strstr(private_key, ".p8"))
+            obj_type = SSL_OBJ_PKCS8;
+        else if (strstr(private_key, ".p12"))
+            obj_type = SSL_OBJ_PKCS12;
+
+        if (ssl_obj_load(ssl_ctx, obj_type, private_key, password))
+        {
+            ret = SSL_ERROR_INVALID_KEY;
+            goto error;
+        }
+    }
+
+    if (device_cert)             /* test chaining */
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, 
+                        SSL_OBJ_X509_CERT, device_cert, NULL)) != SSL_OK)
+            goto error;
+    }
+
+    if (product_cert)             /* test chaining */
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, 
+                        SSL_OBJ_X509_CERT, product_cert, NULL)) != SSL_OK)
+            goto error;
+    }
+
+    if (ca_cert)                  /* test adding certificate authorities */
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, 
+                        SSL_OBJ_X509_CACERT, ca_cert, NULL)) != SSL_OK)
+            goto error;
+    }
+
+#ifndef WIN32
+    pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_client, (void *)&client_data);
+    pthread_detach(thread);
+#else
+    CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_client, 
+            (LPVOID)&client_data, 0, NULL);
+#endif
+
+    for (;;)
+    {
+        int client_fd, size = 0; 
+        SSL *ssl;
+
+        /* Wait for a client to connect */
+        if ((client_fd = accept(server_fd, 
+                        (struct sockaddr *)&client_addr, &clnt_len)) < 0)
+        {
+            ret = SSL_ERROR_SOCK_SETUP_FAILURE;
+            goto error;
+        }
+        
+        /* we are ready to go */
+        ssl = ssl_server_new(ssl_ctx, client_fd);
+        while ((size = ssl_read(ssl, &read_buf)) == SSL_OK);
+        SOCKET_CLOSE(client_fd);
+        
+        if (size < SSL_OK) /* got some alert or something nasty */
+        {
+            ret = size;
+
+            if (ret == SSL_ERROR_CONN_LOST)
+            {
+                ret = SSL_OK;
+                continue;
+            }
+
+            break;  /* we've got a problem */
+        }
+        else /* looks more promising */
+        {
+            if (strstr("hello client", (char *)read_buf) == NULL)
+            {
+                printf("SSL server test \"%s\" passed\n", testname);
+                TTY_FLUSH();
+                ret = 0;
+                break;
+            }
+        }
+
+        ssl_free(ssl);
+    }
+
+    SOCKET_CLOSE(server_fd);
+
+error:
+    ssl_ctx_free(ssl_ctx);
+    return ret;
+}
+
+int SSL_server_tests(void)
+{
+    int ret = -1;
+    struct stat stat_buf;
+    SVR_CTX svr_test_ctx;
+    memset(&svr_test_ctx, 0, sizeof(SVR_CTX));
+
+    printf("### starting server tests\n"); TTY_FLUSH();
+
+    /* Go through the algorithms */
+
+    /* 
+     * TLS1 client hello 
+     */
+    if ((ret = SSL_server_test("TLSv1", "-cipher RC4-SHA -tls1", 
+                    NULL, NULL, NULL, NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * AES128-SHA
+     */
+    if ((ret = SSL_server_test("AES256-SHA", "-cipher AES128-SHA", 
+                    DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                    DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * AES256-SHA
+     */
+    if ((ret = SSL_server_test("AES256-SHA", "-cipher AES128-SHA", 
+                    DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                    DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * RC4-SHA
+     */
+    if ((ret = SSL_server_test("RC4-SHA", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * RC4-MD5
+     */
+    if ((ret = SSL_server_test("RC4-MD5", "-cipher RC4-MD5", 
+                DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * Session Reuse
+     * all the session id's should match for session resumption.
+     */
+    if ((ret = SSL_server_test("Session Reuse", 
+                    "-cipher RC4-SHA -reconnect", 
+                    DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                    DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 512 bit RSA key 
+     */
+    if ((ret = SSL_server_test("512 bit key", "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_512.cer", NULL, 
+                    "../ssl/test/axTLS.key_512",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 1024 bit RSA key (check certificate chaining)
+     */
+    if ((ret = SSL_server_test("1024 bit key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_device.cer", 
+                    "../ssl/test/axTLS.x509_512.cer", 
+                    "../ssl/test/axTLS.device_key",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 2048 bit RSA key 
+     */
+    if ((ret = SSL_server_test("2048 bit key", 
+                    "-cipher RC4-SHA",
+                    "../ssl/test/axTLS.x509_2048.cer", NULL, 
+                    "../ssl/test/axTLS.key_2048",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 4096 bit RSA key 
+     */
+    if ((ret = SSL_server_test("4096 bit key", 
+                    "-cipher RC4-SHA",
+                    "../ssl/test/axTLS.x509_4096.cer", NULL, 
+                    "../ssl/test/axTLS.key_4096",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * Client Verification
+     */
+    if ((ret = SSL_server_test("Client Verification", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_2048.pem "
+                    "-key ../ssl/test/axTLS.key_2048.pem ",
+                    NULL, NULL, NULL, 
+                    "../ssl/test/axTLS.ca_x509.cer", NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)))
+        goto cleanup;
+
+    /* this test should fail */
+    if (stat("../ssl/test/axTLS.x509_bad_before.pem", &stat_buf) >= 0)
+    {
+        if ((ret = SSL_server_test("Error: Bad Before Cert", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_bad_before.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem ",
+                    NULL, NULL, NULL, 
+                    "../ssl/test/axTLS.ca_x509.cer", NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)) !=
+                            SSL_X509_ERROR(X509_VFY_ERROR_NOT_YET_VALID))
+            goto cleanup;
+
+        printf("SSL server test \"%s\" passed\n", "Bad Before Cert");
+        TTY_FLUSH();
+        ret = 0;    /* is ok */
+    }
+
+    /* this test should fail */
+    if ((ret = SSL_server_test("Error: Bad After Cert", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_bad_after.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem ",
+                    NULL, NULL, NULL, 
+                    "../ssl/test/axTLS.ca_x509.cer", NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)) !=
+                            SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED))
+        goto cleanup;
+
+    printf("SSL server test \"%s\" passed\n", "Bad After Cert");
+    TTY_FLUSH();
+
+    /*
+     * No trusted cert
+     */
+    if ((ret = SSL_server_test("Error: No trusted certificate", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_512.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem ",
+                    NULL, NULL, NULL, 
+                    NULL, NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)) !=
+                            SSL_X509_ERROR(X509_VFY_ERROR_NO_TRUSTED_CERT))
+        goto cleanup;
+
+    printf("SSL server test \"%s\" passed\n", "No trusted certificate");
+    TTY_FLUSH();
+
+    /*
+     * Self-signed (from the server)
+     */
+    if ((ret = SSL_server_test("Error: Self-signed certificate (from server)", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_512.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem "
+                    "-CAfile ../ssl/test/axTLS.ca_x509.pem ",
+                    NULL, NULL, NULL, 
+                    NULL, NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)) !=
+                            SSL_X509_ERROR(X509_VFY_ERROR_SELF_SIGNED))
+        goto cleanup;
+
+    printf("SSL server test \"%s\" passed\n", 
+                            "Self-signed certificate (from server)");
+    TTY_FLUSH();
+
+    /*
+     * Self-signed (from the client)
+     */
+    if ((ret = SSL_server_test("Self-signed certificate (from client)", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_512.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem ",
+                    NULL, NULL, NULL, 
+                    "../ssl/test/axTLS.ca_x509.cer",
+                    NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)))
+        goto cleanup;
+
+    /* 
+     * Key in PEM format
+     */
+    if ((ret = SSL_server_test("Key in PEM format",
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_512.cer", NULL, 
+                    "../ssl/test/axTLS.key_512.pem", NULL,
+                    NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * Cert in PEM format
+     */
+    if ((ret = SSL_server_test("Cert in PEM format", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_512.pem", NULL, 
+                    "../ssl/test/axTLS.key_512.pem", NULL,
+                    NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * Cert chain in PEM format
+     */
+    if ((ret = SSL_server_test("Cert chain in PEM format", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_device.pem", 
+                    NULL, "../ssl/test/axTLS.device_key.pem",
+                    "../ssl/test/axTLS.ca_x509.pem", NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * AES128 Encrypted key 
+     */
+    if ((ret = SSL_server_test("AES128 encrypted key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_aes128.pem", NULL, 
+                    "../ssl/test/axTLS.key_aes128.pem",
+                    NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * AES256 Encrypted key 
+     */
+    if ((ret = SSL_server_test("AES256 encrypted key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_aes256.pem", NULL, 
+                    "../ssl/test/axTLS.key_aes256.pem",
+                    NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * AES128 Encrypted invalid key 
+     */
+    if ((ret = SSL_server_test("AES128 encrypted invalid key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_aes128.pem", NULL, 
+                    "../ssl/test/axTLS.key_aes128.pem",
+                    NULL, "xyz", DEFAULT_SVR_OPTION)) != SSL_ERROR_INVALID_KEY)
+        goto cleanup;
+
+    printf("SSL server test \"%s\" passed\n", "AES128 encrypted invalid key");
+    TTY_FLUSH();
+
+    /*
+     * PKCS#8 key (encrypted)
+     */
+    if ((ret = SSL_server_test("pkcs#8 encrypted", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, "../ssl/test/axTLS.encrypted.p8", 
+                NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * PKCS#8 key (unencrypted)
+     */
+    if ((ret = SSL_server_test("pkcs#8 unencrypted", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, "../ssl/test/axTLS.unencrypted.p8", 
+                NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * PKCS#12 key/certificate
+     */
+    if ((ret = SSL_server_test("pkcs#12 with CA", "-cipher RC4-SHA", 
+                NULL, NULL, "../ssl/test/axTLS.withCA.p12", 
+                NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    if ((ret = SSL_server_test("pkcs#12 no CA", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, "../ssl/test/axTLS.withoutCA.p12", 
+                NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    ret = 0;
+
+cleanup:
+    if (ret)
+    {
+        printf("Error: A server test failed\n");
+        ssl_display_error(ret);
+        exit(1);
+    }
+    else
+    {
+        printf("All server tests passed\n"); TTY_FLUSH();
+    }
+
+    return ret;
+}
+
+/**************************************************************************
+ * SSL Client Testing
+ *
+ **************************************************************************/
+typedef struct
+{
+    uint8_t session_id[SSL_SESSION_ID_SIZE];
+#ifndef WIN32
+    pthread_t server_thread;
+#endif
+    int start_server;
+    int stop_server;
+    int do_reneg;
+} CLNT_SESSION_RESUME_CTX;
+
+typedef struct
+{
+    const char *testname;
+    const char *openssl_option;
+} server_t;
+
+static void do_server(server_t *svr)
+{
+    char openssl_buf[2048];
+#ifndef WIN32
+    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+#endif
+    sprintf(openssl_buf, "openssl s_server -tls1 " 
+            "-accept %d -quiet %s ", g_port, svr->openssl_option);
+    system(openssl_buf);
+}
+
+static int SSL_client_test(
+        const char *test,
+        SSL_CTX **ssl_ctx,
+        const char *openssl_option, 
+        CLNT_SESSION_RESUME_CTX *sess_resume,
+        uint32_t client_options,
+        const char *private_key,
+        const char *password,
+        const char *cert)
+{
+    server_t server_data;
+    SSL *ssl = NULL;
+    int client_fd = -1;
+    uint8_t *session_id = NULL;
+    int ret = 1;
+#ifndef WIN32
+    pthread_t thread;
+#endif
+
+    if (sess_resume == NULL || sess_resume->start_server)
+    {
+        g_port++;
+        server_data.openssl_option = openssl_option;
+
+#ifndef WIN32
+        pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_server, (void *)&server_data);
+        pthread_detach(thread);
+#else
+        CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_server, 
+            (LPVOID)&server_data, 0, NULL);
+#endif
+    }
+    
+    usleep(200000);           /* allow server to start */
+
+    if (*ssl_ctx == NULL)
+    {
+        if (private_key)
+        {
+            client_options |= SSL_NO_DEFAULT_KEY;
+        }
+
+        if ((*ssl_ctx = ssl_ctx_new(
+                            client_options, SSL_DEFAULT_CLNT_SESS)) == NULL)
+        {
+            ret = SSL_ERROR_INVALID_KEY;
+            goto client_test_exit;
+        }
+
+        if (private_key)
+        {
+            int obj_type = SSL_OBJ_RSA_KEY;
+
+            if (strstr(private_key, ".p8"))
+                obj_type = SSL_OBJ_PKCS8;
+            else if (strstr(private_key, ".p12"))
+                obj_type = SSL_OBJ_PKCS12;
+
+            if (ssl_obj_load(*ssl_ctx, obj_type, private_key, password))
+            {
+                ret = SSL_ERROR_INVALID_KEY;
+                goto client_test_exit;
+            }
+        }
+
+        if (cert)                  
+        {
+            if ((ret = ssl_obj_load(*ssl_ctx, 
+                            SSL_OBJ_X509_CERT, cert, NULL)) != SSL_OK)
+            {
+                printf("could not add cert %s (%d)\n", cert, ret);
+                TTY_FLUSH();
+                goto client_test_exit;
+            }
+        }
+
+	if (ssl_obj_load(*ssl_ctx, SSL_OBJ_X509_CACERT, 
+				"../ssl/test/axTLS.ca_x509.cer", NULL))
+        {
+            printf("could not add cert auth\n"); TTY_FLUSH();
+            goto client_test_exit;
+        }
+    }
+    
+    if (sess_resume && !sess_resume->start_server) 
+    {
+        session_id = sess_resume->session_id;
+    }
+
+    if ((client_fd = client_socket_init(g_port)) < 0)
+    {
+        printf("could not start socket on %d\n", g_port); TTY_FLUSH();
+        goto client_test_exit;
+    }
+
+    ssl = ssl_client_new(*ssl_ctx, client_fd, session_id, sizeof(session_id));
+
+    /* check the return status */
+    if ((ret = ssl_handshake_status(ssl)))
+        goto client_test_exit;
+
+    /* renegotiate client */
+    if (sess_resume && sess_resume->do_reneg) 
+    {
+        if (ssl_renegotiate(ssl) < 0)
+            goto client_test_exit;
+    }
+
+    if (sess_resume)
+    {
+        memcpy(sess_resume->session_id, 
+                ssl_get_session_id(ssl), SSL_SESSION_ID_SIZE);
+    }
+
+    if (IS_SET_SSL_FLAG(SSL_SERVER_VERIFY_LATER) && 
+                                            (ret = ssl_verify_cert(ssl)))
+    {
+        goto client_test_exit;
+    }
+
+    ssl_write(ssl, (uint8_t *)"hello world\n", 13);
+    if (sess_resume)
+    {
+        const uint8_t *sess_id = ssl_get_session_id(ssl);
+        int i;
+
+        printf("    Session-ID: ");
+        for (i = 0; i < SSL_SESSION_ID_SIZE; i++)
+        {
+            printf("%02X", sess_id[i]);
+        }
+        printf("\n");
+        TTY_FLUSH();
+    }
+
+    ret = 0;
+
+client_test_exit:
+    ssl_free(ssl);
+    SOCKET_CLOSE(client_fd);
+    usleep(200000);           /* allow openssl to say something */
+
+    if (sess_resume)
+    {
+        if (sess_resume->stop_server)
+        {
+            ssl_ctx_free(*ssl_ctx);
+            *ssl_ctx = NULL;
+#ifndef WIN32
+            pthread_cancel(sess_resume->server_thread);
+#endif
+        }
+        else if (sess_resume->start_server)
+        {
+#ifndef WIN32
+           sess_resume->server_thread = thread;
+#endif
+        }
+    }
+    else
+    {
+        ssl_ctx_free(*ssl_ctx);
+        *ssl_ctx = NULL;
+#ifndef WIN32
+        pthread_cancel(thread);
+#endif
+    }
+
+    if (ret == 0)
+    {
+        printf("SSL client test \"%s\" passed\n", test);
+        TTY_FLUSH();
+    }
+
+    return ret;
+}
+
+int SSL_client_tests(void)
+{
+    int ret =  -1;
+    SSL_CTX *ssl_ctx = NULL;
+    CLNT_SESSION_RESUME_CTX sess_resume;
+    memset(&sess_resume, 0, sizeof(CLNT_SESSION_RESUME_CTX));
+
+    sess_resume.start_server = 1;
+    printf("### starting client tests\n");
+   
+    if ((ret = SSL_client_test("512 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_512.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem", &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    /* all the session id's should match for session resumption */
+    sess_resume.start_server = 0;
+    if ((ret = SSL_client_test("Client session resumption #1", 
+                    &ssl_ctx, NULL, &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    sess_resume.do_reneg = 1;
+    if ((ret = SSL_client_test("Client renegotiation", 
+                    &ssl_ctx, NULL, &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+    sess_resume.do_reneg = 0;
+
+    sess_resume.stop_server = 1;
+    if ((ret = SSL_client_test("Client session resumption #2", 
+                    &ssl_ctx, NULL, &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("1024 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_1024.pem "
+                    "-key ../ssl/test/axTLS.key_1024.pem", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("2048 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_2048.pem "
+                    "-key ../ssl/test/axTLS.key_2048.pem",  NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("4096 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_4096.pem "
+                    "-key ../ssl/test/axTLS.key_4096.pem", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("Server cert chaining", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_device.pem "
+                    "-key ../ssl/test/axTLS.device_key.pem "
+                    "-CAfile ../ssl/test/axTLS.x509_512.pem ", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    /* Check the server can verify the client */
+    if ((ret = SSL_client_test("Client peer authentication",
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_2048.pem "
+                    "-key ../ssl/test/axTLS.key_2048.pem "
+                    "-CAfile ../ssl/test/axTLS.ca_x509.pem "
+                    "-verify 1 ", NULL, DEFAULT_CLNT_OPTION, 
+                    "../ssl/test/axTLS.key_1024", NULL,
+                    "../ssl/test/axTLS.x509_1024.cer")))
+        goto cleanup;
+
+    /* Should get an "ERROR" from openssl (as the handshake fails as soon as
+     * the certificate verification fails) */
+    if ((ret = SSL_client_test("Error: Expired cert (verify now)",
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_bad_after.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)) != 
+                            SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED))
+    {
+        printf("*** Error: %d\n", ret);
+        goto cleanup;
+    }
+
+    printf("SSL client test \"Expired cert (verify now)\" passed\n");
+
+    /* There is no "ERROR" from openssl */
+    if ((ret = SSL_client_test("Error: Expired cert (verify later)", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_bad_after.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem", NULL,
+                    DEFAULT_CLNT_OPTION|SSL_SERVER_VERIFY_LATER, NULL, 
+                    NULL, NULL)) != SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED))
+    {
+        printf("*** Error: %d\n", ret);
+        goto cleanup;
+    }
+
+    printf("SSL client test \"Expired cert (verify later)\" passed\n");
+    ret = 0;
+
+cleanup:
+    if (ret)
+    {
+        ssl_display_error(ret);
+        printf("Error: A client test failed\n");
+        exit(1);
+    }
+    else
+    {
+        printf("All client tests passed\n"); TTY_FLUSH();
+    }
+
+    return ret;
+}
+
+/**************************************************************************
+ * SSL Basic Testing (test a big packet handshake)
+ *
+ **************************************************************************/
+static uint8_t basic_buf[256*1024];
+
+static void do_basic(void)
+{
+    int client_fd;
+    SSL *ssl_clnt;
+    SSL_CTX *ssl_clnt_ctx = ssl_ctx_new(
+                            DEFAULT_CLNT_OPTION, SSL_DEFAULT_CLNT_SESS);
+    usleep(200000);           /* allow server to start */
+
+    if ((client_fd = client_socket_init(g_port)) < 0)
+        goto error;
+
+    if (ssl_obj_load(ssl_clnt_ctx, SSL_OBJ_X509_CACERT, 
+                                        "../ssl/test/axTLS.ca_x509.cer", NULL))
+        goto error;
+
+    ssl_clnt = ssl_client_new(ssl_clnt_ctx, client_fd, NULL, 0);
+
+    /* check the return status */
+    if (ssl_handshake_status(ssl_clnt) < 0)
+    {
+        printf("YA YA\n");
+        ssl_display_error(ssl_handshake_status(ssl_clnt));
+        goto error;
+    }
+
+    ssl_write(ssl_clnt, basic_buf, sizeof(basic_buf));
+    ssl_free(ssl_clnt);
+
+error:
+    ssl_ctx_free(ssl_clnt_ctx);
+    SOCKET_CLOSE(client_fd);
+
+    /* exit this thread */
+}
+
+static int SSL_basic_test(void)
+{
+    int server_fd, client_fd, ret = 0, size = 0, offset = 0;
+    SSL_CTX *ssl_svr_ctx = NULL;
+    struct sockaddr_in client_addr;
+    uint8_t *read_buf;
+    socklen_t clnt_len = sizeof(client_addr);
+    SSL *ssl_svr;
+#ifndef WIN32
+    pthread_t thread;
+#endif
+    memset(basic_buf, 0xA5, sizeof(basic_buf)/2);
+    memset(&basic_buf[sizeof(basic_buf)/2], 0x5A, sizeof(basic_buf)/2);
+
+    if ((server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+    ssl_svr_ctx = ssl_ctx_new(DEFAULT_SVR_OPTION, SSL_DEFAULT_SVR_SESS);
+
+#ifndef WIN32
+    pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_basic, NULL);
+    pthread_detach(thread);
+#else
+    CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_basic, NULL, 0, NULL);
+#endif
+
+    /* Wait for a client to connect */
+    if ((client_fd = accept(server_fd, 
+                    (struct sockaddr *) &client_addr, &clnt_len)) < 0)
+    {
+        ret = SSL_ERROR_SOCK_SETUP_FAILURE;
+        goto error;
+    }
+    
+    /* we are ready to go */
+    ssl_svr = ssl_server_new(ssl_svr_ctx, client_fd);
+    
+    do
+    {
+        while ((size = ssl_read(ssl_svr, &read_buf)) == SSL_OK);
+
+        if (size < SSL_OK) /* got some alert or something nasty */
+        {
+            printf("Server ");
+            ssl_display_error(size);
+            ret = size;
+            break;
+        }
+        else /* looks more promising */
+        {
+            if (memcmp(read_buf, &basic_buf[offset], size) != 0)
+            {
+                ret = SSL_NOT_OK;
+                break;
+            }
+        }
+
+        offset += size;
+    } while (offset < sizeof(basic_buf));
+
+    printf(ret == SSL_OK && offset == sizeof(basic_buf) ? 
+                            "SSL basic test passed\n" :
+                            "SSL basic test failed\n");
+    TTY_FLUSH();
+
+    ssl_free(ssl_svr);
+    SOCKET_CLOSE(server_fd);
+    SOCKET_CLOSE(client_fd);
+
+error:
+    ssl_ctx_free(ssl_svr_ctx);
+    return ret;
+}
+
+#if !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING)
+/**************************************************************************
+ * Multi-Threading Tests
+ *
+ **************************************************************************/
+#define NUM_THREADS         100
+
+typedef struct
+{
+    SSL_CTX *ssl_clnt_ctx;
+    int port;
+    int thread_id;
+} multi_t;
+
+void do_multi_clnt(multi_t *multi_data)
+{
+    int res = 1, client_fd, i;
+    SSL *ssl = NULL;
+    char tmp[5];
+
+    if ((client_fd = client_socket_init(multi_data->port)) < 0)
+        goto client_test_exit;
+
+    sleep(1);
+    ssl = ssl_client_new(multi_data->ssl_clnt_ctx, client_fd, NULL, 0);
+
+    if ((res = ssl_handshake_status(ssl)))
+    {
+        printf("Client ");
+        ssl_display_error(res);
+        goto client_test_exit;
+    }
+
+    sprintf(tmp, "%d\n", multi_data->thread_id);
+    for (i = 0; i < 10; i++)
+        ssl_write(ssl, (uint8_t *)tmp, strlen(tmp)+1);
+
+client_test_exit:
+    ssl_free(ssl);
+    SOCKET_CLOSE(client_fd);
+    free(multi_data);
+}
+
+void do_multi_svr(SSL *ssl)
+{
+    uint8_t *read_buf;
+    int *res_ptr = malloc(sizeof(int));
+    int res;
+
+    for (;;)
+    {
+        res = ssl_read(ssl, &read_buf);
+
+        /* kill the client */
+        if (res != SSL_OK)
+        {
+            if (res == SSL_ERROR_CONN_LOST)
+            {
+                SOCKET_CLOSE(ssl->client_fd);
+                ssl_free(ssl);
+                break;
+            }
+            else if (res > 0)
+            {
+                /* do nothing */
+            }
+            else /* some problem */
+            {
+                printf("Server ");
+                ssl_display_error(res);
+                goto error;
+            }
+        }
+    }
+
+    res = SSL_OK;
+error:
+    *res_ptr = res;
+    pthread_exit(res_ptr);
+}
+
+int multi_thread_test(void)
+{
+    int server_fd = -1;
+    SSL_CTX *ssl_server_ctx;
+    SSL_CTX *ssl_clnt_ctx;
+    pthread_t clnt_threads[NUM_THREADS];
+    pthread_t svr_threads[NUM_THREADS];
+    int i, res = 0;
+    struct sockaddr_in client_addr;
+    socklen_t clnt_len = sizeof(client_addr);
+
+    printf("Do multi-threading test (takes a minute)\n");
+
+    ssl_server_ctx = ssl_ctx_new(DEFAULT_SVR_OPTION, SSL_DEFAULT_SVR_SESS);
+    ssl_clnt_ctx = ssl_ctx_new(DEFAULT_CLNT_OPTION, SSL_DEFAULT_CLNT_SESS);
+
+    if (ssl_obj_load(ssl_clnt_ctx, SSL_OBJ_X509_CACERT, 
+                                        "../ssl/test/axTLS.ca_x509.cer", NULL))
+        goto error;
+
+    if ((server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+    for (i = 0; i < NUM_THREADS; i++)
+    {
+        multi_t *multi_data = (multi_t *)malloc(sizeof(multi_t));
+        multi_data->ssl_clnt_ctx = ssl_clnt_ctx;
+        multi_data->port = g_port;
+        multi_data->thread_id = i+1;
+        pthread_create(&clnt_threads[i], NULL, 
+                (void *(*)(void *))do_multi_clnt, (void *)multi_data);
+        pthread_detach(clnt_threads[i]);
+    }
+
+    for (i = 0; i < NUM_THREADS; i++)
+    { 
+        SSL *ssl_svr;
+        int client_fd = accept(server_fd, 
+                      (struct sockaddr *)&client_addr, &clnt_len);
+
+        if (client_fd < 0)
+            goto error;
+
+        ssl_svr = ssl_server_new(ssl_server_ctx, client_fd);
+
+        pthread_create(&svr_threads[i], NULL, 
+                        (void *(*)(void *))do_multi_svr, (void *)ssl_svr);
+    }
+
+    /* make sure we've run all of the threads */
+    for (i = 0; i < NUM_THREADS; i++)
+    {
+        void *thread_res;
+        pthread_join(svr_threads[i], &thread_res);
+
+        if (*((int *)thread_res) != 0)
+            res = 1;
+
+        free(thread_res);
+    } 
+
+    if (res) 
+        goto error;
+
+    printf("Multi-thread test passed (%d)\n", NUM_THREADS);
+error:
+    ssl_ctx_free(ssl_server_ctx);
+    ssl_ctx_free(ssl_clnt_ctx);
+    SOCKET_CLOSE(server_fd);
+    return res;
+}
+#endif /* !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING) */ 
+
+/**************************************************************************
+ * Header issue
+ *
+ **************************************************************************/
+static void do_header_issue(void)
+{
+    char axtls_buf[2048];
+#ifndef WIN32
+    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+#endif
+    sprintf(axtls_buf, "./axssl s_client -connect localhost:%d", g_port);
+    system(axtls_buf);
+}
+
+static int header_issue(void)
+{
+    FILE *f = fopen("../ssl/test/header_issue.dat", "r");
+    int server_fd = -1, client_fd = -1, ret = 1;
+    uint8_t buf[2048];
+    int size = 0;
+    struct sockaddr_in client_addr;
+    socklen_t clnt_len = sizeof(client_addr);
+#ifndef WIN32
+    pthread_t thread;
+#endif
+
+    if (f == NULL || (server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+#ifndef WIN32
+    pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_header_issue, NULL);
+    pthread_detach(thread);
+#else
+    CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_header_issue, 
+                NULL, 0, NULL);
+#endif
+    if ((client_fd = accept(server_fd, 
+                    (struct sockaddr *) &client_addr, &clnt_len)) < 0)
+    {
+        ret = SSL_ERROR_SOCK_SETUP_FAILURE;
+        goto error;
+    }
+
+    size = fread(buf, 1, sizeof(buf), f);
+    SOCKET_WRITE(client_fd, buf, size);
+    usleep(200000);
+
+    ret = 0;
+error:
+    fclose(f);
+    SOCKET_CLOSE(client_fd);
+    SOCKET_CLOSE(server_fd);
+    TTY_FLUSH();
+    system("killall axssl");
+    return ret;
+}
+
+/**************************************************************************
+ * main()
+ *
+ **************************************************************************/
+int main(int argc, char *argv[])
+{
+    int ret = 1;
+    BI_CTX *bi_ctx;
+    int fd;
+
+#ifdef WIN32
+    WSADATA wsaData;
+    WORD wVersionRequested = MAKEWORD(2, 2);
+    WSAStartup(wVersionRequested, &wsaData);
+    fd = _open("test_result.txt", O_WRONLY|O_TEMPORARY|O_CREAT, _S_IWRITE);
+    dup2(fd, 2);                        /* write stderr to this file */
+#else
+    fd = open("/dev/null", O_WRONLY);   /* write stderr to /dev/null */
+    signal(SIGPIPE, SIG_IGN);           /* ignore pipe errors */
+    dup2(fd, 2);
+#endif
+
+    /* can't do testing in this mode */
+#if defined CONFIG_SSL_GENERATE_X509_CERT
+    printf("Error: Must compile with default key/certificates\n");
+    exit(1);
+#endif
+
+    bi_ctx = bi_initialize();
+
+    if (AES_test(bi_ctx))
+    {
+        printf("AES tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (RC4_test(bi_ctx))
+    {
+        printf("RC4 tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (MD5_test(bi_ctx))
+    {
+        printf("MD5 tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (SHA1_test(bi_ctx))
+    {
+        printf("SHA1 tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (HMAC_test(bi_ctx))
+    {
+        printf("HMAC tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (BIGINT_test(bi_ctx))
+    {
+        printf("BigInt tests failed!\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    bi_terminate(bi_ctx);
+
+    if (RSA_test())
+    {
+        printf("RSA tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (cert_tests())
+    {
+        printf("CERT tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+#if !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING)
+    if (multi_thread_test())
+        goto cleanup;
+#endif
+
+    if (SSL_basic_test())
+        goto cleanup;
+
+    system("sh ../ssl/test/killopenssl.sh");
+
+    if (SSL_client_tests())
+        goto cleanup;
+
+    system("sh ../ssl/test/killopenssl.sh");
+
+    if (SSL_server_tests())
+        goto cleanup;
+
+    system("sh ../ssl/test/killopenssl.sh");
+
+    if (header_issue())
+    {
+        printf("Header tests failed\n"); TTY_FLUSH();
+        goto cleanup;
+    }
+
+    ret = 0;        /* all ok */
+    printf("**** ALL TESTS PASSED ****\n"); TTY_FLUSH();
+cleanup:
+
+    if (ret)
+        printf("Error: Some tests failed!\n");
+
+    close(fd);
+    return ret;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c.bak b/trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c.bak
new file mode 100644
index 00000000..ca9637f9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/ssltest.c.bak
@@ -0,0 +1,1940 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * The testing of the crypto and ssl stuff goes here. Keeps the individual code
+ * modules from being uncluttered with test code.
+ *
+ * This is test code - I make no apologies for the quality!
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifndef WIN32
+#include <pthread.h>
+#endif
+
+#include "ssl.h"
+
+#define DEFAULT_CERT            "../ssl/test/axTLS.x509_512.cer"
+#define DEFAULT_KEY             "../ssl/test/axTLS.key_512"     
+//#define DEFAULT_SVR_OPTION      SSL_DISPLAY_BYTES|SSL_DISPLAY_STATES
+#define DEFAULT_SVR_OPTION      0
+#define DEFAULT_CLNT_OPTION     0
+//#define DEFAULT_CLNT_OPTION      SSL_DISPLAY_BYTES|SSL_DISPLAY_STATES
+
+static int g_port = 19001;
+
+/**************************************************************************
+ * AES tests 
+ * 
+ * Run through a couple of the RFC3602 tests to verify that AES is correct.
+ **************************************************************************/
+#define TEST1_SIZE  16
+#define TEST2_SIZE  32
+
+static int AES_test(BI_CTX *bi_ctx)
+{
+    AES_CTX aes_key;
+    int res = 1;
+    uint8_t key[TEST1_SIZE];
+    uint8_t iv[TEST1_SIZE];
+
+    {
+        /*
+            Case #1: Encrypting 16 bytes (1 block) using AES-CBC
+            Key       : 0x06a9214036b8a15b512e03d534120006
+            IV        : 0x3dafba429d9eb430b422da802c9fac41
+            Plaintext : "Single block msg"
+            Ciphertext: 0xe353779c1079aeb82708942dbe77181a
+
+        */
+        char *in_str =  "Single block msg";
+        uint8_t ct[TEST1_SIZE];
+        uint8_t enc_data[TEST1_SIZE];
+        uint8_t dec_data[TEST1_SIZE];
+
+        bigint *key_bi = bi_str_import(
+                bi_ctx, "06A9214036B8A15B512E03D534120006");
+        bigint *iv_bi = bi_str_import(
+                bi_ctx, "3DAFBA429D9EB430B422DA802C9FAC41");
+        bigint *ct_bi = bi_str_import(
+                bi_ctx, "E353779C1079AEB82708942DBE77181A");
+        bi_export(bi_ctx, key_bi, key, TEST1_SIZE);
+        bi_export(bi_ctx, iv_bi, iv, TEST1_SIZE);
+        bi_export(bi_ctx, ct_bi, ct, TEST1_SIZE);
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_cbc_encrypt(&aes_key, (const uint8_t *)in_str, 
+                enc_data, sizeof(enc_data));
+        if (memcmp(enc_data, ct, sizeof(ct)))
+        {
+            printf("Error: AES ENCRYPT #1 failed\n");
+            goto end;
+        }
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_convert_key(&aes_key);
+        AES_cbc_decrypt(&aes_key, enc_data, dec_data, sizeof(enc_data));
+
+        if (memcmp(dec_data, in_str, sizeof(dec_data)))
+        {
+            printf("Error: AES DECRYPT #1 failed\n");
+            goto end;
+        }
+    }
+
+    {
+        /*
+            Case #2: Encrypting 32 bytes (2 blocks) using AES-CBC 
+            Key       : 0xc286696d887c9aa0611bbb3e2025a45a
+            IV        : 0x562e17996d093d28ddb3ba695a2e6f58
+            Plaintext : 0x000102030405060708090a0b0c0d0e0f
+                          101112131415161718191a1b1c1d1e1f
+            Ciphertext: 0xd296cd94c2cccf8a3a863028b5e1dc0a
+                          7586602d253cfff91b8266bea6d61ab1
+        */
+        uint8_t in_data[TEST2_SIZE];
+        uint8_t ct[TEST2_SIZE];
+        uint8_t enc_data[TEST2_SIZE];
+        uint8_t dec_data[TEST2_SIZE];
+
+        bigint *in_bi = bi_str_import(bi_ctx,
+            "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F");
+        bigint *key_bi = bi_str_import(
+                bi_ctx, "C286696D887C9AA0611BBB3E2025A45A");
+        bigint *iv_bi = bi_str_import(
+                bi_ctx, "562E17996D093D28DDB3BA695A2E6F58");
+        bigint *ct_bi = bi_str_import(bi_ctx,
+            "D296CD94C2CCCF8A3A863028B5E1DC0A7586602D253CFFF91B8266BEA6D61AB1");
+        bi_export(bi_ctx, in_bi, in_data, TEST2_SIZE);
+        bi_export(bi_ctx, key_bi, key, TEST1_SIZE);
+        bi_export(bi_ctx, iv_bi, iv, TEST1_SIZE);
+        bi_export(bi_ctx, ct_bi, ct, TEST2_SIZE);
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_cbc_encrypt(&aes_key, (const uint8_t *)in_data, 
+                enc_data, sizeof(enc_data));
+
+        if (memcmp(enc_data, ct, sizeof(ct)))
+        {
+            printf("Error: ENCRYPT #2 failed\n");
+            goto end;
+        }
+
+        AES_set_key(&aes_key, key, iv, AES_MODE_128);
+        AES_convert_key(&aes_key);
+        AES_cbc_decrypt(&aes_key, enc_data, dec_data, sizeof(enc_data));
+        if (memcmp(dec_data, in_data, sizeof(dec_data)))
+        {
+            printf("Error: DECRYPT #2 failed\n");
+            goto end;
+        }
+    }
+
+    res = 0;
+    printf("All AES tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * RC4 tests 
+ *
+ * ARC4 tests vectors from OpenSSL (crypto/rc4/rc4test.c)
+ **************************************************************************/
+static const uint8_t keys[7][30]=
+{
+    {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
+    {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
+    {8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+    {4,0xef,0x01,0x23,0x45},
+    {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
+    {4,0xef,0x01,0x23,0x45},
+};
+
+static const uint8_t data_len[7]={8,8,8,20,28,10};
+static uint8_t data[7][30]=
+{
+    {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xff},
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0xff},
+        {0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
+            0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
+            0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
+            0x12,0x34,0x56,0x78,0xff},
+            {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
+            {0},
+};
+
+static const uint8_t output[7][30]=
+{
+    {0x75,0xb7,0x87,0x80,0x99,0xe0,0xc5,0x96,0x00},
+    {0x74,0x94,0xc2,0xe7,0x10,0x4b,0x08,0x79,0x00},
+    {0xde,0x18,0x89,0x41,0xa3,0x37,0x5d,0x3a,0x00},
+    {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,
+        0xbd,0x61,0x5a,0x11,0x62,0xe1,0xc7,0xba,
+        0x36,0xb6,0x78,0x58,0x00},
+        {0x66,0xa0,0x94,0x9f,0x8a,0xf7,0xd6,0x89,
+            0x1f,0x7f,0x83,0x2b,0xa8,0x33,0xc0,0x0c,
+            0x89,0x2e,0xbe,0x30,0x14,0x3c,0xe2,0x87,
+            0x40,0x01,0x1e,0xcf,0x00},
+            {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,0xbd,0x61,0x00},
+            {0},
+};
+
+static int RC4_test(BI_CTX *bi_ctx)
+{
+    int i, res = 1;
+    RC4_CTX s;
+
+    for (i = 0; i < 6; i++)
+    {
+        RC4_setup(&s, &keys[i][1], keys[i][0]);
+        RC4_crypt(&s, data[i], data[i], data_len[i]);
+
+        if (memcmp(data[i], output[i], data_len[i]))
+        {
+            printf("Error: RC4 CRYPT #%d failed\n", i);
+            goto end;
+        }
+    }
+
+    res = 0;
+    printf("All RC4 tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * SHA1 tests 
+ *
+ * Run through a couple of the RFC3174 tests to verify that SHA1 is correct.
+ **************************************************************************/
+static int SHA1_test(BI_CTX *bi_ctx)
+{
+    SHA1_CTX ctx;
+    uint8_t ct[SHA1_SIZE];
+    uint8_t digest[SHA1_SIZE];
+    int res = 1;
+
+    {
+        const char *in_str = "abc";
+        bigint *ct_bi = bi_str_import(bi_ctx,
+                "A9993E364706816ABA3E25717850C26C9CD0D89D");
+        bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+        SHA1_Init(&ctx);
+        SHA1_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        SHA1_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: SHA1 #1 failed\n");
+            goto end;
+        }
+    }
+
+    {
+        const char *in_str =
+            "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
+        bigint *ct_bi = bi_str_import(bi_ctx,
+                "84983E441C3BD26EBAAE4AA1F95129E5E54670F1");
+        bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+        SHA1_Init(&ctx);
+        SHA1_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        SHA1_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: SHA1 #2 failed\n");
+            goto end;
+        }
+    }
+
+    res = 0;
+    printf("All SHA1 tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * MD5 tests 
+ *
+ * Run through a couple of the RFC1321 tests to verify that MD5 is correct.
+ **************************************************************************/
+static int MD5_test(BI_CTX *bi_ctx)
+{
+    MD5_CTX ctx;
+    uint8_t ct[MD5_SIZE];
+    uint8_t digest[MD5_SIZE];
+    int res = 1;
+
+    {
+        const char *in_str =  "abc";
+        bigint *ct_bi = bi_str_import(bi_ctx, 
+                "900150983CD24FB0D6963F7D28E17F72");
+        bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+
+        MD5_Init(&ctx);
+        MD5_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        MD5_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: MD5 #1 failed\n");
+            goto end;
+        }
+    }
+
+    {
+        const char *in_str =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        bigint *ct_bi = bi_str_import(
+                bi_ctx, "D174AB98D277D9F5A5611C2C9F419D9F");
+        bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+
+        MD5_Init(&ctx);
+        MD5_Update(&ctx, (const uint8_t *)in_str, strlen(in_str));
+        MD5_Final(digest, &ctx);
+
+        if (memcmp(digest, ct, sizeof(ct)))
+        {
+            printf("Error: MD5 #2 failed\n");
+            goto end;
+        }
+    }
+    res = 0;
+    printf("All MD5 tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * HMAC tests 
+ *
+ * Run through a couple of the RFC2202 tests to verify that HMAC is correct.
+ **************************************************************************/
+static int HMAC_test(BI_CTX *bi_ctx)
+{
+    uint8_t key[SHA1_SIZE];
+    uint8_t ct[SHA1_SIZE];
+    uint8_t dgst[SHA1_SIZE];
+    int res = 1;
+    const char *key_str;
+
+    const char *data_str = "Hi There";
+    bigint *key_bi = bi_str_import(bi_ctx, "0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B");
+    bigint *ct_bi = bi_str_import(bi_ctx, "9294727A3638BB1C13F48EF8158BFC9D");
+    bi_export(bi_ctx, key_bi, key, MD5_SIZE);
+    bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+    hmac_md5((const uint8_t *)data_str, 8, key, MD5_SIZE, dgst);
+    if (memcmp(dgst, ct, MD5_SIZE))
+    {
+        printf("HMAC MD5 #1 failed\n");
+        goto end;
+    }
+
+    data_str = "what do ya want for nothing?";
+    key_str = "Jefe";
+    ct_bi = bi_str_import(bi_ctx, "750C783E6AB0B503EAA86E310A5DB738");
+    bi_export(bi_ctx, ct_bi, ct, MD5_SIZE);
+    hmac_md5((const uint8_t *)data_str, 28, (const uint8_t *)key_str, 4, dgst);
+    if (memcmp(dgst, ct, MD5_SIZE))
+    {
+        printf("HMAC MD5 #2 failed\n");
+        goto end;
+    }
+   
+    data_str = "Hi There";
+    key_bi = bi_str_import(bi_ctx, "0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B");
+    bi_export(bi_ctx, key_bi, key, SHA1_SIZE);
+    ct_bi = bi_str_import(bi_ctx, "B617318655057264E28BC0B6FB378C8EF146BE00");
+    bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+    hmac_sha1((const uint8_t *)data_str, 8, 
+            (const uint8_t *)key, SHA1_SIZE, dgst);
+    if (memcmp(dgst, ct, SHA1_SIZE))
+    {
+        printf("HMAC SHA1 #1 failed\n");
+        goto end;
+    }
+
+    data_str = "what do ya want for nothing?";
+    key_str = "Jefe";
+    ct_bi = bi_str_import(bi_ctx, "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79");
+    bi_export(bi_ctx, ct_bi, ct, SHA1_SIZE);
+
+    hmac_sha1((const uint8_t *)data_str, 28, (const uint8_t *)key_str, 5, dgst);
+    if (memcmp(dgst, ct, SHA1_SIZE))
+    {
+        printf("HMAC SHA1 failed\n");
+        exit(1);
+    }
+
+    res = 0;
+    printf("All HMAC tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * BIGINT tests 
+ *
+ **************************************************************************/
+static int BIGINT_test(BI_CTX *ctx)
+{
+    int res = 1;
+    bigint *bi_data, *bi_exp, *bi_res;
+    const char *expnt, *plaintext, *mod;
+    uint8_t compare[MAX_KEY_BYTE_SIZE];
+
+    /**
+     * 512 bit key
+     */
+    plaintext = /* 64 byte number */
+        "01aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeeee";
+
+    mod = "C30773C8ABE09FCC279EE0E5343370DE"
+          "8B2FFDB6059271E3005A7CEEF0D35E0A"
+          "1F9915D95E63560836CC2EB2C289270D"
+          "BCAE8CAF6F5E907FC2759EE220071E1B";
+
+    expnt = "A1E556CD1738E10DF539E35101334E97"
+          "BE8D391C57A5C89A7AD9A2EA2ACA1B3D"
+          "F3140F5091CC535CBAA47CEC4159EE1F"
+          "B6A3661AFF1AB758426EAB158452A9B9";
+
+    bi_data = bi_import(ctx, (uint8_t *)plaintext, strlen(plaintext));
+    bi_exp = int_to_bi(ctx, 0x10001);
+    bi_set_mod(ctx, bi_str_import(ctx, mod), 0);
+    bi_res = bi_mod_power(ctx, bi_data, bi_exp);
+
+    bi_data = bi_res;   /* resuse again - see if we get the original */
+
+    bi_exp = bi_str_import(ctx, expnt);
+    bi_res = bi_mod_power(ctx, bi_data, bi_exp);
+    bi_free_mod(ctx, 0);
+
+    bi_export(ctx, bi_res, compare, 64);
+    if (memcmp(plaintext, compare, 64) != 0)
+        goto end;
+
+    printf("All BIGINT tests passed\n");
+    res = 0;
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * RSA tests 
+ *
+ * Use the results from openssl to verify PKCS1 etc 
+ **************************************************************************/
+static int RSA_test(void)
+{
+    int res = 1;
+    const char *plaintext = /* 128 byte hex number */
+        "1aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeeee2"
+        "1aaaaaaaaaabbbbbbbbbbbbbbbccccccccccccccdddddddddddddeeeeeeeee2\012";
+    uint8_t enc_data[128], dec_data[128];
+    RSA_CTX *rsa_ctx = NULL;
+    BI_CTX *bi_ctx;
+    bigint *plaintext_bi;
+    bigint *enc_data_bi, *dec_data_bi;
+    uint8_t enc_data2[128], dec_data2[128];
+    int size;
+    int len; 
+    uint8_t *buf;
+
+    /* extract the private key elements */
+    len = get_file("../ssl/test/axTLS.key_1024", &buf);
+    if (asn1_get_private_key(buf, len, &rsa_ctx) < 0)
+    {
+        goto end;
+    }
+
+    free(buf);
+    bi_ctx = rsa_ctx->bi_ctx;
+    plaintext_bi = bi_import(bi_ctx, 
+            (const uint8_t *)plaintext, strlen(plaintext));
+
+    /* basic rsa encrypt */
+    enc_data_bi = RSA_public(rsa_ctx, plaintext_bi);
+    bi_export(bi_ctx, bi_copy(enc_data_bi), enc_data, sizeof(enc_data));
+
+    /* basic rsa decrypt */
+    dec_data_bi = RSA_private(rsa_ctx, enc_data_bi);
+    bi_export(bi_ctx, dec_data_bi, dec_data, sizeof(dec_data));
+
+    if (memcmp(dec_data, plaintext, strlen(plaintext)))
+    {
+        printf("Error: DECRYPT #1 failed\n");
+        goto end;
+    }
+
+    RSA_encrypt(rsa_ctx, (const uint8_t *)"abc", 3, enc_data2, 0);
+    size = RSA_decrypt(rsa_ctx, enc_data2, dec_data2, 1);
+    if (memcmp("abc", dec_data2, 3))
+    {
+        printf("Error: ENCRYPT/DECRYPT #2 failed\n");
+        goto end;
+    }
+
+    RSA_free(rsa_ctx);
+    res = 0;
+    printf("All RSA tests passed\n");
+
+end:
+    return res;
+}
+
+/**************************************************************************
+ * Cert Testing
+ *
+ **************************************************************************/
+static int cert_tests(void)
+{
+    int res = -1, len;
+    X509_CTX *x509_ctx;
+    SSL_CTX *ssl_ctx;
+    uint8_t *buf;
+
+    /* check a bunch of 3rd party certificates */
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/microsoft.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #1\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/thawte.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #2\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/deutsche_telecom.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #3\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/equifax.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #4\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/gnutls.cer", &buf);
+    if ((res = add_cert(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #5\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/socgen.cer", &buf);
+    if ((res = add_cert(ssl_ctx, buf, len)) < 0)
+    {
+        printf("Cert #6\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    len = get_file("../ssl/test/verisign.x509_ca", &buf);
+    if ((res = add_cert_auth(ssl_ctx, buf, len)) <0)
+    {
+        printf("Cert #7\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    free(buf);
+
+    if (get_file("../ssl/test/verisign.x509_my_cert", &buf) < 0 ||
+                                    x509_new(buf, &len, &x509_ctx))
+    {
+        printf("Cert #8\n");
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    x509_free(x509_ctx);
+    free(buf);
+
+    ssl_ctx = ssl_ctx_new(0, 0);
+    if ((res = ssl_obj_load(ssl_ctx, 
+              SSL_OBJ_X509_CERT, "../ssl/test/ms_iis.cer", NULL)) != SSL_OK)
+    {
+        ssl_display_error(res);
+        goto bad_cert;
+    }
+
+    ssl_ctx_free(ssl_ctx);
+    res = 0;        /* all ok */
+    printf("All Certificate tests passed\n");
+
+bad_cert:
+    if (res)
+        printf("Error: A certificate test failed\n");
+    return res;
+}
+
+/**
+ * init a server socket.
+ */
+static int server_socket_init(int *port)
+{
+    struct sockaddr_in serv_addr;
+    int server_fd;
+    char yes = 1;
+
+    /* Create socket for incoming connections */
+    if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    {
+        return -1;
+    }
+      
+    setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+
+go_again:
+    /* Construct local address structure */
+    memset(&serv_addr, 0, sizeof(serv_addr));      /* Zero out structure */
+    serv_addr.sin_family = AF_INET;                /* Internet address family */
+    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); /* Any incoming interface */
+    serv_addr.sin_port = htons(*port);              /* Local port */
+
+    /* Bind to the local address */
+    if (bind(server_fd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
+    {
+        (*port)++;
+        goto go_again;
+    }
+    /* Mark the socket so it will listen for incoming connections */
+    if (listen(server_fd, 3000) < 0)
+    {
+        return -1;
+    }
+
+    return server_fd;
+}
+
+/**
+ * init a client socket.
+ */
+static int client_socket_init(uint16_t port)
+{
+    struct sockaddr_in address;
+    int client_fd;
+
+    address.sin_family = AF_INET;
+    address.sin_port = htons(port);
+    address.sin_addr.s_addr =  inet_addr("127.0.0.1");
+    client_fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (connect(client_fd, (struct sockaddr *)&address, sizeof(address)) < 0)
+    {
+        perror("socket");
+        SOCKET_CLOSE(client_fd);
+        client_fd = -1;
+    }
+
+    return client_fd;
+}
+
+/**************************************************************************
+ * SSL Server Testing
+ *
+ **************************************************************************/
+typedef struct
+{
+    /* not used as yet */
+    int dummy;
+} SVR_CTX;
+
+typedef struct
+{
+    const char *testname;
+    const char *openssl_option;
+} client_t;
+
+static void do_client(client_t *clnt)
+{
+    char openssl_buf[2048];
+
+    /* make sure the main thread goes first */
+    sleep(0);
+
+    /* show the session ids in the reconnect test */
+    if (strcmp(clnt->testname, "Session Reuse") == 0)
+    {
+        sprintf(openssl_buf, "echo \"hello client\" | openssl s_client "
+            "-connect localhost:%d %s 2>&1 | grep \"Session-ID:\"", 
+            g_port, clnt->openssl_option);
+    }
+    else
+    {
+        sprintf(openssl_buf, "echo \"hello client\" | openssl s_client "
+#ifdef WIN32
+            "-connect localhost:%d -quiet %s",
+#else
+            "-connect localhost:%d -quiet %s > /dev/null 2>&1",
+#endif
+        g_port, clnt->openssl_option);
+    }
+
+    system(openssl_buf);
+}
+
+static int SSL_server_test(
+        const char *testname, 
+        const char *openssl_option, 
+        const char *device_cert, 
+        const char *product_cert, 
+        const char *private_key,
+        const char *ca_cert,
+        const char *password,
+        int axolotls_option)
+{
+    int server_fd, ret = 0;
+    SSL_CTX *ssl_ctx = NULL;
+    struct sockaddr_in client_addr;
+    uint8_t *read_buf;
+    socklen_t clnt_len = sizeof(client_addr);
+    client_t client_data;
+#ifndef WIN32
+    pthread_t thread;
+#endif
+    g_port++;
+
+    client_data.testname = testname;
+    client_data.openssl_option = openssl_option;
+
+    if ((server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+    if (private_key)
+    {
+        axolotls_option |= SSL_NO_DEFAULT_KEY;
+    }
+
+    if ((ssl_ctx = ssl_ctx_new(axolotls_option, SSL_DEFAULT_SVR_SESS)) == NULL)
+    {
+        ret = SSL_ERROR_INVALID_KEY;
+        goto error;
+    }
+
+    if (private_key)
+    {
+        int obj_type = SSL_OBJ_RSA_KEY;
+
+        if (strstr(private_key, ".p8"))
+            obj_type = SSL_OBJ_PKCS8;
+        else if (strstr(private_key, ".p12"))
+            obj_type = SSL_OBJ_PKCS12;
+
+        if (ssl_obj_load(ssl_ctx, obj_type, private_key, password))
+        {
+            ret = SSL_ERROR_INVALID_KEY;
+            goto error;
+        }
+    }
+
+    if (device_cert)             /* test chaining */
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, 
+                        SSL_OBJ_X509_CERT, device_cert, NULL)) != SSL_OK)
+            goto error;
+    }
+
+    if (product_cert)             /* test chaining */
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, 
+                        SSL_OBJ_X509_CERT, product_cert, NULL)) != SSL_OK)
+            goto error;
+    }
+
+    if (ca_cert)                  /* test adding certificate authorities */
+    {
+        if ((ret = ssl_obj_load(ssl_ctx, 
+                        SSL_OBJ_X509_CACERT, ca_cert, NULL)) != SSL_OK)
+            goto error;
+    }
+
+#ifndef WIN32
+    pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_client, (void *)&client_data);
+    pthread_detach(thread);
+#else
+    CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_client, 
+            (LPVOID)&client_data, 0, NULL);
+#endif
+
+    for (;;)
+    {
+        int client_fd, size = 0; 
+        SSL *ssl;
+
+        /* Wait for a client to connect */
+        if ((client_fd = accept(server_fd, 
+                        (struct sockaddr *)&client_addr, &clnt_len)) < 0)
+        {
+            ret = SSL_ERROR_SOCK_SETUP_FAILURE;
+            goto error;
+        }
+        
+        /* we are ready to go */
+        ssl = ssl_server_new(ssl_ctx, client_fd);
+        while ((size = ssl_read(ssl, &read_buf)) == SSL_OK);
+        SOCKET_CLOSE(client_fd);
+        
+        if (size < SSL_OK) /* got some alert or something nasty */
+        {
+            ret = size;
+
+            if (ret == SSL_ERROR_CONN_LOST)
+            {
+                ret = SSL_OK;
+                continue;
+            }
+
+            break;  /* we've got a problem */
+        }
+        else /* looks more promising */
+        {
+            if (strstr("hello client", (char *)read_buf) == NULL)
+            {
+                printf("SSL server test \"%s\" passed\n", testname);
+                TTY_FLUSH();
+                ret = 0;
+                break;
+            }
+        }
+
+        ssl_free(ssl);
+    }
+
+    SOCKET_CLOSE(server_fd);
+
+error:
+    ssl_ctx_free(ssl_ctx);
+    return ret;
+}
+
+int SSL_server_tests(void)
+{
+    int ret = -1;
+    struct stat stat_buf;
+    SVR_CTX svr_test_ctx;
+    memset(&svr_test_ctx, 0, sizeof(SVR_CTX));
+
+    printf("### starting server tests\n"); TTY_FLUSH();
+
+    /* Go through the algorithms */
+
+    /* 
+     * TLS1 client hello 
+     */
+    if ((ret = SSL_server_test("TLSv1", "-cipher RC4-SHA -tls1", 
+                    NULL, NULL, NULL, NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * AES128-SHA
+     */
+    if ((ret = SSL_server_test("AES256-SHA", "-cipher AES128-SHA", 
+                    DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                    DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * AES256-SHA
+     */
+    if ((ret = SSL_server_test("AES256-SHA", "-cipher AES128-SHA", 
+                    DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                    DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * RC4-SHA
+     */
+    if ((ret = SSL_server_test("RC4-SHA", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * RC4-MD5
+     */
+    if ((ret = SSL_server_test("RC4-MD5", "-cipher RC4-MD5", 
+                DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * Session Reuse
+     * all the session id's should match for session resumption.
+     */
+    if ((ret = SSL_server_test("Session Reuse", 
+                    "-cipher RC4-SHA -reconnect", 
+                    DEFAULT_CERT, NULL, DEFAULT_KEY, NULL, NULL,
+                    DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 512 bit RSA key 
+     */
+    if ((ret = SSL_server_test("512 bit key", "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_512.cer", NULL, 
+                    "../ssl/test/axTLS.key_512",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 1024 bit RSA key (check certificate chaining)
+     */
+    if ((ret = SSL_server_test("1024 bit key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_device.cer", 
+                    "../ssl/test/axTLS.x509_512.cer", 
+                    "../ssl/test/axTLS.device_key",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 2048 bit RSA key 
+     */
+    if ((ret = SSL_server_test("2048 bit key", 
+                    "-cipher RC4-SHA",
+                    "../ssl/test/axTLS.x509_2048.cer", NULL, 
+                    "../ssl/test/axTLS.key_2048",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * 4096 bit RSA key 
+     */
+    if ((ret = SSL_server_test("4096 bit key", 
+                    "-cipher RC4-SHA",
+                    "../ssl/test/axTLS.x509_4096.cer", NULL, 
+                    "../ssl/test/axTLS.key_4096",
+                    NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * Client Verification
+     */
+    if ((ret = SSL_server_test("Client Verification", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_2048.pem "
+                    "-key ../ssl/test/axTLS.key_2048.pem ",
+                    NULL, NULL, NULL, 
+                    "../ssl/test/axTLS.ca_x509.cer", NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)))
+        goto cleanup;
+
+    /* this test should fail */
+    if (stat("../ssl/test/axTLS.x509_bad_before.pem", &stat_buf) >= 0)
+    {
+        if ((ret = SSL_server_test("Bad Before Cert", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_bad_before.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem ",
+                    NULL, NULL, NULL, 
+                    "../ssl/test/axTLS.ca_x509.cer", NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)) !=
+                            SSL_X509_ERROR(X509_VFY_ERROR_NOT_YET_VALID))
+            goto cleanup;
+
+        printf("SSL server test \"%s\" passed\n", "Bad Before Cert");
+        TTY_FLUSH();
+        ret = 0;    /* is ok */
+    }
+
+    /* this test should fail */
+    if ((ret = SSL_server_test("Bad After Cert", 
+                    "-cipher RC4-SHA -tls1 "
+                    "-cert ../ssl/test/axTLS.x509_bad_after.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem ",
+                    NULL, NULL, NULL, 
+                    "../ssl/test/axTLS.ca_x509.cer", NULL,
+                    DEFAULT_SVR_OPTION|SSL_CLIENT_AUTHENTICATION)) !=
+                            SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED))
+        goto cleanup;
+
+    printf("SSL server test \"%s\" passed\n", "Bad After Cert");
+    TTY_FLUSH();
+
+    /* 
+     * Key in PEM format
+     */
+    if ((ret = SSL_server_test("Key in PEM format",
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_512.cer", NULL, 
+                    "../ssl/test/axTLS.key_512.pem", NULL,
+                    NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * Cert in PEM format
+     */
+    if ((ret = SSL_server_test("Cert in PEM format", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_512.pem", NULL, 
+                    "../ssl/test/axTLS.key_512.pem", NULL,
+                    NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * Cert chain in PEM format
+     */
+    if ((ret = SSL_server_test("Cert chain in PEM format", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_device.pem", 
+                    NULL, "../ssl/test/axTLS.device_key.pem",
+                    "../ssl/test/axTLS.ca_x509.pem", NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * AES128 Encrypted key 
+     */
+    if ((ret = SSL_server_test("AES128 encrypted key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_aes128.pem", NULL, 
+                    "../ssl/test/axTLS.key_aes128.pem",
+                    NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * AES256 Encrypted key 
+     */
+    if ((ret = SSL_server_test("AES256 encrypted key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_aes256.pem", NULL, 
+                    "../ssl/test/axTLS.key_aes256.pem",
+                    NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /* 
+     * AES128 Encrypted invalid key 
+     */
+    if ((ret = SSL_server_test("AES128 encrypted invalid key", 
+                    "-cipher RC4-SHA", 
+                    "../ssl/test/axTLS.x509_aes128.pem", NULL, 
+                    "../ssl/test/axTLS.key_aes128.pem",
+                    NULL, "xyz", DEFAULT_SVR_OPTION)) != SSL_ERROR_INVALID_KEY)
+        goto cleanup;
+
+    printf("SSL server test \"%s\" passed\n", "AES128 encrypted invalid key");
+    TTY_FLUSH();
+
+    /*
+     * PKCS#8 key (encrypted)
+     */
+    if ((ret = SSL_server_test("pkcs#8 encrypted", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, "../ssl/test/axTLS.encrypted.p8", 
+                NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * PKCS#8 key (unencrypted)
+     */
+    if ((ret = SSL_server_test("pkcs#8 unencrypted", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, "../ssl/test/axTLS.unencrypted.p8", 
+                NULL, NULL, DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     * PKCS#12 key/certificate
+     */
+    if ((ret = SSL_server_test("pkcs#12 with CA", "-cipher RC4-SHA", 
+                NULL, NULL, "../ssl/test/axTLS.withCA.p12", 
+                NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    if ((ret = SSL_server_test("pkcs#12 no CA", "-cipher RC4-SHA", 
+                DEFAULT_CERT, NULL, "../ssl/test/axTLS.withoutCA.p12", 
+                NULL, "abcd", DEFAULT_SVR_OPTION)))
+        goto cleanup;
+
+    /*
+     *
+     */
+
+    ret = 0;
+
+cleanup:
+    if (ret)
+    {
+        printf("Error: A server test failed\n");
+        ssl_display_error(ret);
+        exit(1);
+    }
+    else
+    {
+        printf("All server tests passed\n"); TTY_FLUSH();
+    }
+
+    return ret;
+}
+
+/**************************************************************************
+ * SSL Client Testing
+ *
+ **************************************************************************/
+typedef struct
+{
+    uint8_t session_id[SSL_SESSION_ID_SIZE];
+#ifndef WIN32
+    pthread_t server_thread;
+#endif
+    int start_server;
+    int stop_server;
+    int do_reneg;
+} CLNT_SESSION_RESUME_CTX;
+
+typedef struct
+{
+    const char *testname;
+    const char *openssl_option;
+} server_t;
+
+static void do_server(server_t *svr)
+{
+    char openssl_buf[2048];
+#ifndef WIN32
+    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+#endif
+    sprintf(openssl_buf, "openssl s_server -tls1 " 
+            "-accept %d -quiet %s ", g_port, svr->openssl_option);
+    system(openssl_buf);
+}
+
+static int SSL_client_test(
+        const char *test,
+        SSL_CTX **ssl_ctx,
+        const char *openssl_option, 
+        CLNT_SESSION_RESUME_CTX *sess_resume,
+        uint32_t client_options,
+        const char *private_key,
+        const char *password,
+        const char *cert)
+{
+    server_t server_data;
+    SSL *ssl = NULL;
+    int client_fd = -1;
+    uint8_t *session_id = NULL;
+    int ret = 1;
+#ifndef WIN32
+    pthread_t thread;
+#endif
+
+    if (sess_resume == NULL || sess_resume->start_server)
+    {
+        g_port++;
+        server_data.openssl_option = openssl_option;
+
+#ifndef WIN32
+        pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_server, (void *)&server_data);
+        pthread_detach(thread);
+#else
+        CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_server, 
+            (LPVOID)&server_data, 0, NULL);
+#endif
+    }
+    
+    usleep(200000);           /* allow server to start */
+
+    if (*ssl_ctx == NULL)
+    {
+        if (private_key)
+        {
+            client_options |= SSL_NO_DEFAULT_KEY;
+        }
+
+        if ((*ssl_ctx = ssl_ctx_new(
+                            client_options, SSL_DEFAULT_CLNT_SESS)) == NULL)
+        {
+            ret = SSL_ERROR_INVALID_KEY;
+            goto client_test_exit;
+        }
+
+        if (private_key)
+        {
+            int obj_type = SSL_OBJ_RSA_KEY;
+
+            if (strstr(private_key, ".p8"))
+                obj_type = SSL_OBJ_PKCS8;
+            else if (strstr(private_key, ".p12"))
+                obj_type = SSL_OBJ_PKCS12;
+
+            if (ssl_obj_load(*ssl_ctx, obj_type, private_key, password))
+            {
+                ret = SSL_ERROR_INVALID_KEY;
+                goto client_test_exit;
+            }
+        }
+
+        if (cert)                  
+        {
+            if ((ret = ssl_obj_load(*ssl_ctx, 
+                            SSL_OBJ_X509_CERT, cert, NULL)) != SSL_OK)
+            {
+                printf("could not add cert %s (%d)\n", cert, ret);
+                TTY_FLUSH();
+                goto client_test_exit;
+            }
+        }
+
+	if (ssl_obj_load(*ssl_ctx, SSL_OBJ_X509_CACERT, 
+				"../ssl/test/axTLS.ca_x509.cer", NULL))
+        {
+            printf("could not add cert auth\n"); TTY_FLUSH();
+            goto client_test_exit;
+        }
+    }
+    
+    if (sess_resume && !sess_resume->start_server) 
+    {
+        session_id = sess_resume->session_id;
+    }
+
+    if ((client_fd = client_socket_init(g_port)) < 0)
+    {
+        printf("could not start socket on %d\n", g_port); TTY_FLUSH();
+        goto client_test_exit;
+    }
+
+    ssl = ssl_client_new(*ssl_ctx, client_fd, session_id, sizeof(session_id));
+
+    /* check the return status */
+    if ((ret = ssl_handshake_status(ssl)))
+        goto client_test_exit;
+
+    /* renegotiate client */
+    if (sess_resume && sess_resume->do_reneg) 
+    {
+        if (ssl_renegotiate(ssl) < 0)
+            goto client_test_exit;
+    }
+
+    if (sess_resume)
+    {
+        memcpy(sess_resume->session_id, 
+                ssl_get_session_id(ssl), SSL_SESSION_ID_SIZE);
+    }
+
+    if (IS_SET_SSL_FLAG(SSL_SERVER_VERIFY_LATER) && 
+                                            (ret = ssl_verify_cert(ssl)))
+    {
+        goto client_test_exit;
+    }
+
+    ssl_write(ssl, (uint8_t *)"hello world\n", 13);
+    if (sess_resume)
+    {
+        const uint8_t *sess_id = ssl_get_session_id(ssl);
+        int i;
+
+        printf("    Session-ID: ");
+        for (i = 0; i < SSL_SESSION_ID_SIZE; i++)
+        {
+            printf("%02X", sess_id[i]);
+        }
+        printf("\n");
+        TTY_FLUSH();
+    }
+
+    ret = 0;
+
+client_test_exit:
+    ssl_free(ssl);
+    SOCKET_CLOSE(client_fd);
+    usleep(200000);           /* allow openssl to say something */
+
+    if (sess_resume)
+    {
+        if (sess_resume->stop_server)
+        {
+            ssl_ctx_free(*ssl_ctx);
+            *ssl_ctx = NULL;
+#ifndef WIN32
+            pthread_cancel(sess_resume->server_thread);
+#endif
+        }
+        else if (sess_resume->start_server)
+        {
+#ifndef WIN32
+           sess_resume->server_thread = thread;
+#endif
+        }
+    }
+    else
+    {
+        ssl_ctx_free(*ssl_ctx);
+        *ssl_ctx = NULL;
+#ifndef WIN32
+        pthread_cancel(thread);
+#endif
+    }
+
+    if (ret == 0)
+    {
+        printf("SSL client test \"%s\" passed\n", test);
+        TTY_FLUSH();
+    }
+
+    return ret;
+}
+
+int SSL_client_tests(void)
+{
+    int ret =  -1;
+    SSL_CTX *ssl_ctx = NULL;
+    CLNT_SESSION_RESUME_CTX sess_resume;
+    memset(&sess_resume, 0, sizeof(CLNT_SESSION_RESUME_CTX));
+
+    sess_resume.start_server = 1;
+    printf("### starting client tests\n");
+   
+    if ((ret = SSL_client_test("512 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_512.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem", &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    /* all the session id's should match for session resumption */
+    sess_resume.start_server = 0;
+    if ((ret = SSL_client_test("Client session resumption #1", 
+                    &ssl_ctx, NULL, &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    sess_resume.do_reneg = 1;
+    if ((ret = SSL_client_test("Client renegotiation", 
+                    &ssl_ctx, NULL, &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+    sess_resume.do_reneg = 0;
+
+    sess_resume.stop_server = 1;
+    if ((ret = SSL_client_test("Client session resumption #2", 
+                    &ssl_ctx, NULL, &sess_resume, 
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("1024 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_1024.pem "
+                    "-key ../ssl/test/axTLS.key_1024.pem", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("2048 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_2048.pem "
+                    "-key ../ssl/test/axTLS.key_2048.pem",  NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("4096 bit key", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_4096.pem "
+                    "-key ../ssl/test/axTLS.key_4096.pem", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    if ((ret = SSL_client_test("Server cert chaining", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_device.pem "
+                    "-key ../ssl/test/axTLS.device_key.pem "
+                    "-CAfile ../ssl/test/axTLS.x509_512.pem ", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)))
+        goto cleanup;
+
+    /* Check the server can verify the client */
+    if ((ret = SSL_client_test("Client peer authentication",
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_2048.pem "
+                    "-key ../ssl/test/axTLS.key_2048.pem "
+                    "-CAfile ../ssl/test/axTLS.ca_x509.pem "
+                    "-verify 1 ", NULL, DEFAULT_CLNT_OPTION, 
+                    "../ssl/test/axTLS.key_1024", NULL,
+                    "../ssl/test/axTLS.x509_1024.cer")))
+        goto cleanup;
+
+    /* Should get an "ERROR" from openssl (as the handshake fails as soon as
+     * the certificate verification fails) */
+    if ((ret = SSL_client_test("Error: Expired cert (verify now)",
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_bad_after.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem", NULL,
+                    DEFAULT_CLNT_OPTION, NULL, NULL, NULL)) != 
+                            SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED))
+    {
+        printf("*** Error: %d\n", ret);
+        goto cleanup;
+    }
+
+    printf("SSL client test \"Expired cert (verify now)\" passed\n");
+
+    /* There is no "ERROR" from openssl */
+    if ((ret = SSL_client_test("Error: Expired cert (verify later)", 
+                    &ssl_ctx,
+                    "-cert ../ssl/test/axTLS.x509_bad_after.pem "
+                    "-key ../ssl/test/axTLS.key_512.pem", NULL,
+                    DEFAULT_CLNT_OPTION|SSL_SERVER_VERIFY_LATER, NULL, 
+                    NULL, NULL)) != SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED))
+    {
+        printf("*** Error: %d\n", ret);
+        goto cleanup;
+    }
+
+    printf("SSL client test \"Expired cert (verify later)\" passed\n");
+    ret = 0;
+
+cleanup:
+    if (ret)
+    {
+        ssl_display_error(ret);
+        printf("Error: A client test failed\n");
+        exit(1);
+    }
+    else
+    {
+        printf("All client tests passed\n"); TTY_FLUSH();
+    }
+
+    return ret;
+}
+
+/**************************************************************************
+ * SSL Basic Testing (test a big packet handshake)
+ *
+ **************************************************************************/
+static uint8_t basic_buf[256*1024];
+
+static void do_basic(void)
+{
+    int client_fd;
+    SSL *ssl_clnt;
+    SSL_CTX *ssl_clnt_ctx = ssl_ctx_new(
+                            DEFAULT_CLNT_OPTION, SSL_DEFAULT_CLNT_SESS);
+    usleep(200000);           /* allow server to start */
+
+    if ((client_fd = client_socket_init(g_port)) < 0)
+        goto error;
+
+    if (ssl_obj_load(ssl_clnt_ctx, SSL_OBJ_X509_CACERT, 
+                                        "../ssl/test/axTLS.ca_x509.cer", NULL))
+        goto error;
+
+    ssl_clnt = ssl_client_new(ssl_clnt_ctx, client_fd, NULL, 0);
+
+    /* check the return status */
+    if (ssl_handshake_status(ssl_clnt) < 0)
+    {
+        printf("YA YA\n");
+        ssl_display_error(ssl_handshake_status(ssl_clnt));
+        goto error;
+    }
+
+    ssl_write(ssl_clnt, basic_buf, sizeof(basic_buf));
+    ssl_free(ssl_clnt);
+
+error:
+    ssl_ctx_free(ssl_clnt_ctx);
+    SOCKET_CLOSE(client_fd);
+
+    /* exit this thread */
+}
+
+static int SSL_basic_test(void)
+{
+    int server_fd, client_fd, ret = 0, size = 0, offset = 0;
+    SSL_CTX *ssl_svr_ctx = NULL;
+    struct sockaddr_in client_addr;
+    uint8_t *read_buf;
+    socklen_t clnt_len = sizeof(client_addr);
+    SSL *ssl_svr;
+#ifndef WIN32
+    pthread_t thread;
+#endif
+    memset(basic_buf, 0xA5, sizeof(basic_buf)/2);
+    memset(&basic_buf[sizeof(basic_buf)/2], 0x5A, sizeof(basic_buf)/2);
+
+    if ((server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+    ssl_svr_ctx = ssl_ctx_new(DEFAULT_SVR_OPTION, SSL_DEFAULT_SVR_SESS);
+
+#ifndef WIN32
+    pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_basic, NULL);
+    pthread_detach(thread);
+#else
+    CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_basic, NULL, 0, NULL);
+#endif
+
+    /* Wait for a client to connect */
+    if ((client_fd = accept(server_fd, 
+                    (struct sockaddr *) &client_addr, &clnt_len)) < 0)
+    {
+        ret = SSL_ERROR_SOCK_SETUP_FAILURE;
+        goto error;
+    }
+    
+    /* we are ready to go */
+    ssl_svr = ssl_server_new(ssl_svr_ctx, client_fd);
+    
+    do
+    {
+        while ((size = ssl_read(ssl_svr, &read_buf)) == SSL_OK);
+
+        if (size < SSL_OK) /* got some alert or something nasty */
+        {
+            printf("Server ");
+            ssl_display_error(size);
+            ret = size;
+            break;
+        }
+        else /* looks more promising */
+        {
+            if (memcmp(read_buf, &basic_buf[offset], size) != 0)
+            {
+                ret = SSL_NOT_OK;
+                break;
+            }
+        }
+
+        offset += size;
+    } while (offset < sizeof(basic_buf));
+
+    printf(ret == SSL_OK && offset == sizeof(basic_buf) ? 
+                            "SSL basic test passed\n" :
+                            "SSL basic test failed\n");
+    TTY_FLUSH();
+
+    ssl_free(ssl_svr);
+    SOCKET_CLOSE(server_fd);
+    SOCKET_CLOSE(client_fd);
+
+error:
+    ssl_ctx_free(ssl_svr_ctx);
+    return ret;
+}
+
+#if !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING)
+/**************************************************************************
+ * Multi-Threading Tests
+ *
+ **************************************************************************/
+#define NUM_THREADS         100
+
+typedef struct
+{
+    SSL_CTX *ssl_clnt_ctx;
+    int port;
+    int thread_id;
+} multi_t;
+
+void do_multi_clnt(multi_t *multi_data)
+{
+    int res = 1, client_fd, i;
+    SSL *ssl = NULL;
+    char tmp[5];
+
+    if ((client_fd = client_socket_init(multi_data->port)) < 0)
+        goto client_test_exit;
+
+    sleep(1);
+    ssl = ssl_client_new(multi_data->ssl_clnt_ctx, client_fd, NULL, 0);
+
+    if ((res = ssl_handshake_status(ssl)))
+    {
+        printf("Client ");
+        ssl_display_error(res);
+        goto client_test_exit;
+    }
+
+    sprintf(tmp, "%d\n", multi_data->thread_id);
+    for (i = 0; i < 10; i++)
+        ssl_write(ssl, (uint8_t *)tmp, strlen(tmp)+1);
+
+client_test_exit:
+    ssl_free(ssl);
+    SOCKET_CLOSE(client_fd);
+    free(multi_data);
+}
+
+void do_multi_svr(SSL *ssl)
+{
+    uint8_t *read_buf;
+    int *res_ptr = malloc(sizeof(int));
+    int res;
+
+    for (;;)
+    {
+        res = ssl_read(ssl, &read_buf);
+
+        /* kill the client */
+        if (res != SSL_OK)
+        {
+            if (res == SSL_ERROR_CONN_LOST)
+            {
+                SOCKET_CLOSE(ssl->client_fd);
+                ssl_free(ssl);
+                break;
+            }
+            else if (res > 0)
+            {
+                /* do nothing */
+            }
+            else /* some problem */
+            {
+                printf("Server ");
+                ssl_display_error(res);
+                goto error;
+            }
+        }
+    }
+
+    res = SSL_OK;
+error:
+    *res_ptr = res;
+    pthread_exit(res_ptr);
+}
+
+int multi_thread_test(void)
+{
+    int server_fd = -1;
+    SSL_CTX *ssl_server_ctx;
+    SSL_CTX *ssl_clnt_ctx;
+    pthread_t clnt_threads[NUM_THREADS];
+    pthread_t svr_threads[NUM_THREADS];
+    int i, res = 0;
+    struct sockaddr_in client_addr;
+    socklen_t clnt_len = sizeof(client_addr);
+
+    printf("Do multi-threading test (takes a minute)\n");
+
+    ssl_server_ctx = ssl_ctx_new(DEFAULT_SVR_OPTION, SSL_DEFAULT_SVR_SESS);
+    ssl_clnt_ctx = ssl_ctx_new(DEFAULT_CLNT_OPTION, SSL_DEFAULT_CLNT_SESS);
+
+    if (ssl_obj_load(ssl_clnt_ctx, SSL_OBJ_X509_CACERT, 
+                                        "../ssl/test/axTLS.ca_x509.cer", NULL))
+        goto error;
+
+    if ((server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+    for (i = 0; i < NUM_THREADS; i++)
+    {
+        multi_t *multi_data = (multi_t *)malloc(sizeof(multi_t));
+        multi_data->ssl_clnt_ctx = ssl_clnt_ctx;
+        multi_data->port = g_port;
+        multi_data->thread_id = i+1;
+        pthread_create(&clnt_threads[i], NULL, 
+                (void *(*)(void *))do_multi_clnt, (void *)multi_data);
+        pthread_detach(clnt_threads[i]);
+    }
+
+    for (i = 0; i < NUM_THREADS; i++)
+    { 
+        SSL *ssl_svr;
+        int client_fd = accept(server_fd, 
+                      (struct sockaddr *)&client_addr, &clnt_len);
+
+        if (client_fd < 0)
+            goto error;
+
+        ssl_svr = ssl_server_new(ssl_server_ctx, client_fd);
+
+        pthread_create(&svr_threads[i], NULL, 
+                        (void *(*)(void *))do_multi_svr, (void *)ssl_svr);
+    }
+
+    /* make sure we've run all of the threads */
+    for (i = 0; i < NUM_THREADS; i++)
+    {
+        void *thread_res;
+        pthread_join(svr_threads[i], &thread_res);
+
+        if (*((int *)thread_res) != 0)
+            res = 1;
+
+        free(thread_res);
+    } 
+
+    if (res) 
+        goto error;
+
+    printf("Multi-thread test passed (%d)\n", NUM_THREADS);
+error:
+    ssl_ctx_free(ssl_server_ctx);
+    ssl_ctx_free(ssl_clnt_ctx);
+    SOCKET_CLOSE(server_fd);
+    return res;
+}
+#endif /* !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING) */ 
+
+/**************************************************************************
+ * Header issue
+ *
+ **************************************************************************/
+static void do_header_issue(void)
+{
+    char axtls_buf[2048];
+#ifndef WIN32
+    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+#endif
+    sprintf(axtls_buf, "./axssl s_client -connect localhost:%d", g_port);
+    system(axtls_buf);
+}
+
+static int header_issue(void)
+{
+    FILE *f = fopen("../ssl/test/header_issue.dat", "r");
+    int server_fd = -1, client_fd = -1, ret = 1;
+    uint8_t buf[2048];
+    int size = 0;
+    struct sockaddr_in client_addr;
+    socklen_t clnt_len = sizeof(client_addr);
+#ifndef WIN32
+    pthread_t thread;
+#endif
+
+    if (f == NULL || (server_fd = server_socket_init(&g_port)) < 0)
+        goto error;
+
+#ifndef WIN32
+    pthread_create(&thread, NULL, 
+                (void *(*)(void *))do_header_issue, NULL);
+    pthread_detach(thread);
+#else
+    CreateThread(NULL, 1024, (LPTHREAD_START_ROUTINE)do_header_issue, 
+                NULL, 0, NULL);
+#endif
+    if ((client_fd = accept(server_fd, 
+                    (struct sockaddr *) &client_addr, &clnt_len)) < 0)
+    {
+        ret = SSL_ERROR_SOCK_SETUP_FAILURE;
+        goto error;
+    }
+
+    size = fread(buf, 1, sizeof(buf), f);
+    SOCKET_WRITE(client_fd, buf, size);
+    usleep(200000);
+
+    ret = 0;
+error:
+    fclose(f);
+    SOCKET_CLOSE(client_fd);
+    SOCKET_CLOSE(server_fd);
+    TTY_FLUSH();
+    system("killall axssl");
+    return ret;
+}
+
+/**************************************************************************
+ * main()
+ *
+ **************************************************************************/
+int main(int argc, char *argv[])
+{
+    int ret = 1;
+    BI_CTX *bi_ctx;
+    int fd;
+
+#ifdef WIN32
+    WSADATA wsaData;
+    WORD wVersionRequested = MAKEWORD(2, 2);
+    WSAStartup(wVersionRequested, &wsaData);
+    fd = _open("test_result.txt", O_WRONLY|O_TEMPORARY|O_CREAT, _S_IWRITE);
+    dup2(fd, 2);                        /* write stderr to this file */
+#else
+    fd = open("/dev/null", O_WRONLY);   /* write stderr to /dev/null */
+    signal(SIGPIPE, SIG_IGN);           /* ignore pipe errors */
+    dup2(fd, 2);
+#endif
+
+    /* can't do testing in this mode */
+#if defined CONFIG_SSL_GENERATE_X509_CERT
+    printf("Error: Must compile with default key/certificates\n");
+    exit(1);
+#endif
+
+    bi_ctx = bi_initialize();
+
+    if (AES_test(bi_ctx))
+    {
+        printf("AES tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (RC4_test(bi_ctx))
+    {
+        printf("RC4 tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (MD5_test(bi_ctx))
+    {
+        printf("MD5 tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (SHA1_test(bi_ctx))
+    {
+        printf("SHA1 tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (HMAC_test(bi_ctx))
+    {
+        printf("HMAC tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (BIGINT_test(bi_ctx))
+    {
+        printf("BigInt tests failed!\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    bi_terminate(bi_ctx);
+
+    if (RSA_test())
+    {
+        printf("RSA tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+    if (cert_tests())
+    {
+        printf("CERT tests failed\n");
+        goto cleanup;
+    }
+    TTY_FLUSH();
+
+#if !defined(WIN32) && defined(CONFIG_SSL_CTX_MUTEXING)
+    if (multi_thread_test())
+        goto cleanup;
+#endif
+
+    if (SSL_basic_test())
+        goto cleanup;
+
+    system("sh ../ssl/test/killopenssl.sh");
+
+    if (SSL_client_tests())
+        goto cleanup;
+
+    system("sh ../ssl/test/killopenssl.sh");
+
+    if (SSL_server_tests())
+        goto cleanup;
+
+    system("sh ../ssl/test/killopenssl.sh");
+
+    if (header_issue())
+    {
+        printf("Header tests failed\n"); TTY_FLUSH();
+        goto cleanup;
+    }
+
+    ret = 0;        /* all ok */
+    printf("**** ALL TESTS PASSED ****\n"); TTY_FLUSH();
+cleanup:
+
+    if (ret)
+        printf("Error: Some tests failed!\n");
+
+    close(fd);
+    return ret;
+}
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/test_axssl.sh b/trunk/package/luci/libs/nixio/axTLS/ssl/test/test_axssl.sh
new file mode 100755
index 00000000..acf11a63
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/test_axssl.sh
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2007, Cameron Rich
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the axTLS project nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# Test the various axssl bindings. To run it, got to the _install directory
+# and run this script from there.
+#
+
+if grep "CONFIG_PLATFORM_WIN32=y" "../config/.config"  > /dev/null; then
+    JAVA_EXE="$JAVA_HOME/bin/java.exe"
+    PERL_BIN="/cygdrive/c/Perl/bin/perl"
+    KILL_AXSSL="kill %1"
+    KILL_CSHARP="kill %1"
+    KILL_PERL="kill %1"
+    KILL_JAVA="kill %1"
+    KILL_LUA="kill %1"
+else
+    if grep "CONFIG_PLATFORM_CYGWIN=y" "../config/.config"  > /dev/null; then
+        # no .net or java on cygwin
+        PERL_BIN=/usr/bin/perl
+        KILL_AXSSL="killall axssl"
+        KILL_PERL="killall /usr/bin/perl"
+        KILL_LUA="killall /usr/local/bin/lua"
+    else     # Linux
+        JAVA_EXE=/usr/java/default/bin/java
+        PERL_BIN=/usr/bin/perl
+        KILL_AXSSL="killall axssl"
+        KILL_CSHARP="killall mono"
+        KILL_PERL="killall /usr/bin/perl"
+        RUN_CSHARP="mono"
+        KILL_JAVA="killall $JAVA_EXE"
+        KILL_LUA="killall /usr/local/bin/lua"
+    fi
+fi
+
+BASE=..
+SERVER_ARGS="s_server -accept 15001 -verify -CAfile $BASE/ssl/test/axTLS.ca_x509.cer"
+CLIENT_ARGS="s_client -reconnect -connect localhost:15001 -verify -CAfile $BASE/ssl/test/axTLS.ca_x509.cer -key $BASE/ssl/test/axTLS.key_1024 -cert $BASE/ssl/test/axTLS.x509_1024.cer"
+
+# check pem arguments
+SERVER_PEM_ARGS="s_server -accept 15001 -pass abcd -key $BASE/ssl/test/axTLS.key_aes128.pem -cert $BASE/ssl/test/axTLS.x509_aes128.pem"
+CLIENT_PEM_ARGS="s_client -connect localhost:15001 -CAfile $BASE/ssl/test/axTLS.ca_x509.pem -key $BASE/ssl/test/axTLS.key_1024.pem -cert $BASE/ssl/test/axTLS.x509_1024.pem"
+
+export LD_LIBRARY_PATH=.:`perl -e 'use Config; print $Config{archlib};'`/CORE
+
+if [ -x ./axssl ]; then
+echo "############################# C SAMPLE ###########################"
+./axssl $SERVER_ARGS &
+echo "C Test passed" | ./axssl $CLIENT_ARGS
+$KILL_AXSSL
+sleep 1
+
+./axssl $SERVER_PEM_ARGS &
+echo "C Test passed" | ./axssl $CLIENT_PEM_ARGS
+$KILL_AXSSL
+sleep 1
+echo "### C tests complete"
+fi
+
+if [ -f ./axtls.jar ]; then
+echo "########################## JAVA SAMPLE ###########################"
+"$JAVA_EXE" -jar ./axtls.jar $SERVER_ARGS &
+echo "Java Test passed" | "$JAVA_EXE" -jar ./axtls.jar $CLIENT_ARGS
+$KILL_JAVA
+sleep 1
+
+"$JAVA_EXE" -jar ./axtls.jar $SERVER_PEM_ARGS &
+echo "Java Test passed" | "$JAVA_EXE" -jar ./axtls.jar $CLIENT_PEM_ARGS
+$KILL_JAVA
+sleep 1
+
+echo "### Java tests complete"
+fi
+
+if [ -x ./axssl.csharp.exe ]; then
+echo "############################ C# SAMPLE ###########################"
+$RUN_CSHARP ./axssl.csharp.exe $SERVER_ARGS &
+echo "C# Test passed" | $RUN_CSHARP ./axssl.csharp.exe $CLIENT_ARGS
+$KILL_CSHARP
+sleep 1
+
+$RUN_CSHARP ./axssl.csharp.exe $SERVER_PEM_ARGS &
+echo "C# Test passed" | $RUN_CSHARP ./axssl.csharp.exe $CLIENT_PEM_ARGS
+$KILL_CSHARP
+sleep 1
+
+echo "### C# tests complete"
+fi
+
+if [ -x ./axssl.vbnet.exe ]; then
+echo "######################## VB.NET SAMPLE ###########################"
+echo $SERVER_ARGS
+echo $CLIENT_ARGS
+./axssl.vbnet $SERVER_ARGS &
+echo "VB.NET Test passed" | ./axssl.vbnet.exe $CLIENT_ARGS
+kill %1
+sleep 1
+
+./axssl.vbnet $SERVER_PEM_ARGS &
+echo "VB.NET Test passed" | ./axssl.vbnet.exe $CLIENT_PEM_ARGS
+kill %1
+sleep 1
+echo "### VB.NET tests complete"
+fi
+
+if [ -f ./axssl.pl ]; then
+echo "########################## PERL SAMPLE ###########################"
+"$PERL_BIN" ./axssl.pl $SERVER_ARGS &
+echo "Perl Test passed" | "$PERL_BIN" ./axssl.pl $CLIENT_ARGS
+$KILL_PERL
+sleep 1
+
+"$PERL_BIN" ./axssl.pl $SERVER_PEM_ARGS &
+echo "Perl Test passed" | "$PERL_BIN" ./axssl.pl $CLIENT_PEM_ARGS
+$KILL_PERL
+sleep 1
+echo "### Perl tests complete"
+fi
+
+if [ -f ./axssl.lua ]; then
+echo "########################## LUA SAMPLE ###########################"
+./axssl.lua $SERVER_ARGS &
+echo "Lua Test passed" | ./axssl.lua $CLIENT_ARGS
+$KILL_LUA
+sleep 1
+
+./axssl.lua $SERVER_PEM_ARGS &
+echo "Lua Test passed" | ./axssl.lua $CLIENT_PEM_ARGS
+$KILL_LUA
+sleep 1
+echo "### Lua tests complete"
+fi
+
+echo "########################## ALL TESTS COMPLETE ###########################"
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/thawte.x509_ca b/trunk/package/luci/libs/nixio/axTLS/ssl/test/thawte.x509_ca
new file mode 100644
index 0000000000000000000000000000000000000000..59b1059f84086fa580dc1001303c4db4e070e572
GIT binary patch
literal 811
zcmXqLVpcb3Vw$jknTe5!iILHOmyJ`a&7<u*FC!xhD}zDfIYVv(PB!LH7B*p~C`Ut4
z17Q${LzpK#wYVg;C{MvTu^`n@$Up!j%r49c;wpsXm**ME8c2i0xP(PQG7`&6QWc!@
z^NLGzN;31(6_S$;H4M~1(%i!G&Z$KunQ58Hi6xo&c?!X)MP-@Esl^H|nPr*9KoLVl
z19^~2W?>1aK><anxtXQ8V5O-=3eJvT!(i^_WE7JufT++d1{#)H<WK^3fL?Nbu7R95
zuceuRg@K^~7(|Kl8W|WG83U22rKx4q@bhrveB?M~WMyD(>;=YaCsSi1!zDAbtnTZF
zqUYUebWG~Ec<0FydhNn{8R@BF?(Zc$Os#^xXlJqYTkF3Hd%V7_cb@q7d0SFTnS9@$
z=3Jy0cw_d3^b5OqC$WhXUzvP*x)#Hn7(bppzeI!nd~(UVCFqsMF<)Qz@y}IOZN=N%
zf+J3JvhHmb+)-@5ioN%XlkanfxiaQV%!~|-i-ipY4fugEEGx{&_@9N<fEh?3yBU}c
znSqW~^Ux7H6!GhYSP9RnRq-MApRS**NQjHeGf!43H>=wue#B(wSB};{CmAjN`|kTB
z=H&c*ca+=jgU1BrKYDG@a65VUh*RyJU#lbYu5J(P5PZC(RWiHDX9<tc+Lue#*?&Cj
nnL4ZI=m|U3?Nes%o@7+W{-G`IZGieR-et-^cb{IyF5(0LRxS$7

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_ca b/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_ca
new file mode 100644
index 0000000000000000000000000000000000000000..d2ea1289d6f43b837eb685446af97d942a8d98e6
GIT binary patch
literal 668
zcmXqLVwz#l#Kg!Xps-^4y4y`m_YRsZ@Kf8{UTnb2#;Mij(e|B}k&%g&!Jx6nklTQh
zjX9KsO_(V(*ihU+6vW{Y<_k+L$_&m-&(l%x%uCiYG%(NuNpK6RyX6-tgrpXiC<K%i
z733GE7AyGY<y7h^DEQ?oBo-H!7A58-rxxoO8W|XXbTA8R!i-V~DauUDQ3y^=E-gw0
zQblE{P@{tK^Gg(*9S!8fc@0brj0`Ldz#vMT*9gS5Fful^G_{NxY|d?*j~t$itPISJ
zy}&T-WNK_=n6LQ#sP&|<nex+F<}a8eu(B;OAjhBaM8*Mzu!XBQJ%2l2*m~(8pF%<L
ze5Fs73XhG>`CKd5-@#z5p&(TMr~SNx>{S1)iXw~p883_fotvm7>@WOHLUXNt;H*b_
z|IQe^xO{Hv`^QNljGg@tW>o80?|dhoUHjsH8z1xKWBTV_tO(!D#LURRi0nLIbTb3p
zWwp-Y-R7SHR;@y@?^|{x`0o6ab&@xk`Ta5fEloQwoG`H15dW%Sy}DTBd%Xlc@q%Y{
zucp0BS^d~*a<WyyjF~y}`}t=7nbx)GkJQtNbvM@D_`K2g<0bZ^Y3`429?vv;=phz3
lXGM?UMztI5<<-fYw^|!5);_qj<Mwqi%VXK?eIF|x0RUHq@TmX*

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem
new file mode 100644
index 00000000..d5ef5d24
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICmDCCAgECECCol67bggLewTagTia9h3MwDQYJKoZIhvcNAQECBQAwgYwxCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEwMC4GA1UECxMnRm9y
+IFRlc3QgUHVycG9zZXMgT25seS4gIE5vIGFzc3VyYW5jZXMuMTIwMAYDVQQDEylW
+ZXJpU2lnbiBUcmlhbCBTZWN1cmUgU2VydmVyIFRlc3QgUm9vdCBDQTAeFw0wNTAy
+MDkwMDAwMDBaFw0yNTAyMDgyMzU5NTlaMIGMMQswCQYDVQQGEwJVUzEXMBUGA1UE
+ChMOVmVyaVNpZ24sIEluYy4xMDAuBgNVBAsTJ0ZvciBUZXN0IFB1cnBvc2VzIE9u
+bHkuICBObyBhc3N1cmFuY2VzLjEyMDAGA1UEAxMpVmVyaVNpZ24gVHJpYWwgU2Vj
+dXJlIFNlcnZlciBUZXN0IFJvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAJ8h98U7klaZH5cEn6CSEKmGWVBsTwHIaMAAVqGqCUn7Q9C10sEOIHBznyLy
+eSDjMs5M1nC/iAA7KCASf/yHz0AdlU+1IRSijwHTF/2dYSoTTxP2GCmtL1Ga4i7+
+zDDo086V7+NiFAGJj+CYey47ue4Xa33o/4YOA9PGL87oqFe7AgMBAAEwDQYJKoZI
+hvcNAQECBQADgYEAOq447rP5EDqFEl3vhLhgTbnyaskNYwPvxk+0grnQyDA4sF/q
+gK8nFlnvLmAOF3DmfuqW6WSr4zqTYzpwmJlsn48Om/yWirL8GuWRftit2POxTfHS
+B8VmR+PZx2k24UgWUZyojDGxJtiHd3tjCdqFgTit4NK429cWOcZrh47xeOI=
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert b/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert
new file mode 100644
index 0000000000000000000000000000000000000000..426c9ff7f1c0af7c2376af6a0868cc1429f06347
GIT binary patch
literal 1095
zcmXqLVsSQTVqUX=nTe5!Nx=PkIJd$6<5O-ul|KDSsAZ7>FB_*;n@8JsUPeY%RtAH{
z9z$*ePB!LH7B*p~&|pJx15pr%OPDV#wJ0+<Gd)j7!80#e&(Od?4<x}YtnQXyq!5x?
zT%r(AT2zo<oLa2lpO;gqr=Z}MuaH<=Tw0Wvmz-LxXJ}+#0MfxMtO+wpA*3iXF-IXd
zHMz7X6-X78r9zDg%Fi!RaCS716X!KBGcYtXGXR4q2-n!a$k^1<)H2GTaVL^<9YYOy
z47fmca0oL8=A;-38t{X7>>?aaMVZA(iFv7pk_O@+AubVt#ESf!{1BgDg@B^`tkmQZ
zLs0`^kQBEFkD-B)i9%9li9&X2rJ<F91w_~|B(*5FSRp@6p|m(vA+bcEyu4fw=;F*`
zV5sON=jZAt7ZmH407D`<Q9&bF)4<eF+CUPdmsvyzq!w&rNlr0PtzKS{LF0Vnz-MG-
zU~cRMMnET1V<W@1JCC30y{dWUu};3Q`PhSA<E~sKX&vdF`2q$tDKSA?_-?rH$=+LH
zWO}h}nSDWShjil}##eL0E00fE_ByBRVs@l!!@t=VM3{t+d^(o=Z%c#L{7Jw5lsx<4
zsKj{J|CsrT$;)?(FBO*;O5Lj1KI4T$eZkHNzxIprO-OyX<AnXYGe4P_85tNCH!+qP
zG%*%}(}S!q3zGqZ0XNV;vivM8%uK8c4BSB+c@_r)I|G{qRtqfJ%rZ(!3as??gTsO#
zk*b?ql!F>ZKq+vngJKw%B24vwDh#|p1}Oj&s-uBD8&^V`2V>h0S4MVG149FSHV$nz
zVA5n~ViZ#b8D9)EA5X{|$b!sLWf3zFf$3ysgtM3oOkiwAMivbNH3JnG-+-}A0_yzy
z<l+JpR~zKQR59|fBpSpoj9n0I5NQx@5Gux*nVXoNs-K>jW}s*wZ@|vRs?EpDB*h}q
z|Map{+nV0K?8E09vaWbY=u}JU8K^@10Q5pmetJHN9r|U(U@?$MsF{)(m>{%MIgMNe
zF3gcp;g*^HXwj|JH%sakW^XY%?K}Ip+slNyvt8M1?Uz`5cz$g&-`l2-@0b62`(fXd
z*3a*ARU9g<^p4fEd<fXn`n;x_tFOZPj(O`D$;k#WznmrR{_tfDP+B={)!l=hYVMuv
dFWzaEBw8?qo-|YCxP90BWP6ZnFyD^d69G?mT9W_(

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem b/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
new file mode 100644
index 00000000..5b6c1ffe
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEQzCCA6ygAwIBAgIQR/dXCzC/x5Ta5RvL6hKEojANBgkqhkiG9w0BAQUFADCB
+jDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTAwLgYDVQQL
+EydGb3IgVGVzdCBQdXJwb3NlcyBPbmx5LiAgTm8gYXNzdXJhbmNlcy4xMjAwBgNV
+BAMTKVZlcmlTaWduIFRyaWFsIFNlY3VyZSBTZXJ2ZXIgVGVzdCBSb290IENBMB4X
+DTA2MDExNjAwMDAwMFoXDTA2MDEzMDIzNTk1OVowgbkxCzAJBgNVBAYTAkFVMQww
+CgYDVQQIEwNRbGQxETAPBgNVBAcUCEJyaXNiYW5lMRkwFwYDVQQKFBBheG9sb1RM
+UyBQcm9qZWN0MRUwEwYDVQQLFAwxMDI0IGJpdCBrZXkxOjA4BgNVBAsUMVRlcm1z
+IG9mIHVzZSBhdCB3d3cudmVyaXNpZ24uY29tL2Nwcy90ZXN0Y2EgKGMpMDUxGzAZ
+BgNVBAMUEnd3dy5heG9sb3Rscy5jby5ucjCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEAttzj5S7qfOZIrh9xg8bgjTOKbSIbLBuMnxAwfGRcUrQO2EQOHd6kMjXR
+hqY/cG2IG4G8AeqdV3nHlKbrbHbRa1lFgP6b0BQCE8TyxmP+tIAqn5L6/HTm+EEi
+Ad1Pxjeok6e7F6UXHxJltSGHmOhAf3C5kPq/FQ6QZeG4yD/uzPkCAwEAAaOCAXUw
+ggFxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEcGA1UdHwRAMD4wPKA6oDiGNmh0
+dHA6Ly9TVlJTZWN1cmUtY3JsLnZlcmlzaWduLmNvbS9TVlJUcmlhbFJvb3QyMDA1
+LmNybDBKBgNVHSAEQzBBMD8GCmCGSAGG+EUBBxUwMTAvBggrBgEFBQcCARYjaHR0
+cHM6Ly93d3cudmVyaXNpZ24uY29tL2Nwcy90ZXN0Y2EwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
+cDovL29jc3AudmVyaXNpZ24uY29tMG0GCCsGAQUFBwEMBGEwX6FdoFswWTBXMFUW
+CWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgsexkuMCUW
+I2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMA0GCSqGSIb3DQEB
+BQUAA4GBACtlCTJFENCcHCQLHJfiotqr2XR+oWu0MstNm8dG6WB+zYprrT+kOPDn
+1rMO7YLx76f67fC+lIXz720kQHk6LsZ8hPBQvIXnfIsKjng73DeFzBmTMFz6Qxjd
++E0FUCKplqrdwUkmR4kH6O4pdGE4AlXJNiUI2903yYdSRVMOuLuR
+-----END CERTIFICATE-----
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/tls1.c b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1.c
new file mode 100755
index 00000000..658c2c15
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1.c
@@ -0,0 +1,2057 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Common ssl/tlsv1 code to both the client and server implementations.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include "ssl.h"
+
+/* The session expiry time */
+#define SSL_EXPIRY_TIME     (CONFIG_SSL_EXPIRY_TIME*3600)
+
+static const uint8_t g_hello_request[] = { HS_HELLO_REQUEST, 0, 0, 0 };
+static const uint8_t g_chg_cipher_spec_pkt[] = { 1 };
+static const char * server_finished = "server finished";
+static const char * client_finished = "client finished";
+
+static int do_handshake(SSL *ssl, uint8_t *buf, int read_len);
+static void set_key_block(SSL *ssl, int is_write);
+static int verify_digest(SSL *ssl, int mode, const uint8_t *buf, int read_len);
+static void *crypt_new(SSL *ssl, uint8_t *key, uint8_t *iv, int is_decrypt);
+static int send_raw_packet(SSL *ssl, uint8_t protocol);
+
+/**
+ * The server will pick the cipher based on the order that the order that the
+ * ciphers are listed. This order is defined at compile time.
+ */
+#ifdef CONFIG_SSL_SKELETON_MODE
+const uint8_t ssl_prot_prefs[NUM_PROTOCOLS] = 
+{ SSL_RC4_128_SHA };
+#else
+static void session_free(SSL_SESSION *ssl_sessions[], int sess_index);
+
+const uint8_t ssl_prot_prefs[NUM_PROTOCOLS] = 
+#ifdef CONFIG_SSL_PROT_LOW                  /* low security, fast speed */
+{ SSL_RC4_128_SHA, SSL_AES128_SHA, SSL_AES256_SHA, SSL_RC4_128_MD5 };
+#elif CONFIG_SSL_PROT_MEDIUM                /* medium security, medium speed */
+{ SSL_AES128_SHA, SSL_AES256_SHA, SSL_RC4_128_SHA, SSL_RC4_128_MD5 };    
+#else /* CONFIG_SSL_PROT_HIGH */            /* high security, low speed */
+{ SSL_AES256_SHA, SSL_AES128_SHA, SSL_RC4_128_SHA, SSL_RC4_128_MD5 };
+#endif
+#endif /* CONFIG_SSL_SKELETON_MODE */
+
+/**
+ * The cipher map containing all the essentials for each cipher.
+ */
+#ifdef CONFIG_SSL_SKELETON_MODE
+static const cipher_info_t cipher_info[NUM_PROTOCOLS] = 
+{
+    {   /* RC4-SHA */
+        SSL_RC4_128_SHA,                /* RC4-SHA */
+        16,                             /* key size */
+        0,                              /* iv size */ 
+        2*(SHA1_SIZE+16),               /* key block size */
+        0,                              /* no padding */
+        SHA1_SIZE,                      /* digest size */
+        hmac_sha1,                      /* hmac algorithm */
+        (crypt_func)RC4_crypt,          /* encrypt */
+        (crypt_func)RC4_crypt           /* decrypt */
+    },
+};
+#else
+static const cipher_info_t cipher_info[NUM_PROTOCOLS] = 
+{
+    {   /* AES128-SHA */
+        SSL_AES128_SHA,                 /* AES128-SHA */
+        16,                             /* key size */
+        16,                             /* iv size */ 
+        2*(SHA1_SIZE+16+16),            /* key block size */
+        16,                             /* block padding size */
+        SHA1_SIZE,                      /* digest size */
+        hmac_sha1,                      /* hmac algorithm */
+        (crypt_func)AES_cbc_encrypt,    /* encrypt */
+        (crypt_func)AES_cbc_decrypt     /* decrypt */
+    },
+    {   /* AES256-SHA */
+        SSL_AES256_SHA,                 /* AES256-SHA */
+        32,                             /* key size */
+        16,                             /* iv size */ 
+        2*(SHA1_SIZE+32+16),            /* key block size */
+        16,                             /* block padding size */
+        SHA1_SIZE,                      /* digest size */
+        hmac_sha1,                      /* hmac algorithm */
+        (crypt_func)AES_cbc_encrypt,    /* encrypt */
+        (crypt_func)AES_cbc_decrypt     /* decrypt */
+    },       
+    {   /* RC4-SHA */
+        SSL_RC4_128_SHA,                /* RC4-SHA */
+        16,                             /* key size */
+        0,                              /* iv size */ 
+        2*(SHA1_SIZE+16),               /* key block size */
+        0,                              /* no padding */
+        SHA1_SIZE,                      /* digest size */
+        hmac_sha1,                      /* hmac algorithm */
+        (crypt_func)RC4_crypt,          /* encrypt */
+        (crypt_func)RC4_crypt           /* decrypt */
+    },
+    /*
+     * This protocol is from SSLv2 days and is unlikely to be used - but was
+     * useful for testing different possible digest algorithms.
+     */
+    {   /* RC4-MD5 */
+        SSL_RC4_128_MD5,                /* RC4-MD5 */
+        16,                             /* key size */
+        0,                              /* iv size */ 
+        2*(MD5_SIZE+16),                /* key block size */
+        0,                              /* no padding */
+        MD5_SIZE,                       /* digest size */
+        hmac_md5,                       /* hmac algorithm */
+        (crypt_func)RC4_crypt,          /* encrypt */
+        (crypt_func)RC4_crypt           /* decrypt */
+    },
+};
+#endif
+
+static void prf(const uint8_t *sec, int sec_len, uint8_t *seed, int seed_len,
+        uint8_t *out, int olen);
+static const cipher_info_t *get_cipher_info(uint8_t cipher);
+static void increment_read_sequence(SSL *ssl);
+static void increment_write_sequence(SSL *ssl);
+static void add_hmac_digest(SSL *ssl, int snd, uint8_t *hmac_header,
+        const uint8_t *buf, int buf_len, uint8_t *hmac_buf);
+
+/* win32 VC6.0 doesn't have variadic macros */
+#if defined(WIN32) && !defined(CONFIG_SSL_FULL_MODE)
+void DISPLAY_BYTES(SSL *ssl, const char *format, 
+        const uint8_t *data, int size, ...) {}
+#endif
+
+/**
+ * Establish a new client/server context.
+ */
+EXP_FUNC SSL_CTX *STDCALL ssl_ctx_new(uint32_t options, int num_sessions)
+{
+    SSL_CTX *ssl_ctx = (SSL_CTX *)calloc(1, sizeof (SSL_CTX));
+    ssl_ctx->options = options;
+
+    if (load_key_certs(ssl_ctx) < 0)
+    {
+        free(ssl_ctx);  /* can't load our key/certificate pair, so die */
+        return NULL;
+    }
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    ssl_ctx->num_sessions = num_sessions;
+#endif
+
+    SSL_CTX_MUTEX_INIT(ssl_ctx->mutex);
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    if (num_sessions)
+    {
+        ssl_ctx->ssl_sessions = (SSL_SESSION **)
+                        calloc(1, num_sessions*sizeof(SSL_SESSION *));
+    }
+#endif
+
+    return ssl_ctx;
+}
+
+/*
+ * Remove a client/server context.
+ */
+EXP_FUNC void STDCALL ssl_ctx_free(SSL_CTX *ssl_ctx)
+{
+    SSL *ssl;
+    int i;
+
+    if (ssl_ctx == NULL)
+        return;
+
+    ssl = ssl_ctx->head;
+
+    /* clear out all the ssl entries */
+    while (ssl)
+    {
+        SSL *next = ssl->next;
+        ssl_free(ssl);
+        ssl = next;
+    }
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    /* clear out all the sessions */
+    for (i = 0; i < ssl_ctx->num_sessions; i++)
+        session_free(ssl_ctx->ssl_sessions, i);
+
+    free(ssl_ctx->ssl_sessions);
+#endif
+
+    i = 0;
+    while (i < CONFIG_SSL_MAX_CERTS && ssl_ctx->certs[i].buf)
+    {
+        free(ssl_ctx->certs[i].buf);
+        ssl_ctx->certs[i++].buf = NULL;
+    }
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    remove_ca_certs(ssl_ctx->ca_cert_ctx);
+#endif
+    ssl_ctx->chain_length = 0;
+    SSL_CTX_MUTEX_DESTROY(ssl_ctx->mutex);
+    RSA_free(ssl_ctx->rsa_ctx);
+    RNG_terminate();
+    free(ssl_ctx);
+}
+
+/*
+ * Free any used resources used by this connection.
+ */
+EXP_FUNC void STDCALL ssl_free(SSL *ssl)
+{
+    SSL_CTX *ssl_ctx;
+
+    if (ssl == NULL)        /* just ignore null pointers */
+        return;
+
+    /* spec says we must notify when we are dying */
+    send_alert(ssl, SSL_ALERT_CLOSE_NOTIFY);
+
+    ssl_ctx = ssl->ssl_ctx;
+
+    SSL_CTX_LOCK(ssl_ctx->mutex);
+
+    /* adjust the server SSL list */
+    if (ssl->prev)
+        ssl->prev->next = ssl->next;
+    else
+        ssl_ctx->head = ssl->next;
+
+    if (ssl->next)
+        ssl->next->prev = ssl->prev;
+    else
+        ssl_ctx->tail = ssl->prev;
+
+    SSL_CTX_UNLOCK(ssl_ctx->mutex);
+
+    /* may already be free - but be sure */
+    free(ssl->encrypt_ctx);
+    free(ssl->decrypt_ctx);
+    disposable_free(ssl);
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    x509_free(ssl->x509_ctx);
+#endif
+
+    free(ssl);
+}
+
+/*
+ * Read the SSL connection and send any alerts for various errors.
+ */
+EXP_FUNC int STDCALL ssl_read(SSL *ssl, uint8_t **in_data)
+{
+    int ret = basic_read(ssl, in_data);
+
+    /* check for return code so we can send an alert */
+    if (ret < SSL_OK)
+    {
+        if (ret != SSL_ERROR_CONN_LOST)
+        {
+            send_alert(ssl, ret);
+#ifndef CONFIG_SSL_SKELETON_MODE
+            /* something nasty happened, so get rid of this session */
+            kill_ssl_session(ssl->ssl_ctx->ssl_sessions, ssl);
+#endif
+        }
+    }
+
+    return ret;
+}
+
+/*
+ * Write application data to the client
+ */
+EXP_FUNC int STDCALL ssl_write(SSL *ssl, const uint8_t *out_data, int out_len)
+{
+    int n = out_len, nw, i, tot = 0;
+
+    /* maximum size of a TLS packet is around 16kB, so fragment */
+    do 
+    {
+        nw = n;
+
+        if (nw > RT_MAX_PLAIN_LENGTH)    /* fragment if necessary */
+            nw = RT_MAX_PLAIN_LENGTH;
+
+        if ((i = send_packet(ssl, PT_APP_PROTOCOL_DATA, 
+                                            &out_data[tot], nw)) <= 0)
+        {
+            out_len = i;    /* an error */
+            break;
+        }
+
+        tot += i;
+        n -= i;
+    } while (n > 0);
+
+    return out_len;
+}
+
+/**
+ * Add a certificate to the certificate chain.
+ */
+int add_cert(SSL_CTX *ssl_ctx, const uint8_t *buf, int len)
+{
+    int ret = SSL_ERROR_NO_CERT_DEFINED, i = 0;
+    SSL_CERT *ssl_cert;
+    X509_CTX *cert = NULL;
+    int offset;
+
+    while (ssl_ctx->certs[i].buf && i < CONFIG_SSL_MAX_CERTS) 
+        i++;
+
+    if (i == CONFIG_SSL_MAX_CERTS) /* too many certs */
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: maximum number of certs added - change of "
+                "compile-time configuration required\n");
+#endif
+        goto error;
+    }
+
+    if ((ret = x509_new(buf, &offset, &cert)))
+        goto error;
+
+#if defined (CONFIG_SSL_FULL_MODE)
+    if (ssl_ctx->options & SSL_DISPLAY_CERTS)
+        x509_print(cert, NULL);
+#endif
+
+    ssl_cert = &ssl_ctx->certs[i];
+    ssl_cert->size = len;
+    ssl_cert->buf = (uint8_t *)malloc(len);
+    memcpy(ssl_cert->buf, buf, len);
+    ssl_ctx->chain_length++;
+    len -= offset;
+    ret = SSL_OK;           /* ok so far */
+
+    /* recurse? */
+    if (len > 0)
+    {
+        ret = add_cert(ssl_ctx, &buf[offset], len);
+    }
+
+error:
+    x509_free(cert);        /* don't need anymore */
+    return ret;
+}
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+/**
+ * Add a certificate authority.
+ */
+int add_cert_auth(SSL_CTX *ssl_ctx, const uint8_t *buf, int len)
+{
+    int ret = SSL_ERROR_NO_CERT_DEFINED;
+    int i = 0;
+    int offset;
+    CA_CERT_CTX *ca_cert_ctx;
+
+    if (ssl_ctx->ca_cert_ctx == NULL)
+        ssl_ctx->ca_cert_ctx = (CA_CERT_CTX *)calloc(1, sizeof(CA_CERT_CTX));
+
+    ca_cert_ctx = ssl_ctx->ca_cert_ctx;
+
+    while (i < CONFIG_X509_MAX_CA_CERTS && ca_cert_ctx->cert[i]) 
+        i++;
+
+    if (i > CONFIG_X509_MAX_CA_CERTS)
+    {
+#ifdef CONFIG_SSL_FULL_MODE
+        printf("Error: maximum number of CA certs added - change of "
+                "compile-time configuration required\n");
+#endif
+        goto error;
+    }
+
+    if ((ret = x509_new(buf, &offset, &ca_cert_ctx->cert[i])))
+        goto error;
+
+    len -= offset;
+    ret = SSL_OK;           /* ok so far */
+
+    /* recurse? */
+    if (len > 0)
+        ret = add_cert_auth(ssl_ctx, &buf[offset], len);
+
+error:
+    return ret;
+}
+
+/*
+ * Retrieve an X.509 distinguished name component
+ */
+EXP_FUNC const char * STDCALL ssl_get_cert_dn(const SSL *ssl, int component)
+{
+    if (ssl->x509_ctx == NULL)
+        return NULL;
+
+    switch (component)
+    {
+        case SSL_X509_CERT_COMMON_NAME:
+            return ssl->x509_ctx->cert_dn[X509_COMMON_NAME];
+
+        case SSL_X509_CERT_ORGANIZATION:
+            return ssl->x509_ctx->cert_dn[X509_ORGANIZATION];
+
+        case SSL_X509_CERT_ORGANIZATIONAL_NAME:       
+            return ssl->x509_ctx->cert_dn[X509_ORGANIZATIONAL_UNIT];
+
+        case SSL_X509_CA_CERT_COMMON_NAME:
+            return ssl->x509_ctx->ca_cert_dn[X509_COMMON_NAME];
+
+        case SSL_X509_CA_CERT_ORGANIZATION:
+            return ssl->x509_ctx->ca_cert_dn[X509_ORGANIZATION];
+
+        case SSL_X509_CA_CERT_ORGANIZATIONAL_NAME:       
+            return ssl->x509_ctx->ca_cert_dn[X509_ORGANIZATIONAL_UNIT];
+
+        default:
+            return NULL;
+    }
+}
+
+#endif
+
+/*
+ * Find an ssl object based on the client's file descriptor.
+ */
+EXP_FUNC SSL * STDCALL ssl_find(SSL_CTX *ssl_ctx, int client_fd)
+{
+    SSL *ssl;
+
+    SSL_CTX_LOCK(ssl_ctx->mutex);
+    ssl = ssl_ctx->head;
+
+    /* search through all the ssl entries */
+    while (ssl)
+    {
+        if (ssl->client_fd == client_fd)
+        {
+            SSL_CTX_UNLOCK(ssl_ctx->mutex);
+            return ssl;
+        }
+
+        ssl = ssl->next;
+    }
+
+    SSL_CTX_UNLOCK(ssl_ctx->mutex);
+    return NULL;
+}
+
+/*
+ * Force the client to perform its handshake again.
+ */
+EXP_FUNC int STDCALL ssl_renegotiate(SSL *ssl)
+{
+    int ret = SSL_OK;
+
+    disposable_new(ssl);
+#ifdef CONFIG_SSL_ENABLE_CLIENT
+    if (IS_SET_SSL_FLAG(SSL_IS_CLIENT))
+    {
+        ret = do_client_connect(ssl);
+    }
+    else
+#endif
+    {
+        send_packet(ssl, PT_HANDSHAKE_PROTOCOL, 
+                g_hello_request, sizeof(g_hello_request));
+        SET_SSL_FLAG(SSL_NEED_RECORD);
+    }
+
+    return ret;
+}
+
+/**
+ * @brief Get what we need for key info.
+ * @param cipher    [in]    The cipher information we are after
+ * @param key_size  [out]   The key size for the cipher
+ * @param iv_size   [out]   The iv size for the cipher
+ * @return  The amount of key information we need.
+ */
+static const cipher_info_t *get_cipher_info(uint8_t cipher)
+{
+    int i;
+
+    for (i = 0; i < NUM_PROTOCOLS; i++)
+    {
+        if (cipher_info[i].cipher == cipher)
+        {
+            return &cipher_info[i];
+        }
+    }
+
+    return NULL;  /* error */
+}
+
+/*
+ * Get a new ssl context for a new connection.
+ */
+SSL *ssl_new(SSL_CTX *ssl_ctx, int client_fd)
+{
+    SSL *ssl = (SSL *)calloc(1, sizeof(SSL));
+    ssl->ssl_ctx = ssl_ctx;
+    ssl->need_bytes = SSL_RECORD_SIZE;      /* need a record */
+    ssl->client_fd = client_fd;
+    ssl->flag = SSL_NEED_RECORD;
+    ssl->bm_data = ssl->bm_all_data+BM_RECORD_OFFSET; /* space at the start */
+    ssl->hs_status = SSL_NOT_OK;            /* not connected */
+#ifdef CONFIG_ENABLE_VERIFICATION
+    ssl->ca_cert_ctx = ssl_ctx->ca_cert_ctx;
+#endif
+    disposable_new(ssl);
+
+    /* a bit hacky but saves a few bytes of memory */
+    ssl->flag |= ssl_ctx->options;
+    SSL_CTX_LOCK(ssl_ctx->mutex);
+
+    if (ssl_ctx->head == NULL)
+    {
+        ssl_ctx->head = ssl;
+        ssl_ctx->tail = ssl;
+    }
+    else
+    {
+        ssl->prev = ssl_ctx->tail;
+        ssl_ctx->tail->next = ssl;
+        ssl_ctx->tail = ssl;
+    }
+
+    SSL_CTX_UNLOCK(ssl_ctx->mutex);
+    return ssl;
+}
+
+/*
+ * Add a private key to a context.
+ */
+int add_private_key(SSL_CTX *ssl_ctx, SSLObjLoader *ssl_obj)
+{
+    int ret = SSL_OK;
+
+    /* get the private key details */
+    if (asn1_get_private_key(ssl_obj->buf, ssl_obj->len, &ssl_ctx->rsa_ctx))
+    {
+        ret = SSL_ERROR_INVALID_KEY;
+        goto error;
+    }
+
+error:
+    return ret;
+}
+
+/** 
+ * Increment the read sequence number (as a 64 bit endian indepenent #)
+ */     
+static void increment_read_sequence(SSL *ssl)
+{
+    int i;
+
+    for (i = 7; i >= 0; i--) 
+    {       
+        if (++ssl->read_sequence[i])
+            break;
+    }
+}
+            
+/**
+ * Increment the read sequence number (as a 64 bit endian indepenent #)
+ */      
+static void increment_write_sequence(SSL *ssl)
+{        
+    int i;                  
+         
+    for (i = 7; i >= 0; i--)
+    {                       
+        if (++ssl->write_sequence[i])
+            break;
+    }                       
+}
+
+/**
+ * Work out the HMAC digest in a packet.
+ */
+static void add_hmac_digest(SSL *ssl, int mode, uint8_t *hmac_header,
+        const uint8_t *buf, int buf_len, uint8_t *hmac_buf)
+{
+    int hmac_len = buf_len + 8 + SSL_RECORD_SIZE;
+    uint8_t *t_buf = (uint8_t *)alloca(hmac_len+10);
+
+    memcpy(t_buf, (mode == SSL_SERVER_WRITE || mode == SSL_CLIENT_WRITE) ? 
+                    ssl->write_sequence : ssl->read_sequence, 8);
+    memcpy(&t_buf[8], hmac_header, SSL_RECORD_SIZE);
+    memcpy(&t_buf[8+SSL_RECORD_SIZE], buf, buf_len);
+
+    ssl->cipher_info->hmac(t_buf, hmac_len, 
+            (mode == SSL_SERVER_WRITE || mode == SSL_CLIENT_READ) ? 
+                ssl->server_mac : ssl->client_mac, 
+            ssl->cipher_info->digest_size, hmac_buf);
+
+#if 0
+    print_blob("record", ssl->hmac_tx, SSL_RECORD_SIZE);
+    print_blob("buf", buf, buf_len);
+    if (mode == SSL_SERVER_WRITE || mode == SSL_CLIENT_WRITE)
+    {
+        print_blob("write seq", ssl->write_sequence, 8);
+    }
+    else
+    {
+        print_blob("read seq", ssl->read_sequence, 8);
+    }
+
+    if (mode == SSL_SERVER_WRITE || mode == SSL_CLIENT_READ)
+    {
+        print_blob("server mac", 
+                ssl->server_mac, ssl->cipher_info->digest_size);
+    }
+    else
+    {
+        print_blob("client mac", 
+                ssl->client_mac, ssl->cipher_info->digest_size);
+    }
+    print_blob("hmac", hmac_buf, SHA1_SIZE);
+#endif
+}
+
+/**
+ * Verify that the digest of a packet is correct.
+ */
+static int verify_digest(SSL *ssl, int mode, const uint8_t *buf, int read_len)
+{   
+    uint8_t hmac_buf[SHA1_SIZE];
+    int hmac_offset;
+   
+    if (ssl->cipher_info->padding_size)
+    {
+        hmac_offset = read_len-buf[read_len-1]-ssl->cipher_info->digest_size-1;
+    }
+    else
+    {
+        hmac_offset = read_len - ssl->cipher_info->digest_size;
+    }
+
+    /* sanity check the offset */
+    if (hmac_offset < 0)
+    {
+        return SSL_ERROR_INVALID_HMAC;
+    }
+
+    ssl->hmac_header[3] = hmac_offset >> 8;      /* insert size */
+    ssl->hmac_header[4] = hmac_offset & 0xff;
+    add_hmac_digest(ssl, mode, ssl->hmac_header, buf, hmac_offset, hmac_buf);
+
+    if (memcmp(hmac_buf, &buf[hmac_offset], ssl->cipher_info->digest_size))
+    {
+        return SSL_ERROR_INVALID_HMAC;
+    }
+
+    return hmac_offset;
+}
+
+/**
+ * Add a packet to the end of our sent and received packets, so that we may use
+ * it to calculate the hash at the end.
+ */
+void add_packet(SSL *ssl, const uint8_t *pkt, int len)
+{
+    MD5_Update(&ssl->dc->md5_ctx, pkt, len);
+    SHA1_Update(&ssl->dc->sha1_ctx, pkt, len);
+}
+
+/**
+ * Work out the MD5 PRF.
+ */
+static void p_hash_md5(const uint8_t *sec, int sec_len, 
+        uint8_t *seed, int seed_len, uint8_t *out, int olen)
+{
+    uint8_t a1[128];
+
+    /* A(1) */
+    hmac_md5(seed, seed_len, sec, sec_len, a1);
+    memcpy(&a1[MD5_SIZE], seed, seed_len);
+    hmac_md5(a1, MD5_SIZE+seed_len, sec, sec_len, out);
+
+    while (olen > MD5_SIZE)
+    {
+        uint8_t a2[MD5_SIZE];
+        out += MD5_SIZE;
+        olen -= MD5_SIZE;
+
+        /* A(N) */
+        hmac_md5(a1, MD5_SIZE, sec, sec_len, a2);
+        memcpy(a1, a2, MD5_SIZE);
+
+        /* work out the actual hash */
+        hmac_md5(a1, MD5_SIZE+seed_len, sec, sec_len, out);
+    }
+}
+
+/**
+ * Work out the SHA1 PRF.
+ */
+static void p_hash_sha1(const uint8_t *sec, int sec_len, 
+        uint8_t *seed, int seed_len, uint8_t *out, int olen)
+{
+    uint8_t a1[128];
+
+    /* A(1) */
+    hmac_sha1(seed, seed_len, sec, sec_len, a1);
+    memcpy(&a1[SHA1_SIZE], seed, seed_len);
+    hmac_sha1(a1, SHA1_SIZE+seed_len, sec, sec_len, out);
+
+    while (olen > SHA1_SIZE)
+    {
+        uint8_t a2[SHA1_SIZE];
+        out += SHA1_SIZE;
+        olen -= SHA1_SIZE;
+
+        /* A(N) */
+        hmac_sha1(a1, SHA1_SIZE, sec, sec_len, a2);
+        memcpy(a1, a2, SHA1_SIZE);
+
+        /* work out the actual hash */
+        hmac_sha1(a1, SHA1_SIZE+seed_len, sec, sec_len, out);
+    }
+}
+
+/**
+ * Work out the PRF.
+ */
+static void prf(const uint8_t *sec, int sec_len, uint8_t *seed, int seed_len,
+        uint8_t *out, int olen)
+{
+    int len, i;
+    const uint8_t *S1, *S2;
+    uint8_t xbuf[256]; /* needs to be > the amount of key data */
+    uint8_t ybuf[256]; /* needs to be > the amount of key data */
+
+    len = sec_len/2;
+    S1 = sec;
+    S2 = &sec[len];
+    len += (sec_len & 1); /* add for odd, make longer */
+
+    p_hash_md5(S1, len, seed, seed_len, xbuf, olen);
+    p_hash_sha1(S2, len, seed, seed_len, ybuf, olen);
+
+    for (i = 0; i < olen; i++)
+        out[i] = xbuf[i] ^ ybuf[i];
+}
+
+/**
+ * Generate a master secret based on the client/server random data and the
+ * premaster secret.
+ */
+void generate_master_secret(SSL *ssl, const uint8_t *premaster_secret)
+{
+    uint8_t buf[128];   /* needs to be > 13+32+32 in size */
+    strcpy((char *)buf, "master secret");
+    memcpy(&buf[13], ssl->dc->client_random, SSL_RANDOM_SIZE);
+    memcpy(&buf[45], ssl->dc->server_random, SSL_RANDOM_SIZE);
+    prf(premaster_secret, SSL_SECRET_SIZE, buf, 77, ssl->dc->master_secret,
+            SSL_SECRET_SIZE);
+}
+
+/**
+ * Generate a 'random' blob of data used for the generation of keys.
+ */
+static void generate_key_block(uint8_t *client_random, uint8_t *server_random,
+        uint8_t *master_secret, uint8_t *key_block, int key_block_size)
+{
+    uint8_t buf[128];
+    strcpy((char *)buf, "key expansion");
+    memcpy(&buf[13], server_random, SSL_RANDOM_SIZE);
+    memcpy(&buf[45], client_random, SSL_RANDOM_SIZE);
+    prf(master_secret, SSL_SECRET_SIZE, buf, 77, key_block, key_block_size);
+}
+
+/** 
+ * Calculate the digest used in the finished message. This function also
+ * doubles up as a certificate verify function.
+ */
+void finished_digest(SSL *ssl, const char *label, uint8_t *digest)
+{
+    uint8_t mac_buf[128]; 
+    uint8_t *q = mac_buf;
+    MD5_CTX md5_ctx = ssl->dc->md5_ctx;
+    SHA1_CTX sha1_ctx = ssl->dc->sha1_ctx;
+
+    if (label)
+    {
+        strcpy((char *)q, label);
+        q += strlen(label);
+    }
+
+    MD5_Final(q, &md5_ctx);
+    q += MD5_SIZE;
+    
+    SHA1_Final(q, &sha1_ctx);
+    q += SHA1_SIZE;
+
+    if (label)
+    {
+        prf(ssl->dc->master_secret, SSL_SECRET_SIZE, mac_buf, (int)(q-mac_buf),
+            digest, SSL_FINISHED_HASH_SIZE);
+    }
+    else    /* for use in a certificate verify */
+    {
+        memcpy(digest, mac_buf, MD5_SIZE + SHA1_SIZE);
+    }
+
+#if 0
+    printf("label: %s\n", label);
+    print_blob("master secret", ssl->dc->master_secret, 48);
+    print_blob("mac_buf", mac_buf, q-mac_buf);
+    print_blob("finished digest", digest, SSL_FINISHED_HASH_SIZE);
+#endif
+}   
+    
+/**
+ * Retrieve (and initialise) the context of a cipher.
+ */
+static void *crypt_new(SSL *ssl, uint8_t *key, uint8_t *iv, int is_decrypt)
+{
+    switch (ssl->cipher)
+    {
+#ifndef CONFIG_SSL_SKELETON_MODE
+        case SSL_AES128_SHA:
+            {
+                AES_CTX *aes_ctx = (AES_CTX *)malloc(sizeof(AES_CTX));
+                AES_set_key(aes_ctx, key, iv, AES_MODE_128);
+
+                if (is_decrypt)
+                {
+                    AES_convert_key(aes_ctx);
+                }
+
+                return (void *)aes_ctx;
+            }
+
+        case SSL_AES256_SHA:
+            {
+                AES_CTX *aes_ctx = (AES_CTX *)malloc(sizeof(AES_CTX));
+                AES_set_key(aes_ctx, key, iv, AES_MODE_256);
+
+                if (is_decrypt)
+                {
+                    AES_convert_key(aes_ctx);
+                }
+
+                return (void *)aes_ctx;
+            }
+            break;
+
+        case SSL_RC4_128_MD5:
+#endif
+        case SSL_RC4_128_SHA:
+            {
+                RC4_CTX *rc4_ctx = (RC4_CTX *)malloc(sizeof(RC4_CTX));
+                RC4_setup(rc4_ctx, key, 16);
+                return (void *)rc4_ctx;
+            }
+            break;
+    }
+
+    return NULL;    /* its all gone wrong */
+}
+
+/**
+ * Send a packet over the socket.
+ */
+static int send_raw_packet(SSL *ssl, uint8_t protocol)
+{
+    uint8_t *rec_buf = ssl->bm_all_data;
+    int pkt_size = SSL_RECORD_SIZE+ssl->bm_index;
+    int sent = 0;
+    int ret = SSL_OK;
+
+    rec_buf[0] = protocol;
+    rec_buf[1] = 0x03;      /* version = 3.1 (TLS) */
+    rec_buf[2] = 0x01;
+    rec_buf[3] = ssl->bm_index >> 8;
+    rec_buf[4] = ssl->bm_index & 0xff;
+
+    DISPLAY_BYTES(ssl, "sending %d bytes", ssl->bm_all_data, 
+                             pkt_size, pkt_size);
+
+    while (sent < pkt_size)
+    {
+        if ((ret = SOCKET_WRITE(ssl->client_fd, 
+                        &ssl->bm_all_data[sent], pkt_size)) < 0)
+        {
+            ret = SSL_ERROR_CONN_LOST;
+            break;
+        }
+
+        sent += ret;
+
+        /* keep going until the write buffer has some space */
+        if (sent != pkt_size)
+        {
+            fd_set wfds;
+            FD_ZERO(&wfds);
+            FD_SET(ssl->client_fd, &wfds);
+
+            if (select(ssl->client_fd + 1, NULL, &wfds, NULL, NULL) < 0)
+            {
+                ret = SSL_ERROR_CONN_LOST;
+                break;
+            }
+        }
+    }
+
+    SET_SSL_FLAG(SSL_NEED_RECORD);  /* reset for next time */
+    ssl->bm_index = 0;
+
+    if (protocol != PT_APP_PROTOCOL_DATA)  
+    {
+        /* always return SSL_OK during handshake */   
+        ret = SSL_OK;
+    }
+
+    return ret;
+}
+
+/**
+ * Send an encrypted packet with padding bytes if necessary.
+ */
+int send_packet(SSL *ssl, uint8_t protocol, const uint8_t *in, int length)
+{
+    int msg_length = length;
+    int ret, pad_bytes = 0;
+    ssl->bm_index = msg_length;
+
+    /* if our state is bad, don't bother */
+    if (ssl->hs_status == SSL_ERROR_DEAD)
+        return SSL_ERROR_CONN_LOST;
+
+    if (in) /* has the buffer already been initialised? */
+    {
+        memcpy(ssl->bm_data, in, length);
+    }
+
+    if (IS_SET_SSL_FLAG(SSL_TX_ENCRYPTED))
+    {
+        int mode = IS_SET_SSL_FLAG(SSL_IS_CLIENT) ? 
+                            SSL_CLIENT_WRITE : SSL_SERVER_WRITE;
+        uint8_t hmac_header[SSL_RECORD_SIZE];
+
+        hmac_header[0] = protocol;
+        hmac_header[1] = 0x03;
+        hmac_header[2] = 0x01;
+        hmac_header[3] = length >> 8; 
+        hmac_header[4] = length & 0xff;
+
+        if (protocol == PT_HANDSHAKE_PROTOCOL)
+        {
+            DISPLAY_STATE(ssl, 1, ssl->bm_data[0], 0);
+
+            if (ssl->bm_data[0] != HS_HELLO_REQUEST)
+            {
+                add_packet(ssl, ssl->bm_data, ssl->bm_index);
+            }
+        }
+
+        /* add the packet digest */
+        msg_length += ssl->cipher_info->digest_size;
+        ssl->bm_index = msg_length;
+        add_hmac_digest(ssl, mode, hmac_header, ssl->bm_data, length, 
+                                                &ssl->bm_data[length]);
+
+        /* add padding? */
+        if (ssl->cipher_info->padding_size)
+        {
+            int last_blk_size = msg_length%ssl->cipher_info->padding_size;
+            pad_bytes = ssl->cipher_info->padding_size - last_blk_size;
+
+            /* ensure we always have at least 1 padding byte */
+            if (pad_bytes == 0)
+                pad_bytes += ssl->cipher_info->padding_size;
+
+            memset(&ssl->bm_data[msg_length], pad_bytes-1, pad_bytes);
+            msg_length += pad_bytes;
+            ssl->bm_index = msg_length;
+        }
+
+        DISPLAY_BYTES(ssl, "unencrypted write", ssl->bm_data, msg_length);
+        increment_write_sequence(ssl);
+
+        /* now encrypt the packet */
+        ssl->cipher_info->encrypt(ssl->encrypt_ctx, ssl->bm_data, 
+                                            ssl->bm_data, msg_length);
+    }
+    else if (protocol == PT_HANDSHAKE_PROTOCOL)
+    {
+        DISPLAY_STATE(ssl, 1, ssl->bm_data[0], 0);
+
+        if (ssl->bm_data[0] != HS_HELLO_REQUEST)
+        {
+            add_packet(ssl, ssl->bm_data, ssl->bm_index);
+        }
+    }
+
+    if ((ret = send_raw_packet(ssl, protocol)) <= 0)
+        return ret;
+
+    return length;  /* just return what we wanted to send */
+}
+
+/**
+ * Work out the cipher keys we are going to use for this session based on the
+ * master secret.
+ */
+static void set_key_block(SSL *ssl, int is_write)
+{
+    const cipher_info_t *ciph_info = get_cipher_info(ssl->cipher);
+    uint8_t *q;
+    uint8_t client_key[32], server_key[32]; /* big enough for AES256 */
+    uint8_t client_iv[16], server_iv[16];   /* big enough for AES128/256 */
+    int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
+
+    /* only do once in a handshake */
+    if (ssl->dc->key_block == NULL)
+    {
+        ssl->dc->key_block = (uint8_t *)malloc(ciph_info->key_block_size);
+
+#if 0
+        print_blob("client", ssl->dc->client_random, 32);
+        print_blob("server", ssl->dc->server_random, 32);
+        print_blob("master", ssl->dc->master_secret, SSL_SECRET_SIZE);
+#endif
+        generate_key_block(ssl->dc->client_random, ssl->dc->server_random,
+            ssl->dc->master_secret, ssl->dc->key_block, 
+            ciph_info->key_block_size);
+#if 0
+        print_blob("keyblock", ssl->key_block, ciph_info->key_block_size);
+#endif
+    }
+
+    q = ssl->dc->key_block;
+
+    if ((is_client && is_write) || (!is_client && !is_write))
+    {
+        memcpy(ssl->client_mac, q, ciph_info->digest_size);
+    }
+
+    q += ciph_info->digest_size;
+
+    if ((!is_client && is_write) || (is_client && !is_write))
+    {
+        memcpy(ssl->server_mac, q, ciph_info->digest_size);
+    }
+
+    q += ciph_info->digest_size;
+    memcpy(client_key, q, ciph_info->key_size);
+    q += ciph_info->key_size;
+    memcpy(server_key, q, ciph_info->key_size);
+    q += ciph_info->key_size;
+
+#ifndef CONFIG_SSL_SKELETON_MODE 
+    if (ciph_info->iv_size)    /* RC4 has no IV, AES does */
+    {
+        memcpy(client_iv, q, ciph_info->iv_size);
+        q += ciph_info->iv_size;
+        memcpy(server_iv, q, ciph_info->iv_size);
+        q += ciph_info->iv_size;
+    }
+#endif
+
+    free(is_write ? ssl->encrypt_ctx : ssl->decrypt_ctx);
+
+    /* now initialise the ciphers */
+    if (is_client)
+    {
+        finished_digest(ssl, server_finished, ssl->dc->final_finish_mac);
+
+        if (is_write)
+            ssl->encrypt_ctx = crypt_new(ssl, client_key, client_iv, 0);
+        else
+            ssl->decrypt_ctx = crypt_new(ssl, server_key, server_iv, 1);
+    }
+    else
+    {
+        finished_digest(ssl, client_finished, ssl->dc->final_finish_mac);
+
+        if (is_write)
+            ssl->encrypt_ctx = crypt_new(ssl, server_key, server_iv, 0);
+        else
+            ssl->decrypt_ctx = crypt_new(ssl, client_key, client_iv, 1);
+    }
+
+    ssl->cipher_info = ciph_info;
+}
+
+/**
+ * Read the SSL connection.
+ */
+int basic_read(SSL *ssl, uint8_t **in_data)
+{
+    int ret = SSL_OK;
+    int read_len, is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
+    uint8_t *buf = ssl->bm_data;
+
+    read_len = SOCKET_READ(ssl->client_fd, &buf[ssl->bm_read_index], 
+                            ssl->need_bytes-ssl->got_bytes);
+
+    /* connection has gone, so die */
+    if (read_len <= 0)
+    {
+        ret = SSL_ERROR_CONN_LOST;
+        ssl->hs_status = SSL_ERROR_DEAD;  /* make sure it stays dead */
+        goto error;
+    }
+
+    DISPLAY_BYTES(ssl, "received %d bytes", 
+            &ssl->bm_data[ssl->bm_read_index], read_len, read_len);
+
+    ssl->got_bytes += read_len;
+    ssl->bm_read_index += read_len;
+
+    /* haven't quite got what we want, so try again later */
+    if (ssl->got_bytes < ssl->need_bytes)
+        return SSL_OK;
+
+    read_len = ssl->got_bytes;
+    ssl->got_bytes = 0;
+
+    if (IS_SET_SSL_FLAG(SSL_NEED_RECORD))
+    {
+        /* check for sslv2 "client hello" */
+        if (buf[0] & 0x80 && buf[2] == 1 && buf[3] == 0x03)
+        {
+#ifdef CONFIG_SSL_ENABLE_V23_HANDSHAKE
+            DISPLAY_BYTES(ssl, "ssl2 record", buf, 5);
+            add_packet(ssl, &buf[2], 3);
+            ret = process_sslv23_client_hello(ssl); 
+#else
+            printf("Error: no SSLv23 handshaking allowed\n"); TTY_FLUSH();
+            ret = SSL_ERROR_NOT_SUPPORTED;
+#endif
+            goto error; /* not an error - just get out of here */
+        }
+
+        ssl->need_bytes = (buf[3] << 8) + buf[4];
+
+        /* do we violate the spec with the message size?  */
+        if (ssl->need_bytes > RT_MAX_PLAIN_LENGTH+RT_EXTRA-BM_RECORD_OFFSET)
+        {
+            ret = SSL_ERROR_INVALID_PROT_MSG;              
+            goto error;
+        }
+
+        CLR_SSL_FLAG(SSL_NEED_RECORD);
+        memcpy(ssl->hmac_header, buf, 3);       /* store for hmac */
+        ssl->record_type = buf[0];
+        goto error;                         /* no error, we're done */
+    }
+
+    /* for next time - just do it now in case of an error */
+    SET_SSL_FLAG(SSL_NEED_RECORD);
+    ssl->need_bytes = SSL_RECORD_SIZE;
+
+    /* decrypt if we need to */
+    if (IS_SET_SSL_FLAG(SSL_RX_ENCRYPTED))
+    {
+        ssl->cipher_info->decrypt(ssl->decrypt_ctx, buf, buf, read_len);
+        read_len = verify_digest(ssl, 
+                is_client ? SSL_CLIENT_READ : SSL_SERVER_READ, buf, read_len);
+
+        /* does the hmac work? */
+        if (read_len < 0)
+        {
+            ret = read_len;
+            goto error;
+        }
+
+        DISPLAY_BYTES(ssl, "decrypted", buf, read_len);
+        increment_read_sequence(ssl);
+    }
+
+    /* The main part of the SSL packet */
+    switch (ssl->record_type)
+    {
+        case PT_HANDSHAKE_PROTOCOL:
+            ssl->dc->bm_proc_index = 0;
+            ret = do_handshake(ssl, buf, read_len);
+            break;
+
+        case PT_CHANGE_CIPHER_SPEC:
+            if (ssl->next_state != HS_FINISHED)
+            {
+                ret = SSL_ERROR_INVALID_HANDSHAKE;
+                goto error;
+            }
+
+            /* all encrypted from now on */
+            SET_SSL_FLAG(SSL_RX_ENCRYPTED);
+            set_key_block(ssl, 0);
+            memset(ssl->read_sequence, 0, 8);
+            break;
+
+        case PT_APP_PROTOCOL_DATA:
+            if (in_data)
+            {
+                *in_data = ssl->bm_data;   /* point to the work buffer */
+                (*in_data)[read_len] = 0;  /* null terminate just in case */
+            }
+
+            ret = read_len;
+            break;
+
+        case PT_ALERT_PROTOCOL:
+            /* return the alert # with alert bit set */
+            ret = -buf[1]; 
+            DISPLAY_ALERT(ssl, buf[1]);
+            break;
+
+        default:
+            ret = SSL_ERROR_INVALID_PROT_MSG;
+            break;
+    }
+
+error:
+    ssl->bm_read_index = 0;          /* reset to go again */
+
+    if (ret < SSL_OK && in_data)/* if all wrong, then clear this buffer ptr */
+        *in_data = NULL;
+
+    return ret;
+}
+
+/**
+ * Do some basic checking of data and then perform the appropriate handshaking.
+ */
+static int do_handshake(SSL *ssl, uint8_t *buf, int read_len)
+{
+    int hs_len = (buf[2]<<8) + buf[3];
+    uint8_t handshake_type = buf[0];
+    int ret = SSL_OK;
+    int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
+
+    /* some integrity checking on the handshake */
+    PARANOIA_CHECK(read_len-SSL_HS_HDR_SIZE, hs_len);
+
+    if (handshake_type != ssl->next_state)
+    {
+        /* handle a special case on the client */
+        if (!is_client || handshake_type != HS_CERT_REQ ||
+                        ssl->next_state != HS_SERVER_HELLO_DONE)
+        {
+            ret = SSL_ERROR_INVALID_HANDSHAKE;
+            goto error;
+        }
+    }
+
+    hs_len += SSL_HS_HDR_SIZE;  /* adjust for when adding packets */
+    ssl->bm_index = hs_len;     /* store the size and check later */
+    DISPLAY_STATE(ssl, 0, handshake_type, 0);
+
+    if (handshake_type != HS_CERT_VERIFY && handshake_type != HS_HELLO_REQUEST)
+        add_packet(ssl, buf, hs_len); 
+
+#if defined(CONFIG_SSL_ENABLE_CLIENT)
+    ret = is_client ? 
+        do_clnt_handshake(ssl, handshake_type, buf, hs_len) :
+        do_svr_handshake(ssl, handshake_type, buf, hs_len);
+#else
+    ret = do_svr_handshake(ssl, handshake_type, buf, hs_len);
+#endif
+
+    /* just use recursion to get the rest */
+    if (hs_len < read_len && ret == SSL_OK)
+        ret = do_handshake(ssl, &buf[hs_len], read_len-hs_len);
+
+error:
+    return ret;
+}
+
+/**
+ * Sends the change cipher spec message. We have just read a finished message
+ * from the client.
+ */
+int send_change_cipher_spec(SSL *ssl)
+{
+    int ret = send_packet(ssl, PT_CHANGE_CIPHER_SPEC, 
+            g_chg_cipher_spec_pkt, sizeof(g_chg_cipher_spec_pkt));
+    SET_SSL_FLAG(SSL_TX_ENCRYPTED);
+    set_key_block(ssl, 1);
+    memset(ssl->write_sequence, 0, 8);
+    return ret;
+}
+
+/**
+ * Send a "finished" message
+ */
+int send_finished(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+
+    buf[0] = HS_FINISHED;
+    buf[1] = 0;
+    buf[2] = 0;
+    buf[3] = SSL_FINISHED_HASH_SIZE;
+
+    /* now add the finished digest mac (12 bytes) */
+    finished_digest(ssl, 
+        IS_SET_SSL_FLAG(SSL_IS_CLIENT) ?
+                    client_finished : server_finished, &buf[4]);
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    /* store in the session cache */
+    if (!IS_SET_SSL_FLAG(SSL_SESSION_RESUME) && ssl->ssl_ctx->num_sessions)
+    {
+        memcpy(ssl->session->master_secret,
+                ssl->dc->master_secret, SSL_SECRET_SIZE);
+    }
+#endif
+
+    return send_packet(ssl, PT_HANDSHAKE_PROTOCOL,
+                                NULL, SSL_FINISHED_HASH_SIZE+4);
+}
+
+/**
+ * Send an alert message.
+ * Return 1 if the alert was an "error".
+ */
+int send_alert(SSL *ssl, int error_code)
+{
+    int alert_num = 0;
+    int is_warning = 0;
+    uint8_t buf[2];
+
+    /* Don't bother we're already dead */
+    if (ssl->hs_status == SSL_ERROR_DEAD)
+    {
+        return SSL_ERROR_CONN_LOST;
+    }
+
+#ifdef CONFIG_SSL_FULL_MODE
+    if (IS_SET_SSL_FLAG(SSL_DISPLAY_STATES))
+        ssl_display_error(error_code);
+#endif
+
+    switch (error_code)
+    {
+        case SSL_ALERT_CLOSE_NOTIFY:
+            is_warning = 1;
+            alert_num = SSL_ALERT_CLOSE_NOTIFY;
+            break;
+
+        case SSL_ERROR_CONN_LOST:       /* don't send alert just yet */
+            is_warning = 1;
+            break;
+
+        case SSL_ERROR_INVALID_HANDSHAKE:
+        case SSL_ERROR_INVALID_PROT_MSG:
+            alert_num = SSL_ALERT_HANDSHAKE_FAILURE;
+            break;
+
+        case SSL_ERROR_INVALID_HMAC:
+        case SSL_ERROR_FINISHED_INVALID:
+            alert_num = SSL_ALERT_BAD_RECORD_MAC;
+            break;
+
+        case SSL_ERROR_INVALID_VERSION:
+            alert_num = SSL_ALERT_INVALID_VERSION;
+            break;
+
+        case SSL_ERROR_INVALID_SESSION:
+        case SSL_ERROR_NO_CIPHER:
+        case SSL_ERROR_INVALID_KEY:
+            alert_num = SSL_ALERT_ILLEGAL_PARAMETER;
+            break;
+
+        case SSL_ERROR_BAD_CERTIFICATE:
+            alert_num = SSL_ALERT_BAD_CERTIFICATE;
+            break;
+
+        default:
+            /* a catch-all for any badly verified certificates */
+            alert_num = (error_code <= SSL_X509_OFFSET) ?  
+                SSL_ALERT_BAD_CERTIFICATE : SSL_ALERT_UNEXPECTED_MESSAGE;
+            break;
+    }
+
+    buf[0] = is_warning ? 1 : 2;
+    buf[1] = alert_num;
+    send_packet(ssl, PT_ALERT_PROTOCOL, buf, sizeof(buf));
+    DISPLAY_ALERT(ssl, alert_num);
+    return is_warning ? 0 : 1;
+}
+
+/**
+ * Process a client finished message.
+ */
+int process_finished(SSL *ssl, int hs_len)
+{
+    uint8_t *buf = ssl->bm_data;
+    int ret = SSL_OK;
+    int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
+    int resume = IS_SET_SSL_FLAG(SSL_SESSION_RESUME);
+
+    PARANOIA_CHECK(ssl->bm_index, SSL_FINISHED_HASH_SIZE+4);
+
+    /* check that we all work before we continue */
+    if (memcmp(ssl->dc->final_finish_mac, &buf[4], SSL_FINISHED_HASH_SIZE))
+        return SSL_ERROR_FINISHED_INVALID;
+
+    if ((!is_client && !resume) || (is_client && resume))
+    {
+        if ((ret = send_change_cipher_spec(ssl)) == SSL_OK)
+            ret = send_finished(ssl);
+    }
+
+    /* if we ever renegotiate */
+    ssl->next_state = is_client ? HS_HELLO_REQUEST : HS_CLIENT_HELLO;  
+    ssl->hs_status = ret;  /* set the final handshake status */
+
+error:
+    return ret;
+}
+
+/**
+ * Send a certificate.
+ */
+int send_certificate(SSL *ssl)
+{
+    int i = 0;
+    uint8_t *buf = ssl->bm_data;
+    int offset = 7;
+    int chain_length;
+
+    buf[0] = HS_CERTIFICATE;
+    buf[1] = 0;
+    buf[4] = 0;
+
+    while (i < ssl->ssl_ctx->chain_length)
+    {
+        SSL_CERT *cert = &ssl->ssl_ctx->certs[i];
+        buf[offset++] = 0;        
+        buf[offset++] = cert->size >> 8;        /* cert 1 length */
+        buf[offset++] = cert->size & 0xff;
+        memcpy(&buf[offset], cert->buf, cert->size);
+        offset += cert->size;
+        i++;
+    }
+
+    chain_length = offset - 7;
+    buf[5] = chain_length >> 8;        /* cert chain length */
+    buf[6] = chain_length & 0xff;
+    chain_length += 3;
+    buf[2] = chain_length >> 8;        /* handshake length */
+    buf[3] = chain_length & 0xff;
+    ssl->bm_index = offset;
+    return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, offset);
+}
+
+/**
+ * Create a blob of memory that we'll get rid of once the handshake is
+ * complete.
+ */
+void disposable_new(SSL *ssl)
+{
+    if (ssl->dc == NULL)
+    {
+        ssl->dc = (DISPOSABLE_CTX *)calloc(1, sizeof(DISPOSABLE_CTX));
+        MD5_Init(&ssl->dc->md5_ctx);
+        SHA1_Init(&ssl->dc->sha1_ctx);
+    }
+}
+
+/**
+ * Remove the temporary blob of memory.
+ */
+void disposable_free(SSL *ssl)
+{
+    if (ssl->dc)
+    {
+	    free(ssl->dc->key_block);
+        memset(ssl->dc, 0, sizeof(DISPOSABLE_CTX));
+        free(ssl->dc);
+        ssl->dc = NULL;
+    }
+
+}
+
+#ifndef CONFIG_SSL_SKELETON_MODE     /* no session resumption in this mode */
+/**
+ * Find if an existing session has the same session id. If so, use the
+ * master secret from this session for session resumption.
+ */
+SSL_SESSION *ssl_session_update(int max_sessions, SSL_SESSION *ssl_sessions[], 
+        SSL *ssl, const uint8_t *session_id)
+{
+    time_t tm = time(NULL);
+    time_t oldest_sess_time = tm;
+    SSL_SESSION *oldest_sess = NULL;
+    int i;
+
+    /* no sessions? Then bail */
+    if (max_sessions == 0)
+        return NULL;
+
+    SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
+    if (session_id)
+    {
+        for (i = 0; i < max_sessions; i++)
+        {
+            if (ssl_sessions[i])
+            {
+                /* kill off any expired sessions */
+                if (tm > ssl_sessions[i]->conn_time + SSL_EXPIRY_TIME)
+                {
+                    session_free(ssl_sessions, i);
+                    continue;
+                }
+
+                /* if the session id matches, it must still be less than 
+                   the expiry time */
+                if (memcmp(ssl_sessions[i]->session_id, session_id,
+                                                SSL_SESSION_ID_SIZE) == 0)
+                {
+                    ssl->session_index = i;
+                    memcpy(ssl->dc->master_secret, 
+                            ssl_sessions[i]->master_secret, SSL_SECRET_SIZE);
+                    SET_SSL_FLAG(SSL_SESSION_RESUME);
+                    SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+                    return ssl_sessions[i];  /* a session was found */
+                }
+            }
+        }
+    }
+
+    /* If we've got here, no matching session was found - so create one */
+    for (i = 0; i < max_sessions; i++)
+    {
+        if (ssl_sessions[i] == NULL)
+        {
+            /* perfect, this will do */
+            ssl_sessions[i] = (SSL_SESSION *)calloc(1, sizeof(SSL_SESSION));
+            ssl_sessions[i]->conn_time = tm;
+            ssl->session_index = i;
+            SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+            return ssl_sessions[i]; /* return the session object */
+        }
+        else if (ssl_sessions[i]->conn_time <= oldest_sess_time)
+        {
+            /* find the oldest session */
+            oldest_sess_time = ssl_sessions[i]->conn_time;
+            oldest_sess = ssl_sessions[i];
+            ssl->session_index = i;
+        }
+    }
+
+    /* ok, we've used up all of our sessions. So blow the oldest session away */
+    oldest_sess->conn_time = tm;
+    memset(oldest_sess->session_id, 0, sizeof(SSL_SESSION_ID_SIZE));
+    memset(oldest_sess->master_secret, 0, sizeof(SSL_SECRET_SIZE));
+    SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+    return oldest_sess;
+}
+
+/**
+ * Free an existing session.
+ */
+static void session_free(SSL_SESSION *ssl_sessions[], int sess_index)
+{
+    if (ssl_sessions[sess_index])
+    {
+        free(ssl_sessions[sess_index]);
+        ssl_sessions[sess_index] = NULL;
+    }
+}
+
+/**
+ * This ssl object doesn't want this session anymore.
+ */
+void kill_ssl_session(SSL_SESSION **ssl_sessions, SSL *ssl)
+{
+    SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
+
+    if (ssl->ssl_ctx->num_sessions)
+    {
+        session_free(ssl_sessions, ssl->session_index);
+        ssl->session = NULL;
+    }
+
+    SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+}
+#endif /* CONFIG_SSL_SKELETON_MODE */
+
+/*
+ * Get the session id for a handshake. This will be a 32 byte sequence.
+ */
+EXP_FUNC const uint8_t * STDCALL ssl_get_session_id(const SSL *ssl)
+{
+    return ssl->session_id;
+}
+
+/*
+ * Get the session id size for a handshake. 
+ */
+EXP_FUNC uint8_t STDCALL ssl_get_session_id_size(const SSL *ssl)
+{
+    return ssl->sess_id_size;
+}
+
+/*
+ * Return the cipher id (in the SSL form).
+ */
+EXP_FUNC uint8_t STDCALL ssl_get_cipher_id(const SSL *ssl)
+{
+    return ssl->cipher;
+}
+
+/*
+ * Return the status of the handshake.
+ */
+EXP_FUNC int STDCALL ssl_handshake_status(const SSL *ssl)
+{
+    return ssl->hs_status;
+}
+
+/*
+ * Retrieve various parameters about the SSL engine.
+ */
+EXP_FUNC int STDCALL ssl_get_config(int offset)
+{
+    switch (offset)
+    {
+        /* return the appropriate build mode */
+        case SSL_BUILD_MODE:
+#if defined(CONFIG_SSL_FULL_MODE)
+            return SSL_BUILD_FULL_MODE;
+#elif defined(CONFIG_SSL_ENABLE_CLIENT)
+            return SSL_BUILD_ENABLE_CLIENT;
+#elif defined(CONFIG_ENABLE_VERIFICATION)
+            return SSL_BUILD_ENABLE_VERIFICATION;
+#elif defined(CONFIG_SSL_SERVER_ONLY )
+            return SSL_BUILD_SERVER_ONLY;
+#else 
+            return SSL_BUILD_SKELETON_MODE;
+#endif
+
+        case SSL_MAX_CERT_CFG_OFFSET:
+            return CONFIG_SSL_MAX_CERTS;
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+        case SSL_MAX_CA_CERT_CFG_OFFSET:
+            return CONFIG_X509_MAX_CA_CERTS;
+#endif
+#ifdef CONFIG_SSL_HAS_PEM
+        case SSL_HAS_PEM:
+            return 1;
+#endif
+        default:
+            return 0;
+    }
+}
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+/**
+ * Authenticate a received certificate.
+ */
+EXP_FUNC int STDCALL ssl_verify_cert(const SSL *ssl)
+{
+    int ret;
+    SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
+    ret = x509_verify(ssl->ssl_ctx->ca_cert_ctx, ssl->x509_ctx);
+    SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+
+    if (ret)        /* modify into an SSL error type */
+    {
+        ret = SSL_X509_ERROR(ret);
+    }
+
+    return ret;
+}
+
+/**
+ * Process a certificate message.
+ */
+int process_certificate(SSL *ssl, X509_CTX **x509_ctx)
+{
+    int ret = SSL_OK;
+    uint8_t *buf = &ssl->bm_data[ssl->dc->bm_proc_index];
+    int pkt_size = ssl->bm_index;
+    int cert_size, offset = 5;
+    int total_cert_size = (buf[offset]<<8) + buf[offset+1];
+    int is_client = IS_SET_SSL_FLAG(SSL_IS_CLIENT);
+    X509_CTX **chain = x509_ctx;
+    offset += 2;
+
+    PARANOIA_CHECK(total_cert_size, offset);
+
+    while (offset < total_cert_size)
+    {
+        offset++;       /* skip empty char */
+        cert_size = (buf[offset]<<8) + buf[offset+1];
+        offset += 2;
+        
+        if (x509_new(&buf[offset], NULL, chain))
+        {
+            ret = SSL_ERROR_BAD_CERTIFICATE;
+            goto error;
+        }
+
+        /* DISPLAY_CERT(ssl, *chain); */
+        chain = &((*chain)->next);
+        offset += cert_size;
+    }
+
+    PARANOIA_CHECK(pkt_size, offset);
+
+    /* if we are client we can do the verify now or later */
+    if (is_client && !IS_SET_SSL_FLAG(SSL_SERVER_VERIFY_LATER))
+    {
+        ret = ssl_verify_cert(ssl);
+    }
+
+    ssl->next_state = is_client ? HS_SERVER_HELLO_DONE : HS_CLIENT_KEY_XCHG;
+    ssl->dc->bm_proc_index += offset;
+error:
+    return ret;
+}
+
+#endif /* CONFIG_SSL_CERT_VERIFICATION */
+
+/**
+ * Debugging routine to display SSL handshaking stuff.
+ */
+#ifdef CONFIG_SSL_FULL_MODE
+/**
+ * Debugging routine to display SSL states.
+ */
+void DISPLAY_STATE(SSL *ssl, int is_send, uint8_t state, int not_ok)
+{
+    const char *str;
+
+    if (!IS_SET_SSL_FLAG(SSL_DISPLAY_STATES))
+        return;
+
+    printf(not_ok ? "Error - invalid State:\t" : "State:\t");
+    printf(is_send ? "sending " : "receiving ");
+
+    switch (state)
+    {
+        case HS_HELLO_REQUEST:
+            str = "Hello Request (0)";
+            break;
+
+        case HS_CLIENT_HELLO:
+            str = "Client Hello (1)";
+            break;
+
+        case HS_SERVER_HELLO:
+            str = "Server Hello (2)";
+            break;
+
+        case HS_CERTIFICATE:
+            str = "Certificate (11)";
+            break;
+
+        case HS_SERVER_KEY_XCHG:
+            str = "Certificate Request (12)";
+            break;
+
+        case HS_CERT_REQ:
+            str = "Certificate Request (13)";
+            break;
+
+        case HS_SERVER_HELLO_DONE:
+            str = "Server Hello Done (14)";
+            break;
+
+        case HS_CERT_VERIFY:
+            str = "Certificate Verify (15)";
+            break;
+
+        case HS_CLIENT_KEY_XCHG:
+            str = "Client Key Exchange (16)";
+            break;
+
+        case HS_FINISHED:
+            str = "Finished (16)";
+            break;
+
+        default:
+            str = "Error (Unknown)";
+            
+            break;
+    }
+
+    printf("%s\n", str);
+    TTY_FLUSH();
+}
+
+/**
+ * Debugging routine to display X509 certificates.
+ */
+void DISPLAY_CERT(SSL *ssl, const X509_CTX *x509_ctx)
+{
+    if (!IS_SET_SSL_FLAG(SSL_DISPLAY_CERTS))
+        return;
+
+    x509_print(x509_ctx, ssl->ssl_ctx->ca_cert_ctx);
+    TTY_FLUSH();
+}
+
+/**
+ * Debugging routine to display RSA objects
+ */
+void DISPLAY_RSA(SSL *ssl, const RSA_CTX *rsa_ctx)
+{
+    if (!IS_SET_SSL_FLAG(SSL_DISPLAY_RSA))
+        return;
+
+    RSA_print(rsa_ctx);
+    TTY_FLUSH();
+}
+
+/**
+ * Debugging routine to display SSL handshaking bytes.
+ */
+void DISPLAY_BYTES(SSL *ssl, const char *format, 
+        const uint8_t *data, int size, ...)
+{
+    va_list(ap);
+
+    if (!IS_SET_SSL_FLAG(SSL_DISPLAY_BYTES))
+        return;
+
+    va_start(ap, size);
+    print_blob(format, data, size, va_arg(ap, char *));
+    va_end(ap);
+    TTY_FLUSH();
+}
+
+/**
+ * Debugging routine to display SSL handshaking errors.
+ */
+EXP_FUNC void STDCALL ssl_display_error(int error_code)
+{
+    if (error_code == SSL_OK)
+        return;
+
+    printf("Error: ");
+
+    /* X509 error? */
+    if (error_code < SSL_X509_OFFSET)
+    {
+        printf("%s\n", x509_display_error(error_code - SSL_X509_OFFSET));
+        return;
+    }
+
+    /* SSL alert error code */
+    if (error_code > SSL_ERROR_CONN_LOST)
+    {
+        printf("SSL error %d\n", -error_code);
+        return;
+    }
+
+    switch (error_code)
+    {
+        case SSL_ERROR_DEAD:
+            printf("connection dead");
+            break;
+
+        case SSL_ERROR_INVALID_HANDSHAKE:
+            printf("invalid handshake");
+            break;
+
+        case SSL_ERROR_INVALID_PROT_MSG:
+            printf("invalid protocol message");
+            break;
+
+        case SSL_ERROR_INVALID_HMAC:
+            printf("invalid mac");
+            break;
+
+        case SSL_ERROR_INVALID_VERSION:
+            printf("invalid version");
+            break;
+
+        case SSL_ERROR_INVALID_SESSION:
+            printf("invalid session");
+            break;
+
+        case SSL_ERROR_NO_CIPHER:
+            printf("no cipher");
+            break;
+
+        case SSL_ERROR_CONN_LOST:
+            printf("connection lost");
+            break;
+
+        case SSL_ERROR_BAD_CERTIFICATE:
+            printf("bad certificate");
+            break;
+
+        case SSL_ERROR_INVALID_KEY:
+            printf("invalid key");
+            break;
+
+        case SSL_ERROR_FINISHED_INVALID:
+            printf("finished invalid");
+            break;
+
+        case SSL_ERROR_NO_CERT_DEFINED:
+            printf("no certificate defined");
+            break;
+
+        case SSL_ERROR_NOT_SUPPORTED:
+            printf("Option not supported");
+            break;
+
+        default:
+            printf("undefined as yet - %d", error_code);
+            break;
+    }
+
+    printf("\n");
+    TTY_FLUSH();
+}
+
+/**
+ * Debugging routine to display alerts.
+ */
+void DISPLAY_ALERT(SSL *ssl, int alert)
+{
+    if (!IS_SET_SSL_FLAG(SSL_DISPLAY_STATES))
+        return;
+
+    printf("Alert: ");
+
+    switch (alert)
+    {
+        case SSL_ALERT_CLOSE_NOTIFY:
+            printf("close notify");
+            break;
+
+        case SSL_ALERT_INVALID_VERSION:
+            printf("invalid version");
+            break;
+
+        case SSL_ALERT_BAD_CERTIFICATE:
+            printf("bad certificate");
+            break;
+
+        case SSL_ALERT_UNEXPECTED_MESSAGE:
+            printf("unexpected message");
+            break;
+
+        case SSL_ALERT_BAD_RECORD_MAC:
+            printf("bad record mac");
+            break;
+
+        case SSL_ALERT_HANDSHAKE_FAILURE:
+            printf("handshake failure");
+            break;
+
+        case SSL_ALERT_ILLEGAL_PARAMETER:
+            printf("illegal parameter");
+            break;
+
+        case SSL_ALERT_DECODE_ERROR:
+            printf("decode error");
+            break;
+
+        case SSL_ALERT_DECRYPT_ERROR:
+            printf("decrypt error");
+            break;
+
+        default:
+            printf("alert - (unknown %d)", alert);
+            break;
+    }
+
+    printf("\n");
+    TTY_FLUSH();
+}
+
+#endif /* CONFIG_SSL_FULL_MODE */
+
+/**
+ * Return the version of this library.
+ */
+EXP_FUNC const char  * STDCALL ssl_version()
+{
+    static const char * axtls_version = AXTLS_VERSION;
+    return axtls_version;
+}
+
+/**
+ * Enable the various language bindings to work regardless of the
+ * configuration - they just return an error statement and a bad return code.
+ */
+#if !defined(CONFIG_SSL_FULL_MODE)
+EXP_FUNC void STDCALL ssl_display_error(int error_code) {}
+#endif
+
+#ifdef CONFIG_BINDINGS
+#if !defined(CONFIG_SSL_ENABLE_CLIENT)
+EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const
+        uint8_t *session_id, uint8_t sess_id_size)
+{
+    printf(unsupported_str);
+    return NULL;
+}
+#endif
+
+#if !defined(CONFIG_SSL_CERT_VERIFICATION)
+EXP_FUNC int STDCALL ssl_verify_cert(const SSL *ssl)
+{
+    printf(unsupported_str);
+    return -1;
+}
+
+EXP_FUNC const char * STDCALL ssl_get_cert_dn(const SSL *ssl, int component)
+{
+    printf(unsupported_str);
+    return NULL;
+}
+
+#endif  /* CONFIG_SSL_CERT_VERIFICATION */
+
+#endif /* CONFIG_BINDINGS */
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/tls1.h b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1.h
new file mode 100755
index 00000000..b64b4fda
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1.h
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file tls1.h
+ *
+ * @brief The definitions for the TLS library.
+ */
+#ifndef HEADER_SSL_LIB_H
+#define HEADER_SSL_LIB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "version.h"
+#include "crypto.h"
+#include "os_port.h"
+#include "crypto_misc.h"
+
+#define SSL_RANDOM_SIZE             32
+#define SSL_SECRET_SIZE             48
+#define SSL_FINISHED_HASH_SIZE      12
+#define SSL_RECORD_SIZE             5
+#define SSL_SERVER_READ             0
+#define SSL_SERVER_WRITE            1
+#define SSL_CLIENT_READ             2
+#define SSL_CLIENT_WRITE            3
+#define SSL_HS_HDR_SIZE             4
+
+/* the flags we use while establishing a connection */
+#define SSL_NEED_RECORD             0x0001
+#define SSL_TX_ENCRYPTED            0x0002 
+#define SSL_RX_ENCRYPTED            0x0004
+#define SSL_SESSION_RESUME          0x0008
+#define SSL_IS_CLIENT               0x0010
+#define SSL_HAS_CERT_REQ            0x0020
+
+/* some macros to muck around with flag bits */
+#define SET_SSL_FLAG(A)             (ssl->flag |= A)
+#define CLR_SSL_FLAG(A)             (ssl->flag &= ~A)
+#define IS_SET_SSL_FLAG(A)          (ssl->flag & A)
+
+#define MAX_KEY_BYTE_SIZE           512     /* for a 4096 bit key */
+#define RT_MAX_PLAIN_LENGTH         16384
+#define RT_EXTRA                    1024
+#define BM_RECORD_OFFSET            5
+
+#ifdef CONFIG_SSL_SKELETON_MODE
+#define NUM_PROTOCOLS               1
+#else
+#define NUM_PROTOCOLS               4
+#endif
+
+#define PARANOIA_CHECK(A, B)        if (A < B) { \
+    ret = SSL_ERROR_INVALID_HANDSHAKE; goto error; }
+
+/* protocol types */
+enum
+{
+    PT_CHANGE_CIPHER_SPEC = 20,
+    PT_ALERT_PROTOCOL,
+    PT_HANDSHAKE_PROTOCOL,
+    PT_APP_PROTOCOL_DATA
+};
+
+/* handshaking types */
+enum
+{
+    HS_HELLO_REQUEST,
+    HS_CLIENT_HELLO,
+    HS_SERVER_HELLO,
+    HS_CERTIFICATE = 11,
+    HS_SERVER_KEY_XCHG,
+    HS_CERT_REQ,
+    HS_SERVER_HELLO_DONE,
+    HS_CERT_VERIFY,
+    HS_CLIENT_KEY_XCHG,
+    HS_FINISHED = 20
+};
+
+typedef struct 
+{
+    uint8_t cipher;
+    uint8_t key_size;
+    uint8_t iv_size;
+    uint8_t key_block_size;
+    uint8_t padding_size;
+    uint8_t digest_size;
+    hmac_func hmac;
+    crypt_func encrypt;
+    crypt_func decrypt;
+} cipher_info_t;
+
+struct _SSLObjLoader 
+{
+    uint8_t *buf;
+    int len;
+};
+
+typedef struct _SSLObjLoader SSLObjLoader;
+
+typedef struct 
+{
+    time_t conn_time;
+    uint8_t session_id[SSL_SESSION_ID_SIZE];
+    uint8_t master_secret[SSL_SECRET_SIZE];
+} SSL_SESSION;
+
+typedef struct
+{
+    uint8_t *buf;
+    int size;
+} SSL_CERT;
+
+typedef struct
+{
+    MD5_CTX md5_ctx;
+    SHA1_CTX sha1_ctx;
+    uint8_t final_finish_mac[SSL_FINISHED_HASH_SIZE];
+    uint8_t *key_block;
+    uint8_t master_secret[SSL_SECRET_SIZE];
+    uint8_t client_random[SSL_RANDOM_SIZE]; /* client's random sequence */
+    uint8_t server_random[SSL_RANDOM_SIZE]; /* server's random sequence */
+    uint16_t bm_proc_index;
+} DISPOSABLE_CTX;
+
+struct _SSL
+{
+    uint32_t flag;
+    uint16_t need_bytes;
+    uint16_t got_bytes;
+    uint8_t record_type;
+    uint8_t cipher;
+    uint8_t sess_id_size;
+    int16_t next_state;
+    int16_t hs_status;
+    DISPOSABLE_CTX *dc;         /* temporary data which we'll get rid of soon */
+    int client_fd;
+    const cipher_info_t *cipher_info;
+    void *encrypt_ctx;
+    void *decrypt_ctx;
+    uint8_t bm_all_data[RT_MAX_PLAIN_LENGTH+RT_EXTRA];
+    uint8_t *bm_data;
+    uint16_t bm_index;
+    uint16_t bm_read_index;
+    struct _SSL *next;                  /* doubly linked list */
+    struct _SSL *prev;
+    struct _SSL_CTX *ssl_ctx;           /* back reference to a clnt/svr ctx */
+#ifndef CONFIG_SSL_SKELETON_MODE
+    uint16_t session_index;
+    SSL_SESSION *session;
+#endif
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    X509_CTX *x509_ctx;
+#endif
+
+    uint8_t session_id[SSL_SESSION_ID_SIZE]; 
+    uint8_t client_mac[SHA1_SIZE];  /* for HMAC verification */
+    uint8_t server_mac[SHA1_SIZE];  /* for HMAC verification */
+    uint8_t read_sequence[8];       /* 64 bit sequence number */
+    uint8_t write_sequence[8];      /* 64 bit sequence number */
+    uint8_t hmac_header[SSL_RECORD_SIZE];    /* rx hmac */
+};
+
+typedef struct _SSL SSL;
+
+struct _SSL_CTX
+{
+    uint32_t options;
+    uint8_t chain_length;
+    RSA_CTX *rsa_ctx;
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    CA_CERT_CTX *ca_cert_ctx;
+#endif
+    SSL *head;
+    SSL *tail;
+    SSL_CERT certs[CONFIG_SSL_MAX_CERTS];
+#ifndef CONFIG_SSL_SKELETON_MODE
+    uint16_t num_sessions;
+    SSL_SESSION **ssl_sessions;
+#endif
+#ifdef CONFIG_SSL_CTX_MUTEXING
+    SSL_CTX_MUTEX_TYPE mutex;
+#endif
+#ifdef CONFIG_OPENSSL_COMPATIBLE
+    void *bonus_attr;
+#endif
+};
+
+typedef struct _SSL_CTX SSL_CTX;
+
+/* backwards compatibility */
+typedef struct _SSL_CTX SSLCTX;
+
+extern const uint8_t ssl_prot_prefs[NUM_PROTOCOLS];
+
+SSL *ssl_new(SSL_CTX *ssl_ctx, int client_fd);
+void disposable_new(SSL *ssl);
+void disposable_free(SSL *ssl);
+int send_packet(SSL *ssl, uint8_t protocol, 
+        const uint8_t *in, int length);
+int do_svr_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len);
+int do_clnt_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len);
+int process_finished(SSL *ssl, int hs_len);
+int process_sslv23_client_hello(SSL *ssl);
+int send_alert(SSL *ssl, int error_code);
+int send_finished(SSL *ssl);
+int send_certificate(SSL *ssl);
+int basic_read(SSL *ssl, uint8_t **in_data);
+int send_change_cipher_spec(SSL *ssl);
+void finished_digest(SSL *ssl, const char *label, uint8_t *digest);
+void generate_master_secret(SSL *ssl, const uint8_t *premaster_secret);
+void add_packet(SSL *ssl, const uint8_t *pkt, int len);
+int add_cert(SSL_CTX *ssl_ctx, const uint8_t *buf, int len);
+int add_private_key(SSL_CTX *ssl_ctx, SSLObjLoader *ssl_obj);
+void ssl_obj_free(SSLObjLoader *ssl_obj);
+int pkcs8_decode(SSL_CTX *ssl_ctx, SSLObjLoader *ssl_obj, const char *password);
+int pkcs12_decode(SSL_CTX *ssl_ctx, SSLObjLoader *ssl_obj, const char *password);
+int load_key_certs(SSL_CTX *ssl_ctx);
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+int add_cert_auth(SSL_CTX *ssl_ctx, const uint8_t *buf, int len);
+void remove_ca_certs(CA_CERT_CTX *ca_cert_ctx);
+#endif
+#ifdef CONFIG_SSL_ENABLE_CLIENT
+int do_client_connect(SSL *ssl);
+#endif
+
+#ifdef CONFIG_SSL_FULL_MODE
+void DISPLAY_STATE(SSL *ssl, int is_send, uint8_t state, int not_ok);
+void DISPLAY_BYTES(SSL *ssl, const char *format, 
+        const uint8_t *data, int size, ...);
+void DISPLAY_CERT(SSL *ssl, const X509_CTX *x509_ctx);
+void DISPLAY_RSA(SSL *ssl,  const RSA_CTX *rsa_ctx);
+void DISPLAY_ALERT(SSL *ssl, int alert);
+#else
+#define DISPLAY_STATE(A,B,C,D)
+#define DISPLAY_CERT(A,B)
+#define DISPLAY_RSA(A,B)
+#define DISPLAY_ALERT(A, B)
+#ifdef WIN32
+void DISPLAY_BYTES(SSL *ssl, const char *format,/* win32 has no variadic macros */
+        const uint8_t *data, int size, ...);
+#else
+#define DISPLAY_BYTES(A,B,C,D,...)
+#endif
+#endif
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+int process_certificate(SSL *ssl, X509_CTX **x509_ctx);
+#endif
+
+SSL_SESSION *ssl_session_update(int max_sessions, 
+        SSL_SESSION *ssl_sessions[], SSL *ssl,
+        const uint8_t *session_id);
+void kill_ssl_session(SSL_SESSION **ssl_sessions, SSL *ssl);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif 
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/tls1_clnt.c b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1_clnt.c
new file mode 100644
index 00000000..91314333
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1_clnt.c
@@ -0,0 +1,386 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <stdio.h>
+
+#include "ssl.h"
+
+#ifdef CONFIG_SSL_ENABLE_CLIENT        /* all commented out if no client */
+
+static int send_client_hello(SSL *ssl);
+static int process_server_hello(SSL *ssl);
+static int process_server_hello_done(SSL *ssl);
+static int send_client_key_xchg(SSL *ssl);
+static int process_cert_req(SSL *ssl);
+static int send_cert_verify(SSL *ssl);
+
+/*
+ * Establish a new SSL connection to an SSL server.
+ */
+EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const
+        uint8_t *session_id, uint8_t sess_id_size)
+{
+    SSL *ssl;
+    int ret;
+
+    SOCKET_BLOCK(client_fd);    /* ensure blocking mode */
+    ssl = ssl_new(ssl_ctx, client_fd);
+
+    if (session_id && ssl_ctx->num_sessions)
+    {
+        if (sess_id_size > SSL_SESSION_ID_SIZE) /* validity check */
+        {
+            ssl_free(ssl);
+            return NULL;
+        }
+
+        memcpy(ssl->session_id, session_id, sess_id_size);
+        ssl->sess_id_size = sess_id_size;
+        SET_SSL_FLAG(SSL_SESSION_RESUME);   /* just flag for later */
+    }
+
+    SET_SSL_FLAG(SSL_IS_CLIENT);
+    ret = do_client_connect(ssl);
+    return ssl;
+}
+
+/*
+ * Process the handshake record.
+ */
+int do_clnt_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
+{
+    int ret = SSL_OK;
+
+    /* To get here the state must be valid */
+    switch (handshake_type)
+    {
+        case HS_SERVER_HELLO:
+            ret = process_server_hello(ssl);
+            break;
+
+        case HS_CERTIFICATE:
+            ret = process_certificate(ssl, &ssl->x509_ctx);
+            break;
+
+        case HS_SERVER_HELLO_DONE:
+            if ((ret = process_server_hello_done(ssl)) == SSL_OK)
+            {
+                if (IS_SET_SSL_FLAG(SSL_HAS_CERT_REQ))
+                {
+                    if ((ret = send_certificate(ssl)) == SSL_OK &&
+                        (ret = send_client_key_xchg(ssl)) == SSL_OK)
+                    {
+                        send_cert_verify(ssl);
+                    }
+                }
+                else
+                {
+                    ret = send_client_key_xchg(ssl);
+                }
+
+                if (ret == SSL_OK && 
+                     (ret = send_change_cipher_spec(ssl)) == SSL_OK)
+                {
+                    ret = send_finished(ssl);
+                }
+            }
+            break;
+
+        case HS_CERT_REQ:
+            ret = process_cert_req(ssl);
+            break;
+
+        case HS_FINISHED:
+            ret = process_finished(ssl, hs_len);
+            disposable_free(ssl);   /* free up some memory */
+            break;
+
+        case HS_HELLO_REQUEST:
+            disposable_new(ssl);
+            ret = do_client_connect(ssl);
+            break;
+    }
+
+    return ret;
+}
+
+/*
+ * Do the handshaking from the beginning.
+ */
+int do_client_connect(SSL *ssl)
+{
+    int ret = SSL_OK;
+
+    send_client_hello(ssl);                 /* send the client hello */
+    ssl->bm_read_index = 0;
+    ssl->next_state = HS_SERVER_HELLO;
+    ssl->hs_status = SSL_NOT_OK;            /* not connected */
+    x509_free(ssl->x509_ctx);
+
+    /* sit in a loop until it all looks good */
+    while (ssl->hs_status != SSL_OK)
+    {
+        ret = basic_read(ssl, NULL);
+        
+        if (ret < SSL_OK)
+        { 
+            if (ret != SSL_ERROR_CONN_LOST)
+            {
+                /* let the server know we are dying and why */
+                if (send_alert(ssl, ret))
+                {
+                    /* something nasty happened, so get rid of it */
+                    kill_ssl_session(ssl->ssl_ctx->ssl_sessions, ssl);
+                }
+            }
+
+            break;
+        }
+    }
+
+    ssl->hs_status = ret;            /* connected? */
+    return ret;
+}
+
+/*
+ * Send the initial client hello.
+ */
+static int send_client_hello(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+    time_t tm = time(NULL);
+    uint8_t *tm_ptr = &buf[6]; /* time will go here */
+    int i, offset;
+
+    buf[0] = HS_CLIENT_HELLO;
+    buf[1] = 0;
+    buf[2] = 0;
+    /* byte 3 is calculated later */
+    buf[4] = 0x03;
+    buf[5] = 0x01;
+
+    /* client random value - spec says that 1st 4 bytes are big endian time */
+    *tm_ptr++ = (uint8_t)(((long)tm & 0xff000000) >> 24);
+    *tm_ptr++ = (uint8_t)(((long)tm & 0x00ff0000) >> 16);
+    *tm_ptr++ = (uint8_t)(((long)tm & 0x0000ff00) >> 8);
+    *tm_ptr++ = (uint8_t)(((long)tm & 0x000000ff));
+    get_random(SSL_RANDOM_SIZE-4, &buf[10]);
+    memcpy(ssl->dc->client_random, &buf[6], SSL_RANDOM_SIZE);
+    offset = 6 + SSL_RANDOM_SIZE;
+
+    /* give session resumption a go */
+    if (IS_SET_SSL_FLAG(SSL_SESSION_RESUME))    /* set initially by user */
+    {
+        buf[offset++] = ssl->sess_id_size;
+        memcpy(&buf[offset], ssl->session_id, ssl->sess_id_size);
+        offset += ssl->sess_id_size;
+        CLR_SSL_FLAG(SSL_SESSION_RESUME);       /* clear so we can set later */
+    }
+    else
+    {
+        /* no session id - because no session resumption just yet */
+        buf[offset++] = 0;
+    }
+
+    buf[offset++] = 0;              /* number of ciphers */
+    buf[offset++] = NUM_PROTOCOLS*2;/* number of ciphers */
+
+    /* put all our supported protocols in our request */
+    for (i = 0; i < NUM_PROTOCOLS; i++)
+    {
+        buf[offset++] = 0;          /* cipher we are using */
+        buf[offset++] = ssl_prot_prefs[i];
+    }
+
+    buf[offset++] = 1;              /* no compression */
+    buf[offset++] = 0;
+    buf[3] = offset - 4;            /* handshake size */
+
+    return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, offset);
+}
+
+/*
+ * Process the server hello.
+ */
+static int process_server_hello(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+    int pkt_size = ssl->bm_index;
+    int version = (buf[4] << 4) + buf[5];
+    int num_sessions = ssl->ssl_ctx->num_sessions;
+    uint8_t sess_id_size;
+    int offset, ret = SSL_OK;
+
+    /* check that we are talking to a TLSv1 server */
+    if (version != 0x31)
+        return SSL_ERROR_INVALID_VERSION;
+
+    /* get the server random value */
+    memcpy(ssl->dc->server_random, &buf[6], SSL_RANDOM_SIZE);
+    offset = 6 + SSL_RANDOM_SIZE; /* skip of session id size */
+    sess_id_size = buf[offset++];
+
+    if (num_sessions)
+    {
+        ssl->session = ssl_session_update(num_sessions,
+                ssl->ssl_ctx->ssl_sessions, ssl, &buf[offset]);
+        memcpy(ssl->session->session_id, &buf[offset], sess_id_size);
+
+        /* pad the rest with 0's */
+        if (sess_id_size < SSL_SESSION_ID_SIZE)
+        {
+            memset(&ssl->session->session_id[sess_id_size], 0,
+                SSL_SESSION_ID_SIZE-sess_id_size);
+        }
+    }
+
+    memcpy(ssl->session_id, &buf[offset], sess_id_size);
+    ssl->sess_id_size = sess_id_size;
+    offset += sess_id_size;
+
+    /* get the real cipher we are using */
+    ssl->cipher = buf[++offset];
+    ssl->next_state = IS_SET_SSL_FLAG(SSL_SESSION_RESUME) ? 
+                                        HS_FINISHED : HS_CERTIFICATE;
+
+    offset++;   // skip the compr
+    PARANOIA_CHECK(pkt_size, offset);
+    ssl->dc->bm_proc_index = offset+1; 
+
+error:
+    return ret;
+}
+
+/**
+ * Process the server hello done message.
+ */
+static int process_server_hello_done(SSL *ssl)
+{
+    ssl->next_state = HS_FINISHED;
+    return SSL_OK;
+}
+
+/*
+ * Send a client key exchange message.
+ */
+static int send_client_key_xchg(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+    uint8_t premaster_secret[SSL_SECRET_SIZE];
+    int enc_secret_size = -1;
+
+    buf[0] = HS_CLIENT_KEY_XCHG;
+    buf[1] = 0;
+
+    premaster_secret[0] = 0x03; /* encode the version number */
+    premaster_secret[1] = 0x01;
+    get_random(SSL_SECRET_SIZE-2, &premaster_secret[2]);
+    DISPLAY_RSA(ssl, ssl->x509_ctx->rsa_ctx);
+
+    /* rsa_ctx->bi_ctx is not thread-safe */
+    SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
+    enc_secret_size = RSA_encrypt(ssl->x509_ctx->rsa_ctx, premaster_secret,
+            SSL_SECRET_SIZE, &buf[6], 0);
+    SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+
+    buf[2] = (enc_secret_size + 2) >> 8;
+    buf[3] = (enc_secret_size + 2) & 0xff;
+    buf[4] = enc_secret_size >> 8;
+    buf[5] = enc_secret_size & 0xff;
+
+    generate_master_secret(ssl, premaster_secret);
+    return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, enc_secret_size+6);
+}
+
+/*
+ * Process the certificate request.
+ */
+static int process_cert_req(SSL *ssl)
+{
+    uint8_t *buf = &ssl->bm_data[ssl->dc->bm_proc_index];
+    int ret = SSL_OK;
+    int offset = (buf[2] << 4) + buf[3];
+    int pkt_size = ssl->bm_index;
+
+    /* don't do any processing - we will send back an RSA certificate anyway */
+    ssl->next_state = HS_SERVER_HELLO_DONE;
+    SET_SSL_FLAG(SSL_HAS_CERT_REQ);
+    ssl->dc->bm_proc_index += offset;
+    PARANOIA_CHECK(pkt_size, offset);
+error:
+    return ret;
+}
+
+/*
+ * Send a certificate verify message.
+ */
+static int send_cert_verify(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+    uint8_t dgst[MD5_SIZE+SHA1_SIZE];
+    RSA_CTX *rsa_ctx = ssl->ssl_ctx->rsa_ctx;
+    int n = 0, ret;
+
+    DISPLAY_RSA(ssl, rsa_ctx);
+
+    buf[0] = HS_CERT_VERIFY;
+    buf[1] = 0;
+
+    finished_digest(ssl, NULL, dgst);   /* calculate the digest */
+
+    /* rsa_ctx->bi_ctx is not thread-safe */
+    if (rsa_ctx)
+    {
+        SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
+        n = RSA_encrypt(rsa_ctx, dgst, sizeof(dgst), &buf[6], 1);
+        SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+
+        if (n == 0)
+        {
+            ret = SSL_ERROR_INVALID_KEY;
+            goto error;
+        }
+    }
+    
+    buf[4] = n >> 8;        /* add the RSA size (not officially documented) */
+    buf[5] = n & 0xff;
+    n += 2;
+    buf[2] = n >> 8;
+    buf[3] = n & 0xff;
+    ret = send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, n+4);
+
+error:
+    return ret;
+}
+
+#endif      /* CONFIG_SSL_ENABLE_CLIENT */
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/tls1_svr.c b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1_svr.c
new file mode 100644
index 00000000..45b9bec6
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/tls1_svr.c
@@ -0,0 +1,476 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "ssl.h"
+
+static const uint8_t g_hello_done[] = { HS_SERVER_HELLO_DONE, 0, 0, 0 };
+
+static int process_client_hello(SSL *ssl);
+static int send_server_hello_sequence(SSL *ssl);
+static int send_server_hello(SSL *ssl);
+static int send_server_hello_done(SSL *ssl);
+static int process_client_key_xchg(SSL *ssl);
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+static int send_certificate_request(SSL *ssl);
+static int process_cert_verify(SSL *ssl);
+#endif
+
+/*
+ * Establish a new SSL connection to an SSL client.
+ */
+EXP_FUNC SSL * STDCALL ssl_server_new(SSL_CTX *ssl_ctx, int client_fd)
+{
+    SSL *ssl;
+
+    ssl = ssl_new(ssl_ctx, client_fd);
+    ssl->next_state = HS_CLIENT_HELLO;
+
+#ifdef CONFIG_SSL_FULL_MODE
+    if (ssl_ctx->chain_length == 0)
+        printf("Warning - no server certificate defined\n"); TTY_FLUSH();
+#endif
+
+    return ssl;
+}
+
+/*
+ * Process the handshake record.
+ */
+int do_svr_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
+{
+    int ret = SSL_OK;
+    ssl->hs_status = SSL_NOT_OK;            /* not connected */
+
+    /* To get here the state must be valid */
+    switch (handshake_type)
+    {
+        case HS_CLIENT_HELLO:
+            if ((ret = process_client_hello(ssl)) == SSL_OK)
+                ret = send_server_hello_sequence(ssl);
+            break;
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+        case HS_CERTIFICATE:/* the client sends its cert */
+            ret = process_certificate(ssl, &ssl->x509_ctx);
+
+            if (ret == SSL_OK)    /* verify the cert */
+            { 
+                int cert_res;
+                cert_res = x509_verify(
+                        ssl->ssl_ctx->ca_cert_ctx, ssl->x509_ctx);
+                ret = (cert_res == 0) ? SSL_OK : SSL_X509_ERROR(cert_res);
+            }
+            break;
+
+        case HS_CERT_VERIFY:    
+            ret = process_cert_verify(ssl);
+            add_packet(ssl, buf, hs_len);   /* needs to be done after */
+            break;
+#endif
+        case HS_CLIENT_KEY_XCHG:
+            ret = process_client_key_xchg(ssl);
+            break;
+
+        case HS_FINISHED:
+            ret = process_finished(ssl, hs_len);
+            disposable_free(ssl);   /* free up some memory */
+            break;
+    }
+
+    return ret;
+}
+
+/* 
+ * Process a client hello message.
+ */
+static int process_client_hello(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+    uint8_t *record_buf = ssl->hmac_header;
+    int pkt_size = ssl->bm_index;
+    int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE;
+    int version = (record_buf[1] << 4) + record_buf[2];
+    int ret = SSL_OK;
+    
+    /* should be v3.1 (TLSv1) or better - we'll send in v3.1 mode anyway */
+    if (version < 0x31) 
+    {
+        ret = SSL_ERROR_INVALID_VERSION;
+        ssl_display_error(ret);
+        goto error;
+    }
+
+    memcpy(ssl->dc->client_random, &buf[6], SSL_RANDOM_SIZE);
+
+    /* process the session id */
+    id_len = buf[offset++];
+    if (id_len > SSL_SESSION_ID_SIZE)
+    {
+        return SSL_ERROR_INVALID_SESSION;
+    }
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    ssl->session = ssl_session_update(ssl->ssl_ctx->num_sessions,
+            ssl->ssl_ctx->ssl_sessions, ssl, id_len ? &buf[offset] : NULL);
+#endif
+
+    offset += id_len;
+    cs_len = (buf[offset]<<8) + buf[offset+1];
+    offset += 3;        /* add 1 due to all cipher suites being 8 bit */
+
+    PARANOIA_CHECK(pkt_size, offset);
+
+    /* work out what cipher suite we are going to use */
+    for (j = 0; j < NUM_PROTOCOLS; j++)
+    {
+        for (i = 0; i < cs_len; i += 2)
+        {
+            if (ssl_prot_prefs[j] == buf[offset+i])   /* got a match? */
+            {
+                ssl->cipher = ssl_prot_prefs[j];
+                goto do_state;
+            }
+        }
+    }
+
+    /* ouch! protocol is not supported */
+    ret = SSL_ERROR_NO_CIPHER;
+
+do_state:
+error:
+    return ret;
+}
+
+#ifdef CONFIG_SSL_ENABLE_V23_HANDSHAKE
+/*
+ * Some browsers use a hybrid SSLv2 "client hello" 
+ */
+int process_sslv23_client_hello(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+    int bytes_needed = ((buf[0] & 0x7f) << 8) + buf[1];
+    int version = (buf[3] << 4) + buf[4];
+    int ret = SSL_OK;
+
+    /* we have already read 3 extra bytes so far */
+    int read_len = SOCKET_READ(ssl->client_fd, buf, bytes_needed-3);
+    int cs_len = buf[1];
+    int id_len = buf[3];
+    int ch_len = buf[5];
+    int i, j, offset = 8;   /* start at first cipher */
+    int random_offset = 0;
+
+    DISPLAY_BYTES(ssl, "received %d bytes", buf, read_len, read_len);
+    
+    /* should be v3.1 (TLSv1) or better - we'll send in v3.1 mode anyway */
+    if (version < 0x31)
+    {
+        return SSL_ERROR_INVALID_VERSION;
+    }
+
+    add_packet(ssl, buf, read_len);
+
+    /* connection has gone, so die */
+    if (bytes_needed < 0)
+    {
+        return SSL_ERROR_CONN_LOST;
+    }
+
+    /* now work out what cipher suite we are going to use */
+    for (j = 0; j < NUM_PROTOCOLS; j++)
+    {
+        for (i = 0; i < cs_len; i += 3)
+        {
+            if (ssl_prot_prefs[j] == buf[offset+i])
+            {
+                ssl->cipher = ssl_prot_prefs[j];
+                goto server_hello;
+            }
+        }
+    }
+
+    /* ouch! protocol is not supported */
+    ret = SSL_ERROR_NO_CIPHER;
+    goto error;
+
+server_hello:
+    /* get the session id */
+    offset += cs_len - 2;   /* we've gone 2 bytes past the end */
+#ifndef CONFIG_SSL_SKELETON_MODE
+    ssl->session = ssl_session_update(ssl->ssl_ctx->num_sessions,
+            ssl->ssl_ctx->ssl_sessions, ssl, id_len ? &buf[offset] : NULL);
+#endif
+
+    /* get the client random data */
+    offset += id_len;
+
+    /* random can be anywhere between 16 and 32 bytes long - so it is padded
+     * with 0's to the left */
+    if (ch_len == 0x10)
+    {
+        random_offset += 0x10;
+    }
+
+    memcpy(&ssl->dc->client_random[random_offset], &buf[offset], ch_len);
+    ret = send_server_hello_sequence(ssl);
+
+error:
+    return ret;
+}
+#endif
+
+/*
+ * Send the entire server hello sequence
+ */
+static int send_server_hello_sequence(SSL *ssl)
+{
+    int ret;
+
+    if ((ret = send_server_hello(ssl)) == SSL_OK)
+    {
+#ifndef CONFIG_SSL_SKELETON_MODE
+        /* resume handshake? */
+        if (IS_SET_SSL_FLAG(SSL_SESSION_RESUME))
+        {
+            if ((ret = send_change_cipher_spec(ssl)) == SSL_OK)
+            {
+                ret = send_finished(ssl);
+                ssl->next_state = HS_FINISHED;
+            }
+        }
+        else 
+#endif
+        if ((ret = send_certificate(ssl)) == SSL_OK)
+        {
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+            /* ask the client for its certificate */
+            if (IS_SET_SSL_FLAG(SSL_CLIENT_AUTHENTICATION))
+            {
+                if ((ret = send_certificate_request(ssl)) == SSL_OK)
+                {
+                    ret = send_server_hello_done(ssl);
+                    ssl->next_state = HS_CERTIFICATE;
+                }
+            }
+            else
+#endif
+            {
+                ret = send_server_hello_done(ssl);
+                ssl->next_state = HS_CLIENT_KEY_XCHG;
+            }
+        }
+    }
+
+    return ret;
+}
+
+/*
+ * Send a server hello message.
+ */
+static int send_server_hello(SSL *ssl)
+{
+    uint8_t *buf = ssl->bm_data;
+    int offset = 0;
+
+    buf[0] = HS_SERVER_HELLO;
+    buf[1] = 0;
+    buf[2] = 0;
+    /* byte 3 is calculated later */
+    buf[4] = 0x03;
+    buf[5] = 0x01;
+
+    /* server random value */
+    get_random(SSL_RANDOM_SIZE, &buf[6]);
+    memcpy(ssl->dc->server_random, &buf[6], SSL_RANDOM_SIZE);
+    offset = 6 + SSL_RANDOM_SIZE;
+
+#ifndef CONFIG_SSL_SKELETON_MODE
+    if (IS_SET_SSL_FLAG(SSL_SESSION_RESUME))
+    {
+        /* retrieve id from session cache */
+        buf[offset++] = SSL_SESSION_ID_SIZE;
+        memcpy(&buf[offset], ssl->session->session_id, SSL_SESSION_ID_SIZE);
+        memcpy(ssl->session_id, ssl->session->session_id, SSL_SESSION_ID_SIZE);
+        ssl->sess_id_size = SSL_SESSION_ID_SIZE;
+        offset += SSL_SESSION_ID_SIZE;
+    }
+    else    /* generate our own session id */
+#endif
+    {
+#ifndef CONFIG_SSL_SKELETON_MODE
+        buf[offset++] = SSL_SESSION_ID_SIZE;
+        get_random(SSL_SESSION_ID_SIZE, &buf[offset]);
+        memcpy(ssl->session_id, &buf[offset], SSL_SESSION_ID_SIZE);
+        ssl->sess_id_size = SSL_SESSION_ID_SIZE;
+
+        /* store id in session cache */
+        if (ssl->ssl_ctx->num_sessions)
+        {
+            memcpy(ssl->session->session_id, 
+                    ssl->session_id, SSL_SESSION_ID_SIZE);
+        }
+
+        offset += SSL_SESSION_ID_SIZE;
+#else
+        buf[offset++] = 0;  /* don't bother with session id in skelton mode */
+#endif
+    }
+
+    buf[offset++] = 0;      /* cipher we are using */
+    buf[offset++] = ssl->cipher;
+    buf[offset++] = 0;      /* no compression */
+    buf[3] = offset - 4;    /* handshake size */
+    return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, NULL, offset);
+}
+
+/*
+ * Send the server hello done message.
+ */
+static int send_server_hello_done(SSL *ssl)
+{
+    return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, 
+                            g_hello_done, sizeof(g_hello_done));
+}
+
+/*
+ * Pull apart a client key exchange message. Decrypt the pre-master key (using
+ * our RSA private key) and then work out the master key. Initialise the
+ * ciphers.
+ */
+static int process_client_key_xchg(SSL *ssl)
+{
+    uint8_t *buf = &ssl->bm_data[ssl->dc->bm_proc_index];
+    int pkt_size = ssl->bm_index;
+    int premaster_size, secret_length = (buf[2] << 8) + buf[3];
+    uint8_t premaster_secret[MAX_KEY_BYTE_SIZE];
+    RSA_CTX *rsa_ctx = ssl->ssl_ctx->rsa_ctx;
+    int offset = 4;
+    int ret = SSL_OK;
+    
+    if (rsa_ctx == NULL)
+    {
+        ret = SSL_ERROR_NO_CERT_DEFINED;
+        goto error;
+    }
+
+    /* is there an extra size field? */
+    if ((secret_length - 2) == rsa_ctx->num_octets)
+        offset += 2;
+
+    PARANOIA_CHECK(pkt_size, rsa_ctx->num_octets+offset);
+
+    /* rsa_ctx->bi_ctx is not thread-safe */
+    SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
+    premaster_size = RSA_decrypt(rsa_ctx, &buf[offset], premaster_secret, 1);
+    SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+
+    if (premaster_size != SSL_SECRET_SIZE || 
+            premaster_secret[0] != 0x03 ||  /* check version is 3.1 (TLS) */
+            premaster_secret[1] != 0x01)
+    {
+        /* guard against a Bleichenbacher attack */
+        memset(premaster_secret, 0, SSL_SECRET_SIZE);
+        /* and continue - will die eventually when checking the mac */
+    }
+
+#if 0
+    print_blob("pre-master", premaster_secret, SSL_SECRET_SIZE);
+#endif
+
+    generate_master_secret(ssl, premaster_secret);
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+    ssl->next_state = IS_SET_SSL_FLAG(SSL_CLIENT_AUTHENTICATION) ?  
+                                            HS_CERT_VERIFY : HS_FINISHED;
+#else
+    ssl->next_state = HS_FINISHED; 
+#endif
+error:
+    ssl->dc->bm_proc_index += rsa_ctx->num_octets+offset;
+    return ret;
+}
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+static const uint8_t g_cert_request[] = { HS_CERT_REQ, 0, 0, 4, 1, 0, 0, 0 };
+
+/*
+ * Send the certificate request message.
+ */
+static int send_certificate_request(SSL *ssl)
+{
+    return send_packet(ssl, PT_HANDSHAKE_PROTOCOL, 
+            g_cert_request, sizeof(g_cert_request));
+}
+
+/*
+ * Ensure the client has the private key by first decrypting the packet and
+ * then checking the packet digests.
+ */
+static int process_cert_verify(SSL *ssl)
+{
+    uint8_t *buf = &ssl->bm_data[ssl->dc->bm_proc_index];
+    int pkt_size = ssl->bm_index;
+    uint8_t dgst_buf[MAX_KEY_BYTE_SIZE];
+    uint8_t dgst[MD5_SIZE+SHA1_SIZE];
+    X509_CTX *x509_ctx = ssl->x509_ctx;
+    int ret = SSL_OK;
+    int n;
+
+    PARANOIA_CHECK(pkt_size, x509_ctx->rsa_ctx->num_octets+6);
+    DISPLAY_RSA(ssl, x509_ctx->rsa_ctx);
+
+    /* rsa_ctx->bi_ctx is not thread-safe */
+    SSL_CTX_LOCK(ssl->ssl_ctx->mutex);
+    n = RSA_decrypt(x509_ctx->rsa_ctx, &buf[6], dgst_buf, 0);
+    SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex);
+
+    if (n != SHA1_SIZE + MD5_SIZE)
+    {
+        ret = SSL_ERROR_INVALID_KEY;
+        goto end_cert_vfy;
+    }
+
+    finished_digest(ssl, NULL, dgst);       /* calculate the digest */
+    if (memcmp(dgst_buf, dgst, MD5_SIZE + SHA1_SIZE))
+    {
+        ret = SSL_ERROR_INVALID_KEY;
+    }
+
+end_cert_vfy:
+    ssl->next_state = HS_FINISHED;
+error:
+    return ret;
+}
+
+#endif
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/version.h b/trunk/package/luci/libs/nixio/axTLS/ssl/version.h
new file mode 100644
index 00000000..72260bf1
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/version.h
@@ -0,0 +1 @@
+#define AXTLS_VERSION    "1.2.1"
diff --git a/trunk/package/luci/libs/nixio/axTLS/ssl/x509.c b/trunk/package/luci/libs/nixio/axTLS/ssl/x509.c
new file mode 100644
index 00000000..37db7f4e
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/ssl/x509.c
@@ -0,0 +1,502 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ * 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ *   this list of conditions and the following disclaimer in the documentation 
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this software 
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file x509.c
+ * 
+ * Certificate processing.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "os_port.h"
+#include "crypto_misc.h"
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+/**
+ * Retrieve the signature from a certificate.
+ */
+static const uint8_t *get_signature(const uint8_t *asn1_sig, int *len)
+{
+    int offset = 0;
+    const uint8_t *ptr = NULL;
+
+    if (asn1_next_obj(asn1_sig, &offset, ASN1_SEQUENCE) < 0 || 
+            asn1_skip_obj(asn1_sig, &offset, ASN1_SEQUENCE))
+        goto end_get_sig;
+
+    if (asn1_sig[offset++] != ASN1_OCTET_STRING)
+        goto end_get_sig;
+    *len = get_asn1_length(asn1_sig, &offset);
+    ptr = &asn1_sig[offset];          /* all ok */
+
+end_get_sig:
+    return ptr;
+}
+
+#endif
+
+/**
+ * Construct a new x509 object.
+ * @return 0 if ok. < 0 if there was a problem.
+ */
+int x509_new(const uint8_t *cert, int *len, X509_CTX **ctx)
+{
+    int begin_tbs, end_tbs;
+    int ret = X509_NOT_OK, offset = 0, cert_size = 0;
+    X509_CTX *x509_ctx;
+    BI_CTX *bi_ctx;
+
+    *ctx = (X509_CTX *)calloc(1, sizeof(X509_CTX));
+    x509_ctx = *ctx;
+
+    /* get the certificate size */
+    asn1_skip_obj(cert, &cert_size, ASN1_SEQUENCE); 
+
+    if (asn1_next_obj(cert, &offset, ASN1_SEQUENCE) < 0)
+        goto end_cert;
+
+    begin_tbs = offset;         /* start of the tbs */
+    end_tbs = begin_tbs;        /* work out the end of the tbs */
+    asn1_skip_obj(cert, &end_tbs, ASN1_SEQUENCE);
+
+    if (asn1_next_obj(cert, &offset, ASN1_SEQUENCE) < 0)
+        goto end_cert;
+
+    if (cert[offset] == ASN1_EXPLICIT_TAG)   /* optional version */
+    {
+        if (asn1_version(cert, &offset, x509_ctx))
+            goto end_cert;
+    }
+
+    if (asn1_skip_obj(cert, &offset, ASN1_INTEGER) || /* serial number */ 
+            asn1_next_obj(cert, &offset, ASN1_SEQUENCE) < 0)
+        goto end_cert;
+
+    /* make sure the signature is ok */
+    if (asn1_signature_type(cert, &offset, x509_ctx))
+    {
+        ret = X509_VFY_ERROR_UNSUPPORTED_DIGEST;
+        goto end_cert;
+    }
+
+    if (asn1_name(cert, &offset, x509_ctx->ca_cert_dn) || 
+            asn1_validity(cert, &offset, x509_ctx) ||
+            asn1_name(cert, &offset, x509_ctx->cert_dn) ||
+            asn1_public_key(cert, &offset, x509_ctx))
+        goto end_cert;
+
+    bi_ctx = x509_ctx->rsa_ctx->bi_ctx;
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION /* only care if doing verification */
+    /* use the appropriate signature algorithm (SHA1/MD5/MD2) */
+    if (x509_ctx->sig_type == SIG_TYPE_MD5)
+    {
+        MD5_CTX md5_ctx;
+        uint8_t md5_dgst[MD5_SIZE];
+        MD5_Init(&md5_ctx);
+        MD5_Update(&md5_ctx, &cert[begin_tbs], end_tbs-begin_tbs);
+        MD5_Final(md5_dgst, &md5_ctx);
+        x509_ctx->digest = bi_import(bi_ctx, md5_dgst, MD5_SIZE);
+    }
+    else if (x509_ctx->sig_type == SIG_TYPE_SHA1)
+    {
+        SHA1_CTX sha_ctx;
+        uint8_t sha_dgst[SHA1_SIZE];
+        SHA1_Init(&sha_ctx);
+        SHA1_Update(&sha_ctx, &cert[begin_tbs], end_tbs-begin_tbs);
+        SHA1_Final(sha_dgst, &sha_ctx);
+        x509_ctx->digest = bi_import(bi_ctx, sha_dgst, SHA1_SIZE);
+    }
+    else if (x509_ctx->sig_type == SIG_TYPE_MD2)
+    {
+        MD2_CTX md2_ctx;
+        uint8_t md2_dgst[MD2_SIZE];
+        MD2_Init(&md2_ctx);
+        MD2_Update(&md2_ctx, &cert[begin_tbs], end_tbs-begin_tbs);
+        MD2_Final(md2_dgst, &md2_ctx);
+        x509_ctx->digest = bi_import(bi_ctx, md2_dgst, MD2_SIZE);
+    }
+
+    offset = end_tbs;   /* skip the v3 data */
+    if (asn1_skip_obj(cert, &offset, ASN1_SEQUENCE) || 
+            asn1_signature(cert, &offset, x509_ctx))
+        goto end_cert;
+#endif
+
+    if (len)
+    {
+        *len = cert_size;
+    }
+
+    ret = X509_OK;
+end_cert:
+
+#ifdef CONFIG_SSL_FULL_MODE
+    if (ret)
+    {
+        printf("Error: Invalid X509 ASN.1 file\n");
+    }
+#endif
+
+    return ret;
+}
+
+/**
+ * Free an X.509 object's resources.
+ */
+void x509_free(X509_CTX *x509_ctx)
+{
+    X509_CTX *next;
+    int i;
+
+    if (x509_ctx == NULL)       /* if already null, then don't bother */
+        return;
+
+    for (i = 0; i < X509_NUM_DN_TYPES; i++)
+    {
+        free(x509_ctx->ca_cert_dn[i]);
+        free(x509_ctx->cert_dn[i]);
+    }
+
+    free(x509_ctx->signature);
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION 
+    if (x509_ctx->digest)
+    {
+        bi_free(x509_ctx->rsa_ctx->bi_ctx, x509_ctx->digest);
+    }
+#endif
+
+    RSA_free(x509_ctx->rsa_ctx);
+
+    next = x509_ctx->next;
+    free(x509_ctx);
+    x509_free(next);        /* clear the chain */
+}
+
+#ifdef CONFIG_SSL_CERT_VERIFICATION
+/**
+ * Take a signature and decrypt it.
+ */
+static bigint *sig_verify(BI_CTX *ctx, const uint8_t *sig, int sig_len,
+        bigint *modulus, bigint *pub_exp)
+{
+    int i, size;
+    bigint *decrypted_bi, *dat_bi;
+    bigint *bir = NULL;
+    uint8_t *block = (uint8_t *)alloca(sig_len);
+
+    /* decrypt */
+    dat_bi = bi_import(ctx, sig, sig_len);
+    ctx->mod_offset = BIGINT_M_OFFSET;
+
+    /* convert to a normal block */
+    decrypted_bi = bi_mod_power2(ctx, dat_bi, modulus, pub_exp);
+
+    bi_export(ctx, decrypted_bi, block, sig_len);
+    ctx->mod_offset = BIGINT_M_OFFSET;
+
+    i = 10; /* start at the first possible non-padded byte */
+    while (block[i++] && i < sig_len);
+    size = sig_len - i;
+
+    /* get only the bit we want */
+    if (size > 0)
+    {
+        int len;
+        const uint8_t *sig_ptr = get_signature(&block[i], &len);
+
+        if (sig_ptr)
+        {
+            bir = bi_import(ctx, sig_ptr, len);
+        }
+    }
+
+    /* save a few bytes of memory */
+    bi_clear_cache(ctx);
+    return bir;
+}
+
+/**
+ * Do some basic checks on the certificate chain.
+ *
+ * Certificate verification consists of a number of checks:
+ * - The date of the certificate is after the start date.
+ * - The date of the certificate is before the finish date.
+ * - A root certificate exists in the certificate store.
+ * - That the certificate(s) are not self-signed.
+ * - The certificate chain is valid.
+ * - The signature of the certificate is valid.
+ */
+int x509_verify(const CA_CERT_CTX *ca_cert_ctx, const X509_CTX *cert) 
+{
+    int ret = X509_OK, i = 0;
+    bigint *cert_sig;
+    X509_CTX *next_cert = NULL;
+    BI_CTX *ctx = NULL;
+    bigint *mod = NULL, *expn = NULL;
+    int match_ca_cert = 0;
+    struct timeval tv;
+    uint8_t is_self_signed = 0;
+
+    if (cert == NULL)
+    {
+        ret = X509_VFY_ERROR_NO_TRUSTED_CERT;       
+        goto end_verify;
+    }
+
+    /* a self-signed certificate that is not in the CA store - use this 
+       to check the signature */
+    if (asn1_compare_dn(cert->ca_cert_dn, cert->cert_dn) == 0)
+    {
+        is_self_signed = 1;
+        ctx = cert->rsa_ctx->bi_ctx;
+        mod = cert->rsa_ctx->m;
+        expn = cert->rsa_ctx->e;
+    }
+
+    gettimeofday(&tv, NULL);
+
+    /* check the not before date */
+    if (tv.tv_sec < cert->not_before)
+    {
+        ret = X509_VFY_ERROR_NOT_YET_VALID;
+        goto end_verify;
+    }
+
+    /* check the not after date */
+    if (tv.tv_sec > cert->not_after)
+    {
+        ret = X509_VFY_ERROR_EXPIRED;
+        goto end_verify;
+    }
+
+    next_cert = cert->next;
+
+    /* last cert in the chain - look for a trusted cert */
+    if (next_cert == NULL)
+    {
+       if (ca_cert_ctx != NULL) 
+       {
+            /* go thu the CA store */
+           while (i < CONFIG_X509_MAX_CA_CERTS && ca_cert_ctx->cert[i])
+            {
+                if (asn1_compare_dn(cert->ca_cert_dn,
+                                            ca_cert_ctx->cert[i]->cert_dn) == 0)
+                {
+                    /* use this CA certificate for signature verification */
+                    match_ca_cert = 1;
+                    ctx = ca_cert_ctx->cert[i]->rsa_ctx->bi_ctx;
+                    mod = ca_cert_ctx->cert[i]->rsa_ctx->m;
+                    expn = ca_cert_ctx->cert[i]->rsa_ctx->e;
+                    break;
+                }
+
+                i++;
+            }
+        }
+
+       /* couldn't find a trusted cert (& let self-signed errors be returned) */
+        if (!match_ca_cert && !is_self_signed)
+        {
+            ret = X509_VFY_ERROR_NO_TRUSTED_CERT;       
+            goto end_verify;
+        }
+    }
+    else if (asn1_compare_dn(cert->ca_cert_dn, next_cert->cert_dn) != 0)
+    {
+        /* check the chain */
+        ret = X509_VFY_ERROR_INVALID_CHAIN;
+        goto end_verify;
+    }
+    else /* use the next certificate in the chain for signature verify */
+    {
+        ctx = next_cert->rsa_ctx->bi_ctx;
+        mod = next_cert->rsa_ctx->m;
+        expn = next_cert->rsa_ctx->e;
+    }
+
+    /* cert is self signed */
+    if (!match_ca_cert && is_self_signed)
+    {
+        ret = X509_VFY_ERROR_SELF_SIGNED;
+        goto end_verify;
+    }
+
+    /* check the signature */
+    cert_sig = sig_verify(ctx, cert->signature, cert->sig_len, 
+                        bi_clone(ctx, mod), bi_clone(ctx, expn));
+
+    if (cert_sig && cert->digest)
+    {
+        if (bi_compare(cert_sig, cert->digest) != 0)
+            ret = X509_VFY_ERROR_BAD_SIGNATURE;
+
+
+        bi_free(ctx, cert_sig);
+    }
+    else
+    {
+        ret = X509_VFY_ERROR_BAD_SIGNATURE;
+    }
+
+    if (ret)
+        goto end_verify;
+
+    /* go down the certificate chain using recursion. */
+    if (next_cert != NULL)
+    {
+        ret = x509_verify(ca_cert_ctx, next_cert);
+    }
+
+end_verify:
+    return ret;
+}
+#endif
+
+#if defined (CONFIG_SSL_FULL_MODE)
+/**
+ * Used for diagnostics.
+ */
+static const char *not_part_of_cert = "<Not Part Of Certificate>";
+void x509_print(const X509_CTX *cert, CA_CERT_CTX *ca_cert_ctx) 
+{
+    if (cert == NULL)
+        return;
+
+    printf("=== CERTIFICATE ISSUED TO ===\n");
+    printf("Common Name (CN):\t\t");
+    printf("%s\n", cert->cert_dn[X509_COMMON_NAME] ?
+                    cert->cert_dn[X509_COMMON_NAME] : not_part_of_cert);
+
+    printf("Organization (O):\t\t");
+    printf("%s\n", cert->cert_dn[X509_ORGANIZATION] ?
+        cert->cert_dn[X509_ORGANIZATION] : not_part_of_cert);
+
+    printf("Organizational Unit (OU):\t");
+    printf("%s\n", cert->cert_dn[X509_ORGANIZATIONAL_UNIT] ?
+        cert->cert_dn[X509_ORGANIZATIONAL_UNIT] : not_part_of_cert);
+
+    printf("=== CERTIFICATE ISSUED BY ===\n");
+    printf("Common Name (CN):\t\t");
+    printf("%s\n", cert->ca_cert_dn[X509_COMMON_NAME] ?
+                    cert->ca_cert_dn[X509_COMMON_NAME] : not_part_of_cert);
+
+    printf("Organization (O):\t\t");
+    printf("%s\n", cert->ca_cert_dn[X509_ORGANIZATION] ?
+        cert->ca_cert_dn[X509_ORGANIZATION] : not_part_of_cert);
+
+    printf("Organizational Unit (OU):\t");
+    printf("%s\n", cert->ca_cert_dn[X509_ORGANIZATIONAL_UNIT] ?
+        cert->ca_cert_dn[X509_ORGANIZATIONAL_UNIT] : not_part_of_cert);
+
+    printf("Not Before:\t\t\t%s", ctime(&cert->not_before));
+    printf("Not After:\t\t\t%s", ctime(&cert->not_after));
+    printf("RSA bitsize:\t\t\t%d\n", cert->rsa_ctx->num_octets*8);
+    printf("Sig Type:\t\t\t");
+    switch (cert->sig_type)
+    {
+        case SIG_TYPE_MD5:
+            printf("MD5\n");
+            break;
+        case SIG_TYPE_SHA1:
+            printf("SHA1\n");
+            break;
+        case SIG_TYPE_MD2:
+            printf("MD2\n");
+            break;
+        default:
+            printf("Unrecognized: %d\n", cert->sig_type);
+            break;
+    }
+
+    if (ca_cert_ctx)
+    {
+        printf("Verify:\t\t\t\t%s\n",
+                x509_display_error(x509_verify(ca_cert_ctx, cert)));
+    }
+
+#if 0
+    print_blob("Signature", cert->signature, cert->sig_len);
+    bi_print("Modulus", cert->rsa_ctx->m);
+    bi_print("Pub Exp", cert->rsa_ctx->e);
+#endif
+
+    if (ca_cert_ctx)
+    {
+        x509_print(cert->next, ca_cert_ctx);
+    }
+
+    TTY_FLUSH();
+}
+
+const char * x509_display_error(int error)
+{
+    switch (error)
+    {
+        case X509_OK:
+            return "Certificate verify successful";
+
+        case X509_NOT_OK:
+            return "X509 not ok";
+
+        case X509_VFY_ERROR_NO_TRUSTED_CERT:
+            return "No trusted cert is available";
+
+        case X509_VFY_ERROR_BAD_SIGNATURE:
+            return "Bad signature";
+
+        case X509_VFY_ERROR_NOT_YET_VALID:
+            return "Cert is not yet valid";
+
+        case X509_VFY_ERROR_EXPIRED:
+            return "Cert has expired";
+
+        case X509_VFY_ERROR_SELF_SIGNED:
+            return "Cert is self-signed";
+
+        case X509_VFY_ERROR_INVALID_CHAIN:
+            return "Chain is invalid (check order of certs)";
+
+        case X509_VFY_ERROR_UNSUPPORTED_DIGEST:
+            return "Unsupported digest";
+
+        case X509_INVALID_PRIV_KEY:
+            return "Invalid private key";
+
+        default:
+            return "Unknown";
+    }
+}
+#endif      /* CONFIG_SSL_FULL_MODE */
+
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/favicon.ico b/trunk/package/luci/libs/nixio/axTLS/www/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9f6f30e4c6de09f2e93be5e3cbde8a97850b1989
GIT binary patch
literal 22486
zcmeHu30zf2nr~sceZHA_-90^TmN&28Jk8Qcr;~KLlTO^lBt}i5G10h0RE&xU3Kv;K
z5JYwq1!TJ*!ezg*URf{uWl>gTQ2|8(#Rd0WP}KkX*TEZUC+SY+b-$VSn-qMv>YP)j
z>Z`BnRMo$}?-RmAj23UcDHx9t+MftvA%qw^_Q~}aA%5~xA%6C=;cLqu3sLZo;z|Co
zLi>^s|MI_#`FYKJ2j4U1A1f?>B!ta;AzopbtU{QRWIZx?{FM?7|Cl^Y0}vh_9=zef
zSosyby}jgVtk7sQ!ra_kco=wX&a{Vyl{4#DbD=R9gsG-in3Lqq-d<DDt1)NVoL3}M
z59ap}rhI3thk^MF!h@vgg)sCo_7K8gknfFUUe@JdDhwKyVKC=CmO~ml)?ApH@|u}@
z4Sb>3gZD`0B%u*xK$x0q$fJh5YsfF_A+H*ep|@8I4h{-uXJ_H>?=SlM`$b({o#^cB
z6k4rT==FM`R;$Gz+pkhN3tjJ^Xt^;cH2ON0rxhBlPSmw@l9zs=>l|dhK><>5u%2c2
z3q${)P&unuzDjto{9v^|%h9qftqAtl@tWmpTZG=wA`G3qthZO_T4Y%_gueHNs3U1v
zuAb!>SZ^oES;ewE{Dpt8KV!8}S!!4g+c!%qoXL~QQY$>1wL-0t{4vdX{8^7irx*Tg
zd$88Pb{T{^xK5~bEkaw@!ZwpyT7=HfDRgz6LNAH!GLTv*3x9nt^Yscn`Ku$T4gI2p
z?dznxdP#cnTh~vXTgWSAR7Za6$ZIc2rLrVH&Xj|PaQ5&Jv&Q=iOUq!UgDHn#VYyf>
zELCdCOii8`Q{EblTFiP=BP`ixmTaHOSwk6W*cT)X+iI#6mTa&2Vz!rLDcenQmTmW^
zeARq5OUL)vcD7$FNkh`=gjS~$ix=zpo}Tj33lEZ|C1pdhR5A9@vu_x)57m-nA8GVL
zOHykoN0OGLraX0$^z3VrzrTUc3@o29<*PSP)|xuXo20AbI3{sysr4;<PPvnGl)Ii}
zAO-6?`K*)Ul4FnZZ=vk99HT9icPGcGu8!l0W265@ztB+L2FkmI)Gz7A4UQYio@1qx
z<M{@ut{)sP5Ez88bT$|NBrL_)F_vQ9JWFA2Y00*doJr;?jv1AhWy(IXbmsVyedWxt
zMe=tRKZHLn0h9kXVf^^<tVq&#3ga)19zALN)k%}CD({($AAj|t5{56IDT9TNKAbmg
z^5nylr%d9-_(`L?Cm){1Fxf@9A@e_dbNt0glSa2qH8qWno;rCn(=OAdnnq8Q!NPRR
z;VF|QU6eV<!9|7XtD`4Ro-(Cv%)|*3Oxs*0GxNkz6DCY}k73?~3DHxhO>3JxEpO`7
zytXM9CC{T>rjD6*c-qv7t5;7PGiHy>{N6kn<nMbEMzI=;iK9l1vY0w~()iJnr`1li
z_}tcI%*6M`L{AtsO6Cm?mW9g@9L#$7N_2Fz>6lvP@18nw;+hGgX8HwrxB0mwu37!r
zy!Upmed`O|oH>T7DnsI$;Lj#Z9K(jYOqnue^u_VrWBB%j;CY`P4qCNp>wEVn+#h;t
zPV?f$i#KgL>FT=0&D(S^Ji2z)@maInyl4B5A3tU4gn7FUga!xS%~=(+bkvag!Gd4>
zV$;d4cY4gsmM!aBabb$uYEIJ<*S<ctS>636CV5Grp)=bv*G5K!yIuLxGVE4Z^Dj2N
z^Nx?tj*rfrI~O?D%vYP$v%<Hp&wJ~vNgtb-*yOCUnYE<yiw%~kR@p_duisWJ{>7#f
z+y2&P$GLOn<{zE$@hvV}(zq`2a~sFQM?A)lUovxJr~8-fUo0#w*6X#&v0?VD+nD`t
zFMV|G{Xp}}@A&w(RZX}b9K3qM#ON{8rd;ee)al;g>^fu797AJS>4r2-OY636+k7r9
zJNN#lfggReWBI!k>fO;15uZPvFk#f5+U{dB+Gljk=-9Y1*Df<-{elJMGrCUr_?-L5
z{QXZqUHQ@b0q3_qNC{7f3y&CMI)CEC=sf2|b}E&f!=mb3)q(}7v0)9ao@SKH`|r#A
z@4vr%dt+E^vQ<h-_<_Td>!*&%TeKl<!G|Ayn7tr7`@^hcE35KjW?p8?mIto<^xCzZ
zUoBrTw{3rMu|7H0Dk@^_%+XV(G^^6JR>{n0#T7igbpH}}_qhSfmVf%y2iJFfu=D&}
zzh1|tw--C<v*J?KZ#mAs>gn04T5oM_t+g(;E}hd*`r+a)y_PRuzEbAjwS2B`Vs!2C
z%{5ClH#wCS?0YM6_Nh~zo+ppmXQ=FE9Gc;<FF&^E%MVs8|MY`ZAME;I``lGccSc3$
zxpYsSW|}x{N!fyknFkNeICko!!_hALR_6|fqWpqVw_`15wtw)!2djJs?Jh1HoIt^w
zMvvNU(RTJ?|K`y#F){0sGAw7fo3*yusY>$GDqI`7%$R>w&{}o&)~2C}A##xK4xc(&
znGNR8x0oMeS+FqoV2izdc2R0+d-LL+xhpPQ@SDBvix1nEY=|BcZECtVA@yy3z~etL
z0W2&m5(+oO$4C9Hq`)fu?egYRbLXz`_4b%vXQL@~b&Aido7^_7G;87TByscRz`Rir
zsg!VXY^+sr*`k({US3~%&%VkTp(*~uhQ-AnsxqQ1vy$H)&Tm16a8I35tSu-^U-(5v
z&QG14J7)EdpFW+>{VRW0=+sbHP*9M(e)e#F{(gLR^2~5`>06d>g-66B+2lE%zWT|>
z%ztD2C#Qd^Td=-i!+Lf2tgo}n#KlQVXWA^C<TBdBqkGDTnTbrfR5mSfbe#RK=1NM7
zpU<=5#`N(QmrnY`#N-o_F-(`U-IFk4-jk0%=I!b7kumRgh(DhG9WwoUW%=W)+Ye8P
zeI)$hzW%$#KS=D4OW?c8(U?!-)UhN}($_fkN4ziw6JtW@Bko&?1G!%wiA^O|l(<sj
zMj_0Hai^x2dw-!|%CV*rSMp*kpOGY<RB)v5AkOpn8b6v7KlY9_C|Fg&wjR9-zV$Ht
zA(oWb(TF7_u9O&3Vo8Y$CAO4!N#Z++8U2HUiILRABNCrTJW;1$DTy^Dew29Ah${!V
zmzVo_1&=<#m6qn*v$M_4&cSTEn&qj7ag$0T7E6pYkN8NE5hF3yXtcyBTH=>soMg_r
zoy~Q`LBym_Fp|VQ8e$%edKfe6h-nOU65G@fC)N=I5xWq>NbDl<qr@)~yJ(1A6#T+=
z2J0!8C%93;x9k^*V<g5kbPi+3PU06W+iJwP5;xWnw^*vo$&aOiA0<waxcAMU5t|U7
zNQ~kv@d;`1Jda^)Nqp%~Ir#f~i1GjA&v*TaXZ$G_67jMJ`$1x6e`0Wn!_8+Adzw>b
zl-s;l)MDN&%1vTXb2al*jwBC>M<r?0#DF9%pU)%yTueMlT<Y&n3Vw=9wOZm;%6u{9
zt&&7+>Opy1S~5*i@TrRU)cFZc_2)T2@GxEtCT3NWG^AiH%NWo8kp1GUBag(fq+l6)
z@E-B3g6o5MPtAMmGX>i+*2%QQxTboxNiS5A=8+cb6};=OV%nK$4?X2a+)4^2Ir}qB
zlGxXo<5W2_;27}N5bKg8{*|~_o+IcD%wx&38fOFfG7u*-<~Wh(3;x8w5(le^gC!Q$
z5(oRMiF--@5)YGfBsFodMiQ~Ho}}ft(v!3tTM{R?kTmKRzC+?z3noeItRrc8UZUZc
zlV=x349ySw-!=R>*6(r8z53#dFOC~$Vlr+V6H4l7xxDw%3k<Ky#49iS_{Tqf;g#pc
zJqgS<ZuLvAc12A7<&u}GULN)Q<jIp=CO`jj)hn;e`SA-~&y9O-#Y-<lESWRvm!sa`
zLnkK}1}DeopC9$hU;gq9mif}lzkL4r#p{-@`}p}O&c1syfAy;cUwjea?E1zlFTJ$-
z)fdOT^oGlO(;VNhnGiSC{Wrb$SFW_Owq9?O6Zpk)?kCrcGnxN}|L@ADdzY>+-t2W@
zVC5RC*KKWo{hHZ93yTL>!RIFoOD+3~8{T|#hSvw?<^z9YWo!Gom6gS@H=dt7>g5+!
zkGruHk01YbK}Tz$_Ne)qHP)}c{rlHnf9-cWO-=ngpC9$|OJ6QJ+J5%8pO<J8_gq_L
zZT-6K?|=XH+i#@@MJI%O{K}k{UntYg`tZZgKASanX4=qN>tCyWZ@=;Puf27>sJk|A
z_isLa?zxp$3T7wG{3u2Lt3#J8Uwchu|IRxb-&$O`eA%+g&2PS+wff<zRbQPsdiu*-
zO$R=;u>SQs@4Pei(YmS6|9HtO>X%nMD4QP{nfrO^s+IQ_HGbM`c8||(rhj0uYt-|j
z+`Qvnr0}-~?3g|;yW&X8r?VFhTD|qwx(&KivxVXDb3U2XV=`g9iG#!Bt#7^=96Yza
zZPCiLmg`<LS(njx_f+Yx3Tt{~A1_(brT)##d9!0eW2=9G4dY~o{<h%M$^04bv-sh#
zVa4&At8cGf@#;8vJ#qZIFP`iB-MQz6ADT>h5|51DeQ_N3vR~hM*JRwp36q{?95>Nq
z0yF$M!oTas$I6HI3r~Ol()>KFX*ebKDLiUd_A17Gis^{Gi5QXQ8{*NUN8-VQhvMPT
zBQZ4ePz*g}n)e<*ek>k80`EOyp2y-5uko1cJ|2q8SFVT)m(Gcb@@A2|r&<)`)ryL`
zdePp~qnu+u#v@VJcv5KM>xCxfptx}UD(e^$TYMeF7H=0}`&FD+yH+b!EYu3mZ8<_y
z)+U;IFNsUnuZj4?GU2gBFMNH|h0WSHu_v@v?9DF_Q8^_dD6T@pmeh;wdn<*_szQ;H
z+aU~RZ;R%O*F?;|8ljHL5J4e+B0hDmh}EQtj`nk+@o<L-ORg20HsuMc6=}lWI$bzf
zWeLCSrK0r21yOSDj%c{~NE{x3C~7_?5~7Pl)b=Lf;jmu>_-Bf;%4!jlRw3fJHtfwh
zAa;i33yY;G!o@X5#2)AtF$XV;obCZp&^sXXr*4RCj;UhVyzRo(B|yZ)M2bT49vPP)
z;<Iu@_#U0u=A10Tg6qV`lXeInO_K=DJttC|?~07>AyM9SN5n<ch=jC!5uctTs_UA>
z-Me>%E;~zjdHD!;4^L58T_eis8-$gGov>ATiS1!oB6M$wh)b_#yZ4KYR$E1iHdmC_
z91?BqC&V4T-`(9U4jecr_U%g(Zd=^M{{7h^DM=&T-L?pO)ka}wV=J7UoJ2xmoXFv`
zl;lKVs3;e=Z{HT}?d{^^$&=#Nty|*i)vKcGWS6pcyl~+H#|Xqjju+>NKUc`WvGx8$
zGx6#BUx*oV7l^Ub=ZdlOXNU!}=Zg7e)5RPaFZf(6`1Et}hSf^3lH>HoyFXV*j@eI0
z(?~MBLHb^0nQ`13ej<(@|A~0`J>DJ9ypu@svyk78tkZUtqgZ3(AjYn=A^&TH!#W#b
zPyRQ^*kPk^u-zzB%=>@CtLe{vE+ozS9(78YO=f<o*_1Gvzw(|pnK$zCI`4g#HVl{W
z?Z0D2$=O)>8MAxTm@y_M0o!*3n(W*a6dYn=GG>em&m7&idTjIb^7ird^S82Izrn^<
zWw+7Z!O>}x^X7k8%EPf0<}1HiwR(*Oml>;%KbbT4(|MnLK7YX%3l}Y3^5vw-Q>IQc
zo&MhYAI$i0=B(Kt{ra`n-}ud&zx~}?Z~y+CcgIhd_`m+;e~%sa{0lF>^vjoD`PHi?
zCO`ez-~RmX{`=qmgULVs)BpJA|2gUx#<k*a{+r29BtN4@J@=y@kNz)XOve1^zy8%<
zo5=3`qhT0J|IsYp_|W*C94l{<%t<C<EPsXYcu9$V`1wHsKS<yQ3H*nUfN_7w{hTpL
zfb;kp$(X_T+<5(LY<&KwV)>rT^K3BQGse$8fA-p#PsYadH{~%t|4YZRZX+Kf>oVSd
z_TI?*+;1!I%6MpK2>0*bSBU$lKe#_K-^jEqTV5OQjjZdN?mhe5n8z58d_FQQd6vO=
zZ)AR%mV9$Rh@PGvoH}(1JZHq6J9of6BQ9OKgv*yNE9rap?kRcYJH{Z}D&MEg3%IYu
z_3PJh?b<b^JQ+*6dGjXZyAK{bfKfI^USurG8_ARL*|Ya$og?!}nM;zqO1{g>%aNU(
zjUv4s_4W0rud72vMFnaO9KeYaCqQjAxCd9>k?+a0yeHp1a^whVYinUJ7*JYTs!&Nu
zi4xb;)S$V!1zlZTN`7NoWEms*k!d4OvYkf$zbTe7lXAIo<%%NXUh+`Mx|5QV5w2E)
z=er0E4Mj*u2+~uvXliIc&*{^+c;&LvAF{6w9XbS_0V5?P1yNB^2o4TLU|=A4K8%2X
z0QmWleEqO%*G@!6Mj$aUQIV09#rgB+m9`lBNAf}CFix`$o^_+IuTSAi@+kXuWP4;A
z<=Bw<8pu~eV<S#<bfAmnR#8@Q@fz0a3)(=z)zuYy*cREg!!0d1z&<G~EJSK*DtU@j
zc-^vP3pQ=q1V=|lI5;?B<Hn5&*>7}&o!v&*JJ|ENBeuA1QQDZEp02dJxVRXVm6eeF
zQ&d!h%*;%rrKMrtzJ18b%0g9D6^<W2u8c(^&vGmi@8Im&vuJ5<Mh44@i`|R7!UB|W
z{FJgxE&ITq@^i4aSIB>R0Agcfk(iKxh|n;~)er9O?%3?SnLIlwygHCadwcS2uY$_X
zma(0}yUI?b+_QJEQ}S)1OuW3jzV4%)J9n~wb}84}wt0fO26%aUVJGiN8P(R-Dg4TB
zNA@{w$&jC)kKDXGXvzD|;2`GrM?wn62*+qbQWAW9{Gd|VBcADy-MiuF;)-qF-q`9!
zIXgN)MfuuE{>YP!Y6EO+Z5eNbjg15BRj$}*<BW~A&ahk0{;=Hyds|0rSZ@tmTN^kz
zFpoWnv6Is#Y$d+|0saWy6@<{;AqeGoRfk6+DLxT-Ik{+RYQzQ3Cvv>YZ!9AtL&@*w
zza3jWec-Uk0bATWk(io^<7Y3R@9sU+A3uqb$_BKb?MKbw7DPlQz{@j`JgMO1sNxv0
zB`+J{=;Q&9tx@pwjEAp(8UnWOM_5P+c_=_+coCBJ79b_I7;!QA2#-!;`+Z?=vmTD@
zE6KaBuQxRDdpTd^qptQKT3Zg2nsM~#F?4peqpRmQ&YbO4#*gH`t*uS@hUA#`*t!k=
zK7nxFL^*Aw4B78)e*Vx^RHOIC0J^T+LD%&=sA@S1m8~6A8*Jh1v>7TZ6>P0G!NW5a
zp}UI7S1tCWG((-*ggxoa*qhmcJ-TKjlyo4crVH5y(t#7mZ|Fip%X!4aM8Rq$$ED?V
z><SD+ZcYvwnvSBXu?+_f9Yf=h6DU1+6pcrFaq8?P^qs#<*$?7A$IsEDM>(calyB08
z<I>J$E0WXnaB}y9o$UtLZP<WStE~}}kcH#@_i*M0-|0Bb@6H=m7F%I9KL9f)yTaNo
z0WJ|$@QkiORBkikN;{w~?0}}Y8(EcSk#qPevRbboqvHy4j$A`^`*j>Vc?Hequc7@!
z7c4&w#EO|2*d0=g?EGrz%R7-<ejMd>eW*U%kK)=6)U|e_x%DLHpldv;8eSvPbvcNR
zi-)tjheEMh9kR*}!7nTwp6-$G_6&yGmLS;L>_&cFCr%9BLsiFd*jvS6`mg=*&!g61
z<^+EP#y7$xtOlXF79>@i!rrQrP?uf6p7OKMAGw3<uDjUNauc!5H?Ws+@yS7yAMZ!z
zvGX|GeFl#6_F?U`V(9Yv&~W@RTDz{o&~y&fZGAY<ei~J6?5krZaQ5N_3_Tk9dd&-u
z)nZR#CIZ7^5fz_?x|ZYEUw#-7d-D<Kn*pD#`}oZzV$~uo7R`*uCZ|eRt}nsN-^Jq9
zG28Gjf4v%R9{UlJ(E?9RGs1F?Ah@6dZt-W~xcfZ9i_RkN$bG~dy^V-t_pq=19+KJz
zk=Jz(x`X}D)Lg}(-hS-dn1@KuDio9-LSlLuc8A5oZ$~Ix`AvqUCLzC|9K~f-DC0NL
z+<p{;_Xd=8EvK>`G3j}T*A;^{hA3<~hSH;bNH1)LAHTmK?_BJ5D#8v+J-oikhu5+K
z*nF0WMbne<*_(SX>s@aI#u>0Py9EK6UD%y}0{(fuu-tVV8~sjUf6F~&9UDY!=OFf<
z89?!=0i?7KprC62Nd*@XQF;Z3&iA7%zmfAxE}UI9aqi+cwzuNkumO&o$F?{*A%OGe
zZmxxKoUe<xmY+Cr9M`U2Lsm80TTljlV=GEp+mX}If{X)4kyCjTNreZnE2;<~yYvW;
z%tuUe8T%w3e%tclvS}YSm?y!)G66eNYq3+;3g5zR1eKn~j*?!49XJmi$4ze6EhHYj
ziTyqIQQ1F$vfcsg@4S!P_Pfxx-9v6Szk{AWL<i-=VqpXv?Kl>9s^RFm1NK{Yz@2NR
zhnoxMCKt|e&e+B|CY<X{Zf*fuTaQ3f#CajF5!#|w#1}Rq%g~JY;(BBstOs>yh$V&d
zo7fSZ1Mko*xcjHW#yW%RP6kvq``{m1h}ir(?BTZ>T-gnE^*O}W^ds@`HDnyWhvd#X
z$m||K<%NeRzjz<|vjc3?Aad9b1zp!*;9OF6r~{u*+k!Qp#>2)k2rkZvur?>H4T0;n
zK*Yy$Y{#e(ygLZneSNT<b7DwvD6%rMk$$ilJ7Wvs7hVYW5FOkDbK${xdUr}0cI_$T
z*vm(lHV0b+_QQ@cw^eDeX32hhG${eICxvs}C`Ec%J2L7yR*qakR?9`?wp~UJjZ!mD
z-9yHiLFAsfhsyI0P<?R-CFk#AKhwItdnl#s>o43wYH}4mea#>9-_T<5q!^gZ+5?N(
z=~(k|BG$1zDXB#$GgP3io_j~`|5CXZh>eTozA_6zQF(B4p-fk5;jlr6)n930wk!=R
zmZidBa~{^Nr<^zCz;SCfR;)<D(ogd7`THqYK3j|BbD|Nzbt%50g=3`$dO4r8p5wQ9
z4f->;NrNcrA41vX2dKaF5C=(hmj_UObqGc0ZlS8@I;wjwqP(;gYVT}#+v*TtSB|ag
z3^02;3tzmH4YN-)*kBU|JEvf{dxaw*IU6TW_M)Tnm_p(4Rq*o5g7dl*s21+S>W|3V
z)Kn~=oC32C7=N@6%P0pcKC}Hi4K@q*VavKq1iR%!y(0(us#X-Vb)x79_u8i}BLCPG
z>_2`Dg?+bCe&s$4*N1TE_G28o{s?uq9-(!B?O+=!`^bAwKRT{n#u3hs`8hS%pI(Ld
z=n8(vt%%y$2=CQZSW9`WSr(6F3*xbG?ryky#38?k>*<;ExOwLmw1>_kt?@L%v+J;B
zdk*Z@rNZf}bhxfagNs=j92Y0SZIu>2RvB<#oru7#xd;i;W7p0~t_!7DWtk3j@)1<F
zpFv4`A1b<Uq3F~N6!qPJ{_<T^+~692`w@<@4UJ6K-MEX=v)5thyMmV9Yf#4|VrNJ&
zGIEPhdEf|YYCAc97NeYUsjX>+E~6Il;mrtitcKm<61HU@+&q)8%_jsseHRd4cO0pQ
zPC(mmlGKBk18oQ^Y=w{3fQ>$B*t#nZ+xHY>udW_@a;p$qa1g<%6|i6*EM8QMY47fX
zwM9Ovj-AGltAiX5*HL=<25K(eL+gzp9J@6{{vV+6+FcyE`v47Buc5sAJWk#kKzdd!
zKAU3!FAsMF2ZbOjSI7NgGg{l)aj>=tc?JCTBEk@@-iw05QWTdSLZE*MY}O~i$t?o0
z$r;#_U4*@P<%lghh`5r&(AFPAe03XkCRIaS(h7CyG594^WB2}QXb&`VFVKXLcmvj$
z=W_2*jCBi(;OCTw(u$Kv%0G%7+D2qH_M`UvZ5+OS7j3s5;Lwdb=(ux_^1g({U%A0I
zG7o32-Nf#IY^++b1+JSN;p*rLAMR&EcZY&TxCjdk#ug86*g13G9JHMn#DHtJuHY)M
z=lSzDP~UKbW2g@yd&03RI)XBe!uGv;5t5>TXGjV*tkxj0unzl=b|Q;oJ1F}wLMSi4
zm=ZX8k#D<VEM1rf)rt(nhL%8=-wAi0T14zWiGm}SQFrb(T5k`cnR4&CejnWzZ^6?i
z5=$3zAMTiq>ZV@gq}0RSlJnsXVh0x&xNLTTo0~iLzHV@F-Nd=h7wguCAz7P=p6*i^
z9Jv1kVm~%QZS0KVdJ*Z59bo|ojM#zTm{9J`V`2AMK5;-cB6Mkp$SuU~v_|;Fm%}fy
z5>}3xSj#bE&To19mI7pEH6b*y0ekoLAeDQc%ClEc!|~tTe+x&i-bDMkOT?KMuroXX
z-rgx#WxfxoS?#DU?tqt53VcGNph?y!d;PGm-H41(BPLD_7ni+Q`gsz+=Q0co-2EEs
z4-HAoFZV!?INxu<)<8FS1$n|J*c1LC0dP{qz<IeIZjQ-NZQcV1&s11$jKX5GBwklw
zjaeQR&&a@Li!{y`2jLe|f$f?)r1M*<>AixAGna9I@gdGHP2D{>a`GhiT#t~cFGlDd
z&T$qAaNEXjRDTBQT{TcSXy6-_iri8?4sedIuBu02aS1$J3$WzFBJAYaBlnwM<K4%^
z@ubI(9%Gg53aoWlg>_DApmMdrR<CW`(+9$0ej41DmSMs4IJ`eK3ZI#3@Zswk%$<~s
zm9sLiO=UpDcCK;ZdDxxNfViq-ocH@s+|h@!V|{4qJcF(?=Wv7P7&6GZ@7%qE^qf*`
z+?<G&D^d~Qa{!r%{AO$$vD{3HErFSE^-jYYt4OS0$2oIm5$280MWV)_l<|o2eng%}
zh8>}P2#F%zjNFcZV1KyzI#bqbVX-s{HgmGzYt8ZgWd@wS$b+kSKDMpT#7-|A{C%~=
znEMctl!w&%YV14Mh|~jzkW<@+8seKvSFYjV1D?gm^AGYa`Imu`L+`oE*ppO(FU=yb
zd3_n8gX<CO-V8hQa;#rmj1BWkVe>^5zL=f`o7L$!!|&dBCiIv}YvWmvj7Nt198>*Q
zFXBK`17ef1uxiy#tX&$zF`h##kN^i&G<>%uz{-9noV?iP*eFCMCn7o_1<ATxWS3T>
z{nSa^;#hsiJ^B#KyHEZfkRFpB4L!sF_r1Un+D~^Qy}S}W+q1FWCKc<f*dIG8xTa)d
zqqP<*7KLNgnjL6pJ38EIw%^G2NS>8*AodG&^2&1#GbLQPc>@<NpGRlcDQNcXCmzTk
zR_npp%NJ39_y|s(Ig2A*ojAgMY|D|OINsUGGq2%uELngocep;D@yS2RN|GD{^4!1}
z28ITRtJ)ByAui4_ps>0L*#!rnFRG*5&nf*jG<1LXU5*`D#>ikS*BCz<(bw#3Svheg
zzx5}tJ$N+0+rwjFWH~Y|%aG&5SeA@=@dw$AZISJJ$o_c1{C9|DFWtUQS@od*;$^m7
z&XdFEk#e4S^!Ndbk@AqmJw2y1)=Aq3h0lkKmA+;y`&-IMVtnQN?!kQw@XTw7ZF#_Z
z4|v`sN%osDpVF5sU&h9=N4CY7HulZX!w0xKIKa8_0n1`N<oQ15#(Vtc2M6vc^*(yU
zFGi7xu|NM%9?#Yz+oIGjW66s`lq-3XeJ|&%$LtK{TFEn<Uy(HnGxBJRm4=M?G2WN4
z<n19zic}d_l=YD0SI#l~m$4*fRmwH;I-<C5P5$dverwjRA4s15ZQ)<PC&$^-Fr5Cj
z;+1-tWu$CmqeotUm$a<Un9rDg%ENHV`261ze_NT)*75(-^?wK@+z(9rAb}qw@Sjow
z!*iw4F7!{w|0#v^JsSOe<@twxJ7blaJfyMV58($1jF5obFFhN+Z4Wgv-?!x%d4FX7
zk!fR{Bjb_p8SjsLN2cX{BS!ePJjQpPEpOy|#%IPdjn^`k`g^I@m%8w4wDXWQ8s{(Y
zO!bLwU*?fPVjpSSAfHRS52NkJjT<+<wgE7fYph#&@yU<znK71FN!nQ4xPAjov=NZD
z4fJDE^z#|%88}9L<aJ_SnMc|qG&MCTy6xoT6h+^@ckf>6J7W|*xYYI2c3H78G1_0q
zShhj(C(DraNxmemlq78wq|UaMdaR?2OUp_XdkQ-{J8Y+oL`6jf&pvCR%hu7}B1+NA
zZ`$NU-HSbSy3{K%A05kK?`X&Kt<8$PLeBmi#eSizv`n!#NT5wcGTT*FR)#ZY&L}dJ
zwi7KaEs8x!iZ&HNLAz02S*6&fczRH8>>mIR+5qeb+)16KC-vC0b6|Zow(F_awxzz<
zp871_vtdl4O*huBx1!$Kfi@MJv1N-Je0;nSKsy9!XAv9}gf!YbbaZqmGLSYI5fKs8
zZ~MbV+E&o!V86Z;$If4XfqLQ=>M-}lr&7O2U6aEGY*g7&kK@PlKI+l8)21LOkNTTJ
zMDNk_Jg=Dg;5^E04;(kz!O`B4^#xJ}`KYa{Rr>63%Mlzu)kQu31qDMlvafg1u7Nhh
z2-q18=Pg@dZM_ZwyTWkn+%;Sp0-|H$uy&Ob&kVOvcOC_Qbq)4rAHiNd&(w=fA*1Fj
zGMg_Vr}Yxbk6ywto=?W9_rd(*P-qegP*vA~%En$CY&i?Vp)PcEo#z-BVE;cvT6Qk$
z3WbO7c4U{-VOIq8C0oO=-pU`IemO97^uyaL53l{5Gp4-Gv&fhR1f(89Z21Z7qE0uV
z@*;H9hefyDM8c8VDC)S05}q-pQ%A4*xR83$^VC(JL{{-(6gC{gftC&&@9Dt+&n9F@
z$krn|Rfqi*wJ1N*jrg=01bFd$&8`6UUu404X&#o$NXPI0-W%4o@z|Z$fnB;zY)d~0
zRbVgD>Te;wV*qI<?;-QVAhMcnBEIqp&yi0dF*2WR3t_*yD)uJs9$OI|8I6>TbhPn%
z8sJ$%a#1ZZ4UNzrZbx?A5oA}lAWB<|u<!z?WA)U_QIF-E1=YG__(hc<i2A_5lG6w(
z>qGLP>&QHQ2fCg?&{ve_l+^!Gw^?%L7IY<zur>?D=FNfF<Pri$H;z9aPktL);Lb6*
zCprcPYN#8?uSJN4=d>}!*b!HXh>S8s?&G<1Y7RF0Wx$sD$VGEfv20;H;<6g3N8nlX
zp$m%5Ko)iHX+6|?QEz9sa348+tiSgTbz(Q*?V5@?uZCmId<|BAoQgGHhI1Tip)V;!
zc4j*3k5<0L9icgJuujH$vs9RUmVy=Ysjpw1g>}@USbmj;Wglf=&0L<L+U`SIRSOC_
z&LHntzoLsPqRzAI$`I<WJf!|)2vyW;l~Bjh+<zU#IrZ4(l8fz|sjrz|f~D_dVa-?3
z{BEfqiPxc<W1#QcX(U&lLS%Xa&-Hb%F{4g@K^oT2qaJ0sminnQ_&8-FB(MaY9(n}F
z)xmJQ50yRCLG{qq;L=^x-g=0mHy@#SfO<6AlGL8NiJX#3q^4!TP}7Wpl4hRSwIMU1
z0lPdauyJ`VELKoAwL1kZ$2yQm-BfBrCsJrLqB+=(9qHBZi7rJT`$SWC5Gm#LaNbsk
zIUnX><w6~8RL)S3aUO*yuHx{uLA2hat<Jp%s5*5HX|*kA>AHk9D_pRdb7QO~9_6&<
zD&l+`#WU3i+LhJT9m4+XRs`<KLTcuIgvRbcP@IPS%`;=_Ah&wvAe}ZUaWzK~k>AAo
zm9TLx!m`hE5$aWhlznZ~wXjX?v=O;}k8Qt?lUHtIi+dETRq?1f*aLTm-SFJz4j0<c
z(C>x16Bn$p^oE*tJy)*wE8m?woRVu;Km_N;P+#iv{jqghB%I805D=M!9mzRx2`YqB
zKna$A$+O$9vaokgHA0gPLsxqiRcEiEf%?7{+993lJCD%lR9IQ3B0Zx6d&A1GZC4bM
z(h_J}mX5S6o&!_=8yRBY8qTxH2Xf6BQr7d;b}OkTSPeVZ^{{txhwYLK*euGz=O6FE
zXH(;0_E8obsPhQ+q3%1m8k*{M6jL8iLA_*0?|EG2`YX@uj`yCTO#sJ_Di;Y6ZE&+I
zg(r39fwUj+a?8bnDV(Ee$0EZ+p7R;k<cgXy7!H&}U&iN2YHZvP3Cqutu=%S@I8c|c
z**YGZw?x4^C=O9N9g<2bkYC%3o^$6hbf5Z~CwmfE?(KVb5uL18YzRD@O5tc-iginM
zSo~oM)>7|(fi?m1oKc=d8ut<My^-Pcg|j$V*NWtQMbzgWL=$Z<Dry^XsJ#{ShYq8?
zqZ7BdR?8sIFlF0iS@O*HkvwPQ-`R_okd#@0xP4`yKRYrq4b<tKk#Bt6ZsWegxc-mS
zMaZ(rrHmLJ4@b}Z4xe8>ZHGKRR@(KXeGkaTRqj^?Xjfz`!`SD;bw51|mQ^U{vr?Aa
zi#%XEqz+7;Da&@zKTpw>7<n}E{!OuziE{otG|Z3kt}I76EB?c?M`M$C*O>hC#^0e>
z*#=qtH?`$Y-IL5J?>~wERQ{*WpT0K&3jC1#Pbh(B2mD`J1kcv@hkm<bmFi7@^q1!1
z`<E}j9l2&a8@}nD%q!;`;~FEcjX~lp`j&o;&*XjSPeA`t+R=6@_RAx(e?2eIpB3HR
z-Jm}!F=3jruG60t^k)VAS!s(*J7r=Y`m=)mte`(D=+6rJvnqIxzO=+_KC~0^q%N}t
z^rfYpsvU8M7wAh1`qF~Fw4g67=t~Rw(t^IUpf9b0XX(oe`tpLlyr3^H=*tWG@`Ap+
zpf4}z%M1GQg1)?<FE8lJ3;ObczPw8P^d$y;i9ugt(3hBc^c3#-azI~V(3cqWB?f(o
zL0@9fml*UV27QT%X(K^jV$heFcI|nfFEi-N4Ei#IzRaL6Gw90<`Z9yQ%%Cqb=*tZH
zGK0R%pf5A%%MAKbgTB<<YgK^0)U;{gzG_t==t~XyQiHzKpf5G(OAY!`Qx1E%e@g>>
zsX<?A(1#oJ;Rb!UK_70=hnst>9MFdw^x+15xIrIo(1)8?l6G%v<3Jy7W4D98<Dl<2
z=sOPjj)T7Apzk>7JFduAW|V6#{l{r%O&i6SgWNA%RmKo~$iFV<+Y)m9e7cN1)gv3{
wd^r{+DSI!jjm9<AxPMUUm*bYtxP<b#%>Q)Ue*Z7#&-;ea|MdHoYJBhi0G)?VF8}}l

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/axTLS/www/index.html b/trunk/package/luci/libs/nixio/axTLS/www/index.html
new file mode 100755
index 00000000..25cd2e69
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/index.html
@@ -0,0 +1,7106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<script type="text/javascript">
+//<![CDATA[
+var version = {major: 2, minor: 1, revision: 3, date: new Date("Nov 3, 2006"), extensions: {}};
+//]]>
+</script>
+<!--
+TiddlyWiki 2.1.3 by Jeremy Ruston, (jeremy [at] osmosoft [dot] com)
+
+Copyright (c) Osmosoft Limited 2004-2006
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+Neither the name of the Osmosoft Limited nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+-->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<!--PRE-HEAD-START-->
+<!--{{{-->
+<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>
+<!--}}}-->
+<!--PRE-HEAD-END-->
+<title> axTLS Embedded SSL - changes, notes and errata </title>
+<script type="text/javascript">
+//<![CDATA[
+// ---------------------------------------------------------------------------------
+// Configuration repository
+// ---------------------------------------------------------------------------------
+
+// Miscellaneous options
+var config = {
+	numRssItems: 20, // Number of items in the RSS feed
+	animFast: 0.12, // Speed for animations (lower == slower)
+	animSlow: 0.01, // Speed for EasterEgg animations
+	cascadeFast: 20, // Speed for cascade animations (higher == slower)
+	cascadeSlow: 60, // Speed for EasterEgg cascade animations
+	cascadeDepth: 5, // Depth of cascade animation
+	displayStartupTime: false // Whether to display startup time
+	};
+
+// Messages
+config.messages = {
+	messageClose: {},
+	dates: {}
+};
+
+// Options that can be set in the options panel and/or cookies
+config.options = {
+	chkRegExpSearch: false,
+	chkCaseSensitiveSearch: false,
+	chkAnimate: true,
+	chkSaveBackups: true,
+	chkAutoSave: false,
+	chkGenerateAnRssFeed: false,
+	chkSaveEmptyTemplate: false,
+	chkOpenInNewWindow: true,
+	chkToggleLinks: false,
+	chkHttpReadOnly: true,
+	chkForceMinorUpdate: false,
+	chkConfirmDelete: true,
+	chkInsertTabs: false,
+	txtBackupFolder: "",
+	txtMainTab: "tabTimeline",
+	txtMoreTab: "moreTabAll",
+	txtMaxEditRows: "30"
+	};
+	
+// List of notification functions to be called when certain tiddlers are changed or deleted
+config.notifyTiddlers = [
+	{name: "StyleSheetLayout", notify: refreshStyles},
+	{name: "StyleSheetColors", notify: refreshStyles},
+	{name: "StyleSheet", notify: refreshStyles},
+	{name: "StyleSheetPrint", notify: refreshStyles},
+	{name: "PageTemplate", notify: refreshPageTemplate},
+	{name: "SiteTitle", notify: refreshPageTitle},
+	{name: "SiteSubtitle", notify: refreshPageTitle},
+	{name: "ColorPalette", notify: refreshColorPalette},
+	{name: null, notify: refreshDisplay}
+	];
+
+// Default tiddler templates
+var DEFAULT_VIEW_TEMPLATE = 1;
+var DEFAULT_EDIT_TEMPLATE = 2;
+config.tiddlerTemplates = {
+	1: "ViewTemplate",
+	2: "EditTemplate"
+	};
+
+// More messages (rather a legacy layout that shouldn't really be like this)
+config.views = {
+	wikified: {
+		tag: {}
+		},
+	editor: {
+		tagChooser: {}
+		}
+	};
+
+// Macros; each has a 'handler' member that is inserted later
+config.macros = {
+	today: {},
+	version: {},
+	search: {sizeTextbox: 15},
+	tiddler: {},
+	tag: {},
+	tags: {},
+	tagging: {},
+	timeline: {},
+	allTags: {},
+	list: {
+		all: {},
+		missing: {},
+		orphans: {},
+		shadowed: {}
+		},
+	closeAll: {},
+	permaview: {},
+	saveChanges: {},
+	slider: {},
+	option: {},
+	newTiddler: {},
+	newJournal: {},
+	sparkline: {},
+	tabs: {},
+	gradient: {},
+	message: {},
+	view: {},
+	edit: {},
+	tagChooser: {},
+	toolbar: {},
+	br: {},
+	plugins: {},
+	refreshDisplay: {},
+	importTiddlers: {}
+	};
+
+// Commands supported by the toolbar macro
+config.commands = {
+	closeTiddler: {},
+	closeOthers: {},
+	editTiddler: {},
+	saveTiddler: {hideReadOnly: true},
+	cancelTiddler: {},
+	deleteTiddler: {hideReadOnly: true},
+	permalink: {},
+	references: {},
+	jump: {}
+	};
+
+// Browser detection... In a very few places, there's nothing else for it but to
+// know what browser we're using.
+config.userAgent = navigator.userAgent.toLowerCase();
+config.browser = {
+	isIE: config.userAgent.indexOf("msie") != -1 && config.userAgent.indexOf("opera") == -1,
+	ieVersion: /MSIE (\d.\d)/i.exec(config.userAgent), // config.browser.ieVersion[1], if it exists, will be the IE version string, eg "6.0"
+	isSafari: config.userAgent.indexOf("applewebkit") != -1,
+	isBadSafari: !((new RegExp("[\u0150\u0170]","g")).test("\u0150")),
+	firefoxDate: /Gecko\/(\d{8})/i.exec(config.userAgent), // config.browser.firefoxDate[1], if it exists, will be Firefox release date as "YYYYMMDD"
+	isOpera: config.userAgent.indexOf("opera") != -1,
+	isLinux: config.userAgent.indexOf("linux") != -1,
+	isUnix: config.userAgent.indexOf("x11") != -1,
+	isMac: config.userAgent.indexOf("mac") != -1,
+	isWindows: config.userAgent.indexOf("win") != -1
+	};
+
+// Basic regular expressions
+config.textPrimitives = {
+	upperLetter: "[A-Z\u00c0-\u00de\u0150\u0170]",
+	lowerLetter: "[a-z0-9_\\-\u00df-\u00ff\u0151\u0171]",
+	anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]",
+	anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]"
+	};
+if(config.browser.isBadSafari)
+	config.textPrimitives = {
+		upperLetter: "[A-Z\u00c0-\u00de]",
+		lowerLetter: "[a-z0-9_\\-\u00df-\u00ff]",
+		anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff]",
+		anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff]"
+		}
+config.textPrimitives.sliceSeparator = "::";
+config.textPrimitives.urlPattern = "[a-z]{3,8}:[^\\s:'\"][^\\s'\"]*(?:/|\\b)";
+config.textPrimitives.unWikiLink = "~";
+config.textPrimitives.wikiLink = "(?:(?:" + config.textPrimitives.upperLetter + "+" +
+												config.textPrimitives.lowerLetter + "+" +
+												config.textPrimitives.upperLetter +
+												config.textPrimitives.anyLetter + "*)|(?:" +
+												config.textPrimitives.upperLetter + "{2,}" +
+												config.textPrimitives.lowerLetter + "+))";
+
+config.textPrimitives.cssLookahead = "(?:(" + config.textPrimitives.anyLetter + "+)\\(([^\\)\\|\\n]+)(?:\\):))|(?:(" + config.textPrimitives.anyLetter + "+):([^;\\|\\n]+);)";
+config.textPrimitives.cssLookaheadRegExp = new RegExp(config.textPrimitives.cssLookahead,"mg");
+
+config.textPrimitives.brackettedLink = "\\[\\[([^\\]]+)\\]\\]";
+config.textPrimitives.titledBrackettedLink = "\\[\\[([^\\[\\]\\|]+)\\|([^\\[\\]\\|]+)\\]\\]";
+config.textPrimitives.tiddlerForcedLinkRegExp = new RegExp("(?:" + config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" + 
+	config.textPrimitives.urlPattern + ")","mg");
+config.textPrimitives.tiddlerAnyLinkRegExp = new RegExp("("+ config.textPrimitives.wikiLink + ")|(?:" +
+	config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" +
+	config.textPrimitives.urlPattern + ")","mg");
+
+// ---------------------------------------------------------------------------------
+// Shadow tiddlers
+// ---------------------------------------------------------------------------------
+
+config.shadowTiddlers = {
+	ColorPalette: "Background: #fff\n" + 
+				  "Foreground: #000\n" +
+				  "PrimaryPale: #8cf\n" +
+				  "PrimaryLight: #18f\n" +
+				  "PrimaryMid: #04b\n" +
+				  "PrimaryDark: #014\n" +
+				  "SecondaryPale: #ffc\n" +
+				  "SecondaryLight: #fe8\n" +
+				  "SecondaryMid: #db4\n" +
+				  "SecondaryDark: #841\n" +
+				  "TertiaryPale: #eee\n" +
+				  "TertiaryLight: #ccc\n" +
+				  "TertiaryMid: #999\n" +
+				  "TertiaryDark: #666\n" +
+				  "Error: #f88\n",
+	StyleSheet: "",
+	StyleSheetColors: "/*{{{*/\nbody {\n	background: [[ColorPalette::Background]];\n	color: [[ColorPalette::Foreground]];\n}\n\na{\n	color: [[ColorPalette::PrimaryMid]];\n}\n\na:hover{\n	background: [[ColorPalette::PrimaryMid]];\n	color: [[ColorPalette::Background]];\n}\n\na img{\n	border: 0;\n}\n\nh1,h2,h3,h4,h5 {\n	color: [[ColorPalette::SecondaryDark]];\n	background: [[ColorPalette::PrimaryPale]];\n}\n\n.button {\n	color: [[ColorPalette::PrimaryDark]];\n	border: 1px solid [[ColorPalette::Background]];\n}\n\n.button:hover {\n	color: [[ColorPalette::PrimaryDark]];\n	background: [[ColorPalette::SecondaryLight]];\n	border-color: [[ColorPalette::SecondaryMid]];\n}\n\n.button:active {\n	color: [[ColorPalette::Background]];\n	background: [[ColorPalette::SecondaryMid]];\n	border: 1px solid [[ColorPalette::SecondaryDark]];\n}\n\n.header {\n	background: [[ColorPalette::PrimaryMid]];\n}\n\n.headerShadow {\n	color: [[ColorPalette::Foreground]];\n}\n\n.headerShadow a {\n	font-weight: normal;\n	color: [[ColorPalette::Foreground]];\n}\n\n.headerForeground {\n	color: [[ColorPalette::Background]];\n}\n\n.headerForeground a {\n	font-weight: normal;\n	color: [[ColorPalette::PrimaryPale]];\n}\n\n.tabSelected{\n	color: [[ColorPalette::PrimaryDark]];\n	background: [[ColorPalette::TertiaryPale]];\n	border-left: 1px solid [[ColorPalette::TertiaryLight]];\n	border-top: 1px solid [[ColorPalette::TertiaryLight]];\n	border-right: 1px solid [[ColorPalette::TertiaryLight]];\n}\n\n.tabUnselected {\n	color: [[ColorPalette::Background]];\n	background: [[ColorPalette::TertiaryMid]];\n}\n\n.tabContents {\n	color: [[ColorPalette::PrimaryDark]];\n	background: [[ColorPalette::TertiaryPale]];\n	border: 1px solid [[ColorPalette::TertiaryLight]];\n}\n\n.tabContents .button {\n	 border: 0;}\n\n#sidebar {\n}\n\n#sidebarOptions input {\n	border: 1px solid [[ColorPalette::PrimaryMid]];\n}\n\n#sidebarOptions .sliderPanel {\n	background: [[ColorPalette::PrimaryPale]];\n}\n\n#sidebarOptions .sliderPanel a {\n	border: none;\n	color: [[ColorPalette::PrimaryMid]];\n}\n\n#sidebarOptions .sliderPanel a:hover {\n	color: [[ColorPalette::Background]];\n	background: [[ColorPalette::PrimaryMid]];\n}\n\n#sidebarOptions .sliderPanel a:active {\n	color: [[ColorPalette::PrimaryMid]];\n	background: [[ColorPalette::Background]];\n}\n\n.wizard {\n	background: [[ColorPalette::SecondaryLight]];\n	border-top: 1px solid [[ColorPalette::SecondaryMid]];\n	border-left: 1px solid [[ColorPalette::SecondaryMid]];\n}\n\n.wizard h1 {\n	color: [[ColorPalette::SecondaryDark]];\n}\n\n.wizard h2 {\n	color: [[ColorPalette::Foreground]];\n}\n\n.wizardStep {\n	background: [[ColorPalette::Background]];\n	border-top: 1px solid [[ColorPalette::SecondaryMid]];\n	border-bottom: 1px solid [[ColorPalette::SecondaryMid]];\n	border-left: 1px solid [[ColorPalette::SecondaryMid]];\n}\n\n.wizard .button {\n	color: [[ColorPalette::Background]];\n	background: [[ColorPalette::PrimaryMid]];\n	border-top: 1px solid [[ColorPalette::PrimaryLight]];\n	border-right: 1px solid [[ColorPalette::PrimaryDark]];\n	border-bottom: 1px solid [[ColorPalette::PrimaryDark]];\n	border-left: 1px solid [[ColorPalette::PrimaryLight]];\n}\n\n.wizard .button:hover {\n	color: [[ColorPalette::PrimaryLight]];\n	background: [[ColorPalette::PrimaryDark]];\n	border-color: [[ColorPalette::PrimaryLight]];\n}\n\n.wizard .button:active {\n	color: [[ColorPalette::Background]];\n	background: [[ColorPalette::PrimaryMid]];\n	border-top: 1px solid [[ColorPalette::PrimaryLight]];\n	border-right: 1px solid [[ColorPalette::PrimaryDark]];\n	border-bottom: 1px solid [[ColorPalette::PrimaryDark]];\n	border-left: 1px solid [[ColorPalette::PrimaryLight]];\n}\n\n#messageArea {\n	border: 1px solid [[ColorPalette::SecondaryDark]];\n	background: [[ColorPalette::SecondaryMid]];\n	color: [[ColorPalette::PrimaryDark]];\n}\n\n#messageArea .button {\n	padding: 0.2em 0.2em 0.2em 0.2em;\n	color: [[ColorPalette::PrimaryDark]];\n	background: [[ColorPalette::Background]];\n}\n\n.popup {\n	background: [[ColorPalette::PrimaryLight]];\n	border: 1px solid [[ColorPalette::PrimaryMid]];\n}\n\n.popup hr {\n	color: [[ColorPalette::PrimaryDark]];\n	background: [[ColorPalette::PrimaryDark]];\n	border-bottom: 1px;\n}\n\n.listBreak div{\n	border-bottom: 1px solid [[ColorPalette::PrimaryDark]];\n}\n\n.popup li.disabled {\n	color: [[ColorPalette::PrimaryMid]];\n}\n\n.popup li a, .popup li a:visited {\n	color: [[ColorPalette::TertiaryPale]];\n	border: none;\n}\n\n.popup li a:hover {\n	background: [[ColorPalette::PrimaryDark]];\n	color: [[ColorPalette::Background]];\n	border: none;\n}\n\n.tiddler .defaultCommand {\n font-weight: bold;\n}\n\n.shadow .title {\n	color: [[ColorPalette::TertiaryDark]];\n}\n\n.title {\n	color: [[ColorPalette::SecondaryDark]];\n}\n\n.subtitle {\n	color: [[ColorPalette::TertiaryDark]];\n}\n\n.toolbar {\n	color: [[ColorPalette::PrimaryMid]];\n}\n\n.tagging, .tagged {\n	border: 1px solid [[ColorPalette::TertiaryPale]];\n	background-color: [[ColorPalette::TertiaryPale]];\n}\n\n.selected .tagging, .selected .tagged {\n	background-color: [[ColorPalette::TertiaryLight]];\n	border: 1px solid [[ColorPalette::TertiaryMid]];\n}\n\n.tagging .listTitle, .tagged .listTitle {\n	color: [[ColorPalette::PrimaryDark]];\n}\n\n.tagging .button, .tagged .button {\n		border: none;\n}\n\n.footer {\n	color: [[ColorPalette::TertiaryLight]];\n}\n\n.selected .footer {\n	color: [[ColorPalette::TertiaryMid]];\n}\n\n.sparkline {\n	background: [[ColorPalette::PrimaryPale]];\n	border: 0;\n}\n\n.sparktick {\n	background: [[ColorPalette::PrimaryDark]];\n}\n\n.error, .errorButton {\n	color: [[ColorPalette::Foreground]];\n	background: [[ColorPalette::Error]];\n}\n\n.warning {\n	color: [[ColorPalette::Foreground]];\n	background: [[ColorPalette::SecondaryPale]];\n}\n\n.cascade {\n	background: [[ColorPalette::TertiaryPale]];\n	color: [[ColorPalette::TertiaryMid]];\n	border: 1px solid [[ColorPalette::TertiaryMid]];\n}\n\n.imageLink, #displayArea .imageLink {\n	background: transparent;\n}\n\n.viewer .listTitle {list-style-type: none; margin-left: -2em;}\n\n.viewer .button {\n	border: 1px solid [[ColorPalette::SecondaryMid]];\n}\n\n.viewer blockquote {\n	border-left: 3px solid [[ColorPalette::TertiaryDark]];\n}\n\n.viewer table {\n	border: 2px solid [[ColorPalette::TertiaryDark]];\n}\n\n.viewer th, thead td {\n	background: [[ColorPalette::SecondaryMid]];\n	border: 1px solid [[ColorPalette::TertiaryDark]];\n	color: [[ColorPalette::Background]];\n}\n\n.viewer td, .viewer tr {\n	border: 1px solid [[ColorPalette::TertiaryDark]];\n}\n\n.viewer pre {\n	border: 1px solid [[ColorPalette::SecondaryLight]];\n	background: [[ColorPalette::SecondaryPale]];\n}\n\n.viewer code {\n	color: [[ColorPalette::SecondaryDark]];\n}\n\n.viewer hr {\n	border: 0;\n	border-top: dashed 1px [[ColorPalette::TertiaryDark]];\n	color: [[ColorPalette::TertiaryDark]];\n}\n\n.highlight, .marked {\n	background: [[ColorPalette::SecondaryLight]];\n}\n\n.editor input {\n	border: 1px solid [[ColorPalette::PrimaryMid]];\n}\n\n.editor textarea {\n	border: 1px solid [[ColorPalette::PrimaryMid]];\n	width: 100%;\n}\n\n.editorFooter {\n	color: [[ColorPalette::TertiaryMid]];\n}\n\n/*}}}*/",
+	StyleSheetLayout: "/*{{{*/\n* html .tiddler {\n    height: 1%;\n}\n\nbody {\n	font-size: .75em;\n	font-family: arial,helvetica;\n	margin: 0;\n	padding: 0;\n}\n\nh1,h2,h3,h4,h5 {\n	font-weight: bold;\n	text-decoration: none;\n	padding-left: 0.4em;\n}\n\nh1 {font-size: 1.35em;}\nh2 {font-size: 1.25em;}\nh3 {font-size: 1.1em;}\nh4 {font-size: 1em;}\nh5 {font-size: .9em;}\n\nhr {\n	height: 1px;\n}\n\na{\n	text-decoration: none;\n}\n\ndt {font-weight: bold;}\n\nol { list-style-type: decimal }\nol ol { list-style-type: lower-alpha }\nol ol ol { list-style-type: lower-roman }\nol ol ol ol { list-style-type: decimal }\nol ol ol ol ol { list-style-type: lower-alpha }\nol ol ol ol ol ol { list-style-type: lower-roman }\nol ol ol ol ol ol ol { list-style-type: decimal }\n\n.txtOptionInput {\n	width: 11em;\n}\n\n#contentWrapper .chkOptionInput {\n	border: 0;\n}\n\n.externalLink {\n	text-decoration: underline;\n}\n\n.indent {margin-left:3em;}\n.outdent {margin-left:3em; text-indent:-3em;}\ncode.escaped {white-space:nowrap;}\n\n.tiddlyLinkExisting {\n	font-weight: bold;\n}\n\n.tiddlyLinkNonExisting {\n	font-style: italic;\n}\n\n/* the 'a' is required for IE, otherwise it renders the whole tiddler a bold */\na.tiddlyLinkNonExisting.shadow {\n	font-weight: bold;\n}\n\n#mainMenu .tiddlyLinkExisting, \n#mainMenu .tiddlyLinkNonExisting,\n#sidebarTabs .tiddlyLinkNonExisting{\n font-weight: normal;\n font-style: normal;\n}\n\n#sidebarTabs .tiddlyLinkExisting {\n font-weight: bold;\n font-style: normal;\n}\n\n.header {\n		position: relative;\n}\n\n.header a:hover {\n	background: transparent;\n}\n\n.headerShadow {\n	position: relative;\n	padding: 4.5em 0em 1em 1em;\n	left: -1px;\n	top: -1px;\n}\n\n.headerForeground {\n	position: absolute;\n	padding: 4.5em 0em 1em 1em;\n	left: 0px;\n	top: 0px;\n}\n\n.siteTitle {\n	font-size: 3em;\n}\n\n.siteSubtitle {\n	font-size: 1.2em;\n}\n\n#mainMenu {\n	position: absolute;\n	left: 0;\n	width: 10em;\n	text-align: right;\n	line-height: 1.6em;\n	padding: 1.5em 0.5em 0.5em 0.5em;\n	font-size: 1.1em;\n}\n\n#sidebar {\n	position: absolute;\n	right: 3px;\n	width: 16em;\n	font-size: .9em;\n}\n\n#sidebarOptions {\n	padding-top: 0.3em;\n}\n\n#sidebarOptions a {\n	margin: 0em 0.2em;\n	padding: 0.2em 0.3em;\n	display: block;\n}\n\n#sidebarOptions input {\n	margin: 0.4em 0.5em;\n}\n\n#sidebarOptions .sliderPanel {\n	margin-left: 1em;\n	padding: 0.5em;\n	font-size: .85em;\n}\n\n#sidebarOptions .sliderPanel a {\n	font-weight: bold;\n	display: inline;\n	padding: 0;\n}\n\n#sidebarOptions .sliderPanel input {\n	margin: 0 0 .3em 0;\n}\n\n#sidebarTabs .tabContents {\n	width: 15em;\n	overflow: hidden;\n}\n\n.wizard {\n	padding: 0.1em 0em 0em 2em;\n}\n\n.wizard h1 {\n	font-size: 2em;\n	font-weight: bold;\n	background: none;\n	padding: 0em 0em 0em 0em;\n	margin: 0.4em 0em 0.2em 0em;\n}\n\n.wizard h2 {\n	font-size: 1.2em;\n	font-weight: bold;\n	background: none;\n	padding: 0em 0em 0em 0em;\n	margin: 0.2em 0em 0.2em 0em;\n}\n\n.wizardStep {\n	padding: 1em 1em 1em 1em;\n}\n\n.wizard .button {\n	margin: 0.5em 0em 0em 0em;\n	font-size: 1.2em;\n}\n\n#messageArea {\nposition:absolute; top:0; right:0; margin: 0.5em; padding: 0.5em;\n}\n\n*[id='messageArea'] {\nposition:fixed !important; z-index:99;}\n\n.messageToolbar {\ndisplay: block;\ntext-align: right;\n}\n\n#messageArea a{\n	text-decoration: underline;\n}\n\n.popup {\n	font-size: .9em;\n	padding: 0.2em;\n	list-style: none;\n	margin: 0;\n}\n\n.popup hr {\n	display: block;\n	height: 1px;\n	width: auto;\n	padding: 0;\n	margin: 0.2em 0em;\n}\n\n.listBreak {\n	font-size: 1px;\n	line-height: 1px;\n}\n\n.listBreak div {\n	margin: 2px 0;\n}\n\n.popup li.disabled {\n	padding: 0.2em;\n}\n\n.popup li a{\n	display: block;\n	padding: 0.2em;\n}\n\n.tabset {\n	padding: 1em 0em 0em 0.5em;\n}\n\n.tab {\n	margin: 0em 0em 0em 0.25em;\n	padding: 2px;\n}\n\n.tabContents {\n	padding: 0.5em;\n}\n\n.tabContents ul, .tabContents ol {\n	margin: 0;\n	padding: 0;\n}\n\n.txtMainTab .tabContents li {\n	list-style: none;\n}\n\n.tabContents li.listLink {\n	 margin-left: .75em;\n}\n\n#displayArea {\n	margin: 1em 17em 0em 14em;\n}\n\n\n.toolbar {\n	text-align: right;\n	font-size: .9em;\n	visibility: hidden;\n}\n\n.selected .toolbar {\n	visibility: visible;\n}\n\n.tiddler {\n	padding: 1em 1em 0em 1em;\n}\n\n.missing .viewer,.missing .title {\n	font-style: italic;\n}\n\n.title {\n	font-size: 1.6em;\n	font-weight: bold;\n}\n\n.missing .subtitle {\n display: none;\n}\n\n.subtitle {\n	font-size: 1.1em;\n}\n\n.tiddler .button {\n	padding: 0.2em 0.4em;\n}\n\n.tagging {\nmargin: 0.5em 0.5em 0.5em 0;\nfloat: left;\ndisplay: none;\n}\n\n.isTag .tagging {\ndisplay: block;\n}\n\n.tagged {\nmargin: 0.5em;\nfloat: right;\n}\n\n.tagging, .tagged {\nfont-size: 0.9em;\npadding: 0.25em;\n}\n\n.tagging ul, .tagged ul {\nlist-style: none;margin: 0.25em;\npadding: 0;\n}\n\n.tagClear {\nclear: both;\n}\n\n.footer {\n	font-size: .9em;\n}\n\n.footer li {\ndisplay: inline;\n}\n\n* html .viewer pre {\n	width: 99%;\n	padding: 0 0 1em 0;\n}\n\n.viewer {\n	line-height: 1.4em;\n	padding-top: 0.5em;\n}\n\n.viewer .button {\n	margin: 0em 0.25em;\n	padding: 0em 0.25em;\n}\n\n.viewer blockquote {\n	line-height: 1.5em;\n	padding-left: 0.8em;\n	margin-left: 2.5em;\n}\n\n.viewer ul, .viewer ol{\n	margin-left: 0.5em;\n	padding-left: 1.5em;\n}\n\n.viewer table {\n	border-collapse: collapse;\n	margin: 0.8em 1.0em;\n}\n\n.viewer th, .viewer td, .viewer tr,.viewer caption{\n	padding: 3px;\n}\n\n.viewer table.listView {\n	font-size: 0.85em;\n	margin: 0.8em 1.0em;\n}\n\n.viewer table.listView th, .viewer table.listView td, .viewer table.listView tr {\n	padding: 0px 3px 0px 3px;\n}\n\n.viewer pre {\n	padding: 0.5em;\n	margin-left: 0.5em;\n	font-size: 1.2em;\n	line-height: 1.4em;\n	overflow: auto;\n}\n\n.viewer code {\n	font-size: 1.2em;\n	line-height: 1.4em;\n}\n\n.editor {\nfont-size: 1.1em;\n}\n\n.editor input, .editor textarea {\n	display: block;\n	width: 100%;\n	font: inherit;\n}\n\n.editorFooter {\n	padding: 0.25em 0em;\n	font-size: .9em;\n}\n\n.editorFooter .button {\npadding-top: 0px; padding-bottom: 0px;}\n\n.fieldsetFix {border: 0;\npadding: 0;\nmargin: 1px 0px 1px 0px;\n}\n\n.sparkline {\n	line-height: 1em;\n}\n\n.sparktick {\n	outline: 0;\n}\n\n.zoomer {\n	font-size: 1.1em;\n	position: absolute;\n	padding: 1em;\n}\n\n.cascade {\n	font-size: 1.1em;\n	position: absolute;\n	overflow: hidden;\n}\n/*}}}*/",
+	StyleSheetPrint: "/*{{{*/\n@media print {\n#mainMenu, #sidebar, #messageArea, .toolbar {display: none ! important;}\n#displayArea {margin: 1em 1em 0em 1em;}\n/* Fixes a feature in Firefox 1.5.0.2 where print preview displays the noscript content */\nnoscript {display:none;}\n}\n/*}}}*/",
+	PageTemplate: "<!--{{{-->\n<div class='header' macro='gradient vert [[ColorPalette::PrimaryLight]] [[ColorPalette::PrimaryMid]]'>\n<div class='headerShadow'>\n<span class='siteTitle' refresh='content' tiddler='SiteTitle'></span>&nbsp;\n<span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'></span>\n</div>\n<div class='headerForeground'>\n<span class='siteTitle' refresh='content' tiddler='SiteTitle'></span>&nbsp;\n<span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'></span>\n</div>\n</div>\n<div id='mainMenu' refresh='content' tiddler='MainMenu'></div>\n<div id='sidebar'>\n<div id='sidebarOptions' refresh='content' tiddler='SideBarOptions'></div>\n<div id='sidebarTabs' refresh='content' force='true' tiddler='SideBarTabs'></div>\n</div>\n<div id='displayArea'>\n<div id='messageArea'></div>\n<div id='tiddlerDisplay'></div>\n</div>\n<!--}}}-->",
+	ViewTemplate: "<!--{{{-->\n<div class='toolbar' macro='toolbar closeTiddler closeOthers +editTiddler permalink references jump'></div>\n<div class='title' macro='view title'></div>\n<div class='subtitle'><span macro='view modifier link'></span>, <span macro='view modified date [[DD MMM YYYY]]'></span> (<span macro='message views.wikified.createdPrompt'></span> <span macro='view created date [[DD MMM YYYY]]'></span>)</div>\n<div class='tagging' macro='tagging'></div>\n<div class='tagged' macro='tags'></div>\n<div class='viewer' macro='view text wikified'></div>\n<div class='tagClear'></div>\n<!--}}}-->",
+	EditTemplate: "<!--{{{-->\n<div class='toolbar' macro='toolbar +saveTiddler -cancelTiddler deleteTiddler'></div>\n<div class='title' macro='view title'></div>\n<div class='editor' macro='edit title'></div>\n<div class='editor' macro='edit text'></div>\n<div class='editor' macro='edit tags'></div><div class='editorFooter'><span macro='message views.editor.tagPrompt'></span><span macro='tagChooser'></span></div>\n<!--}}}-->",
+	MarkupPreHead: "<!--{{{-->\n<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>\n<!--}}}-->",
+	MarkupPostHead: "",
+	MarkupPreBody: "",
+	MarkupPostBody: ""
+	};
+
+// ---------------------------------------------------------------------------------
+// Translateable strings
+// ---------------------------------------------------------------------------------
+
+// Strings in "double quotes" should be translated; strings in 'single quotes' should be left alone
+
+merge(config.options,{
+	txtUserName: "YourName"});
+
+merge(config.messages,{
+	customConfigError: "Problems were encountered loading plugins. See PluginManager for details",
+	pluginError: "Error: %0",
+	pluginDisabled: "Not executed because disabled via 'systemConfigDisable' tag",
+	pluginForced: "Executed because forced via 'systemConfigForce' tag",
+	pluginVersionError: "Not executed because this plugin needs a newer version of TiddlyWiki",
+	nothingSelected: "Nothing is selected. You must select one or more items first",
+	savedSnapshotError: "It appears that this TiddlyWiki has been incorrectly saved. Please see http://www.tiddlywiki.com/#DownloadSoftware for details",
+	subtitleUnknown: "(unknown)",
+	undefinedTiddlerToolTip: "The tiddler '%0' doesn't yet exist",
+	shadowedTiddlerToolTip: "The tiddler '%0' doesn't yet exist, but has a pre-defined shadow value",
+	tiddlerLinkTooltip: "%0 - %1, %2",
+	externalLinkTooltip: "External link to %0",
+	noTags: "There are no tagged tiddlers",
+	notFileUrlError: "You need to save this TiddlyWiki to a file before you can save changes",
+	cantSaveError: "It's not possible to save changes. This could be because your browser doesn't support saving (instead, use FireFox if you can), or because the pathname to your TiddlyWiki file contains illegal characters",
+	invalidFileError: "The original file '%0' does not appear to be a valid TiddlyWiki",
+	backupSaved: "Backup saved",
+	backupFailed: "Failed to save backup file",
+	rssSaved: "RSS feed saved",
+	rssFailed: "Failed to save RSS feed file",
+	emptySaved: "Empty template saved",
+	emptyFailed: "Failed to save empty template file",
+	mainSaved: "Main TiddlyWiki file saved",
+	mainFailed: "Failed to save main TiddlyWiki file. Your changes have not been saved",
+	macroError: "Error in macro <<%0>>",
+	macroErrorDetails: "Error while executing macro <<%0>>:\n%1",
+	missingMacro: "No such macro",
+	overwriteWarning: "A tiddler named '%0' already exists. Choose OK to overwrite it",
+	unsavedChangesWarning: "WARNING! There are unsaved changes in TiddlyWiki\n\nChoose OK to save\nChoose CANCEL to discard",
+	confirmExit: "--------------------------------\n\nThere are unsaved changes in TiddlyWiki. If you continue you will lose those changes\n\n--------------------------------",
+	saveInstructions: "SaveChanges",
+	unsupportedTWFormat: "Unsupported TiddlyWiki format '%0'",
+	tiddlerSaveError: "Error when saving tiddler '%0'",
+	tiddlerLoadError: "Error when loading tiddler '%0'",
+	wrongSaveFormat: "Cannot save with storage format '%0'. Using standard format for save.",
+	invalidFieldName: "Invalid field name %0",
+	fieldCannotBeChanged: "Field '%0' cannot be changed"});
+
+merge(config.messages.messageClose,{
+	text: "close",
+	tooltip: "close this message area"});
+
+config.messages.dates.months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November","December"];
+config.messages.dates.days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+config.messages.dates.shortMonths = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+config.messages.dates.shortDays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+
+merge(config.views.wikified.tag,{
+	labelNoTags: "no tags",
+	labelTags: "tags: ",
+	openTag: "Open tag '%0'",
+	tooltip: "Show tiddlers tagged with '%0'",
+	openAllText: "Open all",
+	openAllTooltip: "Open all of these tiddlers",
+	popupNone: "No other tiddlers tagged with '%0'"});
+
+merge(config.views.wikified,{
+	defaultText: "The tiddler '%0' doesn't yet exist. Double-click to create it",
+	defaultModifier: "(missing)",
+	shadowModifier: "(built-in shadow tiddler)",
+	createdPrompt: "created"});
+
+merge(config.views.editor,{
+	tagPrompt: "Type tags separated with spaces, [[use double square brackets]] if necessary, or add existing",
+	defaultText: "Type the text for '%0'"});
+
+merge(config.views.editor.tagChooser,{
+	text: "tags",
+	tooltip: "Choose existing tags to add to this tiddler",
+	popupNone: "There are no tags defined",
+	tagTooltip: "Add the tag '%0'"});
+
+merge(config.macros.search,{
+	label: "search",
+	prompt: "Search this TiddlyWiki",
+	accessKey: "F",
+	successMsg: "%0 tiddlers found matching %1",
+	failureMsg: "No tiddlers found matching %0"});
+
+merge(config.macros.tagging,{
+	label: "tagging: ",
+	labelNotTag: "not tagging",
+	tooltip: "List of tiddlers tagged with '%0'"});
+
+merge(config.macros.timeline,{
+	dateFormat: "DD MMM YYYY"});
+
+merge(config.macros.allTags,{
+	tooltip: "Show tiddlers tagged with '%0'",
+	noTags: "There are no tagged tiddlers"});
+
+config.macros.list.all.prompt = "All tiddlers in alphabetical order";
+config.macros.list.missing.prompt = "Tiddlers that have links to them but are not defined";
+config.macros.list.orphans.prompt = "Tiddlers that are not linked to from any other tiddlers";
+config.macros.list.shadowed.prompt = "Tiddlers shadowed with default contents";
+
+merge(config.macros.closeAll,{
+	label: "close all",
+	prompt: "Close all displayed tiddlers (except any that are being edited)"});
+
+merge(config.macros.permaview,{
+	label: "permaview",
+	prompt: "Link to an URL that retrieves all the currently displayed tiddlers"});
+
+merge(config.macros.saveChanges,{
+	label: "save changes",
+	prompt: "Save all tiddlers to create a new TiddlyWiki",
+	accessKey: "S"});
+
+merge(config.macros.newTiddler,{
+	label: "new tiddler",
+	prompt: "Create a new tiddler",
+	title: "New Tiddler",
+	accessKey: "N"});
+
+merge(config.macros.newJournal,{
+	label: "new journal",
+	prompt: "Create a new tiddler from the current date and time",
+	accessKey: "J"});
+
+merge(config.macros.plugins,{
+	skippedText: "(This plugin has not been executed because it was added since startup)",
+	noPluginText: "There are no plugins installed",
+	confirmDeleteText: "Are you sure you want to delete these tiddlers:\n\n%0",
+	listViewTemplate : {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Title', field: 'title', tiddlerLink: 'title', title: "Title", type: 'TiddlerLink'},
+			{name: 'Forced', field: 'forced', title: "Forced", tag: 'systemConfigForce', type: 'TagCheckbox'},
+			{name: 'Disabled', field: 'disabled', title: "Disabled", tag: 'systemConfigDisable', type: 'TagCheckbox'},
+			{name: 'Executed', field: 'executed', title: "Loaded", type: 'Boolean', trueText: "Yes", falseText: "No"},
+			{name: 'Error', field: 'error', title: "Status", type: 'Boolean', trueText: "Error", falseText: "OK"},
+			{name: 'Log', field: 'log', title: "Log", type: 'StringList'}
+			],
+		rowClasses: [
+			{className: 'error', field: 'error'},
+			{className: 'warning', field: 'warning'}
+			],
+		actions: [
+			{caption: "More actions...", name: ''},
+			{caption: "Remove systemConfig tag", name: 'remove'},
+			{caption: "Delete these tiddlers forever", name: 'delete'}
+			]}
+	});
+
+merge(config.macros.refreshDisplay,{
+	label: "refresh",
+	prompt: "Redraw the entire TiddlyWiki display"
+	});
+
+merge(config.macros.importTiddlers,{
+	readOnlyWarning: "You cannot import tiddlers into a read-only TiddlyWiki. Try opening the TiddlyWiki file from a file:// URL",
+	defaultPath: "http://www.tiddlywiki.com/index.html",
+	fetchLabel: "fetch",
+	fetchPrompt: "Fetch the tiddlywiki file",
+	fetchError: "There were problems fetching the tiddlywiki file",
+	confirmOverwriteText: "Are you sure you want to overwrite these tiddlers:\n\n%0",
+	wizardTitle: "Import tiddlers from another TiddlyWiki file",
+	step1: "Step 1: Locate the TiddlyWiki file",
+	step1prompt: "Enter the URL or pathname here: ",
+	step1promptFile: "...or browse for a file: ",
+	step1promptFeeds: "...or select a pre-defined feed: ",
+	step1feedPrompt: "Choose...",
+	step2: "Step 2: Loading TiddlyWiki file",
+	step2Text: "Please wait while the file is loaded from: %0",
+	step3: "Step 3: Choose the tiddlers to import",
+	step4: "%0 tiddler(s) imported",
+	step5: "Done",
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Title', field: 'title', title: "Title", type: 'String'},
+			{name: 'Snippet', field: 'text', title: "Snippet", type: 'String'},
+			{name: 'Tags', field: 'tags', title: "Tags", type: 'Tags'}
+			],
+		rowClasses: [
+			],
+		actions: [
+			{caption: "More actions...", name: ''},
+			{caption: "Import these tiddlers", name: 'import'}
+			]}
+	});
+
+merge(config.commands.closeTiddler,{
+	text: "close",
+	tooltip: "Close this tiddler"});
+
+merge(config.commands.closeOthers,{
+	text: "close others",
+	tooltip: "Close all other tiddlers"});
+
+merge(config.commands.editTiddler,{
+	text: "edit",
+	tooltip: "Edit this tiddler",
+	readOnlyText: "view",
+	readOnlyTooltip: "View the source of this tiddler"});
+
+merge(config.commands.saveTiddler,{
+	text: "done",
+	tooltip: "Save changes to this tiddler"});
+
+merge(config.commands.cancelTiddler,{
+	text: "cancel",
+	tooltip: "Undo changes to this tiddler",
+	warning: "Are you sure you want to abandon your changes to '%0'?",
+	readOnlyText: "done",
+	readOnlyTooltip: "View this tiddler normally"});
+
+merge(config.commands.deleteTiddler,{
+	text: "delete",
+	tooltip: "Delete this tiddler",
+	warning: "Are you sure you want to delete '%0'?"});
+
+merge(config.commands.permalink,{
+	text: "permalink",
+	tooltip: "Permalink for this tiddler"});
+
+merge(config.commands.references,{
+	text: "references",
+	tooltip: "Show tiddlers that link to this one",
+	popupNone: "No references"});
+
+merge(config.commands.jump,{
+	text: "jump",
+	tooltip: "Jump to another open tiddler"});
+
+merge(config.shadowTiddlers,{
+	DefaultTiddlers: "GettingStarted",
+	MainMenu: "GettingStarted",
+	SiteTitle: "My TiddlyWiki",
+	SiteSubtitle: "a reusable non-linear personal web notebook",
+	SiteUrl: "http://www.tiddlywiki.com/",
+	GettingStarted: "To get started with this blank TiddlyWiki, you'll need to modify the following tiddlers:\n* SiteTitle & SiteSubtitle: The title and subtitle of the site, as shown above (after saving, they will also appear in the browser title bar)\n* MainMenu: The menu (usually on the left)\n* DefaultTiddlers: Contains the names of the tiddlers that you want to appear when the TiddlyWiki is opened\nYou'll also need to enter your username for signing your edits: <<option txtUserName>>",
+	SideBarOptions: "<<search>><<closeAll>><<permaview>><<newTiddler>><<newJournal 'DD MMM YYYY'>><<saveChanges>><<slider chkSliderOptionsPanel OptionsPanel 'options »' 'Change TiddlyWiki advanced options'>>",
+	OptionsPanel: "These InterfaceOptions for customising TiddlyWiki are saved in your browser\n\nYour username for signing your edits. Write it as a WikiWord (eg JoeBloggs)\n\n<<option txtUserName>>\n<<option chkSaveBackups>> SaveBackups\n<<option chkAutoSave>> AutoSave\n<<option chkRegExpSearch>> RegExpSearch\n<<option chkCaseSensitiveSearch>> CaseSensitiveSearch\n<<option chkAnimate>> EnableAnimations\n\n----\nAdvancedOptions\nPluginManager\nImportTiddlers",
+	AdvancedOptions: "<<option chkGenerateAnRssFeed>> GenerateAnRssFeed\n<<option chkOpenInNewWindow>> OpenLinksInNewWindow\n<<option chkSaveEmptyTemplate>> SaveEmptyTemplate\n<<option chkToggleLinks>> Clicking on links to tiddlers that are already open causes them to close\n^^(override with Control or other modifier key)^^\n<<option chkHttpReadOnly>> HideEditingFeatures when viewed over HTTP\n<<option chkForceMinorUpdate>> Treat edits as MinorChanges by preserving date and time\n^^(override with Shift key when clicking 'done' or by pressing Ctrl-Shift-Enter^^\n<<option chkConfirmDelete>> ConfirmBeforeDeleting\nMaximum number of lines in a tiddler edit box: <<option txtMaxEditRows>>\nFolder name for backup files: <<option txtBackupFolder>>\n<<option chkInsertTabs>> Use tab key to insert tab characters instead of jumping to next field",
+	SideBarTabs: "<<tabs txtMainTab Timeline Timeline TabTimeline All 'All tiddlers' TabAll Tags 'All tags' TabTags More 'More lists' TabMore>>",
+	TabTimeline: "<<timeline>>",
+	TabAll: "<<list all>>",
+	TabTags: "<<allTags>>",
+	TabMore: "<<tabs txtMoreTab Missing 'Missing tiddlers' TabMoreMissing Orphans 'Orphaned tiddlers' TabMoreOrphans Shadowed 'Shadowed tiddlers' TabMoreShadowed>>",
+	TabMoreMissing: "<<list missing>>",
+	TabMoreOrphans: "<<list orphans>>",
+	TabMoreShadowed: "<<list shadowed>>",
+	PluginManager: "<<plugins>>",
+	ImportTiddlers: "<<importTiddlers>>"});
+
+// ---------------------------------------------------------------------------------
+// Main
+// ---------------------------------------------------------------------------------
+
+var params = null; // Command line parameters
+var store = null; // TiddlyWiki storage
+var story = null; // Main story
+var formatter = null; // Default formatters for the wikifier
+config.parsers = {}; // Hashmap of alternative parsers for the wikifier
+var anim = new Animator(); // Animation engine
+var readOnly = false; // Whether we're in readonly mode
+var highlightHack = null; // Embarrassing hack department...
+var hadConfirmExit = false; // Don't warn more than once
+var safeMode = false; // Disable all plugins and cookies
+var installedPlugins = []; // Information filled in when plugins are executed
+var startingUp = false; // Whether we're in the process of starting up
+var pluginInfo,tiddler; // Used to pass information to plugins in loadPlugins()
+
+// Whether to use the JavaSaver applet
+var useJavaSaver = config.browser.isSafari || config.browser.isOpera;
+
+// Starting up
+function main()
+{
+	var now, then = new Date();
+	startingUp = true;
+	window.onbeforeunload = function(e) {if(window.confirmExit) return confirmExit();};
+	params = getParameters();
+	if(params)
+		params = params.parseParams("open",null,false);
+	store = new TiddlyWiki();
+	invokeParamifier(params,"oninit");
+	story = new Story("tiddlerDisplay","tiddler");
+	addEvent(document,"click",Popup.onDocumentClick);
+	saveTest();
+	loadOptionsCookie();
+	for(var s=0; s<config.notifyTiddlers.length; s++)
+		store.addNotification(config.notifyTiddlers[s].name,config.notifyTiddlers[s].notify);
+	store.loadFromDiv("storeArea","store",true);
+	invokeParamifier(params,"onload");
+	var pluginProblem = loadPlugins();
+	formatter = new Formatter(config.formatters);
+	readOnly = (window.location.protocol == "file:") ? false : config.options.chkHttpReadOnly;
+	invokeParamifier(params,"onconfig");
+	store.notifyAll();
+	restart();
+	if(pluginProblem)
+		{
+		story.displayTiddler(null,"PluginManager");
+		displayMessage(config.messages.customConfigError);
+		}
+	now = new Date();
+	if(config.displayStartupTime)
+		displayMessage("TiddlyWiki startup in " + (now-then)/1000 + " seconds");
+	startingUp = false;
+}
+
+// Restarting
+function restart()
+{
+	invokeParamifier(params,"onstart");
+	if(story.isEmpty())
+		{
+		var defaultParams = store.getTiddlerText("DefaultTiddlers").parseParams("open",null,false);
+		invokeParamifier(defaultParams,"onstart");
+		}
+	window.scrollTo(0,0);
+}
+
+function saveTest()
+{
+	var saveTest = document.getElementById("saveTest");
+	if(saveTest.hasChildNodes())
+		alert(config.messages.savedSnapshotError);
+	saveTest.appendChild(document.createTextNode("savetest"));
+}
+
+function loadPlugins()
+{
+	if(safeMode)
+		return false;
+	var configTiddlers = store.getTaggedTiddlers("systemConfig");
+	installedPlugins = [];
+	var hadProblem = false;
+	for(var t=0; t<configTiddlers.length; t++)
+		{
+		tiddler = configTiddlers[t];
+		pluginInfo = getPluginInfo(tiddler);
+		if(isPluginExecutable(pluginInfo))
+			{
+			pluginInfo.executed = true;
+			pluginInfo.error = false;
+			try
+				{
+				if(tiddler.text && tiddler.text != "")
+					window.eval(tiddler.text);
+				}
+			catch(e)
+				{
+				pluginInfo.log.push(config.messages.pluginError.format([exceptionText(e)]));
+				pluginInfo.error = true;
+				hadProblem = true;
+				}
+			}
+		else
+			pluginInfo.warning = true;
+		installedPlugins.push(pluginInfo);
+		}
+	return hadProblem;
+}
+
+function getPluginInfo(tiddler)
+{
+	var p = store.getTiddlerSlices(tiddler.title,["Name","Description","Version","CoreVersion","Date","Source","Author","License","Browsers"]);
+	p.tiddler = tiddler;
+	p.title = tiddler.title;
+	p.log = [];
+	return p;
+}
+
+// Check that a particular plugin is valid for execution
+function isPluginExecutable(plugin)
+{
+	if(plugin.tiddler.isTagged("systemConfigDisable"))
+		return verifyTail(plugin,false,config.messages.pluginDisabled);
+	if(plugin.tiddler.isTagged("systemConfigForce"))
+		return verifyTail(plugin,true,config.messages.pluginForced);
+	if(plugin["CoreVersion"])
+		{
+		var coreVersion = plugin["CoreVersion"].split(".");
+		var w = parseInt(coreVersion[0]) - version.major;
+		if(w == 0 && coreVersion[1])
+			w = parseInt(coreVersion[1]) - version.minor;
+		if(w == 0 && coreVersion[2])
+		 	w = parseInt(coreVersion[2]) - version.revision;
+		if(w > 0)
+			return verifyTail(plugin,false,config.messages.pluginVersionError);
+		}
+	return true;
+}
+
+function verifyTail(plugin,result,message)
+{
+	plugin.log.push(message);
+	return result;
+}
+
+function invokeMacro(place,macro,params,wikifier,tiddler)
+{
+	try
+		{
+		var m = config.macros[macro];
+		if(m && m.handler)
+			m.handler(place,macro,params.readMacroParams(),wikifier,params,tiddler);
+		else
+			createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,config.messages.missingMacro]));
+		}
+	catch(ex)
+		{
+		createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,ex.toString()]));
+		}
+}
+
+// ---------------------------------------------------------------------------------
+// Paramifiers
+// ---------------------------------------------------------------------------------
+
+function getParameters()
+{
+	var p = null;
+	if(window.location.hash)
+		{
+		p = decodeURI(window.location.hash.substr(1));
+		if(config.browser.firefoxDate != null && config.browser.firefoxDate[1] < "20051111")
+			p = convertUTF8ToUnicode(p);
+		}
+	return p;
+}
+
+function invokeParamifier(params,handler)
+{
+	if(!params || params.length == undefined || params.length <= 1)
+		return;
+	for(var t=1; t<params.length; t++)
+		{
+		var p = config.paramifiers[params[t].name];
+		if(p && p[handler] instanceof Function)
+			p[handler](params[t].value);
+		}
+}
+
+config.paramifiers = {};
+
+config.paramifiers.start = {
+	oninit: function(v) {
+		safeMode = v.toLowerCase() == "safe";
+		}
+};
+
+config.paramifiers.open = {
+	onstart: function(v) {
+		story.displayTiddler("bottom",v,null,false,false);
+		}
+};
+
+config.paramifiers.story = {
+	onstart: function(v) {
+		var list = store.getTiddlerText(v,"").parseParams("open",null,false);
+		invokeParamifier(list,"onstart");
+		}
+};
+
+config.paramifiers.search = {
+	onstart: function(v) {
+		story.search(v,false,false);
+		}
+};
+
+config.paramifiers.searchRegExp = {
+	onstart: function(v) {
+		story.prototype.search(v,false,true);
+		}
+};
+
+config.paramifiers.tag = {
+	onstart: function(v) {
+		var tagged = store.getTaggedTiddlers(v,"title");
+		for(var t=0; t<tagged.length; t++)
+			story.displayTiddler("bottom",tagged[t].title,null,false,false);
+		}
+};
+
+config.paramifiers.newTiddler = {
+	onstart: function(v) {
+		if(!readOnly)
+			{
+			story.displayTiddler(null,v,DEFAULT_EDIT_TEMPLATE);
+			story.focusTiddler(v,"text");
+			}
+		}
+};
+
+config.paramifiers.newJournal = {
+	onstart: function(v) {
+		if(!readOnly)
+			{
+			var now = new Date();
+			var title = now.formatString(v.trim());
+			story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE);
+			story.focusTiddler(title,"text");
+			}
+		}
+};
+
+// ---------------------------------------------------------------------------------
+// Formatter helpers
+// ---------------------------------------------------------------------------------
+
+function Formatter(formatters)
+{
+	this.formatters = [];
+	var pattern = [];
+	for(var n=0; n<formatters.length; n++)
+		{
+		pattern.push("(" + formatters[n].match + ")");
+		this.formatters.push(formatters[n]);
+		}
+	this.formatterRegExp = new RegExp(pattern.join("|"),"mg");
+}
+
+config.formatterHelpers = {
+
+	createElementAndWikify: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,this.element),this.termRegExp);
+	},
+	
+	inlineCssHelper: function(w)
+	{
+		var styles = [];
+		config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch)
+			{
+			var s,v;
+			if(lookaheadMatch[1])
+				{
+				s = lookaheadMatch[1].unDash();
+				v = lookaheadMatch[2];
+				}
+			else
+				{
+				s = lookaheadMatch[3].unDash();
+				v = lookaheadMatch[4];
+				}
+			if (s=="bgcolor")
+				s = "backgroundColor";
+			styles.push({style: s, value: v});
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+			config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+			}
+		return styles;
+	},
+
+	applyCssHelper: function(e,styles)
+	{
+		for(var t=0; t< styles.length; t++)
+			{
+			try
+				{
+				e.style[styles[t].style] = styles[t].value;
+				}
+			catch (ex)
+				{
+				}
+			}
+	},
+
+	enclosedTextHelper: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			{
+			var text = lookaheadMatch[1];
+			if(config.browser.isIE)
+				text = text.replace(/\n/g,"\r");
+			createTiddlyElement(w.output,this.element,null,null,text);
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+			}
+	},
+
+	isExternalLink: function(link)
+	{
+		if(store.tiddlerExists(link) || store.isShadowTiddler(link))
+			{
+			//# Definitely not an external link
+			return false;
+			}
+		var urlRegExp = new RegExp(config.textPrimitives.urlPattern,"mg");
+		if(urlRegExp.exec(link))
+			{
+			// Definitely an external link
+			return true;
+			}
+		if (link.indexOf(".")!=-1 || link.indexOf("\\")!=-1 || link.indexOf("/")!=-1)
+			{
+			//# Link contains . / or \ so is probably an external link
+			return true;
+			}
+		//# Otherwise assume it is not an external link
+		return false;
+	}
+
+};
+
+// ---------------------------------------------------------------------------------
+// Standard formatters
+// ---------------------------------------------------------------------------------
+
+config.formatters = [
+{
+	name: "table",
+	match: "^\\|(?:[^\\n]*)\\|(?:[fhck]?)$",
+	lookaheadRegExp: /^\|([^\n]*)\|([fhck]?)$/mg,
+	rowTermRegExp: /(\|(?:[fhck]?)$\n?)/mg,
+	cellRegExp: /(?:\|([^\n\|]*)\|)|(\|[fhck]?$\n?)/mg,
+	cellTermRegExp: /((?:\x20*)\|)/mg,
+	rowTypes: {"c":"caption", "h":"thead", "":"tbody", "f":"tfoot"},
+
+	handler: function(w)
+	{
+		var table = createTiddlyElement(w.output,"table");
+		var prevColumns = [];
+		var currRowType = null;
+		var rowContainer;
+		var rowCount = 0;
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch)
+			{
+			var nextRowType = lookaheadMatch[2];
+			if(nextRowType == "k")
+				{
+				table.className = lookaheadMatch[1];
+				w.nextMatch += lookaheadMatch[0].length+1;
+				}
+			else
+				{
+				if(nextRowType != currRowType)
+					{
+					rowContainer = createTiddlyElement(table,this.rowTypes[nextRowType]);
+					currRowType = nextRowType;
+					}
+				if(currRowType == "c")
+					{
+					// Caption
+					w.nextMatch++;
+					if(rowContainer != table.firstChild)
+						table.insertBefore(rowContainer,table.firstChild);
+					rowContainer.setAttribute("align",rowCount == 0?"top":"bottom");
+					w.subWikifyTerm(rowContainer,this.rowTermRegExp);
+					}
+				else
+					{
+					this.rowHandler(w,createTiddlyElement(rowContainer,"tr",null,(rowCount&1)?"oddRow":"evenRow"),prevColumns);
+					rowCount++;
+					}
+				}
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+			}
+	},
+	rowHandler: function(w,e,prevColumns)
+	{
+		var col = 0;
+		var colSpanCount = 1;
+		var prevCell = null;
+		this.cellRegExp.lastIndex = w.nextMatch;
+		var cellMatch = this.cellRegExp.exec(w.source);
+		while(cellMatch && cellMatch.index == w.nextMatch)
+			{
+			if(cellMatch[1] == "~")
+				{
+				// Rowspan
+				var last = prevColumns[col];
+				if(last)
+					{
+					last.rowSpanCount++;
+					last.element.setAttribute("rowspan",last.rowSpanCount);
+					last.element.setAttribute("rowSpan",last.rowSpanCount); // Needed for IE
+					last.element.valign = "center";
+					}
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+				}
+			else if(cellMatch[1] == ">")
+				{
+				// Colspan
+				colSpanCount++;
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+				}
+			else if(cellMatch[2])
+				{
+				// End of row
+				if(prevCell && colSpanCount > 1)
+					{
+					prevCell.setAttribute("colspan",colSpanCount);
+					prevCell.setAttribute("colSpan",colSpanCount); // Needed for IE
+					}
+				w.nextMatch = this.cellRegExp.lastIndex;
+				break;
+				}
+			else
+				{
+				// Cell
+				w.nextMatch++;
+				var styles = config.formatterHelpers.inlineCssHelper(w);
+				var spaceLeft = false;
+				var chr = w.source.substr(w.nextMatch,1);
+				while(chr == " ")
+					{
+					spaceLeft = true;
+					w.nextMatch++;
+					chr = w.source.substr(w.nextMatch,1);
+					}
+				var cell;
+				if(chr == "!")
+					{
+					cell = createTiddlyElement(e,"th");
+					w.nextMatch++;
+					}
+				else
+					cell = createTiddlyElement(e,"td");
+				prevCell = cell;
+				prevColumns[col] = {rowSpanCount:1, element:cell};
+				if(colSpanCount > 1)
+					{
+					cell.setAttribute("colspan",colSpanCount);
+					cell.setAttribute("colSpan",colSpanCount); // Needed for IE
+					colSpanCount = 1;
+					}
+				config.formatterHelpers.applyCssHelper(cell,styles);
+				w.subWikifyTerm(cell,this.cellTermRegExp);
+				if(w.matchText.substr(w.matchText.length-2,1) == " ") // spaceRight
+					cell.align = spaceLeft ? "center" : "left";
+				else if(spaceLeft)
+					cell.align = "right";
+				w.nextMatch--;
+				}
+			col++;
+			this.cellRegExp.lastIndex = w.nextMatch;
+			cellMatch = this.cellRegExp.exec(w.source);
+			}
+	}
+},
+
+{
+	name: "heading",
+	match: "^!{1,5}",
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,"h" + w.matchLength),this.termRegExp);
+	}
+},
+
+{
+	name: "list",
+	match: "^(?:(?:(?:\\*)|(?:#)|(?:;)|(?::))+)",
+	lookaheadRegExp: /^(?:(?:(\*)|(#)|(;)|(:))+)/mg,
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		var placeStack = [w.output];
+		var currLevel = 0, currType = null;
+		var listLevel, listType, itemType;
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch)
+			{
+			if(lookaheadMatch[1])
+				{
+				listType = "ul";
+				itemType = "li";
+				}
+			else if(lookaheadMatch[2])
+				{
+				listType = "ol";
+				itemType = "li";
+				}
+			else if(lookaheadMatch[3])
+				{
+				listType = "dl";
+				itemType = "dt";
+				}
+			else if(lookaheadMatch[4])
+				{
+				listType = "dl";
+				itemType = "dd";
+				}
+			listLevel = lookaheadMatch[0].length;
+			w.nextMatch += lookaheadMatch[0].length;
+			if(listLevel > currLevel)
+				{
+				for(var t=currLevel; t<listLevel; t++)
+					placeStack.push(createTiddlyElement(placeStack[placeStack.length-1],listType));
+				}
+			else if(listLevel < currLevel)
+				{
+				for(var t=currLevel; t>listLevel; t--)
+					placeStack.pop();
+				}
+			else if(listLevel == currLevel && listType != currType)
+				{
+				placeStack.pop();
+				placeStack.push(createTiddlyElement(placeStack[placeStack.length-1],listType));
+				}
+			currLevel = listLevel;
+			currType = listType;
+			var e = createTiddlyElement(placeStack[placeStack.length-1],itemType);
+			w.subWikifyTerm(e,this.termRegExp);
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		}
+	}
+},
+
+{
+	name: "quoteByBlock",
+	match: "^<<<\\n",
+	termRegExp: /(^<<<(\n|$))/mg,
+	element: "blockquote",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "quoteByLine",
+	match: "^>+",
+	lookaheadRegExp: /^>+/mg,
+	termRegExp: /(\n)/mg,
+	element: "blockquote",
+	handler: function(w)
+	{
+		var placeStack = [w.output];
+		var currLevel = 0;
+		var newLevel = w.matchLength;
+		var t;
+		do {
+			if(newLevel > currLevel)
+				{
+				for(t=currLevel; t<newLevel; t++)
+					placeStack.push(createTiddlyElement(placeStack[placeStack.length-1],this.element));
+				}
+			else if(newLevel < currLevel)
+				{
+				for(t=currLevel; t>newLevel; t--)
+					placeStack.pop();
+				}
+			currLevel = newLevel;
+			w.subWikifyTerm(placeStack[placeStack.length-1],this.termRegExp);
+			createTiddlyElement(placeStack[placeStack.length-1],"br");
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+			var matched = lookaheadMatch && lookaheadMatch.index == w.nextMatch;
+			if(matched)
+				{
+				newLevel = lookaheadMatch[0].length;
+				w.nextMatch += lookaheadMatch[0].length;
+				}
+		} while(matched);
+	}
+},
+
+{
+	name: "rule",
+	match: "^----+$\\n?",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"hr");
+	}
+},
+
+{
+	name: "monospacedByLine",
+	match: "^\\{\\{\\{\\n",
+	lookaheadRegExp: /^\{\{\{\n((?:^[^\n]*\n)+?)(^\}\}\}$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForCSS",
+	match: "^/\\*[\\{]{3}\\*/\\n",
+	lookaheadRegExp: /\/\*[\{]{3}\*\/\n*((?:^[^\n]*\n)+?)(\n*^\/\*[\}]{3}\*\/$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForPlugin",
+	match: "^//\\{\\{\\{\\n",
+	lookaheadRegExp: /^\/\/\{\{\{\n\n*((?:^[^\n]*\n)+?)(\n*^\/\/\}\}\}$\n?)/mg,
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "monospacedByLineForTemplate",
+	match: "^<!--[\\{]{3}-->\\n",
+	lookaheadRegExp: /<!--[\{]{3}-->\n*((?:^[^\n]*\n)+?)(\n*^<!--[\}]{3}-->$\n?)/mg, 
+	element: "pre",
+	handler: config.formatterHelpers.enclosedTextHelper
+},
+
+{
+	name: "wikifyCommentForPlugin", 
+	match: "^/\\*\\*\\*\\n",
+	termRegExp: /(^\*\*\*\/\n)/mg,
+	handler: function(w)
+	{
+		w.subWikifyTerm(w.output,this.termRegExp);
+	}
+},
+
+{
+	name: "wikifyCommentForTemplate", 
+	match: "^<!---\\n",
+	termRegExp: /(^--->\n)/mg,
+	handler: function(w) 
+	{
+		w.subWikifyTerm(w.output,this.termRegExp);
+	}
+},
+
+{
+	name: "macro",
+	match: "<<",
+	lookaheadRegExp: /<<([^>\s]+)(?:\s*)((?:[^>]|(?:>(?!>)))*)>>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart && lookaheadMatch[1])
+			{
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			invokeMacro(w.output,lookaheadMatch[1],lookaheadMatch[2],w,w.tiddler);
+			}
+	}
+},
+
+{
+	name: "prettyLink",
+	match: "\\[\\[",
+	lookaheadRegExp: /\[\[(.*?)(?:\|(~)?(.*?))?\]\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			{
+			var e;
+			var text = lookaheadMatch[1];
+			if(lookaheadMatch[3])
+				{
+				// Pretty bracketted link
+				var link = lookaheadMatch[3];
+				e = (!lookaheadMatch[2] && config.formatterHelpers.isExternalLink(link))
+						? createExternalLink(w.output,link)
+						: createTiddlyLink(w.output,link,false,null,w.isStatic);
+				}
+			else
+				{
+				// Simple bracketted link
+				e = createTiddlyLink(w.output,text,false,null,w.isStatic);
+				}
+			createTiddlyText(e,text);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			}
+	}
+},
+
+{
+	name: "unWikiLink",
+	match: config.textPrimitives.unWikiLink+config.textPrimitives.wikiLink,
+	handler: function(w)
+	{
+		w.outputText(w.output,w.matchStart+1,w.nextMatch);
+	}
+},
+
+{
+	name: "wikiLink",
+	match: config.textPrimitives.wikiLink,
+	handler: function(w)
+	{
+		if(w.matchStart > 0)
+			{
+			var preRegExp = new RegExp(config.textPrimitives.anyLetterStrict,"mg");
+			preRegExp.lastIndex = w.matchStart-1;
+			var preMatch = preRegExp.exec(w.source);
+			if(preMatch.index == w.matchStart-1)
+				{
+				w.outputText(w.output,w.matchStart,w.nextMatch);
+				return;
+				}
+			}
+		if(w.autoLinkWikiWords == true || store.isShadowTiddler(w.matchText))
+			{
+			var link = createTiddlyLink(w.output,w.matchText,false,null,w.isStatic);
+			w.outputText(link,w.matchStart,w.nextMatch);
+			}
+		else
+			{
+			w.outputText(w.output,w.matchStart,w.nextMatch);
+			}
+	}
+},
+
+{
+	name: "urlLink",
+	match: config.textPrimitives.urlPattern,
+	handler: function(w)
+	{
+		w.outputText(createExternalLink(w.output,w.matchText),w.matchStart,w.nextMatch);
+	}
+},
+
+{
+	name: "image",
+	match: "\\[[<>]?[Ii][Mm][Gg]\\[",
+	lookaheadRegExp: /\[(<?)(>?)[Ii][Mm][Gg]\[(?:([^\|\]]+)\|)?([^\[\]\|]+)\](?:\[([^\]]*)\])?\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) // Simple bracketted link
+			{
+			var e = w.output;
+			if(lookaheadMatch[5])
+				{
+				var link = lookaheadMatch[5];
+				e = config.formatterHelpers.isExternalLink(link) ? createExternalLink(w.output,link) : createTiddlyLink(w.output,link,false,null,w.isStatic);
+				addClass(e,"imageLink");
+				}
+			var img = createTiddlyElement(e,"img");
+			if(lookaheadMatch[1])
+				img.align = "left";
+			else if(lookaheadMatch[2])
+				img.align = "right";
+			if(lookaheadMatch[3])
+				img.title = lookaheadMatch[3];
+			img.src = lookaheadMatch[4];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			}
+	}
+},
+
+{
+	name: "html",
+	match: "<[Hh][Tt][Mm][Ll]>",
+	lookaheadRegExp: /<[Hh][Tt][Mm][Ll]>((?:.|\n)*?)<\/[Hh][Tt][Mm][Ll]>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source)
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			{
+			createTiddlyElement(w.output,"span").innerHTML = lookaheadMatch[1];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			}
+	}
+},
+
+{
+	name: "commentByBlock",
+	match: "/%",
+	lookaheadRegExp: /\/%((?:.|\n)*?)%\//mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source)
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+	}
+},
+
+{
+	name: "boldByChar",
+	match: "''",
+	termRegExp: /('')/mg,
+	element: "strong",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "italicByChar",
+	match: "//",
+	termRegExp: /(\/\/)/mg,
+	element: "em",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "underlineByChar",
+	match: "__",
+	termRegExp: /(__)/mg,
+	element: "u",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "strikeByChar",
+	match: "--(?!\\s|$)",
+	termRegExp: /((?!\s)--|(?=\n\n))/mg,
+	element: "strike",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "superscriptByChar",
+	match: "\\^\\^",
+	termRegExp: /(\^\^)/mg,
+	element: "sup",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "subscriptByChar",
+	match: "~~",
+	termRegExp: /(~~)/mg,
+	element: "sub",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "monospacedByChar",
+	match: "\\{\\{\\{",
+	lookaheadRegExp: /\{\{\{((?:.|\n)*?)\}\}\}/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source)
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			{
+			createTiddlyElement(w.output,"code",null,null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			}
+	}
+},
+
+{
+	name: "styleByChar",
+	match: "@@",
+	termRegExp: /(@@)/mg,
+	handler:  function(w)
+	{
+		var e = createTiddlyElement(w.output,"span");
+		var styles = config.formatterHelpers.inlineCssHelper(w);
+		if(styles.length == 0)
+			e.className = "marked";
+		else
+			config.formatterHelpers.applyCssHelper(e,styles);
+		w.subWikifyTerm(e,this.termRegExp);
+	}
+},
+
+{
+	name: "lineBreak",
+	match: "\\n|<br ?/?>",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"br");
+	}
+},
+
+{
+	name: "rawText",
+	match: "\\\"{3}|<nowiki>",
+	lookaheadRegExp: /(?:\"{3}|<nowiki>)((?:.|\n)*?)(?:\"{3}|<\/nowiki>)/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source)
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			{
+			createTiddlyElement(w.output,"span",null,null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			}
+	}
+},
+
+{
+	name: "mdash",
+	match: "--",
+	handler: function(w)
+		{
+		createTiddlyElement(w.output,"span").innerHTML = "&mdash;";
+		}
+},
+
+{
+	name: "htmlEntitiesEncoding",
+	match: "(?:(?:&#?[a-zA-Z0-9]{2,8};|.)(?:&#?(?:x0*(?:3[0-6][0-9a-fA-F]|1D[c-fC-F][0-9a-fA-F]|20[d-fD-F][0-9a-fA-F]|FE2[0-9a-fA-F])|0*(?:76[89]|7[7-9][0-9]|8[0-7][0-9]|761[6-9]|76[2-7][0-9]|84[0-3][0-9]|844[0-7]|6505[6-9]|6506[0-9]|6507[0-1]));)+|&#?[a-zA-Z0-9]{2,8};)",
+	handler: function(w)
+		{
+		createTiddlyElement(w.output,"span").innerHTML = w.matchText;
+		}
+},
+
+{
+	name: "customClasses",
+	match: "\\{\\{",
+	termRegExp: /(\}\}\})/mg,
+	lookaheadRegExp: /\{\{[\s]*([\w]+[\s\w]*)[\s]*\{(\n?)/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch)
+			{
+			var e = createTiddlyElement(w.output,lookaheadMatch[2] == "\n" ? "div" : "span",null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			w.subWikifyTerm(e,this.termRegExp);
+			}
+	}
+}
+
+];
+
+// ---------------------------------------------------------------------------------
+// Wikifier
+// ---------------------------------------------------------------------------------
+
+function getParser(tiddler)
+{
+	var f = formatter;
+	if(tiddler!=null)
+		{
+		for(var i in config.parsers)
+			{
+			if(tiddler.isTagged(config.parsers[i].formatTag))
+				{
+				f = config.parsers[i];
+				break;
+				}
+			}
+		}
+	return f;
+}
+
+function wikify(source,output,highlightRegExp,tiddler)
+{
+	if(source && source != "")
+		{
+		var wikifier = new Wikifier(source,getParser(tiddler),highlightRegExp,tiddler);
+		wikifier.subWikifyUnterm(output);
+		}
+}
+
+function wikifyStatic(source,highlightRegExp,tiddler)
+{
+	var e = createTiddlyElement(document.body,"div");
+	e.style.display = "none";
+	var html = "";
+	if(source && source != "")
+		{
+		var wikifier = new Wikifier(source,getParser(tiddler),highlightRegExp,tiddler);
+		wikifier.isStatic = true;
+		wikifier.subWikifyUnterm(e);
+		html = e.innerHTML;
+		e.parentNode.removeChild(e);
+		}
+	return html;
+}
+
+// Wikify a named tiddler to plain text
+function wikifyPlain(title)
+{
+	if(store.tiddlerExists(title) || store.isShadowTiddler(title))
+		{
+		var wikifier = new Wikifier(store.getTiddlerText(title),formatter,null,store.getTiddler(title));
+		return wikifier.wikifyPlain();
+		}
+	else
+		return "";
+}
+
+// Highlight plain text into an element
+function highlightify(source,output,highlightRegExp)
+{
+	if(source && source != "")
+		{
+		var wikifier = new Wikifier(source,formatter,highlightRegExp);
+		wikifier.outputText(output,0,source.length);
+		}
+}
+
+// Construct a wikifier object
+// source - source string that's going to be wikified
+// formatter - Formatter() object containing the list of formatters to be used
+// highlightRegExp - regular expression of the text string to highlight
+// tiddler - reference to the tiddler that's taken to be the container for this wikification
+function Wikifier(source,formatter,highlightRegExp,tiddler)
+{
+	this.source = source;
+	this.output = null;
+	this.formatter = formatter;
+	this.nextMatch = 0;
+	this.autoLinkWikiWords = tiddler && tiddler.autoLinkWikiWords() == false ? false : true;
+	this.highlightRegExp = highlightRegExp;
+	this.highlightMatch = null;
+	this.isStatic = false;
+	if(highlightRegExp)
+		{
+		highlightRegExp.lastIndex = 0;
+		this.highlightMatch = highlightRegExp.exec(source);
+		}
+	this.tiddler = tiddler;
+}
+
+Wikifier.prototype.wikifyPlain = function()
+{
+	var e = createTiddlyElement(document.body,"div");
+	e.style.display = "none";
+	this.subWikify(e);
+	var text = getPlainText(e);
+	e.parentNode.removeChild(e);
+	return text;
+}
+
+Wikifier.prototype.subWikify = function(output,terminator)
+{
+	// Handle the terminated and unterminated cases separately
+	if (terminator)
+		this.subWikifyTerm(output,new RegExp("(" + terminator + ")","mg"));
+	else
+		this.subWikifyUnterm(output);
+}
+
+Wikifier.prototype.subWikifyUnterm = function(output)
+{
+	// subWikify() can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	// Get the first match
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+	while(formatterMatch)
+		{
+		// Output any text before the match
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		// Set the match parameters for the handler
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		// Figure out which formatter matched and call its handler
+		for(var t=1; t<formatterMatch.length; t++)
+			{
+			if(formatterMatch[t])
+				{
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+				}
+			}
+		// Get the next match
+		formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+		}
+	// Output any text after the last match
+	if(this.nextMatch < this.source.length)
+		{
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+		}
+	// Restore the output pointer
+	this.output = oldOutput;
+}
+
+Wikifier.prototype.subWikifyTerm = function(output,terminatorRegExp)
+{
+	// subWikify() can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	// Get the first matches for the formatter and terminator RegExps
+	terminatorRegExp.lastIndex = this.nextMatch;
+	var terminatorMatch = terminatorRegExp.exec(this.source);
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+	while(terminatorMatch || formatterMatch)
+		{
+		// Check for a terminator match  before the next formatter match
+		if(terminatorMatch && (!formatterMatch || terminatorMatch.index <= formatterMatch.index))
+			{
+			// Output any text before the match
+			if(terminatorMatch.index > this.nextMatch)
+				this.outputText(this.output,this.nextMatch,terminatorMatch.index);
+			// Set the match parameters
+			this.matchText = terminatorMatch[1];
+			this.matchLength = terminatorMatch[1].length;
+			this.matchStart = terminatorMatch.index;
+			this.nextMatch = this.matchStart + this.matchLength;
+			// Restore the output pointer
+			this.output = oldOutput;
+			return;
+			}
+		// It must be a formatter match; output any text before the match
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		// Set the match parameters
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		// Figure out which formatter matched and call its handler
+		for(var t=1; t<formatterMatch.length; t++)
+			{
+			if(formatterMatch[t])
+				{
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+				}
+			}
+		// Get the next match
+		terminatorRegExp.lastIndex = this.nextMatch;
+		terminatorMatch = terminatorRegExp.exec(this.source);
+		formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+		}
+	// Output any text after the last match
+	if(this.nextMatch < this.source.length)
+		{
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+		}
+	// Restore the output pointer
+	this.output = oldOutput;
+}
+
+Wikifier.prototype.outputText = function(place,startPos,endPos)
+{
+	// Check for highlights
+	while(this.highlightMatch && (this.highlightRegExp.lastIndex > startPos) && (this.highlightMatch.index < endPos) && (startPos < endPos))
+		{
+		// Deal with any plain text before the highlight
+		if(this.highlightMatch.index > startPos)
+			{
+			createTiddlyText(place,this.source.substring(startPos,this.highlightMatch.index));
+			startPos = this.highlightMatch.index;
+			}
+		// Deal with the highlight
+		var highlightEnd = Math.min(this.highlightRegExp.lastIndex,endPos);
+		var theHighlight = createTiddlyElement(place,"span",null,"highlight",this.source.substring(startPos,highlightEnd));
+		startPos = highlightEnd;
+		// Nudge along to the next highlight if we're done with this one
+		if(startPos >= this.highlightRegExp.lastIndex)
+			this.highlightMatch = this.highlightRegExp.exec(this.source);
+		}
+	// Do the unhighlighted text left over
+	if(startPos < endPos)
+		{
+		createTiddlyText(place,this.source.substring(startPos,endPos));
+		}
+}
+
+// ---------------------------------------------------------------------------------
+// Macro definitions
+// ---------------------------------------------------------------------------------
+
+config.macros.today.handler = function(place,macroName,params)
+{
+	var now = new Date();
+	var text;
+	if(params[0])
+		text = now.formatString(params[0].trim());
+	else
+		text = now.toLocaleString();
+	createTiddlyElement(place,"span",null,null,text);
+}
+
+config.macros.version.handler = function(place)
+{
+	createTiddlyElement(place,"span",null,null,version.major + "." + version.minor + "." + version.revision + (version.beta ? " (beta " + version.beta + ")" : ""));
+}
+
+config.macros.list.handler = function(place,macroName,params)
+{
+	var type = params[0] ? params[0] : "all";
+	var theList = document.createElement("ul");
+	place.appendChild(theList);
+	if(this[type].prompt)
+		createTiddlyElement(theList,"li",null,"listTitle",this[type].prompt);
+	var results;
+	if(this[type].handler)
+		results = this[type].handler(params);
+	for(var t = 0; t < results.length; t++)
+		{
+		var theListItem = document.createElement("li")
+		theList.appendChild(theListItem);
+		if(typeof results[t] == "string")
+			createTiddlyLink(theListItem,results[t],true);
+		else
+			createTiddlyLink(theListItem,results[t].title,true);
+		}
+}
+
+config.macros.list.all.handler = function(params)
+{
+	return store.reverseLookup("tags","excludeLists",false,"title");
+}
+
+config.macros.list.missing.handler = function(params)
+{
+	return store.getMissingLinks();
+}
+
+config.macros.list.orphans.handler = function(params)
+{
+	return store.getOrphans();
+}
+
+config.macros.list.shadowed.handler = function(params)
+{
+	return store.getShadowed();
+}
+
+config.macros.allTags.handler = function(place,macroName,params)
+{
+	var tags = store.getTags();
+	var theDateList = createTiddlyElement(place,"ul");
+	if(tags.length == 0)
+		createTiddlyElement(theDateList,"li",null,"listTitle",this.noTags);
+	for(var t=0; t<tags.length; t++)
+		{
+		var theListItem =createTiddlyElement(theDateList,"li");
+		var theTag = createTiddlyButton(theListItem,tags[t][0] + " (" + tags[t][1] + ")",this.tooltip.format([tags[t][0]]),onClickTag);
+		theTag.setAttribute("tag",tags[t][0]);
+		}
+}
+
+config.macros.timeline.handler = function(place,macroName,params)
+{
+	var field = params[0] ? params[0] : "modified";
+	var tiddlers = store.reverseLookup("tags","excludeLists",false,field);
+	var lastDay = "";
+	var last = params[1] ? tiddlers.length-Math.min(tiddlers.length,parseInt(params[1])) : 0;
+	for(var t=tiddlers.length-1; t>=last; t--)
+		{
+		var tiddler = tiddlers[t];
+		var theDay = tiddler[field].convertToLocalYYYYMMDDHHMM().substr(0,8);
+		if(theDay != lastDay)
+			{
+			var theDateList = document.createElement("ul");
+			place.appendChild(theDateList);
+			createTiddlyElement(theDateList,"li",null,"listTitle",tiddler[field].formatString(this.dateFormat));
+			lastDay = theDay;
+			}
+		var theDateListItem = createTiddlyElement(theDateList,"li",null,"listLink");
+		theDateListItem.appendChild(createTiddlyLink(place,tiddler.title,true));
+		}
+}
+
+config.macros.search.handler = function(place,macroName,params)
+{
+	var searchTimeout = null;
+	var btn = createTiddlyButton(place,this.label,this.prompt,this.onClick);
+	var txt = createTiddlyElement(place,"input",null,"txtOptionInput");
+	if(params[0])
+		txt.value = params[0];
+	txt.onkeyup = this.onKeyPress;
+	txt.onfocus = this.onFocus;
+	txt.setAttribute("size",this.sizeTextbox);
+	txt.setAttribute("accessKey",this.accessKey);
+	txt.setAttribute("autocomplete","off");
+	txt.setAttribute("lastSearchText","");
+	if(config.browser.isSafari)
+		{
+		txt.setAttribute("type","search");
+		txt.setAttribute("results","5");
+		}
+	else
+		txt.setAttribute("type","text");
+}
+
+// Global because there's only ever one outstanding incremental search timer
+config.macros.search.timeout = null;
+
+config.macros.search.doSearch = function(txt)
+{
+	if(txt.value.length > 0)
+		{
+		story.search(txt.value,config.options.chkCaseSensitiveSearch,config.options.chkRegExpSearch);
+		txt.setAttribute("lastSearchText",txt.value);
+		}
+}
+
+config.macros.search.onClick = function(e)
+{
+	config.macros.search.doSearch(this.nextSibling);
+	return false;
+}
+
+config.macros.search.onKeyPress = function(e)
+{
+	if(!e) var e = window.event;
+	switch(e.keyCode)
+		{
+		case 13: // Ctrl-Enter
+		case 10: // Ctrl-Enter on IE PC
+			config.macros.search.doSearch(this);
+			break;
+		case 27: // Escape
+			this.value = "";
+			clearMessage();
+			break;
+		}
+	if(this.value.length > 2)
+		{
+		if(this.value != this.getAttribute("lastSearchText"))
+			{
+			if(config.macros.search.timeout)
+				clearTimeout(config.macros.search.timeout);
+			var txt = this;
+			config.macros.search.timeout = setTimeout(function() {config.macros.search.doSearch(txt);},500);
+			}
+		}
+	else
+		{
+		if(config.macros.search.timeout)
+			clearTimeout(config.macros.search.timeout);
+		}
+}
+
+config.macros.search.onFocus = function(e)
+{
+	this.select();
+}
+
+config.macros.tiddler.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("name",null,true,false,true);
+	var names = params[0]["name"];
+	var tiddlerName = names[0];
+	var className = names[1] ? names[1] : null;
+	var args = params[0]["with"];
+	var wrapper = createTiddlyElement(place,"span",null,className);
+	if(!args)
+		{
+		wrapper.setAttribute("refresh","content");
+		wrapper.setAttribute("tiddler",tiddlerName);
+		}
+	var text = store.getTiddlerText(tiddlerName);
+	if(text)
+		{
+		var stack = config.macros.tiddler.tiddlerStack;
+		if(stack.indexOf(tiddlerName) !== -1)
+			return;
+		stack.push(tiddlerName);
+		try
+			{
+			var n = args ? Math.min(args.length,9) : 0;
+			for(var i=0; i<n; i++) 
+				{
+				var placeholderRE = new RegExp("\\$" + (i + 1),"mg");
+				text = text.replace(placeholderRE,args[i]);
+				}
+			config.macros.tiddler.renderText(wrapper,text,tiddlerName,params);
+			}
+		finally
+			{
+			stack.pop();
+			}
+		}
+}
+
+config.macros.tiddler.renderText = function(place,text,tiddlerName,params) 
+{
+	wikify(text,place,null,store.getTiddler(tiddlerName));
+}
+
+config.macros.tiddler.tiddlerStack = [];
+
+config.macros.tag.handler = function(place,macroName,params)
+{
+	createTagButton(place,params[0]);
+}
+
+config.macros.tags.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var theList = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title && store.tiddlerExists(title))
+		tiddler = store.getTiddler(title);
+	var sep = getParam(params,"sep"," ");
+	var lingo = config.views.wikified.tag;
+	var prompt = tiddler.tags.length == 0 ? lingo.labelNoTags : lingo.labelTags;
+	createTiddlyElement(theList,"li",null,"listTitle",prompt.format([tiddler.title]));
+	for(var t=0; t<tiddler.tags.length; t++)
+		{
+		createTagButton(createTiddlyElement(theList,"li"),tiddler.tags[t],tiddler.title);
+		if(t<tiddler.tags.length-1)
+			createTiddlyText(theList,sep);
+		}
+}
+
+config.macros.tagging.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var theList = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title == "" && tiddler instanceof Tiddler)
+		title = tiddler.title;
+	var sep = getParam(params,"sep"," ");
+	theList.setAttribute("title",this.tooltip.format([title]));
+	var tagged = store.getTaggedTiddlers(title);
+	var prompt = tagged.length == 0 ? this.labelNotTag : this.label;
+	createTiddlyElement(theList,"li",null,"listTitle",prompt.format([title,tagged.length]));
+	for(var t=0; t<tagged.length; t++)
+		{
+		createTiddlyLink(createTiddlyElement(theList,"li"),tagged[t].title,true);
+		if(t<tagged.length-1)
+			createTiddlyText(theList,sep);
+		}
+}
+
+config.macros.closeAll.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+}
+
+config.macros.closeAll.onClick = function(e)
+{
+	story.closeAllTiddlers();
+	return false;
+}
+
+config.macros.permaview.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+}
+
+config.macros.permaview.onClick = function(e)
+{
+	story.permaView();
+	return false;
+}
+
+config.macros.saveChanges.handler = function(place)
+{
+	if(!readOnly)
+		createTiddlyButton(place,this.label,this.prompt,this.onClick,null,null,this.accessKey);
+}
+
+config.macros.saveChanges.onClick = function(e)
+{
+	saveChanges();
+	return false;
+}
+
+config.macros.slider.onClickSlider = function(e)
+{
+	if(!e) var e = window.event;
+	var n = this.nextSibling;
+	var cookie = n.getAttribute("cookie");
+	var isOpen = n.style.display != "none";
+	if(anim && config.options.chkAnimate)
+		anim.startAnimating(new Slider(n,!isOpen,e.shiftKey || e.altKey,"none"));
+	else
+		n.style.display = isOpen ? "none" : "block";
+	config.options[cookie] = !isOpen;
+	saveOptionCookie(cookie);
+	return false;
+}
+
+config.macros.slider.createSlider = function(place,cookie,title,tooltip)
+{
+	var cookie = cookie ? cookie : "";
+	var btn = createTiddlyButton(place,title,tooltip,this.onClickSlider);
+	var panel = createTiddlyElement(null,"div",null,"sliderPanel");
+	panel.setAttribute("cookie",cookie);
+	panel.style.display = config.options[cookie] ? "block" : "none";
+	place.appendChild(panel);
+	return panel;
+}
+
+config.macros.slider.handler = function(place,macroName,params)
+{
+	var panel = this.createSlider(place,params[0],params[2],params[3]);
+	var text = store.getTiddlerText(params[1]);
+	panel.setAttribute("refresh", "content");
+	panel.setAttribute("tiddler", params[1]);
+	if(text)
+		wikify(text,panel,null,store.getTiddler(params[1]));
+}
+
+config.macros.option.onChangeOption = function(e)
+{
+	var opt = this.getAttribute("option");
+	var elementType,valueField;
+	if(opt)
+		{
+		switch(opt.substr(0,3))
+			{
+			case "txt":
+				elementType = "input";
+				valueField = "value";
+				break;
+			case "chk":
+				elementType = "input";
+				valueField = "checked";
+				break;
+			}
+		config.options[opt] = this[valueField];
+		saveOptionCookie(opt);
+		var nodes = document.getElementsByTagName(elementType);
+		for(var t=0; t<nodes.length; t++)
+			{
+			var optNode = nodes[t].getAttribute("option");
+			if(opt == optNode)
+				nodes[t][valueField] = this[valueField];
+			}
+		}
+	return(true);
+}
+
+config.macros.option.handler = function(place,macroName,params)
+{
+	var opt = params[0];
+	if(config.options[opt] == undefined)
+		return;
+	var c;
+	switch(opt.substr(0,3))
+		{
+		case "txt":
+			c = document.createElement("input");
+			c.onkeyup = this.onChangeOption;
+			c.setAttribute("option",opt);
+			c.className = "txtOptionInput";
+			place.appendChild(c);
+			c.value = config.options[opt];
+			break;
+		case "chk":
+			c = document.createElement("input");
+			c.setAttribute("type","checkbox");
+			c.onclick = this.onChangeOption;
+			c.setAttribute("option",opt);
+			c.className = "chkOptionInput";
+			place.appendChild(c);
+			c.checked = config.options[opt];
+			break;
+		}
+}
+
+
+
+config.macros.newTiddler.createNewTiddlerButton = function(place,title,params,label,prompt,accessKey,newFocus,isJournal)
+{
+	var tags = [];
+	for(var t=1; t<params.length; t++)
+		if((params[t].name == "anon" && t != 1) || (params[t].name == "tag"))
+			tags.push(params[t].value);
+	label = getParam(params,"label",label);
+	prompt = getParam(params,"prompt",prompt);
+	accessKey = getParam(params,"accessKey",accessKey);
+	newFocus = getParam(params,"focus",newFocus);
+	var btn = createTiddlyButton(place,label,prompt,this.onClickNewTiddler,null,null,accessKey);
+	btn.setAttribute("newTitle",title);
+	btn.setAttribute("isJournal",isJournal);
+	btn.setAttribute("params",tags.join("|"));
+	btn.setAttribute("newFocus",newFocus);
+	btn.setAttribute("newTemplate",getParam(params,"template",DEFAULT_EDIT_TEMPLATE));
+	var text = getParam(params,"text");
+	if(text !== undefined) 
+		btn.setAttribute("newText",text);
+	return btn;
+}
+
+config.macros.newTiddler.onClickNewTiddler = function()
+{
+	var title = this.getAttribute("newTitle");
+	if(this.getAttribute("isJournal"))
+		{
+		var now = new Date();
+		title = now.formatString(title.trim());
+		}
+	var params = this.getAttribute("params").split("|");
+	var focus = this.getAttribute("newFocus");
+	var template = this.getAttribute("newTemplate");
+	story.displayTiddler(null,title,template);
+	var text = this.getAttribute("newText");
+	if(typeof text == "string")
+		story.getTiddlerField(title,"text").value = text.format([title]);
+	for(var t=0;t<params.length;t++)
+		story.setTiddlerTag(title,params[t],+1);
+	story.focusTiddler(title,focus);
+	return false;
+}
+
+config.macros.newTiddler.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!readOnly)
+		{
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : this.title;
+		title = getParam(params,"title",title);
+		this.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"title",false);
+		}
+}
+
+config.macros.newJournal.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!readOnly)
+		{
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : "";
+		title = getParam(params,"title",title);
+		config.macros.newTiddler.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"text",true);
+		}
+}
+
+config.macros.sparkline.handler = function(place,macroName,params)
+{
+	var data = [];
+	var min = 0;
+	var max = 0;
+	for(var t=0; t<params.length; t++)
+		{
+		var v = parseInt(params[t]);
+		if(v < min)
+			min = v;
+		if(v > max)
+			max = v;
+		data.push(v);
+		}
+	if(data.length < 1)
+		return;
+	var box = createTiddlyElement(place,"span",null,"sparkline",String.fromCharCode(160));
+	box.title = data.join(",");
+	var w = box.offsetWidth;
+	var h = box.offsetHeight;
+	box.style.paddingRight = (data.length * 2 - w) + "px";
+	box.style.position = "relative";
+	for(var d=0; d<data.length; d++)
+		{
+		var tick = document.createElement("img");
+		tick.border = 0;
+		tick.className = "sparktick";
+		tick.style.position = "absolute";
+		tick.src = "data:image/gif,GIF89a%01%00%01%00%91%FF%00%FF%FF%FF%00%00%00%C0%C0%C0%00%00%00!%F9%04%01%00%00%02%00%2C%00%00%00%00%01%00%01%00%40%02%02T%01%00%3B";
+		tick.style.left = d*2 + "px";
+		tick.style.width = "2px";
+		var v = Math.floor(((data[d] - min)/(max-min)) * h);
+		tick.style.top = (h-v) + "px";
+		tick.style.height = v + "px";
+		box.appendChild(tick);
+		}
+}
+
+config.macros.tabs.handler = function(place,macroName,params)
+{
+	var cookie = params[0];
+	var numTabs = (params.length-1)/3;
+	var wrapper = createTiddlyElement(null,"div",null,cookie);
+	var tabset = createTiddlyElement(wrapper,"div",null,"tabset");
+	tabset.setAttribute("cookie",cookie);
+	var validTab = false;
+	for(var t=0; t<numTabs; t++)
+		{
+		var label = params[t*3+1];
+		var prompt = params[t*3+2];
+		var content = params[t*3+3];
+		var tab = createTiddlyButton(tabset,label,prompt,this.onClickTab,"tab tabUnselected");
+		tab.setAttribute("tab",label);
+		tab.setAttribute("content",content);
+		tab.title = prompt;
+		if(config.options[cookie] == label)
+			validTab = true;
+		}
+	if(!validTab)
+		config.options[cookie] = params[1];
+	place.appendChild(wrapper);
+	this.switchTab(tabset,config.options[cookie]);
+}
+
+config.macros.tabs.onClickTab = function(e)
+{
+	config.macros.tabs.switchTab(this.parentNode,this.getAttribute("tab"));
+	return false;
+}
+
+config.macros.tabs.switchTab = function(tabset,tab)
+{
+	var cookie = tabset.getAttribute("cookie");
+	var theTab = null
+	var nodes = tabset.childNodes;
+	for(var t=0; t<nodes.length; t++)
+		if(nodes[t].getAttribute && nodes[t].getAttribute("tab") == tab)
+			{
+			theTab = nodes[t];
+			theTab.className = "tab tabSelected";
+			}
+		else
+			nodes[t].className = "tab tabUnselected"
+	if(theTab)
+		{
+		if(tabset.nextSibling && tabset.nextSibling.className == "tabContents")
+			tabset.parentNode.removeChild(tabset.nextSibling);
+		var tabContent = createTiddlyElement(null,"div",null,"tabContents");
+		tabset.parentNode.insertBefore(tabContent,tabset.nextSibling);
+		var contentTitle = theTab.getAttribute("content");
+		wikify(store.getTiddlerText(contentTitle),tabContent,null,store.getTiddler(contentTitle));
+		if(cookie)
+			{
+			config.options[cookie] = tab;
+			saveOptionCookie(cookie);
+			}
+		}
+}
+
+// <<gradient [[tiddler name]] vert|horiz rgb rgb rgb rgb... >>
+config.macros.gradient.handler = function(place,macroName,params,wikifier)
+{
+	var terminator = ">>";
+	var panel;
+	if(wikifier)
+		panel = createTiddlyElement(place,"div",null,"gradient");
+	else
+		panel = place;
+	panel.style.position = "relative";
+	panel.style.overflow = "hidden";
+	panel.style.zIndex = "0";
+	var t;
+	if(wikifier)
+		{
+		var styles = config.formatterHelpers.inlineCssHelper(wikifier);
+		config.formatterHelpers.applyCssHelper(panel,styles);
+		}
+	var colours = [];
+	for(t=1; t<params.length; t++)
+		{
+		var c = new RGB(params[t]);
+		if(c)
+			colours.push(c);
+		}
+	drawGradient(panel,params[0] != "vert",colours);
+	if(wikifier)
+		wikifier.subWikify(panel,terminator);
+	if(document.all)
+		{
+		panel.style.height = "100%";
+		panel.style.width = "100%";
+		}
+}
+
+config.macros.message.handler = function(place,macroName,params)
+{
+	if(params[0])
+		{
+		var m = config;
+		var p = params[0].split(".");
+		for(var t=0; t<p.length; t++)
+			{
+			if(p[t] in m)
+				m = m[p[t]];
+			else
+				break;
+			}
+		createTiddlyText(place,m.toString().format(params.splice(1)));
+		}
+}
+
+config.macros.view.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if((tiddler instanceof Tiddler) && params[0])
+		{
+		var value = store.getValue(tiddler,params[0]);
+		if(value != undefined)
+			switch(params[1])
+				{
+				case undefined:
+					highlightify(value,place,highlightHack);
+					break;
+				case "link":
+					createTiddlyLink(place,value,true);
+					break;
+				case "wikified":
+					wikify(value,place,highlightHack,tiddler);
+					break;
+				case "date":
+					value = Date.convertFromYYYYMMDDHHMM(value);
+					if(params[2])
+						createTiddlyText(place,value.formatString(params[2]));
+					else
+						createTiddlyText(place,value);
+					break;
+				}
+		}
+}
+
+config.macros.edit.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var field = params[0];
+	if((tiddler instanceof Tiddler) && field)
+		{
+		story.setDirty(tiddler.title,true);
+		if(field != "text")
+			{
+				var e = createTiddlyElement(null,"input");
+				if(tiddler.isReadOnly())
+					e.setAttribute("readOnly","readOnly");
+				e.setAttribute("edit",field);
+				e.setAttribute("type","text");
+				var v = store.getValue(tiddler,field);
+				if(!v) 
+					v = "";
+				e.value = v;
+				e.setAttribute("size","40");
+				e.setAttribute("autocomplete","off");
+				place.appendChild(e);
+			}
+		else
+			{
+				var wrapper1 = createTiddlyElement(null,"fieldset",null,"fieldsetFix");
+				var wrapper2 = createTiddlyElement(wrapper1,"div");
+				var e = createTiddlyElement(wrapper2,"textarea");
+				if(tiddler.isReadOnly())
+					e.setAttribute("readOnly","readOnly");
+				var v = store.getValue(tiddler,field);
+				if(!v) 
+					v = "";
+				e.value = v;
+				var rows = 10;
+				var lines = v.match(/\n/mg);
+				var maxLines = Math.max(parseInt(config.options.txtMaxEditRows),5);
+				if(lines != null && lines.length > rows)
+					rows = lines.length + 5;
+				rows = Math.min(rows,maxLines);
+				e.setAttribute("rows",rows);
+				e.setAttribute("edit",field);
+				place.appendChild(wrapper1);
+			}
+		}
+}
+
+config.macros.tagChooser.onClick = function(e)
+{
+	if(!e) var e = window.event;
+	var lingo = config.views.editor.tagChooser;
+	var popup = Popup.create(this);
+	var tags = store.getTags();
+	if(tags.length == 0)
+		createTiddlyText(createTiddlyElement(popup,"li"),lingo.popupNone);
+	for(var t=0; t<tags.length; t++)
+		{
+		var theTag = createTiddlyButton(createTiddlyElement(popup,"li"),tags[t][0],lingo.tagTooltip.format([tags[t][0]]),config.macros.tagChooser.onTagClick);
+		theTag.setAttribute("tag",tags[t][0]);
+		theTag.setAttribute("tiddler", this.getAttribute("tiddler"));
+		}
+	Popup.show(popup,false);
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return(false);
+}
+
+config.macros.tagChooser.onTagClick = function(e)
+{
+	if(!e) var e = window.event;
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(!readOnly)
+		story.setTiddlerTag(title,tag,0);
+	return(false);
+}
+
+config.macros.tagChooser.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(tiddler instanceof Tiddler)
+		{
+		var title = tiddler.title;
+		var lingo = config.views.editor.tagChooser;
+		var btn = createTiddlyButton(place,lingo.text,lingo.tooltip,this.onClick);
+		btn.setAttribute("tiddler", title);
+		}
+}
+
+// Create a toolbar command button
+// place - parent DOM element
+// command - reference to config.commands[] member -or- name of member
+// tiddler - reference to tiddler that toolbar applies to
+// theClass - the class to give the button
+config.macros.toolbar.createCommand = function(place,commandName,tiddler,theClass)
+{
+	if(typeof commandName != "string")
+		{
+		var c = null;
+		for(var t in config.commands)
+			if(config.commands[t] == commandName)
+				c = t;
+		commandName = c;
+		}
+	if((tiddler instanceof Tiddler) && (typeof commandName == "string"))
+		{
+		var title = tiddler.title;
+		var command = config.commands[commandName];
+		var ro = tiddler.isReadOnly();
+		var shadow = store.isShadowTiddler(title) && !store.tiddlerExists(title);
+		var text = ro && command.readOnlyText ? command.readOnlyText : command.text;
+		var tooltip = ro && command.readOnlyTooltip ? command.readOnlyTooltip : command.tooltip;
+		if((!ro || (ro && !command.hideReadOnly)) && !(shadow && command.hideShadow))
+
+			{
+			var btn = createTiddlyButton(null,text,tooltip,this.onClickCommand);
+			btn.setAttribute("commandName", commandName);
+			btn.setAttribute("tiddler", title);
+			if(theClass)
+				addClass(btn,theClass);
+			place.appendChild(btn);
+			}
+		}
+}
+
+config.macros.toolbar.onClickCommand = function(e)
+{
+	if(!e) var e = window.event;
+	var command = config.commands[this.getAttribute("commandName")];
+	return command.handler(e,this,this.getAttribute("tiddler"));
+}
+
+// Invoke the first command encountered from a given place that is tagged with a specified class
+config.macros.toolbar.invokeCommand = function(place,theClass,event)
+{
+	var children = place.getElementsByTagName("a")
+	for(var t=0; t<children.length; t++)
+		{
+		var c = children[t];
+		if(hasClass(c,theClass) && c.getAttribute && c.getAttribute("commandName"))
+			{
+			if(c.onclick instanceof Function)
+				c.onclick.call(c,event);
+			break;
+			}
+		}
+}
+
+config.macros.toolbar.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	for(var t=0; t<params.length; t++)
+		{
+		var c = params[t];
+		var theClass = "";
+		switch(c.substr(0,1))
+			{
+			case "+":
+				theClass = "defaultCommand";
+				c = c.substr(1);
+				break;
+			case "-":
+				theClass = "cancelCommand";
+				c = c.substr(1);
+				break;
+			}
+		if(c in config.commands)
+			this.createCommand(place,c,tiddler,theClass);
+		}
+}
+
+config.macros.plugins.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var e = createTiddlyElement(place,"div");
+	e.setAttribute("refresh","macro");
+	e.setAttribute("macroName","plugins");
+	e.setAttribute("params",paramString);
+	this.refresh(e,paramString);
+}
+
+config.macros.plugins.refresh = function(place,params)
+{
+	var selectedRows = [];
+	ListView.forEachSelector(place,function(e,rowName) {
+			if(e.checked)
+				selectedRows.push(e.getAttribute("rowName"));
+		});
+	removeChildren(place);
+	params = params.parseParams("anon");
+	var plugins = installedPlugins.slice(0);
+	var t,tiddler,p;
+	var configTiddlers = store.getTaggedTiddlers("systemConfig");
+	for(t=0; t<configTiddlers.length; t++)
+		{
+		tiddler = configTiddlers[t];
+		if(plugins.findByField("title",tiddler.title) == null)
+			{
+			p = getPluginInfo(tiddler);
+			p.executed = false;
+			p.log.splice(0,0,this.skippedText);
+			plugins.push(p);
+			}
+		}
+	for(t=0; t<plugins.length; t++)
+		{
+		var p = plugins[t];
+		p.forced = p.tiddler.isTagged("systemConfigForce");
+		p.disabled = p.tiddler.isTagged("systemConfigDisable");
+		p.Selected = selectedRows.indexOf(plugins[t].title) != -1;
+		}
+	if(plugins.length == 0)
+		createTiddlyElement(place,"em",null,null,this.noPluginText);
+	else
+		ListView.create(place,plugins,this.listViewTemplate,this.onSelectCommand);
+}
+
+config.macros.plugins.onSelectCommand = function(command,rowNames)
+{
+	var t;
+	switch(command)
+		{
+		case "remove":
+			for(t=0; t<rowNames.length; t++)
+				store.setTiddlerTag(rowNames[t],false,"systemConfig");
+			break;
+		case "delete":
+			if(rowNames.length > 0 && confirm(config.macros.plugins.confirmDeleteText.format([rowNames.join(", ")])))
+				{
+				for(t=0; t<rowNames.length; t++)
+					{
+					store.removeTiddler(rowNames[t]);
+					story.closeTiddler(rowNames[t],true,false);
+					}
+				}
+			break;
+		}
+	if(config.options.chkAutoSave)
+		saveChanges(true);
+}
+
+config.macros.refreshDisplay.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+}
+
+config.macros.refreshDisplay.onClick = function(e)
+{
+	refreshAll();
+	return false;
+}
+
+config.macros.importTiddlers.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(readOnly)
+		{
+		createTiddlyElement(place,"div",null,"marked",this.readOnlyWarning);
+		return;
+		}
+	var importer = createTiddlyElement(null,"div",null,"importTiddler wizard");
+	createTiddlyElement(importer,"h1",null,null,this.wizardTitle);
+	createTiddlyElement(importer,"h2",null,"step1",this.step1);
+	var step = createTiddlyElement(importer,"div",null,"wizardStep");
+	createTiddlyText(step,this.step1prompt);
+	var input = createTiddlyElement(null,"input",null,"txtOptionInput");
+	input.type = "text";
+	input.size = 50;
+	step.appendChild(input);
+	importer.inputBox = input;
+	createTiddlyElement(step,"br");
+	createTiddlyText(step,this.step1promptFile);
+	var fileInput = createTiddlyElement(null,"input",null,"txtOptionInput");
+	fileInput.type = "file";
+	fileInput.size = 50;
+	fileInput.onchange = this.onBrowseChange;
+	fileInput.onkeyup = this.onBrowseChange;
+	step.appendChild(fileInput);
+	createTiddlyElement(step,"br");
+	createTiddlyText(step,this.step1promptFeeds);
+	var feeds = this.getFeeds([{caption: this.step1feedPrompt, name: ""}]);
+	createTiddlyDropDown(step,this.onFeedChange,feeds);
+	createTiddlyElement(step,"br");
+	createTiddlyButton(step,this.fetchLabel,this.fetchPrompt,this.onFetch,null,null,null);
+        place.appendChild(importer);
+}
+
+config.macros.importTiddlers.getFeeds = function(feeds)
+{
+	var tagged = store.getTaggedTiddlers("contentPublisher","title");
+	for(var t=0; t<tagged.length; t++)
+		feeds.push({caption: tagged[t].title, name: store.getTiddlerSlice(tagged[t].title,"URL")});
+	return feeds;
+}
+
+config.macros.importTiddlers.onFeedChange = function(e)
+{
+	var importer = findRelated(this,"importTiddler","className","parentNode");
+	importer.inputBox.value = this.value;
+	this.selectedIndex = 0;
+}
+
+config.macros.importTiddlers.onBrowseChange = function(e)
+{
+	var importer = findRelated(this,"importTiddler","className","parentNode");
+	importer.inputBox.value = "file://" + this.value;
+}
+
+config.macros.importTiddlers.onFetch = function(e)
+{
+	var importer = findRelated(this,"importTiddler","className","parentNode");
+	var url = importer.inputBox.value;
+	var cutoff = findRelated(importer.firstChild,"step2","className","nextSibling");
+	while(cutoff)
+		{
+		var temp = cutoff.nextSibling;
+		cutoff.parentNode.removeChild(cutoff);
+		cutoff = temp;
+		}
+	createTiddlyElement(importer,"h2",null,"step2",config.macros.importTiddlers.step2);
+	var step = createTiddlyElement(importer,"div",null,"wizardStep",config.macros.importTiddlers.step2Text.format([url]));
+	loadRemoteFile(url,config.macros.importTiddlers.onLoad,importer);
+}
+
+config.macros.importTiddlers.onLoad = function(status,params,responseText,url,xhr)
+{
+	if(!status)
+		{
+		displayMessage(this.fetchError);
+		return;
+		}
+	var importer = params;
+	// Check that the tiddler we're in hasn't been closed - doesn't work on IE
+//	var p = importer;
+//	while(p.parentNode)
+//		p = p.parentNode;
+//	if(!(p instanceof HTMLDocument))
+//		return;
+	// Crack out the content - (should be refactored)
+	var posOpeningDiv = responseText.indexOf(startSaveArea);
+	var limitClosingDiv = responseText.indexOf("<!--POST-BODY-START--"+">");
+	var posClosingDiv = responseText.lastIndexOf(endSaveArea,limitClosingDiv == -1 ? responseText.length : limitClosingDiv);
+	if((posOpeningDiv == -1) || (posClosingDiv == -1))
+		{
+		alert(config.messages.invalidFileError.format([url]));
+		return;
+		}
+	var content = "<html><body>" + responseText.substring(posOpeningDiv,posClosingDiv + endSaveArea.length) + "</body></html>";
+	// Create the iframe
+	var iframe = document.createElement("iframe");
+	iframe.style.display = "none";
+	importer.insertBefore(iframe,importer.firstChild);
+	var doc = iframe.document;
+	if(iframe.contentDocument)
+		doc = iframe.contentDocument; // For NS6
+	else if(iframe.contentWindow)
+		doc = iframe.contentWindow.document; // For IE5.5 and IE6
+	// Put the content in the iframe
+	doc.open();
+	doc.writeln(content);
+	doc.close();
+	// Load the content into a TiddlyWiki() object
+	var storeArea = doc.getElementById("storeArea");
+	var importStore = new TiddlyWiki();
+	importStore.loadFromDiv(storeArea,"store");
+	// Get rid of the iframe
+	iframe.parentNode.removeChild(iframe);
+	// Extract data for the listview
+	var tiddlers = [];
+	importStore.forEachTiddler(function(title,tiddler)
+		{
+		var t = {};
+		t.title = title;
+		t.modified = tiddler.modified;
+		t.modifier = tiddler.modifier;
+		t.text = tiddler.text.substr(0,50);
+		t.tags = tiddler.tags;
+		tiddlers.push(t);
+		});
+	// Display the listview
+	createTiddlyElement(importer,"h2",null,"step3",config.macros.importTiddlers.step3);
+	var step = createTiddlyElement(importer,"div",null,"wizardStep");
+	ListView.create(step,tiddlers,config.macros.importTiddlers.listViewTemplate,config.macros.importTiddlers.onSelectCommand);
+	// Save the importer
+	importer.store = importStore;
+}
+
+config.macros.importTiddlers.onSelectCommand = function(listView,command,rowNames)
+{
+	var importer = findRelated(listView,"importTiddler","className","parentNode");
+	switch(command)
+		{
+		case "import":
+			config.macros.importTiddlers.doImport(importer,rowNames);
+			break;
+		}
+	if(config.options.chkAutoSave)
+		saveChanges(true);
+}
+
+config.macros.importTiddlers.doImport = function(importer,rowNames)
+{
+	var theStore = importer.store;
+	var overwrite = new Array();
+	var t;
+	for(t=0; t<rowNames.length; t++)
+		{
+		if(store.tiddlerExists(rowNames[t]))
+			overwrite.push(rowNames[t]);
+	}
+	if(overwrite.length > 0)
+		if(!confirm(this.confirmOverwriteText.format([overwrite.join(", ")])))
+			return;
+	for(t=0; t<rowNames.length; t++)
+		{
+		var inbound = theStore.fetchTiddler(rowNames[t]);
+		store.saveTiddler(inbound.title, inbound.title, inbound.text, inbound.modifier, inbound.modified, inbound.tags);
+		store.fetchTiddler(inbound.title).created = inbound.created;
+		store.notify(rowNames[t],false);
+		}
+	store.notifyAll();
+	store.setDirty(true);
+	createTiddlyElement(importer,"h2",null,"step4",this.step4.format([rowNames.length]));
+	var step = createTiddlyElement(importer,"div",null,"wizardStep");
+	for(t=0; t<rowNames.length; t++)
+		{
+		createTiddlyLink(step,rowNames[t],true);
+		createTiddlyElement(step,"br");
+		}
+	createTiddlyElement(importer,"h2",null,"step5",this.step5);
+}
+// ---------------------------------------------------------------------------------
+// Menu and toolbar commands
+// ---------------------------------------------------------------------------------
+
+config.commands.closeTiddler.handler = function(event,src,title)
+{
+	story.closeTiddler(title,true,event.shiftKey || event.altKey);
+	return false;
+}
+
+config.commands.closeOthers.handler = function(event,src,title)
+{
+	story.closeAllTiddlers(title);
+	return false;
+}
+
+config.commands.editTiddler.handler = function(event,src,title)
+{
+	clearMessage();
+	story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE);
+	story.focusTiddler(title,"text");
+	return false;
+}
+
+config.commands.saveTiddler.handler = function(event,src,title)
+{
+	var newTitle = story.saveTiddler(title,event.shiftKey);
+	if(newTitle)
+	   story.displayTiddler(null,newTitle);
+	return false;
+}
+
+config.commands.cancelTiddler.handler = function(event,src,title)
+{
+	if(story.hasChanges(title) && !readOnly)
+		if(!confirm(this.warning.format([title])))
+			return false;
+	story.setDirty(title,false);
+	story.displayTiddler(null,title);
+	return false;
+}
+
+config.commands.deleteTiddler.handler = function(event,src,title)
+{
+	var deleteIt = true;
+	if (config.options.chkConfirmDelete)
+		deleteIt = confirm(this.warning.format([title]));
+	if (deleteIt)
+		{
+		store.removeTiddler(title);
+		story.closeTiddler(title,true,event.shiftKey || event.altKey);
+		if(config.options.chkAutoSave)
+			saveChanges();
+		}
+	return false;
+}
+
+config.commands.permalink.handler = function(event,src,title)
+{
+	var t = encodeURIComponent(String.encodeTiddlyLink(title));
+	if(window.location.hash != t)
+		window.location.hash = t;
+	return false;
+}
+
+config.commands.references.handler = function(event,src,title)
+{
+	var popup = Popup.create(src);
+	if(popup)
+		{
+		var references = store.getReferringTiddlers(title);
+		var c = false;
+		for(var r=0; r<references.length; r++)
+			if(references[r].title != title && !references[r].isTagged("excludeLists"))
+				{
+				createTiddlyLink(createTiddlyElement(popup,"li"),references[r].title,true);
+				c = true;
+				}
+		if(!c)
+			createTiddlyText(createTiddlyElement(popup,"li",null,"disabled"),this.popupNone);
+		}
+	Popup.show(popup,false);
+	event.cancelBubble = true;
+	if (event.stopPropagation) event.stopPropagation();
+	return false;
+}
+
+config.commands.jump.handler = function(event,src,title)
+{
+	var popup = Popup.create(src);
+	if(popup)
+		{
+		story.forEachTiddler(function(title,element) {
+			createTiddlyLink(createTiddlyElement(popup,"li"),title,true);
+			});
+		}
+	Popup.show(popup,false);
+	event.cancelBubble = true;
+	if (event.stopPropagation) event.stopPropagation();
+	return false;
+}
+
+// ---------------------------------------------------------------------------------
+// Tiddler() object
+// ---------------------------------------------------------------------------------
+
+function Tiddler()
+{
+	this.title = null;
+	this.text = null;
+	this.modifier = null;
+	this.modified = new Date();
+	this.created = new Date();
+	this.links = [];
+	this.linksUpdated = false;
+	this.tags = [];
+	return this;
+}
+
+Tiddler.prototype.getLinks = function()
+{
+	if(this.linksUpdated==false)
+		this.changed();
+	return this.links;
+}
+
+// Format the text for storage in an RSS item
+Tiddler.prototype.saveToRss = function(url)
+{
+	var s = [];
+	s.push("<item>");
+	s.push("<title" + ">" + this.title.htmlEncode() + "</title" + ">");
+	s.push("<description>" + wikifyStatic(this.text,null,this).htmlEncode() + "</description>");
+	for(var t=0; t<this.tags.length; t++)
+		s.push("<category>" + this.tags[t] + "</category>");
+	s.push("<link>" + url + "#" + encodeURIComponent(String.encodeTiddlyLink(this.title)) + "</link>");
+	s.push("<pubDate>" + this.modified.toGMTString() + "</pubDate>");
+	s.push("</item>");
+	return(s.join("\n"));
+}
+
+// Change the text and other attributes of a tiddler
+Tiddler.prototype.set = function(title,text,modifier,modified,tags,created,fields)
+{
+	this.assign(title,text,modifier,modified,tags,created,fields);
+	this.changed();
+	return this;
+}
+
+// Change the text and other attributes of a tiddler without triggered a tiddler.changed() call
+Tiddler.prototype.assign = function(title,text,modifier,modified,tags,created,fields)
+{
+	if(title != undefined)
+		this.title = title;
+	if(text != undefined)
+		this.text = text;
+	if(modifier != undefined)
+		this.modifier = modifier;
+	if(modified != undefined)
+		this.modified = modified;
+	if(created != undefined)
+		this.created = created;
+	if(fields != undefined)
+		this.fields = fields;
+	if(tags != undefined)
+		this.tags = (typeof tags == "string") ? tags.readBracketedList() : tags;
+	else if(this.tags == undefined)
+		this.tags = [];
+	return this;
+}
+
+// Get the tags for a tiddler as a string (space delimited, using [[brackets]] for tags containing spaces)
+Tiddler.prototype.getTags = function()
+{
+	return String.encodeTiddlyLinkList(this.tags);
+}
+
+// Test if a tiddler carries a tag
+Tiddler.prototype.isTagged = function(tag)
+{
+	return this.tags.indexOf(tag) != -1;
+}
+
+// Static method to convert "\n" to newlines, "\s" to "\"
+Tiddler.unescapeLineBreaks = function(text)
+{
+	return text ? text.unescapeLineBreaks() : "";
+}
+
+// Convert newlines to "\n", "\" to "\s"
+Tiddler.prototype.escapeLineBreaks = function()
+{
+	return this.text.escapeLineBreaks();
+}
+
+// Updates the secondary information (like links[] array) after a change to a tiddler
+Tiddler.prototype.changed = function()
+{
+	this.links = [];
+	var t = this.autoLinkWikiWords() ? 0 : 1;
+	var tiddlerLinkRegExp = t==0 ? config.textPrimitives.tiddlerAnyLinkRegExp : config.textPrimitives.tiddlerForcedLinkRegExp;
+	tiddlerLinkRegExp.lastIndex = 0;
+	var formatMatch = tiddlerLinkRegExp.exec(this.text);
+	while(formatMatch)
+		{
+		if(t==0 && formatMatch[1] && formatMatch[1] != this.title) // wikiWordLink
+			{
+			if(formatMatch.index > 0)
+				{
+				var preRegExp = new RegExp(config.textPrimitives.unWikiLink+"|"+config.textPrimitives.anyLetter,"mg");
+				preRegExp.lastIndex = formatMatch.index-1;
+				var preMatch = preRegExp.exec(this.text);
+				if(preMatch.index != formatMatch.index-1)
+					this.links.pushUnique(formatMatch[1]);
+				}
+			else
+				this.links.pushUnique(formatMatch[1]);
+			}
+		else if(formatMatch[2-t] && (store.tiddlerExists(formatMatch[3-t]) || store.isShadowTiddler(formatMatch[3-t]))) // titledBrackettedLink
+			this.links.pushUnique(formatMatch[3-t]);
+		else if(formatMatch[4-t] && formatMatch[4-t] != this.title) // brackettedLink
+			this.links.pushUnique(formatMatch[4-t]);
+		// Do not add link if match urlPattern (formatMatch[5-t])
+		formatMatch = tiddlerLinkRegExp.exec(this.text);
+		}
+	this.linksUpdated = true;
+	return;
+}
+
+Tiddler.prototype.getSubtitle = function()
+{
+	var theModifier = this.modifier;
+	if(!theModifier)
+		theModifier = config.messages.subtitleUnknown;
+	var theModified = this.modified;
+	if(theModified)
+		theModified = theModified.toLocaleString();
+	else
+		theModified = config.messages.subtitleUnknown;
+	return(config.messages.tiddlerLinkTooltip.format([this.title,theModifier,theModified]));
+}
+
+Tiddler.prototype.isReadOnly = function()
+{
+	return readOnly;
+}
+
+Tiddler.prototype.autoLinkWikiWords = function()
+{
+	return !(this.isTagged("systemConfig") || this.isTagged("excludeMissing"));
+}
+
+Tiddler.prototype.generateFingerprint = function()
+{
+	return "0x" + Crypto.hexSha1Str(this.text);
+}
+
+// ---------------------------------------------------------------------------------
+// TiddlyWiki() object contains Tiddler()s
+// ---------------------------------------------------------------------------------
+
+function TiddlyWiki()
+{
+	var tiddlers = {}; // Hashmap by name of tiddlers
+	this.tiddlersUpdated = false;
+	this.namedNotifications = []; // Array of {name:,notify:} of notification functions
+	this.notificationLevel = 0;
+	this.slices = {}; // map tiddlerName->(map sliceName->sliceValue). Lazy.
+	this.clear = function() {
+		tiddlers = {};
+		this.setDirty(false);
+		};
+	this.fetchTiddler = function(title) {
+		return tiddlers[title];
+		};
+	this.deleteTiddler = function(title) {
+		delete this.slices[title];
+		delete tiddlers[title];
+		};
+	this.addTiddler = function(tiddler) {
+		delete this.slices[tiddler.title];
+		tiddlers[tiddler.title] = tiddler;
+		};
+	this.forEachTiddler = function(callback) {
+		for(var t in tiddlers)
+			{
+			var tiddler = tiddlers[t];
+			if(tiddler instanceof Tiddler)
+				callback.call(this,t,tiddler);
+			}
+		};
+}
+
+// Set the dirty flag
+TiddlyWiki.prototype.setDirty = function(dirty)
+{
+	this.dirty = dirty;
+}
+
+TiddlyWiki.prototype.isDirty = function()
+{
+	return this.dirty;
+}
+
+TiddlyWiki.prototype.suspendNotifications = function()
+{
+	this.notificationLevel--;
+}
+
+TiddlyWiki.prototype.resumeNotifications = function()
+{
+	this.notificationLevel++;
+}
+
+// Invoke the notification handlers for a particular tiddler
+TiddlyWiki.prototype.notify = function(title,doBlanket)
+{
+	if(!this.notificationLevel)
+		for(var t=0; t<this.namedNotifications.length; t++)
+			{
+			var n = this.namedNotifications[t];
+			if((n.name == null && doBlanket) || (n.name == title))
+				n.notify(title);
+			}
+}
+
+// Invoke the notification handlers for all tiddlers
+TiddlyWiki.prototype.notifyAll = function()
+{
+	if(!this.notificationLevel)
+		for(var t=0; t<this.namedNotifications.length; t++)
+			{
+			var n = this.namedNotifications[t];
+			if(n.name)
+				n.notify(n.name);
+			}
+}
+
+// Add a notification handler to a tiddler
+TiddlyWiki.prototype.addNotification = function(title,fn)
+{
+	for (var i=0; i<this.namedNotifications.length; i++)
+		if((this.namedNotifications[i].name == title) && (this.namedNotifications[i].notify == fn))
+			return this;
+	this.namedNotifications.push({name: title, notify: fn});
+	return this;
+}
+
+TiddlyWiki.prototype.removeTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		{
+		this.deleteTiddler(title);
+		this.notify(title,true);
+		this.setDirty(true);
+		}
+}
+
+TiddlyWiki.prototype.tiddlerExists = function(title)
+{
+	var t = this.fetchTiddler(title);
+	return (t != undefined);
+}
+
+TiddlyWiki.prototype.isShadowTiddler = function(title)
+{
+	return typeof config.shadowTiddlers[title] == "string";
+}
+
+TiddlyWiki.prototype.getTiddler = function(title)
+{
+	var t = this.fetchTiddler(title);
+	if(t != undefined)
+		return t;
+	else
+		return null;
+}
+
+TiddlyWiki.prototype.getTiddlerText = function(title,defaultText)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		return tiddler.text;
+	if(!title)
+		return defaultText;
+	var pos = title.indexOf(config.textPrimitives.sliceSeparator);
+	if(pos != -1)
+		{
+		var slice = this.getTiddlerSlice(title.substr(0,pos),title.substr(pos + config.textPrimitives.sliceSeparator.length));
+		if(slice)
+			return slice;
+		}
+	if(this.isShadowTiddler(title))
+		return config.shadowTiddlers[title];
+	if(defaultText != undefined)
+		return defaultText;
+	return null;
+}
+
+TiddlyWiki.prototype.slicesRE = /(?:[\'\/]*~?(\w+)[\'\/]*\:[\'\/]*\s*(.*?)\s*$)|(?:\|[\'\/]*~?(\w+)\:?[\'\/]*\|\s*(.*?)\s*\|)/gm
+
+// @internal
+TiddlyWiki.prototype.calcAllSlices = function(title) 
+{
+	var slices = {};
+	var text = this.getTiddlerText(title,"");
+	this.slicesRE.lastIndex = 0;
+	do 
+		{
+			var m = this.slicesRE.exec(text);
+			if (m) 
+				{
+					if (m[1])
+						slices[m[1]] = m[2];
+					else
+						slices[m[3]] = m[4];
+				}
+		}
+	while(m);
+	return slices;
+}
+
+// Returns the slice of text of the given name
+//#
+//# A text slice is a substring in the tiddler's text that is defined
+//# either like this
+//#    aName:  textSlice
+//# or
+//#    |aName:| textSlice |
+//# or
+//#    |aName| textSlice |
+//#
+//# In the text the name (or name:) may be decorated with '' or //. I.e.
+//# this would also a possible text slice:
+//#
+//#    |''aName:''| textSlice |
+//#
+//# @param name should only contain "word characters" (i.e. "a-ZA-Z_0-9")
+//# @return [may be undefined] the (trimmed) text of the specified slice.
+TiddlyWiki.prototype.getTiddlerSlice = function(title,sliceName)
+{
+	var slices = this.slices[title];
+	if (!slices) {
+		slices = this.calcAllSlices(title);
+		this.slices[title] = slices;
+	}
+	return slices[sliceName];
+}
+
+// Build an hashmap of the specified named slices of a tiddler
+TiddlyWiki.prototype.getTiddlerSlices = function(title,sliceNames)
+{
+	var r = {};
+	for(var t=0; t<sliceNames.length; t++)
+		{
+		var slice = this.getTiddlerSlice(title,sliceNames[t]);
+		if(slice)
+			r[sliceNames[t]] = slice;
+		}
+	return r;
+}
+
+TiddlyWiki.prototype.getRecursiveTiddlerText = function(title,defaultText,depth)
+{
+	var bracketRegExp = new RegExp("(?:\\[\\[([^\\]]+)\\]\\])","mg");
+	var text = this.getTiddlerText(title,null);
+	if(text == null)
+		return defaultText;
+	var textOut = [];
+	var lastPos = 0;
+	do {
+		var match = bracketRegExp.exec(text);
+		if(match)
+			{
+			textOut.push(text.substr(lastPos,match.index-lastPos));
+			if(match[1])
+				{
+				if(depth <= 0)
+					textOut.push(match[1]);
+				else
+					textOut.push(this.getRecursiveTiddlerText(match[1],"[[" + match[1] + "]]",depth-1));
+				}
+			lastPos = match.index + match[0].length;
+			}
+		else
+			textOut.push(text.substr(lastPos));
+	} while(match);
+	return(textOut.join(""));
+}
+
+TiddlyWiki.prototype.setTiddlerTag = function(title,status,tag)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		{
+		var t = tiddler.tags.indexOf(tag);
+		if(t != -1)
+			tiddler.tags.splice(t,1);
+		if(status)
+			tiddler.tags.push(tag);
+		tiddler.changed();
+		this.notify(title,true);
+		this.setDirty(true);
+		}
+}
+
+TiddlyWiki.prototype.saveTiddler = function(title,newTitle,newBody,modifier,modified,tags,fields)
+{
+	var tiddler = this.fetchTiddler(title);
+	var created;
+	if(tiddler)
+		{
+		created = tiddler.created; // Preserve created date
+		this.deleteTiddler(title);
+		}
+	else
+		{
+		tiddler = new Tiddler();
+		created = modified;
+		}
+	tiddler.set(newTitle,newBody,modifier,modified,tags,created,fields);
+	this.addTiddler(tiddler);
+	if(title != newTitle)
+		this.notify(title,true);
+	this.notify(newTitle,true);
+	this.setDirty(true);
+	return tiddler;
+}
+
+TiddlyWiki.prototype.createTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(!tiddler)
+		{
+		tiddler = new Tiddler();
+		tiddler.title = title;
+		this.addTiddler(tiddler);
+		this.setDirty(true);
+		}
+	return tiddler;
+}
+
+// Load contents of a tiddlywiki from an HTML DIV
+TiddlyWiki.prototype.loadFromDiv = function(src,idPrefix,noUpdate)
+{
+	this.idPrefix = idPrefix;
+	var storeElem = (typeof src == "string") ? document.getElementById(src) : src;
+	var tiddlers = this.getLoader().loadTiddlers(this,storeElem.childNodes);
+	this.setDirty(false);
+	if(!noUpdate)
+		{
+		for(var i = 0;i<tiddlers.length; i++)
+			tiddlers[i].changed();
+		}
+}
+
+TiddlyWiki.prototype.updateTiddlers = function()
+{
+	this.tiddlersUpdated = true;
+	this.forEachTiddler(function(title,tiddler) {
+		tiddler.changed();
+		});
+}
+
+// Return all tiddlers formatted as an HTML string
+TiddlyWiki.prototype.allTiddlersAsHtml = function()
+{
+	return store.getSaver().externalize(store);
+}
+
+// Return an array of tiddlers matching a search regular expression
+TiddlyWiki.prototype.search = function(searchRegExp,sortField,excludeTag)
+{
+	var candidates = this.reverseLookup("tags",excludeTag,false);
+	var results = [];
+	for(var t=0; t<candidates.length; t++)
+		{
+		if((candidates[t].title.search(searchRegExp) != -1) || (candidates[t].text.search(searchRegExp) != -1))
+			results.push(candidates[t]);
+		}
+	if(!sortField)
+		sortField = "title";
+	results.sort(function(a,b) {return a[sortField] < b[sortField] ? -1 : (a[sortField] == b[sortField] ? 0 : +1);});
+	return results;
+}
+
+// Return an array of all the tags in use. Each member of the array is another array where [0] is the name of the tag and [1] is the number of occurances
+TiddlyWiki.prototype.getTags = function()
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		for(var g=0; g<tiddler.tags.length; g++)
+			{
+			var tag = tiddler.tags[g];
+			var f = false;
+			for(var c=0; c<results.length; c++)
+				if(results[c][0] == tag)
+					{
+					f = true;
+					results[c][1]++;
+					}
+			if(!f)
+				results.push([tag,1]);
+			}
+		});
+	results.sort(function(a,b) {return a[0].toLowerCase() < b[0].toLowerCase() ? -1 : (a[0].toLowerCase() == b[0].toLowerCase() ? 0 : +1);});
+	return results;
+}
+
+// Return an array of the tiddlers that are tagged with a given tag
+TiddlyWiki.prototype.getTaggedTiddlers = function(tag,sortField)
+{
+	return this.reverseLookup("tags",tag,true,sortField);
+}
+
+// Return an array of the tiddlers that link to a given tiddler
+TiddlyWiki.prototype.getReferringTiddlers = function(title,unusedParameter,sortField)
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	return this.reverseLookup("links",title,true,sortField);
+}
+
+// Return an array of the tiddlers that do or do not have a specified entry in the specified storage array (ie, "links" or "tags")
+// lookupMatch == true to match tiddlers, false to exclude tiddlers
+TiddlyWiki.prototype.reverseLookup = function(lookupField,lookupValue,lookupMatch,sortField)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		var f = !lookupMatch;
+		for(var lookup=0; lookup<tiddler[lookupField].length; lookup++)
+			if(tiddler[lookupField][lookup] == lookupValue)
+				f = lookupMatch;
+		if(f)
+			results.push(tiddler);
+		});
+	if(!sortField)
+		sortField = "title";
+	results.sort(function(a,b) {return a[sortField] < b[sortField] ? -1 : (a[sortField] == b[sortField] ? 0 : +1);});
+	return results;
+}
+
+// Return the tiddlers as a sorted array
+TiddlyWiki.prototype.getTiddlers = function(field,excludeTag)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		if(excludeTag == undefined || !tiddler.isTagged(excludeTag))
+			results.push(tiddler);
+		});
+	if(field)
+		results.sort(function(a,b) {return a[field] < b[field] ? -1 : (a[field] == b[field] ? 0 : +1);});
+	return results;
+}
+
+// Return array of names of tiddlers that are referred to but not defined
+TiddlyWiki.prototype.getMissingLinks = function(sortField)
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		for(var n=0; n<tiddler.links.length;n++)
+			{
+			var link = tiddler.links[n];
+			if(this.fetchTiddler(link) == null && !this.isShadowTiddler(link))
+				results.pushUnique(link);
+			}
+		});
+	results.sort();
+	return results;
+}
+
+// Return an array of names of tiddlers that are defined but not referred to
+TiddlyWiki.prototype.getOrphans = function()
+{
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		if(this.getReferringTiddlers(title).length == 0 && !tiddler.isTagged("excludeLists"))
+			results.push(title);
+		});
+	results.sort();
+	return results;
+}
+
+// Return an array of names of all the shadow tiddlers
+TiddlyWiki.prototype.getShadowed = function()
+{
+	var results = [];
+	for(var t in config.shadowTiddlers)
+		if(typeof config.shadowTiddlers[t] == "string")
+			results.push(t);
+	results.sort();
+	return results;
+}
+
+// Resolves a Tiddler reference or tiddler title into a Tiddler object, or null if it doesn't exist
+TiddlyWiki.prototype.resolveTiddler = function(tiddler) 
+{
+	var t = (typeof tiddler == 'string') ? this.getTiddler(tiddler) : tiddler;
+	return t instanceof Tiddler ? t : null;
+}
+
+TiddlyWiki.prototype.getLoader = function() 
+{
+	if (!this.loader) 
+		this.loader = new TW21Loader();
+	return this.loader;
+}
+ 
+TiddlyWiki.prototype.getSaver = function() 
+{
+	if (!this.saver) 
+		this.saver = new TW21Saver();
+	return this.saver;
+}
+
+// Returns true if path is a valid field name (path),
+// i.e. a sequence of identifiers, separated by '.'
+TiddlyWiki.isValidFieldName = function (name) {
+	var match = /[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)*/.exec(name);
+	return match && (match[0] == name);
+}
+
+// Throws an exception when name is not a valid field name.
+TiddlyWiki.checkFieldName = function(name) {
+	if (!TiddlyWiki.isValidFieldName(name))
+		throw config.messages.invalidFieldName.format([name]);
+}
+
+function StringFieldAccess(n, readOnly) {
+	this.set = readOnly 
+		? function(t,v) {if (v != t[n]) throw config.messages.fieldCannotBeChanged.format([n]);}
+		: function(t,v) {if (v != t[n]) {t[n] = v; return true;}};
+	this.get = function(t) {return t[n];};
+}
+
+function DateFieldAccess(n) {
+	this.set = function(t,v) {
+			var d = v instanceof Date ? v : Date.convertFromYYYYMMDDHHMM(v); 
+			if (d != t[n]) {
+				t[n] = d; return true;
+			}
+		};
+	this.get = function(t)   {return t[n].convertToYYYYMMDDHHMM();}
+}
+
+function LinksFieldAccess(n) {
+	this.set = function(t,v) {
+			var s = (typeof v == "string") ? v.readBracketedList() : v; 
+			if (s.toString() != t[n].toString()) {
+				t[n] = s; return true;
+			}
+		};
+	this.get = function(t)   {return String.encodeTiddlyLinkList(t[n]);}
+}
+
+TiddlyWiki.standardFieldAccess = {
+	// The set functions return true when setting the data has changed the value.
+	
+	"title":    new StringFieldAccess("title", true),
+	// Handle the "tiddler" field name as the title
+	"tiddler":  new StringFieldAccess("title", true),
+	
+	"text":     new StringFieldAccess("text"),
+	"modifier": new StringFieldAccess("modifier"),
+	"modified": new DateFieldAccess("modified"),
+	"created":  new DateFieldAccess("created"),
+	"tags":     new LinksFieldAccess("tags")
+};
+
+TiddlyWiki.isStandardField = function(name) {
+	return TiddlyWiki.standardFieldAccess[name] != undefined;
+}
+
+// Sets the value of the given field of the tiddler to the value. 
+// Setting an ExtendedField's value to null or undefined removes the field. 
+// Setting a namespace to undefined removes all fields of that namespace.
+// The fieldName is case-insensitive.
+// All values will be converted to a string value.
+TiddlyWiki.prototype.setValue = function(tiddler, fieldName, value) {
+	TiddlyWiki.checkFieldName(fieldName);
+	var t = this.resolveTiddler(tiddler);
+	if (!t)
+		return;
+		
+	fieldName = fieldName.toLowerCase();
+
+	var isRemove = (value === undefined) || (value === null);
+
+	if (!t.fields) 
+		t.fields = {};
+		
+	var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+	if (accessor) {
+		if (isRemove)
+			// don't remove StandardFields
+			return;
+		var h = TiddlyWiki.standardFieldAccess[fieldName];
+		if (!h.set(t, value))
+			return;
+
+	} else {
+		var oldValue = t.fields[fieldName];
+		
+		if (isRemove) {
+			if (oldValue !== undefined) {
+				// deletes a single field
+				delete t.fields[fieldName];
+			} else {
+				// no concrete value is defined for the fieldName
+				// so we guess this is a namespace path.
+				
+				// delete all fields in a namespace
+				var re = new RegExp('^'+fieldName+'\\.');
+				var dirty = false;
+				for (var n in t.fields) {
+					if (n.match(re)) {
+						delete t.fields[n];
+						dirty = true;
+					}
+				}
+				if (!dirty)
+					return
+			}
+				
+		} else {
+			// the "normal" set case. value is defined (not null/undefined)
+			// For convenience provide a nicer conversion Date->String
+ 			value = value instanceof Date 
+				? value.convertToYYYYMMDDHHMMSSMMM() 
+				: String(value);
+			if (oldValue == value) 
+				return;
+			t.fields[fieldName] = value;
+		}
+	}
+	
+	// When we are here the tiddler/store really was changed.
+	this.notify(t.title,true);
+	if (!fieldName.match(/^temp\./))
+		this.setDirty(true);
+}
+
+// Returns the value of the given field of the tiddler. 
+// The fieldName is case-insensitive.
+// Will only return String values (or undefined).
+TiddlyWiki.prototype.getValue = function(tiddler, fieldName) {
+	var t = this.resolveTiddler(tiddler);
+	if (!t)
+		return undefined;
+
+	fieldName = fieldName.toLowerCase();
+
+	var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+	if (accessor) {
+		return accessor.get(t);
+	}
+	
+	return t.fields ? t.fields[fieldName] : undefined;
+}
+
+// Calls the callback function for every field in the tiddler.
+//
+// When callback function returns a non-false value the iteration stops 
+// and that value is returned. 
+//
+// The order of the fields is not defined.
+// 
+// @param callback a function(tiddler, fieldName, value). 
+// 
+TiddlyWiki.prototype.forEachField = function(tiddler, callback, onlyExtendedFields) {
+	var t = this.resolveTiddler(tiddler);
+	if (!t)
+		return undefined;
+	
+	if (t.fields) {
+		for (var n in t.fields) {
+			var result = callback(t, n, t.fields[n]);
+			if (result)
+				return result;
+		}
+	}
+	
+	if (onlyExtendedFields)
+		return undefined;
+
+	for (var n in TiddlyWiki.standardFieldAccess) {
+		if (n == "tiddler")
+			// even though the "title" field can also be referenced through the name "tiddler"
+			// we only visit this field once.
+			continue;
+			
+		var result = callback(t, n, TiddlyWiki.standardFieldAccess[n].get(t));
+		if (result)
+			return result;
+	}
+
+	return undefined;
+};
+// ---------------------------------------------------------------------------------
+// Story functions
+// ---------------------------------------------------------------------------------
+
+// A story is a HTML div containing a sequence of tiddlers that can be manipulated
+// container - id of containing element
+// idPrefix - string prefix prepended to title to make ids for tiddlers in this story
+function Story(container,idPrefix)
+{
+	this.container = container;
+	this.idPrefix = idPrefix;
+	this.highlightRegExp = null;
+}
+
+// Iterate through all the tiddlers in a story
+// fn - callback function to be called for each tiddler. Arguments are:
+//		tiddler - reference to Tiddler object
+//		element - reference to tiddler display element
+Story.prototype.forEachTiddler = function(fn)
+{
+	var place = document.getElementById(this.container);
+	if(!place)
+		return;
+	var e = place.firstChild;
+	while(e)
+		{
+		var n = e.nextSibling;
+		var title = e.getAttribute("tiddler");
+		fn.call(this,title,e);
+		e = n;
+		}
+}
+
+// Display several tiddlers given their titles in an array. Parameters same as displayTiddler(), except:
+// titles - array of string titles
+Story.prototype.displayTiddlers = function(srcElement,titles,template,animate,slowly)
+{
+	for(var t = titles.length-1;t>=0;t--)
+		this.displayTiddler(srcElement,titles[t],template,animate,slowly);
+}
+
+// Display a given tiddler with a given template. If the tiddler is already displayed but with a different
+// template, it is switched to the specified template
+// srcElement - reference to element from which this one is being opened -or-
+//              special positions "top", "bottom"
+// title - title of tiddler to display
+// template - the name of the tiddler containing the template -or-
+//			  one of the constants DEFAULT_VIEW_TEMPLATE and DEFAULT_EDIT_TEMPLATE -or-
+//			  null or undefined to indicate the current template if there is one, DEFAULT_VIEW_TEMPLATE if not
+// animate - whether to perform animations
+// slowly - whether to perform animations in slomo
+Story.prototype.displayTiddler = function(srcElement,title,template,animate,slowly)
+{
+	var place = document.getElementById(this.container);
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem)
+		this.refreshTiddler(title,template);
+	else
+		{
+		var before = this.positionTiddler(srcElement);
+		tiddlerElem = this.createTiddler(place,before,title,template);
+		}
+	if(srcElement && typeof srcElement !== "string")
+		{
+		if(anim && config.options.chkAnimate && (animate == undefined || animate == true))
+			anim.startAnimating(new Cascade(title,srcElement,tiddlerElem,slowly),new Scroller(tiddlerElem,slowly));
+		else
+			window.scrollTo(0,ensureVisible(tiddlerElem));
+		}
+}
+
+// Figure out the appropriate position for a newly opened tiddler
+// srcElement - reference to the element containing the link to the tiddler -or-
+//              special positions "top", "bottom"
+// returns - reference to the tiddler that the new one should appear before (null for the bottom of the story)
+Story.prototype.positionTiddler = function(srcElement)
+{
+	var place = document.getElementById(this.container);
+	var before;
+	if(typeof srcElement == "string")
+		{
+		switch(srcElement)
+			{
+			case "top":
+				before = place.firstChild;
+				break;
+			case "bottom":
+				before = null;
+				break;
+			}
+		}
+	else
+		{
+		var after = this.findContainingTiddler(srcElement);
+		if(after == null)
+			before = place.firstChild;
+		else if(after.nextSibling)
+			before = after.nextSibling;
+		else
+			before = null;
+		}
+	return before;
+}
+
+// Create a tiddler frame at the appropriate place in a story column
+// place - reference to parent element
+// before - null, or reference to element before which to insert new tiddler
+// title - title of new tiddler
+// template - the name of the tiddler containing the template or one of the constants DEFAULT_VIEW_TEMPLATE and DEFAULT_EDIT_TEMPLATE
+Story.prototype.createTiddler = function(place,before,title,template)
+{
+	var tiddlerElem = createTiddlyElement(null,"div",this.idPrefix + title,"tiddler");
+	tiddlerElem.setAttribute("refresh","tiddler");
+	place.insertBefore(tiddlerElem,before);
+	this.refreshTiddler(title,template);
+	return tiddlerElem;
+}
+
+// Overridable for choosing the name of the template to apply for a tiddler
+Story.prototype.chooseTemplateForTiddler = function(title,template)
+{
+	if(!template)
+		template = DEFAULT_VIEW_TEMPLATE;
+	if(template == DEFAULT_VIEW_TEMPLATE || template == DEFAULT_EDIT_TEMPLATE)
+		template = config.tiddlerTemplates[template];
+	return template;
+}
+
+// Overridable for extracting the text of a template from a tiddler
+Story.prototype.getTemplateForTiddler = function(title,template,tiddler)
+{
+	return store.getRecursiveTiddlerText(template,null,10);
+}
+
+// Apply a template to an existing tiddler if it is not already displayed using that template
+// title - title of tiddler to update
+// template - the name of the tiddler containing the template or one of the constants DEFAULT_VIEW_TEMPLATE and DEFAULT_EDIT_TEMPLATE
+// force - if true, forces the refresh even if the template hasn't changedd
+Story.prototype.refreshTiddler = function(title,template,force)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem)
+		{
+		if(tiddlerElem.getAttribute("dirty") == "true" && !force)
+			return tiddlerElem;
+		template = this.chooseTemplateForTiddler(title,template);
+		var currTemplate = tiddlerElem.getAttribute("template");
+		if((template != currTemplate) || force)
+			{
+			var tiddler = store.getTiddler(title);
+			if(!tiddler)
+				{
+				tiddler = new Tiddler();
+				if(store.isShadowTiddler(title))
+					tiddler.set(title,store.getTiddlerText(title),config.views.wikified.shadowModifier,version.date,[],version.date);
+				else
+					{
+					var text = template=="EditTemplate"
+								? config.views.editor.defaultText.format([title])
+								: config.views.wikified.defaultText.format([title]);
+					tiddler.set(title,text,config.views.wikified.defaultModifier,version.date,[],version.date);
+					}
+				}
+			tiddlerElem.setAttribute("tags",tiddler.tags.join(" "));
+			tiddlerElem.setAttribute("tiddler",title);
+			tiddlerElem.setAttribute("template",template);
+			var me = this;
+			tiddlerElem.onmouseover = this.onTiddlerMouseOver;
+			tiddlerElem.onmouseout = this.onTiddlerMouseOut;
+			tiddlerElem.ondblclick = this.onTiddlerDblClick;
+			tiddlerElem[window.event?"onkeydown":"onkeypress"] = this.onTiddlerKeyPress;
+			var html = this.getTemplateForTiddler(title,template,tiddler);
+			tiddlerElem.innerHTML = html;
+			applyHtmlMacros(tiddlerElem,tiddler);
+			if(store.getTaggedTiddlers(title).length > 0)
+				addClass(tiddlerElem,"isTag");
+			else
+				removeClass(tiddlerElem,"isTag");
+			if(!store.tiddlerExists(title))
+				{
+				if(store.isShadowTiddler(title))
+					addClass(tiddlerElem,"shadow");
+				else
+					addClass(tiddlerElem,"missing");
+				}
+			else
+				{
+				removeClass(tiddlerElem,"shadow");
+				removeClass(tiddlerElem,"missing");
+				}
+			}
+		}
+	return tiddlerElem;
+}
+
+// Refresh all tiddlers in the Story
+Story.prototype.refreshAllTiddlers = function() 
+{
+	var place = document.getElementById(this.container);
+	var e = place.firstChild;
+	if(!e)
+		return;
+	this.refreshTiddler(e.getAttribute("tiddler"),e.getAttribute("template"),true);
+	while((e = e.nextSibling) != null) 
+		this.refreshTiddler(e.getAttribute("tiddler"),e.getAttribute("template"),true);
+}
+
+// Default tiddler onmouseover/out event handlers
+Story.prototype.onTiddlerMouseOver = function(e)
+{
+	if(window.addClass instanceof Function)
+		addClass(this,"selected");
+}
+
+Story.prototype.onTiddlerMouseOut = function(e)
+{
+	if(window.removeClass instanceof Function)
+		removeClass(this,"selected");
+}
+
+// Default tiddler ondblclick event handler
+Story.prototype.onTiddlerDblClick = function(e)
+{
+	if(!e) var e = window.event;
+	var theTarget = resolveTarget(e);
+	if(theTarget && theTarget.nodeName.toLowerCase() != "input" && theTarget.nodeName.toLowerCase() != "textarea")
+		{
+		if(document.selection && document.selection.empty)
+			document.selection.empty();
+		config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+		e.cancelBubble = true;
+		if (e.stopPropagation) e.stopPropagation();
+		return true;
+		}
+	else
+		return false;
+}
+
+Story.prototype.onTiddlerKeyPress = function(e)
+{
+	if(!e) var e = window.event;
+	clearMessage();
+	var consume = false; 
+	var title = this.getAttribute("tiddler");
+	var target = resolveTarget(e);
+	switch(e.keyCode)
+		{
+		case 9: // Tab
+			if(config.options.chkInsertTabs && target.tagName.toLowerCase() == "textarea")
+				{
+				replaceSelection(target,String.fromCharCode(9));
+				consume = true; 
+				}
+			if(config.isOpera)
+				{
+				target.onblur = function()
+					{
+					this.focus();
+					this.onblur = null;
+					}
+				}
+			break;
+		case 13: // Ctrl-Enter
+		case 10: // Ctrl-Enter on IE PC
+		case 77: // Ctrl-Enter is "M" on some platforms
+			if(e.ctrlKey)
+				{
+				blurElement(this);
+				config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+				consume = true;
+				}
+			break; 
+		case 27: // Escape
+			blurElement(this);
+			config.macros.toolbar.invokeCommand(this,"cancelCommand",e);
+			consume = true;
+			break;
+		}
+	e.cancelBubble = consume;
+	if(consume)
+		{
+		if(e.stopPropagation) e.stopPropagation(); // Stop Propagation
+		e.returnValue = true; // Cancel The Event in IE
+		if(e.preventDefault ) e.preventDefault(); // Cancel The Event in Moz
+		}
+	return(!consume);
+};
+
+// Returns the specified field (input or textarea element) in a tiddler, otherwise the first edit field it finds
+// or null if it found no edit field at all
+Story.prototype.getTiddlerField = function(title,field)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	var e = null;
+	if(tiddlerElem != null)
+		{
+		var children = tiddlerElem.getElementsByTagName("*");
+		for (var t=0; t<children.length; t++)
+			{
+			var c = children[t];
+			if(c.tagName.toLowerCase() == "input" || c.tagName.toLowerCase() == "textarea")
+				{
+				if(!e)
+					e = c;
+				if(c.getAttribute("edit") == field)
+					e = c;
+				}
+			}
+		}
+	return e;
+}
+
+// Focus a specified tiddler. Attempts to focus the specified field, otherwise the first edit field it finds
+Story.prototype.focusTiddler = function(title,field)
+{
+	var e = this.getTiddlerField(title,field);
+	if(e)
+		{
+		e.focus();
+		e.select();
+		}
+}
+
+// Ensures that a specified tiddler does not have the focus
+Story.prototype.blurTiddler = function(title)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null && tiddlerElem.focus && tiddlerElem.blur)
+		{
+		tiddlerElem.focus();
+		tiddlerElem.blur();
+		}
+}
+
+// Adds a specified value to the edit controls (if any) of a particular
+// array-formatted field of a particular tiddler (eg "tags")
+//  title - name of tiddler
+//  tag - value of field, without any [[brackets]]
+//  mode - +1 to add the tag, -1 to remove it, 0 to toggle it
+//  field - name of field (eg "tags")
+Story.prototype.setTiddlerField = function(title,tag,mode,field)
+{
+	var c = story.getTiddlerField(title,field);
+
+	var tags = c.value.readBracketedList();
+	tags.setItem(tag,mode);
+	c.value = String.encodeTiddlyLinkList(tags);
+}
+
+// The same as setTiddlerField but preset to the "tags" field
+Story.prototype.setTiddlerTag = function(title,tag,mode)
+{
+	Story.prototype.setTiddlerField(title,tag,mode,"tags");
+}
+
+// Close a specified tiddler
+// title - name of tiddler to close
+// animate - whether to perform animations
+// slowly - whether to perform animations in slomo
+Story.prototype.closeTiddler = function(title,animate,slowly)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		{
+		clearMessage();
+		this.scrubTiddler(tiddlerElem);
+		if(anim && config.options.chkAnimate && animate)
+			anim.startAnimating(new Slider(tiddlerElem,false,slowly,"all"));
+		else
+			tiddlerElem.parentNode.removeChild(tiddlerElem);
+		}
+}
+
+// Scrub IDs from a tiddler. This is so that the 'ghost' of a tiddler while it is being closed
+// does not interfere with things
+// tiddler - reference to the tiddler element
+Story.prototype.scrubTiddler = function(tiddlerElem)
+{
+	tiddlerElem.id = null;
+}
+
+// Set the 'dirty' flag of a tiddler
+// title - title of tiddler to change
+// dirty - new boolean status of flag
+Story.prototype.setDirty = function(title,dirty)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		tiddlerElem.setAttribute("dirty",dirty ? "true" : "false");
+}
+
+// Is a particular tiddler dirty (with unsaved changes)?
+Story.prototype.isDirty = function(title)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		return tiddlerElem.getAttribute("dirty") == "true";
+	return null;
+}
+
+// Determine whether any open tiddler are dirty
+Story.prototype.areAnyDirty = function()
+{
+	var r = false;
+	this.forEachTiddler(function(title,element) {
+		if(this.isDirty(title))
+			r = true;
+		});
+	return r;
+}
+
+// Close all tiddlers in the story
+Story.prototype.closeAllTiddlers = function(exclude)
+{
+	clearMessage();
+	this.forEachTiddler(function(title,element) {
+		if((title != exclude) && element.getAttribute("dirty") != "true")
+			this.closeTiddler(title);
+		});
+	window.scrollTo(0,0);
+}
+
+// Check if there are any tiddlers in the story
+Story.prototype.isEmpty = function()
+{
+	var place = document.getElementById(this.container);
+	return(place && place.firstChild == null);
+}
+
+// Perform a search and display the result
+// text - text to search for
+// useCaseSensitive - true for case sensitive matching
+// useRegExp - true to interpret text as a RegExp
+Story.prototype.search = function(text,useCaseSensitive,useRegExp)
+{
+	this.closeAllTiddlers();
+	highlightHack = new RegExp(useRegExp ?	 text : text.escapeRegExp(),useCaseSensitive ? "mg" : "img");
+	var matches = store.search(highlightHack,"title","excludeSearch");
+	var titles = [];
+	for(var t=matches.length-1; t>=0; t--)
+		titles.push(matches[t].title);
+	this.displayTiddlers(null,titles);
+	highlightHack = null;
+	var q = useRegExp ? "/" : "'";
+	if(matches.length > 0)
+		displayMessage(config.macros.search.successMsg.format([titles.length.toString(),q + text + q]));
+	else
+		displayMessage(config.macros.search.failureMsg.format([q + text + q]));
+}
+
+// Determine if the specified element is within a tiddler in this story
+// e - reference to an element
+// returns: reference to a tiddler element or null if none
+Story.prototype.findContainingTiddler = function(e)
+{
+	while(e && !hasClass(e,"tiddler"))
+		e = e.parentNode;
+	return(e);
+}
+
+// Gather any saveable fields from a tiddler element
+// e - reference to an element to scan recursively
+// fields - object to contain gathered field values
+Story.prototype.gatherSaveFields = function(e,fields)
+{
+	if(e && e.getAttribute)
+		{
+		var f = e.getAttribute("edit");
+		if(f)
+			fields[f] = e.value.replace(/\r/mg,"");;
+		if(e.hasChildNodes())
+			{
+			var c = e.childNodes;
+			for(var t=0; t<c.length; t++)
+				this.gatherSaveFields(c[t],fields)
+			}
+		}
+}
+
+// Determine whether a tiddler has any edit fields, and if so if their values have been changed
+// title - name of tiddler
+Story.prototype.hasChanges = function(title)
+{
+	var e = document.getElementById(this.idPrefix + title);
+	if(e != null)
+		{
+		var fields = {};
+		this.gatherSaveFields(e,fields);
+		var tiddler = store.fetchTiddler(title);
+		if (!tiddler)
+			return false;
+		for(var n in fields)
+			if (store.getValue(title,n) != fields[n])
+				return true;
+		}
+	return false;
+}
+
+// Save any open edit fields of a tiddler and updates the display as necessary
+// title - name of tiddler
+// minorUpdate - true if the modified date shouldn't be updated
+// returns: title of saved tiddler, or null if not saved
+Story.prototype.saveTiddler = function(title,minorUpdate)
+{
+	var tiddlerElem = document.getElementById(this.idPrefix + title);
+	if(tiddlerElem != null)
+		{
+		var fields = {};
+		this.gatherSaveFields(tiddlerElem,fields);
+		var newTitle = fields.title ? fields.title : title;
+		if(store.tiddlerExists(newTitle) && newTitle != title)
+			{
+			if(confirm(config.messages.overwriteWarning.format([newTitle.toString()])))
+				this.closeTiddler(newTitle,false,false);
+			else
+				return null;
+			}
+		tiddlerElem.id = this.idPrefix + newTitle;
+		tiddlerElem.setAttribute("tiddler",newTitle);
+		tiddlerElem.setAttribute("template",DEFAULT_VIEW_TEMPLATE);
+		tiddlerElem.setAttribute("dirty","false");
+		if(config.options.chkForceMinorUpdate)
+			minorUpdate = !minorUpdate;
+		var newDate = new Date();
+		store.saveTiddler(title,newTitle,fields.text,config.options.txtUserName,minorUpdate ? undefined : newDate,fields.tags);
+		for (var n in fields) 
+			if (!TiddlyWiki.isStandardField(n))
+				store.setValue(newTitle,n,fields[n]);
+		if(config.options.chkAutoSave)
+			saveChanges();
+		return newTitle;
+		}
+	return null;
+}
+
+Story.prototype.permaView = function()
+{
+	var links = [];
+	this.forEachTiddler(function(title,element) {
+		links.push(String.encodeTiddlyLink(title));
+		});
+	var t = encodeURIComponent(links.join(" "));
+	if(t == "")
+		t = "#";
+	if(window.location.hash != t)
+		window.location.hash = t;
+}
+
+// ---------------------------------------------------------------------------------
+// Message area
+// ---------------------------------------------------------------------------------
+
+function getMessageDiv()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(!msgArea)
+		return null;
+	if(!msgArea.hasChildNodes())
+		createTiddlyButton(createTiddlyElement(msgArea,"div",null,"messageToolbar"),
+			config.messages.messageClose.text,
+			config.messages.messageClose.tooltip,
+			clearMessage);
+	msgArea.style.display = "block";
+	return createTiddlyElement(msgArea,"div");
+}
+
+function displayMessage(text,linkText)
+{
+	var e = getMessageDiv();
+	if(!e)
+		{
+		alert(text);
+		return;
+		}
+	if(linkText)
+		{
+		var link = createTiddlyElement(e,"a",null,null,text);
+		link.href = linkText;
+		link.target = "_blank";
+		}
+	else
+		e.appendChild(document.createTextNode(text));
+}
+
+function clearMessage()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(msgArea)
+		{
+		removeChildren(msgArea);
+		msgArea.style.display = "none";
+		}
+	return false;
+}
+
+// ---------------------------------------------------------------------------------
+// Refresh mechanism
+// ---------------------------------------------------------------------------------
+
+config.refreshers = {
+	link: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddlyLink");
+		refreshTiddlyLink(e,title);
+		return true;
+		},
+	
+	tiddler: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var template = e.getAttribute("template");
+		if(changeList && changeList.indexOf(title) != -1 && !story.isDirty(title))
+			story.refreshTiddler(title,template,true);
+		else
+			refreshElements(e,changeList);
+		return true;
+		},
+
+	content: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var force = e.getAttribute("force");
+		if(force != null || changeList == null || changeList.indexOf(title) != -1)
+			{
+			removeChildren(e);
+			wikify(store.getTiddlerText(title,title),e);
+			return true;
+			}
+		else
+			return false;
+		},
+
+	macro: function(e,changeList)
+		{
+		var macro = e.getAttribute("macroName");
+		var params = e.getAttribute("params");
+		if(macro)
+			macro = config.macros[macro];
+		if(macro && macro.refresh)
+			macro.refresh(e,params);
+		return true;
+		}
+};
+
+function refreshElements(root,changeList)
+{
+	var nodes = root.childNodes;
+	for(var c=0; c<nodes.length; c++)
+		{
+		var e = nodes[c],type;
+		if(e.getAttribute)
+			type = e.getAttribute("refresh");
+		else
+			type = null;
+		var refresher = config.refreshers[type];
+		var refreshed = false;
+		if(refresher != undefined)
+			refreshed = refresher(e,changeList);
+		if(e.hasChildNodes() && !refreshed)
+			refreshElements(e,changeList);
+		}
+}
+
+function applyHtmlMacros(root,tiddler)
+{
+	var e = root.firstChild;
+	while(e)
+		{
+		var nextChild = e.nextSibling;
+		if(e.getAttribute)
+			{
+			var macro = e.getAttribute("macro");
+			if(macro)
+				{
+				var params = "";
+				var p = macro.indexOf(" ");
+				if(p != -1)
+					{
+					params = macro.substr(p+1);
+					macro = macro.substr(0,p);
+					}
+				invokeMacro(e,macro,params,null,tiddler);
+				}
+			}
+		if(e.hasChildNodes())
+			applyHtmlMacros(e,tiddler);
+		e = nextChild;
+		}
+}
+
+function refreshPageTemplate(title)
+{
+	var stash = createTiddlyElement(document.body,"div");
+	stash.style.display = "none";
+	var display = document.getElementById("tiddlerDisplay");
+	var nodes,t;
+	if(display)
+		{
+		nodes = display.childNodes;
+		for(t=nodes.length-1; t>=0; t--)
+			stash.appendChild(nodes[t]);
+		}
+	var wrapper = document.getElementById("contentWrapper");
+	if(!title)
+		title = "PageTemplate";
+	var html = store.getRecursiveTiddlerText(title,null,10);
+	wrapper.innerHTML = html;
+	applyHtmlMacros(wrapper);
+	refreshElements(wrapper);
+	display = document.getElementById("tiddlerDisplay");
+	removeChildren(display);
+	if(!display)
+		display = createTiddlyElement(wrapper,"div","tiddlerDisplay");
+	nodes = stash.childNodes;
+	for(t=nodes.length-1; t>=0; t--)
+		display.appendChild(nodes[t]);
+	stash.parentNode.removeChild(stash);
+}
+
+function refreshDisplay(hint)
+{
+	var e = document.getElementById("contentWrapper");
+	if(typeof hint == "string")
+		hint = [hint];
+	refreshElements(e,hint);
+}
+
+function refreshPageTitle()
+{
+	document.title = wikifyPlain("SiteTitle") + " - " + wikifyPlain("SiteSubtitle");
+}
+
+function refreshStyles(title)
+{
+	setStylesheet(title == null ? "" : store.getRecursiveTiddlerText(title,"",10),title);
+}
+
+function refreshColorPalette(title)
+{
+	if(!startingUp)
+		refreshAll();
+}
+
+function refreshAll()
+{
+	refreshPageTemplate();
+	refreshDisplay();
+	refreshStyles("StyleSheetLayout");
+	refreshStyles("StyleSheetColors");
+	refreshStyles("StyleSheet");
+	refreshStyles("StyleSheetPrint");
+}
+
+// ---------------------------------------------------------------------------------
+// Options cookie stuff
+// ---------------------------------------------------------------------------------
+
+function loadOptionsCookie()
+{
+	if(safeMode)
+		return;
+	var cookies = document.cookie.split(";");
+	for(var c=0; c<cookies.length; c++)
+		{
+		var p = cookies[c].indexOf("=");
+		if(p != -1)
+			{
+			var name = cookies[c].substr(0,p).trim();
+			var value = cookies[c].substr(p+1).trim();
+			switch(name.substr(0,3))
+				{
+				case "txt":
+					config.options[name] = unescape(value);
+					break;
+				case "chk":
+					config.options[name] = value == "true";
+					break;
+				}
+			}
+		}
+}
+
+function saveOptionCookie(name)
+{
+	if(safeMode)
+		return;
+	var c = name + "=";
+	switch(name.substr(0,3))
+		{
+		case "txt":
+			c += escape(config.options[name].toString());
+			break;
+		case "chk":
+			c += config.options[name] ? "true" : "false";
+			break;
+		}
+	c += "; expires=Fri, 1 Jan 2038 12:00:00 UTC; path=/";
+	document.cookie = c;
+}
+
+// ---------------------------------------------------------------------------------
+// Saving
+// ---------------------------------------------------------------------------------
+
+var saveUsingSafari = false;
+
+var startSaveArea = '<div id="' + 'storeArea">'; // Split up into two so that indexOf() of this source doesn't find it
+var endSaveArea = '</d' + 'iv>';
+
+// If there are unsaved changes, force the user to confirm before exitting
+function confirmExit()
+{
+	hadConfirmExit = true;
+	if((store && store.isDirty && store.isDirty()) || (story && story.areAnyDirty && story.areAnyDirty()))
+		return config.messages.confirmExit;
+}
+
+// Give the user a chance to save changes before exitting
+function checkUnsavedChanges()
+{
+	if(store && store.isDirty && store.isDirty() && window.hadConfirmExit === false)
+		{
+		if(confirm(config.messages.unsavedChangesWarning))
+			saveChanges();
+		}
+}
+
+function updateMarkupBlock(s,blockName,tiddlerName)
+{
+	return s.replaceChunk(
+			"<!--%0-START-->".format([blockName]),
+			"<!--%0-END-->".format([blockName]),
+			"\n" + store.getRecursiveTiddlerText(tiddlerName,"") + "\n");
+}
+
+// Save this tiddlywiki with the pending changes
+function saveChanges(onlyIfDirty)
+{
+	if(onlyIfDirty && !store.isDirty())
+		return;
+	clearMessage();
+	// Get the URL of the document
+	var originalPath = document.location.toString();
+	// Check we were loaded from a file URL
+	if(originalPath.substr(0,5) != "file:")
+		{
+		alert(config.messages.notFileUrlError);
+		if(store.tiddlerExists(config.messages.saveInstructions))
+			story.displayTiddler(null,config.messages.saveInstructions);
+		return;
+		}
+	var localPath = getLocalPath(originalPath);
+	// Load the original file
+	var original = loadFile(localPath);
+	if(original == null)
+		{
+		alert(config.messages.cantSaveError);
+		if(store.tiddlerExists(config.messages.saveInstructions))
+			story.displayTiddler(null,config.messages.saveInstructions);
+		return;
+		}
+	// Locate the storeArea div's
+	var posOpeningDiv = original.indexOf(startSaveArea);
+	var limitClosingDiv = original.indexOf("<!--POST-BODY-START--"+">");
+	var posClosingDiv = original.lastIndexOf(endSaveArea,limitClosingDiv == -1 ? original.length : limitClosingDiv);
+	if((posOpeningDiv == -1) || (posClosingDiv == -1))
+		{
+		alert(config.messages.invalidFileError.format([localPath]));
+		return;
+		}
+	// Save the backup
+	if(config.options.chkSaveBackups)
+		{
+		var backupPath = getBackupPath(localPath);
+		var backup = saveFile(backupPath,original);
+		if(backup)
+			displayMessage(config.messages.backupSaved,"file://" + backupPath);
+		else
+			alert(config.messages.backupFailed);
+		}
+	// Save Rss
+	if(config.options.chkGenerateAnRssFeed)
+		{
+		var rssPath = localPath.substr(0,localPath.lastIndexOf(".")) + ".xml";
+		var rssSave = saveFile(rssPath,convertUnicodeToUTF8(generateRss()));
+		if(rssSave)
+			displayMessage(config.messages.rssSaved,"file://" + rssPath);
+		else
+			alert(config.messages.rssFailed);
+		}
+	// Save empty template
+	if(config.options.chkSaveEmptyTemplate)
+		{
+		var emptyPath,p;
+		if((p = localPath.lastIndexOf("/")) != -1)
+			emptyPath = localPath.substr(0,p) + "/empty.html";
+		else if((p = localPath.lastIndexOf("\\")) != -1)
+			emptyPath = localPath.substr(0,p) + "\\empty.html";
+		else
+			emptyPath = localPath + ".empty.html";
+		var empty = original.substr(0,posOpeningDiv + startSaveArea.length) + original.substr(posClosingDiv);
+		var emptySave = saveFile(emptyPath,empty);
+		if(emptySave)
+			displayMessage(config.messages.emptySaved,"file://" + emptyPath);
+		else
+			alert(config.messages.emptyFailed);
+		}
+	var save;
+	try 
+		{
+		// Save new file
+		var revised = original.substr(0,posOpeningDiv + startSaveArea.length) + "\n" +
+					convertUnicodeToUTF8(store.allTiddlersAsHtml()) + "\n" +
+					original.substr(posClosingDiv);
+		var newSiteTitle = convertUnicodeToUTF8((wikifyPlain("SiteTitle") + " - " + wikifyPlain("SiteSubtitle")).htmlEncode());
+		revised = revised.replaceChunk("<title"+">","</title"+">"," " + newSiteTitle + " ");
+		revised = updateMarkupBlock(revised,"PRE-HEAD","MarkupPreHead");
+		revised = updateMarkupBlock(revised,"POST-HEAD","MarkupPostHead");
+		revised = updateMarkupBlock(revised,"PRE-BODY","MarkupPreBody");
+		revised = updateMarkupBlock(revised,"POST-BODY","MarkupPostBody");
+		save = saveFile(localPath,revised);
+		}
+	catch (e) 
+		{
+		showException(e);
+		}
+	if(save)
+		{
+		displayMessage(config.messages.mainSaved,"file://" + localPath);
+		store.setDirty(false);
+		}
+	else
+		alert(config.messages.mainFailed);
+}
+
+function getLocalPath(originalPath)
+{
+	// Remove any location or query part of the URL
+	var argPos = originalPath.indexOf("?");
+	if(argPos != -1)
+		originalPath = originalPath.substr(0,argPos);
+	var hashPos = originalPath.indexOf("#");
+	if(hashPos != -1)
+		originalPath = originalPath.substr(0,hashPos);
+	// Convert file://localhost/ to file:///
+	if(originalPath.indexOf("file://localhost/") == 0)
+		originalPath = "file://" + originalPath.substr(16);
+	// Convert to a native file format assuming
+	// "file:///x:/path/path/path..." - pc local file --> "x:\path\path\path..."
+	// "file://///server/share/path/path/path..." - FireFox pc network file --> "\\server\share\path\path\path..."
+	// "file:///path/path/path..." - mac/unix local file --> "/path/path/path..."
+	// "file://server/share/path/path/path..." - pc network file --> "\\server\share\path\path\path..."
+	var localPath;
+	if(originalPath.charAt(9) == ":") // pc local file
+		localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file://///") == 0) // FireFox pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file:///") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(7));
+	else if(originalPath.indexOf("file:/") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(5));
+	else // pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\\");
+	return localPath;
+}
+
+function getBackupPath(localPath)
+{
+	var backSlash = true;
+	var dirPathPos = localPath.lastIndexOf("\\");
+	if(dirPathPos == -1)
+		{
+		dirPathPos = localPath.lastIndexOf("/");
+		backSlash = false;
+		}
+	var backupFolder = config.options.txtBackupFolder;
+	if(!backupFolder || backupFolder == "")
+		backupFolder = ".";
+	var backupPath = localPath.substr(0,dirPathPos) + (backSlash ? "\\" : "/") + backupFolder + localPath.substr(dirPathPos);
+	backupPath = backupPath.substr(0,backupPath.lastIndexOf(".")) + "." + (new Date()).convertToYYYYMMDDHHMMSSMMM() + ".html";
+	return backupPath;
+}
+
+function generateRss()
+{
+	var s = [];
+	var d = new Date();
+	var u = store.getTiddlerText("SiteUrl");
+	// Assemble the header
+	s.push("<" + "?xml version=\"1.0\"?" + ">");
+	s.push("<rss version=\"2.0\">");
+	s.push("<channel>");
+	s.push("<title" + ">" + wikifyPlain("SiteTitle").htmlEncode() + "</title" + ">");
+	if(u)
+		s.push("<link>" + u.htmlEncode() + "</link>");
+	s.push("<description>" + wikifyPlain("SiteSubtitle").htmlEncode() + "</description>");
+	s.push("<language>en-us</language>");
+	s.push("<copyright>Copyright " + d.getFullYear() + " " + config.options.txtUserName.htmlEncode() + "</copyright>");
+	s.push("<pubDate>" + d.toGMTString() + "</pubDate>");
+	s.push("<lastBuildDate>" + d.toGMTString() + "</lastBuildDate>");
+	s.push("<docs>http://blogs.law.harvard.edu/tech/rss</docs>");
+	s.push("<generator>TiddlyWiki " + version.major + "." + version.minor + "." + version.revision + "</generator>");
+	// The body
+	var tiddlers = store.getTiddlers("modified","excludeLists");
+	var n = config.numRssItems > tiddlers.length ? 0 : tiddlers.length-config.numRssItems;
+	for (var t=tiddlers.length-1; t>=n; t--)
+		s.push(tiddlers[t].saveToRss(u));
+	// And footer
+	s.push("</channel>");
+	s.push("</rss>");
+	// Save it all
+	return s.join("\n");
+}
+
+
+// UTF-8 encoding rules:
+// 0x0000 - 0x007F:	0xxxxxxx
+// 0x0080 - 0x07FF:	110xxxxx 10xxxxxx
+// 0x0800 - 0xFFFF:	1110xxxx 10xxxxxx 10xxxxxx
+
+function convertUTF8ToUnicode(u)
+{
+	if(window.netscape == undefined)
+		return manualConvertUTF8ToUnicode(u);
+	else
+		return mozConvertUTF8ToUnicode(u);
+}
+
+function manualConvertUTF8ToUnicode(utf)
+{
+	var uni = utf;
+	var src = 0;
+	var dst = 0;
+	var b1, b2, b3;
+	var c;
+	while(src < utf.length)
+		{
+		b1 = utf.charCodeAt(src++);
+		if(b1 < 0x80)
+			dst++;
+		else if(b1 < 0xE0)
+			{
+			b2 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0x1F) << 6) | (b2 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+			}
+		else
+			{
+			b2 = utf.charCodeAt(src++);
+			b3 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0xF) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+			}
+	}
+	return(uni);
+}
+
+function mozConvertUTF8ToUnicode(u)
+{
+	try
+		{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+		}
+	catch(e)
+		{
+		return manualConvertUTF8ToUnicode(u);
+		} // fallback
+	var s = converter.ConvertToUnicode(u);
+	var fin = converter.Finish();
+	return (fin.length > 0) ? s+fin : s;
+}
+
+function convertUnicodeToUTF8(s)
+{
+	if(window.netscape == undefined)
+		return manualConvertUnicodeToUTF8(s);
+	else
+		return mozConvertUnicodeToUTF8(s);
+}
+
+function manualConvertUnicodeToUTF8(s)
+{
+	var re = /[^\u0000-\u007F]/g ;
+	return s.replace(re, function($0) {return("&#" + $0.charCodeAt(0).toString() + ";");})
+}
+
+function mozConvertUnicodeToUTF8(s)
+{
+	try
+		{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+		}
+	catch(e)
+		{
+		return manualConvertUnicodeToUTF8(s);
+		} // fallback
+	var u = converter.ConvertFromUnicode(s);
+	var fin = converter.Finish();
+	if(fin.length > 0)
+		return u + fin;
+	else
+		return u;
+}
+
+function saveFile(fileUrl, content)
+{
+	var r = null;
+	if((r == null) || (r == false))
+		r = mozillaSaveFile(fileUrl, content);
+	if((r == null) || (r == false))
+		r = ieSaveFile(fileUrl, content);
+	if((r == null) || (r == false))
+		r = javaSaveFile(fileUrl, content);
+	return(r);
+}
+
+function loadFile(fileUrl)
+{
+	var r = null;
+	if((r == null) || (r == false))
+		r = mozillaLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = ieLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = javaLoadFile(fileUrl);
+	return(r);
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function ieSaveFile(filePath, content)
+{
+	try
+		{
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		}
+	catch(e)
+		{
+		//alert("Exception while attempting to save\n\n" + e.toString());
+		return(null);
+		}
+	var file = fso.OpenTextFile(filePath,2,-1,0);
+	file.Write(content);
+	file.Close();
+	return(true);
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function ieLoadFile(filePath)
+{
+	try
+		{
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		var file = fso.OpenTextFile(filePath,1);
+		var content = file.ReadAll();
+		file.Close();
+		}
+	catch(e)
+		{
+		//alert("Exception while attempting to load\n\n" + e.toString());
+		return(null);
+		}
+	return(content);
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function mozillaSaveFile(filePath, content)
+{
+	if(window.Components)
+		try
+			{
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if (!file.exists())
+				file.create(0, 0664);
+			var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+			out.init(file, 0x20 | 0x02, 00004,null);
+			out.write(content, content.length);
+			out.flush();
+			out.close();
+			return(true);
+			}
+		catch(e)
+			{
+			//alert("Exception while attempting to save\n\n" + e);
+			return(false);
+			}
+	return(null);
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function mozillaLoadFile(filePath)
+{
+	if(window.Components)
+		try
+			{
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if (!file.exists())
+				return(null);
+			var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+			inputStream.init(file, 0x01, 00004, null);
+			var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+			sInputStream.init(inputStream);
+			return(sInputStream.read(sInputStream.available()));
+			}
+		catch(e)
+			{
+			//alert("Exception while attempting to load\n\n" + e);
+			return(false);
+			}
+	return(null);
+}
+
+function javaUrlToFilename(url)
+{
+	var f = "//localhost";
+	if(url.indexOf(f) == 0)
+		return url.substring(f.length);
+	var i = url.indexOf(":");
+	if(i > 0)
+		return url.substring(i-1);
+	return url;
+}
+
+function javaSaveFile(filePath, content)
+{
+	try
+		{
+		if(document.applets["TiddlySaver"])
+			return document.applets["TiddlySaver"].saveFile(javaUrlToFilename(filePath),"UTF-8",content);
+		}
+	catch(e)
+		{
+		}
+	try
+		{
+		var s = new java.io.PrintStream(new java.io.FileOutputStream(javaUrlToFilename(filePath)));
+		s.print(content);
+		s.close();
+		}
+	catch(e)
+		{
+		return null;
+		}
+	return true;
+}
+
+function javaLoadFile(filePath)
+{
+	try
+		{
+	if(document.applets["TiddlySaver"])
+		return String(document.applets["TiddlySaver"].loadFile(javaUrlToFilename(filePath),"UTF-8"));
+		}
+	catch(e)
+		{
+		}
+	var content = [];
+	try
+		{
+		var r = new java.io.BufferedReader(new java.io.FileReader(javaUrlToFilename(filePath)));
+		var line;
+		while ((line = r.readLine()) != null)
+			content.push(new String(line));
+		r.close();
+		}
+	catch(e)
+		{
+		return null;
+		}
+	return content.join("\n");
+}
+
+
+// ---------------------------------------------------------------------------------
+// Remote HTTP requests
+// ---------------------------------------------------------------------------------
+
+// Load a file over http
+//   url - the source url
+//   callback - function to call when there's a response
+//   params - parameter object that gets passed to the callback for storing it's state
+// Return value is the underlying XMLHttpRequest object, or 'null' if there was an error
+// Callback function is called like this:
+//   callback(status,params,responseText,xhr)
+//     status - true if OK, false if error
+//     params - the parameter object provided to loadRemoteFile()
+//     responseText - the text of the file
+//     xhr - the underlying XMLHttpRequest object
+function loadRemoteFile(url,callback,params)
+{
+	// Get an xhr object
+	var x;
+	try
+		{
+		x = new XMLHttpRequest(); // Modern
+		}
+	catch(e)
+		{
+		try
+			{
+			x = new ActiveXObject("Msxml2.XMLHTTP"); // IE 6
+			}
+		catch (e)
+			{
+			return null;
+			}
+		}
+	// Install callback
+	x.onreadystatechange = function()
+		{
+		if (x.readyState == 4)
+			{
+			if ((x.status == 0 || x.status == 200) && callback)
+				{
+				callback(true,params,x.responseText,url,x);
+			}
+			else
+				callback(false,params,null,url,x);
+			}
+		}
+	// Send request
+	if(window.netscape && window.netscape.security && document.location.protocol.indexOf("http") == -1)
+		window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+	try
+		{
+		url = url + (url.indexOf("?") < 0 ? "?" : "&") + "nocache=" + Math.random();
+		x.open("GET",url,true);
+		if (x.overrideMimeType)
+			x.overrideMimeType("text/html");
+		x.send(null);
+		}
+	catch (e)
+		{
+		alert("Error in send " + e);
+		return null;
+		}
+	return x;
+}
+// ---------------------------------------------------------------------------------
+// TiddlyWiki-specific utility functions
+// ---------------------------------------------------------------------------------
+
+function createTiddlyButton(theParent,theText,theTooltip,theAction,theClass,theId,theAccessKey)
+{
+	var theButton = document.createElement("a");
+	if(theAction)
+		{
+		theButton.onclick = theAction;
+		theButton.setAttribute("href","javascript:;");
+		}
+	if(theTooltip)
+		theButton.setAttribute("title",theTooltip);
+	if(theText)
+		theButton.appendChild(document.createTextNode(theText));
+	if(theClass)
+		theButton.className = theClass;
+	else
+		theButton.className = "button";
+	if(theId)
+		theButton.id = theId;
+	if(theParent)
+		theParent.appendChild(theButton);
+	if(theAccessKey)
+		theButton.setAttribute("accessKey",theAccessKey);
+	return(theButton);
+}
+
+function createTiddlyLink(place,title,includeText,theClass,isStatic)
+{
+	var text = includeText ? title : null;
+	var i = getTiddlyLinkInfo(title,theClass)
+	var btn;
+	if(isStatic)
+		btn = createExternalLink(place,"#" + title);
+	else
+		btn = createTiddlyButton(place,text,i.subTitle,onClickTiddlerLink,i.classes);
+	btn.setAttribute("refresh","link");
+	btn.setAttribute("tiddlyLink",title);
+	return(btn);
+}
+
+function refreshTiddlyLink(e,title)
+{
+	var i = getTiddlyLinkInfo(title,e.className);
+	e.className = i.classes;
+	e.title = i.subTitle;
+}
+
+function getTiddlyLinkInfo(title,currClasses)
+{
+	var classes = currClasses ? currClasses.split(" ") : [];
+	classes.pushUnique("tiddlyLink");
+	var tiddler = store.fetchTiddler(title);
+	var subTitle;
+	if(tiddler)
+		{
+		subTitle = tiddler.getSubtitle();
+		classes.pushUnique("tiddlyLinkExisting");
+		classes.remove("tiddlyLinkNonExisting");
+		classes.remove("shadow");
+		}
+	else
+		{
+		classes.remove("tiddlyLinkExisting");
+		classes.pushUnique("tiddlyLinkNonExisting");
+		if(store.isShadowTiddler(title))
+			{
+			subTitle = config.messages.shadowedTiddlerToolTip.format([title]);
+			classes.pushUnique("shadow");
+			}
+		else
+			{
+			subTitle = config.messages.undefinedTiddlerToolTip.format([title]);
+			classes.remove("shadow");
+			}
+		}
+	return {classes: classes.join(" "), subTitle: subTitle};
+}
+
+function createExternalLink(place,url)
+{
+	var theLink = document.createElement("a");
+	theLink.className = "externalLink";
+	theLink.href = url;
+	theLink.title = config.messages.externalLinkTooltip.format([url]);
+	if(config.options.chkOpenInNewWindow)
+		theLink.target = "_blank";
+	place.appendChild(theLink);
+	return(theLink);
+}
+
+// Event handler for clicking on a tiddly link
+function onClickTiddlerLink(e)
+{
+	if (!e) var e = window.event;
+	var theTarget = resolveTarget(e);
+	var theLink = theTarget;
+	var title = null;
+	do {
+		title = theLink.getAttribute("tiddlyLink");
+		theLink = theLink.parentNode;
+	} while(title == null && theLink != null);
+	if(title)
+		{
+		var toggling = e.metaKey || e.ctrlKey;
+		if(config.options.chkToggleLinks)
+			toggling = !toggling;
+		var opening;
+		if(toggling && document.getElementById("tiddler" + title))
+			story.closeTiddler(title,true,e.shiftKey || e.altKey);
+		else
+			story.displayTiddler(theTarget,title,null,true,e.shiftKey || e.altKey);
+		}
+	clearMessage();
+	return(false);
+}
+
+// Create a button for a tag with a popup listing all the tiddlers that it tags
+function createTagButton(place,tag,excludeTiddler)
+{
+	var theTag = createTiddlyButton(place,tag,config.views.wikified.tag.tooltip.format([tag]),onClickTag);
+	theTag.setAttribute("tag",tag);
+	if(excludeTiddler)
+		theTag.setAttribute("tiddler",excludeTiddler);
+	return(theTag);
+}
+
+// Event handler for clicking on a tiddler tag
+function onClickTag(e)
+{
+	if (!e) var e = window.event;
+	var theTarget = resolveTarget(e);
+	var popup = Popup.create(this);
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(popup && tag)
+		{
+		var tagged = store.getTaggedTiddlers(tag);
+		var titles = [];
+		var li,r;
+		for(r=0;r<tagged.length;r++)
+			if(tagged[r].title != title)
+				titles.push(tagged[r].title);
+		var lingo = config.views.wikified.tag;
+		if(titles.length > 0)
+			{
+			var openAll = createTiddlyButton(createTiddlyElement(popup,"li"),lingo.openAllText.format([tag]),lingo.openAllTooltip,onClickTagOpenAll);
+			openAll.setAttribute("tag",tag);
+			createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+			for(r=0; r<titles.length; r++)
+				{
+				createTiddlyLink(createTiddlyElement(popup,"li"),titles[r],true);
+				}
+			}
+		else
+			createTiddlyText(createTiddlyElement(popup,"li",null,"disabled"),lingo.popupNone.format([tag]));
+		createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+		var h = createTiddlyLink(createTiddlyElement(popup,"li"),tag,false);
+		createTiddlyText(h,lingo.openTag.format([tag]));
+		}
+	Popup.show(popup,false);
+	e.cancelBubble = true;
+	if (e.stopPropagation) e.stopPropagation();
+	return(false);
+}
+
+// Event handler for 'open all' on a tiddler popup
+function onClickTagOpenAll(e)
+{
+	if (!e) var e = window.event;
+	var tag = this.getAttribute("tag");
+	var tagged = store.getTaggedTiddlers(tag);
+	var titles = [];
+	for(var t=0; t<tagged.length; t++)
+		titles.push(tagged[t].title);
+	story.displayTiddlers(this,titles);
+	return(false);
+}
+
+function onClickError(e)
+{
+	if (!e) var e = window.event;
+	var popup = Popup.create(this);
+	var lines = this.getAttribute("errorText").split("\n");
+	for(var t=0; t<lines.length; t++)
+		createTiddlyElement(popup,"li",null,null,lines[t]);
+	Popup.show(popup,false);
+	e.cancelBubble = true;
+	if (e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+function createTiddlyDropDown(place,onchange,options)
+{
+	var sel = createTiddlyElement(place,"select");
+	sel.onchange = onchange;
+	for(var t=0; t<options.length; t++)
+		{
+		var e = createTiddlyElement(sel,"option",null,null,options[t].caption);
+		e.value = options[t].name;
+		}
+}
+
+function createTiddlyError(place,title,text)
+{
+	var btn = createTiddlyButton(place,title,null,onClickError,"errorButton");
+	if (text) btn.setAttribute("errorText",text);
+}
+
+function merge(dst,src,preserveExisting)
+{
+	for (p in src)
+		if (!preserveExisting || dst[p] === undefined)
+			dst[p] = src[p];
+	return dst;
+}
+
+// Returns a string containing the description of an exception, optionally prepended by a message
+function exceptionText(e, message)
+{
+	var s = e.description ? e.description : e.toString();
+	return message ? "%0:\n%1".format([message, s]) : s;
+}
+
+// Displays an alert of an exception description with optional message
+function showException(e, message)
+{
+	alert(exceptionText(e, message));
+}
+
+// ---------------------------------------------------------------------------------
+// Animation engine
+// ---------------------------------------------------------------------------------
+
+function Animator()
+{
+	this.running = 0; // Incremented at start of each animation, decremented afterwards. If zero, the interval timer is disabled
+	this.timerID = 0; // ID of the timer used for animating
+	this.animations = []; // List of animations in progress
+	return this;
+}
+
+// Start animation engine
+Animator.prototype.startAnimating = function() // Variable number of arguments
+{
+	for(var t=0; t<arguments.length; t++)
+		this.animations.push(arguments[t]);
+	if(this.running == 0)
+		{
+		var me = this;
+		this.timerID = window.setInterval(function() {me.doAnimate(me);},5);
+		}
+	this.running += arguments.length;
+}
+
+// Perform an animation engine tick, calling each of the known animation modules
+Animator.prototype.doAnimate = function(me)
+{
+	var a = 0;
+	while(a < me.animations.length)
+		{
+		var animation = me.animations[a];
+		if(animation.tick())
+			a++;
+		else
+			{
+			me.animations.splice(a,1);
+			if(--me.running == 0)
+				window.clearInterval(me.timerID);
+			}
+		}
+}
+
+// Map a 0..1 value to 0..1, but slow down at the start and end
+Animator.slowInSlowOut = function(progress)
+{
+	return(1-((Math.cos(progress * Math.PI)+1)/2));
+}
+
+// ---------------------------------------------------------------------------------
+// Cascade animation
+// ---------------------------------------------------------------------------------
+
+function Cascade(text,startElement,targetElement,slowly)
+{
+	var winWidth = findWindowWidth();
+	var winHeight = findWindowHeight();
+	this.elements = [];
+	this.startElement = startElement;
+	this.startLeft = findPosX(this.startElement);
+	this.startTop = findPosY(this.startElement);
+	this.startWidth = Math.min(this.startElement.offsetWidth,winWidth);
+	this.startHeight = Math.min(this.startElement.offsetHeight,winHeight);
+	this.targetElement = targetElement;
+	targetElement.style.position = "relative";
+	targetElement.style.zIndex = 2;
+	this.targetLeft = findPosX(this.targetElement);
+	this.targetTop = findPosY(this.targetElement);
+	this.targetWidth = Math.min(this.targetElement.offsetWidth,winWidth);
+	this.targetHeight = Math.min(this.targetElement.offsetHeight,winHeight);
+	this.progress = -1;
+	this.steps = slowly ? config.cascadeSlow : config.cascadeFast;
+	this.text = text;
+	this.tick();
+	return this;
+}
+
+Cascade.prototype.tick = function()
+{
+	this.progress++;
+	if(this.progress >= this.steps)
+		{
+		while(this.elements.length > 0)
+			this.removeTail();
+		this.targetElement.style.position = "static";
+		this.targetElement.style.zIndex = "";
+		return false;
+		}
+	else
+		{
+		if(this.elements.length > 0 && this.progress > config.cascadeDepth)
+			this.removeTail();
+		if(this.progress < (this.steps - config.cascadeDepth))
+			{
+			var f = Animator.slowInSlowOut(this.progress/(this.steps - config.cascadeDepth - 1));
+			var e = createTiddlyElement(document.body,"div",null,"cascade",this.text);
+			e.style.zIndex = 1;
+			e.style.left = this.startLeft + (this.targetLeft-this.startLeft) * f + "px";
+			e.style.top = this.startTop + (this.targetTop-this.startTop) * f + "px";
+			e.style.width = this.startWidth + (this.targetWidth-this.startWidth) * f + "px";
+			e.style.height = this.startHeight + (this.targetHeight-this.startHeight) * f + "px";
+			e.style.display = "block";
+			this.elements.push(e);
+			}
+		return true;
+		}
+}
+
+Cascade.prototype.removeTail = function()
+{
+	var e = this.elements[0];
+	e.parentNode.removeChild(e);
+	this.elements.shift();
+}
+
+// ---------------------------------------------------------------------------------
+// Scroller animation
+// ---------------------------------------------------------------------------------
+
+function Scroller(targetElement,slowly)
+{
+	this.targetElement = targetElement;
+	this.startScroll = findScrollY();
+	this.targetScroll = ensureVisible(targetElement);
+	this.progress = 0;
+	this.step = slowly ? config.animSlow : config.animFast;
+	return this;
+}
+
+Scroller.prototype.tick = function()
+{
+	this.progress += this.step;
+	if(this.progress > 1)
+		{
+		window.scrollTo(0,this.targetScroll);
+		return false;
+		}
+	else
+		{
+		var f = Animator.slowInSlowOut(this.progress);
+		window.scrollTo(0,this.startScroll + (this.targetScroll-this.startScroll) * f);
+		return true;
+		}
+}
+
+// ---------------------------------------------------------------------------------
+// Slider animation
+// ---------------------------------------------------------------------------------
+
+// deleteMode - "none", "all" [delete target element and it's children], [only] "children" [but not the target element]
+function Slider(element,opening,slowly,deleteMode)
+{
+	this.element = element;
+	element.style.display = "block";
+	this.deleteMode = deleteMode;
+	this.element.style.height = "auto";
+	this.realHeight = element.offsetHeight;
+	this.opening = opening;
+	this.step = slowly ? config.animSlow : config.animFast;
+	if(opening)
+		{
+		this.progress = 0;
+		element.style.height = "0px";
+		element.style.display = "block";
+		}
+	else
+		{
+		this.progress = 1;
+		this.step = -this.step;
+		}
+	element.style.overflow = "hidden";
+	return this;
+}
+
+Slider.prototype.stop = function()
+{
+	if(this.opening)
+		{
+		this.element.style.height = "auto";
+		this.element.style.opacity = 1;
+		this.element.style.filter = "alpha(opacity:100)";
+		}
+	else
+		{
+		switch(this.deleteMode)
+			{
+			case "none":
+				this.element.style.display = "none";
+				break;
+			case "all":
+				this.element.parentNode.removeChild(this.element);
+				break;
+			case "children":
+				removeChildren(this.element);
+				break;
+			}
+		}
+}
+
+Slider.prototype.tick = function()
+{
+	this.progress += this.step;
+	if(this.progress < 0 || this.progress > 1)
+		{
+		this.stop();
+		return false;
+		}
+	else
+		{
+		var f = Animator.slowInSlowOut(this.progress);
+		var h = this.realHeight * f;
+		this.element.style.height = h + "px";
+		this.element.style.opacity = f;
+		this.element.style.filter = "alpha(opacity:" + f * 100 +")";
+		return true;
+		}
+}
+
+// ---------------------------------------------------------------------------------
+// Popup menu
+// ---------------------------------------------------------------------------------
+
+var Popup = {
+	stack: [] // Array of objects with members root: and popup:
+	};
+
+Popup.create = function(root)
+{
+	Popup.remove();
+	var popup = createTiddlyElement(document.body,"ol","popup","popup");
+	Popup.stack.push({root: root, popup: popup});
+	return popup;
+}
+
+Popup.onDocumentClick = function(e)
+{
+	if (!e) var e = window.event;
+	var target = resolveTarget(e);
+	if(e.eventPhase == undefined)
+		Popup.remove();
+	else if(e.eventPhase == Event.BUBBLING_PHASE || e.eventPhase == Event.AT_TARGET)
+		Popup.remove();
+	return true;
+}
+
+Popup.show = function(unused,slowly)
+{
+	var curr = Popup.stack[Popup.stack.length-1];
+	var rootLeft = findPosX(curr.root);
+	var rootTop = findPosY(curr.root);
+	var rootHeight = curr.root.offsetHeight;
+	var popupLeft = rootLeft;
+	var popupTop = rootTop + rootHeight;
+	var popupWidth = curr.popup.offsetWidth;
+	var winWidth = findWindowWidth();
+	if(popupLeft + popupWidth > winWidth)
+		popupLeft = winWidth - popupWidth;
+	curr.popup.style.left = popupLeft + "px";
+	curr.popup.style.top = popupTop + "px";
+	curr.popup.style.display = "block";
+	addClass(curr.root,"highlight");
+	if(anim && config.options.chkAnimate)
+		anim.startAnimating(new Scroller(curr.popup,slowly));
+	else
+		window.scrollTo(0,ensureVisible(curr.popup));
+}
+
+Popup.remove = function()
+{
+	if(Popup.stack.length > 0)
+		{
+		Popup.removeFrom(0);
+		}
+}
+
+Popup.removeFrom = function(from)
+{
+	for(var t=Popup.stack.length-1; t>=from; t--)
+		{
+		var p = Popup.stack[t];
+		removeClass(p.root,"highlight");
+		p.popup.parentNode.removeChild(p.popup);
+		}
+	Popup.stack = Popup.stack.slice(0,from);
+}
+
+// ---------------------------------------------------------------------------------
+// ListView gadget
+// ---------------------------------------------------------------------------------
+
+var ListView = {};
+
+// Create a listview
+//   place - where in the DOM tree to insert the listview
+//   listObject - array of objects to be included in the listview
+//   listTemplate - template for the listview
+//   callback - callback for a command being selected
+//   className - optional classname for the <table> element
+ListView.create = function(place,listObject,listTemplate,callback,className)
+{
+	var table = createTiddlyElement(place,"table",null,className ? className : "listView");
+	var thead = createTiddlyElement(table,"thead");
+	var r = createTiddlyElement(thead,"tr");
+	for(var t=0; t<listTemplate.columns.length; t++)
+		{
+		var columnTemplate = listTemplate.columns[t];
+		var c = createTiddlyElement(r,"th");
+		var colType = ListView.columnTypes[columnTemplate.type];
+		if(colType && colType.createHeader)
+			colType.createHeader(c,columnTemplate,t);
+		}
+	var tbody = createTiddlyElement(table,"tbody");
+	for(var rc=0; rc<listObject.length; rc++)
+		{
+		rowObject = listObject[rc];
+		r = createTiddlyElement(tbody,"tr");
+		for(var c=0; c<listTemplate.rowClasses.length; c++)
+			{
+			if(rowObject[listTemplate.rowClasses[c].field])
+				addClass(r,listTemplate.rowClasses[c].className);
+			}
+		rowObject.rowElement = rowObject;
+		rowObject.colElements = {};
+		for(var cc=0; cc<listTemplate.columns.length; cc++)
+			{
+			var c = createTiddlyElement(r,"td");
+			var columnTemplate = listTemplate.columns[cc];
+			var field = columnTemplate.field;
+			var colType = ListView.columnTypes[columnTemplate.type];
+			if(colType && colType.createItem)
+				colType.createItem(c,rowObject,field,columnTemplate,cc,rc);
+			rowObject.colElements[field] = c;
+			}
+		}
+	if(callback && listTemplate.actions)
+		createTiddlyDropDown(place,ListView.getCommandHandler(callback),listTemplate.actions);
+	if(callback && listTemplate.buttons)
+		{
+		for(t=0; t<listTemplate.buttons.length; t++)
+			{
+			var a = listTemplate.buttons[t];
+			if(a && a.name != "")
+				createTiddlyButton(place,a.caption,null,ListView.getCommandHandler(callback,a.name,a.allowEmptySelection));
+			}
+		}
+	return table;
+}
+
+ListView.getCommandHandler = function(callback,name,allowEmptySelection)
+{
+	return function(e)
+		{
+		var view = findRelated(this,"TABLE",null,"previousSibling");
+		var tiddlers = [];
+		ListView.forEachSelector(view,function(e,rowName) {
+					if(e.checked)
+						tiddlers.push(rowName);
+					});
+		if(tiddlers.length == 0 && !allowEmptySelection)
+			alert(config.messages.nothingSelected);
+		else
+			{
+			if(this.nodeName.toLowerCase() == "select")
+				{
+				callback(view,this.value,tiddlers);
+				this.selectedIndex = 0;
+				}
+			else
+				callback(view,name,tiddlers);
+			}
+		};
+}
+
+// Invoke a callback for each selector checkbox in the listview
+//   view - <table> element of listView
+//   callback(checkboxElement,rowName)
+//     where
+//       checkboxElement - DOM element of checkbox
+//       rowName - name of this row as assigned by the column template
+//   result: true if at least one selector was checked
+ListView.forEachSelector = function(view,callback)
+{
+	var checkboxes = view.getElementsByTagName("input");
+	var hadOne = false;
+	for(var t=0; t<checkboxes.length; t++)
+		{
+		var cb = checkboxes[t];
+		if(cb.getAttribute("type") == "checkbox")
+			{
+			var rn = cb.getAttribute("rowName");
+			if(rn)
+				{
+				callback(cb,rn);
+				hadOne = true;
+				}
+			}
+		}
+	return hadOne;
+}
+
+ListView.columnTypes = {};
+
+ListView.columnTypes.String = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyText(place,columnTemplate.title);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v);
+		}
+};
+
+ListView.columnTypes.Date = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v.formatString(columnTemplate.dateFormat));
+		}
+};
+
+ListView.columnTypes.StringList = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				{
+				for(var t=0; t<v.length; t++)
+					{
+					createTiddlyText(place,v[t]);
+					createTiddlyElement(place,"br");
+					}
+				}
+		}
+};
+
+ListView.columnTypes.Selector = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyCheckbox(place,null,false,this.onHeaderChange);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],null);
+			e.setAttribute("rowName",listObject[columnTemplate.rowName]);
+		},
+	onHeaderChange: function(e)
+		{
+			var state = this.checked;
+			var view = findRelated(this,"TABLE");
+			if(!view)
+				return;
+			ListView.forEachSelector(view,function(e,rowName) {
+								e.checked = state;
+							});
+		}
+};
+
+ListView.columnTypes.Tags = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var tags = listObject[field];
+			createTiddlyText(place,String.encodeTiddlyLinkList(tags));
+		}
+};
+
+ListView.columnTypes.Boolean = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			if(listObject[field] == true)
+				createTiddlyText(place,columnTemplate.trueText);
+			if(listObject[field] == false)
+				createTiddlyText(place,columnTemplate.falseText);
+		}
+};
+
+ListView.columnTypes.TagCheckbox = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],this.onChange);
+			e.setAttribute("tiddler",listObject.title);
+			e.setAttribute("tag",columnTemplate.tag);
+		},
+	onChange : function(e)
+		{
+			var tag = this.getAttribute("tag");
+			var tiddler = this.getAttribute("tiddler");
+			store.setTiddlerTag(tiddler,this.checked,tag);
+		}
+};
+
+ListView.columnTypes.TiddlerLink = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				{
+				var link = createTiddlyLink(place,listObject[columnTemplate.tiddlerLink],false,null);
+				createTiddlyText(link,listObject[field]);
+				}
+		}
+};
+// ---------------------------------------------------------------------------------
+// Augmented methods for the JavaScript Number(), Array(), String() and Date() objects
+// ---------------------------------------------------------------------------------
+
+// Clamp a number to a range
+Number.prototype.clamp = function(min,max)
+{
+	var c = this;
+	if(c < min)
+		c = min;
+	if(c > max)
+		c = max;
+	return c;
+}
+
+// Add indexOf function if browser does not support it
+if(!Array.indexOf) {
+Array.prototype.indexOf = function(item,from)
+{
+	if(!from)
+		from = 0;
+	for(var i=from; i<this.length; i++)
+		if(this[i] === item)
+			return i;
+	return -1;
+}}
+
+// Find an entry in a given field of the members of an array
+Array.prototype.findByField = function(field,value)
+{
+	for(var t=0; t<this.length; t++)
+		if(this[t][field] == value)
+			return t;
+	return null;
+}
+
+// Return whether an entry exists in an array
+Array.prototype.contains = function(item)
+{
+	return this.indexOf(item) != -1;
+};
+
+// Adds, removes or toggles a particular value within an array
+//  value - value to add
+//  mode - +1 to add value, -1 to remove value, 0 to toggle it
+Array.prototype.setItem = function(value,mode)
+{
+	var p = this.indexOf(value);
+	if(mode == 0)
+		mode = (p == -1) ? +1 : -1;
+	if(mode == +1)
+		{
+		if(p == -1)
+			this.push(value);
+		}
+	else if(mode == -1)
+		{
+		if(p != -1)
+			this.splice(p,1);
+		}
+}
+
+// Return whether one of a list of values exists in an array
+Array.prototype.containsAny = function(items)
+{
+	for(var i=0; i<items.length; i++)
+		if (this.indexOf(items[i]) != -1)
+			return true;
+	return false;
+};
+
+// Return whether all of a list of values exists in an array
+Array.prototype.containsAll = function(items)
+{
+	for (var i = 0; i<items.length; i++)
+		if (this.indexOf(items[i]) == -1)
+			return false;
+	return true;
+};
+
+// Push a new value into an array only if it is not already present in the array. If the optional unique parameter is false, it reverts to a normal push
+Array.prototype.pushUnique = function(item,unique)
+{
+	if(unique != undefined && unique == false)
+		this.push(item);
+	else
+		{
+		if(this.indexOf(item) == -1)
+			this.push(item);
+		}
+}
+
+Array.prototype.remove = function(item)
+{
+	var p = this.indexOf(item);
+	if(p != -1)
+		this.splice(p,1);
+}
+
+// Get characters from the right end of a string
+String.prototype.right = function(n)
+{
+	if(n < this.length)
+		return this.slice(this.length-n);
+	else
+		return this;
+}
+
+// Trim whitespace from both ends of a string
+String.prototype.trim = function()
+{
+	return this.replace(/^\s*|\s*$/g,"");
+}
+
+// Convert a string from a CSS style property name to a JavaScript style name ("background-color" -> "backgroundColor")
+String.prototype.unDash = function()
+{
+	var s = this.split("-");
+	if(s.length > 1)
+		for(var t=1; t<s.length; t++)
+			s[t] = s[t].substr(0,1).toUpperCase() + s[t].substr(1);
+	return s.join("");
+}
+
+// Substitute substrings from an array into a format string that includes '%1'-type specifiers
+String.prototype.format = function(substrings)
+{
+	var subRegExp = /(?:%(\d+))/mg;
+	var currPos = 0;
+	var r = [];
+	do {
+		var match = subRegExp.exec(this);
+		if(match && match[1])
+			{
+			if(match.index > currPos)
+				r.push(this.substring(currPos,match.index));
+			r.push(substrings[parseInt(match[1])]);
+			currPos = subRegExp.lastIndex;
+			}
+	} while(match);
+	if(currPos < this.length)
+		r.push(this.substring(currPos,this.length));
+	return r.join("");
+}
+
+// Escape any special RegExp characters with that character preceded by a backslash
+String.prototype.escapeRegExp = function()
+{
+	var s = "\\^$*+?()=!|,{}[].";
+	var c = this;
+	for(var t=0; t<s.length; t++)
+		c = c.replace(new RegExp("\\" + s.substr(t,1),"g"),"\\" + s.substr(t,1));
+	return c;
+}
+
+// Convert "\" to "\s", newlines to "\n" (and remove carriage returns)
+String.prototype.escapeLineBreaks = function()
+{
+	return this.replace(/\\/mg,"\\s").replace(/\n/mg,"\\n").replace(/\r/mg,"");
+}
+
+// Convert "\n" to newlines, "\b" to " ", "\s" to "\" (and remove carriage returns)
+String.prototype.unescapeLineBreaks = function()
+{
+	return this.replace(/\\n/mg,"\n").replace(/\\b/mg," ").replace(/\\s/mg,"\\").replace(/\r/mg,"");
+}
+
+// Convert & to "&amp;", < to "&lt;", > to "&gt;" and " to "&quot;"
+String.prototype.htmlEncode = function()
+{
+	return(this.replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;").replace(/\"/mg,"&quot;"));
+}
+
+// Convert "&amp;" to &, "&lt;" to <, "&gt;" to > and "&quot;" to "
+String.prototype.htmlDecode = function()
+{
+	return(this.replace(/&amp;/mg,"&").replace(/&lt;/mg,"<").replace(/&gt;/mg,">").replace(/&quot;/mg,"\""));
+}
+
+// Parse a space-separated string of name:value parameters where:
+//   - the name or the value can be optional (in which case separate defaults are used instead)
+//     - in case of ambiguity, a lone word is taken to be a value
+//     - if 'cascadeDefaults' is set to true, then the defaults are modified by updated by each specified name or value
+//     - name prefixes are not allowed if the 'noNames' parameter is true
+//   - if both the name and value are present they must be separated by a colon
+//   - the name and the value may both be quoted with single- or double-quotes, double-square brackets
+//   - names or values quoted with {{double-curly braces}} are evaluated as a JavaScript expression
+//     - as long as the 'allowEval' parameter is true
+// The result is an array of objects:
+//   result[0] = object with a member for each parameter name, value of that member being an array of values
+//   result[1..n] = one object for each parameter, with 'name' and 'value' members
+String.prototype.parseParams = function(defaultName,defaultValue,allowEval,noNames,cascadeDefaults)
+{
+	var parseToken = function(match,p)
+		{
+		var n;
+		if(match[p]) // Double quoted
+			n = match[p];
+		else if(match[p+1]) // Single quoted
+			n = match[p+1];
+		else if(match[p+2]) // Double-square-bracket quoted
+			n = match[p+2];
+		else if(match[p+3]) // Double-brace quoted
+			try
+				{
+				n = match[p+3];
+				if(allowEval)
+					n = window.eval(n);
+				}
+			catch(e)
+				{
+				throw "Unable to evaluate {{" + match[p+3] + "}}: " + exceptionText(e);
+				}
+		else if(match[p+4]) // Unquoted
+			n = match[p+4];
+		else if(match[p+5]) // empty quote
+			n = "";
+		return n;
+		};
+	var r = [{}];
+	var dblQuote = "(?:\"((?:(?:\\\\\")|[^\"])+)\")";
+	var sngQuote = "(?:'((?:(?:\\\\\')|[^'])+)')";
+	var dblSquare = "(?:\\[\\[((?:\\s|\\S)*?)\\]\\])";
+	var dblBrace = "(?:\\{\\{((?:\\s|\\S)*?)\\}\\})";
+	var unQuoted = noNames ? "([^\"'\\s]\\S*)" : "([^\"':\\s][^\\s:]*)";
+	var emptyQuote = "((?:\"\")|(?:''))";
+	var skipSpace = "(?:\\s*)";
+	var token = "(?:" + dblQuote + "|" + sngQuote + "|" + dblSquare + "|" + dblBrace + "|" + unQuoted + "|" + emptyQuote + ")";
+	var re = noNames
+		? new RegExp(token,"mg")
+		: new RegExp(skipSpace + token + skipSpace + "(?:(\\:)" + skipSpace + token + ")?","mg");
+	var params = [];
+	do {
+		var match = re.exec(this);
+		if(match)
+			{
+			var n = parseToken(match,1);
+			if(noNames)
+				r.push({name: "", value: n});
+			else
+				{
+				var v = parseToken(match,8);
+				if(v == null && defaultName)
+					{
+					v = n;
+					n = defaultName;
+					}
+				else if(v == null && defaultValue)
+					v = defaultValue;
+				r.push({name: n, value: v});
+				if(cascadeDefaults)
+					{
+					defaultName = n;
+					defaultValue = v;
+					}
+				}
+			}
+	} while(match);
+	// Summarise parameters into first element
+	for(var t=1; t<r.length; t++)
+		{
+		if(r[0][r[t].name])
+			r[0][r[t].name].push(r[t].value);
+		else
+			r[0][r[t].name] = [r[t].value];
+		}
+	return r;
+}
+
+// Process a string list of macro parameters into an array. Parameters can be quoted with "", '',
+// [[]], {{ }} or left unquoted (and therefore space-separated). Double-braces {{}} results in
+// an *evaluated* parameter: e.g. {{config.options.txtUserName}} results in the current user's name.
+String.prototype.readMacroParams = function()
+{
+	var p = this.parseParams("list",null,true,true);
+	var n = [];
+	for(var t=1; t<p.length; t++)
+		n.push(p[t].value);
+	return n;
+}
+
+// Process a string list of unique tiddler names into an array. Tiddler names that have spaces in them must be [[bracketed]]
+String.prototype.readBracketedList = function(unique)
+{
+	var p = this.parseParams("list",null,false,true);
+	var n = [];
+	for(var t=1; t<p.length; t++)
+		n.pushUnique(p[t].value,unique);
+	return n;
+}
+
+// Returns array with start and end index of chunk between given start and end marker, or undefined.
+String.prototype.getChunkRange = function(start,end) 
+{
+	var s = this.indexOf(start);
+	if(s != -1)
+		{
+		s += start.length;
+		var e = this.indexOf(end,s);
+		if(e != -1)
+			return [s, e];
+		}
+}
+
+// Replace a chunk of a string given start and end markers
+String.prototype.replaceChunk = function(start,end,sub)
+{
+	var r = this.getChunkRange(start,end);
+	return r 
+		? this.substring(0,r[0]) + sub + this.substring(r[1])
+		: this;
+}
+
+// Returns a chunk of a string between start and end markers, or undefined
+String.prototype.getChunk = function(start,end)
+{
+	var r = this.getChunkRange(start,end);
+	if (r)
+		return this.substring(r[0],r[1]);
+}
+
+
+// Static method to bracket a string with double square brackets if it contains a space
+String.encodeTiddlyLink = function(title)
+{
+	if(title.indexOf(" ") == -1)
+		return(title);
+	else
+		return("[[" + title + "]]");
+}
+
+// Static method to encodeTiddlyLink for every item in an array and join them with spaces
+String.encodeTiddlyLinkList = function(list)
+{
+	if(list)
+		{
+		var results = [];
+		for(var t=0; t<list.length; t++)
+			results.push(String.encodeTiddlyLink(list[t]));
+		return results.join(" ");
+		}
+	else
+		return "";
+}
+
+// Static method to left-pad a string with 0s to a certain width
+String.zeroPad = function(n,d)
+{
+	var s = n.toString();
+	if(s.length < d)
+		s = "000000000000000000000000000".substr(0,d-s.length) + s;
+	return(s);
+}
+
+String.prototype.startsWith = function(prefix) 
+{
+	return !prefix || this.substring(0,prefix.length) == prefix;
+}
+
+// Returns the first value of the given named parameter.
+//#
+//# @param params
+//#         as returned by parseParams or null/undefined
+//# @return [may be null/undefined]
+//#
+function getParam(params, name, defaultValue) {
+	if (!params)
+		return defaultValue;
+	var p = params[0][name];
+	return p ? p[0] : defaultValue;
+}
+
+// Returns the first value of the given boolean named parameter.
+//#
+//# @param params
+//#         as returned by parseParams or null/undefined
+//#
+function getFlag(params, name, defaultValue) {
+	return !!getParam(params, name, defaultValue);
+} 
+	
+// Substitute date components into a string
+Date.prototype.formatString = function(template)
+{
+	var t = template.replace(/0hh12/g,String.zeroPad(this.getHours12(),2));
+	t = t.replace(/hh12/g,this.getHours12());
+	t = t.replace(/0hh/g,String.zeroPad(this.getHours(),2));
+	t = t.replace(/hh/g,this.getHours());
+	t = t.replace(/0mm/g,String.zeroPad(this.getMinutes(),2));
+	t = t.replace(/mm/g,this.getMinutes());
+	t = t.replace(/0ss/g,String.zeroPad(this.getSeconds(),2));
+	t = t.replace(/ss/g,this.getSeconds());
+	t = t.replace(/[ap]m/g,this.getAmPm().toLowerCase());
+	t = t.replace(/[AP]M/g,this.getAmPm().toUpperCase());
+	t = t.replace(/wYYYY/g,this.getYearForWeekNo());
+	t = t.replace(/wYY/g,String.zeroPad(this.getYearForWeekNo()-2000,2));
+	t = t.replace(/YYYY/g,this.getFullYear());
+	t = t.replace(/YY/g,String.zeroPad(this.getFullYear()-2000,2));
+	t = t.replace(/MMM/g,config.messages.dates.months[this.getMonth()]);
+	t = t.replace(/mmm/g,config.messages.dates.shortMonths[this.getMonth()]);
+	t = t.replace(/0MM/g,String.zeroPad(this.getMonth()+1,2));
+	t = t.replace(/MM/g,this.getMonth()+1);
+	t = t.replace(/0WW/g,String.zeroPad(this.getWeek(),2));
+	t = t.replace(/WW/g,this.getWeek());
+	t = t.replace(/DDD/g,config.messages.dates.days[this.getDay()]);
+	t = t.replace(/ddd/g,config.messages.dates.shortDays[this.getDay()]);
+	t = t.replace(/0DD/g,String.zeroPad(this.getDate(),2));
+	t = t.replace(/DDth/g,this.getDate()+this.daySuffix());
+	t = t.replace(/DD/g,this.getDate());
+	return t;
+}
+
+Date.prototype.getWeek = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if (d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week to calculate weekNo
+	var n = Math.floor((dt.getTime()-new Date(dt.getFullYear(),0,1)+3600000)/86400000); 
+	return Math.floor(n/7)+1;
+}
+
+Date.prototype.getYearForWeekNo = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if (d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week
+	return dt.getFullYear();
+}
+
+Date.prototype.getHours12 = function()
+{
+	var h = this.getHours();
+	return h > 12 ? h-12 : ( h > 0 ? h : 12 );
+}
+
+Date.prototype.getAmPm = function()
+{
+	return this.getHours() >= 12 ? "pm" : "am";
+}
+
+Date.prototype.daySuffix = function()
+{
+	var num = this.getDate();
+	if (num >= 11 && num <= 13) return "th";
+	else if (num.toString().substr(-1)=="1") return "st";
+	else if (num.toString().substr(-1)=="2") return "nd";
+	else if (num.toString().substr(-1)=="3") return "rd";
+	return "th";
+}
+
+// Convert a date to local YYYYMMDDHHMM string format
+Date.prototype.convertToLocalYYYYMMDDHHMM = function()
+{
+	return(String.zeroPad(this.getFullYear(),4) + String.zeroPad(this.getMonth()+1,2) + String.zeroPad(this.getDate(),2) + String.zeroPad(this.getHours(),2) + String.zeroPad(this.getMinutes(),2));
+}
+
+// Convert a date to UTC YYYYMMDDHHMM string format
+Date.prototype.convertToYYYYMMDDHHMM = function()
+{
+	return(String.zeroPad(this.getUTCFullYear(),4) + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2));
+}
+
+// Convert a date to UTC YYYYMMDD.HHMMSSMMM string format
+Date.prototype.convertToYYYYMMDDHHMMSSMMM = function()
+{
+	return(String.zeroPad(this.getUTCFullYear(),4) + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + "." + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2) + String.zeroPad(this.getUTCSeconds(),2) + String.zeroPad(this.getUTCMilliseconds(),4));
+}
+
+// Static method to create a date from a UTC YYYYMMDDHHMM format string
+Date.convertFromYYYYMMDDHHMM = function(d)
+{
+	var theDate = new Date(Date.UTC(parseInt(d.substr(0,4),10),
+							parseInt(d.substr(4,2),10)-1,
+							parseInt(d.substr(6,2),10),
+							parseInt(d.substr(8,2),10),
+							parseInt(d.substr(10,2),10),0,0));
+	return(theDate);
+}
+
+// ---------------------------------------------------------------------------------
+// Crypto functions and associated conversion routines
+// ---------------------------------------------------------------------------------
+
+// Crypto "namespace"
+function Crypto() {}
+
+// Convert a string to an array of big-endian 32-bit words
+Crypto.strToBe32s = function(str)
+{
+	var be = Array();
+	var len = Math.floor(str.length/4);
+	var i, j;
+	for(i=0, j=0; i<len; i++, j+=4)
+		{
+		be[i] = ((str.charCodeAt(j)&0xff) << 24)|((str.charCodeAt(j+1)&0xff) << 16)|((str.charCodeAt(j+2)&0xff) << 8)|(str.charCodeAt(j+3)&0xff);
+		}
+	while (j<str.length)
+		{
+		be[j>>2] |= (str.charCodeAt(j)&0xff)<<(24-(j*8)%32);
+		j++;
+		}
+	return be;
+}
+
+// Convert an array of big-endian 32-bit words to a string
+Crypto.be32sToStr = function(be)
+{
+	var str = "";
+	for(var i=0;i<be.length*32;i+=8)
+		str += String.fromCharCode((be[i>>5]>>>(24-i%32)) & 0xff);
+	return str;
+}
+
+// Convert an array of big-endian 32-bit words to a hex string
+Crypto.be32sToHex = function(be)
+{
+	var hex = "0123456789ABCDEF";
+	var str = "";
+	for(var i=0;i<be.length*4;i++)
+		str += hex.charAt((be[i>>2]>>((3-i%4)*8+4))&0xF) + hex.charAt((be[i>>2]>>((3-i%4)*8))&0xF);
+	return str;
+}
+
+// Return, in hex, the SHA-1 hash of a string
+Crypto.hexSha1Str = function(str)
+{
+	return Crypto.be32sToHex(Crypto.sha1Str(str));
+}
+
+// Return the SHA-1 hash of a string
+Crypto.sha1Str = function(str)
+{
+	return Crypto.sha1(Crypto.strToBe32s(str),str.length);
+}
+
+// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words
+Crypto.sha1 = function(x,blen)
+{
+	// Add 32-bit integers, wrapping at 32 bits
+	//# Uses 16-bit operations internally to work around bugs in some JavaScript interpreters.
+	add32 = function(a,b)
+	{
+		var lsw = (a&0xFFFF)+(b&0xFFFF);
+		var msw = (a>>16)+(b>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	};
+	// Add five 32-bit integers, wrapping at 32 bits
+	//# Uses 16-bit operations internally to work around bugs in some JavaScript interpreters.
+	add32x5 = function(a,b,c,d,e)
+	{
+		var lsw = (a&0xFFFF)+(b&0xFFFF)+(c&0xFFFF)+(d&0xFFFF)+(e&0xFFFF);
+		var msw = (a>>16)+(b>>16)+(c>>16)+(d>>16)+(e>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	};
+	// Bitwise rotate left a 32-bit integer by 1 bit
+	rol32 = function(n)
+	{
+		return (n>>>31)|(n<<1);
+	};
+
+	var len = blen*8;
+	// Append padding so length in bits is 448 mod 512
+	x[len>>5] |= 0x80 << (24-len%32);
+	// Append length
+	x[((len+64>>9)<<4)+15] = len;
+	var w = Array(80);
+
+	var k1 = 0x5A827999;
+	var k2 = 0x6ED9EBA1;
+	var k3 = 0x8F1BBCDC;
+	var k4 = 0xCA62C1D6;
+
+	var h0 = 0x67452301;
+	var h1 = 0xEFCDAB89;
+	var h2 = 0x98BADCFE;
+	var h3 = 0x10325476;
+	var h4 = 0xC3D2E1F0;
+
+	for(var i=0;i<x.length;i+=16)
+		{
+		var j,t;
+		var a = h0;
+		var b = h1;
+		var c = h2;
+		var d = h3;
+		var e = h4;
+		for(j = 0;j<16;j++)
+			{
+			w[j] = x[i+j];
+			t = add32x5(e,(a>>>27)|(a<<5),d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+			}
+		for(j=16;j<20;j++)
+			{
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+			}
+		for(j=20;j<40;j++)
+			{
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),b^c^d,w[j],k2);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+			}
+		for(j=40;j<60;j++)
+			{
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),(b&c)|(d&(b|c)),w[j],k3);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+			}
+		for(j=60;j<80;j++)
+			{
+			w[j] = rol32(w[j-3]^w[j-8]^w[j-14]^w[j-16]);
+			t = add32x5(e,(a>>>27)|(a<<5),b^c^d,w[j],k4);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a = t;
+			}
+
+		h0 = add32(h0,a);
+		h1 = add32(h1,b);
+		h2 = add32(h2,c);
+		h3 = add32(h3,d);
+		h4 = add32(h4,e);
+		}
+	return Array(h0,h1,h2,h3,h4);
+}
+
+// ---------------------------------------------------------------------------------
+// RGB colour object
+// ---------------------------------------------------------------------------------
+
+// Construct an RGB colour object from a '#rrggbb', '#rgb' or 'rgb(n,n,n)' string or from separate r,g,b values
+function RGB(r,g,b)
+{
+	this.r = 0;
+	this.g = 0;
+	this.b = 0;
+	if(typeof r == "string")
+		{
+		if(r.substr(0,1) == "#")
+			{
+			if(r.length == 7)
+				{
+				this.r = parseInt(r.substr(1,2),16)/255;
+				this.g = parseInt(r.substr(3,2),16)/255;
+				this.b = parseInt(r.substr(5,2),16)/255;
+				}
+			else
+				{
+				this.r = parseInt(r.substr(1,1),16)/15;
+				this.g = parseInt(r.substr(2,1),16)/15;
+				this.b = parseInt(r.substr(3,1),16)/15;
+				}
+			}
+		else
+			{
+			var rgbPattern = /rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)/ ;
+			var c = r.match(rgbPattern);
+			if (c)
+				{
+				this.r = parseInt(c[1],10)/255;
+				this.g = parseInt(c[2],10)/255;
+				this.b = parseInt(c[3],10)/255;
+				}
+			}
+		}
+	else
+		{
+		this.r = r;
+		this.g = g;
+		this.b = b;
+		}
+	return this;
+}
+
+// Mixes this colour with another in a specified proportion
+// c = other colour to mix
+// f = 0..1 where 0 is this colour and 1 is the new colour
+// Returns an RGB object
+RGB.prototype.mix = function(c,f)
+{
+	return new RGB(this.r + (c.r-this.r) * f,this.g + (c.g-this.g) * f,this.b + (c.b-this.b) * f);
+}
+
+// Return an rgb colour as a #rrggbb format hex string
+RGB.prototype.toString = function()
+{
+	var r = this.r.clamp(0,1);
+	var g = this.g.clamp(0,1);
+	var b = this.b.clamp(0,1);
+	return("#" + ("0" + Math.floor(r * 255).toString(16)).right(2) +
+				 ("0" + Math.floor(g * 255).toString(16)).right(2) +
+				 ("0" + Math.floor(b * 255).toString(16)).right(2));
+}
+
+// ---------------------------------------------------------------------------------
+// DOM utilities - many derived from www.quirksmode.org
+// ---------------------------------------------------------------------------------
+
+function drawGradient(place,horiz,colours)
+{
+	for(var t=0; t<= 100; t+=2)
+		{
+		var bar = document.createElement("div");
+		place.appendChild(bar);
+		bar.style.position = "absolute";
+		bar.style.left = horiz ? t + "%" : 0;
+		bar.style.top = horiz ? 0 : t + "%";
+		bar.style.width = horiz ? (101-t) + "%" : "100%";
+		bar.style.height = horiz ? "100%" : (101-t) + "%";
+		bar.style.zIndex = -1;
+		var f = t/100;
+		var p = f*(colours.length-1);
+		bar.style.backgroundColor = colours[Math.floor(p)].mix(colours[Math.ceil(p)],p-Math.floor(p)).toString();
+		}
+}
+
+function createTiddlyText(theParent,theText)
+{
+	return theParent.appendChild(document.createTextNode(theText));
+}
+
+function createTiddlyCheckbox(theParent,caption,checked,onChange)
+{
+	var cb = document.createElement("input");
+	cb.setAttribute("type","checkbox");
+	cb.onclick = onChange;
+	theParent.appendChild(cb);
+	cb.checked = checked;
+	cb.className = "chkOptionInput";
+	if(caption)
+		wikify(caption,theParent);
+	return cb;
+}
+
+function createTiddlyElement(theParent,theElement,theID,theClass,theText)
+{
+	var e = document.createElement(theElement);
+	if(theClass != null)
+		e.className = theClass;
+	if(theID != null)
+		e.setAttribute("id",theID);
+	if(theText != null)
+		e.appendChild(document.createTextNode(theText));
+	if(theParent != null)
+		theParent.appendChild(e);
+	return(e);
+}
+
+// Add an event handler
+// Thanks to John Resig, via QuirksMode
+function addEvent(obj,type,fn)
+{
+	if(obj.attachEvent)
+		{
+		obj['e'+type+fn] = fn;
+		obj[type+fn] = function(){obj['e'+type+fn](window.event);}
+		obj.attachEvent('on'+type,obj[type+fn]);
+		}
+	else
+		obj.addEventListener(type,fn,false);
+}
+
+// Remove  an event handler
+// Thanks to John Resig, via QuirksMode
+function removeEvent(obj,type,fn)
+{
+	if(obj.detachEvent)
+		{
+		obj.detachEvent('on'+type,obj[type+fn]);
+		obj[type+fn] = null;
+		}
+	else
+		obj.removeEventListener(type,fn,false);
+}
+
+function addClass(e,theClass)
+{
+	var currClass = e.className.split(" ");
+	if(currClass.indexOf(theClass) == -1)
+		e.className += " " + theClass;
+}
+
+function removeClass(e,theClass)
+{
+	var currClass = e.className.split(" ");
+	var i = currClass.indexOf(theClass);
+	while(i != -1)
+		{
+		currClass.splice(i,1);
+		i = currClass.indexOf(theClass);
+		}
+	e.className = currClass.join(" ");
+}
+
+function hasClass(e,theClass)
+{
+	if(e.className)
+		{
+		if(e.className.split(" ").indexOf(theClass) != -1)
+			return true;
+		}
+	return false;
+}
+
+// Find the closest relative with a given property value (property defaults to tagName, relative defaults to parentNode)
+function findRelated(e,value,name,relative)
+{
+	name = name ? name : "tagName";
+	relative = relative ? relative : "parentNode";
+	if(name == "className")
+		{
+		while(e && !hasClass(e,value))
+			{
+			e = e[relative];
+			}
+		}
+	else
+		{
+		while(e && e[name] != value)
+			{
+			e = e[relative];
+			}
+		}
+	return e;
+}
+
+// Resolve the target object of an event
+function resolveTarget(e)
+{
+	var obj;
+	if (e.target)
+		obj = e.target;
+	else if (e.srcElement)
+		obj = e.srcElement;
+	if (obj.nodeType == 3) // defeat Safari bug
+		obj = obj.parentNode;
+	return(obj);
+}
+
+// Return the content of an element as plain text with no formatting
+function getPlainText(e)
+{
+	var text = "";
+	if(e.innerText)
+		text = e.innerText;
+	else if(e.textContent)
+		text = e.textContent;
+	return text;
+}
+
+// Get the scroll position for window.scrollTo necessary to scroll a given element into view
+function ensureVisible(e)
+{
+	var posTop = findPosY(e);
+	var posBot = posTop + e.offsetHeight;
+	var winTop = findScrollY();
+	var winHeight = findWindowHeight();
+	var winBot = winTop + winHeight;
+	if(posTop < winTop)
+		return(posTop);
+	else if(posBot > winBot)
+		{
+		if(e.offsetHeight < winHeight)
+			return(posTop - (winHeight - e.offsetHeight));
+		else
+			return(posTop);
+		}
+	else
+		return(winTop);
+}
+
+// Get the current width of the display window
+function findWindowWidth()
+{
+	return(window.innerWidth ? window.innerWidth : document.documentElement.clientWidth);
+}
+
+// Get the current height of the display window
+function findWindowHeight()
+{
+	return(window.innerHeight ? window.innerHeight : document.documentElement.clientHeight);
+}
+
+// Get the current horizontal page scroll position
+function findScrollX()
+{
+	return(window.scrollX ? window.scrollX : document.documentElement.scrollLeft);
+}
+
+// Get the current vertical page scroll position
+function findScrollY()
+{
+	return(window.scrollY ? window.scrollY : document.documentElement.scrollTop);
+}
+
+function findPosX(obj)
+{
+	var curleft = 0;
+	while (obj.offsetParent)
+		{
+		curleft += obj.offsetLeft;
+		obj = obj.offsetParent;
+		}
+	return curleft;
+}
+
+function findPosY(obj)
+{
+	var curtop = 0;
+	while (obj.offsetParent)
+		{
+		curtop += obj.offsetTop;
+		obj = obj.offsetParent;
+		}
+	return curtop;
+}
+
+// Blur a particular element
+function blurElement(e)
+{
+	if(e != null && e.focus && e.blur)
+		{
+		e.focus();
+		e.blur();
+		}
+}
+
+// Create a non-breaking space
+function insertSpacer(place)
+{
+	var e = document.createTextNode(String.fromCharCode(160));
+	if(place)
+		place.appendChild(e);
+	return e;
+}
+
+// Remove all children of a node
+function removeChildren(e)
+{
+	while(e.hasChildNodes())
+		e.removeChild(e.firstChild);
+}
+
+// Add a stylesheet, replacing any previous custom stylesheet
+function setStylesheet(s,id)
+{
+	if(!id)
+		id = "customStyleSheet";
+	var n = document.getElementById(id);
+	if(document.createStyleSheet) // Test for IE's non-standard createStyleSheet method
+		{
+		if(n)
+			n.parentNode.removeChild(n);
+		// This failed without the &nbsp;
+		document.getElementsByTagName("head")[0].insertAdjacentHTML("beforeEnd","&nbsp;<style id='" + id + "'>" + s + "</style>");
+		}
+	else
+		{
+		if(n)
+			n.replaceChild(document.createTextNode(s),n.firstChild);
+		else
+			{
+			var n = document.createElement("style");
+			n.type = "text/css";
+			n.id = id;
+			n.appendChild(document.createTextNode(s));
+			document.getElementsByTagName("head")[0].appendChild(n);
+			}
+		}
+}
+
+// Replace the current selection of a textarea or text input and scroll it into view
+
+function replaceSelection(e,text)
+{
+	if (e.setSelectionRange)
+		{
+		var oldpos = e.selectionStart + 1;
+		e.value = e.value.substr(0,e.selectionStart) + text + e.value.substr(e.selectionStart);
+		e.setSelectionRange( oldpos, oldpos);
+		var linecount = e.value.split('\n').length;
+		var thisline = e.value.substr(0,e.selectionStart).split('\n').length-1;
+		e.scrollTop = Math.floor((thisline-e.rows/2)*e.scrollHeight/linecount);
+		}
+	else if (document.selection)
+		{
+		var range = document.selection.createRange();
+		if (range.parentElement() == e)
+			{
+			var isCollapsed = range.text == "";
+			range.text = text;
+			 if (!isCollapsed)
+				{
+				range.moveStart('character', -text.length);
+				range.select();
+				}
+			}
+		}
+}
+
+// Returns the text of the given (text) node, possibly merging subsequent text nodes
+function getNodeText(e)
+{
+	var t = ""; 
+	while (e && e.nodeName == "#text")
+		{
+		t += e.nodeValue;
+		e = e.nextSibling;
+		}
+	return t;
+}
+//# -------------------------
+//# LoaderBase: A (abstract) storage loader that loads the tiddlers from a list of HTML elements.
+//# The format of the elements is defined by subclasses of this loader through the internalizeTiddler implementation.
+//# Subclasses must implement:
+//# 			function getTitle(store, e)
+//#
+//# store must implement:
+//# 			function createTiddler(title).
+//#
+
+function LoaderBase()
+{
+}
+
+LoaderBase.prototype.loadTiddler = function(store,e,tiddlers)
+{
+	var title = this.getTitle(store, e);
+	if (title)
+		{
+		var tiddler = store.createTiddler(title);
+		this.internalizeTiddler(store, tiddler, title, e);
+		tiddlers.push(tiddler);
+		}
+}
+
+LoaderBase.prototype.loadTiddlers = function(store,nodes)
+{
+	var tiddlers = [];
+	for (var t = 0; t < nodes.length; t++)
+		{
+		try
+			{
+			this.loadTiddler(store, nodes[t], tiddlers);
+			}
+		catch(e)
+			{
+			showException(e, config.messages.tiddlerLoadError.format([this.getTitle(store, nodes[t])]));
+			}
+		}
+	return tiddlers;
+}
+	
+//# -------------------------
+//# SaverBase: a (abstract) storage saver that externalizes all tiddlers into a string, 
+//# with every tiddler individually externalized (using this.externalizeTiddler) and joined with newlines 
+//# Subclasses must implement:
+//# 			function externalizeTiddler(store, tiddler)
+//#
+//# store must implement:
+//# 			function getTiddlers(sortByFieldName)
+//#
+
+function SaverBase()
+{
+}
+
+SaverBase.prototype.externalize = function(store) 
+{
+	var results = [];
+	var tiddlers = store.getTiddlers("title");
+	for (var t = 0; t < tiddlers.length; t++)
+		results.push(this.externalizeTiddler(store, tiddlers[t]));
+	return results.join("\n");
+}
+//--------------------------------
+// TW21Loader (inherits from LoaderBase)
+
+function TW21Loader() {};
+
+TW21Loader.prototype = new LoaderBase();
+
+TW21Loader.prototype.getTitle = function(store, e) {
+	var title = null;
+	if(e.getAttribute)
+		title = e.getAttribute("tiddler");
+	if(!title && e.id) {	
+		var lenPrefix = store.idPrefix.length;
+		if (e.id.substr(0,lenPrefix) == store.idPrefix)
+			title = e.id.substr(lenPrefix);
+	}
+	return title;
+}
+
+TW21Loader.prototype.internalizeTiddler = function(store, tiddler, title, data) {
+	var text = getNodeText(data.firstChild).unescapeLineBreaks();
+	var modifier = data.getAttribute("modifier");
+	var modified = Date.convertFromYYYYMMDDHHMM(data.getAttribute("modified"));
+	var c = data.getAttribute("created");
+	var created = c ? Date.convertFromYYYYMMDDHHMM(c) : modified;
+	var tags = data.getAttribute("tags");
+	var fields = {};
+	var attrs = data.attributes;
+	for(var i = attrs.length-1; i >= 0; i--) {
+		var name = attrs[i].name;
+		if (attrs[i].specified && !TiddlyWiki.isStandardField(name)) {
+			fields[name] = attrs[i].value.unescapeLineBreaks();
+		}
+	}
+	tiddler.assign(title,text,modifier,modified,tags,created, fields);
+	return tiddler;
+};
+
+//--------------------------------
+// TW21Saver (inherits from SaverBase)
+
+function TW21Saver() {};
+
+TW21Saver.prototype = new SaverBase();
+
+TW21Saver.prototype.externalizeTiddler = function(store, tiddler) 
+{
+	try {
+		var extendedFieldAttributes = "";
+		store.forEachField(tiddler, 
+			function(tiddler, fieldName, value) {
+				// don't store stuff from the temp namespace
+				if (!fieldName.match(/^temp\./))
+					extendedFieldAttributes += ' %0="%1"'.format([fieldName, value.escapeLineBreaks().htmlEncode()]);
+			}, true);
+		return '<div tiddler="%0" modifier="%1" modified="%2" created="%3" tags="%4"%6>%5</div>'.format([
+				tiddler.title.htmlEncode(),
+				tiddler.modifier.htmlEncode(),
+				tiddler.modified.convertToYYYYMMDDHHMM(),
+				tiddler.created.convertToYYYYMMDDHHMM(),
+				tiddler.getTags().htmlEncode(),
+				tiddler.escapeLineBreaks().htmlEncode(),
+				extendedFieldAttributes
+			]);
+	} catch (e) {
+		throw exceptionText(e, config.messages.tiddlerSaveError.format([tiddler.title]));
+	}
+}
+
+// ---------------------------------------------------------------------------------
+// Deprecated code
+// ---------------------------------------------------------------------------------
+
+// @Deprecated: Use createElementAndWikify and this.termRegExp instead
+config.formatterHelpers.charFormatHelper = function(w)
+{
+	w.subWikify(createTiddlyElement(w.output,this.element),this.terminator);
+}
+
+// @Deprecated: Use enclosedTextHelper and this.lookaheadRegExp instead
+config.formatterHelpers.monospacedByLineHelper = function(w)
+{
+	var lookaheadRegExp = new RegExp(this.lookahead,"mg");
+	lookaheadRegExp.lastIndex = w.matchStart;
+	var lookaheadMatch = lookaheadRegExp.exec(w.source);
+	if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+		{
+		var text = lookaheadMatch[1];
+		if(config.browser.isIE)
+			text = text.replace(/\n/g,"\r");
+		createTiddlyElement(w.output,"pre",null,null,text);
+		w.nextMatch = lookaheadRegExp.lastIndex;
+		}
+}
+
+// @Deprecated: Use <br> or <br /> instead of <<br>>
+config.macros.br.handler = function(place)
+{
+	createTiddlyElement(place,"br");
+}
+
+// Find an entry in an array. Returns the array index or null
+// @Deprecated: Use indexOf instead
+Array.prototype.find = function(item)
+{
+	var i = this.indexOf(item);
+	return i == -1 ? null : i;
+}
+
+// Load a tiddler from an HTML DIV. The caller should make sure to later call Tiddler.changed()
+// @Deprecated: Use store.getLoader().internalizeTiddler instead
+Tiddler.prototype.loadFromDiv = function(divRef,title)
+{
+	return store.getLoader().internalizeTiddler(store,this,title,divRef);
+}
+
+// Format the text for storage in an HTML DIV
+// @Deprecated Use store.getSaver().externalizeTiddler instead.
+Tiddler.prototype.saveToDiv = function()
+{
+	return store.getSaver().externalizeTiddler(store,this);
+}
+
+// @Deprecated: Use store.allTiddlersAsHtml() instead
+function allTiddlersAsHtml()
+{
+	return store.allTiddlersAsHtml();
+}
+
+// @Deprecated: Use refreshPageTemplate instead
+function applyPageTemplate(title)
+{
+	refreshPageTemplate(title);
+}
+
+// @Deprecated: Use story.displayTiddlers instead
+function displayTiddlers(srcElement,titles,template,unused1,unused2,animate,slowly)
+{
+	story.displayTiddlers(srcElement,titles,template,animate,slowly);
+}
+
+// @Deprecated: Use story.displayTiddler instead
+function displayTiddler(srcElement,title,template,unused1,unused2,animate,slowly)
+{
+	story.displayTiddler(srcElement,title,template,animate,slowly);
+}
+
+// @Deprecated: Use functions on right hand side directly instead
+var createTiddlerPopup = Popup.create;
+var scrollToTiddlerPopup = Popup.show;
+var hideTiddlerPopup = Popup.remove;
+
+// @Deprecated: Use right hand side directly instead
+var regexpBackSlashEn = new RegExp("\\\\n","mg");
+var regexpBackSlash = new RegExp("\\\\","mg");
+var regexpBackSlashEss = new RegExp("\\\\s","mg");
+var regexpNewLine = new RegExp("\n","mg");
+var regexpCarriageReturn = new RegExp("\r","mg");
+// ---------------------------------------------------------------------------------
+// End of scripts
+merge(config.shadowTiddlers,{SiteTitle:'DevFire'});
+merge(config.shadowTiddlers,{MainMenu:"PageTemplate\nStyleSheet\nMainMenu\nDefaultTiddlers"});
+merge(config.shadowTiddlers,{SiteSubtitle:"a theme for ~TiddlyWiki"});
+merge(config.shadowTiddlers,{DefaultTiddlers:"LorumIpsum"});
+merge(config.shadowTiddlers,{LorumIpsum:"Aenean eros arcu, condimentum nec, dapibus ut, tincidunt sit amet, urna. Quisque viverra, eros sed imperdiet iaculis, est risus facilisis quam, id malesuada arcu nulla luctus urna. Nullam et est. Vestibulum velit sem, faucibus cursus, dapibus vestibulum, pellentesque et, urna. Donec luctus. Donec lectus. Aliquam eget eros facilisis tortor feugiat sollicitudin. Integer lobortis vulputate sapien. Sed iaculis erat ac nunc. Etiam eu enim. Mauris ipsum urna, rhoncus at, bibendum sit amet, euismod eget, dolor. Mauris fermentum quam vitae ligula. Vestibulum in libero feugiat justo dictum consectetuer. Vestibulum euismod purus eget elit. Nunc sed massa porta elit bibendum posuere. Nunc pulvinar justo sit amet odio. In sed est. Phasellus ornare elementum nulla. Nulla ipsum neque, cursus a, viverra a, imperdiet at, enim. Quisque facilisis, diam sed accumsan suscipit, odio arcu hendrerit dolor, quis aliquet massa nulla nec sem.\n!heading 1\n!!heading 2\n!!!heading3\n----\n<<tag button>>\nThis is a link to a [[StyleSheet]] tiddler.\n\n> This is a blockquote\n> This is a blockquote\n> This is a blockquote\n|>|>| !This is a header |h\n|column1|column2|column3|\n|row2| row2 |row2|\n|column1|column2|column3|\n|row2| row2 |row2|\n|column1|column2|column3|\n|row2| row2 |row2|"});
+// ---------------------------------------------------------------------------------
+//]]>
+</script>
+<style type="text/css">
+
+#saveTest {
+	display: none;
+}
+
+.zoomer {
+	display: none;
+}
+
+#messageArea {
+	display: none;
+}
+
+#copyright {
+	display: none;
+}
+
+.popup {
+	position: absolute;
+}
+
+#storeArea {
+	display: none;
+	margin: 4em 10em 3em;
+}
+
+#storeArea div {
+ padding: 0.5em;
+ margin: 1em 0em 0em 0em;
+ border-color: #f0f0f0 #606060 #404040 #d0d0d0; 
+ border-style: solid; 
+ border-width: 2px;
+ overflow: auto;
+}
+
+#javascriptWarning {
+	width: 100%;
+	text-align: center;
+	font-weight: bold;
+	background-color: #dd1100;
+	color: #fff;
+	padding:1em 0em; 
+}
+
+</style>
+<!--POST-HEAD-START-->
+
+<!--POST-HEAD-END-->
+</head>
+<body onload="main();" onunload="if(window.checkUnsavedChanges) checkUnsavedChanges();">
+<!--PRE-BODY-START-->
+
+<!--PRE-BODY-END-->
+	<script type="text/javascript">
+//<![CDATA[
+if (useJavaSaver)
+	document.write("<applet style='position:absolute;left:-1px' name='TiddlySaver' code='TiddlySaver.class' archive='TiddlySaver.jar' width='1' height='1'></applet>");
+//]]>
+	</script>
+	<div id="copyright">
+	Welcome to TiddlyWiki by Jeremy Ruston, Copyright &copy; 2006 Osmosoft Limited
+	</div>
+	<noscript>
+		<div id="javascriptWarning">This page requires JavaScript to function properly</div>
+	</noscript>
+	<div id="saveTest"></div>
+	<div id="contentWrapper"></div>
+	<div id="contentStash"></div>
+	<div id="storeArea">
+<div tiddler="(built-in shadow tiddler)" modifier="CameronRich" modified="200702240024" created="200702240024" tags="">changes, notes and errata</div>
+<div tiddler="Cam" modifier="YourName" modified="200804011313" created="200804011313" tags="">Type the text for 'YourName'</div>
+<div tiddler="Changelog" modifier="YourName" modified="200901301233" created="200702240022" tags="">@@bgcolor(#ff0000):color(#ffffff):Changes for 1.2.1@@\n\n!!__SSL Library__\n* Certificate verification now works for Firefox.\n* Extended the openssl API.\n\n@@bgcolor(#ff0000):color(#ffffff):Changes for 1.2.0@@\n\n!!__SSL Library__\n* A self-signed certificate will be verified as ok provided that that it is on the certificate authority list.\n* Certificates are not verified when added as certificate authorities (since self-signed and expired certificates can be added to browsers etc)\n\n@@bgcolor(#ff0000):color(#ffffff):Changes for 1.1.9@@\n\n!!__SSL Library__\n* Now support MS IIS resource kit certificates (thanks to Carsten Sørensen).\n* Fixed a memory leak when freeing more than one CA certificate.\n* The bigint library had a problem with squaring which affected classical reduction (thanks to Manuel Klimek).\n\n!!__axhttpd__\n* Brought back setuid()/setgid() as an option.\n\n!@@bgcolor(#ff0000):color(#ffffff):Changes for 1.1.8@@\n\n!!__SSL Library__\n* Now using a BSD style license.\n* Self-signed certificates can now be automatically generated (the keys still need to be provided).\n* A new API call //ssl_x509_create()// can be used to programatically  create the certificate.\n* Certificate/keys can be loaded automatically given a file location.\n\n!@@bgcolor(#ff0000):color(#ffffff):Changes for 1.1.7@@\n\n!!__SSL Library__\n\n* Variable sized session id's is now better handled for session caching. It has meant a new API call //ssl_get_session_id_size()// and a change to //ssl_client_new()// to define the session id size.\n* Muliple records with a single header are now better supported (thanks to Hervé Sibert).\n* ~MD2 added for Verisign root cert verification (thanks to Byron Rakitzis).\n* The ~MD5/~SHA1 digests are calculated incrementally to reduce memory (thanks to Byron Rakitzis).\n* The bigint cache is now cleared regularly to reduce memory.\n\n!!__axhttpd__\n\n* Improved the POST handling (thanks to Christian Melki).\n* CSS files now work properly.\n* Lua's CGI launcher location is configurable.\n* //vfork()// is now used for CGI for performance reasons.\n\n!@@bgcolor(#ff0000):color(#ffffff):Changes for 1.1.6@@\n\n!!__SSL Library__\n\n* ~RC4 speed improvements\n* Lua samples/bindings now work properly\n\n!@@bgcolor(#ff0000):color(#ffffff):Changes for 1.1.5@@\n\n!!__SSL Library__\n\n* Session id's can now be variable lengths in server hello messages.\n* 0 length client certificates are now supported.\n* ssl_version() now returns just the version and not the date.\n* ssl_write() was not sending complete packets under load.\n\n!!__axhttpd__\n\n* Completely updated the CGI code.\n* Lua now integrated - Lua scripts and Lua Pages now run.\n\n!@@bgcolor(#ff0000):color(#ffffff):Changes for 1.1.4@@\n\n!!__SSL Library__\n\n* Fixed a Win32 crypto library issue with non-Administrator users\n* Removed compiler warnings that showed up in ~FC6.\n* GNU TLS certificates are now accepted.\n* Separated the send/receive headers for HMAC calculations.\n* Fixed a compilation problem with swig/perl/~FC6.\n* Fixed an issue with loading PEM CA certificates.\n\n!!__axhttpd__\n\n* Made //setuid()/setgid()// call an mconf option.\n* Made //chroot()// an mconf option. Default to //chdir()// instead.\n* Removed optional permissions checking.\n\n!@@bgcolor(#ff0000):color(#ffffff):Changes for 1.1.1@@\n\n!!__SSL Library__\n\n* AES should now work on 16bit processors (there was an alignment problem).\n* Various freed objects are cleared before freeing.\n* Header files now installed in ///usr/local/include/axTLS//.\n* -DCYGWIN replaced with -~DCONFIG_PLATFORM_CYGWIN (and the same for Solaris).\n* removed &quot;-noextern&quot; option in Swig. Fixed some other warnings in Win32.\n* SSLCTX changed to ~SSL_CTX (to be consistent with openssl). SSLCTX still exists for backwards compatibility.\n* malloc() and friends call abort() on failure.\n* Fixed a memory leak in directory listings.\n* Added openssl() compatibility functions.\n* Fixed Cygwin 'make install' issue.\n\n!!__axhttpd__\n\n* main.c now becomes axhttpd.c.\n* Header file issue fixed (in mime_types.c).\n* //chroot()// now used for better security.\n* Basic authentication implemented (via .htpasswd).\n* SSL access/denial protection implemented (via .htaccess).\n* Directory access protection implemented (via .htaccess).\n* Can now have more than one CGI file extension in mconf.\n* &quot;~If-Modified-Since&quot; request now handled properly.\n* Performance tweaks to remove //ssl_find()//.</div>
+<div tiddler="DefaultTiddlers" modifier="CameronRich" modified="200702240019" created="200702240019" tags="">[[Read Me]]</div>
+<div tiddler="License" modifier="YourName" modified="200804011309" created="200702240022" tags="">axTLS uses a BSD style license:\n\nCopyright (c) 2008, Cameron Rich All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this\nlist of conditions and the following disclaimer. Redistributions in binary\nform must reproduce the above copyright notice, this list of conditions and\nthe following disclaimer in the documentation and/or other materials\nprovided with the distribution. Neither the name of the axTLS Project nor\nthe names of its contributors may be used to endorse or promote products\nderived from this software without specific prior written permission. \n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot;\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE.</div>
+<div tiddler="MainMenu" modifier="CameronRich" modified="200702250353" created="200702240021" tags="">[[Read Me]] \n[[Changelog]]\n[[axhttpd]]\n[[License]]</div>
+<div tiddler="PageTemplate" modifier="YourName" modified="200701122313" created="200701122350" tags="DevFireTheme">&lt;div class='header' macro='gradient vert #390108 #900'&gt;\n&lt;div class='headerShadow'&gt;\n&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;\n&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;\n&lt;/div&gt;\n&lt;div class='headerForeground'&gt;\n&lt;span class='siteTitle' refresh='content' tiddler='SiteTitle'&gt;&lt;/span&gt;&amp;nbsp;\n&lt;span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'&gt;&lt;/span&gt;\n&lt;/div&gt;\n&lt;/div&gt;\n&lt;div id='mainMenu'&gt;\n&lt;div refresh='content' tiddler='MainMenu'&gt;&lt;/div&gt;\n&lt;/div&gt;\n&lt;div id='sidebar'&gt;\n&lt;div id='sidebarOptions' refresh='content' tiddler='SideBarOptions'&gt;&lt;/div&gt;\n&lt;div id='sidebarTabs' refresh='content' force='true' tiddler='SideBarTabs'&gt;&lt;/div&gt;\n&lt;/div&gt;\n&lt;div id='displayArea'&gt;\n&lt;div id='messageArea'&gt;&lt;/div&gt;\n&lt;div id='tiddlerDisplay'&gt;&lt;/div&gt;\n&lt;/div&gt;</div>
+<div tiddler="Read Me" modifier="YourName" modified="200804011313" created="200702240020" tags="">!@@bgcolor(#ff0000):color(#ffffff):axTLS Quick Start Guide@@\n\nThis is a guide to get a small SSL web-server up and running quickly.\n\n!!__Introduction__\n\nThe axTLS project is an SSL client/server library using the ~TLSv1 protocol. It is designed to be small and fast, and is suited to embedded projects. A web server is included.\n\nThe basic web server + SSL library is around 60-70kB and is configurable for features or size.\n\n!!__Compilation__\n\nAll platforms require GNU make. This means on Win32 that Cygwin needs to be installed with &quot;make&quot; and various developer options selected.\n\nConfiguration now uses a tool called &quot;mconf&quot; which gives a nice way to configure options (similar to what is used in ~BusyBox and the Linux kernel).\n\nYou should be able to compile axTLS simply by extracting it, change into the extracted directory and typing:\n\n{{indent{{{{&gt;  make}}}\n\nSelect your platform type, save the configuration, exit, and then type &quot;make&quot; again.\n\nIf all goes well, you should end up with an executable called &quot;axhttpd&quot; (or axhttpd.exe) in the //_stage// directory.\n\nTo play with all the various axTLS options, type:\n\n{{indent{{{{&gt;  make menuconfig}}}\n\nSave the new configuration and rebuild.\n\n!!__Running it__\n\nTo run it, go to the //_stage// directory, and type (as superuser):\n\n{{indent{{{{&gt; axhttpd}}}\n\nNote: you may have to set your ~LD_LIBRARY_PATH - e.g. go to //_stage// and type //export ~LD_LIBRARY_PATH=`pwd`//\n\nAnd then point your browser at https://127.0.0.1 And you should see a this html page with a padlock appearing on your browser. or type http://127.0.0.1 to see the same page unencrypted.\n\n!!__The axssl utilities__\n\nThe axssl suite of tools are the SSL test tools in the various language bindings. They are:\n\n* axssl              - C sample\n* axssl.csharp    - C# sample\n* axssl.vbnet      - VB.NET sample\n* axtls.jar           - Java sample\n* axssl.pl           - Perl sample\n* axssl.lua         - Lua sample\n\nAll the tools have identical command-line parameters. e.g. to run something interesting:\n\n{{indent{{{{&gt; axssl s_server -verify -CAfile ../ssl/test/axTLS.ca_x509}}}\n\nand\n\n{{indent{{{{&gt; axssl s_client -cert ../ssl/test/axTLS.x509_1024 -key ../ssl/test/axTLS.key_1024 -reconnect}}}\n\n!!!!C#\n\nIf building under Linux or other non-Win32 platforms, Mono must be installed and the executable is run as:\n\n{{indent{{{{&gt; mono axssl.csharp.exe ...}}}\n\n!!!!Java\n\nThe java version is run as:\n\n{{indent{{{{&gt; java -jar axtls.jar &lt;options&gt;}}}\n\n!!!!Perl\n\n{{indent{{{{&gt; [perl] ./axssl.pl &lt;options&gt;}}}\n\nIf running under Win32, be sure to use the correct version of Perl (i.e. ~ActiveState's version works ok).\n\n!!!!Lua\n\n{{indent{{{{&gt; [lua] ./axssl.lua &lt;options&gt;}}}\n\n!__Known Issues__\n\n* Firefox doesn't handle legacy ~SSLv2 at all well. Disabling ~SSLv2 still initiates a ~SSLv23 handshake (v1.5). And continuous pressing of the &quot;Reload&quot; page instigates a change to ~SSLv3 for some reason (even though the TLS 1.0 option is selected). This will cause a &quot;Firefox and &lt;server&gt; cannot communicate securely because they have no common encryption algorithms&quot; (v1.5), or &quot;Firefox can't connect to &lt;server&gt; because the site uses a security protocol which isn't enabled&quot; (v2.0). See bugzilla issues 343543 and 359484 (Comment #7). It's all broken (hopefully fixed soon).\n* Perl/Java bindings don't work on 64 bit Linux machines. I can't even compile the latest version of Perl on an ~AMD64 box (using ~FC3).\n* Java 1.4 or better is required for the Java interfaces.\n* Processes that fork can't use session resumption unless some form of IPC is used.\n* Ensure libperl.so and libaxtls.so are in the shared library path when running with the perl bindings. A way to do this is with:\n\n{{indent{{{{&gt; export LD_LIBRARY_PATH=`perl -e 'use Config; print $Config{archlib};'`/CORE:.}}}\n* The lua sample requires the luabit library from http://luaforge.net/projects/bit.\n\n!!!!Win32 issues\n\n* Be careful about doing .NET executions on network drives - .NET complains with security exceptions on the binary. //TODO: Add a manifest file to prevent this.//\n* CGI has been removed from Win32 - it needs a lot more work to get it right.\n* The default Microsoft .NET SDK is v2.0.50727. Download from: http://msdn.microsoft.com/netframework/downloads/updates/default.aspx.\n\n!!!!Solaris issues\n\n* mconf doesn't work well - some manual tweaking is required for string values.\n* GNU make is required and needs to be in $PATH.\n* To get swig's library dependencies to work (and for the C library to be found), I needed to type:\n\n{{indent{{{{&gt; export LD_LIBRARY_PATH=/usr/local/gcc-3.3.1/lib:.}}}\n\n!!!!Cygwin issues\n\n* The bindings all compile but don't run under Cygwin with the exception of Perl. This is due to win32 executables being incompatible with Cygwin libraries.\n\n</div>
+<div tiddler="SiteSubtitle" modifier="CameronRich" modified="200702240025" created="200702240025" tags="">changes, notes and errata</div>
+<div tiddler="SiteTitle" modifier="CameronRich" modified="200702240023" created="200702240023" tags="">axTLS Embedded SSL</div>
+<div tiddler="SiteUrl" modifier="CameronRich" modified="200702240025" created="200702240025" tags="">http://axtls.cerocclub.com.au</div>
+<div tiddler="StyleSheet" modifier="CameronRich" modified="200702250600" created="200701122350" tags="DevFireTheme">/***\nhttp://tiddlystyles.com/#theme:DevFire\nAuthor: Clint Checketts\n***/\n\n/*{{{*/\nbody {\nbackground: #000;\n}\n/*}}}*/\n/***\n!Link styles /% ============================================================= %/\n***/\n/*{{{*/\na,\na.button,\n#mainMenu a.button,\n#sidebarOptions .sliderPanel a{\n color: #ffbf00;\n border: 0;\n background: transparent;\n}\n\na:hover,\na.button:hover,\n#mainMenu a.button:hover,\n#sidebarOptions .sliderPanel a:hover\n#sidebarOptions .sliderPanel a:active{\n color: #ff7f00;\n border: 0;\n border-bottom: #ff7f00 1px dashed;\n background: transparent;\n text-decoration: none;\n}\n\n#displayArea .button.highlight{\n color: #ffbf00;\n background: #4c4c4c;\n}\n/*}}}*/\n/***\n!Header styles /% ============================================================= %/\n***/\n/*{{{*/\n.header{\n border-bottom: 2px solid #ffbf00;\n color: #fff;\n}\n\n.headerForeground a {\n color: #fff;\n}\n\n.header a:hover {\n border-bottom: 1px dashed #fff;\n}\n/*}}}*/\n/***\n!Main menu styles /% ============================================================= %/\n***/\n/*{{{*/\n#mainMenu {color: #fff;}\n#mainMenu h1{\n font-size: 1.1em;\n}\n#mainMenu li,#mainMenu ul{\n list-style: none;\n margin: 0;\n padding: 0;\n}\n/*}}}*/\n/***\n!Sidebar styles /% ============================================================= %/\n***/\n/*{{{*/\n#sidebar {\n right: 0;\n color: #fff;\n border: 2px solid #ffbf00;\n border-width: 0 0 2px 2px;\n}\n#sidebarOptions {\n background-color: #4c4c4c;\n padding: 0;\n}\n\n#sidebarOptions a{\n margin: 0;\n color: #ffbf00;\n border: 0;\n}\n#sidebarOptions a:hover {\n color: #4c4c4c;\n background-color: #ffbf00;\n\n}\n\n#sidebarOptions a:active {\n color: #ffbf00;\n background-color: transparent;\n}\n\n#sidebarOptions .sliderPanel {\n background-color: #333;\n margin: 0;\n}\n\n#sidebarTabs {background-color: #4c4c4c;}\n#sidebarTabs .tabSelected {\n padding: 3px 3px;\n cursor: default;\n color: #ffbf00;\n background-color: #666;\n}\n#sidebarTabs .tabUnselected {\n color: #ffbf00;\n background-color: #5f5f5f;\n padding: 0 4px;\n}\n\n#sidebarTabs .tabUnselected:hover,\n#sidebarTabs .tabContents {\n background-color: #666;\n}\n\n.listTitle{color: #FFF;}\n#sidebarTabs .tabContents a{\n color: #ffbf00;\n}\n\n#sidebarTabs .tabContents a:hover{\n color: #ff7f00;\n background: transparent;\n}\n\n#sidebarTabs .txtMoreTab .tabSelected,\n#sidebarTabs .txtMoreTab .tab:hover,\n#sidebarTabs .txtMoreTab .tabContents{\n color: #ffbf00;\n background: #4c4c4c;\n}\n\n#sidebarTabs .txtMoreTab .tabUnselected {\n color: #ffbf00;\n background: #5f5f5f;\n}\n\n.tab.tabSelected, .tab.tabSelected:hover{color: #ffbf00; border: 0; background-color: #4c4c4c;cursor:default;}\n.tab.tabUnselected {background-color: #666;}\n.tab.tabUnselected:hover{color:#ffbf00; border: 0;background-color: #4c4c4c;}\n.tabContents {\n background-color: #4c4c4c;\n border: 0;\n}\n.tabContents .tabContents{background: #666;}\n.tabContents .tabSelected{background: #666;}\n.tabContents .tabUnselected{background: #5f5f5f;}\n.tabContents .tab:hover{background: #666;}\n/*}}}*/\n/***\n!Message area styles /% ============================================================= %/\n***/\n/*{{{*/\n#messageArea {background-color: #666; color: #fff; border: 2px solid #ffbf00;}\n#messageArea a:link, #messageArea a:visited {color: #ffbf00; text-decoration:none;}\n#messageArea a:hover {color: #ff7f00;}\n#messageArea a:active {color: #ff7f00;}\n#messageArea .messageToolbar a{\n border: 1px solid #ffbf00;\n background: #4c4c4c;\n}\n/*}}}*/\n/***\n!Popup styles /% ============================================================= %/\n***/\n/*{{{*/\n.popup {color: #fff; background-color: #4c4c4c; border: 1px solid #ffbf00;}\n.popup li.disabled{color: #fff;}\n.popup a {color: #ffbf00; }\n.popup a:hover { background: transparent; color: #ff7f00; border: 0;}\n.popup hr {color: #ffbf00; background: #ffbf00;}\n/*}}}*/\n/***\n!Tiddler Display styles /% ============================================================= %/\n***/\n/*{{{*/\n.title{color: #fff;}\nh1, h2, h3, h4, h5 {\n color: #fff;\n background-color: transparent;\n border-bottom: 1px solid #333;\n}\n\n.subtitle{\n color: #666;\n}\n\n.viewer {color: #fff; }\n\n.viewer table{background: #666; color: #fff;}\n\n.viewer th {background-color: #996; color: #fff;}\n\n.viewer pre, .viewer code {color: #ddd; background-color: #4c4c4c; border: 1px solid #ffbf00;}\n\n.viewer hr {color: #666;}\n\n.tiddler .button {color: #4c4c4c;}\n.tiddler .button:hover { color: #ffbf00; background-color: #4c4c4c;}\n.tiddler .button:active {color: #ffbf00; background-color: #4c4c4c;}\n\n.toolbar {\n color: #4c4c4c;\n}\n\n.toolbar a.button,\n.toolbar a.button:hover,\n.toolbar a.button:active,\n.editorFooter a{\n border: 0;\n}\n\n.footer {\n color: #ddd;\n}\n\n.selected .footer {\n color: #888;\n}\n\n.highlight, .marked {\n color: #000;\n background-color: #ffe72f;\n}\n.editorFooter {\n color: #aaa;\n}\n\n.tab{\n-moz-border-radius-topleft: 3px;\n-moz-border-radius-topright: 3px;\n}\n\n.tagging,\n.tagged{\n background: #4c4c4c;\n border: 1px solid #4c4c4c; \n}\n\n.selected .tagging,\n.selected .tagged{\n background-color: #333;\n border: 1px solid #ffbf00;\n}\n\n.tagging .listTitle,\n.tagged .listTitle{\n color: #fff;\n}\n\n.tagging .button,\n.tagged .button{\n color: #ffbf00;\n border: 0;\n padding: 0;\n}\n\n.tagging .button:hover,\n.tagged .button:hover{\nbackground: transparent;\n}\n\n.selected .isTag .tagging.simple,\n.selected .tagged.simple,\n.isTag .tagging.simple,\n.tagged.simple {\n float: none;\n display: inline;\n border: 0;\n background: transparent;\n color: #fff;\n margin: 0;\n}\n\n.cascade {\n background: #4c4c4c;\n color: #ddd;\n border: 1px solid #ffbf00;\n}\n/*}}}*/</div>
+<div tiddler="axhttpd" modifier="YourName" modified="200804011308" created="200702242231" tags="">axhttpd is a small embedded web server using the axTLS library. It is based originally on the web server written by Doug Currie which is at http://www.hcsw.org/awhttpd.\n\n!@@bgcolor(#ff0000):color(#ffffff):axhttpd Features@@ \n\n!!__Basic Authentication__\n\nBasic Authentication uses a password file called  &quot;.htpasswd&quot;, in the directory to be  protected. This file is formatted as the familiar colon-separated username/encrypted-password pair, records delimited by newlines. The protection does not carry over to subdirectories. The utility program htpasswd is included to help manually edit .htpasswd files.\n\nThe encryption of this password uses a proprietary algorithm due to the dependency of many crypt libraries on DES. An example is in [[/test_dir/no_http|https://127.0.0.1/test_dir/no_http]]  (username 'abcd', password is '1234').\n\n//Note: This is an mconf enabled configuration option.//\n\n!!__SSL Protection__\n\nDirectories/files can be accessed using the 'http' or 'https' uri prefix. If normal http access for a directory needs to be disabled, then put &quot;~SSLRequireSSL&quot; into a '.htaccess' file in the directory to be protected. \n\nConversely, use &quot;~SSLDenySSL&quot; to deny access to directories via SSL.\n\nAn example is in [[/test_dir/no_http|http://127.0.0.1/test_dir/no_http]] and [[/test_dir/no_ssl|https://127.0.0.1/test_dir/no_ssl]].\n\nEntire directories can be denied access with a &quot;Deny all&quot; directive (regardless of SSL or authentication). An example is in [[/test_dir/bin|http://127.0.0.1/test_dir/bin]]\n\n!!__CGI__\n\nMost of the CGI 1.1 variables are now placed into the script environment and should work as normal.\n\n!!__Lua and Lua Pages__\n\nThis is a small scripting language gaining popularity in embedded applications due to its small footprint and fast speed.\n\nLua has been incorporated into the build, so simply select it and it will automatically install. Try pointing your browser at [[test_main.html]|http://127.0.0.1/lua/test_main.html]] to see an example of Lua Pages.\n\n//Note: This is an mconf enabled configuration option.//\n\n!!__Directory Listing__\n\nAn mconf option. Allow the files in directories to be displayed. An example is in [[/test_dir|http://127.0.0.1/test_dir]]\n\n!!__Other Features__\n\n* Timeout - HTTP 1.1 allows for persistent connections. This is the time allowed for this connection in seconds.\n* Daemon - Puts the process in daemon mode. \n* SSL  session cache size - The size of the session cache (a heavily loaded server should maintain many sessions). A session will save on expensive SSL handshaking.\n\n</div>
+</div>
+<!--POST-BODY-START-->
+
+<!--POST-BODY-END-->
+	</body>
+</html>
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/download.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/download.lua
new file mode 100644
index 00000000..2ee1a71e
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/download.lua
@@ -0,0 +1,75 @@
+#!/usr/local/bin/lua
+
+require"luasocket"
+
+function receive (connection)
+	connection:settimeout(0)
+	local s, status = connection:receive (2^10)
+	if status == "timeout" then
+		coroutine.yield (connection)
+	end
+	return s, status
+end
+
+function download (host, file, outfile)
+	--local f = assert (io.open (outfile, "w"))
+	local c = assert (socket.connect (host, 80))
+	c:send ("GET "..file.." HTTP/1.0\r\n\r\n")
+	while true do
+		local s, status = receive (c)
+		--f:write (s)
+		if status == "closed" then
+			break
+		end
+	end
+	c:close()
+	--f:close()
+end
+
+local threads = {}
+function get (host, file, outfile)
+	print (string.format ("Downloading %s from %s to %s", file, host, outfile))
+	local co = coroutine.create (function ()
+		return download (host, file, outfile)
+	end)
+	table.insert (threads, co)
+end
+
+function dispatcher ()
+	while true do
+		local n = table.getn (threads)
+		if n == 0 then
+			break
+		end
+		local connections = {}
+		for i = 1, n do
+			local status, res = coroutine.resume (threads[i])
+			if not res then
+				table.remove (threads, i)
+				break
+			else
+				table.insert (connections, res)
+			end
+		end
+		if table.getn (connections) == n then
+			socket.select (connections)
+		end
+	end
+end
+
+local url = arg[1]
+if not url then
+	print (string.format ("usage: %s url [times]", arg[0]))
+	os.exit()
+end
+local times = arg[2] or 5
+
+url = string.gsub (url, "^http.?://", "")
+local _, _, host, file = string.find (url, "^([^/]+)(/.*)")
+local _, _, fn = string.find (file, "([^/]+)$")
+
+for i = 1, times do
+	get (host, file, fn..i)
+end
+
+dispatcher ()
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/env.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/env.lua
new file mode 100644
index 00000000..c4298477
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/env.lua
@@ -0,0 +1,26 @@
+-- This file should be executed before any script in this directory
+-- according to the configuration (cgilua/conf.lua).
+
+pcall (cgilua.enablesession)
+
+local put, mkurlpath = cgilua.put, cgilua.mkurlpath
+
+cgilua.addclosefunction (function ()
+	put [[
+<p>
+<small>
+<a href="test_main.html">Main</a>]]
+	for _, test in {
+			{ "Get", "test_main.lua", {ab = "cd", ef = "gh"} },
+			{ "Cookies", "test_cookies.lua", },
+			{ "FileSystem", "test_fs.lua", },
+			{ "Libraries", "test_lib.lua", },
+			{ "Session", "test_session.lua", },
+			{ "Variables", "test_variables.lp", },
+		} do
+		put (string.format (' &middot; <a href="%s">%s</a>',
+			mkurlpath (test[2], test[3]), test[1]))
+	end
+	put [[
+</small>]]
+end)
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/overview.lp b/trunk/package/luci/libs/nixio/axTLS/www/lua/overview.lp
new file mode 100644
index 00000000..4d17002a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/overview.lp
@@ -0,0 +1,64 @@
+<?lua
+-- Tries to load known libraries
+for _, t in ipairs { "lxp", "luasql.postgres", "luasql.mysql", "luasql.oci8", "luasql.sqlite", "luasql.odbc", "socket", "xmlrpc", "soap", "lualdap", "logging", "md5", "zip", "stable", "copas", } do
+	pcall (require, t)
+end
+
+libraries = { "lxp", "luasql", "socket", "xmlrpc", "soap", "lualdap", "logging", "md5", "zip", "stable", "copas", }
+
+local colors = { "#999999", "#CCCCCC", "#FFFFFF", }
+local i = 0
+function color () i = math.mod (i + 1, 3) return colors[i + 1] end
+
+function pack_name (p) return string.gsub (p, "^([^.]+).-", "%1") end
+
+function idx (t, f) return _G[t][f] or _G[t]["_"..f] or "" end
+?>
+<html>
+<head><title>CGILua installation overview</title></head>
+
+<body bgcolor="#FFFFFF">
+<h1>CGILua installation overview</h1>
+
+<table>
+  <tr>
+    <th bgcolor="#999999">Version
+    <th bgcolor="#999999">Copyright
+    <th bgcolor="#999999">Description
+  </tr>
+<?lua
+local support = {
+	{ "Lua", "_VERSION" },
+	{ "compat-5.1", "_COMPAT51" },
+}
+for _, l in ipairs (support) do bg = color()
+?>
+  <tr>
+    <td bgcolor = "<%= bg %>"><%= tostring(_G[l[2]]) %>
+    <td bgcolor = "<%= bg %>">
+    <td bgcolor = "<%= bg %>">
+  </tr>
+<? end ?>
+  <tr><td colspan="4"></tr>
+<?lua
+local pack = {}
+for i, p in ipairs (libraries) do
+	local s = _G[p]
+	local n = pack_name(p)
+	if type(_G[n]) == "table" and _G[n]._VERSION then
+		pack[n] = true
+		table.insert (pack, n)
+	end
+end
+table.sort (pack)
+for _, p in ipairs (pack) do bg = color() ?>
+  <tr>
+    <td bgcolor = "<%= bg %>"><%= idx(p,"VERSION") %>
+    <td bgcolor = "<%= bg %>"><small><%= idx(p,"COPYRIGHT") %></small>
+    <td bgcolor = "<%= bg %>"><small><%= idx(p,"DESCRIPTION") %></small>
+  </tr>
+<?lua end ?>
+</table>
+
+</body>
+</html>
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/prepara_sql2.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/prepara_sql2.lua
new file mode 100644
index 00000000..6a37c2fe
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/prepara_sql2.lua
@@ -0,0 +1,31 @@
+#!/usr/local/bin/lua
+
+MAX_ROWS = arg[1] or 10
+
+require"postgres"
+
+local env = assert (luasql.postgres ())
+local conn = assert (env:connect ("luasql-test", "tomas"))
+
+-- Apaga restos de outros testes.
+conn:execute "drop table t2"
+conn:execute "drop table t1"
+
+-- Criando as tabelas.
+assert (conn:execute [[create table t1 (
+	a int,
+	b int
+)]])
+assert (conn:execute [[create table t2 (
+	c int,
+	d int
+)]])
+
+-- Preenchedo as tabelas.
+for i = 1, MAX_ROWS do
+	local ii = 2*i
+	assert (conn:execute (string.format ([[
+insert into t1 values (%d, %d);
+insert into t2 values (%d, %d);]],
+		ii, i, ii, i)))
+end
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_conc.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_conc.lua
new file mode 100644
index 00000000..bbb9be78
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_conc.lua
@@ -0,0 +1,38 @@
+cgilua.htmlheader()
+if ap then
+	local pid, ppid = ap.pid ()
+	if not ppid then
+		ppid = "no parent pid"
+	end
+	cgilua.put ("pid = "..pid.." ("..ppid..")".."\n")
+end
+
+assert(type(stable.get) == "function")
+assert(type(stable.set) == "function")
+
+cgilua.put"stable.pairs = {<br>\n"
+for i, v in stable.pairs () do
+	cgilua.put (i.." = "..tostring(v).."<br>\n")
+end
+cgilua.put"}<br>\n"
+
+local counter = stable.get"counter" or 0
+stable.set ("counter", counter + 1)
+
+local f = stable.get"f"
+if not f then
+	local d = os.date()
+	stable.set ("f", function () return d end)
+else
+	cgilua.put ("f() = "..tostring (f ()))
+end
+
+cgilua.put"<br>\n"
+for i = 1,800 do
+	cgilua.put (i)
+	for ii = 1,1000 do
+		cgilua.put ("<!>")
+	end
+	cgilua.put ("\n")
+end
+cgilua.put ("End")
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lp b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lp
new file mode 100644
index 00000000..932b9c5e
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lp
@@ -0,0 +1,13 @@
+<?lua
+local cookies = require"cgilua.cookies"
+CL_COOKIE = "cgilua_cookie"
+
+local test = cookies.get (CL_COOKIE)
+cookies.sethtml (CL_COOKIE, os.date())
+?>
+
+<h1>Testing Cookies library</h1>
+
+<%= CL_COOKIE%> = <%= tostring(test)%><br>
+Assigning current date to cookie!<br>
+Reload this script to check cookie's value!
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lua
new file mode 100644
index 00000000..6af935e8
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_cookies.lua
@@ -0,0 +1,14 @@
+local cookies = require"cgilua.cookies"
+CL_COOKIE = "cgilua_cookie"
+
+local test = cookies.get (CL_COOKIE)
+cookies.set (CL_COOKIE, os.date())
+
+cgilua.htmlheader ()
+cgilua.put ([[
+<h1>Testing Cookies library</h1>
+
+]]..CL_COOKIE..'  = '..tostring(test)..[[<br>
+Assigning current date to cookie!<br>
+Reload this script to check cookie's value!
+]])
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_err.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_err.lua
new file mode 100644
index 00000000..4d6ffc97
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_err.lua
@@ -0,0 +1,4 @@
+cgilua.htmlheader()
+cgilua.put"Oi!"
+--io.write"something\n"
+cgilua.errorlog ("eca", "emerg")
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_fs.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_fs.lua
new file mode 100644
index 00000000..566ed8b2
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_fs.lua
@@ -0,0 +1,23 @@
+function link_dir (dir, base)
+	local path = base.."/"..dir
+	local mode = lfs.attributes (path).mode
+	if mode == "directory" then
+		return string.format ('<a href="%s">%s</a>',
+			cgilua.mkurlpath ("test_fs.lua", { dir = path }),
+			dir)
+	else
+		return dir
+	end
+end
+
+cgilua.htmlheader ()
+cgilua.put ("<h1>Testing Filesystem library</h1>\n")
+cgilua.put ("<table>\n")
+cgilua.put ("<tr><td colspan=2>Testing <b>dir</b></td></tr>\n")
+local i = 0
+local dir = cgi.dir or "."
+for file in lfs.dir (dir) do
+	i = i+1
+	cgilua.put ("<tr><td>"..i.."</td><td>"..link_dir(file, dir).."</td></tr>\n")
+end
+cgilua.put ("</table>\n")
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_htk.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_htk.lua
new file mode 100644
index 00000000..ac1de6c3
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_htk.lua
@@ -0,0 +1,22 @@
+require"htk"
+
+local a_table = {}
+for i = 1, 20 do
+	local l = {}
+	for j = 1, 20 do
+		table.insert (l, HTK.TD { "cell "..i..","..j })
+	end
+	table.insert (a_table, HTK.TR (l))
+end
+
+cgilua.htmlheader()
+cgilua.put (HTK.HTML {
+	HTK.HEAD { HTK.TITLE { "Titulo da Pagina" } },
+	HTK.BODY {
+		bgcolor = "#FFFFFF",
+		HTK.H1 { "Titulo da Pagina" },
+		HTK.P {},
+		"Uma página qualquer",
+		HTK.TABLE (a_table),
+	}
+})
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_lib.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_lib.lua
new file mode 100644
index 00000000..50412537
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_lib.lua
@@ -0,0 +1,31 @@
+local function getfield (t, f)
+  for w in string.gfind(f, "[%w_]+") do
+    if not t then return nil end
+    t = t[w]
+  end
+  return t
+end
+
+function test_lib (libname)
+	local ok, err = pcall (require, libname)
+	if not ok then
+		cgilua.put ("Library <tt><b>"..libname.."</b></tt> not found<br>\n"..
+			err)
+	else
+		cgilua.put ("Library <tt><b>"..libname.."</b></tt><br>\n")
+		local t = getfield (_G, libname)
+		if type(t) ~= "table" then
+			cgilua.put (tostring(t))
+		else
+			for i, v in pairs (t) do
+				cgilua.put ("&nbsp;&nbsp;"..tostring(i).." = "..tostring(v).."<br>\n")
+			end
+		end
+	end
+	cgilua.put ("\n<p>\n")
+end
+
+cgilua.htmlheader ()
+for _, lib in ipairs { "lfs", "socket", "luasql.postgres", "luasql", "lxp", "lxp.lom", "lualdap", "htk", "xmlrpc", "xmlrpc.http" } do
+	test_lib (lib)
+end
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.html b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.html
new file mode 100644
index 00000000..a50dd639
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.html
@@ -0,0 +1,127 @@
+<html>
+<head><title>Test Page</title></head>
+
+<table border>
+  <tr>
+    <th colspan="4"> GET: </td>
+  </tr>
+  <tr>
+    <td>Lua script</td>
+    <td><a href="test_main.lua?field1=ab&field2=cd&field1=ef">module</a></td>
+  </tr>
+  <tr>
+    <td>HTML template</td>
+    <td><a href="test_main.lp?field1=ab&field2=cd&field1=ef">module</a></td>
+  </tr>
+
+  <tr>
+    <th colspan="4"> POST: </td>
+  </tr>
+  <tr>
+    <td colspan="4">
+      <form method="POST" action="">
+        <table>
+          <tr>
+            <td colspan="4">
+              field 1: <input type="text" name="field1"><br>
+              field 2: <input type="text" name="field2"><br>
+              field 3:
+                <input type="checkbox" name="field3" value="op 1">op 1
+                <input type="checkbox" name="field3" value="op 2">op 2
+                <input type="checkbox" name="field3" value="op 3">op 3
+            </td>
+          </tr>
+          <tr>
+            <td>Lua script</td>
+            <td>
+              <a href="javascript:document.forms[0].action='test_main.lua';document.forms[0].submit()">module</a>
+            </td>
+          </tr>
+          <tr>
+            <td>HTML template</td>
+            <td>
+              <a href="javascript:document.forms[0].action='test_main.lp';document.forms[0].submit()">module</a>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan="4"> POST (with upload): </td>
+  </tr>
+  <tr>
+    <td colspan="4">
+      <form method="POST" enctype="multipart/form-data" action="">
+        <table>
+          <tr>
+            <td colspan="4">
+              field 1: <input type="text" name="field1"><br>
+              file (binary!): <input type="file" name="file"><br>
+            </td>
+          </tr>
+          <tr>
+            <td>Lua script</td>
+            <td>
+              <a href="javascript:document.forms[1].action='test_main.lua';document.forms[1].submit()">module</a>
+            </td>
+          </tr>
+          <tr>
+            <td>HTML template</td>
+            <td>
+              <a href="javascript:document.forms[1].action='test_main.lp';document.forms[1].submit()">module</a>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </td>
+  </tr>
+  <tr>
+    <th colspan="4"> Cookies: </td>
+  </tr>
+  <tr>
+    <td>Lua script</td>
+    <td><a href="test_cookies.lua">module</a></td>
+  </tr>
+  <tr>
+    <td>HTML template</td>
+    <td><a href="test_cookies.lp">module</a></td>
+  </tr>
+  <tr>
+    <th colspan="4"> Filesystem: </td>
+  </tr>
+  <tr>
+    <td>Lua script</td>
+    <td><a href="test_fs.lua">module</a></td>
+  </tr>
+  <tr>
+    <th colspan="4"> Session: </td>
+  </tr>
+  <tr>
+    <td>Lua script</td>
+    <td><a href="test_session.lua">module</a></td>
+  </tr>
+  <tr>
+    <th colspan="4"> CGI Variables: </td>
+  </tr>
+  <tr>
+    <td>HTML template</td>
+    <td><a href="test_variables.lp">module</a></td>
+  </tr>
+  <tr>
+    <th colspan="4"> Library Overview: </td>
+  </tr>
+  <tr>
+    <td>HTML template</td>
+    <td><a href="overview.lp">module</a></td>
+  </tr>
+  <tr>
+    <th colspan="4"> Concurrency </td>
+  </tr>
+  <tr>
+    <td>Lua script</td>
+    <td><a href="test_conc.lua">module</a></td>
+  </tr>
+</table>
+</html>
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lp b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lp
new file mode 100644
index 00000000..917ee1e5
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lp
@@ -0,0 +1,31 @@
+<html>
+<head><title>Embeded Lua Test</title></head>
+
+<body>
+cgi = {
+<?lua
+for i,v in pairs (cgi) do
+	if type(v) == "table" then
+		local vv = "{"
+		for a,b in pairs(v) do
+			vv = string.format ("%s%s = %s<br>\n", vv, a, tostring(b))
+		end
+		v = vv.."}"
+	end
+?>
+<%= i %> = <%= tostring(v) %> <br>
+<%
+end
+%>
+}
+<br>
+Remote address: <%= cgilua.servervariable"REMOTE_ADDR" %>
+<br>
+Is persistent = <%= tostring (SAPI.Info.ispersistent) %>
+<br>
+ap = <?lua= tostring(ap) ?> <br>
+lfcgi = <% = tostring(lfcgi) %> <br>
+<%= (ap and ap.handler()) or "" %> <br>
+
+</body>
+</html>
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lua
new file mode 100644
index 00000000..0e997a2d
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_main.lua
@@ -0,0 +1,46 @@
+cgilua.htmlheader()
+cgilua.put[[
+<html>
+<head><title>Script Lua Test</title></head>
+
+<body>
+cgi = {
+]]
+
+for i,v in pairs (cgi) do
+	if type(v) == "table" then
+		local vv = "{"
+		for a,b in pairs(v) do
+			vv = string.format ("%s%s = %s<br>\n", vv, a, tostring(b))
+		end
+		v = vv.."}"
+	end
+	cgilua.put (string.format ("%s = %s<br>\n", i, tostring(v)))
+end
+cgilua.put "}<br>\n"
+cgilua.put ("Remote address: "..cgilua.servervariable"REMOTE_ADDR")
+cgilua.put "<br>\n"
+cgilua.put ("Is persistent = "..tostring (SAPI.Info.ispersistent).."<br>\n")
+cgilua.put ("ap="..tostring(ap).."<br>\n")
+cgilua.put ("lfcgi="..tostring(lfcgi).."<br>\n")
+
+-- Checking Virtual Environment
+local my_output = cgilua.put
+cgilua.put = nil
+local status, err = pcall (function ()
+	assert (cgilua.put == nil, "cannot change cgilua.put value")
+end)
+cgilua.put = my_output
+assert (status == true, err)
+
+-- Checking require
+local status, err = pcall (function () require"unknown_module" end)
+assert (status == false, "<tt>unknown_module</tt> loaded!")
+-- assert (package == nil, "Access to <tt>package</tt> table allowed!")
+
+cgilua.put[[
+<p>
+</body>
+</html>
+]]
+cgilua = nil
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_session.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_session.lua
new file mode 100644
index 00000000..d97cc452
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_session.lua
@@ -0,0 +1,43 @@
+cgilua.enablesession ()
+
+function pt (tab)
+	for i, v in pairs (tab) do
+		local vv = v
+		if type(v) == "table" then
+			vv = ""
+			for _i, _v in pairs (v) do
+				vv = vv..string.format ("%s = %q, ", _i, _v)
+			end
+			vv = '{'..vv..'}'
+		end
+		cgilua.put (string.format ("%s = %s<br>\n", tostring (i), tostring (vv)))
+	end
+end
+
+
+if cgi.field then
+	if not cgilua.session.data.field then
+		cgilua.session.data.field = {}
+	end
+	table.insert (cgilua.session.data.field, cgi.field)
+end
+cgilua.htmlheader()
+if cgilua.session then
+	cgilua.put "cgi = {<br>\n"
+	pt (cgi)
+	cgilua.put "}<br>\n"
+	cgilua.put "cgilua.session.data = {<br>\n"
+	pt (cgilua.session.data)
+	cgilua.put "}<br>\n"
+
+	cgilua.put [[<form action="]]
+	cgilua.put (cgilua.mkurlpath"test_session.lua")
+	cgilua.put [[" method="POST">
+  field: <input type="text" name="field" value="]]
+	cgilua.put (cgi.field or "")
+	cgilua.put [["><br>
+  <input type="submit"><br>
+</form>]]
+else
+	cgilua.put "Sessions library is not available or not well configured"
+end
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql.lua
new file mode 100644
index 00000000..085ce978
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql.lua
@@ -0,0 +1,13 @@
+local s = require"luasql.postgres"
+
+local env = assert (luasql.postgres ())
+local conn = assert (env:connect ("luasql-test", "tomas"))
+local cur = assert (conn:execute ("select count(*) from fetch_test"))
+
+cgilua.htmlheader()
+cgilua.put ("Total lines at table fetch_test is "..cur:fetch())
+cgilua.put (string.format ("<br>\n%s == %s<br>\n", tostring(s), tostring(luasql)))
+
+cur:close()
+conn:close()
+env:close()
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql2.lua b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql2.lua
new file mode 100644
index 00000000..a2f6ee12
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_sql2.lua
@@ -0,0 +1,24 @@
+require"postgres"
+
+local env = assert (luasql.postgres ())
+local conn = assert (env:connect ("luasql-test", "tomas"))
+local cur = assert (conn:execute ("select count(*) from t1"))
+local total = tonumber (cur:fetch())
+cur:close()
+local aleatorio = math.random(total)
+local cur = assert (conn:execute ("select * from t1, t2 where b = d and a != "..2*aleatorio))
+
+cgilua.htmlheader()
+cgilua.put ("Aleatorio = "..aleatorio.."<br>\n")
+
+local a,b,c,d = cur:fetch()
+cgilua.put ("<table>\n")
+while a do
+--	cgilua.put ("<tr><td>",a,"<td>",b,"<td>",c,"<td>",d,"</tr>")
+	a,b,c,d = cur:fetch()
+end
+cgilua.put ("</table>\n")
+
+cur:close()
+conn:close()
+env:close()
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/lua/test_variables.lp b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_variables.lp
new file mode 100644
index 00000000..c1ac332f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/lua/test_variables.lp
@@ -0,0 +1,14 @@
+<table>
+<% for _, var in pairs { "SERVER_SOFTWARE", "SERVER_NAME", "GATEWAY_INTERFACE", "SERVER_PROTOCOL", "SERVER_PORT", "REQUEST_METHOD", "PATH_INFO", "PATH_TRANSLATED", "SCRIPT_NAME", "QUERY_STRING", "REMOTE_HOST", "REMOTE_ADDR", "AUTH_TYPE", "REMOTE_USER", "REMOTE_IDENT", "CONTENT_TYPE", "CONTENT_LENGTH", "HTTP_REFERER", "HTTP_COOKIE", "SCRIPT_FILENAME", "DOCUMENT_ROOT", } do %>
+  <tr><td><%= var %><td>=<td>"<%= cgilua.servervariable(var) or "<i>not defined</i>"%>"</tr>
+<% end %>
+</table>
+
+<p>
+<table>
+<% for _, var in ipairs { "script_file", "script_path", "script_pdir", "script_vdir", "script_vpath", "urlpath", } do %>
+  <tr><td><%= var %><td>=<td>"<%= cgilua[var] %>"</tr>
+<% end %>
+</table>
+
+<p>
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_http/index.html b/trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_http/index.html
new file mode 100644
index 00000000..8b86eba8
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_http/index.html
@@ -0,0 +1,6 @@
+<html>
+<head><title>axhttpd is running</title></head>
+<body>
+Looks like you got to this directory.
+</body>
+</html>
diff --git a/trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_ssl/index.html b/trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_ssl/index.html
new file mode 100644
index 00000000..8b86eba8
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axTLS/www/test_dir/no_ssl/index.html
@@ -0,0 +1,6 @@
+<html>
+<head><title>axhttpd is running</title></head>
+<body>
+Looks like you got to this directory.
+</body>
+</html>
diff --git a/trunk/package/luci/libs/nixio/axtls-config/config.h b/trunk/package/luci/libs/nixio/axtls-config/config.h
new file mode 100644
index 00000000..0f861f34
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/axtls-config/config.h
@@ -0,0 +1,113 @@
+/*
+ * Automatically generated header file: don't edit
+ */
+
+#define HAVE_DOT_CONFIG 1
+#define CONFIG_PLATFORM_LINUX 1
+#undef CONFIG_PLATFORM_CYGWIN
+#undef CONFIG_PLATFORM_WIN32
+
+/*
+ * General Configuration
+ */
+#define PREFIX "/usr"
+#undef CONFIG_DEBUG
+#define CONFIG_STRIP_UNWANTED_SECTIONS 1
+#undef CONFIG_VISUAL_STUDIO_7_0
+#undef CONFIG_VISUAL_STUDIO_8_0
+#define CONFIG_VISUAL_STUDIO_7_0_BASE ""
+#define CONFIG_VISUAL_STUDIO_8_0_BASE ""
+#define CONFIG_EXTRA_CFLAGS_OPTIONS "-fpic"
+#define CONFIG_EXTRA_LDFLAGS_OPTIONS ""
+
+/*
+ * SSL Library
+ */
+#undef CONFIG_SSL_SERVER_ONLY
+#undef CONFIG_SSL_CERT_VERIFICATION
+#undef CONFIG_SSL_ENABLE_CLIENT
+#define CONFIG_SSL_FULL_MODE 1
+#undef CONFIG_SSL_SKELETON_MODE
+#undef CONFIG_SSL_PROT_LOW
+#define CONFIG_SSL_PROT_MEDIUM 1
+#undef CONFIG_SSL_PROT_HIGH
+#undef CONFIG_SSL_USE_DEFAULT_KEY
+#define CONFIG_SSL_PRIVATE_KEY_LOCATION "/etc/nixio/rsa_main.der"
+#define CONFIG_SSL_PRIVATE_KEY_PASSWORD ""
+#define CONFIG_SSL_X509_CERT_LOCATION ""
+#undef CONFIG_SSL_GENERATE_X509_CERT
+#define CONFIG_SSL_X509_COMMON_NAME ""
+#define CONFIG_SSL_X509_ORGANIZATION_NAME ""
+#define CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME ""
+#undef CONFIG_SSL_ENABLE_V23_HANDSHAKE
+#undef CONFIG_SSL_HAS_PEM
+#undef CONFIG_SSL_USE_PKCS12
+#define CONFIG_SSL_EXPIRY_TIME 24
+#define CONFIG_X509_MAX_CA_CERTS 4
+#define CONFIG_SSL_MAX_CERTS 2
+#define CONFIG_SSL_CTX_MUTEXING 1
+#define CONFIG_USE_DEV_URANDOM 1
+#undef CONFIG_WIN32_USE_CRYPTO_LIB
+#undef CONFIG_OPENSSL_COMPATIBLE
+#undef CONFIG_PERFORMANCE_TESTING
+#undef CONFIG_SSL_TEST
+#undef CONFIG_AXHTTPD
+#undef CONFIG_HTTP_STATIC_BUILD
+#define CONFIG_HTTP_PORT 
+#define CONFIG_HTTP_HTTPS_PORT 
+#define CONFIG_HTTP_SESSION_CACHE_SIZE 
+#define CONFIG_HTTP_WEBROOT ""
+#define CONFIG_HTTP_TIMEOUT 
+#undef CONFIG_HTTP_HAS_CGI
+#define CONFIG_HTTP_CGI_EXTENSIONS ""
+#undef CONFIG_HTTP_ENABLE_LUA
+#define CONFIG_HTTP_LUA_PREFIX ""
+#define CONFIG_HTTP_LUA_CGI_LAUNCHER ""
+#undef CONFIG_HTTP_BUILD_LUA
+#undef CONFIG_HTTP_DIRECTORIES
+#undef CONFIG_HTTP_HAS_AUTHORIZATION
+#undef CONFIG_HTTP_HAS_IPV6
+#undef CONFIG_HTTP_ENABLE_DIFFERENT_USER
+#define CONFIG_HTTP_USER ""
+#undef CONFIG_HTTP_VERBOSE
+#undef CONFIG_HTTP_IS_DAEMON
+
+/*
+ * Language Bindings
+ */
+#undef CONFIG_BINDINGS
+#undef CONFIG_CSHARP_BINDINGS
+#undef CONFIG_VBNET_BINDINGS
+#define CONFIG_DOT_NET_FRAMEWORK_BASE ""
+#undef CONFIG_JAVA_BINDINGS
+#define CONFIG_JAVA_HOME ""
+#undef CONFIG_PERL_BINDINGS
+#define CONFIG_PERL_CORE ""
+#define CONFIG_PERL_LIB ""
+#undef CONFIG_LUA_BINDINGS
+#define CONFIG_LUA_CORE ""
+
+/*
+ * Samples
+ */
+#undef CONFIG_SAMPLES
+#undef CONFIG_C_SAMPLES
+#undef CONFIG_CSHARP_SAMPLES
+#undef CONFIG_VBNET_SAMPLES
+#undef CONFIG_JAVA_SAMPLES
+#undef CONFIG_PERL_SAMPLES
+#undef CONFIG_LUA_SAMPLES
+
+/*
+ * BigInt Options
+ */
+#undef CONFIG_BIGINT_CLASSICAL
+#undef CONFIG_BIGINT_MONTGOMERY
+#define CONFIG_BIGINT_BARRETT 1
+#define CONFIG_BIGINT_CRT 1
+#undef CONFIG_BIGINT_KARATSUBA
+#define MUL_KARATSUBA_THRESH 
+#define SQU_KARATSUBA_THRESH 
+#define CONFIG_BIGINT_SLIDING_WINDOW 1
+#define CONFIG_BIGINT_SQUARE 1
+#undef CONFIG_BIGINT_CHECK_ON
diff --git a/trunk/package/luci/libs/nixio/axtls-root/etc/nixio/rsa_main.der b/trunk/package/luci/libs/nixio/axtls-root/etc/nixio/rsa_main.der
new file mode 100644
index 0000000000000000000000000000000000000000..e17fdc0a0c70ea2783896858d75539f404048eb5
GIT binary patch
literal 609
zcmV-n0-pUaf&yIv0RRGlfdJOj{f-NB6s=ZkK6xsdxjSkca%)`@KJMk(U>WOiS|#Eb
zoAWdEN;`Dk9cL|zgXLJx;E>AL(m2eAPKsA&nS6t2IO9Qqj~%MAO&FPJU<Ys3FK9gt
zJp%~}T0=FY+E8D;<Wwq&l&t2rzqc$tn~ktI8CR^6?7dyXQ8(LWAQ=J!0RRC4fq)Y_
znLl5W`()60Wb7Y)9okKkB0{a-_BI#j#q~?~r(^)C$2zNt=M4{5+BW0@y4i|rY5Gge
zz;j6pOJZV_X-;dk1a%Ziq#H`F)jvB5^Lt+Q{sFPigwQre*fN(r@TkA#dYd;*7*yXD
z47DQ*hQg53<$lO?c54tiV;`)vFaZKV0Q@Jcup_@+PU=CYs`p+IaDy$hrP^sZP^s|w
z<Pt+ZR5f#|`>ne3v)6C7X8x$f3Ls#j((1AIKfm6r=>2r<0Rlk)+8ds;3PW2BHX@!+
z+hK(B+-P4V<v;cpsI3XEQ~7*Fbyv}H@GfN5EDK^vDwen+vNieHY<EKLTa^)h_nZ3}
z0zm+Qp>yf!w#%h*Q09HYMjiPTw>^`#K{_${>*UNAhjLe-QzEC>oUjDg(3zP*dP*_&
zi#Mt6_9p@(1-mBPhHL=>Km>PKQkFe7+8AfC5;cv}sUoyUZh$#O63X*%B~P~IB8~c#
zVPqw*4(qG<0Z7UDPfU{PVAo~A%Nw}+xVzm)(E>pL>Dj&<G6v#6Sj|vdNkx&6fQR7@
vxOgs2N%a4^3Tut0$H0_&bN(y>i5m%8UI~~REC*EW9J5XLU*A84D;RtmF~=XW

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/libs/nixio/docsrc/CHANGELOG.lua b/trunk/package/luci/libs/nixio/docsrc/CHANGELOG.lua
new file mode 100644
index 00000000..fb1cf160
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/CHANGELOG.lua
@@ -0,0 +1,29 @@
+--- Changes and improvements.
+module "CHANGELOG"
+
+--- Service Release.
+-- <ul>
+-- <li>Added getifaddrs() function.</li>
+-- <li>Added getsockopt(), setsockopt(), getsockname() and getpeername()
+-- directly to TLS-socket objects unifying the socket interface.</li>
+-- <li>Added support for CyaSSL as cryptographical backend.</li>
+-- <li>Added support for x509 certificates in DER format.</li>
+-- <li>Added support for splice() in UnifiedIO.copyz().</li>
+-- <li>Added interface to inject chunks into UnifiedIO.linesource() buffer.</li>
+-- <li>Changed TLS behaviour to explicitely separate servers and clients.</li>
+-- <li>Fixed usage of signed datatype breaking Base64 decoding.</li>
+-- <li>Fixed namespace clashes for nixio.fs.</li>
+-- <li>Fixed splice() support for some exotic C libraries.</li>
+-- <li>Reconfigure axTLS cryptographical provider and mark it as obsolete.</li>
+-- </ul>
+-- @class table
+-- @name 0.3
+-- @return !
+
+--- Initial Release.
+-- <ul>
+-- <li>Initial Release</li>  
+-- </ul>
+-- @class table
+-- @name 0.2
+-- @return !
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/README.lua b/trunk/package/luci/libs/nixio/docsrc/README.lua
new file mode 100644
index 00000000..b957a699
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/README.lua
@@ -0,0 +1,95 @@
+--- General Information.
+module "README"
+
+--- General error handling information.
+-- <ul>
+-- <li> Most of the functions available in this library may fail. If any error
+-- occurs the function returns <strong>nil or false</strong>, an error code
+-- (usually errno) and an additional error message text (if avaialable).</li>
+-- <li>At the moment false is only returned when a non-blocking I/O function
+-- fails with EAGAIN, EWOULDBLOCK or WSAEWOULDBLOCK for any others nil is
+-- returned as first parameter. Therefore you can use false to write portable
+-- non-blocking I/O applications.</li>
+-- <li>Note that the function documentation does only mention the return values
+-- in case of a successful operation.</li> 
+-- <li>You can find a table of common error numbers and other useful constants
+-- like signal numbers in <strong>nixio.const</strong> e.g. nixio.const.EINVAL,
+-- nixio.const.SIGTERM, etc. For portability there is a second error constant
+-- table <strong>nixio.const_sock</strong> for socket error codes. This might
+-- be important if you are dealing with Windows applications, on POSIX however
+-- const_sock is just an alias for const.</li>
+-- <li>With some exceptions - which are explicitely stated in the function
+-- documentation - all blocking functions are signal-protected and will not fail
+-- with EINTR.</li>
+-- <li>On POSIX the SIGPIPE signal will be set to ignore upon initialization.
+-- You should restore the default behaviour or set a custom signal handler
+-- in your program after loading nixio if you need this behaviour.</li>
+-- </ul>
+-- @class table
+-- @name Errorhandling
+-- @return !
+
+--- Function conventions.
+-- <br />In general all functions are namend and behave like their POSIX API
+-- counterparts - where applicable - applying the following rules:
+-- <ul>
+-- <li>Functions should be named like the underlying POSIX API function ommiting
+-- prefixes or suffixes - especially when placed in an object-context (
+-- lockf -> File:lock, fsync -> File:sync, dup2 -> dup, ...)</li>
+-- <li>If you are unclear about the behaviour of a function you should consult
+-- your OS API documentation (e.g. the manpages).</li>
+-- <li>If the name is significantly different from the POSIX-function, the
+-- underlying function(s) are stated in the documentation.</li>
+-- <li>Parameters should reflect those of the C-API, buffer length arguments and 
+-- by-reference parameters should be ommitted for pratical purposes.</li>
+-- <li>If a C function accepts a bitfield as parameter, it should be translated
+-- into lower case string flags representing the flags if the bitfield is the 
+-- last parameter and also ommiting prefixes or suffixes. (e.g.  waitpid
+-- (pid, &s, WNOHANG | WUNTRACED) -> waitpid(pid, "nohang", "untraced"), 
+-- getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) ->
+-- Socket:getopt("socket", "reuseaddr"), etc.) </li>
+-- <li>If it is not applicable to provide a string representation of the
+-- bitfield a bitfield generator helper is provided. It is named FUNCTION_flags.
+-- (open("/tmp/test", O_RDONLY | O_NONBLOCK) -> open("/tmp/test", open_flags(
+-- "rdonly", "nonblock")))</li>  
+-- </ul>
+-- @class table
+-- @name Functions
+-- @return !
+
+--- Platform information.
+-- <ul>
+-- <li>The minimum platform requirements are a decent POSIX 2001 support.
+-- Builds are more or less tested on Linux, Solaris and FreeBSD. Builds for
+-- Windows XP SP1 and later can be compiled with MinGW either from Windows
+-- itself or using the MinGW cross-compiler. Earlier versions of Windows are not
+-- supported.</li>
+-- <li>In general all functions which don't have any remarks 
+-- in their documentation are available on all platforms.</li>
+-- <li>Functions with a (POSIX), (Linux) or similar prefix are only available
+-- on these specific platforms. Same appplies to parameters of functions
+-- with a similar suffix.</li>
+-- <li>Some functions might have limitations on some platforms. This should
+-- be stated in the documentation. Please also consult your OS API 
+-- documentation.</li>   
+-- </ul>
+-- @usage Tes
+-- @class table
+-- @name Platforms
+-- @return !
+
+--- Cryptography and TLS libraries.
+-- <ul>
+-- <li>Currently 3 underlying cryptography libraries are supported: openssl,
+-- cyassl and axTLS. The name of the library in use is written to 
+-- <strong>nixio.tls_provider</strong></li>
+-- <li>You should whenever possible use openssl or cyassl as axTLS has only 
+-- limited support. It does not provide support for non-blocking sockets and
+-- is probably less audited than the other ones.</li>
+-- <li>As the supported Windows versions are not suitable for embedded devices
+-- axTLS is at the moment not supported on Windows.</li>  
+-- </ul>
+-- @usage Tes
+-- @class table
+-- @name TLS-Crypto
+-- @return !
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.CryptoHash.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.CryptoHash.lua
new file mode 100644
index 00000000..a08b48d6
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.CryptoHash.lua
@@ -0,0 +1,17 @@
+--- Cryptographical Hash and HMAC object.
+-- @cstyle	instance
+module "nixio.CryptoHash"
+
+--- Add another chunk of data to be hashed.
+-- @class function
+-- @name CryptoHash.update
+-- @param chunk Chunk of data
+-- @return CryptoHash object (self)
+
+--- Finalize the hash and return the digest.
+-- @class function
+-- @name CryptoHash.final
+-- @usage You cannot call update on a hash object that was already finalized
+-- you can however call final multiple times to get the digest.
+-- @return	hexdigest
+-- @return  buffer containing binary digest
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.File.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.File.lua
new file mode 100644
index 00000000..368562a2
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.File.lua
@@ -0,0 +1,109 @@
+--- Large File Object.
+-- Large file operations are supported up to 52 bits if the Lua number type is
+-- double (default).
+-- @cstyle	instance
+module "nixio.File"
+
+--- Write to the file descriptor.
+-- @class function
+-- @name File.write
+-- @usage <strong>Warning:</strong> It is not guaranteed that all data
+-- in the buffer is written at once especially when dealing with pipes.
+-- You have to check the return value - the number of bytes actually written -
+-- or use the safe IO functions in the high-level IO utility module.
+-- @usage Unlike standard Lua indexing the lowest offset and default is 0.
+-- @param buffer	Buffer holding the data to be written.
+-- @param offset	Offset to start reading the buffer from. (optional)
+-- @param length	Length of chunk to read from the buffer. (optional)
+-- @return number of bytes written
+
+--- Read from a file descriptor.
+-- @class function
+-- @name File.read
+-- @usage <strong>Warning:</strong> It is not guaranteed that all requested data
+-- is read at once especially when dealing with pipes.
+-- You have to check the return value - the length of the buffer actually read -
+-- or use the safe IO functions in the high-level IO utility module.
+-- @usage The length of the return buffer is limited by the (compile time) 
+-- nixio buffersize which is <em>nixio.const.buffersize</em> (8192 by default).
+-- Any read request greater than that will be safely truncated to this value.  
+-- @param length	Amount of data to read (in Bytes).
+-- @return buffer containing data successfully read
+
+--- Reposition read / write offset of the file descriptor.
+-- The seek will be done either from the beginning of the file or relative
+-- to the current position or relative to the end.
+-- @class function
+-- @name File.seek
+-- @usage This function calls lseek().
+-- @param offset	File Offset
+-- @param whence	Starting point [<strong>"set"</strong>, "cur", "end"]
+-- @return new (absolute) offset position
+
+--- Return the current read / write offset of the file descriptor.
+-- @class function
+-- @name File.tell
+-- @usage This function calls lseek() with offset 0 from the current position.
+-- @return offset position
+
+--- Synchronizes the file with the storage device.
+-- Returns when the file is successfully written to the disk.
+-- @class function
+-- @name File.sync
+-- @usage This function calls fsync() when data_only equals false
+-- otherwise fdatasync(), on Windows _commit() is used instead.
+-- @usage fdatasync() is only supported by Linux and Solaris. For other systems
+-- the <em>data_only</em> parameter is ignored and fsync() is always called.
+-- @param data_only		Do not synchronize the metadata. (optional, boolean)
+-- @return true
+
+--- Apply or test a lock on the file.
+-- @class function
+-- @name File.lock
+-- @usage This function calls lockf() on POSIX and _locking() on Windows.
+-- @usage The "lock" command is blocking, "tlock" is non-blocking,
+-- "ulock" unlocks and "test" only tests for the lock.
+-- @usage The "test" command is not available on Windows.
+-- @usage Locks are by default advisory on POSIX, but mandatory on Windows.
+-- @param command	Locking Command ["lock", "tlock", "ulock", "test"]
+-- @param length	Amount of Bytes to lock from current offset (optional)
+-- @return true
+
+--- Get file status and attributes.
+-- @class function
+-- @name File.stat
+-- @param	field	Only return a specific field, not the whole table (optional)
+-- @usage This function calls fstat().
+-- @return	Table containing: <ul>
+-- <li>atime = Last access timestamp</li>
+-- <li>blksize = Blocksize (POSIX only)</li>
+-- <li>blocks = Blocks used (POSIX only)</li>
+-- <li>ctime = Creation timestamp</li>
+-- <li>dev = Device ID</li>
+-- <li>gid = Group ID</li>
+-- <li>ino = Inode</li>
+-- <li>modedec = Mode converted into a decimal number</li>
+-- <li>modestr = Mode as string as returned by `ls -l`</li>
+-- <li>mtime = Last modification timestamp</li>
+-- <li>nlink = Number of links</li>
+-- <li>rdev = Device ID (if special file)</li>
+-- <li>size = Size in bytes</li>
+-- <li>type = ["reg", "dir", "chr", "blk", "fifo", "lnk", "sock"]</li>
+-- <li>uid = User ID</li>
+-- </ul>
+
+--- Close the file descriptor.
+-- @class function
+-- @name File.close
+-- @return true
+
+--- Get the number of the filedescriptor.
+-- @class function
+-- @name File.fileno
+-- @return file descriptor number
+
+--- (POSIX) Set the blocking mode of the file descriptor.
+-- @class function
+-- @name File.setblocking
+-- @param	blocking	(boolean)
+-- @return true
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.Socket.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.Socket.lua
new file mode 100644
index 00000000..7123393b
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.Socket.lua
@@ -0,0 +1,170 @@
+--- Socket Object.
+-- Supports IPv4, IPv6 and UNIX (POSIX only) families.
+-- @cstyle	instance
+module "nixio.Socket"
+
+--- Get the local address of a socket.
+-- @class function
+-- @name Socket.getsockname
+-- @return	IP-Address
+-- @return	Port
+
+--- Get the peer address of a socket.
+-- @class function
+-- @name Socket.getpeername
+-- @return	IP-Address
+-- @return	Port
+
+--- Bind the socket to a network address.
+-- @class function
+-- @name Socket.bind
+-- @usage This function calls getaddrinfo() and bind() but NOT listen().
+-- @usage If <em>host</em> is a domain name it will be looked up and bind() 
+-- tries the IP-Addresses in the order returned by the DNS resolver
+-- until the bind succeeds. 
+-- @usage UNIX sockets ignore the <em>port</em>,
+-- and interpret <em>host</em> as a socket path.
+-- @param host	Host (optional, default: all addresses)
+-- @param port	Port or service description
+-- @return true
+
+--- Connect the socket to a network address.
+-- @class function
+-- @name Socket.connect
+-- @usage This function calls getaddrinfo() and connect().
+-- @usage If <em>host</em> is a domain name it will be looked up and connect() 
+-- tries the IP-Addresses in the order returned by the DNS resolver
+-- until the connect succeeds. 
+-- @usage UNIX sockets ignore the <em>port</em>,
+-- and interpret <em>host</em> as a socket path.
+-- @param host	Hostname or IP-Address (optional, default: localhost)
+-- @param port	Port or service description
+-- @return true
+
+--- Listen for connections on the socket.
+-- @class function
+-- @name Socket.listen
+-- @param	backlog	Length of queue for pending connections
+-- @return	true
+
+--- Accept a connection on the socket.
+-- @class function
+-- @name Socket.accept
+-- @return	Socket Object
+-- @return	Peer IP-Address
+-- @return  Peer Port
+
+--- Send a message on the socket specifying the destination.
+-- @class function
+-- @name Socket.sendto
+-- @usage <strong>Warning:</strong> It is not guaranteed that all data
+-- in the buffer is written at once.
+-- You have to check the return value - the number of bytes actually written -
+-- or use the safe IO functions in the high-level IO utility module.
+-- @usage Unlike standard Lua indexing the lowest offset and default is 0.
+-- @param buffer	Buffer holding the data to be written.
+-- @param host		Target IP-Address
+-- @param port		Target Port
+-- @param offset	Offset to start reading the buffer from. (optional)
+-- @param length	Length of chunk to read from the buffer. (optional)
+-- @return number of bytes written
+
+--- Send a message on the socket.
+-- This function is identical to sendto except for the missing destination
+-- paramters. See the sendto description for a detailed description.
+-- @class function
+-- @name Socket.send
+-- @param buffer	Buffer holding the data to be written.
+-- @param offset	Offset to start reading the buffer from. (optional)
+-- @param length	Length of chunk to read from the buffer. (optional)
+-- @see	Socket.sendto
+-- @return number of bytes written
+
+--- Send a message on the socket (This is an alias for send).
+-- See the sendto description for a detailed description.
+-- @class function
+-- @name Socket.write
+-- @param buffer	Buffer holding the data to be written.
+-- @param offset	Offset to start reading the buffer from. (optional)
+-- @param length	Length of chunk to read from the buffer. (optional)
+-- @see	Socket.sendto
+-- @return number of bytes written
+
+--- Receive a message on the socket including the senders source address.
+-- @class function
+-- @name Socket.recvfrom
+-- @usage <strong>Warning:</strong> It is not guaranteed that all requested data
+-- is read at once.
+-- You have to check the return value - the length of the buffer actually read -
+-- or use the safe IO functions in the high-level IO utility module.
+-- @usage The length of the return buffer is limited by the (compile time) 
+-- nixio buffersize which is <em>nixio.const.buffersize</em> (8192 by default).
+-- Any read request greater than that will be safely truncated to this value.  
+-- @param length	Amount of data to read (in Bytes).
+-- @return buffer containing data successfully read
+-- @return host		IP-Address of the sender
+-- @return port		Port of the sender
+
+--- Receive a message on the socket.
+-- This function is identical to recvfrom except that it does not return 
+-- the sender's source address. See the recvfrom description for more details.
+-- @class function
+-- @name Socket.recv  
+-- @param length	Amount of data to read (in Bytes).
+-- @see Socket.recvfrom
+-- @return buffer containing data successfully read
+
+--- Receive a message on the socket (This is an alias for recv).
+-- See the recvfrom description for more details.
+-- @class function
+-- @name Socket.read  
+-- @param length	Amount of data to read (in Bytes).
+-- @see Socket.recvfrom
+-- @return buffer containing data successfully read
+
+--- Close the socket.
+-- @class function
+-- @name Socket.close
+-- @return true
+
+--- Shut down part of a full-duplex connection.
+-- @class function
+-- @name Socket.shutdown
+-- @param how	(optional, default: rdwr) ["rdwr", "rd", "wr"] 
+-- @return	true
+
+--- Get the number of the filedescriptor.
+-- @class function
+-- @name Socket.fileno
+-- @return file descriptor number
+
+--- Set the blocking mode of the socket.
+-- @class function
+-- @name Socket.setblocking
+-- @param	blocking	(boolean)
+-- @return true
+
+--- Set a socket option.
+-- @class function
+-- @name Socket.setopt
+-- @param level Level ["socket", "tcp", "ip", "ipv6"]
+-- @param option Option	["keepalive", "reuseaddr", "sndbuf", "rcvbuf", 
+-- "priority", "broadcast", "linger", "sndtimeo", "rcvtimeo", "dontroute", 
+-- "bindtodevice", "error", "oobinline", "cork" (TCP),  "nodelay" (TCP),
+-- "mtu" (IP, IPv6), "hdrincl" (IP), "multicast_ttl" (IP), "multicast_loop"
+-- (IP, IPv6), "multicast_if" (IP, IPv6), "v6only" (IPv6), "multicast_hops"
+-- (IPv6), "add_membership" (IP, IPv6), "drop_membership" (IP, IPv6)]
+-- @param	value Value
+-- @return true
+
+--- Get a socket option.
+-- @class function
+-- @name Socket.getopt
+-- @param level Level ["socket", "tcp", "ip", "ipv6"]
+-- @param option Option	["keepalive", "reuseaddr", "sndbuf", "rcvbuf", 
+-- "priority", "broadcast", "linger", "sndtimeo", "rcvtimeo", "dontroute", 
+-- "bindtodevice", "error", "oobinline", "cork" (TCP),  "nodelay" (TCP),
+-- "mtu" (IP, IPv6), "hdrincl" (IP), "multicast_ttl" (IP), "multicast_loop"
+-- (IP, IPv6), "multicast_if" (IP, IPv6), "v6only" (IPv6), "multicast_hops"
+-- (IPv6), "add_membership" (IP, IPv6), "drop_membership" (IP, IPv6)]
+-- @return Value
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.TLSContext.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.TLSContext.lua
new file mode 100644
index 00000000..7cc07119
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.TLSContext.lua
@@ -0,0 +1,46 @@
+--- Transport Layer Security Context Object.
+-- @cstyle	instance
+module "nixio.TLSContext"
+
+--- Create a TLS Socket from a socket descriptor.
+-- @class function
+-- @name TLSContext.create
+-- @param socket Socket Object
+-- @return TLSSocket Object
+
+--- Assign a PEM certificate to this context.
+-- @class function
+-- @name TLSContext.set_cert
+-- @usage This function calls SSL_CTX_use_certificate_chain_file().
+-- @param path	Certificate File path
+-- @return true
+
+--- Assign a PEM private key to this context.
+-- @class function
+-- @name TLSContext.set_key
+-- @usage This function calls SSL_CTX_use_PrivateKey_file().
+-- @param path	Private Key File path
+-- @return true
+
+--- Set the available ciphers for this context.
+-- @class function
+-- @name TLSContext.set_ciphers
+-- @usage This function calls SSL_CTX_set_cipher_list().
+-- @param cipherlist	String containing a list of ciphers
+-- @return true
+
+--- Set the verification depth of this context.
+-- @class function
+-- @name TLSContext.set_verify_depth
+-- @usage This function calls SSL_CTX_set_verify_depth().
+-- @param depth	Depth
+-- @return true
+
+--- Set the verification flags of this context.
+-- @class function
+-- @name TLSContext.set_verify
+-- @usage This function calls SSL_CTX_set_verify().
+-- @param flag1	First Flag	["none", "peer", "verify_fail_if_no_peer_cert", 
+-- "client_once"]
+-- @param ...	More Flags	[-"-]
+-- @return true
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.TLSSocket.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.TLSSocket.lua
new file mode 100644
index 00000000..b932cde0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.TLSSocket.lua
@@ -0,0 +1,73 @@
+--- TLS Socket Object.
+-- TLS Sockets contain the underlying socket and context in the fields
+-- "socket" and "context".
+-- @cstyle	instance
+module "nixio.TLSSocket"
+
+--- Initiate the TLS handshake as client with the server.
+-- @class function
+-- @name TLSSocket.connect
+-- @usage This function calls SSL_connect().
+-- @usage You have to call either connect or accept before transmitting data.
+-- @see TLSSocket.accept
+-- @return true
+
+--- Wait for a TLS handshake from a client.
+-- @class function
+-- @name TLSSocket.accept
+-- @usage This function calls SSL_accept().
+-- @usage You have to call either connect or accept before transmitting data.
+-- @see TLSSocket.connect
+-- @return	true
+
+--- Send a message to the socket.
+-- @class function
+-- @name TLSSocket.send
+-- @usage This function calls SSL_write().
+-- @usage <strong>Warning:</strong> It is not guaranteed that all data
+-- in the buffer is written at once.
+-- You have to check the return value - the number of bytes actually written -
+-- or use the safe IO functions in the high-level IO utility module.
+-- @usage Unlike standard Lua indexing the lowest offset and default is 0.
+-- @param buffer	Buffer holding the data to be written.
+-- @param offset	Offset to start reading the buffer from. (optional)
+-- @param length	Length of chunk to read from the buffer. (optional)
+-- @return number of bytes written
+
+--- Send a message on the socket (This is an alias for send).
+-- See the send description for a detailed description.
+-- @class function
+-- @name TLSSocket.write
+-- @param buffer	Buffer holding the data to be written.
+-- @param offset	Offset to start reading the buffer from. (optional)
+-- @param length	Length of chunk to read from the buffer. (optional)
+-- @see	TLSSocket.send
+-- @return number of bytes written
+
+--- Receive a message on the socket.
+-- @class function
+-- @name TLSSocket.recv
+-- @usage This function calls SSL_read().
+-- @usage <strong>Warning:</strong> It is not guaranteed that all requested data
+-- is read at once.
+-- You have to check the return value - the length of the buffer actually read -
+-- or use the safe IO functions in the high-level IO utility module.
+-- @usage The length of the return buffer is limited by the (compile time) 
+-- nixio buffersize which is <em>nixio.const.buffersize</em> (8192 by default).
+-- Any read request greater than that will be safely truncated to this value.  
+-- @param length	Amount of data to read (in Bytes).
+-- @return buffer containing data successfully read
+
+--- Receive a message on the socket (This is an alias for recv).
+-- See the recv description for more details.
+-- @class function
+-- @name TLSSocket.read  
+-- @param length	Amount of data to read (in Bytes).
+-- @see TLSSocket.recv
+-- @return buffer containing data successfully read
+
+--- Shut down the TLS connection.
+-- @class function
+-- @name TLSSocket.shutdown
+-- @usage This function calls SSL_shutdown().
+-- @return	true
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.UnifiedIO.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.UnifiedIO.lua
new file mode 100644
index 00000000..6e407ff2
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.UnifiedIO.lua
@@ -0,0 +1,129 @@
+--- Unified high-level I/O utility API for Files, Sockets and TLS-Sockets.
+-- These functions are added to the object function tables by doing <strong>
+-- require "nixio.util"</strong>, can be used on all nixio IO  Descriptors and
+-- are based on the shared low-level read() and write() functions.
+-- @cstyle	instance
+module "nixio.UnifiedIO"
+
+--- Test whether the I/O-Descriptor is a socket. 
+-- @class function
+-- @name UnifiedIO.is_socket
+-- @return	boolean
+
+--- Test whether the I/O-Descriptor is a TLS socket. 
+-- @class function
+-- @name UnifiedIO.is_tls_socket
+-- @return	boolean
+
+--- Test whether the I/O-Descriptor is a file. 
+-- @class function
+-- @name UnifiedIO.is_file
+-- @return	boolean
+
+--- Read a block of data and wait until all data is available.
+-- @class function
+-- @name UnifiedIO.readall
+-- @usage This function uses the low-level read function of the descriptor.
+-- @usage If the length parameter is ommited, this function returns all data
+-- that can be read before an end-of-file, end-of-stream, connection shutdown
+-- or similar happens.
+-- @usage If the descriptor is non-blocking this function may fail with EAGAIN.
+-- @param	length	Bytes to read (optional)
+-- @return	data that was successfully read if no error occured
+-- @return	- reserved for error code -
+-- @return	- reserved for error message -
+-- @return  data that was successfully read even if an error occured
+
+--- Write a block of data and wait until all data is written.
+-- @class function
+-- @name UnifiedIO.writeall
+-- @usage This function uses the low-level write function of the descriptor.
+-- @usage If the descriptor is non-blocking this function may fail with EAGAIN.
+-- @param	block	Bytes to write
+-- @return	bytes that were successfully written if no error occured
+-- @return	- reserved for error code -
+-- @return	- reserved for error message -
+-- @return  bytes that were successfully written even if an error occured
+
+--- Create a line-based iterator.
+-- Lines may end with either \n or \r\n, these control chars are not included
+-- in the return value.
+-- @class function
+-- @name UnifiedIO.linesource
+-- @usage This function uses the low-level read function of the descriptor.
+-- @usage <strong>Note:</strong> This function uses an internal buffer to read
+-- ahead. Do NOT mix calls to read(all) and the returned iterator. If you want
+-- to stop reading line-based and want to use the read(all) functions instead
+-- you can pass "true" to the iterator which will flush the buffer 
+-- and return the bufferd data.
+-- @usage If the limit parameter is ommited, this function uses the nixio
+-- buffersize (8192B by default).
+-- @usage If the descriptor is non-blocking the iterator may fail with EAGAIN.
+-- @usage The iterator can be used as an LTN12 source.
+-- @param	limit	Line limit
+-- @return	Line-based Iterator
+
+--- Create a block-based iterator.
+-- @class function
+-- @name UnifiedIO.blocksource
+-- @usage This function uses the low-level read function of the descriptor.
+-- @usage The blocksize given is only advisory and to be seen as an upper limit,
+-- if an underlying read returns less bytes the chunk is nevertheless returned.
+-- @usage If the limit parameter is ommited, the iterator returns data
+-- until an end-of-file, end-of-stream, connection shutdown or similar happens.
+-- @usage The iterator will not buffer so it is safe to mix with calls to read.
+-- @usage If the descriptor is non-blocking the iterator may fail with EAGAIN.
+-- @usage The iterator can be used as an LTN12 source.
+-- @param	blocksize	Advisory blocksize (optional)
+-- @param	limit		Amount of data to consume (optional)
+-- @return	Block-based Iterator
+
+--- Create a sink.
+-- This sink will simply write all data that it receives and optionally
+-- close the descriptor afterwards.
+-- @class function
+-- @name UnifiedIO.sink
+-- @usage This function uses the writeall function of the descriptor.
+-- @usage If the descriptor is non-blocking the sink may fail with EAGAIN.
+-- @usage The iterator can be used as an LTN12 sink.
+-- @param	close_when_done	(optional, boolean)
+-- @return	Sink
+
+--- Copy data from the current descriptor to another one.
+-- @class function
+-- @name UnifiedIO.copy
+-- @usage This function uses the blocksource function of the source descriptor
+-- and the sink function of the target descriptor.
+-- @usage If the limit parameter is ommited, data is copied
+-- until an end-of-file, end-of-stream, connection shutdown or similar happens.
+-- @usage If the descriptor is non-blocking the function may fail with EAGAIN.
+-- @param	fdout Target Descriptor
+-- @param	size  Bytes to copy (optional)
+-- @return	bytes that were successfully written if no error occured
+-- @return	- reserved for error code -
+-- @return	- reserved for error message -
+-- @return  bytes that were successfully written even if an error occured
+
+--- Copy data from the current descriptor to another one using kernel-space
+-- copying if possible.
+-- @class function
+-- @name UnifiedIO.copyz
+-- @usage This function uses the sendfile() syscall to copy the data or the
+-- blocksource function of the source descriptor and the sink function
+-- of the target descriptor as a fallback mechanism.
+-- @usage If the limit parameter is ommited, data is copied
+-- until an end-of-file, end-of-stream, connection shutdown or similar happens.
+-- @usage If the descriptor is non-blocking the function may fail with EAGAIN.
+-- @param	fdout Target Descriptor
+-- @param	size  Bytes to copy (optional)
+-- @return	bytes that were successfully written if no error occured
+-- @return	- reserved for error code -
+-- @return	- reserved for error message -
+-- @return  bytes that were successfully written even if an error occured
+
+--- Close the descriptor.
+-- @class function
+-- @name UnifiedIO.close
+-- @usage	If the descriptor is a TLS-socket the underlying descriptor is
+-- closed without touching the TLS connection.
+-- @return	true
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.bin.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.bin.lua
new file mode 100644
index 00000000..13e125d3
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.bin.lua
@@ -0,0 +1,33 @@
+--- Binary operations and conversion.
+module "nixio.bin"
+
+--- Return a hexadecimal ASCII represantation of the content of a buffer. 
+-- @class function
+-- @name hexlify
+-- @param buffer	Buffer
+-- @return representation using characters [0-9a-f]
+
+--- Return a binary buffer from a hexadecimal ASCII representation. 
+-- @class function
+-- @name unhexlify
+-- @param hexvalue representation using characters [0-9a-f]
+-- @return binary data
+
+--- Calculate the CRC32 value of a buffer. 
+-- @class function
+-- @name crc32
+-- @param buffer	Buffer
+-- @param initial	Initial CRC32 value (optional)
+-- @return crc32 value
+
+--- Base64 encode a given buffer.
+-- @class function
+-- @name b64encode
+-- @param buffer	Buffer
+-- @return base64 encoded buffer
+
+--- Base64 decode a given buffer.
+-- @class function
+-- @name b64decode
+-- @param buffer	Base 64 Encoded data
+-- @return binary data
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.bit.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.bit.lua
new file mode 100644
index 00000000..6951dd53
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.bit.lua
@@ -0,0 +1,92 @@
+--- Bitfield operators and mainpulation functions.
+-- Can be used as a drop-in replacement for bitlib.
+module "nixio.bit"
+
+--- Bitwise OR several numbers.
+-- @class function
+-- @name bor
+-- @param oper1	First Operand
+-- @param oper2 Second Operand
+-- @param ...	More Operands
+-- @return number
+
+--- Invert given number.
+-- @class function
+-- @name bnot
+-- @param oper Operand
+-- @return number
+
+--- Bitwise AND several numbers.
+-- @class function
+-- @name band
+-- @param oper1	First Operand
+-- @param oper2 Second Operand
+-- @param ...	More Operands
+-- @return number
+
+--- Bitwise XOR several numbers.
+-- @class function
+-- @name bxor
+-- @param oper1	First Operand
+-- @param oper2 Second Operand
+-- @param ...	More Operands
+-- @return number
+
+--- Left shift a number.
+-- @class function
+-- @name lshift
+-- @param oper	number
+-- @param shift	bits to shift 
+-- @return number
+
+--- Right shift a number.
+-- @class function
+-- @name rshift
+-- @param oper	number
+-- @param shift	bits to shift 
+-- @return number
+
+--- Arithmetically right shift a number.
+-- @class function
+-- @name arshift
+-- @param oper	number
+-- @param shift	bits to shift 
+-- @return number
+
+--- Integer division of 2 or more numbers.
+-- @class function
+-- @name div
+-- @param oper1	Operand 1
+-- @param oper2 Operand 2
+-- @param ... More Operands
+-- @return number
+
+--- Cast a number to the bit-operating range.
+-- @class function
+-- @name cast
+-- @param oper	number
+-- @return number
+
+--- Sets one or more flags of a bitfield.
+-- @class function
+-- @name set
+-- @param bitfield	Bitfield
+-- @param flag1 First Flag
+-- @param ...	More Flags
+-- @return altered bitfield
+
+--- Unsets one or more flags of a bitfield.
+-- @class function
+-- @name unset
+-- @param bitfield	Bitfield
+-- @param flag1 First Flag
+-- @param ...	More Flags
+-- @return altered bitfield
+
+--- Checks whether given flags are set in a bitfield.
+-- @class function
+-- @name check
+-- @param bitfield	Bitfield
+-- @param flag1 First Flag
+-- @param ...	More Flags
+-- @return true when all flags are set, otherwise false
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.crypto.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.crypto.lua
new file mode 100644
index 00000000..158d0fc0
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.crypto.lua
@@ -0,0 +1,15 @@
+--- Cryptographical library.
+module "nixio.crypto"
+
+--- Create a hash object. 
+-- @class function
+-- @name nixio.crypto.hash
+-- @param algo	Algorithm ["sha1", "md5"]
+-- @return CryptoHash Object
+
+--- Create a HMAC object. 
+-- @class function
+-- @name nixio.crypto.hmac
+-- @param algo	Algorithm ["sha1", "md5"]
+-- @param key	HMAC-Key
+-- @return CryptoHash Object
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.fs.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.fs.lua
new file mode 100644
index 00000000..5d08719e
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.fs.lua
@@ -0,0 +1,265 @@
+--- Low-level and high-level filesystem manipulation library.
+module "nixio.fs"
+
+
+--- Check user's permission on a file.
+-- @class function
+-- @name nixio.fs.access
+-- @param path		Path
+-- @param mode1		First Mode to check ["f", "r", "w", "x"]
+-- @param ...		More Modes to check	[-"-]
+-- @return	true
+
+--- Strip the directory part from a path.
+-- @class function
+-- @name nixio.fs.basename
+-- @usage	This function cannot fail and will never return nil.
+-- @param	path Path
+-- @return	basename
+
+--- Strip the base from a path.
+-- @class function
+-- @name nixio.fs.dirname
+-- @usage	This function cannot fail and will never return nil.
+-- @param	path Path
+-- @return	dirname
+
+--- Return the cannonicalized absolute pathname.
+-- @class function
+-- @name nixio.fs.realpath
+-- @param	path Path
+-- @return	absolute path
+
+--- Remove a file or directory.
+-- @class function
+-- @name nixio.fs.remove
+-- @param	path Path
+-- @return	true
+
+--- Delete a name and - if no links are left - the associated file.
+-- @class function
+-- @name nixio.fs.unlink
+-- @param	path Path
+-- @return	true
+
+--- Renames a file or directory.
+-- @class function
+-- @name nixio.fs.rename
+-- @param	src	Source path
+-- @param 	dest Destination path
+-- @usage	It is normally not possible to rename files accross fileystems.
+-- @return	true
+
+--- Remove an empty directory.
+-- @class function
+-- @name nixio.fs.rmdir
+-- @param	path Path
+-- @return	true
+
+--- Create a new directory.
+-- @class function
+-- @name nixio.fs.mkdir
+-- @param	path Path
+-- @param	mode File mode (optional, see chmod and umask)
+-- @see	nixio.fs.chmod
+-- @see	nixio.umask
+-- @return	true
+
+--- Change the file mode.
+-- @class function
+-- @name	nixio.fs.chmod
+-- @usage	Windows only supports setting the write-protection through the
+-- "Writable to others" bit.
+-- @usage	<strong>Notice:</strong> The mode-flag for the functions
+-- open, mkdir, mkfifo are affected by the umask. 
+-- @param	path Path
+-- @param	mode File mode	
+-- [decimal mode number, "[-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]"]
+-- @see	nixio.umask
+-- @return true
+
+--- Iterate over the entries of a directory.
+-- @class function
+-- @name nixio.fs.dir
+-- @usage	The special entries "." and ".." are omitted.
+-- @param	path Path
+-- @return	directory iterator returning one entry per call
+
+--- Create a hard link.
+-- @class function
+-- @name nixio.fs.link
+-- @usage This function calls link() on POSIX and CreateHardLink() on Windows.
+-- @param	oldpath Path
+-- @param	newpath Path
+-- @return	true
+
+--- Change file last access and last modification time.
+-- @class function
+-- @name nixio.fs.utimes
+-- @param	path Path
+-- @param	actime Last access timestamp	(optional, default: current time)
+-- @param	mtime Last modification timestamp (optional, default: actime)
+-- @return	true
+
+--- Get file status and attributes.
+-- @class function
+-- @name nixio.fs.stat
+-- @param	path	Path
+-- @param	field	Only return a specific field, not the whole table (optional)
+-- @return	Table containing: <ul>
+-- <li>atime = Last access timestamp</li>
+-- <li>blksize = Blocksize (POSIX only)</li>
+-- <li>blocks = Blocks used (POSIX only)</li>
+-- <li>ctime = Creation timestamp</li>
+-- <li>dev = Device ID</li>
+-- <li>gid = Group ID</li>
+-- <li>ino = Inode</li>
+-- <li>modedec = Mode converted into a decimal number</li>
+-- <li>modestr = Mode as string as returned by `ls -l`</li>
+-- <li>mtime = Last modification timestamp</li>
+-- <li>nlink = Number of links</li>
+-- <li>rdev = Device ID (if special file)</li>
+-- <li>size = Size in bytes</li>
+-- <li>type = ["reg", "dir", "chr", "blk", "fifo", "lnk", "sock"]</li>
+-- <li>uid = User ID</li>
+-- </ul>
+
+--- Get file status and attributes and do not resolve if target is a symlink.
+-- @class function
+-- @name nixio.fs.lstat
+-- @param	path	Path
+-- @param	field	Only return a specific field, not the whole table (optional)
+-- @see	nixio.fs.stat
+-- @return Table containing attributes (see stat for a detailed description)
+
+--- (POSIX) Change owner and group of a file.
+-- @class function
+-- @name nixio.fs.chown
+-- @param	path	Path
+-- @param	user	User ID or Username		(optional)
+-- @param 	group	Group ID or Groupname	(optional)
+-- @return true
+
+--- (POSIX) Change owner and group of a file and do not resolve
+-- if target is a symlink.
+-- @class function
+-- @name nixio.fs.lchown
+-- @param	path	Path
+-- @param	user	User ID or Username		(optional)
+-- @param 	group	Group ID or Groupname	(optional)
+-- @return true
+
+--- (POSIX) Create a FIFO (named pipe).
+-- @class function
+-- @name nixio.fs.mkfifo
+-- @param	path Path
+-- @param	mode File mode (optional, see chmod and umask)
+-- @see	nixio.fs.chmod
+-- @see	nixio.umask
+-- @return	true
+
+--- (POSIX) Create a symbolic link.
+-- @class function
+-- @name nixio.fs.symlink
+-- @param	oldpath Path
+-- @param	newpath Path
+-- @return	true
+
+--- (POSIX) Read the target of a symbolic link.
+-- @class function
+-- @name nixio.fs.readlink
+-- @param	path Path
+-- @return	target path
+
+--- (POSIX) Find pathnames matching a pattern.
+-- @class function
+-- @name nixio.fs.glob
+-- @param	pattern Pattern
+-- @return	path iterator
+-- @return	number of matches
+
+--- (POSIX) Get filesystem statistics.
+-- @class function
+-- @name nixio.fs.statvfs
+-- @param	path Path to any file within the filesystem.
+-- @return	Table containing: <ul>
+-- <li>bavail = available blocks</li>
+-- <li>bfree = free blocks</li>
+-- <li>blocks = number of fragments</li>
+-- <li>frsize = fragment size</li>
+-- <li>favail = available inodes</li>
+-- <li>ffree = free inodes</li>
+-- <li>files = inodes</li>
+-- <li>flag = flags</li>
+-- <li>fsid = filesystem ID</li>
+-- <li>namemax = maximum filename length</li>
+-- </ul>
+
+--- Read the contents of a file into a buffer.
+-- @class function
+-- @name nixio.fs.readfile
+-- @param	path Path
+-- @param	limit	Maximum bytes to read (optional)
+-- @return	file contents
+
+--- Write a buffer into a file truncating the file first.
+-- @class function
+-- @name nixio.fs.writefile
+-- @param	path Path
+-- @param	data Data to write
+-- @return	true
+
+--- Copy data between files.
+-- @class function
+-- @name nixio.fs.datacopy
+-- @param	src	Source file path
+-- @param 	dest Destination file path
+-- @param	limit	Maximum bytes to copy (optional)
+-- @return	true
+
+--- Copy a file, directory or symlink non-recursively preserving file mode,
+-- timestamps, owner and group.
+-- @class function
+-- @name nixio.fs.copy
+-- @usage	The destination must always be a full destination path e.g. do not
+-- omit the basename even if source and destination basename are equal. 
+-- @param	src	Source path
+-- @param 	dest Destination path
+-- @return	true
+
+--- Rename a file, directory or symlink non-recursively across filesystems.
+-- @class function
+-- @name nixio.fs.move
+-- @usage	The destination must always be a full destination path e.g. do not
+-- omit the basename even if source and destination basename are equal. 
+-- @param	src	Source path
+-- @param 	dest Destination path
+-- @return	true
+
+--- Create a directory and all needed parent directories recursively. 
+-- @class function
+-- @name nixio.fs.mkdirr
+-- @param 	dest Destination path
+-- @param	mode File mode (optional, see chmod and umask)
+-- @see	nixio.fs.chmod
+-- @see	nixio.umask
+-- @return	true
+
+--- Rename a file, directory or symlink recursively across filesystems.
+-- @class function
+-- @name nixio.fs.mover
+-- @usage	The destination must always be a full destination path e.g. do not
+-- omit the basename even if source and destination basename are equal. 
+-- @param	src	Source path
+-- @param 	dest Destination path
+-- @return	true
+
+--- Copy a file, directory or symlink recursively preserving file mode,
+-- timestamps, owner and group.
+-- @class function
+-- @name nixio.fs.copyr
+-- @usage	The destination must always be a full destination path e.g. do not
+-- omit the basename even if source and destination basename are equal. 
+-- @param	src	Source path
+-- @param 	dest Destination path
+-- @return	true
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/docsrc/nixio.lua b/trunk/package/luci/libs/nixio/docsrc/nixio.lua
new file mode 100644
index 00000000..1b434d76
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/docsrc/nixio.lua
@@ -0,0 +1,467 @@
+--- General POSIX IO library.
+module "nixio"
+
+--- Look up a hostname and service via DNS.
+-- @class function
+-- @name nixio.getaddrinfo
+-- @param host		hostname to lookup	(optional)
+-- @param family 	address family [<strong>"any"</strong>, "inet", "inet6"]  
+-- @param service	service name or port (optional)
+-- @return			Table containing one or more tables containing: <ul>
+-- <li>family = ["inet", "inet6"]</li>
+-- <li>socktype = ["stream", "dgram", "raw"]</li>
+-- <li>address = Resolved IP-Address</li>
+-- <li>port = Resolved Port (if service was given)</li>
+-- </ul>
+
+--- Reverse look up an IP-Address via DNS.
+-- @class function
+-- @name nixio.getnameinfo
+-- @param ipaddr	IPv4 or IPv6-Address
+-- @return	FQDN
+
+--- (Linux, BSD) Get a list of available network interfaces and their addresses.
+-- @class function
+-- @name nixio.getifaddrs
+-- @return			Table containing one or more tables containing: <ul>
+-- <li>name = Interface Name</li>
+-- <li>family = ["inet", "inet6", "packet"]</li>
+-- <li>addr = Interface Address (IPv4, IPv6, MAC, ...)</li>
+-- <li>broadaddr = Broadcast Address</li>
+-- <li>dstaddr = Destination Address (Point-to-Point)</li>
+-- <li>netmask = Netmask (if available)</li>
+-- <li>prefix = Prefix (if available)</li>
+-- <li>flags = Table of interface flags (up, multicast, loopback, ...)</li>
+-- <li>data = Statistics (Linux, "packet"-family)</li>
+-- <li>hatype = Hardware Type Identifier (Linix, "packet"-family)</li>
+-- <li>ifindex = Interface Index (Linux, "packet"-family)</li>
+-- </ul>
+
+--- Get protocol entry by name.
+-- @usage This function returns nil if the given protocol is unknown.
+-- @class function
+-- @name nixio.getprotobyname
+-- @param name		protocol name to lookup
+-- @return			Table containing the following fields: <ul>
+-- <li>name = Protocol Name</li>
+-- <li>proto = Protocol Number</li>
+-- <li>aliases = Table of alias names</li>
+-- </ul>
+
+--- Get protocol entry by number.
+-- @usage This function returns nil if the given protocol is unknown.
+-- @class function
+-- @name nixio.getprotobynumber
+-- @param proto		protocol number to lookup
+-- @return			Table containing the following fields: <ul>
+-- <li>name = Protocol Name</li>
+-- <li>proto = Protocol Number</li>
+-- <li>aliases = Table of alias names</li>
+-- </ul>
+
+--- Get all or a specifc proto entry.
+-- @class function
+-- @name nixio.getproto
+-- @param proto		protocol number or name to lookup (optional)
+-- @return			Table (or if no parameter is given, a table of tables)
+--                  containing the following fields: <ul>
+-- <li>name = Protocol Name</li>
+-- <li>proto = Protocol Number</li>
+-- <li>aliases = Table of alias names</li>
+-- </ul>
+
+--- Create a new socket and bind it to a network address.
+-- This function is a shortcut for calling nixio.socket and then bind()
+-- on the socket object.
+-- @usage This functions calls getaddrinfo(), socket(),
+-- setsockopt() and bind() but NOT listen().
+-- @usage The <em>reuseaddr</em>-option is automatically set before binding.
+-- @class function
+-- @name nixio.bind
+-- @param host	Hostname or IP-Address (optional, default: all addresses)
+-- @param port	Port or service description
+-- @param family Address family [<strong>"any"</strong>, "inet", "inet6"]
+-- @param socktype Socket Type [<strong>"stream"</strong>, "dgram"]
+-- @return	Socket Object
+
+--- Create a new socket and connect to a network address.
+-- This function is a shortcut for calling nixio.socket and then connect()
+-- on the socket object.
+-- @usage This functions calls getaddrinfo(), socket() and connect().
+-- @class function
+-- @name nixio.connect
+-- @param host	Hostname or IP-Address (optional, default: localhost)
+-- @param port	Port or service description
+-- @param family Address family [<strong>"any"</strong>, "inet", "inet6"]
+-- @param socktype Socket Type [<strong>"stream"</strong>, "dgram"]
+-- @return	Socket Object
+
+--- Open a file.
+-- @class function
+-- @name nixio.open
+-- @usage Although this function also supports the traditional fopen() 
+-- file flags it does not create a file stream but uses the open() syscall.
+-- @param path	Filesystem path to open
+-- @param flags	Flag string or number (see open_flags).
+-- [<strong>"r"</strong>, "r+", "w", "w+", "a", "a+"]
+-- @param  mode	File mode for newly created files (see chmod, umask).
+-- @see	nixio.umask
+-- @see nixio.open_flags
+-- @return	File Object
+
+--- Generate flags for a call to open().
+-- @class function
+-- @name nixio.open_flags
+-- @usage This function cannot fail and will never return nil.
+-- @usage The "nonblock" and "ndelay" flags are aliases.
+-- @usage The "nonblock", "ndelay" and "sync" flags are no-ops on Windows.
+-- @param flag1 First Flag ["append", "creat", "excl", "nonblock", "ndelay",
+-- "sync", "trunc", "rdonly", "wronly", "rdwr"]
+-- @param ...	More Flags [-"-]
+-- @return flag to be used as second paramter to open
+
+--- Duplicate a file descriptor.
+-- @class function
+-- @name nixio.dup
+-- @usage This funcation calls dup2() if <em>newfd</em> is set, otherwise dup().
+-- @param oldfd	Old descriptor [File Object, Socket Object (POSIX only)]
+-- @param newfd New descriptor to serve as copy (optional)
+-- @return	File Object of new descriptor
+
+--- Create a pipe.
+-- @class function
+-- @name nixio.pipe
+-- @return	File Object of the read end
+-- @return	File Object of the write end
+
+--- Get the last system error code.
+-- @class function
+-- @name nixio.errno
+-- @return	Error code
+
+--- Get the error message for the corresponding error code.
+-- @class function
+-- @name nixio.strerror
+-- @param errno System error code
+-- @return	Error message
+
+--- Sleep for a specified amount of time.
+-- @class function
+-- @usage Not all systems support nanosecond precision but you can expect
+-- to have at least maillisecond precision.
+-- @usage This function is not signal-protected and may fail with EINTR.
+-- @param seconds Seconds to wait (optional)
+-- @param nanoseconds Nanoseconds to wait (optional)
+-- @name nixio.nanosleep
+-- @return true
+
+--- Generate events-bitfield or parse revents-bitfield for poll.
+-- @class function
+-- @name nixio.poll_flags
+-- @param	mode1	revents-Flag bitfield returned from poll to parse OR 
+-- ["in", "out", "err", "pri" (POSIX), "hup" (POSIX), "nval" (POSIX)]
+-- @param	...		More mode strings for generating the flag [-"-]
+-- @see nixio.poll
+-- @return table with boolean fields reflecting the mode parameter 
+-- <strong>OR</strong> bitfield to use for the events-Flag field
+
+--- Wait for some event on a file descriptor.
+-- poll() sets the revents-field of the tables provided by fds to a bitfield
+-- indicating the events that occured.
+-- @class function
+-- @usage This function works in-place on the provided table and only
+-- writes the revents field, you can use other fields on your demand.
+-- @usage All metamethods on the tables provided as fds are ignored.
+-- @usage The revents-fields are not reset when the call times out.
+-- You have to check the first return value to be 0 to handle this case.
+-- @usage If you want to wait on a TLS-Socket you have to use the underlying
+-- socket instead.
+-- @usage On Windows poll is emulated through select(), can only be used
+-- on socket descriptors and cannot take more than 64 descriptors per call.
+-- @usage This function is not signal-protected and may fail with EINTR.
+-- @param fds	Table containing one or more tables containing <ul>
+-- <li> fd = I/O Descriptor [Socket Object, File Object (POSIX)]</li>
+-- <li> events = events to wait for (bitfield generated with poll_flags)</li>
+-- </ul>
+-- @param timeout Timeout in milliseconds
+-- @name nixio.poll
+-- @see nixio.poll_flags
+-- @return number of ready IO descriptors
+-- @return the fds-table with revents-fields set
+
+--- (POSIX) Clone the current process.
+-- @class function
+-- @name nixio.fork
+-- @return	the child process id for the parent process, 0 for the child process
+
+--- (POSIX) Send a signal to one or more processes.
+-- @class function
+-- @name nixio.kill
+-- @param	target	Target process of process group.
+-- @param	signal	Signal to send
+-- @return	true
+
+--- (POSIX) Get the parent process id of the current process.
+-- @class function
+-- @name nixio.getppid
+-- @return	parent process id
+
+--- (POSIX) Get the user id of the current process.
+-- @class function
+-- @name nixio.getuid
+-- @return	process user id
+
+--- (POSIX) Get the group id of the current process.
+-- @class function
+-- @name nixio.getgid
+-- @return	process group id
+
+--- (POSIX) Set the group id of the current process.
+-- @class function
+-- @name nixio.setgid
+-- @param gid New Group ID
+-- @return	true
+
+--- (POSIX) Set the user id of the current process.
+-- @class function
+-- @name nixio.setuid
+-- @param gid New User ID
+-- @return	true
+
+--- (POSIX) Change priority of current process.
+-- @class function
+-- @name nixio.nice
+-- @param nice Nice Value
+-- @return	true
+
+--- (POSIX) Create a new session and set the process group ID.
+-- @class function
+-- @name nixio.setsid
+-- @return	session id
+
+--- (POSIX) Wait for a process to change state.
+-- @class function
+-- @name nixio.waitpid
+-- @usage	If the "nohang" is given this function becomes non-blocking.
+-- @param pid Process ID	(optional, default: any childprocess)
+-- @param flag1 Flag	(optional) ["nohang", "untraced", "continued"]
+-- @param ...	More Flags [-"-]
+-- @return	process id of child or 0 if no child has changed state
+-- @return  ["exited", "signaled", "stopped"]
+-- @return  [exit code, terminate signal, stop signal]
+
+--- (POSIX) Get process times.
+-- @class function
+-- @name nixio.times
+-- @return Table containing: <ul>
+-- <li>utime = user time</li>
+-- <li>utime = system time</li>
+-- <li>cutime = children user time</li>
+-- <li>cstime = children system time</li>
+-- </ul>
+
+--- (POSIX) Get information about current system and kernel.
+-- @class function
+-- @name nixio.uname
+-- @return Table containing: <ul>
+-- <li>sysname = operating system</li>
+-- <li>nodename = network name (usually hostname)</li>
+-- <li>release = OS release</li>
+-- <li>version = OS version</li>
+-- <li>machine = hardware identifier</li>
+-- </ul>
+
+--- Change the working directory.
+-- @class function
+-- @name nixio.chdir
+-- @param	path New working directory
+-- @return true
+
+--- Ignore or use set the default handler for a signal.
+-- @class function
+-- @name nixio.signal
+-- @param signal	Signal
+-- @param handler	["ign", "dfl"]
+-- @return true
+
+--- Get the ID of the current process.
+-- @class function
+-- @name nixio.getpid
+-- @return process id
+
+--- Get the current working directory.
+-- @class function
+-- @name nixio.getcwd
+-- @return workign directory
+
+--- Get the current environment table or a specific environment variable.
+-- @class function
+-- @name nixio.getenv
+-- @param variable Variable (optional)
+-- @return environment table or single environment variable
+
+--- Set or unset a environment variable.
+-- @class function
+-- @name nixio.setenv
+-- @usage The environment variable will be unset if value is ommited.
+-- @param variable	Variable
+-- @param value		Value (optional)
+-- @return true
+
+--- Execute a file to replace the current process.
+-- @class function
+-- @name nixio.exec
+-- @usage The name of the executable is automatically passed as argv[0]
+-- @usage This function does not return on success.
+-- @param executable Executable
+-- @param ... Parameters
+
+--- Invoke the shell and execute a file to replace the current process.
+-- @class function
+-- @name nixio.execp
+-- @usage The name of the executable is automatically passed as argv[0]
+-- @usage This function does not return on success.
+-- @param executable Executable
+-- @param ... Parameters
+
+--- Execute a file with a custom environment to replace the current process.
+-- @class function
+-- @name nixio.exece
+-- @usage The name of the executable is automatically passed as argv[0]
+-- @usage This function does not return on success.
+-- @param executable Executable
+-- @param arguments Argument Table
+-- @param environment Environment Table (optional)
+
+--- Sets the file mode creation mask.
+-- @class function
+-- @name nixio.umask
+-- @param mask	New creation mask (see chmod for format specifications)
+-- @return the old umask as decimal mode number
+-- @return the old umask as mode string
+
+--- (Linux) Get overall system statistics.
+-- @class function
+-- @name nixio.sysinfo
+-- @return Table containing: <ul>
+-- <li>uptime = system uptime in seconds</li>
+-- <li>loads = {loadavg1, loadavg5, loadavg15}</li>
+-- <li>totalram = total RAM</li>
+-- <li>freeram = free RAM</li>
+-- <li>sharedram = shared RAM</li>
+-- <li>bufferram = buffered RAM</li>
+-- <li>totalswap = total SWAP</li>
+-- <li>freeswap = free SWAP</li>
+-- <li>procs = number of running processes</li>
+-- </ul>
+
+--- Create a new socket.
+-- @class function
+-- @name nixio.socket
+-- @param domain	Domain ["inet", "inet6", "unix"]
+-- @param type		Type   ["stream", "dgram", "raw"]
+-- @return	Socket Object
+
+--- (POSIX) Send data from a file to a socket in kernel-space.
+-- @class function
+-- @name nixio.sendfile
+-- @param socket Socket Object
+-- @param file	 File Object
+-- @param length Amount of data to send (in Bytes).
+-- @return bytes sent
+
+--- (Linux) Send data from / to a pipe in kernel-space.
+-- @class function
+-- @name nixio.splice
+-- @param fdin	Input I/O descriptor 
+-- @param fdout	Output I/O descriptor
+-- @param length Amount of data to send (in Bytes).
+-- @param flags (optional, bitfield generated by splice_flags)
+-- @see nixio.splice_flags
+-- @return bytes sent
+
+--- (Linux) Generate a flag bitfield for a call to splice.
+-- @class function
+-- @name nixio.splice_flags
+-- @param flag1	First Flag	["move", "nonblock", "more"]
+-- @param ...	More flags	[-"-]
+-- @see nixio.splice
+-- @return Flag bitfield
+
+--- (POSIX) Open a connection to the system logger.
+-- @class function
+-- @name nixio.openlog
+-- @param ident	Identifier
+-- @param flag1	Flag 1 ["cons", "nowait", "pid", "perror", "ndelay", "odelay"]
+-- @param ...	More flags [-"-]
+
+--- (POSIX) Close the connection to the system logger.
+-- @class function
+-- @name nixio.closelog
+
+--- (POSIX) Write a message to the system logger.
+-- @class function
+-- @name nixio.syslog
+-- @param priority Priority ["emerg", "alert", "crit", "err", "warning",
+-- "notice", "info", "debug"]
+-- @param message
+
+--- (POSIX) Set the logmask of the system logger for current process.
+-- @class function
+-- @name nixio.setlogmask
+-- @param priority Priority ["emerg", "alert", "crit", "err", "warning",
+-- "notice", "info", "debug"]
+
+--- (POSIX) Encrypt a user password.
+-- @class function
+-- @name nixio.crypt
+-- @param key Key
+-- @param salt Salt
+-- @return password hash
+
+--- (POSIX) Get all or a specific user group.
+-- @class function
+-- @name nixio.getgr
+-- @param group Group ID or groupname (optional)
+-- @return Table containing: <ul>
+-- <li>name = Group Name</li>
+-- <li>gid = Group ID</li>
+-- <li>passwd = Password</li>
+-- <li>mem = {Member #1, Member #2, ...}</li>
+-- </ul>
+
+--- (POSIX) Get all or a specific user account.
+-- @class function
+-- @name nixio.getpw
+-- @param user User ID or username (optional)
+-- @return Table containing: <ul>
+-- <li>name = Name</li>
+-- <li>uid = ID</li>
+-- <li>gid = Group ID</li>
+-- <li>passwd = Password</li>
+-- <li>dir = Home directory</li>
+-- <li>gecos = Information</li>
+-- <li>shell = Shell</li>
+-- </ul>
+
+--- (Linux, Solaris) Get all or a specific shadow password entry.
+-- @class function
+-- @name nixio.getsp
+-- @param user username (optional)
+-- @return Table containing: <ul>
+-- <li>namp = Name</li>
+-- <li>expire = Expiration Date</li>
+-- <li>flag = Flags</li>
+-- <li>inact = Inactivity Date</li>
+-- <li>lstchg = Last change</li>
+-- <li>max = Maximum</li>
+-- <li>min = Minimum</li>
+-- <li>warn = Warning</li>
+-- <li>pwdp = Password Hash</li>
+-- </ul>
+
+--- Create a new TLS context.
+-- @class function
+-- @name nixio.tls
+-- @param mode TLS-Mode ["client", "server"]
+-- @return TLSContext Object
diff --git a/trunk/package/luci/libs/nixio/lua/bit.lua b/trunk/package/luci/libs/nixio/lua/bit.lua
new file mode 100644
index 00000000..cdfecb1a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/lua/bit.lua
@@ -0,0 +1,15 @@
+--[[
+nixio - Linux I/O library for lua
+
+Copyright 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+return require "nixio".bit
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/lua/nixio/fs.lua b/trunk/package/luci/libs/nixio/lua/nixio/fs.lua
new file mode 100644
index 00000000..8883835f
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/lua/nixio/fs.lua
@@ -0,0 +1,175 @@
+--[[
+nixio - Linux I/O library for lua
+
+Copyright 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local table = require "table"
+local nixio = require "nixio"
+local type, ipairs, setmetatable = type, ipairs, setmetatable
+require "nixio.util"
+
+
+module ("nixio.fs", function(m) setmetatable(m, {__index = nixio.fs}) end)
+
+
+function readfile(path, limit)
+	local fd, code, msg = nixio.open(path, "r")
+	local data
+	if not fd then
+		return nil, code, msg
+	end
+	
+	data, code, msg = fd:readall(limit)
+	
+	fd:close()
+	return data, code, msg
+end
+
+
+function writefile(path, data)
+	local fd, code, msg, stat = nixio.open(path, "w")
+	if not fd then
+		return nil, code, msg
+	end
+	
+	stat, code, msg = fd:writeall(data)
+	
+	fd:close()
+	return stat, code, msg
+end
+
+function datacopy(src, dest, size)
+	local fdin, code, msg = nixio.open(src, "r")
+	if not fdin then
+		return nil, code, msg
+	end
+	
+	local fdout, code, msg = nixio.open(dest, "w")
+	if not fdout then
+		return nil, code, msg
+	end	
+	
+	local stat, code, msg, sent = fdin:copy(fdout, size)
+	fdin:close()
+	fdout:close()
+
+	return stat, code, msg, sent
+end
+
+function copy(src, dest)
+	local stat, code, msg, res = nixio.fs.lstat(src)
+	if not stat then
+		return nil, code, msg
+	end
+	
+	if stat.type == "dir" then
+		if nixio.fs.stat(dest, type) ~= "dir" then
+			res, code, msg = nixio.fs.mkdir(dest)
+		else
+			stat = true
+		end
+	elseif stat.type == "lnk" then
+		res, code, msg = nixio.fs.symlink(nixio.fs.readlink(src), dest)
+	elseif stat.type == "reg" then
+		res, code, msg = datacopy(src, dest)
+	end
+	
+	if not res then
+		return nil, code, msg
+	end
+	
+	nixio.fs.utimes(dest, stat.atime, stat.mtime)
+	
+	if nixio.fs.lchown then
+		nixio.fs.lchown(dest, stat.uid, stat.gid)
+	end
+	
+	if stat.type ~= "lnk" then
+		nixio.fs.chmod(dest, stat.modedec)
+	end
+	
+	return true
+end
+
+function move(src, dest)
+	local stat, code, msg = nixio.fs.rename(src, dest)
+	if not stat and code == nixio.const.EXDEV then
+		stat, code, msg = copy(src, dest)
+		if stat then
+			stat, code, msg = nixio.fs.unlink(src)
+		end
+	end
+	return stat, code, msg
+end
+
+function mkdirr(dest, mode)
+	if nixio.fs.stat(dest, "type") == "dir" then
+		return true
+	else
+		local stat, code, msg = nixio.fs.mkdir(dest, mode)
+		if not stat and code == nixio.const.ENOENT then
+			stat, code, msg = mkdirr(nixio.fs.dirname(dest), mode)
+			if stat then
+				stat, code, msg = nixio.fs.mkdir(dest, mode)
+			end
+		end
+		return stat, code, msg
+	end
+end
+
+local function _recurse(cb, src, dest)
+	local type = nixio.fs.lstat(src, "type")
+	if type ~= "dir" then
+		return cb(src, dest)
+	else
+		local stat, se, code, msg, s, c, m = true, nixio.const.sep
+		if dest then
+			s, c, m = cb(src, dest)
+			stat, code, msg = stat and s, c or code, m or msg
+		end
+
+		for e in nixio.fs.dir(src) do
+			if dest then
+				s, c, m = _recurse(cb, src .. se .. e, dest .. se .. e)
+			else
+				s, c, m = _recurse(cb, src .. se .. e)
+			end
+			stat, code, msg = stat and s, c or code, m or msg
+		end
+
+		if not dest then							-- Postfix
+			s, c, m = cb(src)
+			stat, code, msg = stat and s, c or code, m or msg
+		end
+
+		return stat, code, msg
+	end
+end
+
+function copyr(src, dest)
+	return _recurse(copy, src, dest)
+end
+
+function mover(src, dest)
+	local stat, code, msg = nixio.fs.rename(src, dest)
+	if not stat and code == nixio.const.EXDEV then
+		stat, code, msg = _recurse(copy, src, dest)
+		if stat then
+			stat, code, msg = _recurse(nixio.fs.remove, src)
+		end
+	end
+	return stat, code, msg
+end
+
+function remover(src)
+	return _recurse(nixio.fs.remove, src)
+end
\ No newline at end of file
diff --git a/trunk/package/luci/libs/nixio/lua/nixio/util.lua b/trunk/package/luci/libs/nixio/lua/nixio/util.lua
new file mode 100644
index 00000000..63d2f621
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/lua/nixio/util.lua
@@ -0,0 +1,270 @@
+--[[
+nixio - Linux I/O library for lua
+
+Copyright 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local table = require "table"
+local nixio = require "nixio"
+local getmetatable, assert, pairs, type = getmetatable, assert, pairs, type
+local tostring = tostring
+
+module "nixio.util"
+
+local BUFFERSIZE = nixio.const.buffersize
+local ZIOBLKSIZE = 65536
+local socket = nixio.meta_socket
+local tls_socket = nixio.meta_tls_socket
+local file = nixio.meta_file
+local uname = nixio.uname()
+local ZBUG = uname.sysname == "Linux" and uname.release:sub(1, 3) == "2.4"
+
+function consume(iter, append)
+	local tbl = append or {}
+	if iter then
+		for obj in iter do
+			tbl[#tbl+1] = obj
+		end
+	end
+	return tbl
+end
+
+local meta = {}
+
+function meta.is_socket(self)
+	return (getmetatable(self) == socket)
+end
+
+function meta.is_tls_socket(self)
+	return (getmetatable(self) == tls_socket)
+end
+
+function meta.is_file(self)
+	return (getmetatable(self) == file)
+end
+
+function meta.readall(self, len)
+	local block, code, msg = self:read(len or BUFFERSIZE)
+
+	if not block then
+		return nil, code, msg, ""
+	elseif #block == 0 then
+		return "", nil, nil, ""
+	end
+
+	local data, total = {block}, #block
+
+	while not len or len > total do
+		block, code, msg = self:read(len and (len - total) or BUFFERSIZE)
+
+		if not block then
+			return nil, code, msg, table.concat(data)
+		elseif #block == 0 then
+			break
+		end
+
+		data[#data+1], total = block, total + #block
+	end
+
+	local data = #data > 1 and table.concat(data) or data[1]
+	return data, nil, nil, data
+end
+meta.recvall = meta.readall
+
+function meta.writeall(self, data)
+	data = tostring(data)
+	local sent, code, msg = self:write(data)
+
+	if not sent then
+		return nil, code, msg, 0
+	end
+
+	local total = sent 
+
+	while total < #data do
+		sent, code, msg = self:write(data, total)
+
+		if not sent then
+			return nil, code, msg, total
+		end
+
+		total = total + sent
+	end
+	
+	return total, nil, nil, total
+end
+meta.sendall = meta.writeall
+
+function meta.linesource(self, limit)
+	limit = limit or BUFFERSIZE
+	local buffer = ""
+	local bpos = 0
+	return function(flush)
+		local line, endp, _
+		
+		if flush then
+			line = buffer:sub(bpos + 1)
+			buffer = type(flush) == "string" and flush or ""
+			bpos = 0
+			return line
+		end
+
+		while not line do
+			_, endp, line = buffer:find("(.-)\r?\n", bpos + 1)
+			if line then
+				bpos = endp
+				return line
+			elseif #buffer < limit + bpos then
+				local newblock, code, msg = self:read(limit + bpos - #buffer)
+				if not newblock then
+					return nil, code, msg
+				elseif #newblock == 0 then
+					return nil
+				end
+				buffer = buffer:sub(bpos + 1) .. newblock
+				bpos = 0
+			else
+				return nil, 0
+			end
+		end
+	end
+end
+
+function meta.blocksource(self, bs, limit)
+	bs = bs or BUFFERSIZE
+	return function()
+		local toread = bs
+		if limit then
+			if limit < 1 then
+				return nil
+			elseif limit < toread then
+				toread = limit
+			end
+		end
+
+		local block, code, msg = self:read(toread)
+
+		if not block then
+			return nil, code, msg
+		elseif #block == 0 then
+			return nil
+		else
+			if limit then
+				limit = limit - #block
+			end
+
+			return block
+		end
+	end
+end
+
+function meta.sink(self, close)
+	return function(chunk, src_err)
+		if not chunk and not src_err and close then
+			if self.shutdown then
+				self:shutdown()
+			end
+			self:close()
+		elseif chunk and #chunk > 0 then
+			return self:writeall(chunk)
+		end
+		return true
+	end
+end
+
+function meta.copy(self, fdout, size)
+	local source = self:blocksource(nil, size)
+	local sink = fdout:sink()
+	local sent, chunk, code, msg = 0
+	
+	repeat
+		chunk, code, msg = source()
+		sink(chunk, code, msg)
+		sent = chunk and (sent + #chunk) or sent
+	until not chunk
+	return not code and sent or nil, code, msg, sent
+end
+
+function meta.copyz(self, fd, size)
+	local sent, lsent, code, msg = 0
+	local splicable
+
+	if not ZBUG and self:is_file() then
+		local ftype = self:stat("type")
+		if nixio.sendfile and fd:is_socket() and ftype == "reg" then
+			repeat
+				lsent, code, msg = nixio.sendfile(fd, self, size or ZIOBLKSIZE)
+				if lsent then
+					sent = sent + lsent
+					size = size and (size - lsent)
+				end
+			until (not lsent or lsent == 0 or (size and size == 0))
+			if lsent or (not lsent and sent == 0 and
+			 code ~= nixio.const.ENOSYS and code ~= nixio.const.EINVAL) then
+				return lsent and sent, code, msg, sent
+			end
+		elseif nixio.splice and not fd:is_tls_socket() and ftype == "fifo" then 
+			splicable = true
+		end
+	end
+
+	if nixio.splice and fd:is_file() and not splicable then
+		splicable = not self:is_tls_socket() and fd:stat("type") == "fifo"
+	end
+
+	if splicable then
+		repeat
+			lsent, code, msg = nixio.splice(self, fd, size or ZIOBLKSIZE)
+			if lsent then
+				sent = sent + lsent
+				size = size and (size - lsent)
+			end
+		until (not lsent or lsent == 0 or (size and size == 0))
+		if lsent or (not lsent and sent == 0 and
+		 code ~= nixio.const.ENOSYS and code ~= nixio.const.EINVAL) then
+			return lsent and sent, code, msg, sent
+		end		
+	end
+
+	return self:copy(fd, size)
+end
+
+if tls_socket then
+	function tls_socket.close(self)
+		return self.socket:close()
+	end
+
+	function tls_socket.getsockname(self)
+		return self.socket:getsockname()
+	end
+
+	function tls_socket.getpeername(self)
+		return self.socket:getpeername()
+	end
+
+	function tls_socket.getsockopt(self, ...)
+		return self.socket:getsockopt(...)
+	end
+	tls_socket.getopt = tls_socket.getsockopt
+
+	function tls_socket.setsockopt(self, ...)
+		return self.socket:setsockopt(...)
+	end
+	tls_socket.setopt = tls_socket.setsockopt
+end
+
+for k, v in pairs(meta) do
+	file[k] = v
+	socket[k] = v
+	if tls_socket then
+		tls_socket[k] = v
+	end
+end
diff --git a/trunk/package/luci/libs/nixio/nixio-0.3-1.rockspec b/trunk/package/luci/libs/nixio/nixio-0.3-1.rockspec
new file mode 100644
index 00000000..755cf815
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/nixio-0.3-1.rockspec
@@ -0,0 +1,37 @@
+package = "nixio"
+version = "0.3-1"
+source = {
+   url = "http://dev.luci.freifunk-halle.net/nixio/nixio-0.3.tar.bz2"
+}
+description = {
+   summary = "System, Networking and I/O library for Lua",
+   detailed = [[
+      Nixio is a multi-platform library offering a wide variety
+      of features such as IPv4, IPv6 and UNIX networking, large file I/O, file
+      system operations, system and process control, POSIX user/group management,
+      basic cryptographical hashing, hmac and TLS support, bit operations and
+      binary conversion.
+   ]],
+   homepage = "http://luci.subsignal.org",
+   license = "Apache 2.0",
+   maintainer = "Steven Barth",
+}
+dependencies = {
+   "lua >= 5.1"
+}
+external_dependencies = {
+   OPENSSL = {
+      header = "openssl/ssl.h",
+   }
+}
+build = {
+   type = "make",
+   build_variables = {
+      NIXIO_LDFLAGS = "-lcrypt -L$(OPENSSL_LIBDIR) -I$(OPENSSL_INCDIR)",
+      LUA_CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)",
+   },
+   install_variables = {
+      LUA_MODULEDIR = "$(LUADIR)",
+      LUA_LIBRARYDIR = "$(LIBDIR)",
+   },
+}
diff --git a/trunk/package/luci/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh b/trunk/package/luci/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
new file mode 100644
index 00000000..77399b98
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
@@ -0,0 +1,16 @@
+add_luci_conffiles()
+{
+	local filelist="$1"
+
+	# save ssl certs
+	if [ -d /etc/nixio ]; then
+		find /etc/nixio -type f >> $filelist
+	fi
+
+	# save uhttpd certs
+	[ -f "/etc/uhttpd.key" ] && echo /etc/uhttpd.key >> $filelist
+	[ -f "/etc/uhttpd.crt" ] && echo /etc/uhttpd.crt >> $filelist
+}
+
+sysupgrade_init_conffiles="$sysupgrade_init_conffiles add_luci_conffiles"
+
diff --git a/trunk/package/luci/libs/nixio/src/address.c b/trunk/package/luci/libs/nixio/src/address.c
new file mode 100644
index 00000000..4fd557d6
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/address.c
@@ -0,0 +1,565 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <sys/types.h>
+#include <sys/param.h>
+#include <errno.h>
+#include <string.h>
+
+#ifdef __linux__
+
+#include <signal.h>
+#include <setjmp.h>
+#include <unistd.h>
+
+/* setjmp() / longjmp() stuff */
+static jmp_buf nixio__jump_alarm;
+static void nixio__handle_alarm(int sig) { longjmp(nixio__jump_alarm, 1); }
+
+#include <linux/netdevice.h>
+
+/* struct net_device_stats is buggy on amd64, redefine it */
+struct nixio__nds {
+     uint32_t rx_packets;
+     uint32_t tx_packets;
+     uint32_t rx_bytes;
+     uint32_t tx_bytes;
+     uint32_t rx_errors;
+     uint32_t tx_errors;
+     uint32_t rx_dropped;
+     uint32_t tx_dropped;
+     uint32_t multicast;
+     uint32_t collisions;
+
+     uint32_t rx_length_errors;
+     uint32_t rx_over_errors;
+     uint32_t rx_crc_errors;
+     uint32_t rx_frame_errors;
+     uint32_t rx_fifo_errors;
+     uint32_t rx_missed_errors;
+
+     uint32_t tx_aborted_errors;
+     uint32_t tx_carrier_errors;
+     uint32_t tx_fifo_errors;
+     uint32_t tx_heartbeat_errors;
+     uint32_t tx_window_errors;
+
+     uint32_t rx_compressed;
+     uint32_t tx_compressed;
+};
+#endif
+
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+
+/**
+ * address pushing helper
+ */
+int nixio__addr_parse(nixio_addr *addr, struct sockaddr *saddr) {
+	void *baddr;
+
+	addr->family = saddr->sa_family;
+	if (saddr->sa_family == AF_INET) {
+		struct sockaddr_in *inetaddr = (struct sockaddr_in*)saddr;
+		addr->port = ntohs(inetaddr->sin_port);
+		baddr = &inetaddr->sin_addr;
+	} else if (saddr->sa_family == AF_INET6) {
+		struct sockaddr_in6 *inet6addr = (struct sockaddr_in6*)saddr;
+		addr->port = ntohs(inet6addr->sin6_port);
+		baddr = &inet6addr->sin6_addr;
+#ifdef AF_PACKET
+	} else if (saddr->sa_family == AF_PACKET) {
+		struct sockaddr_ll *etheradddr = (struct sockaddr_ll*)saddr;
+		addr->prefix = etheradddr->sll_hatype;
+		addr->port = etheradddr->sll_ifindex;
+		char *c = addr->host;
+		for (size_t i = 0; i < etheradddr->sll_halen; i++) {
+			*c++ = nixio__bin2hex[(etheradddr->sll_addr[i] & 0xf0) >> 4];
+			*c++ = nixio__bin2hex[(etheradddr->sll_addr[i] & 0x0f)];
+			*c++ = ':';
+		}
+		*(c-1) = 0;
+		return 0;
+#endif
+	} else {
+		errno = EAFNOSUPPORT;
+		return -1;
+	}
+
+	if (!inet_ntop(saddr->sa_family, baddr, addr->host, sizeof(addr->host))) {
+		return -1;
+	}
+
+	return 0;
+}
+
+/**
+ * address pulling helper
+ */
+int nixio__addr_write(nixio_addr *addr, struct sockaddr *saddr) {
+	if (addr->family == AF_UNSPEC) {
+		if (strchr(addr->host, ':')) {
+			addr->family = AF_INET6;
+		} else {
+			addr->family = AF_INET;
+		}
+	}
+	if (addr->family == AF_INET) {
+		struct sockaddr_in *inetaddr = (struct sockaddr_in *)saddr;
+		memset(inetaddr, 0, sizeof(struct sockaddr_in));
+
+		if (inet_pton(AF_INET, addr->host, &inetaddr->sin_addr) < 1) {
+			return -1;
+		}
+
+		inetaddr->sin_family = AF_INET;
+		inetaddr->sin_port = htons((uint16_t)addr->port);
+		return 0;
+	} else if (addr->family == AF_INET6) {
+		struct sockaddr_in6 *inet6addr = (struct sockaddr_in6 *)saddr;
+		memset(inet6addr, 0, sizeof(struct sockaddr_in6));
+
+		if (inet_pton(AF_INET6, addr->host, &inet6addr->sin6_addr) < 1) {
+			return -1;
+		}
+
+		inet6addr->sin6_family = AF_INET6;
+		inet6addr->sin6_port = htons((uint16_t)addr->port);
+		return 0;
+	} else {
+		errno = EAFNOSUPPORT;
+		return -1;
+	}
+}
+
+/**
+ * netmask to prefix helper
+ */
+int nixio__addr_prefix(struct sockaddr *saddr) {
+	int prefix = 0;
+	size_t len;
+	uint8_t *addr;
+
+	if (saddr->sa_family == AF_INET) {
+		addr = (uint8_t*)(&((struct sockaddr_in*)saddr)->sin_addr);
+		len = 4;
+	} else if (saddr->sa_family == AF_INET6) {
+		addr = (uint8_t*)(&((struct sockaddr_in6*)saddr)->sin6_addr);
+		len = 16;
+	} else {
+		errno = EAFNOSUPPORT;
+		return -1;
+	}
+
+	for (size_t i = 0; i < len; i++) {
+		if (addr[i] == 0xff) {
+			prefix += 8;
+		} else if (addr[i] == 0x00) {
+			break;
+		} else {
+			for (uint8_t c = addr[i]; c; c <<= 1) {
+				prefix++;
+			}
+		}
+	}
+
+	return prefix;
+}
+
+/**
+ * getaddrinfo(host, family, port)
+ */
+static int nixio_getaddrinfo(lua_State *L) {
+	const char *host = NULL;
+	if (!lua_isnoneornil(L, 1)) {
+		host = luaL_checklstring(L, 1, NULL);
+	}
+	const char *family = luaL_optlstring(L, 2, "any", NULL);
+	const char *port = lua_tolstring(L, 3, NULL);
+
+	struct addrinfo hints, *result, *rp;
+	memset(&hints, 0, sizeof(hints));
+
+	if (!strcmp(family, "any")) {
+		hints.ai_family = AF_UNSPEC;
+	} else if (!strcmp(family, "inet")) {
+		hints.ai_family = AF_INET;
+	} else if (!strcmp(family, "inet6")) {
+		hints.ai_family = AF_INET6;
+	} else {
+		return luaL_argerror(L, 2, "supported values: any, inet, inet6");
+	}
+
+	hints.ai_socktype = 0;
+	hints.ai_protocol = 0;
+
+	int aistat = getaddrinfo(host, port, &hints, &result);
+	if (aistat) {
+		lua_pushnil(L);
+		lua_pushinteger(L, aistat);
+		lua_pushstring(L, gai_strerror(aistat));
+		return 3;
+	}
+
+	/* create socket object */
+	lua_newtable(L);
+	int i = 1;
+
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		/* avoid duplicate results */
+#ifndef __WINNT__
+		if (!port && rp->ai_socktype != SOCK_STREAM) {
+			continue;
+		}
+#endif
+
+		if (rp->ai_family == AF_INET || rp->ai_family == AF_INET6) {
+			lua_createtable(L, 0, port ? 4 : 2);
+			if (rp->ai_family == AF_INET) {
+				lua_pushliteral(L, "inet");
+			} else if (rp->ai_family == AF_INET6) {
+				lua_pushliteral(L, "inet6");
+			}
+			lua_setfield(L, -2, "family");
+
+			if (port) {
+				switch (rp->ai_socktype) {
+					case SOCK_STREAM:
+						lua_pushliteral(L, "stream");
+						break;
+					case SOCK_DGRAM:
+						lua_pushliteral(L, "dgram");
+						break;
+					case SOCK_RAW:
+						lua_pushliteral(L, "raw");
+						break;
+					default:
+						lua_pushnil(L);
+						break;
+				}
+				lua_setfield(L, -2, "socktype");
+			}
+
+			nixio_addr addr;
+			if (nixio__addr_parse(&addr, rp->ai_addr)) {
+				freeaddrinfo(result);
+				return nixio__perror_s(L);
+			}
+
+			if (port) {
+				lua_pushinteger(L, addr.port);
+				lua_setfield(L, -2, "port");
+			}
+
+			lua_pushstring(L, addr.host);
+			lua_setfield(L, -2, "address");
+			lua_rawseti(L, -2, i++);
+		}
+	}
+
+	freeaddrinfo(result);
+
+	return 1;
+}
+
+/**
+ * getnameinfo(address, family[, timeout])
+ */
+static int nixio_getnameinfo(lua_State *L) {
+	const char *ip = luaL_checkstring(L, 1);
+	const char *family = luaL_optstring(L, 2, NULL);
+
+#ifdef __linux__
+	struct sigaction sa_new, sa_old;
+	int timeout = luaL_optnumber(L, 3, 0);
+	if (timeout > 0 && timeout < 1000)
+	{
+		sa_new.sa_handler = nixio__handle_alarm;
+		sa_new.sa_flags   = 0;
+		sigemptyset(&sa_new.sa_mask);
+		sigaction(SIGALRM, &sa_new, &sa_old);
+
+		/* user timeout exceeded */
+		if (setjmp(nixio__jump_alarm))
+		{
+			sigaction(SIGALRM, &sa_old, NULL);
+
+			lua_pushnil(L);
+			lua_pushinteger(L, EAI_AGAIN);
+			lua_pushstring(L, gai_strerror(EAI_AGAIN));
+
+			return 3;
+		}
+
+		ualarm(timeout * 1000, 0);
+	}
+#endif
+
+	char host[NI_MAXHOST];
+
+	struct sockaddr_storage saddr;
+	nixio_addr addr;
+	memset(&addr, 0, sizeof(addr));
+	strncpy(addr.host, ip, sizeof(addr.host) - 1);
+
+	if (!family) {
+		addr.family = AF_UNSPEC;
+	} else if (!strcmp(family, "inet")) {
+		addr.family = AF_INET;
+	} else if (!strcmp(family, "inet6")) {
+		addr.family = AF_INET6;
+	} else {
+		return luaL_argerror(L, 2, "supported values: inet, inet6");
+	}
+
+	nixio__addr_write(&addr, (struct sockaddr *)&saddr);
+
+	int res = getnameinfo((struct sockaddr *)&saddr, sizeof(saddr),
+	 host, sizeof(host), NULL, 0, NI_NAMEREQD);
+
+#ifdef __linux__
+	if (timeout > 0 && timeout < 1000)
+	{
+		ualarm(0, 0);
+		sigaction(SIGALRM, &sa_old, NULL);
+	}
+#endif
+
+	if (res) {
+		lua_pushnil(L);
+		lua_pushinteger(L, res);
+		lua_pushstring(L, gai_strerror(res));
+		return 3;
+	} else {
+		lua_pushstring(L, host);
+		return 1;
+	}
+}
+
+/**
+ * getsockname()
+ */
+static int nixio_sock_getsockname(lua_State *L) {
+	int sockfd = nixio__checksockfd(L);
+	struct sockaddr_storage saddr;
+	socklen_t addrlen = sizeof(saddr);
+	nixio_addr addr;
+
+	if (getsockname(sockfd, (struct sockaddr*)&saddr, &addrlen) ||
+	 nixio__addr_parse(&addr, (struct sockaddr*)&saddr)) {
+		return nixio__perror_s(L);
+	}
+
+	lua_pushstring(L, addr.host);
+	lua_pushinteger(L, addr.port);
+	return 2;
+}
+
+/**
+ * getpeername()
+ */
+static int nixio_sock_getpeername(lua_State *L) {
+	int sockfd = nixio__checksockfd(L);
+	struct sockaddr_storage saddr;
+	socklen_t addrlen = sizeof(saddr);
+	nixio_addr addr;
+
+	if (getpeername(sockfd, (struct sockaddr*)&saddr, &addrlen) ||
+	 nixio__addr_parse(&addr, (struct sockaddr*)&saddr)) {
+		return nixio__perror_s(L);
+	}
+
+	lua_pushstring(L, addr.host);
+	lua_pushinteger(L, addr.port);
+	return 2;
+}
+
+#if defined(__linux__) || defined(BSD)
+#ifdef BSD
+#include <net/if.h>
+#endif
+#include <ifaddrs.h>
+
+static int nixio_getifaddrs(lua_State *L) {
+	nixio_addr addr;
+	struct ifaddrs *ifaddr, *c;
+	if (getifaddrs(&ifaddr) == -1) {
+		return nixio__perror(L);
+	}
+
+	lua_newtable(L);
+	unsigned int i = 1;
+
+	for (c = ifaddr; c; c = c->ifa_next) {
+		lua_newtable(L);
+
+		lua_pushstring(L, c->ifa_name);
+		lua_setfield(L, -2, "name");
+
+		lua_createtable(L, 0, 7);
+			lua_pushboolean(L, c->ifa_flags & IFF_UP);
+			lua_setfield(L, -2, "up");
+
+			lua_pushboolean(L, c->ifa_flags & IFF_BROADCAST);
+			lua_setfield(L, -2, "broadcast");
+
+			lua_pushboolean(L, c->ifa_flags & IFF_LOOPBACK);
+			lua_setfield(L, -2, "loopback");
+
+			lua_pushboolean(L, c->ifa_flags & IFF_POINTOPOINT);
+			lua_setfield(L, -2, "pointtopoint");
+
+			lua_pushboolean(L, c->ifa_flags & IFF_NOARP);
+			lua_setfield(L, -2, "noarp");
+
+			lua_pushboolean(L, c->ifa_flags & IFF_PROMISC);
+			lua_setfield(L, -2, "promisc");
+
+			lua_pushboolean(L, c->ifa_flags & IFF_MULTICAST);
+			lua_setfield(L, -2, "multicast");
+		lua_setfield(L, -2, "flags");
+
+		if (c->ifa_addr) {
+			if (!nixio__addr_parse(&addr, c->ifa_addr)) {
+				lua_pushstring(L, addr.host);
+				lua_setfield(L, -2, "addr");
+			}
+
+			if (c->ifa_addr->sa_family == AF_INET) {
+				lua_pushliteral(L, "inet");
+			} else if (c->ifa_addr->sa_family == AF_INET6) {
+				lua_pushliteral(L, "inet6");
+#ifdef AF_PACKET
+			} else if (c->ifa_addr->sa_family == AF_PACKET) {
+				lua_pushliteral(L, "packet");
+#endif
+			} else {
+				lua_pushliteral(L, "unknown");
+			}
+			lua_setfield(L, -2, "family");
+
+#ifdef __linux__
+			if (c->ifa_addr->sa_family == AF_PACKET) {
+				lua_pushinteger(L, addr.port);
+				lua_setfield(L, -2, "ifindex");
+
+				lua_pushinteger(L, addr.prefix);
+				lua_setfield(L, -2, "hatype");
+			}
+#endif
+		}
+
+#ifdef __linux__
+		if (c->ifa_data && (!c->ifa_addr
+							|| c->ifa_addr->sa_family == AF_PACKET)) {
+			if (!c->ifa_addr) {
+				lua_pushliteral(L, "packet");
+				lua_setfield(L, -2, "family");
+			}
+
+			lua_createtable(L, 0, 10);
+			struct nixio__nds *stats = c->ifa_data;
+
+			lua_pushnumber(L, stats->rx_packets);
+			lua_setfield(L, -2, "rx_packets");
+
+			lua_pushnumber(L, stats->tx_packets);
+			lua_setfield(L, -2, "tx_packets");
+
+			lua_pushnumber(L, stats->rx_bytes);
+			lua_setfield(L, -2, "rx_bytes");
+
+			lua_pushnumber(L, stats->tx_bytes);
+			lua_setfield(L, -2, "tx_bytes");
+
+			lua_pushnumber(L, stats->rx_errors);
+			lua_setfield(L, -2, "rx_errors");
+
+			lua_pushnumber(L, stats->tx_errors);
+			lua_setfield(L, -2, "tx_errors");
+
+			lua_pushnumber(L, stats->rx_dropped);
+			lua_setfield(L, -2, "rx_dropped");
+
+			lua_pushnumber(L, stats->tx_dropped);
+			lua_setfield(L, -2, "tx_dropped");
+
+			lua_pushnumber(L, stats->multicast);
+			lua_setfield(L, -2, "multicast");
+
+			lua_pushnumber(L, stats->collisions);
+			lua_setfield(L, -2, "collisions");
+		} else {
+			lua_newtable(L);
+		}
+		lua_setfield(L, -2, "data");
+#endif
+
+		if (c->ifa_netmask && !nixio__addr_parse(&addr, c->ifa_netmask)) {
+			lua_pushstring(L, addr.host);
+			lua_setfield(L, -2, "netmask");
+
+			lua_pushinteger(L, nixio__addr_prefix(c->ifa_netmask));
+			lua_setfield(L, -2, "prefix");
+		}
+
+		if (c->ifa_broadaddr && !nixio__addr_parse(&addr, c->ifa_broadaddr)) {
+			lua_pushstring(L, addr.host);
+			lua_setfield(L, -2, "broadaddr");
+		}
+
+		if (c->ifa_dstaddr && !nixio__addr_parse(&addr, c->ifa_dstaddr)) {
+			lua_pushstring(L, addr.host);
+			lua_setfield(L, -2, "dstaddr");
+		}
+
+		lua_rawseti(L, -2, i++);
+	}
+
+	freeifaddrs(ifaddr);
+	return 1;
+}
+#endif
+
+
+/* module table */
+static const luaL_reg R[] = {
+#if defined(__linux__) || defined(BSD)
+	{"getifaddrs",	nixio_getifaddrs},
+#endif
+	{"getaddrinfo",	nixio_getaddrinfo},
+	{"getnameinfo",	nixio_getnameinfo},
+	{NULL,			NULL}
+};
+
+/* object table */
+static const luaL_reg M[] = {
+	{"getsockname",	nixio_sock_getsockname},
+	{"getpeername",	nixio_sock_getpeername},
+	{NULL,			NULL}
+};
+
+void nixio_open_address(lua_State *L) {
+	luaL_register(L, NULL, R);
+
+	lua_pushvalue(L, -2);
+	luaL_register(L, NULL, M);
+	lua_pop(L, 1);
+}
diff --git a/trunk/package/luci/libs/nixio/src/axtls-compat.c b/trunk/package/luci/libs/nixio/src/axtls-compat.c
new file mode 100644
index 00000000..2c5b746c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/axtls-compat.c
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Enable a subset of openssl compatible functions. We don't aim to be 100%
+ * compatible - just to be able to do basic ports etc.
+ *
+ * Only really tested on mini_httpd, so I'm not too sure how extensive this
+ * port is.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include "ssl.h"
+
+static char *key_password = NULL;
+
+void *SSLv23_server_method(void) { return NULL; }
+void *SSLv3_server_method(void) { return NULL; }
+void *TLSv1_server_method(void) { return NULL; }
+void *SSLv23_client_method(void) { return NULL; }
+void *SSLv3_client_method(void) { return NULL; }
+void *TLSv1_client_method(void) { return NULL; }
+void *SSLv23_method(void) { return NULL; }
+void *TLSv1_method(void) { return NULL; }
+
+SSL_CTX * SSL_CTX_new(void *meth)
+{
+    SSL_CTX *ssl_ctx = ssl_ctx_new(SSL_SERVER_VERIFY_LATER, 5);
+    return ssl_ctx;
+}
+
+void SSL_CTX_free(SSL_CTX * ssl_ctx)
+{
+    ssl_ctx_free(ssl_ctx);
+}
+
+SSL * SSL_new(SSL_CTX *ssl_ctx)
+{
+    SSL *ssl;
+
+    ssl = ssl_new(ssl_ctx, -1);        /* fd is set later */
+
+    return ssl;
+}
+
+int SSL_set_fd(SSL *s, int fd)
+{
+    s->client_fd = fd;
+    return 1;   /* always succeeds */
+}
+
+int SSL_accept(SSL *ssl)
+{
+	ssl->next_state = HS_CLIENT_HELLO;
+    while (ssl_read(ssl, NULL) == SSL_OK)
+    {
+        if (ssl->next_state == HS_CLIENT_HELLO)
+            return 1;   /* we're done */
+    }
+
+    return -1;
+}
+
+int SSL_connect(SSL *ssl)
+{
+	SET_SSL_FLAG(SSL_IS_CLIENT);
+	int stat = do_client_connect(ssl);
+	ssl_display_error(stat);
+    return  (stat == SSL_OK) ? 1 : -1;
+}
+
+void SSL_free(SSL *ssl)
+{
+    ssl_free(ssl);
+}
+
+int SSL_read(SSL *ssl, void *buf, int num)
+{
+    uint8_t *read_buf;
+    int ret;
+
+    while ((ret = ssl_read(ssl, &read_buf)) == SSL_OK);
+
+    if (ret > SSL_OK)
+    {
+        memcpy(buf, read_buf, ret > num ? num : ret);
+    }
+
+    return ret;
+}
+
+int SSL_write(SSL *ssl, const void *buf, int num)
+{
+    return ssl_write(ssl, buf, num);
+}
+
+int SSL_CTX_use_certificate_file(SSL_CTX *ssl_ctx, const char *file, int type)
+{
+    return (ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, file, NULL) == SSL_OK);
+}
+
+int SSL_CTX_use_PrivateKey_file(SSL_CTX *ssl_ctx, const char *file, int type)
+{
+    return (ssl_obj_load(ssl_ctx, SSL_OBJ_RSA_KEY, file, key_password) == SSL_OK);
+}
+
+int SSL_CTX_use_certificate_ASN1(SSL_CTX *ssl_ctx, int len, const uint8_t *d)
+{
+    return (ssl_obj_memory_load(ssl_ctx,
+                        SSL_OBJ_X509_CERT, d, len, NULL) == SSL_OK);
+}
+
+int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
+                                            unsigned int sid_ctx_len)
+{
+    return 1;
+}
+
+int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
+{
+    return 1;
+}
+
+int SSL_CTX_use_certificate_chain_file(SSL_CTX *ssl_ctx, const char *file)
+{
+    return (ssl_obj_load(ssl_ctx,
+                        SSL_OBJ_X509_CERT, file, NULL) == SSL_OK);
+}
+
+int SSL_shutdown(SSL *ssl)
+{
+    return 1;
+}
+
+/*** get/set session ***/
+SSL_SESSION *SSL_get1_session(SSL *ssl)
+{
+    return (SSL_SESSION *)ssl_get_session_id(ssl); /* note: wrong cast */
+}
+
+int SSL_set_session(SSL *ssl, SSL_SESSION *session)
+{
+    memcpy(ssl->session_id, (uint8_t *)session, SSL_SESSION_ID_SIZE);
+    return 1;
+}
+
+void SSL_SESSION_free(SSL_SESSION *session) { }
+/*** end get/set session ***/
+
+long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
+{
+    return 0;
+}
+
+void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
+                                 int (*verify_callback)(int, void *)) {
+	if (mode & SSL_VERIFY_PEER) {
+		ctx->options &= ~SSL_SERVER_VERIFY_LATER;
+		ctx->options |= SSL_CLIENT_AUTHENTICATION;
+	} else {
+		ctx->options |= SSL_SERVER_VERIFY_LATER;
+		ctx->options &= ~SSL_CLIENT_AUTHENTICATION;
+	}
+}
+
+void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth) { }
+
+int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+                                           const char *CApath)
+{
+    return 1;
+}
+
+void *SSL_load_client_CA_file(const char *file)
+{
+    return (void *)file;
+}
+
+void SSL_CTX_set_client_CA_list(SSL_CTX *ssl_ctx, void *file)
+{
+
+    ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, (const char *)file, NULL);
+}
+
+void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, void *cb) { }
+
+void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u)
+{
+    key_password = (char *)u;
+}
+
+int SSL_peek(SSL *ssl, void *buf, int num)
+{
+    memcpy(buf, ssl->bm_data, num);
+    return num;
+}
+
+void SSL_set_bio(SSL *ssl, void *rbio, void *wbio) { }
+
+long SSL_get_verify_result(const SSL *ssl)
+{
+    return ssl_handshake_status(ssl);
+}
+
+int SSL_state(SSL *ssl)
+{
+    return 0x03; // ok state
+}
+
+/** end of could do better list */
+
+void *SSL_get_peer_certificate(const SSL *ssl)
+{
+    return &ssl->ssl_ctx->certs[0];
+}
+
+int SSL_clear(SSL *ssl)
+{
+    return 1;
+}
+
+
+int SSL_CTX_check_private_key(const SSL_CTX *ctx)
+{
+    return 1;
+}
+
+int SSL_CTX_set_cipher_list(SSL_CTX *s, const char *str)
+{
+    return 1;
+}
+
+int SSL_get_error(const SSL *ssl, int ret)
+{
+    ssl_display_error(ret);
+    return ret;   /* TODO: return proper return code */
+}
+
+void SSL_CTX_set_options(SSL_CTX *ssl_ctx, int option) {}
+int SSL_library_init(void ) { return 1; }
+void SSL_load_error_strings(void ) {}
+void ERR_print_errors_fp(FILE *fp) {}
+
+long SSL_CTX_get_timeout(const SSL_CTX *ssl_ctx) {
+                            return CONFIG_SSL_EXPIRY_TIME*3600; }
+long SSL_CTX_set_timeout(SSL_CTX *ssl_ctx, long t) {
+                            return SSL_CTX_get_timeout(ssl_ctx); }
+void BIO_printf(FILE *f, const char *format, ...)
+{
+    va_list(ap);
+    va_start(ap, format);
+    vfprintf(f, format, ap);
+    va_end(ap);
+}
+
+void* BIO_s_null(void) { return NULL; }
+FILE *BIO_new(bio_func_type_t func)
+{
+    if (func == BIO_s_null)
+        return fopen("/dev/null", "r");
+    else
+        return NULL;
+}
+
+FILE *BIO_new_fp(FILE *stream, int close_flag) { return stream; }
+int BIO_free(FILE *a) { if (a != stdout && a != stderr) fclose(a); return 1; }
diff --git a/trunk/package/luci/libs/nixio/src/axtls-compat.h b/trunk/package/luci/libs/nixio/src/axtls-compat.h
new file mode 100644
index 00000000..aee24f56
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/axtls-compat.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2007, Cameron Rich
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the axTLS project nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Enable a subset of openssl compatible functions. We don't aim to be 100%
+ * compatible - just to be able to do basic ports etc.
+ *
+ * Only really tested on mini_httpd, so I'm not too sure how extensive this
+ * port is.
+ */
+
+#include "nixio.h"
+#include "config.h"
+
+#define WITH_AXTLS						1
+#define WITHOUT_OPENSSL					1
+#define SSL_OP_NO_SSLv3					0x02000000L
+#define SSL_OP_NO_SSLv2					0x01000000L
+#define SSL_FILETYPE_PEM				1
+#define SSL_FILETYPE_ASN1				2
+#define SSL_VERIFY_NONE					0x00
+#define SSL_VERIFY_PEER					0x01
+#define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
+#define SSL_VERIFY_CLIENT_ONCE			0x03
+#define MD5_DIGEST_LENGTH				16
+#define SHA_DIGEST_LENGTH				20
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include "ssl.h"
+
+typedef SHA1_CTX SHA_CTX;
+
+void *SSLv23_server_method(void);
+void *SSLv3_server_method(void);
+void *TLSv1_server_method(void);
+void *SSLv23_client_method(void);
+void *SSLv3_client_method(void);
+void *TLSv1_client_method(void);
+void *SSLv23_method(void);
+void *TLSv1_method(void);
+
+
+typedef void * (*ssl_func_type_t)(void);
+typedef void * (*bio_func_type_t)(void);
+
+SSL_CTX * SSL_CTX_new(void *meth);
+void SSL_CTX_free(SSL_CTX * ssl_ctx);
+SSL * SSL_new(SSL_CTX *ssl_ctx);
+int SSL_set_fd(SSL *s, int fd);
+int SSL_accept(SSL *ssl);
+int SSL_connect(SSL *ssl);
+void SSL_free(SSL *ssl);
+int SSL_read(SSL *ssl, void *buf, int num);
+int SSL_write(SSL *ssl, const void *buf, int num);
+int SSL_CTX_use_certificate_file(SSL_CTX *ssl_ctx, const char *file, int type);
+int SSL_CTX_use_PrivateKey_file(SSL_CTX *ssl_ctx, const char *file, int type);
+int SSL_CTX_use_certificate_ASN1(SSL_CTX *ssl_ctx, int len, const uint8_t *d);
+int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
+                                            unsigned int sid_ctx_len);
+int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
+int SSL_CTX_use_certificate_chain_file(SSL_CTX *ssl_ctx, const char *file);
+int SSL_shutdown(SSL *ssl);
+
+/*** get/set session ***/
+SSL_SESSION *SSL_get1_session(SSL *ssl);
+int SSL_set_session(SSL *ssl, SSL_SESSION *session);
+void SSL_SESSION_free(SSL_SESSION *session);
+/*** end get/set session ***/
+
+long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
+void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
+                                 int (*verify_callback)(int, void *));
+
+void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth);
+
+int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
+                                           const char *CApath);
+
+void *SSL_load_client_CA_file(const char *file);
+
+void SSL_CTX_set_client_CA_list(SSL_CTX *ssl_ctx, void *file);
+
+void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, void *cb);
+
+void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
+
+int SSL_peek(SSL *ssl, void *buf, int num);
+
+void SSL_set_bio(SSL *ssl, void *rbio, void *wbio);
+
+long SSL_get_verify_result(const SSL *ssl);
+
+int SSL_state(SSL *ssl);
+
+/** end of could do better list */
+
+void *SSL_get_peer_certificate(const SSL *ssl);
+
+int SSL_clear(SSL *ssl);
+
+
+int SSL_CTX_check_private_key(const SSL_CTX *ctx);
+
+int SSL_CTX_set_cipher_list(SSL_CTX *s, const char *str);
+
+int SSL_get_error(const SSL *ssl, int ret);
+
+void SSL_CTX_set_options(SSL_CTX *ssl_ctx, int option);
+int SSL_library_init(void );
+void SSL_load_error_strings(void );
+void ERR_print_errors_fp(FILE *fp);
+
+long SSL_CTX_get_timeout(const SSL_CTX *ssl_ctx);
+long SSL_CTX_set_timeout(SSL_CTX *ssl_ctx, long t);
+void BIO_printf(FILE *f, const char *format, ...);
+
+void* BIO_s_null(void);
+FILE *BIO_new(bio_func_type_t func);
+
+FILE *BIO_new_fp(FILE *stream, int close_flag);
+int BIO_free(FILE *a);
diff --git a/trunk/package/luci/libs/nixio/src/binary.c b/trunk/package/luci/libs/nixio/src/binary.c
new file mode 100644
index 00000000..2c416222
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/binary.c
@@ -0,0 +1,313 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <stdlib.h>
+
+const char nixio__bin2hex[16] = {
+'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+};
+
+static unsigned char nixio__b64encode_tbl[] =
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+static unsigned char nixio__b64decode_tbl[] = {
+	0x3e, 0xff, 0xff, 0xff, 0x3f, 0x34, 0x35, 0x36,
+	0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0xff,
+	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x01,
+	0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
+	0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
+	0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1a, 0x1b,
+	0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
+	0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
+	0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33
+};
+
+static const uint32_t nixio__crc32_tbl[] = {
+	0x00000000U, 0x77073096U, 0xee0e612cU, 0x990951baU, 0x076dc419U,
+	0x706af48fU, 0xe963a535U, 0x9e6495a3U, 0x0edb8832U, 0x79dcb8a4U,
+	0xe0d5e91eU, 0x97d2d988U, 0x09b64c2bU, 0x7eb17cbdU, 0xe7b82d07U,
+	0x90bf1d91U, 0x1db71064U, 0x6ab020f2U, 0xf3b97148U, 0x84be41deU,
+	0x1adad47dU, 0x6ddde4ebU, 0xf4d4b551U, 0x83d385c7U, 0x136c9856U,
+	0x646ba8c0U, 0xfd62f97aU, 0x8a65c9ecU, 0x14015c4fU, 0x63066cd9U,
+	0xfa0f3d63U, 0x8d080df5U, 0x3b6e20c8U, 0x4c69105eU, 0xd56041e4U,
+	0xa2677172U, 0x3c03e4d1U, 0x4b04d447U, 0xd20d85fdU, 0xa50ab56bU,
+	0x35b5a8faU, 0x42b2986cU, 0xdbbbc9d6U, 0xacbcf940U, 0x32d86ce3U,
+	0x45df5c75U, 0xdcd60dcfU, 0xabd13d59U, 0x26d930acU, 0x51de003aU,
+	0xc8d75180U, 0xbfd06116U, 0x21b4f4b5U, 0x56b3c423U, 0xcfba9599U,
+	0xb8bda50fU, 0x2802b89eU, 0x5f058808U, 0xc60cd9b2U, 0xb10be924U,
+	0x2f6f7c87U, 0x58684c11U, 0xc1611dabU, 0xb6662d3dU, 0x76dc4190U,
+	0x01db7106U, 0x98d220bcU, 0xefd5102aU, 0x71b18589U, 0x06b6b51fU,
+	0x9fbfe4a5U, 0xe8b8d433U, 0x7807c9a2U, 0x0f00f934U, 0x9609a88eU,
+	0xe10e9818U, 0x7f6a0dbbU, 0x086d3d2dU, 0x91646c97U, 0xe6635c01U,
+	0x6b6b51f4U, 0x1c6c6162U, 0x856530d8U, 0xf262004eU, 0x6c0695edU,
+	0x1b01a57bU, 0x8208f4c1U, 0xf50fc457U, 0x65b0d9c6U, 0x12b7e950U,
+	0x8bbeb8eaU, 0xfcb9887cU, 0x62dd1ddfU, 0x15da2d49U, 0x8cd37cf3U,
+	0xfbd44c65U, 0x4db26158U, 0x3ab551ceU, 0xa3bc0074U, 0xd4bb30e2U,
+	0x4adfa541U, 0x3dd895d7U, 0xa4d1c46dU, 0xd3d6f4fbU, 0x4369e96aU,
+	0x346ed9fcU, 0xad678846U, 0xda60b8d0U, 0x44042d73U, 0x33031de5U,
+	0xaa0a4c5fU, 0xdd0d7cc9U, 0x5005713cU, 0x270241aaU, 0xbe0b1010U,
+	0xc90c2086U, 0x5768b525U, 0x206f85b3U, 0xb966d409U, 0xce61e49fU,
+	0x5edef90eU, 0x29d9c998U, 0xb0d09822U, 0xc7d7a8b4U, 0x59b33d17U,
+	0x2eb40d81U, 0xb7bd5c3bU, 0xc0ba6cadU, 0xedb88320U, 0x9abfb3b6U,
+	0x03b6e20cU, 0x74b1d29aU, 0xead54739U, 0x9dd277afU, 0x04db2615U,
+	0x73dc1683U, 0xe3630b12U, 0x94643b84U, 0x0d6d6a3eU, 0x7a6a5aa8U,
+	0xe40ecf0bU, 0x9309ff9dU, 0x0a00ae27U, 0x7d079eb1U, 0xf00f9344U,
+	0x8708a3d2U, 0x1e01f268U, 0x6906c2feU, 0xf762575dU, 0x806567cbU,
+	0x196c3671U, 0x6e6b06e7U, 0xfed41b76U, 0x89d32be0U, 0x10da7a5aU,
+	0x67dd4accU, 0xf9b9df6fU, 0x8ebeeff9U, 0x17b7be43U, 0x60b08ed5U,
+	0xd6d6a3e8U, 0xa1d1937eU, 0x38d8c2c4U, 0x4fdff252U, 0xd1bb67f1U,
+	0xa6bc5767U, 0x3fb506ddU, 0x48b2364bU, 0xd80d2bdaU, 0xaf0a1b4cU,
+	0x36034af6U, 0x41047a60U, 0xdf60efc3U, 0xa867df55U, 0x316e8eefU,
+	0x4669be79U, 0xcb61b38cU, 0xbc66831aU, 0x256fd2a0U, 0x5268e236U,
+	0xcc0c7795U, 0xbb0b4703U, 0x220216b9U, 0x5505262fU, 0xc5ba3bbeU,
+	0xb2bd0b28U, 0x2bb45a92U, 0x5cb36a04U, 0xc2d7ffa7U, 0xb5d0cf31U,
+	0x2cd99e8bU, 0x5bdeae1dU, 0x9b64c2b0U, 0xec63f226U, 0x756aa39cU,
+	0x026d930aU, 0x9c0906a9U, 0xeb0e363fU, 0x72076785U, 0x05005713U,
+	0x95bf4a82U, 0xe2b87a14U, 0x7bb12baeU, 0x0cb61b38U, 0x92d28e9bU,
+	0xe5d5be0dU, 0x7cdcefb7U, 0x0bdbdf21U, 0x86d3d2d4U, 0xf1d4e242U,
+	0x68ddb3f8U, 0x1fda836eU, 0x81be16cdU, 0xf6b9265bU, 0x6fb077e1U,
+	0x18b74777U, 0x88085ae6U, 0xff0f6a70U, 0x66063bcaU, 0x11010b5cU,
+	0x8f659effU, 0xf862ae69U, 0x616bffd3U, 0x166ccf45U, 0xa00ae278U,
+	0xd70dd2eeU, 0x4e048354U, 0x3903b3c2U, 0xa7672661U, 0xd06016f7U,
+	0x4969474dU, 0x3e6e77dbU, 0xaed16a4aU, 0xd9d65adcU, 0x40df0b66U,
+	0x37d83bf0U, 0xa9bcae53U, 0xdebb9ec5U, 0x47b2cf7fU, 0x30b5ffe9U,
+	0xbdbdf21cU, 0xcabac28aU, 0x53b39330U, 0x24b4a3a6U, 0xbad03605U,
+	0xcdd70693U, 0x54de5729U, 0x23d967bfU, 0xb3667a2eU, 0xc4614ab8U,
+	0x5d681b02U, 0x2a6f2b94U, 0xb40bbe37U, 0xc30c8ea1U, 0x5a05df1bU,
+	0x2d02ef8dU
+};
+
+static int nixio_bin_crc32(lua_State *L) {
+	size_t len;
+	const char *buffer = luaL_checklstring(L, 1, &len);
+	uint32_t value = luaL_optinteger(L, 2, 0);
+
+	value = ~value;
+	for (size_t i=0; i<len; i++) {
+		value = nixio__crc32_tbl[(value ^ buffer[i]) & 0xffU ] ^ (value >> 8);
+	}
+
+	lua_pushinteger(L, (int)(value ^ 0xffffffffU));
+	return 1;
+}
+
+static int nixio_bin_hexlify(lua_State *L) {
+	size_t len, lenout;
+	luaL_checktype(L, 1, LUA_TSTRING);
+	const unsigned char *data = (unsigned char*)lua_tolstring(L, 1, &len);
+
+	if (len == 0) {
+		lua_pushvalue(L, 1);
+		return 1;
+	}
+
+	lenout = len * 2;
+	luaL_argcheck(L, lenout > len, 1, "size overflow");
+
+	char *out = malloc(lenout);
+	if (!out) {
+		return luaL_error(L, NIXIO_OOM);
+	}
+
+	for (size_t i=0; i < len; i++) {
+		out[2*i]   = nixio__bin2hex[(data[i] & 0xf0) >> 4];
+		out[2*i+1] = nixio__bin2hex[(data[i] & 0x0f)];
+	}
+
+	lua_pushlstring(L, out, lenout);
+	free(out);
+
+	return 1;
+}
+
+
+static int nixio_bin_unhexlify(lua_State *L) {
+	size_t len, lenout;
+	const char *data = luaL_checklstring(L, 1, &len);
+
+	if (len == 0) {
+		lua_pushvalue(L, 1);
+		return 1;
+	} else if (len % 2) {
+		errno = EINVAL;
+		return nixio__perror(L);
+	}
+
+	lenout = len / 2;
+	char *out = malloc(lenout);
+	if (!out) {
+		return luaL_error(L, NIXIO_OOM);
+	}
+
+	for (size_t i=0; i < lenout; i++) {
+		char c = data[2*i];
+		if (c >= '0' && c <= '9') {
+			out[i] = (c - '0') << 4;
+		} else if (c >= 'a' && c <= 'f') {
+			out[i] = (c - 'a' + 10) << 4;
+		} else if (data[2*i] >= 'A' && c <= 'F') {
+			out[i] = (c - 'A' + 10) << 4;
+		} else {
+			free(out);
+			errno = EINVAL;
+			return nixio__perror(L);
+		}
+
+		c = data[2*i+1];
+		if (c >= '0' && c <= '9') {
+			out[i] += c - '0';
+		} else if (c >= 'a' && c <= 'f') {
+			out[i] += c - 'a' + 10;
+		} else if (c >= 'A' && c <= 'F') {
+			out[i] += c - 'A' + 10;
+		} else {
+			free(out);
+			errno = EINVAL;
+			return nixio__perror(L);
+		}
+	}
+
+	lua_pushlstring(L, out, lenout);
+	free(out);
+
+	return 1;
+}
+
+static int nixio_bin_b64encode(lua_State *L) {
+	size_t len, lenout, pad, i;
+	const uint8_t *data = (const uint8_t*)luaL_checklstring(L, 1, &len);
+
+	lenout = len / 3;
+	lenout *= 4;
+
+	pad = len % 3;
+
+	if (len == 0) {
+		lua_pushvalue(L, 1);
+		return 1;
+	} else if (pad) {
+		lenout += 4;
+	}
+
+	luaL_argcheck(L, lenout > len, 1, "size overflow");
+
+	char *out = malloc(lenout);
+	if (!out) {
+		return luaL_error(L, NIXIO_OOM);
+	}
+
+	uint8_t *o = (uint8_t*)out;
+	for (i = 0; i < len; i += 3) {
+		uint32_t cv = (data[i] << 16) | (data[i+1] << 8) | data[i+2];
+		*(o+3) = nixio__b64encode_tbl[ cv        & 0x3f];
+		*(o+2) = nixio__b64encode_tbl[(cv >> 6)  & 0x3f];
+		*(o+1) = nixio__b64encode_tbl[(cv >> 12) & 0x3f];
+		*o     = nixio__b64encode_tbl[(cv >> 18) & 0x3f];
+		o += 4;
+	}
+
+	if (pad) {
+		uint32_t cv = data[len-pad] << 16;
+		*(o-1) = '=';
+		*(o-2) = '=';
+		if (pad == 2) {
+			cv |= data[len-pad+1] << 8;
+			*(o-2) = nixio__b64encode_tbl[(cv >> 6) & 0x3f];
+		}
+		*(o-3) = nixio__b64encode_tbl[(cv >> 12) & 0x3f];
+		*(o-4) = nixio__b64encode_tbl[(cv >> 18) & 0x3f];
+	}
+
+	lua_pushlstring(L, out, lenout);
+	free(out);
+	return 1;
+}
+
+static int nixio_bin_b64decode(lua_State *L) {
+	size_t len, lenout, i;
+	const char *dt = luaL_checklstring(L, 1, &len);
+
+	if (len == 0) {
+		lua_pushvalue(L, 1);
+		return 1;
+	} else if (len % 4) {
+		errno = EINVAL;
+		return nixio__perror(L);
+	}
+
+	lenout = len / 4 * 3;
+
+	unsigned char *out = malloc(lenout);
+	if (!out) {
+		return luaL_error(L, NIXIO_OOM);
+	}
+
+	unsigned char *o = out;
+	for (i = 0; i < len; i += 4) {
+		uint32_t cv = 0;
+		for (int j = 0; j < 4; j++) {
+			unsigned char c = dt[i + j] - 43;
+			if (c > 79 || (c = nixio__b64decode_tbl[c]) == 0xff) {
+				free(out);
+				errno = EINVAL;
+				return nixio__perror(L);
+			}
+
+			cv |= c;
+			if (j != 3) {
+				cv <<= 6;
+			}
+		}
+
+		*(o+2) = (unsigned char)(cv & 0xff);
+		*(o+1) = (unsigned char)((cv >>  8) & 0xff);
+		*o     = (unsigned char)((cv >> 16) & 0xff);
+		o += 3;
+	}
+
+	if (dt[len-1] == '=') {
+		lenout--;
+	}
+
+	if (dt[len-2] == '=') {
+		lenout--;
+	}
+
+	lua_pushlstring(L, (char*)out, lenout);
+	free(out);
+	return 1;
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"hexlify",		nixio_bin_hexlify},
+	{"unhexlify",	nixio_bin_unhexlify},
+	{"crc32",		nixio_bin_crc32},
+	{"b64encode",	nixio_bin_b64encode},
+	{"b64decode",	nixio_bin_b64decode},
+	{NULL,			NULL}
+};
+
+
+void nixio_open_bin(lua_State *L) {
+	lua_newtable(L);
+	luaL_register(L, NULL, R);
+	lua_setfield(L, -2, "bin");
+}
diff --git a/trunk/package/luci/libs/nixio/src/bind.c b/trunk/package/luci/libs/nixio/src/bind.c
new file mode 100644
index 00000000..68e1df8a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/bind.c
@@ -0,0 +1,293 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <sys/types.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+
+/**
+ * connect()/bind() shortcut
+ */
+static int nixio__bind_connect(lua_State *L, int do_bind) {
+	const char *host = NULL;
+	if (!lua_isnoneornil(L, 1)) {
+		host = luaL_checklstring(L, 1, NULL);
+	}
+	const char *port = luaL_checklstring(L, 2, NULL);
+	const char *family = luaL_optlstring(L, 3, "any", NULL);
+	const char *socktype = luaL_optlstring(L, 4, "stream", NULL);
+
+	struct addrinfo hints, *result, *rp;
+	memset(&hints, 0, sizeof(hints));
+
+	if (!strcmp(family, "any")) {
+		hints.ai_family = AF_UNSPEC;
+	} else if (!strcmp(family, "inet")) {
+		hints.ai_family = AF_INET;
+	} else if (!strcmp(family, "inet6")) {
+		hints.ai_family = AF_INET6;
+	} else {
+		return luaL_argerror(L, 3, "supported values: any, inet, inet6");
+	}
+
+	if (!strcmp(socktype, "any")) {
+		hints.ai_socktype = 0;
+	} else if (!strcmp(socktype, "stream")) {
+		hints.ai_socktype = SOCK_STREAM;
+	} else if (!strcmp(socktype, "dgram")) {
+		hints.ai_socktype = SOCK_DGRAM;
+	} else {
+		return luaL_argerror(L, 4, "supported values: any, stream, dgram");
+	}
+
+	if (do_bind) {
+		hints.ai_flags |= AI_PASSIVE;
+	}
+
+	hints.ai_protocol = 0;
+
+	int aistat = getaddrinfo(host, port, &hints, &result);
+	if (aistat) {
+		lua_pushnil(L);
+		lua_pushinteger(L, aistat);
+		lua_pushstring(L, gai_strerror(aistat));
+		return 3;
+	}
+
+	/* create socket object */
+	nixio_sock *sock = lua_newuserdata(L, sizeof(nixio_sock));
+	int status = -1, clstat;
+
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		sock->fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+		if (sock->fd == -1) {
+			continue;
+		}
+
+		if (do_bind) {
+			int one = 1;
+			setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR,
+			 (char*)&one, sizeof(one));
+			status = bind(sock->fd, rp->ai_addr, rp->ai_addrlen);
+		} else {
+			do {
+				status = connect(sock->fd, rp->ai_addr, rp->ai_addrlen);
+			} while (status == -1 && errno == EINTR);
+		}
+
+		/* on success */
+		if (!status) {
+			sock->domain = rp->ai_family;
+			sock->type = rp->ai_socktype;
+			sock->protocol = rp->ai_protocol;
+			break;
+		}
+
+		do {
+#ifndef __WINNT__
+			clstat = close(sock->fd);
+#else
+			clstat = closesocket(sock->fd);
+#endif
+		} while (clstat == -1 && errno == EINTR);
+	}
+
+	freeaddrinfo(result);
+
+	/* on failure */
+	if (status) {
+		return nixio__perror_s(L);
+	}
+
+	luaL_getmetatable(L, NIXIO_META);
+	lua_setmetatable(L, -2);
+
+	return 1;
+}
+
+/**
+ * bind(host, port, [family=any], [type=any]) shortcut
+ */
+static int nixio_bind(lua_State *L) {
+	return nixio__bind_connect(L, 1);
+}
+
+/**
+ * connect(host, port, [family=any], [type=any]) shortcut
+ */
+static int nixio_connect(lua_State *L) {
+	return nixio__bind_connect(L, 0);
+}
+
+/**
+ * bind()/connect() helper
+ */
+static int nixio_sock__bind_connect(lua_State *L, int do_bind) {
+	nixio_sock *sock = nixio__checksock(L);
+	int status = -1;
+
+	if (sock->domain == AF_INET || sock->domain == AF_INET6) {
+		const char *host = NULL;
+		if (!lua_isnoneornil(L, 2)) {
+			host = luaL_checklstring(L, 2, NULL);
+		}
+		const char *port = luaL_checklstring(L, 3, NULL);
+
+		struct addrinfo hints, *result, *rp;
+
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = sock->domain;
+		hints.ai_socktype = sock->type;
+		hints.ai_protocol = sock->protocol;
+
+		if (do_bind) {
+			hints.ai_flags |= AI_PASSIVE;
+		}
+
+		int aistat = getaddrinfo(host, port, &hints, &result);
+		if (aistat) {
+			lua_pushnil(L);
+			lua_pushinteger(L, aistat);
+			lua_pushstring(L, gai_strerror(aistat));
+			return 3;
+		}
+
+		for (rp = result; rp != NULL; rp = rp->ai_next) {
+			if (do_bind) {
+				status = bind(sock->fd, rp->ai_addr, rp->ai_addrlen);
+			} else {
+				do {
+					status = connect(sock->fd, rp->ai_addr, rp->ai_addrlen);
+				} while (status == -1 && errno == EINTR);
+			}
+
+			/* on success */
+			if (!status || errno == EINPROGRESS) {
+				break;
+			}
+		}
+
+		freeaddrinfo(result);
+#ifndef __WINNT__
+	} else if (sock->domain == AF_UNIX) {
+		size_t pathlen;
+		const char *path = luaL_checklstring(L, 2, &pathlen);
+
+		struct sockaddr_un addr;
+		addr.sun_family = AF_UNIX;
+		luaL_argcheck(L, pathlen <= sizeof(addr.sun_path), 2, "out of range");
+		memcpy(addr.sun_path, path, pathlen);
+		socklen_t alen = sizeof(sa_family_t) + pathlen;
+
+		if (do_bind) {
+			status = bind(sock->fd, (struct sockaddr*)&addr, alen);
+		} else {
+			do {
+				status = connect(sock->fd, (struct sockaddr*)&addr, alen);
+			} while (status == -1 && errno == EINTR);
+		}
+#endif
+	} else {
+		return luaL_error(L, "not supported");
+	}
+	return nixio__pstatus_s(L, !status);
+}
+
+/**
+ * bind()
+ */
+static int nixio_sock_bind(lua_State *L) {
+	return nixio_sock__bind_connect(L, 1);
+}
+
+/**
+ * connect()
+ */
+static int nixio_sock_connect(lua_State *L) {
+	return nixio_sock__bind_connect(L, 0);
+}
+
+/**
+ * listen()
+ */
+static int nixio_sock_listen(lua_State *L) {
+	int sockfd = nixio__checksockfd(L);
+	int backlog = luaL_checkinteger(L, 2);
+	return nixio__pstatus_s(L, !listen(sockfd, backlog));
+}
+
+/**
+ * accept()
+ */
+static int nixio_sock_accept(lua_State *L) {
+	nixio_sock *sock = nixio__checksock(L);
+	struct sockaddr_storage saddr;
+	nixio_addr addr;
+	socklen_t saddrlen = sizeof(saddr);
+	int newfd;
+
+	do {
+		newfd = accept(sock->fd, (struct sockaddr *)&saddr, &saddrlen);
+	} while (newfd == -1 && errno == EINTR);
+	if (newfd < 0) {
+		return nixio__perror_s(L);
+	}
+
+	/* create userdata */
+	nixio_sock *clsock = lua_newuserdata(L, sizeof(nixio_sock));
+	luaL_getmetatable(L, NIXIO_META);
+	lua_setmetatable(L, -2);
+
+	memcpy(clsock, sock, sizeof(clsock));
+	clsock->fd = newfd;
+
+	if (!nixio__addr_parse(&addr, (struct sockaddr *)&saddr)) {
+		lua_pushstring(L, addr.host);
+		lua_pushinteger(L, addr.port);
+		return 3;
+	} else {
+		return 1;
+	}
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"bind",		nixio_bind},
+	{"connect",		nixio_connect},
+	{NULL,			NULL}
+};
+
+/* object table */
+static const luaL_reg M[] = {
+	{"bind",		nixio_sock_bind},
+	{"connect",		nixio_sock_connect},
+	{"listen",		nixio_sock_listen},
+	{"accept",		nixio_sock_accept},
+	{NULL,			NULL}
+};
+
+void nixio_open_bind(lua_State *L) {
+	luaL_register(L, NULL, R);
+
+	lua_pushvalue(L, -2);
+	luaL_register(L, NULL, M);
+	lua_pop(L, 1);
+}
diff --git a/trunk/package/luci/libs/nixio/src/bit.c b/trunk/package/luci/libs/nixio/src/bit.c
new file mode 100644
index 00000000..1b352c51
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/bit.c
@@ -0,0 +1,149 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <stdint.h>
+#include <stdlib.h>
+
+/* 52 bit maximum precision */
+#ifdef NIXIO_DOUBLE
+#define NIXIO_BIT_BMAX 52
+#define NIXIO_BIT_NMAX 0xfffffffffffff
+#else
+#define NIXIO_BIT_BMAX 32
+#define NIXIO_BIT_NMAX 0xffffffff
+#endif
+
+#define NIXIO_BIT_XOP(BIT_XOP)						\
+	uint64_t oper = nixio__checknumber(L, 1);		\
+	const int args = lua_gettop(L);					\
+													\
+	for (int i = 2; i <= args; i++) {				\
+		uint64_t oper2 = nixio__checknumber(L, i);	\
+		oper BIT_XOP oper2;							\
+	}												\
+													\
+	nixio__pushnumber(L, oper);						\
+	return 1;										\
+
+
+static int nixio_bit_or(lua_State *L) {
+	NIXIO_BIT_XOP(|=);
+}
+
+static int nixio_bit_and(lua_State *L) {
+	NIXIO_BIT_XOP(&=);
+}
+
+static int nixio_bit_xor(lua_State *L) {
+	NIXIO_BIT_XOP(^=);
+}
+
+static int nixio_bit_unset(lua_State *L) {
+	NIXIO_BIT_XOP(&= ~);
+}
+
+static int nixio_bit_not(lua_State *L) {
+	nixio__pushnumber(L,
+			(~((uint64_t)nixio__checknumber(L, 1))) & NIXIO_BIT_NMAX);
+	return 1;
+}
+
+static int nixio_bit_shl(lua_State *L) {
+	uint64_t oper = nixio__checknumber(L, 1);
+	oper <<= luaL_checkinteger(L, 2);
+	if (oper > NIXIO_BIT_NMAX) {
+		return luaL_error(L, "arithmetic overflow");
+	} else {
+		nixio__pushnumber(L, oper);
+		return 1;
+	}
+}
+
+static int nixio_bit_ashr(lua_State *L) {
+	int64_t oper = nixio__checknumber(L, 1);
+	nixio__pushnumber(L, oper >> luaL_checkinteger(L, 2));
+	return 1;
+}
+
+static int nixio_bit_shr(lua_State *L) {
+	uint64_t oper = nixio__checknumber(L, 1);
+	nixio__pushnumber(L, oper >> luaL_checkinteger(L, 2));
+	return 1;
+}
+
+static int nixio_bit_div(lua_State *L) {
+	uint64_t oper = luaL_checknumber(L, 1);
+	const int args = lua_gettop(L);
+
+	for (int i = 2; i <= args; i++) {
+		uint64_t oper2 = nixio__checknumber(L, i);
+		oper /= oper2;
+	}
+
+	nixio__pushnumber(L, oper);
+	return 1;
+}
+
+static int nixio_bit_check(lua_State *L) {
+	uint64_t oper  = nixio__checknumber(L, 1);
+	uint64_t oper2 = nixio__checknumber(L, 2);
+	lua_pushboolean(L, (oper & oper2) == oper2);
+	return 1;
+}
+
+static int nixio_bit_cast(lua_State *L) {
+	nixio__pushnumber(L, ((uint64_t)nixio__checknumber(L, 1)) & NIXIO_BIT_NMAX);
+	return 1;
+}
+
+static int nixio_bit_swap(lua_State *L) {
+	uint64_t op = nixio__checknumber(L, 1);
+	op = (op >> 24) | ((op >> 8) & 0xff00) | ((op & 0xff00) << 8) | (op << 24);
+	nixio__pushnumber(L, op);
+	return 1;
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"bor",			nixio_bit_or},
+	{"set",			nixio_bit_or},
+	{"band",		nixio_bit_and},
+	{"bxor",		nixio_bit_xor},
+	{"unset",		nixio_bit_unset},
+	{"bnot",		nixio_bit_not},
+	{"rshift",		nixio_bit_shr},
+	{"arshift",		nixio_bit_ashr},
+	{"lshift",		nixio_bit_shl},
+	{"div",			nixio_bit_div},
+	{"check",		nixio_bit_check},
+	{"cast",		nixio_bit_cast},
+	{"tobit",		nixio_bit_cast},
+	{"bswap",		nixio_bit_swap},
+	{NULL,			NULL}
+};
+
+void nixio_open_bit(lua_State *L) {
+	lua_newtable(L);
+	luaL_register(L, NULL, R);
+	nixio__pushnumber(L, NIXIO_BIT_BMAX);
+	lua_setfield(L, -2, "bits");
+	nixio__pushnumber(L, NIXIO_BIT_NMAX);
+	lua_setfield(L, -2, "max");
+	lua_setfield(L, -2, "bit");
+}
diff --git a/trunk/package/luci/libs/nixio/src/cyassl-compat.c b/trunk/package/luci/libs/nixio/src/cyassl-compat.c
new file mode 100644
index 00000000..a483119a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/cyassl-compat.c
@@ -0,0 +1,31 @@
+#include "cyassl-compat.h"
+
+int MD5_Init(MD5_CTX *md5) {
+	InitMd5(md5);
+	return 1;
+}
+
+int MD5_Update(MD5_CTX *md5, void *input, unsigned long sz) {
+	Md5Update(md5, input, (word32)sz);
+	return 1;
+}
+
+int MD5_Final(void *input, MD5_CTX *md5) {
+	Md5Final(md5, input);
+	return 1;
+}
+
+int SHA1_Init(SHA_CTX *sha) {
+	InitSha(sha);
+	return 1;
+}
+
+int SHA1_Update(SHA_CTX *sha, void *input, unsigned long sz) {
+	ShaUpdate(sha, input, (word32)sz);
+	return 1;
+}
+
+int SHA1_Final(void *input, SHA_CTX *sha) {
+	ShaFinal(sha, input);
+	return 1;
+}
diff --git a/trunk/package/luci/libs/nixio/src/cyassl-compat.h b/trunk/package/luci/libs/nixio/src/cyassl-compat.h
new file mode 100644
index 00000000..b2cdc923
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/cyassl-compat.h
@@ -0,0 +1,32 @@
+#define WITH_CYASSL
+#define WITHOUT_OPENSSL
+#include <openssl/ssl.h>
+
+typedef unsigned int word32;
+
+
+#define MD5_DIGEST_LENGTH 16
+typedef struct MD5_CTX {
+    int dummy[24];
+} MD5_CTX;
+
+void InitMd5(MD5_CTX*);
+void Md5Update(MD5_CTX*, void*, word32);
+void Md5Final(MD5_CTX*, void*);
+
+
+#define SHA_DIGEST_LENGTH 20
+typedef struct SHA_CTX {
+    int dummy[24];
+} SHA_CTX;
+
+void InitSha(SHA_CTX*);
+void ShaUpdate(SHA_CTX*, void*, word32);
+void ShaFinal(SHA_CTX*, void*);
+
+int MD5_Init(MD5_CTX *md5);
+int MD5_Update(MD5_CTX *md5, void *input, unsigned long sz);
+int MD5_Final(void *input, MD5_CTX *md5);
+int SHA1_Init(SHA_CTX *md5);
+int SHA1_Update(SHA_CTX *sha, void *input, unsigned long sz);
+int SHA1_Final(void *input, SHA_CTX *sha);
diff --git a/trunk/package/luci/libs/nixio/src/file.c b/trunk/package/luci/libs/nixio/src/file.c
new file mode 100644
index 00000000..b86e040e
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/file.c
@@ -0,0 +1,402 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+
+
+static int nixio_open(lua_State *L) {
+	const char *filename = luaL_checklstring(L, 1, NULL);
+	int flags;
+
+	if (lua_isnoneornil(L, 2)) {
+		flags = O_RDONLY;
+	} else if (lua_isnumber(L, 2)) {
+		flags = lua_tointeger(L, 2);
+	} else if (lua_isstring(L, 2)) {
+		const char *str = lua_tostring(L, 2);
+		if (!strcmp(str, "r")) {
+			flags = O_RDONLY;
+		} else if (!strcmp(str, "r+")) {
+			flags = O_RDWR;
+		} else if (!strcmp(str, "w")) {
+			flags = O_WRONLY | O_CREAT | O_TRUNC;
+		} else if (!strcmp(str, "w+")) {
+			flags = O_RDWR | O_CREAT | O_TRUNC;
+		} else if (!strcmp(str, "a")) {
+			flags = O_WRONLY | O_CREAT | O_APPEND;
+		} else if (!strcmp(str, "a+")) {
+			flags = O_RDWR | O_CREAT | O_APPEND;
+		} else {
+			return luaL_argerror(L, 2, "supported values: r, r+, w, w+, a, a+");
+		}
+	} else {
+		return luaL_argerror(L, 2, "open flags or string expected");
+	}
+
+	int fd;
+
+	do {
+		fd = open(filename, flags, nixio__check_mode(L, 3, 0666));
+	} while (fd == -1 && errno == EINTR);
+	if (fd == -1) {
+		return nixio__perror(L);
+	}
+
+	int *udata = lua_newuserdata(L, sizeof(int));
+	if (!udata) {
+		return luaL_error(L, "out of memory");
+	}
+
+	*udata = fd;
+
+	luaL_getmetatable(L, NIXIO_FILE_META);
+	lua_setmetatable(L, -2);
+
+	return 1;
+}
+
+static int nixio_open_flags(lua_State *L) {
+	int mode = 0;
+	const int j = lua_gettop(L);
+	for (int i=1; i<=j; i++) {
+		const char *flag = luaL_checkstring(L, i);
+		if (!strcmp(flag, "append")) {
+			mode |= O_APPEND;
+		} else if (!strcmp(flag, "creat")) {
+			mode |= O_CREAT;
+		} else if (!strcmp(flag, "excl")) {
+			mode |= O_EXCL;
+		} else if (!strcmp(flag, "nonblock") || !strcmp(flag, "ndelay")) {
+#ifndef __WINNT__
+			mode |= O_NONBLOCK;
+#endif
+		} else if (!strcmp(flag, "sync")) {
+#ifndef __WINNT__
+			mode |= O_SYNC;
+#endif
+		} else if (!strcmp(flag, "trunc")) {
+			mode |= O_TRUNC;
+		} else if (!strcmp(flag, "rdonly")) {
+			mode |= O_RDONLY;
+		} else if (!strcmp(flag, "wronly")) {
+			mode |= O_WRONLY;
+		} else if (!strcmp(flag, "rdwr")) {
+			mode |= O_RDWR;
+		} else {
+			return luaL_argerror(L, i, "supported values: append, creat, "
+					"excl, nonblock, ndelay, sync, trunc");
+		}
+	}
+	lua_pushinteger(L, mode);
+	return 1;
+}
+
+static int nixio_dup(lua_State *L) {
+	int oldfd = nixio__checkfd(L, 1);
+	int newfd = (lua_gettop(L) > 1) ? nixio__checkfd(L, 2) : -1;
+	int stat  = (newfd == -1) ? dup(oldfd) : dup2(oldfd, newfd);
+
+	if (stat == -1) {
+		return nixio__perror(L);
+	} else {
+		if (newfd == -1) {
+			int *udata = lua_newuserdata(L, sizeof(int));
+			if (!udata) {
+				return luaL_error(L, "out of memory");
+			}
+
+			*udata = stat;
+			luaL_getmetatable(L, NIXIO_FILE_META);
+			lua_setmetatable(L, -2);
+		} else {
+			lua_pushvalue(L, 2);
+		}
+		return 1;
+	}
+}
+
+static int nixio_pipe(lua_State *L) {
+	int pipefd[2], *udata;
+	if (pipe(pipefd)) {
+		return nixio__perror(L);
+	}
+
+	luaL_getmetatable(L, NIXIO_FILE_META);
+	udata = lua_newuserdata(L, sizeof(int));
+	if (!udata) {
+		return luaL_error(L, "out of memory");
+	}
+
+	*udata = pipefd[0];
+	lua_pushvalue(L, -2);
+	lua_setmetatable(L, -2);
+
+
+	udata = lua_newuserdata(L, sizeof(int));
+	if (!udata) {
+		return luaL_error(L, "out of memory");
+	}
+
+	*udata = pipefd[1];
+	lua_pushvalue(L, -3);
+	lua_setmetatable(L, -2);
+
+	return 2;
+}
+
+static int nixio_file_write(lua_State *L) {
+	int fd = nixio__checkfd(L, 1);
+	size_t len;
+	ssize_t sent;
+	const char *data = luaL_checklstring(L, 2, &len);
+
+	if (lua_gettop(L) > 2) {
+		int offset = luaL_optint(L, 3, 0);
+		if (offset) {
+			if (offset < len) {
+				data += offset;
+				len -= offset;
+			} else {
+				len = 0;
+			}
+		}
+
+		unsigned int wlen = luaL_optint(L, 4, len);
+		if (wlen < len) {
+			len = wlen;
+		}
+	}
+
+	do {
+		sent = write(fd, data, len);
+	} while(sent == -1 && errno == EINTR);
+	if (sent >= 0) {
+		lua_pushinteger(L, sent);
+		return 1;
+	} else {
+		return nixio__perror(L);
+	}
+}
+
+static int nixio_file_read(lua_State *L) {
+	int fd = nixio__checkfd(L, 1);
+	char buffer[NIXIO_BUFFERSIZE];
+	uint req = luaL_checkinteger(L, 2);
+	int readc;
+
+	/* We limit the readsize to NIXIO_BUFFERSIZE */
+	req = (req > NIXIO_BUFFERSIZE) ? NIXIO_BUFFERSIZE : req;
+
+	do {
+		readc = read(fd, buffer, req);
+	} while (readc == -1 && errno == EINTR);
+
+	if (readc < 0) {
+		return nixio__perror(L);
+	} else {
+		lua_pushlstring(L, buffer, readc);
+		return 1;
+	}
+}
+
+
+static int nixio_file_seek(lua_State *L) {
+	int fd = nixio__checkfd(L, 1);
+	off_t len = (off_t)nixio__checknumber(L, 2);
+	int whence;
+	const char *whstr = luaL_optlstring(L, 3, "set", NULL);
+	if (!strcmp(whstr, "set")) {
+		whence = SEEK_SET;
+	} else if (!strcmp(whstr, "cur")) {
+		whence = SEEK_CUR;
+	} else if (!strcmp(whstr, "end")) {
+		whence = SEEK_END;
+	} else {
+		return luaL_argerror(L, 3, "supported values: set, cur, end");
+	}
+	len = lseek(fd, len, whence);
+	if (len == -1) {
+		return nixio__perror(L);
+	} else {
+		nixio__pushnumber(L, len);
+		return 1;
+	}
+}
+
+static int nixio_file_tell(lua_State *L) {
+	int fd = nixio__checkfd(L, 1);
+	off_t pos = lseek(fd, 0, SEEK_CUR);
+	if (pos < 0) {
+		return nixio__perror(L);
+	} else {
+		nixio__pushnumber(L, pos);
+		return 1;
+	}
+}
+
+static int nixio_file_stat(lua_State *L) {
+	nixio_stat_t buf;
+	if (fstat(nixio__checkfd(L, 1), &buf)) {
+		return nixio__perror(L);
+	} else {
+		nixio__push_stat(L, &buf);
+		if (lua_isstring(L, 2)) {
+			lua_getfield(L, -1, lua_tostring(L, 2));
+		}
+		return 1;
+	}
+}
+
+static int nixio_file_sync(lua_State *L) {
+	int fd = nixio__checkfd(L, 1);
+	int stat;
+#if (!defined BSD && !defined __WINNT__)
+	int dataonly = lua_toboolean(L, 2);
+	do {
+		stat = (dataonly) ? fdatasync(fd) : fsync(fd);
+	} while (stat == -1 && errno == EINTR);
+	return nixio__pstatus(L, !stat);
+#else
+	do {
+		stat = fsync(fd);
+	} while (stat == -1 && errno == EINTR);
+	return nixio__pstatus(L, !stat);
+#endif
+}
+
+static int nixio_file_lock(lua_State *L) {
+	int fd = nixio__checkfd(L, 1);
+	const char *flag = luaL_checkstring(L, 2);
+	off_t len = (off_t)nixio__optnumber(L, 3, 0);
+	int stat;
+
+	int cmd = 0;
+	if (!strcmp(flag, "lock")) {
+		cmd = F_LOCK;
+	} else if (!strcmp(flag, "tlock")) {
+		cmd = F_TLOCK;
+	} else if (!strcmp(flag, "ulock")) {
+		cmd = F_ULOCK;
+	} else if (!strcmp(flag, "test")) {
+		cmd = F_TEST;
+	} else {
+		return luaL_argerror(L, 2,
+				"supported values: lock, tlock, ulock, test");
+	}
+
+	do {
+		stat = lockf(fd, cmd, len);
+	} while (stat == -1 && errno == EINTR);
+
+	return nixio__pstatus(L, !stat);
+}
+
+static int nixio_file_close(lua_State *L) {
+	int *fdp = luaL_checkudata(L, 1, NIXIO_FILE_META);
+	luaL_argcheck(L, *fdp != -1, 1, "invalid file object");
+	int res;
+	do {
+		res = close(*fdp);
+	} while (res == -1 && errno == EINTR);
+	*fdp = -1;
+	return nixio__pstatus(L, !res);
+}
+
+static int nixio_file__gc(lua_State *L) {
+	int *fdp = luaL_checkudata(L, 1, NIXIO_FILE_META);
+	int res;
+	if (*fdp > 2) {
+		do {
+			res = close(*fdp);
+		} while (res == -1 && errno == EINTR);
+		*fdp = -1;
+	}
+	return 0;
+}
+
+/**
+ * string representation
+ */
+static int nixio_file__tostring(lua_State *L) {
+	lua_pushfstring(L, "nixio file %d", nixio__tofd(L, 1));
+	return 1;
+}
+
+/* method table */
+static const luaL_reg M[] = {
+	{"write",		nixio_file_write},
+	{"read",		nixio_file_read},
+	{"tell",		nixio_file_tell},
+	{"seek",		nixio_file_seek},
+	{"stat",		nixio_file_stat},
+	{"sync",		nixio_file_sync},
+	{"lock",		nixio_file_lock},
+	{"close",		nixio_file_close},
+	{"__gc",		nixio_file__gc},
+	{"__tostring",	nixio_file__tostring},
+	{NULL,			NULL}
+};
+
+/* module table */
+static const luaL_reg R[] = {
+	{"dup",			nixio_dup},
+	{"open",		nixio_open},
+	{"open_flags",	nixio_open_flags},
+	{"pipe",		nixio_pipe},
+	{NULL,			NULL}
+};
+
+void nixio_open_file(lua_State *L) {
+	luaL_register(L, NULL, R);
+
+	luaL_newmetatable(L, NIXIO_FILE_META);
+	luaL_register(L, NULL, M);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+
+	int *uin  = lua_newuserdata(L, sizeof(int));
+	int *uout = lua_newuserdata(L, sizeof(int));
+	int *uerr = lua_newuserdata(L, sizeof(int));
+
+	if (!uin || !uout || !uerr) {
+		luaL_error(L, "out of memory");
+	}
+
+	*uin  = STDIN_FILENO;
+	*uout = STDOUT_FILENO;
+	*uerr = STDERR_FILENO;
+
+	for (int i = -4; i < -1; i++) {
+		lua_pushvalue(L, -4);
+		lua_setmetatable(L, i);
+	}
+
+	lua_setfield(L, -5, "stderr");
+	lua_setfield(L, -4, "stdout");
+	lua_setfield(L, -3, "stdin");
+	lua_setfield(L, -2, "meta_file");
+}
diff --git a/trunk/package/luci/libs/nixio/src/fs.c b/trunk/package/luci/libs/nixio/src/fs.c
new file mode 100644
index 00000000..12ca111a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/fs.c
@@ -0,0 +1,566 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <libgen.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <dirent.h>
+
+/* Reads argument from given index and transforms it into a mode bitfield */
+int nixio__check_mode(lua_State *L, int idx, int def) {
+	if (lua_isnoneornil(L, idx) && def > 0) {
+		return def;
+	} else if (lua_isstring(L, idx) && lua_objlen(L, idx) == 9) {
+		int mode = 0;
+		const char *modestr = lua_tostring(L, idx);
+		int i;
+		for (i=0; i<9; i++) {
+			if (i % 3 == 0) {			/* read flags */
+				if (modestr[i] == 'r') {
+					mode |= 1 << (8 - i);
+				} else if (modestr[i] != '-') {
+					break;
+				}
+			} else if (i % 3 == 1) {	/* write flags */
+				if (modestr[i] == 'w') {
+					mode |= 1 << (8 - i);
+				} else if (modestr[i] != '-') {
+					break;
+				}
+			} else if (i == 2) {
+				if (modestr[i] == 'x') {
+					mode |= 00100;
+				} else if (modestr[i] == 's') {
+					mode |= 04100;
+				} else if (modestr[i] == 'S') {
+					mode |= 04000;
+				} else if (modestr[i] != '-') {
+					break;
+				}
+			} else if (i == 5) {
+				if (modestr[i] == 'x') {
+					mode |= 00010;
+				} else if (modestr[i] == 's') {
+					mode |= 02010;
+				} else if (modestr[i] == 'S') {
+					mode |= 02000;
+				} else if (modestr[i] != '-') {
+					break;
+				}
+			} else if (i == 8) {
+				if (modestr[i] == 'x') {
+					mode |= 00001;
+				} else if (modestr[i] == 't') {
+					mode |= 01001;
+				} else if (modestr[i] == 'T') {
+					mode |= 01000;
+				} else if (modestr[i] != '-') {
+					break;
+				}
+			}
+		}
+		if (i == 9) {	/* successfully parsed */
+			return mode;
+		}
+	} else if (lua_isnumber(L, idx)) {
+		int decmode = lua_tointeger(L, idx);
+		int s = (decmode % 10000)	/ 1000;
+		int u = (decmode % 1000)	/ 100;
+		int g = (decmode % 100)		/ 10;
+		int o = (decmode % 10);
+
+		if (s>=0 && s<=7 && u>=0 && u<=7 && g>=0 && g<=7 && o>=0 && o<=7) {
+			return (s << 9) + (u << 6) + (g << 3) + o;
+		}
+	}
+
+	return luaL_argerror(L, idx, "supported values: [0-7]?[0-7][0-7][0-7], "
+				"[-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]");
+}
+
+/* Transforms a mode into the modestring */
+int nixio__mode_write(int mode, char *modestr) {
+	if (modestr) {
+		modestr[0] = (mode & 00400) ? 'r' : '-';
+		modestr[1] = (mode & 00200) ? 'w' : '-';
+		modestr[2] = ((mode & 04100) == 04100) ? 's' :
+			(mode & 04000) ? 'S' : (mode & 00100) ? 'x' : '-';
+		modestr[3] = (mode & 00040) ? 'r' : '-';
+		modestr[4] = (mode & 00020) ? 'w' : '-';
+		modestr[5] = ((mode & 02010) == 02010) ? 's' :
+			(mode & 02000) ? 'S' : (mode & 00010) ? 'x' : '-';
+		modestr[6] = (mode & 00004) ? 'r' : '-';
+		modestr[7] = (mode & 00002) ? 'w' : '-';
+		modestr[8] = ((mode & 01001) == 01001) ? 't' :
+			(mode & 01000) ? 'T' : (mode & 00001) ? 'x' : '-';
+	}
+
+	return (mode & 00007) + ((mode & 00070) >> 3) * 10 +
+		((mode & 00700) >> 6) * 100 + ((mode & 07000) >> 9) * 1000;
+}
+
+static int nixio_access(lua_State *L) {
+	const char *path = luaL_checkstring(L, 1);
+	int mode = F_OK;
+
+	for (const char *s = luaL_optstring(L, 2, "f"); *s; s++) {
+		if (*s == 'r') {
+			mode |= R_OK;
+		} else if (*s == 'w') {
+			mode |= W_OK;
+		} else if (*s == 'x') {
+			mode |= X_OK;
+		} else if (*s != 'f') {
+			return luaL_argerror(L, 2, "supported values: [frwx]");
+		}
+	}
+
+	return nixio__pstatus(L, !access(path, mode));
+}
+
+static int nixio_basename(lua_State *L) {
+	const char *path = luaL_checkstring(L, 1);
+	char base[PATH_MAX];
+	base[PATH_MAX-1] = 0;
+
+	strncpy(base, path, PATH_MAX-1);
+	lua_pushstring(L, basename(base));
+	return 1;
+}
+
+static int nixio_dirname(lua_State *L) {
+	const char *path = luaL_checkstring(L, 1);
+	char base[PATH_MAX];
+	base[PATH_MAX-1] = 0;
+
+	strncpy(base, path, PATH_MAX-1);
+	lua_pushstring(L, dirname(base));
+	return 1;
+}
+
+static int nixio_realpath(lua_State *L) {
+	const char *path = luaL_checkstring(L, 1);
+	char real[PATH_MAX];
+
+	if (!realpath(path, real)) {
+		return nixio__perror(L);
+	} else {
+		lua_pushstring(L, real);
+		return 1;
+	}
+}
+
+static int nixio_remove(lua_State *L) {
+	return nixio__pstatus(L, !remove(luaL_checkstring(L, 1)));
+}
+
+static int nixio_unlink(lua_State *L) {
+	return nixio__pstatus(L, !unlink(luaL_checkstring(L, 1)));
+}
+
+static int nixio_rename(lua_State *L) {
+	return nixio__pstatus(L,
+			!rename(luaL_checkstring(L, 1), luaL_checkstring(L, 2)));
+}
+
+static int nixio_rmdir(lua_State *L) {
+	return nixio__pstatus(L, !rmdir(luaL_checkstring(L, 1)));
+}
+
+static int nixio_mkdir(lua_State *L) {
+	return nixio__pstatus(L,
+			!mkdir(luaL_checkstring(L, 1), nixio__check_mode(L, 2, 0777)));
+}
+
+static int nixio_chmod(lua_State *L) {
+	return nixio__pstatus(L,
+			!chmod(luaL_checkstring(L, 1), nixio__check_mode(L, 2, -1)));
+}
+
+static int nixio_dir__gc(lua_State *L) {
+	DIR **dirp = lua_touserdata(L, 1);
+	if (dirp && *dirp) {
+		closedir(*dirp);
+		*dirp = NULL;
+	}
+	return 0;
+}
+
+static int nixio_dir__iter(lua_State *L) {
+	DIR **dirp = lua_touserdata(L, lua_upvalueindex(1));
+	struct dirent *entry;
+	const char *n = NULL;
+
+	if (*dirp) {
+		do {
+			entry = readdir(*dirp);
+			n = (entry) ? entry->d_name : NULL;
+		} while(n && n[0] == '.' && (n[1] == 0 || (n[1] == '.' && n[2] == 0)));
+	}
+
+	if (n) {
+		lua_pushstring(L, n);
+	} else {
+		if (*dirp) {
+			closedir(*dirp);
+			*dirp = NULL;
+		}
+		lua_pushnil(L);
+	}
+
+	return 1;
+}
+
+static int nixio_dir(lua_State *L) {
+	const char *path = luaL_optstring(L, 1, ".");
+	DIR **dirp = lua_newuserdata(L, sizeof(DIR *));
+
+	*dirp = opendir(path);
+	if (!*dirp) {
+		return nixio__perror(L);
+	} else {
+		luaL_getmetatable(L, NIXIO_DIR_META);
+		lua_setmetatable(L, -2);
+		lua_pushcclosure(L, nixio_dir__iter, 1);
+		return 1;
+	}
+}
+
+static int nixio_link(lua_State *L) {
+	return nixio__pstatus(L,
+			!link(luaL_checkstring(L, 1), luaL_checkstring(L, 2)));
+}
+
+static int nixio_utimes(lua_State *L) {
+	const char *path = luaL_checkstring(L, 1);
+	if (lua_gettop(L) < 2 || (lua_isnoneornil(L, 2) && lua_isnoneornil(L, 3))) {
+		return nixio__pstatus(L, !utimes(path, NULL));
+	} else {
+		double atime = nixio__checknumber(L, 2);
+		double mtime = nixio__optnumber(L, 3, atime);
+		struct timeval times[2];
+
+		times[0].tv_sec = atime;
+		times[0].tv_usec = 0;
+		times[1].tv_sec = mtime;
+		times[1].tv_usec = 0;
+
+		return nixio__pstatus(L, !utimes(path, times));
+	}
+}
+
+int nixio__push_stat(lua_State *L, nixio_stat_t *buf) {
+	lua_createtable(L, 0, 15);
+
+	lua_pushinteger(L, buf->st_dev);
+	lua_setfield(L, -2, "dev");
+
+	lua_pushinteger(L, buf->st_ino);
+	lua_setfield(L, -2, "ino");
+
+	if (S_ISREG(buf->st_mode)) {
+		lua_pushliteral(L, "reg");
+	} else if (S_ISDIR(buf->st_mode)) {
+		lua_pushliteral(L, "dir");
+	} else if (S_ISCHR(buf->st_mode)) {
+		lua_pushliteral(L, "chr");
+	} else if (S_ISBLK(buf->st_mode)) {
+		lua_pushliteral(L, "blk");
+	} else if (S_ISFIFO(buf->st_mode)) {
+		lua_pushliteral(L, "fifo");
+	} else if (S_ISLNK(buf->st_mode)) {
+		lua_pushliteral(L, "lnk");
+	} else if (S_ISSOCK(buf->st_mode)) {
+		lua_pushliteral(L, "sock");
+	} else {
+		lua_pushliteral(L, "unknown");
+	}
+	lua_setfield(L, -2, "type");
+
+	char modestr[9];
+	lua_pushinteger(L, nixio__mode_write(buf->st_mode, modestr));
+	lua_setfield(L, -2, "modedec");
+
+	lua_pushlstring(L, modestr, 9);
+	lua_setfield(L, -2, "modestr");
+
+	lua_pushinteger(L, buf->st_nlink);
+	lua_setfield(L, -2, "nlink");
+
+	lua_pushinteger(L, buf->st_uid);
+	lua_setfield(L, -2, "uid");
+
+	lua_pushinteger(L, buf->st_gid);
+	lua_setfield(L, -2, "gid");
+
+	lua_pushinteger(L, buf->st_rdev);
+	lua_setfield(L, -2, "rdev");
+
+	nixio__pushnumber(L, buf->st_size);
+	lua_setfield(L, -2, "size");
+
+	lua_pushinteger(L, buf->st_atime);
+	lua_setfield(L, -2, "atime");
+
+	lua_pushinteger(L, buf->st_mtime);
+	lua_setfield(L, -2, "mtime");
+
+	lua_pushinteger(L, buf->st_ctime);
+	lua_setfield(L, -2, "ctime");
+
+#ifndef __WINNT__
+	lua_pushinteger(L, buf->st_blksize);
+	lua_setfield(L, -2, "blksize");
+
+	lua_pushinteger(L, buf->st_blocks);
+	lua_setfield(L, -2, "blocks");
+#endif
+
+	return 1;
+}
+
+static int nixio_stat(lua_State *L) {
+	nixio_stat_t buf;
+	if (stat(luaL_checkstring(L, 1), &buf)) {
+		return nixio__perror(L);
+	} else {
+		nixio__push_stat(L, &buf);
+		if (lua_isstring(L, 2)) {
+			lua_getfield(L, -1, lua_tostring(L, 2));
+		}
+		return 1;
+	}
+}
+
+static int nixio_lstat(lua_State *L) {
+	nixio_stat_t buf;
+	if (stat(luaL_checkstring(L, 1), &buf)) {
+		return nixio__perror(L);
+	} else {
+		nixio__push_stat(L, &buf);
+		if (lua_isstring(L, 2)) {
+			lua_getfield(L, -1, lua_tostring(L, 2));
+		}
+		return 1;
+	}
+}
+
+#ifndef __WINNT__
+
+static int nixio_chown(lua_State *L) {
+	return nixio__pstatus(L,
+			!chown(
+					luaL_checkstring(L, 1),
+					lua_isnoneornil(L, 2) ? -1 : nixio__check_user(L, 2),
+					lua_isnoneornil(L, 3) ? -1 : nixio__check_group(L, 3)
+			)
+	);
+}
+
+static int nixio_lchown(lua_State *L) {
+	return nixio__pstatus(L,
+			!lchown(
+					luaL_checkstring(L, 1),
+					lua_isnoneornil(L, 2) ? -1 : nixio__check_user(L, 2),
+					lua_isnoneornil(L, 3) ? -1 : nixio__check_group(L, 3)
+			)
+	);
+}
+
+static int nixio_mkfifo(lua_State *L) {
+	return nixio__pstatus(L,
+			!mkfifo(luaL_checkstring(L, 1), nixio__check_mode(L, 2, -1)));
+}
+
+static int nixio_symlink(lua_State *L) {
+	return nixio__pstatus(L,
+			!symlink(luaL_checkstring(L, 1), luaL_checkstring(L, 2)));
+}
+
+static int nixio_readlink(lua_State *L) {
+	char dest[PATH_MAX];
+	ssize_t res = readlink(luaL_checkstring(L, 1), dest, sizeof(dest));
+	if (res < 0) {
+		return nixio__perror(L);
+	} else {
+		lua_pushlstring(L, dest, res);
+		return 1;
+	}
+}
+
+#include <glob.h>
+
+typedef struct {
+	glob_t gl;
+	size_t pos;
+	int	freed;
+} nixio_glob_t;
+
+static int nixio_glob__iter(lua_State *L) {
+	nixio_glob_t *globres = lua_touserdata(L, lua_upvalueindex(1));
+	if (!globres->freed && globres->pos < globres->gl.gl_pathc) {
+		lua_pushstring(L, globres->gl.gl_pathv[(globres->pos)++]);
+	} else {
+		if (!globres->freed) {
+			globfree(&globres->gl);
+			globres->freed = 1;
+		}
+		lua_pushnil(L);
+	}
+	return 1;
+}
+
+static int nixio_glob__gc(lua_State *L) {
+	nixio_glob_t *globres = lua_touserdata(L, 1);
+	if (globres && !globres->freed) {
+		globres->freed = 1;
+		globfree(&globres->gl);
+	}
+	return 0;
+}
+
+static int nixio_glob(lua_State *L) {
+	 const char *pattern = luaL_optstring(L, 1, "*");
+	 nixio_glob_t *globres = lua_newuserdata(L, sizeof(nixio_glob_t));
+	 if (!globres) {
+		 return luaL_error(L, NIXIO_OOM);
+	 }
+	 globres->pos = 0;
+	 globres->freed = 0;
+
+	 int globstat = glob(pattern, 0, NULL, &globres->gl);
+	 if (globstat == GLOB_NOMATCH) {
+		 lua_pushcfunction(L, nixio__nulliter);
+		 lua_pushinteger(L, 0);
+	 } else if (globstat) {
+		 return nixio__perror(L);
+	 } else {
+		 luaL_getmetatable(L, NIXIO_GLOB_META);
+		 lua_setmetatable(L, -2);
+		 lua_pushcclosure(L, nixio_glob__iter, 1);
+		 lua_pushinteger(L, globres->gl.gl_pathc);
+	 }
+	 return 2;
+}
+
+#include <sys/statvfs.h>
+
+static int nixio__push_statvfs(lua_State *L, struct statvfs *buf) {
+	lua_createtable(L, 0, 12);
+
+	nixio__pushnumber(L, buf->f_bavail);
+	lua_setfield(L, -2, "bavail");
+
+	nixio__pushnumber(L, buf->f_bfree);
+	lua_setfield(L, -2, "bfree");
+
+	nixio__pushnumber(L, buf->f_blocks);
+	lua_setfield(L, -2, "blocks");
+
+	nixio__pushnumber(L, buf->f_bsize);
+	lua_setfield(L, -2, "bsize");
+
+	nixio__pushnumber(L, buf->f_frsize);
+	lua_setfield(L, -2, "frsize");
+
+	nixio__pushnumber(L, buf->f_favail);
+	lua_setfield(L, -2, "favail");
+
+	nixio__pushnumber(L, buf->f_ffree);
+	lua_setfield(L, -2, "ffree");
+
+	nixio__pushnumber(L, buf->f_files);
+	lua_setfield(L, -2, "files");
+
+	nixio__pushnumber(L, buf->f_flag);
+	lua_setfield(L, -2, "flag");
+
+	nixio__pushnumber(L, buf->f_fsid);
+	lua_setfield(L, -2, "fsid");
+
+	nixio__pushnumber(L, buf->f_namemax);
+	lua_setfield(L, -2, "namemax");
+
+	return 1;
+}
+
+static int nixio_statvfs(lua_State *L) {
+	struct statvfs buf;
+	if (statvfs(luaL_optstring(L, 1, "."), &buf)) {
+		return nixio__perror(L);
+	} else {
+		return nixio__push_statvfs(L, &buf);
+	}
+}
+
+#endif /* !__WINNT__ */
+
+
+
+/* module table */
+static const luaL_reg R[] = {
+#ifndef __WINNT__
+	{"glob",		nixio_glob},
+	{"mkfifo",		nixio_mkfifo},
+	{"symlink",		nixio_symlink},
+	{"readlink",	nixio_readlink},
+	{"chown",		nixio_chown},
+	{"lchown",		nixio_lchown},
+	{"statvfs",		nixio_statvfs},
+#endif
+	{"chmod",		nixio_chmod},
+	{"access",		nixio_access},
+	{"basename",	nixio_basename},
+	{"dir",			nixio_dir},
+	{"dirname",		nixio_dirname},
+	{"realpath",	nixio_realpath},
+	{"mkdir",		nixio_mkdir},
+	{"rmdir",		nixio_rmdir},
+	{"link",		nixio_link},
+	{"unlink",		nixio_unlink},
+	{"utimes",		nixio_utimes},
+	{"rename",		nixio_rename},
+	{"remove",		nixio_remove},
+	{"stat",		nixio_stat},
+	{"lstat",		nixio_lstat},
+	{NULL,			NULL}
+};
+
+void nixio_open_fs(lua_State *L) {
+	lua_newtable(L);
+	luaL_register(L, NULL, R);
+	lua_setfield(L, -2, "fs");
+
+	luaL_newmetatable(L, NIXIO_DIR_META);
+	lua_pushcfunction(L, nixio_dir__gc);
+	lua_setfield(L, -2, "__gc");
+	lua_pop(L, 1);
+
+#ifndef __WINNT__
+	luaL_newmetatable(L, NIXIO_GLOB_META);
+	lua_pushcfunction(L, nixio_glob__gc);
+	lua_setfield(L, -2, "__gc");
+	lua_pop(L, 1);
+#endif
+}
diff --git a/trunk/package/luci/libs/nixio/src/io.c b/trunk/package/luci/libs/nixio/src/io.c
new file mode 100644
index 00000000..12d5c7df
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/io.c
@@ -0,0 +1,225 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+
+/**
+ * send() / sendto() helper
+ */
+static int nixio_sock__sendto(lua_State *L, int to) {
+	nixio_sock *sock = nixio__checksock(L);
+	struct sockaddr_storage addr_in;
+#ifndef __WINNT__
+	struct sockaddr_un addr_un;
+#endif
+	struct sockaddr *addr = NULL;
+	socklen_t alen = 0;
+	int argoff = 2;
+
+	if (to) {
+		argoff += 2;
+		if (sock->domain == AF_INET || sock->domain == AF_INET6) {
+			const char *address = luaL_checkstring(L, 3);
+			addr = (struct sockaddr*)&addr_in;
+			alen = sizeof(addr_in);
+
+			nixio_addr naddr;
+			memset(&naddr, 0, sizeof(naddr));
+			strncpy(naddr.host, address, sizeof(naddr.host) - 1);
+			naddr.port = (uint16_t)luaL_checkinteger(L, 4);
+			naddr.family = sock->domain;
+
+			if (nixio__addr_write(&naddr, addr)) {
+				return nixio__perror_s(L);
+			}
+		}
+
+#ifndef __WINNT__
+		else if (sock->domain == AF_UNIX) {
+			size_t pathlen;
+			const char *path = luaL_checklstring(L, 3, &pathlen);
+
+			addr_un.sun_family = AF_UNIX;
+			luaL_argcheck(L, pathlen <= sizeof(addr_un.sun_path), 3, "out of range");
+			memcpy(addr_un.sun_path, path, pathlen);
+
+			addr = (struct sockaddr*)&addr_un;
+			alen = sizeof(sa_family_t) + pathlen;
+		}
+#endif
+	}
+
+	size_t len;
+	ssize_t sent;
+	const char *data = luaL_checklstring(L, 2, &len);
+
+	if (lua_gettop(L) > argoff) {
+		int offset = luaL_optint(L, argoff + 1, 0);
+		if (offset) {
+			if (offset < len) {
+				data += offset;
+				len -= offset;
+			} else {
+				len = 0;
+			}
+		}
+
+		unsigned int wlen = luaL_optint(L, argoff + 2, len);
+		if (wlen < len) {
+			len = wlen;
+		}
+	}
+
+	do {
+		sent = sendto(sock->fd, data, len, 0, addr, alen);
+	} while(sent == -1 && errno == EINTR);
+	if (sent >= 0) {
+		lua_pushinteger(L, sent);
+		return 1;
+	} else {
+		return nixio__perror_s(L);
+	}
+}
+
+/**
+ * send(data)
+ */
+static int nixio_sock_send(lua_State *L) {
+	return nixio_sock__sendto(L, 0);
+}
+
+/**
+ * sendto(data, address, port)
+ */
+static int nixio_sock_sendto(lua_State *L) {
+	return nixio_sock__sendto(L, 1);
+}
+
+
+/**
+ * recv() / recvfrom() helper
+ */
+static int nixio_sock__recvfrom(lua_State *L, int from) {
+	nixio_sock *sock = nixio__checksock(L);
+	char buffer[NIXIO_BUFFERSIZE];
+	struct sockaddr_storage addr_in;
+#ifndef __WINNT__
+	struct sockaddr_un addr_un;
+#endif
+	struct sockaddr *addr = NULL;
+	socklen_t alen = 0;
+	uint req = luaL_checkinteger(L, 2);
+	int readc;
+
+	if (sock->domain == AF_INET || sock->domain == AF_INET6) {
+		addr = (from) ? (struct sockaddr*)&addr_in : NULL;
+		alen = (from) ? sizeof(addr_in) : 0;
+	}
+#ifndef __WINNT__
+	else if (sock->domain == AF_UNIX) {
+		addr = (from) ? (struct sockaddr*)&addr_un : NULL;
+		alen = (from) ? sizeof(addr_un) : 0;
+	}
+#endif
+
+	/* We limit the readsize to NIXIO_BUFFERSIZE */
+	req = (req > NIXIO_BUFFERSIZE) ? NIXIO_BUFFERSIZE : req;
+
+	do {
+		readc = recvfrom(sock->fd, buffer, req, 0, addr, &alen);
+	} while (readc == -1 && errno == EINTR);
+
+#ifdef __WINNT__
+	if (readc < 0) {
+		int e = WSAGetLastError();
+		if (e == WSAECONNRESET || e == WSAECONNABORTED || e == WSAESHUTDOWN) {
+			readc = 0;
+		}
+	}
+#endif
+
+	if (readc < 0) {
+		return nixio__perror_s(L);
+	} else {
+		lua_pushlstring(L, buffer, readc);
+
+		if (!from) {
+			return 1;
+		}
+		/* push address. */
+		if (sock->domain == AF_INET || sock->domain == AF_INET6) {
+			nixio_addr naddr;
+			if (!nixio__addr_parse(&naddr, (struct sockaddr *)&addr_in)) {
+				lua_pushstring(L, naddr.host);
+				lua_pushinteger(L, naddr.port);
+				return 3;
+			} else {
+				return 1;
+			}
+		}
+#ifndef __WINNT__
+		else if (sock->domain == AF_UNIX && alen > sizeof(sa_family_t)) {
+			/* if first char is non-null then the path is not in the
+			   abstract namespace and alen includes the trailing null */
+			if (addr_un.sun_path[0])
+				--alen;
+			lua_pushlstring(L, addr_un.sun_path, alen - sizeof(sa_family_t));
+			return 2;
+		}
+#endif
+	}
+	return 1;
+}
+
+/**
+ * recv(count)
+ */
+static int nixio_sock_recv(lua_State *L) {
+	return nixio_sock__recvfrom(L, 0);
+}
+
+/**
+ * recvfrom(count)
+ */
+static int nixio_sock_recvfrom(lua_State *L) {
+	return nixio_sock__recvfrom(L, 1);
+}
+
+
+/* module table */
+static const luaL_reg M[] = {
+	{"send",	nixio_sock_send},
+	{"sendto",	nixio_sock_sendto},
+	{"recv",	nixio_sock_recv},
+	{"recvfrom",nixio_sock_recvfrom},
+	{"write",	nixio_sock_send},
+	{"read",	nixio_sock_recv},
+	{NULL,			NULL}
+};
+
+void nixio_open_io(lua_State *L) {
+	lua_pushvalue(L, -2);
+	luaL_register(L, NULL, M);
+	lua_pop(L, 1);
+}
diff --git a/trunk/package/luci/libs/nixio/src/mingw-compat.c b/trunk/package/luci/libs/nixio/src/mingw-compat.c
new file mode 100644
index 00000000..02be504a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/mingw-compat.c
@@ -0,0 +1,220 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/locking.h>
+#include <sys/time.h>
+#include <sys/utime.h>
+
+void nixio_open__mingw(lua_State *L) {
+	_fmode = _O_BINARY;
+
+	WSADATA wsa;
+
+	if (WSAStartup(MAKEWORD(2, 2), &wsa)) {
+		luaL_error(L, "Unable to initialize Winsock");
+	}
+
+	lua_newtable(L);
+
+	NIXIO_WSA_CONSTANT(WSAEACCES);
+	NIXIO_WSA_CONSTANT(WSAEINTR);
+	NIXIO_WSA_CONSTANT(WSAEINVAL);
+	NIXIO_WSA_CONSTANT(WSAEBADF);
+	NIXIO_WSA_CONSTANT(WSAEFAULT);
+	NIXIO_WSA_CONSTANT(WSAEMFILE);
+	NIXIO_WSA_CONSTANT(WSAENAMETOOLONG);
+	NIXIO_WSA_CONSTANT(WSAELOOP);
+	NIXIO_WSA_CONSTANT(WSAEAFNOSUPPORT);
+	NIXIO_WSA_CONSTANT(WSAENOBUFS);
+	NIXIO_WSA_CONSTANT(WSAEPROTONOSUPPORT);
+	NIXIO_WSA_CONSTANT(WSAENOPROTOOPT);
+	NIXIO_WSA_CONSTANT(WSAEADDRINUSE);
+	NIXIO_WSA_CONSTANT(WSAENETDOWN);
+	NIXIO_WSA_CONSTANT(WSAENETUNREACH);
+	NIXIO_WSA_CONSTANT(WSAECONNABORTED);
+	NIXIO_WSA_CONSTANT(WSAECONNRESET);
+
+	lua_setfield(L, -2, "const_sock");
+}
+
+const char* nixio__mgw_inet_ntop
+(int af, const void *src, char *dst, socklen_t size) {
+	struct sockaddr_storage saddr;
+	memset(&saddr, 0, sizeof(saddr));
+
+	DWORD hostlen = size, sl;
+	if (af == AF_INET) {
+		struct sockaddr_in *saddr4 = (struct sockaddr_in *)&saddr;
+		memcpy(&saddr4->sin_addr, src, sizeof(saddr4->sin_addr));
+		saddr4->sin_family = AF_INET;
+		saddr4->sin_port = 0;
+		sl = sizeof(struct sockaddr_in);
+	} else if (af == AF_INET6) {
+		struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&saddr;
+		memcpy(&saddr6->sin6_addr, src, sizeof(saddr6->sin6_addr));
+		saddr6->sin6_family = AF_INET6;
+		saddr6->sin6_port = 0;
+		sl = sizeof(struct sockaddr_in6);
+	} else {
+		return NULL;
+	}
+	if (WSAAddressToString((struct sockaddr*)&saddr, sl, NULL, dst, &hostlen)) {
+		return NULL;
+	}
+	return dst;
+}
+
+int nixio__mgw_inet_pton (int af, const char *src, void *dst) {
+	struct sockaddr_storage sa;
+	int sl = sizeof(sa);
+
+	if (!WSAStringToAddress((char*)src, af, NULL, (struct sockaddr*)&sa, &sl)) {
+		if (af == AF_INET) {
+			struct in_addr ina = ((struct sockaddr_in *)&sa)->sin_addr;
+			memcpy(dst, &ina, sizeof(ina));
+			return 1;
+		} else if (af == AF_INET6) {
+			struct in_addr6 ina6 = ((struct sockaddr_in6 *)&sa)->sin6_addr;
+			memcpy(dst, &ina6, sizeof(ina6));
+			return 1;
+		} else {
+			WSASetLastError(WSAEAFNOSUPPORT);
+			return -1;
+		}
+	} else {
+		return -1;
+	}
+}
+
+int nixio__mgw_nanosleep(const struct timespec *req, struct timespec *rem) {
+	if (rem) {
+		rem->tv_sec = 0;
+		rem->tv_nsec = 0;
+	}
+	Sleep(req->tv_sec * 1000 + req->tv_nsec * 1000000);
+	return 0;
+}
+
+int nixio__mgw_poll(struct pollfd *fds, int nfds, int timeout) {
+	if (!fds || !nfds) {
+		Sleep(timeout);
+		return 0;
+	}
+
+	struct timeval tv;
+	int high = 0, rf = 0, wf = 0, ef = 0;
+	fd_set rfds, wfds, efds;
+	FD_ZERO(&rfds);
+	FD_ZERO(&wfds);
+	FD_ZERO(&efds);
+
+	tv.tv_sec = timeout / 1000;
+	tv.tv_usec = (timeout % 1000) * 1000;
+
+	for (int i = 0; i < nfds; i++) {
+		if (fds->events & POLLIN) {
+			FD_SET(fds->fd, &rfds);
+			rf++;
+		}
+		if (fds->events & POLLOUT) {
+			FD_SET(fds->fd, &wfds);
+			wf++;
+		}
+		if (fds->events & POLLERR) {
+			FD_SET(fds->fd, &efds);
+			ef++;
+		}
+		if (fds->fd > high) {
+			high = fds->fd;
+		}
+	}
+
+	int stat = select(high + 1, (rf) ? &rfds : NULL,
+	 (wf) ? &wfds : NULL, (ef) ? &efds : NULL, &tv);
+	if (stat < 1) {
+		errno = WSAGetLastError();
+		return stat;
+	}
+
+	high = 0;
+
+	for (int i = 0; i < nfds; i++) {
+		fds->revents = 0;
+		if ((fds->events & POLLIN) && FD_ISSET(fds->fd, &rfds)) {
+			fds->revents |= POLLIN;
+		}
+		if ((fds->events & POLLOUT) && FD_ISSET(fds->fd, &wfds)) {
+			fds->revents |= POLLOUT;
+		}
+		if ((fds->events & POLLERR) && FD_ISSET(fds->fd, &efds)) {
+			fds->revents |= POLLERR;
+		}
+		if (fds->revents) {
+			high++;
+		}
+	}
+
+	return high;
+}
+
+int nixio__mgw_lockf(int fd, int cmd, off_t len) {
+	int stat;
+	if (cmd == F_LOCK) {
+		do {
+			stat = _locking(fd, _LK_LOCK, len);
+		} while (stat == -1 && errno == EDEADLOCK);
+	} else if (cmd == F_TLOCK) {
+		stat = _locking(fd, _LK_NBLCK, len);
+	} else if (cmd == F_ULOCK) {
+		stat = _locking(fd, _LK_UNLCK, len);
+	} else {
+		stat = -1;
+		errno = EINVAL;
+	}
+	return stat;
+}
+
+char* nixio__mgw_realpath(const char *path, char *resolved) {
+	if (GetFullPathName(path, PATH_MAX, resolved, NULL)) {
+		return resolved;
+	} else {
+		errno = GetLastError();
+		return NULL;
+	}
+}
+
+int nixio__mgw_link(const char *oldpath, const char *newpath) {
+	if (!CreateHardLink(newpath, oldpath, NULL)) {
+		errno = GetLastError();
+		return -1;
+	} else {
+		return 0;
+	}
+}
+
+int nixio__mgw_utimes(const char *filename, const struct timeval times[2]) {
+	struct _utimbuf timebuffer;
+	timebuffer.actime = times[0].tv_sec;
+	timebuffer.modtime = times[1].tv_sec;
+
+	return _utime(filename, &timebuffer);
+}
diff --git a/trunk/package/luci/libs/nixio/src/mingw-compat.h b/trunk/package/luci/libs/nixio/src/mingw-compat.h
new file mode 100644
index 00000000..a26a4bee
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/mingw-compat.h
@@ -0,0 +1,112 @@
+#ifndef NIXIO_MINGW_COMPAT_H_
+#define NIXIO_MINGW_COMPAT_H_
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#include <process.h>
+#include <stdint.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+#define S_ISLNK(m) 0
+#define S_ISSOCK(m) 0
+
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EAFNOSUPPORT WSAEAFNOSUPPORT
+#define ENOPROTOOPT WSAENOPROTOOPT
+
+#define SHUT_RD		SD_RECEIVE
+#define SHUT_WR		SD_SEND
+#define SHUT_RDWR	SD_BOTH
+
+#define pipe(fds) _pipe(fds, 65536, 0)
+#define fsync _commit
+#define lseek lseek64
+#define stat _stati64
+#define lstat _stati64
+#define fstat _fstati64
+
+
+#define F_LOCK 1
+#define F_ULOCK 0
+#define F_TLOCK 2
+#define F_TEST 3
+int nixio__mgw_lockf(int fd, int cmd, off_t len);
+#define lockf nixio__mgw_lockf
+
+const char* nixio__mgw_inet_ntop
+(int af, const void *src, char *dst, socklen_t size);
+#define inet_ntop nixio__mgw_inet_ntop
+
+int nixio__mgw_inet_pton (int af, const char *src, void *dst);
+#define inet_pton nixio__mgw_inet_pton
+
+
+#ifndef POLLIN
+#define POLLIN	0x001
+#define POLLOUT	0x004
+#define POLLERR 0x008
+struct pollfd {
+   int   fd;
+   short events;
+   short revents;
+};
+#endif
+
+typedef int nfds_t;
+int nixio__mgw_poll(struct pollfd *fds, nfds_t nfds, int timeout);
+#define poll nixio__mgw_poll
+
+
+struct timespec {
+      time_t tv_sec;
+      long   tv_nsec;
+};
+
+int nixio__mgw_nanosleep(const struct timespec *req, struct timespec *rem);
+#define nanosleep nixio__mgw_nanosleep
+
+
+char* nixio__mgw_realpath(const char *path, char *resolved);
+#define realpath nixio__mgw_realpath
+
+
+int nixio__mgw_link(const char *oldpath, const char *newpath);
+#define link nixio__mgw_link
+
+
+int nixio__mgw_utimes(const char *filename, const struct timeval times[2]);
+#define utimes nixio__mgw_utimes
+
+
+#define setenv(k, v, o) !SetEnvironmentVariable(k, v)
+#define unsetenv(k) !SetEnvironmentVariable(k, NULL)
+
+#define execv(p, a) execv(p, (const char* const*)a)
+#define execvp(p, a) execvp(p, (const char* const*)a)
+#define execve(p, a, e) execve(p, (const char* const*)a, (const char* const*)e)
+
+#define mkdir(p, m) mkdir(p)
+
+
+#define nixio__perror_s(L) \
+	errno = WSAGetLastError(); \
+	return nixio__perror(L);
+
+#define nixio__pstatus_s(L, c) \
+	errno = WSAGetLastError(); \
+	return nixio__pstatus(L, c);
+
+
+
+#define NIXIO_WSA_CONSTANT(x) \
+	lua_pushinteger(L, x); \
+	lua_setfield(L, -2, #x+3);
+
+void nixio_open__mingw(lua_State *L);
+
+#endif /* NIXIO_MINGW_COMPAT_H_ */
diff --git a/trunk/package/luci/libs/nixio/src/nixio-tls.h b/trunk/package/luci/libs/nixio/src/nixio-tls.h
new file mode 100644
index 00000000..0fac5a98
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/nixio-tls.h
@@ -0,0 +1,53 @@
+#ifndef NIXIO_TLS_H_
+#define NIXIO_TLS_H_
+
+#include "nixio.h"
+#include <sys/types.h>
+
+#ifndef WITHOUT_OPENSSL
+#include <openssl/ssl.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#endif
+
+#define NIXIO_TLS_CTX_META "nixio.tls.ctx"
+#define NIXIO_TLS_SOCK_META "nixio.tls.sock"
+
+typedef struct nixio_tls_socket {
+	SSL		*socket;
+#ifdef WITH_AXTLS
+	char	connected;
+	size_t	pbufsiz;
+	char	*pbufpos;
+	char	*pbuffer;
+#endif
+} nixio_tls_sock;
+
+#define NIXIO_CRYPTO_HASH_META "nixio.crypto.hash"
+#define NIXIO_DIGEST_SIZE 64
+#define NIXIO_CRYPTO_BLOCK_SIZE 64
+
+#define NIXIO_HASH_NONE	0
+#define NIXIO_HASH_MD5	0x01
+#define NIXIO_HASH_SHA1	0x02
+
+#define NIXIO_HMAC_BIT	0x40
+
+typedef int(*nixio_hash_initcb)(void *);
+typedef int(*nixio_hash_updatecb)(void *, const void *, unsigned long);
+typedef int(*nixio_hash_finalcb)(unsigned char *, void *);
+
+typedef struct nixio_hash_obj {
+	uint				type;
+	unsigned char		digest[NIXIO_DIGEST_SIZE];
+	size_t				digest_size;
+	unsigned char		key[NIXIO_CRYPTO_BLOCK_SIZE];
+	size_t				key_size;
+	size_t				block_size;
+	void				*ctx;
+	nixio_hash_initcb	init;
+	nixio_hash_updatecb	update;
+	nixio_hash_finalcb	final;
+} nixio_hash;
+
+#endif /* NIXIO_TLS_H_ */
diff --git a/trunk/package/luci/libs/nixio/src/nixio.c b/trunk/package/luci/libs/nixio/src/nixio.c
new file mode 100644
index 00000000..ae81c6f9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/nixio.c
@@ -0,0 +1,240 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <signal.h>
+
+#define VERSION 0.4
+
+
+/* pushes nil, error number and errstring on the stack */
+int nixio__perror(lua_State *L) {
+	if (errno == EAGAIN || errno == EWOULDBLOCK) {
+		lua_pushboolean(L, 0);
+	} else {
+		lua_pushnil(L);
+	}
+    lua_pushinteger(L, errno);
+    lua_pushstring(L, strerror(errno));
+    return 3;
+}
+
+/* pushes true, if operation succeeded, otherwise call nixio__perror */
+int nixio__pstatus(lua_State *L, int condition) {
+	if (condition) {
+		lua_pushboolean(L, 1);
+		return 1;
+	} else {
+		return nixio__perror(L);
+	}
+}
+
+/* checks whether the first argument is a socket and returns it */
+nixio_sock* nixio__checksock(lua_State *L) {
+    nixio_sock *sock = (nixio_sock*)luaL_checkudata(L, 1, NIXIO_META);
+    luaL_argcheck(L, sock->fd != -1, 1, "invalid socket object");
+    return sock;
+}
+
+/* read fd from nixio_sock object */
+int nixio__checksockfd(lua_State *L) {
+	return nixio__checksock(L)->fd;
+}
+
+/* return any possible fd, otherwise error out */
+int nixio__checkfd(lua_State *L, int ud) {
+	int fd = nixio__tofd(L, ud);
+	return (fd != -1) ? fd : luaL_argerror(L, ud, "invalid file descriptor");
+}
+
+/* return any possible fd */
+int nixio__tofd(lua_State *L, int ud) {
+	void *udata = lua_touserdata(L, ud);
+	int fd = -1;
+	if (lua_getmetatable(L, ud)) {
+		luaL_getmetatable(L, NIXIO_META);
+		luaL_getmetatable(L, NIXIO_FILE_META);
+		luaL_getmetatable(L, LUA_FILEHANDLE);
+		if (lua_rawequal(L, -3, -4)) {
+			fd = ((nixio_sock*)udata)->fd;
+		} else if (lua_rawequal(L, -2, -4)) {
+			fd = *((int*)udata);
+		} else if (lua_rawequal(L, -1, -4)) {
+			fd = (*((FILE **)udata)) ? fileno(*((FILE **)udata)) : -1;
+		}
+		lua_pop(L, 4);
+	}
+	return fd;
+}
+
+/* An empty iterator */
+int nixio__nulliter(lua_State *L) {
+	lua_pushnil(L);
+	return 1;
+}
+
+static int nixio_errno(lua_State *L) {
+	lua_pushinteger(L, errno);
+	return 1;
+}
+
+static int nixio_strerror(lua_State *L) {
+	lua_pushstring(L, strerror(luaL_checkinteger(L, 1)));
+	return 1;
+}
+
+/* object table */
+static const luaL_reg R[] = {
+	{"errno",		nixio_errno},
+	{"strerror",	nixio_strerror},
+	{NULL,			NULL}
+};
+
+/* entry point */
+NIXIO_API int luaopen_nixio(lua_State *L) {
+	/* create metatable */
+	luaL_newmetatable(L, NIXIO_META);
+
+	/* metatable.__index = metatable */
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+
+	/* register module */
+	luaL_register(L, "nixio", R);
+
+	/* register metatable as socket_meta */
+	lua_pushvalue(L, -2);
+	lua_setfield(L, -2, "meta_socket");
+
+	/* register methods */
+#ifdef __WINNT__
+	nixio_open__mingw(L);
+#endif
+	nixio_open_file(L);
+	nixio_open_socket(L);
+	nixio_open_sockopt(L);
+	nixio_open_bind(L);
+	nixio_open_address(L);
+	nixio_open_protoent(L);
+	nixio_open_poll(L);
+	nixio_open_io(L);
+	nixio_open_splice(L);
+	nixio_open_process(L);
+	nixio_open_syslog(L);
+	nixio_open_bit(L);
+	nixio_open_bin(L);
+	nixio_open_fs(L);
+	nixio_open_user(L);
+
+#ifndef NO_TLS
+	nixio_open_tls_crypto(L);
+	nixio_open_tls_context(L);
+	nixio_open_tls_socket(L);
+#endif
+
+	/* module version */
+	lua_pushinteger(L, VERSION);
+	lua_setfield(L, -2, "version");
+
+	/* some constants */
+	lua_newtable(L);
+
+	lua_pushliteral(L, NIXIO_SEP);
+	lua_setfield(L, -2, "sep");
+
+	lua_pushliteral(L, NIXIO_PATHSEP);
+	lua_setfield(L, -2, "pathsep");
+
+	lua_pushinteger(L, NIXIO_BUFFERSIZE);
+	lua_setfield(L, -2, "buffersize");
+
+	NIXIO_PUSH_CONSTANT(EACCES);
+	NIXIO_PUSH_CONSTANT(EINTR);
+	NIXIO_PUSH_CONSTANT(ENOSYS);
+	NIXIO_PUSH_CONSTANT(EINVAL);
+	NIXIO_PUSH_CONSTANT(EAGAIN);
+	NIXIO_PUSH_CONSTANT(ENOMEM);
+	NIXIO_PUSH_CONSTANT(ENOENT);
+	NIXIO_PUSH_CONSTANT(ECHILD);
+	NIXIO_PUSH_CONSTANT(EIO);
+	NIXIO_PUSH_CONSTANT(EBADF);
+	NIXIO_PUSH_CONSTANT(EFAULT);
+	NIXIO_PUSH_CONSTANT(EFBIG);
+	NIXIO_PUSH_CONSTANT(ENOSPC);
+	NIXIO_PUSH_CONSTANT(EPIPE);
+	NIXIO_PUSH_CONSTANT(ESPIPE);
+	NIXIO_PUSH_CONSTANT(EISDIR);
+	NIXIO_PUSH_CONSTANT(EPERM);
+	NIXIO_PUSH_CONSTANT(EEXIST);
+	NIXIO_PUSH_CONSTANT(EMFILE);
+	NIXIO_PUSH_CONSTANT(ENAMETOOLONG);
+	NIXIO_PUSH_CONSTANT(ENFILE);
+	NIXIO_PUSH_CONSTANT(ENODEV);
+	NIXIO_PUSH_CONSTANT(EXDEV);
+	NIXIO_PUSH_CONSTANT(ENOTDIR);
+	NIXIO_PUSH_CONSTANT(ENXIO);
+	NIXIO_PUSH_CONSTANT(EROFS);
+	NIXIO_PUSH_CONSTANT(EBUSY);
+	NIXIO_PUSH_CONSTANT(ESRCH);
+	NIXIO_PUSH_CONSTANT(SIGINT);
+	NIXIO_PUSH_CONSTANT(SIGTERM);
+	NIXIO_PUSH_CONSTANT(SIGSEGV);
+
+#ifndef __WINNT__
+	NIXIO_PUSH_CONSTANT(EALREADY);
+	NIXIO_PUSH_CONSTANT(EINPROGRESS);
+	NIXIO_PUSH_CONSTANT(EWOULDBLOCK);
+	NIXIO_PUSH_CONSTANT(ELOOP);
+	NIXIO_PUSH_CONSTANT(EOVERFLOW);
+	NIXIO_PUSH_CONSTANT(ETXTBSY);
+	NIXIO_PUSH_CONSTANT(EAFNOSUPPORT);
+	NIXIO_PUSH_CONSTANT(ENOBUFS);
+	NIXIO_PUSH_CONSTANT(EPROTONOSUPPORT);
+	NIXIO_PUSH_CONSTANT(ENOPROTOOPT);
+	NIXIO_PUSH_CONSTANT(EADDRINUSE);
+	NIXIO_PUSH_CONSTANT(ENETDOWN);
+	NIXIO_PUSH_CONSTANT(ENETUNREACH);
+
+	NIXIO_PUSH_CONSTANT(SIGALRM);
+	NIXIO_PUSH_CONSTANT(SIGKILL);
+	NIXIO_PUSH_CONSTANT(SIGHUP);
+	NIXIO_PUSH_CONSTANT(SIGSTOP);
+	NIXIO_PUSH_CONSTANT(SIGCONT);
+	NIXIO_PUSH_CONSTANT(SIGCHLD);
+	NIXIO_PUSH_CONSTANT(SIGQUIT);
+	NIXIO_PUSH_CONSTANT(SIGUSR1);
+	NIXIO_PUSH_CONSTANT(SIGUSR2);
+	NIXIO_PUSH_CONSTANT(SIGIO);
+	NIXIO_PUSH_CONSTANT(SIGURG);
+	NIXIO_PUSH_CONSTANT(SIGPIPE);
+
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -3, "const_sock");
+
+	signal(SIGPIPE, SIG_IGN);
+#endif /* !__WINNT__ */
+	lua_setfield(L, -2, "const");
+
+	/* remove meta table */
+	lua_remove(L, -2);
+
+	return 1;
+}
diff --git a/trunk/package/luci/libs/nixio/src/nixio.h b/trunk/package/luci/libs/nixio/src/nixio.h
new file mode 100644
index 00000000..8802e920
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/nixio.h
@@ -0,0 +1,133 @@
+#ifndef NIXIO_H_
+#define NIXIO_H_
+
+#define NIXIO_OOM "out of memory"
+
+#define NIXIO_META "nixio.socket"
+#define NIXIO_FILE_META "nixio.file"
+#define NIXIO_GLOB_META "nixio.glob"
+#define NIXIO_DIR_META "nixio.dir"
+#define _FILE_OFFSET_BITS 64
+
+#define NIXIO_PUSH_CONSTANT(x) \
+	lua_pushinteger(L, x); \
+	lua_setfield(L, -2, #x);
+
+/* uClibc: broken as always */
+#define _LARGEFILE_SOURCE
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+#include <luaconf.h>
+
+#define NIXIO_BUFFERSIZE 8192
+
+typedef struct nixio_socket {
+	int fd;
+	int domain;
+	int type;
+	int protocol;
+} nixio_sock;
+
+typedef struct nixio_address {
+	int family;
+	char host[128];
+	int port;
+	int prefix;
+} nixio_addr;
+
+int nixio__perror(lua_State *L);
+int nixio__pstatus(lua_State *L, int condition);
+
+#if defined(LUA_NUMBER_DOUBLE) || defined(LNUM_DOUBLE) || defined(LNUM_LDOUBLE)
+#define NIXIO_DOUBLE 1
+#define nixio__checknumber luaL_checknumber
+#define nixio__pushnumber  lua_pushnumber
+#define nixio__optnumber   luaL_optnumber
+#else
+#define nixio__checknumber luaL_checkinteger
+#define nixio__pushnumber  lua_pushinteger
+#define nixio__optnumber   luaL_optinteger
+#endif
+
+
+#ifndef __WINNT__
+
+#define NIXIO_API extern
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <poll.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+#define NIXIO_SEP "/"
+#define NIXIO_PATHSEP ":"
+
+#define nixio__perror_s nixio__perror
+#define nixio__pstatus_s nixio__pstatus
+
+int nixio__check_group(lua_State *L, int idx);
+int nixio__check_user(lua_State *L, int idx);
+
+typedef struct stat nixio_stat_t;
+
+#else /* __WINNT__ */
+
+#define NIXIO_API extern __declspec(dllexport)
+#define NIXIO_SEP "\\"
+#define NIXIO_PATHSEP ";"
+#include "mingw-compat.h"
+
+typedef struct _stati64 nixio_stat_t;
+
+#endif
+
+nixio_sock* nixio__checksock(lua_State *L);
+int nixio__checksockfd(lua_State *L);
+int nixio__checkfd(lua_State *L, int ud);
+int nixio__tofd(lua_State *L, int ud);
+int nixio__nulliter(lua_State *L);
+
+int nixio__addr_parse(nixio_addr *addr, struct sockaddr *saddr);
+int nixio__addr_write(nixio_addr *addr, struct sockaddr *saddr);
+
+int nixio__check_mode(lua_State *L, int idx, int def);
+int nixio__mode_write(int mode, char *modestr);
+
+int nixio__push_stat(lua_State *L, nixio_stat_t *buf);
+
+const char nixio__bin2hex[16];
+
+/* Module functions */
+void nixio_open_file(lua_State *L);
+void nixio_open_socket(lua_State *L);
+void nixio_open_sockopt(lua_State *L);
+void nixio_open_bind(lua_State *L);
+void nixio_open_address(lua_State *L);
+void nixio_open_protoent(lua_State *L);
+void nixio_open_poll(lua_State *L);
+void nixio_open_io(lua_State *L);
+void nixio_open_splice(lua_State *L);
+void nixio_open_process(lua_State *L);
+void nixio_open_syslog(lua_State *L);
+void nixio_open_bit(lua_State *L);
+void nixio_open_bin(lua_State *L);
+void nixio_open_fs(lua_State *L);
+void nixio_open_user(lua_State *L);
+
+#ifndef NO_TLS
+void nixio_open_tls_crypto(lua_State *L);
+void nixio_open_tls_context(lua_State *L);
+void nixio_open_tls_socket(lua_State *L);
+#endif
+
+/* Method functions */
+
+#endif /* NIXIO_H_ */
diff --git a/trunk/package/luci/libs/nixio/src/poll.c b/trunk/package/luci/libs/nixio/src/poll.c
new file mode 100644
index 00000000..1211bc72
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/poll.c
@@ -0,0 +1,210 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <time.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/time.h>
+
+
+static int nixio_gettimeofday(lua_State *L) {
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	nixio__pushnumber(L, tv.tv_sec);
+	nixio__pushnumber(L, tv.tv_usec);
+	return 2;
+}
+
+
+/**
+ * nanosleep()
+ */
+static int nixio_nanosleep(lua_State *L) {
+	struct timespec req, rem;
+	req.tv_sec = luaL_optint(L, 1, 0);
+	req.tv_nsec = luaL_optint(L, 2, 0);
+
+	int status = nanosleep(&req, &rem);
+	if (!status) {
+		lua_pushboolean(L, 1);
+		return 1;
+	} else {
+		if (errno == EINTR) {
+			lua_pushboolean(L, 0);
+			lua_pushinteger(L, rem.tv_sec);
+			lua_pushinteger(L, rem.tv_nsec);
+			return 3;
+		} else {
+			return nixio__perror(L);
+		}
+	}
+}
+
+/**
+ * Checks whether a flag is set in the bitmap and sets the matching table value
+ */
+static void nixio_poll_flags__r(lua_State *L, int *map, int f, const char *t) {
+	lua_pushstring(L, t);
+	if (*map & f) {
+		lua_pushboolean(L, 1);
+	} else {
+		lua_pushnil(L);
+	}
+	lua_rawset(L, -3);
+}
+
+/**
+ * Translate integer to poll flags and vice versa
+ */
+static int nixio_poll_flags(lua_State *L) {
+	int flags;
+	if (lua_isnumber(L, 1)) {
+		flags = luaL_checkinteger(L, 1);
+		lua_newtable(L);
+		nixio_poll_flags__r(L, &flags, POLLIN, "in");
+		nixio_poll_flags__r(L, &flags, POLLOUT, "out");
+		nixio_poll_flags__r(L, &flags, POLLERR, "err");
+#ifndef __WINNT__
+		nixio_poll_flags__r(L, &flags, POLLPRI, "pri");
+		nixio_poll_flags__r(L, &flags, POLLHUP, "hup");
+		nixio_poll_flags__r(L, &flags, POLLNVAL, "nval");
+#endif
+	 } else {
+		flags = 0;
+		const int j = lua_gettop(L);
+		for (int i=1; i<=j; i++) {
+			const char *flag = luaL_checkstring(L, i);
+			if (!strcmp(flag, "in")) {
+				flags |= POLLIN;
+			} else if (!strcmp(flag, "out")) {
+				flags |= POLLOUT;
+			} else if (!strcmp(flag, "err")) {
+				flags |= POLLERR;
+			} else if (!strcmp(flag, "pri")) {
+#ifndef __WINNT__
+				flags |= POLLPRI;
+#endif
+			} else if (!strcmp(flag, "hup")) {
+#ifndef __WINNT__
+				flags |= POLLHUP;
+#endif
+			} else if (!strcmp(flag, "nval")) {
+#ifndef __WINNT__
+				flags |= POLLNVAL;
+#endif
+			} else {
+				return luaL_argerror(L, i,
+				 "supported values: in, pri, out, err, hup, nval");
+			}
+		}
+		lua_pushinteger(L, flags);
+	}
+	return 1;
+}
+
+/**
+ * poll({{fd = socket, events = FLAGS}, ...}, timeout)
+ */
+static int nixio_poll(lua_State *L) {
+	int len = lua_objlen(L, 1);
+	int i, fd;
+	int timeout = luaL_optint(L, 2, 0);
+	int status = -1;
+
+	/* we are being abused as sleep() replacement... */
+	if (lua_isnoneornil(L, 1) || len < 1) {
+		if (!poll(NULL, 0, timeout)) {
+			lua_pushinteger(L, 0);
+			return 1;
+		} else {
+			return nixio__perror(L);
+		}
+	}
+
+	luaL_checktype(L, 1, LUA_TTABLE);
+	struct pollfd *fds = calloc(len, sizeof(struct pollfd));
+	if (!fds) {
+		return luaL_error(L, NIXIO_OOM);
+	}
+
+	for (i = 0; i < len; i++) {
+		lua_rawgeti(L, 1, i+1);
+		if (!lua_istable(L, -1)) {
+			free(fds);
+			return luaL_argerror(L, 1, "invalid datastructure");
+		}
+
+		lua_pushliteral(L, "fd");
+		lua_rawget(L, -2);
+		fd = nixio__tofd(L, -1);
+		if (fd == -1) {
+			free(fds);
+			return luaL_argerror(L, 1, "invalid fd in datastructure");
+		}
+		fds[i].fd = fd;
+
+		lua_pushliteral(L, "events");
+		lua_rawget(L, -3);
+		fds[i].events = (short)lua_tointeger(L, -1);
+
+		lua_pop(L, 3);
+	}
+
+	status = poll(fds, (nfds_t)len, timeout);
+
+	if (status == 0) {
+		free(fds);
+		lua_pushboolean(L, 0);
+		return 1;
+	} else if (status < 0) {
+		free(fds);
+		return nixio__perror(L);
+	}
+
+	for (i = 0; i < len; i++) {
+		lua_rawgeti(L, 1, i+1);
+
+		lua_pushliteral(L, "revents");
+		lua_pushinteger(L, fds[i].revents);
+		lua_rawset(L, -3);
+
+		lua_pop(L, 1);
+	}
+
+	free(fds);
+
+	lua_pushinteger(L, status);
+	lua_pushvalue(L, 1);
+
+	return 2;
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"gettimeofday", nixio_gettimeofday},
+	{"nanosleep",	nixio_nanosleep},
+	{"poll",		nixio_poll},
+	{"poll_flags",	nixio_poll_flags},
+	{NULL,			NULL}
+};
+
+void nixio_open_poll(lua_State *L) {
+	luaL_register(L, NULL, R);
+}
diff --git a/trunk/package/luci/libs/nixio/src/process.c b/trunk/package/luci/libs/nixio/src/process.c
new file mode 100644
index 00000000..5ae9b829
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/process.c
@@ -0,0 +1,450 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <signal.h>
+
+#define NIXIO_EXECVE	0x01
+#define NIXIO_EXECV		0x02
+#define NIXIO_EXECVP	0x03
+
+int nixio__exec(lua_State *L, int m) {
+	const char *path = luaL_checkstring(L, 1);
+	const char *arg;
+	int argn, i;
+
+	if (m == NIXIO_EXECVE) {
+		luaL_checktype(L, 2, LUA_TTABLE);
+		argn = lua_objlen(L, 2) + 1;
+	} else {
+		argn = lua_gettop(L);
+	}
+
+	char **args = lua_newuserdata(L, sizeof(char*) * (argn + 1));
+	args[argn] = NULL;
+	args[0] = (char *)path;
+
+	if (m == NIXIO_EXECVE) {
+		for (i = 1; i < argn; i++) {
+			lua_rawgeti(L, 2, i);
+			arg = lua_tostring(L, -1);
+			luaL_argcheck(L, arg, 2, "invalid argument");
+			args[i] = (char *)arg;
+		}
+
+		if (lua_isnoneornil(L, 3)) {
+			execv(path, args);
+		} else {
+			luaL_checktype(L, 3, LUA_TTABLE);
+			argn = 0;
+			lua_pushnil(L);
+			while (lua_next(L, 3)) {
+				if (!lua_checkstack(L, 1)) {
+					lua_settop(L, 0);
+					return luaL_error(L, "stack overflow");
+				}
+
+				if (lua_type(L, -2) != LUA_TSTRING || !lua_isstring(L, -1)) {
+					return luaL_argerror(L, 3, "invalid environment");
+				}
+
+				lua_pushfstring(L, "%s=%s",
+						lua_tostring(L, -2), lua_tostring(L, -1));
+
+				lua_insert(L, 5);
+				lua_pop(L, 1);
+				argn++;
+			}
+
+			char **env = lua_newuserdata(L, sizeof(char*) * (argn + 1));
+			env[argn] = NULL;
+
+			for (i = 1; i <= argn; i++) {
+				env[i-1] = (char *)lua_tostring(L, -(i+1));
+			}
+
+			execve(path, args, env);
+		}
+	} else {
+		for (i = 2; i <= argn; i++) {
+			arg = luaL_checkstring(L, i);
+			args[i-1] = (char *)arg;
+		}
+
+		if (m == NIXIO_EXECV) {
+			execv(path, args);
+		} else {
+			execvp(path, args);
+		}
+	}
+
+	return nixio__perror(L);
+}
+
+#ifndef __WINNT__
+#include <sys/utsname.h>
+#include <sys/times.h>
+#include <sys/wait.h>
+#include <pwd.h>
+#include <grp.h>
+
+static int nixio_fork(lua_State *L) {
+	pid_t pid = fork();
+	if (pid == -1) {
+		return nixio__perror(L);
+	} else {
+		lua_pushinteger(L, pid);
+		return 1;
+	}
+}
+
+static int nixio_kill(lua_State *L) {
+	return nixio__pstatus(L, !kill(luaL_checkint(L, 1), luaL_checkint(L, 2)));
+}
+
+static int nixio_getppid(lua_State *L) {
+	lua_pushinteger(L, getppid());
+	return 1;
+}
+
+static int nixio_getuid(lua_State *L) {
+	lua_pushinteger(L, getuid());
+	return 1;
+}
+
+static int nixio_getgid(lua_State *L) {
+	lua_pushinteger(L, getgid());
+	return 1;
+}
+
+static int nixio_setgid(lua_State *L) {
+	return nixio__pstatus(L, !setgid(nixio__check_group(L, 1)));
+}
+
+static int nixio_setuid(lua_State *L) {
+	return nixio__pstatus(L, !setuid(nixio__check_user(L, 1)));
+}
+
+static int nixio_nice(lua_State *L) {
+	int nval = luaL_checkint(L, 1);
+
+	errno = 0;
+	nval = nice(nval);
+
+	if (nval == -1 && errno) {
+		return nixio__perror(L);
+	} else {
+		lua_pushinteger(L, nval);
+		return 1;
+	}
+}
+
+static int nixio_setsid(lua_State *L) {
+	pid_t pid = setsid();
+
+	if (pid == -1) {
+		return nixio__perror(L);
+	} else {
+		lua_pushinteger(L, pid);
+		return 1;
+	}
+}
+
+static int nixio_wait(lua_State *L) {
+	pid_t pidin = luaL_optinteger(L, 1, -1), pidout;
+	int options = 0, status;
+
+	const int j = lua_gettop(L);
+	for (int i=2; i<=j; i++) {
+		const char *flag = luaL_checkstring(L, i);
+		if (!strcmp(flag, "nohang")) {
+			options |= WNOHANG;
+		} else if (!strcmp(flag, "untraced")) {
+			options |= WUNTRACED;
+		} else if (!strcmp(flag, "continued")) {
+			options |= WCONTINUED;
+		} else {
+			return luaL_argerror(L, i,
+					"supported values: nohang, untraced, continued");
+		}
+	}
+
+	do {
+		pidout = waitpid(pidin, &status, options);
+	} while (pidout == -1 && errno == EINTR);
+
+	if (pidout == 0) {
+		lua_pushboolean(L, 0);
+		return 1;
+	} else if (pidout == -1) {
+		return nixio__perror(L);
+	} else {
+		lua_pushinteger(L, pidout);
+	}
+
+	if (WIFEXITED(status)) {
+		lua_pushliteral(L, "exited");
+		lua_pushinteger(L, WEXITSTATUS(status));
+    } else if (WIFSIGNALED(status)) {
+    	lua_pushliteral(L, "signaled");
+    	lua_pushinteger(L, WTERMSIG(status));
+    } else if (WIFSTOPPED(status)) {
+    	lua_pushliteral(L, "stopped");
+    	lua_pushinteger(L, WSTOPSIG(status));
+    } else {
+    	return 1;
+    }
+
+    return 3;
+}
+
+static int nixio_times(lua_State *L) {
+	struct tms buf;
+	if (times(&buf) == -1) {
+		return nixio__perror(L);
+	} else {
+		lua_createtable(L, 0, 4);
+		nixio__pushnumber(L, buf.tms_cstime);
+		lua_setfield(L, -2, "cstime");
+
+		nixio__pushnumber(L, buf.tms_cutime);
+		lua_setfield(L, -2, "cutime");
+
+		nixio__pushnumber(L, buf.tms_stime);
+		lua_setfield(L, -2, "stime");
+
+		nixio__pushnumber(L, buf.tms_utime);
+		lua_setfield(L, -2, "utime");
+
+		return 1;
+	}
+}
+
+static int nixio_uname(lua_State *L) {
+	struct utsname buf;
+	if (uname(&buf)) {
+		return nixio__perror(L);
+	}
+
+	lua_createtable(L, 0, 5);
+
+	lua_pushstring(L, buf.machine);
+	lua_setfield(L, -2, "machine");
+
+	lua_pushstring(L, buf.version);
+	lua_setfield(L, -2, "version");
+
+	lua_pushstring(L, buf.release);
+	lua_setfield(L, -2, "release");
+
+	lua_pushstring(L, buf.nodename);
+	lua_setfield(L, -2, "nodename");
+
+	lua_pushstring(L, buf.sysname);
+	lua_setfield(L, -2, "sysname");
+
+	return 1;
+}
+
+#endif /* !__WINNT__ */
+
+static int nixio_chdir(lua_State *L) {
+	return nixio__pstatus(L, !chdir(luaL_checkstring(L, 1)));
+}
+
+static int nixio_signal(lua_State *L) {
+	int sig = luaL_checkinteger(L, 1);
+	const char *val = luaL_checkstring(L, 2);
+
+	if (!strcmp(val, "ign") || !strcmp(val, "ignore")) {
+		return nixio__pstatus(L, signal(sig, SIG_IGN) != SIG_ERR);
+	} else if (!strcmp(val, "dfl") || !strcmp(val, "default")) {
+		return nixio__pstatus(L, signal(sig, SIG_DFL) != SIG_ERR);
+	} else {
+		return luaL_argerror(L, 2, "supported values: ign, dfl");
+	}
+}
+
+static int nixio_getpid(lua_State *L) {
+	lua_pushinteger(L, getpid());
+	return 1;
+}
+
+static int nixio_getenv(lua_State *L) {
+	const char *key = luaL_optstring(L, 1, NULL);
+	if (key) {
+		const char *val = getenv(key);
+		if (val) {
+			lua_pushstring(L, val);
+		} else {
+			lua_pushnil(L);
+		}
+	} else {
+		lua_newtable(L);
+		extern char **environ;
+		for (char **c = environ; *c; c++) {
+			const char *delim = strchr(*c, '=');
+			if (!delim) {
+				return luaL_error(L, "invalid environment");
+			}
+			lua_pushlstring(L, *c, delim-*c);
+			lua_pushstring(L, delim + 1);
+			lua_rawset(L, -3);
+		}
+	}
+	return 1;
+}
+
+static int nixio_setenv(lua_State *L) {
+	const char *key = luaL_checkstring(L, 1);
+	const char *val = luaL_optstring(L, 2, NULL);
+	return nixio__pstatus(L, (val) ? !setenv(key, val, 1) : !unsetenv(key));
+}
+
+static int nixio_exec(lua_State *L) {
+	return nixio__exec(L, NIXIO_EXECV);
+}
+
+static int nixio_execp(lua_State *L) {
+	return nixio__exec(L, NIXIO_EXECVP);
+}
+
+static int nixio_exece(lua_State *L) {
+	return nixio__exec(L, NIXIO_EXECVE);
+}
+
+static int nixio_getcwd(lua_State *L) {
+	char path[PATH_MAX];
+
+	if (getcwd(path, sizeof(path))) {
+		lua_pushstring(L, path);
+		return 1;
+	} else {
+		return nixio__perror(L);
+	}
+}
+
+static int nixio_umask(lua_State *L) {
+	char mask[9];
+	lua_pushinteger(L,
+			nixio__mode_write(umask(nixio__check_mode(L, 1, -1)), mask));
+	lua_pushlstring(L, mask, 9);
+	return 2;
+}
+
+#ifdef __linux__
+
+#include <sys/sysinfo.h>
+
+static int nixio_sysinfo(lua_State *L) {
+	struct sysinfo info;
+	if (sysinfo(&info)) {
+		return nixio__perror(L);
+	}
+
+	lua_createtable(L, 0, 12);
+
+	nixio__pushnumber(L, info.bufferram);
+	lua_setfield(L, -2, "bufferram");
+
+	nixio__pushnumber(L, info.freehigh);
+	lua_setfield(L, -2, "freehigh");
+
+	nixio__pushnumber(L, info.freeram);
+	lua_setfield(L, -2, "freeram");
+
+	nixio__pushnumber(L, info.freeswap);
+	lua_setfield(L, -2, "freeswap");
+
+	lua_createtable(L, 0, 3);
+	for (int i=0; i<3; i++) {
+		lua_pushnumber(L, info.loads[i] / 65536.);
+		lua_rawseti(L, -2, i+1);
+	}
+	lua_setfield(L, -2, "loads");
+
+	lua_pushinteger(L, info.mem_unit);
+	lua_setfield(L, -2, "mem_unit");
+
+	lua_pushinteger(L, info.procs);
+	lua_setfield(L, -2, "procs");
+
+	nixio__pushnumber(L, info.sharedram);
+	lua_setfield(L, -2, "sharedram");
+
+	nixio__pushnumber(L, info.totalhigh);
+	lua_setfield(L, -2, "totalhigh");
+
+	nixio__pushnumber(L, info.totalram);
+	lua_setfield(L, -2, "totalram");
+
+	nixio__pushnumber(L, info.totalswap);
+	lua_setfield(L, -2, "totalswap");
+
+	lua_pushinteger(L, info.uptime);
+	lua_setfield(L, -2, "uptime");
+
+	return 1;
+}
+
+#endif
+
+
+/* module table */
+static const luaL_reg R[] = {
+#ifdef __linux__
+	{"sysinfo",		nixio_sysinfo},
+#endif
+#ifndef __WINNT__
+	{"fork",		nixio_fork},
+	{"kill",		nixio_kill},
+	{"nice",		nixio_nice},
+	{"getppid",		nixio_getppid},
+	{"getuid",		nixio_getuid},
+	{"getgid",		nixio_getgid},
+	{"setuid",		nixio_setuid},
+	{"setgid",		nixio_setgid},
+	{"setsid",		nixio_setsid},
+	{"wait",		nixio_wait},
+	{"waitpid",		nixio_wait},
+	{"times",		nixio_times},
+	{"uname",		nixio_uname},
+#endif
+	{"chdir",		nixio_chdir},
+	{"signal",		nixio_signal},
+	{"getpid",		nixio_getpid},
+	{"getenv",		nixio_getenv},
+	{"setenv",		nixio_setenv},
+	{"putenv",		nixio_setenv},
+	{"exec",		nixio_exec},
+	{"execp",		nixio_execp},
+	{"exece",		nixio_exece},
+	{"getcwd",		nixio_getcwd},
+	{"umask",		nixio_umask},
+	{NULL,			NULL}
+};
+
+void nixio_open_process(lua_State *L) {
+	luaL_register(L, NULL, R);
+}
diff --git a/trunk/package/luci/libs/nixio/src/protoent.c b/trunk/package/luci/libs/nixio/src/protoent.c
new file mode 100644
index 00000000..7e3f19ad
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/protoent.c
@@ -0,0 +1,103 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2011 Jo-Philipp Wich <jow@librecmc.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+
+#ifndef __WINNT__
+#include <netdb.h>
+#endif
+
+/**
+ * protoent conversion helper
+ */
+static int nixio__pushprotoent(lua_State *L, struct protoent *e) {
+	int i;
+	if (e) {
+		lua_newtable(L);
+
+		lua_pushstring(L, e->p_name);
+		lua_setfield(L, -2, "name");
+
+		lua_pushnumber(L, e->p_proto);
+		lua_setfield(L, -2, "proto");
+
+		lua_newtable(L);
+		for (i = 0; e->p_aliases[i]; i++) {
+			lua_pushstring(L, e->p_aliases[i]);
+			lua_rawseti(L, -2, i+1);
+		}
+		lua_setfield(L, -2, "aliases");
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+/**
+ * getprotobyname(name)
+ */
+static int nixio_getprotobyname(lua_State *L) {
+	const char *name = luaL_checkstring(L, 1);
+	struct protoent *res = getprotobyname(name);
+	return nixio__pushprotoent(L, res);
+}
+
+/**
+ * getprotobynumber(proto)
+ */
+static int nixio_getprotobynumber(lua_State *L) {
+	int proto = luaL_checkinteger(L, 1);
+	struct protoent *res = getprotobynumber(proto);
+	return nixio__pushprotoent(L, res);
+}
+
+/**
+ * getproto(name_or_proto)
+ */
+static int nixio_getproto(lua_State *L) {
+	int i = 1;
+	struct protoent *res;
+	if (lua_isnumber(L, 1)) {
+		return nixio_getprotobynumber(L);
+	} else if (lua_isstring(L, 1)) {
+		return nixio_getprotobyname(L);
+	} else if (lua_isnoneornil(L, 1)) {
+		setprotoent(1);
+		lua_newtable(L);
+		while ((res = getprotoent()) != NULL) {
+			nixio__pushprotoent(L, res);
+			lua_rawseti(L, -2, i++);
+		}
+		endprotoent();
+		return 1;
+	} else {
+		return luaL_argerror(L, 1, "supported values: <protoname>, <protonumber>");
+	}
+}
+
+/* module table */
+static const luaL_reg R[] = {
+    {"getprotobyname",		nixio_getprotobyname},
+    {"getprotobynumber",	nixio_getprotobynumber},
+    {"getproto",			nixio_getproto},
+    {NULL,					NULL}
+};
+
+void nixio_open_protoent(lua_State *L) {
+    luaL_register(L, NULL, R);
+}
diff --git a/trunk/package/luci/libs/nixio/src/socket.c b/trunk/package/luci/libs/nixio/src/socket.c
new file mode 100644
index 00000000..17c6afc7
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/socket.c
@@ -0,0 +1,173 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+
+/**
+ * create new socket
+ */
+static int nixio_socket(lua_State *L) {
+	const char *domain = luaL_optlstring(L, 1, "", NULL);
+	const char *type   = luaL_optlstring(L, 2, "", NULL);
+	const char *proto  = lua_tolstring(L, 3, NULL);
+
+	nixio_sock *sock = lua_newuserdata(L, sizeof(nixio_sock));
+	if (!sock) {
+		return luaL_error(L, "out of memory");
+	}
+
+	if (!strcmp(domain, "inet")) {
+		sock->domain = AF_INET;
+	} else if (!strcmp(domain, "inet6")) {
+		sock->domain = AF_INET6;
+	} else if (!strcmp(domain, "unix")) {
+		sock->domain = AF_UNIX;
+	/*} else if (!strcmp(domain, "packet")) {
+		sock->domain = AF_PACKET;*/
+	} else {
+		return luaL_argerror(L, 1,
+		 "supported values: inet, inet6, unix, packet"
+		);
+	}
+
+	if (!strcmp(type, "stream")) {
+		sock->type = SOCK_STREAM;
+	} else if (!strcmp(type, "dgram")) {
+		sock->type = SOCK_DGRAM;
+	} else if (!strcmp(type, "raw")) {
+		sock->type = SOCK_RAW;
+	} else {
+		return luaL_argerror(L, 2, "supported values: stream, dgram, raw");
+	}
+
+	if (!proto) {
+		sock->protocol = 0;
+	} else if (!strcmp(proto, "icmp")) {
+		sock->protocol = IPPROTO_ICMP;
+	} else if (!strcmp(proto, "icmpv6")) {
+		sock->protocol = IPPROTO_ICMPV6;
+	} else {
+		return luaL_argerror(L, 3, "supported values: [empty], icmp, icmpv6");
+	}
+
+	/* create userdata */
+	luaL_getmetatable(L, NIXIO_META);
+	lua_setmetatable(L, -2);
+
+	sock->fd = socket(sock->domain, sock->type, sock->protocol);
+
+	if (sock->fd < 0) {
+		return nixio__perror_s(L);
+	}
+
+	return 1;
+}
+
+/**
+ * close a socket
+ */
+static int nixio_sock_close(lua_State *L) {
+	nixio_sock *sock = nixio__checksock(L);
+	int sockfd = sock->fd;
+	int res;
+	sock->fd = -1;
+
+	do {
+#ifndef __WINNT__
+		res = close(sockfd);
+#else
+		res = closesocket(sockfd);
+#endif
+	} while (res == -1 && errno == EINTR);
+
+	return nixio__pstatus_s(L, !res);
+}
+
+/**
+ * garbage collector
+ */
+static int nixio_sock__gc(lua_State *L) {
+	nixio_sock *sock = (nixio_sock*)luaL_checkudata(L, 1, NIXIO_META);
+	int res;
+	if (sock && sock->fd != -1) {
+		do {
+#ifndef __WINNT__
+			res = close(sock->fd);
+#else
+			res = closesocket(sock->fd);
+#endif
+		} while (res == -1 && errno == EINTR);
+	}
+	return 0;
+}
+
+/**
+ * string representation
+ */
+static int nixio_sock__tostring(lua_State *L) {
+	lua_pushfstring(L, "nixio socket %d", nixio__checksockfd(L));
+	return 1;
+}
+
+/**
+ * shutdown a socket
+ */
+static int nixio_sock_shutdown(lua_State *L) {
+	int sockfd = nixio__checksockfd(L);
+	const char *what = luaL_optlstring(L, 2, "rdwr", NULL);
+	int how;
+
+	if (!strcmp(what, "rdwr") || !strcmp(what, "both")) {
+		how = SHUT_RDWR;
+	} else if (!strcmp(what, "rd") || !strcmp(what, "read")) {
+		how = SHUT_RD;
+	} else if (!strcmp(what, "wr") || !strcmp(what, "write")) {
+		how = SHUT_WR;
+	} else {
+		return luaL_argerror(L, 2, "supported values: both, read, write");
+	}
+
+	return nixio__pstatus_s(L, !shutdown(sockfd, how));
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"socket",		nixio_socket},
+	{NULL,			NULL}
+};
+
+/* object table */
+static const luaL_reg M[] = {
+	{"close",		nixio_sock_close},
+	{"shutdown",	nixio_sock_shutdown},
+	{"__gc",		nixio_sock__gc},
+	{"__tostring",	nixio_sock__tostring},
+	{NULL,			NULL}
+};
+
+void nixio_open_socket(lua_State *L) {
+	luaL_register(L, NULL, R);
+
+	lua_pushvalue(L, -2);
+	luaL_register(L, NULL, M);
+	lua_pop(L, 1);
+}
diff --git a/trunk/package/luci/libs/nixio/src/sockopt.c b/trunk/package/luci/libs/nixio/src/sockopt.c
new file mode 100644
index 00000000..cede884c
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/sockopt.c
@@ -0,0 +1,390 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+
+#ifndef __WINNT__
+#include <net/if.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#ifndef IPV6_ADD_MEMBERSHIP
+#define IPV6_ADD_MEMBERSHIP		IPV6_JOIN_GROUP
+#endif
+
+#ifndef IPV6_DROP_MEMBERSHIP
+#define IPV6_DROP_MEMBERSHIP	IPV6_LEAVE_GROUP
+#endif
+
+static int nixio_sock_fileno(lua_State *L) {
+	lua_pushinteger(L, nixio__checkfd(L, 1));
+	return 1;
+}
+
+/**
+ * setblocking()
+ */
+static int nixio_sock_setblocking(lua_State *L) {
+	int fd = nixio__checkfd(L, 1);
+	luaL_checkany(L, 2);
+	int set = lua_toboolean(L, 2);
+
+#ifndef __WINNT__
+
+	int flags = fcntl(fd, F_GETFL);
+
+	if (flags == -1) {
+		return nixio__perror(L);
+	}
+
+	if (!set) {
+		flags |= O_NONBLOCK;
+	} else {
+		flags &= ~O_NONBLOCK;
+	}
+
+	return nixio__pstatus(L, !fcntl(fd, F_SETFL, flags));
+
+#else /* __WINNT__ */
+
+	lua_getmetatable(L, 1);
+	luaL_getmetatable(L, NIXIO_META);
+	if (lua_equal(L, -1, -2)) {	/* Socket */
+		unsigned long val = !set;
+		return nixio__pstatus_s(L, !ioctlsocket(fd, FIONBIO, &val));
+	} else {					/* File */
+		WSASetLastError(WSAENOTSOCK);
+		return nixio__perror_s(L);
+	}
+
+#endif /* __WINNT__ */
+}
+
+static int nixio__gso_int(lua_State *L, int fd, int level, int opt, int set) {
+	int value;
+	socklen_t optlen = sizeof(value);
+	if (!set) {
+		if (!getsockopt(fd, level, opt, (char *)&value, &optlen)) {
+			lua_pushinteger(L, value);
+			return 1;
+		}
+	} else {
+		value = luaL_checkinteger(L, set);
+		if (!setsockopt(fd, level, opt, (char *)&value, optlen)) {
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	return nixio__perror_s(L);
+}
+
+static int nixio__gso_ling(lua_State *L, int fd, int level, int opt, int set) {
+	struct linger value;
+	socklen_t optlen = sizeof(value);
+	if (!set) {
+		if (!getsockopt(fd, level, opt, (char *)&value, &optlen)) {
+			lua_pushinteger(L, value.l_onoff ? value.l_linger : 0);
+			return 1;
+		}
+	} else {
+		value.l_linger = luaL_checkinteger(L, set);
+		value.l_onoff = value.l_linger ? 1 : 0;
+		if (!setsockopt(fd, level, opt, (char *)&value, optlen)) {
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	return nixio__perror_s(L);
+}
+
+static int nixio__gso_timev(lua_State *L, int fd, int level, int opt, int set) {
+	struct timeval value;
+	socklen_t optlen = sizeof(value);
+	if (!set) {
+		if (!getsockopt(fd, level, opt, (char *)&value, &optlen)) {
+			lua_pushinteger(L, value.tv_sec);
+			lua_pushinteger(L, value.tv_usec);
+			return 2;
+		}
+	} else {
+		value.tv_sec  = luaL_checkinteger(L, set);
+		value.tv_usec = luaL_optinteger(L, set + 1, 0);
+		if (!setsockopt(fd, level, opt, (char *)&value, optlen)) {
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	return nixio__perror_s(L);
+}
+
+#ifdef SO_BINDTODEVICE
+
+static int nixio__gso_b(lua_State *L, int fd, int level, int opt, int set) {
+	if (!set) {
+		socklen_t optlen = IFNAMSIZ;
+		char ifname[IFNAMSIZ];
+		if (!getsockopt(fd, level, opt, (char *)ifname, &optlen)) {
+			lua_pushlstring(L, ifname, optlen);
+			return 1;
+		}
+	} else {
+		size_t valuelen;
+		const char *value = luaL_checklstring(L, set, &valuelen);
+		luaL_argcheck(L, valuelen <= IFNAMSIZ, set, "invalid interface name");
+		if (!setsockopt(fd, level, opt, (char *)value, valuelen)) {
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	return nixio__perror_s(L);
+}
+
+#endif /* SO_BINDTODEVICE */
+
+static int nixio__gso_mreq4(lua_State *L, int fd, int level, int opt, int set) {
+	struct ip_mreq value;
+	socklen_t optlen = sizeof(value);
+	if (!set) {
+		char buf[INET_ADDRSTRLEN];
+		if (!getsockopt(fd, level, opt, (char *)&value, &optlen)) {
+			if (!inet_ntop(AF_INET, &value.imr_multiaddr, buf, sizeof(buf))) {
+				return nixio__perror_s(L);
+			}
+			lua_pushstring(L, buf);
+			if (!inet_ntop(AF_INET, &value.imr_interface, buf, sizeof(buf))) {
+				return nixio__perror_s(L);
+			}
+			lua_pushstring(L, buf);
+			return 2;
+		}
+	} else {
+		const char *maddr = luaL_checkstring(L, set);
+		const char *iface = luaL_optstring(L, set + 1, "0.0.0.0");
+		if (inet_pton(AF_INET, maddr, &value.imr_multiaddr) < 1) {
+			return nixio__perror_s(L);
+		}
+		if (inet_pton(AF_INET, iface, &value.imr_interface) < 1) {
+			return nixio__perror_s(L);
+		}
+		if (!setsockopt(fd, level, opt, (char *)&value, optlen)) {
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	return nixio__perror_s(L);
+}
+
+static int nixio__gso_mreq6(lua_State *L, int fd, int level, int opt, int set) {
+	struct ipv6_mreq val;
+	socklen_t optlen = sizeof(val);
+	if (!set) {
+		char buf[INET_ADDRSTRLEN];
+		if (!getsockopt(fd, level, opt, (char *)&val, &optlen)) {
+			if (!inet_ntop(AF_INET6, &val.ipv6mr_multiaddr, buf, sizeof(buf))) {
+				return nixio__perror_s(L);
+			}
+			lua_pushstring(L, buf);
+			lua_pushinteger(L, val.ipv6mr_interface);
+			return 2;
+		}
+	} else {
+		const char *maddr = luaL_checkstring(L, set);
+		if (inet_pton(AF_INET6, maddr, &val.ipv6mr_multiaddr) < 1) {
+			return nixio__perror_s(L);
+		}
+		val.ipv6mr_interface = luaL_optlong(L, set + 1, 0);
+		if (!setsockopt(fd, level, opt, (char *)&val, optlen)) {
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	return nixio__perror_s(L);
+}
+
+/**
+ * get/setsockopt() helper
+ */
+static int nixio__getsetsockopt(lua_State *L, int set) {
+	nixio_sock *sock = nixio__checksock(L);
+	const char *level = luaL_optlstring(L, 2, "", NULL);
+	const char *option = luaL_optlstring(L, 3, "", NULL);
+	set = (set) ? 4 : 0;
+
+	if (!strcmp(level, "socket")) {
+		if (!strcmp(option, "keepalive")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_KEEPALIVE, set);
+		} else if (!strcmp(option, "reuseaddr")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_REUSEADDR, set);
+		} else if (!strcmp(option, "rcvbuf")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_RCVBUF, set);
+		} else if (!strcmp(option, "sndbuf")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_SNDBUF, set);
+		} else if (!strcmp(option, "priority")) {
+#ifdef SO_PRIORITY
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_PRIORITY, set);
+#else
+			return nixio__pstatus(L, !(errno = ENOPROTOOPT));
+#endif
+		} else if (!strcmp(option, "broadcast")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_BROADCAST, set);
+		} else if (!strcmp(option, "dontroute")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_DONTROUTE, set);
+		} else if (!strcmp(option, "error")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_ERROR, set);
+		} else if (!strcmp(option, "oobinline")) {
+			return nixio__gso_int(L, sock->fd, SOL_SOCKET, SO_OOBINLINE, set);
+		} else if (!strcmp(option, "linger")) {
+			return nixio__gso_ling(L, sock->fd, SOL_SOCKET, SO_LINGER, set);
+		} else if (!strcmp(option, "sndtimeo")) {
+			return nixio__gso_timev(L, sock->fd, SOL_SOCKET, SO_SNDTIMEO, set);
+		} else if (!strcmp(option, "rcvtimeo")) {
+			return nixio__gso_timev(L, sock->fd, SOL_SOCKET, SO_RCVTIMEO, set);
+		} else if (!strcmp(option, "bindtodevice")) {
+#ifdef SO_BINDTODEVICE
+			return nixio__gso_b(L, sock->fd, SOL_SOCKET, SO_BINDTODEVICE, set);
+#else
+			return nixio__pstatus(L, !(errno = ENOPROTOOPT));
+#endif
+		} else {
+			return luaL_argerror(L, 3, "supported values: keepalive, reuseaddr,"
+			 " sndbuf, rcvbuf, priority, broadcast, linger, sndtimeo, rcvtimeo,"
+			 " dontroute, bindtodevice, error, oobinline"
+			);
+		}
+	} else if (!strcmp(level, "tcp")) {
+		if (!strcmp(option, "cork")) {
+#ifdef TCP_CORK
+			return nixio__gso_int(L, sock->fd, IPPROTO_TCP, TCP_CORK, set);
+#else
+			return nixio__pstatus(L, !(errno = ENOPROTOOPT));
+#endif
+		} else if (!strcmp(option, "nodelay")) {
+			return nixio__gso_int(L, sock->fd, IPPROTO_TCP, TCP_NODELAY, set);
+		} else {
+			return luaL_argerror(L, 3, "supported values: cork, nodelay");
+		}
+	} else if (!strcmp(level, "ip")) {
+		if (!strcmp(option, "mtu")) {
+#ifdef IP_MTU
+			return nixio__gso_int(L, sock->fd, IPPROTO_IP, IP_MTU, set);
+#else
+			return nixio__pstatus(L, !(errno = ENOPROTOOPT));
+#endif
+		} else if (!strcmp(option, "hdrincl")) {
+			return nixio__gso_int(L, sock->fd, IPPROTO_IP, IP_HDRINCL,
+					set);
+		} else if (!strcmp(option, "multicast_loop")) {
+			return nixio__gso_int(L, sock->fd, IPPROTO_IP, IP_MULTICAST_LOOP,
+					set);
+		} else if (!strcmp(option, "multicast_ttl")) {
+			return nixio__gso_int(L, sock->fd, IPPROTO_IP, IP_MULTICAST_TTL,
+					set);
+		} else if (!strcmp(option, "multicast_if")) {
+			return nixio__gso_mreq4(L, sock->fd, IPPROTO_IP, IP_MULTICAST_IF,
+					set);
+		} else if (!strcmp(option, "add_membership")) {
+			return nixio__gso_mreq4(L, sock->fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+					set);
+		} else if (!strcmp(option, "drop_membership")) {
+			return nixio__gso_mreq4(L, sock->fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
+					set);
+		} else {
+			return luaL_argerror(L, 3,
+				"supported values: hdrincl, mtu, multicast_loop, "
+				"multicast_ttl, multicast_if, add_membership, drop_membership");
+		}
+	} else if (!strcmp(level, "ipv6")) {
+		if (!strcmp(option, "mtu")) {
+#ifdef IPV6_MTU
+			return nixio__gso_int(L, sock->fd, IPPROTO_IPV6, IPV6_MTU, set);
+#else
+			return nixio__pstatus(L, !(errno = ENOPROTOOPT));
+#endif
+		} else if (!strcmp(option, "v6only")) {
+#ifdef IPV6_V6ONLY
+			return nixio__gso_int(L, sock->fd, IPPROTO_IPV6, IPV6_V6ONLY, set);
+#else
+			return nixio__pstatus(L, !(errno = ENOPROTOOPT));
+#endif
+		} else if (!strcmp(option, "multicast_loop")) {
+			return nixio__gso_int(L, sock->fd, IPPROTO_IPV6,
+					IPV6_MULTICAST_LOOP, set);
+		} else if (!strcmp(option, "multicast_hops")) {
+			return nixio__gso_int(L, sock->fd, IPPROTO_IPV6,
+					IPV6_MULTICAST_HOPS, set);
+		} else if (!strcmp(option, "multicast_if")) {
+			return nixio__gso_mreq6(L, sock->fd, IPPROTO_IPV6,
+					IPV6_MULTICAST_IF, set);
+		} else if (!strcmp(option, "add_membership")) {
+			return nixio__gso_mreq6(L, sock->fd, IPPROTO_IPV6,
+					IPV6_ADD_MEMBERSHIP, set);
+		} else if (!strcmp(option, "drop_membership")) {
+			return nixio__gso_mreq6(L, sock->fd, IPPROTO_IPV6,
+					IPV6_DROP_MEMBERSHIP, set);
+		} else {
+			return luaL_argerror(L, 3,
+				"supported values: v6only, mtu, multicast_loop, multicast_hops,"
+				" multicast_if, add_membership, drop_membership");
+		}
+	} else {
+		return luaL_argerror(L, 2, "supported values: socket, tcp, ip, ipv6");
+	}
+}
+
+/**
+ * getsockopt()
+ */
+static int nixio_sock_getsockopt(lua_State *L) {
+	return nixio__getsetsockopt(L, 0);
+}
+
+/**
+ * setsockopt()
+ */
+static int nixio_sock_setsockopt(lua_State *L) {
+	return nixio__getsetsockopt(L, 1);
+}
+
+/* module table */
+static const luaL_reg M[] = {
+	{"setblocking", nixio_sock_setblocking},
+	{"getsockopt",	nixio_sock_getsockopt},
+	{"setsockopt",	nixio_sock_setsockopt},
+	{"getopt",		nixio_sock_getsockopt},
+	{"setopt",		nixio_sock_setsockopt},
+	{"fileno",		nixio_sock_fileno},
+	{NULL,			NULL}
+};
+
+void nixio_open_sockopt(lua_State *L) {
+	lua_pushvalue(L, -2);
+	luaL_register(L, NULL, M);
+	lua_pop(L, 1);
+
+	luaL_getmetatable(L, NIXIO_FILE_META);
+	lua_pushcfunction(L, nixio_sock_setblocking);
+	lua_setfield(L, -2, "setblocking");
+	lua_pushcfunction(L, nixio_sock_fileno);
+	lua_setfield(L, -2, "fileno");
+	lua_pop(L, 1);
+}
diff --git a/trunk/package/luci/libs/nixio/src/splice.c b/trunk/package/luci/libs/nixio/src/splice.c
new file mode 100644
index 00000000..db63ea9a
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/splice.c
@@ -0,0 +1,185 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifdef __linux__
+#define _GNU_SOURCE
+#endif
+
+#include "nixio.h"
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+
+#ifndef __WINNT__
+
+#ifndef BSD
+#include <sys/sendfile.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#endif
+
+#ifdef _GNU_SOURCE
+#ifdef SPLICE_F_MOVE
+
+/* guess what sucks... */
+#ifdef __UCLIBC__
+#include <unistd.h>
+#include <sys/syscall.h>
+
+ssize_t splice(int __fdin, __off64_t *__offin, int __fdout,
+        __off64_t *__offout, size_t __len, unsigned int __flags) {
+#ifdef __NR_splice
+	return syscall(__NR_splice, __fdin, __offin, __fdout, __offout, __len, __flags);
+#else
+	(void)__fdin;
+	(void)__offin;
+	(void)__fdout;
+	(void)__offout;
+	(void)__len;
+	(void)__flags;
+	errno = ENOSYS;
+	return -1;
+#endif
+}
+
+#undef SPLICE_F_MOVE
+#undef SPLICE_F_NONBLOCK
+#undef SPLICE_F_MORE
+
+#define SPLICE_F_MOVE 1
+#define SPLICE_F_NONBLOCK 2
+#define SPLICE_F_MORE 4
+
+#endif /* __UCLIBC__ */
+
+/**
+ * splice(fd_in, fd_out, length, flags)
+ */
+static int nixio_splice(lua_State *L) {
+	int fd_in = nixio__checkfd(L, 1);
+	int fd_out = nixio__checkfd(L, 2);
+	size_t len = luaL_checkinteger(L, 3);
+	int flags = luaL_optinteger(L, 4, 0);
+	long spliced;
+
+	do {
+		spliced = splice(fd_in, NULL, fd_out, NULL, len, flags);
+	} while (spliced == -1 && errno == EINTR);
+
+	if (spliced < 0) {
+		return nixio__perror(L);
+	}
+
+	lua_pushinteger(L, spliced);
+	return 1;
+}
+
+/**
+ * Translate splice flags to integer
+ */
+static int nixio_splice_flags(lua_State *L) {
+	const int j = lua_gettop(L);
+	int flags = 0;
+	for (int i=1; i<=j; i++) {
+		const char *flag = luaL_checkstring(L, i);
+		if (!strcmp(flag, "move")) {
+			flags |= SPLICE_F_MOVE;
+		} else if (!strcmp(flag, "nonblock")) {
+			flags |= SPLICE_F_NONBLOCK;
+		} else if (!strcmp(flag, "more")) {
+			flags |= SPLICE_F_MORE;
+		} else {
+			return luaL_argerror(L, i, "supported values: "
+			 "move, nonblock, more");
+		}
+	}
+	lua_pushinteger(L, flags);
+
+	return 1;
+}
+
+#endif /* SPLICE_F_MOVE */
+#endif /* _GNU_SOURCE */
+
+/**
+ * sendfile(outfd, infd, length)
+ */
+static int nixio_sendfile(lua_State *L) {
+	int sock = nixio__checksockfd(L);
+	int infd = nixio__checkfd(L, 2);
+	size_t len = luaL_checkinteger(L, 3);
+	off_t spliced;
+
+#ifndef BSD
+	do {
+		spliced = sendfile(sock, infd, NULL, len);
+	} while (spliced == -1 && errno == EINTR);
+
+	if (spliced == -1) {
+		return nixio__perror(L);
+	}
+#else
+	int r;
+	const off_t offset = lseek(infd, 0, SEEK_CUR);
+
+	do {
+#ifdef __DARWIN__
+		r = sendfile(infd, sock, offset, (off_t *)&len, NULL, 0);
+		spliced = r;
+#else
+		r = sendfile(infd, sock, offset, len, NULL, &spliced, 0);
+#endif
+	} while (r == -1 && errno == EINTR);
+
+	if (r == -1) {
+		return nixio__perror(L);
+	}
+#endif
+
+	lua_pushinteger(L, spliced);
+	return 1;
+}
+
+/* module table */
+static const luaL_reg R[] = {
+#ifdef _GNU_SOURCE
+#ifdef SPLICE_F_MOVE
+	{"splice",			nixio_splice},
+	{"splice_flags",	nixio_splice_flags},
+#endif
+#endif
+	{"sendfile",		nixio_sendfile},
+	{NULL,			NULL}
+};
+
+
+void nixio_open_splice(lua_State *L) {
+	luaL_register(L, NULL, R);
+}
+
+#else /* __WINNT__ */
+
+void nixio_open_splice(lua_State *L) {
+}
+
+#endif /* !__WINNT__ */
diff --git a/trunk/package/luci/libs/nixio/src/syslog.c b/trunk/package/luci/libs/nixio/src/syslog.c
new file mode 100644
index 00000000..89f1b1dd
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/syslog.c
@@ -0,0 +1,122 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <string.h>
+
+#ifndef __WINNT__
+#include <syslog.h>
+
+
+static int nixio_openlog(lua_State *L) {
+	int option = 0, facility = LOG_USER;
+
+	const char *ident = luaL_optstring(L, 1, "nixio");
+	const int j = lua_gettop(L);
+	for (int i=2; i<=j; i++) {
+		const char *flag = luaL_checkstring(L, i);
+		if (!strcmp(flag, "cons")) {
+			option |= LOG_CONS;
+		} else if (!strcmp(flag, "nowait")) {
+			option |= LOG_NOWAIT;
+		} else if (!strcmp(flag, "pid")) {
+			option |= LOG_PID;
+		} else if (!strcmp(flag, "perror")) {
+#ifdef LOG_PERROR
+			option |= LOG_PERROR;
+#endif
+		} else if (!strcmp(flag, "ndelay")) {
+			option |= LOG_NDELAY;
+		} else if (!strcmp(flag, "odelay")) {
+			option |= LOG_ODELAY;
+		} else {
+			return luaL_argerror(L, i,
+				"supported values: cons, nowait, pid, perror, ndelay, odelay");
+		}
+	}
+
+	openlog(ident, option, facility);
+	return 0;
+}
+
+static int nixio_closelog(lua_State *L) {
+	closelog();
+	return 0;
+}
+
+static int nixio__syslogmask(lua_State *L, int dolog) {
+	int priority;
+
+	const char *flag = luaL_checkstring(L, 1);
+	if (!strcmp(flag, "emerg")) {
+		priority = LOG_EMERG;
+	} else if (!strcmp(flag, "alert")) {
+		priority = LOG_ALERT;
+	} else if (!strcmp(flag, "crit")) {
+		priority = LOG_CRIT;
+	} else if (!strcmp(flag, "err")) {
+		priority = LOG_ERR;
+	} else if (!strcmp(flag, "warning")) {
+		priority = LOG_WARNING;
+	} else if (!strcmp(flag, "notice")) {
+		priority = LOG_NOTICE;
+	} else if (!strcmp(flag, "info")) {
+		priority = LOG_INFO;
+	} else if (!strcmp(flag, "debug")) {
+		priority = LOG_DEBUG;
+	} else {
+		return luaL_argerror(L, 1, "supported values: emerg, alert, crit, err, "
+				"warning, notice, info, debug");
+	}
+
+	if (dolog) {
+		const char *msg = luaL_checkstring(L, 2);
+		syslog(priority, "%s", msg);
+	} else {
+		setlogmask(LOG_UPTO(priority));
+	}
+	return 0;
+}
+
+static int nixio_setlogmask(lua_State *L) {
+	return nixio__syslogmask(L, 0);
+}
+
+static int nixio_syslog(lua_State *L) {
+	return nixio__syslogmask(L, 1);
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"openlog",		nixio_openlog},
+	{"syslog",		nixio_syslog},
+	{"setlogmask",	nixio_setlogmask},
+	{"closelog",	nixio_closelog},
+	{NULL,			NULL}
+};
+
+void nixio_open_syslog(lua_State *L) {
+	luaL_register(L, NULL, R);
+}
+
+#else /* __WINNT__ */
+
+void nixio_open_syslog(lua_State *L) {
+}
+
+#endif /* __WINNT__ */
diff --git a/trunk/package/luci/libs/nixio/src/tls-context.c b/trunk/package/luci/libs/nixio/src/tls-context.c
new file mode 100644
index 00000000..e9a833f5
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/tls-context.c
@@ -0,0 +1,248 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio-tls.h"
+#include <string.h>
+
+static SSL_CTX* nixio__checktlsctx(lua_State *L) {
+	SSL_CTX **ctx = (SSL_CTX **)luaL_checkudata(L, 1, NIXIO_TLS_CTX_META);
+	luaL_argcheck(L, *ctx, 1, "invalid context");
+	return *ctx;
+}
+
+static int nixio__tls_perror(lua_State *L, int code) {
+	lua_pushnil(L);
+	lua_pushinteger(L, code);
+	return 2;
+}
+
+static int nixio__tls_pstatus(lua_State *L, int code) {
+	if (code == 1) {
+		lua_pushboolean(L, 1);
+		return 1;
+	} else {
+		return nixio__tls_perror(L, code);
+	}
+}
+
+static int nixio_tls_ctx(lua_State * L) {
+	const char *method = luaL_optlstring(L, 1, "client", NULL);
+
+	luaL_getmetatable(L, NIXIO_TLS_CTX_META);
+	SSL_CTX **ctx = lua_newuserdata(L, sizeof(SSL_CTX *));
+	if (!ctx) {
+		return luaL_error(L, "out of memory");
+	}
+
+	/* create userdata */
+	lua_pushvalue(L, -2);
+	lua_setmetatable(L, -2);
+
+	if (!strcmp(method, "client")) {
+		*ctx = SSL_CTX_new(TLSv1_client_method());
+	} else if (!strcmp(method, "server")) {
+		*ctx = SSL_CTX_new(TLSv1_server_method());
+	} else {
+		return luaL_argerror(L, 1, "supported values: client, server");
+	}
+
+	if (!(*ctx)) {
+		return luaL_error(L, "unable to create TLS context");
+	}
+
+#ifdef WITH_CYASSL
+	SSL_CTX_set_verify(*ctx, SSL_VERIFY_NONE, NULL);
+#endif
+
+	return 1;
+}
+
+static int nixio_tls_ctx_create(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	int fd = nixio__checkfd(L, 2);
+
+	lua_createtable(L, 0, 3);
+	nixio_tls_sock *sock = lua_newuserdata(L, sizeof(nixio_tls_sock));
+	if (!sock) {
+		return luaL_error(L, "out of memory");
+	}
+	memset(sock, 0, sizeof(nixio_tls_sock));
+
+	/* create userdata */
+	luaL_getmetatable(L, NIXIO_TLS_SOCK_META);
+	lua_pushvalue(L, -1);
+	lua_setmetatable(L, -3);
+
+	sock->socket = SSL_new(ctx);
+	if (!sock->socket) {
+		return nixio__tls_perror(L, 0);
+	}
+
+	if (SSL_set_fd(sock->socket, fd) != 1) {
+		return nixio__tls_perror(L, 0);
+	}
+
+	/* save context and socket to prevent GC from collecting them */
+	lua_setmetatable(L, -3);
+	lua_setfield(L, -2, "connection");
+
+	lua_pushvalue(L, 1);
+	lua_setfield(L, -2, "context");
+
+	lua_pushvalue(L, 2);
+	lua_setfield(L, -2, "socket");
+
+	return 1;
+}
+
+static int nixio_tls_ctx_set_cert(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	const char *cert = luaL_checkstring(L, 2);
+	const char *type = luaL_optstring(L, 3, "chain");
+	int ktype;
+
+	if (!strcmp(type, "chain")) {
+		return nixio__tls_pstatus(L,
+				SSL_CTX_use_certificate_chain_file(ctx, cert));
+	} else if (!strcmp(type, "pem")) {
+		ktype = SSL_FILETYPE_PEM;
+	} else if (!strcmp(type, "asn1")) {
+		ktype = SSL_FILETYPE_ASN1;
+	} else {
+		return luaL_argerror(L, 3, "supported values: chain, pem, asn1");
+	}
+
+	return nixio__tls_pstatus(L,
+			SSL_CTX_use_certificate_file(ctx, cert, ktype));
+}
+
+static int nixio_tls_ctx_set_verify_locations(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	const char *CAfile = luaL_optstring(L, 2, NULL);
+	const char *CApath = luaL_optstring(L, 3, NULL);
+	return nixio__tls_pstatus(L, SSL_CTX_load_verify_locations(ctx, 
+					CAfile, CApath));
+}
+
+static int nixio_tls_ctx_set_key(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	const char *cert = luaL_checkstring(L, 2);
+	const char *type = luaL_optstring(L, 3, "pem");
+	int ktype;
+
+	if (!strcmp(type, "pem")) {
+		ktype = SSL_FILETYPE_PEM;
+	} else if (!strcmp(type, "asn1")) {
+		ktype = SSL_FILETYPE_ASN1;
+	} else {
+		return luaL_argerror(L, 3, "supported values: pem, asn1");
+	}
+
+	return nixio__tls_pstatus(L, SSL_CTX_use_PrivateKey_file(ctx, cert, ktype));
+}
+
+static int nixio_tls_ctx_set_ciphers(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	size_t len;
+	const char *ciphers = luaL_checklstring(L, 2, &len);
+	luaL_argcheck(L, len < 255, 2, "cipher string too long");
+	return nixio__tls_pstatus(L, SSL_CTX_set_cipher_list(ctx, ciphers));
+}
+
+static int nixio_tls_ctx_set_verify(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	const int j = lua_gettop(L);
+	int flags = 0;
+	for (int i=2; i<=j; i++) {
+		const char *flag = luaL_checkstring(L, i);
+		if (!strcmp(flag, "none")) {
+			flags |= SSL_VERIFY_NONE;
+		} else if (!strcmp(flag, "peer")) {
+			flags |= SSL_VERIFY_PEER;
+		} else if (!strcmp(flag, "verify_fail_if_no_peer_cert")) {
+			flags |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
+		} else if (!strcmp(flag, "client_once")) {
+			flags |= SSL_VERIFY_CLIENT_ONCE;
+		} else {
+			return luaL_argerror(L, i, "supported values: none, peer, "
+			 "verify_fail_if_no_peer_cert, client_once");
+		}
+	}
+	SSL_CTX_set_verify(ctx, flags, NULL);
+	return 0;
+}
+
+static int nixio_tls_ctx__gc(lua_State *L) {
+	SSL_CTX **ctx = (SSL_CTX **)luaL_checkudata(L, 1, NIXIO_TLS_CTX_META);
+	if (*ctx) {
+		SSL_CTX_free(*ctx);
+		*ctx = NULL;
+	}
+	return 0;
+}
+
+static int nixio_tls_ctx__tostring(lua_State *L) {
+	SSL_CTX *ctx = nixio__checktlsctx(L);
+	lua_pushfstring(L, "nixio TLS context: %p", ctx);
+	return 1;
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"tls",		nixio_tls_ctx},
+	{NULL,			NULL}
+};
+
+/* ctx function table */
+static const luaL_reg CTX_M[] = {
+	{"set_cert",			nixio_tls_ctx_set_cert},
+	{"set_verify_locations",       nixio_tls_ctx_set_verify_locations},
+	{"set_key",				nixio_tls_ctx_set_key},
+	{"set_ciphers",			nixio_tls_ctx_set_ciphers},
+	{"set_verify",			nixio_tls_ctx_set_verify},
+	{"create",				nixio_tls_ctx_create},
+	{"__gc",				nixio_tls_ctx__gc},
+	{"__tostring",			nixio_tls_ctx__tostring},
+	{NULL,					NULL}
+};
+
+
+void nixio_open_tls_context(lua_State *L) {
+	/* initialize tls library */
+    SSL_load_error_strings();
+    SSL_library_init();
+
+    /* register module functions */
+    luaL_register(L, NULL, R);
+
+#if defined (WITH_AXTLS)
+    lua_pushliteral(L, "axtls");
+#elif defined (WITH_CYASSL)
+    lua_pushliteral(L, "cyassl");
+#else
+    lua_pushliteral(L, "openssl");
+#endif
+    lua_setfield(L, -2, "tls_provider");
+
+	/* create context metatable */
+	luaL_newmetatable(L, NIXIO_TLS_CTX_META);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	luaL_register(L, NULL, CTX_M);
+	lua_setfield(L, -2, "meta_tls_context");
+}
diff --git a/trunk/package/luci/libs/nixio/src/tls-crypto.c b/trunk/package/luci/libs/nixio/src/tls-crypto.c
new file mode 100644
index 00000000..714ec4e6
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/tls-crypto.c
@@ -0,0 +1,185 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio-tls.h"
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+static int nixio_crypto_hash__init(lua_State *L, int hmac) {
+	const char *type = luaL_checkstring(L, 1);
+	nixio_hash *hash = lua_newuserdata(L, sizeof(nixio_hash));
+
+	if (!strcmp(type, "md5")) {
+		hash->type = NIXIO_HASH_MD5;
+		hash->digest_size = MD5_DIGEST_LENGTH;
+		hash->block_size = 64;
+		hash->ctx = malloc(sizeof(MD5_CTX));
+		if (!hash->ctx) {
+			return luaL_error(L, NIXIO_OOM);
+		}
+		MD5_Init((MD5_CTX*)hash->ctx);
+		hash->init = (nixio_hash_initcb)MD5_Init;
+		hash->update = (nixio_hash_updatecb)MD5_Update;
+		hash->final = (nixio_hash_finalcb)MD5_Final;
+	} else if (!strcmp(type, "sha1")) {
+		hash->type = NIXIO_HASH_SHA1;
+		hash->digest_size = SHA_DIGEST_LENGTH;
+		hash->block_size = 64;
+		hash->ctx = malloc(sizeof(SHA_CTX));
+		if (!hash->ctx) {
+			return luaL_error(L, NIXIO_OOM);
+		}
+		SHA1_Init((SHA_CTX*)hash->ctx);
+		hash->init = (nixio_hash_initcb)SHA1_Init;
+		hash->update = (nixio_hash_updatecb)SHA1_Update;
+		hash->final = (nixio_hash_finalcb)SHA1_Final;
+	} else {
+		luaL_argerror(L, 1, "supported values: md5, sha1");
+	}
+
+	luaL_getmetatable(L, NIXIO_CRYPTO_HASH_META);
+	lua_setmetatable(L, -2);
+
+	if (hmac) {
+		const char *key = luaL_checklstring(L, 2, &hash->key_size);
+		if (hash->key_size > hash->block_size) {
+			hash->update(hash->ctx, key, hash->key_size);
+			hash->final(hash->digest, hash->ctx);
+			hash->init(hash->ctx);
+			hash->key_size = hash->digest_size;
+			memcpy(hash->key, hash->digest, hash->key_size);
+		} else {
+			memcpy(hash->key, key, hash->key_size);
+		}
+
+		unsigned char pad[NIXIO_CRYPTO_BLOCK_SIZE];
+		for (uint i = 0; i < hash->block_size; i++) {
+			pad[i] = (i < hash->key_size) ? (0x36 ^ hash->key[i]) : 0x36;
+		}
+		hash->update(hash->ctx, pad, hash->block_size);
+		hash->type |= NIXIO_HMAC_BIT;
+	}
+
+	return 1;
+}
+
+static int nixio_crypto_hash(lua_State *L) {
+	return nixio_crypto_hash__init(L, 0);
+}
+
+static int nixio_crypto_hmac(lua_State *L) {
+	return nixio_crypto_hash__init(L, 1);
+}
+
+static int nixio_crypto_hash_update(lua_State *L) {
+	nixio_hash *hash = luaL_checkudata(L, 1, NIXIO_CRYPTO_HASH_META);
+	if (hash->type) {
+		size_t len;
+		const char *chunk = luaL_checklstring(L, 2, &len);
+		hash->update(hash->ctx, chunk, len);
+		lua_pushvalue(L, 1);
+		return 1;
+	} else {
+		return luaL_error(L, "Tried to update finalized hash object.");
+	}
+}
+
+static int nixio_crypto_hash_final(lua_State *L) {
+	nixio_hash *hash = luaL_checkudata(L, 1, NIXIO_CRYPTO_HASH_META);
+	if (hash->type & NIXIO_HMAC_BIT) {
+		hash->final(hash->digest, hash->ctx);
+		hash->init(hash->ctx);
+
+		unsigned char pad[NIXIO_CRYPTO_BLOCK_SIZE];
+		for (uint i = 0; i < hash->block_size; i++) {
+			pad[i] = (i < hash->key_size) ? (0x5c ^ hash->key[i]) : 0x5c;
+		}
+
+		hash->update(hash->ctx, pad, hash->block_size);
+		hash->update(hash->ctx, hash->digest, hash->digest_size);
+	}
+
+	if (hash->type) {
+		hash->type = NIXIO_HASH_NONE;
+		hash->final(hash->digest, hash->ctx);
+		free(hash->ctx);
+	}
+
+	char hashdigest[NIXIO_DIGEST_SIZE*2];
+	for (uint i=0; i < hash->digest_size; i++) {
+		hashdigest[2*i]   = nixio__bin2hex[(hash->digest[i] & 0xf0) >> 4];
+		hashdigest[2*i+1] = nixio__bin2hex[(hash->digest[i] & 0x0f)];
+	}
+
+	lua_pushlstring(L, hashdigest, hash->digest_size * 2);
+	memcpy(hashdigest, hash->digest, hash->digest_size);
+	lua_pushlstring(L, hashdigest, hash->digest_size);
+
+	return 2;
+}
+
+static int nixio_crypto_hash__gc(lua_State *L) {
+	nixio_hash *hash = luaL_checkudata(L, 1, NIXIO_CRYPTO_HASH_META);
+	if (hash->type) {
+		hash->final(hash->digest, hash->ctx);
+		free(hash->ctx);
+		hash->type = NIXIO_HASH_NONE;
+	}
+	return 0;
+}
+
+static int nixio_crypto_hash__tostring(lua_State *L) {
+	nixio_hash *hash = luaL_checkudata(L, 1, NIXIO_CRYPTO_HASH_META);
+	lua_pushfstring(L, "nixio hash object: %p", hash);
+	return 1;
+}
+
+
+/* module table */
+static const luaL_reg R[] = {
+	{"hash",		nixio_crypto_hash},
+	{"hmac",		nixio_crypto_hmac},
+	{NULL,			NULL}
+};
+
+/* hash table */
+static const luaL_reg M[] = {
+	{"update",		nixio_crypto_hash_update},
+	{"final",		nixio_crypto_hash_final},
+	{"__gc",		nixio_crypto_hash__gc},
+	{"__tostring",	nixio_crypto_hash__tostring},
+	{NULL,			NULL}
+};
+
+
+
+void nixio_open_tls_crypto(lua_State *L) {
+	luaL_newmetatable(L, NIXIO_CRYPTO_HASH_META);
+	luaL_register(L, NULL, M);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	lua_pop(L, 1);
+
+	lua_newtable(L);
+    luaL_register(L, NULL, R);
+
+	lua_setfield(L, -2, "crypto");
+}
diff --git a/trunk/package/luci/libs/nixio/src/tls-socket.c b/trunk/package/luci/libs/nixio/src/tls-socket.c
new file mode 100644
index 00000000..fe4cb607
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/tls-socket.c
@@ -0,0 +1,263 @@
+ /*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio-tls.h"
+#include <string.h>
+#include <stdlib.h>
+
+static int nixio__tls_sock_perror(lua_State *L, SSL *sock, int code) {
+	lua_pushnil(L);
+	lua_pushinteger(L, SSL_get_error(sock, code));
+	return 2;
+}
+
+static int nixio__tls_sock_pstatus(lua_State *L, SSL *sock, int code) {
+	if (code > 0) {
+		lua_pushboolean(L, 1);
+		return 1;
+	} else {
+		return nixio__tls_sock_perror(L, sock, code);
+	}
+}
+
+static SSL* nixio__checktlssock(lua_State *L) {
+	if (lua_istable(L, 1)) {
+		lua_getfield(L, 1, "connection");
+		lua_replace(L, 1);
+	}
+	nixio_tls_sock *sock = luaL_checkudata(L, 1, NIXIO_TLS_SOCK_META);
+	luaL_argcheck(L, sock->socket, 1, "invalid context");
+	return sock->socket;
+}
+
+#ifndef WITH_AXTLS
+#define nixio_tls__check_connected(L) ;
+
+#define nixio_tls__set_connected(L, val) ;
+#else
+#define nixio_tls__check_connected(L) \
+	nixio_tls_sock *ctsock = luaL_checkudata(L, 1, NIXIO_TLS_SOCK_META);	\
+	if (!ctsock->connected) {	\
+		lua_pushnil(L);			\
+		lua_pushinteger(L, 1);	\
+		return 2;				\
+	}
+
+#define nixio_tls__set_connected(L, val) \
+((nixio_tls_sock*)luaL_checkudata(L, 1, NIXIO_TLS_SOCK_META))->connected = val;
+#endif /* WITH_AXTLS */
+
+static int nixio_tls_sock_recv(lua_State *L) {
+	SSL *sock = nixio__checktlssock(L);
+	nixio_tls__check_connected(L);
+	uint req = luaL_checkinteger(L, 2);
+
+	luaL_argcheck(L, req >= 0, 2, "out of range");
+
+	/* We limit the readsize to NIXIO_BUFFERSIZE */
+	req = (req > NIXIO_BUFFERSIZE) ? NIXIO_BUFFERSIZE : req;
+
+#ifndef WITH_AXTLS
+
+	char buffer[NIXIO_BUFFERSIZE];
+	int readc = SSL_read(sock, buffer, req);
+
+	if (readc < 0) {
+		return nixio__tls_sock_pstatus(L, sock, readc);
+	} else {
+		lua_pushlstring(L, buffer, readc);
+		return 1;
+	}
+
+#else
+
+	if (!req) {
+		lua_pushliteral(L, "");
+		return 1;
+	}
+
+	nixio_tls_sock *t = lua_touserdata(L, 1);
+
+	/* AXTLS doesn't handle buffering for us, so we have to hack around*/
+	if (req < t->pbufsiz) {
+		lua_pushlstring(L, t->pbufpos, req);
+		t->pbufpos += req;
+		t->pbufsiz -= req;
+		return 1;
+	} else {
+		uint8_t *axbuf;
+		int axread;
+
+		/* while handshake pending */
+		while ((axread = ssl_read(sock, &axbuf)) == SSL_OK);
+
+		if (t->pbufsiz) {
+			lua_pushlstring(L, t->pbufpos, t->pbufsiz);
+		}
+
+		if (axread < 0) {
+			/* There is an error */
+			free(t->pbuffer);
+			t->pbuffer = t->pbufpos = NULL;
+
+			if (axread != SSL_ERROR_CONN_LOST) {
+				t->pbufsiz = 0;
+				return nixio__tls_sock_perror(L, sock, axread);
+			} else {
+				if (!t->pbufsiz) {
+					lua_pushliteral(L, "");
+				} else {
+					t->pbufsiz = 0;
+				}
+			}
+		} else {
+			int stillwant = req - t->pbufsiz;
+			if (stillwant < axread) {
+				/* we got more data than we need */
+				lua_pushlstring(L, (char *)axbuf, stillwant);
+				if(t->pbufsiz) {
+					lua_concat(L, 2);
+				}
+
+				/* remaining data goes into the buffer */
+				t->pbufpos = t->pbuffer;
+				t->pbufsiz = axread - stillwant;
+				t->pbuffer = realloc(t->pbuffer, t->pbufsiz);
+				if (!t->pbuffer) {
+					free(t->pbufpos);
+					t->pbufpos = NULL;
+					t->pbufsiz = 0;
+					return luaL_error(L, "out of memory");
+				}
+
+				t->pbufpos = t->pbuffer;
+				memcpy(t->pbufpos, axbuf + stillwant, t->pbufsiz);
+			} else {
+				lua_pushlstring(L, (char *)axbuf, axread);
+				if(t->pbufsiz) {
+					lua_concat(L, 2);
+				}
+
+				/* free buffer */
+				free(t->pbuffer);
+				t->pbuffer = t->pbufpos = NULL;
+				t->pbufsiz = 0;
+			}
+		}
+		return 1;
+	}
+
+#endif /* WITH_AXTLS */
+
+}
+
+static int nixio_tls_sock_send(lua_State *L) {
+	SSL *sock = nixio__checktlssock(L);
+	nixio_tls__check_connected(L);
+	size_t len;
+	ssize_t sent;
+	const char *data = luaL_checklstring(L, 2, &len);
+
+	if (lua_gettop(L) > 2) {
+		int offset = luaL_optint(L, 3, 0);
+		if (offset) {
+			if (offset < len) {
+				data += offset;
+				len -= offset;
+			} else {
+				len = 0;
+			}
+		}
+
+		unsigned int wlen = luaL_optint(L, 4, len);
+		if (wlen < len) {
+			len = wlen;
+		}
+	}
+
+	sent = SSL_write(sock, data, len);
+	if (sent > 0) {
+		lua_pushinteger(L, sent);
+		return 1;
+	} else {
+		return nixio__tls_sock_pstatus(L, sock, sent);
+	}
+}
+
+static int nixio_tls_sock_accept(lua_State *L) {
+	SSL *sock = nixio__checktlssock(L);
+	const int stat = SSL_accept(sock);
+	nixio_tls__set_connected(L, stat == 1);
+	return nixio__tls_sock_pstatus(L, sock, stat);
+}
+
+static int nixio_tls_sock_connect(lua_State *L) {
+	SSL *sock = nixio__checktlssock(L);
+	const int stat = SSL_connect(sock);
+	nixio_tls__set_connected(L, stat == 1);
+	return nixio__tls_sock_pstatus(L, sock, stat);
+}
+
+static int nixio_tls_sock_shutdown(lua_State *L) {
+	SSL *sock = nixio__checktlssock(L);
+	nixio_tls__set_connected(L, 0);
+	return nixio__tls_sock_pstatus(L, sock, SSL_shutdown(sock));
+}
+
+static int nixio_tls_sock__gc(lua_State *L) {
+	nixio_tls_sock *sock = luaL_checkudata(L, 1, NIXIO_TLS_SOCK_META);
+	if (sock->socket) {
+		SSL_free(sock->socket);
+		sock->socket = NULL;
+#ifdef WITH_AXTLS
+		free(sock->pbuffer);
+#endif
+	}
+	return 0;
+}
+
+static int nixio_tls_sock__tostring(lua_State *L) {
+	SSL *sock = nixio__checktlssock(L);
+	lua_pushfstring(L, "nixio TLS connection: %p", sock);
+	return 1;
+}
+
+
+/* ctx function table */
+static const luaL_reg M[] = {
+	{"recv", 		nixio_tls_sock_recv},
+	{"send", 		nixio_tls_sock_send},
+	{"read", 		nixio_tls_sock_recv},
+	{"write", 		nixio_tls_sock_send},
+	{"accept",	 	nixio_tls_sock_accept},
+	{"connect", 	nixio_tls_sock_connect},
+	{"shutdown", 	nixio_tls_sock_shutdown},
+	{"__gc",		nixio_tls_sock__gc},
+	{"__tostring",	nixio_tls_sock__tostring},
+	{NULL,			NULL}
+};
+
+
+void nixio_open_tls_socket(lua_State *L) {
+	/* create socket metatable */
+	luaL_newmetatable(L, NIXIO_TLS_SOCK_META);
+	luaL_register(L, NULL, M);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	lua_setfield(L, -2, "meta_tls_socket");
+}
diff --git a/trunk/package/luci/libs/nixio/src/user.c b/trunk/package/luci/libs/nixio/src/user.c
new file mode 100644
index 00000000..b701bac9
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/src/user.c
@@ -0,0 +1,263 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "nixio.h"
+#include <sys/types.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#ifndef __WINNT__
+
+#include <grp.h>
+#include <pwd.h>
+
+#ifndef BSD
+#ifndef NO_SHADOW
+#include <shadow.h>
+#endif
+#include <crypt.h>
+#endif
+
+int nixio__check_group(lua_State *L, int idx) {
+	if (lua_isnumber(L, idx)) {
+		return lua_tointeger(L, idx);
+	} else if (lua_isstring(L, idx)) {
+		struct group *g = getgrnam(lua_tostring(L, idx));
+		return (!g) ? -1 : g->gr_gid;
+	} else {
+		return luaL_argerror(L, idx, "supported values: <groupname>, <gid>");
+	}
+}
+
+int nixio__check_user(lua_State *L, int idx) {
+	if (lua_isnumber(L, idx)) {
+		return lua_tointeger(L, idx);
+	} else if (lua_isstring(L, idx)) {
+		struct passwd *p = getpwnam(lua_tostring(L, idx));
+		return (!p) ? -1 : p->pw_uid;
+	} else {
+		return luaL_argerror(L, idx, "supported values: <username>, <uid>");
+	}
+}
+
+
+static int nixio__push_group(lua_State *L, struct group *gr) {
+	lua_createtable(L, 0, 4);
+	lua_pushstring(L, gr->gr_name);
+	lua_setfield(L, -2, "name");
+	lua_pushstring(L, gr->gr_passwd);
+	lua_setfield(L, -2, "passwd");
+	lua_pushinteger(L, gr->gr_gid);
+	lua_setfield(L, -2, "gid");
+	lua_newtable(L);
+
+	for (int i=0; gr->gr_mem[i]; i++) {
+		lua_pushstring(L, gr->gr_mem[i]);
+		lua_rawseti(L, -2, i+1);
+	}
+
+	lua_setfield(L, -2, "mem");
+	return 1;
+}
+
+static int nixio_getgr(lua_State *L) {
+	struct group *gr;
+	errno = 0;
+	if (lua_isnumber(L, 1)) {
+		gr = getgrgid(lua_tointeger(L, 1));
+	} else if (lua_isstring(L, 1)) {
+		gr = getgrnam(lua_tostring(L, 1));
+	} else if (lua_isnoneornil(L, 1)) {
+		lua_newtable(L);
+		int i = 0;
+
+		setgrent();
+		while ((gr = getgrent())) {
+			nixio__push_group(L, gr);
+			lua_rawseti(L, -2, ++i);
+		}
+
+		if (errno) {
+			return nixio__perror(L);
+		}
+
+		endgrent();
+		return 1;
+	} else {
+		return luaL_argerror(L, 1, "supported values: <groupname>, <gid>");
+	}
+
+	if (!gr) {
+		return nixio__perror(L);
+	} else {
+		return nixio__push_group(L, gr);
+	}
+}
+
+static int nixio__push_passwd(lua_State *L, struct passwd *pw) {
+	lua_createtable(L, 0, 7);
+	lua_pushstring(L, pw->pw_name);
+	lua_setfield(L, -2, "name");
+	lua_pushstring(L, pw->pw_passwd);
+	lua_setfield(L, -2, "passwd");
+	lua_pushinteger(L, pw->pw_gid);
+	lua_setfield(L, -2, "gid");
+	lua_pushinteger(L, pw->pw_uid);
+	lua_setfield(L, -2, "uid");
+	lua_pushstring(L, pw->pw_dir);
+	lua_setfield(L, -2, "dir");
+	lua_pushstring(L, pw->pw_gecos);
+	lua_setfield(L, -2, "gecos");
+	lua_pushstring(L, pw->pw_shell);
+	lua_setfield(L, -2, "shell");
+	return 1;
+}
+
+static int nixio_getpw(lua_State *L) {
+	struct passwd *pw;
+	errno = 0;
+	if (lua_isnumber(L, 1)) {
+		pw = getpwuid(lua_tointeger(L, 1));
+	} else if (lua_isstring(L, 1)) {
+		pw = getpwnam(lua_tostring(L, 1));
+	} else if (lua_isnoneornil(L, 1)) {
+		lua_newtable(L);
+		int i = 0;
+
+		setpwent();
+		while ((pw = getpwent())) {
+			nixio__push_passwd(L, pw);
+			lua_rawseti(L, -2, ++i);
+		}
+
+		if (errno) {
+			return nixio__perror(L);
+		}
+
+		endpwent();
+		return 1;
+	} else {
+		return luaL_argerror(L, 1, "supported values: <username>, <uid>");
+	}
+
+	if (!pw) {
+		return nixio__perror(L);
+	} else {
+		return nixio__push_passwd(L, pw);
+	}
+}
+
+#ifndef BSD
+#ifndef NO_SHADOW
+static int nixio__push_spwd(lua_State *L, struct spwd *sp) {
+	lua_createtable(L, 0, 9);
+	lua_pushstring(L, sp->sp_namp);
+	lua_setfield(L, -2, "namp");
+	lua_pushinteger(L, sp->sp_expire);
+	lua_setfield(L, -2, "expire");
+	lua_pushinteger(L, sp->sp_flag);
+	lua_setfield(L, -2, "flag");
+	lua_pushinteger(L, sp->sp_inact);
+	lua_setfield(L, -2, "inact");
+	lua_pushinteger(L, sp->sp_lstchg);
+	lua_setfield(L, -2, "lstchg");
+	lua_pushinteger(L, sp->sp_max);
+	lua_setfield(L, -2, "max");
+	lua_pushinteger(L, sp->sp_min);
+	lua_setfield(L, -2, "min");
+	lua_pushinteger(L, sp->sp_warn);
+	lua_setfield(L, -2, "warn");
+	lua_pushstring(L, sp->sp_pwdp);
+	lua_setfield(L, -2, "pwdp");
+	return 1;
+}
+
+static int nixio_getsp(lua_State *L) {
+	struct spwd *sp;
+	errno = 0;
+	if (lua_isstring(L, 1)) {
+		sp = getspnam(lua_tostring(L, 1));
+	} else if (lua_isnoneornil(L, 1)) {
+		lua_newtable(L);
+		int i = 0;
+
+		setspent();
+		while ((sp = getspent())) {
+			nixio__push_spwd(L, sp);
+			lua_rawseti(L, -2, ++i);
+		}
+
+		if (errno) {
+			return nixio__perror(L);
+		}
+
+		endspent();
+		return 1;
+	} else {
+		return luaL_argerror(L, 1, "supported values: <username>");
+	}
+
+	if (!sp) {
+		return nixio__perror(L);
+	} else {
+		return nixio__push_spwd(L, sp);
+	}
+}
+#endif /* !NO_SHADOW */
+#endif /* !BSD */
+
+static int nixio_crypt(lua_State *L) {
+	const char *key = luaL_checkstring(L, 1);
+	const char *salt = luaL_checkstring(L, 2);
+	const char *hash = crypt(key, salt);
+
+	if (hash) {
+		lua_pushstring(L, hash);
+	} else {
+		lua_pushnil(L);
+	}
+
+	return 1;
+}
+
+
+/* module table */
+static const luaL_reg R[] = {
+	{"crypt",		nixio_crypt},
+	{"getgr",		nixio_getgr},
+	{"getpw",		nixio_getpw},
+#ifndef BSD
+#ifndef NO_SHADOW
+	{"getsp",		nixio_getsp},
+#endif
+#endif
+	{NULL,			NULL}
+};
+
+#else /* __WINNT__ */
+
+static const luaL_reg R[] = {
+		{NULL,			NULL}
+};
+
+#endif
+
+void nixio_open_user(lua_State *L) {
+	luaL_register(L, NULL, R);
+}
diff --git a/trunk/package/luci/libs/nixio/standalone.mk b/trunk/package/luci/libs/nixio/standalone.mk
new file mode 100644
index 00000000..95f6bece
--- /dev/null
+++ b/trunk/package/luci/libs/nixio/standalone.mk
@@ -0,0 +1,55 @@
+LUAC = luac
+LUAC_OPTIONS = -s
+LUA_TARGET ?= source
+
+LUA_MODULEDIR = /usr/local/share/lua/5.1
+LUA_LIBRARYDIR = /usr/local/lib/lua/5.1
+
+OS ?= $(shell uname)
+
+LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1 || pkg-config --silence-errors --libs lua-5.1 || pkg-config --silence-errors --libs lua)
+LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
+LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1 || pkg-config --silence-errors --cflags lua-5.1 || pkg-config --silence-errors --cflags lua)
+
+CC = gcc
+AR = ar
+RANLIB = ranlib
+CFLAGS = -O2
+FPIC = -fPIC
+EXTRA_CFLAGS = --std=gnu99
+WFLAGS = -Wall -Werror -pedantic
+CPPFLAGS =
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+ifeq ($(OS),Darwin)
+  SHLIB_FLAGS = -bundle -undefined dynamic_lookup
+else
+  SHLIB_FLAGS = -shared
+endif
+LINK = $(CC) $(LDFLAGS)
+
+.PHONY: all build compile luacompile luasource clean luaclean
+
+all: build
+
+build: luabuild gccbuild
+
+luabuild: lua$(LUA_TARGET)
+
+gccbuild: compile
+compile:
+
+clean: luaclean
+
+luasource:
+	mkdir -p dist$(LUA_MODULEDIR)
+	cp -pR lua/* dist$(LUA_MODULEDIR) 2>/dev/null || true
+	for i in $$(find dist -name .svn); do rm -rf $$i || true; done
+
+luastrip: luasource
+	for i in $$(find dist -type f -name '*.lua'); do perl -e 'undef $$/; open( F, "< $$ARGV[0]" ) || die $$!; $$src = <F>; close F; $$src =~ s/--\[\[.*?\]\](--)?//gs; $$src =~ s/^\s*--.*?\n//gm; open( F, "> $$ARGV[0]" ) || die $$!; print F $$src; close F' $$i; done
+
+luacompile: luasource
+	for i in $$(find dist -name *.lua -not -name debug.lua); do $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; done
+
+luaclean:
+	rm -rf dist
diff --git a/trunk/package/luci/libs/px5g/Makefile b/trunk/package/luci/libs/px5g/Makefile
new file mode 100644
index 00000000..80a650ed
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/Makefile
@@ -0,0 +1,28 @@
+include ../../build/config.mk
+include ../../build/module.mk
+include ../../build/gccconfig.mk
+
+PX5G_LIB_CFLAGS = -Isrc/ -include src/polarssl/rsa.h \
+	-include src/polarssl/x509.h \
+	$(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+
+PX5G_OBJ_CFLAGS = -Isrc/ \
+	$(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+
+PX5G_LIB = src/library/bignum.o src/library/havege.o src/library/rsa.o \
+		src/library/sha1.o src/library/timing.o src/library/x509write.o
+PX5G_OBJ = src/px5g.o
+
+src/library/%.o: src/library/%.c
+	$(CC) $(PX5G_LIB_CFLAGS) $(FPIC) -c -o $@ $<
+
+%.o: %.c
+	$(CC) $(PX5G_OBJ_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
+
+compile: $(PX5G_LIB) $(PX5G_OBJ)
+	$(LINK) $(SHLIB_FLAGS) -o src/px5g.so $(PX5G_OBJ) $(PX5G_LIB)
+	mkdir -p dist$(LUA_LIBRARYDIR)
+	cp src/px5g.so dist$(LUA_LIBRARYDIR)/px5g.so
+
+clean: luaclean
+	rm -f $(PX5G_OBJ) $(PX5G_LIB) src/*.o src/*.so src/*.a src/*.dll
diff --git a/trunk/package/luci/libs/px5g/lua/px5g/util.lua b/trunk/package/luci/libs/px5g/lua/px5g/util.lua
new file mode 100644
index 00000000..0f07c81b
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/lua/px5g/util.lua
@@ -0,0 +1,44 @@
+--[[
+ * px5g - Embedded x509 key and certificate generator based on PolarSSL
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+]]--
+
+local nixio = require "nixio"
+local table = require "table"
+
+module "px5g.util"
+
+local preamble = {
+	key = "-----BEGIN RSA PRIVATE KEY-----",
+	cert = "-----BEGIN CERTIFICATE-----",
+	request = "-----BEGIN CERTIFICATE REQUEST-----"
+}
+
+local postamble = {
+	key = "-----END RSA PRIVATE KEY-----",
+	cert = "-----END CERTIFICATE-----",
+	request = "-----END CERTIFICATE REQUEST-----"
+}
+
+function der2pem(data, type)
+	local b64 = nixio.bin.b64encode(data)
+	
+	local outdata = {preamble[type]}
+	for i = 1, #b64, 64 do
+		outdata[#outdata + 1] = b64:sub(i, i + 63) 
+	end
+	outdata[#outdata + 1] = postamble[type]
+	outdata[#outdata + 1] = ""
+	
+	return table.concat(outdata, "\n")
+end
+
+function pem2der(data)
+	local b64 = data:gsub({["\n"] = "", ["%-%-%-%-%-.-%-%-%-%-%-"] = ""})
+	return nixio.bin.b64decode(b64)
+end
\ No newline at end of file
diff --git a/trunk/package/luci/libs/px5g/root/usr/sbin/px5g-genkeys b/trunk/package/luci/libs/px5g/root/usr/sbin/px5g-genkeys
new file mode 100755
index 00000000..87a66bfe
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/root/usr/sbin/px5g-genkeys
@@ -0,0 +1,19 @@
+#!/usr/bin/lua
+local keyfile = "/etc/nixio/rsa_main.der"
+local certfile = "/etc/nixio/cert_main.der"
+
+local px5g = require "px5g"
+local nixio = require "nixio"
+local fs = require "nixio.fs"
+local os = require "os"
+nixio.umask(77)
+
+if not fs.access(certfile) then
+	local key = px5g.genkey(2048)
+	fs.writefile(keyfile, key:asn1())
+
+	local cert = key:create_selfsigned(
+		{CN=nixio.uname().nodename, O="LuCI Keymaster"},
+		os.time(), os.time() + 3600 * 24 * 366 * 15)
+	fs.writefile(certfile, cert)
+end
diff --git a/trunk/package/luci/libs/px5g/src/library/bignum.c b/trunk/package/luci/libs/px5g/src/library/bignum.c
new file mode 100644
index 00000000..8b7c12ff
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/library/bignum.c
@@ -0,0 +1,2010 @@
+/*
+ *  Multi-precision integer library
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  This MPI implementation is based on:
+ *
+ *  http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
+ *  http://www.stillhq.com/extracted/gnupg-api/mpi/
+ *  http://math.libtomcrypt.com/files/tommath.pdf
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_BIGNUM_C)
+
+#include "polarssl/bignum.h"
+#include "polarssl/bn_mul.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#define ciL    ((int) sizeof(t_int))    /* chars in limb  */
+#define biL    (ciL << 3)               /* bits  in limb  */
+#define biH    (ciL << 2)               /* half limb size */
+
+/*
+ * Convert between bits/chars and number of limbs
+ */
+#define BITS_TO_LIMBS(i)  (((i) + biL - 1) / biL)
+#define CHARS_TO_LIMBS(i) (((i) + ciL - 1) / ciL)
+
+/*
+ * Initialize one or more mpi
+ */
+void mpi_init( mpi *X, ... )
+{
+    va_list args;
+
+    va_start( args, X );
+
+    while( X != NULL )
+    {
+        X->s = 1;
+        X->n = 0;
+        X->p = NULL;
+
+        X = va_arg( args, mpi* );
+    }
+
+    va_end( args );
+}
+
+/*
+ * Unallocate one or more mpi
+ */
+void mpi_free( mpi *X, ... )
+{
+    va_list args;
+
+    va_start( args, X );
+
+    while( X != NULL )
+    {
+        if( X->p != NULL )
+        {
+            memset( X->p, 0, X->n * ciL );
+            free( X->p );
+        }
+
+        X->s = 1;
+        X->n = 0;
+        X->p = NULL;
+
+        X = va_arg( args, mpi* );
+    }
+
+    va_end( args );
+}
+
+/*
+ * Enlarge to the specified number of limbs
+ */
+int mpi_grow( mpi *X, int nblimbs )
+{
+    t_int *p;
+
+    if( X->n < nblimbs )
+    {
+        if( ( p = (t_int *) malloc( nblimbs * ciL ) ) == NULL )
+            return( 1 );
+
+        memset( p, 0, nblimbs * ciL );
+
+        if( X->p != NULL )
+        {
+            memcpy( p, X->p, X->n * ciL );
+            memset( X->p, 0, X->n * ciL );
+            free( X->p );
+        }
+
+        X->n = nblimbs;
+        X->p = p;
+    }
+
+    return( 0 );
+}
+
+/*
+ * Copy the contents of Y into X
+ */
+int mpi_copy( mpi *X, mpi *Y )
+{
+    int ret, i;
+
+    if( X == Y )
+        return( 0 );
+
+    for( i = Y->n - 1; i > 0; i-- )
+        if( Y->p[i] != 0 )
+            break;
+    i++;
+
+    X->s = Y->s;
+
+    MPI_CHK( mpi_grow( X, i ) );
+
+    memset( X->p, 0, X->n * ciL );
+    memcpy( X->p, Y->p, i * ciL );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Swap the contents of X and Y
+ */
+void mpi_swap( mpi *X, mpi *Y )
+{
+    mpi T;
+
+    memcpy( &T,  X, sizeof( mpi ) );
+    memcpy(  X,  Y, sizeof( mpi ) );
+    memcpy(  Y, &T, sizeof( mpi ) );
+}
+
+/*
+ * Set value from integer
+ */
+int mpi_lset( mpi *X, int z )
+{
+    int ret;
+
+    MPI_CHK( mpi_grow( X, 1 ) );
+    memset( X->p, 0, X->n * ciL );
+
+    X->p[0] = ( z < 0 ) ? -z : z;
+    X->s    = ( z < 0 ) ? -1 : 1;
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Return the number of least significant bits
+ */
+int mpi_lsb( mpi *X )
+{
+    int i, j, count = 0;
+
+    for( i = 0; i < X->n; i++ )
+        for( j = 0; j < (int) biL; j++, count++ )
+            if( ( ( X->p[i] >> j ) & 1 ) != 0 )
+                return( count );
+
+    return( 0 );
+}
+
+/*
+ * Return the number of most significant bits
+ */
+int mpi_msb( mpi *X )
+{
+    int i, j;
+
+    for( i = X->n - 1; i > 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+
+    for( j = biL - 1; j >= 0; j-- )
+        if( ( ( X->p[i] >> j ) & 1 ) != 0 )
+            break;
+
+    return( ( i * biL ) + j + 1 );
+}
+
+/*
+ * Return the total size in bytes
+ */
+int mpi_size( mpi *X )
+{
+    return( ( mpi_msb( X ) + 7 ) >> 3 );
+}
+
+/*
+ * Convert an ASCII character to digit value
+ */
+static int mpi_get_digit( t_int *d, int radix, char c )
+{
+    *d = 255;
+
+    if( c >= 0x30 && c <= 0x39 ) *d = c - 0x30;
+    if( c >= 0x41 && c <= 0x46 ) *d = c - 0x37;
+    if( c >= 0x61 && c <= 0x66 ) *d = c - 0x57;
+
+    if( *d >= (t_int) radix )
+        return( POLARSSL_ERR_MPI_INVALID_CHARACTER );
+
+    return( 0 );
+}
+
+/*
+ * Import from an ASCII string
+ */
+int mpi_read_string( mpi *X, int radix, char *s )
+{
+    int ret, i, j, n;
+    t_int d;
+    mpi T;
+
+    if( radix < 2 || radix > 16 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    mpi_init( &T, NULL );
+
+    if( radix == 16 )
+    {
+        n = BITS_TO_LIMBS( strlen( s ) << 2 );
+
+        MPI_CHK( mpi_grow( X, n ) );
+        MPI_CHK( mpi_lset( X, 0 ) );
+
+        for( i = strlen( s ) - 1, j = 0; i >= 0; i--, j++ )
+        {
+            if( i == 0 && s[i] == '-' )
+            {
+                X->s = -1;
+                break;
+            }
+
+            MPI_CHK( mpi_get_digit( &d, radix, s[i] ) );
+            X->p[j / (2 * ciL)] |= d << ( (j % (2 * ciL)) << 2 );
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_lset( X, 0 ) );
+
+        for( i = 0; i < (int) strlen( s ); i++ )
+        {
+            if( i == 0 && s[i] == '-' )
+            {
+                X->s = -1;
+                continue;
+            }
+
+            MPI_CHK( mpi_get_digit( &d, radix, s[i] ) );
+            MPI_CHK( mpi_mul_int( &T, X, radix ) );
+            MPI_CHK( mpi_add_int( X, &T, d ) );
+        }
+    }
+
+cleanup:
+
+    mpi_free( &T, NULL );
+
+    return( ret );
+}
+
+/*
+ * Helper to write the digits high-order first
+ */
+static int mpi_write_hlp( mpi *X, int radix, char **p )
+{
+    int ret;
+    t_int r;
+
+    if( radix < 2 || radix > 16 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    MPI_CHK( mpi_mod_int( &r, X, radix ) );
+    MPI_CHK( mpi_div_int( X, NULL, X, radix ) );
+
+    if( mpi_cmp_int( X, 0 ) != 0 )
+        MPI_CHK( mpi_write_hlp( X, radix, p ) );
+
+    if( r < 10 )
+        *(*p)++ = (char)( r + 0x30 );
+    else
+        *(*p)++ = (char)( r + 0x37 );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Export into an ASCII string
+ */
+int mpi_write_string( mpi *X, int radix, char *s, int *slen )
+{
+    int ret = 0, n;
+    char *p;
+    mpi T;
+
+    if( radix < 2 || radix > 16 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    n = mpi_msb( X );
+    if( radix >=  4 ) n >>= 1;
+    if( radix >= 16 ) n >>= 1;
+    n += 3;
+
+    if( *slen < n )
+    {
+        *slen = n;
+        return( POLARSSL_ERR_MPI_BUFFER_TOO_SMALL );
+    }
+
+    p = s;
+    mpi_init( &T, NULL );
+
+    if( X->s == -1 )
+        *p++ = '-';
+
+    if( radix == 16 )
+    {
+        int c, i, j, k;
+
+        for( i = X->n - 1, k = 0; i >= 0; i-- )
+        {
+            for( j = ciL - 1; j >= 0; j-- )
+            {
+                c = ( X->p[i] >> (j << 3) ) & 0xFF;
+
+                if( c == 0 && k == 0 && (i + j) != 0 )
+                    continue;
+
+                p += sprintf( p, "%02X", c );
+                k = 1;
+            }
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_copy( &T, X ) );
+        MPI_CHK( mpi_write_hlp( &T, radix, &p ) );
+    }
+
+    *p++ = '\0';
+    *slen = p - s;
+
+cleanup:
+
+    mpi_free( &T, NULL );
+
+    return( ret );
+}
+
+/*
+ * Read X from an opened file
+ */
+int mpi_read_file( mpi *X, int radix, FILE *fin )
+{
+    t_int d;
+    int slen;
+    char *p;
+    char s[1024];
+
+    memset( s, 0, sizeof( s ) );
+    if( fgets( s, sizeof( s ) - 1, fin ) == NULL )
+        return( POLARSSL_ERR_MPI_FILE_IO_ERROR );
+
+    slen = strlen( s );
+    if( s[slen - 1] == '\n' ) { slen--; s[slen] = '\0'; }
+    if( s[slen - 1] == '\r' ) { slen--; s[slen] = '\0'; }
+
+    p = s + slen;
+    while( --p >= s )
+        if( mpi_get_digit( &d, radix, *p ) != 0 )
+            break;
+
+    return( mpi_read_string( X, radix, p + 1 ) );
+}
+
+/*
+ * Write X into an opened file (or stdout if fout == NULL)
+ */
+int mpi_write_file( char *p, mpi *X, int radix, FILE *fout )
+{
+    int n, ret;
+    size_t slen;
+    size_t plen;
+    char s[1024];
+
+    n = sizeof( s );
+    memset( s, 0, n );
+    n -= 2;
+
+    MPI_CHK( mpi_write_string( X, radix, s, (int *) &n ) );
+
+    if( p == NULL ) p = "";
+
+    plen = strlen( p );
+    slen = strlen( s );
+    s[slen++] = '\r';
+    s[slen++] = '\n';
+
+    if( fout != NULL )
+    {
+        if( fwrite( p, 1, plen, fout ) != plen ||
+            fwrite( s, 1, slen, fout ) != slen )
+            return( POLARSSL_ERR_MPI_FILE_IO_ERROR );
+    }
+    else
+        printf( "%s%s", p, s );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Import X from unsigned binary data, big endian
+ */
+int mpi_read_binary( mpi *X, unsigned char *buf, int buflen )
+{
+    int ret, i, j, n;
+
+    for( n = 0; n < buflen; n++ )
+        if( buf[n] != 0 )
+            break;
+
+    MPI_CHK( mpi_grow( X, CHARS_TO_LIMBS( buflen - n ) ) );
+    MPI_CHK( mpi_lset( X, 0 ) );
+
+    for( i = buflen - 1, j = 0; i >= n; i--, j++ )
+        X->p[j / ciL] |= ((t_int) buf[i]) << ((j % ciL) << 3);
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Export X into unsigned binary data, big endian
+ */
+int mpi_write_binary( mpi *X, unsigned char *buf, int buflen )
+{
+    int i, j, n;
+
+    n = mpi_size( X );
+
+    if( buflen < n )
+        return( POLARSSL_ERR_MPI_BUFFER_TOO_SMALL );
+
+    memset( buf, 0, buflen );
+
+    for( i = buflen - 1, j = 0; n > 0; i--, j++, n-- )
+        buf[i] = (unsigned char)( X->p[j / ciL] >> ((j % ciL) << 3) );
+
+    return( 0 );
+}
+
+/*
+ * Left-shift: X <<= count
+ */
+int mpi_shift_l( mpi *X, int count )
+{
+    int ret, i, v0, t1;
+    t_int r0 = 0, r1;
+
+    v0 = count / (biL    );
+    t1 = count & (biL - 1);
+
+    i = mpi_msb( X ) + count;
+
+    if( X->n * (int) biL < i )
+        MPI_CHK( mpi_grow( X, BITS_TO_LIMBS( i ) ) );
+
+    ret = 0;
+
+    /*
+     * shift by count / limb_size
+     */
+    if( v0 > 0 )
+    {
+        for( i = X->n - 1; i >= v0; i-- )
+            X->p[i] = X->p[i - v0];
+
+        for( ; i >= 0; i-- )
+            X->p[i] = 0;
+    }
+
+    /*
+     * shift by count % limb_size
+     */
+    if( t1 > 0 )
+    {
+        for( i = v0; i < X->n; i++ )
+        {
+            r1 = X->p[i] >> (biL - t1);
+            X->p[i] <<= t1;
+            X->p[i] |= r0;
+            r0 = r1;
+        }
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Right-shift: X >>= count
+ */
+int mpi_shift_r( mpi *X, int count )
+{
+    int i, v0, v1;
+    t_int r0 = 0, r1;
+
+    v0 = count /  biL;
+    v1 = count & (biL - 1);
+
+    /*
+     * shift by count / limb_size
+     */
+    if( v0 > 0 )
+    {
+        for( i = 0; i < X->n - v0; i++ )
+            X->p[i] = X->p[i + v0];
+
+        for( ; i < X->n; i++ )
+            X->p[i] = 0;
+    }
+
+    /*
+     * shift by count % limb_size
+     */
+    if( v1 > 0 )
+    {
+        for( i = X->n - 1; i >= 0; i-- )
+        {
+            r1 = X->p[i] << (biL - v1);
+            X->p[i] >>= v1;
+            X->p[i] |= r0;
+            r0 = r1;
+        }
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare unsigned values
+ */
+int mpi_cmp_abs( mpi *X, mpi *Y )
+{
+    int i, j;
+
+    for( i = X->n - 1; i >= 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+
+    for( j = Y->n - 1; j >= 0; j-- )
+        if( Y->p[j] != 0 )
+            break;
+
+    if( i < 0 && j < 0 )
+        return( 0 );
+
+    if( i > j ) return(  1 );
+    if( j > i ) return( -1 );
+
+    for( ; i >= 0; i-- )
+    {
+        if( X->p[i] > Y->p[i] ) return(  1 );
+        if( X->p[i] < Y->p[i] ) return( -1 );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare signed values
+ */
+int mpi_cmp_mpi( mpi *X, mpi *Y )
+{
+    int i, j;
+
+    for( i = X->n - 1; i >= 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+
+    for( j = Y->n - 1; j >= 0; j-- )
+        if( Y->p[j] != 0 )
+            break;
+
+    if( i < 0 && j < 0 )
+        return( 0 );
+
+    if( i > j ) return(  X->s );
+    if( j > i ) return( -X->s );
+
+    if( X->s > 0 && Y->s < 0 ) return(  1 );
+    if( Y->s > 0 && X->s < 0 ) return( -1 );
+
+    for( ; i >= 0; i-- )
+    {
+        if( X->p[i] > Y->p[i] ) return(  X->s );
+        if( X->p[i] < Y->p[i] ) return( -X->s );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare signed values
+ */
+int mpi_cmp_int( mpi *X, int z )
+{
+    mpi Y;
+    t_int p[1];
+
+    *p  = ( z < 0 ) ? -z : z;
+    Y.s = ( z < 0 ) ? -1 : 1;
+    Y.n = 1;
+    Y.p = p;
+
+    return( mpi_cmp_mpi( X, &Y ) );
+}
+
+/*
+ * Unsigned addition: X = |A| + |B|  (HAC 14.7)
+ */
+int mpi_add_abs( mpi *X, mpi *A, mpi *B )
+{
+    int ret, i, j;
+    t_int *o, *p, c;
+
+    if( X == B )
+    {
+        mpi *T = A; A = X; B = T;
+    }
+
+    if( X != A )
+        MPI_CHK( mpi_copy( X, A ) );
+
+    for( j = B->n - 1; j >= 0; j-- )
+        if( B->p[j] != 0 )
+            break;
+
+    MPI_CHK( mpi_grow( X, j + 1 ) );
+
+    o = B->p; p = X->p; c = 0;
+
+    for( i = 0; i <= j; i++, o++, p++ )
+    {
+        *p +=  c; c  = ( *p <  c );
+        *p += *o; c += ( *p < *o );
+    }
+
+    while( c != 0 )
+    {
+        if( i >= X->n )
+        {
+            MPI_CHK( mpi_grow( X, i + 1 ) );
+            p = X->p + i;
+        }
+
+        *p += c; c = ( *p < c ); i++;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Helper for mpi substraction
+ */
+static void mpi_sub_hlp( int n, t_int *s, t_int *d )
+{
+    int i;
+    t_int c, z;
+
+    for( i = c = 0; i < n; i++, s++, d++ )
+    {
+        z = ( *d <  c );     *d -=  c;
+        c = ( *d < *s ) + z; *d -= *s;
+    }
+
+    while( c != 0 )
+    {
+        z = ( *d < c ); *d -= c;
+        c = z; i++; d++;
+    }
+}
+
+/*
+ * Unsigned substraction: X = |A| - |B|  (HAC 14.9)
+ */
+int mpi_sub_abs( mpi *X, mpi *A, mpi *B )
+{
+    mpi TB;
+    int ret, n;
+
+    if( mpi_cmp_abs( A, B ) < 0 )
+        return( POLARSSL_ERR_MPI_NEGATIVE_VALUE );
+
+    mpi_init( &TB, NULL );
+
+    if( X == B )
+    {
+        MPI_CHK( mpi_copy( &TB, B ) );
+        B = &TB;
+    }
+
+    if( X != A )
+        MPI_CHK( mpi_copy( X, A ) );
+
+    ret = 0;
+
+    for( n = B->n - 1; n >= 0; n-- )
+        if( B->p[n] != 0 )
+            break;
+
+    mpi_sub_hlp( n + 1, B->p, X->p );
+
+cleanup:
+
+    mpi_free( &TB, NULL );
+
+    return( ret );
+}
+
+/*
+ * Signed addition: X = A + B
+ */
+int mpi_add_mpi( mpi *X, mpi *A, mpi *B )
+{
+    int ret, s = A->s;
+
+    if( A->s * B->s < 0 )
+    {
+        if( mpi_cmp_abs( A, B ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_abs( X, A, B ) );
+            X->s =  s;
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_abs( X, B, A ) );
+            X->s = -s;
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_add_abs( X, A, B ) );
+        X->s = s;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Signed substraction: X = A - B
+ */
+int mpi_sub_mpi( mpi *X, mpi *A, mpi *B )
+{
+    int ret, s = A->s;
+
+    if( A->s * B->s > 0 )
+    {
+        if( mpi_cmp_abs( A, B ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_abs( X, A, B ) );
+            X->s =  s;
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_abs( X, B, A ) );
+            X->s = -s;
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_add_abs( X, A, B ) );
+        X->s = s;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Signed addition: X = A + b
+ */
+int mpi_add_int( mpi *X, mpi *A, int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mpi_add_mpi( X, A, &_B ) );
+}
+
+/*
+ * Signed substraction: X = A - b
+ */
+int mpi_sub_int( mpi *X, mpi *A, int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mpi_sub_mpi( X, A, &_B ) );
+}
+
+/*
+ * Helper for mpi multiplication
+ */ 
+static void mpi_mul_hlp( int i, t_int *s, t_int *d, t_int b )
+{
+    t_int c = 0, t = 0;
+
+#if defined(MULADDC_HUIT)
+    for( ; i >= 8; i -= 8 )
+    {
+        MULADDC_INIT
+        MULADDC_HUIT
+        MULADDC_STOP
+    }
+
+    for( ; i > 0; i-- )
+    {
+        MULADDC_INIT
+        MULADDC_CORE
+        MULADDC_STOP
+    }
+#else
+    for( ; i >= 16; i -= 16 )
+    {
+        MULADDC_INIT
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_STOP
+    }
+
+    for( ; i >= 8; i -= 8 )
+    {
+        MULADDC_INIT
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_STOP
+    }
+
+    for( ; i > 0; i-- )
+    {
+        MULADDC_INIT
+        MULADDC_CORE
+        MULADDC_STOP
+    }
+#endif
+
+    t++;
+
+    do {
+        *d += c; c = ( *d < c ); d++;
+    }
+    while( c != 0 );
+}
+
+/*
+ * Baseline multiplication: X = A * B  (HAC 14.12)
+ */
+int mpi_mul_mpi( mpi *X, mpi *A, mpi *B )
+{
+    int ret, i, j;
+    mpi TA, TB;
+
+    mpi_init( &TA, &TB, NULL );
+
+    if( X == A ) { MPI_CHK( mpi_copy( &TA, A ) ); A = &TA; }
+    if( X == B ) { MPI_CHK( mpi_copy( &TB, B ) ); B = &TB; }
+
+    for( i = A->n - 1; i >= 0; i-- )
+        if( A->p[i] != 0 )
+            break;
+
+    for( j = B->n - 1; j >= 0; j-- )
+        if( B->p[j] != 0 )
+            break;
+
+    MPI_CHK( mpi_grow( X, i + j + 2 ) );
+    MPI_CHK( mpi_lset( X, 0 ) );
+
+    for( i++; j >= 0; j-- )
+        mpi_mul_hlp( i, A->p, X->p + j, B->p[j] );
+
+    X->s = A->s * B->s;
+
+cleanup:
+
+    mpi_free( &TB, &TA, NULL );
+
+    return( ret );
+}
+
+/*
+ * Baseline multiplication: X = A * b
+ */
+int mpi_mul_int( mpi *X, mpi *A, t_int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    _B.s = 1;
+    _B.n = 1;
+    _B.p = p;
+    p[0] = b;
+
+    return( mpi_mul_mpi( X, A, &_B ) );
+}
+
+/*
+ * Division by mpi: A = Q * B + R  (HAC 14.20)
+ */
+int mpi_div_mpi( mpi *Q, mpi *R, mpi *A, mpi *B )
+{
+    int ret, i, n, t, k;
+    mpi X, Y, Z, T1, T2;
+
+    if( mpi_cmp_int( B, 0 ) == 0 )
+        return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
+
+    mpi_init( &X, &Y, &Z, &T1, &T2, NULL );
+
+    if( mpi_cmp_abs( A, B ) < 0 )
+    {
+        if( Q != NULL ) MPI_CHK( mpi_lset( Q, 0 ) );
+        if( R != NULL ) MPI_CHK( mpi_copy( R, A ) );
+        return( 0 );
+    }
+
+    MPI_CHK( mpi_copy( &X, A ) );
+    MPI_CHK( mpi_copy( &Y, B ) );
+    X.s = Y.s = 1;
+
+    MPI_CHK( mpi_grow( &Z, A->n + 2 ) );
+    MPI_CHK( mpi_lset( &Z,  0 ) );
+    MPI_CHK( mpi_grow( &T1, 2 ) );
+    MPI_CHK( mpi_grow( &T2, 3 ) );
+
+    k = mpi_msb( &Y ) % biL;
+    if( k < (int) biL - 1 )
+    {
+        k = biL - 1 - k;
+        MPI_CHK( mpi_shift_l( &X, k ) );
+        MPI_CHK( mpi_shift_l( &Y, k ) );
+    }
+    else k = 0;
+
+    n = X.n - 1;
+    t = Y.n - 1;
+    mpi_shift_l( &Y, biL * (n - t) );
+
+    while( mpi_cmp_mpi( &X, &Y ) >= 0 )
+    {
+        Z.p[n - t]++;
+        mpi_sub_mpi( &X, &X, &Y );
+    }
+    mpi_shift_r( &Y, biL * (n - t) );
+
+    for( i = n; i > t ; i-- )
+    {
+        if( X.p[i] >= Y.p[t] )
+            Z.p[i - t - 1] = ~0;
+        else
+        {
+#if defined(POLARSSL_HAVE_LONGLONG)
+            t_dbl r;
+
+            r  = (t_dbl) X.p[i] << biL;
+            r |= (t_dbl) X.p[i - 1];
+            r /= Y.p[t];
+            if( r > ((t_dbl) 1 << biL) - 1)
+                r = ((t_dbl) 1 << biL) - 1;
+
+            Z.p[i - t - 1] = (t_int) r;
+#else
+            /*
+             * __udiv_qrnnd_c, from gmp/longlong.h
+             */
+            t_int q0, q1, r0, r1;
+            t_int d0, d1, d, m;
+
+            d  = Y.p[t];
+            d0 = ( d << biH ) >> biH;
+            d1 = ( d >> biH );
+
+            q1 = X.p[i] / d1;
+            r1 = X.p[i] - d1 * q1;
+            r1 <<= biH;
+            r1 |= ( X.p[i - 1] >> biH );
+
+            m = q1 * d0;
+            if( r1 < m )
+            {
+                q1--, r1 += d;
+                while( r1 >= d && r1 < m )
+                    q1--, r1 += d;
+            }
+            r1 -= m;
+
+            q0 = r1 / d1;
+            r0 = r1 - d1 * q0;
+            r0 <<= biH;
+            r0 |= ( X.p[i - 1] << biH ) >> biH;
+
+            m = q0 * d0;
+            if( r0 < m )
+            {
+                q0--, r0 += d;
+                while( r0 >= d && r0 < m )
+                    q0--, r0 += d;
+            }
+            r0 -= m;
+
+            Z.p[i - t - 1] = ( q1 << biH ) | q0;
+#endif
+        }
+
+        Z.p[i - t - 1]++;
+        do
+        {
+            Z.p[i - t - 1]--;
+
+            MPI_CHK( mpi_lset( &T1, 0 ) );
+            T1.p[0] = (t < 1) ? 0 : Y.p[t - 1];
+            T1.p[1] = Y.p[t];
+            MPI_CHK( mpi_mul_int( &T1, &T1, Z.p[i - t - 1] ) );
+
+            MPI_CHK( mpi_lset( &T2, 0 ) );
+            T2.p[0] = (i < 2) ? 0 : X.p[i - 2];
+            T2.p[1] = (i < 1) ? 0 : X.p[i - 1];
+            T2.p[2] = X.p[i];
+        }
+        while( mpi_cmp_mpi( &T1, &T2 ) > 0 );
+
+        MPI_CHK( mpi_mul_int( &T1, &Y, Z.p[i - t - 1] ) );
+        MPI_CHK( mpi_shift_l( &T1,  biL * (i - t - 1) ) );
+        MPI_CHK( mpi_sub_mpi( &X, &X, &T1 ) );
+
+        if( mpi_cmp_int( &X, 0 ) < 0 )
+        {
+            MPI_CHK( mpi_copy( &T1, &Y ) );
+            MPI_CHK( mpi_shift_l( &T1, biL * (i - t - 1) ) );
+            MPI_CHK( mpi_add_mpi( &X, &X, &T1 ) );
+            Z.p[i - t - 1]--;
+        }
+    }
+
+    if( Q != NULL )
+    {
+        mpi_copy( Q, &Z );
+        Q->s = A->s * B->s;
+    }
+
+    if( R != NULL )
+    {
+        mpi_shift_r( &X, k );
+        mpi_copy( R, &X );
+
+        R->s = A->s;
+        if( mpi_cmp_int( R, 0 ) == 0 )
+            R->s = 1;
+    }
+
+cleanup:
+
+    mpi_free( &X, &Y, &Z, &T1, &T2, NULL );
+
+    return( ret );
+}
+
+/*
+ * Division by int: A = Q * b + R
+ *
+ * Returns 0 if successful
+ *         1 if memory allocation failed
+ *         POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0
+ */
+int mpi_div_int( mpi *Q, mpi *R, mpi *A, int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mpi_div_mpi( Q, R, A, &_B ) );
+}
+
+/*
+ * Modulo: R = A mod B
+ */
+int mpi_mod_mpi( mpi *R, mpi *A, mpi *B )
+{
+    int ret;
+
+    MPI_CHK( mpi_div_mpi( NULL, R, A, B ) );
+
+    while( mpi_cmp_int( R, 0 ) < 0 )
+      MPI_CHK( mpi_add_mpi( R, R, B ) );
+
+    while( mpi_cmp_mpi( R, B ) >= 0 )
+      MPI_CHK( mpi_sub_mpi( R, R, B ) );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Modulo: r = A mod b
+ */
+int mpi_mod_int( t_int *r, mpi *A, int b )
+{
+    int i;
+    t_int x, y, z;
+
+    if( b == 0 )
+        return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
+
+    if( b < 0 )
+        b = -b;
+
+    /*
+     * handle trivial cases
+     */
+    if( b == 1 )
+    {
+        *r = 0;
+        return( 0 );
+    }
+
+    if( b == 2 )
+    {
+        *r = A->p[0] & 1;
+        return( 0 );
+    }
+
+    /*
+     * general case
+     */
+    for( i = A->n - 1, y = 0; i >= 0; i-- )
+    {
+        x  = A->p[i];
+        y  = ( y << biH ) | ( x >> biH );
+        z  = y / b;
+        y -= z * b;
+
+        x <<= biH;
+        y  = ( y << biH ) | ( x >> biH );
+        z  = y / b;
+        y -= z * b;
+    }
+
+    *r = y;
+
+    return( 0 );
+}
+
+/*
+ * Fast Montgomery initialization (thanks to Tom St Denis)
+ */
+static void mpi_montg_init( t_int *mm, mpi *N )
+{
+    t_int x, m0 = N->p[0];
+
+    x  = m0;
+    x += ( ( m0 + 2 ) & 4 ) << 1;
+    x *= ( 2 - ( m0 * x ) );
+
+    if( biL >= 16 ) x *= ( 2 - ( m0 * x ) );
+    if( biL >= 32 ) x *= ( 2 - ( m0 * x ) );
+    if( biL >= 64 ) x *= ( 2 - ( m0 * x ) );
+
+    *mm = ~x + 1;
+}
+
+/*
+ * Montgomery multiplication: A = A * B * R^-1 mod N  (HAC 14.36)
+ */
+static void mpi_montmul( mpi *A, mpi *B, mpi *N, t_int mm, mpi *T )
+{
+    int i, n, m;
+    t_int u0, u1, *d;
+
+    memset( T->p, 0, T->n * ciL );
+
+    d = T->p;
+    n = N->n;
+    m = ( B->n < n ) ? B->n : n;
+
+    for( i = 0; i < n; i++ )
+    {
+        /*
+         * T = (T + u0*B + u1*N) / 2^biL
+         */
+        u0 = A->p[i];
+        u1 = ( d[0] + u0 * B->p[0] ) * mm;
+
+        mpi_mul_hlp( m, B->p, d, u0 );
+        mpi_mul_hlp( n, N->p, d, u1 );
+
+        *d++ = u0; d[n + 1] = 0;
+    }
+
+    memcpy( A->p, d, (n + 1) * ciL );
+
+    if( mpi_cmp_abs( A, N ) >= 0 )
+        mpi_sub_hlp( n, N->p, A->p );
+    else
+        /* prevent timing attacks */
+        mpi_sub_hlp( n, A->p, T->p );
+}
+
+/*
+ * Montgomery reduction: A = A * R^-1 mod N
+ */
+static void mpi_montred( mpi *A, mpi *N, t_int mm, mpi *T )
+{
+    t_int z = 1;
+    mpi U;
+
+    U.n = U.s = z;
+    U.p = &z;
+
+    mpi_montmul( A, &U, N, mm, T );
+}
+
+/*
+ * Sliding-window exponentiation: X = A^E mod N  (HAC 14.85)
+ */
+int mpi_exp_mod( mpi *X, mpi *A, mpi *E, mpi *N, mpi *_RR )
+{
+    int ret, i, j, wsize, wbits;
+    int bufsize, nblimbs, nbits;
+    t_int ei, mm, state;
+    mpi RR, T, W[64];
+
+    if( mpi_cmp_int( N, 0 ) < 0 || ( N->p[0] & 1 ) == 0 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    /*
+     * Init temps and window size
+     */
+    mpi_montg_init( &mm, N );
+    mpi_init( &RR, &T, NULL );
+    memset( W, 0, sizeof( W ) );
+
+    i = mpi_msb( E );
+
+    wsize = ( i > 671 ) ? 6 : ( i > 239 ) ? 5 :
+            ( i >  79 ) ? 4 : ( i >  23 ) ? 3 : 1;
+
+    j = N->n + 1;
+    MPI_CHK( mpi_grow( X, j ) );
+    MPI_CHK( mpi_grow( &W[1],  j ) );
+    MPI_CHK( mpi_grow( &T, j * 2 ) );
+
+    /*
+     * If 1st call, pre-compute R^2 mod N
+     */
+    if( _RR == NULL || _RR->p == NULL )
+    {
+        MPI_CHK( mpi_lset( &RR, 1 ) );
+        MPI_CHK( mpi_shift_l( &RR, N->n * 2 * biL ) );
+        MPI_CHK( mpi_mod_mpi( &RR, &RR, N ) );
+
+        if( _RR != NULL )
+            memcpy( _RR, &RR, sizeof( mpi ) );
+    }
+    else
+        memcpy( &RR, _RR, sizeof( mpi ) );
+
+    /*
+     * W[1] = A * R^2 * R^-1 mod N = A * R mod N
+     */
+    if( mpi_cmp_mpi( A, N ) >= 0 )
+        mpi_mod_mpi( &W[1], A, N );
+    else   mpi_copy( &W[1], A );
+
+    mpi_montmul( &W[1], &RR, N, mm, &T );
+
+    /*
+     * X = R^2 * R^-1 mod N = R mod N
+     */
+    MPI_CHK( mpi_copy( X, &RR ) );
+    mpi_montred( X, N, mm, &T );
+
+    if( wsize > 1 )
+    {
+        /*
+         * W[1 << (wsize - 1)] = W[1] ^ (wsize - 1)
+         */
+        j =  1 << (wsize - 1);
+
+        MPI_CHK( mpi_grow( &W[j], N->n + 1 ) );
+        MPI_CHK( mpi_copy( &W[j], &W[1]    ) );
+
+        for( i = 0; i < wsize - 1; i++ )
+            mpi_montmul( &W[j], &W[j], N, mm, &T );
+    
+        /*
+         * W[i] = W[i - 1] * W[1]
+         */
+        for( i = j + 1; i < (1 << wsize); i++ )
+        {
+            MPI_CHK( mpi_grow( &W[i], N->n + 1 ) );
+            MPI_CHK( mpi_copy( &W[i], &W[i - 1] ) );
+
+            mpi_montmul( &W[i], &W[1], N, mm, &T );
+        }
+    }
+
+    nblimbs = E->n;
+    bufsize = 0;
+    nbits   = 0;
+    wbits   = 0;
+    state   = 0;
+
+    while( 1 )
+    {
+        if( bufsize == 0 )
+        {
+            if( nblimbs-- == 0 )
+                break;
+
+            bufsize = sizeof( t_int ) << 3;
+        }
+
+        bufsize--;
+
+        ei = (E->p[nblimbs] >> bufsize) & 1;
+
+        /*
+         * skip leading 0s
+         */
+        if( ei == 0 && state == 0 )
+            continue;
+
+        if( ei == 0 && state == 1 )
+        {
+            /*
+             * out of window, square X
+             */
+            mpi_montmul( X, X, N, mm, &T );
+            continue;
+        }
+
+        /*
+         * add ei to current window
+         */
+        state = 2;
+
+        nbits++;
+        wbits |= (ei << (wsize - nbits));
+
+        if( nbits == wsize )
+        {
+            /*
+             * X = X^wsize R^-1 mod N
+             */
+            for( i = 0; i < wsize; i++ )
+                mpi_montmul( X, X, N, mm, &T );
+
+            /*
+             * X = X * W[wbits] R^-1 mod N
+             */
+            mpi_montmul( X, &W[wbits], N, mm, &T );
+
+            state--;
+            nbits = 0;
+            wbits = 0;
+        }
+    }
+
+    /*
+     * process the remaining bits
+     */
+    for( i = 0; i < nbits; i++ )
+    {
+        mpi_montmul( X, X, N, mm, &T );
+
+        wbits <<= 1;
+
+        if( (wbits & (1 << wsize)) != 0 )
+            mpi_montmul( X, &W[1], N, mm, &T );
+    }
+
+    /*
+     * X = A^E * R * R^-1 mod N = A^E mod N
+     */
+    mpi_montred( X, N, mm, &T );
+
+cleanup:
+
+    for( i = (1 << (wsize - 1)); i < (1 << wsize); i++ )
+        mpi_free( &W[i], NULL );
+
+    if( _RR != NULL )
+         mpi_free( &W[1], &T, NULL );
+    else mpi_free( &W[1], &T, &RR, NULL );
+
+    return( ret );
+}
+
+/*
+ * Greatest common divisor: G = gcd(A, B)  (HAC 14.54)
+ */
+int mpi_gcd( mpi *G, mpi *A, mpi *B )
+{
+    int ret, lz, lzt;
+    mpi TG, TA, TB;
+
+    mpi_init( &TG, &TA, &TB, NULL );
+
+    MPI_CHK( mpi_copy( &TA, A ) );
+    MPI_CHK( mpi_copy( &TB, B ) );
+
+    lz = mpi_lsb( &TA );
+    lzt = mpi_lsb( &TB );
+
+    if ( lzt < lz )
+        lz = lzt;
+
+    MPI_CHK( mpi_shift_r( &TA, lz ) );
+    MPI_CHK( mpi_shift_r( &TB, lz ) );
+
+    TA.s = TB.s = 1;
+
+    while( mpi_cmp_int( &TA, 0 ) != 0 )
+    {
+        MPI_CHK( mpi_shift_r( &TA, mpi_lsb( &TA ) ) );
+        MPI_CHK( mpi_shift_r( &TB, mpi_lsb( &TB ) ) );
+
+        if( mpi_cmp_mpi( &TA, &TB ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_abs( &TA, &TA, &TB ) );
+            MPI_CHK( mpi_shift_r( &TA, 1 ) );
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_abs( &TB, &TB, &TA ) );
+            MPI_CHK( mpi_shift_r( &TB, 1 ) );
+        }
+    }
+
+    MPI_CHK( mpi_shift_l( &TB, lz ) );
+    MPI_CHK( mpi_copy( G, &TB ) );
+
+cleanup:
+
+    mpi_free( &TB, &TA, &TG, NULL );
+
+    return( ret );
+}
+
+#if defined(POLARSSL_GENPRIME)
+
+/*
+ * Modular inverse: X = A^-1 mod N  (HAC 14.61 / 14.64)
+ */
+int mpi_inv_mod( mpi *X, mpi *A, mpi *N )
+{
+    int ret;
+    mpi G, TA, TU, U1, U2, TB, TV, V1, V2;
+
+    if( mpi_cmp_int( N, 0 ) <= 0 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    mpi_init( &TA, &TU, &U1, &U2, &G,
+              &TB, &TV, &V1, &V2, NULL );
+
+    MPI_CHK( mpi_gcd( &G, A, N ) );
+
+    if( mpi_cmp_int( &G, 1 ) != 0 )
+    {
+        ret = POLARSSL_ERR_MPI_NOT_ACCEPTABLE;
+        goto cleanup;
+    }
+
+    MPI_CHK( mpi_mod_mpi( &TA, A, N ) );
+    MPI_CHK( mpi_copy( &TU, &TA ) );
+    MPI_CHK( mpi_copy( &TB, N ) );
+    MPI_CHK( mpi_copy( &TV, N ) );
+
+    MPI_CHK( mpi_lset( &U1, 1 ) );
+    MPI_CHK( mpi_lset( &U2, 0 ) );
+    MPI_CHK( mpi_lset( &V1, 0 ) );
+    MPI_CHK( mpi_lset( &V2, 1 ) );
+
+    do
+    {
+        while( ( TU.p[0] & 1 ) == 0 )
+        {
+            MPI_CHK( mpi_shift_r( &TU, 1 ) );
+
+            if( ( U1.p[0] & 1 ) != 0 || ( U2.p[0] & 1 ) != 0 )
+            {
+                MPI_CHK( mpi_add_mpi( &U1, &U1, &TB ) );
+                MPI_CHK( mpi_sub_mpi( &U2, &U2, &TA ) );
+            }
+
+            MPI_CHK( mpi_shift_r( &U1, 1 ) );
+            MPI_CHK( mpi_shift_r( &U2, 1 ) );
+        }
+
+        while( ( TV.p[0] & 1 ) == 0 )
+        {
+            MPI_CHK( mpi_shift_r( &TV, 1 ) );
+
+            if( ( V1.p[0] & 1 ) != 0 || ( V2.p[0] & 1 ) != 0 )
+            {
+                MPI_CHK( mpi_add_mpi( &V1, &V1, &TB ) );
+                MPI_CHK( mpi_sub_mpi( &V2, &V2, &TA ) );
+            }
+
+            MPI_CHK( mpi_shift_r( &V1, 1 ) );
+            MPI_CHK( mpi_shift_r( &V2, 1 ) );
+        }
+
+        if( mpi_cmp_mpi( &TU, &TV ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_mpi( &TU, &TU, &TV ) );
+            MPI_CHK( mpi_sub_mpi( &U1, &U1, &V1 ) );
+            MPI_CHK( mpi_sub_mpi( &U2, &U2, &V2 ) );
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_mpi( &TV, &TV, &TU ) );
+            MPI_CHK( mpi_sub_mpi( &V1, &V1, &U1 ) );
+            MPI_CHK( mpi_sub_mpi( &V2, &V2, &U2 ) );
+        }
+    }
+    while( mpi_cmp_int( &TU, 0 ) != 0 );
+
+    while( mpi_cmp_int( &V1, 0 ) < 0 )
+        MPI_CHK( mpi_add_mpi( &V1, &V1, N ) );
+
+    while( mpi_cmp_mpi( &V1, N ) >= 0 )
+        MPI_CHK( mpi_sub_mpi( &V1, &V1, N ) );
+
+    MPI_CHK( mpi_copy( X, &V1 ) );
+
+cleanup:
+
+    mpi_free( &V2, &V1, &TV, &TB, &G,
+              &U2, &U1, &TU, &TA, NULL );
+
+    return( ret );
+}
+
+static const int small_prime[] =
+{
+        3,    5,    7,   11,   13,   17,   19,   23,
+       29,   31,   37,   41,   43,   47,   53,   59,
+       61,   67,   71,   73,   79,   83,   89,   97,
+      101,  103,  107,  109,  113,  127,  131,  137,
+      139,  149,  151,  157,  163,  167,  173,  179,
+      181,  191,  193,  197,  199,  211,  223,  227,
+      229,  233,  239,  241,  251,  257,  263,  269,
+      271,  277,  281,  283,  293,  307,  311,  313,
+      317,  331,  337,  347,  349,  353,  359,  367,
+      373,  379,  383,  389,  397,  401,  409,  419,
+      421,  431,  433,  439,  443,  449,  457,  461,
+      463,  467,  479,  487,  491,  499,  503,  509,
+      521,  523,  541,  547,  557,  563,  569,  571,
+      577,  587,  593,  599,  601,  607,  613,  617,
+      619,  631,  641,  643,  647,  653,  659,  661,
+      673,  677,  683,  691,  701,  709,  719,  727,
+      733,  739,  743,  751,  757,  761,  769,  773,
+      787,  797,  809,  811,  821,  823,  827,  829,
+      839,  853,  857,  859,  863,  877,  881,  883,
+      887,  907,  911,  919,  929,  937,  941,  947,
+      953,  967,  971,  977,  983,  991,  997, -103
+};
+
+/*
+ * Miller-Rabin primality test  (HAC 4.24)
+ */
+int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng )
+{
+    int ret, i, j, n, s, xs;
+    mpi W, R, T, A, RR;
+    unsigned char *p;
+
+    if( mpi_cmp_int( X, 0 ) == 0 )
+        return( 0 );
+
+    mpi_init( &W, &R, &T, &A, &RR, NULL );
+
+    xs = X->s; X->s = 1;
+
+    /*
+     * test trivial factors first
+     */
+    if( ( X->p[0] & 1 ) == 0 )
+        return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
+
+    for( i = 0; small_prime[i] > 0; i++ )
+    {
+        t_int r;
+
+        if( mpi_cmp_int( X, small_prime[i] ) <= 0 )
+            return( 0 );
+
+        MPI_CHK( mpi_mod_int( &r, X, small_prime[i] ) );
+
+        if( r == 0 )
+            return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
+    }
+
+    /*
+     * W = |X| - 1
+     * R = W >> lsb( W )
+     */
+    s = mpi_lsb( &W );
+    MPI_CHK( mpi_sub_int( &W, X, 1 ) );
+    MPI_CHK( mpi_copy( &R, &W ) );
+    MPI_CHK( mpi_shift_r( &R, s ) );
+
+    i = mpi_msb( X );
+    /*
+     * HAC, table 4.4
+     */
+    n = ( ( i >= 1300 ) ?  2 : ( i >=  850 ) ?  3 :
+          ( i >=  650 ) ?  4 : ( i >=  350 ) ?  8 :
+          ( i >=  250 ) ? 12 : ( i >=  150 ) ? 18 : 27 );
+
+    for( i = 0; i < n; i++ )
+    {
+        /*
+         * pick a random A, 1 < A < |X| - 1
+         */
+        MPI_CHK( mpi_grow( &A, X->n ) );
+
+        p = (unsigned char *) A.p;
+        for( j = 0; j < A.n * ciL; j++ )
+            *p++ = (unsigned char) f_rng( p_rng );
+
+        j = mpi_msb( &A ) - mpi_msb( &W );
+        MPI_CHK( mpi_shift_r( &A, j + 1 ) );
+        A.p[0] |= 3;
+
+        /*
+         * A = A^R mod |X|
+         */
+        MPI_CHK( mpi_exp_mod( &A, &A, &R, X, &RR ) );
+
+        if( mpi_cmp_mpi( &A, &W ) == 0 ||
+            mpi_cmp_int( &A,  1 ) == 0 )
+            continue;
+
+        j = 1;
+        while( j < s && mpi_cmp_mpi( &A, &W ) != 0 )
+        {
+            /*
+             * A = A * A mod |X|
+             */
+            MPI_CHK( mpi_mul_mpi( &T, &A, &A ) );
+            MPI_CHK( mpi_mod_mpi( &A, &T, X  ) );
+
+            if( mpi_cmp_int( &A, 1 ) == 0 )
+                break;
+
+            j++;
+        }
+
+        /*
+         * not prime if A != |X| - 1 or A == 1
+         */
+        if( mpi_cmp_mpi( &A, &W ) != 0 ||
+            mpi_cmp_int( &A,  1 ) == 0 )
+        {
+            ret = POLARSSL_ERR_MPI_NOT_ACCEPTABLE;
+            break;
+        }
+    }
+
+cleanup:
+
+    X->s = xs;
+
+    mpi_free( &RR, &A, &T, &R, &W, NULL );
+
+    return( ret );
+}
+
+/*
+ * Prime number generation
+ */
+int mpi_gen_prime( mpi *X, int nbits, int dh_flag,
+                   int (*f_rng)(void *), void *p_rng )
+{
+    int ret, k, n;
+    unsigned char *p;
+    mpi Y;
+
+    if( nbits < 3 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    mpi_init( &Y, NULL );
+
+    n = BITS_TO_LIMBS( nbits );
+
+    MPI_CHK( mpi_grow( X, n ) );
+    MPI_CHK( mpi_lset( X, 0 ) );
+
+    p = (unsigned char *) X->p;
+    for( k = 0; k < X->n * ciL; k++ )
+        *p++ = (unsigned char) f_rng( p_rng );
+
+    k = mpi_msb( X );
+    if( k < nbits ) MPI_CHK( mpi_shift_l( X, nbits - k ) );
+    if( k > nbits ) MPI_CHK( mpi_shift_r( X, k - nbits ) );
+
+    X->p[0] |= 3;
+
+    if( dh_flag == 0 )
+    {
+        while( ( ret = mpi_is_prime( X, f_rng, p_rng ) ) != 0 )
+        {
+            if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
+                goto cleanup;
+
+            MPI_CHK( mpi_add_int( X, X, 2 ) );
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_sub_int( &Y, X, 1 ) );
+        MPI_CHK( mpi_shift_r( &Y, 1 ) );
+
+        while( 1 )
+        {
+            if( ( ret = mpi_is_prime( X, f_rng, p_rng ) ) == 0 )
+            {
+                if( ( ret = mpi_is_prime( &Y, f_rng, p_rng ) ) == 0 )
+                    break;
+
+                if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
+                    goto cleanup;
+            }
+
+            if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
+                goto cleanup;
+
+            MPI_CHK( mpi_add_int( &Y, X, 1 ) );
+            MPI_CHK( mpi_add_int(  X, X, 2 ) );
+            MPI_CHK( mpi_shift_r( &Y, 1 ) );
+        }
+    }
+
+cleanup:
+
+    mpi_free( &Y, NULL );
+
+    return( ret );
+}
+
+#endif
+
+#if defined(POLARSSL_SELF_TEST)
+
+#define GCD_PAIR_COUNT	3
+
+static const int gcd_pairs[GCD_PAIR_COUNT][3] =
+{
+    { 693, 609, 21 },
+    { 1764, 868, 28 },
+    { 768454923, 542167814, 1 }
+};
+
+/*
+ * Checkup routine
+ */
+int mpi_self_test( int verbose )
+{
+    int ret, i;
+    mpi A, E, N, X, Y, U, V;
+
+    mpi_init( &A, &E, &N, &X, &Y, &U, &V, NULL );
+
+    MPI_CHK( mpi_read_string( &A, 16,
+        "EFE021C2645FD1DC586E69184AF4A31E" \
+        "D5F53E93B5F123FA41680867BA110131" \
+        "944FE7952E2517337780CB0DB80E61AA" \
+        "E7C8DDC6C5C6AADEB34EB38A2F40D5E6" ) );
+
+    MPI_CHK( mpi_read_string( &E, 16,
+        "B2E7EFD37075B9F03FF989C7C5051C20" \
+        "34D2A323810251127E7BF8625A4F49A5" \
+        "F3E27F4DA8BD59C47D6DAABA4C8127BD" \
+        "5B5C25763222FEFCCFC38B832366C29E" ) );
+
+    MPI_CHK( mpi_read_string( &N, 16,
+        "0066A198186C18C10B2F5ED9B522752A" \
+        "9830B69916E535C8F047518A889A43A5" \
+        "94B6BED27A168D31D4A52F88925AA8F5" ) );
+
+    MPI_CHK( mpi_mul_mpi( &X, &A, &N ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "602AB7ECA597A3D6B56FF9829A5E8B85" \
+        "9E857EA95A03512E2BAE7391688D264A" \
+        "A5663B0341DB9CCFD2C4C5F421FEC814" \
+        "8001B72E848A38CAE1C65F78E56ABDEF" \
+        "E12D3C039B8A02D6BE593F0BBBDA56F1" \
+        "ECF677152EF804370C1A305CAF3B5BF1" \
+        "30879B56C61DE584A0F53A2447A51E" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #1 (mul_mpi): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    MPI_CHK( mpi_div_mpi( &X, &Y, &A, &N ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "256567336059E52CAE22925474705F39A94" ) );
+
+    MPI_CHK( mpi_read_string( &V, 16,
+        "6613F26162223DF488E9CD48CC132C7A" \
+        "0AC93C701B001B092E4E5B9F73BCD27B" \
+        "9EE50D0657C77F374E903CDFA4C642" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #2 (div_mpi): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 ||
+        mpi_cmp_mpi( &Y, &V ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    MPI_CHK( mpi_exp_mod( &X, &A, &E, &N, NULL ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "36E139AEA55215609D2816998ED020BB" \
+        "BD96C37890F65171D948E9BC7CBAA4D9" \
+        "325D24D6A3C12710F10A09FA08AB87" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #3 (exp_mod): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    MPI_CHK( mpi_inv_mod( &X, &A, &N ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "003A0AAEDD7E784FC07D8F9EC6E3BFD5" \
+        "C3DBA76456363A10869622EAC2DD84EC" \
+        "C5B8A74DAC4D09E03B5E0BE779F2DF61" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #4 (inv_mod): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    if( verbose != 0 )
+        printf( "  MPI test #5 (simple gcd): " );
+
+    for ( i = 0; i < GCD_PAIR_COUNT; i++)
+    {
+        MPI_CHK( mpi_lset( &X, gcd_pairs[i][0] ) );
+	MPI_CHK( mpi_lset( &Y, gcd_pairs[i][1] ) );
+
+	MPI_CHK( mpi_gcd( &A, &X, &Y ) );
+
+	if( mpi_cmp_int( &A, gcd_pairs[i][2] ) != 0 )
+	{
+		if( verbose != 0 )
+			printf( "failed at %d\n", i );
+
+		return( 1 );
+	}
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+cleanup:
+
+    if( ret != 0 && verbose != 0 )
+        printf( "Unexpected error, return code = %08X\n", ret );
+
+    mpi_free( &V, &U, &Y, &X, &N, &E, &A, NULL );
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    return( ret );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/luci/libs/px5g/src/library/havege.c b/trunk/package/luci/libs/px5g/src/library/havege.c
new file mode 100644
index 00000000..266299d3
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/library/havege.c
@@ -0,0 +1,276 @@
+/*
+ *  HAVEGE: HArdware Volatile Entropy Gathering and Expansion
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  The HAVEGE RNG was designed by Andre Seznec in 2002.
+ *
+ *  http://www.irisa.fr/caps/projects/hipsor/publi.php
+ *
+ *  Contact: seznec(at)irisa_dot_fr - orocheco(at)irisa_dot_fr
+ */
+
+#include <string.h>
+#include <time.h>
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_HAVEGE_C)
+
+#include "polarssl/havege.h"
+#include "polarssl/timing.h"
+
+/* ------------------------------------------------------------------------
+ * On average, one iteration accesses two 8-word blocks in the havege WALK
+ * table, and generates 16 words in the RES array.
+ *
+ * The data read in the WALK table is updated and permuted after each use.
+ * The result of the hardware clock counter read is used  for this update.
+ *
+ * 25 conditional tests are present.  The conditional tests are grouped in
+ * two nested  groups of 12 conditional tests and 1 test that controls the
+ * permutation; on average, there should be 6 tests executed and 3 of them
+ * should be mispredicted.
+ * ------------------------------------------------------------------------
+ */
+
+#define SWAP(X,Y) { int *T = X; X = Y; Y = T; }
+
+#define TST1_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1;
+#define TST2_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1;
+
+#define TST1_LEAVE U1++; }
+#define TST2_LEAVE U2++; }
+
+#define ONE_ITERATION                                   \
+                                                        \
+    PTEST = PT1 >> 20;                                  \
+                                                        \
+    TST1_ENTER  TST1_ENTER  TST1_ENTER  TST1_ENTER      \
+    TST1_ENTER  TST1_ENTER  TST1_ENTER  TST1_ENTER      \
+    TST1_ENTER  TST1_ENTER  TST1_ENTER  TST1_ENTER      \
+                                                        \
+    TST1_LEAVE  TST1_LEAVE  TST1_LEAVE  TST1_LEAVE      \
+    TST1_LEAVE  TST1_LEAVE  TST1_LEAVE  TST1_LEAVE      \
+    TST1_LEAVE  TST1_LEAVE  TST1_LEAVE  TST1_LEAVE      \
+                                                        \
+    PTX = (PT1 >> 18) & 7;                              \
+    PT1 &= 0x1FFF;                                      \
+    PT2 &= 0x1FFF;                                      \
+    CLK = (int) hardclock();                            \
+                                                        \
+    i = 0;                                              \
+    A = &WALK[PT1    ]; RES[i++] ^= *A;                 \
+    B = &WALK[PT2    ]; RES[i++] ^= *B;                 \
+    C = &WALK[PT1 ^ 1]; RES[i++] ^= *C;                 \
+    D = &WALK[PT2 ^ 4]; RES[i++] ^= *D;                 \
+                                                        \
+    IN = (*A >> (1)) ^ (*A << (31)) ^ CLK;              \
+    *A = (*B >> (2)) ^ (*B << (30)) ^ CLK;              \
+    *B = IN ^ U1;                                       \
+    *C = (*C >> (3)) ^ (*C << (29)) ^ CLK;              \
+    *D = (*D >> (4)) ^ (*D << (28)) ^ CLK;              \
+                                                        \
+    A = &WALK[PT1 ^ 2]; RES[i++] ^= *A;                 \
+    B = &WALK[PT2 ^ 2]; RES[i++] ^= *B;                 \
+    C = &WALK[PT1 ^ 3]; RES[i++] ^= *C;                 \
+    D = &WALK[PT2 ^ 6]; RES[i++] ^= *D;                 \
+                                                        \
+    if( PTEST & 1 ) SWAP( A, C );                       \
+                                                        \
+    IN = (*A >> (5)) ^ (*A << (27)) ^ CLK;              \
+    *A = (*B >> (6)) ^ (*B << (26)) ^ CLK;              \
+    *B = IN; CLK = (int) hardclock();                   \
+    *C = (*C >> (7)) ^ (*C << (25)) ^ CLK;              \
+    *D = (*D >> (8)) ^ (*D << (24)) ^ CLK;              \
+                                                        \
+    A = &WALK[PT1 ^ 4];                                 \
+    B = &WALK[PT2 ^ 1];                                 \
+                                                        \
+    PTEST = PT2 >> 1;                                   \
+                                                        \
+    PT2 = (RES[(i - 8) ^ PTY] ^ WALK[PT2 ^ PTY ^ 7]);   \
+    PT2 = ((PT2 & 0x1FFF) & (~8)) ^ ((PT1 ^ 8) & 0x8);  \
+    PTY = (PT2 >> 10) & 7;                              \
+                                                        \
+    TST2_ENTER  TST2_ENTER  TST2_ENTER  TST2_ENTER      \
+    TST2_ENTER  TST2_ENTER  TST2_ENTER  TST2_ENTER      \
+    TST2_ENTER  TST2_ENTER  TST2_ENTER  TST2_ENTER      \
+                                                        \
+    TST2_LEAVE  TST2_LEAVE  TST2_LEAVE  TST2_LEAVE      \
+    TST2_LEAVE  TST2_LEAVE  TST2_LEAVE  TST2_LEAVE      \
+    TST2_LEAVE  TST2_LEAVE  TST2_LEAVE  TST2_LEAVE      \
+                                                        \
+    C = &WALK[PT1 ^ 5];                                 \
+    D = &WALK[PT2 ^ 5];                                 \
+                                                        \
+    RES[i++] ^= *A;                                     \
+    RES[i++] ^= *B;                                     \
+    RES[i++] ^= *C;                                     \
+    RES[i++] ^= *D;                                     \
+                                                        \
+    IN = (*A >> ( 9)) ^ (*A << (23)) ^ CLK;             \
+    *A = (*B >> (10)) ^ (*B << (22)) ^ CLK;             \
+    *B = IN ^ U2;                                       \
+    *C = (*C >> (11)) ^ (*C << (21)) ^ CLK;             \
+    *D = (*D >> (12)) ^ (*D << (20)) ^ CLK;             \
+                                                        \
+    A = &WALK[PT1 ^ 6]; RES[i++] ^= *A;                 \
+    B = &WALK[PT2 ^ 3]; RES[i++] ^= *B;                 \
+    C = &WALK[PT1 ^ 7]; RES[i++] ^= *C;                 \
+    D = &WALK[PT2 ^ 7]; RES[i++] ^= *D;                 \
+                                                        \
+    IN = (*A >> (13)) ^ (*A << (19)) ^ CLK;             \
+    *A = (*B >> (14)) ^ (*B << (18)) ^ CLK;             \
+    *B = IN;                                            \
+    *C = (*C >> (15)) ^ (*C << (17)) ^ CLK;             \
+    *D = (*D >> (16)) ^ (*D << (16)) ^ CLK;             \
+                                                        \
+    PT1 = ( RES[(i - 8) ^ PTX] ^                        \
+            WALK[PT1 ^ PTX ^ 7] ) & (~1);               \
+    PT1 ^= (PT2 ^ 0x10) & 0x10;                         \
+                                                        \
+    for( n++, i = 0; i < 16; i++ )                      \
+        hs->pool[n % COLLECT_SIZE] ^= RES[i];
+
+/*
+ * Entropy gathering function
+ */
+static void havege_fill( havege_state *hs )
+{
+    int i, n = 0;
+    int  U1,  U2, *A, *B, *C, *D;
+    int PT1, PT2, *WALK, RES[16];
+    int PTX, PTY, CLK, PTEST, IN;
+
+    WALK = hs->WALK;
+    PT1  = hs->PT1;
+    PT2  = hs->PT2;
+
+    PTX  = U1 = 0;
+    PTY  = U2 = 0;
+
+    memset( RES, 0, sizeof( RES ) );
+
+    while( n < COLLECT_SIZE * 4 )
+    {
+        ONE_ITERATION
+        ONE_ITERATION
+        ONE_ITERATION
+        ONE_ITERATION
+    }
+
+    hs->PT1 = PT1;
+    hs->PT2 = PT2;
+
+    hs->offset[0] = 0;
+    hs->offset[1] = COLLECT_SIZE / 2;
+}
+
+/*
+ * HAVEGE initialization
+ */
+void havege_init( havege_state *hs )
+{
+    memset( hs, 0, sizeof( havege_state ) );
+
+    havege_fill( hs );
+}
+
+/*
+ * HAVEGE rand function
+ */
+int havege_rand( void *p_rng )
+{
+    int ret;
+    havege_state *hs = (havege_state *) p_rng;
+
+    if( hs->offset[1] >= COLLECT_SIZE )
+        havege_fill( hs );
+
+    ret  = hs->pool[hs->offset[0]++];
+    ret ^= hs->pool[hs->offset[1]++];
+
+    return( ret );
+}
+
+#if defined(POLARSSL_RAND_TEST)
+
+#include <stdio.h>
+
+int main( int argc, char *argv[] )
+{
+    FILE *f;
+    time_t t;
+    int i, j, k;
+    havege_state hs;
+    unsigned char buf[1024];
+
+    if( argc < 2 )
+    {
+        fprintf( stderr, "usage: %s <output filename>\n", argv[0] );
+        return( 1 );
+    }
+
+    if( ( f = fopen( argv[1], "wb+" ) ) == NULL )
+    {
+        printf( "failed to open '%s' for writing.\n", argv[0] );
+        return( 1 );
+    }
+
+    havege_init( &hs );
+
+    t = time( NULL );
+
+    for( i = 0, k = 32768; i < k; i++ )
+    {
+        for( j = 0; j < sizeof( buf ); j++ )
+            buf[j] = havege_rand( &hs );
+
+        fwrite( buf, sizeof( buf ), 1, f );
+
+        printf( "Generating 32Mb of data in file '%s'... %04.1f" \
+                "%% done\r", argv[1], (100 * (float) (i + 1)) / k );
+        fflush( stdout );
+    }
+
+    if( t == time( NULL ) )
+        t--;
+
+    fclose( f );
+    return( 0 );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/luci/libs/px5g/src/library/rsa.c b/trunk/package/luci/libs/px5g/src/library/rsa.c
new file mode 100644
index 00000000..131b6c6c
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/library/rsa.c
@@ -0,0 +1,750 @@
+/*
+ *  The RSA public-key cryptosystem
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  RSA was designed by Ron Rivest, Adi Shamir and Len Adleman.
+ *
+ *  http://theory.lcs.mit.edu/~rivest/rsapaper.pdf
+ *  http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_RSA_C)
+
+#include "polarssl/rsa.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+/*
+ * Initialize an RSA context
+ */
+void rsa_init( rsa_context *ctx,
+               int padding,
+               int hash_id,
+               int (*f_rng)(void *),
+               void *p_rng )
+{
+    memset( ctx, 0, sizeof( rsa_context ) );
+
+    ctx->padding = padding;
+    ctx->hash_id = hash_id;
+
+    ctx->f_rng = f_rng;
+    ctx->p_rng = p_rng;
+}
+
+#if defined(POLARSSL_GENPRIME)
+
+/*
+ * Generate an RSA keypair
+ */
+int rsa_gen_key( rsa_context *ctx, int nbits, int exponent )
+{
+    int ret;
+    mpi P1, Q1, H, G;
+
+    if( ctx->f_rng == NULL || nbits < 128 || exponent < 3 )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    mpi_init( &P1, &Q1, &H, &G, NULL );
+
+    /*
+     * find primes P and Q with Q < P so that:
+     * GCD( E, (P-1)*(Q-1) ) == 1
+     */
+    MPI_CHK( mpi_lset( &ctx->E, exponent ) );
+
+    do
+    {
+        MPI_CHK( mpi_gen_prime( &ctx->P, ( nbits + 1 ) >> 1, 0, 
+                                ctx->f_rng, ctx->p_rng ) );
+
+        MPI_CHK( mpi_gen_prime( &ctx->Q, ( nbits + 1 ) >> 1, 0,
+                                ctx->f_rng, ctx->p_rng ) );
+
+        if( mpi_cmp_mpi( &ctx->P, &ctx->Q ) < 0 )
+            mpi_swap( &ctx->P, &ctx->Q );
+
+        if( mpi_cmp_mpi( &ctx->P, &ctx->Q ) == 0 )
+            continue;
+
+        MPI_CHK( mpi_mul_mpi( &ctx->N, &ctx->P, &ctx->Q ) );
+        if( mpi_msb( &ctx->N ) != nbits )
+            continue;
+
+        MPI_CHK( mpi_sub_int( &P1, &ctx->P, 1 ) );
+        MPI_CHK( mpi_sub_int( &Q1, &ctx->Q, 1 ) );
+        MPI_CHK( mpi_mul_mpi( &H, &P1, &Q1 ) );
+        MPI_CHK( mpi_gcd( &G, &ctx->E, &H  ) );
+    }
+    while( mpi_cmp_int( &G, 1 ) != 0 );
+
+    /*
+     * D  = E^-1 mod ((P-1)*(Q-1))
+     * DP = D mod (P - 1)
+     * DQ = D mod (Q - 1)
+     * QP = Q^-1 mod P
+     */
+    MPI_CHK( mpi_inv_mod( &ctx->D , &ctx->E, &H  ) );
+    MPI_CHK( mpi_mod_mpi( &ctx->DP, &ctx->D, &P1 ) );
+    MPI_CHK( mpi_mod_mpi( &ctx->DQ, &ctx->D, &Q1 ) );
+    MPI_CHK( mpi_inv_mod( &ctx->QP, &ctx->Q, &ctx->P ) );
+
+    ctx->len = ( mpi_msb( &ctx->N ) + 7 ) >> 3;
+
+cleanup:
+
+    mpi_free( &G, &H, &Q1, &P1, NULL );
+
+    if( ret != 0 )
+    {
+        rsa_free( ctx );
+        return( POLARSSL_ERR_RSA_KEY_GEN_FAILED | ret );
+    }
+
+    return( 0 );   
+}
+
+#endif
+
+/*
+ * Check a public RSA key
+ */
+int rsa_check_pubkey( rsa_context *ctx )
+{
+    if( ( ctx->N.p[0] & 1 ) == 0 || 
+        ( ctx->E.p[0] & 1 ) == 0 )
+        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
+
+    if( mpi_msb( &ctx->N ) < 128 ||
+        mpi_msb( &ctx->N ) > 4096 )
+        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
+
+    if( mpi_msb( &ctx->E ) < 2 ||
+        mpi_msb( &ctx->E ) > 64 )
+        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
+
+    return( 0 );
+}
+
+/*
+ * Check a private RSA key
+ */
+int rsa_check_privkey( rsa_context *ctx )
+{
+    int ret;
+    mpi PQ, DE, P1, Q1, H, I, G;
+
+    if( ( ret = rsa_check_pubkey( ctx ) ) != 0 )
+        return( ret );
+
+    mpi_init( &PQ, &DE, &P1, &Q1, &H, &I, &G, NULL );
+
+    MPI_CHK( mpi_mul_mpi( &PQ, &ctx->P, &ctx->Q ) );
+    MPI_CHK( mpi_mul_mpi( &DE, &ctx->D, &ctx->E ) );
+    MPI_CHK( mpi_sub_int( &P1, &ctx->P, 1 ) );
+    MPI_CHK( mpi_sub_int( &Q1, &ctx->Q, 1 ) );
+    MPI_CHK( mpi_mul_mpi( &H, &P1, &Q1 ) );
+    MPI_CHK( mpi_mod_mpi( &I, &DE, &H  ) );
+    MPI_CHK( mpi_gcd( &G, &ctx->E, &H  ) );
+
+    if( mpi_cmp_mpi( &PQ, &ctx->N ) == 0 &&
+        mpi_cmp_int( &I, 1 ) == 0 &&
+        mpi_cmp_int( &G, 1 ) == 0 )
+    {
+        mpi_free( &G, &I, &H, &Q1, &P1, &DE, &PQ, NULL );
+        return( 0 );
+    }
+
+cleanup:
+
+    mpi_free( &G, &I, &H, &Q1, &P1, &DE, &PQ, NULL );
+    return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED | ret );
+}
+
+/*
+ * Do an RSA public key operation
+ */
+int rsa_public( rsa_context *ctx,
+                unsigned char *input,
+                unsigned char *output )
+{
+    int ret, olen;
+    mpi T;
+
+    mpi_init( &T, NULL );
+
+    MPI_CHK( mpi_read_binary( &T, input, ctx->len ) );
+
+    if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
+    {
+        mpi_free( &T, NULL );
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+    olen = ctx->len;
+    MPI_CHK( mpi_exp_mod( &T, &T, &ctx->E, &ctx->N, &ctx->RN ) );
+    MPI_CHK( mpi_write_binary( &T, output, olen ) );
+
+cleanup:
+
+    mpi_free( &T, NULL );
+
+    if( ret != 0 )
+        return( POLARSSL_ERR_RSA_PUBLIC_FAILED | ret );
+
+    return( 0 );
+}
+
+/*
+ * Do an RSA private key operation
+ */
+int rsa_private( rsa_context *ctx,
+                 unsigned char *input,
+                 unsigned char *output )
+{
+    int ret, olen;
+    mpi T, T1, T2;
+
+    mpi_init( &T, &T1, &T2, NULL );
+
+    MPI_CHK( mpi_read_binary( &T, input, ctx->len ) );
+
+    if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
+    {
+        mpi_free( &T, NULL );
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+#if 0
+    MPI_CHK( mpi_exp_mod( &T, &T, &ctx->D, &ctx->N, &ctx->RN ) );
+#else
+    /*
+     * faster decryption using the CRT
+     *
+     * T1 = input ^ dP mod P
+     * T2 = input ^ dQ mod Q
+     */
+    MPI_CHK( mpi_exp_mod( &T1, &T, &ctx->DP, &ctx->P, &ctx->RP ) );
+    MPI_CHK( mpi_exp_mod( &T2, &T, &ctx->DQ, &ctx->Q, &ctx->RQ ) );
+
+    /*
+     * T = (T1 - T2) * (Q^-1 mod P) mod P
+     */
+    MPI_CHK( mpi_sub_mpi( &T, &T1, &T2 ) );
+    MPI_CHK( mpi_mul_mpi( &T1, &T, &ctx->QP ) );
+    MPI_CHK( mpi_mod_mpi( &T, &T1, &ctx->P ) );
+
+    /*
+     * output = T2 + T * Q
+     */
+    MPI_CHK( mpi_mul_mpi( &T1, &T, &ctx->Q ) );
+    MPI_CHK( mpi_add_mpi( &T, &T2, &T1 ) );
+#endif
+
+    olen = ctx->len;
+    MPI_CHK( mpi_write_binary( &T, output, olen ) );
+
+cleanup:
+
+    mpi_free( &T, &T1, &T2, NULL );
+
+    if( ret != 0 )
+        return( POLARSSL_ERR_RSA_PRIVATE_FAILED | ret );
+
+    return( 0 );
+}
+
+/*
+ * Add the message padding, then do an RSA operation
+ */
+int rsa_pkcs1_encrypt( rsa_context *ctx,
+                       int mode, int  ilen,
+                       unsigned char *input,
+                       unsigned char *output )
+{
+    int nb_pad, olen;
+    unsigned char *p = output;
+
+    olen = ctx->len;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            if( ilen < 0 || olen < ilen + 11 )
+                return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+            nb_pad = olen - 3 - ilen;
+
+            *p++ = 0;
+            *p++ = RSA_CRYPT;
+
+            while( nb_pad-- > 0 )
+            {
+                do {
+                    *p = (unsigned char) rand();
+                } while( *p == 0 );
+                p++;
+            }
+            *p++ = 0;
+            memcpy( p, input, ilen );
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    return( ( mode == RSA_PUBLIC )
+            ? rsa_public(  ctx, output, output )
+            : rsa_private( ctx, output, output ) );
+}
+
+/*
+ * Do an RSA operation, then remove the message padding
+ */
+int rsa_pkcs1_decrypt( rsa_context *ctx,
+                       int mode, int *olen,
+                       unsigned char *input,
+                       unsigned char *output,
+		       int output_max_len)
+{
+    int ret, ilen;
+    unsigned char *p;
+    unsigned char buf[512];
+
+    ilen = ctx->len;
+
+    if( ilen < 16 || ilen > (int) sizeof( buf ) )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    ret = ( mode == RSA_PUBLIC )
+          ? rsa_public(  ctx, input, buf )
+          : rsa_private( ctx, input, buf );
+
+    if( ret != 0 )
+        return( ret );
+
+    p = buf;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            if( *p++ != 0 || *p++ != RSA_CRYPT )
+                return( POLARSSL_ERR_RSA_INVALID_PADDING );
+
+            while( *p != 0 )
+            {
+                if( p >= buf + ilen - 1 )
+                    return( POLARSSL_ERR_RSA_INVALID_PADDING );
+                p++;
+            }
+            p++;
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    if (ilen - (int)(p - buf) > output_max_len)
+    	return( POLARSSL_ERR_RSA_OUTPUT_TO_LARGE );
+
+    *olen = ilen - (int)(p - buf);
+    memcpy( output, p, *olen );
+
+    return( 0 );
+}
+
+/*
+ * Do an RSA operation to sign the message digest
+ */
+int rsa_pkcs1_sign( rsa_context *ctx,
+                    int mode,
+                    int hash_id,
+                    int hashlen,
+                    unsigned char *hash,
+                    unsigned char *sig )
+{
+    int nb_pad, olen;
+    unsigned char *p = sig;
+
+    olen = ctx->len;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            switch( hash_id )
+            {
+                case RSA_RAW:
+                    nb_pad = olen - 3 - hashlen;
+                    break;
+
+                case RSA_MD2:
+                case RSA_MD4:
+                case RSA_MD5:
+                    nb_pad = olen - 3 - 34;
+                    break;
+
+                case RSA_SHA1:
+                    nb_pad = olen - 3 - 35;
+                    break;
+
+                default:
+                    return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+            }
+
+            if( nb_pad < 8 )
+                return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+            *p++ = 0;
+            *p++ = RSA_SIGN;
+            memset( p, 0xFF, nb_pad );
+            p += nb_pad;
+            *p++ = 0;
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    switch( hash_id )
+    {
+        case RSA_RAW:
+            memcpy( p, hash, hashlen );
+            break;
+
+        case RSA_MD2:
+            memcpy( p, ASN1_HASH_MDX, 18 );
+            memcpy( p + 18, hash, 16 );
+            p[13] = 2; break;
+
+        case RSA_MD4:
+            memcpy( p, ASN1_HASH_MDX, 18 );
+            memcpy( p + 18, hash, 16 );
+            p[13] = 4; break;
+
+        case RSA_MD5:
+            memcpy( p, ASN1_HASH_MDX, 18 );
+            memcpy( p + 18, hash, 16 );
+            p[13] = 5; break;
+
+        case RSA_SHA1:
+            memcpy( p, ASN1_HASH_SHA1, 15 );
+            memcpy( p + 15, hash, 20 );
+            break;
+
+        default:
+            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+    return( ( mode == RSA_PUBLIC )
+            ? rsa_public(  ctx, sig, sig )
+            : rsa_private( ctx, sig, sig ) );
+}
+
+/*
+ * Do an RSA operation and check the message digest
+ */
+int rsa_pkcs1_verify( rsa_context *ctx,
+                      int mode,
+                      int hash_id,
+                      int hashlen,
+                      unsigned char *hash,
+                      unsigned char *sig )
+{
+    int ret, len, siglen;
+    unsigned char *p, c;
+    unsigned char buf[512];
+
+    siglen = ctx->len;
+
+    if( siglen < 16 || siglen > (int) sizeof( buf ) )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    ret = ( mode == RSA_PUBLIC )
+          ? rsa_public(  ctx, sig, buf )
+          : rsa_private( ctx, sig, buf );
+
+    if( ret != 0 )
+        return( ret );
+
+    p = buf;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            if( *p++ != 0 || *p++ != RSA_SIGN )
+                return( POLARSSL_ERR_RSA_INVALID_PADDING );
+
+            while( *p != 0 )
+            {
+                if( p >= buf + siglen - 1 || *p != 0xFF )
+                    return( POLARSSL_ERR_RSA_INVALID_PADDING );
+                p++;
+            }
+            p++;
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    len = siglen - (int)( p - buf );
+
+    if( len == 34 )
+    {
+        c = p[13];
+        p[13] = 0;
+
+        if( memcmp( p, ASN1_HASH_MDX, 18 ) != 0 )
+            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+        if( ( c == 2 && hash_id == RSA_MD2 ) ||
+            ( c == 4 && hash_id == RSA_MD4 ) ||
+            ( c == 5 && hash_id == RSA_MD5 ) )
+        {
+            if( memcmp( p + 18, hash, 16 ) == 0 ) 
+                return( 0 );
+            else
+                return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+        }
+    }
+
+    if( len == 35 && hash_id == RSA_SHA1 )
+    {
+        if( memcmp( p, ASN1_HASH_SHA1, 15 ) == 0 &&
+            memcmp( p + 15, hash, 20 ) == 0 )
+            return( 0 );
+        else
+            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+    }
+
+    if( len == hashlen && hash_id == RSA_RAW )
+    {
+        if( memcmp( p, hash, hashlen ) == 0 )
+            return( 0 );
+        else
+            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+    }
+
+    return( POLARSSL_ERR_RSA_INVALID_PADDING );
+}
+
+/*
+ * Free the components of an RSA key
+ */
+void rsa_free( rsa_context *ctx )
+{
+    mpi_free( &ctx->RQ, &ctx->RP, &ctx->RN,
+              &ctx->QP, &ctx->DQ, &ctx->DP,
+              &ctx->Q,  &ctx->P,  &ctx->D,
+              &ctx->E,  &ctx->N,  NULL );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+
+#include "polarssl/sha1.h"
+
+/*
+ * Example RSA-1024 keypair, for test purposes
+ */
+#define KEY_LEN 128
+
+#define RSA_N   "9292758453063D803DD603D5E777D788" \
+                "8ED1D5BF35786190FA2F23EBC0848AEA" \
+                "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
+                "7130B9CED7ACDF54CFC7555AC14EEBAB" \
+                "93A89813FBF3C4F8066D2D800F7C38A8" \
+                "1AE31942917403FF4946B0A83D3D3E05" \
+                "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
+                "5E94BB77B07507233A0BC7BAC8F90F79"
+
+#define RSA_E   "10001"
+
+#define RSA_D   "24BF6185468786FDD303083D25E64EFC" \
+                "66CA472BC44D253102F8B4A9D3BFA750" \
+                "91386C0077937FE33FA3252D28855837" \
+                "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
+                "DF79C5CE07EE72C7F123142198164234" \
+                "CABB724CF78B8173B9F880FC86322407" \
+                "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
+                "071513A1E85B5DFA031F21ECAE91A34D"
+
+#define RSA_P   "C36D0EB7FCD285223CFB5AABA5BDA3D8" \
+                "2C01CAD19EA484A87EA4377637E75500" \
+                "FCB2005C5C7DD6EC4AC023CDA285D796" \
+                "C3D9E75E1EFC42488BB4F1D13AC30A57"
+
+#define RSA_Q   "C000DF51A7C77AE8D7C7370C1FF55B69" \
+                "E211C2B9E5DB1ED0BF61D0D9899620F4" \
+                "910E4168387E3C30AA1E00C339A79508" \
+                "8452DD96A9A5EA5D9DCA68DA636032AF"
+
+#define RSA_DP  "C1ACF567564274FB07A0BBAD5D26E298" \
+                "3C94D22288ACD763FD8E5600ED4A702D" \
+                "F84198A5F06C2E72236AE490C93F07F8" \
+                "3CC559CD27BC2D1CA488811730BB5725"
+
+#define RSA_DQ  "4959CBF6F8FEF750AEE6977C155579C7" \
+                "D8AAEA56749EA28623272E4F7D0592AF" \
+                "7C1F1313CAC9471B5C523BFE592F517B" \
+                "407A1BD76C164B93DA2D32A383E58357"
+
+#define RSA_QP  "9AE7FBC99546432DF71896FC239EADAE" \
+                "F38D18D2B2F0E2DD275AA977E2BF4411" \
+                "F5A3B2A5D33605AEBBCCBA7FEB9F2D2F" \
+                "A74206CEC169D74BF5A8C50D6F48EA08"
+
+#define PT_LEN  24
+#define RSA_PT  "\xAA\xBB\xCC\x03\x02\x01\x00\xFF\xFF\xFF\xFF\xFF" \
+                "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
+
+/*
+ * Checkup routine
+ */
+int rsa_self_test( int verbose )
+{
+    int len;
+    rsa_context rsa;
+    unsigned char sha1sum[20];
+    unsigned char rsa_plaintext[PT_LEN];
+    unsigned char rsa_decrypted[PT_LEN];
+    unsigned char rsa_ciphertext[KEY_LEN];
+
+    memset( &rsa, 0, sizeof( rsa_context ) );
+
+    rsa.len = KEY_LEN;
+    mpi_read_string( &rsa.N , 16, RSA_N  );
+    mpi_read_string( &rsa.E , 16, RSA_E  );
+    mpi_read_string( &rsa.D , 16, RSA_D  );
+    mpi_read_string( &rsa.P , 16, RSA_P  );
+    mpi_read_string( &rsa.Q , 16, RSA_Q  );
+    mpi_read_string( &rsa.DP, 16, RSA_DP );
+    mpi_read_string( &rsa.DQ, 16, RSA_DQ );
+    mpi_read_string( &rsa.QP, 16, RSA_QP );
+
+    if( verbose != 0 )
+        printf( "  RSA key validation: " );
+
+    if( rsa_check_pubkey(  &rsa ) != 0 ||
+        rsa_check_privkey( &rsa ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 encryption : " );
+
+    memcpy( rsa_plaintext, RSA_PT, PT_LEN );
+
+    if( rsa_pkcs1_encrypt( &rsa, RSA_PUBLIC, PT_LEN,
+                           rsa_plaintext, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 decryption : " );
+
+    if( rsa_pkcs1_decrypt( &rsa, RSA_PRIVATE, &len,
+                           rsa_ciphertext, rsa_decrypted,
+			   sizeof(rsa_decrypted) ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( memcmp( rsa_decrypted, rsa_plaintext, len ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 data sign  : " );
+
+    sha1( rsa_plaintext, PT_LEN, sha1sum );
+
+    if( rsa_pkcs1_sign( &rsa, RSA_PRIVATE, RSA_SHA1, 20,
+                        sha1sum, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 sig. verify: " );
+
+    if( rsa_pkcs1_verify( &rsa, RSA_PUBLIC, RSA_SHA1, 20,
+                          sha1sum, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n\n" );
+
+    rsa_free( &rsa );
+
+    return( 0 );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/luci/libs/px5g/src/library/sha1.c b/trunk/package/luci/libs/px5g/src/library/sha1.c
new file mode 100644
index 00000000..54a4416f
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/library/sha1.c
@@ -0,0 +1,622 @@
+/*
+ *  FIPS-180-1 compliant SHA-1 implementation
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  The SHA-1 standard was published by NIST in 1993.
+ *
+ *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_SHA1_C)
+
+#include "polarssl/sha1.h"
+
+#include <string.h>
+#include <stdio.h>
+
+/*
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_ULONG_BE
+#define GET_ULONG_BE(n,b,i)                             \
+{                                                       \
+    (n) = ( (unsigned long) (b)[(i)    ] << 24 )        \
+        | ( (unsigned long) (b)[(i) + 1] << 16 )        \
+        | ( (unsigned long) (b)[(i) + 2] <<  8 )        \
+        | ( (unsigned long) (b)[(i) + 3]       );       \
+}
+#endif
+
+#ifndef PUT_ULONG_BE
+#define PUT_ULONG_BE(n,b,i)                             \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+}
+#endif
+
+/*
+ * SHA-1 context setup
+ */
+void sha1_starts( sha1_context *ctx )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
+    ctx->state[4] = 0xC3D2E1F0;
+}
+
+static void sha1_process( sha1_context *ctx, unsigned char data[64] )
+{
+    unsigned long temp, W[16], A, B, C, D, E;
+
+    GET_ULONG_BE( W[ 0], data,  0 );
+    GET_ULONG_BE( W[ 1], data,  4 );
+    GET_ULONG_BE( W[ 2], data,  8 );
+    GET_ULONG_BE( W[ 3], data, 12 );
+    GET_ULONG_BE( W[ 4], data, 16 );
+    GET_ULONG_BE( W[ 5], data, 20 );
+    GET_ULONG_BE( W[ 6], data, 24 );
+    GET_ULONG_BE( W[ 7], data, 28 );
+    GET_ULONG_BE( W[ 8], data, 32 );
+    GET_ULONG_BE( W[ 9], data, 36 );
+    GET_ULONG_BE( W[10], data, 40 );
+    GET_ULONG_BE( W[11], data, 44 );
+    GET_ULONG_BE( W[12], data, 48 );
+    GET_ULONG_BE( W[13], data, 52 );
+    GET_ULONG_BE( W[14], data, 56 );
+    GET_ULONG_BE( W[15], data, 60 );
+
+#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
+
+#define R(t)                                            \
+(                                                       \
+    temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^     \
+           W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],      \
+    ( W[t & 0x0F] = S(temp,1) )                         \
+)
+
+#define P(a,b,c,d,e,x)                                  \
+{                                                       \
+    e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
+}
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+
+#define F(x,y,z) (z ^ (x & (y ^ z)))
+#define K 0x5A827999
+
+    P( A, B, C, D, E, W[0]  );
+    P( E, A, B, C, D, W[1]  );
+    P( D, E, A, B, C, W[2]  );
+    P( C, D, E, A, B, W[3]  );
+    P( B, C, D, E, A, W[4]  );
+    P( A, B, C, D, E, W[5]  );
+    P( E, A, B, C, D, W[6]  );
+    P( D, E, A, B, C, W[7]  );
+    P( C, D, E, A, B, W[8]  );
+    P( B, C, D, E, A, W[9]  );
+    P( A, B, C, D, E, W[10] );
+    P( E, A, B, C, D, W[11] );
+    P( D, E, A, B, C, W[12] );
+    P( C, D, E, A, B, W[13] );
+    P( B, C, D, E, A, W[14] );
+    P( A, B, C, D, E, W[15] );
+    P( E, A, B, C, D, R(16) );
+    P( D, E, A, B, C, R(17) );
+    P( C, D, E, A, B, R(18) );
+    P( B, C, D, E, A, R(19) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0x6ED9EBA1
+
+    P( A, B, C, D, E, R(20) );
+    P( E, A, B, C, D, R(21) );
+    P( D, E, A, B, C, R(22) );
+    P( C, D, E, A, B, R(23) );
+    P( B, C, D, E, A, R(24) );
+    P( A, B, C, D, E, R(25) );
+    P( E, A, B, C, D, R(26) );
+    P( D, E, A, B, C, R(27) );
+    P( C, D, E, A, B, R(28) );
+    P( B, C, D, E, A, R(29) );
+    P( A, B, C, D, E, R(30) );
+    P( E, A, B, C, D, R(31) );
+    P( D, E, A, B, C, R(32) );
+    P( C, D, E, A, B, R(33) );
+    P( B, C, D, E, A, R(34) );
+    P( A, B, C, D, E, R(35) );
+    P( E, A, B, C, D, R(36) );
+    P( D, E, A, B, C, R(37) );
+    P( C, D, E, A, B, R(38) );
+    P( B, C, D, E, A, R(39) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) ((x & y) | (z & (x | y)))
+#define K 0x8F1BBCDC
+
+    P( A, B, C, D, E, R(40) );
+    P( E, A, B, C, D, R(41) );
+    P( D, E, A, B, C, R(42) );
+    P( C, D, E, A, B, R(43) );
+    P( B, C, D, E, A, R(44) );
+    P( A, B, C, D, E, R(45) );
+    P( E, A, B, C, D, R(46) );
+    P( D, E, A, B, C, R(47) );
+    P( C, D, E, A, B, R(48) );
+    P( B, C, D, E, A, R(49) );
+    P( A, B, C, D, E, R(50) );
+    P( E, A, B, C, D, R(51) );
+    P( D, E, A, B, C, R(52) );
+    P( C, D, E, A, B, R(53) );
+    P( B, C, D, E, A, R(54) );
+    P( A, B, C, D, E, R(55) );
+    P( E, A, B, C, D, R(56) );
+    P( D, E, A, B, C, R(57) );
+    P( C, D, E, A, B, R(58) );
+    P( B, C, D, E, A, R(59) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0xCA62C1D6
+
+    P( A, B, C, D, E, R(60) );
+    P( E, A, B, C, D, R(61) );
+    P( D, E, A, B, C, R(62) );
+    P( C, D, E, A, B, R(63) );
+    P( B, C, D, E, A, R(64) );
+    P( A, B, C, D, E, R(65) );
+    P( E, A, B, C, D, R(66) );
+    P( D, E, A, B, C, R(67) );
+    P( C, D, E, A, B, R(68) );
+    P( B, C, D, E, A, R(69) );
+    P( A, B, C, D, E, R(70) );
+    P( E, A, B, C, D, R(71) );
+    P( D, E, A, B, C, R(72) );
+    P( C, D, E, A, B, R(73) );
+    P( B, C, D, E, A, R(74) );
+    P( A, B, C, D, E, R(75) );
+    P( E, A, B, C, D, R(76) );
+    P( D, E, A, B, C, R(77) );
+    P( C, D, E, A, B, R(78) );
+    P( B, C, D, E, A, R(79) );
+
+#undef K
+#undef F
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+}
+
+/*
+ * SHA-1 process buffer
+ */
+void sha1_update( sha1_context *ctx, unsigned char *input, int ilen )
+{
+    int fill;
+    unsigned long left;
+
+    if( ilen <= 0 )
+        return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if( ctx->total[0] < (unsigned long) ilen )
+        ctx->total[1]++;
+
+    if( left && ilen >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left),
+                (void *) input, fill );
+        sha1_process( ctx, ctx->buffer );
+        input += fill;
+        ilen  -= fill;
+        left = 0;
+    }
+
+    while( ilen >= 64 )
+    {
+        sha1_process( ctx, input );
+        input += 64;
+        ilen  -= 64;
+    }
+
+    if( ilen > 0 )
+    {
+        memcpy( (void *) (ctx->buffer + left),
+                (void *) input, ilen );
+    }
+}
+
+static const unsigned char sha1_padding[64] =
+{
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*
+ * SHA-1 final digest
+ */
+void sha1_finish( sha1_context *ctx, unsigned char output[20] )
+{
+    unsigned long last, padn;
+    unsigned long high, low;
+    unsigned char msglen[8];
+
+    high = ( ctx->total[0] >> 29 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_ULONG_BE( high, msglen, 0 );
+    PUT_ULONG_BE( low,  msglen, 4 );
+
+    last = ctx->total[0] & 0x3F;
+    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
+
+    sha1_update( ctx, (unsigned char *) sha1_padding, padn );
+    sha1_update( ctx, msglen, 8 );
+
+    PUT_ULONG_BE( ctx->state[0], output,  0 );
+    PUT_ULONG_BE( ctx->state[1], output,  4 );
+    PUT_ULONG_BE( ctx->state[2], output,  8 );
+    PUT_ULONG_BE( ctx->state[3], output, 12 );
+    PUT_ULONG_BE( ctx->state[4], output, 16 );
+}
+
+/*
+ * output = SHA-1( input buffer )
+ */
+void sha1( unsigned char *input, int ilen, unsigned char output[20] )
+{
+    sha1_context ctx;
+
+    sha1_starts( &ctx );
+    sha1_update( &ctx, input, ilen );
+    sha1_finish( &ctx, output );
+
+    memset( &ctx, 0, sizeof( sha1_context ) );
+}
+
+/*
+ * output = SHA-1( file contents )
+ */
+int sha1_file( char *path, unsigned char output[20] )
+{
+    FILE *f;
+    size_t n;
+    sha1_context ctx;
+    unsigned char buf[1024];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( 1 );
+
+    sha1_starts( &ctx );
+
+    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+        sha1_update( &ctx, buf, (int) n );
+
+    sha1_finish( &ctx, output );
+
+    memset( &ctx, 0, sizeof( sha1_context ) );
+
+    if( ferror( f ) != 0 )
+    {
+        fclose( f );
+        return( 2 );
+    }
+
+    fclose( f );
+    return( 0 );
+}
+
+/*
+ * SHA-1 HMAC context setup
+ */
+void sha1_hmac_starts( sha1_context *ctx, unsigned char *key, int keylen )
+{
+    int i;
+    unsigned char sum[20];
+
+    if( keylen > 64 )
+    {
+        sha1( key, keylen, sum );
+        keylen = 20;
+        key = sum;
+    }
+
+    memset( ctx->ipad, 0x36, 64 );
+    memset( ctx->opad, 0x5C, 64 );
+
+    for( i = 0; i < keylen; i++ )
+    {
+        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
+        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
+    }
+
+    sha1_starts( ctx );
+    sha1_update( ctx, ctx->ipad, 64 );
+
+    memset( sum, 0, sizeof( sum ) );
+}
+
+/*
+ * SHA-1 HMAC process buffer
+ */
+void sha1_hmac_update( sha1_context *ctx, unsigned char *input, int ilen )
+{
+    sha1_update( ctx, input, ilen );
+}
+
+/*
+ * SHA-1 HMAC final digest
+ */
+void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] )
+{
+    unsigned char tmpbuf[20];
+
+    sha1_finish( ctx, tmpbuf );
+    sha1_starts( ctx );
+    sha1_update( ctx, ctx->opad, 64 );
+    sha1_update( ctx, tmpbuf, 20 );
+    sha1_finish( ctx, output );
+
+    memset( tmpbuf, 0, sizeof( tmpbuf ) );
+}
+
+/*
+ * output = HMAC-SHA-1( hmac key, input buffer )
+ */
+void sha1_hmac( unsigned char *key, int keylen,
+                unsigned char *input, int ilen,
+                unsigned char output[20] )
+{
+    sha1_context ctx;
+
+    sha1_hmac_starts( &ctx, key, keylen );
+    sha1_hmac_update( &ctx, input, ilen );
+    sha1_hmac_finish( &ctx, output );
+
+    memset( &ctx, 0, sizeof( sha1_context ) );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+/*
+ * FIPS-180-1 test vectors
+ */
+static unsigned char sha1_test_buf[3][57] = 
+{
+    { "abc" },
+    { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
+    { "" }
+};
+
+static const int sha1_test_buflen[3] =
+{
+    3, 56, 1000
+};
+
+static const unsigned char sha1_test_sum[3][20] =
+{
+    { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E,
+      0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D },
+    { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE,
+      0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 },
+    { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E,
+      0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }
+};
+
+/*
+ * RFC 2202 test vectors
+ */
+static unsigned char sha1_hmac_test_key[7][26] =
+{
+    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
+      "\x0B\x0B\x0B\x0B" },
+    { "Jefe" },
+    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
+      "\xAA\xAA\xAA\xAA" },
+    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
+      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
+    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
+      "\x0C\x0C\x0C\x0C" },
+    { "" }, /* 0xAA 80 times */
+    { "" }
+};
+
+static const int sha1_hmac_test_keylen[7] =
+{
+    20, 4, 20, 25, 20, 80, 80
+};
+
+static unsigned char sha1_hmac_test_buf[7][74] =
+{
+    { "Hi There" },
+    { "what do ya want for nothing?" },
+    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
+    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
+    { "Test With Truncation" },
+    { "Test Using Larger Than Block-Size Key - Hash Key First" },
+    { "Test Using Larger Than Block-Size Key and Larger"
+      " Than One Block-Size Data" }
+};
+
+static const int sha1_hmac_test_buflen[7] =
+{
+    8, 28, 50, 50, 20, 54, 73
+};
+
+static const unsigned char sha1_hmac_test_sum[7][20] =
+{
+    { 0xB6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xE2, 0x8B,
+      0xC0, 0xB6, 0xFB, 0x37, 0x8C, 0x8E, 0xF1, 0x46, 0xBE, 0x00 },
+    { 0xEF, 0xFC, 0xDF, 0x6A, 0xE5, 0xEB, 0x2F, 0xA2, 0xD2, 0x74,
+      0x16, 0xD5, 0xF1, 0x84, 0xDF, 0x9C, 0x25, 0x9A, 0x7C, 0x79 },
+    { 0x12, 0x5D, 0x73, 0x42, 0xB9, 0xAC, 0x11, 0xCD, 0x91, 0xA3,
+      0x9A, 0xF4, 0x8A, 0xA1, 0x7B, 0x4F, 0x63, 0xF1, 0x75, 0xD3 },
+    { 0x4C, 0x90, 0x07, 0xF4, 0x02, 0x62, 0x50, 0xC6, 0xBC, 0x84,
+      0x14, 0xF9, 0xBF, 0x50, 0xC8, 0x6C, 0x2D, 0x72, 0x35, 0xDA },
+    { 0x4C, 0x1A, 0x03, 0x42, 0x4B, 0x55, 0xE0, 0x7F, 0xE7, 0xF2,
+      0x7B, 0xE1 },
+    { 0xAA, 0x4A, 0xE5, 0xE1, 0x52, 0x72, 0xD0, 0x0E, 0x95, 0x70,
+      0x56, 0x37, 0xCE, 0x8A, 0x3B, 0x55, 0xED, 0x40, 0x21, 0x12 },
+    { 0xE8, 0xE9, 0x9D, 0x0F, 0x45, 0x23, 0x7D, 0x78, 0x6D, 0x6B,
+      0xBA, 0xA7, 0x96, 0x5C, 0x78, 0x08, 0xBB, 0xFF, 0x1A, 0x91 }
+};
+
+/*
+ * Checkup routine
+ */
+int sha1_self_test( int verbose )
+{
+    int i, j, buflen;
+    unsigned char buf[1024];
+    unsigned char sha1sum[20];
+    sha1_context ctx;
+
+    /*
+     * SHA-1
+     */
+    for( i = 0; i < 3; i++ )
+    {
+        if( verbose != 0 )
+            printf( "  SHA-1 test #%d: ", i + 1 );
+
+        sha1_starts( &ctx );
+
+        if( i == 2 )
+        {
+            memset( buf, 'a', buflen = 1000 );
+
+            for( j = 0; j < 1000; j++ )
+                sha1_update( &ctx, buf, buflen );
+        }
+        else
+            sha1_update( &ctx, sha1_test_buf[i],
+                               sha1_test_buflen[i] );
+
+        sha1_finish( &ctx, sha1sum );
+
+        if( memcmp( sha1sum, sha1_test_sum[i], 20 ) != 0 )
+        {
+            if( verbose != 0 )
+                printf( "failed\n" );
+
+            return( 1 );
+        }
+
+        if( verbose != 0 )
+            printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    for( i = 0; i < 7; i++ )
+    {
+        if( verbose != 0 )
+            printf( "  HMAC-SHA-1 test #%d: ", i + 1 );
+
+        if( i == 5 || i == 6 )
+        {
+            memset( buf, '\xAA', buflen = 80 );
+            sha1_hmac_starts( &ctx, buf, buflen );
+        }
+        else
+            sha1_hmac_starts( &ctx, sha1_hmac_test_key[i],
+                                    sha1_hmac_test_keylen[i] );
+
+        sha1_hmac_update( &ctx, sha1_hmac_test_buf[i],
+                                sha1_hmac_test_buflen[i] );
+
+        sha1_hmac_finish( &ctx, sha1sum );
+
+        buflen = ( i == 4 ) ? 12 : 20;
+
+        if( memcmp( sha1sum, sha1_hmac_test_sum[i], buflen ) != 0 )
+        {
+            if( verbose != 0 )
+                printf( "failed\n" );
+
+            return( 1 );
+        }
+
+        if( verbose != 0 )
+            printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    return( 0 );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/luci/libs/px5g/src/library/timing.c b/trunk/package/luci/libs/px5g/src/library/timing.c
new file mode 100644
index 00000000..6b7ab740
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/library/timing.c
@@ -0,0 +1,265 @@
+/*
+ *  Portable interface to the CPU cycle counter
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_TIMING_C)
+
+#include "polarssl/timing.h"
+
+#if defined(WIN32)
+
+#include <windows.h>
+#include <winbase.h>
+
+struct _hr_time
+{
+    LARGE_INTEGER start;
+};
+
+#else
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <time.h>
+
+struct _hr_time
+{
+    struct timeval start;
+};
+
+#endif
+
+#if (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+
+unsigned long hardclock( void )
+{
+    unsigned long tsc;
+    __asm   rdtsc
+    __asm   mov  [tsc], eax
+    return( tsc );
+}
+
+#else
+#if defined(__GNUC__) && defined(__i386__)
+
+unsigned long hardclock( void )
+{
+    unsigned long tsc;
+    asm( "rdtsc" : "=a" (tsc) );
+    return( tsc );
+}
+
+#else
+#if defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
+
+unsigned long hardclock( void )
+{
+    unsigned long lo, hi;
+    asm( "rdtsc" : "=a" (lo), "=d" (hi) );
+    return( lo | (hi << 32) );
+}
+
+#else
+#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+
+unsigned long hardclock( void )
+{
+    unsigned long tbl, tbu0, tbu1;
+
+    do
+    {
+        asm( "mftbu %0" : "=r" (tbu0) );
+        asm( "mftb  %0" : "=r" (tbl ) );
+        asm( "mftbu %0" : "=r" (tbu1) );
+    }
+    while( tbu0 != tbu1 );
+
+    return( tbl );
+}
+
+#else
+#if defined(__GNUC__) && defined(__sparc__)
+
+unsigned long hardclock( void )
+{
+    unsigned long tick;
+    asm( ".byte 0x83, 0x41, 0x00, 0x00" );
+    asm( "mov   %%g1, %0" : "=r" (tick) );
+    return( tick );
+}
+
+#else
+#if defined(__GNUC__) && defined(__alpha__)
+
+unsigned long hardclock( void )
+{
+    unsigned long cc;
+    asm( "rpcc %0" : "=r" (cc) );
+    return( cc & 0xFFFFFFFF );
+}
+
+#else
+#if defined(__GNUC__) && defined(__ia64__)
+
+unsigned long hardclock( void )
+{
+    unsigned long itc;
+    asm( "mov %0 = ar.itc" : "=r" (itc) );
+    return( itc );
+}
+
+#else
+
+static int hardclock_init = 0;
+static struct timeval tv_init;
+
+unsigned long hardclock( void )
+{
+    struct timeval tv_cur;
+
+    if( hardclock_init == 0 )
+    {
+        gettimeofday( &tv_init, NULL );
+        hardclock_init = 1;
+    }
+
+    gettimeofday( &tv_cur, NULL );
+    return( ( tv_cur.tv_sec  - tv_init.tv_sec  ) * 1000000
+          + ( tv_cur.tv_usec - tv_init.tv_usec ) );
+}
+
+#endif /* generic */
+#endif /* IA-64   */
+#endif /* Alpha   */
+#endif /* SPARC8  */
+#endif /* PowerPC */
+#endif /* AMD64   */
+#endif /* i586+   */
+
+int alarmed = 0;
+
+#if defined(WIN32)
+
+unsigned long get_timer( struct hr_time *val, int reset )
+{
+    unsigned long delta;
+    LARGE_INTEGER offset, hfreq;
+    struct _hr_time *t = (struct _hr_time *) val;
+
+    QueryPerformanceCounter(  &offset );
+    QueryPerformanceFrequency( &hfreq );
+
+    delta = (unsigned long)( ( 1000 *
+        ( offset.QuadPart - t->start.QuadPart ) ) /
+           hfreq.QuadPart );
+
+    if( reset )
+        QueryPerformanceCounter( &t->start );
+
+    return( delta );
+}
+
+DWORD WINAPI TimerProc( LPVOID uElapse )
+{
+    Sleep( (DWORD) uElapse );
+    alarmed = 1;
+    return( TRUE );
+}
+
+void set_alarm( int seconds )
+{
+    DWORD ThreadId;
+
+    alarmed = 0;
+    CloseHandle( CreateThread( NULL, 0, TimerProc,
+        (LPVOID) ( seconds * 1000 ), 0, &ThreadId ) );
+}
+
+void m_sleep( int milliseconds )
+{
+    Sleep( milliseconds );
+}
+
+#else
+
+unsigned long get_timer( struct hr_time *val, int reset )
+{
+    unsigned long delta;
+    struct timeval offset;
+    struct _hr_time *t = (struct _hr_time *) val;
+
+    gettimeofday( &offset, NULL );
+
+    delta = ( offset.tv_sec  - t->start.tv_sec  ) * 1000
+          + ( offset.tv_usec - t->start.tv_usec ) / 1000;
+
+    if( reset )
+    {
+        t->start.tv_sec  = offset.tv_sec;
+        t->start.tv_usec = offset.tv_usec;
+    }
+
+    return( delta );
+}
+
+static void sighandler( int signum )
+{
+    alarmed = 1;
+    signal( signum, sighandler );
+}
+
+void set_alarm( int seconds )
+{
+    alarmed = 0;
+    signal( SIGALRM, sighandler );
+    alarm( seconds );
+}
+
+void m_sleep( int milliseconds )
+{
+    struct timeval tv;
+
+    tv.tv_sec  = milliseconds / 1000;
+    tv.tv_usec = milliseconds * 1000;
+
+    select( 0, NULL, NULL, NULL, &tv );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/luci/libs/px5g/src/library/x509write.c b/trunk/package/luci/libs/px5g/src/library/x509write.c
new file mode 100644
index 00000000..173610c1
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/library/x509write.c
@@ -0,0 +1,1137 @@
+/*
+ *  X.509 certificate and private key writing
+ *
+ *  Copyright (C) 2006-2007  Pascal Vizeli <pvizeli@yahoo.de>
+ *  Modifications (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificat format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc2459.txt
+ *  http://www.ietf.org/rfc/rfc3279.txt
+ *
+ *  ftp://ftp.rsasecurity.com/pub/pkcs/ascii/pkcs-1v2.asc
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ *
+ *  For CRS:
+ *  http://www.faqs.org/rfcs/rfc2314.html
+ */
+#include "polarssl/config.h"
+#include "polarssl/x509.h"
+/* #include "polarssl/base64.h" */
+#include "polarssl/sha1.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <time.h>
+
+#define and &&
+#define or ||
+
+#if defined _MSC_VER && !defined snprintf
+#define snprintf _snprintf
+#endif
+
+static int x509write_realloc_node(x509_node *node, size_t larger);
+static int x509write_file(x509_node *node, char *path, int format, const char* pem_prolog, const char* pem_epilog);
+
+/*
+ * evaluate how mani octet have this integer
+ */
+static int asn1_eval_octet(unsigned int digit)
+{
+    int i, byte;
+
+    for (byte = 4, i = 24; i >= 0; i -= 8, --byte)
+        if (((digit >> i) & 0xFF) != 0)
+            return byte;
+
+    return 0;
+}
+
+/*
+ * write the asn.1 lenght form into p
+ */
+static int asn1_add_len(unsigned int size, x509_node *node)
+{
+    if (size > 127) {
+
+        /* long size */
+        int byte = asn1_eval_octet(size);
+        int i = 0;
+
+        *(node->p) = (0x80 | byte) & 0xFF;
+        ++node->p;
+
+        for (i = byte; i > 0; --i) {
+
+            *(node->p) = (size >> ((i - 1) * 8)) & 0xFF;
+            ++node->p;
+        }
+
+    } else {
+
+        /* short size */
+        *(node->p) = size & 0xFF;
+        if (size != 0)
+            ++node->p;
+    }
+
+    return 0;
+}
+
+/*
+ * write a ans.1 object into p
+ */
+static int asn1_add_obj(unsigned char *value, unsigned int size, int tag,
+        x509_node *node)
+{
+    int tl = 2;
+
+    if (tag == ASN1_BIT_STRING)
+        ++tl;
+
+    if (size > 127)
+        x509write_realloc_node(node, (size_t) size + tl +
+                asn1_eval_octet(size));
+    else
+        x509write_realloc_node(node, (size_t) size + tl);
+
+    if (node->data == NULL)
+        return 1;
+
+    /* tag */
+    *(node->p) = tag & 0xFF;
+    ++node->p;
+
+    /* len */
+    if (tag == ASN1_BIT_STRING) {
+        asn1_add_len((unsigned int) size + 1, node);
+        *(node->p) = 0x00;
+        ++node->p;
+    } else {
+        asn1_add_len((unsigned int) size, node);
+    }
+
+    /* value */
+    if (size > 0) {
+
+        memcpy(node->p, value, (size_t) size);
+        if ((node->p += size -1) != node->end)
+            return POLARSSL_ERR_X509_POINT_ERROR;
+    } else {
+        /* make nothing -> NULL */
+    }
+
+    return 0;
+}
+
+/*
+ * write a asn.1 conform integer object
+ */
+static int asn1_add_int(signed int value, x509_node *node)
+{
+    signed int i = 0, neg = 1;
+    unsigned int byte, u_val = 0, tmp_val = 0;
+
+    /* if negate? */
+    if (value < 0) {
+        neg = -1;
+        u_val = ~value;
+    } else {
+        u_val = value;
+    }
+
+    byte = asn1_eval_octet(u_val);
+    /* 0 isn't NULL */
+    if (byte == 0)
+        byte = 1;
+
+    /* ASN.1 integer is signed! */
+    if (byte < 4 and ((u_val >> ((byte -1) * 8)) & 0xFF) == 0x80)
+        byte += 1;
+
+    if (x509write_realloc_node(node, (size_t) byte + 2) != 0)
+        return 1;
+
+    /* tag */
+    *(node->p) = ASN1_INTEGER;
+    ++node->p;
+
+    /* len */
+    asn1_add_len(byte, node);
+
+    /* value */
+    for (i = byte; i > 0; --i) {
+
+        tmp_val = (u_val >> ((i - 1) * 8)) & 0xFF;
+        if (neg == 1)
+            *(node->p) = tmp_val;
+        else
+            *(node->p) = ~tmp_val;
+
+        if (i > 1)
+          ++node->p;
+    }
+
+    if (node->p != node->end)
+        return POLARSSL_ERR_X509_POINT_ERROR;
+
+    return 0;
+}
+
+/*
+ * write a asn.1 conform mpi object
+ */
+static int asn1_add_mpi(mpi *value, int tag, x509_node *node)
+{
+    size_t size = (mpi_msb(value) / 8) + 1;
+    unsigned char *buf;
+    int buf_len = (int) size, tl = 2;
+
+    if (tag == ASN1_BIT_STRING)
+        ++tl;
+
+    if (size > 127)
+        x509write_realloc_node(node, size + (size_t) tl +
+            asn1_eval_octet((unsigned int)size));
+    else
+        x509write_realloc_node(node, size + (size_t) tl);
+
+    if (node->data == NULL)
+        return 1;
+
+    buf = (unsigned char*) malloc(size);
+    if (mpi_write_binary(value, buf, buf_len) != 0)
+        return POLARSSL_ERR_MPI_BUFFER_TOO_SMALL;
+
+    /* tag */
+    *(node->p) = tag & 0xFF;
+    ++node->p;
+
+    /* len */
+    if (tag == ASN1_BIT_STRING) {
+        asn1_add_len((unsigned int) size + 1, node);
+        *(node->p) = 0x00;
+        ++node->p;
+    } else {
+        asn1_add_len((unsigned int) size, node);
+    }
+
+    /* value */
+    memcpy(node->p, buf, size);
+    free(buf);
+
+    if ((node->p += (int) size -1) != node->end)
+        return POLARSSL_ERR_X509_POINT_ERROR;
+
+    return 0;
+}
+
+/*
+ * write a node into asn.1 conform object
+ */
+static int asn1_append_tag(x509_node *node, int tag)
+{
+    int tl = 2;
+
+    x509_node tmp;
+    x509write_init_node(&tmp);
+
+    if (tag == ASN1_BIT_STRING)
+        ++tl;
+
+    if (node->len > 127)
+        x509write_realloc_node(&tmp, node->len + (size_t) tl +
+            asn1_eval_octet((unsigned int)node->len));
+    else
+        x509write_realloc_node(&tmp, node->len + (size_t) tl);
+
+    if (tmp.data == NULL) {
+        x509write_free_node(&tmp);
+        return 1;
+    }
+
+    /* tag */
+    *(tmp.p) = tag & 0xFF;
+    ++tmp.p;
+
+    /* len */
+    if (tag == ASN1_BIT_STRING) {
+        asn1_add_len((unsigned int) node->len + 1, &tmp);
+        *(tmp.p) = 0x00;
+        ++tmp.p;
+    } else {
+        asn1_add_len((unsigned int) node->len, &tmp);
+    }
+
+    /* value */
+    memcpy(tmp.p, node->data, node->len);
+
+    /* good? */
+    if ((tmp.p += (int) node->len -1) != tmp.end) {
+        x509write_free_node(&tmp);
+        return POLARSSL_ERR_X509_POINT_ERROR;
+    }
+
+    free(node->data);
+    node->data = tmp.data;
+    node->p = tmp.p;
+    node->end = tmp.end;
+    node->len = tmp.len;
+
+    return 0;
+}
+
+/*
+ * write nodes into a asn.1 object
+ */
+static int asn1_append_nodes(x509_node *node, int tag, int anz, ...)
+{
+    va_list ap;
+    size_t size = 0;
+    x509_node *tmp;
+    int count;
+
+    va_start(ap, anz);
+    count = anz;
+
+    while (count--) {
+
+        tmp = va_arg(ap, x509_node*);
+        if (tmp->data != NULL)
+            size += tmp->len;
+    }
+
+    if ( size > 127) {
+        if (x509write_realloc_node(node, size + (size_t) 2 +
+                    asn1_eval_octet(size)) != 0)
+            return 1;
+    } else {
+        if (x509write_realloc_node(node, size + (size_t) 2) != 0)
+            return 1;
+    }
+
+    /* tag */
+    *(node->p) = tag & 0xFF;
+    ++node->p;
+
+    /* len */
+    asn1_add_len(size, node);
+
+    /* value */
+    va_start(ap, anz);
+    count = anz;
+
+    while (count--) {
+
+        tmp = va_arg(ap, x509_node*);
+        if (tmp->data != NULL) {
+
+            memcpy(node->p, tmp->data, tmp->len);
+            if ((node->p += (int) tmp->len -1) != node->end)
+                ++node->p;
+        }
+    }
+
+    va_end(ap);
+    return 0;
+}
+
+/*
+ * write a ASN.1 conform object identifiere include a "tag"
+ */
+static int asn1_add_oid(x509_node *node, unsigned char *oid, size_t len,
+        int tag, int tag_val, unsigned char *value, size_t val_len)
+{
+    int ret;
+    x509_node tmp;
+
+    x509write_init_node(&tmp);
+
+    /* OBJECT IDENTIFIER */
+    if ((ret = asn1_add_obj(oid, len, ASN1_OID, &tmp)) != 0) {
+        x509write_free_node(&tmp);
+        return ret;
+    }
+
+    /* value */
+    if ((ret = asn1_add_obj(value, val_len, tag_val, &tmp)) != 0) {
+        x509write_free_node(&tmp);
+        return ret;
+    }
+
+    /* SET/SEQUENCE */
+    if ((ret = asn1_append_nodes(node, tag, 1, &tmp)) != 0) {
+        x509write_free_node(&tmp);
+        return ret;
+    }
+
+    x509write_free_node(&tmp);
+    return 0;
+}
+
+/*
+ *  utcTime        UTCTime
+ */
+static int asn1_add_date_utc(unsigned char *time, x509_node *node)
+{
+    unsigned char date[13], *sp;
+    x509_time xtime;
+    int ret;
+
+    sscanf((char*)time, "%d-%d-%d %d:%d:%d", &xtime.year, &xtime.mon,
+    	&xtime.day, &xtime.hour, &xtime.min, &xtime.sec);
+
+    /* convert to YY */
+    if (xtime.year > 2000)
+        xtime.year -= 2000;
+    else
+        xtime.year -= 1900;
+
+    snprintf((char*)date, 13, "%2d%2d%2d%2d%2d%2d", xtime.year, xtime.mon, xtime.day,
+        xtime.hour, xtime.min, xtime.sec);
+
+    /* replace ' ' to '0' */
+    for (sp = date; *sp != '\0'; ++sp)
+        if (*sp == '\x20')
+            *sp = '\x30';
+
+    date[12] = 'Z';
+
+    if ((ret = asn1_add_obj(date, 13, ASN1_UTC_TIME, node)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * serialize an rsa key into DER
+ */
+
+int x509write_serialize_key(rsa_context *rsa, x509_node *node)
+{
+    int ret = 0;
+    x509write_init_node(node);
+
+    /* vers, n, e, d, p, q, dp, dq, pq */
+    if ((ret = asn1_add_int(rsa->ver, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->N, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->E, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->D, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->P, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->Q, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->DP, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->DQ, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->QP, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_append_tag(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * write a der/pem encoded rsa private key into a file
+ */
+int x509write_keyfile(rsa_context *rsa, char *path, int out_flag)
+{
+    int ret = 0;
+    const char	key_beg[] = "-----BEGIN RSA PRIVATE KEY-----\n",
+                key_end[] = "-----END RSA PRIVATE KEY-----\n";
+    x509_node node;
+
+    x509write_init_node(&node);
+    if ((ret = x509write_serialize_key(rsa,&node)) != 0) {
+        x509write_free_node(&node);
+	      return ret;
+    }
+
+    ret = x509write_file(&node,path,out_flag,key_beg,key_end);
+    x509write_free_node(&node);
+
+    return ret;
+}
+
+
+/*
+ * reasize the memory for node
+ */
+static int x509write_realloc_node(x509_node *node, size_t larger)
+{
+    /* init len */
+    if (node->data == NULL) {
+        node->len = 0;
+        node->data = malloc(larger);
+        if(node->data == NULL)
+            return 1;
+    } else {
+        /* realloc memory */
+        if ((node->data = realloc(node->data, node->len + larger)) == NULL)
+            return 1;
+    }
+
+    /* init pointer */
+    node->p = &node->data[node->len];
+    node->len += larger;
+    node->end = &node->data[node->len -1];
+
+    return 0;
+}
+
+/*
+ * init node
+ */
+void x509write_init_node(x509_node *node)
+{
+    memset(node, 0, sizeof(x509_node));
+}
+
+/*
+ * clean memory
+ */
+void x509write_free_node(x509_node *node)
+{
+    if (node->data != NULL)
+        free(node->data);
+    node->p = NULL;
+    node->end = NULL;
+    node->len = 0;
+}
+
+/*
+ * write a x509 certificate into file
+ */
+int x509write_crtfile(x509_raw *chain, unsigned char *path, int out_flag)
+{
+    const char	cer_beg[] = "-----BEGIN CERTIFICATE-----\n",
+		cer_end[] = "-----END CERTIFICATE-----\n";
+
+    return x509write_file(&chain->raw, (char*)path, out_flag, cer_beg, cer_end);
+}
+
+/*
+ * write a x509 certificate into file
+ */
+int x509write_csrfile(x509_raw *chain, unsigned char *path, int out_flag)
+{
+    const char	cer_beg[] = "-----BEGIN CERTIFICATE REQUEST-----\n",
+		cer_end[] = "-----END CERTIFICATE REQUEST-----\n";
+
+    return x509write_file(&chain->raw, (char*)path, out_flag, cer_beg, cer_end);
+}
+
+/*
+ * write an x509 file
+ */
+static int x509write_file(x509_node *node, char *path, int format,
+        const char* pem_prolog, const char* pem_epilog)
+{
+    FILE *ofstream;
+    int is_err = 1/*, buf_len, i, n*/;
+    /* char* base_buf; */
+
+    if ((ofstream = fopen(path, "wb")) == NULL)
+        return 1;
+
+    switch (format) {
+        case X509_OUTPUT_DER:
+            if (fwrite(node->data, 1, node->len, ofstream)
+                != node->len)
+                is_err = -1;
+            break;
+/*
+        case X509_OUTPUT_PEM:
+            if (fprintf(ofstream,pem_prolog)<0) {
+                is_err = -1;
+                break;
+            }
+
+            buf_len = node->len << 1;
+            base_buf = (char*) malloc((size_t)buf_len);
+            memset(base_buf,0,buf_len);
+            if (base64_encode(base_buf, &buf_len, node->data,
+                        (int) node->len) != 0) {
+                is_err = -1;
+                break;
+            }
+
+            n=strlen(base_buf);
+            for(i=0;i<n;i+=64) {
+                fprintf(ofstream,"%.64s\n",&base_buf[i]);
+            }
+
+            if (fprintf(ofstream, pem_epilog)<0) {
+                is_err = -1;
+                break;
+            }
+
+            free(base_buf); */
+    }
+
+    fclose(ofstream);
+
+    if (is_err == -1)
+        return 1;
+
+    return 0;
+}
+
+
+/*
+ * add the owner public key to x509 certificate
+ */
+int x509write_add_pubkey(x509_raw *chain, rsa_context *pubkey)
+{
+    x509_node n_tmp, n_tmp2, *node;
+    int ret;
+
+    node = &chain->subpubkey;
+
+    x509write_init_node(&n_tmp);
+    x509write_init_node(&n_tmp2);
+
+    /*
+    *  RSAPublicKey ::= SEQUENCE {
+    *      modulus           INTEGER,  -- n
+    *      publicExponent    INTEGER   -- e
+    *  }
+    */
+    if ((ret = asn1_add_mpi(&pubkey->N, ASN1_INTEGER, &n_tmp)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+    if ((ret = asn1_add_mpi(&pubkey->E, ASN1_INTEGER, &n_tmp)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+    if ((ret = asn1_append_tag(&n_tmp, ASN1_CONSTRUCTED | ASN1_SEQUENCE))
+            != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+
+    /*
+     *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
+     *       algorithm            AlgorithmIdentifier,
+     *       subjectPublicKey     BIT STRING }
+     */
+    if ((ret = asn1_append_tag(&n_tmp, ASN1_BIT_STRING)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+       return ret;
+    }
+    if ((ret = asn1_add_oid(&n_tmp2, (unsigned char*)OID_PKCS1_RSA, 9,
+                  ASN1_CONSTRUCTED | ASN1_SEQUENCE, ASN1_NULL,
+                  (unsigned char *)"", 0)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+
+    if ((ret = asn1_append_nodes(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE, 2,
+                   &n_tmp2, &n_tmp))) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+
+    x509write_free_node(&n_tmp);
+    x509write_free_node(&n_tmp2);
+    return 0;
+}
+
+/*
+ *  RelativeDistinguishedName ::=
+ *    SET OF AttributeTypeAndValue
+ *
+ *  AttributeTypeAndValue ::= SEQUENCE {
+ *    type     AttributeType,
+ *    value    AttributeValue }
+ */
+static int x509write_add_name(x509_node *node, unsigned char *oid,
+        unsigned int oid_len, unsigned char *value, int len, int value_tag)
+{
+    int ret;
+    x509_node n_tmp;
+
+    x509write_init_node(&n_tmp);
+
+    if ((ret = asn1_add_oid(&n_tmp, oid, oid_len,
+                ASN1_CONSTRUCTED | ASN1_SEQUENCE, value_tag,
+                value, len))) {
+        x509write_free_node(&n_tmp);
+        return ret;
+    }
+
+    if ((asn1_append_nodes(node, ASN1_CONSTRUCTED | ASN1_SET, 1, &n_tmp))
+            != 0) {
+        x509write_free_node(&n_tmp);
+        return ret;
+    }
+
+    x509write_free_node(&n_tmp);
+    return 0;
+}
+
+/*
+ * Parse the name string and add to node
+ */
+static int x509write_parse_names(x509_node *node, unsigned char *names)
+{
+    unsigned char *sp, *begin = NULL;
+    unsigned char oid[3] = OID_X520, tag[4], *tag_sp = tag;
+    unsigned char *C = NULL, *CN = NULL, *O = NULL, *OU = NULL,
+                  *ST = NULL, *L = NULL, *R = NULL;
+    int C_len = 0, CN_len = 0, O_len = 0, OU_len = 0, ST_len = 0,
+		L_len = 0, R_len = 0;
+    int ret = 0, is_tag = 1, is_begin = -1, len = 0;
+
+
+    for (sp = names; ; ++sp) {
+
+        /* filter tag */
+        if (is_tag == 1) {
+
+            if (tag_sp == &tag[3])
+                return POLARSSL_ERR_X509_VALUE_TO_LENGTH;
+
+            /* is tag end? */
+            if (*sp == '=') {
+                is_tag = -1;
+                *tag_sp = '\0';
+                is_begin = 1;
+                /* set len 0 (reset) */
+                len = 0;
+            } else {
+                /* tag hasn't ' '! */
+                if (*sp != ' ') {
+                    *tag_sp = *sp;
+                    ++tag_sp;
+                }
+            }
+        /* filter value */
+        } else {
+
+            /* set pointer of value begin */
+            if (is_begin == 1) {
+                begin = sp;
+                is_begin = -1;
+            }
+
+            /* is value at end? */
+            if (*sp == ';' or *sp == '\0') {
+                is_tag = 1;
+
+                /* common name */
+                if (tag[0] == 'C' and tag[1] == 'N') {
+                    CN = begin;
+                    CN_len = len;
+
+                /* organization */
+                } else if (tag[0] == 'O' and tag[1] == '\0') {
+                    O = begin;
+                    O_len = len;
+
+                /* country */
+                } else if (tag[0] == 'C' and tag[1] == '\0') {
+                    C = begin;
+                    C_len = len;
+
+                /* organisation unit */
+                } else if (tag[0] == 'O' and tag[1] == 'U') {
+                    OU = begin;
+                    OU_len = len;
+
+                /* state */
+                } else if (tag[0] == 'S' and tag[1] == 'T') {
+                    ST = begin;
+                    ST_len = len;
+
+                /* locality */
+                } else if (tag[0] == 'L' and tag[1] == '\0') {
+                    L = begin;
+                    L_len = len;
+
+                /* email */
+                } else if (tag[0] == 'R' and tag[1] == '\0') {
+                    R = begin;
+                    R_len = len;
+                }
+
+                /* set tag poiner to begin */
+                tag_sp = tag;
+
+                /* is at end? */
+                if (*sp == '\0' or *(sp +1) == '\0')
+                    break;
+            } else {
+                ++len;
+            }
+        }
+
+        /* make saver */
+        if (*sp == '\0')
+          break;
+    } /* end for */
+
+    /* country */
+    if (C != NULL) {
+        oid[2] = X520_COUNTRY;
+        if ((ret = x509write_add_name(node, oid, 3, C, C_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* state */
+    if (ST != NULL) {
+        oid[2] = X520_STATE;
+        if ((ret = x509write_add_name(node, oid, 3, ST, ST_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* locality */
+    if (L != NULL) {
+        oid[2] = X520_LOCALITY;
+        if ((ret = x509write_add_name(node, oid, 3, L, L_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* organization */
+    if (O != NULL) {
+        oid[2] = X520_ORGANIZATION;
+        if ((ret = x509write_add_name(node, oid, 3, O, O_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* organisation unit */
+    if (OU != NULL) {
+        oid[2] = X520_ORG_UNIT;
+        if ((ret = x509write_add_name(node, oid, 3, OU, OU_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* common name */
+    if (CN != NULL) {
+        oid[2] = X520_COMMON_NAME;
+        if ((ret = x509write_add_name(node, oid, 3, CN, CN_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* email */
+    if (R != NULL) {
+        if ((ret = x509write_add_name(node, (unsigned char*)OID_PKCS9_EMAIL,
+        		9, R, R_len, ASN1_IA5_STRING)) != 0)
+            return ret;
+    }
+
+    if ((asn1_append_tag(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * Copy raw data from orginal ca to node
+ */
+static int x509write_copy_from_raw(x509_node *node, x509_buf *raw)
+{
+    if (x509write_realloc_node(node, raw->len) != 0)
+        return 1;
+
+    memcpy(node->p, raw->p, (size_t)raw->len);
+    if ((node->p += raw->len -1) != node->end)
+        return POLARSSL_ERR_X509_POINT_ERROR;
+
+    return 0;
+}
+
+/*
+ * Add the issuer
+ */
+
+int x509write_add_issuer(x509_raw *crt, unsigned char *issuer)
+{
+    return x509write_parse_names(&crt->issuer, issuer);
+}
+
+/*
+ * Add the subject
+ */
+int x509write_add_subject(x509_raw *crt, unsigned char *subject)
+{
+    return x509write_parse_names(&crt->subject, subject);
+}
+
+/*
+ * Copy issuer line from another cert to issuer
+ */
+int x509write_copy_issuer(x509_raw *crt, x509_cert *from_crt)
+{
+    return x509write_copy_from_raw(&crt->issuer, &from_crt->issuer_raw);
+}
+
+/*
+ * Copy subject line from another cert
+ */
+int x509write_copy_subject(x509_raw *crt, x509_cert *from_crt)
+{
+    return x509write_copy_from_raw(&crt->subject, &from_crt->subject_raw);
+}
+
+/*
+ * Copy subject line form antoher cert into issuer
+ */
+int x509write_copy_issuer_form_subject(x509_raw *crt,
+        x509_cert *from_crt)
+{
+    return x509write_copy_from_raw(&crt->issuer, &from_crt->subject_raw);
+}
+
+/*
+ * Copy issuer line from another cert into subject
+ */
+int x509write_copy_subject_from_issuer(x509_raw *crt,
+        x509_cert * from_crt)
+{
+    return x509write_copy_from_raw(&crt->subject, &from_crt->issuer_raw);
+}
+
+/*
+ *  Validity ::= SEQUENCE {
+ *       notBefore      Time,
+ *       notAfter       Time }
+ *
+ *  Time ::= CHOICE {
+ *       utcTime        UTCTime,
+ *       generalTime    GeneralizedTime }
+ */
+/* TODO: No handle GeneralizedTime! */
+int x509write_add_validity(x509_raw *chain, unsigned char *befor,
+        unsigned char *after)
+{
+    int ret;
+
+    x509_node *node = &chain->validity;
+
+    /* notBefore */
+    if ((ret = asn1_add_date_utc(befor, node)) != 0)
+        return ret;
+
+    /* notAfter */
+    if ((ret = asn1_add_date_utc(after, node)) != 0)
+        return ret;
+
+    if ((ret = asn1_append_tag(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * make hash from tbs and sign that with private key
+ */
+static int x509write_make_sign(x509_raw *chain, rsa_context *privkey)
+{
+    int ret;
+    unsigned char hash[20], *sign;
+    size_t sign_len = (size_t) mpi_size(&privkey->N);
+
+    /* make hash */
+    sha1(chain->tbs.data, chain->tbs.len, hash);
+
+    /* create sign */
+    sign = (unsigned char *) malloc(sign_len);
+    if (sign == NULL)
+        return 1;
+
+    if ((ret = rsa_pkcs1_sign(privkey, RSA_PRIVATE, RSA_SHA1, 20, hash,
+                    sign)) != 0)
+        return ret;
+
+    if ((ret = asn1_add_obj(sign, sign_len, ASN1_BIT_STRING,
+                    &chain->sign)) != 0)
+        return ret;
+
+    /*
+     *  AlgorithmIdentifier  ::=  SEQUENCE  {
+     *       algorithm               OBJECT IDENTIFIER,
+     *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+     */
+    return asn1_add_oid(&chain->signalg, (unsigned char*)OID_PKCS1_RSA_SHA, 9,
+                  ASN1_CONSTRUCTED | ASN1_SEQUENCE, ASN1_NULL,
+                  (unsigned char*)"", 0);
+}
+
+/*
+ * Create a self signed certificate
+ */
+int x509write_create_sign(x509_raw *chain, rsa_context *privkey)
+{
+    int ret, serial;
+
+    /*
+     *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+     */
+    if ((ret = asn1_add_int(2, &chain->version)) != 0)
+        return ret;
+
+    if ((ret = asn1_append_tag(&chain->version, ASN1_CONTEXT_SPECIFIC |
+                    ASN1_CONSTRUCTED)) != 0)
+        return ret;
+
+
+    /*
+     *  CertificateSerialNumber  ::=  INTEGER
+     */
+    srand((unsigned int) time(NULL));
+    serial = rand();
+    if ((ret = asn1_add_int(serial, &chain->serial)) != 0)
+        return ret;
+
+    /*
+     *  AlgorithmIdentifier  ::=  SEQUENCE  {
+     *       algorithm               OBJECT IDENTIFIER,
+     *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+     */
+    if ((ret = asn1_add_oid(&chain->tbs_signalg,
+				(unsigned char*)OID_PKCS1_RSA_SHA, 9, ASN1_CONSTRUCTED |
+				ASN1_SEQUENCE, ASN1_NULL, (unsigned char*)"", 0)) != 0)
+        return ret;
+
+   /*
+    *  Create the tbs
+    */
+    if ((ret = asn1_append_nodes(&chain->tbs, ASN1_CONSTRUCTED |
+                    ASN1_SEQUENCE, 7, &chain->version, &chain->serial,
+                    &chain->tbs_signalg, &chain->issuer, &chain->validity,
+                    &chain->subject, &chain->subpubkey)) != 0)
+        return ret;
+
+    /* make signing */
+    if ((ret = x509write_make_sign(chain, privkey)) != 0)
+        return ret;
+
+    /* finishing */
+    if ((ret = asn1_append_nodes(&chain->raw, ASN1_CONSTRUCTED |
+                    ASN1_SEQUENCE, 3, &chain->tbs, &chain->signalg,
+                    &chain->sign)) != 0)
+        return ret;
+
+    return 0;
+}
+
+int x509write_create_selfsign(x509_raw *chain, rsa_context *privkey)
+{
+    /*
+     * On self signed certificate are subject and issuer the same
+     */
+    x509write_free_node(&chain->issuer);
+    chain->issuer = chain->subject;
+    return x509write_create_sign(chain, privkey);
+}
+
+/*
+ * CertificationRequestInfo ::= SEQUENCE                    {
+ *    version                       Version,
+ *    subject                       Name,
+ *    subjectPublicKeyInfo          SubjectPublicKeyInfo,
+ *    attributes                    [0] IMPLICIT Attributes }
+ *
+ * CertificationRequest ::=   SEQUENCE                      {
+ *    certificationRequestInfo  CertificationRequestInfo,
+ *    signatureAlgorithm        SignatureAlgorithmIdentifier,
+ *    signature                 Signature                   }
+ *
+ * It use chain.serail for attributes!
+ *
+ */
+int x509write_create_csr(x509_raw *chain, rsa_context *privkey)
+{
+    int ret;
+
+    /* version ::= INTEGER */
+    if ((ret = asn1_add_int(0, &chain->version)) != 0)
+        return ret;
+
+    /* write attributes */
+    if ((ret = asn1_add_obj((unsigned char*)"", 0, ASN1_CONTEXT_SPECIFIC |
+                    ASN1_CONSTRUCTED, &chain->serial)) != 0)
+        return ret;
+
+    /* create CertificationRequestInfo */
+    if ((ret = asn1_append_nodes(&chain->tbs, ASN1_CONSTRUCTED |
+                    ASN1_SEQUENCE, 4, &chain->version, &chain->subject,
+                    &chain->subpubkey, &chain->serial)) != 0)
+        return ret;
+
+    /* make signing */
+    if ((ret = x509write_make_sign(chain, privkey)) != 0)
+        return ret;
+
+    /* finish */
+    if ((ret = asn1_append_nodes(&chain->raw, ASN1_CONSTRUCTED | ASN1_SEQUENCE,
+                    3, &chain->tbs, &chain->signalg, &chain->sign)) != 0)
+        return ret;
+
+    return ret;
+}
+
+/*
+ * Free memory
+ */
+void x509write_free_raw(x509_raw *chain)
+{
+    x509write_free_node(&chain->raw);
+    x509write_free_node(&chain->tbs);
+    x509write_free_node(&chain->version);
+    x509write_free_node(&chain->serial);
+    x509write_free_node(&chain->tbs_signalg);
+    x509write_free_node(&chain->issuer);
+    x509write_free_node(&chain->validity);
+    if (chain->subject.data != chain->issuer.data)
+        x509write_free_node(&chain->subject);
+    x509write_free_node(&chain->subpubkey);
+    x509write_free_node(&chain->signalg);
+    x509write_free_node(&chain->sign);
+}
+
+void x509write_init_raw(x509_raw *chain)
+{
+    memset((void *) chain, 0, sizeof(x509_raw));
+}
+
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/bignum.h b/trunk/package/luci/libs/px5g/src/polarssl/bignum.h
new file mode 100644
index 00000000..c6673033
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/bignum.h
@@ -0,0 +1,437 @@
+/**
+ * \file bignum.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_BIGNUM_H
+#define POLARSSL_BIGNUM_H
+
+#include <stdio.h>
+
+#define POLARSSL_ERR_MPI_FILE_IO_ERROR                     -0x0002
+#define POLARSSL_ERR_MPI_BAD_INPUT_DATA                    -0x0004
+#define POLARSSL_ERR_MPI_INVALID_CHARACTER                 -0x0006
+#define POLARSSL_ERR_MPI_BUFFER_TOO_SMALL                  -0x0008
+#define POLARSSL_ERR_MPI_NEGATIVE_VALUE                    -0x000A
+#define POLARSSL_ERR_MPI_DIVISION_BY_ZERO                  -0x000C
+#define POLARSSL_ERR_MPI_NOT_ACCEPTABLE                    -0x000E
+
+#define MPI_CHK(f) if( ( ret = f ) != 0 ) goto cleanup
+
+/*
+ * Define the base integer type, architecture-wise
+ */
+#if defined(POLARSSL_HAVE_INT8)
+typedef unsigned char  t_int;
+typedef unsigned short t_dbl;
+#else
+#if defined(POLARSSL_HAVE_INT16)
+typedef unsigned short t_int;
+typedef unsigned long  t_dbl;
+#else
+  typedef unsigned long t_int;
+  #if defined(_MSC_VER) && defined(_M_IX86)
+  typedef unsigned __int64 t_dbl;
+  #else
+    #if defined(__amd64__) || defined(__x86_64__)    || \
+        defined(__ppc64__) || defined(__powerpc64__) || \
+        defined(__ia64__)  || defined(__alpha__)
+    typedef unsigned int t_dbl __attribute__((mode(TI)));
+    #else
+    typedef unsigned long long t_dbl;
+    #endif
+  #endif
+#endif
+#endif
+
+/**
+ * \brief          MPI structure
+ */
+typedef struct
+{
+    int s;              /*!<  integer sign      */
+    int n;              /*!<  total # of limbs  */
+    t_int *p;           /*!<  pointer to limbs  */
+}
+mpi;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Initialize one or more mpi
+ */
+void mpi_init( mpi *X, ... );
+
+/**
+ * \brief          Unallocate one or more mpi
+ */
+void mpi_free( mpi *X, ... );
+
+/**
+ * \brief          Enlarge to the specified number of limbs
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_grow( mpi *X, int nblimbs );
+
+/**
+ * \brief          Copy the contents of Y into X
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_copy( mpi *X, mpi *Y );
+
+/**
+ * \brief          Swap the contents of X and Y
+ */
+void mpi_swap( mpi *X, mpi *Y );
+
+/**
+ * \brief          Set value from integer
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_lset( mpi *X, int z );
+
+/**
+ * \brief          Return the number of least significant bits
+ */
+int mpi_lsb( mpi *X );
+
+/**
+ * \brief          Return the number of most significant bits
+ */
+int mpi_msb( mpi *X );
+
+/**
+ * \brief          Return the total size in bytes
+ */
+int mpi_size( mpi *X );
+
+/**
+ * \brief          Import from an ASCII string
+ *
+ * \param X        destination mpi
+ * \param radix    input numeric base
+ * \param s        null-terminated string buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ */
+int mpi_read_string( mpi *X, int radix, char *s );
+
+/**
+ * \brief          Export into an ASCII string
+ *
+ * \param X        source mpi
+ * \param radix    output numeric base
+ * \param s        string buffer
+ * \param slen     string buffer size
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ *
+ * \note           Call this function with *slen = 0 to obtain the
+ *                 minimum required buffer size in *slen.
+ */
+int mpi_write_string( mpi *X, int radix, char *s, int *slen );
+
+/**
+ * \brief          Read X from an opened file
+ *
+ * \param X        destination mpi
+ * \param radix    input numeric base
+ * \param fin      input file handle
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ */
+int mpi_read_file( mpi *X, int radix, FILE *fin );
+
+/**
+ * \brief          Write X into an opened file, or stdout
+ *
+ * \param p        prefix, can be NULL
+ * \param X        source mpi
+ * \param radix    output numeric base
+ * \param fout     output file handle
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ *
+ * \note           Set fout == NULL to print X on the console.
+ */
+int mpi_write_file( char *p, mpi *X, int radix, FILE *fout );
+
+/**
+ * \brief          Import X from unsigned binary data, big endian
+ *
+ * \param X        destination mpi
+ * \param buf      input buffer
+ * \param buflen   input buffer size
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_read_binary( mpi *X, unsigned char *buf, int buflen );
+
+/**
+ * \brief          Export X into unsigned binary data, big endian
+ *
+ * \param X        source mpi
+ * \param buf      output buffer
+ * \param buflen   output buffer size
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_MPI_BUFFER_TOO_SMALL if buf isn't large enough
+ *
+ * \note           Call this function with *buflen = 0 to obtain the
+ *                 minimum required buffer size in *buflen.
+ */
+int mpi_write_binary( mpi *X, unsigned char *buf, int buflen );
+
+/**
+ * \brief          Left-shift: X <<= count
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_shift_l( mpi *X, int count );
+
+/**
+ * \brief          Right-shift: X >>= count
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_shift_r( mpi *X, int count );
+
+/**
+ * \brief          Compare unsigned values
+ *
+ * \return         1 if |X| is greater than |Y|,
+ *                -1 if |X| is lesser  than |Y| or
+ *                 0 if |X| is equal to |Y|
+ */
+int mpi_cmp_abs( mpi *X, mpi *Y );
+
+/**
+ * \brief          Compare signed values
+ *
+ * \return         1 if X is greater than Y,
+ *                -1 if X is lesser  than Y or
+ *                 0 if X is equal to Y
+ */
+int mpi_cmp_mpi( mpi *X, mpi *Y );
+
+/**
+ * \brief          Compare signed values
+ *
+ * \return         1 if X is greater than z,
+ *                -1 if X is lesser  than z or
+ *                 0 if X is equal to z
+ */
+int mpi_cmp_int( mpi *X, int z );
+
+/**
+ * \brief          Unsigned addition: X = |A| + |B|
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_add_abs( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Unsigned substraction: X = |A| - |B|
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_MPI_NEGATIVE_VALUE if B is greater than A
+ */
+int mpi_sub_abs( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Signed addition: X = A + B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_add_mpi( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Signed substraction: X = A - B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_sub_mpi( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Signed addition: X = A + b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_add_int( mpi *X, mpi *A, int b );
+
+/**
+ * \brief          Signed substraction: X = A - b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_sub_int( mpi *X, mpi *A, int b );
+
+/**
+ * \brief          Baseline multiplication: X = A * B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_mul_mpi( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Baseline multiplication: X = A * b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_mul_int( mpi *X, mpi *A, t_int b );
+
+/**
+ * \brief          Division by mpi: A = Q * B + R
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0
+ *
+ * \note           Either Q or R can be NULL.
+ */
+int mpi_div_mpi( mpi *Q, mpi *R, mpi *A, mpi *B );
+
+/**
+ * \brief          Division by int: A = Q * b + R
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0
+ *
+ * \note           Either Q or R can be NULL.
+ */
+int mpi_div_int( mpi *Q, mpi *R, mpi *A, int b );
+
+/**
+ * \brief          Modulo: R = A mod B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0
+ */
+int mpi_mod_mpi( mpi *R, mpi *A, mpi *B );
+
+/**
+ * \brief          Modulo: r = A mod b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0
+ */
+int mpi_mod_int( t_int *r, mpi *A, int b );
+
+/**
+ * \brief          Sliding-window exponentiation: X = A^E mod N
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or even
+ *
+ * \note           _RR is used to avoid re-computing R*R mod N across
+ *                 multiple calls, which speeds up things a bit. It can
+ *                 be set to NULL if the extra performance is unneeded.
+ */
+int mpi_exp_mod( mpi *X, mpi *A, mpi *E, mpi *N, mpi *_RR );
+
+/**
+ * \brief          Greatest common divisor: G = gcd(A, B)
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_gcd( mpi *G, mpi *A, mpi *B );
+
+/**
+ * \brief          Modular inverse: X = A^-1 mod N
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or nil
+ *                 POLARSSL_ERR_MPI_NOT_ACCEPTABLE if A has no inverse mod N
+ */
+int mpi_inv_mod( mpi *X, mpi *A, mpi *N );
+
+/**
+ * \brief          Miller-Rabin primality test
+ *
+ * \return         0 if successful (probably prime),
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_NOT_ACCEPTABLE if X is not prime
+ */
+int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng );
+
+/**
+ * \brief          Prime number generation
+ *
+ * \param X        destination mpi
+ * \param nbits    required size of X in bits
+ * \param dh_flag  if 1, then (X-1)/2 will be prime too
+ * \param f_rng    RNG function
+ * \param p_rng    RNG parameter
+ *
+ * \return         0 if successful (probably prime),
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if nbits is < 3
+ */
+int mpi_gen_prime( mpi *X, int nbits, int dh_flag,
+                   int (*f_rng)(void *), void *p_rng );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int mpi_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* bignum.h */
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/bn_mul.h b/trunk/package/luci/libs/px5g/src/polarssl/bn_mul.h
new file mode 100644
index 00000000..f6d34da5
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/bn_mul.h
@@ -0,0 +1,731 @@
+/**
+ * \file bn_mul.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *      Multiply source vector [s] with b, add result
+ *       to destination vector [d] and set carry c.
+ *
+ *      Currently supports:
+ *
+ *         . IA-32 (386+)         . AMD64 / EM64T
+ *         . IA-32 (SSE2)         . Motorola 68000
+ *         . PowerPC, 32-bit      . MicroBlaze
+ *         . PowerPC, 64-bit      . TriCore
+ *         . SPARC v8             . ARM v3+
+ *         . Alpha                . MIPS32
+ *         . C, longlong          . C, generic
+ */
+#ifndef POLARSSL_BN_MUL_H
+#define POLARSSL_BN_MUL_H
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_HAVE_ASM)
+
+#if defined(__GNUC__)
+#if defined(__i386__)
+
+#define MULADDC_INIT                            \
+    asm( "movl   %%ebx, %0      " : "=m" (t));  \
+    asm( "movl   %0, %%esi      " :: "m" (s));  \
+    asm( "movl   %0, %%edi      " :: "m" (d));  \
+    asm( "movl   %0, %%ecx      " :: "m" (c));  \
+    asm( "movl   %0, %%ebx      " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "lodsl                 " );            \
+    asm( "mull   %ebx           " );            \
+    asm( "addl   %ecx,   %eax   " );            \
+    asm( "adcl   $0,     %edx   " );            \
+    asm( "addl   (%edi), %eax   " );            \
+    asm( "adcl   $0,     %edx   " );            \
+    asm( "movl   %edx,   %ecx   " );            \
+    asm( "stosl                 " );
+
+#if defined(POLARSSL_HAVE_SSE2)
+
+#define MULADDC_HUIT                            \
+    asm( "movd     %ecx,     %mm1     " );      \
+    asm( "movd     %ebx,     %mm0     " );      \
+    asm( "movd     (%edi),   %mm3     " );      \
+    asm( "paddq    %mm3,     %mm1     " );      \
+    asm( "movd     (%esi),   %mm2     " );      \
+    asm( "pmuludq  %mm0,     %mm2     " );      \
+    asm( "movd     4(%esi),  %mm4     " );      \
+    asm( "pmuludq  %mm0,     %mm4     " );      \
+    asm( "movd     8(%esi),  %mm6     " );      \
+    asm( "pmuludq  %mm0,     %mm6     " );      \
+    asm( "movd     12(%esi), %mm7     " );      \
+    asm( "pmuludq  %mm0,     %mm7     " );      \
+    asm( "paddq    %mm2,     %mm1     " );      \
+    asm( "movd     4(%edi),  %mm3     " );      \
+    asm( "paddq    %mm4,     %mm3     " );      \
+    asm( "movd     8(%edi),  %mm5     " );      \
+    asm( "paddq    %mm6,     %mm5     " );      \
+    asm( "movd     12(%edi), %mm4     " );      \
+    asm( "paddq    %mm4,     %mm7     " );      \
+    asm( "movd     %mm1,     (%edi)   " );      \
+    asm( "movd     16(%esi), %mm2     " );      \
+    asm( "pmuludq  %mm0,     %mm2     " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "movd     20(%esi), %mm4     " );      \
+    asm( "pmuludq  %mm0,     %mm4     " );      \
+    asm( "paddq    %mm3,     %mm1     " );      \
+    asm( "movd     24(%esi), %mm6     " );      \
+    asm( "pmuludq  %mm0,     %mm6     " );      \
+    asm( "movd     %mm1,     4(%edi)  " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "movd     28(%esi), %mm3     " );      \
+    asm( "pmuludq  %mm0,     %mm3     " );      \
+    asm( "paddq    %mm5,     %mm1     " );      \
+    asm( "movd     16(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm2     " );      \
+    asm( "movd     %mm1,     8(%edi)  " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm7,     %mm1     " );      \
+    asm( "movd     20(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm4     " );      \
+    asm( "movd     %mm1,     12(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm2,     %mm1     " );      \
+    asm( "movd     24(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm6     " );      \
+    asm( "movd     %mm1,     16(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm4,     %mm1     " );      \
+    asm( "movd     28(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm3     " );      \
+    asm( "movd     %mm1,     20(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm6,     %mm1     " );      \
+    asm( "movd     %mm1,     24(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm3,     %mm1     " );      \
+    asm( "movd     %mm1,     28(%edi) " );      \
+    asm( "addl     $32,      %edi     " );      \
+    asm( "addl     $32,      %esi     " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "movd     %mm1,     %ecx     " );
+
+#define MULADDC_STOP                            \
+    asm( "emms                        " );      \
+    asm( "movl   %0, %%ebx      " :: "m" (t));  \
+    asm( "movl   %%ecx, %0      " : "=m" (c));  \
+    asm( "movl   %%edi, %0      " : "=m" (d));  \
+    asm( "movl   %%esi, %0      " : "=m" (s) :: \
+    "eax", "ecx", "edx", "esi", "edi" );
+
+#else
+
+#define MULADDC_STOP                            \
+    asm( "movl   %0, %%ebx      " :: "m" (t));  \
+    asm( "movl   %%ecx, %0      " : "=m" (c));  \
+    asm( "movl   %%edi, %0      " : "=m" (d));  \
+    asm( "movl   %%esi, %0      " : "=m" (s) :: \
+    "eax", "ecx", "edx", "esi", "edi" );
+
+#endif /* SSE2 */
+#endif /* i386 */
+
+#if defined(__amd64__) || defined (__x86_64__)
+
+#define MULADDC_INIT                            \
+    asm( "movq   %0, %%rsi      " :: "m" (s));  \
+    asm( "movq   %0, %%rdi      " :: "m" (d));  \
+    asm( "movq   %0, %%rcx      " :: "m" (c));  \
+    asm( "movq   %0, %%rbx      " :: "m" (b));  \
+    asm( "xorq   %r8, %r8       " );
+
+#define MULADDC_CORE                            \
+    asm( "movq  (%rsi),%rax     " );            \
+    asm( "mulq   %rbx           " );            \
+    asm( "addq   $8,   %rsi     " );            \
+    asm( "addq   %rcx, %rax     " );            \
+    asm( "movq   %r8,  %rcx     " );            \
+    asm( "adcq   $0,   %rdx     " );            \
+    asm( "nop                   " );            \
+    asm( "addq   %rax, (%rdi)   " );            \
+    asm( "adcq   %rdx, %rcx     " );            \
+    asm( "addq   $8,   %rdi     " );
+
+#define MULADDC_STOP                            \
+    asm( "movq   %%rcx, %0      " : "=m" (c));  \
+    asm( "movq   %%rdi, %0      " : "=m" (d));  \
+    asm( "movq   %%rsi, %0      " : "=m" (s) :: \
+    "rax", "rcx", "rdx", "rbx", "rsi", "rdi", "r8" );
+
+#endif /* AMD64 */
+
+#if defined(__mc68020__) || defined(__mcpu32__)
+
+#define MULADDC_INIT                            \
+    asm( "movl   %0, %%a2       " :: "m" (s));  \
+    asm( "movl   %0, %%a3       " :: "m" (d));  \
+    asm( "movl   %0, %%d3       " :: "m" (c));  \
+    asm( "movl   %0, %%d2       " :: "m" (b));  \
+    asm( "moveq  #0, %d0        " );
+
+#define MULADDC_CORE                            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addl   %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "moveq  #0,  %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "addxl  %d4, %d3       " );
+
+#define MULADDC_STOP                            \
+    asm( "movl   %%d3, %0       " : "=m" (c));  \
+    asm( "movl   %%a3, %0       " : "=m" (d));  \
+    asm( "movl   %%a2, %0       " : "=m" (s) :: \
+    "d0", "d1", "d2", "d3", "d4", "a2", "a3" );
+
+#define MULADDC_HUIT                            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "addxl  %d0, %d3       " );
+
+#endif /* MC68000 */
+
+#if defined(__powerpc__)   || defined(__ppc__)
+#if defined(__powerpc64__) || defined(__ppc64__)
+
+#if defined(__MACH__) && defined(__APPLE__)
+
+#define MULADDC_INIT                            \
+    asm( "ld     r3, %0         " :: "m" (s));  \
+    asm( "ld     r4, %0         " :: "m" (d));  \
+    asm( "ld     r5, %0         " :: "m" (c));  \
+    asm( "ld     r6, %0         " :: "m" (b));  \
+    asm( "addi   r3, r3, -8     " );            \
+    asm( "addi   r4, r4, -8     " );            \
+    asm( "addic  r5, r5,  0     " );
+
+#define MULADDC_CORE                            \
+    asm( "ldu    r7, 8(r3)      " );            \
+    asm( "mulld  r8, r7, r6     " );            \
+    asm( "mulhdu r9, r7, r6     " );            \
+    asm( "adde   r8, r8, r5     " );            \
+    asm( "ld     r7, 8(r4)      " );            \
+    asm( "addze  r5, r9         " );            \
+    asm( "addc   r8, r8, r7     " );            \
+    asm( "stdu   r8, 8(r4)      " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  r5, r5         " );            \
+    asm( "addi   r4, r4, 8      " );            \
+    asm( "addi   r3, r3, 8      " );            \
+    asm( "std    r5, %0         " : "=m" (c));  \
+    asm( "std    r4, %0         " : "=m" (d));  \
+    asm( "std    r3, %0         " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#else
+
+#define MULADDC_INIT                            \
+    asm( "ld     %%r3, %0       " :: "m" (s));  \
+    asm( "ld     %%r4, %0       " :: "m" (d));  \
+    asm( "ld     %%r5, %0       " :: "m" (c));  \
+    asm( "ld     %%r6, %0       " :: "m" (b));  \
+    asm( "addi   %r3, %r3, -8   " );            \
+    asm( "addi   %r4, %r4, -8   " );            \
+    asm( "addic  %r5, %r5,  0   " );
+
+#define MULADDC_CORE                            \
+    asm( "ldu    %r7, 8(%r3)    " );            \
+    asm( "mulld  %r8, %r7, %r6  " );            \
+    asm( "mulhdu %r9, %r7, %r6  " );            \
+    asm( "adde   %r8, %r8, %r5  " );            \
+    asm( "ld     %r7, 8(%r4)    " );            \
+    asm( "addze  %r5, %r9       " );            \
+    asm( "addc   %r8, %r8, %r7  " );            \
+    asm( "stdu   %r8, 8(%r4)    " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  %r5, %r5       " );            \
+    asm( "addi   %r4, %r4, 8    " );            \
+    asm( "addi   %r3, %r3, 8    " );            \
+    asm( "std    %%r5, %0       " : "=m" (c));  \
+    asm( "std    %%r4, %0       " : "=m" (d));  \
+    asm( "std    %%r3, %0       " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#endif
+
+#else /* PPC32 */
+
+#if defined(__MACH__) && defined(__APPLE__)
+
+#define MULADDC_INIT                            \
+    asm( "lwz    r3, %0         " :: "m" (s));  \
+    asm( "lwz    r4, %0         " :: "m" (d));  \
+    asm( "lwz    r5, %0         " :: "m" (c));  \
+    asm( "lwz    r6, %0         " :: "m" (b));  \
+    asm( "addi   r3, r3, -4     " );            \
+    asm( "addi   r4, r4, -4     " );            \
+    asm( "addic  r5, r5,  0     " );
+
+#define MULADDC_CORE                            \
+    asm( "lwzu   r7, 4(r3)      " );            \
+    asm( "mullw  r8, r7, r6     " );            \
+    asm( "mulhwu r9, r7, r6     " );            \
+    asm( "adde   r8, r8, r5     " );            \
+    asm( "lwz    r7, 4(r4)      " );            \
+    asm( "addze  r5, r9         " );            \
+    asm( "addc   r8, r8, r7     " );            \
+    asm( "stwu   r8, 4(r4)      " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  r5, r5         " );            \
+    asm( "addi   r4, r4, 4      " );            \
+    asm( "addi   r3, r3, 4      " );            \
+    asm( "stw    r5, %0         " : "=m" (c));  \
+    asm( "stw    r4, %0         " : "=m" (d));  \
+    asm( "stw    r3, %0         " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#else
+
+#define MULADDC_INIT                            \
+    asm( "lwz    %%r3, %0       " :: "m" (s));  \
+    asm( "lwz    %%r4, %0       " :: "m" (d));  \
+    asm( "lwz    %%r5, %0       " :: "m" (c));  \
+    asm( "lwz    %%r6, %0       " :: "m" (b));  \
+    asm( "addi   %r3, %r3, -4   " );            \
+    asm( "addi   %r4, %r4, -4   " );            \
+    asm( "addic  %r5, %r5,  0   " );
+
+#define MULADDC_CORE                            \
+    asm( "lwzu   %r7, 4(%r3)    " );            \
+    asm( "mullw  %r8, %r7, %r6  " );            \
+    asm( "mulhwu %r9, %r7, %r6  " );            \
+    asm( "adde   %r8, %r8, %r5  " );            \
+    asm( "lwz    %r7, 4(%r4)    " );            \
+    asm( "addze  %r5, %r9       " );            \
+    asm( "addc   %r8, %r8, %r7  " );            \
+    asm( "stwu   %r8, 4(%r4)    " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  %r5, %r5       " );            \
+    asm( "addi   %r4, %r4, 4    " );            \
+    asm( "addi   %r3, %r3, 4    " );            \
+    asm( "stw    %%r5, %0       " : "=m" (c));  \
+    asm( "stw    %%r4, %0       " : "=m" (d));  \
+    asm( "stw    %%r3, %0       " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#endif
+
+#endif /* PPC32 */
+#endif /* PPC64 */
+
+#if defined(__sparc__)
+
+#define MULADDC_INIT                            \
+    asm( "ld     %0, %%o0       " :: "m" (s));  \
+    asm( "ld     %0, %%o1       " :: "m" (d));  \
+    asm( "ld     %0, %%o2       " :: "m" (c));  \
+    asm( "ld     %0, %%o3       " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "ld    [%o0], %o4      " );            \
+    asm( "inc      4,  %o0      " );            \
+    asm( "ld    [%o1], %o5      " );            \
+    asm( "umul   %o3,  %o4, %o4 " );            \
+    asm( "addcc  %o4,  %o2, %o4 " );            \
+    asm( "rd      %y,  %g1      " );            \
+    asm( "addx   %g1,    0, %g1 " );            \
+    asm( "addcc  %o4,  %o5, %o4 " );            \
+    asm( "st     %o4, [%o1]     " );            \
+    asm( "addx   %g1,    0, %o2 " );            \
+    asm( "inc      4,  %o1      " );
+
+#define MULADDC_STOP                            \
+    asm( "st     %%o2, %0       " : "=m" (c));  \
+    asm( "st     %%o1, %0       " : "=m" (d));  \
+    asm( "st     %%o0, %0       " : "=m" (s) :: \
+    "g1", "o0", "o1", "o2", "o3", "o4", "o5" );
+
+#endif /* SPARCv8 */
+
+#if defined(__microblaze__) || defined(microblaze)
+
+#define MULADDC_INIT                            \
+    asm( "lwi   r3,   %0        " :: "m" (s));  \
+    asm( "lwi   r4,   %0        " :: "m" (d));  \
+    asm( "lwi   r5,   %0        " :: "m" (c));  \
+    asm( "lwi   r6,   %0        " :: "m" (b));  \
+    asm( "andi  r7,   r6, 0xffff" );            \
+    asm( "bsrli r6,   r6, 16    " );
+
+#define MULADDC_CORE                            \
+    asm( "lhui  r8,   r3,   0   " );            \
+    asm( "addi  r3,   r3,   2   " );            \
+    asm( "lhui  r9,   r3,   0   " );            \
+    asm( "addi  r3,   r3,   2   " );            \
+    asm( "mul   r10,  r9,  r6   " );            \
+    asm( "mul   r11,  r8,  r7   " );            \
+    asm( "mul   r12,  r9,  r7   " );            \
+    asm( "mul   r13,  r8,  r6   " );            \
+    asm( "bsrli  r8, r10,  16   " );            \
+    asm( "bsrli  r9, r11,  16   " );            \
+    asm( "add   r13, r13,  r8   " );            \
+    asm( "add   r13, r13,  r9   " );            \
+    asm( "bslli r10, r10,  16   " );            \
+    asm( "bslli r11, r11,  16   " );            \
+    asm( "add   r12, r12, r10   " );            \
+    asm( "addc  r13, r13,  r0   " );            \
+    asm( "add   r12, r12, r11   " );            \
+    asm( "addc  r13, r13,  r0   " );            \
+    asm( "lwi   r10,  r4,   0   " );            \
+    asm( "add   r12, r12, r10   " );            \
+    asm( "addc  r13, r13,  r0   " );            \
+    asm( "add   r12, r12,  r5   " );            \
+    asm( "addc   r5, r13,  r0   " );            \
+    asm( "swi   r12,  r4,   0   " );            \
+    asm( "addi   r4,  r4,   4   " );
+
+#define MULADDC_STOP                            \
+    asm( "swi   r5,   %0        " : "=m" (c));  \
+    asm( "swi   r4,   %0        " : "=m" (d));  \
+    asm( "swi   r3,   %0        " : "=m" (s) :: \
+     "r3", "r4" , "r5" , "r6" , "r7" , "r8" ,   \
+     "r9", "r10", "r11", "r12", "r13" );
+
+#endif /* MicroBlaze */
+
+#if defined(__tricore__)
+
+#define MULADDC_INIT                            \
+    asm( "ld.a   %%a2, %0       " :: "m" (s));  \
+    asm( "ld.a   %%a3, %0       " :: "m" (d));  \
+    asm( "ld.w   %%d4, %0       " :: "m" (c));  \
+    asm( "ld.w   %%d1, %0       " :: "m" (b));  \
+    asm( "xor    %d5, %d5       " );
+
+#define MULADDC_CORE                            \
+    asm( "ld.w   %d0,   [%a2+]      " );        \
+    asm( "madd.u %e2, %e4, %d0, %d1 " );        \
+    asm( "ld.w   %d0,   [%a3]       " );        \
+    asm( "addx   %d2,    %d2,  %d0  " );        \
+    asm( "addc   %d3,    %d3,    0  " );        \
+    asm( "mov    %d4,    %d3        " );        \
+    asm( "st.w  [%a3+],  %d2        " );
+
+#define MULADDC_STOP                            \
+    asm( "st.w   %0, %%d4       " : "=m" (c));  \
+    asm( "st.a   %0, %%a3       " : "=m" (d));  \
+    asm( "st.a   %0, %%a2       " : "=m" (s) :: \
+    "d0", "d1", "e2", "d4", "a2", "a3" );
+
+#endif /* TriCore */
+
+#if defined(__arm__)
+
+#define MULADDC_INIT                            \
+    asm( "ldr    r0, %0         " :: "m" (s));  \
+    asm( "ldr    r1, %0         " :: "m" (d));  \
+    asm( "ldr    r2, %0         " :: "m" (c));  \
+    asm( "ldr    r3, %0         " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "ldr    r4, [r0], #4   " );            \
+    asm( "mov    r5, #0         " );            \
+    asm( "ldr    r6, [r1]       " );            \
+    asm( "umlal  r2, r5, r3, r4 " );            \
+    asm( "adds   r7, r6, r2     " );            \
+    asm( "adc    r2, r5, #0     " );            \
+    asm( "str    r7, [r1], #4   " );
+
+#define MULADDC_STOP                            \
+    asm( "str    r2, %0         " : "=m" (c));  \
+    asm( "str    r1, %0         " : "=m" (d));  \
+    asm( "str    r0, %0         " : "=m" (s) :: \
+    "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7" );
+
+#endif /* ARMv3 */
+
+#if defined(__alpha__)
+
+#define MULADDC_INIT                            \
+    asm( "ldq    $1, %0         " :: "m" (s));  \
+    asm( "ldq    $2, %0         " :: "m" (d));  \
+    asm( "ldq    $3, %0         " :: "m" (c));  \
+    asm( "ldq    $4, %0         " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "ldq    $6,  0($1)     " );            \
+    asm( "addq   $1,  8, $1     " );            \
+    asm( "mulq   $6, $4, $7     " );            \
+    asm( "umulh  $6, $4, $6     " );            \
+    asm( "addq   $7, $3, $7     " );            \
+    asm( "cmpult $7, $3, $3     " );            \
+    asm( "ldq    $5,  0($2)     " );            \
+    asm( "addq   $7, $5, $7     " );            \
+    asm( "cmpult $7, $5, $5     " );            \
+    asm( "stq    $7,  0($2)     " );            \
+    asm( "addq   $2,  8, $2     " );            \
+    asm( "addq   $6, $3, $3     " );            \
+    asm( "addq   $5, $3, $3     " );
+
+#define MULADDC_STOP                            \
+    asm( "stq    $3, %0         " : "=m" (c));  \
+    asm( "stq    $2, %0         " : "=m" (d));  \
+    asm( "stq    $1, %0         " : "=m" (s) :: \
+    "$1", "$2", "$3", "$4", "$5", "$6", "$7" );
+
+#endif /* Alpha */
+
+#if defined(__mips__)
+
+#define MULADDC_INIT                            \
+    asm( "lw     $10, %0        " :: "m" (s));  \
+    asm( "lw     $11, %0        " :: "m" (d));  \
+    asm( "lw     $12, %0        " :: "m" (c));  \
+    asm( "lw     $13, %0        " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "lw     $14, 0($10)    " );            \
+    asm( "multu  $13, $14       " );            \
+    asm( "addi   $10, $10, 4    " );            \
+    asm( "mflo   $14            " );            \
+    asm( "mfhi   $9             " );            \
+    asm( "addu   $14, $12, $14  " );            \
+    asm( "lw     $15, 0($11)    " );            \
+    asm( "sltu   $12, $14, $12  " );            \
+    asm( "addu   $15, $14, $15  " );            \
+    asm( "sltu   $14, $15, $14  " );            \
+    asm( "addu   $12, $12, $9   " );            \
+    asm( "sw     $15, 0($11)    " );            \
+    asm( "addu   $12, $12, $14  " );            \
+    asm( "addi   $11, $11, 4    " );
+
+#define MULADDC_STOP                            \
+    asm( "sw     $12, %0        " : "=m" (c));  \
+    asm( "sw     $11, %0        " : "=m" (d));  \
+    asm( "sw     $10, %0        " : "=m" (s) :: \
+    "$9", "$10", "$11", "$12", "$13", "$14", "$15" );
+
+#endif /* MIPS */
+#endif /* GNUC */
+
+#if (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+
+#define MULADDC_INIT                            \
+    __asm   mov     esi, s                      \
+    __asm   mov     edi, d                      \
+    __asm   mov     ecx, c                      \
+    __asm   mov     ebx, b
+
+#define MULADDC_CORE                            \
+    __asm   lodsd                               \
+    __asm   mul     ebx                         \
+    __asm   add     eax, ecx                    \
+    __asm   adc     edx, 0                      \
+    __asm   add     eax, [edi]                  \
+    __asm   adc     edx, 0                      \
+    __asm   mov     ecx, edx                    \
+    __asm   stosd
+
+#if defined(POLARSSL_HAVE_SSE2)
+
+#define EMIT __asm _emit
+
+#define MULADDC_HUIT                            \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0xC9             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0xC3             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x1F             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x16             \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x7E  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF8             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x5F  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xDC             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xEE             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x67  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xFC             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x0F             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x56  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x5E  EMIT 0x1C  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD8             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCD             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xD5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCF             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xE5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xF5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCC             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x1C  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xDD             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCE             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x1C  \
+    EMIT 0x83  EMIT 0xC7  EMIT 0x20             \
+    EMIT 0x83  EMIT 0xC6  EMIT 0x20             \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0xC9
+
+#define MULADDC_STOP                            \
+    EMIT 0x0F  EMIT 0x77                        \
+    __asm   mov     c, ecx                      \
+    __asm   mov     d, edi                      \
+    __asm   mov     s, esi                      \
+
+#else
+
+#define MULADDC_STOP                            \
+    __asm   mov     c, ecx                      \
+    __asm   mov     d, edi                      \
+    __asm   mov     s, esi                      \
+
+#endif /* SSE2 */
+#endif /* MSVC */
+
+#endif /* POLARSSL_HAVE_ASM */
+
+#if !defined(MULADDC_CORE)
+#if defined(POLARSSL_HAVE_LONGLONG)
+
+#define MULADDC_INIT                    \
+{                                       \
+    t_dbl r;                            \
+    t_int r0, r1;
+
+#define MULADDC_CORE                    \
+    r   = *(s++) * (t_dbl) b;           \
+    r0  = r;                            \
+    r1  = r >> biL;                     \
+    r0 += c;  r1 += (r0 <  c);          \
+    r0 += *d; r1 += (r0 < *d);          \
+    c = r1; *(d++) = r0;
+
+#define MULADDC_STOP                    \
+}
+
+#else
+#define MULADDC_INIT                    \
+{                                       \
+    t_int s0, s1, b0, b1;               \
+    t_int r0, r1, rx, ry;               \
+    b0 = ( b << biH ) >> biH;           \
+    b1 = ( b >> biH );
+
+#define MULADDC_CORE                    \
+    s0 = ( *s << biH ) >> biH;          \
+    s1 = ( *s >> biH ); s++;            \
+    rx = s0 * b1; r0 = s0 * b0;         \
+    ry = s1 * b0; r1 = s1 * b1;         \
+    r1 += ( rx >> biH );                \
+    r1 += ( ry >> biH );                \
+    rx <<= biH; ry <<= biH;             \
+    r0 += rx; r1 += (r0 < rx);          \
+    r0 += ry; r1 += (r0 < ry);          \
+    r0 +=  c; r1 += (r0 <  c);          \
+    r0 += *d; r1 += (r0 < *d);          \
+    c = r1; *(d++) = r0;
+
+#define MULADDC_STOP                    \
+}
+
+#endif /* C (generic)  */
+#endif /* C (longlong) */
+
+#endif /* bn_mul.h */
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/config.h b/trunk/package/luci/libs/px5g/src/polarssl/config.h
new file mode 100644
index 00000000..6463e521
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/config.h
@@ -0,0 +1,329 @@
+/**
+ * \file config.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This set of compile-time options may be used to enable
+ * or disable features selectively, and reduce the global
+ * memory footprint.
+ */
+#ifndef POLARSSL_CONFIG_H
+#define POLARSSL_CONFIG_H
+
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/*
+ * Uncomment if native integers are 8-bit wide.
+ *
+#define POLARSSL_HAVE_INT8
+ */
+
+/*
+ * Uncomment if native integers are 16-bit wide.
+ *
+#define POLARSSL_HAVE_INT16
+ */
+
+/*
+ * Uncomment if the compiler supports long long.
+ */
+#define POLARSSL_HAVE_LONGLONG
+
+
+/*
+ * Uncomment to enable the use of assembly code.
+ */
+#define POLARSSL_HAVE_ASM
+
+/*
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ *
+#define POLARSSL_HAVE_SSE2
+ */
+
+/*
+ * Enable all SSL/TLS debugging messages.
+ */
+#define POLARSSL_DEBUG_MSG
+
+/*
+ * Enable the checkup functions (*_self_test).
+ */
+#define POLARSSL_SELF_TEST
+
+/*
+ * Enable the prime-number generation code.
+ */
+#define POLARSSL_GENPRIME
+
+/*
+ * Uncomment this macro to store the AES tables in ROM.
+ *
+#define POLARSSL_AES_ROM_TABLES
+ */
+
+/*
+ * Module:  library/aes.c
+ * Caller:  library/ssl_tls.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_RSA_AES_128_SHA
+ *      SSL_RSA_AES_256_SHA
+ *      SSL_EDH_RSA_AES_256_SHA
+ */
+#define POLARSSL_AES_C
+
+/*
+ * Module:  library/arc4.c
+ * Caller:  library/ssl_tls.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_RSA_RC4_128_MD5
+ *      SSL_RSA_RC4_128_SHA
+ */
+#define POLARSSL_ARC4_C
+
+/*
+ * Module:  library/base64.c
+ * Caller:  library/x509parse.c
+ *
+ * This module is required for X.509 support.
+ */
+#define POLARSSL_BASE64_C
+
+/*
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/rsa.c
+ *          library/ssl_tls.c
+ *          library/x509parse.c
+ *
+ * This module is required for RSA and DHM support.
+ */
+#define POLARSSL_BIGNUM_C
+
+/*
+ * Module:  library/camellia.c
+ * Caller:
+ *
+ * This module enabled the following cipher suites:
+ */
+#define POLARSSL_CAMELLIA_C
+
+/*
+ * Module:  library/certs.c
+ * Caller:
+ *
+ * This module is used for testing (ssl_client/server).
+ */
+#define POLARSSL_CERTS_C
+
+/*
+ * Module:  library/debug.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *
+ * This module provides debugging functions.
+ */
+#define POLARSSL_DEBUG_C
+
+/*
+ * Module:  library/des.c
+ * Caller:  library/ssl_tls.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_RSA_DES_168_SHA
+ *      SSL_EDH_RSA_DES_168_SHA
+ */
+#define POLARSSL_DES_C
+
+/*
+ * Module:  library/dhm.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_EDH_RSA_DES_168_SHA
+ *      SSL_EDH_RSA_AES_256_SHA
+ */
+#define POLARSSL_DHM_C
+
+/*
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * This module enables the HAVEGE random number generator.
+ */
+#define POLARSSL_HAVEGE_C
+
+/*
+ * Module:  library/md2.c
+ * Caller:  library/x509parse.c
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+#define POLARSSL_MD2_C
+ */
+
+/*
+ * Module:  library/md4.c
+ * Caller:  library/x509parse.c
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+#define POLARSSL_MD4_C
+ */
+
+/*
+ * Module:  library/md5.c
+ * Caller:  library/ssl_tls.c
+ *          library/x509parse.c
+ *
+ * This module is required for SSL/TLS and X.509.
+ */
+#define POLARSSL_MD5_C
+
+/*
+ * Module:  library/net.c
+ * Caller:
+ *
+ * This module provides TCP/IP networking routines.
+ */
+#define POLARSSL_NET_C
+
+/*
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+#define POLARSSL_PADLOCK_C
+
+/*
+ * Module:  library/rsa.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *          library/x509.c
+ *
+ * This module is required for SSL/TLS and MD5-signed certificates.
+ */
+#define POLARSSL_RSA_C
+
+/*
+ * Module:  library/sha1.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *          library/x509parse.c
+ *
+ * This module is required for SSL/TLS and SHA1-signed certificates.
+ */
+#define POLARSSL_SHA1_C
+
+/*
+ * Module:  library/sha2.c
+ * Caller:
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ */
+#define POLARSSL_SHA2_C
+
+/*
+ * Module:  library/sha4.c
+ * Caller:
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+#define POLARSSL_SHA4_C
+
+/*
+ * Module:  library/ssl_cli.c
+ * Caller:
+ *
+ * This module is required for SSL/TLS client support.
+ */
+#define POLARSSL_SSL_CLI_C
+
+/*
+ * Module:  library/ssl_srv.c
+ * Caller:
+ *
+ * This module is required for SSL/TLS server support.
+ */
+#define POLARSSL_SSL_SRV_C
+
+/*
+ * Module:  library/ssl_tls.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module is required for SSL/TLS.
+ */
+#define POLARSSL_SSL_TLS_C
+
+/*
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+#define POLARSSL_TIMING_C
+
+/*
+ * Module:  library/x509parse.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *
+ * This module is required for X.509 certificate parsing.
+ */
+#define POLARSSL_X509_PARSE_C
+
+/*
+ * Module:  library/x509_write.c
+ * Caller:
+ *
+ * This module is required for X.509 certificate writing.
+ */
+#define POLARSSL_X509_WRITE_C
+
+/*
+ * Module:  library/xtea.c
+ * Caller:
+ */
+#define POLARSSL_XTEA_C
+
+#endif /* config.h */
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/havege.h b/trunk/package/luci/libs/px5g/src/polarssl/havege.h
new file mode 100644
index 00000000..c27cecac
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/havege.h
@@ -0,0 +1,75 @@
+/**
+ * \file havege.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_HAVEGE_H
+#define POLARSSL_HAVEGE_H
+
+#define COLLECT_SIZE 1024
+
+/**
+ * \brief          HAVEGE state structure
+ */
+typedef struct
+{
+    int PT1, PT2, offset[2];
+    int pool[COLLECT_SIZE];
+    int WALK[8192];
+}
+havege_state;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          HAVEGE initialization
+ *
+ * \param hs       HAVEGE state to be initialized
+ */
+void havege_init( havege_state *hs );
+
+/**
+ * \brief          HAVEGE rand function
+ *
+ * \param rng_st   points to an HAVEGE state
+ *
+ * \return         A random int
+ */
+int havege_rand( void *p_rng );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* havege.h */
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/rsa.h b/trunk/package/luci/libs/px5g/src/polarssl/rsa.h
new file mode 100644
index 00000000..b31dc2f1
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/rsa.h
@@ -0,0 +1,309 @@
+/**
+ * \file rsa.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_RSA_H
+#define POLARSSL_RSA_H
+
+#include "polarssl/bignum.h"
+
+#define POLARSSL_ERR_RSA_BAD_INPUT_DATA                    -0x0400
+#define POLARSSL_ERR_RSA_INVALID_PADDING                   -0x0410
+#define POLARSSL_ERR_RSA_KEY_GEN_FAILED                    -0x0420
+#define POLARSSL_ERR_RSA_KEY_CHECK_FAILED                  -0x0430
+#define POLARSSL_ERR_RSA_PUBLIC_FAILED                     -0x0440
+#define POLARSSL_ERR_RSA_PRIVATE_FAILED                    -0x0450
+#define POLARSSL_ERR_RSA_VERIFY_FAILED                     -0x0460
+#define POLARSSL_ERR_RSA_OUTPUT_TO_LARGE                   -0x0470
+
+/*
+ * PKCS#1 constants
+ */
+#define RSA_RAW         0
+#define RSA_MD2         2
+#define RSA_MD4         3
+#define RSA_MD5         4
+#define RSA_SHA1        5
+#define RSA_SHA256      6
+
+#define RSA_PUBLIC      0
+#define RSA_PRIVATE     1
+
+#define RSA_PKCS_V15    0
+#define RSA_PKCS_V21    1
+
+#define RSA_SIGN        1
+#define RSA_CRYPT       2
+
+/*
+ * DigestInfo ::= SEQUENCE {
+ *   digestAlgorithm DigestAlgorithmIdentifier,
+ *   digest Digest }
+ *
+ * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
+ *
+ * Digest ::= OCTET STRING
+ */
+#define ASN1_HASH_MDX                       \
+    "\x30\x20\x30\x0C\x06\x08\x2A\x86\x48"  \
+    "\x86\xF7\x0D\x02\x00\x05\x00\x04\x10"
+
+#define ASN1_HASH_SHA1                      \
+    "\x30\x21\x30\x09\x06\x05\x2B\x0E\x03"  \
+    "\x02\x1A\x05\x00\x04\x14"
+
+/**
+ * \brief          RSA context structure
+ */
+typedef struct
+{
+    int ver;                    /*!<  always 0          */
+    int len;                    /*!<  size(N) in chars  */
+
+    mpi N;                      /*!<  public modulus    */
+    mpi E;                      /*!<  public exponent   */
+
+    mpi D;                      /*!<  private exponent  */
+    mpi P;                      /*!<  1st prime factor  */
+    mpi Q;                      /*!<  2nd prime factor  */
+    mpi DP;                     /*!<  D % (P - 1)       */
+    mpi DQ;                     /*!<  D % (Q - 1)       */
+    mpi QP;                     /*!<  1 / (Q % P)       */
+
+    mpi RN;                     /*!<  cached R^2 mod N  */
+    mpi RP;                     /*!<  cached R^2 mod P  */
+    mpi RQ;                     /*!<  cached R^2 mod Q  */
+
+    int padding;                /*!<  1.5 or OAEP/PSS   */
+    int hash_id;                /*!<  hash identifier   */
+    int (*f_rng)(void *);       /*!<  RNG function      */
+    void *p_rng;                /*!<  RNG parameter     */
+}
+rsa_context;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Initialize an RSA context
+ *
+ * \param ctx      RSA context to be initialized
+ * \param padding  RSA_PKCS_V15 or RSA_PKCS_V21
+ * \param hash_id  RSA_PKCS_V21 hash identifier
+ * \param f_rng    RNG function
+ * \param p_rng    RNG parameter
+ *
+ * \note           The hash_id parameter is actually ignored
+ *                 when using RSA_PKCS_V15 padding.
+ *
+ * \note           Currently (xyssl-0.8), RSA_PKCS_V21 padding
+ *                 is not supported.
+ */
+void rsa_init( rsa_context *ctx,
+               int padding,
+               int hash_id,
+               int (*f_rng)(void *),
+               void *p_rng );
+
+/**
+ * \brief          Generate an RSA keypair
+ *
+ * \param ctx      RSA context that will hold the key
+ * \param nbits    size of the public key in bits
+ * \param exponent public exponent (e.g., 65537)
+ *
+ * \note           rsa_init() must be called beforehand to setup
+ *                 the RSA context (especially f_rng and p_rng).
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ */
+int rsa_gen_key( rsa_context *ctx, int nbits, int exponent );
+
+/**
+ * \brief          Check a public RSA key
+ *
+ * \param ctx      RSA context to be checked
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ */
+int rsa_check_pubkey( rsa_context *ctx );
+
+/**
+ * \brief          Check a private RSA key
+ *
+ * \param ctx      RSA context to be checked
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ */
+int rsa_check_privkey( rsa_context *ctx );
+
+/**
+ * \brief          Do an RSA public key operation
+ *
+ * \param ctx      RSA context
+ * \param input    input buffer
+ * \param output   output buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           This function does NOT take care of message
+ *                 padding. Also, be sure to set input[0] = 0.
+ *
+ * \note           The input and output buffers must be large
+ *                 enough (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_public( rsa_context *ctx,
+                unsigned char *input,
+                unsigned char *output );
+
+/**
+ * \brief          Do an RSA private key operation
+ *
+ * \param ctx      RSA context
+ * \param input    input buffer
+ * \param output   output buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The input and output buffers must be large
+ *                 enough (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_private( rsa_context *ctx,
+                 unsigned char *input,
+                 unsigned char *output );
+
+/**
+ * \brief          Add the message padding, then do an RSA operation
+ *
+ * \param ctx      RSA context
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param ilen     contains the the plaintext length
+ * \param input    buffer holding the data to be encrypted
+ * \param output   buffer that will hold the ciphertext
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The output buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_pkcs1_encrypt( rsa_context *ctx,
+                       int mode, int  ilen,
+                       unsigned char *input,
+                       unsigned char *output );
+
+/**
+ * \brief          Do an RSA operation, then remove the message padding
+ *
+ * \param ctx      RSA context
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param input    buffer holding the encrypted data
+ * \param output   buffer that will hold the plaintext
+ * \param olen     will contain the plaintext length
+ * \param output_max_len	maximum length of the output buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The output buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used) otherwise
+ *                 an error is thrown.
+ */
+int rsa_pkcs1_decrypt( rsa_context *ctx,
+                       int mode, int *olen,
+                       unsigned char *input,
+                       unsigned char *output,
+		       int output_max_len);
+
+/**
+ * \brief          Do a private RSA to sign a message digest
+ *
+ * \param ctx      RSA context
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param hash_id  RSA_RAW, RSA_MD{2,4,5} or RSA_SHA{1,256}
+ * \param hashlen  message digest length (for RSA_RAW only)
+ * \param hash     buffer holding the message digest
+ * \param sig      buffer that will hold the ciphertext
+ *
+ * \return         0 if the signing operation was successful,
+ *                 or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The "sig" buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_pkcs1_sign( rsa_context *ctx,
+                    int mode,
+                    int hash_id,
+                    int hashlen,
+                    unsigned char *hash,
+                    unsigned char *sig );
+
+/**
+ * \brief          Do a public RSA and check the message digest
+ *
+ * \param ctx      points to an RSA public key
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param hash_id  RSA_RAW, RSA_MD{2,4,5} or RSA_SHA{1,256}
+ * \param hashlen  message digest length (for RSA_RAW only)
+ * \param hash     buffer holding the message digest
+ * \param sig      buffer holding the ciphertext
+ *
+ * \return         0 if the verify operation was successful,
+ *                 or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The "sig" buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_pkcs1_verify( rsa_context *ctx,
+                      int mode,
+                      int hash_id,
+                      int hashlen,
+                      unsigned char *hash,
+                      unsigned char *sig );
+
+/**
+ * \brief          Free the components of an RSA key
+ */
+void rsa_free( rsa_context *ctx );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int rsa_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* rsa.h */
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/sha1.h b/trunk/package/luci/libs/px5g/src/polarssl/sha1.h
new file mode 100644
index 00000000..3ca7dc31
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/sha1.h
@@ -0,0 +1,150 @@
+/**
+ * \file sha1.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_SHA1_H
+#define POLARSSL_SHA1_H
+
+/**
+ * \brief          SHA-1 context structure
+ */
+typedef struct
+{
+    unsigned long total[2];     /*!< number of bytes processed  */
+    unsigned long state[5];     /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
+
+    unsigned char ipad[64];     /*!< HMAC: inner padding        */
+    unsigned char opad[64];     /*!< HMAC: outer padding        */
+}
+sha1_context;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          SHA-1 context setup
+ *
+ * \param ctx      context to be initialized
+ */
+void sha1_starts( sha1_context *ctx );
+
+/**
+ * \brief          SHA-1 process buffer
+ *
+ * \param ctx      SHA-1 context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha1_update( sha1_context *ctx, unsigned char *input, int ilen );
+
+/**
+ * \brief          SHA-1 final digest
+ *
+ * \param ctx      SHA-1 context
+ * \param output   SHA-1 checksum result
+ */
+void sha1_finish( sha1_context *ctx, unsigned char output[20] );
+
+/**
+ * \brief          Output = SHA-1( input buffer )
+ *
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   SHA-1 checksum result
+ */
+void sha1( unsigned char *input, int ilen, unsigned char output[20] );
+
+/**
+ * \brief          Output = SHA-1( file contents )
+ *
+ * \param path     input file name
+ * \param output   SHA-1 checksum result
+ *
+ * \return         0 if successful, 1 if fopen failed,
+ *                 or 2 if fread failed
+ */
+int sha1_file( char *path, unsigned char output[20] );
+
+/**
+ * \brief          SHA-1 HMAC context setup
+ *
+ * \param ctx      HMAC context to be initialized
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ */
+void sha1_hmac_starts( sha1_context *ctx, unsigned char *key, int keylen );
+
+/**
+ * \brief          SHA-1 HMAC process buffer
+ *
+ * \param ctx      HMAC context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha1_hmac_update( sha1_context *ctx, unsigned char *input, int ilen );
+
+/**
+ * \brief          SHA-1 HMAC final digest
+ *
+ * \param ctx      HMAC context
+ * \param output   SHA-1 HMAC checksum result
+ */
+void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] );
+
+/**
+ * \brief          Output = HMAC-SHA-1( hmac key, input buffer )
+ *
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   HMAC-SHA-1 result
+ */
+void sha1_hmac( unsigned char *key, int keylen,
+                unsigned char *input, int ilen,
+                unsigned char output[20] );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int sha1_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* sha1.h */
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/timing.h b/trunk/package/luci/libs/px5g/src/polarssl/timing.h
new file mode 100644
index 00000000..62d627f6
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/timing.h
@@ -0,0 +1,81 @@
+/**
+ * \file timing.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_TIMING_H
+#define POLARSSL_TIMING_H
+
+/**
+ * \brief          timer structure
+ */
+struct hr_time
+{
+    unsigned char opaque[32];
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int alarmed;
+
+/**
+ * \brief          Return the CPU cycle counter value
+ */
+unsigned long hardclock( void );
+
+/**
+ * \brief          Return the elapsed time in milliseconds
+ *
+ * \param val      points to a timer structure
+ * \param reset    if set to 1, the timer is restarted
+ */
+unsigned long get_timer( struct hr_time *val, int reset );
+
+/**
+ * \brief          Setup an alarm clock
+ *
+ * \param seconds  delay before the "alarmed" flag is set
+ */
+void set_alarm( int seconds );
+
+/**
+ * \brief          Sleep for a certain amount of time
+ */
+void m_sleep( int milliseconds );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* timing.h */
diff --git a/trunk/package/luci/libs/px5g/src/polarssl/x509.h b/trunk/package/luci/libs/px5g/src/polarssl/x509.h
new file mode 100644
index 00000000..908a1dbf
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/polarssl/x509.h
@@ -0,0 +1,549 @@
+/**
+ * \file x509.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_X509_H
+#define POLARSSL_X509_H
+
+#include "polarssl/rsa.h"
+
+#define POLARSSL_ERR_ASN1_OUT_OF_DATA                      -0x0014
+#define POLARSSL_ERR_ASN1_UNEXPECTED_TAG                   -0x0016
+#define POLARSSL_ERR_ASN1_INVALID_LENGTH                   -0x0018
+#define POLARSSL_ERR_ASN1_LENGTH_MISMATCH                  -0x001A
+#define POLARSSL_ERR_ASN1_INVALID_DATA                     -0x001C
+
+#define POLARSSL_ERR_X509_FEATURE_UNAVAILABLE              -0x0020
+#define POLARSSL_ERR_X509_CERT_INVALID_PEM                 -0x0040
+#define POLARSSL_ERR_X509_CERT_INVALID_FORMAT              -0x0060
+#define POLARSSL_ERR_X509_CERT_INVALID_VERSION             -0x0080
+#define POLARSSL_ERR_X509_CERT_INVALID_SERIAL              -0x00A0
+#define POLARSSL_ERR_X509_CERT_INVALID_ALG                 -0x00C0
+#define POLARSSL_ERR_X509_CERT_INVALID_NAME                -0x00E0
+#define POLARSSL_ERR_X509_CERT_INVALID_DATE                -0x0100
+#define POLARSSL_ERR_X509_CERT_INVALID_PUBKEY              -0x0120
+#define POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE           -0x0140
+#define POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS          -0x0160
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_VERSION             -0x0180
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG             -0x01A0
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_PK_ALG              -0x01C0
+#define POLARSSL_ERR_X509_CERT_SIG_MISMATCH                -0x01E0
+#define POLARSSL_ERR_X509_CERT_VERIFY_FAILED               -0x0200
+#define POLARSSL_ERR_X509_KEY_INVALID_PEM                  -0x0220
+#define POLARSSL_ERR_X509_KEY_INVALID_VERSION              -0x0240
+#define POLARSSL_ERR_X509_KEY_INVALID_FORMAT               -0x0260
+#define POLARSSL_ERR_X509_KEY_INVALID_ENC_IV               -0x0280
+#define POLARSSL_ERR_X509_KEY_UNKNOWN_ENC_ALG              -0x02A0
+#define POLARSSL_ERR_X509_KEY_PASSWORD_REQUIRED            -0x02C0
+#define POLARSSL_ERR_X509_KEY_PASSWORD_MISMATCH            -0x02E0
+#define POLARSSL_ERR_X509_POINT_ERROR                      -0x0300
+#define POLARSSL_ERR_X509_VALUE_TO_LENGTH                  -0x0320
+
+#define BADCERT_EXPIRED                 1
+#define BADCERT_REVOKED                 2
+#define BADCERT_CN_MISMATCH             4
+#define BADCERT_NOT_TRUSTED             8
+
+/*
+ * DER constants
+ */
+#define ASN1_BOOLEAN                 0x01
+#define ASN1_INTEGER                 0x02
+#define ASN1_BIT_STRING              0x03
+#define ASN1_OCTET_STRING            0x04
+#define ASN1_NULL                    0x05
+#define ASN1_OID                     0x06
+#define ASN1_UTF8_STRING             0x0C
+#define ASN1_SEQUENCE                0x10
+#define ASN1_SET                     0x11
+#define ASN1_PRINTABLE_STRING        0x13
+#define ASN1_T61_STRING              0x14
+#define ASN1_IA5_STRING              0x16
+#define ASN1_UTC_TIME                0x17
+#define ASN1_UNIVERSAL_STRING        0x1C
+#define ASN1_BMP_STRING              0x1E
+#define ASN1_PRIMITIVE               0x00
+#define ASN1_CONSTRUCTED             0x20
+#define ASN1_CONTEXT_SPECIFIC        0x80
+
+/*
+ * various object identifiers
+ */
+#define X520_COMMON_NAME                3
+#define X520_COUNTRY                    6
+#define X520_LOCALITY                   7
+#define X520_STATE                      8
+#define X520_ORGANIZATION              10
+#define X520_ORG_UNIT                  11
+#define PKCS9_EMAIL                     1
+
+#define X509_OUTPUT_DER              0x01
+#define X509_OUTPUT_PEM              0x02
+#define PEM_LINE_LENGTH                72
+#define X509_ISSUER                  0x01
+#define X509_SUBJECT                 0x02
+
+#define OID_X520                "\x55\x04"
+#define OID_CN                  "\x55\x04\x03"
+#define OID_PKCS1               "\x2A\x86\x48\x86\xF7\x0D\x01\x01"
+#define OID_PKCS1_RSA           "\x2A\x86\x48\x86\xF7\x0D\x01\x01\x01"
+#define OID_PKCS1_RSA_SHA       "\x2A\x86\x48\x86\xF7\x0D\x01\x01\x05"
+#define OID_PKCS9               "\x2A\x86\x48\x86\xF7\x0D\x01\x09"
+#define OID_PKCS9_EMAIL         "\x2A\x86\x48\x86\xF7\x0D\x01\x09\x01"
+
+/*
+ * Structures for parsing X.509 certificates
+ */
+typedef struct _x509_buf
+{
+    int tag;
+    int len;
+    unsigned char *p;
+}
+x509_buf;
+
+typedef struct _x509_name
+{
+    x509_buf oid;
+    x509_buf val;
+    struct _x509_name *next;
+}
+x509_name;
+
+typedef struct _x509_time
+{
+    int year, mon, day;
+    int hour, min, sec;
+}
+x509_time;
+
+typedef struct _x509_cert
+{
+    x509_buf raw;
+    x509_buf tbs;
+
+    int version;
+    x509_buf serial;
+    x509_buf sig_oid1;
+
+    x509_buf issuer_raw;
+    x509_buf subject_raw;
+
+    x509_name issuer;
+    x509_name subject;
+
+    x509_time valid_from;
+    x509_time valid_to;
+
+    x509_buf pk_oid;
+    rsa_context rsa;
+
+    x509_buf issuer_id;
+    x509_buf subject_id;
+    x509_buf v3_ext;
+
+    int ca_istrue;
+    int max_pathlen;
+
+    x509_buf sig_oid2;
+    x509_buf sig;
+
+    struct _x509_cert *next; 
+}
+x509_cert;
+
+/*
+ * Structures for writing X.509 certificates
+ */
+typedef struct _x509_node
+{
+    unsigned char *data;
+    unsigned char *p;
+    unsigned char *end;
+
+    size_t len;
+}
+x509_node;
+
+typedef struct _x509_raw
+{
+    x509_node raw;
+    x509_node tbs;
+
+    x509_node version;
+    x509_node serial;
+    x509_node tbs_signalg;
+    x509_node issuer;
+    x509_node validity;
+    x509_node subject;
+    x509_node subpubkey;
+
+    x509_node signalg;
+    x509_node sign;
+}
+x509_raw;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Parse one or more certificates and add them
+ *                 to the chained list
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the certificate data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_crt( x509_cert *crt, unsigned char *buf, int buflen );
+
+/**
+ * \brief          Load one or more certificates and add them
+ *                 to the chained list
+ *
+ * \param chain    points to the start of the chain
+ * \param path     filename to read the certificates from
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_crtfile( x509_cert *crt, char *path );
+
+/**
+ * \brief          Parse a private RSA key
+ *
+ * \param rsa      RSA context to be initialized
+ * \param buf      input buffer
+ * \param buflen   size of the buffer
+ * \param pwd      password for decryption (optional)
+ * \param pwdlen   size of the password
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_key( rsa_context *rsa,
+                   unsigned char *buf, int buflen,
+                   unsigned char *pwd, int pwdlen );
+
+/**
+ * \brief          Load and parse a private RSA key
+ *
+ * \param rsa      RSA context to be initialized
+ * \param path     filename to read the private key from
+ * \param pwd      password to decrypt the file (can be NULL)
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_keyfile( rsa_context *rsa, char *path, char *password );
+
+/**
+ * \brief          Store the certificate DN in printable form into buf;
+ *                 no more than (end - buf) characters will be written.
+ */
+int x509parse_dn_gets( char *buf, char *end, x509_name *dn );
+
+/**
+ * \brief          Returns an informational string about the
+ *                 certificate.
+ */
+char *x509parse_cert_info( char *prefix, x509_cert *crt );
+
+/**
+ * \brief          Return 0 if the certificate is still valid,
+ *                 or BADCERT_EXPIRED
+ */
+int x509parse_expired( x509_cert *crt );
+
+/**
+ * \brief          Verify the certificate signature
+ *
+ * \param crt      a certificate to be verified
+ * \param trust_ca the trusted CA chain
+ * \param cn       expected Common Name (can be set to
+ *                 NULL if the CN must not be verified)
+ * \param flags    result of the verification
+ *
+ * \return         0 if successful or POLARSSL_ERR_X509_SIG_VERIFY_FAILED,
+ *                 in which case *flags will have one or more of
+ *                 the following values set:
+ *                      BADCERT_EXPIRED --
+ *                      BADCERT_REVOKED --
+ *                      BADCERT_CN_MISMATCH --
+ *                      BADCERT_NOT_TRUSTED
+ *
+ * \note           TODO: add two arguments, depth and crl
+ */
+int x509parse_verify( x509_cert *crt,
+                      x509_cert *trust_ca,
+                      char *cn, int *flags );
+
+/**
+ * \brief          Unallocate all certificate data
+ */
+void x509_free( x509_cert *crt );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int x509_self_test( int verbose );
+
+/**
+ * \brief          Write a certificate info file
+ *
+ * \param chain    points to the raw certificate data
+ * \param path     filename to write the certificate to
+ * \param format   X509_OUTPUT_DER or X509_OUTPUT_PEM
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_crtfile( x509_raw *chain,
+                       unsigned char *path,
+                       int format );
+
+/**
+ * \brief          Write a certificate signing request message format file
+ *
+ * \param chain    points to the raw certificate (with x509write_create_csr) data
+ * \param path     filename to write the certificate to
+ * \param format   X509_OUTPUT_DER or X509_OUTPUT_PEM
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_csrfile( x509_raw *chain,
+                       unsigned char *path,
+                       int format );
+
+/*
+ * \brief          Write a private RSA key into a file
+ *
+ * \param rsa      points to an RSA key
+ * \param path     filename to write the key to
+ * \param format   X509_OUTPUT_DER or X509_OUTPUT_PEM
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_keyfile( rsa_context *rsa,
+                       char *path,
+                       int format );
+
+/**
+ * \brief          Add a public key to certificate
+ *
+ * \param chain    points to the raw certificate data
+ * \param pubkey   points to an RSA key
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_pubkey( x509_raw *chain, rsa_context *pubkey );
+
+/**
+ * \brief          Create x509 subject/issuer field to raw certificate
+ *                 from string or CA cert. Make string NULL if you will
+ *                 use the CA copy function or make CA NULL then used
+ *                 the string parse.
+ *
+ * \param chain    points to the raw certificate data
+ * \param names    a string that can hold (separete with ";"):
+ *                     CN=CommonName
+ *                 --   O=Organization
+ *                 --  OU=OrgUnit
+ *                 --  ST=State
+ *                 --   L=Locality
+ *                 --   R=Email
+ *                 --   C=Country
+ *                 . Make that NULL if you didn't need that.
+ * \param flag     flag is X509_ISSUER or X509_SUBJECT that defined
+ *                 where change
+ * \param ca       the certificate for copy data. Make that NULL if you
+ *                 didn't need that.
+ * \param ca_flag  set the ca field from copy to crt
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_customize ( x509_raw *crt, 
+                          unsigned char *names, 
+                          int flag, 
+                          x509_cert *ca, 
+                          int ca_flag );
+
+/**
+* \brief          Add x509 issuer field
+*
+* \param chain    points to the raw certificate data
+* \param issuer   a string holding (separete with ";"):
+*                     CN=CommonName
+*                 --   O=Organization
+*                 --  OU=OrgUnit
+*                 --  ST=State
+*                 --   L=Locality
+*                 --   R=Email
+*                 --   C=Country
+*                 . Set this to NULL if not needed.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_add_issuer( x509_raw *crt, unsigned char *issuer);
+
+/**
+ * \brief          Add x509 subject field
+ *
+ * \param chain    points to the raw certificate data
+ * \param subject  a string holding (separete with ";"):
+ *                     CN=CommonName
+ *                 --   O=Organization
+ *                 --  OU=OrgUnit
+ *                 --  ST=State
+ *                 --   L=Locality
+ *                 --   R=Email
+ *                 --   C=Country
+ *                 . Set this to NULL if not needed.
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_subject( x509_raw *crt, unsigned char *subject);
+
+/**
+* \brief          Copy x509 issuer field from another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose issuer is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_issuer(x509_raw *crt, x509_cert *from_crt);
+
+/**
+* \brief          Copy x509 subject field from another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose subject is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_subject(x509_raw *crt, x509_cert *from_crt);
+
+/**
+* \brief          Copy x509 issuer field from the subject of another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose subject is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_issuer_from_subject(x509_raw *crt, x509_cert *from_crt);
+
+/**
+* \brief          Copy x509 subject field from the issuer of another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose issuer is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_subject_from_issuer(x509_raw *crt, x509_cert *from_crt);
+
+/**
+ * \brief          Create x509 validity time in UTC
+ *
+ * \param chain    points to the raw certificate data
+ * \param before   valid not before in format YYYY-MM-DD hh:mm:ss
+ * \param after    valid not after  in format YYYY-MM-DD hh:mm:ss
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_validity( x509_raw *crt,
+                               unsigned char *before,
+                               unsigned char *after );
+
+/**
+ * \brief          Create a self-signed certificate
+ *
+ * \param chain    points to the raw certificate data
+ * \param rsa      a private key to sign the certificate
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_create_selfsign( x509_raw *crt, rsa_context *raw );
+
+/**
+ * \brief          Create a certificate
+ *
+ * \param chain    points to the raw certificate data
+ * \param rsa      a private key to sign the certificate
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_create_sign( x509_raw *crt, rsa_context *raw );
+
+/**
+ * \brief          Create a certificate signing request
+ *
+ * \param chain    points to the raw certificate data. Didn't use the
+ *                 same chain that u have use for certificate.
+ * \param privkey  a rsa private key
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_create_csr( x509_raw *chain, rsa_context *privkey );
+
+/**
+ * \brief           Serialize an rsa key into DER
+ *
+ * \param rsa       a rsa key for output
+ * \param node      a x509 node for write into
+ *
+ * \return          0 if successful, or a specific X509 error code
+ */
+int x509write_serialize_key( rsa_context *rsa, x509_node *node );
+
+/**
+ * \brief          Unallocate all raw certificate data
+ */
+void x509write_free_raw( x509_raw *crt );
+
+/**
+ * \brief          Allocate all raw certificate data
+ */
+void x509write_init_raw( x509_raw *crt );
+
+/**
+ * \brief          Unallocate all node certificate data
+ */
+void x509write_free_node( x509_node *crt_node );
+
+/**
+ * \brief          Allocate all node certificate data
+ */
+void x509write_init_node( x509_node *crt_node );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* x509.h */
diff --git a/trunk/package/luci/libs/px5g/src/px5g.c b/trunk/package/luci/libs/px5g/src/px5g.c
new file mode 100644
index 00000000..feecd012
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/px5g.c
@@ -0,0 +1,159 @@
+/*
+ * px5g - Embedded x509 key and certificate generator based on PolarSSL
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "px5g.h"
+#include <time.h>
+#include <string.h>
+#define VERSION 0.1
+
+static char *xfields[] = {"CN", "O", "C", "OU", "ST", "L", "R"};
+
+static int px5g_genkey(lua_State *L) {
+	int keysize = luaL_checkint(L, 1), pexp = luaL_optint(L, 2, 65537), ret;
+	px5g_rsa *px5g = lua_newuserdata(L, sizeof(px5g_rsa));
+	if (!px5g) {
+		return luaL_error(L, "out of memory");
+	}
+
+	px5g->stat = 1;
+	havege_init(&px5g->hs);
+	rsa_init(&px5g->rsa, RSA_PKCS_V15, 0, havege_rand, &px5g->hs);
+
+	if ((ret = rsa_gen_key(&px5g->rsa, keysize, pexp))) {
+		lua_pushnil(L);
+		lua_pushinteger(L, ret);
+		return 2;
+	}
+
+	luaL_getmetatable(L, PX5G_KEY_META);
+	lua_setmetatable(L, -2);
+	return 1;
+}
+
+static int px5g_rsa_asn1(lua_State *L) {
+	int ret;
+	px5g_rsa *px5g = luaL_checkudata(L, 1, PX5G_KEY_META);
+	x509_node node;
+
+	x509write_init_node(&node);
+	if ((ret = x509write_serialize_key(&px5g->rsa, &node))) {
+		x509write_free_node(&node);
+		lua_pushnil(L);
+		lua_pushinteger(L, ret);
+		return 2;
+	}
+
+	lua_pushlstring(L, (char*)node.data, node.len);
+	x509write_free_node(&node);
+	return 1;
+}
+
+static int px5g_rsa_create_selfsigned(lua_State *L) {
+	px5g_rsa *px5g = luaL_checkudata(L, 1, PX5G_KEY_META);
+	luaL_checktype(L, 2, LUA_TTABLE);
+	time_t from = (time_t)luaL_checknumber(L, 3);
+	time_t to = (time_t)luaL_checknumber(L, 4);
+	char fstr[20], tstr[20];
+
+	lua_pushliteral(L, "CN");
+	lua_rawget(L, 2);
+	luaL_argcheck(L, lua_isstring(L, -1), 2, "CN missing");
+	lua_pop(L, 1);
+
+	luaL_argcheck(L,
+		strftime(fstr, sizeof(fstr), "%F %H:%M:%S", gmtime(&from)),
+	3, "Invalid Time");
+
+	luaL_argcheck(L,
+		strftime(tstr, sizeof(tstr), "%F %H:%M:%S", gmtime(&to)),
+	4, "Invalid Time");
+
+	size_t join = 1;
+	lua_pushliteral(L, "");
+	for (int i = 0; i < (sizeof(xfields) / sizeof(*xfields)); i++) {
+		lua_pushstring(L, xfields[i]);
+		lua_rawget(L, 2);
+		if (lua_isstring(L, -1)) {
+			const char *val = lua_tostring(L, -1);
+			luaL_argcheck(L, !strchr(val, ';'), 2, "Invalid Value");
+			lua_pushfstring(L, "%s=%s;", xfields[i], val);
+			lua_remove(L, -2);
+			join++;
+		} else {
+			lua_pop(L, 1);
+		}
+	}
+	lua_concat(L, join);
+
+	x509_raw cert;
+	x509write_init_raw(&cert);
+	x509write_add_pubkey(&cert, &px5g->rsa);
+	x509write_add_subject(&cert, (unsigned char*)lua_tostring(L, -1));
+	x509write_add_validity(&cert, (unsigned char*)fstr, (unsigned char*)tstr);
+	x509write_create_selfsign(&cert, &px5g->rsa);
+
+	lua_pushlstring(L, (char*)cert.raw.data, cert.raw.len);
+	x509write_free_raw(&cert);
+	return 1;
+}
+
+static int px5g_rsa__gc(lua_State *L) {
+	px5g_rsa *px5g = luaL_checkudata(L, 1, PX5G_KEY_META);
+	if (px5g->stat) {
+		rsa_free(&px5g->rsa);
+		px5g->stat = 0;
+	}
+	return 0;
+}
+
+static int px5g_rsa__tostring(lua_State *L) {
+	px5g_rsa *px5g = luaL_checkudata(L, 1, PX5G_KEY_META);
+	lua_pushfstring(L, "px5g context %p", px5g);
+	return 1;
+}
+
+/* method table */
+static const luaL_reg M[] = {
+	{"asn1",				px5g_rsa_asn1},
+	{"create_selfsigned",	px5g_rsa_create_selfsigned},
+	{"__gc",				px5g_rsa__gc},
+	{"__tostring",			px5g_rsa__tostring},
+	{NULL,			NULL}
+};
+
+/* module table */
+static const luaL_reg R[] = {
+	{"genkey",		px5g_genkey},
+	{NULL,			NULL}
+};
+
+int luaopen_px5g(lua_State *L) {
+	/* register module */
+	luaL_register(L, "px5g", R);
+
+	/* Meta Table */
+	luaL_newmetatable(L, PX5G_KEY_META);
+	luaL_register(L, NULL, M);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+
+	lua_setfield(L, -2, "meta_key");
+	return 1;
+}
diff --git a/trunk/package/luci/libs/px5g/src/px5g.h b/trunk/package/luci/libs/px5g/src/px5g.h
new file mode 100644
index 00000000..47542b5c
--- /dev/null
+++ b/trunk/package/luci/libs/px5g/src/px5g.h
@@ -0,0 +1,16 @@
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+#include "polarssl/havege.h"
+#include "polarssl/bignum.h"
+#include "polarssl/x509.h"
+#include "polarssl/rsa.h"
+
+#define PX5G_KEY_META "px5g.key"
+
+typedef struct px5g_rsa {
+	int stat;
+	havege_state hs;
+	rsa_context rsa;
+} px5g_rsa;
diff --git a/trunk/package/luci/libs/rpcc/Makefile b/trunk/package/luci/libs/rpcc/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/libs/rpcc/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/libs/rpcc/luasrc/rpcc.lua b/trunk/package/luci/libs/rpcc/luasrc/rpcc.lua
new file mode 100644
index 00000000..ef94d3bb
--- /dev/null
+++ b/trunk/package/luci/libs/rpcc/luasrc/rpcc.lua
@@ -0,0 +1,84 @@
+--[[
+LuCIRPCc
+(c) 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local util = require "luci.util"
+local json = require "luci.json"
+local ltn12 = require "luci.ltn12"
+local nixio = require "nixio", require "nixio.util"
+
+local tostring, assert, setmetatable = tostring, assert, setmetatable
+local error = error
+
+--- LuCI RPC Client.
+-- @cstyle instance
+module "luci.rpcc"
+
+RQLIMIT = 32 * nixio.const.buffersize
+
+--- Create a new JSON-RPC stream client.
+-- @class function
+-- @param fd File descriptor
+-- @param v1 Use protocol version 1.0
+-- @return RPC Client
+Client = util.class()
+
+function Client.__init__(self, fd, v1)
+	self.fd = fd
+	self.uniqueid = tostring(self):match("0x([a-f0-9]+)")
+	self.msgid = 1
+	self.v1 = v1
+end
+
+--- Request an RP call and get the response.
+-- @param method Remote method
+-- @param params Parameters
+-- @param notification Notification only?
+-- @return response 
+function Client.request(self, method, params, notification)
+	local oldchunk = self.decoder and self.decoder.chunk
+	self.decoder = json.ActiveDecoder(self.fd:blocksource(nil, RQLIMIT))
+	self.decoder.chunk = oldchunk
+	
+	local reqid = self.msgid .. self.uniqueid
+	local reqdata = json.Encoder({
+		id = (not notification) and (self.msgid .. self.uniqueid) or nil,
+		jsonrpc = (not self.v1) and "2.0" or nil,
+		method = method,
+		params = params
+	})
+	ltn12.pump.all(reqdata:source(), self.fd:sink())
+	if not notification then
+		self.msgid = self.msgid + 1
+		local response = self.decoder:get()
+		assert(response.id == reqid, "Invalid response id")
+		if response.error then
+			error(response.error.message or response.error)
+		end
+		return response.result
+	end
+end
+
+--- Create a transparent RPC proxy.
+-- @param prefix Method prefix
+-- @return RPC Proxy object
+function Client.proxy(self, prefix)
+	prefix = prefix or ""
+	return setmetatable({}, {
+		__call = function(proxy, ...)
+			return self:request(prefix, {...})
+		end,
+		__index = function(proxy, name)
+			return self:proxy(prefix .. name .. ".")
+		end
+	})
+end
\ No newline at end of file
diff --git a/trunk/package/luci/libs/rpcc/luasrc/rpcc/ruci.lua b/trunk/package/luci/libs/rpcc/luasrc/rpcc/ruci.lua
new file mode 100644
index 00000000..05cb7280
--- /dev/null
+++ b/trunk/package/luci/libs/rpcc/luasrc/rpcc/ruci.lua
@@ -0,0 +1,63 @@
+--[[
+LuCIRPCc
+(c) 2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local util = require "luci.util"
+local rawget, setmetatable = rawget, setmetatable
+local ipairs = ipairs
+
+--- Transparent UCI over RPC client.
+-- @cstyle instance
+module "luci.rpcc.ruci"
+
+
+local Proxy = util.class()
+
+--- Create a new UCI over RPC proxy.
+-- @param rpccl RPC client
+-- @return Network transparent UCI module 
+function factory(rpccl)
+	return {
+		cursor = function(...)
+			return Proxy(rpccl, rpccl:request("ruci.cursor", {...}))
+		end,
+		cursor_state = function(...)
+			return Proxy(rpccl, rpccl:request("ruci.cursor_state", {...}))
+		end
+	}
+end
+
+function Proxy.__init__(self, rpccl, objid)
+	self.__rpccl = rpccl
+	self.__objid = objid
+
+	setmetatable(self, {
+		__index = function(self, key)
+			return rawget(self, key) or Proxy[key] or function(self, ...)
+				local argv = {self.__objid, ...}
+				return self.__rpccl:request("ruci."..key, argv)
+			end
+		end
+	})
+end
+
+function Proxy.foreach(self, config, section, callback)
+	local sections = self.__rpccl:request("ruci.foreach", {self.__objid, config, section})
+	if sections then
+		for _, s in ipairs(sections) do
+			callback(s)
+		end
+		return true
+	else
+		return false
+	end
+end
diff --git a/trunk/package/luci/modules/admin-full/Makefile b/trunk/package/luci/modules/admin-full/Makefile
new file mode 100644
index 00000000..819d13f3
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/Makefile
@@ -0,0 +1,24 @@
+include ../../build/config.mk
+include ../../build/module.mk
+include ../../build/gccconfig.mk
+
+BWC_LDFLAGS    = -ldl
+BWC_CFLAGS     =
+BWC_BIN        = luci-bwc
+BWC_OBJ        = src/luci-bwc.o
+
+%.o: %.c
+	$(COMPILE) $(BWC_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
+
+compile: build-clean $(BWC_OBJ)
+	$(LINK) -o src/$(BWC_BIN) $(BWC_OBJ) $(BWC_LDFLAGS)
+	mkdir -p dist/usr/bin
+	cp src/$(BWC_BIN) dist/usr/bin/$(BWC_BIN)
+
+install: build
+	cp -pR dist/usr/bin/$(BWC_BIN) /usr/bin/$(BWC_BIN)
+
+clean: build-clean
+
+build-clean:
+	rm -f src/*.o src/$(BWC_BIN)
diff --git a/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/bandwidth.svg b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/bandwidth.svg
new file mode 100644
index 00000000..4f914883
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/bandwidth.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
+
+	<polyline id="rx" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
+	<polyline id="tx" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+</svg>
diff --git a/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/connections.svg b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/connections.svg
new file mode 100644
index 00000000..816f7e6a
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/connections.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
+
+	<polyline id="tcp" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+	<polyline id="udp" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
+	<polyline id="other" points="" style="fill:red;fill-opacity:0.4;stroke:red;stroke-width:1" />
+</svg>
diff --git a/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/load.svg b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/load.svg
new file mode 100644
index 00000000..d6817027
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/load.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
+
+	<polyline id="load01" points="" style="fill:#ff0000;fill-opacity:0.4;stroke:#ff0000;stroke-width:1" />
+	<polyline id="load05" points="" style="fill:#ff6600;fill-opacity:0.4;stroke:#ff6600;stroke-width:1" />
+	<polyline id="load15" points="" style="fill:#ffaa00;fill-opacity:0.4;stroke:#ffaa00;stroke-width:1" />
+</svg>
diff --git a/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wifirate.svg b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wifirate.svg
new file mode 100644
index 00000000..d3e848b9
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wifirate.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
+
+	<polyline id="rate" points="" style="fill:green;fill-opacity:0.4;stroke:green;stroke-width:1" />
+</svg>
diff --git a/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wireless.svg b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wireless.svg
new file mode 100644
index 00000000..99d9840f
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/htdocs/luci-static/resources/wireless.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<line x1="0" y1="25%" x2="100%" y2="25%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_75" x="20" y="24%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="50%" x2="100%" y2="50%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_50" x="20" y="49%" style="fill:#999999; font-size:9pt"> </text>
+
+	<line x1="0" y1="75%" x2="100%" y2="75%" style="stroke:black;stroke-width:0.1" />
+	<text id="label_25" x="20" y="74%" style="fill:#999999; font-size:9pt"> </text>
+
+	<polyline id="rssi" points="" style="fill:blue;fill-opacity:0.4;stroke:blue;stroke-width:1" />
+	<polyline id="noise" points="" style="fill:red;fill-opacity:0.4;stroke:red;stroke-width:1" />
+</svg>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua
new file mode 100644
index 00000000..d83139fd
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua
@@ -0,0 +1,20 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.admin.filebrowser", package.seeall)
+
+function index()
+	entry( {"admin", "filebrowser"}, template("cbi/filebrowser") ).leaf = true
+end
diff --git a/trunk/package/luci/modules/admin-full/luasrc/controller/admin/index.lua b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/index.lua
new file mode 100644
index 00000000..4e832529
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/index.lua
@@ -0,0 +1,49 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.admin.index", package.seeall)
+
+function index()
+	local root = node()
+	if not root.target then
+		root.target = alias("admin")
+		root.index = true
+	end
+
+	local page   = node("admin")
+	page.target  = firstchild()
+	page.title   = _("Administration")
+	page.order   = 10
+	page.sysauth = "root"
+	page.sysauth_authenticator = "htmlauth"
+	page.ucidata = true
+	page.index = true
+
+	-- Empty services menu to be populated by addons
+	entry({"admin", "services"}, firstchild(), _("Services"), 40).index = true
+
+	entry({"admin", "logout"}, call("action_logout"), _("Logout"), 90)
+end
+
+function action_logout()
+	local dsp = require "luci.dispatcher"
+	local sauth = require "luci.sauth"
+	if dsp.context.authsession then
+		sauth.kill(dsp.context.authsession)
+		dsp.context.urltoken.stok = nil
+	end
+
+	luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url())
+	luci.http.redirect(luci.dispatcher.build_url())
+end
diff --git a/trunk/package/luci/modules/admin-full/luasrc/controller/admin/network.lua b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/network.lua
new file mode 100644
index 00000000..f574239c
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/network.lua
@@ -0,0 +1,465 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.admin.network", package.seeall)
+
+function index()
+	local uci = require("luci.model.uci").cursor()
+	local page
+
+	page = node("admin", "network")
+	page.target = firstchild()
+	page.title  = _("Network")
+	page.order  = 50
+	page.index  = true
+
+--	if page.inreq then
+		local has_switch = false
+
+		uci:foreach("network", "switch",
+			function(s)
+				has_switch = true
+				return false
+			end)
+
+		if has_switch then
+			page  = node("admin", "network", "vlan")
+			page.target = cbi("admin_network/vlan")
+			page.title  = _("Switch")
+			page.order  = 20
+
+			page = entry({"admin", "network", "switch_status"}, call("switch_status"), nil)
+			page.leaf = true
+		end
+
+
+		local has_wifi = false
+
+		uci:foreach("wireless", "wifi-device",
+			function(s)
+				has_wifi = true
+				return false
+			end)
+
+		if has_wifi then
+			page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_reconnect"}, call("wifi_reconnect"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_shutdown"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
+			page.leaf = true
+			page.subindex = true
+
+			if page.inreq then
+				local wdev
+				local net = require "luci.model.network".init(uci)
+				for _, wdev in ipairs(net:get_wifidevs()) do
+					local wnet
+					for _, wnet in ipairs(wdev:get_wifinets()) do
+						entry(
+							{"admin", "network", "wireless", wnet:id()},
+							alias("admin", "network", "wireless"),
+							wdev:name() .. ": " .. wnet:shortname()
+						)
+					end
+				end
+			end
+		end
+
+
+		page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "iface_reconnect"}, call("iface_reconnect"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10)
+		page.leaf   = true
+		page.subindex = true
+
+		if page.inreq then
+			uci:foreach("network", "interface",
+				function (section)
+					local ifc = section[".name"]
+					if ifc ~= "loopback" then
+						entry({"admin", "network", "network", ifc},
+						true, ifc:upper())
+					end
+				end)
+		end
+
+
+		if nixio.fs.access("/etc/config/dhcp") then
+			page = node("admin", "network", "dhcp")
+			page.target = cbi("admin_network/dhcp")
+			page.title  = _("DHCP and DNS")
+			page.order  = 30
+
+			page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
+			page.leaf = true
+
+			page = node("admin", "network", "hosts")
+			page.target = cbi("admin_network/hosts")
+			page.title  = _("Hostnames")
+			page.order  = 40
+		end
+
+		page  = node("admin", "network", "routes")
+		page.target = cbi("admin_network/routes")
+		page.title  = _("Static Routes")
+		page.order  = 50
+
+		page = node("admin", "network", "diagnostics")
+		page.target = template("admin_network/diagnostics")
+		page.title  = _("Diagnostics")
+		page.order  = 60
+
+		page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "diag_ping6"}, call("diag_ping6"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "diag_traceroute6"}, call("diag_traceroute6"), nil)
+		page.leaf = true
+--	end
+end
+
+function wifi_join()
+	local function param(x)
+		return luci.http.formvalue(x)
+	end
+
+	local function ptable(x)
+		x = param(x)
+		return x and (type(x) ~= "table" and { x } or x) or {}
+	end
+
+	local dev  = param("device")
+	local ssid = param("join")
+
+	if dev and ssid then
+		local cancel  = (param("cancel") or param("cbi.cancel")) and true or false
+
+		if cancel then
+			luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev))
+		else
+			local cbi = require "luci.cbi"
+			local tpl = require "luci.template"
+			local map = luci.cbi.load("admin_network/wifi_add")[1]
+
+			if map:parse() ~= cbi.FORM_DONE then
+				tpl.render("header")
+				map:render()
+				tpl.render("footer")
+			end
+		end
+	else
+		luci.template.render("admin_network/wifi_join")
+	end
+end
+
+function wifi_add()
+	local dev = luci.http.formvalue("device")
+	local ntm = require "luci.model.network".init()
+
+	dev = dev and ntm:get_wifidev(dev)
+
+	if dev then
+		local net = dev:add_wifinet({
+			mode       = "ap",
+			ssid       = "libreCMC",
+			encryption = "none"
+		})
+
+		ntm:save("wireless")
+		luci.http.redirect(net:adminlink())
+	end
+end
+
+function wifi_delete(network)
+	local ntm = require "luci.model.network".init()
+	local wnet = ntm:get_wifinet(network)
+	if wnet then
+		local dev = wnet:get_device()
+		local nets = wnet:get_networks()
+		if dev then
+			ntm:del_wifinet(network)
+			ntm:commit("wireless")
+			local _, net
+			for _, net in ipairs(nets) do
+				if net:is_empty() then
+					ntm:del_network(net:name())
+					ntm:commit("network")
+				end
+			end
+			luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
+		end
+	end
+
+	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+end
+
+function iface_status(ifaces)
+	local netm = require "luci.model.network".init()
+	local rv   = { }
+
+	local iface
+	for iface in ifaces:gmatch("[%w%.%-_]+") do
+		local net = netm:get_network(iface)
+		local device = net and net:get_interface()
+		if device then
+			local data = {
+				id         = iface,
+				proto      = net:proto(),
+				uptime     = net:uptime(),
+				gwaddr     = net:gwaddr(),
+				dnsaddrs   = net:dnsaddrs(),
+				name       = device:shortname(),
+				type       = device:type(),
+				ifname     = device:name(),
+				macaddr    = device:mac(),
+				is_up      = device:is_up(),
+				rx_bytes   = device:rx_bytes(),
+				tx_bytes   = device:tx_bytes(),
+				rx_packets = device:rx_packets(),
+				tx_packets = device:tx_packets(),
+
+				ipaddrs    = { },
+				ip6addrs   = { },
+				subdevices = { }
+			}
+
+			local _, a
+			for _, a in ipairs(device:ipaddrs()) do
+				data.ipaddrs[#data.ipaddrs+1] = {
+					addr      = a:host():string(),
+					netmask   = a:mask():string(),
+					prefix    = a:prefix()
+				}
+			end
+			for _, a in ipairs(device:ip6addrs()) do
+				if not a:is6linklocal() then
+					data.ip6addrs[#data.ip6addrs+1] = {
+						addr      = a:host():string(),
+						netmask   = a:mask():string(),
+						prefix    = a:prefix()
+					}
+				end
+			end
+
+			for _, device in ipairs(net:get_interfaces() or {}) do
+				data.subdevices[#data.subdevices+1] = {
+					name       = device:shortname(),
+					type       = device:type(),
+					ifname     = device:name(),
+					macaddr    = device:mac(),
+					macaddr    = device:mac(),
+					is_up      = device:is_up(),
+					rx_bytes   = device:rx_bytes(),
+					tx_bytes   = device:tx_bytes(),
+					rx_packets = device:rx_packets(),
+					tx_packets = device:tx_packets(),
+				}
+			end
+
+			rv[#rv+1] = data
+		else
+			rv[#rv+1] = {
+				id   = iface,
+				name = iface,
+				type = "ethernet"
+			}
+		end
+	end
+
+	if #rv > 0 then
+		luci.http.prepare_content("application/json")
+		luci.http.write_json(rv)
+		return
+	end
+
+	luci.http.status(404, "No such device")
+end
+
+function iface_reconnect(iface)
+	local netmd = require "luci.model.network".init()
+	local net = netmd:get_network(iface)
+	if net then
+		luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
+		luci.http.status(200, "Reconnected")
+		return
+	end
+
+	luci.http.status(404, "No such interface")
+end
+
+function iface_shutdown(iface)
+	local netmd = require "luci.model.network".init()
+	local net = netmd:get_network(iface)
+	if net then
+		luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+		luci.http.status(200, "Shutdown")
+		return
+	end
+
+	luci.http.status(404, "No such interface")
+end
+
+function iface_delete(iface)
+	local netmd = require "luci.model.network".init()
+	local net = netmd:del_network(iface)
+	if net then
+		luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+		luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
+		netmd:commit("network")
+		netmd:commit("wireless")
+		return
+	end
+
+	luci.http.status(404, "No such interface")
+end
+
+function wifi_status(devs)
+	local s    = require "luci.tools.status"
+	local rv   = { }
+
+	local dev
+	for dev in devs:gmatch("[%w%.%-]+") do
+		rv[#rv+1] = s.wifi_network(dev)
+	end
+
+	if #rv > 0 then
+		luci.http.prepare_content("application/json")
+		luci.http.write_json(rv)
+		return
+	end
+
+	luci.http.status(404, "No such device")
+end
+
+local function wifi_reconnect_shutdown(shutdown, wnet)
+	local netmd = require "luci.model.network".init()
+	local net = netmd:get_wifinet(wnet)
+	local dev = net:get_device()
+	if dev and net then
+		dev:set("disabled", nil)
+		net:set("disabled", shutdown and 1 or nil)
+		netmd:commit("wireless")
+
+		luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
+		luci.http.status(200, shutdown and "Shutdown" or "Reconnected")
+
+		return
+	end
+
+	luci.http.status(404, "No such radio")
+end
+
+function wifi_reconnect(wnet)
+	wifi_reconnect_shutdown(false, wnet)
+end
+
+function wifi_shutdown(wnet)
+	wifi_reconnect_shutdown(true, wnet)
+end
+
+function lease_status()
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write('[')
+	luci.http.write_json(s.dhcp_leases())
+	luci.http.write(',')
+	luci.http.write_json(s.dhcp6_leases())
+	luci.http.write(']')
+end
+
+function switch_status(switches)
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(s.switch_status(switches))
+end
+
+function diag_command(cmd, addr)
+	if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
+		luci.http.prepare_content("text/plain")
+
+		local util = io.popen(cmd % addr)
+		if util then
+			while true do
+				local ln = util:read("*l")
+				if not ln then break end
+				luci.http.write(ln)
+				luci.http.write("\n")
+			end
+
+			util:close()
+		end
+
+		return
+	end
+
+	luci.http.status(500, "Bad address")
+end
+
+function diag_ping(addr)
+	diag_command("ping -c 5 -W 1 %q 2>&1", addr)
+end
+
+function diag_traceroute(addr)
+	diag_command("traceroute -q 1 -w 1 -n %q 2>&1", addr)
+end
+
+function diag_nslookup(addr)
+	diag_command("nslookup %q 2>&1", addr)
+end
+
+function diag_ping6(addr)
+	diag_command("ping6 -c 5 %q 2>&1", addr)
+end
+
+function diag_traceroute6(addr)
+	diag_command("traceroute6 -q 1 -w 2 -n %q 2>&1", addr)
+end
diff --git a/trunk/package/luci/modules/admin-full/luasrc/controller/admin/status.lua b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/status.lua
new file mode 100644
index 00000000..89ebda73
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/status.lua
@@ -0,0 +1,164 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.admin.status", package.seeall)
+
+function index()
+	entry({"admin", "status"}, alias("admin", "status", "overview"), _("Status"), 20).index = true
+	entry({"admin", "status", "overview"}, template("admin_status/index"), _("Overview"), 1)
+	entry({"admin", "status", "iptables"}, call("action_iptables"), _("Firewall"), 2).leaf = true
+	entry({"admin", "status", "routes"}, template("admin_status/routes"), _("Routes"), 3)
+	entry({"admin", "status", "syslog"}, call("action_syslog"), _("System Log"), 4)
+	entry({"admin", "status", "dmesg"}, call("action_dmesg"), _("Kernel Log"), 5)
+	entry({"admin", "status", "processes"}, cbi("admin_status/processes"), _("Processes"), 6)
+
+	entry({"admin", "status", "realtime"}, alias("admin", "status", "realtime", "load"), _("Realtime Graphs"), 7)
+
+	entry({"admin", "status", "realtime", "load"}, template("admin_status/load"), _("Load"), 1).leaf = true
+	entry({"admin", "status", "realtime", "load_status"}, call("action_load")).leaf = true
+
+	entry({"admin", "status", "realtime", "bandwidth"}, template("admin_status/bandwidth"), _("Traffic"), 2).leaf = true
+	entry({"admin", "status", "realtime", "bandwidth_status"}, call("action_bandwidth")).leaf = true
+
+	entry({"admin", "status", "realtime", "wireless"}, template("admin_status/wireless"), _("Wireless"), 3).leaf = true
+	entry({"admin", "status", "realtime", "wireless_status"}, call("action_wireless")).leaf = true
+
+	entry({"admin", "status", "realtime", "connections"}, template("admin_status/connections"), _("Connections"), 4).leaf = true
+	entry({"admin", "status", "realtime", "connections_status"}, call("action_connections")).leaf = true
+
+	entry({"admin", "status", "nameinfo"}, call("action_nameinfo")).leaf = true
+end
+
+function action_syslog()
+	local syslog = luci.sys.syslog()
+	luci.template.render("admin_status/syslog", {syslog=syslog})
+end
+
+function action_dmesg()
+	local dmesg = luci.sys.dmesg()
+	luci.template.render("admin_status/dmesg", {dmesg=dmesg})
+end
+
+function action_iptables()
+	if luci.http.formvalue("zero") then
+		if luci.http.formvalue("zero") == "6" then
+			luci.util.exec("ip6tables -Z")
+		else
+			luci.util.exec("iptables -Z")
+		end
+		luci.http.redirect(
+			luci.dispatcher.build_url("admin", "status", "iptables")
+		)
+	elseif luci.http.formvalue("restart") == "1" then
+		luci.util.exec("/etc/init.d/firewall reload")
+		luci.http.redirect(
+			luci.dispatcher.build_url("admin", "status", "iptables")
+		)
+	else
+		luci.template.render("admin_status/iptables")
+	end
+end
+
+function action_bandwidth(iface)
+	luci.http.prepare_content("application/json")
+
+	local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
+	if bwc then
+		luci.http.write("[")
+
+		while true do
+			local ln = bwc:read("*l")
+			if not ln then break end
+			luci.http.write(ln)
+		end
+
+		luci.http.write("]")
+		bwc:close()
+	end
+end
+
+function action_wireless(iface)
+	luci.http.prepare_content("application/json")
+
+	local bwc = io.popen("luci-bwc -r %q 2>/dev/null" % iface)
+	if bwc then
+		luci.http.write("[")
+
+		while true do
+			local ln = bwc:read("*l")
+			if not ln then break end
+			luci.http.write(ln)
+		end
+
+		luci.http.write("]")
+		bwc:close()
+	end
+end
+
+function action_load()
+	luci.http.prepare_content("application/json")
+
+	local bwc = io.popen("luci-bwc -l 2>/dev/null")
+	if bwc then
+		luci.http.write("[")
+
+		while true do
+			local ln = bwc:read("*l")
+			if not ln then break end
+			luci.http.write(ln)
+		end
+
+		luci.http.write("]")
+		bwc:close()
+	end
+end
+
+function action_connections()
+	local sys = require "luci.sys"
+
+	luci.http.prepare_content("application/json")
+
+	luci.http.write("{ connections: ")
+	luci.http.write_json(sys.net.conntrack())
+
+	local bwc = io.popen("luci-bwc -c 2>/dev/null")
+	if bwc then
+		luci.http.write(", statistics: [")
+
+		while true do
+			local ln = bwc:read("*l")
+			if not ln then break end
+			luci.http.write(ln)
+		end
+
+		luci.http.write("]")
+		bwc:close()
+	end
+
+	luci.http.write(" }")
+end
+
+function action_nameinfo(...)
+	local i
+	local rv = { }
+	for i = 1, select('#', ...) do
+		local addr = select(i, ...)
+		local fqdn = nixio.getnameinfo(addr)
+		rv[addr] = fqdn or (addr:match(":") and "[%s]" % addr or addr)
+	end
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+end
diff --git a/trunk/package/luci/modules/admin-full/luasrc/controller/admin/system.lua b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/system.lua
new file mode 100644
index 00000000..5fa4c3a3
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/system.lua
@@ -0,0 +1,393 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.admin.system", package.seeall)
+
+function index()
+	entry({"admin", "system"}, alias("admin", "system", "system"), _("System"), 30).index = true
+	entry({"admin", "system", "system"}, cbi("admin_system/system"), _("System"), 1)
+	entry({"admin", "system", "clock_status"}, call("action_clock_status"))
+
+	entry({"admin", "system", "admin"}, cbi("admin_system/admin"), _("Administration"), 2)
+
+	if nixio.fs.access("/bin/opkg") then
+		entry({"admin", "system", "packages"}, call("action_packages"), _("Software"), 10)
+		entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"))
+	end
+
+	entry({"admin", "system", "startup"}, form("admin_system/startup"), _("Startup"), 45)
+	entry({"admin", "system", "crontab"}, form("admin_system/crontab"), _("Scheduled Tasks"), 46)
+
+	if nixio.fs.access("/etc/config/fstab") then
+		entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), _("Mount Points"), 50)
+		entry({"admin", "system", "fstab", "mount"}, cbi("admin_system/fstab/mount"), nil).leaf = true
+		entry({"admin", "system", "fstab", "swap"},  cbi("admin_system/fstab/swap"),  nil).leaf = true
+	end
+
+	if nixio.fs.access("/sys/class/leds") then
+		entry({"admin", "system", "leds"}, cbi("admin_system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
+	end
+
+	entry({"admin", "system", "flashops"}, call("action_flashops"), _("Backup / Flash Firmware"), 70)
+	entry({"admin", "system", "flashops", "backupfiles"}, form("admin_system/backupfiles"))
+
+	entry({"admin", "system", "reboot"}, call("action_reboot"), _("Reboot"), 90)
+end
+
+function action_clock_status()
+	local set = tonumber(luci.http.formvalue("set"))
+	if set ~= nil and set > 0 then
+		local date = os.date("*t", set)
+		if date then
+			luci.sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d'" %{
+				date.year, date.month, date.day, date.hour, date.min, date.sec
+			})
+		end
+	end
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json({ timestring = os.date("%c") })
+end
+
+function action_packages()
+	local ipkg = require("luci.model.ipkg")
+	local submit = luci.http.formvalue("submit")
+	local changes = false
+	local install = { }
+	local remove  = { }
+	local stdout  = { "" }
+	local stderr  = { "" }
+	local out, err
+
+	-- Display
+	local display = luci.http.formvalue("display") or "installed"
+
+	-- Letter
+	local letter = string.byte(luci.http.formvalue("letter") or "A", 1)
+	letter = (letter == 35 or (letter >= 65 and letter <= 90)) and letter or 65
+
+	-- Search query
+	local query = luci.http.formvalue("query")
+	query = (query ~= '') and query or nil
+
+
+	-- Packets to be installed
+	local ninst = submit and luci.http.formvalue("install")
+	local uinst = nil
+
+	-- Install from URL
+	local url = luci.http.formvalue("url")
+	if url and url ~= '' and submit then
+		uinst = url
+	end
+
+	-- Do install
+	if ninst then
+		install[ninst], out, err = ipkg.install(ninst)
+		stdout[#stdout+1] = out
+		stderr[#stderr+1] = err
+		changes = true
+	end
+
+	if uinst then
+		local pkg
+		for pkg in luci.util.imatch(uinst) do
+			install[uinst], out, err = ipkg.install(pkg)
+			stdout[#stdout+1] = out
+			stderr[#stderr+1] = err
+			changes = true
+		end
+	end
+
+	-- Remove packets
+	local rem = submit and luci.http.formvalue("remove")
+	if rem then
+		remove[rem], out, err = ipkg.remove(rem)
+		stdout[#stdout+1] = out
+		stderr[#stderr+1] = err
+		changes = true
+	end
+
+
+	-- Update all packets
+	local update = luci.http.formvalue("update")
+	if update then
+		update, out, err = ipkg.update()
+		stdout[#stdout+1] = out
+		stderr[#stderr+1] = err
+	end
+
+
+	-- Upgrade all packets
+	local upgrade = luci.http.formvalue("upgrade")
+	if upgrade then
+		upgrade, out, err = ipkg.upgrade()
+		stdout[#stdout+1] = out
+		stderr[#stderr+1] = err
+	end
+
+
+	-- List state
+	local no_lists = true
+	local old_lists = false
+	local tmp = nixio.fs.dir("/var/opkg-lists/")
+	if tmp then
+		for tmp in tmp do
+			no_lists = false
+			tmp = nixio.fs.stat("/var/opkg-lists/"..tmp)
+			if tmp and tmp.mtime < (os.time() - (24 * 60 * 60)) then
+				old_lists = true
+				break
+			end
+		end
+	end
+
+
+	luci.template.render("admin_system/packages", {
+		display   = display,
+		letter    = letter,
+		query     = query,
+		install   = install,
+		remove    = remove,
+		update    = update,
+		upgrade   = upgrade,
+		no_lists  = no_lists,
+		old_lists = old_lists,
+		stdout    = table.concat(stdout, ""),
+		stderr    = table.concat(stderr, "")
+	})
+
+	-- Remove index cache
+	if changes then
+		nixio.fs.unlink("/tmp/luci-indexcache")
+	end
+end
+
+function action_flashops()
+	local sys = require "luci.sys"
+	local fs  = require "luci.fs"
+
+	local upgrade_avail = nixio.fs.access("/lib/upgrade/platform.sh")
+	local reset_avail   = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
+
+	local restore_cmd = "tar -xzC/ >/dev/null 2>&1"
+	local backup_cmd  = "sysupgrade --create-backup - 2>/dev/null"
+	local image_tmp   = "/tmp/firmware.img"
+
+	local function image_supported()
+		-- XXX: yay...
+		return ( 0 == os.execute(
+			". /lib/functions.sh; " ..
+			"include /lib/upgrade; " ..
+			"platform_check_image %q >/dev/null"
+				% image_tmp
+		) )
+	end
+
+	local function image_checksum()
+		return (luci.sys.exec("md5sum %q" % image_tmp):match("^([^%s]+)"))
+	end
+
+	local function storage_size()
+		local size = 0
+		if nixio.fs.access("/proc/mtd") then
+			for l in io.lines("/proc/mtd") do
+				local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
+				if n == "linux" or n == "firmware" then
+					size = tonumber(s, 16)
+					break
+				end
+			end
+		elseif nixio.fs.access("/proc/partitions") then
+			for l in io.lines("/proc/partitions") do
+				local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
+				if b and n and not n:match('[0-9]') then
+					size = tonumber(b) * 1024
+					break
+				end
+			end
+		end
+		return size
+	end
+
+
+	local fp
+	luci.http.setfilehandler(
+		function(meta, chunk, eof)
+			if not fp then
+				if meta and meta.name == "image" then
+					fp = io.open(image_tmp, "w")
+				else
+					fp = io.popen(restore_cmd, "w")
+				end
+			end
+			if chunk then
+				fp:write(chunk)
+			end
+			if eof then
+				fp:close()
+			end
+		end
+	)
+
+	if luci.http.formvalue("backup") then
+		--
+		-- Assemble file list, generate backup
+		--
+		local reader = ltn12_popen(backup_cmd)
+		luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
+			luci.sys.hostname(), os.date("%Y-%m-%d")})
+		luci.http.prepare_content("application/x-targz")
+		luci.ltn12.pump.all(reader, luci.http.write)
+	elseif luci.http.formvalue("restore") then
+		--
+		-- Unpack received .tar.gz
+		--
+		local upload = luci.http.formvalue("archive")
+		if upload and #upload > 0 then
+			luci.template.render("admin_system/applyreboot")
+			luci.sys.reboot()
+		end
+	elseif luci.http.formvalue("image") or luci.http.formvalue("step") then
+		--
+		-- Initiate firmware flash
+		--
+		local step = tonumber(luci.http.formvalue("step") or 1)
+		if step == 1 then
+			if image_supported() then
+				luci.template.render("admin_system/upgrade", {
+					checksum = image_checksum(),
+					storage  = storage_size(),
+					size     = nixio.fs.stat(image_tmp).size,
+					keep     = (not not luci.http.formvalue("keep"))
+				})
+			else
+				nixio.fs.unlink(image_tmp)
+				luci.template.render("admin_system/flashops", {
+					reset_avail   = reset_avail,
+					upgrade_avail = upgrade_avail,
+					image_invalid = true
+				})
+			end
+		--
+		-- Start sysupgrade flash
+		--
+		elseif step == 2 then
+			local keep = (luci.http.formvalue("keep") == "1") and "" or "-n"
+			luci.template.render("admin_system/applyreboot", {
+				title = luci.i18n.translate("Flashing..."),
+				msg   = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
+				addr  = (#keep > 0) and "192.168.1.1" or nil
+			})
+			fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
+		end
+	elseif reset_avail and luci.http.formvalue("reset") then
+		--
+		-- Reset system
+		--
+		luci.template.render("admin_system/applyreboot", {
+			title = luci.i18n.translate("Erasing..."),
+			msg   = luci.i18n.translate("The system is erasing the configuration partition now and will reboot itself when finished."),
+			addr  = "192.168.1.1"
+		})
+		fork_exec("killall dropbear uhttpd; sleep 1; mtd -r erase rootfs_data")
+	else
+		--
+		-- Overview
+		--
+		luci.template.render("admin_system/flashops", {
+			reset_avail   = reset_avail,
+			upgrade_avail = upgrade_avail
+		})
+	end
+end
+
+function action_passwd()
+	local p1 = luci.http.formvalue("pwd1")
+	local p2 = luci.http.formvalue("pwd2")
+	local stat = nil
+
+	if p1 or p2 then
+		if p1 == p2 then
+			stat = luci.sys.user.setpasswd("root", p1)
+		else
+			stat = 10
+		end
+	end
+
+	luci.template.render("admin_system/passwd", {stat=stat})
+end
+
+function action_reboot()
+	local reboot = luci.http.formvalue("reboot")
+	luci.template.render("admin_system/reboot", {reboot=reboot})
+	if reboot then
+		luci.sys.reboot()
+	end
+end
+
+function fork_exec(command)
+	local pid = nixio.fork()
+	if pid > 0 then
+		return
+	elseif pid == 0 then
+		-- change to root dir
+		nixio.chdir("/")
+
+		-- patch stdin, out, err to /dev/null
+		local null = nixio.open("/dev/null", "w+")
+		if null then
+			nixio.dup(null, nixio.stderr)
+			nixio.dup(null, nixio.stdout)
+			nixio.dup(null, nixio.stdin)
+			if null:fileno() > 2 then
+				null:close()
+			end
+		end
+
+		-- replace with target command
+		nixio.exec("/bin/sh", "-c", command)
+	end
+end
+
+function ltn12_popen(command)
+
+	local fdi, fdo = nixio.pipe()
+	local pid = nixio.fork()
+
+	if pid > 0 then
+		fdo:close()
+		local close
+		return function()
+			local buffer = fdi:read(2048)
+			local wpid, stat = nixio.waitpid(pid, "nohang")
+			if not close and wpid and stat == "exited" then
+				close = true
+			end
+
+			if buffer and #buffer > 0 then
+				return buffer
+			elseif close then
+				fdi:close()
+				return nil
+			end
+		end
+	elseif pid == 0 then
+		nixio.dup(fdo, nixio.stdout)
+		fdi:close()
+		fdo:close()
+		nixio.exec("/bin/sh", "-c", command)
+	end
+end
diff --git a/trunk/package/luci/modules/admin-full/luasrc/controller/admin/uci.lua b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/uci.lua
new file mode 100644
index 00000000..34e40ee6
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/controller/admin/uci.lua
@@ -0,0 +1,75 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.admin.uci", package.seeall)
+
+function index()
+	local redir = luci.http.formvalue("redir", true) or
+	  luci.dispatcher.build_url(unpack(luci.dispatcher.context.request))
+
+	entry({"admin", "uci"}, nil, _("Configuration"))
+	entry({"admin", "uci", "changes"}, call("action_changes"), _("Changes"), 40).query = {redir=redir}
+	entry({"admin", "uci", "revert"}, call("action_revert"), _("Revert"), 30).query = {redir=redir}
+	entry({"admin", "uci", "apply"}, call("action_apply"), _("Apply"), 20).query = {redir=redir}
+	entry({"admin", "uci", "saveapply"}, call("action_apply"), _("Save &#38; Apply"), 10).query = {redir=redir}
+end
+
+function action_changes()
+	local uci = luci.model.uci.cursor()
+	local changes = uci:changes()
+
+	luci.template.render("admin_uci/changes", {
+		changes = next(changes) and changes
+	})
+end
+
+function action_apply()
+	local path = luci.dispatcher.context.path
+	local uci = luci.model.uci.cursor()
+	local changes = uci:changes()
+	local reload = {}
+
+	-- Collect files to be applied and commit changes
+	for r, tbl in pairs(changes) do
+		table.insert(reload, r)
+		if path[#path] ~= "apply" then
+			uci:load(r)
+			uci:commit(r)
+			uci:unload(r)
+		end
+	end
+
+	luci.template.render("admin_uci/apply", {
+		changes = next(changes) and changes,
+		configs = reload
+	})
+end
+
+
+function action_revert()
+	local uci = luci.model.uci.cursor()
+	local changes = uci:changes()
+
+	-- Collect files to be reverted
+	for r, tbl in pairs(changes) do
+		uci:load(r)
+		uci:revert(r)
+		uci:unload(r)
+	end
+
+	luci.template.render("admin_uci/revert", {
+		changes = next(changes) and changes
+	})
+end
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
new file mode 100644
index 00000000..bd6f403c
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -0,0 +1,264 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local sys = require "luci.sys"
+
+m = Map("dhcp", translate("DHCP and DNS"),
+	translate("Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol" ..
+		"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-" ..
+		"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> " ..
+		"firewalls"))
+
+s = m:section(TypedSection, "dnsmasq", translate("Server Settings"))
+s.anonymous = true
+s.addremove = false
+
+s:tab("general", translate("General Settings"))
+s:tab("files", translate("Resolv and Hosts Files"))
+s:tab("tftp", translate("TFTP Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+s:taboption("general", Flag, "domainneeded",
+	translate("Domain required"),
+	translate("Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without " ..
+		"<abbr title=\"Domain Name System\">DNS</abbr>-Name"))
+
+s:taboption("general", Flag, "authoritative",
+	translate("Authoritative"),
+	translate("This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" ..
+		"abbr> in the local network"))
+
+
+s:taboption("files", Flag, "readethers",
+	translate("Use <code>/etc/ethers</code>"),
+	translate("Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host " ..
+		"Configuration Protocol\">DHCP</abbr>-Server"))
+
+s:taboption("files", Value, "leasefile",
+	translate("Leasefile"),
+	translate("file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" ..
+		"abbr>-leases will be stored"))
+
+s:taboption("files", Flag, "noresolv",
+	translate("Ignore resolve file")).optional = true
+
+rf = s:taboption("files", Value, "resolvfile",
+	translate("Resolve file"),
+	translate("local <abbr title=\"Domain Name System\">DNS</abbr> file"))
+
+rf:depends("noresolv", "")
+rf.optional = true
+
+
+s:taboption("files", Flag, "nohosts",
+	translate("Ignore Hosts files")).optional = true
+
+hf = s:taboption("files", DynamicList, "addnhosts",
+	translate("Additional Hosts files"))
+
+hf:depends("nohosts", "")
+hf.optional = true
+
+
+s:taboption("advanced", Flag, "boguspriv",
+	translate("Filter private"),
+	translate("Do not forward reverse lookups for local networks"))
+
+s:taboption("advanced", Flag, "filterwin2k",
+	translate("Filter useless"),
+	translate("Do not forward requests that cannot be answered by public name servers"))
+
+
+s:taboption("advanced", Flag, "localise_queries",
+	translate("Localise queries"),
+	translate("Localise hostname depending on the requesting subnet if multiple IPs are available"))
+
+s:taboption("general", Value, "local",
+	translate("Local server"),
+	translate("Local domain specification. Names matching this domain are never forwarded and are resolved from DHCP or hosts files only"))
+
+s:taboption("general", Value, "domain",
+	translate("Local domain"),
+	translate("Local domain suffix appended to DHCP names and hosts file entries"))
+
+s:taboption("advanced", Flag, "expandhosts",
+	translate("Expand hosts"),
+	translate("Add local domain suffix to names served from hosts files"))
+
+s:taboption("advanced", Flag, "nonegcache",
+	translate("No negative cache"),
+	translate("Do not cache negative replies, e.g. for not existing domains"))
+
+s:taboption("advanced", Flag, "strictorder",
+	translate("Strict order"),
+	translate("<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the " ..
+		"order of the resolvfile")).optional = true
+
+
+bn = s:taboption("advanced", DynamicList, "bogusnxdomain", translate("Bogus NX Domain Override"),
+	translate("List of hosts that supply bogus NX domain results"))
+
+bn.optional = true
+bn.placeholder = "67.215.65.132"
+
+
+s:taboption("general", Flag, "logqueries",
+	translate("Log queries"),
+	translate("Write received DNS requests to syslog")).optional = true
+
+df = s:taboption("general", DynamicList, "server", translate("DNS forwardings"),
+	translate("List of <abbr title=\"Domain Name System\">DNS</abbr> " ..
+			"servers to forward requests to"))
+
+df.optional = true
+df.placeholder = "/example.org/10.1.2.3"
+
+
+rp = s:taboption("general", Flag, "rebind_protection",
+	translate("Rebind protection"),
+	translate("Discard upstream RFC1918 responses"))
+
+rp.rmempty = false
+
+
+rl = s:taboption("general", Flag, "rebind_localhost",
+	translate("Allow localhost"),
+	translate("Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"))
+
+rl:depends("rebind_protection", "1")
+
+
+rd = s:taboption("general", DynamicList, "rebind_domain",
+	translate("Domain whitelist"),
+	translate("List of domains to allow RFC1918 responses for"))
+
+rd:depends("rebind_protection", "1")
+rd.datatype = "host"
+rd.placeholder = "ihost.netflix.com"
+
+
+pt = s:taboption("advanced", Value, "port",
+	translate("<abbr title=\"Domain Name System\">DNS</abbr> server port"),
+	translate("Listening port for inbound DNS queries"))
+
+pt.optional = true
+pt.datatype = "port"
+pt.placeholder = 53
+
+
+qp = s:taboption("advanced", Value, "queryport",
+	translate("<abbr title=\"Domain Name System\">DNS</abbr> query port"),
+	translate("Fixed source port for outbound DNS queries"))
+
+qp.optional = true
+qp.datatype = "port"
+qp.placeholder = translate("any")
+
+
+lm = s:taboption("advanced", Value, "dhcpleasemax",
+	translate("<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration " ..
+		"Protocol\">DHCP</abbr> leases"),
+	translate("Maximum allowed number of active DHCP leases"))
+
+lm.optional = true
+lm.datatype = "uinteger"
+lm.placeholder = translate("unlimited")
+
+
+em = s:taboption("advanced", Value, "ednspacket_max",
+	translate("<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for " ..
+		"Domain Name System\">EDNS0</abbr> packet size"),
+	translate("Maximum allowed size of EDNS.0 UDP packets"))
+
+em.optional = true
+em.datatype = "uinteger"
+em.placeholder = 1280
+
+
+cq = s:taboption("advanced", Value, "dnsforwardmax",
+	translate("<abbr title=\"maximal\">Max.</abbr> concurrent queries"),
+	translate("Maximum allowed number of concurrent DNS queries"))
+
+cq.optional = true
+cq.datatype = "uinteger"
+cq.placeholder = 150
+
+
+s:taboption("tftp", Flag, "enable_tftp",
+	translate("Enable TFTP server")).optional = true
+
+tr = s:taboption("tftp", Value, "tftp_root",
+	translate("TFTP server root"),
+	translate("Root directory for files served via TFTP"))
+
+tr.optional = true
+tr:depends("enable_tftp", "1")
+tr.placeholder = "/"
+
+
+db = s:taboption("tftp", Value, "dhcp_boot",
+	translate("Network boot image"),
+	translate("Filename of the boot image advertised to clients"))
+
+db.optional = true
+db:depends("enable_tftp", "1")
+db.placeholder = "pxelinux.0"
+
+
+m:section(SimpleSection).template = "admin_network/lease_status"
+
+s = m:section(TypedSection, "host", translate("Static Leases"),
+	translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " ..
+		"DHCP clients. They are also required for non-dynamic interface configurations where " ..
+		"only hosts with a corresponding lease are served.") .. "<br />" ..
+	translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " ..
+		"indentifies the host, the <em>IPv4-Address</em> specifies to the fixed address to " ..
+		"use and the <em>Hostname</em> is assigned as symbolic name to the requesting host."))
+
+s.addremove = true
+s.anonymous = true
+s.template = "cbi/tblsection"
+
+name = s:option(Value, "name", translate("Hostname"))
+name.datatype = "hostname"
+name.rmempty  = true
+
+mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+mac.datatype = "list(macaddr)"
+mac.rmempty  = true
+
+ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+ip.datatype = "or(ip4addr,'ignore')"
+
+hostid = s:option(Value, "hostid", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"))
+
+sys.net.arptable(function(entry)
+	ip:value(entry["IP address"])
+	mac:value(
+		entry["HW address"],
+		entry["HW address"] .. " (" .. entry["IP address"] .. ")"
+	)
+end)
+
+function ip.validate(self, value, section)
+	local m = mac:formvalue(section) or ""
+	local n = name:formvalue(section) or ""
+	if value and #n == 0 and #m == 0 then
+		return nil, translate("One of hostname or mac address must be specified!")
+	end
+	return Value.validate(self, value, section)
+end
+
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
new file mode 100644
index 00000000..b4fee8cf
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
@@ -0,0 +1,41 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.sys")
+require("luci.util")
+m = Map("dhcp", translate("Hostnames"))
+
+s = m:section(TypedSection, "domain", translate("Host entries"))
+s.addremove = true
+s.anonymous = true
+s.template = "cbi/tblsection"
+
+hn = s:option(Value, "name", translate("Hostname"))
+hn.datatype = "hostname"
+hn.rmempty  = true
+
+ip = s:option(Value, "ip", translate("IP address"))
+ip.datatype = "ipaddr"
+ip.rmempty  = true
+
+local arptable = luci.sys.net.arptable() or {}
+for i, dataset in ipairs(arptable) do
+	ip:value(
+		dataset["IP address"],
+		"%s (%s)" %{ dataset["IP address"], dataset["HW address"] }
+	)
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua
new file mode 100644
index 00000000..92026b15
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua
@@ -0,0 +1,104 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local nw  = require "luci.model.network".init()
+local fw  = require "luci.model.firewall".init()
+local utl = require "luci.util"
+local uci = require "luci.model.uci".cursor()
+
+m = SimpleForm("network", translate("Create Interface"))
+m.redirect = luci.dispatcher.build_url("admin/network/network")
+m.reset = false
+
+newnet = m:field(Value, "_netname", translate("Name of the new interface"),
+	translate("The allowed characters are: <code>A-Z</code>, <code>a-z</code>, " ..
+		"<code>0-9</code> and <code>_</code>"
+	))
+
+newnet:depends("_attach", "")
+newnet.default = arg[1] and "net_" .. arg[1]:gsub("[^%w_]+", "_")
+newnet.datatype = "uciname"
+
+newproto = m:field(ListValue, "_netproto", translate("Protocol of the new interface"))
+
+netbridge = m:field(Flag, "_bridge", translate("Create a bridge over multiple interfaces"))
+
+
+sifname = m:field(Value, "_ifname", translate("Cover the following interface"))
+
+sifname.widget = "radio"
+sifname.template  = "cbi/network_ifacelist"
+sifname.nobridges = true
+
+
+mifname = m:field(Value, "_ifnames", translate("Cover the following interfaces"))
+
+mifname.widget = "checkbox"
+mifname.template  = "cbi/network_ifacelist"
+mifname.nobridges = true
+
+
+local _, p
+for _, p in ipairs(nw:get_protocols()) do
+	if p:is_installed() then
+		newproto:value(p:proto(), p:get_i18n())
+		if not p:is_virtual()  then netbridge:depends("_netproto", p:proto()) end
+		if not p:is_floating() then
+			sifname:depends({ _bridge = "",  _netproto = p:proto()})
+			mifname:depends({ _bridge = "1", _netproto = p:proto()})
+		end
+	end
+end
+
+function newproto.validate(self, value, section)
+	local name = newnet:formvalue(section)
+	if not name or #name == 0 then
+		newnet:add_error(section, translate("No network name specified"))
+	elseif m:get(name) then
+		newnet:add_error(section, translate("The given network name is not unique"))
+	end
+
+	local proto = nw:get_protocol(value)
+	if proto and not proto:is_floating() then
+		local br = (netbridge:formvalue(section) == "1")
+		local ifn = br and mifname:formvalue(section) or sifname:formvalue(section)
+		for ifn in utl.imatch(ifn) do
+			return value
+		end
+		return nil, translate("The selected protocol needs a device assigned")
+	end
+	return value
+end
+
+function newproto.write(self, section, value)
+	local name = newnet:formvalue(section)
+	if name and #name > 0 then
+		local br = (netbridge:formvalue(section) == "1") and "bridge" or nil
+		local net = nw:add_network(name, { proto = value, type = br })
+		if net then
+			local ifn
+			for ifn in utl.imatch(
+				br and mifname:formvalue(section) or sifname:formvalue(section)
+			) do
+				net:add_interface(ifn)
+			end
+			nw:save("network")
+			nw:save("wireless")
+		end
+		luci.http.redirect(luci.dispatcher.build_url("admin/network/network", name))
+	end
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
new file mode 100644
index 00000000..9be5ff1a
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -0,0 +1,527 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs = require "nixio.fs"
+local ut = require "luci.util"
+local pt = require "luci.tools.proto"
+local nw = require "luci.model.network"
+local fw = require "luci.model.firewall"
+
+arg[1] = arg[1] or ""
+
+local has_dnsmasq  = fs.access("/etc/config/dhcp")
+local has_firewall = fs.access("/etc/config/firewall")
+
+m = Map("network", translate("Interfaces") .. " - " .. arg[1]:upper(), translate("On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."))
+m:chain("wireless")
+
+if has_firewall then
+	m:chain("firewall")
+end
+
+nw.init(m.uci)
+fw.init(m.uci)
+
+
+local net = nw:get_network(arg[1])
+
+local function backup_ifnames(is_bridge)
+	if not net:is_floating() and not m:get(net:name(), "_orig_ifname") then
+		local ifcs = net:get_interfaces() or { net:get_interface() }
+		if ifcs then
+			local _, ifn
+			local ifns = { }
+			for _, ifn in ipairs(ifcs) do
+				ifns[#ifns+1] = ifn:name()
+			end
+			if #ifns > 0 then
+				m:set(net:name(), "_orig_ifname", table.concat(ifns, " "))
+				m:set(net:name(), "_orig_bridge", tostring(net:is_bridge()))
+			end
+		end
+	end
+end
+
+
+-- redirect to overview page if network does not exist anymore (e.g. after a revert)
+if not net then
+	luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
+	return
+end
+
+-- protocol switch was requested, rebuild interface config and reload page
+if m:formvalue("cbid.network.%s._switch" % net:name()) then
+	-- get new protocol
+	local ptype = m:formvalue("cbid.network.%s.proto" % net:name()) or "-"
+	local proto = nw:get_protocol(ptype, net:name())
+	if proto then
+		-- backup default
+		backup_ifnames()
+
+		-- if current proto is not floating and target proto is not floating,
+		-- then attempt to retain the ifnames
+		--error(net:proto() .. " > " .. proto:proto())
+		if not net:is_floating() and not proto:is_floating() then
+			-- if old proto is a bridge and new proto not, then clip the
+			-- interface list to the first ifname only
+			if net:is_bridge() and proto:is_virtual() then
+				local _, ifn
+				local first = true
+				for _, ifn in ipairs(net:get_interfaces() or { net:get_interface() }) do
+					if first then
+						first = false
+					else
+						net:del_interface(ifn)
+					end
+				end
+				m:del(net:name(), "type")
+			end
+
+		-- if the current proto is floating, the target proto not floating,
+		-- then attempt to restore ifnames from backup
+		elseif net:is_floating() and not proto:is_floating() then
+			-- if we have backup data, then re-add all orphaned interfaces
+			-- from it and restore the bridge choice
+			local br = (m:get(net:name(), "_orig_bridge") == "true")
+			local ifn
+			local ifns = { }
+			for ifn in ut.imatch(m:get(net:name(), "_orig_ifname")) do
+				ifn = nw:get_interface(ifn)
+				if ifn and not ifn:get_network() then
+					proto:add_interface(ifn)
+					if not br then
+						break
+					end
+				end
+			end
+			if br then
+				m:set(net:name(), "type", "bridge")
+			end
+
+		-- in all other cases clear the ifnames
+		else
+			local _, ifc
+			for _, ifc in ipairs(net:get_interfaces() or { net:get_interface() }) do
+				net:del_interface(ifc)
+			end
+			m:del(net:name(), "type")
+		end
+
+		-- clear options
+		local k, v
+		for k, v in pairs(m:get(net:name())) do
+			if k:sub(1,1) ~= "." and
+			   k ~= "type" and
+			   k ~= "ifname" and
+			   k ~= "_orig_ifname" and
+			   k ~= "_orig_bridge"
+			then
+				m:del(net:name(), k)
+			end
+		end
+
+		-- set proto
+		m:set(net:name(), "proto", proto:proto())
+		m.uci:save("network")
+		m.uci:save("wireless")
+
+		-- reload page
+		luci.http.redirect(luci.dispatcher.build_url("admin/network/network", arg[1]))
+		return
+	end
+end
+
+-- dhcp setup was requested, create section and reload page
+if m:formvalue("cbid.dhcp._enable._enable") then
+	m.uci:section("dhcp", "dhcp", nil, {
+		interface = arg[1],
+		start     = "100",
+		limit     = "150",
+		leasetime = "12h"
+	})
+
+	m.uci:save("dhcp")
+	luci.http.redirect(luci.dispatcher.build_url("admin/network/network", arg[1]))
+	return
+end
+
+local ifc = net:get_interface()
+
+s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
+s.addremove = false
+
+s:tab("general",  translate("General Setup"))
+s:tab("advanced", translate("Advanced Settings"))
+s:tab("physical", translate("Physical Settings"))
+
+if has_firewall then
+	s:tab("firewall", translate("Firewall Settings"))
+end
+
+
+st = s:taboption("general", DummyValue, "__status", translate("Status"))
+
+local function set_status()
+	-- if current network is empty, print a warning
+	if not net:is_floating() and net:is_empty() then
+		st.template = "cbi/dvalue"
+		st.network  = nil
+		st.value    = translate("There is no device assigned yet, please attach a network device in the \"Physical Settings\" tab")
+	else
+		st.template = "admin_network/iface_status"
+		st.network  = arg[1]
+		st.value    = nil
+	end
+end
+
+m.on_init = set_status
+m.on_after_save = set_status
+
+
+p = s:taboption("general", ListValue, "proto", translate("Protocol"))
+p.default = net:proto()
+
+
+if not net:is_installed() then
+	p_install = s:taboption("general", Button, "_install")
+	p_install.title      = translate("Protocol support is not installed")
+	p_install.inputtitle = translate("Install package %q" % net:opkg_package())
+	p_install.inputstyle = "apply"
+	p_install:depends("proto", net:proto())
+
+	function p_install.write()
+		return luci.http.redirect(
+			luci.dispatcher.build_url("admin/system/packages") ..
+			"?submit=1&install=%s" % net:opkg_package()
+		)
+	end
+end
+
+
+p_switch = s:taboption("general", Button, "_switch")
+p_switch.title      = translate("Really switch protocol?")
+p_switch.inputtitle = translate("Switch protocol")
+p_switch.inputstyle = "apply"
+
+local _, pr
+for _, pr in ipairs(nw:get_protocols()) do
+	p:value(pr:proto(), pr:get_i18n())
+	if pr:proto() ~= net:proto() then
+		p_switch:depends("proto", pr:proto())
+	end
+end
+
+
+auto = s:taboption("advanced", Flag, "auto", translate("Bring up on boot"))
+auto.default = (net:proto() == "none") and auto.disabled or auto.enabled
+
+delegate = s:taboption("advanced", Flag, "delegate", translate("Use builtin IPv6-management"))
+delegate.default = delegate.enabled
+
+
+if not net:is_virtual() then
+	br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
+	br.enabled = "bridge"
+	br.rmempty = true
+	br:depends("proto", "static")
+	br:depends("proto", "dhcp")
+	br:depends("proto", "none")
+
+	stp = s:taboption("physical", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
+		translate("Enables the Spanning Tree Protocol on this bridge"))
+	stp:depends("type", "bridge")
+	stp.rmempty = true
+end
+
+
+if not net:is_floating() then
+	ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
+	ifname_single.template = "cbi/network_ifacelist"
+	ifname_single.widget = "radio"
+	ifname_single.nobridges = true
+	ifname_single.rmempty = false
+	ifname_single.network = arg[1]
+	ifname_single:depends("type", "")
+
+	function ifname_single.cfgvalue(self, s)
+		-- let the template figure out the related ifaces through the network model
+		return nil
+	end
+
+	function ifname_single.write(self, s, val)
+		local i
+		local new_ifs = { }
+		local old_ifs = { }
+
+		for _, i in ipairs(net:get_interfaces() or { net:get_interface() }) do
+			old_ifs[#old_ifs+1] = i:name()
+		end
+
+		for i in ut.imatch(val) do
+			new_ifs[#new_ifs+1] = i
+
+			-- if this is not a bridge, only assign first interface
+			if self.option == "ifname_single" then
+				break
+			end
+		end
+
+		table.sort(old_ifs)
+		table.sort(new_ifs)
+
+		for i = 1, math.max(#old_ifs, #new_ifs) do
+			if old_ifs[i] ~= new_ifs[i] then
+				backup_ifnames()
+				for i = 1, #old_ifs do
+					net:del_interface(old_ifs[i])
+				end
+				for i = 1, #new_ifs do
+					net:add_interface(new_ifs[i])
+				end
+				break
+			end
+		end
+	end
+end
+
+
+if not net:is_virtual() then
+	ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
+	ifname_multi.template = "cbi/network_ifacelist"
+	ifname_multi.nobridges = true
+	ifname_multi.rmempty = false
+	ifname_multi.network = arg[1]
+	ifname_multi.widget = "checkbox"
+	ifname_multi:depends("type", "bridge")
+	ifname_multi.cfgvalue = ifname_single.cfgvalue
+	ifname_multi.write = ifname_single.write
+end
+
+
+if has_firewall then
+	fwzone = s:taboption("firewall", Value, "_fwzone",
+		translate("Create / Assign firewall-zone"),
+		translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
+
+	fwzone.template = "cbi/firewall_zonelist"
+	fwzone.network = arg[1]
+	fwzone.rmempty = false
+
+	function fwzone.cfgvalue(self, section)
+		self.iface = section
+		local z = fw:get_zone_by_network(section)
+		return z and z:name()
+	end
+
+	function fwzone.write(self, section, value)
+		local zone = fw:get_zone(value)
+
+		if not zone and value == '-' then
+			value = m:formvalue(self:cbid(section) .. ".newzone")
+			if value and #value > 0 then
+				zone = fw:add_zone(value)
+			else
+				fw:del_network(section)
+			end
+		end
+
+		if zone then
+			fw:del_network(section)
+			zone:add_network(section)
+		end
+	end
+end
+
+
+function p.write() end
+function p.remove() end
+function p.validate(self, value, section)
+	if value == net:proto() then
+		if not net:is_floating() and net:is_empty() then
+			local ifn = ((br and (br:formvalue(section) == "bridge"))
+				and ifname_multi:formvalue(section)
+			     or ifname_single:formvalue(section))
+
+			for ifn in ut.imatch(ifn) do
+				return value
+			end
+			return nil, translate("The selected protocol needs a device assigned")
+		end
+	end
+	return value
+end
+
+
+local form, ferr = loadfile(
+	ut.libpath() .. "/model/cbi/admin_network/proto_%s.lua" % net:proto()
+)
+
+if not form then
+	s:taboption("general", DummyValue, "_error",
+		translate("Missing protocol extension for proto %q" % net:proto())
+	).value = ferr
+else
+	setfenv(form, getfenv(1))(m, s, net)
+end
+
+
+local _, field
+for _, field in ipairs(s.children) do
+	if field ~= st and field ~= p and field ~= p_install and field ~= p_switch then
+		if next(field.deps) then
+			local _, dep
+			for _, dep in ipairs(field.deps) do
+				dep.deps.proto = net:proto()
+			end
+		else
+			field:depends("proto", net:proto())
+		end
+	end
+end
+
+
+--
+-- Display DNS settings if dnsmasq is available
+--
+
+if has_dnsmasq and net:proto() == "static" then
+	m2 = Map("dhcp", "", "")
+
+	local has_section = false
+
+	m2.uci:foreach("dhcp", "dhcp", function(s)
+		if s.interface == arg[1] then
+			has_section = true
+			return false
+		end
+	end)
+
+	if not has_section and has_dnsmasq then
+
+		s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
+		s.anonymous   = true
+		s.cfgsections = function() return { "_enable" } end
+
+		x = s:option(Button, "_enable")
+		x.title      = translate("No DHCP Server configured for this interface")
+		x.inputtitle = translate("Setup DHCP Server")
+		x.inputstyle = "apply"
+
+	elseif has_section then
+
+		s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
+		s.addremove = false
+		s.anonymous = true
+		s:tab("general",  translate("General Setup"))
+		s:tab("advanced", translate("Advanced Settings"))
+		s:tab("ipv6", translate("IPv6 Settings"))
+
+		function s.filter(self, section)
+			return m2.uci:get("dhcp", section, "interface") == arg[1]
+		end
+
+		local ignore = s:taboption("general", Flag, "ignore",
+			translate("Ignore interface"),
+			translate("Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " ..
+				"this interface."))
+
+		local start = s:taboption("general", Value, "start", translate("Start"),
+			translate("Lowest leased address as offset from the network address."))
+		start.optional = true
+		start.datatype = "or(uinteger,ip4addr)"
+		start.default = "100"
+
+		local limit = s:taboption("general", Value, "limit", translate("Limit"),
+			translate("Maximum number of leased addresses."))
+		limit.optional = true
+		limit.datatype = "uinteger"
+		limit.default = "150"
+
+		local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
+			translate("Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."))
+		ltime.rmempty = true
+		ltime.default = "12h"
+
+		local dd = s:taboption("advanced", Flag, "dynamicdhcp",
+			translate("Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"),
+			translate("Dynamically allocate DHCP addresses for clients. If disabled, only " ..
+				"clients having static leases will be served."))
+		dd.default = dd.enabled
+
+		s:taboption("advanced", Flag, "force", translate("Force"),
+			translate("Force DHCP on this network even if another server is detected."))
+
+		-- XXX: is this actually useful?
+		--s:taboption("advanced", Value, "name", translate("Name"),
+		--	translate("Define a name for this network."))
+
+		mask = s:taboption("advanced", Value, "netmask",
+			translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"),
+			translate("Override the netmask sent to clients. Normally it is calculated " ..
+				"from the subnet that is served."))
+
+		mask.optional = true
+		mask.datatype = "ip4addr"
+
+		s:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"),
+			translate("Define additional DHCP options, for example \"<code>6,192.168.2.1," ..
+				"192.168.2.2</code>\" which advertises different DNS servers to clients."))
+
+		for i, n in ipairs(s.children) do
+			if n ~= ignore then
+				n:depends("ignore", "")
+			end
+		end
+
+		o = s:taboption("ipv6", ListValue, "ra", translate("Router Advertisement-Service"))
+		o:value("", translate("disabled"))
+		o:value("server", translate("server mode"))
+		o:value("relay", translate("relay mode"))
+		o:value("hybrid", translate("hybrid mode"))
+
+		o = s:taboption("ipv6", ListValue, "dhcpv6", translate("DHCPv6-Service"))
+		o:value("", translate("disabled"))
+		o:value("server", translate("server mode"))
+		o:value("relay", translate("relay mode"))
+		o:value("hybrid", translate("hybrid mode"))
+
+		o = s:taboption("ipv6", ListValue, "ndp", translate("NDP-Proxy"))
+		o:value("", translate("disabled"))
+		o:value("relay", translate("relay mode"))
+		o:value("hybrid", translate("hybrid mode"))
+
+		o = s:taboption("ipv6", ListValue, "ra_management", translate("DHCPv6-Mode"))
+		o:value("", translate("stateless"))
+		o:value("1", translate("stateless + stateful"))
+		o:value("2", translate("stateful-only"))
+		o:depends("dhcpv6", "server")
+		o:depends("dhcpv6", "hybrid")
+		o.default = "1"
+
+		o = s:taboption("ipv6", Flag, "ra_default", translate("Always announce default router"),
+		        translate("Announce as default router even if no public prefix is available."))
+		o:depends("ra", "server")
+		o:depends("ra", "hybrid")
+
+		s:taboption("ipv6", DynamicList, "dns", translate("Announced DNS servers"))
+		s:taboption("ipv6", DynamicList, "domain", translate("Announced DNS domains"))
+
+	else
+		m2 = nil
+	end
+end
+
+
+return m, m2
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
new file mode 100644
index 00000000..f2984b58
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -0,0 +1,82 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs = require "nixio.fs"
+
+m = Map("network", translate("Interfaces"))
+m.pageaction = false
+m:section(SimpleSection).template = "admin_network/iface_overview"
+
+-- Show ATM bridge section if we have the capabilities
+if fs.access("/usr/sbin/br2684ctl") then
+	atm = m:section(TypedSection, "atm-bridge", translate("ATM Bridges"),
+		translate("ATM bridges expose encapsulated ethernet in AAL5 " ..
+			"connections as virtual Linux network interfaces which can " ..
+			"be used in conjunction with DHCP or PPP to dial into the " ..
+			"provider network."))
+
+	atm.addremove = true
+	atm.anonymous = true
+
+	atm.create = function(self, section)
+		local sid = TypedSection.create(self, section)
+		local max_unit = -1
+
+		m.uci:foreach("network", "atm-bridge",
+			function(s)
+				local u = tonumber(s.unit)
+				if u ~= nil and u > max_unit then
+					max_unit = u
+				end
+			end)
+
+		m.uci:set("network", sid, "unit", max_unit + 1)
+		m.uci:set("network", sid, "atmdev", 0)
+		m.uci:set("network", sid, "encaps", "llc")
+		m.uci:set("network", sid, "payload", "bridged")
+		m.uci:set("network", sid, "vci", 35)
+		m.uci:set("network", sid, "vpi", 8)
+
+		return sid
+	end
+
+	atm:tab("general", translate("General Setup"))
+	atm:tab("advanced", translate("Advanced Settings"))
+
+	vci    = atm:taboption("general", Value, "vci", translate("ATM Virtual Channel Identifier (VCI)"))
+	vpi    = atm:taboption("general", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)"))
+	encaps = atm:taboption("general", ListValue, "encaps", translate("Encapsulation mode"))
+	encaps:value("llc", translate("LLC"))
+	encaps:value("vc", translate("VC-Mux"))
+
+	atmdev  = atm:taboption("advanced", Value, "atmdev", translate("ATM device number"))
+	unit    = atm:taboption("advanced", Value, "unit", translate("Bridge unit number"))
+	payload = atm:taboption("advanced", ListValue, "payload", translate("Forwarding mode"))
+	payload:value("bridged", translate("bridged"))
+	payload:value("routed", translate("routed"))
+	m.pageaction = true
+end
+
+local network = require "luci.model.network"
+if network:has_ipv6() then
+	local s = m:section(NamedSection, "globals", "globals", translate("Global network options"))
+	local o = s:option(Value, "ula_prefix", translate("IPv6 ULA-Prefix"))
+	o.datatype = "ip6addr"
+	o.rmempty = true
+	m.pageaction = true
+end
+
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
new file mode 100644
index 00000000..26dc33ab
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
@@ -0,0 +1,76 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local device, apn, service, pincode, username, password
+local ipv6, maxwait, defaultroute, metric, peerdns, dns,
+      keepalive_failure, keepalive_interval, demand
+
+
+mca = s:taboption("ahcp", Value, "multicast_address", translate("Multicast address"))
+mca.optional    = true
+mca.placeholder = "ff02::cca6:c0f9:e182:5359"
+mca.datatype    = "ip6addr"
+mca:depends("proto", "ahcp")
+
+port = s:taboption("ahcp", Value, "port", translate("Port"))
+port.optional    = true
+port.placeholder = 5359
+port.datatype    = "port"
+port:depends("proto", "ahcp")
+
+fam = s:taboption("ahcp", ListValue, "_family", translate("Protocol family"))
+fam:value("", translate("IPv4 and IPv6"))
+fam:value("ipv4", translate("IPv4 only"))
+fam:value("ipv6", translate("IPv6 only"))
+fam:depends("proto", "ahcp")
+
+function fam.cfgvalue(self, section)
+	local v4 = m.uci:get_bool("network", section, "ipv4_only")
+	local v6 = m.uci:get_bool("network", section, "ipv6_only")
+	if v4 then
+		return "ipv4"
+	elseif v6 then
+		return "ipv6"
+	end
+	return ""
+end
+
+function fam.write(self, section, value)
+	if value == "ipv4" then
+		m.uci:set("network", section, "ipv4_only", "true")
+		m.uci:delete("network", section, "ipv6_only")
+	elseif value == "ipv6" then
+		m.uci:set("network", section, "ipv6_only", "true")
+		m.uci:delete("network", section, "ipv4_only")
+	end
+end
+
+function fam.remove(self, section)
+	m.uci:delete("network", section, "ipv4_only")
+	m.uci:delete("network", section, "ipv6_only")
+end
+
+nodns = s:taboption("ahcp", Flag, "no_dns", translate("Disable DNS setup"))
+nodns.optional = true
+nodns.enabled  = "true"
+nodns.disabled = "false"
+nodns.default  = nodns.disabled
+nodns:depends("proto", "ahcp")
+
+ltime = s:taboption("ahcp", Value, "lease_time", translate("Lease validity time"))
+ltime.optional    = true
+ltime.placeholder = 3666
+ltime.datatype    = "uinteger"
+ltime:depends("proto", "ahcp")
+
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
new file mode 100644
index 00000000..469748c8
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
@@ -0,0 +1,86 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.tools.webadmin")
+m = Map("network",
+	translate("Routes"),
+	translate("Routes specify over which interface and gateway a certain host or network " ..
+		"can be reached."))
+
+local routes6 = luci.sys.net.routes6()
+local bit = require "bit"
+
+s = m:section(TypedSection, "route", translate("Static IPv4 Routes"))
+s.addremove = true
+s.anonymous = true
+
+s.template  = "cbi/tblsection"
+
+iface = s:option(ListValue, "interface", translate("Interface"))
+luci.tools.webadmin.cbi_add_networks(iface)
+
+t = s:option(Value, "target", translate("Target"), translate("Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"))
+t.datatype = "ip4addr"
+t.rmempty = false
+
+n = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"), translate("if target is a network"))
+n.placeholder = "255.255.255.255"
+n.datatype = "ip4addr"
+n.rmempty = true
+
+g = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+g.datatype = "ip4addr"
+g.rmempty = true
+
+metric = s:option(Value, "metric", translate("Metric"))
+metric.placeholder = 0
+metric.datatype = "range(0,255)"
+metric.rmempty = true
+
+mtu = s:option(Value, "mtu", translate("MTU"))
+mtu.placeholder = 1500
+mtu.datatype = "range(64,9000)"
+mtu.rmempty = true
+
+if routes6 then
+	s = m:section(TypedSection, "route6", translate("Static IPv6 Routes"))
+	s.addremove = true
+	s.anonymous = true
+
+	s.template  = "cbi/tblsection"
+
+	iface = s:option(ListValue, "interface", translate("Interface"))
+	luci.tools.webadmin.cbi_add_networks(iface)
+
+	t = s:option(Value, "target", translate("Target"), translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"))
+	t.datatype = "ip6addr"
+	t.rmempty = false
+
+	g = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
+	g.datatype = "ip6addr"
+	g.rmempty = true
+
+	metric = s:option(Value, "metric", translate("Metric"))
+	metric.placeholder = 0
+	metric.datatype = "range(0,65535)" -- XXX: not sure
+	metric.rmempty = true
+
+	mtu = s:option(Value, "mtu", translate("MTU"))
+	mtu.placeholder = 1500
+	mtu.datatype = "range(64,9000)"
+	mtu.rmempty = true
+end
+
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
new file mode 100644
index 00000000..fbea03af
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -0,0 +1,315 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+m = Map("network", translate("Switch"), translate("The network ports on this device can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."))
+
+local fs = require "nixio.fs"
+local switches = { }
+
+m.uci:foreach("network", "switch",
+	function(x)
+		local sid         = x['.name']
+		local switch_name = x.name or sid
+		local has_vlan    = nil
+		local has_learn   = nil
+		local has_vlan4k  = nil
+		local has_jumbo3  = nil
+		local has_mirror  = nil
+		local min_vid     = 0
+		local max_vid     = 16
+		local num_vlans   = 16
+		local cpu_port    = tonumber(fs.readfile("/proc/switch/eth0/cpuport") or 5)
+		local num_ports   = cpu_port + 1
+
+		local switch_title
+		local enable_vlan4k = false
+
+		-- Parse some common switch properties from swconfig help output.
+		local swc = io.popen("swconfig dev %q help 2>/dev/null" % switch_name)
+		if swc then
+
+			local is_port_attr = false
+			local is_vlan_attr = false
+
+			while true do
+				local line = swc:read("*l")
+				if not line then break end
+
+				if line:match("^%s+%-%-vlan") then
+					is_vlan_attr = true
+
+				elseif line:match("^%s+%-%-port") then
+					is_vlan_attr = false
+					is_port_attr = true
+
+				elseif line:match("cpu @") then
+					switch_title = line:match("^switch%d: %w+%((.-)%)")
+					num_ports, cpu_port, num_vlans =
+						line:match("ports: (%d+) %(cpu @ (%d+)%), vlans: (%d+)")
+
+					num_ports  = tonumber(num_ports) or  6
+					num_vlans  = tonumber(num_vlans) or 16
+					cpu_port   = tonumber(cpu_port)  or  5
+					min_vid    = 1
+
+				elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then
+					if is_vlan_attr then has_vlan4k = line:match(": (%w+)") end
+
+				elseif line:match(": enable_vlan4k") then
+					enable_vlan4k = true
+
+				elseif line:match(": enable_vlan") then
+					has_vlan = "enable_vlan"
+
+				elseif line:match(": enable_learning") then
+					has_learn = "enable_learning"
+
+				elseif line:match(": enable_mirror_rx") then
+					has_mirror = "enable_mirror_rx"
+
+				elseif line:match(": max_length") then
+					has_jumbo3 = "max_length"
+				end
+			end
+
+			swc:close()
+		end
+
+
+		-- Switch properties
+		s = m:section(NamedSection, x['.name'], "switch",
+			switch_title and translatef("Switch %q (%s)", switch_name, switch_title)
+					      or translatef("Switch %q", switch_name))
+
+		s.addremove = false
+
+		if has_vlan then
+			s:option(Flag, has_vlan, translate("Enable VLAN functionality"))
+		end
+
+		if has_learn then
+			x = s:option(Flag, has_learn, translate("Enable learning and aging"))
+			x.default = x.enabled
+		end
+
+		if has_jumbo3 then
+			x = s:option(Flag, has_jumbo3, translate("Enable Jumbo Frame passthrough"))
+			x.enabled = "3"
+			x.rmempty = true
+		end
+
+		-- Does this switch support port mirroring?
+		if has_mirror then
+			s:option(Flag, "enable_mirror_rx", translate("Enable mirroring of incoming packets"))
+			s:option(Flag, "enable_mirror_tx", translate("Enable mirroring of outgoing packets"))
+
+			local sp = s:option(ListValue, "mirror_source_port", translate("Mirror source port"))
+			local mp = s:option(ListValue, "mirror_monitor_port", translate("Mirror monitor port"))
+
+			local pt
+			for pt = 0, num_ports - 1 do
+				local name
+
+				name = (pt == cpu_port) and translate("CPU") or translatef("Port %d", pt)
+
+				sp:value(pt, name)
+				mp:value(pt, name)
+			end
+		end
+
+		-- VLAN table
+		s = m:section(TypedSection, "switch_vlan",
+			switch_title and translatef("VLANs on %q (%s)", switch_name, switch_title)
+						  or translatef("VLANs on %q", switch_name))
+
+		s.template = "cbi/tblsection"
+		s.addremove = true
+		s.anonymous = true
+
+		-- Filter by switch
+		s.filter = function(self, section)
+			local device = m:get(section, "device")
+			return (device and device == switch_name)
+		end
+
+		-- Override cfgsections callback to enforce row ordering by vlan id.
+		s.cfgsections = function(self)
+			local osections = TypedSection.cfgsections(self)
+			local sections = { }
+			local section
+
+			for _, section in luci.util.spairs(
+				osections,
+				function(a, b)
+					return (tonumber(m:get(osections[a], has_vlan4k or "vlan")) or 9999)
+						<  (tonumber(m:get(osections[b], has_vlan4k or "vlan")) or 9999)
+				end
+			) do
+				sections[#sections+1] = section
+			end
+
+			return sections
+		end
+
+		-- When creating a new vlan, preset it with the highest found vid + 1.
+		s.create = function(self, section, origin)
+			-- Filter by switch
+			if m:get(origin, "device") ~= switch_name then
+				return
+			end
+
+			local sid = TypedSection.create(self, section)
+
+			local max_nr = 0
+			local max_id = 0
+
+			m.uci:foreach("network", "switch_vlan",
+				function(s)
+					if s.device == switch_name then
+						local nr = tonumber(s.vlan)
+						local id = has_vlan4k and tonumber(s[has_vlan4k])
+						if nr ~= nil and nr > max_nr then max_nr = nr end
+						if id ~= nil and id > max_id then max_id = id end
+					end
+				end)
+
+			m:set(sid, "device", switch_name)
+			m:set(sid, "vlan", max_nr + 1)
+
+			if has_vlan4k then
+				m:set(sid, has_vlan4k, max_id + 1)
+			end
+
+			return sid
+		end
+
+
+		local port_opts = { }
+		local untagged  = { }
+
+		-- Parse current tagging state from the "ports" option.
+		local portvalue = function(self, section)
+			local pt
+			for pt in (m:get(section, "ports") or ""):gmatch("%w+") do
+				local pc, tu = pt:match("^(%d+)([tu]*)")
+				if pc == self.option then return (#tu > 0) and tu or "u" end
+			end
+			return ""
+		end
+
+		-- Validate port tagging. Ensure that a port is only untagged once,
+		-- bail out if not.
+		local portvalidate = function(self, value, section)
+			-- ensure that the ports appears untagged only once
+			if value == "u" then
+				if not untagged[self.option] then
+					untagged[self.option] = true
+				elseif min_vid > 0 or tonumber(self.option) ~= cpu_port then -- enable multiple untagged cpu ports due to weird broadcom default setup
+					return nil,
+						translatef("Port %d is untagged in multiple VLANs!", tonumber(self.option) + 1)
+				end
+			end
+			return value
+		end
+
+
+		local vid = s:option(Value, has_vlan4k or "vlan", "VLAN ID", "<div id='portstatus-%s'></div>" % switch_name)
+		local mx_vid = has_vlan4k and 4094 or (num_vlans - 1)
+
+		vid.rmempty = false
+		vid.forcewrite = true
+		vid.vlan_used = { }
+		vid.datatype = "and(uinteger,range("..min_vid..","..mx_vid.."))"
+
+		-- Validate user provided VLAN ID, make sure its within the bounds
+		-- allowed by the switch.
+		vid.validate = function(self, value, section)
+			local v = tonumber(value)
+			local m = has_vlan4k and 4094 or (num_vlans - 1)
+			if v ~= nil and v >= min_vid and v <= m then
+				if not self.vlan_used[v] then
+					self.vlan_used[v] = true
+					return value
+				else
+					return nil,
+						translatef("Invalid VLAN ID given! Only unique IDs are allowed")
+				end
+			else
+				return nil,
+					translatef("Invalid VLAN ID given! Only IDs between %d and %d are allowed.", min_vid, m)
+			end
+		end
+
+		-- When writing the "vid" or "vlan" option, serialize the port states
+		-- as well and write them as "ports" option to uci.
+		vid.write = function(self, section, value)
+			local o
+			local p = { }
+
+			for _, o in ipairs(port_opts) do
+				local v = o:formvalue(section)
+				if v == "t" then
+					p[#p+1] = o.option .. v
+				elseif v == "u" then
+					p[#p+1] = o.option
+				end
+			end
+
+			if enable_vlan4k then
+				m:set(sid, "enable_vlan4k", "1")
+			end
+
+			m:set(section, "ports", table.concat(p, " "))
+			return Value.write(self, section, value)
+		end
+
+		-- Fallback to "vlan" option if "vid" option is supported but unset.
+		vid.cfgvalue = function(self, section)
+			return m:get(section, has_vlan4k or "vlan")
+				or m:get(section, "vlan")
+		end
+
+		-- Build per-port off/untagged/tagged choice lists.
+		local pt
+		for pt = 0, num_ports - 1 do
+			local title
+			if pt == cpu_port then
+				title = translate("CPU")
+			else
+				title = translatef("Port %d", pt)
+			end
+
+			local po = s:option(ListValue, tostring(pt), title)
+
+			po:value("",  translate("off"))
+			po:value("u", translate("untagged"))
+			po:value("t", translate("tagged"))
+
+			po.cfgvalue = portvalue
+			po.validate = portvalidate
+			po.write    = function() end
+
+			port_opts[#port_opts+1] = po
+		end
+
+		switches[#switches+1] = switch_name
+	end
+)
+
+-- Switch status template
+s = m:section(SimpleSection)
+s.template = "admin_network/switch_status"
+s.switches = switches
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
new file mode 100644
index 00000000..f61fda37
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -0,0 +1,956 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local wa = require "luci.tools.webadmin"
+local nw = require "luci.model.network"
+local ut = require "luci.util"
+local nt = require "luci.sys".net
+local fs = require "nixio.fs"
+
+arg[1] = arg[1] or ""
+
+m = Map("wireless", "",
+	translate("The <em>Device Configuration</em> section covers physical settings of the radio " ..
+		"hardware such as channel, transmit power or antenna selection which are shared among all " ..
+		"defined wireless networks (if the radio hardware is multi-SSID capable). Per network settings " ..
+		"like encryption or operation mode are grouped in the <em>Interface Configuration</em>."))
+
+m:chain("network")
+m:chain("firewall")
+
+local ifsection
+
+function m.on_commit(map)
+	local wnet = nw:get_wifinet(arg[1])
+	if ifsection and wnet then
+		ifsection.section = wnet.sid
+		m.title = luci.util.pcdata(wnet:get_i18n())
+	end
+end
+
+nw.init(m.uci)
+
+local wnet = nw:get_wifinet(arg[1])
+local wdev = wnet and wnet:get_device()
+
+-- redirect to overview page if network does not exist anymore (e.g. after a revert)
+if not wnet or not wdev then
+	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+	return
+end
+
+-- wireless toggle was requested, commit and reload page
+function m.parse(map)
+	if m:formvalue("cbid.wireless.%s.__toggle" % wdev:name()) then
+		if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then
+			wnet:set("disabled", nil)
+		else
+			wnet:set("disabled", "1")
+		end
+		wdev:set("disabled", nil)
+
+		nw:commit("wireless")
+		luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
+
+		luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", arg[1]))
+		return
+	end
+	Map.parse(map)
+end
+
+m.title = luci.util.pcdata(wnet:get_i18n())
+
+
+local function txpower_list(iw)
+	local list = iw.txpwrlist or { }
+	local off  = tonumber(iw.txpower_offset) or 0
+	local new  = { }
+	local prev = -1
+	local _, val
+	for _, val in ipairs(list) do
+		local dbm = val.dbm + off
+		local mw  = math.floor(10 ^ (dbm / 10))
+		if mw ~= prev then
+			prev = mw
+			new[#new+1] = {
+				display_dbm = dbm,
+				display_mw  = mw,
+				driver_dbm  = val.dbm,
+				driver_mw   = val.mw
+			}
+		end
+	end
+	return new
+end
+
+local function txpower_current(pwr, list)
+	pwr = tonumber(pwr)
+	if pwr ~= nil then
+		local _, item
+		for _, item in ipairs(list) do
+			if item.driver_dbm >= pwr then
+				return item.driver_dbm
+			end
+		end
+	end
+	return (list[#list] and list[#list].driver_dbm) or pwr or 0
+end
+
+local iw = luci.sys.wifi.getiwinfo(arg[1])
+local hw_modes      = iw.hwmodelist or { }
+local tx_power_list = txpower_list(iw)
+local tx_power_cur  = txpower_current(wdev:get("txpower"), tx_power_list)
+
+s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration"))
+s.addremove = false
+
+s:tab("general", translate("General Setup"))
+s:tab("macfilter", translate("MAC-Filter"))
+s:tab("advanced", translate("Advanced Settings"))
+
+--[[
+back = s:option(DummyValue, "_overview", translate("Overview"))
+back.value = ""
+back.titleref = luci.dispatcher.build_url("admin", "network", "wireless")
+]]
+
+st = s:taboption("general", DummyValue, "__status", translate("Status"))
+st.template = "admin_network/wifi_status"
+st.ifname   = arg[1]
+
+en = s:taboption("general", Button, "__toggle")
+
+if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then
+	en.title      = translate("Wireless network is disabled")
+	en.inputtitle = translate("Enable")
+	en.inputstyle = "apply"
+else
+	en.title      = translate("Wireless network is enabled")
+	en.inputtitle = translate("Disable")
+	en.inputstyle = "reset"
+end
+
+
+local hwtype = wdev:get("type")
+
+-- NanoFoo
+local nsantenna = wdev:get("antenna")
+
+-- Check whether there are client interfaces on the same radio,
+-- if yes, lock the channel choice as these stations will dicatate the freq
+local found_sta = nil
+local _, net
+if wnet:mode() ~= "sta" then
+	for _, net in ipairs(wdev:get_wifinets()) do
+		if net:mode() == "sta" then
+			if not found_sta then
+				found_sta = {}
+				found_sta.channel = net:channel()
+				found_sta.names = {}
+			end
+			found_sta.names[#found_sta.names+1] = net:shortname()
+		end
+	end
+end
+
+if found_sta then
+	ch = s:taboption("general", DummyValue, "choice", translate("Channel"))
+	ch.value = translatef("Locked to channel %d used by: %s",
+		found_sta.channel, table.concat(found_sta.names, ", "))
+else
+	ch = s:taboption("general", Value, "_mode_freq", '<br />'..translate("Operating frequency"))
+	ch.hwmodes = iw.hwmodelist
+	ch.freqlist = iw.freqlist
+	ch.template = "cbi/wireless_modefreq"
+
+	function ch.cfgvalue(self, section)
+		return {
+			m:get(section, "hwmode") or "",
+			m:get(section, "channel") or "auto",
+			m:get(section, "htmode") or ""
+		}
+	end
+
+	function ch.formvalue(self, section)
+		return {
+			m:formvalue(self:cbid(section) .. ".band") or (iw.hwmodelist.g and "11g" or "11a"),
+			m:formvalue(self:cbid(section) .. ".channel") or "auto",
+			m:formvalue(self:cbid(section) .. ".htmode") or ""
+		}
+	end
+
+	function ch.write(self, section, value)
+		m:set(section, "hwmode", value[1])
+		m:set(section, "channel", value[2])
+		m:set(section, "htmode", value[3])
+	end
+end
+
+------------------- MAC80211 Device ------------------
+
+if hwtype == "mac80211" then
+	if #tx_power_list > 1 then
+		tp = s:taboption("general", ListValue,
+			"txpower", translate("Transmit Power"), "dBm")
+		tp.rmempty = true
+		tp.default = tx_power_cur
+		function tp.cfgvalue(...)
+			return txpower_current(Value.cfgvalue(...), tx_power_list)
+		end
+
+		for _, p in ipairs(tx_power_list) do
+			tp:value(p.driver_dbm, "%i dBm (%i mW)"
+				%{ p.display_dbm, p.display_mw })
+		end
+	end
+
+	local cl = iw and iw.countrylist
+	if cl and #cl > 0 then
+		cc = s:taboption("advanced", ListValue, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes."))
+		cc.default = tostring(iw and iw.country or "00")
+		for _, c in ipairs(cl) do
+			cc:value(c.alpha2, "%s - %s" %{ c.alpha2, c.name })
+		end
+	else
+		s:taboption("advanced", Value, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes."))
+	end
+
+	s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
+		translate("Distance to farthest network member in meters."))
+
+	-- external antenna profiles
+	local eal = iw and iw.extant
+	if eal and #eal > 0 then
+		ea = s:taboption("advanced", ListValue, "extant", translate("Antenna Configuration"))
+		for _, eap in ipairs(eal) do
+			ea:value(eap.id, "%s (%s)" %{ eap.name, eap.description })
+			if eap.selected then
+				ea.default = eap.id
+			end
+		end
+	end
+
+	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+	s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+end
+
+
+------------------- Madwifi Device ------------------
+
+if hwtype == "atheros" then
+	tp = s:taboption("general",
+		(#tx_power_list > 0) and ListValue or Value,
+		"txpower", translate("Transmit Power"), "dBm")
+
+	tp.rmempty = true
+	tp.default = tx_power_cur
+
+	function tp.cfgvalue(...)
+		return txpower_current(Value.cfgvalue(...), tx_power_list)
+	end
+
+	for _, p in ipairs(tx_power_list) do
+		tp:value(p.driver_dbm, "%i dBm (%i mW)"
+			%{ p.display_dbm, p.display_mw })
+	end
+
+	s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
+
+	if not nsantenna then
+		ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
+		ant1.widget = "radio"
+		ant1.orientation = "horizontal"
+		ant1:depends("diversity", "")
+		ant1:value("0", translate("auto"))
+		ant1:value("1", translate("Antenna 1"))
+		ant1:value("2", translate("Antenna 2"))
+
+		ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
+		ant2.widget = "radio"
+		ant2.orientation = "horizontal"
+		ant2:depends("diversity", "")
+		ant2:value("0", translate("auto"))
+		ant2:value("1", translate("Antenna 1"))
+		ant2:value("2", translate("Antenna 2"))
+
+	else -- NanoFoo
+		local ant = s:taboption("advanced", ListValue, "antenna", translate("Transmitter Antenna"))
+		ant:value("auto")
+		ant:value("vertical")
+		ant:value("horizontal")
+		ant:value("external")
+	end
+
+	s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
+		translate("Distance to farthest network member in meters."))
+	s:taboption("advanced", Value, "regdomain", translate("Regulatory Domain"))
+	s:taboption("advanced", Value, "country", translate("Country Code"))
+	s:taboption("advanced", Flag, "outdoor", translate("Outdoor Channels"))
+
+	--s:option(Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
+end
+
+
+
+------------------- Broadcom Device ------------------
+
+if hwtype == "broadcom" then
+	tp = s:taboption("general",
+		(#tx_power_list > 0) and ListValue or Value,
+		"txpower", translate("Transmit Power"), "dBm")
+
+	tp.rmempty = true
+	tp.default = tx_power_cur
+
+	function tp.cfgvalue(...)
+		return txpower_current(Value.cfgvalue(...), tx_power_list)
+	end
+
+	for _, p in ipairs(tx_power_list) do
+		tp:value(p.driver_dbm, "%i dBm (%i mW)"
+			%{ p.display_dbm, p.display_mw })
+	end
+
+	ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
+	ant1.widget = "radio"
+	ant1:depends("diversity", "")
+	ant1:value("3", translate("auto"))
+	ant1:value("0", translate("Antenna 1"))
+	ant1:value("1", translate("Antenna 2"))
+
+	ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
+	ant2.widget = "radio"
+	ant2:depends("diversity", "")
+	ant2:value("3", translate("auto"))
+	ant2:value("0", translate("Antenna 1"))
+	ant2:value("1", translate("Antenna 2"))
+
+	s:taboption("advanced", Flag, "frameburst", translate("Frame Bursting"))
+
+	s:taboption("advanced", Value, "distance", translate("Distance Optimization"))
+	--s:option(Value, "slottime", translate("Slot time"))
+
+	s:taboption("advanced", Value, "country", translate("Country Code"))
+	s:taboption("advanced", Value, "maxassoc", translate("Connection Limit"))
+end
+
+
+--------------------- HostAP Device ---------------------
+
+if hwtype == "prism2" then
+	s:taboption("advanced", Value, "txpower", translate("Transmit Power"), "att units").rmempty = true
+
+	s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
+
+	s:taboption("advanced", Value, "txantenna", translate("Transmitter Antenna"))
+	s:taboption("advanced", Value, "rxantenna", translate("Receiver Antenna"))
+end
+
+
+----------------------- Interface -----------------------
+
+s = m:section(NamedSection, wnet.sid, "wifi-iface", translate("Interface Configuration"))
+ifsection = s
+s.addremove = false
+s.anonymous = true
+s.defaults.device = wdev:name()
+
+s:tab("general", translate("General Setup"))
+s:tab("encryption", translate("Wireless Security"))
+s:tab("macfilter", translate("MAC-Filter"))
+s:tab("advanced", translate("Advanced Settings"))
+
+s:taboption("general", Value, "ssid", translate("<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+
+mode = s:taboption("general", ListValue, "mode", translate("Mode"))
+mode.override_values = true
+mode:value("ap", translate("Access Point"))
+mode:value("sta", translate("Client"))
+mode:value("adhoc", translate("Ad-Hoc"))
+
+bssid = s:taboption("general", Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
+
+network = s:taboption("general", Value, "network", translate("Network"),
+	translate("Choose the network(s) you want to attach to this wireless interface or " ..
+		"fill out the <em>create</em> field to define a new network."))
+
+network.rmempty = true
+network.template = "cbi/network_netlist"
+network.widget = "checkbox"
+network.novirtual = true
+
+function network.write(self, section, value)
+	local i = nw:get_interface(section)
+	if i then
+		if value == '-' then
+			value = m:formvalue(self:cbid(section) .. ".newnet")
+			if value and #value > 0 then
+				local n = nw:add_network(value, {proto="none"})
+				if n then n:add_interface(i) end
+			else
+				local n = i:get_network()
+				if n then n:del_interface(i) end
+			end
+		else
+			local v
+			for _, v in ipairs(i:get_networks()) do
+				v:del_interface(i)
+			end
+			for v in ut.imatch(value) do
+				local n = nw:get_network(v)
+				if n then
+					if not n:is_empty() then
+						n:set("type", "bridge")
+					end
+					n:add_interface(i)
+				end
+			end
+		end
+	end
+end
+
+-------------------- MAC80211 Interface ----------------------
+
+if hwtype == "mac80211" then
+	if fs.access("/usr/sbin/iw") then
+		mode:value("mesh", "802.11s")
+	end
+
+	mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
+	mode:value("monitor", translate("Monitor"))
+	bssid:depends({mode="adhoc"})
+	bssid:depends({mode="sta"})
+	bssid:depends({mode="sta-wds"})
+
+	mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter"))
+	mp:depends({mode="ap"})
+	mp:depends({mode="ap-wds"})
+	mp:value("", translate("disable"))
+	mp:value("allow", translate("Allow listed only"))
+	mp:value("deny", translate("Allow all except listed"))
+
+	ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
+	ml.datatype = "macaddr"
+	ml:depends({macfilter="allow"})
+	ml:depends({macfilter="deny"})
+	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
+
+	mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
+	mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
+
+	function mode.write(self, section, value)
+		if value == "ap-wds" then
+			ListValue.write(self, section, "ap")
+			m.uci:set("wireless", section, "wds", 1)
+		elseif value == "sta-wds" then
+			ListValue.write(self, section, "sta")
+			m.uci:set("wireless", section, "wds", 1)
+		else
+			ListValue.write(self, section, value)
+			m.uci:delete("wireless", section, "wds")
+		end
+	end
+
+	function mode.cfgvalue(self, section)
+		local mode = ListValue.cfgvalue(self, section)
+		local wds  = m.uci:get("wireless", section, "wds") == "1"
+
+		if mode == "ap" and wds then
+			return "ap-wds"
+		elseif mode == "sta" and wds then
+			return "sta-wds"
+		else
+			return mode
+		end
+	end
+
+	hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+	hidden:depends({mode="ap"})
+	hidden:depends({mode="ap-wds"})
+
+	wmm = s:taboption("general", Flag, "wmm", translate("WMM Mode"))
+	wmm:depends({mode="ap"})
+	wmm:depends({mode="ap-wds"})
+	wmm.default = wmm.enabled
+end
+
+
+
+-------------------- Madwifi Interface ----------------------
+
+if hwtype == "atheros" then
+	mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
+	mode:value("monitor", translate("Monitor"))
+	mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
+	mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
+	mode:value("wds", translate("Static WDS"))
+
+	function mode.write(self, section, value)
+		if value == "ap-wds" then
+			ListValue.write(self, section, "ap")
+			m.uci:set("wireless", section, "wds", 1)
+		elseif value == "sta-wds" then
+			ListValue.write(self, section, "sta")
+			m.uci:set("wireless", section, "wds", 1)
+		else
+			ListValue.write(self, section, value)
+			m.uci:delete("wireless", section, "wds")
+		end
+	end
+
+	function mode.cfgvalue(self, section)
+		local mode = ListValue.cfgvalue(self, section)
+		local wds  = m.uci:get("wireless", section, "wds") == "1"
+
+		if mode == "ap" and wds then
+			return "ap-wds"
+		elseif mode == "sta" and wds then
+			return "sta-wds"
+		else
+			return mode
+		end
+	end
+
+	bssid:depends({mode="adhoc"})
+	bssid:depends({mode="ahdemo"})
+	bssid:depends({mode="wds"})
+
+	wdssep = s:taboption("advanced", Flag, "wdssep", translate("Separate WDS"))
+	wdssep:depends({mode="ap-wds"})
+
+	s:taboption("advanced", Flag, "doth", "802.11h")
+	hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+	hidden:depends({mode="ap"})
+	hidden:depends({mode="adhoc"})
+	hidden:depends({mode="ap-wds"})
+	hidden:depends({mode="sta-wds"})
+	isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
+	 translate("Prevents client-to-client communication"))
+	isolate:depends({mode="ap"})
+	s:taboption("advanced", Flag, "bgscan", translate("Background Scan"))
+
+	mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
+	mp:value("", translate("disable"))
+	mp:value("allow", translate("Allow listed only"))
+	mp:value("deny", translate("Allow all except listed"))
+
+	ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
+	ml.datatype = "macaddr"
+	ml:depends({macpolicy="allow"})
+	ml:depends({macpolicy="deny"})
+	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
+
+	s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
+	s:taboption("advanced", Value, "mcast_rate", translate("Multicast Rate"))
+	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+	s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+	s:taboption("advanced", Value, "minrate", translate("Minimum Rate"))
+	s:taboption("advanced", Value, "maxrate", translate("Maximum Rate"))
+	s:taboption("advanced", Flag, "compression", translate("Compression"))
+
+	s:taboption("advanced", Flag, "bursting", translate("Frame Bursting"))
+	s:taboption("advanced", Flag, "turbo", translate("Turbo Mode"))
+	s:taboption("advanced", Flag, "ff", translate("Fast Frames"))
+
+	s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
+	s:taboption("advanced", Flag, "xr", translate("XR Support"))
+	s:taboption("advanced", Flag, "ar", translate("AR Support"))
+
+	local swm = s:taboption("advanced", Flag, "sw_merge", translate("Disable HW-Beacon timer"))
+	swm:depends({mode="adhoc"})
+
+	local nos = s:taboption("advanced", Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
+	nos:depends({mode="sta"})
+	nos:depends({mode="sta-wds"})
+
+	local probereq = s:taboption("advanced", Flag, "probereq", translate("Do not send probe responses"))
+	probereq.enabled  = "0"
+	probereq.disabled = "1"
+end
+
+
+-------------------- Broadcom Interface ----------------------
+
+if hwtype == "broadcom" then
+	mode:value("wds", translate("WDS"))
+	mode:value("monitor", translate("Monitor"))
+
+	hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+	hidden:depends({mode="ap"})
+	hidden:depends({mode="adhoc"})
+	hidden:depends({mode="wds"})
+
+	isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
+	 translate("Prevents client-to-client communication"))
+	isolate:depends({mode="ap"})
+
+	s:taboption("advanced", Flag, "doth", "802.11h")
+	s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
+
+	bssid:depends({mode="wds"})
+	bssid:depends({mode="adhoc"})
+end
+
+
+----------------------- HostAP Interface ---------------------
+
+if hwtype == "prism2" then
+	mode:value("wds", translate("WDS"))
+	mode:value("monitor", translate("Monitor"))
+
+	hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+	hidden:depends({mode="ap"})
+	hidden:depends({mode="adhoc"})
+	hidden:depends({mode="wds"})
+
+	bssid:depends({mode="sta"})
+
+	mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
+	mp:value("", translate("disable"))
+	mp:value("allow", translate("Allow listed only"))
+	mp:value("deny", translate("Allow all except listed"))
+	ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
+	ml:depends({macpolicy="allow"})
+	ml:depends({macpolicy="deny"})
+	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
+
+	s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
+	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+	s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+end
+
+
+------------------- WiFI-Encryption -------------------
+
+encr = s:taboption("encryption", ListValue, "encryption", translate("Encryption"))
+encr.override_values = true
+encr.override_depends = true
+encr:depends({mode="ap"})
+encr:depends({mode="sta"})
+encr:depends({mode="adhoc"})
+encr:depends({mode="ahdemo"})
+encr:depends({mode="ap-wds"})
+encr:depends({mode="sta-wds"})
+encr:depends({mode="mesh"})
+
+cipher = s:taboption("encryption", ListValue, "cipher", translate("Cipher"))
+cipher:depends({encryption="wpa"})
+cipher:depends({encryption="wpa2"})
+cipher:depends({encryption="psk"})
+cipher:depends({encryption="psk2"})
+cipher:depends({encryption="wpa-mixed"})
+cipher:depends({encryption="psk-mixed"})
+cipher:value("auto", translate("auto"))
+cipher:value("ccmp", translate("Force CCMP (AES)"))
+cipher:value("tkip", translate("Force TKIP"))
+cipher:value("tkip+ccmp", translate("Force TKIP and CCMP (AES)"))
+
+function encr.cfgvalue(self, section)
+	local v = tostring(ListValue.cfgvalue(self, section))
+	if v == "wep" then
+		return "wep-open"
+	elseif v and v:match("%+") then
+		return (v:gsub("%+.+$", ""))
+	end
+	return v
+end
+
+function encr.write(self, section, value)
+	local e = tostring(encr:formvalue(section))
+	local c = tostring(cipher:formvalue(section))
+	if value == "wpa" or value == "wpa2"  then
+		self.map.uci:delete("wireless", section, "key")
+	end
+	if e and (c == "tkip" or c == "ccmp" or c == "tkip+ccmp") then
+		e = e .. "+" .. c
+	end
+	self.map:set(section, "encryption", e)
+end
+
+function cipher.cfgvalue(self, section)
+	local v = tostring(ListValue.cfgvalue(encr, section))
+	if v and v:match("%+") then
+		v = v:gsub("^[^%+]+%+", "")
+		if v == "aes" then v = "ccmp"
+		elseif v == "tkip+aes" then v = "tkip+ccmp"
+		elseif v == "aes+tkip" then v = "tkip+ccmp"
+		elseif v == "ccmp+tkip" then v = "tkip+ccmp"
+		end
+	end
+	return v
+end
+
+function cipher.write(self, section)
+	return encr:write(section)
+end
+
+
+encr:value("none", "No Encryption")
+encr:value("wep-open",   translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"})
+encr:value("wep-shared", translate("WEP Shared Key"),  {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"})
+
+if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
+	local supplicant = fs.access("/usr/sbin/wpa_supplicant")
+	local hostapd = fs.access("/usr/sbin/hostapd")
+
+	-- Probe EAP support
+	local has_ap_eap  = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0)
+	local has_sta_eap = (os.execute("wpa_supplicant -veap >/dev/null 2>/dev/null") == 0)
+
+	if hostapd and supplicant then
+		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+		if has_ap_eap and has_sta_eap then
+			encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+			encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
+		end
+	elseif hostapd and not supplicant then
+		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="ap-wds"})
+		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="ap-wds"})
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="ap-wds"})
+		if has_ap_eap then
+			encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="ap-wds"})
+			encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="ap-wds"})
+		end
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)
+	elseif not hostapd and supplicant then
+		encr:value("psk", "WPA-PSK", {mode="sta"}, {mode="sta-wds"})
+		encr:value("psk2", "WPA2-PSK", {mode="sta"}, {mode="sta-wds"})
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"}, {mode="sta-wds"})
+		if has_sta_eap then
+			encr:value("wpa", "WPA-EAP", {mode="sta"}, {mode="sta-wds"})
+			encr:value("wpa2", "WPA2-EAP", {mode="sta"}, {mode="sta-wds"})
+		end
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)
+	else
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)
+	end
+elseif hwtype == "broadcom" then
+	encr:value("psk", "WPA-PSK")
+	encr:value("psk2", "WPA2-PSK")
+	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
+end
+
+auth_server = s:taboption("encryption", Value, "auth_server", translate("Radius-Authentication-Server"))
+auth_server:depends({mode="ap", encryption="wpa"})
+auth_server:depends({mode="ap", encryption="wpa2"})
+auth_server:depends({mode="ap-wds", encryption="wpa"})
+auth_server:depends({mode="ap-wds", encryption="wpa2"})
+auth_server.rmempty = true
+auth_server.datatype = "host"
+
+auth_port = s:taboption("encryption", Value, "auth_port", translate("Radius-Authentication-Port"), translatef("Default %d", 1812))
+auth_port:depends({mode="ap", encryption="wpa"})
+auth_port:depends({mode="ap", encryption="wpa2"})
+auth_port:depends({mode="ap-wds", encryption="wpa"})
+auth_port:depends({mode="ap-wds", encryption="wpa2"})
+auth_port.rmempty = true
+auth_port.datatype = "port"
+
+auth_secret = s:taboption("encryption", Value, "auth_secret", translate("Radius-Authentication-Secret"))
+auth_secret:depends({mode="ap", encryption="wpa"})
+auth_secret:depends({mode="ap", encryption="wpa2"})
+auth_secret:depends({mode="ap-wds", encryption="wpa"})
+auth_secret:depends({mode="ap-wds", encryption="wpa2"})
+auth_secret.rmempty = true
+auth_secret.password = true
+
+acct_server = s:taboption("encryption", Value, "acct_server", translate("Radius-Accounting-Server"))
+acct_server:depends({mode="ap", encryption="wpa"})
+acct_server:depends({mode="ap", encryption="wpa2"})
+acct_server:depends({mode="ap-wds", encryption="wpa"})
+acct_server:depends({mode="ap-wds", encryption="wpa2"})
+acct_server.rmempty = true
+acct_server.datatype = "host"
+
+acct_port = s:taboption("encryption", Value, "acct_port", translate("Radius-Accounting-Port"), translatef("Default %d", 1813))
+acct_port:depends({mode="ap", encryption="wpa"})
+acct_port:depends({mode="ap", encryption="wpa2"})
+acct_port:depends({mode="ap-wds", encryption="wpa"})
+acct_port:depends({mode="ap-wds", encryption="wpa2"})
+acct_port.rmempty = true
+acct_port.datatype = "port"
+
+acct_secret = s:taboption("encryption", Value, "acct_secret", translate("Radius-Accounting-Secret"))
+acct_secret:depends({mode="ap", encryption="wpa"})
+acct_secret:depends({mode="ap", encryption="wpa2"})
+acct_secret:depends({mode="ap-wds", encryption="wpa"})
+acct_secret:depends({mode="ap-wds", encryption="wpa2"})
+acct_secret.rmempty = true
+acct_secret.password = true
+
+wpakey = s:taboption("encryption", Value, "_wpa_key", translate("Key"))
+wpakey:depends("encryption", "psk")
+wpakey:depends("encryption", "psk2")
+wpakey:depends("encryption", "psk+psk2")
+wpakey:depends("encryption", "psk-mixed")
+wpakey.datatype = "wpakey"
+wpakey.rmempty = true
+wpakey.password = true
+
+wpakey.cfgvalue = function(self, section, value)
+	local key = m.uci:get("wireless", section, "key")
+	if key == "1" or key == "2" or key == "3" or key == "4" then
+		return nil
+	end
+	return key
+end
+
+wpakey.write = function(self, section, value)
+	self.map.uci:set("wireless", section, "key", value)
+	self.map.uci:delete("wireless", section, "key1")
+end
+
+
+wepslot = s:taboption("encryption", ListValue, "_wep_key", translate("Used Key Slot"))
+wepslot:depends("encryption", "wep-open")
+wepslot:depends("encryption", "wep-shared")
+wepslot:value("1", translatef("Key #%d", 1))
+wepslot:value("2", translatef("Key #%d", 2))
+wepslot:value("3", translatef("Key #%d", 3))
+wepslot:value("4", translatef("Key #%d", 4))
+
+wepslot.cfgvalue = function(self, section)
+	local slot = tonumber(m.uci:get("wireless", section, "key"))
+	if not slot or slot < 1 or slot > 4 then
+		return 1
+	end
+	return slot
+end
+
+wepslot.write = function(self, section, value)
+	self.map.uci:set("wireless", section, "key", value)
+end
+
+local slot
+for slot=1,4 do
+	wepkey = s:taboption("encryption", Value, "key" .. slot, translatef("Key #%d", slot))
+	wepkey:depends("encryption", "wep-open")
+	wepkey:depends("encryption", "wep-shared")
+	wepkey.datatype = "wepkey"
+	wepkey.rmempty = true
+	wepkey.password = true
+
+	function wepkey.write(self, section, value)
+		if value and (#value == 5 or #value == 13) then
+			value = "s:" .. value
+		end
+		return Value.write(self, section, value)
+	end
+end
+
+
+if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
+	nasid = s:taboption("encryption", Value, "nasid", translate("NAS ID"))
+	nasid:depends({mode="ap", encryption="wpa"})
+	nasid:depends({mode="ap", encryption="wpa2"})
+	nasid:depends({mode="ap-wds", encryption="wpa"})
+	nasid:depends({mode="ap-wds", encryption="wpa2"})
+	nasid.rmempty = true
+
+	eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method"))
+	eaptype:value("tls",  "TLS")
+	eaptype:value("ttls", "TTLS")
+	eaptype:value("peap", "PEAP")
+	eaptype:depends({mode="sta", encryption="wpa"})
+	eaptype:depends({mode="sta", encryption="wpa2"})
+	eaptype:depends({mode="sta-wds", encryption="wpa"})
+	eaptype:depends({mode="sta-wds", encryption="wpa2"})
+
+	cacert = s:taboption("encryption", FileUpload, "ca_cert", translate("Path to CA-Certificate"))
+	cacert:depends({mode="sta", encryption="wpa"})
+	cacert:depends({mode="sta", encryption="wpa2"})
+	cacert:depends({mode="sta-wds", encryption="wpa"})
+	cacert:depends({mode="sta-wds", encryption="wpa2"})
+
+	clientcert = s:taboption("encryption", FileUpload, "client_cert", translate("Path to Client-Certificate"))
+	clientcert:depends({mode="sta", encryption="wpa"})
+	clientcert:depends({mode="sta", encryption="wpa2"})
+	clientcert:depends({mode="sta-wds", encryption="wpa"})
+	clientcert:depends({mode="sta-wds", encryption="wpa2"})
+
+	privkey = s:taboption("encryption", FileUpload, "priv_key", translate("Path to Private Key"))
+	privkey:depends({mode="sta", eap_type="tls", encryption="wpa2"})
+	privkey:depends({mode="sta", eap_type="tls", encryption="wpa"})
+	privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
+	privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
+
+	privkeypwd = s:taboption("encryption", Value, "priv_key_pwd", translate("Password of Private Key"))
+	privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa2"})
+	privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa"})
+	privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
+	privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
+
+
+	auth = s:taboption("encryption", Value, "auth", translate("Authentication"))
+	auth:value("PAP")
+	auth:value("CHAP")
+	auth:value("MSCHAP")
+	auth:value("MSCHAPV2")
+	auth:depends({mode="sta", eap_type="peap", encryption="wpa2"})
+	auth:depends({mode="sta", eap_type="peap", encryption="wpa"})
+	auth:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
+	auth:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+	auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
+	auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
+	auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
+	auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
+
+
+	identity = s:taboption("encryption", Value, "identity", translate("Identity"))
+	identity:depends({mode="sta", eap_type="peap", encryption="wpa2"})
+	identity:depends({mode="sta", eap_type="peap", encryption="wpa"})
+	identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
+	identity:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+	identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
+	identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
+	identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
+	identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
+
+	password = s:taboption("encryption", Value, "password", translate("Password"))
+	password:depends({mode="sta", eap_type="peap", encryption="wpa2"})
+	password:depends({mode="sta", eap_type="peap", encryption="wpa"})
+	password:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
+	password:depends({mode="sta", eap_type="ttls", encryption="wpa"})
+	password:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
+	password:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
+	password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
+	password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
+end
+
+if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
+	local wpasupplicant = fs.access("/usr/sbin/wpa_supplicant")
+	local hostcli = fs.access("/usr/sbin/hostapd_cli")
+	if hostcli and wpasupplicant then
+		wps = s:taboption("encryption", Flag, "wps_pushbutton", translate("Enable WPS pushbutton, requires WPA(2)-PSK"))
+		wps.enabled = "1"
+		wps.disabled = "0"
+		wps.rmempty = false
+		wps:depends("encryption", "psk")
+		wps:depends("encryption", "psk2")
+		wps:depends("encryption", "psk-mixed")
+	end
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
new file mode 100644
index 00000000..cb426488
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -0,0 +1,184 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs   = require "nixio.fs"
+local nw   = require "luci.model.network"
+local fw   = require "luci.model.firewall"
+local uci  = require "luci.model.uci".cursor()
+local http = require "luci.http"
+
+local iw = luci.sys.wifi.getiwinfo(http.formvalue("device"))
+
+local has_firewall = fs.access("/etc/config/firewall")
+
+if not iw then
+	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+	return
+end
+
+m = SimpleForm("network", translate("Join Network: Settings"))
+m.cancel = translate("Back to scan results")
+m.reset = false
+
+function m.on_cancel()
+	local dev = http.formvalue("device")
+	http.redirect(luci.dispatcher.build_url(
+		dev and "admin/network/wireless_join?device=" .. dev
+			or "admin/network/wireless"
+	))
+end
+
+nw.init(uci)
+fw.init(uci)
+
+m.hidden = {
+	device      = http.formvalue("device"),
+	join        = http.formvalue("join"),
+	channel     = http.formvalue("channel"),
+	mode        = http.formvalue("mode"),
+	bssid       = http.formvalue("bssid"),
+	wep         = http.formvalue("wep"),
+	wpa_suites	= http.formvalue("wpa_suites"),
+	wpa_version = http.formvalue("wpa_version")
+}
+
+if iw and iw.mbssid_support then
+	replace = m:field(Flag, "replace", translate("Replace wireless configuration"),
+		translate("An additional network will be created if you leave this unchecked."))
+
+	function replace.cfgvalue() return "1" end
+else
+	replace = m:field(DummyValue, "replace", translate("Replace wireless configuration"))
+	replace.default = translate("The hardware is not multi-SSID capable and the existing " ..
+		"configuration will be replaced if you proceed.")
+
+	function replace.formvalue() return "1" end
+end
+
+if http.formvalue("wep") == "1" then
+	key = m:field(Value, "key", translate("WEP passphrase"),
+		translate("Specify the secret encryption key here."))
+
+	key.password = true
+	key.datatype = "wepkey"
+
+elseif (tonumber(m.hidden.wpa_version) or 0) > 0 and
+	(m.hidden.wpa_suites == "PSK" or m.hidden.wpa_suites == "PSK2")
+then
+	key = m:field(Value, "key", translate("WPA passphrase"),
+		translate("Specify the secret encryption key here."))
+
+	key.password = true
+	key.datatype = "wpakey"
+	--m.hidden.wpa_suite = (tonumber(http.formvalue("wpa_version")) or 0) >= 2 and "psk2" or "psk"
+end
+
+newnet = m:field(Value, "_netname_new", translate("Name of the new network"),
+	translate("The allowed characters are: <code>A-Z</code>, <code>a-z</code>, " ..
+		"<code>0-9</code> and <code>_</code>"
+	))
+
+newnet.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wwan"
+newnet.datatype = "uciname"
+
+if has_firewall then
+	fwzone = m:field(Value, "_fwzone",
+		translate("Create / Assign firewall-zone"),
+		translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
+
+	fwzone.template = "cbi/firewall_zonelist"
+	fwzone.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wan"
+end
+
+function newnet.parse(self, section)
+	local net, zone
+
+	if has_firewall then
+		local zval  = fwzone:formvalue(section)
+		zone = fw:get_zone(zval)
+
+		if not zone and zval == '-' then
+			zval = m:formvalue(fwzone:cbid(section) .. ".newzone")
+			if zval and #zval > 0 then
+				zone = fw:add_zone(zval)
+			end
+		end
+	end
+
+	local wdev = nw:get_wifidev(m.hidden.device)
+
+	wdev:set("disabled", false)
+	wdev:set("channel", m.hidden.channel)
+
+	if replace:formvalue(section) then
+		local n
+		for _, n in ipairs(wdev:get_wifinets()) do
+			wdev:del_wifinet(n)
+		end
+	end
+
+	local wconf = {
+		device  = m.hidden.device,
+		ssid    = m.hidden.join,
+		mode    = (m.hidden.mode == "Ad-Hoc" and "adhoc" or "sta")
+	}
+
+	if m.hidden.wep == "1" then
+		wconf.encryption = "wep-open"
+		wconf.key        = "1"
+		wconf.key1       = key and key:formvalue(section) or ""
+	elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
+		wconf.encryption = (tonumber(m.hidden.wpa_version) or 0) >= 2 and "psk2" or "psk"
+		wconf.key        = key and key:formvalue(section) or ""
+	else
+		wconf.encryption = "none"
+	end
+
+	if wconf.mode == "adhoc" or wconf.mode == "sta" then
+		wconf.bssid = m.hidden.bssid
+	end
+
+	local value = self:formvalue(section)
+	net = nw:add_network(value, { proto = "dhcp" })
+
+	if not net then
+		self.error = { [section] = "missing" }
+	else
+		wconf.network = net:name()
+
+		local wnet = wdev:add_wifinet(wconf)
+		if wnet then
+			if zone then
+				fw:del_network(net:name())
+				zone:add_network(net:name())
+			end
+
+			uci:save("wireless")
+			uci:save("network")
+			uci:save("firewall")
+
+			luci.http.redirect(wnet:adminlink())
+		end
+	end
+end
+
+if has_firewall then
+	function fwzone.cfgvalue(self, section)
+		self.iface = section
+		local z = fw:get_zone_by_network(section)
+		return z and z:name()
+	end
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua
new file mode 100644
index 00000000..c34c70ff
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_status/processes.lua
@@ -0,0 +1,44 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+f = SimpleForm("processes", translate("Processes"), translate("This list gives an overview over currently running system processes and their status."))
+f.reset = false
+f.submit = false
+
+t = f:section(Table, luci.sys.process.list())
+t:option(DummyValue, "PID", translate("PID"))
+t:option(DummyValue, "USER", translate("Owner"))
+t:option(DummyValue, "COMMAND", translate("Command"))
+t:option(DummyValue, "%CPU", translate("CPU usage (%)"))
+t:option(DummyValue, "%MEM", translate("Memory usage (%)"))
+
+hup = t:option(Button, "_hup", translate("Hang Up"))
+hup.inputstyle = "reload"
+function hup.write(self, section)
+	null, self.tag_error[section] = luci.sys.process.signal(section, 1)
+end
+
+term = t:option(Button, "_term", translate("Terminate"))
+term.inputstyle = "remove"
+function term.write(self, section)
+	null, self.tag_error[section] = luci.sys.process.signal(section, 15)
+end
+
+kill = t:option(Button, "_kill", translate("Kill"))
+kill.inputstyle = "reset"
+function kill.write(self, section)
+	null, self.tag_error[section] = luci.sys.process.signal(section, 9)
+end
+
+return f
\ No newline at end of file
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/admin.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/admin.lua
new file mode 100644
index 00000000..a3da6beb
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/admin.lua
@@ -0,0 +1,130 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs = require "nixio.fs"
+
+m = Map("system", translate("Router Password"),
+	translate("Changes the administrator password for accessing the device"))
+
+s = m:section(TypedSection, "_dummy", "")
+s.addremove = false
+s.anonymous = true
+
+pw1 = s:option(Value, "pw1", translate("Password"))
+pw1.password = true
+
+pw2 = s:option(Value, "pw2", translate("Confirmation"))
+pw2.password = true
+
+function s.cfgsections()
+	return { "_pass" }
+end
+
+function m.on_commit(map)
+	local v1 = pw1:formvalue("_pass")
+	local v2 = pw2:formvalue("_pass")
+
+	if v1 and v2 and #v1 > 0 and #v2 > 0 then
+		if v1 == v2 then
+			if luci.sys.user.setpasswd(luci.dispatcher.context.authuser, v1) == 0 then
+				m.message = translate("Password successfully changed!")
+			else
+				m.message = translate("Unknown Error, password not changed!")
+			end
+		else
+			m.message = translate("Given password confirmation did not match, password not changed!")
+		end
+	end
+end
+
+
+if fs.access("/etc/config/dropbear") then
+
+m2 = Map("dropbear", translate("SSH Access"),
+	translate("Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"))
+
+s = m2:section(TypedSection, "dropbear", translate("Dropbear Instance"))
+s.anonymous = true
+s.addremove = true
+
+
+ni = s:option(Value, "Interface", translate("Interface"),
+	translate("Listen only on the given interface or, if unspecified, on all"))
+
+ni.template    = "cbi/network_netlist"
+ni.nocreate    = true
+ni.unspecified = true
+
+
+pt = s:option(Value, "Port", translate("Port"),
+	translate("Specifies the listening port of this <em>Dropbear</em> instance"))
+
+pt.datatype = "port"
+pt.default  = 22
+
+
+pa = s:option(Flag, "PasswordAuth", translate("Password authentication"),
+	translate("Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"))
+
+pa.enabled  = "on"
+pa.disabled = "off"
+pa.default  = pa.enabled
+pa.rmempty  = false
+
+
+ra = s:option(Flag, "RootPasswordAuth", translate("Allow root logins with password"),
+	translate("Allow the <em>root</em> user to login with password"))
+
+ra.enabled  = "on"
+ra.disabled = "off"
+ra.default  = ra.enabled
+
+
+gp = s:option(Flag, "GatewayPorts", translate("Gateway ports"),
+	translate("Allow remote hosts to connect to local SSH forwarded ports"))
+
+gp.enabled  = "on"
+gp.disabled = "off"
+gp.default  = gp.disabled
+
+
+s2 = m2:section(TypedSection, "_dummy", translate("SSH-Keys"),
+	translate("Here you can paste public SSH-Keys (one per line) for SSH public-key authentication."))
+s2.addremove = false
+s2.anonymous = true
+s2.template  = "cbi/tblsection"
+
+function s2.cfgsections()
+	return { "_keys" }
+end
+
+keys = s2:option(TextValue, "_data", "")
+keys.wrap    = "off"
+keys.rows    = 3
+keys.rmempty = false
+
+function keys.cfgvalue()
+	return fs.readfile("/etc/dropbear/authorized_keys") or ""
+end
+
+function keys.write(self, section, value)
+	if value then
+		fs.writefile("/etc/dropbear/authorized_keys", value:gsub("\r\n", "\n"))
+	end
+end
+
+end
+
+return m, m2
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
new file mode 100644
index 00000000..a063ec0a
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
@@ -0,0 +1,92 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+
+if luci.http.formvalue("cbid.luci.1._list") then
+	luci.http.redirect(luci.dispatcher.build_url("admin/system/flashops/backupfiles") .. "?display=list")
+elseif luci.http.formvalue("cbid.luci.1._edit") then
+	luci.http.redirect(luci.dispatcher.build_url("admin/system/flashops/backupfiles") .. "?display=edit")
+	return
+end
+
+m = SimpleForm("luci", translate("Backup file list"))
+m:append(Template("admin_system/backupfiles"))
+
+if luci.http.formvalue("display") ~= "list" then
+	f = m:section(SimpleSection, nil, translate("This is a list of shell glob patterns for matching files and directories to include during sysupgrade. Modified files in /etc/config/ and certain other configurations are automatically preserved."))
+
+	l = f:option(Button, "_list", translate("Show current backup file list"))
+	l.inputtitle = translate("Open list...")
+	l.inputstyle = "apply"
+
+	c = f:option(TextValue, "_custom")
+	c.rmempty = false
+	c.cols = 70
+	c.rows = 30
+
+	c.cfgvalue = function(self, section)
+		return nixio.fs.readfile("/etc/sysupgrade.conf")
+	end
+
+	c.write = function(self, section, value)
+		value = value:gsub("\r\n?", "\n")
+		return nixio.fs.writefile("/etc/sysupgrade.conf", value)
+	end
+else
+	m.submit = false
+	m.reset  = false
+
+	f = m:section(SimpleSection, nil, translate("Below is the determined list of files to backup. It consists of changed configuration files marked by opkg, essential base files and the user defined backup patterns."))
+
+	l = f:option(Button, "_edit", translate("Back to configuration"))
+	l.inputtitle = translate("Close list...")
+	l.inputstyle = "link"
+
+
+	d = f:option(DummyValue, "_detected")
+	d.rawhtml = true
+	d.cfgvalue = function(s)
+		local list = io.popen(
+			"( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' /etc/sysupgrade.conf " ..
+			"/lib/upgrade/keep.d/* 2>/dev/null) -type f 2>/dev/null; " ..
+			"opkg list-changed-conffiles ) | sort -u"
+		)
+
+		if list then
+			local files = { "<ul>" }
+
+			while true do
+				local ln = list:read("*l")
+				if not ln then
+					break
+				else
+					files[#files+1] = "<li>"
+					files[#files+1] = luci.util.pcdata(ln)
+					files[#files+1] = "</li>"
+				end
+			end
+
+			list:close()
+			files[#files+1] = "</ul>"
+
+			return table.concat(files, "")
+		end
+
+		return "<em>" .. translate("No files found") .. "</em>"
+	end
+
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
new file mode 100644
index 00000000..d7581830
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
@@ -0,0 +1,38 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("system", translate("Buttons"),
+	translate("This page allows the configuration of custom button actions"))
+
+s = m:section(TypedSection, "button", "")
+s.anonymous = true
+s.addremove = true
+
+s:option(Value, "button", translate("Name"))
+
+act = s:option(ListValue, "action",
+	translate("Action"),
+	translate("Specifies the button state to handle"))
+
+act:value("released")
+
+s:option(Value, "handler",
+	translate("Handler"),
+	translate("Path to executable which handles the button event"))
+
+min = s:option(Value, "min", translate("Minimum hold time"))
+min.rmempty = true
+
+max = s:option(Value, "max", translate("Maximum hold time"))
+max.rmempty = true
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua
new file mode 100644
index 00000000..3e1b9d85
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/crontab.lua
@@ -0,0 +1,38 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2013 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs = require "nixio.fs"
+local cronfile = "/etc/crontabs/root" 
+
+f = SimpleForm("crontab", translate("Scheduled Tasks"), translate("This is the system crontab in which scheduled tasks can be defined."))
+
+t = f:field(TextValue, "crons")
+t.rmempty = true
+t.rows = 10
+function t.cfgvalue()
+	return fs.readfile(cronfile) or ""
+end
+
+function f.handle(self, state, data)
+	if state == FORM_VALID then
+		if data.crons then
+			fs.writefile(cronfile, data.crons:gsub("\r\n", "\n"))
+			luci.sys.call("/usr/bin/crontab %q" % cronfile)
+		end
+	end
+	return true
+end
+
+return f
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
new file mode 100644
index 00000000..8ac3d6d5
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -0,0 +1,156 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.tools.webadmin")
+
+local fs   = require "nixio.fs"
+local util = require "nixio.util"
+
+local devices = {}
+util.consume((fs.glob("/dev/sd*")), devices)
+util.consume((fs.glob("/dev/hd*")), devices)
+util.consume((fs.glob("/dev/scd*")), devices)
+util.consume((fs.glob("/dev/mmc*")), devices)
+
+local size = {}
+for i, dev in ipairs(devices) do
+	local s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
+	size[dev] = s and math.floor(s / 2048)
+end
+
+
+m = Map("fstab", translate("Mount Points"))
+
+local mounts = luci.sys.mounts()
+
+v = m:section(Table, mounts, translate("Mounted file systems"))
+
+fs = v:option(DummyValue, "fs", translate("Filesystem"))
+
+mp = v:option(DummyValue, "mountpoint", translate("Mount Point"))
+
+avail = v:option(DummyValue, "avail", translate("Available"))
+function avail.cfgvalue(self, section)
+	return luci.tools.webadmin.byte_format(
+		( tonumber(mounts[section].available) or 0 ) * 1024
+	) .. " / " .. luci.tools.webadmin.byte_format(
+		( tonumber(mounts[section].blocks) or 0 ) * 1024
+	)
+end
+
+used = v:option(DummyValue, "used", translate("Used"))
+function used.cfgvalue(self, section)
+	return ( mounts[section].percent or "0%" ) .. " (" ..
+	luci.tools.webadmin.byte_format(
+		( tonumber(mounts[section].used) or 0 ) * 1024
+	) .. ")"
+end
+
+
+
+mount = m:section(TypedSection, "mount", translate("Mount Points"), translate("Mount Points define at which point a memory device will be attached to the filesystem"))
+mount.anonymous = true
+mount.addremove = true
+mount.template = "cbi/tblsection"
+mount.extedit  = luci.dispatcher.build_url("admin/system/fstab/mount/%s")
+
+mount.create = function(...)
+	local sid = TypedSection.create(...)
+	if sid then
+		luci.http.redirect(mount.extedit % sid)
+		return
+	end
+end
+
+
+mount:option(Flag, "enabled", translate("Enabled")).rmempty = false
+
+dev = mount:option(DummyValue, "device", translate("Device"))
+dev.cfgvalue = function(self, section)
+	local v
+
+	v = m.uci:get("fstab", section, "uuid")
+	if v then return "UUID: %s" % v end
+
+	v = m.uci:get("fstab", section, "label")
+	if v then return "Label: %s" % v end
+
+	v = Value.cfgvalue(self, section) or "?"
+	return size[v] and "%s (%s MB)" % {v, size[v]} or v
+end
+
+mp = mount:option(DummyValue, "target", translate("Mount Point"))
+mp.cfgvalue = function(self, section)
+	if m.uci:get("fstab", section, "is_rootfs") == "1" then
+		return "/overlay"
+	else
+		return Value.cfgvalue(self, section) or "?"
+	end
+end
+
+fs = mount:option(DummyValue, "fstype", translate("Filesystem"))
+fs.cfgvalue = function(self, section)
+	return Value.cfgvalue(self, section) or "?"
+end
+
+op = mount:option(DummyValue, "options", translate("Options"))
+op.cfgvalue = function(self, section)
+	return Value.cfgvalue(self, section) or "defaults"
+end
+
+rf = mount:option(DummyValue, "is_rootfs", translate("Root"))
+rf.cfgvalue = function(self, section)
+	return Value.cfgvalue(self, section) == "1"
+		and translate("yes") or translate("no")
+end
+
+ck = mount:option(DummyValue, "enabled_fsck", translate("Check"))
+ck.cfgvalue = function(self, section)
+	return Value.cfgvalue(self, section) == "1"
+		and translate("yes") or translate("no")
+end
+
+
+swap = m:section(TypedSection, "swap", "SWAP", translate("If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."))
+swap.anonymous = true
+swap.addremove = true
+swap.template = "cbi/tblsection"
+swap.extedit  = luci.dispatcher.build_url("admin/system/fstab/swap/%s")
+
+swap.create = function(...)
+	local sid = TypedSection.create(...)
+	if sid then
+		luci.http.redirect(swap.extedit % sid)
+		return
+	end
+end
+
+
+swap:option(Flag, "enabled", translate("Enabled")).rmempty = false
+
+dev = swap:option(DummyValue, "device", translate("Device"))
+dev.cfgvalue = function(self, section)
+	local v
+
+	v = m.uci:get("fstab", section, "uuid")
+	if v then return "UUID: %s" % v end
+
+	v = m.uci:get("fstab", section, "label")
+	if v then return "Label: %s" % v end
+
+	v = Value.cfgvalue(self, section) or "?"
+	return size[v] and "%s (%s MB)" % {v, size[v]} or v
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
new file mode 100644
index 00000000..bac88688
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
@@ -0,0 +1,108 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs   = require "nixio.fs"
+local util = require "nixio.util"
+
+local has_extroot = fs.access("/sbin/block")
+local has_fscheck = fs.access("/usr/sbin/e2fsck")
+
+local devices = {}
+util.consume((fs.glob("/dev/sd*")), devices)
+util.consume((fs.glob("/dev/hd*")), devices)
+util.consume((fs.glob("/dev/scd*")), devices)
+util.consume((fs.glob("/dev/mmc*")), devices)
+
+local size = {}
+for i, dev in ipairs(devices) do
+	local s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
+	size[dev] = s and math.floor(s / 2048)
+end
+
+
+m = Map("fstab", translate("Mount Points - Mount Entry"))
+m.redirect = luci.dispatcher.build_url("admin/system/fstab")
+
+if not arg[1] or m.uci:get("fstab", arg[1]) ~= "mount" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+
+
+mount = m:section(NamedSection, arg[1], "mount", translate("Mount Entry"))
+mount.anonymous = true
+mount.addremove = false
+
+mount:tab("general",  translate("General Settings"))
+mount:tab("advanced", translate("Advanced Settings"))
+
+
+mount:taboption("general", Flag, "enabled", translate("Enable this mount")).rmempty = false
+
+
+o = mount:taboption("general", Value, "device", translate("Device"),
+	translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
+
+for i, d in ipairs(devices) do
+	o:value(d, size[d] and "%s (%s MB)" % {d, size[d]})
+end
+
+o = mount:taboption("advanced", Value, "uuid", translate("UUID"),
+	translate("If specified, mount the device by its UUID instead of a fixed device node"))
+
+o = mount:taboption("advanced", Value, "label", translate("Label"),
+	translate("If specified, mount the device by the partition label instead of a fixed device node"))
+
+
+o = mount:taboption("general", Value, "target", translate("Mount point"),
+	translate("Specifies the directory the device is attached to"))
+
+o:depends("is_rootfs", "")
+
+
+o = mount:taboption("general", Value, "fstype", translate("Filesystem"),
+	translate("The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"))
+
+local fs
+for fs in io.lines("/proc/filesystems") do
+	fs = fs:match("%S+")
+	if fs ~= "nodev" then
+		o:value(fs)
+	end
+end
+
+
+o = mount:taboption("advanced", Value, "options", translate("Mount options"),
+	translate("See \"mount\" manpage for details"))
+
+o.placeholder = "defaults"
+
+
+if has_extroot then
+	o = mount:taboption("general", Flag, "is_rootfs", translate("Use as root filesystem"),
+		translate("Configures this mount as overlay storage for block-extroot"))
+
+	o:depends("fstype", "jffs")
+	o:depends("fstype", "ext2")
+	o:depends("fstype", "ext3")
+	o:depends("fstype", "ext4")
+end
+
+if has_fscheck then
+	o = mount:taboption("general", Flag, "enabled_fsck", translate("Run filesystem check"),
+		translate("Run a filesystem check before mounting the device"))
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
new file mode 100644
index 00000000..01d0ff90
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
@@ -0,0 +1,65 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local fs   = require "nixio.fs"
+local util = require "nixio.util"
+
+local devices = {}
+util.consume((fs.glob("/dev/sd*")), devices)
+util.consume((fs.glob("/dev/hd*")), devices)
+util.consume((fs.glob("/dev/scd*")), devices)
+util.consume((fs.glob("/dev/mmc*")), devices)
+
+local size = {}
+for i, dev in ipairs(devices) do
+	local s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
+	size[dev] = s and math.floor(s / 2048)
+end
+
+
+m = Map("fstab", translate("Mount Points - Swap Entry"))
+m.redirect = luci.dispatcher.build_url("admin/system/fstab")
+
+if not arg[1] or m.uci:get("fstab", arg[1]) ~= "swap" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+
+mount = m:section(NamedSection, arg[1], "swap", translate("Swap Entry"))
+mount.anonymous = true
+mount.addremove = false
+
+mount:tab("general",  translate("General Settings"))
+mount:tab("advanced", translate("Advanced Settings"))
+
+
+mount:taboption("general", Flag, "enabled", translate("Enable this swap")).rmempty = false
+
+
+o = mount:taboption("general", Value, "device", translate("Device"),
+	translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
+
+for i, d in ipairs(devices) do
+	o:value(d, size[d] and "%s (%s MB)" % {d, size[d]})
+end
+
+o = mount:taboption("advanced", Value, "uuid", translate("UUID"),
+	translate("If specified, mount the device by its UUID instead of a fixed device node"))
+
+o = mount:taboption("advanced", Value, "label", translate("Label"),
+	translate("If specified, mount the device by the partition label instead of a fixed device node"))
+
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
new file mode 100644
index 00000000..e9ff5b14
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
@@ -0,0 +1,36 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local ipkgfile = "/etc/opkg.conf"
+
+f = SimpleForm("ipkgconf", translate("OPKG-Configuration"))
+
+f:append(Template("admin_system/ipkg"))
+
+t = f:field(TextValue, "lines")
+t.rows = 10
+function t.cfgvalue()
+	return nixio.fs.readfile(ipkgfile) or ""
+end
+
+function t.write(self, section, data)
+	return nixio.fs.writefile(ipkgfile, data:gsub("\r\n", "\n"))
+end
+
+function f.handle(self, state, data)
+	return true
+end
+
+return f
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
new file mode 100644
index 00000000..b912f5ec
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
@@ -0,0 +1,129 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+m = Map("system", translate("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), translate("Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."))
+
+local sysfs_path = "/sys/class/leds/"
+local leds = {}
+
+local fs   = require "nixio.fs"
+local util = require "nixio.util"
+
+if fs.access(sysfs_path) then
+	leds = util.consume((fs.dir(sysfs_path)))
+end
+
+if #leds == 0 then
+	return m
+end
+
+
+s = m:section(TypedSection, "led", "")
+s.anonymous = true
+s.addremove = true
+
+function s.parse(self, ...)
+	TypedSection.parse(self, ...)
+	os.execute("/etc/init.d/led enable")
+end
+
+
+s:option(Value, "name", translate("Name"))
+
+
+sysfs = s:option(ListValue, "sysfs", translate("<abbr title=\"Light Emitting Diode\">LED</abbr> Name"))
+for k, v in ipairs(leds) do
+	sysfs:value(v)
+end
+
+s:option(Flag, "default", translate("Default state")).rmempty = false
+
+
+trigger = s:option(ListValue, "trigger", translate("Trigger"))
+
+local triggers = fs.readfile(sysfs_path .. leds[1] .. "/trigger")
+for t in triggers:gmatch("[%w-]+") do
+	trigger:value(t, translate(t:gsub("-", "")))
+end
+
+
+delayon = s:option(Value, "delayon", translate ("On-State Delay"))
+delayon:depends("trigger", "timer")
+
+delayoff = s:option(Value, "delayoff", translate ("Off-State Delay"))
+delayoff:depends("trigger", "timer")
+
+
+dev = s:option(ListValue, "_net_dev", translate("Device"))
+dev.rmempty = true
+dev:value("")
+dev:depends("trigger", "netdev")
+
+function dev.cfgvalue(self, section)
+	return m.uci:get("system", section, "dev")
+end
+
+function dev.write(self, section, value)
+	m.uci:set("system", section, "dev", value)
+end
+
+function dev.remove(self, section)
+	local t = trigger:formvalue(section)
+	if t ~= "netdev" and t ~= "usbdev" then
+		m.uci:delete("system", section, "dev")
+	end
+end
+
+for k, v in pairs(luci.sys.net.devices()) do
+	if v ~= "lo" then
+		dev:value(v)
+	end
+end
+
+
+mode = s:option(MultiValue, "mode", translate("Trigger Mode"))
+mode.rmempty = true
+mode:depends("trigger", "netdev")
+mode:value("link", translate("Link On"))
+mode:value("tx", translate("Transmit"))
+mode:value("rx", translate("Receive"))
+
+
+usbdev = s:option(ListValue, "_usb_dev", translate("USB Device"))
+usbdev:depends("trigger", "usbdev")
+usbdev.rmempty = true
+usbdev:value("")
+
+function usbdev.cfgvalue(self, section)
+	return m.uci:get("system", section, "dev")
+end
+
+function usbdev.write(self, section, value)
+	m.uci:set("system", section, "dev", value)
+end
+
+function usbdev.remove(self, section)
+	local t = trigger:formvalue(section)
+	if t ~= "netdev" and t ~= "usbdev" then
+		m.uci:delete("system", section, "dev")
+	end
+end
+
+for p in nixio.fs.glob("/sys/bus/usb/devices/[0-9]*/manufacturer") do
+	local id = p:match("%d+-%d+")
+	local mf = nixio.fs.readfile("/sys/bus/usb/devices/" .. id .. "/manufacturer") or "?"
+	local pr = nixio.fs.readfile("/sys/bus/usb/devices/" .. id .. "/product")      or "?"
+	usbdev:value(id, "%s (%s - %s)" %{ id, mf, pr })
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/startup.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/startup.lua
new file mode 100644
index 00000000..fc35f774
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/startup.lua
@@ -0,0 +1,109 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2010 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require "luci.fs"
+require "luci.sys"
+require "luci.util"
+
+local inits = { }
+
+for _, name in ipairs(luci.sys.init.names()) do
+	local index   = luci.sys.init.index(name)
+	local enabled = luci.sys.init.enabled(name)
+
+	if index < 255 then
+		inits["%02i.%s" % { index, name }] = {
+			name    = name,
+			index   = tostring(index),
+			enabled = enabled
+		}
+	end
+end
+
+
+m = SimpleForm("initmgr", translate("Initscripts"), translate("You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccessible!</strong>"))
+m.reset = false
+m.submit = false
+
+
+s = m:section(Table, inits)
+
+i = s:option(DummyValue, "index", translate("Start priority"))
+n = s:option(DummyValue, "name", translate("Initscript"))
+
+
+e = s:option(Button, "endisable", translate("Enable/Disable"))
+
+e.render = function(self, section, scope)
+	if inits[section].enabled then
+		self.title = translate("Enabled")
+		self.inputstyle = "save"
+	else
+		self.title = translate("Disabled")
+		self.inputstyle = "reset"
+	end
+
+	Button.render(self, section, scope)
+end
+
+e.write = function(self, section)
+	if inits[section].enabled then
+		inits[section].enabled = false
+		return luci.sys.init.disable(inits[section].name)
+	else
+		inits[section].enabled = true
+		return luci.sys.init.enable(inits[section].name)
+	end
+end
+
+
+start = s:option(Button, "start", translate("Start"))
+start.inputstyle = "apply"
+start.write = function(self, section)
+	luci.sys.call("/etc/init.d/%s %s >/dev/null" %{ inits[section].name, self.option })
+end
+
+restart = s:option(Button, "restart", translate("Restart"))
+restart.inputstyle = "reload"
+restart.write = start.write
+
+stop = s:option(Button, "stop", translate("Stop"))
+stop.inputstyle = "remove"
+stop.write = start.write
+
+
+
+f = SimpleForm("rc", translate("Local Startup"),
+	translate("This is the content of /etc/rc.local. Insert your own commands here (in front of 'exit 0') to execute them at the end of the boot process."))
+
+t = f:field(TextValue, "rcs")
+t.rmempty = true
+t.rows = 20
+
+function t.cfgvalue()
+	return luci.fs.readfile("/etc/rc.local") or ""
+end
+
+function f.handle(self, state, data)
+	if state == FORM_VALID then
+		if data.rcs then
+			luci.fs.writefile("/etc/rc.local", data.rcs:gsub("\r\n", "\n"))
+		end
+	end
+	return true
+end
+
+return m, f
diff --git a/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
new file mode 100644
index 00000000..275f2a79
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -0,0 +1,228 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.sys")
+require("luci.sys.zoneinfo")
+require("luci.tools.webadmin")
+require("luci.fs")
+require("luci.config")
+
+local m, s, o
+local has_ntpd = luci.fs.access("/usr/sbin/ntpd")
+
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
+m:chain("luci")
+
+
+s = m:section(TypedSection, "system", translate("System Properties"))
+s.anonymous = true
+s.addremove = false
+
+s:tab("general",  translate("General Settings"))
+s:tab("logging",  translate("Logging"))
+s:tab("language", translate("Language and Style"))
+
+
+--
+-- System Properties
+--
+
+o = s:taboption("general", DummyValue, "_systime", translate("Local Time"))
+o.template = "admin_system/clock_status"
+
+
+o = s:taboption("general", Value, "hostname", translate("Hostname"))
+o.datatype = "hostname"
+
+function o.write(self, section, value)
+	Value.write(self, section, value)
+	luci.sys.hostname(value)
+end
+
+
+o = s:taboption("general", ListValue, "zonename", translate("Timezone"))
+o:value("UTC")
+
+for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
+	o:value(zone[1])
+end
+
+function o.write(self, section, value)
+	local function lookup_zone(title)
+		for _, zone in ipairs(luci.sys.zoneinfo.TZ) do
+			if zone[1] == title then return zone[2] end
+		end
+	end
+
+	AbstractValue.write(self, section, value)
+	local timezone = lookup_zone(value) or "GMT0"
+	self.map.uci:set("system", section, "timezone", timezone)
+	luci.fs.writefile("/etc/TZ", timezone .. "\n")
+end
+
+
+--
+-- Logging
+--
+
+o = s:taboption("logging", Value, "log_size", translate("System log buffer size"), "kiB")
+o.optional    = true
+o.placeholder = 16
+o.datatype    = "uinteger"
+
+o = s:taboption("logging", Value, "log_ip", translate("External system log server"))
+o.optional    = true
+o.placeholder = "0.0.0.0"
+o.datatype    = "ip4addr"
+
+o = s:taboption("logging", Value, "log_port", translate("External system log server port"))
+o.optional    = true
+o.placeholder = 514
+o.datatype    = "port"
+
+o = s:taboption("logging", ListValue, "conloglevel", translate("Log output level"))
+o:value(8, translate("Debug"))
+o:value(7, translate("Info"))
+o:value(6, translate("Notice"))
+o:value(5, translate("Warning"))
+o:value(4, translate("Error"))
+o:value(3, translate("Critical"))
+o:value(2, translate("Alert"))
+o:value(1, translate("Emergency"))
+
+o = s:taboption("logging", ListValue, "cronloglevel", translate("Cron Log Level"))
+o.default = 8
+o:value(5, translate("Debug"))
+o:value(8, translate("Normal"))
+o:value(9, translate("Warning"))
+
+
+--
+-- Langauge & Style
+--
+
+o = s:taboption("language", ListValue, "_lang", translate("Language"))
+o:value("auto")
+
+local i18ndir = luci.i18n.i18ndir .. "base."
+for k, v in luci.util.kspairs(luci.config.languages) do
+	local file = i18ndir .. k:gsub("_", "-")
+	if k:sub(1, 1) ~= "." and luci.fs.access(file .. ".lmo") then
+		o:value(k, v)
+	end
+end
+
+function o.cfgvalue(...)
+	return m.uci:get("luci", "main", "lang")
+end
+
+function o.write(self, section, value)
+	m.uci:set("luci", "main", "lang", value)
+end
+
+
+o = s:taboption("language", ListValue, "_mediaurlbase", translate("Design"))
+for k, v in pairs(luci.config.themes) do
+	if k:sub(1, 1) ~= "." then
+		o:value(v, k)
+	end
+end
+
+function o.cfgvalue(...)
+	return m.uci:get("luci", "main", "mediaurlbase")
+end
+
+function o.write(self, section, value)
+	m.uci:set("luci", "main", "mediaurlbase", value)
+end
+
+
+--
+-- NTP
+--
+
+if has_ntpd then
+
+	-- timeserver setup was requested, create section and reload page
+	if m:formvalue("cbid.system._timeserver._enable") then
+		m.uci:section("system", "timeserver", "ntp",
+			{
+                	server = { "0.librecmc.pool.ntp.org", "1.librecmc.pool.ntp.org", "2.librecmc.pool.ntp.org", "3.librecmc.pool.ntp.org" }
+			}
+		)
+
+		m.uci:save("system")
+		luci.http.redirect(luci.dispatcher.build_url("admin/system", arg[1]))
+		return
+	end
+
+	local has_section = false
+	m.uci:foreach("system", "timeserver", 
+		function(s) 
+			has_section = true 
+			return false
+	end)
+
+	if not has_section then
+
+		s = m:section(TypedSection, "timeserver", translate("Time Synchronization"))
+		s.anonymous   = true
+		s.cfgsections = function() return { "_timeserver" } end
+
+		x = s:option(Button, "_enable")
+		x.title      = translate("Time Synchronization is not configured yet.")
+		x.inputtitle = translate("Set up Time Synchronization")
+		x.inputstyle = "apply"
+
+	else
+		
+		s = m:section(TypedSection, "timeserver", translate("Time Synchronization"))
+		s.anonymous = true
+		s.addremove = false
+
+		o = s:option(Flag, "enable", translate("Enable NTP client"))
+		o.rmempty = false
+
+		function o.cfgvalue(self)
+			return luci.sys.init.enabled("sysntpd")
+				and self.enabled or self.disabled
+		end
+
+		function o.write(self, section, value)
+			if value == self.enabled then
+				luci.sys.init.enable("sysntpd")
+				luci.sys.call("env -i /etc/init.d/sysntpd start >/dev/null")
+			else
+				luci.sys.call("env -i /etc/init.d/sysntpd stop >/dev/null")
+				luci.sys.init.disable("sysntpd")
+			end
+		end
+
+
+		o = s:option(Flag, "enable_server", translate("Provide NTP server"))
+		o:depends("enable", "1")
+
+
+		o = s:option(DynamicList, "server", translate("NTP server candidates"))
+		o.datatype = "host"
+		o:depends("enable", "1")
+
+		-- retain server list even if disabled
+		function o.remove() end
+
+	end
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
new file mode 100644
index 00000000..297bc553
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -0,0 +1,120 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<%
+local fs   = require "nixio.fs"
+local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6")
+local has_traceroute6 = fs.access("/usr/bin/traceroute6")
+%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var stxhr = new XHR();
+
+	function update_status(field, proto)
+	{
+		var tool = field.name;
+		var addr = field.value;
+		var protocol = proto ? "6" : "";
+
+		var legend = document.getElementById('diag-rc-legend');
+		var output = document.getElementById('diag-rc-output');
+
+		if (legend && output)
+		{
+			output.innerHTML =
+				'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
+				'<%:Waiting for command to complete...%>'
+			;
+
+			legend.parentNode.style.display = 'block';
+			legend.style.display = 'inline';
+
+			stxhr.get('<%=luci.dispatcher.build_url("admin", "network")%>/diag_' + tool + protocol + '/' + addr, null,
+				function(x)
+				{
+					if (x.responseText)
+					{
+						legend.style.display = 'none';
+						output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
+					}
+					else
+					{
+						legend.style.display = 'none';
+						output.innerHTML = '<span class="error"><%:Bad address specified!%></span>';
+					}
+				}
+			);
+		}
+	}
+//]]></script>
+
+<form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
+	<div class="cbi-map">
+		<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+
+		<fieldset class="cbi-section">
+			<legend><%:Network Utilities%></legend>
+
+			<br />
+
+			<div style="width:30%; float:left">
+				<input style="margin: 5px 0" type="text" value="librecmc.org" name="ping" /><br />
+				<% if has_ping6 then %>
+				<select name="ping_proto" style="width:auto">
+					<option value="" selected="selected"><%:IPv4%></option>
+					<option value="6"><%:IPv6%></option>
+				</select>
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping, this.form.ping_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
+				<% end %>
+			</div>
+
+			<div style="width:33%; float:left">
+				<input style="margin: 5px 0" type="text" value="librecmc.org" name="traceroute" /><br />
+				<% if has_traceroute6 then %>
+				<select name="traceroute_proto" style="width:auto">
+					<option value="" selected="selected"><%:IPv4%></option>
+					<option value="6"><%:IPv6%></option>
+				</select>
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute, this.form.traceroute_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
+				<% end %>
+				<% if not has_traceroute6 then %>
+					<p>&#160;</p>
+					<p><%:Install iputils-traceroute6 for IPv6 traceroute%></p>
+				<% end %>
+			</div>
+
+			<div style="width:33%; float:left;">
+				<input style="margin: 5px 0" type="text" value="librecmc.org" name="nslookup" /><br />
+				<input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
+			</div>
+
+			<br style="clear:both" /><br />
+
+		</fieldset>
+	</div>
+
+	<fieldset class="cbi-section" style="display:none">
+		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
+		<span id="diag-rc-output"></span>
+	</fieldset>
+</form>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
new file mode 100644
index 00000000..4be06298
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
@@ -0,0 +1,258 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%-
+	local ntm = require "luci.model.network".init()
+	local fwm = require "luci.model.firewall".init()
+
+	local net
+	local ifaces = { }
+	local netlist = { }
+	for _, net in ipairs(ntm:get_networks()) do
+		if net:name() ~= "loopback" then
+			local z = fwm:get_zone_by_network(net:name())
+			ifaces[#ifaces+1] = net:name()
+			netlist[#netlist+1] = {
+				net:name(), z and z:name() or "-", z
+			}
+		end
+	end
+
+	table.sort(netlist,
+		function(a, b)
+			if a[2] ~= b[2] then
+				return a[2] < b[2]
+			else
+				return a[1] < b[1]
+			end
+		end)
+-%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	function iface_shutdown(id, reconnect) {
+		if (!reconnect && !confirm(String.format('<%_Really shutdown interface "%s" ?\nYou might lose access to this device if you are connected via this interface.%>', id)))
+			return;
+
+		var d = document.getElementById(id + '-ifc-description');
+		if (d)
+			d.innerHTML = reconnect
+				? '<em><%:Interface is reconnecting...%></em>'
+				: '<em><%:Interface is shutting down...%></em>';
+
+		var s = document.getElementById('ifc-rc-status');
+		if (s)
+		{
+			s.parentNode.style.display = 'block';
+			s.innerHTML = '<%:Waiting for changes to be applied...%>';
+		}
+
+		XHR.get('<%=luci.dispatcher.build_url("admin", "network")%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null,
+			function(x)
+			{
+				if (s)
+				{
+					s.innerHTML = reconnect
+						? '<%:Interface reconnected%>'
+						: '<%:Interface shut down%>';
+
+					window.setTimeout(function() {
+						s.parentNode.style.display = 'none';
+					}, 1000);
+				}
+			}
+		);
+	}
+
+
+	var iwxhr = new XHR();
+	var wifidevs = <%=luci.http.write_json(netdevs)%>;
+	var arptable = <%=luci.http.write_json(arpcache)%>;
+
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "iface_status", table.concat(ifaces, ","))%>', null,
+		function(x, ifcs)
+		{
+			if (ifcs)
+			{
+				for (var idx = 0; idx < ifcs.length; idx++)
+				{
+					var ifc = ifcs[idx];
+					var html = '';
+
+					var s = document.getElementById(ifc.id + '-ifc-devices');
+					if (s)
+					{
+						var stat = String.format(
+							'<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px; vertical-align:middle" />',
+								ifc.type,
+								ifc.is_up ? '' : '_disabled'
+						);
+
+						if (ifc.subdevices && ifc.subdevices.length)
+						{
+							stat += ' <strong>(';
+
+							for (var j = 0; j < ifc.subdevices.length; j++)
+							{
+								var sif = ifc.subdevices[j];
+
+								stat += String.format(
+									'<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px; vertical-align:middle" title="%h" />',
+										sif.type,
+										sif.is_up ? '' : '_disabled',
+										sif.name
+								);
+							}
+
+							stat += ')</strong>';
+						}
+
+						stat += String.format(
+							'<br /><small>%h</small>',
+								ifc.name
+						);
+
+						s.innerHTML = stat;
+					}
+
+					var d = document.getElementById(ifc.id + '-ifc-description');
+					if (d && ifc.proto && ifc.ifname)
+					{
+						if (ifc.is_up)
+						{
+							html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime);
+						}
+
+						if (ifc.type != 'tunnel')
+						{
+							html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr);
+						}
+
+						html += String.format(
+							'<strong><%:RX%></strong>: %.2mB (%d <%:Pkts.%>)<br />' +
+							'<strong><%:TX%></strong>: %.2mB (%d <%:Pkts.%>)<br />',
+								ifc.rx_bytes, ifc.rx_packets,
+								ifc.tx_bytes, ifc.tx_packets
+						);
+
+						if (ifc.ipaddrs && ifc.ipaddrs.length)
+						{
+							html += '<strong><%:IPv4%>: </strong>';
+
+							for (var i = 0; i < ifc.ipaddrs.length; i++)
+								html += String.format(
+									'%s%s/%d',
+									i ? ', ' : '',
+									ifc.ipaddrs[i].addr,
+									ifc.ipaddrs[i].prefix
+								);
+
+							html += '<br />';
+						}
+
+						if (ifc.ip6addrs && ifc.ip6addrs.length)
+						{
+							html += '<strong><%:IPv6%>: </strong>';
+
+							for (var i = 0; i < ifc.ip6addrs.length; i++)
+								html += String.format(
+									'%s%s/%d',
+									i ? ', ' : '',
+									ifc.ip6addrs[i].addr.toUpperCase(),
+									ifc.ip6addrs[i].prefix
+								);
+
+							html += '<br />';
+						}
+
+						d.innerHTML = html;
+					}
+					else if (d && !ifc.proto)
+					{
+						var e = document.getElementById(ifc.id + '-ifc-edit');
+						if (e)
+							e.disabled = true;
+
+						d.innerHTML = String.format(
+							'<em><%:Unsupported protocol type.%></em><br />' +
+							'<a href="%h"><%:Install protocol extensions...%></a>',
+								'<%=luci.dispatcher.build_url("admin/system/packages")%>?query=luci-proto&display=available'
+						);
+					}
+					else if (d && !ifc.ifname)
+					{
+						d.innerHTML = String.format(
+							'<em><%:Network without interfaces.%></em><br />' +
+							'<a href="<%=luci.dispatcher.build_url("admin/network/network/%s")%>?tab.network.%s=physical"><%:Assign interfaces...%></a>',
+								ifc.name, ifc.name
+						);
+					}
+					else if (d)
+					{
+						d.innerHTML = '<em><%:Interface not present or not connected yet.%></em>';
+					}
+				}
+			}
+		}
+	);
+//]]></script>
+
+<fieldset class="cbi-section" style="display:none">
+	<legend><%:Reconnecting interface%></legend>
+	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+	<span id="ifc-rc-status"><%:Waiting for changes to be applied...%></span>
+</fieldset>
+
+<div class="cbi-map">
+	<fieldset class="cbi-section">
+		<legend><%:Interface Overview%></legend>
+
+		<table class="cbi-section-table" style="margin:10px; empty-cells:hide">
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell"><%:Network%></th>
+				<th class="cbi-section-table-cell" style="text-align:left"><%:Status%></th>
+				<th class="cbi-section-table-cell"><%:Actions%></th>
+			</tr>
+			<%
+				for i, net in ipairs(netlist) do
+					local z = net[3]
+					local c = z and z:get_color() or "#EEEEEE"
+					local t = z and translate("Part of zone %q" % z:name()) or translate("No zone assigned")
+			%>
+				<tr class="cbi-section-table-row cbi-rowstyle-<%=i % 2 + 1%>">
+					<td class="cbi-value-field" style="padding:3px">
+						<div class="ifacebox">
+							<div class="ifacebox-head" style="background-color:<%=c%>" title="<%=pcdata(t)%>">
+								<strong><%=net[1]:upper()%></strong>
+							</div>
+							<div class="ifacebox-body" id="<%=net[1]%>-ifc-devices">
+								<img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br />
+								<small>?</small>
+							</div>
+						</div>
+					</td>
+					<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net[1]%>-ifc-description">
+						<em><%:Collecting data...%></em>
+					</td>
+					<td style="width:420px">
+						<input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" />
+						<input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" />
+						<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" />
+						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this interface.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/iface_delete", net[1])%>'" title="<%:Delete this interface%>" value="<%:Delete%>" />
+					</td>
+				</tr>
+			<% end %>
+		</table>
+
+		<input type="button" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/iface_add")%>'" />
+	</fieldset>
+</div>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_status.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_status.htm
new file mode 100644
index 00000000..81363839
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/iface_status.htm
@@ -0,0 +1,94 @@
+<%+cbi/valueheader%>
+
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "iface_status", self.network)%>', null,
+		function(x, ifc)
+		{
+			if (ifc && (ifc = ifc[0]))
+			{
+				var html = '';
+
+				var s = document.getElementById('<%=self.option%>-ifc-signal');
+				if (s)
+					s.innerHTML = String.format(
+						'<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px" />' +
+						'<br /><small>%s</small>',
+							ifc.type, ifc.is_up ? '' : '_disabled',
+							ifc.name
+					);
+
+				var d = document.getElementById('<%=self.option%>-ifc-description');
+				if (d && ifc.ifname)
+				{
+					if (ifc.is_up)
+					{
+						html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime);
+					}
+
+					if (ifc.type != 'tunnel')
+					{
+						html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr);
+					}
+
+					html += String.format(
+						'<strong><%:RX%></strong>: %.2mB (%d <%:Pkts.%>)<br />' +
+						'<strong><%:TX%></strong>: %.2mB (%d <%:Pkts.%>)<br />',
+							ifc.rx_bytes, ifc.rx_packets,
+							ifc.tx_bytes, ifc.tx_packets
+					);
+
+					if (ifc.ipaddrs && ifc.ipaddrs.length)
+					{
+						html += '<strong><%:IPv4%>: </strong>';
+
+						for (var i = 0; i < ifc.ipaddrs.length; i++)
+							html += String.format(
+								'%s%s/%d',
+								i ? ', ' : '',
+								ifc.ipaddrs[i].addr,
+								ifc.ipaddrs[i].prefix
+							);
+
+						html += '<br />';
+					}
+
+					if (ifc.ip6addrs && ifc.ip6addrs.length)
+					{
+						html += '<strong><%:IPv6%>: </strong>';
+
+						for (var i = 0; i < ifc.ip6addrs.length; i++)
+							html += String.format(
+								'%s%s/%d',
+								i ? ', ' : '',
+								ifc.ip6addrs[i].addr.toUpperCase(),
+								ifc.ip6addrs[i].prefix
+							);
+
+						html += '<br />';
+					}
+
+					d.innerHTML = html;
+				}
+				else if (d)
+				{
+					d.innerHTML = '<em><%:Interface not present or not connected yet.%></em>';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<table>
+	<tr class="cbi-section-table">
+		<td></td>
+		<td class="cbi-value-field" style="min-width:16px; padding:3px; text-align:center" id="<%=self.option%>-ifc-signal">
+			<img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br />
+			<small>?</small>
+		</td>
+		<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=self.option%>-ifc-description">
+			<em><%:Collecting data...%></em>
+		</td>
+	</tr>
+</table>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/lease_status.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/lease_status.htm
new file mode 100644
index 00000000..0ba334ee
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/lease_status.htm
@@ -0,0 +1,118 @@
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "dhcplease_status")%>', null,
+		function(x, st)
+		{
+			var tb = document.getElementById('lease_status_table');
+			if (st && st[0] && tb)
+			{
+				/* clear all rows */
+				while( tb.rows.length > 1 )
+					tb.deleteRow(1);
+
+				for( var i = 0; i < st[0].length; i++ )
+				{
+					var timestr;
+
+					if (st[0][i].expires <= 0)
+					{
+						timestr = '<em><%:expired%></em>';
+					}
+					else
+					{
+						timestr = String.format('%t', st[0][i].expires);
+					}
+
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+					tr.insertCell(-1).innerHTML = st[0][i].hostname ? st[0][i].hostname : '?';
+					tr.insertCell(-1).innerHTML = st[0][i].ipaddr;
+					tr.insertCell(-1).innerHTML = st[0][i].macaddr;
+					tr.insertCell(-1).innerHTML = timestr;
+				}
+
+				if( tb.rows.length == 1 )
+				{
+					var tr = tb.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 4;
+						td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+				}
+			}
+
+			var tb6 = document.getElementById('lease6_status_table');
+			if (st && st[1] && tb6)
+			{
+				tb6.parentNode.style.display = 'block';
+
+				/* clear all rows */
+				while( tb6.rows.length > 1 )
+					tb6.deleteRow(1);
+
+				for( var i = 0; i < st[1].length; i++ )
+				{
+					var timestr;
+
+					if (st[1][i].expires <= 0)
+					{
+						timestr = '<em><%:expired%></em>';
+					}
+					else
+					{
+						timestr = String.format('%t', st[1][i].expires);
+					}
+
+					var tr = tb6.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+					tr.insertCell(-1).innerHTML = st[1][i].hostname ? st[1][i].hostname : '?';
+					tr.insertCell(-1).innerHTML = st[1][i].ip6addr;
+					tr.insertCell(-1).innerHTML = st[1][i].duid;
+					tr.insertCell(-1).innerHTML = timestr;
+				}
+
+				if( tb6.rows.length == 1 )
+				{
+					var tr = tb6.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 4;
+						td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<fieldset class="cbi-section">
+	<legend><%:Active DHCP Leases%></legend>
+	<table class="cbi-section-table" id="lease_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Hostname%></th>
+			<th class="cbi-section-table-cell"><%:IPv4-Address%></th>
+			<th class="cbi-section-table-cell"><%:MAC-Address%></th>
+			<th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="4"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+
+<fieldset class="cbi-section" style="display:none">
+	<legend><%:Active DHCPv6 Leases%></legend>
+	<table class="cbi-section-table" id="lease6_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Hostname%></th>
+			<th class="cbi-section-table-cell"><%:IPv6-Address%></th>
+			<th class="cbi-section-table-cell"><%:DUID%></th>
+			<th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="4"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/switch_status.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/switch_status.htm
new file mode 100644
index 00000000..b299575e
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/switch_status.htm
@@ -0,0 +1,41 @@
+<script type="text/javascript">//<![CDATA[
+	var switches = [ '<%=table.concat(self.switches, "', '")%>' ];
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "switch_status")%>/' + switches.join(','), null,
+		function(x, st)
+		{
+			for (var i = 0; i < switches.length; i++)
+			{
+				var ports = st[switches[i]];
+				var th0 = document.getElementById('portstatus-' + switches[i]);
+
+				if (th0 && ports && ports.length)
+				{
+					if (!th0.innerHTML)
+						th0.innerHTML = '<%:Port status:%>';
+
+					for (var j = 0; j < ports.length; j++)
+					{
+						var th = th0.parentNode.parentNode.childNodes[j+1];
+
+						if (ports[j].link)
+						{
+							th.innerHTML = String.format(
+								'<small><img src="<%=resource%>/icons/port_up.png" />' +
+								'<br />%d<%:baseT%><br />%s</small>',
+								ports[j].speed, ports[j].duplex
+									? '<%:full-duplex%>' : '<%:half-duplex%>'
+							);
+						}
+						else
+						{
+							th.innerHTML = String.format(
+								'<small><img src="<%=resource%>/icons/port_down.png" />' +
+								'<br /><%:no link%></small>'
+							);
+						}
+					}
+				}
+			}
+		}
+	);
+//]]></script>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
new file mode 100644
index 00000000..f3b6ddde
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -0,0 +1,156 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%-
+
+	local sys = require "luci.sys"
+	local utl = require "luci.util"
+
+	function guess_wifi_signal(info)
+		local scale = (100 / (info.quality_max or 100) * (info.quality or 0))
+		local icon
+
+		if not info.bssid or info.bssid == "00:00:00:00:00:00" then
+			icon = resource .. "/icons/signal-none.png"
+		elseif scale < 15 then
+			icon = resource .. "/icons/signal-0.png"
+		elseif scale < 35 then
+			icon = resource .. "/icons/signal-0-25.png"
+		elseif scale < 55 then
+			icon = resource .. "/icons/signal-25-50.png"
+		elseif scale < 75 then
+			icon = resource .. "/icons/signal-50-75.png"
+		else
+			icon = resource .. "/icons/signal-75-100.png"
+		end
+
+		return icon
+	end
+
+	function percent_wifi_signal(info)
+		local qc = info.quality or 0
+		local qm = info.quality_max or 0
+
+		if info.bssid and qc > 0 and qm > 0 then
+			return math.floor((100 / qm) * qc)
+		else
+			return 0
+		end
+	end
+
+	function format_wifi_encryption(info)
+		if info.wep == true then
+			return "WEP"
+		elseif info.wpa > 0 then
+			return translatef("<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>",
+				table.concat(info.pair_ciphers, ", "),
+				table.concat(info.group_ciphers, ", "),
+				(info.wpa == 3) and translate("mixed WPA/WPA2")
+					or (info.wpa == 2 and "WPA2" or "WPA"),
+				table.concat(info.auth_suites, ", ")
+			)
+		elseif info.enabled then
+			return "<em>%s</em>" % translate("unknown")
+		else
+			return "<em>%s</em>" % translate("open")
+		end
+	end
+
+	local dev = luci.http.formvalue("device")
+	local iw = luci.sys.wifi.getiwinfo(dev)
+
+	if not iw then
+		luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+		return
+	end
+
+
+	function scanlist(times)
+		local i, k, v
+		local l = { }
+		local s = { }
+
+		for i = 1, times do
+			for k, v in ipairs(iw.scanlist or { }) do
+				if not s[v.bssid] then
+					l[#l+1] = v
+					s[v.bssid] = true
+				end
+			end
+		end
+
+		return l
+	end
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Join Network: Wireless Scan%></a></h2>
+
+<div class="cbi-map">
+	<fieldset class="cbi-section">
+		<table class="cbi-section-table" style="empty-cells:hide">
+			<!-- scan list -->
+			<% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %>
+			<tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
+				<td class="cbi-value-field" style="width:16px; padding:3px">
+					<abbr title="<%:Signal%>: <%=net.signal%> <%:dB%> / <%:Quality%>: <%=net.quality%>/<%=net.quality_max%>">
+						<img src="<%=guess_wifi_signal(net)%>" /><br />
+						<small><%=percent_wifi_signal(net)%>%</small>
+					</abbr>
+				</td>
+				<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
+					<big><strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong></big><br />
+					<strong>Channel:</strong> <%=net.channel%> |
+					<strong>Mode:</strong> <%=net.mode%> |
+					<strong>BSSID:</strong> <%=net.bssid%> |
+					<strong>Encryption:</strong> <%=format_wifi_encryption(net.encryption)%>
+				</td>
+				<td class="cbi-value-field" style="width:40px">
+					<form action="<%=REQUEST_URI%>" method="post">
+						<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
+						<input type="hidden" name="join" value="<%=utl.pcdata(net.ssid)%>" />
+						<input type="hidden" name="mode" value="<%=net.mode%>" />
+						<input type="hidden" name="bssid" value="<%=net.bssid%>" />
+						<input type="hidden" name="channel" value="<%=net.channel%>" />
+						<input type="hidden" name="wep" value="<%=net.encryption.wep and 1 or 0%>" />
+						<% if net.encryption.wpa then %>
+						<input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>" />
+						<% for _, v in ipairs(net.encryption.auth_suites) do %><input type="hidden" name="wpa_suites" value="<%=v%>" />
+						<% end; for _, v in ipairs(net.encryption.group_ciphers) do %><input type="hidden" name="wpa_group" value="<%=v%>" />
+						<% end; for _, v in ipairs(net.encryption.pair_ciphers) do %><input type="hidden" name="wpa_pairwise" value="<%=v%>" />
+						<% end; end %>
+
+						<input type="hidden" name="clbridge" value="<%=iw.type == "wl" and 1 or 0%>" />
+
+						<input class="cbi-button cbi-button-apply" type="submit" value="<%:Join Network%>" />
+					</form>
+				</td>
+			</tr>
+			<% end %>
+			<!-- /scan list -->
+		</table>
+	</fieldset>
+</div>
+<div class="cbi-page-actions right">
+	<form class="inline" action="<%=luci.dispatcher.build_url("admin/network/wireless")%>" method="get">
+		<input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" />
+	</form>
+	<form class="inline" action="<%=REQUEST_URI%>" method="get">
+		<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
+		<input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>" />
+	</form>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
new file mode 100644
index 00000000..312fd086
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -0,0 +1,441 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008-2009 Steven Barth <steven@midlink.org>
+Copyright 2008-2013 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%-
+
+	local sys = require "luci.sys"
+	local fs = require "luci.fs"
+	local utl = require "luci.util"
+	local uci = require "luci.model.uci".cursor()
+	local ntm = require "luci.model.network"
+
+	local has_iwinfo = pcall(require, "iwinfo")
+
+	ntm.init(uci)
+
+	function guess_wifi_hw(dev)
+		local bands = ""
+		local ifname = dev:name()
+		local name, idx = ifname:match("^([a-z]+)(%d+)")
+		idx = tonumber(idx)
+
+		if has_iwinfo then
+			local bl = dev.iwinfo.hwmodelist
+			if bl and next(bl) then
+				if bl.a then bands = bands .. "a" end
+				if bl.b then bands = bands .. "b" end
+				if bl.g then bands = bands .. "g" end
+				if bl.n then bands = bands .. "n" end
+				if bl.ac then bands = bands .. "ac" end
+			end
+
+			local hw = dev.iwinfo.hardware_name
+			if hw then
+				return "%s 802.11%s" %{ hw, bands }
+			end
+		end
+
+		-- wl.o
+		if name == "wl" then
+			local name = translatef("Broadcom 802.11%s Wireless Controller", bands)
+			local nm   = 0
+
+			local fd = nixio.open("/proc/bus/pci/devices", "r")
+			if fd then
+				local ln
+				for ln in fd:linesource() do
+					if ln:match("wl$") then
+						if nm == idx then
+							local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)")
+							name = translatef(
+								"Broadcom BCM%04x 802.11 Wireless Controller",
+								tonumber(version, 16)
+							)
+
+							break
+						else
+							nm = nm + 1
+						end
+					end
+				end
+				fd:close()
+			end
+
+			return name
+
+		-- madwifi
+		elseif name == "ath" or name == "wifi" then
+			return translatef("Atheros 802.11%s Wireless Controller", bands)
+
+		-- ralink
+		elseif name == "ra" then
+			return translatef("RaLink 802.11%s Wireless Controller", bands)
+
+		-- hermes
+		elseif name == "eth" then
+			return translate("Hermes 802.11b Wireless Controller")
+
+		-- hostap
+		elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then
+			return translate("Prism2/2.5/3 802.11b Wireless Controller")
+
+		-- dunno yet
+		else
+			return translatef("Generic 802.11%s Wireless Controller", bands)
+		end
+	end
+
+	local devices  = ntm:get_wifidevs()
+	local arpcache = { }
+	sys.net.arptable(function(e) arpcache[e["HW address"]:upper()] = e["IP address"] end)
+
+	local netlist = { }
+	local netdevs = { }
+
+	local dev
+	for _, dev in ipairs(devices) do
+		local net
+		for _, net in ipairs(dev:get_wifinets()) do
+			netlist[#netlist+1] = net:id()
+			netdevs[net:id()] = dev:name()
+		end
+	end
+-%>
+
+<%+header%>
+
+<% if not has_iwinfo then %>
+	<div class="errorbox">
+		<strong><%:Package libiwinfo required!%></strong><br />
+		<%_The <em>libiwinfo-lua</em> package is not installed. You must install this component for working wireless configuration!%>
+	</div>
+<% end %>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var wifidevs = <%=luci.http.write_json(netdevs)%>;
+	var arptable = <%=luci.http.write_json(arpcache)%>;
+
+	var is_reconnecting = false;
+
+	function nowrap(s) {
+		return s.replace(/ /g, '&#160;');
+	}
+
+	function wifi_shutdown(id, toggle) {
+		var reconnect = (toggle.getAttribute('active') == 'false');
+
+		if (!reconnect && !confirm(String.format('<%:Really shut down network?\nYou might lose access to this device if you are connected via this interface.%>')))
+			return;
+
+		is_reconnecting = true;
+
+		var s = document.getElementById('iw-rc-status');
+		if (s)
+		{
+			s.parentNode.style.display = 'block';
+			s.innerHTML = '<%:Waiting for changes to be applied...%>';
+		}
+
+		for (var net in wifidevs)
+		{
+			var st = document.getElementById(net + '-iw-status');
+			if (st)
+				st.innerHTML = '<em><%:Wireless is restarting...%></em>';
+		}
+
+		XHR.get('<%=luci.dispatcher.build_url("admin", "network")%>/wireless_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null,
+			function(x)
+			{
+				if (s)
+				{
+					s.innerHTML = reconnect
+						? '<%:Wireless restarted%>'
+						: '<%:Wireless shut down%>';
+
+					window.setTimeout(function() {
+						s.parentNode.style.display = 'none';
+						is_reconnecting = false;
+					}, 1000);
+				}
+			}
+		);
+	}
+
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null,
+		function(x, st)
+		{
+			if (st)
+			{
+				var assoctable = document.getElementById('iw-assoclist');
+				if (assoctable)
+					while (assoctable.rows.length > 1)
+						assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]);
+
+				var devup = { };
+				var rowstyle = 1;
+
+				for( var i = 0; i < st.length; i++ )
+				{
+					var iw = st[i];
+					var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && iw.mode != 'Unknown');
+					var p = iw.quality;
+					var q = is_assoc ? p : -1;
+
+					var icon;
+					if (q < 0)
+						icon = "<%=resource%>/icons/signal-none.png";
+					else if (q == 0)
+						icon = "<%=resource%>/icons/signal-0.png";
+					else if (q < 25)
+						icon = "<%=resource%>/icons/signal-0-25.png";
+					else if (q < 50)
+						icon = "<%=resource%>/icons/signal-25-50.png";
+					else if (q < 75)
+						icon = "<%=resource%>/icons/signal-50-75.png";
+					else
+						icon = "<%=resource%>/icons/signal-75-100.png";
+
+					if (!devup[wifidevs[iw.id]])
+						devup[wifidevs[iw.id]] = is_assoc;
+
+					var sig = document.getElementById(iw.id + '-iw-signal');
+					if (sig)
+						sig.innerHTML = String.format(
+							'<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" /><br />' +
+							'<small>%d%%</small>', icon, iw.signal, iw.noise, p
+						);
+
+					var toggle = document.getElementById(iw.id + '-iw-toggle');
+					if (toggle)
+					{
+						if (!iw.disabled)
+						{
+							toggle.className = 'cbi-button cbi-button-reset';
+							toggle.value = '<%:Disable%>';
+							toggle.title = '<%:Shutdown this network%>';
+						}
+						else
+						{
+							toggle.className = 'cbi-button cbi-button-reload';
+							toggle.value = '<%:Enable%>';
+							toggle.title = '<%:Activate this network%>';
+						}
+
+						toggle.setAttribute('active', !iw.disabled);
+					}
+
+					var info = document.getElementById(iw.id + '-iw-status');
+					if (info)
+					{
+						if (is_assoc)
+							info.innerHTML = String.format(
+								'<strong><%:SSID%>:</strong> %h | ' +
+								'<strong><%:Mode%>:</strong> %s<br />' +
+								'<strong><%:BSSID%>:</strong> %s | ' +
+								'<strong><%:Encryption%>:</strong> %s',
+									iw.ssid, iw.mode, iw.bssid,
+									iw.encryption ? iw.encryption : '<%:None%>'
+							);
+						else
+							info.innerHTML = String.format(
+								'<strong><%:SSID%>:</strong> %h | ' +
+								'<strong><%:Mode%>:</strong> %s<br />' +
+								'<em>%s</em>',
+									iw.ssid || '?', iw.mode,
+									is_reconnecting
+										? '<em><%:Wireless is restarting...%></em>'
+										: '<em><%:Wireless is disabled or not associated%></em>'
+							);
+					}
+
+					var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
+					if (dev)
+					{
+						if (is_assoc)
+							dev.innerHTML = String.format(
+								'<strong><%:Channel%>:</strong> %s (%s <%:GHz%>) | ' +
+								'<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%>',
+									iw.channel ? iw.channel : '?',
+									iw.frequency ? iw.frequency : '?',
+									iw.bitrate ? iw.bitrate : '?'
+							);
+						else
+							dev.innerHTML = '';
+					}
+
+					if (assoctable)
+					{
+						var assoclist = [ ];
+						for( var bssid in iw.assoclist )
+						{
+							assoclist.push(iw.assoclist[bssid]);
+							assoclist[assoclist.length-1].bssid = bssid;
+						}
+
+						assoclist.sort(function(a, b) { a.bssid < b.bssid });
+
+						for( var j = 0; j < assoclist.length; j++ )
+						{
+							var tr = assoctable.insertRow(-1);
+							    tr.className = 'cbi-section-table-row cbi-rowstyle-' + rowstyle;
+
+							var icon;
+							var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
+							if (q < 1)
+								icon = "<%=resource%>/icons/signal-0.png";
+							else if (q < 2)
+								icon = "<%=resource%>/icons/signal-0-25.png";
+							else if (q < 3)
+								icon = "<%=resource%>/icons/signal-25-50.png";
+							else if (q < 4)
+								icon = "<%=resource%>/icons/signal-50-75.png";
+							else
+								icon = "<%=resource%>/icons/signal-75-100.png";
+
+							tr.insertCell(-1).innerHTML = String.format(
+								'<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" />',
+								icon, assoclist[j].signal, assoclist[j].noise
+							);
+
+							tr.insertCell(-1).innerHTML = nowrap(String.format('%h', iw.ssid ? iw.ssid : '?'));
+							tr.insertCell(-1).innerHTML = assoclist[j].bssid;
+
+							tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid]
+								? arptable[assoclist[j].bssid] : '?';
+
+							tr.insertCell(-1).innerHTML = nowrap(String.format('%d <%:dBm%>', assoclist[j].signal));
+							tr.insertCell(-1).innerHTML = nowrap(String.format('%d <%:dBm%>', assoclist[j].noise));
+
+							tr.insertCell(-1).innerHTML = nowrap((assoclist[j].rx_mcs > -1)
+								? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20)
+								: String.format('%.1f <%:Mbit/s%>', assoclist[j].rx_rate / 1000)
+							);
+
+							tr.insertCell(-1).innerHTML = nowrap((assoclist[j].tx_mcs > -1)
+								? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20)
+								: String.format('%.1f <%:Mbit/s%>', assoclist[j].tx_rate / 1000)
+							);
+
+							rowstyle = (rowstyle == 1) ? 2 : 1;
+						}
+					}
+				}
+
+				if (assoctable && assoctable.rows.length == 1)
+				{
+					var tr = assoctable.insertRow(-1);
+					    tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+					    td.colSpan = 8;
+					    td.innerHTML = '<br /><em><%:No information available%></em>';
+				}
+
+				for (var dev in devup)
+				{
+					var img = document.getElementById(dev + '-iw-upstate');
+					if (img)
+						img.src = '<%=resource%>/icons/wifi_big' + (devup[dev] ? '' : '_disabled') + '.png';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
+
+<fieldset class="cbi-section" style="display:none">
+	<legend><%:Reconnecting interface%></legend>
+	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+	<span id="iw-rc-status"><%:Waiting for changes to be applied...%></span>
+</fieldset>
+
+<div class="cbi-map">
+
+	<% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %>
+	<!-- device <%=dev:name()%> -->
+	<fieldset class="cbi-section">
+		<table class="cbi-section-table" style="margin:10px; empty-cells:hide">
+			<!-- physical device -->
+			<tr>
+				<td style="width:34px"><img src="<%=resource%>/icons/wifi_big_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></td>
+				<td colspan="2" style="text-align:left">
+					<big><strong><%=guess_wifi_hw(dev)%> (<%=dev:name()%>)</strong></big><br />
+					<span id="<%=dev:name()%>-iw-devinfo"></span>
+				</td>
+				<td style="width:310px;text-align:right">
+					<input type="button" class="cbi-button cbi-button-find" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/wireless_join")%>?device=<%=dev:name()%>'" title="<%:Find and join network%>" value="<%:Scan%>" />
+					<input type="button" class="cbi-button cbi-button-add" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/wireless_add")%>?device=<%=dev:name()%>'" title="<%:Provide new network%>" value="<%:Add%>" />
+				</td>
+			</tr>
+			<!-- /physical device -->
+
+			<!-- network list -->
+			<% if #nets > 0 then %>
+				<% for i, net in ipairs(nets) do %>
+				<tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
+					<td></td>
+					<td class="cbi-value-field" style="width:16px; padding:3px" id="<%=net:id()%>-iw-signal">
+						<img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" /><br />
+						<small>0%</small>
+					</td>
+					<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net:id()%>-iw-status">
+						<em><%:Collecting data...%></em>
+					</td>
+					<td class="cbi-value-field" style="width:310px;text-align:right">
+						<input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Delete this network%>" value="<%:Enable%>" />
+						<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
+						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this network.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>'" title="<%:Delete this network%>" value="<%:Remove%>" />
+					</td>
+				</tr>
+				<% end %>
+			<% else %>
+				<tr class="cbi-section-table-row cbi-rowstyle-2">
+					<td></td>
+					<td colspan="3" class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
+						<em><%:No network configured on this device%></em>
+					</td>
+				</tr>
+			<% end %>
+			<!-- /network list -->
+		</table>
+	</fieldset>
+	<!-- /device <%=dev:name()%> -->
+	<% end %>
+
+
+	<h2><a id="content" name="content"><%:Associated Stations%></a></h2>
+
+	<fieldset class="cbi-section">
+		<table class="cbi-section-table" style="margin:10px" id="iw-assoclist">
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell"></th>
+				<th class="cbi-section-table-cell"><%:SSID%></th>
+				<th class="cbi-section-table-cell"><%:MAC-Address%></th>
+				<th class="cbi-section-table-cell"><%:IPv4-Address%></th>
+				<th class="cbi-section-table-cell"><%:Signal%></th>
+				<th class="cbi-section-table-cell"><%:Noise%></th>
+				<th class="cbi-section-table-cell"><%:RX Rate%></th>
+				<th class="cbi-section-table-cell"><%:TX Rate%></th>
+			</tr>
+			<tr class="cbi-section-table-row cbi-rowstyle-2">
+				<td class="cbi-value-field" colspan="8">
+					<em><%:Collecting data...%></em>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
new file mode 100644
index 00000000..2484fd3c
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
@@ -0,0 +1,78 @@
+<%+cbi/valueheader%>
+
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "wireless_status", self.ifname)%>', null,
+		function(x, iw)
+		{
+			if (iw && (iw = iw[0]))
+			{
+				var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
+				var p = iw.quality;
+				var q = is_assoc ? p : -1;
+
+				var icon;
+				if (q < 0)
+					icon = "<%=resource%>/icons/signal-none.png";
+				else if (q == 0)
+					icon = "<%=resource%>/icons/signal-0.png";
+				else if (q < 25)
+					icon = "<%=resource%>/icons/signal-0-25.png";
+				else if (q < 50)
+					icon = "<%=resource%>/icons/signal-25-50.png";
+				else if (q < 75)
+					icon = "<%=resource%>/icons/signal-50-75.png";
+				else
+					icon = "<%=resource%>/icons/signal-75-100.png";
+
+				var s = document.getElementById('<%=self.option%>-iw-signal');
+				if (s)
+					s.innerHTML = String.format(
+						'<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" /><br />' +
+						'<small>%d%%</small>', icon, iw.signal, iw.noise, p
+					);
+
+				var d = document.getElementById('<%=self.option%>-iw-description');
+				if (d && is_assoc)
+					d.innerHTML = String.format(
+						'<strong><%:Mode%>:</strong> %s | ' +
+						'<strong><%:SSID%>:</strong> %h<br />' +
+						'<strong><%:BSSID%>:</strong> %s | ' +
+						'<strong><%:Encryption%>:</strong> %s<br />' +
+						'<strong><%:Channel%>:</strong> %d (%.3f <%:GHz%>) | ' +
+						'<strong><%:Tx-Power%>:</strong> %d <%:dBm%><br />' +
+						'<strong><%:Signal%>:</strong> %d <%:dBm%> | ' +
+						'<strong><%:Noise%>:</strong> %d <%:dBm%><br />' +
+						'<strong><%:Bitrate%>:</strong> %.1f <%:Mbit/s%> | ' +
+						'<strong><%:Country%>:</strong> %s',
+							iw.mode, iw.ssid, iw.bssid,
+							iw.encryption ? iw.encryption : '<%:None%>',
+							iw.channel, iw.frequency ? iw.frequency : 0,
+							iw.txpower, iw.signal, iw.noise,
+							iw.bitrate ? iw.bitrate : 0, iw.country
+					);
+				else if (d)
+					d.innerHTML = String.format(
+						'<strong><%:SSID%>:</strong> %h | ' +
+						'<strong><%:Mode%>:</strong> %s<br />' +
+						'<em><%:Wireless is disabled or not associated%></em>',
+							iw.ssid || '?', iw.mode
+					);
+			}
+		}
+	);
+//]]></script>
+
+<table>
+	<tr class="cbi-section-table">
+		<td></td>
+		<td class="cbi-value-field" style="width:16px; padding:3px" id="<%=self.option%>-iw-signal">
+			<img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" /><br />
+			<small>0%</small>
+		</td>
+		<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=self.option%>-iw-description">
+			<em><%:Collecting data...%></em>
+		</td>
+	</tr>
+</table>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/bandwidth.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
new file mode 100644
index 00000000..0c53c95b
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -0,0 +1,311 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%-
+	local ntm = require "luci.model.network".init()
+
+	local dev
+	local devices = { }
+	for _, dev in luci.util.vspairs(luci.sys.net.devices()) do
+		if dev ~= "lo" and not ntm:ignore_interface(dev) then
+			devices[#devices+1] = dev
+		end
+	end
+
+	local curdev = luci.dispatcher.context.requestpath
+	      curdev = curdev[#curdev] ~= "bandwidth" and curdev[#curdev] or devices[1]
+-%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var bwxhr = new XHR();
+
+	var G;
+	var TIME = 0;
+	var RXB  = 1;
+	var RXP  = 2;
+	var TXB  = 3;
+	var TXP  = 4;
+
+	var width  = 760;
+	var height = 300;
+	var step   = 5;
+
+	var data_wanted = Math.floor(width / step);
+	var data_fill   = 0;
+	var data_stamp  = 0;
+
+	var data_rx = [ ];
+	var data_tx = [ ];
+
+	var line_rx;
+	var line_tx;
+
+	var label_25;
+	var label_50;
+	var label_75;
+
+	var label_rx_cur;
+	var label_rx_avg;
+	var label_rx_peak;
+
+	var label_tx_cur;
+	var label_tx_avg;
+	var label_tx_peak;
+
+	var label_scale;
+
+
+	function bandwidth_label(bytes, br)
+	{
+		var uby = '<%:kB/s%>';
+		var kby = (bytes / 1024);
+
+		if (kby >= 1024)
+		{
+			uby = '<%:MB/s%>';
+			kby = kby / 1024;
+		}
+
+		var ubi = '<%:kbit/s%>';
+		var kbi = (bytes * 8 / 1024);
+
+		if (kbi >= 1024)
+		{
+			ubi = '<%:Mbit/s%>';
+			kbi = kbi / 1024;
+		}
+
+		return String.format("%f %s%s(%f %s)",
+			kbi.toFixed(2), ubi,
+			br ? '<br />' : ' ',
+			kby.toFixed(2), uby
+		);
+	}
+
+	/* wait for SVG */
+	window.setTimeout(
+		function() {
+			var svg = document.getElementById('bwsvg');
+
+			try {
+				G = svg.getSVGDocument
+					? svg.getSVGDocument() : svg.contentDocument;
+			}
+			catch(e) {
+				G = document.embeds['bwsvg'].getSVGDocument();
+			}
+
+			if (!G)
+			{
+				window.setTimeout(arguments.callee, 1000);
+			}
+			else
+			{
+				/* find sizes */
+				width       = svg.offsetWidth  - 2;
+				height      = svg.offsetHeight - 2;
+				data_wanted = Math.ceil(width / step);
+
+				/* prefill datasets */
+				for (var i = 0; i < data_wanted; i++)
+				{
+					data_rx[i] = 0;
+					data_tx[i] = 0;
+				}
+
+				/* find svg elements */
+				line_rx = G.getElementById('rx');
+				line_tx = G.getElementById('tx');
+
+				label_25 = G.getElementById('label_25');
+				label_50 = G.getElementById('label_50');
+				label_75 = G.getElementById('label_75');
+
+				label_rx_cur  = document.getElementById('rx_bw_cur');
+				label_rx_avg  = document.getElementById('rx_bw_avg');
+				label_rx_peak = document.getElementById('rx_bw_peak');
+
+				label_tx_cur  = document.getElementById('tx_bw_cur');
+				label_tx_avg  = document.getElementById('tx_bw_avg');
+				label_tx_peak = document.getElementById('tx_bw_peak');
+
+				label_scale   = document.getElementById('scale');
+
+
+				/* plot horizontal time interval lines */
+				for (var i = width % (step * 60); i < width; i += step * 60)
+				{
+					var line = G.createElementNS('http://www.w3.org/2000/svg', 'line');
+						line.setAttribute('x1', i);
+						line.setAttribute('y1', 0);
+						line.setAttribute('x2', i);
+						line.setAttribute('y2', '100%');
+						line.setAttribute('style', 'stroke:black;stroke-width:0.1');
+
+					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
+						text.setAttribute('x', i + 5);
+						text.setAttribute('y', 15);
+						text.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
+
+					label_25.parentNode.appendChild(line);
+					label_25.parentNode.appendChild(text);
+				}
+
+				label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
+
+				/* render datasets, start update interval */
+				XHR.poll(3, '<%=build_url("admin/status/realtime/bandwidth_status", curdev)%>', null,
+					function(x, data)
+					{
+						var data_max   = 0;
+						var data_scale = 0;
+
+						var data_rx_avg = 0;
+						var data_tx_avg = 0;
+
+						var data_rx_peak = 0;
+						var data_tx_peak = 0;
+
+						for (var i = data_stamp ? 0 : 1; i < data.length; i++)
+						{
+							/* skip overlapping entries */
+							if (data[i][TIME] <= data_stamp)
+								continue;
+
+							/* normalize difference against time interval */
+							if (i > 0)
+							{
+								var time_delta = data[i][TIME] - data[i-1][TIME];
+								if (time_delta)
+								{
+									data_rx.push((data[i][RXB] - data[i-1][RXB]) / time_delta);
+									data_tx.push((data[i][TXB] - data[i-1][TXB]) / time_delta);
+								}
+							}
+						}
+
+						/* cut off outdated entries */
+						data_rx = data_rx.slice(data_rx.length - data_wanted, data_rx.length);
+						data_tx = data_tx.slice(data_tx.length - data_wanted, data_tx.length);
+
+						/* find peak */
+						for (var i = 0; i < data_rx.length; i++)
+						{
+							data_max = Math.max(data_max, data_rx[i]);
+							data_max = Math.max(data_max, data_tx[i]);
+
+							data_rx_peak = Math.max(data_rx_peak, data_rx[i]);
+							data_tx_peak = Math.max(data_tx_peak, data_tx[i]);
+
+							if (i > 0)
+							{
+								data_rx_avg = (data_rx_avg + data_rx[i]) / 2;
+								data_tx_avg = (data_tx_avg + data_tx[i]) / 2;
+							}
+							else
+							{
+								data_rx_avg = data_rx[i];
+								data_tx_avg = data_tx[i];
+							}
+						}
+
+						/* remember current timestamp, calculate horizontal scale */
+						data_stamp = data[data.length-1][TIME];
+						data_scale = height / (data_max * 1.1);
+
+
+						/* plot data */
+						var pt_rx = '0,' + height;
+						var pt_tx = '0,' + height;
+
+						var y_rx = 0;
+						var y_tx = 0;
+
+						for (var i = 0; i < data_rx.length; i++)
+						{
+							var x = i * step;
+
+							y_rx = height - Math.floor(data_rx[i] * data_scale);
+							y_tx = height - Math.floor(data_tx[i] * data_scale);
+
+							pt_rx += ' ' + x + ',' + y_rx;
+							pt_tx += ' ' + x + ',' + y_tx;
+						}
+
+						pt_rx += ' ' + width + ',' + y_rx + ' ' + width + ',' + height;
+						pt_tx += ' ' + width + ',' + y_tx + ' ' + width + ',' + height;
+
+
+						line_rx.setAttribute('points', pt_rx);
+						line_tx.setAttribute('points', pt_tx);
+
+						label_25.firstChild.data = bandwidth_label(1.1 * 0.25 * data_max);
+						label_50.firstChild.data = bandwidth_label(1.1 * 0.50 * data_max);
+						label_75.firstChild.data = bandwidth_label(1.1 * 0.75 * data_max);
+
+						label_rx_cur.innerHTML = bandwidth_label(data_rx[data_rx.length-1], true);
+						label_tx_cur.innerHTML = bandwidth_label(data_tx[data_tx.length-1], true);
+
+						label_rx_avg.innerHTML = bandwidth_label(data_rx_avg, true);
+						label_tx_avg.innerHTML = bandwidth_label(data_tx_avg, true);
+
+						label_rx_peak.innerHTML = bandwidth_label(data_rx_peak, true);
+						label_tx_peak.innerHTML = bandwidth_label(data_tx_peak, true);
+					}
+				);
+			}
+		}, 1000
+	);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Realtime Traffic%></a></h2>
+
+<ul class="cbi-tabmenu">
+	<% for _, dev in ipairs(devices) do %>
+		<li class="cbi-tab<%= dev == curdev and "" or "-disabled" %>"><a href="<%=pcdata(dev)%>"><%=pcdata(dev)%></a></li>
+	<% end %>
+</ul>
+
+<embed id="bwsvg" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/bandwidth.svg" />
+<div style="text-align:right"><small id="scale">-</small></div>
+<br />
+
+<table style="width:100%; table-layout:fixed" cellspacing="5">
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Inbound:%></strong></td>
+		<td id="rx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="rx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="rx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
+	</tr>
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Outbound:%></strong></td>
+		<td id="tx_bw_cur">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="tx_bw_avg">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="tx_bw_peak">0 <%:kbit/s%><br />(0 <%:kB/s%>)</td>
+	</tr>
+</table>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/connections.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/connections.htm
new file mode 100644
index 00000000..80c8b70e
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/connections.htm
@@ -0,0 +1,382 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var bwxhr = new XHR();
+
+	var G;
+	var TIME  = 0;
+	var UDP   = 1;
+	var TCP   = 2;
+	var OTHER = 3;
+
+	var width  = 760;
+	var height = 300;
+	var step   = 5;
+
+	var data_wanted = Math.floor(width / step);
+	var data_fill   = 0;
+	var data_stamp  = 0;
+
+	var data_udp = [ ];
+	var data_tcp = [ ];
+	var data_otr = [ ];
+
+	var line_udp;
+	var line_tcp;
+
+	var label_25;
+	var label_50;
+	var label_75;
+
+	var label_udp_cur;
+	var label_udp_avg;
+	var label_udp_peak;
+
+	var label_tcp_cur;
+	var label_tcp_avg;
+	var label_tcp_peak;
+
+	var label_otr_cur;
+	var label_otr_avg;
+	var label_otr_peak;
+
+	var label_scale;
+
+	var conn_table;
+
+	var dns_cache = { };
+
+
+	/* wait for SVG */
+	window.setTimeout(
+		function() {
+			var svg = document.getElementById('bwsvg');
+
+			try {
+				G = svg.getSVGDocument
+					? svg.getSVGDocument() : svg.contentDocument;
+			}
+			catch(e) {
+				G = document.embeds['bwsvg'].getSVGDocument();
+			}
+
+			if (!G)
+			{
+				window.setTimeout(arguments.callee, 1000);
+			}
+			else
+			{
+				/* find sizes */
+				width       = svg.offsetWidth  - 2;
+				height      = svg.offsetHeight - 2;
+				data_wanted = Math.ceil(width / step);
+
+				/* prefill datasets */
+				for (var i = 0; i < data_wanted; i++)
+				{
+					data_udp[i] = 0;
+					data_tcp[i] = 0;
+					data_otr[i] = 0;
+				}
+
+				/* find svg elements */
+				line_udp = G.getElementById('udp');
+				line_tcp = G.getElementById('tcp');
+				line_otr = G.getElementById('other');
+
+				label_25 = G.getElementById('label_25');
+				label_50 = G.getElementById('label_50');
+				label_75 = G.getElementById('label_75');
+
+				label_udp_cur  = document.getElementById('lb_udp_cur');
+				label_udp_avg  = document.getElementById('lb_udp_avg');
+				label_udp_peak = document.getElementById('lb_udp_peak');
+
+				label_tcp_cur  = document.getElementById('lb_tcp_cur');
+				label_tcp_avg  = document.getElementById('lb_tcp_avg');
+				label_tcp_peak = document.getElementById('lb_tcp_peak');
+
+				label_otr_cur  = document.getElementById('lb_otr_cur');
+				label_otr_avg  = document.getElementById('lb_otr_avg');
+				label_otr_peak = document.getElementById('lb_otr_peak');
+
+				label_scale    = document.getElementById('scale');
+
+				conn_table     = document.getElementById('connections');
+
+
+				/* plot horizontal time interval lines */
+				for (var i = width % (step * 60); i < width; i += step * 60)
+				{
+					var line = G.createElementNS('http://www.w3.org/2000/svg', 'line');
+						line.setAttribute('x1', i);
+						line.setAttribute('y1', 0);
+						line.setAttribute('x2', i);
+						line.setAttribute('y2', '100%');
+						line.setAttribute('style', 'stroke:black;stroke-width:0.1');
+
+					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
+						text.setAttribute('x', i + 5);
+						text.setAttribute('y', 15);
+						text.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
+
+					label_25.parentNode.appendChild(line);
+					label_25.parentNode.appendChild(text);
+				}
+
+				label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
+
+				/* render datasets, start update interval */
+				XHR.poll(3, '<%=build_url("admin/status/realtime/connections_status")%>', null,
+					function(x, json)
+					{
+						var conn = json.connections;
+
+						while (conn_table.rows.length > 1)
+							conn_table.rows[0].parentNode.deleteRow(-1);
+
+
+						var lookup_queue = [ ];
+
+						conn.sort(function(a, b) {
+							return b.bytes - a.bytes;
+						});
+
+						for (var i = 0; i < conn.length; i++)
+						{
+							var c  = conn[i];
+
+							if (c.src == '127.0.0.1' && c.dst == '127.0.0.1')
+								continue;
+
+							var tr = conn_table.rows[0].parentNode.insertRow(-1);
+							    tr.className = 'cbi-section-table-row cbi-rowstyle-' + (1 + (i % 2));
+
+							if (!dns_cache[c.src])
+								lookup_queue.push(c.src);
+
+							if (!dns_cache[c.dst])
+								lookup_queue.push(c.dst);
+
+							var src = dns_cache[c.src] || (c.layer3 == 'ipv6' ? '[' + c.src + ']' : c.src);
+							var dst = dns_cache[c.dst] || (c.layer3 == 'ipv6' ? '[' + c.dst + ']' : c.dst);
+
+							tr.insertCell(-1).innerHTML = c.layer3.toUpperCase();
+							tr.insertCell(-1).innerHTML = c.layer4.toUpperCase();
+							tr.insertCell(-1).innerHTML = String.format('%s:%d', src, c.sport);
+							tr.insertCell(-1).innerHTML = String.format('%s:%d', dst, c.dport);
+
+							var traf = tr.insertCell(-1);
+							    traf.style.whiteSpace = 'nowrap';
+							    traf.innerHTML = String.format('%1024.2mB (%d <%:Pkts.%>)', c.bytes, c.packets);
+						}
+
+						if (lookup_queue.length > 0)
+							XHR.get('<%=build_url("admin/status/nameinfo")%>/' + lookup_queue.slice(0, 100).join('/'), null,
+								function(x, json)
+								{
+									for (var addr in json)
+										dns_cache[addr] = json[addr];
+								}
+							);
+
+
+						var data = json.statistics;
+
+						var data_max   = 0;
+						var data_scale = 0;
+
+						var data_udp_avg = 0;
+						var data_tcp_avg = 0;
+						var data_otr_avg = 0;
+
+						var data_udp_peak = 0;
+						var data_tcp_peak = 0;
+						var data_otr_peak = 0;
+
+						for (var i = data_stamp ? 0 : 1; i < data.length; i++)
+						{
+							/* skip overlapping entries */
+							if (data[i][TIME] <= data_stamp)
+								continue;
+
+							data_udp.push(data[i][UDP]);
+							data_tcp.push(data[i][TCP]);
+							data_otr.push(data[i][OTHER]);
+						}
+
+						/* cut off outdated entries */
+						data_udp = data_udp.slice(data_udp.length - data_wanted, data_udp.length);
+						data_tcp = data_tcp.slice(data_tcp.length - data_wanted, data_tcp.length);
+						data_otr = data_otr.slice(data_otr.length - data_wanted, data_otr.length);
+
+						/* find peak */
+						for (var i = 0; i < data_udp.length; i++)
+						{
+							data_max = Math.max(data_max, data_udp[i]);
+							data_max = Math.max(data_max, data_tcp[i]);
+							data_max = Math.max(data_max, data_otr[i]);
+
+							data_udp_peak = Math.max(data_udp_peak, data_udp[i]);
+							data_tcp_peak = Math.max(data_tcp_peak, data_tcp[i]);
+							data_otr_peak = Math.max(data_otr_peak, data_otr[i]);
+
+							if (i > 0)
+							{
+								data_udp_avg = (data_udp_avg + data_udp[i]) / 2;
+								data_tcp_avg = (data_tcp_avg + data_tcp[i]) / 2;
+								data_otr_avg = (data_otr_avg + data_otr[i]) / 2;
+							}
+							else
+							{
+								data_udp_avg = data_udp[i];
+								data_tcp_avg = data_tcp[i];
+								data_otr_avg = data_otr[i];
+							}
+						}
+
+						/* remember current timestamp, calculate horizontal scale */
+						data_stamp = data[data.length-1][TIME];
+						data_scale = height / (data_max * 1.1);
+
+
+						/* plot data */
+						var pt_udp = '0,' + height;
+						var pt_tcp = '0,' + height;
+						var pt_otr = '0,' + height;
+
+						var y_udp = 0;
+						var y_tcp = 0;
+						var y_otr = 0;
+
+						for (var i = 0; i < data_udp.length; i++)
+						{
+							var x = i * step;
+
+							y_udp = height - Math.floor(data_udp[i] * data_scale);
+							y_tcp = height - Math.floor(data_tcp[i] * data_scale);
+							y_otr = height - Math.floor(data_otr[i] * data_scale);
+
+							pt_udp += ' ' + x + ',' + y_udp;
+							pt_tcp += ' ' + x + ',' + y_tcp;
+							pt_otr += ' ' + x + ',' + y_otr;
+						}
+
+						pt_udp += ' ' + width + ',' + y_udp + ' ' + width + ',' + height;
+						pt_tcp += ' ' + width + ',' + y_tcp + ' ' + width + ',' + height;
+						pt_otr += ' ' + width + ',' + y_otr + ' ' + width + ',' + height;
+
+
+						var order = [
+							[ line_udp, data_udp[data_udp.length-1] ],
+							[ line_tcp, data_tcp[data_tcp.length-1] ],
+							[ line_otr, data_otr[data_otr.length-1] ]
+						];
+
+						order.sort(function(a, b) { return b[1] - a[1] });
+
+						for (var i = 0; i < order.length; i++)
+							order[i][0].parentNode.appendChild(order[i][0]);
+
+
+						line_udp.setAttribute('points', pt_udp);
+						line_tcp.setAttribute('points', pt_tcp);
+						line_otr.setAttribute('points', pt_otr);
+
+						label_25.firstChild.data = Math.floor(1.1 * 0.25 * data_max);
+						label_50.firstChild.data = Math.floor(1.1 * 0.50 * data_max);
+						label_75.firstChild.data = Math.floor(1.1 * 0.75 * data_max);
+
+						label_udp_cur.innerHTML = Math.floor(data_udp[data_udp.length-1]);
+						label_tcp_cur.innerHTML = Math.floor(data_tcp[data_tcp.length-1]);
+						label_otr_cur.innerHTML = Math.floor(data_otr[data_otr.length-1]);
+
+						label_udp_avg.innerHTML = Math.floor(data_udp_avg);
+						label_tcp_avg.innerHTML = Math.floor(data_tcp_avg);
+						label_otr_avg.innerHTML = Math.floor(data_otr_avg);
+
+						label_udp_peak.innerHTML = Math.floor(data_udp_peak);
+						label_tcp_peak.innerHTML = Math.floor(data_tcp_peak);
+						label_otr_peak.innerHTML = Math.floor(data_otr_peak);
+					}
+				);
+			}
+		}, 1000
+	);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Realtime Connections%></a></h2>
+
+<div class="cbi-map-descr"><%:This page gives an overview over currently active network connections.%></div>
+
+<fieldset class="cbi-section" id="cbi-table-table">
+	<legend><%:Active Connections%></legend>
+
+	<embed id="bwsvg" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/connections.svg" />
+	<div style="text-align:right"><small id="scale">-</small></div>
+	<br />
+
+	<table style="width:100%; table-layout:fixed" cellspacing="5">
+		<tr>
+			<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:UDP:%></strong></td>
+			<td id="lb_udp_cur">0</td>
+
+			<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+			<td id="lb_udp_avg">0</td>
+
+			<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+			<td id="lb_udp_peak">0</td>
+		</tr>
+		<tr>
+			<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:TCP:%></strong></td>
+			<td id="lb_tcp_cur">0</td>
+
+			<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+			<td id="lb_tcp_avg">0</td>
+
+			<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+			<td id="lb_tcp_peak">0</td>
+		</tr>
+		<tr>
+			<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid red"><%:Other:%></strong></td>
+			<td id="lb_otr_cur">0</td>
+
+			<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+			<td id="lb_otr_avg">0</td>
+
+			<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+			<td id="lb_otr_peak">0</td>
+		</tr>
+	</table>
+	<br />
+
+	<div class="cbi-section-node">
+		<table class="cbi-section-table" id="connections">
+			<tr class="cbi-section-table-titles">
+				<th class="cbi-section-table-cell"><%:Network%></th>
+				<th class="cbi-section-table-cell"><%:Protocol%></th>
+				<th class="cbi-section-table-cell"><%:Source%></th>
+				<th class="cbi-section-table-cell"><%:Destination%></th>
+				<th class="cbi-section-table-cell"><%:Transfer%></th>
+			</tr>
+
+			<tr><td colspan="5"><em><%:Collecting data...%></em></td></tr>
+		</table>
+	</div>
+</fieldset>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm
new file mode 100644
index 00000000..7757460a
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm
@@ -0,0 +1,20 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: syslog.htm 3622 2008-10-23 16:05:55Z jow $
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:Kernel Log%></a></h2>
+<div id="content_syslog">
+<textarea readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea>
+</div>
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/index.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/index.htm
new file mode 100644
index 00000000..cfeb91ac
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/index.htm
@@ -0,0 +1,713 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%
+	require "luci.fs"
+	require "luci.tools.status"
+
+	local has_ipv6 = luci.fs.access("/proc/net/ipv6_route")
+	local has_dhcp = luci.fs.access("/etc/config/dhcp")
+	local has_wifi = luci.fs.stat("/etc/config/wireless")
+	      has_wifi = has_wifi and has_wifi.size > 0
+	local _, _, memtotal, memcached, membuffers, memfree, _, swaptotal, swapcached, swapfree = luci.sys.sysinfo()
+	local has_swap
+	if swaptotal > 0 then
+		has_swap = 1
+	end
+	local has_dsl = luci.fs.stat("/etc/init.d/dsl_control")
+
+	if luci.http.formvalue("status") == "1" then
+		local ntm = require "luci.model.network".init()
+		local wan = ntm:get_wannet()
+		local wan6 = ntm:get_wan6net()
+
+		local conn_count = tonumber((
+			luci.sys.exec("wc -l /proc/net/nf_conntrack") or
+			luci.sys.exec("wc -l /proc/net/ip_conntrack") or
+			""):match("%d+")) or 0
+
+		local conn_max = tonumber((
+			luci.sys.exec("sysctl net.nf_conntrack_max") or
+			luci.sys.exec("sysctl net.ipv4.netfilter.ip_conntrack_max") or
+			""):match("%d+")) or 4096
+
+		local rv = {
+			uptime     = luci.sys.uptime(),
+			localtime  = os.date(),
+			loadavg    = { luci.sys.loadavg() },
+			memtotal   = memtotal,
+			memcached  = memcached,
+			membuffers = membuffers,
+			memfree    = memfree,
+			swaptotal  = swaptotal,
+			swapcached = swapcached,
+			swapfree   = swapfree,
+			connmax    = conn_max,
+			conncount  = conn_count,
+			leases     = luci.tools.status.dhcp_leases(),
+			leases6    = luci.tools.status.dhcp6_leases(),
+			wifinets   = luci.tools.status.wifi_networks()
+		}
+
+		if wan then
+			rv.wan = {
+				ipaddr  = wan:ipaddr(),
+				gwaddr  = wan:gwaddr(),
+				netmask = wan:netmask(),
+				dns     = wan:dnsaddrs(),
+				expires = wan:expires(),
+				uptime  = wan:uptime(),
+				proto   = wan:proto(),
+				ifname  = wan:ifname(),
+				link    = wan:adminlink()
+			}
+		end
+
+		if wan6 then
+			rv.wan6 = {
+				ip6addr = wan6:ip6addr(),
+				gw6addr = wan6:gw6addr(),
+				dns     = wan6:dns6addrs(),
+				uptime  = wan6:uptime(),
+				ifname  = wan6:ifname(),
+				link    = wan6:adminlink()
+			}
+		end
+
+		if has_dsl then
+			local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
+			local dsl_func = loadstring(dsl_stat)
+			rv.dsl = dsl_func()
+		end
+
+		luci.http.prepare_content("application/json")
+		luci.http.write_json(rv)
+
+		return
+	end
+
+	local system, model = luci.sys.sysinfo()
+-%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	function progressbar(v, m)
+	{
+		var vn = parseInt(v) || 0;
+		var mn = parseInt(m) || 100;
+		var pc = Math.floor((100 / mn) * vn);
+
+		return String.format(
+			'<div style="width:200px; position:relative; border:1px solid #999999">' +
+				'<div style="background-color:#CCCCCC; width:%d%%; height:15px">' +
+					'<div style="position:absolute; left:0; top:0; text-align:center; width:100%%; color:#000000">' +
+						'<small>%s / %s (%d%%)</small>' +
+					'</div>' +
+				'</div>' +
+			'</div>', pc, v, m, pc
+		);
+	}
+
+	var wifidevs = <%=luci.http.write_json(netdevs)%>;
+	var arptable = <%=luci.http.write_json(arpcache)%>;
+
+	XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 },
+		function(x, info)
+		{
+			var si = document.getElementById('wan4_i');
+			var ss = document.getElementById('wan4_s');
+			var ifc = info.wan;
+
+			if (ifc && ifc.ifname && ifc.proto != 'none')
+			{
+				var s = String.format(
+					'<strong><%:Type%>: </strong>%s<br />' +
+					'<strong><%:Address%>: </strong>%s<br />' +
+					'<strong><%:Netmask%>: </strong>%s<br />' +
+					'<strong><%:Gateway%>: </strong>%s<br />',
+						ifc.proto,
+						(ifc.ipaddr) ? ifc.ipaddr : '0.0.0.0',
+						(ifc.netmask && ifc.netmask != ifc.ipaddr) ? ifc.netmask : '255.255.255.255',
+						(ifc.gwaddr) ? ifc.gwaddr : '0.0.0.0'
+				);
+
+				for (var i = 0; i < ifc.dns.length; i++)
+				{
+					s += String.format(
+						'<strong><%:DNS%> %d: </strong>%s<br />',
+						i + 1, ifc.dns[i]
+					);
+				}
+
+				if (ifc.expires > -1)
+				{
+					s += String.format(
+						'<strong><%:Expires%>: </strong>%t<br />',
+						ifc.expires
+					);
+				}
+
+				if (ifc.uptime > 0)
+				{
+					s += String.format(
+						'<strong><%:Connected%>: </strong>%t<br />',
+						ifc.uptime
+					);
+				}
+
+				ss.innerHTML = String.format('<small>%s</small>', s);
+				si.innerHTML = String.format(
+					'<img src="<%=resource%>/icons/ethernet.png" />' +
+					'<br /><small><a href="%s">%s</a></small>',
+						ifc.link, ifc.ifname
+				);
+			}
+			else
+			{
+				si.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>';
+				ss.innerHTML = '<em><%:Not connected%></em>';
+			}
+
+			<% if has_ipv6 then %>
+			var si6 = document.getElementById('wan6_i');
+			var ss6 = document.getElementById('wan6_s');
+			var ifc6 = info.wan6;
+
+			if (ifc6 && ifc6.ifname && ifc6.proto != 'none')
+			{
+				var s = String.format(
+					'<strong><%:Address%>: </strong>%s<br />' +
+					'<strong><%:Gateway%>: </strong>%s<br />',
+						(ifc6.ip6addr) ? ifc6.ip6addr : '::',
+						(ifc6.gw6addr) ? ifc6.gw6addr : '::'
+				);
+
+				for (var i = 0; i < ifc6.dns.length; i++)
+				{
+					s += String.format(
+						'<strong><%:DNS%> %d: </strong>%s<br />',
+						i + 1, ifc6.dns[i]
+					);
+				}
+
+				if (ifc6.uptime > 0)
+				{
+					s += String.format(
+						'<strong><%:Connected%>: </strong>%t<br />',
+						ifc6.uptime
+					);
+				}
+
+				ss6.innerHTML = String.format('<small>%s</small>', s);
+				si6.innerHTML = String.format(
+					'<img src="<%=resource%>/icons/ethernet.png" />' +
+					'<br /><small><a href="%s">%s</a></small>',
+						ifc6.link, ifc6.ifname
+				);
+			}
+			else
+			{
+				si6.innerHTML = '<img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small>';
+				ss6.innerHTML = '<em><%:Not connected%></em>';
+			}
+			<% end %>
+
+			<% if has_dsl then %>
+				var dsl_i = document.getElementById('dsl_i');
+				var dsl_s = document.getElementById('dsl_s');
+
+				var s = String.format(
+					'<strong><%:Status%>: </strong>%s<br />' +
+					'<strong><%:Line State%>: </strong>%s [0x%x]<br />' +
+					'<strong><%:Line Speed%>: </strong>%s/s / %s/s<br />' +
+					'<strong><%:Line Attenuation%>: </strong>%s dB / %s dB<br />' +
+					'<strong><%:Noise Margin%>: </strong>%s dB / %s dB<br />',
+						info.dsl.line_state, info.dsl.line_state_detail,
+						info.dsl.line_state_num,
+						info.dsl.data_rate_down_s, info.dsl.data_rate_up_s,
+						info.dsl.line_attenuation_down, info.dsl.line_attenuation_up,
+						info.dsl.noise_margin_down, info.dsl.noise_margin_up
+				);
+
+				dsl_s.innerHTML = String.format('<small>%s</small>', s);
+				dsl_i.innerHTML = String.format(
+					'<img src="<%=resource%>/icons/ethernet.png" />' +
+					'<br /><small>ADSL</small>'
+				);
+			<% end %>
+
+			<% if has_dhcp then %>
+			var ls = document.getElementById('lease_status_table');
+			if (ls)
+			{
+				/* clear all rows */
+				while( ls.rows.length > 1 )
+					ls.rows[0].parentNode.deleteRow(1);
+
+				for( var i = 0; i < info.leases.length; i++ )
+				{
+					var timestr;
+
+					if (info.leases[i].expires <= 0)
+						timestr = '<em><%:expired%></em>';
+					else
+						timestr = String.format('%t', info.leases[i].expires);
+
+					var tr = ls.rows[0].parentNode.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+					tr.insertCell(-1).innerHTML = info.leases[i].hostname ? info.leases[i].hostname : '?';
+					tr.insertCell(-1).innerHTML = info.leases[i].ipaddr;
+					tr.insertCell(-1).innerHTML = info.leases[i].macaddr;
+					tr.insertCell(-1).innerHTML = timestr;
+				}
+
+				if( ls.rows.length == 1 )
+				{
+					var tr = ls.rows[0].parentNode.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 4;
+						td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+				}
+			}
+
+			var ls6 = document.getElementById('lease6_status_table');
+			if (ls6 && info.leases6)
+			{
+				ls6.parentNode.style.display = 'block';
+
+				/* clear all rows */
+				while( ls6.rows.length > 1 )
+					ls6.rows[0].parentNode.deleteRow(1);
+
+				for( var i = 0; i < info.leases6.length; i++ )
+				{
+					var timestr;
+
+					if (info.leases6[i].expires <= 0)
+						timestr = '<em><%:expired%></em>';
+					else
+						timestr = String.format('%t', info.leases6[i].expires);
+
+					var tr = ls6.rows[0].parentNode.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
+
+					tr.insertCell(-1).innerHTML = info.leases6[i].hostname ? info.leases6[i].hostname : '?';
+					tr.insertCell(-1).innerHTML = info.leases6[i].ip6addr;
+					tr.insertCell(-1).innerHTML = info.leases6[i].duid;
+					tr.insertCell(-1).innerHTML = timestr;
+				}
+
+				if( ls6.rows.length == 1 )
+				{
+					var tr = ls6.rows[0].parentNode.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 4;
+						td.innerHTML = '<em><br /><%:There are no active leases.%></em>';
+				}
+			}
+			<% end %>
+
+			<% if has_wifi then %>
+			var assoclist = [ ];
+
+			var ws = document.getElementById('wifi_status_table');
+			if (ws)
+			{
+				var wsbody = ws.rows[0].parentNode;
+				while (ws.rows.length > 0)
+					wsbody.deleteRow(0);
+
+				for (var didx = 0; didx < info.wifinets.length; didx++)
+				{
+					var dev = info.wifinets[didx];
+
+					var tr = wsbody.insertRow(-1);
+					var td;
+
+					td = tr.insertCell(-1);
+					td.width     = "33%";
+					td.innerHTML = dev.name;
+					td.style.verticalAlign = "top";
+
+					td = tr.insertCell(-1);
+
+					var s = '';
+
+					for (var nidx = 0; nidx < dev.networks.length; nidx++)
+					{
+						var net = dev.networks[nidx];
+						var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel);
+
+						var icon;
+						if (!is_assoc)
+							icon = "<%=resource%>/icons/signal-none.png";
+						else if (net.quality == 0)
+							icon = "<%=resource%>/icons/signal-0.png";
+						else if (net.quality < 25)
+							icon = "<%=resource%>/icons/signal-0-25.png";
+						else if (net.quality < 50)
+							icon = "<%=resource%>/icons/signal-25-50.png";
+						else if (net.quality < 75)
+							icon = "<%=resource%>/icons/signal-50-75.png";
+						else
+							icon = "<%=resource%>/icons/signal-75-100.png";
+
+						s += String.format(
+							'<table><tr><td style="text-align:center; width:32px; padding:3px">' +
+								'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' +
+								'<br /><small>%d%%</small>' +
+							'</td><td style="text-align:left; padding:3px"><small>' +
+								'<strong><%:SSID%>:</strong> <a href="%s">%h</a><br />' +
+								'<strong><%:Mode%>:</strong> %s<br />' +
+								'<strong><%:Channel%>:</strong> %d (%.3f <%:GHz%>)<br />' +
+								'<strong><%:Bitrate%>:</strong> %s <%:Mbit/s%><br />',
+								icon, net.signal, net.noise,
+								net.quality,
+								net.link, net.ssid,
+								net.mode,
+								net.channel, net.frequency,
+								net.bitrate || '?'
+						);
+
+						if (is_assoc)
+						{
+							s += String.format(
+								'<strong><%:BSSID%>:</strong> %s<br />' +
+								'<strong><%:Encryption%>:</strong> %s',
+									net.bssid,
+									net.encryption
+							);
+						}
+						else
+						{
+							s += '<em><%:Wireless is disabled or not associated%></em>';
+						}
+
+						s += '</small></td></tr></table>';
+
+						for (var bssid in net.assoclist)
+						{
+							assoclist.push({
+								bssid:    bssid,
+								signal:   net.assoclist[bssid].signal,
+								noise:    net.assoclist[bssid].noise,
+								rx_rate:  net.assoclist[bssid].rx_rate,
+								rx_mcs:   net.assoclist[bssid].rx_mcs,
+								rx_40mhz: net.assoclist[bssid].rx_40mhz,
+								tx_rate:  net.assoclist[bssid].tx_rate,
+								tx_mcs:   net.assoclist[bssid].tx_mcs,
+								tx_40mhz: net.assoclist[bssid].tx_40mhz,
+								link:     net.link,
+								name:     net.name
+							});
+						}
+					}
+
+					if (!s)
+						s = '<em><%:No information available%></em>';
+
+					td.innerHTML = s;
+				}
+			}
+
+			var ac = document.getElementById('wifi_assoc_table');
+			if (ac)
+			{
+				/* clear all rows */
+				while( ac.rows.length > 1 )
+					ac.rows[0].parentNode.deleteRow(1);
+
+				assoclist.sort(function(a, b) {
+					return (a.name == b.name)
+						? (a.bssid < b.bssid)
+						: (a.name  > b.name )
+					;
+				});
+
+				for( var i = 0; i < assoclist.length; i++ )
+				{
+					var tr = ac.rows[0].parentNode.insertRow(-1);
+						tr.className = 'cbi-section-table-row cbi-rowstyle-' + (1 + (i % 2));
+
+					var icon;
+					var q = (-1 * (assoclist[i].noise - assoclist[i].signal)) / 5;
+					if (q < 1)
+						icon = "<%=resource%>/icons/signal-0.png";
+					else if (q < 2)
+						icon = "<%=resource%>/icons/signal-0-25.png";
+					else if (q < 3)
+						icon = "<%=resource%>/icons/signal-25-50.png";
+					else if (q < 4)
+						icon = "<%=resource%>/icons/signal-50-75.png";
+					else
+						icon = "<%=resource%>/icons/signal-75-100.png";
+
+					tr.insertCell(-1).innerHTML = String.format(
+						'<img src="%s" title="<%:Signal%>: %d <%:dBm%> / <%:Noise%>: %d <%:dBm%>" />',
+						icon, assoclist[i].signal, assoclist[i].noise
+					);
+
+					tr.insertCell(-1).innerHTML = assoclist[i].bssid;
+
+					tr.insertCell(-1).innerHTML = String.format(
+						'<a href="%s">%s</a>',
+							assoclist[i].link,
+							'%h'.format(assoclist[i].name).nobr()
+					);
+
+					tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal).nobr();
+					tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise).nobr();
+
+					tr.insertCell(-1).innerHTML = (assoclist[i].rx_mcs > -1)
+						? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20).nobr()
+						: String.format('%.1f <%:Mbit/s%>', assoclist[i].rx_rate / 1000).nobr()
+					;
+
+					tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1)
+						? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20).nobr()
+						: String.format('%.1f <%:Mbit/s%>', assoclist[i].tx_rate / 1000).nobr()
+					;
+				}
+
+				if (ac.rows.length == 1)
+				{
+					var tr = ac.rows[0].parentNode.insertRow(-1);
+						tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+						td.colSpan = 7;
+						td.innerHTML = '<br /><em><%:No information available%></em>';
+				}
+			}
+			<% end %>
+
+			var e;
+
+			if (e = document.getElementById('localtime'))
+				e.innerHTML = info.localtime;
+
+			if (e = document.getElementById('uptime'))
+				e.innerHTML = String.format('%t', info.uptime);
+
+			if (e = document.getElementById('loadavg'))
+				e.innerHTML = String.format('%.02f, %.02f, %.02f',
+					info.loadavg[0], info.loadavg[1], info.loadavg[2]);
+
+			if (e = document.getElementById('memtotal'))
+				e.innerHTML = progressbar(
+					(info.memfree + info.membuffers + info.memcached) + " <%:kB%>",
+					info.memtotal + " <%:kB%>"
+				);
+
+			if (e = document.getElementById('memfree'))
+				e.innerHTML = progressbar(
+					info.memfree + " <%:kB%>", info.memtotal + " <%:kB%>"
+				);
+
+			if (e = document.getElementById('memcache'))
+				e.innerHTML = progressbar(
+					info.memcached + " <%:kB%>", info.memtotal + " <%:kB%>"
+				);
+
+			if (e = document.getElementById('membuff'))
+				e.innerHTML = progressbar(
+					info.membuffers + " <%:kB%>", info.memtotal + " <%:kB%>"
+				);
+
+			if (e = document.getElementById('swapcache'))
+				e.innerHTML = progressbar(
+					info.swapcached + " <%:kB%>", info.swaptotal + " <%:kB%>"
+				);
+
+			if (e = document.getElementById('swaptotal'))
+				e.innerHTML = progressbar(
+					(info.swapfree + info.swapcached) + " <%:kB%>",
+					info.swaptotal + " <%:kB%>"
+				);
+
+			if (e = document.getElementById('swapfree'))
+				e.innerHTML = progressbar(
+					info.swapfree + " <%:kB%>", info.swaptotal + " <%:kB%>"
+				);
+
+			if (e = document.getElementById('conns'))
+				e.innerHTML = progressbar(info.conncount, info.connmax);
+
+		}
+	);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Status%></a></h2>
+
+<fieldset class="cbi-section">
+	<legend><%:System%></legend>
+
+	<table width="100%" cellspacing="10">
+		<tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr>
+		<tr><td width="33%"><%:Model%></td><td><%=pcdata(model or "?")%></td></tr>
+		<tr><td width="33%"><%:Firmware Version%></td><td>
+			<%=pcdata(luci.version.distname)%> <%=pcdata(luci.version.distversion)%> /
+			<%=pcdata(luci.version.luciname)%> (<%=pcdata(luci.version.luciversion)%>)
+		</td></tr>
+		<tr><td width="33%"><%:Kernel Version%></td><td><%=luci.sys.exec("uname -r")%></td></tr>
+		<tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
+		<tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr>
+		<tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr>
+	</table>
+</fieldset>
+
+<fieldset class="cbi-section">
+	<legend><%:Memory%></legend>
+
+	<table width="100%" cellspacing="10">
+		<tr><td width="33%"><%:Total Available%></td><td id="memtotal">-</td></tr>
+		<tr><td width="33%"><%:Free%></td><td id="memfree">-</td></tr>
+		<tr><td width="33%"><%:Cached%></td><td id="memcache">-</td></tr>
+		<tr><td width="33%"><%:Buffered%></td><td id="membuff">-</td></tr>
+	</table>
+</fieldset>
+
+<% if has_swap then %>
+<fieldset class="cbi-section">
+	<legend><%:Swap%></legend>
+
+	<table width="100%" cellspacing="10">
+		<tr><td width="33%"><%:Total Available%></td><td id="swaptotal">-</td></tr>
+		<tr><td width="33%"><%:Free%></td><td id="swapfree">-</td></tr>
+		<tr><td width="33%"><%:Cached%></td><td id="swapcache">-</td></tr>
+	</table>
+</fieldset>
+<% end %>
+
+<fieldset class="cbi-section">
+	<legend><%:Network%></legend>
+
+	<table width="100%" cellspacing="10">
+		<tr><td width="33%" style="vertical-align:top"><%:IPv4 WAN Status%></td><td>
+			<table><tr>
+				<td id="wan4_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
+				<td id="wan4_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
+			</tr></table>
+		</td></tr>
+		<% if has_ipv6 then %>
+		<tr><td width="33%" style="vertical-align:top"><%:IPv6 WAN Status%></td><td>
+			<table><tr>
+				<td id="wan6_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
+				<td id="wan6_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
+			</tr></table>
+		</td></tr>
+		<% end %>
+		<tr><td width="33%"><%:Active Connections%></td><td id="conns">-</td></tr>
+	</table>
+</fieldset>
+
+<% if has_dhcp then %>
+<fieldset class="cbi-section">
+	<legend><%:DHCP Leases%></legend>
+
+	<table class="cbi-section-table" id="lease_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Hostname%></th>
+			<th class="cbi-section-table-cell"><%:IPv4-Address%></th>
+			<th class="cbi-section-table-cell"><%:MAC-Address%></th>
+			<th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="4"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+
+<fieldset class="cbi-section" style="display:none">
+	<legend><%:DHCPv6 Leases%></legend>
+
+	<table class="cbi-section-table" id="lease6_status_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell"><%:Hostname%></th>
+			<th class="cbi-section-table-cell"><%:IPv6-Address%></th>
+			<th class="cbi-section-table-cell"><%:DUID%></th>
+			<th class="cbi-section-table-cell"><%:Leasetime remaining%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="4"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+<% end %>
+
+<% if has_dsl then %>
+<fieldset class="cbi-section">
+       <legend><%:ADSL%></legend>
+       <table width="100%" cellspacing="10">
+               <tr><td width="33%" style="vertical-align:top"><%:ADSL Status%></td><td>
+                       <table><tr>
+                               <td id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td>
+                               <td id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td>
+                       </tr></table>
+               </td></tr>
+       </table>
+</fieldset>
+<% end %>
+
+<% if has_wifi then %>
+<fieldset class="cbi-section">
+	<legend><%:Wireless%></legend>
+
+	<table id="wifi_status_table" width="100%" cellspacing="10">
+		<tr><td><em><%:Collecting data...%></em></td></tr>
+	</table>
+</fieldset>
+
+<fieldset class="cbi-section">
+	<legend><%:Associated Stations%></legend>
+
+	<table class="cbi-section-table" id="wifi_assoc_table">
+		<tr class="cbi-section-table-titles">
+			<th class="cbi-section-table-cell">&#160;</th>
+			<th class="cbi-section-table-cell"><%:MAC-Address%></th>
+			<th class="cbi-section-table-cell"><%:Network%></th>
+			<th class="cbi-section-table-cell"><%:Signal%></th>
+			<th class="cbi-section-table-cell"><%:Noise%></th>
+			<th class="cbi-section-table-cell"><%:RX Rate%></th>
+			<th class="cbi-section-table-cell"><%:TX Rate%></th>
+		</tr>
+		<tr class="cbi-section-table-row">
+			<td colspan="7"><em><br /><%:Collecting data...%></em></td>
+		</tr>
+	</table>
+</fieldset>
+<% end %>
+
+<%-
+	require "luci.util"
+	require "nixio.fs"
+
+	local plugins = nixio.fs.dir(luci.util.libpath() .. "/view/admin_status/index")
+	if plugins then
+		local inc
+		for inc in plugins do
+			if inc:match("%.htm$") then
+				include("admin_status/index/" .. inc:gsub("%.htm$", ""))
+			end
+		end
+	end
+-%>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/iptables.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/iptables.htm
new file mode 100644
index 00000000..957604e8
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/iptables.htm
@@ -0,0 +1,159 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008-2009 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%-
+
+	require "luci.sys.iptparser"
+	require "luci.tools.webadmin"
+	require "luci.fs"
+
+	local has_ip6tables = luci.fs.access("/usr/sbin/ip6tables")
+	local mode = 4
+
+	if has_ip6tables then
+		mode = luci.dispatcher.context.requestpath
+	    mode = tonumber(mode[#mode] ~= "iptables" and mode[#mode]) or 4
+	end
+
+	local ipt = luci.sys.iptparser.IptParser(mode)
+	local wba = luci.tools.webadmin
+
+	local rowcnt = 1
+	function rowstyle()
+		rowcnt = rowcnt + 1
+		return (rowcnt % 2) + 1
+	end
+
+	function link_target(t,c)
+		if ipt:is_custom_target(c) then
+			return '<a href="#rule_%s_%s">%s</a>' %{ t:lower(), c, c }
+		end
+		return c
+	end
+
+	function link_iface(i)
+		local net = wba.iface_get_network(i)
+		if net and i ~= "lo" then
+			return '<a href="%s">%s</a>' %{
+				luci.dispatcher.build_url("admin", "network", "network", net), i
+			}
+
+		end
+		return i
+	end
+
+	local tables = { "Filter", "NAT", "Mangle", "Raw" }
+	if mode == 6 then
+		tables = { "Filter", "Mangle", "Raw" }
+	end
+-%>
+
+<%+header%>
+
+<style type="text/css">
+	span:target {
+		color: blue;
+		text-decoration: underline;
+	}
+</style>
+
+<h2><a id="content" name="content"><%:Firewall Status%></a></h2>
+
+<% if has_ip6tables then %>
+<ul class="cbi-tabmenu">
+	<li class="cbi-tab<%= mode ~= 4 and "-disabled" %>"><a href="<%=luci.dispatcher.build_url("admin/status/iptables/4")%>"><%:IPv4 Firewall%></a></li>
+	<li class="cbi-tab<%= mode ~= 6 and "-disabled" %>"><a href="<%=luci.dispatcher.build_url("admin/status/iptables/6")%>"><%:IPv6 Firewall%></a></li>
+</ul>
+<% end %>
+
+<form method="post" action="<%=REQUEST_URI%>">
+	<div class="cbi-map">
+		<fieldset class="cbi-section">
+			<h3><%:Actions%></h3>
+			<ul>
+				<li><a href="<%=REQUEST_URI%>?zero=<%=mode%>"><%:Reset Counters%></a></li>
+				<li><a href="<%=REQUEST_URI%>?restart=1"><%:Restart Firewall%></a></li>
+			</ul>
+			<br /><br />
+
+			<% for _, tbl in ipairs(tables) do chaincnt = 0 %>
+				<h3><%:Table%>: <%=tbl%></h3>
+				<table class="cbi-section-table" style="font-size:90%">
+					<% for _, chain in ipairs(ipt:chains(tbl)) do
+						rowcnt    = 0
+						chaincnt  = chaincnt + 1
+						chaininfo = ipt:chain(tbl, chain)
+					%>
+						<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
+							<th class="cbi-section-table-cell" style="text-align:left" colspan="11">
+								<br /><span id="rule_<%=tbl:lower()%>_<%=chain%>">
+								<%:Chain%> <em><%=chain%></em>
+								(<%- if chaininfo.policy then -%>
+									<%:Policy%>: <em><%=chaininfo.policy%></em>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%>
+								<%- else -%>
+									<%:References%>: <%=chaininfo.references-%>
+								<%- end -%>)</span>
+							</th>
+						</tr>
+						<tr class="cbi-section-table-descr">
+							<th class="cbi-section-table-cell"><%:Rule #%></th>
+							<th class="cbi-section-table-cell"><%:Pkts.%></th>
+							<th class="cbi-section-table-cell"><%:Traffic%></th>
+							<th class="cbi-section-table-cell"><%:Target%></th>
+							<th class="cbi-section-table-cell"><%:Prot.%></th>
+							<th class="cbi-section-table-cell"><%:Flags%></th>
+							<th class="cbi-section-table-cell"><%:In%></th>
+							<th class="cbi-section-table-cell"><%:Out%></th>
+							<th class="cbi-section-table-cell"><%:Source%></th>
+							<th class="cbi-section-table-cell"><%:Destination%></th>
+							<th class="cbi-section-table-cell" style="width:30%"><%:Options%></th>
+						</tr>
+
+						<% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %>
+							<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
+								<td><%=rule.index%></td>
+								<td><%=rule.packets%></td>
+								<td><%=wba.byte_format(rule.bytes)%></td>
+								<td><%=rule.target and link_target(tbl, rule.target) or "-"%></td>
+								<td><%=rule.protocol%></td>
+								<td><%=rule.flags%></td>
+								<td><%=link_iface(rule.inputif)%></td>
+								<td><%=link_iface(rule.outputif)%></td>
+								<td><%=rule.source%></td>
+								<td><%=rule.destination%></td>
+								<td style="width:30%"><small><%=#rule.options > 0 and luci.util.pcdata(table.concat(rule.options, " ")) or "-"%></small></td>
+							</tr>
+						<% end %>
+
+						<% if rowcnt == 1 then %>
+							<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
+								<td colspan="11"><em><%:No rules in this chain%></em></td>
+							</tr>
+						<% end %>
+					<% end %>
+
+					<% if chaincnt == 0 then %>
+						<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
+							<td colspan="11"><em><%:No chains in this table%></em></td>
+						</tr>
+					<% end %>
+				</table>
+				<br /><br />
+			<% end %>
+		</fieldset>
+	</div>
+</form>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/load.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/load.htm
new file mode 100644
index 00000000..a002715e
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/load.htm
@@ -0,0 +1,291 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var bwxhr = new XHR();
+
+	var G;
+	var TIME = 0;
+	var L01   = 1;
+	var L05   = 2;
+	var L15  = 3;
+
+	var width  = 760;
+	var height = 300;
+	var step   = 5;
+
+	var data_wanted = Math.floor(width / step);
+	var data_fill   = 0;
+	var data_stamp  = 0;
+
+	var data_01  = [ ];
+	var data_05  = [ ];
+	var data_15 = [ ];
+
+	var line_01;
+	var line_05;
+	var line_15;
+
+	var label_25;
+	var label_050;
+	var label_75;
+
+	var label_01_cur;
+	var label_01_avg;
+	var label_01_peak;
+
+	var label_05_cur;
+	var label_05_avg;
+	var label_05_peak;
+
+	var label_15_cur;
+	var label_15_avg;
+	var label_15_peak;
+
+	var label_scale;
+
+
+	/* wait for SVG */
+	window.setTimeout(
+		function() {
+			var svg = document.getElementById('bwsvg');
+
+			try {
+				G = svg.getSVGDocument
+					? svg.getSVGDocument() : svg.contentDocument;
+			}
+			catch(e) {
+				G = document.embeds['bwsvg'].getSVGDocument();
+			}
+
+			if (!G)
+			{
+				window.setTimeout(arguments.callee, 1000);
+			}
+			else
+			{
+				/* find sizes */
+				width       = svg.offsetWidth  - 2;
+				height      = svg.offsetHeight - 2;
+				data_wanted = Math.ceil(width / step);
+
+				/* prefill datasets */
+				for (var i = 0; i < data_wanted; i++)
+				{
+					data_01[i] = 0;
+					data_05[i] = 0;
+					data_15[i] = 0;
+				}
+
+				/* find svg elements */
+				line_01 = G.getElementById('load01');
+				line_05 = G.getElementById('load05');
+				line_15 = G.getElementById('load15');
+
+				label_25 = G.getElementById('label_25');
+				label_50 = G.getElementById('label_50');
+				label_75 = G.getElementById('label_75');
+
+				label_01_cur  = document.getElementById('lb_load01_cur');
+				label_01_avg  = document.getElementById('lb_load01_avg');
+				label_01_peak = document.getElementById('lb_load01_peak');
+
+				label_05_cur  = document.getElementById('lb_load05_cur');
+				label_05_avg  = document.getElementById('lb_load05_avg');
+				label_05_peak = document.getElementById('lb_load05_peak');
+
+				label_15_cur  = document.getElementById('lb_load15_cur');
+				label_15_avg  = document.getElementById('lb_load15_avg');
+				label_15_peak = document.getElementById('lb_load15_peak');
+
+				label_scale   = document.getElementById('scale');
+
+
+				/* plot horizontal time interval lines */
+				for (var i = width % (step * 60); i < width; i += step * 60)
+				{
+					var line = G.createElementNS('http://www.w3.org/2000/svg', 'line');
+						line.setAttribute('x1', i);
+						line.setAttribute('y1', 0);
+						line.setAttribute('x2', i);
+						line.setAttribute('y2', '100%');
+						line.setAttribute('style', 'stroke:black;stroke-width:0.1');
+
+					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
+						text.setAttribute('x', i + 5);
+						text.setAttribute('y', 15);
+						text.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
+
+					label_25.parentNode.appendChild(line);
+					label_25.parentNode.appendChild(text);
+				}
+
+				label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
+
+				/* render datasets, start update interval */
+				XHR.poll(3, '<%=build_url("admin/status/realtime/load_status")%>', null,
+					function(x, data)
+					{
+						var data_max   = 0;
+						var data_scale = 0;
+
+						var data_01_avg = 0;
+						var data_05_avg = 0;
+						var data_15_avg = 0;
+
+						var data_01_peak = 0;
+						var data_05_peak = 0;
+						var data_15_peak = 0;
+
+						for (var i = data_stamp ? 0 : 1; i < data.length; i++)
+						{
+							/* skip overlapping entries */
+							if (data[i][TIME] <= data_stamp)
+								continue;
+
+							data_01.push(data[i][L01]);
+							data_05.push(data[i][L05]);
+							data_15.push(data[i][L15]);
+						}
+
+						/* cut off outdated entries */
+						data_01 = data_01.slice(data_01.length - data_wanted, data_01.length);
+						data_05 = data_05.slice(data_05.length - data_wanted, data_05.length);
+						data_15 = data_15.slice(data_15.length - data_wanted, data_15.length);
+
+						/* find peak */
+						for (var i = 0; i < data_01.length; i++)
+						{
+							data_max = Math.max(data_max, data_01[i]);
+							data_max = Math.max(data_max, data_05[i]);
+							data_max = Math.max(data_max, data_15[i]);
+
+							data_01_peak = Math.max(data_01_peak, data_01[i]);
+							data_05_peak = Math.max(data_05_peak, data_05[i]);
+							data_15_peak = Math.max(data_15_peak, data_15[i]);
+
+							if (i > 0)
+							{
+								data_01_avg = (data_01_avg + data_01[i]) / 2;
+								data_05_avg = (data_05_avg + data_05[i]) / 2;
+								data_15_avg = (data_15_avg + data_15[i]) / 2;
+							}
+							else
+							{
+								data_01_avg = data_01[i];
+								data_05_avg = data_05[i];
+								data_15_avg = data_15[i];
+							}
+						}
+
+						/* remember current timestamp, calculate horizontal scale */
+						data_stamp = data[data.length-1][TIME];
+						data_scale = height / (data_max * 1.1);
+
+
+						/* plot data */
+						var pt_01 = '0,' + height;
+						var pt_05 = '0,' + height;
+						var pt_15 = '0,' + height;
+
+						var y_01 = 0;
+						var y_05 = 0;
+						var y_15 = 0;
+
+						for (var i = 0; i < data_01.length; i++)
+						{
+							var x = i * step;
+
+							y_01 = height - Math.floor(data_01[i] * data_scale);
+							y_05 = height - Math.floor(data_05[i] * data_scale);
+							y_15 = height - Math.floor(data_15[i] * data_scale);
+
+							pt_01 += ' ' + x + ',' + y_01;
+							pt_05 += ' ' + x + ',' + y_05;
+							pt_15 += ' ' + x + ',' + y_15;
+						}
+
+						pt_01 += ' ' + width + ',' + y_01 + ' ' + width + ',' + height;
+						pt_05 += ' ' + width + ',' + y_05 + ' ' + width + ',' + height;
+						pt_15 += ' ' + width + ',' + y_15 + ' ' + width + ',' + height;
+
+
+						line_01.setAttribute('points', pt_01);
+						line_05.setAttribute('points', pt_05);
+						line_15.setAttribute('points', pt_15);
+
+						label_25.firstChild.data = (1.1 * 0.25 * data_max / 100).toFixed(2);
+						label_50.firstChild.data = (1.1 * 0.50 * data_max / 100).toFixed(2);
+						label_75.firstChild.data = (1.1 * 0.75 * data_max / 100).toFixed(2);
+
+						label_01_cur.innerHTML = (data_01[data_01.length-1] / 100).toFixed(2);
+						label_05_cur.innerHTML = (data_05[data_05.length-1] / 100).toFixed(2);
+						label_15_cur.innerHTML = (data_15[data_15.length-1] / 100).toFixed(2);
+
+						label_01_avg.innerHTML = (data_01_avg / 100).toFixed(2);
+						label_05_avg.innerHTML = (data_05_avg / 100).toFixed(2);
+						label_15_avg.innerHTML = (data_15_avg / 100).toFixed(2);
+
+						label_01_peak.innerHTML = (data_01_peak / 100).toFixed(2);
+						label_05_peak.innerHTML = (data_05_peak / 100).toFixed(2);
+						label_15_peak.innerHTML = (data_15_peak / 100).toFixed(2);
+					}
+				);
+			}
+		}, 1000
+	);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Realtime Load%></a></h2>
+
+<embed id="bwsvg" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/load.svg" />
+<div style="text-align:right"><small id="scale">-</small></div>
+<br />
+
+<table style="width:100%; table-layout:fixed" cellspacing="5">
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff0000; white-space:nowrap"><%:1 Minute Load:%></strong></td>
+		<td id="lb_load01_cur">0</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="lb_load01_avg">0</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="lb_load01_peak">0</td>
+	</tr>
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ff6600; white-space:nowrap"><%:5 Minute Load:%></strong></td>
+		<td id="lb_load05_cur">0</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="lb_load05_avg">0</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="lb_load05_peak">0</td>
+	</tr>
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid #ffaa00; white-space:nowrap"><%:15 Minute Load:%></strong></td>
+		<td id="lb_load15_cur">0</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="lb_load15_avg">0</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="lb_load15_peak">0</td>
+	</tr>
+</table>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/routes.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/routes.htm
new file mode 100644
index 00000000..4e7287b7
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -0,0 +1,107 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008-2009 Steven Barth <steven@midlink.org>
+Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%-
+	require "bit"
+	require "luci.sys"
+	require "luci.tools.webadmin"
+	require "nixio.fs"
+
+	local style = true
+-%>
+
+<%+header%>
+
+<div class="cbi-map" id="cbi-network">
+	<h2><a id="content" name="content"><%:Routes%></a></h2>
+	<div class="cbi-map-descr"><%:The following rules are currently active on this system.%></div>
+
+	<fieldset class="cbi-section" id="cbi-table-table">
+		<legend>ARP</legend>
+		<div class="cbi-section-node">
+			<table class="cbi-section-table">
+				<tr class="cbi-section-table-titles">
+					<th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></th>
+					<th class="cbi-section-table-cell"><%_<abbr title="Media Access Control">MAC</abbr>-Address%></th>
+					<th class="cbi-section-table-cell"><%:Interface%></th>
+				</tr>
+
+				<% luci.sys.net.arptable(function(e) %>
+				<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+					<td class="cbi-value-field"><%=e["IP address"]%></td>
+					<td class="cbi-value-field"><%=e["HW address"]%></td>
+					<td class="cbi-value-field"><%=e["Device"]%></td>
+				</tr>
+				<% style = not style; end) %>
+			</table>
+		</div>
+	</fieldset>
+	<br />
+
+	<fieldset class="cbi-section" id="cbi-table-table">
+		<legend><%_Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend>
+
+		<div class="cbi-section-node">
+			<table class="cbi-section-table">
+				<tr class="cbi-section-table-titles">
+					<th class="cbi-section-table-cell"><%:Network%></th>
+					<th class="cbi-section-table-cell"><%:Target%></th>
+					<th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway%></th>
+					<th class="cbi-section-table-cell"><%:Metric%></th>
+				</tr>
+				<% luci.sys.net.routes(function(rt) %>
+				<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+					<td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%></td>
+					<td class="cbi-value-field"><%=rt.dest:string()%></td>
+					<td class="cbi-value-field"><%=rt.gateway:string()%></td>
+					<td class="cbi-value-field"><%=rt.metric%></td>
+				</tr>
+				<% style = not style; end) %>
+			</table>
+		</div>
+	</fieldset>
+	<br />
+
+	<% if nixio.fs.access("/proc/net/ipv6_route") then
+		style = true
+		fe80 = luci.ip.IPv6("fe80::/10")
+	%>
+	<fieldset class="cbi-section" id="cbi-table-table">
+		<legend><%_Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes%></legend>
+
+		<div class="cbi-section-node">
+			<table class="cbi-section-table">
+				<tr class="cbi-section-table-titles">
+					<th class="cbi-section-table-cell"><%:Network%></th>
+					<th class="cbi-section-table-cell"><%:Target%></th>
+					<th class="cbi-section-table-cell"><%_<abbr title="Internet Protocol Version 6">IPv6</abbr>-Gateway%></th>
+					<th class="cbi-section-table-cell"><%:Metric%></th>
+				</tr>
+				<% luci.sys.net.routes6(function(rt) if fe80:contains(rt.dest) then return end %>
+				<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
+					<td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or '(' .. rt.device .. ')'%></td>
+					<td class="cbi-value-field"><%=rt.dest:string()%></td>
+					<td class="cbi-value-field"><%=rt.source:string()%></td>
+					<td class="cbi-value-field"><%=rt.metric_raw:upper()%></td>
+				</tr>
+				<% style = not style; end) %>
+			</table>
+		</div>
+	</fieldset>
+	<br />
+	<% end %>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm
new file mode 100644
index 00000000..06aeeb01
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm
@@ -0,0 +1,20 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:System Log%></a></h2>
+<div id="content_syslog">
+<textarea readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea>
+</div>
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/wireless.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/wireless.htm
new file mode 100644
index 00000000..465143eb
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_status/wireless.htm
@@ -0,0 +1,378 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%-
+	local ntm = require "luci.model.network".init()
+
+	local dev
+	local devices = { }
+	for _, dev in luci.util.vspairs(luci.sys.net.devices()) do
+		if dev:match("^wlan%d") or dev:match("^ath%d") or dev:match("^wl%d") then
+			devices[#devices+1] = dev
+		end
+	end
+
+	local curdev = luci.dispatcher.context.requestpath
+	      curdev = curdev[#curdev] ~= "wireless" and curdev[#curdev] or devices[1]
+-%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var bwxhr = new XHR();
+
+	var G, G2;
+	var TIME  = 0;
+	var RATE  = 1;
+	var RSSI  = 2;
+	var NOISE = 3;
+
+	var width  = 760;
+	var height = 300;
+	var step   = 5;
+
+	var data_wanted = Math.floor(width / step);
+	var data_fill   = 0;
+	var data_stamp  = 0;
+
+	var data_rssi = [ ];
+	var data_noise = [ ];
+	var data_rate = [ ];
+
+	var line_rssi;
+	var line_noise;
+	var line_rate;
+
+	var label_25, label_25_2;
+	var label_50, label_50_2;
+	var label_75, label_75_2;
+
+	var label_rssi_cur;
+	var label_rssi_avg;
+	var label_rssi_peak;
+
+	var label_noise_cur;
+	var label_noise_avg;
+	var label_noise_peak;
+
+	var label_rate_cur;
+	var label_rate_avg;
+	var label_rate_peak;
+
+	var label_scale;
+
+
+	/* wait for SVG */
+	window.setTimeout(
+		function() {
+			var svg = document.getElementById('iwsvg');
+			var svg2 = document.getElementById('iwsvg2');
+
+			try {
+				G = svg.getSVGDocument
+					? svg.getSVGDocument() : svg.contentDocument;
+				G2 = svg2.getSVGDocument
+					? svg2.getSVGDocument() : svg2.contentDocument;
+			}
+			catch(e) {
+				G = document.embeds['iwsvg'].getSVGDocument();
+				G2 = document.embeds['iwsvg2'].getSVGDocument();
+			}
+
+			if (!G || !G2)
+			{
+				window.setTimeout(arguments.callee, 1000);
+			}
+			else
+			{
+				/* find sizes */
+				width       = svg.offsetWidth  - 2;
+				height      = svg.offsetHeight - 2;
+				data_wanted = Math.ceil(width / step);
+
+				/* prefill datasets */
+				for (var i = 0; i < data_wanted; i++)
+				{
+					data_rssi[i] = 0;
+					data_noise[i] = 0;
+					data_rate[i] = 0;
+				}
+
+				/* find svg elements */
+				line_rssi = G.getElementById('rssi');
+				line_noise = G.getElementById('noise');
+				line_rate = G2.getElementById('rate');
+
+				label_25 = G.getElementById('label_25');
+				label_50 = G.getElementById('label_50');
+				label_75 = G.getElementById('label_75');
+				label_25_2 = G2.getElementById('label_25');
+				label_50_2 = G2.getElementById('label_50');
+				label_75_2 = G2.getElementById('label_75');
+
+				label_rssi_cur  = document.getElementById('rssi_bw_cur');
+				label_rssi_avg  = document.getElementById('rssi_bw_avg');
+				label_rssi_peak = document.getElementById('rssi_bw_peak');
+
+				label_noise_cur  = document.getElementById('noise_bw_cur');
+				label_noise_avg  = document.getElementById('noise_bw_avg');
+				label_noise_peak = document.getElementById('noise_bw_peak');
+
+				label_rate_cur  = document.getElementById('rate_bw_cur');
+				label_rate_avg  = document.getElementById('rate_bw_avg');
+				label_rate_peak = document.getElementById('rate_bw_peak');
+
+				label_scale   = document.getElementById('scale');
+				label_scale_2 = document.getElementById('scale2');
+
+
+				/* plot horizontal time interval lines */
+				for (var i = width % (step * 60); i < width; i += step * 60)
+				{
+					var line = G.createElementNS('http://www.w3.org/2000/svg', 'line');
+						line.setAttribute('x1', i);
+						line.setAttribute('y1', 0);
+						line.setAttribute('x2', i);
+						line.setAttribute('y2', '100%');
+						line.setAttribute('style', 'stroke:black;stroke-width:0.1');
+
+					var text = G.createElementNS('http://www.w3.org/2000/svg', 'text');
+						text.setAttribute('x', i + 5);
+						text.setAttribute('y', 15);
+						text.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
+
+					label_25.parentNode.appendChild(line);
+					label_25.parentNode.appendChild(text);
+
+
+					var line2 = G2.createElementNS('http://www.w3.org/2000/svg', 'line');
+						line2.setAttribute('x1', i);
+						line2.setAttribute('y1', 0);
+						line2.setAttribute('x2', i);
+						line2.setAttribute('y2', '100%');
+						line2.setAttribute('style', 'stroke:black;stroke-width:0.1');
+
+					var text2 = G2.createElementNS('http://www.w3.org/2000/svg', 'text');
+						text2.setAttribute('x', i + 5);
+						text2.setAttribute('y', 15);
+						text2.setAttribute('style', 'fill:#999999; font-size:9pt');
+						text2.appendChild(G.createTextNode(Math.round((width - i) / step / 60) + 'm'));
+
+					label_25_2.parentNode.appendChild(line2);
+					label_25_2.parentNode.appendChild(text2);
+				}
+
+				label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
+				label_scale_2.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
+
+				/* render datasets, start update interval */
+				XHR.poll(3, '<%=build_url("admin/status/realtime/wireless_status", curdev)%>', null,
+					function(x, data)
+					{
+						var noise_floor = 255;
+						var rate_floor = 60000;
+
+						for (var i = 0; i < data.length; i++) {
+							noise_floor = Math.min(noise_floor, data[i][NOISE]);
+							rate_floor = Math.min(rate_floor, data[i][RATE]);
+						}
+
+						noise_floor -= 5;
+
+						var data_max   = 0;
+						var data_scale = 0;
+						var data_max_2   = 0;
+						var data_scale_2 = 0;
+
+						var data_rssi_avg = 0;
+						var data_noise_avg = 0;
+						var data_rate_avg = 0;
+
+						var data_rssi_peak = 0;
+						var data_noise_peak = 0;
+						var data_rate_peak = 0;
+
+						for (var i = data_stamp ? 0 : 1; i < data.length; i++)
+						{
+							/* skip overlapping entries */
+							if (data[i][TIME] <= data_stamp)
+								continue;
+
+							data_rssi.push(data[i][RSSI] - noise_floor);
+							data_noise.push(data[i][NOISE] - noise_floor);
+							data_rate.push(Math.floor(data[i][RATE] / 1000));
+						}
+
+						/* cut off outdated entries */
+						data_rssi = data_rssi.slice(data_rssi.length - data_wanted, data_rssi.length);
+						data_noise = data_noise.slice(data_noise.length - data_wanted, data_noise.length);
+						data_rate = data_rate.slice(data_rate.length - data_wanted, data_rate.length);
+
+						/* find peak */
+						for (var i = 0; i < data_rssi.length; i++)
+						{
+							data_max = Math.max(data_max, data_rssi[i]);
+							data_max_2 = Math.max(data_max_2, data_rate[i]);
+
+							data_rssi_peak = Math.max(data_rssi_peak, data_rssi[i]);
+							data_noise_peak = Math.max(data_noise_peak, data_noise[i]);
+							data_rate_peak = Math.max(data_rate_peak, data_rate[i]);
+
+							if (i > 0)
+							{
+								data_rssi_avg = (data_rssi_avg + data_rssi[i]) / 2;
+								data_noise_avg = (data_noise_avg + data_noise[i]) / 2;
+								data_rate_avg = (data_rate_avg + data_rate[i]) / 2;
+							}
+							else
+							{
+								data_rssi_avg = data_rssi[i];
+								data_noise_avg = data_noise[i];
+								data_rate_avg = data_rate[i];
+							}
+						}
+
+						/* remember current timestamp, calculate horizontal scale */
+						data_stamp = data[data.length-1][TIME];
+						data_scale = (height / (data_max * 1.1)).toFixed(1);
+						data_scale_2 = (height / (data_max_2 * 1.1)).toFixed(1);
+
+						/* plot data */
+						var pt_rssi = '0,' + height;
+						var pt_noise = '0,' + height;
+						var pt_rate = '0,' + height;
+
+						var y_rssi = 0;
+						var y_noise = 0;
+						var y_rate = 0;
+
+						for (var i = 0; i < data_rssi.length; i++)
+						{
+							var x = i * step;
+
+							y_rssi = height - Math.floor(data_rssi[i] * data_scale);
+							y_noise = height - Math.floor(data_noise[i] * data_scale);
+							y_rate = height - Math.floor(data_rate[i] * data_scale_2);
+
+							y_rssi -= Math.floor(y_rssi % (1/data_scale));
+							y_noise -= Math.floor(y_noise % (1/data_scale));
+
+							pt_rssi += ' ' + x + ',' + y_rssi;
+							pt_noise += ' ' + x + ',' + y_noise;
+							pt_rate += ' ' + x + ',' + y_rate;
+						}
+
+						pt_rssi += ' ' + width + ',' + y_rssi + ' ' + width + ',' + height;
+						pt_noise += ' ' + width + ',' + y_noise + ' ' + width + ',' + height;
+						pt_rate += ' ' + width + ',' + y_rate + ' ' + width + ',' + height;
+
+						line_rssi.setAttribute('points', pt_rssi);
+						line_noise.setAttribute('points', pt_noise);
+						line_rate.setAttribute('points', pt_rate);
+
+						function wireless_label(dbm, noise)
+						{
+							if (noise)
+								return String.format("%d <%:dBm%> (SNR %d <%:dBm%>)", noise_floor + dbm - 255, dbm - noise);
+							else
+								return String.format("%d <%:dBm%>", noise_floor + dbm - 255);
+						}
+
+						function rate_label(mbit)
+						{
+							return String.format("%d <%:Mbit/s%>", mbit);
+						}
+
+						label_25.firstChild.data = wireless_label(1.1 * 0.25 * data_max);
+						label_50.firstChild.data = wireless_label(1.1 * 0.50 * data_max);
+						label_75.firstChild.data = wireless_label(1.1 * 0.75 * data_max);
+
+						label_25_2.firstChild.data = rate_label(1.1 * 0.25 * data_max_2);
+						label_50_2.firstChild.data = rate_label(1.1 * 0.50 * data_max_2);
+						label_75_2.firstChild.data = rate_label(1.1 * 0.75 * data_max_2);
+
+						label_rssi_cur.innerHTML = wireless_label(data_rssi[data_rssi.length-1], data_noise[data_noise.length-1]).nobr();
+						label_noise_cur.innerHTML = wireless_label(data_noise[data_noise.length-1]).nobr();
+
+						label_rssi_avg.innerHTML = wireless_label(data_rssi_avg, data_noise_avg).nobr();
+						label_noise_avg.innerHTML = wireless_label(data_noise_avg).nobr();
+
+						label_rssi_peak.innerHTML = wireless_label(data_rssi_peak, data_noise_peak).nobr();
+						label_noise_peak.innerHTML = wireless_label(data_noise_peak).nobr();
+
+						label_rate_cur.innerHTML = rate_label(data_rate[data_rate.length-1]);
+						label_rate_avg.innerHTML = rate_label(data_rate_avg);
+						label_rate_peak.innerHTML = rate_label(data_rate_peak);
+					}
+				);
+			}
+		}, 1000
+	);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Realtime Wireless%></a></h2>
+
+<ul class="cbi-tabmenu">
+	<% for _, dev in ipairs(devices) do %>
+		<li class="cbi-tab<%= dev == curdev and "" or "-disabled" %>"><a href="<%=pcdata(dev)%>"><%=pcdata(dev)%></a></li>
+	<% end %>
+</ul>
+
+<embed id="iwsvg" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/wireless.svg" />
+<div style="text-align:right"><small id="scale">-</small></div>
+<br />
+
+<table style="width:100%; table-layout:fixed" cellspacing="5">
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid blue"><%:Signal:%></strong></td>
+		<td id="rssi_bw_cur">0 <%:dBm%></td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="rssi_bw_avg">0 <%:dBm%></td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="rssi_bw_peak">0 <%:dBm%></td>
+	</tr>
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid red"><%:Noise:%></strong></td>
+		<td id="noise_bw_cur">0 <%:dBm%></td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="noise_bw_avg">0 <%:dBm%></td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="noise_bw_peak">0 <%:dBm%></td>
+	</tr>
+</table>
+
+<br />
+
+<embed id="iwsvg2" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/wifirate.svg" />
+<div style="text-align:right"><small id="scale2">-</small></div>
+<br />
+
+<table style="width:100%; table-layout:fixed" cellspacing="5">
+	<tr>
+		<td style="text-align:right; vertical-align:top"><strong style="border-bottom:2px solid green"><%:Phy Rate:%></strong></td>
+		<td id="rate_bw_cur">0 MBit/s</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Average:%></strong></td>
+		<td id="rate_bw_avg">0 MBit/s</td>
+
+		<td style="text-align:right; vertical-align:top"><strong><%:Peak:%></strong></td>
+		<td id="rate_bw_peak">0 MBit/s</td>
+	</tr>
+</table>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
new file mode 100644
index 00000000..56721a61
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
@@ -0,0 +1,50 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<html>
+	<head>
+		<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title>
+		<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
+		<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
+		<script type="text/javascript">//<![CDATA[
+			var interval = window.setInterval(function() {
+				var img = new Image();
+
+				img.onload = function() {
+					window.clearInterval(interval);
+					location.href = ('https:' == document.location.protocol ? 'https://' : 'http://') + '<%=addr or luci.http.getenv("SERVER_NAME")%>/';
+				};
+
+				img.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + '<%=addr or luci.http.getenv("SERVER_NAME")%><%=resource%>/icons/loading.gif?' + Math.random();
+			}, 5000);
+		//]]></script>
+	</head>
+	<body>
+		<div id="maincontainer">
+			<div id="maincontent">
+				<h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></a></h2>
+				<fieldset class="cbi-section">
+					<p>
+						<% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>
+					</p>
+					<p>
+						<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+						<%:Waiting for changes to be applied...%>
+					</p>
+				</fieldset>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/backupfiles.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/backupfiles.htm
new file mode 100644
index 00000000..38b5f03a
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/backupfiles.htm
@@ -0,0 +1,19 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<ul class="cbi-tabmenu">
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/system/flashops")%>"><%:Actions%></a></li>
+	<li class="cbi-tab"><a href="#"><%:Configuration%></a></li>
+</ul>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/clock_status.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/clock_status.htm
new file mode 100644
index 00000000..84e15107
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/clock_status.htm
@@ -0,0 +1,36 @@
+<%+cbi/valueheader%>
+
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "system", "clock_status")%>', null,
+		function(x, rv)
+		{
+			var s = document.getElementById('<%=self.option%>-clock-status');
+			if (s)
+			{
+				s.innerHTML = rv.timestring || '?';
+			}
+		}
+	);
+
+	function sync_clock(btn)
+	{
+		btn.disabled = true;
+		btn.value    = '<%:Synchronizing...%>';
+
+		XHR.get('<%=luci.dispatcher.build_url("admin", "system", "clock_status")%>',
+			{ set: Math.floor((new Date()).getTime() / 1000) },
+			function()
+			{
+				btn.disabled = false;
+				btn.value    = '<%:Sync with browser%>';
+			}
+		);
+
+		return false;
+	}
+//]]></script>
+
+<span id="<%=self.option%>-clock-status"><em><%:Collecting data...%></em></span>
+<input type="button" class="cbi-button cbi-button-apply" value="<%:Sync with browser%>" onclick="return sync_clock(this)" />
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/flashops.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/flashops.htm
new file mode 100644
index 00000000..384e7d5c
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/flashops.htm
@@ -0,0 +1,94 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Flash operations%></a></h2>
+
+<ul class="cbi-tabmenu">
+	<li class="cbi-tab"><a href="#"><%:Actions%></a></li>
+	<li class="cbi-tab-disabled"><a href="<%=REQUEST_URI%>/backupfiles"><%:Configuration%></a></li>
+</ul>
+
+<fieldset class="cbi-section">
+
+	<fieldset class="cbi-section">
+		<legend><%:Backup / Restore%></legend>
+		<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
+			<div class="cbi-section-descr"><%:Click "Generate archive" to download a tar archive of the current configuration files. To reset the firmware to its initial state, click "Perform reset" (only possible with squashfs images).%></div>
+			<div class="cbi-section-node">
+				<div class="cbi-value<% if not reset_avail then %> cbi-value-last<% end %>">
+					<label class="cbi-value-title" for="image"><%:Download backup%>:</label>
+					<div class="cbi-value-field">
+						<input class="cbi-button cbi-button-apply" type="submit" name="backup" value="<%:Generate archive%>" />
+					</div>
+				</div>
+				<% if reset_avail then %>
+				<div class="cbi-value cbi-value-last">
+					<label class="cbi-value-title"><%:Reset to defaults%>:</label>
+					<div class="cbi-value-field">
+						<input onclick="return confirm('<%:Really reset all changes?%>')" class="cbi-button cbi-button-reset" type="submit" name="reset" value="<%:Perform reset%>" />
+					</div>
+				</div>
+				<% end %>
+			</div>
+			<br />
+			<div class="cbi-section-descr"><%:To restore configuration files, you can upload a previously generated backup archive here.%></div>
+			<div class="cbi-section-node">
+				<div class="cbi-value cbi-value-last">
+					<label class="cbi-value-title" for="archive"><%:Restore backup%>:</label>
+					<div class="cbi-value-field">
+						<input type="file" name="archive" id="archive" />
+						<input type="submit" class="cbi-button cbi-input-apply" name="restore" value="<%:Upload archive...%>" />
+					</div>
+				</div>
+			</div>
+		</form>
+	</fieldset>
+
+	<br />
+
+	<fieldset class="cbi-section">
+		<legend><%:Flash new firmware image%></legend>
+		<% if upgrade_avail then %>
+			<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
+				<div class="cbi-section-descr"><%:Upload a sysupgrade-compatible image here to replace the running firmware. Check "Keep settings" to retain the current configuration (requires an libreCMC compatible firmware image).%></div>
+				<div class="cbi-section-node">
+					<div class="cbi-value">
+						<label class="cbi-value-title" for="keep"><%:Keep settings%>:</label>
+						<div class="cbi-value-field">
+							<input type="checkbox" name="keep" id="keep" checked="checked" />
+						</div>
+					</div>
+					<div class="cbi-value cbi-value-last<% if image_invalid then %> cbi-value-error<% end %>">
+						<label class="cbi-value-title" for="image"><%:Image%>:</label>
+						<div class="cbi-value-field">
+							<input type="file" name="image" id="image" />
+							<input type="submit" class="cbi-button cbi-input-apply" value="<%:Flash image...%>" />
+						</div>
+					</div>
+				</div>
+				<% if image_invalid then %>
+					<div class="cbi-section-error"><%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %></div>
+				<% end %>
+			</form>
+		<% else %>
+			<div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the libreCMC wiki for device specific install instructions.%></div>
+		<% end %>
+	</fieldset>
+
+</fieldset>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm
new file mode 100644
index 00000000..7f0956cf
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm
@@ -0,0 +1,19 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<ul class="cbi-tabmenu">
+	<li class="cbi-tab-disabled"><a href="<%=luci.dispatcher.build_url("admin/system/packages")%>"><%:Actions%></a></li>
+	<li class="cbi-tab"><a href="#"><%:Configuration%></a></li>
+</ul>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/packages.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/packages.htm
new file mode 100644
index 00000000..00b4be48
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -0,0 +1,200 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+<%-
+local bit = require "bit"
+local opkg = require "luci.model.ipkg"
+local fs = require "nixio.fs"
+local wa = require "luci.tools.webadmin"
+local rowcnt = 1
+
+function rowstyle()
+	rowcnt = rowcnt + 1
+	return (rowcnt % 2) + 1
+end
+
+local fstat = fs.statvfs(opkg.overlay_root())
+local space_total = fstat and fstat.blocks or 0
+local space_free  = fstat and fstat.bfree  or 0
+local space_used  = space_total - space_free
+
+local used_perc = math.floor(0.5 + ((space_total > 0) and ((100 / space_total) * space_used) or 100))
+local free_byte = space_free * fstat.frsize
+
+local filter = { }
+
+
+local opkg_list = luci.model.ipkg.list_all
+local querypat
+if query and #query > 0 then
+	querypat = '*%s*' % query
+	opkg_list = luci.model.ipkg.find
+end
+
+local letterpat
+if letter == 35 then
+	letterpat = "[^a-z]*"
+else
+	letterpat = string.char(letter, 42) -- 'A' '*'
+end
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Software%></a></h2>
+
+<form method="post" action="<%=REQUEST_URI%>">
+	<div class="cbi-map">
+
+		<ul class="cbi-tabmenu">
+			<li class="cbi-tab"><a href="#"><%:Actions%></a></li>
+			<li class="cbi-tab-disabled"><a href="<%=REQUEST_URI%>/ipkg"><%:Configuration%></a></li>
+		</ul>
+
+		<fieldset class="cbi-section">
+
+
+			<fieldset class="cbi-section-node">
+				<% if (install and next(install)) or (remove and next(remove)) or update or upgrade then %>
+				<div class="cbi-value">
+					<% if #stdout > 0 then %><pre><%=pcdata(stdout)%></pre><% end %>
+					<% if #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %>
+				</div>
+				<% end %>
+
+				<% if querypat then %>
+				<div class="cbi-value">
+					<%:Displaying only packages containing%> <strong>"<%=pcdata(query)%>"</strong>
+					<input type="button" onclick="location.href='?display=<%=pcdata(display)%>'" href="#" class="cbi-button cbi-button-reset" style="margin-left:1em" value="<%:Reset%>" />
+					<br style="clear:both" />
+				</div>
+				<% end %>
+
+				<% if no_lists or old_lists then %>
+				<div class="cbi-value">
+					<% if old_lists then %>
+						<%:Package lists are older than 24 hours%>
+					<% else %>
+						<%:No package lists available%>
+					<% end %>
+					<input type="button" onclick="location.href='?update=1'" href="#" class="cbi-button cbi-button-apply" style="margin-left:3em" value="<%:Update lists%>" />
+				</div>
+				<% end %>
+
+				<div class="cbi-value cbi-value-last">
+					<%:Free space%>: <strong><%=(100-used_perc)%>%</strong> (<strong><%=wa.byte_format(free_byte)%></strong>)
+					<div style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080">
+						<div style="background-color:#F08080; border-right:1px solid #000000; height:100%; width:<%=used_perc%>%">&#160;</div>
+					</div>
+				</div>
+			</fieldset>
+
+			<br />
+
+			<fieldset class="cbi-section-node">
+				<input type="hidden" name="display" value="<%=pcdata(display)%>" />
+
+				<div class="cbi-value">
+					<label class="cbi-value-title"><%:Download and install package%>:</label>
+					<div class="cbi-value-field">
+						<input type="text" name="url" size="30" value="" />
+						<input class="cbi-button cbi-input-save" type="submit" name="submit" value="<%:OK%>" />
+					</div>
+				</div>
+
+				<div class="cbi-value cbi-value-last">
+					<label class="cbi-value-title"><%:Filter%>:</label>
+					<div class="cbi-value-field">
+						<input type="text" name="query" size="20" value="<%=pcdata(query)%>" />
+						<input type="submit" class="cbi-button cbi-input-find" name="search" value="<%:Find package%>" />
+					</div>
+				</div>
+			</fieldset>
+		</fieldset>
+		<br />
+
+		<h3><%:Status%></h3>
+
+
+		<ul class="cbi-tabmenu">
+			<li class="cbi-tab<% if display ~= "installed" then %>-disabled<% end %>"><a href="?display=installed&amp;query=<%=pcdata(query)%>"><%:Installed packages%><% if query then %> (<%=pcdata(query)%>)<% end %></a></li>
+			<li class="cbi-tab<% if display ~= "available" then %>-disabled<% end %>"><a href="?display=available&amp;query=<%=pcdata(query)%>"><%:Available packages%><% if query then %> (<%=pcdata(query)%>)<% end %></a></li>
+		</ul>
+
+		<% if display ~= "available" then %>
+			<fieldset class="cbi-section">
+				<table class="cbi-section-table" style="width:100%">
+					<tr class="cbi-section-table-titles">
+						<th class="cbi-section-table-cell" style="text-align:left">&#160;</th>
+						<th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th>
+						<th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th>
+					</tr>
+					<% local empty = true; luci.model.ipkg.list_installed(querypat, function(n, v, d) empty = false; filter[n] = true %>
+					<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
+						<td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Remove%> &quot;<%=luci.util.pcdata(n)%>&quot; ?')" href="<%=REQUEST_URI%>?submit=1&amp;remove=<%=luci.util.pcdata(n)%>"><%:Remove%></a></td>
+						<td style="text-align:left"><%=luci.util.pcdata(n)%></td>
+						<td style="text-align:left"><%=luci.util.pcdata(v)%></td>
+					</tr>
+					<% end) %>
+					<% if empty then %>
+					<tr class="cbi-section-table-row">
+						<td style="text-align:left">&#160;</td>
+						<td style="text-align:left"><em><%:none%></em></td>
+						<td style="text-align:left"><em><%:none%></em></td>
+					</tr>
+					<% end %>
+				</table>
+			</fieldset>
+		<% else %>
+			<fieldset class="cbi-section">
+			<% if not querypat then %>
+				<ul class="cbi-tabmenu">
+					<% local i; for i = 65, 90 do %>
+					<li class="cbi-tab<% if letter ~= i then %>-disabled<% end %>"><a href="?display=available&amp;letter=<%=string.char(i)%>"><%=string.char(i)%></a></li>
+					<% end %>
+					<li class="cbi-tab<% if letter ~= 35 then %>-disabled<% end %>"><a href="?display=available&amp;letter=%23">#</a></li>
+				</ul>
+				<div class="cbi-section-node">
+			<% end %>
+				<table class="cbi-section-table" style="width:100%">
+					<tr class="cbi-section-table-titles">
+						<th class="cbi-section-table-cell" style="text-align:left">&#160;</th>
+						<th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th>
+						<th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th>
+						<th class="cbi-section-table-cell" style="text-align:left"><%:Description%></th>
+					</tr>
+					<% local empty = true; opkg_list(querypat or letterpat, function(n, v, d) if filter[n] then return end; empty = false %>
+					<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
+						<td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Install%> &quot;<%=luci.util.pcdata(n)%>&quot; ?')" href="<%=REQUEST_URI%>?submit=1&amp;install=<%=luci.util.pcdata(n)%>"><%:Install%></a></td>
+						<td style="text-align:left"><%=luci.util.pcdata(n)%></td>
+						<td style="text-align:left"><%=luci.util.pcdata(v)%></td>
+						<td style="text-align:left"><%=luci.util.pcdata(d)%></td>
+					</tr>
+					<% end) %>
+					<% if empty then %>
+					<tr class="cbi-section-table-row">
+						<td style="text-align:left">&#160;</td>
+						<td style="text-align:left"><em><%:none%></em></td>
+						<td style="text-align:left"><em><%:none%></em></td>
+						<td style="text-align:left"><em><%:none%></em></td>
+					</tr>
+					<% end %>
+				</table>
+			<% if not querypat then %>
+				</div>
+			<% end %>
+			</fieldset>
+		<% end %>
+	</div>
+</form>
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm
new file mode 100644
index 00000000..5f2912d9
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm
@@ -0,0 +1,33 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Reboot%></h3>
+<p><%:Reboots the operating system of your device%></p>
+<%-
+local c = require("luci.model.uci").cursor():changes()
+if c and next(c) then
+-%>
+	<p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p> 
+<%-
+end
+if not reboot then 
+-%>
+<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:Perform reboot%></a></p>
+<%- else -%>
+<p><%:Please wait: Device rebooting...%></p>
+<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
+<%- end -%>
+<%+footer%>
\ No newline at end of file
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm
new file mode 100644
index 00000000..ce285332
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -0,0 +1,67 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Flash Firmware%> - <%:Verify%></a></h2>
+<p>
+	<%_ The flash image was uploaded.
+		Below is the checksum and file size listed,
+		compare them with the original file to ensure data integrity.<br />
+		Click "Proceed" below to start the flash procedure. %>
+
+	<% if storage > 0 and size > storage then %>
+		<br /><br />
+		<div class="error"><%:It appears that you are trying to
+			flash an image that does not fit into the flash memory, please verify
+			the image file! %></div>
+	<% end %>
+
+</p>
+
+<fieldset class="cbi-section">
+	<ul>
+		<li><%:Checksum%>: <code><%=checksum%></code></li>
+		<li><%:Size%>: <%
+			local w = require "luci.tools.webadmin"
+			write(w.byte_format(size))
+
+			if storage > 0 then
+				write(luci.i18n.translatef(
+					" (%s available)",
+					w.byte_format(storage)
+				))
+			end
+		%></li>
+		<li><% if keep then %>
+			<%:Configuration files will be kept.%>
+		<% else %>
+			<%:Note: Configuration files will be erased.%>
+		<% end %></li>
+	</ul>
+</fieldset>
+
+<div class="cbi-page-actions right">
+	<form style="display:inline" action="<%=REQUEST_URI%>" method="post">
+		<input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
+	</form>
+	<form style="display:inline" action="<%=REQUEST_URI%>" method="post">
+		<input type="hidden" name="step" value="2" />
+		<input type="hidden" name="keep" value="<%=keep and "1" or ""%>" />
+		<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />
+	</form>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm
new file mode 100644
index 00000000..f6a68126
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm
@@ -0,0 +1,32 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Configuration%> / <%:Apply%></a></h2>
+
+<% if changes then %>
+	<%+cbi/apply_xhr%>
+	<%+admin_uci/changelog%>
+
+	<%- cbi_apply_xhr('uci-apply', configs) -%>
+
+	<p><strong><%:The following changes have been committed%>:</strong></p>
+	<%- uci_changelog(changes) -%>
+<% else %>
+	<p><strong><%:There are no pending changes to apply!%></strong></p>
+<% end %>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changelog.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changelog.htm
new file mode 100644
index 00000000..e195befb
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changelog.htm
@@ -0,0 +1,88 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<% export("uci_changelog", function(changes) -%>
+<fieldset class="cbi-section">
+	<strong><%:Legend:%></strong>
+	<div class="uci-change-legend">
+		<div class="uci-change-legend-label"><ins>&#160;</ins> <%:Section added%></div>
+		<div class="uci-change-legend-label"><del>&#160;</del> <%:Section removed%></div>
+		<div class="uci-change-legend-label"><var><ins>&#160;</ins></var> <%:Option changed%></div>
+		<div class="uci-change-legend-label"><var><del>&#160;</del></var> <%:Option removed%></div>
+		<br style="clear:both" />
+	</div>
+	<br />
+
+	<div class="uci-change-list"><%
+		local util = luci.util
+		local ret  = { }
+
+		for r, tbl in pairs(changes) do
+			for s, os in pairs(tbl) do
+				-- section add
+				if os['.type'] and os['.type'] ~= "" then
+					ret[#ret+1] = "<ins>%s.%s=<strong>%s</strong>" %{ r, s, os['.type'] }
+					for o, v in util.kspairs(os) do
+						if o:sub(1,1) ~= "." then
+							if type(v) == "table" then
+								local i
+								for i = 1, #v do
+									ret[#ret+1] = "<br />%s.%s.%s+=<strong>%s</strong>"
+										%{ r, s, o, util.pcdata(v[i]) }
+								end
+							else
+								ret[#ret+1] = "<br />%s.%s.%s=<strong>%s</strong>"
+									%{ r, s, o, util.pcdata(v) }
+							end
+						end
+					end
+					ret[#ret+1] = "</ins><br />"
+
+				-- section delete
+				elseif os['.type'] and os['.type'] == "" then
+					ret[#ret+1] = "<del>%s.<strong>%s</strong></del><br />" %{ r, s }
+
+				-- modifications
+				else
+					ret[#ret+1] = "<var>%s.%s<br />" %{ r, s }
+					for o, v in util.kspairs(os) do
+						if o:sub(1,1) ~= "." then
+							if v and #v > 0 then
+								ret[#ret+1] = "<ins>"
+								if type(v) == "table" then
+									local i
+									for i = 1, #v do
+										ret[#ret+1] = "%s.%s.%s+=<strong>%s</strong><br />"
+											%{ r, s, o, util.pcdata(v[i]) }
+									end
+									
+								else
+									ret[#ret+1] = "%s.%s.%s=<strong>%s</strong><br />"
+										%{ r, s, o, util.pcdata(v) }
+								end
+								ret[#ret+1] = "</ins>"
+							else
+								ret[#ret+1] = "<del>%s.%s.<strong>%s</strong><br /></del>" %{ r, s, o }
+							end
+						end
+					end
+					ret[#ret+1] = "</var><br />"
+				end
+			end
+		end
+
+		write(table.concat(ret))
+	%></div>
+</fieldset>
+<%- end) %>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm
new file mode 100644
index 00000000..2415de31
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm
@@ -0,0 +1,52 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Configuration%> / <%:Changes%></a></h2>
+
+<% if changes then %>
+	<%+admin_uci/changelog%>
+	<%- uci_changelog(changes) -%>
+<% else %>
+	<p><strong><%:There are no pending changes!%></strong></p>
+<% end %>
+
+<div class="cbi-page-actions">
+	<% local r = luci.http.formvalue("redir"); if r and #r > 0 then %>
+	<div style="float:left">
+		<form class="inline" method="get" action="<%=luci.util.pcdata(r)%>">
+			<input class="cbi-button cbi-button-link" style="float:left; margin:0" type="submit" value="<%:Back%>" />
+		</form>
+	</div>
+	<% end %>
+
+	<div style="text-align:right">
+		<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
+			<input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
+			<input class="cbi-button cbi-button-apply" type="submit" value="<%:Apply%>" />
+		</form>
+		<form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply">
+			<input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
+			<input class="cbi-button cbi-button-save" type="submit" value="<%:Save & Apply%>" />
+		</form>
+		<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
+			<input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
+			<input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" />
+		</form>
+	</div>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm
new file mode 100644
index 00000000..739b7520
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm
@@ -0,0 +1,36 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Configuration%> / <%:Revert%></a></h2>
+
+<% if changes then %>
+	<%+cbi/apply_xhr%>
+	<%+admin_uci/changelog%>
+
+	<p><strong><%:The following changes have been reverted%>:</strong></p>
+	<%- uci_changelog(changes) -%>
+<% else %>
+	<p><strong><%:There are no pending changes to revert!%></strong></p>
+<% end %>
+
+<div class="cbi-page-actions">
+	<form class="inline" method="get" action="<%=luci.util.pcdata(luci.http.formvalue("redir"))%>">
+		<input class="cbi-button cbi-button-link" style="margin:0" type="submit" value="<%:Back%>" />
+	</form>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-full/luasrc/view/cbi/wireless_modefreq.htm b/trunk/package/luci/modules/admin-full/luasrc/view/cbi/wireless_modefreq.htm
new file mode 100644
index 00000000..ac14593e
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/luasrc/view/cbi/wireless_modefreq.htm
@@ -0,0 +1,167 @@
+<%+cbi/valueheader%>
+
+<script type="text/javascript">//<![CDATA[
+	var freqlist = <%= luci.http.write_json(self.freqlist) %>;
+	var hwmodes  = <%= luci.http.write_json(self.hwmodes) %>;
+
+	var channels = {
+		'11g': [
+			'auto', 'auto', true
+		],
+		'11a': [
+			'auto', 'auto', true
+		]
+	};
+
+	for (var i = 0; i < freqlist.length; i++)
+		channels[(freqlist[i].mhz > 2484) ? '11a' : '11g'].push(
+			freqlist[i].channel,
+			'%d (%d MHz)'.format(freqlist[i].channel, freqlist[i].mhz),
+			!freqlist[i].restricted
+		);
+
+	var modes = [
+		'', 'Legacy', true,
+		'n', 'N', hwmodes.n,
+		'ac', 'AC', hwmodes.ac
+	];
+
+	var htmodes = {
+		'':   [
+			'', '-', true
+		],
+		'n':  [
+			'HT20', '20 MHz', true,
+			'HT40', '40 MHz', true
+		],
+		'ac': [
+			'VHT20', '20 MHz', true,
+			'VHT40', '40 MHz', true,
+			'VHT80', '80 MHz', true,
+			'VHT160', '160 MHz', true
+		]
+	};
+
+	var bands = {
+		'':   [
+			'11g', '2.4 GHz', (channels['11g'].length > 3),
+			'11a', '5 GHz', (channels['11a'].length > 3)
+		],
+		'n':  [
+			'11g', '2.4 GHz', (channels['11g'].length > 3),
+			'11a', '5 GHz', (channels['11a'].length > 3)
+		],
+		'ac': [
+			'11a', '5 GHz', true
+		]
+	};
+
+	function cbi_set_values(sel, vals)
+	{
+		if (sel.vals)
+			sel.vals.selected = sel.selectedIndex;
+
+		while (sel.options[0])
+			sel.remove(0);
+
+		for (var i = 0; vals && i < vals.length; i += 3)
+		{
+			if (!vals[i+2])
+				continue;
+
+			var opt = document.createElement('option');
+			    opt.value = vals[i+0];
+			    opt.text  = vals[i+1];
+
+			sel.add(opt);
+		}
+
+		if (!isNaN(vals.selected))
+			sel.selectedIndex = vals.selected;
+
+		sel.parentNode.style.display = (sel.options.length <= 1) ? 'none' : '';
+		sel.vals = vals;
+	}
+
+	function cbi_toggle_wifi_mode(id)
+	{
+		cbi_toggle_wifi_htmode(id);
+		cbi_toggle_wifi_band(id);
+	}
+
+	function cbi_toggle_wifi_htmode(id)
+	{
+		var mode = document.getElementById(id + '.mode');
+		var bwdt = document.getElementById(id + '.htmode');
+
+		cbi_set_values(bwdt, htmodes[mode.value]);
+	}
+
+	function cbi_toggle_wifi_band(id)
+	{
+		var mode = document.getElementById(id + '.mode');
+		var band = document.getElementById(id + '.band');
+
+		cbi_set_values(band, bands[mode.value]);
+		cbi_toggle_wifi_channel(id);
+	}
+
+	function cbi_toggle_wifi_channel(id)
+	{
+		var band = document.getElementById(id + '.band');
+		var chan = document.getElementById(id + '.channel');
+
+		cbi_set_values(chan, channels[band.value]);
+	}
+
+	function cbi_init_wifi(id)
+	{
+		var mode = document.getElementById(id + '.mode');
+		var band = document.getElementById(id + '.band');
+		var chan = document.getElementById(id + '.channel');
+		var bwdt = document.getElementById(id + '.htmode');
+
+		cbi_set_values(mode, modes);
+
+		if (/VHT20|VHT40|VHT80|VHT160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
+			mode.value = 'ac';
+		else if (/HT20|HT40/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
+			mode.value = 'n';
+		else
+			mode.value = '';
+
+		cbi_toggle_wifi_mode(id);
+
+		if (/a/.test(<%= luci.http.write_json(self.map:get(section, "hwmode")) %>))
+			band.value = '11a';
+		else
+			band.value = '11g';
+
+		cbi_toggle_wifi_band(id);
+
+		bwdt.value = <%= luci.http.write_json(self.map:get(section, "htmode")) %>;
+		chan.value = <%= luci.http.write_json(self.map:get(section, "channel")) %>;
+	}
+//]]></script>
+
+<label style="float:left; margin-right:3px">
+	<%:Mode%><br />
+	<select style="width:auto" id="<%= cbid %>.mode" name="<%= cbid %>.mode" onchange="cbi_toggle_wifi_mode('<%= cbid %>')"></select>
+</label>
+<label style="float:left; margin-right:3px">
+	<%:Band%><br />
+	<select style="width:auto" id="<%= cbid %>.band" name="<%= cbid %>.band" onchange="cbi_toggle_wifi_band('<%= cbid %>')"></select>
+</label>
+<label style="float:left; margin-right:3px">
+	<%:Channel%><br />
+	<select style="width:auto" id="<%= cbid %>.channel" name="<%= cbid %>.channel"></select>
+</label>
+<label style="float:left; margin-right:3px">
+	<%:Width%><br />
+	<select style="width:auto" id="<%= cbid %>.htmode" name="<%= cbid %>.htmode"></select>
+</label>
+<br style="clear:left" />
+
+<script type="text/javascript">cbi_init_wifi('<%= cbid %>');</script>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/admin-full/src/luci-bwc.c b/trunk/package/luci/modules/admin-full/src/luci-bwc.c
new file mode 100644
index 00000000..05e46671
--- /dev/null
+++ b/trunk/package/luci/modules/admin-full/src/luci-bwc.c
@@ -0,0 +1,778 @@
+/*
+ * luci-bwc - Very simple bandwidth collector cache for LuCI realtime graphs
+ *
+ *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <time.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <arpa/inet.h>
+
+#include <dlfcn.h>
+#include <iwinfo.h>
+
+#define STEP_COUNT	60
+#define STEP_TIME	1
+#define TIMEOUT		10
+
+#define PID_PATH	"/var/run/luci-bwc.pid"
+
+#define DB_PATH		"/var/lib/luci-bwc"
+#define DB_IF_FILE	DB_PATH "/if/%s"
+#define DB_RD_FILE	DB_PATH "/radio/%s"
+#define DB_CN_FILE	DB_PATH "/connections"
+#define DB_LD_FILE	DB_PATH "/load"
+
+#define IF_SCAN_PATTERN \
+	" %[^ :]:%u %u" \
+	" %*d %*d %*d %*d %*d %*d" \
+	" %u %u"
+
+#define LD_SCAN_PATTERN \
+	"%f %f %f"
+
+
+struct file_map {
+	int fd;
+	int size;
+	char *mmap;
+};
+
+struct traffic_entry {
+	uint32_t time;
+	uint32_t rxb;
+	uint32_t rxp;
+	uint32_t txb;
+	uint32_t txp;
+};
+
+struct conn_entry {
+	uint32_t time;
+	uint32_t udp;
+	uint32_t tcp;
+	uint32_t other;
+};
+
+struct load_entry {
+	uint32_t time;
+	uint16_t load1;
+	uint16_t load5;
+	uint16_t load15;
+};
+
+struct radio_entry {
+	uint32_t time;
+	uint16_t rate;
+	uint8_t  rssi;
+	uint8_t  noise;
+};
+
+static int readpid(void)
+{
+	int fd;
+	int pid = -1;
+	char buf[9] = { 0 };
+
+	if ((fd = open(PID_PATH, O_RDONLY)) > -1)
+	{
+		if (read(fd, buf, sizeof(buf)))
+		{
+			buf[8] = 0;
+			pid = atoi(buf);
+		}
+
+		close(fd);
+	}
+
+	return pid;
+}
+
+static int writepid(void)
+{
+	int fd;
+	int wlen;
+	char buf[9] = { 0 };
+
+	if ((fd = open(PID_PATH, O_WRONLY | O_CREAT | O_TRUNC, 0600)) > -1)
+	{
+		wlen = snprintf(buf, sizeof(buf), "%i", getpid());
+		write(fd, buf, wlen);
+		close(fd);
+
+		return 0;
+	}
+
+	return -1;
+}
+
+static int timeout = TIMEOUT;
+static int countdown = -1;
+
+static void reset_countdown(int sig)
+{
+	countdown = timeout;
+
+}
+
+
+static char *progname;
+static int prognamelen;
+
+static struct iwinfo_ops *backend = NULL;
+
+
+static int init_directory(char *path)
+{
+	char *p = path;
+
+	for (p = &path[1]; *p; p++)
+	{
+		if (*p == '/')
+		{
+			*p = 0;
+
+			if (mkdir(path, 0700) && (errno != EEXIST))
+				return -1;
+
+			*p = '/';
+		}
+	}
+
+	return 0;
+}
+
+static int init_file(char *path, int esize)
+{
+	int i, file;
+	char buf[sizeof(struct traffic_entry)] = { 0 };
+
+	if (init_directory(path))
+		return -1;
+
+	if ((file = open(path, O_WRONLY | O_CREAT, 0600)) >= 0)
+	{
+		for (i = 0; i < STEP_COUNT; i++)
+		{
+			if (write(file, buf, esize) < 0)
+				break;
+		}
+
+		close(file);
+
+		return 0;
+	}
+
+	return -1;
+}
+
+static inline uint32_t timeof(void *entry)
+{
+	return ntohl(((struct traffic_entry *)entry)->time);
+}
+
+static int update_file(const char *path, void *entry, int esize)
+{
+	int rv = -1;
+	int file;
+	char *map;
+
+	if ((file = open(path, O_RDWR)) >= 0)
+	{
+		map = mmap(NULL, esize * STEP_COUNT, PROT_READ | PROT_WRITE,
+				   MAP_SHARED | MAP_LOCKED, file, 0);
+
+		if ((map != NULL) && (map != MAP_FAILED))
+		{
+			if (timeof(entry) > timeof(map + esize * (STEP_COUNT-1)))
+			{
+				memmove(map, map + esize, esize * (STEP_COUNT-1));
+				memcpy(map + esize * (STEP_COUNT-1), entry, esize);
+			}
+
+			munmap(map, esize * STEP_COUNT);
+
+			rv = 0;
+		}
+
+		close(file);
+	}
+
+	return rv;
+}
+
+static int mmap_file(const char *path, int esize, struct file_map *m)
+{
+	m->fd   = -1;
+	m->size = -1;
+	m->mmap = NULL;
+
+	if ((m->fd = open(path, O_RDONLY)) >= 0)
+	{
+		m->size = STEP_COUNT * esize;
+		m->mmap = mmap(NULL, m->size, PROT_READ,
+					   MAP_SHARED | MAP_LOCKED, m->fd, 0);
+
+		if ((m->mmap != NULL) && (m->mmap != MAP_FAILED))
+			return 0;
+	}
+
+	return -1;
+}
+
+static void umap_file(struct file_map *m)
+{
+	if ((m->mmap != NULL) && (m->mmap != MAP_FAILED))
+		munmap(m->mmap, m->size);
+
+	if (m->fd > -1)
+		close(m->fd);
+}
+
+static void * iw_open(void)
+{
+	return dlopen("/usr/lib/libiwinfo.so", RTLD_LAZY);
+}
+
+static int iw_update(
+	void *iw, const char *ifname, uint16_t *rate, uint8_t *rssi, uint8_t *noise
+) {
+	struct iwinfo_ops *(*probe)(const char *);
+	int val;
+
+	if (!backend)
+	{
+		probe = dlsym(iw, "iwinfo_backend");
+
+		if (!probe)
+			return 0;
+
+		backend = probe(ifname);
+
+		if (!backend)
+			return 0;
+	}
+
+	*rate = (backend->bitrate && !backend->bitrate(ifname, &val)) ? val : 0;
+	*rssi = (backend->signal && !backend->signal(ifname, &val)) ? val : 0;
+	*noise = (backend->noise && !backend->noise(ifname, &val)) ? val : 0;
+
+	return 1;
+}
+
+static void iw_close(void *iw)
+{
+	void (*finish)(void);
+
+	finish = dlsym(iw, "iwinfo_finish");
+
+	if (finish)
+		finish();
+
+	dlclose(iw);
+}
+
+
+static int update_ifstat(
+	const char *ifname, uint32_t rxb, uint32_t rxp, uint32_t txb, uint32_t txp
+) {
+	char path[1024];
+
+	struct stat s;
+	struct traffic_entry e;
+
+	snprintf(path, sizeof(path), DB_IF_FILE, ifname);
+
+	if (stat(path, &s))
+	{
+		if (init_file(path, sizeof(struct traffic_entry)))
+		{
+			fprintf(stderr, "Failed to init %s: %s\n",
+					path, strerror(errno));
+
+			return -1;
+		}
+	}
+
+	e.time = htonl(time(NULL));
+	e.rxb  = htonl(rxb);
+	e.rxp  = htonl(rxp);
+	e.txb  = htonl(txb);
+	e.txp  = htonl(txp);
+
+	return update_file(path, &e, sizeof(struct traffic_entry));
+}
+
+static int update_radiostat(
+	const char *ifname, uint16_t rate, uint8_t rssi, uint8_t noise
+) {
+	char path[1024];
+
+	struct stat s;
+	struct radio_entry e;
+
+	snprintf(path, sizeof(path), DB_RD_FILE, ifname);
+
+	if (stat(path, &s))
+	{
+		if (init_file(path, sizeof(struct radio_entry)))
+		{
+			fprintf(stderr, "Failed to init %s: %s\n",
+					path, strerror(errno));
+
+			return -1;
+		}
+	}
+
+	e.time  = htonl(time(NULL));
+	e.rate  = htons(rate);
+	e.rssi  = rssi;
+	e.noise = noise;
+
+	return update_file(path, &e, sizeof(struct radio_entry));
+}
+
+static int update_cnstat(uint32_t udp, uint32_t tcp, uint32_t other)
+{
+	char path[1024];
+
+	struct stat s;
+	struct conn_entry e;
+
+	snprintf(path, sizeof(path), DB_CN_FILE);
+
+	if (stat(path, &s))
+	{
+		if (init_file(path, sizeof(struct conn_entry)))
+		{
+			fprintf(stderr, "Failed to init %s: %s\n",
+					path, strerror(errno));
+
+			return -1;
+		}
+	}
+
+	e.time  = htonl(time(NULL));
+	e.udp   = htonl(udp);
+	e.tcp   = htonl(tcp);
+	e.other = htonl(other);
+
+	return update_file(path, &e, sizeof(struct conn_entry));
+}
+
+static int update_ldstat(uint16_t load1, uint16_t load5, uint16_t load15)
+{
+	char path[1024];
+
+	struct stat s;
+	struct load_entry e;
+
+	snprintf(path, sizeof(path), DB_LD_FILE);
+
+	if (stat(path, &s))
+	{
+		if (init_file(path, sizeof(struct load_entry)))
+		{
+			fprintf(stderr, "Failed to init %s: %s\n",
+					path, strerror(errno));
+
+			return -1;
+		}
+	}
+
+	e.time   = htonl(time(NULL));
+	e.load1  = htons(load1);
+	e.load5  = htons(load5);
+	e.load15 = htons(load15);
+
+	return update_file(path, &e, sizeof(struct load_entry));
+}
+
+static int run_daemon(void)
+{
+	FILE *info;
+	uint32_t rxb, txb, rxp, txp;
+	uint32_t udp, tcp, other;
+	uint16_t rate;
+	uint8_t rssi, noise;
+	float lf1, lf5, lf15;
+	char line[1024];
+	char ifname[16];
+	int i;
+	void *iw;
+	struct sigaction sa;
+
+	struct stat s;
+	const char *ipc = stat("/proc/net/nf_conntrack", &s)
+		? "/proc/net/ip_conntrack" : "/proc/net/nf_conntrack";
+
+	switch (fork())
+	{
+		case -1:
+			perror("fork()");
+			return -1;
+
+		case 0:
+			if (chdir("/") < 0)
+			{
+				perror("chdir()");
+				exit(1);
+			}
+
+			close(0);
+			close(1);
+			close(2);
+			break;
+
+		default:
+			return 0;
+	}
+
+	/* setup USR1 signal handler to reset timer */
+	sa.sa_handler = reset_countdown;
+	sa.sa_flags   = SA_RESTART;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGUSR1, &sa, NULL);
+
+	/* write pid */
+	if (writepid())
+	{
+		fprintf(stderr, "Failed to write pid file: %s\n", strerror(errno));
+		return 1;
+	}
+
+	/* initialize iwinfo */
+	iw = iw_open();
+
+	/* go */
+	for (reset_countdown(0); countdown >= 0; countdown--)
+	{
+		/* alter progname for ps, top */
+		memset(progname, 0, prognamelen);
+		snprintf(progname, prognamelen, "luci-bwc %d", countdown);
+
+		if ((info = fopen("/proc/net/dev", "r")) != NULL)
+		{
+			while (fgets(line, sizeof(line), info))
+			{
+				if (strchr(line, '|'))
+					continue;
+
+				if (sscanf(line, IF_SCAN_PATTERN, ifname, &rxb, &rxp, &txb, &txp))
+				{
+					if (strncmp(ifname, "lo", sizeof(ifname)))
+						update_ifstat(ifname, rxb, rxp, txb, txp);
+				}
+			}
+
+			fclose(info);
+		}
+
+		if (iw)
+		{
+			for (i = 0; i < 5; i++)
+			{
+#define iw_checkif(pattern) \
+				do {                                                      \
+					snprintf(ifname, sizeof(ifname), pattern, i);         \
+					if (iw_update(iw, ifname, &rate, &rssi, &noise))  \
+					{                                                     \
+						update_radiostat(ifname, rate, rssi, noise);      \
+						continue;                                         \
+					}                                                     \
+				} while(0)
+
+				iw_checkif("wlan%d");
+				iw_checkif("ath%d");
+				iw_checkif("wl%d");
+			}
+		}
+
+		if ((info = fopen(ipc, "r")) != NULL)
+		{
+			udp   = 0;
+			tcp   = 0;
+			other = 0;
+
+			while (fgets(line, sizeof(line), info))
+			{
+				if (strstr(line, "TIME_WAIT"))
+					continue;
+
+				if (strstr(line, "src=127.0.0.1 ") &&
+				    strstr(line, "dst=127.0.0.1 "))
+					continue;
+
+				if (sscanf(line, "%*s %*d %s", ifname) || sscanf(line, "%s %*d", ifname))
+				{
+					if (!strcmp(ifname, "tcp"))
+						tcp++;
+					else if (!strcmp(ifname, "udp"))
+						udp++;
+					else
+						other++;
+				}
+			}
+
+			update_cnstat(udp, tcp, other);
+
+			fclose(info);
+		}
+
+		if ((info = fopen("/proc/loadavg", "r")) != NULL)
+		{
+			if (fscanf(info, LD_SCAN_PATTERN, &lf1, &lf5, &lf15))
+			{
+				update_ldstat((uint16_t)(lf1  * 100),
+							  (uint16_t)(lf5  * 100),
+							  (uint16_t)(lf15 * 100));
+			}
+
+			fclose(info);
+		}
+
+		sleep(STEP_TIME);
+	}
+
+	unlink(PID_PATH);
+
+	if (iw)
+		iw_close(iw);
+
+	return 0;
+}
+
+static void check_daemon(void)
+{
+	int pid;
+
+	if ((pid = readpid()) < 0 || kill(pid, 0) < 0)
+	{
+		/* daemon ping failed, try to start it up */
+		if (run_daemon())
+		{
+			fprintf(stderr,
+				"Failed to ping daemon and unable to start it up: %s\n",
+				strerror(errno));
+
+			exit(1);
+		}
+	}
+	else if (kill(pid, SIGUSR1))
+	{
+		fprintf(stderr, "Failed to send signal: %s\n", strerror(errno));
+		exit(2);
+	}
+}
+
+static int run_dump_ifname(const char *ifname)
+{
+	int i;
+	char path[1024];
+	struct file_map m;
+	struct traffic_entry *e;
+
+	check_daemon();
+	snprintf(path, sizeof(path), DB_IF_FILE, ifname);
+
+	if (mmap_file(path, sizeof(struct traffic_entry), &m))
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", path, strerror(errno));
+		return 1;
+	}
+
+	for (i = 0; i < m.size; i += sizeof(struct traffic_entry))
+	{
+		e = (struct traffic_entry *) &m.mmap[i];
+
+		if (!e->time)
+			continue;
+
+		printf("[ %u, %u, %" PRIu32
+			   ", %u, %u ]%s\n",
+			ntohl(e->time),
+			ntohl(e->rxb), ntohl(e->rxp),
+			ntohl(e->txb), ntohl(e->txp),
+			((i + sizeof(struct traffic_entry)) < m.size) ? "," : "");
+	}
+
+	umap_file(&m);
+
+	return 0;
+}
+
+static int run_dump_radio(const char *ifname)
+{
+	int i;
+	char path[1024];
+	struct file_map m;
+	struct radio_entry *e;
+
+	check_daemon();
+	snprintf(path, sizeof(path), DB_RD_FILE, ifname);
+
+	if (mmap_file(path, sizeof(struct radio_entry), &m))
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", path, strerror(errno));
+		return 1;
+	}
+
+	for (i = 0; i < m.size; i += sizeof(struct radio_entry))
+	{
+		e = (struct radio_entry *) &m.mmap[i];
+
+		if (!e->time)
+			continue;
+
+		printf("[ %u, %d, %d, %d ]%s\n",
+			ntohl(e->time),
+			e->rate, e->rssi, e->noise,
+			((i + sizeof(struct radio_entry)) < m.size) ? "," : "");
+	}
+
+	umap_file(&m);
+
+	return 0;
+}
+
+static int run_dump_conns(void)
+{
+	int i;
+	char path[1024];
+	struct file_map m;
+	struct conn_entry *e;
+
+	check_daemon();
+	snprintf(path, sizeof(path), DB_CN_FILE);
+
+	if (mmap_file(path, sizeof(struct conn_entry), &m))
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", path, strerror(errno));
+		return 1;
+	}
+
+	for (i = 0; i < m.size; i += sizeof(struct conn_entry))
+	{
+		e = (struct conn_entry *) &m.mmap[i];
+
+		if (!e->time)
+			continue;
+
+		printf("[ %u, %u, %u, %u ]%s\n",
+			ntohl(e->time), ntohl(e->udp),
+			ntohl(e->tcp), ntohl(e->other),
+			((i + sizeof(struct conn_entry)) < m.size) ? "," : "");
+	}
+
+	umap_file(&m);
+
+	return 0;
+}
+
+static int run_dump_load(void)
+{
+	int i;
+	char path[1024];
+	struct file_map m;
+	struct load_entry *e;
+
+	check_daemon();
+	snprintf(path, sizeof(path), DB_LD_FILE);
+
+	if (mmap_file(path, sizeof(struct load_entry), &m))
+	{
+		fprintf(stderr, "Failed to open %s: %s\n", path, strerror(errno));
+		return 1;
+	}
+
+	for (i = 0; i < m.size; i += sizeof(struct load_entry))
+	{
+		e = (struct load_entry *) &m.mmap[i];
+
+		if (!e->time)
+			continue;
+
+		printf("[ %u, %u, %u, %u ]%s\n",
+			ntohl(e->time),
+			ntohs(e->load1), ntohs(e->load5), ntohs(e->load15),
+			((i + sizeof(struct load_entry)) < m.size) ? "," : "");
+	}
+
+	umap_file(&m);
+
+	return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+	int opt;
+
+	progname = argv[0];
+	prognamelen = -1;
+
+	for (opt = 0; opt < argc; opt++)
+		prognamelen += 1 + strlen(argv[opt]);
+
+	while ((opt = getopt(argc, argv, "t:i:r:cl")) > -1)
+	{
+		switch (opt)
+		{
+			case 't':
+				timeout = atoi(optarg);
+				break;
+
+			case 'i':
+				if (optarg)
+					return run_dump_ifname(optarg);
+				break;
+
+			case 'r':
+				if (optarg)
+					return run_dump_radio(optarg);
+				break;
+
+			case 'c':
+				return run_dump_conns();
+
+			case 'l':
+				return run_dump_load();
+
+			default:
+				break;
+		}
+	}
+
+	fprintf(stderr,
+		"Usage:\n"
+		"	%s [-t timeout] -i ifname\n"
+		"	%s [-t timeout] -r radiodev\n"
+		"	%s [-t timeout] -c\n"
+		"	%s [-t timeout] -l\n",
+			argv[0], argv[0], argv[0], argv[0]
+	);
+
+	return 1;
+}
diff --git a/trunk/package/luci/modules/admin-mini/Makefile b/trunk/package/luci/modules/admin-mini/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/index.lua b/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/index.lua
new file mode 100644
index 00000000..9d6a38ed
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -0,0 +1,48 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.mini.index", package.seeall)
+
+function index()
+	local root = node()
+	if not root.lock then
+		root.target = alias("mini")
+		root.index = true
+	end
+	
+	entry({"about"}, template("about"))
+	
+	local page   = entry({"mini"}, alias("mini", "index"), _("Essentials"), 10)
+	page.sysauth = "root"
+	page.sysauth_authenticator = "htmlauth"
+	page.index = true
+	
+	entry({"mini", "index"}, alias("mini", "index", "index"), _("Overview"), 10).index = true
+	entry({"mini", "index", "index"}, form("mini/index"), _("General"), 1).ignoreindex = true
+	entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), _("Settings"), 10)
+	entry({"mini", "index", "logout"}, call("action_logout"), _("Logout"))
+end
+
+function action_logout()
+	local dsp = require "luci.dispatcher"
+	local sauth = require "luci.sauth"
+	if dsp.context.authsession then
+		sauth.kill(dsp.context.authsession)
+		dsp.context.urltoken.stok = nil
+	end
+
+	luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url())
+	luci.http.redirect(luci.dispatcher.build_url())
+end
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/network.lua b/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/network.lua
new file mode 100644
index 00000000..8b9356dd
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/network.lua
@@ -0,0 +1,23 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.mini.network", package.seeall)
+
+function index()
+	entry({"mini", "network"}, alias("mini", "network", "index"), _("Network"), 20).index = true
+	entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), _("General"), 1)
+	entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), _("Wifi"), 10)
+	entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), _("DHCP"), 20)
+end
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/system.lua b/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/system.lua
new file mode 100644
index 00000000..71b5b635
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -0,0 +1,246 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.mini.system", package.seeall)
+
+function index()
+	entry({"mini", "system"}, alias("mini", "system", "index"), _("System"), 40).index = true
+	entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), _("General"), 1)
+	entry({"mini", "system", "passwd"}, form("mini/passwd"), _("Admin Password"), 10)
+	entry({"mini", "system", "backup"}, call("action_backup"), _("Backup / Restore"), 80)
+	entry({"mini", "system", "upgrade"}, call("action_upgrade"), _("Flash Firmware"), 90)
+	entry({"mini", "system", "reboot"}, call("action_reboot"), _("Reboot"), 100)
+end
+
+function action_backup()
+	local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
+	local restore_cmd = "gunzip | tar -xC/ >/dev/null 2>&1"
+	local backup_cmd  = "tar -c %s | gzip 2>/dev/null"
+	
+	local restore_fpi 
+	luci.http.setfilehandler(
+		function(meta, chunk, eof)
+			if not restore_fpi then
+				restore_fpi = io.popen(restore_cmd, "w")
+			end
+			if chunk then
+				restore_fpi:write(chunk)
+			end
+			if eof then
+				restore_fpi:close()
+			end
+		end
+	)
+		  
+	local upload = luci.http.formvalue("archive")
+	local backup = luci.http.formvalue("backup")
+	local reset  = reset_avail and luci.http.formvalue("reset")
+	
+	if upload and #upload > 0 then
+		luci.template.render("mini/applyreboot")
+		luci.sys.reboot()
+	elseif backup then
+		local reader = ltn12_popen(backup_cmd:format(_keep_pattern()))
+		luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
+			luci.sys.hostname(), os.date("%Y-%m-%d")})
+		luci.http.prepare_content("application/x-targz")
+		luci.ltn12.pump.all(reader, luci.http.write)
+	elseif reset then
+		luci.template.render("mini/applyreboot")
+		luci.util.exec("mtd -r erase rootfs_data")
+	else
+		luci.template.render("mini/backup", {reset_avail = reset_avail})
+	end
+end
+
+function action_reboot()
+	local reboot = luci.http.formvalue("reboot")
+	luci.template.render("mini/reboot", {reboot=reboot})
+	if reboot then
+		luci.sys.reboot()
+	end
+end
+
+function action_upgrade()
+	require("luci.model.uci")
+
+	local tmpfile = "/tmp/firmware.img"
+	
+	local function image_supported()
+		-- XXX: yay...
+		return ( 0 == os.execute(
+			". /lib/functions.sh; " ..
+			"include /lib/upgrade; " ..
+			"platform_check_image %q >/dev/null"
+				% tmpfile
+		) )
+	end
+	
+	local function image_checksum()
+		return (luci.sys.exec("md5sum %q" % tmpfile):match("^([^%s]+)"))
+	end
+	
+	local function storage_size()
+		local size = 0
+		if nixio.fs.access("/proc/mtd") then
+			for l in io.lines("/proc/mtd") do
+				local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
+				if n == "linux" then
+					size = tonumber(s, 16)
+					break
+				end
+			end
+		elseif nixio.fs.access("/proc/partitions") then
+			for l in io.lines("/proc/partitions") do
+				local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
+				if b and n and not n:match('[0-9]') then
+					size = tonumber(b) * 1024
+					break
+				end
+			end
+		end
+		return size
+	end
+
+
+	-- Install upload handler
+	local file
+	luci.http.setfilehandler(
+		function(meta, chunk, eof)
+			if not nixio.fs.access(tmpfile) and not file and chunk and #chunk > 0 then
+				file = io.open(tmpfile, "w")
+			end
+			if file and chunk then
+				file:write(chunk)
+			end
+			if file and eof then
+				file:close()
+			end
+		end
+	)
+
+
+	-- Determine state
+	local keep_avail   = true
+	local step         = tonumber(luci.http.formvalue("step") or 1)
+	local has_image    = nixio.fs.access(tmpfile)
+	local has_support  = image_supported()
+	local has_platform = nixio.fs.access("/lib/upgrade/platform.sh")
+	local has_upload   = luci.http.formvalue("image")
+	
+	-- This does the actual flashing which is invoked inside an iframe
+	-- so don't produce meaningful errors here because the the 
+	-- previous pages should arrange the stuff as required.
+	if step == 4 then
+		if has_platform and has_image and has_support then
+			-- Mimetype text/plain
+			luci.http.prepare_content("text/plain")
+			luci.http.write("Starting luci-flash...\n")
+
+			-- Now invoke sysupgrade
+			local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
+			local flash = ltn12_popen("/sbin/luci-flash %s %q" %{
+				keepcfg and "-k %q" % _keep_pattern() or "", tmpfile
+			})
+
+			luci.ltn12.pump.all(flash, luci.http.write)
+
+			-- Make sure the device is rebooted
+			luci.sys.reboot()
+		end
+
+
+	--
+	-- This is step 1-3, which does the user interaction and
+	-- image upload.
+	--
+
+	-- Step 1: file upload, error on unsupported image format
+	elseif not has_image or not has_support or step == 1 then
+		-- If there is an image but user has requested step 1
+		-- or type is not supported, then remove it.
+		if has_image then
+			nixio.fs.unlink(tmpfile)
+		end
+			
+		luci.template.render("mini/upgrade", {
+			step=1,
+			bad_image=(has_image and not has_support or false),
+			keepavail=keep_avail,
+			supported=has_platform
+		} )
+
+	-- Step 2: present uploaded file, show checksum, confirmation
+	elseif step == 2 then
+		luci.template.render("mini/upgrade", {
+			step=2,
+			checksum=image_checksum(),
+			filesize=nixio.fs.stat(tmpfile).size,
+			flashsize=storage_size(),
+			keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
+		} )
+	
+	-- Step 3: load iframe which calls the actual flash procedure
+	elseif step == 3 then
+		luci.template.render("mini/upgrade", {
+			step=3,
+			keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
+		} )
+	end	
+end
+
+function _keep_pattern()
+	local kpattern = ""
+	local files = luci.model.uci.cursor():get_all("luci", "flash_keep")
+	if files then
+		kpattern = ""
+		for k, v in pairs(files) do
+			if k:sub(1,1) ~= "." and nixio.fs.glob(v)() then
+				kpattern = kpattern .. " " ..  v
+			end
+		end
+	end
+	return kpattern
+end
+
+function ltn12_popen(command)
+
+	local fdi, fdo = nixio.pipe()
+	local pid = nixio.fork()
+
+	if pid > 0 then
+		fdo:close()
+		local close
+		return function()
+			local buffer = fdi:read(2048)
+			local wpid, stat = nixio.waitpid(pid, "nohang")
+			if not close and wpid and stat == "exited" then
+				close = true
+			end
+
+			if buffer and #buffer > 0 then
+				return buffer
+			elseif close then
+				fdi:close()
+				return nil
+			end
+		end
+	elseif pid == 0 then
+		nixio.dup(fdo, nixio.stdout)
+		fdi:close()
+		fdo:close()
+		nixio.exec("/bin/sh", "-c", command)
+	end
+end
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
new file mode 100644
index 00000000..5547db6c
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -0,0 +1,109 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local wa  = require "luci.tools.webadmin"
+local fs  = require "nixio.fs"
+
+m = Map("dhcp", "DHCP")
+
+s = m:section(TypedSection, "dhcp", "DHCP-Server")
+s.anonymous = true
+s.addremove = false
+s.dynamic = false
+
+s:depends("interface", "lan")
+
+enable = s:option(ListValue, "ignore", translate("enable"), "")
+enable:value(0, translate("enable"))
+enable:value(1, translate("disable"))
+
+start = s:option(Value, "start", translate("First leased address"))
+start.rmempty = true
+start:depends("ignore", "0")
+
+
+limit = s:option(Value, "limit", translate("Number of leased addresses"), "")
+limit:depends("ignore", "0")
+
+function limit.cfgvalue(self, section)
+	local value = Value.cfgvalue(self, section)
+	
+	if value then
+		return tonumber(value) + 1
+	end 
+end
+
+function limit.write(self, section, value)
+	value = tonumber(value) - 1
+	return Value.write(self, section, value) 
+end
+
+limit.rmempty = true
+
+time = s:option(Value, "leasetime")
+time:depends("ignore", "0")
+time.rmempty = true
+
+
+local leasefn, leasefp, leases
+uci:foreach("dhcp", "dnsmasq",
+ function(section)
+ 	leasefn = section.leasefile
+ end
+) 
+local leasefp = leasefn and fs.access(leasefn) and io.lines(leasefn)
+if leasefp then
+	leases = {}
+	for lease in leasefp do
+		table.insert(leases, luci.util.split(lease, " "))
+	end
+end
+
+if leases then
+	v = m:section(Table, leases, translate("Active Leases"))
+	name = v:option(DummyValue, 4, translate("Hostname"))
+	function name.cfgvalue(self, ...)
+		local value = DummyValue.cfgvalue(self, ...)
+		return (value == "*") and "?" or value
+	end
+	ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+	mac  = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+	ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
+	function ltime.cfgvalue(self, ...)
+		local value = DummyValue.cfgvalue(self, ...)
+		return wa.date_format(os.difftime(tonumber(value), os.time()))
+	end
+end
+
+s2 = m:section(TypedSection, "host", translate("Static Leases"))
+s2.addremove = true
+s2.anonymous = true
+s2.template = "cbi/tblsection"
+
+name = s2:option(Value, "name", translate("Hostname"))
+mac = s2:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ip = s2:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+sys.net.arptable(function(entry)
+	ip:value(entry["IP address"])
+	mac:value(
+		entry["HW address"],
+		entry["HW address"] .. " (" .. entry["IP address"] .. ")"
+	)
+end)
+
+return m
+
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua
new file mode 100644
index 00000000..71b5dafa
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua
@@ -0,0 +1,14 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+return Template("mini/index")
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
new file mode 100644
index 00000000..78255c1d
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -0,0 +1,48 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require "luci.config"
+local fs = require "nixio.fs"
+
+m = Map("luci", translate("Web <abbr title=\"User Interface\">UI</abbr>"), translate("Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."))
+
+-- force reload of global luci config namespace to reflect the changes
+function m.commit_handler(self)
+	package.loaded["luci.config"] = nil
+	require "luci.config"
+end
+
+
+c = m:section(NamedSection, "main", "core", translate("General"))
+
+l = c:option(ListValue, "lang", translate("Language"))
+l:value("auto")
+
+local i18ndir = luci.i18n.i18ndir .. "base."
+for k, v in luci.util.kspairs(luci.config.languages) do
+	local file = i18ndir .. k:gsub("_", "-")
+	if k:sub(1, 1) ~= "." and fs.access(file .. ".lmo") then
+		l:value(k, v)
+	end
+end
+
+t = c:option(ListValue, "mediaurlbase", translate("Design"))
+for k, v in pairs(luci.config.themes) do
+	if k:sub(1, 1) ~= "." then
+		t:value(v, k)
+	end
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua
new file mode 100644
index 00000000..2385580b
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -0,0 +1,205 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local wa  = require "luci.tools.webadmin"
+local sys = require "luci.sys"
+local fs  = require "nixio.fs"
+
+local has_pptp  = fs.access("/usr/sbin/pptp")
+local has_pppoe = fs.glob("/usr/lib/pppd/*/rp-pppoe.so")()
+
+local network = luci.model.uci.cursor_state():get_all("network")
+
+local netstat = sys.net.deviceinfo()
+local ifaces = {}
+
+for k, v in pairs(network) do
+	if v[".type"] == "interface" and k ~= "loopback" then
+		table.insert(ifaces, v)
+	end
+end
+
+m = Map("network", translate("Network"))
+s = m:section(Table, ifaces, translate("Status"))
+s.parse = function() end
+
+s:option(DummyValue, ".name", translate("Network"))
+
+hwaddr = s:option(DummyValue, "_hwaddr",
+ translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"), translate("Hardware Address"))
+function hwaddr.cfgvalue(self, section)
+	local ix = self.map:get(section, "ifname") or ""
+	local mac = fs.readfile("/sys/class/net/" .. ix .. "/address")
+
+	if not mac then
+		mac = luci.util.exec("ifconfig " .. ix)
+		mac = mac and mac:match(" ([A-F0-9:]+)%s*\n")
+	end
+
+	if mac and #mac > 0 then
+		return mac:upper()
+	end
+
+	return "?"
+end
+
+
+s:option(DummyValue, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+
+s:option(DummyValue, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+
+
+txrx = s:option(DummyValue, "_txrx",
+ translate("Traffic"), translate("transmitted / received"))
+
+function txrx.cfgvalue(self, section)
+	local ix = self.map:get(section, "ifname")
+
+	local rx = netstat and netstat[ix] and netstat[ix][1]
+	rx = rx and wa.byte_format(tonumber(rx)) or "-"
+
+	local tx = netstat and netstat[ix] and netstat[ix][9]
+	tx = tx and wa.byte_format(tonumber(tx)) or "-"
+
+	return string.format("%s / %s", tx, rx)
+end
+
+errors = s:option(DummyValue, "_err",
+ translate("Errors"), translate("TX / RX"))
+
+function errors.cfgvalue(self, section)
+	local ix = self.map:get(section, "ifname")
+
+	local rx = netstat and netstat[ix] and netstat[ix][3]
+	local tx = netstat and netstat[ix] and netstat[ix][11]
+
+	rx = rx and tostring(rx) or "-"
+	tx = tx and tostring(tx) or "-"
+
+	return string.format("%s / %s", tx, rx)
+end
+
+
+
+s = m:section(NamedSection, "lan", "interface", translate("Local Network"))
+s.addremove = false
+s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+
+nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+nm:value("255.255.255.0")
+nm:value("255.255.0.0")
+nm:value("255.0.0.0")
+
+gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway") .. translate(" (optional)"))
+gw.rmempty = true
+dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server") .. translate(" (optional)"))
+dns.rmempty = true
+
+
+s = m:section(NamedSection, "wan", "interface", translate("Internet Connection"))
+s.addremove = false
+p = s:option(ListValue, "proto", translate("Protocol"))
+p.override_values = true
+p:value("none", "disabled")
+p:value("static", translate("manual"))
+p:value("dhcp", translate("automatic"))
+if has_pppoe then p:value("pppoe", "PPPoE") end
+if has_pptp  then p:value("pptp",  "PPTP")  end
+
+function p.write(self, section, value)
+	-- Always set defaultroute to PPP and use remote dns
+	-- Overwrite a bad variable behaviour in libreCMC
+	if value == "pptp" or value == "pppoe" then
+		self.map:set(section, "peerdns", "1")
+		self.map:set(section, "defaultroute", "1")
+	end
+	return ListValue.write(self, section, value)
+end
+
+if not ( has_pppoe and has_pptp ) then
+	p.description = translate("You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support")
+end
+
+
+ip = s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+ip:depends("proto", "static")
+
+nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+nm:depends("proto", "static")
+
+gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+gw:depends("proto", "static")
+gw.rmempty = true
+
+dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
+dns:depends("proto", "static")
+dns.rmempty = true
+
+usr = s:option(Value, "username", translate("Username"))
+usr:depends("proto", "pppoe")
+usr:depends("proto", "pptp")
+
+pwd = s:option(Value, "password", translate("Password"))
+pwd.password = true
+pwd:depends("proto", "pppoe")
+pwd:depends("proto", "pptp")
+
+
+-- Allow user to set MSS correction here if the UCI firewall is installed
+-- This cures some cancer for providers with pre-war routers
+if fs.access("/etc/config/firewall") then
+	mssfix = s:option(Flag, "_mssfix",
+		translate("Clamp Segment Size"), translate("Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."))
+	mssfix.rmempty = false
+
+	function mssfix.cfgvalue(self)
+		local value
+		m.uci:foreach("firewall", "forwarding", function(s)
+			if s.src == "lan" and s.dest == "wan" then
+				value = s.mtu_fix
+			end
+		end)
+		return value
+	end
+
+	function mssfix.write(self, section, value)
+		m.uci:foreach("firewall", "forwarding", function(s)
+			if s.src == "lan" and s.dest == "wan" then
+				m.uci:set("firewall", s[".name"], "mtu_fix", value)
+				m:chain("firewall")
+			end
+		end)
+	end
+end
+
+kea = s:option(Flag, "keepalive", translate("automatically reconnect"))
+kea:depends("proto", "pppoe")
+kea:depends("proto", "pptp")
+kea.rmempty = true
+kea.enabled = "10"
+
+
+cod = s:option(Value, "demand", translate("disconnect when idle for"), "s")
+cod:depends("proto", "pppoe")
+cod:depends("proto", "pptp")
+cod.rmempty = true
+
+srv = s:option(Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
+srv:depends("proto", "pptp")
+srv.rmempty = true
+
+
+
+return m
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
new file mode 100644
index 00000000..6f13bb0f
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
@@ -0,0 +1,45 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User <code>root</code>)"))
+
+pw1 = f:field(Value, "pw1", translate("Password"))
+pw1.password = true
+pw1.rmempty = false
+
+pw2 = f:field(Value, "pw2", translate("Confirmation"))
+pw2.password = true
+pw2.rmempty = false
+
+function pw2.validate(self, value, section)
+	return pw1:formvalue(section) == value and value
+end
+
+function f.handle(self, state, data)
+	if state == FORM_VALID then
+		local stat = luci.sys.user.setpasswd("root", data.pw1) == 0
+		
+		if stat then
+			f.message = translate("Password successfully changed")
+		else
+			f.errmessage = translate("Unknown Error")
+		end
+		
+		data.pw1 = nil
+		data.pw2 = nil
+	end
+	return true
+end
+
+return f
\ No newline at end of file
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua
new file mode 100644
index 00000000..593af04f
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua
@@ -0,0 +1,80 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.sys")
+require("luci.sys.zoneinfo")
+require("luci.tools.webadmin")
+
+
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
+
+s = m:section(TypedSection, "system", "")
+s.anonymous = true
+s.addremove = false
+
+
+local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
+local uptime = luci.sys.uptime()
+
+s:option(DummyValue, "_system", translate("System")).value = model
+s:option(DummyValue, "_cpu", translate("Processor")).value = system
+
+local load1, load5, load15 = luci.sys.loadavg()
+s:option(DummyValue, "_la", translate("Load")).value =
+ string.format("%.2f, %.2f, %.2f", load1, load5, load15)
+
+s:option(DummyValue, "_memtotal", translate("Memory")).value =
+ string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
+  tonumber(memtotal) / 1024,
+  100 * memcached / memtotal,
+  tostring(translate("cached")),
+  100 * membuffers / memtotal,
+  tostring(translate("buffered")),
+  100 * memfree / memtotal,
+  tostring(translate("free"))
+)
+
+s:option(DummyValue, "_systime", translate("Local Time")).value =
+ os.date("%c")
+
+s:option(DummyValue, "_uptime", translate("Uptime")).value =
+ luci.tools.webadmin.date_format(tonumber(uptime))
+
+hn = s:option(Value, "hostname", translate("Hostname"))
+
+function hn.write(self, section, value)
+	Value.write(self, section, value)
+	luci.sys.hostname(value)
+end
+
+
+tz = s:option(ListValue, "zonename", translate("Timezone"))
+tz:value("UTC")
+
+for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
+        tz:value(zone[1])
+end
+
+function tz.write(self, section, value)
+        local function lookup_zone(title)
+                for _, zone in ipairs(luci.sys.zoneinfo.TZ) do
+                        if zone[1] == title then return zone[2] end
+                end
+        end
+
+        AbstractValue.write(self, section, value)
+        self.map.uci:set("system", section, "timezone", lookup_zone(value) or "GMT0")
+end
+
+return m
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
new file mode 100644
index 00000000..a18c072e
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -0,0 +1,373 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+-- Data init --
+
+local fs  = require "nixio.fs"
+local sys = require "luci.sys"
+local uci = require "luci.model.uci".cursor()
+
+if not uci:get("network", "wan") then
+	uci:section("network", "interface", "wan", {proto="none", ifname=" "})
+	uci:save("network")
+	uci:commit("network")
+end
+
+local wlcursor = luci.model.uci.cursor_state()
+local wireless = wlcursor:get_all("wireless")
+local wifidevs = {}
+local ifaces = {}
+
+for k, v in pairs(wireless) do
+	if v[".type"] == "wifi-iface" then
+		table.insert(ifaces, v)
+	end
+end
+
+wlcursor:foreach("wireless", "wifi-device",
+	function(section)
+		table.insert(wifidevs, section[".name"])
+	end)
+
+
+-- Main Map --
+
+m = Map("wireless", translate("Wifi"), translate("Here you can configure installed wifi devices."))
+m:chain("network")
+
+
+-- Status Table --
+s = m:section(Table, ifaces, translate("Networks"))
+
+link = s:option(DummyValue, "_link", translate("Link"))
+function link.cfgvalue(self, section)
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	return iwinfo and "%d/%d" %{ iwinfo.quality, iwinfo.quality_max } or "-"
+end
+
+essid = s:option(DummyValue, "ssid", "ESSID")
+
+bssid = s:option(DummyValue, "_bsiid", "BSSID")
+function bssid.cfgvalue(self, section)
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	return iwinfo and iwinfo.bssid or "-"
+end
+
+channel = s:option(DummyValue, "channel", translate("Channel"))
+function channel.cfgvalue(self, section)
+	return wireless[self.map:get(section, "device")].channel
+end
+
+protocol = s:option(DummyValue, "_mode", translate("Protocol"))
+function protocol.cfgvalue(self, section)
+	local mode = wireless[self.map:get(section, "device")].mode
+	return mode and "802." .. mode
+end
+
+mode = s:option(DummyValue, "mode", translate("Mode"))
+encryption = s:option(DummyValue, "encryption", translate("<abbr title=\"Encrypted\">Encr.</abbr>"))
+
+power = s:option(DummyValue, "_power", translate("Power"))
+function power.cfgvalue(self, section)
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	return iwinfo and "%d dBm" % iwinfo.txpower or "-"
+end
+
+scan = s:option(Button, "_scan", translate("Scan"))
+scan.inputstyle = "find"
+
+function scan.cfgvalue(self, section)
+	return self.map:get(section, "ifname") or false
+end
+
+-- WLAN-Scan-Table --
+
+t2 = m:section(Table, {}, translate("<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"), translate("Wifi networks in your local environment"))
+
+function scan.write(self, section)
+	m.autoapply = false
+	t2.render = t2._render
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	if iwinfo then
+		local _, cell
+		for _, cell in ipairs(iwinfo.scanlist) do
+			t2.data[#t2.data+1] = {
+				Quality = "%d/%d" %{ cell.quality, cell.quality_max },
+				ESSID   = cell.ssid,
+				Address = cell.bssid,
+				Mode    = cell.mode,
+				["Encryption key"] = cell.encryption.enabled and "On" or "Off",
+				["Signal level"]   = "%d dBm" % cell.signal,
+				["Noise level"]    = "%d dBm" % iwinfo.noise
+			}
+		end
+	end
+end
+
+t2._render = t2.render
+t2.render = function() end
+
+t2:option(DummyValue, "Quality", translate("Link"))
+essid = t2:option(DummyValue, "ESSID", "ESSID")
+function essid.cfgvalue(self, section)
+	return self.map:get(section, "ESSID")
+end
+
+t2:option(DummyValue, "Address", "BSSID")
+t2:option(DummyValue, "Mode", translate("Mode"))
+chan = t2:option(DummyValue, "channel", translate("Channel"))
+function chan.cfgvalue(self, section)
+	return self.map:get(section, "Channel")
+	    or self.map:get(section, "Frequency")
+	    or "-"
+end
+
+t2:option(DummyValue, "Encryption key", translate("<abbr title=\"Encrypted\">Encr.</abbr>"))
+
+t2:option(DummyValue, "Signal level", translate("Signal"))
+
+t2:option(DummyValue, "Noise level", translate("Noise"))
+
+
+
+if #wifidevs < 1 then
+	return m
+end
+
+-- Config Section --
+
+s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("Devices"))
+s.addremove = false
+
+en = s:option(Flag, "disabled", translate("enable"))
+en.rmempty = false
+en.enabled = "0"
+en.disabled = "1"
+
+function en.cfgvalue(self, section)
+	return Flag.cfgvalue(self, section) or "0"
+end
+
+
+local hwtype = m:get(wifidevs[1], "type")
+
+if hwtype == "atheros" then
+	mode = s:option(ListValue, "hwmode", translate("Mode"))
+	mode.override_values = true
+	mode:value("", "auto")
+	mode:value("11b", "802.11b")
+	mode:value("11g", "802.11g")
+	mode:value("11a", "802.11a")
+	mode:value("11bg", "802.11b+g")
+	mode.rmempty = true
+end
+
+
+ch = s:option(Value, "channel", translate("Channel"))
+for i=1, 14 do
+	ch:value(i, i .. " (2.4 GHz)")
+end
+
+
+s = m:section(TypedSection, "wifi-iface", translate("Local Network"))
+s.anonymous = true
+s.addremove = false
+
+s:option(Value, "ssid", translate("Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"))
+
+bssid = s:option(Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
+
+local devs = {}
+luci.model.uci.cursor():foreach("wireless", "wifi-device",
+	function (section)
+		table.insert(devs, section[".name"])
+	end)
+
+if #devs > 1 then
+	device = s:option(DummyValue, "device", translate("Device"))
+else
+	s.defaults.device = devs[1]
+end
+
+mode = s:option(ListValue, "mode", translate("Mode"))
+mode.override_values = true
+mode:value("ap", translate("Provide (Access Point)"))
+mode:value("adhoc", translate("Independent (Ad-Hoc)"))
+mode:value("sta", translate("Join (Client)"))
+
+function mode.write(self, section, value)
+	if value == "sta" then
+		local oldif = m.uci:get("network", "wan", "ifname")
+		if oldif and oldif ~= " " then
+			m.uci:set("network", "wan", "_ifname", oldif)
+		end
+		m.uci:set("network", "wan", "ifname", " ")
+
+		self.map:set(section, "network", "wan")
+	else
+		if m.uci:get("network", "wan", "_ifname") then
+			m.uci:set("network", "wan", "ifname", m.uci:get("network", "wan", "_ifname"))
+		end
+		self.map:set(section, "network", "lan")
+	end
+
+	return ListValue.write(self, section, value)
+end
+
+encr = s:option(ListValue, "encryption", translate("Encryption"))
+encr.override_values = true
+encr:value("none", "No Encryption")
+encr:value("wep", "WEP")
+
+if hwtype == "atheros" or hwtype == "mac80211" then
+	local supplicant = fs.access("/usr/sbin/wpa_supplicant")
+	local hostapd    = fs.access("/usr/sbin/hostapd")
+
+	if hostapd and supplicant then
+		encr:value("psk", "WPA-PSK")
+		encr:value("psk2", "WPA2-PSK")
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
+		encr:value("wpa", "WPA-Radius", {mode="ap"}, {mode="sta"})
+		encr:value("wpa2", "WPA2-Radius", {mode="ap"}, {mode="sta"})
+	elseif hostapd and not supplicant then
+		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
+		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
+		encr:value("wpa", "WPA-Radius", {mode="ap"})
+		encr:value("wpa2", "WPA2-Radius", {mode="ap"})
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)
+	elseif not hostapd and supplicant then
+		encr:value("psk", "WPA-PSK", {mode="sta"})
+		encr:value("psk2", "WPA2-PSK", {mode="sta"})
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
+		encr:value("wpa", "WPA-EAP", {mode="sta"})
+		encr:value("wpa2", "WPA2-EAP", {mode="sta"})
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)		
+	else
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)
+	end
+elseif hwtype == "broadcom" then
+	encr:value("psk", "WPA-PSK")
+	encr:value("psk2", "WPA2-PSK")
+	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
+end
+
+key = s:option(Value, "key", translate("Key"))
+key:depends("encryption", "wep")
+key:depends("encryption", "psk")
+key:depends("encryption", "psk2")
+key:depends("encryption", "psk+psk2")
+key:depends("encryption", "psk-mixed")
+key:depends({mode="ap", encryption="wpa"})
+key:depends({mode="ap", encryption="wpa2"})
+key.rmempty = true
+key.password = true
+
+server = s:option(Value, "server", translate("Radius-Server"))
+server:depends({mode="ap", encryption="wpa"})
+server:depends({mode="ap", encryption="wpa2"})
+server.rmempty = true
+
+port = s:option(Value, "port", translate("Radius-Port"))
+port:depends({mode="ap", encryption="wpa"})
+port:depends({mode="ap", encryption="wpa2"})
+port.rmempty = true
+
+
+if hwtype == "atheros" or hwtype == "mac80211" then
+	nasid = s:option(Value, "nasid", translate("NAS ID"))
+	nasid:depends({mode="ap", encryption="wpa"})
+	nasid:depends({mode="ap", encryption="wpa2"})
+	nasid.rmempty = true
+
+	eaptype = s:option(ListValue, "eap_type", translate("EAP-Method"))
+	eaptype:value("TLS")
+	eaptype:value("TTLS")
+	eaptype:value("PEAP")
+	eaptype:depends({mode="sta", encryption="wpa"})
+	eaptype:depends({mode="sta", encryption="wpa2"})
+
+	cacert = s:option(FileUpload, "ca_cert", translate("Path to CA-Certificate"))
+	cacert:depends({mode="sta", encryption="wpa"})
+	cacert:depends({mode="sta", encryption="wpa2"})
+
+	privkey = s:option(FileUpload, "priv_key", translate("Path to Private Key"))
+	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2"})
+	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"})
+
+	privkeypwd = s:option(Value, "priv_key_pwd", translate("Password of Private Key"))
+	privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2"})
+	privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"})
+
+
+	auth = s:option(Value, "auth", translate("Authentication"))
+	auth:value("PAP")
+	auth:value("CHAP")
+	auth:value("MSCHAP")
+	auth:value("MSCHAPV2")
+	auth:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
+	auth:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+	auth:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	auth:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+
+
+	identity = s:option(Value, "identity", translate("Identity"))
+	identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
+	identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+	identity:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	identity:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+
+	password = s:option(Value, "password", translate("Password"))
+	password:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
+	password:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+	password:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	password:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+end
+
+
+if hwtype == "atheros" or hwtype == "broadcom" then
+	iso = s:option(Flag, "isolate", translate("AP-Isolation"), translate("Prevents Client to Client communication"))
+	iso.rmempty = true
+	iso:depends("mode", "ap")
+
+	hide = s:option(Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+	hide.rmempty = true
+	hide:depends("mode", "ap")
+end
+
+if hwtype == "mac80211" or hwtype == "atheros" then
+	bssid:depends({mode="adhoc"})
+end
+
+if hwtype == "broadcom" then
+	bssid:depends({mode="wds"})
+	bssid:depends({mode="adhoc"})
+end
+
+
+return m
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm
new file mode 100644
index 00000000..8ff7118c
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm
@@ -0,0 +1,21 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<br />
+<p><% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %></p>
+<p><%:Please wait: Device rebooting...%></p>
+<script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
+<%+footer%>
\ No newline at end of file
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/view/mini/backup.htm b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/backup.htm
new file mode 100644
index 00000000..eb9dc46e
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/backup.htm
@@ -0,0 +1,40 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Backup / Restore%></h3>
+<p><%:Here you can backup and restore your configuration and - if possible - reset this device to the default settings.%></p>
+<br />
+<div>
+	<ul>
+	<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
+	<% if reset_avail then -%>
+	<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset this device to defaults%></a></li>
+	<% end -%>
+	</ul>
+</div>
+
+<br />
+
+<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
+	<div class="left"><%:Backup Archive%>:</div>
+	<div>
+		<input type="file" size="30" name="archive" />
+	</div>
+	<div>
+		<input type="submit" class="cbi-button cbi-input-apply" value="<%:Restore backup%>" />
+	</div>
+</form>
+<%+footer%>
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/view/mini/index.htm b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/index.htm
new file mode 100644
index 00000000..9c61421d
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/index.htm
@@ -0,0 +1,21 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<h2><a id="content" name="content"><%:Hello!%></a></h2>
+<p><%_This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p>
+<p><%_<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring libreCMC.%><br />
+<%:On the following pages you can adjust all important settings of this device.%></p>
+<p><%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%></p>
+<p><%:And now have fun with your libreCMC device!%></p>
+<p><em><strong><a href="<%=controller%>/about"><%_The <abbr title="Lua Configuration Interface">LuCI</abbr> Team%></a></strong></em></p>
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/view/mini/reboot.htm b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/reboot.htm
new file mode 100644
index 00000000..9e57d89f
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/reboot.htm
@@ -0,0 +1,33 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Reboot%></h3>
+<p><%:Reboots the operating system of your device%></p>
+<%-
+local c = require("luci.model.uci").cursor():changes()
+if c and next(c) then
+-%>
+	<p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p> 
+<%-
+end
+if not reboot then 
+-%>
+<p><a href="<%=REQUEST_URI%>?reboot=1"><%:Perform reboot%></a></p>
+<%- else -%>
+<p><%:Please wait: Device rebooting...%></p>
+<script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
+<%- end -%>
+<%+footer%>
\ No newline at end of file
diff --git a/trunk/package/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm
new file mode 100644
index 00000000..ba050798
--- /dev/null
+++ b/trunk/package/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm
@@ -0,0 +1,105 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Flash Firmware%></h3>
+
+<% if step == 1 then %>
+	<% if supported then %>
+	<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
+	<p>
+		<%:Upload an libreCMC image file to reflash the device.%>
+		<% if bad_image then %>
+			<br /><br />
+			<div class="error"><%:The uploaded image file does not
+				contain a supported format. Make sure that you choose the generic
+				image format for your platform. %></div>
+		<% end %>
+	</p>
+	<div>
+		<%:Firmware image%>:<br />
+		<input type="hidden" name="step" value="2" />
+		<input type="file" size="30" name="image" />
+		<br />
+		<br />
+		<% if keepavail then -%>
+		<input type="checkbox" name="keepcfg" value="1" checked="checked" />
+		<span class="bold"><%:Keep configuration files%></span>
+		<% end -%>
+
+		<br />
+		<input class="cbi-button cbi-button-apply" type="submit" value="<%:Upload image%>" />
+	</div>
+	</form>
+	<% else %>
+		<div class="error"><%_ Sorry.
+			libreCMC does not support a system upgrade on this platform.<br />
+			You need to manually flash your device. %></div>
+	<% end %>
+<% elseif step == 2 then %>
+	<p>
+		<%_ The flash image was uploaded.
+			Below is the checksum and file size listed,
+			compare them with the original file to ensure data integrity.<br />
+			Click "Proceed" below to start the flash procedure. %>
+
+		<% if flashsize > 0 and filesize > flashsize then %>
+			<br /><br />
+			<div class="error"><%:It appears that you are trying to
+				flash an image that does not fit into the flash memory, please verify
+				the image file! %></div>
+		<% end %>
+
+		<br />
+		<ul>
+			<li><%:Checksum%>: <code><%=checksum%></code></li>
+			<li><%:Size%>: <%
+				local w = require "luci.tools.webadmin"
+				write(w.byte_format(filesize))
+	
+				if flashsize > 0 then
+					write(luci.i18n.translatef(
+						" (%s available)",
+						w.byte_format(flashsize)
+					))
+				end
+			%></li>
+		</ul>
+	</p>
+	<div class="cbi-page-actions right">
+		<form style="display:inline">
+			<input type="hidden" name="step" value="3" />
+			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
+			<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />	
+		</form>
+		<form style="display:inline">
+			<input type="hidden" name="step" value="1" />
+			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
+			<input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
+		</form>
+	</div>
+<% elseif step == 3 then %>
+	<p><%_ The system is flashing now.<br />
+		DO NOT POWER OFF THE DEVICE!<br />
+		Wait a few minutes before you try to reconnect.
+		It might be necessary to renew the address of your computer to reach the device
+		again, depending on your settings. %></p>
+		
+	<iframe src="<%=REQUEST_URI%>?step=4&#38;keepcfg=<%=keepconfig and "1" or "0"%>" style="border:1px solid black; width:100%; height:150px"></iframe>
+<% end %>
+<%+footer%>
+
diff --git a/trunk/package/luci/modules/base/Makefile b/trunk/package/luci/modules/base/Makefile
new file mode 100644
index 00000000..ad16ec73
--- /dev/null
+++ b/trunk/package/luci/modules/base/Makefile
@@ -0,0 +1,45 @@
+ifneq (,$(wildcard ../../build/config.mk))
+include ../../build/config.mk
+include ../../build/module.mk
+include ../../build/gccconfig.mk
+else
+include standalone.mk
+endif
+
+TPL_LDFLAGS    =
+TPL_CFLAGS     =
+TPL_SO         = parser.so
+TPL_PO2LMO     = po2lmo
+TPL_PO2LMO_OBJ = src/po2lmo.o
+TPL_LMO_OBJ    = src/template_lmo.o
+TPL_COMMON_OBJ = src/template_parser.o src/template_utils.o
+TPL_LUALIB_OBJ = src/template_lualib.o
+
+%.o: %.c
+	$(COMPILE) $(TPL_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
+
+compile: build-clean $(TPL_COMMON_OBJ) $(TPL_LUALIB_OBJ) $(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
+	$(LINK) $(SHLIB_FLAGS) $(TPL_LDFLAGS) -o src/$(TPL_SO) \
+		$(TPL_COMMON_OBJ) $(TPL_LMO_OBJ) $(TPL_LUALIB_OBJ)
+	$(LINK) -o src/$(TPL_PO2LMO) \
+		$(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
+	mkdir -p dist$(LUCI_LIBRARYDIR)/template
+	cp src/$(TPL_SO) dist$(LUCI_LIBRARYDIR)/template/$(TPL_SO)
+
+install: build
+	cp -pR dist$(LUA_LIBRARYDIR)/* $(LUA_LIBRARYDIR)
+
+clean: build-clean
+
+build-clean:
+	rm -f src/*.o src/$(TPL_SO)
+
+host-compile: build-clean host-clean $(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
+	$(LINK) -o src/$(TPL_PO2LMO) $(TPL_LMO_OBJ) $(TPL_PO2LMO_OBJ)
+
+host-install: host-compile
+	cp src/$(TPL_PO2LMO) ../../build/$(TPL_PO2LMO)
+
+host-clean:
+	rm -f src/$(TPL_PO2LMO)
+	rm -f ../../build/$(TPL_PO2LMO)
diff --git a/trunk/package/luci/modules/base/htdocs/cgi-bin/luci b/trunk/package/luci/modules/base/htdocs/cgi-bin/luci
new file mode 100755
index 00000000..529d1d0b
--- /dev/null
+++ b/trunk/package/luci/modules/base/htdocs/cgi-bin/luci
@@ -0,0 +1,5 @@
+#!/usr/bin/lua
+require "luci.cacheloader"
+require "luci.sgi.cgi"
+luci.dispatcher.indexcache = "/tmp/luci-indexcache"
+luci.sgi.cgi.run()
\ No newline at end of file
diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi.js b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi.js
new file mode 100644
index 00000000..02814a54
--- /dev/null
+++ b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi.js
@@ -0,0 +1,1339 @@
+/*
+	LuCI - Lua Configuration Interface
+
+	Copyright 2008 Steven Barth <steven@midlink.org>
+	Copyright 2008-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+*/
+
+var cbi_d = [];
+var cbi_t = [];
+var cbi_c = [];
+
+var cbi_validators = {
+
+	'integer': function()
+	{
+		return (this.match(/^-?[0-9]+$/) != null);
+	},
+
+	'uinteger': function()
+	{
+		return (cbi_validators.integer.apply(this) && (this >= 0));
+	},
+
+	'float': function()
+	{
+		return !isNaN(parseFloat(this));
+	},
+
+	'ufloat': function()
+	{
+		return (cbi_validators['float'].apply(this) && (this >= 0));
+	},
+
+	'ipaddr': function()
+	{
+		return cbi_validators.ip4addr.apply(this) ||
+			cbi_validators.ip6addr.apply(this);
+	},
+
+	'ip4addr': function()
+	{
+		if (this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
+		{
+			return (RegExp.$1 >= 0) && (RegExp.$1 <= 255) &&
+			       (RegExp.$2 >= 0) && (RegExp.$2 <= 255) &&
+			       (RegExp.$3 >= 0) && (RegExp.$3 <= 255) &&
+			       (RegExp.$4 >= 0) && (RegExp.$4 <= 255) &&
+			       ((RegExp.$6.indexOf('.') < 0)
+			          ? ((RegExp.$6 >= 0) && (RegExp.$6 <= 32))
+			          : (cbi_validators.ip4addr.apply(RegExp.$6)))
+			;
+		}
+
+		return false;
+	},
+
+	'ip6addr': function()
+	{
+		if( this.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
+		{
+			if( !RegExp.$2 || ((RegExp.$3 >= 0) && (RegExp.$3 <= 128)) )
+			{
+				var addr = RegExp.$1;
+
+				if( addr == '::' )
+				{
+					return true;
+				}
+
+				if( addr.indexOf('.') > 0 )
+				{
+					var off = addr.lastIndexOf(':');
+
+					if( !(off && cbi_validators.ip4addr.apply(addr.substr(off+1))) )
+						return false;
+
+					addr = addr.substr(0, off) + ':0:0';
+				}
+
+				if( addr.indexOf('::') >= 0 )
+				{
+					var colons = 0;
+					var fill = '0';
+
+					for( var i = 1; i < (addr.length-1); i++ )
+						if( addr.charAt(i) == ':' )
+							colons++;
+
+					if( colons > 7 )
+						return false;
+
+					for( var i = 0; i < (7 - colons); i++ )
+						fill += ':0';
+
+					if (addr.match(/^(.*?)::(.*?)$/))
+						addr = (RegExp.$1 ? RegExp.$1 + ':' : '') + fill +
+						       (RegExp.$2 ? ':' + RegExp.$2 : '');
+				}
+
+				return (addr.match(/^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/) != null);
+			}
+		}
+
+		return false;
+	},
+
+	'port': function()
+	{
+		return cbi_validators.integer.apply(this) &&
+			(this >= 0) && (this <= 65535);
+	},
+
+	'portrange': function()
+	{
+		if (this.match(/^(\d+)-(\d+)$/))
+		{
+			var p1 = RegExp.$1;
+			var p2 = RegExp.$2;
+
+			return cbi_validators.port.apply(p1) &&
+			       cbi_validators.port.apply(p2) &&
+			       (parseInt(p1) <= parseInt(p2))
+			;
+		}
+		else
+		{
+			return cbi_validators.port.apply(this);
+		}
+	},
+
+	'macaddr': function()
+	{
+		return (this.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null);
+	},
+
+	'host': function()
+	{
+		return cbi_validators.hostname.apply(this) ||
+			cbi_validators.ipaddr.apply(this);
+	},
+
+	'hostname': function()
+	{
+		if (this.length <= 253)
+			return (this.match(/^[a-zA-Z0-9]+$/) != null ||
+			        (this.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) &&
+			         this.match(/[^0-9.]/)));
+
+		return false;
+	},
+
+	'network': function()
+	{
+		return cbi_validators.uciname.apply(this) ||
+			cbi_validators.host.apply(this);
+	},
+
+	'wpakey': function()
+	{
+		var v = this;
+
+		if( v.length == 64 )
+			return (v.match(/^[a-fA-F0-9]{64}$/) != null);
+		else
+			return (v.length >= 8) && (v.length <= 63);
+	},
+
+	'wepkey': function()
+	{
+		var v = this;
+
+		if ( v.substr(0,2) == 's:' )
+			v = v.substr(2);
+
+		if( (v.length == 10) || (v.length == 26) )
+			return (v.match(/^[a-fA-F0-9]{10,26}$/) != null);
+		else
+			return (v.length == 5) || (v.length == 13);
+	},
+
+	'uciname': function()
+	{
+		return (this.match(/^[a-zA-Z0-9_]+$/) != null);
+	},
+
+	'range': function(min, max)
+	{
+		var val = parseFloat(this);
+		if (!isNaN(min) && !isNaN(max) && !isNaN(val))
+			return ((val >= min) && (val <= max));
+
+		return false;
+	},
+
+	'min': function(min)
+	{
+		var val = parseFloat(this);
+		if (!isNaN(min) && !isNaN(val))
+			return (val >= min);
+
+		return false;
+	},
+
+	'max': function(max)
+	{
+		var val = parseFloat(this);
+		if (!isNaN(max) && !isNaN(val))
+			return (val <= max);
+
+		return false;
+	},
+
+	'rangelength': function(min, max)
+	{
+		var val = '' + this;
+		if (!isNaN(min) && !isNaN(max))
+			return ((val.length >= min) && (val.length <= max));
+
+		return false;
+	},
+
+	'minlength': function(min)
+	{
+		var val = '' + this;
+		if (!isNaN(min))
+			return (val.length >= min);
+
+		return false;
+	},
+
+	'maxlength': function(max)
+	{
+		var val = '' + this;
+		if (!isNaN(max))
+			return (val.length <= max);
+
+		return false;
+	},
+
+	'or': function()
+	{
+		for (var i = 0; i < arguments.length; i += 2)
+		{
+			if (typeof arguments[i] != 'function')
+			{
+				if (arguments[i] == this)
+					return true;
+				i--;
+			}
+			else if (arguments[i].apply(this, arguments[i+1]))
+			{
+				return true;
+			}
+		}
+		return false;
+	},
+
+	'and': function()
+	{
+		for (var i = 0; i < arguments.length; i += 2)
+		{
+			if (typeof arguments[i] != 'function')
+			{
+				if (arguments[i] != this)
+					return false;
+				i--;
+			}
+			else if (!arguments[i].apply(this, arguments[i+1]))
+			{
+				return false;
+			}
+		}
+		return true;
+	},
+
+	'neg': function()
+	{
+		return cbi_validators.or.apply(
+			this.replace(/^[ \t]*![ \t]*/, ''), arguments);
+	},
+
+	'list': function(subvalidator, subargs)
+	{
+		if (typeof subvalidator != 'function')
+			return false;
+
+		var tokens = this.match(/[^ \t]+/g);
+		for (var i = 0; i < tokens.length; i++)
+			if (!subvalidator.apply(tokens[i], subargs))
+				return false;
+
+		return true;
+	},
+	'phonedigit': function()
+	{
+		return (this.match(/^[0-9\*#!\.]+$/) != null);
+	}
+};
+
+
+function cbi_d_add(field, dep, next) {
+	var obj = document.getElementById(field);
+	if (obj) {
+		var entry
+		for (var i=0; i<cbi_d.length; i++) {
+			if (cbi_d[i].id == field) {
+				entry = cbi_d[i];
+				break;
+			}
+		}
+		if (!entry) {
+			entry = {
+				"node": obj,
+				"id": field,
+				"parent": obj.parentNode.id,
+				"next": next,
+				"deps": []
+			};
+			cbi_d.unshift(entry);
+		}
+		entry.deps.push(dep)
+	}
+}
+
+function cbi_d_checkvalue(target, ref) {
+	var t = document.getElementById(target);
+	var value;
+
+	if (!t) {
+		var tl = document.getElementsByName(target);
+
+		if( tl.length > 0 && (tl[0].type == 'radio' || tl[0].type == 'checkbox'))
+			for( var i = 0; i < tl.length; i++ )
+				if( tl[i].checked ) {
+					value = tl[i].value;
+					break;
+				}
+
+		value = value ? value : "";
+	} else if (!t.value) {
+		value = "";
+	} else {
+		value = t.value;
+
+		if (t.type == "checkbox") {
+			value = t.checked ? value : "";
+		}
+	}
+
+	return (value == ref)
+}
+
+function cbi_d_check(deps) {
+	var reverse;
+	var def = false;
+	for (var i=0; i<deps.length; i++) {
+		var istat = true;
+		reverse = false;
+		for (var j in deps[i]) {
+			if (j == "!reverse") {
+				reverse = true;
+			} else if (j == "!default") {
+				def = true;
+				istat = false;
+			} else {
+				istat = (istat && cbi_d_checkvalue(j, deps[i][j]))
+			}
+		}
+		if (istat) {
+			return !reverse;
+		}
+	}
+	return def;
+}
+
+function cbi_d_update() {
+	var state = false;
+	for (var i=0; i<cbi_d.length; i++) {
+		var entry = cbi_d[i];
+		var next  = document.getElementById(entry.next)
+		var node  = document.getElementById(entry.id)
+		var parent = document.getElementById(entry.parent)
+
+		if (node && node.parentNode && !cbi_d_check(entry.deps)) {
+			node.parentNode.removeChild(node);
+			state = true;
+			if( entry.parent )
+				cbi_c[entry.parent]--;
+		} else if ((!node || !node.parentNode) && cbi_d_check(entry.deps)) {
+			if (!next) {
+				parent.appendChild(entry.node);
+			} else {
+				next.parentNode.insertBefore(entry.node, next);
+			}
+			state = true;
+			if( entry.parent )
+				cbi_c[entry.parent]++;
+		}
+	}
+
+	if (entry && entry.parent) {
+		if (!cbi_t_update())
+			cbi_tag_last(parent);
+	}
+
+	if (state) {
+		cbi_d_update();
+	}
+}
+
+function cbi_bind(obj, type, callback, mode) {
+	if (!obj.addEventListener) {
+		obj.attachEvent('on' + type,
+			function(){
+				var e = window.event;
+
+				if (!e.target && e.srcElement)
+					e.target = e.srcElement;
+
+				return !!callback(e);
+			}
+		);
+	} else {
+		obj.addEventListener(type, callback, !!mode);
+	}
+	return obj;
+}
+
+function cbi_combobox(id, values, def, man) {
+	var selid = "cbi.combobox." + id;
+	if (document.getElementById(selid)) {
+		return
+	}
+
+	var obj = document.getElementById(id)
+	var sel = document.createElement("select");
+		sel.id = selid;
+		sel.className = obj.className.replace(/cbi-input-text/, 'cbi-input-select');
+
+	if (obj.nextSibling) {
+		obj.parentNode.insertBefore(sel, obj.nextSibling);
+	} else {
+		obj.parentNode.appendChild(sel);
+	}
+
+	var dt = obj.getAttribute('cbi_datatype');
+	var op = obj.getAttribute('cbi_optional');
+
+	if (dt)
+		cbi_validate_field(sel, op == 'true', dt);
+
+	if (!values[obj.value]) {
+		if (obj.value == "") {
+			var optdef = document.createElement("option");
+			optdef.value = "";
+			optdef.appendChild(document.createTextNode(def));
+			sel.appendChild(optdef);
+		} else {
+			var opt = document.createElement("option");
+			opt.value = obj.value;
+			opt.selected = "selected";
+			opt.appendChild(document.createTextNode(obj.value));
+			sel.appendChild(opt);
+		}
+	}
+
+	for (var i in values) {
+		var opt = document.createElement("option");
+		opt.value = i;
+
+		if (obj.value == i) {
+			opt.selected = "selected";
+		}
+
+		opt.appendChild(document.createTextNode(values[i]));
+		sel.appendChild(opt);
+	}
+
+	var optman = document.createElement("option");
+	optman.value = "";
+	optman.appendChild(document.createTextNode(man));
+	sel.appendChild(optman);
+
+	obj.style.display = "none";
+
+	cbi_bind(sel, "change", function() {
+		if (sel.selectedIndex == sel.options.length - 1) {
+			obj.style.display = "inline";
+			sel.parentNode.removeChild(sel);
+			obj.focus();
+		} else {
+			obj.value = sel.options[sel.selectedIndex].value;
+		}
+
+		try {
+			cbi_d_update();
+		} catch (e) {
+			//Do nothing
+		}
+	})
+
+	// Retrigger validation in select
+	sel.focus();
+	sel.blur();
+}
+
+function cbi_combobox_init(id, values, def, man) {
+	var obj = document.getElementById(id);
+	cbi_bind(obj, "blur", function() {
+		cbi_combobox(id, values, def, man)
+	});
+	cbi_combobox(id, values, def, man);
+}
+
+function cbi_filebrowser(id, url, defpath) {
+	var field   = document.getElementById(id);
+	var browser = window.open(
+		url + ( field.value || defpath || '' ) + '?field=' + id,
+		"luci_filebrowser", "width=300,height=400,left=100,top=200,scrollbars=yes"
+	);
+
+	browser.focus();
+}
+
+function cbi_browser_init(id, respath, url, defpath)
+{
+	function cbi_browser_btnclick(e) {
+		cbi_filebrowser(id, url, defpath);
+		return false;
+	}
+
+	var field = document.getElementById(id);
+
+	var btn = document.createElement('img');
+	btn.className = 'cbi-image-button';
+	btn.src = respath + '/cbi/folder.gif';
+	field.parentNode.insertBefore(btn, field.nextSibling);
+
+	cbi_bind(btn, 'click', cbi_browser_btnclick);
+}
+
+function cbi_dynlist_init(name, respath, datatype, optional, choices)
+{
+	var input0 = document.getElementsByName(name)[0];
+	var prefix = input0.name;
+	var parent = input0.parentNode;
+	var holder = input0.placeholder;
+
+	var values;
+
+	function cbi_dynlist_redraw(focus, add, del)
+	{
+		values = [ ];
+
+		while (parent.firstChild)
+		{
+			var n = parent.firstChild;
+			var i = parseInt(n.index);
+
+			if (i != del)
+			{
+				if (n.nodeName.toLowerCase() == 'input')
+					values.push(n.value || '');
+				else if (n.nodeName.toLowerCase() == 'select')
+					values[values.length-1] = n.options[n.selectedIndex].value;
+			}
+
+			parent.removeChild(n);
+		}
+
+		if (add >= 0)
+		{
+			focus = add+1;
+			values.splice(focus, 0, '');
+		}
+		else if (values.length == 0)
+		{
+			focus = 0;
+			values.push('');
+		}
+
+		for (var i = 0; i < values.length; i++)
+		{
+			var t = document.createElement('input');
+				t.id = prefix + '.' + (i+1);
+				t.name = prefix;
+				t.value = values[i];
+				t.type = 'text';
+				t.index = i;
+				t.className = 'cbi-input-text';
+
+			if (i == 0 && holder)
+			{
+				t.placeholder = holder;
+			}
+
+			var b = document.createElement('img');
+				b.src = respath + ((i+1) < values.length ? '/cbi/remove.gif' : '/cbi/add.gif');
+				b.className = 'cbi-image-button';
+
+			parent.appendChild(t);
+			parent.appendChild(b);
+			parent.appendChild(document.createElement('br'));
+
+			if (datatype)
+			{
+				cbi_validate_field(t.id, ((i+1) == values.length) || optional, datatype);
+			}
+
+			if (choices)
+			{
+				cbi_combobox_init(t.id, choices[0], '', choices[1]);
+				t.nextSibling.index = i;
+
+				cbi_bind(t.nextSibling, 'keydown',  cbi_dynlist_keydown);
+				cbi_bind(t.nextSibling, 'keypress', cbi_dynlist_keypress);
+
+				if (i == focus || -i == focus)
+					t.nextSibling.focus();
+			}
+			else
+			{
+				cbi_bind(t, 'keydown',  cbi_dynlist_keydown);
+				cbi_bind(t, 'keypress', cbi_dynlist_keypress);
+
+				if (i == focus)
+				{
+					t.focus();
+				}
+				else if (-i == focus)
+				{
+					t.focus();
+
+					/* force cursor to end */
+					var v = t.value;
+					t.value = ' '
+					t.value = v;
+				}
+			}
+
+			cbi_bind(b, 'click', cbi_dynlist_btnclick);
+		}
+	}
+
+	function cbi_dynlist_keypress(ev)
+	{
+		ev = ev ? ev : window.event;
+
+		var se = ev.target ? ev.target : ev.srcElement;
+
+		if (se.nodeType == 3)
+			se = se.parentNode;
+
+		switch (ev.keyCode)
+		{
+			/* backspace, delete */
+			case 8:
+			case 46:
+				if (se.value.length == 0)
+				{
+					if (ev.preventDefault)
+						ev.preventDefault();
+
+					return false;
+				}
+
+				return true;
+
+			/* enter, arrow up, arrow down */
+			case 13:
+			case 38:
+			case 40:
+				if (ev.preventDefault)
+					ev.preventDefault();
+
+				return false;
+		}
+
+		return true;
+	}
+
+	function cbi_dynlist_keydown(ev)
+	{
+		ev = ev ? ev : window.event;
+
+		var se = ev.target ? ev.target : ev.srcElement;
+
+		if (se.nodeType == 3)
+			se = se.parentNode;
+
+		var prev = se.previousSibling;
+		while (prev && prev.name != name)
+			prev = prev.previousSibling;
+
+		var next = se.nextSibling;
+		while (next && next.name != name)
+			next = next.nextSibling;
+
+		/* advance one further in combobox case */
+		if (next && next.nextSibling.name == name)
+			next = next.nextSibling;
+
+		switch (ev.keyCode)
+		{
+			/* backspace, delete */
+			case 8:
+			case 46:
+				var del = (se.nodeName.toLowerCase() == 'select')
+					? true : (se.value.length == 0);
+
+				if (del)
+				{
+					if (ev.preventDefault)
+						ev.preventDefault();
+
+					var focus = se.index;
+					if (ev.keyCode == 8)
+						focus = -focus+1;
+
+					cbi_dynlist_redraw(focus, -1, se.index);
+
+					return false;
+				}
+
+				break;
+
+			/* enter */
+			case 13:
+				cbi_dynlist_redraw(-1, se.index, -1);
+				break;
+
+			/* arrow up */
+			case 38:
+				if (prev)
+					prev.focus();
+
+				break;
+
+			/* arrow down */
+			case 40:
+				if (next)
+					next.focus();
+
+				break;
+		}
+
+		return true;
+	}
+
+	function cbi_dynlist_btnclick(ev)
+	{
+		ev = ev ? ev : window.event;
+
+		var se = ev.target ? ev.target : ev.srcElement;
+
+		if (se.src.indexOf('remove') > -1)
+		{
+			se.previousSibling.value = '';
+
+			cbi_dynlist_keydown({
+				target:  se.previousSibling,
+				keyCode: 8
+			});
+		}
+		else
+		{
+			cbi_dynlist_keydown({
+				target:  se.previousSibling,
+				keyCode: 13
+			});
+		}
+
+		return false;
+	}
+
+	cbi_dynlist_redraw(NaN, -1, -1);
+}
+
+//Hijacks the CBI form to send via XHR (requires Prototype)
+function cbi_hijack_forms(layer, win, fail, load) {
+	var forms = layer.getElementsByTagName('form');
+	for (var i=0; i<forms.length; i++) {
+		$(forms[i]).observe('submit', function(event) {
+			// Prevent the form from also submitting the regular way
+			event.stop();
+
+			// Submit via XHR
+			event.element().request({
+				onSuccess: win,
+				onFailure: fail
+			});
+
+			if (load) {
+				load();
+			}
+		});
+	}
+}
+
+
+function cbi_t_add(section, tab) {
+	var t = document.getElementById('tab.' + section + '.' + tab);
+	var c = document.getElementById('container.' + section + '.' + tab);
+
+	if( t && c ) {
+		cbi_t[section] = (cbi_t[section] || [ ]);
+		cbi_t[section][tab] = { 'tab': t, 'container': c, 'cid': c.id };
+	}
+}
+
+function cbi_t_switch(section, tab) {
+	if( cbi_t[section] && cbi_t[section][tab] ) {
+		var o = cbi_t[section][tab];
+		var h = document.getElementById('tab.' + section);
+		for( var tid in cbi_t[section] ) {
+			var o2 = cbi_t[section][tid];
+			if( o.tab.id != o2.tab.id ) {
+				o2.tab.className = o2.tab.className.replace(/(^| )cbi-tab( |$)/, " cbi-tab-disabled ");
+				o2.container.style.display = 'none';
+			}
+			else {
+				if(h) h.value = tab;
+				o2.tab.className = o2.tab.className.replace(/(^| )cbi-tab-disabled( |$)/, " cbi-tab ");
+				o2.container.style.display = 'block';
+			}
+		}
+	}
+	return false
+}
+
+function cbi_t_update() {
+	var hl_tabs = [ ];
+	var updated = false;
+
+	for( var sid in cbi_t )
+		for( var tid in cbi_t[sid] )
+		{
+			if( cbi_c[cbi_t[sid][tid].cid] == 0 ) {
+				cbi_t[sid][tid].tab.style.display = 'none';
+			}
+			else if( cbi_t[sid][tid].tab && cbi_t[sid][tid].tab.style.display == 'none' ) {
+				cbi_t[sid][tid].tab.style.display = '';
+
+				var t = cbi_t[sid][tid].tab;
+				t.className += ' cbi-tab-highlighted';
+				hl_tabs.push(t);
+			}
+
+			cbi_tag_last(cbi_t[sid][tid].container);
+			updated = true;
+		}
+
+	if( hl_tabs.length > 0 )
+		window.setTimeout(function() {
+			for( var i = 0; i < hl_tabs.length; i++ )
+				hl_tabs[i].className = hl_tabs[i].className.replace(/ cbi-tab-highlighted/g, '');
+		}, 750);
+
+	return updated;
+}
+
+
+function cbi_validate_form(form, errmsg)
+{
+	/* if triggered by a section removal or addition, don't validate */
+	if( form.cbi_state == 'add-section' || form.cbi_state == 'del-section' )
+		return true;
+
+	if( form.cbi_validators )
+	{
+		for( var i = 0; i < form.cbi_validators.length; i++ )
+		{
+			var validator = form.cbi_validators[i];
+			if( !validator() && errmsg )
+			{
+				alert(errmsg);
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+function cbi_validate_reset(form)
+{
+	window.setTimeout(
+		function() { cbi_validate_form(form, null) }, 100
+	);
+
+	return true;
+}
+
+function cbi_validate_compile(code)
+{
+	var pos = 0;
+	var esc = false;
+	var depth = 0;
+	var stack = [ ];
+
+	code += ',';
+
+	for (var i = 0; i < code.length; i++)
+	{
+		if (esc)
+		{
+			esc = false;
+			continue;
+		}
+
+		switch (code.charCodeAt(i))
+		{
+		case 92:
+			esc = true;
+			break;
+
+		case 40:
+		case 44:
+			if (depth <= 0)
+			{
+				if (pos < i)
+				{
+					var label = code.substring(pos, i);
+						label = label.replace(/\\(.)/g, '$1');
+						label = label.replace(/^[ \t]+/g, '');
+						label = label.replace(/[ \t]+$/g, '');
+
+					if (label && !isNaN(label))
+					{
+						stack.push(parseFloat(label));
+					}
+					else if (label.match(/^(['"]).*\1$/))
+					{
+						stack.push(label.replace(/^(['"])(.*)\1$/, '$2'));
+					}
+					else if (typeof cbi_validators[label] == 'function')
+					{
+						stack.push(cbi_validators[label]);
+						stack.push(null);
+					}
+					else
+					{
+						throw "Syntax error, unhandled token '"+label+"'";
+					}
+				}
+				pos = i+1;
+			}
+			depth += (code.charCodeAt(i) == 40);
+			break;
+
+		case 41:
+			if (--depth <= 0)
+			{
+				if (typeof stack[stack.length-2] != 'function')
+					throw "Syntax error, argument list follows non-function";
+
+				stack[stack.length-1] =
+					arguments.callee(code.substring(pos, i));
+
+				pos = i+1;
+			}
+			break;
+		}
+	}
+
+	return stack;
+}
+
+function cbi_validate_field(cbid, optional, type)
+{
+	var field = (typeof cbid == "string") ? document.getElementById(cbid) : cbid;
+	var vstack; try { vstack = cbi_validate_compile(type); } catch(e) { };
+
+	if (field && vstack && typeof vstack[0] == "function")
+	{
+		var validator = function()
+		{
+			// is not detached
+			if( field.form )
+			{
+				field.className = field.className.replace(/ cbi-input-invalid/g, '');
+
+				// validate value
+				var value = (field.options && field.options.selectedIndex > -1)
+					? field.options[field.options.selectedIndex].value : field.value;
+
+				if (!(((value.length == 0) && optional) || vstack[0].apply(value, vstack[1])))
+				{
+					// invalid
+					field.className += ' cbi-input-invalid';
+					return false;
+				}
+			}
+
+			return true;
+		};
+
+		if( ! field.form.cbi_validators )
+			field.form.cbi_validators = [ ];
+
+		field.form.cbi_validators.push(validator);
+
+		cbi_bind(field, "blur",  validator);
+		cbi_bind(field, "keyup", validator);
+
+		if (field.nodeName == 'SELECT')
+		{
+			cbi_bind(field, "change", validator);
+			cbi_bind(field, "click",  validator);
+		}
+
+		field.setAttribute("cbi_validate", validator);
+		field.setAttribute("cbi_datatype", type);
+		field.setAttribute("cbi_optional", (!!optional).toString());
+
+		validator();
+
+		var fcbox = document.getElementById('cbi.combobox.' + field.id);
+		if (fcbox)
+			cbi_validate_field(fcbox, optional, type);
+	}
+}
+
+function cbi_row_swap(elem, up, store)
+{
+	var tr = elem.parentNode;
+	while (tr && tr.nodeName.toLowerCase() != 'tr')
+		tr = tr.parentNode;
+
+	if (!tr)
+		return false;
+
+	var table = tr.parentNode;
+	while (table && table.nodeName.toLowerCase() != 'table')
+		table = table.parentNode;
+
+	if (!table)
+		return false;
+
+	var s = up ? 3 : 2;
+	var e = up ? table.rows.length : table.rows.length - 1;
+
+	for (var idx = s; idx < e; idx++)
+	{
+		if (table.rows[idx] == tr)
+		{
+			if (up)
+				tr.parentNode.insertBefore(table.rows[idx], table.rows[idx-1]);
+			else
+				tr.parentNode.insertBefore(table.rows[idx+1], table.rows[idx]);
+
+			break;
+		}
+	}
+
+	var ids = [ ];
+	for (idx = 2; idx < table.rows.length; idx++)
+	{
+		table.rows[idx].className = table.rows[idx].className.replace(
+			/cbi-rowstyle-[12]/, 'cbi-rowstyle-' + (1 + (idx % 2))
+		);
+
+		if (table.rows[idx].id && table.rows[idx].id.match(/-([^\-]+)$/) )
+			ids.push(RegExp.$1);
+	}
+
+	var input = document.getElementById(store);
+	if (input)
+		input.value = ids.join(' ');
+
+	return false;
+}
+
+function cbi_tag_last(container)
+{
+	var last;
+
+	for (var i = 0; i < container.childNodes.length; i++)
+	{
+		var c = container.childNodes[i];
+		if (c.nodeType == 1 && c.nodeName.toLowerCase() == 'div')
+		{
+			c.className = c.className.replace(/ cbi-value-last$/, '');
+			last = c;
+		}
+	}
+
+	if (last)
+	{
+		last.className += ' cbi-value-last';
+	}
+}
+
+String.prototype.serialize = function()
+{
+	var o = this;
+	switch(typeof(o))
+	{
+		case 'object':
+			// null
+			if( o == null )
+			{
+				return 'null';
+			}
+
+			// array
+			else if( o.length )
+			{
+				var i, s = '';
+
+				for( var i = 0; i < o.length; i++ )
+					s += (s ? ', ' : '') + String.serialize(o[i]);
+
+				return '[ ' + s + ' ]';
+			}
+
+			// object
+			else
+			{
+				var k, s = '';
+
+				for( k in o )
+					s += (s ? ', ' : '') + k + ': ' + String.serialize(o[k]);
+
+				return '{ ' + s + ' }';
+			}
+
+			break;
+
+		case 'string':
+			// complex string
+			if( o.match(/[^a-zA-Z0-9_,.: -]/) )
+				return 'decodeURIComponent("' + encodeURIComponent(o) + '")';
+
+			// simple string
+			else
+				return '"' + o + '"';
+
+			break;
+
+		default:
+			return o.toString();
+	}
+}
+
+String.prototype.format = function()
+{
+	if (!RegExp)
+		return;
+
+	var html_esc = [/&/g, '&#38;', /"/g, '&#34;', /'/g, '&#39;', /</g, '&#60;', />/g, '&#62;'];
+	var quot_esc = [/"/g, '&#34;', /'/g, '&#39;'];
+
+	function esc(s, r) {
+		for( var i = 0; i < r.length; i += 2 )
+			s = s.replace(r[i], r[i+1]);
+		return s;
+	}
+
+	var str = this;
+	var out = '';
+	var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t|m))/;
+	var a = b = [], numSubstitutions = 0, numMatches = 0;
+
+	while( a = re.exec(str) )
+	{
+		var m = a[1];
+		var leftpart = a[2], pPad = a[3], pJustify = a[4], pMinLength = a[5];
+		var pPrecision = a[6], pType = a[7];
+
+		numMatches++;
+
+		if (pType == '%')
+		{
+			subst = '%';
+		}
+		else
+		{
+			if (numSubstitutions < arguments.length)
+			{
+				var param = arguments[numSubstitutions++];
+
+				var pad = '';
+				if (pPad && pPad.substr(0,1) == "'")
+					pad = leftpart.substr(1,1);
+				else if (pPad)
+					pad = pPad;
+
+				var justifyRight = true;
+				if (pJustify && pJustify === "-")
+					justifyRight = false;
+
+				var minLength = -1;
+				if (pMinLength)
+					minLength = parseInt(pMinLength);
+
+				var precision = -1;
+				if (pPrecision && pType == 'f')
+					precision = parseInt(pPrecision.substring(1));
+
+				var subst = param;
+
+				switch(pType)
+				{
+					case 'b':
+						subst = (parseInt(param) || 0).toString(2);
+						break;
+
+					case 'c':
+						subst = String.fromCharCode(parseInt(param) || 0);
+						break;
+
+					case 'd':
+						subst = (parseInt(param) || 0);
+						break;
+
+					case 'u':
+						subst = Math.abs(parseInt(param) || 0);
+						break;
+
+					case 'f':
+						subst = (precision > -1)
+							? ((parseFloat(param) || 0.0)).toFixed(precision)
+							: (parseFloat(param) || 0.0);
+						break;
+
+					case 'o':
+						subst = (parseInt(param) || 0).toString(8);
+						break;
+
+					case 's':
+						subst = param;
+						break;
+
+					case 'x':
+						subst = ('' + (parseInt(param) || 0).toString(16)).toLowerCase();
+						break;
+
+					case 'X':
+						subst = ('' + (parseInt(param) || 0).toString(16)).toUpperCase();
+						break;
+
+					case 'h':
+						subst = esc(param, html_esc);
+						break;
+
+					case 'q':
+						subst = esc(param, quot_esc);
+						break;
+
+					case 'j':
+						subst = String.serialize(param);
+						break;
+
+					case 't':
+						var td = 0;
+						var th = 0;
+						var tm = 0;
+						var ts = (param || 0);
+
+						if (ts > 60) {
+							tm = Math.floor(ts / 60);
+							ts = (ts % 60);
+						}
+
+						if (tm > 60) {
+							th = Math.floor(tm / 60);
+							tm = (tm % 60);
+						}
+
+						if (th > 24) {
+							td = Math.floor(th / 24);
+							th = (th % 24);
+						}
+
+						subst = (td > 0)
+							? String.format('%dd %dh %dm %ds', td, th, tm, ts)
+							: String.format('%dh %dm %ds', th, tm, ts);
+
+						break;
+
+					case 'm':
+						var mf = pMinLength ? parseInt(pMinLength) : 1000;
+						var pr = pPrecision ? Math.floor(10*parseFloat('0'+pPrecision)) : 2;
+
+						var i = 0;
+						var val = parseFloat(param || 0);
+						var units = [ '', 'K', 'M', 'G', 'T', 'P', 'E' ];
+
+						for (i = 0; (i < units.length) && (val > mf); i++)
+							val /= mf;
+
+						subst = val.toFixed(pr) + ' ' + units[i];
+						break;
+				}
+			}
+		}
+
+		out += leftpart + subst;
+		str = str.substr(m.length);
+	}
+
+	return out + str;
+}
+
+String.prototype.nobr = function()
+{
+	return this.replace(/[\s\n]+/g, '&#160;');
+}
+
+String.serialize = function()
+{
+	var a = [ ];
+	for (var i = 1; i < arguments.length; i++)
+		a.push(arguments[i]);
+	return ''.serialize.apply(arguments[0], a);
+}
+
+String.format = function()
+{
+	var a = [ ];
+	for (var i = 1; i < arguments.length; i++)
+		a.push(arguments[i]);
+	return ''.format.apply(arguments[0], a);
+}
+
+String.nobr = function()
+{
+	var a = [ ];
+	for (var i = 1; i < arguments.length; i++)
+		a.push(arguments[i]);
+	return ''.nobr.apply(arguments[0], a);
+}
diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/add.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/add.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0888abf85ed10d3bdadb25b30b49e8c35b8233d9
GIT binary patch
literal 378
zcmZ?wbhEHb6krfwxT?YM=;a5`&}?V#n2z-)rk?s^=Nj6%`^~-Q?==mbXC1h9`pm_a
zJ=P67ET*3H=saLQ{j_)8HuL@?E|ZSCPdMs&_4bo#r@XE{|4_Brxch*^ymP;U605@t
zCcgRjt!Rzz)3;yCrf*qt@%P5-e?EQtb>RNr-FN=3zVdt9tv~<4fPor7@h1x-1A_*G
z4#+T&pBUJtADCR=A+xAY{q)Mqma1&c{a=cmxa4~mroT4KS#`Qg<xxi8Ii=?C8#5Ec
z1dKaXR%LheoGx%Nn(3re?&qCWQ>Uof=)~+&T;I{j*sYXaTd%6BpddF%U0!DD^qC5h
za!gM1`zFkilw?>wPi9)j8Wt9I))h*%tJiLm*{Loqq9hZ|aDstdhKpl`^aUv?Mn)zk
OR#uKC*E=qb4Aua>fQ#$^

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/apply.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/apply.gif
new file mode 100644
index 0000000000000000000000000000000000000000..82ae7ed821f7524c0356e40f79a0379fc634d535
GIT binary patch
literal 268
zcmV+n0rUPxNk%w1VGsZi0K^{vM3g9B!ajxBR(;h{C|4L|#z9W1FZTQNam`88@5?V|
z96pC8chOCN)>Mw(T#DRUiQ8Fv(@#mEENRI^ZOca`PZo5~OEz>Nz2>iuw1BeWp~dOA
zBTN<S_~`%t|NsC0A^8LW0018VEC2ui01yBW000Gv;P-iCX?mjQ8Eh*_0I;B=ksV#G
zcZYVNtAoSwfCw6c2qU2Y8ahOyAjz<72+mGX;Ato=h$~Rik&>zi%BC{z2#%%nWDQ(&
zkP#APQYdIRbsbb52orn(e?S)<Uuk^-h=3ys2WWc*kO3Hy9ts%=8=)H-q!<~JBLo$z
S9IdXXDkmo?w6(S$Apkp4rEE6<

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/arrow.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10d797e9b0d7c0fb0cb3e13c4e7a11508161f230
GIT binary patch
literal 135
zcmV;20C@jLNk%w1VG95Y0J9DNRb+aCjh(Q!!P3^;^!4^&ZiAVkucWNFY<Z06>g~J1
z%8r<(-QeVRgO&gP{{R30A^8LW000gEEC2ui01E&M06+vZ(8)=q0AK`A2tAn4V1q?&
p9d!Z1mQ}E{1V<7C3PltEGGGP@1A|xv9lPESaCFRSx11yb06WwgHGu#C

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/down.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/down.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f0bb6a4ea640d9b2beda344c7485d260f5761779
GIT binary patch
literal 131
zcmZ?wbhEHb6krfw*v!o^>1^DDBbk%W#`m8Mo^~Z-=JluvXG6M=M%Jv0O73_44+acK
zK=CIFBLf3BgAPaxWCjC^LBUDS)q5?HkM0ihoS_kK#PIl-D%-2j1P>Oa%ti-AnU~WT
VI^xvQF6&qvTT*m#iwgsTH2{W9F7W^W

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/download.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/download.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f99a5383b23fc4270a45048cea54b7d84e4c632b
GIT binary patch
literal 189
zcmZ?wbhEHb6krfw*v!umwaLqI!OQM5F>k&<yZm;~h1b8h;*QR~(zECJ#wpt$FTb`}
zVWvQGzpFsbrT<`{_>+Z^fq|bvhXDvcW-zd1eeis_YHo#<8bh&USm7b|HfiTo^1C<-
zB2&*9?YY;WqkfgAr7?@)##fnMrp5vd5e9?B>jf-W))_Q3ne(cwV{E9XUS-Jmz%6-U
ohKzU%--1K~l{<@Algzi@uNL9X;o>Z>(Bsa^YtS>66lAal0Is`BfB*mh

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/edit.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7b02b6e72a8d3b7f8add18f94fdd25e6d705ddac
GIT binary patch
literal 280
zcmV+z0q6clNk%w1VGsZi0K@<QV0V>>ugJjP{dk$T<m~mR)BMKa{Yh18^Y;0&*!)yw
ze(mw~oXz{?^8U2Z;6qDX-tYd@<nWol)#>r~sLS5q=<g{pLq0`Sy@>$-yaxZ#SE11S
zRIB!<(fT-LmH+?$A^8LV00000EC2ui01yBW000G*;3tk`DMpS%Nm39Du;)pl6A@EB
z5xm!Np4!AfBnlcnph84J6a~km2eJG}oCYZJ=Ydc~*KCvvDSSTxgcd_Cm=B`#5u?d;
z3!M!C{uwM9bQu_Bd3p~bei3zpcpDoG6^DHb2?~}900Ru06&HvI2?=-w0|2G~3!WbU
e5ePdx1QoIi4i<=*mj?$A4;L2}RVKnBApko)oOWvf

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif
new file mode 100644
index 0000000000000000000000000000000000000000..431ff64d1f07ea8368ff38ac49941794a3fdd849
GIT binary patch
literal 379
zcmZ?wbhEHb6krfwxXQrr|GeMpEk^&ppZIqp{q-#2*GpypKk@m0DeV7?)PKK@zCNA$
z`dro2lOEGfdA01Zo^;&3Zkzdpqptt|eeXPA|NqbH{v$3`n~kTR_U=C5@c+lT*LU_b
z?6CO%>(2l8{r~^I{r|G{^@*_mA7}snwCwdU*P=DL|Gypj|E%Km1>^spH~#;&>;M1%
z43q)IpDbVlbU-A?PYi4`9Htg{=x~{833+Y}XmD73G1F_0L0j|T!~?dRp1tm=n^<O?
zWzRQiDs-5(tm4mNu{@o_L0SEeR)~9gGgWD7XeiY=aS4eyRkbN8Dat52DabK3x3()P
z%5pMJlT+=VBP*|_xll`aam}RVY8;BI*Y<B%!NDfa>ZC5We%>aw-FvmvIpt(dOEPIJ
XU%@iXKOm5ik(HI@w%c77M+R#EbrzH@

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/file.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/file.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3b1217dd654c6959b4dd97fad83ef626186aac32
GIT binary patch
literal 371
zcmZ?wbhEHb6krfwSgOwO=;a5`&}?V#n2z-)rk?s^=Nj6%`^~-Q?==mbXC1h9`pm_a
zJ=P67ET*3H=saLQ{j_)8HuL@?E|ZSCPdMs&_4bo#r@XE{|4_Brxch*^ymP;U605@t
zCcgRjt!Rzz)3;yCrf*qt@%P5-e?EQtb>RNr-FN=3zVdt9tv~;%2NZv@FfuUMGw3h?
z0mx4bY!ePlF7S}~*Qf5ia!Ljt+x!>LTXZ6AWOA+@HqBYFd{VlL+GG#qi3hcPI!-;^
zoUtx*|HG8YnkuX2->FckQdF&VVlG!suWo5&Z0~ILR#1@ZSC>~xZ|a>QDaYg_FVj6&
zK~j=o;fy7d=CQD_vo4xdJ$c0jna%3bB1+K=2N~F9xHuL`pOlhfWMpDuW#y=Iz3Sq~
GU=08%rO(X(

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/find.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/find.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9ae5e3489bb888d198eb923bb095b48b04403705
GIT binary patch
literal 273
zcmV+s0q*`sNk%w1VGsZi0K^{vc9*og-TcMk{nhCBh_A@i+vHYljktnV?e+bOcW6yp
zbLH*z_4)kq_4;Q^Gl{$GpO1s<@%ZNQ{aZUCuG8g1OkMl^{;_vPn!whm%ie)&TX<hf
zvDo~u(c}OB|NsC0A^8LW0018VEC2ui01yBW000G!peK&x_?_NBbs2^c1Rw(zN)1bt
z>r4L_o{y)q5EzYtB;xTCWf;e!643y9FwiJ6z-cH%*eE2C&?LHF520~{Ks*+N*(+Kf
z6ATMOGH`g(00>C|cno`e9u*=05rZ2M2z-c&9*lzt8<GbTiHi(L92^=Bq!SmMA_fHw
XJSC>600y!Ov<els9;PL`yCDEOn8SHN

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/folder.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..22b583bb59d0ce46153152c18a33219a0b7c2944
GIT binary patch
literal 698
zcmV;r0!95tNk%w1VGsZi0LFR%5=C(rN^}@XbQnr?8A@~+OLZAbb{|oDB~^bgUx+wp
zk~?aWKWvgjZIMB7nn7`!LUEZwahgMNnnZG%P?O73md<9Byj7UcR+-RPo6=aE(`}i-
zTAkEeoz+~P)?J|2UZB`sq1a!d*<hpEVWit)q}yYq++?NQWTxF^r`~3$-e#!ZXQ|+5
zs^Dm=;c2VlX{_UFtmA5}<7=(tY_8;NuH|j7<!-O$Zm{NWvFC8H=Ww#<akJ@`t-*4%
z>2kE{g|XOkwd;Ab>T|a1bhhkywd#Ad>UFp6cDL<(x9okm?0&fIc)IU+y6}9u?s>cL
zfV%E`yz-8@;ex#Gf4%XLy5fSp@qxbce!umEzVU^>^M=3jgu(QP!1I*9=ZV7fhQs%Y
z!}W;8`Hsf-i^%(t$N7xO{E^A|kjnj(%lw$n{+-VKn$iE9(f_H_`l{6Xr`i9>)!(q%
z|FPQtvD^Q);Q!Lx<?izJ{{H^||Nl>t%1@HYPm;<{lFCn#%1@HYA^uK7a%Ew3Wn>^?
zc_2$=c4=-POmAarWh@{vFflPLFf%PMG$3Ygav)4~LrE?mAW~&)Wnpt=WFTp7bZ;PZ
zXk{Q!bz*F3V<1FtZDDC{E&w6<1OW;Fe*i210000G01yBG2gQJYf`f#Ge|UL`iiU%E
z4Fdv^0C9|ec>{8Eb8>YId5n1ib8n<>Ks|P;sdtD5UQ)1C8wn8(4i5?li3bZ45)%*>
zXk1rRPHh5-0dQtyVqi@~J~=fnVacIvSW!$zKRPxsEGSyo0%}i4K|41xEh!};Rs@Lx
zX+u0XGcGD7A|D)}m^+h$#)}mvMu6y$;erx+p~k=%M<Rp=4Hzm=C<3v-nlD|pWSIhG
gNfIMM$`nY{pg^RT0tm<?P@q8`M2d3iycq}pJC$!+6aWAK

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/help.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/help.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9dfa0e196aba9bf0dd70074ccdb980d07de9e903
GIT binary patch
literal 266
zcmV+l0rmbzNk%w1VGsZi0K^{vX}bO=Q+JG$m|w5)cDL-S*7{tb+@Z<qW~$>?p4qk8
z_sQn}X|3gLf|Hfa{4HFBMq+vzJXv+X|6!-#{r&xKvgu!?-l)&;*zNvYc8feuU~I4F
zQ<~I5R%ieJ|NsC0A^8LW0018VEC2ui01yBW000Gt;3s}wX?kNyLPFa#5UP3^wk(CC
zKe9+;gdm|(VMuts4zO}DT@VOK1m)={2pi9Zf$&VC9jdjm*+RV&K$v9RFu0|I!2+1F
z6;Q;%BcIpB1z!^u289U*e{2p3gL?-F2^@(e8U&FXn3w<oJ(L6h1EB+(9uzYg4-WwW
Q4^yTpBqt@Xw6!4sJBdwm?EnA(

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/key.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/key.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e3853e5afd54d40a853e4cb7934917316f073e7d
GIT binary patch
literal 230
zcmZ?wbhEHb6krfwI3mt)cB=6G?XEvwEV;5k@%#*tlih-MHikVr5_NB*)q`F6Z*J|r
zvPAsmO8wiLbI(i?dbrK;$sVs`?flOVdj0+R=-Z?2x2F^Tg8>5$p!k!8k%2*+K?fuc
zvXg-|`GIQRqSUCAs4#&;3tm~By~MCQ%rwwORo7gy-yy?BWny%m`4$Z=kEQF}JtY=+
zUfLA?(#?Ar^XBeQKBmcC4v)^p`DK_cQ206RTqffIk;3UrB1Hyj7R*hC%3_Rs)g7Jc
Jeaeaq)&Qp@T0Z~)

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/link.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/link.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f0bb78da6b1e2cb17aa1a0e21c80e02979f6321a
GIT binary patch
literal 279
zcmV+y0qFimNk%w1VGsZi0K^{vm&^Qekgn|U_T}yMiLlDm+vLaN{=MG)S8$O@RcrG0
z`m5CYWS!x)+5Dr>`-!{kQek_q(&TBN;zLVZ)#vbFn&Fzj)~L(g-skTrF+)B@RpROJ
ze4)L|%+de<|NsC0A^8LW0018VEC2ui01yBW000G)peK&x_?;dVMVDm}1jhw|hep&O
z==<P52%9G|Fc^)8q~ZY-T@*({QmIftL>8z~GHrORSgnM6@HQ4;4*@!6xGR+fIw4vg
zByI*g?ikQL90EyhXA2I80}~>FNeyv^hX5Oj9sz=0a*zN37#bo03T1_nn*yF52n7l~
d8?74{0v#Ej2(=Ip2?-Mu8X6f_CBY>j06X7qcdP&a

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/reload.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/reload.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8268958a19e016741fffb8309b1174e548f5ce19
GIT binary patch
literal 248
zcmV<U00;j^Nk%w1VGsZi0K^{vx#E*%mqPyj{nPHZz2%j++Lf)#nQov-YMn!8m_%xt
zNVnXRp1g^Q)Ii?y%wCZ^wAYo0)IY`WnTOCow%C`5(LiXLLc{Ku*7Cc#;FQzzu(jBg
z{{H?@hb#a8|NsC0A^8LW0018VEC2ui01yBW000Gb;3tk=>51h?dP)!|<#Vc>gJ1)O
z9Y&Xm98YHe08|<ajBi%zFgj4mBtr0UfI^F@b0K7wq=Y93ErU(ywCU3{TRq}cM{|)Z
yJr*lUD2YrcWluj%5(^C#MG!s$as~$l1sf0w4p%B3GAu4IGnY(jDxspIApkq&UTtpx

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/remove.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/remove.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bf43a0a0bc63494a69a63fe5d0fef5b683be221d
GIT binary patch
literal 385
zcmZ?wbhEHb6krfwxT?gk?be@1FF$yOW;=VwbgVxy_0*pO_y5|thVH)ew{!QK(`PQu
zI&kgY^Y@yD&g(8ez54vahKr9^oW6JU_LF(%eg`F1hZjuTc>T}nE5Daq{Qc(Rx3cM5
zjz9kQ*3j_j+pnL#{d)WH+j&{p|6ssC8=&};g^__li9rWsJjhQBZ1WCGDDaT!>RZ^(
zEEK83!O|Nd>|`Z3*C*`uOEs;l0!ub)PUp?=f27@0VfU<`vGKzV%|l1oS?<>Z^@_<=
zC~_&t)O6G|iMKeh$aQzhi;0Q%F-^$to;pK9LUxv-l;q?Z@dd)N%uel7=1K?)Gp=1y
z$56M4m6eCxNh-frev|MX$^D9=LUJ*T=NWk<xp)tVUKbHzVq#`yXXkBoeeB}MU=0BC
CGJ~i9

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/reset.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/reset.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c941c19028c479d4a27a7ee04d6e0e66b6bce599
GIT binary patch
literal 258
zcmZ?wbhEHb6krfwI3myRx}@ZPMa9G9<ZoNH{6Bf}V|@IdsZ;+gTQ)g2_g_|4rMmj{
z(9maDS@+`NX7u!ASy;5{>sPtC-3SYNk)IzaCG{5wQd4hOTmQRpBi`QrZFzZjOw5(w
z;B+Ua|6ri_lZBCiL7qW}0SG{LGO*S^P_K*2tV;HB^Xpa+Tva9QCeXgnd6P%76fc9p
zOamsHcy<jHDaj@V)~7Fd+U7kvs@!3>;@YDln|Vuw<0nl$s8=rCxw48uw_56lMa6}$
zEFa1XibC1A+uFH>WUA~WrMhG$PUPgWRp}FBoy96PRn(YYfNQZp@O&*5b=4JX)+#bs
F0{{l~XioqD

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/save.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/save.gif
new file mode 100644
index 0000000000000000000000000000000000000000..35e949963e4b7a5f04fd1c8932a980901e3d4385
GIT binary patch
literal 263
zcmV+i0r>t$Nk%w1VGsZi0K^{vcEd+Ya4xgmmXXkDk(iA6{P)e~xr@?RgUwTMzeLpS
z#Wq<Qev@rdf-IBfSBd0I?DyrU<#)p7sa<+Te$_{S%TJ8uP)uMvaf@7w&S0e4cYxVQ
zX}CU8XF~t~|NsC0A^8LW0018VEC2ui01yBW000Gq;3s}wX?kNyPDINv6RLWcVMtLP
zHL^$>hu{H$s5p4O4v<)^3=A2^0_EulhRp%QGjIf`R%Ru$RUj;1k~O1%3=|$g0$`b{
z1p`T8E1%cF0ssJ7eF+H<c2yc2f`*119DhC+2MLgu91m$D9+VFhpc|SV1v3{7sHjst
NDJLc>u(2Z{06R}5X@39!

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/up.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/up.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e8234178efaea626368f6bb5fffaa716e862b596
GIT binary patch
literal 130
zcmZ?wbhEHb6krfw*v!o^>1^DDBbk%W#`m8Mo^~Z-=JluvXG6M=M%Jv0O73_44+acK
zK=CIFBLf3BgAPaxWCjC^e!)r4)q5>o$4-6JJxOK08WYFNxvd2&rdbFb<OrUZ!LX#g
UlR55X`tH~w%Lzq0I~f?P0f*=?AOHXW

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/user.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/cbi/user.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dcb5c2a899c84ee0be36e6b92222cdde6fbb8ad3
GIT binary patch
literal 246
zcmV<S015v`Nk%w1VGsZi0K^{vRe+{&p2Z$9Q&fPZqIXJAd7&shX0w%ZEk|)gXp{2j
z-Xk_#@8Z@{e4}TTyG?bS$(wa2JY~+MgN?P=HdBBuM{;O)f5Vh$I97wPc14L{GU?aG
zs?hR&tkwVj|NsC0A^8LW0018VEC2ui01yBW000GZ;3tk=>5VArX{>gpqy}ZQ3xBIb
z?{>Ooo8TtXQxO=NV3P1sT@;64^wK0*F2c<PQ^f%|n2UG|ZhF3*4rYz%OgM<wnUk(}
w9Dz<mKHwDSX#pGt9RhrQfE|K_h9nJt9FdU=jVc}w2^bU=dtD?ZB`F~QJA~0^RR910

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/bridge.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/bridge.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c163bf692da13973a1e6b55498c42802e190722
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~
z10N#j&C1UJ00PEIL_t(I%bk;JNYh~y#((d-F*niX1tLszR(8W|B?YCk((V>f1Q|y3
zp$i02mPJJ$qUfew?1}~@LD3yCltolT>eT3_E$!mUnvQN%+su`^|J#SI1SRzQbl^E~
zIOjYM{DZxP1@wgIsiEY=v1q5WVKvbCha^p=(8eAo<gHt^L;Z!?I)~D4-m)n_W5T4h
z!C(+6B|0hT>h3~HiQD}WM@{uIP&76*Qm}U)H!CaIlfR3}lP4-oQ$qUu{!g~FbZqHq
zg!eL2cl!?G$7L|wYQ<vdM^Fn&5IAaTak-u|FmVt&b`}t73=;r)@%;=ZPo8G~!9$qM
zX3m{IPi<8-nx-Ly1i<U{6WiN|P8T3CKK$p3`X7Z-lA!~1gc!T&_!RhdVIgSqc(B_m
zShR2f+1Yc6ii)PVxQNf49SRV7Q>cmZic3WFGLbbam-co)ZEbC61OY|=g#P-Lmo21>
zO2%k3aP`_{r3Jf%(GV(x6v&492P7o)BQ-S*t91yO8R>+D8S(l)C?O<W9dFA($FQk+
z*stGH(NU4Y-P+3fjd|-zOD`_ar`b}&Z`D;(|M&%SXU|lg)_M#EgLu-^EMBxUbGT^4
zo185%WG`KdZTv`abl(QfoH;k;mFLx!pGL}AQ>Y>=DasmWBGLR_Y~H&4;f-rIl1Mx-
zeD#`?`_J6(eBQgq4|MuHLI{0HRb`DUDLDyegA+1yFI?SFa$8MXx>J>vo>kLlPPGF>
zPcMvHd8A5BSaIqDp!?liSu>{n`a*0UbEdC7aMAwAl50OY&kYber)cDu<oNuKKqoD)
z1F1kTYQR|DH#-2RD7XL0f^A9h;P|+hrpU+$K7Z*ZBt!>F;PrmQ<#G>nlq`Qbdf6#%
z73cgjOfoKOTUOtgKG`1wIKTK_KYDg)V;P{$$U9B>?)iTYizR*We`!DX3M}L-Bi}*(
Qv;Y7A07*qoM6N<$g7Ut8z5oCK

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f367c5369f83e65b1f95bfa86e2ce3e4254984a
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~1Pc#_
z^H*vB00D_fL_t(2&wY_WNRwe4#((eY=eEyqwL%1uF*mw-SW%a9A=$c2LcMq@nS@9L
z)geZQ4kKcRA+k=AP#r1|4~r1I%pDr)!h=|f?69bPH7_CG+Qv58d^;?I?a*`kKmXt5
zc^+udJna(g#;fk#aq7okJ*Tw;dlS){{{TKpEj)d7rcswjej_ouH$&9->vN=t;#WsP
z7OO+1&$OFc=CFCrbR9MXY>?$F5p)3>z#E=%l4aIWNZ=Pebl?R30tyc{%7EYptK4Fe
zGb~V3LTFvAU}uaHc@zqF$2WBW8wu6G+9`zG!Odm7jBtX2lCqM<>L;mAi|<{J7UL1k
zr>9khab;kU8OK+Bq3~GV)`pq4Ej`F@gMj<%&O;Xt%ad&KPX9pYtzmq6UlcNtIv8XZ
z?mm5<nEnt?2f}czC$=%Wglv{H+Dy@VzO?pv@x@OFc)Y=i<=`PlZoU93&9<ldUGGj+
zYZa?iiGrTJ@j4&mW!qTd`o+F0<y^^FO{4A+YaQp(e=dMO75#;AG%NU{00000NkvXX
Hu0mjf^9SCN

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/encryption.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/encryption.png
new file mode 100644
index 0000000000000000000000000000000000000000..41d2ba9ace8332dab6b216749cbc48794f30b541
GIT binary patch
literal 1224
zcmV;(1ULJMP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru(+mU)D;wghWfK4Z0K#-d
zSad^gZEa<4bO0!0DIhX1FfbrWVQY0_ASX&`ZEay=Cm>UFWod3@ataDmXlZjGX>DO=
zWgvH9b0A}KWnpw>WFU2OX>MmAM`>+vE+9u~ZEzrIb0B7NWo009Z)S9NVRB_43Sn~~
zWMyV)Ze?U3VtF8RXk{Qqa%E*8Q*UN;cVTj6AVzO>Ze(F}X>V>IVQyp~X>%Z9c4293
zVPb4$3TAI|AY^ZMZftL1WFTR5AZT=Sa5^t9cXxL#XK8J4E^l&YMp_mN000ArNkl<Z
zc-qyKKWtl76vlt|J==8?sc!1D<X@3ei6JNxB1Hnm1_?DQ3lhqPM36dkfSrN8QYMBF
zv1iG`z|e|RA|*(Pm_iWHxM>pSPi@Ecd+)yc=P>xSAYoHSOkC-1SKoKO?>pxn_`e_3
z=erMq4}fbx4rl>w;7i~q!2XvazL=bx++SK+lKuUCIXF0w_4RdGUS4+PaybF+0>xg%
zhA#nMoS&b+yRx!!X>xLsdc95@$COGX#>U3f^z?M@<mBX5rBb;Je1Bdg@6XK4M73H?
zHa9nuxw*ODfeLUqJUo25u&`jZwzgz-bya3(XJg<qVDKEavs$TCWP5vCrlzJI0lxru
zfcJn;N~O}z3kwT+eSKXP7Z+`&;0BQI3%y(}H>%aDtgWpjzya_n@HTKA7y@ojOiUc@
z?(WLc(voEAZUO^;$I0~~7#<!jwA*c(%_cw!>;O-IDqw)`_V)Hnp-^CSWCY++W>N63
zZF==$aBp<{l{>MvynE|5PDgC~@Q{<*8Dm#VL`h1L8j6KHuT5NI{PmkO>J6T3Z=j<l
zJA3t&mf<5H0i;_XQv3Bj-Ycy2cxUiFC9WUgynRuX0Nz==(KsFBl9-Kezvkm_o&vl9
zYy)vui<Cfo`k1roW1KTM-A1Pg&RS3qr~nbcT7yd?Y^z2ZHSoxDh!Nnoo&?@I#APk*
zJ33WXdJqJl0+e`^QlJ7*3Z+7VzZ?&r+utK(K}0}=xOIk2Tj*3{t?eWj1c-ps5k|)p
zLWeU3=j9(r-7N}2f*?QzipwJ-q-l)RZM;bl0we&u$D2W%ZgW;W=$O+b(e4Vo!#ayi
zQyRwy7?Yrr81HPy9;FZgo5pw@Q^<9|b78JO0zna~kT92LX!JTJZDO>>IfDopfgovw
zHEmkeL&OWk!J%y4UPj<8-Xxf`P5tPUIEhK)2xkpSg^*JyFL;yUbwn=oc<%@c#eOpg
zkT6dWT;R(1t62sb?`>yL6(EAsZJdc|9zLZ|EMm-sJ~MC*!6D8NHJYS4?)1F1FWMEr
z8;#WwDwn4?P@;KS?`t0n&fFMyXF#=S9ao6YYDCRvB+X|eQ3De<u{y$Ajieec3LzkF
zHF)r7hadll9sm!sFmyM@w}7v*-{8FWKJYp4CUCLWP7Z-9z*si&`Ex8O2OI-?zzJY`
mZJ#g$E}UmWWhzW|Ex?~zd-znqXYv*R0000<MNUMnLSTZoE(Q(&

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2e05a425136b086a9962472f7e8c4a947c15c7c
GIT binary patch
literal 1197
zcmV;e1XBBnP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)CU|F3^0C?3i|*60K#-d
zSad^gZEa<4bO0!0DIhX1FfbrWVQY0_ASX&`ZEay=Cm>UFWod3@ataDmXlZjGX>DO=
zWgvH9b0A}KWnpw>WFU2OX>MmAM`>+vE+9u~ZEzrIb0B7NWo009Z)S9NVRB_43Sn~~
zWMyV)Ze?U3VtF8RXk{Qqa%E*8Q*UN;cVTj6AVzO>Ze(F}X>V>IVQyp~X>%Z9c4293
zVPb4$3TAI|AY^ZMZftL1WFTR5AZT=Sa5^t9cXxL#XK8J4E^l&YMp_mN000AQNkl<Z
zc-q~Sy-#FS7{-6+-aC8>!ZKtB7EN|qDvZQpV`4{)C6yJ~#s*?xWA9(Eg`uz*iQOg=
zBaMlLyGA6V8xw*J>=rKL06Pn_4D)gCoO?cAi<u>?QI^?Q`6MSf=M>L#@;vW(U-&=b
zLtq`K1K$JR0CWEp`Dgij{-97O$l>9k6pKY!TU&G4Y&HgNzY1Y^VgLEk($XjE>+7R8
zZ{DO<t1&t{%JlTKnw_1^RIAkwN~MwletZ?7_vh#5<I~eq+1c4?EiNwp2I$Gj$@22@
zvfkd_mW_=KSy)(TbS>-|-<C=x+1=fhxw*Nofg*4Vcz0}U?5CBLmAF_e%IfNB3f%3P
zJ)6zeDwT?CZEdxHN5Ff)AfSNxnVFgL{{Frc3Izdv?}a-6n3$O8Z?#%98Vvz7umiLK
z0UnggWq)#V!c;B?FxiVh1hBWacPF3EFLm#J0PN&oaA)eq^^gCo)QARN<LAvy5YJ$L
z=K9D`zZmPV&J%?J<0He2WT((tQ?DM88wq(>uH9`KZmSDoqre#8fC^wvAKk-yg|!~<
z4Bn?CwWm05q3fRj-dViSIGy0y2@k&el8?SR0C+39AW-kFb0~qN`j~p<G0qvBZlTjQ
z&RS3qr~nbcT7yetZ1a>fKEor=DRR+e{(0{ZXS)Xw)p<1vf*=4Dpv0q;0u_K#C>0WL
zZcG?m9+4m-AVSitW78%&)mUpg)e!`UfYUKXC-j95XAI8Eiy{9TR1gvb0V+_8<#MEH
zg4Hd&Nf81h0KCVWVVrJJuN-yEQCv*`@378d)0DI0BaCUI+X>#;jy*~t0ya(XI-xJ>
zkVhAci7q!t5vq_d$}m3l1}1G_w8lAu2wed|(im%6G%HUKFANNi1Enhnc#Ah}OxmLM
zv`W%WNRt?64N8R&DU=tyN%1-+3O(LC!oGp4W)L7@h9KzY+Ko568ECw>ohG0F5u9$}
zOhV(y0eu4l7}I~n44gx7h%>}z4N{$SYTnxOas}{4V|9#*G7Jp8PNQ1;$9eE~4A19>
zZVjmx&EpbD{gk-zjCSK0?f49nG_X3xTaBa|FA5<bX`XTamxuiNM|>aHylfJ^1ANi#
z2EDF(z^B05>Lt_e8ZZsyfJ_ff)B(ppSzTeIW`MpIzt2k{fC0>3SPSRhXB&uF00000
LNkvXXu0mjf2f71E

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/ethernet.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/ethernet.png
new file mode 100644
index 0000000000000000000000000000000000000000..a02538124c6a030579f90bc1c358947234593a63
GIT binary patch
literal 814
zcmV+}1JV46P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~
z10Wyhd#vIB00OQ_L_t(I%Y{>0NK{c2UFXh_V>XKA12Hr)wL(K`)UwouBFd}~F*S(n
zVIk$8KN@Cz2|@%xhA2{~P>B@1FeyTk=s~FoR$9KUrj28x&CDHj?m4@U8BI-V{T=o`
zYp=cb-VBRSQd*R?e_z^dAq18KV+=#XvN<a=$6vcRs3^*&?b{MzSF8kp5zUX%ECUI_
z{Qy9_1it_Pr>Zgnpw(!g_wt6yXJE70KrRJLxS6G;BoYY-!J%8>fu^QrghfUo|6Bn~
zV`dN$gy3NA++_#|oC|pBR^sC2GDNJ8LT{gpw{KnpAk6pY?-m&5ssO;zR2g3S830bG
z+!LI05D8b}e1go(3^X(}LSl?d8Vw{#f?cs9%1{l?Rd6nl5Wg9!ssfA_Dma^;hsqmO
z0D#Y5x{Wn8)v!!ha3C!e$tebqaD5PhLkJFH3k17xp`_?pX2y}-p`jtLDK_%;@nx0O
zmB`M?23OU&36k3-d0?3B+>ylQS{Rh&5f7aPs+b~&!-0W;KAKXdSZ`0C+YdH>k=Vds
zzw2Shs{;V+*|p_T@s(QIXgn@txrdsXA5%<h^lAJ9on37V<X(uxysGELx7w(*u7if;
zeo8SWHR3<mnp^48wYRYGYh28_@cZ{3HiX$9v`;wLWNYjD>j1Dey&_WYr8^Yl?;RK9
zr%%v%Xaj#vItIVV=7S$^=5}k73+_CMiw+IHdae4rVw$NJ#==A*XF|Gh^}9enZ-Z8n
zz!+dt9HvpT^~sNMWmRhOhW5elmIwgd>{wYd1qb-R=5T^YKqE;I1ei?b(T>hfEz`=c
z*8ZpEcL8pS&8-ax3HFIMTkMmsDso<)Dt`gCCgyOWcc|fnR-$p@&T-2~f7kej+7<xz
sKj#M+&eR7nz|*cwk9F0Zw9XFTH$uTo6x@&~b^rhX07*qoM6N<$g25bV+W-In

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bb02e455a39c5518426cf794dd6b108ba989d3f
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~10OML
zbBhrG00DqWL_t(2&sC2>NEC4x#ed(-*p6T<f+4JiQ0+1Wc`yhKN(qvPjvC4y_E>o6
z&?!Vj#G4S&Nw5w=1l|N8H3*Cd?9f3<Lqu~IcUfA}rra5oo&Vp%&bsTneeiqleNPBA
zdi(x}KBh(@yY8c;RXM$jUCPslt`aI}gHr$vB~e&35O9D-L@O|ALj!D<h%-b1jRMX9
ziU6B2uJDT$2!U!v=;`Hr2<vJ>KVT>mgCbpACBZF9D5RY5gehR7{f+v|L++pe6&8R6
zQ;baXb+#ROK~$z0JPk*Sgg<2V?Bi14v!ng`%}B*-NZJJ}#SH2Eyv*}f4$jR^4u7Z}
z{u6T*=oxTg9mZwz*{82FoY6i4Pp8}CbBjk?Uh&I&c+k>t^FqAIv7>GwGyX1TJs!P&
z>D6R@`L5IGJb%%2!&K;E_RqI%yL&quBPZhv%_T3Q>kLE7@15^I{PmBYag)(lV!!x$
y{UvhEX}xFuSO4;v)in;w3sa2}@!eS;Qk(#xxRU1SoOx3K0000<MNUMnLSTYLSJ)H)

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/loading.gif b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5bb90fd6a49107a321c35b9cee4a7b810314b51f
GIT binary patch
literal 1787
zcmZXTYfw{X9>&iJhvXcHF*h)T1OnEW1i^?zgDfop1p?usL<AaZh+-&$2EttwaxsAf
z5io^RBQ=UPTxzXY7jdwOT$Up2+E!WCUNl|`3%bncxazX5dz|geGP@t%d1u}a@9+1Y
z=l>*#<AssAEPw^{0l?e0Z~OZC78e(%rl#C(_p@iu1_lN+8cjq*1PFru{{F+m!|m<u
zZ{EC-N~Hh*1ikf6-6GA16Qyqn5951)@19;mo}TEv20iGfEC7IJh+|@Ia_`*a=SfKd
z;wfLo_A}d(i59AzLpaB#xaoXB$l7m<6sl#_$A|Fi{4m(4_dM6dfwl{Pn1}o`F)m*&
zA{_uhD0qFbR4^d>PMGT;HQkSO{q6FlJyb$PWkPf|h*eTST}7h8z$}MF(XD(aQ)ZLZ
zM?v0rT<1C4XHn<6PbNA{XL@>1^)apdD_@tcYDrW#m`k#MmslI7p^P;Az74wGs`!SI
zLs$GEZHsafXsu1i-WleMzAL(yw$-LK{0hv;6hrx8kx!!4$``dAyBnY9Jz&DqJo2$A
z!(L$H=Kq<U2CP75FF|MT@e<58P`hz`4Hm_=#Mb<=9UbJeyuy7Fb|`nwzAh9;D7O{?
zO}<<l%|Y%=xj9nmkWCJ`4L7#!F*k^Mn2A_;qJ_*d!t;~Pr{)8r#*1$pzbrn4u%J#~
z3uyI6YBdcy!?EU;*5e7)2TA{p;9VX}fbg4!GDa}Jj8T&9Ownx(;ymVzbC^b<-AcXq
z0uCIqCBbdUis{!S{dPUL9?S<Y$w4QH8$2GaFOzH7#?4w0Osl5smHd#y8%92o@9&Ra
zZvGAfrrq{ctE-X@NvRN4lNy#=oTbi>BeY~CF_viHPz^tTglc?D97CqEBjzUwH}7GI
zapg8YZM~>2Wk%E$d<zRTCN<FubZw&59(-vN-Fb@#D#&+|#QoyaKu)|JPWMeo0o)9=
zk3u<FocZ1-C;x7FaK!&=`KzGzg+&3P(RzJwNNYrDfqF#0gpQ66kO3M>&r@9ly9b4Q
zJpM7T@}r63I(OExUlG%Xcjz3MU+9U^r!SkpjNThDtaP)7>j6L5z%o5|^hlVOyI*uY
zt^UU6NTuY?(Lb4ZIU2Zb5Vz}Pb7KF%ivf&j^CL>$cDz?rMNTQQ|NqDVD7mhghUp%h
zhIA{gi{S8y9Y<VS&a(?VJO6BQ#<sEVV=4}tHeh=cLI(D{OC^sese$63*F8@;_WsQq
zpN`<K-Cv`Sl-GRlC?dAETz}7Z{G>hIIbSv$`B!JiPi!0#4#Jge0)p&YVPHchWcyAn
zQhvb8ggXGXs9;k`u9Uq*YB>O+Q3Rq=2hlLFcG{Q3ORH_}JnY8C+r%@}6|%ySP%bWG
zV~mA;?P`Q2L_Ss})nrJ{$TmeA9Tt*4=}X5x%RioM@_?ZsKSEST-f+GBv~Ya)xX3O{
z8!d=YthI-13OI;RN~`>|6u5L{z20oBp%9MIj)n$!Aw{Wpq&Rtr4~*_74Gjo@3el>B
zz(Rk;;>2lp73<2;d=r*8z%WkdsG=vRuG_fvxO#uN^El|+5Qoz^X!2MfxJ3m}vyi?>
zMLLDi8+${Z6YbUg?8GNR>-+SwHKdFyr%HqWcs|X_l*-DAC^bG&KCqWg7<ibsL;!=r
z|5K96cU|>-_`UlwQ`EdOp_LJkr`L$mHHs75uP?fSgVfsDjuE#ft2b8HDt0yFt!+;C
zEgL=)G9ZFt4wa+N3Xg7FGc0~`&EEt6_%7tyzmnb9B_h1~<!NTIpwtUg?<ZHuxVxCf
zS_)PfVDKTpO*JLWf+aElu>7~GD4V-Bhx7~QKRkF>&aT>(-!Us@aJxAY@8E?HW$G8g
zSz@7Jcp><wR~WOzd0xZ{GtRDxS#{c$7Gv=g(o+daNys40p(74`t7`+HIaOPkdaZZC
zSl3?)u$cvPJZ|?!x;IYjzl03}FuED<iX!88meviv>iCp;lU1ieF6n7!oAa-1E!rS0
zF1lBFVS%G#ZO}b@*+bIk+7@Q|iG<a+7Sy>60vIDVpV%4tW8rKyzwRo_<25;8*Ky@n
z-sX>W*b;M){5lB_Edc@m1`VHy0@dg$PTR9uE$O2&a?KAe?xRlCj&Z$iZYw<FFlif|
zt(VCOVKeoIF!ez^&#`q@0Auk}u`W#G%cIUpum0R+Z4YM<yuZIc@vp3DJa@EaZ|5p7
jQhtb^?hAtPfskfTAXcOE^Uxg5(^Myb6<o+n0;2v6mm+^t

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/port_down.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/port_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..25ea172324c04e222c575cd01089e36a5c416c3e
GIT binary patch
literal 982
zcmV;{11bE8P)<h;3K|Lk000e1NJLTq0015U000;W1^@s6?P*QF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq@
z4g)HQF(jJ+00UM@L_t(Y$HkUmZyQArhM$?;bL?0mkdlZmq)1d1p;bxM3L$~`2IM~=
zBz|B1L5nIxnj#`Ziz^6xC{m#kO(Mr>9H+ML&bxfr^ZA@RC#jIY(rUf8bMxLi^Umzb
z#>R%{fB0E|&%gL=#<qWjr&Sx(mfzgH7l6kGXE{_+R29U}1oVJ&BfR(ci!k>7Ojtw&
zV-zm{TCtzanQfB9=LRGI&j3|57}em}dme1vr}emn_htK9ZI1QzbynWKOcd4d-jj~f
zg6;G>;q$#O4Pz|U7(@gC;w0h8A5SVl0pfVbpHH6#ry>|t=As%Z5<*{aUtoNiX$bA0
z-{;QVJ3N2>H))yz&^vj_y>GYh-XS8W2+PY$e0Y0}*5ejCzwOXy)LFZ6lMmKz5=Ave
z!+wc$iE&`02*RVEAM)(kU!-YD94G9z57^%R2@x>HV2q+h>2x~$vhzEG!H^_L=ys3U
z+}fml&_+ZN(cr#-U72IalpDth0NX!4Vs~#pXJ}MI3bLUJySsbr?d@Z&<;L|@78e)k
zc8^(lb14&_pJHvtiz#Ry96IN6wHj4KB?p(OLH>*^p8&=P!Z^piqMS;M2`^;8MipZw
zET@3Az+A}x16Z|_TJtmOxVS4IF!C-Fn_`R!A5;wSDdsurab0Kcc;`#xY}Mz45-NmR
zi+LqyS`PX6S?1iB5V?Z?ama0PF+mRTcB2VnHOgC;`ZVT7c!HonFe2GnXuoI@r%@hi
zqoEIYHzUWTjwRFL8Y}tQl@807`V8ZU`drFzXlc|(4C07JE#*P$9omOAvfhfZq3bzZ
z30TLBiz7&DA}%$dp+pw0UOvQ)l&dQpoHJZm>EN95?#cl#`%xA#pQ$>^8K3UhcCwt#
zgNQKSYy$B9>U#hT`H0P(VDsI0{&h01UYm|w6xqC-W}Hsb8%Yw=sL%7s$Dh*a9B_Ep
zDW5VP;<)-0vet6z)@@#2cq302oK?r!G#C!3*M}^;w!l|kem&!?%&VrL$nvk-JDSb7
z>gMp`=#b`olUl7lDX~ngDv~3s=%ndn`_4I%B<8qxL|izV&pwX}&7^nIgOlEQ7oH1V
zg{sP_A{77jUUi;@EsEt;oL$&z#>K$`e1HFk|NMIU5B8^)T!cwsE&u=k07*qoM6N<$
Ef)7g4YybcN

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/port_up.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/port_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..e06303791092800beef5f08cd3dd9ba70cf68fa7
GIT binary patch
literal 1401
zcmV-<1%~>GP)<h;3K|Lk000e1NJLTq0015U000;W1^@s6?P*QF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq@
z4;&z+e5ot|00j9-L_t(Y$HkV*Z&Xzr$3N$Br!##>U(?PE^f4_3Q6gvzMmK5{s5|3E
zV>Fn!FuE|tm7&pvYySmFOkCkw5;O`?Bmp0ENGJrUZ7FSs&J5|y)Xse$7k4@gbc&jo
zcs4iZp5Og_@AvzA9dYvHNyGoJG{BLghqpO4|Ke?{gVvVce)C-fylL<thf+wSlpxHu
zfCdP|0Amd1pD;G&fv^Z6P)cG1fNXJIf7We1&;46LBH(R6rBo;>BhSY0)43nXUCv?5
zR{L12jmgPLhKEM5tQf`^{J?LrHCq|e!jaNe1X^FN=W%292JgP}9#Sf#lqjVz#!#tN
zDBUSCKR3tl&<Iip5CSD*xSmT8hTBNJg=r+MU8`~Wo71eUEaUq=AH4q|e&FM}E^FmA
zR#%s)RI80}%v_ye=IRWIM4W?<J<frHk7HRe0;jfx^cKbj5JJ-)@1P^m$;9|xUVrTk
zj4>1nc`DT^wo}8lZ9LBhAQ4Zn|Iq`y`1~Y`w-(6fm-+t88Fmg0(chOu2uXM!>y|MN
z0-s{B$n5Ma<KyEL3I(JTgvOw?Li-w}6iR8*sh#ZIvkyyKEG;iGH$RKxH~>^CRg(S5
zdh(fjSnJJAGjz35=E}?!f*@eEm<J#`nkAh|qf`Xi7K<}7oTay?4}g{Y5_9vj6iWp<
zJ36C0Q38R8%FCDsGj<$@Vxh#?=orOPfp~iy6N2M8R5zk{O0C(bg{)P|tZ!712yQOk
zWVLX+9=XV$milh3nQiMBeBZ-$TxvC&bY_s`U=lCzSYM9-{lIH{xT8}Ngf4*#VHlFX
zy>d5C>JEicQ6+|EOE~Z8TtN^JghBL?jA9tG+Q>~`rc^57dI3voh9DH|pV-NvgA<J(
zZeHOgW2GXgn?M_CG;e|+AP6F0DWW=+LUQWsQ~YrLS4v(FT7<~Z!2~uRO&#ZzBZqKZ
zbr0}n+?7-aAtJ`6CF8A2DUFsIAq8E7d+}0TWMYPd_UVjE78aMeHor!^ErDoiqXWql
zy*<74CKPqOkZ_yi+Kh=1h<Y+uS|gR>tFt#av)IR;M+WHWP;_-Fex1IKt$kwc4-s!m
zG!m!3FUdf1pdqzVR)g{V9b4bs8nmTRUL;#!1fPC!k+aiF3?&~TJCdZcvz@aSu2WM<
z`ZFCIej<g|8f|HMx_cQMOk;q{mvhn2Te?wB+e|0Zh^u8;08D-UGcyZ!$fmo=jtn5A
z;`F(z*tScuC&9622icoV0|wi+$z*mRfUDQ9F+Dxakt0Xx-qF+4u^v>%2G;%z`Rvpx
zYkvl0)7?yrrKxN<ocrZ>JU?LnXb&I1d4R5VtKKLCu~-`d$ma{}fA}$;Ja~vqCKGk9
z_44+NH*t$)o2e6**l-LJLw)QXOR;pj%*EV1p)pK8HOeQ)p2pJm&SU}H&KDRR877hF
zKx>WbI#k!oxJ|RU<vcEy9i~o9v*8%VhkMyGwv+kgJ6z1oVGO+f!fxJvX&-iN9lM^0
zn+f^bZ<pB7+eOW-;RYVDn8k*(exJH6q%M_hrcUH=J=i_e&%{_d0-c`20LKnzIgoP6
z<#H`cZ`W|TJ~W!@`M!zQQtIO;a`=H@G}F!Qu@nm{YYou1j%IoJnO*<rZrAc2V_M&C
z^p}?uo)5#RZpO#b+$vPLkoyAzy!zY_1K|?q&n^Au*W14Uf*Mc=Aj6}|00000NkvXX
Hu0mjfviOV$

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e5dff46632a2cfc115f30a5e5450a61bbacec54
GIT binary patch
literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$sYygZR5;6(lh0}sQ51*2JDCtlap7OO5YdJr)|KGSK7oQz-@rv5K)3G2cQ7jp
zF1k_N_zpgS1shj}78R42w3C_pJIBSHNh%gg?&{vl%y)j@nKOYU*52NmtxEo&IiF0c
z*ZDGl_3rKG-Sv%afGo>+|KS}=0iw)etN>`WS^)nC^m@HZE356D<~*5>E}IE}5I7&u
z?zDCuJ$(Gi%m6s(e>pTy```i4`3i~=DOEMe8(1J<XC>HuyZbZ?b`8MX@5_Yh*wMsk
z0Coo8?&h7BH*efp1L%J}_-zu6x68dzzyo0a0?Kk`Wi?Cts`Aqb%;P)(fPj4a#mB7}
zG#`%1u`(%AOS{bGFPXbFX~2`hz0E7n)~;TB0<hZ2`PBbB-smPk6@_e3Rf;SW>d$yQ
zlfI8r<YGlgw&=Qv)Pn|Ke<=XuCuOuwOqWGzIC!iTqy%iLT5?DM+*1>aB3fAkvLIYW
z(*t=@NDqT~T+Bf|iuvKuPa96lZ{Q)%Lb%@f)!yHq4FHD2QM)LLK?4|#N1>cmgY+{6
lkES2>L~{WMEVm4p`~i^dDOX9Zg=7E#002ovPDHLkV1kKx;|%}+

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-0.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..114583a67611fb0320e55d309201fb0172b4aa6d
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$m`OxIR5;6(lD%$IK@f$%-D?X)hz2A?g%X<|0WBRo0Z5UOH=xJ^goi-91Fnda
zA`OT)0Pzw*Bve=~D14nC?%my)q1d~&ArX<cnvr(DIcN4bRyYR-@1IApXQlsr7T@(&
z0Stx@Uk?ZOw*b8NeEjr*l>kXpQ;GmoRR!>Wz-TnOxpuw3Q~J}h`j)By;2c*2`q!$R
zmoGNoswx0S$KNMvxpw9Nx!QuHgh-yMB357yhhC;&Z-4KVcX}H@&7O)1(#cLLECbL>
z08bu2db56a;|{>_kE0V6q4+j2D;6*Z=tV#Xt%lg<I!0SopqAze00ij$8;;OKFOuj?
zo2bqoshJivVA;a@#)IAA;NEr#$Ct04XQ>0kB#17iiX;{mx^IjzNYkFr!=bvgbrtds
z3PAs|0MH9DXow*Lq(TiV3PdD7>ZWS;kOi3KCAJ~X0p5F5g|Y*&Y$0C;wY11V7scLW
zGS;>||7nJE-nr?l?jIh08v{(Ib-!tvaRJn`+J!cb^Dt*g<yV(zZUBzejsmBD0GYWg
U8fF6ELI3~&07*qoM6N<$g6e_G=l}o!

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee8cc4f1cef6b76624d92dad8457c988845fbc7d
GIT binary patch
literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$uSrBfR5;6(lg(-qQ5462cQPTABGhOl8#gT?bSDTd><eh6P~X5sA3(Rd7T>|F
zTy|q|(>HMKx_*F&p|M(<bf!sW&WDRTlSC|*+|@mB&hPyH=bjr_;Oy<a*(}xX*YPMX
zU#E)z*4A%7TVK1i1CS&M`|sYe5J1#Sqy(VRXaM{l(Cv2HOUupOI?nRJH8TYu1TF_O
zTaDeVhug2r41mvHJ{_6Id+-40<rY)~)!5Zky@mw>c9DWdFZQ1V(i;FD`e%0^n4*<z
zF=ZZrT>!YZar0$ob)^IF<M{WPsZ#rPb+0Yp0kD4o*+}gqD*(vHrR$smbD1gtP$1oT
zey}M)r^_)eibOOfsk*D#w8-48Rs$X_+}XJPw6l8kF~D*w<>39tVY|HoK%tJ>tgEUp
zvrs+b`9$@2IEmet6mdt*XG2q+1K3{{0Mbz*))K4a8*1*gg;FdQRb4H5hyvW>5XWP&
zq5>pAF$1X;h@mD`GMLM352{s6kNUstG%vn`hcpQx&+_KiZ~Y#CjLw^fho`+7Fc=O(
rF)4fTGX)pZpVdZl1qdv549NZfO0X$Bi?J_D00000NkvXXu0mjf(<$K<

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png
new file mode 100644
index 0000000000000000000000000000000000000000..26bcbf715d6ff22f3fb95f1efa3fcedc6b0abba9
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$u1Q2eR5;6(le=ycK@^6+S#PkA6)6~k+#p0Egp>v$AyJSX3Yt*TQRD$a3pL^$
z=qS?=(S#@9C0rqdi4};<#_P-Oxlruv+K7nAQ_X1ReCPkqITKi69UgwzE!7{_=V@NP
zPgenKZQpyfy>)jFAW0IAK7C{*fT)>B2|%mW0{B1R$-(FDm5%J!=l;p``kmVfKnPq8
zNZQ5zi>LSB<ud_bl%1WJTLtg{=;ao&Nl7+|vc=pi0tnbe3ZA_=dKpM>0+{JTQAf?I
zOBI#@*ad(`JGb8UHaB_zKZc`oQELG1cx?d>fc*;?Pu0%G1pw#s(mP8Eth7b}fCA~>
z>*HMs+6>36C=yYNip@n0t1W<;Y212c;la+0gWl$~=K!5{%JG+e*6nTpP{iy_4MbU3
zh;5wARZp{dmHnzBz6elrN^>+mcJ;q30Ho7GtSuJh8*1*gg|ZYxy|G~CO&i_4D&lM=
zRzyG&6f=+*Am%K0K}{EP5JxdR8UC_SUVH}+X%a#{&ey(v8x8>Se7-g>%0aDQo!_C~
q&j!_J3NEHU<3zI#1Xf!HjQ;?>WFH){?)wP<0000<MNUMnLSTaN&)K*D

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cffaa1b84fc02489584ada68491b764e8cc875b
GIT binary patch
literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$pGibPR5;6(lDlpbQ4of|vut7_6Ui82nSvJx1wtTEKo12?DCsEj0HK8%@eWkH
z0R>Wc0(xpHgfKBTN4D4A%UmdYcGu$Wsm@4ezM21@32YDtkB@Il&|7t0X6f^E6TtN=
zgGZMJy#s*m*_0Qr-m(!uRBbXZ0Z?;*zXR?Zz3y*!<*?2tv*N<ex!nlh-+-i39zM8x
z^;wn+0He>76Z2JP_5YXvV7jQ7E-C=3%KXfB1gK&58^FCMFCPZd0f3p_5cNi{m=m9<
z|3Sjd{mV~>d%YpRr}61b)EYpg=4R~#V7~(9OSSLO=~+>EcYOj?8V}4dApQ9`^0G`M
zTC8F&YSdlbgRRQ}NU!Z*JR0tuzYoyuq#VC_H|_U(t4oXB8wp~q2Q^?(sD7CitL{6B
zcw3<6ROXFgqDt#Q1T0Ijj#wPuP;;*(RFxp=ZIR%$2V$!~X`YLf5s(DMtkoyxtZzX~
z+bzUvOi#w&>@+Jsf`>E-A)9Ag?>~%309jUS6=gN5i<a3U<fV)NLP$KIUqdv17YJ+?
b2F!l|vP(2^tGA>p00000NkvXXu0mjfH3-v*

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-none.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/signal-none.png
new file mode 100644
index 0000000000000000000000000000000000000000..b77585c0f053fb7c2ebd618370a466b7ccb675dc
GIT binary patch
literal 681
zcmV;a0#^NrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%V@X6oR5;6(lDkh-Q4oi}bMIboT@l2$5QPP$FltOpR8WE%8%;#f#L`e;qZV5E
zC)ik7N~1&z8VrpZpBOap5j8#v3=qKOp=ji>tekW1nPWlLLXCu}W}0t)Gx-z?sP^{j
zd#v+y`T6IJy_#4EAYD~+p(?%c7(fsN-0JLLL4eqa#IXe+3`2nb16o^KOOvUnB|m3p
zCYOsi0F+{WKvWpE96og9l86A%*WWuPey&$u0dD>iTpZ)v+*WbU=V1zk{3}7*&9>%1
z$tnQxeuops^xy#5cOS@(e@V^kYam%xhC+dW`V;W_?W@s>^_6P?`g%W2tJ`;rRAv~G
zi?G^ALR=u_WvppF#e+xpFaDLl7%j$X0DfF+D_mv_;htJb8|oSSJT#WOc4J+1`!2&;
z<7(0*{*=Sa+Q7M(TqeWffx##`d4iILdOYy+&b?GBGeT}tHQ}Q!RH#Z46_uOLSEZ|)
z@^U=s?wX2S%#Rl@iIrmM-ddbEzISwzdiAC#*k4cO@uLi#K1<^L$LfT&#?9*7Z#hKf
zzAhq&*4~5qeybB6b}_wm^K`nYu{gGtsIU+eJ}}mZu?Axe#u&uoV;7U$zKu|8_4(3e
zqNmSsduve#4@`*&+3sfqT4T3t?hUlDzX956L>$h=6s%rJuBO_Q^z}1Ql%lxtFwV~U
znJ3+ZkGo;VcBtGinHU=z5v_B>-lJ5Y)Wp<e)YJ261Yn|WcVujwS~W1396xixmlPC~
zi&B1QMQJXq+cgo7fBlyCpoo7sk*{-0mXz;YyY>LU^U=`<SF+g*AVBsPXf`}mhehmR
P00000NkvXXu0mjfrZYlk

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/switch.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c99ba5684d182ee4afd75be80c67beabaac3e3a
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~
z10Vv6eZV^a00NpxL_t(I%cYWANK|VWhM#|}m1TQo>>RT@BiZ=?j=D26#OT7#5QIpO
z)l?UCS3yA-K?D{A!46`#sYxv=Bq<AuBBE)UipsJaoeD%d*firIoi*vqT3;94RQp2M
zz1Pq8^1<`MZ$|B}*t^~|&DntczZwD$?#u5)10mEBl5+1BGH1@9?n)gt78h$TF)b?#
z@AhrHej6s#65?0JSLH(m9|q**t0qqS&f{<lr!&^cqX&Lw&Ch1i#6Phti!J44eC;3L
z-_tceF|!wBV~7B1IBSaA(e*UUcocxrk~SR90U${-l@7}I53{ED1BPweEGh61e0T_5
z*GU_a2Ed#=AIW4tsgy-t?pzcQG!CKb8k%MR77O!FqJqJIxF@-BI-GQOcTrz|jZ`v)
zh_HM`2`*O#mTiFun$iG4P*_$9LpLy*!yzo&=H;tKD<?ZwFDor0@ioDSjFEEWXr)?O
zycEm&*{}lSSDgnAR!DP8qy0JdUczshZGYg7EG}5Id$1X39&a@Ox2|2-bGE)g6|UPS
z=|gqZ*K491#+N~dB=Y^4eD6QE_xYYlMfG!e*WM~iiVA86yZvkXITXOMUA1p==1tA4
zyL|Q1wD^^V?u6>``=9&`FmdgPEaxA?R=LNza@=E_dBcVp<2!p2ZExG7D_@-17&Z!b
zUZ~HRJ0<hj@l!j@$Uu!<v@2gEnYXrR)Z_7ETpmNyPzw6YM5H6yd;L?)bd(g%Y-sz?
zH5~}64To>agmD@4C6b8P=$eKt5Q#)Po;QZ>_M2b)tv4z!f)!b~v1;7p2^qQ3u6R%2
zMCrZFm3L61=dI3nP4Sc)n#9CP#=1VXHpQM+-38)5+VX6zaVtoVoBf}gsyFolc)Zno
Y1IgoY&vcijs{jB107*qoM6N<$f_BAd4gdfE

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8c84c8dc46e68abe3ea5d4de8832b530ae2a3a1
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~10WR$
zu0{L+00DhTL_t(2&xMcAOOtUN$6w#?^E^4-B&K+YWr5Qm`~eD%pfwv3bqa*)s1u<>
z|ATn*lz8aiMHHihFfWY>UfRhykRT892RdS7Y^$`DKlZEd^E@3)Q4jV$zTO``ykGF2
zh;e`EHug0K@s$VGbsr?Poj+shp8BY46;|!)wc1nL>WnNXk%%N&z{yY6=)!}^C>7@a
zk#2O5JVN6HctRtfE|37ag`YZGw;d)trXp)vKcJ%_fdC>AX|>bNgJ$J9LCS`-FQcSD
zVq;^Wqwn4{t?wNVjk4+B*oxLQxi3ozfS0o)ee31`+?be(&0Wz90mbNUu8{TRmiJN-
z7`{*sBVh3Uv+3W4%cvc_4HXLjL3fK+YZKo-#6W-A^?W9|^X?6081iZ_Je{}vqH391
zp*}0c`%hvrTy&(O9#>OO;~gx-Q9c>3Zf4i}f_L{fzAPS!k%^w5s#HopGFz$A*6L>t
v07AXauX%gvR|o(D?bPOcnj2n;)46{E7nhZCw2s0500000NkvXXu0mjfc1YRY

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/tunnel.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/tunnel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a09dd6857f7a1f0cf2577827ec021ce5054bdf
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$&q+i<R5;6xl0RruQ51*2d*6LEFBXfYb<m-S*@aq=ia0o^33V65p%xun1*uZ$
zpO}QiMn@M#2O)!lh)~ldlca-a)ybu48X|?ZiHgwN*EHn07@D*%G{5oOd%k=5&JoGv
zTt;g<!~wA^&%(sSz3|?;(%KG9O-&+%=-BKy4v|PKbobR)2S7Nyc``n94L|`1Aqb2n
zIsyvw_W^i%bLgaH9g}ySWlO*=pqZ;zM)33)7>2|U0=rh{?fhcvl{Kw@wZX;A%p+%d
z`XPbQ1eY(3U@C=A|3FsP>BdXj5B_Y`@p=sgs_S&?r48_D@iPEpXS?^JnzUvCV0Jdz
zwHIYsRwfdOg*&}eYk*T1=;{uCw`x@FTKgU}*v_6if99fp@RX-mD$ws6;QhOWeO{E=
zLvOEvl(HQl1SzlgFvU^<rA*3|P29Y6iUP>xa;}zJy||qNxXvk=OnuN=hY#KZE2AE~
z{=OW)aXOm*SUhq4!eAQsnRp!E=cQcPq~CX(a%F>nKgi0;vc0tQEi1R{jUeFvlK&k8
z#%|pnU;FRH)9OV^Nx8CtsZ0v1dHRm@d4wRP4k?)jR)>Q}CxP^f=P#qlx%iHo7q|Qa
X$qd1O*F?;t00000NkvXXu0mjfYK{DI

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad9856cfecac80bc025b48feca437b7c524f86f9
GIT binary patch
literal 546
zcmV+-0^R+IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipl4
z03s?-nbf-g00E*&L_t(I%Z-z<iW)&2#(y&|<ARN_V39O|Y+>OeSeWj%u-?)<gKgSN
zclZQ0B3zMfUC7v6<qK$Mp%6*9LUgfNxSeHp(?st)SK`+U^L@<sAAZ9Kt+h7B-0>eN
zrKX<edGCD@1VPd5b`e5cJzNw8VHi@c*N^)joleIGumFS*3<iU%1^s>>fbn?zQ7I*T
z-~SD~797=TwXiG;DJ1||ma$kYPWf;+d<O7+|Kyz&<ath(Wf)^H#sJ{DE|bXwfFKA8
zfWzTH5Cnx%YI;_XBne6>(lq5pE_Y`I>-G9H^;Ry{vF&I8rz_vW#ZpS?FbutGla5@H
zBq2!>(lkBGt)eKNT-W{LIF21f5w%*4`FwuCrBbO-tyV9%SVD*gr4&&VA*CdaW6HQ(
zlLfF^tx74s<x-Xdl)jVJ`lm6*yWxLmYc`v$+U@rJa=HA_Y&IW(KU(VxE^!>6R>yJJ
z?RGDl&E`qwdHxyrwB2sM17Am@(epnp_FFDO2;w+KO38k|$F^--2=QP^Dc8WSMx*f!
kc<l9h_tWV#E#p$AzfEz}cr9EL7XSbN07*qoM6N<$f?B=m5dZ)H

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/vlan.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/vlan.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c99ba5684d182ee4afd75be80c67beabaac3e3a
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~
z10Vv6eZV^a00NpxL_t(I%cYWANK|VWhM#|}m1TQo>>RT@BiZ=?j=D26#OT7#5QIpO
z)l?UCS3yA-K?D{A!46`#sYxv=Bq<AuBBE)UipsJaoeD%d*firIoi*vqT3;94RQp2M
zz1Pq8^1<`MZ$|B}*t^~|&DntczZwD$?#u5)10mEBl5+1BGH1@9?n)gt78h$TF)b?#
z@AhrHej6s#65?0JSLH(m9|q**t0qqS&f{<lr!&^cqX&Lw&Ch1i#6Phti!J44eC;3L
z-_tceF|!wBV~7B1IBSaA(e*UUcocxrk~SR90U${-l@7}I53{ED1BPweEGh61e0T_5
z*GU_a2Ed#=AIW4tsgy-t?pzcQG!CKb8k%MR77O!FqJqJIxF@-BI-GQOcTrz|jZ`v)
zh_HM`2`*O#mTiFun$iG4P*_$9LpLy*!yzo&=H;tKD<?ZwFDor0@ioDSjFEEWXr)?O
zycEm&*{}lSSDgnAR!DP8qy0JdUczshZGYg7EG}5Id$1X39&a@Ox2|2-bGE)g6|UPS
z=|gqZ*K491#+N~dB=Y^4eD6QE_xYYlMfG!e*WM~iiVA86yZvkXITXOMUA1p==1tA4
zyL|Q1wD^^V?u6>``=9&`FmdgPEaxA?R=LNza@=E_dBcVp<2!p2ZExG7D_@-17&Z!b
zUZ~HRJ0<hj@l!j@$Uu!<v@2gEnYXrR)Z_7ETpmNyPzw6YM5H6yd;L?)bd(g%Y-sz?
zH5~}64To>agmD@4C6b8P=$eKt5Q#)Po;QZ>_M2b)tv4z!f)!b~v1;7p2^qQ3u6R%2
zMCrZFm3L61=dI3nP4Sc)n#9CP#=1VXHpQM+-38)5+VX6zaVtoVoBf}gsyFolc)Zno
Y1IgoY&vcijs{jB107*qoM6N<$f_BAd4gdfE

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8c84c8dc46e68abe3ea5d4de8832b530ae2a3a1
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~10WR$
zu0{L+00DhTL_t(2&xMcAOOtUN$6w#?^E^4-B&K+YWr5Qm`~eD%pfwv3bqa*)s1u<>
z|ATn*lz8aiMHHihFfWY>UfRhykRT892RdS7Y^$`DKlZEd^E@3)Q4jV$zTO``ykGF2
zh;e`EHug0K@s$VGbsr?Poj+shp8BY46;|!)wc1nL>WnNXk%%N&z{yY6=)!}^C>7@a
zk#2O5JVN6HctRtfE|37ag`YZGw;d)trXp)vKcJ%_fdC>AX|>bNgJ$J9LCS`-FQcSD
zVq;^Wqwn4{t?wNVjk4+B*oxLQxi3ozfS0o)ee31`+?be(&0Wz90mbNUu8{TRmiJN-
z7`{*sBVh3Uv+3W4%cvc_4HXLjL3fK+YZKo-#6W-A^?W9|^X?6081iZ_Je{}vqH391
zp*}0c`%hvrTy&(O9#>OO;~gx-Q9c>3Zf4i}f_L{fzAPS!k%^w5s#HopGFz$A*6L>t
v07AXauX%gvR|o(D?bPOcnj2n;)46{E7nhZCw2s0500000NkvXXu0mjfc1YRY

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi.png
new file mode 100644
index 0000000000000000000000000000000000000000..528ce2b4e91e3ebb9b9473ec196e10f0a608e4f6
GIT binary patch
literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~
z10W0Xp?IGF00WIlL_t(I%Vm;nOjBnR$N$g0<<gf6rI$&ev=p+o$XldrXfx*=OqaMV
zbIoLvfhH`I4;m9gT-f$u`=C>aS<Ez=%)}+jgngQ3ixXUym^C3fFo4CEk+|~GLV?ov
z-qK!g@3Sw|W!vxTIlq&0a{dGxxcaZw+#Tqi1%OYlQ(a8{L!((!^8m2^Tqaeb+O~e$
zO~n895&&@Z4z}FA+%@q=|7fvBm)iM!Wu+)_)I=1i6aXm0g*k~V{k6ELTNnA?Zw_ov
z<Q)|N5Goe~fWpL%+Z|Pp6A`h4qpXEhaXbLX*=#B$<@|PsX?W`X!f^nf=N<Aw&(O9^
zu`=H%Y}%#b)QzQvq6SgQv>F6~2JT(gGYkV$%iHm2BuaFgdORFWK9r@*g9nk&Z|VeN
zWfVyEV}0(dn8~)8ExZtkCt3}9o(oL;T=v7cPc&!yIy5WOBV`6X&qd;iR<nf{#7wsB
zSf4wqK(edALK~P|HB(k4<Z|i~nZ|S=gexf2l9?GV#B>sb;RpboOmhXfoZ3!VRV*;M
zY6c4}TkhOz)v~OEFw`Pb*=gXlg~64WW^;{^jNhA}kA15!TI<P^C6Or;iln$G@`NhB
zbX<HI3`N4s)RmrVfnaz~gU#w)UJM)gBCRavWN2B6Y(Xi>s4Iz%RUqeN@I_jAc`<Bk
zuvxu<V0h2em7Z%10EDBlP*O~*%PRzr_mSVQqdKF!T+1U73L=+^&?d7AuT-xq-ba2z
zd4=FfifMH?8Vdmc3jo2%pKcKItKV&DtQk!uqxz5CjhoK@c!w4mOmMdf#8|4w7Q318
z{JAz$V>OL=?mT>d?DB!v0Dy6RI0OI?vy5x__Vm8?>TJo3Zw~M7u%q8yN9LEJxHRHh
z2(7K4-I^&GzCFE9%rY(j$h&Ah_zeKy&90BO`evU{@AQ4;+=Z{{!7sjDdFSl-=-v~a
zvEI+VQUd;2`d0U$tpM=ip+P*0a-PAV?<btj7H4`r4O4jq<fj=V;z=wlg%MnyUvSuL
zRe^wivU7iT%f(9<aOCh&sPb}W*Z!StZSBrer%tZk_~quUT1Tye;|g*PhpoA>sYz?K
zSgIsRg3I-iv+KYI+m9SRItt*Q0rhpY=WqQwf(5_7cg{CIHs_lc0B8X)04M<ZUT4Sd
z*LUywvc7KfMF7puRzH2_#J^72fNXq;VOjQn#WMpZ2>|>J6#k8i6kK={00000NkvXX
Hu0mjfFP-V*

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_big.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..d73a5e7401ae9ec36bada05af157e39fe5b81a1c
GIT binary patch
literal 2865
zcmV-13(oY3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px<>q$gGR9M5+mRXQg*LlbP=iGC*?%Uh+bocBtLcqWPV_`rt2$)4ykSJ_{6xs3;
zV=F0KkyA?Yq^SImR+UnY@{pudWjUb2vJ?}`;1R~g4knU~A}<9Rgl%99h^2>_?peBf
zdb@r5_Fc}&gMlCnieK|p-MUrxEdO8qzwbNe65JBQ>7PY2$b>WLFXjN^-8v2-So%3I
z09vm7Bm;nsnKd2&JN@_YKyI@Jg7u}p)zOE(>ap}l`Q{Pw0rBB<w6SXO;)mlG&!p37
z`}+5ET4)$Rw1VkCM4w|<=j}kS&RC$0NdREYdVW3Vc|A$Zsx(qw1YH&;P)?`GO?#xZ
z|12(Esh_@h@z}9+`L+NX|8n2vhHp-s-1Ftab@JiAId*R%+Em+GqP1W=5O9gA6VFzN
z-&9>jDFDbG=R#7Of@zK{nvHtVvSt^`p?q0w9{bnf6W5(wvuk&&E*S$q|HkM3`wsxt
z?ApCl@nfC8+WV=W{oZN89{TD}9*sq))E+lxxd=s6D(g-_M1^I>g{%Y>;mH8t5atrs
zsgr<FR4h_%a<@TAtuj+I+e#JgANhwZZ;)%LS^wwzM;xh?J-O%07XW}>2Vgw7UhSSZ
zb=~qU&mDbO5$>|CaL|Mt=u~7Z@?foFPIbNT<h7db+#`H-Q26Sg<~#QYPhQKM>Us~>
zIz`4J$brtTaL`nQyKKvIM;}h7g$4j>_rxj2gX^#BN&v9p@%?SO%2&SgFHip>ola}H
z_E1l8ru?O@uH<PY9x~vGe#@$_wi@0&jIy|-N-;sDIJg%D{0Ns=m`E^uN3_)H&Rsrt
z!c3Ma4818+xwJ4}{kYs`p8dqyj{3LKX|s3rV;>7Iej=NnIABr$kTiQ;gEyxD0KGet
zrK#K&MS>a$C>k{};0m$aw7fMzLkSSZS_o(>5j5rt9`^;06G3AHw3RT{5;T;6X?bg0
zA(m4U1CfBDDH7DuRBj7;cP0U#!JAW(X0HPP1^}9-tn^82Y}fdBYw?$J$(kVd2aRyv
z6JiMg?zRe*K}u+VN{mrJ;Z9Ajp83AvRcGP4F0@!DB7={bR1P*EF^2+*Rj3TIXdFTa
z1dK?v)~w!Ntj+yu*Z8<~a?i{~nbjWy@Iwj!p0ImD9mafkLQe8XB+46&{#aOTYO32s
z6faq+H&ce8f&l?S5H!ynF`j?+Z}I9YuVMGU?Z%45?J&<BF$h7B0Rh8MQK>gmMDdcE
z>UPD#YLhn_{X7zhh9~4?sKc1|gxzza2&rI^#6VJ$G&dCBwJ7IuEYzYHo{$ofPol2p
zsj8|d99-qxRjvFbq>?EB03{TU?${11e+itsDhF3pRZ(2eQzf57Js~AREsDXp91HMT
zRMOl~Vj!te!6G+OAS6E!D>cHV77PVFC+HHPdma+9&_ke3(B*>qLdc9#S#Uvx5GWMq
zp(qOMW&;hY4j}{}C?%B29_Mhmpn~wA@br*JoP<k+PCPYeHk44zu7@v6e&Bx{AQE$|
zTB}YR-C;by6p8qbNPu`j0isY!h+}&)C7@Iy2)3`l%ir9K>D&}%=5qM%fiVQzSAa?c
zlz=*xBU4I<08v1^pznwTQzYUr9?*%SJ65fg5{cb#fC_5bb!VB^>Y6fvt`IaUwOXf=
zjQWfVX6OnpE>xJVw{QYVT08DWy`II_zV=VQZ=C**BHqynPY~h@AH{Nw8M?wL1oI>!
zS8BCRg`g=DUw4VG+jVCd71X=|;1K)$VzG8_PkZm%Hf_kNrcEzY%z;#Es35>-DiL)i
zE@bs+#GnRh80_ysAhH%-q#poq-$(mlRpv2%DGw7Nx=^l@fu)^}fJ7<xq=kyvs%qLq
zQ%JJr=u)wmxz{1~`!`acn98B5<*foQE6gQy$=z)yZPV85rmqnK!el1e+amnJ<ryNI
zm#}f&AkLpY4z9+))fmqG<^(pb{Rmj?A}(B>A?<Au&SWMC0kNCDW}CLQ<nFeU%q0}O
ztW+&;m0~J~ZU7wL_xW)ld~LSsb^ri8?uU(FE|bY6e8B}EkW9q<-Z*e(p#`rUK84I=
z4o%mGEmTYw8+i5bdpKK)qc;vD6EPnU@C6r{OfC^Nf;o8H2Y}hC+aZLn9pCr)@ekYu
zp3h&;WU|{OS#X~VzwfTZ@kW#5N@gxhK{<ynR=3RKm1no2SzkcbZNup^S8)2*6S$bC
zn7llJSDxL9)v-Bn_=1A+E19`)qsh^CSK_$Og)hm1XENFCp3h(Zz+C_UGp7!oXj{Gg
zuL+@UFsRohiKww?sB|@(UsSg&*1;B}ZJSq-fGXp+$A63-!^GM}IyNj-u)14@&Wl(%
zupF%|QJlY!A?K#+tX#F|z_RYQ6`7WNANA}^v9DOF^^L#$XFCD#4>$n8b6n~9$?3ua
zm3l4ggEn=ImHL-<pRjBf9ZHd|SiS;3K6(UJ%NmhyeUMM_PE6(sn46!&{Tntyq7*9z
zR-#=gQp<MHzqI>=uCbC2+N{)T;mPU31CA>_55W5a2LNF9)YzHMdmdd<sx-ExBEgKr
zWGITvm#CAS+eYqFIQQ}M<L_aj+K!+*M|-paM(_U^wr$-8Ns@5z`){DDvlAU{DVT*T
zmI!tI4jh(i**JSX_YimeACB++>_6VDDc$<_mVNJyAGNP}{Gplo@=!1!6%3iVi}abn
z2S!FQcJO;BnjQw?CV6D@Dr|l5LHOLm*c)Sb``t4r*^(&EWyt8rD6X78r4+ryM4?g%
z{PtXKlnZkD#GcPQajPD|9b(O{*Ir?S?by^?(RMvPs%n~s!$0}~Hf<V0|I%fcp1O*o
zZyrUp!BJ7}Dp-2w6a(>6<+s-T>5d(690z+2{IvPbWW@G_cktw%FMR2CI?|m0W=<YF
z)W6{q&PYGqI<$ER<#HLrL!&UwDh`b8$Ek_;#XRZBl>)1N=g6T225JlHH(-|%#hFXW
z(57KzGiTZPdGXa>eq-m~-ARYxL*h?*a$gzQ{3#TR1=Q<xyu5ceYPBjBoDeUQs9Bd-
z)8X@B$8i<U_T^f=p*yZhA6Yzut5X>aZ`zDP{=ip$3jFh(H13#!7him_GZG6=Kk@0$
zV0!v0QmJ-ms)lCM#zLutxw$#a&CjAxSio$)jAG3ejfQVIe*HvGi#m`@B~xGc+)li{
z|2wFZYF$r1{dD$^b$|h2^?K#qN49?wQ&U&*y|MjJ6a|J6LPtjj+L9^6TH@&I?S-mp
z&~+WQ-5{k>DVQ(hM`mVn$mi#AC36`=n}_k;*Y~{(py%fH`%r)<pL}vzcW-ZdGMU1E
zeCOLJmn+pX6BF-rcXkY3x_GHI5(#TeW`uJNS(agh479biBbi7d-V(>!wd<g3I_C3p
zNG4P0?CNfR>Zzxez4X#c=Wd0#Z4LA<U-IV2&?qvKmr*F>@$awh+ndd1%K%Q@T)2i|
zkm2Et_jPyoE{(QaZ3!7cO_mwqLV!sUG(CV#n>Jy1XcSY^)5id`{htn`)9ICfh%2g!
zpNt(rxm>Dev)ON6J30f`9vy&gnx=C2@R73slxwG|1VBk75`hhyH$1TVBZD7*>#aA*
zj_r>@mRbCT7hYKT%rnpY`a=N%0r`uL>pHvleBBcQn7oqR3Sjoy+{!hP+c|gLT0fu9
zHxG>++8qnU1{N=s{_ETOUIjpy!q{H`_^Usv3qGW6*&X1$o8BJ&zr_ClauFTo#)9&8
P00000NkvXXu0mjf5lV=2

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..af93b37b7a7a12f136c055362ed91a7eddfc2c2c
GIT binary patch
literal 2853
zcmWlbc|4TcAIA@&A@WdHxX5U(B}?`tvOEn!Zeya{u|%V+H~hxFS3}5>wO{rnWRF6~
zQbLSIvXy;_k!=!Y$o6}F=XIWQ{yN{!Ip=wQKi?CB``eg@OPC7)z+-X+i$`Yh|9>bB
zWF!RzZ6Om232zL8Dyqm20Jx@2um+aa9m6-wJ^nOK53?E`4);*cbdtswIJur1c=Elb
zz>r^CJL+&%`q6iODQ*3e9IQ*~k0)&z;)3slseg%yay)dp@1YaT@()g#Q%?2~3pd+4
zC!Me65L$b~wEmn;`s-9f(_*Z;jK!qWtL8Gs%i4VJFu$t3h)3&PE6em1`fxcD(z!c7
zKaa1xky2bza%sH2bAF?-QOoDxw=Wy89#mxmxbk5(@N;(7(R+VqgI*cad3&kvnM!Q2
z>$?vhuwIIiq9KB!qG=xEBZEJ-rVM_@#BhczeMa{%Lu>2nqkQb7TIuH~wGhyU*dE}|
zkBp3b9U4l_ORe2w(vKs;BA~tgU%tnk!n+|;NE~0iqy0@|%tr%OscSiLJFWEAO{(@P
zdb6fR=>+<@QrF7@>00_87aE(6F<H!_#3`A|6xGU^89-NHRBcO(`T4ZisnOArii(PW
zIs#ACtu}=Ou}i(g8ta{L&$i0&#P*fywki_!#{%W4C;(`-^8$}c19TKh@TL067(*2L
z6#Uw#(9t2T1BE^YV35adAa0h76^`eSBtwI$T3yyFYinw)`@hU+l?_u5c6S5Aww5ef
z+S<;3>hIqJV8@|sZewTta!-HGrA!cUMOBywWAa71h=ZmxyBDTHtT03k^l5o6W@(&2
zX9yAHTj?4k>Zw%x<z$RJA_5?-V1~!-+qYSdfmPy%L-_tp`#{4Rr#nNA4ww{Le{OfN
zYZ<SY&d1mF^<(LGOyX*ySDH!*m3}Cq2hNm-j3bl81YkkId8o^JJ9OGhgvLqLO2Wjr
zXLO;^@oQ^qBTmZy=!WfUHhayouF&a;etv!<0%y($aeyaxzHvQhX9q6s?kO7T>dDEN
zB%CyMc{|7wmE>jD(5=XAm;78BmSzE*XzVMfKnU=o^2rzziw;GfQQu%P6cf}U#uEu+
zlQFe5HAx;w7^X(0ETwk)1(&5&9RxSJk5&z6`>%gAfS&Vocxlr3$hZny1!vHXA>+X3
zKjV#7soC1$w<>RFhfE)*)FOYgMI{xV3C*!a+#UDps;vlyQHtCh<-=}2va_?l)VYs-
zO_RMTg2u`M4@Ur~fp1DnOKWOs(2rpBa-jW~s(G<=tc(f%gLhU(l%qI!3Bf%J3k$d2
z?k;AAt7vJ(T(Ex|t@7+@_pe{SE<msec*)(NpD-_yj*%&lj&;qD+|;=s$`!fP)fF`{
zG&D4m^@#T#TvuLxf>JBT0v58m<tWKak_aPIuTnae0|?OGR$9x|YpAKA0U$$Jx}m~n
z9(Vdt1OEipu>~%z^pZ%(ks26qWTOP~5M=G_>;%D(v5Y>dr;cDgmt~ek;skNxC>Vtn
zMLT&>iCLtF5I-Ul3B9m9e_xJ*s~&ylYX`yNXsig)_D)<(sQyEe{VABtpcfG;B?EJ$
z(B$vNTn=$HD^1F1vN#!ID)TFJnho#(%Q&SCoeNRW7f!UB@-v?cc1>)%A!1ySthSB+
zVNdRPZicepgM(V^6CLAv4sW@&(lb->WGESh{@`mTM2zDV>&#hcaztYzlq3a-4TQ>K
z{us7XuyjW8+F1Q$zU$aYa7A8TK6$0dYxX@m0Gc5?imzY4MpDuQm7hvkkTf6c1$ho}
z3vP88?**F$i4tV-s+A~~_F!xT>E3vK_SKTXKVeiwnOhaURA=+UscRK1zy!m;TU1ok
z7LS#X6`aTU`!{%GNRm5d0hswwlAG@5@4pbtT#wYG85QAwAc{ZbfjEr9ms*ZlSsh%X
zY8j!><Mk<7q&*8R;dmpeca|!VTcr!<>`V*o_RhG}Kgb71<9qR?LtmDc-P%@~M7tA2
zFE`wq<gb;}M*4{pC+5C6=Ncx=`&3j_F%X0J%T(qv3f;fygDlt9)~2g;K}2rtgp_-#
z!i~mKvz0atZx0U-bvqP23@rc}qm}T`V?0b!Eb%GOSK&T~dLZsL?q}9$8#O#^^&Gh}
z_@iu^Y474<F_Ozhh(XmiHtr@s1sq_#x3`zid~i{Y((6q<n4GjD$O#N0P2;fOjAGY4
zr&r%{Elk;oSABeZCKx)rcV2zt20L(c9zy^2L?dZN^W@NqulF8f?fd?I2q_<zS6*K3
zwLYPB1;bwnM+2~rl$Z@2USDMS-8fFu(vNpv=@H{5ckDH6t*xb*+uN7op)w?gav@lb
zLZH$%OKeBurDOSpgoQ5_l%3DW%se)znqOZ2*x%oOJ|W>Gh71`eh!|`HWGTqYU$VY+
zD{*~&oiI5$`Bb_{f!H@aF%gF_@Evj7qb-Q(pmEv&3Q3|YBp`Mq1EY$|$})SL!fdKX
z8;f20nGD8UzwVw~G*;q>F9xf-8G2--n>#Ign#*hM11DK2YHG^9!gXwOJ1E;(`Pp<?
z*)kXU>(o?EG7^v7;3qqXJ}YuXKtP}@G&J-bl}ha|99W9NnB+-w@kYWUrPoV1v}j96
z31IXt{3l&WVAQw8*}*|Se53OWADT_~VC(volEEjYMP8+rzeA-@H+5)v4!NnlK{z8J
zo7PfOtMh?UbadMgv-e~$nKnoZFIoAWE=TE8jEhN1O8UIIT5+@T23=iEO;l7!$TfU6
z@{CiLU`BTK9TJITQ%6|qkA(9Bot(&1Ex`>X11=#5u-`j7J5RyUHYq77M~9kIOcVeU
zZ@h^`)z$qC|Lz4^StYh?eKC_--o9vWYny6hY<#M)u&|64=(W8(JhS*IQ$ve(B+L~V
zhU{c?*lpX=-MxHZY^*F~^OMFlVt8z{{mq`99=!u-gqQ#8O^KrkQhz0K(TC$RGkJtk
zO9vMh6obL|+}C&23!%nSlh&4gXO~HSA_2eHXuCsC)6me!6%r9i9UU1764MFzNiln>
zFuAWJ!Ws5HC*)U8%H_+K-AXN4yS--~^6Eyo)y3-c?>&U(`ce58iG41r!ls1-PY}KL
zt@Od1oSd%Tznd;<YQDJV>6yzGk#@F2Ur!)_IqClgrB>`MW6b@A!qbON%ABzU5wt*@
z!qdQf+)N~VKh^XvPvl%Lo12?0t4EJyQ4dx&0^UkJyPBg%T8!K1k;=6^pJuuouQB!W
zkiZTB@ow+K*@dUKPF7b}cl7mff2>^<jCyB7AZ$4)o7}DuMAVNPT3DJ7j;(A51vlF2
z{v#(a{dHm@wV}Qqr=A&^pP&D;`)v5W83>>`>>i}D26%YL`795W?w41$3Lh>NCQcw!
z94t1|Tla_;v)9$lRfrjj*Hgc6({xN^w%^Yxnib*mu@VMz8=6=NKAhDb^$iXAMMdmY
z_AP{i<??F6R51M#&6{8E&GDw@<|FTb0PFs{uW)h#-;i397NSdMX_o}H;X65wf-V68
zJ2(V2XI0@fW$wa6d<Gwk;Y8;YySgCoo)r@tAvI3uv9wnoUSp@`>Ul0VwW_GAbDRy^
zK_iLN7Pz<8Fg@n{w-_m;eV}z7D}m<W=GNIAx_<3|gyGi;{JrI>tfF$v0QxWT92?HH
z)F0hem}XwEdmG?wjJjX@ZFPLF;}~ni4EQ|Hz!7R%T0S{DJ0Fd!ermibxp@IGCII+M
uT{%GOL3!DXR2j#?M}qgv`I)1~2fUPfgo&B&>OIK27nm6Sjje(m9{dkU4|-Do

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png b/trunk/package/luci/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..338a34f78c8da317fb342515ec5ba8d2931a0876
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk~
z10X0+#tH2J00UG>L_t(I%axK(NF!$$#-GeLnf!C@BqKW|iy9?6$)+?5o23?4F&>u%
z#fujWtG(2NC#Bc52%?9^gGg^_Y@!GjVK3E-Ve3i>f|n-H5{>Mt!RUqzVkVQ#OunQC
zQ`q*_A3V4B_wXEE1DZ@vPn%a)S3d&4*47rIC<;+kl>mU%YNahLEp&8rwEo{)0{~1;
zPTq?~qovu|Sz@tR9PRDxHI`*9lu{D_5JIZ8TCH+%aluw96*(LZ(|;TW0P6KR*Bl~A
zlEhXj6>qg#eatY7pAh1&R;!OIm5NuABo=`5sbd%)ALluaQ=LxdeWTIHI~<Pt)oS%i
zQ50*5MB)V@1i@hN*X!$R)?_lJWm*29>-x>*<>d!W)2s{tJ`#!46h(2nTrQI=%g^j~
zyY1lM;AJ!#eLgog_x$ki@TJ{ux5={n%;j>K6h(1IB9R&Zo@E$@+uPeSF$}{~N==l~
zb^yB7Y85k?49ev)j7Fmf-~px7NGWY&7{=0cIO6yFExNAT3<iUZQtEAOZRM`6uD+5a
z$#Haabno=^6y4q3<@57%b6Z>6@$Ky`+h{Z{3WdVQLZP5D@pwF!%jF&h0)cn=d|u*t
zzNG6q2q8{Fh{AE)4I#v->pFOzFXi)jDG&&}%jI$p<MDWo0f17eRFh?y69nN+I-P#v
z@pw3|*NbAY*rKW`-_g+luh+|^)9ELIAiR-fnJbk_H2`1$AQp?gO(v85k|bp{O?w>-
z2A}Tk?*3)B+kfxt>w_Q&=<V%&s%hG5Ns_Y3WU@aNi@gN^5(<ToN~PfQ`TjgPIT;=t
z9DGr)*B`mvZqn1!<2gP)&Lk3vA3Hlc2W&PQc6N4Zx~~76N~LHh6uSGwv9U31Y-|7k
zve|4yRaNZo@84uHnOA1B`Hx1U@fpjq-%U+T^>=l38315nVghSxYj*{WMgs<e0o&W#
zKY2W!NmW%LiXt>kL%Cdrq9~a{q41j^2;UZq#puY$$T!Q&%b1y&xhrU5J3Bj5R#sMi
z35Ubq4-XIbilX?1!{K<~^ZC9OMX{X_0+-7Lx7%$4pyE^J=jX$lo15nY0|TD}U;$VF
zSer2dz|hc8V10f4{ldb+5C4)E7Z>q=Sz1~G0Q?R1{D9(R-kiMv0000<MNUMnLSTY5
C!M~mW

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/base/htdocs/luci-static/resources/xhr.js b/trunk/package/luci/modules/base/htdocs/luci-static/resources/xhr.js
new file mode 100644
index 00000000..701c12ac
--- /dev/null
+++ b/trunk/package/luci/modules/base/htdocs/luci-static/resources/xhr.js
@@ -0,0 +1,241 @@
+/*
+ * xhr.js - XMLHttpRequest helper class
+ * (c) 2008-2010 Jo-Philipp Wich
+ */
+
+XHR = function()
+{
+	this.reinit = function()
+	{
+		if (window.XMLHttpRequest) {
+			this._xmlHttp = new XMLHttpRequest();
+		}
+		else if (window.ActiveXObject) {
+			this._xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");
+		}
+		else {
+			alert("xhr.js: XMLHttpRequest is not supported by this browser!");
+		}
+	}
+
+	this.busy = function() {
+		if (!this._xmlHttp)
+			return false;
+
+		switch (this._xmlHttp.readyState)
+		{
+			case 1:
+			case 2:
+			case 3:
+				return true;
+
+			default:
+				return false;
+		}
+	}
+
+	this.abort = function() {
+		if (this.busy())
+			this._xmlHttp.abort();
+	}
+
+	this.get = function(url,data,callback)
+	{
+		this.reinit();
+
+		var xhr  = this._xmlHttp;
+		var code = this._encode(data);
+
+		url = location.protocol + '//' + location.host + url;
+
+		if (code)
+			if (url.substr(url.length-1,1) == '&')
+				url += code;
+			else
+				url += '?' + code;
+
+		xhr.open('GET', url, true);
+
+		xhr.onreadystatechange = function()
+		{
+			if (xhr.readyState == 4) {
+				var json = null;
+				if (xhr.getResponseHeader("Content-Type") == "application/json") {
+					try {
+						json = eval('(' + xhr.responseText + ')');
+					}
+					catch(e) {
+						json = null;
+					}
+				}
+
+				callback(xhr, json);
+			}
+		}
+
+		xhr.send(null);
+	}
+
+	this.post = function(url,data,callback)
+	{
+		this.reinit();
+
+		var xhr  = this._xmlHttp;
+		var code = this._encode(data);
+
+		xhr.onreadystatechange = function()
+		{
+			if (xhr.readyState == 4)
+				callback(xhr);
+		}
+
+		xhr.open('POST', url, true);
+		xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+		xhr.setRequestHeader('Content-length', code.length);
+		xhr.setRequestHeader('Connection', 'close');
+		xhr.send(code);
+	}
+
+	this.cancel = function()
+	{
+		this._xmlHttp.onreadystatechange = function(){};
+		this._xmlHttp.abort();
+	}
+
+	this.send_form = function(form,callback,extra_values)
+	{
+		var code = '';
+
+		for (var i = 0; i < form.elements.length; i++)
+		{
+			var e = form.elements[i];
+
+			if (e.options)
+			{
+				code += (code ? '&' : '') +
+					form.elements[i].name + '=' + encodeURIComponent(
+						e.options[e.selectedIndex].value
+					);
+			}
+			else if (e.length)
+			{
+				for (var j = 0; j < e.length; j++)
+					if (e[j].name) {
+						code += (code ? '&' : '') +
+							e[j].name + '=' + encodeURIComponent(e[j].value);
+					}
+			}
+			else
+			{
+				code += (code ? '&' : '') +
+					e.name + '=' + encodeURIComponent(e.value);
+			}
+		}
+
+		if (typeof extra_values == 'object')
+			for (var key in extra_values)
+				code += (code ? '&' : '') +
+					key + '=' + encodeURIComponent(extra_values[key]);
+
+		return(
+			(form.method == 'get')
+				? this.get(form.getAttribute('action'), code, callback)
+				: this.post(form.getAttribute('action'), code, callback)
+		);
+	}
+
+	this._encode = function(obj)
+	{
+		obj = obj ? obj : { };
+		obj['_'] = Math.random();
+
+		if (typeof obj == 'object')
+		{
+			var code = '';
+			var self = this;
+
+			for (var k in obj)
+				code += (code ? '&' : '') +
+					k + '=' + encodeURIComponent(obj[k]);
+
+			return code;
+		}
+
+		return obj;
+	}
+}
+
+XHR.get = function(url, data, callback)
+{
+	(new XHR()).get(url, data, callback);
+}
+
+XHR.poll = function(interval, url, data, callback)
+{
+	if (isNaN(interval) || interval < 1)
+		interval = 5;
+
+	if (!XHR._q)
+	{
+		XHR._t = 0;
+		XHR._q = [ ];
+		XHR._r = function() {
+			for (var i = 0, e = XHR._q[0]; i < XHR._q.length; e = XHR._q[++i])
+			{
+				if (!(XHR._t % e.interval) && !e.xhr.busy())
+					e.xhr.get(e.url, e.data, e.callback);
+			}
+
+			XHR._t++;
+		};
+	}
+
+	XHR._q.push({
+		interval: interval,
+		callback: callback,
+		url:      url,
+		data:     data,
+		xhr:      new XHR()
+	});
+
+	XHR.run();
+}
+
+XHR.halt = function()
+{
+	if (XHR._i)
+	{
+		/* show & set poll indicator */
+		try {
+			document.getElementById('xhr_poll_status').style.display = '';
+			document.getElementById('xhr_poll_status_on').style.display = 'none';
+			document.getElementById('xhr_poll_status_off').style.display = '';
+		} catch(e) { }
+
+		window.clearInterval(XHR._i);
+		XHR._i = null;
+	}
+}
+
+XHR.run = function()
+{
+	if (XHR._r && !XHR._i)
+	{
+		/* show & set poll indicator */
+		try {
+			document.getElementById('xhr_poll_status').style.display = '';
+			document.getElementById('xhr_poll_status_on').style.display = '';
+			document.getElementById('xhr_poll_status_off').style.display = 'none';
+		} catch(e) { }
+
+		/* kick first round manually to prevent one second lag when setting up
+		 * the poll interval */
+		XHR._r();
+		XHR._i = window.setInterval(XHR._r, 1000);
+	}
+}
+
+XHR.running = function()
+{
+	return !!(XHR._r && XHR._i);
+}
diff --git a/trunk/package/luci/modules/base/luasrc/cacheloader.lua b/trunk/package/luci/modules/base/luasrc/cacheloader.lua
new file mode 100644
index 00000000..942c4b7b
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/cacheloader.lua
@@ -0,0 +1,23 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local config = require "luci.config"
+local ccache = require "luci.ccache"
+
+module "luci.cacheloader"
+
+if config.ccache and config.ccache.enable == "1" then
+	ccache.cache_ondemand()
+end
\ No newline at end of file
diff --git a/trunk/package/luci/modules/base/luasrc/cbi.lua b/trunk/package/luci/modules/base/luasrc/cbi.lua
new file mode 100644
index 00000000..ae570b15
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/cbi.lua
@@ -0,0 +1,1850 @@
+--[[
+LuCI - Configuration Bind Interface
+
+Description:
+Offers an interface for binding configuration values to certain
+data types. Supports value and range validation and basic dependencies.
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+module("luci.cbi", package.seeall)
+
+require("luci.template")
+local util = require("luci.util")
+require("luci.http")
+
+
+--local event      = require "luci.sys.event"
+local fs         = require("nixio.fs")
+local uci        = require("luci.model.uci")
+local datatypes  = require("luci.cbi.datatypes")
+local class      = util.class
+local instanceof = util.instanceof
+
+FORM_NODATA  =  0
+FORM_PROCEED =  0
+FORM_VALID   =  1
+FORM_DONE	 =  1
+FORM_INVALID = -1
+FORM_CHANGED =  2
+FORM_SKIP    =  4
+
+AUTO = true
+
+CREATE_PREFIX = "cbi.cts."
+REMOVE_PREFIX = "cbi.rts."
+RESORT_PREFIX = "cbi.sts."
+FEXIST_PREFIX = "cbi.cbe."
+
+-- Loads a CBI map from given file, creating an environment and returns it
+function load(cbimap, ...)
+	local fs   = require "nixio.fs"
+	local i18n = require "luci.i18n"
+	require("luci.config")
+	require("luci.util")
+
+	local upldir = "/lib/uci/upload/"
+	local cbidir = luci.util.libpath() .. "/model/cbi/"
+	local func, err
+
+	if fs.access(cbidir..cbimap..".lua") then
+		func, err = loadfile(cbidir..cbimap..".lua")
+	elseif fs.access(cbimap) then
+		func, err = loadfile(cbimap)
+	else
+		func, err = nil, "Model '" .. cbimap .. "' not found!"
+	end
+
+	assert(func, err)
+
+	local env = {
+		translate=i18n.translate,
+		translatef=i18n.translatef,
+	 	arg={...}
+	}
+
+	setfenv(func, setmetatable(env, {__index =
+		function(tbl, key)
+			return rawget(tbl, key) or _M[key] or _G[key]
+		end}))
+
+	local maps       = { func() }
+	local uploads    = { }
+	local has_upload = false
+
+	for i, map in ipairs(maps) do
+		if not instanceof(map, Node) then
+			error("CBI map returns no valid map object!")
+			return nil
+		else
+			map:prepare()
+			if map.upload_fields then
+				has_upload = true
+				for _, field in ipairs(map.upload_fields) do
+					uploads[
+						field.config .. '.' ..
+						(field.section.sectiontype or '1') .. '.' ..
+						field.option
+					] = true
+				end
+			end
+		end
+	end
+
+	if has_upload then
+		local uci = luci.model.uci.cursor()
+		local prm = luci.http.context.request.message.params
+		local fd, cbid
+
+		luci.http.setfilehandler(
+			function( field, chunk, eof )
+				if not field then return end
+				if field.name and not cbid then
+					local c, s, o = field.name:gmatch(
+						"cbid%.([^%.]+)%.([^%.]+)%.([^%.]+)"
+					)()
+
+					if c and s and o then
+						local t = uci:get( c, s ) or s
+						if uploads[c.."."..t.."."..o] then
+							local path = upldir .. field.name
+							fd = io.open(path, "w")
+							if fd then
+								cbid = field.name
+								prm[cbid] = path
+							end
+						end
+					end
+				end
+
+				if field.name == cbid and fd then
+					fd:write(chunk)
+				end
+
+				if eof and fd then
+					fd:close()
+					fd   = nil
+					cbid = nil
+				end
+			end
+		)
+	end
+
+	return maps
+end
+
+--
+-- Compile a datatype specification into a parse tree for evaluation later on
+--
+local cdt_cache = { }
+
+function compile_datatype(code)
+	local i
+	local pos = 0
+	local esc = false
+	local depth = 0
+	local stack = { }
+
+	for i = 1, #code+1 do
+		local byte = code:byte(i) or 44
+		if esc then
+			esc = false
+		elseif byte == 92 then
+			esc = true
+		elseif byte == 40 or byte == 44 then
+			if depth <= 0 then
+				if pos < i then
+					local label = code:sub(pos, i-1)
+						:gsub("\\(.)", "%1")
+						:gsub("^%s+", "")
+						:gsub("%s+$", "")
+
+					if #label > 0 and tonumber(label) then
+						stack[#stack+1] = tonumber(label)
+					elseif label:match("^'.*'$") or label:match('^".*"$') then
+						stack[#stack+1] = label:gsub("[\"'](.*)[\"']", "%1")
+					elseif type(datatypes[label]) == "function" then
+						stack[#stack+1] = datatypes[label]
+						stack[#stack+1] = { }
+					else
+						error("Datatype error, bad token %q" % label)
+					end
+				end
+				pos = i + 1
+			end
+			depth = depth + (byte == 40 and 1 or 0)
+		elseif byte == 41 then
+			depth = depth - 1
+			if depth <= 0 then
+				if type(stack[#stack-1]) ~= "function" then
+					error("Datatype error, argument list follows non-function")
+				end
+				stack[#stack] = compile_datatype(code:sub(pos, i-1))
+				pos = i + 1
+			end
+		end
+	end
+
+	return stack
+end
+
+function verify_datatype(dt, value)
+	if dt and #dt > 0 then
+		if not cdt_cache[dt] then
+			local c = compile_datatype(dt)
+			if c and type(c[1]) == "function" then
+				cdt_cache[dt] = c
+			else
+				error("Datatype error, not a function expression")
+			end
+		end
+		if cdt_cache[dt] then
+			return cdt_cache[dt][1](value, unpack(cdt_cache[dt][2]))
+		end
+	end
+	return true
+end
+
+
+-- Node pseudo abstract class
+Node = class()
+
+function Node.__init__(self, title, description)
+	self.children = {}
+	self.title = title or ""
+	self.description = description or ""
+	self.template = "cbi/node"
+end
+
+-- hook helper
+function Node._run_hook(self, hook)
+	if type(self[hook]) == "function" then
+		return self[hook](self)
+	end
+end
+
+function Node._run_hooks(self, ...)
+	local f
+	local r = false
+	for _, f in ipairs(arg) do
+		if type(self[f]) == "function" then
+			self[f](self)
+			r = true
+		end
+	end
+	return r
+end
+
+-- Prepare nodes
+function Node.prepare(self, ...)
+	for k, child in ipairs(self.children) do
+		child:prepare(...)
+	end
+end
+
+-- Append child nodes
+function Node.append(self, obj)
+	table.insert(self.children, obj)
+end
+
+-- Parse this node and its children
+function Node.parse(self, ...)
+	for k, child in ipairs(self.children) do
+		child:parse(...)
+	end
+end
+
+-- Render this node
+function Node.render(self, scope)
+	scope = scope or {}
+	scope.self = self
+
+	luci.template.render(self.template, scope)
+end
+
+-- Render the children
+function Node.render_children(self, ...)
+	local k, node
+	for k, node in ipairs(self.children) do
+		node.last_child = (k == #self.children)
+		node:render(...)
+	end
+end
+
+
+--[[
+A simple template element
+]]--
+Template = class(Node)
+
+function Template.__init__(self, template)
+	Node.__init__(self)
+	self.template = template
+end
+
+function Template.render(self)
+	luci.template.render(self.template, {self=self})
+end
+
+function Template.parse(self, readinput)
+	self.readinput = (readinput ~= false)
+	return Map.formvalue(self, "cbi.submit") and FORM_DONE or FORM_NODATA
+end
+
+
+--[[
+Map - A map describing a configuration file
+]]--
+Map = class(Node)
+
+function Map.__init__(self, config, ...)
+	Node.__init__(self, ...)
+
+	self.config = config
+	self.parsechain = {self.config}
+	self.template = "cbi/map"
+	self.apply_on_parse = nil
+	self.readinput = true
+	self.proceed = false
+	self.flow = {}
+
+	self.uci = uci.cursor()
+	self.save = true
+
+	self.changed = false
+
+	if not self.uci:load(self.config) then
+		error("Unable to read UCI data: " .. self.config)
+	end
+end
+
+function Map.formvalue(self, key)
+	return self.readinput and luci.http.formvalue(key)
+end
+
+function Map.formvaluetable(self, key)
+	return self.readinput and luci.http.formvaluetable(key) or {}
+end
+
+function Map.get_scheme(self, sectiontype, option)
+	if not option then
+		return self.scheme and self.scheme.sections[sectiontype]
+	else
+		return self.scheme and self.scheme.variables[sectiontype]
+		 and self.scheme.variables[sectiontype][option]
+	end
+end
+
+function Map.submitstate(self)
+	return self:formvalue("cbi.submit")
+end
+
+-- Chain foreign config
+function Map.chain(self, config)
+	table.insert(self.parsechain, config)
+end
+
+function Map.state_handler(self, state)
+	return state
+end
+
+-- Use optimized UCI writing
+function Map.parse(self, readinput, ...)
+	self.readinput = (readinput ~= false)
+	self:_run_hooks("on_parse")
+
+	if self:formvalue("cbi.skip") then
+		self.state = FORM_SKIP
+		return self:state_handler(self.state)
+	end
+
+	Node.parse(self, ...)
+
+	if self.save then
+		self:_run_hooks("on_save", "on_before_save")
+		for i, config in ipairs(self.parsechain) do
+			self.uci:save(config)
+		end
+		self:_run_hooks("on_after_save")
+		if self:submitstate() and ((not self.proceed and self.flow.autoapply) or luci.http.formvalue("cbi.apply")) then
+			self:_run_hooks("on_before_commit")
+			for i, config in ipairs(self.parsechain) do
+				self.uci:commit(config)
+
+				-- Refresh data because commit changes section names
+				self.uci:load(config)
+			end
+			self:_run_hooks("on_commit", "on_after_commit", "on_before_apply")
+			if self.apply_on_parse then
+				self.uci:apply(self.parsechain)
+				self:_run_hooks("on_apply", "on_after_apply")
+			else
+				-- This is evaluated by the dispatcher and delegated to the
+				-- template which in turn fires XHR to perform the actual
+				-- apply actions.
+				self.apply_needed = true
+			end
+
+			-- Reparse sections
+			Node.parse(self, true)
+
+		end
+		for i, config in ipairs(self.parsechain) do
+			self.uci:unload(config)
+		end
+		if type(self.commit_handler) == "function" then
+			self:commit_handler(self:submitstate())
+		end
+	end
+
+	if self:submitstate() then
+		if not self.save then
+			self.state = FORM_INVALID
+		elseif self.proceed then
+			self.state = FORM_PROCEED
+		else
+			self.state = self.changed and FORM_CHANGED or FORM_VALID
+		end
+	else
+		self.state = FORM_NODATA
+	end
+
+	return self:state_handler(self.state)
+end
+
+function Map.render(self, ...)
+	self:_run_hooks("on_init")
+	Node.render(self, ...)
+end
+
+-- Creates a child section
+function Map.section(self, class, ...)
+	if instanceof(class, AbstractSection) then
+		local obj  = class(self, ...)
+		self:append(obj)
+		return obj
+	else
+		error("class must be a descendent of AbstractSection")
+	end
+end
+
+-- UCI add
+function Map.add(self, sectiontype)
+	return self.uci:add(self.config, sectiontype)
+end
+
+-- UCI set
+function Map.set(self, section, option, value)
+	if type(value) ~= "table" or #value > 0 then
+		if option then
+			return self.uci:set(self.config, section, option, value)
+		else
+			return self.uci:set(self.config, section, value)
+		end
+	else
+		return Map.del(self, section, option)
+	end
+end
+
+-- UCI del
+function Map.del(self, section, option)
+	if option then
+		return self.uci:delete(self.config, section, option)
+	else
+		return self.uci:delete(self.config, section)
+	end
+end
+
+-- UCI get
+function Map.get(self, section, option)
+	if not section then
+		return self.uci:get_all(self.config)
+	elseif option then
+		return self.uci:get(self.config, section, option)
+	else
+		return self.uci:get_all(self.config, section)
+	end
+end
+
+--[[
+Compound - Container
+]]--
+Compound = class(Node)
+
+function Compound.__init__(self, ...)
+	Node.__init__(self)
+	self.template = "cbi/compound"
+	self.children = {...}
+end
+
+function Compound.populate_delegator(self, delegator)
+	for _, v in ipairs(self.children) do
+		v.delegator = delegator
+	end
+end
+
+function Compound.parse(self, ...)
+	local cstate, state = 0
+
+	for k, child in ipairs(self.children) do
+		cstate = child:parse(...)
+		state = (not state or cstate < state) and cstate or state
+	end
+
+	return state
+end
+
+
+--[[
+Delegator - Node controller
+]]--
+Delegator = class(Node)
+function Delegator.__init__(self, ...)
+	Node.__init__(self, ...)
+	self.nodes = {}
+	self.defaultpath = {}
+	self.pageaction = false
+	self.readinput = true
+	self.allow_reset = false
+	self.allow_cancel = false
+	self.allow_back = false
+	self.allow_finish = false
+	self.template = "cbi/delegator"
+end
+
+function Delegator.set(self, name, node)
+	assert(not self.nodes[name], "Duplicate entry")
+
+	self.nodes[name] = node
+end
+
+function Delegator.add(self, name, node)
+	node = self:set(name, node)
+	self.defaultpath[#self.defaultpath+1] = name
+end
+
+function Delegator.insert_after(self, name, after)
+	local n = #self.chain + 1
+	for k, v in ipairs(self.chain) do
+		if v == after then
+			n = k + 1
+			break
+		end
+	end
+	table.insert(self.chain, n, name)
+end
+
+function Delegator.set_route(self, ...)
+	local n, chain, route = 0, self.chain, {...}
+	for i = 1, #chain do
+		if chain[i] == self.current then
+			n = i
+			break
+		end
+	end
+	for i = 1, #route do
+		n = n + 1
+		chain[n] = route[i]
+	end
+	for i = n + 1, #chain do
+		chain[i] = nil
+	end
+end
+
+function Delegator.get(self, name)
+	local node = self.nodes[name]
+
+	if type(node) == "string" then
+		node = load(node, name)
+	end
+
+	if type(node) == "table" and getmetatable(node) == nil then
+		node = Compound(unpack(node))
+	end
+
+	return node
+end
+
+function Delegator.parse(self, ...)
+	if self.allow_cancel and Map.formvalue(self, "cbi.cancel") then
+		if self:_run_hooks("on_cancel") then
+			return FORM_DONE
+		end
+	end
+
+	if not Map.formvalue(self, "cbi.delg.current") then
+		self:_run_hooks("on_init")
+	end
+
+	local newcurrent
+	self.chain = self.chain or self:get_chain()
+	self.current = self.current or self:get_active()
+	self.active = self.active or self:get(self.current)
+	assert(self.active, "Invalid state")
+
+	local stat = FORM_DONE
+	if type(self.active) ~= "function" then
+		self.active:populate_delegator(self)
+		stat = self.active:parse()
+	else
+		self:active()
+	end
+
+	if stat > FORM_PROCEED then
+		if Map.formvalue(self, "cbi.delg.back") then
+			newcurrent = self:get_prev(self.current)
+		else
+			newcurrent = self:get_next(self.current)
+		end
+	elseif stat < FORM_PROCEED then
+		return stat
+	end
+
+
+	if not Map.formvalue(self, "cbi.submit") then
+		return FORM_NODATA
+	elseif stat > FORM_PROCEED
+	and (not newcurrent or not self:get(newcurrent)) then
+		return self:_run_hook("on_done") or FORM_DONE
+	else
+		self.current = newcurrent or self.current
+		self.active = self:get(self.current)
+		if type(self.active) ~= "function" then
+			self.active:populate_delegator(self)
+			local stat = self.active:parse(false)
+			if stat == FORM_SKIP then
+				return self:parse(...)
+			else
+				return FORM_PROCEED
+			end
+		else
+			return self:parse(...)
+		end
+	end
+end
+
+function Delegator.get_next(self, state)
+	for k, v in ipairs(self.chain) do
+		if v == state then
+			return self.chain[k+1]
+		end
+	end
+end
+
+function Delegator.get_prev(self, state)
+	for k, v in ipairs(self.chain) do
+		if v == state then
+			return self.chain[k-1]
+		end
+	end
+end
+
+function Delegator.get_chain(self)
+	local x = Map.formvalue(self, "cbi.delg.path") or self.defaultpath
+	return type(x) == "table" and x or {x}
+end
+
+function Delegator.get_active(self)
+	return Map.formvalue(self, "cbi.delg.current") or self.chain[1]
+end
+
+--[[
+Page - A simple node
+]]--
+
+Page = class(Node)
+Page.__init__ = Node.__init__
+Page.parse    = function() end
+
+
+--[[
+SimpleForm - A Simple non-UCI form
+]]--
+SimpleForm = class(Node)
+
+function SimpleForm.__init__(self, config, title, description, data)
+	Node.__init__(self, title, description)
+	self.config = config
+	self.data = data or {}
+	self.template = "cbi/simpleform"
+	self.dorender = true
+	self.pageaction = false
+	self.readinput = true
+end
+
+SimpleForm.formvalue = Map.formvalue
+SimpleForm.formvaluetable = Map.formvaluetable
+
+function SimpleForm.parse(self, readinput, ...)
+	self.readinput = (readinput ~= false)
+
+	if self:formvalue("cbi.skip") then
+		return FORM_SKIP
+	end
+
+	if self:formvalue("cbi.cancel") and self:_run_hooks("on_cancel") then
+		return FORM_DONE
+	end
+
+	if self:submitstate() then
+		Node.parse(self, 1, ...)
+	end
+
+	local valid = true
+	for k, j in ipairs(self.children) do
+		for i, v in ipairs(j.children) do
+			valid = valid
+			 and (not v.tag_missing or not v.tag_missing[1])
+			 and (not v.tag_invalid or not v.tag_invalid[1])
+			 and (not v.error)
+		end
+	end
+
+	local state =
+		not self:submitstate() and FORM_NODATA
+		or valid and FORM_VALID
+		or FORM_INVALID
+
+	self.dorender = not self.handle
+	if self.handle then
+		local nrender, nstate = self:handle(state, self.data)
+		self.dorender = self.dorender or (nrender ~= false)
+		state = nstate or state
+	end
+	return state
+end
+
+function SimpleForm.render(self, ...)
+	if self.dorender then
+		Node.render(self, ...)
+	end
+end
+
+function SimpleForm.submitstate(self)
+	return self:formvalue("cbi.submit")
+end
+
+function SimpleForm.section(self, class, ...)
+	if instanceof(class, AbstractSection) then
+		local obj  = class(self, ...)
+		self:append(obj)
+		return obj
+	else
+		error("class must be a descendent of AbstractSection")
+	end
+end
+
+-- Creates a child field
+function SimpleForm.field(self, class, ...)
+	local section
+	for k, v in ipairs(self.children) do
+		if instanceof(v, SimpleSection) then
+			section = v
+			break
+		end
+	end
+	if not section then
+		section = self:section(SimpleSection)
+	end
+
+	if instanceof(class, AbstractValue) then
+		local obj  = class(self, section, ...)
+		obj.track_missing = true
+		section:append(obj)
+		return obj
+	else
+		error("class must be a descendent of AbstractValue")
+	end
+end
+
+function SimpleForm.set(self, section, option, value)
+	self.data[option] = value
+end
+
+
+function SimpleForm.del(self, section, option)
+	self.data[option] = nil
+end
+
+
+function SimpleForm.get(self, section, option)
+	return self.data[option]
+end
+
+
+function SimpleForm.get_scheme()
+	return nil
+end
+
+
+Form = class(SimpleForm)
+
+function Form.__init__(self, ...)
+	SimpleForm.__init__(self, ...)
+	self.embedded = true
+end
+
+
+--[[
+AbstractSection
+]]--
+AbstractSection = class(Node)
+
+function AbstractSection.__init__(self, map, sectiontype, ...)
+	Node.__init__(self, ...)
+	self.sectiontype = sectiontype
+	self.map = map
+	self.config = map.config
+	self.optionals = {}
+	self.defaults = {}
+	self.fields = {}
+	self.tag_error = {}
+	self.tag_invalid = {}
+	self.tag_deperror = {}
+	self.changed = false
+
+	self.optional = true
+	self.addremove = false
+	self.dynamic = false
+end
+
+-- Define a tab for the section
+function AbstractSection.tab(self, tab, title, desc)
+	self.tabs      = self.tabs      or { }
+	self.tab_names = self.tab_names or { }
+
+	self.tab_names[#self.tab_names+1] = tab
+	self.tabs[tab] = {
+		title       = title,
+		description = desc,
+		childs      = { }
+	}
+end
+
+-- Check whether the section has tabs
+function AbstractSection.has_tabs(self)
+	return (self.tabs ~= nil) and (next(self.tabs) ~= nil)
+end
+
+-- Appends a new option
+function AbstractSection.option(self, class, option, ...)
+	if instanceof(class, AbstractValue) then
+		local obj  = class(self.map, self, option, ...)
+		self:append(obj)
+		self.fields[option] = obj
+		return obj
+	elseif class == true then
+		error("No valid class was given and autodetection failed.")
+	else
+		error("class must be a descendant of AbstractValue")
+	end
+end
+
+-- Appends a new tabbed option
+function AbstractSection.taboption(self, tab, ...)
+
+	assert(tab and self.tabs and self.tabs[tab],
+		"Cannot assign option to not existing tab %q" % tostring(tab))
+
+	local l = self.tabs[tab].childs
+	local o = AbstractSection.option(self, ...)
+
+	if o then l[#l+1] = o end
+
+	return o
+end
+
+-- Render a single tab
+function AbstractSection.render_tab(self, tab, ...)
+
+	assert(tab and self.tabs and self.tabs[tab],
+		"Cannot render not existing tab %q" % tostring(tab))
+
+	local k, node
+	for k, node in ipairs(self.tabs[tab].childs) do
+		node.last_child = (k == #self.tabs[tab].childs)
+		node:render(...)
+	end
+end
+
+-- Parse optional options
+function AbstractSection.parse_optionals(self, section)
+	if not self.optional then
+		return
+	end
+
+	self.optionals[section] = {}
+
+	local field = self.map:formvalue("cbi.opt."..self.config.."."..section)
+	for k,v in ipairs(self.children) do
+		if v.optional and not v:cfgvalue(section) and not self:has_tabs() then
+			if field == v.option then
+				field = nil
+				self.map.proceed = true
+			else
+				table.insert(self.optionals[section], v)
+			end
+		end
+	end
+
+	if field and #field > 0 and self.dynamic then
+		self:add_dynamic(field)
+	end
+end
+
+-- Add a dynamic option
+function AbstractSection.add_dynamic(self, field, optional)
+	local o = self:option(Value, field, field)
+	o.optional = optional
+end
+
+-- Parse all dynamic options
+function AbstractSection.parse_dynamic(self, section)
+	if not self.dynamic then
+		return
+	end
+
+	local arr  = luci.util.clone(self:cfgvalue(section))
+	local form = self.map:formvaluetable("cbid."..self.config.."."..section)
+	for k, v in pairs(form) do
+		arr[k] = v
+	end
+
+	for key,val in pairs(arr) do
+		local create = true
+
+		for i,c in ipairs(self.children) do
+			if c.option == key then
+				create = false
+			end
+		end
+
+		if create and key:sub(1, 1) ~= "." then
+			self.map.proceed = true
+			self:add_dynamic(key, true)
+		end
+	end
+end
+
+-- Returns the section's UCI table
+function AbstractSection.cfgvalue(self, section)
+	return self.map:get(section)
+end
+
+-- Push events
+function AbstractSection.push_events(self)
+	--luci.util.append(self.map.events, self.events)
+	self.map.changed = true
+end
+
+-- Removes the section
+function AbstractSection.remove(self, section)
+	self.map.proceed = true
+	return self.map:del(section)
+end
+
+-- Creates the section
+function AbstractSection.create(self, section)
+	local stat
+
+	if section then
+		stat = section:match("^[%w_]+$") and self.map:set(section, nil, self.sectiontype)
+	else
+		section = self.map:add(self.sectiontype)
+		stat = section
+	end
+
+	if stat then
+		for k,v in pairs(self.children) do
+			if v.default then
+				self.map:set(section, v.option, v.default)
+			end
+		end
+
+		for k,v in pairs(self.defaults) do
+			self.map:set(section, k, v)
+		end
+	end
+
+	self.map.proceed = true
+
+	return stat
+end
+
+
+SimpleSection = class(AbstractSection)
+
+function SimpleSection.__init__(self, form, ...)
+	AbstractSection.__init__(self, form, nil, ...)
+	self.template = "cbi/nullsection"
+end
+
+
+Table = class(AbstractSection)
+
+function Table.__init__(self, form, data, ...)
+	local datasource = {}
+	local tself = self
+	datasource.config = "table"
+	self.data = data or {}
+
+	datasource.formvalue = Map.formvalue
+	datasource.formvaluetable = Map.formvaluetable
+	datasource.readinput = true
+
+	function datasource.get(self, section, option)
+		return tself.data[section] and tself.data[section][option]
+	end
+
+	function datasource.submitstate(self)
+		return Map.formvalue(self, "cbi.submit")
+	end
+
+	function datasource.del(...)
+		return true
+	end
+
+	function datasource.get_scheme()
+		return nil
+	end
+
+	AbstractSection.__init__(self, datasource, "table", ...)
+	self.template = "cbi/tblsection"
+	self.rowcolors = true
+	self.anonymous = true
+end
+
+function Table.parse(self, readinput)
+	self.map.readinput = (readinput ~= false)
+	for i, k in ipairs(self:cfgsections()) do
+		if self.map:submitstate() then
+			Node.parse(self, k)
+		end
+	end
+end
+
+function Table.cfgsections(self)
+	local sections = {}
+
+	for i, v in luci.util.kspairs(self.data) do
+		table.insert(sections, i)
+	end
+
+	return sections
+end
+
+function Table.update(self, data)
+	self.data = data
+end
+
+
+
+--[[
+NamedSection - A fixed configuration section defined by its name
+]]--
+NamedSection = class(AbstractSection)
+
+function NamedSection.__init__(self, map, section, stype, ...)
+	AbstractSection.__init__(self, map, stype, ...)
+
+	-- Defaults
+	self.addremove = false
+	self.template = "cbi/nsection"
+	self.section = section
+end
+
+function NamedSection.parse(self, novld)
+	local s = self.section
+	local active = self:cfgvalue(s)
+
+	if self.addremove then
+		local path = self.config.."."..s
+		if active then -- Remove the section
+			if self.map:formvalue("cbi.rns."..path) and self:remove(s) then
+				self:push_events()
+				return
+			end
+		else           -- Create and apply default values
+			if self.map:formvalue("cbi.cns."..path) then
+				self:create(s)
+				return
+			end
+		end
+	end
+
+	if active then
+		AbstractSection.parse_dynamic(self, s)
+		if self.map:submitstate() then
+			Node.parse(self, s)
+		end
+		AbstractSection.parse_optionals(self, s)
+
+		if self.changed then
+			self:push_events()
+		end
+	end
+end
+
+
+--[[
+TypedSection - A (set of) configuration section(s) defined by the type
+	addremove: 	Defines whether the user can add/remove sections of this type
+	anonymous:  Allow creating anonymous sections
+	validate: 	a validation function returning nil if the section is invalid
+]]--
+TypedSection = class(AbstractSection)
+
+function TypedSection.__init__(self, map, type, ...)
+	AbstractSection.__init__(self, map, type, ...)
+
+	self.template = "cbi/tsection"
+	self.deps = {}
+	self.anonymous = false
+end
+
+-- Return all matching UCI sections for this TypedSection
+function TypedSection.cfgsections(self)
+	local sections = {}
+	self.map.uci:foreach(self.map.config, self.sectiontype,
+		function (section)
+			if self:checkscope(section[".name"]) then
+				table.insert(sections, section[".name"])
+			end
+		end)
+
+	return sections
+end
+
+-- Limits scope to sections that have certain option => value pairs
+function TypedSection.depends(self, option, value)
+	table.insert(self.deps, {option=option, value=value})
+end
+
+function TypedSection.parse(self, novld)
+	if self.addremove then
+		-- Remove
+		local crval = REMOVE_PREFIX .. self.config
+		local name = self.map:formvaluetable(crval)
+		for k,v in pairs(name) do
+			if k:sub(-2) == ".x" then
+				k = k:sub(1, #k - 2)
+			end
+			if self:cfgvalue(k) and self:checkscope(k) then
+				self:remove(k)
+			end
+		end
+	end
+
+	local co
+	for i, k in ipairs(self:cfgsections()) do
+		AbstractSection.parse_dynamic(self, k)
+		if self.map:submitstate() then
+			Node.parse(self, k, novld)
+		end
+		AbstractSection.parse_optionals(self, k)
+	end
+
+	if self.addremove then
+		-- Create
+		local created
+		local crval = CREATE_PREFIX .. self.config .. "." .. self.sectiontype
+		local origin, name = next(self.map:formvaluetable(crval))
+		if self.anonymous then
+			if name then
+				created = self:create(nil, origin)
+			end
+		else
+			if name then
+				-- Ignore if it already exists
+				if self:cfgvalue(name) then
+					name = nil;
+				end
+
+				name = self:checkscope(name)
+
+				if not name then
+					self.err_invalid = true
+				end
+
+				if name and #name > 0 then
+					created = self:create(name, origin) and name
+					if not created then
+						self.invalid_cts = true
+					end
+				end
+			end
+		end
+
+		if created then
+			AbstractSection.parse_optionals(self, created)
+		end
+	end
+
+	if self.sortable then
+		local stval = RESORT_PREFIX .. self.config .. "." .. self.sectiontype
+		local order = self.map:formvalue(stval)
+		if order and #order > 0 then
+			local sid
+			local num = 0
+			for sid in util.imatch(order) do
+				self.map.uci:reorder(self.config, sid, num)
+				num = num + 1
+			end
+			self.changed = (num > 0)
+		end
+	end
+
+	if created or self.changed then
+		self:push_events()
+	end
+end
+
+-- Verifies scope of sections
+function TypedSection.checkscope(self, section)
+	-- Check if we are not excluded
+	if self.filter and not self:filter(section) then
+		return nil
+	end
+
+	-- Check if at least one dependency is met
+	if #self.deps > 0 and self:cfgvalue(section) then
+		local stat = false
+
+		for k, v in ipairs(self.deps) do
+			if self:cfgvalue(section)[v.option] == v.value then
+				stat = true
+			end
+		end
+
+		if not stat then
+			return nil
+		end
+	end
+
+	return self:validate(section)
+end
+
+
+-- Dummy validate function
+function TypedSection.validate(self, section)
+	return section
+end
+
+
+--[[
+AbstractValue - An abstract Value Type
+	null:		Value can be empty
+	valid:		A function returning the value if it is valid otherwise nil
+	depends:	A table of option => value pairs of which one must be true
+	default:	The default value
+	size:		The size of the input fields
+	rmempty:	Unset value if empty
+	optional:	This value is optional (see AbstractSection.optionals)
+]]--
+AbstractValue = class(Node)
+
+function AbstractValue.__init__(self, map, section, option, ...)
+	Node.__init__(self, ...)
+	self.section = section
+	self.option  = option
+	self.map     = map
+	self.config  = map.config
+	self.tag_invalid = {}
+	self.tag_missing = {}
+	self.tag_reqerror = {}
+	self.tag_error = {}
+	self.deps = {}
+	self.subdeps = {}
+	--self.cast = "string"
+
+	self.track_missing = false
+	self.rmempty   = true
+	self.default   = nil
+	self.size      = nil
+	self.optional  = false
+end
+
+function AbstractValue.prepare(self)
+	self.cast = self.cast or "string"
+end
+
+-- Add a dependencie to another section field
+function AbstractValue.depends(self, field, value)
+	local deps
+	if type(field) == "string" then
+		deps = {}
+	 	deps[field] = value
+	else
+		deps = field
+	end
+
+	table.insert(self.deps, {deps=deps, add=""})
+end
+
+-- Generates the unique CBID
+function AbstractValue.cbid(self, section)
+	return "cbid."..self.map.config.."."..section.."."..self.option
+end
+
+-- Return whether this object should be created
+function AbstractValue.formcreated(self, section)
+	local key = "cbi.opt."..self.config.."."..section
+	return (self.map:formvalue(key) == self.option)
+end
+
+-- Returns the formvalue for this object
+function AbstractValue.formvalue(self, section)
+	return self.map:formvalue(self:cbid(section))
+end
+
+function AbstractValue.additional(self, value)
+	self.optional = value
+end
+
+function AbstractValue.mandatory(self, value)
+	self.rmempty = not value
+end
+
+function AbstractValue.add_error(self, section, type, msg)
+	self.error = self.error or { }
+	self.error[section] = msg or type
+
+	self.section.error = self.section.error or { }
+	self.section.error[section] = self.section.error[section] or { }
+	table.insert(self.section.error[section], msg or type)
+
+	if type == "invalid" then
+		self.tag_invalid[section] = true
+	elseif type == "missing" then
+		self.tag_missing[section] = true
+	end
+
+	self.tag_error[section] = true
+	self.map.save = false
+end
+
+function AbstractValue.parse(self, section, novld)
+	local fvalue = self:formvalue(section)
+	local cvalue = self:cfgvalue(section)
+
+	-- If favlue and cvalue are both tables and have the same content
+	-- make them identical
+	if type(fvalue) == "table" and type(cvalue) == "table" then
+		local equal = #fvalue == #cvalue
+		if equal then
+			for i=1, #fvalue do
+				if cvalue[i] ~= fvalue[i] then
+					equal = false
+				end
+			end
+		end
+		if equal then
+			fvalue = cvalue
+		end
+	end
+
+	if fvalue and #fvalue > 0 then -- If we have a form value, write it to UCI
+		local val_err
+		fvalue, val_err = self:validate(fvalue, section)
+		fvalue = self:transform(fvalue)
+
+		if not fvalue and not novld then
+			self:add_error(section, "invalid", val_err)
+		end
+
+		if fvalue and (self.forcewrite or not (fvalue == cvalue)) then
+			if self:write(section, fvalue) then
+				-- Push events
+				self.section.changed = true
+				--luci.util.append(self.map.events, self.events)
+			end
+		end
+	else							-- Unset the UCI or error
+		if self.rmempty or self.optional then
+			if self:remove(section) then
+				-- Push events
+				self.section.changed = true
+				--luci.util.append(self.map.events, self.events)
+			end
+		elseif cvalue ~= fvalue and not novld then
+			-- trigger validator with nil value to get custom user error msg.
+			local _, val_err = self:validate(nil, section)
+			self:add_error(section, "missing", val_err)
+		end
+	end
+end
+
+-- Render if this value exists or if it is mandatory
+function AbstractValue.render(self, s, scope)
+	if not self.optional or self.section:has_tabs() or self:cfgvalue(s) or self:formcreated(s) then
+		scope = scope or {}
+		scope.section = s
+		scope.cbid    = self:cbid(s)
+		Node.render(self, scope)
+	end
+end
+
+-- Return the UCI value of this object
+function AbstractValue.cfgvalue(self, section)
+	local value
+	if self.tag_error[section] then
+		value = self:formvalue(section)
+	else
+		value = self.map:get(section, self.option)
+	end
+
+	if not value then
+		return nil
+	elseif not self.cast or self.cast == type(value) then
+		return value
+	elseif self.cast == "string" then
+		if type(value) == "table" then
+			return value[1]
+		end
+	elseif self.cast == "table" then
+		return { value }
+	end
+end
+
+-- Validate the form value
+function AbstractValue.validate(self, value)
+	if self.datatype and value then
+		if type(value) == "table" then
+			local v
+			for _, v in ipairs(value) do
+				if v and #v > 0 and not verify_datatype(self.datatype, v) then
+					return nil
+				end
+			end
+		else
+			if not verify_datatype(self.datatype, value) then
+				return nil
+			end
+		end
+	end
+
+	return value
+end
+
+AbstractValue.transform = AbstractValue.validate
+
+
+-- Write to UCI
+function AbstractValue.write(self, section, value)
+	return self.map:set(section, self.option, value)
+end
+
+-- Remove from UCI
+function AbstractValue.remove(self, section)
+	return self.map:del(section, self.option)
+end
+
+
+
+
+--[[
+Value - A one-line value
+	maxlength:	The maximum length
+]]--
+Value = class(AbstractValue)
+
+function Value.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template  = "cbi/value"
+	self.keylist = {}
+	self.vallist = {}
+end
+
+function Value.reset_values(self)
+	self.keylist = {}
+	self.vallist = {}
+end
+
+function Value.value(self, key, val)
+	val = val or key
+	table.insert(self.keylist, tostring(key))
+	table.insert(self.vallist, tostring(val))
+end
+
+
+-- DummyValue - This does nothing except being there
+DummyValue = class(AbstractValue)
+
+function DummyValue.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template = "cbi/dvalue"
+	self.value = nil
+end
+
+function DummyValue.cfgvalue(self, section)
+	local value
+	if self.value then
+		if type(self.value) == "function" then
+			value = self:value(section)
+		else
+			value = self.value
+		end
+	else
+		value = AbstractValue.cfgvalue(self, section)
+	end
+	return value
+end
+
+function DummyValue.parse(self)
+
+end
+
+
+--[[
+Flag - A flag being enabled or disabled
+]]--
+Flag = class(AbstractValue)
+
+function Flag.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template  = "cbi/fvalue"
+
+	self.enabled  = "1"
+	self.disabled = "0"
+	self.default  = self.disabled
+end
+
+-- A flag can only have two states: set or unset
+function Flag.parse(self, section)
+	local fexists = self.map:formvalue(
+		FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option)
+
+	if fexists then
+		local fvalue = self:formvalue(section) and self.enabled or self.disabled
+		if fvalue ~= self.default or (not self.optional and not self.rmempty) then
+			self:write(section, fvalue)
+		else
+			self:remove(section)
+		end
+	else
+		self:remove(section)
+	end
+end
+
+function Flag.cfgvalue(self, section)
+	return AbstractValue.cfgvalue(self, section) or self.default
+end
+
+
+--[[
+ListValue - A one-line value predefined in a list
+	widget: The widget that will be used (select, radio)
+]]--
+ListValue = class(AbstractValue)
+
+function ListValue.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template  = "cbi/lvalue"
+
+	self.keylist = {}
+	self.vallist = {}
+	self.size   = 1
+	self.widget = "select"
+end
+
+function ListValue.reset_values(self)
+	self.keylist = {}
+	self.vallist = {}
+end
+
+function ListValue.value(self, key, val, ...)
+	if luci.util.contains(self.keylist, key) then
+		return
+	end
+
+	val = val or key
+	table.insert(self.keylist, tostring(key))
+	table.insert(self.vallist, tostring(val))
+
+	for i, deps in ipairs({...}) do
+		self.subdeps[#self.subdeps + 1] = {add = "-"..key, deps=deps}
+	end
+end
+
+function ListValue.validate(self, val)
+	if luci.util.contains(self.keylist, val) then
+		return val
+	else
+		return nil
+	end
+end
+
+
+
+--[[
+MultiValue - Multiple delimited values
+	widget: The widget that will be used (select, checkbox)
+	delimiter: The delimiter that will separate the values (default: " ")
+]]--
+MultiValue = class(AbstractValue)
+
+function MultiValue.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template = "cbi/mvalue"
+
+	self.keylist = {}
+	self.vallist = {}
+
+	self.widget = "checkbox"
+	self.delimiter = " "
+end
+
+function MultiValue.render(self, ...)
+	if self.widget == "select" and not self.size then
+		self.size = #self.vallist
+	end
+
+	AbstractValue.render(self, ...)
+end
+
+function MultiValue.reset_values(self)
+	self.keylist = {}
+	self.vallist = {}
+end
+
+function MultiValue.value(self, key, val)
+	if luci.util.contains(self.keylist, key) then
+		return
+	end
+
+	val = val or key
+	table.insert(self.keylist, tostring(key))
+	table.insert(self.vallist, tostring(val))
+end
+
+function MultiValue.valuelist(self, section)
+	local val = self:cfgvalue(section)
+
+	if not(type(val) == "string") then
+		return {}
+	end
+
+	return luci.util.split(val, self.delimiter)
+end
+
+function MultiValue.validate(self, val)
+	val = (type(val) == "table") and val or {val}
+
+	local result
+
+	for i, value in ipairs(val) do
+		if luci.util.contains(self.keylist, value) then
+			result = result and (result .. self.delimiter .. value) or value
+		end
+	end
+
+	return result
+end
+
+
+StaticList = class(MultiValue)
+
+function StaticList.__init__(self, ...)
+	MultiValue.__init__(self, ...)
+	self.cast = "table"
+	self.valuelist = self.cfgvalue
+
+	if not self.override_scheme
+	 and self.map:get_scheme(self.section.sectiontype, self.option) then
+		local vs = self.map:get_scheme(self.section.sectiontype, self.option)
+		if self.value and vs.values and not self.override_values then
+			for k, v in pairs(vs.values) do
+				self:value(k, v)
+			end
+		end
+	end
+end
+
+function StaticList.validate(self, value)
+	value = (type(value) == "table") and value or {value}
+
+	local valid = {}
+	for i, v in ipairs(value) do
+		if luci.util.contains(self.keylist, v) then
+			table.insert(valid, v)
+		end
+	end
+	return valid
+end
+
+
+DynamicList = class(AbstractValue)
+
+function DynamicList.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template  = "cbi/dynlist"
+	self.cast = "table"
+	self.keylist = {}
+	self.vallist = {}
+end
+
+function DynamicList.reset_values(self)
+	self.keylist = {}
+	self.vallist = {}
+end
+
+function DynamicList.value(self, key, val)
+	val = val or key
+	table.insert(self.keylist, tostring(key))
+	table.insert(self.vallist, tostring(val))
+end
+
+function DynamicList.write(self, section, value)
+	local t = { }
+
+	if type(value) == "table" then
+		local x
+		for _, x in ipairs(value) do
+			if x and #x > 0 then
+				t[#t+1] = x
+			end
+		end
+	else
+		t = { value }
+	end
+
+	if self.cast == "string" then
+		value = table.concat(t, " ")
+	else
+		value = t
+	end
+
+	return AbstractValue.write(self, section, value)
+end
+
+function DynamicList.cfgvalue(self, section)
+	local value = AbstractValue.cfgvalue(self, section)
+
+	if type(value) == "string" then
+		local x
+		local t = { }
+		for x in value:gmatch("%S+") do
+			if #x > 0 then
+				t[#t+1] = x
+			end
+		end
+		value = t
+	end
+
+	return value
+end
+
+function DynamicList.formvalue(self, section)
+	local value = AbstractValue.formvalue(self, section)
+
+	if type(value) == "string" then
+		if self.cast == "string" then
+			local x
+			local t = { }
+			for x in value:gmatch("%S+") do
+				t[#t+1] = x
+			end
+			value = t
+		else
+			value = { value }
+		end
+	end
+
+	return value
+end
+
+
+--[[
+TextValue - A multi-line value
+	rows:	Rows
+]]--
+TextValue = class(AbstractValue)
+
+function TextValue.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template  = "cbi/tvalue"
+end
+
+--[[
+Button
+]]--
+Button = class(AbstractValue)
+
+function Button.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template  = "cbi/button"
+	self.inputstyle = nil
+	self.rmempty = true
+end
+
+
+FileUpload = class(AbstractValue)
+
+function FileUpload.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template = "cbi/upload"
+	if not self.map.upload_fields then
+		self.map.upload_fields = { self }
+	else
+		self.map.upload_fields[#self.map.upload_fields+1] = self
+	end
+end
+
+function FileUpload.formcreated(self, section)
+	return AbstractValue.formcreated(self, section) or
+		self.map:formvalue("cbi.rlf."..section.."."..self.option) or
+		self.map:formvalue("cbi.rlf."..section.."."..self.option..".x")
+end
+
+function FileUpload.cfgvalue(self, section)
+	local val = AbstractValue.cfgvalue(self, section)
+	if val and fs.access(val) then
+		return val
+	end
+	return nil
+end
+
+function FileUpload.formvalue(self, section)
+	local val = AbstractValue.formvalue(self, section)
+	if val then
+		if not self.map:formvalue("cbi.rlf."..section.."."..self.option) and
+		   not self.map:formvalue("cbi.rlf."..section.."."..self.option..".x")
+		then
+			return val
+		end
+		fs.unlink(val)
+		self.value = nil
+	end
+	return nil
+end
+
+function FileUpload.remove(self, section)
+	local val = AbstractValue.formvalue(self, section)
+	if val and fs.access(val) then fs.unlink(val) end
+	return AbstractValue.remove(self, section)
+end
+
+
+FileBrowser = class(AbstractValue)
+
+function FileBrowser.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template = "cbi/browser"
+end
diff --git a/trunk/package/luci/modules/base/luasrc/cbi/datatypes.lua b/trunk/package/luci/modules/base/luasrc/cbi/datatypes.lua
new file mode 100644
index 00000000..c5f4ec0f
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/cbi/datatypes.lua
@@ -0,0 +1,345 @@
+--[[
+
+LuCI - Configuration Bind Interface - Datatype Tests
+(c) 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local fs = require "nixio.fs"
+local ip = require "luci.ip"
+local math = require "math"
+local util = require "luci.util"
+local tonumber, tostring, type, unpack, select = tonumber, tostring, type, unpack, select
+
+
+module "luci.cbi.datatypes"
+
+
+_M['or'] = function(v, ...)
+	local i
+	for i = 1, select('#', ...), 2 do
+		local f = select(i, ...)
+		local a = select(i+1, ...)
+		if type(f) ~= "function" then
+			if f == v then
+				return true
+			end
+			i = i - 1
+		elseif f(v, unpack(a)) then
+			return true
+		end
+	end
+	return false
+end
+
+_M['and'] = function(v, ...)
+	local i
+	for i = 1, select('#', ...), 2 do
+		local f = select(i, ...)
+		local a = select(i+1, ...)
+		if type(f) ~= "function" then
+			if f ~= v then
+				return false
+			end
+			i = i - 1
+		elseif not f(v, unpack(a)) then
+			return false
+		end
+	end
+	return true
+end
+
+function neg(v, ...)
+	return _M['or'](v:gsub("^%s*!%s*", ""), ...)
+end
+
+function list(v, subvalidator, subargs)
+	if type(subvalidator) ~= "function" then
+		return false
+	end
+	local token
+	for token in v:gmatch("%S+") do
+		if not subvalidator(token, unpack(subargs)) then
+			return false
+		end
+	end
+	return true
+end
+
+function bool(val)
+	if val == "1" or val == "yes" or val == "on" or val == "true" then
+		return true
+	elseif val == "0" or val == "no" or val == "off" or val == "false" then
+		return true
+	elseif val == "" or val == nil then
+		return true
+	end
+
+	return false
+end
+
+function uinteger(val)
+	local n = tonumber(val)
+	if n ~= nil and math.floor(n) == n and n >= 0 then
+		return true
+	end
+
+	return false
+end
+
+function integer(val)
+	local n = tonumber(val)
+	if n ~= nil and math.floor(n) == n then
+		return true
+	end
+
+	return false
+end
+
+function ufloat(val)
+	local n = tonumber(val)
+	return ( n ~= nil and n >= 0 )
+end
+
+function float(val)
+	return ( tonumber(val) ~= nil )
+end
+
+function ipaddr(val)
+	return ip4addr(val) or ip6addr(val)
+end
+
+function ip4addr(val)
+	if val then
+		return ip.IPv4(val) and true or false
+	end
+
+	return false
+end
+
+function ip4prefix(val)
+	val = tonumber(val)
+	return ( val and val >= 0 and val <= 32 )
+end
+
+function ip6addr(val)
+	if val then
+		return ip.IPv6(val) and true or false
+	end
+
+	return false
+end
+
+function ip6prefix(val)
+	val = tonumber(val)
+	return ( val and val >= 0 and val <= 128 )
+end
+
+function port(val)
+	val = tonumber(val)
+	return ( val and val >= 0 and val <= 65535 )
+end
+
+function portrange(val)
+	local p1, p2 = val:match("^(%d+)%-(%d+)$")
+	if p1 and p2 and port(p1) and port(p2) then
+		return true
+	else
+		return port(val)
+	end
+end
+
+function macaddr(val)
+	if val and val:match(
+		"^[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+:" ..
+		 "[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+$"
+	) then
+		local parts = util.split( val, ":" )
+
+		for i = 1,6 do
+			parts[i] = tonumber( parts[i], 16 )
+			if parts[i] < 0 or parts[i] > 255 then
+				return false
+			end
+		end
+
+		return true
+	end
+
+	return false
+end
+
+function hostname(val)
+	if val and (#val < 254) and (
+	   val:match("^[a-zA-Z_]+$") or
+	   (val:match("^[a-zA-Z0-9_][a-zA-Z0-9_%-%.]*[a-zA-Z0-9]$") and
+	    val:match("[^0-9%.]"))
+	) then
+		return true
+	end
+	return false
+end
+
+function host(val)
+	return hostname(val) or ipaddr(val)
+end
+
+function network(val)
+	return uciname(val) or host(val)
+end
+
+function wpakey(val)
+	if #val == 64 then
+		return (val:match("^[a-fA-F0-9]+$") ~= nil)
+	else
+		return (#val >= 8) and (#val <= 63)
+	end
+end
+
+function wepkey(val)
+	if val:sub(1, 2) == "s:" then
+		val = val:sub(3)
+	end
+
+	if (#val == 10) or (#val == 26) then
+		return (val:match("^[a-fA-F0-9]+$") ~= nil)
+	else
+		return (#val == 5) or (#val == 13)
+	end
+end
+
+function string(val)
+	return true		-- Everything qualifies as valid string
+end
+
+function directory( val, seen )
+	local s = fs.stat(val)
+	seen = seen or { }
+
+	if s and not seen[s.ino] then
+		seen[s.ino] = true
+		if s.type == "dir" then
+			return true
+		elseif s.type == "lnk" then
+			return directory( fs.readlink(val), seen )
+		end
+	end
+
+	return false
+end
+
+function file( val, seen )
+	local s = fs.stat(val)
+	seen = seen or { }
+
+	if s and not seen[s.ino] then
+		seen[s.ino] = true
+		if s.type == "reg" then
+			return true
+		elseif s.type == "lnk" then
+			return file( fs.readlink(val), seen )
+		end
+	end
+
+	return false
+end
+
+function device( val, seen )
+	local s = fs.stat(val)
+	seen = seen or { }
+
+	if s and not seen[s.ino] then
+		seen[s.ino] = true
+		if s.type == "chr" or s.type == "blk" then
+			return true
+		elseif s.type == "lnk" then
+			return device( fs.readlink(val), seen )
+		end
+	end
+
+	return false
+end
+
+function uciname(val)
+	return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
+end
+
+function range(val, min, max)
+	val = tonumber(val)
+	min = tonumber(min)
+	max = tonumber(max)
+
+	if val ~= nil and min ~= nil and max ~= nil then
+		return ((val >= min) and (val <= max))
+	end
+
+	return false
+end
+
+function min(val, min)
+	val = tonumber(val)
+	min = tonumber(min)
+
+	if val ~= nil and min ~= nil then
+		return (val >= min)
+	end
+
+	return false
+end
+
+function max(val, max)
+	val = tonumber(val)
+	max = tonumber(max)
+
+	if val ~= nil and max ~= nil then
+		return (val <= max)
+	end
+
+	return false
+end
+
+function rangelength(val, min, max)
+	val = tostring(val)
+	min = tonumber(min)
+	max = tonumber(max)
+
+	if val ~= nil and min ~= nil and max ~= nil then
+		return ((#val >= min) and (#val <= max))
+	end
+
+	return false
+end
+
+function minlength(val, min)
+	val = tostring(val)
+	min = tonumber(min)
+
+	if val ~= nil and min ~= nil then
+		return (#val >= min)
+	end
+
+	return false
+end
+
+function maxlength(val, max)
+	val = tostring(val)
+	max = tonumber(max)
+
+	if val ~= nil and max ~= nil then
+		return (#val <= max)
+	end
+
+	return false
+end
+
+function phonedigit(val)
+	return (val:match("^[0-9\*#!%.]+$") ~= nil)
+end
diff --git a/trunk/package/luci/modules/base/luasrc/ccache.lua b/trunk/package/luci/modules/base/luasrc/ccache.lua
new file mode 100644
index 00000000..56ccbc3e
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/ccache.lua
@@ -0,0 +1,87 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local io = require "io"
+local fs = require "nixio.fs"
+local util = require "luci.util"
+local nixio = require "nixio"
+local debug = require "debug"
+local string = require "string"
+local package = require "package"
+
+local type, loadfile = type, loadfile
+
+
+module "luci.ccache"
+
+function cache_ondemand(...)
+	if debug.getinfo(1, 'S').source ~= "=?" then
+		cache_enable(...)
+	end
+end
+
+function cache_enable(cachepath, mode)
+	cachepath = cachepath or "/tmp/luci-modulecache"
+	mode = mode or "r--r--r--"
+
+	local loader = package.loaders[2]
+	local uid    = nixio.getuid()
+
+	if not fs.stat(cachepath) then
+		fs.mkdir(cachepath)
+	end
+
+	local function _encode_filename(name)
+		local encoded = ""
+		for i=1, #name do
+			encoded = encoded .. ("%2X" % string.byte(name, i))
+		end
+		return encoded
+	end
+
+	local function _load_sane(file)
+		local stat = fs.stat(file)
+		if stat and stat.uid == uid and stat.modestr == mode then
+			return loadfile(file)
+		end
+	end
+
+	local function _write_sane(file, func)
+		if nixio.getuid() == uid then
+			local fp = io.open(file, "w")
+			if fp then
+				fp:write(util.get_bytecode(func))
+				fp:close()
+				fs.chmod(file, mode)
+			end
+		end
+	end
+
+	package.loaders[2] = function(mod)
+		local encoded = cachepath .. "/" .. _encode_filename(mod)
+		local modcons = _load_sane(encoded)
+		
+		if modcons then
+			return modcons
+		end
+
+		-- No cachefile
+		modcons = loader(mod)
+		if type(modcons) == "function" then
+			_write_sane(encoded, modcons)
+		end
+		return modcons
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/config.lua b/trunk/package/luci/modules/base/luasrc/config.lua
new file mode 100644
index 00000000..53db82b3
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/config.lua
@@ -0,0 +1,42 @@
+--[[
+LuCI - Configuration
+
+Description:
+Some LuCI configuration values read from uci file "luci"
+
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+	http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local util = require "luci.util"
+module("luci.config",
+		function(m)
+			if pcall(require, "luci.model.uci") then
+				local config = util.threadlocal()
+				setmetatable(m, {
+					__index = function(tbl, key)
+						if not config[key] then
+							config[key] = luci.model.uci.cursor():get_all("luci", key)
+						end
+						return config[key]
+					end
+				})
+			end
+		end)
diff --git a/trunk/package/luci/modules/base/luasrc/controller/admin/servicectl.lua b/trunk/package/luci/modules/base/luasrc/controller/admin/servicectl.lua
new file mode 100644
index 00000000..753d2c77
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/controller/admin/servicectl.lua
@@ -0,0 +1,60 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.admin.servicectl", package.seeall)
+
+function index()
+	entry({"servicectl"}, alias("servicectl", "status")).sysauth = "root"
+	entry({"servicectl", "status"}, call("action_status")).leaf = true
+	entry({"servicectl", "restart"}, call("action_restart")).leaf = true
+end
+
+function action_status()
+	local data = nixio.fs.readfile("/var/run/luci-reload-status")
+	if data then
+		luci.http.write("/etc/config/")
+		luci.http.write(data)
+	else
+		luci.http.write("finish")
+	end
+end
+
+function action_restart(args)
+	local uci = require "luci.model.uci".cursor()
+	if args then
+		local service
+		local services = { }
+
+		for service in args:gmatch("[%w_-]+") do
+			services[#services+1] = service
+		end
+
+		local command = uci:apply(services, true)
+		if nixio.fork() == 0 then
+			local i = nixio.open("/dev/null", "r")
+			local o = nixio.open("/dev/null", "w")
+
+			nixio.dup(i, nixio.stdin)
+			nixio.dup(o, nixio.stdout)
+
+			i:close()
+			o:close()
+
+			nixio.exec("/bin/sh", unpack(command))
+		else
+			luci.http.write("OK")
+			os.exit(0)
+		end
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/debug.lua b/trunk/package/luci/modules/base/luasrc/debug.lua
new file mode 100644
index 00000000..8ff1bb69
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/debug.lua
@@ -0,0 +1,37 @@
+local debug = require "debug"
+local io = require "io"
+local collectgarbage, floor = collectgarbage, math.floor
+
+module "luci.debug"
+__file__ = debug.getinfo(1, 'S').source:sub(2)
+
+-- Enables the memory tracer with given flags and returns a function to disable the tracer again
+function trap_memtrace(flags, dest)
+	flags = flags or "clr"
+	local tracefile = io.open(dest or "/tmp/memtrace", "w")
+	local peak = 0
+
+	local function trap(what, line)
+		local info = debug.getinfo(2, "Sn")
+		local size = floor(collectgarbage("count"))
+		if size > peak then
+			peak = size
+		end
+		if tracefile then
+			tracefile:write(
+				"[", what, "] ", info.source, ":", (line or "?"), "\t",
+				(info.namewhat or ""), "\t",
+				(info.name or ""), "\t",
+				size, " (", peak, ")\n"
+			)
+		end
+	end
+
+	debug.sethook(trap, flags)
+
+	return function()
+		debug.sethook()
+		tracefile:close()
+	end
+end
+
diff --git a/trunk/package/luci/modules/base/luasrc/dispatcher.lua b/trunk/package/luci/modules/base/luasrc/dispatcher.lua
new file mode 100644
index 00000000..f7e16e77
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/dispatcher.lua
@@ -0,0 +1,959 @@
+--[[
+LuCI - Dispatcher
+
+Description:
+The request dispatcher and module dispatcher generators
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+--- LuCI web dispatcher.
+local fs = require "nixio.fs"
+local sys = require "luci.sys"
+local init = require "luci.init"
+local util = require "luci.util"
+local http = require "luci.http"
+local nixio = require "nixio", require "nixio.util"
+
+module("luci.dispatcher", package.seeall)
+context = util.threadlocal()
+uci = require "luci.model.uci"
+i18n = require "luci.i18n"
+_M.fs = fs
+
+authenticator = {}
+
+-- Index table
+local index = nil
+
+-- Fastindex
+local fi
+
+
+--- Build the URL relative to the server webroot from given virtual path.
+-- @param ...	Virtual path
+-- @return 		Relative URL
+function build_url(...)
+	local path = {...}
+	local url = { http.getenv("SCRIPT_NAME") or "" }
+
+	local k, v
+	for k, v in pairs(context.urltoken) do
+		url[#url+1] = "/;"
+		url[#url+1] = http.urlencode(k)
+		url[#url+1] = "="
+		url[#url+1] = http.urlencode(v)
+	end
+
+	local p
+	for _, p in ipairs(path) do
+		if p:match("^[a-zA-Z0-9_%-%.%%/,;]+$") then
+			url[#url+1] = "/"
+			url[#url+1] = p
+		end
+	end
+
+	return table.concat(url, "")
+end
+
+--- Check whether a dispatch node shall be visible
+-- @param node	Dispatch node
+-- @return		Boolean indicating whether the node should be visible
+function node_visible(node)
+   if node then
+	  return not (
+		 (not node.title or #node.title == 0) or
+		 (not node.target or node.hidden == true) or
+		 (type(node.target) == "table" and node.target.type == "firstchild" and
+		  (type(node.nodes) ~= "table" or not next(node.nodes)))
+	  )
+   end
+   return false
+end
+
+--- Return a sorted table of visible childs within a given node
+-- @param node	Dispatch node
+-- @return		Ordered table of child node names
+function node_childs(node)
+	local rv = { }
+	if node then
+		local k, v
+		for k, v in util.spairs(node.nodes,
+			function(a, b)
+				return (node.nodes[a].order or 100)
+				     < (node.nodes[b].order or 100)
+			end)
+		do
+			if node_visible(v) then
+				rv[#rv+1] = k
+			end
+		end
+	end
+	return rv
+end
+
+
+--- Send a 404 error code and render the "error404" template if available.
+-- @param message	Custom error message (optional)
+-- @return			false
+function error404(message)
+	luci.http.status(404, "Not Found")
+	message = message or "Not Found"
+
+	require("luci.template")
+	if not luci.util.copcall(luci.template.render, "error404") then
+		luci.http.prepare_content("text/plain")
+		luci.http.write(message)
+	end
+	return false
+end
+
+--- Send a 500 error code and render the "error500" template if available.
+-- @param message	Custom error message (optional)#
+-- @return			false
+function error500(message)
+	luci.util.perror(message)
+	if not context.template_header_sent then
+		luci.http.status(500, "Internal Server Error")
+		luci.http.prepare_content("text/plain")
+		luci.http.write(message)
+	else
+		require("luci.template")
+		if not luci.util.copcall(luci.template.render, "error500", {message=message}) then
+			luci.http.prepare_content("text/plain")
+			luci.http.write(message)
+		end
+	end
+	return false
+end
+
+function authenticator.htmlauth(validator, accs, default)
+	local user = luci.http.formvalue("luci_username")
+	local pass = luci.http.formvalue("luci_password")
+
+	if user and validator(user, pass) then
+		return user
+	end
+
+	require("luci.i18n")
+	require("luci.template")
+	context.path = {}
+	luci.template.render("sysauth", {duser=default, fuser=user})
+	return false
+
+end
+
+--- Dispatch an HTTP request.
+-- @param request	LuCI HTTP Request object
+function httpdispatch(request, prefix)
+	luci.http.context.request = request
+
+	local r = {}
+	context.request = r
+	context.urltoken = {}
+
+	local pathinfo = http.urldecode(request:getenv("PATH_INFO") or "", true)
+
+	if prefix then
+		for _, node in ipairs(prefix) do
+			r[#r+1] = node
+		end
+	end
+
+	local tokensok = true
+	for node in pathinfo:gmatch("[^/]+") do
+		local tkey, tval
+		if tokensok then
+			tkey, tval = node:match(";(%w+)=([a-fA-F0-9]*)")
+		end
+		if tkey then
+			context.urltoken[tkey] = tval
+		else
+			tokensok = false
+			r[#r+1] = node
+		end
+	end
+
+	local stat, err = util.coxpcall(function()
+		dispatch(context.request)
+	end, error500)
+
+	luci.http.close()
+
+	--context._disable_memtrace()
+end
+
+--- Dispatches a LuCI virtual path.
+-- @param request	Virtual path
+function dispatch(request)
+	--context._disable_memtrace = require "luci.debug".trap_memtrace("l")
+	local ctx = context
+	ctx.path = request
+
+	local conf = require "luci.config"
+	assert(conf.main,
+		"/etc/config/luci seems to be corrupt, unable to find section 'main'")
+
+	local lang = conf.main.lang or "auto"
+	if lang == "auto" then
+		local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
+		for lpat in aclang:gmatch("[%w-]+") do
+			lpat = lpat and lpat:gsub("-", "_")
+			if conf.languages[lpat] then
+				lang = lpat
+				break
+			end
+		end
+	end
+	require "luci.i18n".setlanguage(lang)
+
+	local c = ctx.tree
+	local stat
+	if not c then
+		c = createtree()
+	end
+
+	local track = {}
+	local args = {}
+	ctx.args = args
+	ctx.requestargs = ctx.requestargs or args
+	local n
+	local token = ctx.urltoken
+	local preq = {}
+	local freq = {}
+
+	for i, s in ipairs(request) do
+		preq[#preq+1] = s
+		freq[#freq+1] = s
+		c = c.nodes[s]
+		n = i
+		if not c then
+			break
+		end
+
+		util.update(track, c)
+
+		if c.leaf then
+			break
+		end
+	end
+
+	if c and c.leaf then
+		for j=n+1, #request do
+			args[#args+1] = request[j]
+			freq[#freq+1] = request[j]
+		end
+	end
+
+	ctx.requestpath = ctx.requestpath or freq
+	ctx.path = preq
+
+	if track.i18n then
+		i18n.loadc(track.i18n)
+	end
+
+	-- Init template engine
+	if (c and c.index) or not track.notemplate then
+		local tpl = require("luci.template")
+		local media = track.mediaurlbase or luci.config.main.mediaurlbase
+		if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
+			media = nil
+			for name, theme in pairs(luci.config.themes) do
+				if name:sub(1,1) ~= "." and pcall(tpl.Template,
+				 "themes/%s/header" % fs.basename(theme)) then
+					media = theme
+				end
+			end
+			assert(media, "No valid theme found")
+		end
+
+		local function _ifattr(cond, key, val)
+			if cond then
+				local env = getfenv(3)
+				local scope = (type(env.self) == "table") and env.self
+				return string.format(
+					' %s="%s"', tostring(key),
+					luci.util.pcdata(tostring( val
+					 or (type(env[key]) ~= "function" and env[key])
+					 or (scope and type(scope[key]) ~= "function" and scope[key])
+					 or "" ))
+				)
+			else
+				return ''
+			end
+		end
+
+		tpl.context.viewns = setmetatable({
+		   write       = luci.http.write;
+		   include     = function(name) tpl.Template(name):render(getfenv(2)) end;
+		   translate   = i18n.translate;
+		   translatef  = i18n.translatef;
+		   export      = function(k, v) if tpl.context.viewns[k] == nil then tpl.context.viewns[k] = v end end;
+		   striptags   = util.striptags;
+		   pcdata      = util.pcdata;
+		   media       = media;
+		   theme       = fs.basename(media);
+		   resource    = luci.config.main.resourcebase;
+		   ifattr      = function(...) return _ifattr(...) end;
+		   attr        = function(...) return _ifattr(true, ...) end;
+		}, {__index=function(table, key)
+			if key == "controller" then
+				return build_url()
+			elseif key == "REQUEST_URI" then
+				return build_url(unpack(ctx.requestpath))
+			else
+				return rawget(table, key) or _G[key]
+			end
+		end})
+	end
+
+	track.dependent = (track.dependent ~= false)
+	assert(not track.dependent or not track.auto,
+		"Access Violation\nThe page at '" .. table.concat(request, "/") .. "/' " ..
+		"has no parent node so the access to this location has been denied.\n" ..
+		"This is a software bug, please report this message at " ..
+		"http://luci.subsignal.org/trac/newticket"
+	)
+
+	if track.sysauth then
+		local sauth = require "luci.sauth"
+
+		local authen = type(track.sysauth_authenticator) == "function"
+		 and track.sysauth_authenticator
+		 or authenticator[track.sysauth_authenticator]
+
+		local def  = (type(track.sysauth) == "string") and track.sysauth
+		local accs = def and {track.sysauth} or track.sysauth
+		local sess = ctx.authsession
+		local verifytoken = false
+		if not sess then
+			sess = luci.http.getcookie("sysauth")
+			sess = sess and sess:match("^[a-f0-9]*$")
+			verifytoken = true
+		end
+
+		local sdat = sauth.read(sess)
+		local user
+
+		if sdat then
+			if not verifytoken or ctx.urltoken.stok == sdat.token then
+				user = sdat.user
+			end
+		else
+			local eu = http.getenv("HTTP_AUTH_USER")
+			local ep = http.getenv("HTTP_AUTH_PASS")
+			if eu and ep and luci.sys.user.checkpasswd(eu, ep) then
+				authen = function() return eu end
+			end
+		end
+
+		if not util.contains(accs, user) then
+			if authen then
+				ctx.urltoken.stok = nil
+				local user, sess = authen(luci.sys.user.checkpasswd, accs, def)
+				if not user or not util.contains(accs, user) then
+					return
+				else
+					local sid = sess or luci.sys.uniqueid(16)
+					if not sess then
+						local token = luci.sys.uniqueid(16)
+						sauth.reap()
+						sauth.write(sid, {
+							user=user,
+							token=token,
+							secret=luci.sys.uniqueid(16)
+						})
+						ctx.urltoken.stok = token
+					end
+					luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())
+					ctx.authsession = sid
+					ctx.authuser = user
+				end
+			else
+				luci.http.status(403, "Forbidden")
+				return
+			end
+		else
+			ctx.authsession = sess
+			ctx.authuser = user
+		end
+	end
+
+	if track.setgroup then
+		luci.sys.process.setgroup(track.setgroup)
+	end
+
+	if track.setuser then
+		luci.sys.process.setuser(track.setuser)
+	end
+
+	local target = nil
+	if c then
+		if type(c.target) == "function" then
+			target = c.target
+		elseif type(c.target) == "table" then
+			target = c.target.target
+		end
+	end
+
+	if c and (c.index or type(target) == "function") then
+		ctx.dispatched = c
+		ctx.requested = ctx.requested or ctx.dispatched
+	end
+
+	if c and c.index then
+		local tpl = require "luci.template"
+
+		if util.copcall(tpl.render, "indexer", {}) then
+			return true
+		end
+	end
+
+	if type(target) == "function" then
+		util.copcall(function()
+			local oldenv = getfenv(target)
+			local module = require(c.module)
+			local env = setmetatable({}, {__index=
+
+			function(tbl, key)
+				return rawget(tbl, key) or module[key] or oldenv[key]
+			end})
+
+			setfenv(target, env)
+		end)
+
+		local ok, err
+		if type(c.target) == "table" then
+			ok, err = util.copcall(target, c.target, unpack(args))
+		else
+			ok, err = util.copcall(target, unpack(args))
+		end
+		assert(ok,
+		       "Failed to execute " .. (type(c.target) == "function" and "function" or c.target.type or "unknown") ..
+		       " dispatcher target for entry '/" .. table.concat(request, "/") .. "'.\n" ..
+		       "The called action terminated with an exception:\n" .. tostring(err or "(unknown)"))
+	else
+		local root = node()
+		if not root or not root.target then
+			error404("No root node was registered, this usually happens if no module was installed.\n" ..
+			         "Install luci-mod-admin-full and retry. " ..
+			         "If the module is already installed, try removing the /tmp/luci-indexcache file.")
+		else
+			error404("No page is registered at '/" .. table.concat(request, "/") .. "'.\n" ..
+			         "If this url belongs to an extension, make sure it is properly installed.\n" ..
+			         "If the extension was recently installed, try removing the /tmp/luci-indexcache file.")
+		end
+	end
+end
+
+--- Generate the dispatching index using the best possible strategy.
+function createindex()
+	local path = luci.util.libpath() .. "/controller/"
+	local suff = { ".lua", ".lua.gz" }
+
+	if luci.util.copcall(require, "luci.fastindex") then
+		createindex_fastindex(path, suff)
+	else
+		createindex_plain(path, suff)
+	end
+end
+
+--- Generate the dispatching index using the fastindex C-indexer.
+-- @param path		Controller base directory
+-- @param suffixes	Controller file suffixes
+function createindex_fastindex(path, suffixes)
+	index = {}
+
+	if not fi then
+		fi = luci.fastindex.new("index")
+		for _, suffix in ipairs(suffixes) do
+			fi.add(path .. "*" .. suffix)
+			fi.add(path .. "*/*" .. suffix)
+		end
+	end
+	fi.scan()
+
+	for k, v in pairs(fi.indexes) do
+		index[v[2]] = v[1]
+	end
+end
+
+--- Generate the dispatching index using the native file-cache based strategy.
+-- @param path		Controller base directory
+-- @param suffixes	Controller file suffixes
+function createindex_plain(path, suffixes)
+	local controllers = { }
+	for _, suffix in ipairs(suffixes) do
+		nixio.util.consume((fs.glob(path .. "*" .. suffix)), controllers)
+		nixio.util.consume((fs.glob(path .. "*/*" .. suffix)), controllers)
+	end
+
+	if indexcache then
+		local cachedate = fs.stat(indexcache, "mtime")
+		if cachedate then
+			local realdate = 0
+			for _, obj in ipairs(controllers) do
+				local omtime = fs.stat(obj, "mtime")
+				realdate = (omtime and omtime > realdate) and omtime or realdate
+			end
+
+			if cachedate > realdate then
+				assert(
+					sys.process.info("uid") == fs.stat(indexcache, "uid")
+					and fs.stat(indexcache, "modestr") == "rw-------",
+					"Fatal: Indexcache is not sane!"
+				)
+
+				index = loadfile(indexcache)()
+				return index
+			end
+		end
+	end
+
+	index = {}
+
+	for i,c in ipairs(controllers) do
+		local modname = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".")
+		for _, suffix in ipairs(suffixes) do
+			modname = modname:gsub(suffix.."$", "")
+		end
+
+		local mod = require(modname)
+		assert(mod ~= true,
+		       "Invalid controller file found\n" ..
+		       "The file '" .. c .. "' contains an invalid module line.\n" ..
+		       "Please verify whether the module name is set to '" .. modname ..
+		       "' - It must correspond to the file path!")
+
+		local idx = mod.index
+		assert(type(idx) == "function",
+		       "Invalid controller file found\n" ..
+		       "The file '" .. c .. "' contains no index() function.\n" ..
+		       "Please make sure that the controller contains a valid " ..
+		       "index function and verify the spelling!")
+
+		index[modname] = idx
+	end
+
+	if indexcache then
+		local f = nixio.open(indexcache, "w", 600)
+		f:writeall(util.get_bytecode(index))
+		f:close()
+	end
+end
+
+--- Create the dispatching tree from the index.
+-- Build the index before if it does not exist yet.
+function createtree()
+	if not index then
+		createindex()
+	end
+
+	local ctx  = context
+	local tree = {nodes={}, inreq=true}
+	local modi = {}
+
+	ctx.treecache = setmetatable({}, {__mode="v"})
+	ctx.tree = tree
+	ctx.modifiers = modi
+
+	-- Load default translation
+	require "luci.i18n".loadc("base")
+
+	local scope = setmetatable({}, {__index = luci.dispatcher})
+
+	for k, v in pairs(index) do
+		scope._NAME = k
+		setfenv(v, scope)
+		v()
+	end
+
+	local function modisort(a,b)
+		return modi[a].order < modi[b].order
+	end
+
+	for _, v in util.spairs(modi, modisort) do
+		scope._NAME = v.module
+		setfenv(v.func, scope)
+		v.func()
+	end
+
+	return tree
+end
+
+--- Register a tree modifier.
+-- @param	func	Modifier function
+-- @param	order	Modifier order value (optional)
+function modifier(func, order)
+	context.modifiers[#context.modifiers+1] = {
+		func = func,
+		order = order or 0,
+		module
+			= getfenv(2)._NAME
+	}
+end
+
+--- Clone a node of the dispatching tree to another position.
+-- @param	path	Virtual path destination
+-- @param	clone	Virtual path source
+-- @param	title	Destination node title (optional)
+-- @param	order	Destination node order value (optional)
+-- @return			Dispatching tree node
+function assign(path, clone, title, order)
+	local obj  = node(unpack(path))
+	obj.nodes  = nil
+	obj.module = nil
+
+	obj.title = title
+	obj.order = order
+
+	setmetatable(obj, {__index = _create_node(clone)})
+
+	return obj
+end
+
+--- Create a new dispatching node and define common parameters.
+-- @param	path	Virtual path
+-- @param	target	Target function to call when dispatched.
+-- @param	title	Destination node title
+-- @param	order	Destination node order value (optional)
+-- @return			Dispatching tree node
+function entry(path, target, title, order)
+	local c = node(unpack(path))
+
+	c.target = target
+	c.title  = title
+	c.order  = order
+	c.module = getfenv(2)._NAME
+
+	return c
+end
+
+--- Fetch or create a dispatching node without setting the target module or
+-- enabling the node.
+-- @param	...		Virtual path
+-- @return			Dispatching tree node
+function get(...)
+	return _create_node({...})
+end
+
+--- Fetch or create a new dispatching node.
+-- @param	...		Virtual path
+-- @return			Dispatching tree node
+function node(...)
+	local c = _create_node({...})
+
+	c.module = getfenv(2)._NAME
+	c.auto = nil
+
+	return c
+end
+
+function _create_node(path)
+	if #path == 0 then
+		return context.tree
+	end
+
+	local name = table.concat(path, ".")
+	local c = context.treecache[name]
+
+	if not c then
+		local last = table.remove(path)
+		local parent = _create_node(path)
+
+		c = {nodes={}, auto=true}
+		-- the node is "in request" if the request path matches
+		-- at least up to the length of the node path
+		if parent.inreq and context.path[#path+1] == last then
+		  c.inreq = true
+		end
+		parent.nodes[last] = c
+		context.treecache[name] = c
+	end
+	return c
+end
+
+-- Subdispatchers --
+
+function _firstchild()
+   local path = { unpack(context.path) }
+   local name = table.concat(path, ".")
+   local node = context.treecache[name]
+
+   local lowest
+   if node and node.nodes and next(node.nodes) then
+	  local k, v
+	  for k, v in pairs(node.nodes) do
+		 if not lowest or
+			(v.order or 100) < (node.nodes[lowest].order or 100)
+		 then
+			lowest = k
+		 end
+	  end
+   end
+
+   assert(lowest ~= nil,
+		  "The requested node contains no childs, unable to redispatch")
+
+   path[#path+1] = lowest
+   dispatch(path)
+end
+
+--- Alias the first (lowest order) page automatically
+function firstchild()
+   return { type = "firstchild", target = _firstchild }
+end
+
+--- Create a redirect to another dispatching node.
+-- @param	...		Virtual path destination
+function alias(...)
+	local req = {...}
+	return function(...)
+		for _, r in ipairs({...}) do
+			req[#req+1] = r
+		end
+
+		dispatch(req)
+	end
+end
+
+--- Rewrite the first x path values of the request.
+-- @param	n		Number of path values to replace
+-- @param	...		Virtual path to replace removed path values with
+function rewrite(n, ...)
+	local req = {...}
+	return function(...)
+		local dispatched = util.clone(context.dispatched)
+
+		for i=1,n do
+			table.remove(dispatched, 1)
+		end
+
+		for i, r in ipairs(req) do
+			table.insert(dispatched, i, r)
+		end
+
+		for _, r in ipairs({...}) do
+			dispatched[#dispatched+1] = r
+		end
+
+		dispatch(dispatched)
+	end
+end
+
+
+local function _call(self, ...)
+	local func = getfenv()[self.name]
+	assert(func ~= nil,
+	       'Cannot resolve function "' .. self.name .. '". Is it misspelled or local?')
+
+	assert(type(func) == "function",
+	       'The symbol "' .. self.name .. '" does not refer to a function but data ' ..
+	       'of type "' .. type(func) .. '".')
+
+	if #self.argv > 0 then
+		return func(unpack(self.argv), ...)
+	else
+		return func(...)
+	end
+end
+
+--- Create a function-call dispatching target.
+-- @param	name	Target function of local controller
+-- @param	...		Additional parameters passed to the function
+function call(name, ...)
+	return {type = "call", argv = {...}, name = name, target = _call}
+end
+
+
+local _template = function(self, ...)
+	require "luci.template".render(self.view)
+end
+
+--- Create a template render dispatching target.
+-- @param	name	Template to be rendered
+function template(name)
+	return {type = "template", view = name, target = _template}
+end
+
+
+local function _cbi(self, ...)
+	local cbi = require "luci.cbi"
+	local tpl = require "luci.template"
+	local http = require "luci.http"
+
+	local config = self.config or {}
+	local maps = cbi.load(self.model, ...)
+
+	local state = nil
+
+	for i, res in ipairs(maps) do
+		res.flow = config
+		local cstate = res:parse()
+		if cstate and (not state or cstate < state) then
+			state = cstate
+		end
+	end
+
+	local function _resolve_path(path)
+		return type(path) == "table" and build_url(unpack(path)) or path
+	end
+
+	if config.on_valid_to and state and state > 0 and state < 2 then
+		http.redirect(_resolve_path(config.on_valid_to))
+		return
+	end
+
+	if config.on_changed_to and state and state > 1 then
+		http.redirect(_resolve_path(config.on_changed_to))
+		return
+	end
+
+	if config.on_success_to and state and state > 0 then
+		http.redirect(_resolve_path(config.on_success_to))
+		return
+	end
+
+	if config.state_handler then
+		if not config.state_handler(state, maps) then
+			return
+		end
+	end
+
+	http.header("X-CBI-State", state or 0)
+
+	if not config.noheader then
+		tpl.render("cbi/header", {state = state})
+	end
+
+	local redirect
+	local messages
+	local applymap   = false
+	local pageaction = true
+	local parsechain = { }
+
+	for i, res in ipairs(maps) do
+		if res.apply_needed and res.parsechain then
+			local c
+			for _, c in ipairs(res.parsechain) do
+				parsechain[#parsechain+1] = c
+			end
+			applymap = true
+		end
+
+		if res.redirect then
+			redirect = redirect or res.redirect
+		end
+
+		if res.pageaction == false then
+			pageaction = false
+		end
+
+		if res.message then
+			messages = messages or { }
+			messages[#messages+1] = res.message
+		end
+	end
+
+	for i, res in ipairs(maps) do
+		res:render({
+			firstmap   = (i == 1),
+			applymap   = applymap,
+			redirect   = redirect,
+			messages   = messages,
+			pageaction = pageaction,
+			parsechain = parsechain
+		})
+	end
+
+	if not config.nofooter then
+		tpl.render("cbi/footer", {
+			flow       = config,
+			pageaction = pageaction,
+			redirect   = redirect,
+			state      = state,
+			autoapply  = config.autoapply
+		})
+	end
+end
+
+--- Create a CBI model dispatching target.
+-- @param	model	CBI model to be rendered
+function cbi(model, config)
+	return {type = "cbi", config = config, model = model, target = _cbi}
+end
+
+
+local function _arcombine(self, ...)
+	local argv = {...}
+	local target = #argv > 0 and self.targets[2] or self.targets[1]
+	setfenv(target.target, self.env)
+	target:target(unpack(argv))
+end
+
+--- Create a combined dispatching target for non argv and argv requests.
+-- @param trg1	Overview Target
+-- @param trg2	Detail Target
+function arcombine(trg1, trg2)
+	return {type = "arcombine", env = getfenv(), target = _arcombine, targets = {trg1, trg2}}
+end
+
+
+local function _form(self, ...)
+	local cbi = require "luci.cbi"
+	local tpl = require "luci.template"
+	local http = require "luci.http"
+
+	local maps = luci.cbi.load(self.model, ...)
+	local state = nil
+
+	for i, res in ipairs(maps) do
+		local cstate = res:parse()
+		if cstate and (not state or cstate < state) then
+			state = cstate
+		end
+	end
+
+	http.header("X-CBI-State", state or 0)
+	tpl.render("header")
+	for i, res in ipairs(maps) do
+		res:render()
+	end
+	tpl.render("footer")
+end
+
+--- Create a CBI form model dispatching target.
+-- @param	model	CBI form model tpo be rendered
+function form(model)
+	return {type = "cbi", model = model, target = _form}
+end
+
+--- Access the luci.i18n translate() api.
+-- @class  function
+-- @name   translate
+-- @param  text    Text to translate
+translate = i18n.translate
+
+--- No-op function used to mark translation entries for menu labels.
+-- This function does not actually translate the given argument but
+-- is used by build/i18n-scan.pl to find translatable entries.
+function _(text)
+	return text
+end
diff --git a/trunk/package/luci/modules/base/luasrc/fs.lua b/trunk/package/luci/modules/base/luasrc/fs.lua
new file mode 100644
index 00000000..a81ff675
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/fs.lua
@@ -0,0 +1,244 @@
+--[[
+LuCI - Filesystem tools
+
+Description:
+A module offering often needed filesystem manipulation functions
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local io    = require "io"
+local os    = require "os"
+local ltn12 = require "luci.ltn12"
+local fs	= require "nixio.fs"
+local nutil = require "nixio.util"
+
+local type  = type
+
+--- LuCI filesystem library.
+module "luci.fs"
+
+--- Test for file access permission on given path.
+-- @class		function
+-- @name		access
+-- @param str	String value containing the path
+-- @return		Number containing the return code, 0 on sucess or nil on error
+-- @return		String containing the error description (if any)
+-- @return		Number containing the os specific errno (if any)
+access = fs.access
+
+--- Evaluate given shell glob pattern and return a table containing all matching
+-- file and directory entries.
+-- @class			function
+-- @name			glob
+-- @param filename	String containing the path of the file to read
+-- @return			Table containing file and directory entries or nil if no matches
+-- @return			String containing the error description (if no matches)
+-- @return			Number containing the os specific errno (if no matches)
+function glob(...)
+	local iter, code, msg = fs.glob(...)
+	if iter then
+		return nutil.consume(iter)
+	else
+		return nil, code, msg
+	end
+end
+
+--- Checks wheather the given path exists and points to a regular file.
+-- @param filename	String containing the path of the file to test
+-- @return			Boolean indicating wheather given path points to regular file
+function isfile(filename)
+	return fs.stat(filename, "type") == "reg"
+end
+
+--- Checks wheather the given path exists and points to a directory.
+-- @param dirname	String containing the path of the directory to test
+-- @return			Boolean indicating wheather given path points to directory
+function isdirectory(dirname)
+	return fs.stat(dirname, "type") == "dir"
+end
+
+--- Read the whole content of the given file into memory.
+-- @param filename	String containing the path of the file to read
+-- @return			String containing the file contents or nil on error
+-- @return			String containing the error message on error
+readfile = fs.readfile
+
+--- Write the contents of given string to given file.
+-- @param filename	String containing the path of the file to read
+-- @param data		String containing the data to write
+-- @return			Boolean containing true on success or nil on error
+-- @return			String containing the error message on error
+writefile = fs.writefile
+
+--- Copies a file.
+-- @param source	Source file
+-- @param dest		Destination
+-- @return			Boolean containing true on success or nil on error
+copy = fs.datacopy
+
+--- Renames a file.
+-- @param source	Source file
+-- @param dest		Destination
+-- @return			Boolean containing true on success or nil on error
+rename = fs.move
+
+--- Get the last modification time of given file path in Unix epoch format.
+-- @param path	String containing the path of the file or directory to read
+-- @return		Number containing the epoch time or nil on error
+-- @return		String containing the error description (if any)
+-- @return		Number containing the os specific errno (if any)
+function mtime(path)
+	return fs.stat(path, "mtime")
+end
+
+--- Set the last modification time  of given file path in Unix epoch format.
+-- @param path	String containing the path of the file or directory to read
+-- @param mtime	Last modification timestamp
+-- @param atime Last accessed timestamp
+-- @return		0 in case of success nil on error
+-- @return		String containing the error description (if any)
+-- @return		Number containing the os specific errno (if any)
+function utime(path, mtime, atime)
+	return fs.utimes(path, atime, mtime)
+end
+
+--- Return the last element - usually the filename - from the given path with
+-- the directory component stripped.
+-- @class		function
+-- @name		basename
+-- @param path	String containing the path to strip
+-- @return		String containing the base name of given path
+-- @see			dirname
+basename = fs.basename
+
+--- Return the directory component of the given path with the last element
+-- stripped of.
+-- @class		function
+-- @name		dirname
+-- @param path	String containing the path to strip
+-- @return		String containing the directory component of given path
+-- @see			basename
+dirname = fs.dirname
+
+--- Return a table containing all entries of the specified directory.
+-- @class		function
+-- @name		dir
+-- @param path	String containing the path of the directory to scan
+-- @return		Table containing file and directory entries or nil on error
+-- @return		String containing the error description on error
+-- @return		Number containing the os specific errno on error
+function dir(...)
+	local iter, code, msg = fs.dir(...)
+	if iter then
+		local t = nutil.consume(iter)
+		t[#t+1] = "."
+		t[#t+1] = ".."
+		return t
+	else
+		return nil, code, msg
+	end
+end
+
+--- Create a new directory, recursively on demand.
+-- @param path		String with the name or path of the directory to create
+-- @param recursive	Create multiple directory levels (optional, default is true)
+-- @return			Number with the return code, 0 on sucess or nil on error
+-- @return			String containing the error description on error
+-- @return			Number containing the os specific errno on error
+function mkdir(path, recursive)
+	return recursive and fs.mkdirr(path) or fs.mkdir(path)
+end
+
+--- Remove the given empty directory.
+-- @class		function
+-- @name		rmdir
+-- @param path	String containing the path of the directory to remove
+-- @return		Number with the return code, 0 on sucess or nil on error
+-- @return		String containing the error description on error
+-- @return		Number containing the os specific errno on error
+rmdir = fs.rmdir
+
+local stat_tr = {
+	reg = "regular",
+	dir = "directory",
+	lnk = "link",
+	chr = "character device",
+	blk = "block device",
+	fifo = "fifo",
+	sock = "socket"
+}
+--- Get information about given file or directory.
+-- @class		function
+-- @name		stat
+-- @param path	String containing the path of the directory to query
+-- @return		Table containing file or directory properties or nil on error
+-- @return		String containing the error description on error
+-- @return		Number containing the os specific errno on error
+function stat(path, key)
+	local data, code, msg = fs.stat(path)
+	if data then
+		data.mode = data.modestr
+		data.type = stat_tr[data.type] or "?"
+	end
+	return key and data and data[key] or data, code, msg
+end
+
+--- Set permissions on given file or directory.
+-- @class		function
+-- @name		chmod
+-- @param path	String containing the path of the directory
+-- @param perm	String containing the permissions to set ([ugoa][+-][rwx])
+-- @return		Number with the return code, 0 on sucess or nil on error
+-- @return		String containing the error description on error
+-- @return		Number containing the os specific errno on error
+chmod = fs.chmod
+
+--- Create a hard- or symlink from given file (or directory) to specified target
+-- file (or directory) path.
+-- @class			function
+-- @name			link
+-- @param path1		String containing the source path to link
+-- @param path2		String containing the destination path for the link
+-- @param symlink	Boolean indicating wheather to create a symlink (optional)
+-- @return			Number with the return code, 0 on sucess or nil on error
+-- @return			String containing the error description on error
+-- @return			Number containing the os specific errno on error
+function link(src, dest, sym)
+	return sym and fs.symlink(src, dest) or fs.link(src, dest)
+end
+
+--- Remove the given file.
+-- @class		function
+-- @name		unlink
+-- @param path	String containing the path of the file to remove
+-- @return		Number with the return code, 0 on sucess or nil on error
+-- @return		String containing the error description on error
+-- @return		Number containing the os specific errno on error
+unlink = fs.unlink
+
+--- Retrieve target of given symlink.
+-- @class		function
+-- @name		readlink
+-- @param path	String containing the path of the symlink to read
+-- @return		String containing the link target or nil on error
+-- @return		String containing the error description on error
+-- @return		Number containing the os specific errno on error
+readlink = fs.readlink
diff --git a/trunk/package/luci/modules/base/luasrc/http.lua b/trunk/package/luci/modules/base/luasrc/http.lua
new file mode 100644
index 00000000..e8430b72
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/http.lua
@@ -0,0 +1,344 @@
+--[[
+LuCI - HTTP-Interaction
+
+Description:
+HTTP-Header manipulator and form variable preprocessor
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local ltn12 = require "luci.ltn12"
+local protocol = require "luci.http.protocol"
+local util  = require "luci.util"
+local string = require "string"
+local coroutine = require "coroutine"
+local table = require "table"
+
+local ipairs, pairs, next, type, tostring, error =
+	ipairs, pairs, next, type, tostring, error
+
+--- LuCI Web Framework high-level HTTP functions.
+module "luci.http"
+
+context = util.threadlocal()
+
+Request = util.class()
+function Request.__init__(self, env, sourcein, sinkerr)
+	self.input = sourcein
+	self.error = sinkerr
+
+
+	-- File handler nil by default to let .content() work
+	self.filehandler = nil
+
+	-- HTTP-Message table
+	self.message = {
+		env = env,
+		headers = {},
+		params = protocol.urldecode_params(env.QUERY_STRING or ""),
+	}
+
+	self.parsed_input = false
+end
+
+function Request.formvalue(self, name, noparse)
+	if not noparse and not self.parsed_input then
+		self:_parse_input()
+	end
+
+	if name then
+		return self.message.params[name]
+	else
+		return self.message.params
+	end
+end
+
+function Request.formvaluetable(self, prefix)
+	local vals = {}
+	prefix = prefix and prefix .. "." or "."
+
+	if not self.parsed_input then
+		self:_parse_input()
+	end
+
+	local void = self.message.params[nil]
+	for k, v in pairs(self.message.params) do
+		if k:find(prefix, 1, true) == 1 then
+			vals[k:sub(#prefix + 1)] = tostring(v)
+		end
+	end
+
+	return vals
+end
+
+function Request.content(self)
+	if not self.parsed_input then
+		self:_parse_input()
+	end
+
+	return self.message.content, self.message.content_length
+end
+
+function Request.getcookie(self, name)
+  local c = string.gsub(";" .. (self:getenv("HTTP_COOKIE") or "") .. ";", "%s*;%s*", ";")
+  local p = ";" .. name .. "=(.-);"
+  local i, j, value = c:find(p)
+  return value and urldecode(value)
+end
+
+function Request.getenv(self, name)
+	if name then
+		return self.message.env[name]
+	else
+		return self.message.env
+	end
+end
+
+function Request.setfilehandler(self, callback)
+	self.filehandler = callback
+end
+
+function Request._parse_input(self)
+	protocol.parse_message_body(
+		 self.input,
+		 self.message,
+		 self.filehandler
+	)
+	self.parsed_input = true
+end
+
+--- Close the HTTP-Connection.
+function close()
+	if not context.eoh then
+		context.eoh = true
+		coroutine.yield(3)
+	end
+
+	if not context.closed then
+		context.closed = true
+		coroutine.yield(5)
+	end
+end
+
+--- Return the request content if the request was of unknown type.
+-- @return	HTTP request body
+-- @return	HTTP request body length
+function content()
+	return context.request:content()
+end
+
+--- Get a certain HTTP input value or a table of all input values.
+-- @param name		Name of the GET or POST variable to fetch
+-- @param noparse	Don't parse POST data before getting the value
+-- @return			HTTP input value or table of all input value
+function formvalue(name, noparse)
+	return context.request:formvalue(name, noparse)
+end
+
+--- Get a table of all HTTP input values with a certain prefix.
+-- @param prefix	Prefix
+-- @return			Table of all HTTP input values with given prefix
+function formvaluetable(prefix)
+	return context.request:formvaluetable(prefix)
+end
+
+--- Get the value of a certain HTTP-Cookie.
+-- @param name		Cookie Name
+-- @return			String containing cookie data
+function getcookie(name)
+	return context.request:getcookie(name)
+end
+
+--- Get the value of a certain HTTP environment variable
+-- or the environment table itself.
+-- @param name		Environment variable
+-- @return			HTTP environment value or environment table
+function getenv(name)
+	return context.request:getenv(name)
+end
+
+--- Set a handler function for incoming user file uploads.
+-- @param callback	Handler function
+function setfilehandler(callback)
+	return context.request:setfilehandler(callback)
+end
+
+--- Send a HTTP-Header.
+-- @param key	Header key
+-- @param value Header value
+function header(key, value)
+	if not context.headers then
+		context.headers = {}
+	end
+	context.headers[key:lower()] = value
+	coroutine.yield(2, key, value)
+end
+
+--- Set the mime type of following content data.
+-- @param mime	Mimetype of following content
+function prepare_content(mime)
+	if not context.headers or not context.headers["content-type"] then
+		if mime == "application/xhtml+xml" then
+			if not getenv("HTTP_ACCEPT") or
+			  not getenv("HTTP_ACCEPT"):find("application/xhtml+xml", nil, true) then
+				mime = "text/html; charset=UTF-8"
+			end
+			header("Vary", "Accept")
+		end
+		header("Content-Type", mime)
+	end
+end
+
+--- Get the RAW HTTP input source
+-- @return	HTTP LTN12 source
+function source()
+	return context.request.input
+end
+
+--- Set the HTTP status code and status message.
+-- @param code		Status code
+-- @param message	Status message
+function status(code, message)
+	code = code or 200
+	message = message or "OK"
+	context.status = code
+	coroutine.yield(1, code, message)
+end
+
+--- Send a chunk of content data to the client.
+-- This function is as a valid LTN12 sink.
+-- If the content chunk is nil this function will automatically invoke close.
+-- @param content	Content chunk
+-- @param src_err	Error object from source (optional)
+-- @see close
+function write(content, src_err)
+	if not content then
+		if src_err then
+			error(src_err)
+		else
+			close()
+		end
+		return true
+	elseif #content == 0 then
+		return true
+	else
+		if not context.eoh then
+			if not context.status then
+				status()
+			end
+			if not context.headers or not context.headers["content-type"] then
+				header("Content-Type", "text/html; charset=utf-8")
+			end
+			if not context.headers["cache-control"] then
+				header("Cache-Control", "no-cache")
+				header("Expires", "0")
+			end
+
+
+			context.eoh = true
+			coroutine.yield(3)
+		end
+		coroutine.yield(4, content)
+		return true
+	end
+end
+
+--- Splice data from a filedescriptor to the client.
+-- @param fp	File descriptor
+-- @param size	Bytes to splice (optional)
+function splice(fd, size)
+	coroutine.yield(6, fd, size)
+end
+
+--- Redirects the client to a new URL and closes the connection.
+-- @param url	Target URL
+function redirect(url)
+	status(302, "Found")
+	header("Location", url)
+	close()
+end
+
+--- Create a querystring out of a table of key - value pairs.
+-- @param table		Query string source table
+-- @return			Encoded HTTP query string
+function build_querystring(q)
+	local s = { "?" }
+
+	for k, v in pairs(q) do
+		if #s > 1 then s[#s+1] = "&" end
+
+		s[#s+1] = urldecode(k)
+		s[#s+1] = "="
+		s[#s+1] = urldecode(v)
+	end
+
+	return table.concat(s, "")
+end
+
+--- Return the URL-decoded equivalent of a string.
+-- @param str		URL-encoded string
+-- @param no_plus	Don't decode + to " "
+-- @return			URL-decoded string
+-- @see urlencode
+urldecode = protocol.urldecode
+
+--- Return the URL-encoded equivalent of a string.
+-- @param str		Source string
+-- @return			URL-encoded string
+-- @see urldecode
+urlencode = protocol.urlencode
+
+--- Send the given data as JSON encoded string.
+-- @param data		Data to send
+function write_json(x)
+	if x == nil then
+		write("null")
+	elseif type(x) == "table" then
+		local k, v
+		if type(next(x)) == "number" then
+			write("[ ")
+			for k, v in ipairs(x) do
+				write_json(v)
+				if next(x, k) then
+					write(", ")
+				end
+			end
+			write(" ]")
+		else
+			write("{ ")
+			for k, v in pairs(x) do
+			write("%q: " % k)
+				write_json(v)
+				if next(x, k) then
+					write(", ")
+				end
+			end
+			write(" }")
+		end
+	elseif type(x) == "number" or type(x) == "boolean" then
+		if (x ~= x) then
+			-- NaN is the only value that doesn't equal to itself.
+			write("Number.NaN")
+		else
+			write(tostring(x))
+		end
+	else
+		write('"%s"' % tostring(x):gsub('["%z\1-\31]', function(c)
+			return '\\u%04x' % c:byte(1)
+		end))
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/http/protocol.lua b/trunk/package/luci/modules/base/luasrc/http/protocol.lua
new file mode 100644
index 00000000..6431b040
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/http/protocol.lua
@@ -0,0 +1,688 @@
+--[[
+
+HTTP protocol implementation for LuCI
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+--- LuCI http protocol class.
+-- This class contains several functions useful for http message- and content
+-- decoding and to retrive form data from raw http messages.
+module("luci.http.protocol", package.seeall)
+
+local ltn12 = require("luci.ltn12")
+
+HTTP_MAX_CONTENT      = 1024*8		-- 8 kB maximum content size
+
+--- Decode an urlencoded string - optionally without decoding
+-- the "+" sign to " " - and return the decoded string.
+-- @param str		Input string in x-www-urlencoded format
+-- @param no_plus	Don't decode "+" signs to spaces
+-- @return			The decoded string
+-- @see				urlencode
+function urldecode( str, no_plus )
+
+	local function __chrdec( hex )
+		return string.char( tonumber( hex, 16 ) )
+	end
+
+	if type(str) == "string" then
+		if not no_plus then
+			str = str:gsub( "+", " " )
+		end
+
+		str = str:gsub( "%%([a-fA-F0-9][a-fA-F0-9])", __chrdec )
+	end
+
+	return str
+end
+
+--- Extract and split urlencoded data pairs, separated bei either "&" or ";"
+-- from given url or string. Returns a table with urldecoded values.
+-- Simple parameters are stored as string values associated with the parameter
+-- name within the table. Parameters with multiple values are stored as array
+-- containing the corresponding values.
+-- @param url	The url or string which contains x-www-urlencoded form data
+-- @param tbl	Use the given table for storing values (optional)
+-- @return		Table containing the urldecoded parameters
+-- @see			urlencode_params
+function urldecode_params( url, tbl )
+
+	local params = tbl or { }
+
+	if url:find("?") then
+		url = url:gsub( "^.+%?([^?]+)", "%1" )
+	end
+
+	for pair in url:gmatch( "[^&;]+" ) do
+
+		-- find key and value
+		local key = urldecode( pair:match("^([^=]+)")     )
+		local val = urldecode( pair:match("^[^=]+=(.+)$") )
+
+		-- store
+		if type(key) == "string" and key:len() > 0 then
+			if type(val) ~= "string" then val = "" end
+
+			if not params[key] then
+				params[key] = val
+			elseif type(params[key]) ~= "table" then
+				params[key] = { params[key], val }
+			else
+				table.insert( params[key], val )
+			end
+		end
+	end
+
+	return params
+end
+
+--- Encode given string to x-www-urlencoded format.
+-- @param str	String to encode
+-- @return		String containing the encoded data
+-- @see			urldecode
+function urlencode( str )
+
+	local function __chrenc( chr )
+		return string.format(
+			"%%%02x", string.byte( chr )
+		)
+	end
+
+	if type(str) == "string" then
+		str = str:gsub(
+			"([^a-zA-Z0-9$_%-%.%+!*'(),])",
+			__chrenc
+		)
+	end
+
+	return str
+end
+
+--- Encode each key-value-pair in given table to x-www-urlencoded format,
+-- separated by "&". Tables are encoded as parameters with multiple values by
+-- repeating the parameter name with each value.
+-- @param tbl	Table with the values
+-- @return		String containing encoded values
+-- @see			urldecode_params
+function urlencode_params( tbl )
+	local enc = ""
+
+	for k, v in pairs(tbl) do
+		if type(v) == "table" then
+			for i, v2 in ipairs(v) do
+				enc = enc .. ( #enc > 0 and "&" or "" ) ..
+					urlencode(k) .. "=" .. urlencode(v2)
+			end
+		else
+			enc = enc .. ( #enc > 0 and "&" or "" ) ..
+				urlencode(k) .. "=" .. urlencode(v)
+		end
+	end
+
+	return enc
+end
+
+-- (Internal function)
+-- Initialize given parameter and coerce string into table when the parameter
+-- already exists.
+-- @param tbl	Table where parameter should be created
+-- @param key	Parameter name
+-- @return		Always nil
+local function __initval( tbl, key )
+	if tbl[key] == nil then
+		tbl[key] = ""
+	elseif type(tbl[key]) == "string" then
+		tbl[key] = { tbl[key], "" }
+	else
+		table.insert( tbl[key], "" )
+	end
+end
+
+-- (Internal function)
+-- Append given data to given parameter, either by extending the string value
+-- or by appending it to the last string in the parameter's value table.
+-- @param tbl	Table containing the previously initialized parameter value
+-- @param key	Parameter name
+-- @param chunk	String containing the data to append
+-- @return		Always nil
+-- @see			__initval
+local function __appendval( tbl, key, chunk )
+	if type(tbl[key]) == "table" then
+		tbl[key][#tbl[key]] = tbl[key][#tbl[key]] .. chunk
+	else
+		tbl[key] = tbl[key] .. chunk
+	end
+end
+
+-- (Internal function)
+-- Finish the value of given parameter, either by transforming the string value
+-- or - in the case of multi value parameters - the last element in the
+-- associated values table.
+-- @param tbl		Table containing the previously initialized parameter value
+-- @param key		Parameter name
+-- @param handler	Function which transforms the parameter value
+-- @return			Always nil
+-- @see				__initval
+-- @see				__appendval
+local function __finishval( tbl, key, handler )
+	if handler then
+		if type(tbl[key]) == "table" then
+			tbl[key][#tbl[key]] = handler( tbl[key][#tbl[key]] )
+		else
+			tbl[key] = handler( tbl[key] )
+		end
+	end
+end
+
+
+-- Table of our process states
+local process_states = { }
+
+-- Extract "magic", the first line of a http message.
+-- Extracts the message type ("get", "post" or "response"), the requested uri
+-- or the status code if the line descripes a http response.
+process_states['magic'] = function( msg, chunk, err )
+
+	if chunk ~= nil then
+		-- ignore empty lines before request
+		if #chunk == 0 then
+			return true, nil
+		end
+
+		-- Is it a request?
+		local method, uri, http_ver = chunk:match("^([A-Z]+) ([^ ]+) HTTP/([01]%.[019])$")
+
+		-- Yup, it is
+		if method then
+
+			msg.type           = "request"
+			msg.request_method = method:lower()
+			msg.request_uri    = uri
+			msg.http_version   = tonumber( http_ver )
+			msg.headers        = { }
+
+			-- We're done, next state is header parsing
+			return true, function( chunk )
+				return process_states['headers']( msg, chunk )
+			end
+
+		-- Is it a response?
+		else
+
+			local http_ver, code, message = chunk:match("^HTTP/([01]%.[019]) ([0-9]+) ([^\r\n]+)$")
+
+			-- Is a response
+			if code then
+
+				msg.type           = "response"
+				msg.status_code    = code
+				msg.status_message = message
+				msg.http_version   = tonumber( http_ver )
+				msg.headers        = { }
+
+				-- We're done, next state is header parsing
+				return true, function( chunk )
+					return process_states['headers']( msg, chunk )
+				end
+			end
+		end
+	end
+
+	-- Can't handle it
+	return nil, "Invalid HTTP message magic"
+end
+
+
+-- Extract headers from given string.
+process_states['headers'] = function( msg, chunk )
+
+	if chunk ~= nil then
+
+		-- Look for a valid header format
+		local hdr, val = chunk:match( "^([A-Za-z][A-Za-z0-9%-_]+): +(.+)$" )
+
+		if type(hdr) == "string" and hdr:len() > 0 and
+		   type(val) == "string" and val:len() > 0
+		then
+			msg.headers[hdr] = val
+
+			-- Valid header line, proceed
+			return true, nil
+
+		elseif #chunk == 0 then
+			-- Empty line, we won't accept data anymore
+			return false, nil
+		else
+			-- Junk data
+			return nil, "Invalid HTTP header received"
+		end
+	else
+		return nil, "Unexpected EOF"
+	end
+end
+
+
+--- Creates a ltn12 source from the given socket. The source will return it's
+-- data line by line with the trailing \r\n stripped of.
+-- @param sock	Readable network socket
+-- @return		Ltn12 source function
+function header_source( sock )
+	return ltn12.source.simplify( function()
+
+		local chunk, err, part = sock:receive("*l")
+
+		-- Line too long
+		if chunk == nil then
+			if err ~= "timeout" then
+				return nil, part
+					and "Line exceeds maximum allowed length"
+					or  "Unexpected EOF"
+			else
+				return nil, err
+			end
+
+		-- Line ok
+		elseif chunk ~= nil then
+
+			-- Strip trailing CR
+			chunk = chunk:gsub("\r$","")
+
+			return chunk, nil
+		end
+	end )
+end
+
+--- Decode a mime encoded http message body with multipart/form-data
+-- Content-Type. Stores all extracted data associated with its parameter name
+-- in the params table withing the given message object. Multiple parameter
+-- values are stored as tables, ordinary ones as strings.
+-- If an optional file callback function is given then it is feeded with the
+-- file contents chunk by chunk and only the extracted file name is stored
+-- within the params table. The callback function will be called subsequently
+-- with three arguments:
+--  o Table containing decoded (name, file) and raw (headers) mime header data
+--  o String value containing a chunk of the file data
+--  o Boolean which indicates wheather the current chunk is the last one (eof)
+-- @param src		Ltn12 source function
+-- @param msg		HTTP message object
+-- @param filecb	File callback function (optional)
+-- @return			Value indicating successful operation (not nil means "ok")
+-- @return			String containing the error if unsuccessful
+-- @see				parse_message_header
+function mimedecode_message_body( src, msg, filecb )
+
+	if msg and msg.env.CONTENT_TYPE then
+		msg.mime_boundary = msg.env.CONTENT_TYPE:match("^multipart/form%-data; boundary=(.+)$")
+	end
+
+	if not msg.mime_boundary then
+		return nil, "Invalid Content-Type found"
+	end
+
+
+	local tlen   = 0
+	local inhdr  = false
+	local field  = nil
+	local store  = nil
+	local lchunk = nil
+
+	local function parse_headers( chunk, field )
+
+		local stat
+		repeat
+			chunk, stat = chunk:gsub(
+				"^([A-Z][A-Za-z0-9%-_]+): +([^\r\n]+)\r\n",
+				function(k,v)
+					field.headers[k] = v
+					return ""
+				end
+			)
+		until stat == 0
+
+		chunk, stat = chunk:gsub("^\r\n","")
+
+		-- End of headers
+		if stat > 0 then
+			if field.headers["Content-Disposition"] then
+				if field.headers["Content-Disposition"]:match("^form%-data; ") then
+					field.name = field.headers["Content-Disposition"]:match('name="(.-)"')
+					field.file = field.headers["Content-Disposition"]:match('filename="(.+)"$')
+				end
+			end
+
+			if not field.headers["Content-Type"] then
+				field.headers["Content-Type"] = "text/plain"
+			end
+
+			if field.name and field.file and filecb then
+				__initval( msg.params, field.name )
+				__appendval( msg.params, field.name, field.file )
+
+				store = filecb
+			elseif field.name then
+				__initval( msg.params, field.name )
+
+				store = function( hdr, buf, eof )
+					__appendval( msg.params, field.name, buf )
+				end
+			else
+				store = nil
+			end
+
+			return chunk, true
+		end
+
+		return chunk, false
+	end
+
+	local function snk( chunk )
+
+		tlen = tlen + ( chunk and #chunk or 0 )
+
+		if msg.env.CONTENT_LENGTH and tlen > tonumber(msg.env.CONTENT_LENGTH) + 2 then
+			return nil, "Message body size exceeds Content-Length"
+		end
+
+		if chunk and not lchunk then
+			lchunk = "\r\n" .. chunk
+
+		elseif lchunk then
+			local data = lchunk .. ( chunk or "" )
+			local spos, epos, found
+
+			repeat
+				spos, epos = data:find( "\r\n--" .. msg.mime_boundary .. "\r\n", 1, true )
+
+				if not spos then
+					spos, epos = data:find( "\r\n--" .. msg.mime_boundary .. "--\r\n", 1, true )
+				end
+
+
+				if spos then
+					local predata = data:sub( 1, spos - 1 )
+
+					if inhdr then
+						predata, eof = parse_headers( predata, field )
+
+						if not eof then
+							return nil, "Invalid MIME section header"
+						elseif not field.name then
+							return nil, "Invalid Content-Disposition header"
+						end
+					end
+
+					if store then
+						store( field, predata, true )
+					end
+
+
+					field = { headers = { } }
+					found = found or true
+
+					data, eof = parse_headers( data:sub( epos + 1, #data ), field )
+					inhdr = not eof
+				end
+			until not spos
+
+			if found then
+				-- We found at least some boundary. Save
+				-- the unparsed remaining data for the
+				-- next chunk.
+				lchunk, data = data, nil
+			else
+				-- There was a complete chunk without a boundary. Parse it as headers or
+				-- append it as data, depending on our current state.
+				if inhdr then
+					lchunk, eof = parse_headers( data, field )
+					inhdr = not eof
+				else
+					-- We're inside data, so append the data. Note that we only append
+					-- lchunk, not all of data, since there is a chance that chunk
+					-- contains half a boundary. Assuming that each chunk is at least the
+					-- boundary in size, this should prevent problems
+					store( field, lchunk, false )
+					lchunk, chunk = chunk, nil
+				end
+			end
+		end
+
+		return true
+	end
+
+	return ltn12.pump.all( src, snk )
+end
+
+--- Decode an urlencoded http message body with application/x-www-urlencoded
+-- Content-Type. Stores all extracted data associated with its parameter name
+-- in the params table withing the given message object. Multiple parameter
+-- values are stored as tables, ordinary ones as strings.
+-- @param src	Ltn12 source function
+-- @param msg	HTTP message object
+-- @return		Value indicating successful operation (not nil means "ok")
+-- @return		String containing the error if unsuccessful
+-- @see			parse_message_header
+function urldecode_message_body( src, msg )
+
+	local tlen   = 0
+	local lchunk = nil
+
+	local function snk( chunk )
+
+		tlen = tlen + ( chunk and #chunk or 0 )
+
+		if msg.env.CONTENT_LENGTH and tlen > tonumber(msg.env.CONTENT_LENGTH) + 2 then
+			return nil, "Message body size exceeds Content-Length"
+		elseif tlen > HTTP_MAX_CONTENT then
+			return nil, "Message body size exceeds maximum allowed length"
+		end
+
+		if not lchunk and chunk then
+			lchunk = chunk
+
+		elseif lchunk then
+			local data = lchunk .. ( chunk or "&" )
+			local spos, epos
+
+			repeat
+				spos, epos = data:find("^.-[;&]")
+
+				if spos then
+					local pair = data:sub( spos, epos - 1 )
+					local key  = pair:match("^(.-)=")
+					local val  = pair:match("=([^%s]*)%s*$")
+
+					if key and #key > 0 then
+						__initval( msg.params, key )
+						__appendval( msg.params, key, val )
+						__finishval( msg.params, key, urldecode )
+					end
+
+					data = data:sub( epos + 1, #data )
+				end
+			until not spos
+
+			lchunk = data
+		end
+
+		return true
+	end
+
+	return ltn12.pump.all( src, snk )
+end
+
+--- Try to extract an http message header including information like protocol
+-- version, message headers and resulting CGI environment variables from the
+-- given ltn12 source.
+-- @param src	Ltn12 source function
+-- @return		HTTP message object
+-- @see			parse_message_body
+function parse_message_header( src )
+
+	local ok   = true
+	local msg  = { }
+
+	local sink = ltn12.sink.simplify(
+		function( chunk )
+			return process_states['magic']( msg, chunk )
+		end
+	)
+
+	-- Pump input data...
+	while ok do
+
+		-- get data
+		ok, err = ltn12.pump.step( src, sink )
+
+		-- error
+		if not ok and err then
+			return nil, err
+
+		-- eof
+		elseif not ok then
+
+			-- Process get parameters
+			if ( msg.request_method == "get" or msg.request_method == "post" ) and
+			   msg.request_uri:match("?")
+			then
+				msg.params = urldecode_params( msg.request_uri )
+			else
+				msg.params = { }
+			end
+
+			-- Populate common environment variables
+			msg.env = {
+				CONTENT_LENGTH    = msg.headers['Content-Length'];
+				CONTENT_TYPE      = msg.headers['Content-Type'] or msg.headers['Content-type'];
+				REQUEST_METHOD    = msg.request_method:upper();
+				REQUEST_URI       = msg.request_uri;
+				SCRIPT_NAME       = msg.request_uri:gsub("?.+$","");
+				SCRIPT_FILENAME   = "";		-- XXX implement me
+				SERVER_PROTOCOL   = "HTTP/" .. string.format("%.1f", msg.http_version);
+				QUERY_STRING      = msg.request_uri:match("?")
+					and msg.request_uri:gsub("^.+?","") or ""
+			}
+
+			-- Populate HTTP_* environment variables
+			for i, hdr in ipairs( {
+				'Accept',
+				'Accept-Charset',
+				'Accept-Encoding',
+				'Accept-Language',
+				'Connection',
+				'Cookie',
+				'Host',
+				'Referer',
+				'User-Agent',
+			} ) do
+				local var = 'HTTP_' .. hdr:upper():gsub("%-","_")
+				local val = msg.headers[hdr]
+
+				msg.env[var] = val
+			end
+		end
+	end
+
+	return msg
+end
+
+--- Try to extract and decode a http message body from the given ltn12 source.
+-- This function will examine the Content-Type within the given message object
+-- to select the appropriate content decoder.
+-- Currently the application/x-www-urlencoded and application/form-data
+-- mime types are supported. If the encountered content encoding can't be
+-- handled then the whole message body will be stored unaltered as "content"
+-- property within the given message object.
+-- @param src		Ltn12 source function
+-- @param msg		HTTP message object
+-- @param filecb	File data callback (optional, see mimedecode_message_body())
+-- @return			Value indicating successful operation (not nil means "ok")
+-- @return			String containing the error if unsuccessful
+-- @see				parse_message_header
+function parse_message_body( src, msg, filecb )
+	-- Is it multipart/mime ?
+	if msg.env.REQUEST_METHOD == "POST" and msg.env.CONTENT_TYPE and
+	   msg.env.CONTENT_TYPE:match("^multipart/form%-data")
+	then
+
+		return mimedecode_message_body( src, msg, filecb )
+
+	-- Is it application/x-www-form-urlencoded ?
+	elseif msg.env.REQUEST_METHOD == "POST" and msg.env.CONTENT_TYPE and
+	       msg.env.CONTENT_TYPE:match("^application/x%-www%-form%-urlencoded")
+	then
+		return urldecode_message_body( src, msg, filecb )
+
+
+	-- Unhandled encoding
+	-- If a file callback is given then feed it chunk by chunk, else
+	-- store whole buffer in message.content
+	else
+
+		local sink
+
+		-- If we have a file callback then feed it
+		if type(filecb) == "function" then
+			sink = filecb
+
+		-- ... else append to .content
+		else
+			msg.content = ""
+			msg.content_length = 0
+
+			sink = function( chunk, err )
+				if chunk then
+					if ( msg.content_length + #chunk ) <= HTTP_MAX_CONTENT then
+						msg.content        = msg.content        .. chunk
+						msg.content_length = msg.content_length + #chunk
+						return true
+					else
+						return nil, "POST data exceeds maximum allowed length"
+					end
+				end
+				return true
+			end
+		end
+
+		-- Pump data...
+		while true do
+			local ok, err = ltn12.pump.step( src, sink )
+
+			if not ok and err then
+				return nil, err
+			elseif not ok then -- eof
+				return true
+			end
+		end
+
+		return true
+	end
+end
+
+--- Table containing human readable messages for several http status codes.
+-- @class table
+statusmsg = {
+	[200] = "OK",
+	[206] = "Partial Content",
+	[301] = "Moved Permanently",
+	[302] = "Found",
+	[304] = "Not Modified",
+	[400] = "Bad Request",
+	[403] = "Forbidden",
+	[404] = "Not Found",
+	[405] = "Method Not Allowed",
+	[408] = "Request Time-out",
+	[411] = "Length Required",
+	[412] = "Precondition Failed",
+	[416] = "Requested range not satisfiable",
+	[500] = "Internal Server Error",
+	[503] = "Server Unavailable",
+}
diff --git a/trunk/package/luci/modules/base/luasrc/http/protocol/conditionals.lua b/trunk/package/luci/modules/base/luasrc/http/protocol/conditionals.lua
new file mode 100644
index 00000000..75e1f7b3
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/http/protocol/conditionals.lua
@@ -0,0 +1,153 @@
+--[[
+
+HTTP protocol implementation for LuCI - RFC2616 / 14.19, 14.24 - 14.28
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+--- LuCI http protocol implementation - HTTP/1.1 bits.
+-- This class provides basic ETag handling and implements most of the
+-- conditional HTTP/1.1 headers specified in RFC2616 Sct. 14.24 - 14.28 .
+module("luci.http.protocol.conditionals", package.seeall)
+
+local date = require("luci.http.protocol.date")
+
+
+--- Implement 14.19 / ETag.
+-- @param stat	A file.stat structure
+-- @return		String containing the generated tag suitable for ETag headers
+function mk_etag( stat )
+	if stat ~= nil then
+		return string.format( '"%x-%x-%x"', stat.ino, stat.size, stat.mtime )
+	end
+end
+
+--- 14.24 / If-Match
+-- Test whether the given message object contains an "If-Match" header and
+-- compare it against the given stat object.
+-- @param req	HTTP request message object
+-- @param stat	A file.stat object
+-- @return		Boolean indicating whether the precondition is ok
+-- @return		Alternative status code if the precondition failed
+function if_match( req, stat )
+	local h    = req.headers
+	local etag = mk_etag( stat )
+
+	-- Check for matching resource
+	if type(h['If-Match']) == "string" then
+		for ent in h['If-Match']:gmatch("([^, ]+)") do
+			if ( ent == '*' or ent == etag ) and stat ~= nil then
+				return true
+			end
+		end
+
+		return false, 412
+	end
+
+	return true
+end
+
+--- 14.25 / If-Modified-Since
+-- Test whether the given message object contains an "If-Modified-Since" header
+-- and compare it against the given stat object.
+-- @param req	HTTP request message object
+-- @param stat	A file.stat object
+-- @return		Boolean indicating whether the precondition is ok
+-- @return		Alternative status code if the precondition failed
+-- @return		Table containing extra HTTP headers if the precondition failed
+function if_modified_since( req, stat )
+	local h = req.headers
+
+	-- Compare mtimes
+	if type(h['If-Modified-Since']) == "string" then
+		local since = date.to_unix( h['If-Modified-Since'] )
+
+		if stat == nil or since < stat.mtime then
+			return true
+		end
+
+		return false, 304, {
+			["ETag"]          = mk_etag( stat );
+			["Date"]          = date.to_http( os.time() );
+			["Last-Modified"] = date.to_http( stat.mtime )
+		}
+	end
+
+	return true
+end
+
+--- 14.26 / If-None-Match
+-- Test whether the given message object contains an "If-None-Match" header and
+-- compare it against the given stat object.
+-- @param req	HTTP request message object
+-- @param stat	A file.stat object
+-- @return		Boolean indicating whether the precondition is ok
+-- @return		Alternative status code if the precondition failed
+-- @return		Table containing extra HTTP headers if the precondition failed
+function if_none_match( req, stat )
+	local h      = req.headers
+	local etag   = mk_etag( stat )
+	local method = req.env and req.env.REQUEST_METHOD or "GET"
+
+	-- Check for matching resource
+	if type(h['If-None-Match']) == "string" then
+		for ent in h['If-None-Match']:gmatch("([^, ]+)") do
+			if ( ent == '*' or ent == etag ) and stat ~= nil then
+				if method == "GET" or method == "HEAD" then
+					return false, 304, {
+						["ETag"]          = etag;
+						["Date"]          = date.to_http( os.time() );
+						["Last-Modified"] = date.to_http( stat.mtime )
+					}
+				else
+					return false, 412
+				end
+			end
+		end
+	end
+
+	return true
+end
+
+--- 14.27 / If-Range
+-- The If-Range header is currently not implemented due to the lack of general
+-- byte range stuff in luci.http.protocol . This function will always return
+-- false, 412 to indicate a failed precondition.
+-- @param req	HTTP request message object
+-- @param stat	A file.stat object
+-- @return		Boolean indicating whether the precondition is ok
+-- @return		Alternative status code if the precondition failed
+function if_range( req, stat )
+	-- Sorry, no subranges (yet)
+	return false, 412
+end
+
+--- 14.28 / If-Unmodified-Since
+-- Test whether the given message object contains an "If-Unmodified-Since"
+-- header and compare it against the given stat object.
+-- @param req	HTTP request message object
+-- @param stat	A file.stat object
+-- @return		Boolean indicating whether the precondition is ok
+-- @return		Alternative status code if the precondition failed
+function if_unmodified_since( req, stat )
+	local h = req.headers
+
+	-- Compare mtimes
+	if type(h['If-Unmodified-Since']) == "string" then
+		local since = date.to_unix( h['If-Unmodified-Since'] )
+
+		if stat ~= nil and since <= stat.mtime then
+			return false, 412
+		end
+	end
+
+	return true
+end
diff --git a/trunk/package/luci/modules/base/luasrc/http/protocol/date.lua b/trunk/package/luci/modules/base/luasrc/http/protocol/date.lua
new file mode 100644
index 00000000..83d11e2c
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/http/protocol/date.lua
@@ -0,0 +1,115 @@
+--[[
+
+HTTP protocol implementation for LuCI - date handling
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+--- LuCI http protocol implementation - date helper class.
+-- This class contains functions to parse, compare and format http dates.
+module("luci.http.protocol.date", package.seeall)
+
+require("luci.sys.zoneinfo")
+
+
+MONTHS = {
+	"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
+	"Sep", "Oct", "Nov", "Dec"
+}
+
+--- Return the time offset in seconds between the UTC and given time zone.
+-- @param tz	Symbolic or numeric timezone specifier
+-- @return		Time offset to UTC in seconds
+function tz_offset(tz)
+
+	if type(tz) == "string" then
+
+		-- check for a numeric identifier
+		local s, v = tz:match("([%+%-])([0-9]+)")
+		if s == '+' then s = 1 else s = -1 end
+		if v then v = tonumber(v) end
+
+		if s and v then
+			return s * 60 * ( math.floor( v / 100 ) * 60 + ( v % 100 ) )
+
+		-- lookup symbolic tz
+		elseif luci.sys.zoneinfo.OFFSET[tz:lower()] then
+			return luci.sys.zoneinfo.OFFSET[tz:lower()]
+		end
+
+	end
+
+	-- bad luck
+	return 0
+end
+
+--- Parse given HTTP date string and convert it to unix epoch time.
+-- @param data	String containing the date
+-- @return		Unix epoch time
+function to_unix(date)
+
+	local wd, day, mon, yr, hr, min, sec, tz = date:match(
+		"([A-Z][a-z][a-z]), ([0-9]+) " ..
+		"([A-Z][a-z][a-z]) ([0-9]+) " ..
+		"([0-9]+):([0-9]+):([0-9]+) " ..
+		"([A-Z0-9%+%-]+)"
+	)
+
+	if day and mon and yr and hr and min and sec then
+		-- find month
+		local month = 1
+		for i = 1, 12 do
+			if MONTHS[i] == mon then
+				month = i
+				break
+			end
+		end
+
+		-- convert to epoch time
+		return tz_offset(tz) + os.time( {
+			year  = yr,
+			month = month,
+			day   = day,
+			hour  = hr,
+			min   = min,
+			sec   = sec
+		} )
+	end
+
+	return 0
+end
+
+--- Convert the given unix epoch time to valid HTTP date string.
+-- @param time	Unix epoch time
+-- @return		String containing the formatted date
+function to_http(time)
+	return os.date( "%a, %d %b %Y %H:%M:%S GMT", time )
+end
+
+--- Compare two dates which can either be unix epoch times or HTTP date strings.
+-- @param d1	The first date or epoch time to compare
+-- @param d2	The first date or epoch time to compare
+-- @return		-1  -  if d1 is lower then d2
+-- @return		0   -  if both dates are equal
+-- @return		1   -  if d1 is higher then d2
+function compare(d1, d2)
+
+	if d1:match("[^0-9]") then d1 = to_unix(d1) end
+	if d2:match("[^0-9]") then d2 = to_unix(d2) end
+
+	if d1 == d2 then
+		return 0
+	elseif d1 < d2 then
+		return -1
+	else
+		return 1
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/http/protocol/mime.lua b/trunk/package/luci/modules/base/luasrc/http/protocol/mime.lua
new file mode 100644
index 00000000..c8781606
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/http/protocol/mime.lua
@@ -0,0 +1,99 @@
+--[[
+
+HTTP protocol implementation for LuCI - mime handling
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+--- LuCI http protocol implementation - mime helper class.
+-- This class provides functions to guess mime types from file extensions and
+-- vice versa.
+module("luci.http.protocol.mime", package.seeall)
+
+require("luci.util")
+
+--- MIME mapping table containg extension - mimetype relations.
+-- @class table
+MIME_TYPES = {
+    ["txt"]   = "text/plain";
+    ["js"]    = "text/javascript";
+    ["css"]   = "text/css";
+    ["htm"]   = "text/html";
+    ["html"]  = "text/html";
+    ["patch"] = "text/x-patch";
+    ["c"]     = "text/x-csrc";
+    ["h"]     = "text/x-chdr";
+    ["o"]     = "text/x-object";
+    ["ko"]    = "text/x-object";
+
+    ["bmp"]   = "image/bmp";
+    ["gif"]   = "image/gif";
+    ["png"]   = "image/png";
+    ["jpg"]   = "image/jpeg";
+    ["jpeg"]  = "image/jpeg";
+    ["svg"]   = "image/svg+xml";
+
+    ["zip"]   = "application/zip";
+    ["pdf"]   = "application/pdf";
+    ["xml"]   = "application/xml";
+    ["xsl"]   = "application/xml";
+    ["doc"]   = "application/msword";
+    ["ppt"]   = "application/vnd.ms-powerpoint";
+    ["xls"]   = "application/vnd.ms-excel";
+    ["odt"]   = "application/vnd.oasis.opendocument.text";
+    ["odp"]   = "application/vnd.oasis.opendocument.presentation";
+    ["pl"]    = "application/x-perl";
+    ["sh"]    = "application/x-shellscript";
+    ["php"]   = "application/x-php";
+    ["deb"]   = "application/x-deb";
+    ["iso"]   = "application/x-cd-image";
+    ["tgz"]   = "application/x-compressed-tar";
+
+    ["mp3"]   = "audio/mpeg";
+    ["ogg"]   = "audio/x-vorbis+ogg";
+    ["wav"]   = "audio/x-wav";
+
+    ["mpg"]   = "video/mpeg";
+    ["mpeg"]  = "video/mpeg";
+    ["avi"]   = "video/x-msvideo";
+}
+
+--- Extract extension from a filename and return corresponding mime-type or
+-- "application/octet-stream" if the extension is unknown.
+-- @param filename	The filename for which the mime type is guessed
+-- @return			String containign the determined mime type
+function to_mime(filename)
+	if type(filename) == "string" then
+		local ext = filename:match("[^%.]+$")
+
+		if ext and MIME_TYPES[ext:lower()] then
+			return MIME_TYPES[ext:lower()]
+		end
+	end
+
+	return "application/octet-stream"
+end
+
+--- Return corresponding extension for a given mime type or nil if the
+-- given mime-type is unknown.
+-- @param mimetype	The mimetype to retrieve the extension from
+-- @return			String with the extension or nil for unknown type
+function to_ext(mimetype)
+	if type(mimetype) == "string" then
+		for ext, type in luci.util.kspairs( MIME_TYPES ) do
+			if type == mimetype then
+				return ext
+			end
+		end
+	end
+
+	return nil
+end
diff --git a/trunk/package/luci/modules/base/luasrc/i18n.lua b/trunk/package/luci/modules/base/luasrc/i18n.lua
new file mode 100644
index 00000000..545a8aed
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/i18n.lua
@@ -0,0 +1,104 @@
+--[[
+LuCI - Internationalisation
+
+Description:
+A very minimalistic but yet effective internationalisation module
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+--- LuCI translation library.
+module("luci.i18n", package.seeall)
+require("luci.util")
+
+local tparser = require "luci.template.parser"
+
+table   = {}
+i18ndir = luci.util.libpath() .. "/i18n/"
+loaded  = {}
+context = luci.util.threadlocal()
+default = "en"
+
+--- Clear the translation table.
+function clear()
+end
+
+--- Load a translation and copy its data into the translation table.
+-- @param file	Language file
+-- @param lang	Two-letter language code
+-- @param force	Force reload even if already loaded (optional)
+-- @return		Success status
+function load(file, lang, force)
+end
+
+--- Load a translation file using the default translation language.
+-- Alternatively load the translation of the fallback language.
+-- @param file	Language file
+-- @param force	Force reload even if already loaded (optional)
+function loadc(file, force)
+end
+
+--- Set the context default translation language.
+-- @param lang	Two-letter language code
+function setlanguage(lang)
+	context.lang   = lang:gsub("_", "-")
+	context.parent = (context.lang:match("^([a-z][a-z])_"))
+	if not tparser.load_catalog(context.lang, i18ndir) then
+		if context.parent then
+			tparser.load_catalog(context.parent, i18ndir)
+			return context.parent
+		end
+	end
+	return context.lang
+end
+
+--- Return the translated value for a specific translation key.
+-- @param key	Default translation text
+-- @return		Translated string
+function translate(key)
+	return tparser.translate(key) or key
+end
+
+--- Return the translated value for a specific translation key and use it as sprintf pattern.
+-- @param key		Default translation text
+-- @param ...		Format parameters
+-- @return			Translated and formatted string
+function translatef(key, ...)
+	return tostring(translate(key)):format(...)
+end
+
+--- Return the translated value for a specific translation key
+-- and ensure that the returned value is a Lua string value.
+-- This is the same as calling <code>tostring(translate(...))</code>
+-- @param key		Default translation text
+-- @return			Translated string
+function string(key)
+	return tostring(translate(key))
+end
+
+--- Return the translated value for a specific translation key and use it as sprintf pattern.
+-- Ensure that the returned value is a Lua string value.
+-- This is the same as calling <code>tostring(translatef(...))</code>
+-- @param key		Default translation text
+-- @param ...		Format parameters
+-- @return			Translated and formatted string
+function stringf(key, ...)
+	return tostring(translate(key)):format(...)
+end
diff --git a/trunk/package/luci/modules/base/luasrc/init.lua b/trunk/package/luci/modules/base/luasrc/init.lua
new file mode 100644
index 00000000..4d66e867
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/init.lua
@@ -0,0 +1,39 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Description:
+Main class
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local require = require
+
+-- Make sure that bitlib is loaded
+if not _G.bit then
+	_G.bit = require "bit"
+end
+
+module "luci"
+
+local v = require "luci.version"
+
+__version__ = v.luciversion or "trunk"
+__appname__ = v.luciname    or "LuCI"
diff --git a/trunk/package/luci/modules/base/luasrc/ip.lua b/trunk/package/luci/modules/base/luasrc/ip.lua
new file mode 100644
index 00000000..60ca0901
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/ip.lua
@@ -0,0 +1,673 @@
+--[[
+
+LuCI ip calculation libarary
+(c) 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+(c) 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+--- LuCI IP calculation library.
+module( "luci.ip", package.seeall )
+
+require "nixio"
+local bit  = nixio.bit
+local util = require "luci.util"
+
+--- Boolean; true if system is little endian
+LITTLE_ENDIAN = not util.bigendian()
+
+--- Boolean; true if system is big endian
+BIG_ENDIAN    = not LITTLE_ENDIAN
+
+--- Specifier for IPv4 address family
+FAMILY_INET4  = 0x04
+
+--- Specifier for IPv6 address family
+FAMILY_INET6  = 0x06
+
+
+local function __bless(x)
+	return setmetatable( x, {
+		__index	= luci.ip.cidr,
+		__add   = luci.ip.cidr.add,
+		__sub   = luci.ip.cidr.sub,
+		__lt	= luci.ip.cidr.lower,
+		__eq	= luci.ip.cidr.equal,
+		__le	=
+			function(...)
+				return luci.ip.cidr.equal(...) or luci.ip.cidr.lower(...)
+			end
+	} )
+end
+
+local function __array16( x, family )
+	local list
+
+	if type(x) == "number" then
+		list = { bit.rshift(x, 16), bit.band(x, 0xFFFF) }
+
+	elseif type(x) == "string" then
+		if x:find(":") then x = IPv6(x) else x = IPv4(x) end
+		if x then
+			assert( x[1] == family, "Can't mix IPv4 and IPv6 addresses" )
+			list = { unpack(x[2]) }
+		end
+
+	elseif type(x) == "table" and type(x[2]) == "table" then
+		assert( x[1] == family, "Can't mix IPv4 and IPv6 addresses" )
+		list = { unpack(x[2]) }
+
+	elseif type(x) == "table" then
+		list = { unpack(x) }
+	end
+
+	assert( list, "Invalid operand" )
+
+	return list
+end
+
+local function __mask16(bits)
+	return bit.lshift( bit.rshift( 0xFFFF, 16 - bits % 16 ), 16 - bits % 16 )
+end
+
+local function __not16(bits)
+	return bit.band( bit.bnot( __mask16(bits) ), 0xFFFF )
+end
+
+local function __maxlen(family)
+	return ( family == FAMILY_INET4 ) and 32 or 128
+end
+
+local function __sublen(family)
+	return ( family == FAMILY_INET4 ) and 30 or 127
+end
+
+
+--- Convert given short value to network byte order on little endian hosts
+-- @param x	Unsigned integer value between 0x0000 and 0xFFFF
+-- @return	Byte-swapped value
+-- @see		htonl
+-- @see		ntohs
+function htons(x)
+	if LITTLE_ENDIAN then
+		return bit.bor(
+			bit.rshift( x, 8 ),
+			bit.band( bit.lshift( x, 8 ), 0xFF00 )
+		)
+	else
+		return x
+	end
+end
+
+--- Convert given long value to network byte order on little endian hosts
+-- @param x	Unsigned integer value between 0x00000000 and 0xFFFFFFFF
+-- @return	Byte-swapped value
+-- @see		htons
+-- @see		ntohl
+function htonl(x)
+	if LITTLE_ENDIAN then
+		return bit.bor(
+			bit.lshift( htons( bit.band( x, 0xFFFF ) ), 16 ),
+			htons( bit.rshift( x, 16 ) )
+		)
+	else
+		return x
+	end
+end
+
+--- Convert given short value to host byte order on little endian hosts
+-- @class	function
+-- @name	ntohs
+-- @param x	Unsigned integer value between 0x0000 and 0xFFFF
+-- @return	Byte-swapped value
+-- @see		htonl
+-- @see		ntohs
+ntohs = htons
+
+--- Convert given short value to host byte order on little endian hosts
+-- @class	function
+-- @name	ntohl
+-- @param x	Unsigned integer value between 0x00000000 and 0xFFFFFFFF
+-- @return	Byte-swapped value
+-- @see		htons
+-- @see		ntohl
+ntohl = htonl
+
+
+--- Parse given IPv4 address in dotted quad or CIDR notation. If an optional
+-- netmask is given as second argument and the IP address is encoded in CIDR
+-- notation then the netmask parameter takes precedence. If neither a CIDR
+-- encoded prefix nor a netmask parameter is given, then a prefix length of
+-- 32 bit is assumed.
+-- @param address	IPv4 address in dotted quad or CIDR notation
+-- @param netmask	IPv4 netmask in dotted quad notation (optional)
+-- @return			luci.ip.cidr instance or nil if given address was invalid
+-- @see				IPv6
+-- @see				Hex
+function IPv4(address, netmask)
+	address = address or "0.0.0.0/0"
+
+	local obj = __bless({ FAMILY_INET4 })
+
+	local data = {}
+	local prefix = address:match("/(.+)")
+	address = address:gsub("/.+","")
+	address = address:gsub("^%[(.*)%]$", "%1"):upper():gsub("^::FFFF:", "")
+
+	if netmask then
+		prefix = obj:prefix(netmask)
+	elseif prefix then
+		prefix = tonumber(prefix)
+		if not prefix or prefix < 0 or prefix > 32 then return nil end
+	else
+		prefix = 32
+	end
+
+	local b1, b2, b3, b4 = address:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
+
+	b1 = tonumber(b1)
+	b2 = tonumber(b2)
+	b3 = tonumber(b3)
+	b4 = tonumber(b4)
+
+	if b1 and b1 <= 255 and
+	   b2 and b2 <= 255 and
+	   b3 and b3 <= 255 and
+	   b4 and b4 <= 255 and
+	   prefix
+	then
+		table.insert(obj, { b1 * 256 + b2, b3 * 256 + b4 })
+		table.insert(obj, prefix)
+		return obj
+	end
+end
+
+--- Parse given IPv6 address in full, compressed, mixed or CIDR notation.
+-- If an optional netmask is given as second argument and the IP address is
+-- encoded in CIDR notation then the netmask parameter takes precedence.
+-- If neither a CIDR encoded prefix nor a netmask parameter is given, then a
+-- prefix length of 128 bit is assumed.
+-- @param address	IPv6 address in full/compressed/mixed or CIDR notation
+-- @param netmask	IPv6 netmask in full/compressed/mixed notation (optional)
+-- @return			luci.ip.cidr instance or nil if given address was invalid
+-- @see				IPv4
+-- @see				Hex
+function IPv6(address, netmask)
+	address = address or "::/0"
+
+	local obj = __bless({ FAMILY_INET6 })
+
+	local data = {}
+	local prefix = address:match("/(.+)")
+	address = address:gsub("/.+","")
+	address = address:gsub("^%[(.*)%]$", "%1")
+
+	if netmask then
+		prefix = obj:prefix(netmask)
+	elseif prefix then
+		prefix = tonumber(prefix)
+		if not prefix or prefix < 0 or prefix > 128 then return nil end
+	else
+		prefix = 128
+	end
+
+	local borderl = address:sub(1, 1) == ":" and 2 or 1
+	local borderh, zeroh, chunk, block, i
+
+	if #address > 45 then return nil end
+
+	repeat
+		borderh = address:find(":", borderl, true)
+		if not borderh then break end
+
+		block = tonumber(address:sub(borderl, borderh - 1), 16)
+		if block and block <= 0xFFFF then
+			data[#data+1] = block
+		else
+			if zeroh or borderh - borderl > 1 then return nil end
+			zeroh = #data + 1
+		end
+
+		borderl = borderh + 1
+	until #data == 7
+
+	chunk = address:sub(borderl)
+	if #chunk > 0 and #chunk <= 4 then
+		block = tonumber(chunk, 16)
+		if not block or block > 0xFFFF then return nil end
+
+		data[#data+1] = block
+	elseif #chunk > 4 then
+		if #data == 7 or #chunk > 15 then return nil end
+		borderl = 1
+		for i=1, 4 do
+			borderh = chunk:find(".", borderl, true)
+			if not borderh and i < 4 then return nil end
+			borderh = borderh and borderh - 1
+
+			block = tonumber(chunk:sub(borderl, borderh))
+			if not block or block > 255 then return nil end
+
+			if i == 1 or i == 3 then
+				data[#data+1] = block * 256
+			else
+				data[#data] = data[#data] + block
+			end
+
+			borderl = borderh and borderh + 2
+		end
+	end
+
+	if zeroh then
+		if #data == 8 then return nil end
+		while #data < 8 do
+			table.insert(data, zeroh, 0)
+		end
+	end
+
+	if #data == 8 and prefix then
+		table.insert(obj, data)
+		table.insert(obj, prefix)
+		return obj
+	end
+end
+
+--- Transform given hex-encoded value to luci.ip.cidr instance of specified
+-- address family.
+-- @param hex		String containing hex encoded value
+-- @param prefix	Prefix length of CIDR instance (optional, default is 32/128)
+-- @param family	Address family, either luci.ip.FAMILY_INET4 or FAMILY_INET6
+-- @param swap		Bool indicating whether to swap byteorder on low endian host
+-- @return			luci.ip.cidr instance or nil if given value was invalid
+-- @see				IPv4
+-- @see				IPv6
+function Hex( hex, prefix, family, swap )
+	family = ( family ~= nil ) and family or FAMILY_INET4
+	swap   = ( swap   == nil ) and true   or swap
+	prefix = prefix or __maxlen(family)
+
+	local len  = __maxlen(family)
+	local tmp  = ""
+	local data = { }
+	local i
+
+	for i = 1, (len/4) - #hex do tmp = tmp .. '0' end
+
+	if swap and LITTLE_ENDIAN then
+		for i = #hex, 1, -2 do tmp = tmp .. hex:sub( i - 1, i ) end
+	else
+		tmp = tmp .. hex
+	end
+
+	hex = tmp
+
+	for i = 1, ( len / 4 ), 4 do
+		local n = tonumber( hex:sub( i, i+3 ), 16 )
+		if n then
+			data[#data+1] = n
+		else
+			return nil
+		end
+	end
+
+	return __bless({ family, data, prefix })
+end
+
+
+--- LuCI IP Library / CIDR instances
+-- @class	module
+-- @cstyle	instance
+-- @name	luci.ip.cidr
+cidr = util.class()
+
+--- Test whether the instance is a IPv4 address.
+-- @return	Boolean indicating a IPv4 address type
+-- @see		cidr.is6
+function cidr.is4( self )
+	return self[1] == FAMILY_INET4
+end
+
+--- Test whether this instance is an IPv4 RFC1918 private address
+-- @return	Boolean indicating whether this instance is an RFC1918 address
+function cidr.is4rfc1918( self )
+	if self[1] == FAMILY_INET4 then
+		return ((self[2][1] >= 0x0A00) and (self[2][1] <= 0x0AFF)) or
+		       ((self[2][1] >= 0xAC10) and (self[2][1] <= 0xAC1F)) or
+		        (self[2][1] == 0xC0A8)
+	end
+	return false
+end
+
+--- Test whether this instance is an IPv4 link-local address (Zeroconf)
+-- @return	Boolean indicating whether this instance is IPv4 link-local
+function cidr.is4linklocal( self )
+	if self[1] == FAMILY_INET4 then
+		return (self[2][1] == 0xA9FE)
+	end
+	return false
+end
+
+--- Test whether the instance is a IPv6 address.
+-- @return	Boolean indicating a IPv6 address type
+-- @see		cidr.is4
+function cidr.is6( self )
+	return self[1] == FAMILY_INET6
+end
+
+--- Test whether this instance is an IPv6 link-local address
+-- @return	Boolean indicating whether this instance is IPv6 link-local
+function cidr.is6linklocal( self )
+	if self[1] == FAMILY_INET6 then
+		return (self[2][1] >= 0xFE80) and (self[2][1] <= 0xFEBF)
+	end
+	return false
+end
+
+--- Return a corresponding string representation of the instance.
+-- If the prefix length is lower then the maximum possible prefix length for the
+-- corresponding address type then the address is returned in CIDR notation,
+-- otherwise the prefix will be left out.
+function cidr.string( self )
+	local str
+	if self:is4() then
+		str = string.format(
+			"%d.%d.%d.%d",
+			bit.rshift(self[2][1], 8), bit.band(self[2][1], 0xFF),
+			bit.rshift(self[2][2], 8), bit.band(self[2][2], 0xFF)
+		)
+		if self[3] < 32 then
+			str = str .. "/" .. self[3]
+		end
+	elseif self:is6() then
+		str = string.format( "%X:%X:%X:%X:%X:%X:%X:%X", unpack(self[2]) )
+		if self[3] < 128 then
+			str = str .. "/" .. self[3]
+		end
+	end
+	return str
+end
+
+--- Test whether the value of the instance is lower then the given address.
+-- This function will throw an exception if the given address has a different
+-- family than this instance.
+-- @param addr	A luci.ip.cidr instance to compare against
+-- @return		Boolean indicating whether this instance is lower
+-- @see			cidr.higher
+-- @see			cidr.equal
+function cidr.lower( self, addr )
+	assert( self[1] == addr[1], "Can't compare IPv4 and IPv6 addresses" )
+	local i
+	for i = 1, #self[2] do
+		if self[2][i] ~= addr[2][i] then
+			return self[2][i] < addr[2][i]
+		end
+	end
+	return false
+end
+
+--- Test whether the value of the instance is higher then the given address.
+-- This function will throw an exception if the given address has a different
+-- family than this instance.
+-- @param addr	A luci.ip.cidr instance to compare against
+-- @return		Boolean indicating whether this instance is higher
+-- @see			cidr.lower
+-- @see			cidr.equal
+function cidr.higher( self, addr )
+	assert( self[1] == addr[1], "Can't compare IPv4 and IPv6 addresses" )
+	local i
+	for i = 1, #self[2] do
+		if self[2][i] ~= addr[2][i] then
+			return self[2][i] > addr[2][i]
+		end
+	end
+	return false
+end
+
+--- Test whether the value of the instance is equal to the given address.
+-- This function will throw an exception if the given address is a different
+-- family than this instance.
+-- @param addr	A luci.ip.cidr instance to compare against
+-- @return		Boolean indicating whether this instance is equal
+-- @see			cidr.lower
+-- @see			cidr.higher
+function cidr.equal( self, addr )
+	assert( self[1] == addr[1], "Can't compare IPv4 and IPv6 addresses" )
+	local i
+	for i = 1, #self[2] do
+		if self[2][i] ~= addr[2][i] then
+			return false
+		end
+	end
+	return true
+end
+
+--- Return the prefix length of this CIDR instance.
+-- @param mask	Override instance prefix with given netmask (optional)
+-- @return		Prefix length in bit
+function cidr.prefix( self, mask )
+	local prefix = self[3]
+
+	if mask then
+		prefix = 0
+
+		local stop = false
+		local obj = type(mask) ~= "table"
+			and ( self:is4() and IPv4(mask) or IPv6(mask) ) or mask
+
+		if not obj then return nil end
+
+		local _, word
+		for _, word in ipairs(obj[2]) do
+			if word == 0xFFFF then
+				prefix = prefix + 16
+			else
+				local bitmask = bit.lshift(1, 15)
+				while bit.band(word, bitmask) == bitmask do
+					prefix  = prefix + 1
+					bitmask = bit.lshift(1, 15 - (prefix % 16))
+				end
+
+				break
+			end
+		end
+	end
+
+	return prefix
+end
+
+--- Return a corresponding CIDR representing the network address of this
+-- instance.
+-- @param bits	Override prefix length of this instance (optional)
+-- @return		CIDR instance containing the network address
+-- @see			cidr.host
+-- @see			cidr.broadcast
+-- @see			cidr.mask
+function cidr.network( self, bits )
+	local data = { }
+	bits = bits or self[3]
+
+	local i
+	for i = 1, math.floor( bits / 16 ) do
+		data[#data+1] = self[2][i]
+	end
+
+	if #data < #self[2] then
+		data[#data+1] = bit.band( self[2][1+#data], __mask16(bits) )
+
+		for i = #data + 1, #self[2] do
+			data[#data+1] = 0
+		end
+	end
+
+	return __bless({ self[1], data, __maxlen(self[1]) })
+end
+
+--- Return a corresponding CIDR representing the host address of this
+-- instance. This is intended to extract the host address from larger subnet.
+-- @return		CIDR instance containing the network address
+-- @see			cidr.network
+-- @see			cidr.broadcast
+-- @see			cidr.mask
+function cidr.host( self )
+	return __bless({ self[1], self[2], __maxlen(self[1]) })
+end
+
+--- Return a corresponding CIDR representing the netmask of this instance.
+-- @param bits	Override prefix length of this instance (optional)
+-- @return		CIDR instance containing the netmask
+-- @see			cidr.network
+-- @see			cidr.host
+-- @see			cidr.broadcast
+function cidr.mask( self, bits )
+	local data = { }
+	bits = bits or self[3]
+
+	for i = 1, math.floor( bits / 16 ) do
+		data[#data+1] = 0xFFFF
+	end
+
+	if #data < #self[2] then
+		data[#data+1] = __mask16(bits)
+
+		for i = #data + 1, #self[2] do
+			data[#data+1] = 0
+		end
+	end
+
+	return __bless({ self[1], data, __maxlen(self[1]) })
+end
+
+--- Return CIDR containing the broadcast address of this instance.
+-- @return		CIDR instance containing the netmask, always nil for IPv6
+-- @see			cidr.network
+-- @see			cidr.host
+-- @see			cidr.mask
+function cidr.broadcast( self )
+	-- IPv6 has no broadcast addresses (XXX: assert() instead?)
+	if self[1] == FAMILY_INET4 then
+		local data   = { unpack(self[2]) }
+		local offset = math.floor( self[3] / 16 ) + 1
+
+		if offset <= #data then
+			data[offset] = bit.bor( data[offset], __not16(self[3]) )
+			for i = offset + 1, #data do data[i] = 0xFFFF end
+
+			return __bless({ self[1], data, __maxlen(self[1]) })
+		end
+	end
+end
+
+--- Test whether this instance fully contains the given CIDR instance.
+-- @param addr	CIDR instance to test against
+-- @return		Boolean indicating whether this instance contains the given CIDR
+function cidr.contains( self, addr )
+	assert( self[1] == addr[1], "Can't compare IPv4 and IPv6 addresses" )
+
+	if self:prefix() <= addr:prefix() then
+		return self:network() == addr:network(self:prefix())
+	end
+
+	return false
+end
+
+--- Add specified amount of hosts to this instance.
+-- @param amount	Number of hosts to add to this instance
+-- @param inplace	Boolen indicating whether to alter values inplace (optional)
+-- @return			CIDR representing the new address or nil on overflow error
+-- @see				cidr.sub
+function cidr.add( self, amount, inplace )
+	local pos
+	local data   = { unpack(self[2]) }
+	local shorts = __array16( amount, self[1] )
+
+	for pos = #data, 1, -1 do
+		local add = ( #shorts > 0 ) and table.remove( shorts, #shorts ) or 0
+		if ( data[pos] + add ) > 0xFFFF then
+			data[pos] = ( data[pos] + add ) % 0xFFFF
+			if pos > 1 then
+				data[pos-1] = data[pos-1] + ( add - data[pos] )
+			else
+				return nil
+			end
+		else
+			data[pos] = data[pos] + add
+		end
+	end
+
+	if inplace then
+		self[2] = data
+		return self
+	else
+		return __bless({ self[1], data, self[3] })
+	end
+end
+
+--- Substract specified amount of hosts from this instance.
+-- @param amount	Number of hosts to substract from this instance
+-- @param inplace	Boolen indicating whether to alter values inplace (optional)
+-- @return			CIDR representing the new address or nil on underflow error
+-- @see				cidr.add
+function cidr.sub( self, amount, inplace )
+	local pos
+	local data   = { unpack(self[2]) }
+	local shorts = __array16( amount, self[1] )
+
+	for pos = #data, 1, -1 do
+		local sub = ( #shorts > 0 ) and table.remove( shorts, #shorts ) or 0
+		if ( data[pos] - sub ) < 0 then
+			data[pos] = ( sub - data[pos] ) % 0xFFFF
+			if pos > 1 then
+				data[pos-1] = data[pos-1] - ( sub + data[pos] )
+			else
+				return nil
+			end
+		else
+			data[pos] = data[pos] - sub
+		end
+	end
+
+	if inplace then
+		self[2] = data
+		return self
+	else
+		return __bless({ self[1], data, self[3] })
+	end
+end
+
+--- Return CIDR containing the lowest available host address within this subnet.
+-- @return		CIDR containing the host address, nil if subnet is too small
+-- @see			cidr.maxhost
+function cidr.minhost( self )
+	if self[3] <= __sublen(self[1]) then
+		-- 1st is Network Address in IPv4 and Subnet-Router Anycast Adresse in IPv6
+		return self:network():add(1, true)
+	end
+end
+
+--- Return CIDR containing the highest available host address within the subnet.
+-- @return		CIDR containing the host address, nil if subnet is too small
+-- @see			cidr.minhost
+function cidr.maxhost( self )
+	if self[3] <= __sublen(self[1]) then
+		local i
+		local data   = { unpack(self[2]) }
+		local offset = math.floor( self[3] / 16 ) + 1
+
+		data[offset] = bit.bor( data[offset], __not16(self[3]) )
+		for i = offset + 1, #data do data[i] = 0xFFFF end
+		data = __bless({ self[1], data, __maxlen(self[1]) })
+
+		-- Last address in reserved for Broadcast Address in IPv4
+		if data[1] == FAMILY_INET4 then data:sub(1, true) end
+
+		return data
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/ltn12.lua b/trunk/package/luci/modules/base/luasrc/ltn12.lua
new file mode 100644
index 00000000..b59fb8c4
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/ltn12.lua
@@ -0,0 +1,392 @@
+--[[
+LuaSocket 2.0.2 license
+Copyright � 2004-2007 Diego Nehab
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+]]--
+--[[
+	Changes made by LuCI project:
+		* Renamed to luci.ltn12 to avoid collisions with luasocket
+		* Added inline documentation
+]]--
+-----------------------------------------------------------------------------
+-- LTN12 - Filters, sources, sinks and pumps.
+-- LuaSocket toolkit.
+-- Author: Diego Nehab
+-- RCS ID: $Id$
+-----------------------------------------------------------------------------
+
+-----------------------------------------------------------------------------
+-- Declare module
+-----------------------------------------------------------------------------
+local string = require("string")
+local table = require("table")
+local base = _G
+
+--- Diego Nehab's LTN12 - Filters, sources, sinks and pumps.
+-- See http://lua-users.org/wiki/FiltersSourcesAndSinks for design concepts 
+module("luci.ltn12")
+
+filter = {}
+source = {}
+sink = {}
+pump = {}
+
+-- 2048 seems to be better in windows...
+BLOCKSIZE = 2048
+_VERSION = "LTN12 1.0.1"
+
+-----------------------------------------------------------------------------
+-- Filter stuff
+-----------------------------------------------------------------------------
+
+--- LTN12 Filter constructors
+-- @class module
+-- @name luci.ltn12.filter
+
+--- Return a high level filter that cycles a low-level filter
+-- by passing it each chunk and updating a context between calls. 
+-- @param low   Low-level filter
+-- @param ctx   Context
+-- @param extra Extra argument passed to the low-level filter
+-- @return LTN12 filter
+function filter.cycle(low, ctx, extra)
+    base.assert(low)
+    return function(chunk)
+        local ret
+        ret, ctx = low(ctx, chunk, extra)
+        return ret
+    end
+end
+
+--- Chain a bunch of filters together.
+-- (thanks to Wim Couwenberg)
+-- @param ... filters to be chained
+-- @return LTN12 filter
+function filter.chain(...)
+    local n = table.getn(arg)
+    local top, index = 1, 1
+    local retry = ""
+    return function(chunk)
+        retry = chunk and retry
+        while true do
+            if index == top then
+                chunk = arg[index](chunk)
+                if chunk == "" or top == n then return chunk
+                elseif chunk then index = index + 1
+                else
+                    top = top+1
+                    index = top
+                end
+            else
+                chunk = arg[index](chunk or "")
+                if chunk == "" then
+                    index = index - 1
+                    chunk = retry
+                elseif chunk then
+                    if index == n then return chunk
+                    else index = index + 1 end
+                else base.error("filter returned inappropriate nil") end
+            end
+        end
+    end
+end
+
+-----------------------------------------------------------------------------
+-- Source stuff
+-----------------------------------------------------------------------------
+
+--- LTN12 Source constructors
+-- @class module
+-- @name luci.ltn12.source
+
+-- create an empty source
+local function empty()
+    return nil
+end
+
+--- Create an empty source.
+-- @return LTN12 source
+function source.empty()
+    return empty
+end
+
+--- Return a source that just outputs an error.
+-- @param err Error object
+-- @return LTN12 source
+function source.error(err)
+    return function()
+        return nil, err
+    end
+end
+
+--- Create a file source.
+-- @param handle File handle ready for reading
+-- @param io_err IO error object
+-- @return LTN12 source
+function source.file(handle, io_err)
+    if handle then
+        return function()
+            local chunk = handle:read(BLOCKSIZE)
+            if chunk and chunk:len() == 0 then chunk = nil end
+            if not chunk then handle:close() end
+            return chunk
+        end
+    else return source.error(io_err or "unable to open file") end
+end
+
+--- Turn a fancy source into a simple source.
+-- @param src fancy source
+-- @return LTN12 source
+function source.simplify(src)
+    base.assert(src)
+    return function()
+        local chunk, err_or_new = src()
+        src = err_or_new or src
+        if not chunk then return nil, err_or_new
+        else return chunk end
+    end
+end
+
+--- Create a string source.
+-- @param s Data
+-- @return LTN12 source
+function source.string(s)
+    if s then
+        local i = 1
+        return function()
+            local chunk = string.sub(s, i, i+BLOCKSIZE-1)
+            i = i + BLOCKSIZE
+            if chunk ~= "" then return chunk
+            else return nil end
+        end
+    else return source.empty() end
+end
+
+--- Creates rewindable source.
+-- @param src LTN12 source to be made rewindable
+-- @return LTN12 source
+function source.rewind(src)
+    base.assert(src)
+    local t = {}
+    return function(chunk)
+        if not chunk then
+            chunk = table.remove(t)
+            if not chunk then return src()
+            else return chunk end
+        else
+            t[#t+1] = chunk
+        end
+    end
+end
+
+--- Chain a source and a filter together.
+-- @param src LTN12 source
+-- @param f LTN12 filter
+-- @return LTN12 source
+function source.chain(src, f)
+    base.assert(src and f)
+    local last_in, last_out = "", ""
+    local state = "feeding"
+    local err
+    return function()
+        if not last_out then
+            base.error('source is empty!', 2)
+        end
+        while true do
+            if state == "feeding" then
+                last_in, err = src()
+                if err then return nil, err end
+                last_out = f(last_in)
+                if not last_out then
+                    if last_in then
+                        base.error('filter returned inappropriate nil')
+                    else
+                        return nil
+                    end
+                elseif last_out ~= "" then
+                    state = "eating"
+                    if last_in then last_in = "" end
+                    return last_out
+                end
+            else
+                last_out = f(last_in)
+                if last_out == "" then
+                    if last_in == "" then
+                        state = "feeding"
+                    else
+                        base.error('filter returned ""')
+                    end
+                elseif not last_out then
+                    if last_in then
+                        base.error('filter returned inappropriate nil')
+                    else
+                        return nil
+                    end
+                else
+                    return last_out
+                end
+            end
+        end
+    end
+end
+
+--- Create a source that produces contents of several sources.
+-- Sources will be used one after the other, as if they were concatenated
+-- (thanks to Wim Couwenberg)
+-- @param ... LTN12 sources
+-- @return LTN12 source
+function source.cat(...)
+    local src = table.remove(arg, 1)
+    return function()
+        while src do
+            local chunk, err = src()
+            if chunk then return chunk end
+            if err then return nil, err end
+            src = table.remove(arg, 1)
+        end
+    end
+end
+
+-----------------------------------------------------------------------------
+-- Sink stuff
+-----------------------------------------------------------------------------
+
+--- LTN12 sink constructors
+-- @class module
+-- @name luci.ltn12.sink
+
+--- Create a sink that stores into a table.
+-- @param t output table to store into
+-- @return LTN12 sink
+function sink.table(t)
+    t = t or {}
+    local f = function(chunk, err)
+        if chunk then t[#t+1] = chunk end
+        return 1
+    end
+    return f, t
+end
+
+--- Turn a fancy sink into a simple sink.
+-- @param snk fancy sink
+-- @return LTN12 sink
+function sink.simplify(snk)
+    base.assert(snk)
+    return function(chunk, err)
+        local ret, err_or_new = snk(chunk, err)
+        if not ret then return nil, err_or_new end
+        snk = err_or_new or snk
+        return 1
+    end
+end
+
+--- Create a file sink.
+-- @param handle file handle to write to
+-- @param io_err IO error
+-- @return LTN12 sink
+function sink.file(handle, io_err)
+    if handle then
+        return function(chunk, err)
+            if not chunk then
+                handle:close()
+                return 1
+            else return handle:write(chunk) end
+        end
+    else return sink.error(io_err or "unable to open file") end
+end
+
+-- creates a sink that discards data
+local function null()
+    return 1
+end
+
+--- Create a sink that discards data.
+-- @return LTN12 sink
+function sink.null()
+    return null
+end
+
+--- Create a sink that just returns an error.
+-- @param err Error object
+-- @return LTN12 sink
+function sink.error(err)
+    return function()
+        return nil, err
+    end
+end
+
+--- Chain a sink with a filter.
+-- @param f LTN12 filter
+-- @param snk LTN12 sink
+-- @return LTN12 sink
+function sink.chain(f, snk)
+    base.assert(f and snk)
+    return function(chunk, err)
+        if chunk ~= "" then
+            local filtered = f(chunk)
+            local done = chunk and ""
+            while true do
+                local ret, snkerr = snk(filtered, err)
+                if not ret then return nil, snkerr end
+                if filtered == done then return 1 end
+                filtered = f(done)
+            end
+        else return 1 end
+    end
+end
+
+-----------------------------------------------------------------------------
+-- Pump stuff
+-----------------------------------------------------------------------------
+
+--- LTN12 pump functions
+-- @class module
+-- @name luci.ltn12.pump
+
+--- Pump one chunk from the source to the sink.
+-- @param src LTN12 source
+-- @param snk LTN12 sink
+-- @return Chunk of data or nil if an error occured
+-- @return Error object
+function pump.step(src, snk)
+    local chunk, src_err = src()
+    local ret, snk_err = snk(chunk, src_err)
+    if chunk and ret then return 1
+    else return nil, src_err or snk_err end
+end
+
+--- Pump all data from a source to a sink, using a step function.
+-- @param src LTN12 source
+-- @param snk LTN12 sink
+-- @param step step function (optional)
+-- @return 1 if the operation succeeded otherwise nil
+-- @return Error object
+function pump.all(src, snk, step)
+    base.assert(src and snk)
+    step = step or pump.step
+    while true do
+        local ret, err = step(src, snk)
+        if not ret then
+            if err then return nil, err
+            else return 1 end
+        end
+    end
+end
+
diff --git a/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua b/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua
new file mode 100644
index 00000000..fe3fec6f
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua
@@ -0,0 +1,76 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+local ifc = net:get_interface()
+
+local hostname, accept_ra, send_rs
+local bcast, defaultroute, peerdns, dns, metric, clientid, vendorclass
+
+
+hostname = section:taboption("general", Value, "hostname",
+	translate("Hostname to send when requesting DHCP"))
+
+hostname.placeholder = luci.sys.hostname()
+hostname.datatype    = "hostname"
+
+
+bcast = section:taboption("advanced", Flag, "broadcast",
+	translate("Use broadcast flag"),
+	translate("Required for certain ISPs, e.g. Charter with DOCSIS 3"))
+
+bcast.default = bcast.disabled
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+
+
+clientid = section:taboption("advanced", Value, "clientid",
+	translate("Client ID to send when requesting DHCP"))
+
+
+vendorclass = section:taboption("advanced", Value, "vendorid",
+	translate("Vendor Class to send when requesting DHCP"))
+
+
+luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_none.lua b/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_none.lua
new file mode 100644
index 00000000..0e34b67d
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_none.lua
@@ -0,0 +1,13 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
diff --git a/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_static.lua b/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_static.lua
new file mode 100644
index 00000000..338c0b7d
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/model/cbi/admin_network/proto_static.lua
@@ -0,0 +1,90 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+local ifc = net:get_interface()
+
+local ipaddr, netmask, gateway, broadcast, dns, accept_ra, send_rs, ip6addr, ip6gw
+local mtu, metric
+
+
+ipaddr = section:taboption("general", Value, "ipaddr", translate("IPv4 address"))
+ipaddr.datatype = "ip4addr"
+
+
+netmask = section:taboption("general", Value, "netmask",
+	translate("IPv4 netmask"))
+
+netmask.datatype = "ip4addr"
+netmask:value("255.255.255.0")
+netmask:value("255.255.0.0")
+netmask:value("255.0.0.0")
+
+
+gateway = section:taboption("general", Value, "gateway", translate("IPv4 gateway"))
+gateway.datatype = "ip4addr"
+
+
+broadcast = section:taboption("general", Value, "broadcast", translate("IPv4 broadcast"))
+broadcast.datatype = "ip4addr"
+
+
+dns = section:taboption("general", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+if luci.model.network:has_ipv6() then
+
+	local ip6assign = section:taboption("general", Value, "ip6assign", translate("IPv6 assignment length"),
+		translate("Assign a part of given length of every public IPv6-prefix to this interface"))
+	ip6assign:value("", translate("disabled"))
+	ip6assign:value("64")
+	ip6assign.datatype = "max(64)"
+
+	local ip6hint = section:taboption("general", Value, "ip6hint", translate("IPv6 assignment hint"),
+		translate("Assign prefix parts using this hexadecimal subprefix ID for this interface."))
+	for i=33,64 do ip6hint:depends("ip6assign", i) end
+
+	ip6addr = section:taboption("general", Value, "ip6addr", translate("IPv6 address"))
+	ip6addr.datatype = "ip6addr"
+	ip6addr:depends("ip6assign", "")
+
+
+	ip6gw = section:taboption("general", Value, "ip6gw", translate("IPv6 gateway"))
+	ip6gw.datatype = "ip6addr"
+	ip6gw:depends("ip6assign", "")
+
+
+	local ip6prefix = s:taboption("general", Value, "ip6prefix", translate("IPv6 routed prefix"),
+		translate("Public prefix routed to this device for distribution to clients."))
+	ip6prefix.datatype = "ip6addr"
+	ip6prefix:depends("ip6assign", "")
+
+end
+
+
+luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(9200)"
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
diff --git a/trunk/package/luci/modules/base/luasrc/model/firewall.lua b/trunk/package/luci/modules/base/luasrc/model/firewall.lua
new file mode 100644
index 00000000..a9f6fdb7
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/model/firewall.lua
@@ -0,0 +1,582 @@
+--[[
+LuCI - Firewall model
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local type, pairs, ipairs, table, luci, math
+	= type, pairs, ipairs, table, luci, math
+
+local tpl = require "luci.template.parser"
+local utl = require "luci.util"
+local uci = require "luci.model.uci"
+
+module "luci.model.firewall"
+
+
+local uci_r, uci_s
+
+function _valid_id(x)
+	return (x and #x > 0 and x:match("^[a-zA-Z0-9_]+$"))
+end
+
+function _get(c, s, o)
+	return uci_r:get(c, s, o)
+end
+
+function _set(c, s, o, v)
+	if v ~= nil then
+		if type(v) == "boolean" then v = v and "1" or "0" end
+		return uci_r:set(c, s, o, v)
+	else
+		return uci_r:delete(c, s, o)
+	end
+end
+
+
+function init(cursor)
+	uci_r = cursor or uci_r or uci.cursor()
+	uci_s = uci_r:substate()
+
+	return _M
+end
+
+function save(self, ...)
+	uci_r:save(...)
+	uci_r:load(...)
+end
+
+function commit(self, ...)
+	uci_r:commit(...)
+	uci_r:load(...)
+end
+
+function get_defaults()
+	return defaults()
+end
+
+function new_zone(self)
+	local name = "newzone"
+	local count = 1
+
+	while self:get_zone(name) do
+		count = count + 1
+		name = "newzone%d" % count
+	end
+
+	return self:add_zone(name)
+end
+
+function add_zone(self, n)
+	if _valid_id(n) and not self:get_zone(n) then
+		local d = defaults()
+		local z = uci_r:section("firewall", "zone", nil, {
+			name    = n,
+			network = " ",
+			input   = d:input()   or "DROP",
+			forward = d:forward() or "DROP",
+			output  = d:output()  or "DROP"
+		})
+
+		return z and zone(z)
+	end
+end
+
+function get_zone(self, n)
+	if uci_r:get("firewall", n) == "zone" then
+		return zone(n)
+	else
+		local z
+		uci_r:foreach("firewall", "zone",
+			function(s)
+				if n and s.name == n then
+					z = s['.name']
+					return false
+				end
+			end)
+		return z and zone(z)
+	end
+end
+
+function get_zones(self)
+	local zones = { }
+	local znl = { }
+
+	uci_r:foreach("firewall", "zone",
+		function(s)
+			if s.name then
+				znl[s.name] = zone(s['.name'])
+			end
+		end)
+
+	local z
+	for z in utl.kspairs(znl) do
+		zones[#zones+1] = znl[z]
+	end
+
+	return zones
+end
+
+function get_zone_by_network(self, net)
+	local z
+
+	uci_r:foreach("firewall", "zone",
+		function(s)
+			if s.name and net then
+				local n
+				for n in utl.imatch(s.network or s.name) do
+					if n == net then
+						z = s['.name']
+						return false
+					end
+				end
+			end
+		end)
+
+	return z and zone(z)
+end
+
+function del_zone(self, n)
+	local r = false
+
+	if uci_r:get("firewall", n) == "zone" then
+		local z = uci_r:get("firewall", n, "name")
+		r = uci_r:delete("firewall", n)
+		n = z
+	else
+		uci_r:foreach("firewall", "zone",
+			function(s)
+				if n and s.name == n then
+					r = uci_r:delete("firewall", s['.name'])
+					return false
+				end
+			end)
+	end
+
+	if r then
+		uci_r:foreach("firewall", "rule",
+			function(s)
+				if s.src == n or s.dest == n then
+					uci_r:delete("firewall", s['.name'])
+				end
+			end)
+
+		uci_r:foreach("firewall", "redirect",
+			function(s)
+				if s.src == n or s.dest == n then
+					uci_r:delete("firewall", s['.name'])
+				end
+			end)
+
+		uci_r:foreach("firewall", "forwarding",
+			function(s)
+				if s.src == n or s.dest == n then
+					uci_r:delete("firewall", s['.name'])
+				end
+			end)
+	end
+
+	return r
+end
+
+function rename_zone(self, old, new)
+	local r = false
+
+	if _valid_id(new) and not self:get_zone(new) then
+		uci_r:foreach("firewall", "zone",
+			function(s)
+				if old and s.name == old then
+					if not s.network then
+						uci_r:set("firewall", s['.name'], "network", old)
+					end
+					uci_r:set("firewall", s['.name'], "name", new)
+					r = true
+					return false
+				end
+			end)
+
+		if r then
+			uci_r:foreach("firewall", "rule",
+				function(s)
+					if s.src == old then
+						uci_r:set("firewall", s['.name'], "src", new)
+					end
+					if s.dest == old then
+						uci_r:set("firewall", s['.name'], "dest", new)
+					end
+				end)
+
+			uci_r:foreach("firewall", "redirect",
+				function(s)
+					if s.src == old then
+						uci_r:set("firewall", s['.name'], "src", new)
+					end
+					if s.dest == old then
+						uci_r:set("firewall", s['.name'], "dest", new)
+					end
+				end)
+
+			uci_r:foreach("firewall", "forwarding",
+				function(s)
+					if s.src == old then
+						uci_r:set("firewall", s['.name'], "src", new)
+					end
+					if s.dest == old then
+						uci_r:set("firewall", s['.name'], "dest", new)
+					end
+				end)
+		end
+	end
+
+	return r
+end
+
+function del_network(self, net)
+	local z
+	if net then
+		for _, z in ipairs(self:get_zones()) do
+			z:del_network(net)
+		end
+	end
+end
+
+
+defaults = utl.class()
+function defaults.__init__(self)
+	uci_r:foreach("firewall", "defaults",
+		function(s)
+			self.sid  = s['.name']
+			return false
+		end)
+
+	self.sid = self.sid or uci_r:section("firewall", "defaults", nil, { })
+end
+
+function defaults.get(self, opt)
+	return _get("firewall", self.sid, opt)
+end
+
+function defaults.set(self, opt, val)
+	return _set("firewall", self.sid, opt, val)
+end
+
+function defaults.syn_flood(self)
+	return (self:get("syn_flood") == "1")
+end
+
+function defaults.drop_invalid(self)
+	return (self:get("drop_invalid") == "1")
+end
+
+function defaults.input(self)
+	return self:get("input") or "DROP"
+end
+
+function defaults.forward(self)
+	return self:get("forward") or "DROP"
+end
+
+function defaults.output(self)
+	return self:get("output") or "DROP"
+end
+
+
+zone = utl.class()
+function zone.__init__(self, z)
+	if uci_r:get("firewall", z) == "zone" then
+		self.sid  = z
+		self.data = uci_r:get_all("firewall", z)
+	else
+		uci_r:foreach("firewall", "zone",
+			function(s)
+				if s.name == z then
+					self.sid  = s['.name']
+					self.data = s
+					return false
+				end
+			end)
+	end
+end
+
+function zone.get(self, opt)
+	return _get("firewall", self.sid, opt)
+end
+
+function zone.set(self, opt, val)
+	return _set("firewall", self.sid, opt, val)
+end
+
+function zone.masq(self)
+	return (self:get("masq") == "1")
+end
+
+function zone.name(self)
+	return self:get("name")
+end
+
+function zone.network(self)
+	return self:get("network")
+end
+
+function zone.input(self)
+	return self:get("input") or defaults():input() or "DROP"
+end
+
+function zone.forward(self)
+	return self:get("forward") or defaults():forward() or "DROP"
+end
+
+function zone.output(self)
+	return self:get("output") or defaults():output() or "DROP"
+end
+
+function zone.add_network(self, net)
+	if uci_r:get("network", net) == "interface" then
+		local nets = { }
+
+		local n
+		for n in utl.imatch(self:get("network") or self:get("name")) do
+			if n ~= net then
+				nets[#nets+1] = n
+			end
+		end
+
+		nets[#nets+1] = net
+
+		_M:del_network(net)
+		self:set("network", table.concat(nets, " "))
+	end
+end
+
+function zone.del_network(self, net)
+	local nets = { }
+
+	local n
+	for n in utl.imatch(self:get("network") or self:get("name")) do
+		if n ~= net then
+			nets[#nets+1] = n
+		end
+	end
+
+	if #nets > 0 then
+		self:set("network", table.concat(nets, " "))
+	else
+		self:set("network", " ")
+	end
+end
+
+function zone.get_networks(self)
+	local nets = { }
+
+	local n
+	for n in utl.imatch(self:get("network") or self:get("name")) do
+		nets[#nets+1] = n
+	end
+
+	return nets
+end
+
+function zone.clear_networks(self)
+	self:set("network", " ")
+end
+
+function zone.get_forwardings_by(self, what)
+	local name = self:name()
+	local forwards = { }
+
+	uci_r:foreach("firewall", "forwarding",
+		function(s)
+			if s.src and s.dest and s[what] == name then
+				forwards[#forwards+1] = forwarding(s['.name'])
+			end
+		end)
+
+	return forwards
+end
+
+function zone.add_forwarding_to(self, dest)
+	local exist, forward
+
+	for _, forward in ipairs(self:get_forwardings_by('src')) do
+		if forward:dest() == dest then
+			exist = true
+			break
+		end
+	end
+
+	if not exist and dest ~= self:name() and _valid_id(dest) then
+		local s = uci_r:section("firewall", "forwarding", nil, {
+			src     = self:name(),
+			dest    = dest
+		})
+
+		return s and forwarding(s)
+	end
+end
+
+function zone.add_forwarding_from(self, src)
+	local exist, forward
+
+	for _, forward in ipairs(self:get_forwardings_by('dest')) do
+		if forward:src() == src then
+			exist = true
+			break
+		end
+	end
+
+	if not exist and src ~= self:name() and _valid_id(src) then
+		local s = uci_r:section("firewall", "forwarding", nil, {
+			src     = src,
+			dest    = self:name()
+		})
+
+		return s and forwarding(s)
+	end
+end
+
+function zone.del_forwardings_by(self, what)
+	local name = self:name()
+
+	uci_r:delete_all("firewall", "forwarding",
+		function(s)
+			return (s.src and s.dest and s[what] == name)
+		end)
+end
+
+function zone.add_redirect(self, options)
+	options = options or { }
+	options.src = self:name()
+
+	local s = uci_r:section("firewall", "redirect", nil, options)
+	return s and redirect(s)
+end
+
+function zone.add_rule(self, options)
+	options = options or { }
+	options.src = self:name()
+
+	local s = uci_r:section("firewall", "rule", nil, options)
+	return s and rule(s)
+end
+
+function zone.get_color(self)
+	if self and self:name() == "lan" then
+		return "#90f090"
+	elseif self and self:name() == "wan" then
+		return "#f09090"
+	elseif self then
+		math.randomseed(tpl.hash(self:name()))
+
+		local r   = math.random(128)
+		local g   = math.random(128)
+		local min = 0
+		local max = 128
+
+		if ( r + g ) < 128 then
+			min = 128 - r - g
+		else
+			max = 255 - r - g
+		end
+
+		local b = min + math.floor( math.random() * ( max - min ) )
+
+		return "#%02x%02x%02x" % { 0xFF - r, 0xFF - g, 0xFF - b }
+	else
+		return "#eeeeee"
+	end
+end
+
+
+forwarding = utl.class()
+function forwarding.__init__(self, f)
+	self.sid = f
+end
+
+function forwarding.src(self)
+	return uci_r:get("firewall", self.sid, "src")
+end
+
+function forwarding.dest(self)
+	return uci_r:get("firewall", self.sid, "dest")
+end
+
+function forwarding.src_zone(self)
+	return zone(self:src())
+end
+
+function forwarding.dest_zone(self)
+	return zone(self:dest())
+end
+
+
+rule = utl.class()
+function rule.__init__(self, f)
+	self.sid = f
+end
+
+function rule.get(self, opt)
+	return _get("firewall", self.sid, opt)
+end
+
+function rule.set(self, opt, val)
+	return _set("firewall", self.sid, opt, val)
+end
+
+function rule.src(self)
+	return uci_r:get("firewall", self.sid, "src")
+end
+
+function rule.dest(self)
+	return uci_r:get("firewall", self.sid, "dest")
+end
+
+function rule.src_zone(self)
+	return zone(self:src())
+end
+
+function rule.dest_zone(self)
+	return zone(self:dest())
+end
+
+
+redirect = utl.class()
+function redirect.__init__(self, f)
+	self.sid = f
+end
+
+function redirect.get(self, opt)
+	return _get("firewall", self.sid, opt)
+end
+
+function redirect.set(self, opt, val)
+	return _set("firewall", self.sid, opt, val)
+end
+
+function redirect.src(self)
+	return uci_r:get("firewall", self.sid, "src")
+end
+
+function redirect.dest(self)
+	return uci_r:get("firewall", self.sid, "dest")
+end
+
+function redirect.src_zone(self)
+	return zone(self:src())
+end
+
+function redirect.dest_zone(self)
+	return zone(self:dest())
+end
diff --git a/trunk/package/luci/modules/base/luasrc/model/ipkg.lua b/trunk/package/luci/modules/base/luasrc/model/ipkg.lua
new file mode 100644
index 00000000..c927e711
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/model/ipkg.lua
@@ -0,0 +1,239 @@
+--[[
+LuCI - Lua Configuration Interface
+
+(c) 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+(c) 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local os   = require "os"
+local io   = require "io"
+local fs   = require "nixio.fs"
+local util = require "luci.util"
+
+local type  = type
+local pairs = pairs
+local error = error
+local table = table
+
+local ipkg = "opkg --force-removal-of-dependent-packages --force-overwrite --nocase"
+local icfg = "/etc/opkg.conf"
+
+--- LuCI OPKG call abstraction library
+module "luci.model.ipkg"
+
+
+-- Internal action function
+local function _action(cmd, ...)
+	local pkg = ""
+	for k, v in pairs({...}) do
+		pkg = pkg .. " '" .. v:gsub("'", "") .. "'"
+	end
+
+	local c = "%s %s %s >/tmp/opkg.stdout 2>/tmp/opkg.stderr" %{ ipkg, cmd, pkg }
+	local r = os.execute(c)
+	local e = fs.readfile("/tmp/opkg.stderr")
+	local o = fs.readfile("/tmp/opkg.stdout")
+
+	fs.unlink("/tmp/opkg.stderr")
+	fs.unlink("/tmp/opkg.stdout")
+
+	return r, o or "", e or ""
+end
+
+-- Internal parser function
+local function _parselist(rawdata)
+	if type(rawdata) ~= "function" then
+		error("OPKG: Invalid rawdata given")
+	end
+
+	local data = {}
+	local c = {}
+	local l = nil
+
+	for line in rawdata do
+		if line:sub(1, 1) ~= " " then
+			local key, val = line:match("(.-): ?(.*)%s*")
+
+			if key and val then
+				if key == "Package" then
+					c = {Package = val}
+					data[val] = c
+				elseif key == "Status" then
+					c.Status = {}
+					for j in val:gmatch("([^ ]+)") do
+						c.Status[j] = true
+					end
+				else
+					c[key] = val
+				end
+				l = key
+			end
+		else
+			-- Multi-line field
+			c[l] = c[l] .. "\n" .. line
+		end
+	end
+
+	return data
+end
+
+-- Internal lookup function
+local function _lookup(act, pkg)
+	local cmd = ipkg .. " " .. act
+	if pkg then
+		cmd = cmd .. " '" .. pkg:gsub("'", "") .. "'"
+	end
+
+	-- OPKG sometimes kills the whole machine because it sucks
+	-- Therefore we have to use a sucky approach too and use
+	-- tmpfiles instead of directly reading the output
+	local tmpfile = os.tmpname()
+	os.execute(cmd .. (" >%s 2>/dev/null" % tmpfile))
+
+	local data = _parselist(io.lines(tmpfile))
+	os.remove(tmpfile)
+	return data
+end
+
+
+--- Return information about installed and available packages.
+-- @param pkg Limit output to a (set of) packages
+-- @return Table containing package information
+function info(pkg)
+	return _lookup("info", pkg)
+end
+
+--- Return the package status of one or more packages.
+-- @param pkg Limit output to a (set of) packages
+-- @return Table containing package status information
+function status(pkg)
+	return _lookup("status", pkg)
+end
+
+--- Install one or more packages.
+-- @param ... List of packages to install
+-- @return Boolean indicating the status of the action
+-- @return OPKG return code, STDOUT and STDERR
+function install(...)
+	return _action("install", ...)
+end
+
+--- Determine whether a given package is installed.
+-- @param pkg Package
+-- @return Boolean
+function installed(pkg)
+	local p = status(pkg)[pkg]
+	return (p and p.Status and p.Status.installed)
+end
+
+--- Remove one or more packages.
+-- @param ... List of packages to install
+-- @return Boolean indicating the status of the action
+-- @return OPKG return code, STDOUT and STDERR
+function remove(...)
+	return _action("remove", ...)
+end
+
+--- Update package lists.
+-- @return Boolean indicating the status of the action
+-- @return OPKG return code, STDOUT and STDERR
+function update()
+	return _action("update")
+end
+
+--- Upgrades all installed packages.
+-- @return Boolean indicating the status of the action
+-- @return OPKG return code, STDOUT and STDERR
+function upgrade()
+	return _action("upgrade")
+end
+
+-- List helper
+function _list(action, pat, cb)
+	local fd = io.popen(ipkg .. " " .. action ..
+		(pat and (" '%s'" % pat:gsub("'", "")) or ""))
+
+	if fd then
+		local name, version, desc
+		while true do
+			local line = fd:read("*l")
+			if not line then break end
+
+			name, version, desc = line:match("^(.-) %- (.-) %- (.+)")
+
+			if not name then
+				name, version = line:match("^(.-) %- (.+)")
+				desc = ""
+			end
+
+			cb(name, version, desc)
+
+			name    = nil
+			version = nil
+			desc    = nil
+		end
+
+		fd:close()
+	end
+end
+
+--- List all packages known to opkg.
+-- @param pat	Only find packages matching this pattern, nil lists all packages
+-- @param cb	Callback function invoked for each package, receives name, version and description as arguments
+-- @return	nothing
+function list_all(pat, cb)
+	_list("list", pat, cb)
+end
+
+--- List installed packages.
+-- @param pat	Only find packages matching this pattern, nil lists all packages
+-- @param cb	Callback function invoked for each package, receives name, version and description as arguments
+-- @return	nothing
+function list_installed(pat, cb)
+	_list("list_installed", pat, cb)
+end
+
+--- Find packages that match the given pattern.
+-- @param pat	Find packages whose names or descriptions match this pattern, nil results in zero results
+-- @param cb	Callback function invoked for each patckage, receives name, version and description as arguments
+-- @return	nothing
+function find(pat, cb)
+	_list("find", pat, cb)
+end
+
+
+--- Determines the overlay root used by opkg.
+-- @return		String containing the directory path of the overlay root.
+function overlay_root()
+	local od = "/"
+	local fd = io.open(icfg, "r")
+
+	if fd then
+		local ln
+
+		repeat
+			ln = fd:read("*l")
+			if ln and ln:match("^%s*option%s+overlay_root%s+") then
+				od = ln:match("^%s*option%s+overlay_root%s+(%S+)")
+
+				local s = fs.stat(od)
+				if not s or s.type ~= "dir" then
+					od = "/"
+				end
+
+				break
+			end
+		until not ln
+
+		fd:close()
+	end
+
+	return od
+end
diff --git a/trunk/package/luci/modules/base/luasrc/model/network.lua b/trunk/package/luci/modules/base/luasrc/model/network.lua
new file mode 100644
index 00000000..6119abd7
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/model/network.lua
@@ -0,0 +1,1597 @@
+--[[
+LuCI - Network model
+
+Copyright 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local type, next, pairs, ipairs, loadfile, table
+	= type, next, pairs, ipairs, loadfile, table
+
+local tonumber, tostring, math = tonumber, tostring, math
+
+local require = require
+
+local bus = require "ubus"
+local nxo = require "nixio"
+local nfs = require "nixio.fs"
+local ipc = require "luci.ip"
+local sys = require "luci.sys"
+local utl = require "luci.util"
+local dsp = require "luci.dispatcher"
+local uci = require "luci.model.uci"
+local lng = require "luci.i18n"
+
+module "luci.model.network"
+
+
+IFACE_PATTERNS_VIRTUAL  = { }
+IFACE_PATTERNS_IGNORE   = { "^wmaster%d", "^wifi%d", "^hwsim%d", "^imq%d", "^ifb%d", "^mon%.wlan%d", "^sit%d", "^gre%d", "^lo$" }
+IFACE_PATTERNS_WIRELESS = { "^wlan%d", "^wl%d", "^ath%d", "^%w+%.network%d" }
+
+
+protocol = utl.class()
+
+local _protocols = { }
+
+local _interfaces, _bridge, _switch, _tunnel
+local _ubus, _ubusnetcache, _ubusdevcache, _ubuswificache
+local _uci_real, _uci_state
+
+function _filter(c, s, o, r)
+	local val = _uci_real:get(c, s, o)
+	if val then
+		local l = { }
+		if type(val) == "string" then
+			for val in val:gmatch("%S+") do
+				if val ~= r then
+					l[#l+1] = val
+				end
+			end
+			if #l > 0 then
+				_uci_real:set(c, s, o, table.concat(l, " "))
+			else
+				_uci_real:delete(c, s, o)
+			end
+		elseif type(val) == "table" then
+			for _, val in ipairs(val) do
+				if val ~= r then
+					l[#l+1] = val
+				end
+			end
+			if #l > 0 then
+				_uci_real:set(c, s, o, l)
+			else
+				_uci_real:delete(c, s, o)
+			end
+		end
+	end
+end
+
+function _append(c, s, o, a)
+	local val = _uci_real:get(c, s, o) or ""
+	if type(val) == "string" then
+		local l = { }
+		for val in val:gmatch("%S+") do
+			if val ~= a then
+				l[#l+1] = val
+			end
+		end
+		l[#l+1] = a
+		_uci_real:set(c, s, o, table.concat(l, " "))
+	elseif type(val) == "table" then
+		local l = { }
+		for _, val in ipairs(val) do
+			if val ~= a then
+				l[#l+1] = val
+			end
+		end
+		l[#l+1] = a
+		_uci_real:set(c, s, o, l)
+	end
+end
+
+function _stror(s1, s2)
+	if not s1 or #s1 == 0 then
+		return s2 and #s2 > 0 and s2
+	else
+		return s1
+	end
+end
+
+function _get(c, s, o)
+	return _uci_real:get(c, s, o)
+end
+
+function _set(c, s, o, v)
+	if v ~= nil then
+		if type(v) == "boolean" then v = v and "1" or "0" end
+		return _uci_real:set(c, s, o, v)
+	else
+		return _uci_real:delete(c, s, o)
+	end
+end
+
+function _wifi_iface(x)
+	local _, p
+	for _, p in ipairs(IFACE_PATTERNS_WIRELESS) do
+		if x:match(p) then
+			return true
+		end
+	end
+	return false
+end
+
+function _wifi_state(key, val, field)
+	local radio, radiostate, ifc, ifcstate
+
+	if not next(_ubuswificache) then
+		_ubuswificache = _ubus:call("network.wireless", "status", {}) or {}
+
+		-- workaround extended section format
+		for radio, radiostate in pairs(_ubuswificache) do
+			for ifc, ifcstate in pairs(radiostate.interfaces) do
+				if ifcstate.section and ifcstate.section:sub(1, 1) == '@' then
+					local s = _uci_real:get_all('wireless.%s' % ifcstate.section)
+					if s then
+						ifcstate.section = s['.name']
+					end
+				end
+			end
+		end
+	end
+
+	for radio, radiostate in pairs(_ubuswificache) do
+		for ifc, ifcstate in pairs(radiostate.interfaces) do
+			if ifcstate[key] == val then
+				return ifcstate[field]
+			end
+		end
+	end
+end
+
+function _wifi_lookup(ifn)
+	-- got a radio#.network# pseudo iface, locate the corresponding section
+	local radio, ifnidx = ifn:match("^(%w+)%.network(%d+)$")
+	if radio and ifnidx then
+		local sid = nil
+		local num = 0
+
+		ifnidx = tonumber(ifnidx)
+		_uci_real:foreach("wireless", "wifi-iface",
+			function(s)
+				if s.device == radio then
+					num = num + 1
+					if num == ifnidx then
+						sid = s['.name']
+						return false
+					end
+				end
+			end)
+
+		return sid
+
+	-- looks like wifi, try to locate the section via state vars
+	elseif _wifi_iface(ifn) then
+		local sid = _wifi_state("ifname", ifn, "section")
+		if not sid then
+			_uci_state:foreach("wireless", "wifi-iface",
+				function(s)
+					if s.ifname == ifn then
+						sid = s['.name']
+						return false
+					end
+				end)
+		end
+
+		return sid
+	end
+end
+
+function _iface_virtual(x)
+	local _, p
+	for _, p in ipairs(IFACE_PATTERNS_VIRTUAL) do
+		if x:match(p) then
+			return true
+		end
+	end
+	return false
+end
+
+function _iface_ignore(x)
+	local _, p
+	for _, p in ipairs(IFACE_PATTERNS_IGNORE) do
+		if x:match(p) then
+			return true
+		end
+	end
+	return _iface_virtual(x)
+end
+
+
+function init(cursor)
+	_uci_real  = cursor or _uci_real or uci.cursor()
+	_uci_state = _uci_real:substate()
+
+	_interfaces = { }
+	_bridge     = { }
+	_switch     = { }
+	_tunnel     = { }
+
+	_ubus          = bus.connect()
+	_ubusnetcache  = { }
+	_ubusdevcache  = { }
+	_ubuswificache = { }
+
+	-- read interface information
+	local n, i
+	for n, i in ipairs(nxo.getifaddrs()) do
+		local name = i.name:match("[^:]+")
+		local prnt = name:match("^([^%.]+)%.")
+
+		if _iface_virtual(name) then
+			_tunnel[name] = true
+		end
+
+		if _tunnel[name] or not _iface_ignore(name) then
+			_interfaces[name] = _interfaces[name] or {
+				idx      = i.ifindex or n,
+				name     = name,
+				rawname  = i.name,
+				flags    = { },
+				ipaddrs  = { },
+				ip6addrs = { }
+			}
+
+			if prnt then
+				_switch[name] = true
+				_switch[prnt] = true
+			end
+
+			if i.family == "packet" then
+				_interfaces[name].flags   = i.flags
+				_interfaces[name].stats   = i.data
+				_interfaces[name].macaddr = i.addr
+			elseif i.family == "inet" then
+				_interfaces[name].ipaddrs[#_interfaces[name].ipaddrs+1] = ipc.IPv4(i.addr, i.netmask)
+			elseif i.family == "inet6" then
+				_interfaces[name].ip6addrs[#_interfaces[name].ip6addrs+1] = ipc.IPv6(i.addr, i.netmask)
+			end
+		end
+	end
+
+	-- read bridge informaton
+	local b, l
+	for l in utl.execi("brctl show") do
+		if not l:match("STP") then
+			local r = utl.split(l, "%s+", nil, true)
+			if #r == 4 then
+				b = {
+					name    = r[1],
+					id      = r[2],
+					stp     = r[3] == "yes",
+					ifnames = { _interfaces[r[4]] }
+				}
+				if b.ifnames[1] then
+					b.ifnames[1].bridge = b
+				end
+				_bridge[r[1]] = b
+			elseif b then
+				b.ifnames[#b.ifnames+1] = _interfaces[r[2]]
+				b.ifnames[#b.ifnames].bridge = b
+			end
+		end
+	end
+
+	return _M
+end
+
+function save(self, ...)
+	_uci_real:save(...)
+	_uci_real:load(...)
+end
+
+function commit(self, ...)
+	_uci_real:commit(...)
+	_uci_real:load(...)
+end
+
+function ifnameof(self, x)
+	if utl.instanceof(x, interface) then
+		return x:name()
+	elseif utl.instanceof(x, protocol) then
+		return x:ifname()
+	elseif type(x) == "string" then
+		return x:match("^[^:]+")
+	end
+end
+
+function get_protocol(self, protoname, netname)
+	local v = _protocols[protoname]
+	if v then
+		return v(netname or "__dummy__")
+	end
+end
+
+function get_protocols(self)
+	local p = { }
+	local _, v
+	for _, v in ipairs(_protocols) do
+		p[#p+1] = v("__dummy__")
+	end
+	return p
+end
+
+function register_protocol(self, protoname)
+	local proto = utl.class(protocol)
+
+	function proto.__init__(self, name)
+		self.sid = name
+	end
+
+	function proto.proto(self)
+		return protoname
+	end
+
+	_protocols[#_protocols+1] = proto
+	_protocols[protoname]     = proto
+
+	return proto
+end
+
+function register_pattern_virtual(self, pat)
+	IFACE_PATTERNS_VIRTUAL[#IFACE_PATTERNS_VIRTUAL+1] = pat
+end
+
+
+function has_ipv6(self)
+	return nfs.access("/proc/net/ipv6_route")
+end
+
+function add_network(self, n, options)
+	local oldnet = self:get_network(n)
+	if n and #n > 0 and n:match("^[a-zA-Z0-9_]+$") and not oldnet then
+		if _uci_real:section("network", "interface", n, options) then
+			return network(n)
+		end
+	elseif oldnet and oldnet:is_empty() then
+		if options then
+			local k, v
+			for k, v in pairs(options) do
+				oldnet:set(k, v)
+			end
+		end
+		return oldnet
+	end
+end
+
+function get_network(self, n)
+	if n and _uci_real:get("network", n) == "interface" then
+		return network(n)
+	end
+end
+
+function get_networks(self)
+	local nets = { }
+	local nls = { }
+
+	_uci_real:foreach("network", "interface",
+		function(s)
+			nls[s['.name']] = network(s['.name'])
+		end)
+
+	local n
+	for n in utl.kspairs(nls) do
+		nets[#nets+1] = nls[n]
+	end
+
+	return nets
+end
+
+function del_network(self, n)
+	local r = _uci_real:delete("network", n)
+	if r then
+		_uci_real:delete_all("network", "alias",
+			function(s) return (s.interface == n) end)
+
+		_uci_real:delete_all("network", "route",
+			function(s) return (s.interface == n) end)
+
+		_uci_real:delete_all("network", "route6",
+			function(s) return (s.interface == n) end)
+
+		_uci_real:foreach("wireless", "wifi-iface",
+			function(s)
+				local net
+				local rest = { }
+				for net in utl.imatch(s.network) do
+					if net ~= n then
+						rest[#rest+1] = net
+					end
+				end
+				if #rest > 0 then
+					_uci_real:set("wireless", s['.name'], "network",
+					              table.concat(rest, " "))
+				else
+					_uci_real:delete("wireless", s['.name'], "network")
+				end
+			end)
+	end
+	return r
+end
+
+function rename_network(self, old, new)
+	local r
+	if new and #new > 0 and new:match("^[a-zA-Z0-9_]+$") and not self:get_network(new) then
+		r = _uci_real:section("network", "interface", new, _uci_real:get_all("network", old))
+
+		if r then
+			_uci_real:foreach("network", "alias",
+				function(s)
+					if s.interface == old then
+						_uci_real:set("network", s['.name'], "interface", new)
+					end
+				end)
+
+			_uci_real:foreach("network", "route",
+				function(s)
+					if s.interface == old then
+						_uci_real:set("network", s['.name'], "interface", new)
+					end
+				end)
+
+			_uci_real:foreach("network", "route6",
+				function(s)
+					if s.interface == old then
+						_uci_real:set("network", s['.name'], "interface", new)
+					end
+				end)
+
+			_uci_real:foreach("wireless", "wifi-iface",
+				function(s)
+					local net
+					local list = { }
+					for net in utl.imatch(s.network) do
+						if net == old then
+							list[#list+1] = new
+						else
+							list[#list+1] = net
+						end
+					end
+					if #list > 0 then
+						_uci_real:set("wireless", s['.name'], "network",
+						              table.concat(list, " "))
+					end
+				end)
+
+			_uci_real:delete("network", old)
+		end
+	end
+	return r or false
+end
+
+function get_interface(self, i)
+	if _interfaces[i] or _wifi_iface(i) then
+		return interface(i)
+	else
+		local ifc
+		local num = { }
+		_uci_real:foreach("wireless", "wifi-iface",
+			function(s)
+				if s.device then
+					num[s.device] = num[s.device] and num[s.device] + 1 or 1
+					if s['.name'] == i then
+						ifc = interface(
+							"%s.network%d" %{s.device, num[s.device] })
+						return false
+					end
+				end
+			end)
+		return ifc
+	end
+end
+
+function get_interfaces(self)
+	local iface
+	local ifaces = { }
+	local seen = { }
+	local nfs = { }
+	local baseof = { }
+
+	-- find normal interfaces
+	_uci_real:foreach("network", "interface",
+		function(s)
+			for iface in utl.imatch(s.ifname) do
+				if not _iface_ignore(iface) and not _wifi_iface(iface) then
+					seen[iface] = true
+					nfs[iface] = interface(iface)
+				end
+			end
+		end)
+
+	for iface in utl.kspairs(_interfaces) do
+		if not (seen[iface] or _iface_ignore(iface) or _wifi_iface(iface)) then
+			nfs[iface] = interface(iface)
+		end
+	end
+
+	-- find vlan interfaces
+	_uci_real:foreach("network", "switch_vlan",
+		function(s)
+			if not s.device then
+				return
+			end
+
+			local base = baseof[s.device]
+			if not base then
+				if not s.device:match("^eth%d") then
+					local l
+					for l in utl.execi("swconfig dev %q help 2>/dev/null" % s.device) do
+						if not base then
+							base = l:match("^%w+: (%w+)")
+						end
+					end
+					if not base or not base:match("^eth%d") then
+						base = "eth0"
+					end
+				else
+					base = s.device
+				end
+				baseof[s.device] = base
+			end
+
+			local vid = tonumber(s.vid or s.vlan)
+			if vid ~= nil and vid >= 0 and vid <= 4095 then
+				local iface = "%s.%d" %{ base, vid }
+				if not seen[iface] then
+					seen[iface] = true
+					nfs[iface] = interface(iface)
+				end
+			end
+		end)
+
+	for iface in utl.kspairs(nfs) do
+		ifaces[#ifaces+1] = nfs[iface]
+	end
+
+	-- find wifi interfaces
+	local num = { }
+	local wfs = { }
+	_uci_real:foreach("wireless", "wifi-iface",
+		function(s)
+			if s.device then
+				num[s.device] = num[s.device] and num[s.device] + 1 or 1
+				local i = "%s.network%d" %{ s.device, num[s.device] }
+				wfs[i] = interface(i)
+			end
+		end)
+
+	for iface in utl.kspairs(wfs) do
+		ifaces[#ifaces+1] = wfs[iface]
+	end
+
+	return ifaces
+end
+
+function ignore_interface(self, x)
+	return _iface_ignore(x)
+end
+
+function get_wifidev(self, dev)
+	if _uci_real:get("wireless", dev) == "wifi-device" then
+		return wifidev(dev)
+	end
+end
+
+function get_wifidevs(self)
+	local devs = { }
+	local wfd  = { }
+
+	_uci_real:foreach("wireless", "wifi-device",
+		function(s) wfd[#wfd+1] = s['.name'] end)
+
+	local dev
+	for _, dev in utl.vspairs(wfd) do
+		devs[#devs+1] = wifidev(dev)
+	end
+
+	return devs
+end
+
+function get_wifinet(self, net)
+	local wnet = _wifi_lookup(net)
+	if wnet then
+		return wifinet(wnet)
+	end
+end
+
+function add_wifinet(self, net, options)
+	if type(options) == "table" and options.device and
+		_uci_real:get("wireless", options.device) == "wifi-device"
+	then
+		local wnet = _uci_real:section("wireless", "wifi-iface", nil, options)
+		return wifinet(wnet)
+	end
+end
+
+function del_wifinet(self, net)
+	local wnet = _wifi_lookup(net)
+	if wnet then
+		_uci_real:delete("wireless", wnet)
+		return true
+	end
+	return false
+end
+
+function get_status_by_route(self, addr, mask)
+	local _, object
+	for _, object in ipairs(_ubus:objects()) do
+		local net = object:match("^network%.interface%.(.+)")
+		if net then
+			local s = _ubus:call(object, "status", {})
+			if s and s.route then
+				local rt
+				for _, rt in ipairs(s.route) do
+					if not rt.table and rt.target == addr and rt.mask == mask then
+						return net, s
+					end
+				end
+			end
+		end
+	end
+end
+
+function get_status_by_address(self, addr)
+	local _, object
+	for _, object in ipairs(_ubus:objects()) do
+		local net = object:match("^network%.interface%.(.+)")
+		if net then
+			local s = _ubus:call(object, "status", {})
+			if s and s['ipv4-address'] then
+				local a
+				for _, a in ipairs(s['ipv4-address']) do
+					if a.address == addr then
+						return net, s
+					end
+				end
+			end
+			if s and s['ipv6-address'] then
+				local a
+				for _, a in ipairs(s['ipv6-address']) do
+					if a.address == addr then
+						return net, s
+					end
+				end
+			end
+		end
+	end
+end
+
+function get_wannet(self)
+	local net = self:get_status_by_route("0.0.0.0", 0)
+	return net and network(net)
+end
+
+function get_wandev(self)
+	local _, stat = self:get_status_by_route("0.0.0.0", 0)
+	return stat and interface(stat.l3_device or stat.device)
+end
+
+function get_wan6net(self)
+	local net = self:get_status_by_route("::", 0)
+	return net and network(net)
+end
+
+function get_wan6dev(self)
+	local _, stat = self:get_status_by_route("::", 0)
+	return stat and interface(stat.l3_device or stat.device)
+end
+
+
+function network(name, proto)
+	if name then
+		local p = proto or _uci_real:get("network", name, "proto")
+		local c = p and _protocols[p] or protocol
+		return c(name)
+	end
+end
+
+function protocol.__init__(self, name)
+	self.sid = name
+end
+
+function protocol._get(self, opt)
+	local v = _uci_real:get("network", self.sid, opt)
+	if type(v) == "table" then
+		return table.concat(v, " ")
+	end
+	return v or ""
+end
+
+function protocol._ubus(self, field)
+	if not _ubusnetcache[self.sid] then
+		_ubusnetcache[self.sid] = _ubus:call("network.interface.%s" % self.sid,
+		                                     "status", { })
+	end
+	if _ubusnetcache[self.sid] and field then
+		return _ubusnetcache[self.sid][field]
+	end
+	return _ubusnetcache[self.sid]
+end
+
+function protocol.get(self, opt)
+	return _get("network", self.sid, opt)
+end
+
+function protocol.set(self, opt, val)
+	return _set("network", self.sid, opt, val)
+end
+
+function protocol.ifname(self)
+	local ifname
+	if self:is_floating() then
+		ifname = self:_ubus("l3_device")
+	else
+		ifname = self:_ubus("device")
+	end
+	if not ifname then
+		local num = { }
+		_uci_real:foreach("wireless", "wifi-iface",
+			function(s)
+				if s.device then
+					num[s.device] = num[s.device]
+						and num[s.device] + 1 or 1
+
+					local net
+					for net in utl.imatch(s.network) do
+						if net == self.sid then
+							ifname = "%s.network%d" %{ s.device, num[s.device] }
+							return false
+						end
+					end
+				end
+			end)
+	end
+	return ifname
+end
+
+function protocol.proto(self)
+	return "none"
+end
+
+function protocol.get_i18n(self)
+	local p = self:proto()
+	if p == "none" then
+		return lng.translate("Unmanaged")
+	elseif p == "static" then
+		return lng.translate("Static address")
+	elseif p == "dhcp" then
+		return lng.translate("DHCP client")
+	else
+		return lng.translate("Unknown")
+	end
+end
+
+function protocol.type(self)
+	return self:_get("type")
+end
+
+function protocol.name(self)
+	return self.sid
+end
+
+function protocol.uptime(self)
+	return self:_ubus("uptime") or 0
+end
+
+function protocol.expires(self)
+	local a = tonumber(_uci_state:get("network", self.sid, "lease_acquired"))
+	local l = tonumber(_uci_state:get("network", self.sid, "lease_lifetime"))
+	if a and l then
+		l = l - (nxo.sysinfo().uptime - a)
+		return l > 0 and l or 0
+	end
+	return -1
+end
+
+function protocol.metric(self)
+	return tonumber(_uci_state:get("network", self.sid, "metric")) or 0
+end
+
+function protocol.ipaddr(self)
+	local addrs = self:_ubus("ipv4-address")
+	return addrs and #addrs > 0 and addrs[1].address
+end
+
+function protocol.netmask(self)
+	local addrs = self:_ubus("ipv4-address")
+	return addrs and #addrs > 0 and
+		ipc.IPv4("0.0.0.0/%d" % addrs[1].mask):mask():string()
+end
+
+function protocol.gwaddr(self)
+	local _, route
+	for _, route in ipairs(self:_ubus("route") or { }) do
+		if route.target == "0.0.0.0" and route.mask == 0 then
+			return route.nexthop
+		end
+	end
+end
+
+function protocol.dnsaddrs(self)
+	local dns = { }
+	local _, addr
+	for _, addr in ipairs(self:_ubus("dns-server") or { }) do
+		if not addr:match(":") then
+			dns[#dns+1] = addr
+		end
+	end
+	return dns
+end
+
+function protocol.ip6addr(self)
+	local addrs = self:_ubus("ipv6-address")
+	if addrs and #addrs > 0 then
+		return "%s/%d" %{ addrs[1].address, addrs[1].mask }
+	else
+		addrs = self:_ubus("ipv6-prefix-assignment")
+		if addrs and #addrs > 0 then
+			return "%s/%d" %{ addrs[1].address, addrs[1].mask }
+		end
+	end
+end
+
+function protocol.gw6addr(self)
+	local _, route
+	for _, route in ipairs(self:_ubus("route") or { }) do
+		if route.target == "::" and route.mask == 0 then
+			return ipc.IPv6(route.nexthop):string()
+		end
+	end
+end
+
+function protocol.dns6addrs(self)
+	local dns = { }
+	local _, addr
+	for _, addr in ipairs(self:_ubus("dns-server") or { }) do
+		if addr:match(":") then
+			dns[#dns+1] = addr
+		end
+	end
+	return dns
+end
+
+function protocol.is_bridge(self)
+	return (not self:is_virtual() and self:type() == "bridge")
+end
+
+function protocol.opkg_package(self)
+	return nil
+end
+
+function protocol.is_installed(self)
+	return true
+end
+
+function protocol.is_virtual(self)
+	return false
+end
+
+function protocol.is_floating(self)
+	return false
+end
+
+function protocol.is_empty(self)
+	if self:is_floating() then
+		return false
+	else
+		local rv = true
+
+		if (self:_get("ifname") or ""):match("%S+") then
+			rv = false
+		end
+
+		_uci_real:foreach("wireless", "wifi-iface",
+			function(s)
+				local n
+				for n in utl.imatch(s.network) do
+					if n == self.sid then
+						rv = false
+						return false
+					end
+				end
+			end)
+
+		return rv
+	end
+end
+
+function protocol.add_interface(self, ifname)
+	ifname = _M:ifnameof(ifname)
+	if ifname and not self:is_floating() then
+		-- if its a wifi interface, change its network option
+		local wif = _wifi_lookup(ifname)
+		if wif then
+			_append("wireless", wif, "network", self.sid)
+
+		-- add iface to our iface list
+		else
+			_append("network", self.sid, "ifname", ifname)
+		end
+	end
+end
+
+function protocol.del_interface(self, ifname)
+	ifname = _M:ifnameof(ifname)
+	if ifname and not self:is_floating() then
+		-- if its a wireless interface, clear its network option
+		local wif = _wifi_lookup(ifname)
+		if wif then _filter("wireless", wif, "network", self.sid) end
+
+		-- remove the interface
+		_filter("network", self.sid, "ifname", ifname)
+	end
+end
+
+function protocol.get_interface(self)
+	if self:is_virtual() then
+		_tunnel[self:proto() .. "-" .. self.sid] = true
+		return interface(self:proto() .. "-" .. self.sid, self)
+	elseif self:is_bridge() then
+		_bridge["br-" .. self.sid] = true
+		return interface("br-" .. self.sid, self)
+	else
+		local ifn = nil
+		local num = { }
+		for ifn in utl.imatch(_uci_real:get("network", self.sid, "ifname")) do
+			ifn = ifn:match("^[^:/]+")
+			return ifn and interface(ifn, self)
+		end
+		ifn = nil
+		_uci_real:foreach("wireless", "wifi-iface",
+			function(s)
+				if s.device then
+					num[s.device] = num[s.device] and num[s.device] + 1 or 1
+
+					local net
+					for net in utl.imatch(s.network) do
+						if net == self.sid then
+							ifn = "%s.network%d" %{ s.device, num[s.device] }
+							return false
+						end
+					end
+				end
+			end)
+		return ifn and interface(ifn, self)
+	end
+end
+
+function protocol.get_interfaces(self)
+	if self:is_bridge() or (self:is_virtual() and not self:is_floating()) then
+		local ifaces = { }
+
+		local ifn
+		local nfs = { }
+		for ifn in utl.imatch(self:get("ifname")) do
+			ifn = ifn:match("^[^:/]+")
+			nfs[ifn] = interface(ifn, self)
+		end
+
+		for ifn in utl.kspairs(nfs) do
+			ifaces[#ifaces+1] = nfs[ifn]
+		end
+
+		local num = { }
+		local wfs = { }
+		_uci_real:foreach("wireless", "wifi-iface",
+			function(s)
+				if s.device then
+					num[s.device] = num[s.device] and num[s.device] + 1 or 1
+
+					local net
+					for net in utl.imatch(s.network) do
+						if net == self.sid then
+							ifn = "%s.network%d" %{ s.device, num[s.device] }
+							wfs[ifn] = interface(ifn, self)
+						end
+					end
+				end
+			end)
+
+		for ifn in utl.kspairs(wfs) do
+			ifaces[#ifaces+1] = wfs[ifn]
+		end
+
+		return ifaces
+	end
+end
+
+function protocol.contains_interface(self, ifname)
+	ifname = _M:ifnameof(ifname)
+	if not ifname then
+		return false
+	elseif self:is_virtual() and self:proto() .. "-" .. self.sid == ifname then
+		return true
+	elseif self:is_bridge() and "br-" .. self.sid == ifname then
+		return true
+	else
+		local ifn
+		for ifn in utl.imatch(self:get("ifname")) do
+			ifn = ifn:match("[^:]+")
+			if ifn == ifname then
+				return true
+			end
+		end
+
+		local wif = _wifi_lookup(ifname)
+		if wif then
+			local n
+			for n in utl.imatch(_uci_real:get("wireless", wif, "network")) do
+				if n == self.sid then
+					return true
+				end
+			end
+		end
+	end
+
+	return false
+end
+
+function protocol.adminlink(self)
+	return dsp.build_url("admin", "network", "network", self.sid)
+end
+
+
+interface = utl.class()
+
+function interface.__init__(self, ifname, network)
+	local wif = _wifi_lookup(ifname)
+	if wif then
+		self.wif    = wifinet(wif)
+		self.ifname = _wifi_state("section", wif, "ifname")
+	end
+
+	self.ifname  = self.ifname or ifname
+	self.dev     = _interfaces[self.ifname]
+	self.network = network
+end
+
+function interface._ubus(self, field)
+	if not _ubusdevcache[self.ifname] then
+		_ubusdevcache[self.ifname] = _ubus:call("network.device", "status",
+		                                        { name = self.ifname })
+	end
+	if _ubusdevcache[self.ifname] and field then
+		return _ubusdevcache[self.ifname][field]
+	end
+	return _ubusdevcache[self.ifname]
+end
+
+function interface.name(self)
+	return self.wif and self.wif:ifname() or self.ifname
+end
+
+function interface.mac(self)
+	return (self:_ubus("macaddr") or "00:00:00:00:00:00"):upper()
+end
+
+function interface.ipaddrs(self)
+	return self.dev and self.dev.ipaddrs or { }
+end
+
+function interface.ip6addrs(self)
+	return self.dev and self.dev.ip6addrs or { }
+end
+
+function interface.type(self)
+	if self.wif or _wifi_iface(self.ifname) then
+		return "wifi"
+	elseif _bridge[self.ifname] then
+		return "bridge"
+	elseif _tunnel[self.ifname] then
+		return "tunnel"
+	elseif self.ifname:match("%.") then
+		return "vlan"
+	elseif _switch[self.ifname] then
+		return "switch"
+	else
+		return "ethernet"
+	end
+end
+
+function interface.shortname(self)
+	if self.wif then
+		return "%s %q" %{
+			self.wif:active_mode(),
+			self.wif:active_ssid() or self.wif:active_bssid()
+		}
+	else
+		return self.ifname
+	end
+end
+
+function interface.get_i18n(self)
+	if self.wif then
+		return "%s: %s %q" %{
+			lng.translate("Wireless Network"),
+			self.wif:active_mode(),
+			self.wif:active_ssid() or self.wif:active_bssid()
+		}
+	else
+		return "%s: %q" %{ self:get_type_i18n(), self:name() }
+	end
+end
+
+function interface.get_type_i18n(self)
+	local x = self:type()
+	if x == "wifi" then
+		return lng.translate("Wireless Adapter")
+	elseif x == "bridge" then
+		return lng.translate("Bridge")
+	elseif x == "switch" then
+		return lng.translate("Ethernet Switch")
+	elseif x == "vlan" then
+		return lng.translate("VLAN Interface")
+	elseif x == "tunnel" then
+		return lng.translate("Tunnel Interface")
+	else
+		return lng.translate("Ethernet Adapter")
+	end
+end
+
+function interface.adminlink(self)
+	if self.wif then
+		return self.wif:adminlink()
+	end
+end
+
+function interface.ports(self)
+	local members = self:_ubus("bridge-members")
+	if members then
+		local _, iface
+		local ifaces = { }
+		for _, iface in ipairs(members) do
+			ifaces[#ifaces+1] = interface(iface)
+		end
+	end
+end
+
+function interface.bridge_id(self)
+	if self.br then
+		return self.br.id
+	else
+		return nil
+	end
+end
+
+function interface.bridge_stp(self)
+	if self.br then
+		return self.br.stp
+	else
+		return false
+	end
+end
+
+function interface.is_up(self)
+	return self:_ubus("up") or false
+end
+
+function interface.is_bridge(self)
+	return (self:type() == "bridge")
+end
+
+function interface.is_bridgeport(self)
+	return self.dev and self.dev.bridge and true or false
+end
+
+function interface.tx_bytes(self)
+	local stat = self:_ubus("statistics")
+	return stat and stat.tx_bytes or 0
+end
+
+function interface.rx_bytes(self)
+	local stat = self:_ubus("statistics")
+	return stat and stat.rx_bytes or 0
+end
+
+function interface.tx_packets(self)
+	local stat = self:_ubus("statistics")
+	return stat and stat.tx_packets or 0
+end
+
+function interface.rx_packets(self)
+	local stat = self:_ubus("statistics")
+	return stat and stat.rx_packets or 0
+end
+
+function interface.get_network(self)
+	return self:get_networks()[1]
+end
+
+function interface.get_networks(self)
+	if not self.networks then
+		local nets = { }
+		local _, net
+		for _, net in ipairs(_M:get_networks()) do
+			if net:contains_interface(self.ifname) or
+			   net:ifname() == self.ifname
+			then
+				nets[#nets+1] = net
+			end
+		end
+		table.sort(nets, function(a, b) return a.sid < b.sid end)
+		self.networks = nets
+		return nets
+	else
+		return self.networks
+	end
+end
+
+function interface.get_wifinet(self)
+	return self.wif
+end
+
+
+wifidev = utl.class()
+
+function wifidev.__init__(self, dev)
+	self.sid    = dev
+	self.iwinfo = dev and sys.wifi.getiwinfo(dev) or { }
+end
+
+function wifidev.get(self, opt)
+	return _get("wireless", self.sid, opt)
+end
+
+function wifidev.set(self, opt, val)
+	return _set("wireless", self.sid, opt, val)
+end
+
+function wifidev.name(self)
+	return self.sid
+end
+
+function wifidev.hwmodes(self)
+	local l = self.iwinfo.hwmodelist
+	if l and next(l) then
+		return l
+	else
+		return { b = true, g = true }
+	end
+end
+
+function wifidev.get_i18n(self)
+	local t = "Generic"
+	if self.iwinfo.type == "wl" then
+		t = "Broadcom"
+	elseif self.iwinfo.type == "madwifi" then
+		t = "Atheros"
+	end
+
+	local m = ""
+	local l = self:hwmodes()
+	if l.a then m = m .. "a" end
+	if l.b then m = m .. "b" end
+	if l.g then m = m .. "g" end
+	if l.n then m = m .. "n" end
+	if l.ac then m = "ac" end
+
+	return "%s 802.11%s Wireless Controller (%s)" %{ t, m, self:name() }
+end
+
+function wifidev.is_up(self)
+	if _ubuswificache[self.sid] then
+		return (_ubuswificache[self.sid].up == true)
+	end
+
+	local up = false
+	_uci_state:foreach("wireless", "wifi-iface",
+		function(s)
+			if s.device == self.sid then
+				if s.up == "1" then
+					up = true
+					return false
+				end
+			end
+		end)
+
+	return up
+end
+
+function wifidev.get_wifinet(self, net)
+	if _uci_real:get("wireless", net) == "wifi-iface" then
+		return wifinet(net)
+	else
+		local wnet = _wifi_lookup(net)
+		if wnet then
+			return wifinet(wnet)
+		end
+	end
+end
+
+function wifidev.get_wifinets(self)
+	local nets = { }
+
+	_uci_real:foreach("wireless", "wifi-iface",
+		function(s)
+			if s.device == self.sid then
+				nets[#nets+1] = wifinet(s['.name'])
+			end
+		end)
+
+	return nets
+end
+
+function wifidev.add_wifinet(self, options)
+	options = options or { }
+	options.device = self.sid
+
+	local wnet = _uci_real:section("wireless", "wifi-iface", nil, options)
+	if wnet then
+		return wifinet(wnet, options)
+	end
+end
+
+function wifidev.del_wifinet(self, net)
+	if utl.instanceof(net, wifinet) then
+		net = net.sid
+	elseif _uci_real:get("wireless", net) ~= "wifi-iface" then
+		net = _wifi_lookup(net)
+	end
+
+	if net and _uci_real:get("wireless", net, "device") == self.sid then
+		_uci_real:delete("wireless", net)
+		return true
+	end
+
+	return false
+end
+
+
+wifinet = utl.class()
+
+function wifinet.__init__(self, net, data)
+	self.sid = net
+
+	local num = { }
+	local netid
+	_uci_real:foreach("wireless", "wifi-iface",
+		function(s)
+			if s.device then
+				num[s.device] = num[s.device] and num[s.device] + 1 or 1
+				if s['.name'] == self.sid then
+					netid = "%s.network%d" %{ s.device, num[s.device] }
+					return false
+				end
+			end
+		end)
+
+	local dev = _wifi_state("section", self.sid, "ifname") or netid
+
+	self.netid  = netid
+	self.wdev   = dev
+	self.iwinfo = dev and sys.wifi.getiwinfo(dev) or { }
+	self.iwdata = data or _uci_state:get_all("wireless", self.sid) or
+		_uci_real:get_all("wireless", self.sid) or { }
+end
+
+function wifinet.get(self, opt)
+	return _get("wireless", self.sid, opt)
+end
+
+function wifinet.set(self, opt, val)
+	return _set("wireless", self.sid, opt, val)
+end
+
+function wifinet.mode(self)
+	return _uci_state:get("wireless", self.sid, "mode") or "ap"
+end
+
+function wifinet.ssid(self)
+	return _uci_state:get("wireless", self.sid, "ssid")
+end
+
+function wifinet.bssid(self)
+	return _uci_state:get("wireless", self.sid, "bssid")
+end
+
+function wifinet.network(self)
+	return _uci_state:get("wifinet", self.sid, "network")
+end
+
+function wifinet.id(self)
+	return self.netid
+end
+
+function wifinet.name(self)
+	return self.sid
+end
+
+function wifinet.ifname(self)
+	local ifname = self.iwinfo.ifname
+	if not ifname or ifname:match("^wifi%d") or ifname:match("^radio%d") then
+		ifname = self.wdev
+	end
+	return ifname
+end
+
+function wifinet.get_device(self)
+	if self.iwdata.device then
+		return wifidev(self.iwdata.device)
+	end
+end
+
+function wifinet.is_up(self)
+	local ifc = self:get_interface()
+	return (ifc and ifc:is_up() or false)
+end
+
+function wifinet.active_mode(self)
+	local m = _stror(self.iwinfo.mode, self.iwdata.mode) or "ap"
+
+	if     m == "ap"      then m = "Master"
+	elseif m == "sta"     then m = "Client"
+	elseif m == "adhoc"   then m = "Ad-Hoc"
+	elseif m == "mesh"    then m = "Mesh"
+	elseif m == "monitor" then m = "Monitor"
+	end
+
+	return m
+end
+
+function wifinet.active_mode_i18n(self)
+	return lng.translate(self:active_mode())
+end
+
+function wifinet.active_ssid(self)
+	return _stror(self.iwinfo.ssid, self.iwdata.ssid)
+end
+
+function wifinet.active_bssid(self)
+	return _stror(self.iwinfo.bssid, self.iwdata.bssid) or "00:00:00:00:00:00"
+end
+
+function wifinet.active_encryption(self)
+	local enc = self.iwinfo and self.iwinfo.encryption
+	return enc and enc.description or "-"
+end
+
+function wifinet.assoclist(self)
+	return self.iwinfo.assoclist or { }
+end
+
+function wifinet.frequency(self)
+	local freq = self.iwinfo.frequency
+	if freq and freq > 0 then
+		return "%.03f" % (freq / 1000)
+	end
+end
+
+function wifinet.bitrate(self)
+	local rate = self.iwinfo.bitrate
+	if rate and rate > 0 then
+		return (rate / 1000)
+	end
+end
+
+function wifinet.channel(self)
+	return self.iwinfo.channel or
+		tonumber(_uci_state:get("wireless", self.iwdata.device, "channel"))
+end
+
+function wifinet.signal(self)
+	return self.iwinfo.signal or 0
+end
+
+function wifinet.noise(self)
+	return self.iwinfo.noise or 0
+end
+
+function wifinet.country(self)
+	return self.iwinfo.country or "00"
+end
+
+function wifinet.txpower(self)
+	local pwr = (self.iwinfo.txpower or 0)
+	return pwr + self:txpower_offset()
+end
+
+function wifinet.txpower_offset(self)
+	return self.iwinfo.txpower_offset or 0
+end
+
+function wifinet.signal_level(self, s, n)
+	if self:active_bssid() ~= "00:00:00:00:00:00" then
+		local signal = s or self:signal()
+		local noise  = n or self:noise()
+
+		if signal < 0 and noise < 0 then
+			local snr = -1 * (noise - signal)
+			return math.floor(snr / 5)
+		else
+			return 0
+		end
+	else
+		return -1
+	end
+end
+
+function wifinet.signal_percent(self)
+	local qc = self.iwinfo.quality or 0
+	local qm = self.iwinfo.quality_max or 0
+
+	if qc > 0 and qm > 0 then
+		return math.floor((100 / qm) * qc)
+	else
+		return 0
+	end
+end
+
+function wifinet.shortname(self)
+	return "%s %q" %{
+		lng.translate(self:active_mode()),
+		self:active_ssid() or self:active_bssid()
+	}
+end
+
+function wifinet.get_i18n(self)
+	return "%s: %s %q (%s)" %{
+		lng.translate("Wireless Network"),
+		lng.translate(self:active_mode()),
+		self:active_ssid() or self:active_bssid(),
+		self:ifname()
+	}
+end
+
+function wifinet.adminlink(self)
+	return dsp.build_url("admin", "network", "wireless", self.netid)
+end
+
+function wifinet.get_network(self)
+	return self:get_networks()[1]
+end
+
+function wifinet.get_networks(self)
+	local nets = { }
+	local net
+	for net in utl.imatch(tostring(self.iwdata.network)) do
+		if _uci_real:get("network", net) == "interface" then
+			nets[#nets+1] = network(net)
+		end
+	end
+	table.sort(nets, function(a, b) return a.sid < b.sid end)
+	return nets
+end
+
+function wifinet.get_interface(self)
+	return interface(self:ifname())
+end
+
+
+-- setup base protocols
+_M:register_protocol("static")
+_M:register_protocol("dhcp")
+_M:register_protocol("none")
+
+-- load protocol extensions
+local exts = nfs.dir(utl.libpath() .. "/model/network")
+if exts then
+	local ext
+	for ext in exts do
+		if ext:match("%.lua$") then
+			require("luci.model.network." .. ext:gsub("%.lua$", ""))
+		end
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/model/uci.lua b/trunk/package/luci/modules/base/luasrc/model/uci.lua
new file mode 100644
index 00000000..a3945630
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/model/uci.lua
@@ -0,0 +1,404 @@
+--[[
+LuCI - UCI model
+
+Description:
+Generalized UCI model
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+local os    = require "os"
+local uci   = require "uci"
+local util  = require "luci.util"
+local table = require "table"
+
+
+local setmetatable, rawget, rawset = setmetatable, rawget, rawset
+local require, getmetatable = require, getmetatable
+local error, pairs, ipairs = error, pairs, ipairs
+local type, tostring, tonumber, unpack = type, tostring, tonumber, unpack
+
+--- LuCI UCI model library.
+-- The typical workflow for UCI is:  Get a cursor instance from the
+-- cursor factory, modify data (via Cursor.add, Cursor.delete, etc.),
+-- save the changes to the staging area via Cursor.save and finally
+-- Cursor.commit the data to the actual config files.
+-- LuCI then needs to Cursor.apply the changes so deamons etc. are
+-- reloaded.
+-- @cstyle	instance
+module "luci.model.uci"
+
+--- Create a new UCI-Cursor.
+-- @class function
+-- @name cursor
+-- @return	UCI-Cursor
+cursor = uci.cursor
+
+APIVERSION = uci.APIVERSION
+
+--- Create a new Cursor initialized to the state directory.
+-- @return UCI cursor
+function cursor_state()
+	return cursor(nil, "/var/state")
+end
+
+
+inst = cursor()
+inst_state = cursor_state()
+
+local Cursor = getmetatable(inst)
+
+--- Applies UCI configuration changes
+-- @param configlist		List of UCI configurations
+-- @param command			Don't apply only return the command
+function Cursor.apply(self, configlist, command)
+	configlist = self:_affected(configlist)
+	if command then
+		return { "/sbin/luci-reload", unpack(configlist) }
+	else
+		return os.execute("/sbin/luci-reload %s >/dev/null 2>&1"
+			% table.concat(configlist, " "))
+	end
+end
+
+
+--- Delete all sections of a given type that match certain criteria.
+-- @param config		UCI config
+-- @param type			UCI section type
+-- @param comparator	Function that will be called for each section and
+-- returns a boolean whether to delete the current section (optional)
+function Cursor.delete_all(self, config, stype, comparator)
+	local del = {}
+
+	if type(comparator) == "table" then
+		local tbl = comparator
+		comparator = function(section)
+			for k, v in pairs(tbl) do
+				if section[k] ~= v then
+					return false
+				end
+			end
+			return true
+		end
+	end
+
+	local function helper (section)
+
+		if not comparator or comparator(section) then
+			del[#del+1] = section[".name"]
+		end
+	end
+
+	self:foreach(config, stype, helper)
+
+	for i, j in ipairs(del) do
+		self:delete(config, j)
+	end
+end
+
+--- Create a new section and initialize it with data.
+-- @param config	UCI config
+-- @param type		UCI section type
+-- @param name		UCI section name (optional)
+-- @param values	Table of key - value pairs to initialize the section with
+-- @return			Name of created section
+function Cursor.section(self, config, type, name, values)
+	local stat = true
+	if name then
+		stat = self:set(config, name, type)
+	else
+		name = self:add(config, type)
+		stat = name and true
+	end
+
+	if stat and values then
+		stat = self:tset(config, name, values)
+	end
+
+	return stat and name
+end
+
+--- Updated the data of a section using data from a table.
+-- @param config	UCI config
+-- @param section	UCI section name (optional)
+-- @param values	Table of key - value pairs to update the section with
+function Cursor.tset(self, config, section, values)
+	local stat = true
+	for k, v in pairs(values) do
+		if k:sub(1, 1) ~= "." then
+			stat = stat and self:set(config, section, k, v)
+		end
+	end
+	return stat
+end
+
+--- Get a boolean option and return it's value as true or false.
+-- @param config	UCI config
+-- @param section	UCI section name
+-- @param option	UCI option
+-- @return			Boolean
+function Cursor.get_bool(self, ...)
+	local val = self:get(...)
+	return ( val == "1" or val == "true" or val == "yes" or val == "on" )
+end
+
+--- Get an option or list and return values as table.
+-- @param config	UCI config
+-- @param section	UCI section name
+-- @param option	UCI option
+-- @return			UCI value
+function Cursor.get_list(self, config, section, option)
+	if config and section and option then
+		local val = self:get(config, section, option)
+		return ( type(val) == "table" and val or { val } )
+	end
+	return nil
+end
+
+--- Get the given option from the first section with the given type.
+-- @param config	UCI config
+-- @param type		UCI section type
+-- @param option	UCI option (optional)
+-- @param default	Default value (optional)
+-- @return			UCI value
+function Cursor.get_first(self, conf, stype, opt, def)
+	local rv = def
+
+	self:foreach(conf, stype,
+		function(s)
+			local val = not opt and s['.name'] or s[opt]
+
+			if type(def) == "number" then
+				val = tonumber(val)
+			elseif type(def) == "boolean" then
+				val = (val == "1" or val == "true" or
+				       val == "yes" or val == "on")
+			end
+
+			if val ~= nil then
+				rv = val
+				return false
+			end
+		end)
+
+	return rv
+end
+
+--- Set given values as list.
+-- @param config	UCI config
+-- @param section	UCI section name
+-- @param option	UCI option
+-- @param value		UCI value
+-- @return			Boolean whether operation succeeded
+function Cursor.set_list(self, config, section, option, value)
+	if config and section and option then
+		return self:set(
+			config, section, option,
+			( type(value) == "table" and value or { value } )
+		)
+	end
+	return false
+end
+
+-- Return a list of initscripts affected by configuration changes.
+function Cursor._affected(self, configlist)
+	configlist = type(configlist) == "table" and configlist or {configlist}
+
+	local c = cursor()
+	c:load("ucitrack")
+
+	-- Resolve dependencies
+	local reloadlist = {}
+
+	local function _resolve_deps(name)
+		local reload = {name}
+		local deps = {}
+
+		c:foreach("ucitrack", name,
+			function(section)
+				if section.affects then
+					for i, aff in ipairs(section.affects) do
+						deps[#deps+1] = aff
+					end
+				end
+			end)
+
+		for i, dep in ipairs(deps) do
+			for j, add in ipairs(_resolve_deps(dep)) do
+				reload[#reload+1] = add
+			end
+		end
+
+		return reload
+	end
+
+	-- Collect initscripts
+	for j, config in ipairs(configlist) do
+		for i, e in ipairs(_resolve_deps(config)) do
+			if not util.contains(reloadlist, e) then
+				reloadlist[#reloadlist+1] = e
+			end
+		end
+	end
+
+	return reloadlist
+end
+
+--- Create a sub-state of this cursor. The sub-state is tied to the parent
+-- curser, means it the parent unloads or loads configs, the sub state will
+-- do so as well.
+-- @return			UCI state cursor tied to the parent cursor
+function Cursor.substate(self)
+	Cursor._substates = Cursor._substates or { }
+	Cursor._substates[self] = Cursor._substates[self] or cursor_state()
+	return Cursor._substates[self]
+end
+
+local _load = Cursor.load
+function Cursor.load(self, ...)
+	if Cursor._substates and Cursor._substates[self] then
+		_load(Cursor._substates[self], ...)
+	end
+	return _load(self, ...)
+end
+
+local _unload = Cursor.unload
+function Cursor.unload(self, ...)
+	if Cursor._substates and Cursor._substates[self] then
+		_unload(Cursor._substates[self], ...)
+	end
+	return _unload(self, ...)
+end
+
+
+--- Add an anonymous section.
+-- @class function
+-- @name Cursor.add
+-- @param config	UCI config
+-- @param type		UCI section type
+-- @return			Name of created section
+
+--- Get a table of saved but uncommitted changes.
+-- @class function
+-- @name Cursor.changes
+-- @param config	UCI config
+-- @return			Table of changes
+-- @see Cursor.save
+
+--- Commit saved changes.
+-- @class function
+-- @name Cursor.commit
+-- @param config	UCI config
+-- @return			Boolean whether operation succeeded
+-- @see Cursor.revert
+-- @see Cursor.save
+
+--- Deletes a section or an option.
+-- @class function
+-- @name Cursor.delete
+-- @param config	UCI config
+-- @param section	UCI section name
+-- @param option	UCI option (optional)
+-- @return			Boolean whether operation succeeded
+
+--- Call a function for every section of a certain type.
+-- @class function
+-- @name Cursor.foreach
+-- @param config	UCI config
+-- @param type		UCI section type
+-- @param callback	Function to be called
+-- @return			Boolean whether operation succeeded
+
+--- Get a section type or an option
+-- @class function
+-- @name Cursor.get
+-- @param config	UCI config
+-- @param section	UCI section name
+-- @param option	UCI option (optional)
+-- @return			UCI value
+
+--- Get all sections of a config or all values of a section.
+-- @class function
+-- @name Cursor.get_all
+-- @param config	UCI config
+-- @param section	UCI section name (optional)
+-- @return			Table of UCI sections or table of UCI values
+
+--- Manually load a config.
+-- @class function
+-- @name Cursor.load
+-- @param config	UCI config
+-- @return			Boolean whether operation succeeded
+-- @see Cursor.save
+-- @see Cursor.unload
+
+--- Revert saved but uncommitted changes.
+-- @class function
+-- @name Cursor.revert
+-- @param config	UCI config
+-- @return			Boolean whether operation succeeded
+-- @see Cursor.commit
+-- @see Cursor.save
+
+--- Saves changes made to a config to make them committable.
+-- @class function
+-- @name Cursor.save
+-- @param config	UCI config
+-- @return			Boolean whether operation succeeded
+-- @see Cursor.load
+-- @see Cursor.unload
+
+--- Set a value or create a named section.
+-- @class function
+-- @name Cursor.set
+-- @param config	UCI config
+-- @param section	UCI section name
+-- @param option	UCI option or UCI section type
+-- @param value		UCI value or nil if you want to create a section
+-- @return			Boolean whether operation succeeded
+
+--- Get the configuration directory.
+-- @class function
+-- @name Cursor.get_confdir
+-- @return			Configuration directory
+
+--- Get the directory for uncomitted changes.
+-- @class function
+-- @name Cursor.get_savedir
+-- @return			Save directory
+
+--- Set the configuration directory.
+-- @class function
+-- @name Cursor.set_confdir
+-- @param directory	UCI configuration directory
+-- @return			Boolean whether operation succeeded
+
+--- Set the directory for uncommited changes.
+-- @class function
+-- @name Cursor.set_savedir
+-- @param directory	UCI changes directory
+-- @return			Boolean whether operation succeeded
+
+--- Discard changes made to a config.
+-- @class function
+-- @name Cursor.unload
+-- @param config	UCI config
+-- @return			Boolean whether operation succeeded
+-- @see Cursor.load
+-- @see Cursor.save
diff --git a/trunk/package/luci/modules/base/luasrc/sauth.lua b/trunk/package/luci/modules/base/luasrc/sauth.lua
new file mode 100644
index 00000000..32f172dc
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sauth.lua
@@ -0,0 +1,127 @@
+--[[
+
+Session authentication
+(c) 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+--- LuCI session library.
+module("luci.sauth", package.seeall)
+require("luci.util")
+require("luci.sys")
+require("luci.config")
+local nixio = require "nixio", require "nixio.util"
+local fs = require "nixio.fs"
+
+
+luci.config.sauth = luci.config.sauth or {}
+sessionpath = luci.config.sauth.sessionpath
+sessiontime = tonumber(luci.config.sauth.sessiontime) or 15 * 60
+
+--- Prepare session storage by creating the session directory.
+function prepare()
+	fs.mkdir(sessionpath, 700)
+	if not sane() then
+		error("Security Exception: Session path is not sane!")
+	end
+end
+
+local function _read(id)
+	local blob = fs.readfile(sessionpath .. "/" .. id)
+	return blob
+end
+
+local function _write(id, data)
+	local f = nixio.open(sessionpath .. "/" .. id, "w", 600)
+	f:writeall(data)
+	f:close()
+end
+
+local function _checkid(id)
+	return not not (id and #id == 32 and id:match("^[a-fA-F0-9]+$"))
+end
+
+--- Write session data to a session file.
+-- @param id	Session identifier
+-- @param data	Session data table
+function write(id, data)
+	if not sane() then
+		prepare()
+	end
+
+	assert(_checkid(id), "Security Exception: Session ID is invalid!")
+	assert(type(data) == "table", "Security Exception: Session data invalid!")
+
+	data.atime = luci.sys.uptime()
+
+	_write(id, luci.util.get_bytecode(data))
+end
+
+--- Read a session and return its content.
+-- @param id	Session identifier
+-- @return		Session data table or nil if the given id is not found
+function read(id)
+	if not id or #id == 0 then
+		return nil
+	end
+
+	assert(_checkid(id), "Security Exception: Session ID is invalid!")
+
+	if not sane(sessionpath .. "/" .. id) then
+		return nil
+	end
+
+	local blob = _read(id)
+	local func = loadstring(blob)
+	setfenv(func, {})
+
+	local sess = func()
+	assert(type(sess) == "table", "Session data invalid!")
+
+	if sess.atime and sess.atime + sessiontime < luci.sys.uptime() then
+		kill(id)
+		return nil
+	end
+
+	-- refresh atime in session
+	write(id, sess)
+
+	return sess
+end
+
+--- Check whether Session environment is sane.
+-- @return Boolean status
+function sane(file)
+	return luci.sys.process.info("uid")
+			== fs.stat(file or sessionpath, "uid")
+		and fs.stat(file or sessionpath, "modestr")
+			== (file and "rw-------" or "rwx------")
+end
+
+--- Kills a session
+-- @param id	Session identifier
+function kill(id)
+	assert(_checkid(id), "Security Exception: Session ID is invalid!")
+	fs.unlink(sessionpath .. "/" .. id)
+end
+
+--- Remove all expired session data files
+function reap()
+	if sane() then
+		local id
+		for id in nixio.fs.dir(sessionpath) do
+			if _checkid(id) then
+				-- reading the session will kill it if it is expired
+				read(id)
+			end
+		end
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/sgi/cgi.lua b/trunk/package/luci/modules/base/luasrc/sgi/cgi.lua
new file mode 100644
index 00000000..04ae9aa5
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sgi/cgi.lua
@@ -0,0 +1,95 @@
+--[[
+LuCI - SGI-Module for CGI
+
+Description:
+Server Gateway Interface for CGI
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+	http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+exectime = os.clock()
+module("luci.sgi.cgi", package.seeall)
+local ltn12 = require("luci.ltn12")
+require("nixio.util")
+require("luci.http")
+require("luci.sys")
+require("luci.dispatcher")
+
+-- Limited source to avoid endless blocking
+local function limitsource(handle, limit)
+	limit = limit or 0
+	local BLOCKSIZE = ltn12.BLOCKSIZE
+
+	return function()
+		if limit < 1 then
+			handle:close()
+			return nil
+		else
+			local read = (limit > BLOCKSIZE) and BLOCKSIZE or limit
+			limit = limit - read
+
+			local chunk = handle:read(read)
+			if not chunk then handle:close() end
+			return chunk
+		end
+	end
+end
+
+function run()
+	local r = luci.http.Request(
+		luci.sys.getenv(),
+		limitsource(io.stdin, tonumber(luci.sys.getenv("CONTENT_LENGTH"))),
+		ltn12.sink.file(io.stderr)
+	)
+	
+	local x = coroutine.create(luci.dispatcher.httpdispatch)
+	local hcache = ""
+	local active = true
+	
+	while coroutine.status(x) ~= "dead" do
+		local res, id, data1, data2 = coroutine.resume(x, r)
+
+		if not res then
+			print("Status: 500 Internal Server Error")
+			print("Content-Type: text/plain\n")
+			print(id)
+			break;
+		end
+
+		if active then
+			if id == 1 then
+				io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\r\n")
+			elseif id == 2 then
+				hcache = hcache .. data1 .. ": " .. data2 .. "\r\n"
+			elseif id == 3 then
+				io.write(hcache)
+				io.write("\r\n")
+			elseif id == 4 then
+				io.write(tostring(data1 or ""))
+			elseif id == 5 then
+				io.flush()
+				io.close()
+				active = false
+			elseif id == 6 then
+				data1:copyz(nixio.stdout, data2)
+				data1:close()
+			end
+		end
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/sgi/uhttpd.lua b/trunk/package/luci/modules/base/luasrc/sgi/uhttpd.lua
new file mode 100644
index 00000000..db8780f7
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sgi/uhttpd.lua
@@ -0,0 +1,105 @@
+--[[
+LuCI - Server Gateway Interface for the uHTTPd server
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+	http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+require "nixio.util"
+require "luci.http"
+require "luci.sys"
+require "luci.dispatcher"
+require "luci.ltn12"
+
+function handle_request(env)
+	exectime = os.clock()
+	local renv = {
+		CONTENT_LENGTH  = env.CONTENT_LENGTH,
+		CONTENT_TYPE    = env.CONTENT_TYPE,
+		REQUEST_METHOD  = env.REQUEST_METHOD,
+		REQUEST_URI     = env.REQUEST_URI,
+		PATH_INFO	= env.PATH_INFO,
+		SCRIPT_NAME     = env.SCRIPT_NAME:gsub("/+$", ""),
+		SCRIPT_FILENAME = env.SCRIPT_NAME,
+		SERVER_PROTOCOL = env.SERVER_PROTOCOL,
+		QUERY_STRING    = env.QUERY_STRING
+	}
+
+	local k, v
+	for k, v in pairs(env.headers) do
+		k = k:upper():gsub("%-", "_")
+		renv["HTTP_" .. k] = v
+	end
+
+	local len = tonumber(env.CONTENT_LENGTH) or 0
+	local function recv()
+		if len > 0 then
+			local rlen, rbuf = uhttpd.recv(4096)
+			if rlen >= 0 then
+				len = len - rlen
+				return rbuf
+			end
+		end
+		return nil
+	end
+
+	local send = uhttpd.send
+
+	local req = luci.http.Request(
+		renv, recv, luci.ltn12.sink.file(io.stderr)
+	)
+	
+
+	local x = coroutine.create(luci.dispatcher.httpdispatch)
+	local hcache = { }
+	local active = true
+
+	while coroutine.status(x) ~= "dead" do
+		local res, id, data1, data2 = coroutine.resume(x, req)
+
+		if not res then
+			send("Status: 500 Internal Server Error\r\n")
+			send("Content-Type: text/plain\r\n\r\n")
+			send(tostring(id))
+			break
+		end
+
+		if active then
+			if id == 1 then
+				send("Status: ")
+				send(tostring(data1))
+				send(" ")
+				send(tostring(data2))
+				send("\r\n")
+			elseif id == 2 then
+				hcache[data1] = data2
+			elseif id == 3 then
+				for k, v in pairs(hcache) do
+					send(tostring(k))
+					send(": ")
+					send(tostring(v))
+					send("\r\n")
+				end
+				send("\r\n")
+			elseif id == 4 then
+				send(tostring(data1 or ""))
+			elseif id == 5 then
+				active = false
+			elseif id == 6 then
+				data1:copyz(nixio.stdout, data2)
+			end
+		end
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/store.lua b/trunk/package/luci/modules/base/luasrc/store.lua
new file mode 100644
index 00000000..c33ef07e
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/store.lua
@@ -0,0 +1,16 @@
+--[[
+
+LuCI - Lua Development Framework
+(c) 2009 Steven Barth <steven@midlink.org>
+(c) 2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local util = require "luci.util"
+module("luci.store", util.threadlocal)
\ No newline at end of file
diff --git a/trunk/package/luci/modules/base/luasrc/sys.lua b/trunk/package/luci/modules/base/luasrc/sys.lua
new file mode 100644
index 00000000..3a04f6ba
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sys.lua
@@ -0,0 +1,962 @@
+--[[
+LuCI - System library
+
+Description:
+Utilities for interaction with the Linux system
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+
+local io     = require "io"
+local os     = require "os"
+local table  = require "table"
+local nixio  = require "nixio"
+local fs     = require "nixio.fs"
+local uci    = require "luci.model.uci"
+
+local luci  = {}
+luci.util   = require "luci.util"
+luci.ip     = require "luci.ip"
+
+local tonumber, ipairs, pairs, pcall, type, next, setmetatable, require, select =
+	tonumber, ipairs, pairs, pcall, type, next, setmetatable, require, select
+
+
+--- LuCI Linux and POSIX system utilities.
+module "luci.sys"
+
+--- Execute a given shell command and return the error code
+-- @class		function
+-- @name		call
+-- @param 		...		Command to call
+-- @return		Error code of the command
+function call(...)
+	return os.execute(...) / 256
+end
+
+--- Execute a given shell command and capture its standard output
+-- @class		function
+-- @name		exec
+-- @param command	Command to call
+-- @return			String containg the return the output of the command
+exec = luci.util.exec
+
+--- Retrieve information about currently mounted file systems.
+-- @return 	Table containing mount information
+function mounts()
+	local data = {}
+	local k = {"fs", "blocks", "used", "available", "percent", "mountpoint"}
+	local ps = luci.util.execi("df")
+
+	if not ps then
+		return
+	else
+		ps()
+	end
+
+	for line in ps do
+		local row = {}
+
+		local j = 1
+		for value in line:gmatch("[^%s]+") do
+			row[k[j]] = value
+			j = j + 1
+		end
+
+		if row[k[1]] then
+
+			-- this is a rather ugly workaround to cope with wrapped lines in
+			-- the df output:
+			--
+			--	/dev/scsi/host0/bus0/target0/lun0/part3
+			--                   114382024  93566472  15005244  86% /mnt/usb
+			--
+
+			if not row[k[2]] then
+				j = 2
+				line = ps()
+				for value in line:gmatch("[^%s]+") do
+					row[k[j]] = value
+					j = j + 1
+				end
+			end
+
+			table.insert(data, row)
+		end
+	end
+
+	return data
+end
+
+--- Retrieve environment variables. If no variable is given then a table
+-- containing the whole environment is returned otherwise this function returns
+-- the corresponding string value for the given name or nil if no such variable
+-- exists.
+-- @class		function
+-- @name		getenv
+-- @param var	Name of the environment variable to retrieve (optional)
+-- @return		String containg the value of the specified variable
+-- @return		Table containing all variables if no variable name is given
+getenv = nixio.getenv
+
+--- Get or set the current hostname.
+-- @param		String containing a new hostname to set (optional)
+-- @return		String containing the system hostname
+function hostname(newname)
+	if type(newname) == "string" and #newname > 0 then
+		fs.writefile( "/proc/sys/kernel/hostname", newname )
+		return newname
+	else
+		return nixio.uname().nodename
+	end
+end
+
+--- Returns the contents of a documented referred by an URL.
+-- @param url	 The URL to retrieve
+-- @param stream Return a stream instead of a buffer
+-- @param target Directly write to target file name
+-- @return		String containing the contents of given the URL
+function httpget(url, stream, target)
+	if not target then
+		local source = stream and io.popen or luci.util.exec
+		return source("wget -qO- '"..url:gsub("'", "").."'")
+	else
+		return os.execute("wget -qO '%s' '%s'" %
+			{target:gsub("'", ""), url:gsub("'", "")})
+	end
+end
+
+--- Returns the system load average values.
+-- @return	String containing the average load value 1 minute ago
+-- @return	String containing the average load value 5 minutes ago
+-- @return	String containing the average load value 15 minutes ago
+function loadavg()
+	local info = nixio.sysinfo()
+	return info.loads[1], info.loads[2], info.loads[3]
+end
+
+--- Initiate a system reboot.
+-- @return	Return value of os.execute()
+function reboot()
+	return os.execute("reboot >/dev/null 2>&1")
+end
+
+--- Returns the system type, cpu name and installed physical memory.
+-- @return	String containing the system or platform identifier
+-- @return	String containing hardware model information
+-- @return	String containing the total memory amount in kB
+-- @return	String containing the memory used for caching in kB
+-- @return	String containing the memory used for buffering in kB
+-- @return	String containing the free memory amount in kB
+-- @return	String containing the cpu bogomips (number)
+function sysinfo()
+	local cpuinfo = fs.readfile("/proc/cpuinfo")
+	local meminfo = fs.readfile("/proc/meminfo")
+
+	local memtotal = tonumber(meminfo:match("MemTotal:%s*(%d+)"))
+	local memcached = tonumber(meminfo:match("\nCached:%s*(%d+)"))
+	local memfree = tonumber(meminfo:match("MemFree:%s*(%d+)"))
+	local membuffers = tonumber(meminfo:match("Buffers:%s*(%d+)"))
+	local bogomips = tonumber(cpuinfo:match("[Bb]ogo[Mm][Ii][Pp][Ss].-: ([^\n]+)")) or 0
+	local swaptotal = tonumber(meminfo:match("SwapTotal:%s*(%d+)"))
+	local swapcached = tonumber(meminfo:match("SwapCached:%s*(%d+)"))
+	local swapfree = tonumber(meminfo:match("SwapFree:%s*(%d+)"))
+
+	local system =
+		cpuinfo:match("system type\t+: ([^\n]+)") or
+		cpuinfo:match("Processor\t+: ([^\n]+)") or
+		cpuinfo:match("model name\t+: ([^\n]+)")
+
+	local model =
+		fs.readfile("/proc/device-tree/model") or
+		luci.util.pcdata(fs.readfile("/tmp/sysinfo/model")) or
+		cpuinfo:match("machine\t+: ([^\n]+)") or
+		cpuinfo:match("Hardware\t+: ([^\n]+)") or
+		luci.util.pcdata(fs.readfile("/proc/diag/model")) or
+		nixio.uname().machine or
+		system
+
+	return system, model, memtotal, memcached, membuffers, memfree, bogomips, swaptotal, swapcached, swapfree
+end
+
+--- Retrieves the output of the "logread" command.
+-- @return	String containing the current log buffer
+function syslog()
+	return luci.util.exec("logread")
+end
+
+--- Retrieves the output of the "dmesg" command.
+-- @return	String containing the current log buffer
+function dmesg()
+	return luci.util.exec("dmesg")
+end
+
+--- Generates a random id with specified length.
+-- @param bytes	Number of bytes for the unique id
+-- @return		String containing hex encoded id
+function uniqueid(bytes)
+	local rand = fs.readfile("/dev/urandom", bytes)
+	return rand and nixio.bin.hexlify(rand)
+end
+
+--- Returns the current system uptime stats.
+-- @return	String containing total uptime in seconds
+function uptime()
+	return nixio.sysinfo().uptime
+end
+
+
+--- LuCI system utilities / network related functions.
+-- @class	module
+-- @name	luci.sys.net
+net = {}
+
+--- Returns the current arp-table entries as two-dimensional table.
+-- @return	Table of table containing the current arp entries.
+--			The following fields are defined for arp entry objects:
+--			{ "IP address", "HW address", "HW type", "Flags", "Mask", "Device" }
+function net.arptable(callback)
+	local arp = (not callback) and {} or nil
+	local e, r, v
+	if fs.access("/proc/net/arp") then
+		for e in io.lines("/proc/net/arp") do
+			local r = { }, v
+			for v in e:gmatch("%S+") do
+				r[#r+1] = v
+			end
+
+			if r[1] ~= "IP" then
+				local x = {
+					["IP address"] = r[1],
+					["HW type"]    = r[2],
+					["Flags"]      = r[3],
+					["HW address"] = r[4],
+					["Mask"]       = r[5],
+					["Device"]     = r[6]
+				}
+
+				if callback then
+					callback(x)
+				else
+					arp = arp or { }
+					arp[#arp+1] = x
+				end
+			end
+		end
+	end
+	return arp
+end
+
+local function _nethints(what, callback)
+	local _, k, e, mac, ip, name
+	local cur = uci.cursor()
+	local ifn = { }
+	local hosts = { }
+
+	local function _add(i, ...)
+		local k = select(i, ...)
+		if k then
+			if not hosts[k] then hosts[k] = { } end
+			hosts[k][1] = select(1, ...) or hosts[k][1]
+			hosts[k][2] = select(2, ...) or hosts[k][2]
+			hosts[k][3] = select(3, ...) or hosts[k][3]
+			hosts[k][4] = select(4, ...) or hosts[k][4]
+		end
+	end
+
+	if fs.access("/proc/net/arp") then
+		for e in io.lines("/proc/net/arp") do
+			ip, mac = e:match("^([%d%.]+)%s+%S+%s+%S+%s+([a-fA-F0-9:]+)%s+")
+			if ip and mac then
+				_add(what, mac:upper(), ip, nil, nil)
+			end
+		end
+	end
+
+	if fs.access("/etc/ethers") then
+		for e in io.lines("/etc/ethers") do
+			mac, ip = e:match("^([a-f0-9]%S+) (%S+)")
+			if mac and ip then
+				_add(what, mac:upper(), ip, nil, nil)
+			end
+		end
+	end
+
+	if fs.access("/var/dhcp.leases") then
+		for e in io.lines("/var/dhcp.leases") do
+			mac, ip, name = e:match("^%d+ (%S+) (%S+) (%S+)")
+			if mac and ip then
+				_add(what, mac:upper(), ip, nil, name ~= "*" and name)
+			end
+		end
+	end
+
+	cur:foreach("dhcp", "host",
+		function(s)
+			for mac in luci.util.imatch(s.mac) do
+				_add(what, mac:upper(), s.ip, nil, s.name)
+			end
+		end)
+
+	for _, e in ipairs(nixio.getifaddrs()) do
+		if e.name ~= "lo" then
+			ifn[e.name] = ifn[e.name] or { }
+			if e.family == "packet" and e.addr and #e.addr == 17 then
+				ifn[e.name][1] = e.addr:upper()
+			elseif e.family == "inet" then
+				ifn[e.name][2] = e.addr
+			elseif e.family == "inet6" then
+				ifn[e.name][3] = e.addr
+			end
+		end
+	end
+
+	for _, e in pairs(ifn) do
+		if e[what] and (e[2] or e[3]) then
+			_add(what, e[1], e[2], e[3], e[4])
+		end
+	end
+
+	for _, e in luci.util.kspairs(hosts) do
+		callback(e[1], e[2], e[3], e[4])
+	end
+end
+
+--- Returns a two-dimensional table of mac address hints.
+-- @return  Table of table containing known hosts from various sources.
+--          Each entry contains the values in the following order:
+--          [ "mac", "name" ]
+function net.mac_hints(callback)
+	if callback then
+		_nethints(1, function(mac, v4, v6, name)
+			name = name or nixio.getnameinfo(v4 or v6, nil, 100) or v4
+			if name and name ~= mac then
+				callback(mac, name or nixio.getnameinfo(v4 or v6, nil, 100) or v4)
+			end
+		end)
+	else
+		local rv = { }
+		_nethints(1, function(mac, v4, v6, name)
+			name = name or nixio.getnameinfo(v4 or v6, nil, 100) or v4
+			if name and name ~= mac then
+				rv[#rv+1] = { mac, name or nixio.getnameinfo(v4 or v6, nil, 100) or v4 }
+			end
+		end)
+		return rv
+	end
+end
+
+--- Returns a two-dimensional table of IPv4 address hints.
+-- @return  Table of table containing known hosts from various sources.
+--          Each entry contains the values in the following order:
+--          [ "ip", "name" ]
+function net.ipv4_hints(callback)
+	if callback then
+		_nethints(2, function(mac, v4, v6, name)
+			name = name or nixio.getnameinfo(v4, nil, 100) or mac
+			if name and name ~= v4 then
+				callback(v4, name)
+			end
+		end)
+	else
+		local rv = { }
+		_nethints(2, function(mac, v4, v6, name)
+			name = name or nixio.getnameinfo(v4, nil, 100) or mac
+			if name and name ~= v4 then
+				rv[#rv+1] = { v4, name }
+			end
+		end)
+		return rv
+	end
+end
+
+--- Returns a two-dimensional table of IPv6 address hints.
+-- @return  Table of table containing known hosts from various sources.
+--          Each entry contains the values in the following order:
+--          [ "ip", "name" ]
+function net.ipv6_hints(callback)
+	if callback then
+		_nethints(3, function(mac, v4, v6, name)
+			name = name or nixio.getnameinfo(v6, nil, 100) or mac
+			if name and name ~= v6 then
+				callback(v6, name)
+			end
+		end)
+	else
+		local rv = { }
+		_nethints(3, function(mac, v4, v6, name)
+			name = name or nixio.getnameinfo(v6, nil, 100) or mac
+			if name and name ~= v6 then
+				rv[#rv+1] = { v6, name }
+			end
+		end)
+		return rv
+	end
+end
+
+--- Returns conntrack information
+-- @return	Table with the currently tracked IP connections
+function net.conntrack(callback)
+	local connt = {}
+	if fs.access("/proc/net/nf_conntrack", "r") then
+		for line in io.lines("/proc/net/nf_conntrack") do
+			line = line:match "^(.-( [^ =]+=).-)%2"
+			local entry, flags = _parse_mixed_record(line, " +")
+			if flags[6] ~= "TIME_WAIT" then
+				entry.layer3 = flags[1]
+				entry.layer4 = flags[3]
+				for i=1, #entry do
+					entry[i] = nil
+				end
+
+				if callback then
+					callback(entry)
+				else
+					connt[#connt+1] = entry
+				end
+			end
+		end
+	elseif fs.access("/proc/net/ip_conntrack", "r") then
+		for line in io.lines("/proc/net/ip_conntrack") do
+			line = line:match "^(.-( [^ =]+=).-)%2"
+			local entry, flags = _parse_mixed_record(line, " +")
+			if flags[4] ~= "TIME_WAIT" then
+				entry.layer3 = "ipv4"
+				entry.layer4 = flags[1]
+				for i=1, #entry do
+					entry[i] = nil
+				end
+
+				if callback then
+					callback(entry)
+				else
+					connt[#connt+1] = entry
+				end
+			end
+		end
+	else
+		return nil
+	end
+	return connt
+end
+
+--- Determine the current IPv4 default route. If multiple default routes exist,
+-- return the one with the lowest metric.
+-- @return	Table with the properties of the current default route.
+--			The following fields are defined:
+--			{ "dest", "gateway", "metric", "refcount", "usecount", "irtt",
+--			  "flags", "device" }
+function net.defaultroute()
+	local route
+
+	net.routes(function(rt)
+		if rt.dest:prefix() == 0 and (not route or route.metric > rt.metric) then
+			route = rt
+		end
+	end)
+
+	return route
+end
+
+--- Determine the current IPv6 default route. If multiple default routes exist,
+-- return the one with the lowest metric.
+-- @return	Table with the properties of the current default route.
+--			The following fields are defined:
+--			{ "source", "dest", "nexthop", "metric", "refcount", "usecount",
+--			  "flags", "device" }
+function net.defaultroute6()
+	local route
+
+	net.routes6(function(rt)
+		if rt.dest:prefix() == 0 and rt.device ~= "lo" and
+		   (not route or route.metric > rt.metric)
+		then
+			route = rt
+		end
+	end)
+
+	if not route then
+		local global_unicast = luci.ip.IPv6("2000::/3")
+		net.routes6(function(rt)
+			if rt.dest:equal(global_unicast) and
+			   (not route or route.metric > rt.metric)
+			then
+				route = rt
+			end
+		end)
+	end
+
+	return route
+end
+
+--- Determine the names of available network interfaces.
+-- @return	Table containing all current interface names
+function net.devices()
+	local devs = {}
+	for k, v in ipairs(nixio.getifaddrs()) do
+		if v.family == "packet" then
+			devs[#devs+1] = v.name
+		end
+	end
+	return devs
+end
+
+
+--- Return information about available network interfaces.
+-- @return	Table containing all current interface names and their information
+function net.deviceinfo()
+	local devs = {}
+	for k, v in ipairs(nixio.getifaddrs()) do
+		if v.family == "packet" then
+			local d = v.data
+			d[1] = d.rx_bytes
+			d[2] = d.rx_packets
+			d[3] = d.rx_errors
+			d[4] = d.rx_dropped
+			d[5] = 0
+			d[6] = 0
+			d[7] = 0
+			d[8] = d.multicast
+			d[9] = d.tx_bytes
+			d[10] = d.tx_packets
+			d[11] = d.tx_errors
+			d[12] = d.tx_dropped
+			d[13] = 0
+			d[14] = d.collisions
+			d[15] = 0
+			d[16] = 0
+			devs[v.name] = d
+		end
+	end
+	return devs
+end
+
+
+-- Determine the MAC address belonging to the given IP address.
+-- @param ip	IPv4 address
+-- @return		String containing the MAC address or nil if it cannot be found
+function net.ip4mac(ip)
+	local mac = nil
+	net.arptable(function(e)
+		if e["IP address"] == ip then
+			mac = e["HW address"]
+		end
+	end)
+	return mac
+end
+
+--- Returns the current kernel routing table entries.
+-- @return	Table of tables with properties of the corresponding routes.
+--			The following fields are defined for route entry tables:
+--			{ "dest", "gateway", "metric", "refcount", "usecount", "irtt",
+--			  "flags", "device" }
+function net.routes(callback)
+	local routes = { }
+
+	for line in io.lines("/proc/net/route") do
+
+		local dev, dst_ip, gateway, flags, refcnt, usecnt, metric,
+			  dst_mask, mtu, win, irtt = line:match(
+			"([^%s]+)\t([A-F0-9]+)\t([A-F0-9]+)\t([A-F0-9]+)\t" ..
+			"(%d+)\t(%d+)\t(%d+)\t([A-F0-9]+)\t(%d+)\t(%d+)\t(%d+)"
+		)
+
+		if dev then
+			gateway  = luci.ip.Hex( gateway,  32, luci.ip.FAMILY_INET4 )
+			dst_mask = luci.ip.Hex( dst_mask, 32, luci.ip.FAMILY_INET4 )
+			dst_ip   = luci.ip.Hex(
+				dst_ip, dst_mask:prefix(dst_mask), luci.ip.FAMILY_INET4
+			)
+
+			local rt = {
+				dest     = dst_ip,
+				gateway  = gateway,
+				metric   = tonumber(metric),
+				refcount = tonumber(refcnt),
+				usecount = tonumber(usecnt),
+				mtu      = tonumber(mtu),
+				window   = tonumber(window),
+				irtt     = tonumber(irtt),
+				flags    = tonumber(flags, 16),
+				device   = dev
+			}
+
+			if callback then
+				callback(rt)
+			else
+				routes[#routes+1] = rt
+			end
+		end
+	end
+
+	return routes
+end
+
+--- Returns the current ipv6 kernel routing table entries.
+-- @return	Table of tables with properties of the corresponding routes.
+--			The following fields are defined for route entry tables:
+--			{ "source", "dest", "nexthop", "metric", "refcount", "usecount",
+--			  "flags", "device" }
+function net.routes6(callback)
+	if fs.access("/proc/net/ipv6_route", "r") then
+		local routes = { }
+
+		for line in io.lines("/proc/net/ipv6_route") do
+
+			local dst_ip, dst_prefix, src_ip, src_prefix, nexthop,
+				  metric, refcnt, usecnt, flags, dev = line:match(
+				"([a-f0-9]+) ([a-f0-9]+) " ..
+				"([a-f0-9]+) ([a-f0-9]+) " ..
+				"([a-f0-9]+) ([a-f0-9]+) " ..
+				"([a-f0-9]+) ([a-f0-9]+) " ..
+				"([a-f0-9]+) +([^%s]+)"
+			)
+
+			if dst_ip and dst_prefix and
+			   src_ip and src_prefix and
+			   nexthop and metric and
+			   refcnt and usecnt and
+			   flags and dev
+			then
+				src_ip = luci.ip.Hex(
+					src_ip, tonumber(src_prefix, 16), luci.ip.FAMILY_INET6, false
+				)
+
+				dst_ip = luci.ip.Hex(
+					dst_ip, tonumber(dst_prefix, 16), luci.ip.FAMILY_INET6, false
+				)
+
+				nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false )
+
+				local rt = {
+					source   = src_ip,
+					dest     = dst_ip,
+					nexthop  = nexthop,
+					metric   = tonumber(metric, 16),
+					refcount = tonumber(refcnt, 16),
+					usecount = tonumber(usecnt, 16),
+					flags    = tonumber(flags, 16),
+					device   = dev,
+
+					-- lua number is too small for storing the metric
+					-- add a metric_raw field with the original content
+					metric_raw = metric
+				}
+
+				if callback then
+					callback(rt)
+				else
+					routes[#routes+1] = rt
+				end
+			end
+		end
+
+		return routes
+	end
+end
+
+--- Tests whether the given host responds to ping probes.
+-- @param host	String containing a hostname or IPv4 address
+-- @return		Number containing 0 on success and >= 1 on error
+function net.pingtest(host)
+	return os.execute("ping -c1 '"..host:gsub("'", '').."' >/dev/null 2>&1")
+end
+
+
+--- LuCI system utilities / process related functions.
+-- @class	module
+-- @name	luci.sys.process
+process = {}
+
+--- Get the current process id.
+-- @class function
+-- @name  process.info
+-- @return	Number containing the current pid
+function process.info(key)
+	local s = {uid = nixio.getuid(), gid = nixio.getgid()}
+	return not key and s or s[key]
+end
+
+--- Retrieve information about currently running processes.
+-- @return 	Table containing process information
+function process.list()
+	local data = {}
+	local k
+	local ps = luci.util.execi("/bin/busybox top -bn1")
+
+	if not ps then
+		return
+	end
+
+	for line in ps do
+		local pid, ppid, user, stat, vsz, mem, cpu, cmd = line:match(
+			"^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][W ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)"
+		)
+
+		local idx = tonumber(pid)
+		if idx then
+			data[idx] = {
+				['PID']     = pid,
+				['PPID']    = ppid,
+				['USER']    = user,
+				['STAT']    = stat,
+				['VSZ']     = vsz,
+				['%MEM']    = mem,
+				['%CPU']    = cpu,
+				['COMMAND'] = cmd
+			}
+		end
+	end
+
+	return data
+end
+
+--- Set the gid of a process identified by given pid.
+-- @param gid	Number containing the Unix group id
+-- @return		Boolean indicating successful operation
+-- @return		String containing the error message if failed
+-- @return		Number containing the error code if failed
+function process.setgroup(gid)
+	return nixio.setgid(gid)
+end
+
+--- Set the uid of a process identified by given pid.
+-- @param uid	Number containing the Unix user id
+-- @return		Boolean indicating successful operation
+-- @return		String containing the error message if failed
+-- @return		Number containing the error code if failed
+function process.setuser(uid)
+	return nixio.setuid(uid)
+end
+
+--- Send a signal to a process identified by given pid.
+-- @class function
+-- @name  process.signal
+-- @param pid	Number containing the process id
+-- @param sig	Signal to send (default: 15 [SIGTERM])
+-- @return		Boolean indicating successful operation
+-- @return		Number containing the error code if failed
+process.signal = nixio.kill
+
+
+--- LuCI system utilities / user related functions.
+-- @class	module
+-- @name	luci.sys.user
+user = {}
+
+--- Retrieve user informations for given uid.
+-- @class		function
+-- @name		getuser
+-- @param uid	Number containing the Unix user id
+-- @return		Table containing the following fields:
+--				{ "uid", "gid", "name", "passwd", "dir", "shell", "gecos" }
+user.getuser = nixio.getpw
+
+--- Retrieve the current user password hash.
+-- @param username	String containing the username to retrieve the password for
+-- @return			String containing the hash or nil if no password is set.
+-- @return			Password database entry
+function user.getpasswd(username)
+	local pwe = nixio.getsp and nixio.getsp(username) or nixio.getpw(username)
+	local pwh = pwe and (pwe.pwdp or pwe.passwd)
+	if not pwh or #pwh < 1 or pwh == "!" or pwh == "x" then
+		return nil, pwe
+	else
+		return pwh, pwe
+	end
+end
+
+--- Test whether given string matches the password of a given system user.
+-- @param username	String containing the Unix user name
+-- @param pass		String containing the password to compare
+-- @return			Boolean indicating wheather the passwords are equal
+function user.checkpasswd(username, pass)
+	local pwh, pwe = user.getpasswd(username)
+	if pwe then
+		return (pwh == nil or nixio.crypt(pass, pwh) == pwh)
+	end
+	return false
+end
+
+--- Change the password of given user.
+-- @param username	String containing the Unix user name
+-- @param password	String containing the password to compare
+-- @return			Number containing 0 on success and >= 1 on error
+function user.setpasswd(username, password)
+	if password then
+		password = password:gsub("'", [['"'"']])
+	end
+
+	if username then
+		username = username:gsub("'", [['"'"']])
+	end
+
+	return os.execute(
+		"(echo '" .. password .. "'; sleep 1; echo '" .. password .. "') | " ..
+		"passwd '" .. username .. "' >/dev/null 2>&1"
+	)
+end
+
+
+--- LuCI system utilities / wifi related functions.
+-- @class	module
+-- @name	luci.sys.wifi
+wifi = {}
+
+--- Get wireless information for given interface.
+-- @param ifname        String containing the interface name
+-- @return              A wrapped iwinfo object instance
+function wifi.getiwinfo(ifname)
+	local stat, iwinfo = pcall(require, "iwinfo")
+
+	if ifname then
+		local c = 0
+		local u = uci.cursor_state()
+		local d, n = ifname:match("^(%w+)%.network(%d+)")
+		if d and n then
+			ifname = d
+			n = tonumber(n)
+			u:foreach("wireless", "wifi-iface",
+				function(s)
+					if s.device == d then
+						c = c + 1
+						if c == n then
+							ifname = s.ifname or s.device
+							return false
+						end
+					end
+				end)
+		elseif u:get("wireless", ifname) == "wifi-device" then
+			u:foreach("wireless", "wifi-iface",
+				function(s)
+					if s.device == ifname and s.ifname then
+						ifname = s.ifname
+						return false
+					end
+				end)
+		end
+
+		local t = stat and iwinfo.type(ifname)
+		local x = t and iwinfo[t] or { }
+		return setmetatable({}, {
+			__index = function(t, k)
+				if k == "ifname" then
+					return ifname
+				elseif x[k] then
+					return x[k](ifname)
+				end
+			end
+		})
+	end
+end
+
+
+--- LuCI system utilities / init related functions.
+-- @class	module
+-- @name	luci.sys.init
+init = {}
+init.dir = "/etc/init.d/"
+
+--- Get the names of all installed init scripts
+-- @return	Table containing the names of all inistalled init scripts
+function init.names()
+	local names = { }
+	for name in fs.glob(init.dir.."*") do
+		names[#names+1] = fs.basename(name)
+	end
+	return names
+end
+
+--- Get the index of he given init script
+-- @param name	Name of the init script
+-- @return		Numeric index value
+function init.index(name)
+	if fs.access(init.dir..name) then
+		return call("env -i sh -c 'source %s%s enabled; exit ${START:-255}' >/dev/null"
+			%{ init.dir, name })
+	end
+end
+
+local function init_action(action, name)
+	if fs.access(init.dir..name) then
+		return call("env -i %s%s %s >/dev/null" %{ init.dir, name, action })
+	end
+end
+
+--- Test whether the given init script is enabled
+-- @param name	Name of the init script
+-- @return		Boolean indicating whether init is enabled
+function init.enabled(name)
+	return (init_action("enabled", name) == 0)
+end
+
+--- Enable the given init script
+-- @param name	Name of the init script
+-- @return		Boolean indicating success
+function init.enable(name)
+	return (init_action("enable", name) == 1)
+end
+
+--- Disable the given init script
+-- @param name	Name of the init script
+-- @return		Boolean indicating success
+function init.disable(name)
+	return (init_action("disable", name) == 0)
+end
+
+--- Start the given init script
+-- @param name	Name of the init script
+-- @return		Boolean indicating success
+function init.start(name)
+	return (init_action("start", name) == 0)
+end
+
+--- Stop the given init script
+-- @param name	Name of the init script
+-- @return		Boolean indicating success
+function init.stop(name)
+	return (init_action("stop", name) == 0)
+end
+
+
+-- Internal functions
+
+function _parse_mixed_record(cnt, delimiter)
+	delimiter = delimiter or "  "
+	local data = {}
+	local flags = {}
+
+	for i, l in pairs(luci.util.split(luci.util.trim(cnt), "\n")) do
+		for j, f in pairs(luci.util.split(luci.util.trim(l), delimiter, nil, true)) do
+			local k, x, v = f:match('([^%s][^:=]*) *([:=]*) *"*([^\n"]*)"*')
+
+			if k then
+				if x == "" then
+					table.insert(flags, k)
+				else
+					data[k] = v
+				end
+			end
+		end
+	end
+
+	return data, flags
+end
diff --git a/trunk/package/luci/modules/base/luasrc/sys/iptparser.lua b/trunk/package/luci/modules/base/luasrc/sys/iptparser.lua
new file mode 100644
index 00000000..d8236330
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sys/iptparser.lua
@@ -0,0 +1,373 @@
+--[[
+
+Iptables parser and query library
+(c) 2008-2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+(c) 2008-2009 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
+local luci  = {}
+luci.util   = require "luci.util"
+luci.sys    = require "luci.sys"
+luci.ip     = require "luci.ip"
+
+local tonumber, ipairs, table = tonumber, ipairs, table
+
+--- LuCI iptables parser and query library
+-- @cstyle	instance
+module("luci.sys.iptparser")
+
+--- Create a new iptables parser object.
+-- @class	function
+-- @name	IptParser
+-- @param	family	Number specifying the address family. 4 for IPv4, 6 for IPv6
+-- @return	IptParser instance
+IptParser = luci.util.class()
+
+function IptParser.__init__( self, family )
+	self._family = (tonumber(family) == 6) and 6 or 4
+	self._rules  = { }
+	self._chains = { }
+
+	if self._family == 4 then
+		self._nulladdr = "0.0.0.0/0"
+		self._tables   = { "filter", "nat", "mangle", "raw" }
+		self._command  = "iptables -t %s --line-numbers -nxvL"
+	else
+		self._nulladdr = "::/0"
+		self._tables   = { "filter", "mangle", "raw" }
+		self._command  = "ip6tables -t %s --line-numbers -nxvL"
+	end
+
+	self:_parse_rules()
+end
+
+--- Find all firewall rules that match the given criteria. Expects a table with
+-- search criteria as only argument. If args is nil or an empty table then all
+-- rules will be returned.
+--
+-- The following keys in the args table are recognized:
+-- <ul>
+--  <li> table		 - Match rules that are located within the given table
+--  <li> chain		 - Match rules that are located within the given chain
+--  <li> target		 - Match rules with the given target
+--  <li> protocol	 - Match rules that match the given protocol, rules with
+-- 						protocol "all" are always matched
+--  <li> source		 - Match rules with the given source, rules with source
+-- 						"0.0.0.0/0" (::/0) are always matched
+--  <li> destination - Match rules with the given destination, rules with
+-- 						destination "0.0.0.0/0" (::/0) are always matched
+--  <li> inputif	 - Match rules with the given input interface, rules
+-- 						with input	interface "*" (=all) are always matched
+--  <li> outputif	 - Match rules with the given output interface, rules
+-- 						with output	interface "*" (=all) are always matched
+--  <li> flags		 - Match rules that match the given flags, current
+-- 						supported values are "-f" (--fragment)
+--						and "!f" (! --fragment)
+--  <li> options	 - Match rules containing all given options
+-- </ul>
+-- The return value is a list of tables representing the matched rules.
+-- Each rule table contains the following fields:
+-- <ul>
+--  <li> index		 - The index number of the rule
+--  <li> table		 - The table where the rule is located, can be one
+--	 					of "filter", "nat" or "mangle"
+--  <li> chain		 - The chain where the rule is located, e.g. "INPUT"
+-- 						or "postrouting_wan"
+--  <li> target		 - The rule target, e.g. "REJECT" or "DROP"
+--  <li> protocol		The matching protocols, e.g. "all" or "tcp"
+--  <li> flags		 - Special rule options ("--", "-f" or "!f")
+--  <li> inputif	 - Input interface of the rule, e.g. "eth0.0"
+-- 						or "*" for all interfaces
+--  <li> outputif	 - Output interface of the rule,e.g. "eth0.0"
+-- 						or "*" for all interfaces
+--  <li> source		 - The source ip range, e.g. "0.0.0.0/0" (::/0)
+--  <li> destination - The destination ip range, e.g. "0.0.0.0/0" (::/0)
+--  <li> options	 - A list of specific options of the rule,
+-- 						e.g. { "reject-with", "tcp-reset" }
+--  <li> packets	 - The number of packets matched by the rule
+--  <li> bytes		 - The number of total bytes matched by the rule
+-- </ul>
+-- Example:
+-- <pre>
+-- ip = luci.sys.iptparser.IptParser()
+-- result = ip.find( {
+-- 	target="REJECT",
+-- 	protocol="tcp",
+-- 	options={ "reject-with", "tcp-reset" }
+-- } )
+-- </pre>
+-- This will match all rules with target "-j REJECT",
+-- protocol "-p tcp" (or "-p all")
+-- and the option "--reject-with tcp-reset".
+-- @params args		Table containing the search arguments (optional)
+-- @return			Table of matching rule tables
+function IptParser.find( self, args )
+
+	local args = args or { }
+	local rv   = { }
+
+	args.source      = args.source      and self:_parse_addr(args.source)
+	args.destination = args.destination and self:_parse_addr(args.destination)
+
+	for i, rule in ipairs(self._rules) do
+		local match = true
+
+		-- match table
+		if not ( not args.table or args.table:lower() == rule.table ) then
+			match = false
+		end
+
+		-- match chain
+		if not ( match == true and (
+			not args.chain or args.chain == rule.chain
+		) ) then
+			match = false
+		end
+
+		-- match target
+		if not ( match == true and (
+			not args.target or args.target == rule.target
+		) ) then
+			match = false
+		end
+
+		-- match protocol
+		if not ( match == true and (
+			not args.protocol or rule.protocol == "all" or
+			args.protocol:lower() == rule.protocol
+		) ) then
+			match = false
+		end
+
+		-- match source
+		if not ( match == true and (
+			not args.source or rule.source == self._nulladdr or
+			self:_parse_addr(rule.source):contains(args.source)
+		) ) then
+			match = false
+		end
+
+		-- match destination
+		if not ( match == true and (
+			not args.destination or rule.destination == self._nulladdr or
+			self:_parse_addr(rule.destination):contains(args.destination)
+		) ) then
+			match = false
+		end
+
+		-- match input interface
+		if not ( match == true and (
+			not args.inputif or rule.inputif == "*" or
+			args.inputif == rule.inputif
+		) ) then
+			match = false
+		end
+
+		-- match output interface
+		if not ( match == true and (
+			not args.outputif or rule.outputif == "*" or
+			args.outputif == rule.outputif
+		) ) then
+			match = false
+		end
+
+		-- match flags (the "opt" column)
+		if not ( match == true and (
+			not args.flags or rule.flags == args.flags
+		) ) then
+			match = false
+		end
+
+		-- match specific options
+		if not ( match == true and (
+			not args.options or
+			self:_match_options( rule.options, args.options )
+		) ) then
+			match = false
+		end
+
+		-- insert match
+		if match == true then
+			rv[#rv+1] = rule
+		end
+	end
+
+	return rv
+end
+
+
+--- Rebuild the internal lookup table, for example when rules have changed
+-- through external commands.
+-- @return	nothing
+function IptParser.resync( self )
+	self._rules = { }
+	self._chain = nil
+	self:_parse_rules()
+end
+
+
+--- Find the names of all tables.
+-- @return		Table of table names.
+function IptParser.tables( self )
+	return self._tables
+end
+
+
+--- Find the names of all chains within the given table name.
+-- @param table	String containing the table name
+-- @return		Table of chain names in the order they occur.
+function IptParser.chains( self, table )
+	local lookup = { }
+	local chains = { }
+	for _, r in ipairs(self:find({table=table})) do
+		if not lookup[r.chain] then
+			lookup[r.chain]   = true
+			chains[#chains+1] = r.chain
+		end
+	end
+	return chains
+end
+
+
+--- Return the given firewall chain within the given table name.
+-- @param table	String containing the table name
+-- @param chain	String containing the chain name
+-- @return		Table containing the fields "policy", "packets", "bytes"
+--				and "rules". The "rules" field is a table of rule tables.
+function IptParser.chain( self, table, chain )
+	return self._chains[table:lower()] and self._chains[table:lower()][chain]
+end
+
+
+--- Test whether the given target points to a custom chain.
+-- @param target	String containing the target action
+-- @return			Boolean indicating whether target is a custom chain.
+function IptParser.is_custom_target( self, target )
+	for _, r in ipairs(self._rules) do
+		if r.chain == target then
+			return true
+		end
+	end
+	return false
+end
+
+
+-- [internal] Parse address according to family.
+function IptParser._parse_addr( self, addr )
+	if self._family == 4 then
+		return luci.ip.IPv4(addr)
+	else
+		return luci.ip.IPv6(addr)
+	end
+end
+
+-- [internal] Parse iptables output from all tables.
+function IptParser._parse_rules( self )
+
+	for i, tbl in ipairs(self._tables) do
+
+		self._chains[tbl] = { }
+
+		for i, rule in ipairs(luci.util.execl(self._command % tbl)) do
+
+			if rule:find( "^Chain " ) == 1 then
+
+				local crefs
+				local cname, cpol, cpkt, cbytes = rule:match(
+					"^Chain ([^%s]*) %(policy (%w+) " ..
+					"(%d+) packets, (%d+) bytes%)"
+				)
+
+				if not cname then
+					cname, crefs = rule:match(
+						"^Chain ([^%s]*) %((%d+) references%)"
+					)
+				end
+
+				self._chain = cname
+				self._chains[tbl][cname] = {
+					policy     = cpol,
+					packets    = tonumber(cpkt or 0),
+					bytes      = tonumber(cbytes or 0),
+					references = tonumber(crefs or 0),
+					rules      = { }
+				}
+
+			else
+				if rule:find("%d") == 1 then
+
+					local rule_parts   = luci.util.split( rule, "%s+", nil, true )
+					local rule_details = { }
+
+					-- cope with rules that have no target assigned
+					if rule:match("^%d+%s+%d+%s+%d+%s%s") then
+						table.insert(rule_parts, 4, nil)
+					end
+
+					-- ip6tables opt column is usually zero-width
+					if self._family == 6 then
+						table.insert(rule_parts, 6, "--")
+					end
+
+					rule_details["table"]       = tbl
+					rule_details["chain"]       = self._chain
+					rule_details["index"]       = tonumber(rule_parts[1])
+					rule_details["packets"]     = tonumber(rule_parts[2])
+					rule_details["bytes"]       = tonumber(rule_parts[3])
+					rule_details["target"]      = rule_parts[4]
+					rule_details["protocol"]    = rule_parts[5]
+					rule_details["flags"]       = rule_parts[6]
+					rule_details["inputif"]     = rule_parts[7]
+					rule_details["outputif"]    = rule_parts[8]
+					rule_details["source"]      = rule_parts[9]
+					rule_details["destination"] = rule_parts[10]
+					rule_details["options"]     = { }
+
+					for i = 11, #rule_parts  do
+						if #rule_parts[i] > 0 then
+							rule_details["options"][i-10] = rule_parts[i]
+						end
+					end
+
+					self._rules[#self._rules+1] = rule_details
+
+					self._chains[tbl][self._chain].rules[
+						#self._chains[tbl][self._chain].rules + 1
+					] = rule_details
+				end
+			end
+		end
+	end
+
+	self._chain = nil
+end
+
+
+-- [internal] Return true if optlist1 contains all elements of optlist 2.
+--            Return false in all other cases.
+function IptParser._match_options( self, o1, o2 )
+
+	-- construct a hashtable of first options list to speed up lookups
+	local oh = { }
+	for i, opt in ipairs( o1 ) do oh[opt] = true end
+
+	-- iterate over second options list
+	-- each string in o2 must be also present in o1
+	-- if o2 contains a string which is not found in o1 then return false
+	for i, opt in ipairs( o2 ) do
+		if not oh[opt] then
+			return false
+		end
+	end
+
+	return true
+end
diff --git a/trunk/package/luci/modules/base/luasrc/sys/zoneinfo.lua b/trunk/package/luci/modules/base/luasrc/sys/zoneinfo.lua
new file mode 100644
index 00000000..f5a12bfc
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sys/zoneinfo.lua
@@ -0,0 +1,28 @@
+--[[
+LuCI - Autogenerated Zoneinfo Module
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+local setmetatable, require, rawget, rawset = setmetatable, require, rawget, rawset
+
+module "luci.sys.zoneinfo"
+
+setmetatable(_M, {
+	__index = function(t, k)
+		if k == "TZ" and not rawget(t, k) then
+			local m = require "luci.sys.zoneinfo.tzdata"
+			rawset(t, k, rawget(m, k))
+		elseif k == "OFFSET" and not rawget(t, k) then
+			local m = require "luci.sys.zoneinfo.tzoffset"
+			rawset(t, k, rawget(m, k))
+		end
+
+		return rawget(t, k)
+	end
+})
diff --git a/trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzdata.lua b/trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzdata.lua
new file mode 100644
index 00000000..8c7cc2ad
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzdata.lua
@@ -0,0 +1,430 @@
+--[[
+LuCI - Autogenerated Zoneinfo Module
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module "luci.sys.zoneinfo.tzdata"
+
+TZ = {
+	{ 'Africa/Abidjan', 'GMT0' },
+	{ 'Africa/Accra', 'GMT0' },
+	{ 'Africa/Addis Ababa', 'EAT-3' },
+	{ 'Africa/Algiers', 'CET-1' },
+	{ 'Africa/Asmara', 'EAT-3' },
+	{ 'Africa/Bamako', 'GMT0' },
+	{ 'Africa/Bangui', 'WAT-1' },
+	{ 'Africa/Banjul', 'GMT0' },
+	{ 'Africa/Bissau', 'GMT0' },
+	{ 'Africa/Blantyre', 'CAT-2' },
+	{ 'Africa/Brazzaville', 'WAT-1' },
+	{ 'Africa/Bujumbura', 'CAT-2' },
+	{ 'Africa/Cairo', 'EET-2EEST,M4.5.5/0,M9.5.4/24' },
+	{ 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' },
+	{ 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Africa/Conakry', 'GMT0' },
+	{ 'Africa/Dakar', 'GMT0' },
+	{ 'Africa/Dar es Salaam', 'EAT-3' },
+	{ 'Africa/Djibouti', 'EAT-3' },
+	{ 'Africa/Douala', 'WAT-1' },
+	{ 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' },
+	{ 'Africa/Freetown', 'GMT0' },
+	{ 'Africa/Gaborone', 'CAT-2' },
+	{ 'Africa/Harare', 'CAT-2' },
+	{ 'Africa/Johannesburg', 'SAST-2' },
+	{ 'Africa/Juba', 'EAT-3' },
+	{ 'Africa/Kampala', 'EAT-3' },
+	{ 'Africa/Khartoum', 'EAT-3' },
+	{ 'Africa/Kigali', 'CAT-2' },
+	{ 'Africa/Kinshasa', 'WAT-1' },
+	{ 'Africa/Lagos', 'WAT-1' },
+	{ 'Africa/Libreville', 'WAT-1' },
+	{ 'Africa/Lome', 'GMT0' },
+	{ 'Africa/Luanda', 'WAT-1' },
+	{ 'Africa/Lubumbashi', 'CAT-2' },
+	{ 'Africa/Lusaka', 'CAT-2' },
+	{ 'Africa/Malabo', 'WAT-1' },
+	{ 'Africa/Maputo', 'CAT-2' },
+	{ 'Africa/Maseru', 'SAST-2' },
+	{ 'Africa/Mbabane', 'SAST-2' },
+	{ 'Africa/Mogadishu', 'EAT-3' },
+	{ 'Africa/Monrovia', 'GMT0' },
+	{ 'Africa/Nairobi', 'EAT-3' },
+	{ 'Africa/Ndjamena', 'WAT-1' },
+	{ 'Africa/Niamey', 'WAT-1' },
+	{ 'Africa/Nouakchott', 'GMT0' },
+	{ 'Africa/Ouagadougou', 'GMT0' },
+	{ 'Africa/Porto-Novo', 'WAT-1' },
+	{ 'Africa/Sao Tome', 'GMT0' },
+	{ 'Africa/Tripoli', 'EET-2' },
+	{ 'Africa/Tunis', 'CET-1' },
+	{ 'Africa/Windhoek', 'WAT-1WAST,M9.1.0,M4.1.0' },
+	{ 'America/Adak', 'HAST10HADT,M3.2.0,M11.1.0' },
+	{ 'America/Anchorage', 'AKST9AKDT,M3.2.0,M11.1.0' },
+	{ 'America/Anguilla', 'AST4' },
+	{ 'America/Antigua', 'AST4' },
+	{ 'America/Araguaina', 'BRT3' },
+	{ 'America/Argentina/Buenos Aires', 'ART3' },
+	{ 'America/Argentina/Catamarca', 'ART3' },
+	{ 'America/Argentina/Cordoba', 'ART3' },
+	{ 'America/Argentina/Jujuy', 'ART3' },
+	{ 'America/Argentina/La Rioja', 'ART3' },
+	{ 'America/Argentina/Mendoza', 'ART3' },
+	{ 'America/Argentina/Rio Gallegos', 'ART3' },
+	{ 'America/Argentina/Salta', 'ART3' },
+	{ 'America/Argentina/San Juan', 'ART3' },
+	{ 'America/Argentina/San Luis', 'ART3' },
+	{ 'America/Argentina/Tucuman', 'ART3' },
+	{ 'America/Argentina/Ushuaia', 'ART3' },
+	{ 'America/Aruba', 'AST4' },
+	{ 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M3.4.0/0' },
+	{ 'America/Atikokan', 'EST5' },
+	{ 'America/Bahia', 'BRT3' },
+	{ 'America/Bahia Banderas', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Barbados', 'AST4' },
+	{ 'America/Belem', 'BRT3' },
+	{ 'America/Belize', 'CST6' },
+	{ 'America/Blanc-Sablon', 'AST4' },
+	{ 'America/Boa Vista', 'AMT4' },
+	{ 'America/Bogota', 'COT5' },
+	{ 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' },
+	{ 'America/Cancun', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Caracas', 'VET4:30' },
+	{ 'America/Cayenne', 'GFT3' },
+	{ 'America/Cayman', 'EST5' },
+	{ 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
+	{ 'America/Costa Rica', 'CST6' },
+	{ 'America/Creston', 'MST7' },
+	{ 'America/Cuiaba', 'AMT4AMST,M10.3.0/0,M2.3.0/0' },
+	{ 'America/Curacao', 'AST4' },
+	{ 'America/Danmarkshavn', 'GMT0' },
+	{ 'America/Dawson', 'PST8PDT,M3.2.0,M11.1.0' },
+	{ 'America/Dawson Creek', 'MST7' },
+	{ 'America/Denver', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'America/Detroit', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Dominica', 'AST4' },
+	{ 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'America/Eirunepe', 'ACT5' },
+	{ 'America/El Salvador', 'CST6' },
+	{ 'America/Fortaleza', 'BRT3' },
+	{ 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' },
+	{ 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' },
+	{ 'America/Goose Bay', 'AST4ADT,M3.2.0,M11.1.0' },
+	{ 'America/Grand Turk', 'AST4' },
+	{ 'America/Grenada', 'AST4' },
+	{ 'America/Guadeloupe', 'AST4' },
+	{ 'America/Guatemala', 'CST6' },
+	{ 'America/Guayaquil', 'ECT5' },
+	{ 'America/Guyana', 'GYT4' },
+	{ 'America/Halifax', 'AST4ADT,M3.2.0,M11.1.0' },
+	{ 'America/Havana', 'CST5CDT,M3.2.0/0,M11.1.0/1' },
+	{ 'America/Hermosillo', 'MST7' },
+	{ 'America/Indiana/Indianapolis', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Indiana/Knox', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Indiana/Marengo', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Indiana/Petersburg', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Indiana/Tell City', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Indiana/Vevay', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Indiana/Vincennes', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Indiana/Winamac', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Inuvik', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'America/Iqaluit', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Jamaica', 'EST5' },
+	{ 'America/Juneau', 'AKST9AKDT,M3.2.0,M11.1.0' },
+	{ 'America/Kentucky/Louisville', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Kentucky/Monticello', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Kralendijk', 'AST4' },
+	{ 'America/La Paz', 'BOT4' },
+	{ 'America/Lima', 'PET5' },
+	{ 'America/Los Angeles', 'PST8PDT,M3.2.0,M11.1.0' },
+	{ 'America/Lower Princes', 'AST4' },
+	{ 'America/Maceio', 'BRT3' },
+	{ 'America/Managua', 'CST6' },
+	{ 'America/Manaus', 'AMT4' },
+	{ 'America/Marigot', 'AST4' },
+	{ 'America/Martinique', 'AST4' },
+	{ 'America/Matamoros', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Mazatlan', 'MST7MDT,M4.1.0,M10.5.0' },
+	{ 'America/Menominee', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Metlakatla', 'PST8' },
+	{ 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' },
+	{ 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' },
+	{ 'America/Monterrey', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Montevideo', 'UYT3UYST,M10.1.0,M3.2.0' },
+	{ 'America/Montserrat', 'AST4' },
+	{ 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Nipigon', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Nome', 'AKST9AKDT,M3.2.0,M11.1.0' },
+	{ 'America/Noronha', 'FNT2' },
+	{ 'America/North Dakota/Beulah', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/North Dakota/Center', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/North Dakota/New Salem', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Ojinaga', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'America/Panama', 'EST5' },
+	{ 'America/Pangnirtung', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Paramaribo', 'SRT3' },
+	{ 'America/Phoenix', 'MST7' },
+	{ 'America/Port of Spain', 'AST4' },
+	{ 'America/Port-au-Prince', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Porto Velho', 'AMT4' },
+	{ 'America/Puerto Rico', 'AST4' },
+	{ 'America/Rainy River', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Rankin Inlet', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Recife', 'BRT3' },
+	{ 'America/Regina', 'CST6' },
+	{ 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Rio Branco', 'ACT5' },
+	{ 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
+	{ 'America/Santarem', 'BRT3' },
+	{ 'America/Santiago', 'CLT4CLST,M9.1.6/24,M4.4.6/24' },
+	{ 'America/Santo Domingo', 'AST4' },
+	{ 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
+	{ 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' },
+	{ 'America/Sitka', 'AKST9AKDT,M3.2.0,M11.1.0' },
+	{ 'America/St Barthelemy', 'AST4' },
+	{ 'America/St Johns', 'NST3:30NDT,M3.2.0,M11.1.0' },
+	{ 'America/St Kitts', 'AST4' },
+	{ 'America/St Lucia', 'AST4' },
+	{ 'America/St Thomas', 'AST4' },
+	{ 'America/St Vincent', 'AST4' },
+	{ 'America/Swift Current', 'CST6' },
+	{ 'America/Tegucigalpa', 'CST6' },
+	{ 'America/Thule', 'AST4ADT,M3.2.0,M11.1.0' },
+	{ 'America/Thunder Bay', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Tijuana', 'PST8PDT,M3.2.0,M11.1.0' },
+	{ 'America/Toronto', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Tortola', 'AST4' },
+	{ 'America/Vancouver', 'PST8PDT,M3.2.0,M11.1.0' },
+	{ 'America/Whitehorse', 'PST8PDT,M3.2.0,M11.1.0' },
+	{ 'America/Winnipeg', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Yakutat', 'AKST9AKDT,M3.2.0,M11.1.0' },
+	{ 'America/Yellowknife', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'Antarctica/Casey', 'AWST-8' },
+	{ 'Antarctica/Davis', 'DAVT-7' },
+	{ 'Antarctica/DumontDUrville', 'DDUT-10' },
+	{ 'Antarctica/Macquarie', 'MIST-11' },
+	{ 'Antarctica/Mawson', 'MAWT-5' },
+	{ 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
+	{ 'Antarctica/Palmer', 'CLT4CLST,M9.1.6/24,M4.4.6/24' },
+	{ 'Antarctica/Rothera', 'ROTT3' },
+	{ 'Antarctica/Syowa', 'SYOT-3' },
+	{ 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' },
+	{ 'Antarctica/Vostok', 'VOST-6' },
+	{ 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Asia/Aden', 'AST-3' },
+	{ 'Asia/Almaty', 'ALMT-6' },
+	{ 'Asia/Amman', 'EET-2EEST,M3.5.4/24,M10.5.5/1' },
+	{ 'Asia/Anadyr', 'ANAT-12' },
+	{ 'Asia/Aqtau', 'AQTT-5' },
+	{ 'Asia/Aqtobe', 'AQTT-5' },
+	{ 'Asia/Ashgabat', 'TMT-5' },
+	{ 'Asia/Baghdad', 'AST-3' },
+	{ 'Asia/Bahrain', 'AST-3' },
+	{ 'Asia/Baku', 'AZT-4AZST,M3.5.0/4,M10.5.0/5' },
+	{ 'Asia/Bangkok', 'ICT-7' },
+	{ 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' },
+	{ 'Asia/Bishkek', 'KGT-6' },
+	{ 'Asia/Brunei', 'BNT-8' },
+	{ 'Asia/Chita', 'IRKT-8' },
+	{ 'Asia/Choibalsan', 'CHOT-8' },
+	{ 'Asia/Colombo', 'IST-5:30' },
+	{ 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,M10.5.5/0' },
+	{ 'Asia/Dhaka', 'BDT-6' },
+	{ 'Asia/Dili', 'TLT-9' },
+	{ 'Asia/Dubai', 'GST-4' },
+	{ 'Asia/Dushanbe', 'TJT-5' },
+	{ 'Asia/Gaza', 'EET-2EEST,M3.5.4/24,M9.3.6/144' },
+	{ 'Asia/Hebron', 'EET-2EEST,M3.5.4/24,M9.3.6/144' },
+	{ 'Asia/Ho Chi Minh', 'ICT-7' },
+	{ 'Asia/Hong Kong', 'HKT-8' },
+	{ 'Asia/Hovd', 'HOVT-7' },
+	{ 'Asia/Irkutsk', 'IRKT-8' },
+	{ 'Asia/Jakarta', 'WIB-7' },
+	{ 'Asia/Jayapura', 'WIT-9' },
+	{ 'Asia/Jerusalem', 'IST-2IDT,M3.4.4/26,M10.5.0' },
+	{ 'Asia/Kabul', 'AFT-4:30' },
+	{ 'Asia/Kamchatka', 'PETT-12' },
+	{ 'Asia/Karachi', 'PKT-5' },
+	{ 'Asia/Kathmandu', 'NPT-5:45' },
+	{ 'Asia/Khandyga', 'YAKT-9' },
+	{ 'Asia/Kolkata', 'IST-5:30' },
+	{ 'Asia/Krasnoyarsk', 'KRAT-7' },
+	{ 'Asia/Kuala Lumpur', 'MYT-8' },
+	{ 'Asia/Kuching', 'MYT-8' },
+	{ 'Asia/Kuwait', 'AST-3' },
+	{ 'Asia/Macau', 'CST-8' },
+	{ 'Asia/Magadan', 'MAGT-10' },
+	{ 'Asia/Makassar', 'WITA-8' },
+	{ 'Asia/Manila', 'PHT-8' },
+	{ 'Asia/Muscat', 'GST-4' },
+	{ 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Asia/Novokuznetsk', 'KRAT-7' },
+	{ 'Asia/Novosibirsk', 'NOVT-6' },
+	{ 'Asia/Omsk', 'OMST-6' },
+	{ 'Asia/Oral', 'ORAT-5' },
+	{ 'Asia/Phnom Penh', 'ICT-7' },
+	{ 'Asia/Pontianak', 'WIB-7' },
+	{ 'Asia/Pyongyang', 'KST-9' },
+	{ 'Asia/Qatar', 'AST-3' },
+	{ 'Asia/Qyzylorda', 'QYZT-6' },
+	{ 'Asia/Rangoon', 'MMT-6:30' },
+	{ 'Asia/Riyadh', 'AST-3' },
+	{ 'Asia/Sakhalin', 'SAKT-10' },
+	{ 'Asia/Samarkand', 'UZT-5' },
+	{ 'Asia/Seoul', 'KST-9' },
+	{ 'Asia/Shanghai', 'CST-8' },
+	{ 'Asia/Singapore', 'SGT-8' },
+	{ 'Asia/Srednekolymsk', 'SRET-11' },
+	{ 'Asia/Taipei', 'CST-8' },
+	{ 'Asia/Tashkent', 'UZT-5' },
+	{ 'Asia/Tbilisi', 'GET-4' },
+	{ 'Asia/Thimphu', 'BTT-6' },
+	{ 'Asia/Tokyo', 'JST-9' },
+	{ 'Asia/Ulaanbaatar', 'ULAT-8' },
+	{ 'Asia/Urumqi', 'XJT-6' },
+	{ 'Asia/Ust-Nera', 'VLAT-10' },
+	{ 'Asia/Vientiane', 'ICT-7' },
+	{ 'Asia/Vladivostok', 'VLAT-10' },
+	{ 'Asia/Yakutsk', 'YAKT-9' },
+	{ 'Asia/Yekaterinburg', 'YEKT-5' },
+	{ 'Asia/Yerevan', 'AMT-4' },
+	{ 'Atlantic/Azores', 'AZOT1AZOST,M3.5.0/0,M10.5.0/1' },
+	{ 'Atlantic/Bermuda', 'AST4ADT,M3.2.0,M11.1.0' },
+	{ 'Atlantic/Canary', 'WET0WEST,M3.5.0/1,M10.5.0' },
+	{ 'Atlantic/Cape Verde', 'CVT1' },
+	{ 'Atlantic/Faroe', 'WET0WEST,M3.5.0/1,M10.5.0' },
+	{ 'Atlantic/Madeira', 'WET0WEST,M3.5.0/1,M10.5.0' },
+	{ 'Atlantic/Reykjavik', 'GMT0' },
+	{ 'Atlantic/South Georgia', 'GST2' },
+	{ 'Atlantic/St Helena', 'GMT0' },
+	{ 'Atlantic/Stanley', 'FKST3' },
+	{ 'Australia/Adelaide', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Brisbane', 'AEST-10' },
+	{ 'Australia/Broken Hill', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Currie', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Darwin', 'ACST-9:30' },
+	{ 'Australia/Eucla', 'ACWST-8:45' },
+	{ 'Australia/Hobart', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Lindeman', 'AEST-10' },
+	{ 'Australia/Lord Howe', 'LHST-10:30LHDT-11,M10.1.0,M4.1.0' },
+	{ 'Australia/Melbourne', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Perth', 'AWST-8' },
+	{ 'Australia/Sydney', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Europe/Amsterdam', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Andorra', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Athens', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Belgrade', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Berlin', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Bratislava', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Brussels', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Bucharest', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Budapest', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Busingen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Chisinau', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Copenhagen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Dublin', 'GMT0IST,M3.5.0/1,M10.5.0' },
+	{ 'Europe/Gibraltar', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Guernsey', 'GMT0BST,M3.5.0/1,M10.5.0' },
+	{ 'Europe/Helsinki', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Isle of Man', 'GMT0BST,M3.5.0/1,M10.5.0' },
+	{ 'Europe/Istanbul', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Jersey', 'GMT0BST,M3.5.0/1,M10.5.0' },
+	{ 'Europe/Kaliningrad', 'EET-2' },
+	{ 'Europe/Kiev', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Lisbon', 'WET0WEST,M3.5.0/1,M10.5.0' },
+	{ 'Europe/Ljubljana', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/London', 'GMT0BST,M3.5.0/1,M10.5.0' },
+	{ 'Europe/Luxembourg', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Madrid', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Malta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Mariehamn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Minsk', 'MSK-3' },
+	{ 'Europe/Monaco', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Moscow', 'MSK-3' },
+	{ 'Europe/Oslo', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Paris', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Podgorica', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Prague', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Riga', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Rome', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Samara', 'SAMT-4' },
+	{ 'Europe/San Marino', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Sarajevo', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Simferopol', 'MSK-3' },
+	{ 'Europe/Skopje', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Sofia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Stockholm', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Tallinn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Tirane', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Uzhgorod', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Vaduz', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Vienna', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Vilnius', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Volgograd', 'MSK-3' },
+	{ 'Europe/Warsaw', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Zagreb', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Zaporozhye', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Zurich', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Indian/Antananarivo', 'EAT-3' },
+	{ 'Indian/Chagos', 'IOT-6' },
+	{ 'Indian/Christmas', 'CXT-7' },
+	{ 'Indian/Cocos', 'CCT-6:30' },
+	{ 'Indian/Comoro', 'EAT-3' },
+	{ 'Indian/Kerguelen', 'TFT-5' },
+	{ 'Indian/Mahe', 'SCT-4' },
+	{ 'Indian/Maldives', 'MVT-5' },
+	{ 'Indian/Mauritius', 'MUT-4' },
+	{ 'Indian/Mayotte', 'EAT-3' },
+	{ 'Indian/Reunion', 'RET-4' },
+	{ 'Pacific/Apia', 'WSST-13WSDT,M9.5.0/3,M4.1.0/4' },
+	{ 'Pacific/Auckland', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
+	{ 'Pacific/Bougainville', 'BST-11' },
+	{ 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' },
+	{ 'Pacific/Chuuk', 'CHUT-10' },
+	{ 'Pacific/Easter', 'EAST6EASST,M9.1.6/22,M4.4.6/22' },
+	{ 'Pacific/Efate', 'VUT-11' },
+	{ 'Pacific/Enderbury', 'PHOT-13' },
+	{ 'Pacific/Fakaofo', 'TKT-13' },
+	{ 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.4/75' },
+	{ 'Pacific/Funafuti', 'TVT-12' },
+	{ 'Pacific/Galapagos', 'GALT6' },
+	{ 'Pacific/Gambier', 'GAMT9' },
+	{ 'Pacific/Guadalcanal', 'SBT-11' },
+	{ 'Pacific/Guam', 'ChST-10' },
+	{ 'Pacific/Honolulu', 'HST10' },
+	{ 'Pacific/Johnston', 'HST10' },
+	{ 'Pacific/Kiritimati', 'LINT-14' },
+	{ 'Pacific/Kosrae', 'KOST-11' },
+	{ 'Pacific/Kwajalein', 'MHT-12' },
+	{ 'Pacific/Majuro', 'MHT-12' },
+	{ 'Pacific/Marquesas', 'MART9:30' },
+	{ 'Pacific/Midway', 'SST11' },
+	{ 'Pacific/Nauru', 'NRT-12' },
+	{ 'Pacific/Niue', 'NUT11' },
+	{ 'Pacific/Norfolk', 'NFT-11:30' },
+	{ 'Pacific/Noumea', 'NCT-11' },
+	{ 'Pacific/Pago Pago', 'SST11' },
+	{ 'Pacific/Palau', 'PWT-9' },
+	{ 'Pacific/Pitcairn', 'PST8' },
+	{ 'Pacific/Pohnpei', 'PONT-11' },
+	{ 'Pacific/Port Moresby', 'PGT-10' },
+	{ 'Pacific/Rarotonga', 'CKT10' },
+	{ 'Pacific/Saipan', 'ChST-10' },
+	{ 'Pacific/Tahiti', 'TAHT10' },
+	{ 'Pacific/Tarawa', 'GILT-12' },
+	{ 'Pacific/Tongatapu', 'TOT-13' },
+	{ 'Pacific/Wake', 'WAKT-12' },
+	{ 'Pacific/Wallis', 'WFT-12' },
+}
diff --git a/trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzoffset.lua b/trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
new file mode 100644
index 00000000..d2f77ed2
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -0,0 +1,177 @@
+--[[
+LuCI - Autogenerated Zoneinfo Module
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module "luci.sys.zoneinfo.tzoffset"
+
+OFFSET = {
+	gmt   =      0,	-- GMT
+	eat   =  10800,	-- EAT
+	cet   =   3600,	-- CET
+	wat   =   3600,	-- WAT
+	cat   =   7200,	-- CAT
+	eet   =   7200,	-- EET
+	eest  =  10800,	-- EEST
+	wet   =      0,	-- WET
+	sast  =   7200,	-- SAST
+	hast  = -36000,	-- HAST
+	hadt  = -32400,	-- HADT
+	akst  = -32400,	-- AKST
+	akdt  = -28800,	-- AKDT
+	ast   = -14400,	-- AST
+	brt   = -10800,	-- BRT
+	art   = -10800,	-- ART
+	pyt   = -14400,	-- PYT
+	pyst  = -10800,	-- PYST
+	est   = -18000,	-- EST
+	cst   = -21600,	-- CST
+	cdt   = -18000,	-- CDT
+	amt   = -14400,	-- AMT
+	cot   = -18000,	-- COT
+	mst   = -25200,	-- MST
+	mdt   = -21600,	-- MDT
+	vet   = -16200,	-- VET
+	gft   = -10800,	-- GFT
+	pst   = -28800,	-- PST
+	pdt   = -25200,	-- PDT
+	act   = -18000,	-- ACT
+	wgt   = -10800,	-- WGT
+	wgst  =  -7200,	-- WGST
+	ect   = -18000,	-- ECT
+	gyt   = -14400,	-- GYT
+	bot   = -14400,	-- BOT
+	pet   = -18000,	-- PET
+	pmst  = -10800,	-- PMST
+	pmdt  =  -7200,	-- PMDT
+	uyt   = -10800,	-- UYT
+	uyst  =  -7200,	-- UYST
+	fnt   =  -7200,	-- FNT
+	srt   = -10800,	-- SRT
+	clt   = -14400,	-- CLT
+	clst  = -10800,	-- CLST
+	egt   =  -3600,	-- EGT
+	egst  =      0,	-- EGST
+	nst   = -12600,	-- NST
+	ndt   =  -9000,	-- NDT
+	awst  =  28800,	-- AWST
+	davt  =  25200,	-- DAVT
+	ddut  =  36000,	-- DDUT
+	mist  =  39600,	-- MIST
+	mawt  =  18000,	-- MAWT
+	nzst  =  43200,	-- NZST
+	nzdt  =  46800,	-- NZDT
+	rott  = -10800,	-- ROTT
+	syot  =  10800,	-- SYOT
+	utc   =      0,	-- UTC
+	vost  =  21600,	-- VOST
+	almt  =  21600,	-- ALMT
+	anat  =  43200,	-- ANAT
+	aqtt  =  18000,	-- AQTT
+	tmt   =  18000,	-- TMT
+	azt   =  14400,	-- AZT
+	azst  =  18000,	-- AZST
+	ict   =  25200,	-- ICT
+	kgt   =  21600,	-- KGT
+	bnt   =  28800,	-- BNT
+	irkt  =  28800,	-- IRKT
+	chot  =  28800,	-- CHOT
+	ist   =  19800,	-- IST
+	bdt   =  21600,	-- BDT
+	tlt   =  32400,	-- TLT
+	gst   =  14400,	-- GST
+	tjt   =  18000,	-- TJT
+	hkt   =  28800,	-- HKT
+	hovt  =  25200,	-- HOVT
+	wib   =  25200,	-- WIB
+	wit   =  32400,	-- WIT
+	aft   =  16200,	-- AFT
+	pett  =  43200,	-- PETT
+	pkt   =  18000,	-- PKT
+	npt   =  20700,	-- NPT
+	yakt  =  32400,	-- YAKT
+	krat  =  25200,	-- KRAT
+	myt   =  28800,	-- MYT
+	magt  =  36000,	-- MAGT
+	wita  =  28800,	-- WITA
+	pht   =  28800,	-- PHT
+	novt  =  21600,	-- NOVT
+	omst  =  21600,	-- OMST
+	orat  =  18000,	-- ORAT
+	kst   =  32400,	-- KST
+	qyzt  =  21600,	-- QYZT
+	mmt   =  23400,	-- MMT
+	sakt  =  36000,	-- SAKT
+	uzt   =  18000,	-- UZT
+	sgt   =  28800,	-- SGT
+	sret  =  39600,	-- SRET
+	get   =  14400,	-- GET
+	btt   =  21600,	-- BTT
+	jst   =  32400,	-- JST
+	ulat  =  28800,	-- ULAT
+	xjt   =  21600,	-- XJT
+	vlat  =  36000,	-- VLAT
+	yekt  =  18000,	-- YEKT
+	azot  =  -3600,	-- AZOT
+	azost =      0,	-- AZOST
+	cvt   =  -3600,	-- CVT
+	fkst  = -10800,	-- FKST
+	acst  =  34200,	-- ACST
+	acdt  =  37800,	-- ACDT
+	aest  =  36000,	-- AEST
+	acwst =  31500,	-- ACWST
+	lhst  =  37800,	-- LHST
+	lhdt  =  39600,	-- LHDT
+	msk   =  10800,	-- MSK
+	samt  =  14400,	-- SAMT
+	iot   =  21600,	-- IOT
+	cxt   =  25200,	-- CXT
+	cct   =  23400,	-- CCT
+	tft   =  18000,	-- TFT
+	sct   =  14400,	-- SCT
+	mvt   =  18000,	-- MVT
+	mut   =  14400,	-- MUT
+	ret   =  14400,	-- RET
+	wsst  =  46800,	-- WSST
+	wsdt  =  50400,	-- WSDT
+	bst   =  39600,	-- BST
+	chast =  45900,	-- CHAST
+	chadt =  49500,	-- CHADT
+	chut  =  36000,	-- CHUT
+	east  = -21600,	-- EAST
+	easst = -18000,	-- EASST
+	vut   =  39600,	-- VUT
+	phot  =  46800,	-- PHOT
+	tkt   =  46800,	-- TKT
+	fjt   =  43200,	-- FJT
+	fjst  =  46800,	-- FJST
+	tvt   =  43200,	-- TVT
+	galt  = -21600,	-- GALT
+	gamt  = -32400,	-- GAMT
+	sbt   =  39600,	-- SBT
+	hst   = -36000,	-- HST
+	lint  =  50400,	-- LINT
+	kost  =  39600,	-- KOST
+	mht   =  43200,	-- MHT
+	mart  = -34200,	-- MART
+	sst   = -39600,	-- SST
+	nrt   =  43200,	-- NRT
+	nut   = -39600,	-- NUT
+	nft   =  41400,	-- NFT
+	nct   =  39600,	-- NCT
+	pwt   =  32400,	-- PWT
+	pont  =  39600,	-- PONT
+	pgt   =  36000,	-- PGT
+	ckt   = -36000,	-- CKT
+	taht  = -36000,	-- TAHT
+	gilt  =  43200,	-- GILT
+	tot   =  46800,	-- TOT
+	wakt  =  43200,	-- WAKT
+	wft   =  43200,	-- WFT
+}
diff --git a/trunk/package/luci/modules/base/luasrc/template.lua b/trunk/package/luci/modules/base/luasrc/template.lua
new file mode 100644
index 00000000..ea01d3c2
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/template.lua
@@ -0,0 +1,123 @@
+--[[
+LuCI - Template Parser
+
+Description:
+A template parser supporting includes, translations, Lua code blocks
+and more. It can be used either as a compiler or as an interpreter.
+
+FileId: $Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+	http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local util = require "luci.util"
+local config = require "luci.config"
+local tparser = require "luci.template.parser"
+
+local tostring, pairs, loadstring = tostring, pairs, loadstring
+local setmetatable, loadfile = setmetatable, loadfile
+local getfenv, setfenv, rawget = getfenv, setfenv, rawget
+local assert, type, error = assert, type, error
+
+--- LuCI template library.
+module "luci.template"
+
+config.template = config.template or {}
+viewdir = config.template.viewdir or util.libpath() .. "/view"
+
+
+-- Define the namespace for template modules
+context = util.threadlocal()
+
+--- Render a certain template.
+-- @param name		Template name
+-- @param scope		Scope to assign to template (optional)
+function render(name, scope)
+	return Template(name):render(scope or getfenv(2))
+end
+
+--- Render a template from a string.
+-- @param template	Template string
+-- @param scope		Scope to assign to template (optional)
+function render_string(template, scope)
+	return Template(nil, template):render(scope or getfenv(2))
+end
+
+
+-- Template class
+Template = util.class()
+
+-- Shared template cache to store templates in to avoid unnecessary reloading
+Template.cache = setmetatable({}, {__mode = "v"})
+
+
+-- Constructor - Reads and compiles the template on-demand
+function Template.__init__(self, name, template)
+	if name then
+		self.template = self.cache[name]
+		self.name = name
+	else
+		self.name = "[string]"
+	end
+
+	-- Create a new namespace for this template
+	self.viewns = context.viewns
+	
+	-- If we have a cached template, skip compiling and loading
+	if not self.template then
+
+		-- Compile template
+		local err
+		local sourcefile
+
+		if name then
+			sourcefile = viewdir .. "/" .. name .. ".htm"
+			self.template, _, err = tparser.parse(sourcefile)
+		else
+			sourcefile = "[string]"
+			self.template, _, err = tparser.parse_string(template)
+		end
+
+		-- If we have no valid template throw error, otherwise cache the template
+		if not self.template then
+			error("Failed to load template '" .. name .. "'.\n" ..
+			      "Error while parsing template '" .. sourcefile .. "':\n" ..
+			      (err or "Unknown syntax error"))
+		elseif name then
+			self.cache[name] = self.template
+		end
+	end
+end
+
+
+-- Renders a template
+function Template.render(self, scope)
+	scope = scope or getfenv(2)
+	
+	-- Put our predefined objects in the scope of the template
+	setfenv(self.template, setmetatable({}, {__index =
+		function(tbl, key)
+			return rawget(tbl, key) or self.viewns[key] or scope[key]
+		end}))
+	
+	-- Now finally render the thing
+	local stat, err = util.copcall(self.template)
+	if not stat then
+		error("Failed to execute template '" .. self.name .. "'.\n" ..
+		      "A runtime error occured: " .. tostring(err or "(nil)"))
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/tools/proto.lua b/trunk/package/luci/modules/base/luasrc/tools/proto.lua
new file mode 100644
index 00000000..4df02696
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/tools/proto.lua
@@ -0,0 +1,46 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.tools.proto", package.seeall)
+
+function opt_macaddr(s, ifc, ...)
+	local v = luci.cbi.Value
+	local o = s:taboption("advanced", v, "macaddr", ...)
+
+	o.placeholder = ifc and ifc:mac()
+	o.datatype    = "macaddr"
+
+	function o.cfgvalue(self, section)
+		local w = ifc and ifc:get_wifinet()
+		if w then
+			return w:get("macaddr")
+		else
+			return v.cfgvalue(self, section)
+		end
+	end
+
+	function o.write(self, section, value)
+		local w = ifc and ifc:get_wifinet()
+		if w then
+			w:set("macaddr", value)
+		elseif value then
+			v.write(self, section, value)
+		else
+			v.remove(self, section)
+		end
+	end
+
+	function o.remove(self, section)
+		self:write(section, nil)
+	end
+end
diff --git a/trunk/package/luci/modules/base/luasrc/tools/status.lua b/trunk/package/luci/modules/base/luasrc/tools/status.lua
new file mode 100644
index 00000000..0efc51be
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/tools/status.lua
@@ -0,0 +1,218 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.tools.status", package.seeall)
+
+local uci = require "luci.model.uci".cursor()
+
+local function dhcp_leases_common(family)
+	local rv = { }
+	local nfs = require "nixio.fs"
+	local leasefile = "/var/dhcp.leases"
+
+	uci:foreach("dhcp", "dnsmasq",
+		function(s)
+			if s.leasefile and nfs.access(s.leasefile) then
+				leasefile = s.leasefile
+				return false
+			end
+		end)
+
+	local fd = io.open(leasefile, "r")
+	if fd then
+		while true do
+			local ln = fd:read("*l")
+			if not ln then
+				break
+			else
+				local ts, mac, ip, name, duid = ln:match("^(%d+) (%S+) (%S+) (%S+) (%S+)")
+				if ts and mac and ip and name and duid then
+					if family == 4 and not ip:match(":") then
+						rv[#rv+1] = {
+							expires  = os.difftime(tonumber(ts) or 0, os.time()),
+							macaddr  = mac,
+							ipaddr   = ip,
+							hostname = (name ~= "*") and name
+						}
+					elseif family == 6 and ip:match(":") then
+						rv[#rv+1] = {
+							expires  = os.difftime(tonumber(ts) or 0, os.time()),
+							ip6addr  = ip,
+							duid     = (duid ~= "*") and duid,
+							hostname = (name ~= "*") and name
+						}
+					end
+				end
+			end
+		end
+		fd:close()
+	end
+
+	local fd = io.open("/tmp/hosts/odhcpd", "r")
+	if fd then
+		while true do
+			local ln = fd:read("*l")
+			if not ln then
+				break
+			else
+				local iface, duid, iaid, name, ts, id, length, ip = ln:match("^# (%S+) (%S+) (%S+) (%S+) (%d+) (%S+) (%S+) (.*)")
+				if ip and iaid ~= "ipv4" and family == 6 then
+					rv[#rv+1] = {
+						expires  = os.difftime(tonumber(ts) or 0, os.time()),
+						duid     = duid,
+						ip6addr  = ip,
+						hostname = (name ~= "-") and name
+					}
+				elseif ip and iaid == "ipv4" and family == 4 then
+					rv[#rv+1] = {
+						expires  = os.difftime(tonumber(ts) or 0, os.time()),
+						macaddr  = duid,
+						ipaddr   = ip,
+						hostname = (name ~= "-") and name
+					}
+				end
+			end
+		end
+		fd:close()
+	end
+
+	return rv
+end
+
+function dhcp_leases()
+	return dhcp_leases_common(4)
+end
+
+function dhcp6_leases()
+	return dhcp_leases_common(6)
+end
+
+function wifi_networks()
+	local rv = { }
+	local ntm = require "luci.model.network".init()
+
+	local dev
+	for _, dev in ipairs(ntm:get_wifidevs()) do
+		local rd = {
+			up       = dev:is_up(),
+			device   = dev:name(),
+			name     = dev:get_i18n(),
+			networks = { }
+		}
+
+		local net
+		for _, net in ipairs(dev:get_wifinets()) do
+			rd.networks[#rd.networks+1] = {
+				name       = net:shortname(),
+				link       = net:adminlink(),
+				up         = net:is_up(),
+				mode       = net:active_mode(),
+				ssid       = net:active_ssid(),
+				bssid      = net:active_bssid(),
+				encryption = net:active_encryption(),
+				frequency  = net:frequency(),
+				channel    = net:channel(),
+				signal     = net:signal(),
+				quality    = net:signal_percent(),
+				noise      = net:noise(),
+				bitrate    = net:bitrate(),
+				ifname     = net:ifname(),
+				assoclist  = net:assoclist(),
+				country    = net:country(),
+				txpower    = net:txpower(),
+				txpoweroff = net:txpower_offset()
+			}
+		end
+
+		rv[#rv+1] = rd
+	end
+
+	return rv
+end
+
+function wifi_network(id)
+	local ntm = require "luci.model.network".init()
+	local net = ntm:get_wifinet(id)
+	if net then
+		local dev = net:get_device()
+		if dev then
+			return {
+				id         = id,
+				name       = net:shortname(),
+				link       = net:adminlink(),
+				up         = net:is_up(),
+				mode       = net:active_mode(),
+				ssid       = net:active_ssid(),
+				bssid      = net:active_bssid(),
+				encryption = net:active_encryption(),
+				frequency  = net:frequency(),
+				channel    = net:channel(),
+				signal     = net:signal(),
+				quality    = net:signal_percent(),
+				noise      = net:noise(),
+				bitrate    = net:bitrate(),
+				ifname     = net:ifname(),
+				assoclist  = net:assoclist(),
+				country    = net:country(),
+				txpower    = net:txpower(),
+				txpoweroff = net:txpower_offset(),
+				disabled   = (dev:get("disabled") == "1" or
+				              net:get("disabled") == "1"),
+				device     = {
+					up     = dev:is_up(),
+					device = dev:name(),
+					name   = dev:get_i18n()
+				}
+			}
+		end
+	end
+	return { }
+end
+
+function switch_status(devs)
+	local dev
+	local switches = { }
+	for dev in devs:gmatch("[^%s,]+") do
+		local ports = { }
+		local swc = io.popen("swconfig dev %q show" % dev, "r")
+		if swc then
+			local l
+			repeat
+				l = swc:read("*l")
+				if l then
+					local port, up = l:match("port:(%d+) link:(%w+)")
+					if port then
+						local speed  = l:match(" speed:(%d+)")
+						local duplex = l:match(" (%w+)-duplex")
+						local txflow = l:match(" (txflow)")
+						local rxflow = l:match(" (rxflow)")
+						local auto   = l:match(" (auto)")
+
+						ports[#ports+1] = {
+							port   = tonumber(port) or 0,
+							speed  = tonumber(speed) or 0,
+							link   = (up == "up"),
+							duplex = (duplex == "full"),
+							rxflow = (not not rxflow),
+							txflow = (not not txflow),
+							auto   = (not not auto)
+						}
+					end
+				end
+			until not l
+			swc:close()
+		end
+		switches[dev] = ports
+	end
+	return switches
+end
diff --git a/trunk/package/luci/modules/base/luasrc/tools/webadmin.lua b/trunk/package/luci/modules/base/luasrc/tools/webadmin.lua
new file mode 100644
index 00000000..0e09be98
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/tools/webadmin.lua
@@ -0,0 +1,173 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.tools.webadmin", package.seeall)
+local uci = require("luci.model.uci")
+require("luci.sys")
+require("luci.ip")
+
+function byte_format(byte)
+	local suff = {"B", "KB", "MB", "GB", "TB"}
+	for i=1, 5 do
+		if byte > 1024 and i < 5 then
+			byte = byte / 1024
+		else
+			return string.format("%.2f %s", byte, suff[i]) 
+		end 
+	end
+end
+
+function date_format(secs)
+	local suff = {"min", "h", "d"}
+	local mins = 0
+	local hour = 0
+	local days = 0
+	
+	secs = math.floor(secs)
+	if secs > 60 then
+		mins = math.floor(secs / 60)
+		secs = secs % 60
+	end
+	
+	if mins > 60 then
+		hour = math.floor(mins / 60)
+		mins = mins % 60
+	end
+	
+	if hour > 24 then
+		days = math.floor(hour / 24)
+		hour = hour % 24
+	end
+	
+	if days > 0 then
+		return string.format("%.0fd %02.0fh %02.0fmin %02.0fs", days, hour, mins, secs)
+	else
+		return string.format("%02.0fh %02.0fmin %02.0fs", hour, mins, secs)
+	end
+end
+
+function network_get_addresses(net)
+	local state = uci.cursor_state()
+	state:load("network")
+	local addr = {}
+	local ipv4 = state:get("network", net, "ipaddr")
+	local mav4 = state:get("network", net, "netmask")
+	local ipv6 = state:get("network", net, "ip6addr")
+	
+	if ipv4 and #ipv4 > 0 then
+		if mav4 and #mav4 == 0 then mav4 = nil end
+
+		ipv4 = luci.ip.IPv4(ipv4, mav4)
+		
+		if ipv4 then 
+			table.insert(addr, ipv4:string())
+		end
+	end
+
+	if ipv6 then
+		table.insert(addr, ipv6)
+	end
+	
+	state:foreach("network", "alias",
+		function (section)
+			if section.interface == net then
+				if section.ipaddr and section.netmask then
+					local ipv4 = luci.ip.IPv4(section.ipaddr, section.netmask)
+					
+					if ipv4 then
+						table.insert(addr, ipv4:string())
+					end
+				end
+				
+				if section.ip6addr then
+					table.insert(addr, section.ip6addr)
+				end
+			end
+		end
+	)
+	
+	return addr
+end
+
+function cbi_add_networks(field)
+	uci.cursor():foreach("network", "interface",
+		function (section)
+			if section[".name"] ~= "loopback" then
+				field:value(section[".name"])
+			end
+		end
+	)
+	field.titleref = luci.dispatcher.build_url("admin", "network", "network")
+end
+
+function cbi_add_knownips(field)
+	for i, dataset in ipairs(luci.sys.net.arptable()) do
+		field:value(dataset["IP address"])
+	end
+end
+
+function network_get_zones(net)
+	local state = uci.cursor_state()
+	if not state:load("firewall") then
+		return nil
+	end
+	
+	local zones = {}
+	
+	state:foreach("firewall", "zone", 
+		function (section)
+			local znet = section.network or section.name
+			if luci.util.contains(luci.util.split(znet, " "), net) then
+				table.insert(zones, section.name)
+			end
+		end
+	)
+	
+	return zones
+end
+
+function firewall_find_zone(name)
+	local find
+	
+	luci.model.uci.cursor():foreach("firewall", "zone", 
+		function (section)
+			if section.name == name then
+				find = section[".name"]
+			end
+		end
+	)
+	
+	return find
+end
+
+function iface_get_network(iface)
+	local state = uci.cursor_state()
+	state:load("network")
+	local net
+	
+	state:foreach("network", "interface",
+		function (section)
+			local ifname = state:get(
+				"network", section[".name"], "ifname"
+			)
+			
+			if iface == ifname then
+				net = section[".name"]
+			end
+		end
+	)
+	
+	return net
+end
diff --git a/trunk/package/luci/modules/base/luasrc/util.lua b/trunk/package/luci/modules/base/luasrc/util.lua
new file mode 100644
index 00000000..da761e21
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/util.lua
@@ -0,0 +1,791 @@
+--[[
+LuCI - Utility library
+
+Description:
+Several common useful Lua functions
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local io = require "io"
+local math = require "math"
+local table = require "table"
+local debug = require "debug"
+local ldebug = require "luci.debug"
+local string = require "string"
+local coroutine = require "coroutine"
+local tparser = require "luci.template.parser"
+
+local getmetatable, setmetatable = getmetatable, setmetatable
+local rawget, rawset, unpack = rawget, rawset, unpack
+local tostring, type, assert = tostring, type, assert
+local ipairs, pairs, next, loadstring = ipairs, pairs, next, loadstring
+local require, pcall, xpcall = require, pcall, xpcall
+local collectgarbage, get_memory_limit = collectgarbage, get_memory_limit
+
+--- LuCI utility functions.
+module "luci.util"
+
+--
+-- Pythonic string formatting extension
+--
+getmetatable("").__mod = function(a, b)
+	if not b then
+		return a
+	elseif type(b) == "table" then
+		for k, _ in pairs(b) do if type(b[k]) == "userdata" then b[k] = tostring(b[k]) end end
+		return a:format(unpack(b))
+	else
+		if type(b) == "userdata" then b = tostring(b) end
+		return a:format(b)
+	end
+end
+
+
+--
+-- Class helper routines
+--
+
+-- Instantiates a class
+local function _instantiate(class, ...)
+	local inst = setmetatable({}, {__index = class})
+
+	if inst.__init__ then
+		inst:__init__(...)
+	end
+
+	return inst
+end
+
+--- Create a Class object (Python-style object model).
+-- The class object can be instantiated by calling itself.
+-- Any class functions or shared parameters can be attached to this object.
+-- Attaching a table to the class object makes this table shared between
+-- all instances of this class. For object parameters use the __init__ function.
+-- Classes can inherit member functions and values from a base class.
+-- Class can be instantiated by calling them. All parameters will be passed
+-- to the __init__ function of this class - if such a function exists.
+-- The __init__ function must be used to set any object parameters that are not shared
+-- with other objects of this class. Any return values will be ignored.
+-- @param base	The base class to inherit from (optional)
+-- @return		A class object
+-- @see			instanceof
+-- @see			clone
+function class(base)
+	return setmetatable({}, {
+		__call  = _instantiate,
+		__index = base
+	})
+end
+
+--- Test whether the given object is an instance of the given class.
+-- @param object	Object instance
+-- @param class		Class object to test against
+-- @return			Boolean indicating whether the object is an instance
+-- @see				class
+-- @see				clone
+function instanceof(object, class)
+	local meta = getmetatable(object)
+	while meta and meta.__index do
+		if meta.__index == class then
+			return true
+		end
+		meta = getmetatable(meta.__index)
+	end
+	return false
+end
+
+
+--
+-- Scope manipulation routines
+--
+
+local tl_meta = {
+	__mode = "k",
+
+	__index = function(self, key)
+		local t = rawget(self, coxpt[coroutine.running()]
+		 or coroutine.running() or 0)
+		return t and t[key]
+	end,
+
+	__newindex = function(self, key, value)
+		local c = coxpt[coroutine.running()] or coroutine.running() or 0
+		if not rawget(self, c) then
+			rawset(self, c, { [key] = value })
+		else
+			rawget(self, c)[key] = value
+		end
+	end
+}
+
+--- Create a new or get an already existing thread local store associated with
+-- the current active coroutine. A thread local store is private a table object
+-- whose values can't be accessed from outside of the running coroutine.
+-- @return	Table value representing the corresponding thread local store
+function threadlocal(tbl)
+	return setmetatable(tbl or {}, tl_meta)
+end
+
+
+--
+-- Debugging routines
+--
+
+--- Write given object to stderr.
+-- @param obj	Value to write to stderr
+-- @return		Boolean indicating whether the write operation was successful
+function perror(obj)
+	return io.stderr:write(tostring(obj) .. "\n")
+end
+
+--- Recursively dumps a table to stdout, useful for testing and debugging.
+-- @param t	Table value to dump
+-- @param maxdepth	Maximum depth
+-- @return	Always nil
+function dumptable(t, maxdepth, i, seen)
+	i = i or 0
+	seen = seen or setmetatable({}, {__mode="k"})
+
+	for k,v in pairs(t) do
+		perror(string.rep("\t", i) .. tostring(k) .. "\t" .. tostring(v))
+		if type(v) == "table" and (not maxdepth or i < maxdepth) then
+			if not seen[v] then
+				seen[v] = true
+				dumptable(v, maxdepth, i+1, seen)
+			else
+				perror(string.rep("\t", i) .. "*** RECURSION ***")
+			end
+		end
+	end
+end
+
+
+--
+-- String and data manipulation routines
+--
+
+--- Create valid XML PCDATA from given string.
+-- @param value	String value containing the data to escape
+-- @return		String value containing the escaped data
+function pcdata(value)
+	return value and tparser.pcdata(tostring(value))
+end
+
+--- Strip HTML tags from given string.
+-- @param value	String containing the HTML text
+-- @return	String with HTML tags stripped of
+function striptags(value)
+	return value and tparser.striptags(tostring(value))
+end
+
+--- Splits given string on a defined separator sequence and return a table
+-- containing the resulting substrings. The optional max parameter specifies
+-- the number of bytes to process, regardless of the actual length of the given
+-- string. The optional last parameter, regex, specifies whether the separator
+-- sequence is interpreted as regular expression.
+-- @param str		String value containing the data to split up
+-- @param pat		String with separator pattern (optional, defaults to "\n")
+-- @param max		Maximum times to split (optional)
+-- @param regex 	Boolean indicating whether to interpret the separator
+--					pattern as regular expression (optional, default is false)
+-- @return			Table containing the resulting substrings
+function split(str, pat, max, regex)
+	pat = pat or "\n"
+	max = max or #str
+
+	local t = {}
+	local c = 1
+
+	if #str == 0 then
+		return {""}
+	end
+
+	if #pat == 0 then
+		return nil
+	end
+
+	if max == 0 then
+		return str
+	end
+
+	repeat
+		local s, e = str:find(pat, c, not regex)
+		max = max - 1
+		if s and max < 0 then
+			t[#t+1] = str:sub(c)
+		else
+			t[#t+1] = str:sub(c, s and s - 1)
+		end
+		c = e and e + 1 or #str + 1
+	until not s or max < 0
+
+	return t
+end
+
+--- Remove leading and trailing whitespace from given string value.
+-- @param str	String value containing whitespace padded data
+-- @return		String value with leading and trailing space removed
+function trim(str)
+	return (str:gsub("^%s*(.-)%s*$", "%1"))
+end
+
+--- Count the occurences of given substring in given string.
+-- @param str		String to search in
+-- @param pattern	String containing pattern to find
+-- @return			Number of found occurences
+function cmatch(str, pat)
+	local count = 0
+	for _ in str:gmatch(pat) do count = count + 1 end
+	return count
+end
+
+--- Return a matching iterator for the given value. The iterator will return
+-- one token per invocation, the tokens are separated by whitespace. If the
+-- input value is a table, it is transformed into a string first. A nil value
+-- will result in a valid interator which aborts with the first invocation.
+-- @param val		The value to scan (table, string or nil)
+-- @return			Iterator which returns one token per call
+function imatch(v)
+	if type(v) == "table" then
+		local k = nil
+		return function()
+			k = next(v, k)
+			return v[k]
+		end
+
+	elseif type(v) == "number" or type(v) == "boolean" then
+		local x = true
+		return function()
+			if x then
+				x = false
+				return tostring(v)
+			end
+		end
+
+	elseif type(v) == "userdata" or type(v) == "string" then
+		return tostring(v):gmatch("%S+")
+	end
+
+	return function() end
+end
+
+--- Parse certain units from the given string and return the canonical integer
+-- value or 0 if the unit is unknown. Upper- or lower case is irrelevant.
+-- Recognized units are:
+--	o "y"	- one year   (60*60*24*366)
+--  o "m"	- one month  (60*60*24*31)
+--  o "w"	- one week   (60*60*24*7)
+--  o "d"	- one day    (60*60*24)
+--  o "h"	- one hour	 (60*60)
+--  o "min"	- one minute (60)
+--  o "kb"  - one kilobyte (1024)
+--  o "mb"	- one megabyte (1024*1024)
+--  o "gb"	- one gigabyte (1024*1024*1024)
+--  o "kib" - one si kilobyte (1000)
+--  o "mib"	- one si megabyte (1000*1000)
+--  o "gib"	- one si gigabyte (1000*1000*1000)
+-- @param ustr	String containing a numerical value with trailing unit
+-- @return		Number containing the canonical value
+function parse_units(ustr)
+
+	local val = 0
+
+	-- unit map
+	local map = {
+		-- date stuff
+		y   = 60 * 60 * 24 * 366,
+		m   = 60 * 60 * 24 * 31,
+		w   = 60 * 60 * 24 * 7,
+		d   = 60 * 60 * 24,
+		h   = 60 * 60,
+		min = 60,
+
+		-- storage sizes
+		kb  = 1024,
+		mb  = 1024 * 1024,
+		gb  = 1024 * 1024 * 1024,
+
+		-- storage sizes (si)
+		kib = 1000,
+		mib = 1000 * 1000,
+		gib = 1000 * 1000 * 1000
+	}
+
+	-- parse input string
+	for spec in ustr:lower():gmatch("[0-9%.]+[a-zA-Z]*") do
+
+		local num = spec:gsub("[^0-9%.]+$","")
+		local spn = spec:gsub("^[0-9%.]+", "")
+
+		if map[spn] or map[spn:sub(1,1)] then
+			val = val + num * ( map[spn] or map[spn:sub(1,1)] )
+		else
+			val = val + num
+		end
+	end
+
+
+	return val
+end
+
+-- also register functions above in the central string class for convenience
+string.pcdata      = pcdata
+string.striptags   = striptags
+string.split       = split
+string.trim        = trim
+string.cmatch      = cmatch
+string.parse_units = parse_units
+
+
+--- Appends numerically indexed tables or single objects to a given table.
+-- @param src	Target table
+-- @param ...	Objects to insert
+-- @return		Target table
+function append(src, ...)
+	for i, a in ipairs({...}) do
+		if type(a) == "table" then
+			for j, v in ipairs(a) do
+				src[#src+1] = v
+			end
+		else
+			src[#src+1] = a
+		end
+	end
+	return src
+end
+
+--- Combines two or more numerically indexed tables and single objects into one table.
+-- @param tbl1	Table value to combine
+-- @param tbl2	Table value to combine
+-- @param ...	More tables to combine
+-- @return		Table value containing all values of given tables
+function combine(...)
+	return append({}, ...)
+end
+
+--- Checks whether the given table contains the given value.
+-- @param table	Table value
+-- @param value	Value to search within the given table
+-- @return		Boolean indicating whether the given value occurs within table
+function contains(table, value)
+	for k, v in pairs(table) do
+		if value == v then
+			return k
+		end
+	end
+	return false
+end
+
+--- Update values in given table with the values from the second given table.
+-- Both table are - in fact - merged together.
+-- @param t			Table which should be updated
+-- @param updates	Table containing the values to update
+-- @return			Always nil
+function update(t, updates)
+	for k, v in pairs(updates) do
+		t[k] = v
+	end
+end
+
+--- Retrieve all keys of given associative table.
+-- @param t	Table to extract keys from
+-- @return	Sorted table containing the keys
+function keys(t)
+	local keys = { }
+	if t then
+		for k, _ in kspairs(t) do
+			keys[#keys+1] = k
+		end
+	end
+	return keys
+end
+
+--- Clones the given object and return it's copy.
+-- @param object	Table value to clone
+-- @param deep		Boolean indicating whether to do recursive cloning
+-- @return			Cloned table value
+function clone(object, deep)
+	local copy = {}
+
+	for k, v in pairs(object) do
+		if deep and type(v) == "table" then
+			v = clone(v, deep)
+		end
+		copy[k] = v
+	end
+
+	return setmetatable(copy, getmetatable(object))
+end
+
+
+--- Create a dynamic table which automatically creates subtables.
+-- @return	Dynamic Table
+function dtable()
+        return setmetatable({}, { __index =
+                function(tbl, key)
+                        return rawget(tbl, key)
+                         or rawget(rawset(tbl, key, dtable()), key)
+                end
+        })
+end
+
+
+-- Serialize the contents of a table value.
+function _serialize_table(t, seen)
+	assert(not seen[t], "Recursion detected.")
+	seen[t] = true
+
+	local data  = ""
+	local idata = ""
+	local ilen  = 0
+
+	for k, v in pairs(t) do
+		if type(k) ~= "number" or k < 1 or math.floor(k) ~= k or ( k - #t ) > 3 then
+			k = serialize_data(k, seen)
+			v = serialize_data(v, seen)
+			data = data .. ( #data > 0 and ", " or "" ) ..
+				'[' .. k .. '] = ' .. v
+		elseif k > ilen then
+			ilen = k
+		end
+	end
+
+	for i = 1, ilen do
+		local v = serialize_data(t[i], seen)
+		idata = idata .. ( #idata > 0 and ", " or "" ) .. v
+	end
+
+	return idata .. ( #data > 0 and #idata > 0 and ", " or "" ) .. data
+end
+
+--- Recursively serialize given data to lua code, suitable for restoring
+-- with loadstring().
+-- @param val	Value containing the data to serialize
+-- @return		String value containing the serialized code
+-- @see			restore_data
+-- @see			get_bytecode
+function serialize_data(val, seen)
+	seen = seen or setmetatable({}, {__mode="k"})
+
+	if val == nil then
+		return "nil"
+	elseif type(val) == "number" then
+		return val
+	elseif type(val) == "string" then
+		return "%q" % val
+	elseif type(val) == "boolean" then
+		return val and "true" or "false"
+	elseif type(val) == "function" then
+		return "loadstring(%q)" % get_bytecode(val)
+	elseif type(val) == "table" then
+		return "{ " .. _serialize_table(val, seen) .. " }"
+	else
+		return '"[unhandled data type:' .. type(val) .. ']"'
+	end
+end
+
+--- Restore data previously serialized with serialize_data().
+-- @param str	String containing the data to restore
+-- @return		Value containing the restored data structure
+-- @see			serialize_data
+-- @see			get_bytecode
+function restore_data(str)
+	return loadstring("return " .. str)()
+end
+
+
+--
+-- Byte code manipulation routines
+--
+
+--- Return the current runtime bytecode of the given data. The byte code
+-- will be stripped before it is returned.
+-- @param val	Value to return as bytecode
+-- @return		String value containing the bytecode of the given data
+function get_bytecode(val)
+	local code
+
+	if type(val) == "function" then
+		code = string.dump(val)
+	else
+		code = string.dump( loadstring( "return " .. serialize_data(val) ) )
+	end
+
+	return code -- and strip_bytecode(code)
+end
+
+--- Strips unnescessary lua bytecode from given string. Information like line
+-- numbers and debugging numbers will be discarded. Original version by
+-- Peter Cawley (http://lua-users.org/lists/lua-l/2008-02/msg01158.html)
+-- @param code	String value containing the original lua byte code
+-- @return		String value containing the stripped lua byte code
+function strip_bytecode(code)
+	local version, format, endian, int, size, ins, num, lnum = code:byte(5, 12)
+	local subint
+	if endian == 1 then
+		subint = function(code, i, l)
+			local val = 0
+			for n = l, 1, -1 do
+				val = val * 256 + code:byte(i + n - 1)
+			end
+			return val, i + l
+		end
+	else
+		subint = function(code, i, l)
+			local val = 0
+			for n = 1, l, 1 do
+				val = val * 256 + code:byte(i + n - 1)
+			end
+			return val, i + l
+		end
+	end
+
+	local function strip_function(code)
+		local count, offset = subint(code, 1, size)
+		local stripped = { string.rep("\0", size) }
+		local dirty = offset + count
+		offset = offset + count + int * 2 + 4
+		offset = offset + int + subint(code, offset, int) * ins
+		count, offset = subint(code, offset, int)
+		for n = 1, count do
+			local t
+			t, offset = subint(code, offset, 1)
+			if t == 1 then
+				offset = offset + 1
+			elseif t == 4 then
+				offset = offset + size + subint(code, offset, size)
+			elseif t == 3 then
+				offset = offset + num
+			elseif t == 254 or t == 9 then
+				offset = offset + lnum
+			end
+		end
+		count, offset = subint(code, offset, int)
+		stripped[#stripped+1] = code:sub(dirty, offset - 1)
+		for n = 1, count do
+			local proto, off = strip_function(code:sub(offset, -1))
+			stripped[#stripped+1] = proto
+			offset = offset + off - 1
+		end
+		offset = offset + subint(code, offset, int) * int + int
+		count, offset = subint(code, offset, int)
+		for n = 1, count do
+			offset = offset + subint(code, offset, size) + size + int * 2
+		end
+		count, offset = subint(code, offset, int)
+		for n = 1, count do
+			offset = offset + subint(code, offset, size) + size
+		end
+		stripped[#stripped+1] = string.rep("\0", int * 3)
+		return table.concat(stripped), offset
+	end
+
+	return code:sub(1,12) .. strip_function(code:sub(13,-1))
+end
+
+
+--
+-- Sorting iterator functions
+--
+
+function _sortiter( t, f )
+	local keys = { }
+
+	local k, v
+	for k, v in pairs(t) do
+		keys[#keys+1] = k
+	end
+
+	local _pos = 0
+
+	table.sort( keys, f )
+
+	return function()
+		_pos = _pos + 1
+		if _pos <= #keys then
+			return keys[_pos], t[keys[_pos]], _pos
+		end
+	end
+end
+
+--- Return a key, value iterator which returns the values sorted according to
+-- the provided callback function.
+-- @param t	The table to iterate
+-- @param f A callback function to decide the order of elements
+-- @return	Function value containing the corresponding iterator
+function spairs(t,f)
+	return _sortiter( t, f )
+end
+
+--- Return a key, value iterator for the given table.
+-- The table pairs are sorted by key.
+-- @param t	The table to iterate
+-- @return	Function value containing the corresponding iterator
+function kspairs(t)
+	return _sortiter( t )
+end
+
+--- Return a key, value iterator for the given table.
+-- The table pairs are sorted by value.
+-- @param t	The table to iterate
+-- @return	Function value containing the corresponding iterator
+function vspairs(t)
+	return _sortiter( t, function (a,b) return t[a] < t[b] end )
+end
+
+
+--
+-- System utility functions
+--
+
+--- Test whether the current system is operating in big endian mode.
+-- @return	Boolean value indicating whether system is big endian
+function bigendian()
+	return string.byte(string.dump(function() end), 7) == 0
+end
+
+--- Execute given commandline and gather stdout.
+-- @param command	String containing command to execute
+-- @return			String containing the command's stdout
+function exec(command)
+	local pp   = io.popen(command)
+	local data = pp:read("*a")
+	pp:close()
+
+	return data
+end
+
+--- Return a line-buffered iterator over the output of given command.
+-- @param command	String containing the command to execute
+-- @return			Iterator
+function execi(command)
+	local pp = io.popen(command)
+
+	return pp and function()
+		local line = pp:read()
+
+		if not line then
+			pp:close()
+		end
+
+		return line
+	end
+end
+
+-- Deprecated
+function execl(command)
+	local pp   = io.popen(command)
+	local line = ""
+	local data = {}
+
+	while true do
+		line = pp:read()
+		if (line == nil) then break end
+		data[#data+1] = line
+	end
+	pp:close()
+
+	return data
+end
+
+--- Returns the absolute path to LuCI base directory.
+-- @return		String containing the directory path
+function libpath()
+	return require "nixio.fs".dirname(ldebug.__file__)
+end
+
+
+--
+-- Coroutine safe xpcall and pcall versions modified for Luci
+-- original version:
+-- coxpcall 1.13 - Copyright 2005 - Kepler Project (www.keplerproject.org)
+--
+-- Copyright © 2005 Kepler Project.
+-- Permission is hereby granted, free of charge, to any person obtaining a
+-- copy of this software and associated documentation files (the "Software"),
+-- to deal in the Software without restriction, including without limitation
+-- the rights to use, copy, modify, merge, publish, distribute, sublicense,
+-- and/or sell copies of the Software, and to permit persons to whom the
+-- Software is furnished to do so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be
+-- included in all copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+-- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+-- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+-- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+-- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+-- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+local performResume, handleReturnValue
+local oldpcall, oldxpcall = pcall, xpcall
+coxpt = {}
+setmetatable(coxpt, {__mode = "kv"})
+
+-- Identity function for copcall
+local function copcall_id(trace, ...)
+  return ...
+end
+
+--- This is a coroutine-safe drop-in replacement for Lua's "xpcall"-function
+-- @param f		Lua function to be called protected
+-- @param err	Custom error handler
+-- @param ...	Parameters passed to the function
+-- @return		A boolean whether the function call succeeded and the return
+--				values of either the function or the error handler
+function coxpcall(f, err, ...)
+	local res, co = oldpcall(coroutine.create, f)
+	if not res then
+		local params = {...}
+		local newf = function() return f(unpack(params)) end
+		co = coroutine.create(newf)
+	end
+	local c = coroutine.running()
+	coxpt[co] = coxpt[c] or c or 0
+
+	return performResume(err, co, ...)
+end
+
+--- This is a coroutine-safe drop-in replacement for Lua's "pcall"-function
+-- @param f		Lua function to be called protected
+-- @param ...	Parameters passed to the function
+-- @return		A boolean whether the function call succeeded and the returns
+--				values of the function or the error object
+function copcall(f, ...)
+	return coxpcall(f, copcall_id, ...)
+end
+
+-- Handle return value of protected call
+function handleReturnValue(err, co, status, ...)
+	if not status then
+		return false, err(debug.traceback(co, (...)), ...)
+	end
+
+	if coroutine.status(co) ~= 'suspended' then
+		return true, ...
+	end
+
+	return performResume(err, co, coroutine.yield(...))
+end
+
+-- Resume execution of protected function call
+function performResume(err, co, ...)
+	return handleReturnValue(err, co, coroutine.resume(co, ...))
+end
diff --git a/trunk/package/luci/modules/base/luasrc/version.lua b/trunk/package/luci/modules/base/luasrc/version.lua
new file mode 100644
index 00000000..9e5cb719
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/version.lua
@@ -0,0 +1,12 @@
+--[[
+LuCI - Lua Configuration Interface
+Version definition - do not edit this file
+]]--
+
+module "luci.version"
+
+distname    = "Host System"
+distversion = "SDK"
+
+luciname    = "LuCI"
+luciversion = "SVN"
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/apply_xhr.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/apply_xhr.htm
new file mode 100644
index 00000000..1814c939
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/apply_xhr.htm
@@ -0,0 +1,43 @@
+<% export("cbi_apply_xhr", function(id, configs, redirect) -%>
+<fieldset class="cbi-section" id="cbi-apply-<%=id%>">
+	<legend><%:Applying changes%></legend>
+	<script type="text/javascript">//<![CDATA[
+		var apply_xhr = new XHR();
+
+		apply_xhr.get('<%=luci.dispatcher.build_url("servicectl", "restart", table.concat(configs, ","))%>', null,
+			function() {
+				var checkfinish = function() {
+					apply_xhr.get('<%=luci.dispatcher.build_url("servicectl", "status")%>', null,
+						function(x) {
+							if( x.responseText == 'finish' )
+							{
+								var e = document.getElementById('cbi-apply-<%=id%>-status');
+								if( e )
+								{
+									e.innerHTML = '<%:Configuration applied.%>';
+									window.setTimeout(function() {
+										e.parentNode.style.display = 'none';
+										<% if redirect then %>location.href='<%=redirect%>';<% end %>
+									}, 1000);
+								}
+							}
+							else
+							{
+								var e = document.getElementById('cbi-apply-<%=id%>-status');
+								if( e && x.responseText ) e.innerHTML = x.responseText;
+
+								window.setTimeout(checkfinish, 1000);
+							}
+						}
+					);
+				}
+
+				window.setTimeout(checkfinish, 1000);
+			}
+		);
+	//]]></script>
+
+	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+	<span id="cbi-apply-<%=id%>-status"><%:Waiting for changes to be applied...%></span>
+</fieldset>
+<%-	end) %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/browser.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/browser.htm
new file mode 100644
index 00000000..e4a4077d
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/browser.htm
@@ -0,0 +1,7 @@
+<% local v = self:cfgvalue(section) -%>
+<%+cbi/valueheader%>
+	<input class="cbi-input-text" type="text"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
+	<script type="text/javascript">
+cbi_browser_init('<%=cbid%>', '<%=resource%>', '<%=luci.dispatcher.build_url("admin", "filebrowser")%>'<%=self.default_path and ", '"..self.default_path.."'"%>);
+	</script>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/button.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/button.htm
new file mode 100644
index 00000000..30f8ddfd
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/button.htm
@@ -0,0 +1,7 @@
+<%+cbi/valueheader%>
+	<% if self:cfgvalue(section) ~= false then %>
+		<input class="cbi-button cbi-input-<%=self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> />
+	<% else %>
+		-
+	<% end %>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/cell_valuefooter.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/cell_valuefooter.htm
new file mode 100644
index 00000000..220ebd42
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/cell_valuefooter.htm
@@ -0,0 +1,20 @@
+</div>
+<div id="cbip-<%=self.config.."-"..section.."-"..self.option%>"></div>
+</td>
+
+<% if #self.deps > 0 then -%>
+	<script type="text/javascript">
+		<% for j, d in ipairs(self.deps) do -%>
+			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option..d.add%>", {
+		<%-
+			for k,v in pairs(d.deps) do
+		-%>
+			<%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+			}, "cbip-<%=self.config.."-"..section.."-"..self.option%>");
+		<%- end %>
+	</script>
+<%- end %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/cell_valueheader.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/cell_valueheader.htm
new file mode 100644
index 00000000..9e2e145d
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/cell_valueheader.htm
@@ -0,0 +1,2 @@
+<td class="cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %>">
+<div id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/compound.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/compound.htm
new file mode 100644
index 00000000..12d02bb1
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/compound.htm
@@ -0,0 +1 @@
+<%- self:render_children() %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/delegator.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/delegator.htm
new file mode 100644
index 00000000..4fd19265
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/delegator.htm
@@ -0,0 +1,24 @@
+<%- self.active:render() %>
+	<div class="cbi-page-actions">
+		<input type="hidden" name="cbi.delg.current" value="<%=self.current%>" />
+<% for _, x in ipairs(self.chain) do %>
+		<input type="hidden" name="cbi.delg.path" value="<%=x%>" />
+<% end %>
+<% if not self.disallow_pageactions then %>
+<% if self.allow_finish and not self:get_next(self.current) then %>
+	<input class="cbi-button cbi-button-finish" type="submit" value="<%:Finish%>" />
+<% elseif self:get_next(self.current) then %>
+		<input class="cbi-button cbi-button-next" type="submit" value="<%:Next »%>" />
+<% end %>
+<% if self.allow_cancel then %>
+		<input class="cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:Cancel%>" />
+<% end %>
+<% if self.allow_reset then %>
+		<input class="cbi-button cbi-button-reset" type="reset" value="<%:Reset%>" />
+<% end %>
+<% if self.allow_back and self:get_prev(self.current) then %>
+		<input class="cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:« Back%>" />
+<% end %>
+<% end %>
+		<script type="text/javascript">cbi_d_update();</script>
+	</div>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/dvalue.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/dvalue.htm
new file mode 100644
index 00000000..78e6f323
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/dvalue.htm
@@ -0,0 +1,13 @@
+<%+cbi/valueheader%>
+<% if self.href then %><a href="<%=self.href%>"><% end -%>
+	<%
+		local val = self:cfgvalue(section) or self.default or ""
+		if not self.rawhtml then
+			write(pcdata(val))
+		else
+			write(val)
+		end
+	%>
+<%- if self.href then %></a><%end%>
+<input type="hidden" id="<%=cbid%>" value="<%=pcdata(self:cfgvalue(section) or self.default or "")%>" />
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/dynlist.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/dynlist.htm
new file mode 100644
index 00000000..fd626a4e
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/dynlist.htm
@@ -0,0 +1,26 @@
+<%+cbi/valueheader%>
+<div>
+<%
+	local vals = self:cfgvalue(section) or {}
+	for i=1, #vals + 1 do
+		local val = vals[i]
+		if (val and #val > 0) or (i == 1) then
+%>
+	<input class="cbi-input-text" value="<%=pcdata(val)%>" onchange="cbi_d_update(this.id)" type="text"<%=
+		attr("id", cbid .. "." .. i) .. attr("name", cbid) .. ifattr(self.size, "size") ..
+		ifattr(i == 1 and self.placeholder, "placeholder", self.placeholder)
+	%> /><br />
+<% end end %>
+</div>
+<script type="text/javascript">
+cbi_dynlist_init(
+	'<%=cbid%>', '<%=resource%>', '<%=self.datatype%>',
+	<%=tostring(self.optional or self.rmempty)%>
+	<%- if #self.keylist > 0 then -%>, [{
+		<%- for i, k in ipairs(self.keylist) do -%>
+			<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>
+			<%-if i<#self.keylist then-%>,<%-end-%>
+		<%-	end	-%>
+	}, '<%: -- custom -- %>']<% end -%>);
+</script>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/filebrowser.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/filebrowser.htm
new file mode 100644
index 00000000..a79beebb
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/filebrowser.htm
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>Filebrowser - LuCI</title>
+	<style type="text/css">
+		#path, #listing {
+			font-size: 85%;
+		}
+
+		ul {
+			padding-left: 0;
+			list-style-type: none;
+		}
+
+		li img {
+			vertical-align: bottom;
+			margin-right: 0.2em;
+		}
+	</style>
+
+	<script type="text/javascript">
+		function callback(path) {
+			if( window.opener ) {
+				var input = window.opener.document.getElementById('<%=luci.http.formvalue('field')%>');
+				if( input ) {
+					input.value = path;
+					window.close();
+				}
+			}
+		}
+	</script>
+</head>
+<body>
+	<%
+		require("nixio.fs")
+		require("nixio.util")
+		require("luci.http")
+		require("luci.dispatcher")
+
+		local field   = luci.http.formvalue('field')
+		local request = luci.dispatcher.context.args
+		local path    = { '' }
+
+		for i = 1, #request do
+			if request[i] ~= '..' and #request[i] > 0 then
+				path[#path+1] = request[i]
+			end
+		end
+
+		local filepath = table.concat( path, '/' )
+		local filestat = nixio.fs.stat( filepath )
+		local baseurl  = luci.dispatcher.build_url('admin', 'filebrowser')
+
+		if filestat and filestat.type == "reg" then
+			table.remove( path, #path )
+			filepath = table.concat( path, '/' ) .. '/'
+		elseif not ( filestat and filestat.type == "dir" ) then
+			path     = { '' }
+			filepath = '/'
+		else
+			filepath = filepath .. '/'
+		end
+
+		local entries = nixio.util.consume((nixio.fs.dir(filepath)))
+	-%>
+    <div id="path">
+		Location:
+		<% for i, dir in ipairs(path) do %>
+			<% if i == 1 then %>
+				<a href="<%=baseurl%>?field=<%=field%>">(root)</a>
+			<% elseif next(path, i) then %>
+				<% baseurl = baseurl .. '/' .. dir %>
+				/ <a href="<%=baseurl%>?field=<%=field%>"><%=dir%></a>
+			<% else %>
+				<% baseurl = baseurl .. '/' .. dir %>
+				/ <%=dir%>
+			<% end %>
+		<% end %>
+	</div>
+
+	<hr />
+
+	<div id="listing">
+		<ul>
+			<% for _, e in luci.util.vspairs(entries) do
+			    local stat = nixio.fs.stat(filepath..e)
+				if stat and stat.type == 'dir' then
+			-%>
+				<li class="dir">
+					<img src="<%=resource%>/cbi/folder.gif" alt="<%:Directory%>" />
+					<a href="<%=baseurl%>/<%=e%>?field=<%=field%>"><%=e%>/</a>
+				</li>
+			<% end end -%>
+
+			<% for _, e in luci.util.vspairs(entries) do
+			    local stat = nixio.fs.stat(filepath..e)
+				if stat and stat.type ~= 'dir' then
+			-%>
+				<li class="file">
+					<img src="<%=resource%>/cbi/file.gif" alt="<%:File%>" />
+					<a href="#" onclick="callback('<%=filepath..e%>')"><%=e%></a>
+				</li>
+			<% end end -%>
+		</ul>
+	</div>
+</body>
+</html>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zoneforwards.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zoneforwards.htm
new file mode 100644
index 00000000..2a433b56
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zoneforwards.htm
@@ -0,0 +1,59 @@
+<%+cbi/valueheader%>
+
+<%-
+	local utl = require "luci.util"
+	local fwm = require "luci.model.firewall".init()
+	local nwm = require "luci.model.network".init()
+
+	local zone, fwd, fz
+	local value = self:formvalue(section)
+	if not value or value == "-" then
+		value = self:cfgvalue(section) or self.default
+	end
+
+	local def  = fwm:get_defaults()
+	local zone = fwm:get_zone(value)
+	local empty = true
+-%>
+
+<% if zone then %>
+<div style="white-space:nowrap">
+	<label class="zonebadge" style="background-color:<%=zone:get_color()%>">
+		<strong><%=zone:name()%>:</strong>
+		<%-
+			local zempty = true
+			for _, net in ipairs(zone:get_networks()) do
+				net = nwm:get_network(net)
+				if net then
+					zempty = false
+		-%>
+			<span class="ifacebadge<% if net:name() == self.network then %> ifacebadge-active<% end %>"><%=net:name()%>:
+			<%
+				local nempty = true
+				for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
+					nempty = false
+			 %>
+				<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+			<% end %>
+			<% if nempty then %><em><%:(empty)%></em><% end %>
+			</span>
+		<%- end end -%>
+		<%- if zempty then %><em><%:(empty)%></em><% end -%>
+	</label>
+	&#160;&#8658;&#160;
+	<% for _, fwd in ipairs(zone:get_forwardings_by("src")) do
+		fz = fwd:dest_zone()
+		empty = false %>
+		<label class="zonebadge" style="background-color:<%=fz:get_color()%>">
+			<strong><%=fz:name()%></strong>
+		</label>&#160;
+	<% end %>
+	<% if empty then %>
+		<label class="zonebadge zonebadge-empty">
+			<strong><%=zone:forward():upper()%></strong>
+		</label>
+	<% end %>
+</div>
+<% end %>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zonelist.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zonelist.htm
new file mode 100644
index 00000000..7973437f
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/firewall_zonelist.htm
@@ -0,0 +1,89 @@
+<%+cbi/valueheader%>
+
+<%-
+	local utl = require "luci.util"
+	local fwm = require "luci.model.firewall".init()
+	local nwm = require "luci.model.network".init()
+
+	local zone, net, iface
+	local zones = fwm:get_zones()
+	local value = self:formvalue(section)
+	if not value or value == "-" then
+		value = self:cfgvalue(section) or self.default
+	end
+
+	local selected = false
+	local checked = { }
+
+	for value in utl.imatch(value) do
+		checked[value] = true
+	end
+
+	if not next(checked) then
+		checked[""] = true
+	end
+-%>
+
+<ul style="margin:0; list-style-type:none; text-align:left">
+	<% if self.allowlocal then %>
+	<li style="padding:0.5em">
+		<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "_empty") .. attr("name", cbid) .. attr("value", "") .. ifattr(checked[""], "checked", "checked")%> /> &#160;
+		<label<%=attr("for", cbid .. "_empty")%> style="background-color:<%=fwm.zone.get_color()%>" class="zonebadge">
+			<strong><%:Device%></strong>
+			<% if self.allowany and self.allowlocal then %>(<%:input%>)<% end %>
+		</label>
+	</li>
+	<% end %>
+	<% if self.allowany then %>
+	<li style="padding:0.5em">
+		<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "_any") .. attr("name", cbid) .. attr("value", "*") .. ifattr(checked["*"], "checked", "checked")%> /> &#160;
+		<label<%=attr("for", cbid .. "_any")%> style="background-color:<%=fwm.zone.get_color()%>" class="zonebadge">
+			<strong><%:Any zone%></strong>
+			<% if self.allowany and self.allowlocal then %>(<%:forward%>)<% end %>
+		</label>
+	</li>
+	<% end %>
+	<%
+		for _, zone in utl.spairs(zones, function(a,b) return (zones[a]:name() < zones[b]:name()) end) do
+			if zone:name() ~= self.exclude then
+				selected = selected or (value == zone:name())
+ 	%>
+	<li style="padding:0.5em">
+		<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "." .. zone:name()) .. attr("name", cbid) .. attr("value", zone:name()) .. ifattr(checked[zone:name()], "checked", "checked")%> /> &#160;
+		<label<%=attr("for", cbid .. "." .. zone:name())%> style="background-color:<%=zone:get_color()%>" class="zonebadge">
+			<strong><%=zone:name()%>:</strong>
+			<%
+				local zempty = true
+				for _, net in ipairs(zone:get_networks()) do
+					net = nwm:get_network(net)
+					if net then
+						zempty = false
+			%>
+				<span class="ifacebadge<% if net:name() == self.network then %> ifacebadge-active<% end %>"><%=net:name()%>:
+				<%
+					local nempty = true
+					for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
+						nempty = false
+				 %>
+					<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+				<% end %>
+				<% if nempty then %><em><%:(empty)%></em><% end %>
+				</span>
+			<% end end %>
+			<% if zempty then %><em><%:(empty)%></em><% end %>
+		</label>
+	</li>
+	<% end end %>
+
+	<% if self.widget ~= "checkbox" and not self.nocreate then %>
+	<li style="padding:0.5em">
+		<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not selected, "checked", "checked")%> /> &#160;
+		<div onclick="document.getElementById('<%=cbid%>_new').checked=true" class="zonebadge" style="background-color:<%=fwm.zone.get_color()%>">
+			<em><%:unspecified -or- create:%>&#160;</em>
+			<input type="text"<%=attr("name", cbid .. ".newzone") .. ifattr(not selected, "value", luci.http.formvalue(cbid .. ".newzone") or self.default)%> onfocus="document.getElementById('<%=cbid%>_new').checked=true" />
+		</div>
+	</li>
+	<% end %>
+</ul>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/footer.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/footer.htm
new file mode 100644
index 00000000..115250a8
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/footer.htm
@@ -0,0 +1,26 @@
+	<%- if pageaction then -%>
+	<div class="cbi-page-actions">
+		<% if redirect then %>
+		<div style="float:left">
+			<input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" />
+		</div>
+		<% end %>
+
+		<% if flow.skip then %>
+			<input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:Skip%>" />
+		<% end %>
+		<% if not autoapply and not flow.hideapplybtn then %>
+			<input class="cbi-button cbi-button-apply" type="submit" name="cbi.apply" value="<%:Save & Apply%>" />
+		<% end %>
+		<% if not flow.hidesavebtn then %>
+			<input class="cbi-button cbi-button-save" type="submit" value="<%:Save%>" />
+		<% end %>
+		<% if not flow.hideresetbtn then %>
+			<input class="cbi-button cbi-button-reset" type="button" value="<%:Reset%>" onclick="location.href='<%=REQUEST_URI%>'" />
+		<% end %>
+
+		<script type="text/javascript">cbi_d_update();</script>
+	</div>
+	<%- end -%>
+</form>
+<%+footer%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/full_valuefooter.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/full_valuefooter.htm
new file mode 100644
index 00000000..4876fbcc
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/full_valuefooter.htm
@@ -0,0 +1,59 @@
+		<% if self.description and #self.description > 0 then -%>
+			<% if not luci.util.instanceof(self, luci.cbi.DynamicList) and (not luci.util.instanceof(self, luci.cbi.Flag) or self.orientation == "horizontal") then -%>
+				<br />
+			<%- end %>
+			<div class="cbi-value-description">
+				<span class="cbi-value-helpicon"><img src="<%=resource%>/cbi/help.gif" alt="<%:help%>" /></span>
+				<%=self.description%>
+			</div>
+		<%- end %>
+	<%- if self.title and #self.title > 0 then -%>
+	</div>
+	<%- end -%>
+</div>
+
+
+<% if #self.deps > 0 or #self.subdeps > 0 then -%>
+	<script type="text/javascript" id="cbip-<%=self.config.."-"..section.."-"..self.option%>">
+		<% for j, d in ipairs(self.subdeps) do -%>
+			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option..d.add%>", {
+		<%-
+			for k,v in pairs(d.deps) do
+				local depk
+				if k:find("!", 1, true) then
+					depk = string.format('"%s"', k)
+				elseif k:find(".", 1, true) then
+					depk = string.format('"cbid.%s"', k)
+				else
+					depk = string.format('"cbid.%s.%s.%s"', self.config, section, k)
+				end
+		-%>
+			<%-= depk .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+			}, "cbip-<%=self.config.."-"..section.."-"..self.option..d.add%>");
+		<%- end %>
+		<% for j, d in ipairs(self.deps) do -%>
+			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option..d.add%>", {
+		<%-
+			for k,v in pairs(d.deps) do
+				local depk
+				if k:find("!", 1, true) then
+					depk = string.format('"%s"', k)
+				elseif k:find(".", 1, true) then
+					depk = string.format('"cbid.%s"', k)
+				else
+					depk = string.format('"cbid.%s.%s.%s"', self.config, section, k)
+				end
+		-%>
+			<%-= depk .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+			}, "cbip-<%=self.config.."-"..section.."-"..self.option..d.add%>");
+		<%- end %>
+	</script>
+<%- end %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/full_valueheader.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/full_valueheader.htm
new file mode 100644
index 00000000..aaf08547
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/full_valueheader.htm
@@ -0,0 +1,9 @@
+<div class="cbi-value<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.last_child then %> cbi-value-last<% end %>" id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
+	<%- if self.title and #self.title > 0 then -%>
+	<label class="cbi-value-title"<%= attr("for", cbid) %>>
+	<%- if self.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=self.titleref%>"><%- end -%>
+		<%-=self.title-%>
+	<%- if self.titleref then -%></a><%- end -%>
+	</label>
+		<div class="cbi-value-field">
+	<%- end -%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/fvalue.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/fvalue.htm
new file mode 100644
index 00000000..a1e0808e
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/fvalue.htm
@@ -0,0 +1,9 @@
+<%+cbi/valueheader%>
+	<input type="hidden" value="1"<%=
+		attr("name", "cbi.cbe." .. self.config .. "." .. section .. "." .. self.option)
+	%> />
+	<input class="cbi-input-checkbox" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="checkbox"<%=
+		attr("id", cbid) .. attr("name", cbid) .. attr("value", self.enabled or 1) ..
+		ifattr((self:cfgvalue(section) or self.default) == self.enabled, "checked", "checked")
+	%> />
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/header.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/header.htm
new file mode 100644
index 00000000..2bddaba6
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/header.htm
@@ -0,0 +1,7 @@
+<%+header%>
+<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')">
+	<div>
+		<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+		<input type="hidden" name="cbi.submit" value="1" />
+		<input type="submit" value="<%:Save%>" class="hidden" />
+	</div>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/lvalue.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/lvalue.htm
new file mode 100644
index 00000000..8cc086db
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/lvalue.htm
@@ -0,0 +1,18 @@
+<%+cbi/valueheader%>
+<% if self.widget == "select" then %>
+	<select class="cbi-input-select" onchange="cbi_d_update(this.id)"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self.size, "size") %>>
+	<% for i, key in pairs(self.keylist) do -%>
+		<option id="cbi-<%=self.config.."-"..section.."-"..self.option.."-"..key%>"<%= attr("value", key) .. ifattr(tostring(self:cfgvalue(section) or self.default) == key, "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
+	<%- end %>
+	</select>
+<% elseif self.widget == "radio" then
+	local c = 0
+	for i, key in pairs(self.keylist) do
+	c = c + 1
+%>
+	<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr((self:cfgvalue(section) or self.default) == key, "checked", "checked") %> />
+	<label<%= attr("for", cbid..c) %>><%=self.vallist[i]%></label>
+<% if c == self.size then c = 0 %><% if self.orientation == "horizontal" then %>&#160;<% else %><br /><% end %>
+<% end end %>
+<% end %>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/map.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/map.htm
new file mode 100644
index 00000000..053220d1
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/map.htm
@@ -0,0 +1,13 @@
+<%- if firstmap and messages then local msg; for _, msg in ipairs(messages) do -%>
+	<div class="errorbox"><%=pcdata(msg)%></div>
+<%- end end -%>
+
+<%-+cbi/apply_xhr-%>
+
+<div class="cbi-map" id="cbi-<%=self.config%>">
+	<% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
+	<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
+	<%- if firstmap and applymap then cbi_apply_xhr(self.config, parsechain, redirect) end -%>
+	<%- self:render_children() %>
+	<br />
+</div>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/mvalue.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/mvalue.htm
new file mode 100644
index 00000000..6a0b3881
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/mvalue.htm
@@ -0,0 +1,19 @@
+<% local v = self:valuelist(section) or {} -%>
+<%+cbi/valueheader%>
+<% if self.widget == "select" then %>
+	<select class="cbi-input-select" multiple="multiple" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. ifattr(self.size, "size") %>>
+	<% for i, key in pairs(self.keylist) do -%>
+		<option<%= attr("value", key) .. ifattr(luci.util.contains(v, key), "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
+	<%- end %>
+	</select>
+<% elseif self.widget == "checkbox" then
+	local c = 0;
+	for i, key in pairs(self.keylist) do
+	c = c + 1
+%>
+	<input class="cbi-input-checkbox" type="checkbox" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr(luci.util.contains(v, key), "checked", "checked") %> />
+	<label<%= attr("for", cbid..c) %>><%=self.vallist[i]%></label><br />
+<% if c == self.size then c = 0 %><br />
+<% end end %>
+<% end %>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/network_ifacelist.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/network_ifacelist.htm
new file mode 100644
index 00000000..643d849a
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/network_ifacelist.htm
@@ -0,0 +1,81 @@
+<%+cbi/valueheader%>
+
+<%-
+	local utl = require "luci.util"
+	local net = require "luci.model.network".init()
+	local cbeid = luci.cbi.FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option
+
+	local iface
+	local ifaces = net:get_interfaces()
+	local value
+
+	if self.map:formvalue(cbeid) == "1" then
+		value = self:formvalue(section) or self.default or ""
+	else
+		value = self:cfgvalue(section) or self.default
+	end
+
+	local checked = { }
+
+	if value then
+		for value in utl.imatch(value) do
+			checked[value] = true
+		end
+	else
+		local n = self.network and net:get_network(self.network)
+		if n then
+			local i
+			for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do
+				checked[i:name()] = true
+			end
+		end
+	end
+-%>
+
+<input type="hidden" name="<%=cbeid%>" value="1" />
+<ul style="margin:0; list-style-type:none">
+	<% for _, iface in ipairs(ifaces) do
+	     local link = iface:adminlink()
+         if (not self.nobridges  or not iface:is_bridge()) and
+		    (not self.noinactive or iface:is_up()) and
+		    iface:name() ~= self.exclude
+		 then %>
+	<li>
+		<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
+			attr("type", self.widget or "radio") ..
+			attr("id", cbid .. "." .. iface:name()) ..
+			attr("name", cbid) .. attr("value", iface:name()) ..
+			ifattr(checked[iface:name()], "checked", "checked")
+		%> /> &#160;
+		<label<%=attr("for", cbid .. "." .. iface:name())%>>
+			<% if link then -%><a href="<%=link%>"><% end -%>
+			<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+			<% if link then -%></a><% end -%>
+			<%=pcdata(iface:get_i18n())%>
+			<% local ns = iface:get_networks(); if #ns > 0 then %>(
+				<%- local i, n; for i, n in ipairs(ns) do -%>
+					<%-= (i>1) and ', ' -%>
+					<a href="<%=n:adminlink()%>"><%=n:name()%></a>
+				<%- end -%>
+			)<% end %>
+		</label>
+	</li>
+	<% end end %>
+	<% if not self.nocreate then %>
+	<li>
+		<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
+			attr("type", self.widget or "radio") ..
+			attr("id", cbid .. "_custom") ..
+			attr("name", cbid) ..
+			attr("value", " ")
+		%> /> &#160;
+		<label<%=attr("for", cbid .. "_custom")%>>
+			<img title="<%:Custom Interface%>" style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/ethernet_disabled.png" />
+			<%:Custom Interface%>:
+		</label>
+		<input type="text" style="width:50px" onfocus="document.getElementById('<%=cbid%>_custom').checked=true" onblur="var x=document.getElementById('<%=cbid%>_custom'); x.value=this.value; x.checked=true" />
+	</li>
+	<% end %>
+</ul>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/network_netinfo.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/network_netinfo.htm
new file mode 100644
index 00000000..4fd84112
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/network_netinfo.htm
@@ -0,0 +1,27 @@
+<%+cbi/valueheader%>
+
+<%-
+	local value = self:formvalue(section)
+	if not value or value == "-" then
+		value = self:cfgvalue(section) or self.default
+	end
+
+	local nwm = require "luci.model.network".init()
+	local net = nwm:get_network(value)
+-%>
+
+<% if net then %>
+<span class="ifacebadge"><%=net:name()%>:
+	<%
+		local empty = true
+		for _, iface in ipairs(net:get_interfaces() or { net:get_interface() }) do
+			if not iface:is_bridge() then
+				empty = false
+	 %>
+		<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+	<% end end %>
+	<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
+</span>
+<% end %>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/network_netlist.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/network_netlist.htm
new file mode 100644
index 00000000..7e23d149
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/network_netlist.htm
@@ -0,0 +1,81 @@
+<%+cbi/valueheader%>
+
+<%-
+	local utl = require "luci.util"
+	local nwm = require "luci.model.network".init()
+
+	local net, iface
+	local networks = nwm:get_networks()
+	local value = self:formvalue(section)
+
+	self.cast = nil
+
+	if not value or value == "-" then
+		value = self:cfgvalue(section) or self.default
+	end
+
+	local checked = { }
+	for value in utl.imatch(value) do
+		checked[value] = true
+	end
+-%>
+
+<ul style="margin:0; list-style-type:none; text-align:left">
+	<% for _, net in ipairs(networks) do
+	       if (net:name() ~= "loopback") and
+		      (net:name() ~= self.exclude) and
+		      (not self.novirtual or not net:is_virtual())
+		   then %>
+	<li style="padding:0.25em 0">
+		<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
+			attr("type", self.widget or "radio") ..
+			attr("id", cbid .. "." .. net:name()) ..
+			attr("name", cbid) .. attr("value", net:name()) ..
+			ifattr(checked[net:name()], "checked", "checked")
+		%> /> &#160;
+		<label<%=attr("for", cbid .. "." .. net:name())%>>
+			<span class="ifacebadge"><%=net:name()%>:
+				<%
+					local empty = true
+					for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
+						if not iface:is_bridge() then
+							empty = false
+				 %>
+					<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+				<% end end %>
+				<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
+			</span>
+		</label>
+	</li>
+	<% end end %>
+
+	<% if not self.nocreate then %>
+	<li style="padding:0.25em 0">
+		<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not value and self.widget ~= "checkbox", "checked", "checked")%> /> &#160;
+		<div style="padding:0.5em; display:inline">
+			<label<%=attr("for", cbid .. "_new")%>><em>
+				<%- if self.widget == "checkbox" then -%>
+					<%:create:%>
+				<%- else -%>
+					<%:unspecified -or- create:%>
+				<%- end -%>&#160;</em></label>
+			<input style="width:6em" type="text"<%=attr("name", cbid .. ".newnet")%> onfocus="document.getElementById('<%=cbid%>_new').checked=true" />
+		</div>
+	</li>
+	<% elseif self.widget ~= "checkbox" and self.unspecified then %>
+	<li style="padding:0.25em 0">
+		<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
+			attr("type", self.widget or "radio") ..
+			attr("id", cbid .. "_uns") ..
+			attr("name", cbid) ..
+			attr("value", "") ..
+			ifattr(not value or #value == 0, "checked", "checked")
+		%> /> &#160;
+		<div style="padding:0.5em; display:inline">
+			<label<%=attr("for", cbid .. "_uns")%>><em><%:unspecified%></em></label>
+		</div>
+	</li>
+	<% end %>
+</ul>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/nsection.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/nsection.htm
new file mode 100644
index 00000000..32e73e74
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/nsection.htm
@@ -0,0 +1,31 @@
+<% if self:cfgvalue(self.section) then section = self.section %>
+	<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=section%>">
+		<% if self.title and #self.title > 0 then -%>
+			<legend><%=self.title%></legend>
+		<%- end %>
+		<% if self.description and #self.description > 0 then -%>
+			<div class="cbi-section-descr"><%=self.description%></div>
+		<%- end %>
+		<% if self.addremove then -%>
+			<div class="cbi-section-remove right">
+				<input type="submit" class="cbi-button" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:Delete%>" />
+			</div>
+		<%- end %>
+		<%+cbi/tabmenu%>
+		<div class="cbi-section-node<% if self.tabs then %> cbi-section-node-tabbed<% end %>" id="cbi-<%=self.config%>-<%=section%>">
+			<%+cbi/ucisection%>
+		</div>
+		<br />
+	</fieldset>
+<% elseif self.addremove then %>
+	<% if self.template_addremove then include(self.template_addremove) else -%>
+	<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>">
+		<% if self.title and #self.title > 0 then -%>
+			<legend><%=self.title%></legend>
+		<%- end %>
+		<div class="cbi-section-descr"><%=self.description%></div>
+		<input type="submit" class="cbi-button cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:Add%>" />
+	</fieldset>
+	<%- end %>
+<% end %>
+<!-- /nsection -->
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/nullsection.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/nullsection.htm
new file mode 100644
index 00000000..bd489509
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/nullsection.htm
@@ -0,0 +1,38 @@
+<fieldset class="cbi-section">
+	<% if self.title and #self.title > 0 then -%>
+		<legend><%=self.title%></legend>
+	<%- end %>
+	<% if self.description and #self.description > 0 then -%>
+		<div class="cbi-section-descr"><%=self.description%></div>
+	<%- end %>
+	<div class="cbi-section-node" id="cbi-<%=self.config%>-<%=tostring(self):sub(8)%>">
+		<div>
+			<% self:render_children(1, scope or {}) %>
+		</div>
+		<% if self.error and self.error[1] then -%>
+			<div class="cbi-section-error">
+				<ul><% for _, e in ipairs(self.error[1]) do -%>
+					<li>
+						<%- if e == "invalid" then -%>
+							<%:One or more fields contain invalid values!%>
+						<%- elseif e == "missing" then -%>
+							<%:One or more required fields have no value!%>
+						<%- else -%>
+							<%=pcdata(e)%>
+						<%- end -%>
+					</li>
+				<%- end %></ul>
+			</div>
+		<%- end %>
+	</div>
+	<br />
+</fieldset>
+<%-
+	if type(self.hidden) == "table" then
+		for k, v in pairs(self.hidden) do
+-%>
+	<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
+<%-
+		end
+	end
+%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/simpleform.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/simpleform.htm
new file mode 100644
index 00000000..5216cd50
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/simpleform.htm
@@ -0,0 +1,57 @@
+<% if not self.embedded then %>
+<form method="post" enctype="multipart/form-data" action="<%=REQUEST_URI%>">
+	<div>
+		<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+		<input type="hidden" name="cbi.submit" value="1" />
+	</div>
+<% end %>
+	<div class="cbi-map" id="cbi-<%=self.config%>">
+		<% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
+		<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
+		<% self:render_children() %>
+		<br />
+	</div>
+<%- if self.message then %>
+	<div><%=self.message%></div>
+<%- end %>
+<%- if self.errmessage then %>
+	<div class="error"><%=self.errmessage%></div>
+<%- end %>
+<% if not self.embedded then %>
+	<div class="cbi-page-actions">
+<%-
+	if type(self.hidden) == "table" then
+		for k, v in pairs(self.hidden) do
+-%>
+	<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
+<%-
+		end
+	end
+%>
+<% if redirect then %>
+	<div style="float:left">
+		<input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" />
+	</div>
+<% end %>
+<%- if self.flow and self.flow.skip then %>
+	<input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:Skip%>" />
+<% end %>
+<%- if self.submit ~= false then %>
+	<input class="cbi-button cbi-button-save" type="submit" value="
+		<%- if not self.submit then -%><%-:Submit-%><%-else-%><%=self.submit%><%end-%>
+	" />
+<% end %>
+<%- if self.reset ~= false then %>
+	<input class="cbi-button cbi-button-reset" type="reset" value="
+		<%- if not self.reset then -%><%-:Reset-%><%-else-%><%=self.reset%><%end-%>
+	" />
+<% end %>
+<%- if self.cancel ~= false and self.on_cancel then %>
+	<input class="cbi-button cbi-button-reset" type="submit" name="cbi.cancel" value="
+		<%- if not self.cancel then -%><%-:Cancel-%><%-else-%><%=self.cancel%><%end-%>
+	" />
+<% end %>
+		<script type="text/javascript">cbi_d_update();</script>
+	</div>
+</form>
+<% end %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/tabcontainer.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/tabcontainer.htm
new file mode 100644
index 00000000..38c435d6
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/tabcontainer.htm
@@ -0,0 +1,7 @@
+<% for tab, data in pairs(self.tabs) do %>
+	<div class="cbi-tabcontainer" id="container.<%=self.config%>.<%=section%>.<%=tab%>"<% if tab ~= self.selected_tab then %> style="display:none"<% end %>>
+		<% if data.description then %><div class="cbi-tab-descr"><%=data.description%></div><% end %>
+		<% self:render_tab(tab, section, scope or {}) %>
+	</div>
+	<script type="text/javascript">cbi_t_add('<%=self.config%>.<%=section%>', '<%=tab%>')</script>
+<% end %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/tabmenu.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/tabmenu.htm
new file mode 100644
index 00000000..b96ac9ce
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/tabmenu.htm
@@ -0,0 +1,13 @@
+<%- if self.tabs then %>
+	<ul class="cbi-tabmenu">
+	<%- self.selected_tab = luci.http.formvalue("tab." .. self.config .. "." .. section) %>
+	<%- for _, tab in ipairs(self.tab_names) do if #self.tabs[tab].childs > 0 then %>
+		<script type="text/javascript">cbi_c['container.<%=self.config%>.<%=section%>.<%=tab%>'] = <%=#self.tabs[tab].childs%>;</script>
+		<%- if not self.selected_tab then self.selected_tab = tab end %>
+		<li id="tab.<%=self.config%>.<%=section%>.<%=tab%>" class="cbi-tab<%=(tab == self.selected_tab) and '' or '-disabled'%>">
+			<a onclick="this.blur(); return cbi_t_switch('<%=self.config%>.<%=section%>', '<%=tab%>')" href="<%=REQUEST_URI%>?tab.<%=self.config%>.<%=section%>=<%=tab%>"><%=self.tabs[tab].title%></a>
+			<% if tab == self.selected_tab then %><input type="hidden" id="tab.<%=self.config%>.<%=section%>" name="tab.<%=self.config%>.<%=section%>" value="<%=tab%>" /><% end %>
+		</li>
+	<% end end -%>
+	</ul>
+<% end -%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/tblsection.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/tblsection.htm
new file mode 100644
index 00000000..d9287911
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/tblsection.htm
@@ -0,0 +1,146 @@
+<%-
+local rowcnt = 1
+function rowstyle()
+	rowcnt = rowcnt + 1
+	return (rowcnt % 2) + 1
+end
+
+function width(o)
+	if o.width then
+		if type(o.width) == 'number' then
+			return ' style="width:%dpx"' % o.width
+		end
+		return ' style="width:%s"' % o.width
+	end
+	return ''
+end
+-%>
+
+<!-- tblsection -->
+<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+	<% if self.title and #self.title > 0 then -%>
+		<legend><%=self.title%></legend>
+	<%- end %>
+	<%- if self.sortable then -%>
+		<input type="hidden" id="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" name="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" value="" />
+	<%- end -%>
+	<div class="cbi-section-descr"><%=self.description%></div>
+	<div class="cbi-section-node">
+		<%- local count = 0 -%>
+		<table class="cbi-section-table">
+			<tr class="cbi-section-table-titles">
+			<%- if not self.anonymous then -%>
+				<%- if self.sectionhead then -%>
+					<th class="cbi-section-table-cell"><%=self.sectionhead%></th>
+				<%- else -%>
+					<th>&#160;</th>
+				<%- end -%>
+			<%- end -%>
+			<%- for i, k in pairs(self.children) do if not k.optional then -%>
+				<th class="cbi-section-table-cell"<%=width(k)%>>
+				<%- if k.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
+					<%-=k.title-%>
+				<%- if k.titleref then -%></a><%- end -%>
+				</th>
+			<%- count = count + 1; end; end; if self.sortable then -%>
+				<th class="cbi-section-table-cell"><%:Sort%></th>
+			<%- end; if self.extedit or self.addremove then -%>
+				<th class="cbi-section-table-cell">&#160;</th>
+			<%- count = count + 1; end -%>
+			</tr>
+			<tr class="cbi-section-table-descr">
+			<%- if not self.anonymous then -%>
+				<%- if self.sectiondesc then -%>
+					<th class="cbi-section-table-cell"><%=self.sectiondesc%></th>
+				<%- else -%>
+					<th></th>
+				<%- end -%>
+			<%- end -%>
+			<%- for i, k in pairs(self.children) do if not k.optional then -%>
+				<th class="cbi-section-table-cell"<%=width(k)%>><%=k.description%></th>
+			<%- end; end; if self.sortable then -%>
+				<th class="cbi-section-table-cell"></th>
+			<%- end; if self.extedit or self.addremove then -%>
+				<th class="cbi-section-table-cell"></th>
+			<%- end -%>
+			</tr>
+			<%- local isempty = true
+			    for i, k in ipairs(self:cfgsections()) do
+					section = k
+					isempty = false
+					scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" }
+			-%>
+			<tr class="cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>">
+				<% if not self.anonymous then -%>
+					<th><h3><%=(type(self.sectiontitle) == "function") and self:sectiontitle(section) or k%></h3></th>
+				<%- end %>
+
+
+				<%-
+					for k, node in ipairs(self.children) do
+						if not node.optional then
+							node:render(section, scope or {})
+						end
+					end
+				-%>
+
+				<%- if self.sortable then -%>
+					<td class="cbi-section-table-cell">
+						<input class="cbi-button cbi-button-up" type="button" value=""  onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" alt="<%:Move up%>" title="<%:Move up%>" />
+						<input class="cbi-button cbi-button-down" type="button" value=""  onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" alt="<%:Move down%>" title="<%:Move down%>" />
+					</td>
+				<%- end -%>
+
+				<%- if self.extedit or self.addremove then -%>
+					<td class="cbi-section-table-cell">
+						<%- if self.extedit then -%>
+							<input class="cbi-button cbi-button-edit" type="button" value="<%:Edit%>"
+							<%- if type(self.extedit) == "string" then
+							%> onclick="location.href='<%=self.extedit:format(section)%>'"
+							<%- elseif type(self.extedit) == "function" then
+							%> onclick="location.href='<%=self:extedit(section)%>'"
+							<%- end 
+							%> alt="<%:Edit%>" title="<%:Edit%>" />
+						<%- end; if self.addremove then %>
+							<input class="cbi-button cbi-button-remove" type="submit" value="<%:Delete%>"  onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" />
+						<%- end -%>
+					</td>
+				<%- end -%>
+			</tr>
+			<%- end -%>
+
+			<%- if isempty then -%>
+			<tr class="cbi-section-table-row">
+				<td colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></td>
+			</tr>
+			<%- end -%>
+		</table>
+
+		<% if self.error then %>
+			<div class="cbi-section-error">
+				<ul><% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%>
+					<li><%=pcdata(e):gsub("\n","<br />")%></li>
+				<%- end end %></ul>
+			</div>
+		<% end %>
+
+		<%- if self.addremove then -%>
+			<% if self.template_addremove then include(self.template_addremove) else -%>
+			<div class="cbi-section-create cbi-tblsection-create">
+				<% if self.anonymous then %>
+					<input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" title="<%:Add%>" />
+				<% else %>
+					<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
+					<input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" />
+					<script type="text/javascript">cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname');</script>
+					<input class="cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" />
+					<% if self.invalid_cts then -%>
+						<br /><%:Invalid%></div>
+					<%- end %>
+				<% end %>
+			</div>
+			<%- end %>
+		<%- end -%>
+	</div>
+</fieldset>
+<!-- /tblsection -->
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/tsection.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/tsection.htm
new file mode 100644
index 00000000..087548bf
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/tsection.htm
@@ -0,0 +1,48 @@
+<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+	<% if self.title and #self.title > 0 then -%>
+		<legend><%=self.title%></legend>
+	<%- end %>
+	<div class="cbi-section-descr"><%=self.description%></div>
+	<% local isempty = true for i, k in ipairs(self:cfgsections()) do -%>
+		<% if self.addremove then -%>
+			<div class="cbi-section-remove right">
+				<input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" onclick="this.form.cbi_state='del-section'; return true" value="<%:Delete%>" class="cbi-button" />
+			</div>
+		<%- end %>
+
+		<%- section = k; isempty = false -%>
+
+		<% if not self.anonymous then -%>
+			<h3><%=section:upper()%></h3>
+		<%- end %>
+
+		<%+cbi/tabmenu%>
+
+		<fieldset class="cbi-section-node<% if self.tabs then %> cbi-section-node-tabbed<% end %>" id="cbi-<%=self.config%>-<%=section%>">
+			<%+cbi/ucisection%>
+		</fieldset>
+		<br />
+	<%- end %>
+
+	<% if isempty then -%>
+		<em><%:This section contains no values yet%><br /><br /></em>
+	<%- end %>
+
+	<% if self.addremove then -%>
+		<% if self.template_addremove then include(self.template_addremove) else -%>
+		<div class="cbi-section-create">
+			<% if self.anonymous then -%>
+				<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+			<%- else -%>
+				<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
+				<input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" />
+				<script type="text/javascript">cbi_validate_field('cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>', true, 'uciname');</script>
+				<input type="submit" class="cbi-button cbi-button-add" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" />
+				<% if self.invalid_cts then -%>
+					<br /><%:Invalid%></div>
+				<%- end %>
+			<%- end %>
+		</div>
+		<%- end %>
+	<%- end %>
+</fieldset>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/tvalue.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/tvalue.htm
new file mode 100644
index 00000000..4841c370
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/tvalue.htm
@@ -0,0 +1,5 @@
+<%+cbi/valueheader%>
+	<textarea class="cbi-input-textarea" <% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> onchange="cbi_d_update(this.id)"<%= attr("name", cbid) .. attr("id", cbid) .. ifattr(self.rows, "rows") .. ifattr(self.wrap, "wrap")  .. ifattr(self.readonly, "readonly") %>>
+	<%-=pcdata(self:cfgvalue(section))-%>
+	</textarea>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/ucisection.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/ucisection.htm
new file mode 100644
index 00000000..3b69f12f
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/ucisection.htm
@@ -0,0 +1,75 @@
+<%-
+	if type(self.hidden) == "table" then
+		for k, v in pairs(self.hidden) do
+-%>
+	<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
+<%-
+		end
+	end
+%>
+
+<% if self.tabs then %>
+	<%+cbi/tabcontainer%>
+<% else %>
+	<% self:render_children(section, scope or {}) %>
+<% end %>
+
+<% if self.error and self.error[section] then -%>
+	<div class="cbi-section-error">
+		<ul><% for _, e in ipairs(self.error[section]) do -%>
+			<li>
+				<%- if e == "invalid" then -%>
+					<%:One or more fields contain invalid values!%>
+				<%- elseif e == "missing" then -%>
+					<%:One or more required fields have no value!%>
+				<%- else -%>
+					<%=pcdata(e)%>
+				<%- end -%>
+			</li>
+		<%- end %></ul>
+	</div>
+<%- end %>
+
+<% if self.optionals[section] and #self.optionals[section] > 0 or self.dynamic then %>
+	<div class="cbi-optionals">
+		<% if self.dynamic then %>
+			<input type="text" id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>" />
+			<% if self.optionals[section] and #self.optionals[section] > 0 then %>
+			<script type="text/javascript">
+				cbi_combobox_init('cbi.opt.<%=self.config%>.<%=section%>', {
+				<%-
+					for i, val in pairs(self.optionals[section]) do
+				-%>
+					<%-=string.format("%q", val.option) .. ":" .. string.format("%q", striptags(val.title))-%>
+					<%-if next(self.optionals[section], i) then-%>,<%-end-%>
+				<%-
+					end
+				-%>
+				}, '', '<%-: -- custom -- -%>');
+			</script>
+			<% end %>
+		<% else %>
+		<select id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>">
+			<option><%: -- Additional Field -- %></option>
+			<% for key, val in pairs(self.optionals[section]) do -%>
+				<option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=striptags(val.title)%></option>
+			<%- end %>
+		</select>
+		<script type="text/javascript"><% for key, val in pairs(self.optionals[section]) do %>
+			<% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do -%>
+			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..val.option..d.add%>", {
+		<%-
+			for k,v in pairs(d.deps) do
+		-%>
+			<%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+			});
+		<%- end %><% end %>
+		<% end %></script>
+	<% end %>
+		<input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:Add%>" />
+	</div>
+<% end %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/upload.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/upload.htm
new file mode 100644
index 00000000..77709341
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/upload.htm
@@ -0,0 +1,14 @@
+<%
+	local t = require("luci.tools.webadmin")
+	local v = self:cfgvalue(section)
+	local s = v and nixio.fs.stat(v)
+-%>
+<%+cbi/valueheader%>
+	<% if s then %>
+		<%:Uploaded File%> (<%=t.byte_format(s.size)%>)
+		<input type="hidden"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
+		<input class="cbi-button cbi-input-image" type="image" value="<%:Replace entry%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" />
+	<% else %>
+		<input class="cbi-input-file" type="file"<%= attr("name", cbid) .. attr("id", cbid) %> />
+	<% end %>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/value.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/value.htm
new file mode 100644
index 00000000..d1a7bea5
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/value.htm
@@ -0,0 +1,35 @@
+<%+cbi/valueheader%>
+	<input type="<%=self.password and 'password" class="cbi-input-password' or 'text" class="cbi-input-text' %>" onchange="cbi_d_update(this.id)"<%=
+		attr("name", cbid) .. attr("id", cbid) .. attr("value", self:cfgvalue(section) or self.default) ..
+		ifattr(self.size, "size") .. ifattr(self.placeholder, "placeholder")
+	%> />
+	<% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
+	<% if #self.keylist > 0 or self.datatype then -%>
+	<script type="text/javascript">//<![CDATA[
+		<% if #self.keylist > 0 then -%>
+		cbi_combobox_init('<%=cbid%>', {
+		<%-
+			for i, k in ipairs(self.keylist) do
+		-%>
+			<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>
+			<%-if i<#self.keylist then-%>,<%-end-%>
+		<%-
+			end
+		-%>
+		}, '<%- if not self.rmempty and not self.optional then -%>
+			<%-: -- Please choose -- -%>
+			<%- elseif self.placeholder then -%>
+			<%-= pcdata(self.placeholder) -%>
+		<%- end -%>', '
+		<%- if self.combobox_manual then -%>
+			<%-=self.combobox_manual-%>
+		<%- else -%>
+			<%-: -- custom -- -%>
+		<%- end -%>');
+		<%- end %>
+		<% if self.datatype then -%>
+		cbi_validate_field('<%=cbid%>', <%=tostring((self.optional or self.rmempty) == true)%>, '<%=self.datatype:gsub("'", "\\'")%>');
+		<%- end %>
+	//]]></script>
+	<% end -%>
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/valuefooter.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/valuefooter.htm
new file mode 100644
index 00000000..805312e4
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/valuefooter.htm
@@ -0,0 +1 @@
+<% include( valuefooter or "cbi/full_valuefooter" ) %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/cbi/valueheader.htm b/trunk/package/luci/modules/base/luasrc/view/cbi/valueheader.htm
new file mode 100644
index 00000000..761a54ae
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/cbi/valueheader.htm
@@ -0,0 +1 @@
+<% include( valueheader or "cbi/full_valueheader" ) %>
diff --git a/trunk/package/luci/modules/base/luasrc/view/error404.htm b/trunk/package/luci/modules/base/luasrc/view/error404.htm
new file mode 100644
index 00000000..813604d1
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/error404.htm
@@ -0,0 +1,19 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content">404 <%:Not Found%></a></h2>
+<p><%:Sorry, the object you requested was not found.%></p>
+<tt><%:Unable to dispatch%>: <%=luci.http.request.env.PATH_INFO%></tt>
+<%+footer%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/error500.htm b/trunk/package/luci/modules/base/luasrc/view/error500.htm
new file mode 100644
index 00000000..14ba0410
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/error500.htm
@@ -0,0 +1,19 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content">500 <%:Internal Server Error%></a></h2>
+<p><%:Sorry, the server encountered an unexpected error.%></p>
+<pre class="error500"><%=message%></pre>
+<%+footer%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/footer.htm b/trunk/package/luci/modules/base/luasrc/view/footer.htm
new file mode 100644
index 00000000..6c6d2142
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/footer.htm
@@ -0,0 +1,15 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<% include("themes/" .. theme .. "/footer") %>
\ No newline at end of file
diff --git a/trunk/package/luci/modules/base/luasrc/view/header.htm b/trunk/package/luci/modules/base/luasrc/view/header.htm
new file mode 100644
index 00000000..77018b11
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/header.htm
@@ -0,0 +1,21 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%
+	if not luci.dispatcher.context.template_header_sent then
+		include("themes/" .. theme .. "/header")
+		luci.dispatcher.context.template_header_sent = true
+	end
+%>
diff --git a/trunk/package/luci/modules/base/luasrc/view/indexer.htm b/trunk/package/luci/modules/base/luasrc/view/indexer.htm
new file mode 100644
index 00000000..c6282897
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/indexer.htm
@@ -0,0 +1,15 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<% include("themes/" .. theme .. "/indexer") %>
\ No newline at end of file
diff --git a/trunk/package/luci/modules/base/luasrc/view/sysauth.htm b/trunk/package/luci/modules/base/luasrc/view/sysauth.htm
new file mode 100644
index 00000000..e87f26c2
--- /dev/null
+++ b/trunk/package/luci/modules/base/luasrc/view/sysauth.htm
@@ -0,0 +1,80 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+
+<%+header%>
+
+<form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
+	<div class="cbi-map">
+		<h2><a id="content" name="content"><%:Authorization Required%></a></h2>
+		<div class="cbi-map-descr">
+			<%:Please enter your username and password.%>
+			<%- if fuser then %>
+			<div class="error"><%:Invalid username and/or password! Please try again.%></div>
+			<br />
+			<% end -%>
+		</div>
+		<fieldset class="cbi-section"><fieldset class="cbi-section-node">
+			<div class="cbi-value">
+				<label class="cbi-value-title"><%:Username%></label>
+				<div class="cbi-value-field">
+					<input class="cbi-input-user" type="text" name="luci_username" value="<%=duser%>" />
+				</div>
+			</div>
+			<div class="cbi-value cbi-value-last">
+				<label class="cbi-value-title"><%:Password%></label>
+				<div class="cbi-value-field">
+					<input class="cbi-input-password" type="password" name="luci_password" />
+				</div>
+			</div>
+		</fieldset></fieldset>
+	</div>
+
+	<div>
+		<input type="submit" value="<%:Login%>" class="cbi-button cbi-button-apply" />
+		<input type="reset" value="<%:Reset%>" class="cbi-button cbi-button-reset" />
+	</div>
+</form>
+<script type="text/javascript">//<![CDATA[
+	var input = document.getElementsByName('luci_password')[0];
+	if (input)
+		input.focus();
+//]]></script>
+
+<%
+local uci  = require "luci.model.uci".cursor()
+local fs  = require "nixio.fs"
+local https_key = uci:get("uhttpd", "main", "key")
+local https_port = uci:get("uhttpd", "main", "listen_https")
+if type(https_port) == "table" then
+	https_port = https_port[1]
+end
+
+if https_port and fs.access(https_key) then
+	https_port = https_port:match("(%d+)$")
+%>
+
+<script type="text/javascript">//<![CDATA[
+	if (document.location.protocol != 'https:') {
+		var url = 'https://' + window.location.hostname + ':' + '<%=https_port%>' + window.location.pathname;
+		var img=new Image;
+		img.onload=function(){window.location = url};
+		img.src='https://' + window.location.hostname + ':' + '<%=https_port%>' + '<%=resource%>/cbi/up.gif?' + Math.random();;
+		setTimeout(function(){
+			img.src=''
+		}, 5000);
+	}
+//]]></script>
+
+<% end %>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/base/root/etc/config/luci b/trunk/package/luci/modules/base/root/etc/config/luci
new file mode 100644
index 00000000..f3956cd6
--- /dev/null
+++ b/trunk/package/luci/modules/base/root/etc/config/luci
@@ -0,0 +1,24 @@
+config core main
+	option lang auto
+	option mediaurlbase /luci-static/librecmc.org
+	option resourcebase /luci-static/resources
+	
+config extern flash_keep
+	option uci 		"/etc/config/"
+	option dropbear "/etc/dropbear/"
+	option openvpn	"/etc/openvpn/"
+	option passwd	"/etc/passwd"
+	option opkg		"/etc/opkg.conf"
+	option firewall	"/etc/firewall.user"
+	option uploads	"/lib/uci/upload/"
+	
+config internal languages
+	
+config internal sauth
+	option sessionpath "/tmp/luci-sessions"
+	option sessiontime 3600
+	
+config internal ccache
+	option enable 1
+		
+config internal themes
diff --git a/trunk/package/luci/modules/base/root/etc/config/ucitrack b/trunk/package/luci/modules/base/root/etc/config/ucitrack
new file mode 100644
index 00000000..cd3cb851
--- /dev/null
+++ b/trunk/package/luci/modules/base/root/etc/config/ucitrack
@@ -0,0 +1,57 @@
+config network
+	option init network
+	list affects dhcp
+	list affects radvd
+
+config wireless
+	list affects network
+
+config firewall
+	option init firewall
+	list affects luci-splash
+	list affects qos
+	list affects miniupnpd
+
+config olsr
+	option init olsrd
+
+config dhcp
+	option init dnsmasq
+	list affects odhcpd
+
+config odhcpd
+	option init odhcpd
+
+config dropbear
+	option init dropbear
+
+config httpd
+	option init httpd
+
+config fstab
+	option init fstab
+
+config qos
+	option init qos
+
+config system
+	option init led
+	list affects luci_statistics
+
+config luci_splash
+	option init luci_splash
+
+config upnpd
+	option init miniupnpd
+
+config ntpclient
+	option init ntpclient
+
+config samba
+	option init samba
+
+config tinyproxy
+	option init tinyproxy
+
+config 6relayd
+	option init 6relayd
diff --git a/trunk/package/luci/modules/base/root/sbin/luci-reload b/trunk/package/luci/modules/base/root/sbin/luci-reload
new file mode 100755
index 00000000..cc41da2b
--- /dev/null
+++ b/trunk/package/luci/modules/base/root/sbin/luci-reload
@@ -0,0 +1,45 @@
+#!/bin/sh
+. /lib/functions.sh
+
+apply_config() {
+	config_get init "$1" init
+	config_get exec "$1" exec
+	config_get test "$1" test
+
+	echo "$2" > "/var/run/luci-reload-status"
+
+	[ -n "$init" ] && reload_init "$2" "$init" "$test"
+	[ -n "$exec" ] && reload_exec "$2" "$exec" "$test"
+}
+
+reload_exec() {
+	local service="$1"
+	local ok="$3"
+	set -- $2
+	local cmd="$1"; shift
+	
+	[ -x "$cmd" ] && {
+		echo "Reloading $service... "
+		( $cmd "$@" ) 2>/dev/null 1>&2
+		[ -n "$ok" -a "$?" != "$ok" ] && echo '!!! Failed to reload' $service '!!!'
+	}
+}
+
+reload_init() {
+	[ -x /etc/init.d/$2 ] && /etc/init.d/$2 enabled && {
+		echo "Reloading $1... "
+		/etc/init.d/$2 reload >/dev/null 2>&1
+		[ -n "$3" -a "$?" != "$3" ] && echo '!!! Failed to reload' $1 '!!!'
+	}
+}
+
+lock "/var/run/luci-reload"
+
+config_load ucitrack
+
+for i in $*; do
+	config_foreach apply_config $i $i
+done
+
+rm -f "/var/run/luci-reload-status"
+lock -u "/var/run/luci-reload"
diff --git a/trunk/package/luci/modules/base/root/www/index.html b/trunk/package/luci/modules/base/root/www/index.html
new file mode 100644
index 00000000..0a7238b5
--- /dev/null
+++ b/trunk/package/luci/modules/base/root/www/index.html
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci" />
+</head>
+<body style="background-color: black">
+<a style="color: white; text-decoration: none" href="/cgi-bin/luci">LuCI - Lua Configuration Interface</a>
+</body>
+</html>
diff --git a/trunk/package/luci/modules/base/src/po2lmo.c b/trunk/package/luci/modules/base/src/po2lmo.c
new file mode 100644
index 00000000..0da792b6
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/po2lmo.c
@@ -0,0 +1,247 @@
+/*
+ * lmo - Lua Machine Objects - PO to LMO conversion tool
+ *
+ *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_lmo.h"
+
+static void die(const char *msg)
+{
+	fprintf(stderr, "Error: %s\n", msg);
+	exit(1);
+}
+
+static void usage(const char *name)
+{
+	fprintf(stderr, "Usage: %s input.po output.lmo\n", name);
+	exit(1);
+}
+
+static void print(const void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+	if( fwrite(ptr, size, nmemb, stream) == 0 )
+		die("Failed to write stdout");
+}
+
+static int extract_string(const char *src, char *dest, int len)
+{
+	int pos = 0;
+	int esc = 0;
+	int off = -1;
+
+	for( pos = 0; (pos < strlen(src)) && (pos < len); pos++ )
+	{
+		if( (off == -1) && (src[pos] == '"') )
+		{
+			off = pos + 1;
+		}
+		else if( off >= 0 )
+		{
+			if( esc == 1 )
+			{
+				switch (src[pos])
+				{
+				case '"':
+				case '\\':
+					off++;
+					break;
+				}
+				dest[pos-off] = src[pos];
+				esc = 0;
+			}
+			else if( src[pos] == '\\' )
+			{
+				dest[pos-off] = src[pos];
+				esc = 1;
+			}
+			else if( src[pos] != '"' )
+			{
+				dest[pos-off] = src[pos];
+			}
+			else
+			{
+				dest[pos-off] = '\0';
+				break;
+			}
+		}
+	}
+
+	return (off > -1) ? strlen(dest) : -1;
+}
+
+static int cmp_index(const void *a, const void *b)
+{
+	uint32_t x = ((const lmo_entry_t *)a)->key_id;
+	uint32_t y = ((const lmo_entry_t *)b)->key_id;
+
+	if (x < y)
+		return -1;
+	else if (x > y)
+		return 1;
+
+	return 0;
+}
+
+static void print_uint32(uint32_t x, FILE *out)
+{
+	uint32_t y = htonl(x);
+	print(&y, sizeof(uint32_t), 1, out);
+}
+
+static void print_index(void *array, int n, FILE *out)
+{
+	lmo_entry_t *e;
+
+	qsort(array, n, sizeof(*e), cmp_index);
+
+	for (e = array; n > 0; n--, e++)
+	{
+		print_uint32(e->key_id, out);
+		print_uint32(e->val_id, out);
+		print_uint32(e->offset, out);
+		print_uint32(e->length, out);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	char line[4096];
+	char key[4096];
+	char val[4096];
+	char tmp[4096];
+	int state  = 0;
+	int offset = 0;
+	int length = 0;
+	int n_entries = 0;
+	void *array = NULL;
+	lmo_entry_t *entry = NULL;
+	uint32_t key_id, val_id;
+
+	FILE *in;
+	FILE *out;
+
+	if( (argc != 3) || ((in = fopen(argv[1], "r")) == NULL) || ((out = fopen(argv[2], "w")) == NULL) )
+		usage(argv[0]);
+
+	memset(line, 0, sizeof(key));
+	memset(key, 0, sizeof(val));
+	memset(val, 0, sizeof(val));
+
+	while( (NULL != fgets(line, sizeof(line), in)) || (state >= 2 && feof(in)) )
+	{
+		if( state == 0 && strstr(line, "msgid \"") == line )
+		{
+			switch(extract_string(line, key, sizeof(key)))
+			{
+				case -1:
+					die("Syntax error in msgid");
+				case 0:
+					state = 1;
+					break;
+				default:
+					state = 2;
+			}
+		}
+		else if( state == 1 || state == 2 )
+		{
+			if( strstr(line, "msgstr \"") == line || state == 2 )
+			{
+				switch(extract_string(line, val, sizeof(val)))
+				{
+					case -1:
+						state = 4;
+						break;
+					default:
+						state = 3;
+				}
+			}
+			else
+			{
+				switch(extract_string(line, tmp, sizeof(tmp)))
+				{
+					case -1:
+						state = 2;
+						break;
+					default:
+						strcat(key, tmp);
+				}
+			}
+		}
+		else if( state == 3 )
+		{
+			switch(extract_string(line, tmp, sizeof(tmp)))
+			{
+				case -1:
+					state = 4;
+					break;
+				default:
+					strcat(val, tmp);
+			}
+		}
+
+		if( state == 4 )
+		{
+			if( strlen(key) > 0 && strlen(val) > 0 )
+			{
+				key_id = sfh_hash(key, strlen(key));
+				val_id = sfh_hash(val, strlen(val));
+
+				if( key_id != val_id )
+				{
+					n_entries++;
+					array = realloc(array, n_entries * sizeof(lmo_entry_t));
+					entry = (lmo_entry_t *)array + n_entries - 1;
+
+					if (!array)
+						die("Out of memory");
+
+					entry->key_id = key_id;
+					entry->val_id = val_id;
+					entry->offset = offset;
+					entry->length = strlen(val);
+
+					length = strlen(val) + ((4 - (strlen(val) % 4)) % 4);
+
+					print(val, length, 1, out);
+					offset += length;
+				}
+			}
+
+			state = 0;
+			memset(key, 0, sizeof(key));
+			memset(val, 0, sizeof(val));
+		}
+
+		memset(line, 0, sizeof(line));
+	}
+
+	print_index(array, n_entries, out);
+
+	if( offset > 0 )
+	{
+		print_uint32(offset, out);
+		fsync(fileno(out));
+		fclose(out);
+	}
+	else
+	{
+		fclose(out);
+		unlink(argv[2]);
+	}
+
+	fclose(in);
+	return(0);
+}
diff --git a/trunk/package/luci/modules/base/src/template_lmo.c b/trunk/package/luci/modules/base/src/template_lmo.c
new file mode 100644
index 00000000..27205a72
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_lmo.c
@@ -0,0 +1,328 @@
+/*
+ * lmo - Lua Machine Objects - Base functions
+ *
+ *   Copyright (C) 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_lmo.h"
+
+/*
+ * Hash function from http://www.azillionmonkeys.com/qed/hash.html
+ * Copyright (C) 2004-2008 by Paul Hsieh
+ */
+
+uint32_t sfh_hash(const char *data, int len)
+{
+	uint32_t hash = len, tmp;
+	int rem;
+
+	if (len <= 0 || data == NULL) return 0;
+
+	rem = len & 3;
+	len >>= 2;
+
+	/* Main loop */
+	for (;len > 0; len--) {
+		hash  += sfh_get16(data);
+		tmp    = (sfh_get16(data+2) << 11) ^ hash;
+		hash   = (hash << 16) ^ tmp;
+		data  += 2*sizeof(uint16_t);
+		hash  += hash >> 11;
+	}
+
+	/* Handle end cases */
+	switch (rem) {
+		case 3: hash += sfh_get16(data);
+			hash ^= hash << 16;
+			hash ^= data[sizeof(uint16_t)] << 18;
+			hash += hash >> 11;
+			break;
+		case 2: hash += sfh_get16(data);
+			hash ^= hash << 11;
+			hash += hash >> 17;
+			break;
+		case 1: hash += *data;
+			hash ^= hash << 10;
+			hash += hash >> 1;
+	}
+
+	/* Force "avalanching" of final 127 bits */
+	hash ^= hash << 3;
+	hash += hash >> 5;
+	hash ^= hash << 4;
+	hash += hash >> 17;
+	hash ^= hash << 25;
+	hash += hash >> 6;
+
+	return hash;
+}
+
+uint32_t lmo_canon_hash(const char *str, int len)
+{
+	char res[4096];
+	char *ptr, prev;
+	int off;
+
+	if (!str || len >= sizeof(res))
+		return 0;
+
+	for (prev = ' ', ptr = res, off = 0; off < len; prev = *str, off++, str++)
+	{
+		if (isspace(*str))
+		{
+			if (!isspace(prev))
+				*ptr++ = ' ';
+		}
+		else
+		{
+			*ptr++ = *str;
+		}
+	}
+
+	if ((ptr > res) && isspace(*(ptr-1)))
+		ptr--;
+
+	return sfh_hash(res, ptr - res);
+}
+
+lmo_archive_t * lmo_open(const char *file)
+{
+	int in = -1;
+	uint32_t idx_offset = 0;
+	struct stat s;
+
+	lmo_archive_t *ar = NULL;
+
+	if (stat(file, &s) == -1)
+		goto err;
+
+	if ((in = open(file, O_RDONLY)) == -1)
+		goto err;
+
+	if ((ar = (lmo_archive_t *)malloc(sizeof(*ar))) != NULL)
+	{
+		memset(ar, 0, sizeof(*ar));
+
+		ar->fd     = in;
+		ar->size = s.st_size;
+
+		fcntl(ar->fd, F_SETFD, fcntl(ar->fd, F_GETFD) | FD_CLOEXEC);
+
+		if ((ar->mmap = mmap(NULL, ar->size, PROT_READ, MAP_SHARED, ar->fd, 0)) == MAP_FAILED)
+			goto err;
+
+		idx_offset = ntohl(*((const uint32_t *)
+		                     (ar->mmap + ar->size - sizeof(uint32_t))));
+
+		if (idx_offset >= ar->size)
+			goto err;
+
+		ar->index  = (lmo_entry_t *)(ar->mmap + idx_offset);
+		ar->length = (ar->size - idx_offset - sizeof(uint32_t)) / sizeof(lmo_entry_t);
+		ar->end    = ar->mmap + ar->size;
+
+		return ar;
+	}
+
+err:
+	if (in > -1)
+		close(in);
+
+	if (ar != NULL)
+	{
+		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
+			munmap(ar->mmap, ar->size);
+
+		free(ar);
+	}
+
+	return NULL;
+}
+
+void lmo_close(lmo_archive_t *ar)
+{
+	if (ar != NULL)
+	{
+		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
+			munmap(ar->mmap, ar->size);
+
+		close(ar->fd);
+		free(ar);
+
+		ar = NULL;
+	}
+}
+
+
+lmo_catalog_t *_lmo_catalogs = NULL;
+lmo_catalog_t *_lmo_active_catalog = NULL;
+
+int lmo_load_catalog(const char *lang, const char *dir)
+{
+	DIR *dh = NULL;
+	char pattern[16];
+	char path[PATH_MAX];
+	struct dirent *de = NULL;
+
+	lmo_archive_t *ar = NULL;
+	lmo_catalog_t *cat = NULL;
+
+	if (!lmo_change_catalog(lang))
+		return 0;
+
+	if (!dir || !(dh = opendir(dir)))
+		goto err;
+
+	if (!(cat = malloc(sizeof(*cat))))
+		goto err;
+
+	memset(cat, 0, sizeof(*cat));
+
+	snprintf(cat->lang, sizeof(cat->lang), "%s", lang);
+	snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang);
+
+	while ((de = readdir(dh)) != NULL)
+	{
+		if (!fnmatch(pattern, de->d_name, 0))
+		{
+			snprintf(path, sizeof(path), "%s/%s", dir, de->d_name);
+			ar = lmo_open(path);
+
+			if (ar)
+			{
+				ar->next = cat->archives;
+				cat->archives = ar;
+			}
+		}
+	}
+
+	closedir(dh);
+
+	cat->next = _lmo_catalogs;
+	_lmo_catalogs = cat;
+
+	if (!_lmo_active_catalog)
+		_lmo_active_catalog = cat;
+
+	return 0;
+
+err:
+	if (dh) closedir(dh);
+	if (cat) free(cat);
+
+	return -1;
+}
+
+int lmo_change_catalog(const char *lang)
+{
+	lmo_catalog_t *cat;
+
+	for (cat = _lmo_catalogs; cat; cat = cat->next)
+	{
+		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
+		{
+			_lmo_active_catalog = cat;
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+static lmo_entry_t * lmo_find_entry(lmo_archive_t *ar, uint32_t hash)
+{
+	unsigned int m, l, r;
+	uint32_t k;
+
+	l = 0;
+	r = ar->length - 1;
+
+	while (1)
+	{
+		m = l + ((r - l) / 2);
+
+		if (r < l)
+			break;
+
+		k = ntohl(ar->index[m].key_id);
+
+		if (k == hash)
+			return &ar->index[m];
+
+		if (k > hash)
+		{
+			if (!m)
+				break;
+
+			r = m - 1;
+		}
+		else
+		{
+			l = m + 1;
+		}
+	}
+
+	return NULL;
+}
+
+int lmo_translate(const char *key, int keylen, char **out, int *outlen)
+{
+	uint32_t hash;
+	lmo_entry_t *e;
+	lmo_archive_t *ar;
+
+	if (!key || !_lmo_active_catalog)
+		return -2;
+
+	hash = lmo_canon_hash(key, keylen);
+
+	for (ar = _lmo_active_catalog->archives; ar; ar = ar->next)
+	{
+		if ((e = lmo_find_entry(ar, hash)) != NULL)
+		{
+			*out = ar->mmap + ntohl(e->offset);
+			*outlen = ntohl(e->length);
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+void lmo_close_catalog(const char *lang)
+{
+	lmo_archive_t *ar, *next;
+	lmo_catalog_t *cat, *prev;
+
+	for (prev = NULL, cat = _lmo_catalogs; cat; prev = cat, cat = cat->next)
+	{
+		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
+		{
+			if (prev)
+				prev->next = cat->next;
+			else
+				_lmo_catalogs = cat->next;
+
+			for (ar = cat->archives; ar; ar = next)
+			{
+				next = ar->next;
+				lmo_close(ar);
+			}
+
+			free(cat);
+			break;
+		}
+	}
+}
diff --git a/trunk/package/luci/modules/base/src/template_lmo.h b/trunk/package/luci/modules/base/src/template_lmo.h
new file mode 100644
index 00000000..57f59aa5
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_lmo.h
@@ -0,0 +1,92 @@
+/*
+ * lmo - Lua Machine Objects - General header
+ *
+ *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _TEMPLATE_LMO_H_
+#define _TEMPLATE_LMO_H_
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fnmatch.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <limits.h>
+
+#if (defined(__GNUC__) && defined(__i386__))
+#define sfh_get16(d) (*((const uint16_t *) (d)))
+#else
+#define sfh_get16(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
+					   +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+
+
+struct lmo_entry {
+	uint32_t key_id;
+	uint32_t val_id;
+	uint32_t offset;
+	uint32_t length;
+} __attribute__((packed));
+
+typedef struct lmo_entry lmo_entry_t;
+
+
+struct lmo_archive {
+	int         fd;
+	int	        length;
+	uint32_t    size;
+	lmo_entry_t *index;
+	char        *mmap;
+	char		*end;
+	struct lmo_archive *next;
+};
+
+typedef struct lmo_archive lmo_archive_t;
+
+
+struct lmo_catalog {
+	char lang[6];
+	struct lmo_archive *archives;
+	struct lmo_catalog *next;
+};
+
+typedef struct lmo_catalog lmo_catalog_t;
+
+
+uint32_t sfh_hash(const char *data, int len);
+uint32_t lmo_canon_hash(const char *data, int len);
+
+lmo_archive_t * lmo_open(const char *file);
+void lmo_close(lmo_archive_t *ar);
+
+
+extern lmo_catalog_t *_lmo_catalogs;
+extern lmo_catalog_t *_lmo_active_catalog;
+
+int lmo_load_catalog(const char *lang, const char *dir);
+int lmo_change_catalog(const char *lang);
+int lmo_translate(const char *key, int keylen, char **out, int *outlen);
+void lmo_close_catalog(const char *lang);
+
+#endif
diff --git a/trunk/package/luci/modules/base/src/template_lualib.c b/trunk/package/luci/modules/base/src/template_lualib.c
new file mode 100644
index 00000000..10356118
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_lualib.c
@@ -0,0 +1,179 @@
+/*
+ * LuCI Template - Lua binding
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_lualib.h"
+
+static int template_L_do_parse(lua_State *L, struct template_parser *parser, const char *chunkname)
+{
+	int lua_status, rv;
+
+	if (!parser)
+	{
+		lua_pushnil(L);
+		lua_pushinteger(L, errno);
+		lua_pushstring(L, strerror(errno));
+		return 3;
+	}
+
+	lua_status = lua_load(L, template_reader, parser, chunkname);
+
+	if (lua_status == 0)
+		rv = 1;
+	else
+		rv = template_error(L, parser);
+
+	template_close(parser);
+
+	return rv;
+}
+
+int template_L_parse(lua_State *L)
+{
+	const char *file = luaL_checkstring(L, 1);
+	struct template_parser *parser = template_open(file);
+
+	return template_L_do_parse(L, parser, file);
+}
+
+int template_L_parse_string(lua_State *L)
+{
+	size_t len;
+	const char *str = luaL_checklstring(L, 1, &len);
+	struct template_parser *parser = template_string(str, len);
+
+	return template_L_do_parse(L, parser, "[string]");
+}
+
+int template_L_utf8(lua_State *L)
+{
+	size_t len = 0;
+	const char *str = luaL_checklstring(L, 1, &len);
+	char *res = utf8(str, len);
+
+	if (res != NULL)
+	{
+		lua_pushstring(L, res);
+		free(res);
+
+		return 1;
+	}
+
+	return 0;
+}
+
+int template_L_pcdata(lua_State *L)
+{
+	size_t len = 0;
+	const char *str = luaL_checklstring(L, 1, &len);
+	char *res = pcdata(str, len);
+
+	if (res != NULL)
+	{
+		lua_pushstring(L, res);
+		free(res);
+
+		return 1;
+	}
+
+	return 0;
+}
+
+int template_L_striptags(lua_State *L)
+{
+	size_t len = 0;
+	const char *str = luaL_checklstring(L, 1, &len);
+	char *res = striptags(str, len);
+
+	if (res != NULL)
+	{
+		lua_pushstring(L, res);
+		free(res);
+
+		return 1;
+	}
+
+	return 0;
+}
+
+static int template_L_load_catalog(lua_State *L) {
+	const char *lang = luaL_optstring(L, 1, "en");
+	const char *dir  = luaL_optstring(L, 2, NULL);
+	lua_pushboolean(L, !lmo_load_catalog(lang, dir));
+	return 1;
+}
+
+static int template_L_close_catalog(lua_State *L) {
+	const char *lang = luaL_optstring(L, 1, "en");
+	lmo_close_catalog(lang);
+	return 0;
+}
+
+static int template_L_change_catalog(lua_State *L) {
+	const char *lang = luaL_optstring(L, 1, "en");
+	lua_pushboolean(L, !lmo_change_catalog(lang));
+	return 1;
+}
+
+static int template_L_translate(lua_State *L) {
+	size_t len;
+	char *tr;
+	int trlen;
+	const char *key = luaL_checklstring(L, 1, &len);
+
+	switch (lmo_translate(key, len, &tr, &trlen))
+	{
+		case 0:
+			lua_pushlstring(L, tr, trlen);
+			return 1;
+
+		case -1:
+			return 0;
+	}
+
+	lua_pushnil(L);
+	lua_pushstring(L, "no catalog loaded");
+	return 2;
+}
+
+static int template_L_hash(lua_State *L) {
+	size_t len;
+	const char *key = luaL_checklstring(L, 1, &len);
+	lua_pushinteger(L, sfh_hash(key, len));
+	return 1;
+}
+
+
+/* module table */
+static const luaL_reg R[] = {
+	{ "parse",				template_L_parse },
+	{ "parse_string",		template_L_parse_string },
+	{ "utf8",				template_L_utf8 },
+	{ "pcdata",				template_L_pcdata },
+	{ "striptags",			template_L_striptags },
+	{ "load_catalog",		template_L_load_catalog },
+	{ "close_catalog",		template_L_close_catalog },
+	{ "change_catalog",		template_L_change_catalog },
+	{ "translate",			template_L_translate },
+	{ "hash",				template_L_hash },
+	{ NULL,					NULL }
+};
+
+LUALIB_API int luaopen_luci_template_parser(lua_State *L) {
+	luaL_register(L, TEMPLATE_LUALIB_META, R);
+	return 1;
+}
diff --git a/trunk/package/luci/modules/base/src/template_lualib.h b/trunk/package/luci/modules/base/src/template_lualib.h
new file mode 100644
index 00000000..1b659be1
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_lualib.h
@@ -0,0 +1,30 @@
+/*
+ * LuCI Template - Lua library header
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _TEMPLATE_LUALIB_H_
+#define _TEMPLATE_LUALIB_H_
+
+#include "template_parser.h"
+#include "template_utils.h"
+#include "template_lmo.h"
+
+#define TEMPLATE_LUALIB_META  "template.parser"
+
+LUALIB_API int luaopen_luci_template_parser(lua_State *L);
+
+#endif
diff --git a/trunk/package/luci/modules/base/src/template_parser.c b/trunk/package/luci/modules/base/src/template_parser.c
new file mode 100644
index 00000000..c263fbf9
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_parser.c
@@ -0,0 +1,419 @@
+/*
+ * LuCI Template - Parser implementation
+ *
+ *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_parser.h"
+#include "template_utils.h"
+#include "template_lmo.h"
+
+
+/* leading and trailing code for different types */
+const char *gen_code[9][2] = {
+	{ NULL,					NULL			},
+	{ "write(\"",			"\")"			},
+	{ NULL,					NULL			},
+	{ "write(tostring(",	" or \"\"))"	},
+	{ "include(\"",			"\")"			},
+	{ "write(\"",			"\")"			},
+	{ "write(\"",			"\")"			},
+	{ NULL,					" "				},
+	{ NULL,					NULL			},
+};
+
+/* Simple strstr() like function that takes len arguments for both haystack and needle. */
+static char *strfind(char *haystack, int hslen, const char *needle, int ndlen)
+{
+	int match = 0;
+	int i, j;
+
+	for( i = 0; i < hslen; i++ )
+	{
+		if( haystack[i] == needle[0] )
+		{
+			match = ((ndlen == 1) || ((i + ndlen) <= hslen));
+
+			for( j = 1; (j < ndlen) && ((i + j) < hslen); j++ )
+			{
+				if( haystack[i+j] != needle[j] )
+				{
+					match = 0;
+					break;
+				}
+			}
+
+			if( match )
+				return &haystack[i];
+		}
+	}
+
+	return NULL;
+}
+
+struct template_parser * template_open(const char *file)
+{
+	struct stat s;
+	struct template_parser *parser;
+
+	if (!(parser = malloc(sizeof(*parser))))
+		goto err;
+
+	memset(parser, 0, sizeof(*parser));
+	parser->fd = -1;
+	parser->file = file;
+
+	if (stat(file, &s))
+		goto err;
+
+	if ((parser->fd = open(file, O_RDONLY)) < 0)
+		goto err;
+
+	parser->size = s.st_size;
+	parser->data = mmap(NULL, parser->size, PROT_READ, MAP_PRIVATE,
+						parser->fd, 0);
+
+	if (parser->data != MAP_FAILED)
+	{
+		parser->off = parser->data;
+		parser->cur_chunk.type = T_TYPE_INIT;
+		parser->cur_chunk.s    = parser->data;
+		parser->cur_chunk.e    = parser->data;
+
+		return parser;
+	}
+
+err:
+	template_close(parser);
+	return NULL;
+}
+
+struct template_parser * template_string(const char *str, uint32_t len)
+{
+	struct template_parser *parser;
+
+	if (!str) {
+		errno = EINVAL;
+		goto err;
+	}
+
+	if (!(parser = malloc(sizeof(*parser))))
+		goto err;
+
+	memset(parser, 0, sizeof(*parser));
+	parser->fd = -1;
+
+	parser->size = len;
+	parser->data = (char*)str;
+
+	parser->off = parser->data;
+	parser->cur_chunk.type = T_TYPE_INIT;
+	parser->cur_chunk.s    = parser->data;
+	parser->cur_chunk.e    = parser->data;
+
+	return parser;
+
+err:
+	template_close(parser);
+	return NULL;
+}
+
+void template_close(struct template_parser *parser)
+{
+	if (!parser)
+		return;
+
+	if (parser->gc != NULL)
+		free(parser->gc);
+
+	/* if file is not set, we were parsing a string */
+	if (parser->file) {
+		if ((parser->data != NULL) && (parser->data != MAP_FAILED))
+			munmap(parser->data, parser->size);
+
+		if (parser->fd >= 0)
+			close(parser->fd);
+	}
+
+	free(parser);
+}
+
+void template_text(struct template_parser *parser, const char *e)
+{
+	const char *s = parser->off;
+
+	if (s < (parser->data + parser->size))
+	{
+		if (parser->strip_after)
+		{
+			while ((s <= e) && isspace(*s))
+				s++;
+		}
+
+		parser->cur_chunk.type = T_TYPE_TEXT;
+	}
+	else
+	{
+		parser->cur_chunk.type = T_TYPE_EOF;
+	}
+
+	parser->cur_chunk.line = parser->line;
+	parser->cur_chunk.s = s;
+	parser->cur_chunk.e = e;
+}
+
+void template_code(struct template_parser *parser, const char *e)
+{
+	const char *s = parser->off;
+
+	parser->strip_before = 0;
+	parser->strip_after = 0;
+
+	if (*s == '-')
+	{
+		parser->strip_before = 1;
+		for (s++; (s <= e) && (*s == ' ' || *s == '\t'); s++);
+	}
+
+	if (*(e-1) == '-')
+	{
+		parser->strip_after = 1;
+		for (e--; (e >= s) && (*e == ' ' || *e == '\t'); e--);
+	}
+
+	switch (*s)
+	{
+		/* comment */
+		case '#':
+			s++;
+			parser->cur_chunk.type = T_TYPE_COMMENT;
+			break;
+
+		/* include */
+		case '+':
+			s++;
+			parser->cur_chunk.type = T_TYPE_INCLUDE;
+			break;
+
+		/* translate */
+		case ':':
+			s++;
+			parser->cur_chunk.type = T_TYPE_I18N;
+			break;
+
+		/* translate raw */
+		case '_':
+			s++;
+			parser->cur_chunk.type = T_TYPE_I18N_RAW;
+			break;
+
+		/* expr */
+		case '=':
+			s++;
+			parser->cur_chunk.type = T_TYPE_EXPR;
+			break;
+
+		/* code */
+		default:
+			parser->cur_chunk.type = T_TYPE_CODE;
+			break;
+	}
+
+	parser->cur_chunk.line = parser->line;
+	parser->cur_chunk.s = s;
+	parser->cur_chunk.e = e;
+}
+
+static const char *
+template_format_chunk(struct template_parser *parser, size_t *sz)
+{
+	const char *s, *p;
+	const char *head, *tail;
+	struct template_chunk *c = &parser->prv_chunk;
+	struct template_buffer *buf;
+
+	*sz = 0;
+	s = parser->gc = NULL;
+
+	if (parser->strip_before && c->type == T_TYPE_TEXT)
+	{
+		while ((c->e > c->s) && isspace(*(c->e - 1)))
+			c->e--;
+	}
+
+	/* empty chunk */
+	if (c->s == c->e)
+	{
+		if (c->type == T_TYPE_EOF)
+		{
+			*sz = 0;
+			s = NULL;
+		}
+		else
+		{
+			*sz = 1;
+			s = " ";
+		}
+	}
+
+	/* format chunk */
+	else if ((buf = buf_init(c->e - c->s)) != NULL)
+	{
+		if ((head = gen_code[c->type][0]) != NULL)
+			buf_append(buf, head, strlen(head));
+
+		switch (c->type)
+		{
+			case T_TYPE_TEXT:
+				luastr_escape(buf, c->s, c->e - c->s, 0);
+				break;
+
+			case T_TYPE_EXPR:
+				buf_append(buf, c->s, c->e - c->s);
+				for (p = c->s; p < c->e; p++)
+					parser->line += (*p == '\n');
+				break;
+
+			case T_TYPE_INCLUDE:
+				luastr_escape(buf, c->s, c->e - c->s, 0);
+				break;
+
+			case T_TYPE_I18N:
+				luastr_translate(buf, c->s, c->e - c->s, 1);
+				break;
+
+			case T_TYPE_I18N_RAW:
+				luastr_translate(buf, c->s, c->e - c->s, 0);
+				break;
+
+			case T_TYPE_CODE:
+				buf_append(buf, c->s, c->e - c->s);
+				for (p = c->s; p < c->e; p++)
+					parser->line += (*p == '\n');
+				break;
+		}
+
+		if ((tail = gen_code[c->type][1]) != NULL)
+			buf_append(buf, tail, strlen(tail));
+
+		*sz = buf_length(buf);
+		s = parser->gc = buf_destroy(buf);
+
+		if (!*sz)
+		{
+			*sz = 1;
+			s = " ";
+		}
+	}
+
+	return s;
+}
+
+const char *template_reader(lua_State *L, void *ud, size_t *sz)
+{
+	struct template_parser *parser = ud;
+	int rem = parser->size - (parser->off - parser->data);
+	char *tag;
+
+	parser->prv_chunk = parser->cur_chunk;
+
+	/* free previous string */
+	if (parser->gc)
+	{
+		free(parser->gc);
+		parser->gc = NULL;
+	}
+
+	/* before tag */
+	if (!parser->in_expr)
+	{
+		if ((tag = strfind(parser->off, rem, "<%", 2)) != NULL)
+		{
+			template_text(parser, tag);
+			parser->off = tag + 2;
+			parser->in_expr = 1;
+		}
+		else
+		{
+			template_text(parser, parser->data + parser->size);
+			parser->off = parser->data + parser->size;
+		}
+	}
+
+	/* inside tag */
+	else
+	{
+		if ((tag = strfind(parser->off, rem, "%>", 2)) != NULL)
+		{
+			template_code(parser, tag);
+			parser->off = tag + 2;
+			parser->in_expr = 0;
+		}
+		else
+		{
+			/* unexpected EOF */
+			template_code(parser, parser->data + parser->size);
+
+			*sz = 1;
+			return "\033";
+		}
+	}
+
+	return template_format_chunk(parser, sz);
+}
+
+int template_error(lua_State *L, struct template_parser *parser)
+{
+	const char *err = luaL_checkstring(L, -1);
+	const char *off = parser->prv_chunk.s;
+	const char *ptr;
+	char msg[1024];
+	int line = 0;
+	int chunkline = 0;
+
+	if ((ptr = strfind((char *)err, strlen(err), "]:", 2)) != NULL)
+	{
+		chunkline = atoi(ptr + 2) - parser->prv_chunk.line;
+
+		while (*ptr)
+		{
+			if (*ptr++ == ' ')
+			{
+				err = ptr;
+				break;
+			}
+		}
+	}
+
+	if (strfind((char *)err, strlen(err), "'char(27)'", 10) != NULL)
+	{
+		off = parser->data + parser->size;
+		err = "'%>' expected before end of file";
+		chunkline = 0;
+	}
+
+	for (ptr = parser->data; ptr < off; ptr++)
+		if (*ptr == '\n')
+			line++;
+
+	snprintf(msg, sizeof(msg), "Syntax error in %s:%d: %s",
+			 parser->file ? parser->file : "[string]", line + chunkline, err ? err : "(unknown error)");
+
+	lua_pushnil(L);
+	lua_pushinteger(L, line + chunkline);
+	lua_pushstring(L, msg);
+
+	return 3;
+}
diff --git a/trunk/package/luci/modules/base/src/template_parser.h b/trunk/package/luci/modules/base/src/template_parser.h
new file mode 100644
index 00000000..a3200a2d
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_parser.h
@@ -0,0 +1,80 @@
+/*
+ * LuCI Template - Parser header
+ *
+ *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _TEMPLATE_PARSER_H_
+#define _TEMPLATE_PARSER_H_
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+
+/* code types */
+#define T_TYPE_INIT			0
+#define T_TYPE_TEXT			1
+#define T_TYPE_COMMENT		2
+#define T_TYPE_EXPR			3
+#define T_TYPE_INCLUDE 		4
+#define T_TYPE_I18N			5
+#define T_TYPE_I18N_RAW		6
+#define T_TYPE_CODE			7
+#define T_TYPE_EOF			8
+
+
+struct template_chunk {
+	const char *s;
+	const char *e;
+	int type;
+	int line;
+};
+
+/* parser state */
+struct template_parser {
+	int fd;
+	uint32_t size;
+	char *data;
+	char *off;
+	char *gc;
+	int line;
+	int in_expr;
+	int strip_before;
+	int strip_after;
+	struct template_chunk prv_chunk;
+	struct template_chunk cur_chunk;
+	const char *file;
+};
+
+struct template_parser * template_open(const char *file);
+struct template_parser * template_string(const char *str, uint32_t len);
+void template_close(struct template_parser *parser);
+
+const char *template_reader(lua_State *L, void *ud, size_t *sz);
+int template_error(lua_State *L, struct template_parser *parser);
+
+#endif
diff --git a/trunk/package/luci/modules/base/src/template_utils.c b/trunk/package/luci/modules/base/src/template_utils.c
new file mode 100644
index 00000000..80542bd4
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_utils.c
@@ -0,0 +1,494 @@
+/*
+ * LuCI Template - Utility functions
+ *
+ *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_utils.h"
+#include "template_lmo.h"
+
+/* initialize a buffer object */
+struct template_buffer * buf_init(int size)
+{
+	struct template_buffer *buf;
+
+	if (size <= 0)
+		size = 1024;
+
+	buf = (struct template_buffer *)malloc(sizeof(struct template_buffer));
+
+	if (buf != NULL)
+	{
+		buf->fill = 0;
+		buf->size = size;
+		buf->data = malloc(buf->size);
+
+		if (buf->data != NULL)
+		{
+			buf->dptr = buf->data;
+			buf->data[0] = 0;
+
+			return buf;
+		}
+
+		free(buf);
+	}
+
+	return NULL;
+}
+
+/* grow buffer */
+int buf_grow(struct template_buffer *buf, int size)
+{
+	unsigned int off = (buf->dptr - buf->data);
+	char *data;
+
+	if (size <= 0)
+		size = 1024;
+
+	data = realloc(buf->data, buf->size + size);
+
+	if (data != NULL)
+	{
+		buf->data  = data;
+		buf->dptr  = data + off;
+		buf->size += size;
+
+		return buf->size;
+	}
+
+	return 0;
+}
+
+/* put one char into buffer object */
+int buf_putchar(struct template_buffer *buf, char c)
+{
+	if( ((buf->fill + 1) >= buf->size) && !buf_grow(buf, 0) )
+		return 0;
+
+	*(buf->dptr++) = c;
+	*(buf->dptr) = 0;
+
+	buf->fill++;
+	return 1;
+}
+
+/* append data to buffer */
+int buf_append(struct template_buffer *buf, const char *s, int len)
+{
+	if ((buf->fill + len + 1) >= buf->size)
+	{
+		if (!buf_grow(buf, len + 1))
+			return 0;
+	}
+
+	memcpy(buf->dptr, s, len);
+	buf->fill += len;
+	buf->dptr += len;
+
+	*(buf->dptr) = 0;
+
+	return len;
+}
+
+/* read buffer length */
+int buf_length(struct template_buffer *buf)
+{
+	return buf->fill;
+}
+
+/* destroy buffer object and return pointer to data */
+char * buf_destroy(struct template_buffer *buf)
+{
+	char *data = buf->data;
+
+	free(buf);
+	return data;
+}
+
+
+/* calculate the number of expected continuation chars */
+static inline int mb_num_chars(unsigned char c)
+{
+	if ((c & 0xE0) == 0xC0)
+		return 2;
+	else if ((c & 0xF0) == 0xE0)
+		return 3;
+	else if ((c & 0xF8) == 0xF0)
+		return 4;
+	else if ((c & 0xFC) == 0xF8)
+		return 5;
+	else if ((c & 0xFE) == 0xFC)
+		return 6;
+
+	return 1;
+}
+
+/* test whether the given byte is a valid continuation char */
+static inline int mb_is_cont(unsigned char c)
+{
+	return ((c >= 0x80) && (c <= 0xBF));
+}
+
+/* test whether the byte sequence at the given pointer with the given
+ * length is the shortest possible representation of the code point */
+static inline int mb_is_shortest(unsigned char *s, int n)
+{
+	switch (n)
+	{
+		case 2:
+			/* 1100000x (10xxxxxx) */
+			return !(((*s >> 1) == 0x60) &&
+					 ((*(s+1) >> 6) == 0x02));
+
+		case 3:
+			/* 11100000 100xxxxx (10xxxxxx) */
+			return !((*s == 0xE0) &&
+					 ((*(s+1) >> 5) == 0x04) &&
+					 ((*(s+2) >> 6) == 0x02));
+
+		case 4:
+			/* 11110000 1000xxxx (10xxxxxx 10xxxxxx) */
+			return !((*s == 0xF0) &&
+					 ((*(s+1) >> 4) == 0x08) &&
+					 ((*(s+2) >> 6) == 0x02) &&
+					 ((*(s+3) >> 6) == 0x02));
+
+		case 5:
+			/* 11111000 10000xxx (10xxxxxx 10xxxxxx 10xxxxxx) */
+			return !((*s == 0xF8) &&
+					 ((*(s+1) >> 3) == 0x10) &&
+					 ((*(s+2) >> 6) == 0x02) &&
+					 ((*(s+3) >> 6) == 0x02) &&
+					 ((*(s+4) >> 6) == 0x02));
+
+		case 6:
+			/* 11111100 100000xx (10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx) */
+			return !((*s == 0xF8) &&
+					 ((*(s+1) >> 2) == 0x20) &&
+					 ((*(s+2) >> 6) == 0x02) &&
+					 ((*(s+3) >> 6) == 0x02) &&
+					 ((*(s+4) >> 6) == 0x02) &&
+					 ((*(s+5) >> 6) == 0x02));
+	}
+
+	return 1;
+}
+
+/* test whether the byte sequence at the given pointer with the given
+ * length is an UTF-16 surrogate */
+static inline int mb_is_surrogate(unsigned char *s, int n)
+{
+	return ((n == 3) && (*s == 0xED) && (*(s+1) >= 0xA0) && (*(s+1) <= 0xBF));
+}
+
+/* test whether the byte sequence at the given pointer with the given
+ * length is an illegal UTF-8 code point */
+static inline int mb_is_illegal(unsigned char *s, int n)
+{
+	return ((n == 3) && (*s == 0xEF) && (*(s+1) == 0xBF) &&
+			(*(s+2) >= 0xBE) && (*(s+2) <= 0xBF));
+}
+
+
+/* scan given source string, validate UTF-8 sequence and store result
+ * in given buffer object */
+static int _validate_utf8(unsigned char **s, int l, struct template_buffer *buf)
+{
+	unsigned char *ptr = *s;
+	unsigned int o = 0, v, n;
+
+	/* ascii byte without null */
+	if ((*(ptr+0) >= 0x01) && (*(ptr+0) <= 0x7F))
+	{
+		if (!buf_putchar(buf, *ptr++))
+			return 0;
+
+		o = 1;
+	}
+
+	/* multi byte sequence */
+	else if ((n = mb_num_chars(*ptr)) > 1)
+	{
+		/* count valid chars */
+		for (v = 1; (v <= n) && ((o+v) < l) && mb_is_cont(*(ptr+v)); v++);
+
+		switch (n)
+		{
+			case 6:
+			case 5:
+				/* five and six byte sequences are always invalid */
+				if (!buf_putchar(buf, '?'))
+					return 0;
+
+				break;
+
+			default:
+				/* if the number of valid continuation bytes matches the
+				 * expected number and if the sequence is legal, copy
+				 * the bytes to the destination buffer */
+				if ((v == n) && mb_is_shortest(ptr, n) &&
+					!mb_is_surrogate(ptr, n) && !mb_is_illegal(ptr, n))
+				{
+					/* copy sequence */
+					if (!buf_append(buf, (char *)ptr, n))
+						return 0;
+				}
+
+				/* the found sequence is illegal, skip it */
+				else
+				{
+					/* invalid sequence */
+					if (!buf_putchar(buf, '?'))
+						return 0;
+				}
+
+				break;
+		}
+
+		/* advance beyound the last found valid continuation char */
+		o = v;
+		ptr += v;
+	}
+
+	/* invalid byte (0x00) */
+	else
+	{
+		if (!buf_putchar(buf, '?')) /* or 0xEF, 0xBF, 0xBD */
+			return 0;
+
+		o = 1;
+		ptr++;
+	}
+
+	*s = ptr;
+	return o;
+}
+
+/* sanitize given string and replace all invalid UTF-8 sequences with "?" */
+char * utf8(const char *s, unsigned int l)
+{
+	struct template_buffer *buf = buf_init(l);
+	unsigned char *ptr = (unsigned char *)s;
+	unsigned int v, o;
+
+	if (!buf)
+		return NULL;
+
+	for (o = 0; o < l; o++)
+	{
+		/* ascii char */
+		if ((*ptr >= 0x01) && (*ptr <= 0x7F))
+		{
+			if (!buf_putchar(buf, (char)*ptr++))
+				break;
+		}
+
+		/* invalid byte or multi byte sequence */
+		else
+		{
+			if (!(v = _validate_utf8(&ptr, l - o, buf)))
+				break;
+
+			o += (v - 1);
+		}
+	}
+
+	return buf_destroy(buf);
+}
+
+/* Sanitize given string and strip all invalid XML bytes
+ * Validate UTF-8 sequences
+ * Escape XML control chars */
+char * pcdata(const char *s, unsigned int l)
+{
+	struct template_buffer *buf = buf_init(l);
+	unsigned char *ptr = (unsigned char *)s;
+	unsigned int o, v;
+	char esq[8];
+	int esl;
+
+	if (!buf)
+		return NULL;
+
+	for (o = 0; o < l; o++)
+	{
+		/* Invalid XML bytes */
+		if (((*ptr >= 0x00) && (*ptr <= 0x08)) ||
+		    ((*ptr >= 0x0B) && (*ptr <= 0x0C)) ||
+		    ((*ptr >= 0x0E) && (*ptr <= 0x1F)) ||
+		    (*ptr == 0x7F))
+		{
+			ptr++;
+		}
+
+		/* Escapes */
+		else if ((*ptr == 0x26) ||
+		         (*ptr == 0x27) ||
+		         (*ptr == 0x22) ||
+		         (*ptr == 0x3C) ||
+		         (*ptr == 0x3E))
+		{
+			esl = snprintf(esq, sizeof(esq), "&#%i;", *ptr);
+
+			if (!buf_append(buf, esq, esl))
+				break;
+
+			ptr++;
+		}
+
+		/* ascii char */
+		else if (*ptr <= 0x7F)
+		{
+			buf_putchar(buf, (char)*ptr++);
+		}
+
+		/* multi byte sequence */
+		else
+		{
+			if (!(v = _validate_utf8(&ptr, l - o, buf)))
+				break;
+
+			o += (v - 1);
+		}
+	}
+
+	return buf_destroy(buf);
+}
+
+char * striptags(const char *s, unsigned int l)
+{
+	struct template_buffer *buf = buf_init(l);
+	unsigned char *ptr = (unsigned char *)s;
+	unsigned char *end = ptr + l;
+	unsigned char *tag;
+	unsigned char prev;
+	char esq[8];
+	int esl;
+
+	for (prev = ' '; ptr < end; ptr++)
+	{
+		if ((*ptr == '<') && ((ptr + 2) < end) &&
+			((*(ptr + 1) == '/') || isalpha(*(ptr + 1))))
+		{
+			for (tag = ptr; tag < end; tag++)
+			{
+				if (*tag == '>')
+				{
+					if (!isspace(prev))
+						buf_putchar(buf, ' ');
+
+					ptr = tag;
+					prev = ' ';
+					break;
+				}
+			}
+		}
+		else if (isspace(*ptr))
+		{
+			if (!isspace(prev))
+				buf_putchar(buf, *ptr);
+
+			prev = *ptr;
+		}
+		else
+		{
+			switch(*ptr)
+			{
+				case '"':
+				case '\'':
+				case '<':
+				case '>':
+				case '&':
+					esl = snprintf(esq, sizeof(esq), "&#%i;", *ptr);
+					buf_append(buf, esq, esl);
+					break;
+
+				default:
+					buf_putchar(buf, *ptr);
+					break;
+			}
+
+			prev = *ptr;
+		}
+	}
+
+	return buf_destroy(buf);
+}
+
+void luastr_escape(struct template_buffer *out, const char *s, unsigned int l,
+				   int escape_xml)
+{
+	int esl;
+	char esq[8];
+	char *ptr;
+
+	for (ptr = (char *)s; ptr < (s + l); ptr++)
+	{
+		switch (*ptr)
+		{
+		case '\\':
+			buf_append(out, "\\\\", 2);
+			break;
+
+		case '"':
+			if (escape_xml)
+				buf_append(out, "&#34;", 5);
+			else
+				buf_append(out, "\\\"", 2);
+			break;
+
+		case '\n':
+			buf_append(out, "\\n", 2);
+			break;
+
+		case '\'':
+		case '&':
+		case '<':
+		case '>':
+			if (escape_xml)
+			{
+				esl = snprintf(esq, sizeof(esq), "&#%i;", *ptr);
+				buf_append(out, esq, esl);
+				break;
+			}
+
+		default:
+			buf_putchar(out, *ptr);
+		}
+	}
+}
+
+void luastr_translate(struct template_buffer *out, const char *s, unsigned int l,
+					  int escape_xml)
+{
+	char *tr;
+	int trlen;
+
+	switch (lmo_translate(s, l, &tr, &trlen))
+	{
+		case 0:
+			luastr_escape(out, tr, trlen, escape_xml);
+			break;
+
+		case -1:
+			luastr_escape(out, s, l, escape_xml);
+			break;
+
+		default:
+			/* no catalog loaded */
+			break;
+	}
+}
diff --git a/trunk/package/luci/modules/base/src/template_utils.h b/trunk/package/luci/modules/base/src/template_utils.h
new file mode 100644
index 00000000..c54af757
--- /dev/null
+++ b/trunk/package/luci/modules/base/src/template_utils.h
@@ -0,0 +1,49 @@
+/*
+ * LuCI Template - Utility header
+ *
+ *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _TEMPLATE_UTILS_H_
+#define _TEMPLATE_UTILS_H_
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+
+/* buffer object */
+struct template_buffer {
+	char *data;
+	char *dptr;
+	unsigned int size;
+	unsigned int fill;
+};
+
+struct template_buffer * buf_init(int size);
+int buf_grow(struct template_buffer *buf, int size);
+int buf_putchar(struct template_buffer *buf, char c);
+int buf_append(struct template_buffer *buf, const char *s, int len);
+int buf_length(struct template_buffer *buf);
+char * buf_destroy(struct template_buffer *buf);
+
+char * utf8(const char *s, unsigned int l);
+char * pcdata(const char *s, unsigned int l);
+char * striptags(const char *s, unsigned int l);
+
+void luastr_escape(struct template_buffer *out, const char *s, unsigned int l, int escape_xml);
+void luastr_translate(struct template_buffer *out, const char *s, unsigned int l, int escape_xml);
+
+#endif
diff --git a/trunk/package/luci/modules/base/standalone.mk b/trunk/package/luci/modules/base/standalone.mk
new file mode 100644
index 00000000..66a0e5a2
--- /dev/null
+++ b/trunk/package/luci/modules/base/standalone.mk
@@ -0,0 +1,56 @@
+LUAC = luac
+LUAC_OPTIONS = -s
+LUA_TARGET ?= source
+
+LUA_MODULEDIR = /usr/local/share/lua/5.1
+LUA_LIBRARYDIR = /usr/local/lib/lua/5.1
+
+OS ?= $(shell uname)
+
+LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1 || pkg-config --silence-errors --libs lua-5.1 || pkg-config --silence-errors --libs lua)
+LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
+LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1 || pkg-config --silence-errors --cflags lua-5.1 || pkg-config --silence-errors --cflags lua)
+
+CC = gcc
+AR = ar
+RANLIB = ranlib
+CFLAGS = -O2
+FPIC = -fPIC
+EXTRA_CFLAGS = --std=gnu99
+WFLAGS = -Wall -Werror -pedantic
+CPPFLAGS =
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+ifeq ($(OS),Darwin)
+  SHLIB_FLAGS = -bundle -undefined dynamic_lookup
+else
+  SHLIB_FLAGS = -shared
+endif
+LINK = $(CC) $(LDFLAGS)
+
+.PHONY: all build compile luacompile luasource clean luaclean
+
+all: build
+
+build: luabuild gccbuild
+
+luabuild: lua$(LUA_TARGET)
+
+gccbuild: compile
+compile:
+
+clean: luaclean
+
+luasource:
+	mkdir -p dist$(LUA_MODULEDIR)
+	cp -pR root/* dist 2>/dev/null || true
+	cp -pR lua/* dist$(LUA_MODULEDIR) 2>/dev/null || true
+	for i in $$(find dist -name .svn); do rm -rf $$i || true; done
+
+luastrip: luasource
+	for i in $$(find dist -type f -name '*.lua'); do perl -e 'undef $$/; open( F, "< $$ARGV[0]" ) || die $$!; $$src = <F>; close F; $$src =~ s/--\[\[.*?\]\](--)?//gs; $$src =~ s/^\s*--.*?\n//gm; open( F, "> $$ARGV[0]" ) || die $$!; print F $$src; close F' $$i; done
+
+luacompile: luasource
+	for i in $$(find dist -name *.lua -not -name debug.lua); do $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; done
+
+luaclean:
+	rm -rf dist
diff --git a/trunk/package/luci/modules/failsafe/Makefile b/trunk/package/luci/modules/failsafe/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/modules/failsafe/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/modules/failsafe/luasrc/controller/failsafe/failsafe.lua b/trunk/package/luci/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
new file mode 100644
index 00000000..db4bda66
--- /dev/null
+++ b/trunk/package/luci/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
@@ -0,0 +1,211 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2012 Daniel Golle <dgolle@allnet.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.failsafe.failsafe", package.seeall)
+
+function index()
+	local root = node()
+	if not root.target then
+		root.target = alias("failsafe")
+		root.index = true
+	end
+
+	page          = node()
+	page.lock     = true
+	page.target   = alias("failsafe")
+	page.subindex = true
+	page.index    = false
+
+	page          = node("failsafe")
+	page.title    = _("Fail-safe")
+	page.target   = alias("failsafe", "flashops")
+	page.order    = 5
+	page.setuser  = "root"
+	page.setgroup = "root"
+	page.index    = true
+
+	entry({"failsafe", "flashops"}, call("action_flashops"), _("Flash Firmware"), 70).index = true
+	entry({"failsafe", "reboot"}, call("action_reboot"), _("Reboot"), 90)
+end
+
+function action_flashops()
+	local sys = require "luci.sys"
+	local fs  = require "luci.fs"
+
+	local upgrade_avail = nixio.fs.access("/lib/upgrade/platform.sh")
+	local reset_avail   = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
+
+	local image_tmp   = "/tmp/firmware.img"
+
+	local function image_supported()
+		-- XXX: yay...
+		return ( 0 == os.execute(
+			". /lib/functions.sh; " ..
+			"include /lib/upgrade; " ..
+			"platform_check_image %q >/dev/null"
+				% image_tmp
+		) )
+	end
+
+	local function image_checksum()
+		return (luci.sys.exec("md5sum %q" % image_tmp):match("^([^%s]+)"))
+	end
+
+	local function storage_size()
+		local size = 0
+		if nixio.fs.access("/proc/mtd") then
+			for l in io.lines("/proc/mtd") do
+				local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
+				if n == "linux" or n == "firmware" then
+					size = tonumber(s, 16)
+					break
+				end
+			end
+		elseif nixio.fs.access("/proc/partitions") then
+			for l in io.lines("/proc/partitions") do
+				local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
+				if b and n and not n:match('[0-9]') then
+					size = tonumber(b) * 1024
+					break
+				end
+			end
+		end
+		return size
+	end
+
+
+	local fp
+	luci.http.setfilehandler(
+		function(meta, chunk, eof)
+			if not fp then
+				if meta and meta.name == "image" then
+					fp = io.open(image_tmp, "w")
+				end
+			end
+			if chunk then
+				fp:write(chunk)
+			end
+			if eof then
+				fp:close()
+			end
+		end
+	)
+
+	if luci.http.formvalue("image") or luci.http.formvalue("step") then
+		--
+		-- Initiate firmware flash
+		--
+		local step = tonumber(luci.http.formvalue("step") or 1)
+		if step == 1 then
+			if image_supported() then
+				luci.template.render("failsafe/upgrade", {
+					checksum = image_checksum(),
+					storage  = storage_size(),
+					size     = nixio.fs.stat(image_tmp).size,
+					keep     = false
+				})
+			else
+				nixio.fs.unlink(image_tmp)
+				luci.template.render("failsafe/flashops", {
+					reset_avail   = reset_avail,
+					upgrade_avail = upgrade_avail,
+					image_invalid = true
+				})
+			end
+		--
+		-- Start sysupgrade flash
+		--
+		elseif step == 2 then
+			local keep = (luci.http.formvalue("keep") == "1") and "" or "-n"
+			luci.template.render("failsafe/applyreboot", {
+				title = luci.i18n.translate("Flashing..."),
+				msg   = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
+				addr  = (#keep > 0) and "192.168.1.1" or nil
+			})
+			fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
+		end
+	else
+		--
+		-- Overview
+		--
+		luci.template.render("failsafe/flashops", {
+			reset_avail   = reset_avail,
+			upgrade_avail = upgrade_avail
+		})
+	end
+end
+
+function action_reboot()
+	local reboot = luci.http.formvalue("reboot")
+	luci.template.render("failsafe/reboot", {reboot=reboot})
+	if reboot then
+		luci.sys.reboot()
+	end
+end
+
+function fork_exec(command)
+	local pid = nixio.fork()
+	if pid > 0 then
+		return
+	elseif pid == 0 then
+		-- change to root dir
+		nixio.chdir("/")
+
+		-- patch stdin, out, err to /dev/null
+		local null = nixio.open("/dev/null", "w+")
+		if null then
+			nixio.dup(null, nixio.stderr)
+			nixio.dup(null, nixio.stdout)
+			nixio.dup(null, nixio.stdin)
+			if null:fileno() > 2 then
+				null:close()
+			end
+		end
+
+		-- replace with target command
+		nixio.exec("/bin/sh", "-c", command)
+	end
+end
+
+function ltn12_popen(command)
+
+	local fdi, fdo = nixio.pipe()
+	local pid = nixio.fork()
+
+	if pid > 0 then
+		fdo:close()
+		local close
+		return function()
+			local buffer = fdi:read(2048)
+			local wpid, stat = nixio.waitpid(pid, "nohang")
+			if not close and wpid and stat == "exited" then
+				close = true
+			end
+
+			if buffer and #buffer > 0 then
+				return buffer
+			elseif close then
+				fdi:close()
+				return nil
+			end
+		end
+	elseif pid == 0 then
+		nixio.dup(fdo, nixio.stdout)
+		fdi:close()
+		fdo:close()
+		nixio.exec("/bin/sh", "-c", command)
+	end
+end
diff --git a/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/applyreboot.htm b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/applyreboot.htm
new file mode 100644
index 00000000..866d213f
--- /dev/null
+++ b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/applyreboot.htm
@@ -0,0 +1,50 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<html>
+	<head>
+		<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title>
+		<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
+		<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
+		<script type="text/javascript">//<![CDATA[
+			var interval = window.setInterval(function() {
+				var img = new Image();
+
+				img.onload = function() {
+					window.clearInterval(interval);
+					location.href = 'http://<%=addr or luci.http.getenv("SERVER_NAME")%>/';
+				};
+
+				img.src = 'http://<%=addr or luci.http.getenv("SERVER_NAME")%><%=resource%>/icons/loading.gif?' + Math.random();
+			}, 5000);
+		//]]></script>
+	</head>
+	<body>
+		<div id="maincontainer">
+			<div id="maincontent">
+				<h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></a></h2>
+				<fieldset class="cbi-section">
+					<p>
+						<% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>
+					</p>
+					<p>
+						<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+						<%:Waiting for changes to be applied...%>
+					</p>
+				</fieldset>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/flashops.htm b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/flashops.htm
new file mode 100644
index 00000000..1b4bc337
--- /dev/null
+++ b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/flashops.htm
@@ -0,0 +1,43 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2012 Daniel Golle <dgolle@allnet.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Flash operations%></a></h2>
+<fieldset class="cbi-section">
+	<legend><%:Flash new firmware image%></legend>
+	<% if upgrade_avail then %>
+		<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
+			<div class="cbi-section-descr"><%:Upload a sysupgrade-compatible image. %></div>
+			<div class="cbi-section-node">
+				<div class="cbi-value cbi-value-last<% if image_invalid then %> cbi-value-error<% end %>">
+					<label class="cbi-value-title" for="image"><%:Image%>:</label>
+					<div class="cbi-value-field">
+						<input type="file" name="image" id="image" />
+						<input type="submit" class="cbi-button cbi-input-apply" value="<%:Flash image...%>" />
+					</div>
+				</div>
+			</div>
+			<% if image_invalid then %>
+				<div class="cbi-section-error"><%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %></div>
+			<% end %>
+		</form>
+	<% else %>
+		<div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the libreCMC wiki for device specific install instructions.%></div>
+	<% end %>
+</fieldset>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/reboot.htm b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/reboot.htm
new file mode 100644
index 00000000..e2e4db03
--- /dev/null
+++ b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/reboot.htm
@@ -0,0 +1,26 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2012 Daniel Golle <dgolle@allnet.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Reboot%></h3>
+<p><%:Reboots the operating system of your device%></p>
+<%- if not reboot then -%>
+<p><a href="<%=controller%>/failsafe/reboot?reboot=1"><%:Perform reboot%></a></p>
+<%- else -%>
+<p><%:Please wait: Device rebooting...%></p>
+<script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
+<%- end -%>
+<%+footer%>
diff --git a/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/upgrade.htm b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/upgrade.htm
new file mode 100644
index 00000000..7a86000e
--- /dev/null
+++ b/trunk/package/luci/modules/failsafe/luasrc/view/failsafe/upgrade.htm
@@ -0,0 +1,62 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2012 Daniel Golle <dgolle@allnet.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+
+<%+header%>
+
+<h2><a id="content" name="content"><%:Flash Firmware%> - <%:Verify%></a></h2>
+<p>
+	<%_ The flash image was uploaded.
+		Below is the checksum and file size listed,
+		compare them with the original file to ensure data integrity.<br />
+		Click "Proceed" below to start the flash procedure. %>
+
+	<% if storage > 0 and size > storage then %>
+		<br /><br />
+		<div class="error"><%:It appears that you are trying to
+			flash an image that does not fit into the flash memory, please verify
+			the image file! %></div>
+	<% end %>
+
+</p>
+
+<fieldset class="cbi-section">
+	<ul>
+		<li><%:Checksum%>: <code><%=checksum%></code></li>
+		<li><%:Size%>: <%
+			local w = require "luci.tools.webadmin"
+			write(w.byte_format(size))
+
+			if storage > 0 then
+				write(luci.i18n.translatef(
+					" (%s available)",
+					w.byte_format(storage)
+				))
+			end
+		%></li>
+	</ul>
+</fieldset>
+
+<div class="cbi-page-actions right">
+	<form style="display:inline" action="<%=REQUEST_URI%>" method="post">
+		<input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
+	</form>
+	<form style="display:inline" action="<%=REQUEST_URI%>" method="post">
+		<input type="hidden" name="step" value="2" />
+		<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />
+	</form>
+</div>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/freifunk/Makefile b/trunk/package/luci/modules/freifunk/Makefile
new file mode 100644
index 00000000..82c5b132
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/Makefile
@@ -0,0 +1,4 @@
+PO = freifunk
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/modules/freifunk/htdocs/luci-static/flashing.html b/trunk/package/luci/modules/freifunk/htdocs/luci-static/flashing.html
new file mode 100644
index 00000000..43e51236
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/htdocs/luci-static/flashing.html
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>LuCI - System Upgrade</title>
+
+	<style type="text/css">
+		body {
+			background-color:	#CCCCCC;
+			font-family:		sans-serif;
+			font-size:		90%;
+			padding-left:		50%;
+			padding-top:		100px;
+		}
+
+		h2 {
+			font-size:		110%;
+			margin:			5px 5px 0.5em 5px;
+			border-bottom:		1px dotted #0066CC;
+			color:			#0066CC;
+		}
+
+		p {
+			font-size:		95%;
+			margin:			15px 15px 0.5em 15px;
+		}
+
+		div {
+			background-color:	#F7F7F7;
+			border:			1px dotted #000000;
+			width:			600px;
+			height:			150px;
+			margin-left:		-300px;
+		}
+
+		em {
+			color:			#555555;
+		}
+	</style>
+
+	<script type="text/javascript"><!--
+		var time_remaining = 60 * 25;
+		var interval = window.setInterval(function() {
+			if( time_remaining <= 0 )
+			{
+				window.clearInterval(interval);
+				location.href = 'http://' + location.hostname + '/';
+			}
+			else
+			{
+				var minutes = Math.floor(time_remaining / 60);
+				var seconds = time_remaining % 60;
+				var label = document.getElementById('time_remaining');
+
+				if( label )
+				{
+					label.innerHTML =
+						( minutes > 0 ? minutes + 'm ' : '' ) +
+						seconds + 's';
+				}
+			}
+
+			time_remaining = time_remaining - 1;
+		}, 1000);
+	--></script>
+</head>
+
+<body class="lang_en">
+	<div>
+		<h2>Performing Upgrade</h2>
+
+		<p>
+			The System is flashing now. The procedure can take up to 25 minutes,
+			please be patient and wait until this page reloads itself.
+
+			<br /><img src="resources/flashing.gif" style="vertical-align:middle; margin:10px" />
+
+			<em>Remaining time (estimated): <span id="time_remaining">unknown</span></em>
+		</p>
+	</div>
+</body>
+
+</html>
diff --git a/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm b/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm
new file mode 100644
index 00000000..18be30be
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<head>
+	<title>OpenStreetMap</title>
+	<script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script>
+	<script type="text/javascript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
+	<script type="text/javascript" src="osm.js"></script>
+</head>
+<body onload="init();drawmap();" style="padding:0px; margin:0px">				
+		<div id="map"></div>
+		<div style="position:absolute; bottom:0%; width:100%; background:url('cbi/black_60.png'); font-size:10px; color:#fff;z-index:1000">
+			Map by <a href="http://www.openstreetmap.org" title="www.openstreetmap.org" style="color:#fff;" >openstreetmap.org</a>, License CC-BY-SA 
+			&#160;&#160;&#160;&#160;
+			<span id="osm">
+				Latitude: <input id="osmlat" name="osmlat" type="text" size="20" style="font-size:10px;">
+				Longitude: <input id="osmlon" name="osmlon" type="text" size="20" style="font-size:10px;">
+			</span>
+		</div>
+
+</body>
diff --git a/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/flashing.gif b/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/flashing.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e207fc56a1fcf035eba568f4ba5396f6dcd030fc
GIT binary patch
literal 4261
zcmajgX;_kJ-^cNji&a1cMa3lt)Kb%OsZlCxE>KgmOv_5k8Yn9*YiOM^XX3&Q*U&6!
zvcjcwtR^yBb?R~}GA%7r+zJ#GmlV{jx$o|or~B3O=6R0Zov%N~_y0SCLRNE@37CKh
zMgaKq>C@cYr@2p`z@8Sy;a4*s=cZ@p3^Q|GTEn`t-GVFq4XR1~%-q{S!-AwYM=RB-
z)q_*hbH}c$Ti)p}H|RbXKE{>4o0*+kCh07y8(ERjnSM{Jo1At2<;|_uvA&UM?Zj+j
z_oU+GcvH{hkxKQz_{^==@w%?b=KiS*=*ad<eS_n(om#{D(V2FQKJD({(8TP+HxoU>
z(_sbOCvR$8e|>Y~#aQNjt+Zz7(VL0a8bj^d58Xr49fJnhli_;RWOdtkag%OL|4}_Q
zGp_&GJ!IG=?;rj!d%u0+!Rv{eEn~0L`mw2x>kGPt74LT!zmwe4UTM(v4o^SrnXKvf
zaItQr;`yj%Y)08TRrP8-=iyMlZu;hnF?plz&a3fD^&^{Py_mf%*PF*wLxza+Jyu8C
zN}6<>^v=V-tIMA1p7l<>e6RoW?T3$ZpMF&gB;Oevo%)z@Uz=7vc>Cpe(k;z$N$0}T
z9d8B<_u412A838jI)A>QdC@<m(i%?vp?TIb6@IQ~v#hsEJ6-r>cvWWC=+vy^sn@v=
zhYps%pD=vnU+xP#+s(`F+II0P)J$ygJ8{+E@$2e{b3N+OnabwTce<I!ogciC-&!1b
zr5&Gn);oE&c3Adgq_jyFct*9S<Xzdb(F51spMN|&IXzeURJSUtYvjYMZ(3*B)6tMT
z)&8<~8_)LyOI6K%Qw4txdmtStcLra**Z+9AZ_9<=yKNJNkB3X2j{0SEX5H5cuJrAc
z_xI~&c3$Z(svnuqe@wkQXmhMB`nTRgzpL|Whs%|tH60T*ZzfisQN<SbC;p+?ajDPx
zSljg%V<VHZ>kE2VCtoZ3rv7LdyQUl^#J5gPe{6X-)uz_t<6G-glhQ{+wH+VCRRj68
zLw3j891>rf{`6{Xez(cNmxWJ8{Bu;tZ>ZtyF5<q{n4-SB?c?Vj5C5VVSee;r|8qOq
z^}$ozvAd){zU&=of9vVn1MZ@ZHTm7A{uo%9(S?g^4bJNh$W<j=dtXpHT=jB1=!|Oi
z<EO~N9`-+!u)xTT{@n0D@5P>23;=-r7Y>lYKfwL#`|FV~0U-SiFeJNRg}g4Am~6~a
z5!iM3I09tDhxr#BO^A;j!g+jgDzr@>C%cVDLhY?KYum-KPhngIkhz2tDCv}myUbv|
zH88pb0^&pwd?N<#KOCW4USb)EUjgyu@yIoC(9=chG_=&Wmx${-6a(RJTC?Nm%`*+1
zudJ$F2GU?I4y4umyhy&OeoMwV3&<4EihLHGBbjtX21N0q#Ro{nNg+tJ9Aji;Cd4Xa
z{3b{4<D|b}&oC$;<v&b~yC*KC#C?HPf@fPQv<N(6+0<e_!6+%mh1M4+M(u3Rm)#Y_
z=Ar}G893NYa2NG>iuVx#A4dUDQ3xw=5#0j#zcQHrU&i7bS1AmrLKa$*Q?O|obejoG
ziVQ$S@Jc~P6t1lvaYh!BNZA(G8iJ8C%fA3t7Qg~rJ<3&<XRHQ<<quMhzJN0^X9)Fw
z!8C|KHTAou;CYJe5qd038bM1bE03iAs$=gOsiUXt^enhNaJ5&Qeh`+0CTK4aPT2M(
z)E90#yVCJA>2I%ra?Ba~_ugOfKJ!hpwnVOcgtUo>9!XRi5kJ5ZFaHfgD;~lqEyS+b
z4;~t+b8Hd&u5gxvB9&;0e@LD%sPCAOU{{sH=NbN=EA3BHBF_#Of?1~dq%W5^YYGbg
zATG>U623ZffNE>xwk3g<awH9d`36pV2dos<=OC7L)Uu~p8WhJ|Ym~I1L4@wYg-79p
z_=Xz*!zoFCMeV^zv1cQhUyK!j?@0_^Tu$L?<Z8^m5Fp=ZEx^VXuyqT$P%yN@+Wc#o
zdAp!pGF$%3L6o=N>_+q9H}YG1v4mO<lhs-I1GT(;W{qOu+d{l?xN4-*BRb1%bBuM;
z%vt&lN!QlcI$03*M+})!VI!Iht-=4pU(Dn;ZBKS%t(2p}I<e(N3{yF$##j|7ez&Rk
zGV<&S&!u#ga`ig-nFQbKKAzm0mB0VsOir}?tTDC%36JGVz0Os7q!6aHbV&-d#%jS<
z=OiB{zmC!hDx{C&2W|y!LGe`v!Tr>XaZ5MTrNfu@jTHtYd2aYtSL5-pQlI+(F<r`_
zMPcX-NVA!c#yrGg65lR{fY+e;vs5t2iJHGb{>a)KNLS3)7bKHOr~Fhdo|w=>3o@3;
zy=a|&Vg|#dfgRogi7il43nm+Q5^w@P&z(3U9-)v#<0tB0I>%9w)_u!v&*w&R2R7)N
z72-SA*Y#;hsFktJcUBoG)_xpGuh_iTKIZW4wm>GwN4`@cm+VUB`XtD+6hPd}A!e#z
zfn4?+EI4S5Siq?cB(jM$CxvH*F<)D@Lv);vOJe{Elg;Dj(Q~(k>FMSusUM{6-<MHY
zjgDXi?xfam6vjl!iQoA|73V8O->AyhiRl6Zo>;uxIFh3fT};QeyNDg7C2-&|oB#*>
z>Bb1n65>Y$<u&A`Ge&`Q1OEpek7?!(A%j5_02gEUrD1l!IGvstGFzAI0o_^4Qlh*D
z{5(6ID=K895KkRvxx*Fy>5R4P*RsTLk^S~~ypP@UHbFxgERxaK!;StJeB{!7PO4N9
zhc=L)0_0K}By%vQ?ed*`pN5xtTQpi|l8eq`NSIBjmOR?mI+wVh4OZlRlP?3ugzFx3
z#P6{R6_gw?V;#mUwe>$0H70H)i1l)UD0diSR?FPbrTZ}_@#M@!ASE}#5zo#xu$0BQ
z`08hj;(wo#vu2@Goh~VQu^8{+f5si`iv3nkfulU7lz0c>*ckhPR1F+umO|>N3TI{D
z{M;d$L$QNs9U12ktcT0c#b!rATfQ0WDYT#+q@UX;$Ju}fwLpX`sz6Fm`r7G%CV#LZ
z*2En!P||89a~_LX+)Q!#jb_hE7HoIE<V*AP>wJB6n|Q_XM%jwG0SrYc)f@ow&@}3%
zO4e=CGh`l7GE%!T3N8=y6*4!&-g|L84vr+{d`_km&L;@~tX{OlN}TlI3saeH$~D8r
zV08r#4d`XZpo-Mu%}UWvLhHYyjOF=Tfs*i9_?IR<4%8A&nCip4C}dmiD|-;@C7Qt9
zCnS1^Z2#{C|JVQiZC69Sj#Owa5@AV>MKd($QCkO+(|kHgz<=isNfcjYB+zab)q)N3
zbH?mt<bW~}rrvDxQgZDfES!53sB{kBOA8<|+dK9IiIqYXQxhQ+B89Uq;;y<LL!^j!
zm#B&rL!a+dAML)aaz2Nh(o2h3wERM7!}E<!J_XwC{5%YSn)3IC=uoD}HOp3EpH17z
zjY+nnzLg(oYl6!E3nDLHZG0PRi_ZJ3aV467dvwYErX$=-j`RZ177Ii?9F-p1puj-L
zUHo!3t!y{WdU-O%36@{YE=Ld4IH4C6(;2Cl2QCM_Sl_s=Kl@;%qVWu3|BmX;&(gs0
z)=UxuD^Poy)qLfU^0Hx58W}_x)Y4$YYr_qo7O;VDo&!rO3MfaZ5#UP&X9#(o<3xI-
zR|_&>E4K4B+5>IKVhWzps8?Sl)<fFEu5h|Awa|>Zh<fVzJ^q>dKb3kXVT&g(N;g`%
zfA-p)(L~CE%C{aZxv9ys-1ylq3eKcd6CL9?Z`%18tA5D^6?_^FxL$tQH_g*a7)o$?
zyX~lTCiWJn?Ry;_UW(dbEivI-5e7?4B;DJ2;(!Q#2aR&n)A>(9MvW15qD`~=!U^oj
z-nrMsis0UMBVwgrUqj|Mhi82(tdwFik!6+CT6HQrfKJ2>N4d1M5SW%2J6iENxleA8
zPdLeymL+inVdTc!?7_MKm&H^DLIh+MxN$(~MKf{|e`mQio+WINiW`4ha8|n3nafz?
z#;z6m%Wx&W<wCx!h5F(Seu?q(GRtd$cAV<Q0~k5d?-jOaM>x8LTk0Bz#VVze;tTbp
zn{=ieBXHRJQpofZ?n40{$e8Z6S0f<r`9y*Zf3LeJbaz1RRbgiQT5lsV<P)7n1r!tS
zE6Z04jT?6F_TH*v>7TmVx(n#iq+aPJ;~f7^olhIjSYoqhTlL9*TXU}?wm1pNn)Z!k
zoFz;bAgCkz5q3tqw4o;H*oYJkOE>`2tzkZc38lh}1vs&iU!n=dIdg!X#9Bv4Cpwr=
z=@3|Z<<CSPzlbar3Fo)KsL1Io%N{_h?EZC3$*15*zu9YN-ApV~mbr2K0^-ZMlM$!i
zFL8IqGL}R<I!a$AKiD72G?l7qy0qO-pjJs>T(Tq2DvhLouESib<PJYNi$z8G;+@Xy
z4SFq(yB)VC!d&+}7hV7)t!*a<GN1-$V$~r%4j3Ds--~n9)oa{{c0W<HO9w}T?MyOz
zI{C1g8nP$!f~8B0I>Xw$#iu;iR#9i_wHhMezM*1U!By((^AO`OS`jK#6D?_0)JDq>
za3JDdMoN&=!P&T`Rb;z*F$UyAdElW)5p}_oW(z8`kcdHFP6z{m`gRfKbDZ~~5Ly;$
zwr4|tYt(3WyA{bpCCM)t;W`Z`dM!P>;cB#)99gl+FkG5*|EEyEf(s8m%(T*~U%Lf4
zgTkeo2*C4%g1g3oX-O&4N9IIFI~Hf`k#b8-zW)OFex3%huc^a2Pbw?Y7+#AL3#u<%
z%L(FOZe+~LSyzyKV=0ixtuB>9rqLTEiXuXxhZ$*UsVJv;hfO1NqAqjP5x>wpjw!Rd
z4?VHCKn>fnSUMXGzH{14C4IwZ37f?P?7DgD3F0V@;!Fe5Pl%zPNOb`7C=M|=y+GuP
znB(oE<fR&ABsL%DToi9j(s1i*dmQxjqWu8AK}r+{HUReu8e_Ex$S7b(l52%O%iPbt
ziV<U|bTvuA<i~!WC=Bx5V{#{(`FxJ=vT6P03bD6$h}psufy-4jRxM4GO_iT3c*X1e
zu|QsR%o^QY=T1b!gb9lEl}jpVHX<l=PaT&0vIxPe;XwpL#qq_1_=5A;(IO*DYZ2Zv
z$I&?tlxoaeJX}1iIc&^4kjyAM52qUz7h#_}Ns4OORz{~)heOaC#isahtX;4a-HiN*
bTx8G+`G;Z;Xq)kb@V?FJOe04u1XlbHnv55!

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif b/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif
new file mode 100644
index 0000000000000000000000000000000000000000..818780d153abf08cd650ff698e6b595f9b2a9bac
GIT binary patch
literal 209
zcmZ?wbhEHblwgoxn8?KNpCRo(7%(s}DE{a6a}5c0b_{Se(lcOY1PT3Q;Y?v*V$cDy
zff^(j7?@<H^shYqmVfb_Ew{Qqvob!BOPRBL>a)&euTE|AWyGdI0ZBvV4T}c(n0X8>
z)7Z;mj%|C#ef-lOF_0!!G+Q(gntnH3Gi&(II<=fZ$yMqZ$CT$!8ei|&d!zUHuXEr3
J1u-yK0|2#tP22zg

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/freifunk-map/node.gif b/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/freifunk-map/node.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f64ab162a451f8eb04b6b6664694b7b907f511cf
GIT binary patch
literal 209
zcmZ?wbhEHblwgoxn8?JykoF$}7#J87|8x7fh6Fo12DlpO889<~gnqJcrZ6xu=m6P3
z4H66tOfpmYSDt>$zj)4;Tiu^o8K20d%vnD5S?97>r?&YrV$-02q#^T$MT30IJcgEO
z>}4^>w!Py%{^^exNE0iXEt&{TzniX^HT-9tTF#*4D)o$G%JV0UuXpUd(fj<@x$pmi
H7#OSpv*u0Q

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/osm.js b/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/osm.js
new file mode 100644
index 00000000..cae0cd66
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/htdocs/luci-static/resources/osm.js
@@ -0,0 +1,130 @@
+var map;
+var layer_mapnik;
+var layer_tah;
+var layer_markers;
+var PI = Math.PI;
+var latfield = '';
+var lonfield = '';
+var latfield_id='';
+var lonfield_id='';
+var centerlon = 10;
+var centerlat = 52;
+var zoom = 6;
+
+function lon2merc(lon) {
+    return 20037508.34 * lon / 180;
+}
+
+function lat2merc(lat) {
+	lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / PI;
+	return 20037508.34 * lat;
+}
+
+function merc2lon(lon) {
+	return lon*180/20037508.34;
+};
+
+function merc2lat(lat) {
+	return Math.atan(Math.exp(lat*PI/20037508.34))*360/PI-90;
+};
+
+OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
+	defaultHandlerOptions: {
+		'single': true,
+		'double': false,
+		'pixelTolerance': 0,
+		'stopSingle': false,
+		'stopDouble': false
+	},
+
+	initialize: function(options) {
+		this.handlerOptions = OpenLayers.Util.extend(
+			{}, this.defaultHandlerOptions
+		);
+		OpenLayers.Control.prototype.initialize.apply(
+			this, arguments
+		);
+			this.handler = new OpenLayers.Handler.Click(
+				this, {
+					'click': this.trigger
+			}, this.handlerOptions
+		);
+	}, 
+
+	trigger: function(e) {
+		var lonlat = map.getLonLatFromViewPortPx(e.xy);	
+		lat=merc2lat(lonlat.lat);
+		lon=merc2lon(lonlat.lon);
+		if(parent.document.getElementById(latfield_id)==null){
+			latfield=document.getElementById('osmlat');
+		}else{
+			latfield=parent.document.getElementById(latfield_id);
+		}
+		if(parent.document.getElementById(lonfield_id)==null){
+			lonfield=document.getElementById('osmlon');
+		}else{
+			lonfield=parent.document.getElementById(lonfield_id);
+		}
+		latfield.value = lat;
+		lonfield.value = lon;								
+	}
+});
+
+function init(){			
+	var field = window.name.substring(0, window.name.lastIndexOf("."));
+	if(parent.document.getElementById(field+".latfield")!=null){
+		latfield_id = parent.document.getElementById(field+".latfield").value;	
+		document.getElementById('osm').style.display="none";
+	}
+	if(parent.document.getElementById(field+".lonfield")!=null){
+		lonfield_id = parent.document.getElementById(field+".lonfield").value;
+	}
+	if(parent.document.getElementById(field+".centerlat")!=null){
+		centerlat =parseFloat(parent.document.getElementById(field+".centerlat").value);
+	}
+	if(parent.document.getElementById(field+".centerlon")!=null){
+		centerlon = parseFloat(parent.document.getElementById(field+".centerlon").value);
+	}
+	if(parent.document.getElementById(field+".zoom")!=null){
+		zoom = parseFloat(parent.document.getElementById(field+".zoom").value);
+	}
+}
+
+function drawmap() {
+	OpenLayers.Lang.setCode('de'); 
+	mapdiv=document.getElementById('map');
+	mapdiv.style.height=window.innerHeight+"px";
+	mapdiv.style.width=window.innerWidth+"px";
+	map = new OpenLayers.Map('map', {
+		projection: new OpenLayers.Projection("EPSG:900913"),
+		displayProjection: new OpenLayers.Projection("EPSG:4326"),
+		controls: [
+			new OpenLayers.Control.Navigation(),
+			new OpenLayers.Control.PanZoomBar()],
+		maxExtent:
+			new OpenLayers.Bounds(-20037508.34,-20037508.34, 20037508.34, 20037508.34),
+		numZoomLevels: 18,
+		maxResolution: 156543,
+		units: 'meters'
+	});
+
+	layer_mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
+
+	map.addLayers([layer_mapnik]);
+	var y =lat2merc(centerlat);
+	var x =lon2merc(centerlon);
+	map.setCenter(new OpenLayers.LonLat(x, y), zoom);
+	
+	// Check for geolocation support
+	if(navigator.geolocation){
+		navigator.geolocation.getCurrentPosition(function(position){
+			var y =lat2merc(position.coords.latitude);
+			var x =lon2merc(position.coords.longitude);
+			map.setCenter(new OpenLayers.LonLat(x, y), '17');
+		});
+	}
+
+	var click = new OpenLayers.Control.Click();
+	map.addControl(click);
+	click.activate();
+}
diff --git a/trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
new file mode 100644
index 00000000..d4606e75
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -0,0 +1,202 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.freifunk.freifunk", package.seeall)
+
+function index()
+	local uci = require "luci.model.uci".cursor()
+	local page
+
+	-- Frontend
+	page          = node()
+	page.lock     = true
+	page.target   = alias("freifunk")
+	page.subindex = true
+	page.index    = false
+
+	page          = node("freifunk")
+	page.title    = _("Freifunk")
+	page.target   = alias("freifunk", "index")
+	page.order    = 5
+	page.setuser  = "nobody"
+	page.setgroup = "nogroup"
+	page.i18n     = "freifunk"
+	page.index    = true
+
+	page          = node("freifunk", "index")
+	page.target   = template("freifunk/index")
+	page.title    = _("Overview")
+	page.order    = 10
+	page.indexignore = true
+
+	page          = node("freifunk", "contact")
+	page.target   = template("freifunk/contact")
+	page.title    = _("Contact")
+	page.order    = 15
+
+	page          = node("freifunk", "status")
+	page.target   = template("freifunk/public_status")
+	page.title    = _("Status")
+	page.order    = 20
+	page.i18n     = "base"
+	page.setuser  = false
+	page.setgroup = false
+
+	entry({"freifunk", "status.json"}, call("jsonstatus"))
+	entry({"freifunk", "status", "zeroes"}, call("zeroes"), "Testdownload")
+
+	if nixio.fs.access("/usr/sbin/luci-splash") then
+		assign({"freifunk", "status", "splash"}, {"splash", "publicstatus"}, _("Splash"), 40)
+	end
+
+	page = assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, _("OLSR"), 30)
+	page.setuser = false
+	page.setgroup = false
+
+	if nixio.fs.access("/etc/config/luci_statistics") then
+		assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, _("Statistics"), 40)
+	end
+
+	-- backend
+	assign({"mini", "freifunk"}, {"admin", "freifunk"}, _("Freifunk"), 5)
+	entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), _("Freifunk"), 5)
+
+	page        = node("admin", "freifunk")
+	page.target = template("freifunk/adminindex")
+	page.title  = _("Freifunk")
+	page.order  = 5
+
+	page        = node("admin", "freifunk", "basics")
+	page.target = cbi("freifunk/basics")
+	page.title  = _("Basic Settings")
+	page.order  = 5
+	
+	page        = node("admin", "freifunk", "basics", "profile")
+	page.target = cbi("freifunk/profile")
+	page.title  = _("Profile")
+	page.order  = 10
+
+	page        = node("admin", "freifunk", "basics", "profile_expert")
+	page.target = cbi("freifunk/profile_expert")
+	page.title  = _("Profile (Expert)")
+	page.order  = 20
+
+	page        = node("admin", "freifunk", "Index-Page")
+	page.target = cbi("freifunk/user_index")
+	page.title  = _("Index Page")
+	page.order  = 50
+
+	page        = node("admin", "freifunk", "contact")
+	page.target = cbi("freifunk/contact")
+	page.title  = _("Contact")
+	page.order  = 15
+
+	entry({"freifunk", "map"}, template("freifunk-map/frame"), _("Map"), 50)
+	entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51)
+	entry({"admin", "freifunk", "profile_error"}, template("freifunk/profile_error"))
+end
+
+function zeroes()
+	local string = require "string"
+	local http = require "luci.http"
+	local zeroes = string.rep(string.char(0), 8192)
+	local cnt = 0
+	local lim = 1024 * 1024 * 1024
+	
+	http.prepare_content("application/x-many-zeroes")
+
+	while cnt < lim do
+		http.write(zeroes)
+		cnt = cnt + #zeroes
+	end
+end
+
+function jsonstatus()
+	local root = {}
+	local sys = require "luci.sys"
+	local uci = require "luci.model.uci"
+	local util = require "luci.util"
+	local http = require "luci.http"
+	local json = require "luci.json"
+	local ltn12 = require "luci.ltn12"
+	local version = require "luci.version"
+	local webadmin = require "luci.tools.webadmin"
+
+	local cursor = uci.cursor_state()
+
+	local ffzone = webadmin.firewall_find_zone("freifunk")
+	local ffznet = ffzone and cursor:get("firewall", ffzone, "network")
+	local ffwifs = ffznet and util.split(ffznet, " ") or {}
+
+
+	root.protocol = 1
+
+	root.system = {
+		uptime = {sys.uptime()},
+		loadavg = {sys.loadavg()},
+		sysinfo = {sys.sysinfo()},
+		hostname = sys.hostname()
+	}
+
+	root.firmware = {
+		luciname=version.luciname,
+		luciversion=version.luciversion,
+		distname=version.distname,
+		distversion=version.distversion
+	}
+
+	root.freifunk = {}
+	cursor:foreach("freifunk", "public", function(s)
+		root.freifunk[s[".name"]] = s
+	end)
+
+	cursor:foreach("system", "system", function(s)
+		root.geo = {
+			latitude = s.latitude,
+			longitude = s.longitude
+		}
+	end)
+
+	root.network = {}
+	root.wireless = {devices = {}, interfaces = {}, status = {}}
+	local wifs = root.wireless.interfaces
+	local netdata = luci.sys.net.deviceinfo() or {}
+
+	for _, vif in ipairs(ffwifs) do
+		root.network[vif] = cursor:get_all("network", vif)
+		root.wireless.devices[vif] = cursor:get_all("wireless", vif)
+		cursor:foreach("wireless", "wifi-iface", function(s)
+			if s.device == vif and s.network == vif then
+				wifs[#wifs+1] = s
+				if s.ifname then
+					local iwinfo = luci.sys.wifi.getiwinfo(s.ifname)
+					if iwinfo then
+						root.wireless.status[s.ifname] = { }
+
+						local _, f
+						for _, f in ipairs({
+							"channel", "txpower", "bitrate", "signal", "noise",
+							"quality", "quality_max", "mode", "ssid", "bssid", "encryption", "ifname"
+						}) do
+							root.wireless.status[s.ifname][f] = iwinfo[f]
+						end
+					end
+				end
+			end
+		end)
+	end
+
+	http.prepare_content("application/json")
+	ltn12.pump.all(json.Encoder(root):source(), http.write)
+end
diff --git a/trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/remote_update.lua b/trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/remote_update.lua
new file mode 100644
index 00000000..cc8dd142
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/controller/freifunk/remote_update.lua
@@ -0,0 +1,62 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2009 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+
+module("luci.controller.freifunk.remote_update", package.seeall)
+
+function index()
+	if not nixio.fs.access("/usr/sbin/remote-update") then
+		return
+	end
+
+	entry({"admin", "system", "remote_update"}, call("act_remote_update"),
+		_("Freifunk Remote Update"), 90)
+end
+
+function act_remote_update()
+	if luci.http.formvalue("flash") == "1" then
+		if luci.http.formvalue("confirm") == "1" then
+			local nobackup = ( luci.http.formvalue("keepcfg") ~= "1" )
+			local noverify = ( luci.http.formvalue("verify")  ~= "1" )
+
+			luci.http.redirect("/luci-static/flashing.html")
+
+			os.execute("start-stop-daemon -S -b -x /usr/sbin/remote-update -- %s%s-s 5 -y" % {
+				noverify and "-v " or "",
+				nobackup and "-n " or ""
+			})
+		else
+			luci.template.render("freifunk/remote_update", {confirm=1})
+		end
+	else
+		local fd = io.popen("remote-update -c")
+		local update = { }
+
+		if fd then
+			while true do
+				local ln=fd:read("*l")
+
+				if not ln                  then break
+				elseif ln:find("Local: ")  then update.locvar = ln:match("Local: (%d+)")
+				elseif ln:find("Remote: ") then update.remver = ln:match("Remote: (%d+)")
+				elseif ln == "--"          then update.info   = ""
+				elseif update.info ~= nil  then
+					update.info = update.info .. ln .. "\n"
+				end
+			end
+
+			fd:close()
+		end
+
+		luci.template.render("freifunk/remote_update", {update=update})
+	end
+end
diff --git a/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
new file mode 100644
index 00000000..8987b1cb
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
@@ -0,0 +1,104 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Manuel Munz <freifunk at somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]
+
+local fs = require "luci.fs"
+local util = require "luci.util"
+local uci = require "luci.model.uci".cursor()
+local profiles = "/etc/config/profile_"
+
+m = Map("freifunk", translate ("Community"))
+c = m:section(NamedSection, "community", "public", nil, translate("These are the basic settings for your local wireless community. These settings define the default values for the wizard and DO NOT affect the actual configuration of the router."))
+
+community = c:option(ListValue, "name", translate ("Community"))
+community.rmempty = false
+
+local list = { }
+local list = fs.glob(profiles .. "*")
+
+for k,v in ipairs(list) do
+	local name = uci:get_first(v, "community", "name") or "?"
+	local n = string.gsub(v, profiles, "")
+	community:value(n, name)
+end
+
+
+n = Map("system", translate("Basic system settings"))
+function n.on_after_commit(self)
+	luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "basics"))
+end
+
+b = n:section(TypedSection, "system")
+b.anonymous = true
+
+hn = b:option(Value, "hostname", translate("Hostname"))
+hn.rmempty = false
+hn.datatype = "hostname"
+
+loc = b:option(Value, "location", translate("Location"))
+loc.rmempty = false
+loc.datatype = "minlength(1)"
+
+lat = b:option(Value, "latitude", translate("Latitude"), translate("e.g.") .. " 48.12345")
+lat.datatype = "float"
+lat.rmempty = false
+
+lon = b:option(Value, "longitude", translate("Longitude"), translate("e.g.") .. " 10.12345")
+lon.datatype = "float"
+lon.rmempty = false
+
+--[[
+Opens an OpenStreetMap iframe or popup
+Makes use of resources/OSMLatLon.htm and htdocs/resources/osm.js
+]]--
+
+local class = util.class
+local ff = uci:get("freifunk", "community", "name") or ""
+local co = "profile_" .. ff
+
+local deflat = uci:get_first("system", "system", "latitude") or uci:get_first(co, "community", "latitude") or 52
+local deflon = uci:get_first("system", "system", "longitude") or uci:get_first(co, "community", "longitude") or 10
+local zoom = 12
+if ( deflat == 52 and deflon == 10 ) then
+	zoom = 4
+end
+
+OpenStreetMapLonLat = luci.util.class(AbstractValue)
+    
+function OpenStreetMapLonLat.__init__(self, ...)
+	AbstractValue.__init__(self, ...)
+	self.template = "cbi/osmll_value"
+	self.latfield = nil
+	self.lonfield = nil
+	self.centerlat = ""
+	self.centerlon = ""
+	self.zoom = "0"
+	self.width = "100%" --popups will ignore the %-symbol, "100%" is interpreted as "100"
+	self.height = "600"
+	self.popup = false
+	self.displaytext="OpenStreetMap" --text on button, that loads and displays the OSMap
+	self.hidetext="X" -- text on button, that hides OSMap
+end
+
+	osm = b:option(OpenStreetMapLonLat, "latlon", translate("Find your coordinates with OpenStreetMap"), translate("Select your location with a mouse click on the map. The map will only show up if you are connected to the Internet."))
+	osm.latfield = "latitude"
+	osm.lonfield = "longitude"
+	osm.centerlat = uci:get_first("system", "system", "latitude") or deflat
+	osm.centerlon = uci:get_first("system", "system", "longitude") or deflon
+	osm.zoom = zoom
+	osm.width = "100%"
+	osm.height = "600"
+	osm.popup = false
+	osm.displaytext=translate("Show OpenStreetMap")
+	osm.hidetext=translate("Hide OpenStreetMap")
+
+return m, n
diff --git a/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
new file mode 100644
index 00000000..30e94a3e
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("freifunk", translate("Contact"), translate("Please fill in your contact details below."))
+
+c = m:section(NamedSection, "contact", "public", "")
+
+c:option(Value, "nickname", translate("Nickname"))
+c:option(Value, "name", translate("Realname"))
+c:option(DynamicList, "homepage", translate("Homepage"))
+c:option(Value, "mail", translate("E-Mail"))
+c:option(Value, "phone", translate("Phone"))
+c:option(TextValue, "note", translate("Notice")).rows = 10
+
+return m
diff --git a/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua
new file mode 100644
index 00000000..c9bd23ed
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua
@@ -0,0 +1,83 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011-2012 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	httc://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local uci = require "luci.model.uci".cursor()
+local ipkg = require "luci.model.ipkg"
+local community = uci:get("freifunk", "community", "name")
+
+if community == nil then
+	luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "profile_error"))
+	return
+else
+	community = "profile_" .. community
+	m = Map(community, translate("Community settings"), translate("These are the settings of your local community."))
+	c = m:section(NamedSection, "profile", "community")
+
+	local name = c:option(Value, "name", "Name")
+	name.rmempty = false
+
+	local homepage = c:option(Value, "homepage", translate("Homepage"))
+
+	local cc = c:option(Value, "country", translate("Country code"))
+	function cc.cfgvalue(self, section)
+		return uci:get(community, "wifi_device", "country")
+	end
+	function cc.write(self, sec, value)
+		if value then
+			uci:set(community, "wifi_device", "country", value)
+			uci:save(community)
+		end
+	end
+
+	local ssid = c:option(Value, "ssid", translate("ESSID"))
+	ssid.rmempty = false
+
+	local prefix = c:option(Value, "mesh_network", translate("Mesh prefix"))
+	prefix.datatype = "ip4addr"
+	prefix.rmempty = false
+
+	local splash_net = c:option(Value, "splash_network", translate("Network for client DHCP addresses"))
+	splash_net.datatype = "ip4addr"
+	splash_net.rmempty = false
+
+	local splash_prefix = c:option(Value, "splash_prefix", translate("Client network size"))
+	splash_prefix.datatype = "range(0,32)"
+	splash_prefix.rmempty = false
+
+	local ipv6 = c:option(Flag, "ipv6", translate("Enable IPv6"))
+	ipv6.rmempty = true
+
+        local ipv6_config = c:option(ListValue, "ipv6_config", translate("IPv6 Config"))
+	ipv6_config:depends("ipv6", 1)
+	ipv6_config:value("static")
+	if ipkg.installed ("auto-ipv6-ib") then
+		ipv6_config:value("auto-ipv6-random")
+		ipv6_config:value("auto-ipv6-fromv4")
+	end
+	ipv6_config.rmempty = true
+
+	local ipv6_prefix = c:option(Value, "ipv6_prefix", translate("IPv6 Prefix"), translate("IPv6 network in CIDR notation."))
+	ipv6_prefix:depends("ipv6", 1)
+	ipv6_prefix.datatype = "ip6addr"
+	ipv6_prefix.rmempty = true
+
+	local vap = c:option(Flag, "vap", translate("VAP"), translate("Enable a virtual access point (VAP) by default if possible."))
+	vap.rmempty = true
+
+	local lat = c:option(Value, "latitude", translate("Latitude"))
+	lat.datatype = "range(-180, 180)"
+	lat.rmempty = false
+
+	local lon = c:option(Value, "longitude", translate("Longitude"))
+	lon.rmempty = false
+	return m
+end
diff --git a/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua
new file mode 100644
index 00000000..0d890e1d
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua
@@ -0,0 +1,41 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	httc://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local fs = require "nixio.fs"
+local uci = require "luci.model.uci".cursor()
+local community = uci:get("freifunk", "community", "name")
+
+if community == nil then
+        luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "profile_error"))
+        return
+else
+        community = "/etc/config/profile_" .. community
+	f = SimpleForm("community", translate("Community profile"), translate("You can manually edit the selected community profile here."))
+
+	t = f:field(TextValue, "cop")
+	t.rmempty = true
+	t.rows = 30
+	function t.cfgvalue()
+		return fs.readfile(community) or ""
+	end
+
+	function f.handle(self, state, data)
+		if state == FORM_VALID then
+			if data.cop then
+				fs.writefile(community, data.cop:gsub("\r\n", "\n"))
+			end
+		end
+		return true
+	end
+	return f
+end
+
diff --git a/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua
new file mode 100644
index 00000000..fe1d8fe7
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua
@@ -0,0 +1,30 @@
+local fs = require "nixio.fs"
+local file = "/www/luci-static/index_user.html"
+
+m = Map("freifunk", translate("Edit index page"), translate("You can display additional content on the public index page by inserting valid XHTML in the form below.<br />Headlines should be enclosed between &lt;h2&gt; and &lt;/h2&gt;."))
+
+s = m:section(NamedSection, "community", "public", "")
+s.anonymous = true
+
+di = s:option(Flag, "DefaultText", translate("Disable default content"), translate("If selected then the default content element is not shown."))
+di.enabled = "disabled"
+di.disabled = "enabled"
+di.rmempty = false
+
+t = s:option(TextValue, "_text")
+t.rmempty = true
+t.rows = 20
+
+function t.cfgvalue()
+        return fs.readfile(file) or ""
+end
+
+function t.write(self, section, value)
+        return fs.writefile(file, value)
+end
+
+function t.remove(self, section)
+        return fs.unlink(file)
+end
+
+return m
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/cbi/osmll_value.htm b/trunk/package/luci/modules/freifunk/luasrc/view/cbi/osmll_value.htm
new file mode 100644
index 00000000..78b4dff9
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/cbi/osmll_value.htm
@@ -0,0 +1,55 @@
+<%#
+cc-by-sa Andreas Pittrich <andreas.pittrich@web.de>
+in behalf of the german pirate party (Piratenpartei)
+www.piratenpartei.de
+
+$Id$
+
+-%>
+<%+cbi/valueheader%>
+
+		<% if self:cfgvalue(section) ~= false then %>
+			<% if self.latfield and self.lonfield then %>
+				<input type="hidden" <%= attr("value", string.format('cbid.%s.%s.%s', self.config, section, self.latfield))..attr("id", cbid..".latfield")..attr("name", cbid..".latfield")%>/>
+				<input type="hidden" <%= attr("value", string.format('cbid.%s.%s.%s', self.config, section, self.lonfield))..attr("id", cbid..".lonfield")..attr("name", cbid..".lonfield")%>/>
+			<% end %>
+			<input type="hidden" <%= attr("value", self.centerlat)..attr("id", cbid..".centerlat")..attr("name", cbid..".centerlat")%>/>
+			<input type="hidden" <%= attr("value", self.centerlon)..attr("id", cbid..".centerlon")..attr("name", cbid..".centerlon")%>/>
+			<input type="hidden" <%= attr("value", self.zoom)..attr("id", cbid..".zoom")..attr("name", cbid..".zoom")%>/>
+		<% end %>
+
+		<% if self.popup then %>
+			<input class="cbi-button cbi-input-button" type="button"<%= attr("name", cbid..".button")..attr("id", cbid..".button")..attr("value", self.displaytext)%> 
+					onclick="
+						popup=window.open('/luci-static/resources/OSMLatLon.htm', '<%=cbid%>.window', 'innerWidth=<%=self.width%>, innerHeight=<%=self.height%>, location=no, menubar=no, scrollbars=no, status=no, toolbar=no');
+						popup.focus();
+					"
+			/>
+	</div>
+	<div>		
+		<% else %>
+			<input class="cbi-button cbi-input-button" type="button"<%= attr("name", cbid..".displayosm")..attr("id", cbid..".displayosm")..attr("value", self.displaytext)%> 
+					onclick="
+						document.getElementById('<%=cbid..".hideosm"%>').style.display='inline';
+						document.getElementById('<%=cbid..".displayosm"%>').style.display='none';
+						for(var i = 0; Math.min(i, window.frames.length)!=window.frames.lengths; i++){
+							if(frames[i].name=='<%=cbid..".iframe"%>'){								
+								document.getElementById('<%=cbid..".iframediv"%>').style.display='block';
+								frames[i].location.href='/luci-static/resources/OSMLatLon.htm';
+							}
+                                                }
+					"
+			/>
+			<input class="cbi-button cbi-input-button" style="display:none" type="button"<%= attr("name", cbid..".hideosm")..attr("id", cbid..".hideosm")..attr("value", self.hidetext)%> 
+					onclick="
+						document.getElementById('<%=cbid..".displayosm"%>').style.display='inline';
+						document.getElementById('<%=cbid..".hideosm"%>').style.display='none';
+						document.getElementById('<%=cbid..".iframediv"%>').style.display='none';
+					"
+			/>
+	</div>
+	<div class="cbi-value-osmiframesection" id="<%=cbid..".iframediv"%>" style="display:none">
+			<iframe src="" <%= attr("id", cbid..".iframe")..attr("name", cbid..".iframe")..attr("width", self.width)..attr("height", self.height)%> frameborder="0" scrolling="no"></iframe>
+		<%end%>
+
+<%+cbi/valuefooter%>
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/frame.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/frame.htm
new file mode 100644
index 00000000..b2e16836
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/frame.htm
@@ -0,0 +1,29 @@
+<%+header%>
+
+<%
+	local has_latlon = false
+	local uci = require "luci.model.uci".cursor()
+	uci:foreach("olsrd", "LoadPlugin", function(s)
+		if s.library == "olsrd_nameservice.so.0.3" and s.latlon_file then
+			has_latlon = true
+		end
+	end)
+%>
+
+<% if has_latlon then %>
+	<iframe style="width:100%; height:640px; border:none" src="<%=luci.dispatcher.build_url("freifunk/map/content")%>"></iframe>
+	<h3><%:Legend%>:</h3>
+	<ul>
+		<li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (ETX < 2)%></li>
+		<li><strong><span style="color:#ffcb05"><%:Yellow%></span></strong>:<%:Good (2 < ETX < 4)%></li>
+		<li><strong><span style="color:#ff6600"><%:Orange%></span></strong>:<%:Still usable (4 < ETX < 10)%></li>
+		<li><strong><span style="color:#bb3333"><%:Red%></span></strong>:<%:Bad (ETX > 10)%></li>
+	</ul>
+
+<% else %>
+	<h2><%:Map Error%></h2>
+	<p><%_The OLSRd service is not configured to capture position data from the network.<br />
+		Please make sure that the nameservice plugin is properly configured and that the <em>latlon_file</em> option is enabled.%></p>
+<% end %>
+<%+footer%>
+
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/map.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/map.htm
new file mode 100644
index 00000000..c3951f9c
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk-map/map.htm
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+	<head>
+		<title>Map</title>
+	</head>
+
+	<body style="margin:0">
+		<script src="//dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.1&s=1" type="text/javascript"></script>
+		<script type="text/javascript">
+			var alias = new Array;
+			var points = new Array;
+			var unkpos = new Array;
+			var lineid = 0;
+			onload=new Function("if(null!=window.ffmapinit)ffmapinit();");
+
+			function Mid(mainip,aliasip)
+			{
+				alias[aliasip]=mainip;
+			}
+
+			function Node(mainip,lat,lon,ishna,hnaip,name)
+			{
+				points[mainip] = new VELatLong(lat, lon);
+				map.AddPushpin(new VEPushpin(mainip, points[mainip],
+				'<%=luci.config.main.resourcebase%>/freifunk-map/'+(ishna?'hna':'node')+'.gif', 'Node:'+name,
+				'<br><img src="<%=luci.config.main.resourcebase%>/freifunk-map/'+(ishna?'hna':'node')+'.gif">'+
+				'<br>IP:'+mainip+'<br>DefGW:'+hnaip));
+			}
+
+			function Self(mainip,lat,lon,ishna,hnaip,name)
+			{
+				//map.SetDashboardSize(VEDashboardSize.Small);
+				map.LoadMap(new VELatLong(lat, lon), 15, VEMapStyle.Hybrid);
+				map.SetScaleBarDistanceUnit(VEDistanceUnit.Kilometers);
+				map.ShowMiniMap(14, 474);
+				Node(mainip,lat,lon,ishna,hnaip,name);
+			}
+
+			function Link(fromip,toip,lq,nlq,etx)
+			{
+				if (0==lineid && null!=window.ffmapstatic) ffmapstatic();
+				if (null != alias[toip]) toip = alias[toip];
+				if (null != alias[fromip]) fromip = alias[fromip];
+				if (null != points[fromip] && null != points[toip])
+				{
+					var color;
+					var red = 240;
+					var green = 0;
+					var blue = 0;
+					var w = 1
+
+					if (etx < 100) {red=252;green=102;blue=0;w=2};
+					if (etx < 10) {red=255;green=203;blue=5;w=3};
+					if (etx < 4) {red=240;green=255;blue=0;w=4};
+					if (etx < 2) {red=0;green=204;blue=0;w=5};
+					if (etx < 1) {red=80;green=0;blue=0;w=1};
+
+					map.AddPolyline(new VEPolyline('id'+lineid, [points[fromip], points[toip]],
+					new VEColor(red, green, blue, 0.5), w));
+
+
+				}
+				else
+				{
+					if (null == points[toip]) unkpos[toip] = '';
+					if (null == points[fromip]) unkpos[fromip] = '';
+				}
+				lineid++;
+			}
+
+			function PLink(fromip,toip,lq,nlq,etx,lata,lona,ishnaa,latb,lonb,ishnab)
+			{
+				Link(fromip,toip,lq,nlq,etx);
+			}
+
+			function ffmapinit()
+			{
+				if(null!=window.map)map.Dispose();
+
+				var INFINITE = 99.99;
+
+				map = new VEMap('ffmap');
+				<%
+					local fd
+					local uci = require "luci.model.uci".cursor()
+
+					uci:foreach("olsrd", "LoadPlugin", function(s)
+						if s.library == "olsrd_nameservice.so.0.3" and s.latlon_file then
+							fd = io.open(s.latlon_file)
+						end
+					end)
+
+					if fd then
+						local data = fd:read("*a")
+						fd:close()
+
+						if data then
+							local line
+							for line in data:gmatch("[^\n]+") do
+								if line:match(";$") then
+									write(line .. "\n")
+								else
+									break
+								end
+							end
+						end
+					end
+				%>
+			}
+
+			function ffgoto(ip)
+			{
+				map.SetCenter(points[ip]);
+			}
+		</script>
+		<div id="ffmap" style="position:relative; width:100%; height:640px;"></div>
+	</body>
+</html>
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/adminindex.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/adminindex.htm
new file mode 100644
index 00000000..e0252ba8
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/adminindex.htm
@@ -0,0 +1,51 @@
+<%+header%>
+<%
+local uci = require "luci.model.uci".cursor()
+local contact = uci:get_all("freifunk", "contact")
+local contacturl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "contact")
+local hostname = uci:get_first ("system", "system", "hostname")
+local latitude = uci:get_first ("system", "system", "latitude")
+local longitude = uci:get_first ("system", "system", "longitude")
+local location = uci:get_first ("system", "system", "location")
+local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics")
+local nickname, name, mail
+if not contact then
+	nickname, name, mail = ""
+else
+	nickname = contact.nickname
+	name = contact.name
+	mail = contact.mail
+end
+
+%>
+
+<h2><%:Freifunk Overview%></h2>
+
+<%:These pages will assist you in setting up your router for Freifunk or similar wireless community networks.%>
+<p />
+
+<% if not (hostname and latitude and longitude and location) then%>
+<div class="error">
+	<%:Basic settings are incomplete. Please go to%> <a href='<%=basicsurl%>'><%:Basic settings%></a> <%:and fill out all required fields.%>
+</div>
+<%end%>
+<p />
+
+<% if not (nickname and name and mail) then%>
+<div class="error">
+	<%:Contact information is incomplete. Please go to%> <a href='<%=contacturl%>'><%:Contact%></a> <%:and fill out all required fields.%>
+	<p />
+</div>
+<%end%>
+
+<% uci:foreach("wireless", "wifi-device", function(section)
+	local device = section[".name"]
+	local url = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "network", "wireless")
+	if section.diversity ~= "0" and section.disabled ~= "1" and section.type ~= "mac80211" then
+		print('<div class="error">' .. translate("Diversity is enabled for device") .. ' <b>' .. section[".name"] .. '</b>. '
+		.. translate("Go to") .. ' <a href="' .. url .. '">' .. translate("wireless settings") .. '</a> ' ..
+		translate("to disable it.") .. '</div><p />')
+	end
+end) %>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/contact.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/contact.htm
new file mode 100644
index 00000000..2d79ccd4
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/contact.htm
@@ -0,0 +1,70 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+-%>
+
+<%+header%>
+
+<% 
+local uci = require "luci.model.uci".cursor()
+local contact = uci:get_all("freifunk", "contact")
+local nickname, name, mail, phone, location, note
+local lon = uci:get_first("system", "system", "longitude")
+local lat = uci:get_first("system", "system", "latitude")
+
+if not contact then
+	nickname, name, homepage, mail, phone, location, note = ""
+else
+	nickname = contact.nickname or ""
+	name = contact.name or ""
+	homepage = contact.homepage or {}
+	mail = contact.mail or ""
+	phone = contact.phone or ""
+	location = uci:get_first("system", "system", "location") or contact.location
+	note = contact.note or ""
+end
+%>
+
+<h2><a id="content" name="content"><%:Contact%></a></h2>
+
+<fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
+<legend><%:Operator%></legend>
+	<table cellspacing="10" width="100%" style="text-align:left">
+		<tr><th width="33%"><%:Nickname%>:</th><td><%=nickname%></td></tr>
+		<tr><th width="33%"><%:Realname%>:</th><td><%=name%></td></tr>
+		<tr><th width="33%"><%:Homepage%>:</th><td>
+			<% for k, v in ipairs(homepage) do %>
+			<a href="<%=v%>"><%=v%></a><br />
+			<% end %>
+		</td></tr>
+		<tr><th width="33%"><%:E-Mail%>:</th><td><a href="mailto:<%=mail%>"><%=mail%></a></td></tr>
+		<tr><th width="33%"><%:Phone%>:</th><td><%=phone%></td></tr>
+	</table>
+</fieldset>
+
+<fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
+<legend><%:Location%></legend>
+	<table cellspacing="10" width="100%" style="text-align:left">
+		<tr><th width="33%"><%:Location%>:</th><td><%=location%></td></tr>
+		<tr><th width="33%"><%:Coordinates%>:</th><td><%=lat%> <%=lon%> (<a href="<%=pcdata(luci.dispatcher.build_url("freifunk/map"))%>"><%:Show on map%>)</a></td></tr>
+	</table>
+</fieldset>
+
+<% if note then %>
+<fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
+<legend><%:Notice%></legend>
+	<table cellspacing="10" width="100%" style="text-align:left">
+		<tr><td><%=note%></td></tr>
+	</table>
+</fieldset>
+<%end%>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/index.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/index.htm
new file mode 100644
index 00000000..0fcec459
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/index.htm
@@ -0,0 +1,92 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<% 
+local uci = require "luci.model.uci".cursor()
+local tpl = require "luci.template"
+local fs = require "luci.fs"
+local ff = {}
+local ff = uci:get_all("freifunk")
+
+if not ff or not ff.community.name then
+	community = "Freifunk"
+	DefaultText = ""
+	nickname = "No Nickname set"
+else
+	community = ff.community.name
+	DefaultText = ff.community.DefaultText
+	nickname = ff.contact.nickname
+end
+
+local co = "profile_" .. community
+--local community = uci:get_first(co, "community", "name") or "Freifunk"
+local url = uci:get_first(co, "community", "homepage") or "http://www.freifunk.net"
+
+
+local usertext = fs.readfile("/www/luci-static/index_user.html")
+
+if DefaultText ~= "disabled" then
+
+	defaulttext = '<h2><a id="content" name="content">'..
+	(translate("Hello and welcome in the network of"))..
+	' '..
+	(community or "Freifunk Deutschland")..
+	'!</a></h2><p>'..
+	translate("We are an initiative to establish a free, independent and open wireless mesh network.")..
+	'<br />'..
+	translate("This is the access point")..
+	' '..
+	luci.sys.hostname()..
+	'. '..
+	translate("It is operated by")..
+	' <a href="'..
+	luci.dispatcher.build_url("freifunk", "contact")..
+	'">'..
+	(nickname or translate("Please set your contact information"))..
+	'</a>.</p><p>'..
+	translate("You can find further information about the global Freifunk initiative at")..
+	' <a href="http://freifunk.net">Freifunk.net</a>.<br />'..
+	translate("If you are interested in our project then contact the local community")..
+	' <a href="'..url..'">'..community..'</a>.</p><p><strong>'..
+	translate("Notice")..
+	'</strong>: '..
+	translate("Internet access depends on technical and organisational conditions and may or may not work for you.")..
+	'</p>'
+end
+%>
+
+<%=defaulttext%>
+<%=usertext%>
+
+<%
+-- add custom widgets from view/freifunk/widgets
+local widgets = {}
+local dir = "/usr/lib/lua/luci/view/freifunk/widgets"
+
+uci:foreach("freifunk-widgets", "widget",
+			function(s)
+				if s.enabled == "1" then
+					table.insert(widgets, s)
+				end
+			end)
+
+for k, v in ipairs(widgets) do
+	if v['template'] and fs.access(dir .. "/" .. v['template'] .. "/main.htm") then
+		tpl.render("freifunk/widgets/" .. v['template'] .. "/main", { data = v })
+	end
+end
+
+%>
+<%+footer%>
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/profile_error.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/profile_error.htm
new file mode 100644
index 00000000..984fa0ac
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/profile_error.htm
@@ -0,0 +1,11 @@
+<%+header%>
+
+<%
+local profileurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics")
+%>
+
+<h2><%:Error%></h2>
+<%:You need to select a profile before you can edit it. To select a profile go to%> <a href='<%=profileurl%>'><%:Basic settings%></a>.
+<p/>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/public_status.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/public_status.htm
new file mode 100644
index 00000000..10bd849d
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/public_status.htm
@@ -0,0 +1,372 @@
+<%
+local sys = require "luci.sys"
+local twa = require "luci.tools.webadmin"
+
+-- System
+local model, system, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo()
+local uptime = twa.date_format(tonumber(sys.uptime()))
+local time = os.date("%a, %d %b %Y, %H:%M:%S")
+local load1, load5, load15 = sys.loadavg()
+local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15)
+
+local mem = string.format(
+	"%.2f MB (%.2f %s, %.2f %s, %.2f %s, %.2f %s)",
+	tonumber(memtotal) / 1024,
+	tonumber(memtotal - memfree) / 1024,
+	tostring(i18n.translate("used")),
+	memfree / 1024,
+	tostring(i18n.translate("free")),
+	memcached / 1024,
+	tostring(i18n.translate("cached")),
+	membuffers / 1024,
+	tostring(i18n.translate("buffered"))
+)
+
+-- update interval
+local bogomips = bogomips or 100
+local interval = 10
+if bogomips > 350 then
+	interval = 5
+end
+
+-- wireless
+local ntm = require "luci.model.network".init()
+local devices  = ntm:get_wifidevs()
+local netlist = { }
+local netdevs = { }
+local dev
+for _, dev in ipairs(devices) do
+	local net
+	for _, net in ipairs(dev:get_wifinets()) do
+		netlist[#netlist+1] = net:ifname()
+		netdevs[net:ifname()] = dev:name()
+	end
+end
+local has_iwinfo = pcall(require, "iwinfo")
+
+-- Routes
+local defroutev4 = sys.net.defaultroute()
+local defroutev6 = sys.net.defaultroute6()
+
+if defroutev4 then
+	defroutev4.dest = defroutev4.dest:string()
+	defroutev4.gateway = defroutev4.gateway:string()
+else
+	-- probably policy routing activated, try olsr-default table
+	local dr4 = sys.exec("ip r s t olsr-default")
+	if dr4 then
+		defroutev4 = { }
+		defroutev4.dest, defroutev4.gateway, defroutev4.device, defroutev4.metric = dr4:match("^(%w+) via (%d+.%d+.%d+.%d+) dev ([%w-]+) +metric (%d+)")
+	end
+end
+
+if defroutev6 then
+	defroutev6.dest = defroutev6.dest:string()
+	defroutev6.nexthop = defroutev6.nexthop:string()
+end
+
+if luci.http.formvalue("status") == "1" then
+	local rv = { }
+	for dev in pairs(netdevs) do
+		local j = { id = dev }
+		local iw = luci.sys.wifi.getiwinfo(dev)
+		if iw then
+			local f
+			for _, f in ipairs({
+				"channel", "txpower", "bitrate", "signal", "noise",
+				"quality", "quality_max", "mode", "ssid", "bssid", "encryption", "ifname"
+			}) do
+				j[f] = iw[f]
+			end
+		end
+		rv[#rv+1] = j
+	end
+
+	if defroutev6 then
+		def6 = {
+			gateway = defroutev6.nexthop,
+			dest = defroutev6.dest,
+			dev = defroutev6.device,
+			metr = defroutev6.metric
+		}
+	end
+
+	if defroutev4 then
+		def4 = {
+			gateway = defroutev4.gateway,
+			dest = defroutev4.dest,
+			dev = defroutev4.device,
+			metr = defroutev4.metric
+		}
+	end
+
+	rv[#rv+1] = {
+		time = time,
+		uptime = uptime,
+		load = load,
+		mem = mem,
+		defroutev4 = def4,
+		defroutev6 = def6
+	}
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(rv)
+	return
+end
+-%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+
+<script type="text/javascript">//<![CDATA[
+	 XHR.poll(<%=interval%> , '<%=REQUEST_URI%>', { status: 1 },
+		function(x, st)
+		{
+			if (st)
+			{
+				for( var i = 0; i < st.length; i++ )
+				{
+					var iw = st[i];
+					var is_assoc = (iw.bssid && iw.channel);
+					var p = (100 / iw.quality_max * iw.quality);
+					var q = is_assoc ? p : -1;
+
+					var icon;
+					if (q < 0)
+						icon = "<%=resource%>/icons/signal-none.png";
+					else if (q == 0)
+						icon = "<%=resource%>/icons/signal-0.png";
+					else if (q < 25)
+						icon = "<%=resource%>/icons/signal-0-25.png";
+					else if (q < 50)
+						icon = "<%=resource%>/icons/signal-25-50.png";
+					else if (q < 75)
+						icon = "<%=resource%>/icons/signal-50-75.png";
+					else
+						icon = "<%=resource%>/icons/signal-75-100.png";
+
+					var power = document.getElementById(iw.id + '-txpower');
+					if (power)
+						power.innerHTML = String.format('%s dbm', iw.txpower);
+
+					var signal = document.getElementById(iw.id + '-signal');
+					if (signal)
+						signal.innerHTML = String.format(
+							'<img src="%s" title="Signal: %s db / Noise: %s db" alt="Signal Quality" />',
+							icon, iw.signal, iw.noise
+						);
+
+					var bitrate = document.getElementById(iw.id + '-bitrate');
+					if (bitrate)
+						bitrate.innerHTML = String.format('%s Mb/s', iw.bitrate ? iw.bitrate / 1000 : '?');
+
+					var ssid = document.getElementById(iw.id + '-ssid');
+					if (ssid)
+						ssid.innerHTML = iw.ssid;
+
+					var bssid = document.getElementById(iw.id + '-bssid');
+					if (bssid)
+						bssid.innerHTML = iw.bssid;
+
+					var channel = document.getElementById(iw.id + '-channel');
+					if (channel)
+						channel.innerHTML = iw.channel;
+
+					var mode = document.getElementById(iw.id + '-mode');
+					if (mode)
+					mode.innerHTML = iw.mode;
+				}
+
+				i = st.length - 1
+				var u
+
+				if (u = document.getElementById('dynuptime'))
+					u.innerHTML = st[i].uptime;
+
+				if (u = document.getElementById('dynload'))
+					u.innerHTML = st[i].load;
+
+				if (u = document.getElementById('dynmem'))
+					u.innerHTML = st[i].mem;
+
+				if (u = document.getElementById('dyntime'))
+					u.innerHTML = st[i].time;
+
+				if (st[i].defroutev4)
+				{
+					if (u = document.getElementById('v4dst'))
+						u.innerHTML = st[i].defroutev4.dest;
+
+					if (u = document.getElementById('v4gw'))
+						u.innerHTML = st[i].defroutev4.gateway;
+
+					if (u = document.getElementById('v4dev'))
+						u.innerHTML = st[i].defroutev4.dev;
+
+					if (u = document.getElementById('v4metr'))
+						u.innerHTML = st[i].defroutev4.metr;
+				}
+
+				if (st[i].defroutev6)
+				{
+					if (u = document.getElementById('v6dst'))
+						u.innerHTML = st[i].defroutev6.dest;
+
+					if (u = document.getElementById('v6gw'))
+						u.innerHTML = st[i].defroutev6.gateway;
+
+					if (u = document.getElementById('v6dev'))
+						u.innerHTML = st[i].defroutev6.dev;
+
+					if (u = document.getElementById('v6metr'))
+						u.innerHTML = st[i].defroutev6.metr;
+				}
+			}
+		}
+	);
+//]]></script>
+
+<div class="cbi-map">
+	<h2><%:System%></h2>
+	<div class="cbi-section-node">
+		<div class="cbi-value"><label class="cbi-value-title"><%:System%></label><div class="cbi-value-field"><%=system%></div></div>
+		<div class="cbi-value"><label class="cbi-value-title"><%:Processor%></label><div class="cbi-value-field"><%=model%></div></div>
+		<div class="cbi-value"><label class="cbi-value-title"><%:Load%></label><div class="cbi-value-field" id="dynload"><%=load%></div></div>
+		<div class="cbi-value"><label class="cbi-value-title"><%:Memory%></label><div class="cbi-value-field" id="dynmem"><%=mem%></div></div>
+		<div class="cbi-value"><label class="cbi-value-title"><%:Local Time%></label><div class="cbi-value-field" id="dyntime"><%=time%></div></div>
+		<div class="cbi-value"><label class="cbi-value-title"><%:Uptime%></label><div class="cbi-value-field" id="dynuptime"><%=uptime%></div></div>
+	</div>
+</div>
+
+<% if devices[1] then %>
+
+<div class="cbi-map">
+	<h2><%:Wireless Overview%></h2>
+
+		<% if not has_iwinfo then %>
+			<div class="errorbox">
+				<strong><%:Package libiwinfo required!%></strong><br />
+				<%_The <em>libiwinfo</em> package is not installed. You must install this component for working wireless configuration!%>
+			</div>
+		<% end %>
+
+		<div class="cbi-section">
+			<div class="cbi-section-node">
+				<table class="cbi-section-table">
+					<tr class="cbi-section-table-titles">
+						<th class="cbi-section-table-cell"><%:Signal%></th>
+						<th class="cbi-section-table-cell"><%:Bitrate%></th>
+						<th class="cbi-section-table-cell"><%:SSID%></th>
+						<th class="cbi-section-table-cell"><%:BSSID%></th>
+						<th class="cbi-section-table-cell"><%:Channel%></th>
+						<th class="cbi-section-table-cell"><%:Mode%></th>
+						<th class="cbi-section-table-cell"><%:TX%>-<%:Power%></th>
+						<th class="cbi-section-table-cell"><%:Interface%></th>
+					</tr>
+	<%
+	for _, dev in ipairs(devices) do
+	local net
+		for _, net in ipairs(dev:get_wifinets()) do
+			netlist[#netlist+1] = net:ifname()
+			netdevs[net:ifname()] = dev:name()
+
+			if net.iwdata.device then
+				local signal = net.iwinfo.signal or "N/A"
+				local noise = net.iwinfo.noise or "N/A"
+				local q = net.iwinfo.quality or "0"
+				local qmax = net.iwinfo.quality_max or "100"
+				local qperc = q / qmax * 100
+
+				if qperc == 0 then
+					icon = "signal-none.png"
+				elseif qperc < 26 then
+					icon = "signal-0-25.png"
+				elseif qperc < 51 then
+					icon = "signal-25-50.png"
+				elseif qperc < 76 then
+					icon = "signal-50-75.png"
+				elseif qperc < 100 then
+					icon = "signal-75-100.png"
+				else
+					icon = "signal-0.png"
+				end
+
+				signal_string = "<img src='"..resource.."/icons/"..icon.."' title='Signal: "..signal.." db / Noise: "..noise.." db' alt='Signal Quality'></img>"
+
+				local ssid = net.iwinfo.ssid or "N/A"
+				local bssid = net.iwinfo.bssid or "N/A"
+				local chan = net.iwinfo.channel or "N/A"
+				local mode = net.iwinfo.mode or "N/A"
+				local txpwr = net.iwinfo.txpower or "N/A"
+				if txpwr ~= "N/A" then
+					txpwr = txpwr.." dbm"
+				end
+				local bitrate = net.iwinfo.bitrate or "N/A"
+				if bitrate ~= "N/A" then
+					bitrate = ( bitrate / 1000 ).."Mb/s"
+				end
+				local interface = net.iwdata.ifname or "N/A"
+	%>
+						<tr class="cbi-section-table-row cbi-rowstyle-1">
+						<td class="cbi-value-field" id="<%=net:ifname()%>-signal"><%=signal_string%></td>
+						<td class="cbi-value-field" id="<%=net:ifname()%>-bitrate"><%=bitrate%></td>
+						<td class="cbi-value-field" id="<%=net:ifname()%>-ssid"><%=ssid%></td>
+						<td class="cbi-value-field" id="<%=net:ifname()%>-bssid"><%=bssid%></td>
+						<td class="cbi-value-field" id="<%=net:ifname()%>-channel"><%=chan%></td>
+						<td class="cbi-value-field" id="<%=net:ifname()%>-mode"><%=mode%></td>
+						<td class="cbi-value-field" id="<%=net:ifname()%>-txpower"><%=txpwr%></td>
+						<td class="cbi-value-field"><%=interface%></td>
+					</tr>
+			<% end
+		end
+	end %>
+			</table>
+		</div>
+	</div>
+</div>
+<% end %>
+
+<div class="cbi-map">
+	<h2><%:Default routes%></h2>
+		<div class="cbi-section">
+			<div class="cbi-section-node">
+
+<% if not defroutev4 and not defroutev6 then %>
+	<%:No default routes known.%>
+<%else%>
+				<table class="cbi-section-table">
+						<tr class="cbi-section-table-titles">
+							<th class="cbi-section-table-cell"><%:Network%></th>
+							<th class="cbi-section-table-cell"><%:Interface%></th>
+							<th class="cbi-section-table-cell"><%:Gateway%></th>
+							<th class="cbi-section-table-cell"><%:Metric%></th>
+						</tr>
+
+	<% if defroutev4 then %>
+
+						<tr class="cbi-section-table-row cbi-rowstyle-1">
+							<td class="cbi-value-field" id="v4dst"><%=defroutev4.dest%></td>
+							<td class="cbi-value-field" id="v4dev"><%=defroutev4.device%></td>
+							<td class="cbi-value-field" id="v4gw"><%=defroutev4.gateway%></td>
+							<td class="cbi-value-field" id="v4metr"><%=defroutev4.metric%></td>
+						</tr>
+
+	<% end
+	if defroutev6 then %>
+
+						<tr class="cbi-section-table-row cbi-rowstyle-2">
+							<td class="cbi-value-field" id="v6dst"><%=defroutev6.dest%></td>
+							<td class="cbi-value-field" id="v6dev"><%=defroutev6.device%></td>
+							<td class="cbi-value-field" id="v6gw"><%=defroutev6.nexthop%></td>
+							<td class="cbi-value-field" id="v6metr"><%=defroutev6.metric%></td>
+						</tr>
+
+	<% end %>
+
+				</table>
+<% end %>
+		</div>
+	</div>
+</div>
+<%+footer%>
diff --git a/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/remote_update.htm b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/remote_update.htm
new file mode 100644
index 00000000..092ec471
--- /dev/null
+++ b/trunk/package/luci/modules/freifunk/luasrc/view/freifunk/remote_update.htm
@@ -0,0 +1,59 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id: contact.htm 3529 2008-10-07 13:10:24Z jow $
+
+-%>
+<%+header%>
+
+<h2><%:Freifunk Remote Update%></h2>
+
+<p><%:Check for new firmware versions and perform automatic updates.%></p>
+
+<% if update then %>
+
+	<% if update.info then %>
+		<strong><%:Update available!%></strong>
+		<br /><br />
+		<pre><%=update.info%></pre><br />
+	<% else %>
+		<strong><%:The installed firmware is the most recent version.%></strong>
+		<br /><br />
+	<% end %>
+
+	<p>
+		<form method="post" action="" class="inline">
+			<input type="hidden" name="flash" value="1" />
+			<input type="submit" class="cbi-button cbi-button-apply" value="<%:Start Upgrade%>" />
+		</form>	
+	</p>
+
+<% elseif confirm then %>
+
+	<strong><%:Update Settings%></strong>
+	<br /><br />
+
+	<p><form method="post" action="" class="inline">
+		<input type="hidden" name="flash" value="1" />
+		<input type="hidden" name="confirm" value="1" />
+
+		<input type="checkbox" class="cbi-input-checkbox" name="keepcfg" value="1" checked="checked" id="cb_keepcfg" />
+		<label for="cb_keepcfg"><%:Keep configuration%></label><br />
+
+		<input type="checkbox" class="cbi-input-checkbox" name="verify" value="1" checked="checked" id="cb_verify" />
+		<label for="cb_verify"><%:Verify downloaded images%></label><br /><br />
+
+		<input type="submit" class="cbi-button cbi-button-apply" value="<%:Confirm Upgrade%>" />
+	</form></p>
+
+<% end %>
+
+<%+footer%>
diff --git a/trunk/package/luci/modules/rpc/Makefile b/trunk/package/luci/modules/rpc/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/modules/rpc/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/modules/rpc/luasrc/controller/rpc.lua b/trunk/package/luci/modules/rpc/luasrc/controller/rpc.lua
new file mode 100644
index 00000000..359184c7
--- /dev/null
+++ b/trunk/package/luci/modules/rpc/luasrc/controller/rpc.lua
@@ -0,0 +1,166 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local require = require
+local pairs = pairs
+local print = print
+local pcall = pcall
+local table = table
+
+module "luci.controller.rpc"
+
+function index()
+	local function authenticator(validator, accs)
+		local auth = luci.http.formvalue("auth", true)
+		if auth then -- if authentication token was given
+			local sdat = luci.sauth.read(auth)
+			if sdat then -- if given token is valid
+				if sdat.user and luci.util.contains(accs, sdat.user) then
+					return sdat.user, auth
+				end
+			end
+		end
+		luci.http.status(403, "Forbidden")
+	end
+
+	local rpc = node("rpc")
+	rpc.sysauth = "root"
+	rpc.sysauth_authenticator = authenticator
+	rpc.notemplate = true
+
+	entry({"rpc", "uci"}, call("rpc_uci"))
+	entry({"rpc", "fs"}, call("rpc_fs"))
+	entry({"rpc", "sys"}, call("rpc_sys"))
+	entry({"rpc", "ipkg"}, call("rpc_ipkg"))
+	entry({"rpc", "auth"}, call("rpc_auth")).sysauth = false
+end
+
+function rpc_auth()
+	local jsonrpc = require "luci.jsonrpc"
+	local sauth   = require "luci.sauth"
+	local http    = require "luci.http"
+	local sys     = require "luci.sys"
+	local ltn12   = require "luci.ltn12"
+	local util    = require "luci.util"
+
+	local loginstat
+
+	local server = {}
+	server.challenge = function(user, pass)
+		local sid, token, secret
+
+		if sys.user.checkpasswd(user, pass) then
+			sid = sys.uniqueid(16)
+			token = sys.uniqueid(16)
+			secret = sys.uniqueid(16)
+
+			http.header("Set-Cookie", "sysauth=" .. sid.."; path=/")
+			sauth.reap()
+			sauth.write(sid, {
+				user=user,
+				token=token,
+				secret=secret
+			})
+		end
+
+		return sid and {sid=sid, token=token, secret=secret}
+	end
+
+	server.login = function(...)
+		local challenge = server.challenge(...)
+		return challenge and challenge.sid
+	end
+
+	http.prepare_content("application/json")
+	ltn12.pump.all(jsonrpc.handle(server, http.source()), http.write)
+end
+
+function rpc_uci()
+	if not pcall(require, "luci.model.uci") then
+		luci.http.status(404, "Not Found")
+		return nil
+	end
+	local uci     = require "luci.jsonrpcbind.uci"
+	local jsonrpc = require "luci.jsonrpc"
+	local http    = require "luci.http"
+	local ltn12   = require "luci.ltn12"
+
+	http.prepare_content("application/json")
+	ltn12.pump.all(jsonrpc.handle(uci, http.source()), http.write)
+end
+
+function rpc_fs()
+	local util    = require "luci.util"
+	local io      = require "io"
+	local fs2     = util.clone(require "nixio.fs")
+	local jsonrpc = require "luci.jsonrpc"
+	local http    = require "luci.http"
+	local ltn12   = require "luci.ltn12"
+
+	function fs2.readfile(filename)
+		local stat, mime = pcall(require, "mime")
+		if not stat then
+			error("Base64 support not available. Please install LuaSocket.")
+		end
+
+		local fp = io.open(filename)
+		if not fp then
+			return nil
+		end
+
+		local output = {}
+		local sink = ltn12.sink.table(output)
+		local source = ltn12.source.chain(ltn12.source.file(fp), mime.encode("base64"))
+		return ltn12.pump.all(source, sink) and table.concat(output)
+	end
+
+	function fs2.writefile(filename, data)
+		local stat, mime = pcall(require, "mime")
+		if not stat then
+			error("Base64 support not available. Please install LuaSocket.")
+		end
+
+		local  file = io.open(filename, "w")
+		local  sink = file and ltn12.sink.chain(mime.decode("base64"), ltn12.sink.file(file))
+		return sink and ltn12.pump.all(ltn12.source.string(data), sink) or false
+	end
+
+	http.prepare_content("application/json")
+	ltn12.pump.all(jsonrpc.handle(fs2, http.source()), http.write)
+end
+
+function rpc_sys()
+	local sys     = require "luci.sys"
+	local jsonrpc = require "luci.jsonrpc"
+	local http    = require "luci.http"
+	local ltn12   = require "luci.ltn12"
+
+	http.prepare_content("application/json")
+	ltn12.pump.all(jsonrpc.handle(sys, http.source()), http.write)
+end
+
+function rpc_ipkg()
+	if not pcall(require, "luci.model.ipkg") then
+		luci.http.status(404, "Not Found")
+		return nil
+	end
+	local ipkg    = require "luci.model.ipkg"
+	local jsonrpc = require "luci.jsonrpc"
+	local http    = require "luci.http"
+	local ltn12   = require "luci.ltn12"
+
+	http.prepare_content("application/json")
+	ltn12.pump.all(jsonrpc.handle(ipkg, http.source()), http.write)
+end
diff --git a/trunk/package/luci/modules/rpc/luasrc/jsonrpc.lua b/trunk/package/luci/modules/rpc/luasrc/jsonrpc.lua
new file mode 100644
index 00000000..71c95d54
--- /dev/null
+++ b/trunk/package/luci/modules/rpc/luasrc/jsonrpc.lua
@@ -0,0 +1,94 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.jsonrpc", package.seeall)
+require "luci.json"
+
+function resolve(mod, method)
+	local path = luci.util.split(method, ".")
+	
+	for j=1, #path-1 do
+		if not type(mod) == "table" then
+			break
+		end
+		mod = rawget(mod, path[j])
+		if not mod then
+			break
+		end
+	end
+	mod = type(mod) == "table" and rawget(mod, path[#path]) or nil
+	if type(mod) == "function" then
+		return mod
+	end
+end
+
+function handle(tbl, rawsource, ...)
+	local decoder = luci.json.Decoder()
+	local stat = luci.ltn12.pump.all(rawsource, decoder:sink())
+	local json = decoder:get()
+	local response
+	local success = false
+	
+	if stat then
+		if type(json.method) == "string"
+		 and (not json.params or type(json.params) == "table") then
+			local method = resolve(tbl, json.method)
+			if method then
+				response = reply(json.jsonrpc, json.id,
+				 proxy(method, unpack(json.params or {})))
+			else
+		 		response = reply(json.jsonrpc, json.id,
+			 	 nil, {code=-32601, message="Method not found."})
+			end
+		else
+			response = reply(json.jsonrpc, json.id,
+			 nil, {code=-32600, message="Invalid request."})
+		end
+	else
+		response = reply("2.0", nil,
+		 nil, {code=-32700, message="Parse error."})
+	end
+
+	return luci.json.Encoder(response, ...):source()
+end
+
+function reply(jsonrpc, id, res, err)
+	require "luci.json"
+	id = id or luci.json.null
+	
+	-- 1.0 compatibility
+	if jsonrpc ~= "2.0" then
+		jsonrpc = nil
+		res = res or luci.json.null
+		err = err or luci.json.null
+	end
+	
+	return {id=id, result=res, error=err, jsonrpc=jsonrpc}
+end
+
+function proxy(method, ...)
+	local res = {luci.util.copcall(method, ...)}
+	local stat = table.remove(res, 1)
+	
+	if not stat then
+		return nil, {code=-32602, message="Invalid params.", data=table.remove(res, 1)} 
+	else
+		if #res <= 1 then
+			return res[1] or luci.json.null
+		else
+			return res
+		end
+	end
+end
diff --git a/trunk/package/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua b/trunk/package/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua
new file mode 100644
index 00000000..19539867
--- /dev/null
+++ b/trunk/package/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua
@@ -0,0 +1,94 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local uci   = require "luci.model.uci".cursor()
+local ucis  = require "luci.model.uci".cursor_state()
+local table = require "table"
+
+
+module "luci.jsonrpcbind.uci"
+_M, _PACKAGE, _NAME = nil, nil, nil
+
+function add(config, ...)
+	uci:load(config)
+	local stat = uci:add(config, ...)
+	return uci:save(config) and stat
+end
+
+function apply(config)
+	return uci:apply(config)
+end
+
+function changes(...)
+	return uci:changes(...)
+end
+
+function commit(config)
+	return uci:load(config) and uci:commit(config)
+end
+
+function delete(config, ...)
+	uci:load(config) 
+	return uci:delete(config, ...) and uci:save(config) 
+end
+
+function delete_all(config, ...)
+	uci:load(config)
+	return uci:delete_all(config, ...) and uci:save(config) 
+end
+
+function foreach(config, stype)
+	uci:load(config)
+	local sections = {}
+	
+	return uci:foreach(config, stype, function(section)
+		table.insert(sections, section)
+	end) and sections
+end
+
+function get(config, ...)
+	uci:load(config)
+	return uci:get(config, ...)
+end
+
+function get_all(config, ...)
+	uci:load(config)
+	return uci:get_all(config, ...)
+end
+
+function get_state(config, ...)
+	ucis:load(config)
+	return ucis:get(config, ...)
+end
+
+function revert(config)
+	return uci:load(config) and uci:revert(config)
+end
+
+function section(config, ...)
+	uci:load(config)
+	return uci:section(config, ...) and uci:save(config)
+end
+
+function set(config, ...)
+	uci:load(config)
+	return uci:set(config, ...) and uci:save(config)
+end
+
+function tset(config, ...)
+	uci:load(config)
+	return uci:tset(config, ...) and uci:save(config)
+end
+
diff --git a/trunk/package/luci/po/ca/ahcp.po b/trunk/package/luci/po/ca/ahcp.po
new file mode 100644
index 00000000..89108fd7
--- /dev/null
+++ b/trunk/package/luci/po/ca/ahcp.po
@@ -0,0 +1,117 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-02 21:34+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Servidor AHCP"
+
+# Minor misspelling corrections
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP és un protocol de configuració automàtica per IPv6 i xarxes de pila "
+"dual IPv6/IPv4 dissenyat per fer servir en lloc del descobriment de rutes o "
+"DHCP en xarxes on es difícil o impossible configurar un servidor dins de "
+"tots els dominis de difusió a la capa d'enllaç, per exemple xarxes mòbils ad-"
+"hoc."
+
+# apòstrof+acrònims http://ca.wikipedia.org/wiki/Ap%C3%B2strof#Observacions
+msgid "Active AHCP Leases"
+msgstr "Leases actius d'AHCP"
+
+msgid "Address"
+msgstr "Adreça"
+
+msgid "Advanced Settings"
+msgstr "Configuració avançada"
+
+msgid "Age"
+msgstr "Edat"
+
+msgid "Announced DNS servers"
+msgstr "Servidors DNS anunciats"
+
+msgid "Announced NTP servers"
+msgstr "Servidors NTP anunciats"
+
+msgid "Announced prefixes"
+msgstr "Prefixos anunciats"
+
+msgid "Collecting data..."
+msgstr "Recopilant informació..."
+
+msgid "Forwarder"
+msgstr "Retransmissor"
+
+msgid "General Setup"
+msgstr "Configuració general"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 i IPv6"
+
+msgid "IPv4 only"
+msgstr "Només IPv4"
+
+msgid "IPv6 only"
+msgstr "Només IPv6"
+
+msgid "Lease directory"
+msgstr "Directori d'arrendament"
+
+msgid "Lease validity time"
+msgstr "Duració d'arrendament"
+
+msgid "Log file"
+msgstr "Fitxer de registre"
+
+msgid "Multicast address"
+msgstr "Adreça de difusió selectiva"
+
+msgid "Operation mode"
+msgstr "Mode d'operació"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Família de protocol"
+
+msgid "Served interfaces"
+msgstr "Interfícies servides"
+
+msgid "Server"
+msgstr "Servidor"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Especifica els servidors NTP IPv4 i IPv6 anunciats"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Especifica els servidors de noms IPv4 i IPv6 anunciats"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Especifica els prefixos de xarxa IPv4 i IPv6 anunciats en notació CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "El servidor AHCP no està funcionant."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "El servei AHCP està funcionant amb el ID %s."
+
+msgid "There are no active leases."
+msgstr "No hi ha arrendaments actius."
+
+msgid "Unique ID file"
+msgstr "Fitxer ID únic"
diff --git a/trunk/package/luci/po/ca/asterisk.po b/trunk/package/luci/po/ca/asterisk.po
new file mode 100644
index 00000000..9775758e
--- /dev/null
+++ b/trunk/package/luci/po/ca/asterisk.po
@@ -0,0 +1,680 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2009-05-31 19:18+0200\n"
+"Last-Translator: Eduard Duran <iopahopa@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Opcions Generals d'Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Directori AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Desa en memòria cau els sons gravats durant la gravació"
+
+#~ msgid "Debug Level"
+#~ msgstr "Nivell de depuració"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Desactiva algunes alertes"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Bolca el nucli en cas de fallada"
+
+#~ msgid "High Priority"
+#~ msgstr "Alta Prioritat"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Inicialitza Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Utilitza l'hora interna"
+
+#~ msgid "Log directory"
+#~ msgstr "Directori de registres"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Número màxim de trucades permeses"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Càrrega màxima per deixar d'acceptar trucades noves"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Desactiva els colors de consola"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Directori de memòria cau dels fitxers de so"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Executa amb els permisos del Grup"
+
+#~ msgid "The User to run as"
+#~ msgstr "Executa amb els permisos de l'Usuari"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Directori de bústia de correu"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Prefixa l'UniquID amb el nom del sistema"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "Munta les rutes de transcodificació via SLINEAR, no directament"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Transmet silenci SLINEAR mentre s'enregistri un canal"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Nivell de detall"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Secció Dialplan"
+
+#~ msgid "include"
+#~ msgstr "inclou"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Connector Dialplan"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Opcions generals de Dialplan"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Permet la transferència"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Buida les variables globals"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "Dialplan Goto"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Conferència Dialplan"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Dialplan Time"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Bústia de correu Dialplan"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Zones de marcatge per Dialplan"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "Prefix per afegir als Dialplan que coincideixin"
+
+#~ msgid "Match International prefix"
+#~ msgstr "Coincideix amb el prefix Internacional"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Prefix (0) per afegir/esborrar a/des de números internacionals"
+
+#~ msgid "localzone"
+#~ msgstr "zona local"
+
+#~ msgid "Match plan"
+#~ msgstr "Pla coincident"
+
+#~ msgid "Connection to use"
+#~ msgstr "Connexió a fer servir"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Mapa de Funcions Principals"
+
+#~ msgid "Attended transfer key"
+#~ msgstr "Tecla de transferència assistida"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "Tecla de transferència cega"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Tecla per desconnectar trucada"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Tecla per trucada en espera"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Funció de trucada en espera"
+
+#~ msgid "ADSI Park"
+#~ msgstr "Trucada en espera ADSI"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "Temps d'espera de transferència assistida (seg)"
+
+#~ msgid "One touch record key"
+#~ msgstr "Tecla de registre d'un toc"
+
+#~ msgid "Name of call context for parking"
+#~ msgstr "Nom del context de la trucada en espera"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Fitxer de so per reproduir a la trucada en espera"
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr "Temps màxim (en ms) entre dígits per l'activació de funció"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Mètode per trobar una ranura de trucada en espera"
+
+#~ msgid "parkedmusicclass"
+#~ msgstr "parkedmusicclass"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Reprodueix to de cortesia a"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Activa les trucades en espera"
+
+#~ msgid "Extension to dial to park"
+#~ msgstr "Extensió per marcar per deixar en espera una trucada"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Temps de trucada en espera (secs)"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "Rang d'extensions per trucada en espera"
+
+#~ msgid "Pickup extension"
+#~ msgstr "Connector de recol·lecció"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Segons a esperar entre dígits quan es transfereix"
+
+#~ msgid "sound when attended transfer is complete"
+#~ msgstr "so quan es completa la transferència assistida"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "so quan falla la transferència assitida"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Recarrega la configuració de maquinari"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Mètode de Reinici"
+
+#~ msgid "Parameter"
+#~ msgstr "Paràmetre"
+
+#~ msgid "Option type"
+#~ msgstr "Tipus d'opció"
+
+#~ msgid "User name"
+#~ msgstr "Nom d'usuari"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Opcions generals IAX"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Permet Codecs"
+
+#~ msgid "Static"
+#~ msgstr "Estàtic"
+
+#~ msgid "Write Protect"
+#~ msgstr "Protecció d'escriptura"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Conferència Meetme"
+
+#~ msgid "Admin PIN"
+#~ msgstr "PIN d'administrador"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "PIN de reunió"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Opcions generals de conferència Meetme"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Número de memòries intermitges d'àudio de 20 ms a utilitzar"
+
+#~ msgid "Modules"
+#~ msgstr "Mòduls"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Aplicació de recepció d'alarma"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Aplicació d'autenticació"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "Assegura't que asterisk no desa CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Comprova que el canal estigui disponible"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Escolta a qualsevol canal"
+
+#~ msgid "Control Playback Application"
+#~ msgstr "Aplicació de control de reproducció"
+
+#~ msgid "Cuts up variables"
+#~ msgstr "Talla les variables"
+
+#~ msgid "Database access functions"
+#~ msgstr "Funcions d'accés a base de dades"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Aplicació de marcatge"
+
+#~ msgid "Virtual Dictation Machine Application"
+#~ msgstr "Aplicació de màquina de dictat virtual"
+
+#~ msgid "Directed Call Pickup Support"
+#~ msgstr "Suport de recollida de trucades adreçades"
+
+#~ msgid "Extension Directory"
+#~ msgstr "Directori de connectors"
+
+#~ msgid "DISA (Direct Inward System Access) Application"
+#~ msgstr "Aplicació DISA (Direct Inward System Access)"
+
+#~ msgid "Dump channel variables Application"
+#~ msgstr "Bolca les variables de canal de l'aplicació"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Aplicació d'eco simple"
+
+#~ msgid "ENUM Lookup"
+#~ msgstr "Consulta ENUM"
+
+#~ msgid "Reevaluates strings"
+#~ msgstr "Reavalua cadenes"
+
+#~ msgid "Executes applications"
+#~ msgstr "Executa aplicacions"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "Interfície d'aplicació IVR externa"
+
+#~ msgid "Fork The CDR into 2 seperate entities"
+#~ msgstr "Bifurca el CDR en 2 entitats separades"
+
+#~ msgid "Get ADSI CPE ID"
+#~ msgstr "Obtingues la ADSI CPE ID"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Rutines de gestió de grup"
+
+#~ msgid "Encode and Stream via icecast and ices"
+#~ msgstr "Codifica i emet via icecast i ices"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Aplicació de transmissió d'imatge"
+
+#~ msgid "Look up Caller*ID name/number from black"
+#~ msgstr "Cerca la ID/nom/número de qui truca de negre"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr "Cerca la ID/nom/número de qui truca de la base de dades local"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Macros de connectors"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Una aplicació de matemàtiques simple"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "Aplicació de suma de verificació MD5"
+
+#~ msgid "Digital Milliwatt (mu-law) Test Application"
+#~ msgstr "Aplicació de prova de milliwat digital (mu-law)"
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Registra una trucada i mescla l'àudio durant la gravació"
+
+#~ msgid "Call Parking and Announce Application"
+#~ msgstr "Aplicació d'anunci de trucades i trucada en espera"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Aplicació de reproducció trivial"
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Requereix que s'entri un número de telèfon"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "Encuament de trucades real"
+
+#~ msgid "Random goto"
+#~ msgstr "Goto aleatori"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Aplicació de lectura de variables"
+
+#~ msgid "Read in a file"
+#~ msgstr "Llegeix en un fitxer"
+
+#~ msgid "Realtime Data Lookup/Rewrite"
+#~ msgstr "Cerca/reescriptura de dades en temps real"
+
+#~ msgid "Trivial Record Application"
+#~ msgstr "Aplicació d'enregistrament trivial"
+
+#~ msgid "Say time"
+#~ msgstr "Digues l'hora"
+
+#~ msgid "Send DTMF digits Application"
+#~ msgstr "Envia aplicació de dígits DTMF"
+
+#~ msgid "Send Text Applications"
+#~ msgstr "Envia aplicacions de text"
+
+#~ msgid "Set CallerID Application"
+#~ msgstr "Estableix l'aplicació CallerID"
+
+#~ msgid "CDR user field apps"
+#~ msgstr "Aplicacions de camp d'usuari CDR"
+
+#~ msgid "load => .so ; Set CallerID Name"
+#~ msgstr "load =&gt; .so ; Estableix el nom CallerID"
+
+#~ msgid "load => .so ; Set CallerID Number"
+#~ msgstr "load =&gt; .so ; Estableix el número CallerID"
+
+#~ msgid "Set RDNIS Number"
+#~ msgstr "Estableix el número RDNIS"
+
+#~ msgid "Set ISDN Transfer Capability"
+#~ msgstr "Estableix la capacitat de transferència XDSI"
+
+#~ msgid "SMS/PSTN handler"
+#~ msgstr "Gestor SMS/PSTN"
+
+#~ msgid "Hangs up the requested channel"
+#~ msgstr "Penja el canal sol·licitat"
+
+#~ msgid "Stack Routines"
+#~ msgstr "Rutines de pila"
+
+#~ msgid "Generic System() application"
+#~ msgstr "Aplicació genèrica de System()"
+
+#~ msgid "Playback with Talk Detection"
+#~ msgstr "Playback amb Detecció de Parla"
+
+#~ msgid "Interface Test Application"
+#~ msgstr "Aplicació de proves d'interfície"
+
+#~ msgid "Transfer"
+#~ msgstr "Transfereix"
+
+#~ msgid "TXTCIDName"
+#~ msgstr "TXTCIDName"
+
+#~ msgid "Send URL Applications"
+#~ msgstr "Envia aplicacions d'URL"
+
+#~ msgid "Custom User Event Application"
+#~ msgstr "Aplicació d'esdeveniments personalitzats d'usuari"
+
+#~ msgid "Send verbose output"
+#~ msgstr "Envia sortida detallada"
+
+#~ msgid "Voicemail"
+#~ msgstr "Bústia de veu"
+
+#~ msgid "Waits until first ring after time"
+#~ msgstr "Espera fins el primer to després del temps"
+
+#~ msgid "Wait For Silence Application"
+#~ msgstr "Espera l'aplicació de silenci"
+
+#~ msgid "While Loops and Conditional Execution"
+#~ msgstr "Execució de bucles while i condicionals"
+
+#~ msgid "Comma Separated Values CDR Backend"
+#~ msgstr "Valors de Backend CDR separats per comes"
+
+#~ msgid "Customizable Comma Separated Values CDR Backend"
+#~ msgstr "Valors de Backend CDR personalitzats separats per comes"
+
+#~ msgid "Asterisk Call Manager CDR Backend"
+#~ msgstr "Backend CDR del gestor de trucades Asterisk"
+
+#~ msgid "MySQL CDR Backend"
+#~ msgstr "Backend CDR MySQL"
+
+#~ msgid "PostgreSQL CDR Backend"
+#~ msgstr "Backend CDR PostgreSQL"
+
+#~ msgid "SQLite CDR Backend"
+#~ msgstr "Backend CDR SQLite"
+
+#~ msgid "Agent Proxy Channel"
+#~ msgstr "Canal de l'Agent Proxy"
+
+#~ msgid "Option chan_iax2"
+#~ msgstr "Opció chan_iax2"
+
+#~ msgid "Local Proxy Channel"
+#~ msgstr "Canal de proxy local"
+
+#~ msgid "Session Initiation Protocol (SIP)"
+#~ msgstr "Protocol d'inicialització de sessió (SIP)"
+
+#~ msgid "Adaptive Differential PCM Coder/Decoder"
+#~ msgstr "Codificador/Decodificador PCM adaptatiu diferencial"
+
+#~ msgid "A-law Coder/Decoder"
+#~ msgstr "Codificador/Decodificador de llei A"
+
+#~ msgid "A-law and Mulaw direct Coder/Decoder"
+#~ msgstr "Codificador/Decodificador directe de llei A i Mu"
+
+#~ msgid "ITU G.726-32kbps G726 Transcoder"
+#~ msgstr "Transcodificador ITU G.726-32kbps G726"
+
+#~ msgid "GSM/PCM16 (signed linear) Codec Translation"
+#~ msgstr "Còdec de traducció GSM/PCM16 (lineal amb signe)"
+
+#~ msgid "Speex/PCM16 (signed linear) Codec Translator"
+#~ msgstr "Còdec de traducció Speex/PCM16 (lineal amb signe)"
+
+#~ msgid "Mu-law Coder/Decoder"
+#~ msgstr "Codificador/Decodificador llei Mu"
+
+#~ msgid "Sun Microsystems AU format (signed linear)"
+#~ msgstr "Format AU de Sun Microsystems (lineal amb signe)"
+
+#~ msgid "G.723.1 Simple Timestamp File Format"
+#~ msgstr "Format de fitxer de marca de temps simple G.723.1"
+
+#~ msgid "Raw G.726 (16/24/32/40kbps) data"
+#~ msgstr "Dades Raw G.726 (16/24/32/40kbps)"
+
+#~ msgid "Raw G729 data"
+#~ msgstr "Dades Raw G729"
+
+#~ msgid "Raw GSM data"
+#~ msgstr "Dades Raw GSM"
+
+#~ msgid "Raw h263 data"
+#~ msgstr "Dades Raw h263"
+
+#~ msgid "JPEG (Joint Picture Experts Group) Image"
+#~ msgstr "Imatge JPEG (Joint Picture Experts Group)"
+
+#~ msgid "Raw uLaw 8khz Audio support (PCM)"
+#~ msgstr "Suport d'àudio Raw llei-u 8khz (PCM)"
+
+#~ msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
+#~ msgstr "load =&gt; .so ; suport d'àudio Raw llei-a 8khz PCM"
+
+#~ msgid "Raw Signed Linear Audio support (SLN)"
+#~ msgstr "Suport d'àudio Raw amb signe lineal (SLN)"
+
+#~ msgid "Dialogic VOX (ADPCM) File Format"
+#~ msgstr "Format de fitxer Dialogic VOX (ADPCM)"
+
+#~ msgid "Microsoft WAV format (8000hz Signed Line"
+#~ msgstr "Format Microsoft WAV (8000hz amb signe lineal)"
+
+#~ msgid "Microsoft WAV format (Proprietary GSM)"
+#~ msgstr "Format Microsoft WAV (GSM propietari)"
+
+#~ msgid "Caller ID related dialplan functions"
+#~ msgstr "Functions de dialplan relacionades amb la ID de qui truca"
+
+#~ msgid "ENUM Functions"
+#~ msgstr "Funcions ENUM"
+
+#~ msgid "URI encoding / decoding functions"
+#~ msgstr "Funcions de codificació / decodificació d'URI"
+
+#~ msgid "Asterisk Extension Language Compiler"
+#~ msgstr "Compilador del llenguatge de connectors d'Asterisk"
+
+#~ msgid "Text Extension Configuration"
+#~ msgstr "Configuració del connector de text"
+
+#~ msgid "load => .so ; Builtin dialplan functions"
+#~ msgstr "load =&gt; .s ; Funcions integrades dialplan"
+
+#~ msgid "Loopback Switch"
+#~ msgstr "Switch loopback"
+
+#~ msgid "Realtime Switch"
+#~ msgstr "Switch en temps real"
+
+#~ msgid "Outgoing Spool Support"
+#~ msgstr "Suport de gestió de cues sortint"
+
+#~ msgid "Wil Cal U (Auto Dialer)"
+#~ msgstr "Wil Cal U (Auto Marcatge)"
+
+#~ msgid "MySQL Config Resource"
+#~ msgstr "Configuració del recurs MySQL"
+
+#~ msgid "ODBC Config Resource"
+#~ msgstr "Configuració del recurs ODBC"
+
+#~ msgid "PGSQL Module"
+#~ msgstr "Mòdul PGSQL"
+
+#~ msgid "Cryptographic Digital Signatures"
+#~ msgstr "Signatures digitals criptogràfiques"
+
+#~ msgid "Call Parking Resource"
+#~ msgstr "Recurs de trucada en espera"
+
+#~ msgid "Indications Configuration"
+#~ msgstr "Configuració d'indicacions"
+
+#~ msgid "Call Monitoring Resource"
+#~ msgstr "Recurs de monitoreig de trucades"
+
+#~ msgid "Music On Hold Resource"
+#~ msgstr "Recurs de música en espera"
+
+#~ msgid "ODBC Resource"
+#~ msgstr "Recurs ODBC"
+
+#~ msgid "SMDI Module"
+#~ msgstr "Mòdul SMDI"
+
+#~ msgid "SNMP Module"
+#~ msgstr "Mòdul SNMP"
+
+#~ msgid "Music On Hold"
+#~ msgstr "Música en espera"
+
+#~ msgid "Application"
+#~ msgstr "Aplicació"
+
+#~ msgid "Directory of Music"
+#~ msgstr "Directori de música"
+
+#~ msgid "Option mode"
+#~ msgstr "Mode d'opció"
+
+#~ msgid "Random Play"
+#~ msgstr "Reproducció aleatòria"
+
+#~ msgid "DTMF mode"
+#~ msgstr "Mode DTMF"
+
+#~ msgid "Primary domain identity for From: headers"
+#~ msgstr "Domini d'identitat primari per les capçaleres From:"
+
+#~ msgid "From user (required by many SIP providers)"
+#~ msgstr "Usuari d'inici (requerit per diversos proveïdors SIP)"
+
+#~ msgid "Ring on incoming dialplan contexts"
+#~ msgstr "Truca en contextos d'entrades dialplan"
+
+#~ msgid "Allow Insecure for"
+#~ msgstr "Permet insegur per"
+
+#~ msgid "Mailbox for MWI"
+#~ msgstr "Bústia de veu per MWI"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "NAT entre el telèfon i l'Asterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "Comprova etiquetes a les capçaleres"
+
+#~ msgid "Reply Timeout (ms) for down connection"
+#~ msgstr "Temps d'esperi per contestar (ms) per caigudes de connexió"
+
+#~ msgid "Register connection"
+#~ msgstr "Registra connexió"
+
+#~ msgid "Dial own extension for mailbox"
+#~ msgstr "Truca el propi connector per la bústia de veu"
+
+#~ msgid "Client Type"
+#~ msgstr "Tipus de client"
+
+#~ msgid "Username"
+#~ msgstr "Nom d'usuari"
+
+#~ msgid "Section sipgeneral"
+#~ msgstr "Secció sipgeneral"
+
+#~ msgid "Allow codecs"
+#~ msgstr "Permet còdecs"
+
+#~ msgid "SIP realm"
+#~ msgstr "Reialme SIP"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "Opcions generals de bústia de veu"
+
+#~ msgid "From Email address of server"
+#~ msgstr "Adreça de correu electrònic d'origen del servidor"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "Bústies de la bústia de veu"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "El correu electrònic conté fitxers adjunts"
+
+#~ msgid "Email"
+#~ msgstr "Correu electrònic"
+
+#~ msgid "Display Name"
+#~ msgstr "Nom a mostrar"
+
+#~ msgid "Password"
+#~ msgstr "Contrasenya"
+
+#~ msgid "zone"
+#~ msgstr "zona"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Configuració de zona de veu"
+
+#~ msgid "Message Format"
+#~ msgstr "Format de missatge"
diff --git a/trunk/package/luci/po/ca/base.po b/trunk/package/luci/po/ca/base.po
new file mode 100644
index 00000000..da2a63c8
--- /dev/null
+++ b/trunk/package/luci/po/ca/base.po
@@ -0,0 +1,3801 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-06-06 11:17+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(finestra de %d minuts, interval de %d segons)"
+
+msgid "(%s available)"
+msgstr "(%s disponibles)"
+
+msgid "(empty)"
+msgstr "(buit)"
+
+msgid "(no interfaces attached)"
+msgstr "(sense interfícies adjuntes)"
+
+msgid "-- Additional Field --"
+msgstr "-- Camp addicional --"
+
+msgid "-- Please choose --"
+msgstr "-- Escolliu, si us plau --"
+
+msgid "-- custom --"
+msgstr "-- personalitzat --"
+
+msgid "1 Minute Load:"
+msgstr "Càrrega d'1 minut:"
+
+msgid "15 Minute Load:"
+msgstr "Càrrega de 15 minuts:"
+
+msgid "5 Minute Load:"
+msgstr "Càrrega de 5 minuts:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "Port de consulta <abbr title=\"Domain Name System\">DNS</abbr> "
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "Port del servidor <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"Es consultaran els servidors <abbr title=\"Domain Name System\">DNS</abbr> "
+"segons l'ordre del fitxer de resolució"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Adreça <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "Passarel·la <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+"Màscara de xarxa <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"Adreça <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> o Xarxa (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "Passarel·la <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Configuració <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Nom <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Adreça <abbr title=\"Media Access Control\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"Arrendaments de <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> <abbr title=\"màxims\">max.</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"Mida <abbr title=\"màxima\">màx.</abbr> de paquet <abbr title=\"Extension "
+"Mechanisms for Domain Name System\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "Consultes concurrents <abbr title=\"màximes\">max.</abbr>"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Parella: %s / Grup: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Suport AR"
+
+msgid "ARP retry threshold"
+msgstr "Llindar de reintent ARP"
+
+msgid "ATM Bridges"
+msgstr "Ponts ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Identificador de canal virtual (VCI) ATM"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Identificador de camí virtual (VPI) ATM"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Els ponts ATM mostren ethernet encapsulat en connexions AAL5 com interfícies "
+"de xarxa virtual de Linux que es poden utilitzar conjuntament amb DHCP o PPP "
+"per trucar a la xarxa del proveïdor."
+
+msgid "ATM device number"
+msgstr "Número de dispositiu ATM"
+
+msgid "Access Concentrator"
+msgstr "Concentrador d'accés"
+
+msgid "Access Point"
+msgstr "Punt d'accés"
+
+msgid "Action"
+msgstr "Acció"
+
+msgid "Actions"
+msgstr "Accions"
+
+msgid "Activate this network"
+msgstr "Activa aquesta xarxa"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Rutes <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> actives"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Rutes <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> actives"
+
+msgid "Active Connections"
+msgstr "Connexions actives"
+
+msgid "Active DHCP Leases"
+msgstr "Arrendaments DHCP actius"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Arrendaments DHCPv6 actius"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Afegeix"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Afegeix el sufix de domini local als noms servits des dels fitxers de hosts"
+
+msgid "Add new interface..."
+msgstr "Afegeix una interfície nova..."
+
+msgid "Additional Hosts files"
+msgstr "Fitxers de Hosts addicionals"
+
+msgid "Address"
+msgstr "Adreça"
+
+msgid "Address to access local relay bridge"
+msgstr "Adreça per accedir al relay bridge local"
+
+msgid "Administration"
+msgstr "Administració"
+
+msgid "Advanced Settings"
+msgstr "Paràmetres avançats"
+
+msgid "Alert"
+msgstr "Alerta"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Permet autenticació <abbr title=\"Secure Shell\">SSH</abbr> per contrasenya"
+
+msgid "Allow all except listed"
+msgstr "Permet-les totes menys les llistades"
+
+msgid "Allow listed only"
+msgstr "Permet només les llistades"
+
+msgid "Allow localhost"
+msgstr "Permetre el localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Permetre a màquines remotes de connectar als ports reenviats de l'SSH local"
+
+msgid "Allow root logins with password"
+msgstr "Permetre l'accés del l'administrador amb paraula clau"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Permetre l'accés de l'usurari <em>root</em> amb paraula clau"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr "Permet respostes del rang 127.0.0.0/8, p.e. per serveis RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Utilitza sempre canals de 40 MHz fins i tot si el canal secundari se solapa. "
+"L'ús d'aquesta opció no compleix amb l'IEEE 802.11n-2009."
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Es crearà una xarxa addicional si deixes això sense marcar."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antena 1"
+
+msgid "Antenna 2"
+msgstr "Antena 2"
+
+msgid "Antenna Configuration"
+msgstr "Configuració d'antena"
+
+msgid "Any zone"
+msgstr "Qualsevol zona"
+
+msgid "Apply"
+msgstr "Aplica"
+
+msgid "Applying changes"
+msgstr "Aplicant els canvis"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Assigna interfícies..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Estacions associades"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Controlador sense fils d'Atheros 802.11%s"
+
+msgid "Authentication"
+msgstr "Autenticació"
+
+msgid "Authoritative"
+msgstr "Autoritzada"
+
+msgid "Authorization Required"
+msgstr "Es requereix autenticació"
+
+msgid "Auto Refresh"
+msgstr "Refresc automàtic"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid "Available packages"
+msgstr "Paquets disponibles"
+
+msgid "Average:"
+msgstr "Mitjana:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Enrere"
+
+msgid "Back to Overview"
+msgstr "Enrere al Resum"
+
+msgid "Back to configuration"
+msgstr "Enrere a la configuració"
+
+msgid "Back to overview"
+msgstr "Enrere al resum"
+
+# Endarrere cap a resultats d'escaneig
+msgid "Back to scan results"
+msgstr "Enrere als resultats de l'escaneig"
+
+msgid "Background Scan"
+msgstr "Escaneig de fons"
+
+msgid "Backup / Flash Firmware"
+msgstr "Còpia de seguretat / Recàrrega de programari"
+
+msgid "Backup / Restore"
+msgstr "Còpia de seguretat / Restauració"
+
+msgid "Backup file list"
+msgstr "Llista de còpies de seguretat"
+
+msgid "Bad address specified!"
+msgstr "Adreça mal especificada!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"A sota hi ha la llista determinada de fitxers per fer-ne còpia. Consisteix "
+"en els fitxers de configuració canviats i marcats per l'opkg, fitxers base "
+"essencials i els patrons de còpia de seguretat definits per l'usuari."
+
+msgid "Bitrate"
+msgstr "Velocitat de bits"
+
+msgid "Bogus NX Domain Override"
+msgstr "Substitució dels dominis NX falsos"
+
+msgid "Bridge"
+msgstr "Pont"
+
+msgid "Bridge interfaces"
+msgstr "Pont d'interfícies"
+
+msgid "Bridge unit number"
+msgstr "Número d'unitat de pont"
+
+msgid "Bring up on boot"
+msgstr "Aixecar a l'engegada"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Controlador sense fil Broadcom 802.11%s"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Controlador sense fil Broadcom BCM%04x 802.11"
+
+msgid "Buffered"
+msgstr "En memòria intermèdia"
+
+msgid "Buttons"
+msgstr "Botons"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Ús de CPU (%)"
+
+msgid "Cached"
+msgstr "En memòria cau"
+
+msgid "Cancel"
+msgstr "Cancel·la"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Cadena"
+
+msgid "Changes"
+msgstr "Canvis"
+
+msgid "Changes applied."
+msgstr "Canvis aplicats."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Canvia la paraula clau de l'administrador per accedir al dispositiu"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check"
+msgstr "Comprovació"
+
+msgid "Checksum"
+msgstr "Suma de verificació"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Escolliu la zona de tallafocs que voleu assignar a aquesta interfície. Trieu "
+"<em>sense especificar</em> per esborrar la interfície de la zona associada o "
+"ompliu el camp <em>crea</em> per definir una nova zona i adjuntar-hi la "
+"interfície."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Trieu les xarxes que voleu adjuntar a la interfície sense fil o ompliu el "
+"camp <em>crea</em> per definir una xarxa nova."
+
+msgid "Cipher"
+msgstr "Xifra"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr "Client"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "ID de client a enviar en les sol·licituds DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr "Tanca la llista..."
+
+msgid "Collecting data..."
+msgstr "Aplegant dades..."
+
+msgid "Command"
+msgstr "Ordre"
+
+msgid "Common Configuration"
+msgstr "Configuració comuna"
+
+msgid "Compression"
+msgstr "Compressió"
+
+msgid "Configuration"
+msgstr "Configuració"
+
+msgid "Configuration applied."
+msgstr "S'ha aplicat la configuració."
+
+msgid "Configuration files will be kept."
+msgstr "Es mantindran els fitxers de configuració."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr "Confirmació"
+
+msgid "Connect"
+msgstr "Connecta"
+
+msgid "Connected"
+msgstr "Connectat"
+
+msgid "Connection Limit"
+msgstr "Límit de connexió"
+
+msgid "Connections"
+msgstr "Connexions"
+
+msgid "Country"
+msgstr "País"
+
+msgid "Country Code"
+msgstr "Codi de País"
+
+msgid "Cover the following interface"
+msgstr "Cobreix la interfície següent"
+
+msgid "Cover the following interfaces"
+msgstr "Cobreix les interfícies següents"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Crea / Assigna zona de tallafocs"
+
+msgid "Create Interface"
+msgstr "Crea interfície"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Crea un pont entre múltiples interfícies"
+
+msgid "Critical"
+msgstr "Crític"
+
+msgid "Cron Log Level"
+msgstr "Nivell de registre del Cron"
+
+msgid "Custom Interface"
+msgstr "Interfície personalitzada"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Personalitza el comportament dels <abbr title=\"Light Emitting Diode\">LED</"
+"abbr>s del dispositiu si és possible."
+
+msgid "DHCP Leases"
+msgstr "Arrendaments DHCP"
+
+msgid "DHCP Server"
+msgstr "Servidor DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP i DNS"
+
+msgid "DHCP client"
+msgstr "Client DHCP"
+
+msgid "DHCP-Options"
+msgstr "Opcions DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Arrendaments DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Reenviaments DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Depuració"
+
+msgid "Default %d"
+msgstr "%d per defecte"
+
+msgid "Default gateway"
+msgstr "Passarel·la per defecte"
+
+msgid "Default state"
+msgstr "Estat per defecte"
+
+msgid "Define a name for this network."
+msgstr "Definiu el nom d'aquesta xarxa"
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr "Suprimeix"
+
+msgid "Delete this interface"
+msgstr "Suprimeix aquesta interfície"
+
+msgid "Delete this network"
+msgstr "Suprimeix aquesta xarxa"
+
+msgid "Description"
+msgstr "Descripció"
+
+msgid "Design"
+msgstr "Disseny"
+
+msgid "Destination"
+msgstr "Destí"
+
+msgid "Device"
+msgstr "Dispositiu"
+
+msgid "Device Configuration"
+msgstr "Configuració de dispositiu"
+
+msgid "Diagnostics"
+msgstr "Diagnòstics"
+
+msgid "Directory"
+msgstr "Directori"
+
+msgid "Disable"
+msgstr "Inhabilita"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Inhabilita el <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> en aquesta interfície."
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr "Inhabilita el temporitzador HW-Beacon"
+
+msgid "Disabled"
+msgstr "Inhabilitat"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Descarta les respostes RFC1918 des de dalt"
+
+msgid "Displaying only packages containing"
+msgstr "Mostrant només els paquets que contenen"
+
+msgid "Distance Optimization"
+msgstr "Optimització de distància"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distància al membre de la xarxa més allunyat en metres."
+
+msgid "Diversity"
+msgstr "Diversitat"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"El Dnsmasq és un servidor <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> combinat i un reenviador de <abbr title=\"Domain Name System"
+"\">DNS</abbr> per tallafocs <abbr title=\"Network Address Translation\">NAT</"
+"abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr "No enviïs les respostes de prova"
+
+msgid "Domain required"
+msgstr "Es requereix un domini"
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"No reenviïs les peticions <abbr title=\"Domain Name System\">DNS</abbr> "
+"sense el nom <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "Download and install package"
+msgstr "Descarrega i instal·la el paquet"
+
+msgid "Download backup"
+msgstr "Descarrega còpia de seguritat"
+
+msgid "Dropbear Instance"
+msgstr "Instància de Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"El Dropbear ofereix accés per la xarxa a consola <abbr title=\"Secure Shell"
+"\">SSH</abbr>i un servidor <abbr title=\"Secure Copy\">SCP</abbr> integrat"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinàmic"
+
+msgid "Dynamic tunnel"
+msgstr "Túnel dinàmic"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr "Mètode EAP"
+
+msgid "Edit"
+msgstr "Edita"
+
+msgid "Edit this interface"
+msgstr "Edita aquesta interfície"
+
+msgid "Edit this network"
+msgstr "Edita aquesta xarxa"
+
+msgid "Emergency"
+msgstr "Emergència"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Habilita l'<abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Habilita negociació IPv6 en la enllaç PPP"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Habilita el passatge de trames enormes"
+
+msgid "Enable NTP client"
+msgstr "Habilita el client NTP"
+
+msgid "Enable TFTP server"
+msgstr "Habilita el servidor TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Habilita la funcionalitat VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Habilita l'aprenentatge i l'envelliment"
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr "Activa/Desactiva"
+
+msgid "Enabled"
+msgstr "Habilitat"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Habilita l'Spanning Tree Protocol a aquest pont"
+
+msgid "Encapsulation mode"
+msgstr "Mode d'encapsulació"
+
+msgid "Encryption"
+msgstr "Encriptació"
+
+msgid "Erasing..."
+msgstr "Esborrant..."
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Ethernet Adapter"
+msgstr "Adaptador Ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Switch Ethernet"
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr "Caduca"
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr "Fast Frames"
+
+msgid "File"
+msgstr "Fitxer"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Nom de fitxer de la imatge d'inici que es publica als clients"
+
+msgid "Filesystem"
+msgstr "Sistema de fitxers"
+
+msgid "Filter"
+msgstr "Filtre"
+
+msgid "Filter private"
+msgstr "Filtra privat"
+
+msgid "Filter useless"
+msgstr "Filtra els no útils"
+
+msgid "Find and join network"
+msgstr "Troba i uneix-te a la xarxa"
+
+msgid "Find package"
+msgstr "Cerca paquet"
+
+msgid "Finish"
+msgstr "Acaba"
+
+msgid "Firewall"
+msgstr "Tallafocs"
+
+msgid "Firewall Settings"
+msgstr "Ajusts de tallafocs"
+
+msgid "Firewall Status"
+msgstr "Estat de tallafocs"
+
+msgid "Firmware Version"
+msgstr "Versió de microprogramari"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr "Flags"
+
+msgid "Flash Firmware"
+msgstr "Reescriu el microprogramari"
+
+msgid "Flash image..."
+msgstr "Escriu una imatge..."
+
+msgid "Flash new firmware image"
+msgstr "Escriu una imatge nova"
+
+msgid "Flash operations"
+msgstr "Operacions d'escriptura"
+
+msgid "Flashing..."
+msgstr "Escrivent..."
+
+msgid "Force"
+msgstr "Força"
+
+msgid "Force 40MHz mode"
+msgstr "Força el mode 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Força el CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Força el DHCP en aquesta xarxa encara que es detecti altre servidor."
+
+msgid "Force TKIP"
+msgstr "Força el TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Força el TKIP i el CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Reenvia el tràfic DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Reenvia el tràfic difós"
+
+msgid "Forwarding mode"
+msgstr "Mode de reenviament"
+
+msgid "Fragmentation Threshold"
+msgstr "Llindar de fragmentació"
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr "Lliures"
+
+msgid "Free space"
+msgstr "Espai lliure"
+
+msgid "Frequency Hopping"
+msgstr "Salts de freqüència"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Només GPRS"
+
+msgid "Gateway"
+msgstr "Passarel·la"
+
+msgid "Gateway ports"
+msgstr "Ports de passarel·la"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Controlador sense fil 802.11%s genèric"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+"La contrasenya i la confirmació de contrasenya no es coincideixen. La "
+"contrasenya no s'ha canviat!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Vés a la configuració de contrasenya"
+
+msgid "Go to relevant configuration page"
+msgstr "Vés a la pàgina de configuració"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Contrasenya de HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr "Penja"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Ací pots configurar els aspectes bàsics del teu dispositiu, com el nom de la "
+"màquina o el fus horari."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Controlador sense fil Hermes 802.11b"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"No mostris l'<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Entrades de noms de màquina"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "Xarxa o adreça <abbr title=\"Internet Protocol Address\">IP</abbr>"
+
+msgid "Hostname"
+msgstr "Nom de màquina"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr "Noms de màquina"
+
+msgid "IP address"
+msgstr "Adreça IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Tallafocs IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Estat WAN IPv4"
+
+msgid "IPv4 address"
+msgstr "Adreça IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 i IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Difusió IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Passarel·la IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Màscara de xarxa IPv4"
+
+msgid "IPv4 only"
+msgstr "Només IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Longitud de prefix IPv4"
+
+msgid "IPv4-Address"
+msgstr "Adreça IPv6"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Tallafocs IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Estado WAN IPv6"
+
+msgid "IPv6 address"
+msgstr "Adreça IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Passarel·la IPv6"
+
+msgid "IPv6 only"
+msgstr "Només IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Prefix IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Longitud de prefix IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "Adreça IPv6"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-en-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-sobre-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-sobre-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Identitat"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Si la teva memòria física és insuficient, les dades no usades es poden "
+"intercanviar a un dispositiu d'intercanvi, pel qual hi haurà una quantitat "
+"més gran de memòria <abbr title=\"Random Access Memory\">RAM</abbr> usable. "
+"Tingues en compte que intercanviar dades és un procés molt lent, ja que no "
+"es pot accedir al dispositiu d'intercanvi amb unes taxes tan altes com les "
+"de la <abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr "Ignora la interfície"
+
+msgid "Ignore resolve file"
+msgstr "Ignora el fitxer de resolució"
+
+msgid "Image"
+msgstr "Imatge"
+
+msgid "In"
+msgstr "En"
+
+msgid "Inactivity timeout"
+msgstr "Temps d'espera d'inactivitat"
+
+msgid "Inbound:"
+msgstr "Entrant:"
+
+msgid "Info"
+msgstr "Informació"
+
+msgid "Initscript"
+msgstr "Script d'inici"
+
+msgid "Initscripts"
+msgstr "Scripts d'inici"
+
+msgid "Install"
+msgstr "Instal·la"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Instal·la el paquet %q"
+
+msgid "Install protocol extensions..."
+msgstr "Instal·la extensions de protocol"
+
+msgid "Installed packages"
+msgstr "Paquets instal·lats"
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid "Interface Configuration"
+msgstr "Configuració d'interfície"
+
+msgid "Interface Overview"
+msgstr "Visió de conjunt de la interfície"
+
+msgid "Interface is reconnecting..."
+msgstr "La interfície s'està reconnectant..."
+
+msgid "Interface is shutting down..."
+msgstr "La interfície s'està aturant..."
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfícies"
+
+msgid "Internal Server Error"
+msgstr "Error de servidor intern"
+
+msgid "Invalid"
+msgstr "Invàlid"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Usuari i/o contrasenya invàlids! Si us plau prova-ho de nou."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Sembla que intentes actualitzar una imatge que no hi cap a la memòria flaix, "
+"si us plau verifica el fitxer d'imatge!"
+
+msgid "Java Script required!"
+msgstr "Es requereix JavaScript!"
+
+msgid "Join Network"
+msgstr "Uneix-te a la xarxa"
+
+msgid "Join Network: Settings"
+msgstr "Unir-se a la xarxa: Ajusts"
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr "Registre del nucli"
+
+msgid "Kernel Version"
+msgstr "Versió del nucli"
+
+msgid "Key"
+msgstr "Clau"
+
+msgid "Key #%d"
+msgstr "Clau #%d"
+
+msgid "Kill"
+msgstr "Mata"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Servidor L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr "Llindar de fracàs d'eco LCP"
+
+msgid "LCP echo interval"
+msgstr "Interval d'eco LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Etiqueta"
+
+msgid "Language"
+msgstr "Llengua"
+
+msgid "Language and Style"
+msgstr "Llengua i estil"
+
+msgid "Lease validity time"
+msgstr "Duració de validitat d'arrendament"
+
+msgid "Leasefile"
+msgstr "Fitxer d'arrendament"
+
+msgid "Leasetime"
+msgstr "Duració d'arrendament"
+
+msgid "Leasetime remaining"
+msgstr "Duració d'arrendament restant"
+
+msgid "Leave empty to autodetect"
+msgstr "Deixeu-ho en blanc per autodetectar"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Deixeu-ho en blanc per utilitzar l'adreça WAN actual"
+
+msgid "Legend:"
+msgstr "Llegenda:"
+
+msgid "Limit"
+msgstr "Límit"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Enllaç activa"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr "Carrega"
+
+msgid "Load Average"
+msgstr "Carrega mitjana"
+
+msgid "Loading"
+msgstr "Carregant"
+
+msgid "Local IPv4 address"
+msgstr "Adreça IPv4 local"
+
+msgid "Local IPv6 address"
+msgstr "Adreça IPv6 local"
+
+msgid "Local Startup"
+msgstr "Inici local"
+
+msgid "Local Time"
+msgstr "Hora local"
+
+msgid "Local domain"
+msgstr "Domini local"
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr "Servidor local"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr "Localitza les peticions"
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr "Nivell de sortida de registre"
+
+msgid "Log queries"
+msgstr "Registra les peticions"
+
+msgid "Logging"
+msgstr "Registre"
+
+msgid "Login"
+msgstr "Entra"
+
+msgid "Logout"
+msgstr "Surt"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr "Adreça MAC"
+
+msgid "MAC-Address Filter"
+msgstr "Filtre d'adreces MAC"
+
+msgid "MAC-Filter"
+msgstr "Filtre MAC"
+
+msgid "MAC-List"
+msgstr "Llista MAC"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Velocitat màxima"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Memòria"
+
+msgid "Memory usage (%)"
+msgstr "Ús de Memòria (%)"
+
+msgid "Metric"
+msgstr "Mètric"
+
+msgid "Minimum Rate"
+msgstr "Velocitat mínima"
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Manca l'extensió de protocol del protocol %q"
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Dispositiu mòdem"
+
+msgid "Modem init timeout"
+msgstr "Temps d'espera d'inici de mòdem"
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr "Punt de muntatge"
+
+msgid "Mount Points"
+msgstr "Punts de muntatge"
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Els punts de muntatge defineixen en quin punt un dispositiu de memòria "
+"s'adjuntarà amb el sistema de fitxers"
+
+msgid "Mount options"
+msgstr "Opcions de muntatge"
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr "Sistemes de fitxers muntats"
+
+msgid "Move down"
+msgstr "Baixa"
+
+msgid "Move up"
+msgstr "Puja"
+
+msgid "Multicast Rate"
+msgstr "Velocitat de difusió selectiva"
+
+msgid "Multicast address"
+msgstr "Adreça de difusió selectiva"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Candidats de servidor NTP"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Name of the new interface"
+msgstr "Nom de la nova interfície"
+
+msgid "Name of the new network"
+msgstr "Nom de la nova xarxa"
+
+msgid "Navigation"
+msgstr "Navegació"
+
+msgid "Netmask"
+msgstr "Màscara de xarxa"
+
+msgid "Network"
+msgstr "Xarxa"
+
+msgid "Network Utilities"
+msgstr "Utilitats de xarxa"
+
+msgid "Network boot image"
+msgstr "Imatge d'inici de xarxa"
+
+msgid "Network without interfaces."
+msgstr "Xarxa sense interfícies."
+
+msgid "Next »"
+msgstr "Següent"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Cap servidor DHCP configurat en aquesta interfície"
+
+msgid "No chains in this table"
+msgstr "No hi ha cadenes a aquesta taula"
+
+msgid "No files found"
+msgstr "Cap fitxer trobat"
+
+msgid "No information available"
+msgstr "Cap informació disponible"
+
+msgid "No negative cache"
+msgstr "Sense memòria cau negativa"
+
+msgid "No network configured on this device"
+msgstr "Cap xarxa configurada en aquest dispositiu"
+
+msgid "No network name specified"
+msgstr "Cap nom de xarxa especificat"
+
+msgid "No package lists available"
+msgstr "No hi ha llistes de paquets disponibles"
+
+msgid "No password set!"
+msgstr "Cap contrasenya establerta!"
+
+msgid "No rules in this chain"
+msgstr "No hi ha regles en aquesta cadena"
+
+msgid "No zone assigned"
+msgstr "Cap zona assignada"
+
+msgid "Noise"
+msgstr "Soroll"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Soroll:"
+
+msgid "None"
+msgstr "Cap"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "No trobat"
+
+msgid "Not associated"
+msgstr "No associat"
+
+msgid "Not connected"
+msgstr "No connectat"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Nota: Els fitxers de configuració s'esborraran."
+
+msgid "Notice"
+msgstr "Avís"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "D'acord"
+
+msgid "OPKG-Configuration"
+msgstr "Configuració d&#39;OPKG"
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"En aquesta pàgina pots configurar les interfícies de xarxa. Pots fer un pont "
+"entre diverses interfícies clicant sobre el camp \"interfície pont\" i "
+"introduint els noms de les diverses interfícies de xarxa separats per "
+"espais. També pots fer servir la notació <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"per "
+"exemple\">p.e.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Cal especificar o el nom de host o l'adreça MAC!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Un o més dels camps requerits conté un valor invàlid!"
+
+msgid "One or more required fields have no value!"
+msgstr "Un o més dels camps requerits no té valor!"
+
+msgid "Open list..."
+msgstr "Obre una llista..."
+
+msgid "Option changed"
+msgstr "Opció canviada"
+
+msgid "Option removed"
+msgstr "Opció treta"
+
+msgid "Options"
+msgstr "Opcions"
+
+msgid "Other:"
+msgstr "Altres:"
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr "Sortint:"
+
+msgid "Outdoor Channels"
+msgstr "Canals d'exteriors"
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Visió de conjunt"
+
+msgid "Owner"
+msgstr "Propietari"
+
+msgid "PAP/CHAP password"
+msgstr "Contrasenya PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Nom d'usuari PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Encapsulació PPPoA"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Es requereix el paquet libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Les llistes de paquets tenen més de 24 hores"
+
+msgid "Package name"
+msgstr "Nom del paquet"
+
+msgid "Packets"
+msgstr "Paquets"
+
+msgid "Part of zone %q"
+msgstr "Part de la zona %q"
+
+msgid "Password"
+msgstr "Contrasenya"
+
+msgid "Password authentication"
+msgstr "Autenticació per contrasenya"
+
+msgid "Password of Private Key"
+msgstr "Contrasenya de la clau privada"
+
+msgid "Password successfully changed!"
+msgstr "La contrasenya s'ha canviat amb èxit!"
+
+msgid "Path to CA-Certificate"
+msgstr "Ruta als Certificats CA"
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr "Ruta a la clau privada"
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr "Màxim:"
+
+msgid "Perform reboot"
+msgstr "Executa un reinici"
+
+msgid "Perform reset"
+msgstr "Executa un reinici"
+
+msgid "Phy Rate:"
+msgstr "Velocitat física:"
+
+msgid "Physical Settings"
+msgstr "Ajusts físics"
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr "Paquets"
+
+msgid "Please enter your username and password."
+msgstr "Si us plau entra el teu nom d'usuari i contrasenya."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Si us plau espera: Dispositiu arrancant-se de nou"
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr "Estatus de port"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr "Evita la comunicació client a client"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr "continua"
+
+msgid "Processes"
+msgstr "Processos"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Calidad"
+
+msgid "RTS/CTS Threshold"
+msgstr "Llindar RTS/CTS"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "Velocitat RX"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "Controlador sense fil RaLink 802.11%s"
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Llegeix <code>/etc/ethers</code> per configurar el servidor <abbr title="
+"\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr "Reinicia"
+
+msgid "Rebooting..."
+msgstr "Reiniciant..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Arranca de nou el sistema operatiu del teu dispositiu"
+
+msgid "Receive"
+msgstr "Rep"
+
+msgid "Receiver Antenna"
+msgstr "Antena receptora"
+
+msgid "Reconnect this interface"
+msgstr "Reconnex aquesta interfície"
+
+msgid "Reconnecting interface"
+msgstr "Reconnectant la interfície"
+
+msgid "References"
+msgstr "Referències"
+
+msgid "Regulatory Domain"
+msgstr "Domini regulatori"
+
+msgid "Relay"
+msgstr "Relé"
+
+msgid "Relay Bridge"
+msgstr "Pont de relé"
+
+msgid "Relay between networks"
+msgstr "Relé entre xarxes"
+
+msgid "Relay bridge"
+msgstr "Pont de relé"
+
+msgid "Remote IPv4 address"
+msgstr "Adreça IPv6 remota"
+
+msgid "Remove"
+msgstr "Treu"
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr "Reemplaça l'entrada"
+
+msgid "Replace wireless configuration"
+msgstr "Reemplaça la configuració sense fil"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Alguns ISP ho requereixen, per exemple el Charter amb DOCSIS 3"
+
+msgid "Reset"
+msgstr "Reinicia"
+
+msgid "Reset Counters"
+msgstr "Reinicia els comptadors"
+
+msgid "Reset to defaults"
+msgstr "Reestableix els valors per defecte"
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr "Reinicia"
+
+msgid "Restart Firewall"
+msgstr "Reinicia Tallafocs"
+
+msgid "Restore backup"
+msgstr "Restaura còpia de seguretat"
+
+msgid "Reveal/hide password"
+msgstr "Mostra/amaga la contrasenya"
+
+msgid "Revert"
+msgstr "Reverteix"
+
+msgid "Root"
+msgstr "Arrel"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Directori arrel dels fitxers servits per TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Contrasenya de l'encaminador"
+
+msgid "Routes"
+msgstr "Rutes"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Les rutes especifiquen per quina interfície i passarel·la es pot arribar a "
+"un cert ordinador o xarxa."
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr "Accés SSH"
+
+msgid "SSH-Keys"
+msgstr "Claus SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Desa"
+
+msgid "Save & Apply"
+msgstr "Desa y aplica"
+
+msgid "Save &#38; Apply"
+msgstr "Desa y aplica"
+
+msgid "Scan"
+msgstr "Escaneja"
+
+msgid "Scheduled Tasks"
+msgstr "Tasques programades"
+
+msgid "Section added"
+msgstr "Secció afegida"
+
+msgid "Section removed"
+msgstr "Secció treta"
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr "Clients separats"
+
+msgid "Separate WDS"
+msgstr "WDS separat"
+
+msgid "Server Settings"
+msgstr "Ajusts de servidor"
+
+msgid "Service Name"
+msgstr "Nom de servei"
+
+msgid "Service Type"
+msgstr "Tipus de servei"
+
+msgid "Services"
+msgstr "Serveis"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Sincronització de hora"
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr "Atura aquesta interfície"
+
+msgid "Shutdown this network"
+msgstr "Atura aquesta xarxa"
+
+msgid "Signal"
+msgstr "Senyal"
+
+msgid "Signal:"
+msgstr "Senyal:"
+
+msgid "Size"
+msgstr "Mida"
+
+msgid "Skip"
+msgstr "Salta"
+
+msgid "Skip to content"
+msgstr "Salta al contingut"
+
+msgid "Skip to navigation"
+msgstr "Salta a la navegació"
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr "Programari"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "No es pot desar els valors perquè alguns camps estan invàlids!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Tristament, l'object que heu sol·licitat no s'ha trobat."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Tristament, el servidor ha encontrat un error inesperat."
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr "Ordena"
+
+msgid "Source"
+msgstr "Origen"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Especifica el directori a que el dispositiu està adjuntat"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Especifica el port d'escolta d'aquesta instància del <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr "Especifiqueu el clau de xifració secret aquí."
+
+msgid "Start"
+msgstr "Inici"
+
+msgid "Start priority"
+msgstr "Prioritat d'inici"
+
+msgid "Startup"
+msgstr "Arranca"
+
+msgid "Static IPv4 Routes"
+msgstr "Rutes IPv4 estàtiques"
+
+msgid "Static IPv6 Routes"
+msgstr "Rutes IPv6 estàtiques"
+
+msgid "Static Leases"
+msgstr "Leases estàtics"
+
+msgid "Static Routes"
+msgstr "Rutes estàtiques"
+
+msgid "Static WDS"
+msgstr "WDS estàtic"
+
+msgid "Static address"
+msgstr "Adreça estàtica"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr "Estat"
+
+msgid "Stop"
+msgstr "Atura"
+
+msgid "Strict order"
+msgstr "Ordre estricte"
+
+msgid "Submit"
+msgstr "Envia"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Entrada d'intercanvi"
+
+msgid "Switch"
+msgstr "Commutador"
+
+msgid "Switch %q"
+msgstr "Commutador %q"
+
+msgid "Switch %q (%s)"
+msgstr "Commutador %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Protocol de commutador"
+
+msgid "Sync with browser"
+msgstr "Sincronitza amb navegador"
+
+msgid "Synchronizing..."
+msgstr "Sincronitzant..."
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "System Log"
+msgstr "Registre de sistema"
+
+msgid "System Properties"
+msgstr "Propietats de sistema"
+
+msgid "System log buffer size"
+msgstr "Mida de la memòria intermèdia del registre de sistema"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Ajusts TFTP"
+
+msgid "TFTP server root"
+msgstr "Arrel del servidor TFTP"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "Velocitat TX"
+
+msgid "Table"
+msgstr "Taula"
+
+msgid "Target"
+msgstr "Destí"
+
+msgid "Terminate"
+msgstr "Acaba"
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"El paquet <em>libiwinfo-lua</em> no està instal·lat. Heu de instal·lar "
+"aquest component per tenir una configuració sense fil funcionant!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Els caràcters permets són: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> i <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"El fitxer de dispositiu de la memòria o partició (<abbr title=\"per exemple"
+"\">p.e.</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"El sistema the fitxers que es va fer servir per formatar la memòria (<abbr "
+"title=\"per exemple example\">p.e.</abbr> <samp><abbr title=\"Third Extended "
+"Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr "S'han comès els següents canvis"
+
+msgid "The following changes have been reverted"
+msgstr "S&#39;han desfet els següents canvis"
+
+msgid "The following rules are currently active on this system."
+msgstr "Els següents regles estan actualment actives en aquest sistema."
+
+msgid "The given network name is not unique"
+msgstr "El nom de xarxa donat no és únic"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"El maquinari no es capaç de múltiples SSID i la configuració existent es "
+"reemplaçara si procediu."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"La longitud del prefix IPv4 en bits, el reste s'utilitza en les adreces IPv6."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "La longitud del prefix IPv6 en bits"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr "El protocol seleccionat necessita un dispositiu assignat"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"El sistema està esborrant la partició de configuració i es reiniciarà quan "
+"termini."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"El sistema s'està escrivent ara.<br />NO APAGUEU EL DISPOSITIU!<br />Espereu "
+"uns minuts abans d'intentar connectar-vos de nou. Pot ser necessari que "
+"renoveu l'adreça del vostre ordinador per a connectar al dispositiu de nou, "
+"depenent dels vostres ajusts."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"La imatge pujada no conté un format suportat. Assegura't de triar el format "
+"d'imatge genèric per la teva plataforma."
+
+msgid "There are no active leases."
+msgstr "No hi ha arrendaments actius."
+
+msgid "There are no pending changes to apply!"
+msgstr "No hi ha canvis pendents per aplicar!"
+
+msgid "There are no pending changes to revert!"
+msgstr "No hi ha canvis pendents per revertir!"
+
+msgid "There are no pending changes!"
+msgstr "No hi ha canvis pendents!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Aquest és l'únic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> a la teva xarxa local"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Aquest és el crontab del sistema en el qual es poden definir tasques "
+"programades."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Aquesta llista mostra una vista general sobre els processos corrent al "
+"sistema actualment i el seu estat."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Aquesta pàgina ofereix una vista general de les connexions de xarxa actives "
+"actualment."
+
+msgid "This section contains no values yet"
+msgstr "Aquesta secció no conté cap valor encara"
+
+msgid "Time Synchronization"
+msgstr "Sincronització de hora"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "La sincronització de hora encara no s'ha configurat."
+
+msgid "Timezone"
+msgstr "Zona horària"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr "Total disponible"
+
+msgid "Traceroute"
+msgstr "Rastre de ruta"
+
+msgid "Traffic"
+msgstr "Tràfic"
+
+msgid "Transfer"
+msgstr "Transferència"
+
+msgid "Transmission Rate"
+msgstr "Taxa de transmissió"
+
+msgid "Transmit"
+msgstr "Transmet"
+
+msgid "Transmit Power"
+msgstr "Potència de transmissió"
+
+msgid "Transmitter Antenna"
+msgstr "Antena transmissora"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr "ID del túnel"
+
+msgid "Tunnel Interface"
+msgstr "Interfície del túnel"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Mode Turbo"
+
+msgid "Tx-Power"
+msgstr "Potència Tx"
+
+msgid "Type"
+msgstr "Tipus"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Només UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "Dispositiu USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr "Desconegut"
+
+msgid "Unknown Error, password not changed!"
+msgstr "La contrasenya no s'ha canviat a causa d'un error desconegut!"
+
+msgid "Unmanaged"
+msgstr "Sense gestionar"
+
+msgid "Unsaved Changes"
+msgstr "Canvis sense desar"
+
+msgid "Unsupported protocol type."
+msgstr "Tipus de protocol no suportat."
+
+msgid "Update lists"
+msgstr "Actualitza les llistes"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr "Puja un arxiu..."
+
+msgid "Uploaded File"
+msgstr "Fitxer pujat"
+
+msgid "Uptime"
+msgstr "Temps d'alta"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Fes servir <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr "Utilitza la bandera de difusió"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr "Usat"
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr "Nom d'usuari"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Interfície VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANs en %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs en %q (%s)"
+
+msgid "VPN Server"
+msgstr "Servidor VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Classe de venidor per enviar al sol·licitar DHCP"
+
+msgid "Verify"
+msgstr "Verifica"
+
+msgid "Version"
+msgstr "Versió"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Sistema obert WEP"
+
+msgid "WEP Shared Key"
+msgstr "Clau compartit WEP"
+
+msgid "WEP passphrase"
+msgstr "Contrasenya WEP"
+
+msgid "WMM Mode"
+msgstr "Mode WMM"
+
+msgid "WPA passphrase"
+msgstr "Contrasenya WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"La xifratge WPA requereix que sigui instal·lat el wpa_supplicant (pel mode "
+"client) o el hostapd (pels modes AP i ad hoc)."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Esperant que s'apliquin els canvis..."
+
+msgid "Waiting for command to complete..."
+msgstr "Esperant que s'acabi l'ordre..."
+
+msgid "Warning"
+msgstr "Advertència"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Advertència: Hi ha canvis que no s'han desat i que es perdran mentre "
+"s'arranca de nou!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Sense fils"
+
+msgid "Wireless Adapter"
+msgstr "Adaptador sense fils"
+
+msgid "Wireless Network"
+msgstr "Xarxa sense fils"
+
+msgid "Wireless Overview"
+msgstr "Resum sense fils"
+
+msgid "Wireless Security"
+msgstr "Seguretat sense fils"
+
+msgid "Wireless is disabled or not associated"
+msgstr "El sense fil està inhabilitat o sense associar"
+
+msgid "Wireless is restarting..."
+msgstr "Sense fils està reiniciant..."
+
+msgid "Wireless network is disabled"
+msgstr "La xarxa sense fil està inhabilitada"
+
+msgid "Wireless network is enabled"
+msgstr "La xarxa sense fils està habilitada"
+
+msgid "Wireless restarted"
+msgstr "Sense fils reinciat"
+
+msgid "Wireless shut down"
+msgstr "Sense fils aturat"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Escriure les peticions DNS rebudes al syslog"
+
+msgid "XR Support"
+msgstr "Suport XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Pots activar o desactivar els scripts d'inici instal·lats ací. Els canvis "
+"s'aplicaran després d'arrancar de nou el dispositiu.<br /><strong>Atenció: "
+"Si desactives scripts d'inici necessaris com el \"network\", el teu "
+"dispositiu pot resultar inaccessible!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Has d'activar el Java Script al teu navegador o LuCI no funcionarà "
+"correctament."
+
+msgid "any"
+msgstr "qualsevol"
+
+msgid "auto"
+msgstr "auto"
+
+#, fuzzy
+msgid "automatic"
+msgstr "estàtic"
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr "pontejat"
+
+msgid "create:"
+msgstr "crea:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "crea un pont entre les interfícies especificades"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "inhabilita"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "caducat"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"fitxer on els leases de <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> s'emmagatzemaran"
+
+msgid "forward"
+msgstr "transemès"
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr "ajuda"
+
+msgid "hidden"
+msgstr "amagat"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "si el destí és una xarxa"
+
+msgid "input"
+msgstr "entrada"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "fitxer <abbr title=\"Domain Name System\">DNS</abbr> local"
+
+msgid "no"
+msgstr "no"
+
+msgid "no link"
+msgstr "cap enllaç"
+
+msgid "none"
+msgstr "cap"
+
+msgid "off"
+msgstr "parat"
+
+msgid "on"
+msgstr "engegat"
+
+msgid "open"
+msgstr "obert"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "encaminat"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "etiquetat"
+
+msgid "unknown"
+msgstr "desconegut"
+
+msgid "unlimited"
+msgstr "il·limitat"
+
+msgid "unspecified"
+msgstr "sense espeficicar"
+
+msgid "unspecified -or- create:"
+msgstr "sense espeficicar -o- crear:"
+
+msgid "untagged"
+msgstr "sense etiquetar"
+
+msgid "yes"
+msgstr "sí"
+
+msgid "« Back"
+msgstr "« Enrere"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "ID d'usuari de HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Això és la ID d'usuari de 32 bytes codificat en hex, no el nom d'inici"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz, 2n canal per sobre"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz, 2n canal per sota"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Accepta les publicitats d'encaminador"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Anuncia IPv6 a la xarxa"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ID de xarxa anunciat"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "El rang permès és entre 1 i 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Capacitats HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Mode HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Model de l'encaminador"
+
+#~ msgid "Router Name"
+#~ msgstr "Nom de l'encaminador"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Esperant un encaminador..."
+
+#~ msgid "Active Leases"
+#~ msgstr "Leases Actius"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encriptat\">Encr.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr ""
+#~ "Escaneig <abbr title=\"Xarxa sense fils d&#39;àrea local\">WLAN</abbr>"
+
+#~ msgid "Create Network"
+#~ msgstr "Crea Xarxa"
+
+#~ msgid "Networks"
+#~ msgstr "Xarxes"
+
+#~ msgid "Power"
+#~ msgstr "Potència"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Xarxes sense fils del teu entorn local"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "Notació <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
+#~ "adreça/prefix"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "Servidor <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "Broadcast <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Adreça <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Els ports de xarxa del teu router es poden combinar amb diverses <abbr "
+#~ "title=\"Virtual Local Area Network\">VLAN</abbr>s en les que els "
+#~ "ordinador es poden comunicar directament entre ells. Les <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s es fan servir normalment per "
+#~ "separar segments de xarxa diferents. Normalment, hi ha un port de Pujada "
+#~ "per defecte per la següent xarxa major, com Internet, i altres ports per "
+#~ "una xarxa local."
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Fitxers a guardar quan s&#39;actualitzi un nou firmware"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Aquí pots personalitzar la configuració i funcionalitats de <abbr title="
+#~ "\"Interfície de configuració Lua\">LuCI</abbr>"
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Accions Post-commit"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Aquestes comandes s&#39;executaran automàticament quan es publiqui una "
+#~ "configuració <abbr title=\"Configuració d&#39;Interfície Unificada\">UCI</"
+#~ "abbr> determinada, permetent que els canvis s&#39;apliquin a l&#39;"
+#~ "instant."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"Interfície d'Usuari\">UI</abbr>"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "Servidor <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Punt d'accés (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Opcions pppd addicionals"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Desconnexió Automàtica"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Arxiu de seguretat"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configura el servidor DNS local per fer servir els servidors anunciats "
+#~ "pel peer PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Script de connexió"
+
+#~ msgid "Create backup"
+#~ msgstr "Crea còpia de seguretat"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Script de desconnexió"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Edita llistes de paquets i destins d&#39;instal·lació"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Habilita IPv6 a l'enllaç PPP"
+
+#~ msgid "Firmware image"
+#~ msgstr "Imatge de firmware"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Ací pots crear una còpia de seguretat i restaurar la teva configuració "
+#~ "del router i - si és possible - reiniciar el router als paràmetres per "
+#~ "defecte."
+
+#~ msgid "Installation targets"
+#~ msgstr "Objectius d'instal·lació"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Mantingues els fitxers de configuració"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Permet que el pppd reemplaci la ruta per defecte actual per fer servir "
+#~ "les interfícies PPP després de connectar-se amb èxit"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr ""
+#~ "Permet que el pppd executi aquest script abans d'establir l'enllaç PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr ""
+#~ "Permet que el pppd executi aquest script abans de desconnectar l'enllaç "
+#~ "PPP"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Assegura't d'introduir el codi pin correcte o pots bloquejar la teva "
+#~ "targeta SIM!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "La majoria d'ells són servidors de xarxa, que ofereixen un cert servei "
+#~ "pel teu dispositiu o xarxa, com l'accés a consola, servir pàgines web com "
+#~ "el <abbr title=\"Interfície de configuració Lua\">LuCI</abbr>, fer "
+#~ "enrutament mesh, enviar e-mails, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Número de connexions de test fallades per iniciar reconnexió automàtica"
+
+#~ msgid "PIN code"
+#~ msgstr "Codi PIN"
+
+#~ msgid "Package lists"
+#~ msgstr "Llistes de paquets"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr ""
+#~ "Continua desfent tots els paràmetres i reiniciant els valors per defecte "
+#~ "del firmware?"
+
+#~ msgid "Processor"
+#~ msgstr "Processador"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Port Radius"
+
+#, fuzzy
+#~ msgid "Radius-Server"
+#~ msgstr "Servidor Radius"
+
+#~ msgid "Replace default route"
+#~ msgstr "Reemplaça la ruta per defecte"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Reinicia els valors per defecte del router"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Segons a esperar per tal que el modem estigui apunt abans de provar de "
+#~ "connectar-se"
+
+#~ msgid "Service type"
+#~ msgstr "Tipus de servei"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "Els serveis i dimonis realitzen certes tasques al teu dispositiu."
+
+#~ msgid "Settings"
+#~ msgstr "Configuració"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Temps d'espera de configuració"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Ho sento, l'libreCMC no suporta una actualització del sistema en aquesdta "
+#~ "plataforma.<br />Has actualitzar manualment el teu dispositiu."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Especifica arguments de línia de comanda addicionals pel pppd"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "El node de dispositiu del teu modem, p.e. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr ""
+#~ "Temps (en segons) després del qual les connexions sense fer servir es "
+#~ "tancaran"
+
+#~ msgid "Update package lists"
+#~ msgstr "Actualitza llistes de paquets"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr ""
+#~ "Penja una imatge d'libreCMC per actualitzar el firmware del dispositiu."
+
+#~ msgid "Upload image"
+#~ msgstr "Penja imatge"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Fes servir peer DNS"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Necessites instal·lar \"comgt\" per suport UMTS/GPRS, \"ppp-mod-pppoe\" "
+#~ "per suport PPPoE, \"ppp-mod-pppoa\" per suport PPPoA o \"pptp\" per "
+#~ "suport PPtP"
+
+#~ msgid "back"
+#~ msgstr "enrere"
+
+#~ msgid "buffered"
+#~ msgstr "emmagatzemat en memòria intermèdia"
+
+#~ msgid "cached"
+#~ msgstr "emmagatzemat en memòria cau"
+
+#~ msgid "free"
+#~ msgstr "lliure"
+
+#~ msgid "static"
+#~ msgstr "estàtic"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Interfície de configuració Lua\">LuCI</abbr> és una "
+#~ "col·lecció de programari lliure Lua, incloent un framework web <abbr "
+#~ "title=\"Model-Vista-Control·lador\">MVC</abbr> i una interfície web per "
+#~ "dispositius empotrats. <abbr title=\"Interfície de configuració Lua"
+#~ "\">LuCI</abbr> està llicenciada sota la Apache-License."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "Claus <abbr title=\"Secure Shell\">SSH</abbr>"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Un servidor web HTTP/1.1 lleuger escrit en C i LUA dissenyat per servir "
+#~ "LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Un servidor web petit, que es pot fer servir per servir el <abbr title="
+#~ "\"Interfície de configuració Lua\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "Addresses"
+#~ msgstr "Addreces"
+
+#~ msgid "Admin Password"
+#~ msgstr "Contrasenya d&#39;administrador"
+
+#~ msgid "Alias"
+#~ msgstr "Àlies"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Reialme d'Autenticació"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Port de pont"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Canvia la contrasenya de l'administrador del sistema (Usuari <code>root</"
+#~ "code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Client + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Fitxer de configuració"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Temps d'espera de la connexió excedit"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Desenvolupadors Contribuïdors"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP assignat"
+
+#~ msgid "Document root"
+#~ msgstr "Arrel del document"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Activa el Keep-Alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Pont Ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Ací pots enganxar les claus públiques <abbr title=\"Secure Shell\">SSH</"
+#~ "abbr> (una per línia) per l'autenticació <abbr title=\"Secure Shell"
+#~ "\">SSH</abbr> per clau pública."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Configuració IP"
+
+#~ msgid "Interface Status"
+#~ msgstr "Estat d'Interfície"
+
+#~ msgid "Lead Development"
+#~ msgstr "Desenvolupadors principals"
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Master + WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "No configurat"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Contrasenya canviada amb èxit"
+
+#~ msgid "Plugin path"
+#~ msgstr "Directori de connectors"
+
+#~ msgid "Ports"
+#~ msgstr "Ports"
+
+#~ msgid "Primary"
+#~ msgstr "Primari"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Pàgina d&#39;inici del projecte"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Gràcies a"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "El reialme que es mostrarà a la sol·licitiu d'autenticació per pàgines "
+#~ "protegides."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Error desconegut"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "per defecte a <code>/etc/httpd.conf</code>"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Llistes de paquets actualitzades"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Actualitza paquets instal·lats"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Ací també es poden veure els registres del kernel o dels serveis, per "
+#~ "tenir una vista general del seu estat actual.'iwscan = 'Escaneig <abbr "
+#~ "title=\"Xarxa sense fils d&#39;àrea local\">WLAN</abbr>"
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Ací pots trobar informació sobre l&#39;estat actual del sistema, com la "
+#~ "freqüència de rellotge de la <abbr title=\"Unitat Central de Processament"
+#~ "\">CPU</abbr>, l&#39;ús de memòria o les dades d&#39;interfície de xarxa."
+
+#~ msgid "Search file..."
+#~ msgstr "Cerca fitxer..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Interfície de configuració Lua\">LuCI</abbr> és una "
+#~ "interfície gràfica amigable, lliure i flexible per configurar l&#39;"
+#~ "libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "I ara diverteix-te amb el teu router!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Com que volem millorar aquesta interfície sempre, volem la teva opinió i "
+#~ "els teus suggeriments."
+
+#~ msgid "Hello!"
+#~ msgstr "Hola!"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Alerta: A <abbr title=\"Interfície de configuració Lua\">LuCI</abbr> els "
+#~ "canvis s&#39;han de confirmar clicant \"Canvis --> Desa &amp; Aplica\" "
+#~ "abans que s&#39;apliquin."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "A les pàgines següents podràs ajustar tots els paràmetres importants del "
+#~ "teu router."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr ""
+#~ "L&#39;equip de <abbr title=\"Interfície de configuració Lua\">LuCI</abbr>"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Aquesta és l&#39;àrea d&#39;administració de <abbr title=\"Interfície de "
+#~ "configuració Lua\">LuCI</abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Interfície d&#39;usuari"
+
+#~ msgid "enable"
+#~ msgstr "habilita"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr "(opcional)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "Port <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "Es consultarà el servidor <abbr title=\"Domain Name System\">DNS</abbr> "
+#~ "en l'ordre del fitxer de Resolució"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"màxims\">max.</abbr> leases <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "<abbr title=\"màxima\">max.</abbr> mida de paquet <abbr title=\"Extension "
+#~ "Mechanisms for Domain Name System\">EDNS0</abbr>"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "Aïllament d'AP"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Afegeix la xarxa sense fils a la xarxa física"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliases"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Mida de segment Clamp"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Crea Xarxa"
+
+#~ msgid "Devices"
+#~ msgstr "Dispositius"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "No reenviïs les cerques inverses per la xarxa local"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Habilita el Servidor TFTP"
+
+#~ msgid "Errors"
+#~ msgstr "Errors"
+
+#~ msgid "Essentials"
+#~ msgstr "Essencials"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Expandeix els Noms de Domini"
+
+#~ msgid "First leased address"
+#~ msgstr "Primera adreça de lease"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Resol problemes amb llocs web inassolibles, enviant formularis o altres "
+#~ "comportaments inesperats d'alguns ISPs."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Adreça <abbr title=\"Media Access Control\">MAC</abbr>"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Ací pots configurar els dispositius sense fils instal·lats."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignora <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Independent (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Connexió a Internet"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Uneix-te (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Leases"
+
+#~ msgid "Local Domain"
+#~ msgstr "Domini Local"
+
+#~ msgid "Local Network"
+#~ msgstr "Xarxa Local"
+
+#~ msgid "Local Server"
+#~ msgstr "Servidor Local"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Imatge de Càrrega de Xarxa"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Nom de Xarxa (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Número d'adreces de lease"
+
+#~ msgid "Path"
+#~ msgstr "Ruta"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Realitza accions"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Evita la comunicació Client a Client"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Proveeix (Punt d'Accés)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Fitxer de Resolució"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Arrel del Servidor TFTP"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "S&#39;han aplicat els següents canvis"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Quan s&#39;actualitza un nou firmware amb un <abbr title=\"Interfície de "
+#~ "configuració Lua\">LuCI</abbr> aquests fitxers s&#39;afegiran a la "
+#~ "instal·lació del nou firmware."
+
+#, fuzzy
+#~ msgid "Wireless Scan"
+#~ msgstr "Wireless"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Amb el <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "els membres d'una xarxa poden rebre automàticament els seus paràmetres de "
+#~ "xarxa (adreça <abbr title=\"Internet Protocol\">IP</abbr>, màscara de "
+#~ "xarxa, servidor <abbr title=\"Domain Name System\">DNS</abbr>, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Pots fer servir diverses xarxes sense fils amb un sol dispositiu. Tingues "
+#~ "en compte que hi ha certes restriccions específiques del maquinari i dels "
+#~ "controlados. Normalment, pots operar 1 xarxa Ad-Hoc o fins a 3 xarxes en "
+#~ "mode Master i 1 xarxa en mode Client simultàniament.\"a_w_netid = \"Nom "
+#~ "de la xarxa (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Necessites instal·lar \"ppp-mod-pppoe\" per suport PPPoE o \"pptp\" per "
+#~ "suport PPtP"
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#~ msgid "additional hostfile"
+#~ msgstr "fitxer de noms addicional"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "afegeix Noms de Domini a les entrades de noms al fitxer resolv"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "reconnecta automàticament"
+
+#~ msgid "concurrent queries"
+#~ msgstr "consultes concurrents"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "deshabilita el <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+#~ "abbr> per aquesta interfície"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "desconnecta per inactivitat durant"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "no emmagatzemis en memòria cau els desconeguts"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "filtra les consultes <abbr title=\"Domain Name System\">DNS</abbr> no "
+#~ "útils de sistemes Windows"
+
+#~ msgid "installed"
+#~ msgstr "instal·lat"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "localitza el nom de màquina depenent de la seva subxarxa"
+
+#~ msgid "not installed"
+#~ msgstr "no instal·lat"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "evita emmagatzemar en memòria cau les respostes <abbr title=\"Domain Name "
+#~ "System\">DNS</abbr> negatives"
+
+#~ msgid "query port"
+#~ msgstr "port de consulta"
+
+#~ msgid "transmitted / received"
+#~ msgstr "transmès / rebut"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "Xarxes contingudes"
+
+#~ msgid "all"
+#~ msgstr "tots"
+
+#~ msgid "Code"
+#~ msgstr "Codi"
+
+#~ msgid "Distance"
+#~ msgstr "Distància"
+
+#~ msgid "Legend"
+#~ msgstr "Llegenda"
+
+#~ msgid "Library"
+#~ msgstr "Llibreria"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "pàgina de manual de &#39;%s&#39;"
+
+#~ msgid "Package Manager"
+#~ msgstr "Gestor de paquets"
+
+#~ msgid "Service"
+#~ msgstr "Servei"
+
+#~ msgid "Statistics"
+#~ msgstr "Estadístiques"
+
+#~ msgid "zone"
+#~ msgstr "Zona"
diff --git a/trunk/package/luci/po/ca/commands.po b/trunk/package/luci/po/ca/commands.po
new file mode 100644
index 00000000..9dc23b2f
--- /dev/null
+++ b/trunk/package/luci/po/ca/commands.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-06 10:41+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Una breva descripció textual de l'ordre configurat"
+
+msgid "Access command with"
+msgstr "Accedeix l'ordre amb"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Permet la execució de l'ordre i la baixada de la seva sortida sense "
+"autenticació prèvia"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Permet que l'usuari proveïa paràmetres de línia de consola addicionals"
+
+msgid "Arguments:"
+msgstr "Paràmetres:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Els dades binaris no es mostren, descarregueu-los."
+
+msgid "Code:"
+msgstr "Codi:"
+
+msgid "Collecting data..."
+msgstr "Recollint dades..."
+
+msgid "Command"
+msgstr "Ordre"
+
+msgid "Command failed"
+msgstr "L'ordre ha fallat"
+
+msgid "Command line to execute"
+msgstr "Línia d'ordre per executar"
+
+msgid "Command successful"
+msgstr "L'ordre ha tingut èxit"
+
+msgid "Command:"
+msgstr "Ordre;"
+
+msgid "Configure"
+msgstr "Configura"
+
+msgid "Custom Commands"
+msgstr "Ordres personalitzats"
+
+msgid "Custom arguments"
+msgstr "Paràmetres personalitzats"
+
+msgid "Dashboard"
+msgstr "Panell"
+
+msgid "Description"
+msgstr "Descripció"
+
+msgid "Download"
+msgstr "Baixa"
+
+msgid "Failed to execute command!"
+msgstr "L'execució de l'ordre ha fallat!"
+
+msgid "Link"
+msgstr "Enllaç"
+
+msgid "Loading"
+msgstr "Carregant"
+
+msgid "Public access"
+msgstr "Accés públic"
+
+msgid "Run"
+msgstr "Executa"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Aquesta pàgina us permet configurar ordres de consola personalitzats que es "
+"poden invocar fàcilment de la interfície web."
+
+msgid "Waiting for command to complete..."
+msgstr "Esperant que l'ordre acabi..."
diff --git a/trunk/package/luci/po/ca/coovachilli.po b/trunk/package/luci/po/ca/coovachilli.po
new file mode 100644
index 00000000..085d9917
--- /dev/null
+++ b/trunk/package/luci/po/ca/coovachilli.po
@@ -0,0 +1,655 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-06-01 22:48+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Configuració de xarxa"
+
+msgid "RADIUS configuration"
+msgstr "Configuració RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Autenticació UAM i MAC"
+
+#~ msgid "General configuration"
+#~ msgstr "Configuració general"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Configuració CoovaChilli general"
+
+#~ msgid "Command socket"
+#~ msgstr "Socket de comanda"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "SocketUNIX usat per comunicació amb chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Configuració d'interval de refresc"
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Re-llegeix el fitxer de configuració i les consultes DNS cada interval "
+#~ "segons. Això té el mateix efecte que enviar el senyal HUP. Si l'interval "
+#~ "és 0 (zero) es deshabilita la funció."
+
+#~ msgid "Pid file"
+#~ msgstr "Fitxer PID"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr "Nom de fitxer on posar la ID de procés"
+
+#~ msgid "State directory"
+#~ msgstr "Directori d'estat"
+
+#~ msgid "Directory of non-volatile data"
+#~ msgstr "Directori de dades no volàtils"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "Configuració TUN/TAP"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Configuració de xarxa/tun"
+
+#~ msgid "Network down script"
+#~ msgstr "Script de baixada de xarxa"
+
+#~ msgid ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+#~ msgstr ""
+#~ "Script executat quan es mou una sessió des de l'estat autoritzat a no "
+#~ "autoritzat"
+
+#~ msgid "Network up script"
+#~ msgstr "Script de pujada de xarxa"
+
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr "Script executat després que la interfície de xarxa tun s'hagi alçat"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Servidor DNS primari"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Servidor DNS secundari"
+
+#~ msgid "Domain name"
+#~ msgstr "Nom de domini"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr ""
+#~ "S'utilitza per informar el client sobre el no mde domini a utilitzar per "
+#~ "les consultes DNS"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Bateria d'adreces IP dinàmiques"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Especifica una bateria d'adreces IP dinàmiques"
+
+#~ msgid "IP down script"
+#~ msgstr "Scripts de baixada IP"
+
+#~ msgid "Script executed after the tun network interface has been taken down"
+#~ msgstr ""
+#~ "Script executat després que s'hagi abaixat la interfície de xarxa tun"
+
+#~ msgid "IP up script"
+#~ msgstr "Script de pujada IP"
+
+#~ msgid ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+#~ msgstr ""
+#~ "Script executat després que s'hagi apujat la interfície de xarxa TUN/TAP"
+
+#~ msgid "Uplink subnet"
+#~ msgstr "Subxarxa de pujada"
+
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr "Adreça de xarxa de la interfície d'enllaç de pujada (notació CIDR)"
+
+#~ msgid "Static IP address pool"
+#~ msgstr "Bateria d'adreces IP estàtiques"
+
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Especifica una bateria d'adreces IP estàtiques"
+
+#~ msgid "TUN/TAP device"
+#~ msgstr "Dispositiu TUN/TAP"
+
+#~ msgid "The specific device to use for the TUN/TAP interface"
+#~ msgstr "El dispositiu específic utilitzar per la interfície TUN/TAP"
+
+#~ msgid "TX queue length"
+#~ msgstr "Llargària de la cua TX"
+
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr "La llargària de la cua TX per establir la interfície TUN/TAP"
+
+#~ msgid "Use TAP device"
+#~ msgstr "Utilitza dispositiu TAP"
+
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Utilitza la interfície TAP en comptes de TUN"
+
+#~ msgid "DHCP configuration"
+#~ msgstr "Configuració DHCP"
+
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Estebleix les opcions DHCP pels clients connectats"
+
+#~ msgid "DHCP end number"
+#~ msgstr "Número final de DHCP"
+
+#~ msgid "Where to stop assigning IP addresses (default 254)"
+#~ msgstr "Quan deixar d'assignar adreces IP (per defecte 254)"
+
+#~ msgid "DHCP interface"
+#~ msgstr "Interfície DHCP"
+
+#~ msgid "Ethernet interface to listen to for the downlink interface"
+#~ msgstr ""
+#~ "Interfície Ethernet per escoltar les connexions a la interfície de baixada"
+
+#~ msgid "Listen MAC address"
+#~ msgstr "Escolta adreça MAC"
+
+#~ msgid ""
+#~ "MAC address to listen to. If not specified the MAC address of the "
+#~ "interface will be used"
+#~ msgstr ""
+#~ "Adreça MAC per escoltar. Si no s'especifica, s'utilitzarà l'adreça MAC de "
+#~ "la interfície."
+
+#~ msgid "DHCP start number"
+#~ msgstr "Número d'inici de DHCP"
+
+#~ msgid "Where to start assigning IP addresses (default 10)"
+#~ msgstr "Quan començar a assignar adreces IP (per defecte 10)"
+
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Activa IEEE 802.1x"
+
+#~ msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
+#~ msgstr "Activa l'autenticació IEEE 802.1x i escolta peticions EAP"
+
+#~ msgid "Leasetime"
+#~ msgstr "Temps de Lease"
+
+#~ msgid "Use a DHCP lease of seconds (default 600)"
+#~ msgstr "Utilitza un lease de segons (per defecte 600)"
+
+#~ msgid "Allow session update through RADIUS"
+#~ msgstr "Permet l'actualització de sessió a través de RADIUS"
+
+#~ msgid ""
+#~ "Allow updating of session parameters with RADIUS attributes sent in "
+#~ "Accounting-Response"
+#~ msgstr ""
+#~ "Permet l'actualització dels paràmetres de sessió amb atributs RADIUS "
+#~ "enviats per Accounting-Response"
+
+#~ msgid "Admin password"
+#~ msgstr "Contrasenya d'administració"
+
+#~ msgid ""
+#~ "Password to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Contrasenya per utilitzar per autenticació d'usuari administrador per "
+#~ "agafar configurcions Chilli i establir una sessió \"system\" de dispositiu"
+
+#~ msgid "Admin user"
+#~ msgstr "Usuari administrador"
+
+#~ msgid ""
+#~ "User-name to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Nom d'usuari per utilitzar per autenticació d'usuari administrador per "
+#~ "agafar configurcions Chilli i establir una sessió \"system\" de dispositiu"
+
+#~ msgid "Do not check disconnection requests"
+#~ msgstr "No comprovis les peticions de desconnexió"
+
+#~ msgid "Do not check the source IP address of radius disconnect requests"
+#~ msgstr ""
+#~ "No comprovis l'origen de l'adreça IP de les peticions de desconnexió "
+#~ "RADIUS"
+
+#~ msgid "RADIUS disconnect port"
+#~ msgstr "Port de desconnexió RADIUS"
+
+#~ msgid "UDP port to listen to for accepting radius disconnect requests"
+#~ msgstr "Port UDP per acceptar peticions de desconnexió RADIUS"
+
+#~ msgid "NAS IP"
+#~ msgstr "NAS IP"
+
+#~ msgid "Value to use in RADIUS NAS-IP-Address attribute"
+#~ msgstr "Valor per utilitzar a l'atribut RADIUS adreça NAS-IP"
+
+#~ msgid "NAS MAC"
+#~ msgstr "NAS MAC"
+
+#~ msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
+#~ msgstr ""
+#~ "Valor d'adreça MAC per utilitzar a l'atribiut RADIUS Called-Station-ID"
+
+#~ msgid "Allow OpenID authentication"
+#~ msgstr "Permet autenticació OpenID"
+
+#~ msgid ""
+#~ "Allows OpenID authentication by sending ChilliSpot-Config=allow-"
+#~ "openidauth in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Permet autenticació OpenID enviant ChilliSpot-Config=allow-openidauth als "
+#~ "Access-Requests de RADIUS"
+
+#~ msgid "RADIUS accounting port"
+#~ msgstr "Port d'accounting RADIUS"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius accounting requests (default 1813)"
+#~ msgstr ""
+#~ "Port UDP a utilitzar per les peticions d'accounting RADIUS (per defecte "
+#~ "1813)"
+
+#~ msgid "RADIUS authentication port"
+#~ msgstr "Port d'autenticació RADIUS"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius authentication requests (default "
+#~ "1812)"
+#~ msgstr ""
+#~ "Port UDP a utilitzar per les peticions d'autenticació RADIUS (per defecte "
+#~ "1812)"
+
+#~ msgid "Option radiuscalled"
+#~ msgstr "Opció radiuscalled"
+
+#~ msgid "RADIUS listen address"
+#~ msgstr "Adreça per rebre connexions RADIUS"
+
+#~ msgid "Local interface IP address to use for the radius interface"
+#~ msgstr "Adreça IP d'interfície local per utilitzar per la interfície RADIUS"
+
+#~ msgid "RADIUS location ID"
+#~ msgstr "ID de localització RADIUS"
+
+#~ msgid "WISPr Location ID"
+#~ msgstr "ID de localització WISPr"
+
+#~ msgid "RADIUS location name"
+#~ msgstr "Nom de localització RADIUS"
+
+#~ msgid "WISPr Location Name"
+#~ msgstr "Nom de localització WISPr"
+
+#~ msgid "NAS ID"
+#~ msgstr "NAS ID"
+
+#~ msgid "Network access server identifier"
+#~ msgstr "Identificació de servidor d'accés de xarxa"
+
+#~ msgid "Option radiusnasip"
+#~ msgstr "Opció radiusnasip"
+
+#~ msgid "NAS port type"
+#~ msgstr "Tipus de port NAS"
+
+#~ msgid ""
+#~ "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
+#~ msgstr ""
+#~ "Valor de l'atribut NAS-Port-Type. Per defecte 19 (Wireless-IEEE-802.11)"
+
+#~ msgid "Send RADIUS VSA"
+#~ msgstr "Envia RADIUS VSA"
+
+#~ msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
+#~ msgstr "Envia el RADIUS VSA ChilliSpot-OriginalURl al Access-Request"
+
+#~ msgid "RADIUS secret"
+#~ msgstr "Secret RADIUS"
+
+#~ msgid "Radius shared secret for both servers"
+#~ msgstr "Secret compartit RADIUS pels dos servidors"
+
+#~ msgid "RADIUS server 1"
+#~ msgstr "Servidor RADIUS 1"
+
+#~ msgid "The IP address of radius server 1"
+#~ msgstr "L'adreça IP del servidor RADIUS 1"
+
+#~ msgid "RADIUS server 2"
+#~ msgstr "Servidor RADIUS 2"
+
+#~ msgid "The IP address of radius server 2"
+#~ msgstr "L'adreça IP del servidor RADIUS 2"
+
+#~ msgid "Swap octets"
+#~ msgstr "Intercanvia octets"
+
+#~ msgid ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+#~ msgstr ""
+#~ "Intercanvia el significat dels \"octets d'entrada\" i els \"octets de "
+#~ "sortida\" com es relacionen els atributs RADIUS"
+
+#~ msgid "Allow WPA guests"
+#~ msgstr "Permet convidats WPA"
+
+#~ msgid ""
+#~ "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+#~ "guests in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Permet l'autenticació de convidats WPA enviant un ChilliSpot-Config=allow-"
+#~ "wpa-guests als Access-Requests de RADIUS"
+
+#~ msgid "Proxy client"
+#~ msgstr "Client proxy"
+
+#~ msgid ""
+#~ "IP address from which radius requests are accepted. If omitted the server "
+#~ "will not accept radius requests"
+#~ msgstr ""
+#~ "Adreça IP des de la qual s'accepten les peticions RADIUS. Si s'omet, el "
+#~ "servidor no acceptarà peticions RADIUS"
+
+#~ msgid "Proxy listen address"
+#~ msgstr "Adreça que rep connexions del proxy"
+
+#~ msgid "Local interface IP address to use for accepting radius requests"
+#~ msgstr ""
+#~ "L'adreça IP de la interfície local a utilitzar per acceptar peticions "
+#~ "RADIUS"
+
+#~ msgid "Proxy port"
+#~ msgstr "Port proxy"
+
+#~ msgid "UDP Port to listen to for accepting radius requests"
+#~ msgstr "Port UDP a rebre connexions per acceptar peticions RADIUS"
+
+#~ msgid "Proxy secret"
+#~ msgstr "Secret de proxy"
+
+#~ msgid "Radius shared secret for clients"
+#~ msgstr "Secret compartit de RADIUS pels clients"
+
+#~ msgid "UAM configuration"
+#~ msgstr "Configuració UAM"
+
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Preferències de Mètode de Configuració Unificat"
+
+#~ msgid "Use Chilli XML"
+#~ msgstr "Utilitza XML Chilli"
+
+#~ msgid "Return the so-called Chilli XML along with WISPr XML"
+#~ msgstr "Retorna l'XML Chilli juntament amb l'XML WISPr"
+
+#~ msgid "Default idle timeout"
+#~ msgstr "Temps d'espera d'inactivitat màxim per defecte"
+
+#~ msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Temps d'espera d'inactivitat màxim per defecte excepte si s'estableix pel "
+#~ "RADIUS (per defecte 0)"
+
+#~ msgid "Default interim interval"
+#~ msgstr "Interval provisional predeterminat"
+
+#~ msgid ""
+#~ "Default interim-interval for RADIUS accounting unless otherwise set by "
+#~ "RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Interval provisional predeterminat per accounting RADIUS excepte si "
+#~ "s'estableix pel RADIUS (per defecte 0)"
+
+#~ msgid "Default session timeout"
+#~ msgstr "Temps d'espera màxim de sessió per defecte"
+
+#~ msgid ""
+#~ "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Temps d'espera màxim de sessió per defecte excepte si s'estableix pel "
+#~ "RADIUS (per defecte 0)"
+
+#~ msgid "Inspect DNS traffic"
+#~ msgstr "Inspeccions tràfic DNS"
+
+#~ msgid ""
+#~ "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
+#~ "records to prevent dns tunnels (experimental)"
+#~ msgstr ""
+#~ "Inspecciona paquets DNS i descarta ls respostes per qualsevol registre "
+#~ "que no sigui A, CNAME, SOA o MX per prevenir túnels DNS (experimental)"
+
+#~ msgid "Local users file"
+#~ msgstr "Fitxers d'usuaris local"
+
+#~ msgid ""
+#~ "A colon seperated file containing usernames and passwords of locally "
+#~ "authenticated users"
+#~ msgstr ""
+#~ "Un fitxer contenint usuaris i contrasenyes separats per punts d'usuaris "
+#~ "autenticats localment"
+
+#~ msgid "Location name"
+#~ msgstr "Nom de localització"
+
+#~ msgid "Human readable location name used in JSON interface"
+#~ msgstr "Nom de localització llegible utilitzat en l'interfície JSON"
+
+#~ msgid "Do not redirect to UAM server"
+#~ msgstr "No readrecis al servidor UAM"
+
+#~ msgid ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+#~ msgstr ""
+#~ "No retornis al servidor UAM amb quan s'iniciï la sessió amb èxit, "
+#~ "readreça només a la URL original"
+
+#~ msgid "Do not do WISPr"
+#~ msgstr "No facis WISPr"
+
+#~ msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
+#~ msgstr "No facis cap XML WISPr, assumeix que el back-end ho està fent"
+
+#~ msgid "Post auth proxy"
+#~ msgstr "Proxy post autenticació"
+
+#~ msgid ""
+#~ "Used with postauthproxyport to define a post authentication HTTP proxy "
+#~ "server"
+#~ msgstr ""
+#~ "Utilitzat amb postauthproxyport per definir una autenticació HTTP "
+#~ "posterior de proxy server"
+
+#~ msgid "Post auth proxy port"
+#~ msgstr "Port proxy post autenticació"
+
+#~ msgid ""
+#~ "Used with postauthproxy to define a post authentication HTTP proxy server"
+#~ msgstr ""
+#~ "Utilitzat amb postauthproxy per definir un servidor proxy HTTP "
+#~ "d'autenticació posterior"
+
+#~ msgid "Allowed resources"
+#~ msgstr "Recursos permesos"
+
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr ""
+#~ "Llista dels recursos que el client pot accedir sense autenticar-se primer"
+
+#~ msgid "Allow any DNS server"
+#~ msgstr "Permet qualsevol servidor DNS"
+
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr "Permet qualsevol servidor DNS per clients no autenticats"
+
+#~ msgid "Allow any IP address"
+#~ msgstr "Permet qualsevol adreça IP"
+
+#~ msgid ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+#~ msgstr ""
+#~ "Permet que els clients utilitzin qualsevol configuració IP que vulguin "
+#~ "fent ARP spoofind (experimental)"
+
+#~ msgid "Allowed domains"
+#~ msgstr "Dominis permesos"
+
+#~ msgid ""
+#~ "Defines a list of domain names to automatically add to the walled garden"
+#~ msgstr ""
+#~ "Defineix una llista de noms de domini per afegir automàticament al jardí "
+#~ "tancat"
+
+#~ msgid "UAM homepage"
+#~ msgstr "Pàgina d'inici UAM"
+
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr "URL de la pàgina d'inici per readreçar usuari no autenticats"
+
+#~ msgid "UAM static content port"
+#~ msgstr "Port de contingut estàtic UAM"
+
+#~ msgid "TCP port to bind to for only serving embedded content"
+#~ msgstr "Port TCP on escoltar per servir només contingut empotrat"
+
+#~ msgid "UAM listening address"
+#~ msgstr "Adreça per on escoltar UAM"
+
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr "Adreça IP on escoltar pels l'autenticació dels clients"
+
+#~ msgid "UAM logout IP"
+#~ msgstr "IP de final de sessió UAM"
+
+#~ msgid ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+#~ msgstr ""
+#~ "Utilitza aquesta adreça IP per finalitzar la sessió d'un que hi accedeix "
+#~ "instantàniament (per defecte 1.1.1.1)"
+
+#~ msgid "UAM listening port"
+#~ msgstr "Port on escoltar UAM"
+
+#~ msgid "TCP port to bind to for authenticating clients (default 3990)"
+#~ msgstr ""
+#~ "Port TCP per on escoltar l'autenticació de clients (per defecte 3990)"
+
+#~ msgid "UAM secret"
+#~ msgstr "Secret UAM"
+
+#~ msgid "Shared secret between uamserver and chilli"
+#~ msgstr "Secret compartit entre el uamserver i el chilli"
+
+#~ msgid "UAM server"
+#~ msgstr "Servidor UAM"
+
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr "URL del servidor URL a utilitzar per clients autenticats"
+
+#~ msgid "UAM user interface"
+#~ msgstr "Interfície d'usuari UAM"
+
+#~ msgid ""
+#~ "An init.d style program to handle local content on the uamuiport web "
+#~ "server"
+#~ msgstr ""
+#~ "Un programa de l'stil init.d per gestionar el contingut local al servidor "
+#~ "web uamuiport"
+
+#~ msgid "Use status file"
+#~ msgstr "Utilitza fitxer d'estat"
+
+#~ msgid ""
+#~ "Write the status of clients in a non-volatile state file (experimental)"
+#~ msgstr ""
+#~ "Escriu l'estat dels clients en un fitxer d'estat no volàtil (experimental)"
+
+#~ msgid "WISPr login url"
+#~ msgstr "URL d'inici de sessió WISPr"
+
+#~ msgid "Specific URL to be given in WISPr XML LoginURL"
+#~ msgstr "URL específica a donar a la URL d'inici de sessió de l'XML WISPr"
+
+#~ msgid "CGI program"
+#~ msgstr "Programa CGI"
+
+#~ msgid ""
+#~ "Executable to run as a CGI type program (like haserl) for URLs with "
+#~ "extention .chi"
+#~ msgstr ""
+#~ "Executable per executar com un programa de tipus CGI (com el haserl) per "
+#~ "URLs amb extensió .chi"
+
+#~ msgid "Web content directory"
+#~ msgstr "Directori de contingut web"
+
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr "Directori on se situa el contingut web local empotrat"
+
+#~ msgid "MAC configuration"
+#~ msgstr "Configuració MAC"
+
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Configura l'autenticació MAC"
+
+#~ msgid "Allowed MAC addresses"
+#~ msgstr "Adreces MAC permeses"
+
+#~ msgid "List of MAC addresses for which MAC authentication will be performed"
+#~ msgstr "Llista d'adreces MAC per les que es realitzarà autenticació MAC"
+
+#~ msgid "Authenticate locally allowed MACs"
+#~ msgstr "Autentica localment les MACs permeses"
+
+#~ msgid "Authenticate allowed MAC addresses without the use of RADIUS"
+#~ msgstr "Autentica les adreces MAC permeses sense l'ús del RADIUS"
+
+#~ msgid "Enable MAC authentification"
+#~ msgstr "Activa l'autenticació MAC"
+
+#~ msgid "Try to authenticate all users based on their mac address alone"
+#~ msgstr ""
+#~ "Intenta autenticar tots els usuaris basats només en la seva adreça MAC"
+
+#~ msgid "Password"
+#~ msgstr "Contrasenya"
+
+#~ msgid "Password used when performing MAC authentication"
+#~ msgstr "Contrasenya utilitzada quan es realitza autenticació MAC"
+
+#~ msgid "Suffix"
+#~ msgstr "Sufix"
+
+#~ msgid "coovachilli_macauth_macsuffix_desc"
+#~ msgstr ""
+#~ "Sufix per afegir a l'adreça MAC per formar el nm d'usuari, que s'enviarà "
+#~ "al servidor RADIUS"
diff --git a/trunk/package/luci/po/ca/ddns.po b/trunk/package/luci/po/ca/ddns.po
new file mode 100644
index 00000000..caa39167
--- /dev/null
+++ b/trunk/package/luci/po/ca/ddns.po
@@ -0,0 +1,92 @@
+#  ddns.pot
+#  generated from ./applications/luci-ddns/luasrc/i18n/ddns.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2014-07-03 20:30+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Comprova si s'ha canviat la IP cada"
+
+#, fuzzy
+msgid "Check-time unit"
+msgstr "Unitat de temps de comprovació"
+
+#, fuzzy
+msgid "Custom update-URL"
+msgstr "URL d'actualització personalitzada"
+
+msgid "Dynamic DNS"
+msgstr "DNS dinàmic"
+
+#, fuzzy
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"El DNS dinàmic permet que el teu router sigui localitzable amb un nom de "
+"màquin fix mentre té una adreça IP dinàmica."
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Force update every"
+msgstr "Força actualització cada"
+
+#, fuzzy
+msgid "Force-time unit"
+msgstr "Unitat de temps de forceig"
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid "Network"
+msgstr "Xarxa"
+
+msgid "Password"
+msgstr "Contrasenya"
+
+msgid "Service"
+msgstr "Servei"
+
+msgid "Source of IP address"
+msgstr "Origen de l'adreça IP"
+
+msgid "URL"
+msgstr ""
+
+msgid "Username"
+msgstr "Nom d'usuari"
+
+msgid "custom"
+msgstr "personalitzat"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "interface"
+msgstr "interfície"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "xarxa"
+
+#~ msgid "Event interface"
+#~ msgstr "Interfície d'esdeveniment"
diff --git a/trunk/package/luci/po/ca/diag_core.po b/trunk/package/luci/po/ca/diag_core.po
new file mode 100644
index 00000000..ffe0ded6
--- /dev/null
+++ b/trunk/package/luci/po/ca/diag_core.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-01 23:52+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configuració de diagnòstics"
+
+msgid "Diagnostics"
+msgstr "Diagnòstics"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/ca/diag_devinfo.po b/trunk/package/luci/po/ca/diag_devinfo.po
new file mode 100644
index 00000000..9739a4b3
--- /dev/null
+++ b/trunk/package/luci/po/ca/diag_devinfo.po
@@ -0,0 +1,209 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-02 05:29+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Accions"
+
+msgid "Add"
+msgstr "Afegeix"
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr "Configura"
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "Suprimeix"
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr "Edita"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr "Cap dispositiu SIP"
+
+msgid "No devices detected"
+msgstr "Cap dispositiu detectat"
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr "Propietari OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr "Informació de telèfon"
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr "Telèfons"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr "Subxarxa"
+
+msgid "This section contains no values yet"
+msgstr "Esta secció encara no conté valors"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr "Temps d'espera"
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr "Venedor"
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/ca/ffwizard.po b/trunk/package/luci/po/ca/ffwizard.po
new file mode 100644
index 00000000..c0dfa539
--- /dev/null
+++ b/trunk/package/luci/po/ca/ffwizard.po
@@ -0,0 +1,162 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-02 05:50+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr "Passarel·la"
+
+msgid "Heartbeat"
+msgstr "Batec del cor"
+
+msgid "IP address"
+msgstr "Adreça IP"
+
+msgid "L2gvpn tunnel"
+msgstr "Túnel L2gvpn"
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr "Màscara de xarxa"
+
+msgid "Password"
+msgstr "Contrasenya"
+
+msgid "Password confirmation"
+msgstr "Confirmació de contrasenya"
+
+msgid "Password successfully changed"
+msgstr "Contrasenya canviada amb èxit"
+
+msgid "Protect LAN"
+msgstr "Protegeix la LAN"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr "Compartiu la vostra connexió a Internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "L'adreça ipv6 es calcula automàticament."
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr "Error desconegut"
+
+msgid "Username"
+msgstr "Nom d'usuari"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Virtual Access Point (VAP)"
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "estàtic"
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr "recomanat"
+
+msgid "Basic settings"
+msgstr "Ajusts bàsics"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Els ajusts bàsics estan incomplets. Si us plau, aneu a"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/ca/firewall.po b/trunk/package/luci/po/ca/firewall.po
new file mode 100644
index 00000000..1843a164
--- /dev/null
+++ b/trunk/package/luci/po/ca/firewall.po
@@ -0,0 +1,603 @@
+#  luci-fw.pot
+#  generated from ./applications/luci-fw/luasrc/i18n/luci-fw.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2014-06-17 09:40+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s en %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s amb %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s en %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Entrada sense nom)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Regla sense nom)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT sense nom)"
+
+msgid "-- Please choose --"
+msgstr "-- Si us plau, trieu --"
+
+msgid "-- custom --"
+msgstr "-- personalitzats --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> paquets al <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> i limita a %s"
+
+msgid "Action"
+msgstr "Acció"
+
+msgid "Add"
+msgstr "Afegeix"
+
+msgid "Add and edit..."
+msgstr "Afegeix i edita..."
+
+msgid "Advanced Settings"
+msgstr "Ajusts avançats"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Permet el reenviament des dels <em>zones d'origen</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Permet el reenviament als <em>zones de destí</em>:"
+
+msgid "Any"
+msgstr "Qualsevol"
+
+msgid "Covered networks"
+msgstr "Xarxes cobertes"
+
+msgid "Custom Rules"
+msgstr "Regles personalitzades"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Les regles personalitzades us permet executar ordres del iptables arbitraris "
+"que la infraestructura de tallafocs no cobreix d'altra manera. Aquests "
+"ordres s'executen després de cada reinici de tallafocs, just després el "
+"conjunt de regles per defecte s'ha carregat."
+
+msgid "Destination IP address"
+msgstr "Adreça IP de destí"
+
+msgid "Destination address"
+msgstr "Adreça de destí"
+
+msgid "Destination port"
+msgstr "Port de destí"
+
+msgid "Destination zone"
+msgstr "Zona de destí"
+
+msgid "Do not rewrite"
+msgstr "No reescriguis"
+
+msgid "Drop invalid packets"
+msgstr "Descarta els paquets invàlids"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr "Habilita protecció contra la inundació SYN"
+
+msgid "Enable logging on this zone"
+msgstr "Habilita el registre d'aquesta zona"
+
+msgid "External IP address"
+msgstr "Adreça IP extern"
+
+msgid "External port"
+msgstr "Port extern"
+
+msgid "External zone"
+msgstr "Zona extern"
+
+msgid "Extra arguments"
+msgstr "Paràmetres extres"
+
+msgid "Firewall"
+msgstr "Tallafocs"
+
+msgid "Firewall - Custom Rules"
+msgstr "Tallafocs - Regles personalitzades"
+
+msgid "Firewall - Port Forwards"
+msgstr "Tallafocs - Reenviaments de port"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Tallafocs - Regles de tràfic"
+
+msgid "Firewall - Zone Settings"
+msgstr "Tallafocs - Ajusts de zona"
+
+msgid "Force connection tracking"
+msgstr "Força el rastreig de connexió"
+
+msgid "Forward"
+msgstr "Reenvia"
+
+msgid "Forward to"
+msgstr "Reenvia a"
+
+msgid "From %s in %s"
+msgstr "Des de %s en %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Des de %s en %s amb origen %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Des de %s en %s amb orígens %s i %s"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 i IPv6"
+
+msgid "IPv4 only"
+msgstr "Només IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Només IPv6"
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Reenviament interzonal"
+
+msgid "Internal IP address"
+msgstr "Adreça IP interna"
+
+msgid "Internal port"
+msgstr "Port intern"
+
+msgid "Internal zone"
+msgstr "Zona interna"
+
+msgid "Limit log messages"
+msgstr "Limita els missatges de registre"
+
+msgid "MSS clamping"
+msgstr "Fixació MSS"
+
+msgid "Masquerading"
+msgstr "Mascarada"
+
+msgid "Match"
+msgstr "Coincideix"
+
+msgid "Match ICMP type"
+msgstr "Coincideix amb el tipus ICMP"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Coincideix amb trànsit reenviat al port o rang de ports de destí donat."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Coincideix amb trànsit entrant dirigit al port o rang de ports de destí en "
+"aquest host donat"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Coincideix amb trànsit entrant originant en el host client des del port o "
+"rang de ports d'origen donat."
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "New SNAT rule"
+msgstr "Nova regla SNAT"
+
+msgid "New forward rule"
+msgstr "Nova regla de reenviament"
+
+msgid "New input rule"
+msgstr "Nova regla d'entrada"
+
+msgid "New port forward"
+msgstr "Nou reenviament de port"
+
+msgid "New source NAT"
+msgstr "Nou origen NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Només coincideix amb trànsit entrant dirigit a la adreça IP donada."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Només coincideix amb trànsit entrant des d'aquests MAC."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Només coincideix amb trànsit entrant des d'aquest IP o rang."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Només coincideix amb trànsit originant en el host client des del port o del "
+"rang de ports d'origen donat"
+
+msgid "Open ports on router"
+msgstr "Obre els ports en el encaminador"
+
+msgid "Other..."
+msgstr "Altre..."
+
+msgid "Output"
+msgstr "Sortida"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
+
+msgid "Port Forwards"
+msgstr "Reenviaments de port"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"El reenviament de ports permet que els ordinadors remots en el Internet "
+"connectin a un ordinador o servei específic dins del LAN privat."
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr "Redirigeix trànsit entrant coincidit al port donat en el host intern"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Redirigeix trànsit entrant coincidit al host intern especificat"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Restringeix la mascarada a les subxarxes de destí donades"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
+
+msgid "Restrict to address family"
+msgstr "Restringeix a la família d'adreces"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Reescriu el trànsit coincidint cap a la adreça donada."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Reescriu el trànsit coincidint cap al port d'origen donat. Pot ser deixat en "
+"blanc per només reescriure l'adreça IP."
+
+msgid "Rewrite to source %s"
+msgstr "Reescriu a l'origen %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Reescriu als orígens %s, %s"
+
+msgid "SNAT IP address"
+msgstr "Adreça IP de SNAT"
+
+msgid "SNAT port"
+msgstr "Port SNAT"
+
+msgid "Source IP address"
+msgstr "Adreça IP d'origen"
+
+msgid "Source MAC address"
+msgstr "Adreça MAC d'origen"
+
+msgid "Source NAT"
+msgstr "NAT d'origen"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"El NAT d'origen és un forma específic de mascarada que permet control de gra "
+"fi sobre l'IP d'origen utilitzat pel trànsit sortint, per exemple per "
+"associar múltiples adreces WAN a subxarxes internes."
+
+msgid "Source address"
+msgstr "Adreça d'origen"
+
+msgid "Source port"
+msgstr "Port d'origen"
+
+msgid "Source zone"
+msgstr "Zona d'origen"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
+"flux de tràfic de xarxa."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Les opcions a sota controlen les polítiques de reenviament entre aquesta "
+"zona (%s) i altres zones. <em>Zones de destí</em> cobreixen trànsit reenviat "
+"<strong>originant des de %q</strong>. <em>Zones d'origen</em> coincideixen "
+"amb trànsit reenviat des de altres zones <strong>apuntat a %q</strong>. La "
+"regla de reenviament es <em>unidirectional</em>, per exemple un reenviament "
+"de lan a wan <em>no</em> implica permís per reenviar de wan a lan també."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Aquesta pàgina us permet canviar propietats avançats de l'entrada de "
+"reenviament de port. En la majoria dels casos no hi ha necessitat de "
+"modificar aquests ajusts."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Aquesta pàgina us permet canviar propietats avançats de l'entrada de regla "
+"de trànsit, com als hosts d'origen i de destí coincidits."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Aquesta secció defineix propietats comuns de %q. Les opcions <em>entrada</"
+"em> i <em>sortida</em> estableixen les polítiques per defecte per a trànsit "
+"entrant i sortint aquesta zona mentre l'opció <em>reenvia</em> descriu la "
+"política de trànsit reenviat entre xarxes distintes dins de la zona. "
+"<em>Xarxes cobertes</em> especifica quines xarxes disponibles són membres "
+"d'aquesta zona."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "A %s a %s en <var>aquest dispositiu</var>"
+
+msgid "To %s in %s"
+msgstr "A %s en %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "A %s en <var>aquest dispositiu</var>"
+
+msgid "To %s, %s in %s"
+msgstr "A %s, %s en %s"
+
+msgid "To source IP"
+msgstr "A l'IP d'origen"
+
+msgid "To source port"
+msgstr "Al port d'origen"
+
+msgid "Traffic Rules"
+msgstr "Regles de trànsit"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Les regles de trànsit defineixen polítiques per als paquets viatjant entre "
+"zones distintes, per exemple per a rebutjar trànsit entre certs hosts o "
+"obrir ports WAN en el encaminador."
+
+msgid "Via %s"
+msgstr "Via %s"
+
+msgid "Via %s at %s"
+msgstr "Via %s a %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Podeu especificar múltiples per seleccionar \"-- personalitzat --\" i "
+"llavors introduir protocols separats per espai."
+
+msgid "Zone %q"
+msgstr "Zona %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zona ⇒ Reenviaments"
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "accepta"
+
+msgid "any"
+msgstr "qualsevol"
+
+msgid "any host"
+msgstr "qualsevol host"
+
+msgid "any router IP"
+msgstr "qualsevol IP d'encaminador"
+
+msgid "any zone"
+msgstr "qualsevol zona"
+
+msgid "don't track"
+msgstr "no rastregis"
+
+msgid "drop"
+msgstr "descarta"
+
+msgid "reject"
+msgstr "rebutja"
+
+msgid "traffic"
+msgstr "trànsit"
+
+#~ msgid "Destination"
+#~ msgstr "Destí"
+
+#~ msgid "Source"
+#~ msgstr "Origen"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Port intern (opcional)"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regles avançades"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Les regles avançades et deixen personalitzar el teu tallafocs per les "
+#~ "teves necessitats. Només s'hi correspondran les connexions noves. Als "
+#~ "paquets que pertanyen una connexió oberta se'ls permet passar el "
+#~ "tallafocs automàticament."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Readreçament de port"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "El readreçament de ports permet proveir serveis de la xarxa interna a una "
+#~ "xarxa externa."
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Readreçament de tràfic"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "El readreçament de tràfic et permet canviar l'adreça destí dels paquets "
+#~ "reenviats."
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Xarxes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Control de tràfic"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tràfic zona a zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Ací pots especificar quin tràfic de xarxes es permet entre les zones de "
+#~ "xarxa. Només s'hi correspondren les connexions noves. Als paquets que "
+#~ "pertanyen una connexió oberta se'ls permet passar el tallafocs "
+#~ "automàticament. Si experimentes problemes de connexió ocasionals, intenta "
+#~ "activar el Clamping MSS, si no desactiva'l per raons de rendiment."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destí"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Adreça IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Adreça MAC d'origen"
+
+#~ msgid "Custom forwarding"
+#~ msgstr "Reenviament personalitzat"
+
+#~ msgid "Input Zone"
+#~ msgstr "Zona d'entrada"
+
+#~ msgid "Output Zone"
+#~ msgstr "Zona de sortida"
+
+#~ msgid "External Zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "Source MAC"
+#~ msgstr "MAC origen"
+
+#~ msgid "Defaults"
+#~ msgstr "Per defecte"
+
+#~ msgid ""
+#~ "These are the default settings that are used if no other rules match."
+#~ msgstr ""
+#~ "Aquesta és la configuració per defecte utilitzada si no hi ha cap altra "
+#~ "regla que es correspongui."
+
+#~ msgid ""
+#~ "Zones part the network interfaces into certain isolated areas to separate "
+#~ "network traffic. One or more networks can belong to a zone. The MASQ-flag "
+#~ "enables NAT masquerading for all outgoing traffic on this zone."
+#~ msgstr ""
+#~ "Les zones parteixen les interfícies de xarxa en certes àrees aïllades per "
+#~ "separar el tràfic de xarxa. Una o més xarxes poden pertànyer a una zona. "
+#~ "El flag MASQ activa el NAT masquerading per tot el tràfic sortint "
+#~ "d'aquesta zona."
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
+
+#~ msgid "contained networks"
+#~ msgstr "Xarxes contingudes"
diff --git a/trunk/package/luci/po/ca/freifunk-policyrouting.po b/trunk/package/luci/po/ca/freifunk-policyrouting.po
new file mode 100644
index 00000000..c1d96e03
--- /dev/null
+++ b/trunk/package/luci/po/ca/freifunk-policyrouting.po
@@ -0,0 +1,62 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-01 23:52+0200\n"
+"PO-Revision-Date: 2014-07-03 20:37+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Tot el trànsit des de interfícies pertinent a aquestes zones s'enviarà via "
+"una passarel·la en la xarxa en malla."
+
+msgid "Enable Policy Routing"
+msgstr "Habilita el encaminament per política"
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr "Zones de tallafocs"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr "Encaminament per política"
+
+msgid "Strict Filtering"
+msgstr "Filtració estricta"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"Aquestes pàgines es poden utilitzar per configurar encaminament en certes "
+"zones de tallafocs. Això és útil si necessiteu utilitzar la vostra pròpia "
+"connexió a Internet per a vós mateix però no voleu compartir-la amb altres "
+"(és per això que també es diu 'Mode egoista'). El vostre propi trànsit "
+"llavors s'envia via la vostra connexió d'Internet mentre el trànsit "
+"originant en malla utilitzarà altra passarel·la en malla."
diff --git a/trunk/package/luci/po/ca/freifunk.po b/trunk/package/luci/po/ca/freifunk.po
new file mode 100644
index 00000000..338c6882
--- /dev/null
+++ b/trunk/package/luci/po/ca/freifunk.po
@@ -0,0 +1,407 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-18 00:15+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Dolent (ETX > 10)"
+
+msgid "Basic Settings"
+msgstr "Ajusts bàsics"
+
+msgid "Basic settings"
+msgstr "Ajusts bàsics"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Els ajusts bàsics estan incomplets. Si us plau, aneu a"
+
+msgid "Basic system settings"
+msgstr "Ajusts de sistema bàsics"
+
+msgid "Bitrate"
+msgstr "Velocitat de bits"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+"Busca versions de microprogramari noves i realitza actualitzacions "
+"automàtiques."
+
+msgid "Client network size"
+msgstr "Mida de xarxa client"
+
+msgid "Community"
+msgstr "Comunitat"
+
+msgid "Community profile"
+msgstr "Perfil de comunitat"
+
+msgid "Community settings"
+msgstr "Ajusts de comunitat"
+
+msgid "Confirm Upgrade"
+msgstr "Confirma actualització"
+
+msgid "Contact"
+msgstr "Contacte"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "La informació de contacte està incompleta. Si us plau, aneu a"
+
+msgid "Coordinates"
+msgstr "Coordenades"
+
+msgid "Country code"
+msgstr "Codi de país"
+
+msgid "Default routes"
+msgstr "Rutes per defecte"
+
+msgid "Disable default content"
+msgstr "Deshabilita el contingut per defecte"
+
+msgid "Diversity is enabled for device"
+msgstr "La diversitat està habilitada en el dispositiu"
+
+msgid "E-Mail"
+msgstr "Adreça electrònica"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "Edita la pàgina d'índex"
+
+msgid "Enable IPv6"
+msgstr "Habilita IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr "Habilita un punt d'accés virtual (VAP) per defecte si és possible."
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Troba les vostres coordenades amb l'OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Visió de conjunt del Freifunk"
+
+msgid "Freifunk Remote Update"
+msgstr "Actualització remota del Freifunk"
+
+msgid "Gateway"
+msgstr "Passarel·la"
+
+msgid "Go to"
+msgstr "Vés a"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Bo (2 < ETX < 4)"
+
+msgid "Green"
+msgstr "Verd"
+
+msgid "Hello and welcome in the network of"
+msgstr "Hola i benvingut a la xarxa de"
+
+msgid "Hide OpenStreetMap"
+msgstr "Amaga l'OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Pàgina principal"
+
+msgid "Hostname"
+msgstr "Nom de màquina"
+
+msgid "IPv6 Config"
+msgstr "Configuració IPv6"
+
+msgid "IPv6 Prefix"
+msgstr "Prefix IPv6"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "Xarxa IPv6 en notació CIDR."
+
+msgid "If selected then the default content element is not shown."
+msgstr "Si està seleccionat, l'element de contingut per defecte no es mostra."
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Si estàs interessat en el nostre projecte, llavors contacta la comunitat "
+"local"
+
+msgid "Index Page"
+msgstr "Pàgina d'índex"
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"L'accés a Internet depèn de les condicions tècniques i organitzatives, i pot "
+"funcionar o no per tu."
+
+msgid "It is operated by"
+msgstr "És administrat per"
+
+msgid "Keep configuration"
+msgstr "Manté la configuració"
+
+msgid "Latitude"
+msgstr "Latitud"
+
+msgid "Legend"
+msgstr "Llegenda"
+
+msgid "Load"
+msgstr "Càrrega"
+
+msgid "Local Time"
+msgstr "Hora local"
+
+msgid "Location"
+msgstr "Ubicació"
+
+msgid "Longitude"
+msgstr "Longitud"
+
+msgid "Map"
+msgstr "Mapa"
+
+msgid "Map Error"
+msgstr "Error de mapa"
+
+msgid "Memory"
+msgstr "Memòria"
+
+msgid "Mesh prefix"
+msgstr "Prefix de malla"
+
+msgid "Metric"
+msgstr "Mètric"
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid "Network"
+msgstr "Xarxa"
+
+msgid "Network for client DHCP addresses"
+msgstr "Xarxa de les adreces DHCP dels clients"
+
+msgid "Nickname"
+msgstr "Nickname"
+
+msgid "No default routes known."
+msgstr "No es coneix cap ruta per defecte."
+
+msgid "Notice"
+msgstr "Avís"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Operador"
+
+msgid "Orange"
+msgstr "Taronja"
+
+msgid "Overview"
+msgstr "Visió de conjunt"
+
+msgid "Package libiwinfo required!"
+msgstr "Es requereix el paquet libiwinfo!"
+
+msgid "Phone"
+msgstr "Telèfon"
+
+msgid "Please fill in your contact details below."
+msgstr "Si us plau, empleneu els vostres detalls de contacte a baix."
+
+msgid "Please set your contact information"
+msgstr "Si us plau, establiu la vostra informació de contacte"
+
+msgid "Power"
+msgstr "Potència"
+
+msgid "Processor"
+msgstr "Processador"
+
+msgid "Profile"
+msgstr "Perfil"
+
+msgid "Profile (Expert)"
+msgstr "Perfil (expert)"
+
+msgid "Realname"
+msgstr "Nom real"
+
+msgid "Red"
+msgstr "Xarxa"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Seleccioneu la vostra ubicació per un clic del ratolí en el mapa. El mapa es "
+"mostra només si esteu connectat al Internet."
+
+msgid "Show OpenStreetMap"
+msgstr "Mostra OpenStreetMap"
+
+msgid "Show on map"
+msgstr "Mostra en mapa"
+
+msgid "Signal"
+msgstr "Senyal"
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr "Inicia l'actualització"
+
+msgid "Statistics"
+msgstr "Estadístiques"
+
+msgid "Status"
+msgstr "Estat"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Encara utilitzable (4 < ETX < 10)"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"El paquet <em>libiwinfo</em> no està instal·lat. Heu d'instal·lar aquest "
+"component per a tenir una configuració sense fil funcionant!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr "El microprogramari instal·lat és la versió més recent."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr "Aquests són els ajusts de la vostra comunitat local."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr "Això és el punt d'accés"
+
+msgid "Update Settings"
+msgstr "Actualitza els ajusts"
+
+msgid "Update available!"
+msgstr "Actualització disponible!"
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr "Molt bo (ETX < 2)"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Som una iniciativa per establir una xarxa mesh lliure, independent i oberta."
+
+msgid "Wireless Overview"
+msgstr "Visió de conjunt sense fil"
+
+msgid "Yellow"
+msgstr "Groc"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "Pots trobar més informació sobre la iniciativa global Freifunk a"
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr "lliure"
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr "utilitzat"
+
+msgid "wireless settings"
+msgstr "ajusts sense fil"
diff --git a/trunk/package/luci/po/ca/hd_idle.po b/trunk/package/luci/po/ca/hd_idle.po
new file mode 100644
index 00000000..9aa2c13c
--- /dev/null
+++ b/trunk/package/luci/po/ca/hd_idle.po
@@ -0,0 +1,52 @@
+#  hd_idle.pot
+#  generated from ./applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2014-07-01 05:48+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disc"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Enable debug"
+msgstr "Habilita la depuració"
+
+msgid "Idle-time"
+msgstr "Temps d'inactivitat"
+
+msgid "Idle-time unit"
+msgstr "Unitat de temps d'inactivitat"
+
+msgid "Settings"
+msgstr "Ajusts"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle és un programa per ralentitzar els discos externs després d'un "
+"període de temps inactiu."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
diff --git a/trunk/package/luci/po/ca/meshwizard.po b/trunk/package/luci/po/ca/meshwizard.po
new file mode 100644
index 00000000..6d7bf936
--- /dev/null
+++ b/trunk/package/luci/po/ca/meshwizard.po
@@ -0,0 +1,144 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-01 23:43+0200\n"
+"PO-Revision-Date: 2014-07-01 06:11+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Activa o desactiva la configuració IPv6 globalment."
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr "Neteja la configuració"
+
+msgid "Configure this interface"
+msgstr "Configura aquesta interfície"
+
+msgid "DHCP IP range"
+msgstr "Rang IP de DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP assignarà automàticament adreces IP als clients"
+
+msgid "Enable DHCP"
+msgstr "Habilita DHCP"
+
+msgid "Enable RA"
+msgstr "Habilita RA"
+
+msgid "Enabled"
+msgstr "Habilitat"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "IPv6 Settings"
+msgstr "Ajusts IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Si això està seleccionat, la configuració es neteja abans d'establir noves "
+"opcions de configuració."
+
+msgid "Interfaces"
+msgstr "Interfícies"
+
+msgid "Mesh IP address"
+msgstr "Adreça IP en malla"
+
+msgid "Mesh IPv6 address"
+msgstr "Adreça IPv6 en malla"
+
+msgid "Mesh Wizard"
+msgstr "Ajudant de malla"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Nota: això configurarà aquesta interfície per a operació en malla, és a dir, "
+"la afegirà a la zona 'freifunk' i habilitarà l'OLSR."
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Seleccioneu aquesta opció per permetre que altres utilitzin la vostra "
+"connexió per accedir a Internet."
+
+msgid "Send router advertisements on this device."
+msgstr "Envia publicitats d'encaminador en aquest dispositiu."
+
+msgid "Share your internet connection"
+msgstr "Comparteix la vostra connexió a Internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"El rang IP del qual s'assignen adreces IP als clients (per exemple, "
+"10.1.2.1/28). Si aquest és un rang dins del vostre rang de xarxa en malla, "
+"s'anunciarà com HNA. Qualsevol altre rang utilitzarà NAT. Si deixat en "
+"blanc, els valors per defecte del perfil comunitari s'utilitzaran."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr "L'adreça IP donada no està dins del rang de la xarxa en malla"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+"Aquesta és una adreça IPv4 única en notació CIDR (per exemple, "
+"2001:1:2:3::1/64) i ha de ser registrada a la vostra comunitat local."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Aquesta és una adreça única en la malla (per exemple, 10.1.1.1) i ha de ser "
+"registrada a la vostra comunitat local."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Això configurarà una nova interfície sense fil virtual en mode de punt "
+"d'accés."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Aquest ajudant us ajudarà a configurar el vostre encaminador per al Freifunk "
+"o altre xarxa comunitària sense fil similar."
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Punt d'accés virtual (VAP)"
+
+msgid "Wizard"
+msgstr "Ajudant"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+"El vostre dispositiu i els nodes veïns han d'utilitzar el mateix canal."
+
+msgid "recommended"
+msgstr "recomanat"
diff --git a/trunk/package/luci/po/ca/minidlna.po b/trunk/package/luci/po/ca/minidlna.po
new file mode 100644
index 00000000..bf160080
--- /dev/null
+++ b/trunk/package/luci/po/ca/minidlna.po
@@ -0,0 +1,167 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-01 05:45+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Ajusts avançats"
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr "Habilita TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Habilita inotify:"
+
+msgid "Enable:"
+msgstr "Habilita:"
+
+msgid "Friendly name:"
+msgstr "Nom amistós:"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "Interfaces:"
+msgstr "Interfícies"
+
+msgid "Log directory:"
+msgstr "Directori de registre:"
+
+msgid "Media directories:"
+msgstr "Directoris de medis:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr "Música"
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr "Interval de notificació en segons."
+
+msgid "Notify interval:"
+msgstr "Interval de notificació:"
+
+msgid "Pictures"
+msgstr "Imatges"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port de tràfic HTTP (descripcions, SOAP, transferència de medis)"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Especifiqueu la ruta a l'endoll de MiniSSDPd."
+
+msgid "Standard container"
+msgstr "Contenidor estàndard"
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr "Vídeo"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "Estat de miniDLNA"
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/ca/mmc_over_gpio.po b/trunk/package/luci/po/ca/mmc_over_gpio.po
new file mode 100644
index 00000000..558e10a7
--- /dev/null
+++ b/trunk/package/luci/po/ca/mmc_over_gpio.po
@@ -0,0 +1,43 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-06-01 23:04+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "MMC/SD driver configuration"
+msgstr "Configuració de controlador MMC/SD"
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Settings"
+msgstr "Ajusts"
diff --git a/trunk/package/luci/po/ca/multiwan.po b/trunk/package/luci/po/ca/multiwan.po
new file mode 100644
index 00000000..eb81ae81
--- /dev/null
+++ b/trunk/package/luci/po/ca/multiwan.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-01 04:22+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Intents abans de commutació WAN"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Intents abans de recuperació WAN"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Collecting data..."
+msgstr "Recollint dades..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Configureu les regles per dirigir trànsit sortint a través d'enllaços "
+"ascendents WAN especificats."
+
+msgid "DNS Server(s)"
+msgstr "Servidors DNS"
+
+msgid "Default Route"
+msgstr "Ruta per defecte"
+
+msgid "Destination Address"
+msgstr "Adreça de destí"
+
+msgid "Disable"
+msgstr "Inhabilita"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Failing"
+msgstr "Fallant"
+
+msgid "Failover Traffic Destination"
+msgstr "Destí de trànsit al commutar"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Hosts ICMP de monitor de salut"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Temps d'espera ICMP del monitor de salut"
+
+msgid "Health Monitor Interval"
+msgstr "Interval del monitor de salut"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"El monitor de salut detecta i corregeix canvis de xarxa i connexions "
+"fallades."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Distribució de l'equilibrador de carrega"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Equilibrador de carrega (compatibilitat)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Equilibrador de carrega (rendiment)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Estat de Multi-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Regles de trànsit de Multi-WAN"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"El Multi-WAN permet el ús de múltiples enllaços ascendents per a equilibri "
+"de carrega i commutació d'errors."
+
+msgid "None"
+msgstr "Cap"
+
+msgid "OK"
+msgstr "D'acord"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Recovering"
+msgstr "Recuperant"
+
+msgid "Source Address"
+msgstr "Adreça d'origen"
+
+msgid "Unknown"
+msgstr "Desconegut"
+
+msgid "WAN Interfaces"
+msgstr "Interfícies WAN"
+
+msgid "WAN Uplink"
+msgstr "Enllaç ascendent WAN"
+
+msgid "all"
+msgstr "tots"
diff --git a/trunk/package/luci/po/ca/ntpc.po b/trunk/package/luci/po/ca/ntpc.po
new file mode 100644
index 00000000..1a0f5fbc
--- /dev/null
+++ b/trunk/package/luci/po/ca/ntpc.po
@@ -0,0 +1,57 @@
+#  ntpc.pot
+#  generated from ./applications/luci-ntpc/luasrc/i18n/ntpc.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2014-07-03 20:32+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Ajustament de rellotge"
+
+#, fuzzy
+msgid "Count of time measurements"
+msgstr "Compte de mesures d'horari"
+
+msgid "Current system time"
+msgstr "Horari del sistema actual"
+
+msgid "General"
+msgstr "General"
+
+msgid "Hostname"
+msgstr "Nom de host"
+
+#, fuzzy
+msgid "Offset frequency"
+msgstr "Compensació de freqüència"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Sincronitza l'hora del sistema"
+
+msgid "Time Server"
+msgstr "Servidor d'horari"
+
+msgid "Time Servers"
+msgstr "Servidors d'horari"
+
+msgid "Time Synchronisation"
+msgstr "Sincronització d'horari"
+
+msgid "Update interval (in seconds)"
+msgstr "Interval d'actualització (en segons)"
+
+msgid "empty = infinite"
+msgstr "buit = infinit"
diff --git a/trunk/package/luci/po/ca/olsr.po b/trunk/package/luci/po/ca/olsr.po
new file mode 100644
index 00000000..db4bce1b
--- /dev/null
+++ b/trunk/package/luci/po/ca/olsr.po
@@ -0,0 +1,707 @@
+#  olsr.pot
+#  generated from ./applications/luci-olsr/luasrc/i18n/olsr.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-06-06 11:22+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "Anuncis MID actius"
+
+msgid "Active OLSR nodes"
+msgstr "Nodes OLSR actius"
+
+msgid "Active host net announcements"
+msgstr "Anuncis de xarxa de màquines actives"
+
+msgid "Advanced Settings"
+msgstr "Ajusts avançats"
+
+msgid "Allow gateways with NAT"
+msgstr "Permet els passarel·les amb NAT "
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr "Xarxa anunciada"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr "Adreça de difusió"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configuració"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr "Habilita aquesta interfície."
+
+msgid "Enabled"
+msgstr "Habilitat"
+
+msgid "Expected retransmission count"
+msgstr "Compte de retransmissió previst"
+
+msgid "FIB metric"
+msgstr "Mètrica FIB"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr "Passarel·la"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "General settings"
+msgstr "Ajusts generals"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "Anuncis HNA"
+
+msgid "HNA interval"
+msgstr "Interval HNA"
+
+msgid "HNA validity time"
+msgstr "Temps de validesa HNA"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Anuncis HNA"
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr "Interval Hello"
+
+msgid "Hello validity time"
+msgstr "Temps de validesa Hello"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr "Adreces IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "Difusió IPv4"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "Difusió selectiva IPv6"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfícies"
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr "Protocol d'Internet"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "Rutes OLSR conegudes"
+
+msgid "LQ"
+msgstr "LQ"
+
+msgid "LQ aging"
+msgstr "Envelliment LQ"
+
+msgid "LQ algorithm"
+msgstr "Algoritme LQ"
+
+msgid "LQ fisheye"
+msgstr "LQ fisheye"
+
+msgid "LQ level"
+msgstr "Nivell LQ"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "Últim salt"
+
+msgid "Legend"
+msgstr "Llegenda"
+
+msgid "Library"
+msgstr "Biblioteca"
+
+msgid "Link Quality Settings"
+msgstr "Ajusts de qualitat d'enllaç"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr "Multiplicador de qualitat d'enllaç"
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr "IP d'interfície local"
+
+msgid "MID"
+msgstr "MID"
+
+msgid "MID interval"
+msgstr "Interval MID"
+
+msgid "MID validity time"
+msgstr "Temps de validesa MID"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "IP principal"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr "Mètric"
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr "Llindar NAT"
+
+msgid "NLQ"
+msgstr "NLQ"
+
+msgid "Neighbors"
+msgstr "Veïns"
+
+msgid "Neighbour IP"
+msgstr "IP del veí"
+
+msgid "Neighbours"
+msgstr "Veïns"
+
+msgid "Netmask"
+msgstr "Màscara de xarxa"
+
+msgid "Network"
+msgstr "Xarxa"
+
+msgid "Network address"
+msgstr "Adreça de xarxa"
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr "OLSR - Opcions de mostra"
+
+msgid "OLSR - HNA-Announcements"
+msgstr "Anuncis OLSR - HNA"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "Anuncis OLSR - HNA"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Connectors"
+
+msgid "OLSR Daemon"
+msgstr "Dimoni OLSR"
+
+msgid "OLSR Daemon - Interface"
+msgstr "Dimoni OLSR - Interfície"
+
+msgid "OLSR connections"
+msgstr "Connexions OLSR"
+
+msgid "OLSR gateway"
+msgstr "Passarel·la OLSR"
+
+msgid "OLSR node"
+msgstr "Node OLSR"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr "Visió de conjunt"
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Visió de conjunt d'anuncis de xarxa de màquines OLSR actives"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Visió de conjunt de les connexions OLSR establertes actualment"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Visió de conjunt dels nodes OLSR coneguts actualment"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Visió de conjunt de rutes conegudes actualment a altres nodes OLSR"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr "Visió de conjunt de interfícies on està funcionant OLSR"
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Visió de conjunt d'anuncis d'interfície múltiple coneguts"
+
+msgid "Overview of smart gateways in this network"
+msgstr "Visió de conjunt de les passarel·les intel·ligents en aquesta xarxa"
+
+msgid "Plugin configuration"
+msgstr "Configuració de connector"
+
+msgid "Plugins"
+msgstr "Connectors"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr "Taxa de sondeig"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr "Interfícies OSLR secundàries"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr "Anuncis de SmartGW"
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr "Estat"
+
+msgid "Status"
+msgstr "Estat"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr "TC"
+
+msgid "TC interval"
+msgstr "Interval TC"
+
+msgid "TC validity time"
+msgstr "Temps de validesa TC"
+
+msgid "TOS value"
+msgstr "Valor TOS"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr "Sincronització i validitat"
+
+msgid "Topology"
+msgstr "Topologia"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "No s'ha pogut connectar al dimoni OLSR"
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr "Utilitza histèresi"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Versió"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr "Pes"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr "Voluntat"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "Dispositiu"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Assegura't que l'OLSRd està corrent, que el connector \"txtinfo\" està "
+#~ "carregat, configurat al port 2006, i que accepta connexions de "
+#~ "\"127.0.0.1\"."
diff --git a/trunk/package/luci/po/ca/openvpn.po b/trunk/package/luci/po/ca/openvpn.po
new file mode 100644
index 00000000..c7863b24
--- /dev/null
+++ b/trunk/package/luci/po/ca/openvpn.po
@@ -0,0 +1,555 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-08-07 20:41+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', o 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Accepta opcions rebudes del servidor"
+
+msgid "Add"
+msgstr "Afegeix"
+
+msgid "Add route after establishing connection"
+msgstr "Afegeix ruta després d'establir connexió"
+
+msgid "Additional authentication over TLS"
+msgstr "Autenticació addicional sobre TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Permet tràfic client a client"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Permet múltiples clients amb el mateix certificat"
+
+msgid "Allow only one session"
+msgstr "Permet només una sessió"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Permet al remot canviar la seva IP o port"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Màxim de clients connectats pemès"
+
+msgid "Allowed maximum of internal"
+msgstr "Màxim permès d'interns"
+
+msgid "Allowed maximum of new connections"
+msgstr "Màxim de noves connexions permesès"
+
+msgid "Append log to file"
+msgstr "Afegeix el registre al fitxer"
+
+msgid "Authenticate using username/password"
+msgstr "Autentica utilitzant nom d'usuari/contrasenya"
+
+msgid "Automatically redirect default route"
+msgstr "Readreça automàticament la ruta per defecte"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"A sota hi ha una llista d'instàncies OpenVPN configurades i el seu estat "
+"actual"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+"Crida l'script/comanda de desactivació abans de tancar el dispositiu TUN/TAP"
+
+msgid "Certificate authority"
+msgstr "Autoritat de certificat"
+
+msgid "Change process priority"
+msgstr "Canvia la prioritat del procés"
+
+msgid "Change to directory before initialization"
+msgstr "Canvia el directori abans de la inicialització"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Comprova el certificat de peer contra un CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Chroot al directori després de la inicialització"
+
+msgid "Client is disabled"
+msgstr "El client està inhabilitat"
+
+msgid "Configuration category"
+msgstr "Categoria de configuració"
+
+msgid "Configure client mode"
+msgstr "Configura el mode client"
+
+msgid "Configure server bridge"
+msgstr "Configura el pont de servidor"
+
+msgid "Configure server mode"
+msgstr "Configura el mode servidor"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Connecta't a través un proxy Socks5"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Connecta al host remot a través d'un intermediari HTTP"
+
+msgid "Connection retry interval"
+msgstr "Interval de reintent de connexió"
+
+msgid "Cryptography"
+msgstr "Criptografia"
+
+msgid "Daemonize after initialization"
+msgstr "Dimonitza després d'inicialitzar"
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Retarda l'obertura tun/tap i l'execució d'script d'activació"
+
+msgid "Diffie Hellman parameters"
+msgstr "Paràmetres Diffie-Hellman"
+
+msgid "Directory for custom client config files"
+msgstr "Directori per fitxers de configuració de client personalitzats"
+
+msgid "Disable Paging"
+msgstr "Desactiva Paging"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Desactiva xifratge de vector d'inicialització"
+
+msgid "Disable options consistency check"
+msgstr "Desactiva la comprovació de consistència d'opcions"
+
+msgid "Disable replay protection"
+msgstr "Desactiva la protecció de reproducció"
+
+msgid "Do not bind to local address and port"
+msgstr "No vinculis a adreça i port locals"
+
+msgid "Don't actually execute ifconfig"
+msgstr "No executis ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "No afegeixis rutes automàticament"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "No desis a la memòria cau contrasenyes --askpass o --auth-user-pass"
+
+msgid "Don't inherit global push options"
+msgstr "No heretis les opcions globals enviades pel servidor"
+
+msgid "Don't log timestamps"
+msgstr "No registris les marques horàries"
+
+msgid "Don't re-read key on restart"
+msgstr "No rellegeixis la clau al reiniciar"
+
+msgid "Don't require client certificate"
+msgstr "No requereixis el certificat de client"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "No utilitzis compressió adaptativa LZO"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "No alertis d'inconsistències ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Escriu els paràmetres al registre"
+
+msgid "Empirically measure MTU"
+msgstr "Mesura empíricament l'MTU"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Habilita els motors criptogràfics de maquinari del OpenSSL"
+
+msgid "Enable Path MTU discovery"
+msgstr "Habilita el descobriment de ruta MTU"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Activa el mode d'encriptació de Clau Estàtica (no-TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Activa el TLS i assumeix el rol de client"
+
+msgid "Enable TLS and assume server role"
+msgstr "Activa el TLS i assumeix el rol de servidor"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Activa la fragmentació de datagrames interna"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Activa la interfície de gestió a <em>IP</em> <em>port</em>"
+
+msgid "Enabled"
+msgstr "Activat"
+
+msgid "Encryption cipher for packets"
+msgstr "Xifra d'encriptació per paquets"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Executa comanda després d'afegir les rutes"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Executa una ordre de consola quan hi hagi un canvi d'IP remot"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Surt en fallar la negociació TLS"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Aconsegueix contrasenya PEM de controlar tty abans de dimonitzar"
+
+msgid "HMAC authentication for packets"
+msgstr "Autenticació HMAC per paquets"
+
+msgid "Handling of authentication failures"
+msgstr "Gestió de fallades d'autenticació"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr "Si la resolució del nom de màquina falla, reintenta-ho"
+
+msgid "Instance \"%s\""
+msgstr "Instància \"%s\""
+
+msgid "Invalid"
+msgstr "Invàlid"
+
+msgid "Keep local IP address on restart"
+msgstr "Mantingues l'adreça IP local al reiniciar"
+
+msgid "Keep remote IP address on restart"
+msgstr "Mantingues l'adreça IP remota al reiniciar"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Mantingues el dispositiu tun/tap obert al reiniciar"
+
+msgid "Key transition window"
+msgstr "Finestra de transició de clau"
+
+msgid "Limit repeated log messages"
+msgstr "Limita els missatges de registre repetits"
+
+msgid "Local certificate"
+msgstr "Certificat local"
+
+msgid "Local host name or ip address"
+msgstr "Nom de màquina local o adreça IP"
+
+msgid "Local private key"
+msgstr "Clau privada local"
+
+msgid "Major mode"
+msgstr "Mode major"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Fes que el dispositiu tun sigui apte per IPv6"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Número màxim de paquets TCP encuats a la sortida"
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Número de memòries intermèdies de difusió assignades"
+
+msgid "Number of lines for log file history"
+msgstr "Número de línies per historial de fitxer de registre"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Accepta connexions només d'un cert nom X509"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Processa l'excés de temps d'espera de pings remots si la ruta existeix"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Instàncies OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Optimitza les escriptures TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Sortida al syslog i no dimonitzis"
+
+msgid "Overview"
+msgstr "Visió de conjunt"
+
+msgid "PKCS#12 file containing keys"
+msgstr "Fitxer PKCS#12 contenidor de claus"
+
+msgid "Pass environment variables to script"
+msgstr "Passa les variables d'ambient a l'script"
+
+msgid "Persist replay-protection state"
+msgstr "Persisteix l'estat de protecció de reproducció"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Persisteix/deixa de persistir ifconfig-pool"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Ping remot cada n segons sobre port TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Proxy timeout in seconds"
+msgstr "Temps d'espera màxim de proxy en segons"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Envia una opció ifconfig al remot"
+
+msgid "Push options to peer"
+msgstr "Envia opcions al peer"
+
+msgid "Query management channel for private key"
+msgstr "Consulta el canal de gestió per una clau privada"
+
+msgid "Randomly choose remote server"
+msgstr "Tria aleatòriament el servidor remot"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Refusa la connexió si no hi ha configuració de client personalitzada"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Remapeja senyals SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Nom de màquina remot o adreça IP"
+
+msgid "Remote ping timeout"
+msgstr "Temps d'espera màxim de ping remot"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Renegocia clau de canal de dades després de bytes"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Renegocia clau de canal de dades després de paquets"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Renegocia clau de canal de dades després de segons"
+
+msgid "Replay protection sliding window size"
+msgstr "Mida de la finestra lliscant de protecció de reproducció"
+
+msgid "Require explicit designation on certificate"
+msgstr "Requereix una designació explícita al certificat"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Requereix ús de clau explícit al certificat"
+
+msgid "Restart after remote ping timeout"
+msgstr "Reinicia després d'excedir el temps d'espera de ping remot"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Temps d'espera de retransmissió en canal de control TLS"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Reintenta indefinidament en errors de proxy HTTP"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Reintenta indefinidament en errors de proxy Socks"
+
+msgid "Route subnet to client"
+msgstr "Enruta subxarxa al client"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Executa com un servidor inetd o xinetd"
+
+msgid "Run script cmd on client connection"
+msgstr "Executa l'script en connectar-se el client"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Executa l'script en desconnectar-te el client"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Executa els scripts d'activació/desactivació per tots els reinicis."
+
+msgid "Send notification to peer on disconnect"
+msgstr "Envia notificació al peer en desconnectar-se"
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr "Estableix el GID al grup"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Estableix la MTU de TCP/UDP"
+
+msgid "Set UID to user"
+msgstr "Estableix l'UID per l'usuari"
+
+msgid "Set aside a pool of subnets"
+msgstr "Deixa de banda un conjunt de subxarxes"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Estableix les opcions de proxy HTTP exteses"
+
+msgid "Set output verbosity"
+msgstr "Estableix el detall de sortida"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+"Estableix la mida de les taules de dispersió d'adreces reals i virtuals"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Estableix la mida de memòria intermèdia de recepció TCP/UDP"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Estableix la mida de memòria intermèdia d'enviament TCP/UDP"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Estableix la mida de cua TX de tun/tap"
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr "Estableix la MTU del dispositiu tun/tap"
+
+msgid "Set tun/tap device overhead"
+msgstr "Estableix la càrrega (overhead) del dispositiu tun/tap"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Estableix el límit superior al TCP MSS"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Configuració d'ample de banda d'un peer"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Ordre a executar després que s'obri un dispositiu tun"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Ordre a executar després que es tanqui un dispositiu tun"
+
+msgid "Shell command to verify X509 name"
+msgstr "Ordre de comanda per verificar el nom X509"
+
+msgid "Silence the output of replay warnings"
+msgstr "Silencia la sortida d'alertes de reproducció"
+
+msgid "Size of cipher key"
+msgstr "Mida de la clau de xifratge"
+
+msgid "Specify a default gateway for routes"
+msgstr "Especifica una passarel·la per defecte per rutes"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Inicia l'OpenVPN en un estat d'hivernació"
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr "Iniciat"
+
+msgid "Status file format version"
+msgstr "Versió de format de fitxer d'estat"
+
+msgid "Switch to advanced configuration »"
+msgstr "Canvia a configuració avançada"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Port TCP/UDP tan per local com per remot"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Port TCP/UDP per local (defecte=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Port TCP/UDP per remot (defecte=1194)"
+
+msgid "TLS cipher"
+msgstr "Xifrador TLS"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "Pas TOS (aplica només a IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Directori temporal pel fitxer de retorn per la connexió de client"
+
+msgid "Timeframe for key exchange"
+msgstr "Calendari per intercanvi de claus"
+
+msgid "Type of used device"
+msgstr "Tipus de dispositiu utilitzat"
+
+msgid "Use fast LZO compression"
+msgstr "Utilitza compressió ràpida LZO"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Utilitza adreces individuals en comptes de subxarxes /30"
+
+msgid "Use protocol"
+msgstr "Utilitza protocol"
+
+msgid "Use tun/tap device node"
+msgstr "Utilitza un node de dispositiu tun/tap"
+
+msgid "Use username as common name"
+msgstr "Utilitza el nom d'usuari com a nom comú"
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr "Escriu registre al fitxer"
+
+msgid "Write process ID to file"
+msgstr "Escriu l'ID del procés al fitxer"
+
+msgid "Write status to file every n seconds"
+msgstr "Escriu l'estat al fitxer cada n segons"
+
+msgid "no"
+msgstr "no"
+
+msgid "tun/tap device"
+msgstr "dispositiu tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr "temps d'espera màxim d'inactivitat tun/tap"
+
+msgid "yes (%i)"
+msgstr "sí (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "Canvia a configuració bàsica"
diff --git a/trunk/package/luci/po/ca/p2pblock.po b/trunk/package/luci/po/ca/p2pblock.po
new file mode 100644
index 00000000..fe99a772
--- /dev/null
+++ b/trunk/package/luci/po/ca/p2pblock.po
@@ -0,0 +1,46 @@
+#  default.pot
+#  generated from ./i18n/english/luasrc/i18n/default.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2011-02-14 17:43+0100\n"
+"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Block Time"
+msgstr "Temps de bloqueig"
+
+msgid "Enable P2P-Block"
+msgstr "Habilita el Blocat P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Protocols de capa 7"
+
+msgid "P2P-Block"
+msgstr "Blocat P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"El Blocat P2P és un mecanisme de llista grisa per blocar diversos protocols "
+"peer-tp-peer per clients que no estiguin a la llista blanca."
+
+msgid "Portrange"
+msgstr "Rang de ports"
+
+msgid "Whitelisted IPs"
+msgstr "IPs a la llista blanca"
+
+msgid "seconds"
+msgstr "segons"
diff --git a/trunk/package/luci/po/ca/p910nd.po b/trunk/package/luci/po/ca/p910nd.po
new file mode 100644
index 00000000..6862df46
--- /dev/null
+++ b/trunk/package/luci/po/ca/p910nd.po
@@ -0,0 +1,55 @@
+#  p910nd.pot
+#  generated from ./applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-01 03:56+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Mode bidireccional"
+
+msgid "Device"
+msgstr "Dispositiu"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Primer heu d'instal·lar els paquets de suport USB (kmod-usb-printer) o de "
+"port paral·lel (kmod-lp)."
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Ajusts"
+
+msgid "Specifies the interface to listen on."
+msgstr "Especifica la interfície en que escoltar."
+
+msgid "TCP listener port."
+msgstr "Port d'escolta TCP."
+
+msgid "enable"
+msgstr "habilita"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Servidor d'impressió"
+
+#~ msgid "port_help"
+#~ msgstr ""
+#~ "El p910nd escolta al port 910+N. Per exemple, 9100 per la primera "
+#~ "impressora (la 0)."
diff --git a/trunk/package/luci/po/ca/pbx-voicemail.po b/trunk/package/luci/po/ca/pbx-voicemail.po
new file mode 100644
index 00000000..c0119f77
--- /dev/null
+++ b/trunk/package/luci/po/ca/pbx-voicemail.po
@@ -0,0 +1,100 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-01 05:47+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "Adreces de correu electrònic que reben correu de veu"
+
+msgid "Enable Voicemail"
+msgstr "Habilita el correu de veu"
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr "Registre del últim correu de veu enviat"
+
+msgid "Local Storage Directory"
+msgstr "Directori d'emmagatzematge local"
+
+msgid "No"
+msgstr "No"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Servidor de correu sortint (SMTP)"
+
+msgid "SMTP Password"
+msgstr "Contrasenya SMTP"
+
+msgid "SMTP Port Number"
+msgstr "Nombre de port SMTP"
+
+msgid "SMTP Server Authentication"
+msgstr "Autenticació del servidor SMTP"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "Adreça IP o nom de host del servidor SMTP"
+
+msgid "SMTP User Name"
+msgstr "Nom d'usuari SMTP"
+
+msgid "Secure Connection Using TLS"
+msgstr "Assegura la connexió mitjançant TLS"
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"Quan habiliteu el correu de veu, tindreu l'oportunitat d'especificar adreces "
+"de correu electrònic que reben correu de veu gravat. Heu d'establir també "
+"un servidor SMTP a baix."
+
+msgid "Yes"
+msgstr "Sí"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"Podeu també retenir còpies de missatges de veu en el dispositiu executant el "
+"vostre PBX. La ruta especificat aquí es crearà si no existeix. Teniu compte "
+"d'espai limitat en dispositius incrustats com els encaminadors, i habiliteu "
+"aquesta opció només si coneixeu ho que feu."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"La vostra contrasenya SMTP no es mostra per a la vostra protecció. Es "
+"canviarà només quan canvieu el valor en aquesta caixa."
diff --git a/trunk/package/luci/po/ca/pbx.po b/trunk/package/luci/po/ca/pbx.po
new file mode 100644
index 00000000..c8a0a996
--- /dev/null
+++ b/trunk/package/luci/po/ca/pbx.po
@@ -0,0 +1,509 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-01 05:14+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Ajusts avançats"
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+"Eviteu utilitzar res excepte caràcters alfanumèrics, espai, coma, i punt."
+
+msgid "Away"
+msgstr "Fora"
+
+msgid "Blacklisted Numbers"
+msgstr "Nombres prohibits"
+
+msgid "Call Routing"
+msgstr "Encaminament de trucades"
+
+msgid "Call-back Numbers"
+msgstr "Nombres de trucada de tornada"
+
+msgid "Call-back Provider"
+msgstr "Proveïdor de trucada de tornada"
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Copieu i enganxeu llistes grans de nombres aquí."
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+"Designeu els nombres que es permeten trucar a través d'aquest sistema i els "
+"privilegis de qual usuari tindran."
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+"Designeu els nombres als quals el sistema penjarà i trucarà de tornada, qual "
+"proveïdor s'emprarà per a trucar-los, i els privilegis de qual usuari se "
+"lis concedirà."
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr "Truca els nombres que no coincideixen d'altra manera"
+
+msgid "Do Not Disturb"
+msgstr "No molestis"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Habilita trucades entrants (registreu via SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Habilita trucades entrants (establiu l'Estat a baix)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Habilita trucades sortints"
+
+msgid "Enabled"
+msgstr "Habilitat"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr "Port SIP extern"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Nom complet"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "Google Accounts"
+msgstr "Comptes de Google"
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr "Retard de penja"
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+"Quant temps per a esperar abans de penjar. Si el proveïdor que empreu per a "
+"trucar automàticament redirigeix al correu de veu, podeu estableix aquest "
+"valor a un retard que us permet penjar abans que la teva trucada es "
+"redirigeixi i s'us cobri per ella."
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "Trucades entrants"
+
+msgid "Insert QoS Rules"
+msgstr "Insereix regles QoS"
+
+msgid "Makes Outgoing Calls"
+msgstr "Fa trucades sortints"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr "NOTA: No hi ha cap compte configurat ni del Google ni de proveïdor SIP."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+"NOTA: No hi ha cap compte habilitat ni del Google ni de proveïdor SIP per "
+"als trucades entrants."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+"NOTA: No hi ha cap compte habilitat ni del Google ni de proveïdor SIP per "
+"als trucades sortints."
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr "NOTA: No hi ha cap compte d'usuari local configurat."
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+"NOTA: No hi ha cap compte d'usuari local habilitat per als trucades "
+"sortints."
+
+msgid "No"
+msgstr "No"
+
+msgid "Number of Seconds to Ring"
+msgstr "Nombre de segons a sonar"
+
+msgid "Outbound Proxy"
+msgstr "Servidor intermediari de sortida"
+
+msgid "Outgoing Calls"
+msgstr "Trucades sortints"
+
+msgid "PBX Main Page"
+msgstr "Pàgina principal PBX"
+
+msgid "PBX Service Status"
+msgstr "Estat del servei PBX"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Contrasenya"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr "Ajust de port per als dispositius SIP"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "Proveïdors utilitzats per als trucades sortints"
+
+msgid "QoS Settings"
+msgstr "Ajusts QoS"
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr "Rep trucades entrants"
+
+msgid "Remote Usage"
+msgstr "Ús remot"
+
+msgid "Rings users enabled for incoming calls"
+msgstr "Truca als usuaris habilitats per a rebre trucades"
+
+msgid "SIP Accounts"
+msgstr "Comptes SIP"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr "Comptes de proveïdor SIP"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "Regne SIP (necessitat per alguns proveïdors)"
+
+msgid "SIP Server/Registrar"
+msgstr "Servidor/Registrador SIP"
+
+msgid "SIP Server/Registrar Port"
+msgstr "Port del Servidor/Registrador SIP"
+
+msgid "Server Setting"
+msgstr "Ajust de servidor"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "Ajust de servidor pels dispositius SIP locals"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "Ajust de servidor pels dispositius SIP remots"
+
+msgid "Service Status"
+msgstr "Estat de servei"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+"Estableix el nombre de segons per a sonar als usuaris abans de penjar o anar "
+"al correu de veu, si el correu de veu està instal·lat i habilitat."
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr "Llista de nombres prohibits separats per espai"
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+"Especifiqueu els nombres individualment aquí. Premeu Enter per afegir més "
+"nombres."
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+"Utilitza aquest compte per fer trucades sortints com configurat en la secció "
+"\"Encaminament de trucades\"."
+
+msgid "Use this account to make outgoing calls."
+msgstr "Utilitza aquest compte per fer trucades sortints."
+
+msgid "User Accounts"
+msgstr "Comptes d'usuari"
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr "Nom d'usuari"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "Sí"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/ca/polipo.po b/trunk/package/luci/po/ca/polipo.po
new file mode 100644
index 00000000..76a7093f
--- /dev/null
+++ b/trunk/package/luci/po/ca/polipo.po
@@ -0,0 +1,299 @@
+#  polipo.pot
+#  generated from ./applications/luci-polipo/luasrc/i18n/polipo.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-06-02 05:16+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Ajusts avançats"
+
+msgid "Allowed clients"
+msgstr "Clients permesos"
+
+msgid "Always use system DNS resolver"
+msgstr "Sempre utilitza el resolutor DNS del sistema"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Se suporta autenticació HTTP bàsica. Entra el nom d'usuari i contrasenya en "
+"format usuari:contrasenya."
+
+msgid "Configuration"
+msgstr "Configuració"
+
+msgid "DNS and Query Settings"
+msgstr "Ajusts de DNS i petició"
+
+msgid "DNS server address"
+msgstr "Adreça de servidor DNS"
+
+msgid "Delete cache files time"
+msgstr "Hora d'esborrat de fitxers de memòria cau"
+
+msgid "Disk cache location"
+msgstr "Localització de la memòria cau del disc"
+
+msgid "Do not query IPv6"
+msgstr "No consultis IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Activa si la memòria cau (proxy) és compartida per múltiples usuaris."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Mida de segment del primer PMM (en bytes)"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Quanta RAM hauria de fer servir Polipo per la seva memòria cau"
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Mida de memòria cau a la RAM (en bytes)"
+
+msgid "Listen address"
+msgstr "Adreça que rep connexions"
+
+msgid "Listen port"
+msgstr "Port que rep connexions"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Localització on polipo desarà els fitxers de memòria cau permanentment. Es "
+"recomana l'ús de dispositius d'emmagatzematge extern, perquè la memòria cau "
+"pot créixer considerablement. Deixa-ho buit per desactivar la memòria cau en "
+"disc."
+
+msgid "Log file location"
+msgstr "Localització de fitxer registre"
+
+msgid "Log to syslog"
+msgstr "Registra al syslog"
+
+msgid "Logging and RAM"
+msgstr "Registre i RAM"
+
+msgid "Never use system DNS resolver"
+msgstr "Mai utilitzis el resolutor DNS del sistema"
+
+msgid "On-Disk Cache"
+msgstr "Memòria cau en disc"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Mida de segments MMS (en bytes)"
+
+msgid "Parent Proxy"
+msgstr "Proxy pare"
+
+msgid "Parent proxy address"
+msgstr "Adreça de proxy pare"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Adreça de proxy pare (en format host:port), al que Polipo readreçarà les "
+"sol·licituds."
+
+msgid "Parent proxy authentication"
+msgstr "Autenticació de proxy pare"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Estat del Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo és un proxy caché web petit i ràpid."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Multiplexació Poor Man's"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Multiplexació Poor Man's (PMM) és una tècnica que multiplexa sol·licitant "
+"una instància en segments múltiples. Intenta reduir la latència causada per "
+"la feblesa del protocol HTTP. NOTA: algunes pàgines poden no funcionar amb "
+"la PMM activada."
+
+msgid "Port on which Polipo will listen"
+msgstr "Port en que el Polipo escolta"
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr "Consulta DNS per nom de màquina"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr "Consulta DNS per IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "Consulta IPv4 i IPv6, prefereix IPv4"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "Consulta IPv4 i IPv6, prefereix IPv6"
+
+msgid "Query only IPv6"
+msgstr "Consulta només IPv6"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Estableix l'adreça de servidor DNS a utilitzar, si vols que Polipo faci "
+"servir un servidor DNS diferent al del sistema."
+
+msgid "Shared cache"
+msgstr "Memòria cau compartida"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Mida del primer segment PMM. Si no es defineix, per defecte és el doble de "
+"la mida de segment MMS."
+
+msgid "Size to which cached files should be truncated"
+msgstr "Mida a que els fitxers en memòria cau es deuen truncar"
+
+msgid "Status"
+msgstr "Estat"
+
+msgid "Syslog facility"
+msgstr "Instal·lació syslog"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"La interfície a la que Polipo rebrà les connexions. Per rebre-les a a totes "
+"les interfícies, utilitza 0.0.0.0 o :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Mida de truncatge de fitxer de memòria cau (en bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Hora de truncatge de fitxers de memòria cau"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Es recomana l'ǘs de dispositius d'emmagatzematge externs, ja que el fitxer "
+"de registre és escrit freqüentment i pot créixer considerablement."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr "habilita"
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Per activar la neteja memòria cau en disc de polipo (altament recomenat), "
+#~ "hauries d'afegir una tasca de cron al servei de Tasques Programades que "
+#~ "executaran l'script /usr/sbin/polipo_purge. Per exemple, per executar la "
+#~ "neteja de memòria cau del disc cada dia a les 6:00 del matí, hauries "
+#~ "d'afegir la següent línia a les Tasques Programades: \"0 6 * * * /usr/"
+#~ "sbin/polipo_purge\" (sense cometes)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Mida a la qual els fitxers de memòria cau s'haurien de truncar (valor per "
+#~ "defecte: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Hora després de la qual els fitxers de memòria cau es truncaran (valor "
+#~ "per defecte: 4d12h)."
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Hora després de la qual els fitxers de memòria s'esborraran (valor per "
+#~ "defecte: 32d)."
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Quan l'adreça d'escolta s'estableix a 0.0.0.0 o :: (IPv6), has de llistar "
+#~ "els clients que es permeten per connectar. El format és adreça IP o "
+#~ "adreça de xarxa (192.168.1.123, 192.168.1.0/24, 2001:660:116::/47 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "fals = No consultis IPv6; a contracor = Consulta els dos, prefereix IPv4; "
+#~ "feliçment = Consulta els dos, prefereix IPv6; cert = Consulta només IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "fals = mai utilitzis resoledor DNS; a contracor = Consulta DNS "
+#~ "directament, si el servidor DNS està indisponible no utilitzis el sistema "
+#~ "resoledor de DNS; feliçment = Consulta DNS directament, si la màquina no "
+#~ "es pot trobar, vés al sistema resoledor de DNS; cert = Utilitza sistema "
+#~ "resoledor DNS sempre"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Port al que Polipo rebrà les connexions (valor per defecte: 8123)."
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Per habilitar el PMM, la mida dels segments PMM s'ha d'establir a algun "
+#~ "valor positiu."
diff --git a/trunk/package/luci/po/ca/qos.po b/trunk/package/luci/po/ca/qos.po
new file mode 100644
index 00000000..7871b120
--- /dev/null
+++ b/trunk/package/luci/po/ca/qos.po
@@ -0,0 +1,122 @@
+#  qos.pot
+#  generated from ./applications/luci-qos/luasrc/i18n/qos.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2014-07-17 23:39+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#, fuzzy
+msgid "Calculate overhead"
+msgstr "Calcula càrrega (overhead)"
+
+msgid "Classification Rules"
+msgstr "Regles de classificació"
+
+msgid "Classification group"
+msgstr "Grup de classificació"
+
+msgid "Comment"
+msgstr "Comentari"
+
+msgid "Destination host"
+msgstr "Host de destí"
+
+msgid "Download speed (kbit/s)"
+msgstr "Velocitat de baixada (kbit/s)"
+
+msgid "Enable"
+msgstr "Habilita"
+
+#, fuzzy
+msgid "Half-duplex"
+msgstr "Half-duplex"
+
+msgid "Interfaces"
+msgstr "Interfícies"
+
+msgid "Number of bytes"
+msgstr "Nombre de bytes"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Qualitat de Servei"
+
+msgid "Service"
+msgstr "Servei"
+
+msgid "Source host"
+msgstr "Host d'origen"
+
+msgid "Target"
+msgstr "Host de destí"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Velocitat de pujada (kbit/s)"
+
+#, fuzzy
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Amb QoS pots prioritzar el tràfic de xarxa seleccionat per adreces, ports o "
+"serveis."
+
+msgid "all"
+msgstr "tots"
+
+msgid "default"
+msgstr "per defecte"
+
+msgid "express"
+msgstr "exprés"
+
+msgid "low"
+msgstr "baix"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "prioritat"
+
+#~ msgid "Downlink"
+#~ msgstr "Enllaç de baixada"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Connexió a Internet"
+
+#~ msgid "Uplink"
+#~ msgstr "Enllaç de pujada"
+
+#~ msgid "Prioritization"
+#~ msgstr "Priorització"
+
+#~ msgid "source network / source host"
+#~ msgstr "xarxa d'origen / màquina d'origen"
+
+#~ msgid "target network / target host"
+#~ msgstr "xarxa de destí / màquina de destí"
+
+#~ msgid "portrange"
+#~ msgstr "rang de ports"
+
+#~ msgid "Bytes sent"
+#~ msgstr "Bytes enviats"
diff --git a/trunk/package/luci/po/ca/radvd.po b/trunk/package/luci/po/ca/radvd.po
new file mode 100644
index 00000000..a9a317d4
--- /dev/null
+++ b/trunk/package/luci/po/ca/radvd.po
@@ -0,0 +1,382 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-02 21:41+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: German\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "6to4 interface"
+msgstr "Interfície 6to4"
+
+msgid "Address"
+msgstr "Adreça"
+
+msgid "Addresses"
+msgstr "Adreces"
+
+msgid "Advanced"
+msgstr "Avançat"
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr "Sufixos de domini publicats"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Prefixos IPv6 publicats"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr "Publicació"
+
+msgid "Autonomous"
+msgstr "Autònom"
+
+msgid "Clients"
+msgstr "Clients"
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Configuració DNSSL"
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr "Preferència per defecte"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Enable advertisements"
+msgstr "Habilita la publicitat"
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr "General"
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+"Indica que la enllaç subjacent no és capaç de la difusió, prevén que les "
+"publicitats no sol·licitats es enviïn"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid "Interface Configuration"
+msgstr "Configuració d'interfície"
+
+msgid "Interface required"
+msgstr "Interfície requerida"
+
+msgid "Interfaces"
+msgstr "Interfícies"
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr "IPv6 mòbil"
+
+msgid "Mobile IPv6 interval option"
+msgstr "Opció d'interval d'IPv6 mòbil"
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr "Difusió selectiva"
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Prefix Configuration"
+msgstr "Configuració de prefix"
+
+msgid "Prefixes"
+msgstr "Prefixos"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "Configuració RDNSS"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Interfície %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Prefix"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Ruta"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"El Radvd és un dimoni de publicitat d'encaminador per IPv6. Escolta per "
+"sol·licituds i envia publicitats d'encaminador com descrit en RFC 4861."
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"Restringeix la comunicació a clients especificats, deixeu en blanc per "
+"utilitzar la difusió selectiva"
+
+msgid "Retransmit timer"
+msgstr "Temporitzador de retransmissió"
+
+msgid "Route Configuration"
+msgstr "Configuració de ruta"
+
+msgid "Routes"
+msgstr "Rutes"
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr "Sufix"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"El temps màxim permès entre enviar publicitats d'encaminador de difusió "
+"selectiva no sol·licitats des de la interfície, en segons"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+"El temps mínim permès entre enviar publicitats d'encaminador de difusió "
+"selectiva des de la interfície, en segons"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"El temps mínim permès entre enviar publicitats d'encaminador de difusió "
+"selectiva no sol·licitats des de la interfície, en segons"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr "Sincronització"
+
+msgid "Unicast only"
+msgstr "Només unidifusió"
+
+msgid "Valid lifetime"
+msgstr "Durada de vida vàlida"
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr "per defecte"
+
+msgid "high"
+msgstr "alt"
+
+msgid "low"
+msgstr "baix"
+
+msgid "medium"
+msgstr "mitjà"
+
+msgid "no"
+msgstr "no"
+
+msgid "yes"
+msgstr "sí"
diff --git a/trunk/package/luci/po/ca/rrdtool.po b/trunk/package/luci/po/ca/rrdtool.po
new file mode 100644
index 00000000..7c03aad9
--- /dev/null
+++ b/trunk/package/luci/po/ca/rrdtool.po
@@ -0,0 +1,359 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 16:39+0200\n"
+"PO-Revision-Date: 2009-05-27 01:49+0200\n"
+"Last-Translator: Eduard Duran <iopahopa@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Wireless - Relació Senyal Soroll"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Nivell de soroll"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Potència de senyal"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Wireless - Qualitat de senyal"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Qualitat de senyal"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: Temps ICMP d'anada i tornada"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Tallafocs - Paquets processats"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Paquets/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Cadena \"%di\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Enllaç de xarxa - Transferència en %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bytes (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Enllaç de xarxa - Paquets en %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Paquets/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Processats (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Descartats   (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Errors    (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Enllaç de xarxa - Multicast en %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Paquets/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Paquets"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Enllaç de xarxa - Col·lisions en %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Col·lisions/s"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Col·lisions"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Enllaç de xarxa - Errors on %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Errors/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Processos"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Processos/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Procés %pi - temps de cpu usat"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "sistema"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "usuari"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Procés %pi - threads i processos"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Compte"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Procés %pi - errors de pàgina"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Errors de pàgina"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "errors de pàgina"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Procés %pi - mida de memòria virtual"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "memòria virtual"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Ús al Processador #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Transferència a %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Paquets a %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Paquets/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: Connexions TCP a Port %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Connexions/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Ús de l'espai de disc a %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Interrupcions"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Temes/s"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Càrrega de Sistema"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Càrrega"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 min"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 min"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 min"
diff --git a/trunk/package/luci/po/ca/samba.po b/trunk/package/luci/po/ca/samba.po
new file mode 100644
index 00000000..0668b1b1
--- /dev/null
+++ b/trunk/package/luci/po/ca/samba.po
@@ -0,0 +1,95 @@
+#  samba.pot
+#  generated from ./applications/luci-samba/luasrc/i18n/samba.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-01 05:47+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permet convidats"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Permet que els usuaris del sistema pugin arribar als seus directoris d'inici "
+"via comparticions de xarxa"
+
+msgid "Allowed users"
+msgstr "Usuaris permesos"
+
+msgid "Create mask"
+msgstr "Crea màscara"
+
+msgid "Description"
+msgstr "Descripció"
+
+msgid "Directory mask"
+msgstr "Màscara de directori"
+
+msgid "Edit Template"
+msgstr "Edita plantilla"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edita la plantilla que s'usa per generar la configuració de samba."
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "Hostname"
+msgstr "Nom de màquina"
+
+msgid "Mask for new directories"
+msgstr "Màscara per directoris nous"
+
+msgid "Mask for new files"
+msgstr "Màscara per fitxers nous"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Network Shares"
+msgstr "Comparticions de xarxa"
+
+msgid "Path"
+msgstr "Ruta"
+
+msgid "Read-only"
+msgstr "Només lectura"
+
+msgid "Share home-directories"
+msgstr "Comparteix directoris d'inici"
+
+msgid "Shared Directories"
+msgstr "Directoris compartits"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Això és el contingut del fitxer '/etc/samba/smb.conf.template' del qual la "
+"vostra configuració de samba es generarà. Valors encerclats per símbols de "
+"barra ('|') no es deuen canviar. Reben els seus valors de la pestanya "
+"'Ajusts generals'."
+
+msgid "Workgroup"
+msgstr "Grup de treball"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Directori compartit"
+
+#~ msgid "Physical Path"
+#~ msgstr "Ruta física"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/trunk/package/luci/po/ca/splash.po b/trunk/package/luci/po/ca/splash.po
new file mode 100644
index 00000000..3afef1a7
--- /dev/null
+++ b/trunk/package/luci/po/ca/splash.po
@@ -0,0 +1,330 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-01 23:10+0200\n"
+"PO-Revision-Date: 2014-07-02 21:20+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Accepta"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+"Accés a la xarxa no està garantit. Pot ser interromput en qualsevol moment "
+"sense notificació per qualsevol motiu, en certs dispositius, i pot ser "
+"bloquejat a certs usuaris."
+
+msgid "Active Clients"
+msgstr "Clients actius"
+
+msgid "Allowed hosts/subnets"
+msgstr "Hosts/subxarxes permets"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr "Llista negra"
+
+msgid "Blocked"
+msgstr "Bloquejat"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr "Declina"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "Dona una mica de diners per a ajudar-nos a mantenir aquest project viu."
+
+msgid "Download limit"
+msgstr "Límit de baixada"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr "Política d'ús just"
+
+msgid "Firewall zone"
+msgstr "Zona de tallafocs"
+
+msgid "General"
+msgstr "General"
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nom de host"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+"Si opereu el vostre propi equip WiFi, utilitzeu canals distints dels "
+"nostres."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "Si utilitzeu aquesta xarxa regularment, us demanem el vostre suport:"
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Intercepta trànsit de clients en aquesta interfície"
+
+msgid "Interfaces"
+msgstr "Interfícies"
+
+msgid "Interfaces that are used for Splash."
+msgstr "interfícies que s'utilitzen pel Splash."
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr "Activitats legalment prohibits"
+
+msgid "Legally Prohibited content"
+msgstr "Contingut legalment prohibit"
+
+msgid "MAC Address"
+msgstr "Adreça MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "Les adreces MAC en aquesta llista estan bloquejades."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr "Màscara de xarxa"
+
+msgid "Network"
+msgstr "Xarxa"
+
+msgid "No clients connected"
+msgstr "Cap client connectat"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Si us plau, noteu que no som proveïdor de servei de Internet sinó una xarxa "
+"comunitària experimental."
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr "Seguretat"
+
+msgid "Save"
+msgstr "Desa"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+"La xarxa, com a la Internet, no és xifrada i és oberta. Cada partícip és "
+"responsable de la seguretat dels seus propis connexions i dispositius."
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+"El partícip consent a no transferir contingut sobre la xarxa que violi la "
+"llei."
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+"El partícip consent a no utilitzar la xarxa de qualsevol manera que danyi la "
+"infraestructura, la xarxa en si, els seus operadors o altres partícips."
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+"Aquestes condicions d'ús governen l'ús de la xarxa pels ordinadors, "
+"organitzadors personals o dispositius similars (\"Dispositius\") dels seus "
+"partícips dins de la xarxa."
+
+msgid "Time remaining"
+msgstr "Temps restant"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Per demanar el motiu perquè s'us ha bloquejat o per demanar l'accés de nou, "
+"podeu intentar contactar al propietari d'aquest punt d'accés:"
+
+msgid "Traffic in/out"
+msgstr "Trànsit entrant/sortint"
+
+msgid "Upload limit"
+msgstr "Límit de pujada"
+
+msgid "Usage Agreement"
+msgstr "Acord d'ús"
+
+msgid "Welcome"
+msgstr "Benvingut"
+
+msgid "Whitelist"
+msgstr "Llista blanca"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr "Ja esteu connectat a la xarxa en malla sense fil gratis"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"Podeu introduir aquí el vostre propi text que es mostra als clients.<br />Es "
+"pot utilitzar els següents marcadors: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME### ###LIMIT### i ###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"S'us ha bloquejat el accés a aquesta xarxa, probablement perquè heu fet "
+"alguna cosa que les nostres regles explícitament prohibeixen."
+
+msgid "Your bandwidth is limited to"
+msgstr "La vostra amplada de banda està limitat a"
+
+msgid "blacklisted"
+msgstr "prohibit"
+
+msgid "expired"
+msgstr "caducat"
+
+msgid "optional when using host addresses"
+msgstr "opcional quan s'utilitza adreces de host"
+
+msgid "perform any kind of illegal activities"
+msgstr "realitza qualsevol tipus d'activitat il·legal"
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr "bloquejat temporalment"
+
+msgid "unknown"
+msgstr "desconegut"
+
+msgid "use filesharing applications on this network"
+msgstr "utilitza aplicacions de compartició de fitxers en aquesta xarxa"
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "malgasta l'amplada de banda amb baixades o corrents innecessaris"
+
+msgid "whitelisted"
+msgstr "en llista blanca"
diff --git a/trunk/package/luci/po/ca/statistics.po b/trunk/package/luci/po/ca/statistics.po
new file mode 100644
index 00000000..39a425d8
--- /dev/null
+++ b/trunk/package/luci/po/ca/statistics.po
@@ -0,0 +1,675 @@
+#  statistics.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/statistics.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-08-07 20:11+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Acció (objectiu)"
+
+msgid "Add command for reading values"
+msgstr "Afegeix ordre per llegir valors"
+
+msgid "Add matching rule"
+msgstr "Afegeix regla coincident"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Afegeix múltiples hosts separats per espai."
+
+msgid "Add notification command"
+msgstr "Afegeix ordre de notificació"
+
+msgid "Base Directory"
+msgstr "Directori base"
+
+msgid "Basic monitoring"
+msgstr "Monitoreig bàsic"
+
+msgid "CPU Plugin Configuration"
+msgstr "Configuració del connector de CPU"
+
+msgid "CSV Output"
+msgstr "Sortida CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Configuració del connector CSV"
+
+msgid "Cache collected data for"
+msgstr "Emmagatzema en memòria cau les dades recollides de"
+
+msgid "Cache flush interval"
+msgstr "Interval de neteja de memòria cau"
+
+msgid "Chain"
+msgstr "Cadena"
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Configuració Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd és un petit dimoni per recollir dades de diverses fonts a través "
+"dels connectors. En aquesta pàgina podeu canviar la configuració general del "
+"dimoni Collectd."
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Configuració del connector Conntrack"
+
+msgid "DF Plugin Configuration"
+msgstr "Configuració del connector DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Configuració del connector DNS"
+
+msgid "Data collection interval"
+msgstr "Interval de recol·lecció de dades"
+
+msgid "Datasets definition file"
+msgstr "Fitxer de definició de dades"
+
+msgid "Destination ip range"
+msgstr "Rang d'IP destí"
+
+msgid "Directory for collectd plugins"
+msgstr "Directori pels connectors connectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Directori per sub-configuracions"
+
+msgid "Disk Plugin Configuration"
+msgstr "Configuració del connector de disc"
+
+msgid "Disk Space Usage"
+msgstr "Ús d'espai en disc"
+
+msgid "Disk Usage"
+msgstr "Ús de disc"
+
+msgid "Display Host »"
+msgstr "Mostra el host »"
+
+msgid "Display timespan »"
+msgstr "Mostra l'hora"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Configuració del connector d'adreça electrònica"
+
+msgid "Email"
+msgstr "Adreça electrònica"
+
+msgid "Enable this plugin"
+msgstr "Activa aquest connector"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Configuració del connector exec"
+
+msgid "Filter class monitoring"
+msgstr "Monitoreig de classe filter"
+
+msgid "Firewall"
+msgstr "Tallafocs"
+
+msgid "Flush cache after"
+msgstr "Neteja la memòria cau després de"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Readreçant entre adreces que reben connexions i adreces de servidors"
+
+msgid "Graphs"
+msgstr "Gràfics"
+
+msgid "Group"
+msgstr "Grup"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Ací pots definir ordres externes que s'iniciaran pel collectd per llegir "
+"certs valors. Els valors es llegiran des del stdout"
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Ací pots definir ordres externes que s'iniciaran pel collectd quan s'aribi a "
+"uns certs valors llindars. Els valors que condueixin a la invocació, "
+"alimentaran als programes stdin"
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Ací pots definir diversos criteris pels que es seleccionaran les regles "
+"iptables monitoritzades ."
+
+msgid "Host"
+msgstr "Host"
+
+msgid "Hostname"
+msgstr "Nom de host"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr "Configuració de connector IRQ"
+
+msgid "Ignore source addresses"
+msgstr "Ignora adreces origen"
+
+msgid "Incoming interface"
+msgstr "Interfície entrant"
+
+msgid "Interface Plugin Configuration"
+msgstr "Configuració de connector d'interfície"
+
+msgid "Interfaces"
+msgstr "Interfícies"
+
+msgid "Interrupts"
+msgstr "Interrupcions"
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr "Configuració del connector iptables"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr "Màquina que rep connexions"
+
+msgid "Listen port"
+msgstr "Port que rep connexions"
+
+msgid "Listener interfaces"
+msgstr "Interfícies que reben connexions"
+
+msgid "Load Plugin Configuration"
+msgstr "Configuració de connector de càrrega"
+
+msgid "Maximum allowed connections"
+msgstr "Connexions màximes permeses"
+
+msgid "Memory"
+msgstr "Memòria"
+
+msgid "Memory Plugin Configuration"
+msgstr "Configuració del connector de memòria"
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr "Monitoritza tots els ports locals que reben connexions"
+
+msgid "Monitor devices"
+msgstr "Monitoritza dispositius"
+
+msgid "Monitor disks and partitions"
+msgstr "Monitoritza els discs i les particions"
+
+msgid "Monitor filesystem types"
+msgstr "Monitoritza els tipus de sistema de fitxers"
+
+msgid "Monitor hosts"
+msgstr "Monitoritza màquines"
+
+msgid "Monitor interfaces"
+msgstr "Monitoritza hosts"
+
+msgid "Monitor interrupts"
+msgstr "Monitoritza interrupcions"
+
+msgid "Monitor local ports"
+msgstr "Monitoritza els ports locals"
+
+msgid "Monitor mount points"
+msgstr "Monitoritza punts de muntatge"
+
+msgid "Monitor processes"
+msgstr "Monitoritza processos"
+
+msgid "Monitor remote ports"
+msgstr "Monitoritza els ports remots"
+
+msgid "Name of the rule"
+msgstr "Nom de la regla"
+
+msgid "Netlink"
+msgstr "Enllaç de xarxa"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Configuració del connector d'enllaç de xarxa"
+
+msgid "Network"
+msgstr "Xarxa"
+
+msgid "Network Plugin Configuration"
+msgstr "Configuració del connector de xarxa"
+
+msgid "Network plugins"
+msgstr "Connectors de xarxa"
+
+msgid "Network protocol"
+msgstr "Protocol de xarxa"
+
+msgid "Number of threads for data collection"
+msgstr "Número de fils de recol·lecció de dades"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "Configuració del connector OLSRd"
+
+msgid "Only create average RRAs"
+msgstr "Crea només RRAs mitjans"
+
+msgid "Options"
+msgstr "Opcions"
+
+msgid "Outgoing interface"
+msgstr "Interfície sortint"
+
+msgid "Output plugins"
+msgstr "Connectors de sortida"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Configuració del connector ping"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Processes"
+msgstr "Processos"
+
+msgid "Processes Plugin Configuration"
+msgstr "Configuració del connector de processos"
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Processador"
+
+msgid "Qdisc monitoring"
+msgstr "Monitoreig Qdisc"
+
+msgid "RRD XFiles Factor"
+msgstr "Factor RRD XFiles"
+
+msgid "RRD heart beat interval"
+msgstr "Interval de batec de cor RRD"
+
+msgid "RRD step interval"
+msgstr "Interval de pas RRD"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Configuració del connector RRDTool"
+
+msgid "Rows per RRA"
+msgstr "Files per RRA"
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Segons"
+
+msgid "Server host"
+msgstr "Màquina servidor"
+
+msgid "Server port"
+msgstr "Port del servidor"
+
+msgid "Shaping class monitoring"
+msgstr "Monitoreig de classe shaping"
+
+msgid "Socket file"
+msgstr "Fitxer d'endoll"
+
+msgid "Socket group"
+msgstr "Grup d'endoll"
+
+msgid "Socket permissions"
+msgstr "Permisos d'endoll"
+
+msgid "Source ip range"
+msgstr "Rang d'IP origen"
+
+msgid "Specifies what information to collect about links."
+msgstr "Especifica què informació es recull sobre enllaços."
+
+msgid "Specifies what information to collect about routes."
+msgstr "Especifica què informació es recull sobre rutes."
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "Especifica què informació es recull sobre la topologia global."
+
+msgid "Statistics"
+msgstr "Estadístiques"
+
+msgid "Storage directory"
+msgstr "Directori d'emmagatzematge"
+
+msgid "Storage directory for the csv files"
+msgstr "Directori d'emmagatzematge dels fitxers CSV"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+"Emmagatzema els valors de dades com a relacions en comptes de com a valors "
+"absoluts"
+
+msgid "Stored timespans"
+msgstr "Marques de temps emmagatzemades"
+
+msgid "System Load"
+msgstr "Càrrega de sistema"
+
+msgid "System plugins"
+msgstr "Connectors de sistema"
+
+msgid "TCP Connections"
+msgstr "Connexions TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Configuració de connector TCPConns"
+
+msgid "TTL for network packets"
+msgstr "TTL pels paquets de xarxa"
+
+msgid "TTL for ping packets"
+msgstr "TTL per paquets ping"
+
+msgid "Table"
+msgstr "Taula"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+"El connector de cpu recull estadístiques bàsiques sobre l'ús del processador."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"El connector CSV desa les dades recollides en format CSV per ser processades "
+"posteriorment per programes externs."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"El connector DF recull dades sobre l'ús d'espai en disc de diferents "
+"dispositius, punts de muntatge i tipus de sistema de fitxers."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"El connector de disc recull estadístiques d'ús detallades per les particions "
+"seleccionades o per tot el disc."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"El connector DNS recull estadístiques detallades sobre el tràfic DNS a les "
+"interfícies seleccionades."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"El connector d'adreça electrònica crea un socket unix que es pot utilitzar "
+"per transmetre estadístiques d'email a un dimoni collectd. Aquest connector "
+"es fa servir en conjunció amb Mail::SpamAssassin::Plugin. Plugin::Collectd "
+"també es pot utilitzar d'altres maneres."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"El connector exec inicia ordres externes per llegir valors des de o a "
+"processos externs quan s'arriba a certs valors de llindar."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"El connector d'interfície recull estadístiques de tràfic a les interfícies "
+"seleccionades."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"El connector iptables monitoritzarà les regles de tallafocs seleccionades i "
+"recollirà informacions sobre els bytes i paquests processats per regla."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"El connector IRQ monitoritzarà la taxa de qüestions per segon per cada "
+"interrupció seleccionada. Si no se selecciona cap interrupció, es "
+"monitoritzen totes les interrupcions."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"El connector iwinfo recull estadístiques sobre la força de senyal, soroll i "
+"qualitat sense fil."
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+"El connector de càrrega recull estadístiques sobre la càrrega de sistema "
+"general."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "El connector de memòria recull estadístiques sobre l'ús de memòria."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"El connector d'enllaç de xarxa recull informació extensa com estadístiques "
+"de qdisc-, class- i filter- per les interfícies seleccionades."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"El connector de xarxa proporciona comunicacions basades en xarxa entre "
+"diferents instàncies de collectd. El collectd pot operar tan en mode "
+"servidor com client. En el client mode les dades recollides localment es "
+"transferiran a la instància del servidor de collectd, en el mode servidor la "
+"instància rep dades de les altres màquines."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"El connector de ping enviarà ICMP Echo Replies a les màquines seleccionades "
+"i mesurarà el temps d'anada i tornada en cada màquina."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"El connector de processor recollirà informacions com el temps de cpu, errors "
+"de pàgina i ús de memòria dels processos seleccionats."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"El connector RRDTool desa les dades recollides als fitxers de base de dades "
+"RRD, la base dels diagrames.<br /><br /><strong>Alerta: Establir els valors "
+"incorrectes comportarà un consum molt alt de memòria al directori temporal. "
+"Això pot inutilitzar el dispositiu!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"El paquet d'estadísitiques està basat en <a href=\"http://collectd.org/index."
+"shtml\">Collectd</a> i utilitza l'eina <a href=\"http://oss.oetiker.ch/"
+"rrdtool/\">RRD</a> per renderitzar imatges de diagrama de les dades "
+"recoliildes."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"El connector TCPConns recull informació sobre les connexions TCP obertes en "
+"els ports seleccionats."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"El connector unixsock crea un socket Unix que es pot fer servir per llegir "
+"dades recollides d'una instància collectd."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Aquesta secció defineix en quines interfícies el collectd rebrà connexions "
+"entrants."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Aquesta secció defineix a quins servidors s'enviaran les dades recollides "
+"localment."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Intenta resoldre el nom de màquina (fqdn)"
+
+msgid "UPS"
+msgstr "UPS"
+
+msgid "UPS Plugin Configuration"
+msgstr "Configuració del connector UPS"
+
+msgid "UPS name in NUT ups@host format"
+msgstr "Nom UPS en format NUT ups@host"
+
+msgid "UnixSock"
+msgstr "Sock Unix"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Configuració de connector Unixsock"
+
+msgid "Used PID file"
+msgstr "Fitxer PID usat"
+
+msgid "User"
+msgstr "Usuari"
+
+msgid "Verbose monitoring"
+msgstr "Monitoreig detallat"
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr "p.e. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "p.e. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "p.e. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "màx. 16 caràcters"
+
+msgid "reduces rrd size"
+msgstr "redueix mida RRD"
+
+msgid "seconds; multiple separated by space"
+msgstr "segons; múltiples separats per espais"
+
+msgid "server interfaces"
+msgstr "interfícies de servidor"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "El connector Wireless recull estadístiques sobre la potència del senyal "
+#~ "sense fils, el soroll i la qualitat."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Configuració del connector Wireless"
diff --git a/trunk/package/luci/po/ca/tinyproxy.po b/trunk/package/luci/po/ca/tinyproxy.po
new file mode 100644
index 00000000..69cd99e5
--- /dev/null
+++ b/trunk/package/luci/po/ca/tinyproxy.po
@@ -0,0 +1,339 @@
+#  tinyproxy.pot
+#  generated from ./applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-18 00:04+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr "Clients permesos"
+
+msgid "Allowed connect ports"
+msgstr "Ports de connexió permesos"
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configuració"
+
+msgid "Connection timeout"
+msgstr "Temps d'espera de connexió"
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr "Habilita el servidor Tinyproxy"
+
+msgid "Error page"
+msgstr "Pàgina d'error"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr "Filtra per expressió regular"
+
+msgid "Filter by URLs"
+msgstr "Filtra per adreça"
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr "Fitxer de filtració"
+
+msgid "Filtering and ACLs"
+msgstr "Filtració i ACLs"
+
+msgid "General settings"
+msgstr "Ajusts generals"
+
+msgid "Group"
+msgstr "Grup"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr "Llista blanca de capçaleres"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Llista d'adreces IP o rangs dels quals es permeten utilitzar el servidor "
+"intermediari"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"Llista de ports permesos per al mètode CONNECT. El valor solter \"0\" permet "
+"tots els ports"
+
+msgid "Listen address"
+msgstr "Adreça d'escolta"
+
+msgid "Listen port"
+msgstr "Port d'escolta"
+
+msgid "Log file"
+msgstr "Fitxer de registre"
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr "Nivell de registre"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr "Màx servidors spare"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr "Mín servidors spare"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "Nombre mínim de processos ociosos preparats"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr "Nombre de processos ociosos que iniciar al iniciar el Tinyproxy"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Privacy settings"
+msgstr "Ajusts de privacitat"
+
+msgid "Reject access"
+msgstr "Rebutja accés"
+
+msgid "Server Settings"
+msgstr "Ajusts de servidor"
+
+msgid "Server limits"
+msgstr "Límits de servidor"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr "Pàgina d'estadístiques"
+
+msgid "Status"
+msgstr "Estat"
+
+msgid "Target host"
+msgstr "Màquina destí"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Estat de Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy és un proxy HTTP no caché petit i ràpid"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr "Utilitza el syslog"
+
+msgid "User"
+msgstr "Usuari"
+
+msgid "Via hostname"
+msgstr "Via nom de host"
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+"Escriu els missatges de registre al syslog en lloc d'un fitxer de registre"
+
+msgid "X-Tinyproxy header"
+msgstr "Capçalera X-Tinyproxy"
+
+#~ msgid "Allow access from"
+#~ msgstr "Permet l'accés des de"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Capçaleres permeses pel proxy anònim"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Vincula el tràfic sortint a l'adreça"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports permesos pel mètode CONNECT"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = desactivats, buit = tots"
+
+#~ msgid "Error document"
+#~ msgstr "Document d'error"
+
+#~ msgid "Filter list"
+#~ msgstr "Llista de filtre"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtres distingint majúscules i minúscules"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "La llista de filtre és una llista blanca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtres d'expressions regulars exteses"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtra URLs en comptes de dominis"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escolta a l'adreça"
+
+#~ msgid "Logfile"
+#~ msgstr "Fitxer de registre"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Màxim número de clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Màximes peticions per fil"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Servidors spare amb els que començar"
+
+#~ msgid "Statistic document"
+#~ msgstr "Document estadístic"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escriu al syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Temps d'espera excedit"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor de Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Inclou client IP"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Control de pujada"
+
+#~ msgid "Type"
+#~ msgstr "Tipus"
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy de pujada"
diff --git a/trunk/package/luci/po/ca/transmission.po b/trunk/package/luci/po/ca/transmission.po
new file mode 100644
index 00000000..2498393a
--- /dev/null
+++ b/trunk/package/luci/po/ca/transmission.po
@@ -0,0 +1,297 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-01 23:27+0200\n"
+"PO-Revision-Date: 2014-07-17 23:50+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Velocitat de baixada alternativa"
+
+msgid "Alternative speed enabled"
+msgstr "Velocitat alternativa habilitada"
+
+msgid "Alternative speed time begin"
+msgstr "Hora inicial de velocitat alternativa"
+
+msgid "Alternative speed time day"
+msgstr "Dia de velocitat alternativa"
+
+msgid "Alternative speed time end"
+msgstr "Hora final de velocitat alternativa"
+
+msgid "Alternative speed timing enabled"
+msgstr "Temporització de velocitat alternativa habilitada"
+
+msgid "Alternative upload speed"
+msgstr "Velocitat de pujada alternativa"
+
+msgid "Automatically start added torrents"
+msgstr "Comença automàticament els torrents afegits"
+
+msgid "Bandwidth settings"
+msgstr "Ajusts d'amplada de banda"
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr "Llista de bloqueig habilitada"
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr "Llistes de bloqueig"
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr "Directori de fitxer de configuració"
+
+msgid "DHT enabled"
+msgstr "DHT habilitat"
+
+msgid "Debug"
+msgstr "Depuració"
+
+msgid "Download directory"
+msgstr "Directori de baixada"
+
+msgid "Download queue enabled"
+msgstr "Cua de baixada habilitada"
+
+msgid "Download queue size"
+msgstr "Mida de cua de baixada"
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Habilitat"
+
+msgid "Encryption"
+msgstr "Xifració"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Fast"
+msgstr "Ràpid"
+
+msgid "Files and Locations"
+msgstr "Fitxers i ubicacions"
+
+msgid "Forced"
+msgstr "Forçat"
+
+msgid "Full"
+msgstr "Ple"
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr "Ajusts globals"
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr "Directori incomplet"
+
+msgid "Incomplete directory enabled"
+msgstr "Directori incomplet habilitat"
+
+msgid "Info"
+msgstr "Informació"
+
+msgid "LPD enabled"
+msgstr "LPD habilitat"
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr "Miscel·lani"
+
+msgid "None"
+msgstr "Cap"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr "Desactivat"
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr "PEX habilitat"
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr "Preferit"
+
+msgid "Prefetch enabled"
+msgstr "Precarrega habilitada"
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr "Autenticació RPC requerida"
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr "RPC habilitat"
+
+msgid "RPC password"
+msgstr "Contrasenya RPC"
+
+msgid "RPC port"
+msgstr "Port RPC"
+
+msgid "RPC settings"
+msgstr "Ajusts RPC"
+
+msgid "RPC username"
+msgstr "Nom d'usuari RPC"
+
+msgid "RPC whitelist"
+msgstr "Llista blanca RPC"
+
+msgid "RPC whitelist enabled"
+msgstr "Llista blanca RPC habilitada"
+
+msgid "Ratio limit"
+msgstr "Límit de ràtio"
+
+msgid "Ratio limit enabled"
+msgstr "Límit de ràtio habilitat"
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr "Executa el dimoni com l'usuari"
+
+msgid "Scheduling"
+msgstr "Programació"
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"El dimoni Transmission és un client de bittorrent senzill, aquí podeu "
+"configurar els ajusts."
+
+msgid "Trash original torrent files"
+msgstr "Suprimeix els fitxers de torrent originals"
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr "Directori que vigilar"
+
+msgid "in minutes from midnight"
+msgstr "en minuts des de la mitjanit"
+
+msgid "preallocation"
+msgstr "preassignació"
+
+msgid "uTP enabled"
+msgstr "uTP habilitat"
diff --git a/trunk/package/luci/po/ca/upnp.po b/trunk/package/luci/po/ca/upnp.po
new file mode 100644
index 00000000..3176bb51
--- /dev/null
+++ b/trunk/package/luci/po/ca/upnp.po
@@ -0,0 +1,167 @@
+#  upnp.pot
+#  generated from ./applications/luci-upnp/luasrc/i18n/upnp.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-01 08:38+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Els ACL especifiquen quins ports externs es poden redirigir a quines adreces "
+"i ports interns"
+
+msgid "Action"
+msgstr "Acció"
+
+msgid "Active UPnP Redirects"
+msgstr "Redireccions UPnP actives"
+
+msgid "Advanced Settings"
+msgstr "Ajusts avançats"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Permet que s'afegeixin redireccions només a les adreces IP peticionant"
+
+msgid "Announced model number"
+msgstr "Número de model anunciat"
+
+msgid "Announced serial number"
+msgstr "Número de sèrie anunciat"
+
+msgid "Clean rules interval"
+msgstr "Interval de neteja de regles"
+
+msgid "Clean rules threshold"
+msgstr "Llindar de neteja de regles"
+
+msgid "Client Address"
+msgstr "Adreça de client"
+
+msgid "Client Port"
+msgstr "Port de client"
+
+msgid "Collecting data..."
+msgstr "Recollint dades..."
+
+msgid "Comment"
+msgstr "Comentari"
+
+msgid "Delete Redirect"
+msgstr "Suprimeix la redirecció"
+
+msgid "Device UUID"
+msgstr "UUID de dispositiu"
+
+msgid "Downlink"
+msgstr "Enllaç de baixada"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Habilita la funcionalitat NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Habilita la funcionalitat UPnP"
+
+msgid "Enable additional logging"
+msgstr "Habilita el registre addicional"
+
+msgid "Enable secure mode"
+msgstr "Habilita mode segur"
+
+msgid "External Port"
+msgstr "Port extern"
+
+msgid "External ports"
+msgstr "Ports externs"
+
+msgid "General Settings"
+msgstr "Ajusts generals"
+
+msgid "Internal addresses"
+msgstr "Adreces internes"
+
+msgid "Internal ports"
+msgstr "Ports interns"
+
+msgid "MiniUPnP ACLs"
+msgstr "ACLs de MiniUPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Ajusts de MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Interval de notificació"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Posa informació extra de depuració en el registre de sistema"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Reporta el temps actiu del sistema en lloc del del dimoni"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Inicia el servei UPnP i NAP-PMP"
+
+msgid "There are no active redirects."
+msgstr "No hi ha redireccions actives."
+
+msgid "UPNP"
+msgstr "UPNP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP permet als clients de la xarxa local configurar automàticament el "
+"router."
+
+msgid "UPnP lease file"
+msgstr "Fitxer d'arrendament UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Enllaç de pujada"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Valor en KByte/s, només per informació"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP permet als clients de la xarxa local configurar automàticament el "
+#~ "router."
+
+#~ msgid "enable"
+#~ msgstr "habilita"
+
+#~ msgid "Log output"
+#~ msgstr "Registra la sortida"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "Només s'hauria d'activar l'UPnP si és absolutament necessari, ja que en "
+#~ "poden resultar alts riscos de seguretat a la teva xarxa."
diff --git a/trunk/package/luci/po/ca/ushare.po b/trunk/package/luci/po/ca/ushare.po
new file mode 100644
index 00000000..9d645969
--- /dev/null
+++ b/trunk/package/luci/po/ca/ushare.po
@@ -0,0 +1,55 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-01 08:29+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Directoris de contingut"
+
+msgid "Disable telnet console"
+msgstr "Inhabilita la consola telnet"
+
+msgid "Disable webinterface"
+msgstr "Inhabilita la interfície web"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid "Options"
+msgstr "Opcions"
+
+msgid "Servername"
+msgstr "Nom de servidor"
+
+msgid "Settings"
+msgstr "Configuració"
+
+msgid "Username"
+msgstr "Nom d'usuari"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"El uShare és un servidor de mitjans UPnP (TM) A/V i DLNA. Implementa el "
+"component servidor que proveeix els dispositius de mitjans UPnP amb "
+"informació sobre els fitxers de multimèdia disponibles."
diff --git a/trunk/package/luci/po/ca/uvc_streamer.po b/trunk/package/luci/po/ca/uvc_streamer.po
new file mode 100644
index 00000000..8ae7b146
--- /dev/null
+++ b/trunk/package/luci/po/ca/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-01 03:54+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Trames al segon"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Resolució"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Ajusts"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Transmissió de càmera web"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configureu la teva càmera compatible amb Linux-UVC. Dirigiu el vostre "
+"navegador a, per exemple, <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/ca/vnstat.po b/trunk/package/luci/po/ca/vnstat.po
new file mode 100644
index 00000000..536228ee
--- /dev/null
+++ b/trunk/package/luci/po/ca/vnstat.po
@@ -0,0 +1,65 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-09 07:13+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: German\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configuration"
+msgstr "Configuració"
+
+msgid "Daily traffic"
+msgstr "Trànsit diari"
+
+msgid "Graphs"
+msgstr "Gràfics"
+
+msgid "Hourly traffic"
+msgstr "Trànsit per hora"
+
+msgid "Monitor selected interfaces"
+msgstr "Vigila les interfícies seleccionades"
+
+msgid "Monthly traffic"
+msgstr "Trànsit mensual"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Encara no s'ha configurat cap base de dades. Aneu a la configuració del "
+"VnStat i habilita la vigila de una o més interfícies."
+
+msgid "Restart VnStat"
+msgstr "Reinicia el VnStat"
+
+msgid "Summary display"
+msgstr "Mostra de resum"
+
+msgid "Top 10 display"
+msgstr "Mostra dels 10 principals"
+
+msgid "Update »"
+msgstr "Actualitza »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Gràfics de VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Monitor de trànsit VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"El VnStat és un monitor de trànsit de xarxa pel Linux que manté un registre "
+"del trànsit de xarxa de les interfícies seleccionades."
diff --git a/trunk/package/luci/po/ca/voice_core.po b/trunk/package/luci/po/ca/voice_core.po
new file mode 100644
index 00000000..06862096
--- /dev/null
+++ b/trunk/package/luci/po/ca/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-29 01:58+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telèfons"
+
+msgid "Voice"
+msgstr "Veu"
diff --git a/trunk/package/luci/po/ca/voice_diag.po b/trunk/package/luci/po/ca/voice_diag.po
new file mode 100644
index 00000000..0396100a
--- /dev/null
+++ b/trunk/package/luci/po/ca/voice_diag.po
@@ -0,0 +1,30 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-29 02:00+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Diagnostics"
+msgstr "Diagnòstics"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Els diagnòstics disponibles en el vostre dispositiu depenen dels mòduls que "
+"teniu instal·lats."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"En aquest menú estan opcions que us permeten configurar i realitzar proves "
+"en les operacions de veu del vostre sistema. Aquestes es coneixen com "
+"diagnòstics."
diff --git a/trunk/package/luci/po/ca/watchcat.po b/trunk/package/luci/po/ca/watchcat.po
new file mode 100644
index 00000000..36e64054
--- /dev/null
+++ b/trunk/package/luci/po/ca/watchcat.po
@@ -0,0 +1,71 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-01 05:59+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "Retard de reinici forçat"
+
+msgid "Host address to ping"
+msgstr "Adreça de host per al ping"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Quan sovint que es comprova la connexió a Internet. La unitat per defecte es "
+"el segon, podeu utilitzar el sufix 'm' per minuts, 'h' per hores o 'd' per "
+"dies."
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"En mode periòdic, defineix el període de reinici. En mode de Internet, "
+"defineix el període més llarg sense accés al Internet abans que un reinici "
+"es comença. La unitat per defecte es el segon, podeu podeu utilitzar el "
+"sufix 'm' per minuts, 'h' per hores o 'd' per dies."
+
+msgid "Operating mode"
+msgstr "Mode d'operació"
+
+msgid "Period"
+msgstr "Període"
+
+msgid "Ping host"
+msgstr "Host de ping"
+
+msgid "Ping period"
+msgstr "Període de ping"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"El Watchcat permet la configuració d'un reinici periòdic o un reinici quan "
+"la connexió d'Internet ha estat perdut fa un cert període de temps."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"Al reiniciar el sistema, el Watchcat causarà un reinici suau. Introduïu un "
+"valor diferent de zero causarà un reinici dur retardat si el reinici suau "
+"falla. Introduïu un nombre de segons per a habilitar, utilitzeu 0 per a "
+"inhabilitar."
diff --git a/trunk/package/luci/po/ca/wol.po b/trunk/package/luci/po/ca/wol.po
new file mode 100644
index 00000000..42f7cf75
--- /dev/null
+++ b/trunk/package/luci/po/ca/wol.po
@@ -0,0 +1,58 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2014-07-01 06:15+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Difon en totes les interfícies"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+"Trieu el host per a despertar o introduïu una adreça MAC personalitzada per "
+"a utilitzar"
+
+msgid "Host to wake up"
+msgstr "Host per a despertar"
+
+msgid "Network interface to use"
+msgstr "Interfície de xarxa per a utilitzar"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"A vegades, només una de les dues eines funciona. Si un dels falla, prova la "
+"altra."
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Especifica la interfície en que s'envia el paquet WoL"
+
+msgid "Starting WoL utility:"
+msgstr "Iniciant la utilitat WoL:"
+
+msgid "Wake on LAN"
+msgstr "Despert en LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Despert en LAN és un mecanisme per a iniciar remotament ordinadors en la "
+"xarxa local."
+
+msgid "Wake up host"
+msgstr "Desperta al host"
+
+msgid "WoL program"
+msgstr "Programa WoL"
diff --git a/trunk/package/luci/po/ca/wshaper.po b/trunk/package/luci/po/ca/wshaper.po
new file mode 100644
index 00000000..25603833
--- /dev/null
+++ b/trunk/package/luci/po/ca/wshaper.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-01 22:51+0200\n"
+"PO-Revision-Date: 2014-07-01 03:51+0200\n"
+"Last-Translator: Alex <alexhenrie24@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr "Enllaç descendent"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Amplada de banda descendent en kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Host o xarxa en notació CIDR."
+
+msgid "Interface"
+msgstr "Interfície"
+
+msgid "Low priority destination ports"
+msgstr "Ports de destí de baixa prioritat"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Hosts de baixa prioritat (destí)"
+
+msgid "Low priority hosts (Source)"
+msgstr "Hosts de baixa prioritat (origen)"
+
+msgid "Low priority source ports"
+msgstr "Ports d'origen de baixa prioritat"
+
+msgid "Uplink"
+msgstr "Enllaç ascendent"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Amplada de banda ascendent en kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Ajusts del Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershapter afaiçona el trànsit per assegurar latències baixes per a "
+"trànsit interactiu encara que la vostra connexió de Internet estigui "
+"altament saturada."
diff --git a/trunk/package/luci/po/cs/ahcp.po b/trunk/package/luci/po/cs/ahcp.po
new file mode 100644
index 00000000..0a9e0afa
--- /dev/null
+++ b/trunk/package/luci/po/cs/ahcp.po
@@ -0,0 +1,114 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-23 23:01+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "AHCP Server"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP je autokonfigurační protokol pro IPv6 a dual-stack IPv6/IPv4 sítě, "
+"vytvořený pro použití vedle funkcí router discovery (Vyhledávání směrovačů "
+"pomocí ICMP zpráv) a DHCP na sítích kde je obtížné či nemožné nakonfigurovat "
+"server v každé vrstvě broadcast domény, například mobilní ad-hoc sítě."
+
+msgid "Active AHCP Leases"
+msgstr "Aktivní AHCP zapůjčení"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Age"
+msgstr "Stáří"
+
+msgid "Announced DNS servers"
+msgstr "Oznámené DNS servery"
+
+msgid "Announced NTP servers"
+msgstr "Oznámené NTP servery"
+
+msgid "Announced prefixes"
+msgstr "Oznámené předčíslí"
+
+msgid "Collecting data..."
+msgstr "Probíhá shromažďování dat..."
+
+msgid "Forwarder"
+msgstr "Přesměrování"
+
+msgid "General Setup"
+msgstr "Obecné nastavení"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 a IPv6"
+
+msgid "IPv4 only"
+msgstr "pouze IPv4"
+
+msgid "IPv6 only"
+msgstr "Pouze IPv6"
+
+msgid "Lease directory"
+msgstr "Zapůjčené adresáře"
+
+msgid "Lease validity time"
+msgstr "Doba platnosti zapujčení"
+
+msgid "Log file"
+msgstr "Soubor protokolu"
+
+msgid "Multicast address"
+msgstr "Vícesměrové adresy"
+
+msgid "Operation mode"
+msgstr "Pracovní režim"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Rodina protokolů"
+
+msgid "Served interfaces"
+msgstr "Obsluhované rozhraní"
+
+msgid "Server"
+msgstr "Servr"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Specifikuje ohlášené IPv4 a IPv6 NTP servery"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Specifikuje ohlášené IPv4 a IPv6 názvové servery"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Specifikuje ohlášené IPv4 a IPv6 sítě předpony v CIDR notaci"
+
+msgid "The AHCP Service is not running."
+msgstr "Služba AHCP neběží"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Služba AHCP je spuštěna s ID %s."
+
+msgid "There are no active leases."
+msgstr "Neexistují žádná aktivní pronajmutí."
+
+msgid "Unique ID file"
+msgstr "Jedinečný ID soubor"
diff --git a/trunk/package/luci/po/cs/asterisk.po b/trunk/package/luci/po/cs/asterisk.po
new file mode 100644
index 00000000..7341d57c
--- /dev/null
+++ b/trunk/package/luci/po/cs/asterisk.po
@@ -0,0 +1,11 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
diff --git a/trunk/package/luci/po/cs/base.po b/trunk/package/luci/po/cs/base.po
new file mode 100644
index 00000000..4640493b
--- /dev/null
+++ b/trunk/package/luci/po/cs/base.po
@@ -0,0 +1,3204 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-31 13:59+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d minutové okno, %d sekundový interval)"
+
+msgid "(%s available)"
+msgstr "(%s k dispozici)"
+
+msgid "(empty)"
+msgstr "(prázdný)"
+
+msgid "(no interfaces attached)"
+msgstr "(bez rozhraní připojení)"
+
+msgid "-- Additional Field --"
+msgstr "-- Doplňující pole --"
+
+msgid "-- Please choose --"
+msgstr "-- Prosím vyberte --"
+
+msgid "-- custom --"
+msgstr "-- vlastní --"
+
+msgid "1 Minute Load:"
+msgstr "Zatížení za 1 minutu:"
+
+msgid "15 Minute Load:"
+msgstr "Zatížení za 15 minut:"
+
+msgid "5 Minute Load:"
+msgstr "Zatížení za 5 minut:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "port dotazů <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "port serveru <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servery budou dotazovány podle "
+"pořadí resolvfile"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protokol Verze 4\">IPv4</abbr>-Adresa"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Verze 4\">IPv4</abbr>-Brána"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protokol Verze 4\">IPv4</abbr>-Maska sítě"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protokol Verze 6\">IPv6</abbr>-Adresa nebo Síť (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protokol Verze 6\">IPv6</abbr>-Brána"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurace"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Název"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Adresa"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"Nejvyšší počet <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> výpůjček"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"Největší povolená velikost <abbr title=\"Extension Mechanisms for Domain "
+"Name System\">EDNS0</abbr> packetů"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "Nejvyšší počet souběžných dotazů"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Podpora AR"
+
+msgid "ARP retry threshold"
+msgstr "ARP limit opakování"
+
+msgid "ATM Bridges"
+msgstr "ATM mosty"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Identifikátor virtuálního kanálu ATM (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Identifikátor virtuální cesty ATM (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Otevře ATM mosty přes uzavřené ethernetové rozhraní v AAL5 připojení jako "
+"virtuální síťová rozhraní Linuxu, které mohou být použity ve spojení s DHCP "
+"nebo PPP vytáčeného připojení od poskytovatele sítě."
+
+msgid "ATM device number"
+msgstr "číslo ATM zařízení"
+
+msgid "Access Concentrator"
+msgstr "Přístupový koncentrátor"
+
+msgid "Access Point"
+msgstr "Přístupový bod"
+
+msgid "Action"
+msgstr "Akce"
+
+msgid "Actions"
+msgstr "Akce"
+
+msgid "Activate this network"
+msgstr "Aktivovat tuto síť"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Aktivní záznamy ve směrovací tabulce <abbr title=\"Internet Protocol Version "
+"4\">IPv4</abbr>"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Aktivní záznamy ve směrovací tabulce <abbr title=\"Internet Protocol Version "
+"6\">IPv6</abbr>"
+
+msgid "Active Connections"
+msgstr "Aktivní spojení"
+
+msgid "Active DHCP Leases"
+msgstr "Aktivní propůjčené DHCP adresy (leases)"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Aktivní propůjčené DHCPv6 adresy (leases)"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Přidat lokální koncovku k doménovým jménům ze souboru hosts"
+
+msgid "Add new interface..."
+msgstr "Přidat rozhraní..."
+
+msgid "Additional Hosts files"
+msgstr "Dodatečné Hosts soubory"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "Address to access local relay bridge"
+msgstr "Adresa pro přístup k místnímu relay bridge"
+
+msgid "Administration"
+msgstr "Správa"
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Alert"
+msgstr "Upozornění"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "Povolit <abbr title=\"Secure Shell\">SSH</abbr> autentizaci heslem"
+
+msgid "Allow all except listed"
+msgstr "Povolit vše mimo uvedené"
+
+msgid "Allow listed only"
+msgstr "Povolit pouze uvedené"
+
+msgid "Allow localhost"
+msgstr "Povolit localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Povolit vzdáleným hostitelům připojování k místním portům přesměrovaným "
+"pomocí SSH"
+
+msgid "Allow root logins with password"
+msgstr "Povolit přihlašovaní root účtu pomocí hesla"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Povolit <em>root</em> účtu přihlášení bez nastaveného hesla"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr "Povolit upstream odpovědi na 127.0.0.0/8 rozsah, např. pro RBL služby"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Vždy použije kanál 40 MHz , i když překrývá sekundární kanál . Tato volba "
+"není v souladu s IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Pokud není zaškrtnuto, bude vytvořena dodatečná síť."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Anténa 1"
+
+msgid "Antenna 2"
+msgstr "Anténa 2"
+
+msgid "Antenna Configuration"
+msgstr "Konfigurace antén"
+
+msgid "Any zone"
+msgstr "Libovolná zóna"
+
+msgid "Apply"
+msgstr "Použít"
+
+msgid "Applying changes"
+msgstr "Probíhá uplatňování nastavení"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Přiřadit rozhraní..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Připojení klienti"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s bezdrátový ovladač"
+
+msgid "Authentication"
+msgstr "Autentizace"
+
+msgid "Authoritative"
+msgstr "Autoritativní"
+
+msgid "Authorization Required"
+msgstr "Vyžadována autorizace"
+
+msgid "Auto Refresh"
+msgstr "Automaticky obnovovat"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Dostupné"
+
+msgid "Available packages"
+msgstr "Dostupné balíčky"
+
+msgid "Average:"
+msgstr "Průměr:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Zpět"
+
+msgid "Back to Overview"
+msgstr "Zpět k přehledu"
+
+msgid "Back to configuration"
+msgstr "Zpět ke konfiguraci"
+
+msgid "Back to overview"
+msgstr "Zpět k přehledu"
+
+msgid "Back to scan results"
+msgstr "Zpět k výsledkům vyhledávání"
+
+msgid "Background Scan"
+msgstr "Vyhledávat na pozadí"
+
+msgid "Backup / Flash Firmware"
+msgstr "Zálohovat / nahrát firmware"
+
+msgid "Backup / Restore"
+msgstr "Zálohovat / obnovit"
+
+msgid "Backup file list"
+msgstr "Seznam souborů k zálohování"
+
+msgid "Bad address specified!"
+msgstr "Zadána neplatná adresa!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Seznam souborů k zálohování lze nalézt níže. Sestává se z konfiguračních "
+"souborů označených opkg, nezbyných systémových souborů a souborů "
+"vyhovujících uživatelem určeným vzorům."
+
+msgid "Bitrate"
+msgstr "Přenosová rychlost"
+
+msgid "Bogus NX Domain Override"
+msgstr "Přepíše falešnou hodnotu NX Domény"
+
+msgid "Bridge"
+msgstr "Síťový most"
+
+msgid "Bridge interfaces"
+msgstr "Síťové mosty"
+
+msgid "Bridge unit number"
+msgstr "Číslo síťového mostu"
+
+msgid "Bring up on boot"
+msgstr "Zapnout po startu"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s bezdrátový ovladač"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom modul BCM%04x 802.11 bezdrátový ovladač"
+
+msgid "Buffered"
+msgstr "Bufferováno"
+
+msgid "Buttons"
+msgstr "Tlačítka"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Vytížení CPU (%)"
+
+msgid "Cached"
+msgstr "V cache"
+
+msgid "Cancel"
+msgstr "Storno"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Řetěz"
+
+msgid "Changes"
+msgstr "Změny"
+
+msgid "Changes applied."
+msgstr "Změny aplikovány."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Změní administrátorské heslo pro přístup k zařízení"
+
+msgid "Channel"
+msgstr "Kanál"
+
+msgid "Check"
+msgstr "Kontrola"
+
+msgid "Checksum"
+msgstr "Kontrolní součet"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Zóna firewallu přiřazená k tomuto rozhraní. Pro odstranění rozhraní z "
+"přiřazené zóny vyberte volbu <em>nespecifikovaná</em>. Pro vytvoření nové "
+"zóny a její následné přiřazení danému rozhraní vyplňte pole <em>vytvořit</"
+"em>."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Vyberte síť(ě), které chcete připojit k tomuto bezdrátovému rozhraní, nebo "
+"vyplňte pole <em>vytvořit</em> a pojmenujte novou síť."
+
+msgid "Cipher"
+msgstr "Å ifra"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Pro stažení archivu tar s aktuální konfigurací stiskněte \"Vytvořit archiv"
+"\". Pro obnovení továrního nastavení stiskněte \"Obnovit výchozí\" (možné "
+"pouze s obrazy squashfs)."
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Klientské ID odesílané v DHCP požadavku"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Uzavírat neaktivní spojení po daném počtu sekund. Pro vypnutí časového "
+"omezení použijte jako hodntu nulu"
+
+msgid "Close list..."
+msgstr "Zavřít seznam..."
+
+msgid "Collecting data..."
+msgstr "Probíhá sběr dat..."
+
+msgid "Command"
+msgstr "Příkaz"
+
+msgid "Common Configuration"
+msgstr "Společná nastavení"
+
+msgid "Compression"
+msgstr "Komprese"
+
+msgid "Configuration"
+msgstr "Nastavení"
+
+msgid "Configuration applied."
+msgstr "Nastavení uplatněno."
+
+msgid "Configuration files will be kept."
+msgstr "Konfigurační soubory budou zachovány."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr "Použít tento přípojný bod jako překryvné úložiště pro block-extroot"
+
+msgid "Confirmation"
+msgstr "Ověření"
+
+msgid "Connect"
+msgstr "Připojit"
+
+msgid "Connected"
+msgstr "Připojeno"
+
+msgid "Connection Limit"
+msgstr "Omezení počtu připojení"
+
+msgid "Connections"
+msgstr "Připojení"
+
+msgid "Country"
+msgstr "Země"
+
+msgid "Country Code"
+msgstr "Kód země"
+
+msgid "Cover the following interface"
+msgstr "Pokrýt následující rozhraní"
+
+msgid "Cover the following interfaces"
+msgstr "Pokrýt následující rozhraní"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Vytvořit / přiřadit zónu firewallu"
+
+msgid "Create Interface"
+msgstr "Vytvořit rozhraní"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Vytvořit síťový most přes více rozhraní"
+
+msgid "Critical"
+msgstr "Kritické"
+
+msgid "Cron Log Level"
+msgstr "Úroveň protokolování Cronu"
+
+msgid "Custom Interface"
+msgstr "Vlastní rozhraní"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Upraví chování <abbr title=\"Light Emitting Diode\">LED</abbr> diod zařízení "
+"pokud je to možné."
+
+msgid "DHCP Leases"
+msgstr "DHCP výpůjčky"
+
+msgid "DHCP Server"
+msgstr "DHCP server"
+
+msgid "DHCP and DNS"
+msgstr "DHCP a DNS"
+
+msgid "DHCP client"
+msgstr "DHCP klient"
+
+msgid "DHCP-Options"
+msgstr "Volby DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "DHCPv6 přidělené IP"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Přeposílání DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Ladění"
+
+msgid "Default %d"
+msgstr "Výchozí %d"
+
+msgid "Default gateway"
+msgstr "Výchozí brána"
+
+msgid "Default state"
+msgstr "Výchozí stav"
+
+msgid "Define a name for this network."
+msgstr "Jméno sítě."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Další možnosti DHCP, například \"<code>6,192.168.2.1,192.168.2.2</code>\", "
+"které odkazuje na různé DNS servery pro klienty."
+
+msgid "Delete"
+msgstr "Odstranit"
+
+msgid "Delete this interface"
+msgstr "Odstranit toto rozhraní"
+
+msgid "Delete this network"
+msgstr "Odstranit tuto síť"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid "Design"
+msgstr "Vzhled"
+
+msgid "Destination"
+msgstr "Cíl"
+
+msgid "Device"
+msgstr "Zařízení"
+
+msgid "Device Configuration"
+msgstr "Nastavení zařízení"
+
+msgid "Diagnostics"
+msgstr "Diagnostika"
+
+msgid "Directory"
+msgstr "Adresář"
+
+msgid "Disable"
+msgstr "Zakázat"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Pro toto rozhraní zakázat <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>."
+
+msgid "Disable DNS setup"
+msgstr "Zakázat nastavení DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Zakázat HW-Beacon časovač"
+
+msgid "Disabled"
+msgstr "Zakázáno"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Vyřadit upstream RFC1918 odpovědi"
+
+msgid "Displaying only packages containing"
+msgstr "Zobrazeny pouze balíčky obsahující"
+
+msgid "Distance Optimization"
+msgstr "Optimalizace na vzdálenost"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Vzdálenost nejodlehlejšího člena sítě v metrech."
+
+msgid "Diversity"
+msgstr "Diverzita"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq je kombinace <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> serveru a <abbr title=\"Domain Name System\">DNS</abbr> "
+"forwarderu pro použití v <abbr title=\"Network Address Translation\">NAT</"
+"abbr> firewallech"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "Necachovat negativní odpovědi (např. pro neexistující domény)"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Nepřeposílat požadavky, které nemohou být zodpovězeny veřejnými jmennými "
+"servery"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Nepřeposílat reverzní dotazy na místní sítě"
+
+msgid "Do not send probe responses"
+msgstr "Neodpovídat na vyhledávání"
+
+msgid "Domain required"
+msgstr "Vyžadována doména"
+
+msgid "Domain whitelist"
+msgstr "Whitelist domén"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Nepřeposílat <abbr title=\"Domain Name System\">DNS</abbr> dotazy bez <abbr "
+"title=\"Domain Name System\">DNS</abbr> jména"
+
+msgid "Download and install package"
+msgstr "Stáhnout a nainstalovat balíček"
+
+msgid "Download backup"
+msgstr "Stáhnout zálohu"
+
+msgid "Dropbear Instance"
+msgstr "Instance Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear poskytuje <abbr title=\"Secure Shell\">SSH</abbr> přístup a <abbr "
+"title=\"Secure Copy\">SCP</abbr> server"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Dynamický <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "Dynamický tunel"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Pro klienty alokovat DHCP adresy dynamicky. Pokud je volba zakázána, budou "
+"obsloužení pouze klienti se statickými výpůjčkami."
+
+msgid "EAP-Method"
+msgstr "Metoda EAP"
+
+msgid "Edit"
+msgstr "Upravit"
+
+msgid "Edit this interface"
+msgstr "Upravit toto rozhraní"
+
+msgid "Edit this network"
+msgstr "Upravit tuto síť"
+
+msgid "Emergency"
+msgstr "Záchrana"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Povolit <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Povolit dynamickou aktualizaci koncového bodu HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Na PPP spoji povolit vyjednání IPv6"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Povolit průchod jumbo rámců"
+
+msgid "Enable NTP client"
+msgstr "Povolit NTP klienta"
+
+msgid "Enable TFTP server"
+msgstr "Povolit TFTP server"
+
+msgid "Enable VLAN functionality"
+msgstr "Povolit funkcionalitu VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Povolit ARP učení a stárnutí"
+
+msgid "Enable this mount"
+msgstr "Povolit tento přípojný bod"
+
+msgid "Enable this swap"
+msgstr "Povolit tento swapovací oddíl"
+
+msgid "Enable/Disable"
+msgstr "Povolit/Zakázat"
+
+msgid "Enabled"
+msgstr "Povoleno"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Na tomto síťovém mostě povolit Spanning Tree Protocol"
+
+msgid "Encapsulation mode"
+msgstr "Režim zapouzdření"
+
+msgid "Encryption"
+msgstr "Šifrování"
+
+msgid "Erasing..."
+msgstr "Odstraňování..."
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Ethernet Adapter"
+msgstr "Ethernetový adaptér"
+
+msgid "Ethernet Switch"
+msgstr "Ethernetový switch"
+
+msgid "Expand hosts"
+msgstr "Rozšířit hostitele"
+
+msgid "Expires"
+msgstr "Vyprší"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Čas vypršení vypůjčené adresy, minimum jsou 2 minuty (<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Externí protokolovací server"
+
+msgid "External system log server port"
+msgstr "Port externího protokolovacího serveru"
+
+msgid "Fast Frames"
+msgstr "Rychlé rámce"
+
+msgid "File"
+msgstr "Soubor"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Název souboru s bootovacím obrazem oznamovaný klientům"
+
+msgid "Filesystem"
+msgstr "Souborový systém"
+
+msgid "Filter"
+msgstr "Filtr"
+
+msgid "Filter private"
+msgstr "Filtrovat soukromé"
+
+msgid "Filter useless"
+msgstr "Filtrovat nepotřebné"
+
+msgid "Find and join network"
+msgstr "Vyhledat a připojit síť"
+
+msgid "Find package"
+msgstr "Vyhledat balíček"
+
+msgid "Finish"
+msgstr "Dokončit"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Nastavení firewallu"
+
+msgid "Firewall Status"
+msgstr "Stav firewallu"
+
+msgid "Firmware Version"
+msgstr "Verze firmwaru"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Pevný zdrojový port pro odchozí DNS dotazy"
+
+msgid "Flags"
+msgstr "Příznaky"
+
+msgid "Flash Firmware"
+msgstr "Nahrát firmware"
+
+msgid "Flash image..."
+msgstr "Nahrát obraz..."
+
+msgid "Flash new firmware image"
+msgstr "Nahrát nový obraz s firmwarem"
+
+msgid "Flash operations"
+msgstr "Operace nad flash pamětí"
+
+msgid "Flashing..."
+msgstr "Nahrávám..."
+
+msgid "Force"
+msgstr "Vynutit"
+
+msgid "Force 40MHz mode"
+msgstr "Vynutit 40MHz mód"
+
+msgid "Force CCMP (AES)"
+msgstr "Vynutit CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Na této síti vynutit DHCP i v případě detekování jiného serveru."
+
+msgid "Force TKIP"
+msgstr "Vynutit TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Vynutit TKIP a CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Přeposílat DHCP provoz"
+
+msgid "Forward broadcast traffic"
+msgstr "Přeposílat broadcasty"
+
+msgid "Forwarding mode"
+msgstr "Režim přeposílání"
+
+msgid "Fragmentation Threshold"
+msgstr "Hranice fragmentace"
+
+msgid "Frame Bursting"
+msgstr "Dávkování rámců"
+
+msgid "Free"
+msgstr "Volné"
+
+msgid "Free space"
+msgstr "Volné místo"
+
+msgid "Frequency Hopping"
+msgstr "Kmitočtové skákání"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Pouze GPRS"
+
+msgid "Gateway"
+msgstr "Brána"
+
+msgid "Gateway ports"
+msgstr "Porty brány"
+
+msgid "General Settings"
+msgstr "Obecná nastavení"
+
+msgid "General Setup"
+msgstr "Obecné nastavení"
+
+msgid "Generate archive"
+msgstr "Vytvorǐt archív"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Generic 802.11%s Wireless Controller"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "Heslo nezměněno z důvodu nesouhlasu nového hesla a ověření hesla!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Přejít na nastavení hesla..."
+
+msgid "Go to relevant configuration page"
+msgstr "Přejít na související konfigurační stránku"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Heslo HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Handler"
+
+msgid "Hang Up"
+msgstr "Zavěsit"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Nastavení základních vlastností zařízení jako je časová zóna nebo název "
+"zařízení."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Vložte veřejné klíče (na každý řadek jeden) pro ověřovaní SSH přístupu."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b bezdrátový ovladač"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Skrývat <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Záznamy hostitelů"
+
+msgid "Host expiry timeout"
+msgstr "Vypršení časového limitu hostitele"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"<abbr title=\"Internet Protocol Address\">IP</abbr> adresa hostitele nebo síť"
+
+msgid "Hostname"
+msgstr "Jméno hostitele"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Jméno hostitele odesílané s DHCP požadavky"
+
+msgid "Hostnames"
+msgstr "Jména hostitelů"
+
+msgid "IP address"
+msgstr "IP adresy"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4 firewall"
+
+msgid "IPv4 WAN Status"
+msgstr "Stav IPv4 WAN"
+
+msgid "IPv4 address"
+msgstr "IPv4 adresa"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 a IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 broadcast"
+
+msgid "IPv4 gateway"
+msgstr "IPv4 brána"
+
+msgid "IPv4 netmask"
+msgstr "IPv4 maska sítě"
+
+msgid "IPv4 only"
+msgstr "Pouze IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Délka IPv4 prefixu"
+
+msgid "IPv4-Address"
+msgstr "IPv4 adresa"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6 firewall"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Stav IPv6 WAN"
+
+msgid "IPv6 address"
+msgstr "IPv6 adresa"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6 brána"
+
+msgid "IPv6 only"
+msgstr "Pouze IPv6"
+
+msgid "IPv6 prefix"
+msgstr "IPv6 prefix"
+
+msgid "IPv6 prefix length"
+msgstr "Délka IPv6 prefixu"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6 adresa"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-in-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-over-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-over-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Identita"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr "Namísto pevného uzlu zařízení připojovat pomocí UUID"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr "Namísto pevného uzlu zařízení připojovat pomocí názvu oddílu"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Pokud není povoleno, není nastaven žádný výchozí směrovací záznam"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Pokud není povoleno, oznámené adresy DNS serverů budou ignorovány"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Pokud máte nedostatek fyzické paměti, nepoužívaná data mohou být dočasně "
+"odložena do odkládacího zařízení, což bude mít za důsledek větší množství "
+"použitelné  <abbr title=\"Random Access Memory\">RAM</abbr>. Vezměte na "
+"vědomí, že odkládání dat je velice pomalý proces, stejně jako fakt, že "
+"přístup na odkládací zařízení je řádově pomalejší, než přístup do paměti "
+"<abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ignorovat soubory Hosts"
+
+msgid "Ignore interface"
+msgstr "Ignorovat rozhraní"
+
+msgid "Ignore resolve file"
+msgstr "Ignorovat resolv soubor"
+
+msgid "Image"
+msgstr "Obraz"
+
+msgid "In"
+msgstr "Dovnitř"
+
+msgid "Inactivity timeout"
+msgstr "Časový limit nečinnosti"
+
+msgid "Inbound:"
+msgstr "Příchozí:"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Initscript"
+msgstr "Initskript"
+
+msgid "Initscripts"
+msgstr "Initskripty"
+
+msgid "Install"
+msgstr "Instalovat"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Instalovat balíček %q"
+
+msgid "Install protocol extensions..."
+msgstr "Instalovat protokolové rozšíření..."
+
+msgid "Installed packages"
+msgstr "Nainstalované balíčky"
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid "Interface Configuration"
+msgstr "Konfigurace rozhraní"
+
+msgid "Interface Overview"
+msgstr "Přehled rozhraní"
+
+msgid "Interface is reconnecting..."
+msgstr "Rozhraní se znovu připojuje..."
+
+msgid "Interface is shutting down..."
+msgstr "Rozhraní se vypíná..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Rozhraní není přítomné nebo je dosud nepřipojeno."
+
+msgid "Interface reconnected"
+msgstr "Rozhraní bylo znovu připojeno"
+
+msgid "Interface shut down"
+msgstr "Rozhraní bylo vypnuto"
+
+msgid "Interfaces"
+msgstr "Rozhraní"
+
+# Není co dodat.
+msgid "Internal Server Error"
+msgstr "Vnitřní chyba serveru"
+
+msgid "Invalid"
+msgstr "Neplatná vstupní hodnota"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+"Uvedené VLAN ID je neplatné! Jsou povolena pouze ID z rozsahu %d až %d."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "Uvedené VLAN ID je neplatné! Každé ID musí být jedinečné"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Špatné uživatelské jméno a/nebo heslo! Prosím zkuste to znovu."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Zdá se, že se pokoušíte zapsat obraz, který se nevejde do flash paměti. "
+"Prosím ověřte soubor s obrazem!"
+
+msgid "Java Script required!"
+msgstr "Vyžadován JavaScript!"
+
+msgid "Join Network"
+msgstr "Připojit k síti"
+
+msgid "Join Network: Settings"
+msgstr "Připojit k síti: nastavení"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Připojit k síti: Vyhledání bezdrátových sítí"
+
+msgid "Keep settings"
+msgstr "Zachovat nastavení"
+
+msgid "Kernel Log"
+msgstr "Záznam jádra"
+
+msgid "Kernel Version"
+msgstr "Verze jádra"
+
+msgid "Key"
+msgstr "Klíč"
+
+msgid "Key #%d"
+msgstr "Klíč #%d"
+
+msgid "Kill"
+msgstr "Zabít"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP Server"
+
+msgid "LCP echo failure threshold"
+msgstr "LCP echo prahová hodnota selhání"
+
+msgid "LCP echo interval"
+msgstr "LCP interval upozornění"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Popis"
+
+msgid "Language"
+msgstr "Jazyk"
+
+msgid "Language and Style"
+msgstr "Jazyk a styl"
+
+msgid "Lease validity time"
+msgstr "Doba platnosti zápůjčky"
+
+msgid "Leasefile"
+msgstr "Soubor zájpůjček"
+
+msgid "Leasetime"
+msgstr "Doba trvání zápůjčky"
+
+msgid "Leasetime remaining"
+msgstr "Zbývající doba trvání zápůjčky"
+
+msgid "Leave empty to autodetect"
+msgstr "Ponechte prázdné pro automatickou detekci"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Ponecháte-li prázdné, použije stávající WAN adresu"
+
+msgid "Legend:"
+msgstr "Legenda:"
+
+msgid "Limit"
+msgstr "Limit"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Odkaz na"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Seznam <abbr title=\"Domain Name System\">DNS</abbr> serverů, na které "
+"přeposílat požadavky"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Seznam domén, pro které povolit odpovědi podle RFC1918"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Seznam hostitelů, kteří udávají falešné hodnoty NX domén"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Poslouchat pouze na daném rozhraní, nebo pokud není specifikováno, na všech"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Port pro příchozí dotazy DNS"
+
+msgid "Load"
+msgstr "Zátěž"
+
+msgid "Load Average"
+msgstr "Zátěž průměrná"
+
+msgid "Loading"
+msgstr "Načítání"
+
+msgid "Local IPv4 address"
+msgstr "Místní IPv4 adresa"
+
+msgid "Local IPv6 address"
+msgstr "Místní IPv6 adresa"
+
+msgid "Local Startup"
+msgstr "Místní startup"
+
+msgid "Local Time"
+msgstr "Místní čas"
+
+msgid "Local domain"
+msgstr "Místní doména"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Specifikace místní domény. Jména shodná s touto doménou nikdy nebudou "
+"přesměrována ani rozlušťována pomocí DHCP nebo souborů hosts"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Přípona místní domény, připojená za názvy DHCP jmen a záznamů v souboru hosts"
+
+msgid "Local server"
+msgstr "Místní server"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Lokalizovat jméno v závislosti na dotazující se podsíti, pokud bylo nalezeno "
+"více IP adres"
+
+msgid "Localise queries"
+msgstr "Lokalizační dotazy"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Uzamknout kanál %d používaný %s"
+
+msgid "Log output level"
+msgstr "Úroveň logování"
+
+msgid "Log queries"
+msgstr "Dotazy pro logování"
+
+msgid "Logging"
+msgstr "Logování"
+
+msgid "Login"
+msgstr "Přihlásit"
+
+msgid "Logout"
+msgstr "Odhlásit"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "Nejnižší zapůjčenou adresu použít jako offset síťové adresy."
+
+msgid "MAC-Address"
+msgstr "MAC-Adresa"
+
+msgid "MAC-Address Filter"
+msgstr "Filtr MAC adres"
+
+msgid "MAC-Filter"
+msgstr "Filtr MAC"
+
+msgid "MAC-List"
+msgstr "Seznam Mac"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Nejvyšší míra"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Nejvyšší povolené množství aktivních DHCP zápůjček"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Nejvyšší povolené množství souběžných DNS dotazů"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Nejvyšší povolená velikost EDNS.0 UDP paketů"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Nejvyšší počet sekund čekání, než bude modem připraven"
+
+msgid "Maximum hold time"
+msgstr "Maximální doba držení"
+
+msgid "Maximum number of leased addresses."
+msgstr "Maximální počet zapůjčených adres."
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Paměť"
+
+msgid "Memory usage (%)"
+msgstr "Využití paměti (%)"
+
+msgid "Metric"
+msgstr "Metrika"
+
+msgid "Minimum Rate"
+msgstr "Nejnižší hodnota"
+
+msgid "Minimum hold time"
+msgstr "Minimální čas zápůjčky"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Chybějící rozšíření protokolu %q"
+
+msgid "Mode"
+msgstr "Mód"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Modemové zařízení"
+
+msgid "Modem init timeout"
+msgstr "Časový limit inicializace modemu"
+
+msgid "Monitor"
+msgstr "Sledování"
+
+msgid "Mount Entry"
+msgstr "Připojit vstup"
+
+msgid "Mount Point"
+msgstr "Přípojný bod"
+
+msgid "Mount Points"
+msgstr "Přípojné body"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Přípojné body - vstupy"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Přípojné body - změna vstupu"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Přípojný bod určuje místo v souborovém systému, na kterém bude připojeno "
+"paměťové zařízení"
+
+msgid "Mount options"
+msgstr "Volby připojení"
+
+msgid "Mount point"
+msgstr "Přípojný bod"
+
+msgid "Mounted file systems"
+msgstr "Připojené souborové systémy"
+
+msgid "Move down"
+msgstr "Přesunout dolů"
+
+msgid "Move up"
+msgstr "Přesunout nahoru"
+
+msgid "Multicast Rate"
+msgstr "Hodnota vícesměrového vysílání"
+
+msgid "Multicast address"
+msgstr "Adresa vícesměrového vysílání"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Kandidáti NTP serveru"
+
+msgid "Name"
+msgstr "Název"
+
+msgid "Name of the new interface"
+msgstr "Název nového rozhraní"
+
+msgid "Name of the new network"
+msgstr "Název nové sítě"
+
+msgid "Navigation"
+msgstr "Navigace"
+
+msgid "Netmask"
+msgstr "Síťová maska"
+
+msgid "Network"
+msgstr "Síť"
+
+msgid "Network Utilities"
+msgstr "Síťové nástroje"
+
+msgid "Network boot image"
+msgstr "Síťový bootovací obraz"
+
+msgid "Network without interfaces."
+msgstr "Síť bez rozhraní."
+
+msgid "Next »"
+msgstr "Další »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Pro toto rozhraní není nastaven žádný DHCP server"
+
+msgid "No chains in this table"
+msgstr "Žádné řetězce v této tabulce"
+
+msgid "No files found"
+msgstr "Nebyly nalezeny žádné soubory"
+
+msgid "No information available"
+msgstr "Údaje nejsou k dispozici"
+
+msgid "No negative cache"
+msgstr "Žádná negativní mezipaměť"
+
+msgid "No network configured on this device"
+msgstr "Síť není nastavena na tomto zařízení"
+
+msgid "No network name specified"
+msgstr "Neuvedeno jméno sítě"
+
+msgid "No package lists available"
+msgstr "Seznam balíčků není k dispozici"
+
+msgid "No password set!"
+msgstr "Žádné heslo!"
+
+msgid "No rules in this chain"
+msgstr "Žádná pravidla v tomto řetězci"
+
+msgid "No zone assigned"
+msgstr "Žádná zóna nepřiřazena"
+
+msgid "Noise"
+msgstr "Å um"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Å um:"
+
+msgid "None"
+msgstr "Žádný"
+
+msgid "Normal"
+msgstr "Normální"
+
+msgid "Not Found"
+msgstr "Nenalezeno"
+
+msgid "Not associated"
+msgstr "Neasociováno"
+
+msgid "Not connected"
+msgstr "Nepřipojeno"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Pozn: Konfigurační soubory budou vymazány."
+
+msgid "Notice"
+msgstr "Oznámení"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Konfigurace balíčků OPKG"
+
+msgid "Off-State Delay"
+msgstr "Vypnutí prodlevy"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Na této stránce můžete nastavit síťová rozhraní. Můžete přemostit několik "
+"rozhraní zaškrtnutím pole \"přemostit rozhraní\" a zápisem názvů rozhraní, "
+"vzájemně oddělených mezerami. Také můžete použít <abbr title=\"Virtual Local "
+"Area Network\">VLAN</abbr> zápis <samp>INTERFACE.VLANNR</samp> (<abbr title="
+"\"například\">např.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Zapnutí prodlevy"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Jedno jméno nebo mac adresa, musí být zadáno!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Jedno nebo více polí obsahuje neplatné hodnoty!"
+
+msgid "One or more required fields have no value!"
+msgstr "Jedno nebo více požadovaných polí neobsahuje hodnotu!"
+
+msgid "Open list..."
+msgstr "Otevřít seznam..."
+
+msgid "Option changed"
+msgstr "Volba změněna"
+
+msgid "Option removed"
+msgstr "Volba odstraněna"
+
+msgid "Options"
+msgstr "Možnosti"
+
+msgid "Other:"
+msgstr "Ostatní:"
+
+msgid "Out"
+msgstr "Ven"
+
+msgid "Outbound:"
+msgstr "Odchozí:"
+
+msgid "Outdoor Channels"
+msgstr "Venkovní kanály"
+
+msgid "Override MAC address"
+msgstr "Přepsat MAC adresu"
+
+msgid "Override MTU"
+msgstr "Přepsat MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Přepsat bránu v DHCP odpovědích"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Přepsat síťovou masku, odesílanou klientům. Obvykle je spočítána podle "
+"subsítě, která je obsluhována."
+
+msgid "Override the table used for internal routes"
+msgstr "Přepsat tabulku, používanou pro vnitřní cesty"
+
+msgid "Overview"
+msgstr "Přehled"
+
+msgid "Owner"
+msgstr "Vlastník"
+
+msgid "PAP/CHAP password"
+msgstr "Heslo PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Uživatelské jméno PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Zapouzdření PPPoA"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Vyžadován balíček libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Seznamy balíčků jsou starší než 24 hodin"
+
+msgid "Package name"
+msgstr "Název balíčku"
+
+msgid "Packets"
+msgstr "Pakety"
+
+msgid "Part of zone %q"
+msgstr "Část zóny %q"
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid "Password authentication"
+msgstr "Autentizace heslem"
+
+msgid "Password of Private Key"
+msgstr "Heslo privátního klíče"
+
+msgid "Password successfully changed!"
+msgstr "Heslo bylo úspěšně změněno!"
+
+msgid "Path to CA-Certificate"
+msgstr "Cesta k certifikátu CA"
+
+msgid "Path to Client-Certificate"
+msgstr "Cesta k certifikátu klienta"
+
+msgid "Path to Private Key"
+msgstr "Cesta k privátnímu klíči"
+
+msgid "Path to executable which handles the button event"
+msgstr "Cesta ke spustitelnému souboru, který obsluhuje událost tlačítka"
+
+msgid "Peak:"
+msgstr "Špička:"
+
+msgid "Perform reboot"
+msgstr "Provést restart"
+
+msgid "Perform reset"
+msgstr "Provést reset"
+
+msgid "Phy Rate:"
+msgstr "Fyzická rychlost:"
+
+msgid "Physical Settings"
+msgstr "Fyzické nastavení"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "Paketů"
+
+msgid "Please enter your username and password."
+msgstr "Prosím vložte vaše uživatelské jméno a heslo."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Prosím počkejte: Provádím reboot..."
+
+msgid "Policy"
+msgstr "Politika"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Port %d je neoznačený ve více VLAN!"
+
+msgid "Port status:"
+msgstr "Stav portu:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Po takovém množství LCP echo selhání předpokládám, že peer je mrtvý. "
+"Použijte 0 pro ignorování chyb"
+
+msgid "Prevents client-to-client communication"
+msgstr "Zabraňuje komunikaci klient-klient"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b Wireless Controller"
+
+msgid "Proceed"
+msgstr "Pokračovat"
+
+msgid "Processes"
+msgstr "Procesy"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Protocol family"
+msgstr "Rodina protokolů"
+
+msgid "Protocol of the new interface"
+msgstr "Protokol nového rozhraní"
+
+msgid "Protocol support is not installed"
+msgstr "Podpora pro protokol není nainstalována"
+
+msgid "Provide NTP server"
+msgstr "Poskytování NTP serveru"
+
+msgid "Provide new network"
+msgstr "Poskytování nové sítě"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Kvalita"
+
+msgid "RTS/CTS Threshold"
+msgstr "Práh RTS/CTS"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "RX Rate"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "RaLink 802.11%s Wireless Controller"
+
+msgid "Radius-Accounting-Port"
+msgstr "Port pro Radius-Accounting"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Tajný klíč pro Radius-Accounting"
+
+msgid "Radius-Accounting-Server"
+msgstr "Server Radius-Accounting"
+
+msgid "Radius-Authentication-Port"
+msgstr "Výběr ověřování portů"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Tajný klíč pro Radius-Authentication"
+
+msgid "Radius-Authentication-Server"
+msgstr "Server Radius-Authentication"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Přečtěte si <code>/etc/ethers</code> ke konfiguraci <abbr title=\"Dynamic "
+"Host Configuration Protocol\">DHCP</abbr> Serveru"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Opravdu odstranit toto rozhraní? Odstranění nelze vrátit zpět!\n"
+"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím "
+"tohoto rozhraní."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Opravdu odstranit bezdrátovou síť? Odstranění nelze vrátit zpět!\n"
+"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím této "
+"sítě."
+
+msgid "Really reset all changes?"
+msgstr "Opravdu resetovat všechny změny?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Opravdu vypnout síť ?\n"
+"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím "
+"tohoto rozhraní."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Opravdu vypnout rozhraní \"%s\" ?\n"
+"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím "
+"tohoto rozhraní."
+
+msgid "Really switch protocol?"
+msgstr "Opravdu prohodit protokol?"
+
+msgid "Realtime Connections"
+msgstr "Připojení v reálném čase"
+
+msgid "Realtime Graphs"
+msgstr "Grafy v reálném čase"
+
+msgid "Realtime Load"
+msgstr "Zátěž v reálném čase"
+
+msgid "Realtime Traffic"
+msgstr "Provoz v reálném čase"
+
+msgid "Realtime Wireless"
+msgstr "Wireless v reálném čase"
+
+msgid "Rebind protection"
+msgstr "Opětovné nastavení ochrany"
+
+msgid "Reboot"
+msgstr "Reboot"
+
+msgid "Rebooting..."
+msgstr "Rebootuji..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Rebootuje operační systém vašeho zařízení"
+
+msgid "Receive"
+msgstr "Přijmout"
+
+msgid "Receiver Antenna"
+msgstr "Přijímací anténa"
+
+msgid "Reconnect this interface"
+msgstr "Přepojit toto rozhraní"
+
+msgid "Reconnecting interface"
+msgstr "Přepojuji rozhraní"
+
+msgid "References"
+msgstr "Reference"
+
+msgid "Regulatory Domain"
+msgstr "Doména regulátora"
+
+msgid "Relay"
+msgstr "Přenos"
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr "Přenášet mezi sítěmi"
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr "Vzdálená IPv4 adresa"
+
+msgid "Remove"
+msgstr "Odstranit"
+
+msgid "Repeat scan"
+msgstr "Opakovat skenování"
+
+msgid "Replace entry"
+msgstr "Nahradit vstup"
+
+msgid "Replace wireless configuration"
+msgstr "Nahradit bezdrátovou konfiguraci"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+# Charter je poskytovate
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Vyžadováno u některých ISP, např. Charter s DocSIS 3"
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Reset Counters"
+msgstr "Resetovat čítače"
+
+msgid "Reset to defaults"
+msgstr "Obnovit na výchozí"
+
+msgid "Resolv and Hosts Files"
+msgstr "Soubory Resolv a Hosts"
+
+msgid "Resolve file"
+msgstr "Soubor resolve"
+
+msgid "Restart"
+msgstr "Restart"
+
+msgid "Restart Firewall"
+msgstr "Restartovat firewall"
+
+msgid "Restore backup"
+msgstr "Obnovit zálohu"
+
+msgid "Reveal/hide password"
+msgstr "Odhalit/skrýt heslo"
+
+msgid "Revert"
+msgstr "Vrátit zpět"
+
+msgid "Root"
+msgstr "Root"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Kořenový adresář souborů, přístupných přes TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Heslo routeru"
+
+msgid "Routes"
+msgstr "Trasy"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Trasy určují, přes jaké rozhraní a bránu může být konkrétního hosta dosaženo."
+
+msgid "Rule #"
+msgstr "Pravidlo #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Spustit kontrolu souborového systému před připojením zařízení"
+
+msgid "Run filesystem check"
+msgstr "Spustit kontrolu souborového systému"
+
+msgid "SSH Access"
+msgstr "Přístup přes SSH"
+
+msgid "SSH-Keys"
+msgstr "SSH klíče"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Uložit"
+
+msgid "Save & Apply"
+msgstr "Uložit & použít"
+
+msgid "Save &#38; Apply"
+msgstr "Uložit &#38; použít"
+
+msgid "Scan"
+msgstr "Skenovat"
+
+msgid "Scheduled Tasks"
+msgstr "Naplánované úlohy"
+
+msgid "Section added"
+msgstr "Přidána sekce"
+
+msgid "Section removed"
+msgstr "Sekce odebrána"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Podrobnosti viz manuálová stránka příkazu \"mount\""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Odesílat LCP echo požadaveky každých x sekund, účinné pouze ve spojení s "
+"prahem selhání."
+
+msgid "Separate Clients"
+msgstr "Oddělovat klienty"
+
+msgid "Separate WDS"
+msgstr "Oddělovat WDS"
+
+msgid "Server Settings"
+msgstr "Nastavení serveru"
+
+msgid "Service Name"
+msgstr "Název služby"
+
+msgid "Service Type"
+msgstr "Typ služby"
+
+msgid "Services"
+msgstr "Služby"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Nastavit synchronizaci času"
+
+msgid "Setup DHCP Server"
+msgstr "Nastavit DHCP server"
+
+msgid "Show current backup file list"
+msgstr "Ukázat aktuální seznam záložních souborů"
+
+msgid "Shutdown this interface"
+msgstr "Shodit toho rozhraní"
+
+msgid "Shutdown this network"
+msgstr "Shodit tuto síť"
+
+msgid "Signal"
+msgstr "Signál"
+
+msgid "Signal:"
+msgstr "Signál:"
+
+msgid "Size"
+msgstr "Velikost"
+
+msgid "Skip"
+msgstr "Přeskočit"
+
+msgid "Skip to content"
+msgstr "Skočit na obsah"
+
+msgid "Skip to navigation"
+msgstr "Skočit na navigaci"
+
+msgid "Slot time"
+msgstr "Time sloty"
+
+msgid "Software"
+msgstr "Software"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Některá pole obsahují neplatné hodnoty, nelze uložit!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Omlouváme se, ale požadovaný objekt nebyl nalezen."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Omlouváme se, na serveru došlo k neočekávané vyjímce."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Omlouváme se, ale v tomto zařízení není přítomná podpora pro upgrade "
+"systému. Nový obraz firmwaru musí být zapsán ručně. Prosím, obraťte se na "
+"libreCMC wiki pro zařízení specifické instalační instrukce."
+
+msgid "Sort"
+msgstr "Seřadit"
+
+msgid "Source"
+msgstr "Zdroj"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Určuje port na kterém bude tato instance <em>Dropbearu</em> naslouchat"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Určuje množství neúspěšných ARP požadavků, po kterém je hostitel považován "
+"za mrtvého"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr "Určuje počet sekund, po kterém je hostitel považovám za mrtvého"
+
+msgid "Specify the secret encryption key here."
+msgstr "Zde nastavte soukromý šifrovací klíč."
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Start priority"
+msgstr "Priorita spouštění"
+
+msgid "Startup"
+msgstr "Po spuštění"
+
+msgid "Static IPv4 Routes"
+msgstr "Statické IPv4 trasy"
+
+msgid "Static IPv6 Routes"
+msgstr "Statické IPv6 trasy"
+
+msgid "Static Leases"
+msgstr "Statické zápůjčky"
+
+msgid "Static Routes"
+msgstr "Statické trasy"
+
+msgid "Static WDS"
+msgstr "Statický WDS"
+
+msgid "Static address"
+msgstr "Statická adresa"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Statické zápůjčky se používají pro přiřazení fixních IP adres a symbolických "
+"jmen DHCP klientům. Jsou také vyžadvány pro nedynamické konfigurace "
+"rozhraní, kde jsou povoleni pouze hosté s odpovídajícím nastavením."
+
+msgid "Status"
+msgstr "Stav"
+
+msgid "Stop"
+msgstr "Stop"
+
+msgid "Strict order"
+msgstr "Striktní výběr"
+
+msgid "Submit"
+msgstr "Odeslat"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Vstupní bod"
+
+msgid "Switch"
+msgstr "Směrovač"
+
+msgid "Switch %q"
+msgstr "Směrovač číslo %q"
+
+msgid "Switch %q (%s)"
+msgstr "Směrovač číslo %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Směrovací protokol"
+
+msgid "Sync with browser"
+msgstr "Synchronizovat s prohlížečem"
+
+msgid "Synchronizing..."
+msgstr "Synchronizuji..."
+
+msgid "System"
+msgstr "Systém"
+
+msgid "System Log"
+msgstr "Systémový log"
+
+msgid "System Properties"
+msgstr "Vlastnosti systému"
+
+msgid "System log buffer size"
+msgstr "Velikost bufferu systémového logu"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Nastavení TFTP"
+
+msgid "TFTP server root"
+msgstr "Kořenový adresář TFTP serveru"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "Rychlost TX"
+
+msgid "Table"
+msgstr ""
+
+msgid "Target"
+msgstr "Cíl"
+
+msgid "Terminate"
+msgstr "Ukončit"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"Sekce <em>Nastavení zařízení</em> pokrývá fyzické nastavení radiového "
+"hardwaru jako kanál, vysílací výkon nebo výběr antény, které je sdíleno mezi "
+"všemi bezdrátovými sítěmi (pokud hardware podporuje multi-SSID). Nastavení "
+"konkrétní sítě jako šifrování, operační mód jsou seskupeny v sekci "
+"<em>Nastavení rozhraní</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Balíček <em>libiwinfo-lua</em> není nainstalován. Tato komponenta musí být "
+"nainstalována, aby fungovalo nastavení bezdátové sítě!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr "IPv6 prefix přidělený poskytovatelm většinou končí  <code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Povolené znaky jsou: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> a "
+"<code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"Soubor zařízení paměti nebo oddílu (<abbr title=\"například\">např.</abbr> "
+"<code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Souborový systém, který byl použit pro formátování paměti (<abbr title="
+"\"například\">napři.</abbr> <samp><abbr title=\"Souborový systém\">ext3</"
+"abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Obraz flash byl nahrán. Prosím porovnejte níže uvedený checksum a velikost "
+"souboru s originálním souborem pro zajištění integrity dat.<br /> Kliknutím "
+"na \"Pokračovat\" spustíte proceduru flashování."
+
+msgid "The following changes have been committed"
+msgstr "Následující změny byly provedeny"
+
+msgid "The following changes have been reverted"
+msgstr "Následující změny byly vráceny"
+
+msgid "The following rules are currently active on this system."
+msgstr "Následující pravidla jsou v nyní na tomto systému aktivní."
+
+msgid "The given network name is not unique"
+msgstr "Zadané jméno sítě není jedinečné"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Tento hardware nepodporuje multi-SSID. Pokud budete pokračovat, existující "
+"konfigurace bude nahrazena."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr "Délka IPv4 prefixu v bitech, zbytek se používá v IPv6 adresách"
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Délka IPv6 prefixu v bitech"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Síťové porty tohoto zařízení mohou být kombinovány do několika <abbr title="
+"\"Virtualních místních sítí\">VLAN</abbr>ve kterých počítače mohou "
+"komunikovat přímo mezi sebou. <abbr title=\"Virtualní místní sítě \">VLAN</"
+"abbr>se často používají na oddělení různých siťových částí. Většinou je "
+"jeden port pro připojení k vyšší síti (Uplink) jako třeba internet a "
+"zbývající porty pro místní síť."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Vybraný protokol potřebuje mít přiřazeno zařízení"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"Systém maže konfigurační oddíl, po skončení procesu bude automaticky "
+"restartován."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Systém nyní nahrává firmware.<br /> NEVYPÍNEJTE ZAŘÍZENÍ!<br /> Počkejte "
+"několik minut než se pokusíte znovu připojit. V záležitosti na vašem "
+"nastavení, bude možná nutné obnovit adresu vašeho počítače, aby jste se "
+"mohli znovu připojit."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr "Nejsou žádné aktivní zápůjčky."
+
+msgid "There are no pending changes to apply!"
+msgstr "Nejsou zde žádné nevyřízené změny k aplikaci!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Nejsou zde žádné nevyřízené změny k navrácení!"
+
+msgid "There are no pending changes!"
+msgstr "Nejsou zde žádné nevyřízené změny!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Zatím zde není přiřazeno zařízení, prosím připojte nějaké v záložce "
+"\"Fyzické nastavení\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Na tomto routeru není nastaveno heslo. Prosím, nastavte heslo uživatele root "
+"tak, abyste ochránili webové rozhraní a mohli povolit SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Zde vidíte obsah souboru /etc/rc.local. Příkazy, které sem vložíte (před "
+"příkaz 'exit 0') budou spuštěny na konci bootovacího procesu."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Toto je jedný <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>v mistní síti"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Toto je systémový crontab, v němž můžete nastavit naplánované úlohy. "
+"Podrobnosti naleznete v crontab(5)."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"V tomto seznamu vidíte přehled aktuálně běžících systémových procesů a "
+"jejich stavy."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "Na této stránce si můžete nastavit vlastní události tlačítek"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Tato stránka zobrazuje přehled aktivních síťových spojení."
+
+msgid "This section contains no values yet"
+msgstr "Tato sekce zatím neobsahuje žádné hodnoty"
+
+msgid "Time Synchronization"
+msgstr "Synchronizace času"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Synchronizace času dosud není nakonfigurována."
+
+msgid "Timezone"
+msgstr "Časové pásmo"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Zde můžete nahrát dříve vygenerovaný záložní archiv, pokud chcete obnovit "
+"konfigurační soubory."
+
+msgid "Total Available"
+msgstr "Dostupná celkem"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "Provoz"
+
+msgid "Transfer"
+msgstr "Přenos"
+
+msgid "Transmission Rate"
+msgstr "Vysílací rychlost"
+
+msgid "Transmit"
+msgstr "Přenos"
+
+msgid "Transmit Power"
+msgstr "Vysílací výkon"
+
+msgid "Transmitter Antenna"
+msgstr "Anténa vysílače"
+
+msgid "Trigger"
+msgstr "Spouštění"
+
+msgid "Trigger Mode"
+msgstr "Trigger mód"
+
+msgid "Tunnel ID"
+msgstr "ID tunelu"
+
+msgid "Tunnel Interface"
+msgstr "Rozhraní tunelu"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Turbo mód"
+
+msgid "Tx-Power"
+msgstr "Tx-Power"
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Pouze UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB zařízení"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr "Neznámý"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Neznámá chyba, heslo nebylo změněno!"
+
+msgid "Unmanaged"
+msgstr "Nespravovaný"
+
+msgid "Unsaved Changes"
+msgstr "Neuložené změny"
+
+msgid "Unsupported protocol type."
+msgstr "Nepodporovaný typ protokolu."
+
+msgid "Update lists"
+msgstr "Aktualizovat seznamy"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Nahrát obraz pro upgrade systému, jímž bude přepsán běžící firmware. "
+"Zkontrolujte \"Keep settings\" za účelem udržení aktuální konfigurace "
+"(vyžaduje obraz libreCMC kompatabilního firmwaru)."
+
+msgid "Upload archive..."
+msgstr "Nahrát archiv..."
+
+msgid "Uploaded File"
+msgstr "Nahrát soubor"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Použít <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Použít DHCP bránu"
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Pomocí ISO/IEC 3166 alpha2 kódů zemí."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Použít MTU na rozhraní tunelu"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Použít TTL na rozhraní tunelu"
+
+msgid "Use as root filesystem"
+msgstr "Použít jako kořenový souborový systém"
+
+msgid "Use broadcast flag"
+msgstr "Použít příznak broadcastu"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Použít vlastní DNS servery"
+
+msgid "Use default gateway"
+msgstr "Použít výchozí bránu"
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr "Použít směrovací tabulku"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Použitím tlačítka <em>Přidat</em> přidáte novou zápůjčku (lease). <em>MAC "
+"adresa</em> identifikuje počítač, <em>IPv4 adresa</em> určuje, jaká pevná "
+"adresa bude použita. <em>Hostname</em> je přiřazeno jako symbolické jméno."
+
+msgid "Used"
+msgstr "Použit"
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Rozhraní VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANy na %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANy na %q (%s)"
+
+msgid "VPN Server"
+msgstr "VPN server"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr "Ověřit"
+
+msgid "Version"
+msgstr "Verze"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "WEP Open System"
+
+msgid "WEP Shared Key"
+msgstr "Sdílený klíč WEP"
+
+msgid "WEP passphrase"
+msgstr "WEP heslo"
+
+msgid "WMM Mode"
+msgstr "WMM mód"
+
+msgid "WPA passphrase"
+msgstr "WPA heslo"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"Šifrování WPA vyžaduje nainstalovaný wpa_supplicant (pro klientský režim) "
+"nebo hostapd (pro AP a ad-hoc režim)."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Čekání na realizaci změn..."
+
+msgid "Waiting for command to complete..."
+msgstr "Čekání na dokončení příkazu..."
+
+msgid "Warning"
+msgstr "Varování"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "Varování: Existují neuložené změny, které budou rebootem ztraceny!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Bezdrátová síť"
+
+msgid "Wireless Adapter"
+msgstr "Bezdrátový adaptér"
+
+msgid "Wireless Network"
+msgstr "Bezdrátová síť"
+
+msgid "Wireless Overview"
+msgstr "Přehled bezdrátových sití"
+
+msgid "Wireless Security"
+msgstr "Zabezpečení bezdrátové sítě"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Bezdrátová síť je vypnuta nebo nespojena"
+
+msgid "Wireless is restarting..."
+msgstr "Probíhá restartování bezdrátové sítě..."
+
+msgid "Wireless network is disabled"
+msgstr "Bezdrátová síť je zakázána"
+
+msgid "Wireless network is enabled"
+msgstr "Bezdrátová síť je povolena"
+
+msgid "Wireless restarted"
+msgstr "Bezdrátová síť restartována"
+
+msgid "Wireless shut down"
+msgstr "Bezdrátová síť vypnuta"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Zapisovat přijaté požadavky DNS do systemového logu"
+
+msgid "XR Support"
+msgstr "Podpora XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Zde můžete povolit nebo zakázat init skripty. Změny se projeví po restartu "
+"zařízení.<br /><strong>Varování: Pokud zakážete základní init skripty jako "
+"\"network\", vaše zařízení se může stát nepřístupným!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Aby LuCI fungoval správně, musíte mít v prohlížeči povolený Javascript."
+
+msgid "any"
+msgstr "libovolný"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "přemostěný"
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "vytvoří most přes vybraná rozhraní"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "zakázat"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "expirované"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"Soubor, ve kterém budou uloženy zadané <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr> výpůjčky (leases)"
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr "plný-duplex"
+
+msgid "half-duplex"
+msgstr "poloviční-duplex"
+
+msgid "help"
+msgstr "pomoc"
+
+msgid "hidden"
+msgstr "skrytý"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "pokud cílem je síť"
+
+msgid "input"
+msgstr "vstup"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "místní <abbr title=\"Domain Name System\">DNS</abbr> soubor"
+
+msgid "no"
+msgstr "ne"
+
+msgid "no link"
+msgstr "žádné spojení"
+
+msgid "none"
+msgstr "žádný"
+
+msgid "off"
+msgstr "off"
+
+msgid "on"
+msgstr "on"
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "směrované"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "označený"
+
+msgid "unknown"
+msgstr "neznámý"
+
+msgid "unlimited"
+msgstr "neomezený"
+
+msgid "unspecified"
+msgstr "nespecifikovaný"
+
+msgid "unspecified -or- create:"
+msgstr "nespecifikovaný -nebo- vytvořit:"
+
+msgid "untagged"
+msgstr "neoznačený"
+
+msgid "yes"
+msgstr "ano"
+
+msgid "« Back"
+msgstr "« Zpět"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "Uživatelské ID HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Toto je 32 bajtové uživatelské ID, zapsané v hex tvaru, ne přihlašovací "
+#~ "jméno"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz druhý kanál nad hlavním"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz druhý kanál pod hlavním"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Přijímat oznámení směrovačů"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Na síti oznamovat IPv6"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Oznamované ID sítě"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Hodnota musí ležet v intervalu 1 až 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Možnosti HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Režim HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Model routeru"
+
+#~ msgid "Router Name"
+#~ msgstr "Název routeru"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Posílat žádosti o informace o směrování"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr ""
+#~ "Určuje dobu za kterou interface požádá o prodloužení životnosti prefixu v "
+#~ "sekundách"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Určuje dobu životnosti prefixu v sekundách"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Použít preferovanou životnost"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Použít platnou životnost"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Čekám na router.."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Povolit zabudovaný NTP server"
+
+#~ msgid "Active Leases"
+#~ msgstr "Aktivní výpůjčky"
+
+#~ msgid "Open"
+#~ msgstr "Otevřít"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Přenosová rychlost"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Nastavení / Použít"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Nastavení / Změny"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Nastavení / Zrušit změny"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "MAC adresa"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Šifrováno\">Šifr.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scanování"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Síť přiřazená k tomuto bezdrátovému rozhraní. Pro nepřiřazování rozhraní "
+#~ "k žádné síti vyberte volbu \"<em>nespecifikovaná</em>\". Pro vytvoření "
+#~ "nové sítě vyplňte pole \"<em>vytvořit</em>\"."
+
+#~ msgid "Create Network"
+#~ msgstr "Vytvořit síť"
+
+#~ msgid "Networks"
+#~ msgstr "Sítě"
+
+#~ msgid "Power"
+#~ msgstr "Výkon"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Wifi sítě v místním prostředí"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-notace : "
+#~ "adresa/prefix"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr ""
+#~ "<abbr title=\"Internet Protokol Verze 4\">IPv4</abbr>-Všesměrové vysílání"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protokol Verze 6\">IPv6</abbr>-Adresa"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Nastavení IPv6"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Pozn: Pokud zde zvolíte rozhraní, které již je součástí jiné sítě, bude "
+#~ "přesunuto do této sítě."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Síťové porty na vašem routeru mohou být kombinovány do několika <abbr "
+#~ "title=\"Virtual Local Area Network\">VLAN</abbr>, ve kterých mohou "
+#~ "počítače navzájem komunikovat přímo. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr> jsou často používány za účelem oddělení různých "
+#~ "síťových segmentů. Často je zde jeden Uplink port, sloužící pro připojení "
+#~ "do větší sítě (třeba Internetu) a ostatní porty jsou využity pro místní "
+#~ "síť."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Povolit bufferování"
diff --git a/trunk/package/luci/po/cs/commands.po b/trunk/package/luci/po/cs/commands.po
new file mode 100644
index 00000000..64949bde
--- /dev/null
+++ b/trunk/package/luci/po/cs/commands.po
@@ -0,0 +1,96 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-04 19:01+0200\n"
+"Last-Translator: KubaCZ <kuba.turek@centrum.cz>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Krátky popis nastaveného příkazu"
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr "Povolit vykonání příkazu a stažení výstupu bez předchozí autentizace."
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Povolit uživateli poskytnout dodatečné argumenty příkazového řádku"
+
+msgid "Arguments:"
+msgstr "Argumenty:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Binární data nezobrazena, stáhněte si je."
+
+msgid "Code:"
+msgstr "Kód:"
+
+msgid "Collecting data..."
+msgstr "Sbírání dat..."
+
+msgid "Command"
+msgstr "Příkaz"
+
+msgid "Command failed"
+msgstr "Příkaz selhal"
+
+msgid "Command line to execute"
+msgstr "Příkazový řádek k vykonání"
+
+msgid "Command successful"
+msgstr "Příkaz úspěšný."
+
+msgid "Command:"
+msgstr "Příkaz:"
+
+msgid "Configure"
+msgstr "Konfigurovat"
+
+msgid "Custom Commands"
+msgstr "Vlastní příkazy"
+
+msgid "Custom arguments"
+msgstr "Vlastní parametry"
+
+msgid "Dashboard"
+msgstr "Řídicí panel"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid "Download"
+msgstr "Stáhnout"
+
+msgid "Failed to execute command!"
+msgstr "Chyba při zpracování příkazu!"
+
+msgid "Link"
+msgstr "Odkaz"
+
+msgid "Loading"
+msgstr "Nahrávám"
+
+msgid "Public access"
+msgstr "Veřejný přístup"
+
+msgid "Run"
+msgstr "Spustit"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Tato stránka umožňuje nastavit vlastní příkazy shellu, které lze snadno "
+"vyvolat z webového rozhraní."
+
+msgid "Waiting for command to complete..."
+msgstr "Čekejte na dokončení příkazu..."
diff --git a/trunk/package/luci/po/cs/coovachilli.po b/trunk/package/luci/po/cs/coovachilli.po
new file mode 100644
index 00000000..0dc5fc0c
--- /dev/null
+++ b/trunk/package/luci/po/cs/coovachilli.po
@@ -0,0 +1,348 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-30 10:33+0200\n"
+"Last-Translator: Astran <martin.hromadko@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Nastavení sítě"
+
+msgid "RADIUS configuration"
+msgstr "Nastavení RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "UAM a MAC ověřování"
+
+#~ msgid "General configuration"
+#~ msgstr "Obecná konfigurace"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Obecné nastavení CoovaChilli"
+
+#~ msgid "Command socket"
+#~ msgstr "Příkazový socket"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "UNIX socket, používaný pro komunikaci s chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Interval obnovení konfigurace"
+
+#~ msgid "Pid file"
+#~ msgstr "PID soubor"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "Nastavení TUN/TAP"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Nastavení sítě/Tun"
+
+#~ msgid "Network down script"
+#~ msgstr "Network down skript"
+
+#~ msgid "Network up script"
+#~ msgstr "Network up skript"
+
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr "Skript, spuštěný po nahození síťového rozhraní TUN"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Primární DNS server"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Sekundární DNS server"
+
+#~ msgid "Domain name"
+#~ msgstr "Doménové jméno"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Pool dynamických IP adres"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Urči rozsah, z něhož se budou přidělovat dynamické IP adresy"
+
+#~ msgid "IP down script"
+#~ msgstr "IP down skript"
+
+#~ msgid "IP up script"
+#~ msgstr "IP up skript"
+
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr "Síťová adresa uplink rozhraní (CIDR notace)"
+
+#~ msgid "Static IP address pool"
+#~ msgstr "Pool statických IP adres"
+
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Určuje rozsah, z něhož se budou přidělovat statické IP adresy"
+
+#~ msgid "TX queue length"
+#~ msgstr "Délka odchozí fronty"
+
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr "Délka odchozí fronty na zařízení TUN/TAP"
+
+#~ msgid "Use TAP device"
+#~ msgstr "Použít zařízení TAP"
+
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Použít TAP rozhraní namísto TUN"
+
+#~ msgid "DHCP configuration"
+#~ msgstr "Nastavení DHCP"
+
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Nastavit možnosti DHCP pro příchozí klienty"
+
+#~ msgid "DHCP end number"
+#~ msgstr "DHCP koncové číslo"
+
+#~ msgid "Where to stop assigning IP addresses (default 254)"
+#~ msgstr "Kde přestat přidělovat IP adresy (standardně 254)"
+
+#~ msgid "DHCP interface"
+#~ msgstr "DHCP rozhraní"
+
+#~ msgid "Where to start assigning IP addresses (default 10)"
+#~ msgstr "Odkud začít přidělovat IP adresy"
+
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Povolit IEEE 802.1x"
+
+#~ msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
+#~ msgstr "Povolit IEEE 802.1x autentizaci a naslouchat požadavkům EAP"
+
+#~ msgid "Admin password"
+#~ msgstr "Administrátorské heslo"
+
+#~ msgid "Admin user"
+#~ msgstr "Administrátorský uživatel"
+
+#~ msgid "Do not check disconnection requests"
+#~ msgstr "Neověřovat požadavky na odpojení"
+
+#~ msgid "Do not check the source IP address of radius disconnect requests"
+#~ msgstr ""
+#~ "Neověřovat zdrojovou IP adresu požadavku na odpojení protokolu RADIUS"
+
+#~ msgid "NAS IP"
+#~ msgstr "NAS IP"
+
+#~ msgid "NAS MAC"
+#~ msgstr "NAS MAC"
+
+#~ msgid "Allow OpenID authentication"
+#~ msgstr "Povolit autentizaci pomocí OpenID"
+
+#~ msgid "RADIUS server 1"
+#~ msgstr "RADIUS server 1"
+
+#~ msgid "The IP address of radius server 1"
+#~ msgstr "IP adresa prvního radius serveru"
+
+#~ msgid "RADIUS server 2"
+#~ msgstr "RADIUS server 2"
+
+#~ msgid "The IP address of radius server 2"
+#~ msgstr "IP adresa druhého radius serveru"
+
+#~ msgid ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+#~ msgstr ""
+#~ "Prohodit významy spojení \"vstupní oktety\" a \"výstupní oktety\", "
+#~ "vztahující se k atributům protokolu RADIUS"
+
+#~ msgid "Allow WPA guests"
+#~ msgstr "Povolit WPA hosty"
+
+#~ msgid "Proxy client"
+#~ msgstr "Proxy klient"
+
+#~ msgid ""
+#~ "IP address from which radius requests are accepted. If omitted the server "
+#~ "will not accept radius requests"
+#~ msgstr ""
+#~ "IP adresa, ze které budou přijímány požadavky radius. Pokud necháte "
+#~ "prázdné, server nebude přijímat požadavky protokolu RADIUS."
+
+#~ msgid "Proxy listen address"
+#~ msgstr "Naslouchající adresa Proxy"
+
+#~ msgid "Local interface IP address to use for accepting radius requests"
+#~ msgstr ""
+#~ "IP adresa místního rozhraní, určená pro naslouchání požadavkům protokolu "
+#~ "RADIUS"
+
+#~ msgid "Proxy port"
+#~ msgstr "Port Proxy"
+
+#~ msgid "UDP Port to listen to for accepting radius requests"
+#~ msgstr "UDP port, určený pro naslouchání požadavkům protokolu RADIUS"
+
+#~ msgid "UAM configuration"
+#~ msgstr "Konfigurace UAM"
+
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Nastavení 'Unified Configuration Method'"
+
+#~ msgid "Use Chilli XML"
+#~ msgstr "Použít Chilli XML"
+
+#~ msgid "Default idle timeout"
+#~ msgstr "Výchozí časový limit nečinnosti"
+
+#~ msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Výchozí časový limit nečinnosti, pokud nebyl nastaven pomocí RADIUS "
+#~ "(standardně 0)"
+
+#~ msgid "Default session timeout"
+#~ msgstr "Výchozí časový limit sezení"
+
+#~ msgid ""
+#~ "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Výchozí časový limit sezení, pokud není RADIUS nastaven jinak (standardně "
+#~ "0)"
+
+#~ msgid "Inspect DNS traffic"
+#~ msgstr "Kontrolovat DNS provoz"
+
+#~ msgid "Local users file"
+#~ msgstr "Soubor s místními uživateli"
+
+#~ msgid ""
+#~ "A colon seperated file containing usernames and passwords of locally "
+#~ "authenticated users"
+#~ msgstr ""
+#~ "Soubor, obsahující uživatelská jména a hesla místně ověřovaných "
+#~ "uživatelů. Jednotlivé položky jsou odděleny dvojtečkou."
+
+#~ msgid "Location name"
+#~ msgstr "Název umístění"
+
+#~ msgid "Human readable location name used in JSON interface"
+#~ msgstr "Čitelný název umístění, používán v rozhraní JSON"
+
+#~ msgid "Do not redirect to UAM server"
+#~ msgstr "Nepřesměrovávat na UAM server"
+
+#~ msgid ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+#~ msgstr ""
+#~ "Při úspěšném přihlášení nevracet na UAM server, pouze přesměrovat na "
+#~ "původní URL"
+
+#~ msgid "Do not do WISPr"
+#~ msgstr "Neprovádět WISPr"
+
+#~ msgid "Allowed resources"
+#~ msgstr "Povolené zdroje"
+
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr "Seznam zdrojů, jež může klient využívat bez nutnosti autentizace"
+
+#~ msgid "Allow any DNS server"
+#~ msgstr "Povolit libovolný DNS server"
+
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr "Povolí libovolný DNS server neověřeným klientům"
+
+#~ msgid "Allow any IP address"
+#~ msgstr "Povolit libovolnou IP adresu"
+
+#~ msgid "Allowed domains"
+#~ msgstr "Povolené domény"
+
+#~ msgid "UAM homepage"
+#~ msgstr "Domovská stránka UAM"
+
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr ""
+#~ "URL domovské stránky, na kterou budou přesměrováni neověření uživatelé"
+
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr "IP adresa, na které naslouchat za účelem ověřování klientů"
+
+#~ msgid "UAM logout IP"
+#~ msgstr "Odhlašovací IP UAM"
+
+#~ msgid ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+#~ msgstr ""
+#~ "Adresa, sloužící k okamžitému odhlášení klienta, pokud na ní přistoupí "
+#~ "(standardně 1.1.1.1)"
+
+#~ msgid "UAM listening port"
+#~ msgstr "Naslouchající port UAM"
+
+#~ msgid "UAM server"
+#~ msgstr "UAM server"
+
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr "URL web serveru, sloužícího k ověřování klientů"
+
+#~ msgid "UAM user interface"
+#~ msgstr "Uživatelské rozhraní UAM"
+
+#~ msgid "Use status file"
+#~ msgstr "Použít stavový soubor"
+
+#~ msgid ""
+#~ "Write the status of clients in a non-volatile state file (experimental)"
+#~ msgstr ""
+#~ "Zapisovat stavy klientů do stálého stavového souboru (experimentální)"
+
+#~ msgid "WISPr login url"
+#~ msgstr "Přihlašovací URL WISPr"
+
+#~ msgid "CGI program"
+#~ msgstr "CGI program"
+
+#~ msgid "Web content directory"
+#~ msgstr "Adresář s webovým obsahem"
+
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr "Adresář, ve kterém je umístěn místní webový obsah."
+
+#~ msgid "MAC configuration"
+#~ msgstr "Nastavení MAC"
+
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Nastavit ověřování pomocí MAC"
+
+#~ msgid "Allowed MAC addresses"
+#~ msgstr "Povolené MAC adresy"
+
+#~ msgid "List of MAC addresses for which MAC authentication will be performed"
+#~ msgstr "Seznam MAC adres, pro které bude prováděno ověřování pomocí MAC"
+
+#~ msgid "Authenticate locally allowed MACs"
+#~ msgstr "Ověřit lokálně povolené MAC"
+
+#~ msgid "Authenticate allowed MAC addresses without the use of RADIUS"
+#~ msgstr "Ověří povolené MAC adresy bez použití protokolu RADIUS"
+
+#~ msgid "Enable MAC authentification"
+#~ msgstr "Povolit ověřování pomocí MAC"
+
+#~ msgid "Password"
+#~ msgstr "Heslo"
+
+#~ msgid "Suffix"
+#~ msgstr "Přípona"
diff --git a/trunk/package/luci/po/cs/ddns.po b/trunk/package/luci/po/cs/ddns.po
new file mode 100644
index 00000000..15c1e228
--- /dev/null
+++ b/trunk/package/luci/po/cs/ddns.po
@@ -0,0 +1,87 @@
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2014-06-20 23:22+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Zkontrolovat změnu IP každých"
+
+msgid "Check-time unit"
+msgstr "Check-time jednotka"
+
+msgid "Custom update-URL"
+msgstr "Vlastní aktualizační-URL"
+
+msgid "Dynamic DNS"
+msgstr "Dynamické DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Dynamické DNS umožňuje, aby mohl být váš router dostupný pod pevným "
+"hostname, zatímco se jeho IP adresa dynamicky mění."
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Force update every"
+msgstr "Vynutit aktualizaci každých"
+
+msgid "Force-time unit"
+msgstr "Force-time jednotka"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid "Network"
+msgstr "Síť"
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid "Service"
+msgstr "Služba"
+
+msgid "Source of IP address"
+msgstr "Zdroj IP adresy"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+msgid "custom"
+msgstr "vlastní"
+
+# Hours
+# Hodin
+msgid "h"
+msgstr "h"
+
+msgid "interface"
+msgstr "rozhraní"
+
+# Minutes (not minimum)
+# Minut
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "síť"
diff --git a/trunk/package/luci/po/cs/diag_core.po b/trunk/package/luci/po/cs/diag_core.po
new file mode 100644
index 00000000..dcfea775
--- /dev/null
+++ b/trunk/package/luci/po/cs/diag_core.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-20 23:19+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Nastavení diagnostiky"
+
+msgid "Diagnostics"
+msgstr "Diagnostika"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Počet diagnostických testů, které jsou k dispozici v tomto menu je závislý "
+"na modulech nainstalovaných ve vašem zařízení."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Položky v menu vám umožní provádět systémové diagnostické testy, které vám "
+"pomohou vyřešit problémy."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"V tomto menu můžete nastavit síťovou diagnostiku, jako je skenování síťových "
+"zařízení a ping testů."
diff --git a/trunk/package/luci/po/cs/diag_devinfo.po b/trunk/package/luci/po/cs/diag_devinfo.po
new file mode 100644
index 00000000..73fe67e2
--- /dev/null
+++ b/trunk/package/luci/po/cs/diag_devinfo.po
@@ -0,0 +1,209 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-11 19:32+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Akce"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid "Beginning of MAC address range"
+msgstr "Začátek rozsahu MAC adres"
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr "Konfigurace"
+
+msgid "Configure Scans"
+msgstr "Konfigurace skenů"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "Odstranit"
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr "Typ zařízení"
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr "Zařízení na síti"
+
+msgid "Edit"
+msgstr "Upravit"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "End of MAC address range"
+msgstr "Konec rozsahu MAC adres"
+
+msgid "Go to relevant configuration page"
+msgstr "Přejít na příslušnou konfigurační stránku"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid "Invalid"
+msgstr "Neplatný"
+
+msgid "Link to Device"
+msgstr "Odkaz na zařízení"
+
+msgid "MAC Address"
+msgstr "MAC adresa"
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Jak dlouho spát mezi požadavky (milisekundy, výchozí 100)"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Name"
+msgstr "Jméno"
+
+msgid "Network Device Scan"
+msgstr "Vyhledání síťových zařízení"
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr "Žádná zařízení SIP"
+
+msgid "No devices detected"
+msgstr "Nebyla detekována žádná zařízení"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Kolikrát odeslat požadavek (standardně 1)"
+
+msgid "OUI Owner"
+msgstr "Vlastník OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Provést skenování (může trvat několik minut)"
+
+msgid "Phone Information"
+msgstr "Informace o telefonu"
+
+msgid "Phone Scan"
+msgstr "Vyhledání telefonů"
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr "Telefony"
+
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr "Počet opakování"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Opakování skenování (může trvat několik minut)"
+
+msgid "SIP Device Information"
+msgstr "Informace o zařízení SIP"
+
+msgid "SIP Device Scan"
+msgstr "Skenování SIP zařízení"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Konfigurace skenování SIP zařízení"
+
+msgid "SIP Devices on Network"
+msgstr "Zařízení SIP na síti"
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr "Hledat zařízení na zadané síti"
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr "Nastavení skenování"
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr "Uspat mezi jednotlivými požadavky"
+
+msgid "Subnet"
+msgstr "Podsíť"
+
+msgid "This section contains no values yet"
+msgstr "Tato sekce zatím neobsahuje žádné hodnoty"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Doba čekání na odpovědi v sekundách (výchozí 10)"
+
+msgid "Timeout"
+msgstr "Časový limit"
+
+msgid "Use Configuration"
+msgstr "Použít nastavení"
+
+msgid "Vendor"
+msgstr "Prodejce"
+
+msgid "check other networks"
+msgstr "zkontrolovat ostatní sítě"
diff --git a/trunk/package/luci/po/cs/ffwizard.po b/trunk/package/luci/po/cs/ffwizard.po
new file mode 100644
index 00000000..4c0071ee
--- /dev/null
+++ b/trunk/package/luci/po/cs/ffwizard.po
@@ -0,0 +1,166 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-08 21:15+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Povolit přenášení anonymních statistik o tomto uzlu."
+
+msgid "Channel"
+msgstr "Kanál"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr "Nastavit síť"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Propojit váš uzel s jinými pomocí tunelu skrz internet."
+
+msgid "DHCP IP range"
+msgstr "Rozsah IP adres DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP bude klientům automaticky přidělovat IP adresy"
+
+msgid "DNS Server"
+msgstr "DNS server"
+
+msgid "Enable DHCP"
+msgstr "Povolit DHCP"
+
+msgid "Gateway"
+msgstr "Brána"
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr "IP adresa"
+
+msgid "L2gvpn tunnel"
+msgstr "L2gvpn tunel"
+
+msgid "Limit download bandwidth"
+msgstr "Omezit šířku pásma pro stahování"
+
+msgid "Limit upload bandwidth"
+msgstr "Omezit šířku pásma pro nahrávání"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr "Netmask"
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid "Password confirmation"
+msgstr "Potvrdit heslo"
+
+msgid "Password successfully changed"
+msgstr "Heslo bylo úspěšně změněno"
+
+msgid "Protect LAN"
+msgstr "Ochránit LAN"
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Zaškrtněte toto pole, pokud chcete nastavit vaše síťová rozhraní"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Zaškrtnutím povolíte ostatním využití vašeho rozhraní pro přístup k "
+"internetu."
+
+msgid "Share your internet connection"
+msgstr "Sdílet připojení k internetu"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "IPv6 adresy jsou počítány automaticky."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Protokol, který slouží k připojení k Internetu."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr "Nastaví nové virtuální bezdrátové rozhraní v režimu Access Pointu"
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Tento průvodce vám pomůže s nastavením vašeho routeru pro Freifunk nebo "
+"podobnou komunitní bezdrátovou síť."
+
+msgid "Unknown Error"
+msgstr "Neznámá chyba"
+
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Virtuální přístupový bod (Virtual Access Point, VAP)"
+
+msgid "Wizard"
+msgstr "Průvodce"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr "DHCP"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr "Nastavit toto rozhraní."
+
+msgid "recommended"
+msgstr "doporučené"
+
+msgid "Basic settings"
+msgstr "Základní nastavení"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Základní nastavení není kompletní. Prosím pokračujte"
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr "Nemůžete použít průvodce, protože chybí některé nezbytné hodnoty."
+
+msgid "and fill out all required fields."
+msgstr "a vyplňte všechna požadovaná pole."
diff --git a/trunk/package/luci/po/cs/firewall.po b/trunk/package/luci/po/cs/firewall.po
new file mode 100644
index 00000000..beda490f
--- /dev/null
+++ b/trunk/package/luci/po/cs/firewall.po
@@ -0,0 +1,579 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-21 11:22+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s v %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s s %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s v %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Nepojmenovaný vstup)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Nepojmenované pravidlo)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(Nepojmenovaný SNAT)"
+
+msgid "-- Please choose --"
+msgstr "-- Prosím zvolte --"
+
+msgid "-- custom --"
+msgstr "-- vlastní --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> paketů za <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> paketů za <var>%s</var>, burst <var>%d</var> paketů."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> a omezit na %s"
+
+msgid "Action"
+msgstr "Akce"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid "Add and edit..."
+msgstr "Přidat a upravit"
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Povolit přesměrování ze <em>zdrojových oblastí</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Povolit přesměrování do <em>zdrojových oblastí</em>:"
+
+msgid "Any"
+msgstr "Libovolné"
+
+msgid "Covered networks"
+msgstr "Pokryté sítě"
+
+msgid "Custom Rules"
+msgstr "Vlastní pravidla"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Vlastní pravidla vám umožňují spustit libovolné iptables příkazy, které "
+"nejsou jinak pokryté frameworkem firewallu. Příkazy jsou spuštěny po každém "
+"restartu firewallu, právě po načtení výchozí sady pravidel."
+
+msgid "Destination IP address"
+msgstr "Cílová IP adresa"
+
+msgid "Destination address"
+msgstr "Cílová adresa"
+
+msgid "Destination port"
+msgstr "Cílový port"
+
+msgid "Destination zone"
+msgstr "Cílová oblast"
+
+msgid "Do not rewrite"
+msgstr "Nepřepisovat"
+
+msgid "Drop invalid packets"
+msgstr "Zahazovat neplatné pakety"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Enable NAT Loopback"
+msgstr "Povolit NAT Loopback"
+
+msgid "Enable SYN-flood protection"
+msgstr "Povolit ochranu proti SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr "Povolit logování v této oblasti"
+
+msgid "External IP address"
+msgstr "Vnější IP adresa"
+
+msgid "External port"
+msgstr "Vnější port"
+
+msgid "External zone"
+msgstr "Vnější zóna"
+
+msgid "Extra arguments"
+msgstr "Dodatečné argumenty"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr "Firewall - Vlastní pravidla"
+
+msgid "Firewall - Port Forwards"
+msgstr "Firewall - Přesměrování portů"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Firewall - Pravidla síťového provozu"
+
+msgid "Firewall - Zone Settings"
+msgstr "Firewall - Nastavení zón"
+
+msgid "Force connection tracking"
+msgstr "Vynutit sledování připojení"
+
+msgid "Forward"
+msgstr "Přesměrování"
+
+msgid "Forward to"
+msgstr "Přesměrovat na"
+
+msgid "From %s in %s"
+msgstr "Z %s v %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Z %s v %s se zdrojovou %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Z %s v %s se zdrojovou %s a %s"
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 a IPv6"
+
+msgid "IPv4 only"
+msgstr "pouze IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "pouze IPv6"
+
+msgid "Input"
+msgstr "Vstup"
+
+# nebo mimo zóny?
+msgid "Inter-Zone Forwarding"
+msgstr "Přesměrování mezi zónami"
+
+msgid "Internal IP address"
+msgstr "Vnitřní IP adresa"
+
+msgid "Internal port"
+msgstr "Vnitřní port"
+
+msgid "Internal zone"
+msgstr "Vnitřní zóna"
+
+msgid "Limit log messages"
+msgstr "Omezit logovací zprávy"
+
+msgid "MSS clamping"
+msgstr "MSS clamping"
+
+msgid "Masquerading"
+msgstr "Maškárádování"
+
+msgid "Match"
+msgstr "Shoda"
+
+msgid "Match ICMP type"
+msgstr "Odpovídá ICMP typu"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "Vybrat provoz, přesměrovaný na zadaný port nebo rozsah portů"
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Vybrat příchozí provoz, směrovaný na zadaný cílový port nebo rozsah portů "
+"tohoto hostitele"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Vybrat příchozí provoz, pocházející ze zadaného portu nebo rozsahu portů "
+"klienta."
+
+msgid "Name"
+msgstr "Název"
+
+msgid "New SNAT rule"
+msgstr "Nové pravidlo SNAT"
+
+msgid "New forward rule"
+msgstr "Nové přesměrovací pravidlo"
+
+msgid "New input rule"
+msgstr "Nové vstupní pravidlo"
+
+msgid "New port forward"
+msgstr "Nové přesměrování portu"
+
+msgid "New source NAT"
+msgstr "Nový zdrojový NAT (SNAT)"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Vybrat pouze příchozí provoz z těchto MAC adres."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Vybrat pouze příchozí provoz z této IP nebo rozsahu IP adres."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Vybrat pouze příchozí provoz, pocházející ze zadaného portu nebo rozsahu "
+"portů klienta."
+
+msgid "Open ports on router"
+msgstr "Otevřené porty na routeru"
+
+msgid "Other..."
+msgstr "Ostatní ..."
+
+msgid "Output"
+msgstr "Výstup"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "Předává další argumenty iptables. Používat opatrně!"
+
+msgid "Port Forwards"
+msgstr "Přesměrování portů"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"Přesměrování portů (port forwarding) umožňuje vzdáleným počítačům z "
+"Internetu připojení k vybraným počítačům nebo službám uvnitř privátní sítě "
+"LAN."
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Přesměrovat vybraný příchozí provoz na uvedený port vnitřního hostitele."
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Přesměrovat vybraný příchozí provoz na uvedeného vnitřního hostitele."
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Omezit maškarádování na uvedené cílové podsítě"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
+
+msgid "Restrict to address family"
+msgstr "Omezit na rodinu adres"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Přepsat shodný provoz na uvedenou adresu."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Přepsat shodný provoz na uvedený zdrojový port. Může zůstat prázdné, pak "
+"bude přepsána pouze IP adresa."
+
+msgid "Rewrite to source %s"
+msgstr "Přepsat na zdrojovou %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Přepsat na zdrojovou %s, %s"
+
+msgid "SNAT IP address"
+msgstr "IP adresa SNATu"
+
+msgid "SNAT port"
+msgstr "Port SNATu"
+
+msgid "Source IP address"
+msgstr "Zdrojová IP adresa"
+
+msgid "Source MAC address"
+msgstr "Zdrojová MAC adresa"
+
+msgid "Source NAT"
+msgstr "Zdrojový NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Zdrojový NAT je specifická forma maškarádování, která umožňuje jemnozrnnou "
+"kontrolu nad zdrojovými IP, použitými pro odchozí provoz. Využívá se "
+"například pro mapování množství WAN adres do vnitřních podsítí."
+
+msgid "Source address"
+msgstr "Zdrojová adresa"
+
+msgid "Source port"
+msgstr "Zdrojový port"
+
+msgid "Source zone"
+msgstr "Zdrojová zóna"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Firewall vytváří zóny přes vaše síťová rozhraní za účelem řízení síťového "
+"provozu."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Níže uvedené možnosti řídí přesměrovací politiky mezi touto zónou (%s) a "
+"ostatními zónami. <em>Cílové zóny</em> pokrývají přesměrovávaný provoz, "
+"<strong>pocházející z %q</strong>. <em>Zdrojové zóny</em> porovnávají "
+"přesměrovávaný provoz z ostatních zón, <strong>zaměřený na %q</strong>. "
+"Přesměrovávací pravidlo je <em>jednosměrné</em>, například přesměrování z "
+"lan do wan <em>nepovoluje</em> přesměrování z wan do lan (a naopak)."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Tato stránka vám umožňuje změnit pokročilé vlastností přesměrování portů. Ve "
+"většině případů není potřeba upravovat tato nastavení."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Tato stránka vám umožňuje změnit pokročilé vlastnosti pravidla síťového "
+"provozu, například zdrojové a cílové hostitele."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Tato sekce definuje běžné možnosti %q. <em>Vstupní</em> a <em>výstupní</em> "
+"možnosti nastavují výchozí politiky pro provoz, vstupující do této zóny a "
+"vystupující z ní, zatímco <em>přesměrovací</em> možnosti popisují politiku "
+"pro přesměrování provozu mezi rozdílnými sítěmi uvnitř jedné zóny.<em> "
+"Pokryté sítě</em> určuje, které z dostupných sítí jsou členy této zóny."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "Na %s v %s na <var>tomto zařízení</var>"
+
+msgid "To %s in %s"
+msgstr "Na %s v %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "Na %s na <var>tomto zařízení</var>"
+
+msgid "To %s, %s in %s"
+msgstr "Na %s, %s v %s"
+
+msgid "To source IP"
+msgstr "Na zdrojovou IP"
+
+msgid "To source port"
+msgstr "Na zdrojový port"
+
+msgid "Traffic Rules"
+msgstr "Pravidla síťového provozu"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Pravidla síťového provozu definují politiky pro cestování paketů mezi "
+"různými zónami, například pro odmítnutí provozu mezi jistými hostiteli nebo "
+"pro otevření WAN portů na routeru."
+
+msgid "Via %s"
+msgstr "Prostřednictvím %s"
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Lze určit více protokolů. Vyberte \"-- vlastní --\" a vkládejte protokoly "
+"oddělené mezerou."
+
+msgid "Zone %q"
+msgstr "Zóna %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zóna ⇒ Přesměrování"
+
+msgid "Zones"
+msgstr "Zóny"
+
+msgid "accept"
+msgstr "přijmout"
+
+msgid "any"
+msgstr "libovolný"
+
+msgid "any host"
+msgstr "libovolný hostitel"
+
+msgid "any router IP"
+msgstr "libovolná IP routeru"
+
+msgid "any zone"
+msgstr "libovolná zóna"
+
+msgid "don't track"
+msgstr "nesledovat"
+
+msgid "drop"
+msgstr "zahodit"
+
+msgid "reject"
+msgstr "odmítnout"
+
+msgid "traffic"
+msgstr "provoz"
+
+#~ msgid "Destination"
+#~ msgstr "Cíl"
+
+#~ msgid "Family"
+#~ msgstr "Rodina"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "Přesměrovat na %s v %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "Přesměrovat na %s, %s v %s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Zdroj"
+
+#~ msgid "To %s"
+#~ msgstr "Na %s"
+
+#~ msgid "To %s at %s"
+#~ msgstr "Na %s v %s"
+
+#~ msgid "Via"
+#~ msgstr "přes"
+
+#~ msgid "Accept forward"
+#~ msgstr "Přijmout přesměrování"
+
+#~ msgid "Accept input"
+#~ msgstr "Přijmout vstup"
+
+#~ msgid "Disable"
+#~ msgstr "Zakázat"
+
+#~ msgid "Discard forward"
+#~ msgstr "Zahodit přesměrování"
+
+#~ msgid "Discard input"
+#~ msgstr "Zahodit vstup"
+
+#~ msgid "Do not track forward"
+#~ msgstr "Nesledovat přesměrování"
+
+#~ msgid "Do not track input"
+#~ msgstr "Nesledovat vstup"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "IP rozsah"
+
+#~ msgid "IPs"
+#~ msgstr "IP"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "MAC"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Odmítnout přesměrování"
+
+#~ msgid "Refuse input"
+#~ msgstr "Odmítnout vstup"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Pravidlo je zakázané"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Pravidlo je povolené"
+
+#~ msgid "day"
+#~ msgstr "den"
+
+#~ msgid "hour"
+#~ msgstr "hodina"
+
+#~ msgid "minute"
+#~ msgstr "minuta"
+
+#~ msgid "not"
+#~ msgstr "ne"
+
+#~ msgid "port"
+#~ msgstr "port"
+
+#~ msgid "ports"
+#~ msgstr "porty"
+
+#~ msgid "second"
+#~ msgstr "sekunda"
+
+#~ msgid "type"
+#~ msgstr "typ"
+
+#~ msgid "types"
+#~ msgstr "typy"
diff --git a/trunk/package/luci/po/cs/freifunk-policyrouting.po b/trunk/package/luci/po/cs/freifunk-policyrouting.po
new file mode 100644
index 00000000..4ec9f8da
--- /dev/null
+++ b/trunk/package/luci/po/cs/freifunk-policyrouting.po
@@ -0,0 +1,52 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-26 20:27+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr "Povolit politiku směrování"
+
+msgid "Fallback to mesh"
+msgstr "Fallback do mesh"
+
+msgid "Firewall zones"
+msgstr "Zóny firewallu"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr "Politika směrování"
+
+msgid "Strict Filtering"
+msgstr "Striktní filtrování"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/cs/freifunk.po b/trunk/package/luci/po/cs/freifunk.po
new file mode 100644
index 00000000..cf22c008
--- /dev/null
+++ b/trunk/package/luci/po/cs/freifunk.po
@@ -0,0 +1,404 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-08 21:21+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Špatné (ETX > 10)"
+
+msgid "Basic Settings"
+msgstr "Základní nastavení"
+
+msgid "Basic settings"
+msgstr "Základní nastavení"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Základní nastavení není kompletní. Prosím přejděte na"
+
+msgid "Basic system settings"
+msgstr "Základní nastavení systému"
+
+msgid "Bitrate"
+msgstr "Datový tok"
+
+msgid "Channel"
+msgstr "Kanál"
+
+#, fuzzy
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+"Zkontrolovat dostupnost nové verze firmwaru a provést automatické "
+"aktualizace."
+
+msgid "Client network size"
+msgstr "Velikost klientské sítě"
+
+msgid "Community"
+msgstr "Komunita"
+
+msgid "Community profile"
+msgstr "Komunitní profil"
+
+msgid "Community settings"
+msgstr "Nastavení komunity"
+
+msgid "Confirm Upgrade"
+msgstr "Potvrďte upgrade"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "Kontaktní informace není kompletní. Prosím pokračujte na"
+
+msgid "Coordinates"
+msgstr "Souřadnice"
+
+msgid "Country code"
+msgstr "Kód země"
+
+msgid "Default routes"
+msgstr "Výchozí trasy"
+
+#, fuzzy
+msgid "Disable default content"
+msgstr "Zakázat výchozí obsah"
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr "E-Mail"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr "Povolit IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Najděte své souřadnice pomocí OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Freifunk - Přehled"
+
+msgid "Freifunk Remote Update"
+msgstr "Freifunk - Vzdálené aktualizace"
+
+msgid "Gateway"
+msgstr "Brána"
+
+msgid "Go to"
+msgstr "Jít na"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Dobré (2 < ETX < 4)"
+
+msgid "Green"
+msgstr "Zelený"
+
+msgid "Hello and welcome in the network of"
+msgstr "Dobrý den, vítejte v síti"
+
+msgid "Hide OpenStreetMap"
+msgstr "Skrýt OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Domovská stránka"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IPv6 Config"
+msgstr "Konfigurace IPv6"
+
+msgid "IPv6 Prefix"
+msgstr "IPv6 Prefix"
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr "Pokud se zajímáte o náš projekt, kontaktujte místní komunitu"
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Přístup k Internetu závisí na technických a organizačních podmínkách. Může "
+"(ale nemusí) vám fungovat."
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr "Uchovat nastavení"
+
+msgid "Latitude"
+msgstr "Zeměpisná šířka"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr "Místní čas"
+
+msgid "Location"
+msgstr "Umístění"
+
+msgid "Longitude"
+msgstr "Zeměpisná délka"
+
+msgid "Map"
+msgstr "Mapa"
+
+msgid "Map Error"
+msgstr "Chyba mapy"
+
+msgid "Memory"
+msgstr "Paměť"
+
+msgid "Mesh prefix"
+msgstr "Mesh prefix"
+
+msgid "Metric"
+msgstr "Metrika"
+
+msgid "Mode"
+msgstr "Režim"
+
+msgid "Network"
+msgstr "Síť"
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr "Přezdívka"
+
+msgid "No default routes known."
+msgstr "Nejsou známy výchozí cesty"
+
+msgid "Notice"
+msgstr "Upozornění"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Operátor"
+
+msgid "Orange"
+msgstr "Oranžový"
+
+msgid "Overview"
+msgstr "Přehled"
+
+msgid "Package libiwinfo required!"
+msgstr "Balíček libiwinfo je vyžadován!"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Please fill in your contact details below."
+msgstr "Prosím níže vyplňte kontaktní detaily."
+
+msgid "Please set your contact information"
+msgstr "Prosím nastavte si vaše kontaktní informace"
+
+msgid "Power"
+msgstr "Výkon"
+
+msgid "Processor"
+msgstr "Procesor"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Profile (Expert)"
+msgstr "Profil (Expert)"
+
+msgid "Realname"
+msgstr "Skutečné jméno"
+
+msgid "Red"
+msgstr "Červený"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Kliknutím na mapu vyberte vaše umístění. Mapa se zobrazí, pouze pokud jste "
+"připojen do sítě Internet."
+
+msgid "Show OpenStreetMap"
+msgstr "Zobrazit OpenStreetMap"
+
+msgid "Show on map"
+msgstr "Zobrazit na mapě"
+
+msgid "Signal"
+msgstr "Signál"
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr "Spustit aktualizaci"
+
+msgid "Statistics"
+msgstr "Statistiky"
+
+msgid "Status"
+msgstr "Stav"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Stále použitelné (4 < ETX < 10)"
+
+msgid "System"
+msgstr "Systém"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Balíček <em>libiwinfo</em> není nainstalován. Je třeba ho nainstalovat, aby "
+"byla funkční konfigurace bezdrátové sítě!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr "Nainstalovaný firmware je aktuální."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr "To je přístupový bod (AP)"
+
+msgid "Update Settings"
+msgstr "Nastavení aktualizace"
+
+msgid "Update available!"
+msgstr "Aktualizace dostupná!"
+
+msgid "Uptime"
+msgstr "Doba provozu"
+
+msgid "VAP"
+msgstr "VAP"
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr "Velmi dobré (ETX < 2)"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr "Žlutý"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr "např."
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr "nastavení bezdrátové sítě"
diff --git a/trunk/package/luci/po/cs/hd_idle.po b/trunk/package/luci/po/cs/hd_idle.po
new file mode 100644
index 00000000..3b8aa9d4
--- /dev/null
+++ b/trunk/package/luci/po/cs/hd_idle.po
@@ -0,0 +1,52 @@
+# Generated from applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2014-04-23 22:33+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Enable debug"
+msgstr "Povolit ladění"
+
+msgid "Idle-time"
+msgstr "Čas nečinnosti"
+
+msgid "Idle-time unit"
+msgstr "Čas nečinnosti - jednotka"
+
+msgid "Settings"
+msgstr "Nastavení"
+
+# Hodin
+msgid "h"
+msgstr "h"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle je utilita pro vypnutí externích pevných disků po určité době "
+"nečinnosti."
+
+# Minut (ne minimum)
+msgid "min"
+msgstr "min"
diff --git a/trunk/package/luci/po/cs/meshwizard.po b/trunk/package/luci/po/cs/meshwizard.po
new file mode 100644
index 00000000..b1253d01
--- /dev/null
+++ b/trunk/package/luci/po/cs/meshwizard.po
@@ -0,0 +1,122 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-21 14:39+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr "Kanál"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr "Nastavit toto rozhraní"
+
+msgid "DHCP IP range"
+msgstr "DHCP IP rozsah"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr "Povolit DHCP"
+
+msgid "Enable RA"
+msgstr "Povolit RA"
+
+msgid "Enabled"
+msgstr "Povoleno"
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "IPv6 Settings"
+msgstr "Nastavení IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Rozhraní"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr "Průvodce mesh"
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr "Ochrana LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr "Sdílet vaše internetové připojení"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Virtuální přístupový bod (VAP)"
+
+msgid "Wizard"
+msgstr "Průvodce"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr "doporučeno"
diff --git a/trunk/package/luci/po/cs/minidlna.po b/trunk/package/luci/po/cs/minidlna.po
new file mode 100644
index 00000000..bf5a7f44
--- /dev/null
+++ b/trunk/package/luci/po/cs/minidlna.po
@@ -0,0 +1,171 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-04 19:18+0200\n"
+"Last-Translator: KubaCZ <kuba.turek@centrum.cz>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr "Procházet adresář"
+
+msgid "Collecting data..."
+msgstr "Shromažďování dat ..."
+
+msgid "Database directory:"
+msgstr "Adresář databáze:"
+
+msgid "Enable TIVO:"
+msgstr "Povolit TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Povolit inotify:"
+
+msgid "Enable:"
+msgstr "Povolit:"
+
+msgid "Friendly name:"
+msgstr "Popisek:"
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "Interfaces:"
+msgstr "Rozhraní:"
+
+msgid "Log directory:"
+msgstr "Log adresář:"
+
+msgid "Media directories:"
+msgstr "Media adresáře:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA je serverový software s cílem být plně kompatibilní s DLNA / UPnP-"
+"AV klienty."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr "Hudba"
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr "Notifikační interval v sekundách."
+
+msgid "Notify interval:"
+msgstr "Notifikační interval:"
+
+msgid "Pictures"
+msgstr "Obrázky"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port pro HTTP (popisy, SOAP, přenos médií) provoz."
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr "Prezentační URL:"
+
+msgid "Root container:"
+msgstr "Kořenový/root kontejner:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr "Standardní kontejner"
+
+msgid "Strict to DLNA standard:"
+msgstr "Striktně se držet standardu DLNA:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"Služba miniDLNA je aktivní, poskytuje %d audio, %d video a %d obrázkových "
+"souborů."
+
+msgid "The miniDLNA service is not running."
+msgstr "Služba miniDLNA není spuštěna."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr "Video"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "Stav miniDLNA"
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP socket:"
diff --git a/trunk/package/luci/po/cs/mmc_over_gpio.po b/trunk/package/luci/po/cs/mmc_over_gpio.po
new file mode 100644
index 00000000..6a7b7b12
--- /dev/null
+++ b/trunk/package/luci/po/cs/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-15 20:16+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "Pin CLK"
+
+msgid "CS_pin"
+msgstr "Pin CS"
+
+msgid "DI_pin"
+msgstr "Pin DI"
+
+msgid "DO_pin"
+msgstr "Pin DO"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "MMC/SD driver configuration"
+msgstr "Konfigurace ovladače MMC/SD"
+
+msgid "Mode"
+msgstr "Mód"
+
+msgid "Name"
+msgstr "Jméno"
+
+msgid "Settings"
+msgstr "Nastavení"
diff --git a/trunk/package/luci/po/cs/multiwan.po b/trunk/package/luci/po/cs/multiwan.po
new file mode 100644
index 00000000..0629827e
--- /dev/null
+++ b/trunk/package/luci/po/cs/multiwan.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-11 19:45+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Počet pokusů před spuštěním záložního WAN"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Počet pokusů před obnovou WAN"
+
+msgid "Auto"
+msgstr "Automaticky"
+
+msgid "Collecting data..."
+msgstr "Sbírám data..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Nastavit pravidla pro směrování odchozích paketů přes konkrétní WAN "
+"rozhraní."
+
+msgid "DNS Server(s)"
+msgstr "DNS server(y)"
+
+msgid "Default Route"
+msgstr "Výchozí brána"
+
+msgid "Destination Address"
+msgstr "Cílová adresa"
+
+msgid "Disable"
+msgstr "Vypnout"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Failing"
+msgstr "Selhání"
+
+msgid "Failover Traffic Destination"
+msgstr "Cíl záložního spojení"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Monitorování dostupnosti - ICMP host(é)"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Monitorování dostupnosti - ICMP časový limit"
+
+msgid "Health Monitor Interval"
+msgstr "Monitorování dostupnosti - interval"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"Monitorování dostupnosti kontroluje a opravuje změny v síti a selhání "
+"připojení."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Load Balancer - rozdělení"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Load Balancer(Kompatibilita)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Load Balancer(Výkon)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Stav Multi-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Multi-WAN pravidla směrování"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN umožňuje použít několik internetových připojení pro vyvažování "
+"zátěže a zálohy připojení."
+
+msgid "None"
+msgstr "Žádný"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Recovering"
+msgstr "Obnovuji"
+
+msgid "Source Address"
+msgstr "Zdrojová adresa"
+
+msgid "Unknown"
+msgstr "Neznámý"
+
+msgid "WAN Interfaces"
+msgstr "WAN rozhraní"
+
+msgid "WAN Uplink"
+msgstr "WAN připojení"
+
+msgid "all"
+msgstr "VÅ¡echny"
diff --git a/trunk/package/luci/po/cs/ntpc.po b/trunk/package/luci/po/cs/ntpc.po
new file mode 100644
index 00000000..8c342dea
--- /dev/null
+++ b/trunk/package/luci/po/cs/ntpc.po
@@ -0,0 +1,55 @@
+# Generated from applications/luci-ntpc/luasrc/model/cbi/ntpc/*.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2014-04-14 12:47+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Úprava času"
+
+msgid "Count of time measurements"
+msgstr "Počet měření času"
+
+msgid "Current system time"
+msgstr "Aktuální systémový čas"
+
+msgid "General"
+msgstr "Obecné nastavení"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Offset frequency"
+msgstr "Offsetová frekvence (chyba měření času)"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Synchronizuje systémový čas s přesným reálným časem přes síť"
+
+msgid "Time Server"
+msgstr "Synchronizační server"
+
+msgid "Time Servers"
+msgstr "Synchronizační servery"
+
+msgid "Time Synchronisation"
+msgstr "Synchronizace času"
+
+msgid "Update interval (in seconds)"
+msgstr "Interval obnovy synchronizace (v sekundách)"
+
+msgid "empty = infinite"
+msgstr "prázdný = neustálé opakování"
diff --git a/trunk/package/luci/po/cs/olsr.po b/trunk/package/luci/po/cs/olsr.po
new file mode 100644
index 00000000..31669072
--- /dev/null
+++ b/trunk/package/luci/po/cs/olsr.po
@@ -0,0 +1,693 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-21 14:56+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr "Špatné (ETX > 10)"
+
+msgid "Bad (SNR < 5)"
+msgstr "Špatné (SNR < 5)"
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Konfigurace"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr "Povolit toto rozhraní."
+
+msgid "Enabled"
+msgstr "Povoleno"
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "General settings"
+msgstr "Obecné nastavení"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Dobré (2 < ETX < 4)"
+
+msgid "Good (30 > SNR > 20)"
+msgstr "Dobré (30 > SNR > 20)"
+
+msgid "Green"
+msgstr "Zelený"
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr "HNA interval"
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr "Skrýt IPv4"
+
+msgid "Hide IPv6"
+msgstr "Skrýt IPv6"
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr "IP adresy"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 broadcast"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "IPv6 multicast"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Rozhraní"
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr "Internet protokol"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr "LQ"
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr "LQ algoritmus"
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "Poslední skok (hop)"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Library"
+msgstr "Knihovna"
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr "IP lokálního rozhraní"
+
+msgid "MID"
+msgstr "MID"
+
+msgid "MID interval"
+msgstr "MID interval"
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "Hlavní IP"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr "NLQ"
+
+msgid "Neighbors"
+msgstr "Sousedé"
+
+msgid "Neighbour IP"
+msgstr "IP souseda"
+
+msgid "Neighbours"
+msgstr "Sousedé"
+
+msgid "Netmask"
+msgstr "Maska sítě"
+
+msgid "Network"
+msgstr "Síť"
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - pluginy"
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr "Oranžový"
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr "Konfigurace pluginu"
+
+msgid "Plugins"
+msgstr "Pluginy"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Red"
+msgstr "Červený"
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr "Zobrazit IPv4"
+
+msgid "Show IPv6"
+msgstr "Zobrazit IPv6"
+
+msgid "Signal Noise Ratio in dB"
+msgstr "Úroveň šumu v dB"
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr "Stále použitelné (4 < ETX < 10)"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Stále použitelné (4 < ETX < 10)"
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr "TC"
+
+msgid "TC interval"
+msgstr "TC interval"
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr "TOS hodnota"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr "Topologie"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Verze"
+
+msgid "Very good (ETX < 2)"
+msgstr "Velmi dobré (ETX < 2)"
+
+msgid "Very good (SNR > 30)"
+msgstr "Velmi dobré (SNR > 30)"
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr "Váha"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr "Žlutý"
+
+msgid "no"
+msgstr "ne"
+
+msgid "yes"
+msgstr "ano"
+
+#~ msgid "Device"
+#~ msgstr "Zařízení"
diff --git a/trunk/package/luci/po/cs/openvpn.po b/trunk/package/luci/po/cs/openvpn.po
new file mode 100644
index 00000000..58cfa901
--- /dev/null
+++ b/trunk/package/luci/po/cs/openvpn.po
@@ -0,0 +1,549 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-12 19:47+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', nebo 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Přijmout nastavení, přijatá ze serveru"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid "Add route after establishing connection"
+msgstr "Přidat trasu po navázání spojení"
+
+msgid "Additional authentication over TLS"
+msgstr "Dodatečné ověření přes TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Povolit provoz typu klient-klient"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Povolit více klientů se stejným certifikátem"
+
+msgid "Allow only one session"
+msgstr "Povolit pouze jedno sezení"
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr "Maximální povolené množství připojených klientů"
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr "Maximální povolené množství nových připojení"
+
+msgid "Append log to file"
+msgstr "Připojit log do souboru"
+
+msgid "Authenticate using username/password"
+msgstr "Ověřit prostřednictvím uživatelského jména / hesla"
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr "Certifikační autorita"
+
+msgid "Change process priority"
+msgstr "Změnit prioritu procesu"
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr "Klient je zakázáný"
+
+msgid "Configuration category"
+msgstr "Konfigurace kategorie"
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr "Šifrování"
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr "Parametry Diffie Hellman"
+
+msgid "Directory for custom client config files"
+msgstr "Adresář s uživatelskými konfiguračními soubory"
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Povolit hardwarovou akceleraci OpenSSL"
+
+msgid "Enable Path MTU discovery"
+msgstr "Povolit Path MTU discovery (PMTUD)"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr "Povolit TLS a převzít roli klienta"
+
+msgid "Enable TLS and assume server role"
+msgstr "Povolit TLS a převzít roli serveru"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Povolit interní fragmentaci datagramů"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Povoleno"
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr "Instance \"%s\""
+
+msgid "Invalid"
+msgstr "Neplatné"
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr "Lokální certifikát"
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr "Lokální soukromý klíč"
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN instance"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr "Přehled"
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr "Spustit skript cmd pro připojení klienta"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Spustit skript cmd pro odpojení klienta"
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr "Služba"
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr "Velikost šifrovacího klíče"
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr "Start/Stop"
+
+msgid "Started"
+msgstr "Spuštěno"
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr "Přepnout na pokročilou konfiguraci »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr "TLS Å¡ifra"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr "ne"
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr "ano (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Přepnout na základní konfiguraci"
diff --git a/trunk/package/luci/po/cs/p2pblock.po b/trunk/package/luci/po/cs/p2pblock.po
new file mode 100644
index 00000000..02eafef4
--- /dev/null
+++ b/trunk/package/luci/po/cs/p2pblock.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-04 22:44+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "Doba blokování"
+
+msgid "Enable P2P-Block"
+msgstr "Povolit P2P-Block"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Layer7-Protokoly"
+
+msgid "P2P-Block"
+msgstr "P2P-Block"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr "Rozsah portů"
+
+msgid "Whitelisted IPs"
+msgstr "Povolené IP adresy"
+
+msgid "seconds"
+msgstr "sekundy"
diff --git a/trunk/package/luci/po/cs/p910nd.po b/trunk/package/luci/po/cs/p910nd.po
new file mode 100644
index 00000000..e4f1c71e
--- /dev/null
+++ b/trunk/package/luci/po/cs/p910nd.po
@@ -0,0 +1,49 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-20 23:28+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Obousměrný režim"
+
+msgid "Device"
+msgstr "Zařízení"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Nejprve je nutno nainstalovat balíčky přinášející podporu USB (kmod-usb-"
+"printer) či paralelního portu (kmod-lp)."
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Nastavení"
+
+msgid "Specifies the interface to listen on."
+msgstr "Specifikuje rozhraní pro naslouchání."
+
+msgid "TCP listener port."
+msgstr "Naslouchající TCP port"
+
+msgid "enable"
+msgstr "Povolit"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - tiskový server"
+
+#~ msgid "port_help"
+#~ msgstr "Nápověda pro výběr portu"
diff --git a/trunk/package/luci/po/cs/pbx-voicemail.po b/trunk/package/luci/po/cs/pbx-voicemail.po
new file mode 100644
index 00000000..6d94b352
--- /dev/null
+++ b/trunk/package/luci/po/cs/pbx-voicemail.po
@@ -0,0 +1,91 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-05 19:16+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr "Povolit Voicemail"
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr "Ne"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr "SMTP heslo"
+
+msgid "SMTP Port Number"
+msgstr "SMTP číslo portu"
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr "SMTP uživatelské jméno"
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr "Voicemail nastavení"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr "Ano"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/cs/pbx.po b/trunk/package/luci/po/cs/pbx.po
new file mode 100644
index 00000000..8b69ef15
--- /dev/null
+++ b/trunk/package/luci/po/cs/pbx.po
@@ -0,0 +1,487 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-12 20:19+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Available"
+msgstr "Dostupné"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr "Pryč"
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr "Nevyrušovat"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Povolit příchozí hovory (Registrace přes SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr "Povolit odchozí hovory"
+
+msgid "Enabled"
+msgstr "Povoleno"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr "Externí SIP port"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Celé jméno (jméno a příjmení)"
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "Google Accounts"
+msgstr "Google účty"
+
+msgid "Google Talk Status"
+msgstr "Stav Google Talk"
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Google Voice/Talk účty"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "Příchozí volání"
+
+msgid "Insert QoS Rules"
+msgstr "Vložte QoS pravidla"
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr "Ne"
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr "Odchozí volání"
+
+msgid "PBX Main Page"
+msgstr "Hlavní stránka PBX"
+
+msgid "PBX Service Status"
+msgstr "Stav PBX služby"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr "Nastavení QoS"
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr "SIP účty"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr "Stav služby"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr "Uživatelské účty"
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr "Uživatelské jméno"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "Ano"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/cs/polipo.po b/trunk/package/luci/po/cs/polipo.po
new file mode 100644
index 00000000..9fa249d5
--- /dev/null
+++ b/trunk/package/luci/po/cs/polipo.po
@@ -0,0 +1,205 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-11 19:47+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Allowed clients"
+msgstr "Povolení klienti"
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr "Konfigurace"
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Velikost prvního PMM segmentu (v bajtech)"
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr "Velikost PMM segmentů (v bajtech)"
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Stav Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr "Stav"
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr "povolit"
diff --git a/trunk/package/luci/po/cs/qos.po b/trunk/package/luci/po/cs/qos.po
new file mode 100644
index 00000000..361e4d54
--- /dev/null
+++ b/trunk/package/luci/po/cs/qos.po
@@ -0,0 +1,114 @@
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2014-06-20 23:36+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr ""
+"Snažit se zabránit zahlcení linky snížením jejího maximálního povoleného "
+"zatížení síťovým provozem"
+
+msgid "Classification Rules"
+msgstr "Klasifikační pravidla"
+
+msgid "Classification group"
+msgstr "Klasifikační skupina"
+
+msgid "Comment"
+msgstr "Komentář"
+
+msgid "Destination host"
+msgstr "Cílová adresa"
+
+msgid "Download speed (kbit/s)"
+msgstr "Rychlost stahování dat (kbit/s)"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Half-duplex"
+msgstr "Poloviční duplex"
+
+msgid "Interfaces"
+msgstr "Síťová rozhraní"
+
+msgid "Number of bytes"
+msgstr "Počet bajtů"
+
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Quality of Service"
+
+msgid "Service"
+msgstr "Služba"
+
+msgid "Source host"
+msgstr "Zdrojová adresa"
+
+msgid "Target"
+msgstr "Cílová třída priority"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Rychlost odesílání dat (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Pomocí služby \"<abbr title=\"Quality of Service\">QoS</abbr>\" můžete "
+"nastavit prioritu síťového provozu na základě specifikace adres, portů či "
+"služeb."
+
+msgid "all"
+msgstr "vše"
+
+msgid "default"
+msgstr "výchozí"
+
+msgid "express"
+msgstr "nejvyšší priorita (velké rámce)"
+
+msgid "low"
+msgstr "nízká priorita"
+
+msgid "normal"
+msgstr "normální priorita"
+
+msgid "priority"
+msgstr "nejvyšší priorita (malé rámce)"
+
+#~ msgid "Downlink"
+#~ msgstr "Stahování"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Připojení k internetu"
+
+#~ msgid "Uplink"
+#~ msgstr "Odesílání"
+
+#, fuzzy
+#~ msgid "allf"
+#~ msgstr "allf"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "qos_connbytes"
diff --git a/trunk/package/luci/po/cs/radvd.po b/trunk/package/luci/po/cs/radvd.po
new file mode 100644
index 00000000..ab4e4af5
--- /dev/null
+++ b/trunk/package/luci/po/cs/radvd.po
@@ -0,0 +1,389 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-04 19:04+0200\n"
+"Last-Translator: KubaCZ <kuba.turek@centrum.cz>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "6to4 interface"
+msgstr "6to4 rozhraní"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "Addresses"
+msgstr "Adresy"
+
+msgid "Advanced"
+msgstr "Pokročilé"
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr "Oznamovat adresu routeru"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Oznamované doménové přípony"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Oznamované IPv6 RDNSS. Pokud prázdné, bude použita stávající IPv6 adresa "
+"rozhraní."
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Oznamované IPv6 prefixy"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Oznamované IPv6 prefixy. Pokud prázdné, bude použit stávající prefix na "
+"rozhraní."
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Oznamovaná doba za kterou by sousední stroje měly být dosažitelné. 0 znamená "
+"neoznamovat."
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Oznamovaný výchozí počet hopů pro odchozí unicast pakety. 0 vypne oznamování "
+"počtu hopů."
+
+msgid "Advertises the default router preference"
+msgstr "Oznamovaný preferovaný router."
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr "Oznamovat MTU linky. 0 vypne oznamování MTU."
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+"Oznamovaný počet sekund po kterých adresa generovaná z prefixu bezestavové "
+"konfigurace zůstává preferovaná."
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+"Oznamovaný počet sekund po kterou je prefix validní pro potřeby zjištění "
+"stavu on-link/off-link."
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+"Oznamovaný počet sekund k vypršení platnosti preference routeru. 0 zančí že "
+"není žádný router preferován."
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+"Oznamovaný počet sekund k vypršení nabízení služeb Mobile IPv6 Home Agenta"
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+"Oznamovaný počet milisekund mezi Neighbor Solicitation zprávamy. 0 vypne "
+"oznamování."
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr "Autonomní"
+
+msgid "Clients"
+msgstr "Klienti"
+
+msgid "Configuration flag"
+msgstr "Konfigurační volba"
+
+msgid "Current hop limit"
+msgstr "Aktuální limit počtu hopů"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Konfigurace DNSSL"
+
+msgid "Default lifetime"
+msgstr "Výchozí časový limit"
+
+msgid "Default preference"
+msgstr "Výchozí preference"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Enable advertisements"
+msgstr "Povolit oznamování"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Povolí oznamování routeru a hledání sousedů"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+"Povolí přídavný stavový administrovaný autokonfigurační protokol (RFC2462)"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr "Povolí autokonfiguraci přídavného, neadresních informací (RFC2462)"
+
+msgid "General"
+msgstr "Obecné"
+
+msgid "Home Agent information"
+msgstr "Informace Home Agenta"
+
+msgid "Home Agent lifetime"
+msgstr "Časový limit Home Agenta"
+
+msgid "Home Agent preference"
+msgstr "Preferovaný Home Agent"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "Zahrnout informace o Home Agentovi v oznámeních"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid "Interface Configuration"
+msgstr "Konfigurace rozhraní"
+
+msgid "Interface required"
+msgstr "Rozhraní vyžadováno"
+
+msgid "Interfaces"
+msgstr "Rozhraní"
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr "Max. interval"
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr "Multicast"
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Prefix Configuration"
+msgstr "Nastavení prefixu"
+
+msgid "Prefixes"
+msgstr "Prefixy"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "Konfigurace RDNSS"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - rozhraní %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Prefix"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Route"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr "Dostupný čas"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr "Trasy"
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr "Suffix"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr "Načasování"
+
+msgid "Unicast only"
+msgstr "Pouze unicast"
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr "Doba platnosti"
+
+msgid "default"
+msgstr "výchozí"
+
+msgid "high"
+msgstr "vysoká"
+
+msgid "low"
+msgstr "nízká"
+
+msgid "medium"
+msgstr "střední"
+
+msgid "no"
+msgstr "ne"
+
+# ano
+msgid "yes"
+msgstr "ano"
diff --git a/trunk/package/luci/po/cs/rrdtool.po b/trunk/package/luci/po/cs/rrdtool.po
new file mode 100644
index 00000000..e6149eca
--- /dev/null
+++ b/trunk/package/luci/po/cs/rrdtool.po
@@ -0,0 +1,359 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-12 20:35+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "Bezdrátová síť - Úroveň šumu"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Úroveň šumu"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Síla signálu"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Wireless - kvalita signálu"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Kvalita signálu"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: ICMP časy odezvy"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Firewall - zpracované pakety"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pakety/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Řetěz \\\"%di\\\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - přenos na %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bajty/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bajty (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - pakety na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Pakety/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Zpracováno (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Zahozeno (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Chyby (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - multicast na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pakety/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Pakety"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - kolize na %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Kolize/s"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Kolize"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - chyby na %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Chyby/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Procesy"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Procesy/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Proces %pi - čas využití CPU"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "systém"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "uživatel"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Proces %pi - vlákna a procesy"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Počet"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Process %pi - chyby stránkování"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Chyby stránkování"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "chyby stránkování"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Proces %pi - velikost virtuální paměti"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bajty"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "virtuální paměť"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Vytížení procesoru #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Přenos na %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bajty/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Pakety na %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pakety/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: TCP-spojení na portu %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Spojení/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Využití diskového prostoru na %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bajty"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Přerušení"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Problémy/s"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H Zatížení systému"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Zatížení"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 min"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 min"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 min"
diff --git a/trunk/package/luci/po/cs/samba.po b/trunk/package/luci/po/cs/samba.po
new file mode 100644
index 00000000..fefb7ff8
--- /dev/null
+++ b/trunk/package/luci/po/cs/samba.po
@@ -0,0 +1,83 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-31 13:56+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Povolení hosté"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Povoluje systémovým uživatelům přístup do jejich domácích adresářů skrze "
+"sdílení přes síť."
+
+msgid "Allowed users"
+msgstr "Povolení uživatelé"
+
+msgid "Create mask"
+msgstr "Vytvořit masku"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid "Directory mask"
+msgstr "Maska adresáře"
+
+msgid "Edit Template"
+msgstr "Editovat Å¡ablonu"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Editovat šablonu, která je použita pro generování konfiguračního souboru pro "
+"sambu."
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "Hostname"
+msgstr "Název počítače."
+
+msgid "Mask for new directories"
+msgstr "Maska pro nové adresáře"
+
+msgid "Mask for new files"
+msgstr "Maska pro nové soubory"
+
+msgid "Name"
+msgstr "Jméno"
+
+msgid "Network Shares"
+msgstr "Síťová sdílení"
+
+msgid "Path"
+msgstr "Cesta"
+
+msgid "Read-only"
+msgstr "Pouze pro čtení"
+
+msgid "Share home-directories"
+msgstr "Sdílet domácí adresáře"
+
+msgid "Shared Directories"
+msgstr "Sdílené adresáře"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Toto je obsah souboru \"/etc/samba/smb.conf.template\", ze kterého je "
+"konfigurace samby generována. Hodnoty uzavřené rourou (\"|\"), by se neměly "
+"měnit. Tyto hodnoty jsou brány ze záložky \"Obecná nastavení\"."
+
+msgid "Workgroup"
+msgstr "Skupina"
diff --git a/trunk/package/luci/po/cs/splash.po b/trunk/package/luci/po/cs/splash.po
new file mode 100644
index 00000000..671afd79
--- /dev/null
+++ b/trunk/package/luci/po/cs/splash.po
@@ -0,0 +1,340 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-04 19:05+0200\n"
+"Last-Translator: KubaCZ <kuba.turek@centrum.cz>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Přijmout"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"Přístup k Internetu může být možný, nicméně pouze proto, že někteří "
+"aktivisté tohoto projektu sdílí jejich soukromé Internetové připojení. "
+"Těchto několik spojení je sdíleno mezi všemi uživateli. Z toho plyne, že "
+"dostupná šířka pásma je omezená a z tohoto důvodu vás žádáme, abyste "
+"nedělali žádné z následujících věcí:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr "Aktivní klienti"
+
+msgid "Allowed hosts/subnets"
+msgstr "Povolení hostitelé/podsítě"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+"Kromě možnosti vytvořit celý vlastní text místo textu výše také můžete jen "
+"jako doplněk připojit svůj text jeho napsáním sem."
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"Limit šířky pásma pro klienty je aktivován pouze v případě, že oba limity "
+"(upload a download) jsou nastaveny. Hodnotou 0 úplně vypnete toto omezení. "
+"Klienti na whitelistu nejsou omezeni."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+"Staňte se aktivním členem této komunity a přispějte provozováním vlastního "
+"uzlu"
+
+msgid "Blacklist"
+msgstr "Blacklist"
+
+msgid "Blocked"
+msgstr "Zablokovaný"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+#, fuzzy
+msgid "Client-Splash"
+msgstr "Client-Splash"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr "Rychlost stahování je pro klienty omezena na tuto hodnotu (kbyte/s)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr "Rychlost nahrávání je pro klienty omezena na tuto hodnotu (kbyte/s)"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Decline"
+msgstr "Odmítnout"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "Darováním peněz nám pomůžete udržet tento projekt naživu"
+
+msgid "Download limit"
+msgstr "Limit stahování"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr "Fair Use Policy"
+
+msgid "Firewall zone"
+msgstr "Zóna firewallu"
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Rozhraní"
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"KB/s (Stahování/Nahrávání). Aktivním přispíváním tomuto projektu můžete moci "
+"odebrat tento limit."
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "MAC adresa"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "MAC adresy v tomto seznamu jsou blokovány"
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"Mac adresy klientů na whitelistu. Tito nemusí přijímat splash a nejsou "
+"omezeni šířkou pásma."
+
+msgid "Netmask"
+msgstr "Síťová maska"
+
+msgid "Network"
+msgstr "Síť"
+
+msgid "No clients connected"
+msgstr "Žádní klienti nejsou připojeni"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Vezměte prosím na vědomí, že nejsme žádní ISP, ale experimentální komunitní "
+"síť."
+
+msgid "Policy"
+msgstr "Politika"
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr "Bezpečnost"
+
+msgid "Save"
+msgstr "Uložit"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr "Zbývající čas"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Pokud se chcete zeptat, proč jste byli zablokováni nebo jak získat zpět "
+"přístup, můžete se pokusit kontaktovat vlastníka tohoto přístupového bodu:"
+
+msgid "Traffic in/out"
+msgstr "Provoz dovnitř/ven"
+
+msgid "Upload limit"
+msgstr "Limit nahrávání"
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr "Vítejte"
+
+msgid "Whitelist"
+msgstr "Whitelist"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"Sem můžete vložit text, který se zobrazí klientům.<br />Můžete použít tyto "
+"značky: ###COMMUNITY###, ###COMMUNITY_URL###, ###CONTACTURL###, "
+"###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"Váš přístup do této sítě byl zablokován, nejspíše jste udělal něco, co naše "
+"pravidla výslovně zakazují."
+
+msgid "Your bandwidth is limited to"
+msgstr "Vaše šířka pásma je omezena na"
+
+msgid "blacklisted"
+msgstr "na černé listině"
+
+msgid "expired"
+msgstr "prošlý"
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr "provádět nějaký z druhů nelegálních činností"
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr "dočasně zablokován"
+
+msgid "unknown"
+msgstr "neznámý"
+
+msgid "use filesharing applications on this network"
+msgstr "používat aplikace na sdílení souborů v této síti"
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "plýtvat šířkou pásma nepotřebným stahováním nebo streamy"
+
+msgid "whitelisted"
+msgstr "na bílé listině"
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "Přijmutím těchto pravidel můžete začít používat tuto síť pro"
+
+#~ msgid "hour(s). After this time you need to accept these rules again."
+#~ msgstr "hodin. Po uplynutí této doby musíte přijmout pravidla znovu."
+
+#~ msgid "the owner of this access point."
+#~ msgstr "vlastník tohoto přístupového bodu."
diff --git a/trunk/package/luci/po/cs/statistics.po b/trunk/package/luci/po/cs/statistics.po
new file mode 100644
index 00000000..af690465
--- /dev/null
+++ b/trunk/package/luci/po/cs/statistics.po
@@ -0,0 +1,688 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-21 17:44+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Akce (cíl)"
+
+msgid "Add command for reading values"
+msgstr "Přidat příkaz pro čtení hodnot"
+
+msgid "Add matching rule"
+msgstr "Přidat pravidlo pro výběr"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Přidat více hostů, oddělených mezerou"
+
+msgid "Add notification command"
+msgstr "Přidat příkaz pro upozornění"
+
+msgid "Base Directory"
+msgstr "Základní adresář"
+
+msgid "Basic monitoring"
+msgstr "Základní sledování"
+
+msgid "CPU Plugin Configuration"
+msgstr "Nastavení CPU pluginu"
+
+msgid "CSV Output"
+msgstr "CSV výstup"
+
+msgid "CSV Plugin Configuration"
+msgstr "Nastavení CSV pluginu"
+
+msgid "Cache collected data for"
+msgstr "Mezipamět pro ukládání dat"
+
+msgid "Cache flush interval"
+msgstr "Interval vyprazdňování mezipaměti"
+
+msgid "Chain"
+msgstr "Řetěz"
+
+msgid "CollectLinks"
+msgstr "CollectLinks"
+
+msgid "CollectRoutes"
+msgstr "CollectRoutes"
+
+msgid "CollectTopology"
+msgstr "CollectTopology"
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Nastavení Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd je malý daemon pro shromažďování dat z nejrůznějších zdrojů zkrz "
+"rozdílné pluginy. Na této stránce můžete změnit obecná nastavení daemonu "
+"collectd."
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Nastavení pluginu Conntrack"
+
+msgid "DF Plugin Configuration"
+msgstr "Nastavení pluginu DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Nastavení DNS pluginu"
+
+msgid "Data collection interval"
+msgstr "Interval sběru dat"
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr "Rozsah cílových IP adres"
+
+msgid "Directory for collectd plugins"
+msgstr "Adresář s pluginy pro collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Adresář pro pod-nastavení"
+
+msgid "Disk Plugin Configuration"
+msgstr "Nastavení Disk pluginu"
+
+msgid "Disk Space Usage"
+msgstr "Využití místa na disku"
+
+msgid "Disk Usage"
+msgstr "Využití disku"
+
+msgid "Display Host »"
+msgstr "Zobrazit hostitele »"
+
+msgid "Display timespan »"
+msgstr "Zobrazit časové rozpětí »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Nastavení E-Mail pluginu"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable this plugin"
+msgstr "Povolit tento plugin"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Nastavení pluginu Exec"
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Vyprázdnit cache po"
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr "Grafy"
+
+msgid "Group"
+msgstr "Skupina"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Zde můžete nastavit externí příkazy, které budou spuštěny v tomto pořadí "
+"daemonem collectd. Ze standardního výstupu příkazů vezme collectd potřebné "
+"hodnoty."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Zde můžete definovat různá kritéria, podle kterých budou vybrána sledovaná "
+"pravidla iptables."
+
+msgid "Host"
+msgstr "Hostitel"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr "IP nebo hostname, odkud získat txtinfo výstup"
+
+msgid "IRQ Plugin Configuration"
+msgstr "Nastavení IRQ pluginu"
+
+msgid "Ignore source addresses"
+msgstr "Ignorovat zdrojové adresy"
+
+msgid "Incoming interface"
+msgstr "Příchozí rozhraní"
+
+msgid "Interface Plugin Configuration"
+msgstr "Nastavení Interface pluginu"
+
+msgid "Interfaces"
+msgstr "Rozhraní"
+
+msgid "Interrupts"
+msgstr "Přerušení"
+
+msgid "Interval for pings"
+msgstr "Interval pro ping"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Nastavení Iptables pluginu"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Pokud nic nevyberete, rozhraní pro monitoring budou určena automaticky."
+
+msgid "Listen host"
+msgstr "Naslouchající hostitel"
+
+msgid "Listen port"
+msgstr "Naslouchající port"
+
+msgid "Listener interfaces"
+msgstr "Rozhraní naslouchajícího"
+
+msgid "Load Plugin Configuration"
+msgstr "Načíst nastavení pluginů"
+
+msgid "Maximum allowed connections"
+msgstr "Maximální množství povolených spojení"
+
+msgid "Memory"
+msgstr "Paměť"
+
+msgid "Memory Plugin Configuration"
+msgstr "Nastavení pluginu Memory (Paměť)"
+
+msgid "Monitor all except specified"
+msgstr "Sledovat vše kromě vybraných"
+
+msgid "Monitor all local listen ports"
+msgstr "Monitorovat všechny naslouchající porty"
+
+msgid "Monitor devices"
+msgstr "Sledovat zařízení"
+
+msgid "Monitor disks and partitions"
+msgstr "Sledovat disky a oddíly"
+
+msgid "Monitor filesystem types"
+msgstr "Sledovat typy souborových systémů"
+
+msgid "Monitor hosts"
+msgstr "Sledovat hostitele"
+
+msgid "Monitor interfaces"
+msgstr "Sledovat rozhraní"
+
+msgid "Monitor interrupts"
+msgstr "Sledovat přerušení"
+
+msgid "Monitor local ports"
+msgstr "Sledovat místní porty"
+
+msgid "Monitor mount points"
+msgstr "Sledovat přípojné body"
+
+msgid "Monitor processes"
+msgstr "Sledovat procesy"
+
+msgid "Monitor remote ports"
+msgstr "Sledovat vzdálené porty"
+
+msgid "Name of the rule"
+msgstr "Název pravidla"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Nastavení pluginu Netlink"
+
+msgid "Network"
+msgstr "Síť"
+
+msgid "Network Plugin Configuration"
+msgstr "Nastavení pluginu Síť"
+
+msgid "Network plugins"
+msgstr "Síťové pluginy"
+
+msgid "Network protocol"
+msgstr "Síťový protokol"
+
+msgid "Number of threads for data collection"
+msgstr "Počet vláken pro sběr dat"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "Nastavení pluginu OLSRd"
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr "Možnosti"
+
+msgid "Outgoing interface"
+msgstr "Odchozí rozhraní"
+
+msgid "Output plugins"
+msgstr "Výstupní pluginy"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Nastavení pluginu Ping"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Processes"
+msgstr "Procesy"
+
+msgid "Processes Plugin Configuration"
+msgstr "Nastavení pluginu Procesy"
+
+msgid "Processes to monitor separated by space"
+msgstr "Sledované procesy (oddělte mezerou)"
+
+msgid "Processor"
+msgstr "Procesor"
+
+msgid "Qdisc monitoring"
+msgstr "Sledování Qdisc"
+
+#, fuzzy
+msgid "RRD XFiles Factor"
+msgstr "RRD XFiles Factor"
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Nastavení pluginu RRDTool"
+
+msgid "Rows per RRA"
+msgstr "Řádky na jeden RRA"
+
+msgid "Script"
+msgstr "Skript"
+
+msgid "Seconds"
+msgstr "Sekundy"
+
+msgid "Server host"
+msgstr "Hostitel serveru"
+
+msgid "Server port"
+msgstr "Port serveru"
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr "Soubor socketu"
+
+msgid "Socket group"
+msgstr "Skupina socketů"
+
+msgid "Socket permissions"
+msgstr "Oprávnění socketu"
+
+msgid "Source ip range"
+msgstr "Rozsah zdrojových IP"
+
+msgid "Specifies what information to collect about links."
+msgstr "Určuje, jaké informace sbírat o odkazech."
+
+msgid "Specifies what information to collect about routes."
+msgstr "Určuje, jaké informace sbírat o cestách"
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "Určuje, jaké informace sbírat o globální topologii"
+
+msgid "Statistics"
+msgstr "Statistiky"
+
+msgid "Storage directory"
+msgstr "Úložný adresář"
+
+msgid "Storage directory for the csv files"
+msgstr "Úložný adresář pro soubory CSV"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Ukládat data jako poměrné hodnoty místo absolutních"
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr "Zatížení systému"
+
+msgid "System plugins"
+msgstr "Systémové pluginy"
+
+msgid "TCP Connections"
+msgstr "TCP spojení"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Nastavení pluginu TCPConns"
+
+msgid "TTL for network packets"
+msgstr "TTL pro síťové pakety"
+
+msgid "TTL for ping packets"
+msgstr "TTL pro pakety pingu"
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr "Plugin Conntrack shromažďuje statistiky o počtu sledovaných spojení."
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "Plugin CPU shromažďuje základní statistiky o vytížení procesoru."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"Plugin CSV ukládá shromážděná data ve formátu CSV. Data mohou být později "
+"zpracována externími programy."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"Plugin DF shromažďuje statistiky o využití diskového prostoru na různých "
+"zařízeních, přípojných bodech nebo typech souborových systémů."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"Plugin Disk shromažďuje podrobné statistiky o využívání vybraného oddílu "
+"nebo celého disku."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"Plugin DNS shromažďuje podrobné statistky o provozu, vztahující se k DNS, na "
+"vybraných rozhraních."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"Plugin Email vytváří unixový socket, které může být využit pro odeslání "
+"statistik o emailu běžícímu daemonu collectd. Plugin je primárně určen pro "
+"použití ve spojení s Mail::SpamAssasin::Plugin::Collectd, ale stejně dobře "
+"může být využit jinak."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"Plugin Interface shromažďuje statistiky o provozu na vybraných rozhraních."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"Plugin Iptables monitoruje vybraná pravidla firewallu a shromažďuje "
+"informace o zpracovaných bajtech a paketech pro každé pravidlo."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"Plugin IRQ monitoruje množství požadavků na přerušení pro každé vybrané "
+"přerušení. Pokud není vybráno žádné přerušení, jsou monitorována všechna."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"Plugin Iwinfo shromažďuje statistiky o síle, šumu a kvalitě bezdrátového "
+"signálu."
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "Plugin Load shromažďuje statistiky o obecné zátěži systému."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "Plugin Memory shromažďuje statistiky o využití paměti."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"Plugin Netlink shromažďuje rozšířené informace jako statistiky qdisk, class "
+"a filtru pro vybraná rozhraní."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"Plugin Network poskytuje síťovou komunikaci mezi různými instancemi daemonu "
+"collectd. Collectd může pracovat v režimu klienta i serveru. V režimu "
+"klienta jsou lokálně shromažďovaná data odeslána instanci serveru, jako "
+"server naopak collectd přijímá data z ostatních hostitelů."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"Plugin Ping bude odesílat ICMP echo odpovědi vybraným hostům a měřit "
+"zpáteční čas pro každého hosta."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"Plugin Processes shromažďuje informace o procesorovém času, výpadcích "
+"stránky a využití paměti vybranými programy."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"Plugin Rrdtool ukládá shromažďená data v souborech databáze RRD.<br /><br /"
+"><strong>Varování: Nastavení špatných hodnot bude mít za následek velkou "
+"spotřebu paměti v dočasném adresáří. Zařízení ze tak může stát nepoužitelným!"
+"</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Balíček Statistiky je založen na <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> a využívá <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> pro kreslení diagramů z collectd."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"Plugin Tcpconns shromažďuje informace o otevřených TCP spojeních na "
+"vybraných portech."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"Plugin Unixsock vytváří unixový socket, které může být využit pro čtení dat "
+"z běžící instance collectd."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Tato sekce určuje, na kterých rozhraních bude collectd čekat na příchozí "
+"spojení."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr "Tato sekce určuje, na které servery budou odeslána shromážděná data."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr "UPS"
+
+msgid "UPS Plugin Configuration"
+msgstr "Konfigurace pluginu UPS"
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Konfigurace pluginu Unixsock"
+
+msgid "Used PID file"
+msgstr "Použitý soubor PID (identifikátoru procesu)"
+
+msgid "User"
+msgstr "Uživatel"
+
+msgid "Verbose monitoring"
+msgstr "Podrobný monitoring"
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "Nastavení pluginu Wireless Iwinfo"
+
+msgid "e.g. br-ff"
+msgstr "např. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "např. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "např. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "max. 16 znaků"
+
+msgid "reduces rrd size"
+msgstr "redukovaná velikost rrd"
+
+msgid "seconds; multiple separated by space"
+msgstr "sekundy, více hodnot oddělených mezerou"
+
+msgid "server interfaces"
+msgstr "rozhraní serveru"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Instalované síťové pluginy:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Instalované výstupní pluginy:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "Síťové pluginy jsou používány pro shromažďování informací o otevřených tcp "
+#~ "spojeních, provozu na rozhraní, pravidel iptables atd."
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "Výstupní pluginy poskytují různé možnosti ukládání sesbíraných dat. Plugin "
+#~ "je možné v jeden okamžik povolit vícekrát , například pro ukládání dat do "
+#~ "rrd databází a předávání dat po síti jiným instancím daemonu collectd."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr ""
+#~ "Systémové pluginy, shromažďující hodnoty o systémovém stavu a zdrojích, "
+#~ "používaných zařízením:"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "Plugin Wireless shromažďuje statistiky o síle, šumu a kvalitě bezdrátového "
+#~ "signálu."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Nastavení pluginu Wireless"
diff --git a/trunk/package/luci/po/cs/tinyproxy.po b/trunk/package/luci/po/cs/tinyproxy.po
new file mode 100644
index 00000000..2a2cbdc8
--- /dev/null
+++ b/trunk/package/luci/po/cs/tinyproxy.po
@@ -0,0 +1,258 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-12 20:14+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Konfigurace"
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr "Povolit server Tinyproxy"
+
+msgid "Error page"
+msgstr "Chybová stránka"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr "Filtrovat podle RegExp"
+
+msgid "Filter by URLs"
+msgstr "Filtrovat podle URL adres"
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr "Obecné nastavení"
+
+msgid "Group"
+msgstr "Skupina"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr "Max. klientů"
+
+msgid "Max. requests per server"
+msgstr "Max. žádostí na server"
+
+msgid "Max. spare servers"
+msgstr "Max. záložních serverů"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr "Min. záložních serverů"
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr "Politika"
+
+msgid "Privacy settings"
+msgstr "Nastavení soukromí"
+
+msgid "Reject access"
+msgstr "Odepřít přístup"
+
+msgid "Server Settings"
+msgstr "Nastavení serveru"
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr "Stránka statistik"
+
+msgid "Status"
+msgstr "Stav"
+
+msgid "Target host"
+msgstr "Cílový hostitel"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Stav Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy je malý a rychlý necachující HTTP(S)-Proxy server"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr "Použít syslog"
+
+msgid "User"
+msgstr "Uživatel"
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr "X-Tinyproxy hlavička"
diff --git a/trunk/package/luci/po/cs/transmission.po b/trunk/package/luci/po/cs/transmission.po
new file mode 100644
index 00000000..b6166ec0
--- /dev/null
+++ b/trunk/package/luci/po/cs/transmission.po
@@ -0,0 +1,295 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-06 17:54+0200\n"
+"Last-Translator: koli <lukas.koluch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Alternativní rychlost download"
+
+msgid "Alternative speed enabled"
+msgstr "Povolit alternativní rychlost"
+
+msgid "Alternative speed time begin"
+msgstr "Začátek doby alternativní rychlosti"
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr "Konec doby alternativní rychlosti"
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr "Alternativní rychlost uploadu"
+
+msgid "Automatically start added torrents"
+msgstr "Automaticky začít stahovat nové torrenty"
+
+msgid "Bandwidth settings"
+msgstr "Nastavení přenosové rychlosti"
+
+msgid "Binding address IPv4"
+msgstr "Svázání s IPv4 adresou"
+
+msgid "Binding address IPv6"
+msgstr "Svázání s IPv6 adresou"
+
+msgid "Block list enabled"
+msgstr "Povolit černou listinu"
+
+msgid "Blocklist URL"
+msgstr "URL černé listiny"
+
+msgid "Blocklists"
+msgstr "Černé listiny"
+
+msgid "Cache size in MB"
+msgstr "Velikost mezipaměti v MB"
+
+msgid "Config file directory"
+msgstr "Složka pro uložení konfiguračního souboru"
+
+msgid "DHT enabled"
+msgstr "Povolit DHT"
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "Download directory"
+msgstr "Adresář pro stahované"
+
+msgid "Download queue enabled"
+msgstr "Povolit stahovací frontu"
+
+msgid "Download queue size"
+msgstr "Velikost stahovací fronty"
+
+msgid "Enable watch directory"
+msgstr "Povolit sledování složky"
+
+msgid "Enabled"
+msgstr "Povolit"
+
+msgid "Encryption"
+msgstr "Šifrování"
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Fast"
+msgstr "Rychlá"
+
+msgid "Files and Locations"
+msgstr "Soubory a umístění"
+
+msgid "Forced"
+msgstr "Vynucené"
+
+msgid "Full"
+msgstr "Plná"
+
+msgid "Global peer limit"
+msgstr "Globální peer limit"
+
+msgid "Global settings"
+msgstr "Globální nastavení"
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr "Složka pro nedokončená stahování"
+
+msgid "Incomplete directory enabled"
+msgstr "Povolit složku pro nedokončená stahování"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "LPD enabled"
+msgstr "Povolit LPD"
+
+msgid "Lazy bitfield enabled"
+msgstr "Povolit lazy bitfield"
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr "Ostatní"
+
+msgid "None"
+msgstr "Žádný"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr "Vypnuta"
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr "Povolit PEX"
+
+msgid "Peer Port settings"
+msgstr "Nastavení peer portu"
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr "Peer limit na torrent"
+
+msgid "Peer port"
+msgstr "Peer port"
+
+msgid "Peer port random high"
+msgstr "Peer port náhodný nejvyšší"
+
+msgid "Peer port random low"
+msgstr "Peer port náhodný nejnižší"
+
+msgid "Peer port random on start"
+msgstr "Náhodný peer port při startu"
+
+msgid "Peer settings"
+msgstr "Nastavení peer"
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr "Povolit port forwarding"
+
+msgid "Preferred"
+msgstr "Preferované"
+
+msgid "Prefetch enabled"
+msgstr "Povolit přednačítání"
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr "RPC URL"
+
+msgid "RPC authentication required"
+msgstr "RPC ověřování vyžadováno"
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr "Povolit RPC"
+
+msgid "RPC password"
+msgstr "RPC heslo"
+
+msgid "RPC port"
+msgstr "RPC port"
+
+msgid "RPC settings"
+msgstr "Nastavení RPC"
+
+msgid "RPC username"
+msgstr "Uživatelské jméno RPC"
+
+msgid "RPC whitelist"
+msgstr "RPC whitelist"
+
+msgid "RPC whitelist enabled"
+msgstr "Povolit RPC whitelist"
+
+msgid "Ratio limit"
+msgstr "Ratio limit"
+
+msgid "Ratio limit enabled"
+msgstr "Povolit ratio limit"
+
+msgid "Rename partial files"
+msgstr "Přejmenovat dílčí soubory"
+
+msgid "Run daemon as user"
+msgstr "Spustit daemona jako uživatel"
+
+msgid "Scheduling"
+msgstr "Plánování"
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr "Povolit seed frontu"
+
+msgid "Seed queue size"
+msgstr "Velikost seed fronty"
+
+msgid "Speed limit down"
+msgstr "Rychlostní limit downloadu"
+
+msgid "Speed limit down enabled"
+msgstr "Povolit rychlostní limit downloadu"
+
+msgid "Speed limit up"
+msgstr "Rychlostní limit uploadu"
+
+msgid "Speed limit up enabled"
+msgstr "Povolit rychlostní limit uploadu"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"Transmission daemon je jednoduchý BitTorrent klient, zde můžete provést jeho "
+"nastavení."
+
+msgid "Trash original torrent files"
+msgstr "Odstranit původní torrent soubory"
+
+msgid "Upload slots per torrent"
+msgstr "Upload sloty na torrent"
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr "v minutách od půlnoci"
+
+msgid "preallocation"
+msgstr "prealokace"
+
+msgid "uTP enabled"
+msgstr "Povolit uTP"
diff --git a/trunk/package/luci/po/cs/upnp.po b/trunk/package/luci/po/cs/upnp.po
new file mode 100644
index 00000000..a712f826
--- /dev/null
+++ b/trunk/package/luci/po/cs/upnp.po
@@ -0,0 +1,150 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-29 21:54+0200\n"
+"Last-Translator: Astran <martin.hromadko@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"ACL stanovují, které vnější porty by měly být přesměrovány na které vnitřní "
+"adresy a porty"
+
+msgid "Action"
+msgstr "Akce"
+
+msgid "Active UPnP Redirects"
+msgstr "Aktivní přesměrování UPnP"
+
+msgid "Advanced Settings"
+msgstr "Pokročilé nastavení"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Povolit přesměrování pouze na dotazující ip adresy"
+
+msgid "Announced model number"
+msgstr "Oznámené číslo modelu"
+
+msgid "Announced serial number"
+msgstr "Oznámené sériové číslo"
+
+msgid "Clean rules interval"
+msgstr "Interval čištění pravidel"
+
+msgid "Clean rules threshold"
+msgstr "Práh čištění pravidel"
+
+msgid "Client Address"
+msgstr "Adresa klienta"
+
+msgid "Client Port"
+msgstr "Port klienta"
+
+msgid "Collecting data..."
+msgstr "Probíhá sběr dat.."
+
+msgid "Comment"
+msgstr "Komentář"
+
+msgid "Delete Redirect"
+msgstr "Odstranit přesměrování"
+
+msgid "Device UUID"
+msgstr "UUID zařízení"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Povolit funkčnost NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Povolit funkčnost UPnP"
+
+msgid "Enable additional logging"
+msgstr "Povolit přídavné logování"
+
+msgid "Enable secure mode"
+msgstr "Povolit bezpečný režim"
+
+msgid "External Port"
+msgstr "Vnější port"
+
+msgid "External ports"
+msgstr "Vnější porty"
+
+msgid "General Settings"
+msgstr "Obecné nastavení"
+
+msgid "Internal addresses"
+msgstr "Vnitřní adresy"
+
+msgid "Internal ports"
+msgstr "Vnitřní porty"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP ACL listy"
+
+msgid "MiniUPnP settings"
+msgstr "Nastavení MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Interval oznamování"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr "Prezentace URL"
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Vypisovat extra ladící informace do systémového záznamu"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Hlásit uptime systému namísto uptime daemonu"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Spustit službu UPnP a NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Nejsou zde žádná aktivní přesměrování"
+
+msgid "UPNP"
+msgstr "UPNP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP umožňuje klientům v místní síti automaticky nakonfigurovat router."
+
+msgid "UPnP lease file"
+msgstr "Soubor UPnP výpůjček"
+
+msgid "Universal Plug & Play"
+msgstr "Univerzální Plug & Play"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Pouze informační hodnoty (v KByte/s)"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr "UPnP umožňuje klientům v místní síti automaticky nakonfigurovat router."
+
+#~ msgid "enable"
+#~ msgstr "povolit"
diff --git a/trunk/package/luci/po/cs/ushare.po b/trunk/package/luci/po/cs/ushare.po
new file mode 100644
index 00000000..d908e91e
--- /dev/null
+++ b/trunk/package/luci/po/cs/ushare.po
@@ -0,0 +1,53 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-29 21:49+0200\n"
+"Last-Translator: Astran <martin.hromadko@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Složky s obsahem"
+
+msgid "Disable telnet console"
+msgstr "Zakázat telnet konzoli"
+
+msgid "Disable webinterface"
+msgstr "Zakázat webové rozhraní"
+
+msgid "Enable"
+msgstr "Povolit"
+
+msgid "Interface"
+msgstr "Rozhraní"
+
+msgid "Options"
+msgstr "Možnosti"
+
+msgid "Servername"
+msgstr "Název serveru"
+
+msgid "Settings"
+msgstr "Nastavení"
+
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare je UPnP (TM) A/V & DLNA Media Server. Implementuje součást serveru, "
+"který poskytuje UPnP mediální zařízení s informacemi o dostupných "
+"multimediálních souborech."
diff --git a/trunk/package/luci/po/cs/uvc_streamer.po b/trunk/package/luci/po/cs/uvc_streamer.po
new file mode 100644
index 00000000..2a53342d
--- /dev/null
+++ b/trunk/package/luci/po/cs/uvc_streamer.po
@@ -0,0 +1,44 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-24 14:51+0200\n"
+"Last-Translator: awm1 <awm1klimes8vladimir@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Počet snímků za sekundu"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Rozlišení"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Nastavení"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Stream z webkamery"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Toto menu umožňuje konfiguraci připojených webkamer kompatibilních s UVC. "
+"Videostream je dostupný přes webový prohlížeč na síťové adrese routeru, "
+"např. <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/cs/vnstat.po b/trunk/package/luci/po/cs/vnstat.po
new file mode 100644
index 00000000..48183741
--- /dev/null
+++ b/trunk/package/luci/po/cs/vnstat.po
@@ -0,0 +1,64 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Configuration"
+msgstr "Konfigurace"
+
+msgid "Daily traffic"
+msgstr "Denní přenos"
+
+msgid "Graphs"
+msgstr "Grafy"
+
+msgid "Hourly traffic"
+msgstr "Hodinový přenos"
+
+msgid "Monitor selected interfaces"
+msgstr "Sledovat vybraná zařízení"
+
+msgid "Monthly traffic"
+msgstr "Měsíční přenos"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Zatím nebyla nastavena žádná databáze. Přejděte na konfiguraci VnStatu a "
+"povolnet sledování jednoho nebo více zařízení."
+
+msgid "Restart VnStat"
+msgstr "Restartovat VnStat"
+
+msgid "Summary display"
+msgstr "Souhrn"
+
+msgid "Top 10 display"
+msgstr "Top 10"
+
+msgid "Update »"
+msgstr "Aktualizovat »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Grafy VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Sledování přenosu VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat je nástroj pro sledování přenosů dat pro Linux, který ukládá "
+"informace o síťovém provozu na vybraných zařízeních."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "Služba VnStat byla restartována"
diff --git a/trunk/package/luci/po/cs/voice_core.po b/trunk/package/luci/po/cs/voice_core.po
new file mode 100644
index 00000000..e4eae35a
--- /dev/null
+++ b/trunk/package/luci/po/cs/voice_core.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-29 21:47+0200\n"
+"Last-Translator: Astran <martin.hromadko@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefony"
+
+msgid "Voice"
+msgstr "Hlas"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "Telefony"
diff --git a/trunk/package/luci/po/cs/voice_diag.po b/trunk/package/luci/po/cs/voice_diag.po
new file mode 100644
index 00000000..4939d208
--- /dev/null
+++ b/trunk/package/luci/po/cs/voice_diag.po
@@ -0,0 +1,29 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Diagnostics"
+msgstr "Diagnostika"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Diagnostiky, dostupné na vašem zařízení, závisí na modulech, které máte "
+"nainstalovány."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Pod tímto menu se nachází možnosti, které vám umožní nastavovat a provádět "
+"testy hlasových operací vašeho systému. Tyto jsou známy pod názvem "
+"diagnostika."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "Diagnostika"
diff --git a/trunk/package/luci/po/cs/watchcat.po b/trunk/package/luci/po/cs/watchcat.po
new file mode 100644
index 00000000..1bfd435b
--- /dev/null
+++ b/trunk/package/luci/po/cs/watchcat.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-24 15:54+0200\n"
+"Last-Translator: awm1 <awm1klimes8vladimir@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Forced reboot delay"
+msgstr "Prodleva nuceného restartu"
+
+msgid "Host address to ping"
+msgstr "Adresa zařízení, vůči kterému bude testování připojení (ping)"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Perioda testování připojení; výchozí časovou jednotkou jsou sekundy, avšak "
+"použitím přípony \"m\" lze určit minuty, pomocí \"h\" hodiny a \"d\" dny"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"Pokud je nastaven periodický režim práce, tak tato hodnota vyjadřuje "
+"interval opakování restartu. V 'internetovém' režimu práce hodnota vyjadřuje "
+"nejdelší možnou dobu, po kterou smí být zařízení bez připojení k internetu, "
+"resp. nastavenému testovacímu zařízení - po jejím uplynutí je proveden "
+"automaticky reset. Výchozí jednotkou jsou sekundy, pomocí přípony \"m\" lze "
+"nastavit minuty, pomocí \"h\" hodiny a prostřednictvím \"d\" dny"
+
+msgid "Operating mode"
+msgstr "Pracovní režim"
+
+msgid "Period"
+msgstr "Perioda"
+
+msgid "Ping host"
+msgstr "Cílové zařízení příkazu ping"
+
+msgid "Ping period"
+msgstr "Interval opakování testu ping"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Nástroj Watchcat umožňuje nastavit periodický interval restartu zařízení a/"
+"nebo provést restart i tehdy, když dojde ke ztrátě připojení k internetu/"
+"danému zařízení po stanovenou dobu"
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"Pokud je nutno restartovat systém, provede Watchcat \"měkký\" restart "
+"(hodnota 0); zadáním nenulové hodnoty nastavíte interval (v sekundách), za "
+"který program provede \"tvrdý\" restart, pokud \"měkký\" selže."
diff --git a/trunk/package/luci/po/cs/wol.po b/trunk/package/luci/po/cs/wol.po
new file mode 100644
index 00000000..6ee7f67b
--- /dev/null
+++ b/trunk/package/luci/po/cs/wol.po
@@ -0,0 +1,55 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2014-05-12 11:17+0200\n"
+"Last-Translator: sairon <llamka@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Vysílat broadcastem na všech rozhraních"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Vyberte zařízení, které má být probuzeno, nebo zadejte jeho MAC adresu"
+
+msgid "Host to wake up"
+msgstr "Adresa zařízení, které má být probuzeno"
+
+msgid "Network interface to use"
+msgstr "Použité síťové rozhraní"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Může se stát, že pro dané cílové zařízení bude fungovat pouze jeden z "
+"programů. Pokud první selže, vyzkoušejte další."
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Zde se nastaví síťové rozhraní, přes které budou zasílány WoL packety."
+
+msgid "Starting WoL utility:"
+msgstr "Spouštím nástroj WoL:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Funkce \"Wake on LAN\" umožňuje vzdáleně spouštět počítače v místní síti."
+
+msgid "Wake up host"
+msgstr "Probudit zařízení"
+
+msgid "WoL program"
+msgstr "Program provádějící WoL"
diff --git a/trunk/package/luci/po/cs/wshaper.po b/trunk/package/luci/po/cs/wshaper.po
new file mode 100644
index 00000000..bca6c4e5
--- /dev/null
+++ b/trunk/package/luci/po/cs/wshaper.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-24 15:20+0200\n"
+"Last-Translator: awm1 <awm1klimes8vladimir@gmail.com>\n"
+"Language-Team: none\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Downlink"
+msgstr "Příchozí rychlost"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Rychlost stahování dat v kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Adresa počítače nebo sítě v CIDR notaci."
+
+msgid "Interface"
+msgstr "Síťové rozhraní"
+
+msgid "Low priority destination ports"
+msgstr "Cílové porty s nízkou prioritou"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Adresy cílových počítačů s nízkou prioritou"
+
+msgid "Low priority hosts (Source)"
+msgstr "Adresy zdrojových počítačů s nízkou prioritou"
+
+msgid "Low priority source ports"
+msgstr "Zdrojové porty s nízkou prioritou"
+
+msgid "Uplink"
+msgstr "Odchozí rychlost"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Rychlost odesílání dat v kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Nastavení skriptu Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Úkolem skriptu Wondershaper je řízení provozu na daném síťovém rozhraní. "
+"Snaží se zajistit nízké přenosové zpoždění pro \"interaktivní\" síťový "
+"provoz (např. SSH), a to především v okamžicích, kdy ostatní síťový provoz "
+"zahltí linku."
diff --git a/trunk/package/luci/po/de/ahcp.po b/trunk/package/luci/po/de/ahcp.po
new file mode 100644
index 00000000..6df34d8d
--- /dev/null
+++ b/trunk/package/luci/po/de/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-30 18:21+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "AHCP Server"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP ist ein Autokonfigurationsprotokoll für IPv6- und IPv4/IPv6 Dualstack-"
+"Netzwerke. Es ist darauf ausgelegt anstelle von Router Advertisements und "
+"DHCP-Servern in Ad-Hoc Netzwerken eingesetzt zu werden."
+
+msgid "Active AHCP Leases"
+msgstr "Aktive AHCP-Leases"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Age"
+msgstr "Alter"
+
+msgid "Announced DNS servers"
+msgstr "Angekündigte DNS-Server"
+
+msgid "Announced NTP servers"
+msgstr "Angekündigte NTP-Server"
+
+msgid "Announced prefixes"
+msgstr "Angekündigte Prefixe"
+
+msgid "Collecting data..."
+msgstr "Sammle Daten..."
+
+msgid "Forwarder"
+msgstr "Forwarder"
+
+msgid "General Setup"
+msgstr "Allgemeine Einstellungen"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 und IPv6"
+
+msgid "IPv4 only"
+msgstr "nur IPv4"
+
+msgid "IPv6 only"
+msgstr "nur IPv6"
+
+msgid "Lease directory"
+msgstr "Lease-Verzeichnis"
+
+msgid "Lease validity time"
+msgstr "Lease-Gültigkeitsdauer"
+
+msgid "Log file"
+msgstr "Protokolldatei"
+
+msgid "Multicast address"
+msgstr "Mutlicast-Adresse"
+
+msgid "Operation mode"
+msgstr "Betriebsmodus"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Protokollfamilie"
+
+msgid "Served interfaces"
+msgstr "Verwendete Schnittstellen"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Konfiguriert die bekannt gegebenen IPv4- und IPv6-NTP-Server"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Konfiguriert die bekannt gegebenen IPv4- und IPv6-DNS-Server"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"Konfiguriert die bekannt gegebenen IPv4- und IPv6-Netzwerkprefixe. Angabe in "
+"CIDR-Notation."
+
+msgid "The AHCP Service is not running."
+msgstr "Der AHCP-Dienst läuft nicht."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Der AHCP-Dienst läuft mit ID %s."
+
+msgid "There are no active leases."
+msgstr "Es gibt keine aktiven Leases."
+
+msgid "Unique ID file"
+msgstr "UID-Datei"
diff --git a/trunk/package/luci/po/de/asterisk.po b/trunk/package/luci/po/de/asterisk.po
new file mode 100644
index 00000000..f289849b
--- /dev/null
+++ b/trunk/package/luci/po/de/asterisk.po
@@ -0,0 +1,131 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2012-02-23 16:29+0200\n"
+"Last-Translator: Martin <roecker@empty-v.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Asterisk Grundeinstellungen"
+
+#~ msgid "AGI directory"
+#~ msgstr "AGI - Verzeichnis"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Audiodateien während der Aufnahme zwischenspeichern"
+
+#~ msgid "Debug Level"
+#~ msgstr "Debug Stufe"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Schalte einige Warnungen aus"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Speicherabbild bei Absturz erstellen"
+
+#~ msgid "High Priority"
+#~ msgstr "Hohe Priorität"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Verschlüsselung initialisieren"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Interne Zeitreferenz benutzen"
+
+#~ msgid "Log directory"
+#~ msgstr "Log - Verzeichnis"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Maximale Anruferanzahl"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Maximale CPU Auslastung um eingehende Anrufe anzunehmen"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Farbige Ausgabe auf der Konsole deaktivieren"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Verzeichnis zum Zwischenspeichern von Audiodateien"
+
+#~ msgid "The Group to run as"
+#~ msgstr "zu benutzende Gruppenkennung"
+
+#~ msgid "The User to run as"
+#~ msgstr "zu benutzende Benutzerkennung"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Sprachnachrichten Puffer"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Systemnamen als Präfix von UniquID benutzen"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "Transcode Pfade durch SLINEAR bauen, indirekt"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Übertrage Stille (SLINEAR) während der Aufnahme eines Kanals"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Detailgrad"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Übertragung erlauben"
+
+#~ msgid "Clear global vars"
+#~ msgstr "globale Variablen Zurücksetzen"
+
+#~ msgid "localzone"
+#~ msgstr "Zeitzone"
+
+#~ msgid "Connection to use"
+#~ msgstr "zu verwendende Verbindung"
+
+#~ msgid "One touch record key"
+#~ msgstr "Sofortaufnahmetaste"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Hardwarekonfiguration neuladen"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Neustartmethode"
+
+#~ msgid "Parameter"
+#~ msgstr "Parameter"
+
+#~ msgid "User name"
+#~ msgstr "Benutzername"
+
+#~ msgid "IAX General Options"
+#~ msgstr "IAX Allgemeine Einstellungen"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Codecs erlauben"
+
+#~ msgid "Admin PIN"
+#~ msgstr "Admin PIN"
+
+#~ msgid "Modules"
+#~ msgstr "Module"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Prüfen, ob der Kanal verfügbar ist"
+
+#~ msgid "Control Playback Application"
+#~ msgstr "Anwendung zur Wiedergabesteuerung"
+
+#~ msgid "Executes applications"
+#~ msgstr "startet Anwendungen"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Einfache Mathe-Anwendung"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "MD5-Prüfsummen Anwendung"
diff --git a/trunk/package/luci/po/de/base.po b/trunk/package/luci/po/de/base.po
new file mode 100644
index 00000000..17998388
--- /dev/null
+++ b/trunk/package/luci/po/de/base.po
@@ -0,0 +1,4147 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2013-03-29 12:13+0200\n"
+"Last-Translator: JoeSemler <josef.semler@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d Minuten Abschnitt, %d Sekunden Intervall)"
+
+msgid "(%s available)"
+msgstr "(%s verfügbar)"
+
+msgid "(empty)"
+msgstr "(leer)"
+
+msgid "(no interfaces attached)"
+msgstr "(keine Schnittstellen)"
+
+msgid "-- Additional Field --"
+msgstr "-- Zusätzliches Feld --"
+
+msgid "-- Please choose --"
+msgstr "-- Bitte auswählen --"
+
+msgid "-- custom --"
+msgstr "-- benutzerdefiniert --"
+
+msgid "1 Minute Load:"
+msgstr "Systemlast (1 Minute):"
+
+msgid "15 Minute Load:"
+msgstr "Systemlast (15 Minuten):"
+
+msgid "5 Minute Load:"
+msgstr "Systemlast (5 Minuten):"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> Abfrageport"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> Serverport"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr>-Server in der Reihenfolge der "
+"Resolv-Datei abfragen"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "IPv4-Adresse"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "IPv4-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "IPv4-Netzmaske"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr "IPv6 Host- oder Netzwerk-Addresse (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "IPv6-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "LED Konfiguration"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "MAC-Adresse"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> Anzahl von <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Leases"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> Größe von <abbr title=\"Extension "
+"Mechanisms for Domain Name System\">EDNS0</abbr>-Paketen"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">Max.</abbr> Anzahl gleichzeitiger Abfragen"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Paarweise: %s / Gruppe: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "AR-Unterstützung"
+
+msgid "ARP retry threshold"
+msgstr "Grenzwert für ARP-Auflösungsversuche"
+
+msgid "ATM Bridges"
+msgstr "ATM Brücken"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM Virtual Channel Identifier (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM Virtual Path Identifier (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"ATM Brücken exponieren in AAL5 gekapselten Ethernetverkehr als virtuelle "
+"Linux Netzwerkschnittstellen welche z.B. in Verbindung mit DHCP oder PPP "
+"genutzt werden können um sich in das Providernetzwerk einzuwählen."
+
+msgid "ATM device number"
+msgstr "ATM Geräteindex"
+
+msgid "Access Concentrator"
+msgstr "Access Concentrator"
+
+msgid "Access Point"
+msgstr "Access Point"
+
+msgid "Action"
+msgstr "Aktion"
+
+msgid "Actions"
+msgstr "Aktionen"
+
+msgid "Activate this network"
+msgstr "Dieses Netzwerk aktivieren"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Aktive IPv4-Routen"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Aktive IPv6-Routen"
+
+msgid "Active Connections"
+msgstr "Aktive Verbindungen"
+
+msgid "Active DHCP Leases"
+msgstr "Aktive DHCP-Leases"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Aktive DHCPv6-Leases"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Lokalen Domainsuffx an Namen aus der Hosts-Datei anhängen"
+
+msgid "Add new interface..."
+msgstr "Neue Schnittstelle hinzufügen..."
+
+msgid "Additional Hosts files"
+msgstr "Zusätzliche Hosts-Dateien"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Address to access local relay bridge"
+msgstr "Adresse der lokalen Relay-Brücke"
+
+msgid "Administration"
+msgstr "Administration"
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Alert"
+msgstr "Alarm"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "Erlaube Anmeldung per Passwort"
+
+msgid "Allow all except listed"
+msgstr "Alle außer gelistete erlauben"
+
+msgid "Allow listed only"
+msgstr "Nur gelistete erlauben"
+
+msgid "Allow localhost"
+msgstr "Erlaube localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr "Entfernten Hosts erlauben zu lokale SSH-Tunnel-Ports zu verbinden"
+
+msgid "Allow root logins with password"
+msgstr "\"root\" Login mit Passwort aktivieren"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+"Erlaubt es dem <em>root</em> Benutzer sich mit einem Passwort statt einem "
+"Zertifikat einzuloggen"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Dies erlaubt DNS-Antworten im 127.0.0.0/8 Bereich der z.B. für RBL Dienste "
+"genutzt wird"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Immer 40MHz Kanalbreite nutzen, auch wenn der sekundäre Kanal andere "
+"Netzwerke überschneidet. Die Benutzung dieser Option verletzt den IEEE "
+"802.11n-2009 Standard!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+"Erzeugt ein zusätzliches Netzwerk wenn diese Option nicht ausgewählt ist"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antenne 1"
+
+msgid "Antenna 2"
+msgstr "Antenne 2"
+
+msgid "Antenna Configuration"
+msgstr "Antennenkonfiguration"
+
+msgid "Any zone"
+msgstr "Beliebige Zone"
+
+msgid "Apply"
+msgstr "Anwenden"
+
+msgid "Applying changes"
+msgstr "Änderungen werden angewandt"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Schnittstellen zuweisen..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Assoziierte Clients"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s W-LAN Adapter"
+
+msgid "Authentication"
+msgstr "Authentifizierung"
+
+msgid "Authoritative"
+msgstr "Authoritativ"
+
+msgid "Authorization Required"
+msgstr "Autorisierung benötigt"
+
+msgid "Auto Refresh"
+msgstr "Automatisches Neuladen"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Verfügbar"
+
+msgid "Available packages"
+msgstr "Verfügbare Pakete"
+
+msgid "Average:"
+msgstr "Durchschnitt:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Zurück"
+
+msgid "Back to Overview"
+msgstr "Zurück zur Übersicht"
+
+msgid "Back to configuration"
+msgstr "Zurück zur Konfiguration"
+
+msgid "Back to overview"
+msgstr "Zurück zur Übersicht"
+
+msgid "Back to scan results"
+msgstr "Zurück zu den Scan-Ergebnissen"
+
+msgid "Background Scan"
+msgstr "Hintergrundscan"
+
+msgid "Backup / Flash Firmware"
+msgstr "Backup / Firmware Update"
+
+msgid "Backup / Restore"
+msgstr "Sichern / Wiederherstellen"
+
+msgid "Backup file list"
+msgstr "Liste zu sichernder Dateien"
+
+msgid "Bad address specified!"
+msgstr "Ungültige Adresse angegeben!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Nachfolgend wird eine generierte Liste der zu sichernden Dateien angezeigt. "
+"Sie enthält alle notwendigen Systemdateien sowie die von opkg als geändert "
+"markierten Konfigurationsdateien. Des Weiteren sind die durch "
+"benutzerdefinierte Dateiemuster betroffenen Dateien enthalten."
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Bogus NX Domain Override"
+msgstr "Ungültige \"NX-Domain\" Antworten ignorieren"
+
+msgid "Bridge"
+msgstr "Bridge"
+
+msgid "Bridge interfaces"
+msgstr "Netzwerkbrücke"
+
+msgid "Bridge unit number"
+msgstr "Geräteindex der Brücke"
+
+msgid "Bring up on boot"
+msgstr "Während des Bootvorgangs starten"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s W-LAN Adapter"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 W-LAN Adapter"
+
+msgid "Buffered"
+msgstr "Gepuffert"
+
+msgid "Buttons"
+msgstr "Knöpfe"
+
+msgid "CPU"
+msgstr "Prozessor"
+
+msgid "CPU usage (%)"
+msgstr "CPU-Nutzung (%)"
+
+msgid "Cached"
+msgstr "Zwischengespeichert"
+
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Kette"
+
+msgid "Changes"
+msgstr "Änderungen"
+
+msgid "Changes applied."
+msgstr "Änderungen angewendet."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Ändert das Administratorpasswort für den Zugriff auf dieses Gerät"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Check"
+msgstr "Prüfen"
+
+msgid "Checksum"
+msgstr "Prüfsumme"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr "Diese Schnittstelle gehört bis jetzt zu keiner Firewallzone."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Wählt die Netzwerke die dieser WLAN-Schnittstelle zugeordnet werden. Das "
+"<em>erstelle</em>-Feld ausfüllen um ein neues Netzwerk zu erzeugen."
+
+msgid "Cipher"
+msgstr "Verschlüsselungsalgorithmus"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Zum Herunterladen der aktuellen Konfigurationsdateien als gepacktes Archiv "
+"\"Sicherung erstellen\" drücken. \"Konfiguration zurücksetzen\" stellt den "
+"Auslieferungszustand des Systems wieder her (nur möglich bei squashfs-"
+"Images)."
+
+msgid "Client"
+msgstr "Client"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Zu sendende Client-ID bei DHCP Anfragen"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Inaktive Verbindungen nach Ablauf dieser Zeit in Sekunden schließen (0 um "
+"die Verbindung immer aufrecht zu erhalten)."
+
+msgid "Close list..."
+msgstr "Schließe Liste..."
+
+msgid "Collecting data..."
+msgstr "Sammle Daten..."
+
+msgid "Command"
+msgstr "Befehl"
+
+msgid "Common Configuration"
+msgstr "Allgemeine Konfiguration"
+
+msgid "Compression"
+msgstr "Kompression"
+
+msgid "Configuration"
+msgstr "Konfiguration"
+
+msgid "Configuration applied."
+msgstr "Konfiguration angewendet."
+
+msgid "Configuration files will be kept."
+msgstr "Konfigurationsdateien sichern"
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Konfiguriert diesen Mountpunkt als Overlay-Speicher für <em>block-extroot</"
+"em>"
+
+msgid "Confirmation"
+msgstr "Bestätigung"
+
+msgid "Connect"
+msgstr "Verbinden"
+
+msgid "Connected"
+msgstr "Verbunden"
+
+msgid "Connection Limit"
+msgstr "Verbindungslimit"
+
+msgid "Connections"
+msgstr "Verbindungen"
+
+msgid "Country"
+msgstr "Land"
+
+msgid "Country Code"
+msgstr "Ländercode"
+
+msgid "Cover the following interface"
+msgstr "Die folgende Schnittstelle abdecken"
+
+msgid "Cover the following interfaces"
+msgstr "Die folgende Schnittstellen abdecken"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Firewallzone anlegen / zuweisen"
+
+msgid "Create Interface"
+msgstr "Erzeuge Schnittstelle"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Erzeuge Netzwerkbrücke über mehrere Schnittstellen"
+
+msgid "Critical"
+msgstr "Kritisch"
+
+msgid "Cron Log Level"
+msgstr "Cron Protokolllevel"
+
+msgid "Custom Interface"
+msgstr "benutzerdefinierte Schnittstelle"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr "Passt das Verhalten der Geräte-LEDs an - wenn dies möglich ist."
+
+msgid "DHCP Leases"
+msgstr "DHCP-Leases"
+
+msgid "DHCP Server"
+msgstr "DHCP-Server"
+
+msgid "DHCP and DNS"
+msgstr "DHCP und DNS"
+
+msgid "DHCP client"
+msgstr "DHCP Client"
+
+msgid "DHCP-Options"
+msgstr "DHCP-Optionen"
+
+msgid "DHCPv6 Leases"
+msgstr "DHCPv6-Leases"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "DNS-Weiterleitungen"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "Default %d"
+msgstr "Standard %d"
+
+msgid "Default gateway"
+msgstr "Default Gateway"
+
+msgid "Default state"
+msgstr "Ausgangszustand"
+
+msgid "Define a name for this network."
+msgstr "Definiert einen Namen für dieses Netzwerk"
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Definiert zusätzliche DHCP-Optionen, z.B. \"<code>6,192.168.2.1,192.168.2.2</"
+"code>\" um einen anderen DNS-Server an Clients zu verteilen."
+
+msgid "Delete"
+msgstr "Löschen"
+
+msgid "Delete this interface"
+msgstr "Diese Schnittstelle löschen"
+
+msgid "Delete this network"
+msgstr "Dieses Netzwerk löschen"
+
+msgid "Description"
+msgstr "Beschreibung"
+
+msgid "Design"
+msgstr "Design"
+
+msgid "Destination"
+msgstr "Ziel"
+
+msgid "Device"
+msgstr "Gerät"
+
+msgid "Device Configuration"
+msgstr "Gerätekonfiguration"
+
+msgid "Diagnostics"
+msgstr "Diagnosen"
+
+msgid "Directory"
+msgstr "Verzeichnis"
+
+msgid "Disable"
+msgstr "Deaktivieren"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server auf "
+"dieser Schnittstelle deaktivieren"
+
+msgid "Disable DNS setup"
+msgstr "DNS-Verarbeitung deaktivieren"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Deaktiviere Hardware-Beacon Zeitgeber"
+
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Eingehende RFC1918-Antworten verwerfen"
+
+msgid "Displaying only packages containing"
+msgstr "Nur Pakete mit folgendem Inhalt anzeigen"
+
+msgid "Distance Optimization"
+msgstr "Distanzoptimierung"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distanz zum am weitesten entfernten Funkpartner in Metern."
+
+msgid "Diversity"
+msgstr "Diversität"
+
+# Nur für NAT-Firewalls?
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq ist ein kombinierter <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr>-Server und <abbr title=\"Domain Name System\">DNS</"
+"abbr>-Forwarder für <abbr title=\"Network Address Translation\">NAT</abbr> "
+"Router"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+"Negative Antworten nicht zwischenspeichern, z.B. bei nicht existierenden "
+"Domains"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Keine Anfragen weiterleiten welche nicht durch öffentliche Server "
+"beantwortet werden können"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Keine Rückwärtsauflösungen für lokale Netzwerke weiterleiten"
+
+msgid "Do not send probe responses"
+msgstr "Scan-Anforderungen nicht beantworten"
+
+msgid "Domain required"
+msgstr "Anfragen nur mit Domain"
+
+msgid "Domain whitelist"
+msgstr "Domain-Whitelist"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr "Anfragen ohne Domainnamen nicht weiterleiten"
+
+msgid "Download and install package"
+msgstr "Paket herunterladen und installieren"
+
+msgid "Download backup"
+msgstr "Backup herunterladen"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear Instanz"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Der SSH-Server ermöglicht Shell-Zugriff über das Netzwerk und bietet einen "
+"integrierten SCP-Dienst."
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr "Dynamisches DHCP"
+
+msgid "Dynamic tunnel"
+msgstr "Dynamischer Tunnel"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"DHCP Adressen dynamisch erzeugen. Wenn dies deaktiviert ist, werden nur "
+"Clients mit konfigurierten statischen Leases bedient"
+
+msgid "EAP-Method"
+msgstr "EAP-Methode"
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Edit this interface"
+msgstr "Diese Schnittstelle bearbeiten"
+
+msgid "Edit this network"
+msgstr "Dieses Netzwerk bearbeiten"
+
+msgid "Emergency"
+msgstr "Notfall"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> aktivieren"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Dynamisches HE.net IP-Adress-Update aktivieren"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Aushandeln von IPv6-Adressen auf der PPP-Verbindung aktivieren"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Aktiviere Jumbo Frame Durchleitung"
+
+msgid "Enable NTP client"
+msgstr "Aktiviere NTP-Client"
+
+msgid "Enable TFTP server"
+msgstr "TFTP-Server aktivieren"
+
+msgid "Enable VLAN functionality"
+msgstr "VLAN-Funktionalität aktivieren"
+
+msgid "Enable learning and aging"
+msgstr "Learning und Aging aktivieren"
+
+msgid "Enable this mount"
+msgstr "Diesen Mountpunkt aktivieren"
+
+msgid "Enable this swap"
+msgstr "Diesen Auslagerungsspeicher aktivieren"
+
+msgid "Enable/Disable"
+msgstr "Aktivieren/Deaktivieren"
+
+msgid "Enabled"
+msgstr "Aktiviert"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Aktiviert das Spanning Tree Protokoll auf dieser Netzwerkbrücke"
+
+msgid "Encapsulation mode"
+msgstr "Kapselung"
+
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+msgid "Erasing..."
+msgstr "Lösche..."
+
+msgid "Error"
+msgstr "Fehler"
+
+msgid "Ethernet Adapter"
+msgstr "Netzwerkschnittstelle"
+
+msgid "Ethernet Switch"
+msgstr "Netzwerk Switch"
+
+msgid "Expand hosts"
+msgstr "Hosts vervollständigen"
+
+msgid "Expires"
+msgstr "Verfällt"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Gültigkeitsdauer von vergebenen Adressen. Das Minimum sind 2 Minuten "
+"(<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Externer Protokollserver IP"
+
+msgid "External system log server port"
+msgstr "Externer Protokollserver Port"
+
+msgid "Fast Frames"
+msgstr "Schnelle Frames"
+
+msgid "File"
+msgstr "Datei"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Dateiname des Boot-Images welches den Clients mitgeteilt wird."
+
+msgid "Filesystem"
+msgstr "Dateisystem"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Filter private"
+msgstr "Private Anfragen filtern"
+
+msgid "Filter useless"
+msgstr "Windowsanfragen filtern"
+
+msgid "Find and join network"
+msgstr "Suchen und Verbinden von Netzwerken"
+
+msgid "Find package"
+msgstr "Paket suchen"
+
+msgid "Finish"
+msgstr "Fertigstellen"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Firewall Einstellungen"
+
+msgid "Firewall Status"
+msgstr "Firewall-Status"
+
+msgid "Firmware Version"
+msgstr "Firmware Version"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Fester Port für ausgehende DNS-Anfragen"
+
+msgid "Flags"
+msgstr "Parameter"
+
+msgid "Flash Firmware"
+msgstr "Firmware aktualisieren"
+
+msgid "Flash image..."
+msgstr "Firmware aktualisieren..."
+
+msgid "Flash new firmware image"
+msgstr "Neues Firmware Image schreiben"
+
+msgid "Flash operations"
+msgstr "Flash-Operationen"
+
+msgid "Flashing..."
+msgstr "Firmware wird installiert..."
+
+msgid "Force"
+msgstr "Start erzwingen"
+
+msgid "Force 40MHz mode"
+msgstr "40MHz-Modus erzwingen"
+
+msgid "Force CCMP (AES)"
+msgstr "CCMP (AES) erzwingen"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+"Aktiviere DHCP-Server für dieses Netzwerk, selbst wenn ein anderer aktiver "
+"Server erkannt wurde."
+
+msgid "Force TKIP"
+msgstr "Erzwinge TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Erzwinge TKIP und CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "DHCP Traffic weiterleiten"
+
+msgid "Forward broadcast traffic"
+msgstr "Broadcasts weiterleiten"
+
+msgid "Forwarding mode"
+msgstr "Weiterleitungstyp"
+
+msgid "Fragmentation Threshold"
+msgstr "Fragmentierungsschwelle"
+
+msgid "Frame Bursting"
+msgstr "Frame Bursting"
+
+msgid "Free"
+msgstr "Frei"
+
+msgid "Free space"
+msgstr "Freier Platz"
+
+msgid "Frequency Hopping"
+msgstr "Frequenzsprung"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Nur GPRS"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Gateway ports"
+msgstr "Gateway-Ports"
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "General Setup"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Generate archive"
+msgstr "Sicherung erstellen"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Generischer 802.11%s W-LAN Adapter"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+"Die angegebenen Passwörter stimmen nicht überein, das Systempasswort wurde "
+"nicht geändert!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Zur Passwortkonfiguration..."
+
+msgid "Go to relevant configuration page"
+msgstr "Gehe zur entsprechenden Konfigurationsseite"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "HE.net Passwort"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Handler"
+
+msgid "Hang Up"
+msgstr "Auflegen"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"An dieser Stelle können Grundeinstellungen des Systems wie Hostname oder "
+"Zeitzone vorgenommen werden."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Hier können öffentliche SSH-Schlüssel reinkopiert werden (einer pro Zeile)."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b W-LAN Adapter"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "ESSID verstecken"
+
+msgid "Host entries"
+msgstr "Host-Einträge"
+
+msgid "Host expiry timeout"
+msgstr "Host Verfallsdatum"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> oder Netzwerk"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Zu sendender Hostname bei DHCP Anfragen"
+
+msgid "Hostnames"
+msgstr "Rechnernamen"
+
+msgid "IP address"
+msgstr "IP-Adresse"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4 Firewall"
+
+msgid "IPv4 WAN Status"
+msgstr "IPv4 WAN Status"
+
+msgid "IPv4 address"
+msgstr "IPv4 Adresse"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 und IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 Broadcast"
+
+msgid "IPv4 gateway"
+msgstr "IPv4 Gateway"
+
+msgid "IPv4 netmask"
+msgstr "IPv4 Netzmaske"
+
+msgid "IPv4 only"
+msgstr "nur IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Länge des IPv4 Präfix"
+
+msgid "IPv4-Address"
+msgstr "IPv4-Adresse"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6 Firewall"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "IPv6 WAN Status"
+
+msgid "IPv6 address"
+msgstr "IPv6 Adresse"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6 Gateway"
+
+msgid "IPv6 only"
+msgstr "nur IPv6"
+
+msgid "IPv6 prefix"
+msgstr "IPv6 Präfix"
+
+msgid "IPv6 prefix length"
+msgstr "Länge des IPv6 Präfix"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-Adresse"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-in-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-über-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-über-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Identität"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Wenn angegeben, wird das Gerät anhand seiner UUID statt fester Gerätedatei "
+"gemounted"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Wenn angegeben, wird das Gerät nach anhhand des Partitionslabels statt "
+"fester Gerätedatei gemounted"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Wenn deaktiviert, wird keine Default-Route gesetzt"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Falls deaktiviert werden die zugewiesenen DNS-Server ignoriert"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Falls der Arbeitsspeicher des Routers nicht ausreicht, kann dieser nicht "
+"benutzte Daten zeitweise auf einem SWAP-Laufwerk auslagern um so die "
+"effektive Größe des Arbeitsspeichers zu erhöhen. Die Auslagerung der Daten "
+"ist natürlich bedeutend langsamer als direkte Arbeitsspeicherzugriffe."
+
+msgid "Ignore Hosts files"
+msgstr "Hosts-Dateien ignorieren"
+
+msgid "Ignore interface"
+msgstr "Schnittstelle ignorieren"
+
+msgid "Ignore resolve file"
+msgstr "Resolv-Datei ignorieren"
+
+msgid "Image"
+msgstr "Image"
+
+msgid "In"
+msgstr "Ein"
+
+msgid "Inactivity timeout"
+msgstr "Timeout bei Inaktivität"
+
+msgid "Inbound:"
+msgstr "Eingehend:"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Initscript"
+msgstr "Startscript"
+
+msgid "Initscripts"
+msgstr "Startscripte"
+
+msgid "Install"
+msgstr "Installieren"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Installiere Paket %q"
+
+msgid "Install protocol extensions..."
+msgstr "Installiere Protokoll-Erweiterungen"
+
+msgid "Installed packages"
+msgstr "Installierte Pakete"
+
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgid "Interface Configuration"
+msgstr "Schnittstellenkonfiguration"
+
+msgid "Interface Overview"
+msgstr "Schnittstellenübersicht"
+
+msgid "Interface is reconnecting..."
+msgstr "Schnittstelle verbindet neu..."
+
+msgid "Interface is shutting down..."
+msgstr "Schnittstelle fährt herunter..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Schnittstelle existiert nicht oder ist nicht verbunden."
+
+msgid "Interface reconnected"
+msgstr "Schnittstelle neu verbunden"
+
+msgid "Interface shut down"
+msgstr "Schnittstelle heruntergefahren"
+
+msgid "Interfaces"
+msgstr "Schnittstellen"
+
+msgid "Internal Server Error"
+msgstr "Interner Serverfehler"
+
+msgid "Invalid"
+msgstr "Ungültige Eingabe"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "Ungültige VLAN ID angegeben! Nur IDs zwischen %d und %d sind erlaubt."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "Ungültige VLAN ID angegeben! Die ID ist muß eindeutig sein!"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr ""
+"Ungültiger Benutzername oder ungültiges Passwort! Bitte erneut versuchen. "
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Das verwendete Image scheint zu groß für den internen Flash-Speicher zu "
+"sein. Überprüfen Sie die Imagedatei!"
+
+msgid "Java Script required!"
+msgstr "Java-Script benötigt!"
+
+msgid "Join Network"
+msgstr "Netzwerk beitreten"
+
+msgid "Join Network: Settings"
+msgstr "Netzwerk beitreten: Einstellungen"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Netzwerk beitreten: Suche nach Netzwerken"
+
+msgid "Keep settings"
+msgstr "Konfiguration behalten"
+
+msgid "Kernel Log"
+msgstr "Kernelprotokoll"
+
+msgid "Kernel Version"
+msgstr "Kernel Version"
+
+msgid "Key"
+msgstr "Schlüssel"
+
+msgid "Key #%d"
+msgstr "Schlüssel Nr. %d"
+
+msgid "Kill"
+msgstr "Töten"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP Server"
+
+msgid "LCP echo failure threshold"
+msgstr "LCP Echo Fehler Schwellenwert"
+
+msgid "LCP echo interval"
+msgstr "LCP Echo Intervall"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Label"
+
+msgid "Language"
+msgstr "Sprache"
+
+msgid "Language and Style"
+msgstr "Sprache und Aussehen"
+
+msgid "Lease validity time"
+msgstr "Lease-Gültigkeitsdauer"
+
+msgid "Leasefile"
+msgstr "Leasedatei"
+
+msgid "Leasetime"
+msgstr "Laufzeit"
+
+msgid "Leasetime remaining"
+msgstr "Verbleibende Gültigkeit"
+
+msgid "Leave empty to autodetect"
+msgstr "Zur automatischen Erkennung leer lassen"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Leer lassen um die aktuelle WAN-Adresse zu verwenden"
+
+msgid "Legend:"
+msgstr "Legende:"
+
+msgid "Limit"
+msgstr "Limit"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Verbindung hergestellt"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Liste von <abbr title=\"Domain Name System\">DNS</abbr>-Servern an welche "
+"Requests weitergeleitet werden"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Liste von Domains für welche RFC1918-Antworten erlaubt sind"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Liste von Servern die falsche \"NX Domain\" Antworten liefern"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Nur auf die gegebene Schnittstelle reagieren, nutze alle wenn nicht "
+"spezifiziert"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Serverport für eingehende DNS Abfragen"
+
+msgid "Load"
+msgstr "Last"
+
+msgid "Load Average"
+msgstr "Durchschnittslast"
+
+msgid "Loading"
+msgstr "Lade"
+
+msgid "Local IPv4 address"
+msgstr "Lokale IPv4 Adresse"
+
+msgid "Local IPv6 address"
+msgstr "Lokale IPv6 Adresse"
+
+msgid "Local Startup"
+msgstr "Lokales Startskript"
+
+msgid "Local Time"
+msgstr "Lokale Zeit"
+
+msgid "Local domain"
+msgstr "Lokale Domain"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Spezifiziert den lokalen Domainnamen. Anfragen für Hostnamen welche auf "
+"diese Domain zutreffen werden nie weitergeleitet und ausschließlich aus DHCP-"
+"Namen oder Hosts-Dateien aufgelöst"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Lokaler Domain-Suffix welcher an DHCP Namen und Host-Datei Einträge "
+"angehangen wird"
+
+msgid "Local server"
+msgstr "Lokaler Server"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Hostnamen je nach anfragendem Subnetz auflösen wenn mehrere IPs verfügbar "
+"sind"
+
+msgid "Localise queries"
+msgstr "Lokalisiere Anfragen"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Festgelegt auf Kanal %d benutzt von %s"
+
+msgid "Log output level"
+msgstr "Protokolllevel"
+
+msgid "Log queries"
+msgstr "Schreibe Abfragelog"
+
+msgid "Logging"
+msgstr "Protokollierung"
+
+msgid "Login"
+msgstr "Anmelden"
+
+msgid "Logout"
+msgstr "Abmelden"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "Kleinste vergebene Adresse (Netzwerkadresse + x)"
+
+msgid "MAC-Address"
+msgstr "MAC-Adresse"
+
+msgid "MAC-Address Filter"
+msgstr "MAC-Adressfilter"
+
+msgid "MAC-Filter"
+msgstr "MAC-Filter"
+
+msgid "MAC-List"
+msgstr "MAC-Adressliste"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Höchstübertragungsrate"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Maximal zulässige Anzahl von aktiven DHCP-Leases"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Maximal zulässige Anzahl an gleichzeitigen DNS-Anfragen"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Maximal zulässige Größe von EDNS.0 UDP Paketen"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Maximale Zeit die gewartet wird bis das Modem bereit ist (in Sekunden)"
+
+msgid "Maximum hold time"
+msgstr "Maximalzeit zum Halten der Verbindung"
+
+msgid "Maximum number of leased addresses."
+msgstr "Maximal zulässige Anzahl von vergeben DHCP-Adressen"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Hauptspeicher"
+
+msgid "Memory usage (%)"
+msgstr "Speichernutzung (%)"
+
+msgid "Metric"
+msgstr "Metrik"
+
+msgid "Minimum Rate"
+msgstr "Mindestübertragungsrate"
+
+msgid "Minimum hold time"
+msgstr "Minimalzeit zum Halten der Verbindung"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Erweiterung für Protokoll %q fehlt"
+
+msgid "Mode"
+msgstr "Modus"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Modemgerät"
+
+msgid "Modem init timeout"
+msgstr "Wartezeit für Modeminitialisierung"
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr "Mount-Eintrag"
+
+msgid "Mount Point"
+msgstr "Einhängepunkt"
+
+msgid "Mount Points"
+msgstr "Einhängepunkte"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Mountpunkte - Mount-Eintrag"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Mountpunkte - Auslagerungsdatei"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Einhängepunkte bestimmen, an welcher Stelle des Dateisystems bestimmte "
+"Laufwerke und Speicher zur Verwendung eingebunden werden."
+
+msgid "Mount options"
+msgstr "Mount-Optionen"
+
+msgid "Mount point"
+msgstr "Mountpunkt"
+
+msgid "Mounted file systems"
+msgstr "Eingehängte Dateisysteme"
+
+msgid "Move down"
+msgstr "Nach unten schieben"
+
+msgid "Move up"
+msgstr "Nach oben schieben"
+
+msgid "Multicast Rate"
+msgstr "Multicastrate"
+
+msgid "Multicast address"
+msgstr "Multicast-Adresse"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "NTP Server Kandidaten"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Name of the new interface"
+msgstr "Name der neuen Schnittstelle"
+
+msgid "Name of the new network"
+msgstr "Name des neuen Netzwerkes"
+
+msgid "Navigation"
+msgstr "Navigation"
+
+msgid "Netmask"
+msgstr "Netzmaske"
+
+msgid "Network"
+msgstr "Netzwerk"
+
+msgid "Network Utilities"
+msgstr "Netzwerk-Werkzeuge"
+
+msgid "Network boot image"
+msgstr "Netzwerk-Boot-Image"
+
+msgid "Network without interfaces."
+msgstr "Netzwerk ohne Schnittstellen."
+
+msgid "Next »"
+msgstr "Weiter »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Kein DHCP Server auf dieser Schnittstelle eingerichtet"
+
+msgid "No chains in this table"
+msgstr "Keine Ketten in dieser Tabelle"
+
+msgid "No files found"
+msgstr "Keine Dateien gefunden"
+
+msgid "No information available"
+msgstr "Keine Informationen verfügbar"
+
+msgid "No negative cache"
+msgstr "Kein Negativ-Cache"
+
+msgid "No network configured on this device"
+msgstr "Keine Netzwerke auf diesem Gerät konfiguriert"
+
+msgid "No network name specified"
+msgstr "Netzwerkname nicht angegeben"
+
+# Ich glab das ist so richtiger
+msgid "No package lists available"
+msgstr "Es sind keine Paketlisten vorhanden"
+
+msgid "No password set!"
+msgstr "Kein Passwort gesetzt!"
+
+msgid "No rules in this chain"
+msgstr "Keine Regeln in dieser Kette"
+
+msgid "No zone assigned"
+msgstr "Keine Zone zugewiesen"
+
+msgid "Noise"
+msgstr "Rauschen"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Noise:"
+
+msgid "None"
+msgstr "keine"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "Nicht Gefunden"
+
+msgid "Not associated"
+msgstr "Nicht assoziiert"
+
+msgid "Not connected"
+msgstr "Nicht verbunden"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Warnung: Konfigurationsdateien werden gelöscht."
+
+msgid "Notice"
+msgstr "Notiz"
+
+msgid "Nslookup"
+msgstr "DNS-Auflösung"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "OPKG-Konfiguration"
+
+msgid "Off-State Delay"
+msgstr "Verzögerung für Ausschalt-Zustand"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"An dieser Stelle können die einzelnen Schnittstellen des Netzwerkes "
+"konfiguriert werden. Es können mehrere Schnittstellen zu einer Brücke "
+"zusammengefasst werden, indem diese durch Leerzeichen getrennt aufgezählt "
+"werden und ein entsprechender Haken im Feld Netzwerkbrücke gesetzt wird. Es "
+"können VLANs in der Notation SCHNITTSTELLE.VLANNR (z.B.: eth0.1) verwendet "
+"werden."
+
+msgid "On-State Delay"
+msgstr "Verzögerung für Anschalt-Zustand"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Es muss entweder ein Hostname oder eine MAC-Adresse angegeben werden!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Ein oder mehrere Felder enthalten ungültige Werte!"
+
+msgid "One or more required fields have no value!"
+msgstr "Ein oder mehr benötigte Felder sind nicht ausgefüllt!"
+
+msgid "Open list..."
+msgstr "Liste öffnen..."
+
+msgid "Option changed"
+msgstr "Option geändert"
+
+msgid "Option removed"
+msgstr "Option entfernt"
+
+msgid "Options"
+msgstr "Optionen"
+
+msgid "Other:"
+msgstr "Andere:"
+
+msgid "Out"
+msgstr "Aus"
+
+msgid "Outbound:"
+msgstr "Ausgehend:"
+
+msgid "Outdoor Channels"
+msgstr "Funkkanal für den Ausseneinsatz"
+
+msgid "Override MAC address"
+msgstr "MAC-Adresse überschreiben"
+
+msgid "Override MTU"
+msgstr "MTU-Wert überschreiben"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Gateway-Adresse in DHCP-Antworten überschreiben"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Überschreibt die Netzmaske welche an Clients geschickt wird. Normalerweise "
+"wird diese vom bedienten Subnetz abgeleitet."
+
+msgid "Override the table used for internal routes"
+msgstr "Überschreibt die benutzte Tabelle für interne Routen"
+
+msgid "Overview"
+msgstr "Übersicht"
+
+msgid "Owner"
+msgstr "Besitzer"
+
+msgid "PAP/CHAP password"
+msgstr "PAP/CHAP Passwort"
+
+msgid "PAP/CHAP username"
+msgstr "PAP/CHAP Benutzername"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA Kapselung"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Benötige das libiwinfo Paket!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Die Paketlisten sind älter als 24 Stunden"
+
+msgid "Package name"
+msgstr "Paketname"
+
+msgid "Packets"
+msgstr "Pakete"
+
+msgid "Part of zone %q"
+msgstr "Teil von Zone %q"
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid "Password authentication"
+msgstr "Passwortanmeldung"
+
+msgid "Password of Private Key"
+msgstr "Passwort des Privaten Schlüssels"
+
+msgid "Password successfully changed!"
+msgstr "Passwort erfolgreich geändert!"
+
+msgid "Path to CA-Certificate"
+msgstr "Pfad zum CA-Zertifikat"
+
+msgid "Path to Client-Certificate"
+msgstr "Pfad zu Client-Zertifikat"
+
+msgid "Path to Private Key"
+msgstr "Pfad zum Privaten Schlüssel"
+
+msgid "Path to executable which handles the button event"
+msgstr "Ausführbare Datei welche das Schalter-Ereignis verarbeitet"
+
+msgid "Peak:"
+msgstr "Spitze:"
+
+msgid "Perform reboot"
+msgstr "Neustart durchführen"
+
+msgid "Perform reset"
+msgstr "Reset durchführen"
+
+msgid "Phy Rate:"
+msgstr "Phy-Rate:"
+
+msgid "Physical Settings"
+msgstr "Physikalische Einstellungen"
+
+msgid "Ping"
+msgstr "Ping-Anfrage"
+
+msgid "Pkts."
+msgstr "Pkte."
+
+msgid "Please enter your username and password."
+msgstr "Bitte Benutzernamen und Passwort eingeben."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Bitte warten: Neustart wird durchgeführt..."
+
+msgid "Policy"
+msgstr "Standardregel"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Port %d ist untagged in mehreren VLANs!"
+
+msgid "Port status:"
+msgstr "Port-Status:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Deklariere den Client als tot nach der angegebenen Anzahl von LCP Echo "
+"Fehlschlägen, nutze den Wert 0 um Fehler zu ignorieren"
+
+msgid "Prevents client-to-client communication"
+msgstr "Unterbindet Client-Client-Verkehr"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b W-LAN Adapter"
+
+msgid "Proceed"
+msgstr "Fortfahren"
+
+msgid "Processes"
+msgstr "Prozesse"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Protocol family"
+msgstr "Protokollfamilie"
+
+msgid "Protocol of the new interface"
+msgstr "Protokoll für die neue Schnittstelle"
+
+msgid "Protocol support is not installed"
+msgstr "Protokollunterstützung ist nicht installiert"
+
+msgid "Provide NTP server"
+msgstr "NTP-Server anbieten"
+
+msgid "Provide new network"
+msgstr "Neues Netzwerk anbieten"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Qualität"
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS-Schwelle"
+
+# Ein / Aus, eingehend / ausgehend?
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "RX-Rate"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "RaLink 802.11%s W-LAN Adapter"
+
+msgid "Radius-Accounting-Port"
+msgstr "Radius-Accounting-Port"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Radius-Accounting-Secret"
+
+msgid "Radius-Accounting-Server"
+msgstr "Radius-Accounting-Server"
+
+msgid "Radius-Authentication-Port"
+msgstr "Radius-Authentication-Port"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Radius-Authentication-Secret"
+
+msgid "Radius-Authentication-Server"
+msgstr "Radius-Authentication-Server"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr "Lese Informationen aus /etc/ethers um den DHCP-Server zu konfigurieren"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Diese Schnittstelle wirklich löschen? Der Schritt kann nicht rückgängig "
+"gemacht werden!\n"
+"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese "
+"Schnittstelle verbunden sind."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Dieses Drahtlosnetzwerk wirklich löschen? Der Schritt kann nicht rückgängig "
+"gemacht werden!\n"
+"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über dieses Netzwerk "
+"verbunden sind."
+
+msgid "Really reset all changes?"
+msgstr "Sollen wirklich alle Änderungen verworfen werden?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Das Netzwerk wirklich herunterfahren?\n"
+"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese "
+"Schnittstelle verbunden sind."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Die Schnitstelle \"%s\" wirklich herunterfahren?\n"
+"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese "
+"Schnittstelle verbunden sind."
+
+msgid "Really switch protocol?"
+msgstr "Protokoll wirklich wechseln?"
+
+msgid "Realtime Connections"
+msgstr "Echtzeitverbindungen"
+
+msgid "Realtime Graphs"
+msgstr "Echtzeit-Diagramme"
+
+msgid "Realtime Load"
+msgstr "Echtzeitsystemlast"
+
+msgid "Realtime Traffic"
+msgstr "Echtzeitverkehr"
+
+msgid "Realtime Wireless"
+msgstr "Echtzeit-WLAN-Signal"
+
+msgid "Rebind protection"
+msgstr "DNS-Rebind-Schutz"
+
+msgid "Reboot"
+msgstr "Neu Starten"
+
+msgid "Rebooting..."
+msgstr "Das System wird neu gestartet..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Startet das Betriebssystem des Routers neu."
+
+msgid "Receive"
+msgstr "Empfangen"
+
+msgid "Receiver Antenna"
+msgstr "Empfangsantenne"
+
+msgid "Reconnect this interface"
+msgstr "Diese Schnittstelle neu verbinden"
+
+msgid "Reconnecting interface"
+msgstr "Verbinde Schnittstelle neu"
+
+msgid "References"
+msgstr "Verweise"
+
+msgid "Regulatory Domain"
+msgstr "Geltungsbereich (Regulatory Domain)"
+
+msgid "Relay"
+msgstr "Relay"
+
+msgid "Relay Bridge"
+msgstr "Relay-Brücke"
+
+msgid "Relay between networks"
+msgstr "Zwischen folgenden Netzwerken weiterleiten"
+
+msgid "Relay bridge"
+msgstr "Relay-Brücke"
+
+msgid "Remote IPv4 address"
+msgstr "Entfernte IPv4-Adresse"
+
+msgid "Remove"
+msgstr "Entfernen"
+
+msgid "Repeat scan"
+msgstr "Scan wiederholen"
+
+msgid "Replace entry"
+msgstr "Eintrag ersetzen"
+
+msgid "Replace wireless configuration"
+msgstr "Drahtloskonfiguration ersetzen"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+"Wird von bestimmten Internet-Providern benötigt, z.B. Charter mit DOCSIS 3"
+
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+msgid "Reset Counters"
+msgstr "Zähler zurücksetzen"
+
+msgid "Reset to defaults"
+msgstr "Auslieferungszustand wiederherstellen"
+
+msgid "Resolv and Hosts Files"
+msgstr "Resolv- und Hosts-Dateien"
+
+msgid "Resolve file"
+msgstr "Resolv-Datei"
+
+msgid "Restart"
+msgstr "Neustarten"
+
+msgid "Restart Firewall"
+msgstr "Firewall neu starten"
+
+msgid "Restore backup"
+msgstr "Sicherung wiederherstellen"
+
+msgid "Reveal/hide password"
+msgstr "Passwort zeigen/verstecken"
+
+msgid "Revert"
+msgstr "Verwerfen"
+
+msgid "Root"
+msgstr "Root"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Wurzelverzeichnis für über TFTP ausgelieferte Dateien "
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Routerpasswort"
+
+msgid "Routes"
+msgstr "Routen"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Netzwerkrouten geben an, über welche Schnittstellen bestimmte Rechner oder "
+"Netzwerke erreicht werden können"
+
+msgid "Rule #"
+msgstr "Regel #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Vor dem Einhängen Dateisystemprüfung starten "
+
+msgid "Run filesystem check"
+msgstr "Dateisystemprüfung durchführen"
+
+msgid "SSH Access"
+msgstr "SSH-Zugriff"
+
+msgid "SSH-Keys"
+msgstr "SSH-Schlüssel"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Save & Apply"
+msgstr "Speichern & Anwenden"
+
+msgid "Save &#38; Apply"
+msgstr "Speichern &#38; Anwenden"
+
+msgid "Scan"
+msgstr "Scan"
+
+msgid "Scheduled Tasks"
+msgstr "Geplante Aufgaben"
+
+msgid "Section added"
+msgstr "Sektion hinzugefügt"
+
+msgid "Section removed"
+msgstr "Sektion entfernt"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Siehe \"mount\" Handbuch für Details"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Sende LCP Echo Anforderungen im angegebenem Interval in Sekunden, nur "
+"effektiv in Verbindung mit einem Fehler-Schwellwert"
+
+msgid "Separate Clients"
+msgstr "Clients isolieren"
+
+msgid "Separate WDS"
+msgstr "Separates WDS"
+
+msgid "Server Settings"
+msgstr "Servereinstellungen"
+
+msgid "Service Name"
+msgstr "Service-Name"
+
+msgid "Service Type"
+msgstr "Service-Typ"
+
+msgid "Services"
+msgstr "Dienste"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Zeitsynchronisierung einrichten"
+
+msgid "Setup DHCP Server"
+msgstr "DHCP Server einrichten"
+
+msgid "Show current backup file list"
+msgstr "Zeige aktuelle Liste der gesicherten Dateien"
+
+msgid "Shutdown this interface"
+msgstr "Diese Schnittstelle herunterfahren"
+
+msgid "Shutdown this network"
+msgstr "Dieses Netzwerk herunterfahren"
+
+msgid "Signal"
+msgstr "Signal"
+
+msgid "Signal:"
+msgstr "Signal:"
+
+msgid "Size"
+msgstr "Größe"
+
+msgid "Skip"
+msgstr "Überspringen"
+
+msgid "Skip to content"
+msgstr "Zum Inhalt springen"
+
+msgid "Skip to navigation"
+msgstr "Zur Navigation springen"
+
+msgid "Slot time"
+msgstr "Zeitslot"
+
+msgid "Software"
+msgstr "Paketverwaltung"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Einige Felder sind ungültig, kann das Formular nicht speichern!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Entschuldigung, das anfgeforderte Objekt wurde nicht gefunden."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+"Entschuldigung, auf dem Server ist ein unerwarteter Fehler aufgetreten."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Aufgrund des fehlenden sysupgrade-Supports muss die neue Firmware manuell "
+"geflasht werden. Weitere  Informationen sowie gerätespezifische "
+"Installationsanleitungen entnehmen Sie bitte dem libreCMC Wiki."
+
+msgid "Sort"
+msgstr "Sortieren"
+
+msgid "Source"
+msgstr "Quelle"
+
+msgid "Specifies the button state to handle"
+msgstr "Gibt den zu behandelnden Tastenstatus an"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Nennt das Verzeichnis, an welches das Gerät angebunden ist"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Gibt den Server-Port dieser <em>Dropbear</em>-Instanz an"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Maximale Anzahl fehlgeschlagener ARP-Anfragen bis ein Host als nicht "
+"verfügbar gilt"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Spezifiziert die maximale Anzahl an Sekunde nach denen Hoss als tot erachtet "
+"werden"
+
+msgid "Specify the secret encryption key here."
+msgstr "Geben Sie hier den geheimen Netzwerkschlüssel an"
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Start priority"
+msgstr "Startpriorität"
+
+msgid "Startup"
+msgstr "Systemstart"
+
+msgid "Static IPv4 Routes"
+msgstr "Statische IPv4 Routen"
+
+msgid "Static IPv6 Routes"
+msgstr "Statische IPv6 Routen"
+
+msgid "Static Leases"
+msgstr "Statische Einträge"
+
+msgid "Static Routes"
+msgstr "Statische Routen"
+
+msgid "Static WDS"
+msgstr "Statisches WDS"
+
+msgid "Static address"
+msgstr "Statische Adresse"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Statische Leases werden genutzt um feste IP-Adressen und Hostnames zu DHCP-"
+"Clients zuzuordnen. Sie werden auch für nicht-dynamische Schnittstellen-"
+"Konfigurationen benötigt auf denen lediglich Hosts mit zugehörigem "
+"statischem Lease-Eintrag bedient werden."
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Stop"
+msgstr "Stoppen"
+
+msgid "Strict order"
+msgstr "Strikte Reihenfolge"
+
+msgid "Submit"
+msgstr "Absenden"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Auslagerungsdatei"
+
+msgid "Switch"
+msgstr "Switch"
+
+msgid "Switch %q"
+msgstr "Switch %q"
+
+msgid "Switch %q (%s)"
+msgstr "Switch %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Wechsle Protokoll"
+
+msgid "Sync with browser"
+msgstr "Mit Browser synchronisieren"
+
+msgid "Synchronizing..."
+msgstr "Synchronisiere..."
+
+msgid "System"
+msgstr "System"
+
+msgid "System Log"
+msgstr "Systemprotokoll"
+
+msgid "System Properties"
+msgstr "Systemeigenschaften"
+
+msgid "System log buffer size"
+msgstr "Größe des Systemprotokoll-Puffers"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "TFTP Einstellungen"
+
+msgid "TFTP server root"
+msgstr "TFTP Wurzelverzeichnis"
+
+# same as RX
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "TX-Rate"
+
+msgid "Table"
+msgstr "Tabelle"
+
+msgid "Target"
+msgstr "Ziel"
+
+msgid "Terminate"
+msgstr "Beenden"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"Die <em>Gerätekonfiguration</em> deckt physikalische Einstellungen der WLAN-"
+"Hardware wie Kanal, Sendestärke oder Antennenauswahl ab. Diese Einstellungen "
+"werden von allen Netzwerken auf dem Gerät geteilt. Netzwerk-spezifische "
+"Einstellungen wie Verschlüsselung oder Betriebsmodus sind in der "
+"<em>Schnittstellenkonfiguration</em> gruppiert."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Das <em>libiwinfo-lua</em> Paket ist nicht installiert. Dieses Paket muss "
+"für eine funktionierende WLAN-Konfiguration vorhanden sein!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"Vom Provider zugewiesener IPv6 Präfix, endet normalerweise mit <code>::</"
+"code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Erlaubte Buchstaben sind: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr "Das Dateisystem mit dem der Speicher formatiert ist (z.B.: ext3)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Das Firmware-Image wurde hochgeladen. Nachfolgend sind die Prüfsumme und "
+"Dateigröße gelistet. Vergleichen Sie diese mit der Originaldatei um die "
+"Integrität sicherzustellen.<br /> Klicken Sie \"Fortfahren\" um die Flash-"
+"Prozedur zu starten."
+
+msgid "The following changes have been committed"
+msgstr "Die folgenden Änderungen wurden angewendet"
+
+msgid "The following changes have been reverted"
+msgstr "Die folgenden Änderungen wurden verworfen"
+
+msgid "The following rules are currently active on this system."
+msgstr "Die folgenden Regeln sind zur Zeit auf dem System aktiv."
+
+msgid "The given network name is not unique"
+msgstr "Der angebene Netzwerk-Name ist nicht eindeutig"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Die Hardware ist nicht Multi-SSID fähig und die existierende Konfiguration "
+"wird beim Fortfahren ersetzt."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"Länge des IPv4 Präfix in Bits, die übrigen Bits werden in der IPv6 Adresse "
+"verwendet."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Länge des IPv6 Präfix in Bits"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Die Netzwerkschnittstellen dieses Geräts können zu verschienden <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s zusammengefasst werden, in denen "
+"Geräte miteinander direkt kommunizieren können. <abbr title=\"Virtual Local "
+"Area Network\">VLAN</abbr>s werden auch häufig dazu genutzt, um Netzwerke "
+"voneinander zu trennen. So ist oftmals eine Schnittstelle als Uplink zu "
+"einem größeren Netz, wie dem Internet, vorkonfiguriert und die anderen "
+"Schnittstellen bilden ein <abbr title=\"Virtual Local Area Network\">VLAN</"
+"abbr> für das lokale Netzwerk."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Dem ausgewähltem Protokoll muss ein Gerät zugeordnet werden"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"Die Einstellungen werden nun gelöscht! Anschließend wird ein Neustart des "
+"Systems durchgeführt."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Der Flashvorgang läuft jetzt.<br /> SCHALTEN SIE NICHT DEN STROM AUS!<br /> "
+"Warten Sie einige Minuten bis das Gerät wieder erreichbar ist. Je nach "
+"Konfiguration ist es notwendig, dass Sie auf Ihrem Computer eine neue IP-"
+"Adresse beziehen müssen um auf das Gerät zugreifen zu können."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Das hochgeladene Firmware-Image hat ein nicht unterstütztes Format. Stellen "
+"Sie sicher dass Sie das generische Format für Ihre Platform gewählt haben."
+
+msgid "There are no active leases."
+msgstr "Es gibt z.Z. keine aktiven Leases."
+
+msgid "There are no pending changes to apply!"
+msgstr "Es gibt keine ausstehenen Änderungen anzuwenden!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Es gibt keine ausstehenen Änderungen zurückzusetzen!"
+
+msgid "There are no pending changes!"
+msgstr "Es gibt keine ausstehenen Änderungen!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Es wurde noch kein Netzwerkgerät zugeordnet, bitte ein Gerät im "
+"\"Physikalische Einstellungen\" Bereich anfügen"
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Es ist kein Passwort auf diesem Router gesetzt. Bitte konfigurieren Sie ein "
+"Root-Passwort um das Web-Interface zu schützen und SSH zu aktivieren."
+
+msgid "This IPv4 address of the relay"
+msgstr "IPv4-Adresse des Relais"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Dies ist eine Liste von Shell-Glob-Mustern um Dateien und Verzeichnisse zu "
+"selektieren welche während eines System-Upgrade gesichert werden sollen. "
+"Modifizierte Dateien in /etc/config/ und bestimmte andere essenzielle "
+"Konfigurationsdateien werden automatisch gesichert."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Dies ist der Inhalt von /etc.rc.local. Hier kann man eigene Befehle einfügen "
+"(vor 'exit 0'), die dann am Ende des Bootvorgangs ausgeführt werden."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Dies ist die lokale, vom Broker zugewiesene IPv6-Adresse, sie endet "
+"üblicherweise mit <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr "Dies ist der einzige DHCP im lokalen Netz"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Dies ist die System-Crontab in der geplante Aufgaben definiert werden können."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Dies ist üblicherweise die Adresse des nächstgelegenen PoPs betrieben durch "
+"den Tunnelbroker"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Diese Tabelle gibt eine Übersicht über aktuell laufende Systemprozesse und "
+"deren Status."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+"Diese Seite ermöglicht die Konfiguration benutzerdefinierter Tastenaktionen"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Diese Seite gibt eine Übersicht über aktive Netzwerkverbindungen."
+
+msgid "This section contains no values yet"
+msgstr "Diese Sektion enthält noch keine Einträge"
+
+msgid "Time Synchronization"
+msgstr "Zeitsynchronisation"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Die Zeitsynchronisation wurde noch nicht konfiguriert."
+
+msgid "Timezone"
+msgstr "Zeitzone"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Zum Wiederherstellen der Konfiguration kann hier ein bereits vorhandenes "
+"Backup-Archiv hochgeladen werden."
+
+msgid "Total Available"
+msgstr "Gesamt verfügbar"
+
+msgid "Traceroute"
+msgstr "Routenverfolgung"
+
+# Ich bin der Meinung Traffic versteht jeder! Wenn der Begriff "deutscher" sein soll, würde ich "Datenmenge" angeben. Aber "Verkehrs" passt nicht!
+msgid "Traffic"
+msgstr "Traffic"
+
+msgid "Transfer"
+msgstr "Transfer"
+
+msgid "Transmission Rate"
+msgstr "Übertragungsrate"
+
+msgid "Transmit"
+msgstr "Senden"
+
+msgid "Transmit Power"
+msgstr "Sendeleistung"
+
+msgid "Transmitter Antenna"
+msgstr "Sendeantenne"
+
+msgid "Trigger"
+msgstr "Auslöser"
+
+msgid "Trigger Mode"
+msgstr "Auslösmechanismus"
+
+msgid "Tunnel ID"
+msgstr "Tunnel-ID"
+
+msgid "Tunnel Interface"
+msgstr "Tunnelschnittstelle"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Turbo Modus"
+
+msgid "Tx-Power"
+msgstr "Sendestärke"
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Nur UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB-Gerät"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Kann Anfrage nicht zustellen"
+
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Unbekannter Fehler, Passwort nicht geändert!"
+
+msgid "Unmanaged"
+msgstr "Ignoriert"
+
+msgid "Unsaved Changes"
+msgstr "Ungespeicherte Änderungen"
+
+msgid "Unsupported protocol type."
+msgstr "Nicht unterstützter Protokolltyp."
+
+msgid "Update lists"
+msgstr "Listen aktualisieren"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Zum Ersetzen der aktuellen Firmware kann hier ein sysupgrade-Kompatibles "
+"Image hochgeladen werden. Wenn die vorhandene Konfiguration auch nach dem "
+"Update noch aktiv sein soll, aktivieren Sie \"Konfiguration behalten\"."
+
+msgid "Upload archive..."
+msgstr "Backup wiederherstellen..."
+
+msgid "Uploaded File"
+msgstr "hochgeladene Datei"
+
+msgid "Uptime"
+msgstr "Laufzeit"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Verwende /etc/ethers"
+
+msgid "Use DHCP gateway"
+msgstr "Benutze DHCP-Gateway"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Benutze die von der Gegenstelle zugewiesenen DNS-Server"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Muss ein ISO/IEC 3166 Länderkürzel sein."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Benutze MTU auf der Tunnelschnittstelle"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Benutze TTL auf der Tunnelschnittstelle"
+
+msgid "Use as root filesystem"
+msgstr "Als Wurzeldateisystem benutzen"
+
+msgid "Use broadcast flag"
+msgstr "Benutze Broadcast-Flag"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Benutze eigene DNS-Server"
+
+msgid "Use default gateway"
+msgstr "Benutze Standard-Gateway"
+
+msgid "Use gateway metric"
+msgstr "Benutze Gateway-Metrik"
+
+msgid "Use routing table"
+msgstr "Benutze Routing-Tabelle"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Die <em>Hinzufügen</em> Schaltfläche fügt einen neuen Lease-Eintrag hinzu. "
+"Die <em>MAC-Adresse</em> identifiziert den Host, die <em>IPv4-Adresse</em> "
+"definiert die zu nutzende statische Adresse und der <em>Hostname</em> ist "
+"der symbolische Name der dem Host zugewisen wird."
+
+msgid "Used"
+msgstr "Belegt"
+
+msgid "Used Key Slot"
+msgstr "Benutzer Schlüsselindex"
+
+msgid "Username"
+msgstr "Benutzername"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "VLAN Schnittstelle"
+
+msgid "VLANs on %q"
+msgstr "VLANs auf %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs auf %q (%s)"
+
+msgid "VPN Server"
+msgstr "VPN-Server"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Bei DHCP-Anfragen gesendete Vendor-Klasse"
+
+msgid "Verify"
+msgstr "Verifizieren"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "WEP Open System"
+
+msgid "WEP Shared Key"
+msgstr "WEP Shared Key"
+
+msgid "WEP passphrase"
+msgstr "WEP Schlüssel"
+
+msgid "WMM Mode"
+msgstr "WMM Modus"
+
+msgid "WPA passphrase"
+msgstr "WPA Schlüssel"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA-Verschlüsselung benötigt wpa_supplicant (für Client-Modus) oder hostapd "
+"(für AP oder Ad-Hoc Modus)."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Änderungen werden angewandt..."
+
+msgid "Waiting for command to complete..."
+msgstr "Der Befehl wird ausgeführt..."
+
+msgid "Warning"
+msgstr "Warnung"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Warnung: Es gibt ungespeicherte Änderungen, die bei einem Neustart verloren "
+"gehen!"
+
+msgid "Wifi"
+msgstr "Drahtlos"
+
+msgid "Wireless"
+msgstr "WLAN"
+
+msgid "Wireless Adapter"
+msgstr "WLAN-Gerät"
+
+msgid "Wireless Network"
+msgstr "Drahtlosnetzwerk"
+
+msgid "Wireless Overview"
+msgstr "Drahtlosübersicht"
+
+msgid "Wireless Security"
+msgstr "WLAN-Verschlüsselung"
+
+msgid "Wireless is disabled or not associated"
+msgstr "WLAN ist deaktiviert oder nicht assoziiert"
+
+msgid "Wireless is restarting..."
+msgstr "WLAN startet neu..."
+
+msgid "Wireless network is disabled"
+msgstr "Das WLAN-Netzwerk ist deaktiviert"
+
+msgid "Wireless network is enabled"
+msgstr "Das WLAN-Netzwerk ist aktiviert"
+
+msgid "Wireless restarted"
+msgstr "WLAN neu gestartet"
+
+msgid "Wireless shut down"
+msgstr "WLAN heruntergefahren"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Empfangene DNS-Anfragen in das Systemprotokoll schreiben"
+
+msgid "XR Support"
+msgstr "XR-Unterstützung"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Hier können installierte Startscripte aktiviert oder deaktiviert werden. "
+"Änderungen werden erst mit einem Geräteneustart angewendet.<br /"
+"><strong>Warnung: Wenn essentialle Startscripte wie \"network\" deaktiviert "
+"werden könnte das Gerät unerreichbar werden!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Im Browser muss Java-Script aktiviert sein oder LuCI wird nicht richtig "
+"funktionieren."
+
+msgid "any"
+msgstr "beliebig"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "automatic"
+msgstr "automatisch"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "bridged"
+
+msgid "create:"
+msgstr "erstelle:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "überbrückt angegebene Schnittstelle(n)"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "deaktivieren"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "abgelaufen"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr "Speicherort für vergebenen DHCP-Adressen"
+
+msgid "forward"
+msgstr "weitergeleitet"
+
+msgid "full-duplex"
+msgstr "Voll-Duplex"
+
+msgid "half-duplex"
+msgstr "Halb-Duplex"
+
+msgid "help"
+msgstr "Hilfe"
+
+msgid "hidden"
+msgstr "versteckt"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "falls Ziel ein Netzwerk ist"
+
+msgid "input"
+msgstr "eingehend"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "Lokale DNS-Datei"
+
+msgid "no"
+msgstr "nein"
+
+msgid "no link"
+msgstr "nicht verbunden"
+
+msgid "none"
+msgstr "keine"
+
+msgid "off"
+msgstr "aus"
+
+msgid "on"
+msgstr "ein"
+
+msgid "open"
+msgstr "offen"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "routed"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "tagged"
+
+msgid "unknown"
+msgstr "unbekannt"
+
+msgid "unlimited"
+msgstr "unbegrenzt"
+
+msgid "unspecified"
+msgstr "unspezifiziert"
+
+msgid "unspecified -or- create:"
+msgstr "nichts auswählen -oder- erstellen:"
+
+msgid "untagged"
+msgstr "untagged"
+
+msgid "yes"
+msgstr "ja"
+
+msgid "« Back"
+msgstr "« Zurück"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "HE.net Benutzer-ID"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Die ist die 32 Zeichen lange, hexadezimal kodierte Nutzer-ID, nicht der "
+#~ "Benutzername."
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz, Sekundärkanal oberhalb"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz, Sekundärkanal unterhalb"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Routerankündigungen (RAs) akzeptieren"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "IPv6 auf folgendem Netzwerk ankündigen"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Angekündigte Subnetz-ID"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Erlaubter Bereich 1 bis 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT-Fähigkeiten"
+
+#~ msgid "HT mode"
+#~ msgstr "HT-Modus"
+
+#~ msgid "Router Model"
+#~ msgstr "Routermodell"
+
+#~ msgid "Router Name"
+#~ msgstr "Routername"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Sende Router-Solicitations"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "Bestimmt die bevorzugte angekündigte Prefix-Lebenszeit in Sekunden"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Bestimmt die gültige angeündigte Prefix-Lebenszeit in Sekunden"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Benutze bevorzugte Lebenszeit"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Benutze gültige Lebenszeit"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Warte auf den Router..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "NTP Server aktivieren"
+
+#~ msgid "Active Leases"
+#~ msgstr "Aktive Zuweisungen"
+
+#~ msgid "Open"
+#~ msgstr "Offen"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Bitrate"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Konfiguration / Anwenden"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Konfiguration / Änderungen"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Konfiguration / Zurücksetzen"
+
+#~ msgid "MAC"
+#~ msgstr "MAC-Adresse"
+
+#~ msgid "MAC Address"
+#~ msgstr "MAC-Adresse"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Verschlüsselung\">Vers.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "WLAN-Scan"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr "Wählt die Schnittstelle die diesem Netzwerk zugeordnet wird."
+
+#~ msgid "Create Network"
+#~ msgstr "Netzwerk anlegen"
+
+#~ msgid "Link"
+#~ msgstr "Verbindung"
+
+#~ msgid "Networks"
+#~ msgstr "Netzwerke"
+
+#~ msgid "Power"
+#~ msgstr "Leistung"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Drahtlosnetzwerke in der lokalen Umgebung des Routers:"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr "CIDR-Notation: Adresse/Prefix"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "DNS-Server"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "IPv4-Broadcast"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "IPv6-Adresse"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "IP Aliase"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "IPv6 Einstellungen"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Hinweis: When eine Schnittstelle gewählt wird, welche Mitglied eines "
+#~ "anderen Netzwerkes ist, wird sie in dieses Netzwerk verschoben"
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Diese Schnittstelle wirklich löschen? Der Schritt kann nicht rückgängig "
+#~ "gemacht werden!\\nDer Zugriff auf den Router könnte verlorengehen wenn "
+#~ "Sie über diese Schnittstelle verbunden sind."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Dieses Drahtlosnetzwerk wirklich löschen? Der Schritt kann nicht "
+#~ "rückgängig gemacht werden!\\nDer Zugriff auf den Router könnte "
+#~ "verlorengehen wenn Sie über dieses Netzwerk verbunden sind."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Die Schnitstelle \"%s\" wirklich herunterfahren?\\nDer Zugriff auf den "
+#~ "Router könnte verlorengehen wenn Sie über diese Schnittstelle verbunden "
+#~ "sind."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Das Netzwerk wirklich herunterfahren?\\nDer Zugriff auf den Router könnte "
+#~ "verlorengehen wenn Sie über diese Schnittstelle verbunden sind."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Die Netzwerkschnittstellen am Router können zu verschienden VLANs "
+#~ "zusammengefasst werden, in denen Geräte miteinander direkt kommunizieren "
+#~ "können. VLANs werden auch häufig dazu genutzt, um Netzwerke voneinander "
+#~ "zu trennen. So ist oftmals eine Schnittstelle als Uplink zu einem "
+#~ "größeren Netz, wie dem Internet, vorkonfiguriert und die anderen "
+#~ "Schnittstellen bilden ein VLAN für das lokale Netzwerk."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Pufferung aktivieren"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6-über-IPv4"
+
+#~ msgid "Custom Files"
+#~ msgstr "Benutzerdefinierte Dateien"
+
+#~ msgid "Custom files"
+#~ msgstr "Benutzerdefinierte Dateien"
+
+#~ msgid "Detected Files"
+#~ msgstr "Erkannte Dateien"
+
+#~ msgid "Detected files"
+#~ msgstr "Erkannte Dateien"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Zu übernehmende Dateien bei Firmwareupgrade"
+
+#~ msgid "General"
+#~ msgstr "Allgemeines"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst "
+#~ "werden."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "UCI-Befehle beim Anwenden"
+
+#~ msgid ""
+#~ "The following files are detected by the system and will be kept "
+#~ "automatically during sysupgrade"
+#~ msgstr ""
+#~ "Die folgenden Dateien wurden vom System erkannt und werden bei einen "
+#~ "System-Update automatisch beibehalten"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Beim Anwenden der Konfiguration aus der Oberflächliche heraus können "
+#~ "automatisch die relevanten Dienste neugestart werden, sodass Änderungen "
+#~ "sofort nach dem Anwenden aktiv werden und der Router nicht erst "
+#~ "neugestartet werden muss."
+
+#~ msgid ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+#~ msgstr ""
+#~ "Dies ist eine Liste von Shell-Glob-Mustern um Dateien und Verzeichnisse "
+#~ "zu wählen welche bei einem Systemupgrade beibehalten werden sollen"
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Weboberfläche"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+
+#~ msgid "AHCP Settings"
+#~ msgstr "AHCP-Einstellungen"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "ARP-Ping Versuche"
+
+#~ msgid "ATM Settings"
+#~ msgstr "ATM Einstellungen"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "Router Advertisements akzeptieren"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Zugriffspunkt (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Weitere pppd Optionen"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "Der Erlaubte Bereich liegt zwischen 1 und FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Automatische Trennung"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Sicherungsarchiv"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Konfiguriert den lokalen DNS-Server so, dass er die von der Gegenstelle "
+#~ "angekündigten Nameserver-Adressen nutzt"
+
+#~ msgid "Connect script"
+#~ msgstr "Verbindungs-Script"
+
+#~ msgid "Create backup"
+#~ msgstr "Sicherung erstellen"
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Trennuns-Script"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Paketlisten und Installationsziele bearbeiten"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "Aktiviere 4K VLANs"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "IPv6 für die PPP-Verbindung aktivieren"
+
+#~ msgid "Firmware image"
+#~ msgstr "Firmware-Image"
+
+#~ msgid "Forward DHCP"
+#~ msgstr "DHCP weiterleiten"
+
+#~ msgid "Forward broadcasts"
+#~ msgstr "Broadcasts weiterleiten"
+
+#~ msgid "HE.net Tunnel ID"
+#~ msgstr "HE.net Tunnel ID"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Auf dieser Seite können Sicherungen der Konfiguration erstellt und "
+#~ "eingespielt werden und - wenn möglich - die Grundeinstellungen "
+#~ "wiederhergestellt werden."
+
+#~ msgid "Installation targets"
+#~ msgstr "Installationsziele"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Konfigurationsdateien erhalten"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid "Kernel"
+#~ msgstr "Kernel"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Lässt pppd die aktuelle Standardroute ersetzen und über die PPP "
+#~ "Schnittstelle leiten"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr ""
+#~ "Lässt pppd das angegebene Script nach dem Aufbau der PPP Verbindung "
+#~ "abarbeiten"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr ""
+#~ "Lässt pppd das angegebene Script vor dem Trennen der PPP Verbindung "
+#~ "abarbeiten"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Stellen Sie sicher das die richtige PIN hier eingetragen wird, sonst "
+#~ "könnte die SIM-Karte gesperrt werden!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "Es handelt sich hierbei meist um Netzwerkserver, die verschiedene "
+#~ "Aufgaben auf dem Router erfüllen, beispielsweise Shell-Zugang ermöglichen "
+#~ "oder diese Weboberfläche über HTTP zur Verfügung stellen."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Anzahl fehlgeschlagener Verbindungstests nach der automatisch neu "
+#~ "verbunden wird"
+
+#~ msgid "Override Gateway"
+#~ msgstr "Gateway erzwingen"
+
+#~ msgid "PIN code"
+#~ msgstr "PIN-Code"
+
+#~ msgid "PPP Settings"
+#~ msgstr "PPP Einstellungen"
+
+#~ msgid "Package lists"
+#~ msgstr "Paketlisten"
+
+#~ msgid ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> specify the default "
+#~ "VLAN ID added to received untagged frames."
+#~ msgstr ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> definieren die "
+#~ "Standard-VLAN ID welche zu empfangenen, untagged Ethernet-Frames "
+#~ "hinzugefügt wird."
+
+#~ msgid "Port PVIDs on %q"
+#~ msgstr "Port PVIDs auf %q"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr ""
+#~ "Alle aktuellen Einstellungen verwerfen und Grundeinstellungen "
+#~ "wiederherstellen?"
+
+#~ msgid "Processor"
+#~ msgstr "Prozessor"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radius-Port"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radius-Server"
+
+#~ msgid "Relay Settings"
+#~ msgstr "Relay-Einstellungen"
+
+#~ msgid "Replace default route"
+#~ msgstr "Standardroute ersetzen"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Grundeinstellungen wiederherstellen"
+
+#~ msgid "Routing table ID"
+#~ msgstr "Nr. der Routingtabelle"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Zeit in Sekunden um auf die Initialisierung des Modems zu warten bevor "
+#~ "ein Verbindungsversuch unternommen wird"
+
+#~ msgid "Send Router Solicitiations"
+#~ msgstr "Router Solicititaions senden"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "Server IPv4-Adresse"
+
+#~ msgid "Service type"
+#~ msgstr "Dienstart"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr ""
+#~ "Dienste und Hintergrundprozesse stellen den Großteil der Funktionalitäten "
+#~ "auf dem Router zur Verfügung."
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Initialisierungszeit"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Sorry. libreCMC unterstützt kein Systemupdate auf dieser Platform.<br /> "
+#~ "Sie müssen das Gerät manuell neu flashen."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr ""
+#~ "Hier können zusätzliche Kommandozeilenargumente für pppd angegeben werden"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Geräteknoten des Modems, z.B. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird"
+
+#~ msgid "Time Server (rdate)"
+#~ msgstr "Zeit-Server (rdate)"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "Tunnel-Einstellungen"
+
+#~ msgid "Update package lists"
+#~ msgstr "Paketlisten aktualisieren"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Firmware-Image hochladen um das Gerät neu zu flashen."
+
+#~ msgid "Upload image"
+#~ msgstr "Image hochladen"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "DNS der Gegenstelle nutzen"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid ""
+#~ "You can specify multiple DNS servers here, press enter to add a new "
+#~ "entry. Servers entered here will override automatically assigned ones."
+#~ msgstr ""
+#~ "Hier können mehrere DNS-Server angegeben werden. Enter fügt ein neues "
+#~ "Eingabefeld hinzu. Hier angegebene Server überschreiben autmatisch "
+#~ "zugewiesene Adressen."
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Für die Unterstützung von UMTS/GPRS muss \"comgt\", für PPPoE \"ppp-mod-"
+#~ "pppoe\", für PPPoA \"ppp-mod-pppoa\" und für PPtP \"pptp\" installiert "
+#~ "sein"
+
+#~ msgid "back"
+#~ msgstr "zurück"
+
+#~ msgid "buffered"
+#~ msgstr "gepuffert"
+
+#~ msgid "cached"
+#~ msgstr "gecached"
+
+#~ msgid "free"
+#~ msgstr "frei"
+
+#~ msgid "static"
+#~ msgstr "statisch"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "LuCI ist eine Sammlung freier Lua-Software einschließlich eines MVC-"
+#~ "Webframeworks und einer Weboberfläche für eingebettete Geräte. Luci steht "
+#~ "unter der Apache-Lizenz."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "SSH-Schlüssel"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Ein schlanker HTTP/1.1 Webserver in C und Lua geschrieben um LuCI zu "
+#~ "betreiben."
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Ein kleiner Webserver, der für die Bereitstellung von LuCI genutzt werden "
+#~ "kann."
+
+#~ msgid "About"
+#~ msgstr "Über"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "Aktive IP Verbindungen"
+
+#~ msgid "Addresses"
+#~ msgstr "Adressen"
+
+#~ msgid "Admin Password"
+#~ msgstr "Passwort ändern"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Anmeldeaufforderung"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Port"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr "Ändert das Passwort des Systemverwalters (Benutzer \"root\")"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Client mit WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Konfigurationsdatei"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Verbindungszeitlimit"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Mitwirkende Entwickler"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "durch DHCP zugewiesen"
+
+#~ msgid "Document root"
+#~ msgstr "Wurzelverzeichnis"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Keep-Alive aktivieren"
+
+#~ msgid "Enable device"
+#~ msgstr "Gerät aktivieren"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Netzwerkbrücke"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Hier können öffentliche SSH-Schlüssel (einer pro Zeile) zur "
+#~ "Authentifizierung abgelegt werden."
+
+#~ msgid "ID"
+#~ msgstr "Bezeichner"
+
+#~ msgid "IP Configuration"
+#~ msgstr "IP Konfiguration"
+
+#~ msgid "Interface Status"
+#~ msgstr "Netzwerkschnittstellen-Status"
+
+#~ msgid "Lead Development"
+#~ msgstr "Leitende Entwicklung"
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Master mit WDS"
+
+#~ msgid "No address configured on this interface."
+#~ msgstr "Keine Adresse auf dieser Schnittstelle konfiguriert"
+
+#~ msgid "Not configured"
+#~ msgstr "nicht konfiguriert"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Passwort erfolgreich geändert"
+
+#~ msgid "Plugin path"
+#~ msgstr "Pluginpfad"
+
+#~ msgid "Ports"
+#~ msgstr "Ports"
+
+#~ msgid "Primary"
+#~ msgstr "primär"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Projekt Homepage"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo-Ad-Hoc (Atheros)"
+
+#~ msgid "STP"
+#~ msgstr "Spanning-Tree-Protokoll"
+
+#~ msgid "Thanks To"
+#~ msgstr "Dank an"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr "Aufforderungstext zum Anmelden im Administrationsbereich"
+
+#~ msgid "Unknown Error"
+#~ msgstr "Unbekannter Fehler"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "nutzt <code>/etc/httpd.conf</code> wenn leer"
+
+#~ msgid "Enable this switch"
+#~ msgstr "Switch aktivieren"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG Fehlercode %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Paketlisten wurden aktualisiert"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "Switch während der Einrichtung zurücksetzen"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Installierte Pakete aktualisieren"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Zusätzlich können hier Protokolldaten, des Kernels und diverser "
+#~ "Systemdienste eingesehen werden, um deren Zustand zu kontrollieren."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Hier finden sich Informationen über den aktuellen Status des Systems, "
+#~ "beispielsweise Prozessortakt, Speicherauslastung und "
+#~ "Netzwerkschnittstellen."
+
+#~ msgid "Search file..."
+#~ msgstr "Datei suchen..."
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "LuCI ist eine freie, flexible und benutzerfreundliche grafische "
+#~ "Oberfläche zur Konfiguration von libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "Und nun wünschen wir viel Spaß mit dem Router!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Wir sind natürlich stets darum bemüht, diese Oberfläche noch besser und "
+#~ "intuitiver zu Gestalten und freuen uns über jegliche Art von Feedback "
+#~ "oder Verbesserungsvorschlägen."
+
+#~ msgid "Hello!"
+#~ msgstr "Hallo!"
+
+#~ msgid "LuCI Components"
+#~ msgstr "LuCI Komponenten"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Hinweis: In LuCI werden getätigte Änderungen erst nach einem Klick auf "
+#~ "Änderungen - Speichern &amp; Anwenden angewandt."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Auf den folgenden Seiten können alle wichtigen Einstellungen des Routers "
+#~ "vorgenommen werden."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "Das LuCI-Team"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr "Dies ist der Administrationsbereich von LuCI."
+
+#~ msgid "User Interface"
+#~ msgstr "Benutzeroberfläche"
+
+#~ msgid "used"
+#~ msgstr "benutzt"
+
+#~ msgid "enable"
+#~ msgstr "aktivieren"
+
+#~ msgid ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> specify the default "
+#~ "VLAN ID added to received untagged frames.<br />Leave the ID field empty "
+#~ "to disable auto tagging on the associated port."
+#~ msgstr ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> definieren die "
+#~ "standard VLAN-ID welche zu empfangen, nicht getaggten Ethernet-Frames "
+#~ "hinzugefügt wird.<br />Dieses Feld leer lassen um Auto-Tagging auf dem "
+#~ "zugehörigen Port zu deaktivieren."
+
+#~ msgid "(hidden)"
+#~ msgstr "(versteckt)"
+
+#~ msgid "(optional)"
+#~ msgstr "(optional)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "DNS-Port"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr "DNS-Server werden gemäß der Reihenfolge der Resolvdatei abgefragt"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr "maximale Anzahl von DHCP-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "maximale <abbr title=\"Extension Mechanisms for Domain Name System"
+#~ "\">EDNS.0</abbr> Paketgröße"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "AP-Isolation"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "WLAN-Netz zu Netzwerk hinzufügen"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliasse"
+
+#~ msgid "Attach to existing network"
+#~ msgstr "Zu bestehendem Netzwerk hinzufügen"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "MSS-Korrektur"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Netzwerk anlegen"
+
+#~ msgid "DHCP"
+#~ msgstr "DHCP"
+
+#~ msgid "Devices"
+#~ msgstr "Geräte"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Reverse DNS-Anfragen für lokale Netze nicht weiterleiten"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "TFTP-Server aktivieren"
+
+#~ msgid "Errors"
+#~ msgstr "Fehler"
+
+#~ msgid "Essentials"
+#~ msgstr "Vereinfacht"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Erweitere Hosts"
+
+#~ msgid "First leased address"
+#~ msgstr "Erste vergebene Adresse"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Behebt Probleme bei nicht erreichbaren Webseiten, Absenden von Formularen "
+#~ "oder anderes unerwartetes Verhalten für einige ISPs."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Hardware Adresse"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "An dieser Stelle können eingebaute WLAN-Geräte konfiguriert werden."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignoriere /etc/hosts"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Unabhängig (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Internetverbindung"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Einklinken (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Zuweisungen"
+
+#~ msgid "Local Domain"
+#~ msgstr "Lokale Domain"
+
+#~ msgid "Local Network"
+#~ msgstr "Lokales Netz"
+
+#~ msgid "Local Server"
+#~ msgstr "Lokale Server"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Netzwerk-Boot Abbild"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr "Netzkennung (ESSID)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Anzahl vergebener Adressen"
+
+#~ msgid "Path"
+#~ msgstr "Pfad"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Aktionen ausführen"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Unterbindet Client-Client-Verkehr"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Anbieten (Access Point)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Resolvdatei"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "TFTP-Server Wurzelverzeichnis"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Die folgenden Änderungen wurden übernommen"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Die folgenden Dateien und Verzeichnisse werden beim Aktualisieren der "
+#~ "Firmware über die Oberfläche automatisch in die neue Firmware übernommen."
+
+#~ msgid "Wireless Scan"
+#~ msgstr "WLAN-Scan"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Mit <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "können Netzwerkteilnehmer automatisch Einstellungen wie <abbr title="
+#~ "\"Internet Protocol\">IP</abbr>-Adresse, Präfix, <abbr title=\"Domain "
+#~ "Name System\">DNS</abbr>-Server, usw. beziehen."
+
+#~ msgid ""
+#~ "You are about to join the wireless network <em><strong>%s</strong></em>. "
+#~ "In order to complete the process, you need to provide some additional "
+#~ "details."
+#~ msgstr ""
+#~ "Sie sind dabei dem Drahtlosnetzwerk <em><strong>%s</strong></em> "
+#~ "beizutreten.Um den Prozess zu beenden müssen einige weitere Angaben "
+#~ "gemacht werden."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Pro WLAN-Gerät können mehrere Netze bereitgestellt werden. Es sollte "
+#~ "beachtet werden, dass es hardware- / treiberspezifische Einschränkungen "
+#~ "gibt. So kann pro WLAN-Gerät in der Regel entweder 1 Ad-Hoc-Zugang ODER "
+#~ "bis zu 3 Access-Point und 1 Client-Zugang gleichzeitig erstellt werden."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Für die Unterstützung von PPPoE muss \"ppp-mod-pppoe\" und für PPtP \"pptp"
+#~ "\" installiert sein"
+
+#~ msgid ""
+#~ "You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
+#~ msgstr ""
+#~ "Sie müssen <a href='%s'><em>wpa-supplicant</em></a> isntallieren um WPA "
+#~ "nutzen zu können!"
+
+#~ msgid ""
+#~ "You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> "
+#~ "to use WPA!"
+#~ msgstr ""
+#~ "Sie müssen den <a href='%s'>Broadcom <em>nas</em> Supplikaten "
+#~ "installieren um WPA nutzen zu können!"
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "additional hostfile"
+#~ msgstr "Zusätzliche Hostdatei"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr ""
+#~ "Fügt Domainnamen zu einfachen Hosteinträgen in der Resolvdatei hinzu"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "automatisch neu verbinden"
+
+#~ msgid "concurrent queries"
+#~ msgstr "gleichzeitige Abfragen"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr "DHCP für dieses Netzwerk deaktivieren"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "trennen bei Inaktivität nach"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "Unbekannte nicht cachen"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr "nutzlose DNS-Anfragen aktueller Windowssysteme filtern"
+
+#~ msgid "installed"
+#~ msgstr "installiert"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr ""
+#~ "Gibt die Adresse eines Hostnamen entsprechend seines Subnetzes zurück"
+
+#~ msgid "manual"
+#~ msgstr "manuell"
+
+#~ msgid "not installed"
+#~ msgstr "nicht installiert"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr "Negative DNS-Antworten nicht zwischenspeichern"
+
+#~ msgid "query port"
+#~ msgstr "Abfrageport"
+
+#~ msgid "transmitted / received"
+#~ msgstr "gesendet / empfangen"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "verbundene Netzwerke"
+
+#~ msgid "all"
+#~ msgstr "alle"
+
+#~ msgid "Code"
+#~ msgstr "Code"
+
+#~ msgid "Distance"
+#~ msgstr "Distanz"
+
+#~ msgid "Legend"
+#~ msgstr "Legende"
+
+#~ msgid "Library"
+#~ msgstr "Bibliothek"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "siehe &#39;%s&#39; manpage"
+
+#~ msgid "Package Manager"
+#~ msgstr "Packet-Manager"
+
+#~ msgid "Service"
+#~ msgstr "Dienst"
+
+#~ msgid "Statistics"
+#~ msgstr "Statistiken"
+
+#~ msgid "zone"
+#~ msgstr "Zone"
diff --git a/trunk/package/luci/po/de/commands.po b/trunk/package/luci/po/de/commands.po
new file mode 100644
index 00000000..09c56b39
--- /dev/null
+++ b/trunk/package/luci/po/de/commands.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-11-21 18:45+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Kurze Beschreibung des abgespeicherten Kommandos"
+
+msgid "Access command with"
+msgstr "Kommando aufrufen mit"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Ausführen des Kommandos und Herunterladen der Ausgabe ohne vorherige "
+"Authentifizierung ermöglichen"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Erlaube dem Nutzer zusätzliche Kommandozeilenargumente zu übergeben"
+
+msgid "Arguments:"
+msgstr "Argumente:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Binärdaten ausgeblendet, laden Sie die Ausgaben stattdessen herunter"
+
+msgid "Code:"
+msgstr "Rückgabewert:"
+
+msgid "Collecting data..."
+msgstr "Sammle Daten..."
+
+msgid "Command"
+msgstr "Kommando"
+
+msgid "Command failed"
+msgstr "Kommando fehlgeschlagen"
+
+msgid "Command line to execute"
+msgstr "Auszuführende Kommandozeile"
+
+msgid "Command successful"
+msgstr "Kommando erfolgreich"
+
+msgid "Command:"
+msgstr "Kommando:"
+
+msgid "Configure"
+msgstr "Konfigurieren"
+
+msgid "Custom Commands"
+msgstr "Benutzerdefinierte Kommandos"
+
+msgid "Custom arguments"
+msgstr "Benutzerdefinierte Argumente"
+
+msgid "Dashboard"
+msgstr "Übersicht"
+
+msgid "Description"
+msgstr "Beschreibung"
+
+msgid "Download"
+msgstr "Herunterladen"
+
+msgid "Failed to execute command!"
+msgstr "Kommando konnte nicht ausgeführt werden!"
+
+msgid "Link"
+msgstr "Link"
+
+msgid "Loading"
+msgstr "Lade"
+
+msgid "Public access"
+msgstr "Öffentlicher Zugriff"
+
+msgid "Run"
+msgstr "Ausführen"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Diese Seite ermöglicht die Konfiguration eigener Shell-Kommandos um diese "
+"einfach über das Webinterface ausführen zu können."
+
+msgid "Waiting for command to complete..."
+msgstr "Warte auf die Ausführung des Kommandos..."
diff --git a/trunk/package/luci/po/de/coovachilli.po b/trunk/package/luci/po/de/coovachilli.po
new file mode 100644
index 00000000..d8322db3
--- /dev/null
+++ b/trunk/package/luci/po/de/coovachilli.po
@@ -0,0 +1,658 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2012-07-17 15:05+0200\n"
+"Last-Translator: Martin <roecker@empty-v.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Netzwerk-Konfiguration"
+
+msgid "RADIUS configuration"
+msgstr "RADIUS Konfiguration"
+
+msgid "UAM and MAC Authentication"
+msgstr "UAM- und MAC-Authentifizierung"
+
+#~ msgid "General configuration"
+#~ msgstr "Allgemeine Einstellungen"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Allgemeine Einstellungen zu CoovaChilli"
+
+#, fuzzy
+#~ msgid "Command socket"
+#~ msgstr "Eingabeschnittstelle"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr ""
+#~ "UNIX socket der fuer die Kommunikation mit chilli_query benutzt wird"
+
+#, fuzzy
+#~ msgid "Config refresh interval"
+#~ msgstr "Zeit zwischen neuladen der Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr "Zeit zwischen neuladen der Konfiguration"
+
+#~ msgid "Pid file"
+#~ msgstr "<abbr title=\"Prozessindentifikationsnummer\">Pid</abbr>-Datei"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr ""
+#~ "Name der Datei, in der die <abbr title=\"Prozessindentifikationsnummer"
+#~ "\">Pid</abbr> gespeichert wird"
+
+#, fuzzy
+#~ msgid "State directory"
+#~ msgstr "Statisches Verzeichniss"
+
+#~ msgid "Directory of non-volatile data"
+#~ msgstr "Verzeichniss für statische Daten"
+
+#, fuzzy
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "TUN/TAP Konfiguration"
+
+#, fuzzy
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Network down script"
+#~ msgstr ""
+#~ "Script, das nach einer Umwandlung von einer autorisierten zu einer "
+#~ "unautorisierten Sitzung ausgeführt wird"
+
+#~ msgid ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+#~ msgstr ""
+#~ "Skript, das nach einer Umwandlung von einer autorisierten zu einer "
+#~ "unautorisierten Sitzung ausgeführt wird"
+
+#~ msgid "Network up script"
+#~ msgstr "Netzwerk Up Skript"
+
+#, fuzzy
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Primärer DNS-Server"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Sekundärer DNS-Server"
+
+#, fuzzy
+#~ msgid "Domain name"
+#~ msgstr "Domain Name"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr ""
+#~ "Wird benutzt um Clients ueber den zu benutzenden Domain Namen fuer DNS "
+#~ "Anfragen zu informieren"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Dynamischer IP-Adressen Pool"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Legt einen Bereich von dynamischen IP-Adressen fest"
+
+#~ msgid "IP down script"
+#~ msgstr "IP down Skript"
+
+#, fuzzy
+#~ msgid "Script executed after the tun network interface has been taken down"
+#~ msgstr ""
+#~ "Script, das nach einer Umwandlung von einer autorisierten zu einer "
+#~ "unautorisierten Sitzung ausgeführt wird"
+
+#, fuzzy
+#~ msgid "IP up script"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+#~ msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
+
+#, fuzzy
+#~ msgid "Uplink subnet"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr ""
+#~ "Zur Auflösung der Host-Namen benötigter DNS Server, die an den client "
+#~ "übertragen wird"
+
+#, fuzzy
+#~ msgid "Static IP address pool"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
+
+#, fuzzy
+#~ msgid "TUN/TAP device"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "The specific device to use for the TUN/TAP interface"
+#~ msgstr ""
+#~ "Script, das nach einer Umwandlung von einer autorisierten zu einer "
+#~ "unautorisierten Sitzung ausgeführt wird"
+
+#, fuzzy
+#~ msgid "TX queue length"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr ""
+#~ "Script, das nach einer Umwandlung von einer autorisierten zu einer "
+#~ "unautorisierten Sitzung ausgeführt wird"
+
+#, fuzzy
+#~ msgid "Use TAP device"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
+
+#, fuzzy
+#~ msgid "DHCP configuration"
+#~ msgstr "TUN/TAP Konfiguration"
+
+#, fuzzy
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "DHCP end number"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Where to stop assigning IP addresses (default 254)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "DHCP interface"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Ethernet interface to listen to for the downlink interface"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Listen MAC address"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "MAC address to listen to. If not specified the MAC address of the "
+#~ "interface will be used"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "DHCP start number"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Where to start assigning IP addresses (default 10)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Leasetime"
+#~ msgstr "Vorhaltezeit"
+
+#~ msgid "Use a DHCP lease of seconds (default 600)"
+#~ msgstr "Benutze eine DHCP-Vorhaltezeit in Sekunden (voreingestelllt 600)"
+
+#~ msgid "Allow session update through RADIUS"
+#~ msgstr "Erlaube Sitzungsupdates durch RADIUS"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allow updating of session parameters with RADIUS attributes sent in "
+#~ "Accounting-Response"
+#~ msgstr ""
+#~ "Erlaubt das Aktuallisieren der Sitzungsparameter mit RADIUS-attributen, "
+#~ "die im der Konten-Antwort enthalten sind"
+
+#~ msgid "Admin password"
+#~ msgstr "Administratorkennwort"
+
+#, fuzzy
+#~ msgid ""
+#~ "Password to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Kennwort zur Administratoren-Authentifizierung um die chilli- "
+#~ "konfigurationen aufzunehmen und eine Systemsitzung fürs Gerät zu erstellen"
+
+#, fuzzy
+#~ msgid "Admin user"
+#~ msgstr "Adminstratorenkennung"
+
+#, fuzzy
+#~ msgid ""
+#~ "User-name to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr "Benutzername des für Administration berechtigten Benutzers. "
+
+#, fuzzy
+#~ msgid "Do not check disconnection requests"
+#~ msgstr "Ignoriere die Verbindungstrennungsanfragen"
+
+#, fuzzy
+#~ msgid "Do not check the source IP address of radius disconnect requests"
+#~ msgstr "Prüft nicht die Quell-IP einer RADIUS Verbindungstrennungsanfrage."
+
+#, fuzzy
+#~ msgid "RADIUS disconnect port"
+#~ msgstr "Port f&uuml;r die Verbindungstrennung"
+
+#, fuzzy
+#~ msgid "UDP port to listen to for accepting radius disconnect requests"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "NAS IP"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Value to use in RADIUS NAS-IP-Address attribute"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "NAS MAC"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Allow OpenID authentication"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows OpenID authentication by sending ChilliSpot-Config=allow-"
+#~ "openidauth in RADIUS Access-Requests"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS accounting port"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "The UDP port number to use for radius accounting requests (default 1813)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS authentication port"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "The UDP port number to use for radius authentication requests (default "
+#~ "1812)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Option radiuscalled"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS listen address"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Local interface IP address to use for the radius interface"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS location ID"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "WISPr Location ID"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS location name"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "WISPr Location Name"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "NAS ID"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Network access server identifier"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Option radiusnasip"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "NAS port type"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Send RADIUS VSA"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS secret"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Radius shared secret for both servers"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS server 1"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "The IP address of radius server 1"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "RADIUS server 2"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "The IP address of radius server 2"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Swap octets"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Allow WPA guests"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+#~ "guests in RADIUS Access-Requests"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "UAM configuration"
+#~ msgstr "TUN/TAP Konfiguration"
+
+#, fuzzy
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Inspect DNS traffic"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
+#~ "records to prevent dns tunnels (experimental)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Local users file"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid ""
+#~ "A colon seperated file containing usernames and passwords of locally "
+#~ "authenticated users"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Human readable location name used in JSON interface"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Do not redirect to UAM server"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Do not do WISPr"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Allowed resources"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Allow any DNS server"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "Allow any IP address"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Allowed domains"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid ""
+#~ "Defines a list of domain names to automatically add to the walled garden"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "UAM homepage"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "UAM static content port"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "TCP port to bind to for only serving embedded content"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "UAM listening address"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "UAM logout IP"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "UAM listening port"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "TCP port to bind to for authenticating clients (default 3990)"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "UAM secret"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "Shared secret between uamserver and chilli"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "UAM server"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "UAM user interface"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid ""
+#~ "An init.d style program to handle local content on the uamuiport web "
+#~ "server"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "WISPr login url"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Specific URL to be given in WISPr XML LoginURL"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "CGI program"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid ""
+#~ "Executable to run as a CGI type program (like haserl) for URLs with "
+#~ "extention .chi"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Web content directory"
+#~ msgstr "Domain Name"
+
+#, fuzzy
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "MAC configuration"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Allowed MAC addresses"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "List of MAC addresses for which MAC authentication will be performed"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Authenticate locally allowed MACs"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Authenticate allowed MAC addresses without the use of RADIUS"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Enable MAC authentification"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Try to authenticate all users based on their mac address alone"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Password used when performing MAC authentication"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "Suffix"
+#~ msgstr "Netzwerk/TUN Konfiguration"
+
+#, fuzzy
+#~ msgid "coovachilli_macauth_macsuffix_desc"
+#~ msgstr "Netzwerk/TUN Konfiguration"
diff --git a/trunk/package/luci/po/de/ddns.po b/trunk/package/luci/po/de/ddns.po
new file mode 100644
index 00000000..bed35212
--- /dev/null
+++ b/trunk/package/luci/po/de/ddns.po
@@ -0,0 +1,602 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: luci-app-ddns\n"
+"POT-Creation-Date: 2014-11-09 13:41+0100\n"
+"PO-Revision-Date: 2014-11-09 14:29+0100\n"
+"Last-Translator: Christian Schoenebeck <christian.schoenebeck@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-Basepath: .\n"
+
+msgid "&"
+msgstr "&"
+
+msgid "Basic Settings"
+msgstr "Grundlegende Einstellungen"
+
+msgid ""
+"Below a list of configuration tips for your system to run Dynamic DNS "
+"updates without limitations"
+msgstr ""
+"Liste der Konfigurationshinweise um Dynamische DNS Aktualisierungen ohne "
+"Einschränkungen zu nutzen"
+
+msgid ""
+"Below is a list of configured DDNS configurations and their current state."
+"<br />If you want to send updates for IPv4 and IPv6 you need to define two "
+"separate Configurations i.e. 'myddns_ipv4' and 'myddns_ipv6'"
+msgstr ""
+"Liste der definierten DDNS Konfigurationen und ihr aktueller Status.<br /"
+">Wenn Sie Aktualisierungen für IPv4 und IPv6 senden möchten benötigen Sie "
+"zwei Konfigurationen z.B. 'myddns_ipv4' und 'myddns_ipv6'"
+
+msgid "Build"
+msgstr "Build"
+
+msgid ""
+"BusyBox's nslookup and Wget do not support to specify the IP version to use "
+"for communication with DDNS Provider."
+msgstr ""
+"BusyBox's nslookup und Wget unterstützen nicht die IP Version für die "
+"Kommunikation festzulegen."
+
+msgid ""
+"BusyBox's nslookup does not support to specify to use TCP instead of default "
+"UDP when requesting DNS server"
+msgstr ""
+"BusyBox's nslookup unterstützt es nicht das TCP-Protokoll für DNS Anfragen "
+"anstelle des standardmäßigen UDP-Protokolls."
+
+msgid "Check Interval"
+msgstr "Prüfinterval"
+
+msgid "Check for changed IP every"
+msgstr "Teste auf neue IP alle"
+
+msgid "Check-time unit"
+msgstr "Zeiteinheit"
+
+msgid "Config error"
+msgstr "Konfigurationsfehler"
+
+msgid "Configure here the details for selected Dynamic DNS service"
+msgstr "Konfiguriere hier die Details für den gewählten Dynamik DNS Dienst"
+
+msgid ""
+"Currently DDNS updates are not started at boot or on interface events.<br /"
+">This is the default if you run DDNS scripts by yourself (i.e. via cron with "
+"force_interval set to '0')"
+msgstr ""
+"Aktuell werden keine DDNS Aktualisierungen beim Systemstart oder bei "
+"Netzwerkereignissen gestartet.<br />Dieses ist der Standard, wenn Sie die "
+"DDSN Skripte über eigene Routinen (z.B. cron und Erzwungener Aktualisierung "
+"von '0')  starten."
+
+msgid ""
+"Currently DDNS updates are not started at boot or on interface events.<br /"
+">You can start/stop each configuration here. It will run until next reboot."
+msgstr ""
+"Aktuell werden DDNS Aktualisierungen nicht bei Systemstart oder bei "
+"Netzwerkereignissen gestartet.<br />Sie können jede Konfiguration hier "
+"starten und stoppen. Sie wird bis zum nächsten Neustart ausgeführt."
+
+msgid "Custom update script to be used for updating your DDNS Provider."
+msgstr "Update-Skript um Aktualisierungen an Ihren DDNS Anbieter zu senden."
+
+msgid "Custom update-URL"
+msgstr "Eigene Update-URL"
+
+msgid "Custom update-script"
+msgstr "Eigenes Update-Skript"
+
+msgid "DDNS Autostart disabled"
+msgstr "DDNS Autostart deaktiviert"
+
+msgid "DDNS Service provider"
+msgstr "DDNS-Dienstanbieter"
+
+msgid "DNS requests via TCP not supported"
+msgstr "DNS Anfragen über TCP nicht unterstützt"
+
+msgid "DNS-Server"
+msgstr "DNS-Server"
+
+msgid "Defines the Web page to read systems IPv4-Address from"
+msgstr ""
+"Definiert die Web-Seite von der die aktuelle IPv4-Adresse des System gelesen "
+"wird."
+
+msgid "Defines the Web page to read systems IPv6-Address from"
+msgstr ""
+"Definiert die Web-Seite von der die aktuelle IPv6-Adresse des System gelesen "
+"wird."
+
+msgid "Defines the interface to read systems IP-Address from"
+msgstr ""
+"Definiert die Schnittstelle von der die aktuelle IP-Adresse des System "
+"gelesen wird."
+
+msgid "Defines the network to read systems IPv4-Address from"
+msgstr ""
+"Definiert das Netzwerk von dem die aktuelle IPv4-Adresse des System gelesen "
+"wird."
+
+msgid "Defines the network to read systems IPv6-Address from"
+msgstr ""
+"Definiert das Netzwerk von dem die aktuelle IPv6-Adresse des System gelesen "
+"wird."
+
+msgid ""
+"Defines the source to read systems IPv4-Address from, that will be send to "
+"the DDNS provider"
+msgstr ""
+"Definiert die Quelle von der die aktuelle IPv4-Adresse des Systems gelesen "
+"wird, die an Ihren DDNS Anbieter gesendet wird."
+
+msgid ""
+"Defines the source to read systems IPv6-Address from, that will be send to "
+"the DDNS provider"
+msgstr ""
+"Definiert die Quelle von der die aktuelle IPv6-Adresse des Systems gelesen "
+"wird, die an Ihren DDNS Anbieter gesendet wird."
+
+msgid "Defines which IP address 'IPv4/IPv6' is send to the DDNS provider"
+msgstr ""
+"Legt fest welche IP-Adresse 'IPv4/IPv6' zum DDNS Anbieter gesendet wird"
+
+msgid "Details for"
+msgstr "Details für"
+
+msgid "Dynamic DNS"
+msgstr "Dynamisches DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Dynamisches DNS erlaubt es, den Router bei dynamischer IP-Adresse über einen "
+"festen DNS-Namen zu erreichen."
+
+msgid "Enable secure communication with DDNS provider"
+msgstr "Aktiviert sichere Kommunikation mit dem DDNS Anbieter"
+
+msgid "Error Retry Counter"
+msgstr "Wiederholungszähler bei Fehler"
+
+msgid "Error Retry Interval"
+msgstr "Wiederholungsintervall bei Fehler"
+
+msgid "Event Network"
+msgstr "Ereignis Netzwerk"
+
+msgid "Event interface"
+msgstr "Ereignis Netzwerk"
+
+msgid "File not found"
+msgstr "Datei nicht gefunden"
+
+msgid "File not found or empty"
+msgstr "Datei nicht gefunden oder leer"
+
+msgid ""
+"Follow this link<br />You will find more hints to optimize your system to "
+"run DDNS scripts with all options"
+msgstr ""
+"Folgen Sie dem Link<br />Hier finden Sie weitere Hinweise um Ihr System für "
+"die Nutzung aller Optionen der DDNS Skripte zu optimieren."
+
+msgid "Force IP Version"
+msgstr "Erzwinge IP-Version"
+
+msgid "Force IP Version not supported"
+msgstr "Erzwinge IP-Version nicht unterstützt"
+
+msgid "Force Interval"
+msgstr "Erzwungene Aktualisierung"
+
+msgid "Force TCP on DNS"
+msgstr "Erzwinge TCP bei DNS-Anfragen"
+
+msgid "Force update every"
+msgstr "Erzwinge Aktualisierung alle"
+
+msgid "Force-time unit"
+msgstr "Zeiteinheit"
+
+msgid "Forced IP Version don't matched"
+msgstr "Erzwungene IP Version stimmt nicht überein"
+
+msgid "Format"
+msgstr "Format"
+
+msgid "Format: IP or FQDN"
+msgstr "Format: IP-Adresse oder FQDN"
+
+msgid "HTTPS not supported"
+msgstr "HTTPS nicht unterstützt"
+
+msgid "Hints"
+msgstr "Hinweise"
+
+msgid "Hostname/Domain"
+msgstr "Rechnername/Domäne"
+
+msgid "IP address source"
+msgstr "IP-Adressquelle"
+
+msgid "IP address version"
+msgstr "IP-Adressversion"
+
+msgid "IPv6 address must be given in square brackets"
+msgstr "Eine IPv6 Adresse muss in eckigen Klammern angegeben werden"
+
+msgid ""
+"IPv6 is currently not (fully) supported by this system<br />Please follow "
+"the instructions on libreCMC's homepage to enable IPv6 support<br />or update "
+"your system to the latest libreCMC Release"
+msgstr ""
+"IPv6 wird vom System nicht (voll) unterstützt.<br /> Bitte folgen Sie den "
+"Hinweisen auf der Homepage von libreCMC um die volle IPv6-Unterstützung zu "
+"aktivieren<br /> oder installieren Sie die aktuellste libreCMC Version."
+
+msgid "IPv6 not supported"
+msgstr "IPv6 nicht unterstützt"
+
+msgid ""
+"If this service section is disabled it could not be started.<br />Neither "
+"from LuCI interface nor from console"
+msgstr ""
+"Wenn deaktiviert kann die Aktualisierung nicht gestartet werden.<br />Weder "
+"über das LuCI Web Interface noch von der Geräte-Konsole"
+
+msgid ""
+"In some versions cURL/libcurl in libreCMC is compiled without proxy support."
+msgstr ""
+"In einigen Versionen von libreCMC wurde cURL/libcurl ohne Proxy Unterstützung "
+"compiliert."
+
+msgid ""
+"Interval to check for changed IP<br />Values below 5 minutes == 300 seconds "
+"are not supported"
+msgstr ""
+"Intervall zur Prüfung auf geänderte IP-Adresse<br />Minimum Wert 5 Minuten "
+"== 300 Sekunden"
+
+msgid ""
+"Interval to force updates send to DDNS Provider<br />Setting this parameter "
+"to 0 will force the script to only run once<br />Values lower 'Check "
+"Interval' except '0' are not supported"
+msgstr ""
+"Intervall mit dem Aktualisierungen erzwungen an den DDNS Anbieter gesendet "
+"werden.<br />Ein Wert von '0' führt das Skript nur einmalig aus. <br />Der "
+"Wert muss größer als das Prüfintervall sein oder '0'."
+
+msgid "Last Update"
+msgstr "Letztes Aktualisierung"
+
+msgid "Log File Viewer"
+msgstr "Protokolldatei"
+
+msgid "Log to file"
+msgstr "Protokoll in Datei schreiben"
+
+msgid "Log to syslog"
+msgstr "Systemprotokoll verwenden"
+
+msgid ""
+"Neither GNU Wget with SSL nor cURL installed to support updates via HTTPS "
+"protocol."
+msgstr ""
+"Weder GNU Wget mit SSL noch cURL sind installiert um Aktualisierungen über "
+"HTTPS Protokoll zu unterstützen."
+
+msgid "Network on which the ddns-updater scripts will be started"
+msgstr "Netzwerk auf dem Ereignisse die ddns-updater Skripte starten"
+
+msgid "Never"
+msgstr "Nie"
+
+msgid "Next Update"
+msgstr "Nächste Aktualisierung"
+
+msgid "No data"
+msgstr "Keine Daten"
+
+msgid "No logging"
+msgstr "Keine Protokollierung"
+
+msgid "OPTIONAL: Force the usage of pure IPv4/IPv6 only communication."
+msgstr ""
+"OPTIONAL: Erzwingt die Verwendung einer reinen IPv4/IPv6 Kommunikation."
+
+msgid "OPTIONAL: Force the use of TCP instead of default UDP on DNS requests."
+msgstr ""
+"OPTIONAL: Erzwingt die Verwendung von TCP anstelle von UDP bei DNS Anfragen."
+
+msgid "OPTIONAL: Proxy-Server for detection and updates."
+msgstr "OPTIONAL: Proxy-Server für Adresserkennung und Aktualisierungen"
+
+msgid "OPTIONAL: Use non-default DNS-Server to detect 'Registered IP'."
+msgstr ""
+"OPTIONAL: Ersetzt den voreingestellten DNS-Server um die 'Registrierte IP' "
+"zu ermitteln."
+
+msgid "Old version of ddns-scripts installed"
+msgstr "Alte Version von ddns-scripts installiert"
+
+msgid "On Error the script will retry the failed action after given time"
+msgstr ""
+"Bei Fehlern wird das Skript die fehlerhafte Aktion nach der gegebenen Zeit "
+"wiederholen"
+
+msgid "On Error the script will stop execution after given number of retrys"
+msgstr "Das Skript wird nach der gegebener Anzahlt von Fehlversuchen beendet"
+
+msgid "PROXY-Server"
+msgstr "Proxy-Server"
+
+msgid "PROXY-Server not supported"
+msgstr "Proxy-Server nicht unterstützt"
+
+msgid "Please [Save & Apply] your changes first"
+msgstr "Bitte [Speichern & Anwenden] Sie Änderungen zunächst"
+
+msgid "Please press [Read] button"
+msgstr "Bitte Protokolldatei einlesen"
+
+msgid "Please update to the current version!"
+msgstr "Aktualisieren Sie bitte auf die aktuelle Version!"
+
+msgid "Process ID"
+msgstr "Prozess ID"
+
+msgid "Read / Reread log file"
+msgstr "Protokolldatei (neu) einlesen"
+
+msgid "Registered IP"
+msgstr "Registrierte IP"
+
+msgid "Replaces [DOMAIN] in Update-URL"
+msgstr "Ersetzt [DOMAIN] in der Update-URL"
+
+msgid "Replaces [PASSWORD] in Update-URL"
+msgstr "Ersetzt [PASSWORD] in der Update-URL"
+
+msgid "Replaces [USERNAME] in Update-URL"
+msgstr "Ersetzt [USERNAME] in der Update-URL"
+
+msgid "Run once"
+msgstr "Einmalig ausführen"
+
+msgid "Script"
+msgstr "Skript"
+
+msgid "Service"
+msgstr "Dienst"
+
+msgid "Show more"
+msgstr "Zeige mehr"
+
+msgid "Software update required"
+msgstr "Softwareaktualisierung nötig"
+
+msgid "Source of IP address"
+msgstr "Quelle der IP-Adresse"
+
+msgid "Start / Stop"
+msgstr "Start / Stopp"
+
+msgid "Stopped"
+msgstr "Angehalten"
+
+msgid ""
+"The currently installed 'ddns-scripts' package did not support all available "
+"settings."
+msgstr ""
+"Die installierte Software 'ddns-scripts' unterstützt nicht alle verfügbaren "
+"Optionen."
+
+msgid "There is no service configured."
+msgstr "Kein Dienst konfiguriert"
+
+msgid "Timer Settings"
+msgstr "Zeitgeber Einstellungen"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "URL to detect"
+msgstr "URL zur Adresserkennung für"
+
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+msgid ""
+"Update URL to be used for updating your DDNS Provider.<br />Follow "
+"instructions you will find on their WEB page."
+msgstr ""
+"Update-URL um Aktualisierungen an Ihren DDNS Anbieter zu senden.<br />Folgen "
+"Sie der Anleitung auf der Internet Seite des Anbieters."
+
+msgid "Update error"
+msgstr "Aktualisierungsfehler"
+
+msgid "Use HTTP Secure"
+msgstr "Verwende sicheres HTTP"
+
+msgid "User defined script to read systems IP-Address"
+msgstr ""
+"Definiert das Skript mit dem die  aktuelle IP-Adresse des System gelesen "
+"wird."
+
+msgid "Version Information"
+msgstr "Versionsinformationen"
+
+msgid ""
+"Writes detailed messages to log file. File will be truncated automatically."
+msgstr ""
+"Schreibt detaillierte Meldungen in die Protokolldatei. Die Datei wird "
+"automatisch gekürzt."
+
+msgid ""
+"Writes log messages to syslog. Critical Errors will always be written to "
+"syslog."
+msgstr ""
+"Schreibt Meldungen ins Systemprotokoll. Kritische Fehler werden immer in das "
+"Systemprotokoll geschrieben."
+
+msgid "You should install BIND host package for DNS requests."
+msgstr ""
+"Sie sollten das Programmpakete BIND host for DNS Anfragen installieren."
+
+msgid "You should install GNU Wget with SSL (prefered) or cURL package."
+msgstr ""
+"Sie sollten das Programmpaket GNU Wget mit SSL (bevorzugt) oder cURL "
+"installieren."
+
+msgid "You should install GNU Wget with SSL or replace libcurl."
+msgstr ""
+"Sie sollten das Programmpaket GNU Wget mit SSL installieren oder libcurl "
+"austauschen."
+
+msgid "cURL is installed, but libcurl was compiled without proxy support."
+msgstr ""
+"cURL ist installiert, aber libcurl wurde ohne Proxy Unterstützung compiliert"
+
+msgid "cURL without Proxy Support"
+msgstr "cURL ohne Proxy Unterstützung"
+
+msgid "can not detect local IP. Please select a different Source combination"
+msgstr ""
+"kann lokale IP-Adresse nicht ermitteln. Bitte wählen Sie eine andere Quelle."
+
+msgid "can not resolve host:"
+msgstr "Konnte Server nicht finden:"
+
+msgid "config error"
+msgstr "Konfigurationsfehler"
+
+msgid "custom"
+msgstr "benutzerdefiniert"
+
+msgid "days"
+msgstr "Tage"
+
+msgid "directory or path/file"
+msgstr "Verzeichnis oder Pfad/zur/Datei"
+
+msgid "either url or script could be set"
+msgstr "Weder Url noch Script ist definiert"
+
+msgid "enable here"
+msgstr "hier aktivieren"
+
+msgid "file or directory not found or not 'IGNORE'"
+msgstr "Datei oder Verzeichnis nicht gefunden oder nicht 'IGNORE'"
+
+msgid "h"
+msgstr "Stunden"
+
+msgid "hours"
+msgstr "Stunden"
+
+msgid "install update here"
+msgstr "Aktualisierung hier installieren"
+
+msgid "installed"
+msgstr "installiert"
+
+msgid "interface"
+msgstr "Schnittstelle"
+
+msgid "invalid - Sample"
+msgstr "ungültig - Beispiel"
+
+msgid "min"
+msgstr "Minuten"
+
+msgid "minimum value '0'"
+msgstr "Minimum Wert '0'"
+
+msgid "minimum value '1'"
+msgstr "Minimum Wert '1'"
+
+msgid "minimum value 5 minutes == 300 seconds"
+msgstr "Minimum Wert 5 Minuten == 300 Sekunden"
+
+msgid "minutes"
+msgstr "Minuten"
+
+msgid "missing / required"
+msgstr "fehlt / Pflichteingabe"
+
+msgid "must be greater or equal 'Check Interval'"
+msgstr "muss größer als das Prüfintervall sein"
+
+msgid "must start with 'http://'"
+msgstr "muss mit 'http://' beginnen"
+
+msgid "nc (netcat) can not connect"
+msgstr "nc (netcat) kann keine Verbindung herstellen"
+
+msgid "network"
+msgstr "Netzwerk"
+
+msgid "never"
+msgstr "nie"
+
+msgid "no data"
+msgstr "Keine Daten"
+
+msgid "not found or not executable - Sample: '/path/to/script.sh'"
+msgstr ""
+"Skript nicht gefunden oder nicht ausführbar. - Beispiel: 'Pfad/zum/Skript.sh'"
+
+msgid "nslookup can not resolve host"
+msgstr "nslookup kann den Namen nicht auflösen"
+
+msgid "or"
+msgstr "oder"
+
+msgid "or greater"
+msgstr "oder größer"
+
+msgid "please disable"
+msgstr "Bitte deaktivieren"
+
+msgid "please remove entry"
+msgstr "Bitte Eintrag entfernen"
+
+msgid "please select 'IPv4' address version"
+msgstr "Bitte 'IPv4' Adressversion auswählen"
+
+msgid "please select 'IPv4' address version in"
+msgstr "Bitte 'IPv4' Adressversion auswählen in den"
+
+msgid "proxy port missing"
+msgstr "Proxy-Port fehlt"
+
+msgid "required"
+msgstr "erforderlich"
+
+msgid "seconds"
+msgstr "Sekunden"
+
+msgid "to run HTTPS without verification of server certificates (insecure)"
+msgstr ""
+"um HTTPS ohne Überprüfung der Server Zertifikate auszuführen (unsicher)"
+
+msgid "unknown error"
+msgstr "Unbekannter Fehler"
+
+msgid "unspecific error"
+msgstr "Unspezifischer Fehler"
+
+msgid "use hostname, FQDN, IPv4- or IPv6-Address"
+msgstr "verwende Rechnername, FQDN, IPv4- oder IPv6-Adresse"
diff --git a/trunk/package/luci/po/de/diag_core.po b/trunk/package/luci/po/de/diag_core.po
new file mode 100644
index 00000000..feda0fcb
--- /dev/null
+++ b/trunk/package/luci/po/de/diag_core.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-07-02 08:24+0200\n"
+"Last-Translator: dgolle <dgolle@allnet.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Diagnose-Tests konfigurieren"
+
+msgid "Diagnostics"
+msgstr "Diagnose"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Die verfügbaren Diagnose-Programme in diesem Menü hängen von den auf Ihrem "
+"Gerät installierten Modulen ab."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Falls es mit ihrem Gerät Probleme gibt können hier Diagnose-Tests "
+"durchgeführt werden."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Hier werden die Netzwerk Diagnose Tools konfiguriert (zB. Netzwerkscans und "
+"Pings)."
+
+#~ msgid "l_d_diag"
+#~ msgstr "Diagnose"
diff --git a/trunk/package/luci/po/de/diag_devinfo.po b/trunk/package/luci/po/de/diag_devinfo.po
new file mode 100644
index 00000000..606358aa
--- /dev/null
+++ b/trunk/package/luci/po/de/diag_devinfo.po
@@ -0,0 +1,221 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-10 02:08+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Aktionen"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Beginning of MAC address range"
+msgstr "Beginn des MAC-Adress-Bereiches"
+
+msgid "Config Phone Scan"
+msgstr "Telefonsuche konfigurieren"
+
+msgid "Configure"
+msgstr "Konfigurieren"
+
+msgid "Configure Scans"
+msgstr "Suche konfigurieren"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Konfiguriere Suche für Geräte in gewählten Netzwerken. Das Verringern von "
+"'Zeitüberschreitung', 'Wiederholungszähler' und/oder 'Pause zwischen "
+"Anfragen' kann die Geschwindigkeit der Suche erhöhen, aber auch das Finden "
+"einzelner Geräte verhindern."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Konfiguriere Suche für SIP-Gerätein gewählten Netzwerken. Das Verringern von "
+"'Zeitüberschreitung', 'Wiederholungszähler' und/oder 'Pause zwischen "
+"Anfragen' kann die Geschwindigkeit der Suche erhöhen, aber auch das Finden "
+"einzelner Geräte verhindern."
+
+msgid "Delete"
+msgstr "Löschen"
+
+msgid "Device Scan Config"
+msgstr "Gerätesuche konfigurieren"
+
+msgid "Device Type"
+msgstr "Geräte-Typ"
+
+msgid "Devices discovered for"
+msgstr "Geräte gefunden für"
+
+msgid "Devices on Network"
+msgstr "Geräte im Netzwerk"
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "End of MAC address range"
+msgstr "Ende des MAC-Adress-Bereiches"
+
+msgid "Go to relevant configuration page"
+msgstr "Gehe zu entsprechender Konfigurations-Seite"
+
+msgid "IP Address"
+msgstr "IP-Adresse"
+
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgid "Invalid"
+msgstr "Ungültig"
+
+msgid "Link to Device"
+msgstr "Verknüpfung zu Gerät"
+
+msgid "MAC Address"
+msgstr "MAC-Adresse"
+
+msgid "MAC Device Info Overrides"
+msgstr "Benutzerdefinierte MAC-zu-Gerät-Benennungen"
+
+msgid "MAC Device Override"
+msgstr "Benutzerdefinierte MAC-zu-Gerät-Benennung"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"MAC-Adressbereich und Benennungen um die Informationen der System- und IEEE-"
+"Datenbanken zu überschreiben"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Wartezeit zwischen den Anfragen in Millisekunden (Standard 100)"
+
+msgid "Model"
+msgstr "Modell"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Network Device Scan"
+msgstr "Netzwerkgerätesuche"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Konfiguration der Netzwerkgerätesuche"
+
+msgid "Networks to scan for devices"
+msgstr "Zu durchsuchende Netzwerke"
+
+msgid "Networks to scan for supported devices"
+msgstr "Nach unterstützten Geräten zu durchsuchende Netzwerke"
+
+msgid "No SIP devices"
+msgstr "keine SIP-Geräte"
+
+msgid "No devices detected"
+msgstr "keine Geräte gefunden"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Anzahl der Versuche Anfragen zu senden (Standard 1)"
+
+msgid "OUI Owner"
+msgstr "OUI-Organisation"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Überschreibt die Informationen die durch das MAC-zu-Gerätename-Programm (mac-"
+"to-devinfo) für einen bestimmten MAC-Adressbereich zurückgegeben werden"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Führe Suche aus (Dies kann einige Minuten dauern)"
+
+msgid "Phone Information"
+msgstr "Informationen zum Telefon"
+
+msgid "Phone Scan"
+msgstr "Telefonsuche"
+
+msgid "Phone Scanning Configuration"
+msgstr "Konfiguration der Telefonsuche"
+
+msgid "Phones"
+msgstr "Telefone"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Raw"
+msgstr "Rohdaten"
+
+msgid "Repeat Count"
+msgstr "Wiederholungsanzahl"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Wiederhole Suche (Dies kann einige Minuten dauern)"
+
+msgid "SIP Device Information"
+msgstr "SIP-Geräteinformationen"
+
+msgid "SIP Device Scan"
+msgstr "SIP-Gerätesuche"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Konfiguration der SIP-Gerätesuche"
+
+msgid "SIP Devices on Network"
+msgstr "SIP-Geräte im Netzwerk"
+
+msgid "SIP devices discovered for"
+msgstr "SIP-Geräte entdeckt für"
+
+msgid "Scan for devices on specified networks."
+msgstr "Suche nach Geräten im spezifizierten Netzwerk"
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Suche nach SIP-unterstützenden Geräten im spezifizierten Netzwerk"
+
+msgid "Scanning Configuration"
+msgstr "Such-Konfiguration"
+
+msgid "Scans for devices on specified networks."
+msgstr "Scans for devices on specified networks."
+
+msgid "Sleep Between Requests"
+msgstr "Wartezeit zwischen den Versuchen"
+
+msgid "Subnet"
+msgstr "Subnetz"
+
+msgid "This section contains no values yet"
+msgstr "Dieser Abschnitt enthält noch keine Werte"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Antwortwartezeit in Sekunden (Standard: 10)"
+
+msgid "Timeout"
+msgstr "Zeitüberschreitung"
+
+msgid "Use Configuration"
+msgstr "Verwende Konfiguration"
+
+msgid "Vendor"
+msgstr "Hersteller"
+
+msgid "check other networks"
+msgstr "Prüfe andere Netzwerke"
diff --git a/trunk/package/luci/po/de/ffwizard.po b/trunk/package/luci/po/de/ffwizard.po
new file mode 100644
index 00000000..a4827b6a
--- /dev/null
+++ b/trunk/package/luci/po/de/ffwizard.po
@@ -0,0 +1,180 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ffwizard\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2011-06-11 01:47+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Diesem Node erlauben anonyme Nutzungsstatistiken zu übertragen"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Rechner im eigenen LAN vor Zugriffen aus dem Freifunknetzwerk schützen"
+
+msgid "Configure network"
+msgstr "Netzwerk konfigurieren"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Dieses Node mit anderen Nodes über einen Internettunnel verbinden."
+
+msgid "DHCP IP range"
+msgstr "DHCP IP-Bereich"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP weist verbundenen Benutzern ohne OLSR automatisch IP-Adressen zu"
+
+msgid "DNS Server"
+msgstr "DNS Server"
+
+msgid "Enable DHCP"
+msgstr "DHCP aktivieren"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Heartbeat"
+msgstr "Heartbeat"
+
+msgid "IP address"
+msgstr "IP-Adresse"
+
+msgid "L2gvpn tunnel"
+msgstr "L2gvpn Tunnel"
+
+msgid "Limit download bandwidth"
+msgstr "Downloadbandbreite limitieren"
+
+msgid "Limit upload bandwidth"
+msgstr "Uploadbandbreite limitieren"
+
+msgid "Mesh IP address"
+msgstr "Mesh IP-Adresse"
+
+msgid "Mesh IPv6 Address"
+msgstr "Mesh IPv6-Adresse"
+
+msgid "Netmask"
+msgstr "Netzmaske"
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid "Password confirmation"
+msgstr "Passwort bestätigen"
+
+msgid "Password successfully changed"
+msgstr "Passwort erfolgreich geändert"
+
+msgid "Protect LAN"
+msgstr "LAN-Netzwerk schützen"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Diese Checkbox aktivieren um Schnittstellen zu konfigurieren."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr "Anderen erlauben die eigene Internetverbindung mitzubenutzen."
+
+msgid "Share your internet connection"
+msgstr "Internet freigeben"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Der IP-Bereich aus dem Clients IPs zugewiesen bekommen (z.B. 10.1.2.1/28). "
+"Liegt dieser Bereich innerhalb des Mesh-Netzwerks, dann werden diese Clients "
+"als HNA von OLSRd angekündigt, ansonsten wird NAT verwendet. Wird dieses "
+"Feld leer gelassen dann wird der Wert aus dem Community-Profil verwendet."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "Die IPv6-Adresse wird automatisch generiert."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Protokoll für den Internetzugang."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Hier muss eine netzweit eindeutige IP-Adresse verwendet werden, z.B. "
+"10.1.1.1. Diese muss von der lokalen Community zugewiesen sein oder dort "
+"registriert werden."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Diese Option richtet ein zusätzliches WLAN-Netzwerk als Access Point für "
+"Clients ein."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Dieser Assistent hilft beim Einrichten des Routers für Freifunk oder "
+"ähnliche Wireless Community Netzwerke."
+
+msgid "Unknown Error"
+msgstr "Unbekannter Fehler"
+
+msgid "Username"
+msgstr "Benutzername"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Virtueller Access Point (VAP)"
+
+msgid "Wizard"
+msgstr "Freifunkassistent"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+"Hier sollte der selbe Kanal wie auf benachbarten Nodes verwendet werden."
+
+msgid "dhcp"
+msgstr "DHCP"
+
+msgid "kbit/s"
+msgstr "KBit/s"
+
+msgid "static"
+msgstr "Statisch"
+
+msgid "Configure this interface."
+msgstr "Dieses Netzwerkinterface einrichten."
+
+msgid "recommended"
+msgstr "empfohlen"
+
+msgid "Basic settings"
+msgstr "Grundeinstellungen"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+"Ein oder mehrere wichtige Grundeinstellungen fehlen. Bitte besuche die Seite"
+
+msgid "Error"
+msgstr "Fehler"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+"Der ffwizard kann nicht benutzt werden da einige wichtige Grundeinstellungen "
+"fehlen."
+
+msgid "and fill out all required fields."
+msgstr "und fülle alle dort benötigten Felder aus."
diff --git a/trunk/package/luci/po/de/firewall.po b/trunk/package/luci/po/de/firewall.po
new file mode 100644
index 00000000..0e5ddcf1
--- /dev/null
+++ b/trunk/package/luci/po/de/firewall.po
@@ -0,0 +1,748 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2014-03-25 02:04+0200\n"
+"Last-Translator: laryllian <my-lucl@laryllian.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s in %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s mit %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s in %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Unbenannter Eintrag)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Unbenannte Regel)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(Unbennanter SNAT-Eintrag)"
+
+msgid "-- Please choose --"
+msgstr "-- Bitte wählen --"
+
+msgid "-- custom --"
+msgstr "-- benutzerdefiniert --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> Pkte. pro <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> Pkte. pro <var>%s</var>, Häufung <var>%d</var> Pkte."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> und limitieren auf %s"
+
+msgid "Action"
+msgstr "Aktion"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Add and edit..."
+msgstr "Hinzufügen und bearbeiten..."
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Erlaube Weiterleitung zu <em>Zielzone</em>:"
+
+msgid "Any"
+msgstr "beliebig"
+
+msgid "Covered networks"
+msgstr "Abgedeckte Netzwerke"
+
+msgid "Custom Rules"
+msgstr "Benutzerdefinierte Regeln"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Benutzerdefinierte Regeln ermöglichen das Ausführen belieber iptables-"
+"Befehle welche durch das Firewall-Framework nicht unterstützt werden. Die "
+"Befehle werden mit jedem Firewall-Neustart abgearbeitet, direkt nach dem "
+"Laden der Basisregeln."
+
+msgid "Destination IP address"
+msgstr "Ziel IP-Adresse"
+
+msgid "Destination address"
+msgstr "Zieladresse"
+
+msgid "Destination port"
+msgstr "Zielport"
+
+msgid "Destination zone"
+msgstr "Ziel-Zone"
+
+msgid "Do not rewrite"
+msgstr "Nicht umschreiben"
+
+msgid "Drop invalid packets"
+msgstr "Ungültige Pakete verwerfen"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Enable NAT Loopback"
+msgstr "NAT-Loopback aktivieren"
+
+msgid "Enable SYN-flood protection"
+msgstr "Schutz vor SYN-flood-Attacken"
+
+msgid "Enable logging on this zone"
+msgstr "Protokollierung innerhalb der Zone aktivieren"
+
+msgid "External IP address"
+msgstr "Externe IP-Adresse"
+
+msgid "External port"
+msgstr "Externer Port"
+
+msgid "External zone"
+msgstr "Externe Zone"
+
+msgid "Extra arguments"
+msgstr "Zusätzliche Argumente"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr "Firewall - Benutzerdefinierte Regeln"
+
+msgid "Firewall - Port Forwards"
+msgstr "Firewall - Portweiterleitungen"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Firewall - Verkehrsregeln"
+
+msgid "Firewall - Zone Settings"
+msgstr "Firewall - Zoneneinstellungen"
+
+msgid "Force connection tracking"
+msgstr "Connectiontracking erzwingen"
+
+msgid "Forward"
+msgstr "Weitergeleitet"
+
+msgid "Forward to"
+msgstr "Weiterleiten an"
+
+msgid "From %s in %s"
+msgstr "Von %s in %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Von %s in %s mit Quell-%s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Von %s in %s mit Quell-%s und %s"
+
+msgid "General Settings"
+msgstr "Allgemein"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 und IPv6"
+
+msgid "IPv4 only"
+msgstr "nur IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "nur IPv6"
+
+msgid "Input"
+msgstr "Eingang"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Weiterleitungen zwischen Zonen"
+
+msgid "Internal IP address"
+msgstr "Interne IP-Adresse"
+
+msgid "Internal port"
+msgstr "Interner Port"
+
+msgid "Internal zone"
+msgstr "Interne Zone"
+
+msgid "Limit log messages"
+msgstr "Protokollnachrichten limitieren"
+
+msgid "MSS clamping"
+msgstr "MSS Korrektur"
+
+msgid "Masquerading"
+msgstr "NAT aktivieren"
+
+msgid "Match"
+msgstr "Filter"
+
+msgid "Match ICMP type"
+msgstr "Nach ICMP-Typ filtern"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "Selektiert weitergeleiteten Verkehr nach den angegebenen Ziel-Ports."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Eingehende Verbindungen filtern welche an den angegebenen Port oder "
+"Portbereich auf dem lokalen Gerät gerichtet sind"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr "Selektiert eingehenden Verkehr nach den angegebenen Quell-Ports."
+
+msgid "Name"
+msgstr "Name"
+
+msgid "New SNAT rule"
+msgstr "Neue SNAT-Regel"
+
+msgid "New forward rule"
+msgstr "Neuer Weiterleitungsregel"
+
+msgid "New input rule"
+msgstr "Neue Eingangsregel"
+
+msgid "New port forward"
+msgstr "Neue Portweiterleitung"
+
+msgid "New source NAT"
+msgstr "Neues SNAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Selektiere nur Verkehr der an die angegebene IP-Adresse gerichtet ist."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Selektiere nur Verkehr von den angegebenen MAC-Adressen."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Selektiere nur Verkehr vom angebenem Quell-IP-Adressbereich."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr "Selektiere nur Verkehr von den angegebenen Quell-Ports auf dem Client."
+
+msgid "Open ports on router"
+msgstr "Ports auf dem Router öffnen"
+
+msgid "Other..."
+msgstr "Anderes..."
+
+msgid "Output"
+msgstr "Ausgang"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+"Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
+"benutzen!"
+
+msgid "Port Forwards"
+msgstr "Portweiterleitungen"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"Portweiterleitungen ermöglichen es entfernten Rechnern im Internet auf "
+"bestimmte Computer oder Dienste im lokalen LAN zuzugreifen."
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Gefilterte Verbindungen an den angegeben Port auf dem internen Host "
+"weiterleiten"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
+
+msgid "Restrict to address family"
+msgstr "Beschränke auf Adressfamilie"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Schreibe selektierten Verkehr auf die angegebene Quell-IP-Adresse um."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Schreibe selektierten Verkehr auf den angegebenen Qull-Port um. Kann leer "
+"gelassen werden um nur die IP-Adresse umzuschreiben."
+
+msgid "Rewrite to source %s"
+msgstr "Schreibe um auf Quell-%s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Schreibe um auf Quell-%s, %s"
+
+msgid "SNAT IP address"
+msgstr "SNAT-IP-Adresse"
+
+msgid "SNAT port"
+msgstr "SNAT-Port"
+
+msgid "Source IP address"
+msgstr "Quell-IP-Adresse"
+
+msgid "Source MAC address"
+msgstr "Quell-MAC-Adresse"
+
+msgid "Source NAT"
+msgstr "Source NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Source NAT ist eine spezifische From von NAT, welche volle Kontrolle über "
+"die verwendete Quell-IP-Adresse für ausgehenden Verkehr zulässt, zum "
+"Beispiel um mehrere WAN-IP-Adressen auf interne Subnetze abzubilden."
+
+msgid "Source address"
+msgstr "Quelladresse"
+
+msgid "Source port"
+msgstr "Quellport"
+
+msgid "Source zone"
+msgstr "Quell-Zone"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
+"den Netzverkehr zu trennen."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Die untenstehenen Optionen regeln die Verfahreinsweisen für Verkehr zwischen "
+"dieser Zone (%s) und anderen Zonen. <em>Ziel-Zonen</em> decken "
+"weitergeleiteten Verkehr <strong>von %q</strong> ab. <em>Quell-Zonen</em> "
+"treffen auf weitergeleiteten Verkehr aus anderen Zonen zu, welcher "
+"<strong>an %q gerichtet</strong> ist. Die Weiterleitung gilt nur in eine "
+"Richtung, d.h. eine erlaubte Weiterleitung von LAN nach WAN impliziert "
+"<em>nicht</em> zusätzlich die Erlaubnis, auch von WAN nach LAN "
+"weiterzuleiten."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Diese Seite bietet Zugriff auf die erweiterten Eigenschaften der "
+"Portweiterleitung. In den meisten Fällen ist es unnötig die Eigenschaften zu "
+"ändern."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Diese Seite bietet Zugriff auf die erweiterten Eigenschaften der "
+"Verkehrsregel, zum Beispiel die Selektion nach Quell- und Zieladressen."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Diese Sektion definiert allgemeine Eigenschaften der %q Zone. Die "
+"<em>Eingang</em> und <em>Ausgang</em> Optionen regeln die Verfahrensweise "
+"für Verkehr der in diese Zone eintritt oder diese verlässt. "
+"<em>Weitergeleitet</em> trifft auf Verkehr zwischen verschiedenen "
+"Schnittstellen innerhalb dieser Zone zu. <em>Abgedeckte Netzwerke</em> "
+"definieren die Zugehörigkeit von Schnittstellen zu dieser Zone."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "Zu %s an %s auf <var>diesem Gerät</var>"
+
+msgid "To %s in %s"
+msgstr "Zu %s in %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "Zu %s auf <var>diesem Gerät</var>"
+
+msgid "To %s, %s in %s"
+msgstr "Zu %s, %s in %s"
+
+msgid "To source IP"
+msgstr "Zu Quell-IP"
+
+msgid "To source port"
+msgstr "Zu Quell-Port"
+
+msgid "Traffic Rules"
+msgstr "Verkehrsregeln"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Verkehrsregeln bestimmen den Fluss der Pakete zwischen verschiedenen Zonen, "
+"zum Beispiel um Verkehr zwischen bestimmten Rechnern zu unterbinden oder um "
+"WAN-Ports auf dem Router zu öffnen."
+
+msgid "Via %s"
+msgstr "Über %s"
+
+msgid "Via %s at %s"
+msgstr "Über %s an %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Durch die Auswahl von \"-- benutzerdefiniert --\" könnene mehrere Werte "
+"durch Leerzeichen getrennt angegeben werden."
+
+msgid "Zone %q"
+msgstr "Zone %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zone ⇒ Weiterleitungen"
+
+msgid "Zones"
+msgstr "Zonen"
+
+# Die richtige Übersetzung von ACCEPT im Firewallkontext ist nicht "Annehmen" sondern "Zulassen". Man kann ja keinen
+# ausgehenden Verkehr annehmen. 
+msgid "accept"
+msgstr "zulassen"
+
+msgid "any"
+msgstr "beliebig"
+
+msgid "any host"
+msgstr "beliebiger Rechner"
+
+msgid "any router IP"
+msgstr "beliebige Router-IP"
+
+msgid "any zone"
+msgstr "beliebige Zone"
+
+msgid "don't track"
+msgstr "nicht verfolgen"
+
+msgid "drop"
+msgstr "verwerfen"
+
+msgid "reject"
+msgstr "zurückweisen"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Ziel"
+
+#~ msgid "Family"
+#~ msgstr "Adressfamilie"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "Weiterleiten zu %s in %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "Weiterleiten zu %s, %s in %s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Quelle"
+
+#~ msgid "To %s"
+#~ msgstr "Zu %s"
+
+#~ msgid "To %s at %s"
+#~ msgstr "Zu %s an %s"
+
+#~ msgid "Via"
+#~ msgstr "Über"
+
+#~ msgid "Accept forward"
+#~ msgstr "Weiterleitung erlauben"
+
+#~ msgid "Accept input"
+#~ msgstr "Eingang erlauben"
+
+#~ msgid "Disable"
+#~ msgstr "Daktivieren"
+
+#~ msgid "Discard forward"
+#~ msgstr "Weiterleitung verwerfen"
+
+#~ msgid "Discard input"
+#~ msgstr "Eingang verwerfen"
+
+#~ msgid "Do not track forward"
+#~ msgstr "Weiterleitung nicht verfolgen"
+
+#~ msgid "Do not track input"
+#~ msgstr "Eingang nicht verfolgen"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "IP-Bereich"
+
+#~ msgid "IPs"
+#~ msgstr "IPs"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "MACs"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Weiterleitung zurückweisen"
+
+#~ msgid "Refuse input"
+#~ msgstr "Eingang zurückweisen"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Regel ist deaktiviert"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Regel ist aktiviert"
+
+#~ msgid "day"
+#~ msgstr "Tag"
+
+#~ msgid "hour"
+#~ msgstr "Stunde"
+
+#~ msgid "minute"
+#~ msgstr "Minute"
+
+#~ msgid "not"
+#~ msgstr "nicht"
+
+#~ msgid "port"
+#~ msgstr "Port"
+
+#~ msgid "ports"
+#~ msgstr "Ports"
+
+#~ msgid "second"
+#~ msgstr "Sekunde"
+
+#~ msgid "type"
+#~ msgstr "Typ"
+
+#~ msgid "types"
+#~ msgstr "Typen"
+
+#~ msgid "(optional)"
+#~ msgstr "(optional)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "Gewünschte Zieladresse"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Interner Port (optional)"
+
+#~ msgid "Accept"
+#~ msgstr "Akzeptiere"
+
+#~ msgid "Discard"
+#~ msgstr "Verwerfe"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Erweiterte Optionen"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Erweiterte Regeln"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Mit erweiterten Regeln kann die Firewall an die eigenen Bedürfnisse "
+#~ "angepasst werden. Es werden nur neue Verbindungen betrachtet. Pakete, die "
+#~ "zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Benutzerdefinierte Regeln (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Gerät"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Für DNAT Regeln wird der Verkehr nach der angegeben Zieladresse "
+#~ "gefiltert. Bei SNAT Regeln ist dieses die Quelladresse für umgeschriebene "
+#~ "Pakete."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Eingehende Verbindungen filtern welche von dem angegebenen Port oder "
+#~ "Portbereich des Clients ausgehen"
+
+#~ msgid "Overview"
+#~ msgstr "Übersicht"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Portweiterleitung"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Portweiterleitungen ermöglichen es interne Netzwerkdienste aus einem "
+#~ "externen Netzwerk heraus erreichbar zu machen."
+
+#~ msgid "Redirection type"
+#~ msgstr "Typ der Weiterleitung"
+
+#~ msgid "Redirections"
+#~ msgstr "Weiterleitungen"
+
+#~ msgid "Rules"
+#~ msgstr "Regeln"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Umleitungen"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Umleitungen erlauben es das Ziel von weitergeleiteten Paketen zu "
+#~ "verändern."
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Netzwerke"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Verkehrskontrolle"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Zone-zu-Zone Verkehr"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin "
+#~ "und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, "
+#~ "die zu bereits bestehenden Verbindungen gehören werden automatisch "
+#~ "akzeptiert. Bei gelegentlich auftretenden Verbindungsproblemen kann MSS "
+#~ "Clamping helfen, ansonsten sollte dies aus Performancegründen deaktiviert "
+#~ "bleiben."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Ziel"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "IP-Adresse"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Quell-MAC-Adresse"
+
+#~ msgid "Custom forwarding"
+#~ msgstr "Erweiterte Weiterleitung"
+
+#~ msgid "Input Zone"
+#~ msgstr "Eingangszone"
+
+#~ msgid "Output Zone"
+#~ msgstr "Ausgangszone"
+
+#~ msgid "External Zone"
+#~ msgstr "Externe Zone"
+
+#~ msgid "Source MAC"
+#~ msgstr "Quell-MAC-Adresse"
+
+#~ msgid "Defaults"
+#~ msgstr "Grundeinstellungen"
+
+#~ msgid ""
+#~ "These are the default settings that are used if no other rules match."
+#~ msgstr ""
+#~ "Grundeinstellungen die verwendet werden, wenn keine andere Regel "
+#~ "angewandt werden kann."
+
+#~ msgid ""
+#~ "Zones part the network interfaces into certain isolated areas to separate "
+#~ "network traffic. One or more networks can belong to a zone. The MASQ-flag "
+#~ "enables NAT masquerading for all outgoing traffic on this zone."
+#~ msgstr ""
+#~ "Zonen teilen das Netzwerk in mehrere Bereiche ein um Netzverkehr sicher "
+#~ "zu trennen. Ein oder mehrere Netzwerke gehören zu einer Zone. Das MASQ-"
+#~ "Flag legt fest, dass aller ausgehende Netzverkehr einer Zone NAT-maskiert "
+#~ "wird."
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
+
+#~ msgid "contained networks"
+#~ msgstr "verbundene Netzwerke"
diff --git a/trunk/package/luci/po/de/freifunk-policyrouting.po b/trunk/package/luci/po/de/freifunk-policyrouting.po
new file mode 100644
index 00000000..79c22953
--- /dev/null
+++ b/trunk/package/luci/po/de/freifunk-policyrouting.po
@@ -0,0 +1,67 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-11-21 20:53+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Traffic der aus diesen Zonen kommt wird über ein Internetgateway im Mesh "
+"weitergeleitet."
+
+msgid "Enable Policy Routing"
+msgstr "Policy Routing aktivieren"
+
+msgid "Fallback to mesh"
+msgstr "Auf Mesh zurückfallen"
+
+msgid "Firewall zones"
+msgstr "Firewallzonen"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"Falls im Mesh kein anderer Internetgateway verfügbar ist, dann wird Traffic "
+"aus den ausgewählten Zonen als Fallback über die Internetverbindung dieses "
+"Routers geleitet. Wenn das nicht gewünscht ist und dieser Traffic dann "
+"stattdessen geblockt werden soll, dann aktiviere diese Option."
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+"Wenn das eigene lokale Gateway nicht verfügbar ist, dann nutze das aktuelle "
+"Mesh-Default-Gateway."
+
+msgid "Policy Routing"
+msgstr "Policy Routing"
+
+msgid "Strict Filtering"
+msgstr "Strenges Filtern"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"Auf diesen Seiten kann Policy Routing für bestimmte Firewallzonen aktiviert "
+"werden. Dies ist z.B. nützlich, wenn du deinen eigenen Internetverkehr über "
+"deine eigene Internetverbindung routen aber diese nicht mit anderen teilen "
+"willst ('Mein Gateway für mich allein').  Eigener Traffic wird dann über die "
+"eigene Internetverbindung geschickt während Traffic aus den ausgewählten "
+"Firewallzonen über einen anderen Gateway im Mesh geleitet wird."
diff --git a/trunk/package/luci/po/de/freifunk.po b/trunk/package/luci/po/de/freifunk.po
new file mode 100644
index 00000000..ff6e6bc6
--- /dev/null
+++ b/trunk/package/luci/po/de/freifunk.po
@@ -0,0 +1,447 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-12 17:58+0200\n"
+"PO-Revision-Date: 2013-01-28 22:17+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Schlecht (ETX > 10)"
+
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
+
+msgid "Basic settings"
+msgstr "Grundeinstellungen"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Die Grundeinstellungen sind unvollständig. Bitte gehe zur Seite"
+
+msgid "Basic system settings"
+msgstr "Grundlegende Systemeinstellungen"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+"Der Fernupdate-Mechanismus prüft nach neuen Firmware-Versionen und führt "
+"automatisierte Updates durch."
+
+msgid "Client network size"
+msgstr "Größe des DHCP-Netzes"
+
+msgid "Community"
+msgstr "Community"
+
+msgid "Community profile"
+msgstr "Community Profile"
+
+msgid "Community settings"
+msgstr "Community Einstellungen"
+
+msgid "Confirm Upgrade"
+msgstr "Updatevorgang starten"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "Die Kontaktinformationen sind unvollständig. Bitte gehe zur Seite"
+
+msgid "Coordinates"
+msgstr "Geokoordinaten"
+
+msgid "Country code"
+msgstr "Ländercode"
+
+msgid "Default routes"
+msgstr "Standardrouten"
+
+msgid "Disable default content"
+msgstr "Standardtext deaktivieren"
+
+msgid "Diversity is enabled for device"
+msgstr "Diversity ist aktiv für das Interface"
+
+msgid "E-Mail"
+msgstr "E-Mail"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "Indexseite bearbeiten"
+
+msgid "Enable IPv6"
+msgstr "IPv6 aktivieren"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "Fehler"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Geokoordinaten mit OpenStreetMap ermitteln"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Freifunk Übersicht"
+
+msgid "Freifunk Remote Update"
+msgstr "Freifunk Fernupdate"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Go to"
+msgstr "Gehe zu"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Gut (2 < ETX < 4)"
+
+msgid "Green"
+msgstr "Grün"
+
+msgid "Hello and welcome in the network of"
+msgstr "Hallo und willkommen im Netz von"
+
+msgid "Hide OpenStreetMap"
+msgstr "OpenStreetMap ausblenden"
+
+msgid "Homepage"
+msgstr "Homepage"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IPv6 Config"
+msgstr "IPv6 Konfiguration"
+
+msgid "IPv6 Prefix"
+msgstr "IPv6 Prefix"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "IPv6 Subnetz in CIDR-Notation"
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+"Wird diese Option gewählt dann wird das standardmässige Inhaltselement nicht "
+"angezeigt."
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Hast du Interesse an diesem Projekt, dann wende dich an deine lokale "
+"Gemeinschaft"
+
+msgid "Index Page"
+msgstr "Index-Seite"
+
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Der Internetzugang über das experimentelle Freifunknetz ist an technische "
+"und organisatorische Bedingungen geknüpft und deshalb möglicherweise nicht "
+"(immer) gewährleistet."
+
+msgid "It is operated by"
+msgstr "Er wird betrieben von "
+
+msgid "Keep configuration"
+msgstr "Konfigurationsdateien wiederherstellen"
+
+msgid "Latitude"
+msgstr "Breite"
+
+msgid "Legend"
+msgstr "Erklärung"
+
+msgid "Load"
+msgstr "Load"
+
+msgid "Local Time"
+msgstr "Lokale Zeit"
+
+msgid "Location"
+msgstr "Standort"
+
+msgid "Longitude"
+msgstr "Länge"
+
+msgid "Map"
+msgstr "Karte"
+
+msgid "Map Error"
+msgstr "Fehler beim Darstellen der Karte"
+
+msgid "Memory"
+msgstr "Hauptspeicher"
+
+msgid "Mesh prefix"
+msgstr "Prefix des Meshs"
+
+msgid "Metric"
+msgstr "Metrik"
+
+msgid "Mode"
+msgstr "Modus"
+
+msgid "Network"
+msgstr "Netzwerk"
+
+msgid "Network for client DHCP addresses"
+msgstr "Netzwerk aus dem IPs für Clients vergeben werden"
+
+msgid "Nickname"
+msgstr "Pseudonym"
+
+msgid "No default routes known."
+msgstr "Es sind keine Standardrouten bekannt."
+
+msgid "Notice"
+msgstr "Notiz"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Betreiber"
+
+msgid "Orange"
+msgstr "Orange"
+
+msgid "Overview"
+msgstr "Übersicht"
+
+msgid "Package libiwinfo required!"
+msgstr "Das Paket libiwinfo wird benötigt!"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Please fill in your contact details below."
+msgstr "Bitte gib hier deine Kontaktdaten an."
+
+msgid "Please set your contact information"
+msgstr "Bitte gib deine Kontaktinformationen ein"
+
+msgid "Power"
+msgstr "Power"
+
+msgid "Processor"
+msgstr "Prozessor"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Profile (Expert)"
+msgstr "Profil (Expertenmodus)"
+
+msgid "Realname"
+msgstr "Name"
+
+msgid "Red"
+msgstr "Rot"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Wähle hier deinen Standort durch einen Mausklick aus. Die Karte funktioniert "
+"nur, wenn bereits eine Verbindung zum Internet besteht."
+
+msgid "Show OpenStreetMap"
+msgstr "OpenStreetMap anzeigen"
+
+msgid "Show on map"
+msgstr "Karte öffnen"
+
+msgid "Signal"
+msgstr "Signal"
+
+msgid "Splash"
+msgstr "Splash"
+
+msgid "Start Upgrade"
+msgstr "Updatevorgang starten"
+
+msgid "Statistics"
+msgstr "Statistiken"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Noch nutzbar (4 < ETX < 10)"
+
+msgid "System"
+msgstr "System"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Das <em>libiwinfo</em>-Paket ist nicht installiert. Dieses Paket muss für "
+"eine funktionierende WLAN-Konfiguration vorhanden sein!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"OLSRd ist nicht dafür konfiguriert worden Geoinformationen zu speichern.<br /"
+"> Bitte sicherstellen dass das OLSRd-Nameservice-Plugin geladen und richtig "
+"konfiguriert wurde (Option latlon_file)."
+
+msgid "The installed firmware is the most recent version."
+msgstr "Die installierte Firmware ist bereits die neueste Version."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"Dies hier sind die Grundeinstellungen für die Freifunk Community in deiner "
+"Nachbarschaft. Diese Einstellungen legen die Standardwerte für den ffwizard "
+"fest und beeinflussen die aktuelle Konfiguration des Routers NICHT."
+
+msgid "These are the settings of your local community."
+msgstr "Dies sind die Einstellungen für deine Freifunk Community."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Diese Seiten helfen dabei, den Router für Freifunk oder ähnliche Wireless "
+"Community Netzwerke einzurichten."
+
+msgid "This is the access point"
+msgstr "Dies ist der Zugangspunkt "
+
+msgid "Update Settings"
+msgstr "Einstellungen zum Update"
+
+msgid "Update available!"
+msgstr "Update verfügbar!"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr "Heruntergeladene Images verifizieren"
+
+msgid "Very good (ETX < 2)"
+msgstr "Sehr gut (ETX < 2) "
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Wir sind eine Initiative zur Schaffung eines freien, offenen und "
+"unabhängigen Funknetzwerks auf WLAN-Basis."
+
+msgid "Wireless Overview"
+msgstr "WLAN Übersicht"
+
+msgid "Yellow"
+msgstr "Gelb"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"Hier kann der Indexseite weiterer Inhalt hinzugefügt werden. Dazu muss "
+"gültiges XHTML verwendet werden.<br />Überschriften sollten zwischen den "
+"Tags &lt;h2&gt; und &lt;/h2&gt; eingeschlossen werden."
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "Weitere Informationen zur globalen Freifunkinitiative findest du unter"
+
+msgid "You can manually edit the selected community profile here."
+msgstr "Hier kann das ausgewählte Community-Profil bearbeitet werden."
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+"Es muss ein Profil ausgewählt werden, bevor es editiert werden kann. Gehe "
+"dazu zur Seite"
+
+msgid "and fill out all required fields."
+msgstr "und fülle alle benötigten Felder aus."
+
+msgid "buffered"
+msgstr "gepuffert"
+
+msgid "cached"
+msgstr "gecacht"
+
+msgid "e.g."
+msgstr "z.B."
+
+msgid "free"
+msgstr "ungenutzt"
+
+msgid "to disable it."
+msgstr "um es auszuschalten."
+
+msgid "used"
+msgstr "benutzt"
+
+msgid "wireless settings"
+msgstr "Drahtloseinstellungen"
+
+#~ msgid ""
+#~ "No services can be shown, because olsrd is not running or the olsrd-"
+#~ "nameservice Plugin is not loaded."
+#~ msgstr ""
+#~ "Es kann keine Liste der Dienste angezeigt werden, da olsrd nicht läuft "
+#~ "oder das nameservice plugin nicht geladen oder konfiguriert wurde."
+
+#~ msgid "Services"
+#~ msgstr "Dienste"
+
+#~ msgid "Source"
+#~ msgstr "Quelle"
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Das <em>libiwinfo-lua</em>-Paket ist nicht installiert. Das Paket muss "
+#~ "für eine funktionierende WLAN-Konfiguration installiert sein!"
+
+#~ msgid "Url"
+#~ msgstr "Adresse"
diff --git a/trunk/package/luci/po/de/hd_idle.po b/trunk/package/luci/po/de/hd_idle.po
new file mode 100644
index 00000000..890df678
--- /dev/null
+++ b/trunk/package/luci/po/de/hd_idle.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2011-06-11 01:55+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Disk"
+msgstr "Festplatte"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Enable debug"
+msgstr "Debug-Ausgaben aktivieren"
+
+msgid "Idle-time"
+msgstr "Leerlaufzeit"
+
+msgid "Idle-time unit"
+msgstr "Leerlaufzeiteinheit"
+
+msgid "Settings"
+msgstr "Einstellungen"
+
+# Hours
+msgid "h"
+msgstr "Stunden"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle ist ein Hilfsprogramm um externe Festplatten nach einer festgelegten "
+"Leerlaufzeit herunter zu fahren."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "Minuten"
diff --git a/trunk/package/luci/po/de/meshwizard.po b/trunk/package/luci/po/de/meshwizard.po
new file mode 100644
index 00000000..87802be2
--- /dev/null
+++ b/trunk/package/luci/po/de/meshwizard.po
@@ -0,0 +1,145 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-26 15:36+0200\n"
+"PO-Revision-Date: 2012-11-21 20:51+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "IPv6 global aktivieren oder deaktivieren"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Aktivieren um Zugriff auf das LAN von anderen Knoten oder Clients zu "
+"verhindern"
+
+msgid "Cleanup config"
+msgstr "Konfiguration aufräumen"
+
+msgid "Configure this interface"
+msgstr "Diese Schnittstelle einrichten"
+
+msgid "DHCP IP range"
+msgstr "DHCP-Adressbereich"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP vergibt automatisch IP-Adressen an Clients"
+
+msgid "Enable DHCP"
+msgstr "DHCP aktivieren"
+
+msgid "Enable RA"
+msgstr "RAs aktivieren"
+
+msgid "Enabled"
+msgstr "Aktiviert"
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "IPv6 Settings"
+msgstr "IPv6 Einstellungen"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Wenn diese Option aktiviert wird, werden eventuell vorhandene Einstellungen "
+"aufgeräumt bevor neue Optionen gesetzt werden."
+
+msgid "Interfaces"
+msgstr "Schnittstellen"
+
+msgid "Mesh IP address"
+msgstr "Mesh-IP-Adresse"
+
+msgid "Mesh IPv6 address"
+msgstr "Mesh-IPv6-Adresse"
+
+msgid "Mesh Wizard"
+msgstr "Mesh-Assistent"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Hinweis: Dies konfiguriert die Schnittstelle für den Mesh-Betrieb, d.h. sie "
+"wird zur Freifunk-Zone hinzugefügt und OLSR eingerichtet."
+
+msgid "Protect LAN"
+msgstr "LAN schützen"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Diese Option aktivieren um anderen den Zugriff auf die lokale "
+"Internetverbindung zu gestatten"
+
+msgid "Send router advertisements on this device."
+msgstr "Router-Advertisements auf dieser Schnittstelle senden"
+
+msgid "Share your internet connection"
+msgstr "Internetverbindung freigeben"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Der Adressbereich, aus welchem den Clients IP-Adressen zugewiesen werden (z."
+"B. 10.1.2.1/28). Liegt dieser Adressbereich außerhalb des Mesh-Bereiches, "
+"dann wird dieser per HNA angekündigt. Leer lassen um den Standardwert aus "
+"dem Community-Profil zu verwenden."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr "Die angegebene IP-Adresse ist nicht Teil des Mesh-Adressbereiches"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+"Diese ist eine eindeutige IPv6-Adresse in CIDR-Notation (z.B. "
+"2001:1:2:3::1/64) welche bei der lokalen Community registriert werden muss."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Dies ist die eindeutige IP-Adresse des Mesh-Knotens (z.B. 10.1.1.1). Diese "
+"muss bei der lokalen Community registriert werden."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Dies richtet eine weitere, virtuelle WLAN-Schnittstelle im Access-Point-"
+"Modus ein."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Der Assistent hilft beim Einrichten des Routers für ein Freifunk- oder "
+"ähnliches Wireless-Community-Netzwerk."
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Virtueller Access-Point (VAP)"
+
+msgid "Wizard"
+msgstr "Assistent"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Dieses Gerät und benachbarte Knoten müssen den selben Kanal verwenden."
+
+msgid "recommended"
+msgstr "empfohlen"
diff --git a/trunk/package/luci/po/de/minidlna.po b/trunk/package/luci/po/de/minidlna.po
new file mode 100644
index 00000000..d912c926
--- /dev/null
+++ b/trunk/package/luci/po/de/minidlna.po
@@ -0,0 +1,205 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-09 14:39+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Album art names:"
+msgstr "Dateinamen für Cover-Bilder:"
+
+msgid "Announced model number:"
+msgstr "Angekündigte Modellnummer:"
+
+msgid "Announced serial number:"
+msgstr "Angekündigte Seriennummer:"
+
+msgid "Browse directory"
+msgstr "Browse-Verzeichnis"
+
+msgid "Collecting data..."
+msgstr "Sammle Daten..."
+
+msgid "Database directory:"
+msgstr "Datenbankverzeichnis:"
+
+msgid "Enable TIVO:"
+msgstr "TIVO aktivieren:"
+
+msgid "Enable inotify:"
+msgstr "Inotify aktivieren:"
+
+msgid "Enable:"
+msgstr "Aktivieren:"
+
+msgid "Friendly name:"
+msgstr "Spitzname:"
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Interfaces:"
+msgstr "Schnittstellen:"
+
+msgid "Log directory:"
+msgstr "Protokollverzeichnis:"
+
+msgid "Media directories:"
+msgstr "Medienverzeichnisse:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA ist eine Serversoftware mit dem Ziel voll kompatibel mit DLNA/UPnP-"
+"AV-Klienten zu sein."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Spezifiziert die Modellnummer welche der miniDLNA-Dienst als Teil seiner XML-"
+"Beschreibung an Clients versendet."
+
+msgid "Music"
+msgstr "Musik"
+
+msgid "Network interfaces to serve."
+msgstr "Zu bedienende Netzwerkschnittstellen."
+
+msgid "Notify interval in seconds."
+msgstr "Ankündigungsinterval in Sekunden."
+
+msgid "Notify interval:"
+msgstr "Ankündigunsintervall"
+
+msgid "Pictures"
+msgstr "Bilder"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port für HTTP-Verkehr (Beschreibungen, SOAP, Mediendaten)."
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr "Präsentations-URL:"
+
+msgid "Root container:"
+msgstr "Root-Container:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Spezifiziert die Seriennummer welche der miniDLNA-Dienst als Teil seiner XML-"
+"Beschreibung an Clients versendet."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "Diesen Wert setzen um den auf Clients angezeigten Namen zu verändern."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Diesen Wert setzen um das Verzeichnis zu bestimmen in dem miniDLNA seine "
+"Datenbank und den Cover-Bild-Speicher ablegt."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+"Diesen Wert setzen um das Verzeichnis zu bestimmen in dem miniDLNA seine "
+"Protokolldateien ablegt."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Diese Option aktivieren um den Inotify-Mechanismus zum Entdecken neuer "
+"Dateien zu benutzen."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Diese Option aktivieren um die Unterstützung von JPEG- und MP3-Streaming zu "
+"HMO-TiVo-Geräten zu aktivieren."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Diese Option setzen um den DLNA-Standard strikt einzuhalten. Damit wird "
+"serverseitiges Herunterskalieren von JPEG-Bildern aktviert was die "
+"Auslieferunsgeschwindigkeit in Verbindung mit Sony DLNA-Produkten negativ "
+"beeinflussen kann."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Spezifiziert die zu durchsuchenden Medienverzeichnisse. Durch Voranstellung "
+"eines Buchstaben gefolgt von einem Komma kann ein Verzeichnis auf einen "
+"bestimmten Typ eingeschränkt werden; 'A' für Audio-, 'V' für Video- und 'P' "
+"für Bild-Verzeichnisse. Es können mehrere Verzeichnisse angegeben werden."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Spezifiziert den Pfad zur MiniSSDPd-Socket-Datei."
+
+msgid "Standard container"
+msgstr "Standard-Container"
+
+msgid "Strict to DLNA standard:"
+msgstr "Stikt nach DLNA-Standard:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"Der miniDLNA-Dienst ist aktiv und publiziert %d Audio-, %d Video- und %d "
+"Bild-Dateien."
+
+msgid "The miniDLNA service is not running."
+msgstr "Der miniDLNA-Dienst ist inaktiv."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+"Dies ist eine Liste von Dateinamen, die geprüft werden sollen wenn nach "
+"Cover-Bildern gesucht wird."
+
+msgid "Video"
+msgstr "Video"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "miniDLNA-Status"
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP-Socket:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr ""
+#~ "Lister dee bedienten Netzwerkschnittstellen als Komma-getrennte Liste."
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "Dies ist eine Liste von zu prüfenden Dateinamen wenn nach Album-Covern "
+#~ "gesucht wird. Hinweis: Namen müssen mit einem Schrägstrich ('/') getrennt "
+#~ "werden."
diff --git a/trunk/package/luci/po/de/mmc_over_gpio.po b/trunk/package/luci/po/de/mmc_over_gpio.po
new file mode 100644
index 00000000..3b214171
--- /dev/null
+++ b/trunk/package/luci/po/de/mmc_over_gpio.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2012-11-28 10:44+0200\n"
+"Last-Translator: dunkelschunkel <dunkelschunkel@googlemail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+# Das wäre der Pin für Clock, also Takt, eventuell kann das auch rein. Halte obige Variante aber für hinreichend
+msgid "CLK_pin"
+msgstr "CLK-Pin"
+
+msgid "CS_pin"
+msgstr "CS-Pin"
+
+msgid "DI_pin"
+msgstr "DI-Pin"
+
+msgid "DO_pin"
+msgstr "DO-Pin"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "MMC/SD driver configuration"
+msgstr "MMC/SD Treibereinstellungen"
+
+msgid "Mode"
+msgstr "Modus"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Settings"
+msgstr "Einstellungen"
diff --git a/trunk/package/luci/po/de/multiwan.po b/trunk/package/luci/po/de/multiwan.po
new file mode 100644
index 00000000..f2bec627
--- /dev/null
+++ b/trunk/package/luci/po/de/multiwan.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-10 02:55+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Versuche vor Umschalten auf WAN Ersatzverbindung"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Versuche vor dem Zurückschalten auf normale WAN Verbindung"
+
+msgid "Auto"
+msgstr "automatisch"
+
+msgid "Collecting data..."
+msgstr "Sammle Daten..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Mit diesen Regeln kann ausgehender Verkehr bestimmten WAN-Uplinks zugeordnet "
+"werden."
+
+msgid "DNS Server(s)"
+msgstr "DNS Server"
+
+msgid "Default Route"
+msgstr "Standardroute"
+
+msgid "Destination Address"
+msgstr "Zieladresse"
+
+msgid "Disable"
+msgstr "Deaktivieren"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Failing"
+msgstr "Versagt"
+
+msgid "Failover Traffic Destination"
+msgstr "Failover Traffic Ziel"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "ICMP Host(s) zur Verbindungsüberwachung"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Timeout für ICMP-Pakete zur Verbindungsüberwachung"
+
+msgid "Health Monitor Interval"
+msgstr "Intervall für Verbindungsüberwachung"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"Die Verbindungsüberwachung erkennt und behebt Netzwerkänderungen und "
+"Verbindungsabbrüche."
+
+msgid "KO"
+msgstr "Getrennt"
+
+msgid "Load Balancer Distribution"
+msgstr "Load Balancer Verteilung"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Load Balancer (Kompatibilität)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Load Balancer (Performance)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Multi-WAN Status"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Multi-WAN Verkehrsregeln"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN erlaubt es, mehrere ISP-Verbindungen gleichzeitig oder als "
+"Ersatzverbindung beim Ausfall der Hauptverbindung zu verwenden."
+
+msgid "None"
+msgstr "Keine"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Recovering"
+msgstr "Neu verbunden"
+
+msgid "Source Address"
+msgstr "Quelladresse"
+
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgid "WAN Interfaces"
+msgstr "WAN-Schnittstellen"
+
+msgid "WAN Uplink"
+msgstr "WAN Uplink-Verbindung"
+
+msgid "all"
+msgstr "alle"
diff --git a/trunk/package/luci/po/de/ntpc.po b/trunk/package/luci/po/de/ntpc.po
new file mode 100644
index 00000000..b6109358
--- /dev/null
+++ b/trunk/package/luci/po/de/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-07-17 15:07+0200\n"
+"Last-Translator: Martin <roecker@empty-v.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Zeitgeberjustierung"
+
+msgid "Count of time measurements"
+msgstr "Anzahl der Zeitmessungen"
+
+msgid "Current system time"
+msgstr "Aktuelle Systemzeit"
+
+msgid "General"
+msgstr "Allgemein"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Offset frequency"
+msgstr "Frequenzabweichung"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Synchronisiert die Systemzeit"
+
+msgid "Time Server"
+msgstr "Zeitserver"
+
+msgid "Time Servers"
+msgstr "Zeitserver"
+
+msgid "Time Synchronisation"
+msgstr "Zeitsynchronisation"
+
+msgid "Update interval (in seconds)"
+msgstr "Aktualisierungsintervall (in Sekunden)"
+
+msgid "empty = infinite"
+msgstr "leer = unendlich"
diff --git a/trunk/package/luci/po/de/olsr.po b/trunk/package/luci/po/de/olsr.po
new file mode 100644
index 00000000..8be91d74
--- /dev/null
+++ b/trunk/package/luci/po/de/olsr.po
@@ -0,0 +1,814 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-11-21 20:54+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "Aktive MID-Ankündigungen"
+
+msgid "Active OLSR nodes"
+msgstr "Aktive OLSR-Knoten"
+
+msgid "Active host net announcements"
+msgstr "Aktive HNA-Ankündigungen"
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Allow gateways with NAT"
+msgstr "Gateways mit NAT erlauben"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "Auswahl von IPv4-Gateways erlauben, die zum Internet hin NAT verwenden"
+
+msgid "Announce uplink"
+msgstr "Uplink ankündigen"
+
+msgid "Announced network"
+msgstr "Angekündigtes Netzwerk"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+"Beide Werte müssen in der 'dotted decimal' Schreibweise angegeben werden."
+
+msgid "Broadcast address"
+msgstr "Broadcast-Adresse"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Konfiguration"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "Anzeige"
+
+msgid "Downlink"
+msgstr "Download-Bandbreite"
+
+msgid "Download Config"
+msgstr "Konfiguration herunterladen"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"SmartGateway aktivieren. Ist diese Option deaktiviert, dann werden alle "
+"folgenden SmartGateway Einstellungen ignoriert. Der Defaultwert ist \"no\"."
+
+msgid "Enable this interface."
+msgstr "Dieses Interface benutzen."
+
+msgid "Enabled"
+msgstr "Aktiviert"
+
+msgid "Expected retransmission count"
+msgstr "Zu erwartende Sendeversuche pro Paket"
+
+msgid "FIB metric"
+msgstr "FIB-Metrik"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+"FIBMetric bestimmt die Metrik für Hostrouten die olsrd setzt. \"flat\" setzt "
+"die Metrik immer auf 2. Dies ist der bevorzugte Wert, da er dem Kernel dabei "
+"hilft, veraltete Routen zu löschen. \"correct\" verwendet den Hopcount als "
+"Metrik. \"approx\" benutzt ebenfalls den Hopcount als Metrik, updated diese "
+"aber nur, wenn sich auch der Nexthop verändert hat. Der Defaultwert ist "
+"\"flat\"."
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+"Fisheye Mechanismus für TC-Nachrichten (ausgewählt entspricht ein). Der "
+"Defaultwert ist \"ein\""
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "General settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "HNA-Ankündigungen"
+
+msgid "HNA interval"
+msgstr "HNA-Intervall"
+
+msgid "HNA validity time"
+msgstr "HNA-Gültigkeit"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "HNA-Ankündigungen"
+
+msgid "Hello"
+msgstr "Hello"
+
+msgid "Hello interval"
+msgstr "Hello-Intervall"
+
+msgid "Hello validity time"
+msgstr "Hello-Gültigkeit"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "Sprünge"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+"Rechner in einem OLSR-geroutetem Netzwerk können Konnektivität zu externen "
+"Netzwerken mittels HNA-Nachrichten ankündigen."
+
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Rechner in einem OLSR-geroutetem Netzwerk können Konnektivität zu externen "
+"Netzwerken mittels HNA-Nachrichten ankündigen."
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+"Verwende Hysterese zur Berechnung von Links (nur verfügbar für Hopcount "
+"Metric). Hysterese erhöht die Stabilität von berechneten Routen, verzögert "
+"aber das Registrieren von Nachbarknoten. Der Defaultwert ist \"eingeschaltet"
+"\"."
+
+msgid "IP Addresses"
+msgstr "IP-Adressen"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+"Die zu verwendende IP-Version. Wird 6and4 gewählt dann wird ein OLSRd-"
+"Prozess für jedes Protokoll gestartet."
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 Broadcast"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+"IPv4 Broadcastadresse für ausgehende OLSR-Pakete. Ein häufig verwendetes "
+"Beispiel ist 255.255.255.255. Der Defaultwert ist \"0.0.0.0\". Dies "
+"verwendet die Broadcastadresse des Interfaces."
+
+msgid "IPv4 source"
+msgstr "IPv4 Quell-IP"
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+"IPv4 Quell-IP für ausgehende OLSR-Nachrichten. Der Defaultwert ist "
+"\"0.0.0.0\", dann wird die IP des Interfaces verwendet."
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "IPv6 Multicast"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+"IPv6 Multicast-Adresse. Der Defaultwert ist \"FF02::6D\", die linklocal "
+"Multicastadresse für MANETs."
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"IPv6 Netzwerk muss in 'full notation', der Prefix in CIDR Schreibweise "
+"eingegeben werden."
+
+msgid "IPv6 source"
+msgstr "IPv6 Quell-IP"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+"IPv6 Quell-Prefix. OLSRd wählt eine IP als Quell-IP die innerhalb des "
+"angegebenen Prefix liegt. Der Defaultwert ist \"0::/0\", damit wird eine "
+"IPv6-Adresse des Interfaces verwendet die nicht linklocal ist."
+
+msgid "IPv6-Prefix of the uplink"
+msgstr "IPv6-Präfix des Uplinks"
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+"Wenn sich die Route zum aktuellen Gateway ändert, dann wird sein ETX-Wert "
+"zunächst mit diesem Wert multipliziert bevor er mit dem neuen ETX-Wert "
+"verglichen wird. Damit kann \"flapping\" von Routen reduziert werden. Der "
+"Wert kann zwischen 0.1 und 1.0 liegen, sollte aber nahe bei 1.0 sein.<br /"
+"><b>ACHTUNG:</b> Diese Einstellung darf nicht zusammen mit der etx_ffeth "
+"Metrik verwendet werden!<br />Der Defaultwert ist \"1.0\"."
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+"Benutzt dieser Knoten NAT für die Verbindung zum Internet? Der Defaultwert "
+"ist \"yes\"."
+
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+"Mit dieser Einstellung kann unnötiges Forwarden von Paketen auf geswitchten "
+"Ethernetschnittstellen unterbunden werden. Gültige Werte sind \"mesh\" und "
+"\"ether\". Der Defaultwert ist \"mesh\"."
+
+msgid "Interfaces"
+msgstr "Schnittstellen"
+
+msgid "Interfaces Defaults"
+msgstr "Schnittstellen-Standards"
+
+msgid "Internet protocol"
+msgstr "Internet Protokoll"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+"Intervall mit dem Netzwerkschnittstellen auf Änderungen in ihrer "
+"Konfiguration überprüft werden (in Sekunden). Der Defaultwert ist \"2.5\"."
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "Bekannte OLSR-Routen"
+
+msgid "LQ"
+msgstr "LQ"
+
+msgid "LQ aging"
+msgstr "LQ-Alterung"
+
+msgid "LQ algorithm"
+msgstr "LQ-Algorithmus"
+
+msgid "LQ fisheye"
+msgstr "LQ-Fisheye"
+
+msgid "LQ level"
+msgstr "LQ-Level"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "letzter Hop"
+
+msgid "Legend"
+msgstr "Legende"
+
+msgid "Library"
+msgstr "Bibliothek"
+
+msgid "Link Quality Settings"
+msgstr "Linkqualitätseinstellungen"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+"Der Linkqualitäts-Alterungsfaktor kann nur zusammen mit Linkqualitylevel 2 "
+"verwendet werden. Kleinere Werte bedeuten, dass ETX-Werte sich langsamer "
+"verändern. Erlaubte Werte sind 0.01 bis 1.0."
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+"Link Quality Algorithmus (nur für lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX mit exponentieller Alterung<br /><b>etx_fpm</b>: Dasselbe "
+"wie etx_float, Berechnung jedoch mit Ganzzahlen<br /><b>etx_ff</b>: ETX "
+"freifunk, eine ETX Variante die allen OLSR Traffic zur ETX Berechnung nutzt "
+"(und nicht nur Hello-Nachrichten)<br /><b>etx_ffeth</b>: Inkompatible "
+"Variante von etx_ff die Ethernetlinks mit ETX 0.1 erlaubt<br />Der Default "
+"ist \"etx_ff\""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+"Mit dieser Option kann der Linkquality-Algorithmus gewählt werden.<br /"
+"><b>0</b> = Linkquality nicht benutzen<br /><b>2</b> = Linkquality für die "
+"Wahl von MPRs und fürs Routing benutzen.<br />Der Defaultwert ist \"2\"."
+
+msgid "LinkQuality Multiplicator"
+msgstr "LQ-Multiplikator"
+
+msgid "Links per node (average)"
+msgstr "Verbindungen pro Node (Durchschnitt)"
+
+msgid "Links total"
+msgstr "Verbindungen insgesamt"
+
+msgid "Local interface IP"
+msgstr "Lokale Interface-IP"
+
+msgid "MID"
+msgstr "MID"
+
+msgid "MID interval"
+msgstr "MID-Intervall"
+
+msgid "MID validity time"
+msgstr "MID-Gültigkeit"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "Haupt-IP"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr "Metrik"
+
+msgid "Mode"
+msgstr "Modus"
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Multipliziere die Linkquality (LQ) für Routen mit dem hier angegebenen "
+"Faktor, der zwischen 0.01 und 1 liegen kann. Beispiele:<br />halbiere die LQ "
+"zu 192.168.0.1: 192.168.0.1 0.5<br />reduziere die LQ für alle Nodes die mit "
+"diesem Interface kommunizieren um 20%: default 0.8"
+
+msgid "NAT threshold"
+msgstr "NAT-Schwellenwert"
+
+msgid "NLQ"
+msgstr "NLQ"
+
+msgid "Neighbors"
+msgstr "Nachbarn"
+
+msgid "Neighbour IP"
+msgstr "Nachbar-IP"
+
+msgid "Neighbours"
+msgstr "Nachbarn"
+
+msgid "Netmask"
+msgstr "Netzmaske"
+
+msgid "Network"
+msgstr "Netzwerk"
+
+msgid "Network address"
+msgstr "Netzwerk-Adresse"
+
+msgid "Nic changes poll interval"
+msgstr "Abfrageintervall für Schnittstellenänderungen"
+
+msgid "Nodes"
+msgstr "Knoten"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr "OLSR - Anzeigeoptionen"
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - HNA-Ankündigungen"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA-Ankündigungen"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Plugins"
+
+msgid "OLSR Daemon"
+msgstr "OLSR Daemon"
+
+msgid "OLSR Daemon - Interface"
+msgstr "OLSR Daemon - Schnittstelle"
+
+msgid "OLSR connections"
+msgstr "OLSR-Verbindungen"
+
+msgid "OLSR gateway"
+msgstr "OLSR-Gateway"
+
+msgid "OLSR node"
+msgstr "OLSR-Knoten"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr "Übersicht"
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Übersicht über zur Zeit aktive OLSR-Netzwerk-Ankündigungen"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Übersicht über aktuell bestehende OLSR-Verbindungen"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Übersicht über zur Zeit bekannte andere OLSR-Knoten"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Übersicht über zur Zeit bekannte Routen zu anderen OLSR-Knoten"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr "Übersicht über Interfaces auf denen OLSRd läuft."
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Übersicht über bekannte Mehrfachschnittstellenmeldungen"
+
+msgid "Overview of smart gateways in this network"
+msgstr "Übersicht über Smart Gateways in diesem Netzwerk."
+
+msgid "Plugin configuration"
+msgstr "Pluginkonfiguration"
+
+msgid "Plugins"
+msgstr "Plugins"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr "Abfragerate für OLSRd-Sockets in Sekunden. Der Defaultwert ist 0.05."
+
+msgid "Pollrate"
+msgstr "Abfragerate"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr "DNS auflösen"
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+"Hostnamen auf den Statusseiten auflösen. Dies ist in der Regel kein Problem, "
+"wenn aber öffentliche IPs benutzt werden und das DNS-Setup nicht stabil ist, "
+"dann werden die OLSR-Statusseiten nur sehr langsam laden. In diesem Fall "
+"sollte man diese Option deaktivieren."
+
+msgid "Routes"
+msgstr "Routen"
+
+msgid "Secondary OLSR interfaces"
+msgstr "Sekundäre OLSR Schnittstellen"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+"Setzt die Haupt-IP (originator ip) für diesen Router. Diese IP wird sich "
+"NIEMALS während der Laufzeit von OLSRD verändern. Der Defaultwert ist "
+"0.0.0.0. Damit wird die IP des ersten Interfaces verwendet."
+
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Setzt die Haupt-IP (originator ip) für diesen Router. Diese IP wird sich "
+"NIEMALS während der Laufzeit von OLSRD verändern. Der Defaultwert ist "
+"0.0.0.0. Damit wird die IP des ersten Interfaces verwendet."
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr "Smart Gateway"
+
+msgid "SmartGW announcements"
+msgstr "Smart Gateway Ankündigungen"
+
+msgid "SmartGateway is not configured on this system."
+msgstr "Smart Gateway ist auf diesem System nicht konfiguriert."
+
+msgid "Source address"
+msgstr "Quell-IP"
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+"Hiermit kann man die Geschwindigkeit des Uplinks dieses Knotens ankündigen. "
+"Der erste Wert ist die Upload-, der zweite Wert die Downloadgeschwindigkeit. "
+"Der Defaultwert ist \"128 1024\"."
+
+msgid "Speed of the uplink"
+msgstr "Geschwindigkeit des Uplinks"
+
+msgid "State"
+msgstr "Status"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr "Erfolgsquote vom Nachbarn empfangener Pakete"
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr "Erfolgsquote zum Nachbarn gesendeter Pakete"
+
+msgid "TC"
+msgstr "TC"
+
+msgid "TC interval"
+msgstr "TC-Intervall"
+
+msgid "TC validity time"
+msgstr "TC-Gültigkeit"
+
+msgid "TOS value"
+msgstr "TOS-Wert"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+"OLSR ist eine Implementation des Optimized Link State Routing Protokolls und "
+"erlaubt damit Mesh-Routing für jegliche Netzwerkgeräte. Besuche <a "
+"href='http://www.olsr.org'>olsrd.org</a> für Hilfe und Dokumentation."
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+"Hier kann ein Bereitschaftswert angegeben werden. Bleibt dieses Feld leer, "
+"dann wird der Bereitschaftswert automatisch anhand von Akkukapazität und "
+"Stromversorgung berechnet"
+
+msgid "The interface OLSRd should serve."
+msgstr "Interface das OLSRd verwenden soll."
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+"Port, den OLSRd benutzt. Dieser sollte in der Regel auf dem Defaultwert 698 "
+"bleiben, was dem von IANA zugewiesenen Port für OLSRd entspricht."
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+"Hiermit kann der externe IPv6-Präfix an Clients signalisiert werden. Dadurch "
+"können Clients ihre lokale IP-Adresse ändern, um diesen IPv6-Gateway ohne "
+"Übersetzung der IPv6-Adresse zu benutzen. Die maximale erlaubte Länge des "
+"Präfix ist 64 bit. Der Defaultwert ist \"::/0\" (kein Präfix)."
+
+msgid "Timing and Validity"
+msgstr "Taktung und Validität"
+
+msgid "Topology"
+msgstr "Topologie"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+"TOS-Wert für den IP-Header von OLSR-Nachrichten. Der Defaultwert ist \"16\"."
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!"
+
+msgid "Uplink"
+msgstr "Upload-Bandbreite"
+
+msgid "Uplink uses NAT"
+msgstr "Der Uplink benutzt NAT."
+
+msgid "Use hysteresis"
+msgstr "Hysterese aktivieren"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Version"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+"WARNUNG: kmod-ipip ist nicht installiert. Ohne kmod-ipip wird SmartGateway "
+"nicht funktionieren!"
+
+msgid "Weight"
+msgstr "Gewichtung"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+"Gibt es mehrere Links zwischen einzelnen Nodes dann wird ein Gewichtungswert "
+"verwendet um zu bestimmen, welches Interface bevorzugt wird. Dieses Gewicht "
+"wird in der Regel automatisch berechnet, kann hier jedoch mit einem festen "
+"Wert überschrieben werden. OLSRd wählt den Link mit dem niedrigsten Wert. "
+"<br /><b>Hinweis:</b> Diese Gewichtung ist nur möglich wenn "
+"LinkQualityLevel= 0 ist. Für alle anderen Werte von LinkQualityLevel wird "
+"stattdessen der ETX-Wert verwendet."
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+"Welche Art von Uplink im Mesh angekündigt wird. Ein Uplink wird automatisch "
+"anhand der lokal angekündigten HNA erkannt (0.0.0.0/0, ::ffff:0:0/96 oder "
+"2000::/3). Der Defaultwert ist \"both\" (sowohl IPv4 als auch IPv6 Uplink "
+"ankündigen sofern verfügbar)."
+
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Welche Art von Uplink im Mesh angekündigt wird. Ein Uplink wird automatisch "
+"anhand der lokal angekündigten HNA erkannt (0.0.0.0/0, ::ffff:0:0/96 oder "
+"2000::/3). Der Defaultwert ist \"both\" (sowohl IPv4 als auch IPv6 Uplink "
+"ankündigen sofern verfügbar)."
+
+msgid "Willingness"
+msgstr "Bereitschaft"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "Schnittstelle"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Stellen Sie sicher das OLSRd läuft und das \"txtinfo\" Plugin auf Port "
+#~ "2006 geladen und \"127.0.0.1\" als Accept-Host gesetzt ist."
diff --git a/trunk/package/luci/po/de/openvpn.po b/trunk/package/luci/po/de/openvpn.po
new file mode 100644
index 00000000..ce77281e
--- /dev/null
+++ b/trunk/package/luci/po/de/openvpn.po
@@ -0,0 +1,560 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2013-01-28 22:15+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "Topologietyp"
+
+msgid "Accept options pushed from server"
+msgstr "Vom Server übertragene Optionen lokal akzeptieren"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Add route after establishing connection"
+msgstr "Netzwerkrouten nach Verbindungsaufbau einrichten"
+
+msgid "Additional authentication over TLS"
+msgstr "Erweiterte Authentifikation über TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Netzwerkverkehr zwischen Teilnehmern zulassen"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Mehrere Teilnehmer mit selbem Zertifikat erlauben"
+
+msgid "Allow only one session"
+msgstr "Nur eine einzige Verbindung zulassen"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Address- und Port-Änderungen der Gegenstelle zulassen"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Betriebsmodus"
+
+msgid "Allowed maximum of internal"
+msgstr "Maximal erlaubte Anzahl an Netzwerkrouten pro Teilnehmer"
+
+msgid "Allowed maximum of new connections"
+msgstr "Wiederholrate für Verbindungversuche"
+
+msgid "Append log to file"
+msgstr "An Protokolldatei anfügen"
+
+msgid "Authenticate using username/password"
+msgstr "Authentifikation mittels Benutzername und Passwort"
+
+msgid "Automatically redirect default route"
+msgstr "Automatisch die Standard-Route umleiten"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr "Liste der konfigurierten OpenVPN Instanzen und ihr momentaner Status"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+"Shell-Kommando <em>vor</em> Deaktivierung der TUN/TAP Schnittstelle ausführen"
+
+msgid "Certificate authority"
+msgstr "Zertifikat der Zertifizierungsstelle"
+
+msgid "Change process priority"
+msgstr "Prozess-Priorität anpassen"
+
+msgid "Change to directory before initialization"
+msgstr "<em>Vor</em> der Initialisierung in Verzeichnis wechseln"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Teilnehmerzertifikat mit Sperrliste abgleichen"
+
+msgid "Chroot to directory after initialization"
+msgstr "<em>Nach</em> der Initialisierung in Verzeichnis wechseln"
+
+msgid "Client is disabled"
+msgstr "Teilnehmer-Konto deaktivieren"
+
+msgid "Configuration category"
+msgstr "Kategorie"
+
+msgid "Configure client mode"
+msgstr "Clientmodus"
+
+msgid "Configure server bridge"
+msgstr "Server-zu-Server Netzwerkbrücke"
+
+msgid "Configure server mode"
+msgstr "Server-Modus"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Verbindung über einen Socks 5 - Proxy"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Verbindung zum entfernten Rechner über HTTP-Proxy aufbauen"
+
+msgid "Connection retry interval"
+msgstr "Wiederholrate für Verbindungversuche"
+
+msgid "Cryptography"
+msgstr "Kryptographie"
+
+msgid "Daemonize after initialization"
+msgstr "Nach der Initialisierung als Hintergrundprozess ausführen"
+
+msgid "Delay n seconds after connection"
+msgstr "Nach dem Verbindungsaufbau um n Sekunden verzögern"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Shell-Kommando nach Schnittstelleneinrichtung verzögern"
+
+msgid "Diffie Hellman parameters"
+msgstr "Diffie-Hellman-Parameter"
+
+msgid "Directory for custom client config files"
+msgstr "Verzeichnis für eigene Konfigurationsdateien"
+
+msgid "Disable Paging"
+msgstr "Benutzten Arbeitsspeicher sperren"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Initialisierungsvektor für Verschlüsselung deaktivieren"
+
+msgid "Disable options consistency check"
+msgstr "Konsistenzprüfungen für Optionen durchführen"
+
+msgid "Disable replay protection"
+msgstr "\"Replay\"-Schutz deaktivieren"
+
+msgid "Do not bind to local address and port"
+msgstr "An keine spezielle Adresse binden"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Schnittstellenkonfiguration nicht durchführen"
+
+msgid "Don't add routes automatically"
+msgstr "Netzwerkrouten nicht automatisch einrichten"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "Authentifikationsdaten nicht zwischenspeichern"
+
+msgid "Don't inherit global push options"
+msgstr "Nur teilnehmerspezifische Optionen übertragen"
+
+msgid "Don't log timestamps"
+msgstr "Keine Zeitangaben protokollieren"
+
+msgid "Don't re-read key on restart"
+msgstr "Schlüssel bei Neustarts beibehalten"
+
+msgid "Don't require client certificate"
+msgstr "Verbindung ohne Teilnehmerzertifikat erlauben"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Adaptive LZO-Kompression deaktivieren"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Keine Warnung bei inkonsistenter Schnittstellenkonfiguration"
+
+msgid "Echo parameters to log"
+msgstr "Parameter in Protokolldatei speichern"
+
+msgid "Empirically measure MTU"
+msgstr "MTU regelmäßig testen"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "OpenSSL-Unterstützung für Kryptographie-Hardware benutzen"
+
+msgid "Enable Path MTU discovery"
+msgstr "MTU-Erkennung aktivieren"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Verschlüsselung mittels statischer Schlüssel (kein TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "TLS im Client-Betriebsmodus aktivieren"
+
+msgid "Enable TLS and assume server role"
+msgstr "TLS im Server-Betriebsmodus aktivieren"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Datenpakete bei Bedarf fragmentieren"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Administratorschnittstelle aktivieren"
+
+msgid "Enabled"
+msgstr "Einschalten"
+
+msgid "Encryption cipher for packets"
+msgstr "Verschlüsselungsalgorithmus für Pakete"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Shell-Befehl nach Routen-Einrichtung ausführen"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Programm bei Adressänderung der Gegenstelle aufrufen"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+"Wird bei neuen Client-Verbindungen im Servermodus ausgeführt, wenn dem "
+"Clienten noch nicht vertraut wird"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+"Wird im Servermodus ausgeführt, wann immer eine IPv4-Adresse/Route oder MAC-"
+"Adresse zur internen Routingtabelle von OpenVPN hinzugefügt wird"
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Terminieren nach fehlgeschlagenem Schlüsselaustausch"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "PEM-Passwort von Konsole abfragen"
+
+msgid "HMAC authentication for packets"
+msgstr "HMAC-Authentifizierung für Pakete"
+
+msgid "Handling of authentication failures"
+msgstr "Behandlung von Authentifikationsfehlern"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+"Helfer-Direktive, um den Ausdruck von --ping und --ping-restart in "
+"Servermodus-Konfigurationen zu vereinfachen"
+
+msgid "If hostname resolve fails, retry"
+msgstr "Neuer Verbindungsversuch wenn Namensauflösung fehlschlägt"
+
+msgid "Instance \"%s\""
+msgstr "Instanz \"%s\""
+
+msgid "Invalid"
+msgstr "Ungültig"
+
+msgid "Keep local IP address on restart"
+msgstr "Lokale IP-Adresse bei Neustarts beibehalten"
+
+msgid "Keep remote IP address on restart"
+msgstr "IP-Adresse der Gegenstelle bei Neustarts beibehalten"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "TUN/TAP Schnittelle bei Neustarts offen halten"
+
+msgid "Key transition window"
+msgstr "Maximaler Zeitraum für Schlüsselwechsel"
+
+msgid "Limit repeated log messages"
+msgstr "Wiederholende Protokollmeldungen unterdrücken"
+
+msgid "Local certificate"
+msgstr "Lokales Zertifikat"
+
+msgid "Local host name or ip address"
+msgstr "Lokaler Rechnername oder IP Adresse"
+
+msgid "Local private key"
+msgstr "Lokaler privater Schlüssel"
+
+msgid "Major mode"
+msgstr "Betriebsmodus"
+
+msgid "Make tun device IPv6 capable"
+msgstr "IPv6 auf TUN Schnittstellen aktivieren"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Maximale Anzahl an TCP-Paketen in der Warteschlange"
+
+msgid "Networking"
+msgstr "Netzwerk"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Anzahl der benutzten Broadcast-Puffer"
+
+msgid "Number of lines for log file history"
+msgstr "Anzahl der Zeilen im Protokoll-Zwischenspeicher"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Nur Verbindungen vom angegebenem X.509 Name zulassen"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Ping-Timeouts nur bei vorhandenen Routen auslösen"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN Instanzen"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "TUN-, TAP- und UDP-Schreibvorgänge optimieren"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Ausgaben ins Systemprotokoll umleiten und im Vordergrund ausführen"
+
+msgid "Overview"
+msgstr "Übersicht"
+
+msgid "PKCS#12 file containing keys"
+msgstr "PKCS#12 Schlüsselarchiv"
+
+msgid "Pass environment variables to script"
+msgstr "Umgebungsvariablen für Shell-Befehle"
+
+msgid "Persist replay-protection state"
+msgstr "Persistenter Status für \"Replay\"-Schutz"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Persistenten IP-Adressbereich nutzen"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Ping-Intervall für Gegenstellen"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr "Policy-Ebene über Nutzung von externen Programmen und Skripten"
+
+msgid "Port"
+msgstr "Netzwerkport"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Proxy timeout in seconds"
+msgstr "Maximaler Timeout für Proxy-Verbindungen"
+
+msgid "Push an ifconfig option to remote"
+msgstr "IP-Adresskonfiguration an Teilnehmer übertragen"
+
+msgid "Push options to peer"
+msgstr "Optionen an Teilnehmer übertragen"
+
+msgid "Query management channel for private key"
+msgstr "Privaten Schlüssel über Management-Kanal abfragen"
+
+msgid "Randomly choose remote server"
+msgstr "Entfernten Server zufällig wählen"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Teilnehmer-Verbindung verweigern wenn Teilnehmer-Konfiguration fehlt"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "\"USR1\" Systemsignal umleiten"
+
+msgid "Remote host name or ip address"
+msgstr "Entfernter Rechnername oder IP-Adresse"
+
+msgid "Remote ping timeout"
+msgstr "Ping-Timeout für Gegenstellen"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Schlüssel nach maximale Verkehrsmenge neu aushandeln"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Schlüssel nach maximaler Anzahl von Paketen neu aushandeln"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
+
+msgid "Replay protection sliding window size"
+msgstr "Fenstergröße für \"Replay\"-Schutz"
+
+msgid "Require explicit designation on certificate"
+msgstr "Verwendungszweck von Zertifikaten überprüfen"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
+
+msgid "Restart after remote ping timeout"
+msgstr "Neu Starten nach Ping-Timeout an Gegenstellen"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "TLS Timeout"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Neue Verbindung bei Proxy-Fehlern aufbauen"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Neue Verbindung bei Proxy-Fehlern aufbauen"
+
+msgid "Route subnet to client"
+msgstr "Subnetz an Teilnehmer routen"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Als <em>inetd</em> oder <em>xinetd</em> Server laufen"
+
+msgid "Run script cmd on client connection"
+msgstr "Shell-Kommando bei neuer Teilnehmer-Verbindung ausführen"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Shell-Kommando beim Trennen von Teilnehmer-Verbindungen ausführen"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Shell-Kommandos bei jedem Neustart ausführen"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Teilnehmer über Verbindungstrennung informieren"
+
+msgid "Service"
+msgstr "Dienst"
+
+msgid "Set GID to group"
+msgstr "Dienst mit Benutzergruppe laufen lassen"
+
+msgid "Set TCP/UDP MTU"
+msgstr "MTU für TCP/UDP Protokoll festlegen"
+
+msgid "Set UID to user"
+msgstr "Dienst als Benutzer laufen lassen"
+
+msgid "Set aside a pool of subnets"
+msgstr "IP-Adressbereich für zu vergebende Subnetze"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Erweiterte HTTP-Proxy Einstellungen vornehmen"
+
+msgid "Set output verbosity"
+msgstr "Detailstufe für Protokolle"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Größe für interne Adresstabellen"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Größe des TCP/UDP Empfangs-Puffers"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Größe des TCP/UDP Sende-Puffers"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Größe der Sende-Warteschlange"
+
+msgid "Set tun/tap adapter parameters"
+msgstr "Tun/Tap parameter einstellen"
+
+msgid "Set tun/tap device MTU"
+msgstr "MTU für TUN/TAP Schnittstelle festlegen"
+
+msgid "Set tun/tap device overhead"
+msgstr "Overhead für TUN/TAP Schnittstelle festlegen"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Maximale TCP-MSS erzwingen"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Verbindungsrate von Gegenstellen limitieren"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Shell-Kommando nach Einrichtung von TUN/TAP Schnittstelle ausführen"
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+"Shell-Kommando <em>nach</em> Deaktivierung der TUN/TAP Schnittstelle "
+"ausführen"
+
+msgid "Shell command to verify X509 name"
+msgstr "Shell-Kommando zum Überprüfen das X.509 Namens"
+
+msgid "Silence the output of replay warnings"
+msgstr "\"Replay\"-Warnungen unterdrücken"
+
+msgid "Size of cipher key"
+msgstr "Größe des Schlüssels"
+
+msgid "Specify a default gateway for routes"
+msgstr "Standard-Gateway für Netzwerkrouten"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "OpenVPN im Schlafmodus starten"
+
+msgid "Start/Stop"
+msgstr "Start/Stopp"
+
+msgid "Started"
+msgstr "Gestartet"
+
+msgid "Status file format version"
+msgstr "Format für Status-Datei"
+
+msgid "Switch to advanced configuration »"
+msgstr "Erweiterte Einstellungen"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Benutzter TCP oder UDP Port"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Lokaler TCP oder UDP Port"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "TCP oder UDP Port der Gegenstelle"
+
+msgid "TLS cipher"
+msgstr "TLS Verschlüsselungsalgorithmus"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "\"TOS\" Durchleitung (nur für IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Temporäres Verzeichnis für Teilnehmer-Verbindungen"
+
+msgid "Timeframe for key exchange"
+msgstr "Maximaler Zeitraum für Schlüsselaustausch"
+
+msgid "Type of used device"
+msgstr "Schnittstellentyp"
+
+msgid "Use fast LZO compression"
+msgstr "Schnelle LZO-Kompression benutzen"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Einzeladressen statt /30 Subnetze vergeben"
+
+msgid "Use protocol"
+msgstr "Netzwerkprotokoll"
+
+msgid "Use tun/tap device node"
+msgstr "TUN/TAP Gerätedatei"
+
+msgid "Use username as common name"
+msgstr "Benutzernamen als Common-Name benutzen"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "In Protokolldatei schreiben"
+
+msgid "Write process ID to file"
+msgstr "Prozess-Nummer in Datei schreiben"
+
+msgid "Write status to file every n seconds"
+msgstr "Status-Datei schreiben"
+
+msgid "no"
+msgstr "Nicht gestartet"
+
+msgid "tun/tap device"
+msgstr "TUN/TAP Schnittstelle"
+
+msgid "tun/tap inactivity timeout"
+msgstr "Inaktivitäts-Timeout für TUN/TAP Schnittstellen"
+
+msgid "yes (%i)"
+msgstr "Gestartet (%s)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Zur vereinfachten Konfiguration wechseln"
diff --git a/trunk/package/luci/po/de/p2pblock.po b/trunk/package/luci/po/de/p2pblock.po
new file mode 100644
index 00000000..e3613d65
--- /dev/null
+++ b/trunk/package/luci/po/de/p2pblock.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2011-02-14 17:44+0100\n"
+"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Block Time"
+msgstr "Sperr-Zeitraum"
+
+msgid "Enable P2P-Block"
+msgstr "P2P-Sperr-Mechanismus aktivieren"
+
+msgid "IP-P2P"
+msgstr "IPP2P"
+
+msgid "Layer7-Protocols"
+msgstr "Layer7-Protokolle"
+
+msgid "P2P-Block"
+msgstr "P2P-Sperre"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"P2P-Block ist ein Mechanismus zum vorrübergehendem Sperren von Peer-to-Peer "
+"Protokollen für nicht auf der Whitelist stehende Clients. "
+
+msgid "Portrange"
+msgstr "Überwachter Port-Bereich"
+
+msgid "Whitelisted IPs"
+msgstr "Freigeschaltete IP-Adressen"
+
+msgid "seconds"
+msgstr "Angabe in Sekunden"
diff --git a/trunk/package/luci/po/de/p910nd.po b/trunk/package/luci/po/de/p910nd.po
new file mode 100644
index 00000000..7d1628c1
--- /dev/null
+++ b/trunk/package/luci/po/de/p910nd.po
@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2012-09-12 14:00+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Bidirektionaler Modus"
+
+msgid "Device"
+msgstr "Gerät"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Bevor p910nd verwendet werden kann muessen Pakete fuer USB (kmod-usb-"
+"printer) und Parallelport (kmod-lp) Support installiert werden."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Einstellungen"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "TCP Port"
+
+msgid "enable"
+msgstr "aktivieren"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Printserver"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd hoert auf Port 910+N. Z.B. 9100 fuer ersten Drucker"
diff --git a/trunk/package/luci/po/de/pbx-voicemail.po b/trunk/package/luci/po/de/pbx-voicemail.po
new file mode 100644
index 00000000..224b5a92
--- /dev/null
+++ b/trunk/package/luci/po/de/pbx-voicemail.po
@@ -0,0 +1,141 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-28 22:30+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "E-Mail Adressen die Sprachnachrichten empfangen"
+
+msgid "Enable Voicemail"
+msgstr "Anrufbeantworter aktivieren"
+
+msgid "Global Voicemail Setup"
+msgstr "Allgemeine Einstellungen für Voicemail"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"Es kann ein systemweiter Anrufbeantworter für diese Telefonanlage (<abbr "
+"title=\"Private Branch eXchange\">PBX</abbr>) konfiguriert werden. Da dieses "
+"System für den Einsatz auf embedded Systemen wie Routern optimiert wurde, "
+"gibt es keine Möglichkeit die Sprachnachrichten lokal zu speichern. Sie "
+"müssen per E-Mail versendet werden. Daher muss ein ausgehender Mail-Server "
+"(<abbr title=\"Simple Mail Transfer Protocol\">SMTP</abbr>) konfiguriert "
+"werden. Hier kann zum Beispiel der SMTP-Server des Providers, aber auch ein "
+"Freemailer wie GMail eingetragen werden. Zusätzlich muss noch eine Liste von "
+"Adressen angegeben werden, an die aufgezeichnete Sprachnachrichten geschickt "
+"werden."
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"Damit diese Telefonanlage (<abbr title=\"Private Branch eXchange\">PBX</abbr>) "
+"E-Mails mit Sprachaufnahmen senden kann, muss an dieser Stelle ein SMTP-"
+"Server eingetragen werden. Ihr Internet-Dienstanbieter (<abbr "
+"title=\"Internet Service Provider\">ISP</abbr>) stellt normalerweise einen "
+"SMTP-Server für diesen Zweck zur Verfügung. Sie können auch einen SMTP-"
+"Server eines Drittanbieters, wie z.B. Google oder Yahoo, hier einstellen."
+
+msgid "Last Sent Voicemail Log"
+msgstr "Log der zuletzt gesendeten Voicemails"
+
+msgid "Local Storage Directory"
+msgstr "Lokales Speicherverzeichnis"
+
+msgid "No"
+msgstr "Nein"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Server für ausgehende Mails (SMTP)"
+
+msgid "SMTP Password"
+msgstr "SMTP-Passwort"
+
+msgid "SMTP Port Number"
+msgstr "SMTP-Portnummer"
+
+msgid "SMTP Server Authentication"
+msgstr "SMTP-Server-Anmeldung"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "SMTP-Servername oder IP-Adresse"
+
+msgid "SMTP User Name"
+msgstr "SMTP-Benutzername"
+
+msgid "Secure Connection Using TLS"
+msgstr "Sichere Verbindung über TLS"
+
+msgid "Voicemail Setup"
+msgstr "Voicemail-Einstellungen"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"Wenn Sie Voicemail aktivieren, können Sie E-Mail-Adressen angeben, die "
+"aufgenommene Voicemails erhalten sollen. Sie müssen ebenfalls einen SMTP-"
+"Server unten angeben."
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"Sie können auch Kopien Ihrer Voicemail-Nachrichten auf dem Gerät speichern. "
+"Der hier angegebene Pfad wird erstellt, falls er nicht existiert. Beachten "
+"Sie, dass Geräte wie Router nur begrenzten Speicherplatz haben, und "
+"aktivieren Sie diese Option nur, wenn Sie wissen, was Sie tun."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"Ihr SMTP-Passwort wird zu Ihrem Schutz nicht angezeigt. Es wird nur "
+"geändert, wenn Sie dein Eintrag in diesem Kästchen verändern."
+
+#~ msgid "Directory to save voicemail into"
+#~ msgstr "Verzeichnis für eingehende Sprachnachrichten"
+
+#~ msgid "Enabled"
+#~ msgstr "Aktiviert"
+
+#~ msgid ""
+#~ "Here you can configure a global voicemail for this PBX. Since this system "
+#~ "is intended to run on embedded systems like routers, there is no local "
+#~ "storage of voicemail - it must be sent out by email. Therefore you need "
+#~ "to configure an outgoing mail (SMTP) server (for example the SMTP server "
+#~ "your ISP provides, or GMail), and provide a list of addresses the "
+#~ "voicemail will be sent to."
+#~ msgstr ""
+#~ "Es kann ein systemweiter Anrufbeantworter für diese Telefonanlage (<abbr "
+#~ "title=\"Private Branch eXchange\">PBX</abbr>) konfiguriert werden. Da "
+#~ "dieses System für den Einsatz auf embedded Systemen wie Routern optimiert "
+#~ "wurde, gibt es keine Möglichkeit die Sprachnachrichten lokal zu "
+#~ "speichern. Sie müssen per E-Mail versendet werden. Daher muss ein "
+#~ "ausgehender Mail-Server (<abbr title=\"Simple Mail Transfer Protocol"
+#~ "\">SMTP</abbr>) konfiguriert werden. Hier kann zum Beispiel der SMTP-"
+#~ "Server des Providers, aber auch ein Freemailer wie GMail verwendet "
+#~ "werden. Zusätzlich muss noch eine Liste von Adressen angegeben werden, zu "
+#~ "denen die Sprachnachrichten geschickt werden."
diff --git a/trunk/package/luci/po/de/pbx.po b/trunk/package/luci/po/de/pbx.po
new file mode 100644
index 00000000..3bc4bd42
--- /dev/null
+++ b/trunk/package/luci/po/de/pbx.po
@@ -0,0 +1,699 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-30 18:17+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Available"
+msgstr "Verfügbar"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr "Nur alphanumerische Zeichen, Komma, Punkt und Leerzeichen verwenden"
+
+msgid "Away"
+msgstr "Abwesend"
+
+msgid "Blacklisted Numbers"
+msgstr "Nicht erlaubte Nummern (Blacklist)"
+
+msgid "Call Routing"
+msgstr "Anrufweiterleitung"
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr "Durchwahl Nummern"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Hier können per Copy & Paste größere Nummernlisten eingefügt werden."
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr "Wählt Nummern an, für die es keine andere Übereinstimmung gibt"
+
+msgid "Do Not Disturb"
+msgstr "Beschäftigt"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "Domäne/IP-Adresse/Dynamische Domäne"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Dynamische Liste nicht erlaubter Nummern (Dynamische Blacklist)"
+
+msgid "Email"
+msgstr "E-Mail"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Eingehende Anrufe akzeptieren (registrieren via SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Eingehende Anrufe akzeptieren (Status unten einstellen)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Ausgehende Anrufe aktivieren"
+
+msgid "Enabled"
+msgstr "Aktiv"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"Geben Sie Telefonnummern ein, von denen Anrufe automatisch zurückgewiesen "
+"werden sollen. Sie sollten die Ländervorwahl und alle führenden Nullen "
+"weglassen, aber experimentieren Sie ruhig, damit Sie auch wirklich alle "
+"Nummern blockieren, die blockiert werden sollen."
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"Geben SIe diese IP (oder IP:Port) in der Server-/Registrar-Einstellung der "
+"SIP-Geräte an, die Sie NUR local und niemals von einem entfernten Ort "
+"einsetzen werden."
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"Geben SIe diese IP (oder IP:Port) in der Server-/Registrar-Einstellung der "
+"SIP-Geräte an, die Sie von einem entfernten Ort einsetzen werden (sie "
+"funktionieren auch lokal)."
+
+msgid "External SIP Port"
+msgstr "Externer SIP Port"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+"Hier können Sie für jeden Dienstanbieter, der für eingehende Anrufe "
+"eingerichtet ist, festlegen, welche Nutzer ein Klingelzeichen bei "
+"eingehenden Anrufen erhalten. Ist die Liste leer, klingelt es bei allen "
+"Nutzern, die eingehende Anrufe empfangen dürfen. Ungültige Benutzernamen "
+"werden ohne Fehlermeldung zurückgewiesen. Außerdem überschreibt der Eintrag "
+"eines Benutzernamens an dieser Stelle die evtl. vorhandene Einstellung für "
+"diesen Benutzer, keine eingehenden Anrufe zu erhalten. Auf diese Weise kann "
+"eingestellt werden, dass die Nutzer nur bei bestimmten Dienstanbietern ein "
+"Klingelzeichen erhalten. Einträge in dieser Liste können entweder durch "
+"Leerzeichen getrennt oder als ein Eintrag pro Zeile (Eingabetaste nach jedem "
+"Eintrag) eingegeben werden."
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+"Hier können Sie für jeden Benutzer, der für abgehende Anrufe eingerichtet "
+"ist, festlegen, welche Dienstanbieter verwendet werden dürfen. In der "
+"Voreinstellung dürfen alle Benutzer auch alle Dienstanbieter verwenden. Um "
+"in der Liste unten aufzutauchen, sollte dem Benutzer auf der Seite "
+"\"Benutzerkonten\" erlaubt werden, abgehende Anrufe machen zu dürfen. Geben "
+"Sie VoIP-Dienstanbieter im Format Benutzername@Servername an, wie bereits "
+"oben unter \"Abgehende Anrufe\". Am einfachsten kopieren Sie die "
+"Dienstanbieter von dort und fügen sie hier wieder ein. Ungültige Einträge, "
+"einschließlich nicht für abgehende Anrufe zugelassene Dienstanbieter, werden "
+"ohne Fehlermeldung zurückgewiesen. Einträge in dieser Liste können entweder "
+"durch Leerzeichen getrennt und/oder als ein Eintrag pro Zeile (Eingabetaste "
+"nach jedem Eintrag) eingegeben werden."
+
+msgid "Full Name"
+msgstr "Vollständiger Name"
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Google Accounts"
+msgstr "Google-Konten"
+
+msgid "Google Talk Status"
+msgstr "Status für Google Talk"
+
+msgid "Google Talk Status Message"
+msgstr "Statusbenachrichtigung für Google Talk"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Google Voice/Talk-Konten"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+"Hier müssen Sie wenigstens ein SIP-Konto angeben, welches Sie zur Anmeldung "
+"an diesen Dienst nutzen. Verwenden Sie dieses Konto entweder in einem "
+"Adapter für analoges Telefonieren (ATA) oder einer SIP-Software wie "
+"CSipSimple, Linphone, oder Sipdroid auf Ihrem Smartphone, oder Ekiga, "
+"Linphone, oder X-Lite auf Ihrem Computer. In der Voreinstellung klingeln "
+"alle SIP-Konten gleichzeitig, wenn ein Anruf auf eines Ihrer VoIP-Konten "
+"oder Ihre GV-Nummern gemacht wird."
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+"Wenn EInstellen des Servers/Registrars auf %s oder %s bei Ihnen nicht "
+"funktioniert, versuchen Sie die Einstellung %s oder %s und geben Sie die "
+"Portnummer in ein separates Feld für Server/Registrat-Portnummer ein. "
+"Achtung: Einige Geräte haben eine verwirrende Einstellung, die den Port "
+"setzt, von dem die SIP-Anfragen auf dem Gerät selbst herkommen (der Bindungs-"
+"Port). Der Port auf dieser Seite meint NICHT diesen Bindungs-Port, sondern "
+"den Port, an dem der Dienst lauscht."
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+"Wenn Sie stotternden oder stark verzögerten Ton während großer Downloads "
+"haben, sollten Sie QoS einschalten. QoS priorisiert Verkehr von und zu Ihrem "
+"Netzwerk für bestimmte Ports und IP-Adressen mit dem Ergebnis einer besseren "
+"Tonübertragung in unserem Fall. Wenn unten eingeschaltet, wird eine QoS-"
+"Regel automatisch vom PBX eingerichtet, aber Sie müssen die QoS-"
+"Konfigurationsseite (Netzwerk->QoS) aufrufen, um andere kritische QoS-"
+"Einstellungen wie Upload-und Download-Geschwindigkeit vorzunehmen."
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+"Wenn Sie mehr als ein Konto für abgehende Anrufe haben, sollten Sie eine "
+"Liste von Telefonnummern/Vorwahlen in den folgenden Feldern für jeden "
+"aufgeführten Dienstanbieter eintragen. Ungültige Vorwahlen werden ohne "
+"Fehlermeldung entfernt, nur 0-9, X, Z, N, #, *, und + sind gültige Zeichen. "
+"Der Buchstabe X entspricht 0-9, Z entrpricht 1-9, N entspricht 2-9. Zum "
+"Beispiel können Sie 49 eingeben, um Anrufe nach Deutschland über einen "
+"Dienstanbieter zu tätigen. Für Anrufe nach Nordamerika geben Sie 1NXXNXXXXXX "
+"an. Unterstützt ein Dienstanbieter Ortsgespräche, wie im Gebiet 646 von New "
+"York, geben Sie 646NXXXXXX für diesen Anbieter ein. Ein Konto sollte eine "
+"leere Liste behalten, damit Sie darüber standardmäßig Anrufe tätigen können, "
+"wenn keine der Vorwahlen für die anderen Anbieter übereinstimmt. Das System "
+"ersetzt eine leere Liste automatisch mit dem Eintrag, dass dieser Anbieter "
+"alle Vorwahlen unterstützt, die von den anderen Anbietern nicht unterstützt "
+"werden. Seien Sie so spezifisch wie möglich (1NXXNXXXXXX ist besser als 1). "
+"Bitte beachten Sie, dass alle internationalen Vorwahl-Codes (wie 00, 011, "
+"010, 0011) verworfen werden. Einträge können durch Leezeichen getrennt und/"
+"oder einzeln pro Zeile (Abschließen mit Eingabe-Taste) eingegeben werden."
+
+msgid "Incoming Calls"
+msgstr "Eingehende Anrufe"
+
+msgid "Insert QoS Rules"
+msgstr "QoS-Regeln einfügen"
+
+msgid "Makes Outgoing Calls"
+msgstr "Macht ausgehende Anrufe"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+"ACHTUNG: Es sind keine Konten für Google oder einen SIP-Dienstanbieter "
+"eingerichtet."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+"ACHTUNG: Es sind keine Konten für Google oder einen SIP-Dienstanbieter für "
+"eingehende Anrufe eingerichtet."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+"ACHTUNG: Es sind keine Konten für Google oder einen SIP-Dienstanbieter für "
+"abgehende Anrufe eingerichtet."
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr "ACHTUNG: Es sind keine lokalen Benutzerkonten eingerichtet."
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+"ACHTUNG: Es sind keine lokalen Benutzerkonten für abgehende Anrufe "
+"eingerichtet."
+
+msgid "No"
+msgstr "Nein"
+
+msgid "Number of Seconds to Ring"
+msgstr "Dauer des Klingelns in Sekunden"
+
+msgid "Outbound Proxy"
+msgstr "Proxy für ausgehende Verbindungen"
+
+msgid "Outgoing Calls"
+msgstr "Abgehende Anrufe"
+
+msgid "PBX Main Page"
+msgstr "PBX-Hauptseite"
+
+msgid "PBX Service Status"
+msgstr "PBX-Dienststatus"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr "Port-Einstellung für SIP-Geräte"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "Provider für abgehende Anrufe"
+
+msgid "QoS Settings"
+msgstr "QoS Einstellungen"
+
+msgid "RTP Port Range End"
+msgstr "Ende des RTP-Port-Bereichs"
+
+msgid "RTP Port Range Start"
+msgstr "Anfang des RTP-Port-Bereichs"
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+"RTP-Verkehr überträgt die aktuellen Sprachpakete. Dies ist der Anfang des "
+"Port-Bereichs, der für die Einrichtung der RTP-Verbindung verwendet wird. "
+"Normalerweise kann hier die Voreinstellung belassen werden."
+
+msgid "Receives Incoming Calls"
+msgstr "Empfängt eingehende Anrufe"
+
+msgid "Remote Usage"
+msgstr "Benutzung aus der Ferne"
+
+msgid "Rings users enabled for incoming calls"
+msgstr "Für eingehende Anrufe freigeschaltete Nutzer erhalten Klingelzeichen"
+
+msgid "SIP Accounts"
+msgstr "SIP-Konten"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "SIP-Geräte-/Softphone-Konten"
+
+msgid "SIP Provider Accounts"
+msgstr "SIP-Dienstanbieter-Konten"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "SIP-Bereich (von manchen Dienstanbietern benötigt)"
+
+msgid "SIP Server/Registrar"
+msgstr "SIP-Server/Registrar"
+
+msgid "SIP Server/Registrar Port"
+msgstr "SIP-Server/Registrar Port"
+
+msgid "Server Setting"
+msgstr "Servereinstellung"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "Servereinstellung für lokale SIP-Geräte"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "Servereinstellung für entfernte SIP-Geräte"
+
+msgid "Service Status"
+msgstr "Dienst-Status"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+"Stellen Sie ein (in Sekunden), wie lange es bei den Benutzern klingeln soll, "
+"bevor aufgelegt oder zur Voicemail (falls installiert und aktiv) "
+"übergegangen wird.  "
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr "Mit Leerzeichen unterteilte Liste gesperrter Nummern"
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+"Geben Sie die Nummern hier einzeln an. Drücken Sie Eingabe, um weitere "
+"Nummern hinzuzufügen."
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+"Die oben angegebene(n) Nummer(n) können für ausgehende Anrufe mit den "
+"Dienstanbietern dieses Nutzers verwendet werden. Ungültige Benutzernamen, "
+"einschließlich Nutzer, die nicht für ausgehende Anrufe freigeschaltet sind, "
+"werden ohne Fehlermeldung verworfen. Bitte überprüfen Sie deshalb, ob der "
+"Eintrag akzeptiert wurde."
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+"Diese Konfigurationsseite erlaubt Ihnen die Einrichtung eines "
+"Telefonsystemdienstes (PBX), der Anrufe über mehrere Google- und SIP-Konten "
+"(wie Sipgate, SipSorcery und Betamax) erlaubt. Sie können diese Konten für "
+"viele SIP-Geräte verwenden. Beachten Sie, dass Google-, SIP- und lokale "
+"Benutzer-Konten in den Abschnitten \"Google-Konten\", \"SIP-Konten\" und "
+"\"Benutzerkonten\" eingerichtet werden. Sie müssen mindestens ein "
+"Benutzerkonto für diesen PBX vorsehen und dann ein SIP-Gerät oder Softphone "
+"für die Benutzung dieses Kontos einrichten, damit Sie Anrufe mit Ihren "
+"Google-/SIP-Konten tätigen oder empfangen können. Wenn Sie mehr als ein "
+"Google- / SIP-Konto eingerichtet haben, sollten Sie auf der Seite "
+"\"Anrufweiterleitung\" einrichten, wie diese Anrufe behandelt werden. Wenn "
+"Sie Ihr PBX von irgendwo auf der Welt nutzen wollen, schauen Sie auf den "
+"Abschnitt \"Benutzung aus der Ferne\" auf der Seite \"Erweiterte "
+"Einstellungen\". "
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+"Dies ist der Name, den der VoIP-Server verwenden wird, um sich selbst bei "
+"der Registrierung beim VoIP-Dienstanbieter zu  identifizieren. Einige "
+"Anbieter verlangen, dass dies ein spezieller Begriff ist, der einem Hardware-"
+"SIP-Gerät entspricht."
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+"Hier geben Sie an, welche Google-/SIP-Konten für welche Ländervorwahlen "
+"benutzt werden sollen, welche Nutzer welche Konten verwenden dürfen, wie "
+"Anrufe weitergeleitet werden, welche Nummern mit Password in diesen PBX "
+"kommen, und welche Nummern ausgeschlossen werden."
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+"Hier stellen Sie Ihre Google (Talk und Voice) Konten ein, um sie für "
+"abgehende und ankommende Anrufe nutzen zu können (Voice Chat und Telefon-"
+"Anrufe). Bitte tätigen Sie wenigstens einen Sprach-Anruf mit dem Google-Talk-"
+"Plugin, das über das GMail-Interface zu installieren ist, und melden Sie "
+"sich dann überall aus Ihrem Konto ab. Klicken Sie auf \"Hinzufügen\" um so "
+"viele Konten hinzuzufügen, wie Sie wollen."
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+"Hier stellen Sie Ihre SIP (VoIP) Konten, wie Sipgate, SipSorcery, die "
+"populären Betamax-Anbieter, und alle anderen Anbieter mit SIP-Einstellungen "
+"ein, um sie für abgehende und ankommende Anrufe nutzen zu können (SIP uri "
+"und Telefon-Anrufe). Klicken Sie auf \"Hinzufügen\" um so viele Konten "
+"hinzuzufügen, wie Sie wollen."
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+"Diese Option sollte auf \"Ja\" gesetzt werden, wenn Sie eine DID (reale "
+"Telefonnummer) haben, die mit diesem SIP-Konto verknüpft ist, oder wenn Sie "
+"SIP-Anrufe über diesen Anbieter empfangen wollen."
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+"Dieser Abschnitt enthält Einstellungen, die unter normalen Umständen nicht "
+"geändert werden müssen. Zusätzlich konnen Sie hier Ihr System für die "
+"Verwendung mit entfernten SIP-Geräten einrichten und Probleme bei der "
+"Tonqualität beheben, indem Sie die Festlegung von QoS-Regeln aktivieren."
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+"Verwenden Sie eine vier- bis fünfstellige Nummer als Benutzernamen, wenn Sie "
+"normale Telefone mit ATA an dieses System anschließen (damit diese Namen "
+"über deren Zifferntastatur eingegeben werden können)."
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+"Dieses Konto für abgehende Anrufe verwenden, wie im Abschnitt "
+"\"Anrufweiterleitung\" eingestellt."
+
+msgid "Use this account to make outgoing calls."
+msgstr "Dieses Konto für abgehende Anrufe verwenden."
+
+msgid "User Accounts"
+msgstr "Benutzerkonten"
+
+msgid "User Agent String"
+msgstr "Benutzeridentifikation (User Agent)"
+
+msgid "User Name"
+msgstr "Benutzername"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr "Verwendet für abgehende Anrufe eingerichtete Dienstanbieter"
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+"Wenn jemand einen Voice-Chat mit Ihrem GTalk-Konto oder die GVoice-Nummer "
+"(falls Sie Google Voice haben) anruft, wird der Anruf an jeden Benutzer "
+"weiter geleitet, der Online ist (mit SIP-Gerät oder Softphone) und den Anruf "
+"empfangen darf. Wenn Sie Google Voice haben, müssen Sie in Ihre GVoice-"
+"Einstellungen gehen und Anrufe zu Google Chat weiter leiten, damit Sie "
+"Anrufe auf Ihre GVoice-Nummer empfangen können. Bei Problemen mit dem "
+"Empfang von Anrufen über GVoice, experimentieren Sie mit der Option "
+"\"Anrufprüfung\" in den GVoice-Einstellungen. Stellen Sie schließlich "
+"sicher, dass kein anderer Client mit diesem Konto Online ist (z.B. Browser "
+"in GMail, Google Talk App mobil oder auf PC), denn das könnte Einfluss haben."
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+"Wenn Ihr Passwort gespeichert wird, verschwindet es aus diesem Feld und wird "
+"zu Ihrem Schutz nicht angezeigt. Ein vorher gespeichertes Passwort wird nur "
+"geändert, wenn Sie ein geändertes Passwort eingeben."
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+"Sie können hier einen Klarnamen angeben, der als Name des Anrufers erscheint."
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+"Sie können Ihre SIP-Geräte/Softphones mit diesem System auch von einem "
+"entfernten Ort aus benutzen, so lange Ihnen Ihr Internet-Dienstanbieter eine "
+"öffentliche IP-Adresse zuweist. Sie können andere lokale Benutzer kostenlos "
+"anrufen (z.B. andere Analog-Telefon-Adapter (ATA)) und Ihre VoIP-Anbieter "
+"für Anrufe verwenden, als ob Sie am lokalen PBX angeschlossen wären. Nach "
+"der Einrichtung dieses Tabs gehen Sie zu den Benutzereinstellungen zurück "
+"und schauen Sie nach den neuen Einstellungen für Server und Port, die Sie an "
+"den entfernten SIP-Geräten vornehmen müssen. Bitte beachten Sie, dass Sie "
+"NAT/Portweiterleitung auf dem Router/Gateway einrichten müssen, falls dieser "
+"PBX nicht auf Ihrem Router/Gateway läuft. Bitte leiten Sie die unten "
+"angegebenen Ports (SIP-Port und RTP-Bereich) auf die IP-Adresse dieses PBX "
+"weiter."
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+"Ihre PIN verschwindet beim Speichern aus diesem Feld und wird zu Ihrem "
+"Schutz nicht angezeigt. Eine vorher gespeicherte PIN wird nur geändert, wenn "
+"Sie eine geänderte PIN eingeben. Sie können die PIN leer lassen, aber denken "
+"Sie an die Konsequenzen für die Sicherheit."
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+"Ihr Passwort verschwindet beim Speichern und wird zu Ihrem Schutz nicht "
+"angezeigt. Es wird nur geändert, wenn Sie ein anderes Passwort eingeben."
+
+#~ msgid ""
+#~ "Designate numbers that are allowed to call through this system and which "
+#~ "user's privileges it will have."
+#~ msgstr ""
+#~ "Nummern auswählen, die durch dieses System anrufen können, und deren "
+#~ "Benutzerrechte einstellen"
+
+#~ msgid ""
+#~ "Pick a random port number between 6500 and 9500 for the service to listen "
+#~ "on. Do not pick the standard 5060, because it is often subject to brute-"
+#~ "force attacks. When finished, (1) click \"Save and Apply\", and (2) click "
+#~ "the \"Restart VoIP Service\" button above. Finally, (3) look in the \"SIP "
+#~ "Device/Softphone Accounts\" section for updated Server and Port settings "
+#~ "for your SIP Devices/Softphones."
+#~ msgstr ""
+#~ "Wählen Sie eine zufällige Portnummer zwischen 6500 und 9000 für den Dienst "
+#~ "aus. Nehmen Sie nicht die standardmäßige 5060, weil sie oft attackiert wird. "
+#~ "Wenn fertig (1) klicken Sie auf \"Speichern und Anwenden\" und (2) auf \"VoIP-"
+#~ "Dienst neu starten\" oben. Schließlich (3) sehen Sie im Abschnitt \"SIP-Geräte"
+#~ "/Softphone-Konten\" nach aktualisierten Einstellungen für Ihre SIP-"
+#~ "Geräte/Softphones."
+
+#~ msgid ""
+#~ "You can enter your domain name, external IP address, or dynamic domain "
+#~ "name here Please keep in mind that if your IP address is dynamic and it "
+#~ "changes your configuration will become invalid. Hence, it's recommended "
+#~ "to set up Dynamic DNS in this case."
+#~ msgstr ""
+#~ "Sie können Ihren Domänennamen, externe IP-Adresse, oder dynamischen "
+#~ "Domänennamen hier angeben.Bitte beachten Sie, dass Ihre Konfiguration "
+#~ "ungältig wird, wenn Sie eine dynamische IP-Adresse besitzen und sich diese "
+#~ "ändert. Für diesen Fall wird deshalb die Einrichtung von dnamischem DNS "
+#~ "empfohlen."
+
+#~ msgid "Account Status"
+#~ msgstr "Konto-Status"
+
+#~ msgid "Account Status Message"
+#~ msgstr "Konto-Status Meldung"
+
+#~ msgid "Domain Name/Dynamic Domain Name"
+#~ msgstr "DNS Name (auch dynamisch möglich)"
diff --git a/trunk/package/luci/po/de/polipo.po b/trunk/package/luci/po/de/polipo.po
new file mode 100644
index 00000000..50f7819e
--- /dev/null
+++ b/trunk/package/luci/po/de/polipo.po
@@ -0,0 +1,272 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2013-01-29 20:21+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Allowed clients"
+msgstr "Zugelassene Clients"
+
+msgid "Always use system DNS resolver"
+msgstr "Immer DNS-Auflösung des Systems benutzen"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"HTTP-Basis-Anmeldung wird unterstützt. Geben Sie Benutzernamen und Passwort "
+"im Format benutzername:passwort an."
+
+msgid "Configuration"
+msgstr "Konfiguration"
+
+msgid "DNS and Query Settings"
+msgstr "Einstellungen für DNS und Abfragen"
+
+msgid "DNS server address"
+msgstr "Adresse des DNS-Servers"
+
+msgid "Delete cache files time"
+msgstr "Zeit zur Lösching der Cache-Dateien"
+
+msgid "Disk cache location"
+msgstr "Cache-Verzeichnis"
+
+msgid "Do not query IPv6"
+msgstr "IPv6 nicht abfragen"
+
+# Klingt komisch
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Aktivieren, falls Cache (Proxy) von mehreren Benutzern verwendet wird."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Größe des ersten PMM - Segment in bytes"
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Wie viel Arbeitsspeicher soll Polipo für den Cache verwenden."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Größe des Caches im Arbeitsspeicher (Bytes)"
+
+msgid "Listen address"
+msgstr "Aktive Adresse"
+
+msgid "Listen port"
+msgstr "Aktiver Port"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Speicherort für permanent gespeicherte Dateien. Es wird die Benutzung von "
+"externen Datenträgern empfohlen, da der Cache sehr groß werden kann. Lassen "
+"Sie diese Option leer um den Cache zu deaktivieren."
+
+msgid "Log file location"
+msgstr "Ort der Log-Datei"
+
+msgid "Log to syslog"
+msgstr "Ereignisse im Systemprotokoll (syslog) speichern"
+
+msgid "Logging and RAM"
+msgstr "Protokollierung und Speicher"
+
+msgid "Never use system DNS resolver"
+msgstr "DNS-Auflösung des Systems niemals verwenden"
+
+msgid "On-Disk Cache"
+msgstr "Festplatten-Cache"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Größe des normalen PMM - Segment in bytes"
+
+msgid "Parent Proxy"
+msgstr "Übergeordneter Proxy"
+
+msgid "Parent proxy address"
+msgstr "Adresse des übergeordneten Proxy-Servers"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Adresse des Übergeordneten Proxyservers (im Format host:port), an den Polipo "
+"die Anfragen weiterleiten soll."
+
+msgid "Parent proxy authentication"
+msgstr "Authentifizierung für übergeordneten Proxyserver"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Polipo-Status"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo ist ein kleiner und schneller Webproxy."
+
+msgid "Poor Man's Multiplexing"
+msgstr "<abbr title=\"Poor Mans Multiplexing\">PMM</abbr>"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Poor Man's Multiplexing (PMM) ist eine Technik, welche Multiplexing "
+"simuliert, indem eine Instanz in mehreren Teilen angefordert wird. Damit "
+"wird versucht, die durch Schwächen im HTTP-Protokoll verursachten Latenzen "
+"auszugleichen. ACHTUNG: Einige Webseiten könnten bei aktivem PMM nicht "
+"funktionieren."
+
+msgid "Port on which Polipo will listen"
+msgstr "Port, an dem Polipo lauscht"
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr "DNS-Abfrage über Hostname"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr "direkte DNS-Abfrage, Rückgriff auf System-Auflösung"
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+"direkte DNS-Abfrage, Rückgriff auf System-Auflösung für unbekannte Hosts"
+
+msgid "Query DNS for IPv6"
+msgstr "DNS-Abfrage für IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "DNS-Abfrage für IPv4 und IPv6, bevorzuge IPv4"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "DNS-Abfrage für IPv4 und IPv6, bevorzuge IPv6"
+
+msgid "Query only IPv6"
+msgstr "Nur IPv6 abfragen"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Geben Sie einen DNS-Server an, wenn Polipo diesen Server statt des "
+"systemeigenen DNS-Servers verwenden soll."
+
+# Verteilt? Gemeinsam?
+msgid "Shared cache"
+msgstr "Gemeinsamer Cache"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Größe des ersten Segments. Wenn diese Option leer ist, wird hierfür die "
+"Doppelte Größe des PMM-Segments angenommen"
+
+msgid "Size to which cached files should be truncated"
+msgstr "Größe, auf die zwischengespeicherte Dateien beschnitten werden sollen"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Syslog facility"
+msgstr "System-Protokollierungsfunktion"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"Aktive Schnittstelle für Polipo. Um Polipo auf allen Schnittstellen zu "
+"aktivieren, bitte 0.0.0.0 bzw. :: (IPv6) angeben."
+
+msgid "Time after which cached files will be deleted"
+msgstr "Zeit, nach der zwischengespeicherte Dateien gelöscht werden"
+
+msgid "Time after which cached files will be truncated"
+msgstr "Zeit, nach der zwischengespeicherte Dateien beschnitten werden"
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr "Um PMM zu aktivieren muss hier ein Wert eingetragen werden"
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Zwischengespeicherte Dateien auf (Bytes) beschneiden"
+
+msgid "Truncate cache files time"
+msgstr "Zwischengespeicherte Dateien nach (Zeit) beschneiden"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Es sollte ein externes Speichermedium verwendet werden, da häufig in die "
+"Protokolldatei geschrieben wird; sie kann dadurch sehr groß werden."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+"Ist die aktive Adresse auf 0.0.0.0 oder or :: (IPv6) gesetzt, müssen "
+"Clients, die sich verbinden dürfen, angegeben werden. Das Format ist "
+"entweder IP- oder Netzwerk-Adresse (192.168.1.123, 192.168.1.0/24, "
+"2001:660:116::/48 (IPv6))"
+
+msgid "enable"
+msgstr "aktivieren"
+
+#, fuzzy
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Speicherort für permanent gespeicherte Dateien. Es wird die Benutzung von "
+#~ "externen Datenträgern empfohlen, da der Cache sehr groß werden kann. "
+#~ "Lassen Sie diese Option leer um den Cache zu deaktivieren."
+
+#~ msgid "General"
+#~ msgstr "Allgemein"
+
+#, fuzzy
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Wenn der Server auf alle Anfragen (0.0.0.0 bzw. ::) hört, dann müssen die "
+#~ "zugelassenen Gegenpunkte, die berechtig sind eine Verbindung aufzubauen, "
+#~ "hier eingetragen werden. Als Format hier bitte die IP-Adresse oder "
+#~ "Nerzwerkmaske auswählen (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 "
+#~ "(IPv6))"
+
+#, fuzzy
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Beachtet IPv6 nicht, nur IPv4 möglich; reluctantly = Beachtet "
+#~ "sowohl IPv4 als auch IPv6, IPv4 wird bevorzugt; happily = Beachtet sowohl "
+#~ "IPv4 als auch IPv6, IPv6 wird bevorzugt; true = Beachtet IPv4 nicht, nur "
+#~ "IPv6 möglich"
+
+#, fuzzy
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr ""
+#~ "Beschreibt, welcher Port von Polipo genutzt werden soll. "
+#~ "Grundeinstellung: Port 8123"
diff --git a/trunk/package/luci/po/de/qos.po b/trunk/package/luci/po/de/qos.po
new file mode 100644
index 00000000..6ba5701f
--- /dev/null
+++ b/trunk/package/luci/po/de/qos.po
@@ -0,0 +1,122 @@
+#  qos.po
+#  generated from ./applications/luci-qos/luasrc/i18n/qos.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2013-01-28 22:18+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Overheadberechnung"
+
+msgid "Classification Rules"
+msgstr "Klassifizierungsregeln"
+
+msgid "Classification group"
+msgstr "Klassifizierungsgruppe"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Zieladresse"
+
+msgid "Download speed (kbit/s)"
+msgstr "Downloadgeschwindigkeit (kbit/s)"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Half-duplex"
+msgstr "Halb-Duplex"
+
+msgid "Interfaces"
+msgstr "Schnittstellen"
+
+msgid "Number of bytes"
+msgstr "Byteanzahl"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Quality of Service"
+
+msgid "Service"
+msgstr "Dienst"
+
+msgid "Source host"
+msgstr "Quelladresse"
+
+msgid "Target"
+msgstr "Zieladresse"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Uploadgeschwindigkeit (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Mit Hilfe von <abbr title=\"Quality of Service\">QoS</abbr> kann "
+"Netzwerkverkehr anhand von Adressen, Ports oder Diensten priorisiert werden."
+
+msgid "all"
+msgstr "alle"
+
+msgid "default"
+msgstr "Standardeinstellung"
+
+msgid "express"
+msgstr "express"
+
+msgid "low"
+msgstr "niedrig"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "Priorität"
+
+#~ msgid "Downlink"
+#~ msgstr "Downlink"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Internetverbindung"
+
+#~ msgid "Uplink"
+#~ msgstr "Uplink"
+
+#~ msgid "allf"
+#~ msgstr "alle f"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "Bytes gesendet"
+
+#~ msgid "Prioritization"
+#~ msgstr "Priorisierung"
+
+#~ msgid "source network / source host"
+#~ msgstr "Quellnetz / Quellhost"
+
+#~ msgid "target network / target host"
+#~ msgstr "Zielnetz / Zielhost"
+
+#~ msgid "portrange"
+#~ msgstr "Portbereich"
diff --git a/trunk/package/luci/po/de/radvd.po b/trunk/package/luci/po/de/radvd.po
new file mode 100644
index 00000000..4afdbb0c
--- /dev/null
+++ b/trunk/package/luci/po/de/radvd.po
@@ -0,0 +1,483 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-15 16:46+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "6to4 interface"
+msgstr "6to4-Schnittstelle"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Addresses"
+msgstr "Adressen"
+
+msgid "Advanced"
+msgstr "Erweitert"
+
+msgid "Advertise Home Agent flag"
+msgstr "Home-Agent Funktionalität ankündigen"
+
+msgid "Advertise router address"
+msgstr "Router-Adresse ankündigen"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Angekündigte Domain-Suffixes"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Angekündigte rekursive IPv6 DNS Server. Wenn leer wird die aktuelle IPv6-"
+"Adresse der Schnittstelle verwendet"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Angekündigte IPv6-Prefixe"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Angekündigte IPv6-Subnetze in CIDR-Notation. Wenn leer wird das aktuelle "
+"IPv6-Prefix der Schnittstelle verwendet"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Kündigt \"Mobile IPv6 Home Agent\"-Fähigkeit an (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "Kündigt \"Mobile Router Registration\"-Fähigkeit an (NEMO Basic)"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Kündigt die angenommene Erreichbarkeit von Nachbarn als Zeitspanne in "
+"Millisekunden an, sofern gegeben. Der Wert \"0\" deaktiviert "
+"Erreichbarkeitsankündigungen"
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Kündigt den Standard Hop-Count-Wert für ausgehende Unicast-Pakete an. Der "
+"Wert \"0\" deaktiviert Hop-Count-Ankündigungen"
+
+msgid "Advertises the default router preference"
+msgstr "Kündigt das Vorhandensein des Default-Routers an"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+"Kündigt die gegebene Verbindungs-MTU an wenn gegeben. Der Wert \"0\" "
+"deaktiviert MTU-Ankündigungen"
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+"Kündigt den Zeitraum an, in dem die vom angekündigtem Prefix generierte "
+"Adresse bevorzugt bleibt, als Zeitspanne in Sekunden."
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+"Kündigt den Zeitraum in Sekunden an, in dem der Prefix für On-Link-"
+"Ermittlung gültig ist."
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+"Kündigt die Gültigskeitsdauer des Defaultrouters in Sekunden an. Der Wert \"0"
+"\" impliziert dass dieser Knoten kein Default-Router ist"
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+"Kündigt die Zeitspanne in Sekunden an, in der der Router \"Mobile IPv6 Home "
+"Agent\"-Dienste anbietet"
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+"Kündigt die vorgegebene Wartezeit zwischen wiederholt versendeten Neighbor-"
+"Solicitation-Nachrichten als Zeitspanne in Millisekunden an, wenn gegeben. "
+"Der Wert \"0\" deaktiviert die Ankündigung der Wartezeit"
+
+msgid "Advertising"
+msgstr "Ankündigend"
+
+msgid "Autonomous"
+msgstr "Autonom"
+
+msgid "Clients"
+msgstr "Clienten"
+
+msgid "Configuration flag"
+msgstr "Konfigurations-Bit"
+
+msgid "Current hop limit"
+msgstr "Aktuelles Hop-Limit"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "DNSSL-Konfiguration"
+
+msgid "Default lifetime"
+msgstr "Standard-Gültigkeitszeitraum"
+
+msgid "Default preference"
+msgstr "Standard-Priorität"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Enable advertisements"
+msgstr "Ankündigungen aktivieren"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Aktiviert Router-Ankündigungen und Solicitations"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+"Aktiviert das zusätzliche \"Stateful Administered Autoconfiguration Protocol"
+"\" (RFC2462)"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+"Aktiviert die Auto-Konfiguration von zusätzlichen, Nicht-Adress-"
+"Eigenschaften (RFC2462)"
+
+msgid "General"
+msgstr "Allgemein"
+
+msgid "Home Agent information"
+msgstr "Home-Agent-Information"
+
+msgid "Home Agent lifetime"
+msgstr "Home-Agent-Gültigkeitsdauer"
+
+msgid "Home Agent preference"
+msgstr "Home-Agent-Priorität"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "Home-Agent-Informationen in die RA-Nachricht einfügen"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr "Mobile-IPv6-Ankündigungsintervall in die RA-Nachricht einfügen"
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+"Link-Layer-Adresse der ausgehenden Schnittstelle in die RA-Nachricht einfügen"
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+"Zeigt an, dass die Adresse der Schnittstelle statt einem Netzwerk-Prefix "
+"gesendet wird - benötigt für Mobile IPv6"
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+"Zeigt an, dass die zugrundeliegende Verbindung keinen Broadcast-Verkehr "
+"beherrscht, verhindert das Senden unaufgeforderter Ankündigungsnachrichten"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+"Zeigt an, dass das angekündigte Prefix für autonome Adress-Konfiguration "
+"genutzt werden kann (RFC4862)"
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+"Zeigt an, dass das Prefix für On-Link-Ermittlungen genutzt werden kann "
+"(RFC4861)"
+
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgid "Interface Configuration"
+msgstr "Schnittstellenkonfiguration"
+
+msgid "Interface required"
+msgstr "Schnittstelle benötigt"
+
+msgid "Interfaces"
+msgstr "Schnittstellen"
+
+msgid "Lifetime"
+msgstr "Gültigkeitsdauer"
+
+msgid "Link MTU"
+msgstr "Verbindungs-MTU"
+
+msgid "Managed flag"
+msgstr "Managed-Bit"
+
+msgid "Max. interval"
+msgstr "Max. Intervall"
+
+msgid "Maximum advertisement interval"
+msgstr "Maximales Ankündigungsintervall"
+
+msgid "Minimum advertisement delay"
+msgstr "Minimale Ankündigungsverzögerung"
+
+msgid "Minimum advertisement interval"
+msgstr "Minimales Ankündigungsintervall"
+
+msgid "Mobile IPv6"
+msgstr "Mobile IPv6"
+
+msgid "Mobile IPv6 interval option"
+msgstr "Mobile-IPv6-Intervall-Option"
+
+msgid "Mobile IPv6 router registration"
+msgstr "Mobile-IPv6-Router-Registrierung"
+
+msgid "Multicast"
+msgstr "Multicast"
+
+msgid "On-link"
+msgstr "On-Link"
+
+msgid "On-link determination"
+msgstr "On-Link-Ermittlung"
+
+msgid "Preference"
+msgstr "Priorität"
+
+msgid "Preferred lifetime"
+msgstr "Bevorzugte Gültigkeitsdauer"
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Prefix Configuration"
+msgstr "Prefix-Konfiguration"
+
+msgid "Prefixes"
+msgstr "Prefixes"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "RDNSS-Konfiguration"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Schnittstelle %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Prefix"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Route"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"Radvd ist ein Router-Advertisement-Dienst für IPv6. Er hört auf Router-"
+"Solicitations und sendet Ankündigungen wie in RFC 4861 spezifiziert."
+
+msgid "Reachable time"
+msgstr "Erreichbarkeitsdauer"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"Kommunikation auf angegebene Clients beschränken, leer lassen um Multicast "
+"zu nutzen"
+
+msgid "Retransmit timer"
+msgstr "Taktung von Neu-Übertragungen"
+
+msgid "Route Configuration"
+msgstr "Routen-Konfiguration"
+
+msgid "Routes"
+msgstr "Routen"
+
+msgid "Source link-layer address"
+msgstr "Quell-Link-Layer-Adresse"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+"Spezifiziert eine Schnittstelle, von welcher das 6to4-Prefix abgeleitet "
+"wird. Die öffentliche IPv4-Adresse der Schnittstelle wird dazu mit dem "
+"Subnetz 2002::/3 und dem Wert der Prefix-Option kombiniert"
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr "Bestimmt die Gültigkeitsdauer dieser Route."
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr "Bestimmt die Schnittstelle, zu welcher diese Sektion gehört"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+"Bestimmt die maximale Dauer, für welche die DNSSL-Einträge gültig zur "
+"Namensauflösung sind."
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+"Bestimmt die maximale Dauer, für welche die RDNSS-Einträge gültig zur "
+"Namensauflösung sind."
+
+msgid "Specifies the preference associated with the default router"
+msgstr "Bestimmt die mit diesem Router assoziierte Priorität"
+
+msgid "Suffix"
+msgstr "Suffix"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Die maximal erlaubte Wartezeit zwischen dem Versand aufeinanderfolgender, "
+"unaufgeforderter Mutlicast-Router-Ankündigungen auf dieser Schnittstelle als "
+"Zeitspanne in Sekunden"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+"Die minimal erlaubte Wartezeit zwischen dem Versand aufeinanderfolgender "
+"Router-Ankündigungen auf dieser Schnittstelle als Zeitspanne in Sekunden"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Die minimal erlaubte Wartezeit zwischen dem Versand aufeinanderfolgender, "
+"unaufgeforderter Mutlicast-Router-Ankündigungen auf dieser Schnittstelle als "
+"Zeitspanne in Sekunden"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr "Die Priorität des ankündigendem \"IPv6 Home Agent\""
+
+msgid "Timing"
+msgstr "Taktung"
+
+msgid "Unicast only"
+msgstr "Nur Unicast"
+
+msgid "Valid lifetime"
+msgstr "Gültigkeitsdauer"
+
+msgid "Validity time"
+msgstr "Gültigkeitsdauer"
+
+msgid "default"
+msgstr "Standard"
+
+msgid "high"
+msgstr "hoch"
+
+msgid "low"
+msgstr "niedrig"
+
+msgid "medium"
+msgstr "mittel"
+
+msgid "no"
+msgstr "nein"
+
+msgid "yes"
+msgstr "ja"
+
+#~ msgid "Advertised IPv6 prefix"
+#~ msgstr "Angekündigtes IPv6-Prefix"
+
+#~ msgid ""
+#~ "Advertised IPv6 prefix. If empty, the current interface prefix is used"
+#~ msgstr ""
+#~ "Angekündigtes IPv6-Subnetz in CIDR-Notation. Wenn leer wird das aktuelle "
+#~ "IPv6-Prefix der Schnittstelle verwendet"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that addresses generated from "
+#~ "the prefix via stateless address autoconfiguration remain preferred. Use "
+#~ "0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Kündigt den Zeitraum an, in dem die vom angekündigtem Prefix generierte "
+#~ "Adresse bevorzugt bleibt, als Zeitspanne in Sekunden. Der Wert \"0\" "
+#~ "spezifiziert eine unbegrenzte Gültigkeitsspanne"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that the prefix is valid for the "
+#~ "purpose of on-link determination. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Kündigt den Zeitraum in Sekunden an, in dem der Prefix für On-Link-"
+#~ "Ermittlung gültig ist. Der Wert \"0\" spezifiziert eine unbegrenzte "
+#~ "Gültigkeitsspanne"
+
+#~ msgid ""
+#~ "Indicates whether that RDNSS continues to be available to hosts even if "
+#~ "they moved to a different subnet"
+#~ msgstr ""
+#~ "Zeigt an, ob dieser rekursive DNS Server von anderen Subnetzen aus "
+#~ "verfügbar bleibt"
+
+#~ msgid "Open"
+#~ msgstr "Offen"
+
+#~ msgid ""
+#~ "Specifies the lifetime associated with the route in seconds. Use 0 to "
+#~ "specify an infinite lifetime"
+#~ msgstr ""
+#~ "Bestimmt die Gültigkeitsdauer dieser Route. Der Wert \"0\" spezifiziert "
+#~ "einen unbegrenzten Zeitraum"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the DNSSL entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Bestimmt die maximale Dauer, für welche die DNSSL-Einträge gültig zur "
+#~ "Namensauflösung sind. Der Wert \"0\" spezifiziert einen unbegrenzten "
+#~ "Zeitraum"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the RDNSS entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Bestimmt die maximale Dauer, für welche die RDNSS-Einträge gültig zur "
+#~ "Namensauflösung sind. Der Wert \"0\" spezifiziert einen unbegrenzten "
+#~ "Zeitraum"
diff --git a/trunk/package/luci/po/de/rrdtool.po b/trunk/package/luci/po/de/rrdtool.po
new file mode 100644
index 00000000..390fd2e6
--- /dev/null
+++ b/trunk/package/luci/po/de/rrdtool.po
@@ -0,0 +1,357 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2009-05-19 00:33+0200\n"
+"Last-Translator: Stefan Keks <i18n@freifunk-bno.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Drahtlos - Signal-Noise-Verhältnis"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Noise-Level"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Signalstärke"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Drahtlos - Signalqualität"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Signalqualität"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: ICMP Antwortzeiten"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Firewall - Verarbeitete Pakete"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pakete/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Kette \"%di\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - Transfer auf %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bytes (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - Pakete auf %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Pakete/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Verarbeitet (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Verworfen   (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Fehler      (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - Multicast auf %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pakete/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Pakete"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - Kollisionen auf %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Kollisionen/s"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Kollisionen"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Fehler auf %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Fehler/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Prozesse"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Prozesse/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Prozess %pi - Verbrauchte CPU Zeit"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "System"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "User"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Prozess %pi - Threads und Prozesse"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Anzahl"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Prozess %pi - Speicherzugriffsfehler"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Zugriffsfehler"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "Zugriffsfehler"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Process %pi - Virtueller Speicher"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "virtueller Speicher"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Auslastung auf Prozessor #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Transfer auf %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Pakete auf %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pakete/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: TCP-Verbindungen auf Port %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Verbindungen/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Speicherverbrauch auf %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "verfügbar"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "belegt   "
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Interrupts"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Aufrufe/s"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Systemlast"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Last"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 Minute"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 Minuten"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 Minuten"
diff --git a/trunk/package/luci/po/de/samba.po b/trunk/package/luci/po/de/samba.po
new file mode 100644
index 00000000..a5ceb056
--- /dev/null
+++ b/trunk/package/luci/po/de/samba.po
@@ -0,0 +1,87 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2011-10-18 13:13+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Gastzugang"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Systembenutzer dürfen ihre Heimatverzeichnis über Netzwerkfreigaben "
+"erreichen."
+
+msgid "Allowed users"
+msgstr "Legitimierte Benutzer"
+
+msgid "Create mask"
+msgstr "Berechtigungsmaske für neue Dateien"
+
+msgid "Description"
+msgstr "Beschreibung"
+
+msgid "Directory mask"
+msgstr "Verzeichnismaske"
+
+msgid "Edit Template"
+msgstr "Template bearbeiten"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Hier kann das Template bearbeitet werden, das zur Erstellung der Samba-"
+"Konfigurationsdateien verwendet wird."
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Mask for new directories"
+msgstr "Maske für neue Verzeichnisse"
+
+msgid "Mask for new files"
+msgstr "Maske für neue Dateien"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Network Shares"
+msgstr "Netzwerkfreigaben"
+
+msgid "Path"
+msgstr "Pfad"
+
+msgid "Read-only"
+msgstr "Nur Lesen"
+
+msgid "Share home-directories"
+msgstr "Heimatverzeichnisse freigeben"
+
+msgid "Shared Directories"
+msgstr "Freigegebene Verzeichnisse"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Dieses Fenster zeigt den Inhalt der Datei '/etc/samba/smb.conf.template', "
+"die als Template zum Erstellen der Samba-Konfiguration verwendet wird. Werte "
+"die von Pipe Symbolen (|) eingeschlossen sind sollten nicht verändert "
+"werden, da diese beim Erstellen der Konfiguration mit den Werten aus dem Tab "
+"'Allgemeine Einstellungen' ersetzt werden."
+
+msgid "Workgroup"
+msgstr "Arbeitsgruppe"
diff --git a/trunk/package/luci/po/de/splash.po b/trunk/package/luci/po/de/splash.po
new file mode 100644
index 00000000..8b1cd9a5
--- /dev/null
+++ b/trunk/package/luci/po/de/splash.po
@@ -0,0 +1,383 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2013-08-19 13:53+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Akzeptieren"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"Zugang zum Internet ist unter Umständen dennoch möglich, da einige "
+"Teilnehmer dieses Netzes ihren eigenen Internetzugang teilen. Da alle Nutzer "
+"sich diese wenigen Zugänge teilen müssen bitten wir darum, folgende "
+"Aktivitäten zu unterlassen:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+"Der Zugang zum Netzwerk wird nicht garantiert. Er kann jederzeit und ohne "
+"Angabe von Gründen unterbrochen oder für bestimmte Endgeräte und Teilnehmer "
+"gesperrt werden."
+
+msgid "Active Clients"
+msgstr "verbundene Clients"
+
+msgid "Allowed hosts/subnets"
+msgstr "Erlaubte Rechner/Netzwerke"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+"Als Alternative zum Bearbeiten des kompletten Splash-Textes (oben) kann auch "
+"nur eigener Text in die Default-Splashseite eingebunden werden. Dazu im "
+"folgenden Feld den eigenen Text eingeben."
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"Die Bandbreitenlimitierung für Clients wird nur aktiviert, wenn sowohl für "
+"Up- als auch für Download Limits eingegeben wurden. Ein Wert von 0 "
+"deaktiviert die Bandbreitenbeschränkung komplett. Rechner/Netze aus der "
+"Whitelist werden nicht limitiert."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+"Werde ein aktives Mitglied unserer Community und hilf, indem du selber einen "
+"Access Point betreibst."
+
+msgid "Blacklist"
+msgstr "Blacklist "
+
+msgid "Blocked"
+msgstr "Gesperrt"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+"Durch das Akzeptieren dieser Regeln kannst du unser Netzwerk für %s Stunde"
+"(n) benutzen. Danach wirst du aufgefordert diese Bedingungen erneut zu "
+"akzeptieren."
+
+msgid "Clearance time"
+msgstr "Freigabezeit"
+
+msgid "Client-Splash"
+msgstr "Client-Splash"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+"Client-Splash ist ein Hotspot-Authentifizierungssystem für Freifunk und "
+"andere Meshnetzwerke."
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+"Wird hier eine URL angegeben dann werden Clients zu dieser Seite "
+"weitergeleitet nachdem sie die Nutzungsbedingungen akzeptiert haben. Wird "
+"keine URL angegeben dann werden Clients zu der ursprünglich angeforderten "
+"Seite weitergeleitet."
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+"Downloadgeschwindigkeit von Clients auf diesen Wert limitieren (kbyte/s) "
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+"Clients die den Splash akzeptiert haben dürfen das Netzwerk für so viele "
+"Stunden benutzen."
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+"Uploadgeschwindigkeit von Clients auf diesen Wert limitieren (kbyte/s) "
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Decline"
+msgstr "Ablehnen"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+"Ziel-Rechner und Ziel-Netzwerke die hier aufgeführt sind werden vom "
+"Splashvorgang ausgenommen, d.h. sie können von Clients immer und ohne "
+"Authentifizierung erreicht werden."
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+"Hilf durch eine Spende dieses Projekt aufrechzuerhalten oder weiter "
+"auszubauen."
+
+msgid "Download limit"
+msgstr "Downloadbegrenzung"
+
+msgid "Edit the complete splash text"
+msgstr "Bearbeiten des kompletten Splash-Textes."
+
+msgid "Fair Use Policy"
+msgstr "Fair Use Policy"
+
+msgid "Firewall zone"
+msgstr "Firewallzone"
+
+msgid "General"
+msgstr "Allgemein"
+
+msgid "Get in %s with the operator of this access point."
+msgstr "Nimm %s mit dem Betreiber dieses Access Points auf."
+
+msgid "Hostname"
+msgstr "Rechnername"
+
+msgid "IP Address"
+msgstr "IP-Adresse"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr "Betreibe deine eigenen WLAN-Geräte auf anderen Kanälen als wir."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "Wenn du unser Netzwerk regelmässig benutzt dann hilf uns bitte, z.B.:"
+
+msgid "Include your own text in the default splash"
+msgstr "Einbinden von eigenem Text in die Default-Splashseite"
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Clientverkehr auf dieser Schnittstelle abfangen"
+
+msgid "Interfaces"
+msgstr "Schnittstellen"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Schnittstellen die für Splash benutzt werden."
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"KB/s (Download/Upload). Durch die aktive Teilnahme an unserem Netzwerks "
+"kannst du dieses Bandbreitenlimit deaktivieren."
+
+msgid "Legally Prohibited Activities"
+msgstr "Verbotene Handlungen"
+
+msgid "Legally Prohibited content"
+msgstr "Verbotene Inhalte"
+
+msgid "MAC Address"
+msgstr "MAC-Adresse"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "MAC-Adressen in dieser Liste werden geblockt."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"MAC-Adressen von Clients in der Whitelist. Diese müssen den Splash nicht "
+"akzeptieren und unterliegen keinen Bandbreitenbegrenzungen."
+
+msgid "Netmask"
+msgstr "Netzmaske"
+
+msgid "Network"
+msgstr "Netzwerk"
+
+msgid "No clients connected"
+msgstr "Keine Clients verbunden."
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Bitte sei dir darüber bewusst, dass wir kein Internetanbieter sondern ein "
+"experimentelles Gemeinschaftsnetzwerk sind."
+
+msgid "Policy"
+msgstr "Richtlinie"
+
+msgid "Redirect target"
+msgstr "Ziel für Weiterleitung"
+
+msgid "Safety"
+msgstr "Sicherheit"
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr "Splashregeln werden in diese Firewallzone eingegliedert"
+
+msgid "Splashtext"
+msgstr "Splash-Text"
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+"Das Netzwerk ist, wie das Internet auch, unverschlüsselt und offen. Jeder "
+"Teilnehmer ist selbst für die Sicherheit seiner Verbindungen und seiner "
+"Endgeräte verantwortlich."
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+"Das offene und freie drahtlose Netzwerk wird von Freiwilligen betrieben "
+"(\"Betreiber\"), die die nötigen Geräte und Internet-Anschlüsse "
+"(\"Infrastruktur\") auf eigene Kosten zur Verfügung stellen."
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+"Die Betreiber lehnen jede Haftung für Datenverlust, unbefugten Zugriff auf "
+"Endgeräte, Schäden an Endgeräten oder finanzielle Verluste, die ein "
+"Teilnehmer durch die Nutzung des Netzwerks erleidet ab."
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+"Der Teilnehmer verpflichtet sich, keine Handlungen vorzunehmen bzw. "
+"Handlungen zu unterlassen, welche gesetzliche Bestimmungen oder die Rechte "
+"Dritter verletzen."
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+"Der Teilnehmer verpflichtet sich, keine Inhalte über das Netzwerk zu "
+"übertragen, welche gegen geltendes Recht verstoßen."
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+"Der Teilnehmer verpflichtet sich, das Netzwerk nicht in einer Weise zu "
+"beanspruchen, welche die Infrastruktur, das Netzwerk selbst, dessen "
+"Betreiber oder andere Teilnehmer beeinträchtigt."
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+"Diese Nutzungsbestimmungen regeln die Inanspruchnahme des Netzwerks durch "
+"die Teilnehmer, welche sich mittels Computer, Handheld o.ä (\"Endgerät\") "
+"mit dem Netzwerk verbinden."
+
+msgid "Time remaining"
+msgstr "Verbleibende Zeit"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Um nach dem Grund der Sperrung zu fragen oder um deren Aufhebung zu bitten "
+"wende dich an den Administrator dieses Access Points:"
+
+msgid "Traffic in/out"
+msgstr "Ein-/Ausgehender Verkehr"
+
+msgid "Upload limit"
+msgstr "Upload-Begrenzung"
+
+msgid "Usage Agreement"
+msgstr "Nutzungsbestimmungen"
+
+msgid "Welcome"
+msgstr "Willkommen"
+
+msgid "Whitelist"
+msgstr "Whitelist"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr "Du bist jetzt verbunden mit dem freien Funknetzwerk"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"Hier kann ein eigener Text eingegeben werden, der Clients angezeigt wird."
+"<br />Folgende Marker können dabei verwendet werden: ###COMMUNITY###, "
+"###COMMUNITY_URL###, ###CONTACTURL###, ###LEASETIME###, ###LIMIT### und "
+"###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"Der Zugang zu diesem Netzwerk wurde vom Administrator blockiert. Das kann "
+"verschiedene Gründe haben, sehr wahrscheinlich hast du jedoch die Regeln "
+"dieses Netzwerks nicht beachtet und dadurch Probleme verursacht."
+
+msgid "Your bandwidth is limited to"
+msgstr "Deine Bandbreite ist limitiert auf"
+
+msgid "blacklisted"
+msgstr "gesperrt"
+
+msgid "expired"
+msgstr "abgelaufen"
+
+msgid "optional when using host addresses"
+msgstr "Die Angabe ist optional wenn nur einzelne Rechner/IPs verwendet werden"
+
+msgid "perform any kind of illegal activities"
+msgstr "Illegale Aktivitäten"
+
+msgid "splashed"
+msgstr "gesplasht"
+
+msgid "temporarily blocked"
+msgstr "Vorübergehend geblockt"
+
+msgid "unknown"
+msgstr "Unbekannt"
+
+msgid "use filesharing applications on this network"
+msgstr "Filesharing betreiben"
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "Bandbreite durch unnötige Downloads oder Streams zu verschwenden."
+
+msgid "whitelisted"
+msgstr "erlaubt"
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr ""
+#~ "Rechner und Netzwerke die hier aufgeführt sind werden vom Splashvorgang "
+#~ "ausgenommen, d.h. sie dürfen das Netzwerk immer und ohne Authentifizierung "
+#~ "benutzen."
diff --git a/trunk/package/luci/po/de/statistics.po b/trunk/package/luci/po/de/statistics.po
new file mode 100644
index 00000000..a523d779
--- /dev/null
+++ b/trunk/package/luci/po/de/statistics.po
@@ -0,0 +1,711 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2013-01-28 22:20+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Aktion (Ziel)"
+
+msgid "Add command for reading values"
+msgstr "Kommando zum Werte einlesen hinzufügen"
+
+msgid "Add matching rule"
+msgstr "Auswahlregel hinzufügen"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Mehrere Hosts durch Leerzeichen getrennt hinzufuegen"
+
+msgid "Add notification command"
+msgstr "Benachrichtigungskommando hinzufügen"
+
+msgid "Base Directory"
+msgstr "Basisverzeichnis"
+
+msgid "Basic monitoring"
+msgstr "Schnittstellen einfach überwachen"
+
+msgid "CPU Plugin Configuration"
+msgstr "CPU Plugin Konfiguration"
+
+msgid "CSV Output"
+msgstr "CSV Ausgabe"
+
+msgid "CSV Plugin Configuration"
+msgstr "CSV Plugin Konfiguration"
+
+msgid "Cache collected data for"
+msgstr "Zwischenspeicherzeit für gesammelte Daten"
+
+msgid "Cache flush interval"
+msgstr "Cache-Leerungsintervall"
+
+msgid "Chain"
+msgstr "Kette (Chain)"
+
+msgid "CollectLinks"
+msgstr "Informationen über Links sammeln (CollectdLinks)"
+
+msgid "CollectRoutes"
+msgstr "Informationen über Routen sammeln (CollectRoutes)"
+
+msgid "CollectTopology"
+msgstr "Informationen über die Netzwerktopologie sammeln (CollectTopology)"
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Collectd Einstellungen"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd ist ein schlankes Dienstprogramm zum Sammeln von Systemdaten aus "
+"verschiedenen Quellen mittels diverser Plugins. Auf dieser Seite können "
+"generelle Einstellungen für den Collectd-Daemon vorgenommen werden."
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Conntrack Plugin Einstellungen"
+
+msgid "DF Plugin Configuration"
+msgstr "DF Plugin Konfiguration"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "DNS Plugin Konfiguration"
+
+msgid "Data collection interval"
+msgstr "Daten-Sammelintervall"
+
+msgid "Datasets definition file"
+msgstr "Dataset-Definitionen"
+
+msgid "Destination ip range"
+msgstr "Ziel-IP-Bereich"
+
+msgid "Directory for collectd plugins"
+msgstr "Verzeichnis für Collectd-Plugins"
+
+msgid "Directory for sub-configurations"
+msgstr "Verzeichnis für Unterkonfigurationen"
+
+msgid "Disk Plugin Configuration"
+msgstr "Disk Plugin Konfiguration"
+
+msgid "Disk Space Usage"
+msgstr "Plattenspeicher"
+
+msgid "Disk Usage"
+msgstr "Plattenauslastung"
+
+msgid "Display Host »"
+msgstr "Anzeigeserver"
+
+msgid "Display timespan »"
+msgstr "Zeitspanne zeigen »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "E-Mail Plugin Konfiguration"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable this plugin"
+msgstr "Plugin aktivieren"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Exec Plugin Konfiguration"
+
+msgid "Filter class monitoring"
+msgstr "Filterklassen überwachen"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Leerungsintervall für Zwischenspeicher"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Weiterleitung zwischen Listen- und Server-Adressen"
+
+msgid "Graphs"
+msgstr "Diagramme"
+
+msgid "Group"
+msgstr "Gruppe"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Hier können externe Kommandos definiert werden, welche durch Collectd "
+"gestartet werden um Statistik-Werte einzulesen. Die Werte werden dabei vom "
+"STDOUT des aufgerufenen Programmes gelesen."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Hier können externe Kommandos definiert werden, welche durch Collectd "
+"gestartet werden sobald konfigurierte Grenzwerte erreicht werden. Die Werte "
+"welche die Benachrichtigung ausgelöst haben werden dabei an den STDIN des "
+"aufgerufenen Programmes übergeben."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Hier werden die Kriterien festgelegt nach welchen die zu überwachenden "
+"Firewall-Regeln ausgewählt werden."
+
+msgid "Host"
+msgstr "Host"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr "IP-Adresse oder Hostname zum Abfragen der Txtinfo-Ausagabe"
+
+msgid "IRQ Plugin Configuration"
+msgstr "IRQ Plugin Konfiguration"
+
+msgid "Ignore source addresses"
+msgstr "Quelladressen ignorieren"
+
+msgid "Incoming interface"
+msgstr "eingehende Schnittstelle"
+
+msgid "Interface Plugin Configuration"
+msgstr "Interface Plugin Konfiguration"
+
+msgid "Interfaces"
+msgstr "Schnittstellen"
+
+msgid "Interrupts"
+msgstr "Interrupts"
+
+msgid "Interval for pings"
+msgstr "Intervall zwischen den Pings"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Iptables Plugin Konfiguration"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Nichts auswählen um die zu überwachende Schnittstelle automatisch zu "
+"bestimmen"
+
+msgid "Listen host"
+msgstr "Listen-Host"
+
+msgid "Listen port"
+msgstr "Listen-Port"
+
+msgid "Listener interfaces"
+msgstr "Listen-Schnittstelle"
+
+msgid "Load Plugin Configuration"
+msgstr "Load Plugin Konfiguration"
+
+msgid "Maximum allowed connections"
+msgstr "Maximale Anzahl erlaubter Verbindungen"
+
+msgid "Memory"
+msgstr "Memory"
+
+msgid "Memory Plugin Configuration"
+msgstr "Memory-Plugin-Konfiguration"
+
+msgid "Monitor all except specified"
+msgstr "Alle bis auf Angegebene überwachen"
+
+msgid "Monitor all local listen ports"
+msgstr "Alle durch lokale Dienste genutzten Ports überwachen"
+
+msgid "Monitor devices"
+msgstr "Geräte überwachen"
+
+msgid "Monitor disks and partitions"
+msgstr "Geräte und Partitionen überwachen"
+
+msgid "Monitor filesystem types"
+msgstr "Datesystemtypen überwachen"
+
+msgid "Monitor hosts"
+msgstr "Hosts überwachen"
+
+msgid "Monitor interfaces"
+msgstr "Schnittstellen überwachen"
+
+msgid "Monitor interrupts"
+msgstr "Interrups überwachen"
+
+msgid "Monitor local ports"
+msgstr "lokale Ports überwachen"
+
+msgid "Monitor mount points"
+msgstr "Mount-Punkte überwachen"
+
+msgid "Monitor processes"
+msgstr "Überwachte Prozesse"
+
+msgid "Monitor remote ports"
+msgstr "entfernte Ports überwachen"
+
+msgid "Name of the rule"
+msgstr "Name der Regel"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Netlink Plugin Konfiguration"
+
+msgid "Network"
+msgstr "Netzwerk"
+
+msgid "Network Plugin Configuration"
+msgstr "Network Plugin Konfiguration"
+
+msgid "Network plugins"
+msgstr "Netzwerkplugins"
+
+msgid "Network protocol"
+msgstr "Netzwerkprotokoll"
+
+msgid "Number of threads for data collection"
+msgstr "Anzahl paralleler Sammelprozesse"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "OLSRd-Plugin-Konfiguration"
+
+msgid "Only create average RRAs"
+msgstr "Nur &#39;average&#39; RRAs erzeugen"
+
+msgid "Options"
+msgstr "Optionen"
+
+msgid "Outgoing interface"
+msgstr "ausgehende Schnittstelle"
+
+msgid "Output plugins"
+msgstr "Ausgabeplugins"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Ping Plugin Konfiguration"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Processes"
+msgstr "Prozesse"
+
+msgid "Processes Plugin Configuration"
+msgstr "Prozess Plugin Konfiguration"
+
+msgid "Processes to monitor separated by space"
+msgstr "Zu überwachende Prozesse (getrennt durch Leerzeichen)"
+
+msgid "Processor"
+msgstr "Prozessor"
+
+msgid "Qdisc monitoring"
+msgstr "Queue Discipline überwachen"
+
+msgid "RRD XFiles Factor"
+msgstr "RRD XFiles Faktor"
+
+msgid "RRD heart beat interval"
+msgstr "RRD Heartbeatintervall"
+
+msgid "RRD step interval"
+msgstr "RRD Schrittintervall"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "RRDTool Plugin Konfiguration"
+
+msgid "Rows per RRA"
+msgstr "Spalten pro RRA"
+
+msgid "Script"
+msgstr "Skript"
+
+msgid "Seconds"
+msgstr "Sekunden"
+
+msgid "Server host"
+msgstr "Server-Host"
+
+msgid "Server port"
+msgstr "Server-Port"
+
+msgid "Shaping class monitoring"
+msgstr "Shapingklassen überwachen"
+
+msgid "Socket file"
+msgstr "Socket-Datei"
+
+msgid "Socket group"
+msgstr "Socket-Nutzergruppe"
+
+msgid "Socket permissions"
+msgstr "Socket-Berechtigungen"
+
+msgid "Source ip range"
+msgstr "Quell-IP-Bereich"
+
+msgid "Specifies what information to collect about links."
+msgstr "Bestimmt die zu sammelnden Per-Link-Informationen."
+
+msgid "Specifies what information to collect about routes."
+msgstr "Bestimmt die zu sammelnden Per-Route-Informationen."
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "Bestimmt die zu sammelnden Informationen der globalen Topologie."
+
+msgid "Statistics"
+msgstr "Statistiken"
+
+msgid "Storage directory"
+msgstr "Speicherverzeichnis"
+
+msgid "Storage directory for the csv files"
+msgstr "Speicherverzeichnis für die CSV-Dateien"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Werte nicht absolut sondern als Raten speichern"
+
+msgid "Stored timespans"
+msgstr "gespeicherte Zeitspannen"
+
+msgid "System Load"
+msgstr "Systemlast"
+
+msgid "System plugins"
+msgstr "Systemplugins"
+
+msgid "TCP Connections"
+msgstr "TCP-Verbindungen"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "TCPConns Plugin Konfiguration"
+
+msgid "TTL for network packets"
+msgstr "TTL für Netzwerkpakete"
+
+msgid "TTL for ping packets"
+msgstr "TTL für Ping Pakete"
+
+msgid "Table"
+msgstr "Tabelle"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+"Das NUT-Plugin liest Informationen über Unterbrechungsfreie "
+"Stromversorgungen"
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+"Das OLSRd-Plugin liest Informationen über Meshnetzwerke aus der OLSR-Txtinfo-"
+"Erweiterung."
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+"Das Conntrack-Plugin sammelt Daten über die Anzahl der verfolgten "
+"Verbindungen."
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+"Das CPU-Plugin sammelt grundlegende Statistiken über die Prozessorauslastung."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"Das CSV-Plugin speichert die gesammelten Daten im CSV-Format, geeignet für "
+"die Weiterverarbeitung durch externe Programme."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"Das DF-Plugin sammelt Statistiken über den Speicherverbrauch auf "
+"verschiedenen Geräten, Mount-Punkten oder Dateisystemtypen."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"Das Disk-Plugin sammelt detaillierte Statistiken über die Auslastung auf "
+"ausgewählten Festplatten und Partitionen."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"Das DNS-Plugin sammelt detaillierte Statistiken über DNS-bezogenen Verkehr "
+"auf ausgewählten Schnittstellen."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"Das E-Mail Plugin erstellt einen Unix-Socket welcher benutzt werden kann um "
+"E-Mail-Statistiken an den laufenden Collectd-Daemon zu übermitteln. Dieses "
+"Plugin ist primär für die Verwendung zusammen mit Mail::SpamAssasin::Plugin::"
+"Collectd gedacht, kann aber auch anderweitig verwendet werden."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"Das Exec-Plugin startet externe Kommandos um Werte einzulesen oder um "
+"Benachrichtigungen auszulösen falls bestimmte Grenzwerte erreicht werden."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"Das Interface-Plugin sammelt allgemeine Verkehrsstatistiken auf ausgewählten "
+"Schnittstellen."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"Das Iptables-Plugin überwacht ausgewählte Firewall-Regeln und sammelt Werte "
+"über die Anzahl der verarbeiteten Pakete und Bytes."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"Das IRQ-Plugin überwacht die Anzahl der Aufrufe pro Sekunde für jeden "
+"ausgewählten Interrupt. Wird kein Interrupt ausgewählt überwacht das Plugin "
+"alle im System vorhandenen Interrupts."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"Das iwinfo-Plugin sammelt Statistiken über die WLAN-Signalstärke, den "
+"Rauschpegel und die Signalqualität."
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "Das Load-Plugin sammelt Informationen über die allgemeine Systemlast."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+"Das memory-Plugin sammelt Statistiken über die RAM-Auslastung des Systems."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"Das Netlink-Plugin sammelt erweiterte QoS-Informationen wie QDisc-, Class- "
+"und Filter-Statistiken auf ausgewählten Schnittstellen."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"Das Network-Plugin ermöglicht die netzwerkgestützte Kommunikation zwischen "
+"verschiedenen Collectd-Instanzen. Collectd kann gleichzeitig im Server- und "
+"Client-Modus betrieben werden. Im Client-Modus werden lokal gesammelte Daten "
+"an einen Collectd-Server übermittelt, im Server-Modus empfängt die lokale "
+"Instanz Daten von anderen Installationen."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"Das Ping-Plugin sendet ICMP-Echo-Requests an ausgewählte Hosts und misst die "
+"Antwortzeiten für jede Adresse."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"Das Prozess-Plugin sammelt Statistiken über Prozess-Zeit, Speicher-Fehler "
+"und Speicher-Verbrauch ausgewählter Prozesse"
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"Das RRDTool-Plugin speichert die gesammelten Daten in sogenannten RRD-"
+"Datenbanken, der Grundlage für die Diagramm-Bilder.<br /><br /"
+"><strong>Warnung: Falsche Werte resultieren in einem sehr hohen "
+"Speicherverbrauch im temporären Verzeichnis. Das kann das Gerät unbrauchbar "
+"machen, da Systemspeicher für den regulären Betrieb fehlt!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Das Statistik-Paket basiert auf <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> und nutzt <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> um die gesammelten Daten in Diagramme zu rendern."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"Das TCPConns-Plugin sammelt Informationen über offene TCP-Verbindungen auf "
+"ausgewählten Ports."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"Das Unixsock-Plugin erstellt einen Unix-Socket über welchen gesammelte Werte "
+"aus der laufenden Collectd-Instanz ausgelesen werden können."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Diese Sektion legt fest auf welchen Schnittstellen Collectd auf eingehende "
+"Verbindungen wartet."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Diese Sektion legt fest zu welchen Collectd-Servern die lokal gesammelten "
+"Daten gesendet werden."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "automatisch vollen Hostnamen herausfinden"
+
+msgid "UPS"
+msgstr "USV"
+
+msgid "UPS Plugin Configuration"
+msgstr "Einstellungen des USV-Plugins"
+
+msgid "UPS name in NUT ups@host format"
+msgstr "Name der USV in NUT im Format usv@host "
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Unixsock Plugin Konfiguration"
+
+msgid "Used PID file"
+msgstr "Pfad zu PID-Datei"
+
+msgid "User"
+msgstr "Nutzer"
+
+msgid "Verbose monitoring"
+msgstr "Schnittstellen detailliert überwachen"
+
+msgid "Wireless"
+msgstr "Drahtlos"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "Wireless-iwinfo Plugin Konfiguration"
+
+msgid "e.g. br-ff"
+msgstr "z.B. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "z.B. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "z.B. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "max. 16 Buchstaben"
+
+msgid "reduces rrd size"
+msgstr "reduziert die RRD Größe"
+
+msgid "seconds; multiple separated by space"
+msgstr "mehrere mit Leerzeichen trennen"
+
+msgid "server interfaces"
+msgstr "Server-Schnittstellen"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Installierte Netzwerk-Plugins:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Installierte Ausgabe-Plugins:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "Netzwerkplugins werden benutzt um Informationen über offene TCP-"
+#~ "Verbindungen, Datenverkehr/Volumen, Iptables/Firewall Regeln etc. zu sammeln"
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "Ausgabeplugins ermöglichen es gesammelte Daten zu speichern. Mehrere Plugins "
+#~ "können gleichzeitig aktiviert werden, z.B. um Daten in RRD-Datenbanken zu "
+#~ "speichern und gleichzeitig über das Netzwerk an andere Collectd-Instanzen zu "
+#~ "versenden."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr ""
+#~ "Systemplugins sammeln Daten zum Systemzustand und den Ressoursenbedarf des "
+#~ "Gerätes"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "Das Wireless-Plugin sammelt Statistiken über die drahtlose Signalstärke, den "
+#~ "Störpegel und die Signalqualität."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Wireless Plugin Konfiguration"
diff --git a/trunk/package/luci/po/de/tinyproxy.po b/trunk/package/luci/po/de/tinyproxy.po
new file mode 100644
index 00000000..d4448724
--- /dev/null
+++ b/trunk/package/luci/po/de/tinyproxy.po
@@ -0,0 +1,373 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2012-11-28 10:52+0200\n"
+"Last-Translator: dunkelschunkel <dunkelschunkel@googlemail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"<em>Via Proxy</em> leitet Anfragen an das gegebene Ziel über den angegebenen "
+"Upstream-Proxy, <em>Zugriff verweigern</em> deaktiviert jegliche Proxies für "
+"das Ziel"
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Fügt eine \"X-Tinyproxy\" HTTP-Headerzeile mit der Client Adresse in "
+"weitergeleitete Anfragen ein"
+
+msgid "Allowed clients"
+msgstr "Erlaubte Clients"
+
+msgid "Allowed connect ports"
+msgstr "Erlaubte Verbindungsports"
+
+msgid "Bind address"
+msgstr "Serveradresse"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"Standardmäßig werden einfache POSIX Ausdrücke für die Filterung genutzt, "
+"diese Option aktiviert erweiterte reguläre Ausdrücke"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+"Standardmäßig spielt die Groß- und Kleinschreibung bei der Filterung keine "
+"Rolle, diese Option aktiviert die Unterscheidung von Groß- und "
+"Kleinschreibung"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"Standardmäßig basiert die Filterung auf Domainnamen, diese Option aktiviert "
+"das Filtern gegen die volle URL"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"Standardmäßig fungieren die Filterregeln als Blacklist, diese Option kehrt "
+"diese in eine Whitelist um und lässt nur treffende URLs oder Domains zu"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+"Kann entweder eine IP-Adresse, ein Domain-Name oder \".\" für jegliche Hosts "
+"sein"
+
+msgid "Configuration"
+msgstr "Konfiguration"
+
+msgid "Connection timeout"
+msgstr "Verbindungstimeout"
+
+msgid "Default deny"
+msgstr "Standardmäßig verbieten"
+
+msgid "Enable Tinyproxy server"
+msgstr "Tinyproxy Server aktivieren"
+
+msgid "Error page"
+msgstr "Fehlerseite"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "Empfangen der Statiken von URL fehlgeschlagen"
+
+msgid "Filter by RegExp"
+msgstr "Filtern nach RegExp"
+
+msgid "Filter by URLs"
+msgstr "Filtern nach URLs"
+
+msgid "Filter case-sensitive"
+msgstr "Filtern nach Groß-/Kleinschreibung"
+
+msgid "Filter file"
+msgstr "Filterdatei"
+
+msgid "Filtering and ACLs"
+msgstr "Filterung und Zugriffsregeln"
+
+msgid "General settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Group"
+msgstr "Gruppe"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr "HTML-Vorlage für Statistikseiten"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "HTML-Vorlage für Fehlerseiten"
+
+msgid "Header whitelist"
+msgstr "Headerzeilen-Whitelist"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Liste von IP-Adressen oder Netzbereichen welche diesen Server nutzen dürfen"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"Liste erlaubter Ports für \"CONNECT\" Anfragen. Ein einzelner Wert \"0\" "
+"erlaubt alle Ports"
+
+msgid "Listen address"
+msgstr "Serveradresse"
+
+msgid "Listen port"
+msgstr "Serverport"
+
+msgid "Log file"
+msgstr "Protokolldatei"
+
+msgid "Log file to use for dumping messages"
+msgstr "Gibt die Datei an, in welche Protokollausgaben geschrieben werden"
+
+msgid "Log level"
+msgstr "Protokolllevel"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "Umfang der Tinyproxy Protokollmeldungen"
+
+msgid "Max. clients"
+msgstr "Max. Clients"
+
+msgid "Max. requests per server"
+msgstr "Max. Anfragen pro Server"
+
+msgid "Max. spare servers"
+msgstr "Max. Prozesszahl"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "Maximal erlaubte Anzahl gleichzeitig verbundener Clients"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+"Maximal erlaubte Anzahl an Anfragen pro Prozess. Wenn diese erreicht wird, "
+"startet der Prozess neu. Null bedeutet unlimitiert."
+
+msgid "Maximum number of prepared idle processes"
+msgstr "Maximale Anzahl an vorgehaltenen Leerlaufprozessen"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+"Maximale Anzahl an Sekunden, die eine etablierte, inaktive Verbindung offen "
+"gehalten wird"
+
+msgid "Min. spare servers"
+msgstr "Min. Prozesszahl"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "Minimale Anzahl an vorgehaltenen Leerlaufprozessen"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr "Anzahl zu erzeugender Leerlaufprozesse beim Start von Tinyproxy"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+"Klartextdatei mit zu filternden URLs oder Domains. Ein Eintrag pro Zeile."
+
+msgid "Policy"
+msgstr "Verfahrensweise"
+
+msgid "Privacy settings"
+msgstr "Privatsphäre"
+
+msgid "Reject access"
+msgstr "Verbiete Zugriff"
+
+msgid "Server Settings"
+msgstr "Servereinstellungen"
+
+msgid "Server limits"
+msgstr "Serverlimits"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+"Spezifiziert Headerzeilen welche durch den Proxyserver durchgereicht werden "
+"dürfen, alle anderen werden entfernt. Leer lassen um den Filter zu "
+"deaktivieren"
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "Konfiguriert den Port an welchem Tinyproxy auf Anfragen wartet"
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+"Konfiguriert den Hostname, welchen Tinyproxy in die \"Via\" Headerzeile "
+"schreibt"
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+"Konfiguriert die lokale IP-Adresse welche Tinyproxy für ausgehende, "
+"weitergeleitete Anfragen benutzt"
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+"Konfiguriert die IP-Adressen auf welchen Tinyproxy Anfragen entgegen nimmt"
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+"Spezifiziert den UNIX-Gruppennamen mit welchem der Tinyproxy Prozess läuft"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+"Spezifiziert den Upstream-Proxy über welchen auf den Zielhost zugegriffen "
+"wird. Das Format ist <code>IP-Adresse:Port</code>"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+"Spezifiziert den UNIX-Nutzernamen mit welchem der Tinyproxy Prozess läuft"
+
+msgid "Start spare servers"
+msgstr "Starte Leerlaufserver"
+
+msgid "Statistics page"
+msgstr "Statistikseite"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Target host"
+msgstr "Zielhost"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Status Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+"Tinyproxy ist ein schlanker HTTP(S)-Proxy ohne eigenen Zwischenspeicher"
+
+msgid "Upstream Proxies"
+msgstr "Upstream-Proxies"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+"Upstream-Proxy-Regeln definieren Proxy-Server welche immer dann genutzt "
+"werden wenn bestimmte IP-Adressen oder Domains angefragt werden."
+
+msgid "Use syslog"
+msgstr "Nutze den Systemprotokolldienst"
+
+msgid "User"
+msgstr "Benutzername"
+
+msgid "Via hostname"
+msgstr "\"Via\" Hostname"
+
+msgid "Via proxy"
+msgstr "Zwischenproxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+"Schreibt Protokolleinträge an den Protokolldienst statt in eine separate "
+"Protokolldatei."
+
+msgid "X-Tinyproxy header"
+msgstr "X-Tinyproxy Headerzeile"
+
+#~ msgid "Allow access from"
+#~ msgstr "Proxyzugang erlauben von"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Erlaube Header für anonymen Proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Ausgehendenden Verkehr an Adresse binden"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports für CONNECT-Methode"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = deaktiviert, leer = alle"
+
+#~ msgid "Error document"
+#~ msgstr "Fehlerseite"
+
+#~ msgid "Filter list"
+#~ msgstr "Filterliste"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filter unterscheiden Groß-/Kleinschreibung"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Filterliste ist eine Whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Erweiterte reguläre Ausdrücke für Filter"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtere URLs statt Domains"
+
+#~ msgid "Listen on address"
+#~ msgstr "An Adresse binden"
+
+#~ msgid "Logfile"
+#~ msgstr "Protokolldatei"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Maximale Anzahl an Clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Maximale Anfragen pro Prozess"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Anfängliche Prozesszahl"
+
+#~ msgid "Statistic document"
+#~ msgstr "Statistikseite"
+
+#~ msgid "Write to syslog"
+#~ msgstr "In Systemprotokoll schreiben"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Verbindungstimeout"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Wert des Via-Headers"
+
+#~ msgid "Include client IP"
+#~ msgstr "Client-IP übertragen"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Zugangskontrolle"
+
+#~ msgid "Type"
+#~ msgstr "Methode"
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Zugangsproxy"
diff --git a/trunk/package/luci/po/de/transmission.po b/trunk/package/luci/po/de/transmission.po
new file mode 100644
index 00000000..4b665ff6
--- /dev/null
+++ b/trunk/package/luci/po/de/transmission.po
@@ -0,0 +1,300 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-17 15:08+0200\n"
+"PO-Revision-Date: 2013-01-28 23:03+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Alternative Download-Geschwindigkeit"
+
+msgid "Alternative speed enabled"
+msgstr "Alternative Geschwindigkeit aktivieren"
+
+msgid "Alternative speed time begin"
+msgstr "Zeit für Beginn der alternativen Geschwindigkeit"
+
+msgid "Alternative speed time day"
+msgstr "Tag für alternative Geschwindigkeit"
+
+msgid "Alternative speed time end"
+msgstr "Zeit für Ende der alternativen Geschwindigkeit"
+
+msgid "Alternative speed timing enabled"
+msgstr "Zeiteinstellung für alternative Geschwindigkeit eingeschaltet"
+
+msgid "Alternative upload speed"
+msgstr "Alternative Upload-Geschwindigkeit"
+
+msgid "Automatically start added torrents"
+msgstr "Hinzugefügte Torrents automatisch starten"
+
+msgid "Bandwidth settings"
+msgstr "Bandbreiten-Einstellungen"
+
+msgid "Binding address IPv4"
+msgstr "IPv4-Adressbindung"
+
+msgid "Binding address IPv6"
+msgstr "IPv6-Adressbindung"
+
+msgid "Block list enabled"
+msgstr "Blockier-Liste eingeschaltet"
+
+msgid "Blocklist URL"
+msgstr "URL für Blockier-Liste"
+
+msgid "Blocklists"
+msgstr "Blockier-Listen"
+
+msgid "Cache size in MB"
+msgstr "Cache-Größe in MB"
+
+msgid "Config file directory"
+msgstr "Verzeichnis für Konfigurationsdatei"
+
+msgid "DHT enabled"
+msgstr "DHT eingeschaltet"
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "Download directory"
+msgstr "Verzeichnis für Downloads"
+
+msgid "Download queue enabled"
+msgstr "Download-Warteschlange eingeschaltet"
+
+msgid "Download queue size"
+msgstr "Größe der Download-Warteschlange"
+
+msgid "Enable watch directory"
+msgstr "Verzeichnisüberprüfung eingeschaltet"
+
+msgid "Enabled"
+msgstr "Eingeschaltet"
+
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+msgid "Error"
+msgstr "Fehler"
+
+msgid "Fast"
+msgstr "Schnell"
+
+msgid "Files and Locations"
+msgstr "Dateien und Orte"
+
+msgid "Forced"
+msgstr "Erzwungen"
+
+msgid "Full"
+msgstr "Voll"
+
+msgid "Global peer limit"
+msgstr "Allgemeines Peer-Limit"
+
+msgid "Global settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Idle seeding limit"
+msgstr "Begrenzung für Seeding im Idle-Zustand"
+
+msgid "Idle seeding limit enabled"
+msgstr "Begrenzung für Seeding im Idle-Zustand eingeschaltet"
+
+msgid "Incomplete directory"
+msgstr "unvollständiges Verzeichnis"
+
+msgid "Incomplete directory enabled"
+msgstr "unvollständiges Verzeichnis eingeschaltet"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "LPD enabled"
+msgstr "LPD eingeschaltet"
+
+msgid "Lazy bitfield enabled"
+msgstr "Lazy-Bitfield eingeschaltet"
+
+msgid "Message level"
+msgstr "Nachrichten-Ebene"
+
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+msgid "None"
+msgstr "Keines"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"Zahl/Bitfeld. Starte mit 0, für jeden Tag, an dem die Zeitplanung aktiv sein "
+"soll, füge einen Wert hinzu. Sonntag - 1, Montag - 2, Dienstag - 4, "
+"Mittwoch - 8, Donnerstag - 16, Freitag - 32, Samstag - 64"
+
+msgid "Off"
+msgstr "Aus"
+
+msgid "Open Web Interface"
+msgstr "Offenes Web-Interface"
+
+msgid "PEX enabled"
+msgstr "PEX aktiv"
+
+msgid "Peer Port settings"
+msgstr "Einstellungen für Peer-Port"
+
+msgid "Peer congestion algorithm"
+msgstr "Algorithmus für Peer-Überlastungen"
+
+msgid "Peer limit per torrent"
+msgstr "Peer-Begrenzung pro Torrent"
+
+msgid "Peer port"
+msgstr "Peer-Port"
+
+msgid "Peer port random high"
+msgstr "Peer-Port: hohe Zufallszahl"
+
+msgid "Peer port random low"
+msgstr "Peer-Port: niedrige Zufallszahl"
+
+msgid "Peer port random on start"
+msgstr "Zufälliger Peer-Port beim Start"
+
+msgid "Peer settings"
+msgstr "Peer-Einstellungen"
+
+msgid "Peer socket tos"
+msgstr "Peer-Socket-TOS"
+
+msgid "Port forwarding enabled"
+msgstr "Port-Weiterleitung aktiv"
+
+msgid "Preferred"
+msgstr "Bevorzugt"
+
+msgid "Prefetch enabled"
+msgstr "Prefetch aktiv"
+
+msgid "Queue stalled enabled"
+msgstr "Warteschlangen-Halt aktiv"
+
+msgid "Queue stalled minutes"
+msgstr "Warteschlangen-Halt in Minuten"
+
+msgid "Queueing"
+msgstr "in Warteschlange stellen"
+
+msgid "RPC URL"
+msgstr "RPC-URL"
+
+msgid "RPC authentication required"
+msgstr "RPC-Anmeldung erforderlich"
+
+msgid "RPC bind address"
+msgstr "RPC-Adressbindung"
+
+msgid "RPC enabled"
+msgstr "RPC eingeschaltet"
+
+msgid "RPC password"
+msgstr "RPC-Passwort"
+
+msgid "RPC port"
+msgstr "RPC-Port"
+
+msgid "RPC settings"
+msgstr "RPC-Einstellungen"
+
+msgid "RPC username"
+msgstr "RPC-Benutzername"
+
+msgid "RPC whitelist"
+msgstr "RPC-Einschlussliste"
+
+msgid "RPC whitelist enabled"
+msgstr "RPC-Einschlussliste aktiv"
+
+msgid "Ratio limit"
+msgstr "Ratio-Begrenzung"
+
+msgid "Ratio limit enabled"
+msgstr "Ratio-Begrenzung aktiv"
+
+msgid "Rename partial files"
+msgstr "Teildateien umbenennen"
+
+msgid "Run daemon as user"
+msgstr "Den Daemon als Benutzer starten"
+
+msgid "Scheduling"
+msgstr "Zeitplanung"
+
+msgid "Scrape paused torrents enabled"
+msgstr "Pausierte Torrents beschneiden"
+
+msgid "Script torrent done enabled"
+msgstr "Skript nach Abschluss eines Torrents aktiv"
+
+msgid "Script torrent done filename"
+msgstr "Skript nach Abschluss eines Torrents: Dateiname"
+
+msgid "Seed queue enabled"
+msgstr "Seed-Warteschlange aktiv"
+
+msgid "Seed queue size"
+msgstr "Größe der Seed-Warteschlange"
+
+msgid "Speed limit down"
+msgstr "Geschwindigkeitsbegrenzung Down"
+
+msgid "Speed limit down enabled"
+msgstr "Geschwindigkeitsbegrenzung Down aktiv"
+
+msgid "Speed limit up"
+msgstr "Geschwindigkeitsbegrenzung Up"
+
+msgid "Speed limit up enabled"
+msgstr "Geschwindigkeitsbegrenzung Up aktiv"
+
+msgid "Transmission"
+msgstr "Übertragung"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"Der Transmission-Daemon ist ein einfacher Bittorent-Client. Hier können Sie "
+"ihn einstellen."
+
+msgid "Trash original torrent files"
+msgstr "Originale Torrent-Dateien verwerfen"
+
+msgid "Upload slots per torrent"
+msgstr "Upload-Plätze pro Torrent"
+
+msgid "Watch directory"
+msgstr "Überwachtes Verzeichnis"
+
+msgid "in minutes from midnight"
+msgstr "in Minuten ab Mitternacht"
+
+msgid "preallocation"
+msgstr "Vorbelegung"
+
+msgid "uTP enabled"
+msgstr "uTP eingeschaltet"
diff --git a/trunk/package/luci/po/de/upnp.po b/trunk/package/luci/po/de/upnp.po
new file mode 100644
index 00000000..2edd93c5
--- /dev/null
+++ b/trunk/package/luci/po/de/upnp.po
@@ -0,0 +1,171 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2012-11-28 10:45+0200\n"
+"Last-Translator: dunkelschunkel <dunkelschunkel@googlemail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"ACLs definieren, welche externen Ports zu welchen internen Adressen und "
+"Ports weitergeleitet werden dürfen"
+
+msgid "Action"
+msgstr "Aktion"
+
+msgid "Active UPnP Redirects"
+msgstr "Aktive UPnP-Weiterleitungen"
+
+msgid "Advanced Settings"
+msgstr "Erweiterte Einstellungen"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Nur Weiterleitungen zurück zum anfordernden Client zulassen"
+
+msgid "Announced model number"
+msgstr "Angekündigte Modellnummer"
+
+msgid "Announced serial number"
+msgstr "Angekündigte Seriennummer"
+
+msgid "Clean rules interval"
+msgstr "Aufräumintervall für Weiterleitungen"
+
+msgid "Clean rules threshold"
+msgstr "Aufräumschwellenwert für Weiterleitungen"
+
+msgid "Client Address"
+msgstr "Clientadresse"
+
+msgid "Client Port"
+msgstr "Clientport"
+
+msgid "Collecting data..."
+msgstr "Sammle Daten..."
+
+msgid "Comment"
+msgstr "Kommentar"
+
+msgid "Delete Redirect"
+msgstr "Weiterleitung löschen"
+
+msgid "Device UUID"
+msgstr "Geräte-UUID"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "NAT-PMP Funktionalität aktivieren"
+
+msgid "Enable UPnP functionality"
+msgstr "UPnP Funktionalität aktivieren"
+
+msgid "Enable additional logging"
+msgstr "Erweiterte Protokollierung aktivieren"
+
+msgid "Enable secure mode"
+msgstr "Sicheren Modus aktivieren"
+
+msgid "External Port"
+msgstr "Externer Port"
+
+msgid "External ports"
+msgstr "Externe Ports"
+
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgid "Internal addresses"
+msgstr "Interne Adressen"
+
+msgid "Internal ports"
+msgstr "Interne Ports"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP ACLs"
+
+msgid "MiniUPnP settings"
+msgstr "MiniUPnP-Einstellungen"
+
+msgid "Notify interval"
+msgstr "Benachrichtigungsintervall"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr "Präsentations-URL"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Schreibt zusätzliche Debug-Informationen in das Systemprotokoll"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Systemlaufzeit statt Prozesslaufzeit melden"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "UPnP und NAT-PMP Dienst starten"
+
+msgid "There are no active redirects."
+msgstr "Es gibt keine aktiven Weiterleitungen."
+
+msgid "UPNP"
+msgstr "UPnP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP erlaubt es Clients im lokalen Netzwerk automatisch Port-Weiterleitungen "
+"auf diesem Router einzurichten."
+
+msgid "UPnP lease file"
+msgstr "UPnP Lease-Datei"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Wert in Kilobyte/s, nur informativ"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP ermöglicht die automatische Konfiguration des Routers durch Clients im "
+#~ "lokalen Netzwerk."
+
+#~ msgid "enable"
+#~ msgstr "aktivieren"
+
+#~ msgid "Enable NAT-PMP"
+#~ msgstr "NAT-PMP aktivieren"
+
+#~ msgid "Enable UPnP Service"
+#~ msgstr "UPnP Service aktivieren"
+
+#~ msgid "Log output"
+#~ msgstr "Ausgabe protokollieren"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPNP sollte nur wenn unbedingt nötig aktiviert werden, da es ein "
+#~ "Sicherheitsrisiko für das Netzwerk darstellen kann."
diff --git a/trunk/package/luci/po/de/ushare.po b/trunk/package/luci/po/de/ushare.po
new file mode 100644
index 00000000..d7d7e229
--- /dev/null
+++ b/trunk/package/luci/po/de/ushare.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 17:57+0200\n"
+"PO-Revision-Date: 2013-01-28 22:32+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Freigabeverzeichnisse"
+
+msgid "Disable telnet console"
+msgstr "Telnet-Konsole deaktivieren"
+
+msgid "Disable webinterface"
+msgstr "Webinterface deaktivieren"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgid "Options"
+msgstr "Optionen"
+
+msgid "Servername"
+msgstr "Servername"
+
+msgid "Settings"
+msgstr "Einstellungen"
+
+msgid "Username"
+msgstr "Benutzername"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare ist ein uPNP(TM) A/V & DLNA - basierender Medien-Server. Es "
+"implementiert die Serverkomponente, welche uPNP-Geräten Informationen über "
+"verfügbare Mediendateien bereitstellt."
diff --git a/trunk/package/luci/po/de/uvc_streamer.po b/trunk/package/luci/po/de/uvc_streamer.po
new file mode 100644
index 00000000..0dd8a656
--- /dev/null
+++ b/trunk/package/luci/po/de/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-01-26 12:12+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Frames pro Sekunde"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Auflösung"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Einstellungen"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Webcam Streaming"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Richten sie ihre Linux-UVC kompatible Webcam ein. Rufen sie mit ihrem "
+"Browser z.B. <a href=\"http://%s:%i/\">http://%s:%i/</a> auf"
diff --git a/trunk/package/luci/po/de/vnstat.po b/trunk/package/luci/po/de/vnstat.po
new file mode 100644
index 00000000..e42f4f0f
--- /dev/null
+++ b/trunk/package/luci/po/de/vnstat.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2010-11-16 21:06+0100\n"
+"Last-Translator: Jo-Philipp Wich <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr "Konfiguration"
+
+msgid "Daily traffic"
+msgstr "Täglicher Verkehr"
+
+msgid "Graphs"
+msgstr "Diagramme"
+
+msgid "Hourly traffic"
+msgstr "Stündlicher Verkehr"
+
+msgid "Monitor selected interfaces"
+msgstr "Überwachte Schnittstellen"
+
+msgid "Monthly traffic"
+msgstr "Monatlicher Verkehr"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Es ist noch keine Datenbank eingerichtet. Navigieren Sie zur VnStat "
+"Konfiguration und aktivieren Sie die Überwachung einer oder mehrerer "
+"Schnittstellen."
+
+msgid "Restart VnStat"
+msgstr "VnStat neu starten"
+
+msgid "Summary display"
+msgstr "Übersicht"
+
+msgid "Top 10 display"
+msgstr "Top 10 Anzeige"
+
+msgid "Update »"
+msgstr "Aktualisieren »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "VnStat Diagramme"
+
+msgid "VnStat Traffic Monitor"
+msgstr "VnStat Trafficüberwachung"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat ist ein Überwachungsprogramm für Netwerkverkehr unter Linux. Das "
+"Programm protokolliert das Verkehrsvolumen auf ausgewählten Schnittstellen."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "Der VnStat Dienst wurde neu gestartet."
diff --git a/trunk/package/luci/po/de/voice_core.po b/trunk/package/luci/po/de/voice_core.po
new file mode 100644
index 00000000..2a03b634
--- /dev/null
+++ b/trunk/package/luci/po/de/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-28 22:20+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefone"
+
+msgid "Voice"
+msgstr "Sprache"
diff --git a/trunk/package/luci/po/de/voice_diag.po b/trunk/package/luci/po/de/voice_diag.po
new file mode 100644
index 00000000..f60dc08d
--- /dev/null
+++ b/trunk/package/luci/po/de/voice_diag.po
@@ -0,0 +1,29 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-09-08 15:21+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Diagnostics"
+msgstr "Diagnose"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Welche Diagnosetools auf diesem System verfügbar sind hängt davon ab, welche "
+"Module installiert sind."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Unter diesem Menüpunkt können Diagnosetools für sprachbezogene Dienste "
+"konfiguriert und ausgeführt werden."
diff --git a/trunk/package/luci/po/de/watchcat.po b/trunk/package/luci/po/de/watchcat.po
new file mode 100644
index 00000000..1bbc6d52
--- /dev/null
+++ b/trunk/package/luci/po/de/watchcat.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-28 22:40+0200\n"
+"Last-Translator: DAC324 <gerd_roethig@web.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "Erzwungenen Neustart verzögern um"
+
+msgid "Host address to ping"
+msgstr "Anzupingende Host-Adresse"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Wie oft soll die Internetverbindung überprüft werden. Standart-Einheit in "
+"Sekunden, kann aber durch angehängtes 'm' in Minuten, 'h' in Stunden und 'd' "
+"in Tage geändert werden."
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"Im periodischen Modus gibt er die Zeitdauer für einen Neustart an. Im "
+"Internet-Modus gibt er die längste Zeitdauer ohne Internetzugang an, nach "
+"der ein Neustart durchgeführt wird. Voreingestellte Einheit ist Sekunden, "
+"Sie können aber die Endungen 'm' für Minuten, 'h' für Stunden und 'd' für "
+"Tage benutzen."
+
+msgid "Operating mode"
+msgstr "Betriebsart"
+
+msgid "Period"
+msgstr "Periode"
+
+msgid "Ping host"
+msgstr "Ping-Host"
+
+msgid "Ping period"
+msgstr "Ping-Zeitdauer"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat erlaubt die Einstellung eines automatischen Neustarts, wenn die "
+"Internetverbindung eine bestimmte Zeitlang ausgefallen ist."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"Bei einem Neustart des Systems wird Watchcat einen Warmstart auslösen, wird "
+"hier ein Wert ungleich Null eingegeben, wird ein Kaltstart ausgelöst, sollte "
+"der Warmstart fehlschlagen. Geben Sie eine Zahl in Sekunden zur Aktivierung "
+"an, 0 schaltet diese Funktion aus."
diff --git a/trunk/package/luci/po/de/wol.po b/trunk/package/luci/po/de/wol.po
new file mode 100644
index 00000000..21ebc8f2
--- /dev/null
+++ b/trunk/package/luci/po/de/wol.po
@@ -0,0 +1,58 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2011-06-11 01:37+0200\n"
+"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Auf allen Schnittstellen senden"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+"Zu startenden Rechner selektieren oder benutzerdefinierte MAC-Adresse angeben"
+
+msgid "Host to wake up"
+msgstr "Anzuschaltender Rechner"
+
+msgid "Network interface to use"
+msgstr "Verwendete Schnittstelle"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Manchmal funktioniert nur eines der beiden Programme. Wenn eines "
+"fehlschlägt, versuchen Sie das Andere."
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+"Selektiert die Netzwerkschnittstelle auf der das WoL-Paket versendet wird"
+
+msgid "Starting WoL utility:"
+msgstr "Starte WoL-Programm:"
+
+msgid "Wake on LAN"
+msgstr "Wake-on-LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake-on-LAN ist ein Mechanismus um Geräte im lokalen Netzwerk ferngesteuert "
+"anzuschalten."
+
+msgid "Wake up host"
+msgstr "Rechner anschalten"
+
+msgid "WoL program"
+msgstr "WoL-Programm"
diff --git a/trunk/package/luci/po/de/wshaper.po b/trunk/package/luci/po/de/wshaper.po
new file mode 100644
index 00000000..39dd6177
--- /dev/null
+++ b/trunk/package/luci/po/de/wshaper.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2011-10-18 12:28+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Downlink"
+msgstr "Download"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Download Bandbreite in kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Rechner oder Netzwerk in CIDR Schreibweise"
+
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgid "Low priority destination ports"
+msgstr "Zielports mit niedriger Priorität"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Zielrechner mit nideriger Priorität"
+
+msgid "Low priority hosts (Source)"
+msgstr "Quellrechner mit neidriger Priorität"
+
+msgid "Low priority source ports"
+msgstr "Quellports mit niedriger Priorität"
+
+msgid "Uplink"
+msgstr "Upload"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Upload Bandbreite in kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Wondershaper Einstellungen"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper ermöglicht mit Hilfe von Traffic Shaping niedrige Latenzzeiten "
+"für interaktiven Internetverkehr selbst wenn die Internetverbindung extrem "
+"ausgelastet ist."
diff --git a/trunk/package/luci/po/el/ahcp.po b/trunk/package/luci/po/el/ahcp.po
new file mode 100644
index 00000000..5b1dd57d
--- /dev/null
+++ b/trunk/package/luci/po/el/ahcp.po
@@ -0,0 +1,114 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 16:25+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "AHCP Server"
+msgstr "Εξυπηρετητής AHCP"
+
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+
+msgid "Active AHCP Leases"
+msgstr "Ενεργά AHCP Leases"
+
+msgid "Address"
+msgstr "Διεύθυνση"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Age"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Announced NTP servers"
+msgstr ""
+
+msgid "Announced prefixes"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr "Συλλέγονται δεδομένα..."
+
+msgid "Forwarder"
+msgstr "Προωθητής"
+
+msgid "General Setup"
+msgstr "Γενικές ρυθμίσεις"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 και IPv6"
+
+msgid "IPv4 only"
+msgstr "μόνο IPv4"
+
+msgid "IPv6 only"
+msgstr "μόνο IPv6"
+
+#, fuzzy
+msgid "Lease directory"
+msgstr "Κατάλογος leases"
+
+msgid "Lease validity time"
+msgstr "Χρόνος εγκυρότητας lease"
+
+msgid "Log file"
+msgstr "Αρχείο καταγραφής"
+
+msgid "Multicast address"
+msgstr "Διεύθυνση multicast"
+
+msgid "Operation mode"
+msgstr ""
+
+msgid "Port"
+msgstr "Θύρα"
+
+msgid "Protocol family"
+msgstr "Οικογένεια πρωτοκόλλου"
+
+msgid "Served interfaces"
+msgstr "Εξυπηρετούμενες διεπαφές"
+
+msgid "Server"
+msgstr "Εξυπηρετητής"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Καθορίζει τους εξυπηρετητές NTP σε IPv4 και IPv6 που ανακοινώνονται"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Καθορίζει τους εξυπηρετητές DNS σε IPv4 και IPv6 που ανακοινώνονται"
+
+#, fuzzy
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"Καθορίζει τα προθέματα διευθύνσεων IPv4 και IPv6 που ανακοινώνονται, σε "
+"μορφή CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr ""
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
+#, fuzzy
+msgid "There are no active leases."
+msgstr "Δεν υπάρχουν ενεργά leases"
+
+msgid "Unique ID file"
+msgstr "Αρχείο μοναδικού αναγνωριστικού"
diff --git a/trunk/package/luci/po/el/asterisk.po b/trunk/package/luci/po/el/asterisk.po
new file mode 100644
index 00000000..e7372135
--- /dev/null
+++ b/trunk/package/luci/po/el/asterisk.po
@@ -0,0 +1,71 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-03-19 14:55+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Γενικές επιλογές του Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Φάκελος AGI"
+
+#~ msgid "Debug Level"
+#~ msgstr "Επίπεδο αποσφαλμάτωσης"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Απενεργοποίηση ορισμένων μηνυμάτων"
+
+#~ msgid "High Priority"
+#~ msgstr "Υψηλή Προτεραιότητα"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Αρχικοποίηση Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Χρήση εσωτερικού χρονόμετρου"
+
+#~ msgid "Log directory"
+#~ msgstr "Φάκελος καταγραφής"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Μέγιστος επιτρεπόμενος αριθμός κλήσεων"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Μέγιστος φόρτος για παύση εισερχόμενων κλήσεων"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Απενεργοποίηση χρωμάτων κονσόλας"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Κρυφός φάκελος αρχείων ήχου"
+
+#~ msgid "include"
+#~ msgstr "περιλαμβάνω"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Καθαρισμός γενικών μεταβλητών"
+
+#~ msgid "Connection to use"
+#~ msgstr "Χρήση σύνδεσης"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Μέθοδος Επανεκκίνησης"
+
+#~ msgid "Parameter"
+#~ msgstr "Παράμετρος"
+
+#~ msgid "JPEG (Joint Picture Experts Group) Image"
+#~ msgstr "Εικόνα JPEG (Joint Picture Experts Group)"
+
+#~ msgid "Application"
+#~ msgstr "Εφαρμογή"
diff --git a/trunk/package/luci/po/el/base.po b/trunk/package/luci/po/el/base.po
new file mode 100644
index 00000000..88da8cc2
--- /dev/null
+++ b/trunk/package/luci/po/el/base.po
@@ -0,0 +1,3857 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-03-31 15:35+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(παράθυρο %d λεπτών, διάστημα %d δευτερολέπτων)"
+
+msgid "(%s available)"
+msgstr "(%s διαθέσιμα)"
+
+msgid "(empty)"
+msgstr "(κενό)"
+
+msgid "(no interfaces attached)"
+msgstr "(χωρίς προσαρτημένες διεπαφές)"
+
+msgid "-- Additional Field --"
+msgstr "-- Επιπλέον Πεδίο --"
+
+msgid "-- Please choose --"
+msgstr "-- Παρακαλώ επιλέξτε --"
+
+msgid "-- custom --"
+msgstr "-- προσαρμοσμένο --"
+
+msgid "1 Minute Load:"
+msgstr "Φορτίο 1 λεπτού:"
+
+msgid "15 Minute Load:"
+msgstr "Φορτίο 15 λεπτών:"
+
+msgid "5 Minute Load:"
+msgstr "Φορτίο 5 λεπτών:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "Θύρα ερωτημάτων <abbr title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "Θύρα εξυπηρετητή <abbr title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"Οι <abbr title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr> εξυπηρετητές θα "
+"ερωτηθούν με την σειρά εμφάνισης στο αρχείο resolvfile"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Διεύθυνση <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "Πύλη <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "Μάσκα <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"Διεύθυνση <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> ή Δίκτυο "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "Πύλη <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Παραμετροποίηση <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Όνομα <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Διεύθυνση <abbr title=\"Media Access Control\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"μέγιστο\">Μεγ.</abbr> πλήθος <abbr title=\"Πρωτόκολλο "
+"Παραμετροποίησης Δυναμικού Συστήματος\">DHCP</abbr> leases"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"μέγιστο\">Μεγ.</abbr> μέγεθος πακέτου <abbr title=\"Μηχανισμοί "
+"επεκτάσεων για Συστήματα Ονόματος Τομέα\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"μέγιστο\">Μεγ.</abbr> πλήθος ταυτόχρονων ερωτηματων"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Υποστήριξη AR"
+
+msgid "ARP retry threshold"
+msgstr "Όριο επαναδοκιμών ARP"
+
+msgid "ATM Bridges"
+msgstr "Γέφυρες ΑΤΜ"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM Εικονικό Κανάλι Αναγνωριστή (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM Εικονικό μονοπάτι Αναγνωριστή (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Οι γέφυρες ATM αποκαλύπτουν ενθυλακωμένες ethernet σε συνδέσεις AAL5 σαν "
+"εικονικές διεπαφές δικτύου Linux, οι οποίες μπορούν να χρησιμοποιηθούν σε "
+"συνδυασμό με DHCP ή PPP για την κλήση προς τον παροχέα δικτύου."
+
+msgid "ATM device number"
+msgstr "Αριθμός συσκευής ATM"
+
+msgid "Access Concentrator"
+msgstr "Συγκεντρωτής Πρόσβασης "
+
+msgid "Access Point"
+msgstr "Σημείο Πρόσβασης"
+
+msgid "Action"
+msgstr "Ενέργεια"
+
+msgid "Actions"
+msgstr "Ενέργειες"
+
+msgid "Activate this network"
+msgstr "Ενεργοποίηση αυτού του δικτύου"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Ενεργές Διαδρομές <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Ενεργές Διαδρομές <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "Active Connections"
+msgstr "Ενεργές Συνδέσεις"
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Προσθήκη"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Προσθήκη κατάληξης τοπικού τομέα για ονόματα εξυπηρετούμενα από αρχεία hosts "
+
+msgid "Add new interface..."
+msgstr "Προσθήκη νέας διεπαφής..."
+
+msgid "Additional Hosts files"
+msgstr "Επιπλέον αρχεία Hosts"
+
+msgid "Address"
+msgstr "Διεύθυνση"
+
+msgid "Address to access local relay bridge"
+msgstr "Διεύθυνση για πρόσβαση σε την τοπική γέφυρα αναμετάδοσης"
+
+msgid "Administration"
+msgstr "Διαχείριση"
+
+msgid "Advanced Settings"
+msgstr "Προχωρημένες Ρυθμίσεις"
+
+msgid "Alert"
+msgstr "Ειδοποίηση"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Επιτρέπει την εξουσιοδότηση <abbr title=\"Secure Shell\">SSH</abbr> με "
+"κωδικό πρόσβασης"
+
+msgid "Allow all except listed"
+msgstr "Να επιτρέπονται όλες, εκτός από αυτές στη λίστα"
+
+msgid "Allow listed only"
+msgstr "Να επιτρέπονται μόνο αυτές στην λίστα"
+
+msgid "Allow localhost"
+msgstr "Να επιτρέπεται το localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Να επιτρέπεται σε απομακρυσμένα συστήματα να συνδέονται σε τοπικά "
+"προωθημένες SSH θύρες"
+
+msgid "Allow root logins with password"
+msgstr "Να επιτρέπονται root συνδέσεις με κωδικό πρόσβασης"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+"Να επιτρέπεται στον χρήστη <em>root</em> να συνδέετε με κωδικό πρόσβασης"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Να επιτρέπονται απαντήσεις από ανώτερο επίπεδο εντός του εύρους 127.0.0.0/8, "
+"π.χ. για υπηρεσίες RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Ένα επιπλέον δίκτυο θα δημιουργηθεί εάν αυτό αφεθεί κενό"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Κεραία 1"
+
+msgid "Antenna 2"
+msgstr "Κεραία 2"
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr "Οιαδήποτε ζώνη"
+
+msgid "Apply"
+msgstr "Εφαρμογή"
+
+msgid "Applying changes"
+msgstr "Εφαρμογή αλλαγών"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Συνδεδεμένοι Σταθμοί"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr "Εξουσιοδότηση"
+
+msgid "Authoritative"
+msgstr "Κύριος"
+
+msgid "Authorization Required"
+msgstr "Απαιτείται Εξουσιοδότηση"
+
+msgid "Auto Refresh"
+msgstr "Αυτόματη Ανανέωση"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Διαθέσιμο"
+
+msgid "Available packages"
+msgstr "Διαθέσιμα πακέτα"
+
+msgid "Average:"
+msgstr "Μέσος Όρος:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Πίσω"
+
+msgid "Back to Overview"
+msgstr "Πίσω προς Επισκόπηση"
+
+msgid "Back to configuration"
+msgstr "Πίσω προς παραμετροποίηση"
+
+msgid "Back to overview"
+msgstr "Πίσω προς επισκόπηση"
+
+msgid "Back to scan results"
+msgstr "Πίσω στα αποτελέσματα σάρωσης"
+
+msgid "Background Scan"
+msgstr "Σάρωση Παρασκηνίου"
+
+msgid "Backup / Flash Firmware"
+msgstr "Αντίγραφο ασφαλείας / Εγγραφή FLASH Υλικολογισμικό"
+
+msgid "Backup / Restore"
+msgstr "Αποθήκευση / Επαναφορά Αντίγραφου Ασφαλείας"
+
+msgid "Backup file list"
+msgstr "Λίστα αρχείων για αντίγραφο ασφαλείας"
+
+#, fuzzy
+msgid "Bad address specified!"
+msgstr "Μη έγκυρη διεύθυνση!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Παρακάτω είναι η προκαθορισμένη λίστα αρχείων για αντιγραφή ασφαλείας. "
+"Αποτελείτε από αλλαγμένα αρχεία παραμετροποίησης σημαδεμένα από το opkg, "
+"ουσιώδη βασικά αρχεία καθώς και καθορισμένα από το χρήστη μοτίβα αντιγράφων "
+"ασφαλείας."
+
+msgid "Bitrate"
+msgstr "Ρυθμός δεδομένων"
+
+msgid "Bogus NX Domain Override"
+msgstr "Παράκαμψη Ψευδούς Τομέα NX"
+
+msgid "Bridge"
+msgstr "Γέφυρα"
+
+msgid "Bridge interfaces"
+msgstr "Γεφύρωμα διεπαφών"
+
+msgid "Bridge unit number"
+msgstr "Αριθμός μονάδας γέφυρας"
+
+msgid "Bring up on boot"
+msgstr "Ανέβασμα κατά την εκκίνηση"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr "Κουμπιά"
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr "Χρήση CPU (%)"
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Αλυσίδα"
+
+msgid "Changes"
+msgstr "Αλλαγές"
+
+msgid "Changes applied."
+msgstr "Αλλαγές εφαρμόστηκαν."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Αλλάζει τον κωδικό διαχειριστή για πρόσβαση στη συσκευή"
+
+msgid "Channel"
+msgstr "Κανάλι"
+
+msgid "Check"
+msgstr "Έλεγχος"
+
+msgid "Checksum"
+msgstr "Άθροισμα Ελέγχου"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Επιλέξατε την ζώνη τείχους προστασίας που επιθυμητέ να αναθέσετε σε αυτήν "
+"την διεπαφή. Επιλέξτε <em>απροσδιόριστο</em> για να αφαιρέσετε την διεπαφή "
+"από την συσχετισμένη ζώνη ή συμπληρώστε το <em>δημιουργία</em> πεδίο για να "
+"προσδιορίσετε μία νέα ζώνη και να προσαρτήσετε την διεπαφή σε αυτό."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Κλικ στο \"Δημιουργία αρχείου\" για να κατεβάσετε ένα tar αρχείο με τα "
+"τρέχοντα αρχεία παραμετροποίησης. Για να επαναφέρετε το υλικολογισμικό στην "
+"αρχική του κατάσταση, κάντε κλικ στο \"Εκτέλεσε επαναφορά\" (δυνατό μόνο σε "
+"squashfs εικόνες)."
+
+msgid "Client"
+msgstr "Πελάτης"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Αναγνωριστικό πελάτη που αποστέλλετε κατά την αίτηση DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Κλείσιμο, μη ενεργών συνδέσεων μετά το πέρας του ορισμένου αριθμού "
+"δευτερολέπτων, χρησιμοποιήστε 0 για να εξακολουθούν να υφίστανται επ' "
+"αόριστον"
+
+msgid "Close list..."
+msgstr "Κλείσιμο λίστας..."
+
+msgid "Collecting data..."
+msgstr "Συλλογή δεδομένων..."
+
+msgid "Command"
+msgstr "Εντολή"
+
+msgid "Common Configuration"
+msgstr "Κοινή Παραμετροποίηση"
+
+msgid "Compression"
+msgstr "Συμπίεση"
+
+msgid "Configuration"
+msgstr "Παραμετροποίηση"
+
+msgid "Configuration applied."
+msgstr "Η Παραμετροποίηση εφαρμόστηκε."
+
+msgid "Configuration files will be kept."
+msgstr "Τα αρχεία παραμετροποίησης θα διατηρηθούν."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Ορίζει το συγκεκριμένο σημείο προσάρτησης ως επικαλύπτον αποθηκευτικό χώρο "
+"για το block-extroot"
+
+msgid "Confirmation"
+msgstr "Επιβεβαίωση"
+
+msgid "Connect"
+msgstr "Σύνδεση"
+
+msgid "Connected"
+msgstr "Συνδεδεμένος"
+
+msgid "Connection Limit"
+msgstr "Όριο Συνδέσεων"
+
+msgid "Connections"
+msgstr "Συνδέσεις"
+
+msgid "Country"
+msgstr "Χώρα"
+
+msgid "Country Code"
+msgstr "Κωδικός Χώρας"
+
+msgid "Cover the following interface"
+msgstr "Κάλυψη της ακόλουθης διεπαφής"
+
+msgid "Cover the following interfaces"
+msgstr "Κάλυψη των ακόλουθων διεπαφών"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Δημιουργία / Ανάθεση ζώνης τείχους προστασίας"
+
+msgid "Create Interface"
+msgstr "Δημιουργία Διεπαφής"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr "Επίπεδο Καταγραφής Cron"
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Ρυθμίζει, αν είναι δυνατόν, την συμπεριφορά των <abbr title=\"Light Emitting "
+"Diode\">LED</abbr> της συσκευής."
+
+msgid "DHCP Leases"
+msgstr "DHCP Leases"
+
+msgid "DHCP Server"
+msgstr "Εξυπηρετητής DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP και DNS"
+
+msgid "DHCP client"
+msgstr "Πελάτης DHCP"
+
+msgid "DHCP-Options"
+msgstr "Επιλογές DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Προωθήσεις DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr "Αποσφαλμάτωση"
+
+msgid "Default %d"
+msgstr "Προεπιλογή %d"
+
+msgid "Default gateway"
+msgstr "Προεπιλεγμένη πύλη"
+
+msgid "Default state"
+msgstr "Προεπιλεγμένη κατάσταση"
+
+msgid "Define a name for this network."
+msgstr "Ορίστε ένα όνομα για αυτό το δίκτυο."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Ορίστε επιπλέον επιλογές DHCP, που διαφημίζουν διαφορετικούς εξυπηρετητές "
+"DNS στους πελάτες, για παράδειγμα \"<code>6,192.168.2.1,192.168.2.2</code>\"."
+
+msgid "Delete"
+msgstr "Διαγραφή"
+
+msgid "Delete this interface"
+msgstr "Διαγραφή αυτής της διεπαφής"
+
+msgid "Delete this network"
+msgstr "Διαγραφή αυτού του δικτύου"
+
+msgid "Description"
+msgstr "Περιγραφή"
+
+msgid "Design"
+msgstr "Εμφάνιση"
+
+msgid "Destination"
+msgstr "Προορισμός"
+
+msgid "Device"
+msgstr "Συσκευή"
+
+msgid "Device Configuration"
+msgstr "Παραμετροποίηση Συσκευής"
+
+msgid "Diagnostics"
+msgstr "Διαγνωστικά"
+
+msgid "Directory"
+msgstr "Κατάλογος"
+
+msgid "Disable"
+msgstr "Απενεργοποίηση"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Απενεργοποίηση <abbr title=\"Πρωτόκολλο Δυναμικής Απόδοσης Διεύθυνσης"
+"\">DHCP</abbr> για αυτή τη διεπαφή."
+
+msgid "Disable DNS setup"
+msgstr "Απενεργοποίηση ρυθμίσεων DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Απενεργοποίηση χρονιστή HW-Beacon"
+
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Αγνόησε τις απαντήσεις ανοδικής ροής RFC1918"
+
+msgid "Displaying only packages containing"
+msgstr "Εμφάνιση μόνο πακέτων που περιέχουν"
+
+msgid "Distance Optimization"
+msgstr "Βελτιστοποίηση Απόστασης"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Απόσταση σε μέτρα από το πιο απομακρυσμένο μέλος του δικτύου."
+
+msgid "Diversity"
+msgstr "Διαφορική Λήψη"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Ο Dnsmasq είναι ένας συνδυασμός εξυπηρετητή <abbr title=\"Πρωτόκολλο "
+"Δυναμικής Απόδοσης Παραμέτρων Συστήματος\">DHCP</abbr> και προωθητή<abbr "
+"title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr> για τείχη προστασίας <abbr title="
+"\"Μεταφραστή Διεύθυνσης Δικτύου\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+"Να μην αποθηκεύονται στη λανθάνουσα μνήμη οι αρνητικές απαντήσεις, π.χ. για "
+"μη υπαρκτούς τομείς."
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Να μην προωθούνται αιτήματα τα οποία δεν μπορούν να απαντηθούν από δημόσιους "
+"εξυπηρετητές ονομάτων"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr "Να μην στέλνονται απαντήσεις σε probes"
+
+msgid "Domain required"
+msgstr "Απαίτηση για όνομα τομέα"
+
+msgid "Domain whitelist"
+msgstr "Λευκή λίστα τομέων"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Να μην προωθούνται ερωτήματα <abbr title=\"Domain Name System\">DNS</abbr> "
+"χωρίς όνομα τομέα <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "Download and install package"
+msgstr "Κατέβασμα και εγκατάσταση πακέτου"
+
+msgid "Download backup"
+msgstr "Κατέβασμα αντιγράφου ασφαλείας"
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Το Dropbear προσφέρει πρόσβαση σε <abbr title=\"Secure Shell\">SSH</abbr> "
+"κέλυφος μέσω δικτύου και έναν ενσωματωμένο εξυπηρετητή <abbr title=\"Secure "
+"Copy\">SCP</abbr>"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Δυναμικό <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "Δυναμικό τούνελ"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Δυναμική απόδοση DHCP διευθύνσεων στους πελάτες. Σε περίπτωση "
+"απενεργοποίησης, μόνο πελάτες με στατικα leases θα εξυπηρετούνται."
+
+msgid "EAP-Method"
+msgstr "Μέθοδος EAP"
+
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+msgid "Edit this interface"
+msgstr "Επεξεργασία αυτής της διεπαφής"
+
+msgid "Edit this network"
+msgstr "Επεξεργασία αυτού του δικτύου"
+
+msgid "Emergency"
+msgstr "Έκτακτη ανάγκη"
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Ενεργοποίηση <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Ενεργοποίηση ενημέρωσης δυναμικού τερματικού σημείου HE.net."
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Ενεργοποίηση διαπραγμάτευσης IPv6 πάνω στη PPP ζεύξη"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Ενεργοποίηση διέλευσης Jumbo Frame"
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr "Ενεργοποίηση εξυπηρετητή TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Ενεργοποίηση λειτουργίας VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Ένεργοποίηση learning and aging"
+
+msgid "Enable this mount"
+msgstr "Ενεργοποίηση αυτής της προσάρτησης"
+
+msgid "Enable this swap"
+msgstr "Ενεργοποίηση αυτής της swap"
+
+msgid "Enable/Disable"
+msgstr "Ενεργοποίηση/Απενεργοποίηση"
+
+msgid "Enabled"
+msgstr "Ενεργοποιημένο"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr "Λειτουργία ενθυλάκωσης"
+
+msgid "Encryption"
+msgstr "Κρυπτογράφηση"
+
+msgid "Erasing..."
+msgstr "Διαγράφεται..."
+
+msgid "Error"
+msgstr "Σφάλμα"
+
+msgid "Ethernet Adapter"
+msgstr "Προσαρμογέας Ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Ethernet Switch"
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr "Λήγει"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Ο ελάχιστος χρόνος λήξεως των διευθύνσεων lease είναι 2 λεπτά (<code>2m</"
+"code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Εξωτερικός εξυπηρετητής καταγραφής συστήματος"
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr "Γρήγορα Πλαίσια"
+
+msgid "File"
+msgstr "Αρχείο"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Όνομα αρχείου της εικόνας εκκίνησης που διαφημίζετε στους πελάτες"
+
+msgid "Filesystem"
+msgstr "Σύστημα Αρχείων"
+
+msgid "Filter"
+msgstr "Φίλτρο"
+
+msgid "Filter private"
+msgstr "Φιλτράρισμα ιδιωτικών"
+
+msgid "Filter useless"
+msgstr "Φιλτράρισμα άχρηστων"
+
+msgid "Find and join network"
+msgstr "Εύρεση και σύνδεση σε δίκτυο"
+
+msgid "Find package"
+msgstr "Εύρεση πακέτου"
+
+msgid "Finish"
+msgstr "Τέλος"
+
+msgid "Firewall"
+msgstr "Τείχος Προστασίας"
+
+msgid "Firewall Settings"
+msgstr "Ρυθμίσεις Τείχους Προστασίας"
+
+msgid "Firewall Status"
+msgstr "Κατάσταση Τείχους Προστασίας"
+
+msgid "Firmware Version"
+msgstr "Έκδοση Υλικολογισμικού"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr "Σημαίες"
+
+msgid "Flash Firmware"
+msgstr "Φλασάρισμα Firmware"
+
+msgid "Flash image..."
+msgstr "Φλασάρισμα εικόνας..."
+
+msgid "Flash new firmware image"
+msgstr "Φλασάρισμα νέας εικόνας υλικολογισμικού"
+
+msgid "Flash operations"
+msgstr "Λειτουργίες φλασάρισματος"
+
+msgid "Flashing..."
+msgstr "Φλασάρεται..."
+
+msgid "Force"
+msgstr "Επιβολή"
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr "Επιβολή CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+"Επιβολή DHCP σε αυτό το δίκτυο ακόμα κι αν έχει εντοπιστεί άλλος εξυπηρετητής"
+
+msgid "Force TKIP"
+msgstr "Επιβολή TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Επιβολή TKIP και CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Προώθηση κίνησης DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Προώθηση κίνησης broadcast"
+
+msgid "Forwarding mode"
+msgstr "Μέθοδος προώθησης"
+
+msgid "Fragmentation Threshold"
+msgstr "Όριο Κατακερµατισµού"
+
+msgid "Frame Bursting"
+msgstr "Bursting Πλαισίων"
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr "Ελεύθερος χώρος"
+
+msgid "Frequency Hopping"
+msgstr "Frequency Hopping"
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr "Πύλη"
+
+msgid "Gateway ports"
+msgstr "Θύρες πύλης"
+
+msgid "General Settings"
+msgstr "Γενικές Ρυθμίσεις"
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr "Μετάβαση στη σχετική σελίδα ρυθμίσεων"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr "Κρέμασμα"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Εδώ μπορείτε να παραμετροποιήσετε βασικές πλευρές της συσκευής σας όπως το "
+"όνομα υπολογιστή ή τη ζώνη ώρας."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Κρυφό <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Καταχωρήσεις Υπολογιστών"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"<abbr title=\"Internet Protocol Address\">IP</abbr> Υπολογιστή ή Δικτύου"
+
+msgid "Hostname"
+msgstr "Όνομα Υπολογιστή"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr "Ονόματα Υπολογιστών"
+
+msgid "IP address"
+msgstr "Διεύθυνση IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4 Τείχος Προστασίας"
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr "Διεύθυνση IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 και IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr "Πύλη IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Μάσκα IPv4"
+
+msgid "IPv4 only"
+msgstr "Μόνο IPv4"
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr "IPv4-Διεύθυνση"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6 Τείχος Προστασίας"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Κατάσταση IPv6 WAN"
+
+msgid "IPv6 address"
+msgstr "Διεύθυνση IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Πύλη IPv6"
+
+msgid "IPv6 only"
+msgstr "Μόνο IPv6"
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-in-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr "Ταυτότητα"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Αν οριστεί, προσάρτησε τη συσκευή με βάση το UUID της αντί για το "
+"καθορισμένο όνομα της"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Αν οριστεί, προσάρτησε τη συσκευή με βάση την ετικέτα της αντί για το "
+"καθορισμένο όνομα της"
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Αν η φυσική μνήμη δεν είναι αρκετή, μη-χρησιμοποιούμενα δεδομένα μπορούν "
+"προσωρινά να εναλλάσσονται σε μία συσκευή swap με αποτέλεσμα περισσότερη "
+"ενεργή <abbr title=\"Random Access Memory\">RAM</abbr>. Η εναλλαγή δεδομένων "
+"είναι μία πολύ αργή διαδικασία αφού η συσκευή swap δεν μπορεί να "
+"προσπελαστεί με τους υψηλούς ρυθμούς μεταφοράς δεδομένων που διαθέτει η "
+"<abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr "Αγνόησε διεπαφή"
+
+msgid "Ignore resolve file"
+msgstr "Αγνόησε αρχείο resolve"
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr "Είσοδος"
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr "Πληροφορίες"
+
+msgid "Initscript"
+msgstr "Σενάριο εκκίνησης"
+
+msgid "Initscripts"
+msgstr "Σενάρια Εκκίνησης"
+
+msgid "Install"
+msgstr "Εγκατάσταση"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Εγκατάσταση πακέτου %q"
+
+msgid "Install protocol extensions..."
+msgstr "Εγκατάσταση επεκτάσεων πρωτοκόλλου..."
+
+msgid "Installed packages"
+msgstr "Εγκατεστημένα πακέτα"
+
+msgid "Interface"
+msgstr "Διεπαφή"
+
+msgid "Interface Configuration"
+msgstr "Παραμετροποίηση Διεπαφής"
+
+msgid "Interface Overview"
+msgstr "Επισκόπηση Διεπαφής"
+
+msgid "Interface is reconnecting..."
+msgstr "Η διεπαφή επανασυνδέεται..."
+
+msgid "Interface is shutting down..."
+msgstr "Η διεπαφή απενεργοποιείται..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Η διεπαφή δεν υπάρχει ή δεν έχει συνδεθεί ακόμη."
+
+msgid "Interface reconnected"
+msgstr "Η διεπαφή επανασυνδέθηκε"
+
+msgid "Interface shut down"
+msgstr "Η διεπαφή απενεργοποιήθηκε"
+
+msgid "Interfaces"
+msgstr "Διεπαφές"
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr "Άκυρη τιμή εισόδου"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Άκυρο όνομα χρήστη και/ή κωδικός πρόσβασης! Παρακαλώ προσπαθήστε ξανά."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Φαίνεται πως προσπαθείτε να φλασάρετε μια εικόνα που δεν χωράει στην μνήμη "
+"flash, παρακαλώ επιβεβαιώστε το αρχείο εικόνας!"
+
+msgid "Java Script required!"
+msgstr "Απαιτείται Javascript!"
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr "Διατήρηση ρυθμίσεων"
+
+msgid "Kernel Log"
+msgstr "Καταγραφή Πυρήνα"
+
+msgid "Kernel Version"
+msgstr "Έκδοση Πυρήνα"
+
+msgid "Key"
+msgstr "Κλειδί"
+
+msgid "Key #%d"
+msgstr "Κλειδί #%d"
+
+msgid "Kill"
+msgstr "Σκότωμα"
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Ετικέτα"
+
+msgid "Language"
+msgstr "Γλώσσα"
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr "Αρχείο Leases"
+
+msgid "Leasetime"
+msgstr "Χρόνος Lease"
+
+msgid "Leasetime remaining"
+msgstr "Υπόλοιπο χρόνου Lease"
+
+msgid "Leave empty to autodetect"
+msgstr "Αφήστε το κενό για να γίνει αυτόματη ανίχνευση"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Αφήστε το κενό για να γίνει χρήση της τρέχουσας διεύθυνσης WAN"
+
+msgid "Legend:"
+msgstr "Υπόμνημα:"
+
+msgid "Limit"
+msgstr "Όριο"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Αναμμένο με Ζεύξη"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr "Φόρτος"
+
+msgid "Load Average"
+msgstr "Μέσος όρος φόρτου"
+
+msgid "Loading"
+msgstr "Φόρτωση"
+
+msgid "Local IPv4 address"
+msgstr "Τοπική διεύθυνση IPv4"
+
+msgid "Local IPv6 address"
+msgstr "Τοπική διεύθυνση IPv6"
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr "Τοπική Ώρα"
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr "Τοπικός εξυπηρετητής"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr "Τοπικά ερωτήματα"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Κλειδωμένο στο κανάλι %d που χρησιμοποιείται απ' το %s"
+
+msgid "Log output level"
+msgstr "Επίπεδο εξόδου αρχείων καταγραφής"
+
+msgid "Log queries"
+msgstr "Καταγραφή ερωτημάτων"
+
+msgid "Logging"
+msgstr "Καταγραφή"
+
+msgid "Login"
+msgstr "Σύνδεση"
+
+msgid "Logout"
+msgstr "Αποσύνδεση"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr "MAC-Διεύθυνση"
+
+msgid "MAC-Address Filter"
+msgstr "Φίλτρο MAC Διευθύνσεων"
+
+msgid "MAC-Filter"
+msgstr "MAC-Φίλτρο"
+
+msgid "MAC-List"
+msgstr "Λίστα MAC"
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Μέγιστος Ρυθμός"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Μέγιστος επιτρεπόμενος αριθμός ενεργών DHCP leases"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Μέγιστος επιτρεπόμενος αριθμός ταυτόχρονων ερωτημάτων DNS"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Μέγιστο επιτρεπόμενο μέγεθος EDNS.0 UDP πακέτων"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+"Μέγιστος αριθμός δευτερολέπτων αναμονής ώστε το modem να καταστεί έτοιμο"
+
+msgid "Maximum hold time"
+msgstr "Μέγιστος χρόνος κράτησης"
+
+msgid "Maximum number of leased addresses."
+msgstr "Μέγιστος αριθμός διευθύνσεων lease"
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr "Μνήμη"
+
+msgid "Memory usage (%)"
+msgstr "Χρήση Μνήμης (%)"
+
+msgid "Metric"
+msgstr "Μέτρο"
+
+msgid "Minimum Rate"
+msgstr "Ελάχιστος Ρυθμός"
+
+msgid "Minimum hold time"
+msgstr "Ελάχιστος χρόνος κράτησης"
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr "Λειτουργία"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Συσκευή Modem"
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr "Παρακολούθηση"
+
+#, fuzzy
+msgid "Mount Entry"
+msgstr "Προσάρτηση"
+
+msgid "Mount Point"
+msgstr "Σημείο Προσάρτησης"
+
+msgid "Mount Points"
+msgstr "Σημεία Προσάρτησης"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Σημεία Προσάρτησης - Είσοδος Προσάρτησης"
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Τα σημεία προσάρτησης ορίζουν σε ποιο σημείο στο σύστημα αρχείων θα "
+"προσαρτηθεί μία συσκευή μνήμης"
+
+msgid "Mount options"
+msgstr "Επιλογές προσάρτησης"
+
+msgid "Mount point"
+msgstr "Σημείο προσάρτησης"
+
+msgid "Mounted file systems"
+msgstr "Προσαρτημένα συστήματα αρχείων"
+
+msgid "Move down"
+msgstr "Μετακίνηση κάτω"
+
+msgid "Move up"
+msgstr "Μετακίνηση πάνω"
+
+msgid "Multicast Rate"
+msgstr "Ρυθμός Multicast"
+
+msgid "Multicast address"
+msgstr "Διεύθυνση Multicast"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr "Όνομα"
+
+msgid "Name of the new interface"
+msgstr "Όνομα νέας διεπαφής"
+
+msgid "Name of the new network"
+msgstr "Όνομα νέου δικτύου"
+
+msgid "Navigation"
+msgstr "Πλοήγηση"
+
+msgid "Netmask"
+msgstr "Μάσκα δικτύου"
+
+msgid "Network"
+msgstr "Δίκτυο"
+
+msgid "Network Utilities"
+msgstr "Εργαλεία Δικτύου"
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr "Επόμενο »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Δεν υπάρχει ρυθμισμένος DHCP εξυπηρετητής για αυτή τη διεπαφή"
+
+msgid "No chains in this table"
+msgstr "Δεν υπάρχουν αλυσίδες σε αυτόν τον πίνακα"
+
+msgid "No files found"
+msgstr "Δε βρέθηκαν αρχεία"
+
+msgid "No information available"
+msgstr "Δεν υπάρχουν πληροφορίες διαθέσιμες"
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr "Δεν υπάρχει παραμετροποιημένο δίκτυο σε αυτή τη συσκευή"
+
+msgid "No network name specified"
+msgstr "Δεν έχει οριστεί όνομα δικτύου"
+
+msgid "No package lists available"
+msgstr "Δεν υπάρχουν διαθέσιμες λίστες πακέτων"
+
+msgid "No password set!"
+msgstr "Δεν έχει οριστεί κωδικός πρόσβασης!"
+
+msgid "No rules in this chain"
+msgstr "Δεν υπάρχει κανόνας σε αυτή την αλυσίδα"
+
+msgid "No zone assigned"
+msgstr "Δεν έχει ανατεθεί ζώνη"
+
+msgid "Noise"
+msgstr "Θόρυβος"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Θόρυβος:"
+
+msgid "None"
+msgstr "Κανένα"
+
+msgid "Normal"
+msgstr "Φυσιολογικό"
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr "Σημείωση: Τα αρχεία παραμετροποίησης θα διαγραφούν."
+
+msgid "Notice"
+msgstr "Επισήμανση"
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr "Εντάξει"
+
+msgid "OPKG-Configuration"
+msgstr "Παραμετροποίηση OPKG"
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Σε αυτή τη σελίδα μπορείτε να ρυθμίσετε τις διεπαφές δικτύου. Μπορείτε να "
+"γεφυρώσετε πολλαπλές διεπαφές τικάροντας το πεδίο \"γεφύρωμα διεπαφών\" και "
+"εισάγοντας τα ονόματα των διεπαφών δικτύου χωρισμένα με κενά. Μπορείτε "
+"επίσης να χρησιμοποιήσετε παράσταση τύπου <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title="
+"\"παραδείγματος χάριν\">π.χ.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr "Ένα ή περισσότερα πεδία περιέχουν μη έγκυρες τιμές!"
+
+msgid "One or more required fields have no value!"
+msgstr "Ένα ή περισσότερα πεδία δεν περιέχουν τιμές!"
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr "Η επιλογή άλλαξε"
+
+msgid "Option removed"
+msgstr "Η επιλογή αφαιρέθηκε"
+
+msgid "Options"
+msgstr "Επιλογές"
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr "Έξοδος"
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr "Εξωτερικά Κανάλια"
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Επισκόπηση"
+
+msgid "Owner"
+msgstr "Κάτοχος"
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Ενθυλάκωση PPPoA"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Απαιτείται το πακέτο libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Οι λίστες πακέτων έχουν να ανανεωθούν πάνω από 24 ώρες"
+
+msgid "Package name"
+msgstr "Όνομα πακέτου"
+
+msgid "Packets"
+msgstr "Πακέτα"
+
+msgid "Part of zone %q"
+msgstr "Μέρος της ζώνης %q"
+
+msgid "Password"
+msgstr "Κωδικός Πρόσβασης"
+
+msgid "Password authentication"
+msgstr "Εξουσιοδότηση με κωδικό πρόσβασης"
+
+msgid "Password of Private Key"
+msgstr "Κωδικός Πρόσβασης του Ιδιωτικού Κλειδιού"
+
+msgid "Password successfully changed!"
+msgstr "Ο κωδικός πρόσβασης άλλαξε επιτυχώς!"
+
+msgid "Path to CA-Certificate"
+msgstr "Διαδρομή για Πιστοποιητικό CA"
+
+msgid "Path to Client-Certificate"
+msgstr "Διαδρομή για Πιστοποιητικό-Πελάτη"
+
+msgid "Path to Private Key"
+msgstr "Διαδρομή για Ιδιωτικό Κλειδί"
+
+msgid "Path to executable which handles the button event"
+msgstr "Διαδρομή για το εκτελέσιμο που χειρίζεται το γεγονός του κουμπιού"
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr "Εκτέλεση επανεκκίνησης"
+
+msgid "Perform reset"
+msgstr "Διενέργεια αρχικοποίησης"
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr "Πκτ."
+
+msgid "Please enter your username and password."
+msgstr "Παρακαλώ εισάγετε όνομα χρήστη και κωδικό πρόσβασης."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Παρακαλώ περιμένετε: Η συσκευή επανεκκινεί..."
+
+msgid "Policy"
+msgstr "Πολιτική"
+
+msgid "Port"
+msgstr "Θύρα"
+
+msgid "Port %d"
+msgstr "Θύρα %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+#, fuzzy
+msgid "Prevents client-to-client communication"
+msgstr "Αποτρέπει την επικοινωνία μεταξύ πελατών"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr "Συνέχεια"
+
+msgid "Processes"
+msgstr "Εργασίες"
+
+msgid "Prot."
+msgstr "Πρωτ."
+
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
+
+msgid "Protocol family"
+msgstr "Οικογένεια πρωτοκόλλου"
+
+msgid "Protocol of the new interface"
+msgstr "Πρωτόκολλο νέας διεπαφής"
+
+msgid "Protocol support is not installed"
+msgstr "Η υποστήριξη πρωτοκόλλου δεν έχει εκγατασταθεί"
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Ψευδό Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr "Όριο RTS/CTS"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Διάβασμα του <code>/etc/ethers</code> για την παραμετροποίηση του "
+"εξυπηρετητή <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr "Αρχικοποίηση όλων των αλλαγών;"
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr "Αλλαγή πρωτοκόλλου;"
+
+msgid "Realtime Connections"
+msgstr "Συνδέσεις πραγματικού χρόνου"
+
+msgid "Realtime Graphs"
+msgstr "Γραφήματα πραγματικού χρόνου"
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr "Κίνηση πραγματικού χρόνου"
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr "Επανεκκίνηση"
+
+msgid "Rebooting..."
+msgstr "Επανεκκίνηση..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Επανεκκίνηση του λειτουργικού συστήματος της συσκευής σας"
+
+msgid "Receive"
+msgstr "Λήψη"
+
+msgid "Receiver Antenna"
+msgstr "Κεραία Λήψης"
+
+msgid "Reconnect this interface"
+msgstr "Επανασύνδεση της διεπαφής"
+
+msgid "Reconnecting interface"
+msgstr "Επανασύνδεση της διεπαφής"
+
+msgid "References"
+msgstr "Αναφορές"
+
+msgid "Regulatory Domain"
+msgstr "Ρυθμιστική Περιοχή"
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr "Απομακρυσμένη διεύθυνση IPv4"
+
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+msgid "Repeat scan"
+msgstr "Επανάληψη σάρωσης"
+
+msgid "Replace entry"
+msgstr "Αντικατάσταση καταχώρησης"
+
+msgid "Replace wireless configuration"
+msgstr "Αντικατάσταση ρυθμίσεων ασύρματης σύνδεσης"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr "Αρχικοποίηση"
+
+msgid "Reset Counters"
+msgstr "Αρχικοποίηση Μετρητών"
+
+msgid "Reset to defaults"
+msgstr "Αρχικοποίηση στις προεπιλεγμένες τιμές"
+
+msgid "Resolv and Hosts Files"
+msgstr "Αρχεία Resolv και Hosts"
+
+msgid "Resolve file"
+msgstr "Αρχείο Resolve"
+
+msgid "Restart"
+msgstr "Επανεκκίνηση"
+
+msgid "Restart Firewall"
+msgstr "Επανεκκίνηση Τείχους Προστασίας"
+
+msgid "Restore backup"
+msgstr "Επαναφορά αντιγράφου ασφαλείας"
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr "Αναίρεση"
+
+msgid "Root"
+msgstr "Root"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Κατάλογος Root για αρχεία που σερβίρονται μέσω TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Κωδικός Πρόσβασης Δρομολογητή"
+
+#, fuzzy
+msgid "Routes"
+msgstr "Διαδρομές"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Οι διαδρομές ορίζουν τη διεπαφή και πύλη από την οποία κάποιος υπολογιστής ή "
+"δίκτυο μπορεί να είναι προσβάσιμο/ς."
+
+msgid "Rule #"
+msgstr "Κανόνας #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Εκτέλεση ελέγχου του συστήματος αρχείων πριν προσαρτηθεί η συσκευή"
+
+msgid "Run filesystem check"
+msgstr "Εκτέλεση ελέγχου συστήματος αρχείων"
+
+msgid "SSH Access"
+msgstr "Πρόσβαση SSH"
+
+msgid "SSH-Keys"
+msgstr "Κλειδιά SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Αποθήκευση"
+
+msgid "Save & Apply"
+msgstr "Αποθήκευση & Εφαρμογή"
+
+msgid "Save &#38; Apply"
+msgstr "Αποθήκευση &#38; Εφαρμογή"
+
+msgid "Scan"
+msgstr "Σάρωση"
+
+msgid "Scheduled Tasks"
+msgstr "Προγραμματισμένες Εργασίες"
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr "Δείτε το manpage του \"mount\" για λεπτομέρειες"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+#, fuzzy
+msgid "Separate Clients"
+msgstr "Απομόνωση Πελατών"
+
+msgid "Separate WDS"
+msgstr "Ξεχωριστά WDS"
+
+msgid "Server Settings"
+msgstr "Ρυθμίσεις Εξυπηρετητή"
+
+msgid "Service Name"
+msgstr "Όνομα Υπηρεσίας"
+
+msgid "Service Type"
+msgstr "Είδος Υπηρεσίας"
+
+msgid "Services"
+msgstr "Υπηρεσίες"
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr "Ρύθμιση Εξυπηρετητή DHCP"
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr "Απενεργοποίηση αυτής της διεπαφής"
+
+msgid "Shutdown this network"
+msgstr "Απενεργοποίηση αυτού του δικτύου"
+
+msgid "Signal"
+msgstr "Σήμα"
+
+msgid "Signal:"
+msgstr "Σήμα:"
+
+msgid "Size"
+msgstr "Μέγεθος"
+
+msgid "Skip"
+msgstr "Παράκαμψη"
+
+msgid "Skip to content"
+msgstr "Παράκαμψη σε περιεχόμενο"
+
+msgid "Skip to navigation"
+msgstr "Παράκαμψη σε πλοήγηση"
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr "Λογισμικό"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Κάποια πεδία δεν είναι έγκυρα, δεν μπορούν να αποθηκευτούν οι τιμές!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr "Ταξινόμηση"
+
+msgid "Source"
+msgstr "Πηγή"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+#, fuzzy
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+"Προσδιορίζει την θύρα ακρόασης αυτού του στιγμιοτύπου <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr "Ορίστε το κρυφό κλειδί κρυπτογράφησης."
+
+msgid "Start"
+msgstr "Αρχή"
+
+msgid "Start priority"
+msgstr "Προτεραιότητα εκκίνησης"
+
+msgid "Startup"
+msgstr "Εκκίνηση"
+
+msgid "Static IPv4 Routes"
+msgstr "Στατικές Διαδρομές IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Στατικές Διαδρομές IPv6"
+
+msgid "Static Leases"
+msgstr "Στατικά Leases"
+
+msgid "Static Routes"
+msgstr "Στατικές Διαδρομές"
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr "Στατική διεύθυνση"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr "Κατάσταση"
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr "Αυστηρή σειρά"
+
+msgid "Submit"
+msgstr "Υποβολή"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr "Switch"
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr "Συγχρονισμός..."
+
+msgid "System"
+msgstr "Σύστημα"
+
+msgid "System Log"
+msgstr "Καταγραφή Συστήματος"
+
+msgid "System Properties"
+msgstr "Ιδιότητες Συστήματος"
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Ρυθμίσεις TFTP"
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr "Πίνακας"
+
+msgid "Target"
+msgstr "Στόχος"
+
+msgid "Terminate"
+msgstr "Τερματισμός"
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Οι επιτρεπόμενοι χαρακτήρες είναι: <code>A-Z</code>, <code>a-z</code>, "
+"<code>0-9</code> και <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"Το αρχείο συσκευής της μνήμης ή του διαμέρισματος (<abbr title="
+"\"παραδείγματος χάρην\">π.χ.</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Το σύστημα αρχείων που χρησιμοποιήθηκε για διαμόρφωση (<abbr title="
+"\"παραδείγματος χάρην\">π.χ.</abbr> <samp><abbr title=\"Third Extended "
+"Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr "Οι παρακάτω αλλαγές έχουν υποβληθεί"
+
+msgid "The following changes have been reverted"
+msgstr "Οι παρακάτω αλλαγές έχουν αναιρεθεί"
+
+msgid "The following rules are currently active on this system."
+msgstr "Οι παρακάτω κανόνες είναι αυτή τη στιγμή ενεργοί σε αυτό το σύστημα."
+
+msgid "The given network name is not unique"
+msgstr "Το παρεχόμενο όνομα δικτύου δεν είναι μοναδικό"
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Το σύστημα φλασάρετε τώρα.<br /> ΜΗ ΣΒΗΣΕΤΕ ΤΗΝ ΣΥΣΚΕΥΗ!<br /> Περιμένετε "
+"λίγα λεπτά για να δοκιμάσετε επανασύνδεση. Ανάλογα με τις ρυθμίσεις σας, "
+"είναι πιθανό να χρειαστεί να ανανεώσετε την διεύθυνση του υπολογιστή σας για "
+"να αποκτήσετε ξανά πρόσβαση στη συσκευή."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Η εικόνα που ανεβάσατε δεν περιέχει κάποια υποστηριζόμενη μορφή. Βεβαιωθείτε "
+"ότι επιλέξατε την γενική μορφή εικόνας για την πλατφόρμα σας."
+
+msgid "There are no active leases."
+msgstr "Δεν υπάρχουν ενεργά leases."
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Αυτός είναι ο μόνος <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> στο τοπικό δίκτυο"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Αυτό είναι το crontab του συστήματος στο οποίο μπορούν να οριστούν "
+"προγραμματισμένες εργασίες."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Αυτή η λίστα δίνει μία εικόνα των τρέχοντων εργασιών συστήματος και της "
+"κατάστασής τους."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Αυτή η σελίδα δίνει μία εικόνα για τις τρέχουσες ενεργές συνδέσεις δικτύου."
+
+msgid "This section contains no values yet"
+msgstr "Αυτό το τμήμα δεν περιέχει τιμές ακόμη"
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr "Ζώνη ώρας"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr "Διαθέσιμο Συνολικά"
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr "Κίνηση"
+
+msgid "Transfer"
+msgstr "Μεταφέρθηκαν"
+
+msgid "Transmission Rate"
+msgstr "Ρυθμός Εκπομπής"
+
+msgid "Transmit"
+msgstr "Εκπομπή"
+
+msgid "Transmit Power"
+msgstr "Ισχύς Εκπομπής"
+
+msgid "Transmitter Antenna"
+msgstr "Κεραία Εκπομπής"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr "Διεπαφή Τούνελ"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Λειτουργία Turbo"
+
+msgid "Tx-Power"
+msgstr "Ισχύς Εκπομπής"
+
+msgid "Type"
+msgstr "Τύπος"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "Συσκευή USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Άγνωστο Λάθος. ο κωδικός πρόσβασης δεν άλλαξε!"
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr "Μη-αποθηκευμένες Αλλαγές"
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr "Το Αρχείο Ανέβηκε"
+
+msgid "Uptime"
+msgstr "Χρόνος εν λειτουργία"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Χρήση <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Χρήση πύλης DHCP"
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr "Χρήση προεπιλεγμένης πύλης"
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr "Σε χρήση"
+
+msgid "Used Key Slot"
+msgstr "Χρησιμοποιούμενη Υποδοχή Κλειδιού"
+
+msgid "Username"
+msgstr "Όνομα Χρήστη"
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr "Διεπαφή VLAN"
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr "Εξυπηρετητής VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr "Έκδοση"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr "Μοιραζόμενο κλειδί WEP"
+
+msgid "WEP passphrase"
+msgstr "Κωδική φράση WEP"
+
+msgid "WMM Mode"
+msgstr "Υποστήριξη WMM"
+
+msgid "WPA passphrase"
+msgstr "Κωδική φράση WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Προειδοποίηση: Υπάρχουν μη-αποθηκευμένες αλλαγές που θα χαθούν κατά την "
+"επανεκκίνηση!"
+
+msgid "Wifi"
+msgstr "Ασύρματο"
+
+msgid "Wireless"
+msgstr "Ασύρματο"
+
+msgid "Wireless Adapter"
+msgstr "Ασύρματος Προσαρμογέας"
+
+msgid "Wireless Network"
+msgstr "Ασύρματο Δίκτυο"
+
+msgid "Wireless Overview"
+msgstr "Επισκόπηση Ασύρματου Δικτύου"
+
+msgid "Wireless Security"
+msgstr "Ασφάλεια Ασύρματου Δικτύου"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Το ασύρματο δίκτυο είναι απενεργοποιημένο ή μη συνδεδεμένο"
+
+msgid "Wireless is restarting..."
+msgstr "Το ασύρματο δίκτυο επανεκκινείται..."
+
+msgid "Wireless network is disabled"
+msgstr "Το ασύρματο δίκτυο είναι ανενεργό"
+
+msgid "Wireless network is enabled"
+msgstr "Το ασύρματο δίκτυο είναι ενεργό"
+
+msgid "Wireless restarted"
+msgstr "Το ασύρματο δίκτυο επανεκκινήθηκε"
+
+msgid "Wireless shut down"
+msgstr "Το ασύρματο δίκτυο τερματίστηκε"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Καταγραφή των ληφθέντων DNS αιτήσεων στο syslog"
+
+msgid "XR Support"
+msgstr "Υποστήριξη XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Μπορείτε να ενεργοποιήσετε ή να απενεργοποιήσετε σενάρια εκκίνησης εδώ. Οι "
+"αλλαγές θα εφαρμοστούν αφού επανεκκινήσετε τη συσκευή.<br /"
+"><strong>Προειδοποίηση: Αν απενεργοποιήσετε απαραίτητα σενάρια εκκίνησης "
+"όπως το \"network\", η συσκευή σας μπορεί να καταστεί μη-προσβάσιμη!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr "αυτόματα"
+
+#, fuzzy
+msgid "automatic"
+msgstr "στατικό"
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+#, fuzzy
+msgid "creates a bridge over specified interface(s)"
+msgstr "δημιουργεί μία γέφυρα μεταξύ των ορισμένων διεπαφών"
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr "ανενεργό"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"αρχείο όπου θα αποθηκεύονται τα Leases του <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>"
+
+msgid "forward"
+msgstr "προώθηση"
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr "βοήθεια"
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "αν ο στόχος είναι ένα δίκτυο"
+
+msgid "input"
+msgstr "είσοδος"
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "τοπικό αρχείο <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "no"
+msgstr "όχι"
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr "κανένα"
+
+msgid "off"
+msgstr "κλειστό"
+
+msgid "on"
+msgstr "ανοιχτό"
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr "απεριόριστα"
+
+msgid "unspecified"
+msgstr "μη-καθορισμένο"
+
+msgid "unspecified -or- create:"
+msgstr "μη-καθορισμένο -ή- δημιουργείστε:"
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr "ναι"
+
+msgid "« Back"
+msgstr "« Πίσω"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz με δεύτερο κανάλι υψηλότερα"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz με δεύτερο κανάλι χαμηλότερα"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Αποδοχή διαφημίσεων δρομολογητή"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Διαφήμιση IPv6 στο δίκτυο"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Διαφημιζόμενο αναγνωριστικό δικτύου"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Το επιτρεπόμενο εύρος είναι από 1 έως 65535"
+
+#~ msgid "Router Model"
+#~ msgstr "Μοντέλο Δρομολογητή"
+
+#~ msgid "Router Name"
+#~ msgstr "Όνομα Δρομολογητή"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Αναμονή για δρομολογητή..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Ενεργοποίηση ενσωματωμένου εξυπηρετητή NTP"
+
+#~ msgid "Active Leases"
+#~ msgstr "Ενεργά Leases"
+
+#~ msgid "Open"
+#~ msgstr "Άνοιγμα"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Ρυθμός Δεδομένων"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Παραμετροποίηση / Εφαρμογή"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Παραμετροποίηση / Αλλαγές"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Παραμετροποίηση / Επαναφορά"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "Διεύθυνση MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encrypted\">Κρυπτ.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "Σάρωση <abbr title=\"Wireless Local Area Network\">WLAN</abbr>"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Επιλέξατε το δίκτυο που επιθυμείτε να προσαρτήσετε σε αυτήν την ασύρματη "
+#~ "διεπαφή. Επιλέξτε <em>απροσδιόριστο</em> για να μην προσαρτηθεί "
+#~ "οποιοδήποτε ή συμπληρώστε το πεδίο <em>δημιουργία</em> για να "
+#~ "προσδιορίσετε ένα νέο δίκτυο."
+
+#~ msgid "Create Network"
+#~ msgstr "Δημιουργία Δικτύου"
+
+#~ msgid "Link"
+#~ msgstr "Ζεύξη"
+
+#~ msgid "Networks"
+#~ msgstr "Δίκτυα"
+
+#~ msgid "Power"
+#~ msgstr "Ισχύς"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Τοπικά Ασύρματα δίκτυα"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "Παράσταση <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
+#~ "διεύθυνση/πρόθεμα"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "Εξυπηρετητής <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Διεύθυνση <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Διαχείριση IPv6"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Σημείωση: Εάν επιλέξετε μια διεπαφή εδώ η οποία είναι μέρος ενός άλλου "
+#~ "δικτύου, θα μετακινηθεί σε αυτό το δίκτυο."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Οι πόρτες δικτύου του δρομολογητή σας μπορούν να συνδυαστούν σε πολλά "
+#~ "<abbr title=\"Virtual Local Area Network\">VLAN</abbr>s όπου οι "
+#~ "υπολογιστές να επικοινωνούν απευθείας μεταξύ τους. Τα <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s συχνά χρησιμοποιούνται για να "
+#~ "διαχωρίσουν διαφορετικά τμήματα του δικτύου. Συχνά υπάρχει μία "
+#~ "προεπιλεγμένη πόρτα Uplink για σύνδεση με ένα μεγαλύτερο δίκτυο όπως το "
+#~ "internet και άλλες πόρτες για σύνδεση με το τοπικό δίκτυο."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Ενεργοποίηση buffering"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6-over-IPv4"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Αρχεία που θα διατηρηθούν κατά το φλασάρισμα του firmware"
+
+#~ msgid "General"
+#~ msgstr "Γενικά"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Εδώ μπορείτε να προσαρμόσετε τις ρυθμίσεις και την λειτουργία του <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Ενέργειες μετά το commit"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Αυτές οι εντολές θα εκτελεστούν αυτόματα όταν μία ρύθμιση <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> γίνει commit επιτρέποντας "
+#~ "τις αλλαγές να εφαρμόζονται ακαριαία."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "Εξυπηρετητής <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Σημείο πρόσβασης (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Επιπλέον επιλογές pppd"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Αυτόματη Αποσύνδεση"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Αρχείο αντιγράφων ασφαλείας"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Ρύθμιση του τοπικού εξυπηρετητή DNS να χρησιμοποιεί τους εξυπηρετητές "
+#~ "ονόματος που διαφημίζει ο ομότιμος PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Σενάριο σύνδεσης"
+
+#~ msgid "Create backup"
+#~ msgstr "Δημιουργία αντίγραφου ασφαλείας"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Σενάριο αποσύνδεσης"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Επεξεργασία λίστας πακέτων και προορισμών εγκατάστασης"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Ενεργοποίηση IPv6 σε ζεύξη PPP"
+
+#~ msgid "Firmware image"
+#~ msgstr "Εικόνα firmware"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Εδώ μπορείτε να κρατήσετε και να επαναφέρετε αντίγραφα ασφαλείας των "
+#~ "παραμέτρων του δρομολογητή σας και - αν είναι δυνατόν - να επαναφέρετε "
+#~ "τον δρομολογητή στις προεπιλεγμένες ρυθμίσεις."
+
+#~ msgid "Installation targets"
+#~ msgstr "Προορισμοί εγκατάστασης"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Διατήρηση αρχείων παραμετροποίησης"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Το pppd να αντικαθιστά την τρέχουσα προεπιλεγμένη διαδρομή για να "
+#~ "χρησιμοποιείται η διεπαφή PPP μετά από επιτυχημένη σύνδεση"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "Το pppd να τρέχει αυτό το σενάριο όταν η ζεύξη PPP εγκαθιδρύεται"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Το pppd να τρέχει αυτό το σενάριο πριν η ζεύξη PPP κλείσει"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Εξασφαλίστε ότι δηλώνετε το σωστό κωδικό pin εδώ αλλιώς μπορεί να "
+#~ "κλειδώσετε την κάρτα sim σας!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "Οι περισσότεροι είναι εξυπηρετητές δικτύου που προσφέρουν κάποιες "
+#~ "συγκεκριμένες υπηρεσίες για την συσκευή ή το δίκτυο σας όπως πρόσβαση στο "
+#~ "κέλυφος, υπηρεσίες ιστοσελίδων σαν το <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>, δρομολόγηση mesh, αποστολή ηλ. ταχυδρομείου, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Αριθμός αποτυχημένων δοκιμών για την εφαρμογή της αυτόματης επανασύνδεσης"
+
+#~ msgid "PIN code"
+#~ msgstr "Κωδικός PIN"
+
+#~ msgid "Package lists"
+#~ msgstr "Λίστες Πακέτων"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr ""
+#~ "Θέλετε να προχωρήσετε στην αναίρεση όλων των ρυθμίσεων και την επαναφορά "
+#~ "στις προεπιλεγμένες για το firmware;"
+
+#~ msgid "Processor"
+#~ msgstr "Επεξεργαστής"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Θύρα Radius"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Εξυπηρετητής Radius"
+
+#~ msgid "Replace default route"
+#~ msgstr "Αντικατάσταση προεπιλεγμένης διαδρομής"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Επαναφορά δρομολογητή στα προεπιλεγμένα"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Δευτερόλεπτα αναμονής ώστε το modem να προετοιμαστεί πριν την προσπάθεια "
+#~ "για σύνδεση"
+
+#~ msgid "Service type"
+#~ msgstr "Τύπος υπηρεσίες"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr ""
+#~ "Οι υπηρεσίες και οι δαίμονες εκτελούν κάποιες συγκεκριμένες εργασίες στην "
+#~ "συσκευή σας."
+
+#~ msgid "Settings"
+#~ msgstr "Ρυθμίσεις"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Καθορισμός χρόνου αναμονής"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Συγνώμη. Το libreCMC δεν υποστηρίζει αναβάθμιση συστήματος σε αυτή την "
+#~ "πλατφόρμα.<br /> Χρειάζεται να φλασάρετε την συσκευή σας χειροκίνητα."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Ορισμός επιπλέον επιλογών pppd στην γραμμή εντολών"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Ο κόμβος συσκευής του modem σας, π.χ. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr ""
+#~ "Χρόνος (σε δευτερόλεπτα) ύστερα από τον οποίο οι αχρησιμοποίητες "
+#~ "συνδέσεις θα κλείνουν"
+
+#~ msgid "Update package lists"
+#~ msgstr "Ενημέρωση λίστας πακέτων"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Ανεβάστε ένα αρχείο εικόνας libreCMC για να φλασάρετε τη συσκευή."
+
+#~ msgid "Upload image"
+#~ msgstr "Ανέβασμα εικόνας"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Χρήση DNS ομότιμου"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Θα πρέπει να εγκαταστήσετε το \"comgt\" για υποστήριξη UMTS/GPRS, το "
+#~ "\"ppp-mod-pppoe\" για PPPoE, το \"ppp-mod-pppoa\" για PPPoA ή το \"pptp\" "
+#~ "για PPtP"
+
+#~ msgid "back"
+#~ msgstr "πίσω"
+
+#~ msgid "buffered"
+#~ msgstr "ενδιάμεση"
+
+#~ msgid "cached"
+#~ msgstr "λανθάνουσα"
+
+#~ msgid "free"
+#~ msgstr "ελεύθερη"
+
+#~ msgid "static"
+#~ msgstr "στατικό"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "Το <abbr title=\"Lua Configuration Interface\">LuCI</abbr> είναι μία "
+#~ "συλλογή από ελεύθερο λογισμικό Lua που συμπεριλαμβάνει ένα <abbr title="
+#~ "\"Model-View-Controller\">MVC</abbr>-Webframework και ένα περιβάλλον web "
+#~ "για embedded συσκευές. Το <abbr title=\"Lua Configuration Interface"
+#~ "\">LuCI</abbr> έχει άδεια λογισμικού Apache."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "Κλειδιά <abbr title=\"Secure Shell\">SSH</abbr>"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Ένας ελαφρύς εξυπηρετητής web HTTP/1.1 webserver γραμμένος σε C και Lua "
+#~ "και σχεδιασμένος να εξυπηρετεί το LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Ένας μικρός εξυπηρετητής web που μπορεί να χρησιμοποιηθεί για να "
+#~ "εξυπηρετεί το <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "Περί"
+
+#~ msgid "Addresses"
+#~ msgstr "Διευθύνσεις"
+
+#~ msgid "Admin Password"
+#~ msgstr "Κωδικός Διαχειριστή"
+
+#~ msgid "Alias"
+#~ msgstr "Ψευδώνυμο"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Realm Εξουσιοδότησης"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Πόρτα Γέφυρας"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Αλλαγή κωδικού πρόσβασης του διαχειριστή του συστήματος (Χρήστης "
+#~ "<code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Πελάτης + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Αρχείο Παραμετροποίησης"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Χρόνος λήξης σύνδεσης"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Συνεισφορές στην Ανάπτυξη"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "Ανάθεση από DHCP"
+
+#~ msgid "Document root"
+#~ msgstr "Ρίζα εγγράφων"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Ενεργοποίηση Keep-Alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Γέφυρα Ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Εδώ μπορείτε να επικολλήσετε δημόσια <abbr title=\"Secure Shell\">SSH</"
+#~ "abbr>-κλειδιά (ένα ανά γραμμή) για εξουσιοδότηση δημόσιου-κλειδιού <abbr "
+#~ "title=\"Secure Shell\">SSH</abbr>."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Ρυθμίσεις IP"
+
+#~ msgid "Interface Status"
+#~ msgstr "Κατάσταση Διεπαφής"
+
+#~ msgid "Lead Development"
+#~ msgstr "Επικεφαλής Ανάπτυξης"
+
+#~ msgid "Master"
+#~ msgstr "Σημείο Πρόσβασης"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Σημείο Πρόσβασης + WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "Μη-ρυθμισμένο"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Ο κωδικός πρόσβασης αλλάχτηκε επιτυχώς"
+
+#~ msgid "Plugin path"
+#~ msgstr "Διαδρομή προσθέτων"
+
+#~ msgid "Ports"
+#~ msgstr "Θύρες"
+
+#~ msgid "Primary"
+#~ msgstr "Κύριο"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Ιστοσελίδα του Πρότζεκτ"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Ψευδό Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Ευχαριστίες"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "Το realm που θα εμφανίζεται κατά την προτροπή για εξουσιοδότηση για τις "
+#~ "προστατευμένες σελίδες."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Άγνωστο Σφάλμα"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "προεπιλεγμένο <code>/etc/httpd.conf</code>"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Η λίστα πακέτων ενημερώθηκε"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Αναβάθμιση εγκατεστημένων πακέτων"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Επίσης εδώ μπορείτε να δείτε τα αρχεία καταγραφής του πυρήνα ή των "
+#~ "υπηρεσιών ώστε να έχετε μια εικόνα για την τρέχουσα κατάσταση."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Εδώ μπορείτε να βρείτε πληροφορίες για την τρέχουσα κατάσταση του "
+#~ "συστήματος όπως την συχνότητα της <abbr title=\"Central Processing Unit"
+#~ "\">CPU</abbr>, τη χρήση μνήμης ή τον όγκο δεδομένων των διεπαφών δικτύου."
+
+#~ msgid "Search file..."
+#~ msgstr "Εύρεση αρχείου..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "Το <abbr title=\"Lua Configuration Interface\">LuCI</abbr> είναι ένα "
+#~ "ελεύθερο, ευέλικτο, και φιλικό προς το χρήστη γραφικό περιβάλλον για την "
+#~ "παραμετροποίηση του libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "Και τώρα διασκεδάστε με τον δρομολογητή σας!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Θέλοντας πάντα να βελτιώνουμε αυτό το περιβάλλον, περιμένουμε την "
+#~ "ανάδραση και τις προτάσεις σας."
+
+#~ msgid "Hello!"
+#~ msgstr "Γεια σας!"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Σημείωση: Πριν εφαρμοστούν οι αλλαγές στο <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> πρέπει να επιβεβαιωθούν κλικάροντας το Αλλαγές - "
+#~ "Αποθήκευση &amp; Εφαρμογή."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Στις επόμενες σελίδες μπορείτε να προσαρμόζετε τις πιο σημαντικές "
+#~ "ρυθμίσεις του δρομολογητή σας."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "Η ομάδα του <abbr title=\"Lua Configuration Interface\">LuCI</abbr>"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Αυτός είναι ο χώρος διαχείρισης του <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Περιβάλλον Χρήστη"
+
+#~ msgid "enable"
+#~ msgstr "ενεργό"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr " (προαιρετικό)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "Θύρα <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "Ο εξυπηρετητής <abbr title=\"Domain Name System\">DNS</abbr> θα ερωτάται "
+#~ "με την σειρά που δηλώνεται στο αρχείο resolv"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"μέγιστα\">μεγ.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "<abbr title=\"μέγιστο\">μεγ.</abbr> μέγεθος πακέτου <abbr title="
+#~ "\"Extension Mechanisms for Domain Name System\">EDNS0</abbr>"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "Απομόνωση AP"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Προσθήκη Ασύρματου δικτύου σε φυσικό δίκτυο"
+
+#~ msgid "Aliases"
+#~ msgstr "Ψευδώνυμα"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Μέγεθος Τμήματος Τεμαχισμού"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Δημιουργία Δικτύου"
+
+#~ msgid "Devices"
+#~ msgstr "Συσκευές"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Να μην προωθούνται αντίστροφες αναζητήσεις για τοπικά δίκτυα"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Ενεργός εξυπηρετητής TFTP"
+
+#~ msgid "Errors"
+#~ msgstr "Λάθη"
+
+#~ msgid "Essentials"
+#~ msgstr "Βασικά"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Ανάπτυξη ονομάτων υπολογιστών"
+
+#~ msgid "First leased address"
+#~ msgstr "Πρώτη διεύθυνση lease"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Επιλύει προβλήματα με μη-προσβάσιμους ιστοχώρους, την υποβολή φορμών ή "
+#~ "άλλες απροσδόκητες συμπεριφορές κάποιων ISP."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Διεύθυνση Υλικού"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Εδώ μπορείτε να ρυθμίσετε τις εγκατεστημένες ασύρματες συσκευές."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Αγνόησε <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Ανεξάρτητο (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Σύνδεση με Διαδίκτυο"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Συμμετοχή (Πελάτης)"
+
+#~ msgid "Leases"
+#~ msgstr "Leases"
+
+#~ msgid "Local Domain"
+#~ msgstr "Τοπικό Όνομα Τομέα"
+
+#~ msgid "Local Network"
+#~ msgstr "Τοπικό Δίκτυο"
+
+#~ msgid "Local Server"
+#~ msgstr "Τοπικός Διακομιστής"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Εικόνα Εκκίνησης Δικτύου"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Όνομα Δικτύου (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Αριθμός διευθύνσεων lease"
+
+#~ msgid "Path"
+#~ msgstr "Διαδρομή"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Εκτέλεση Ενεργειών"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Αποτρέπει την επικοινωνία μεταξύ Πελατών"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Παροχή (Σημείο Πρόσβασης)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Αρχείο Resolv"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Ρίζα εξυπηρετητή TFTP"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Οι παρακάτω αλλαγές έχουν εφαρμοστεί"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Τα παρακάτω αρχεία θα διατηρούνται όταν φλασάρεται το firmware μέσω του "
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
+
+#, fuzzy
+#~ msgid "Wireless Scan"
+#~ msgstr "Ασύρματο"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Με τον <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> τα "
+#~ "μέλη του δικτύου μπορούν αυτόματα να λάβουν τις ρυθμίσεις δικτύου τους "
+#~ "(διεύθυνση <abbr title=\"Internet Protocol\">IP</abbr>, μάσκα δικτύου, "
+#~ "εξυπηρετητή <abbr title=\"Domain Name System\">DNS</abbr>, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Μια συσκευή μπορεί να λειτουργεί σε πολλά ασύρματα δίκτυα. Προσοχή όμως "
+#~ "γιατί υπάρχουν κάποιοι περιορισμοί από το υλικό και τον οδηγό. Κανονικά, "
+#~ "μπορούν να λειτουργούν: 1 δίκτυο Ad-Hoc ή μέχρι 3 δίκτυα AP και 1 πελάτη "
+#~ "ταυτόχρονα."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Χρειάζεται να εγκαταστήσετε το \"ppp-mod-pppoe\" για υποστήριξη PPPoE ή "
+#~ "το \"pptp\" για υποστήριξη PPtP"
+
+#~ msgid "additional hostfile"
+#~ msgstr "επιπλέον αρχείο ονομάτων υπολογιστών"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "προσθέτει τα ονόματα τομέα στις καταχωρήσεις του αρχείου resolv"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "αυτόματη επανασύνδεση"
+
+#~ msgid "concurrent queries"
+#~ msgstr "ταυτόχρονα ερωτήματα"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "απενεργοποίηση <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+#~ "abbr> για αυτή τη διεπαφή"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "αποσύνδεση όταν είναι αδρανές για"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "να μην διατηρούνται στην λανθάνουσα μνήμη τα άγνωστα"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "φιλτράρισμα άχρηστων ερωτημάτων <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr> των συστημάτων Windows"
+
+#~ msgid "installed"
+#~ msgstr "εγκατεστημένο"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "επιτρέπει τοπικό όνομα υπολογιστή με βάση το υποδίκτυο του"
+
+#~ msgid "not installed"
+#~ msgstr "μη-εγκατεστημένο"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "αποτρέπει τη διατήρηση των αρνητικών απαντήσεων <abbr title=\"Domain Name "
+#~ "System\">DNS</abbr> στην λανθάνουσα μνήμη"
+
+#~ msgid "query port"
+#~ msgstr "θύρα ερωτημάτων"
+
+#~ msgid "transmitted / received"
+#~ msgstr "απεσταλμένα / ληφθέντα"
+
+#~ msgid "Console Log Level"
+#~ msgstr "Επίπεδο Καταγραφής Τερματικού"
+
+#~ msgid "Log Size"
+#~ msgstr "Μέγεθος Αρχείου Καταγραφής"
+
+#~ msgid "Remote Syslog IP"
+#~ msgstr "Διεύθυνση Απομακρυσμένου Syslog"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "Δίκτυο"
+
+#~ msgid "all"
+#~ msgstr "όλα"
+
+#~ msgid "Code"
+#~ msgstr "Κωδικός"
+
+#~ msgid "Distance"
+#~ msgstr "Απόσταση"
+
+#~ msgid "Legend"
+#~ msgstr "Υπόμνημα"
+
+#~ msgid "Library"
+#~ msgstr "Βιβλιοθήκη"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "βλέπε &#39;%s&#39; manpage"
+
+#~ msgid "Package Manager"
+#~ msgstr "Διαχειριστής Πακέτων"
+
+#~ msgid "Service"
+#~ msgstr "Υπηρεσία"
+
+#~ msgid "Statistics"
+#~ msgstr "Στατιστικά"
+
+#~ msgid "zone"
+#~ msgstr "Ζώνη"
diff --git a/trunk/package/luci/po/el/commands.po b/trunk/package/luci/po/el/commands.po
new file mode 100644
index 00000000..0e9e65d2
--- /dev/null
+++ b/trunk/package/luci/po/el/commands.po
@@ -0,0 +1,91 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/el/coovachilli.po b/trunk/package/luci/po/el/coovachilli.po
new file mode 100644
index 00000000..871483bf
--- /dev/null
+++ b/trunk/package/luci/po/el/coovachilli.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-03-19 15:27+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
+
+#~ msgid "General configuration"
+#~ msgstr "Γενική παραμετροποίηση"
+
+#~ msgid "DHCP configuration"
+#~ msgstr "Παραμετροποίηση DHCP"
+
+#~ msgid "DHCP interface"
+#~ msgstr "Διεπαφή DHCP"
+
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Ενεργοποίηση IEEE 802.1x"
+
+#~ msgid "Admin password"
+#~ msgstr "Κωδικός πρόσβασης διαχειριστή"
+
+#~ msgid "Location name"
+#~ msgstr "Όνομα τοποθεσίας"
+
+#~ msgid "CGI program"
+#~ msgstr "Πρόγραμμα CGI"
+
+#~ msgid "Password"
+#~ msgstr "Κωδικός πρόσβασης"
diff --git a/trunk/package/luci/po/el/ddns.po b/trunk/package/luci/po/el/ddns.po
new file mode 100644
index 00000000..028c4b47
--- /dev/null
+++ b/trunk/package/luci/po/el/ddns.po
@@ -0,0 +1,90 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2012-03-18 17:08+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Check for changed IP every"
+msgstr "Έλεγχος για αλλαγή IP κάθε"
+
+msgid "Check-time unit"
+msgstr "Μονάδα χρόνου ελέγχου"
+
+msgid "Custom update-URL"
+msgstr "Προσαρμοσμένο URL-ενημέρωσης"
+
+msgid "Dynamic DNS"
+msgstr "Δυναμικό DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Το Δυναμικό DNS επιτρέπει στον δρομολογητή σας να είναι προσβάσιμος μέσω "
+"ενός σταθερού ονόματος υπολογιστή παρόλο που η διεύθυνση IP του μπορεί να "
+"αλλάζει δυναμικά."
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid "Force update every"
+msgstr "Εξαναγκασμός ενημέρωσης κάθε"
+
+#, fuzzy
+msgid "Force-time unit"
+msgstr "Μονάδα χρόνου εξαναγκαστικής ενημέρωσης"
+
+msgid "Hostname"
+msgstr "Όνομα υπολογιστή"
+
+msgid "Interface"
+msgstr "Διεπαφή"
+
+msgid "Network"
+msgstr "Δίκτυο"
+
+msgid "Password"
+msgstr "Κωδικός πρόσβασης"
+
+msgid "Service"
+msgstr "Υπηρεσία"
+
+#, fuzzy
+msgid "Source of IP address"
+msgstr "Πηγή της διεύθυνσης IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Όνομα χρήστη"
+
+msgid "custom"
+msgstr "προσαρμοσμένο"
+
+# Hours
+msgid "h"
+msgstr "ω"
+
+msgid "interface"
+msgstr "διεπαφή"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "λεπτά"
+
+msgid "network"
+msgstr "δίκτυο"
+
+#, fuzzy
+#~ msgid "ddns_service_updateurl"
+#~ msgstr "Προσαρμογή URL ενημέρωσης"
diff --git a/trunk/package/luci/po/el/diag_core.po b/trunk/package/luci/po/el/diag_core.po
new file mode 100644
index 00000000..f6470ad2
--- /dev/null
+++ b/trunk/package/luci/po/el/diag_core.po
@@ -0,0 +1,38 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 14:53+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configure Diagnostics"
+msgstr "Ρύθμιση Διαγνωστικών"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Η καταχωρήσεις στο μενού, σας επιτρέπουν να προβαίνετε σε διαγνωστικές "
+"δοκιμές στο σύστημά σας, για την διευκόλυνση αντιμετώπισης προβλημάτων."
+
+#, fuzzy
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Με αυτό το μενού, μπορείτε να παραμετροποιήσετε διαγνωστικά δικτύου, όπως "
+"σαρώσεις συσκευών δικτύου και δοκιμές ping."
diff --git a/trunk/package/luci/po/el/diag_devinfo.po b/trunk/package/luci/po/el/diag_devinfo.po
new file mode 100644
index 00000000..b77d6c9a
--- /dev/null
+++ b/trunk/package/luci/po/el/diag_devinfo.po
@@ -0,0 +1,209 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-19 15:30+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr "Προσθήκη"
+
+msgid "Beginning of MAC address range"
+msgstr "Αρχή εύρους διευθύνσεων MAC"
+
+msgid "Config Phone Scan"
+msgstr "Ρύθμιση Σάρωσης Τηλεφώνων"
+
+msgid "Configure"
+msgstr "Παραμετροποίηση"
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "Διαγραφή"
+
+msgid "Device Scan Config"
+msgstr "Ρύθμιση Σάρωσης Συσκευών"
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr "Συσκευές στο Δίκτυο"
+
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid "End of MAC address range"
+msgstr "Τέλος εύρους διευθύνσεων MAC"
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Διεύθυνση IP"
+
+msgid "Interface"
+msgstr "Διεπαφή"
+
+msgid "Invalid"
+msgstr "Μη έγκυρο"
+
+msgid "Link to Device"
+msgstr "Ζεύξη με Συσκευή"
+
+msgid "MAC Address"
+msgstr "Διεύθυνση MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr "Όνομα"
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr "Δεν υπάρχουν συσκευές SIP"
+
+msgid "No devices detected"
+msgstr "Δεν ανιχνεύτηκαν συσκευές"
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr "Ιδιοκτήτης OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr "Πληροφορίες Τηλεφώνου"
+
+msgid "Phone Scan"
+msgstr "Σάρωση Τηλεφώνων"
+
+msgid "Phone Scanning Configuration"
+msgstr "Παραμετροποίηση Σάρωσης Τηλεφώνων"
+
+msgid "Phones"
+msgstr "Τηλέφωνα"
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr "Ανεπεξέργαστα"
+
+msgid "Repeat Count"
+msgstr "Επανάληψη Μέτρησης"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr "Πληροφορίες Συσκευής SIP"
+
+msgid "SIP Device Scan"
+msgstr "Σάρωση για συσκευές SIP"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Παραμετροποίηση Σάρωσης Συσκευών SIP"
+
+msgid "SIP Devices on Network"
+msgstr "Συσκευές SIP στο Δίκτυο"
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr "Σάρωση για συσκευές σε καθορισμένα δίκτυα."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr "Scans for devices on specified networks."
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr "Υποδίκτυο"
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr "έλεγχος άλλων δικτύων"
diff --git a/trunk/package/luci/po/el/ffwizard.po b/trunk/package/luci/po/el/ffwizard.po
new file mode 100644
index 00000000..fccd3417
--- /dev/null
+++ b/trunk/package/luci/po/el/ffwizard.po
@@ -0,0 +1,181 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-31 15:37+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Να επιτρέπεται η μεταφορά ανώνυμων στατιστικών αυτού του κόμβου"
+
+msgid "Channel"
+msgstr "Κανάλι"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Επιλέξτε για να προστατέψετε το LAN σας από άλλους κόμβους ή πελάτες"
+
+msgid "Configure network"
+msgstr "Παραμετροποίηση δικτύου"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+"Συνδέστε τον κόμβο σας με άλλους κόμβους χρησιμοποιώντας τούνελ μέσω του "
+"διαδικτύου."
+
+msgid "DHCP IP range"
+msgstr "Εύρος DHCP IP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "Το DHCP θα αποδώσει αυτόματα διευθύνσεις ip στους πελάτες"
+
+msgid "DNS Server"
+msgstr "Εξυπηρετητής DNS"
+
+msgid "Enable DHCP"
+msgstr "Ενεργοποίηση DHCP"
+
+msgid "Gateway"
+msgstr "Πύλη"
+
+msgid "Heartbeat"
+msgstr "Καρδιακός Παλμός"
+
+msgid "IP address"
+msgstr "Διεύθυνση IP"
+
+msgid "L2gvpn tunnel"
+msgstr "Τούνελ L2gvpn"
+
+msgid "Limit download bandwidth"
+msgstr "Περιορισμός ταχύτητας κατεβάσματος"
+
+msgid "Limit upload bandwidth"
+msgstr "Περιορισμός ταχύτητας ανεβάσματος"
+
+msgid "Mesh IP address"
+msgstr "IP διεύθυνση πλέγματος"
+
+msgid "Mesh IPv6 Address"
+msgstr "IPv6 Διεύθυνση Δικτύου Πλέγματος"
+
+msgid "Netmask"
+msgstr "Μάσκα δικτύου"
+
+msgid "Password"
+msgstr "Κωδικός πρόσβασης"
+
+msgid "Password confirmation"
+msgstr "Επιβεβαίωση κωδικού πρόσβασης"
+
+msgid "Password successfully changed"
+msgstr "Ο κωδικός πρόσβασης άλλαξε επιτυχώς"
+
+msgid "Protect LAN"
+msgstr "Προστασία LAN"
+
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Επιλέξτε για να παραμετροποιήσετε τις διεπαφές δικτύου."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Επιλέξτε για να επιτρέπεται σε άλλους να χρησιμοποιήσουν την σύνδεσή σας για "
+"πρόσβαση στο διαδίκτυο."
+
+msgid "Share your internet connection"
+msgstr "Διαμοιρασμός σύνδεσης διαδικτύου"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Το εύρος IP από το οποίο θα αποδίδονται στους πελάτες διευθύνσεις ip (π.χ. "
+"10.1.2.1/28). Εάν αυτό είναι εύρος εντός του δικτύου πλέγματος, τότε θα "
+"ανακοινώνεται ως HNA. Οποιοδήποτε άλλο εύρος θα χρησιμοποιεί το NAT. Εάν "
+"αφεθεί κενό τότε θα χρησιμοποιηθούν οι ρυθμίσεις από το προφίλ κοινότητας."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "Η διεύθυνση ipv6 υπολογίζεται αυτόματα."
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+"Το πρωτόκολλο που θα χρησιμοποιήσετε για την διαδικτυακή συνδεσιμότητα. "
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Αυτή είναι μία μοναδική διεύθυνση στο πλέγμα (π.χ 10.1.1.1) και πρέπει να "
+"καταχωρηθεί στην τοπική σας κοινότητα."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Αυτή η επιλογή θα ρυθμίσει μία νέα εικονική ασύρματη διεπαφή σε λειτουργία "
+"Σημείου Πρόσβασης. "
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Αυτός ο οδηγός θα σας βοηθήσει να στήσετε το δρομολογητής σας για το "
+"Freifunk  ή άλλο παρόμοιο δίκτυο."
+
+msgid "Unknown Error"
+msgstr "Άγνωστο Σφάλμα"
+
+msgid "Username"
+msgstr "Όνομα χρήστη"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Εικονικό Σημείο Πρόσβασης (VAP)"
+
+msgid "Wizard"
+msgstr "Οδηγός"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+"Η συσκευή σας και οι γειτονικοί σας κόμβοι πρέπει να χρησιμοποιούν το ίδιο "
+"κανάλι."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "στατικό"
+
+msgid "Configure this interface."
+msgstr "Παραμετροποίηση αυτής της διεπαφής."
+
+msgid "recommended"
+msgstr "προτεινόμενο"
+
+msgid "Basic settings"
+msgstr "Βασικές ρυθμίσεις"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Οι βασικές ρυθμίσεις είναι ημιτελείς. Παρακαλώ προχωρήστε στο"
+
+msgid "Error"
+msgstr "Σφάλμα"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+"Δεν μπορείτε να χρησιμοποιήσετε τον οδηγό γιατί κάποιες απαραίτητες τιμές "
+"δεν έχουν συμπληρωθεί."
+
+msgid "and fill out all required fields."
+msgstr "και συμπληρώστε όλα τα απαραίτητα πεδία."
diff --git a/trunk/package/luci/po/el/firewall.po b/trunk/package/luci/po/el/firewall.po
new file mode 100644
index 00000000..7680dfbf
--- /dev/null
+++ b/trunk/package/luci/po/el/firewall.po
@@ -0,0 +1,638 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2012-03-31 15:40+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr "%s%s με %s"
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr "-- Παρακαλώ επιλέξτε --"
+
+msgid "-- custom --"
+msgstr "-- προσαρμοσμένο --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> πκτ. ανά <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr "Ενέργεια"
+
+msgid "Add"
+msgstr "Προσθήκη"
+
+msgid "Add and edit..."
+msgstr "Προσθήκη και επεξεργασία..."
+
+msgid "Advanced Settings"
+msgstr "Ρυθμίσεις για προχωρημένους"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr "Οποιοδήποτε"
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr "Προσαρμοσμένοι Κανόνες"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr "Διεύθυνση IP προορισμού"
+
+msgid "Destination address"
+msgstr "Διεύθυνση προορισμού"
+
+msgid "Destination port"
+msgstr "Θύρα προορισμού"
+
+#, fuzzy
+msgid "Destination zone"
+msgstr "Ζώνη προορισμού"
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Αγνόηση μη-έγκυρων πακετών"
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+#, fuzzy
+msgid "Enable SYN-flood protection"
+msgstr "Προστασία SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr "Εξωτερική διεύθυνση IP"
+
+msgid "External port"
+msgstr "Εξωτερική θύρα"
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr "Επιπλέον παράμετροι"
+
+msgid "Firewall"
+msgstr "Τείχος προστασίας"
+
+msgid "Firewall - Custom Rules"
+msgstr "Τείχος προστασίας - Προσαρμοσμένοι Κανόνες"
+
+msgid "Firewall - Port Forwards"
+msgstr "Τείχος προστασίας - Προώθηση Θυρών"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Τείχος προστασίας - Κανόνες Κίνησεις"
+
+msgid "Firewall - Zone Settings"
+msgstr "Τείχος προστασίας - Ρυθμίσεις Ζώνης"
+
+msgid "Force connection tracking"
+msgstr "Επιβολή παρακολούθησης σύνδεσης"
+
+msgid "Forward"
+msgstr "Προώθηση"
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr "Απο %s στο %s"
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Γενικές Ρυθμίσεις"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 και IPv6"
+
+msgid "IPv4 only"
+msgstr "Μόνο IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Μόνο IPv6"
+
+msgid "Input"
+msgstr "Είσοδος"
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#, fuzzy
+msgid "Internal IP address"
+msgstr "Εσωτερική διεύθυνση"
+
+#, fuzzy
+msgid "Internal port"
+msgstr "Εξωτερική θύρα"
+
+msgid "Internal zone"
+msgstr "Εσωτερική ζώνη"
+
+msgid "Limit log messages"
+msgstr "Περιορισμός καταγραφών συστήματος"
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "Περιορισμός MSS"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr "Όνομα"
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr "Άλλο..."
+
+msgid "Output"
+msgstr "Έξοδος"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr "Προώθηση Θυρών"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+#, fuzzy
+msgid "Source IP address"
+msgstr "Διεύθυνση MAC πηγής"
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Διεύθυνση MAC πηγής"
+
+msgid "Source port"
+msgstr "Θύρα πηγής"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Θύρα πηγής"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
+"ελέγχει την δικτυακή κίνηση."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Ζώνες"
+
+msgid "accept"
+msgstr "αποδοχή"
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr "αγνόηση"
+
+msgid "reject"
+msgstr "απόρριψη"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Προορισμός"
+
+#~ msgid "Family"
+#~ msgstr "Οικογένεια"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "Προώθηση του %s στο %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "Προώθηση στο %s, %s στο %s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Πηγή"
+
+#~ msgid "To %s"
+#~ msgstr "Προς %s"
+
+#~ msgid "Accept forward"
+#~ msgstr "Αποδοχή προώθησης"
+
+#~ msgid "Accept input"
+#~ msgstr "Αποδοχή εισόδου"
+
+#~ msgid "Disable"
+#~ msgstr "Απενεργοποίηση"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "Εύρος IP"
+
+#~ msgid "IPs"
+#~ msgstr "IPs"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "MACs"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Άρνηση προώθησης"
+
+#~ msgid "Refuse input"
+#~ msgstr "Άρνηση εισόδου"
+
+#~ msgid "day"
+#~ msgstr "ημέρα"
+
+#~ msgid "hour"
+#~ msgstr "ώρα"
+
+#~ msgid "minute"
+#~ msgstr "λεπτό"
+
+#~ msgid "port"
+#~ msgstr "θύρα"
+
+#~ msgid "ports"
+#~ msgstr "θύρες"
+
+#~ msgid "second"
+#~ msgstr "δευτερόλεπτο"
+
+#~ msgid "type"
+#~ msgstr "τύπος"
+
+#~ msgid "types"
+#~ msgstr "τύποι"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Εσωτερική θύρα (προαιρετικό)"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Προχωρημένοι Κανόνες"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Οι προχωρημένοι κανόνες σας επιτρέπουν να προσαρμόσετε το τείχος "
+#~ "προστασίας στις δικές σας ανάγκες. Οι κανόνες θα εφαρμόζονται μόνο στις "
+#~ "νέες συνδέσεις. Πακέτα που ανήκουν σε ήδη ανοιχτές συνδέσεις, θα περνάνε "
+#~ "αυτόματα το τείχος προστασίας."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Προώθηση θυρών"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Η προώθηση θυρών επιτρέπει σε υπηρεσίες δικτύου που λειτουργούν μέσα σε "
+#~ "ένα εσωτερικό δίκτυο, να γίνονται διαθέσιμες και σε ένα εξωτερικό."
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Ανακατεύθυνση Κίνησης"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Η ανακατεύθυνση κίνησης σας επιτρέπει να αλλάξετε την διεύθυνση "
+#~ "προορισμού των προωθημένων πακέτων."
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Δίκτυα"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Έλεγχος Κίνησης"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Κίνηση Ζώνης-προς-Ζώνη"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Εδώ μπορείτε να ορίσετε τι δικτυακή κίνηση επιτρέπεται μεταξύ δικτυακών "
+#~ "ζωνών. Θα εφαρμόζεται μόνο σε νέες συνδέσεις. Πακέτα που ανήκουν σε ήδη "
+#~ "ανοιχτές συνδέσεις θα περνάνε αυτόματα το τείχος προστασίας. Αν "
+#~ "αντιμετωπίζεται σποραδικά προβλήματα με τη σύνδεσή σας, δοκιμάστε να "
+#~ "ενεργοποιήσετε τον Περιορισμό MSS, αλλιώς απενεργοποιήστε το για "
+#~ "μεγαλύτερη απόδοση."
+
+#~ msgid "Zone"
+#~ msgstr "Ζώνη"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Προορισμός"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Διεύθυνση IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Διεύθυνση MAC πηγής"
+
+#~ msgid "Custom forwarding"
+#~ msgstr "Προσαρμοσμένη προώθηση"
+
+#~ msgid "Input Zone"
+#~ msgstr "Ζώνη Εισόδου"
+
+#~ msgid "Output Zone"
+#~ msgstr "Ζώνη Εξόδου"
+
+#~ msgid "External Zone"
+#~ msgstr "Εξωτερική Ζώνη"
+
+#~ msgid "Source MAC"
+#~ msgstr "MAC πηγής"
+
+#~ msgid "Defaults"
+#~ msgstr "Προκαθορισμένα"
+
+#~ msgid ""
+#~ "These are the default settings that are used if no other rules match."
+#~ msgstr ""
+#~ "Αυτές είναι οι προκαθορισμένες ρυθμίσεις που χρησιμοποιούνται αν δεν "
+#~ "υπάρχει κάποιος άλλος κανόνας που ταιριάζει."
+
+#~ msgid ""
+#~ "Zones part the network interfaces into certain isolated areas to separate "
+#~ "network traffic. One or more networks can belong to a zone. The MASQ-flag "
+#~ "enables NAT masquerading for all outgoing traffic on this zone."
+#~ msgstr ""
+#~ "Οι ζώνες χωρίζουν τις δικτυακές διεπαφές σε απομονωμένες περιοχές ώστε να "
+#~ "διαχωρίζεται η δικτυακή κίνηση. Σε μία ζώνη μπορούν να ανήκουν ένα ή "
+#~ "περισσότερα δίκτυα. Η σημαία MASQ ενεργοποιεί NAT masquerading για όλη "
+#~ "την εξερχόμενη κίνηση της ζώνης."
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
+
+#~ msgid "contained networks"
+#~ msgstr "δίκτυα που περιέχονται"
diff --git a/trunk/package/luci/po/el/freifunk-policyrouting.po b/trunk/package/luci/po/el/freifunk-policyrouting.po
new file mode 100644
index 00000000..3c9a17e0
--- /dev/null
+++ b/trunk/package/luci/po/el/freifunk-policyrouting.po
@@ -0,0 +1,39 @@
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/el/freifunk.po b/trunk/package/luci/po/el/freifunk.po
new file mode 100644
index 00000000..e484821e
--- /dev/null
+++ b/trunk/package/luci/po/el/freifunk.po
@@ -0,0 +1,407 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-18 15:11+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr "Βασικές Ρυθμίσεις"
+
+msgid "Basic settings"
+msgstr "Βασικές ρυθμίσεις"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr "Βασικές ρυθμίσεις συστήματος"
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr "Κανάλι"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr "Κοινότητα"
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr "Επικοινωνία"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr "Συντεταγμένες"
+
+msgid "Country code"
+msgstr "Κωδικός xώρας"
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr "Ηλ. Ταχυδρομείο"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "Σφάλμα"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr "Πύλη"
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr "Γεια σας και καλώς ήλθατε στο δίκτυο"
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr "Αν ενδιαφέρεστε για το έργο μας, επικοινωνήστε με την τοπική κοινότητα"
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr "Διεπαφή"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Η πρόσβαση στο διαδίκτυο εξαρτάται από τις τεχνικές και τις οργανωτικές "
+"συνθήκες και μπορεί να λειτουργεί ή όχι για σας."
+
+msgid "It is operated by"
+msgstr "Διαχειρίζεται από"
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr "Γεωγραφικό πλάτος"
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr "Τοπική Ώρα"
+
+msgid "Location"
+msgstr "Τοποθεσία"
+
+msgid "Longitude"
+msgstr "Γεωγραφικό μήκος"
+
+msgid "Map"
+msgstr "Χάρτης"
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr "Μνήμη"
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr "Δίκτυο"
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr "Σημείωση"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr "Επεξεργαστής"
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr "Ονοματεπώνυμο"
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr "Σήμα"
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr "Στατιστικά"
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr "Σύστημα"
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr "Αυτές είναι οι ρυθμίσεις της τοπικής σας κοινότητας."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Αυτές οι σελίδες θα σας βοηθήσουν να ρυθμίσετε το δρομολογητή σας για το "
+"Freifunk ή παρόμοια ασύρματα κοινοτικά δίκτυα."
+
+msgid "This is the access point"
+msgstr "Αυτό είναι το access point"
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Είμαστε μία πρωτοβουλία για την εδραίωση ενός ελεύθερου, ανεξάρτητου και "
+"ανοιχτού ασύρματου mesh δικτύου."
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+"Μπορείτε να βρείτε περισσότερες πληροφορίες για την παγκόσμια πρωτοβουλία "
+"Freifunk στο"
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr "π.χ."
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
+
+#~ msgid "Source"
+#~ msgstr "Πηγή"
diff --git a/trunk/package/luci/po/el/hd_idle.po b/trunk/package/luci/po/el/hd_idle.po
new file mode 100644
index 00000000..8c280552
--- /dev/null
+++ b/trunk/package/luci/po/el/hd_idle.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-03-18 15:14+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Disk"
+msgstr "Δίσκος"
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid "Enable debug"
+msgstr "Ενεργοποίηση αποσφαλμάτωσης"
+
+msgid "Idle-time"
+msgstr ""
+
+msgid "Idle-time unit"
+msgstr ""
+
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+# Hours
+msgid "h"
+msgstr "ω"
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "λεπτά"
diff --git a/trunk/package/luci/po/el/meshwizard.po b/trunk/package/luci/po/el/meshwizard.po
new file mode 100644
index 00000000..cf1ce9f4
--- /dev/null
+++ b/trunk/package/luci/po/el/meshwizard.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-18 15:14+0200\n"
+"PO-Revision-Date: 2012-03-31 15:40+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr "Κανάλι"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr "Καθαρισμός ρυθμίσεων"
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr "Ενεργοποίηση DHCP"
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Γενικές Ρυθμίσεις"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Διεπαφές"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/el/minidlna.po b/trunk/package/luci/po/el/minidlna.po
new file mode 100644
index 00000000..48c61883
--- /dev/null
+++ b/trunk/package/luci/po/el/minidlna.po
@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/el/mmc_over_gpio.po b/trunk/package/luci/po/el/mmc_over_gpio.po
new file mode 100644
index 00000000..8aadeff8
--- /dev/null
+++ b/trunk/package/luci/po/el/mmc_over_gpio.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2010-07-01 20:18+0200\n"
+"Last-Translator: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr "Ρυθμίσεις"
diff --git a/trunk/package/luci/po/el/multiwan.po b/trunk/package/luci/po/el/multiwan.po
new file mode 100644
index 00000000..d48818a4
--- /dev/null
+++ b/trunk/package/luci/po/el/multiwan.po
@@ -0,0 +1,118 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 15:16+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr "Διεύθυνση Προορισμού"
+
+msgid "Disable"
+msgstr "Απενεργοποίηση"
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/el/ntpc.po b/trunk/package/luci/po/el/ntpc.po
new file mode 100644
index 00000000..483b909c
--- /dev/null
+++ b/trunk/package/luci/po/el/ntpc.po
@@ -0,0 +1,56 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-03-31 15:40+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Clock Adjustment"
+msgstr "Ρύθμιση Ρολογιού"
+
+msgid "Count of time measurements"
+msgstr "Πλήθος μετρήσεων ώρας"
+
+msgid "Current system time"
+msgstr "Τρέχουσα ώρα συστήματος"
+
+msgid "General"
+msgstr "Γενικά"
+
+msgid "Hostname"
+msgstr "Όνομα συστήματος"
+
+#, fuzzy
+msgid "Offset frequency"
+msgstr "Συχνότητα μετάθεσης"
+
+msgid "Port"
+msgstr "Θύρα"
+
+msgid "Synchronizes the system time"
+msgstr "Συγχρονίζει την ώρα του συστήματος"
+
+msgid "Time Server"
+msgstr ""
+
+#, fuzzy
+msgid "Time Servers"
+msgstr "Εξυπηρετητές Ώρας"
+
+msgid "Time Synchronisation"
+msgstr "Συγχρονισμός Ώρας"
+
+#, fuzzy
+msgid "Update interval (in seconds)"
+msgstr "Περίοδος ενημέρωσης (σε δευτερόλεπτα)"
+
+msgid "empty = infinite"
+msgstr "άδειο = άπειρος"
diff --git a/trunk/package/luci/po/el/olsr.po b/trunk/package/luci/po/el/olsr.po
new file mode 100644
index 00000000..cd23b1ca
--- /dev/null
+++ b/trunk/package/luci/po/el/olsr.po
@@ -0,0 +1,695 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-31 15:41+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr "Ενεργοί κόμβοι OLSR"
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr "Προχωρημένες Ρυθμίσεις"
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr "Ενεργοποίηση αυτής της διεπαφής."
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr "Πύλη"
+
+msgid "General Settings"
+msgstr "Γενικές Ρυθμίσεις"
+
+msgid "General settings"
+msgstr "Γενικές ρυθμίσεις"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr "Διευθύνσεις IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr "Διεπαφή"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Διεπαφές"
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr "Συνδέσεις σύνολο"
+
+msgid "Local interface IP"
+msgstr "IP τοπικής διεπαφής"
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr "Δίκτυο"
+
+msgid "Network address"
+msgstr "Διεύθυνση δικτύου"
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr "OLSR Δαίμονας"
+
+msgid "OLSR Daemon - Interface"
+msgstr "OLSR Δαίμονας - Διεπαφή"
+
+msgid "OLSR connections"
+msgstr "OLSR συνδέσεις"
+
+msgid "OLSR gateway"
+msgstr "OLSR πύλη"
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr "Πόρτα"
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr "Διαδρομές"
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr "Τοπολογία"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Έκδοση"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "Συσκευή"
diff --git a/trunk/package/luci/po/el/openvpn.po b/trunk/package/luci/po/el/openvpn.po
new file mode 100644
index 00000000..16caa55b
--- /dev/null
+++ b/trunk/package/luci/po/el/openvpn.po
@@ -0,0 +1,560 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-18 15:23+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr "Προσθήκη"
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr "Επιτρέπουμε στον απομακρυσμένο να αλλάξει την IP ή τη θύρα"
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Παρακάτω είναι μία λίστα των ρυθμισμένων περιστατικών OpenVPN και της "
+"τρέχουσας κατάστασής τους"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr "Σύνδεση μέσω διαμεσολαβητή Socks5"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr "Διάστημα επαναπροσπάθειας σύνδεσης"
+
+msgid "Cryptography"
+msgstr "Κρυπτογραφία"
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr "Μη συνδέσεις σε τοπική διεύθυνση και θύρα"
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Ενεργοποιημένο"
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr "Εκτέλεση της εντολής κελύφους στην αλλαγή IP του απομακρυσμένου"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+"Αν αποτύχει η μετατροπή του ονόματος του μηχανήματος σε IP, ξαναπροσπάθησε"
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr "Όνομα τοπικού μηχανήματος ή διεύθυνση IP"
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Διεργασίες OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "Θύρα"
+
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
+
+msgid "Proxy timeout in seconds"
+msgstr "Τέλος χρόνου μεσολαβητή σε δευτερόλεπτα"
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr "Τυχαία επιλογή απομακρυσμένου διακομιστή"
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr "Όνομα απομακρυσμένου μηχανήματος ή διεύθυνση IP"
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Επαναπροσπάθεια για πάντα αν υπάρχουν λάθη HTTP στο μεσολαβητή"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Επαναπροσπάθεια για πάντα σε περίπτωση λαθών στο διαμεσολαβητή Socks5"
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr "Υπηρεσία"
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr "Ορισμός εκτεταμένων ρυθμίσεων διαμεσολαβητή HTTP"
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr "Εκκίνηση/Τερματισμός"
+
+msgid "Started"
+msgstr "Ξεκίνησε"
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr "Μετάβαση στις προχωρημένες ρυθμίσεις »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "TCP/UDP νούμερο θύρας για το τοπικό και το απομακρυσμένο"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "TCP/UDP αριθμός θύρας για το τοπικό (εξ'ορισμού=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "TCP/UDP αριθμός θύρας για τον απομακρυσμένο (εξ'ορισμού=1194)"
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr "Είδος χρησιμοποιούμενης συσκευής"
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr "όχι"
+
+msgid "tun/tap device"
+msgstr "Συσκευή tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr "ναι (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Μετάβαση στις βασικές επιλογές"
+
+#~ msgid "openvpn_%s"
+#~ msgstr "openvpn_%s"
+
+#~ msgid "openvpn_%s_desc"
+#~ msgstr "openvpn_%s_desc"
diff --git a/trunk/package/luci/po/el/p2pblock.po b/trunk/package/luci/po/el/p2pblock.po
new file mode 100644
index 00000000..01eac238
--- /dev/null
+++ b/trunk/package/luci/po/el/p2pblock.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-18 15:23+0200\n"
+"PO-Revision-Date: 2012-03-18 15:23+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr "δευτερόλεπτα"
diff --git a/trunk/package/luci/po/el/p910nd.po b/trunk/package/luci/po/el/p910nd.po
new file mode 100644
index 00000000..91c42a36
--- /dev/null
+++ b/trunk/package/luci/po/el/p910nd.po
@@ -0,0 +1,55 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-18 15:25+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Bidirectional mode"
+msgstr "Αμφίδρομη μέθοδος"
+
+msgid "Device"
+msgstr "Συσκευή"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Πρώτα πρέπει να εγκατασταθούν τα πακέτα για να υπάρξει υποστήριξη για USB "
+"(kmod-usb-printer) ή παράλληλη θύρα (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Θύρα"
+
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "Θύρα ακρόασης TCP"
+
+msgid "enable"
+msgstr "ενεργοποίηση"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Εξυπηρετητής εκτυπώσεων"
+
+#~ msgid "port_help"
+#~ msgstr "port_help"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr ""
+#~ "p910nd ανταποκρίνεται στην πόρτα 910+N. π.χ. 9100 για τον πρώτο εκτυπωτή"
diff --git a/trunk/package/luci/po/el/pbx-voicemail.po b/trunk/package/luci/po/el/pbx-voicemail.po
new file mode 100644
index 00000000..535fb902
--- /dev/null
+++ b/trunk/package/luci/po/el/pbx-voicemail.po
@@ -0,0 +1,94 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 15:26+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr "Όχι"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+
+#~ msgid "Enabled"
+#~ msgstr "Ενεργοποιημένο"
diff --git a/trunk/package/luci/po/el/pbx.po b/trunk/package/luci/po/el/pbx.po
new file mode 100644
index 00000000..e97aeae0
--- /dev/null
+++ b/trunk/package/luci/po/el/pbx.po
@@ -0,0 +1,493 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-31 15:41+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr "Μην Ενοχλείτε"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Ενεργοποιημένο"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Πλήρες Όνομα"
+
+msgid "General Settings"
+msgstr "Γενικές Ρυθμίσεις"
+
+msgid "Google Accounts"
+msgstr "Λογαριασμοί Google"
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Λογαριασμοί Google Voice/Talk"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "Εισερχόμενες Κλήσεις"
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr "Όχι"
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr "Εξερχόμενες Κλήσεις"
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Κωδικός πρόσβασης"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr "Λογαριασμοί SIP"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+#~ msgid "Account Status"
+#~ msgstr "Κατάσταση Λογαριασμού"
+
+#~ msgid "Account Status Message"
+#~ msgstr "Μήνυμα Κατάστασης Λογαριασμού"
diff --git a/trunk/package/luci/po/el/polipo.po b/trunk/package/luci/po/el/polipo.po
new file mode 100644
index 00000000..c086285b
--- /dev/null
+++ b/trunk/package/luci/po/el/polipo.po
@@ -0,0 +1,207 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-18 15:29+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Γενικές Ρυθμίσεις"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/el/qos.po b/trunk/package/luci/po/el/qos.po
new file mode 100644
index 00000000..2dee6f1e
--- /dev/null
+++ b/trunk/package/luci/po/el/qos.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2012-03-18 15:29+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#, fuzzy
+msgid "Calculate overhead"
+msgstr "Υπολογισμός Overhead"
+
+#, fuzzy
+msgid "Classification Rules"
+msgstr "Κατηγοριοποίηση"
+
+#, fuzzy
+msgid "Classification group"
+msgstr "Κατηγοριοποίηση"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+#, fuzzy
+msgid "Half-duplex"
+msgstr "Μη-ταυτόχρονη αμφίδρομη επικοινωνία"
+
+msgid "Interfaces"
+msgstr "Διεπαφές"
+
+msgid "Number of bytes"
+msgstr ""
+
+#, fuzzy
+msgid "Ports"
+msgstr "Προτεραιότητα"
+
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr "Ποιότητα Υπηρεσίας"
+
+msgid "Service"
+msgstr "Υπηρεσία"
+
+#, fuzzy
+msgid "Source host"
+msgstr "Διεύθυνση πηγής"
+
+#, fuzzy
+msgid "Target"
+msgstr "Διεύθυνση στόχου"
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Με το QoS μπορείτε να ορίσετε προτεραιότητες στην κίνηση του δικτύου με βάση "
+"διευθύνσεις, θύρες ή υπηρεσίες."
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr "προεπιλογή"
+
+msgid "express"
+msgstr "εξπρές"
+
+msgid "low"
+msgstr "χαμηλή"
+
+msgid "normal"
+msgstr "κανονική"
+
+msgid "priority"
+msgstr "προτεραιότητα"
+
+#, fuzzy
+#~ msgid "Downlink"
+#~ msgstr "Ταχύτητα κατεβάσματος"
+
+#, fuzzy
+#~ msgid "Uplink"
+#~ msgstr "Ταχύτητα ανεβάσματος"
+
+#~ msgid "Prioritization"
+#~ msgstr "Προτεραιότητες"
+
+#~ msgid "source network / source host"
+#~ msgstr "πηγαίο δίκτυο / πηγαίος υπολογιστής"
+
+#~ msgid "target network / target host"
+#~ msgstr "δίκτυο στόχος / υπολογιστής στόχος"
+
+#~ msgid "portrange"
+#~ msgstr "εύρος θυρών"
+
+#~ msgid "Bytes sent"
+#~ msgstr "Απεσταλμένα byte"
diff --git a/trunk/package/luci/po/el/radvd.po b/trunk/package/luci/po/el/radvd.po
new file mode 100644
index 00000000..5e925e01
--- /dev/null
+++ b/trunk/package/luci/po/el/radvd.po
@@ -0,0 +1,370 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 15:31+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: German\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "6to4 interface"
+msgstr "Διεπαφή 6to4"
+
+msgid "Address"
+msgstr "Διεύθυνση"
+
+msgid "Addresses"
+msgstr "Διευθύνσεις"
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr "Πελάτες"
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr "Διεπαφή"
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Διεπαφές"
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Διεπαφή %q"
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Διαδρομή"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr "Διαδρομές"
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr "όχι"
+
+msgid "yes"
+msgstr "ναι"
diff --git a/trunk/package/luci/po/el/rrdtool.po b/trunk/package/luci/po/el/rrdtool.po
new file mode 100644
index 00000000..1d81166e
--- /dev/null
+++ b/trunk/package/luci/po/el/rrdtool.po
@@ -0,0 +1,358 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/el/samba.po b/trunk/package/luci/po/el/samba.po
new file mode 100644
index 00000000..54fc69e0
--- /dev/null
+++ b/trunk/package/luci/po/el/samba.po
@@ -0,0 +1,78 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-18 15:31+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr "Όνομα"
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/trunk/package/luci/po/el/splash.po b/trunk/package/luci/po/el/splash.po
new file mode 100644
index 00000000..65649918
--- /dev/null
+++ b/trunk/package/luci/po/el/splash.po
@@ -0,0 +1,307 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-18 15:31+0200\n"
+"PO-Revision-Date: 2012-03-18 15:31+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Διεύθυνση IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Διεπαφές"
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "Διεύθυνση MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr "Δίκτυο"
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr "Αποθήκευση"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/el/statistics.po b/trunk/package/luci/po/el/statistics.po
new file mode 100644
index 00000000..1d376727
--- /dev/null
+++ b/trunk/package/luci/po/el/statistics.po
@@ -0,0 +1,606 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-03-18 15:32+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+#, fuzzy
+msgid "Base Directory"
+msgstr "Κατάλογος βάσης"
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr "Έξοδος CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Ρυθμίσεις Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Το Collectd είναι ένας μικρός δαίμονας για τη συλλογή δεδομένων από διάφορες "
+"πηγές μέσω διάφορων προσθέτων. Σε αυτή τη σελίδα μπορείτε να αλλάξετε τις "
+"γενικές ρυθμίσεις του δαίμονα collectd."
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr "Περίοδος συλλογής δεδομένων"
+
+msgid "Datasets definition file"
+msgstr "Αρχείο ορισμού συνόλων δεδομένων"
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr "Κατάλογος για πρόσθετα collectd"
+
+#, fuzzy
+msgid "Directory for sub-configurations"
+msgstr "Κατάλογος υπο-ρυθμίσεων"
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr "Χρήση Χώρου στον δίσκο"
+
+msgid "Disk Usage"
+msgstr "Χρήση Δίσκου"
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr "Εμφάνιση χρονικού εύρους »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr "Ηλ. Ταχυδρομείο"
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Τείχος προστασίας"
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr "Γραφήματα"
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Όνομα υπολογιστή"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Διεπαφές"
+
+msgid "Interrupts"
+msgstr "Διακοπές"
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr "Μνήμη"
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr "Όνομα κανόνα"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr "Δίκτυο"
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr "Πρόσθετα δικτύου"
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr "Αριθμός νημάτων για τη συλλογή δεδομένων"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr "Πρόσθετα εξόδου"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr "Διεργασίες"
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Επεξεργαστής"
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Δευτερόλεπτα"
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr "Στατιστικά"
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr "Φόρτος Συστήματος"
+
+msgid "System plugins"
+msgstr "Πρόσθετα συστήματος"
+
+msgid "TCP Connections"
+msgstr "Συνδέσεις TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr "Πίνακας"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Το πακέτο στατιστικών βασίζεται στο <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> και χρησιμοποιεί το <a href=\"http://oss.oetiker.ch/rrdtool/"
+"\">RRD Tool</a> για να σχεδιάσει διαγράμματα από τα συλλεγόμενα δεδομένα."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr "Αρχείο PID σε χρήση"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr "Ασύρματο"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr "π.χ. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "π.χ. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/el/tinyproxy.po b/trunk/package/luci/po/el/tinyproxy.po
new file mode 100644
index 00000000..a0e258a6
--- /dev/null
+++ b/trunk/package/luci/po/el/tinyproxy.po
@@ -0,0 +1,283 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2012-03-18 16:25+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"Το <em>μέσω proxy</em> δρομολογεί αιτήσεις προς τον συγκεκριμένο προορισμό "
+"μέσω του καθοριζόμενου διαμεσολαβητή ανωτέρου επιπέδου, Το <em>απόρριψη "
+"πρόσβασης</em> απενεργοποιεί τη χρήση διαμεσολαβητή ανωτέρου επιπέδου για το "
+"συγκεκριμένο προορισμό"
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Προσθέτει μια κεφαλίδα HTTP \"X-Tinyproxy\" με τη διεύθυνση IP του πελάτη "
+"στις προωθούμενες αιτήσεις"
+
+msgid "Allowed clients"
+msgstr "Επιτρεπόμενοι πελάτες"
+
+msgid "Allowed connect ports"
+msgstr "Επιτρεπόμενες θύρες σύνδεσης"
+
+#, fuzzy
+msgid "Bind address"
+msgstr "Διεύθυνση στην οποία ακούει η υπηρεσία"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"Προεπιλεγμένα, χρησιμοποιούνται απλές κανονικές εκφράσεις POSIX για το "
+"φιλτράρισμα. Ενεργοποιήστε αυτή την επιλογή για να χρησιμοποιούνται "
+"εκτεταμένες κανονικές εκφράσεις"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+"Προεπιλεγμένα, το φιλτράρισμα με συμβολοσειρές γίνεται χωρίς διάκριση πεζών "
+"κεφαλαίων. Ενεργοποιήστε αυτή την επιλογή για να γίνεται διάκριση πεζών "
+"κεφαλαίων"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"Προεπιλεγμένα, το φιλτράρισμα γίνεται βάσει του ονόματος τομέα. "
+"Ενεργοποιήστε αυτή την επιλογή για να γίνεται βάσει URL"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"Προεπιλεγμένα, οι κανόνες φιλτραρίσματος λειτουργούν ως μαύρη λίστα. "
+"Ενεργοποιήστε αυτή την επιλογή ώστε να επιτρέπονται μόνο τα ονόματα τομέα ή "
+"URLs που ταιριάζουν"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+"Μπορεί να είναι μια IP διεύθυνση ή εύρος, ένα όνομα τομέα ή \".\" για "
+"οποιοδήποτε σύστημα χωρίς όνομα τομέα"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr "Χρονικό όριο σύνδεσης"
+
+msgid "Default deny"
+msgstr "Άρνηση προεπιλεγμένα"
+
+msgid "Enable Tinyproxy server"
+msgstr "Ενεργοποίηση διαμεσολαβητή Tinyproxy"
+
+msgid "Error page"
+msgstr "Σελίδα σφάλματος"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr "Φιλτράρισμα με Κανονικές Εκφράσεις"
+
+msgid "Filter by URLs"
+msgstr "Φιλτράρισμα με URL"
+
+msgid "Filter case-sensitive"
+msgstr "Φιλτράρισμα με διάκριση πεζών/κεφαλαίων"
+
+msgid "Filter file"
+msgstr "Αρχείο φίλτρων"
+
+msgid "Filtering and ACLs"
+msgstr "Φιλτράρισμα και λίστες ελέγχου πρόσβασης"
+
+msgid "General settings"
+msgstr "Γενικές ρυθμίσεις"
+
+msgid "Group"
+msgstr "Ομάδα"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+"Αρχείο προτύπου HTML που στέλνεται σε αιτήσεις για στατιστικά του συστήματος"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "Αρχείο προτύπου HTML που στέλνεται όταν προκύπτουν σφάλματα HTML"
+
+msgid "Header whitelist"
+msgstr "Λευκή λίστα κεφαλίδων"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Λίστα διευθύνσεων IP ή εύρη αυτών στις οποίες επιτρέπεται η χρήση του "
+"διαμεσολαβητή"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/el/transmission.po b/trunk/package/luci/po/el/transmission.po
new file mode 100644
index 00000000..3125fc27
--- /dev/null
+++ b/trunk/package/luci/po/el/transmission.po
@@ -0,0 +1,280 @@
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/el/upnp.po b/trunk/package/luci/po/el/upnp.po
new file mode 100644
index 00000000..775a7f70
--- /dev/null
+++ b/trunk/package/luci/po/el/upnp.po
@@ -0,0 +1,140 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/trunk/package/luci/po/el/ushare.po b/trunk/package/luci/po/el/ushare.po
new file mode 100644
index 00000000..331c8a0d
--- /dev/null
+++ b/trunk/package/luci/po/el/ushare.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-28 02:08+0200\n"
+"PO-Revision-Date: 2010-06-30 17:26+0200\n"
+"Last-Translator: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Content directories"
+msgstr "Φάκελοι περιεχομένου"
+
+msgid "Disable telnet console"
+msgstr "Απενεργοποίηση τερματικού telnet"
+
+msgid "Disable webinterface"
+msgstr "Απενεργοποίηση διεπαφής web"
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr "Επιλογές"
+
+msgid "Servername"
+msgstr "Όνομα εξυπηρετητή"
+
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/el/uvc_streamer.po b/trunk/package/luci/po/el/uvc_streamer.po
new file mode 100644
index 00000000..f3601731
--- /dev/null
+++ b/trunk/package/luci/po/el/uvc_streamer.po
@@ -0,0 +1,41 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-12 13:02+0200\n"
+"Last-Translator: elkos <elkosmas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr ""
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Ανάλυση"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr ""
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
diff --git a/trunk/package/luci/po/el/vnstat.po b/trunk/package/luci/po/el/vnstat.po
new file mode 100644
index 00000000..9d237780
--- /dev/null
+++ b/trunk/package/luci/po/el/vnstat.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-16 20:54+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/el/voice_core.po b/trunk/package/luci/po/el/voice_core.po
new file mode 100644
index 00000000..01abb413
--- /dev/null
+++ b/trunk/package/luci/po/el/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-02-16 19:15+0200\n"
+"Last-Translator: Jinxcat <bikkit@gmail.com>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Phones"
+msgstr "Τηλέφωνα"
+
+msgid "Voice"
+msgstr ""
diff --git a/trunk/package/luci/po/el/voice_diag.po b/trunk/package/luci/po/el/voice_diag.po
new file mode 100644
index 00000000..e3a7dc4e
--- /dev/null
+++ b/trunk/package/luci/po/el/voice_diag.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 17:15+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: none\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Diagnostics"
+msgstr "Διαγνωστικά"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Τα διαγνωστικά που είναι διαθέσιμα για την συσκευή σας, εξαρτώνται από τα "
+"αρθρώματα που έχετε εγκατεστημένα."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Κάτω από αυτό το μενού βρίσκονται επιλογές που σας επιτρέπουν να "
+"παραμετροποιήσετε και να πραγματοποιήσετε δοκιμές στις φωνητικές λειτουργίες "
+"του συστήματός σας. Είναι γνωστές ως διαγνωστικά."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/el/watchcat.po b/trunk/package/luci/po/el/watchcat.po
new file mode 100644
index 00000000..4aa0c6b6
--- /dev/null
+++ b/trunk/package/luci/po/el/watchcat.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/el/wol.po b/trunk/package/luci/po/el/wol.po
new file mode 100644
index 00000000..cb7c3b97
--- /dev/null
+++ b/trunk/package/luci/po/el/wol.po
@@ -0,0 +1,49 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2010-04-19 00:29+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/el/wshaper.po b/trunk/package/luci/po/el/wshaper.po
new file mode 100644
index 00000000..b75aca22
--- /dev/null
+++ b/trunk/package/luci/po/el/wshaper.po
@@ -0,0 +1,55 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-18 17:10+0200\n"
+"PO-Revision-Date: 2012-03-18 17:10+0200\n"
+"Last-Translator: Vasilis <acinonyx@librecmc.gr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr "Διεπαφή"
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/en/ahcp.po b/trunk/package/luci/po/en/ahcp.po
new file mode 100644
index 00000000..4ad2ab27
--- /dev/null
+++ b/trunk/package/luci/po/en/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-15 11:31+0200\n"
+"Last-Translator: madanadam <madanadam@gmail.com>\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "AHCP Server"
+msgstr "AHCP Server"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery and DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+
+msgid "Active AHCP Leases"
+msgstr "Active AHCP Leases"
+
+msgid "Address"
+msgstr "Address"
+
+msgid "Advanced Settings"
+msgstr "Advanced Settings"
+
+msgid "Age"
+msgstr "Age"
+
+msgid "Announced DNS servers"
+msgstr "Announced DNS servers"
+
+msgid "Announced NTP servers"
+msgstr "Announced NTP servers"
+
+msgid "Announced prefixes"
+msgstr "Announced prefixes"
+
+msgid "Collecting data..."
+msgstr "Collecting data..."
+
+msgid "Forwarder"
+msgstr "Forwarder"
+
+msgid "General Setup"
+msgstr "General Setup"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 and IPv6"
+
+msgid "IPv4 only"
+msgstr "IPv4 only"
+
+msgid "IPv6 only"
+msgstr "IPv6 only"
+
+msgid "Lease directory"
+msgstr "Lease directory"
+
+msgid "Lease validity time"
+msgstr "Lease validity time"
+
+msgid "Log file"
+msgstr "Log file"
+
+msgid "Multicast address"
+msgstr "Multicast address"
+
+msgid "Operation mode"
+msgstr "Operation mode"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Protocol family"
+
+msgid "Served interfaces"
+msgstr "Served interfaces"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Specifies the announced IPv4 and IPv6 NTP servers"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Specifies the announced IPv4 and IPv6 name servers"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+
+msgid "The AHCP Service is not running."
+msgstr "The AHCP Service is not running."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "The AHCP Service is running with ID %s."
+
+msgid "There are no active leases."
+msgstr "There are no active leases."
+
+msgid "Unique ID file"
+msgstr "Unique ID file"
diff --git a/trunk/package/luci/po/en/asterisk.po b/trunk/package/luci/po/en/asterisk.po
new file mode 100644
index 00000000..e462f56b
--- /dev/null
+++ b/trunk/package/luci/po/en/asterisk.po
@@ -0,0 +1,680 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: 2011-06-03 10:45+0200\n"
+"Last-Translator: Ladislav <suspend@tiscali.cz>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Asterisk General Options"
+
+#~ msgid "AGI directory"
+#~ msgstr "AGI directory"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Cache recorded sound files during recording"
+
+#~ msgid "Debug Level"
+#~ msgstr "Debug Level"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Disable some warnings"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Dump core on crash"
+
+#~ msgid "High Priority"
+#~ msgstr "High Priority"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Initialise Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Use Internal Timing"
+
+#~ msgid "Log directory"
+#~ msgstr "Log directory"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Maximum number of calls allowed"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Maximum load to stop accepting new calls"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Disable console colors"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Sound files Cache directory"
+
+#~ msgid "The Group to run as"
+#~ msgstr "The Group to run as"
+
+#~ msgid "The User to run as"
+#~ msgstr "The User to run as"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Voicemail Spool directory"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Prefix UniquID with system name"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "Build transcode paths via SLINEAR, not directly"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Transmit SLINEAR silence while recording a channel"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Verbose Level"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Section dialplan"
+
+#~ msgid "include"
+#~ msgstr "include"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Dialplan Extension"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Dialplan General Options"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Allow transfer"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Clear global vars"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "Dialplan Goto"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Dialplan Conference"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Dialplan Time"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Dialplan Voicemail"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Dial Zones for Dialplan"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "Prefix to add matching dialplans"
+
+#~ msgid "Match International prefix"
+#~ msgstr "Match International prefix"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Prefix (0) to add/remove to/from international numbers"
+
+#~ msgid "localzone"
+#~ msgstr "localzone"
+
+#~ msgid "Match plan"
+#~ msgstr "Match plan"
+
+#~ msgid "Connection to use"
+#~ msgstr "Connection to use"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Feature Key maps"
+
+#~ msgid "Attended transfer key"
+#~ msgstr "Attended transfer key"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "Blind transfer key"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Key to Disconnect call"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Key to Park call"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Parking Feature"
+
+#~ msgid "ADSI Park"
+#~ msgstr "ADSI Park"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "Attended transfer timeout (sec)"
+
+#~ msgid "One touch record key"
+#~ msgstr "One touch record key"
+
+#~ msgid "Name of call context for parking"
+#~ msgstr "Name of call context for parking"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Sound file to play to parked caller"
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr "Max time (ms) between digits for feature activation"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Method to Find Parking slot"
+
+#~ msgid "parkedmusicclass"
+#~ msgstr "parkedmusicclass"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Play courtesy tone to"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Enable Parking"
+
+#~ msgid "Extension to dial to park"
+#~ msgstr "Extension to dial to park"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Parking time (secs)"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "Range of extensions for call parking"
+
+#~ msgid "Pickup extension"
+#~ msgstr "Pickup extension"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Seconds to wait bewteen digits when transferring"
+
+#~ msgid "sound when attended transfer is complete"
+#~ msgstr "sound when attended transfer is complete"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "Sound when attended transfer fails"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Reload Hardware Config"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Reboot Method"
+
+#~ msgid "Parameter"
+#~ msgstr "Parameter"
+
+#~ msgid "Option type"
+#~ msgstr "Option type"
+
+#~ msgid "User name"
+#~ msgstr "User name"
+
+#~ msgid "IAX General Options"
+#~ msgstr "IAX General Options"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Allow Codecs"
+
+#~ msgid "Static"
+#~ msgstr "Static"
+
+#~ msgid "Write Protect"
+#~ msgstr "Write Protect"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Meetme Conference"
+
+#~ msgid "Admin PIN"
+#~ msgstr "Admin PIN"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "Meeting PIN"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Meetme Conference General Options"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Number of 20ms audio buffers to be used"
+
+#~ msgid "Modules"
+#~ msgstr "Modules"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Alarm Receiver Application"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Authentication Application"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "Make sure asterisk doesnt save CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Check if channel is available"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Listen in on any channel"
+
+#~ msgid "Control Playback Application"
+#~ msgstr "Control Playback Application"
+
+#~ msgid "Cuts up variables"
+#~ msgstr "Cuts up variables"
+
+#~ msgid "Database access functions"
+#~ msgstr "Database access functions"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Dialing Application"
+
+#~ msgid "Virtual Dictation Machine Application"
+#~ msgstr "Virtual Dictation Machine Application"
+
+#~ msgid "Directed Call Pickup Support"
+#~ msgstr "Directed Call Pickup Support"
+
+#~ msgid "Extension Directory"
+#~ msgstr "Extension Directory"
+
+#~ msgid "DISA (Direct Inward System Access) Application"
+#~ msgstr "DISA (Direct Inward System Access) Application"
+
+#~ msgid "Dump channel variables Application"
+#~ msgstr "Dump channel variables Application"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Simple Echo Application"
+
+#~ msgid "ENUM Lookup"
+#~ msgstr "ENUM Lookup"
+
+#~ msgid "Reevaluates strings"
+#~ msgstr "Reevaluates strings"
+
+#~ msgid "Executes applications"
+#~ msgstr "Executes applications"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "External IVR application interface"
+
+#~ msgid "Fork The CDR into 2 seperate entities"
+#~ msgstr "Fork The CDR into 2 seperate entities"
+
+#~ msgid "Get ADSI CPE ID"
+#~ msgstr "Get ADSI CPE ID"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Group Management Routines"
+
+#~ msgid "Encode and Stream via icecast and ices"
+#~ msgstr "Encode and Stream via icecast and ices"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Image Transmission Application"
+
+#~ msgid "Look up Caller*ID name/number from black"
+#~ msgstr "Look up Caller*ID name/number from black"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr "Look up CallerID Name from local databas"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Extension Macros"
+
+#~ msgid "A simple math Application"
+#~ msgstr "A simple math Application"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "MD5 checksum Application"
+
+#~ msgid "Digital Milliwatt (mu-law) Test Application"
+#~ msgstr "Digital Milliwatt (mu-law) Test Application"
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Record a call and mix the audio during the recording"
+
+#~ msgid "Call Parking and Announce Application"
+#~ msgstr "Call Parking and Announce Application"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Trivial Playback Application"
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Require phone number to be entered"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "True Call Queueing"
+
+#~ msgid "Random goto"
+#~ msgstr "Random goto"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Read Variable Application"
+
+#~ msgid "Read in a file"
+#~ msgstr "Read in a file"
+
+#~ msgid "Realtime Data Lookup/Rewrite"
+#~ msgstr "Realtime Data Lookup/Rewrite"
+
+#~ msgid "Trivial Record Application"
+#~ msgstr "Trivial Record Application"
+
+#~ msgid "Say time"
+#~ msgstr "Say time"
+
+#~ msgid "Send DTMF digits Application"
+#~ msgstr "Send DTMF digits Application"
+
+#~ msgid "Send Text Applications"
+#~ msgstr "Send Text Applications"
+
+#~ msgid "Set CallerID Application"
+#~ msgstr "Set CallerID Application"
+
+#~ msgid "CDR user field apps"
+#~ msgstr "CDR user field apps"
+
+#~ msgid "load => .so ; Set CallerID Name"
+#~ msgstr "load =&gt; .so ; Set CallerID Name"
+
+#~ msgid "load => .so ; Set CallerID Number"
+#~ msgstr "load =&gt; .so ; Set CallerID Number"
+
+#~ msgid "Set RDNIS Number"
+#~ msgstr "Set RDNIS Number"
+
+#~ msgid "Set ISDN Transfer Capability"
+#~ msgstr "Set ISDN Transfer Capability"
+
+#~ msgid "SMS/PSTN handler"
+#~ msgstr "SMS/PSTN handler"
+
+#~ msgid "Hangs up the requested channel"
+#~ msgstr "Hangs up the requested channel"
+
+#~ msgid "Stack Routines"
+#~ msgstr "Stack Routines"
+
+#~ msgid "Generic System() application"
+#~ msgstr "Generic System() application"
+
+#~ msgid "Playback with Talk Detection"
+#~ msgstr "Playback with Talk Detection"
+
+#~ msgid "Interface Test Application"
+#~ msgstr "Interface Test Application"
+
+#~ msgid "Transfer"
+#~ msgstr "Transfer"
+
+#~ msgid "TXTCIDName"
+#~ msgstr "TXTCIDName"
+
+#~ msgid "Send URL Applications"
+#~ msgstr "Send URL Applications"
+
+#~ msgid "Custom User Event Application"
+#~ msgstr "Custom User Event Application"
+
+#~ msgid "Send verbose output"
+#~ msgstr "Send verbose output"
+
+#~ msgid "Voicemail"
+#~ msgstr "Voicemail"
+
+#~ msgid "Waits until first ring after time"
+#~ msgstr "Waits until first ring after time"
+
+#~ msgid "Wait For Silence Application"
+#~ msgstr "Wait For Silence Application"
+
+#~ msgid "While Loops and Conditional Execution"
+#~ msgstr "While Loops and Conditional Execution"
+
+#~ msgid "Comma Separated Values CDR Backend"
+#~ msgstr "Comma Separated Values CDR Backend"
+
+#~ msgid "Customizable Comma Separated Values CDR Backend"
+#~ msgstr "Customizable Comma Separated Values CDR Backend"
+
+#~ msgid "Asterisk Call Manager CDR Backend"
+#~ msgstr "Asterisk Call Manager CDR Backend"
+
+#~ msgid "MySQL CDR Backend"
+#~ msgstr "MySQL CDR Backend"
+
+#~ msgid "PostgreSQL CDR Backend"
+#~ msgstr "PostgreSQL CDR Backend"
+
+#~ msgid "SQLite CDR Backend"
+#~ msgstr "SQLite CDR Backend"
+
+#~ msgid "Agent Proxy Channel"
+#~ msgstr "Agent Proxy Channel"
+
+#~ msgid "Option chan_iax2"
+#~ msgstr "Option chan_iax2"
+
+#~ msgid "Local Proxy Channel"
+#~ msgstr "Local Proxy Channel"
+
+#~ msgid "Session Initiation Protocol (SIP)"
+#~ msgstr "Session Initiation Protocol (SIP)"
+
+#~ msgid "Adaptive Differential PCM Coder/Decoder"
+#~ msgstr "Adaptive Differential PCM Coder/Decoder"
+
+#~ msgid "A-law Coder/Decoder"
+#~ msgstr "A-law Coder/Decoder"
+
+#~ msgid "A-law and Mulaw direct Coder/Decoder"
+#~ msgstr "A-law and Mulaw direct Coder/Decoder"
+
+#~ msgid "ITU G.726-32kbps G726 Transcoder"
+#~ msgstr "ITU G.726-32kbps G726 Transcoder"
+
+#~ msgid "GSM/PCM16 (signed linear) Codec Translation"
+#~ msgstr "GSM/PCM16 (signed linear) Codec Translation"
+
+#~ msgid "Speex/PCM16 (signed linear) Codec Translator"
+#~ msgstr "Speex/PCM16 (signed linear) Codec Translator"
+
+#~ msgid "Mu-law Coder/Decoder"
+#~ msgstr "Mu-law Coder/Decoder"
+
+#~ msgid "Sun Microsystems AU format (signed linear)"
+#~ msgstr "Sun Microsystems AU format (signed linear)"
+
+#~ msgid "G.723.1 Simple Timestamp File Format"
+#~ msgstr "G.723.1 Simple Timestamp File Format"
+
+#~ msgid "Raw G.726 (16/24/32/40kbps) data"
+#~ msgstr "Raw G.726 (16/24/32/40kbps) data"
+
+#~ msgid "Raw G729 data"
+#~ msgstr "Raw G729 data"
+
+#~ msgid "Raw GSM data"
+#~ msgstr "Raw GSM data"
+
+#~ msgid "Raw h263 data"
+#~ msgstr "Raw h263 data"
+
+#~ msgid "JPEG (Joint Picture Experts Group) Image"
+#~ msgstr "JPEG (Joint Picture Experts Group) Image"
+
+#~ msgid "Raw uLaw 8khz Audio support (PCM)"
+#~ msgstr "Raw uLaw 8khz Audio support (PCM)"
+
+#~ msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
+#~ msgstr "load =&gt; .so ; Raw aLaw 8khz PCM Audio support"
+
+#~ msgid "Raw Signed Linear Audio support (SLN)"
+#~ msgstr "Raw Signed Linear Audio support (SLN)"
+
+#~ msgid "Dialogic VOX (ADPCM) File Format"
+#~ msgstr "Dialogic VOX (ADPCM) File Format"
+
+#~ msgid "Microsoft WAV format (8000hz Signed Line"
+#~ msgstr "Microsoft WAV format (8000hz Signed Line"
+
+#~ msgid "Microsoft WAV format (Proprietary GSM)"
+#~ msgstr "Microsoft WAV format (Proprietary GSM)"
+
+#~ msgid "Caller ID related dialplan functions"
+#~ msgstr "Caller ID related dialplan functions"
+
+#~ msgid "ENUM Functions"
+#~ msgstr "ENUM Functions"
+
+#~ msgid "URI encoding / decoding functions"
+#~ msgstr "URI encoding / decoding functions"
+
+#~ msgid "Asterisk Extension Language Compiler"
+#~ msgstr "Asterisk Extension Language Compiler"
+
+#~ msgid "Text Extension Configuration"
+#~ msgstr "Text Extension Configuration"
+
+#~ msgid "load => .so ; Builtin dialplan functions"
+#~ msgstr "load =&gt; .so ; Builtin dialplan functions"
+
+#~ msgid "Loopback Switch"
+#~ msgstr "Loopback Switch"
+
+#~ msgid "Realtime Switch"
+#~ msgstr "Realtime Switch"
+
+#~ msgid "Outgoing Spool Support"
+#~ msgstr "Outgoing Spool Support"
+
+#~ msgid "Wil Cal U (Auto Dialer)"
+#~ msgstr "Wil Cal U (Auto Dialer)"
+
+#~ msgid "MySQL Config Resource"
+#~ msgstr "MySQL Config Resource"
+
+#~ msgid "ODBC Config Resource"
+#~ msgstr "ODBC Config Resource"
+
+#~ msgid "PGSQL Module"
+#~ msgstr "PGSQL Module"
+
+#~ msgid "Cryptographic Digital Signatures"
+#~ msgstr "Cryptographic Digital Signatures"
+
+#~ msgid "Call Parking Resource"
+#~ msgstr "Call Parking Resource"
+
+#~ msgid "Indications Configuration"
+#~ msgstr "Indications Configuration"
+
+#~ msgid "Call Monitoring Resource"
+#~ msgstr "Call Monitoring Resource"
+
+#~ msgid "Music On Hold Resource"
+#~ msgstr "Music On Hold Resource"
+
+#~ msgid "ODBC Resource"
+#~ msgstr "ODBC Resource"
+
+#~ msgid "SMDI Module"
+#~ msgstr "SMDI Module"
+
+#~ msgid "SNMP Module"
+#~ msgstr "SNMP Module"
+
+#~ msgid "Music On Hold"
+#~ msgstr "Music On Hold"
+
+#~ msgid "Application"
+#~ msgstr "Application"
+
+#~ msgid "Directory of Music"
+#~ msgstr "Directory of Music"
+
+#~ msgid "Option mode"
+#~ msgstr "Option mode"
+
+#~ msgid "Random Play"
+#~ msgstr "Random Play"
+
+#~ msgid "DTMF mode"
+#~ msgstr "DTMF mode"
+
+#~ msgid "Primary domain identity for From: headers"
+#~ msgstr "Primary domain identity for From: headers"
+
+#~ msgid "From user (required by many SIP providers)"
+#~ msgstr "From user (required by many SIP providers)"
+
+#~ msgid "Ring on incoming dialplan contexts"
+#~ msgstr "Ring on incoming dialplan contexts"
+
+#~ msgid "Allow Insecure for"
+#~ msgstr "Allow Insecure for"
+
+#~ msgid "Mailbox for MWI"
+#~ msgstr "Mailbox for MWI"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "NAT between phone and Asterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "Check tags in headers"
+
+#~ msgid "Reply Timeout (ms) for down connection"
+#~ msgstr "Reply Timeout (ms) for down connection"
+
+#~ msgid "Register connection"
+#~ msgstr "Register connection"
+
+#~ msgid "Dial own extension for mailbox"
+#~ msgstr "Dial own extension for mailbox"
+
+#~ msgid "Client Type"
+#~ msgstr "Client Type"
+
+#~ msgid "Username"
+#~ msgstr "Username"
+
+#~ msgid "Section sipgeneral"
+#~ msgstr "Section sipgeneral"
+
+#~ msgid "Allow codecs"
+#~ msgstr "Allow codecs"
+
+#~ msgid "SIP realm"
+#~ msgstr "SIP realm"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "Voicemail general options"
+
+#~ msgid "From Email address of server"
+#~ msgstr "From Email address of server"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "Voice Mail boxes"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "Email contains attachment"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Display Name"
+#~ msgstr "Display Name"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "zone"
+#~ msgstr "zone"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Voice Zone settings"
+
+#~ msgid "Message Format"
+#~ msgstr "Message Format"
diff --git a/trunk/package/luci/po/en/base.po b/trunk/package/luci/po/en/base.po
new file mode 100644
index 00000000..152e092a
--- /dev/null
+++ b/trunk/package/luci/po/en/base.po
@@ -0,0 +1,3816 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-04-03 08:44+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d minute window, %d second interval)"
+
+msgid "(%s available)"
+msgstr "(%s available)"
+
+msgid "(empty)"
+msgstr "(empty)"
+
+msgid "(no interfaces attached)"
+msgstr "(no interfaces attached)"
+
+msgid "-- Additional Field --"
+msgstr "-- Additional Field --"
+
+msgid "-- Please choose --"
+msgstr "-- Please choose --"
+
+msgid "-- custom --"
+msgstr "-- custom --"
+
+msgid "1 Minute Load:"
+msgstr "1 Minute Load:"
+
+msgid "15 Minute Load:"
+msgstr "15 Minute Load:"
+
+msgid "5 Minute Load:"
+msgstr "5 Minute Load:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "AR Support"
+
+msgid "ARP retry threshold"
+msgstr "ARP retry threshold"
+
+msgid "ATM Bridges"
+msgstr "ATM Bridges"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM Virtual Channel Identifier (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM Virtual Path Identifier (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+
+msgid "ATM device number"
+msgstr "ATM device number"
+
+msgid "Access Concentrator"
+msgstr "Access Concentrator"
+
+msgid "Access Point"
+msgstr "Access Point"
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Actions"
+msgstr "Actions"
+
+msgid "Activate this network"
+msgstr "Activate this network"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+
+msgid "Active Connections"
+msgstr "Active Connections"
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Add"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Add local domain suffix to names served from hosts files"
+
+msgid "Add new interface..."
+msgstr "Add new interface..."
+
+msgid "Additional Hosts files"
+msgstr "Additional Hosts files"
+
+msgid "Address"
+msgstr "Address"
+
+msgid "Address to access local relay bridge"
+msgstr "Address to access local relay bridge"
+
+msgid "Administration"
+msgstr "Administration"
+
+msgid "Advanced Settings"
+msgstr "Advanced Settings"
+
+msgid "Alert"
+msgstr "Alert"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+
+msgid "Allow all except listed"
+msgstr "Allow all except listed"
+
+msgid "Allow listed only"
+msgstr "Allow listed only"
+
+msgid "Allow localhost"
+msgstr "Allow localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr "Allow remote hosts to connect to local SSH forwarded ports"
+
+msgid "Allow root logins with password"
+msgstr "Allow root logins with password"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Allow the <em>root</em> user to login with password"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "An additional network will be created if you leave this unchecked."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antenna 1"
+
+msgid "Antenna 2"
+msgstr "Antenna 2"
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr "Any zone"
+
+msgid "Apply"
+msgstr "Apply"
+
+msgid "Applying changes"
+msgstr "Applying changes"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Assign interfaces..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Associated Stations"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr "Authentication"
+
+msgid "Authoritative"
+msgstr "Authoritative"
+
+msgid "Authorization Required"
+msgstr "Authorization Required"
+
+msgid "Auto Refresh"
+msgstr "Auto Refresh"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Available"
+
+msgid "Available packages"
+msgstr "Available packages"
+
+msgid "Average:"
+msgstr "Average:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Back"
+
+msgid "Back to Overview"
+msgstr "Back to Overview"
+
+msgid "Back to configuration"
+msgstr "Back to configuration"
+
+msgid "Back to overview"
+msgstr "Back to overview"
+
+msgid "Back to scan results"
+msgstr "Back to scan results"
+
+msgid "Background Scan"
+msgstr "Background Scan"
+
+msgid "Backup / Flash Firmware"
+msgstr "Backup / Flash Firmware"
+
+msgid "Backup / Restore"
+msgstr "Backup / Restore"
+
+msgid "Backup file list"
+msgstr "Backup file list"
+
+msgid "Bad address specified!"
+msgstr "Bad address specified!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Bogus NX Domain Override"
+msgstr "Bogus NX Domain Override"
+
+msgid "Bridge"
+msgstr "Bridge"
+
+msgid "Bridge interfaces"
+msgstr "Bridge interfaces"
+
+msgid "Bridge unit number"
+msgstr "Bridge unit number"
+
+msgid "Bring up on boot"
+msgstr "Bring up on boot"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr "Buffered"
+
+msgid "Buttons"
+msgstr "Buttons"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "CPU usage (%)"
+
+msgid "Cached"
+msgstr "Cached"
+
+msgid "Cancel"
+msgstr "Cancel"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Chain"
+
+msgid "Changes"
+msgstr "Changes"
+
+msgid "Changes applied."
+msgstr "Changes applied."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Changes the administrator password for accessing the device"
+
+msgid "Channel"
+msgstr "Channel"
+
+msgid "Check"
+msgstr "Check"
+
+msgid "Checksum"
+msgstr "Checksum"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr "Cipher"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+
+msgid "Client"
+msgstr "Client"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Client ID to send when requesting DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+
+msgid "Close list..."
+msgstr "Close list..."
+
+msgid "Collecting data..."
+msgstr "Collecting data..."
+
+msgid "Command"
+msgstr "Command"
+
+msgid "Common Configuration"
+msgstr "Common Configuration"
+
+msgid "Compression"
+msgstr "Compression"
+
+msgid "Configuration"
+msgstr "Configuration"
+
+msgid "Configuration applied."
+msgstr "Configuration applied."
+
+msgid "Configuration files will be kept."
+msgstr "Configuration files will be kept."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr "Configures this mount as overlay storage for block-extroot"
+
+msgid "Confirmation"
+msgstr "Confirmation"
+
+msgid "Connect"
+msgstr "Connect"
+
+msgid "Connected"
+msgstr "Connected"
+
+msgid "Connection Limit"
+msgstr "Connection Limit"
+
+msgid "Connections"
+msgstr "Connections"
+
+msgid "Country"
+msgstr "Country"
+
+msgid "Country Code"
+msgstr "Country Code"
+
+msgid "Cover the following interface"
+msgstr "Cover the following interface"
+
+msgid "Cover the following interfaces"
+msgstr "Cover the following interfaces"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Create / Assign firewall-zone"
+
+msgid "Create Interface"
+msgstr "Create Interface"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Create a bridge over multiple interfaces"
+
+msgid "Critical"
+msgstr "Critical"
+
+msgid "Cron Log Level"
+msgstr "Cron Log Level"
+
+msgid "Custom Interface"
+msgstr "Custom Interface"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+
+msgid "DHCP Leases"
+msgstr "DHCP Leases"
+
+msgid "DHCP Server"
+msgstr "DHCP Server"
+
+msgid "DHCP and DNS"
+msgstr "DHCP and DNS"
+
+msgid "DHCP client"
+msgstr "DHCP client"
+
+msgid "DHCP-Options"
+msgstr "DHCP-Options"
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "DNS forwardings"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "Default %d"
+msgstr "Default %d"
+
+msgid "Default gateway"
+msgstr "Default gateway"
+
+msgid "Default state"
+msgstr "Default state"
+
+msgid "Define a name for this network."
+msgstr "Define a name for this network."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Delete this interface"
+msgstr "Delete this interface"
+
+msgid "Delete this network"
+msgstr "Delete this network"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Design"
+msgstr "Design"
+
+msgid "Destination"
+msgstr "Destination"
+
+msgid "Device"
+msgstr "Device"
+
+msgid "Device Configuration"
+msgstr "Device Configuration"
+
+msgid "Diagnostics"
+msgstr "Diagnostics"
+
+msgid "Directory"
+msgstr "Directory"
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr "Disable HW-Beacon timer"
+
+msgid "Disabled"
+msgstr "Disabled"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr "Distance Optimization"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distance to farthest network member in meters."
+
+msgid "Diversity"
+msgstr "Diversity"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr "Do not send probe responses"
+
+msgid "Domain required"
+msgstr "Domain required"
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests "
+"without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
+
+msgid "Download and install package"
+msgstr "Download and install package"
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr "EAP-Method"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr "Enable/Disable"
+
+msgid "Enabled"
+msgstr "Enabled"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Enables the Spanning Tree Protocol on this bridge"
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr "Encryption"
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Ethernet Adapter"
+msgstr "Ethernet Adapter"
+
+msgid "Ethernet Switch"
+msgstr "Ethernet Switch"
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr "Fast Frames"
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr "Filesystem"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Filter private"
+msgstr "Filter private"
+
+msgid "Filter useless"
+msgstr "Filter useless"
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr "Find package"
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Firewall Settings"
+
+msgid "Firewall Status"
+msgstr "Firewall Status"
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr "Flags"
+
+msgid "Flash Firmware"
+msgstr "Flash Firmware"
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr "Force"
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr "Fragmentation Threshold"
+
+msgid "Frame Bursting"
+msgstr "Frame Bursting"
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr "Frequency Hopping"
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr "General Setup"
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr "Go to relevant configuration page"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Handler"
+
+msgid "Hang Up"
+msgstr "Hang Up"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Host entries"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr "Hostnames"
+
+msgid "IP address"
+msgstr "IP address"
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr "Identity"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr "Ignore interface"
+
+msgid "Ignore resolve file"
+msgstr "Ignore resolve file"
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr "In"
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr "Initscript"
+
+msgid "Initscripts"
+msgstr "Initscripts"
+
+msgid "Install"
+msgstr "Install"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr "Invalid input value"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Invalid username and/or password! Please try again."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"It appears that you try to flash an image that does not fit into the flash "
+"memory, please verify the image file!"
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr "Join Network"
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr "Kernel Log"
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr "Key"
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr "Kill"
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr "Leasefile"
+
+msgid "Leasetime"
+msgstr "Leasetime"
+
+msgid "Leasetime remaining"
+msgstr "Leasetime remaining"
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr "Limit"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Link On"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr "Load"
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr "Local Time"
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr "Localise queries"
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr "Log queries"
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr "MAC-Address Filter"
+
+msgid "MAC-Filter"
+msgstr "MAC-Filter"
+
+msgid "MAC-List"
+msgstr "MAC-List"
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr "Maximum Rate"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr "Maximum hold time"
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr "Memory"
+
+msgid "Memory usage (%)"
+msgstr "Memory usage (%)"
+
+msgid "Metric"
+msgstr "Metric"
+
+msgid "Minimum Rate"
+msgstr "Minimum Rate"
+
+msgid "Minimum hold time"
+msgstr "Minimum hold time"
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Modem device"
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr "Mount Point"
+
+msgid "Mount Points"
+msgstr "Mount Points"
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr "Mounted file systems"
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr "Multicast Rate"
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr "Name of the new network"
+
+msgid "Navigation"
+msgstr "Navigation"
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr "Network"
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr "No chains in this table"
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr "No rules in this chain"
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr "Noise"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "OPKG-Configuration"
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr "Out"
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr "Outdoor Channels"
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Overview"
+
+msgid "Owner"
+msgstr "Owner"
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA Encapsulation"
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr "Package name"
+
+msgid "Packets"
+msgstr "Packets"
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Password authentication"
+msgstr "Password authentication"
+
+msgid "Password of Private Key"
+msgstr "Password of Private Key"
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr "Path to CA-Certificate"
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr "Path to Private Key"
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr "Perform reboot"
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr "Physical Settings"
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr "Pkts."
+
+msgid "Please enter your username and password."
+msgstr "Please enter your username and password."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Please wait: Device rebooting..."
+
+msgid "Policy"
+msgstr "Policy"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr "Prevents client-to-client communication"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr "Proceed"
+
+msgid "Processes"
+msgstr "Processes"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS Threshold"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr "Reboot"
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr "Reboots the operating system of your device"
+
+msgid "Receive"
+msgstr "Receive"
+
+msgid "Receiver Antenna"
+msgstr "Receiver Antenna"
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr "References"
+
+msgid "Regulatory Domain"
+msgstr "Regulatory Domain"
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr "Remove"
+
+msgid "Repeat scan"
+msgstr "Repeat scan"
+
+msgid "Replace entry"
+msgstr "Replace entry"
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Reset Counters"
+msgstr "Reset Counters"
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr "Restart"
+
+msgid "Restart Firewall"
+msgstr "Restart Firewall"
+
+msgid "Restore backup"
+msgstr "Restore backup"
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr "Revert"
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr "Routes"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+
+msgid "Rule #"
+msgstr "Rule #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Save"
+
+msgid "Save & Apply"
+msgstr "Save & Apply"
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr "Scan"
+
+msgid "Scheduled Tasks"
+msgstr "Scheduled Tasks"
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr "Separate Clients"
+
+msgid "Separate WDS"
+msgstr "Separate WDS"
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr "Services"
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr "Signal"
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr "Size"
+
+msgid "Skip"
+msgstr "Skip"
+
+msgid "Skip to content"
+msgstr "Skip to content"
+
+msgid "Skip to navigation"
+msgstr "Skip to navigation"
+
+msgid "Slot time"
+msgstr "Slot time"
+
+msgid "Software"
+msgstr "Software"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr "Source"
+
+msgid "Specifies the button state to handle"
+msgstr "Specifies the button state to handle"
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Start priority"
+msgstr "Start priority"
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr "Static IPv4 Routes"
+
+msgid "Static IPv6 Routes"
+msgstr "Static IPv6 Routes"
+
+msgid "Static Leases"
+msgstr "Static Leases"
+
+msgid "Static Routes"
+msgstr "Static Routes"
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Stop"
+msgstr "Stop"
+
+msgid "Strict order"
+msgstr "Strict order"
+
+msgid "Submit"
+msgstr "Submit"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr "Switch"
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr "System"
+
+msgid "System Log"
+msgstr "System Log"
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr "Table"
+
+msgid "Target"
+msgstr "Target"
+
+msgid "Terminate"
+msgstr "Terminate"
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr "The following changes have been reverted"
+
+msgid "The following rules are currently active on this system."
+msgstr "The following rules are currently active on this system."
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes until you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "This is the system crontab in which scheduled tasks can be defined."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"This list gives an overview over currently running system processes and "
+"their status."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "This page gives an overview over currently active network connections."
+
+msgid "This section contains no values yet"
+msgstr "This section contains no values yet"
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr "Timezone"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr "Traffic"
+
+msgid "Transfer"
+msgstr "Transfer"
+
+msgid "Transmission Rate"
+msgstr "Transmission Rate"
+
+msgid "Transmit"
+msgstr "Transmit"
+
+msgid "Transmit Power"
+msgstr "Transmit Power"
+
+msgid "Transmitter Antenna"
+msgstr "Transmitter Antenna"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Turbo Mode"
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr "Type"
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr "Unsaved Changes"
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr "Uploaded File"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Use <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr "Used"
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr "Username"
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr "Version"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr "WMM Mode"
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "Warning: There are unsaved changes that will be lost while rebooting!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr "Wireless Adapter"
+
+msgid "Wireless Network"
+msgstr "Wireless Network"
+
+msgid "Wireless Overview"
+msgstr "Wireless Overview"
+
+msgid "Wireless Security"
+msgstr "Wireless Security"
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr "XR Support"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr "auto"
+
+msgid "automatic"
+msgstr "automatic"
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "creates a bridge over specified interface(s)"
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr "disable"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr "help"
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "if target is a network"
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+
+msgid "no"
+msgstr ""
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr "none"
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr ""
+
+msgid "unspecified"
+msgstr ""
+
+msgid "unspecified -or- create:"
+msgstr "unspecified -or- create:"
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "« Back"
+msgstr "« Back"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz 2nd channel above"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz 2nd channel below"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Accept router advertisements"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Advertise IPv6 on network"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Advertised network ID"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Allowed range is 1 to 65535"
+
+#~ msgid "Active Leases"
+#~ msgstr "Active Leases"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Bit Rate"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Configuration / Apply"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Configuration / Changes"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Configuration / Revert"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encrypted\">Encr.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+
+#~ msgid "Create Network"
+#~ msgstr "Create Network"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Networks"
+#~ msgstr "Networks"
+
+#~ msgid "Power"
+#~ msgstr "Power"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Wifi networks in your local environment"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Files to be kept when flashing a new firmware"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Post-commit actions"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "ARP ping retries"
+
+#~ msgid "ATM Settings"
+#~ msgstr "ATM Settings"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "Accept Router Advertisements"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Access point (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Additional pppd options"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "Allowed range is 1 to FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Automatic Disconnect"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Backup Archive"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+
+#~ msgid "Connect script"
+#~ msgstr "Connect script"
+
+#~ msgid "Create backup"
+#~ msgstr "Create backup"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Disconnect script"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Edit package lists and installation targets"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Enable IPv6 on PPP link"
+
+#~ msgid "Firmware image"
+#~ msgstr "Firmware image"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+
+#~ msgid "Installation targets"
+#~ msgstr "Installation targets"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Keep configuration files"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "Let pppd run this script after establishing the PPP link"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Let pppd run this script before tearing down the PPP link"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr "Number of failed connection tests to initiate automatic reconnect"
+
+#~ msgid "PIN code"
+#~ msgstr "PIN code"
+
+#~ msgid "PPP Settings"
+#~ msgstr "PPP Settings"
+
+#~ msgid "Package lists"
+#~ msgstr "Package lists"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Proceed reverting all settings and resetting to firmware defaults?"
+
+#~ msgid "Processor"
+#~ msgstr "Processor"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radius-Port"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radius-Server"
+
+#~ msgid "Replace default route"
+#~ msgstr "Replace default route"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Reset router to defaults"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+
+#~ msgid "Service type"
+#~ msgstr "Service type"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "Services and daemons perform certain tasks on your device."
+
+#~ msgid "Settings"
+#~ msgstr "Settings"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Setup wait time"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Specify additional command line arguments for pppd here"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "The device node of your modem, e.g. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "Time (in seconds) after which an unused connection will be closed"
+
+#~ msgid "Update package lists"
+#~ msgstr "Update package lists"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Upload an libreCMC image file to reflash the device."
+
+#~ msgid "Upload image"
+#~ msgstr "Upload image"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Use peer DNS"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+
+#~ msgid "back"
+#~ msgstr "back"
+
+#~ msgid "buffered"
+#~ msgstr "buffered"
+
+#~ msgid "cached"
+#~ msgstr "cached"
+
+#~ msgid "free"
+#~ msgstr "free"
+
+#~ msgid "static"
+#~ msgstr "static"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "About"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "Active IP Connections"
+
+#~ msgid "Addresses"
+#~ msgstr "Addresses"
+
+#~ msgid "Admin Password"
+#~ msgstr "Admin Password"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Authentication Realm"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Bridge Port"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Client + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Configuration file"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Connection timeout"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Contributing Developers"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP assigned"
+
+#~ msgid "Document root"
+#~ msgstr "Document root"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Enable Keep-Alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Ethernet Bridge"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "IP Configuration"
+
+#~ msgid "Interface Status"
+#~ msgstr "Interface Status"
+
+#~ msgid "Lead Development"
+#~ msgstr "Lead Development"
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Master + WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "Not configured"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Password successfully changed"
+
+#~ msgid "Plugin path"
+#~ msgstr "Plugin path"
+
+#~ msgid "Ports"
+#~ msgstr "Ports"
+
+#~ msgid "Primary"
+#~ msgstr "Primary"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Project Homepage"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Thanks To"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Unknown Error"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "defaults to <code>/etc/httpd.conf</code>"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG error code %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Package lists updated"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Upgrade installed packages"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+
+#~ msgid "Search file..."
+#~ msgstr "Search file..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "And now have fun with your router!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+
+#~ msgid "Hello!"
+#~ msgstr "Hello!"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "User Interface"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "(hidden)"
+#~ msgstr "(hidden)"
+
+#~ msgid "(optional)"
+#~ msgstr "(optional)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "AP-Isolation"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Add the Wifi network to physical network"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliases"
+
+#~ msgid "Attach to existing network"
+#~ msgstr "Attach to existing network"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Create Or Attach Network"
+
+#~ msgid "DHCP"
+#~ msgstr "DHCP"
+
+#~ msgid "Devices"
+#~ msgstr "Devices"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Don&#39;t forward reverse lookups for local networks"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Enable TFTP-Server"
+
+#~ msgid "Errors"
+#~ msgstr "Errors"
+
+#~ msgid "Essentials"
+#~ msgstr "Essentials"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Expand Hosts"
+
+#~ msgid "First leased address"
+#~ msgstr "First leased address"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Hardware Address"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Here you can configure installed wifi devices."
+
+#~ msgid ""
+#~ "If the interface is attached to an existing network it will be "
+#~ "<em>bridged</em> to the existing interfaces and is covered by the "
+#~ "firewall zone of the choosen network.<br />Uncheck the attach option to "
+#~ "define a new standalone network for this interface."
+#~ msgstr ""
+#~ "If the interface is attached to an existing network it will be "
+#~ "<em>bridged</em> to the existing interfaces and is covered by the "
+#~ "firewall zone of the choosen network.<br />Uncheck the attach option to "
+#~ "define a new standalone network for this interface."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignore <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Independent (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Internet Connection"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Join (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Leases"
+
+#~ msgid "Local Domain"
+#~ msgstr "Local Domain"
+
+#~ msgid "Local Network"
+#~ msgstr "Local Network"
+
+#~ msgid "Local Server"
+#~ msgstr "Local Server"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Network Boot Image"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Number of leased addresses"
+
+#~ msgid "Path"
+#~ msgstr "Path"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Perform Actions"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Prevents Client to Client communication"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Provide (Access Point)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Resolvfile"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "TFTP-Server Root"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "The following changes have been applied"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+
+#~ msgid "Wireless Scan"
+#~ msgstr "Wireless Scan"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+
+#~ msgid ""
+#~ "You are about to join the wireless network <em><strong>%s</strong></em>. "
+#~ "In order to complete the process, you need to provide some additional "
+#~ "details."
+#~ msgstr ""
+#~ "You are about to join the wireless network <em><strong>%s</strong></em>. "
+#~ "In order to complete the process, you need to provide some additional "
+#~ "details."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+
+#~ msgid ""
+#~ "You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
+#~ msgstr ""
+#~ "You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
+
+#~ msgid ""
+#~ "You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> "
+#~ "to use WPA!"
+#~ msgstr ""
+#~ "You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> "
+#~ "to use WPA!"
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "additional hostfile"
+#~ msgstr "additional hostfile"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "adds domain names to hostentries in the resolv file"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "automatically reconnect"
+
+#~ msgid "concurrent queries"
+#~ msgstr "concurrent queries"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "disconnect when idle for"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "don&#39;t cache unknown"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+
+#~ msgid "installed"
+#~ msgstr "installed"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "localises the hostname depending on its subnet"
+
+#~ msgid "manual"
+#~ msgstr "manual"
+
+#~ msgid "not installed"
+#~ msgstr "not installed"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+
+#~ msgid "query port"
+#~ msgstr "query port"
+
+#~ msgid "transmitted / received"
+#~ msgstr "transmitted / received"
+
+#~ msgid "all"
+#~ msgstr "all"
+
+#~ msgid "Code"
+#~ msgstr "Code"
+
+#~ msgid "Distance"
+#~ msgstr "Distance"
+
+#~ msgid "Legend"
+#~ msgstr "Legend"
+
+#~ msgid "Library"
+#~ msgstr "Library"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "see &#39;%s&#39; manpage"
+
+#~ msgid "Package Manager"
+#~ msgstr "Package Manager"
+
+#~ msgid "Service"
+#~ msgstr "Service"
+
+#~ msgid "Statistics"
+#~ msgstr "Statistics"
+
+#~ msgid "zone"
+#~ msgstr "Zone"
diff --git a/trunk/package/luci/po/en/commands.po b/trunk/package/luci/po/en/commands.po
new file mode 100644
index 00000000..754a229c
--- /dev/null
+++ b/trunk/package/luci/po/en/commands.po
@@ -0,0 +1,95 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "A short textual description of the configured command"
+msgstr "A short textual description of the configured command"
+
+msgid "Access command with"
+msgstr "Access command with"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Allow the user to provide additional command line arguments"
+
+msgid "Arguments:"
+msgstr "Arguments:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Binary data not displayed, download instead."
+
+msgid "Code:"
+msgstr "Code:"
+
+msgid "Collecting data..."
+msgstr "Collecting data..."
+
+msgid "Command"
+msgstr "Command"
+
+msgid "Command failed"
+msgstr "Command failed"
+
+msgid "Command line to execute"
+msgstr "Command line to execute"
+
+msgid "Command successful"
+msgstr "Command successful"
+
+msgid "Command:"
+msgstr "Command:"
+
+msgid "Configure"
+msgstr "Configure"
+
+msgid "Custom Commands"
+msgstr "Custom Commands"
+
+msgid "Custom arguments"
+msgstr "Custom arguments"
+
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Download"
+msgstr "Download"
+
+msgid "Failed to execute command!"
+msgstr "Failed to execute command!"
+
+msgid "Link"
+msgstr "Link"
+
+msgid "Loading"
+msgstr "Loading"
+
+msgid "Public access"
+msgstr "Public access"
+
+msgid "Run"
+msgstr "Run"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+
+msgid "Waiting for command to complete..."
+msgstr "Waiting for command to complete..."
diff --git a/trunk/package/luci/po/en/coovachilli.po b/trunk/package/luci/po/en/coovachilli.po
new file mode 100644
index 00000000..ebaa3452
--- /dev/null
+++ b/trunk/package/luci/po/en/coovachilli.po
@@ -0,0 +1,639 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-03-18 05:30+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
+
+#, fuzzy
+#~ msgid "General configuration"
+#~ msgstr "General configuration"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "General CoovaChilli settings"
+
+#~ msgid "Command socket"
+#~ msgstr "Command socket"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "UNIX socket used for communication with chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Config refresh interval"
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+
+#~ msgid "Pid file"
+#~ msgstr "Pid file"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr "Filename to put the process id"
+
+#~ msgid "State directory"
+#~ msgstr "State directory"
+
+#~ msgid "Directory of non-volatile data"
+#~ msgstr "Directory of non-volatile data"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "TUN/TAP configuration"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Network/Tun configuration"
+
+#~ msgid "Network down script"
+#~ msgstr "Network down script"
+
+#~ msgid ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+#~ msgstr ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+
+#~ msgid "Network up script"
+#~ msgstr "Network up script"
+
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr "Script executed after the tun network interface has been brought up"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Primary DNS Server"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Secondary DNS Server"
+
+#~ msgid "Domain name"
+#~ msgstr "Domain name"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Dynamic IP address pool"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Specifies a pool of dynamic IP addresses"
+
+#~ msgid "IP down script"
+#~ msgstr "IP down script"
+
+#~ msgid "Script executed after the tun network interface has been taken down"
+#~ msgstr "Script executed after the tun network interface has been taken down"
+
+#~ msgid "IP up script"
+#~ msgstr "IP up script"
+
+#~ msgid ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+#~ msgstr ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+
+#~ msgid "Uplink subnet"
+#~ msgstr "Uplink subnet"
+
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr "Network address of the uplink interface (CIDR notation)"
+
+#~ msgid "Static IP address pool"
+#~ msgstr "Static IP address pool"
+
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Specifies a pool of static IP addresses"
+
+#~ msgid "TUN/TAP device"
+#~ msgstr "TUN/TAP device"
+
+#~ msgid "The specific device to use for the TUN/TAP interface"
+#~ msgstr "The specific device to use for the TUN/TAP interface"
+
+#~ msgid "TX queue length"
+#~ msgstr "TX queue length"
+
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr "The TX queue length to set on the TUN/TAP interface"
+
+#~ msgid "Use TAP device"
+#~ msgstr "Use TAP device"
+
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Use the TAP interface instead of TUN"
+
+#~ msgid "DHCP configuration"
+#~ msgstr "DHCP configuration"
+
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Set DHCP options for connecting clients"
+
+#~ msgid "DHCP end number"
+#~ msgstr "DHCP end number"
+
+#~ msgid "Where to stop assigning IP addresses (default 254)"
+#~ msgstr "Where to stop assigning IP addresses (default 254)"
+
+#~ msgid "DHCP interface"
+#~ msgstr "DHCP interface"
+
+#~ msgid "Ethernet interface to listen to for the downlink interface"
+#~ msgstr "Ethernet interface to listen to for the downlink interface"
+
+#~ msgid "Listen MAC address"
+#~ msgstr "Listen MAC address"
+
+#~ msgid ""
+#~ "MAC address to listen to. If not specified the MAC address of the "
+#~ "interface will be used"
+#~ msgstr ""
+#~ "MAC address to listen to. If not specified the MAC address of the "
+#~ "interface will be used"
+
+#~ msgid "DHCP start number"
+#~ msgstr "DHCP start number"
+
+#~ msgid "Where to start assigning IP addresses (default 10)"
+#~ msgstr "Where to start assigning IP addresses (default 10)"
+
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Enable IEEE 802.1x"
+
+#~ msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
+#~ msgstr "Enable IEEE 802.1x authentication and listen for EAP requests"
+
+#~ msgid "Leasetime"
+#~ msgstr "Leasetime"
+
+#~ msgid "Use a DHCP lease of seconds (default 600)"
+#~ msgstr "Use a DHCP lease of seconds (default 600)"
+
+#~ msgid "Allow session update through RADIUS"
+#~ msgstr "Allow session update through RADIUS"
+
+#~ msgid ""
+#~ "Allow updating of session parameters with RADIUS attributes sent in "
+#~ "Accounting-Response"
+#~ msgstr ""
+#~ "Allow updating of session parameters with RADIUS attributes sent in "
+#~ "Accounting-Response"
+
+#~ msgid "Admin password"
+#~ msgstr "Admin password"
+
+#~ msgid ""
+#~ "Password to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Password to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+
+#~ msgid "Admin user"
+#~ msgstr "Admin user"
+
+#~ msgid ""
+#~ "User-name to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "User-name to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+
+#~ msgid "Do not check disconnection requests"
+#~ msgstr "Do not check disconnection requests"
+
+#~ msgid "Do not check the source IP address of radius disconnect requests"
+#~ msgstr "Do not check the source IP address of radius disconnect requests"
+
+#~ msgid "RADIUS disconnect port"
+#~ msgstr "RADIUS disconnect port"
+
+#~ msgid "UDP port to listen to for accepting radius disconnect requests"
+#~ msgstr "UDP port to listen to for accepting radius disconnect requests"
+
+#~ msgid "NAS IP"
+#~ msgstr "NAS IP"
+
+#~ msgid "Value to use in RADIUS NAS-IP-Address attribute"
+#~ msgstr "Value to use in RADIUS NAS-IP-Address attribute"
+
+#~ msgid "NAS MAC"
+#~ msgstr "NAS MAC"
+
+#~ msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
+#~ msgstr "MAC address value to use in RADIUS Called-Station-ID attribute"
+
+#~ msgid "Allow OpenID authentication"
+#~ msgstr "Allow OpenID authentication"
+
+#~ msgid ""
+#~ "Allows OpenID authentication by sending ChilliSpot-Config=allow-"
+#~ "openidauth in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Allows OpenID authentication by sending ChilliSpot-Config=allow-"
+#~ "openidauth in RADIUS Access-Requests"
+
+#~ msgid "RADIUS accounting port"
+#~ msgstr "RADIUS accounting port"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius accounting requests (default 1813)"
+#~ msgstr ""
+#~ "The UDP port number to use for radius accounting requests (default 1813)"
+
+#~ msgid "RADIUS authentication port"
+#~ msgstr "RADIUS authentication port"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius authentication requests (default "
+#~ "1812)"
+#~ msgstr ""
+#~ "The UDP port number to use for radius authentication requests (default "
+#~ "1812)"
+
+#~ msgid "Option radiuscalled"
+#~ msgstr "Option radiuscalled"
+
+#~ msgid "RADIUS listen address"
+#~ msgstr "RADIUS listen address"
+
+#~ msgid "Local interface IP address to use for the radius interface"
+#~ msgstr "Local interface IP address to use for the radius interface"
+
+#~ msgid "RADIUS location ID"
+#~ msgstr "RADIUS location ID"
+
+#~ msgid "WISPr Location ID"
+#~ msgstr "WISPr Location ID"
+
+#~ msgid "RADIUS location name"
+#~ msgstr "RADIUS location name"
+
+#~ msgid "WISPr Location Name"
+#~ msgstr "WISPr Location Name"
+
+#~ msgid "NAS ID"
+#~ msgstr "NAS ID"
+
+#~ msgid "Network access server identifier"
+#~ msgstr "Network access server identifier"
+
+#~ msgid "Option radiusnasip"
+#~ msgstr "Option radiusnasip"
+
+#~ msgid "NAS port type"
+#~ msgstr "NAS port type"
+
+#~ msgid ""
+#~ "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
+#~ msgstr ""
+#~ "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
+
+#~ msgid "Send RADIUS VSA"
+#~ msgstr "Send RADIUS VSA"
+
+#~ msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
+#~ msgstr "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
+
+#~ msgid "RADIUS secret"
+#~ msgstr "RADIUS secret"
+
+#~ msgid "Radius shared secret for both servers"
+#~ msgstr "Radius shared secret for both servers"
+
+#~ msgid "RADIUS server 1"
+#~ msgstr "RADIUS server 1"
+
+#~ msgid "The IP address of radius server 1"
+#~ msgstr "The IP address of radius server 1"
+
+#~ msgid "RADIUS server 2"
+#~ msgstr "RADIUS server 2"
+
+#~ msgid "The IP address of radius server 2"
+#~ msgstr "The IP address of radius server 2"
+
+#~ msgid "Swap octets"
+#~ msgstr "Swap octets"
+
+#~ msgid ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+#~ msgstr ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+
+#~ msgid "Allow WPA guests"
+#~ msgstr "Allow WPA guests"
+
+#~ msgid ""
+#~ "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+#~ "guests in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+#~ "guests in RADIUS Access-Requests"
+
+#~ msgid "Proxy client"
+#~ msgstr "Proxy client"
+
+#~ msgid ""
+#~ "IP address from which radius requests are accepted. If omitted the server "
+#~ "will not accept radius requests"
+#~ msgstr ""
+#~ "IP address from which radius requests are accepted. If omitted the server "
+#~ "will not accept radius requests"
+
+#~ msgid "Proxy listen address"
+#~ msgstr "Proxy listen address"
+
+#~ msgid "Local interface IP address to use for accepting radius requests"
+#~ msgstr "Local interface IP address to use for accepting radius requests"
+
+#~ msgid "Proxy port"
+#~ msgstr "Proxy port"
+
+#~ msgid "UDP Port to listen to for accepting radius requests"
+#~ msgstr "UDP Port to listen to for accepting radius requests"
+
+#~ msgid "Proxy secret"
+#~ msgstr "Proxy secret"
+
+#~ msgid "Radius shared secret for clients"
+#~ msgstr "Radius shared secret for clients"
+
+#~ msgid "UAM configuration"
+#~ msgstr "UAM configuration"
+
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Unified Configuration Method settings"
+
+#~ msgid "Use Chilli XML"
+#~ msgstr "Use Chilli XML"
+
+#~ msgid "Return the so-called Chilli XML along with WISPr XML"
+#~ msgstr "Return the so-called Chilli XML along with WISPr XML"
+
+#~ msgid "Default idle timeout"
+#~ msgstr "Default idle timeout"
+
+#~ msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
+
+#~ msgid "Default interim interval"
+#~ msgstr "Default interim interval"
+
+#~ msgid ""
+#~ "Default interim-interval for RADIUS accounting unless otherwise set by "
+#~ "RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Default interim-interval for RADIUS accounting unless otherwise set by "
+#~ "RADIUS (defaults to 0)"
+
+#~ msgid "Default session timeout"
+#~ msgstr "Default session timeout"
+
+#~ msgid ""
+#~ "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
+
+#~ msgid "Inspect DNS traffic"
+#~ msgstr "Inspect DNS traffic"
+
+#~ msgid ""
+#~ "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
+#~ "records to prevent dns tunnels (experimental)"
+#~ msgstr ""
+#~ "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
+#~ "records to prevent dns tunnels (experimental)"
+
+#~ msgid "Local users file"
+#~ msgstr "Local users file"
+
+#~ msgid ""
+#~ "A colon seperated file containing usernames and passwords of locally "
+#~ "authenticated users"
+#~ msgstr ""
+#~ "A colon seperated file containing usernames and passwords of locally "
+#~ "authenticated users"
+
+#~ msgid "Location name"
+#~ msgstr "Location name"
+
+#~ msgid "Human readable location name used in JSON interface"
+#~ msgstr "Human readable location name used in JSON interface"
+
+#~ msgid "Do not redirect to UAM server"
+#~ msgstr "Do not redirect to UAM server"
+
+#~ msgid ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+#~ msgstr ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+
+#~ msgid "Do not do WISPr"
+#~ msgstr "Do not do WISPr"
+
+#~ msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
+#~ msgstr "Do not do any WISPr XML, assume the back-end is doing this instead"
+
+#~ msgid "Post auth proxy"
+#~ msgstr "Post auth proxy"
+
+#~ msgid ""
+#~ "Used with postauthproxyport to define a post authentication HTTP proxy "
+#~ "server"
+#~ msgstr ""
+#~ "Used with postauthproxyport to define a post authentication HTTP proxy "
+#~ "server"
+
+#~ msgid "Post auth proxy port"
+#~ msgstr "Post auth proxy port"
+
+#~ msgid ""
+#~ "Used with postauthproxy to define a post authentication HTTP proxy server"
+#~ msgstr ""
+#~ "Used with postauthproxy to define a post authentication HTTP proxy server"
+
+#~ msgid "Allowed resources"
+#~ msgstr "Allowed resources"
+
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr ""
+#~ "List of resources the client can access without first authenticating"
+
+#~ msgid "Allow any DNS server"
+#~ msgstr "Allow any DNS server"
+
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr "Allow any DNS server for unauthenticated clients"
+
+#~ msgid "Allow any IP address"
+#~ msgstr "Allow any IP address"
+
+#~ msgid ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+#~ msgstr ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+
+#~ msgid "Allowed domains"
+#~ msgstr "Allowed domains"
+
+#~ msgid ""
+#~ "Defines a list of domain names to automatically add to the walled garden"
+#~ msgstr ""
+#~ "Defines a list of domain names to automatically add to the walled garden"
+
+#~ msgid "UAM homepage"
+#~ msgstr "UAM homepage"
+
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr "URL of homepage to redirect unauthenticated users to"
+
+#~ msgid "UAM static content port"
+#~ msgstr "UAM static content port"
+
+#~ msgid "TCP port to bind to for only serving embedded content"
+#~ msgstr "TCP port to bind to for only serving embedded content"
+
+#~ msgid "UAM listening address"
+#~ msgstr "UAM listening address"
+
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr "IP address to listen to for authentication of clients"
+
+#~ msgid "UAM logout IP"
+#~ msgstr "UAM logout IP"
+
+#~ msgid ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+#~ msgstr ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+
+#~ msgid "UAM listening port"
+#~ msgstr "UAM listening port"
+
+#~ msgid "TCP port to bind to for authenticating clients (default 3990)"
+#~ msgstr "TCP port to bind to for authenticating clients (default 3990)"
+
+#~ msgid "UAM secret"
+#~ msgstr "UAM secret"
+
+#~ msgid "Shared secret between uamserver and chilli"
+#~ msgstr "Shared secret between uamserver and chilli"
+
+#~ msgid "UAM server"
+#~ msgstr "UAM server"
+
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr "URL of web server to use for authenticating clients"
+
+#~ msgid "UAM user interface"
+#~ msgstr "UAM user interface"
+
+#~ msgid ""
+#~ "An init.d style program to handle local content on the uamuiport web "
+#~ "server"
+#~ msgstr ""
+#~ "An init.d style program to handle local content on the uamuiport web "
+#~ "server"
+
+#~ msgid "Use status file"
+#~ msgstr "Use status file"
+
+#~ msgid ""
+#~ "Write the status of clients in a non-volatile state file (experimental)"
+#~ msgstr ""
+#~ "Write the status of clients in a non-volatile state file (experimental)"
+
+#~ msgid "WISPr login url"
+#~ msgstr "WISPr login url"
+
+#~ msgid "Specific URL to be given in WISPr XML LoginURL"
+#~ msgstr "Specific URL to be given in WISPr XML LoginURL"
+
+#~ msgid "CGI program"
+#~ msgstr "CGI program"
+
+#~ msgid ""
+#~ "Executable to run as a CGI type program (like haserl) for URLs with "
+#~ "extention .chi"
+#~ msgstr ""
+#~ "Executable to run as a CGI type program (like haserl) for URLs with "
+#~ "extention .chi"
+
+#~ msgid "Web content directory"
+#~ msgstr "Web content directory"
+
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr "Directory where embedded local web content is placed"
+
+#~ msgid "MAC configuration"
+#~ msgstr "MAC configuration"
+
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Configure MAC authentication"
+
+#~ msgid "Allowed MAC addresses"
+#~ msgstr "Allowed MAC addresses"
+
+#~ msgid "List of MAC addresses for which MAC authentication will be performed"
+#~ msgstr ""
+#~ "List of MAC addresses for which MAC authentication will be performed"
+
+#~ msgid "Authenticate locally allowed MACs"
+#~ msgstr "Authenticate locally allowed MACs"
+
+#~ msgid "Authenticate allowed MAC addresses without the use of RADIUS"
+#~ msgstr "Authenticate allowed MAC addresses without the use of RADIUS"
+
+#~ msgid "Enable MAC authentification"
+#~ msgstr "Enable MAC authentification"
+
+#~ msgid "Try to authenticate all users based on their mac address alone"
+#~ msgstr "Try to authenticate all users based on their mac address alone"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "Password used when performing MAC authentication"
+#~ msgstr "Password used when performing MAC authentication"
+
+#~ msgid "Suffix"
+#~ msgstr "Suffix"
+
+#~ msgid "coovachilli_macauth_macsuffix_desc"
+#~ msgstr ""
+#~ "Suffix to add to the MAC address in order to form the User-Name, which is "
+#~ "sent to the radius server"
diff --git a/trunk/package/luci/po/en/ddns.po b/trunk/package/luci/po/en/ddns.po
new file mode 100644
index 00000000..66f199ff
--- /dev/null
+++ b/trunk/package/luci/po/en/ddns.po
@@ -0,0 +1,88 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Check for changed IP every"
+msgstr "Check for changed IP every"
+
+msgid "Check-time unit"
+msgstr "Check-time unit"
+
+msgid "Custom update-URL"
+msgstr "Custom update-URL"
+
+msgid "Dynamic DNS"
+msgstr "Dynamic DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+
+msgid "Enable"
+msgstr "Enable"
+
+msgid "Force update every"
+msgstr "Force update every"
+
+msgid "Force-time unit"
+msgstr "Force-time unit"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Network"
+msgstr "Network"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Source of IP address"
+msgstr "Source of IP address"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Username"
+
+msgid "custom"
+msgstr "custom"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "interface"
+msgstr "interface"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "network"
+
+#~ msgid "Event interface"
+#~ msgstr "Event interface"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "On which interface up should start the ddns script process."
diff --git a/trunk/package/luci/po/en/diag_core.po b/trunk/package/luci/po/en/diag_core.po
new file mode 100644
index 00000000..aa030efb
--- /dev/null
+++ b/trunk/package/luci/po/en/diag_core.po
@@ -0,0 +1,42 @@
+# Diagnostics Core.
+# Copyright (C) 2009 Daniel Dickinson.
+# Daniel Dickinson <crazycshore@gmail.com>, 2009.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: diag-core 0.1\n"
+"PO-Revision-Date: 2009-07-17 04:54-0400\n"
+"Last-Translator: Daniel Dickinson <crazycshore@gmail.com>\n"
+"Language-Team: en <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configure Diagnostics"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+
+#~ msgid "l_d_diag"
+#~ msgstr "Diagnostics"
diff --git a/trunk/package/luci/po/en/diag_devinfo.po b/trunk/package/luci/po/en/diag_devinfo.po
new file mode 100644
index 00000000..7adbbeaa
--- /dev/null
+++ b/trunk/package/luci/po/en/diag_devinfo.po
@@ -0,0 +1,213 @@
+# Diagnostics (Device Info).
+# Copyright (C) 2009 Daniel Dickinson
+# Daniel Dickinson <crazycshore@gmail.com>, 2009.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2009-07-17 04:22-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr "Add"
+
+msgid "Beginning of MAC address range"
+msgstr "Beginning of MAC address range"
+
+msgid "Config Phone Scan"
+msgstr "Config Phone Scan"
+
+msgid "Configure"
+msgstr "Configure"
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "Device Scan Config"
+msgstr "Device Scan Config"
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr ""
+
+msgid "Devices on Network"
+msgstr "Devices on Network"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Enable"
+msgstr "Enable"
+
+msgid "End of MAC address range"
+msgstr "End of MAC address range"
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Invalid"
+msgstr "Invalid"
+
+msgid "Link to Device"
+msgstr "Link to Device"
+
+msgid "MAC Address"
+msgstr "MAC Address"
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr "MAC Device Override"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr "MAC range and information used to override system and IEEE databases"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Milliseconds to sleep between requests (default 100)"
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr "No SIP devices"
+
+msgid "No devices detected"
+msgstr "No devices detected"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Number of times to send requests (default 1)"
+
+msgid "OUI Owner"
+msgstr "OUI Owner"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr "Phone Information"
+
+msgid "Phone Scan"
+msgstr "Phone Scan"
+
+msgid "Phone Scanning Configuration"
+msgstr "Phone Scanning Configuration"
+
+msgid "Phones"
+msgstr "Phones"
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr "Raw"
+
+msgid "Repeat Count"
+msgstr "Repeat Count"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr "SIP Device Information"
+
+msgid "SIP Device Scan"
+msgstr "SIP Device Scan"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "SIP Device Scanning Configuration"
+
+msgid "SIP Devices on Network"
+msgstr "SIP Devices on Network"
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr "Scan for devices on specified networks."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr "Scans for devices on specified networks."
+
+msgid "Sleep Between Requests"
+msgstr "Sleep Between Requests"
+
+msgid "Subnet"
+msgstr "Subnet"
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Time to wait for responses in seconds (default 10)"
+
+msgid "Timeout"
+msgstr "Timeout"
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr "check other networks"
diff --git a/trunk/package/luci/po/en/ffwizard.po b/trunk/package/luci/po/en/ffwizard.po
new file mode 100644
index 00000000..ac523a42
--- /dev/null
+++ b/trunk/package/luci/po/en/ffwizard.po
@@ -0,0 +1,171 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-15 17:26+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Allow to transfer anonymous statistics about this node"
+
+msgid "Channel"
+msgstr "Channel"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Check this to protect your LAN from other nodes or clients"
+
+msgid "Configure network"
+msgstr "Configure network"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Connect your node with other nodes with a tunnel via the internet."
+
+msgid "DHCP IP range"
+msgstr "DHCP IP range"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP will automatically assign ip addresses to clients"
+
+msgid "DNS Server"
+msgstr "DNS Server"
+
+msgid "Enable DHCP"
+msgstr "Enable DHCP"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Heartbeat"
+msgstr "Heartbeat"
+
+msgid "IP address"
+msgstr "IP address"
+
+msgid "L2gvpn tunnel"
+msgstr "L2gvpn tunnel"
+
+msgid "Limit download bandwidth"
+msgstr "Limit download bandwidth"
+
+msgid "Limit upload bandwidth"
+msgstr "Limit upload bandwidth"
+
+msgid "Mesh IP address"
+msgstr "Mesh IP address"
+
+msgid "Mesh IPv6 Address"
+msgstr "Mesh IPv6 Address"
+
+msgid "Netmask"
+msgstr "Netmask"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Password confirmation"
+msgstr "Password confirmation"
+
+msgid "Password successfully changed"
+msgstr "Password successfully changed"
+
+msgid "Protect LAN"
+msgstr "Protect LAN"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Select this checkbox to configure your network interfaces."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Select this to allow others to use your connection to access the internet."
+
+msgid "Share your internet connection"
+msgstr "Share your internet connection"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "The ipv6 address is calculated automatically."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "The protocol to use for internet connectivity."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr "This will setup a new virtual wireless interface in Access Point mode."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+
+msgid "Unknown Error"
+msgstr "Unknown Error"
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Virtual Access Point (VAP)"
+
+msgid "Wizard"
+msgstr "Wizard"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Your device and neighbouring nodes have to use the same channel."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "static"
+
+msgid "Configure this interface."
+msgstr "Configure this interface."
+
+msgid "recommended"
+msgstr "recommended"
+
+msgid "Basic settings"
+msgstr "Basic settings"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Basic settings are incomplete. Please go to"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr "You can not use the wizard because some necessary values are missing."
+
+msgid "and fill out all required fields."
+msgstr "and fill out all required fields."
diff --git a/trunk/package/luci/po/en/firewall.po b/trunk/package/luci/po/en/firewall.po
new file mode 100644
index 00000000..2684067e
--- /dev/null
+++ b/trunk/package/luci/po/en/firewall.po
@@ -0,0 +1,635 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr "Destination address"
+
+msgid "Destination port"
+msgstr "Destination port"
+
+msgid "Destination zone"
+msgstr "Destination zone"
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Drop invalid packets"
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr "Enable SYN-flood protection"
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr "External port"
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr "Forward"
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Input"
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr "Internal IP address"
+
+msgid "Internal port"
+msgstr "Internal port"
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr "MSS clamping"
+
+msgid "Masquerading"
+msgstr "Masquerading"
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr "Name"
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr "Output"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Redirect matched incoming traffic to the given port on the internal host"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Redirect matched incoming traffic to the specified internal host"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Traffic Redirection"
+# msgstr ""
+#
+# msgid ""
+# "Traffic redirection allows you to change the destination address of "
+# "forwarded packets."
+# msgstr ""
+#
+# msgid "Overview"
+# msgstr ""
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Source zone"
+# msgstr ""
+#
+# msgid "Source MAC-address"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+msgid "Source IP address"
+msgstr "Source IP address"
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr "Source address"
+
+msgid "Source port"
+msgstr "Source port"
+
+msgid "Source zone"
+msgstr "Source zone"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "accept"
+
+msgid "any"
+msgstr "any"
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr "drop"
+
+msgid "reject"
+msgstr "reject"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Destination"
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
+#~ msgid "(optional)"
+#~ msgstr "(optional)"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Internal port (optional)"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Destination port"
+# msgstr ""
+#
+# msgid "Action"
+# msgstr ""
+#
+# msgid "drop"
+# msgstr ""
+#
+# msgid "accept"
+# msgstr ""
+#
+# msgid "reject"
+# msgstr ""
+#
+#~ msgid "Advanced Rules"
+#~ msgstr "Advanced Rules"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+
+#~ msgid "Device"
+#~ msgstr "Device"
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+
+#~ msgid "Overview"
+#~ msgstr "Overview"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "External port"
+# msgstr ""
+#
+# msgid "Internal IP address"
+# msgstr ""
+#
+#~ msgid "Port forwarding"
+#~ msgstr "Port forwarding"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+
+#~ msgid "Rules"
+#~ msgstr "Rules"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+#~ msgid "Traffic Redirection"
+#~ msgstr "Traffic Redirection"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+
+#~ msgid "Network"
+#~ msgstr "Network"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+#~ msgid "Traffic Control"
+#~ msgstr "Traffic Control"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Zone-to-Zone traffic"
+
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "Destination IP"
+#~ msgstr "Destination IP"
+
+#~ msgid "IP address"
+#~ msgstr "IP address"
+
+#~ msgid "Source MAC-address"
+#~ msgstr "Source MAC-address"
diff --git a/trunk/package/luci/po/en/freifunk-policyrouting.po b/trunk/package/luci/po/en/freifunk-policyrouting.po
new file mode 100644
index 00000000..3c9a17e0
--- /dev/null
+++ b/trunk/package/luci/po/en/freifunk-policyrouting.po
@@ -0,0 +1,39 @@
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/en/freifunk.po b/trunk/package/luci/po/en/freifunk.po
new file mode 100644
index 00000000..1a0b425e
--- /dev/null
+++ b/trunk/package/luci/po/en/freifunk.po
@@ -0,0 +1,400 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-30 06:42+0200\n"
+"PO-Revision-Date: 2009-07-06 23:21+0200\n"
+"Last-Translator: Jo-Philipp Wich <xm@subsignal.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr "Check for new firmware versions and perform automatic updates."
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr "Coordinates"
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr "E-Mail"
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr "Freifunk Remote Update"
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr "Hello and welcome in the network of"
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr "If you are interested in our project then contact the local community"
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+
+msgid "It is operated by"
+msgstr "It is operated by"
+
+msgid "Keep configuration"
+msgstr "Keep configuration"
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr "Location"
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr "Memory"
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr "Nickname"
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr "Notice"
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr "Phone"
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr "Realname"
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr "Start Upgrade"
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr "The installed firmware is the most recent version."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr "This is the access point"
+
+msgid "Update Settings"
+msgstr "Update Settings"
+
+msgid "Update available!"
+msgstr "Update available!"
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr "Verify downloaded images"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+"You can find further information about the global Freifunk initiative at"
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/en/hd_idle.po b/trunk/package/luci/po/en/hd_idle.po
new file mode 100644
index 00000000..d3058a7b
--- /dev/null
+++ b/trunk/package/luci/po/en/hd_idle.po
@@ -0,0 +1,48 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "Enable"
+msgstr "Enable"
+
+msgid "Enable debug"
+msgstr "Enable debug"
+
+msgid "Idle-time"
+msgstr "Idle-time"
+
+msgid "Idle-time unit"
+msgstr "Idle-time unit"
+
+msgid "Settings"
+msgstr "Settings"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
diff --git a/trunk/package/luci/po/en/meshwizard.po b/trunk/package/luci/po/en/meshwizard.po
new file mode 100644
index 00000000..a67c71f5
--- /dev/null
+++ b/trunk/package/luci/po/en/meshwizard.po
@@ -0,0 +1,109 @@
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/en/minidlna.po b/trunk/package/luci/po/en/minidlna.po
new file mode 100644
index 00000000..5934d42e
--- /dev/null
+++ b/trunk/package/luci/po/en/minidlna.po
@@ -0,0 +1,195 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr "Album art names:"
+
+msgid "Announced model number:"
+msgstr "Announced model number:"
+
+msgid "Announced serial number:"
+msgstr "Announced serial number:"
+
+msgid "Browse directory"
+msgstr "Browse directory"
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr "Database directory:"
+
+msgid "Enable TIVO:"
+msgstr "Enable TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Enable inotify:"
+
+msgid "Enable:"
+msgstr "Enable:"
+
+msgid "Friendly name:"
+msgstr "Friendly name:"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr "Interfaces:"
+
+msgid "Log directory:"
+msgstr "Log directory:"
+
+msgid "Media directories:"
+msgstr "Media directories:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+
+msgid "Music"
+msgstr "Music"
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr "Notify interval in seconds."
+
+msgid "Notify interval:"
+msgstr "Notify interval:"
+
+msgid "Pictures"
+msgstr "Pictures"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr "Presentation URL:"
+
+msgid "Root container:"
+msgstr "Root container:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+"Set this if you want to customize the name that shows up on your clients."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Set this to enable inotify monitoring to automatically discover new files."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Specify the path to the MiniSSDPd socket."
+
+msgid "Standard container"
+msgstr "Standard container"
+
+msgid "Strict to DLNA standard:"
+msgstr "Strict to DLNA standard:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr "Video"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP socket:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr "Network interfaces to serve, comma delimited list."
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
diff --git a/trunk/package/luci/po/en/mmc_over_gpio.po b/trunk/package/luci/po/en/mmc_over_gpio.po
new file mode 100644
index 00000000..bd8f3c87
--- /dev/null
+++ b/trunk/package/luci/po/en/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-03-21 18:31+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr "Settings"
diff --git a/trunk/package/luci/po/en/multiwan.po b/trunk/package/luci/po/en/multiwan.po
new file mode 100644
index 00000000..241e6d02
--- /dev/null
+++ b/trunk/package/luci/po/en/multiwan.po
@@ -0,0 +1,114 @@
+#  multiwan.po
+#  generated from /tmp/i18n/luasrc/i18n/multiwan.en.lua
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Attempts Before WAN Failover"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Attempts Before WAN Recovery"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+
+msgid "DNS Server(s)"
+msgstr "DNS Server(s)"
+
+msgid "Default Route"
+msgstr "Default Route"
+
+msgid "Destination Address"
+msgstr "Destination Address"
+
+msgid "Disable"
+msgstr "Disable"
+
+msgid "Enable"
+msgstr "Enable"
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr "Failover Traffic Destination"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Health Monitor ICMP Host(s)"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Health Monitor ICMP Timeout"
+
+msgid "Health Monitor Interval"
+msgstr "Health Monitor Interval"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"Health Monitor detects and corrects network changes and failed connections."
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr "Load Balancer Distribution"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Load Balancer(Compatibility)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Load Balancer(Performance)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Multi-WAN Traffic Rules"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+
+msgid "None"
+msgstr "None"
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr "Source Address"
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr "WAN Interfaces"
+
+msgid "WAN Uplink"
+msgstr "WAN Uplink"
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/en/ntpc.po b/trunk/package/luci/po/en/ntpc.po
new file mode 100644
index 00000000..803a9965
--- /dev/null
+++ b/trunk/package/luci/po/en/ntpc.po
@@ -0,0 +1,51 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Clock Adjustment"
+msgstr "Clock Adjustment"
+
+msgid "Count of time measurements"
+msgstr "Count of time measurements"
+
+msgid "Current system time"
+msgstr "Current system time"
+
+msgid "General"
+msgstr "General"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Offset frequency"
+msgstr "Offset frequency"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Synchronizes the system time"
+
+msgid "Time Server"
+msgstr ""
+
+msgid "Time Servers"
+msgstr "Time Servers"
+
+msgid "Time Synchronisation"
+msgstr "Time Synchronisation"
+
+msgid "Update interval (in seconds)"
+msgstr "Update interval (in seconds)"
+
+msgid "empty = infinite"
+msgstr "empty = infinite"
diff --git a/trunk/package/luci/po/en/olsr.po b/trunk/package/luci/po/en/olsr.po
new file mode 100644
index 00000000..131005e1
--- /dev/null
+++ b/trunk/package/luci/po/en/olsr.po
@@ -0,0 +1,701 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Active MID announcements"
+msgstr "Active MID announcements"
+
+msgid "Active OLSR nodes"
+msgstr "Active OLSR nodes"
+
+msgid "Active host net announcements"
+msgstr "Active host net announcements"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr "Announced network"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr "Expected retransmission count"
+
+msgid "FIB metric"
+msgstr "FIB metric"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr "General settings"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr "HNA interval"
+
+msgid "HNA validity time"
+msgstr "HNA validity time"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "OLSR - HNA-Announcements"
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr "Hello interval"
+
+msgid "Hello validity time"
+msgstr "Hello validity time"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 broadcast"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr "Internet protocol"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "Known OLSR routes"
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr "LQ aging"
+
+msgid "LQ algorithm"
+msgstr "LQ algorithm"
+
+msgid "LQ fisheye"
+msgstr "LQ fisheye"
+
+msgid "LQ level"
+msgstr "LQ level"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "Last hop"
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr "Library"
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr "Local interface IP"
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr "MID interval"
+
+msgid "MID validity time"
+msgstr "MID validity time"
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr "Neighbour IP"
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr "Netmask"
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - HNA-Announcements"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA-Announcements"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Plugins"
+
+msgid "OLSR Daemon"
+msgstr "OLSR Daemon"
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr "OLSR connections"
+
+msgid "OLSR gateway"
+msgstr "OLSR gateway"
+
+msgid "OLSR node"
+msgstr "OLSR node"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Overview of currently active OLSR host net announcements"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Overview of currently established OLSR connections"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Overview of currently known OLSR nodes"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Overview of currently known routes to other OLSR nodes"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Overview of known multiple interface announcements"
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr "Plugin configuration"
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr "Pollrate"
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr "Secondary OLSR interfaces"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr "TC interval"
+
+msgid "TC validity time"
+msgstr "TC validity time"
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Unable to connect to the OLSR daemon!"
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr "Use hysteresis"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr "Willingness"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/trunk/package/luci/po/en/openvpn.po b/trunk/package/luci/po/en/openvpn.po
new file mode 100644
index 00000000..66931382
--- /dev/null
+++ b/trunk/package/luci/po/en/openvpn.po
@@ -0,0 +1,552 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: 2012-04-03 08:45+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', or 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Accept options pushed from server"
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr "Add route after establishing connection"
+
+msgid "Additional authentication over TLS"
+msgstr "Additional authentication over TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Allow client-to-client traffic"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Allow multiple clients with same certificate"
+
+msgid "Allow only one session"
+msgstr "Allow only one session"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Allow remote to change its IP or port"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Allowed maximum of connected clients"
+
+msgid "Allowed maximum of internal"
+msgstr "Allowed maximum of internal"
+
+msgid "Allowed maximum of new connections"
+msgstr "Allowed maximum of new connections"
+
+msgid "Append log to file"
+msgstr "Append log to file"
+
+msgid "Authenticate using username/password"
+msgstr "Authenticate using username/password"
+
+msgid "Automatically redirect default route"
+msgstr "Automatically redirect default route"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Below is a list of configured OpenVPN instances and their current state"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "Call down cmd/script before TUN/TAP close"
+
+msgid "Certificate authority"
+msgstr "Certificate authority"
+
+msgid "Change process priority"
+msgstr "Change process priority"
+
+msgid "Change to directory before initialization"
+msgstr "Change to directory before initialization"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Check peer certificate against a CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Chroot to directory after initialization"
+
+msgid "Client is disabled"
+msgstr "Client is disabled"
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr "Configure client mode"
+
+msgid "Configure server bridge"
+msgstr "Configure server bridge"
+
+msgid "Configure server mode"
+msgstr "Configure server mode"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Connect through Socks5 proxy"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr "Connection retry interval"
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr "Daemonize after initialization"
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Delay tun/tap open and up script execution"
+
+msgid "Diffie Hellman parameters"
+msgstr "Diffie Hellman parameters"
+
+msgid "Directory for custom client config files"
+msgstr "Directory for custom client config files"
+
+msgid "Disable Paging"
+msgstr "Disable Paging"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Disable cipher initialisation vector"
+
+msgid "Disable options consistency check"
+msgstr "Disable options consistency check"
+
+msgid "Disable replay protection"
+msgstr "Disable replay protection"
+
+msgid "Do not bind to local address and port"
+msgstr "Do not bind to local address and port"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Don't actually execute ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "Don't add routes automatically"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "Don't cache --askpass or --auth-user-pass passwords"
+
+msgid "Don't inherit global push options"
+msgstr "Don't inherit global push options"
+
+msgid "Don't log timestamps"
+msgstr "Don't log timestamps"
+
+msgid "Don't re-read key on restart"
+msgstr "Don't re-read key on restart"
+
+msgid "Don't require client certificate"
+msgstr "Don't require client certificate"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Don't use adaptive lzo compression"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Don't warn on ifconfig inconsistencies"
+
+msgid "Echo parameters to log"
+msgstr "Echo parameters to log"
+
+msgid "Empirically measure MTU"
+msgstr "Empirically measure MTU"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Enable OpenSSL hardware crypto engines"
+
+msgid "Enable Path MTU discovery"
+msgstr "Enable Path MTU discovery"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Enable Static Key encryption mode (non-TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Enable TLS and assume client role"
+
+msgid "Enable TLS and assume server role"
+msgstr "Enable TLS and assume server role"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Enable internal datagram fragmentation"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Enable management interface on <em>IP</em> <em>port</em>"
+
+msgid "Enabled"
+msgstr "Enabled"
+
+msgid "Encryption cipher for packets"
+msgstr "Encryption cipher for packets"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Execute shell cmd after routes are added"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Execute shell command on remote ip change"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Exit on TLS negotiation failure"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Get PEM password from controlling tty before we daemonize"
+
+msgid "HMAC authentication for packets"
+msgstr "HMAC authentication for packets"
+
+msgid "Handling of authentication failures"
+msgstr "Handling of authentication failures"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr "If hostname resolve fails, retry"
+
+msgid "Instance \"%s\""
+msgstr "Instance \"%s\""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr "Keep local IP address on restart"
+
+msgid "Keep remote IP address on restart"
+msgstr "Keep remote IP address on restart"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Keep tun/tap device open on restart"
+
+msgid "Key transition window"
+msgstr "Key transition window"
+
+msgid "Limit repeated log messages"
+msgstr "Limit repeated log messages"
+
+msgid "Local certificate"
+msgstr "Local certificate"
+
+msgid "Local host name or ip address"
+msgstr "Local host name or ip address"
+
+msgid "Local private key"
+msgstr "Local private key"
+
+msgid "Major mode"
+msgstr "Major mode"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Make tun device IPv6 capable"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Maximum number of queued TCP output packets"
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Number of allocated broadcast buffers"
+
+msgid "Number of lines for log file history"
+msgstr "Number of lines for log file history"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Only accept connections from given X509 name"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Only process ping timeouts if routes exist"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN instances"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Optimize TUN/TAP/UDP writes"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Output to syslog and do not daemonize"
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr "PKCS#12 file containing keys"
+
+msgid "Pass environment variables to script"
+msgstr "Pass environment variables to script"
+
+msgid "Persist replay-protection state"
+msgstr "Persist replay-protection state"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Persist/unpersist ifconfig-pool"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Ping remote every n seconds over TCP/UDP port"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Proxy timeout in seconds"
+msgstr "Proxy timeout in seconds"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Push an ifconfig option to remote"
+
+msgid "Push options to peer"
+msgstr "Push options to peer"
+
+msgid "Query management channel for private key"
+msgstr "Query management channel for private key"
+
+msgid "Randomly choose remote server"
+msgstr "Randomly choose remote server"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Refuse connection if no custom client config"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Remap SIGUSR1 signals"
+
+msgid "Remote host name or ip address"
+msgstr "Remote host name or ip address"
+
+msgid "Remote ping timeout"
+msgstr "Remote ping timeout"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Renegotiate data chan. key after bytes"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Renegotiate data chan. key after packets"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Renegotiate data chan. key after seconds"
+
+msgid "Replay protection sliding window size"
+msgstr "Replay protection sliding window size"
+
+msgid "Require explicit designation on certificate"
+msgstr "Require explicit designation on certificate"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Require explicit key usage on certificate"
+
+msgid "Restart after remote ping timeout"
+msgstr "Restart after remote ping timeout"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Retransmit timeout on TLS control channel"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Retry indefinitely on HTTP proxy errors"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Retry indefinitely on Socks proxy errors"
+
+msgid "Route subnet to client"
+msgstr "Route subnet to client"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Run as an inetd or xinetd server"
+
+msgid "Run script cmd on client connection"
+msgstr "Run script cmd on client connection"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Run script cmd on client disconnection"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Run up/down scripts for all restarts"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Send notification to peer on disconnect"
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr "Set GID to group"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Set TCP/UDP MTU"
+
+msgid "Set UID to user"
+msgstr "Set UID to user"
+
+msgid "Set aside a pool of subnets"
+msgstr "Set aside a pool of subnets"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Set extended HTTP proxy options"
+
+msgid "Set output verbosity"
+msgstr "Set output verbosity"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Set size of real and virtual address hash tables"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Set the TCP/UDP receive buffer size"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Set the TCP/UDP send buffer size"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Set tun/tap TX queue length"
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr "Set tun/tap device MTU"
+
+msgid "Set tun/tap device overhead"
+msgstr "Set tun/tap device overhead"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Set upper bound on TCP MSS"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Shaping for peer bandwidth"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Shell cmd to execute after tun device open"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Shell cmd to run after tun device close"
+
+msgid "Shell command to verify X509 name"
+msgstr "Shell command to verify X509 name"
+
+msgid "Silence the output of replay warnings"
+msgstr "Silence the output of replay warnings"
+
+msgid "Size of cipher key"
+msgstr "Size of cipher key"
+
+msgid "Specify a default gateway for routes"
+msgstr "Specify a default gateway for routes"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Start OpenVPN in a hibernating state"
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr "Started"
+
+msgid "Status file format version"
+msgstr "Status file format version"
+
+msgid "Switch to advanced configuration »"
+msgstr "Switch to advanced configuration »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "TCP/UDP port # for both local and remote"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "TCP/UDP port # for local (default=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "TCP/UDP port # for remote (default=1194)"
+
+msgid "TLS cipher"
+msgstr "TLS cipher"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "TOS passthrough (applies to IPv4 only)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Temporary directory for client-connect return file"
+
+msgid "Timeframe for key exchange"
+msgstr "Timeframe for key exchange"
+
+msgid "Type of used device"
+msgstr "Type of used device"
+
+msgid "Use fast LZO compression"
+msgstr "Use fast LZO compression"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Use individual addresses rather than /30 subnets"
+
+msgid "Use protocol"
+msgstr "Use protocol"
+
+msgid "Use tun/tap device node"
+msgstr "Use tun/tap device node"
+
+msgid "Use username as common name"
+msgstr "Use username as common name"
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr "Write log to file"
+
+msgid "Write process ID to file"
+msgstr "Write process ID to file"
+
+msgid "Write status to file every n seconds"
+msgstr "Write status to file every n seconds"
+
+msgid "no"
+msgstr "no"
+
+msgid "tun/tap device"
+msgstr "tun/tap device"
+
+msgid "tun/tap inactivity timeout"
+msgstr "tun/tap inactivity timeout"
+
+msgid "yes (%i)"
+msgstr "yes (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Switch to basic configuration"
diff --git a/trunk/package/luci/po/en/p2pblock.po b/trunk/package/luci/po/en/p2pblock.po
new file mode 100644
index 00000000..00cccc8e
--- /dev/null
+++ b/trunk/package/luci/po/en/p2pblock.po
@@ -0,0 +1,28 @@
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr ""
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
diff --git a/trunk/package/luci/po/en/p910nd.po b/trunk/package/luci/po/en/p910nd.po
new file mode 100644
index 00000000..766673ac
--- /dev/null
+++ b/trunk/package/luci/po/en/p910nd.po
@@ -0,0 +1,51 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Bidirectional mode"
+msgstr "Bidirectional mode"
+
+msgid "Device"
+msgstr ""
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Printer server"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd listens on port 910+N. E.g. 9100 for the first printer."
diff --git a/trunk/package/luci/po/en/pbx-voicemail.po b/trunk/package/luci/po/en/pbx-voicemail.po
new file mode 100644
index 00000000..79c8848b
--- /dev/null
+++ b/trunk/package/luci/po/en/pbx-voicemail.po
@@ -0,0 +1,169 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "Email Addresses that Receive Voicemail"
+
+msgid "Enable Voicemail"
+msgstr "Enable Voicemail"
+
+msgid "Global Voicemail Setup"
+msgstr "Global Voicemail Setup"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+
+msgid "Last Sent Voicemail Log"
+msgstr "Last Sent Voicemail Log"
+
+msgid "Local Storage Directory"
+msgstr "Local Storage Directory"
+
+msgid "No"
+msgstr "No"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Outgoing mail (SMTP) Server"
+
+msgid "SMTP Password"
+msgstr "SMTP Password"
+
+msgid "SMTP Port Number"
+msgstr "SMTP Port Number"
+
+msgid "SMTP Server Authentication"
+msgstr "SMTP Server Authentication"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "SMTP Server Hostname or IP Address"
+
+msgid "SMTP User Name"
+msgstr "SMTP User Name"
+
+msgid "Secure Connection Using TLS"
+msgstr "Secure Connection Using TLS"
+
+msgid "Voicemail Setup"
+msgstr "Voicemail Setup"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+
+msgid "Yes"
+msgstr "Yes"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+
+#~ msgid "Directory to save voicemail into"
+#~ msgstr "Directory to save voicemail into"
+
+#~ msgid "Email addresses to forward to"
+#~ msgstr "Email addresses to forward to"
+
+#~ msgid "Enabled"
+#~ msgstr "Enabled"
+
+#~ msgid ""
+#~ "Here you can configure a global voicemail for this PBX. Since this system "
+#~ "is intended to run on embedded systems like routers, there is no local "
+#~ "storage of voicemail - it must be sent out by email. Therefore you need "
+#~ "to configure an outgoing mail (SMTP) server (for example the SMTP server "
+#~ "your ISP provides, or GMail), and provide a list of addresses the "
+#~ "voicemail will be sent to."
+#~ msgstr ""
+#~ "Here you can configure a global voicemail for this PBX. Since this system "
+#~ "is intended to run on embedded systems like routers, there is no local "
+#~ "storage of voicemail - it must be sent out by email. Therefore you need "
+#~ "to configure an outgoing mail (SMTP) server (for example the SMTP server "
+#~ "your ISP provides, or GMail), and provide a list of addresses the "
+#~ "voicemail will be sent to."
+
+#~ msgid ""
+#~ "In order for this PBX to send emails containing voicemail recordings, you "
+#~ "need to set up an SMTP server here. Your ISP usually provides an SMTP "
+#~ "server for that purpose. You can also set up a GMail, Yahoo, or other 3rd "
+#~ "party SMTP server."
+#~ msgstr ""
+#~ "In order for this PBX to send emails containing voicemail recordings, you "
+#~ "need to set up an SMTP server here. Your ISP usually provides an SMTP "
+#~ "server for that purpose. You can also set up a GMail, Yahoo, or other 3rd "
+#~ "party SMTP server."
+
+#~ msgid "SMTP port number"
+#~ msgstr "SMTP port number"
+
+#~ msgid "SMTP server authentication"
+#~ msgstr "SMTP server authentication"
+
+#~ msgid "SMTP server hostname or IP"
+#~ msgstr "SMTP server hostname or IP"
+
+#~ msgid "SMTP user name"
+#~ msgstr "SMTP user name"
+
+#~ msgid "Timeout before sending callers to voicemail"
+#~ msgstr "Timeout before sending callers to voicemail"
+
+#~ msgid "Use TLS (secure connection)"
+#~ msgstr "Use TLS (secure connection)"
+
+#~ msgid ""
+#~ "When you enable voicemail, you will have the opportunity to specify email "
+#~ "addresses which receive the message. You must also set up an SMTP server "
+#~ "below."
+#~ msgstr ""
+#~ "When you enable voicemail, you will have the opportunity to specify email "
+#~ "addresses which receive the message. You must also set up an SMTP server "
+#~ "below."
diff --git a/trunk/package/luci/po/en/pbx.po b/trunk/package/luci/po/en/pbx.po
new file mode 100644
index 00000000..8b995e1a
--- /dev/null
+++ b/trunk/package/luci/po/en/pbx.po
@@ -0,0 +1,502 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr "Advanced Settings"
+
+msgid "Available"
+msgstr "Available"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+
+msgid "Away"
+msgstr "Away"
+
+msgid "Blacklisted Numbers"
+msgstr "Blacklisted Numbers"
+
+msgid "Call Routing"
+msgstr "Call Routing"
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr "Call-through Numbers"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Copy-paste large lists of numbers here."
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Dynamic List of Blacklisted Numbers"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Enable Incoming Calls (Register via SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr "Enable Outgoing Calls"
+
+msgid "Enabled"
+msgstr "Enabled"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr "External SIP Port"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Full Name"
+
+msgid "General Settings"
+msgstr "General Settings"
+
+msgid "Google Accounts"
+msgstr "Google Accounts"
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Google Voice/Talk Accounts"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "Incoming Calls"
+
+msgid "Insert QoS Rules"
+msgstr "Insert QoS Rules"
+
+msgid "Makes Outgoing Calls"
+msgstr "Makes Outgoing Calls"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr "No"
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr "Outbound Proxy"
+
+msgid "Outgoing Calls"
+msgstr "Outgoing Calls"
+
+msgid "PBX Main Page"
+msgstr "PBX Main Page"
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Password"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr "Port Setting for SIP Devices"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "Providers Used for Outgoing Calls"
+
+msgid "QoS Settings"
+msgstr "QoS Settings"
+
+msgid "RTP Port Range End"
+msgstr "RTP Port Range End"
+
+msgid "RTP Port Range Start"
+msgstr "RTP Port Range Start"
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr "Receives Incoming Calls"
+
+msgid "Remote Usage"
+msgstr "Remote Usage"
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr "SIP Accounts"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "SIP Device/Softphone Accounts"
+
+msgid "SIP Provider Accounts"
+msgstr "SIP Provider Accounts"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "SIP Realm (needed by some providers)"
+
+msgid "SIP Server/Registrar"
+msgstr "SIP Server/Registrar"
+
+msgid "SIP Server/Registrar Port"
+msgstr "SIP Server/Registrar Port"
+
+msgid "Server Setting"
+msgstr "Server Setting"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "Server Setting for Local SIP Devices"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "Server Setting for Remote SIP Devices"
+
+msgid "Service Status"
+msgstr "Service Status"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr "Space-Separated List of Blacklisted Numbers"
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr "Specify numbers individually here. Press enter to add more numbers."
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+
+msgid "Use this account to make outgoing calls."
+msgstr "Use this account to make outgoing calls."
+
+msgid "User Accounts"
+msgstr "User Accounts"
+
+msgid "User Agent String"
+msgstr "User Agent String"
+
+msgid "User Name"
+msgstr "User Name"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "Yes"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr "You can specify a real name to show up in the Caller ID here."
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+#~ msgid "Account Status"
+#~ msgstr "Account Status"
+
+#~ msgid "Account Status Message"
+#~ msgstr "Account Status Message"
+
+#~ msgid "Domain Name/Dynamic Domain Name"
+#~ msgstr "Domain Name/Dynamic Domain Name"
+
+#~ msgid "Enable Incoming Calls (See Status, Message below)"
+#~ msgstr "Enable Incoming Calls (See Status, Message below)"
+
+#~ msgid "Service Control and Connection Status"
+#~ msgstr "Service Control and Connection Status"
diff --git a/trunk/package/luci/po/en/polipo.po b/trunk/package/luci/po/en/polipo.po
new file mode 100644
index 00000000..1bdb0c1d
--- /dev/null
+++ b/trunk/package/luci/po/en/polipo.po
@@ -0,0 +1,284 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr "Allowed clients"
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr "DNS server address"
+
+msgid "Delete cache files time"
+msgstr "Delete cache files time"
+
+msgid "Disk cache location"
+msgstr "Disk cache location"
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Enable if cache (proxy) is shared by multiple users."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "First PMM segment size (in bytes)"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "How much RAM should Polipo use for its cache."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "In RAM cache size (in bytes)"
+
+msgid "Listen address"
+msgstr "Listen address"
+
+msgid "Listen port"
+msgstr "Listen port"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+
+msgid "Log file location"
+msgstr "Log file location"
+
+msgid "Log to syslog"
+msgstr "Log to syslog"
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr "On-Disk Cache"
+
+msgid "PMM segments size (in bytes)"
+msgstr "PMM segments size (in bytes)"
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr "Parent proxy address"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+
+msgid "Parent proxy authentication"
+msgstr "Parent proxy authentication"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo is a small and fast caching web proxy."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Poor Man&#39;s Multiplexing"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing "
+"by requesting an instance in multiple segments. It tries to lower the "
+"latency caused by the weakness of HTTP protocol. NOTE: some sites may not "
+"work with PMM enabled."
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr "Query DNS by hostname"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr "Query DNS for IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+
+msgid "Shared cache"
+msgstr "Shared cache"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Syslog facility"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr "To enable PMM, PMM segment size must be set to some positive value."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Truncate cache files size (in bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Truncate cache files time"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\t/usr/sbin/polipo_purge\" (without quotes)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr "Time after which cached files will be deleted. (default value: 32d)"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Port on which Polipo will listen. (default value: 8123)"
diff --git a/trunk/package/luci/po/en/qos.po b/trunk/package/luci/po/en/qos.po
new file mode 100644
index 00000000..aeb7b27b
--- /dev/null
+++ b/trunk/package/luci/po/en/qos.po
@@ -0,0 +1,91 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2010-03-25 22:10+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Calculate overhead"
+msgstr "Calculate overhead"
+
+msgid "Classification Rules"
+msgstr "Classification Rules"
+
+msgid "Classification group"
+msgstr "Classification group"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Destination host"
+
+msgid "Download speed (kbit/s)"
+msgstr "Download speed (kbit/s)"
+
+msgid "Enable"
+msgstr "Enable"
+
+msgid "Half-duplex"
+msgstr "Half-duplex"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Number of bytes"
+msgstr "Number of bytes"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr "Quality of Service"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Source host"
+msgstr "Source host"
+
+msgid "Target"
+msgstr "Target"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Upload speed (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+
+msgid "all"
+msgstr "all"
+
+msgid "default"
+msgstr "default"
+
+msgid "express"
+msgstr "express"
+
+msgid "low"
+msgstr "low"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "priority"
diff --git a/trunk/package/luci/po/en/radvd.po b/trunk/package/luci/po/en/radvd.po
new file mode 100644
index 00000000..8e0fb01a
--- /dev/null
+++ b/trunk/package/luci/po/en/radvd.po
@@ -0,0 +1,368 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-21 04:06+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/en/rrdtool.po b/trunk/package/luci/po/en/rrdtool.po
new file mode 100644
index 00000000..d7801445
--- /dev/null
+++ b/trunk/package/luci/po/en/rrdtool.po
@@ -0,0 +1,358 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Wireless - Signal Noise Ratio"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Noise Level"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Signal Strength"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Wireless - Signal Quality"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Signal Quality"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: ICMP Roundtrip Times"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Firewall - Processed Packets"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Packets/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Chain \"%di\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - Transfer on %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bytes (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - Packets on %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Packets/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Processed (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Dropped   (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Errors    (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - Multicast on %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Packets/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Packets"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - Collisions on %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Collisions/s"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Collisions"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Errors on %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Errors/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Processes"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Processes/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Process %pi - used cpu time"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "system"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "user"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Process %pi - threads and processes"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Count"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Process %pi - page faults"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Pagefaults"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "page faults"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Process %pi - virtual memory size"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "virtual memory"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Usage on Processor #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Transfer on %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Packets on %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Packets/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: TCP-Connections to Port %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Connections/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Disk Space Usage on %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Interrupts"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Issues/s"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: System Load"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Load"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 min"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 min"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 min"
diff --git a/trunk/package/luci/po/en/samba.po b/trunk/package/luci/po/en/samba.po
new file mode 100644
index 00000000..f524c144
--- /dev/null
+++ b/trunk/package/luci/po/en/samba.po
@@ -0,0 +1,82 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-22 15:23+0100\n"
+"PO-Revision-Date: 2011-10-25 21:26+0200\n"
+"Last-Translator: awm1 <awm1klimes8vladimir@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Allow guests"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "Allow system users to reach their home directories via network shares"
+
+msgid "Allowed users"
+msgstr "Allowed users"
+
+msgid "Create mask"
+msgstr "Create mask"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Directory mask"
+msgstr "Directory mask"
+
+msgid "Edit Template"
+msgstr "Edit template"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edit the template that is used for generating the Samba configuration."
+
+msgid "General Settings"
+msgstr "General settings"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Mask for new directories"
+msgstr "Mask for new directories"
+
+msgid "Mask for new files"
+msgstr "Mask for new files"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Network Shares"
+msgstr "Network Shares"
+
+msgid "Path"
+msgstr "Path"
+
+msgid "Read-only"
+msgstr "Read-only"
+
+msgid "Share home-directories"
+msgstr "Share home-directories"
+
+msgid "Shared Directories"
+msgstr "Shared Directories"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your Samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"settings' tab."
+
+msgid "Workgroup"
+msgstr "Workgroup"
diff --git a/trunk/package/luci/po/en/splash.po b/trunk/package/luci/po/en/splash.po
new file mode 100644
index 00000000..615be16b
--- /dev/null
+++ b/trunk/package/luci/po/en/splash.po
@@ -0,0 +1,292 @@
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/en/statistics.po b/trunk/package/luci/po/en/statistics.po
new file mode 100644
index 00000000..5de07640
--- /dev/null
+++ b/trunk/package/luci/po/en/statistics.po
@@ -0,0 +1,661 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Action (target)"
+msgstr "Action (target)"
+
+msgid "Add command for reading values"
+msgstr "Add command for reading values"
+
+msgid "Add matching rule"
+msgstr "Add matching rule"
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr "Add notification command"
+
+msgid "Base Directory"
+msgstr "Base Directory"
+
+msgid "Basic monitoring"
+msgstr "Basic monitoring"
+
+msgid "CPU Plugin Configuration"
+msgstr "CPU Plugin Configuration"
+
+msgid "CSV Output"
+msgstr "CSV Output"
+
+msgid "CSV Plugin Configuration"
+msgstr "CSV Plugin Configuration"
+
+msgid "Cache collected data for"
+msgstr "Cache collected data for"
+
+msgid "Cache flush interval"
+msgstr "Cache flush interval"
+
+msgid "Chain"
+msgstr "Chain"
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Collectd Settings"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr "DF Plugin Configuration"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "DNS Plugin Configuration"
+
+msgid "Data collection interval"
+msgstr "Data collection interval"
+
+msgid "Datasets definition file"
+msgstr "Datasets definition file"
+
+msgid "Destination ip range"
+msgstr "Destination ip range"
+
+msgid "Directory for collectd plugins"
+msgstr "Directory for collectd plugins"
+
+msgid "Directory for sub-configurations"
+msgstr "Directory for sub-configurations"
+
+msgid "Disk Plugin Configuration"
+msgstr "Disk Plugin Configuration"
+
+msgid "Disk Space Usage"
+msgstr "Disk Space Usage"
+
+msgid "Disk Usage"
+msgstr "Disk Usage"
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr "Display timespan »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "E-Mail Plugin Configuration"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable this plugin"
+msgstr "Enable this plugin"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Exec Plugin Configuration"
+
+msgid "Filter class monitoring"
+msgstr "Filter class monitoring"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Flush cache after"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Forwarding between listen and server addresses"
+
+msgid "Graphs"
+msgstr "Graphs"
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr "IRQ Plugin Configuration"
+
+msgid "Ignore source addresses"
+msgstr "Ignore source addresses"
+
+msgid "Incoming interface"
+msgstr "Incoming interface"
+
+msgid "Interface Plugin Configuration"
+msgstr "Interface Plugin Configuration"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interrupts"
+msgstr "Interrupts"
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr "Iptables Plugin Configuration"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr "Listen host"
+
+msgid "Listen port"
+msgstr "Listen port"
+
+msgid "Listener interfaces"
+msgstr "Listener interfaces"
+
+msgid "Load Plugin Configuration"
+msgstr "Load Plugin Configuration"
+
+msgid "Maximum allowed connections"
+msgstr "Maximum allowed connections"
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr "Monitor all local listen ports"
+
+msgid "Monitor devices"
+msgstr "Monitor devices"
+
+msgid "Monitor disks and partitions"
+msgstr "Monitor disks and partitions"
+
+msgid "Monitor filesystem types"
+msgstr "Monitor filesystem types"
+
+msgid "Monitor hosts"
+msgstr "Monitor hosts"
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr "Monitor interrupts"
+
+msgid "Monitor local ports"
+msgstr "Monitor local ports"
+
+msgid "Monitor mount points"
+msgstr "Monitor mount points"
+
+msgid "Monitor processes"
+msgstr "Monitor processes"
+
+msgid "Monitor remote ports"
+msgstr "Monitor remote ports"
+
+msgid "Name of the rule"
+msgstr "Name of the rule"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Netlink Plugin Configuration"
+
+msgid "Network"
+msgstr "Network"
+
+msgid "Network Plugin Configuration"
+msgstr "Network Plugin Configuration"
+
+msgid "Network plugins"
+msgstr "Network plugins"
+
+msgid "Network protocol"
+msgstr "Network protocol"
+
+msgid "Number of threads for data collection"
+msgstr "Number of threads for data collection"
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr "Only create average RRAs"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Outgoing interface"
+msgstr "Outgoing interface"
+
+msgid "Output plugins"
+msgstr "Output plugins"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Ping Plugin Configuration"
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr "Processes"
+
+msgid "Processes Plugin Configuration"
+msgstr "Processes Plugin Configuration"
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Processor"
+
+msgid "Qdisc monitoring"
+msgstr "Qdisc monitoring"
+
+msgid "RRD XFiles Factor"
+msgstr "RRD XFiles Factor"
+
+msgid "RRD heart beat interval"
+msgstr "RRD heart beat interval"
+
+msgid "RRD step interval"
+msgstr "RRD step interval"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "RRDTool Plugin Configuration"
+
+msgid "Rows per RRA"
+msgstr "Rows per RRA"
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Seconds"
+
+msgid "Server host"
+msgstr "Server host"
+
+msgid "Server port"
+msgstr "Server port"
+
+msgid "Shaping class monitoring"
+msgstr "Shaping class monitoring"
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr "Source ip range"
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr "Storage directory"
+
+msgid "Storage directory for the csv files"
+msgstr "Storage directory for the csv files"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Store data values as rates instead of absolute values"
+
+msgid "Stored timespans"
+msgstr "Stored timespans"
+
+msgid "System Load"
+msgstr "System Load"
+
+msgid "System plugins"
+msgstr "System plugins"
+
+msgid "TCP Connections"
+msgstr "TCP Connections"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "TCPConns Plugin Configuration"
+
+msgid "TTL for network packets"
+msgstr "TTL for network packets"
+
+msgid "TTL for ping packets"
+msgstr "TTL for ping packets"
+
+msgid "Table"
+msgstr "Table"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "The cpu plugin collects basic statistics about the processor usage."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"The interface plugin collects traffic statistics on selected interfaces."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "The load plugin collects statistics about the general system load."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"This section defines to which servers the locally collected data is sent to."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Try to lookup fully qualified hostname"
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Unixsock Plugin Configuration"
+
+msgid "Used PID file"
+msgstr "Used PID file"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr "Verbose monitoring"
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr "e.g. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "e.g. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "e.g. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "max. 16 chars"
+
+msgid "reduces rrd size"
+msgstr "reduces rrd size"
+
+msgid "seconds; multiple separated by space"
+msgstr "seconds; multiple separated by space"
+
+msgid "server interfaces"
+msgstr "server interfaces"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Wireless Plugin Configuration"
diff --git a/trunk/package/luci/po/en/tinyproxy.po b/trunk/package/luci/po/en/tinyproxy.po
new file mode 100644
index 00000000..4650f3e1
--- /dev/null
+++ b/trunk/package/luci/po/en/tinyproxy.po
@@ -0,0 +1,331 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr "Log level"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr "Max. spare servers"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr "Min. spare servers"
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr "Reject access"
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr "Target host"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Allow access from"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Allowed headers for anonymous proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Bind outgoing traffic to address"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports allowed for CONNECT method"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = disabled, empty = all"
+
+#~ msgid "Error document"
+#~ msgstr "Error document"
+
+#~ msgid "Filter list"
+#~ msgstr "Filter list"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Case sensitive filters"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Filter list is a whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Extended regular expression filters"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filter URLs instead of domains"
+
+#~ msgid "Listen on address"
+#~ msgstr "Listen on address"
+
+#~ msgid "Logfile"
+#~ msgstr "Logfile"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Maximum number of clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Maximum requests per thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Spare servers to start with"
+
+#~ msgid "Statistic document"
+#~ msgstr "Statistic document"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Write to syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Connection Timeout"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Value of Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Include client IP"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Upstream Control"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Upstream Proxy"
diff --git a/trunk/package/luci/po/en/transmission.po b/trunk/package/luci/po/en/transmission.po
new file mode 100644
index 00000000..3125fc27
--- /dev/null
+++ b/trunk/package/luci/po/en/transmission.po
@@ -0,0 +1,280 @@
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/en/upnp.po b/trunk/package/luci/po/en/upnp.po
new file mode 100644
index 00000000..72d21bae
--- /dev/null
+++ b/trunk/package/luci/po/en/upnp.po
@@ -0,0 +1,157 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Enable secure mode"
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+
+#~ msgid "Log output"
+#~ msgstr "Log output"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
diff --git a/trunk/package/luci/po/en/ushare.po b/trunk/package/luci/po/en/ushare.po
new file mode 100644
index 00000000..5e5d65f9
--- /dev/null
+++ b/trunk/package/luci/po/en/ushare.po
@@ -0,0 +1,49 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Content directories"
+msgstr "Content directories"
+
+msgid "Disable telnet console"
+msgstr "Disable telnet console"
+
+msgid "Disable webinterface"
+msgstr "Disable webinterface"
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Servername"
+msgstr "Servername"
+
+msgid "Settings"
+msgstr "Settings"
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/en/uvc_streamer.po b/trunk/package/luci/po/en/uvc_streamer.po
new file mode 100644
index 00000000..1d9825a7
--- /dev/null
+++ b/trunk/package/luci/po/en/uvc_streamer.po
@@ -0,0 +1,40 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Frames per second"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Resolution"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Settings"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Webcam streaming"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/en/vnstat.po b/trunk/package/luci/po/en/vnstat.po
new file mode 100644
index 00000000..9d237780
--- /dev/null
+++ b/trunk/package/luci/po/en/vnstat.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-16 20:54+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/en/voice_core.po b/trunk/package/luci/po/en/voice_core.po
new file mode 100644
index 00000000..297f8731
--- /dev/null
+++ b/trunk/package/luci/po/en/voice_core.po
@@ -0,0 +1,23 @@
+# Voice Core.
+# Copyright (C) 2009 Daniel Dickinson
+# Daniel Dickinson <crazycshore@gmail.com>, 2009.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2009-07-16 22:19-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Phones"
+msgstr "Phones"
+
+msgid "Voice"
+msgstr ""
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "Phones"
diff --git a/trunk/package/luci/po/en/voice_diag.po b/trunk/package/luci/po/en/voice_diag.po
new file mode 100644
index 00000000..12bb4592
--- /dev/null
+++ b/trunk/package/luci/po/en/voice_diag.po
@@ -0,0 +1,34 @@
+# Voice Diagnostics.
+# Copyright (C) 2009 Daniel Dickinson
+# Daniel Dickinson <crazycshore@gmail.com>, 2009.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2009-07-16 22:26-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Diagnostics"
+msgstr "Diagnostics"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system.  These are known as diagnostics."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "Diagnostics"
diff --git a/trunk/package/luci/po/en/watchcat.po b/trunk/package/luci/po/en/watchcat.po
new file mode 100644
index 00000000..0f9099c5
--- /dev/null
+++ b/trunk/package/luci/po/en/watchcat.po
@@ -0,0 +1,66 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Forced reboot delay"
+msgstr "Forced reboot delay"
+
+msgid "Host address to ping"
+msgstr "Host address to ping"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+
+msgid "Operating mode"
+msgstr "Operating mode"
+
+msgid "Period"
+msgstr "Period"
+
+msgid "Ping host"
+msgstr "Ping host"
+
+msgid "Ping period"
+msgstr "Ping period"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat allows to configure a periodic reboot and/or when internet "
+"connection has been lost for a certain period of time."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"When rebooting the system the watchcat will trigger a soft reboot, Entering "
+"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
diff --git a/trunk/package/luci/po/en/wol.po b/trunk/package/luci/po/en/wol.po
new file mode 100644
index 00000000..48c7302a
--- /dev/null
+++ b/trunk/package/luci/po/en/wol.po
@@ -0,0 +1,50 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Broadcast on all interfaces"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Choose the host to wake up or enter a custom MAC address to use"
+
+msgid "Host to wake up"
+msgstr "Host to wake up"
+
+msgid "Network interface to use"
+msgstr "Network interface to use"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Sometimes only one of both tools work. If one of fails, try the other one"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Specifies the interface the WoL packet is sent on"
+
+msgid "Starting WoL utility:"
+msgstr "Starting WoL utility:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+
+msgid "Wake up host"
+msgstr "Wake up host"
+
+msgid "WoL program"
+msgstr "WoL program"
diff --git a/trunk/package/luci/po/en/wshaper.po b/trunk/package/luci/po/en/wshaper.po
new file mode 100644
index 00000000..d646e764
--- /dev/null
+++ b/trunk/package/luci/po/en/wshaper.po
@@ -0,0 +1,40 @@
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/es/ahcp.po b/trunk/package/luci/po/es/ahcp.po
new file mode 100644
index 00000000..512606a1
--- /dev/null
+++ b/trunk/package/luci/po/es/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-14 19:30+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Servidor AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP es un protocolo de autoconfiguración para redes con IPv6 o duales IPv6/"
+"IPv4 diseñado para ser usado en lugar de router discovery o DHCP en redes en "
+"las que es difícil o imposible configurar un servidor en cada capa de enlace "
+"del dominio de propagación como las redes móviles ad-hoc."
+
+# "Lease" en el sentido usado en DHCP no tiene una traducción clara en español y se puede usar la misma palabra en que en inglés.
+msgid "Active AHCP Leases"
+msgstr "Cesiones activas AHCP"
+
+msgid "Address"
+msgstr "Dirección"
+
+msgid "Advanced Settings"
+msgstr "Configuración avanzada"
+
+msgid "Age"
+msgstr "Vida"
+
+msgid "Announced DNS servers"
+msgstr "Servidores DNS declarados"
+
+msgid "Announced NTP servers"
+msgstr "Servidores NTP declarados"
+
+msgid "Announced prefixes"
+msgstr "Prefijos declarados"
+
+msgid "Collecting data..."
+msgstr "Obteniendo datos..."
+
+msgid "Forwarder"
+msgstr "Transmisor"
+
+msgid "General Setup"
+msgstr "Configuración general"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Sólo IPv4"
+
+msgid "IPv6 only"
+msgstr "Sólo IPv6"
+
+msgid "Lease directory"
+msgstr "Directorio de cesiones"
+
+msgid "Lease validity time"
+msgstr "Tiempo de validez de la cesión"
+
+msgid "Log file"
+msgstr "Fichero de registro"
+
+msgid "Multicast address"
+msgstr "Dirección multicast"
+
+msgid "Operation mode"
+msgstr "Modo de funcionamiento"
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Protocol family"
+msgstr "Familia de protocolos"
+
+msgid "Served interfaces"
+msgstr "Interfaces configurados"
+
+msgid "Server"
+msgstr "Servidor"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Especifica los servidores NTP IPv4 e IPv6 declarados"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Especifica los servidores de nombres IPv4 e IPv6 declarados"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Especifica los prefijos de red IPv4 e IPv6 declarados en notación CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "El Servicio AHCP no está funcionando."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "El Servicio AHCP está funcionando con el ID %s."
+
+msgid "There are no active leases."
+msgstr "No hay cesiones activas."
+
+msgid "Unique ID file"
+msgstr "ID único de fichero"
diff --git a/trunk/package/luci/po/es/asterisk.po b/trunk/package/luci/po/es/asterisk.po
new file mode 100644
index 00000000..8e2fe1e3
--- /dev/null
+++ b/trunk/package/luci/po/es/asterisk.po
@@ -0,0 +1,355 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-04-16 00:52+0200\n"
+"Last-Translator: Jose <jarre2_es_jose@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Opciones Generales de Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Directorio AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Almacena los ficheros de sonido mientras se graba"
+
+#~ msgid "Debug Level"
+#~ msgstr "Nivel de Depuración"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Desactivar algunos avisos"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Volcar núcleo en caso de fallo"
+
+#~ msgid "High Priority"
+#~ msgstr "Prioridad Alta"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Inicializar Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Usar temporización interna"
+
+#~ msgid "Log directory"
+#~ msgstr "Directorio de registro"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Número máximo de llamadas permitidas"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Carga máxima para dejar de admitir nuevas llamadas"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Desactivar colores en la consola"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Directorio de caché de archivos de sonido"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Grupo en el que ejecutarse"
+
+#~ msgid "The User to run as"
+#~ msgstr "Usuario como el que se ejecutará"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Directorio de la cola de mensajes de voz"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Prefijo UniquID con el nombre del sistema"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr ""
+#~ "Construir las rutas de transcodificación usando SLINEAR, no directamente"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Transmitir silencio SLINEAR mientras graba un canal"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Nivel de detalle"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Sección Dialplan"
+
+#~ msgid "include"
+#~ msgstr "incluir"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Extensión Dialplan"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Opciones generales de Dialplan"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Permitir transferencia"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Limpiar las variables globales"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "Dialplan Goto"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Conferencia Dialplan"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Dialplan Time"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Buzón de voz de Dialplan"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Zonas de marcado para Dialplan"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "Prefijo para añadir coincidencias de plan de marcado"
+
+#~ msgid "Match International prefix"
+#~ msgstr "Coincidir con el prefijo internacional"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Prefijo (0) para añadir/eliminar a/de números internacionales"
+
+#~ msgid "localzone"
+#~ msgstr "zona local"
+
+#~ msgid "Match plan"
+#~ msgstr "Coincidir con el plan"
+
+#~ msgid "Connection to use"
+#~ msgstr "Conexión que se utilizará"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Mapa de Funciones Clave"
+
+#~ msgid "Attended transfer key"
+#~ msgstr "Tecla de transferencia asistida"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "Tecla de transferencia ciega"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Tecla para desconectar la llamada"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Tecla para retener la llamada"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Función de llamada en espera"
+
+#~ msgid "ADSI Park"
+#~ msgstr "Llamada en espera ADSI"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "Tiempo de espera de transferencia asistida (seg)"
+
+#~ msgid "One touch record key"
+#~ msgstr "Tecla de grabacion con una sola tecla"
+
+#~ msgid "Name of call context for parking"
+#~ msgstr "Nombre del contexto de la llamada en espera"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Archivo de sonido para reproducir en la llamada en espera"
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr "Tiempo máximo (en ms) entre digitos para la activación de funciones"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Método para encontrar una ranura de llamada en espera"
+
+#~ msgid "parkedmusicclass"
+#~ msgstr "parkedmusicclass"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Reproducir tono de cortesía en"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Activar llamadas en espera"
+
+#~ msgid "Extension to dial to park"
+#~ msgstr "Extensión a marcar para dejar en espera una llamada"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Tiempo de llamada en espera (segs)"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "Rango de extensiones para llamadas en espera"
+
+#~ msgid "Pickup extension"
+#~ msgstr "Extensión de Pickup"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Segundos de espera entre digitos mientras se transfiere"
+
+#~ msgid "sound when attended transfer is complete"
+#~ msgstr "sonido cuando se completa la transferencia asistida"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "sonido para cuando falla la transferencia asistida"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Recargar la configuración del Hardware"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Método de reinicio"
+
+#~ msgid "Parameter"
+#~ msgstr "Parámetro"
+
+#~ msgid "Option type"
+#~ msgstr "Tipo de opción"
+
+#~ msgid "User name"
+#~ msgstr "Nombre de Usuario"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Opciones Generales de IAX"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Permitir Codecs"
+
+#~ msgid "Static"
+#~ msgstr "Estático"
+
+#~ msgid "Write Protect"
+#~ msgstr "Protección contra escritura"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Conferencia Meetme (entre dos)"
+
+#~ msgid "Admin PIN"
+#~ msgstr "PIN de Administrador"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "PIN de Reunión (Meeting)"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Opciones generales de conferencia Meetme (entre dos)"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Número de memorias intermedias de audio de 20 ms a utilizar"
+
+#~ msgid "Modules"
+#~ msgstr "Módulos"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Aplicación de Recepción de Alarma"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Aplicación de autenticación"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "Asegúrate que asterisk no graba CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Comprueba que el canal esté disponible"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Escuchar en cualquier canal"
+
+#~ msgid "Control Playback Application"
+#~ msgstr "Aplicación para el control de reproducción"
+
+#~ msgid "Cuts up variables"
+#~ msgstr "Variables de corte"
+
+#~ msgid "Database access functions"
+#~ msgstr "Funciones de acceso a la Base de Datos"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Aplicación de marcado telefónico"
+
+#~ msgid "Virtual Dictation Machine Application"
+#~ msgstr "Aplicación de máquina de Dictado Virtual"
+
+#~ msgid "Directed Call Pickup Support"
+#~ msgstr "Apoyo a la captura de llamadas dirigidas"
+
+#~ msgid "Extension Directory"
+#~ msgstr "Directorio de Extensiones"
+
+#~ msgid "DISA (Direct Inward System Access) Application"
+#~ msgstr "Aplicación DISA (Acceso directo entrante al sistema)"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Aplicación de Eco Simple"
+
+#~ msgid "ENUM Lookup"
+#~ msgstr "Consulta ENUM"
+
+#~ msgid "Reevaluates strings"
+#~ msgstr "Reevaluar secuencia de caracteres"
+
+#~ msgid "Executes applications"
+#~ msgstr "Ejecuta aplicaciones"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "Interfaz de aplicación IVR externa"
+
+#~ msgid "Fork The CDR into 2 seperate entities"
+#~ msgstr "Bifurcar el CDR en 2 entidades separadas"
+
+#~ msgid "Get ADSI CPE ID"
+#~ msgstr "Obtener el ADSI CPE ID"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Rutinas de Administración de grupo"
+
+#~ msgid "Encode and Stream via icecast and ices"
+#~ msgstr "Codifica y emite a través de icecast e ices"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Aplicación de transmisión de imagen"
+
+#~ msgid "Look up Caller*ID name/number from black"
+#~ msgstr "Buscar la identidad del llamante nombre/número en la lista negra"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr ""
+#~ "Buscar el nombre de identidad del llamante en las bases de datos locales"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Macros de Extensión"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Una simple aplicación matemática"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "Aplicación de suma de verificación MD5"
+
+#~ msgid "Digital Milliwatt (mu-law) Test Application"
+#~ msgstr "Aplicación de testeo de Milivatios Digitales (mu-law)"
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Grabar una llamada y mezclar el sonido durante la grabación"
+
+#~ msgid "Call Parking and Announce Application"
+#~ msgstr "Aplicación de Anuncio y Llamada en Espera"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Aplicación de reproducción trivial"
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Requiere que se introduzca un número de teléfono"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "Lista de espera real de llamadas"
+
+#~ msgid "Random goto"
+#~ msgstr "Goto (ir a) Aleatorio"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Aplicación de lectura de variables"
+
+#~ msgid "Read in a file"
+#~ msgstr "Leer en un archivo"
diff --git a/trunk/package/luci/po/es/base.po b/trunk/package/luci/po/es/base.po
new file mode 100644
index 00000000..ea7257fe
--- /dev/null
+++ b/trunk/package/luci/po/es/base.po
@@ -0,0 +1,3943 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-05-04 11:38+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(ventana de %d minutos, intervalo de %d segundos)"
+
+msgid "(%s available)"
+msgstr "(%s está disponible)"
+
+msgid "(empty)"
+msgstr "(vacío)"
+
+msgid "(no interfaces attached)"
+msgstr "(sin interfaces conectados)"
+
+msgid "-- Additional Field --"
+msgstr "-- Campo Adicional --"
+
+msgid "-- Please choose --"
+msgstr "-- Elija, por favor --"
+
+msgid "-- custom --"
+msgstr "-- introducir --"
+
+msgid "1 Minute Load:"
+msgstr "Carga a 1 minuto:"
+
+msgid "15 Minute Load:"
+msgstr "Carga a 15 minutos:"
+
+msgid "5 Minute Load:"
+msgstr "Carga a 5 minutos:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+"<abbr title=\"Identificador de conjunto de servicios básicos\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "Puerto de consultas al <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "Puerto del servidor <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"Los servidores de <abbr title=\"Domain Name System\">DNS</abbr> se consultan "
+"en el orden en que aparecen en el fichero resolv"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"<abbr title=\"Identificador de conjunto de servicios extendidos\">ESSID</"
+"abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Dirección <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr ""
+"Puerta de enlace <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "Máscara de red <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"Dirección o red (CIDR)<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr ""
+"Puerta de enlace <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Configuración de <abbr title=\"Light Emitting Diode\">LEDs</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Nombre del <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Dirección <abbr title=\"Media Access Control\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"Máximas cesiones <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr "Tamaño máximo de paquetes EDNS0"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "Máximo número de consultas concurrentes"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Pairwise: %s / Grupo: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Soporte a AR"
+
+msgid "ARP retry threshold"
+msgstr "Umbral de reintento ARP"
+
+msgid "ATM Bridges"
+msgstr "Puente ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Identificador de canal virtual ATM (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Identificador de camino virtual ATM (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Los puentes ATM exponen conexiones AAL5 ethernet encapsuladas como "
+"interfaces de red Linux que se pueden usar junto a DHCP o PPP para conectar "
+"a la red del proveedor."
+
+msgid "ATM device number"
+msgstr "Número de dispositivo ATM"
+
+msgid "Access Concentrator"
+msgstr "Concentrador de acceso"
+
+msgid "Access Point"
+msgstr "Punto de Acceso"
+
+msgid "Action"
+msgstr "Acción"
+
+msgid "Actions"
+msgstr "Acciones"
+
+msgid "Activate this network"
+msgstr "Activar esta red"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Rutas activas <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Rutas activas <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "Active Connections"
+msgstr "Conexiones activas"
+
+msgid "Active DHCP Leases"
+msgstr "Cesiones DHCP activas"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Cesiones DHCPv6 activas"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Añadir"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Añadir el sufijo de dominio local a los nombres servidos desde el fichero de "
+"máquinas"
+
+msgid "Add new interface..."
+msgstr "Añadir nueva interfaz..."
+
+msgid "Additional Hosts files"
+msgstr "Ficheros de máquinas adicionales"
+
+msgid "Address"
+msgstr "Dirección"
+
+msgid "Address to access local relay bridge"
+msgstr "Dirección del puente relé local"
+
+msgid "Administration"
+msgstr "Administración"
+
+msgid "Advanced Settings"
+msgstr "Configuración avanzada"
+
+msgid "Alert"
+msgstr "Alerta"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Permitir autenticación de contraseña via <abbr title=\"Secure Shell\">SSH</"
+"abbr>"
+
+msgid "Allow all except listed"
+msgstr "Permitir a todos excepto a los de la lista"
+
+msgid "Allow listed only"
+msgstr "Permitir a los pertenecientes en la lista"
+
+msgid "Allow localhost"
+msgstr "Permitir a la propia máquina"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr "Permitir a máquinas remotas conectar a puestos SSH locales traspasados"
+
+msgid "Allow root logins with password"
+msgstr "Permitir conexiones a root con contraseña"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Permitir al usuario <em>root</em> conectar con contraseña"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Permitir respuestas en el rango 127.0.0.0/8, por ejemplo para servicios RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Usar canales de 40MHz aunque el canal secundario solape con otro. ¡El "
+"estándar IEEE 802.11n-2009 indica que no es correcto hacer esto!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Se creará una red adicional si deja esto desmarcado."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antena 1"
+
+msgid "Antenna 2"
+msgstr "Antena 2"
+
+msgid "Antenna Configuration"
+msgstr "Configuración de la antena"
+
+msgid "Any zone"
+msgstr "Cualquier zona"
+
+msgid "Apply"
+msgstr "Aplicar"
+
+msgid "Applying changes"
+msgstr "Aplicando cambios"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Asigne interfaces..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Estaciones asociadas"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Controlador inalámbrico 802.11%s Atheros"
+
+msgid "Authentication"
+msgstr "Autentificación"
+
+msgid "Authoritative"
+msgstr "Autorizado"
+
+msgid "Authorization Required"
+msgstr "Conéctese"
+
+msgid "Auto Refresh"
+msgstr "Autorefresco"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid "Available packages"
+msgstr "Paquetes disponibles"
+
+msgid "Average:"
+msgstr "Media:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Volver"
+
+msgid "Back to Overview"
+msgstr "Volver al resumen"
+
+msgid "Back to configuration"
+msgstr "Volver a la configuración"
+
+msgid "Back to overview"
+msgstr "Volver al resumen"
+
+msgid "Back to scan results"
+msgstr "Volver a resultados de la exploración"
+
+msgid "Background Scan"
+msgstr "Exploración en segundo plano"
+
+msgid "Backup / Flash Firmware"
+msgstr "Copia de seguridad / Grabar firmware"
+
+msgid "Backup / Restore"
+msgstr "Salvar / Restaurar"
+
+msgid "Backup file list"
+msgstr "Salvar lista de ficheros"
+
+msgid "Bad address specified!"
+msgstr "¡Dirección no válida!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Lista de ficheros a los que hacer copia de seguridad. Es una lista de "
+"ficheros de configuración cambiados por ficheros marcados por opkg, ficheros "
+"esenciales base y los patrones de copia de seguridad definidos por el "
+"usuario."
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Bogus NX Domain Override"
+msgstr "Ignorar dominio falso NX"
+
+msgid "Bridge"
+msgstr "Puente"
+
+msgid "Bridge interfaces"
+msgstr "Puentear interfaces"
+
+msgid "Bridge unit number"
+msgstr "Número de unidad del puente"
+
+msgid "Bring up on boot"
+msgstr "Activar en el arranque"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Controlador inalámbrico 802.11%s Broadcom"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Controlador inalámbrico 802.11 BCM%04x"
+
+msgid "Buffered"
+msgstr "En búfer"
+
+msgid "Buttons"
+msgstr "Botones"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Uso de CPU (%)"
+
+msgid "Cached"
+msgstr "En caché"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Cadena"
+
+msgid "Changes"
+msgstr "Cambios"
+
+msgid "Changes applied."
+msgstr "Cambios aplicados."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Cambie la contraseña del administrador para acceder al dispositivo"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check"
+msgstr "Comprobar"
+
+msgid "Checksum"
+msgstr "Comprobación"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Elija la zona del cortafuegos a la que quiere asignar esta interfaz. "
+"Seleccione <em>no especificado</em> para eliminar la interfaz de la zona "
+"asociada o rellene el campo <em>crear</em> para definir una zona nueva a la "
+"que asignarla."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Elija la red o redes a las que quiere unir esta interfaz inalámbrica o vacíe "
+"el campo <em>crear</em> para definir una red nueva."
+
+msgid "Cipher"
+msgstr "Cifrado"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Pulse \"generar archivo\" para descargar un fichero tar con los ficheros de "
+"configuración actuales. Para reiniciar el firmware a su estado inicial pulse "
+"\"Reiniciar\" (sólo posible con imágenes squashfs)."
+
+msgid "Client"
+msgstr "Cliente"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "ID de cliente que se enviará al solicitar DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Cerrar las conexiones inactivas tras los segundos dados. Use 0 para una "
+"conexión permanente"
+
+msgid "Close list..."
+msgstr "Cerrar lista..."
+
+msgid "Collecting data..."
+msgstr "Un momento..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Common Configuration"
+msgstr "Configuración común"
+
+msgid "Compression"
+msgstr "Compresión"
+
+msgid "Configuration"
+msgstr "Configuración"
+
+msgid "Configuration applied."
+msgstr "Configuración establecida."
+
+msgid "Configuration files will be kept."
+msgstr "Se mantendrán los ficheros de configuración."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Configura este punto de montaje como almacenamiento de overlay para block-"
+"extroot"
+
+msgid "Confirmation"
+msgstr "Confirmación"
+
+msgid "Connect"
+msgstr "Conectar"
+
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection Limit"
+msgstr "Límite de conexión"
+
+msgid "Connections"
+msgstr "Conexiones"
+
+msgid "Country"
+msgstr "País"
+
+msgid "Country Code"
+msgstr "Código de país"
+
+msgid "Cover the following interface"
+msgstr "Cubre el interfaz siguiente"
+
+msgid "Cover the following interfaces"
+msgstr "Cubre los siguientes interfaces"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Crear / Asignar zona de seguridad"
+
+msgid "Create Interface"
+msgstr "Crear interfaz"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Crear un puente sobre múltiples interfaces"
+
+msgid "Critical"
+msgstr "Crítico"
+
+msgid "Cron Log Level"
+msgstr "Nivel de registro de cron"
+
+msgid "Custom Interface"
+msgstr "Interfaz propio"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Personaliza el comportamiento de los <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s del dispositivo, si es posible."
+
+msgid "DHCP Leases"
+msgstr "Cesiones DHCP"
+
+msgid "DHCP Server"
+msgstr "Servidor DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP y DNS"
+
+msgid "DHCP client"
+msgstr "Cliente DHCP"
+
+msgid "DHCP-Options"
+msgstr "Opciones de DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Cesiones DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Retransmisión DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Depuración"
+
+msgid "Default %d"
+msgstr "%d por defecto"
+
+msgid "Default gateway"
+msgstr "Gateway por defecto"
+
+msgid "Default state"
+msgstr "Estado por defecto"
+
+msgid "Define a name for this network."
+msgstr "Definir un nombre para esta red."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Definir optiones adicionales DHCP, por ejemplo "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" que publica diferentes servidores "
+"DNS a los clientes."
+
+msgid "Delete"
+msgstr "Eliminar"
+
+msgid "Delete this interface"
+msgstr "Borrar esta interfaz"
+
+msgid "Delete this network"
+msgstr "Borrar esta red"
+
+msgid "Description"
+msgstr "Descripción"
+
+msgid "Design"
+msgstr "Diseño"
+
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "Device Configuration"
+msgstr "Configuración del dispositivo"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+msgid "Directory"
+msgstr "Directorio"
+
+msgid "Disable"
+msgstr "Desactivar"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Desactivar <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+"para esta interfaz."
+
+msgid "Disable DNS setup"
+msgstr "Desactivar configuración de DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Desactivar el temporizador de baliza hardware"
+
+msgid "Disabled"
+msgstr "Desactivar"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Descartar respuestas RFC1918 salientes"
+
+msgid "Displaying only packages containing"
+msgstr "Mostrar sólo paquete que contienen"
+
+msgid "Distance Optimization"
+msgstr "Optimización de distancia"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distancia al miembro de la red mas lejana en metros."
+
+msgid "Diversity"
+msgstr "Diversidad"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq es un programa que combina un servidor <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr> y un reenviador <abbr title=\"Domain "
+"Name System\">DNS</abbr> para cortafuegos <abbr title=\"Network Address "
+"Translation\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "No guardar respuestas negativas, por ejemplo dominios inexistentes"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"No retransmitir peticiones que no se puedan responder por servidores de "
+"nombres públicos"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "No retransmitir búsquedas inversas para redes locales"
+
+msgid "Do not send probe responses"
+msgstr "No enviar respuestas de prueba"
+
+msgid "Domain required"
+msgstr "Dominio requerido"
+
+msgid "Domain whitelist"
+msgstr "Lista blanca de dominios"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"No reenviar peticiones de <abbr title=\"Domain Name System\">DNS</abbr> sin "
+"un nombre de <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "Download and install package"
+msgstr "Descargar e instalar paquete"
+
+msgid "Download backup"
+msgstr "Descargar copia de seguridad"
+
+msgid "Dropbear Instance"
+msgstr "Instancia Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear ofrece acceso <abbr title=\"Secure Shell\">SSH</abbr> y un servidor "
+"<abbr title=\"Secure Copy\">SCP</abbr>"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinámico"
+
+msgid "Dynamic tunnel"
+msgstr "Túnel dinámico"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Reparte direcciones DHCP dinámicamente a los clientes. Si se desactiva sólo "
+"se servirá a clientes con cesiones estáticas."
+
+msgid "EAP-Method"
+msgstr "Método EAP"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Edit this interface"
+msgstr "Editar esta interfaz"
+
+msgid "Edit this network"
+msgstr "Editar esta red"
+
+msgid "Emergency"
+msgstr "Emergencia"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Activar <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Activar actualización dinámica de punto final HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Activar negociación IPv6 en el enlace PPP"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Activar paso de tramas jumbo"
+
+msgid "Enable NTP client"
+msgstr "Activar cliente NTP"
+
+msgid "Enable TFTP server"
+msgstr "Activar servidor TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Activar funcionalidad VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Activar aprendizaje y envejecimiento"
+
+msgid "Enable this mount"
+msgstr "Active este punto de montaje"
+
+msgid "Enable this swap"
+msgstr "Activar este swap"
+
+msgid "Enable/Disable"
+msgstr "Activar/Desactivar"
+
+msgid "Enabled"
+msgstr "Activado"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Activa el protocol STP en este puente"
+
+msgid "Encapsulation mode"
+msgstr "Modo de encapsulado"
+
+msgid "Encryption"
+msgstr "Encriptación"
+
+msgid "Erasing..."
+msgstr "Borrando..."
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Ethernet Adapter"
+msgstr "Adaptador ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Switch ethernet"
+
+msgid "Expand hosts"
+msgstr "Expandir nombre de máquina"
+
+msgid "Expires"
+msgstr "Expira"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Tiempo de finalización de direcciones cedidas (mínimo dos minutos: <code>2m</"
+"code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Servidor externo de registro del sistema"
+
+msgid "External system log server port"
+msgstr "Puerto del servidor externo de registro del sistema"
+
+msgid "Fast Frames"
+msgstr "Tramas rápidas"
+
+msgid "File"
+msgstr "Fichero"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Nombre del fichero de imagen de arranque mostrado a los clientes"
+
+msgid "Filesystem"
+msgstr "Sistema de ficheros"
+
+msgid "Filter"
+msgstr "Filtro"
+
+msgid "Filter private"
+msgstr "Filtro privado"
+
+msgid "Filter useless"
+msgstr "Filtro inútil"
+
+msgid "Find and join network"
+msgstr "Encontrar y unirse a red"
+
+msgid "Find package"
+msgstr "Buscar paquete"
+
+msgid "Finish"
+msgstr "Terminar"
+
+msgid "Firewall"
+msgstr "Cortafuegos"
+
+msgid "Firewall Settings"
+msgstr "Configuración del cortafuegos"
+
+msgid "Firewall Status"
+msgstr "Estado del cortafuegos"
+
+msgid "Firmware Version"
+msgstr "Versión del firmware"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Puerto origen fijo para peticiones de DNS salientes"
+
+msgid "Flags"
+msgstr "Indicadores"
+
+msgid "Flash Firmware"
+msgstr "Grabar firmware"
+
+msgid "Flash image..."
+msgstr "Grabar imagen..."
+
+msgid "Flash new firmware image"
+msgstr "Grabar imágenes del firmware"
+
+msgid "Flash operations"
+msgstr "Operaciones de grabado"
+
+msgid "Flashing..."
+msgstr "Grabando..."
+
+msgid "Force"
+msgstr "Forzar"
+
+msgid "Force 40MHz mode"
+msgstr "Forzar modo 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Forzar CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Forzar DHCP en esta red aunque se detecte otro servidor."
+
+msgid "Force TKIP"
+msgstr "Forzar TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Forzar TKIP y CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Retransmitir tráfico DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Retransmitir tráfico de propagación"
+
+msgid "Forwarding mode"
+msgstr "Modo de retransmisión"
+
+msgid "Fragmentation Threshold"
+msgstr "Umbral de fragmentación"
+
+# It should be "Frame Bursting" at once!
+msgid "Frame Bursting"
+msgstr "Frame Bursting"
+
+msgid "Free"
+msgstr "Libre"
+
+msgid "Free space"
+msgstr "Espacio libre"
+
+msgid "Frequency Hopping"
+msgstr "Saltos de Frecuencia"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Sólo GPRS"
+
+msgid "Gateway"
+msgstr "Pasarela"
+
+msgid "Gateway ports"
+msgstr "Puertos del gateway"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "General Setup"
+msgstr "Configuración general"
+
+msgid "Generate archive"
+msgstr "Generar archivo"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Controlador inalámbrico 802.11%s genérico"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+"La confirmación y la contraseña no coinciden. ¡No se ha cambiado la "
+"contraseña!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Ir a configuración de contraseña..."
+
+msgid "Go to relevant configuration page"
+msgstr "Ir a la página principal de configuración"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Contraseña HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Manejador"
+
+msgid "Hang Up"
+msgstr "Suspender"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Aspectos básicos de su dispositivo como la zona horaria o nombre de máquina."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr "Claves públicas SSH. Ponga una por línea."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Controlador inalámbrico 802.11b Hermes"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Ocultar <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Entradas de máquina"
+
+msgid "Host expiry timeout"
+msgstr "Espera para caducidad de máquinas"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"Dirección <abbr title=\"Internet Protocol Address\">IP</abbr> de máquina o "
+"red"
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Nombre de máquina a enviar cuando se solicite DHCP"
+
+msgid "Hostnames"
+msgstr "Nombres de máquina"
+
+msgid "IP address"
+msgstr "Dirección IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Cortafuegos IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Estado de la WAN IPv4"
+
+msgid "IPv4 address"
+msgstr "Dirección IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Propagación IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Gateway IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Máscara de red IPv4"
+
+msgid "IPv4 only"
+msgstr "Sólo IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Longitud de prefijo IPv4"
+
+msgid "IPv4-Address"
+msgstr "Dirección IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Cortafuegos IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Estado de la WAN IPv6"
+
+msgid "IPv6 address"
+msgstr "Dirección IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Gateway IPv6"
+
+msgid "IPv6 only"
+msgstr "Sólo IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Prefijo IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Longitud de prefijo IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "Dirección IPv6"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-en-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-sobre-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-sobre-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Identidad"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Montar el dispositivo por su UUID en vez de un nodo fijo de dispositivo si "
+"se especifica"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Montar el dispositivo por la etiqueta de la partición en vez de por el nodo "
+"fijo de dispositivo si se especifica"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Si está desmarcado no se configurará una ruta por defecto"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+"Si está desmarcado las direcciones de servidor DNS anunciadas se ignorarán"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Si su dispositivo no tiene memoria <abbr title=\"Random Access Memory\">RAM</"
+"abbr> suficiente, los datos no utilizados pueden ser guardados temporalmente "
+"en un dispositivo de intercambio (swap-device) liberando el espacio que "
+"ocupan. Tenga en cuenta que el intercambio es un proceso lento porque los "
+"dispositivos de intercambio no pueden transferir volúmenes de información a "
+"alta velocidad tal y como hace la memoria <abbr title=\"Random Access Memory"
+"\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ignorar fichero de máquinas"
+
+msgid "Ignore interface"
+msgstr "Ignorar interfaz"
+
+msgid "Ignore resolve file"
+msgstr "Ignorar el fichero resolv"
+
+msgid "Image"
+msgstr "Imagen"
+
+msgid "In"
+msgstr "Entrada"
+
+msgid "Inactivity timeout"
+msgstr "Espera de inactividad"
+
+msgid "Inbound:"
+msgstr "Entrantes:"
+
+msgid "Info"
+msgstr "Información"
+
+msgid "Initscript"
+msgstr "Nombre del script de inicio"
+
+msgid "Initscripts"
+msgstr "Scripts de inicio"
+
+msgid "Install"
+msgstr "Instalar"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Instalar el paquete %q"
+
+msgid "Install protocol extensions..."
+msgstr "Instalar extensiones de protocolo..."
+
+msgid "Installed packages"
+msgstr "Paquetes instalados"
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid "Interface Configuration"
+msgstr "Configuración del interfaz"
+
+msgid "Interface Overview"
+msgstr "Resumen de interfaces"
+
+msgid "Interface is reconnecting..."
+msgstr "Reconectando interfaz..."
+
+msgid "Interface is shutting down..."
+msgstr "Parando interfaz..."
+
+msgid "Interface not present or not connected yet."
+msgstr "El interfaz no existe o no está aún conectado."
+
+msgid "Interface reconnected"
+msgstr "Interfaz reconectado"
+
+msgid "Interface shut down"
+msgstr "Interfaz detenido"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Internal Server Error"
+msgstr "Error interno del servidor"
+
+msgid "Invalid"
+msgstr "Valor ingresado inválido"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "¡ID VLAN no válido! Sólo se permiten IDs entre %d y %d."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "¡ID VLAN no válido! Sólo se permiten IDs únicos"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr ""
+"¡Nombre de usuario o contraseña no válidos!. Pruebe de nuevo, por favor."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Parece que está intentando grabar una imagen de firmware mayor que la "
+"memoria flash de su equipo. ¡Por favor, verifique el archivo!"
+
+msgid "Java Script required!"
+msgstr "¡Se necesita JavaScript!"
+
+msgid "Join Network"
+msgstr "Unirse a Red"
+
+msgid "Join Network: Settings"
+msgstr "Unirse a Red: Configuración"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Unirse a una red: Exploración inalámbrica"
+
+msgid "Keep settings"
+msgstr "Conservar la configuración del router"
+
+msgid "Kernel Log"
+msgstr "Registro del Kernel"
+
+msgid "Kernel Version"
+msgstr "Versión del Kernel"
+
+msgid "Key"
+msgstr "Clave"
+
+msgid "Key #%d"
+msgstr "Clave #%d"
+
+msgid "Kill"
+msgstr "Matar"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Servidor L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr "Umbral de fracaso en eco LCP"
+
+msgid "LCP echo interval"
+msgstr "Intervalo de eco LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Etiqueta"
+
+msgid "Language"
+msgstr "Idioma"
+
+msgid "Language and Style"
+msgstr "Idioma y Estilo"
+
+msgid "Lease validity time"
+msgstr "Tiempo de validación de cesión"
+
+msgid "Leasefile"
+msgstr "Archivo de cesiones"
+
+msgid "Leasetime"
+msgstr "Tiempo de cesión"
+
+msgid "Leasetime remaining"
+msgstr "Tiempo de cesión restante"
+
+msgid "Leave empty to autodetect"
+msgstr "Dejar vacío para autodetectar"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Dejar vacío para usar la dirección WAN actual"
+
+msgid "Legend:"
+msgstr "Leyenda:"
+
+msgid "Limit"
+msgstr "Límite"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Enlace activado"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Lista de servidores <abbr title=\"Domain Name System\">DNS</abbr> a los que "
+"enviar solicitudes"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Lista de dominios a los que se permiten respuestas RFC1918"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Lista de máquinas que proporcionan resultados de dominio NX falsos"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr "Escucha solo en la interfaz dada o, si no se especifica, en todas"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Puerto de escucha para consultas DNS entrantes"
+
+msgid "Load"
+msgstr "Carga"
+
+msgid "Load Average"
+msgstr "Carga Media"
+
+msgid "Loading"
+msgstr "Cargando"
+
+msgid "Local IPv4 address"
+msgstr "Dirección local IPv4"
+
+msgid "Local IPv6 address"
+msgstr "Dirección local IPv6"
+
+msgid "Local Startup"
+msgstr "Arranque local"
+
+msgid "Local Time"
+msgstr "Hora local"
+
+msgid "Local domain"
+msgstr "Dominio local"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Especificación de dominio local. Los nombres que coincidan con este dominio "
+"nunca se retransmiten y se resuelven desde DHCP o ficheros de máquina locales"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Sufijo del dominio local que se añade a los nombres DHCP y a las entradas "
+"del fichero de máquinas"
+
+msgid "Local server"
+msgstr "Servidor local"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Localizar nombre de máquina dependiendo de que la subred peticionaria si hay "
+"disponibles múltiples IPs"
+
+msgid "Localise queries"
+msgstr "Localizar consultas"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Bloqueado al canal %d usado por %s"
+
+msgid "Log output level"
+msgstr "Nivel de registro"
+
+msgid "Log queries"
+msgstr "Registrar consultas"
+
+msgid "Logging"
+msgstr "Registro"
+
+msgid "Login"
+msgstr "Iniciar sesión"
+
+msgid "Logout"
+msgstr "Cerrar sesión"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "Dirección cedida más baja como diferencia de la dirección de red."
+
+msgid "MAC-Address"
+msgstr "Dirección MAC"
+
+msgid "MAC-Address Filter"
+msgstr "Filtro por dirección MAC"
+
+msgid "MAC-Filter"
+msgstr "Filtro por dirección MAC"
+
+msgid "MAC-List"
+msgstr "Lista de direcciones MAC"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Ratio Máximo"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Número máximo de cesiones DHCP activas"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Número máximo de consultas DNS concurrentes"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Tamaño máximo de paquetes EDNS.0 paquetes UDP"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Segundos máximos de espera a que el módem esté activo"
+
+msgid "Maximum hold time"
+msgstr "Pausa máxima de transmisión"
+
+msgid "Maximum number of leased addresses."
+msgstr "Máximas cesiones activas."
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Memoria"
+
+msgid "Memory usage (%)"
+msgstr "Uso de memoria (%)"
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Minimum Rate"
+msgstr "Ratio mínimo"
+
+msgid "Minimum hold time"
+msgstr "Pausa mínima de espera"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Extensión de protocolo faltante para %q"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Dispositivo de módem"
+
+msgid "Modem init timeout"
+msgstr "Espera de inicialización del modem"
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr "Entrada de montaje"
+
+msgid "Mount Point"
+msgstr "Punto de montaje"
+
+msgid "Mount Points"
+msgstr "Puntos de montaje"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Puntos de montaje - Entrada de montaje"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Puntos de montaje - Entrada de intercambio"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Los puntos de montaje definen el directorio en el que un dispositivo de "
+"memoria se unirá al sistema del archivos"
+
+msgid "Mount options"
+msgstr "Opciones de montaje"
+
+msgid "Mount point"
+msgstr "Punto de montaje"
+
+msgid "Mounted file systems"
+msgstr "Sistemas de archivo montados"
+
+msgid "Move down"
+msgstr "Bajar"
+
+msgid "Move up"
+msgstr "Subir"
+
+msgid "Multicast Rate"
+msgstr "Ratio multicast"
+
+msgid "Multicast address"
+msgstr "Dirección multicast"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Servidores NTP a consultar"
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Name of the new interface"
+msgstr "Nombre de la nueva interfaz"
+
+msgid "Name of the new network"
+msgstr "Nombre de la nueva red"
+
+msgid "Navigation"
+msgstr "Navegación"
+
+msgid "Netmask"
+msgstr "Máscara de red"
+
+msgid "Network"
+msgstr "Red"
+
+msgid "Network Utilities"
+msgstr "Utilidades de red"
+
+msgid "Network boot image"
+msgstr "Imagen de arranque en red"
+
+msgid "Network without interfaces."
+msgstr "Red sin interfaces."
+
+msgid "Next »"
+msgstr "Siguiente »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "No se ha configurado un servidor DHCP para esta interfaz"
+
+msgid "No chains in this table"
+msgstr "No hay cadenas en esta tabla"
+
+msgid "No files found"
+msgstr "No se han encontrado ficheros"
+
+msgid "No information available"
+msgstr "No hay información disponible"
+
+msgid "No negative cache"
+msgstr "Sin caché negativa"
+
+msgid "No network configured on this device"
+msgstr "No hay red configurada para este dispositivo"
+
+msgid "No network name specified"
+msgstr "No se ha especificado un nombre de red"
+
+msgid "No package lists available"
+msgstr "No hay listas de paquetes disponibles"
+
+msgid "No password set!"
+msgstr "¡Sin contraseña!"
+
+msgid "No rules in this chain"
+msgstr "No hay reglas en esta cadena"
+
+msgid "No zone assigned"
+msgstr "Sin zona asignada"
+
+msgid "Noise"
+msgstr "Ruido"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Ruido:"
+
+msgid "None"
+msgstr "Ninguno"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "No encontrado"
+
+msgid "Not associated"
+msgstr "No asociado"
+
+msgid "Not connected"
+msgstr "No conectado"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Nota: se borrarán los ficheros de configuración."
+
+msgid "Notice"
+msgstr "Aviso"
+
+msgid "Nslookup"
+msgstr "NSLookup"
+
+msgid "OK"
+msgstr "Aceptar"
+
+msgid "OPKG-Configuration"
+msgstr "Configuración de OPKG"
+
+msgid "Off-State Delay"
+msgstr "Retraso de desconexión"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Configure las interfaces de red. Puede hacer puentes con diferentes "
+"interfaces, marcando el campo \"puentear interfaces\" e introduciendo el "
+"nombre de las mismas separadas por espacios. También puede usar la notación "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr>, <samp>INTERFACE."
+"VLANNR</samp> (<abbr title=\"por ejemplo\">Ej.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Retraso de activación"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "¡Debe especificar al menos un nombre de máquina o dirección mac!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "¡Valores no válidos!"
+
+msgid "One or more required fields have no value!"
+msgstr "¡Campos vacíos!"
+
+msgid "Open list..."
+msgstr "Abrir lista..."
+
+msgid "Option changed"
+msgstr "Opción cambiada"
+
+msgid "Option removed"
+msgstr "Opción eliminada"
+
+msgid "Options"
+msgstr "Opciones"
+
+msgid "Other:"
+msgstr "Otros:"
+
+msgid "Out"
+msgstr "Salida"
+
+msgid "Outbound:"
+msgstr "Saliente:"
+
+msgid "Outdoor Channels"
+msgstr "Canales al aire libre"
+
+msgid "Override MAC address"
+msgstr "Ignorar dirección MAC"
+
+msgid "Override MTU"
+msgstr "Ignorar MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Ignorar la pasarela en las respuestas DHCP"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Ignorar la máscara de red enviada a los clientes. Normalmente se calcula "
+"desde la subred desde la que se sirve."
+
+msgid "Override the table used for internal routes"
+msgstr "Ignorar la tabla usada para rutas internas"
+
+msgid "Overview"
+msgstr "Descripción general"
+
+msgid "Owner"
+msgstr "Propietario"
+
+msgid "PAP/CHAP password"
+msgstr "Contraseña PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Nombre de usuario PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Encapsulación PPPoA"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "¡Se necesita el paquete libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Las listas de paquetes tienen más de 24 horas"
+
+msgid "Package name"
+msgstr "Nombre del paquete"
+
+msgid "Packets"
+msgstr "Paquetes"
+
+msgid "Part of zone %q"
+msgstr "Parte de zona %q"
+
+msgid "Password"
+msgstr "Contraseña"
+
+msgid "Password authentication"
+msgstr "Autentificación de contraseña"
+
+msgid "Password of Private Key"
+msgstr "Contraseña de la Clave Privada"
+
+msgid "Password successfully changed!"
+msgstr "¡Contraseña cambiada!"
+
+msgid "Path to CA-Certificate"
+msgstr "Ruta al Certificado CA"
+
+msgid "Path to Client-Certificate"
+msgstr "Camino al certificado de cliente"
+
+msgid "Path to Private Key"
+msgstr "Ruta a la Clave Privada"
+
+msgid "Path to executable which handles the button event"
+msgstr "Ruta al ejecutable que maneja el evento button"
+
+msgid "Peak:"
+msgstr "Pico:"
+
+msgid "Perform reboot"
+msgstr "Rearrancar"
+
+msgid "Perform reset"
+msgstr "Reiniciar"
+
+msgid "Phy Rate:"
+msgstr "Ratio Phy:"
+
+msgid "Physical Settings"
+msgstr "Configuración física"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "Paq."
+
+msgid "Please enter your username and password."
+msgstr "Por favor, introduzca su nombre de usuario y contraseña."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Espere por favor: Rearrancando dispositivo..."
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Port %d"
+msgstr "Puerto %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "¡El puerto %d está desmarcado en múltiples VLANs!"
+
+msgid "Port status:"
+msgstr "Estado del puerto:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Asumir que el otro estará muerto tras estos fallos de echo LCP, use 0 para "
+"ignorar fallos"
+
+msgid "Prevents client-to-client communication"
+msgstr "Impide la comunicación cliente a cliente"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Controlador inalámbrico 802.11n Prism2/2.5/3"
+
+msgid "Proceed"
+msgstr "Proceder"
+
+msgid "Processes"
+msgstr "Procesos"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Protocol family"
+msgstr "Familia de procolo"
+
+msgid "Protocol of the new interface"
+msgstr "Protocolo de la nueva interfaz"
+
+msgid "Protocol support is not installed"
+msgstr "No está instalado el soporte al protocolo"
+
+msgid "Provide NTP server"
+msgstr "Dar servicio NTP"
+
+msgid "Provide new network"
+msgstr "Introduzca una nueva red"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Calidad"
+
+msgid "RTS/CTS Threshold"
+msgstr "Umbral RTS/CTS"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "Ratio RX"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "Controlador inalámbrico 802.11%s RaLink"
+
+msgid "Radius-Accounting-Port"
+msgstr "Puerto de contabilidad Radius"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Secreto de contabilidad Radius"
+
+msgid "Radius-Accounting-Server"
+msgstr "Servidor de contabilidad Radius"
+
+msgid "Radius-Authentication-Port"
+msgstr "Puerto de autentificación Radius"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Secreto de autentificación Radius"
+
+msgid "Radius-Authentication-Server"
+msgstr "Servidor de autentificación Radius"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Leer <code>/etc/ethers</code> para configurar el servidor <abbr title="
+"\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"¿Está seguro de borrar esta interfaz?. ¡No será posible deshacer el "
+"borrado!\n"
+"Puede perder el acceso a este dispositivo si está conectado por esta "
+"interfaz."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"¿Está seguro de borrar esta red inalámbrica?. ¡No será posible deshacer el "
+"borrado!\n"
+"Puede perder el acceso a este dispositivo si está conectado por esta red."
+
+msgid "Really reset all changes?"
+msgstr "¿Está seguro de querer reiniciar todos los cambios?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"¿Está seguro de querer apagar esta red?.\n"
+"Puede perder el acceso a este dispositivo si está conectado por esta red."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"¿Está seguro de apagar la interfaz \"%s\"?.\n"
+"Puede perder el acceso a este dispositivo si está conectado por interfaz."
+
+msgid "Really switch protocol?"
+msgstr "¿Está seguro de querer cambiar el protocolo?"
+
+msgid "Realtime Connections"
+msgstr "Conexiones en tiempo real"
+
+msgid "Realtime Graphs"
+msgstr "Gráficas en tiempo real"
+
+msgid "Realtime Load"
+msgstr "Carga en tiempo real"
+
+msgid "Realtime Traffic"
+msgstr "Tráfico en tiempo real"
+
+msgid "Realtime Wireless"
+msgstr "Red inalámbrica en tiempo real"
+
+msgid "Rebind protection"
+msgstr "Protección contra reasociación"
+
+msgid "Reboot"
+msgstr "Rearrancar"
+
+msgid "Rebooting..."
+msgstr "Rearrancando..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Rearranque el sistema operativo de su dispositivo"
+
+msgid "Receive"
+msgstr "Recibir"
+
+msgid "Receiver Antenna"
+msgstr "Antena Receptora"
+
+msgid "Reconnect this interface"
+msgstr "Reconectar esta interfaz"
+
+msgid "Reconnecting interface"
+msgstr "Reconectando la interfaz"
+
+msgid "References"
+msgstr "Referencias"
+
+msgid "Regulatory Domain"
+msgstr "Dominio Regulador"
+
+msgid "Relay"
+msgstr "Relé"
+
+msgid "Relay Bridge"
+msgstr "Puente relé"
+
+msgid "Relay between networks"
+msgstr "Relé entre redes"
+
+msgid "Relay bridge"
+msgstr "Puente relé"
+
+msgid "Remote IPv4 address"
+msgstr "Dirección IPv4 remota"
+
+msgid "Remove"
+msgstr "Desinstalar"
+
+msgid "Repeat scan"
+msgstr "Repetir exploración"
+
+msgid "Replace entry"
+msgstr "Reemplazar entrada"
+
+msgid "Replace wireless configuration"
+msgstr "Cambiar la configuración inalámbrica"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Necesario para ciertos ISPs, por ejemplo Charter con DOCSIS 3"
+
+msgid "Reset"
+msgstr "Reiniciar"
+
+msgid "Reset Counters"
+msgstr "Reiniciar contadores"
+
+msgid "Reset to defaults"
+msgstr "Reiniciar a valores por defecto"
+
+msgid "Resolv and Hosts Files"
+msgstr "Ficheros Resolv y Hosts"
+
+msgid "Resolve file"
+msgstr "Fichero de resolución"
+
+msgid "Restart"
+msgstr "Rearrancar"
+
+msgid "Restart Firewall"
+msgstr "Rearrancar cortafuegos"
+
+msgid "Restore backup"
+msgstr "Restaurar copia de seguridad"
+
+msgid "Reveal/hide password"
+msgstr "Mostrar/ocultar contraseña"
+
+msgid "Revert"
+msgstr "Anular"
+
+msgid "Root"
+msgstr "Raíz"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Directorio raíz para los ficheros servidos por TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Contraseña del router"
+
+msgid "Routes"
+msgstr "Rutas"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Las rutas especifican sobre qué interfaz y pasarela se puede llegar a una "
+"cierta máquina o red."
+
+msgid "Rule #"
+msgstr "Nº de regla"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Comprobar el sistema de ficheros antes de montar el dispositivo"
+
+msgid "Run filesystem check"
+msgstr "Comprobar el sistema de ficheros"
+
+msgid "SSH Access"
+msgstr "Acceso SSH"
+
+msgid "SSH-Keys"
+msgstr "Claves SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Guardar"
+
+msgid "Save & Apply"
+msgstr "Guardar y aplicar"
+
+msgid "Save &#38; Apply"
+msgstr "Guardar y aplicar"
+
+msgid "Scan"
+msgstr "Explorar"
+
+msgid "Scheduled Tasks"
+msgstr "Tareas programadas"
+
+msgid "Section added"
+msgstr "Sección añadida"
+
+msgid "Section removed"
+msgstr "Sección eliminada"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Vea la página del manual de \"mount\" para detalles"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Enviar peticiones de echo LCP cada intervalo de segundos dado, solo efectivo "
+"usado conjuntamente con el umbral de fallo"
+
+msgid "Separate Clients"
+msgstr "Aislar clientes"
+
+msgid "Separate WDS"
+msgstr "WDS aislado"
+
+msgid "Server Settings"
+msgstr "Configuración del servidor"
+
+msgid "Service Name"
+msgstr "Nombre de servicio"
+
+msgid "Service Type"
+msgstr "Tipo de servicio"
+
+msgid "Services"
+msgstr "Servicios"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Sincronización horaria"
+
+msgid "Setup DHCP Server"
+msgstr "Configuración del servidor DHCP"
+
+msgid "Show current backup file list"
+msgstr "Mostrar lista de ficheros a salvar"
+
+msgid "Shutdown this interface"
+msgstr "Apagar esta interfaz"
+
+msgid "Shutdown this network"
+msgstr "Apagar esta red"
+
+msgid "Signal"
+msgstr "Señal"
+
+msgid "Signal:"
+msgstr "Señal:"
+
+msgid "Size"
+msgstr "Tamaño"
+
+msgid "Skip"
+msgstr "Saltar"
+
+msgid "Skip to content"
+msgstr "Saltar al contenido"
+
+msgid "Skip to navigation"
+msgstr "Saltar a navegación"
+
+msgid "Slot time"
+msgstr "Tiempo asignado"
+
+msgid "Software"
+msgstr "Instalación de programas"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Algunos campos no son válidos, ¡no se pueden guardar!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Objeto no encontrado."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "El servidor encontró un error inesperado."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"No está instalado el soporte para el sysupgrade, la nueva imagen debe "
+"grabarse manualmente. Por favor, mire el wiki de libreCMC para instrucciones "
+"de instalación específicas."
+
+msgid "Sort"
+msgstr "Ordenar"
+
+msgid "Source"
+msgstr "Origen"
+
+msgid "Specifies the button state to handle"
+msgstr "Especifica el estado de botón a manejar"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Especifica el directorio al que está enlazado el dispositivo"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+"Especifica los puertos de escucha de esta instancia de <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Especifica la cantidad de peticiones ARP fallidas hasta suponer muerta una "
+"máquina"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Especifica la cantidad de segundos a transcurrir hasta suponer muerta una "
+"máquina"
+
+msgid "Specify the secret encryption key here."
+msgstr "Especifica la clave secreta de encriptado."
+
+msgid "Start"
+msgstr "Arrancar"
+
+msgid "Start priority"
+msgstr "Prioridad de arranque"
+
+msgid "Startup"
+msgstr "Arranque"
+
+msgid "Static IPv4 Routes"
+msgstr "Rutas estáticas IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Rutas estáticas IPv6"
+
+msgid "Static Leases"
+msgstr "Cesiones estáticas"
+
+msgid "Static Routes"
+msgstr "Rutas estáticas"
+
+msgid "Static WDS"
+msgstr "WDS estático"
+
+msgid "Static address"
+msgstr "Dirección estática"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Las cesiones estáticas se usan para asignar direcciones IP fijas y nombres "
+"simbólicos de máquina a clientes DHCP. También son necesarias para "
+"configuraciones de interfaz no dinámica en las que a cada máquina siempre se "
+"le quiere servir la misma dirección IP."
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Stop"
+msgstr "Parar"
+
+msgid "Strict order"
+msgstr "Orden estricto"
+
+msgid "Submit"
+msgstr "Guardar"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Entrada de intercambio"
+
+msgid "Switch"
+msgstr "Switch"
+
+msgid "Switch %q"
+msgstr "Switch %q"
+
+msgid "Switch %q (%s)"
+msgstr "Switch %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Intercambiar protocolo"
+
+msgid "Sync with browser"
+msgstr "Sincronizar con el navegador"
+
+msgid "Synchronizing..."
+msgstr "Sincronizando..."
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "System Log"
+msgstr "Registro del sistema"
+
+msgid "System Properties"
+msgstr "Propiedades del sistema"
+
+msgid "System log buffer size"
+msgstr "Tamaño del buffer de registro del sistema"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Configuración TFTP"
+
+msgid "TFTP server root"
+msgstr "Raíz del servidor TFTP"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "Ratio TX"
+
+msgid "Table"
+msgstr "Tabla"
+
+# Target = Meta --> Objetivo --> Destino?
+msgid "Target"
+msgstr "Objetivo"
+
+msgid "Terminate"
+msgstr "Terminar"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"La sección de <em>Configuración del dispositivo</em> ocupa la configuración "
+"física del hardware de radio como el canal, la potencia de transmisión o la "
+"selección de antena que se comparte entre todas las redes inalámbricas "
+"definidas (si el hardware de radio es capaz de ser multi-SSID). "
+"Configuración por red como encriptado o modo de operación se agrupan en "
+"<em>Configuración del interfaz</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"El paquete <em>libiwinfo-lua</em> no está instalado. ¡Debe instalarlo para "
+"poder configurar la conectividad inalambrica!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"El prefijo IPv6 asignado por el proveedor, suele termina con <code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Los caracteres permitidos son: <code>A-Z</code>, <code>a-z</code>, "
+"<code>0-9</code> y <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"El archivo de dispositivo de memoria o partición (<abbr title=\"Por ejemplo"
+"\">e.j.</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"El sistema de archivo que fue utilizado para dar formato a la memoria (<abbr "
+"title=\"por ejemplo\">Ej.</abbr> <samp><abbr title=\"Third Extended "
+"Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Imagen recibida. Verifique que la comprobación y tamaño del fichero recibido "
+"coinciden con los del original.<br />Pulse \"Proceder\" para empezar el "
+"grabado."
+
+msgid "The following changes have been committed"
+msgstr "Se han hecho los siguientes cambios"
+
+msgid "The following changes have been reverted"
+msgstr "Se han anulado los siguientes cambios"
+
+msgid "The following rules are currently active on this system."
+msgstr "Rutas activas."
+
+msgid "The given network name is not unique"
+msgstr "Nombre de red repetido"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"El hardware no es capaz de multi-SSD y la configuración actual se cambiará "
+"si continúa."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"Longitud del prefijo IPv4 en bits, el resto se usará en direcciones IPv6."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Longitud del prefijo IPv6 en bits"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Los puertos de red de este dispositivo se pueden combinar en varias <abbr "
+"title=\"Virtual Local Area Network\">VLAN</abbr>s en las que los ordenadores "
+"se pueden comunicar directamente entre ellos. Las <abbr title=\"Virtual "
+"Local Area Network\">VLAN</abbr>s se usan a menudo para separar diferentes "
+"segmentos de red. Es común que exista un puerto por defecto para subida "
+"hacia una red mayor como internet y el resto se dediquen a la red local."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Este protocolo necesita estar asignado a un dispositivo"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"El sistema está borrando la partición de configuración y rearrancará cuando "
+"termine."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Escribiendo en la memoria flash.<br />¡NO APAGUE EL DISPOSITIVO!<br /> "
+"Espere unos minutos antes de reconectar. Es posible que tenga que renovar la "
+"conexión de su ordenador para poder acceder de nuevo al dispositivo."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"El archivo con la imagen de firmware subido no tiene un formato adecuado. "
+"Asegúrese de haber elegido la imagen correcta para su plataforma."
+
+msgid "There are no active leases."
+msgstr "Sin cesiones activas."
+
+msgid "There are no pending changes to apply!"
+msgstr "¡No hay cambios pendientes!"
+
+msgid "There are no pending changes to revert!"
+msgstr "¡No hay cambios a anular!"
+
+msgid "There are no pending changes!"
+msgstr "¡Sin cambios pendientes!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"No hay dispositivo asignado aún. Por favor, enlace un dispositivo de red en "
+"la pestaña \"Configuración física\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"No hay contraseñas en este router. Por favor, configure una contraseña para "
+"proteger el interfaz web y activar SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "Dirección IPv4 del relé"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Lista de patrones shell con los ficheros y directorios que se deben incluir "
+"en un sysupgrade. Los ficheros modificados en /etc/config/ y ciertas otras "
+"configuraciones se guardarán automáticamente."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Contenido de /etc/rc.local. Ponga sus propios comandos aquí (antes de 'exit "
+"0') para ejecutarlos al final del proceso de inicio."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Esta es la dirección de punto final asignada por el broker del túnel, suele "
+"terminar con <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Este es el único servidor <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> en la red de área local"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "Definición de tareas programadas para crontab."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Esta es normalmente la dirección del PoP más cercano operada por el broker "
+"del túnel"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr "Procesos de sistema que se están ejecutando actualmente y su estado."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "Configuración de acciones personalizadas para los botones"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Conexiones de red activas."
+
+msgid "This section contains no values yet"
+msgstr "No hay reglas definidas"
+
+msgid "Time Synchronization"
+msgstr "Sincronización horaria"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Sincronización horaria no configurada."
+
+msgid "Timezone"
+msgstr "Zona horaria"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Para restaurar los ficheros de configuración, debe subir primero una copia "
+"de seguridad."
+
+msgid "Total Available"
+msgstr "Total disponible"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "Tráfico"
+
+msgid "Transfer"
+msgstr "Transferencia"
+
+msgid "Transmission Rate"
+msgstr "Tasa de Transmisión"
+
+msgid "Transmit"
+msgstr "Transmitir"
+
+msgid "Transmit Power"
+msgstr "Potencia de transmisión"
+
+msgid "Transmitter Antenna"
+msgstr "Antena Transmisora"
+
+msgid "Trigger"
+msgstr "Disparador"
+
+msgid "Trigger Mode"
+msgstr "Modo de disparador"
+
+msgid "Tunnel ID"
+msgstr "ID de túnel"
+
+msgid "Tunnel Interface"
+msgstr "Interfaz de túnel"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Modo Turbo"
+
+msgid "Tx-Power"
+msgstr "Potencia-TX"
+
+msgid "Type"
+msgstr "Tipo"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Sólo UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "Dispositivo USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Imposible repartir"
+
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Error desconocido, ¡no se ha cambiado la contraseña!"
+
+msgid "Unmanaged"
+msgstr "No gestionado"
+
+msgid "Unsaved Changes"
+msgstr "Cambios no guardados"
+
+msgid "Unsupported protocol type."
+msgstr "Tipo de protocolo no soportado."
+
+msgid "Update lists"
+msgstr "Actualizar listas"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Suba una imagen compatible con sysupgrade para reemplazar el firmware "
+"actual. Puede marcar \"Conservar la configuración\" si lo desea (es "
+"necesario que la imagen de libreCMC sea compatible)."
+
+msgid "Upload archive..."
+msgstr "Subir archivo..."
+
+msgid "Uploaded File"
+msgstr "Archivo subido"
+
+msgid "Uptime"
+msgstr "Tiempo activo"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Usar <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Usar pasarela DHCP"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Utiliza servidores DNS anunciados por otros"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Usa códigos de país ISO/IEC 3166 alpha2."
+
+msgid "Use MTU on tunnel interface"
+msgstr "MTU a usar en el interfaz de túnel"
+
+msgid "Use TTL on tunnel interface"
+msgstr "TTL a usar en el interfaz de túnel"
+
+msgid "Use as root filesystem"
+msgstr "Usar como raíz del sistema de ficheros"
+
+msgid "Use broadcast flag"
+msgstr "Usar marca de propagación"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Usar servidores DNS personalizados"
+
+msgid "Use default gateway"
+msgstr "Usar pasarela por defecto"
+
+msgid "Use gateway metric"
+msgstr "Usar métrica de la pasarela"
+
+msgid "Use routing table"
+msgstr "Usar tabla de rutas"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Pulse el botón <em>Añadir</em> para insertar una nueva cesión. <em>Dirección "
+"MAC</em> identificará la máquina, <em>dirección IPv4</em> especificará la "
+"dirección fija a usar y <em>Nombre de máquina</em> se asignará como nombre "
+"simbólico."
+
+msgid "Used"
+msgstr "Usado"
+
+msgid "Used Key Slot"
+msgstr "Espacio de clave usado"
+
+msgid "Username"
+msgstr "Nombre de usuario"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Interfaz VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANs en %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs en %q (%s)"
+
+msgid "VPN Server"
+msgstr "Servidor VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Clase de vendedor a enviar cuando solicite DHCP"
+
+msgid "Verify"
+msgstr "Verificar"
+
+msgid "Version"
+msgstr "Versión"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Sistema abierto WEP"
+
+msgid "WEP Shared Key"
+msgstr "Clave compartida WEP"
+
+msgid "WEP passphrase"
+msgstr "Frase de paso WEP"
+
+msgid "WMM Mode"
+msgstr "Modo WMM"
+
+msgid "WPA passphrase"
+msgstr "Frase de paso WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA-Encryption necesita que estén instalados wpa_supplicant (para el modo "
+"cliente o hostapd (para los modos AP y ad-hoc)."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Esperando a que se realicen los cambios..."
+
+msgid "Waiting for command to complete..."
+msgstr "Esperando a que termine el comando..."
+
+msgid "Warning"
+msgstr "Aviso"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Advertencia: Hay cambios realizados que no han sido guardados, los mismos se "
+"perderán mientras se rearranca!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Red inalámbrica"
+
+msgid "Wireless Adapter"
+msgstr "Adaptador inalámbrico"
+
+msgid "Wireless Network"
+msgstr "Red inalámbrica"
+
+msgid "Wireless Overview"
+msgstr "Redes inalámbricas"
+
+msgid "Wireless Security"
+msgstr "Seguridad inalámbrica"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Red inalámbrica desconectada o no asociada"
+
+msgid "Wireless is restarting..."
+msgstr "Rearrancando red inalámbrica..."
+
+msgid "Wireless network is disabled"
+msgstr "Red inalámbrica desconectada"
+
+msgid "Wireless network is enabled"
+msgstr "Red inalámbrica conectada"
+
+msgid "Wireless restarted"
+msgstr "Red inalámbrica rearrancada"
+
+msgid "Wireless shut down"
+msgstr "Apagando red inalámbrica"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Escribir las peticiones de DNS recibidas en el registro del sistema"
+
+msgid "XR Support"
+msgstr "Soporte de XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Gestione los scripts de inicio. Los cambios serán aplicados tras reiniciar "
+"el equipo.<br /><strong>ADVERTENCIA: ¡Si desactiva scripts de inicio "
+"esenciales como\"network\", su equipo puede no arrancar o quedar "
+"inaccesible!.</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Debe activar Javascript en su navegador o LuCI no funcionará correctamente."
+
+msgid "any"
+msgstr "cualquiera"
+
+msgid "auto"
+msgstr "auto"
+
+#, fuzzy
+msgid "automatic"
+msgstr "estático"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "puenteado"
+
+msgid "create:"
+msgstr "crear:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "crea un puente sobre la interfaz o interfaces asociadas"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "desabilitar"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "expirado"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"archivo en el que se guardarán las direcciones <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr> cedidas"
+
+msgid "forward"
+msgstr "retransmisión"
+
+msgid "full-duplex"
+msgstr "full dúplex"
+
+msgid "half-duplex"
+msgstr "half dúplex"
+
+msgid "help"
+msgstr "ayuda"
+
+msgid "hidden"
+msgstr "oculto"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "si el destino es una red"
+
+msgid "input"
+msgstr "entrada"
+
+msgid "kB"
+msgstr "KB"
+
+msgid "kB/s"
+msgstr "KB/s"
+
+msgid "kbit/s"
+msgstr "Kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "Archvo <abbr title=\"Domain Name System\">DNS</abbr> local"
+
+msgid "no"
+msgstr "no"
+
+msgid "no link"
+msgstr "sin enlace"
+
+msgid "none"
+msgstr "ninguno"
+
+msgid "off"
+msgstr "parado"
+
+msgid "on"
+msgstr "activo"
+
+msgid "open"
+msgstr "abierto"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "enrutado"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "marcado"
+
+msgid "unknown"
+msgstr "desconocido"
+
+msgid "unlimited"
+msgstr "ilimitado"
+
+msgid "unspecified"
+msgstr "no especificado"
+
+msgid "unspecified -or- create:"
+msgstr "no especificado -o- crear:"
+
+msgid "untagged"
+msgstr "desmarcado"
+
+msgid "yes"
+msgstr "sí"
+
+msgid "« Back"
+msgstr "« Volver"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "ID de usuario de HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Esto es el ID de usuario codificado como hexadecimal de 32 bytes, no el "
+#~ "nombre de conexión"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz 2º canal por encima"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz 2º canal por debajo"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Aceptar anuncios del router"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Anunciar IPv6 en la red"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ID de red anunciado"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "El rango permitido es desde 1 hasta 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Habilidades HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Modo HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Modelo de router"
+
+#~ msgid "Router Name"
+#~ msgstr "Nombre del router"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Enviar solicitudes de router"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "Especifica el tiempo de prefijo anunciado preferido en segundos"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Especifica el tiempo de prefijo válido preferido en segundos"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Usar tiempo de vida preferido"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Usar tiempo de vida válido"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Esperando al router..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Activar el servidor integrado NTP"
+
+#~ msgid "Active Leases"
+#~ msgstr "Cesiones activas"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Bitrate"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Configuración / Aplicar"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Configuración / Cambios"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Configuración / Anular"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "Encriptado"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "Explorar-<abbr title=\"Wireless Local Area Network\">WLAN</abbr>"
+
+#~ msgid "Create Network"
+#~ msgstr "Crear red"
+
+#~ msgid "Link"
+#~ msgstr "Enlace"
+
+#~ msgid "Networks"
+#~ msgstr "Redes"
+
+#~ msgid "Power"
+#~ msgstr "Potencia"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Redes inalámbricas en un entorno local"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "Notación-<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
+#~ "dirección/prefijo"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "Servidor <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "Difusión-<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Dirección <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "Alias IP"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Configuración IPv6"
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Los puertos de red de su router pueden ser combinados en diferentes <abbr "
+#~ "title=\"Virtual Local Area Network\">VLAN</abbr>s donde las computadoras "
+#~ "pueden comunicarse directamente con otras. Las <abbr title=\"Virtual "
+#~ "Local Area Network\">VLAN</abbr>s a menu son usadas para separar "
+#~ "diferentes segmentos de red. Además, usualmente hay un puerto de enlace "
+#~ "de subida (Uplink) para conectar a una red mas grande, por ejemplo "
+#~ "Internet y otro(s) puerto(s) para el acceso a la red local."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Activar buffering"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6-sobre-IPv4"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Archivos protegidos al instalar un nuevo firmware"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Aquí puede personalizar las configuraciones y funcionalidad de <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Acciones luego de \"Post-commit\""
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Estos comandos se ejecutan automáticamente cuando una determinada "
+#~ "configuración de la <abbr title=\"Unified configuración Interface\"> UCI "
+#~ "</abbr> es aplicada permitiendo que los cambios sean efectivos "
+#~ "inmediatamente."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "<abbr title=\"User Interface\">Interfaz de Usuario</abbr> Web"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "Servidor <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Punto de acceso (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Opciones adicional de pppd"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Desconectar automáticamente"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Archivo de copia de seguridad"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configurar el servidor DNS local para usar servidores de nombre sugeridos "
+#~ "por el par PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Script de conexión"
+
+#~ msgid "Create backup"
+#~ msgstr "Crear copia de respaldo"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Script de desconexión"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Editar listas de paquetes de instalación y los objetivos "
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Ativar IPv6 sobre enlace PPP"
+
+#~ msgid "Firmware image"
+#~ msgstr "Imágen del firmware"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Aquí puede realizar una copia de respaldo o bien restaurar la "
+#~ "configuración de su ruter y, si es posible, reiniciar el ruter a su "
+#~ "configuración de fábrica."
+
+#~ msgid "Installation targets"
+#~ msgstr "Destinos de instalación"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Mantener archivos de configuración"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Mantener conectada"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Permite que pppd reemplace la ruta por defecto actual para usar la "
+#~ "interfaz ppp como ruta por defecto luego de una conexión satisfactoria"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr ""
+#~ "Permite a pppd ejecutar este script luego de establecer un enlace PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Permite a pppd ejecutar este script antes de terminar el enlace PPP"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Asegurese de escribir correctamente el código pin aquí caso contrario "
+#~ "bloqueará su tarjeta sim!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "La mayoría de ellos son servidores de red, que ofrezcen un determinado "
+#~ "servicio para el dispositivo o la red como el acceso shell, servicio de "
+#~ "páginas web como <abbr title=\"Lua configuración Interface\"> LuCI </"
+#~ "abbr>, haciendo mesh-routing, el envío de mensajes de correo "
+#~ "electrónico, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Número de tests de conexión fallida para iniciar la reconexión automática"
+
+#~ msgid "PIN code"
+#~ msgstr "Código PIN"
+
+#~ msgid "Package lists"
+#~ msgstr "Listas de paquetes"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Proceder a configurar su router a los valores de fábrica?"
+
+#~ msgid "Processor"
+#~ msgstr "Procesador"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Puerto servidor Radius"
+
+#, fuzzy
+#~ msgid "Radius-Server"
+#~ msgstr "Servidor Radius"
+
+#~ msgid "Replace default route"
+#~ msgstr "Reemplazar la ruta por defecto"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Reiniciar router a su configuración de fábrica"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr "Segundos a esperar al modem antes iniciar el intento de conexión"
+
+#~ msgid "Service type"
+#~ msgstr "Tipo de servicio"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "Los servicios y demonios ejecutan ciertas tareas en su dispositivo."
+
+#~ msgid "Settings"
+#~ msgstr "Configuraciones"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Configurar tiempo de espera"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Lo lamento. libreCMC y derivados no permite la actualización de esta "
+#~ "plataforma. <br /> Para poder flashear este dispositivo deberá hacerlo en "
+#~ "forma manual."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr ""
+#~ "Especifique aquí argumentos adicionales para la línea de comando de pppd"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "El nodo de dispositivo de su modem, ej. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr ""
+#~ "Tiempo (en segundos) luego de que una conexión no usada será cerrada"
+
+#~ msgid "Update package lists"
+#~ msgstr "Acutlizar listas de paquetes"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr ""
+#~ "Subir un archivo de imágen de libreCMC o derivado para re-flashear el "
+#~ "dispositivo."
+
+#~ msgid "Upload image"
+#~ msgstr "Subir imágen"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Uso de pares de DNS "
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Es necesario instalar &amp;quot;comgt&amp;quot; para UMTS/GPRS, &amp;quot;"
+#~ "ppp-mod-pppoe&amp;quot; para PPPoE, &amp;quot;ppp-mod-pppoa&amp;quot; "
+#~ "para PPPoA o &amp;quot;pptp&amp;quot; para porte PPtP"
+
+#~ msgid "back"
+#~ msgstr "volver"
+
+#~ msgid "buffered"
+#~ msgstr "buffered"
+
+#~ msgid "cached"
+#~ msgstr "en caché "
+
+#~ msgid "free"
+#~ msgstr "libre"
+
+#~ msgid "static"
+#~ msgstr "estático"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> es una colección "
+#~ "libre de software Lua incluyendo un <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework y una interfaz web para dispositivos embebidos."
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> se encuentra "
+#~ "licenciado bajo la licencia Apache (Apache-License)."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Un servidor web HTTP/1.1 liviano escrito en C y Lua, diseñado para servir "
+#~ "LUCI "
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Un pequeño servidor web que puede ser usado para servir <abbr title=\"Lua "
+#~ "configuración Interface\"> LuCI </abbr>. "
+
+#~ msgid "About"
+#~ msgstr "Acerca de"
+
+#~ msgid "Addresses"
+#~ msgstr "Direcciones"
+
+#~ msgid "Admin Password"
+#~ msgstr "Contraseña de Admin"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Autenticación Realm"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Puerto del puente"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Cambiar la clave del administrador del sistema (Usuario <code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Cliente + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Fichero configuración"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Tiempo de conexión agotado"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Desarrolladores que contribuyen"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP asignado"
+
+#~ msgid "Document root"
+#~ msgstr "Raíz de documentos"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Habilitar Keep-Alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Puente ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Aquí puede pegar las claves públicas de <abbr title=\"Secure Shell\">SSH</"
+#~ "abbr> (una por línea) para la autenticación de claves públicas de <abbr "
+#~ "title=\"Secure Shell\">SSH</abbr>."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Configuración IP"
+
+#~ msgid "Interface Status"
+#~ msgstr "Interfaz de Estado "
+
+#~ msgid "Lead Development"
+#~ msgstr "Lider del desarrollo"
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Master + WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "No configurado"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Contraseña cambiada satisfactoriamente"
+
+#~ msgid "Plugin path"
+#~ msgstr "Ruta del plugin"
+
+#~ msgid "Ports"
+#~ msgstr "Puertos"
+
+#~ msgid "Primary"
+#~ msgstr "Primario"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Página del proyecto "
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+# Thanks to --> Gracias a -> Agradecemientos --> Agregadecemos a
+#~ msgid "Thanks To"
+#~ msgstr "Agregadecemos a"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "El nombre Realm el cual será mostrado en el símbolo de autenticación para "
+#~ "páginas protegidas. "
+
+#~ msgid "Unknown Error"
+#~ msgstr "Error desconocido"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "por defecto a <code>/etc/httpd.conf</code>"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Listas de paquetes actualizada"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Actualizar los paquetes instalados"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "También los archivos de registro del núcleo (kernel) o servicio se pueden "
+#~ "ver aquí para obtener una visión general sobre su estado actual."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Aquí pude encontrar información acerca del estado actual del sistema como "
+#~ "la frecuencia del reloj de la <abbr title=\"Central Processing Unit"
+#~ "\">CPU</abbr> clock frequency, uso de la memoria o datos de la interfaz "
+#~ "de red."
+
+#~ msgid "Search file..."
+#~ msgstr "Buscar archivo..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> interfaz gráfica "
+#~ "libre, flexible y amigable para configurar la distro libreCMC (Kamikaze) y "
+#~ "derivados."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "Y ahora disfrute su router!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Como siempre queremos mejorar esta interfaz estamos esperando con interés "
+#~ "sus comentarios y sugerencias. "
+
+#~ msgid "Hello!"
+#~ msgstr "Hola !"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Aviso: En <abbr title=\"Lua Configuration Interface\">LuCI</abbr> los "
+#~ "cambios deben ser confirmados haciendo clic en \"Cambios\" y luego en "
+#~ "\"Guardar &amp; aplicar\" para que los cambios sean efectivos."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "En las páginas siguientes puede realizar todos los ajustes importantes de "
+#~ "su router."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "El grupo de <abbr title=\"Lua Configuration Interface\">LuCI</abbr>"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Éste es el área de administración de <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Interfaz de usuario"
+
+#~ msgid "enable"
+#~ msgstr "habilitar"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr ""
+#~ "<span class=\"translation-space\"> </span>\r\n"
+#~ "(opcional)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "Puerto <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "El Servidor <abbr title=\"Domain Name System\">DNS</abbr> serán "
+#~ "consultados de acuerdo al orden explicitado en el archivo \"resolv\""
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "Tamaño <abbr title=\"máximo\">máx.</abbr> de paquete <abbr title="
+#~ "\"Extension Mechanisms for Domain Name System\">EDNS0</abbr>"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "Aislamiento AP"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Añadir una red WiFi a la red física"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliases"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Tamaño del segmento de la abrazadera"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Crear red"
+
+#~ msgid "Devices"
+#~ msgstr "Dispositivos"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Hacer búqueda inversa para redes locales"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Activar Servidor TFTP"
+
+#~ msgid "Errors"
+#~ msgstr "Errores"
+
+#~ msgid "Essentials"
+#~ msgstr "Esencial"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Expandir hosts"
+
+#~ msgid "First leased address"
+#~ msgstr "Primer dirección otorgada"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Correge problemas con los sitios web inaccesibles, envío de formularios o "
+#~ "una conducta inesperada para algunos proveedores de servicios de Internet."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Dirección de Hardware"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Aquí puede configurar los dispositivos Wi-Fi instalados."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignorar <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Independiente (ad hoc) "
+
+#~ msgid "Internet Connection"
+#~ msgstr "Conexión a Internet "
+
+#~ msgid "Join (Client)"
+#~ msgstr "Únete (Cliente) "
+
+#~ msgid "Leases"
+#~ msgstr "Brindadas"
+
+#~ msgid "Local Domain"
+#~ msgstr "Dominio local"
+
+#~ msgid "Local Network"
+#~ msgstr "Red local"
+
+#~ msgid "Local Server"
+#~ msgstr "Servidor local"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Imágen de inicio en red"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Nombre de la red (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Número de direcciones otorogada"
+
+#~ msgid "Path"
+#~ msgstr "Ruta (path)"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Ejectuar acciones"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Impide la comunicación de cliente a cliente "
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Proporcionar (Punto de Acceso) "
+
+#~ msgid "Resolvfile"
+#~ msgstr "Archivo \"resolv\""
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Raíz del Servidor TFTP"
+
+#~ msgid "TX / RX"
+#~ msgstr "Tx / Rx"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Los siguientes cambios se han aplicado"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Cuando un nuevo firmware ha sido instalado con <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr> estos archivos serán agregados a la "
+#~ "nueva instalación automáticamente."
+
+#, fuzzy
+#~ msgid "Wireless Scan"
+#~ msgstr "Inalámbrico"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Con <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "miembros de la red pueden automáticamente recibir su configuración (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, máscara de red, servidor "
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Puede correr varias redes Wi-Fi con un solo dispositivo. Tenga en cuenta "
+#~ "que hay restricciones que se aplican al propio hardware y al driver "
+#~ "específicamente. Normalmente puede operar 1 red Ad-Hoc o hasta 3 modo "
+#~ "Master y un Cliente de forma simultanea."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Es necesario instalar &amp;quot;ppp-mod-pppoe&amp;quot; para PPPoE o &amp;"
+#~ "quot;pptp&amp;quot; para PPtP support"
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#~ msgid "additional hostfile"
+#~ msgstr "archivo de host adicional"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "añadir nombre de dominios a entradas de host en el archivo resolv"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "reconectar automáticamente"
+
+#~ msgid "concurrent queries"
+#~ msgstr "consultas simultaneas"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "desactivar <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+#~ "abbr> para esta interfaz"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "desconecte cuando esté inactivo durante "
+
+#~ msgid "don't cache unknown"
+#~ msgstr "do cachear desconocido"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+
+#~ msgid "installed"
+#~ msgstr "instalado"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "Localización de nombre de host dependiendo de su subred"
+
+#~ msgid "not installed"
+#~ msgstr "no instalado"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "impedir cacheo de respuestas negativas de <abbr title=\"Domain Name System"
+#~ "\">DNS</abbr>"
+
+#~ msgid "query port"
+#~ msgstr "puerto de consulta"
+
+#~ msgid "transmitted / received"
+#~ msgstr "transmitido / recibido"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "redes contenidas"
+
+#~ msgid "all"
+#~ msgstr "todo"
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid "Distance"
+#~ msgstr "Distancia"
+
+#~ msgid "Legend"
+#~ msgstr "Leyenda"
+
+#~ msgid "Library"
+#~ msgstr "Biblioteca"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "ver las páginas de man de &amp;#39;%s&amp;#39;"
+
+#~ msgid "Package Manager"
+#~ msgstr "Gestor de Paquetes"
+
+#~ msgid "Service"
+#~ msgstr "Servicio"
+
+#~ msgid "Statistics"
+#~ msgstr "Estadísticas"
+
+#~ msgid "zone"
+#~ msgstr "Zona"
diff --git a/trunk/package/luci/po/es/commands.po b/trunk/package/luci/po/es/commands.po
new file mode 100644
index 00000000..80524529
--- /dev/null
+++ b/trunk/package/luci/po/es/commands.po
@@ -0,0 +1,97 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-11-24 10:16+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Descripción breve del comando a configurar"
+
+msgid "Access command with"
+msgstr "Acceder al comando con"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Permitir ejecutar el comando y descargar su salida sin más autentificación"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Permitir al usuario añadir parámetros de línea de comandos"
+
+msgid "Arguments:"
+msgstr "Parámetros:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "No se pueden mostrar datos binarios, descárguelos."
+
+msgid "Code:"
+msgstr "Código:"
+
+msgid "Collecting data..."
+msgstr "Recuperando datos..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Command failed"
+msgstr "Falló"
+
+msgid "Command line to execute"
+msgstr "Comando a ejecutar"
+
+msgid "Command successful"
+msgstr "OK"
+
+msgid "Command:"
+msgstr "Comando:"
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Custom Commands"
+msgstr "Comandos propios"
+
+msgid "Custom arguments"
+msgstr "Parámetros propios"
+
+msgid "Dashboard"
+msgstr "Panel"
+
+msgid "Description"
+msgstr "Descripción"
+
+msgid "Download"
+msgstr "Descarga"
+
+msgid "Failed to execute command!"
+msgstr "¡Error al ejecutar el comando!"
+
+msgid "Link"
+msgstr "Enlace"
+
+msgid "Loading"
+msgstr "Cargando"
+
+msgid "Public access"
+msgstr "Acceso público"
+
+msgid "Run"
+msgstr "Ejecutar"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Aquí puede configurar sus propios comandos shell para lanzarlos fácilmente "
+"desde el interfaz web."
+
+msgid "Waiting for command to complete..."
+msgstr "Esperando a que termine el comando..."
diff --git a/trunk/package/luci/po/es/coovachilli.po b/trunk/package/luci/po/es/coovachilli.po
new file mode 100644
index 00000000..886da590
--- /dev/null
+++ b/trunk/package/luci/po/es/coovachilli.po
@@ -0,0 +1,113 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-07-28 23:18+0200\n"
+"Last-Translator: Daniel <danips@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Configuración de Red"
+
+msgid "RADIUS configuration"
+msgstr "Configuración RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Autenticación UAM y MAC"
+
+#~ msgid "General configuration"
+#~ msgstr "Configuración General"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Configuración General de CoovaChilli"
+
+#~ msgid "Command socket"
+#~ msgstr "Socket de Comando"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "SocketUNIX utilizado para comunicación con chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Configuración del intervalo de refresco "
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Vuelve a leer el fichero de configuracion y las consultas DNS cada "
+#~ "intervalo de segundos. Eso tiene el mismo efecto que enviar la señal HUP. "
+#~ "Si el intervalo es 0 (cero) se inhabilita la función."
+
+#~ msgid "Pid file"
+#~ msgstr "Fichero Pid"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr "Nombre de archivo donde poner el ID del proceso"
+
+#~ msgid "State directory"
+#~ msgstr "Directorio de estado"
+
+#~ msgid "Directory of non-volatile data"
+#~ msgstr "Directorio de datos no volátiles"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "Configuración TUN / TAP"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Configuración de Red / Tun"
+
+#~ msgid ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+#~ msgstr ""
+#~ "Script ejecutado cuando el estado de una sesión es alterado de autorizado "
+#~ "a no autorizado"
+
+#~ msgid "Network up script"
+#~ msgstr "Script de subida de red"
+
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr ""
+#~ "Script ejecutado después de que la interfaz de red tun haya sido "
+#~ "levantado."
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Servidor DNS primario"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Servidor DNS secundario"
+
+#~ msgid "Domain name"
+#~ msgstr "Nombre de dominio"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr ""
+#~ "Se utiliza para informar al cliente sobre el nombre de dominio a utilizar "
+#~ "para las consultas DNS"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Conjunto de direcciones IP Dinámicas"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Especifica un conjunto de direcciones IP Dinámicas"
+
+#~ msgid "IP down script"
+#~ msgstr "Scripts de bajada IP"
+
+#~ msgid "Script executed after the tun network interface has been taken down"
+#~ msgstr "Script ejecutado después de que la red de interfaz tun sea bajado"
+
+#~ msgid "IP up script"
+#~ msgstr "Script de subida IP"
diff --git a/trunk/package/luci/po/es/ddns.po b/trunk/package/luci/po/es/ddns.po
new file mode 100644
index 00000000..2eb72101
--- /dev/null
+++ b/trunk/package/luci/po/es/ddns.po
@@ -0,0 +1,89 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2012-11-01 23:37+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Verificar cambios de IP cada"
+
+msgid "Check-time unit"
+msgstr "Unidad de tiempo"
+
+msgid "Custom update-URL"
+msgstr "URL de actualización personalizada"
+
+msgid "Dynamic DNS"
+msgstr "DNS dinámico"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"DNS Dinámico le permite conectar a su router con un nombre concreto aunque "
+"su dirección IP cambie dinámicamente."
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Force update every"
+msgstr "Forzar actualización cada"
+
+msgid "Force-time unit"
+msgstr "Unidad de tiempo"
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid "Network"
+msgstr "Red"
+
+msgid "Password"
+msgstr "Contraseña"
+
+msgid "Service"
+msgstr "Servicio"
+
+msgid "Source of IP address"
+msgstr "Dirección IP de origen"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Nombre de usuario"
+
+msgid "custom"
+msgstr "personalizado"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "interface"
+msgstr "interfaz"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "red"
+
+#~ msgid "Event interface"
+#~ msgstr "Interfaz de eventos"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "Tras qué interfaz debe arrancar ddns."
diff --git a/trunk/package/luci/po/es/diag_core.po b/trunk/package/luci/po/es/diag_core.po
new file mode 100644
index 00000000..8b9b3b58
--- /dev/null
+++ b/trunk/package/luci/po/es/diag_core.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-07-28 23:25+0200\n"
+"Last-Translator: Daniel <danips@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configurar diagnósticos"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Los diagnósticos disponibles bajo este menú dependen de qué módulos haya "
+"instalado en su dispositivo."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Este menú le permite realizar test de prueba de su sistema para ayudar en la "
+"resolución de problemas."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"En este menú puede configurar diagnósticos de red como el escaneo de equipos "
+"en red o pings."
+
+#~ msgid "l_d_diag"
+#~ msgstr "Diagnośticos"
diff --git a/trunk/package/luci/po/es/diag_devinfo.po b/trunk/package/luci/po/es/diag_devinfo.po
new file mode 100644
index 00000000..0b44ff3e
--- /dev/null
+++ b/trunk/package/luci/po/es/diag_devinfo.po
@@ -0,0 +1,222 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-26 20:14+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Acciones"
+
+msgid "Add"
+msgstr "Añadir"
+
+msgid "Beginning of MAC address range"
+msgstr "Inicio del rango de direcciones MAC"
+
+msgid "Config Phone Scan"
+msgstr "Configurar escaneo de teléfono"
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Configure Scans"
+msgstr "Explorar configuraciones"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Configure la exploración de dispositivos en las redes especificadas. "
+"Reduciendo \"Espera\", \"Repeticiones\" y/o \"Parar entre peticiones\" puede "
+"acelerar las exploración, pero también puede que no encuentre algunos "
+"dispositivos."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Configure la exploración de dispositivos SIP soportados en las redes "
+"especificadas. Reduciendo \"Espera\", \"Repeticiones\" y/o \"Parar entre "
+"peticiones\" puede acelerar la exploración, pero también puede que no "
+"encuentre algunos dispositivos."
+
+msgid "Delete"
+msgstr "Borrar"
+
+msgid "Device Scan Config"
+msgstr "Configuración del escaneo de dispositivos"
+
+msgid "Device Type"
+msgstr "Tipo de dispositivo"
+
+msgid "Devices discovered for"
+msgstr "Dispositivos encontrados para"
+
+msgid "Devices on Network"
+msgstr "Dispositivos en red"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "End of MAC address range"
+msgstr "Fin del rango de direcciones MAC"
+
+msgid "Go to relevant configuration page"
+msgstr "Ir a la página de configuración pertinente"
+
+msgid "IP Address"
+msgstr "Dirección IP"
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid "Invalid"
+msgstr "No válido"
+
+msgid "Link to Device"
+msgstr "Enlazar con dispositivo"
+
+msgid "MAC Address"
+msgstr "Dirección MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr "Ignorar la información del dispositivo MAC"
+
+msgid "MAC Device Override"
+msgstr "Ignorar MAC del dispositivo"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"Dirección MAC e información usada para ignorar el sistema y bases de datos "
+"IEEE"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Milisegundos a detenerse entre peticiones (100 por defecto)"
+
+msgid "Model"
+msgstr "Modelo"
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Network Device Scan"
+msgstr "Exploración de dispositivos de red"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Configuración de la exploración de dispositivos de red"
+
+msgid "Networks to scan for devices"
+msgstr "Redes en las que escanear dispositivos"
+
+msgid "Networks to scan for supported devices"
+msgstr "Redes en las que escanear dispositivos soportados"
+
+msgid "No SIP devices"
+msgstr "No hay dispositivos SIP"
+
+msgid "No devices detected"
+msgstr "No se detectan dispositivos"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Número de veces que se enviarán peticiones (1 por defecto)"
+
+msgid "OUI Owner"
+msgstr "Propietario del OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Ignorar la información devuelta por el script de información MAC a "
+"dispositivo (mac-to-devinfo) para el rango de direcciones MAC que se "
+"especifica"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Realizar exploraciones (puede llevar unos minutos)"
+
+msgid "Phone Information"
+msgstr "Información de teléfono"
+
+msgid "Phone Scan"
+msgstr "Escanear teléfono"
+
+msgid "Phone Scanning Configuration"
+msgstr "Configuración del escaneo telefónico"
+
+msgid "Phones"
+msgstr "Teléfonos"
+
+msgid "Ports"
+msgstr "Puertos"
+
+msgid "Raw"
+msgstr "Sin tratar"
+
+msgid "Repeat Count"
+msgstr "Número de repeticiones"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Repetir exploraciones (puede llevar unos minutos)"
+
+msgid "SIP Device Information"
+msgstr "Información de dispositivos SIP"
+
+msgid "SIP Device Scan"
+msgstr "Escanear dispositivos SIP"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Configuración de escaneo de dispositivos SIP"
+
+msgid "SIP Devices on Network"
+msgstr "Dispositivos SIP en red"
+
+msgid "SIP devices discovered for"
+msgstr "Dispositivos SIP para los que descubrir"
+
+msgid "Scan for devices on specified networks."
+msgstr "Buscar dispositivos en las redes especificadas."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Explorar dispositivos SIP soportados en las redes especificadas."
+
+msgid "Scanning Configuration"
+msgstr "Configuración de la exploración"
+
+msgid "Scans for devices on specified networks."
+msgstr "Explora dispositivos en las redes especificadas."
+
+msgid "Sleep Between Requests"
+msgstr "Detenerse entre peticiones"
+
+msgid "Subnet"
+msgstr "Subred"
+
+msgid "This section contains no values yet"
+msgstr "Esta sección aún no tiene valores"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Esperar de respuestas en segundos (10 por defecto)"
+
+msgid "Timeout"
+msgstr "Espera"
+
+msgid "Use Configuration"
+msgstr "Use la configuración"
+
+msgid "Vendor"
+msgstr "Vendedor"
+
+msgid "check other networks"
+msgstr "comprueba otras redes"
diff --git a/trunk/package/luci/po/es/ffwizard.po b/trunk/package/luci/po/es/ffwizard.po
new file mode 100644
index 00000000..5d86dfc2
--- /dev/null
+++ b/trunk/package/luci/po/es/ffwizard.po
@@ -0,0 +1,172 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-15 21:47+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+"Permitir la transferencia de información estadística anónima sobre este nodo"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Proteger su LAN de otros nodos o clientes"
+
+msgid "Configure network"
+msgstr "Configurar red"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Conecte su nodo con otros vía un túnel por internet."
+
+msgid "DHCP IP range"
+msgstr "Rango de IPs de DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP asignará automáticamente direcciones IP a los clientes"
+
+msgid "DNS Server"
+msgstr "Servidor DNS"
+
+msgid "Enable DHCP"
+msgstr "Habilitar DHCP"
+
+msgid "Gateway"
+msgstr "Pasarela"
+
+msgid "Heartbeat"
+msgstr "Pulso"
+
+msgid "IP address"
+msgstr "Dirección IP"
+
+msgid "L2gvpn tunnel"
+msgstr "Túnel L2gvpn"
+
+msgid "Limit download bandwidth"
+msgstr "Límite de velocidad de descarga"
+
+msgid "Limit upload bandwidth"
+msgstr "Límite de velocidad de subida"
+
+msgid "Mesh IP address"
+msgstr "Dirección IP del mesh"
+
+msgid "Mesh IPv6 Address"
+msgstr "Dirección IPv6 del mesh"
+
+msgid "Netmask"
+msgstr "Máscara de red"
+
+msgid "Password"
+msgstr "Contraseña"
+
+msgid "Password confirmation"
+msgstr "Confirmación de contraseña"
+
+msgid "Password successfully changed"
+msgstr "Contraseña cambiada"
+
+msgid "Protect LAN"
+msgstr "Protege la LAN"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Configurar sus interfaces de red."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr "Permitir a otros usar su conexión para acceder a internet."
+
+msgid "Share your internet connection"
+msgstr "Comparta su dirección de internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Rango IP de direcciones que se reparten a los clientes (ej. 10.1.2.1/28). Si "
+"el rango está dentro de su red mesh, se declarará como HNA. Cualquier otro "
+"rango usará NAT. Si se deja vacío se usarán los valores por defectos del "
+"perfil comunitario."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "La dirección IPv6 se calcula automáticamente."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Protocolo usado para lo conectividad a internet."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Dirección única en el mesh (ej. 10.1.1.1) que tiene que estar registrada en "
+"su comunidad local."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Configurar un nuevo interfaz virtual inalámbrico en modo punto de acceso."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Este asistente le ayudará a configurar su router para Freifunk o una red "
+"comunitaria inalámbrica similar."
+
+msgid "Unknown Error"
+msgstr "Error desconocido"
+
+msgid "Username"
+msgstr "Nombre de usuario"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Punto de acceso virtual (VAP)"
+
+msgid "Wizard"
+msgstr "Asistente"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Su dispositivo y nodos vecinos tienen que usar el mismo canal."
+
+msgid "dhcp"
+msgstr "DHCP"
+
+msgid "kbit/s"
+msgstr "Kbit/s"
+
+msgid "static"
+msgstr "estático"
+
+msgid "Configure this interface."
+msgstr "Configurar esta interfaz."
+
+msgid "recommended"
+msgstr "recomendado"
+
+msgid "Basic settings"
+msgstr "Configuración básica"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "La configuración básica está incompleta. Por favor, vaya a"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr "No puede usar el asistente porque faltan algunos valores necesarios."
+
+msgid "and fill out all required fields."
+msgstr "y rellene los campos requeridos."
diff --git a/trunk/package/luci/po/es/firewall.po b/trunk/package/luci/po/es/firewall.po
new file mode 100644
index 00000000..452809c2
--- /dev/null
+++ b/trunk/package/luci/po/es/firewall.po
@@ -0,0 +1,698 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2014-06-15 09:00+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s en %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s con %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s en %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Entrada sin nombre)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Reglas sin nombre)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT sin nombre)"
+
+msgid "-- Please choose --"
+msgstr "-- Seleccione --"
+
+msgid "-- custom --"
+msgstr "-- propio --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> paquetes por <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+"<var>%d</var> paquetes por <var>%s</var>, máximo <var>%d</var> paquetes."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> y límite a %s"
+
+msgid "Action"
+msgstr "Acción"
+
+msgid "Add"
+msgstr "Añadir"
+
+msgid "Add and edit..."
+msgstr "Añadir y editar..."
+
+msgid "Advanced Settings"
+msgstr "Configuración avanzada"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Permitir traspaso desde <em>zonas de origen</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Permitir traspaso a <em>zonas de destino</em>:"
+
+msgid "Any"
+msgstr "Cualquiera"
+
+msgid "Covered networks"
+msgstr "Redes cubiertas"
+
+msgid "Custom Rules"
+msgstr "Reglas propias"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Las reglas propias le permiten ejecutar comandos de iptables que no están "
+"disponibles en el marco del cortafuegos. Los comandos se ejecutarán tras "
+"cualquier rearranque del cortafuegos, justo tras haber cargado el conjunto "
+"de reglas por defecto."
+
+msgid "Destination IP address"
+msgstr "Dirección IP destino"
+
+msgid "Destination address"
+msgstr "Dirección de destino"
+
+msgid "Destination port"
+msgstr "Puerto de destino"
+
+msgid "Destination zone"
+msgstr "Zona de destino"
+
+msgid "Do not rewrite"
+msgstr "No reescribir"
+
+msgid "Drop invalid packets"
+msgstr "Descartar paquetes no válidos"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Enable NAT Loopback"
+msgstr "Activar bucle NAT"
+
+msgid "Enable SYN-flood protection"
+msgstr "Activar protección a inundación-SYN"
+
+msgid "Enable logging on this zone"
+msgstr "Activar registro en esta zona"
+
+msgid "External IP address"
+msgstr "Dirección IP externa"
+
+msgid "External port"
+msgstr "Puerto externo"
+
+msgid "External zone"
+msgstr "Zona externa"
+
+msgid "Extra arguments"
+msgstr "Parámetros extra"
+
+msgid "Firewall"
+msgstr "Cortafuegos"
+
+msgid "Firewall - Custom Rules"
+msgstr "Cortafuegos - Reglas propias"
+
+msgid "Firewall - Port Forwards"
+msgstr "Cortafuegos - traspasos de puerto"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Cortafuegos - Reglas de tráfico"
+
+msgid "Firewall - Zone Settings"
+msgstr "Cortafuegos - Configuración de la zona"
+
+msgid "Force connection tracking"
+msgstr "Forzar seguimiento de conexión"
+
+msgid "Forward"
+msgstr "Traspasar"
+
+msgid "Forward to"
+msgstr "Traspasar a"
+
+msgid "From %s in %s"
+msgstr "Desde %s en %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Desde %s en %s con origen %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Desde %s en %s con origen %s y %s"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Sólo IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Sñolo IPv6"
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Traspaso entre zonas"
+
+msgid "Internal IP address"
+msgstr "Dirección IP interna"
+
+msgid "Internal port"
+msgstr "Puerto interno"
+
+msgid "Internal zone"
+msgstr "Zona interna"
+
+msgid "Limit log messages"
+msgstr "Limitar registro de mensajes"
+
+msgid "MSS clamping"
+msgstr "Fijado de MSS"
+
+msgid "Masquerading"
+msgstr "Enmascaramiento"
+
+msgid "Match"
+msgstr "Coincidir"
+
+msgid "Match ICMP type"
+msgstr "Coincidir con tipo ICMP"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "Coincidir con tráfico traspasado al puerto o rango de puertos destino."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Coincidir con tráfico de entrada dirigido al puerto o rango de puertos "
+"destino en esta máquina"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Coincidir con tráfico de entrada originado desde el puerto o rango de "
+"puertos origen en la máquina cliente."
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "New SNAT rule"
+msgstr "Nueva regla SNAT"
+
+msgid "New forward rule"
+msgstr "Nueva regla de traspaso"
+
+msgid "New input rule"
+msgstr "Nueva regla de entrada"
+
+msgid "New port forward"
+msgstr "Nuevo traspaso de puerto"
+
+msgid "New source NAT"
+msgstr "Nuevo origen NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Coincidir sólo con tráfico de entrada a esta dirección IP."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Coincidir sólo con tráfico de entrada desde estas MACs."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Coincidir sólo con tráfico de entrada desde esta IP o rango."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Coincidir sólo con tráfico de entrada originado desde el puerto o rango de "
+"puertos origen en la máquina cliente"
+
+msgid "Open ports on router"
+msgstr "Abrir puertos en el router"
+
+msgid "Other..."
+msgstr "Otros..."
+
+msgid "Output"
+msgstr "Salida"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "Pasa más parámetros a IPTables. ¡Usar con cuidado!"
+
+msgid "Port Forwards"
+msgstr "Traspasos de puerto"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"El traspaso de puertos permite a ordenadores remotos en internet conectar a "
+"un ordenador o servicio específico en la LAN privada."
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Redirigir el tráfico de entrada que coincida al puerto en la máquina interna"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Redirigir el tráfico de entrada que coincida a la máquina interna"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Restringir enmascaramiento a las subredes destino"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Restringir enmascaramiento a las subredes origen"
+
+msgid "Restrict to address family"
+msgstr "Restringir a la familia de direcciones"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Reescribir el tráfico que coincida a estas direcciones."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Reescribir el tráfico que coincida con este puerto origen. Deje en blanco "
+"para reescribir sólo la dirección IP."
+
+msgid "Rewrite to source %s"
+msgstr "Reescribir a origen %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Reescribir a origen %s, %s"
+
+msgid "SNAT IP address"
+msgstr "Dirección IP SNAT"
+
+msgid "SNAT port"
+msgstr "Puerto SNAT"
+
+msgid "Source IP address"
+msgstr "Dirección IP origen"
+
+msgid "Source MAC address"
+msgstr "Dirección MAC origen"
+
+msgid "Source NAT"
+msgstr "NAT origen"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"NAT origen es una forma específica de enmascaramiento que permite el control "
+"fino del origen IP que se usa en el tráfico de salida por ejemplo para "
+"dirigir múltiples direcciones WAN a las subredes internas."
+
+msgid "Source address"
+msgstr "Dirección origen"
+
+msgid "Source port"
+msgstr "Puerto origen"
+
+msgid "Source zone"
+msgstr "Zona origen"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"El cortafuegos crea zonas sobre sus interfaces de red para controlar el "
+"flujo del tráfico."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Estas opciones controlan las políticas de traspaso entre esta zona (%s) y "
+"otras. <em>Las zonas origen</em> cubren el tráfico traspasado <strong>desde "
+"%q</strong>. <em>Las zonas origen</em> coinciden con el tráfico traspasado "
+"desde otras zonas <strong>dirigido a %q</strong>. La regla de traspaso es "
+"<em>unidireccional</em>, por ejemplo una regla de traspaso desde la LAN a la "
+"WAN <em>no</em> implica permiso para traspasar desde la WAN a la LAN también."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Propiedades avanzadas de la entrada \"traspaso de puertos\". No suele ser "
+"necesario modificar esta configuración."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Propiedades avanzadas de la entrada \"reglas de tráfico\", como "
+"coincidencias en puertos de origen y destino."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Esta sección define propierdades comunes de %q. Las opciones de <em>entrada</"
+"em> y la <em>salida</em> marcan las políticas por defecto para el tráfico "
+"que entra y deja esta zona mientras que la opción <em>traspaso</em> describe "
+"la política para tráfico traspasado desde diferentes redes en la zona. "
+"<em>Redes cubiertas</em> especifican qué redes disponibles son miembros de "
+"esta zona."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "A %s en %s por <var>este dispositivo</var>"
+
+msgid "To %s in %s"
+msgstr "A %s en %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "A %s por <var>este dispositivo</var>"
+
+msgid "To %s, %s in %s"
+msgstr "A %s, %s en %s"
+
+msgid "To source IP"
+msgstr "A IP origen"
+
+msgid "To source port"
+msgstr "A puerto origen"
+
+msgid "Traffic Rules"
+msgstr "Reglas de tráfico"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Las reglas de tráfico definen políticas para tramas que se mueven entre "
+"zonas diferentes, por ejemplo para rechazar tráfico entre ciertas máquinas o "
+"puertos WAN abiertos en el router."
+
+msgid "Via %s"
+msgstr "Vía %s"
+
+msgid "Via %s at %s"
+msgstr "Vía %s a %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Puede poner varios seleccionando \"-- propio --\" e introduciendo los "
+"protocolos separados por espacio."
+
+msgid "Zone %q"
+msgstr "Zona %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zona ⇒ Traspasos"
+
+msgid "Zones"
+msgstr "Zonas"
+
+msgid "accept"
+msgstr "aceptar"
+
+msgid "any"
+msgstr "cualquiera"
+
+msgid "any host"
+msgstr "cualquier máquina"
+
+msgid "any router IP"
+msgstr "cualquier router IP"
+
+msgid "any zone"
+msgstr "cualquier zona"
+
+msgid "don't track"
+msgstr "no seguir"
+
+msgid "drop"
+msgstr "descartar"
+
+msgid "reject"
+msgstr "rechazar"
+
+msgid "traffic"
+msgstr "tráfico"
+
+#~ msgid "Destination"
+#~ msgstr "Destino"
+
+#~ msgid "Family"
+#~ msgstr "Familia"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "Traspasar a %s en %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "Traspasar a %s, %s en %s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Origen"
+
+#~ msgid "To %s"
+#~ msgstr "A %s"
+
+#~ msgid "To %s at %s"
+#~ msgstr "A %s en %s"
+
+#~ msgid "Via"
+#~ msgstr "Via"
+
+#~ msgid "Accept forward"
+#~ msgstr "Aceptar traspaso"
+
+#~ msgid "Accept input"
+#~ msgstr "Aceptar entrada"
+
+#~ msgid "Disable"
+#~ msgstr "Desactivar"
+
+#~ msgid "Discard forward"
+#~ msgstr "Descartar traspaso"
+
+#~ msgid "Discard input"
+#~ msgstr "Descartar entrada"
+
+#~ msgid "Do not track forward"
+#~ msgstr "No seguir traspaso"
+
+#~ msgid "Do not track input"
+#~ msgstr "No seguir entrada"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "Rango IP"
+
+#~ msgid "IPs"
+#~ msgstr "IPs"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "MACs"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Rechazar traspaso"
+
+#~ msgid "Refuse input"
+#~ msgstr "Rechazar entrada"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "La regla está desactivada"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "La regla está activada"
+
+#~ msgid "day"
+#~ msgstr "dia"
+
+#~ msgid "hour"
+#~ msgstr "hora"
+
+#~ msgid "minute"
+#~ msgstr "minuto"
+
+#~ msgid "not"
+#~ msgstr "no"
+
+#~ msgid "port"
+#~ msgstr "puerto"
+
+#~ msgid "ports"
+#~ msgstr "puertos"
+
+#~ msgid "second"
+#~ msgstr "segundo"
+
+#~ msgid "type"
+#~ msgstr "tipo"
+
+#~ msgid "types"
+#~ msgstr "tipos"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Puerto interno (opcional)"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Reglas avanzadas"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Las reglas avanzadas le permite personalizar el corta fuego según sus "
+#~ "necesidades. Sólamente las nuevas conexiones serán afectadas por las "
+#~ "reglas. Los paquetes pertenecientes a conexiones ya abierta, se les "
+#~ "permite el libre paso por el corta fuego."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Reenvío de puerto"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "El reenvío de puerto permite proveer servicios de red en una red interna "
+#~ "a una red externa (por ejemplo Internet)"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirección de tráfico"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "La redirección de tráfico permite cambiar la dirección de destino de los "
+#~ "paquetes reenviados."
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Redes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Control de tráfico"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tráfico Zona-a-Zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Aquí puede especificar qué tráfico de red is permitido, discho tráfico "
+#~ "fluirá entre las zonas de red definidas. Sólamente las nuevas conexiones "
+#~ "serán aplicadas por las reglas. Los paquetes pertenecientes a conexiones "
+#~ "ya abierta se les permitirá el paso sobre el corta fuego. Si experimenta "
+#~ "ocacionalmente problemas de conexión, intente activar MSS Clamping de "
+#~ "otra forma, deshabilitelo para mejorar considerablemente la performance."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destino"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Dirección IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Dirección MAC de origen"
+
+#~ msgid "Custom forwarding"
+#~ msgstr "Renvío personalizado"
+
+#~ msgid "Input Zone"
+#~ msgstr "Zona de entrada"
+
+#~ msgid "Output Zone"
+#~ msgstr "Zona de salida"
+
+#~ msgid "External Zone"
+#~ msgstr "Zona Externa"
+
+#~ msgid "Source MAC"
+#~ msgstr "MAC de Origen"
+
+#~ msgid "Defaults"
+#~ msgstr "De fábrica"
+
+#~ msgid ""
+#~ "These are the default settings that are used if no other rules match."
+#~ msgstr ""
+#~ "Estos son los valores por defecto que son usados si no hay otra regla a "
+#~ "aplicar."
+
+#~ msgid ""
+#~ "Zones part the network interfaces into certain isolated areas to separate "
+#~ "network traffic. One or more networks can belong to a zone. The MASQ-flag "
+#~ "enables NAT masquerading for all outgoing traffic on this zone."
+#~ msgstr ""
+#~ "Las zonas dividen las interfaces de red en varias partes aisladas para "
+#~ "separar el tráfico de red. Una o mas redes pueden pertenecer a una zona. "
+#~ "La bandera MASQ activa el enmascaramiento NAT para todo el tráfico "
+#~ "saliente sobre esa zona."
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
+
+#~ msgid "contained networks"
+#~ msgstr "redes contenidas"
diff --git a/trunk/package/luci/po/es/freifunk-policyrouting.po b/trunk/package/luci/po/es/freifunk-policyrouting.po
new file mode 100644
index 00000000..8af3458d
--- /dev/null
+++ b/trunk/package/luci/po/es/freifunk-policyrouting.po
@@ -0,0 +1,66 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-22 22:34+0200\n"
+"PO-Revision-Date: 2012-10-14 22:49+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Todo el tráfico desde interfaces de estas zonas se enviará por una pasarela "
+"de la red mesh."
+
+msgid "Enable Policy Routing"
+msgstr "Activar política de enrutado"
+
+msgid "Fallback to mesh"
+msgstr "Si falla usar mesh"
+
+msgid "Firewall zones"
+msgstr "Zonas del cortafuegos"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"Si no se recibe una ruta por defecto de la red mesh el tráfico de las zonas "
+"de cortafuegos seleccionado se enviará por esta conexión de red. Si no desea "
+"esto marque esta opción para bloquearlo."
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+"Si su pasarela no está disponible cambie a la pasarela por defecto de la "
+"mesh."
+
+msgid "Policy Routing"
+msgstr "Política de enrutamiento"
+
+msgid "Strict Filtering"
+msgstr "Filtrado estricto"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"Estas páginas se pueden usar para definir la política de enrutamiento para "
+"ciertas zonas del cortafuegos. Esto es útil si quiere usar su conexión a "
+"internet pero no quiere compartirla con otros (por eso se llama \"Modo "
+"egoísta\"). Su propio tráfico se enviará por su conexión internet mientras "
+"que el tráfico del mes usará otra pasarela en la mesh."
diff --git a/trunk/package/luci/po/es/freifunk.po b/trunk/package/luci/po/es/freifunk.po
new file mode 100644
index 00000000..7242268d
--- /dev/null
+++ b/trunk/package/luci/po/es/freifunk.po
@@ -0,0 +1,417 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-06-15 13:16+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Malo (ETX > 10)"
+
+msgid "Basic Settings"
+msgstr "Configuración básica"
+
+msgid "Basic settings"
+msgstr "Configuración básica"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Configuración básica incompleta. Por favor, vaya a"
+
+msgid "Basic system settings"
+msgstr "Configuración básica del sistema"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+"Comprobar nuevas versiones de firmware y realizar actualizaciones "
+"automáticas."
+
+msgid "Client network size"
+msgstr "Tamaño de la red cliente"
+
+msgid "Community"
+msgstr "Comunidad"
+
+msgid "Community profile"
+msgstr "Perfil de la comunidad"
+
+msgid "Community settings"
+msgstr "Configuración de la comunidad"
+
+msgid "Confirm Upgrade"
+msgstr "Confirmar actualización"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "La información de contacto no está completa. Por favor, vaya a"
+
+msgid "Coordinates"
+msgstr "Coordenadas"
+
+msgid "Country code"
+msgstr "Código de país"
+
+msgid "Default routes"
+msgstr "Rutas por defecto"
+
+msgid "Disable default content"
+msgstr "Desactive contenido por defecto"
+
+msgid "Diversity is enabled for device"
+msgstr "Diversidad activar para el dispositivo"
+
+msgid "E-Mail"
+msgstr "E-Mail"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "Editar índice"
+
+msgid "Enable IPv6"
+msgstr "Activar IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr "Activa un punto virtual de acceso (VAP) por dehecto si es posible."
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Busca sus coordenadas con OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Resumen de Freifunk"
+
+msgid "Freifunk Remote Update"
+msgstr "Actualización remota de Freifunk"
+
+msgid "Gateway"
+msgstr "Pasarela"
+
+msgid "Go to"
+msgstr "Ir a"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Bueno (2 < ETX < 4)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Hello and welcome in the network of"
+msgstr "Hola y bienvenido a la red de"
+
+msgid "Hide OpenStreetMap"
+msgstr "Ocultar OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Página inicial"
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid "IPv6 Config"
+msgstr "Configuración de IPv6"
+
+msgid "IPv6 Prefix"
+msgstr "Prefijo IPv6"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "Red IPv6 en notación CIDR."
+
+msgid "If selected then the default content element is not shown."
+msgstr "No mostrar el contenido por defecto."
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Si se encuentra interesado en nuestro proyecto contacte, por favor, con su "
+"comunidad local mas cercana"
+
+msgid "Index Page"
+msgstr "Índice"
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"El acceso a Internet depende de condiciones tanto técnicas como "
+"organizativas por lo que puede no funcionarle."
+
+msgid "It is operated by"
+msgstr "Administrado por"
+
+msgid "Keep configuration"
+msgstr "Mantener configuración"
+
+msgid "Latitude"
+msgstr "Latitud"
+
+msgid "Legend"
+msgstr "Leyenda"
+
+msgid "Load"
+msgstr "Carga"
+
+msgid "Local Time"
+msgstr "Hora local"
+
+msgid "Location"
+msgstr "Lugar"
+
+msgid "Longitude"
+msgstr "Longitud"
+
+msgid "Map"
+msgstr "Mapa"
+
+msgid "Map Error"
+msgstr "Error en el map"
+
+msgid "Memory"
+msgstr "Memoria"
+
+msgid "Mesh prefix"
+msgstr "Prefijo mesh"
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Network"
+msgstr "Red"
+
+msgid "Network for client DHCP addresses"
+msgstr "Red para las direcciones DHCP de los clientes"
+
+msgid "Nickname"
+msgstr "Apodo"
+
+msgid "No default routes known."
+msgstr "Sin rutas por defecto."
+
+msgid "Notice"
+msgstr "Aviso"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Administrador"
+
+msgid "Orange"
+msgstr "Naranja"
+
+msgid "Overview"
+msgstr "Repaso"
+
+msgid "Package libiwinfo required!"
+msgstr "¡Es necesario el paquete libiwinfo!"
+
+msgid "Phone"
+msgstr "Teléfono"
+
+msgid "Please fill in your contact details below."
+msgstr "Por favor, introduzca sus datos de contacto."
+
+msgid "Please set your contact information"
+msgstr "Por favor, configure su información de contacto"
+
+msgid "Power"
+msgstr "Potencia"
+
+msgid "Processor"
+msgstr "Procesador"
+
+msgid "Profile"
+msgstr "Perfil"
+
+msgid "Profile (Expert)"
+msgstr "Perfil (experto)"
+
+msgid "Realname"
+msgstr "Nombre real"
+
+msgid "Red"
+msgstr "Rojo"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Elija su posición pulsando el ratón sobre el mapa. El mapa solo aparecerá si "
+"está conectado a internet."
+
+msgid "Show OpenStreetMap"
+msgstr "Mostrar OpenStreetMap"
+
+msgid "Show on map"
+msgstr "Mostrar en el mapa"
+
+msgid "Signal"
+msgstr "Señal"
+
+msgid "Splash"
+msgstr "Presentación"
+
+msgid "Start Upgrade"
+msgstr "Iniciar actualización"
+
+msgid "Statistics"
+msgstr "Estadísticas"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Aún utilizable (4 < ETX < 10)"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"El paquete <em>libiwinfo</em> no está instalado. ¡Debe instalarlo para que "
+"funcione la red inalámbrica!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"El servicio OLSRd no está configurado para tomar los datos de posición desde "
+"la red.<br />Asegúrese de que el plugin \"nameservice\" está bien "
+"configurado y que la opción <em>latlon_file</em> está marcada."
+
+msgid "The installed firmware is the most recent version."
+msgstr "El firmare instalado está en la versión más reciente."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"Configuración básica de su comunidad inalámbrica. Aquí puede definir los "
+"valores por defecto para el asistente SIN afectar a la configuración del "
+"router."
+
+msgid "These are the settings of your local community."
+msgstr "Configuración de su comunidad local."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Configuración de su router para Freifunk o redes comunitarias similares."
+
+msgid "This is the access point"
+msgstr "Este es el punto de acceso"
+
+msgid "Update Settings"
+msgstr "Actualizar configuración"
+
+msgid "Update available!"
+msgstr "¡Actualización disponible!"
+
+msgid "Uptime"
+msgstr "Tiempo activo"
+
+msgid "VAP"
+msgstr "VAP"
+
+msgid "Verify downloaded images"
+msgstr "Verificar las descargas"
+
+msgid "Very good (ETX < 2)"
+msgstr "Muy bueno (ETX < 2)"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Somos una iniciativa que pretende crear una red libre, independiente y "
+"abierta utilizando una red mesh inalámbrica."
+
+msgid "Wireless Overview"
+msgstr "Resumen de red inalámbrica"
+
+msgid "Yellow"
+msgstr "Amarillo"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"Puede mostrar más contenido en el índice público poniendo XHTML válido en "
+"este formulario.<br />Las cabeceras deben ir entre &lt;h2&gt; y &lt;/h2&gt;."
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "Puede obtener información acerca de la iniciativa global Freifunk en"
+
+msgid "You can manually edit the selected community profile here."
+msgstr "Edite el perfil comunitario local."
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr "Elija un perfil para editarlo. Para elegir el perfil vaya a"
+
+msgid "and fill out all required fields."
+msgstr "y rellene los campos requeridos."
+
+msgid "buffered"
+msgstr "en búfer"
+
+msgid "cached"
+msgstr "en caché"
+
+msgid "e.g."
+msgstr "ej."
+
+msgid "free"
+msgstr "libre"
+
+msgid "to disable it."
+msgstr "para desactivarlo."
+
+msgid "used"
+msgstr "usado"
+
+msgid "wireless settings"
+msgstr "configuración inalámbrica"
diff --git a/trunk/package/luci/po/es/hd_idle.po b/trunk/package/luci/po/es/hd_idle.po
new file mode 100644
index 00000000..d36bd78c
--- /dev/null
+++ b/trunk/package/luci/po/es/hd_idle.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-08-22 17:44+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disco"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Enable debug"
+msgstr "Activar depuración"
+
+msgid "Idle-time"
+msgstr "Tiempo de inactividad"
+
+msgid "Idle-time unit"
+msgstr "Unidad de tiempo"
+
+msgid "Settings"
+msgstr "Configuración"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle es un programa que gestiona el reposo de discos externos tras un "
+"tiempo de inactividad."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "minutos"
diff --git a/trunk/package/luci/po/es/meshwizard.po b/trunk/package/luci/po/es/meshwizard.po
new file mode 100644
index 00000000..9471d42f
--- /dev/null
+++ b/trunk/package/luci/po/es/meshwizard.po
@@ -0,0 +1,137 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-23 22:25+0200\n"
+"PO-Revision-Date: 2012-11-24 10:22+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Activar o desactivar la configuración IPv6 globalmente."
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Proteger la LAN de otros nodos y clientes"
+
+msgid "Cleanup config"
+msgstr "Borrar configuración"
+
+msgid "Configure this interface"
+msgstr "Configurar esta interfaz"
+
+msgid "DHCP IP range"
+msgstr "Rango IP de DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP asignará direcciones IP automáticamente a los clientes"
+
+msgid "Enable DHCP"
+msgstr "Activar DHCP"
+
+msgid "Enable RA"
+msgstr "Activar RA"
+
+msgid "Enabled"
+msgstr "Activado"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "IPv6 Settings"
+msgstr "Configuración IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr "Borrar la configuración antes de establecer una nueva."
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Mesh IP address"
+msgstr "Dirección IP del mesh"
+
+msgid "Mesh IPv6 address"
+msgstr "Dirección IPv6 del mesh"
+
+msgid "Mesh Wizard"
+msgstr "Asistente del mesh"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Nota: esto configurará esta interfaz para uso mesh, es decir: la añadirá a "
+"la zona \"freifunk\" y activará OSLR."
+
+msgid "Protect LAN"
+msgstr "Proteger LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr "Permitir a otros usar su conexión para acceder a internet."
+
+msgid "Send router advertisements on this device."
+msgstr "Envía publicaciones de routers por este dispositivo."
+
+msgid "Share your internet connection"
+msgstr "Compartir su conexión a internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Rango IP desde el que asignar direcciones IP (ej. 10.1.2.1/28). Si el rango "
+"está dentro del de la mesh se declarará como HNA. Cualquier otro rango usará "
+"NAT. Si se deja vación tomará el del perfil de la comunidad."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr "Este rango IP no está dentro del de la red mesh"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+"Dirección única IPv6 en notación CIDR (p.e.: 2001:1:2:3::1/64) y que tiene "
+"que estar registrada en su comunidad local."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Esta dirección debe ser única en la mesh (ej. 10.1.1.1) y debe registrarse "
+"en su comunidad local."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Configurar un nuevo interfaz virtual inalámbrico en modo punto de acceso."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Este asistente le ayudará a configurar su ruter para Freifunk o una red "
+"comunitaria similar."
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Punto de acceso virtual (VAP)"
+
+msgid "Wizard"
+msgstr "Asistente"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Su dispositivo y los vecinos deben usar el mismo canal."
+
+msgid "recommended"
+msgstr "recomendado"
diff --git a/trunk/package/luci/po/es/minidlna.po b/trunk/package/luci/po/es/minidlna.po
new file mode 100644
index 00000000..5f6b3964
--- /dev/null
+++ b/trunk/package/luci/po/es/minidlna.po
@@ -0,0 +1,184 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-01 09:07+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Configuración avanzada"
+
+msgid "Album art names:"
+msgstr "Imágenes de álbumes:"
+
+msgid "Announced model number:"
+msgstr "Número de modelo declarado:"
+
+msgid "Announced serial number:"
+msgstr "Número de serie declarado:"
+
+msgid "Browse directory"
+msgstr "Ver directorio"
+
+msgid "Collecting data..."
+msgstr "Recopilando información..."
+
+msgid "Database directory:"
+msgstr "Directorio de la base de datos:"
+
+msgid "Enable TIVO:"
+msgstr "Activar TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Activar inotify:"
+
+msgid "Enable:"
+msgstr "Activar:"
+
+msgid "Friendly name:"
+msgstr "Nombre amigable:"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "Interfaces:"
+msgstr "Interfaces:"
+
+msgid "Log directory:"
+msgstr "Directorio de registro:"
+
+msgid "Media directories:"
+msgstr "Directorios de medios:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA es un servidor que buscar ser compatible con clientes DLNA/UPnP-AV."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Número de modelo que el demonio miniDLNA mostrará a los clientes en su "
+"descripción XML."
+
+msgid "Music"
+msgstr "Música"
+
+msgid "Network interfaces to serve."
+msgstr "Interfaces de red a usar."
+
+msgid "Notify interval in seconds."
+msgstr "Intervalo de notificación en segundos."
+
+msgid "Notify interval:"
+msgstr "Intervalo de notificación:"
+
+msgid "Pictures"
+msgstr "Imágenes"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+"Puerto para tráfico HTTP (descripciones, SOAP y transferencia de medios)."
+
+msgid "Port:"
+msgstr "Puerto:"
+
+msgid "Presentation URL:"
+msgstr "URL de presentación:"
+
+msgid "Root container:"
+msgstr "Raíz de contenidos:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Número de serie que el demonio miniDLNA informará a los clientes en su "
+"descripción XML."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "Personalizar el nombre mostrado a los clientes."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Indicar el directorio en el que MiniDLNA guardará su base de datos y la "
+"caché de álbumes."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr "Indicar el directorio donde MiniDLNA guardará su archivo de registro."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr "Inotify descubrirá automáticamente nuevos archivos."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr "Envío de archivos .jpg y .mp3 a un TiVo usando HMO."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Seguir estrictamente el estándar DLNA. Esto permite el reescalado desde el "
+"servidor de imágenes JPEG grandes que pueden perjudicar el rendimiento en "
+"(al menos) productos DLNA de Sony."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Directorio a explorar. Si quiere restringir el directorio a un contenido "
+"específico puede añadir el tipo ('A' par audio, 'V' para vídeo o 'P' para "
+"imágenes), seguido por una coma al nombre del directorio (ej. media_dir=A,/"
+"mnt/media/Music). Se puede establecer varios directorios."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Camino al socket de MiniSSDPd."
+
+msgid "Standard container"
+msgstr "Contenedor estándar"
+
+msgid "Strict to DLNA standard:"
+msgstr "Ceñirse al estándar DLNA:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"El servicio miniDLNA está activo, sirviendo %d archivos de audio, %d de "
+"vídeo y %d de imágenes."
+
+msgid "The miniDLNA service is not running."
+msgstr "El servicio miniDLNA no está arrancado."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr "Lista de nombres a comprobar para buscar imágenes de álbumes."
+
+msgid "Video"
+msgstr "Vídeo"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "Estado de miniDLNA"
+
+msgid "miniSSDP socket:"
+msgstr "Socket de miniSSDP:"
diff --git a/trunk/package/luci/po/es/mmc_over_gpio.po b/trunk/package/luci/po/es/mmc_over_gpio.po
new file mode 100644
index 00000000..ee0b0c67
--- /dev/null
+++ b/trunk/package/luci/po/es/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-08-19 21:05+0200\n"
+"Last-Translator: josevteg <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "Pin CLK"
+
+msgid "CS_pin"
+msgstr "Pin CS"
+
+msgid "DI_pin"
+msgstr "Pin DI"
+
+msgid "DO_pin"
+msgstr "Pin DO"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "MMC/SD driver configuration"
+msgstr "Configuración de controlador MMC/SD"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Settings"
+msgstr "Configuración"
diff --git a/trunk/package/luci/po/es/multiwan.po b/trunk/package/luci/po/es/multiwan.po
new file mode 100644
index 00000000..1a54f755
--- /dev/null
+++ b/trunk/package/luci/po/es/multiwan.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-23 23:07+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Reintentos ante fallo de la WAN"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Reintentos tras recuperar la WAN"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Collecting data..."
+msgstr "Recuperando datos..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Configure las reglas que redirigen el tráfico saliente a través de los "
+"enlaces WAN salientes especificados."
+
+msgid "DNS Server(s)"
+msgstr "Servidor/es DNS"
+
+msgid "Default Route"
+msgstr "Ruta por defecto"
+
+msgid "Destination Address"
+msgstr "Dirección de destino"
+
+msgid "Disable"
+msgstr "Desactivar"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Failing"
+msgstr "Fallando"
+
+msgid "Failover Traffic Destination"
+msgstr "Destino del tráfico en caso de fallo"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Monitores de salud ICMP"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Espera monitor de salud ICMP"
+
+msgid "Health Monitor Interval"
+msgstr "Intervalo del monitor de salud"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"El monitor de salud detecta y corrige cambios en la red y conexiones "
+"fallidas."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Distribución del balanceador de carga"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Balanceador de carga (compatibilidad)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Balanceador de carga (rendimiento)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Estado de Multi-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Reglas de tráfico Multi-WAN"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN permite el use varios enlaces de salida para balancear la carga y "
+"control de fallos."
+
+msgid "None"
+msgstr "Ninguno"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Puertos"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Recovering"
+msgstr "Recuperación"
+
+msgid "Source Address"
+msgstr "Dirección origen"
+
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgid "WAN Interfaces"
+msgstr "Interfaces WAN"
+
+msgid "WAN Uplink"
+msgstr "Enalce saliente WAN"
+
+msgid "all"
+msgstr "todos"
diff --git a/trunk/package/luci/po/es/ntpc.po b/trunk/package/luci/po/es/ntpc.po
new file mode 100644
index 00000000..40edf249
--- /dev/null
+++ b/trunk/package/luci/po/es/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-11-25 11:14+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Ajuste del Reloj"
+
+msgid "Count of time measurements"
+msgstr "Medida del tiempo"
+
+msgid "Current system time"
+msgstr "Hora actual del sistema"
+
+msgid "General"
+msgstr "General"
+
+msgid "Hostname"
+msgstr "Nombre de la máquina"
+
+msgid "Offset frequency"
+msgstr "Desplazamiento de frecuencia"
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Synchronizes the system time"
+msgstr "Sincronizar la hora del sistema"
+
+msgid "Time Server"
+msgstr "Servidor de tiempo"
+
+msgid "Time Servers"
+msgstr "Servidores de hora"
+
+msgid "Time Synchronisation"
+msgstr "Sincronización horaria"
+
+msgid "Update interval (in seconds)"
+msgstr "Intervalo de actualización (en segundos)"
+
+msgid "empty = infinite"
+msgstr "vacío = infinito"
diff --git a/trunk/package/luci/po/es/olsr.po b/trunk/package/luci/po/es/olsr.po
new file mode 100644
index 00000000..0e161bda
--- /dev/null
+++ b/trunk/package/luci/po/es/olsr.po
@@ -0,0 +1,830 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-06-15 13:17+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "Declaraciones MID activas"
+
+msgid "Active OLSR nodes"
+msgstr "Nodos OLSR activos"
+
+msgid "Active host net announcements"
+msgstr "Declaraciones activas de máquinas en la red"
+
+msgid "Advanced Settings"
+msgstr "Configuración avanzada"
+
+msgid "Allow gateways with NAT"
+msgstr "Permitir pasarelas con NAT"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "Permitir seleccionar una pasarela IPv4 con NAT"
+
+msgid "Announce uplink"
+msgstr "Declarar enlace de subida"
+
+msgid "Announced network"
+msgstr "Red declarada"
+
+msgid "Bad (ETX > 10)"
+msgstr "Mal (ETX > 10)"
+
+msgid "Bad (SNR < 5)"
+msgstr "Mal (SNR < 5)"
+
+msgid "Both values must use the dotted decimal notation."
+msgstr "Ambos valores en notación decimal con punto."
+
+msgid "Broadcast address"
+msgstr "Dirección de propagación"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr "Sólo puede ser una dirección IPv4 o IPv6 válidas o \"por defecto\""
+
+#, fuzzy
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr "Sólo puede ser una dirección IPv4 o IPv6 válidas o \"por defecto\""
+
+msgid "Configuration"
+msgstr "Configuración"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+"No pude obtener datos. Asegúrese de que el plugin jsoninfo está instalado y "
+"permite conexiones desde localhost."
+
+msgid "Display"
+msgstr "Mostrar"
+
+msgid "Downlink"
+msgstr "Enlace de bajada"
+
+msgid "Download Config"
+msgstr "Configuración de descarga"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"Activar SmartGateway. Si se desactiva el resto de parámetros de SmartGateway "
+"se ignoran. \"No\" por defecto."
+
+msgid "Enable this interface."
+msgstr "Activar esta interfaz."
+
+msgid "Enabled"
+msgstr "Activado"
+
+msgid "Expected retransmission count"
+msgstr "Contador de retransmisión esperado"
+
+msgid "FIB metric"
+msgstr "Métrica FIB"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+"FIBMetric controla el valor métrico de los conjuntos OLSRd. \"Plano\" "
+"significa que la métrica es siempre 2. Este es el valor preferido porque "
+"ayuda al enrutador del kernel de linux a limpiar valores antiguos. \"Correct"
+"\" usa como métrica el número de saltos. \"Approx\" usa la cuenta de saltos "
+"también, pero solo la actualiza si cambia el siguiente salto también. Por "
+"defecto \"flat\"."
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr "Mecanismo Fisheye para TCs (marcado = activado). Activado por defecto"
+
+msgid "Gateway"
+msgstr "Pasarela"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "General settings"
+msgstr "Configuración general"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Bien (2 < ETX < 4)"
+
+msgid "Good (30 > SNR > 20)"
+msgstr "Bien (30 > SNR > 20)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "Declaraciones HNA"
+
+msgid "HNA interval"
+msgstr "Intervalo HNA"
+
+msgid "HNA validity time"
+msgstr "Tiempo de validez de HNA"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Declaraciones HNA"
+
+msgid "Hello"
+msgstr "Saludo"
+
+msgid "Hello interval"
+msgstr "Intervalo de saludo"
+
+msgid "Hello validity time"
+msgstr "Tiempo de validez del saludo"
+
+msgid "Hide IPv4"
+msgstr "Ocultar IPv4"
+
+msgid "Hide IPv6"
+msgstr "Ocultar IPv6"
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "Saltos"
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+"Las máquinas de una red OLSR pueden declarar conectividad con redes externas "
+"usando mensajes HNA."
+
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Las máquinas de una red OLSR pueden declarar conectividad con redes externas "
+"usando mensajes HNA."
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+"Histéresis para la sensibilidad del enlace (sólo para métrica de saltos). La "
+"histéresis da más robustez a la sensibilidad de enlace pero retrasa el "
+"registro de vecinos. \"Sí\" por defecto"
+
+msgid "IP Addresses"
+msgstr "Direcciones IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+"Versión IP a usar. Si se selecciona 6and4 se arrancarán una instancia de "
+"oslrd para cada protocolo."
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "Propagar IPv4"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+"Dirección de propagación IPv4 para paquetes salientes OLSR. Por ejemplo "
+"\"255.255.255.255\". Por defecto es \"0.0.0.0\" que hace que se use la "
+"interfaz de propagación IP."
+
+msgid "IPv4 source"
+msgstr "IPv4 origen"
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+"Dirección origen IPv4 para paquetes OLSR. Por defecto es \"0.0.0.0\" que "
+"hace que se use la interfaz de propagación IP."
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "Multidifusión IPv6"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+"Dirección IPv6 de multidifusión. Por defecto es \"FF02::6D\", la dirección "
+"de multidifusión local en routers MANET."
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"La red IPv6 debe escribirse en notación completa y el prefijo debe estar en "
+"notación CIDR."
+
+msgid "IPv6 source"
+msgstr "IPv6 origen"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+"Prefijo origen IPv6. OLSRd elegirá un interfaz IP que encaje con el prefijo "
+"de este parámetro. Por defecto es \"0::/0\" que provoca el uso de un "
+"interfaz IP no local."
+
+msgid "IPv6-Prefix of the uplink"
+msgstr "Prefijo IPv6 para el enlace de subida"
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+"Si la ruta a la pasarela actual cambia su ETX de se multiplica por este "
+"valor antes de compararse con el nuevo. El parámetro debe estar entre 0.1 y "
+"1.0, pero debería aproximarse a 1.0 si se cambia.<br /><b>AVISO:</b> No debe "
+"usarse junto con la métrica etx_ffeth!<br />Por defecto es 1.0."
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr "Este nodo usa NAT para conectar a internet. \"Sí\" por defecto."
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+"El modo de interfaz se usar para evitar traspaso innecesario de paquetes en "
+"interfaces de red conmutados. Los modos válidos son \"mesh\" y \"ether\". "
+"Por defecto es \"mesh\"."
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interfaces Defaults"
+msgstr "Valores por defecto de los interfaces"
+
+msgid "Internet protocol"
+msgstr "Protocolo de Internet"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+"Intervalo de sondeo de cambios de configuración a interfaces de red (en "
+"segundos). Por defecto es \"2.5\"."
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr "Valor no válido para LQMult-Value. Debe ser entre 0,01 y 1,0."
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+"Valor no válido para LQMult-Value. Debe usar un número decimal entre 0,01 y "
+"1,0."
+
+msgid "Known OLSR routes"
+msgstr "Rutas OLSR conocidas"
+
+msgid "LQ"
+msgstr "LQ"
+
+msgid "LQ aging"
+msgstr "LQ - Envejecimiento"
+
+msgid "LQ algorithm"
+msgstr "LQ - Algoritmo"
+
+msgid "LQ fisheye"
+msgstr "LQ - Ojo de pez"
+
+msgid "LQ level"
+msgstr "LQ - Nivel"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+"LQMult precisa dos valores (dirección IP o \"por defecto\" y multiplicador) "
+"separados por un espacio."
+
+msgid "Last hop"
+msgstr "Último salto"
+
+msgid "Legend"
+msgstr "Leyenda"
+
+msgid "Library"
+msgstr "Biblioteca"
+
+msgid "Link Quality Settings"
+msgstr "Configuración de calidad de enlace"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+"Factor de envejecimiento de la calidad del enlace (sólo para CE nivel 2). "
+"Parámetro de ajuste para etx_float y etx_fpm, valores menores implican "
+"cambios más lentos en el valor ETX. (los valores permitidos están entre 0.01 "
+"y 1.0)"
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+"Algoritmo de calidad de enlace (solo para CE nivel 2).<br /><b>etx_float</"
+"b>: ETX en punto flotante con envejecimiento exponencial<br /><b>etx_fpm</"
+"b> : igual que etx_float, pero con aritmética entera<br /><b>etx_ff</b> : "
+"ETX freifunk, variante etx que usar todo el tráfico OLSR (en vez de sólo "
+"\"hellos\") para los cálculos ETX<br /><b>etx_ffeth</b>: variante "
+"incompatible de etx_ff que permite enlaces ethernet con ETX 0.1.<br />Por "
+"defecto \"etx_ff\""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+"Intercambio del nivel de calidad del enlace entre \"cuenta de saltos\" y "
+"enrutado \"basado en coste\" (principalmente ETX).<br /><b>0</b> = no usar "
+"calidad del enlace<br /><b>2</b> = use calidad del enlace para selección de "
+"MPR y enrutado<br />Por defecto es 2"
+
+msgid "LinkQuality Multiplicator"
+msgstr "Multilplicador de calidad de enlace"
+
+msgid "Links per node (average)"
+msgstr "Media de enlaces por nodo"
+
+msgid "Links total"
+msgstr "Enlaces totales"
+
+msgid "Local interface IP"
+msgstr "IP de la interfaz local"
+
+msgid "MID"
+msgstr "MID"
+
+msgid "MID interval"
+msgstr "Intervalo de MID"
+
+msgid "MID validity time"
+msgstr "Tiempo de validez de MID"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "IP principal"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+"Asegúrese de que OLSRd funciona y de que el plugin \"jsoninfo\" está "
+"cargado, configurado en el puerto 9090 y que acepta conexiones desde "
+"127.0.0.1."
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Multiplicar las rutas con el factor dado aquí. Los valores permitidos está "
+"entre 0,01 y 1,0. Se usa sólo cuando el nivel LQ es mayor que 0. Ejemplos:"
+"<br />reducir LQ a 192.168.0.1 por la mitad: 192.168.0.1 0,5<br />reducir LQ "
+"a todos los nodos de esta interfaz el 20%: default 0,8"
+
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Multiplicar las rutas con el factor dado aquí. Los valores permitidos está "
+"entre 0,01 y 1,0. Se usa sólo cuando el nivel LQ es mayor que 0. Ejemplos:"
+"<br />reducir LQ a 192.168.0.1 por la mitad: 192.168.0.1 0,5<br />reducir LQ "
+"a todos los nodos de esta interfaz el 20%: default 0,8"
+
+msgid "NAT threshold"
+msgstr "Umbral NAT"
+
+msgid "NLQ"
+msgstr "NLQ"
+
+msgid "Neighbors"
+msgstr "Vecinos"
+
+msgid "Neighbour IP"
+msgstr "IP vecina"
+
+msgid "Neighbours"
+msgstr "Vecinos"
+
+msgid "Netmask"
+msgstr "Máscara de red"
+
+msgid "Network"
+msgstr "Red"
+
+msgid "Network address"
+msgstr "Dirección de red"
+
+msgid "Nic changes poll interval"
+msgstr "Intervalo de muestreo de cambios de nic"
+
+msgid "Nodes"
+msgstr "Nodos"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr "OLSR - Mostrar opciones"
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - Declaraciones HNA"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - Declaraciones HNA"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Plugins"
+
+msgid "OLSR Daemon"
+msgstr "Demonio OLSR"
+
+msgid "OLSR Daemon - Interface"
+msgstr "Demonio OLSR - Interfaz"
+
+msgid "OLSR connections"
+msgstr "Conexiones OLSR"
+
+msgid "OLSR gateway"
+msgstr "Puerta de enlace OLSR"
+
+msgid "OLSR node"
+msgstr "Nodo OLSR"
+
+msgid "Orange"
+msgstr "Naranja"
+
+msgid "Overview"
+msgstr "Resumen"
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Resumen de declaraciones OLSR de máquinas activas"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Resumen de conexiones de OLSR vivas"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Nodos conocidos OLSR"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Rutas conocidas a otros nodos OLSR"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr "Resumen de interfaces con OLSR en ejecución"
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Declaraciones de múltiples interfaces conocidas"
+
+msgid "Overview of smart gateways in this network"
+msgstr "Pasarelas inteligentes en esta red"
+
+msgid "Plugin configuration"
+msgstr "Configuración del plugin"
+
+msgid "Plugins"
+msgstr "Plugins"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr "Ratio de muestreo de paquetes OLSR en segundos. Por defecto es 0.05."
+
+msgid "Pollrate"
+msgstr "Tasa de muestreo"
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Prefix"
+msgstr "Prefijo"
+
+msgid "Red"
+msgstr "Rojo"
+
+msgid "Resolve"
+msgstr "Calcular"
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+"Calcula los nombres de máquina en las páginas de estado. Suele ser seguro, "
+"pero las páginas se cargarán lentamente si usa IPs públicas y tiene una "
+"configuración inestable de DNS."
+
+msgid "Routes"
+msgstr "Rutas"
+
+msgid "Secondary OLSR interfaces"
+msgstr "Interfaces OLSR secundarias"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+"Configura la dirección IP principal (IP originadora) del router. NUNCA debe "
+"cambiar mientras OLSRd esté activa. Por defecto es \"0.0.0.0\" que provoca "
+"el uso de la IP del primer interfaz."
+
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Configura la dirección IP principal (IP originadora) del router. NUNCA debe "
+"cambiar mientras OLSRd esté activa. Por defecto es \"0.0.0.0\" que provoca "
+"el uso de la IP del primer interfaz."
+
+msgid "Show IPv4"
+msgstr "Mostrar IPv4"
+
+msgid "Show IPv6"
+msgstr "Mostrar IPv6"
+
+msgid "Signal Noise Ratio in dB"
+msgstr "Ratio señal / ruido en dB"
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr "Declaraciones SmartGW"
+
+msgid "SmartGateway is not configured on this system."
+msgstr "SmartGateway no está configurado."
+
+msgid "Source address"
+msgstr "Dirección origen"
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+"Especifica la velocidad del enlace en kilobits/s. El primer parámetro es la "
+"subida y el segundo la bajada. Por defecto es \"128 1024\"."
+
+msgid "Speed of the uplink"
+msgstr "Velocidad de subida"
+
+msgid "State"
+msgstr "Estado"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr "Aún usable (20 > SNR > 5)"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Aún usable (4 < ETX < 10)"
+
+msgid "Success rate of packages received from the neighbour"
+msgstr "Ratio de éxito de paquetes recibidos de la vecindad"
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr "Ratio de éxito de paquetes enviados a la vecindad"
+
+msgid "TC"
+msgstr "TC"
+
+msgid "TC interval"
+msgstr "Intervalo TC"
+
+msgid "TC validity time"
+msgstr "Validez de TC"
+
+msgid "TOS value"
+msgstr "TOS"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+"El demonio OLSR es una implementación del protocolo Optimized Link State "
+"Routing. Permite enrutado mesh para cualquier equipo en red. Funciona sobre "
+"cualquier tarjeta wi.fi que soporte el modo ad-hoc y cualquier dispositivo "
+"ethernet. Puede visitar <a href='http://www.olsr.org'>olsrd.org</a> para "
+"ayuda y documentación."
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+"Willingness fija a usar. Si no se establece se calculará dinámicamente "
+"basándose en el estado de la batería y la corriente. Por defecto es 3."
+
+msgid "The interface OLSRd should serve."
+msgstr "Interfaz a usar por OLSRD."
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+"Puerto a usar por OLSR. Debería ser 698 tal y como asigna IANA. Puede tener "
+"un valor entre 1 y 65535."
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+"Prefijo IPv6 a mostrar a clientes del enlace. Puede hacer que un cliente "
+"cambio su dirección IPv6 para usar la pasarela sin ningún tipo de traducción "
+"de dirección. La longitud máxima del prefijo es 64 bits. Por defecto es "
+"\"::/0\" (sin prefijo)."
+
+msgid "Timing and Validity"
+msgstr "Tiempo y validez"
+
+msgid "Topology"
+msgstr "Topología"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+"Tipo de servicio para la cabecera de control de tráfico de IP. Por defecto "
+"es 16."
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "¡No puedo conectar con el demonio OLSR!"
+
+msgid "Uplink"
+msgstr "Enlace saliente"
+
+msgid "Uplink uses NAT"
+msgstr "El enlace saliente usa NAT"
+
+msgid "Use hysteresis"
+msgstr "Usar histéresis"
+
+msgid "Validity Time"
+msgstr "Tiempo de validez"
+
+msgid "Version"
+msgstr "Versión"
+
+msgid "Very good (ETX < 2)"
+msgstr "Muy bien (ETX < 2)"
+
+msgid "Very good (SNR > 30)"
+msgstr "Muy bien (SNR > 30)"
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+"Aviso: kmod-ipip no está instalado. Sin kmod-ipip SmartGateway no funcionará."
+
+msgid "Weight"
+msgstr "Peso"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+"Cuando hayan múltiples enlaces entre máquinas el peso del interfaz se usar "
+"para determinar qué enlace usar. Normalmente se calcula automáticamente "
+"basándose en las características de la interfaz, pero puede indicar un valor "
+"fijo. OLSRd elegirá enlaces con el valor menor.<br /><b>Nota:</b> El peso "
+"del interfaz se usao sólo cuando LinkQualityLevel está en 0. Para otros "
+"valores se usará el valor del interfaz EXT."
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+"Tipo de enlace exportado a otros nodos del mesh. Un enlace se detecta "
+"buscando una HNA local de 0.0.0.0/0, ::ffff:0:0/96 o 2000::/3. Por defecto "
+"\"both\"."
+
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Tipo de enlace exportado a otros nodos del mesh. Un enlace se detecta "
+"buscando una HNA local de 0.0.0.0/0, ::ffff:0:0/96 o 2000::/3. Por defecto "
+"\"both\"."
+
+msgid "Willingness"
+msgstr "Willingness"
+
+msgid "Yellow"
+msgstr "Amarillo"
+
+msgid "no"
+msgstr "no"
+
+msgid "yes"
+msgstr "sí"
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Asegúrese de que OLSRd se está ejecutando, que el plugin \"txtinfo\" esté "
+#~ "cargado, configurado en el puerto 2006 y que acepta conexiones desde "
+#~ "127.0.0.1."
+
+#~ msgid ""
+#~ "Multiply routes with the factor given here. Allowed values are between "
+#~ "0.01 and 1. It is only used when LQ-Level is greater than 0. Examples:"
+#~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
+#~ "all nodes on this interface by 20%: default 0.8"
+#~ msgstr ""
+#~ "Multiplicar rutas por este factor. Valores entre 0,01 y 1. Sólo se usa si "
+#~ "el nivel de CA es mayor que 0. Ejemplos:<br />reducir CE a la mitad a "
+#~ "192.168.0.1: \"192.168.0.1 0.5\"<br />reducir CE a todos los nodos en "
+#~ "esta interfaz el 20%: \"default 0.8\""
diff --git a/trunk/package/luci/po/es/openvpn.po b/trunk/package/luci/po/es/openvpn.po
new file mode 100644
index 00000000..13ae8da7
--- /dev/null
+++ b/trunk/package/luci/po/es/openvpn.po
@@ -0,0 +1,559 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2013-09-01 09:09+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', o 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Aceptar opciones envidadas desde el servidor"
+
+msgid "Add"
+msgstr "Añadir"
+
+msgid "Add route after establishing connection"
+msgstr "Añadir la ruta tras establecer la conexión"
+
+msgid "Additional authentication over TLS"
+msgstr "Autentificación adicional con TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Permitir el tráfico cliente-a-cliente"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Permitir múltiples clientes con el mismo certificado"
+
+msgid "Allow only one session"
+msgstr "Permitir sólo una sesión"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Permitir al conectado cambiar su IP o puerto"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Máximo de clientes conectados"
+
+msgid "Allowed maximum of internal"
+msgstr "Máximo de internos"
+
+msgid "Allowed maximum of new connections"
+msgstr "Máximo de nuevas conexiones"
+
+msgid "Append log to file"
+msgstr "Unir registro al archivo"
+
+msgid "Authenticate using username/password"
+msgstr "Autentificar con nombre usuario y contraseña"
+
+msgid "Automatically redirect default route"
+msgstr "Redirigir automáticamente la ruta por defecto"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr "Instancias OpenVPN configuradas y estado actual"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "Comando/script a llamar al cerrar el dispositivo TUn/TAP"
+
+msgid "Certificate authority"
+msgstr "Autoridad certificativa"
+
+msgid "Change process priority"
+msgstr "Cambiar la prioridad del proceso"
+
+msgid "Change to directory before initialization"
+msgstr "Cambiar a este directorio antes de inicializar"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Comprobar certificados contra un CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Restringir a este directorio tras inicializar"
+
+msgid "Client is disabled"
+msgstr "Cliente desactivado"
+
+msgid "Configuration category"
+msgstr "Categoría de configuración"
+
+msgid "Configure client mode"
+msgstr "Configurar el modo cliente"
+
+msgid "Configure server bridge"
+msgstr "Configurar el puente servidor"
+
+msgid "Configure server mode"
+msgstr "Configurar el modo servidor"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Conectar por un proxy Socks5"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Conectar a la máquina remota usando un proxy HTTP"
+
+msgid "Connection retry interval"
+msgstr "Intervalo de reconexión"
+
+msgid "Cryptography"
+msgstr "Criptografía"
+
+msgid "Daemonize after initialization"
+msgstr "Demonizar tras inicialización"
+
+msgid "Delay n seconds after connection"
+msgstr "Espera tras conexión (segundos)"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Espera para la apertura TUN/TAP y ejecución del script de arranque"
+
+msgid "Diffie Hellman parameters"
+msgstr "Parámetros Diffie-Hellman"
+
+msgid "Directory for custom client config files"
+msgstr "Directorio de configuraciones personalizadas"
+
+msgid "Disable Paging"
+msgstr "Desactivar paginación"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Desactivar vector de inicialización de cifrado"
+
+msgid "Disable options consistency check"
+msgstr "Desactivar comprobación de consistencia de opciones"
+
+msgid "Disable replay protection"
+msgstr "Desactivar la protección contra reproducción"
+
+msgid "Do not bind to local address and port"
+msgstr "No asociar a un puerto y dirección locales"
+
+msgid "Don't actually execute ifconfig"
+msgstr "No ejecutar ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "No añadir rutas automáticamente"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "No guardar las contraseñas --askpass o --auth-user-pass"
+
+msgid "Don't inherit global push options"
+msgstr "No heredar opciones push globales"
+
+msgid "Don't log timestamps"
+msgstr "No guardar en registro horas"
+
+msgid "Don't re-read key on restart"
+msgstr "No releer la clave al rearrancar"
+
+msgid "Don't require client certificate"
+msgstr "No es necesario certificado cliente"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "No usar compresión adaptativa LZO"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "No avisar de inconsistencias en ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Guardar parámetros en el registro"
+
+msgid "Empirically measure MTU"
+msgstr "Medir MTU empíricamente"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Motor criptográfico por hardware OpenSSL"
+
+msgid "Enable Path MTU discovery"
+msgstr "Detección de MTU"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Modo de encriptado de clave estática (no-TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Activar TLS y asumir el papel de cliente"
+
+msgid "Enable TLS and assume server role"
+msgstr "Activar TLS y asumir el papel de servidor"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Fragmentación de datagramas interna"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Interfaz de gestión en <em>IP</em> <em>puerto</em>"
+
+msgid "Enabled"
+msgstr "Activado"
+
+msgid "Encryption cipher for packets"
+msgstr "Cifra de encriptación de paquetes"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Comandos a ejecutar tras añadir rutas"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Comando a ejecutar si se cambia la IP remota"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+"Ejecutado en modo servidor en nuevas conexiones de clientes, cuando no se "
+"confía aún en el cliente"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+"Ejecutado en modo servidor cuando una ruta, dirección IPv4 o dirección MAC "
+"se añade a la tabla de rutas interna de OpenVPN"
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Salir si falla la negociación"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Obtener la clave PEM del tty de control antes de demonizar"
+
+msgid "HMAC authentication for packets"
+msgstr "Autentificación HMAC de paquetes"
+
+msgid "Handling of authentication failures"
+msgstr "Gestión de fallos de autentificación"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+"Directriz para simplificar la expresión de --ping y --ping-restart en "
+"configuraciones en modo servido"
+
+msgid "If hostname resolve fails, retry"
+msgstr "Reintentar si falla la resolución de nombre de máquina"
+
+msgid "Instance \"%s\""
+msgstr "Instancia \"%s\""
+
+msgid "Invalid"
+msgstr "No válido"
+
+msgid "Keep local IP address on restart"
+msgstr "Mantener la dirección IP local al rearrancar"
+
+msgid "Keep remote IP address on restart"
+msgstr "Mantener la dirección IP remota al rearrancar"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Mantener el dispositivo TUN/TAP abierto al rearrancar"
+
+msgid "Key transition window"
+msgstr "Ventana de transición de clave"
+
+msgid "Limit repeated log messages"
+msgstr "Limitar mensajes repetidos al registro"
+
+msgid "Local certificate"
+msgstr "Certificado local"
+
+msgid "Local host name or ip address"
+msgstr "Nombre de máquina local o dirección IP"
+
+msgid "Local private key"
+msgstr "Clave privada local"
+
+msgid "Major mode"
+msgstr "Modo principal"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Habilitar IPv6 en dispositivo TUN"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Paquetes máximos en la cola de salida TCP"
+
+msgid "Networking"
+msgstr "Red"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Número de buffers de propagación"
+
+msgid "Number of lines for log file history"
+msgstr "Líneas en el archivo de registro histórico"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Aceptar solo conexiones desde este nombre X509"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Procesa solo las esperas a ping si existe la ruta"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Instancias OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Optimizar escrituras TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Escribir en SysLog y no demonizar"
+
+msgid "Overview"
+msgstr "Resumen"
+
+msgid "PKCS#12 file containing keys"
+msgstr "Archivo PKCS#12 de claves"
+
+msgid "Pass environment variables to script"
+msgstr "Pasar variables de entorno al script"
+
+msgid "Persist replay-protection state"
+msgstr "Estado continuo de protección antireproducción"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Mantener/no mantener el listado de interfaces"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Ping al remoto cada n segundos sobre un puerto TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr "Política sobre el uso de programas externos y scripts"
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Proxy timeout in seconds"
+msgstr "Espera del proxy en segundos"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Enviar un opción de ifconfig al puesto remoto"
+
+msgid "Push options to peer"
+msgstr "Enviar opciones al otro"
+
+msgid "Query management channel for private key"
+msgstr "Consulta el canal de gestión por la clave privada"
+
+msgid "Randomly choose remote server"
+msgstr "Elegir aleatoriamente un servidor remoto"
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+"Rechazar conexión si no tiene una configuración de cliente personalizada"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Redirigir señales SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Nombre de máquina remota o dirección IP"
+
+msgid "Remote ping timeout"
+msgstr "Espera a ping remoto"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Bytes tras los que renegociar la clave del canal del datos"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Paquetes tras los que renegociar la clave del canal del datos"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Segundos tras los que renegociar la clave del canal del datos"
+
+msgid "Replay protection sliding window size"
+msgstr "Tamaño de la ventana deslizante de la protección de reproducción"
+
+msgid "Require explicit designation on certificate"
+msgstr "Designación explícita de certificado"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Clave de uso explícita de certificado"
+
+msgid "Restart after remote ping timeout"
+msgstr "Rearrancar tras espera del ping remoto"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Espera de retransmisión en el canal de control TLS"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Reintentar indefinidamente en errores del proxy HTTP"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Reintentar indefinidamente en errores del proxy Socks"
+
+msgid "Route subnet to client"
+msgstr "Enrutar subred a cliente"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Ejecutar como servidor inetd o xinetd"
+
+msgid "Run script cmd on client connection"
+msgstr "Script a ejecutar tras una conexión de cliente"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Script a ejecutar tras una desconexión de cliente"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Ejecutar scripts de activación/desactivación en todos los rearranques"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Enviar notificación al otro en caso de desconexión"
+
+msgid "Service"
+msgstr "Servicio"
+
+msgid "Set GID to group"
+msgstr "GID del grupo"
+
+msgid "Set TCP/UDP MTU"
+msgstr "MTU TCP/UDP"
+
+msgid "Set UID to user"
+msgstr "UID del usuario"
+
+msgid "Set aside a pool of subnets"
+msgstr "Reservar un bloque de subredes"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Opciones HTTP extendidas del proxy"
+
+msgid "Set output verbosity"
+msgstr "Nivel de detalle de mensajes"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Tamaño de las tablas real y virtual de hashes"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Tamaño del búfer de recepción TCP/UDP"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Tamaño del búfer de envío TCP/UDP"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Longitud de la cola de transmisión TUN/TAP"
+
+msgid "Set tun/tap adapter parameters"
+msgstr "Parámetros del adaptador TUN/TAP"
+
+msgid "Set tun/tap device MTU"
+msgstr "MTU del dispositivo TUN/TAP"
+
+msgid "Set tun/tap device overhead"
+msgstr "Sobrecarga del dispositivo TUN/TAP"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Límite superior de MSS de TCP"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Adaptar ancho de banda de clientes"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Comando shell a ejecutar tras abrir el dispositivo TUN"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Comando shell a ejecutar tras cerrar el dispositivo TUN"
+
+msgid "Shell command to verify X509 name"
+msgstr "Comando shell a ejecutar para verificar un nombre X509"
+
+msgid "Silence the output of replay warnings"
+msgstr "No mostrar avisos de reproducción"
+
+msgid "Size of cipher key"
+msgstr "Tamaño de la clave de cifrado"
+
+msgid "Specify a default gateway for routes"
+msgstr "Gateway por defecto"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Arrancar OpenVPN en estado hibernado"
+
+msgid "Start/Stop"
+msgstr "Arrancar/Parar"
+
+msgid "Started"
+msgstr "Arrancado"
+
+msgid "Status file format version"
+msgstr "Versión del formato del fichero de estado"
+
+msgid "Switch to advanced configuration »"
+msgstr "Cambiar a configuración avanzada »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Número de puerto TCP/UDP para local y remoto"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Número de puerto TCP/UDP para local (default=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Número de puerto TCP/UDP para remoto (default=1194)"
+
+msgid "TLS cipher"
+msgstr "Cifra TLS"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "Paso a través TOS (sólo para IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+"Directorio temporal para el fichero de retorno de la conexión del cliente"
+
+msgid "Timeframe for key exchange"
+msgstr "Tiempo de intercambio de clave"
+
+msgid "Type of used device"
+msgstr "Tipo de dispositivo usado"
+
+msgid "Use fast LZO compression"
+msgstr "Compresión rápida LZO"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Direcciones individuales en vez de subredes /30"
+
+msgid "Use protocol"
+msgstr "Protocolo"
+
+msgid "Use tun/tap device node"
+msgstr "Nodo de dispositivo TUN/TAP"
+
+msgid "Use username as common name"
+msgstr "Nombre de usuario como nombre común"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "Escribir registro a fichero"
+
+msgid "Write process ID to file"
+msgstr "Escribir ID del proceso a fichero"
+
+msgid "Write status to file every n seconds"
+msgstr "Segundos tras los que escribir el fichero de estado"
+
+msgid "no"
+msgstr "no"
+
+msgid "tun/tap device"
+msgstr "dispositivo TUN/TAP"
+
+msgid "tun/tap inactivity timeout"
+msgstr "Espera de inactividad tun/tap"
+
+msgid "yes (%i)"
+msgstr "sí (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Cambiar a configuración básica"
diff --git a/trunk/package/luci/po/es/p2pblock.po b/trunk/package/luci/po/es/p2pblock.po
new file mode 100644
index 00000000..1edc5330
--- /dev/null
+++ b/trunk/package/luci/po/es/p2pblock.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-19 16:56+0200\n"
+"PO-Revision-Date: 2012-08-19 16:56+0200\n"
+"Last-Translator: josevteg <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "Tiempo de bloqueo"
+
+msgid "Enable P2P-Block"
+msgstr "Activar bloqueo P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Protocolo Layer7"
+
+msgid "P2P-Block"
+msgstr "Bloqueo de P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"El bloqueo de P2P es un mecanismo de lista gris para bloquear varios "
+"protocolos punto a punto a clientes que no están en lista blanca."
+
+msgid "Portrange"
+msgstr "Rango de puertos"
+
+msgid "Whitelisted IPs"
+msgstr "IPs en la lista blanca"
+
+msgid "seconds"
+msgstr "segundos"
diff --git a/trunk/package/luci/po/es/p910nd.po b/trunk/package/luci/po/es/p910nd.po
new file mode 100644
index 00000000..f558c994
--- /dev/null
+++ b/trunk/package/luci/po/es/p910nd.po
@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-06-15 09:10+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Modo bidireccional"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Debe instalar primero el soporte para puertos USB (kmod-usb-printer) o "
+"paralelo (kmod-lp)."
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Settings"
+msgstr "Configuración"
+
+msgid "Specifies the interface to listen on."
+msgstr "Especifica el interfaz en el que se escucha."
+
+msgid "TCP listener port."
+msgstr "Puerto de escucha TCP."
+
+msgid "enable"
+msgstr "activar"
+
+msgid "p910nd - Printer server"
+msgstr "Servidor de Impresión - p910nd"
+
+#~ msgid "port_help"
+#~ msgstr "puerto_ayuda"
diff --git a/trunk/package/luci/po/es/pbx-voicemail.po b/trunk/package/luci/po/es/pbx-voicemail.po
new file mode 100644
index 00000000..384e169d
--- /dev/null
+++ b/trunk/package/luci/po/es/pbx-voicemail.po
@@ -0,0 +1,106 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-23 22:44+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "Dirección de correo electrónica que recibe Voicemail"
+
+msgid "Enable Voicemail"
+msgstr "Activar Voicemail"
+
+msgid "Global Voicemail Setup"
+msgstr "Configuración global de Voicemail"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"Configure un correo de voz global para esta PBX. Como el sistema está "
+"diseñado para sistemas integrados como routers, no tiene un almacenamiento "
+"local y debe enviarse por correo. Por este motivo debe configurar un "
+"servidor SMTP de correo saliente (como ISP, Google o el correo de Yahoo) y "
+"establecer una lista de direcciones que recibirán el correo de voz grabado."
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"Para usar esta PBX para enviar correos con grabaciones de correos de voz "
+"tiene que configurar un servidor SMTP. Su ISP es posible que tenga uno. "
+"También puede usar otros como los de Google o Yahoo."
+
+msgid "Last Sent Voicemail Log"
+msgstr "Último registro de Voicemail enviado"
+
+msgid "Local Storage Directory"
+msgstr "Directorio local de almacenamiento"
+
+msgid "No"
+msgstr "No"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Servidor de correo SMTP saliente"
+
+msgid "SMTP Password"
+msgstr "Contraseña SMTP"
+
+msgid "SMTP Port Number"
+msgstr "Número de puerto SMTP"
+
+msgid "SMTP Server Authentication"
+msgstr "Autentificación de servidor SMTP"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "Nombre del servidor SMTP o dirección IP"
+
+msgid "SMTP User Name"
+msgstr "Nombre de usuario SMTP"
+
+msgid "Secure Connection Using TLS"
+msgstr "Asegurar la conexión con TLS"
+
+msgid "Voicemail Setup"
+msgstr "Configuración de Voicemail"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"Cuando active Voicemail tendrá que especificar direcciones de correo que "
+"recibirán los correos grabados así como un servidor SMTP."
+
+msgid "Yes"
+msgstr "Sí"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"También puede guardar copias de los mensajes de Voicemail en el dispositivo. "
+"El camino se creará si no existe. Tenga cuidado de no sobrepasar el espacio "
+"disponible en dispositivos pequeños como routers."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"Su contraseña SMTP real no se muestra. Se cambiará solo cuando cambie el "
+"valor en esta caja."
diff --git a/trunk/package/luci/po/es/pbx.po b/trunk/package/luci/po/es/pbx.po
new file mode 100644
index 00000000..8071b61f
--- /dev/null
+++ b/trunk/package/luci/po/es/pbx.po
@@ -0,0 +1,677 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-15 13:15+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Configuración avanzada"
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr "Usar sólo caracteres alfanuméricos, espacio, coma y punto."
+
+msgid "Away"
+msgstr "No disponible"
+
+msgid "Blacklisted Numbers"
+msgstr "Lista negra"
+
+msgid "Call Routing"
+msgstr "Enrutado de llamadas"
+
+msgid "Call-back Numbers"
+msgstr "Números de call-back"
+
+msgid "Call-back Provider"
+msgstr "Proveedor de call-back"
+
+msgid "Call-through Numbers"
+msgstr "Números call-through"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Pegue aquí grandes listas de números."
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+"Listar los números a los que se permitirá llamar desde este sistema y qué "
+"privilegios de usuario tendrán."
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+"Listar los números a los que el sistema colgará y volverá a llamar, qué "
+"proveedor se usará para llamarles y qué privilegios de usuario se les dará."
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr "Marca el resto de números en cualquier lugar"
+
+msgid "Do Not Disturb"
+msgstr "No molestar"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "Dominio/Dirección IP/Dominio dinámico"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Lista dinámica de números en lista negra"
+
+msgid "Email"
+msgstr "e-mail"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Permitir llamadas entrantes (registrar vía SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Permitir llamadas entrantes (ver estado abajo)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Permitir llamadas salientes"
+
+msgid "Enabled"
+msgstr "Activado"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+"Proveedor VoIP para callbacks en formato nombredeusuario@algun.nombre.host, "
+"tal y como se detalla arriba en \"Llamadas salientes\". Puede copiar y pegar "
+"los proveedores desde ahí. Las entradas no válidas, incluyendo a proveedores "
+"no habilitados para llamadas saliente, serán rechazadas sin mostrar aviso."
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"Números de teléfono de los que se reclina la llamada automáticamente. Es "
+"posible que tenga que omitir el código de país y ceros precedentes, pero "
+"experimente para asegurarse que bloquea los números correctamente."
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"Ponga esta IP (o IP:puerto) en el parámetro Servidor/Registrador de los "
+"dispositivos SIP que usará SOLO localmente y nunca desde una posición remota."
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"Ponga este nombre de máquina en el parámetro Servidor/Registrador de los "
+"dispositivos SIP que usará desde posiciones remotas (también vale "
+"localmente)."
+
+msgid "External SIP Port"
+msgstr "Puerto externo SIP"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+"Para cada proveedor al que se habilita a hacer llamadas entrantes puede "
+"restringir a qué usuarios llamar. Si se deja vacío el sistema indicará que "
+"llamará a todos los usuarios que puedan recibir llamadas entrantes. Los "
+"nombres de usuario no válidos se rechazarán sin aviso. Estos nombres de "
+"usuario hacen ignorar la configuración de usuario de no recibir llamadas. De "
+"esta manera puede hacer que a ciertos usuarios sólo les llamen ciertos "
+"proveedores. Puede separar los nombres con espacios o poniéndolos en líneas "
+"diferentes."
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+"Para cada usuario habilitado a hacer llamadas salientes puede restringir qué "
+"proveedores usar. Por defecto todos los usuarios pueden usar a todos los "
+"proveedores. Para mostrarse en la lista el usuario debe poder hacer llamadas "
+"salientes (ver página \"Cuentas de usuario\"). Ponga los proveedores en "
+"formato username@some.host.name igual que se listan en \"Llamadas salientes"
+"\" arriba. Los nombres no válidos se rechazarán sin aviso.Puede separar los "
+"nombres con espacios o poniéndolos en líneas diferentes."
+
+msgid "Full Name"
+msgstr "Nombre completo"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "Google Accounts"
+msgstr "Cuentas en google"
+
+msgid "Google Talk Status"
+msgstr "Estado de Google Talk"
+
+msgid "Google Talk Status Message"
+msgstr "Mensaje de estado de Google Talk"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Cuentas Google Voice/Talk"
+
+msgid "Hang-up Delay"
+msgstr "Retraso para descolgar"
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+"Configure una cuenta SIP que usará para conectar con este servicio. Úsela "
+"tanpo en un adaptador de telefonía analógico (ATA) o en un programa SIP como "
+"CSipSimple, Linphone, o Sipdroid para smartphones, o Ekiga, Linphone, o X-"
+"Lite para ordenadores. Por defecto, todas las cuentas SIP sonarán a la vez "
+"si se hace una llamada desde una de las cuentas de su proveedor de VoIP o "
+"números GV."
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+"Cuánto esperar antes de descolgar. Si el proveedor que usas para marcar "
+"automáticamente desvía a un correo de voz puedes ajustar este valor con un "
+"retraso que permitirá descolgar antes de que se desvíe la llamada y se "
+"facture."
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+"Si la configuración Servidor/Registrador en %s o %s no le funciona, prueba a "
+"poner %s o %s e introduzca este número de puerto en un campo separado que "
+"especifique el número de puerto del Servidor/Registrador. Algunos "
+"dispositivos tienen una configuración extraña que muestra este puerto desde "
+"el que el SIP origina peticiones en el mismo dispositivo SIP (el puerto "
+"asociado). El puerto que está configurando aquí NO es este puerto asociado "
+"sino el puerto en el que el servicio escucha."
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+"Si nota saltos o retrasos en el audio mientras realiza descargas puede "
+"querer activar QoS. QoS prioriza el tráfico a y desde su red para ciertos "
+"puertos y direcciones IP mejorando la latencia y el rendimiento del sonido "
+"en dicho caso. Al activarlo el PBX creará una regla QoS para este servicio, "
+"pero deberá rellenar en la página de configuración de QoS (Red/QoS) otros "
+"parámetros necesarios como la velocidad de subida y la de bajada."
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+"Si tiene más de una cuenta para hacer llamadas salientes, debe introducir "
+"una lista de números de teléfono y/o prefijos para cada proveedor. Los "
+"prefijos no válidos se rechazarán sin aviso y solo son caracteres válidos "
+"0-9, X, Z, N, #, *, y +. La letra X equivale a 0-9, Z a 1-9 y N a 2-9. Por "
+"ejemplo para hacer llamadas a Alemania con su proveedor debe introducir 49. "
+"Para hacer llamadas a Estados Unidos 1NXXNXXXXXX. Si uno de sus proveedores "
+"puede hacer llamadas locales a un código de área como el 646 de Nueva York "
+"debe introducir 646NXXXXXX para ese proveedor. Debería dehar una cuenta con "
+"una lista vacía para que haga las llamadas por defecto en caso de que ningún "
+"prefijo encaje. El sistema reemplazará automáticamente la lista vacía con el "
+"mensaje de que el proveedor marca todos los números que no estén en los "
+"prefijos de otros proveedores. Sea todo lo específico que pueda (ej. "
+"1NXXNXXXXXX es mejor que 1). Todos los códigos internaciones de marcado se "
+"descartan (ej. 00, 011, 010, 0011). Las entradas pueden ser una lista "
+"separada por espacios y/o cambios de línea."
+
+msgid "Incoming Calls"
+msgstr "Llamadas entrantes"
+
+msgid "Insert QoS Rules"
+msgstr "Reglas QoS"
+
+msgid "Makes Outgoing Calls"
+msgstr "Realizar llamadas salientes"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr "NOTA: Sin cuentas configuradas de Google o porveedor SIP."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+"NOTA: Sin cuentas configuradas de Google o porveedor SIP para llamadas "
+"entrantes."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+"NOTA: Sin cuentas configuradas de Google o porveedor SIP para llamadas "
+"salientes."
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr "NOTA: Sin cuentas locales configuradas."
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr "NOTA: Sin cuentas locales habilitadas para llamadas saientes."
+
+msgid "No"
+msgstr "No"
+
+msgid "Number of Seconds to Ring"
+msgstr "Número de segundos a sonar"
+
+msgid "Outbound Proxy"
+msgstr "Proxy saliente"
+
+msgid "Outgoing Calls"
+msgstr "Llamadas salientes"
+
+msgid "PBX Main Page"
+msgstr "Página principal de PBX"
+
+msgid "PBX Service Status"
+msgstr "Estado del servicio PBX"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Contraseña"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+"Escoge un número de puerto aleatorio entre 6500 y 9500 para el servicio. No "
+"elijas el estándar 5060 ya que es objeto, a menudo, de ataques por fuerza "
+"bruta. Cuando hayas terminado pulsa en \"Salvar y aplicar\" y busca en la "
+"sección \"Cuentas SIP del dispositivo/softphone\" el puerto actual para tus "
+"dispositivos/softphones SIP."
+
+msgid "Port Setting for SIP Devices"
+msgstr "Configuración de puerto para dispositivos SIP"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "Proveedores usados para llamadas salientess"
+
+msgid "QoS Settings"
+msgstr "Configuración de QoS"
+
+msgid "RTP Port Range End"
+msgstr "Fin del rango de puertos RTP"
+
+msgid "RTP Port Range Start"
+msgstr "Inicio del rango de puertos RTP"
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+"El tráfico RTP es el que lleva los paquetes de voz. Este es el inicio del "
+"rango de puertos que se usará para comunicaciones RTP. Suele ser correcto "
+"dejar el valor por defecto."
+
+msgid "Receives Incoming Calls"
+msgstr "Recibe llamadas entrantes"
+
+msgid "Remote Usage"
+msgstr "Uso remoto"
+
+msgid "Rings users enabled for incoming calls"
+msgstr "Llama a usuarios habilitados a recibir llamadas"
+
+msgid "SIP Accounts"
+msgstr "Cuentas SIP"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "Dispositivo SIP/Cuentas Softphone"
+
+msgid "SIP Provider Accounts"
+msgstr "Cuentas del proveedor SIP"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "Ámbito SIP (necesario para algunos proveedores)"
+
+msgid "SIP Server/Registrar"
+msgstr "Servidor/Registrador del SIP"
+
+msgid "SIP Server/Registrar Port"
+msgstr "Puerto del Servidor/Registrador del SIP"
+
+msgid "Server Setting"
+msgstr "Configuración del servidor"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "Dispositivos SIP locales"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "Dispositivos SIP remotos"
+
+msgid "Service Status"
+msgstr "Estado del servicio"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+"Segundos que se llamará a los usuarios antes de colgar o pasar a correo voz "
+"(si el correo voz está instalado y habilitado)."
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr "Lista negra (separar números con espacios)"
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr "Números individuales. Pulse enter para añadir más."
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+"Especifica números individualmente. Pulsa enter para añadir más. Tendrás que "
+"experimentar con qué códigos de país y área necesitas añadir al número."
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+"Estos números podrán llamar con los proveedores de este usuario. Los nombres "
+"de usuario no válidos se descartan sin aviso. Por favor, verifique que los "
+"números se aceptan."
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+"Aquí puede configurar un servicio de sistema telefónico (PBX) que le "
+"permitirá hacer llamadas por múltiples cuentas Google y SIP (como Sipgate, "
+"SipSorcery, and Betamax) y compartirlas entre muchos dispositivos SIP. Tenga "
+"en cuenta que las cuentas Google, SIP y locales deben configurarse en "
+"subsecciones diferentes. Debe añadir al menos una cuenta de usuarioa este "
+"PBX y configurar un dispositivo SIP o softphone para usarla para recibir las "
+"llamadas de sus cuentas Google/SIP. Configurar múltiples usuarios le "
+"permitirá hacer llamadas gratuitas entre los usuarios y compartir las "
+"cuentas Google/SIP configuradas. Si tiene más de una cuenta Google/SIP "
+"configurada tendrá que configurar cómo se enrutan en la página \"Enrutado de "
+"llamadas\". Si está interesado en usar su PBX desde cualquier sitio del "
+"mundo puede visitar la sección \"Uso remoto\" en la página \"Configuración "
+"avanzada\"."
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+"Nombre del servidor VoIP que usará para identificarse cuando se registre en "
+"proveedores de VoIP (SIP). Algunos requieres que sea una cadena específica a "
+"una dispositivo hardware."
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+"Indique las cuentas Google/SIP que usará para llamar a qué códigos de país/"
+"zona, qué usuarios pueden usuarios pueden usar qué cuentas SIP/Google y cómo "
+"se enrutan las llamadas entrantes, qué números pueden entrar en esta PBX con "
+"una contraseña y qué números están en lista negra."
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+"Configure sus cuentas Google (Talk y Voz) para empezar a usarlas para hacer "
+"y recibir llamadas (chat de voz y teléfono real). Haga al menos una llamada "
+"de voz con el plugin de Google Talk (instalable desde GMail) y desconéctese "
+"de la cuenta en cualquier otro sitio."
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+"Configure sus cuentas SIP (VoIP) como Sipgate, SipSorcery, los popular "
+"proveedores Betamax y cualquier otro proveedor para empezar a usarlos para "
+"hacer y recibir llamadas (uri SIP y teléfono real)."
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+"Debería ser \"Sí\" si tiene un DID (teléfono real) asociado a esta cuenta "
+"SIP o quiere recibir llamads uri SIP de este proveedor."
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+"Algunos de estos parámetros no suele ser necesario cambiarlos. Además puede "
+"configurar su sistema para usar con dispositivos SIP remotos y resolver "
+"problemas de calidad de llamada habilitando algunas reglas QoS."
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+"Use nombre de usuario númericos (cuatro o cinco dígitos) si conecta a "
+"teléfonos normales con ATAs a este sistema (para que puedan marcar números "
+"de usuario)."
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+"Cuenta para llamadas salientes como se configura en la sección \"Enrutado de "
+"llamadas\"."
+
+msgid "Use this account to make outgoing calls."
+msgstr "Cuenta para llamadas salientes."
+
+msgid "User Accounts"
+msgstr "Cuentas de usuario"
+
+msgid "User Agent String"
+msgstr "Cadena \"User Agent\""
+
+msgid "User Name"
+msgstr "Nombre de usuario"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr "Usar proveedores habilitados para llamadas salientes"
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+"Cuando alguien inicia un chat de voz con su cuenta de GTalk o llame al "
+"número de GVoice (si tiene Google Voice) la llamada se transferirá a "
+"cualquier usuario que esté conectado (registrado usando un dispositivo SIP o "
+"softphone) y se le permitirá recibir la llamada. Si tiene Google Voice debe "
+"ir a la configuración de GVoice y traspasar las llamadas a Google chat para "
+"recibir las hechas a si número de GVoice. Si tiene problemas recibiendo "
+"llamadas de GVoice pruebe con la opción \"Call Screening\" en la "
+"configuración de GVoice. Asegúrese de que ningún otro cliente esté conectado "
+"con esta cuenta (navegador en gmail, o una aplicación para móvil o "
+"escritorio) ya que podría interferir."
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+"Cuando se salve su contraseña desaparece de este campo y no se muestra para "
+"su seguridad. La contraseña sólo se podrá cambiar si introduce un valor "
+"diferente al salvado."
+
+msgid "Yes"
+msgstr "Sí"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+"Puedes introducir el nombre de dominio, dirección IP external o nombre "
+"dinámino aquí. Lo mejor es introducir una dirección IP estática. Si la "
+"dirección es dinámica la configuración sería inválida cuando cambiase. En "
+"estos casos es recomendable configurar Dynamic DNS e introducir tu nombre de "
+"host Dynamic DNS. Puedes instalar y configurar Dynamic DNS con el paquete "
+"luci-app-ddns."
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr "Nombre real a mostrar en el \"Caller ID\"."
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+"Puede usar sus dispositivos SIP/softphones con este sistema desde una "
+"ubicación remota mientras su proveedor de internet le dé una dirección IP "
+"pública. Podrá llamar a usuarios locales gratis (ej. otros adaptadores de "
+"teléfonos analógicos) y podrá usar sus proveedores de VoIP para hacer "
+"llamadas como si estuviese en su PBX local. Tras configurar esta pestaña "
+"vuelva a la configuración de usuarios y veo el nuevo servidor y puerto que "
+"debe configurar en sus dispositivos SIP remotos. Tenga en cuenta que si este "
+"PBX no funciona en su router/pasarela, tendrá que configurar el traspaso de "
+"puertos (NAT) en su router/pasarela. Traspase los puertos indicados (Puerto "
+"SIP y rango RTP) hacia la dirección IP del dispositivo en que corre esta PBX."
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+"Su PIN desaparecerá cuando se salve para su protección. Se cambiará solo "
+"cuando introduzca un valor diferente al salvado. No se puede dejar el PIN "
+"vacío."
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+"Su contraseña desaparecerá cuando se salve para su protección. Sólo se puede "
+"cambiar si entra un valor diferente al salvado."
+
+#~ msgid ""
+#~ "Designate numbers that are allowed to call through this system and which "
+#~ "user's privileges it will have."
+#~ msgstr ""
+#~ "Números a los que se permite llamar por este sistema y privilegios de "
+#~ "usuario."
+
+#~ msgid ""
+#~ "Pick a random port number between 6500 and 9500 for the service to listen "
+#~ "on. Do not pick the standard 5060, because it is often subject to brute-"
+#~ "force attacks. When finished, (1) click \"Save and Apply\", and (2) click "
+#~ "the \"Restart VoIP Service\" button above. Finally, (3) look in the \"SIP "
+#~ "Device/Softphone Accounts\" section for updated Server and Port settings "
+#~ "for your SIP Devices/Softphones."
+#~ msgstr ""
+#~ "Puerto aleatorio entre 6500 y 9500 en el que escuche el servicio. No elija "
+#~ "el estándar 5060 porque es susceptible de ataques por fuerza bruta. Cuando "
+#~ "termine (1) pulsa \"Salvar y aplicar\" y (2) pulse \"Rearrancar servicio VoIP\". "
+#~ "Finalmente (3) busque en la sección \"Dispositivo SIP/Cuentas softphone\" la "
+#~ "configuración del puerto."
+
+#~ msgid ""
+#~ "You can enter your domain name, external IP address, or dynamic domain "
+#~ "name here Please keep in mind that if your IP address is dynamic and it "
+#~ "changes your configuration will become invalid. Hence, it's recommended "
+#~ "to set up Dynamic DNS in this case."
+#~ msgstr ""
+#~ "Nombre de dominio, dirección IP externa o nombre de dominio dinámico. Si su "
+#~ "dirección IP es dinámica y cambia su configuración podría resultar no "
+#~ "válida. Se recomienda el uso de DNS dinámico en estos casos."
diff --git a/trunk/package/luci/po/es/polipo.po b/trunk/package/luci/po/es/polipo.po
new file mode 100644
index 00000000..84ba24ec
--- /dev/null
+++ b/trunk/package/luci/po/es/polipo.po
@@ -0,0 +1,307 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-09-02 08:33+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Configuración Avanzada"
+
+msgid "Allowed clients"
+msgstr "Clientes permitos"
+
+msgid "Always use system DNS resolver"
+msgstr "Usar siempre el DNS del sistema"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Autenticación soportada: Basic HTTP. Provee del nombre de usuario y "
+"contraseña in el formato username:password."
+
+msgid "Configuration"
+msgstr "Configuración"
+
+msgid "DNS and Query Settings"
+msgstr "Configuración de DNS y consultas"
+
+msgid "DNS server address"
+msgstr "Dirección del servidor DNS"
+
+msgid "Delete cache files time"
+msgstr "Tiempo para eliminar archivos de cache"
+
+msgid "Disk cache location"
+msgstr "Ubicación de la caché de disco"
+
+msgid "Do not query IPv6"
+msgstr "No consultar IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Activar si la cache (proxy) es compartida por múltiples usuarios."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Tamaño del primer segmento PMM (en bytes)"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Cuánta RAM debe usar Polipo como caché."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Tamaño (en bytes) de la cache en RAM"
+
+msgid "Listen address"
+msgstr "Dirección de escucha"
+
+msgid "Listen port"
+msgstr "Puerto de escucha"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Ubicación en la que Polipo creará archivos permanentemente. Se recomienda el "
+"uso de dispositivos de almacenamiento externo, ya que la caché puede "
+"aumentar considerablemente. Deje en blanco para desactivar la caché en disco."
+
+msgid "Log file location"
+msgstr "Ubicación del archivo de registro"
+
+msgid "Log to syslog"
+msgstr "Registrar en syslog"
+
+msgid "Logging and RAM"
+msgstr "Registro y RAM"
+
+msgid "Never use system DNS resolver"
+msgstr "Nunca usar el DNS del sistema"
+
+msgid "On-Disk Cache"
+msgstr "Cache en disco"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Tamaño de segmentos PMM (en bytes)"
+
+msgid "Parent Proxy"
+msgstr "Proxy padre"
+
+msgid "Parent proxy address"
+msgstr "Dirección del proxy padre"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Dirección del proxy padre (en formato máquina:puerto), al cual Polipo "
+"traspasará las peticiones."
+
+msgid "Parent proxy authentication"
+msgstr "Autentificación con el proxy padre"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Estado de Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo es un servidor proxy web pequeño y rápido."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Multiplexación Poor Man's"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"La Multiplexación Poor Man's (PMM) simula multiplexación solicitando una "
+"instancia en múltiples segmentos. Intenta reducir la latencia provocada por "
+"la debilidad del protocolo HTTP. NOTA: algunos sitios pueden no funcionar "
+"con PMM habilitado."
+
+msgid "Port on which Polipo will listen"
+msgstr "Puerto de escucha de Polipo"
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr "Consultar DNS por nombre de máquina"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr "Consultar DNS directamente y si falla probar con el del sistema"
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+"Consultar DNS directamente y para máquinas desconocidas probar con el del "
+"sistema"
+
+msgid "Query DNS for IPv6"
+msgstr "Consulta DNS para IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "Consultar IPv4 e IPv6, pero mejor IPv4"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "Consultar IPv4 e IPv6, pero mejor IPv6"
+
+msgid "Query only IPv6"
+msgstr "Consultar solo IPv6"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Indique la dirección del servidor DNS a utilizar, si prefiere que Polipo "
+"utilice una dirección para el servidor DNS distinta al utilizado en el "
+"sistema."
+
+msgid "Shared cache"
+msgstr "Cache compartida"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Tamaño del primer segmento PMM. Si no se encuentra definido, su valor por "
+"defecto es el doble del tamaño del segmento PMM."
+
+msgid "Size to which cached files should be truncated"
+msgstr "Tamaño máximo de los ficheros caché"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Syslog facility"
+msgstr "Utilidad Syslog"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"Interfaz de escucha de Polipo. Para hacerlo en todas utilice 0.0.0.0 o :: "
+"(IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr "Tiempo tras el que se borrarán los ficheros en caché"
+
+msgid "Time after which cached files will be truncated"
+msgstr "Tiempo tras el que se truncarán los ficheros en caché"
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+"Para activar PMM, el tamaño de segmento PMM debe tener un valor positivo."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Truncar el tamaño del archivo de la cache (en bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Truncar tiempos en el archivo de cache"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"El uso de un dispositivo externo de almacenamiento es recomendado, debido a "
+"que el archivo log es escrito con mucha frecuencia y el mismo puede "
+"incrementar su tamaño de forma considerable."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+"Si la dirección de escucha es 0.0.0.0 o :: (IPv6), debe listar a los "
+"clientes a los que se permitirá conectar. El formato es dirección IP o "
+"dirección de red (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+
+msgid "enable"
+msgstr "activar"
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Para activar la limpieza de la cache en disco polipo (recomendada), se "
+#~ "recomienda agregar un trabajo al cron in los Servicios de Tareas "
+#~ "Programadas el cual ejecutará el script /usr/sbin/polipo_purge. Por "
+#~ "ejemplo para ejecutar una limpieza de la cache de disco todos los días a "
+#~ "las 6:00 a.m. deberá agregar la siguiente línea en el Servicio de Tareas "
+#~ "Programadas.-&amp;quot;0 6 * * * /usr/sbin/polipo_purge&amp;quot; (sin "
+#~ "las comillas)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Tamaño del archivo sobre el cual la cache deberá ser truncada. (valor por "
+#~ "defecto: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Tiempo transcurrido necesario antes de truncar los archivos cacheado. "
+#~ "(valor por defecto: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Tiempo transcurrido necesario antes de eliminar los archivos en la cache. "
+#~ "(valor por defecto: 32d)"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Cuando la dirección a escuchar es establecida en 0.0.0.0 or :: (en caso "
+#~ "de utilizar IPv6), deberá listar los clientes que se encuentran permitos "
+#~ "a conectarse. El formato a utilizar deberá indicarse con la dirección IP "
+#~ "o bien la dirección de Red.Por ejemplo: (192.168.1.123, 192.168.1.0/24, "
+#~ "2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = No consulta IPv6, reluctantly = Consulta ambos, preferencia IPv4; "
+#~ "happily = Consulta ambos, preferencia IPv6; true = Consulta sólamente IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false = Nunca use el sistema de resolución de DNS, reluctantly = "
+#~ "Consultar DNS directamente, si el servidor DNS no está disponible al "
+#~ "utilizar el sistema de resolución de DNS, hapilly = Consultar DNS "
+#~ "directamente, si el host no se pudo encontrar volver al sistema de "
+#~ "resolución de DNS; true = Siempre use el sistema de resolución de DNS"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Puerto de escucha que Polipo utilizará. (valor por defecto: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Para activar PMM, el tamaño del segmento PMM debe ser establecido a un "
+#~ "valor mayor a 0 (valor positivo)."
diff --git a/trunk/package/luci/po/es/qos.po b/trunk/package/luci/po/es/qos.po
new file mode 100644
index 00000000..3c8206dd
--- /dev/null
+++ b/trunk/package/luci/po/es/qos.po
@@ -0,0 +1,123 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2014-06-15 09:13+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Calcular sobrecarga"
+
+msgid "Classification Rules"
+msgstr "Reglas de clasificación"
+
+msgid "Classification group"
+msgstr "Grupo de clasificación"
+
+msgid "Comment"
+msgstr "Comentario"
+
+msgid "Destination host"
+msgstr "Máquina de destino"
+
+msgid "Download speed (kbit/s)"
+msgstr "Velocidad de descarga (Kbit/s)"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Half-duplex"
+msgstr "Semi dúplex"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Number of bytes"
+msgstr "Número de bytes"
+
+msgid "Ports"
+msgstr "Puertos"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Calidad de Servicio"
+
+msgid "Service"
+msgstr "Servicio"
+
+msgid "Source host"
+msgstr "Máquina origen"
+
+msgid "Target"
+msgstr "Objetivo"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Velocidad de subida (Kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Con QoS puede priorizar el tráfico de la red seleccionando por direcciones, "
+"puertos o servicios."
+
+msgid "all"
+msgstr "todos"
+
+msgid "default"
+msgstr "por defecto"
+
+msgid "express"
+msgstr "exprés"
+
+msgid "low"
+msgstr "bajo"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "prioritario"
+
+#~ msgid "Downlink"
+#~ msgstr "Enlace de bajada"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Conexión a Internet"
+
+#~ msgid "Uplink"
+#~ msgstr "Enlace de subida"
+
+#~ msgid "allf"
+#~ msgstr "-- ¿allf? --"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "-- ¿qos_connbytes? --"
+
+#~ msgid "Prioritization"
+#~ msgstr "Priorización"
+
+#~ msgid "source network / source host"
+#~ msgstr "red de origen / host de origen"
+
+#~ msgid "target network / target host"
+#~ msgstr "red de destino / host de destino"
+
+#~ msgid "portrange"
+#~ msgstr "rango de puerto"
+
+#~ msgid "Bytes sent"
+#~ msgstr "Bytes enviados"
diff --git a/trunk/package/luci/po/es/radvd.po b/trunk/package/luci/po/es/radvd.po
new file mode 100644
index 00000000..86561920
--- /dev/null
+++ b/trunk/package/luci/po/es/radvd.po
@@ -0,0 +1,412 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-26 17:12+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: German\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "6to4 interface"
+msgstr "Interfaz 6a4"
+
+msgid "Address"
+msgstr "Dirección"
+
+msgid "Addresses"
+msgstr "Direcciones"
+
+msgid "Advanced"
+msgstr "Avanzado"
+
+msgid "Advertise Home Agent flag"
+msgstr "Publicar marca de agente personal"
+
+msgid "Advertise router address"
+msgstr "Publicar dirección del router"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Publicar sufijos de dominio"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"RDNSS IPv6 publicado. Dejar en blanco para usar la dirección IPv6 de la "
+"interfaz"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Prefijo IPv6 publicado"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Prefijos IPv6 publicados. Dejar en blanco para usar el propio del interfaz"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Publica aptitudes móviles IPv6 del Home Agent (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "Publica las aptitudes de registro del router móvil"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Publica el alcance asumido en milisegundos de los vecinos en la RA si se "
+"especifica. 0 para desactivar"
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Publica la cuenta de saltos para paquetes salientes en el RA. Desactivar con "
+"0"
+
+msgid "Advertises the default router preference"
+msgstr "Publica la preferencia de router por defecto"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr "Publica el MTU del enlace en la RA si se especifica. Desactivar con 0"
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+"Publica el tiempo de vida en segundos que se prefieren las direcciones "
+"generadas desde el prefijo vía una dirección de autoconfiguración sin estado."
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+"Publica el tiempo en segundos que el prefijo es válido para determinar que "
+"el enlace está activo."
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+"Publica tiempo de vida del router por defecto en segundos. 0 si el router no "
+"lo es"
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+"Publica tiempo en segundos que router ofrece servicios de Home Agent para "
+"IPv6 móvil"
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+"Publicar el tiempo de espera en milisegundos entre mensajes de solicitud de "
+"vecinos en la RA. Desactivar con 0"
+
+msgid "Advertising"
+msgstr "Publicación"
+
+msgid "Autonomous"
+msgstr "Autónomo"
+
+msgid "Clients"
+msgstr "Clientes"
+
+msgid "Configuration flag"
+msgstr "Marca de configuración"
+
+msgid "Current hop limit"
+msgstr "Límite de saltos actual"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Configuración DNSSL"
+
+msgid "Default lifetime"
+msgstr "Vida por defecto"
+
+msgid "Default preference"
+msgstr "Preferencia por defecto"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Enable advertisements"
+msgstr "Activar publicaciones"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Activar publicaciones y solicitudes de router"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr "Activa el protocolo adicional de autoconfiguración de estado (RFC2462)"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+"Activa la configuración de información adicional que no sea de dirección "
+"(RFC2462)"
+
+msgid "General"
+msgstr "General"
+
+msgid "Home Agent information"
+msgstr "Información del \"Home Agent\""
+
+msgid "Home Agent lifetime"
+msgstr "Vida del \"Home Agent\""
+
+msgid "Home Agent preference"
+msgstr "Preferencia del \"Home Agent\""
+
+msgid "Include Home Agent Information in the RA"
+msgstr "Incluir información del \"Home Agent\" en el RA"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr "Incluir la opción de publicación móvil IPv6 a RA"
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+"Incluye la dirección de capa de enlace para el interfaz saliente en la RA"
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+"Se enviará la dirección del interfaz en vez del prefijo de red tal y como se "
+"requiere par IPv6 móvil"
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+"El enlace inferior no puede hacer redifusión, no se pueden enviar "
+"publicaciones no solicitadas"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+"Este prefijo se puede usar como una dirección autónoma de configuración "
+"(RFC4862)"
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+"Este prefijo se puede usar para determinación de enlace activado (RFC4861)"
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid "Interface Configuration"
+msgstr "Configuración de la interfaz"
+
+msgid "Interface required"
+msgstr "Se necesita una interfaz"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Lifetime"
+msgstr "Vida"
+
+msgid "Link MTU"
+msgstr "MTU del enlace"
+
+msgid "Managed flag"
+msgstr "Marca de gestionado"
+
+msgid "Max. interval"
+msgstr "Intervalo máximo"
+
+msgid "Maximum advertisement interval"
+msgstr "Intervalo máximo de publicación"
+
+msgid "Minimum advertisement delay"
+msgstr "Retraso mínimo de publicación"
+
+msgid "Minimum advertisement interval"
+msgstr "Intervalo mínimo de publicación"
+
+msgid "Mobile IPv6"
+msgstr "IPv6 móvil"
+
+msgid "Mobile IPv6 interval option"
+msgstr "Opción de intervalo móvil IPv6"
+
+msgid "Mobile IPv6 router registration"
+msgstr "Registro de router móvil IPv6"
+
+msgid "Multicast"
+msgstr "Multidifusión"
+
+msgid "On-link"
+msgstr "Enlace activado (On-link)"
+
+msgid "On-link determination"
+msgstr "Determinar enlace activado"
+
+msgid "Preference"
+msgstr "Preferencia"
+
+msgid "Preferred lifetime"
+msgstr "Duración de vida preferida"
+
+msgid "Prefix"
+msgstr "Prefijo"
+
+msgid "Prefix Configuration"
+msgstr "Configuración del prefijo"
+
+msgid "Prefixes"
+msgstr "Prefijos"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "Configuración RDNSS"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Interfaz %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Prefijo"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Ruta"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"Radvd es un demonio de publicación de enrutado de para IPv6. Atiende "
+"solicitudes de ruta y envía anuncios de ruta como se describe en RFC4861."
+
+msgid "Reachable time"
+msgstr "Tiempo alcanzable"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"Restringir comunicaciones a estos clientes, dejar en blanco para "
+"multidifusión"
+
+msgid "Retransmit timer"
+msgstr "Retraso de retransmisión"
+
+msgid "Route Configuration"
+msgstr "Configuración de rutas"
+
+msgid "Routes"
+msgstr "Rutas"
+
+msgid "Source link-layer address"
+msgstr "Dirección origen de enlace de red"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+"Nombre lógicos del interfaz del que derivar un prefijo 6to4. La dirección "
+"IPv4 pública del interfaz se combina con 2002::/3 y el valor de la opción "
+"\"prefijo\""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr "Tiempo de vida asociado a la ruta en segundos."
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr "Nombre del interfaz lógico al que pertenece esta sección"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+"Máximo tiempo que las entradas DNSSL se usan para resolución de nombres."
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+"Máximo tiempo que las entradas RDNSS se usan para resolución de nombres."
+
+msgid "Specifies the preference associated with the default router"
+msgstr "Preferencia asociada con el router por defecto"
+
+msgid "Suffix"
+msgstr "Sufijo"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Máximo tiempo en segundos entre envíos de publicaciones multidifusión desde "
+"el interfaz"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+"Mínimo tiempo en segundos entre envíos de publicaciones multidifusión desde "
+"el interfaz"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Mínimo tiempo en segundos entre envíos de publicaciones multidifusión no "
+"solicitadas desde el interfaz"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr "Preferencia que el Home Agent enviará a esta RA"
+
+msgid "Timing"
+msgstr "Temporización"
+
+msgid "Unicast only"
+msgstr "Solo unidifusión"
+
+msgid "Valid lifetime"
+msgstr "Tiempo de vida válido"
+
+msgid "Validity time"
+msgstr "Tiempo de validez"
+
+msgid "default"
+msgstr "por defecto"
+
+msgid "high"
+msgstr "alto"
+
+msgid "low"
+msgstr "bajo"
+
+msgid "medium"
+msgstr "medio"
+
+msgid "no"
+msgstr "no"
+
+msgid "yes"
+msgstr "sí"
diff --git a/trunk/package/luci/po/es/rrdtool.po b/trunk/package/luci/po/es/rrdtool.po
new file mode 100644
index 00000000..3cf27a28
--- /dev/null
+++ b/trunk/package/luci/po/es/rrdtool.po
@@ -0,0 +1,360 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-04-16 01:53+0200\n"
+"Last-Translator: Jose <jarre2_es_jose@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Wireless - Relación señal/ruido"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Nivel de Ruido"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Fuerza de la señal"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Wireless - Calidad de la señal"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Calidad de señal"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: Tiempo de respuesta ICMP"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Firewall - Paquetes Procesados"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Paquetes/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Cadena \\\"%di\\\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - Traslado en %pi"
+
+# Bytes/s
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bytes (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - Paquetes en %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Paquetes/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Procesado (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Descartados (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Errores (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - Multicast en %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Paquetes/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Paquetes"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - Colisiones en %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Colisiones/s"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Colisiones"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Errores en %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Errores/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Procesos"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Procesos/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Proceso %pi -tiempo de cpu utilizado"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "sistema"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "usuario"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Procesos %pi - Hilos y procesos"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "contar"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Procesos %pi - página de errores"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Pagina de errores"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "Página de errores"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Proceso %pi - tamaño de la memoria virtual"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "Memoria Virtual"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Uso en el procesador #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Transferencia en %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Paquetes en %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Paquetes/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: Conexiones TCP en el Puerto %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Conexiones/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Uso de espacio de disco en %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Interrupciones"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "cuestiones/s"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Carga de sistema"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Carga"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 minuto"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 minutos"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 minutos"
diff --git a/trunk/package/luci/po/es/samba.po b/trunk/package/luci/po/es/samba.po
new file mode 100644
index 00000000..950a8179
--- /dev/null
+++ b/trunk/package/luci/po/es/samba.po
@@ -0,0 +1,92 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-08-22 17:45+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permitir invitados"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Permitir a los usuarios acceder a sus directorios de inicio vía "
+"comparticiones de red"
+
+msgid "Allowed users"
+msgstr "Usuarios permitidos"
+
+msgid "Create mask"
+msgstr "Crear máscara"
+
+msgid "Description"
+msgstr "Descripción"
+
+msgid "Directory mask"
+msgstr "Máscara de directorio"
+
+msgid "Edit Template"
+msgstr "Editar plantilla"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Editar la plantilla usada para generar la configuración de samba."
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid "Mask for new directories"
+msgstr "Máscara para directorios nuevos"
+
+msgid "Mask for new files"
+msgstr "Máscara para archivos nuevos"
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Network Shares"
+msgstr "Comparticiones de red"
+
+msgid "Path"
+msgstr "Dirección"
+
+msgid "Read-only"
+msgstr "Solo lectura"
+
+msgid "Share home-directories"
+msgstr "Compartir directorios personales"
+
+msgid "Shared Directories"
+msgstr "Directorios compartidos"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Contenido del fichero '/etc/samba/smb.conf.template' desde el que se "
+"generará la configuración de samba. Los valores entre tuberías ('|') no "
+"deben cambiarse. Su valor se toma desde la pestaña 'Configuración General'."
+
+msgid "Workgroup"
+msgstr "Grupo de trabajo"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Directorio compatido"
+
+#~ msgid "Physical Path"
+#~ msgstr "Ruta Física"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/trunk/package/luci/po/es/splash.po b/trunk/package/luci/po/es/splash.po
new file mode 100644
index 00000000..836352ea
--- /dev/null
+++ b/trunk/package/luci/po/es/splash.po
@@ -0,0 +1,376 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-24 18:30+0200\n"
+"PO-Revision-Date: 2014-06-15 13:17+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Aceptar"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"El acceso a internet puede ser posible, sin embargo, porque otros miembros "
+"del proyecto comparten sus conexiones a internet privadas y estas pocas "
+"conexiones se comparten entre todos los usuarios. Por este motivo el ancho "
+"de banda está limitado y le pedimos que no haga:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+"No se puede garantizar el acceso a la red. Podría interrumpirse en cualquier "
+"momento, sin aviso y por cualquier motivo, para ciertos dispositivos y/o es "
+"posible bloquearlo para ciertos usuarios."
+
+msgid "Active Clients"
+msgstr "Clientes activos"
+
+msgid "Allowed hosts/subnets"
+msgstr "Máquinas y subredes permitidas"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+"En vez de editar el splash entero puede introducir aquí un texto que se "
+"mostrará en el splash por defecto."
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"La limitación de ancho de banda sólo se activa cuando se establecen tanto el "
+"límite de subida como el de bajada. Ponga 0 para desactivarla. A los "
+"clientes en lista blanca no se les limita."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+"Conviértase en un miembro activo de esta comunidad y ayude gestionando su "
+"propio nodo"
+
+msgid "Blacklist"
+msgstr "Lista negra"
+
+msgid "Blocked"
+msgstr "Bloqueado"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+"Aceptar estas reglas le permite usar esta red durante %s hora(s). Tras este "
+"tiempo tendrá que aceptarlas de nuevo."
+
+msgid "Clearance time"
+msgstr "Tiempo de autorización"
+
+msgid "Client-Splash"
+msgstr "Cliente-Splash"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr "Cliente-Splash es un sistema de autentificación para redes mesh."
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+"Se redirigirá a los clientes a esta página tras haber aceptado el splash. Si "
+"se deja vacío se les redirigirá a la página que habían pedido."
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr "La velocidad de descarga de los clientes está limitada a (Kbytes/s)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+"Horas a las que se permitirá usar la red a los clientes que acepten la "
+"presentación."
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr "La velocidad de subida de los clientes está limitada a (Kbytes/s)"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Decline"
+msgstr "Rechazar"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+"Redes y hosts destino excluidos de splash, es decir, que siempre son "
+"admitidos."
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "Haga una aportación para ayudarnos a mantener este proyecto vivo."
+
+msgid "Download limit"
+msgstr "Límite de descarga"
+
+msgid "Edit the complete splash text"
+msgstr "Editar el texto completo del splash"
+
+msgid "Fair Use Policy"
+msgstr "Política de uso adecuado"
+
+msgid "Firewall zone"
+msgstr "Zona del cortafuegos"
+
+msgid "General"
+msgstr "General"
+
+msgid "Get in %s with the operator of this access point."
+msgstr "Conecte %s con el operador de este punto de acceso."
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid "IP Address"
+msgstr "Dirección IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr "Si maneja su propio wi-fi use canales diferentes de los nuestros."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "Si es usuario habitual de esta red le pedimos apoyo:"
+
+msgid "Include your own text in the default splash"
+msgstr "Incluir su propio texto en el splash por defecto"
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Interceptar el tráfico cliente en esta interfaz"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Interfaces usados para Splash."
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"KB/s (Descarga/Subida). Puede evitar este límite contribuyendo activamente a "
+"este proyecto."
+
+msgid "Legally Prohibited Activities"
+msgstr "Actividades prohibidas por ley"
+
+msgid "Legally Prohibited content"
+msgstr "Contenido prohibido por ley"
+
+msgid "MAC Address"
+msgstr "Dirección MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "Direcciones MAC bloqueadas."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"Direcciones MAC de clientes en lista blanca. Estos no tendrán que aceptar la "
+"presentación ni tendrán limitado el ancho de banda."
+
+msgid "Netmask"
+msgstr "Máscara de red"
+
+msgid "Network"
+msgstr "Red"
+
+msgid "No clients connected"
+msgstr "Sin clientes conectados"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Tenga presente que no somos un proveedor de acceso a internet sino una red "
+"comunitaria experimental."
+
+msgid "Policy"
+msgstr "Politica"
+
+msgid "Redirect target"
+msgstr "Redirige objetivo"
+
+msgid "Safety"
+msgstr "Seguridad"
+
+msgid "Save"
+msgstr "Guardar"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr "Zona del cortafuegos en la que está integradas las reglas del Splash"
+
+msgid "Splashtext"
+msgstr "Mensaje de presentación"
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+"La red, como internet, no está encriptada y es abierta. Cada participante es "
+"responsable de la seguridad de sus propias conexiones y dispositivos."
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+"La red abierta y libre de voluntarios (\"operadores\") proporciona el equipo "
+"necesario y conexiones a internet (\"infraestructura\") de su propio "
+"bolsillo."
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+"El operador no será responsable por la pérdida de datos, acceso/daño no "
+"autorizado a dispositivos o pérdidas financieras que los participantes "
+"pudiesen incurrir por el uso de la red."
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+"El participante acepta no llevar a cabo ninguna acción y evitará acciones "
+"que pudiese violar las leyes o infringir los derechos de terceros."
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+"El participante acepta no transferir contenido que viole la ley por la red."
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+"El participante acepta no usar la red de ninguna manera que dañe la "
+"infraestructura, la propia red, sus operadores u otros participantes."
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+"Estos términos cubren el uso de la red por los ordenadores de sus "
+"participantes, PDAs o dispositivos similares."
+
+msgid "Time remaining"
+msgstr "Tiempo restante"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Para preguntar porqué se le ha bloqueado o pedir acceso de nuevo intente "
+"contactar con el propietario de este punto de acceso:"
+
+msgid "Traffic in/out"
+msgstr "Tráfico entrante/saliente"
+
+msgid "Upload limit"
+msgstr "Límite de subida"
+
+msgid "Usage Agreement"
+msgstr "Acuerdo de uso"
+
+msgid "Welcome"
+msgstr "Bienvenido"
+
+msgid "Whitelist"
+msgstr "Lista blanca"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr "Se ha conectado a la red libre mesh inalámbrica"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"Introduzca aquí el texto que se mostrará a los clientes.<br />Es posible "
+"usar las siguientes etiquetas: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### y ###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"Se le ha bloqueado el acceso a esta red, probablemente porque hizo algo "
+"prohibido explícitamente en sus reglas."
+
+msgid "Your bandwidth is limited to"
+msgstr "Su ancho de banda está limitado a"
+
+msgid "blacklisted"
+msgstr "en lista negra"
+
+msgid "expired"
+msgstr "caducado"
+
+msgid "optional when using host addresses"
+msgstr "opcional si usa direcciones de máquina"
+
+msgid "perform any kind of illegal activities"
+msgstr "llevar a cabo cualquier tipo de actividades ilegales"
+
+msgid "splashed"
+msgstr "Recibido"
+
+msgid "temporarily blocked"
+msgstr "bloqueado temporalmente"
+
+msgid "unknown"
+msgstr "desconocido"
+
+msgid "use filesharing applications on this network"
+msgstr "usar aplicaciones de compartición de ficheros en esta red"
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "malgastar ancho de banda con descargas innecesarias o multimedia"
+
+msgid "whitelisted"
+msgstr "en lista blanca"
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr ""
+#~ "A estas máquinas y redes no se les mostrará la presentación y siempre serán "
+#~ "bienvenidas."
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "Si acepta estas reglas pordrá usar esta red para"
+
+#~ msgid "Edit Splash text"
+#~ msgstr "Editar la página de bienvenida"
+
+#~ msgid "hour(s). After this time you need to accept these rules again."
+#~ msgstr "hora/horas. Tras este tiempo deberá aceptar las reglas de nuevo."
+
+#~ msgid "the owner of this access point."
+#~ msgstr "el propietario de este punto de acceso."
diff --git a/trunk/package/luci/po/es/statistics.po b/trunk/package/luci/po/es/statistics.po
new file mode 100644
index 00000000..3571a53d
--- /dev/null
+++ b/trunk/package/luci/po/es/statistics.po
@@ -0,0 +1,721 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-12-12 20:19+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Acción (objetivo)"
+
+msgid "Add command for reading values"
+msgstr "Añadir comando para leer valores"
+
+msgid "Add matching rule"
+msgstr "Añadir regla"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Añadir múltiples máquinas separadas por espacio."
+
+msgid "Add notification command"
+msgstr "Añadir comando de notificación"
+
+msgid "Base Directory"
+msgstr "Directorio Base"
+
+msgid "Basic monitoring"
+msgstr "Monitorización básica"
+
+msgid "CPU Plugin Configuration"
+msgstr "Configuración del plugin de CPU"
+
+msgid "CSV Output"
+msgstr "Salida CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Configuración del plugin de CSV"
+
+msgid "Cache collected data for"
+msgstr "Almacenar datos recogidos para"
+
+msgid "Cache flush interval"
+msgstr "Intervalo de limpieza del caché"
+
+msgid "Chain"
+msgstr "Cadena"
+
+msgid "CollectLinks"
+msgstr "Enlaces"
+
+msgid "CollectRoutes"
+msgstr "Rutas"
+
+msgid "CollectTopology"
+msgstr "Topología"
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Configuración de Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd is un demonio para la recolección de datos desde varias fuentes a "
+"través de la utilización de diferentes plugins. Aquí puede cambiar la "
+"configuración general del demonio que maneja collectd."
+
+msgid "Conntrack"
+msgstr "Seguimiento"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Configuración del seguimiento"
+
+msgid "DF Plugin Configuration"
+msgstr "Configuración del plugin DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Configuración del plugin DNS"
+
+msgid "Data collection interval"
+msgstr "Intervalo de recolección de datos"
+
+msgid "Datasets definition file"
+msgstr "Archivo de definición de conjunto de datos"
+
+msgid "Destination ip range"
+msgstr "Rango IP de destino"
+
+msgid "Directory for collectd plugins"
+msgstr "Directorio para los plugins de collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Directorio para las sub-configuraciones"
+
+msgid "Disk Plugin Configuration"
+msgstr "Configuración del plugin Disco"
+
+msgid "Disk Space Usage"
+msgstr "Espacio en disco ocupado"
+
+msgid "Disk Usage"
+msgstr "Disco ocupado"
+
+msgid "Display Host »"
+msgstr "Mostrar máquina »"
+
+msgid "Display timespan »"
+msgstr "Mostrar lapso de tiempo »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Configuración del plugin email"
+
+msgid "Email"
+msgstr "Correo electrónico"
+
+msgid "Enable this plugin"
+msgstr "Activar este plugin"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Configuración del plugin Exec"
+
+msgid "Filter class monitoring"
+msgstr "Monitorización del filtro de clases"
+
+msgid "Firewall"
+msgstr "Cortafuegos"
+
+msgid "Flush cache after"
+msgstr "Vaciar caché tras"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Retransmitir entre las direcciones de escucha y servidor"
+
+msgid "Graphs"
+msgstr "Gráficas"
+
+msgid "Group"
+msgstr "Grupo"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Aquí puede definir los comandos externos que iniciará collectd para leer "
+"ciertos valores. Los valores se leen desde la salida estándar (stdout)."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Aquí puede definir los comandos externos que iniciará collectd cuando se "
+"alcancen ciertos valores umbral."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Aquí puede definir varios criterios de selección de reglas de iptables "
+"monitorizadas."
+
+msgid "Host"
+msgstr "Máquina"
+
+msgid "Hostname"
+msgstr "Nombre de máquina"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr "IP o nombre de máquina desde la que obtener la salida de txtinfo"
+
+msgid "IRQ Plugin Configuration"
+msgstr "Configuración del plugin IRQ"
+
+msgid "Ignore source addresses"
+msgstr "Ignorar direcciones de origen"
+
+msgid "Incoming interface"
+msgstr "Interfaz de entrada"
+
+msgid "Interface Plugin Configuration"
+msgstr "Configuración del interfaz de plugins"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interrupts"
+msgstr "Interrupciones"
+
+msgid "Interval for pings"
+msgstr "Intervalo entre pings"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Configuración del plugin Iptables"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr "No marcar para determinar automáticamente que interfaces monitorizar."
+
+msgid "Listen host"
+msgstr "Máquina de escucha"
+
+msgid "Listen port"
+msgstr "Puerto de escucha"
+
+msgid "Listener interfaces"
+msgstr "Interfaces para escuchar"
+
+msgid "Load Plugin Configuration"
+msgstr "Configuración del plugin de carga"
+
+msgid "Maximum allowed connections"
+msgstr "Máximo número de conexiones"
+
+msgid "Memory"
+msgstr "Memoria"
+
+msgid "Memory Plugin Configuration"
+msgstr "Configuración del plugin Memoria"
+
+msgid "Monitor all except specified"
+msgstr "Monitorizar todos menos los especificados"
+
+msgid "Monitor all local listen ports"
+msgstr "Monitorizar todos los puertos de escucha locales"
+
+msgid "Monitor devices"
+msgstr "Dispositivos a monitonizar"
+
+msgid "Monitor disks and partitions"
+msgstr "Monitorizar discos y particiones"
+
+msgid "Monitor filesystem types"
+msgstr "Monitorizar tipos de sistema de archivos"
+
+msgid "Monitor hosts"
+msgstr "Monitorizar máquinas"
+
+msgid "Monitor interfaces"
+msgstr "Monitorizar interfaces"
+
+msgid "Monitor interrupts"
+msgstr "Monitorizar interrupciones"
+
+msgid "Monitor local ports"
+msgstr "Monitorizar puertos locales"
+
+msgid "Monitor mount points"
+msgstr "Monitorizar puntos de montaje"
+
+msgid "Monitor processes"
+msgstr "Monitorizar procesos"
+
+msgid "Monitor remote ports"
+msgstr "Monitorizar puertos remotos"
+
+msgid "Name of the rule"
+msgstr "Nombre de la regla"
+
+msgid "Netlink"
+msgstr "Enlace de red"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Configuración del plugin \"enlace de red\""
+
+msgid "Network"
+msgstr "Red"
+
+msgid "Network Plugin Configuration"
+msgstr "Configuración del plugin \"Red\""
+
+msgid "Network plugins"
+msgstr "Plugins de red"
+
+msgid "Network protocol"
+msgstr "Protocolo de red"
+
+msgid "Number of threads for data collection"
+msgstr "Número de hilos para recolección de datos"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "Configuración del plugin \"OLSRd\""
+
+msgid "Only create average RRAs"
+msgstr "Crear sólo RRAs medias"
+
+msgid "Options"
+msgstr "Opciones"
+
+msgid "Outgoing interface"
+msgstr "Interfaz de salida"
+
+msgid "Output plugins"
+msgstr "Plugins de salida"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Configuración del plugin \"Ping\""
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Processes"
+msgstr "Procesos"
+
+msgid "Processes Plugin Configuration"
+msgstr "Configuración del plugin \"Procesos\""
+
+msgid "Processes to monitor separated by space"
+msgstr "Procesos a monitorizar (separados por espacios)"
+
+msgid "Processor"
+msgstr "Procesador"
+
+msgid "Qdisc monitoring"
+msgstr "Monitorización Qdisc"
+
+msgid "RRD XFiles Factor"
+msgstr "Factor XFiles RRD"
+
+msgid "RRD heart beat interval"
+msgstr "Intervalo de pulso RRD"
+
+msgid "RRD step interval"
+msgstr "Intervalo de paso RRD"
+
+msgid "RRDTool"
+msgstr "Herramienta RRD"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Configuración del plugin \"Herramienta RRD\""
+
+msgid "Rows per RRA"
+msgstr "Filas por RRA"
+
+msgid "Script"
+msgstr "Guión"
+
+msgid "Seconds"
+msgstr "Segundos"
+
+msgid "Server host"
+msgstr "Máquina servidor"
+
+msgid "Server port"
+msgstr "Puerto servidor"
+
+msgid "Shaping class monitoring"
+msgstr "Monitorización de la clase shaping"
+
+msgid "Socket file"
+msgstr "Fichero de sockets"
+
+msgid "Socket group"
+msgstr "Grupo socket"
+
+msgid "Socket permissions"
+msgstr "Permisos para socket"
+
+msgid "Source ip range"
+msgstr "Rango de direcciones IP origen"
+
+msgid "Specifies what information to collect about links."
+msgstr "Especifica qué información recolectar sobre enlaces."
+
+msgid "Specifies what information to collect about routes."
+msgstr "Especifica qué información recolectar sobre rutas."
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "Especifica qué información recolectar sobre la topología global."
+
+msgid "Statistics"
+msgstr "Estadísticas"
+
+msgid "Storage directory"
+msgstr "Directorio de guardado"
+
+msgid "Storage directory for the csv files"
+msgstr "Directorio para guardar archivos csv"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Guardar datos como ratios en vez de valores absolutos"
+
+msgid "Stored timespans"
+msgstr "Intervalos almacenados"
+
+msgid "System Load"
+msgstr "Carga del sistema"
+
+msgid "System plugins"
+msgstr "Plugins del sistema"
+
+msgid "TCP Connections"
+msgstr "Conexiones TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Configuración del plugin \"Conexiones TCP\""
+
+msgid "TTL for network packets"
+msgstr "TTL para paquetes de red"
+
+msgid "TTL for ping packets"
+msgstr "TTL para paquetes de ping"
+
+msgid "Table"
+msgstr "Tabla"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+"El plugin NUT obtiene información sobre Sistemas de Alimentación "
+"Ininterrumpida."
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+"El plugin OLSRd lee información sobre redes distribuidas desde el plugin "
+"txtinfo de OLSRd."
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+"El plugin \"Seguimiento\" recoge estadísticas sobre el número de conexiones "
+"analizadas."
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+"El plugin \"CPU\" recolecta estadísticas básicas acerca del uso del "
+"procesador."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"El plugin \"CSV\" almacena los datos recolectados en un archivo con formato "
+"csv para su procesado posterior con programas de terceros."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"El plugin \"DF\" recolecta estadísticas acerca del uso del espacio en disco "
+"en diferentes dispositivos, puntos de montaje y tipos de sistema de archivos."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"El plugin \"Disco\" recolecta estadísticas detallada acerca de su "
+"utilización para las particiones seleccionadas o bien el disco completo."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"El plugin \"DNS\" recolecta estadísticas detalladas acerca del trafico DNS "
+"en las interfaces seleccionadas."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"El plugin \"eMail\" crea un socket de unix (unix-socket) que puede "
+"utilizarse para transmitir estadísticas de email a un demonio collectd en "
+"ejecución. Este plugin fue desarrollado, en primer instancia, para ser "
+"utilizado en conjunto con Mail::SpamAssasin::Plugin::Collectd pero puede "
+"utilizarse de diferentes formas."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"El plugin \"Exec\" inicia comandos externos para leer valores o notificar a "
+"procesos externos cuando determinados valores se alcanzan."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"El plugin \"Interface\" recoge estadísticas de tráfico en las interfaces "
+"seleccionadas."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"El plugin \"Iptables\" monitoriza las reglas seleccionadas del cortafuegos y "
+"recoge información de bytes y paquetes procesados por cada regla."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"El plugin IRQ monitorizará las activaciones por segundo de cada interrupción "
+"elegida. Si no se selecciona ninguna se monitorizarán todas."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"El plugin \"iwinfo\" recolecta estadísticas sobre la potencia de la señal "
+"inalámbrica, ruido y calidad."
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+"El plugin \"carga\" recoge estadísticas sobre la carga general del sistema."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "El plugin \"memoria\" recoge estadísticas sobre el uso de memoria."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"El plugin \"netlink\" recoge informaciones extendidas como estadísticas "
+"qdisc-, clase- y filtro- para las interfaces seleccionadas."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"El plugin \"red\" proporciona comunicación entre diferentes instancias de "
+"collectd. Collectd puede operar tanto en modo cliente como en modo servidor. "
+"En modo cliente la información recogida se envía a una instancia que se "
+"encuentre en modo servidor. En modo servidor la instancia recibe datos de "
+"otras máquinas."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"El plugin \"ping\" enviará ecos ICMP a las máquinas elegifas para medir el "
+"tiempo de viaje para cada host."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"El plugin \"procesos\" recoge información como tiempo de CPU, fallos de "
+"página y uso de memoria de los procesos elegidos."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"El plugin \"rrdtool\" almacena datos en ficheros de bb.dd. RRD que son la "
+"base para los diagramas.<br /><br /><strong>¡Ojo: Configurar valores "
+"incorrectos puede hacer que se use mucho espacio en el directorio temporal y "
+"puede hacer que el dispositivo funcione mal!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"El paquete \"estadísticas\" está basado en <a href=\"http://collectd.org/"
+"index.shtml\">Collectd</a> y utiliza <a href=\"http://oss.oetiker.ch/rrdtool/"
+"\">RRD Tool</a> para dibujar gráficos con los datos recogidos."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"El plugin \"tcpconns\" recoge información de conexiones TCP abiertas en los "
+"puertos seleccionados."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"El plugin \"unixsock\" crea un socket UNIX que se puede usar para leer los "
+"datos recogidos por una instancia collectd."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Esta sección define sobre qué interfaces collectd esperará conexiones "
+"entrantes."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Esta sección define a qué servidores se envían los datos recolectados "
+"localmente."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Intenta resolver el nombre de máquina cualificado"
+
+msgid "UPS"
+msgstr "SAI"
+
+msgid "UPS Plugin Configuration"
+msgstr "Configuración del plugin SAI"
+
+msgid "UPS name in NUT ups@host format"
+msgstr "Nombre del SAI en el formato de NUT sai@máquina"
+
+msgid "UnixSock"
+msgstr "Socket UNIX"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Configuración del plugin \"UnixSock\""
+
+msgid "Used PID file"
+msgstr "Archivo PID utilizado"
+
+msgid "User"
+msgstr "Usuario"
+
+msgid "Verbose monitoring"
+msgstr "Monitorización detallada"
+
+msgid "Wireless"
+msgstr "Red inalámbrica"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "Configuración plugin \"Wireless iwinfo\""
+
+msgid "e.g. br-ff"
+msgstr "p.e. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "p.e. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "p.e. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "16 caracteres máximo"
+
+msgid "reduces rrd size"
+msgstr "reduce el tamaño RRD"
+
+msgid "seconds; multiple separated by space"
+msgstr "segundos (varios separados por espacio)"
+
+msgid "server interfaces"
+msgstr "interfaces servidores"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Plugins de red instalados:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Plugins de salida instalados:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "Los plugins de red se usan para recolectar información sobre conexiones TCP, "
+#~ "tráfico en los interfaces, reglas de iptables, etc."
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "Los plugins de salida ofrecen varias posibilidades para almacenar los datos. "
+#~ "Es posible activar varios plugins a la vez, por ejemplo para almacenar "
+#~ "datos recolectados en bases de datos RRD y para transmitir los datos sobre "
+#~ "la red a otras instancias de collectd."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr ""
+#~ "Los plugins del sistema recolectan valores sobre el estado y el uso de "
+#~ "recursos del dispositivo.:"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "El plugin \"inalámbrico\" recoge estadísticas sobre fuerza de la señal, ruido "
+#~ "y calidad."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Configuración del plugin \"Wireless\""
+
+#~ msgid "Filepath of the unix socket"
+#~ msgstr "Ruta de archivo para el socket de unix"
+
+#~ msgid "Group ownership of the unix socket"
+#~ msgstr "Grupo (dueño) del socket de unix "
+
+#~ msgid "group name"
+#~ msgstr "nombre del grupo"
+
+#~ msgid "File permissions of the unix socket"
+#~ msgstr "Permisos de archivos del socket de unix"
+
+#~ msgid "octal"
+#~ msgstr "octal"
diff --git a/trunk/package/luci/po/es/tinyproxy.po b/trunk/package/luci/po/es/tinyproxy.po
new file mode 100644
index 00000000..c9faff19
--- /dev/null
+++ b/trunk/package/luci/po/es/tinyproxy.po
@@ -0,0 +1,354 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-10-07 15:08+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"<em>Vía proxy</em> enruta las peticiones al destino vía el proxy superior "
+"especificado, <em>Rechazar acceso</em> desactiva cualquier proxy superior al "
+"destino"
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Añade una cabecera HTTP con \"X-Tinyproxy\" con la dirección IP del cliente "
+"a las peticiones retransmitidas"
+
+msgid "Allowed clients"
+msgstr "Clientes permitidos"
+
+msgid "Allowed connect ports"
+msgstr "Puertos permitidos"
+
+msgid "Bind address"
+msgstr "Dirección de asociación"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"Expresiones regulares extendidas. Por defecto se filtra con expresiones "
+"regulares POSIX básicas"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr "Distinguir mayúsculas y minúsculas"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr "Comparar con URLs. Por defecto el filtro se basa en nombres de dominio"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"Tratar el fichero de filtro como una lista de máquinas a permitir. Por "
+"defecto actúa como una lista negra"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+"Puede ser un rango de IPs, un nombre de dominio o \".\" para cualquier "
+"máquina sin dominio"
+
+msgid "Configuration"
+msgstr "Configuración"
+
+msgid "Connection timeout"
+msgstr "Espera de conexión"
+
+msgid "Default deny"
+msgstr "Denegar por defecto"
+
+msgid "Enable Tinyproxy server"
+msgstr "Activar el servidor Tinyproxy"
+
+msgid "Error page"
+msgstr "Página de error"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "No se han podido obtener estadísticas de:"
+
+msgid "Filter by RegExp"
+msgstr "Filtrar por RegExp"
+
+msgid "Filter by URLs"
+msgstr "Filtrar por URLs"
+
+msgid "Filter case-sensitive"
+msgstr "Distinguir entre mayúsculas y minúsculas"
+
+msgid "Filter file"
+msgstr "Fichero de filtro"
+
+msgid "Filtering and ACLs"
+msgstr "Filtrado y ACLs"
+
+msgid "General settings"
+msgstr "Configuración general"
+
+msgid "Group"
+msgstr "Grupo"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+"FIchero con la plantilla HTML a usar para las peticiones de estadísticas"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "Fichero con la plantilla HTTP a usar cuando ocurra algún error"
+
+msgid "Header whitelist"
+msgstr "Cabeceras autorizadas"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr "Direcciones IP o rangos a los que se permite usar el servidor proxy"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"Lista de puertos permitidos al método CONNECT. Use 0 para todos los puertos"
+
+msgid "Listen address"
+msgstr "Dirección de escucha"
+
+msgid "Listen port"
+msgstr "Puerto de escucha"
+
+msgid "Log file"
+msgstr "Registro"
+
+msgid "Log file to use for dumping messages"
+msgstr "Fichero de volcado de mensajes"
+
+msgid "Log level"
+msgstr "Nivel de registro"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "Nivel de registro del proceso Tinyproxy"
+
+msgid "Max. clients"
+msgstr "Clientes máximos"
+
+msgid "Max. requests per server"
+msgstr "Peticiones máximas por servidor"
+
+msgid "Max. spare servers"
+msgstr "Procesos servidores máximos"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "Máximo de clientes conectados simultáneamente"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+"Peticiones máximas por proceso. Si se supera el proceso es arrancado de "
+"nuevo. Para ilimitados indique 0."
+
+msgid "Maximum number of prepared idle processes"
+msgstr "Máximo de procesos inactivos"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr "Segundos máximos que se tiene una conexión inactiva abierta"
+
+msgid "Min. spare servers"
+msgstr "Procesos servidores mínimos"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "Mínimo de procesos inactivos"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr "Procesos inactivos a arrancar cuando se lanza Tinyproxy"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr "Fichero plano con URLs o dominios a filtrar. Uno por línea"
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Privacy settings"
+msgstr "Configuración de privacidad"
+
+msgid "Reject access"
+msgstr "Rechazar acceso"
+
+msgid "Server Settings"
+msgstr "Configuración del servidor"
+
+msgid "Server limits"
+msgstr "Límites del servidor"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+"Nombres de cabeceras HTTP que se dejan pasar. el resto se descartan. Deje en "
+"blanco para desactivar el filtrado de cabeceras"
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "Puerto de escucha de peticiones"
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr "Nombre de máquina a usar en la cabecera HTTP \"Via\""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+"Dirección a la que se asocia Tinyproxy para peticiones de traspaso salientes"
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr "Direcciones de escucha de peticiones"
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr "Nombre de grupo en el que se ejecuta el proceso Tinyproxy"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+"Proxy superior a usar para llegar a la máquina destino. El formato es "
+"<code>dirección_puerto</code>"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr "Nombre de usuario con en el que se ejecuta el proceso Tinyproxy"
+
+msgid "Start spare servers"
+msgstr "Arrancar servidores libres"
+
+msgid "Statistics page"
+msgstr "Estadísticas"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Target host"
+msgstr "Máquina destino"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Estado de Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy es un proxy sin cache HTTP/HTTPS pequeño y rápido"
+
+msgid "Upstream Proxies"
+msgstr "Proxies superiores"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+"Las reglas de proxy superior definen qué servidores usar cuando se accede a "
+"ciertas direcciones IP o dominios."
+
+msgid "Use syslog"
+msgstr "Usar SysLog"
+
+msgid "User"
+msgstr "Usuario"
+
+msgid "Via hostname"
+msgstr "Nombre de máquina en \"Via\""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr "Escribe los mensajes de registro en SysLog en vez de en un fichero"
+
+msgid "X-Tinyproxy header"
+msgstr "Cabecera X-Tinyproxy"
+
+#~ msgid "Allow access from"
+#~ msgstr "Permitir acceso desde"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Encabezados permitidos de proxies anónimos"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Ligar tráfico de salida a la dirección"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Puertos permitidos para el método CONNECT"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = Deshabilitado, vacío = todos"
+
+#~ msgid "Error document"
+#~ msgstr "Error en documento"
+
+#~ msgid "Filter list"
+#~ msgstr "Lista de filtros"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtros de mayúsculas y minúsculas "
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "La Lista de Filtros es una lista blanca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtros extendido para expresiones regulares"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtrar URLs en vez de dominios"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escuchar en dirección"
+
+#~ msgid "Logfile"
+#~ msgstr "Logfile"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Número máximo de clientes"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Máximas peticiones por hilo"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Spare servers to start with"
+
+#~ msgid "Statistic document"
+#~ msgstr "Documento de estadística"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escribir al syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Tiempo agotado para la conexión"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor para Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Incluir IP del cliente"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Control de subida (upstream)"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy de subida (upstream)"
diff --git a/trunk/package/luci/po/es/transmission.po b/trunk/package/luci/po/es/transmission.po
new file mode 100644
index 00000000..9eeb2fb6
--- /dev/null
+++ b/trunk/package/luci/po/es/transmission.po
@@ -0,0 +1,299 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-21 22:06+0200\n"
+"PO-Revision-Date: 2012-08-26 10:47+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Velocidad de descarga alternativa"
+
+msgid "Alternative speed enabled"
+msgstr "Velocidad alternativa activada"
+
+msgid "Alternative speed time begin"
+msgstr "Hora de inicio de la velocidad alternativa"
+
+msgid "Alternative speed time day"
+msgstr "Día de la velocidad alternativa"
+
+msgid "Alternative speed time end"
+msgstr "Hora de fin de la velocidad alternativa"
+
+msgid "Alternative speed timing enabled"
+msgstr "Temporización alternativa de la velocidad activada"
+
+msgid "Alternative upload speed"
+msgstr "Velocidad de subida alternativa"
+
+msgid "Automatically start added torrents"
+msgstr "Arrancar automáticamente los torrents al añadirlos"
+
+msgid "Bandwidth settings"
+msgstr "Configuración del ancho de banda"
+
+msgid "Binding address IPv4"
+msgstr "Dirección IPv4 a asociar"
+
+msgid "Binding address IPv6"
+msgstr "Dirección IPv6 a asociar"
+
+msgid "Block list enabled"
+msgstr "Lista de bloques activada"
+
+msgid "Blocklist URL"
+msgstr "URL de la lista de bloques"
+
+msgid "Blocklists"
+msgstr "Listas de bloques"
+
+msgid "Cache size in MB"
+msgstr "Tamaño de la caché en MB"
+
+msgid "Config file directory"
+msgstr "Directorio del fichero de configuración"
+
+msgid "DHT enabled"
+msgstr "DHT activado"
+
+msgid "Debug"
+msgstr "Depurar"
+
+msgid "Download directory"
+msgstr "Directorio de descargas"
+
+msgid "Download queue enabled"
+msgstr "Cola de descargas activada"
+
+msgid "Download queue size"
+msgstr "Tamaño de la cola de descargas"
+
+msgid "Enable watch directory"
+msgstr "Activar directorio a observar"
+
+msgid "Enabled"
+msgstr "Activado"
+
+msgid "Encryption"
+msgstr "Encriptado"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Fast"
+msgstr "Rápido"
+
+msgid "Files and Locations"
+msgstr "Ficheros y posiciones"
+
+msgid "Forced"
+msgstr "Forzado"
+
+msgid "Full"
+msgstr "Lleno"
+
+msgid "Global peer limit"
+msgstr "Límite global de máquinas"
+
+msgid "Global settings"
+msgstr "Configuración global"
+
+msgid "Idle seeding limit"
+msgstr "Límite de sembrado en vacío"
+
+msgid "Idle seeding limit enabled"
+msgstr "Límite de sembrado en vacío activado"
+
+msgid "Incomplete directory"
+msgstr "Directorio incompleto"
+
+msgid "Incomplete directory enabled"
+msgstr "Directorio incompleto activado"
+
+msgid "Info"
+msgstr "Información"
+
+msgid "LPD enabled"
+msgstr "LPD activado"
+
+msgid "Lazy bitfield enabled"
+msgstr "Lazy bitfield activado"
+
+msgid "Message level"
+msgstr "Nivel de mensajes"
+
+msgid "Miscellaneous"
+msgstr "Varios"
+
+msgid "None"
+msgstr "Ninguno"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"Número/en bits. Empiece con 0 y por cada día que quiera que se active el "
+"programados sume: Para domingo - 1, lunes - 2, martes - 4, miércoles - 8, "
+"jueves - 16, viernes - 32, sábado - 64"
+
+msgid "Off"
+msgstr "Apagado"
+
+msgid "Open Web Interface"
+msgstr "Interfaz de red abierta"
+
+msgid "PEX enabled"
+msgstr "PEX activado"
+
+msgid "Peer Port settings"
+msgstr "Configuración de puertos"
+
+msgid "Peer congestion algorithm"
+msgstr "Algoritmo de congestión"
+
+msgid "Peer limit per torrent"
+msgstr "Límite por torrent"
+
+msgid "Peer port"
+msgstr "Puerto"
+
+msgid "Peer port random high"
+msgstr "Puerto más alto"
+
+msgid "Peer port random low"
+msgstr "Puerto más bajo"
+
+msgid "Peer port random on start"
+msgstr "Puerto aleatorio al arrancar"
+
+msgid "Peer settings"
+msgstr "Configuración de peer"
+
+msgid "Peer socket tos"
+msgstr "Peer socket tos"
+
+msgid "Port forwarding enabled"
+msgstr "Traspaso de puertos activado"
+
+msgid "Preferred"
+msgstr "Preferente"
+
+msgid "Prefetch enabled"
+msgstr "Activar prefetch"
+
+msgid "Queue stalled enabled"
+msgstr "Activar bloqueo de cola"
+
+msgid "Queue stalled minutes"
+msgstr "Minutos de bloqueo de cola"
+
+msgid "Queueing"
+msgstr "Colas"
+
+msgid "RPC URL"
+msgstr "URL RPC"
+
+msgid "RPC authentication required"
+msgstr "Autentificación RPC obligatoria"
+
+msgid "RPC bind address"
+msgstr "Dirección de asociación RPC"
+
+msgid "RPC enabled"
+msgstr "RPC activado"
+
+msgid "RPC password"
+msgstr "Contraseña RPC"
+
+msgid "RPC port"
+msgstr "Puerto RPC"
+
+msgid "RPC settings"
+msgstr "Configuración RPC"
+
+msgid "RPC username"
+msgstr "Nombre de usuario RPC"
+
+msgid "RPC whitelist"
+msgstr "Lista blanca RPC"
+
+msgid "RPC whitelist enabled"
+msgstr "Activar listas blancas RPC"
+
+msgid "Ratio limit"
+msgstr "Límite de ratio"
+
+msgid "Ratio limit enabled"
+msgstr "Límite de ratio activado"
+
+msgid "Rename partial files"
+msgstr "Renombrar ficheros parciales"
+
+msgid "Run daemon as user"
+msgstr "Ejecutar demonio como usuario"
+
+msgid "Scheduling"
+msgstr "Programación"
+
+msgid "Scrape paused torrents enabled"
+msgstr "Activar scrape de torrents en pausa"
+
+msgid "Script torrent done enabled"
+msgstr "Activar script de fin de torrent"
+
+msgid "Script torrent done filename"
+msgstr "Nombre de fichero del script"
+
+msgid "Seed queue enabled"
+msgstr "Cola de seed activada"
+
+msgid "Seed queue size"
+msgstr "Tamaño máximo de la cola de seed"
+
+msgid "Speed limit down"
+msgstr "Velocidad mínima"
+
+msgid "Speed limit down enabled"
+msgstr "Velocidad mínima activada"
+
+msgid "Speed limit up"
+msgstr "Velocidad máxima"
+
+msgid "Speed limit up enabled"
+msgstr "Velocidad máxima activada"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"Configuración. El demonio Transmission es un cliente de bittorrent simple."
+
+msgid "Trash original torrent files"
+msgstr "Eliminar los ficheros torrent originales"
+
+msgid "Upload slots per torrent"
+msgstr "Ranuras de subida por torrent"
+
+msgid "Watch directory"
+msgstr "Directorio a vigilar"
+
+msgid "in minutes from midnight"
+msgstr "en minutos para la media noche"
+
+msgid "preallocation"
+msgstr "precolocación"
+
+msgid "uTP enabled"
+msgstr "uTP activado"
diff --git a/trunk/package/luci/po/es/upnp.po b/trunk/package/luci/po/es/upnp.po
new file mode 100644
index 00000000..79a28009
--- /dev/null
+++ b/trunk/package/luci/po/es/upnp.po
@@ -0,0 +1,165 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-10-07 16:11+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Los ACL especifican qué puertos externos pueden ser redirigidos hacia qué "
+"direcciones y puertos internas"
+
+msgid "Action"
+msgstr "Acción"
+
+msgid "Active UPnP Redirects"
+msgstr "Redirecciones UPnP activas"
+
+msgid "Advanced Settings"
+msgstr "Configuración avanzada"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Permitir añadir redirecciones sólo a IPs que lo soliciten"
+
+msgid "Announced model number"
+msgstr "Número de modelo declarado"
+
+msgid "Announced serial number"
+msgstr "Número de serie declarado"
+
+msgid "Clean rules interval"
+msgstr "Intervalo de borrado de reglas"
+
+msgid "Clean rules threshold"
+msgstr "Umbral de borrado de reglas"
+
+msgid "Client Address"
+msgstr "Dirección del cliente"
+
+msgid "Client Port"
+msgstr "Puerto del cliente"
+
+msgid "Collecting data..."
+msgstr "Un momento..."
+
+msgid "Comment"
+msgstr "Comentario"
+
+msgid "Delete Redirect"
+msgstr "Borrar redirección"
+
+msgid "Device UUID"
+msgstr "UUID del dispositivo"
+
+msgid "Downlink"
+msgstr "Enlace para bajada"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Activar la funcionalidad NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Activar la funcionalidad UPnP"
+
+msgid "Enable additional logging"
+msgstr "Activar registro adicional"
+
+msgid "Enable secure mode"
+msgstr "Habilitar modo seguro"
+
+msgid "External Port"
+msgstr "Puerto externo"
+
+msgid "External ports"
+msgstr "Puertos externos"
+
+msgid "General Settings"
+msgstr "Configuración general"
+
+msgid "Internal addresses"
+msgstr "Direcciones internas"
+
+msgid "Internal ports"
+msgstr "Puertos internos"
+
+msgid "MiniUPnP ACLs"
+msgstr "ACLs MiniUPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Configuración MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Intervalo de notificación"
+
+msgid "Port"
+msgstr "Puerto"
+
+msgid "Presentation URL"
+msgstr "URL de presentación"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Escribir información de depuración extra en el registro del sistema"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Informar del tiempo activo del sistema en vez de el del demonio"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Arrancar servicio UPnP y NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Sin redirecciones activas."
+
+msgid "UPNP"
+msgstr "UPnP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP permite que los puestos de la red local configuren automáticamente el "
+"router."
+
+msgid "UPnP lease file"
+msgstr "Tiempo de cesión UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Plug & Play universal"
+
+msgid "Uplink"
+msgstr "Enlace de subida"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Valor en KBytes/s (sólo informativo)"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP permite que los puestos de la red local configuren automáticamente el "
+#~ "router."
+
+#~ msgid "enable"
+#~ msgstr "activar"
+
+#~ msgid "Log output"
+#~ msgstr "Loguear salida"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPNP sólo deberia habilitarse si es abasolutamente necesario ya que puede "
+#~ "comprometer la seguridad de su red."
diff --git a/trunk/package/luci/po/es/ushare.po b/trunk/package/luci/po/es/ushare.po
new file mode 100644
index 00000000..e8422b95
--- /dev/null
+++ b/trunk/package/luci/po/es/ushare.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-08-25 09:23+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Directorios de contenido"
+
+msgid "Disable telnet console"
+msgstr "Inhabilitar consola telnet"
+
+msgid "Disable webinterface"
+msgstr "Inhabilitar interfaz web"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid "Options"
+msgstr "Opciones"
+
+msgid "Servername"
+msgstr "Nombre para el servidor"
+
+msgid "Settings"
+msgstr "Configuración"
+
+msgid "Username"
+msgstr "Nombre de usuario"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare es un servidor UPnP (TM) A/V y DLNA. Implementa el componente del "
+"servidor que proporciona a los dispositivos UPnP la información disponible "
+"en los ficheros multimedia."
diff --git a/trunk/package/luci/po/es/uvc_streamer.po b/trunk/package/luci/po/es/uvc_streamer.po
new file mode 100644
index 00000000..ed165672
--- /dev/null
+++ b/trunk/package/luci/po/es/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-15 23:39+0200\n"
+"Last-Translator: jarre2 <jarre2_es_jose@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Cuadros por segundo"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Resolución"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Ajustes"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Hacer Streaming con Webcam"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configure una webcam compatible con Linux-UVC Diríjase con su navegador a: "
+"<a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/es/vnstat.po b/trunk/package/luci/po/es/vnstat.po
new file mode 100644
index 00000000..b91e1bb5
--- /dev/null
+++ b/trunk/package/luci/po/es/vnstat.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-07 15:08+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: German\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configuration"
+msgstr "Configuración"
+
+msgid "Daily traffic"
+msgstr "Tráfico diario"
+
+msgid "Graphs"
+msgstr "Gráficas"
+
+msgid "Hourly traffic"
+msgstr "Tráfico por horas"
+
+msgid "Monitor selected interfaces"
+msgstr "Monitorizar las interfaces seleccionadas"
+
+msgid "Monthly traffic"
+msgstr "Tráfico mensual"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Todavía no se ha configurado ninguna base de datos. Vaya a la configuración "
+"de VnStat y habilite la monitorización para una o más interfaces."
+
+msgid "Restart VnStat"
+msgstr "Rearrancar VnStat"
+
+msgid "Summary display"
+msgstr "Mostrar Resumen"
+
+msgid "Top 10 display"
+msgstr "Mostrar Top 10"
+
+msgid "Update »"
+msgstr "Actualizar »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Graficas de VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Monitor de trafico de VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat es un monitor de tráfico de red para Linux que mantiene un registro "
+"del trafico de red de la interfaz o interfaces seleccionadas."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "El servicio VnStat ha sido reiniciado"
diff --git a/trunk/package/luci/po/es/voice_core.po b/trunk/package/luci/po/es/voice_core.po
new file mode 100644
index 00000000..74e2c23c
--- /dev/null
+++ b/trunk/package/luci/po/es/voice_core.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-07-28 23:17+0200\n"
+"Last-Translator: Daniel <danips@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Teléfonos"
+
+msgid "Voice"
+msgstr "Voz"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/es/voice_diag.po b/trunk/package/luci/po/es/voice_diag.po
new file mode 100644
index 00000000..f2f4da27
--- /dev/null
+++ b/trunk/package/luci/po/es/voice_diag.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-16 00:58+0200\n"
+"Last-Translator: Jose <jarre2_es_jose@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Los tipos de diagnósticos disponibles en el dispositivo dependen de los "
+"módulos que ha instalado."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"En este menú hay opciones que permite realizar pruebas de configuración y "
+"funcionamiento de las operaciones de voz en su sistema. Estas opciones se "
+"conocen como diagósticos."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/es/watchcat.po b/trunk/package/luci/po/es/watchcat.po
new file mode 100644
index 00000000..c1f58fe3
--- /dev/null
+++ b/trunk/package/luci/po/es/watchcat.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-23 23:07+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "Espera para forzar reinicio"
+
+msgid "Host address to ping"
+msgstr "Dirección de máquina a la que hacer ping"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Cada cuánto comprobar la conexión a internet. Por defecto son segundos, pero "
+"puede añadir 'm' para minutos, 'h' para horas o 'd' para días"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"En modo periódico define el período de rearranque. En modo internet define "
+"el mayor período de tiempo sin acceso a internet antes de provocar un "
+"reinicio. Por defecto son segundos, pero puede añadir 'm' para minutos, 'h' "
+"para horas o 'd' para días"
+
+msgid "Operating mode"
+msgstr "Modo de operar"
+
+msgid "Period"
+msgstr "Período"
+
+msgid "Ping host"
+msgstr "Máquina a la que hacer ping"
+
+msgid "Ping period"
+msgstr "Período de ping"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat permite configurar un reinicio periódico si la conexión a internet "
+"si pierde durante un cierto tiempo."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"Watchcat provocará por defecto un reinicio suave. Poniendo un valor mayor "
+"que cero se provocará un reinicio completo si el anterior ha fallado"
diff --git a/trunk/package/luci/po/es/wol.po b/trunk/package/luci/po/es/wol.po
new file mode 100644
index 00000000..f5bcf6bf
--- /dev/null
+++ b/trunk/package/luci/po/es/wol.po
@@ -0,0 +1,57 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2012-08-22 21:41+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Propagar en todas las interfaces"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Elija la máquina a despertar o introduzca su dirección MAC"
+
+msgid "Host to wake up"
+msgstr "Máquina a despertar"
+
+msgid "Network interface to use"
+msgstr "Interfaz de red a utilizar"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"A veces, sólo se inicia una de las dos herramientas. Si una falla, intente "
+"con la otra"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Especifica la interfaz donde se envían los paquetes WoL"
+
+msgid "Starting WoL utility:"
+msgstr "Iniciando utilidad WoL:"
+
+# Wake on LAN es un término habitualmente utilizado en el español para referirse a esa misma función de encendido remoto a través de la red
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LAN permite arrancar ordenadores conectados en una red local de "
+"forma remota."
+
+msgid "Wake up host"
+msgstr "Despertar máquina"
+
+msgid "WoL program"
+msgstr "Programa WoL"
diff --git a/trunk/package/luci/po/es/wshaper.po b/trunk/package/luci/po/es/wshaper.po
new file mode 100644
index 00000000..f562760d
--- /dev/null
+++ b/trunk/package/luci/po/es/wshaper.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-16 01:00+0200\n"
+"PO-Revision-Date: 2012-09-03 18:57+0200\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr "Enlace de bajada"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Ancho de banda de bajada en Kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Máquina o red en notación CIDR."
+
+msgid "Interface"
+msgstr "Interfaz"
+
+msgid "Low priority destination ports"
+msgstr "Puertos de destino de prioridad baja"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Máquinas de prioridad baja (destino)"
+
+msgid "Low priority hosts (Source)"
+msgstr "Máquinas de prioridad baja (origen)"
+
+msgid "Low priority source ports"
+msgstr "Puertos de origen de prioridad baja"
+
+msgid "Uplink"
+msgstr "Enlace de salida"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Ancho de banda de subida en Kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Configuración de Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper modela el tráfico para asegurar latencias bajas al tráfico "
+"interactivo incluso cuando la conexión a Internet esté muy saturada."
diff --git a/trunk/package/luci/po/fr/ahcp.po b/trunk/package/luci/po/fr/ahcp.po
new file mode 100644
index 00000000..11635180
--- /dev/null
+++ b/trunk/package/luci/po/fr/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-11-06 13:06+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Serveur AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP est un protocole d'auto-configuration pour les réseaux IPv6 et double-"
+"pile IPv6/IPv4, destiné à remplacer la recherche de routeur et le service "
+"DHCP sur des réseaux où il est difficile, voire impossible de configurer un "
+"tel serveur pour tous les domaines de diffusion au niveau lien, par exemple "
+"pour des réseaux ad-hoc mobiles."
+
+msgid "Active AHCP Leases"
+msgstr "Baux AHCP actifs"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Advanced Settings"
+msgstr "Paramètres avancés"
+
+msgid "Age"
+msgstr "Age"
+
+msgid "Announced DNS servers"
+msgstr "Serveurs DNS publiés"
+
+msgid "Announced NTP servers"
+msgstr "Serveurs NTP publiés"
+
+msgid "Announced prefixes"
+msgstr "Préfixes publiés"
+
+msgid "Collecting data..."
+msgstr "Récupération des données…"
+
+msgid "Forwarder"
+msgstr "Transmetteur"
+
+msgid "General Setup"
+msgstr "Paramètres principaux"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 et IPv6"
+
+msgid "IPv4 only"
+msgstr "IPv4 seulement"
+
+msgid "IPv6 only"
+msgstr "IPv6 seulement"
+
+msgid "Lease directory"
+msgstr "Répertoire d'un bail"
+
+msgid "Lease validity time"
+msgstr "Date de validité d'un bail"
+
+msgid "Log file"
+msgstr "Fichier journal"
+
+msgid "Multicast address"
+msgstr "Adresse multidiffusion"
+
+msgid "Operation mode"
+msgstr "Mode de fonctionnement"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Famille de protocole"
+
+msgid "Served interfaces"
+msgstr "Interfaces gérés"
+
+msgid "Server"
+msgstr "Serveur"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Décrit les serveurs NTP IPv4 et IPv6 publiés"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Décrit les serveurs de noms IPv4 et IPv6 publiés"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Décrit les préfixes réseaux IPv4 et IPv6 publiés en notation CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "Le service AHCP n'est pas en fonctionnement."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Le service AHCP est en fonctionnement avec l'ID s."
+
+msgid "There are no active leases."
+msgstr "Il n'y a aucun bail actif."
+
+msgid "Unique ID file"
+msgstr "Fichier de l'ID unique"
diff --git a/trunk/package/luci/po/fr/asterisk.po b/trunk/package/luci/po/fr/asterisk.po
new file mode 100644
index 00000000..75c1d38e
--- /dev/null
+++ b/trunk/package/luci/po/fr/asterisk.po
@@ -0,0 +1,569 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-11-23 22:34+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Paramètres généraux d'Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Répertoire AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Mes les sons enregistrés en cache pendant l'enregistrement"
+
+#~ msgid "Debug Level"
+#~ msgstr "Niveau de déboguage"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Désactiver certaines alertes"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Créer une image-core en cas de crash"
+
+#~ msgid "High Priority"
+#~ msgstr "Priorité haute"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Initialise le chiffrage"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Utiliser un délai interne"
+
+#~ msgid "Log directory"
+#~ msgstr "Répertoire des journaux"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Nombre maximum d'appels autorisés"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Charge maximum jusqu'à laquelle on accepte de nouveaux appels"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Désactiver les couleurs de la console"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Répertoire de cache des ficihers-sons"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Exécuté avec ce groupe"
+
+#~ msgid "The User to run as"
+#~ msgstr "Exécuté avec cet utilisateur"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Répertoire de stockage du répondeur"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Préfixer le « UniquID » avec le nom du système"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "Construire des chemins de traduction via SLINEAR, pas directement"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Transmettre le silence SLINEAR lors de l'enregistrement d'un canal"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Niveau de verbosité"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Section du plan de numérotation"
+
+#~ msgid "include"
+#~ msgstr "Inclure"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Extension du plan de numérotation"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Paramètres généraux du plan de numérotation"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Permettre le transfert"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Effacer les variables globales"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Règles d'aiguillage pour la conférence"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Règles d'aiguillage liées au temps"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Règles d'aiguillage de la messagerie vocale"
+
+#~ msgid "Match International prefix"
+#~ msgstr "Préfixe correspondant à l'international"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Préfixe (0) à ajouter à/retirer d'un numéro international"
+
+#~ msgid "localzone"
+#~ msgstr "zone locale"
+
+#~ msgid "Match plan"
+#~ msgstr "Règle de correspondance"
+
+#~ msgid "Connection to use"
+#~ msgstr "Connexion à utiliser"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "Touche de transfert en aveugle"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Touche pour déconnecter un appel"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Touche pour parquer un appel"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Capacité de mise en parking"
+
+#~ msgid "ADSI Park"
+#~ msgstr "Parking ADSI"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "Délai max d'un transfert programmé (secondes)"
+
+#~ msgid "Name of call context for parking"
+#~ msgstr "Nom du contexte d'appel pour une mise en parking"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Fichier-son à jouer aux appelants mis en parking"
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr ""
+#~ "Durée max (en ms) entre les chiffres pour l'activation d'une commande"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Méthode pour trouver une place de parking"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Jouer une tonalité de courtoisie à"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Activer la mise en parking"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Durée de mise en parking (secondes)"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Attente en secondes entre les chiffres Lors d'un transfert"
+
+#~ msgid "sound when attended transfer is complete"
+#~ msgstr "Son joué quand un transfert programmé est effectué"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "Son joué quand nu transfert programmé rate"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Relit la configuration matérielle"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Méthode de redémarrage"
+
+#~ msgid "Parameter"
+#~ msgstr "Paramètre"
+
+#~ msgid "Option type"
+#~ msgstr "Type d'option"
+
+#~ msgid "User name"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Paramètres généraux du protocole IAX"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Codecs autorisés"
+
+#~ msgid "Static"
+#~ msgstr "Statique"
+
+#~ msgid "Write Protect"
+#~ msgstr "Protection contre l'écriture"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Conférence « Meetme »"
+
+#~ msgid "Admin PIN"
+#~ msgstr "ID d'administrateur"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "Code de conférence"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Options générales de conférence « Meetme »"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Nombre de buffers audio de 20 ms à utiliser"
+
+#~ msgid "Modules"
+#~ msgstr "Modules"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Application de réception d'alarme"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Application d'authentification"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "S'assure qu'Asterisk ne sauve pas le CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Vérifie que le canal est libre"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Écoute sur n'importe quel canal"
+
+#~ msgid "Database access functions"
+#~ msgstr "Fonctions d'accès aux bases de données"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Application de numérotation"
+
+#~ msgid "Virtual Dictation Machine Application"
+#~ msgstr "Application de dictaphone virtuel"
+
+#~ msgid "Dump channel variables Application"
+#~ msgstr "Application de copie des variables d'un canal"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Application de simple écho"
+
+#~ msgid "ENUM Lookup"
+#~ msgstr "Résolution d'un ENUM"
+
+#~ msgid "Reevaluates strings"
+#~ msgstr "Ré-évaluer les chaînes"
+
+#~ msgid "Executes applications"
+#~ msgstr "Lance les applications"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "Interface d'application SVI externe"
+
+#~ msgid "Fork The CDR into 2 seperate entities"
+#~ msgstr "Dupliquer le CDR en deux entités séparées"
+
+#~ msgid "Get ADSI CPE ID"
+#~ msgstr "Obtenir le « ADSI CPE ID »"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Fonctions de gestion des groupes"
+
+#~ msgid "Encode and Stream via icecast and ices"
+#~ msgstr "Coder et diffuser via icecast et ices"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Application d'envoi d'image"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr "Rechercher le nom de l'appelant dans la base locale"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Macros d'extension"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Une simple application mathématique"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "Application de signature MD5"
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Enregistre un appelle et mixe le son pendant l'enregistrement"
+
+#~ msgid "Call Parking and Announce Application"
+#~ msgstr "Application de mise en parking d'appel et annonce"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Application de simple écoute"
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Nécessite d'entrer un numéro de téléphone"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "Véritable sérialisation des appels"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Application de lecture d'une variable"
+
+#~ msgid "Read in a file"
+#~ msgstr "Lire dans un fichier"
+
+#~ msgid "Realtime Data Lookup/Rewrite"
+#~ msgstr "Recherche/ré-écriture de données en temps-réel"
+
+#~ msgid "Trivial Record Application"
+#~ msgstr "Application de simple enregistrement"
+
+#~ msgid "Say time"
+#~ msgstr "Dis l'heure"
+
+#~ msgid "Send DTMF digits Application"
+#~ msgstr "Application d'envoi de chiffres en DTMF"
+
+#~ msgid "Send Text Applications"
+#~ msgstr "Applications d'envoi de texte"
+
+#~ msgid "Set CallerID Application"
+#~ msgstr "Application de positionnement de l'identifiant de l'appelant"
+
+#~ msgid "load => .so ; Set CallerID Name"
+#~ msgstr ""
+#~ "charger => .so ; Positionner le nom dans l'identifiant de l'appelant"
+
+#~ msgid "load => .so ; Set CallerID Number"
+#~ msgstr ""
+#~ "charger => .so ; Positionner le numéro dans l'identifiant de l'appelant"
+
+#~ msgid "Set RDNIS Number"
+#~ msgstr "Positionner le numéro RDNIS"
+
+#~ msgid "Set ISDN Transfer Capability"
+#~ msgstr "Activer la possibilité de transfert RNIS"
+
+#~ msgid "SMS/PSTN handler"
+#~ msgstr "Gestionnaire SMS/RTC"
+
+#~ msgid "Hangs up the requested channel"
+#~ msgstr "Raccroche le canal demandé"
+
+#~ msgid "Stack Routines"
+#~ msgstr "Empile les routines"
+
+#~ msgid "Generic System() application"
+#~ msgstr "Application générique System()"
+
+#~ msgid "Playback with Talk Detection"
+#~ msgstr "Jouer un son avec la détection de parole"
+
+#~ msgid "Interface Test Application"
+#~ msgstr "Application de test d'interface"
+
+#~ msgid "Transfer"
+#~ msgstr "Transfert"
+
+#~ msgid "Send URL Applications"
+#~ msgstr "Applications d'envois d'URL"
+
+#~ msgid "Send verbose output"
+#~ msgstr "Envoyer une sortie détaillée"
+
+#~ msgid "Voicemail"
+#~ msgstr "Répondeur"
+
+#~ msgid "Wait For Silence Application"
+#~ msgstr "Application d'attente de silence"
+
+#~ msgid "Session Initiation Protocol (SIP)"
+#~ msgstr "Session Initiation Protocol (SIP)"
+
+#~ msgid "Adaptive Differential PCM Coder/Decoder"
+#~ msgstr "Codec PCM différentiel adaptatif (ADPCM)"
+
+#~ msgid "A-law Coder/Decoder"
+#~ msgstr "Codec loi-A"
+
+#~ msgid "A-law and Mulaw direct Coder/Decoder"
+#~ msgstr "Codec loi-A et loi-Mu directs"
+
+#~ msgid "ITU G.726-32kbps G726 Transcoder"
+#~ msgstr "Transcodeur G726 (ITU G.726 32 kbit/s)"
+
+#~ msgid "GSM/PCM16 (signed linear) Codec Translation"
+#~ msgstr "Codec de traduction GSM/PCM16 (linéaire signé)"
+
+#~ msgid "Speex/PCM16 (signed linear) Codec Translator"
+#~ msgstr "Codec de traduction Speex/PCM16 (linéaire signé)"
+
+#~ msgid "Mu-law Coder/Decoder"
+#~ msgstr "Codec loi-Mu"
+
+#~ msgid "Sun Microsystems AU format (signed linear)"
+#~ msgstr "Format Sun Microsystems AU (linéaire signé)"
+
+#~ msgid "G.723.1 Simple Timestamp File Format"
+#~ msgstr "Format de fichier G.723.1 à horodatage simple"
+
+#~ msgid "Raw G.726 (16/24/32/40kbps) data"
+#~ msgstr "Données brutes G.726 (16/24/32/40 kbit/s)"
+
+#~ msgid "Raw G729 data"
+#~ msgstr "Données brutes G729"
+
+#~ msgid "Raw GSM data"
+#~ msgstr "Données brutes GSM"
+
+#~ msgid "Raw h263 data"
+#~ msgstr "Données brutes h263"
+
+#~ msgid "JPEG (Joint Picture Experts Group) Image"
+#~ msgstr "Image JPEG (Joint Picture Experts Group)"
+
+#~ msgid "Raw uLaw 8khz Audio support (PCM)"
+#~ msgstr "Gestion de l'audio en loi-µ 8 kHz brute (PCM)"
+
+#~ msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
+#~ msgstr "Charger => .so ; Gestion de l'audio en loi-A brute PCM 8 kHz"
+
+#~ msgid "Raw Signed Linear Audio support (SLN)"
+#~ msgstr "Gestion de l'audio en linéaire signé brut (SLN)"
+
+#~ msgid "Dialogic VOX (ADPCM) File Format"
+#~ msgstr "Format de fichier Dialogic VOX (ADPCM)"
+
+#~ msgid "Microsoft WAV format (8000hz Signed Line"
+#~ msgstr "Format Microsoft WAV (8 kHz linéaire signé)"
+
+#~ msgid "Microsoft WAV format (Proprietary GSM)"
+#~ msgstr "Format Microsoft WAV (GSM propriétaire)"
+
+#~ msgid "Caller ID related dialplan functions"
+#~ msgstr "Fonctions d'aiguillage des appels liées à l'identifiant d'appel"
+
+#~ msgid "ENUM Functions"
+#~ msgstr "Fonctions ENUM"
+
+#~ msgid "URI encoding / decoding functions"
+#~ msgstr "Fonctions de codage/décodage des URI"
+
+#~ msgid "Asterisk Extension Language Compiler"
+#~ msgstr "Compilateur du langage d'extension d'Asterisk"
+
+#~ msgid "Text Extension Configuration"
+#~ msgstr "Configuration de l'extension Texte"
+
+#~ msgid "load => .so ; Builtin dialplan functions"
+#~ msgstr "charger => .so ; fonctions natives d'aiguillages des appels"
+
+#~ msgid "Outgoing Spool Support"
+#~ msgstr "Gestion d'un spool sortant"
+
+#~ msgid "Wil Cal U (Auto Dialer)"
+#~ msgstr "Wil Cal U (composeur automatique)"
+
+#~ msgid "MySQL Config Resource"
+#~ msgstr "Ressource de configuration de MySQL"
+
+#~ msgid "ODBC Config Resource"
+#~ msgstr "Ressource de configuration d'ODBC"
+
+#~ msgid "PGSQL Module"
+#~ msgstr "Module PGSQL"
+
+#~ msgid "Cryptographic Digital Signatures"
+#~ msgstr "Signatures de chiffrage numérique"
+
+#~ msgid "Call Parking Resource"
+#~ msgstr "Ressource de mise en parking des appels"
+
+#~ msgid "Call Monitoring Resource"
+#~ msgstr "Ressource de supervision des appels"
+
+#~ msgid "Music On Hold Resource"
+#~ msgstr "Ressource de mise en attente musicale"
+
+#~ msgid "ODBC Resource"
+#~ msgstr "Ressource ODBC"
+
+#~ msgid "SMDI Module"
+#~ msgstr "Module SMDI"
+
+#~ msgid "SNMP Module"
+#~ msgstr "Module SNMP"
+
+#~ msgid "Music On Hold"
+#~ msgstr "Mise en attente musicale"
+
+#~ msgid "Application"
+#~ msgstr "Application"
+
+#~ msgid "Directory of Music"
+#~ msgstr "Répertoire sonore"
+
+#~ msgid "Random Play"
+#~ msgstr "morceau choisi aléatoirement"
+
+#~ msgid "DTMF mode"
+#~ msgstr "Mode DTMF"
+
+#~ msgid "Primary domain identity for From: headers"
+#~ msgstr "Identité du domaine primaire pour les entêtes « From: »"
+
+#~ msgid "From user (required by many SIP providers)"
+#~ msgstr "Utilisateur « From » (requis par de nombreux fournisseurs SIP)"
+
+#~ msgid "Allow Insecure for"
+#~ msgstr "Autoriser le mode non sécurisé pour"
+
+#~ msgid "Mailbox for MWI"
+#~ msgstr "Boîte aux lettres pour MWI"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "NAT entre le téléphone et Asterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "Vérifier les « tags » dans les entêtes"
+
+#~ msgid "Reply Timeout (ms) for down connection"
+#~ msgstr "Délai de réponse (en ms) indiquant une connexion tombée"
+
+#~ msgid "Register connection"
+#~ msgstr "Connexion au registre"
+
+#~ msgid "Client Type"
+#~ msgstr "Type de client"
+
+#~ msgid "Username"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Section sipgeneral"
+#~ msgstr "Section générale SIP"
+
+#~ msgid "Allow codecs"
+#~ msgstr "Codecs autorisés"
+
+#~ msgid "SIP realm"
+#~ msgstr "Domaine SIP"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "Options générales de la messagerie vocale"
+
+#~ msgid "From Email address of server"
+#~ msgstr "Adresse de courrier électronique source du serveur"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "Boîtes de messagerie vocale"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "Courriel contenant une pièce-jointe"
+
+#~ msgid "Email"
+#~ msgstr "Courriel"
+
+#~ msgid "Display Name"
+#~ msgstr "Nom affiché"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "zone"
+#~ msgstr "zone"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Paramètres de la zone Voix"
+
+#~ msgid "Message Format"
+#~ msgstr "Format de message"
diff --git a/trunk/package/luci/po/fr/base.po b/trunk/package/luci/po/fr/base.po
new file mode 100644
index 00000000..54851a54
--- /dev/null
+++ b/trunk/package/luci/po/fr/base.po
@@ -0,0 +1,4107 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2013-12-22 17:11+0200\n"
+"Last-Translator: goofy <pierre.gaufillet@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(fenêtre de %d minutes, intervalle de %d secondes)"
+
+msgid "(%s available)"
+msgstr "(%s disponible)"
+
+msgid "(empty)"
+msgstr "(vide)"
+
+msgid "(no interfaces attached)"
+msgstr "(pas d'interface connectée)"
+
+msgid "-- Additional Field --"
+msgstr "-- Champ Supplémentaire --"
+
+msgid "-- Please choose --"
+msgstr "-- Choisir --"
+
+msgid "-- custom --"
+msgstr "-- autre --"
+
+msgid "1 Minute Load:"
+msgstr "Charge sur 1 minute :"
+
+msgid "15 Minute Load:"
+msgstr "Charge sur 15 minutes :"
+
+msgid "5 Minute Load:"
+msgstr "Charge sur 5 minutes :"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "Port des requêtes <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "Port du serveur <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"Les serveurs <abbr title=\"Domain Name System\">DNS</abbr> seront<br/"
+">interrogés dans l'ordre du fichier de résolution"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Adresse <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "Passerelle <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "Masque réseau <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"Adresse ou réseau <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> "
+"(notation CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "Passerelle <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr ""
+"Configuration des <abbr title=\"Diode Électro-Luminescente\">DEL</abbr>s"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Nom de la <abbr title=\"Diode Électro-Luminescente\">DEL</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Adresse <abbr title=\"Media Access Control\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"Nombre de baux <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> maximum"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"taille maximum des paquets <abbr title=\"Extension Mechanisms for Domain "
+"Name System\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "Maximum de requêtes concurrentes"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Gestion du mode AR"
+
+msgid "ARP retry threshold"
+msgstr "Niveau de ré-essai ARP"
+
+msgid "ATM Bridges"
+msgstr "Ponts ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+"Identifiant de canal virtuel (<abbr title=\"Virtual Channel Idendifier"
+"\">VCI</abbr>) ATM"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+"Identifiant de chemin virtuel (<abbr title=\"Virtual Path Idendifier\">VPI</"
+"abbr>) ATM"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Les ponts ATM présentent l'Ethernet encapsulé dans des connexions AAL5 comme "
+"des interfaces réseau virtuelles Linux qui peuvent être utilisées avec DHCP "
+"ou PPP pour se connecter au réseau du fournisseur d'accès."
+
+msgid "ATM device number"
+msgstr "Numéro de périphérique ATM"
+
+msgid "Access Concentrator"
+msgstr "Concentrateur d'accès"
+
+msgid "Access Point"
+msgstr "Point d'accès"
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Actions"
+msgstr "Actions"
+
+msgid "Activate this network"
+msgstr "Activer ce réseau"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Routes <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> actives"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Routes <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> actives"
+
+msgid "Active Connections"
+msgstr "Connexions actives"
+
+msgid "Active DHCP Leases"
+msgstr "Bails DHCP actifs"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Bails DHCPv6 actifs"
+
+msgid "Ad-Hoc"
+msgstr "Ad-hoc"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Ajouter le suffixe du domaine local aux noms résolus d'après le fichier hosts"
+
+msgid "Add new interface..."
+msgstr "Ajout d'une nouvelle interface..."
+
+msgid "Additional Hosts files"
+msgstr "Fichiers hosts supplémetaires"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Address to access local relay bridge"
+msgstr "Adresse pour accéder au pont-relais local"
+
+msgid "Administration"
+msgstr "Administration"
+
+msgid "Advanced Settings"
+msgstr "Paramètres avancés"
+
+msgid "Alert"
+msgstr "Alerte"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Autoriser l'authentification <abbr title=\"Secure Shell\">SSH</abbr> par mot "
+"de passe"
+
+msgid "Allow all except listed"
+msgstr "Autoriser tout sauf ce qui est listé"
+
+msgid "Allow listed only"
+msgstr "Autoriser seulement ce qui est listé"
+
+msgid "Allow localhost"
+msgstr "Autoriser l'hôte local"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Permettre à des hôtes distants de se conecter à des ports SSH locaux "
+"correspondants (« forwarded »)"
+
+msgid "Allow root logins with password"
+msgstr "Autoriser les connexions administrateur avec mot de passe"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+"Autoriser l'utilisateur <em>root</em> à se connecter avec un mot de passe"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Autorise les réponses de l'amont dans la plage 127.0.0.0/8, par ex. pour les "
+"services RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Toujours utiliser des canaux de 40MHz même si les canaux secondaires peuvent "
+"chevaucher d'autres réseaux. Activer cette option n'est pas compatible avec "
+"l'amendement IEEE 802.11n-2009 !"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Un réseau supplémentaire sera créé si vous laissé ceci décoché."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antenne 1"
+
+msgid "Antenna 2"
+msgstr "Antenne 2"
+
+msgid "Antenna Configuration"
+msgstr "Configuration de l'antenne"
+
+msgid "Any zone"
+msgstr "N'importe quelle zone"
+
+msgid "Apply"
+msgstr "Appliquer"
+
+msgid "Applying changes"
+msgstr "Changements en cours"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Affecte les interfaces…"
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Équipements associés"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Contrôleur sans fil Atheros 802.11%s "
+
+msgid "Authentication"
+msgstr "Authentification"
+
+msgid "Authoritative"
+msgstr "Autoritaire"
+
+msgid "Authorization Required"
+msgstr "Autorisation requise"
+
+msgid "Auto Refresh"
+msgstr "Rafraîchissement automatique"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid "Available packages"
+msgstr "Paquets disponibles"
+
+msgid "Average:"
+msgstr "Moyenne :"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Retour"
+
+msgid "Back to Overview"
+msgstr "Retour à la vue générale"
+
+msgid "Back to configuration"
+msgstr "Retour à la configuration"
+
+msgid "Back to overview"
+msgstr "Retour à la vue générale"
+
+msgid "Back to scan results"
+msgstr "Retour aux résultats de la recherche"
+
+msgid "Background Scan"
+msgstr "Recherche en arrière-plan"
+
+msgid "Backup / Flash Firmware"
+msgstr "Sauvegarde / Mise à jour du micrologiciel"
+
+msgid "Backup / Restore"
+msgstr "Sauvegarder / Restaurer"
+
+msgid "Backup file list"
+msgstr "Liste des fichiers de sauvegarde"
+
+msgid "Bad address specified!"
+msgstr "Adresse spécifiée incorrecte!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Voici la liste des fichiers à sauvegarder. Elle est constituée des fichiers "
+"de configuration modifiés marqués par opkg, des fichiers de base essentiels, "
+"et des motifs de sauvegarde définis par l'utilisateur."
+
+msgid "Bitrate"
+msgstr "Débit"
+
+msgid "Bogus NX Domain Override"
+msgstr "Contourne les «  NX Domain » bogués"
+
+msgid "Bridge"
+msgstr "Pont"
+
+msgid "Bridge interfaces"
+msgstr "Interfaces en pont"
+
+msgid "Bridge unit number"
+msgstr "Numéro d'unité du pont"
+
+msgid "Bring up on boot"
+msgstr "L'activer au démarrage"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Contrôleur sans fil Broadcom 802.11%s"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Contrôleur sans fil Broadcom BCM%04x 802.11"
+
+msgid "Buffered"
+msgstr "Temporisé"
+
+msgid "Buttons"
+msgstr "Boutons"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Utilisation CPU (%)"
+
+msgid "Cached"
+msgstr "Mis en cache"
+
+msgid "Cancel"
+msgstr "Annuler"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Chaîne"
+
+msgid "Changes"
+msgstr "Changements"
+
+msgid "Changes applied."
+msgstr "Changements appliqués."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Change le mot de passe administrateur pour accéder à l'équipement"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check"
+msgstr "Vérification"
+
+msgid "Checksum"
+msgstr "Somme de contrôle"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Choisissez la zone de pare-feu à laquelle vous voulez affecter cette "
+"interface. Sélectionnez <em>non précisé</em> pour retirer l'interface de la "
+"zone associée, ou remplissez le champ <em>créer</em> pour définir une "
+"nouvelle zone et y inclure cette interface."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Choisissez le(s) réseau(x)  que vous souhaitez attachez a cette interface "
+"sans-fil ou remplissez le <em>créer</em>  champ pour définir un nouveau "
+"réseau. "
+
+msgid "Cipher"
+msgstr "Code de chiffrement"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Cliquer sur \"Construire l'archive\" pour télécharger une archive tar des "
+"fichiers de la configuration actuelle. Pour réinitialiser le micrologiciel "
+"dans son état initial, cliquer sur \"Réinitialiser\" (possible seulement "
+"avec les images de type squashfs)."
+
+msgid "Client"
+msgstr "Client"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Identifiant client à envoyer dans les requêtes DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Fermer une connexion inactive après le délai donné en secondes, mettre 0 "
+"pour garder les connexions"
+
+msgid "Close list..."
+msgstr "Fermer la liste…"
+
+msgid "Collecting data..."
+msgstr "Récupération de données..."
+
+msgid "Command"
+msgstr "Commande"
+
+msgid "Common Configuration"
+msgstr "Configuration commune"
+
+msgid "Compression"
+msgstr "Compression"
+
+msgid "Configuration"
+msgstr "Configuration"
+
+msgid "Configuration applied."
+msgstr "Configuration appliquée."
+
+msgid "Configuration files will be kept."
+msgstr "Les fichiers de configuration seront préservés."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Configure ce point de montage comme remplacement externe du système de "
+"fichier racine"
+
+msgid "Confirmation"
+msgstr "Confirmation"
+
+msgid "Connect"
+msgstr "Se connecter"
+
+msgid "Connected"
+msgstr "Connecté"
+
+msgid "Connection Limit"
+msgstr "Limite de connexion"
+
+msgid "Connections"
+msgstr "Connexions"
+
+msgid "Country"
+msgstr "Pays"
+
+msgid "Country Code"
+msgstr "Code pays"
+
+msgid "Cover the following interface"
+msgstr "Couvre l'interface suivante"
+
+msgid "Cover the following interfaces"
+msgstr "Couvre les interfaces suivantes"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Créer / Assigner une zone du pare-feu"
+
+msgid "Create Interface"
+msgstr "Créer une interface"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Créer un pont par dessus plusieurs interfaces"
+
+msgid "Critical"
+msgstr "Critique"
+
+msgid "Cron Log Level"
+msgstr "Niveau de journalisation de Cron"
+
+msgid "Custom Interface"
+msgstr "Interface spécifique"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Personnaliser le comportement des <abbr title=\"Diode Électro-Luminescente"
+"\">DEL</abbr>s si possible."
+
+msgid "DHCP Leases"
+msgstr "Baux DHCP"
+
+msgid "DHCP Server"
+msgstr "Serveur DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP et DNS"
+
+msgid "DHCP client"
+msgstr "client DHCP"
+
+msgid "DHCP-Options"
+msgstr "Options DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Bails DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "transmissions DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Deboguage"
+
+msgid "Default %d"
+msgstr "%d par défaut"
+
+msgid "Default gateway"
+msgstr "Passerelle par défaut"
+
+msgid "Default state"
+msgstr "État par défaut"
+
+msgid "Define a name for this network."
+msgstr "Donne un nom à ce réseau."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Définir des options DHCP supplémentaires, par exemple "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" qui publie différents serveurs "
+"DNS à ses clients."
+
+msgid "Delete"
+msgstr "Effacer"
+
+msgid "Delete this interface"
+msgstr "Supprimer cette interface"
+
+msgid "Delete this network"
+msgstr "Supprimer ce réseau"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Design"
+msgstr "Apparence"
+
+msgid "Destination"
+msgstr "Destination"
+
+msgid "Device"
+msgstr "Équipement"
+
+msgid "Device Configuration"
+msgstr "Configuration de l'équipement"
+
+msgid "Diagnostics"
+msgstr "Diagnostics"
+
+msgid "Directory"
+msgstr "Répertoire"
+
+msgid "Disable"
+msgstr "Désactiver"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Désactiver <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+"pour cette interface."
+
+msgid "Disable DNS setup"
+msgstr "Désactiver la configuration DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Désactiver l'émission périodique de balises wifi (« HW-Beacon »)"
+
+msgid "Disabled"
+msgstr "Désactivé"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Jeter les réponses en RFC1918 amont"
+
+msgid "Displaying only packages containing"
+msgstr "N'afficher que les paquets contenant"
+
+msgid "Distance Optimization"
+msgstr "Optimisation de la distance"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distance au membre du réseau le plus éloigné, en mètres."
+
+msgid "Diversity"
+msgstr "Diversité"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq est un serveur <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> combiné à un relais <abbr title=\"Domain Name System\">DNS</"
+"abbr> pour les pare-feu <abbr title=\"Network Address Translation\">NAT</"
+"abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+"Ne pas mettre en cache les réponses négatives, par ex. pour des domaines "
+"inexistants"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Ne pas transmettre les requêtes qui ne peuvent être résolues par les "
+"serveurs de noms publics"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+"Ne pas transmettre les requêtes de recherche inverse pour les réseaux locaux"
+
+msgid "Do not send probe responses"
+msgstr "Ne pas envoyer de réponses de test"
+
+msgid "Domain required"
+msgstr "Domaine nécessaire"
+
+msgid "Domain whitelist"
+msgstr "Liste blanche de domaines"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Ne pas transmettre de requêtes <abbr title=\"Domain Name System\">DNS</abbr> "
+"sans nom <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "Download and install package"
+msgstr "Télécharge et installe le paquet"
+
+msgid "Download backup"
+msgstr "Télécharger la sauvegarde"
+
+msgid "Dropbear Instance"
+msgstr "Session Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear est un serveur <abbr title=\"Secure Shell\">SSH</abbr> et intègre "
+"un serveur <abbr title=\"Secure Copy\">SCP</abbr>"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dynamique"
+
+msgid "Dynamic tunnel"
+msgstr "Tunnel dynamique"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Alloue dynamiquement des adresses pour les clients du DHCP. Si désactivé, "
+"seuls les clients ayant des baux statiques seront gérés."
+
+msgid "EAP-Method"
+msgstr "Méthode EAP"
+
+msgid "Edit"
+msgstr "Éditer"
+
+msgid "Edit this interface"
+msgstr "Éditer cette interface"
+
+msgid "Edit this network"
+msgstr "Éditer ce réseau"
+
+msgid "Emergency"
+msgstr "Urgence"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Activer la mise à jour dynamique de l'extrémité du tunnel chez HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Activer la négociation IPv6 sur le lien PPP"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Activer la circulation de très grandes trames (Jumbo)"
+
+msgid "Enable NTP client"
+msgstr "Activer client NTP"
+
+msgid "Enable TFTP server"
+msgstr "Activer le serveur TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Acviter la gestion des VLANs"
+
+msgid "Enable learning and aging"
+msgstr "Activer l'apprentissage et la péremption"
+
+msgid "Enable this mount"
+msgstr "Activer ce montage"
+
+msgid "Enable this swap"
+msgstr "Activer cette mémoire d'échange (swap)"
+
+msgid "Enable/Disable"
+msgstr "Activer/Désactiver"
+
+msgid "Enabled"
+msgstr "Activé"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+"Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr> sur "
+"ce pont"
+
+msgid "Encapsulation mode"
+msgstr "Mode encapsulé"
+
+msgid "Encryption"
+msgstr "Chiffrement"
+
+msgid "Erasing..."
+msgstr "Effacement…"
+
+msgid "Error"
+msgstr "Erreur"
+
+msgid "Ethernet Adapter"
+msgstr "Module Ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Commutateur Ethernet"
+
+msgid "Expand hosts"
+msgstr "Étendre le nom d'hôte"
+
+msgid "Expires"
+msgstr "Expire"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Délai d'expiration des adresses allouées, le minimum est de 2 minutes "
+"(<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Serveur distant de journaux système"
+
+msgid "External system log server port"
+msgstr "Port du serveur distant de journaux système"
+
+msgid "Fast Frames"
+msgstr "Trames rapides"
+
+msgid "File"
+msgstr "Fichier"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Nom de fichier d'une image de démarrage publiée aux clients"
+
+msgid "Filesystem"
+msgstr "Système de fichiers"
+
+msgid "Filter"
+msgstr "Filtrer"
+
+msgid "Filter private"
+msgstr "Filtrer les requêtes privées"
+
+msgid "Filter useless"
+msgstr "Filtrer les requêtes inutiles"
+
+msgid "Find and join network"
+msgstr "Cherche et rejoint un réseau"
+
+msgid "Find package"
+msgstr "Trouver un paquet"
+
+msgid "Finish"
+msgstr "Terminer"
+
+msgid "Firewall"
+msgstr "Pare-feu"
+
+msgid "Firewall Settings"
+msgstr "Paramètres du pare-feu"
+
+msgid "Firewall Status"
+msgstr "État du pare-feu"
+
+msgid "Firmware Version"
+msgstr "Version du micrologiciel"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Port source fixe pour les requêtes DNS sortantes"
+
+msgid "Flags"
+msgstr "Options"
+
+msgid "Flash Firmware"
+msgstr "Mise à jour du micrologiciel"
+
+msgid "Flash image..."
+msgstr "Écriture de l'image…"
+
+msgid "Flash new firmware image"
+msgstr "Écrire l'image du nouveau micrologiciel"
+
+msgid "Flash operations"
+msgstr "Opérations d'écriture"
+
+msgid "Flashing..."
+msgstr "Écriture…"
+
+msgid "Force"
+msgstr "Forcer"
+
+msgid "Force 40MHz mode"
+msgstr "Forcer le mode 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Forcer CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Force le DHCP sur ce réseau même si un autre serveur est détecté."
+
+msgid "Force TKIP"
+msgstr "Forcer TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Forcer TKIP et CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Transmettre le trafic DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Transmettre le trafic de diffusion"
+
+msgid "Forwarding mode"
+msgstr "Mode de transmission"
+
+msgid "Fragmentation Threshold"
+msgstr "Seuil de fragmentation"
+
+msgid "Frame Bursting"
+msgstr "Rafale de trames"
+
+msgid "Free"
+msgstr "Libre"
+
+msgid "Free space"
+msgstr "Espace libre"
+
+msgid "Frequency Hopping"
+msgstr "Sauts en fréquence"
+
+msgid "GHz"
+msgstr "Ghz"
+
+msgid "GPRS only"
+msgstr "seulement GPRS"
+
+msgid "Gateway"
+msgstr "Passerelle"
+
+msgid "Gateway ports"
+msgstr "Ports de la passerelle"
+
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+msgid "General Setup"
+msgstr "Configuration générale"
+
+msgid "Generate archive"
+msgstr "Construire l'archive"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Contrôleur sans fil générique 802.11%s"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+"La confirmation du nouveau mot de passe ne correspond pas, changement "
+"annulé !"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Aller à la configuration du mot de passe…"
+
+msgid "Go to relevant configuration page"
+msgstr "Aller à la page de configuration correspondante"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Mot de passe HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Gestionnaire"
+
+msgid "Hang Up"
+msgstr "Signal (HUP)"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Ici, vous pouvez configurer les aspects basiques de votre routeur comme son "
+"nom ou son fuseau horaire."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Vous pouvez copier ici des clés SSH publiques (une par ligne) pour une "
+"authentification SSH sur clés publiques."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Contrôleur sans fil Hermes 802.11b"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Cacher le ESSID"
+
+msgid "Host entries"
+msgstr "Entrées d'hôtes"
+
+msgid "Host expiry timeout"
+msgstr "Délai d'expiration pour les hôtes"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "adresse IP ou réseau"
+
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Nom d'hôte à envoyer dans une requête DHCP"
+
+msgid "Hostnames"
+msgstr "Noms d'hôtes"
+
+msgid "IP address"
+msgstr "Adresse IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Pare-feu IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "État IPv4 du WAN"
+
+msgid "IPv4 address"
+msgstr "Adresse IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 et IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Diffusion IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Passerelle IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Masque-réseau IPv4"
+
+msgid "IPv4 only"
+msgstr "IPv4 seulement"
+
+msgid "IPv4 prefix length"
+msgstr "longueur du préfixe IPv4"
+
+msgid "IPv4-Address"
+msgstr "Adresse IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Pare-feu IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "État IPv6 du WAN"
+
+msgid "IPv6 address"
+msgstr "Adresse IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Passerelle IPv6"
+
+msgid "IPv6 only"
+msgstr "IPv6 seulement"
+
+msgid "IPv6 prefix"
+msgstr "Préfixe IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "longueur du préfixe IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "Adresse IPv6"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6 dans IPv4 (RFC 4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6 sur IPv4 (6ème)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6 sur IPv4 (6 vers 4)"
+
+msgid "Identity"
+msgstr "Identité"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Monte le périphérique identifié par cet UUID au lieu d'un nom de "
+"périphérique fixe"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Monte le périphérique identifié par cette étiquette au lieu d'un nom de "
+"périphérique fixe"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Décoché, aucune route par défaut n'est configurée"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Décoché, les adresses des serveurs DNS publiés sont ignorées"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Si la mémoire physique n'est pas en quantité suffisante, les données "
+"inutilisées peuvent être temporairement transférée sur une partition "
+"d'échange, relevant la quantité de RAM disponible. Ce processus est lent car "
+"la mémoire d'échange ne peut être accédée aux taux de transfert de la RAM."
+
+msgid "Ignore Hosts files"
+msgstr "Ignorer le fichiers Hosts"
+
+msgid "Ignore interface"
+msgstr "Ignorer l'interface"
+
+msgid "Ignore resolve file"
+msgstr "Ignorer le fichier de résolution"
+
+msgid "Image"
+msgstr "Image"
+
+msgid "In"
+msgstr "Entrée"
+
+msgid "Inactivity timeout"
+msgstr "Délai d'inactivité"
+
+msgid "Inbound:"
+msgstr "Intérieur :"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Initscript"
+msgstr "Script d'initialisation"
+
+msgid "Initscripts"
+msgstr "Scripts d'initialisation"
+
+msgid "Install"
+msgstr "Installer"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Installer le paquet %q"
+
+msgid "Install protocol extensions..."
+msgstr "Installation des extensions de protocole…"
+
+msgid "Installed packages"
+msgstr "Paquets installés"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Interface Configuration"
+msgstr "Configuration de l'interface"
+
+msgid "Interface Overview"
+msgstr "Vue d'ensemble de l'interface"
+
+msgid "Interface is reconnecting..."
+msgstr "L'interface se reconnecte…"
+
+msgid "Interface is shutting down..."
+msgstr "L'interface s'arrête…"
+
+msgid "Interface not present or not connected yet."
+msgstr "L'interface n'est pas présente ou pas encore connectée."
+
+msgid "Interface reconnected"
+msgstr "Interface reconnectée"
+
+msgid "Interface shut down"
+msgstr "Interface arrêtée"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Internal Server Error"
+msgstr "Erreur Serveur Interne"
+
+msgid "Invalid"
+msgstr "Erreur : donnée entrée invalide"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+"Identifiant VLAN invalide !Seuls les IDs entre %d et %d sont autorisés."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+"Identifiant VLAN donné invalide ! Seuls les identifiants uniques sont "
+"autorisés"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Nom d'utilisateur et/ou mot de passe invalides ! Réessayez !"
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Il semble que vous essayez de programmer votre routeur avec une image qui ne "
+"tient pas dans sa mémoire flash, vérifiez s'il vous plait votre fichier-"
+"image !"
+
+msgid "Java Script required!"
+msgstr "Nécessite un Script Java !"
+
+msgid "Join Network"
+msgstr "Rejoindre un réseau"
+
+msgid "Join Network: Settings"
+msgstr "Rejoindre un réseau : paramètres"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Rejoindre un réseau : recherche des réseaux sans-fil"
+
+msgid "Keep settings"
+msgstr "Garder le paramètrage"
+
+msgid "Kernel Log"
+msgstr "Journal du noyau"
+
+msgid "Kernel Version"
+msgstr "Version du noyau"
+
+msgid "Key"
+msgstr "Clé"
+
+msgid "Key #%d"
+msgstr "Clé n° %d"
+
+msgid "Kill"
+msgstr "Tuer"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Serveur L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr "Seuil d'erreur des échos LCP"
+
+msgid "LCP echo interval"
+msgstr "Intervalle entre échos LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Étiquette"
+
+msgid "Language"
+msgstr "Langue"
+
+msgid "Language and Style"
+msgstr "Langue et apparence"
+
+msgid "Lease validity time"
+msgstr "Durée de validité d'un bail"
+
+msgid "Leasefile"
+msgstr "Fichier de baux"
+
+msgid "Leasetime"
+msgstr "Durée du bail"
+
+msgid "Leasetime remaining"
+msgstr "Durée de validité"
+
+msgid "Leave empty to autodetect"
+msgstr "Laisser vide pour l'auto-détection"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Laisser vide pour utiliser l'adresse WAN actuelle"
+
+msgid "Legend:"
+msgstr "Légende :"
+
+msgid "Limit"
+msgstr "Limite"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Lien établi"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Liste des serveurs auquels sont transmis les requêtes <abbr title=\"Domain "
+"Name System\">DNS</abbr>"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Liste des domaines où sont permises les réponses de type RFC1918"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+"Liste des hôtes qui fournissent des résultats avec des « NX domain » bogués"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr "Écouter seulement sur l'interface spécifié, sinon sur toutes"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Port d'écoute des requêtes DNS entrantes"
+
+msgid "Load"
+msgstr "Charger"
+
+msgid "Load Average"
+msgstr "Charge moyenne"
+
+msgid "Loading"
+msgstr "Chargement"
+
+msgid "Local IPv4 address"
+msgstr "Adresse IPv4 locale"
+
+msgid "Local IPv6 address"
+msgstr "Adresse IPv6 locale"
+
+msgid "Local Startup"
+msgstr "Démarrage local"
+
+msgid "Local Time"
+msgstr "Heure Locale"
+
+msgid "Local domain"
+msgstr "Domaine local"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Domaine local à préciser. Les noms correspondants à ce domaine ne sont "
+"jamais transmis, mais résolus seulement depuis le serveur DHCP ou le fichier "
+"Hosts"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Suffixe du domaine local ajouté aux noms du serveur DHCP et du fichier Hosts"
+
+msgid "Local server"
+msgstr "Serveur local"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Trouve le nom d'hôte suivant le sous-réseau d'où vient la requête si "
+"plusieurs adresses IPs sont possibles"
+
+msgid "Localise queries"
+msgstr "Localiser les requêtes"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Verrouilé sur le canal %d utilisé par %s"
+
+msgid "Log output level"
+msgstr "Niveau de journalisation"
+
+msgid "Log queries"
+msgstr "Journaliser les requêtes"
+
+msgid "Logging"
+msgstr "Journalisation"
+
+msgid "Login"
+msgstr "Connexion"
+
+msgid "Logout"
+msgstr "Déconnexion"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+"Adresse allouée la plus basse, spécifiée par un décalage à partir de "
+"l'adresse réseau."
+
+msgid "MAC-Address"
+msgstr "Adresse MAC"
+
+msgid "MAC-Address Filter"
+msgstr "Filtrage par adresses MAC"
+
+msgid "MAC-Filter"
+msgstr "Filtrage par adresses MAC"
+
+msgid "MAC-List"
+msgstr "Liste des adresses MAC"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Débit maximum"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Nombre maximum de baux DHCP actifs"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Nombre maximum de requêtes DNS au même moment"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Taille maximum autorisée des paquets UDP EDNS.0"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Délai d'attente maximum que le modem soit prêt"
+
+msgid "Maximum hold time"
+msgstr "Temps de maintien maximum"
+
+msgid "Maximum number of leased addresses."
+msgstr "Nombre maximum d'adresses allouées."
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Mémoire"
+
+msgid "Memory usage (%)"
+msgstr "Utilisation Mémoire (%)"
+
+msgid "Metric"
+msgstr "Metrique"
+
+msgid "Minimum Rate"
+msgstr "Débit minimum"
+
+msgid "Minimum hold time"
+msgstr "Temps de maintien mimimum"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Extention de protocole manquante pour le proto %q"
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Interface Modem"
+
+msgid "Modem init timeout"
+msgstr "Délai max. d'initialisation du modem"
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr "Montage"
+
+msgid "Mount Point"
+msgstr "Point de montage"
+
+msgid "Mount Points"
+msgstr "Point de montage"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Points de montage - élément à monter"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Points de montage - partition d'échange"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Les points de montage définissent l'attachement d'un périphérique au système "
+"de fichier"
+
+msgid "Mount options"
+msgstr "Options de montage"
+
+msgid "Mount point"
+msgstr "Point de montage"
+
+msgid "Mounted file systems"
+msgstr "Systèmes de fichiers montés"
+
+msgid "Move down"
+msgstr "Descendre"
+
+msgid "Move up"
+msgstr "Monter"
+
+msgid "Multicast Rate"
+msgstr "Débit multidiffusion"
+
+msgid "Multicast address"
+msgstr "Adresse multidiffusion"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Serveurs NTP candidats"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Name of the new interface"
+msgstr "Nom de la nouvelle interface"
+
+msgid "Name of the new network"
+msgstr "Nom du nouveau réseau"
+
+msgid "Navigation"
+msgstr "Navigation"
+
+msgid "Netmask"
+msgstr "Masque de réseau"
+
+msgid "Network"
+msgstr "Réseau"
+
+msgid "Network Utilities"
+msgstr "Utilitaires réseau"
+
+msgid "Network boot image"
+msgstr "Image de démarrage réseau"
+
+msgid "Network without interfaces."
+msgstr "Réseau sans interfaces."
+
+msgid "Next »"
+msgstr "Prochain »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Aucun serveur DHCP configuré sur cette interface"
+
+msgid "No chains in this table"
+msgstr "Aucune chaîne dans cette table"
+
+msgid "No files found"
+msgstr "Aucun fichier trouvé"
+
+msgid "No information available"
+msgstr "Information indisponible"
+
+msgid "No negative cache"
+msgstr "Pas de cache négatif"
+
+msgid "No network configured on this device"
+msgstr "Ce périphérique n'a aucune adresse configurée"
+
+msgid "No network name specified"
+msgstr "Aucun nom de réseau donné"
+
+msgid "No package lists available"
+msgstr "Aucune liste de paquets disponible"
+
+msgid "No password set!"
+msgstr "Pas de mot de passe positionné !"
+
+msgid "No rules in this chain"
+msgstr "Aucune règle dans cette chaîne"
+
+msgid "No zone assigned"
+msgstr "Aucune zone attribuée"
+
+msgid "Noise"
+msgstr "Bruit"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Bruit :"
+
+msgid "None"
+msgstr "Vide"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "Pas trouvé"
+
+msgid "Not associated"
+msgstr "Pas associé"
+
+msgid "Not connected"
+msgstr "Non connecté"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Note : les fichiers de configuration seront effacés."
+
+msgid "Notice"
+msgstr "Note"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Configuration OPKG"
+
+msgid "Off-State Delay"
+msgstr "Durée éteinte"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Dans cette page vous pourrez configurer les interfaces réseaux. Vous pouvez "
+"bridger différentes interfaces en cochant le champ \"bridger les interfaces"
+"\" et en saisissant les noms des interfaces réseau séparées par des espaces. "
+"Vous pouvez aussi utiliser la notation VLAN, INTERFACE.VLANNB (ex : eth0.1)."
+
+msgid "On-State Delay"
+msgstr "Durée allumée"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Il faut indiquer un nom d'hôte ou une adresse MAC !"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Un ou plusieurs champs contiennent des valeurs incorrectes !"
+
+msgid "One or more required fields have no value!"
+msgstr "Un ou plusieurs champs n'ont pas de valeur !"
+
+msgid "Open list..."
+msgstr "Ouvrir la liste…"
+
+msgid "Option changed"
+msgstr "Option modifiée"
+
+msgid "Option removed"
+msgstr "Option retirée"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Other:"
+msgstr "Autres :"
+
+msgid "Out"
+msgstr "Sortie"
+
+msgid "Outbound:"
+msgstr "Extérieur :"
+
+msgid "Outdoor Channels"
+msgstr "Canaux en extérieur"
+
+msgid "Override MAC address"
+msgstr "Modifier l'adresse MAC"
+
+msgid "Override MTU"
+msgstr "Modifier le MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Modifier la passerelle dans les réponses DHCP"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Remplacer le masque réseau envoyés aux clients. Il est normalement calculé à "
+"partir du sous-réseau géré."
+
+msgid "Override the table used for internal routes"
+msgstr "Modifier la table utilisée pour les routes internes"
+
+msgid "Overview"
+msgstr "Vue d'ensemble"
+
+msgid "Owner"
+msgstr "Propriétaire"
+
+msgid "PAP/CHAP password"
+msgstr "Mot de passe PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Identifiant PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "code PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA Encapsulation"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Nécessite le paquet libiwinfo !"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Les listes de paquets ont plus de 24 heures"
+
+msgid "Package name"
+msgstr "Nom du paquet"
+
+msgid "Packets"
+msgstr "Paquets"
+
+msgid "Part of zone %q"
+msgstr "Fait partie de la zone %q"
+
+msgid "Password"
+msgstr "Mot de passe"
+
+msgid "Password authentication"
+msgstr "Authentification par mot de passe"
+
+msgid "Password of Private Key"
+msgstr "Mot de passe de la clé privée"
+
+msgid "Password successfully changed!"
+msgstr "Mot de passe changé avec succès !"
+
+msgid "Path to CA-Certificate"
+msgstr "Chemin de la CA"
+
+msgid "Path to Client-Certificate"
+msgstr "Chemin du certificat-client"
+
+msgid "Path to Private Key"
+msgstr "Chemin de la clé privée"
+
+msgid "Path to executable which handles the button event"
+msgstr "Chemin du programme exécutable gérant les évènements liés au bouton"
+
+msgid "Peak:"
+msgstr "Pic :"
+
+msgid "Perform reboot"
+msgstr "Redémarrer"
+
+msgid "Perform reset"
+msgstr "Réinitialiser"
+
+msgid "Phy Rate:"
+msgstr "Débit de la puce:"
+
+msgid "Physical Settings"
+msgstr "Paramètres physiques"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "Pqts."
+
+msgid "Please enter your username and password."
+msgstr "Saisissez votre nom d'utilisateur et mot de passe."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Patientez s'il vous plaît: équipement en cours de redémarrage..."
+
+msgid "Policy"
+msgstr "Politique"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Le port %d n'est pas marqué dans plusieurs VLANs !"
+
+msgid "Port status:"
+msgstr "Statut du port :"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Suppose que le distant a disparu une fois le nombre donné d'erreurs d'échos "
+"LCP ; utiliser 0 pour ignorer ces erreurs"
+
+msgid "Prevents client-to-client communication"
+msgstr "Empêche la communication directe entre clients"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Contrôleur sans fil Prism2/2.5/3 802.11b"
+
+msgid "Proceed"
+msgstr "Continuer"
+
+msgid "Processes"
+msgstr "Processus"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "Protocol family"
+msgstr "Famille du protocole"
+
+msgid "Protocol of the new interface"
+msgstr "Protocole de la nouvelle interface"
+
+msgid "Protocol support is not installed"
+msgstr "La gestion du protocole n'est pas installée"
+
+msgid "Provide NTP server"
+msgstr "Fournir serveur NTP"
+
+msgid "Provide new network"
+msgstr "Donner un nouveau réseau"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Qualitée"
+
+msgid "RTS/CTS Threshold"
+msgstr "Seuil RTS/CTS"
+
+msgid "RX"
+msgstr "Reçu"
+
+msgid "RX Rate"
+msgstr "Débit en réception"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "Contrôleur sans fil RaLink 802.11%s"
+
+msgid "Radius-Accounting-Port"
+msgstr "Port de la comptabilisation Radius"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Secret de la comptabilisation Radius"
+
+msgid "Radius-Accounting-Server"
+msgstr "Serveur de la comptabilisation Radius"
+
+msgid "Radius-Authentication-Port"
+msgstr "Port de l'authentification Radius"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Secret de l'authentification Radius"
+
+msgid "Radius-Authentication-Server"
+msgstr "Serveur de l'authentification Radius"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr "Lire /etc/ethers pour configurer le serveur DHCP"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Voulez-vous vraiment supprimer cette interface? L'effacement ne peut être "
+"annulé!\n"
+"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par "
+"cette interface."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Voulez-vous vraiment supprimer ce réseau sans-fil? L'effacement ne peut être "
+"annulé!\n"
+"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par ce "
+"réseau."
+
+msgid "Really reset all changes?"
+msgstr "Voulez-vous vraiment ré-initialiser toutes les modifications ?"
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Voulez-vous vraiment arrêter l'interface %s ?\n"
+"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par "
+"cette interface."
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Voulez-vous vraiment arrêter l'interface %s ?\n"
+"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par "
+"cette interface."
+
+msgid "Really switch protocol?"
+msgstr "Voulez-vous vraiment changer de protocole ?"
+
+msgid "Realtime Connections"
+msgstr "Connexions temps-réel"
+
+msgid "Realtime Graphs"
+msgstr "Graphiques temps-réel"
+
+msgid "Realtime Load"
+msgstr "Charge temps-réel"
+
+msgid "Realtime Traffic"
+msgstr "Trafic temps-réel"
+
+msgid "Realtime Wireless"
+msgstr "Qualité de réception actuelle"
+
+msgid "Rebind protection"
+msgstr "Protection contre l'attaque « rebind »"
+
+msgid "Reboot"
+msgstr "Redémarrage"
+
+msgid "Rebooting..."
+msgstr "Redémarre…"
+
+msgid "Reboots the operating system of your device"
+msgstr "Redémarrage du système d'exploitation de votre équipement"
+
+msgid "Receive"
+msgstr "Reçoit"
+
+msgid "Receiver Antenna"
+msgstr "Antenne émettrice"
+
+msgid "Reconnect this interface"
+msgstr "Reconnecter cet interface"
+
+msgid "Reconnecting interface"
+msgstr "Reconnecte cet interface"
+
+msgid "References"
+msgstr "Références"
+
+msgid "Regulatory Domain"
+msgstr "Domaine de certification"
+
+msgid "Relay"
+msgstr "Relais"
+
+msgid "Relay Bridge"
+msgstr "Pont-relais"
+
+msgid "Relay between networks"
+msgstr "Relais entre réseaux"
+
+msgid "Relay bridge"
+msgstr "Pont-relais"
+
+msgid "Remote IPv4 address"
+msgstr "Adresse IPv4 distante"
+
+msgid "Remove"
+msgstr "Désinstaller"
+
+msgid "Repeat scan"
+msgstr "Répéter la recherche"
+
+msgid "Replace entry"
+msgstr "Remplacer l'entrée"
+
+msgid "Replace wireless configuration"
+msgstr "Remplacer la configuration sans-fil"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Nécessaire avec certains FAIs, par ex. : Charter avec DOCSIS 3"
+
+msgid "Reset"
+msgstr "Remise à zéro"
+
+msgid "Reset Counters"
+msgstr "Remise à zéro des compteurs"
+
+msgid "Reset to defaults"
+msgstr "Ré-initialisation"
+
+msgid "Resolv and Hosts Files"
+msgstr "Fichiers Resolv et Hosts"
+
+msgid "Resolve file"
+msgstr "Fichier de résolution des noms"
+
+msgid "Restart"
+msgstr "Redémarrer"
+
+msgid "Restart Firewall"
+msgstr "Redémarrer le pare-feu"
+
+msgid "Restore backup"
+msgstr "Restaurer une sauvegarde"
+
+msgid "Reveal/hide password"
+msgstr "Montrer/cacher le mot de passe"
+
+msgid "Revert"
+msgstr "Revenir"
+
+msgid "Root"
+msgstr "Racine"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Répertoire racine des fichiers fournis par TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Mot de passe du routeur"
+
+msgid "Routes"
+msgstr "Routes"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Avec les routes statiques vous pouvez spécifier à travers quelle interface "
+"ou passerelle un réseau peut être contacté."
+
+msgid "Rule #"
+msgstr "N° de règle"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+"Faire un vérification du système de fichiers avant de monter le périphérique"
+
+msgid "Run filesystem check"
+msgstr "Faire une vérification du système de fichiers"
+
+msgid "SSH Access"
+msgstr "Accès SSH"
+
+msgid "SSH-Keys"
+msgstr "Clés SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Sauvegarder"
+
+msgid "Save & Apply"
+msgstr "Sauvegarder et Appliquer"
+
+msgid "Save &#38; Apply"
+msgstr "Sauvegarder et appliquer"
+
+msgid "Scan"
+msgstr "Scan"
+
+msgid "Scheduled Tasks"
+msgstr "Tâches Régulières"
+
+msgid "Section added"
+msgstr "Section ajoutée"
+
+msgid "Section removed"
+msgstr "Section retirée"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Voir le manuel de « mount » pour les détails"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Envoyer des demandes d'échos LCP à intervalles donnés, en secondes ; utile "
+"uniqument associé à un seuil d'erreurs"
+
+msgid "Separate Clients"
+msgstr "Isoler les clients"
+
+msgid "Separate WDS"
+msgstr "WDS séparé"
+
+msgid "Server Settings"
+msgstr "Paramètres du serveur"
+
+msgid "Service Name"
+msgstr "Nom du service"
+
+msgid "Service Type"
+msgstr "Type du service"
+
+msgid "Services"
+msgstr "Services"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurer la synchronisation de l'heure"
+
+msgid "Setup DHCP Server"
+msgstr "Configurer le serveur DHCP"
+
+msgid "Show current backup file list"
+msgstr "Afficher la liste des fichiers de la sauvegarde actuelle"
+
+msgid "Shutdown this interface"
+msgstr "Arrêter cet interface"
+
+msgid "Shutdown this network"
+msgstr "Arrêter ce réseau"
+
+msgid "Signal"
+msgstr "Signal"
+
+msgid "Signal:"
+msgstr "Signal :"
+
+msgid "Size"
+msgstr "Taille"
+
+msgid "Skip"
+msgstr "Passer au suivant"
+
+msgid "Skip to content"
+msgstr "Skip to content"
+
+msgid "Skip to navigation"
+msgstr "Skip to navigation"
+
+msgid "Slot time"
+msgstr "Tranche de temps"
+
+msgid "Software"
+msgstr "Logiciels"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Certains champs sont invalides, ne peut sauvegarder les valeurs !"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Désolé, l'objet que vous avez demandé n'as pas été trouvé."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Désolé, le serveur à rencontré une erreur inattendue."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Désolé, il n'y a pas de gestion de mise à jour disponible, une nouvelle "
+"image du micrologiciel doit être écrite manuellement. Reportez-vous S.V.P. "
+"au wiki libreCMC pour connaître les instructions d'installation spécifiques à "
+"votre matériel."
+
+msgid "Sort"
+msgstr "Trier"
+
+msgid "Source"
+msgstr "Source"
+
+msgid "Specifies the button state to handle"
+msgstr "Indique l'état du bouton à gérer"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Indique le répertoire auquel le périphérique est rattaché"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Indique le port d'écoute de cette instance <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Indique le nombre de requêtes ARP ratées au delà duquel les hôtes seront "
+"supposés disparus"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr "Indique le délai après quoi les hôtes seront supposés disparus"
+
+msgid "Specify the secret encryption key here."
+msgstr "Spécifiez ici la clé secrète de chiffrage."
+
+msgid "Start"
+msgstr "Démarrer"
+
+msgid "Start priority"
+msgstr "Priorité de démarrage"
+
+msgid "Startup"
+msgstr "Démarrage"
+
+msgid "Static IPv4 Routes"
+msgstr "Routes IPv4 statiques"
+
+msgid "Static IPv6 Routes"
+msgstr "Routes IPv6 statiques"
+
+msgid "Static Leases"
+msgstr "Baux Statiques"
+
+msgid "Static Routes"
+msgstr "Routes statiques"
+
+msgid "Static WDS"
+msgstr "WDS statique"
+
+msgid "Static address"
+msgstr "Adresse statique"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Les baux statiques sont utilisés pour donner des adresses IP fixes et des "
+"noms symboliques à des clients DHCP. Il sont également nécessaires pour les "
+"interfaces sans configuration dynamique où l'on fournit un bail aux seuls "
+"hôtes configurés."
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Stop"
+msgstr "Arrêter"
+
+msgid "Strict order"
+msgstr "Ordre stricte"
+
+msgid "Submit"
+msgstr "Soumettre"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Élement de partition d'échange"
+
+msgid "Switch"
+msgstr "Commutateur"
+
+msgid "Switch %q"
+msgstr "Commutateur %q"
+
+msgid "Switch %q (%s)"
+msgstr "Commutateur %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Protocole du commutateur"
+
+msgid "Sync with browser"
+msgstr "Synchro avec le navigateur"
+
+msgid "Synchronizing..."
+msgstr "Synchronisation…"
+
+msgid "System"
+msgstr "Système"
+
+msgid "System Log"
+msgstr "Journal système"
+
+msgid "System Properties"
+msgstr "Propriétés système"
+
+msgid "System log buffer size"
+msgstr "Taille du tampon du journal système"
+
+msgid "TCP:"
+msgstr "TCP :"
+
+msgid "TFTP Settings"
+msgstr "Paramètres TFTP"
+
+msgid "TFTP server root"
+msgstr "Racine du serveur TFTP"
+
+msgid "TX"
+msgstr "Transmis"
+
+msgid "TX Rate"
+msgstr "Débit en émission"
+
+msgid "Table"
+msgstr "Table"
+
+msgid "Target"
+msgstr "Cible"
+
+msgid "Terminate"
+msgstr "Terminer"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"La section <em>Configuration de l'équipement</em> couvre les paramètres "
+"physiques du matériel radio comme le canal, la puissance d'émission ou la "
+"sélection de l'antenne, qui sont partagés entre tous les réseaux sans-fil "
+"définis (si le matériel radio gère plusieurs réseaux SSID). Les paramètres "
+"dépendant de chaque réseau comme le chiffrage ou le mode de fonctionnement "
+"sont groupés dans <em>Configuration de l'interface</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Le paquet <em>libiwinfo-lua</em> n'est pas installé. Vous devez l'installer "
+"pour une configuration sans-fil fonctionnelle !"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"Le préfixe IPv6 attribué par le fournisseur, se termine généralement par "
+"<code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Les caractères autorisés sont : <code>A-Z</code>, <code>a-z</code>, "
+"<code>0-9</code> et <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr "Le périphérique de bloc contenant la partition (ex : /dev/sda1)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Le système de fichiers utilisé pour formatter le support de stockage (ex : "
+"ext3)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"L'image du micrologiciel a été chargée. Ci-dessous la taille et la somme de "
+"contrôle de cette image, comparez-les avec le fichier original pour vous "
+"assurer de son intégrité.<br /> Cliquez sur \"Continuer\" pour lancer la "
+"procédure d'écriture."
+
+msgid "The following changes have been committed"
+msgstr "Les changements suivants ont été appliqués"
+
+msgid "The following changes have been reverted"
+msgstr "Les changements suivants ont été annulés"
+
+msgid "The following rules are currently active on this system."
+msgstr "Les règles suivantes sont actuellement actives sur ce système."
+
+msgid "The given network name is not unique"
+msgstr "Le nom de réseau donné n'est pas unique"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Le matériel ne sait pas gérer plusieurs SSID et la configuration existante "
+"sera remplacée si vous continuez."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"La longueur du préfixe IPv4 en bits, le reste est utilisé dans les adresses "
+"IPv6"
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "La longueur du préfixe IPv6 en bits"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Les ports de votre équipement peuvent être configurés pour combiner "
+"plusieurs <abbr title=\"Virtual Local Area Network\">VLANs</abbr> dans "
+"lesquels les machines connectées peuvent dialoguer directement l'une avec "
+"l'autre. Les <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s sont "
+"souvent utilisés pour séparer différences sous-réseaux. Bien souvent il y a "
+"un port d'uplink pour une connexion vers un réseau plus vaste, comme "
+"internet et les autres ports sont réservés au réseau local."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Le protocole sélectionné nécessite l'attribution d'un périphérique"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"Le système est en train d'effacer la partition de configuration et "
+"redémarrera tout seul une fois cela fini."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes until you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+
+msgid "There are no active leases."
+msgstr "Il n'y a aucun bail actif."
+
+msgid "There are no pending changes to apply!"
+msgstr "Il n'y a aucun changement en attente d'être appliqués !"
+
+msgid "There are no pending changes to revert!"
+msgstr "Il n'y a aucun changement à annuler !"
+
+msgid "There are no pending changes!"
+msgstr "Il n'y a aucun changement en attente !"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Il n'y a aucun périphérique attribué pour l'instant, liez s.v.p. un "
+"périphérique réseau dans l'onglet \"Paramètres du matériel\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Ce routeur n'a pas de mot de passe configuré. Veuillez configurer un mot de "
+"passe pour l'utilisateur root pour protéger l'accès de votre interface web "
+"et activer l'accès par SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "L'adresse IPv4 du relais"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Voici la liste des motifs de type glob shell utilisés pour sélectionner les "
+"fichiers et répertoires à inclure durant la mise à jour système. Les "
+"fichiers modifiés dans /etc/config/ et certains autres sont automatiquement "
+"conservés."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Voici le contenu de /etc/rc.local. Placez-y vos propres commandes (avant le "
+"« exit 0 ») pour qu'ils soient exécutés en fin de démarrage."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Il s'agit de l'adresse de l'extrémité locale attribuée par le fournisseur de "
+"tunnels, elle se termine habituellement avec <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr "C'est le seul serveur DHCP sur le réseau local"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Ceci est le système crontab avec lequel sont définies les tâches récurrentes."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Il s'agit habituellement de l'adresse du plus proche PoP géré par le "
+"fournisseur de tunnels"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Cette liste donne une vue d'ensemble des processus en exécution et leur "
+"statut."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "Cette page permet la configuration d'actions spécifiques des boutons"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Cette page donne une vue d'ensemble des connexions réseaux actuellement "
+"actives."
+
+msgid "This section contains no values yet"
+msgstr "Cette section ne contient pas encore de valeur"
+
+msgid "Time Synchronization"
+msgstr "Synchronisation de l'heure"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "La synchronisation de l'heure n'est pas encore configurée."
+
+msgid "Timezone"
+msgstr "Fuseau horaire"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Pour restaurer les fichiers de configuration, vous pouvez charger ici une "
+"archive de sauvegarde construite précédemment."
+
+msgid "Total Available"
+msgstr "Total disponible"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "Trafic"
+
+msgid "Transfer"
+msgstr "Transfert"
+
+msgid "Transmission Rate"
+msgstr "Débit d'émission"
+
+msgid "Transmit"
+msgstr "Transmet"
+
+msgid "Transmit Power"
+msgstr "Puissance d'émission"
+
+msgid "Transmitter Antenna"
+msgstr "Antenne émettrice"
+
+msgid "Trigger"
+msgstr "Déclenchement"
+
+msgid "Trigger Mode"
+msgstr "Mode de déclenchement"
+
+msgid "Tunnel ID"
+msgstr "ID du tunnel"
+
+msgid "Tunnel Interface"
+msgstr "Interface du tunnel"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Mode Turbo"
+
+msgid "Tx-Power"
+msgstr "Puissance d'émission"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "UDP:"
+msgstr "UDP :"
+
+msgid "UMTS only"
+msgstr "seulement UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "Périphérique USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Impossible d'envoyer"
+
+msgid "Unknown"
+msgstr "Inconnu"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Erreur inconnue, mot de passe inchangé !"
+
+msgid "Unmanaged"
+msgstr "non-géré"
+
+msgid "Unsaved Changes"
+msgstr "Changements non appliqués"
+
+msgid "Unsupported protocol type."
+msgstr "Type de protocole non pris en charge."
+
+msgid "Update lists"
+msgstr "Mettre les listes à jour"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Envoyer ici une image compatible avec le système de mise à jour pour "
+"remplacer le micrologiciel actuel. Cochez \"Garder la configuration\" pour "
+"maintenir la configuration actuelle (nécessite une image de micrologiciel "
+"libreCMC compatible)."
+
+msgid "Upload archive..."
+msgstr "Envoi de l'archive…"
+
+msgid "Uploaded File"
+msgstr "Fichier Uploadé"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Utiliser /etc/ethers"
+
+msgid "Use DHCP gateway"
+msgstr "Utiliser la passerelle DHCP"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Utiliser les serveurs DNS publiés par le distant"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Utiliser les codes-pays ISO/IEC 3166 alpha2."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Utiliser le MTU sur l'interface du tunnel"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Utiliser le TTL sur l'interface du tunnel"
+
+msgid "Use as root filesystem"
+msgstr "Utiliser comme racine du système de fichiers"
+
+msgid "Use broadcast flag"
+msgstr "Utiliser une marque de diffusion"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Utiliser des serveurs DNS spécifiques"
+
+msgid "Use default gateway"
+msgstr "Utiliser la passerelle par défaut"
+
+msgid "Use gateway metric"
+msgstr "Utiliser la métrique de la passerelle"
+
+msgid "Use routing table"
+msgstr "Utiliser la table de routage"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Utiliser le bouton <em>Ajouter</em> pour créer un nouveau bail. "
+"L'<em>adresse MAC</em> identifie l'hôte, l'<em>adresse IPv4</em> décrit "
+"l'adresse fixe à utiliser et le <em>nom d'hôte</em> sera le nom symbolique "
+"attribué à l'hôte qui fait la demande."
+
+msgid "Used"
+msgstr "Utilisé"
+
+msgid "Used Key Slot"
+msgstr "Clé utilisée"
+
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Interface du VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANs sur %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs sur %q (%s)"
+
+msgid "VPN Server"
+msgstr "Serveur VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Classe de fournisseur à envoyer dans les requêtes DHCP"
+
+msgid "Verify"
+msgstr "Vérifier"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Système ouvert WEP"
+
+msgid "WEP Shared Key"
+msgstr "Clé partagée WEP"
+
+msgid "WEP passphrase"
+msgstr "Mot de passe WEP"
+
+msgid "WMM Mode"
+msgstr "Mode WMM"
+
+msgid "WPA passphrase"
+msgstr "Mot de passe WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"Le chiffrage WPA nécessite l'installation du paquet wpa_supplicant (en mode "
+"client) ou hostapd (en mode Point d'accès ou Ad-hoc)."
+
+msgid "Waiting for changes to be applied..."
+msgstr "En attente de l'application des changements..."
+
+msgid "Waiting for command to complete..."
+msgstr "En attente de la fin de la commande..."
+
+msgid "Warning"
+msgstr "Attention"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Attention : il reste des changements non appliqués qui seront perdus après "
+"redémarrage !"
+
+msgid "Wifi"
+msgstr "Wi-Fi"
+
+msgid "Wireless"
+msgstr "Sans-fil"
+
+msgid "Wireless Adapter"
+msgstr "Module Wi-Fi"
+
+msgid "Wireless Network"
+msgstr "Réseau sans-fil"
+
+msgid "Wireless Overview"
+msgstr "Présentation des réseaux sans-fil"
+
+msgid "Wireless Security"
+msgstr "Sécurité des réseaux sans-fil"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Le Wi-Fi est désactivé ou non associé"
+
+msgid "Wireless is restarting..."
+msgstr "Le Wi-Fi est ré-initialisé…"
+
+msgid "Wireless network is disabled"
+msgstr "Le réseau Wi-Fi est désactivé"
+
+msgid "Wireless network is enabled"
+msgstr "Le réseau Wi-Fi est activé"
+
+msgid "Wireless restarted"
+msgstr "Wi-Fi ré-initialisé"
+
+msgid "Wireless shut down"
+msgstr "Wi-Fi arrêté"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Écrire les requêtes DNS reçues dans syslog"
+
+msgid "XR Support"
+msgstr "Gestion du mode XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Vous pouvez ici activer ou désactiver les scripts d'initialisation "
+"installés. Les changements seront pris en compte après un redémarrage.<br/"
+"><strong>Attention: Si vous désactivez des scripts essentiels comme \"réseau"
+"\", votre équipement pourrait ne plus être accessible&#160;!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Vous devez activer Java Script dans votre navigateur pour que LuCI "
+"fonctionne correctement."
+
+msgid "any"
+msgstr "n'importe lequel"
+
+msgid "auto"
+msgstr "auto"
+
+#, fuzzy
+msgid "automatic"
+msgstr "statique"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "ponté"
+
+msgid "create:"
+msgstr "créer:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "créer un bridge entre plusieurs interfaces"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "désactiver"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "expiré"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr "fichier dans lequel les baux DHCP seront stockés"
+
+msgid "forward"
+msgstr "transfert"
+
+msgid "full-duplex"
+msgstr "full-duplex"
+
+msgid "half-duplex"
+msgstr "half-duplex"
+
+msgid "help"
+msgstr "aide"
+
+msgid "hidden"
+msgstr "cacher"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "si la destination est un réseau"
+
+msgid "input"
+msgstr "entrée"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "fichier de résolution local"
+
+msgid "no"
+msgstr "non"
+
+msgid "no link"
+msgstr "pas de lien"
+
+msgid "none"
+msgstr "aucun"
+
+msgid "off"
+msgstr "Arrêté"
+
+msgid "on"
+msgstr "Actif"
+
+msgid "open"
+msgstr "ouvrir"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "routé"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "marqué"
+
+msgid "unknown"
+msgstr "inconnu"
+
+msgid "unlimited"
+msgstr "non limité"
+
+msgid "unspecified"
+msgstr "non précisé"
+
+msgid "unspecified -or- create:"
+msgstr "non précisé -ou- créer :"
+
+msgid "untagged"
+msgstr "non marqué"
+
+msgid "yes"
+msgstr "oui"
+
+msgid "« Back"
+msgstr "« Retour"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "Identifiant HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Il s'agit de l'identifiant de 32 octets codés en hexa, pas du nom de "
+#~ "connexion"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "2ème canal 40MHz supérieur"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "2ème canal 40MHz inférieur"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Accepter les publications du routeur"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Publier l'adressage IPv6 sur le réseau"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ID réseau publiée"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "La gamme autorisée va de 1 à 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Capacités HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Mode HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Modèle de routeur"
+
+#~ msgid "Router Name"
+#~ msgstr "Nom du routeur"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Envoyer des sollicitations au routeur"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "Indique la durée de préférence du préfixe publiée, en secondes"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Indique la durée de validité du préfixe publiée, en secondes"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Utiliser la durée de préférence"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Utiliser la durée de validité"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Attente du routeur…"
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Activer le serveur NTP intégré"
+
+#~ msgid "Active Leases"
+#~ msgstr "Baux actifs"
+
+#~ msgid "Open"
+#~ msgstr "Ouvert"
+
+#~ msgid "KB"
+#~ msgstr "Ko"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Débit"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Configuration / Appliquer"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Configuration / Changements"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Configuration / Annuler les changements"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "Adresse MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "Chiffré"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "Recherche <abbr title=\"Wireless Local Area Network\">WLAN</abbr>"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Choisissez le réseau auquel vous voulez affecter cette interface sans-"
+#~ "fil. Sélectionnez <em>non précisé</em> pour ne pas l'affecter à un réseau "
+#~ "ou remplissez le champ <em>créer</em> pour définir un nouveau réseau."
+
+#~ msgid "Create Network"
+#~ msgstr "Créer un réseau"
+
+#~ msgid "Link"
+#~ msgstr "Lien"
+
+#~ msgid "Networks"
+#~ msgstr "Réseaux"
+
+#~ msgid "Power"
+#~ msgstr "Puissance"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Réseaux Wi-Fi dans votre environnement"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "Adresse/préfixe en notation <abbr title=\"Classless Inter-Domain Routing"
+#~ "\">CIDR</abbr>"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "Serveur <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "Diffusion <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Adresse <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "Alias IP"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Configuration IPv6"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Note : si vous choisissez ici une interface faisant partie d'un autre "
+#~ "réseau, il sera déplacé dans ce réseau."
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Vraiment supprimer cet interface ? L'effacement ne peut être annulé !"
+#~ "\\nVous pourriez perdre l'accès à ce routeur si vous y êtes connecté par "
+#~ "cette interface."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Vraiment supprimer ce réseau sans-fil ? effacement ne peut être annulé !"
+#~ "\\nVous pourriez perdre l'accès à ce routeur si vous y êtes connecté par "
+#~ "ce réseau."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Vraiment arrêter cet interface « %s » ?\\nVous pourriez perdre l'accès à "
+#~ "ce routeur si vous y êtes connecté par cette interface."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Vraiment arrêter ce réseau ?\\nVous pourriez perdre l'accès à ce routeur "
+#~ "si vous y êtes connecté par ce réseau."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Les ports de votre routeur peuvent être configurés pour combiner "
+#~ "plusieurs VLANs dans lesquels les machines connectées peuvent dialoguer "
+#~ "directement l'une avec l'autre. Les VLANs sont souvent utilisés pour "
+#~ "séparer différences sous-réseaux. Bien souvent il y a un port d'uplink "
+#~ "pour une connexion vers un réseau plus vaste, comme internet et les "
+#~ "autres ports sont réservés au réseau local."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Activer l'utilisation de tampons"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6 par dessus IPv4"
+
+#~ msgid "Custom Files"
+#~ msgstr "Fichiers spécifiques"
+
+#~ msgid "Custom files"
+#~ msgstr "Fichiers spécifiques"
+
+#~ msgid "Detected Files"
+#~ msgstr "Fichiers détectés"
+
+#~ msgid "Detected files"
+#~ msgstr "Fichiers détectés"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Fichiers à conserver lors d'une mise à jour du micrologiciel"
+
+#~ msgid "General"
+#~ msgstr "Général"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Ici, vous pouvez personnaliser les réglages et les fonctionnalités de "
+#~ "LuCI."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Actions post-changements"
+
+#~ msgid ""
+#~ "The following files are detected by the system and will be kept "
+#~ "automatically during sysupgrade"
+#~ msgstr ""
+#~ "Les fichiers suivants ont été détectés par le système et seront "
+#~ "automatiquement préservés pendant la mise à jour"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Ces commandes seront executées automatiquement lorsqu'une configuration "
+#~ "UCI est appliquée, les changement prenant effet immédiatement."
+
+#~ msgid ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+#~ msgstr ""
+#~ "Voici une liste de motifs de sélection shell pour sélectionner les "
+#~ "fichiers et répertoires à inclure durant une mise à jour"
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "IU Web"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "Serveur <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
+
+#~ msgid "AHCP Settings"
+#~ msgstr "Paramètres AHCP"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "Essais de ping ARP"
+
+#~ msgid "ATM Settings"
+#~ msgstr "Paramètres ATM"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "Accepter les publications du routeur"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Point d'accès (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Options pppd supplémentaires"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "Plage autorisée de 1 à FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Déconnexion automatique"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Archive à restaurer"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configurer le serveur DNS local pour utiliser le serveur de nom fourni "
+#~ "par le pair PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Script de Connexion"
+
+#~ msgid "Create backup"
+#~ msgstr "Créer une archive de sauvegarde"
+
+#~ msgid "Default"
+#~ msgstr "Défaut"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Script de Déconnexion"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Editer la liste des paquets et le répertoire de destination"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "Activer les VLANs 4K"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Activer l'IPv6 sur le lien PPP"
+
+#~ msgid "Firmware image"
+#~ msgstr "Firmware image"
+
+#~ msgid "Forward DHCP"
+#~ msgstr "Transmission du DHCP"
+
+#~ msgid "Forward broadcasts"
+#~ msgstr "Transmission des diffusions"
+
+#~ msgid "HE.net Tunnel ID"
+#~ msgstr "Identifiant du tunnel HE.net"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Ici, vous pouvez sauvegarder et restaurer la configuration de votre "
+#~ "routeur et, si possible, restaurer la configuration par défaut du routeur."
+
+#~ msgid "Installation targets"
+#~ msgstr "Répertoires de destination"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Keep configuration files"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Maintenir la connexion"
+
+#~ msgid "Kernel"
+#~ msgstr "Noyau"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Laisser pppd remplacer la route par défaut courante pour utiliser "
+#~ "l'interface PPP après l'établissement de la connexion"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "pppd exécutera ce script après l'établissement du lien PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "pppd exécutera ce script avant de déconnecter le lien PPP"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Assurez-vous de fournir le bon code PIN ou vous pourriez bloquer votre "
+#~ "carte SIM !"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "La plupart d'entre eux sont des serveurs réseaux, qui vous offrent "
+#~ "certains services comme un accès shell, accéder à des pages comme LuCI, "
+#~ "faire du routage mesh, envoyer des e-mails ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr "Reconnexion si la connexion est perdue"
+
+#~ msgid "Override Gateway"
+#~ msgstr "Remplacer la passerelle"
+
+#~ msgid "PIN code"
+#~ msgstr "code PIN"
+
+#~ msgid "PPP Settings"
+#~ msgstr "Paramètres PPP"
+
+#~ msgid "Package lists"
+#~ msgstr "Listes de paquets"
+
+#~ msgid ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> specify the default "
+#~ "VLAN ID added to received untagged frames."
+#~ msgstr ""
+#~ "Le numéro de port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> indique "
+#~ "l'identifiant VLAN attribué aux trames non marquées"
+
+#~ msgid "Port PVIDs on %q"
+#~ msgstr "Port PVIDs sur %q"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr ""
+#~ "Etes-vous sûr de vouloir revenir à la configuration par défaut du "
+#~ "firmware ?"
+
+#~ msgid "Processor"
+#~ msgstr "Processeur"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Port Radius"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Serveur Radius"
+
+#~ msgid "Relay Settings"
+#~ msgstr "Paramètres du relais"
+
+#~ msgid "Replace default route"
+#~ msgstr "Remplacer la route par défaut"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Revenir à la configuration par défaut du routeur"
+
+#~ msgid "Routing table ID"
+#~ msgstr "ID de la table de routage"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Secondes à attendre pour que le modem soit prêt avant d'essayer de se "
+#~ "connecter"
+
+#~ msgid "Send Router Solicitiations"
+#~ msgstr "Envoyer des sollicitations de routeur"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "Adresse IPv4 du serveur"
+
+#~ msgid "Service type"
+#~ msgstr "Type de service"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr ""
+#~ "Les services et démons accomplissent certaines tâches sur votre "
+#~ "équipement."
+
+#~ msgid "Settings"
+#~ msgstr "Réglages"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Délai d'initialisation"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr ""
+#~ "Spécifiez ici des arguments de ligne de commande supplémentaire pour pppd"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Le noeud d'interface de votre modem, e.g. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "Délai d'inactivité à partir duquel la connexion est coupée"
+
+#~ msgid "Time Server (rdate)"
+#~ msgstr "Serveur de temps (rdate)"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "Configurion du tunnel"
+
+#~ msgid "Update package lists"
+#~ msgstr "Mettre à jour la liste des paquets"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Upload an libreCMC image file to reflash the device."
+
+#~ msgid "Upload image"
+#~ msgstr "Upload image"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Utiliser le DNS fourni"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid ""
+#~ "You can specify multiple DNS servers here, press enter to add a new "
+#~ "entry. Servers entered here will override automatically assigned ones."
+#~ msgstr ""
+#~ "Vous pouvez indiquer plusieurs serveurs DNS ici, tapez Entrée pour "
+#~ "ajouter un nouvel élément. Les serveurs ajoutés ici remplaceront ceux "
+#~ "attribués automatiquement."
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Vous avez besoin d'installer \"comgt\" pour le support UMTS/GPRS, \"ppp-"
+#~ "mod-pppoe\" pour le PPPoE, \"ppp-mod-pppoa\" pour le PPPoA ou \"pptp\" "
+#~ "pour le PPtP"
+
+#~ msgid "back"
+#~ msgstr "retour"
+
+#~ msgid "buffered"
+#~ msgstr "bufferisé"
+
+#~ msgid "cached"
+#~ msgstr "mis en cache"
+
+#~ msgid "free"
+#~ msgstr "libre"
+
+#~ msgid "static"
+#~ msgstr "statique"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> est une suite "
+#~ "logicielle d'applications Lua incluant un <abbr title=\"Model-View-"
+#~ "Controller\">MVC</abbr>-Webframework et une interface web pour "
+#~ "équipements embarqués. <abbr title=\"Lua Configuration Interface\">LuCI</"
+#~ "abbr> est sous license Apache."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "Clés <abbr title=\"Secure Shell\">SSH</abbr>"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr "Un serveur web HTTP/1.1 léger écrit en C et en Lua, créé pour LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr "Un serveur web léger qui peut être utilisé pour LuCI."
+
+#~ msgid "About"
+#~ msgstr "A propos"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "Connexions IP actives"
+
+#~ msgid "Addresses"
+#~ msgstr "Adresses"
+
+#~ msgid "Admin Password"
+#~ msgstr "Mot de passe administrateur"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Domaine d'authentification"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Port du pont"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr "Changer le mot de passe du système (Utilisateur \"root\")"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Client + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Fichier de configuration"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Délai de connexion"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Contributeurs"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP désigné"
+
+#~ msgid "Document root"
+#~ msgstr "Page racine"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Activer le maintien (Keep-Alive)"
+
+#~ msgid "Enable device"
+#~ msgstr "Activer ce périphérique"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Pont Ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Vous pouvez copier ici des clés SSH publiques (une par ligne) pour une "
+#~ "authentification SSH sur clés publiques."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Configuration IP"
+
+#~ msgid "Interface Status"
+#~ msgstr "État de l'interface"
+
+#~ msgid "Lead Development"
+#~ msgstr "Développeurs principaux"
+
+#~ msgid "Master"
+#~ msgstr "Point d'accès"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Point d'accès + WDS"
+
+#~ msgid "No address configured on this interface."
+#~ msgstr "Cette interface n'a Aucune adresse configurée."
+
+#~ msgid "Not configured"
+#~ msgstr "Pas configuré"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Mot de passe changé avec succès"
+
+#~ msgid "Plugin path"
+#~ msgstr "Chemin du greffon"
+
+#~ msgid "Ports"
+#~ msgstr "Ports"
+
+#~ msgid "Primary"
+#~ msgstr "Primaire"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Page d'accueil du projet"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+#~ msgid "Thanks To"
+#~ msgstr "Merci à"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr "Le domaine qui sera affiché lors de la fenêtre d'authentification."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Erreur inconnue"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "fichier de configuration par défaut : /etc/httpd.conf"
+
+#~ msgid "Enable this switch"
+#~ msgstr "Activer ce switch"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "Code d'erreur OPKG %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Liste des paquets mise à jour"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "Ré-initialiser le switch pendant la configuration"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Mettre à jour les paquets installés"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Les journaux des services ou du noyau peuvent être vus ici afin d'obtenir "
+#~ "un aperçu de leur état."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Ici, vous trouverez des informations sur l'état actuel du système comme "
+#~ "la fréquence processeur, utilisation mémoire et trafic réseau."
+
+#~ msgid "Search file..."
+#~ msgstr "Chercher un fichier..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> est une interface "
+#~ "graphique libre, flexible, et orientée utilisateur pour configurer "
+#~ "libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "Et maintenant que la fête commence !"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Nous souhaitons améliorer l'interface de manière permanente, vos retours "
+#~ "et suggestions sont primordiaux."
+
+#~ msgid "Hello!"
+#~ msgstr "Bonjour !"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Vous trouverez une page de navigation sur le côté gauche permettant "
+#~ "d'accèder aux différentes pages de configuration."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Dans les pages suivantes vous pouvez ajuster tous les réglages importants "
+#~ "de votre routeur."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "L'équipe LuCI"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr "Voici la page d'administration de LuCI."
+
+#~ msgid "User Interface"
+#~ msgstr "Interface utilisateur"
+
+#~ msgid "enable"
+#~ msgstr "activer"
+
+#~ msgid "(hidden)"
+#~ msgstr "(caché)"
+
+#~ msgid "(optional)"
+#~ msgstr "(optionnel)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "Port <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "Les serveurs <abbr title=\"Domain Name System\">DNS</abbr> du fichier de "
+#~ "résolution seront interrogés dans l'ordre"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "Nombre <abbr title=\"maximal\">max.</abbr> d'attributions <abbr title="
+#~ "\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr "taille maximum du paquet. EDNS.0 "
+
+#~ msgid "AP-Isolation"
+#~ msgstr "Isolation AP"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Ajouter ce réseau Wi-Fi au réseau physique"
+
+#~ msgid "Aliases"
+#~ msgstr "Alias"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Créer un réseau"
+
+#~ msgid "Devices"
+#~ msgstr "Equipements"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr ""
+#~ "Ne pas transmettre les requêtes de recherche inverse pour les réseaux "
+#~ "locaux"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Activer le serveur TFTP"
+
+#~ msgid "Errors"
+#~ msgstr "Erreurs"
+
+#~ msgid "Essentials"
+#~ msgstr "Essentiel"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Etendre le nom d'hôte"
+
+#~ msgid "First leased address"
+#~ msgstr "Première adresse attribuée"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Addresse matériel"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Ici vous pouvez configurer les équipements Wi-Fi installés."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignorer /etc/hosts"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Ad-Hoc"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Connexion Internet"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Client"
+
+#~ msgid "Leases"
+#~ msgstr "Baux"
+
+#~ msgid "Local Domain"
+#~ msgstr "Domaine local"
+
+#~ msgid "Local Network"
+#~ msgstr "Réseau Local"
+
+#~ msgid "Local Server"
+#~ msgstr "Serveur local"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Image de démarrage réseau"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr "Nom du réseau (ESSID)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Nombre d'adresses attribuées"
+
+#~ msgid "Path"
+#~ msgstr "Chemin"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Accomplir les actions"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Empêche la communication directe Client à Client"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Point d'accès"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Fichier de résolution"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Racine du serveur TFTP"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Les changements suivants ont été appliqués"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Lors d'une nouvelle installation, ces fichiers seront ajoutés à la "
+#~ "nouvelle installation."
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Avec DHCP, les machines connectées au réseau peuvent recevoir leurs "
+#~ "réglages réseau directement (adresse IP, masque de réseau, serveur "
+#~ "DNS, ...)"
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Vous pouvez faire fonctionner plusieurs réseaux Wi-Fi sur un seul "
+#~ "équipement. Il existe des limitations matérielles et liées au pilote. En "
+#~ "général vous pouvez faire fonctionner simultanément 1 réseau Ad-Hoc et 3 "
+#~ "points d'accès simultanément."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Vous avez besoin d'installer \"ppp-mod-pppoe\" pour le support PPPoE ou "
+#~ "\"pptp\" pour le PPtP"
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "additional hostfile"
+#~ msgstr "fichiers de noms d'hôtes supplémentaires"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "concatène le nom de domaine aux noms d'hôtes"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "reconnecter automatiquement"
+
+#~ msgid "concurrent queries"
+#~ msgstr "Requêtes concurrentes maximum"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr "désactiver DHCP sur cette interface"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "déconnecter après une inactivité de"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "Ne pas mettre en cache les requêtes négatives"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr "filtre les requêtes inutiles émises par les systèmes Windows"
+
+#~ msgid "installed"
+#~ msgstr "installé"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "localiser la réponse suivant l'émetteur de la requête"
+
+#~ msgid "not installed"
+#~ msgstr "pas installé"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr "empêche la mise en cache de requêtes DNS erronnées"
+
+#~ msgid "query port"
+#~ msgstr "port de requête"
+
+#~ msgid "transmitted / received"
+#~ msgstr "transmis / reçu"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "réseaux compris"
+
+#~ msgid "all"
+#~ msgstr "tous"
+
+#~ msgid "Code"
+#~ msgstr "Code"
+
+#~ msgid "Distance"
+#~ msgstr "Distance"
+
+#~ msgid "Legend"
+#~ msgstr "Légende"
+
+#~ msgid "Library"
+#~ msgstr "Bibliothèque"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "voir la page de man de '%s'"
+
+#~ msgid "Package Manager"
+#~ msgstr "Gestionnaire de paquets"
+
+#~ msgid "Service"
+#~ msgstr "Service"
+
+#~ msgid "Statistics"
+#~ msgstr "Statistiques"
+
+#~ msgid "zone"
+#~ msgstr "Zone"
diff --git a/trunk/package/luci/po/fr/commands.po b/trunk/package/luci/po/fr/commands.po
new file mode 100644
index 00000000..fac1aff9
--- /dev/null
+++ b/trunk/package/luci/po/fr/commands.po
@@ -0,0 +1,100 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-12-12 13:36+0200\n"
+"Last-Translator: maximeguillaud <maxime@mguillaud.net>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Une courte description de la commande configurée"
+
+msgid "Access command with"
+msgstr "Accéder à la commande par"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Autoriser l'exécution de la commande et le téléchargement de son résultat "
+"sans authentification préalable"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+"Autoriser l'utilisateur à fournir des arguments de ligne de commande "
+"supplémentaires"
+
+msgid "Arguments:"
+msgstr "Arguments :"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Données binaires non affichables, elle peuvent être téléchargées."
+
+msgid "Code:"
+msgstr "Code : "
+
+msgid "Collecting data..."
+msgstr "Récupération des données ..."
+
+msgid "Command"
+msgstr "Commande"
+
+msgid "Command failed"
+msgstr "Echec de la commande"
+
+msgid "Command line to execute"
+msgstr "Ligne de commande à exécuter"
+
+msgid "Command successful"
+msgstr "Commande réussie"
+
+msgid "Command:"
+msgstr "Commande :"
+
+msgid "Configure"
+msgstr "Configurer"
+
+msgid "Custom Commands"
+msgstr "Commandes personnalisées"
+
+msgid "Custom arguments"
+msgstr "Arguments personnalisés"
+
+msgid "Dashboard"
+msgstr "Tableau de bord"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Download"
+msgstr "Télécharger"
+
+msgid "Failed to execute command!"
+msgstr "Echec de l'exécution de la commande ! "
+
+msgid "Link"
+msgstr "Lien"
+
+msgid "Loading"
+msgstr "Chargement"
+
+msgid "Public access"
+msgstr "Accès public"
+
+msgid "Run"
+msgstr "Exécuter"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Cette page vous permet de configurer des commandes shell personnalisées, "
+"pouvant être invoquées facilement depuis l'interface web."
+
+msgid "Waiting for command to complete..."
+msgstr "En attente de la commande pour finir..."
diff --git a/trunk/package/luci/po/fr/coovachilli.po b/trunk/package/luci/po/fr/coovachilli.po
new file mode 100644
index 00000000..b95bb449
--- /dev/null
+++ b/trunk/package/luci/po/fr/coovachilli.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-11-06 13:16+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Configuration Réseau"
+
+msgid "RADIUS configuration"
+msgstr "Configuration RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Authentification UAM et MAC"
diff --git a/trunk/package/luci/po/fr/ddns.po b/trunk/package/luci/po/fr/ddns.po
new file mode 100644
index 00000000..13615a8e
--- /dev/null
+++ b/trunk/package/luci/po/fr/ddns.po
@@ -0,0 +1,89 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2012-11-06 13:19+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Vérifier si l'adresse IP a changé toutes les"
+
+msgid "Check-time unit"
+msgstr "Unité de temps pour la vérification"
+
+msgid "Custom update-URL"
+msgstr "URL de mise à jour personnalisée"
+
+msgid "Dynamic DNS"
+msgstr "DNS Dynamique"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Le DNS Dynamique permet au routeur d'être joint avec un nom d'hôte fixe bien "
+"que changeant dynamiquement d'adresse IP."
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Force update every"
+msgstr "Vérification forcée toutes les"
+
+msgid "Force-time unit"
+msgstr "Unité de temps pour la vérification forcée"
+
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Network"
+msgstr "Réseau"
+
+msgid "Password"
+msgstr "Mot de passe"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Source of IP address"
+msgstr "Source de l'adresse IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+msgid "custom"
+msgstr "personnalisé"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "interface"
+msgstr "interface"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "réseau"
+
+#~ msgid "Event interface"
+#~ msgstr "Événement sur l'interface"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "Sur quelle interface devrait démarrer le processus du script ddns."
diff --git a/trunk/package/luci/po/fr/diag_core.po b/trunk/package/luci/po/fr/diag_core.po
new file mode 100644
index 00000000..a5b4e6ad
--- /dev/null
+++ b/trunk/package/luci/po/fr/diag_core.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-11-06 13:21+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configuration des diagnostics"
+
+msgid "Diagnostics"
+msgstr "Diagnostiques"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Les diagnostics disponible ci-dessous dépendent des modules que vous avez "
+"installé sur votre appareil. "
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Les items de ce menu vous permettent d'accomplir des diagnostics sur votre "
+"système pour vous aider à le dépanner."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Ce menu vous permet de configurer des diagnostics réseau, comme des "
+"recherches de périphérique réseau et des tests par ping."
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d_diag"
diff --git a/trunk/package/luci/po/fr/diag_devinfo.po b/trunk/package/luci/po/fr/diag_devinfo.po
new file mode 100644
index 00000000..e3d3809b
--- /dev/null
+++ b/trunk/package/luci/po/fr/diag_devinfo.po
@@ -0,0 +1,220 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-26 12:49+0200\n"
+"Last-Translator: kyas <rimk_71@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Actions"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Beginning of MAC address range"
+msgstr "Début de la plage d'adresses MAC"
+
+msgid "Config Phone Scan"
+msgstr "Configurer la recherche de téléphone"
+
+msgid "Configure"
+msgstr "Configurer"
+
+msgid "Configure Scans"
+msgstr "Configurer la recherche"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Configurer la recherche d'appareils sur un réseau spécifié. Réduire le "
+"'Timeout', 'Repeat Count', et/ou  'Sleep Between Requests' peut augmenter la "
+"vitesse des scans, mais peut aussi ne pas trouver certains appareils."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Configurer la recherche d'appareils SIP supporté sur un réseau spécifié. "
+"Réduire le 'Timeout', 'Repeat Count', et/ou 'Sleep Between Requests' peut "
+"augmenter la vitesse des scans, mais peut aussi ne pas trouver certains "
+"appareils."
+
+msgid "Delete"
+msgstr "Supprimer"
+
+msgid "Device Scan Config"
+msgstr "Configuration de la recherche de périphériques"
+
+msgid "Device Type"
+msgstr "Type d'appareil"
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr "Périphériques sur le réseau"
+
+msgid "Edit"
+msgstr "Éditer"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "End of MAC address range"
+msgstr "Fin de la plage d'adresses MAC"
+
+msgid "Go to relevant configuration page"
+msgstr "Aller à la page de configuration appropriée"
+
+msgid "IP Address"
+msgstr "Adresse IP"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Invalid"
+msgstr "Invalide"
+
+msgid "Link to Device"
+msgstr "Lien vers le périphérique"
+
+msgid "MAC Address"
+msgstr "Adresse MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr "Modification info MAC du périphérique"
+
+msgid "MAC Device Override"
+msgstr "Modification de MAC de périphériques"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"Gamme d'adresses MAC et informations utilisées pour modifier les bases "
+"système et IEEE"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Durée d'attente en millisecondes entre les requêtes (par défaut 100)"
+
+msgid "Model"
+msgstr "Modèle"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Network Device Scan"
+msgstr "Analyse des périphériques réseau"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Configuration de l'analyse des périphériques réseau"
+
+msgid "Networks to scan for devices"
+msgstr "Réseaux à scanner pour les périphériques "
+
+msgid "Networks to scan for supported devices"
+msgstr "Réseaux à scanner pour les périphériques supporté"
+
+msgid "No SIP devices"
+msgstr "Pas de périphérique SIP"
+
+msgid "No devices detected"
+msgstr "Pas de périphérique détecté"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Nombre de tentatives d'envois des requêtes (1 par défaut)"
+
+msgid "OUI Owner"
+msgstr "OUI du fabricant"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Modifie les informations renvoyées par le script d'information « MAC vers "
+"Périphérique » (mac-to-devinfo) pour une gamme donnée d'adresses MAC"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Faire un scan ( Cela peut prendre quelques minutes)"
+
+msgid "Phone Information"
+msgstr "Informations concernant le téléphone"
+
+msgid "Phone Scan"
+msgstr "Recherche d'un téléphone"
+
+msgid "Phone Scanning Configuration"
+msgstr "Configuration de la recherche d'un téléphone"
+
+msgid "Phones"
+msgstr "Téléphones"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Raw"
+msgstr "Brut"
+
+msgid "Repeat Count"
+msgstr "Nombre de tentatives"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Refaire scans (cela peut prendre quelques minutes )"
+
+msgid "SIP Device Information"
+msgstr "Informations concernant le périphérique SIP"
+
+msgid "SIP Device Scan"
+msgstr "Recherche de périphérique SIP"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Configuration de la recherche de périphériques SIP"
+
+msgid "SIP Devices on Network"
+msgstr "Périphériques SIP sur le réseau"
+
+msgid "SIP devices discovered for"
+msgstr "Périphériques SIP  découvert pour"
+
+msgid "Scan for devices on specified networks."
+msgstr "Rechercher des périphériques sur les réseaux spécifiés."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Rechercher des périphériques SIP supportés sur les réseaux spécifiés."
+
+msgid "Scanning Configuration"
+msgstr "Analyse de la configuration"
+
+msgid "Scans for devices on specified networks."
+msgstr "Recherches des périphériques sur les réseaux spécifiés."
+
+msgid "Sleep Between Requests"
+msgstr "Attente entre les requêtes"
+
+msgid "Subnet"
+msgstr "Sous-réseau"
+
+msgid "This section contains no values yet"
+msgstr "Cette partie ne contient pas encore de valeur."
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Durée d'attente des réponses en secondes (par défaut 10)"
+
+msgid "Timeout"
+msgstr "Timeout"
+
+msgid "Use Configuration"
+msgstr "Utiliser la configuration"
+
+msgid "Vendor"
+msgstr "Vendeur"
+
+msgid "check other networks"
+msgstr "Explorer d'autres réseaux"
diff --git a/trunk/package/luci/po/fr/ffwizard.po b/trunk/package/luci/po/fr/ffwizard.po
new file mode 100644
index 00000000..b4ed531a
--- /dev/null
+++ b/trunk/package/luci/po/fr/ffwizard.po
@@ -0,0 +1,159 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/fr/firewall.po b/trunk/package/luci/po/fr/firewall.po
new file mode 100644
index 00000000..96f3f510
--- /dev/null
+++ b/trunk/package/luci/po/fr/firewall.po
@@ -0,0 +1,693 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2013-02-26 00:44+0200\n"
+"Last-Translator: val56 <valentin_sonet@hotmail.fr>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr "-- Choisissez SVP --"
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr "Paramètres avancés"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Permettre la transmission des <em>zones source</em> :"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Permettre la transmission vers les <em>zones destination</em> :"
+
+msgid "Any"
+msgstr "N'importe lequel"
+
+msgid "Covered networks"
+msgstr "Réseaux couverts"
+
+msgid "Custom Rules"
+msgstr "Régles spécifiques"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr "Adresse IP de destination"
+
+msgid "Destination address"
+msgstr "Adresse de destination"
+
+msgid "Destination port"
+msgstr "Port de destination"
+
+msgid "Destination zone"
+msgstr "Zone de destination"
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Supprimer les paquets invalides"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Enable NAT Loopback"
+msgstr "Activer le NAT sur la boucle-locale"
+
+msgid "Enable SYN-flood protection"
+msgstr "Activer la protection contre le SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr "Activer les traces (logs) sur cette zone"
+
+msgid "External IP address"
+msgstr "Adresse IP externe"
+
+msgid "External port"
+msgstr "Port externe"
+
+msgid "External zone"
+msgstr "Zone externe"
+
+msgid "Extra arguments"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua                    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+msgid "Firewall"
+msgstr "Pare-feu"
+
+msgid "Firewall - Custom Rules"
+msgstr "Pare-feu -- Règles personnalisées"
+
+msgid "Firewall - Port Forwards"
+msgstr "Pare-feu -- Redirections de ports"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Pare-feu -- Règles de trafic"
+
+msgid "Firewall - Zone Settings"
+msgstr "Pare-feu - Configuration des zones"
+
+msgid "Force connection tracking"
+msgstr "Forcer le suivi des connexions"
+
+msgid "Forward"
+msgstr "Transfert"
+
+msgid "Forward to"
+msgstr "Transférer à"
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 et IPv6"
+
+msgid "IPv4 only"
+msgstr "IPv4 seulement"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "IPv6 seulement"
+
+msgid "Input"
+msgstr "Entrée"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Transmission entre zones"
+
+msgid "Internal IP address"
+msgstr "Adresse IP interne"
+
+msgid "Internal port"
+msgstr "Port interne"
+
+msgid "Internal zone"
+msgstr "Zone interne"
+
+msgid "Limit log messages"
+msgstr "Limiter les messages de journalisation"
+
+msgid "MSS clamping"
+msgstr "Contrainte du MSS"
+
+msgid "Masquerading"
+msgstr "Masquage"
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr "Type ICMP correspondant"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Prendre en compte le trafic dirigé vers le port de destination donné (ou la "
+"gamme de ports) sur cet hôte"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "New SNAT rule"
+msgstr "Nouvelle règle SNAT"
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr "Nouvelle règle d'entrée"
+
+msgid "New port forward"
+msgstr "Nouvelle redirection de port"
+
+msgid "New source NAT"
+msgstr "Nouvelle source NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Montrer seulement le trafic entrant provenant de ces adresses MAC."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr "Ports ouverts sur le routeur"
+
+msgid "Other..."
+msgstr "Autre..."
+
+msgid "Output"
+msgstr "Sortie"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr "Redirections de port"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"La redirection de port permet aux ordinateurs distants sur Internet, de se "
+"connecter à un ordinateur ou service spécifié dans le réseau local privé."
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Rediriger le trafic entrant correspondant vers le port donné sur l'hôte "
+"interne"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
+"destinataires"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
+"sources"
+
+msgid "Restrict to address family"
+msgstr "Restreindre à cette famille d'adresses"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr "Adresse IP SNAT"
+
+msgid "SNAT port"
+msgstr "Port SNAT"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua                    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Traffic Redirection"
+# msgstr ""
+#
+# msgid ""
+# "Traffic redirection allows you to change the destination address of "
+# "forwarded packets."
+# msgstr ""
+#
+# msgid "Overview"
+# msgstr ""
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Source zone"
+# msgstr ""
+#
+# msgid "Source MAC-address"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+msgid "Source IP address"
+msgstr "Adresse IP source"
+
+msgid "Source MAC address"
+msgstr "Adresse MAC source"
+
+msgid "Source NAT"
+msgstr "Source NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr "Adresse source"
+
+msgid "Source port"
+msgstr "Port source"
+
+msgid "Source zone"
+msgstr "Zone source"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
+"du trafic réseau."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Les options ci-dessous contrôlent les politiques de transmission entre cette "
+"zone (%s) et les autres zones. <em>Zones de destination</em> couvre le "
+"trafic transfmis <strong>venant de %q</strong>. <em>Zones source</em> "
+"correspond au trafic transféré d'autres zones <strong> à destination de %q</"
+"strong>. La règle de transmission est <em>unidirectionnelle</em>, la "
+"transmission du LAN au WAN n'implique <em>pas</em> également l'autorisation "
+"de transmission du WAN au LAN."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Cette page vous permet de modifier les propriétés avancées parmi les entrées "
+"de redirection de port. Dans la plupart des cas, cela n'est pas nécessaire "
+"de modifier ces paramètres."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Cette section définit des propriétés communes de %q. Les options <em>entrée</"
+"em> et <em>sortie</em> définissent les politiques par défaut pour le trafic "
+"entrant et sortant de cette zone, tandis que l'option <em>transmission</em> "
+"décrit la politique pour le trafic transmis entre différents réseaux dans "
+"cette zone. Les <em>réseaux couverts</em> indiquent quels réseaux "
+"disponibles sont membre de cette zone."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr "Règles de trafic"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr "Zone %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zone ⇒ Transmissions"
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "accepter"
+
+#, fuzzy
+msgid "any"
+msgstr "tous"
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr "ignorer"
+
+msgid "reject"
+msgstr "rejeter"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Destination"
+
+#~ msgid "Family"
+#~ msgstr "Famille"
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
+#~ msgid "Via"
+#~ msgstr "Via"
+
+#~ msgid "(optional)"
+#~ msgstr "(optionnel)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "Adresse de destination voulue"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Port interne (optionnel)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Options avancées"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua                    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Destination port"
+# msgstr ""
+#
+# msgid "Action"
+# msgstr ""
+#
+# msgid "drop"
+# msgstr ""
+#
+# msgid "accept"
+# msgstr ""
+#
+# msgid "reject"
+# msgstr ""
+#
+#~ msgid "Advanced Rules"
+#~ msgstr "Règles avancées"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Les règles avancées vous laissent personnaliser le pare-feu selon vos "
+#~ "besoins. Seules les nouvelles connexions seront prises en compte. Les "
+#~ "paquets appartenant à des connexions déjà ouvertes sont automatiquement "
+#~ "admis à passer le pare-feu."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Règles spécifiques (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Équipement"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Pour le DNAT, sélectionne le trafic entrant correspondant à l'adresse IP "
+#~ "destinataire. Pour le SNAT, ré-écrit l'adresse source avec l'adresse "
+#~ "donnée."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Prendre en compte le trafic entrant provenant du port source donné (ou la "
+#~ "gamme de ports) sur l'hôte client"
+
+#~ msgid "Overview"
+#~ msgstr "Vue d'ensemble"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "External port"
+# msgstr ""
+#
+# msgid "Internal IP address"
+# msgstr ""
+#
+#~ msgid "Port forwarding"
+#~ msgstr "Redirection de port"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "La redirection de port vous permet d'exposer des services réseaux de "
+#~ "votre réseau local au réseau externe."
+
+#~ msgid "Redirection type"
+#~ msgstr "Type de redirection"
+
+#~ msgid "Redirections"
+#~ msgstr "Redirections"
+
+#~ msgid "Rules"
+#~ msgstr "Règles"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua                 #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirection du trafic"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "La redirection de trafic vous permet de changer l'adresse de destination "
+#~ "des paquets transférés."
+
+#~ msgid "Network"
+#~ msgstr "Réseau"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua                  #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+#~ msgid "Traffic Control"
+#~ msgstr "Contrôle de trafic"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Trafic zone-à-zone"
+
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Ici, vous pouvez spécifier quel trafic réseau est autorisé à transiter "
+#~ "entre les zones réseau. Seules les nouvelles connexions seront prises en "
+#~ "compte. Les paquets appartenant à des connexions déjà ouvertes sont "
+#~ "automatiquement admis à passer le pare-feu. Si vous subissez des "
+#~ "problèmes de connexion occasionnels, essayer d'activer le MSS clamping; "
+#~ "sinon laissez-le désactivé pour des raisons de performance."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "Destination IP"
+#~ msgstr "IP de destination"
+
+#~ msgid "IP address"
+#~ msgstr "Adresse IP"
+
+#~ msgid "Source MAC-address"
+#~ msgstr "Adresse MAC source"
diff --git a/trunk/package/luci/po/fr/freifunk-policyrouting.po b/trunk/package/luci/po/fr/freifunk-policyrouting.po
new file mode 100644
index 00000000..3c9a17e0
--- /dev/null
+++ b/trunk/package/luci/po/fr/freifunk-policyrouting.po
@@ -0,0 +1,39 @@
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/fr/freifunk.po b/trunk/package/luci/po/fr/freifunk.po
new file mode 100644
index 00000000..028a2ce2
--- /dev/null
+++ b/trunk/package/luci/po/fr/freifunk.po
@@ -0,0 +1,395 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/fr/hd_idle.po b/trunk/package/luci/po/fr/hd_idle.po
new file mode 100644
index 00000000..4b54e27c
--- /dev/null
+++ b/trunk/package/luci/po/fr/hd_idle.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-11-06 15:20+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disque"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Enable debug"
+msgstr "Activer le débogage"
+
+msgid "Idle-time"
+msgstr "Temps d'inactivité"
+
+msgid "Idle-time unit"
+msgstr "Unité de temps"
+
+msgid "Settings"
+msgstr "Réglages"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle est un utilitaire pour arrêter la rotation des disques externes "
+"après une période d'inactivité."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
diff --git a/trunk/package/luci/po/fr/meshwizard.po b/trunk/package/luci/po/fr/meshwizard.po
new file mode 100644
index 00000000..c9f7b020
--- /dev/null
+++ b/trunk/package/luci/po/fr/meshwizard.po
@@ -0,0 +1,139 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 22:20+0200\n"
+"PO-Revision-Date: 2011-11-23 22:20+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Cochez ceci pour protéger votre réseau LAN des autres nœuds ou clients"
+
+msgid "Cleanup config"
+msgstr "Nettoyer la config"
+
+msgid "Configure this interface"
+msgstr "Configurer cette interface"
+
+msgid "DHCP IP range"
+msgstr "Gamme d'adresses IP pour DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "Le serveur DHCP donnera automatiquement des adresses IP aux clients"
+
+msgid "Enable DHCP"
+msgstr "Activer le serveur DHCP"
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Si vous sélectionnez ceci, la configuration sera nettoyée avant de "
+"positionner de nouvelles options de configuration."
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Mesh IP address"
+msgstr "Adresse IP maillée"
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr "Assistant de Maillage"
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr "Protéger le LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Sélectionnez ceci pour permettre aux autres d'utiliser votre connexion pour "
+"accéder à Internet."
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr "Partager votre connexion Internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"La gamme d'adresses IP utilisée pour attribuer des adresses IP aux clients "
+"(par ex. 10.1.2.1/28). Si ce lot d'adresses est compris dans le réseau "
+"maillé, il sera annoncé comme HNA, sinon du NAT sera utilisé. Si ce champ "
+"reste vide, les valeurs par défaut du profil de la communauté seront "
+"utilisées."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr "L'adresse IP donnée n'est pas dans le réseau maillé"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"C'est une adresse unique dans le réseau maillé (par ex. 10.1.1.1) et doit "
+"être enregistré dans votre communauté locale."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Cela configurera une nouvelle interface sans-fil virtuelle en mode Point "
+"d'Accès."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Cet assistant vous aidera à configurer votre routeur pour le réseau maillé "
+"Freifunk ou un autre réseau sans-fil communautaire du même genre."
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Point d'accès virtuel (VAP)"
+
+msgid "Wizard"
+msgstr "Assistant"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Votre matériel et les nœuds voisins doivent utiliser le même canal."
+
+msgid "recommended"
+msgstr "recommandé"
diff --git a/trunk/package/luci/po/fr/minidlna.po b/trunk/package/luci/po/fr/minidlna.po
new file mode 100644
index 00000000..d638b0cb
--- /dev/null
+++ b/trunk/package/luci/po/fr/minidlna.po
@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/fr/mmc_over_gpio.po b/trunk/package/luci/po/fr/mmc_over_gpio.po
new file mode 100644
index 00000000..64dc8992
--- /dev/null
+++ b/trunk/package/luci/po/fr/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-11-06 16:06+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "MMC/SD driver configuration"
+msgstr "Configuration driver MMC/SD"
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Settings"
+msgstr "Configuration"
diff --git a/trunk/package/luci/po/fr/multiwan.po b/trunk/package/luci/po/fr/multiwan.po
new file mode 100644
index 00000000..39b14217
--- /dev/null
+++ b/trunk/package/luci/po/fr/multiwan.po
@@ -0,0 +1,125 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-11-06 16:07+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Essais avant de déclarer un WAN défaillant"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Essais avant de déclarer qu'un WAN est rétabli"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Collecting data..."
+msgstr "Collection de données..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Configuration de règles pour diriger le trafic sortant à travers des liens "
+"WAN sécifiés."
+
+msgid "DNS Server(s)"
+msgstr "Serveur(s) DNS"
+
+msgid "Default Route"
+msgstr "Route par défaut"
+
+msgid "Destination Address"
+msgstr "Adresse de destination"
+
+msgid "Disable"
+msgstr "Désactiver"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Failing"
+msgstr "Défaillance"
+
+msgid "Failover Traffic Destination"
+msgstr "Destination du trafic en cas de défaillance"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Hôte(s) à pinguer pour valider le lien"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Delai max du ping de validation du lien"
+
+msgid "Health Monitor Interval"
+msgstr "Invervalle de validation du lien"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"La validation de liens détecte et corrige les changements du réseau et les "
+"connexions défaillantes."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Distribution d'équilibrage de charge"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Équilibrage de charge (compatibilité)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Équilibrage de charge (performance)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Statut Multi-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Règles de trafic avec des liens sortants multiples"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN permet l'utilisation de liens sortants multiples pour la "
+"l'équilibrage de charge et la répartition sur les autres en cas de "
+"défaillance."
+
+msgid "None"
+msgstr "Aucun"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "Recovering"
+msgstr "Récupération"
+
+msgid "Source Address"
+msgstr "Adresse source"
+
+msgid "Unknown"
+msgstr "Inconnu"
+
+msgid "WAN Interfaces"
+msgstr "Interfaces WAN"
+
+msgid "WAN Uplink"
+msgstr "Lien remontant WAN"
+
+msgid "all"
+msgstr "tous"
diff --git a/trunk/package/luci/po/fr/ntpc.po b/trunk/package/luci/po/fr/ntpc.po
new file mode 100644
index 00000000..d417e15e
--- /dev/null
+++ b/trunk/package/luci/po/fr/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-11-06 16:08+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Ajustement de l'horloge"
+
+msgid "Count of time measurements"
+msgstr "Nombre de mesures du temps"
+
+msgid "Current system time"
+msgstr "Temps système actuel"
+
+msgid "General"
+msgstr "Général"
+
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+msgid "Offset frequency"
+msgstr "Décalage en fréquence"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Synchronise le temps système"
+
+msgid "Time Server"
+msgstr "Serveur temps "
+
+msgid "Time Servers"
+msgstr "Serveurs de temps"
+
+msgid "Time Synchronisation"
+msgstr "Synchronisation du temps"
+
+msgid "Update interval (in seconds)"
+msgstr "Intervalle de mise à jour (en secondes)"
+
+msgid "empty = infinite"
+msgstr "vide = infini"
diff --git a/trunk/package/luci/po/fr/olsr.po b/trunk/package/luci/po/fr/olsr.po
new file mode 100644
index 00000000..e93a6bd2
--- /dev/null
+++ b/trunk/package/luci/po/fr/olsr.po
@@ -0,0 +1,692 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-01-15 05:35+0200\n"
+"Last-Translator: desillu <ledesillusionniste@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr "IPv6 multidiffusion"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/fr/openvpn.po b/trunk/package/luci/po/fr/openvpn.po
new file mode 100644
index 00000000..84a43c28
--- /dev/null
+++ b/trunk/package/luci/po/fr/openvpn.po
@@ -0,0 +1,580 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2014-01-26 12:53+0200\n"
+"Last-Translator: kyas <rimk_71@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p' ou 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Accepter les options envoyées par le serveur"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Add route after establishing connection"
+msgstr "Ajouter un routage après l'établissement de la connexion"
+
+msgid "Additional authentication over TLS"
+msgstr "Authentification supplémentaire par dessus TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Autoriser le trafic entre clients"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Permettre à plusieurs clients d'utiliser le même certificat"
+
+msgid "Allow only one session"
+msgstr "Autoriser seulement une session"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Autoriser l'hôte distant à changer d'adresse IP ou de port"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Maximum autorisé de clients connectés"
+
+msgid "Allowed maximum of internal"
+msgstr "Admis au maximum interne"
+
+msgid "Allowed maximum of new connections"
+msgstr "Maximum autorisé de nouvelles connexions"
+
+msgid "Append log to file"
+msgstr "Ajouter les journaux en fin de ce fichier"
+
+msgid "Authenticate using username/password"
+msgstr "S'authentifier par identifiant/mot-de-passe"
+
+msgid "Automatically redirect default route"
+msgstr "Rediriger automatiquement la route par défaut"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Voici ci-dessous la liste d'instances OpenVPN configurées et leur état "
+"courant"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+"Appelle une commande/script d'arrêt avant que le périphérique TUN/TAP soit "
+"fermé"
+
+msgid "Certificate authority"
+msgstr "Autorité des certificats"
+
+msgid "Change process priority"
+msgstr "Modifier la priorité du processus"
+
+msgid "Change to directory before initialization"
+msgstr "Aller dans ce répertorie avant l'initialisation"
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+"Confronter le certificat du distant à une liste des certificats révoqués "
+"(CRL)"
+
+msgid "Chroot to directory after initialization"
+msgstr "Faire un « chroot » dans ce répertoire après initialisation"
+
+msgid "Client is disabled"
+msgstr "Client désactivé"
+
+msgid "Configuration category"
+msgstr "Catégorie de configuration"
+
+msgid "Configure client mode"
+msgstr "Configurer le mode client"
+
+msgid "Configure server bridge"
+msgstr "Configurer le mode pont"
+
+msgid "Configure server mode"
+msgstr "Configurer le mode serveur"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Se connecter via un proxy Socks5"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Se connecter à un hôte distant via un mandataire HTTP"
+
+msgid "Connection retry interval"
+msgstr "Intervalle entre 2 tentatives de connexion"
+
+msgid "Cryptography"
+msgstr "Cryptage"
+
+msgid "Daemonize after initialization"
+msgstr "Transformer en démon après l'initialisation"
+
+msgid "Delay n seconds after connection"
+msgstr "Attends n secondes après la connexion"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+"Attends avant l'ouverture de tun/tap et l'exécution de scripts de mise en "
+"marche"
+
+msgid "Diffie Hellman parameters"
+msgstr "Paramètres Diffie Hellman"
+
+msgid "Directory for custom client config files"
+msgstr "Répertoire contenant vos fichiers de config client spécifiques"
+
+msgid "Disable Paging"
+msgstr "Désactiver la pagination"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Désactivé le vecteur d'initialisation cipher"
+
+msgid "Disable options consistency check"
+msgstr "Désactiver la vérification de la cohérence des options"
+
+msgid "Disable replay protection"
+msgstr "Désactiver la protection anti-rejeu"
+
+msgid "Do not bind to local address and port"
+msgstr "Ne pas attacher à l'adresse et au port local"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Ne pas exécuter réellement ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "Ne pas ajouter de routes automatiquement"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+"Ne pas copier en cache les mots de passe des options --askpass ou --auth-"
+"user-pass"
+
+msgid "Don't inherit global push options"
+msgstr "Ne pas hériter des options d'envoi globales"
+
+msgid "Don't log timestamps"
+msgstr "Ne pas journaliser les horodatages"
+
+msgid "Don't re-read key on restart"
+msgstr "Ne pas relire la clef au redémarrage"
+
+msgid "Don't require client certificate"
+msgstr "Ne pas exiger un certificat client"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Ne pas utiliser la compression adaptative LZO"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Ne pas alerter en cas d'incohérence d'ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Écrire les paramètres dans le journal"
+
+msgid "Empirically measure MTU"
+msgstr "Mesurer le MTU empiriquement"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Activer les systèmes de cryptages OpenSSL matériels"
+
+msgid "Enable Path MTU discovery"
+msgstr "Activer la découverte du MTU du chemin"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Activer le mode de cryptage à clef statique (non TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Activer le TLS et prendre le rôle du client"
+
+msgid "Enable TLS and assume server role"
+msgstr "Activer le TLS et prendre le rôle du serveur"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Autoriser la fragmentation des datagrammes en interne"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Activer l'interface de gestion sur <em>IP</em> <em>port</em>"
+
+msgid "Enabled"
+msgstr "Activé"
+
+msgid "Encryption cipher for packets"
+msgstr "Méthode de chiffrement des paquets"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Exécuter une commande shell après l'ajout des routes"
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+"Exécuter une commande Shell suite à un changement d'IP de l'hôte distant"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+"Lancé en mode serveur pour les nouvelles connexions client, quand le client "
+"n'est pas encore reconnu"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+"Lancé en mode serveur à chaque fois qu'une adresse/route IPv4 ou une adresse "
+"MAC est ajoutée à la table de routage interne d'OpenVPN"
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Arrêter suite à l'échec de la négociation TLS"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+"Obtenir le mot de passe du certificat depuis le terminal avant de passer en "
+"mode démon"
+
+msgid "HMAC authentication for packets"
+msgstr "Authentification HMAC des paquets"
+
+msgid "Handling of authentication failures"
+msgstr "Gestion des erreurs d'authentification"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+"Aide pour simplifier l'expression des --ping et --ping-restart dans les "
+"configurations en mode serveur"
+
+msgid "If hostname resolve fails, retry"
+msgstr "Si la résolution du nom de l'hôte échoue, ré-essayer"
+
+msgid "Instance \"%s\""
+msgstr "Instance \"%s\""
+
+msgid "Invalid"
+msgstr "Invalide"
+
+msgid "Keep local IP address on restart"
+msgstr "Conserver l'adresse IP locale lors du redémarrage"
+
+msgid "Keep remote IP address on restart"
+msgstr "Conserver l'adresse IP distante lors du redémarrage"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Conserver le périphérique tun/tap ouvert au redémarrage"
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr "Limiter les messages répétés dans les journaux"
+
+msgid "Local certificate"
+msgstr "Certificat local"
+
+msgid "Local host name or ip address"
+msgstr "Nom ou adresse IP de l'hôte local"
+
+msgid "Local private key"
+msgstr "Clef privée locale"
+
+msgid "Major mode"
+msgstr "Mode principal"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Rendre le périphérique tun compatible IPv6"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Nombre maximum de paquets TCP en attente d'émission"
+
+msgid "Networking"
+msgstr "Réseau"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Nombre de tampons de diffusion alloués"
+
+msgid "Number of lines for log file history"
+msgstr "Nombre de lignes de l'historique du fichier-journal"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Accepte seulement des connexions du nom X509 donné"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+"Traiter l'expiration des délais des pings seulement si les routes existent"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Instances OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Optimiser les écritures TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Envoyer à syslog et ne pas transformer en démon"
+
+msgid "Overview"
+msgstr "Vue d'ensemble"
+
+msgid "PKCS#12 file containing keys"
+msgstr "Fichier au format PKCS#12 contenant les clefs"
+
+msgid "Pass environment variables to script"
+msgstr "Transmettre les variables d'environnement au script"
+
+msgid "Persist replay-protection state"
+msgstr "Reconduire l'état de protection anti-rejeu"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Reconduire ou non le lot d'ifconfig"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+"Envoyer un ping à l'hôte distant toutes les n secondes sur le port TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr "Règle de sécurité appliqué à l'usage de programmes et scripts externes"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "Proxy timeout in seconds"
+msgstr "Délai d'attente du mandataire, en secondes"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Envoyer une option ifconfig au distant"
+
+msgid "Push options to peer"
+msgstr "Envoyer les options au client"
+
+msgid "Query management channel for private key"
+msgstr "Canal de requête de gestion pour clef privée"
+
+msgid "Randomly choose remote server"
+msgstr "Choisir au hasard un serveur distant"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Refuser la connexion en l'absence de config client spécifique"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Rediriger les signaux SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Nom ou adresse IP de l'hôte distant"
+
+msgid "Remote ping timeout"
+msgstr "Délai de ping du distant"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Renégocier la clé du canal de données après tant d'octets"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Renégocier la clé du canal de données après tant de paquets"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+"Renégocier la clé du canal de données après tant de temps (en secondes)"
+
+msgid "Replay protection sliding window size"
+msgstr "Taille de la fenêtre glissante pour la protection anti-rejeu"
+
+msgid "Require explicit designation on certificate"
+msgstr "Exiger l'appellation explicite sur le certificat"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Exiger l'utilisation explicite de la clé sur le certificat"
+
+msgid "Restart after remote ping timeout"
+msgstr "Redémarrer aprés le dépassement du délai de ping du distant"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Renvoyer l'expiration du délai sur le canal de contrôle TLS"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Ré-essayer indéfiniment suite à des erreurs du proxy HTTP"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Ré-essayer indéfiniment suite à des erreurs du proxy Socks"
+
+msgid "Route subnet to client"
+msgstr "Router le sous-réseau vers le client"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Exécuter en tant que serveur inetd ou xinetd"
+
+msgid "Run script cmd on client connection"
+msgstr "Exécuter une commande de script lors de la connexion d'un client"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Exécuter une commande de script lors de la déconnexion d'un client"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Exécuter les scripts up/down à tous les redémarrages"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Envoyer une notification au distant à la déconnexion"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Set GID to group"
+msgstr "Utiliser le GID de ce groupe"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Définir le MTU TCP/UDP"
+
+msgid "Set UID to user"
+msgstr "Utiliser l'UID de cet utilisateur"
+
+msgid "Set aside a pool of subnets"
+msgstr "Mettre de coté un lot de sous-réseaux"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Définir les options de mandataire HTTP étendu"
+
+msgid "Set output verbosity"
+msgstr "Définir la verbosité des écrits"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+"Définir la taille des tables de haché des adresses réelles et virtuelles"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Définir la taille de la pile de réception TCP/UDP"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Définir la taille de la pile d'envoi TCP/UDP"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Définir la taille de la pile TX tun/tap"
+
+msgid "Set tun/tap adapter parameters"
+msgstr "Définir les paramètres de l'adaptateur tun/tap"
+
+msgid "Set tun/tap device MTU"
+msgstr "Définir le MTU du périphérique tun/tap"
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Définir la borne supérieure du MSS TCP"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Gère la bande-passante du distant"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Commande Shell à exécuter après l'ouverture du périphérique tun"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Commande Shell à exécuter après la fermeture du périphérique tun"
+
+msgid "Shell command to verify X509 name"
+msgstr "Commande shell de vérification du nom X509"
+
+msgid "Silence the output of replay warnings"
+msgstr "Supprime les messages d'alertes anti-rejeu"
+
+msgid "Size of cipher key"
+msgstr "Taille de la clé de cryptage"
+
+msgid "Specify a default gateway for routes"
+msgstr "Définir la passerelle par défaut des routes"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Démarrer OpenVPN dans un état d'hibernation"
+
+msgid "Start/Stop"
+msgstr "Démarrer/Arrêter"
+
+msgid "Started"
+msgstr "Démarré"
+
+msgid "Status file format version"
+msgstr "Version du format du fichier de status"
+
+msgid "Switch to advanced configuration »"
+msgstr "Afficher les paramètres de configuration avancés"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Numéro de port TCP/UDP valable pour l'hôte local et l'hôte distant"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Numéro de port TCP/UDP pour l'hôte local (par défaut 1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Numéro de port TCP/UDP pour l'hôte distant (par défaut 1194)"
+
+msgid "TLS cipher"
+msgstr "Méthode de chiffrement TLS"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Répertoire pour le fichier temporaire lié à la connexion d'un client"
+
+msgid "Timeframe for key exchange"
+msgstr "Période d'un échange de clés"
+
+msgid "Type of used device"
+msgstr "Type de périphérique utilisé"
+
+msgid "Use fast LZO compression"
+msgstr "Utiliser la compression LZO rapide"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Utiliser des adresses individuelles plutôt que des sous-réseaux en /30"
+
+msgid "Use protocol"
+msgstr "Utiliser le protocole"
+
+msgid "Use tun/tap device node"
+msgstr "Utiliser le périphérique tun/tap"
+
+msgid "Use username as common name"
+msgstr "Utiliser le nom d'utilisateur comme nom « commun » (du certificat)"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "Écrire le journal dans le fichier"
+
+msgid "Write process ID to file"
+msgstr "Écrire le numéro de processus dans le fichier"
+
+msgid "Write status to file every n seconds"
+msgstr "Écrire le status dans le fichier chaque n secondes"
+
+msgid "no"
+msgstr "non"
+
+msgid "tun/tap device"
+msgstr "Périphérique tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr "Délai d'inactivité tun/tap"
+
+msgid "yes (%i)"
+msgstr "oui (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "Afficher les paramètres de configuration standards"
+
+#~ msgid "openvpn_%s"
+#~ msgstr "openvpn_%s"
+
+#~ msgid "openvpn_%s_desc"
+#~ msgstr "openvpn_%s_desc"
diff --git a/trunk/package/luci/po/fr/p2pblock.po b/trunk/package/luci/po/fr/p2pblock.po
new file mode 100644
index 00000000..524d3d08
--- /dev/null
+++ b/trunk/package/luci/po/fr/p2pblock.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-13 21:39+0200\n"
+"PO-Revision-Date: 2012-01-15 07:06+0200\n"
+"Last-Translator: desillu <ledesillusionniste@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Block Time"
+msgstr "Temps de blocage"
+
+msgid "Enable P2P-Block"
+msgstr "Activer le blocage P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Protocoles de couche 7"
+
+msgid "P2P-Block"
+msgstr "Blocage P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"Le blocage P2P est un mécanisme de liste grise pour bloquer divers "
+"protocoles de pair-à-pair de clients non autorisés."
+
+msgid "Portrange"
+msgstr "Gamme de ports"
+
+msgid "Whitelisted IPs"
+msgstr "Adresses IP autorisées"
+
+msgid "seconds"
+msgstr "secondes"
diff --git a/trunk/package/luci/po/fr/p910nd.po b/trunk/package/luci/po/fr/p910nd.po
new file mode 100644
index 00000000..5621e102
--- /dev/null
+++ b/trunk/package/luci/po/fr/p910nd.po
@@ -0,0 +1,56 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-01-15 07:08+0200\n"
+"Last-Translator: desillu <ledesillusionniste@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Bidirectional mode"
+msgstr "Mode bi-directionnel"
+
+msgid "Device"
+msgstr "Périphérique"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Vous devez d'abord installer les paquets pour gérer des imprimantes USB "
+"(kmod-usb-printer) ou sur port parallèle (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Paramètres"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "Port d'écoute TCP."
+
+msgid "enable"
+msgstr "activer"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Serveur d'impression"
+
+#~ msgid "port_help"
+#~ msgstr "aide_port"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr ""
+#~ "p910nd écoute sur le port 910+N, par exemple 9100 pour la première "
+#~ "imprimante."
diff --git a/trunk/package/luci/po/fr/pbx-voicemail.po b/trunk/package/luci/po/fr/pbx-voicemail.po
new file mode 100644
index 00000000..0ccaa502
--- /dev/null
+++ b/trunk/package/luci/po/fr/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/fr/pbx.po b/trunk/package/luci/po/fr/pbx.po
new file mode 100644
index 00000000..971a6964
--- /dev/null
+++ b/trunk/package/luci/po/fr/pbx.po
@@ -0,0 +1,484 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/fr/polipo.po b/trunk/package/luci/po/fr/polipo.po
new file mode 100644
index 00000000..f4e49aea
--- /dev/null
+++ b/trunk/package/luci/po/fr/polipo.po
@@ -0,0 +1,206 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/fr/qos.po b/trunk/package/luci/po/fr/qos.po
new file mode 100644
index 00000000..a4a81f12
--- /dev/null
+++ b/trunk/package/luci/po/fr/qos.po
@@ -0,0 +1,97 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2012-11-06 16:08+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Calculer la surcharge"
+
+msgid "Classification Rules"
+msgstr "Règles de classification"
+
+msgid "Classification group"
+msgstr "Groupe de classification"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Hôte destinataire"
+
+msgid "Download speed (kbit/s)"
+msgstr "Vitesse de téléchargement (kbit/s)"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Half-duplex"
+msgstr "Demi-duplex"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Number of bytes"
+msgstr "Nombre d'octets"
+
+msgid "Ports"
+msgstr "Ports"
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr "Qualité de service"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Source host"
+msgstr "Hôte source"
+
+msgid "Target"
+msgstr "Cible"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Vitesse de téléversement (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Avec la <abbr title=\"Quality of Service\">QoS</abbr>, vous pouvez donner "
+"des priorités au trafic réseau en fonction des adresses, des ports ou des "
+"services concernés."
+
+msgid "all"
+msgstr "tous"
+
+msgid "default"
+msgstr "par défaut"
+
+msgid "express"
+msgstr "express"
+
+msgid "low"
+msgstr "lent"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "prioritaire"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "qos_connbytes"
diff --git a/trunk/package/luci/po/fr/radvd.po b/trunk/package/luci/po/fr/radvd.po
new file mode 100644
index 00000000..b26e6e06
--- /dev/null
+++ b/trunk/package/luci/po/fr/radvd.po
@@ -0,0 +1,472 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-11-23 22:32+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: German\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "6to4 interface"
+msgstr "Interface 6to4"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Addresses"
+msgstr "Adresses"
+
+msgid "Advanced"
+msgstr "Avancé"
+
+msgid "Advertise Home Agent flag"
+msgstr "Drapeau de publication de l'agent Personnel (Home Agent)"
+
+msgid "Advertise router address"
+msgstr "Publier l'adresse du routeur"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Suffixes de domaines publiés"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"IPv6 RDNSS publié. S'il est vide, l'adresse IPv6 courante de l'interface est "
+"utilisée"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Préfixes IPv6 publiés"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Préfixes IPv6 publiés. Si c'est vide, le préfixe actuel de l'interface est "
+"utilisé"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Publie la capacité Home Agent d'IPv6 Mobile (RFC 3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "Publie la capacité d'enregistrement d'un Routeur Mobile (NEMO basique)"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Publie le temps d'accès présumé en milli-secondes des voisins dans le RA "
+"s'il est spécifié. 0 désactive les publications d'accessibilité"
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Publie le nombre de sauts par défaut pour les paquets unicast sortants dans "
+"le RA. 0 désactive les publications de nombre de sauts"
+
+msgid "Advertises the default router preference"
+msgstr "Publie la préférence du routeur par défaut"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+"Publie la valeur donnée de MTU dans les messages RA. 0 désactive la "
+"publication du MTU"
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+"Publie la durée du routeur par défaut, en secondes. 0 indique que le nœud "
+"n'est pas un routeur par défaut"
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+"Publie la durée en secondes pendant laquelle le routeur offre les services "
+"IPv6 Mobile d'agent personnel (Home Agent)"
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+"Publie le temps d'attente en millisecondes entre deux messages de "
+"sollicitation de voisinage dans le RA. 0 indique de ne pas retransmettre les "
+"publications"
+
+msgid "Advertising"
+msgstr "Publication"
+
+msgid "Autonomous"
+msgstr "Autonome"
+
+msgid "Clients"
+msgstr "Clients"
+
+msgid "Configuration flag"
+msgstr "Drapeau de configuration"
+
+msgid "Current hop limit"
+msgstr "Limite de sauts actuelle"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Configuration DNSSL"
+
+msgid "Default lifetime"
+msgstr "Durée de vie par défaut"
+
+msgid "Default preference"
+msgstr "Préférence par défaut"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Enable advertisements"
+msgstr "Activer les publications"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Activer les publications et sollicitations du routeur"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+"Active le protocole d'auto-configuration administrée à états supplémentaire "
+"(RFC 2462)"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+"Active l'auto-configuration d'informations autres que l'adresse "
+"supplémentaires (RFC 2462)"
+
+msgid "General"
+msgstr "Général"
+
+msgid "Home Agent information"
+msgstr "Informations de l'agent personnel (Home Agent)"
+
+msgid "Home Agent lifetime"
+msgstr "Durée de vie de l'agent personnel (Home Agent)"
+
+msgid "Home Agent preference"
+msgstr "Préférence de l'agent personnel (Home Agent)"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "Inclure les informations de l'agent personnel (Home Agent) dans le RA"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+"Inclure l'option de l'intervalle de publication de Mobile IPv6 dans le RA"
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr "Inclure l'adresse de niveau lien de l'interface sortante dans le RA"
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+"Indique que l'adresse de l'interface est envoyée à la place du préfixe "
+"réseau, comme demandé par la norme IPv6 Mobile"
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+"Indique que le lien sous-jacent ne peut faire de publication « broadcast », "
+"pour éviter l'envoi de publications non sollicitées"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+"Indique que ce préfixe peut être utilisé pour la configuration autonome des "
+"adresses (RFC 4862)"
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+"Indique que ce préfixe peut être utilisé pour la détermination des adresses "
+"liées-au-support (On-Link, RFC 4861)"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Interface Configuration"
+msgstr "Configuration de l'interface"
+
+msgid "Interface required"
+msgstr "Interface nécessaire"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Lifetime"
+msgstr "Durée de vie"
+
+msgid "Link MTU"
+msgstr "MTU du lien"
+
+msgid "Managed flag"
+msgstr "Indicateur de gestion"
+
+msgid "Max. interval"
+msgstr "Intervalle Max"
+
+msgid "Maximum advertisement interval"
+msgstr "Intervalle maximum de publication"
+
+msgid "Minimum advertisement delay"
+msgstr "Délai de publication minimum"
+
+msgid "Minimum advertisement interval"
+msgstr "Intervalle minimum de publication"
+
+msgid "Mobile IPv6"
+msgstr "IPv6 Mobile"
+
+msgid "Mobile IPv6 interval option"
+msgstr "Option d'intervalle pour l'IPv6 Mobile"
+
+msgid "Mobile IPv6 router registration"
+msgstr "Enregistrement du routeur pour IPv6 Mobile"
+
+msgid "Multicast"
+msgstr "Multicast"
+
+msgid "On-link"
+msgstr "lié-au-support (On-link)"
+
+msgid "On-link determination"
+msgstr "Détermination de la liaison-au-support (On-link)"
+
+msgid "Preference"
+msgstr "Préférence"
+
+msgid "Preferred lifetime"
+msgstr "Durée de vie préférée"
+
+msgid "Prefix"
+msgstr "Préfixe"
+
+msgid "Prefix Configuration"
+msgstr "Configuration du préfixe"
+
+msgid "Prefixes"
+msgstr "Préfixes"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "Configuration RDNSS"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Interface %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Préfixe"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Routage"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"Radvd est un démon de publication de routage pour IPv6. Il écoute des "
+"sollicitations de routage (Router Sollicitation) et envoie des publications "
+"de routage (Router Advertisement) comme décrit dans la RFC 4861."
+
+msgid "Reachable time"
+msgstr "temps d'accès"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"Restreint la communication aux clients spécifiés, laissez vide pour utiliser "
+"le multicast"
+
+msgid "Retransmit timer"
+msgstr "Délai de retransmission"
+
+msgid "Route Configuration"
+msgstr "Configuration du routage"
+
+msgid "Routes"
+msgstr "Routes"
+
+msgid "Source link-layer address"
+msgstr "Adresse-source de niveau lien"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+"Décrit le nom d'une interface logique de laquelle le préfixe 6to4 sera "
+"déduit. Les adresses IPv4 des interfaces publiques sont combinées avec "
+"2002::/3 et la valeur de l'option de préfixe"
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+"Indique le nom de l'interface logique auquelle cette section est rattachée"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr "Indique la préférence associée au routeur par défaut"
+
+msgid "Suffix"
+msgstr "Suffixe"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Temps maximum autorisé entre deux émissions de publications multicast non "
+"sollicitées du routeur depuis cette interface, en secondes"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+"Temps minimum autorisé entre deux émissions de publications multicast du "
+"routeur depuis cette interface, en secondes"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Temps minimum autorisé entre deux émissions de publications multicast non "
+"sollicitées du routeur depuis cette interface, en secondes"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr "Préférence pour l'agent personnel (Home Agent) envoyant ce RA"
+
+msgid "Timing"
+msgstr "Délai"
+
+msgid "Unicast only"
+msgstr "Unicast seulement"
+
+msgid "Valid lifetime"
+msgstr "Durée de la validité"
+
+msgid "Validity time"
+msgstr "Durée de validité"
+
+msgid "default"
+msgstr "Défaut"
+
+msgid "high"
+msgstr "haut"
+
+msgid "low"
+msgstr "bas"
+
+msgid "medium"
+msgstr "moyen"
+
+msgid "no"
+msgstr "non"
+
+msgid "yes"
+msgstr "oui"
+
+#~ msgid "Advertised IPv6 prefix"
+#~ msgstr "Préfixe IPv6 publié"
+
+#~ msgid ""
+#~ "Advertised IPv6 prefix. If empty, the current interface prefix is used"
+#~ msgstr ""
+#~ "Préfixe IPv6 publié. S'il est vide, le préfixe actuel de l'interface est "
+#~ "utilisé"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that addresses generated from "
+#~ "the prefix via stateless address autoconfiguration remain preferred. Use "
+#~ "0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Publie la durée en secondes pendant laquelle les adresses générées depuis "
+#~ "le préfixe via l'auto-configuration sans état restent préférées. 0 "
+#~ "indique une durée infinie"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that the prefix is valid for the "
+#~ "purpose of on-link determination. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Publie la durée en secondes pendant laquelle le préfixe est valable pour "
+#~ "le choix des adresses liées-au-support (on-link). 0 indique une durée "
+#~ "infinie"
+
+#~ msgid ""
+#~ "Indicates whether that RDNSS continues to be available to hosts even if "
+#~ "they moved to a different subnet"
+#~ msgstr ""
+#~ "Indique si le RDNSS contine d'être disponible aux hôtes même s'ils ont "
+#~ "migré sur un sous-réseau différent"
+
+#~ msgid "Open"
+#~ msgstr "Ouvert"
+
+#~ msgid ""
+#~ "Specifies the lifetime associated with the route in seconds. Use 0 to "
+#~ "specify an infinite lifetime"
+#~ msgstr ""
+#~ "Précise la durée de vie d'une route, en secondes. Utiliser 0 pour une "
+#~ "durée de vie infinie"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the DNSSL entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Indique la durée maximum d'utilisation des entrées DNSSL pour la "
+#~ "résolution de nom. Utiliser 0 pour une durée infinie"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the RDNSS entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Indique la durée maximum d'utilisation des entrées RDNSS pour la "
+#~ "résolution de nom. Utiliser 0 pour une durée infinie"
diff --git a/trunk/package/luci/po/fr/rrdtool.po b/trunk/package/luci/po/fr/rrdtool.po
new file mode 100644
index 00000000..95545db6
--- /dev/null
+++ b/trunk/package/luci/po/fr/rrdtool.po
@@ -0,0 +1,358 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/fr/samba.po b/trunk/package/luci/po/fr/samba.po
new file mode 100644
index 00000000..88779009
--- /dev/null
+++ b/trunk/package/luci/po/fr/samba.po
@@ -0,0 +1,84 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-11-23 22:36+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Invités autorisés"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Autoriser les utilisateurs système à atteindre leurs dossiers personnels via "
+"les partages réseau"
+
+msgid "Allowed users"
+msgstr "Utilisateurs autorisés"
+
+msgid "Create mask"
+msgstr "Maque de création"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Directory mask"
+msgstr "Masque des dossiers"
+
+msgid "Edit Template"
+msgstr "Éditer le modèle"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Éditer le modèle utilisé pour générer la configuration Samba."
+
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+msgid "Mask for new directories"
+msgstr "Masque pour les nouveaux dossiers"
+
+msgid "Mask for new files"
+msgstr "Masque pour les nouveaux fichiers"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Network Shares"
+msgstr "Partages réseau"
+
+msgid "Path"
+msgstr "Chemin"
+
+msgid "Read-only"
+msgstr "Lecture seule"
+
+msgid "Share home-directories"
+msgstr "Partager les dossiers personnels"
+
+msgid "Shared Directories"
+msgstr "Dossiers partagés"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Voici le contenu du fichier '/etc/samba/smb.conf.template' d'où sera généré "
+"votre configuration Samba. Les valeurs entre les symboles barre-verticale "
+" (« | ») ne doivent pas être modifiées, elles proviennent de l'onglet "
+"« Paramètres généraux »."
+
+msgid "Workgroup"
+msgstr "Groupe de travail"
diff --git a/trunk/package/luci/po/fr/splash.po b/trunk/package/luci/po/fr/splash.po
new file mode 100644
index 00000000..e525ab31
--- /dev/null
+++ b/trunk/package/luci/po/fr/splash.po
@@ -0,0 +1,337 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Accept"
+msgstr "Accepter"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr "Clients actifs"
+
+msgid "Allowed hosts/subnets"
+msgstr "Hôtes/sous-réseaux autorisés"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"La limitation de bande-passante des clients est activée seulement quand les "
+"limites montante et descendante sont données. Utilisez ici une valeur de 0 "
+"pour complètement désactiver cette limitation. Les clients autorisés (liste-"
+"blanche) ne sont pas limités."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr "interdire (liste-noire)"
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr "Durée d'autorisation"
+
+msgid "Client-Splash"
+msgstr "Client-Splash"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+"Client-Splash est un système d'authentification de HotSpot pour des réseaux "
+"sans-fil maillés."
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+"La vitesse de téléchargement des clients est limitée à cette valeur (en ko/s)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+"Les clients qui auront passé la page d'accueil seront autorisés à utiliser "
+"le réseau pendant ce nombre d'heures donné."
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr "La vitesse montante des clients sera limitée à cette valeur (en ko/s)"
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr "Refuser"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr "Limite en télé-chargement"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr "Zone du pare-feu"
+
+msgid "General"
+msgstr "Général"
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hôte"
+
+msgid "IP Address"
+msgstr "Adresse IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Intercepter le trafic-client sur cette interface"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Interfaces utilisés pour l'accueil."
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "Adresse MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "Les adresses MAC de cette liste sont bloquées."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"Adresses MAC des clients autorisés d'office. Ils n'ont pas à accepter la "
+"page d'accueil et ne sont pas limités en bande-passante."
+
+msgid "Netmask"
+msgstr "Masque"
+
+msgid "Network"
+msgstr "Réseau"
+
+msgid "No clients connected"
+msgstr "Aucun client connecté"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr "Politique"
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr "Sauvegarder"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr "Les règles du HotSpot sont intégrés dans cette zone du pare-feu"
+
+msgid "Splashtext"
+msgstr "Texte de la page d'accueil"
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr "Temps restant"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr "Trafic entrant/sortant"
+
+msgid "Upload limit"
+msgstr "Limite du trafic montant"
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr "Liste-blanche"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr "interdit (par liste-noire)"
+
+msgid "expired"
+msgstr "terminé"
+
+msgid "optional when using host addresses"
+msgstr "optionnel quand on utilise des adresses d'hôtes"
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr "À l'accueil"
+
+msgid "temporarily blocked"
+msgstr "bloqué(s) temporairement"
+
+msgid "unknown"
+msgstr "inconnu"
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr "autorisés par liste blanche"
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr ""
+#~ "Les hôtes et réseaux listés ici sont exclus de l'accueil du HotSpot, ils ne "
+#~ "seront jamais autorisés."
+
+#~ msgid "Edit Splash text"
+#~ msgstr "Modifier le texte de la page d'accueil"
+
+#~ msgid ""
+#~ "You can change the text that is displayed to clients here.<br /> It is "
+#~ "possible to use the following markers: ###COMMUNITY###, "
+#~ "###COMMUNITY_URL###, ###LEASETIME### and ###ACCEPT###.<br />Click here to "
+#~ "<a href='/luci/splash/'>test the splash page</a> after you saved it."
+#~ msgstr ""
+#~ "Vous pouvez changer ici le texte qui sera présenté aux clients.<br /> Il "
+#~ "est possible d'y inclure les marqueurs suivants : ###COMMUNITY###, "
+#~ "###COMMUNITY_URL###, ###LEASETIME### et ###ACCEPT###.<br />Cliquez ici <a "
+#~ "href=\\'/luci/splash/\\'>tester la page d'accueil</a> une fois celle-ci "
+#~ "sauvegardée."
diff --git a/trunk/package/luci/po/fr/statistics.po b/trunk/package/luci/po/fr/statistics.po
new file mode 100644
index 00000000..f1fec699
--- /dev/null
+++ b/trunk/package/luci/po/fr/statistics.po
@@ -0,0 +1,669 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-11-23 22:32+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Action (target)"
+msgstr "Action (cible)"
+
+msgid "Add command for reading values"
+msgstr "Ajoute une commande pour lire des valeurs"
+
+msgid "Add matching rule"
+msgstr "Ajouter une règle à surveiller"
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr "Ajoute une commande de notification"
+
+msgid "Base Directory"
+msgstr "Répertoire de base"
+
+msgid "Basic monitoring"
+msgstr "Surveillance de base"
+
+msgid "CPU Plugin Configuration"
+msgstr "Configuration du greffon sur le CPU"
+
+msgid "CSV Output"
+msgstr "Sortie au format CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Configuration du greffon CSV"
+
+msgid "Cache collected data for"
+msgstr "Mettre en cache les données collectées pendant"
+
+msgid "Cache flush interval"
+msgstr "Intervalle de vidange du cache"
+
+msgid "Chain"
+msgstr "Chaîne"
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Paramètres Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd est un petit démon collectant des données de sources variées à "
+"travers différents greffons. Sur ce page, vous pouvez modifier les "
+"paramètres généraux de ce démon collectd."
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr "Configuration du greffon DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Configuration du greffon DNS"
+
+msgid "Data collection interval"
+msgstr "Période de récupération des données"
+
+msgid "Datasets definition file"
+msgstr "Fichier de définition des lots de données"
+
+msgid "Destination ip range"
+msgstr "plage réseau de destination"
+
+msgid "Directory for collectd plugins"
+msgstr "Répertoire pour les greffons Collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Répertoire pour les sous-configurations"
+
+msgid "Disk Plugin Configuration"
+msgstr "Configuration du greffon Disque"
+
+msgid "Disk Space Usage"
+msgstr "Utilisation de l'espace-disque"
+
+msgid "Disk Usage"
+msgstr "Espace-disque"
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr "Période affichée »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Configuration du greffon des courriels"
+
+msgid "Email"
+msgstr "Courriel"
+
+msgid "Enable this plugin"
+msgstr "Activer ce greffon"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Configuration du greffon Exec"
+
+msgid "Filter class monitoring"
+msgstr "Surveillance des filtres"
+
+msgid "Firewall"
+msgstr "Pare-feu"
+
+msgid "Flush cache after"
+msgstr "Vidanger le cache après"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Transfert entre les adresses en écoute et du serveur"
+
+msgid "Graphs"
+msgstr "Graphiques"
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Vous pouvez définir ici des commandes externes qui seront démarrées par "
+"collectd pour lire certaines valeurs. Ces valeurs seront lisibles depuis "
+"stdout."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Vous pouvez définir ici des commandes externes qui seront démarrées par "
+"collectd quand certaines valeurs-seuil seront atteintes. Les valeurs "
+"induisant ces démarrages seront fournies aux commandes externes via stdin."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Vous pouvez définir ici les critères variés pour sélectionner les règles "
+"iptables à surveiller."
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nom de l'hôte"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr "Configuration du greffon IRQ"
+
+msgid "Ignore source addresses"
+msgstr "Ignorer les adresses-source"
+
+msgid "Incoming interface"
+msgstr "Interface entrante"
+
+msgid "Interface Plugin Configuration"
+msgstr "Configuration du greffon des Interfaces"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interrupts"
+msgstr "Interruptions"
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr "Configuration du greffon IPtables"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr "Hôte en écoute"
+
+msgid "Listen port"
+msgstr "Port en écoute"
+
+msgid "Listener interfaces"
+msgstr "Interfaces en écoute"
+
+msgid "Load Plugin Configuration"
+msgstr "Configuration du greffon de charge-système"
+
+msgid "Maximum allowed connections"
+msgstr "Nb de Connexions autorisées au maximum"
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr "Surveiller tous les ports en écoute locaux"
+
+msgid "Monitor devices"
+msgstr "Périphériques à surveiller"
+
+msgid "Monitor disks and partitions"
+msgstr "Disques et partitions à surveiller"
+
+msgid "Monitor filesystem types"
+msgstr "types de systèmes de fichier à surveiller"
+
+msgid "Monitor hosts"
+msgstr "Hôtes à surveiller"
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr "Surveiller les interruptions"
+
+msgid "Monitor local ports"
+msgstr "Surveiller les ports locaux"
+
+msgid "Monitor mount points"
+msgstr "Points de montage à surveiller"
+
+msgid "Monitor processes"
+msgstr "Processus à surveiller"
+
+msgid "Monitor remote ports"
+msgstr "Surveiller les ports destinataires"
+
+msgid "Name of the rule"
+msgstr "Nom de la règle"
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr "Configuration du greffon du lien-réseau"
+
+msgid "Network"
+msgstr "Réseau"
+
+msgid "Network Plugin Configuration"
+msgstr "Configuration du greffon réseau"
+
+msgid "Network plugins"
+msgstr "Greffons liés au réseau"
+
+msgid "Network protocol"
+msgstr "Protocole réseau"
+
+msgid "Number of threads for data collection"
+msgstr "Nombre de fils pour la récupération des données"
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr "Créer seulement des RRAs moyens"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Outgoing interface"
+msgstr "Interface sortante"
+
+msgid "Output plugins"
+msgstr "Greffons liés aux résultats"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Configuration du greffon Ping"
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr "Processus"
+
+msgid "Processes Plugin Configuration"
+msgstr "Configuration du greffon des processus"
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Processeur"
+
+msgid "Qdisc monitoring"
+msgstr "Surveillance Qdisc"
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr "Intervalle de la pulsation RRD"
+
+msgid "RRD step interval"
+msgstr "Intervalle d'avancement RRD"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Configuration du greffon RRDTool"
+
+msgid "Rows per RRA"
+msgstr "Lignes par RRA"
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Secondes"
+
+msgid "Server host"
+msgstr "Hôte du serveur"
+
+msgid "Server port"
+msgstr "Port du serveur"
+
+msgid "Shaping class monitoring"
+msgstr "Surveillance liées à la priorité"
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr "plage réseau source"
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr "Répertoire de stockage"
+
+msgid "Storage directory for the csv files"
+msgstr "Répertoire de stockage pour les fichiers CSV"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Stocke les données sous forme de taux plutôt que de valeurs absolues"
+
+msgid "Stored timespans"
+msgstr "Durée de la période enregistrée"
+
+msgid "System Load"
+msgstr "Charge-système"
+
+msgid "System plugins"
+msgstr "Greffons liés au système"
+
+msgid "TCP Connections"
+msgstr "Connexions TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Configuration du plugin des connexions TCP"
+
+msgid "TTL for network packets"
+msgstr "TTL des paquets-réseau"
+
+msgid "TTL for ping packets"
+msgstr "TTL des paquets ping"
+
+msgid "Table"
+msgstr "Table"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "Le greffon sur le CPU récupère des données sur l'usage du processeur."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"Le greffon CSV stocke les données collectées dans des fichiers au format CSV "
+"pour être traités ultérieurement par des programmes externes."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"Le plugin DF récupère des données sur l'utilisation de l'espace-disque sur "
+"différents périphériques, points de montage ou types de systèmes de fichiers."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"Le greffon Disque récupère des informations détaillées sur des disques ou "
+"partitions sélectionnées."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"Le greffon DNS récupère des données détaillées à propos du trafic lié au DNS "
+"sur des interfaces sélectionnées."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"Le greffon des courriels crée une socket UNIX qui peut être utilisée pour "
+"transmettre des données sur les courriels à un démon collectd en fonction. "
+"Ce greffon est d'abord destiné à être utilisé avec Mail::SpamAssasin::"
+"Plugin::Collectd mais peut être utilisé d'autres manières également."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"Le greffon Exec lance des commandes externes pour lire des valeurs ou "
+"notifie des processus externes quand certains seuils ont été atteints."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"Ce greffon des interfaces collecte des statistiques de trafic sur les "
+"interfaces sélectionnées."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"Le greffon IPtables surveillera des règles de pare-feu sélectionnées et "
+"collectera des informations sur les octets et paquets IP traités par chaque "
+"règle."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"Le greffon IRG surveillera le taux d'apparitions par seconde de chaque "
+"interruption sélectionnée. Si aucune interruption n'est sélectionnée, toutes "
+"sont surveillées."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+"Le greffon de charge-système collecte des données sur la charge générale du "
+"système."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"Le greffon de lien-réseau récupère sur les interfaces sélectionnées des "
+"informations avancées liées à la QOS, aux classes et au filtrage."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"Le greffon réseau fournit des communications-réseau entre différentes "
+"instances collectd : ce programme peut fonctionner à la fois comme client et "
+"serveur. En mode client, les données collectées localement sont transférées "
+"à un serveur, en mode serveur, l'instance collectd locale reçoit des "
+"informations d'autres hôtes."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"Le greffon ping envoie des paquets ICMP « echo reply » aux hôtes définis et "
+"mesure le temps d'aller-retour avec chacun."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"Le greffon des processus récupère des informations comme le temps CPU, les "
+"défauts de page et l'utilisation mémoire des processus définis."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"Le greffon RRDTool stocke les informations récupérées dans des fichiers de "
+"base de données RRD, sur lesquels s'appuient la génération de graphes.<br /"
+"><br /><strong>Attention : Un mauvais paramètrage peut entraîner une très "
+"grande consommation mémoire dans le répertoire temporaire, qui peut rendre "
+"le matériel inutilisable !</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Ce paquet d'outils statistiques s'appuie sur le logiciel <a href=\"http://"
+"collectd.org/index.shtml\">Collectd</a> et utilise <a href=\"http://oss."
+"oetiker.ch/rrdtool/\">RRD Tool</a> pour calculer les graphes issus des "
+"données collectées."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"Le greffon des connexions TCP récupère des informations sur les ouvertures "
+"de connexions TCP sur les ports spécifiés."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Cette section définit sur quelles interfaces collectd écoutera des "
+"connexions entrantes."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Cette section définit à quels serveurs sont envoyées les données collectées "
+"localement."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Tente de récupérer des noms d'hôtes complètement qualifiés"
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "Socket Unix"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Configuration du greffon de socket Unix"
+
+msgid "Used PID file"
+msgstr "Fichier PID utilisé"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr "Surveillance verbeuse"
+
+msgid "Wireless"
+msgstr "Sans-fil"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr "p.ex. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "p.ex. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "p.ex. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "Max. 16 caractères"
+
+msgid "reduces rrd size"
+msgstr "Diminuer la taille RRD"
+
+msgid "seconds; multiple separated by space"
+msgstr "En secondes ; séparer différentes valeurs par des espaces"
+
+msgid "server interfaces"
+msgstr "Interfaces du serveur"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "Le greffon sans-fil récupère des informations sur la puissance du signal "
+#~ "wifi, sa qualité et sur le bruit."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Configuration du greffon sans-fil"
diff --git a/trunk/package/luci/po/fr/tinyproxy.po b/trunk/package/luci/po/fr/tinyproxy.po
new file mode 100644
index 00000000..d359442a
--- /dev/null
+++ b/trunk/package/luci/po/fr/tinyproxy.po
@@ -0,0 +1,372 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-01-26 12:52+0200\n"
+"Last-Translator: kyas <rimk_71@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"<em>Via proxy</em> route les requêtes vers la cible donnée via le mandataire "
+"amont donné, <em>Reject access</em> interdit tout mandataire amont comme "
+"cible"
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Ajoute un en-tête HTTP \"X-Tinyproxy\" avec l'adresse IP du client aux "
+"requêtes retransmises"
+
+msgid "Allowed clients"
+msgstr "Clients autorisés"
+
+msgid "Allowed connect ports"
+msgstr "Ports de connexion autorisés"
+
+msgid "Bind address"
+msgstr "Adresse en écoute"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"Par défaut, le filtrage utilise des expressions POSIX basiques. Activez-ceci "
+"pour permettre l'utilisation d'expressions régulières étendues"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+"Par défaut, les chaînes de caractères des filtres sont utilisées sans faire "
+"attention à leurs casses. Activez-ceci pour les rendre sensible à la casse "
+"des caractères"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"Par défaut, le filtrage s'effectue sur les noms de domaines. Activez-ceci "
+"pour l'appliquer plutôt aux URLs"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"Par défaut, les règles de filtrages décrivent ce qui doit être interdit. "
+"Activez cette option pour n'autoriser que les noms de domaines ou URLs qui "
+"correspondent aux règles"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+"Ce peut être soit une adresse ou une gamme d'adresses IP, un nom de domaine, "
+"ou \".\" pour n'importe quel nom d'hôte sans domaine"
+
+msgid "Configuration"
+msgstr "Configuration"
+
+msgid "Connection timeout"
+msgstr "Délai de connexion"
+
+msgid "Default deny"
+msgstr "Interdit par défaut"
+
+msgid "Enable Tinyproxy server"
+msgstr "Activer le serveur Tinyproxy"
+
+msgid "Error page"
+msgstr "Page d'erreur"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "Impossible de récupérer les statistiques de l'URL:"
+
+msgid "Filter by RegExp"
+msgstr "Filtrage par RegExp"
+
+msgid "Filter by URLs"
+msgstr "Filtrage par URLs"
+
+msgid "Filter case-sensitive"
+msgstr "Filtrage sensible à la casse"
+
+msgid "Filter file"
+msgstr "Fichier des filtres"
+
+msgid "Filtering and ACLs"
+msgstr "Filtrage et ACLs"
+
+msgid "General settings"
+msgstr "Paramètres généraux"
+
+msgid "Group"
+msgstr "Groupe"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+"Modèle de fichier HTML à utiliser pour les requêtes de statistiques des hôtes"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "Modèle de fichier HTML à utiliser quand une erreur HTTP survient"
+
+msgid "Header whitelist"
+msgstr "Liste des en-têtes autorisés"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Liste des adresses IP ou gammes d'adresses IP autorisées à utiliser le "
+"serveur mandataire"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"Liste des ports autorisés pour la méthode CONNECT. Une valeur \"0\" unique "
+"autorises tous les ports"
+
+msgid "Listen address"
+msgstr "Adresse en écoute"
+
+msgid "Listen port"
+msgstr "Port en écoute"
+
+msgid "Log file"
+msgstr "Fichier journal"
+
+msgid "Log file to use for dumping messages"
+msgstr "Fichier-journal utilisé pour y copier les messages"
+
+msgid "Log level"
+msgstr "Niveau de log"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "Verbosité du journal du processus Tinyproxy"
+
+msgid "Max. clients"
+msgstr "Nombre max. de clients"
+
+msgid "Max. requests per server"
+msgstr "Nombre max. de requêtes par serveur"
+
+msgid "Max. spare servers"
+msgstr "Nombre Maximum de processus serveur"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "Nombre max autorisé de clients connectés en même temps"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+"Nombre maximum autorisé de requêtes par processus. S'il est dépassé, le "
+"processus est relancé. Un zéro désactive cette limite."
+
+msgid "Maximum number of prepared idle processes"
+msgstr "Nombre maximum de processus lancés, prêts à traiter des requêtes"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+"Une connexion inactive est maintenue ouverte pendant cette durée maximum (en "
+"secondes)"
+
+msgid "Min. spare servers"
+msgstr "Nombre Minimum de processus serveur"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "Nombre minimum de processus lancés, prêts à traiter des requêtes"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+"Nombre de processus lancés en sus, prêts à traiter des requêtes, au "
+"démarrage de Tinyproxy"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+"Fichier-texte contenant les URLs ou noms de domaines à filtrer, un par ligne"
+
+msgid "Policy"
+msgstr "Action"
+
+msgid "Privacy settings"
+msgstr "Paramètres de confidentialité"
+
+msgid "Reject access"
+msgstr "Refuser l'accès"
+
+msgid "Server Settings"
+msgstr "Paramètres du serveur"
+
+msgid "Server limits"
+msgstr "Limites du serveur"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+"Indique les noms des entêtes HTTP qui sont autorisées à transiter, tous les "
+"autres seront retirés. Laisser vide pour désactiver le filtrage des entêtes"
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "Indique le port HTTP où Tinyproxy est en écoute de requêtes"
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+"Indique le nom d'hôte que Tinyproxy utilisera dans l'entête HTTP « Via »"
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+"Décrit l'adresse que Tinyproxy utilisera pour les requêtes retransmises à "
+"l'extérieur"
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr "Indique les adresses où Tinyproxy est en écoute de requêtes"
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+"Indique le nom de groupe sous lequel les processus Tinyproxy fonctionnent"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+"Indique un mandataire amont à utiliser pour atteindre l'hôte cible. Le "
+"format est <code>adresse:port</code>"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+"Indique le nom d'utilisateur sous lequel les processus Tinyproxy fonctionnent"
+
+msgid "Start spare servers"
+msgstr "Serveurs en surplus au démarrage"
+
+msgid "Statistics page"
+msgstr "Page de statistiques"
+
+msgid "Status"
+msgstr "Statut"
+
+msgid "Target host"
+msgstr "Hôte de destination"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Statut Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+
+msgid "Upstream Proxies"
+msgstr "Mandataires amont"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+"Les règles de mandataires amont définissent les serveurs mandataire à "
+"utiliser pour l'accès à certaines adresses IP ou domaines."
+
+msgid "Use syslog"
+msgstr "Utiliser syslog"
+
+msgid "User"
+msgstr "Utilisateur"
+
+msgid "Via hostname"
+msgstr "nom d'hôte « Via »"
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr "Envoyer les messages à syslog plutôt que dans un fichier-journal"
+
+msgid "X-Tinyproxy header"
+msgstr "Entête X-Tinyproxy"
+
+#~ msgid "Allow access from"
+#~ msgstr "Allow access from"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Allowed headers for anonymous proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Lier le trafic sortant à l'adresse ip"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Ports allowed for CONNECT method"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = disabled, empty = all"
+
+#~ msgid "Error document"
+#~ msgstr "Fichier d'erreur"
+
+#~ msgid "Filter list"
+#~ msgstr "Liste de filtres"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Case sensitive filters"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Filter list is a whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Extended regular expression filters"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filter URLs instead of domains"
+
+#~ msgid "Listen on address"
+#~ msgstr "Listen on address"
+
+#~ msgid "Logfile"
+#~ msgstr "Chemin du fichier de log"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Nombre maximum de clients"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Maximum de connexion par processus"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Nombre de processus serveur lancés au demarrage"
+
+#~ msgid "Statistic document"
+#~ msgstr "Fichier de statistiques"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Écrire dans le journal système (Syslog)"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Délai de connexion"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valeur de l'entête \"VIA\" utilisée comme nom d'hôte"
+
+#~ msgid "Include client IP"
+#~ msgstr "Inclure l'ip du client"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Upstream Control"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy"
diff --git a/trunk/package/luci/po/fr/transmission.po b/trunk/package/luci/po/fr/transmission.po
new file mode 100644
index 00000000..3125fc27
--- /dev/null
+++ b/trunk/package/luci/po/fr/transmission.po
@@ -0,0 +1,280 @@
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/fr/upnp.po b/trunk/package/luci/po/fr/upnp.po
new file mode 100644
index 00000000..0cdb86d1
--- /dev/null
+++ b/trunk/package/luci/po/fr/upnp.po
@@ -0,0 +1,158 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-11-06 16:09+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Les ACLs définissent quels ports externes peuvent être redirigés, vers "
+"quelles adresses et ports internes"
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Active UPnP Redirects"
+msgstr "Redirections UPnP actives"
+
+msgid "Advanced Settings"
+msgstr "Paramètres avancés"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+"Permet d'ajouter des redirections seulement vers les adresses IP qui font "
+"des demandes"
+
+msgid "Announced model number"
+msgstr "Numéro de modèle déclaré"
+
+msgid "Announced serial number"
+msgstr "Numéro de série déclaré"
+
+msgid "Clean rules interval"
+msgstr "Intervalle des règles de nettoyage"
+
+msgid "Clean rules threshold"
+msgstr "Niveau des règles de nettoyage"
+
+msgid "Client Address"
+msgstr "Adresse du client"
+
+msgid "Client Port"
+msgstr "Port du client"
+
+msgid "Collecting data..."
+msgstr "Récupération des données…"
+
+msgid "Comment"
+msgstr "Commentaire"
+
+msgid "Delete Redirect"
+msgstr "Détruire la redirection"
+
+msgid "Device UUID"
+msgstr "UUID du périphérique"
+
+msgid "Downlink"
+msgstr "Lien descendant"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Activer la fonctionnalité NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Activer la fonctionnalité UPnP"
+
+msgid "Enable additional logging"
+msgstr "Activer la journalisation additionnelle"
+
+msgid "Enable secure mode"
+msgstr "Activer le mode sécurisé"
+
+msgid "External Port"
+msgstr "Port externe"
+
+msgid "External ports"
+msgstr "Ports externes"
+
+msgid "General Settings"
+msgstr "Paramètres généraux"
+
+msgid "Internal addresses"
+msgstr "Adresses internes"
+
+msgid "Internal ports"
+msgstr "Ports internes"
+
+msgid "MiniUPnP ACLs"
+msgstr "ACLs MiniUPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Paramètres MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Intervalle de notification"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr "URL de présentation"
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Rajoute des informations de debug dans le journal-système"
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+"Indiquer la durée de fonctionnement du système plutôt que celle du démon UPnP"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Démarrer les services UPnP et NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Il n'y a pas de redirections actives."
+
+msgid "UPNP"
+msgstr "UPNP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP permet à des clients du réseau local de configurer automatiquement le "
+"routeur."
+
+msgid "UPnP lease file"
+msgstr "Fichier des baux UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Lien remontant"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Valeur en Ko/s, pour information seulement"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP permet à des clients du réseau local de configurer automatiquement le "
+#~ "routeur."
+
+#~ msgid "enable"
+#~ msgstr "activer"
diff --git a/trunk/package/luci/po/fr/ushare.po b/trunk/package/luci/po/fr/ushare.po
new file mode 100644
index 00000000..e2e917d9
--- /dev/null
+++ b/trunk/package/luci/po/fr/ushare.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-08-06 13:57+0200\n"
+"Last-Translator: st <shailjathkr@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Répertoires de contenus"
+
+msgid "Disable telnet console"
+msgstr "Désactiver la console Telnet"
+
+msgid "Disable webinterface"
+msgstr "Désactiver l'interface web"
+
+msgid "Enable"
+msgstr "Activer"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Servername"
+msgstr "Nom du serveur"
+
+msgid "Settings"
+msgstr "Paramètres"
+
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/fr/uvc_streamer.po b/trunk/package/luci/po/fr/uvc_streamer.po
new file mode 100644
index 00000000..5295f331
--- /dev/null
+++ b/trunk/package/luci/po/fr/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-11-23 22:22+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "images par seconde"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Résolution"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Paramètres"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Flux de la webcam"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configurer votre webcam compatible Linux-UVC. Entrez par exemple <a href="
+"\"http://%s:%i/\">http://%s:%i/</a> dans votre navigateur"
diff --git a/trunk/package/luci/po/fr/vnstat.po b/trunk/package/luci/po/fr/vnstat.po
new file mode 100644
index 00000000..23b644ac
--- /dev/null
+++ b/trunk/package/luci/po/fr/vnstat.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-11-23 22:33+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: German\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configuration"
+msgstr "Configuration"
+
+msgid "Daily traffic"
+msgstr "Trafic quotidien"
+
+msgid "Graphs"
+msgstr "Graphes"
+
+msgid "Hourly traffic"
+msgstr "Trafic horaire"
+
+msgid "Monitor selected interfaces"
+msgstr "Surveiller les interfaces sélectionnées"
+
+msgid "Monthly traffic"
+msgstr "Trafic mensuel"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Aucun enregistrement n'a encore été configuré. Allez dans la configuration "
+"de VnStat et activez la surveillance d'une ou plusieurs interface(s)."
+
+msgid "Restart VnStat"
+msgstr "Redémarrer VnStat"
+
+msgid "Summary display"
+msgstr "Résumé"
+
+msgid "Top 10 display"
+msgstr "Top 10"
+
+msgid "Update »"
+msgstr "Mise à jour »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Graphiques VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Surveillance du trafic VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat est un outil de surveillance du réseau pour Linux qui garde un "
+"journal du trafic du ou des interface(s) sélectionnée(s)."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "Le service VnStat a été redémarré."
diff --git a/trunk/package/luci/po/fr/voice_core.po b/trunk/package/luci/po/fr/voice_core.po
new file mode 100644
index 00000000..71ef0628
--- /dev/null
+++ b/trunk/package/luci/po/fr/voice_core.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-11-06 16:09+0200\n"
+"Last-Translator: hogsim <hogsim@gmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Téléphones"
+
+msgid "Voice"
+msgstr "Voix"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "Téléphones"
diff --git a/trunk/package/luci/po/fr/voice_diag.po b/trunk/package/luci/po/fr/voice_diag.po
new file mode 100644
index 00000000..c550f062
--- /dev/null
+++ b/trunk/package/luci/po/fr/voice_diag.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-01-15 07:08+0200\n"
+"Last-Translator: desillu <ledesillusionniste@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Diagnostics"
+msgstr "Diagnostics"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Les diagnostics disponibles pour votre périphérique dépendent des modules "
+"que vous avez installé."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Ce menu contient des options vous permettant de configurer et lancer des "
+"tests sur les fonctions vocales de votre système. Ils sont nommés "
+"diagnostics."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/fr/watchcat.po b/trunk/package/luci/po/fr/watchcat.po
new file mode 100644
index 00000000..23af4693
--- /dev/null
+++ b/trunk/package/luci/po/fr/watchcat.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/fr/wol.po b/trunk/package/luci/po/fr/wol.po
new file mode 100644
index 00000000..0bed86d8
--- /dev/null
+++ b/trunk/package/luci/po/fr/wol.po
@@ -0,0 +1,57 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2011-11-23 22:22+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Émettre sur toutes les interfaces"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Choisir l'hôte à réveiller ou entrer une adresse MAC à utiliser"
+
+msgid "Host to wake up"
+msgstr "Hôte à réveiller"
+
+msgid "Network interface to use"
+msgstr "Interface réseau à utiliser"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Parfois seul un des deux outils fonctionne. Si l'un échoue, essayez l'autre"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+"Spécifie l'interface sur laquelle le paquet <abbr title=\"Wake on LAN\">WoL</"
+"abbr> est envoyé"
+
+msgid "Starting WoL utility:"
+msgstr "Démarrer l'utilitaire <abbr title=\"Wake on LAN\">WoL</abbr> :"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LAN est un mécanisme pour démarrer à distance les ordinateurs du "
+"réseau local."
+
+msgid "Wake up host"
+msgstr "Réveiller l'hôte"
+
+msgid "WoL program"
+msgstr "Programme <abbr title=\"Wake on LAN\">WoL</abbr>"
diff --git a/trunk/package/luci/po/fr/wshaper.po b/trunk/package/luci/po/fr/wshaper.po
new file mode 100644
index 00000000..ad334c0a
--- /dev/null
+++ b/trunk/package/luci/po/fr/wshaper.po
@@ -0,0 +1,43 @@
+msgid "Downlink"
+msgstr "Lien descendant (télé-chargement)"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Bande-passante descendante en kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Hôte ou réseau en notation CIDR."
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Low priority destination ports"
+msgstr "Ports-cible à faible priorité"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Hôtes-cible à faible priorité"
+
+msgid "Low priority hosts (Source)"
+msgstr "Hôtes-source à faible priorité"
+
+msgid "Low priority source ports"
+msgstr "Ports-source à faible priorité"
+
+msgid "Uplink"
+msgstr "Lien montant (envois)"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Bande-passante montante en kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Paramètres Wondershaper"
+
+msgid ""
+"Wondershaper uses traffic shaping to ensure low latencies for interactive "
+"traffic even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper gère la priorités entre les flux pour assurer une faible "
+"latence au trafic interactif même quand votre connexion Internet est très "
+"chargée."
diff --git a/trunk/package/luci/po/he/ahcp.po b/trunk/package/luci/po/he/ahcp.po
new file mode 100644
index 00000000..1c45cc85
--- /dev/null
+++ b/trunk/package/luci/po/he/ahcp.po
@@ -0,0 +1,118 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 03:44+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "שרת AHCP"
+
+# מי שמבין את המונחים הטכניים שיעבור על זה ויתקן.
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP הוא פרוטוקול להגדרה אוטומטית של רשתות IPV6 ו- dual-stack IPv6/IPv4, אשר "
+"עוצב לשימוש כתחליף לגילוי נתבים ול- DHCP ברשתות שבהן קשה או בלתי אפשרי "
+"להגדיר שרת בתוך כל שם מתחם לשידור שכבת קישור, לדוגמה רשתות אד-הוק ניידות."
+
+#, fuzzy
+msgid "Active AHCP Leases"
+msgstr "החכרות AHCP קיימות"
+
+msgid "Address"
+msgstr "כתובת"
+
+msgid "Advanced Settings"
+msgstr "הגדרות מתקדמות"
+
+msgid "Age"
+msgstr "גיל"
+
+msgid "Announced DNS servers"
+msgstr "שרתי DNS מוכרזים"
+
+msgid "Announced NTP servers"
+msgstr "שרתי NTP מוכרזים"
+
+msgid "Announced prefixes"
+msgstr "קידומות מוכרזות"
+
+msgid "Collecting data..."
+msgstr "אוסף נתונים..."
+
+msgid "Forwarder"
+msgstr ""
+
+msgid "General Setup"
+msgstr "התקנה כללית"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 ו- IPv6"
+
+msgid "IPv4 only"
+msgstr "IPv4 בלבד"
+
+msgid "IPv6 only"
+msgstr "IPv6 בלבד"
+
+#, fuzzy
+msgid "Lease directory"
+msgstr "ספריית החכרות"
+
+# תו
+msgid "Lease validity time"
+msgstr "תוקף ההקצאה"
+
+msgid "Log file"
+msgstr "קובץ רישום"
+
+msgid "Multicast address"
+msgstr "כתובת Multicast"
+
+# אפשר גם מצב פעולה
+msgid "Operation mode"
+msgstr "מצב הפעלה"
+
+msgid "Port"
+msgstr "פורט"
+
+msgid "Protocol family"
+msgstr "משפחת פרוטוקולים"
+
+msgid "Served interfaces"
+msgstr "סיגמנטים מופעלים"
+
+msgid "Server"
+msgstr "שרת"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "שרתי NTP ברשתות IPV4 IPV6"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "שרתי DNS ברשתות IPV4 IPV6"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "קידומת שרתים (CIDR)"
+
+msgid "The AHCP Service is not running."
+msgstr ""
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr "אין הקצאות פעילות."
+
+msgid "Unique ID file"
+msgstr "קובץ מזהה יחודי"
diff --git a/trunk/package/luci/po/he/asterisk.po b/trunk/package/luci/po/he/asterisk.po
new file mode 100644
index 00000000..25ed5bb1
--- /dev/null
+++ b/trunk/package/luci/po/he/asterisk.po
@@ -0,0 +1,194 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-07-14 12:48+0200\n"
+"Last-Translator: zstorch <zstorch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "הגדרות כלליות של Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "תיקית AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "שמור את קבצי הקול במהלך ההקלטה"
+
+#~ msgid "Debug Level"
+#~ msgstr "רמת מצב ניפוי שגיאות"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "בטל חלק מהאזהרות"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "תעד את מצב הליבה בעת נפילת המערכת"
+
+#~ msgid "High Priority"
+#~ msgstr "עדיפות גבוהה"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "מפעיל את Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "השתמש בשעון הפנימי"
+
+#~ msgid "Log directory"
+#~ msgstr "תיקית התיעוד"
+
+# צריך לבדוק אם מדובר על שיחות "בו זמנית" אם כן חשוב לציין אם לא הנל טעות חמורה
+#, fuzzy
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "מקסימום שיחות בו זמנית"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "מקסימות שיחות שבו המערכת תדחה שיחות נוספות"
+
+#~ msgid "Disable console colors"
+#~ msgstr "בטל צבעים במסוף"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "תיקית קבצי הקול"
+
+#~ msgid "The Group to run as"
+#~ msgstr "הפעל עם הרשאות קבוצת"
+
+#~ msgid "The User to run as"
+#~ msgstr "הפעל עם הרשאות משתמש"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "תיקית התא קולי"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "הוסף לUniquID את שם המערכת"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "המר תבניות קול ישירות עם SLINEAR"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "שדר שקט של SLINEAR במהלך הקלטה"
+
+#~ msgid "Verbose Level"
+#~ msgstr "רמת דו\"ח המערכת"
+
+#~ msgid "Time Zone"
+#~ msgstr "אזור זמן"
+
+#~ msgid "Section dialplan"
+#~ msgstr "מחלקה בתוכנית השיחות"
+
+#~ msgid "include"
+#~ msgstr "כולל"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "שלוחה בתוכנית השיחות"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "הגדרות כללית של תוכנית השיחות"
+
+#~ msgid "Allow transfer"
+#~ msgstr "אפשר העברה"
+
+#~ msgid "Clear global vars"
+#~ msgstr "נקה משתנים כללים"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "\"לך אל\" בתוכנית השיחות"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "שיחת ועידה בתוכנית השיחות"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "זמן בתוכנית השיחות"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "תא קולי בתוכנית השיחות"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "אזורי חיוג עבור תוכנית השיחות"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "קידומת להוספה עבור תוכניות שיחה דומות"
+
+#~ msgid "Match International prefix"
+#~ msgstr "השווה קידומת בין לאומית"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "קידומת (0) להוספה או הסרה במספר בין לאומי"
+
+#~ msgid "localzone"
+#~ msgstr "מיקום"
+
+#~ msgid "Match plan"
+#~ msgstr "תוכנית מתאימה"
+
+#~ msgid "Connection to use"
+#~ msgstr "השתמש בחיבור מסוג"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "מיפוי מקשים יעודיים"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "נתב (NAT) בין מכשיר הטלפון לAsterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "בדוק את התגיות בהקדמה"
+
+#, fuzzy
+#~ msgid "Reply Timeout (ms) for down connection"
+#~ msgstr "החזר את פרק זמן (timeout) במילישניות עבור חבורים סגורים"
+
+#~ msgid "Register connection"
+#~ msgstr "חיבור רשום (מנוי)"
+
+#~ msgid "Dial own extension for mailbox"
+#~ msgstr "חיוג סיפרה בודדת עבור תא דואר"
+
+#~ msgid "Client Type"
+#~ msgstr "סוג הלקוח"
+
+#~ msgid "Username"
+#~ msgstr "שם משתמש"
+
+#~ msgid "Allow codecs"
+#~ msgstr "מקודדים מאושרים"
+
+#~ msgid "SIP realm"
+#~ msgstr "מתחם SIP"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "הגדרות כלליות עבור התא קולי"
+
+#~ msgid "From Email address of server"
+#~ msgstr "שדה דואר אלקטרוני מאת (של השרת)"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "תאים קוליים"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "מצורף תוכן ההודעה"
+
+#~ msgid "Email"
+#~ msgstr "דואר אלקטרוני"
+
+#~ msgid "Display Name"
+#~ msgstr "שם תצוגה"
+
+#~ msgid "Password"
+#~ msgstr "סיסמה"
+
+#~ msgid "zone"
+#~ msgstr "אזור"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "הגדרות אזוריות עבור הקול"
+
+#~ msgid "Message Format"
+#~ msgstr "תבנית ההודעה"
diff --git a/trunk/package/luci/po/he/base.po b/trunk/package/luci/po/he/base.po
new file mode 100644
index 00000000..3aedbdc1
--- /dev/null
+++ b/trunk/package/luci/po/he/base.po
@@ -0,0 +1,2933 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-02 14:32+0200\n"
+"Last-Translator: oranav <oranav@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr ""
+
+msgid "(%s available)"
+msgstr "(%s פנוי)"
+
+msgid "(empty)"
+msgstr "(ריק)"
+
+msgid "(no interfaces attached)"
+msgstr "(אין ממשק מצורף)"
+
+msgid "-- Additional Field --"
+msgstr "-- שדה נוסף --"
+
+msgid "-- Please choose --"
+msgstr "-- נא לבחור --"
+
+msgid "-- custom --"
+msgstr "-- מותאם אישית --"
+
+msgid "1 Minute Load:"
+msgstr "עומס במשך דקה:"
+
+msgid "15 Minute Load:"
+msgstr "עומס במשך רבע שעה:"
+
+msgid "5 Minute Load:"
+msgstr "עומס במשך 5 דקות:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> יציאת שאילתא"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> יציאת שרת"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "כתובות <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"כתובת או רשת (CIDR) <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "הגדרות <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "שם <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "כתובת-<abbr title=\"Media Access Control\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+
+msgid "AR Support"
+msgstr "תמיכת AR"
+
+#, fuzzy
+msgid "ARP retry threshold"
+msgstr "סף נסיונות של ARP"
+
+#, fuzzy
+msgid "ATM Bridges"
+msgstr "גשרי ATM"
+
+#, fuzzy
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "מזהה ערוצים ווירטואליים של ATM"
+
+#, fuzzy
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "מזהה נתיבים ווירטואליים של ATM  (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr "מס' התקן של ATM"
+
+#, fuzzy
+msgid "Access Concentrator"
+msgstr "מרכז גישות"
+
+msgid "Access Point"
+msgstr "נקודת גישה"
+
+msgid "Action"
+msgstr "פעולה"
+
+msgid "Actions"
+msgstr "פעולות"
+
+msgid "Activate this network"
+msgstr "הפעל רשת זו"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+
+msgid "Active Connections"
+msgstr "חיבורים פעילים"
+
+msgid "Active DHCP Leases"
+msgstr "הרשאות DHCP פעילות"
+
+msgid "Active DHCPv6 Leases"
+msgstr "הרשאות DHCPv6 פעילות"
+
+# צריך אימות של מישהו שמבין יותר במושגים האלו אם צריך בכלל לתרגם את זה או להשאיר כמו שזה
+#, fuzzy
+msgid "Ad-Hoc"
+msgstr "אד-הוק"
+
+msgid "Add"
+msgstr "הוסף"
+
+#, fuzzy
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "הוסף דומיין מקומי לשמות המוגשים מהקבצים של המארח"
+
+msgid "Add new interface..."
+msgstr "הוסף ממשק חדש..."
+
+msgid "Additional Hosts files"
+msgstr "קבצי מארח נוספים"
+
+msgid "Address"
+msgstr "כתובת"
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+#, fuzzy
+msgid "Administration"
+msgstr "מנהלה"
+
+msgid "Advanced Settings"
+msgstr "הגדרות מתקדמות"
+
+#, fuzzy
+msgid "Alert"
+msgstr "אזעקה"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+
+#, fuzzy
+msgid "Allow all except listed"
+msgstr "אפשר הכל חוץ מהרשומים"
+
+msgid "Allow listed only"
+msgstr "אפשר רשומים בלבד"
+
+#, fuzzy
+msgid "Allow localhost"
+msgstr "אפשר localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+#, fuzzy
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "רשת נוספת תווצר אם תשאיר את זה לא מסומן"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "אנטנה 1"
+
+msgid "Antenna 2"
+msgstr "אנטנה 2"
+
+msgid "Antenna Configuration"
+msgstr "הגדרות אנטנה"
+
+# אזור?
+#, fuzzy
+msgid "Any zone"
+msgstr "כל תחום"
+
+msgid "Apply"
+msgstr "החל"
+
+msgid "Applying changes"
+msgstr "מחיל הגדרות"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "הקצה ממשקים"
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "תחנות קשורות"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "שלט אלחוטי Atheros 802.11%s"
+
+msgid "Authentication"
+msgstr "אימות"
+
+msgid "Authoritative"
+msgstr "מוסמך"
+
+msgid "Authorization Required"
+msgstr "דרוש אימות"
+
+msgid "Auto Refresh"
+msgstr "רענון אוטומטי"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "זמין"
+
+msgid "Available packages"
+msgstr "חבילות זמינות"
+
+msgid "Average:"
+msgstr "ממוצע:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "חזרה"
+
+msgid "Back to Overview"
+msgstr "חזרה לסקירה"
+
+msgid "Back to configuration"
+msgstr "חזרה להגדרות"
+
+msgid "Back to overview"
+msgstr "חזרה לסקירה"
+
+msgid "Back to scan results"
+msgstr "חזרה לתוצאות סריקה"
+
+msgid "Background Scan"
+msgstr "סריקת רקע"
+
+msgid "Backup / Flash Firmware"
+msgstr "גיבוי / קושחת פלאש"
+
+msgid "Backup / Restore"
+msgstr "גיבוי / שחזור"
+
+msgid "Backup file list"
+msgstr "גיבוי רשימת קבצים"
+
+msgid "Bad address specified!"
+msgstr "פורטה כתובת לא תקינה"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"למטה יש את הרשימה הסופית של קבצים לגיבוי. היא מורכבת ע\"י קבצי הגדרות ששונו, "
+"המסומנים ב opkg ׁOpen PacKaGe Managementׂ, קבצי בסיס חיוניים ותבניות הגיבוי "
+"המוגדרות ע\"י המשתמש."
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr "גשר"
+
+msgid "Bridge interfaces"
+msgstr "ממשקי גשר"
+
+msgid "Bridge unit number"
+msgstr "מס' יח' גשר"
+
+#, fuzzy
+msgid "Bring up on boot"
+msgstr "הבא באיתחול"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "שלט אלחוטי Broadcom 802.11%s"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "שלט אלחוטי Broadcom BCM%04x 802.11"
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr "כפתורים"
+
+msgid "CPU"
+msgstr "מעבד"
+
+msgid "CPU usage (%)"
+msgstr "שימוש מעבד (%)"
+
+msgid "Cached"
+msgstr "שמור במטמון"
+
+msgid "Cancel"
+msgstr "בטל"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "שרשרת"
+
+msgid "Changes"
+msgstr "שינויים"
+
+msgid "Changes applied."
+msgstr "השינויים הוחלו"
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "משנה את סיסמת המנהל לגישה למכשיר"
+
+msgid "Channel"
+msgstr "ערוץ"
+
+msgid "Check"
+msgstr "לבדוק"
+
+msgid "Checksum"
+msgstr ""
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr "סגור חיבורים לא פעילים אחרי מספר השניות שהוגדר, הזן 0 על-מנת לא לסגור"
+
+msgid "Close list..."
+msgstr "סגור רשימה..."
+
+msgid "Collecting data..."
+msgstr "אוסף מידע..."
+
+msgid "Command"
+msgstr "פקודה"
+
+msgid "Common Configuration"
+msgstr "הגדרות נפוצות"
+
+msgid "Compression"
+msgstr "דחיסה"
+
+msgid "Configuration"
+msgstr "הגדרות"
+
+msgid "Configuration applied."
+msgstr "הגדרות הוחלו"
+
+msgid "Configuration files will be kept."
+msgstr "קבצי ההגדרות ישמרו."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr "אישור"
+
+msgid "Connect"
+msgstr "התחבר"
+
+msgid "Connected"
+msgstr "מחובר"
+
+msgid "Connection Limit"
+msgstr "מגבלת חיבורים"
+
+msgid "Connections"
+msgstr "חיבורים"
+
+msgid "Country"
+msgstr "מדינה"
+
+msgid "Country Code"
+msgstr "קוד מדינה"
+
+msgid "Cover the following interface"
+msgstr "כסה את הממשק הבא"
+
+msgid "Cover the following interfaces"
+msgstr "כסה את הממשקים הבאים"
+
+msgid "Create / Assign firewall-zone"
+msgstr "צור / הקצה תחום-חומת אש"
+
+msgid "Create Interface"
+msgstr "צור ממשק"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "צור גשר בין מספר ממשקים"
+
+msgid "Critical"
+msgstr "קריטי"
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr "ממשק מותאם אישית"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"מתאים את הגדרות ה-<abbr title=\"Light Emitting Diode\">LED</abbr>-ים במכשיר "
+"(אם אפשרי)."
+
+msgid "DHCP Leases"
+msgstr "הרשאות DHCP"
+
+msgid "DHCP Server"
+msgstr "שרת DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP ו- DNS"
+
+msgid "DHCP client"
+msgstr "לקוח DHCP"
+
+msgid "DHCP-Options"
+msgstr "אפשרויות-DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "הרשאות DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr "הגדר שם לרשת זו"
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"הגדר אפשרויות DHCP נוספות, למשל \"<code>6,192.168.2.1,192.168.2.2</code>\" "
+"אשר מציגות שרתי DNS שונים ללקוח"
+
+msgid "Delete"
+msgstr "למחוק"
+
+msgid "Delete this interface"
+msgstr "מחק ממשק זה"
+
+msgid "Delete this network"
+msgstr "מחק רשת זו"
+
+msgid "Description"
+msgstr "תיאור"
+
+msgid "Design"
+msgstr "עיצוב"
+
+msgid "Destination"
+msgstr "יעד"
+
+msgid "Device"
+msgstr "מכשיר"
+
+msgid "Device Configuration"
+msgstr "הגדרות מכשיר"
+
+msgid "Diagnostics"
+msgstr "אבחון"
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr "מציג רק חבילות המכילות"
+
+msgid "Distance Optimization"
+msgstr ""
+
+msgid "Distance to farthest network member in meters."
+msgstr "מרחק לנק' הרשת הרחוקה ביותר במטרים"
+
+msgid "Diversity"
+msgstr "גיוון"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr ""
+
+msgid "Domain required"
+msgstr ""
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+
+msgid "Download and install package"
+msgstr "הורד והתקן חבילות"
+
+msgid "Download backup"
+msgstr "הורד גיבוי"
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear מאפשר גישת <abbr title=\"Secure Shell\">SSH</abbr> רשתית ושרת <abbr "
+"title=\"Secure Copy\">SCP</abbr> מובנה"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> דינאמי"
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr ""
+
+msgid "Edit"
+msgstr "ערוך"
+
+msgid "Edit this interface"
+msgstr "ערוך ממשק זה"
+
+msgid "Edit this network"
+msgstr "ערוך רשת זו"
+
+msgid "Emergency"
+msgstr "מצב חרום"
+
+msgid "Enable"
+msgstr "אפשר"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "אפשר <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr "אפשר שרת TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "אפשר תפקוד VLAN"
+
+msgid "Enable learning and aging"
+msgstr "אפשר למידה והזדקנות"
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr ""
+
+msgid "Enabled"
+msgstr "אפשר"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr "הצפנה"
+
+msgid "Erasing..."
+msgstr "מוחק..."
+
+msgid "Error"
+msgstr "שגיאה"
+
+msgid "Ethernet Adapter"
+msgstr ""
+
+msgid "Ethernet Switch"
+msgstr ""
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Filter private"
+msgstr ""
+
+msgid "Filter useless"
+msgstr ""
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall Settings"
+msgstr ""
+
+msgid "Firewall Status"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr ""
+
+msgid "Flash Firmware"
+msgstr ""
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr ""
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr ""
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr ""
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr ""
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "Host entries"
+msgstr ""
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr "כתבות IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 ו-IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr ""
+
+msgid "Ignore resolve file"
+msgstr ""
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr ""
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr ""
+
+msgid "Initscripts"
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "מספר VLAN שגוי! רק ערכים בין %d לבין %d הם חוקיים."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "שם משתמש ו/או סיסמה שגויים! אנא נסה שנית."
+
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr ""
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr ""
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr ""
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr ""
+
+msgid "Leasetime"
+msgstr ""
+
+msgid "Leasetime remaining"
+msgstr ""
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr ""
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr ""
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr "עומס"
+
+msgid "Load Average"
+msgstr "עומס ממוצע"
+
+msgid "Loading"
+msgstr "טוען"
+
+msgid "Local IPv4 address"
+msgstr "כתובת IPv4 מקומית"
+
+msgid "Local IPv6 address"
+msgstr "כתובת IPv6 מקומית"
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr "שרת מקומי"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr ""
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr ""
+
+msgid "MAC-Filter"
+msgstr ""
+
+msgid "MAC-List"
+msgstr ""
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr ""
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory usage (%)"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Minimum Rate"
+msgstr ""
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr ""
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr ""
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr ""
+
+msgid "Mount Points"
+msgstr ""
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr ""
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr "שם"
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr ""
+
+msgid "Navigation"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr "אין רשימת חבילות זמינה"
+
+msgid "No password set!"
+msgstr "לא הוגדרה סיסמה!"
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr ""
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr "לא מחובר"
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "OPKG-Configuration"
+msgstr ""
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr "ישנם שדות המכילים ערכים בלתי חוקיים!"
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Owner"
+msgstr ""
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr ""
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr "שם החבילה"
+
+msgid "Packets"
+msgstr ""
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password authentication"
+msgstr ""
+
+msgid "Password of Private Key"
+msgstr ""
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr ""
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr "נתיב למפתח הפרטי"
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr ""
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr "אנא הזן את שם המשתמש והסיסמה שלך:"
+
+msgid "Please wait: Device rebooting..."
+msgstr "אנא המתן: המכשיר מאותחל מחדש..."
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr ""
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Prot."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr ""
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr ""
+
+msgid "RX"
+msgstr ""
+
+msgid "RX Rate"
+msgstr "קצב קליטה"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"האם למחוק את הרשת האלחוטית הזו? המחיקה אינה ניתנת לביטול!\n"
+"ייתכן ותאבד גישה לנתב הזה אם אתה מחובר דרך השרת הזו."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr ""
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr ""
+
+msgid "Receive"
+msgstr ""
+
+msgid "Receiver Antenna"
+msgstr ""
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr ""
+
+msgid "Regulatory Domain"
+msgstr ""
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr ""
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Reset Counters"
+msgstr ""
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr ""
+
+msgid "Restore backup"
+msgstr ""
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr ""
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr "הרץ בדיקת מערכת קבצים"
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & Apply"
+msgstr ""
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr ""
+
+msgid "Scheduled Tasks"
+msgstr ""
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr ""
+
+msgid "Separate WDS"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr "שירותים"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "סנכרון זמן"
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr "דלג אל התוכן"
+
+msgid "Skip to navigation"
+msgstr "דלג אל הניווט"
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr "תוכנה"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "חלק מהשדות אינם תקינים, אין אפשרות לשמור את הערכים!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "סליחה, אך האובייקט שביקשת אינו נמצא."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "סליחה, השרת נתקל בשגיאה לא צפויה."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"סליחה, אין תמיכה בעדכון מערכת, ולכן קושחה חדשה חייבת להיצרב ידנית. אנא פנה "
+"אל ה-wiki של libreCMC עבור הוראות ספציפיות למכשיר שלך."
+
+msgid "Sort"
+msgstr "מיין"
+
+msgid "Source"
+msgstr "מקור"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr "אתחול"
+
+msgid "Static IPv4 Routes"
+msgstr "ניתובי IPv4 סטטיים"
+
+msgid "Static IPv6 Routes"
+msgstr "ניתובי IPv6 סטטיים"
+
+msgid "Static Leases"
+msgstr "הקצאות סטטיות"
+
+msgid "Static Routes"
+msgstr "ניתובים סטטיים"
+
+msgid "Static WDS"
+msgstr "WDS סטטי"
+
+msgid "Static address"
+msgstr "כתובת סטטית"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"הקצאות סטטיות נועדו להקצות כתובות IP קבועות ואת שם הרשת שלהן ללקוחות DHCP. "
+"הן נחוצות גם עבור הגדרות ממשק שאינן דינאמיות, בהן מטופלות רק ישויות בעלות "
+"הקצאה מתאימה."
+
+msgid "Status"
+msgstr "מצב"
+
+msgid "Stop"
+msgstr "עצור"
+
+msgid "Strict order"
+msgstr ""
+
+msgid "Submit"
+msgstr "שלח"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr ""
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "הגדרות TFTP"
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr "שידור"
+
+msgid "TX Rate"
+msgstr "קצב שידור"
+
+msgid "Table"
+msgstr "טבלה"
+
+msgid "Target"
+msgstr "יעד"
+
+msgid "Terminate"
+msgstr ""
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr ""
+
+msgid "The following rules are currently active on this system."
+msgstr "החוקים הבאים מאופשרים כרגע במערכת זו."
+
+msgid "The given network name is not unique"
+msgstr "השם שניתן לרשת איננו ייחודי"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr "החומרה אינה תומכת בריבוי SSID ולכן ההגדרות הנוכחיות יוחלפו אם תמשיך."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr "רשימה זו מציגה סקירה של תהליכי המערכת הרצים כרגע ואת מצבם."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "דף זה מאפשר להגדיר פעולות מיוחדות עבור הלחצנים."
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "דף זה מציג סקירה של חיבורי הרשת הפעילים כרגע."
+
+msgid "This section contains no values yet"
+msgstr "אזור זה עדיין לא מכיל ערכים."
+
+msgid "Time Synchronization"
+msgstr "סנכרון זמן"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "סנכרון זמן עדיין לא הוגדר."
+
+msgid "Timezone"
+msgstr "אזור זמן"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"על מנת לשחזר את קבצי ההגדרות, באפשרותך להעלות ארכיון גיבוי שנוצר לפני כן."
+
+msgid "Total Available"
+msgstr "סה\"כ פנוי"
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr "תעבורה"
+
+msgid "Transfer"
+msgstr "העברה"
+
+msgid "Transmission Rate"
+msgstr "קצב שידור"
+
+msgid "Transmit"
+msgstr "שידור"
+
+msgid "Transmit Power"
+msgstr "עוצמת שידור"
+
+msgid "Transmitter Antenna"
+msgstr "אנטנת שידור"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr ""
+
+msgid "Tx-Power"
+msgstr "עוצמת שידור"
+
+msgid "Type"
+msgstr ""
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr ""
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr ""
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr "השתמש בדגל broadcast"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "השתמש בשרתי DNS מותאמים אישית"
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr "השתמש בטבלת ניתוב"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr ""
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr "שם משתמש"
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr "שרת VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr "גרסה"
+
+msgid "WDS"
+msgstr ""
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr "סיסמת WEP"
+
+msgid "WMM Mode"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr "סיסמת WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr "אזהרה"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "אזהרה: ישנם שינויים שלא נשמרו ויאבדו בעת הפעלה מחדש!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr ""
+
+msgid "Wireless Network"
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Wireless Security"
+msgstr ""
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr "רשת אלחוטית מנוטרלת"
+
+msgid "Wireless network is enabled"
+msgstr "רשת אלחוטית מאופשרת"
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr ""
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr "אתה חייב להפעיל את Java Script בדפדפן שלך; אחרת, LuCI לא יפעל כראוי."
+
+msgid "any"
+msgstr "כלשהו"
+
+msgid "auto"
+msgstr "אוטומטי"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr ""
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr "בטל"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+
+msgid "forward"
+msgstr "קדימה"
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr "עזרה"
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "אם היעד הוא רשת"
+
+msgid "input"
+msgstr "קלט"
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+
+msgid "no"
+msgstr "לא"
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr "ללא"
+
+msgid "off"
+msgstr "כבוי"
+
+msgid "on"
+msgstr "פועל"
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "מנותב"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "מתויג"
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr "ללא הגבלה"
+
+msgid "unspecified"
+msgstr "לא מוגדר"
+
+msgid "unspecified -or- create:"
+msgstr "לא מוגדר -או- יצר"
+
+msgid "untagged"
+msgstr "לא מתויג"
+
+msgid "yes"
+msgstr "כן"
+
+msgid "« Back"
+msgstr "<< אחורה"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40Mhz, הערוץ הנוסף מעל"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40Mhz, הערוץ הנוסף מתחת"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "אפשר פרסומות נתב"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "פרסם IPv6 ברשת"
+
+# זהות?
+#, fuzzy
+#~ msgid "Advertised network ID"
+#~ msgstr "פרסם פרטי זהות של הרשת"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "הטווח המורשה הוא 1 עד 65535"
+
+#~ msgid "Freifunk"
+#~ msgstr "אריג"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "רשתות Wifi בסביבתך"
+
+#~ msgid "static"
+#~ msgstr "סטטי"
diff --git a/trunk/package/luci/po/he/commands.po b/trunk/package/luci/po/he/commands.po
new file mode 100644
index 00000000..0e9e65d2
--- /dev/null
+++ b/trunk/package/luci/po/he/commands.po
@@ -0,0 +1,91 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/he/coovachilli.po b/trunk/package/luci/po/he/coovachilli.po
new file mode 100644
index 00000000..04efb54d
--- /dev/null
+++ b/trunk/package/luci/po/he/coovachilli.po
@@ -0,0 +1,26 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 03:37+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr ""
+
+msgid "Network Configuration"
+msgstr "תצורת רשת"
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr "אימות UAM ן- MAC"
diff --git a/trunk/package/luci/po/he/ddns.po b/trunk/package/luci/po/he/ddns.po
new file mode 100644
index 00000000..8c23c090
--- /dev/null
+++ b/trunk/package/luci/po/he/ddns.po
@@ -0,0 +1,87 @@
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2012-09-10 04:26+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "בצע בדיקה ל- IP שהתחלף כל"
+
+msgid "Check-time unit"
+msgstr "בדוק-יחידת זמן"
+
+#, fuzzy
+msgid "Custom update-URL"
+msgstr "עדכן URL באופן ידני"
+
+msgid "Dynamic DNS"
+msgstr "DNS דינאמי"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"שירות DDNS מאפשר גישה לנתב שלך ע\"י שם דומיין קבוע, בעוד כתובת ה- IP שלך "
+"משתנה באופן דינמי."
+
+msgid "Enable"
+msgstr "אפשר"
+
+msgid "Force update every"
+msgstr "אלץ עדכון כל"
+
+#, fuzzy
+msgid "Force-time unit"
+msgstr "יחידת זמן של אילוץ"
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Interface"
+msgstr "ממשק"
+
+msgid "Network"
+msgstr "רשת"
+
+msgid "Password"
+msgstr "סיסמא"
+
+msgid "Service"
+msgstr "שירות"
+
+msgid "Source of IP address"
+msgstr "מקור כתובת IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "שם משתמש"
+
+msgid "custom"
+msgstr "מותאם אישית"
+
+# Hours
+msgid "h"
+msgstr "ש'"
+
+msgid "interface"
+msgstr "ממשק"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "דק'"
+
+msgid "network"
+msgstr "רשת"
diff --git a/trunk/package/luci/po/he/diag_core.po b/trunk/package/luci/po/he/diag_core.po
new file mode 100644
index 00000000..b4d73e02
--- /dev/null
+++ b/trunk/package/luci/po/he/diag_core.po
@@ -0,0 +1,30 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/he/diag_devinfo.po b/trunk/package/luci/po/he/diag_devinfo.po
new file mode 100644
index 00000000..7161955d
--- /dev/null
+++ b/trunk/package/luci/po/he/diag_devinfo.po
@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/he/ffwizard.po b/trunk/package/luci/po/he/ffwizard.po
new file mode 100644
index 00000000..3b13704d
--- /dev/null
+++ b/trunk/package/luci/po/he/ffwizard.po
@@ -0,0 +1,159 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/he/firewall.po b/trunk/package/luci/po/he/firewall.po
new file mode 100644
index 00000000..aec566ae
--- /dev/null
+++ b/trunk/package/luci/po/he/firewall.po
@@ -0,0 +1,432 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr ""
+
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr ""
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
+msgstr ""
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
diff --git a/trunk/package/luci/po/he/freifunk-policyrouting.po b/trunk/package/luci/po/he/freifunk-policyrouting.po
new file mode 100644
index 00000000..8d83098d
--- /dev/null
+++ b/trunk/package/luci/po/he/freifunk-policyrouting.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/he/freifunk.po b/trunk/package/luci/po/he/freifunk.po
new file mode 100644
index 00000000..3dfdefd5
--- /dev/null
+++ b/trunk/package/luci/po/he/freifunk.po
@@ -0,0 +1,394 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-22 02:48+0200\n"
+"Last-Translator: citizen.amitai <citizen.amitai@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "חלש"
+
+msgid "Basic Settings"
+msgstr "הגדרות בסיס"
+
+msgid "Basic settings"
+msgstr "הגדרות בסיס"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "לא סיימת להגדיר את הגדרות הבסיס. תחזור ל"
+
+msgid "Basic system settings"
+msgstr "הגדרות מערכת"
+
+msgid "Bitrate"
+msgstr "קצב העברה"
+
+msgid "Channel"
+msgstr "ערוץ"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr "בדוק אם קיים גרסת חומרה חדשה ובצע עדכון אוטומטי"
+
+msgid "Client network size"
+msgstr "גודל הרשת"
+
+msgid "Community"
+msgstr "קהילה"
+
+msgid "Community profile"
+msgstr "פרופיל הקהילה"
+
+msgid "Community settings"
+msgstr "הגדרות קהילה"
+
+msgid "Confirm Upgrade"
+msgstr "אשר שדרוג"
+
+msgid "Contact"
+msgstr "צור קשר"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr "קוד מדינה"
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr "אימייל"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "ערוך דף אינדקס"
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "שגיאה"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "מצא את המיקום שלך עם OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "אריג"
+
+msgid "Freifunk Overview"
+msgstr "סקירה כללית על אריג"
+
+msgid "Freifunk Remote Update"
+msgstr "עדכון מרחוק "
+
+msgid "Gateway"
+msgstr "שער"
+
+msgid "Go to"
+msgstr "עבור אל"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "טוב"
+
+msgid "Green"
+msgstr "ירוק"
+
+msgid "Hello and welcome in the network of"
+msgstr "שלום וברוך הבא לרשת "
+
+msgid "Hide OpenStreetMap"
+msgstr "הסתר OpenStreetMap"
+
+msgid "Homepage"
+msgstr "דף הבית"
+
+msgid "Hostname"
+msgstr "שם מחשב"
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr "אם מסומן, תוכן ברירת המחדל לא יופיע"
+
+msgid "If you are interested in our project then contact the local community"
+msgstr "אם הנכם מעוניינים בפרוייקט שלנו אנא צרו קשר עם הקהילה באזורכם"
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr "ממשק"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr "זה מופעל ע\"י"
+
+msgid "Keep configuration"
+msgstr "שמור הגדרות"
+
+msgid "Latitude"
+msgstr "רוחב"
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr "טען"
+
+msgid "Local Time"
+msgstr "זמן מקומי"
+
+msgid "Location"
+msgstr "מיקום"
+
+msgid "Longitude"
+msgstr "אורך"
+
+msgid "Map"
+msgstr "מפה"
+
+msgid "Map Error"
+msgstr "שגיאת מפה"
+
+msgid "Memory"
+msgstr "זכרון"
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr "מצב"
+
+msgid "Network"
+msgstr "רשת"
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr "כינוי"
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr "סקירה"
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr "אנא הזינו פרטי יצירת קשר"
+
+msgid "Power"
+msgstr "כח"
+
+msgid "Processor"
+msgstr "מעבד"
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr "פרופיל (מומחה)"
+
+msgid "Realname"
+msgstr "שם אמיתי"
+
+msgid "Red"
+msgstr "אדום"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr "פתח OpenStreetMap"
+
+msgid "Show on map"
+msgstr "הצג על גבי מפה"
+
+msgid "Signal"
+msgstr "אות"
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr "התחל שדרוג"
+
+msgid "Statistics"
+msgstr "סטטיסטיקה"
+
+msgid "Status"
+msgstr "סטטוס"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "מתפקד"
+
+msgid "System"
+msgstr "מערכת"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr "יוזמה לביסוס רשת אריג אל-חוטית שתהיה חינמית, נגישה, ועצמאית"
+
+msgid "Wireless Overview"
+msgstr "סקירת הרשת האלחוטית"
+
+msgid "Yellow"
+msgstr "צהוב"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/he/hd_idle.po b/trunk/package/luci/po/he/hd_idle.po
new file mode 100644
index 00000000..6a268f4a
--- /dev/null
+++ b/trunk/package/luci/po/he/hd_idle.po
@@ -0,0 +1,52 @@
+# Generated from applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2011-06-25 11:35+0200\n"
+"Last-Translator: GiladL <gl1000007@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Disk"
+msgstr "כונן"
+
+msgid "Enable"
+msgstr "אפשר"
+
+msgid "Enable debug"
+msgstr "אפשר ניפוי שגיאות"
+
+msgid "Idle-time"
+msgstr "זמן חוסר פעילות"
+
+msgid "Idle-time unit"
+msgstr "יחידת זמן חוסר פעילות"
+
+msgid "Settings"
+msgstr "הגדרות"
+
+# Hours
+msgid "h"
+msgstr "ש'"
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle הינה תוכנת שירות שמטרתה להקטין את מהירות הסיבוב של כוננים חיצוניים "
+"לאחר זמן מסוים של חוסר פעילות."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "דק'"
diff --git a/trunk/package/luci/po/he/meshwizard.po b/trunk/package/luci/po/he/meshwizard.po
new file mode 100644
index 00000000..acf5f102
--- /dev/null
+++ b/trunk/package/luci/po/he/meshwizard.po
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/he/minidlna.po b/trunk/package/luci/po/he/minidlna.po
new file mode 100644
index 00000000..48c61883
--- /dev/null
+++ b/trunk/package/luci/po/he/minidlna.po
@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/he/mmc_over_gpio.po b/trunk/package/luci/po/he/mmc_over_gpio.po
new file mode 100644
index 00000000..bf506c0d
--- /dev/null
+++ b/trunk/package/luci/po/he/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 04:34+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr "אפשר"
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr "שם"
+
+msgid "Settings"
+msgstr "הגדרות"
diff --git a/trunk/package/luci/po/he/multiwan.po b/trunk/package/luci/po/he/multiwan.po
new file mode 100644
index 00000000..2188822e
--- /dev/null
+++ b/trunk/package/luci/po/he/multiwan.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/he/ntpc.po b/trunk/package/luci/po/he/ntpc.po
new file mode 100644
index 00000000..9d2bee63
--- /dev/null
+++ b/trunk/package/luci/po/he/ntpc.po
@@ -0,0 +1,59 @@
+# Generated from applications/luci-ntpc/luasrc/model/cbi/ntpc/*.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2011-06-25 11:40+0200\n"
+"Last-Translator: GiladL <gl1000007@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+# התאמת שעון?
+#, fuzzy
+msgid "Clock Adjustment"
+msgstr "כיוון שעון"
+
+#, fuzzy
+msgid "Count of time measurements"
+msgstr "ספירת יחידות זמן"
+
+msgid "Current system time"
+msgstr "זמן מערכת נוכחי"
+
+msgid "General"
+msgstr "כללי"
+
+msgid "Hostname"
+msgstr "שם מארח"
+
+#, fuzzy
+msgid "Offset frequency"
+msgstr "תדירות סטייה"
+
+msgid "Port"
+msgstr "פורט"
+
+msgid "Synchronizes the system time"
+msgstr "מסנכרן את זמן המערכת"
+
+msgid "Time Server"
+msgstr ""
+
+msgid "Time Servers"
+msgstr "שרתי זמן"
+
+msgid "Time Synchronisation"
+msgstr "סנכרון זמן"
+
+msgid "Update interval (in seconds)"
+msgstr "מרווח בין עדכונים (בשניות)"
+
+msgid "empty = infinite"
+msgstr "ריק = אינסופי"
diff --git a/trunk/package/luci/po/he/olsr.po b/trunk/package/luci/po/he/olsr.po
new file mode 100644
index 00000000..38aa43bf
--- /dev/null
+++ b/trunk/package/luci/po/he/olsr.po
@@ -0,0 +1,687 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/he/openvpn.po b/trunk/package/luci/po/he/openvpn.po
new file mode 100644
index 00000000..bf02ef3d
--- /dev/null
+++ b/trunk/package/luci/po/he/openvpn.po
@@ -0,0 +1,547 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/he/p2pblock.po b/trunk/package/luci/po/he/p2pblock.po
new file mode 100644
index 00000000..5b2679b4
--- /dev/null
+++ b/trunk/package/luci/po/he/p2pblock.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 03:39+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "זמן חסימה"
+
+msgid "Enable P2P-Block"
+msgstr "אפשר חסימת P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "פרוטוקולי Layer7"
+
+msgid "P2P-Block"
+msgstr "חסימת P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"חסימת P2P הינו מנגנון ליצירת 'רשימה אפורה', במטרה לחסום סוגים שונים של "
+"פרוטוקולי P2P עבור לקוחות שאינם ב'רשימה הלבנה'."
+
+msgid "Portrange"
+msgstr "טווח פורטים"
+
+msgid "Whitelisted IPs"
+msgstr "כתובות IP ברשימה הלבנה"
+
+msgid "seconds"
+msgstr "שניות"
diff --git a/trunk/package/luci/po/he/p910nd.po b/trunk/package/luci/po/he/p910nd.po
new file mode 100644
index 00000000..3accdca6
--- /dev/null
+++ b/trunk/package/luci/po/he/p910nd.po
@@ -0,0 +1,53 @@
+#  p910nd.pot
+#  generated from ./applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 03:43+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "מצב דו-כיווני."
+
+msgid "Device"
+msgstr "התקן"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"ראשית עליך להתקין את החבילות כדי לקבל תמיכה ב- USB (kmod-usb-printer) או "
+"בחיבור מקבילי (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+# "יציאה" או "יציאת התקן" ?
+#, fuzzy
+msgid "Port"
+msgstr "יציאת התקן"
+
+msgid "Settings"
+msgstr "הגדרות"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "יציאת האזנה ל- TCP"
+
+msgid "enable"
+msgstr "לאפשר"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - שרת מדפסות"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd מאזין לפורט 910+N (למשל 9100) עבור המדפסת הראשונה."
diff --git a/trunk/package/luci/po/he/pbx-voicemail.po b/trunk/package/luci/po/he/pbx-voicemail.po
new file mode 100644
index 00000000..be25f0b5
--- /dev/null
+++ b/trunk/package/luci/po/he/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/he/pbx.po b/trunk/package/luci/po/he/pbx.po
new file mode 100644
index 00000000..2a458214
--- /dev/null
+++ b/trunk/package/luci/po/he/pbx.po
@@ -0,0 +1,484 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/he/polipo.po b/trunk/package/luci/po/he/polipo.po
new file mode 100644
index 00000000..931228e5
--- /dev/null
+++ b/trunk/package/luci/po/he/polipo.po
@@ -0,0 +1,202 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/he/qos.po b/trunk/package/luci/po/he/qos.po
new file mode 100644
index 00000000..71c2e3c0
--- /dev/null
+++ b/trunk/package/luci/po/he/qos.po
@@ -0,0 +1,91 @@
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2010-03-25 22:10+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "priority"
+msgstr ""
diff --git a/trunk/package/luci/po/he/radvd.po b/trunk/package/luci/po/he/radvd.po
new file mode 100644
index 00000000..63ec1681
--- /dev/null
+++ b/trunk/package/luci/po/he/radvd.po
@@ -0,0 +1,367 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/he/rrdtool.po b/trunk/package/luci/po/he/rrdtool.po
new file mode 100644
index 00000000..32b74f75
--- /dev/null
+++ b/trunk/package/luci/po/he/rrdtool.po
@@ -0,0 +1,356 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/he/samba.po b/trunk/package/luci/po/he/samba.po
new file mode 100644
index 00000000..dd21a4a5
--- /dev/null
+++ b/trunk/package/luci/po/he/samba.po
@@ -0,0 +1,73 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/trunk/package/luci/po/he/splash.po b/trunk/package/luci/po/he/splash.po
new file mode 100644
index 00000000..bf7e2f07
--- /dev/null
+++ b/trunk/package/luci/po/he/splash.po
@@ -0,0 +1,325 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-10 04:38+0200\n"
+"PO-Revision-Date: 2012-09-10 04:58+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"החיבור לאינטרנט יכול להתאפשר בגלל שכמה פעילים של הפרוייקט משתפים את חיבור "
+"האינטרנט האישי שלהם. אותם חיבורים מעטים משותפים בין כל המשתמשים. משמע רוחב "
+"הפס הזמין מוגבל ולכן אנו מבקשים מכם לא לעשות את הדברים הבאים:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr "הפוך לחבר פעיל של הקהילה ועזור ע\"י תפעול נקודה של עצמך"
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr "חסומים"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr "דחה"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "תרום כסף על מנת שנוכל לשמור על הפרוייקט הזה חי."
+
+msgid "Download limit"
+msgstr "הגבלת הורדה"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr "כללי"
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr "כתובת IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr "אם הנך מפעיל מכשירי wifi של עצמך השתמש בערוצים שונים משלנו."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "אם הנך משתמש ברשת זו על בסיס קבוע אנו מבקשים את תמיכתך:"
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "ממשקים"
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"KB/s (הורדה/העלאה). הנך יכול להוריד מגבלה זו ע\"י תרומה פעילה לפרוייקט זה."
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "כתובת MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "כתובות MAC ברשימה זו הינם חסומים."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr "רשת"
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr "שים לב שאנו לא ספק אינטרנט אלא רשת חברתית נסיונית."
+
+msgid "Policy"
+msgstr "מדיניות"
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr "שמור"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr "זמן שנותר"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"על מנת לשאול לסיבה שבגגלה נחסמת או לבקש גישה מחדש הנך יכול לנסות ליצור קשר "
+"עם הבעלים של נקודת גישה זו:"
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr "הגבלת העלאה"
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr "ברוכים הבאים"
+
+msgid "Whitelist"
+msgstr ""
+
+#, fuzzy
+msgid "You are now connected to the free wireless mesh network"
+msgstr "הנך מחובר כעת לרשת האלחוטית החינמית"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"הגישה שלך לרשת זו נחסמה, ככל הנראה בגלל שעשית משהו שהחוקים שלנו אוסרים "
+"במפורש."
+
+msgid "Your bandwidth is limited to"
+msgstr "רוחב הפס שלך מוגבל ל"
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr "פג תוקף"
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr "בצע פעילות בלתי חוקית מכל סוג שהוא"
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr "חסום זמנית"
+
+msgid "unknown"
+msgstr "לא ידוע"
+
+msgid "use filesharing applications on this network"
+msgstr "השתמש בתוכנות לשיתוף קבצים ברשת זו."
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "לבזבז רוחב פס עם הורדות או שידורים מיותרים"
+
+msgid "whitelisted"
+msgstr ""
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "ע\"י הסכמתך לחוקים האלו הנך יכול להשתמש ברשת זו בשביל"
+
+#~ msgid "hour(s). After this time you need to accept these rules again."
+#~ msgstr "שעה(ות). לאחר זמן זה תצטרך לקבל את החוקים האלו שוב."
+
+#~ msgid "the owner of this access point."
+#~ msgstr "הבעלים של נקודת גישה זו."
diff --git a/trunk/package/luci/po/he/statistics.po b/trunk/package/luci/po/he/statistics.po
new file mode 100644
index 00000000..6ad74756
--- /dev/null
+++ b/trunk/package/luci/po/he/statistics.po
@@ -0,0 +1,598 @@
+#  statistics.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/statistics.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 04:59+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr "הוסף פקודה לקריאת נתונים"
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/he/tinyproxy.po b/trunk/package/luci/po/he/tinyproxy.po
new file mode 100644
index 00000000..5c4ddddb
--- /dev/null
+++ b/trunk/package/luci/po/he/tinyproxy.po
@@ -0,0 +1,255 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/he/transmission.po b/trunk/package/luci/po/he/transmission.po
new file mode 100644
index 00000000..3125fc27
--- /dev/null
+++ b/trunk/package/luci/po/he/transmission.po
@@ -0,0 +1,280 @@
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/he/upnp.po b/trunk/package/luci/po/he/upnp.po
new file mode 100644
index 00000000..d6735509
--- /dev/null
+++ b/trunk/package/luci/po/he/upnp.po
@@ -0,0 +1,136 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/trunk/package/luci/po/he/ushare.po b/trunk/package/luci/po/he/ushare.po
new file mode 100644
index 00000000..4858a9a8
--- /dev/null
+++ b/trunk/package/luci/po/he/ushare.po
@@ -0,0 +1,52 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-06-24 18:47+0200\n"
+"Last-Translator: GiladL <gl1000007@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Content directories"
+msgstr "ספריות תוכן"
+
+# האם לכתוב טלנט באנגלית (telenet) או בתעתיק עברי (טלנט)?
+msgid "Disable telnet console"
+msgstr "השבת קונסולת telnet"
+
+msgid "Disable webinterface"
+msgstr "השבת מנשק רשת"
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr "אפשרויות"
+
+msgid "Servername"
+msgstr "שם שרת"
+
+msgid "Settings"
+msgstr "הגדרות"
+
+msgid "Username"
+msgstr ""
+
+# זה שם של תוכנה ולא צריך לתרגם אותו
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/he/uvc_streamer.po b/trunk/package/luci/po/he/uvc_streamer.po
new file mode 100644
index 00000000..6728905d
--- /dev/null
+++ b/trunk/package/luci/po/he/uvc_streamer.po
@@ -0,0 +1,45 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 03:50+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "פריימים לשניה"
+
+# אפשר גם אבחנה
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "רזולוציה"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "הגדרות"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "שידור באמצעות מצלמת רשת"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+#, fuzzy
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"הגדר את מצלמת הרשת התואמת Linux-UVC שלך. הפנה את הדפדפן שלך לכתובת כמו <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>."
diff --git a/trunk/package/luci/po/he/vnstat.po b/trunk/package/luci/po/he/vnstat.po
new file mode 100644
index 00000000..f0ef3a78
--- /dev/null
+++ b/trunk/package/luci/po/he/vnstat.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/he/voice_core.po b/trunk/package/luci/po/he/voice_core.po
new file mode 100644
index 00000000..74440e34
--- /dev/null
+++ b/trunk/package/luci/po/he/voice_core.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-10 03:44+0200\n"
+"Last-Translator: Snoof <sagim9@gmail.com>\n"
+"Language-Team: none\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "טלפונים"
+
+msgid "Voice"
+msgstr "קול"
+
+# מה בדיוק מתרגמים כאן? אם זה phones אז התרגום הוא טלפונים. אם זה l_v_adminphones אז זה מונח טכני וצריך להשאיר אותו ללא שינוי
+#~ msgid "l_v_adminphones"
+#~ msgstr "טלפונים"
diff --git a/trunk/package/luci/po/he/voice_diag.po b/trunk/package/luci/po/he/voice_diag.po
new file mode 100644
index 00000000..3cd1c9f0
--- /dev/null
+++ b/trunk/package/luci/po/he/voice_diag.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/he/watchcat.po b/trunk/package/luci/po/he/watchcat.po
new file mode 100644
index 00000000..4aa0c6b6
--- /dev/null
+++ b/trunk/package/luci/po/he/watchcat.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/he/wol.po b/trunk/package/luci/po/he/wol.po
new file mode 100644
index 00000000..cb7c3b97
--- /dev/null
+++ b/trunk/package/luci/po/he/wol.po
@@ -0,0 +1,49 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2010-04-19 00:29+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/he/wshaper.po b/trunk/package/luci/po/he/wshaper.po
new file mode 100644
index 00000000..d646e764
--- /dev/null
+++ b/trunk/package/luci/po/he/wshaper.po
@@ -0,0 +1,40 @@
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/hu/ahcp.po b/trunk/package/luci/po/hu/ahcp.po
new file mode 100644
index 00000000..a5955657
--- /dev/null
+++ b/trunk/package/luci/po/hu/ahcp.po
@@ -0,0 +1,116 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-31 15:46+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "AHCP Server"
+msgstr "AHCP kiszolgáló"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"Az AHCP egy olyan automatikus konfigurációs protokoll IPv6 és kettős IPv6/"
+"IPv4 hálózatokhoz, mely a DHCP és a router dicovery protokoll helyett "
+"használható olyan hálózatokok ahol nehéz vagy lehetetlen beállítani külön "
+"kiszolgálót minden kapcsolati réteg tartományon belül, mint például a mobil "
+"eseti hálózatok."
+
+msgid "Active AHCP Leases"
+msgstr "Aktív AHCP bérletek"
+
+msgid "Address"
+msgstr "Cím"
+
+msgid "Advanced Settings"
+msgstr "Haladó beállítások"
+
+msgid "Age"
+msgstr "Kor"
+
+msgid "Announced DNS servers"
+msgstr "Bejelentett névkiszolgálók"
+
+msgid "Announced NTP servers"
+msgstr "Bejelentett NTP kiszolgálók"
+
+msgid "Announced prefixes"
+msgstr "Bejelentett előtagok"
+
+msgid "Collecting data..."
+msgstr "Adatok összegyűjtése..."
+
+msgid "Forwarder"
+msgstr "Továbbító"
+
+msgid "General Setup"
+msgstr "Általános beállítások"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 és IPv6"
+
+msgid "IPv4 only"
+msgstr "csak IPv4"
+
+msgid "IPv6 only"
+msgstr "csak IPv6"
+
+msgid "Lease directory"
+msgstr "Bérlet könytár"
+
+msgid "Lease validity time"
+msgstr "Bérlet érvényességi ideje"
+
+msgid "Log file"
+msgstr "Napló fájl"
+
+msgid "Multicast address"
+msgstr "Multicast cím"
+
+msgid "Operation mode"
+msgstr "Működési mód"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Protokoll család"
+
+msgid "Served interfaces"
+msgstr "Kiszolgált interfészek"
+
+msgid "Server"
+msgstr "Kiszolgáló"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "A bejelentett IPv4 és IPv6 NTP kiszolgálók részletezése"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "A bejelentett IPv4 és IPv6 névkiszolgálók részletezése"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"A bejelentett IPv4 és IPv6 hálózati előtagok részletezése CIDR jelölésben"
+
+msgid "The AHCP Service is not running."
+msgstr "Az AHCP szolgáltatás nem fut"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Az AHCP szolgáltatás fut, azonosítója:%s."
+
+msgid "There are no active leases."
+msgstr "Nincsenek aktív bérletek."
+
+msgid "Unique ID file"
+msgstr "Egyedi azonosító fájl"
diff --git a/trunk/package/luci/po/hu/asterisk.po b/trunk/package/luci/po/hu/asterisk.po
new file mode 100644
index 00000000..c6a5d81b
--- /dev/null
+++ b/trunk/package/luci/po/hu/asterisk.po
@@ -0,0 +1,134 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-18 23:18+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Általános Asterisk beállítások"
+
+#~ msgid "AGI directory"
+#~ msgstr "AGI könyvtár"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "A felvett hang fájlok gyorsítótárazása a felvétel alatt"
+
+#~ msgid "Debug Level"
+#~ msgstr "Nyomkövetési szint"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Néhány figyelmeztetés letilása"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Memóriatartalom kiírása összeomláskor"
+
+#~ msgid "High Priority"
+#~ msgstr "Magas prioritás"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Titkosítás inicializálása"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Belső időzítés használata"
+
+#~ msgid "Log directory"
+#~ msgstr "Napló könyvtár"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "A hivások megengedett maximális száma"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "A CPU maximális terhelése új hívások fogadásához"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Konzol színek letiltása"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "A gyorsítótárazott hang fájlok könyvtára"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Csoport futtatása mint"
+
+#~ msgid "The User to run as"
+#~ msgstr "Felhasználó futtatása mint"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Hangposta puffer könyvtár"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Rendszer név használata UniquID előtagként"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Részletes szint"
+
+#~ msgid "Time Zone"
+#~ msgstr "Időzóna"
+
+#~ msgid "include"
+#~ msgstr "tartalmaz"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Átvitel engedélyezése"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Globális változók törlése"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Várakoztatás engedélyezése"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Várakoztatási idő (másodperc)"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Újraindítás módja"
+
+#~ msgid "Parameter"
+#~ msgstr "Paraméter"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Általános IAX beállítások"
+
+#~ msgid "Static"
+#~ msgstr "Statikus"
+
+#~ msgid "Write Protect"
+#~ msgstr "Írásvédelem"
+
+#~ msgid "Modules"
+#~ msgstr "Modulok"
+
+#~ msgid "DTMF mode"
+#~ msgstr "DTMF mód"
+
+#~ msgid "Client Type"
+#~ msgstr "Ügyfél típusa"
+
+#~ msgid "Username"
+#~ msgstr "Felhasználónév"
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Display Name"
+#~ msgstr "Megjelenítendő név"
+
+#~ msgid "Password"
+#~ msgstr "Jelszó"
+
+#~ msgid "zone"
+#~ msgstr "zóna"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Hang zóna beállítások"
+
+#~ msgid "Message Format"
+#~ msgstr "Üzenet formátuma"
diff --git a/trunk/package/luci/po/hu/base.po b/trunk/package/luci/po/hu/base.po
new file mode 100644
index 00000000..62adb6af
--- /dev/null
+++ b/trunk/package/luci/po/hu/base.po
@@ -0,0 +1,3327 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-31 09:59+0200\n"
+"Last-Translator: Gabor <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d perces ablak, %d másodperces intervallum)"
+
+msgid "(%s available)"
+msgstr "(%s elérhető)"
+
+msgid "(empty)"
+msgstr "(üres)"
+
+msgid "(no interfaces attached)"
+msgstr "(nincs csatalkoztatott interfész)"
+
+msgid "-- Additional Field --"
+msgstr "-- További mező --"
+
+msgid "-- Please choose --"
+msgstr "-- Kérem válasszon --"
+
+msgid "-- custom --"
+msgstr "-- egyéni --"
+
+msgid "1 Minute Load:"
+msgstr "Terhelés (utolsó 1 perc):"
+
+msgid "15 Minute Load:"
+msgstr "Terhelés (utolsó 15 perc):"
+
+msgid "5 Minute Load:"
+msgstr "Terhelés (utolsó 5 perc):"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> lekérdezési port"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> szerver port"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr> szerverek a resolv fájl "
+"sorrendjében"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-cím"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-útválasztó"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-cím, vagy hálózat "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-útválasztó"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> konfiguráció"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Név"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-cím"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> bérlés"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> csomagméret"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">Max.</abbr> párhuzamos lekérdezés"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "AR Támogatás"
+
+msgid "ARP retry threshold"
+msgstr "ARP újrapróbálkozási küszöbérték"
+
+msgid "ATM Bridges"
+msgstr "ATM Hidak"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM Virtuális Csatorna Azonosító (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM Virtuális Út Azonosító (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Az ATM hidak az AAL5-be ágyazott ethernet kapcsolatokat mint virtuális Linux "
+"hálózati interfész mutatják, mely így DHCP-vel vagy PPP-vel összekapcsolva "
+"használható a szolgáltatói hálózatba történő betárcsázáshoz."
+
+msgid "ATM device number"
+msgstr "ATM eszközszám"
+
+msgid "Access Concentrator"
+msgstr "Elérési központ"
+
+msgid "Access Point"
+msgstr "Hozzáférési pont"
+
+msgid "Action"
+msgstr "Művelet"
+
+msgid "Actions"
+msgstr "Műveletek"
+
+msgid "Activate this network"
+msgstr "Hálózat aktiválása"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Aktív <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> útvonalak"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Aktív <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> útvonalak"
+
+msgid "Active Connections"
+msgstr "Aktív kapcsolatok"
+
+msgid "Active DHCP Leases"
+msgstr "Aktív DHCP bérletek"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Aktív DHCPv6 bérletek"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Hozzáadás"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Helyi tartomány utótag hozzáadása a hosts fájlokból kiszolgált nevekhez"
+
+msgid "Add new interface..."
+msgstr "Új interfész hozzáadása..."
+
+msgid "Additional Hosts files"
+msgstr "További 'hosts' fájlok"
+
+msgid "Address"
+msgstr "Cím"
+
+msgid "Address to access local relay bridge"
+msgstr "Helyi közvetítő híd elérési címe"
+
+msgid "Administration"
+msgstr "Adminisztráció"
+
+msgid "Advanced Settings"
+msgstr "Haladó beállítások"
+
+msgid "Alert"
+msgstr "Riasztás"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"<abbr title=\"Secure Shell\">SSH</abbr> jelszó hitelesítés engedélyezése"
+
+msgid "Allow all except listed"
+msgstr "Összes engedélyezése a felsoroltakon kívül"
+
+msgid "Allow listed only"
+msgstr "Csak a felsoroltak engedélyezése"
+
+msgid "Allow localhost"
+msgstr "Lolcalhost engedélyezése"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Távoli hostok csatlakozásának engedélyezése a helyi SSH továbbított "
+"portokhoz."
+
+msgid "Allow root logins with password"
+msgstr "root jelszavas bejelentkezésének engedélyezése"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Engedélyezi a <em>root</em> felhasználó jelszavas bejelentkezését"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"A 127.0.0.0/8-as tartományba eső DNS válaszok engedélyezése (pl. RBL "
+"szervizek)"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"40 MHz csatornaszélesség használata akkor is, ha a másodlagos csatorna "
+"átfedésben van. Ezen opció használata nem felel meg az IEE 902.11n-2009 "
+"szabványnak!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Amennyiben ezt jelöletlenül hagyja, egy további hálózat jön létre"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "1-es antenna"
+
+msgid "Antenna 2"
+msgstr "2-es antenna"
+
+msgid "Antenna Configuration"
+msgstr "Antenna beállítások"
+
+msgid "Any zone"
+msgstr "Bármelyik zóna"
+
+msgid "Apply"
+msgstr "Alkalmaz"
+
+msgid "Applying changes"
+msgstr "Módosítások alkalmazása"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Interfészek összekapcsolása..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Kapcsolódó kliensek"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s vezeték-nélküli vezérlő"
+
+msgid "Authentication"
+msgstr "Hitelesítés"
+
+msgid "Authoritative"
+msgstr "Hiteles"
+
+msgid "Authorization Required"
+msgstr "Hitelesítés szükséges"
+
+msgid "Auto Refresh"
+msgstr "Automatikus frissítés"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Elérhető"
+
+msgid "Available packages"
+msgstr "Elérhető csomagok"
+
+msgid "Average:"
+msgstr "Átlag:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Vissza"
+
+msgid "Back to Overview"
+msgstr "Vissza az áttekintéshez"
+
+msgid "Back to configuration"
+msgstr "Vissza a beállításokhoz"
+
+msgid "Back to overview"
+msgstr "Vissza az áttekintéshez"
+
+msgid "Back to scan results"
+msgstr "Vissza a felderítési eredményekhez"
+
+msgid "Background Scan"
+msgstr "Felderítés a háttérben"
+
+msgid "Backup / Flash Firmware"
+msgstr "Mentés / Firmware frissítés"
+
+msgid "Backup / Restore"
+msgstr "Mentés / Visszaállítás"
+
+msgid "Backup file list"
+msgstr "Mentési fájl lista"
+
+msgid "Bad address specified!"
+msgstr "Hibás címet adott meg!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Alább található a biztonsági mentésbe kerülő fájlok listája. A lista az opkg "
+"által megjelölt módosított konfigurációs fájlokból, fontos alapvető "
+"fájlokból valamint a felhasználó által megadott mintáknak megfelelő "
+"fájlokból áll."
+
+msgid "Bitrate"
+msgstr "Bitráta"
+
+msgid "Bogus NX Domain Override"
+msgstr "Hamis NX tartomány felülbírálása"
+
+msgid "Bridge"
+msgstr "Híd"
+
+msgid "Bridge interfaces"
+msgstr "Híd interfészek"
+
+msgid "Bridge unit number"
+msgstr "Híd eszközszám"
+
+msgid "Bring up on boot"
+msgstr "Hozza fel a rendszer indításakor"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s vezeték-nélküli vezérlő"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 vezeték-nélküli vezérlő"
+
+msgid "Buffered"
+msgstr "Átmeneti tárban van"
+
+msgid "Buttons"
+msgstr "Gombok"
+
+msgid "CPU"
+msgstr "Processzor"
+
+msgid "CPU usage (%)"
+msgstr "Processzor használat (%)"
+
+msgid "Cached"
+msgstr "Gyorsítótárban van"
+
+msgid "Cancel"
+msgstr "Mégsem"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Lánc"
+
+msgid "Changes"
+msgstr "Módosítások"
+
+msgid "Changes applied."
+msgstr "A módosítások alkalmazva."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+"Itt módosíthatja az eszköz eléréséhez szükséges adminisztrátori jelszót"
+
+msgid "Channel"
+msgstr "Csatorna"
+
+msgid "Check"
+msgstr "Ellenőrzés"
+
+msgid "Checksum"
+msgstr "Ellenőrző összeg"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Válassza ki a tűzfal zónát amit hozzá akar rendelni ehhez az interfészhez. "
+"Válassza a <em>nincs megadva</em> elemet az interfésznek a hozzárendelt "
+"zónából történő eltávolításához, vagy töltse ki az <em>új</em> mezőt új zóna "
+"megadásához és csatlakoztassa az interfészt ahhoz."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Válassza ki azokat a hálózatokat, amelyeket csatlakoztatni akar ehhez a "
+"vezetéknélküli interfészhez, vagy töltse ki az <em>új</em> mezőt egy új "
+"hálózat definiálásához."
+
+msgid "Cipher"
+msgstr "Titkosító"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Kattintson az \"Archívum készítése\" gombra a jelenlegi konfiguráció tar "
+"archívumként történő letöltéséhez. A firmware kezdeti állapotának "
+"visszaállításához kattintson a \"Visszaállítás végrehajtása\" gombra (csak "
+"squashfs image-ek esetén lehetséges)."
+
+msgid "Client"
+msgstr "Ügyfél"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "DHCP kérés során küldendő kliens azonosító"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Inaktív kapcsolatok bezárása a megadott másodpercek után, használjon 0-t "
+"állandó kapcsolathoz"
+
+msgid "Close list..."
+msgstr "Lista bezárása..."
+
+msgid "Collecting data..."
+msgstr "Adatok összegyűjtése..."
+
+msgid "Command"
+msgstr "Parancs"
+
+msgid "Common Configuration"
+msgstr "Álatános beállítás"
+
+msgid "Compression"
+msgstr "Tömörítés"
+
+msgid "Configuration"
+msgstr "Beállítás"
+
+msgid "Configuration applied."
+msgstr "Beállítások alkalmazva."
+
+msgid "Configuration files will be kept."
+msgstr "A konfigurációs fájlok megmaradnak."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Beállítja ezt a csatlakozási pontot block-extroot részére mint overlay tároló"
+
+msgid "Confirmation"
+msgstr "Megerősítés"
+
+msgid "Connect"
+msgstr "Kapcsolódás"
+
+msgid "Connected"
+msgstr "Kapcsolódva"
+
+msgid "Connection Limit"
+msgstr "Kapcsolati korlát"
+
+msgid "Connections"
+msgstr "Kapcsolatok"
+
+msgid "Country"
+msgstr "Ország"
+
+msgid "Country Code"
+msgstr "Országkód"
+
+msgid "Cover the following interface"
+msgstr "A következő interfészt tartalmazza"
+
+msgid "Cover the following interfaces"
+msgstr "A következő interfészeket tartalmazza"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Tűzfal zóna készítés / hozzárendelés"
+
+msgid "Create Interface"
+msgstr "Új interfész"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Híd létrehozása több interfész között"
+
+msgid "Critical"
+msgstr "Kritikus"
+
+msgid "Cron Log Level"
+msgstr "Cron naplózási szint"
+
+msgid "Custom Interface"
+msgstr "Egyéni interfész"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Az eszköz <abbr title=\"Light Emitting Diode\">LED</abbr>-jei működésének "
+"testreszabása."
+
+msgid "DHCP Leases"
+msgstr "DHCP bérletek"
+
+msgid "DHCP Server"
+msgstr "DHCP kiszolgáló"
+
+msgid "DHCP and DNS"
+msgstr "DHCP és DNS"
+
+msgid "DHCP client"
+msgstr "DHCP ügyfél"
+
+msgid "DHCP-Options"
+msgstr "DHCP beállítások"
+
+msgid "DHCPv6 Leases"
+msgstr "DHCPv6 bérletek"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "DNS továbbítások"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Hibakeresés"
+
+msgid "Default %d"
+msgstr "Alapértelmezés %d"
+
+msgid "Default gateway"
+msgstr "Alapértelmezett átjáró"
+
+msgid "Default state"
+msgstr "Alapértelmezett állapot"
+
+msgid "Define a name for this network."
+msgstr "Adja meg a hálózat nevét."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Adjon meg további DHCP opciókat, például \"<code>6,192.168.2.1,192.168.2.2</"
+"code>\", mely különböző DNS kiszolgálókat hirdet az ügyfelek részére."
+
+msgid "Delete"
+msgstr "Törlés"
+
+msgid "Delete this interface"
+msgstr "Interfész törlése"
+
+msgid "Delete this network"
+msgstr "Hálózat törlése"
+
+msgid "Description"
+msgstr "Leírás"
+
+msgid "Design"
+msgstr "Megjelenés"
+
+msgid "Destination"
+msgstr "Cél"
+
+msgid "Device"
+msgstr "Eszköz"
+
+msgid "Device Configuration"
+msgstr "Eszköz beállítások"
+
+msgid "Diagnostics"
+msgstr "Diagnosztika"
+
+msgid "Directory"
+msgstr "Könyvtár"
+
+msgid "Disable"
+msgstr "Letiltás"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> tiltása ezen "
+"az interfészen."
+
+msgid "Disable DNS setup"
+msgstr "DNS beállítás letiltása"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Hardveres beacon időzítő letiltása"
+
+msgid "Disabled"
+msgstr "Letiltva"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Beérkező RFC1918 DHCP válaszok elvetése. "
+
+msgid "Displaying only packages containing"
+msgstr "Csak azon csomagok megjelenítése, amelyek tartalmazzák"
+
+msgid "Distance Optimization"
+msgstr "Távolság optimalizáció"
+
+msgid "Distance to farthest network member in meters."
+msgstr "A hálózat legtávolabbi tagjának távolsága méterben."
+
+msgid "Diversity"
+msgstr "Diverzitás"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"A Dnsmasq egy kombinált <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-kiszolgáló és  <abbr title=\"Domain Name System\">DNS</abbr>-"
+"továbbító <abbr title=\"Network Address Translation\">NAT</abbr> tűzfalak "
+"számára"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+"Ne gyorsítótárazza a negatív válaszokat, pl. nem létező domain-ok esetén"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Ne továbbítsa a publikus név szerverek által nem megválaszolható kéréseket"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Ne továbbítson fordított keresési kéréseket a helyi hálózathoz"
+
+msgid "Do not send probe responses"
+msgstr "Ne válaszoljon a szondázásra"
+
+msgid "Domain required"
+msgstr "Tartomány szükséges"
+
+msgid "Domain whitelist"
+msgstr "Tartomány fehérlista"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Ne továbbítsa a <abbr title=\"Domain Name System\">DNS</abbr>-név nélküli "
+"<abbr title=\"Domain Name System\">DNS</abbr>-kéréseket "
+
+msgid "Download and install package"
+msgstr "Csomag letöltése és telepítése"
+
+msgid "Download backup"
+msgstr "Biztonsági mentés letöltése"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear példány"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"A Dropbear a hálózaton <abbr title=\"Secure Shell\">SSH</abbr> hozzáférést "
+"tesz lehetővé, valamint integrált <abbr title=\"Secure Copy\">SCP</abbr> "
+"szolgáltatást nyújt."
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Dinamikus <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "Dinamikus alagút"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Az ügyfelek számára kiosztott DHCP címek dinamikus lefoglalása. Letiltása "
+"esetén csak a statikus DHCP bérlettel rendelkező kliensek lesznek "
+"kiszolgálva."
+
+msgid "EAP-Method"
+msgstr "EAP metódus"
+
+msgid "Edit"
+msgstr "Szerkesztés"
+
+msgid "Edit this interface"
+msgstr "Interfész szerkesztése"
+
+msgid "Edit this network"
+msgstr "Hálózat szerkesztése"
+
+msgid "Emergency"
+msgstr "Vészhelyzet"
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> engedélyezése"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "HE.net dinamikus végpont frissítésének engedélyezése"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "IPv6 egyeztetés engedélyezése a PPP linken"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Óriás keretek átengedésének engedélyezése"
+
+msgid "Enable NTP client"
+msgstr "NTP-kliens engedélyezése"
+
+msgid "Enable TFTP server"
+msgstr "TFTP kiszolgáló engedélyezése"
+
+msgid "Enable VLAN functionality"
+msgstr "VLAN funkció engedélyezése"
+
+msgid "Enable learning and aging"
+msgstr "Tanulás és aging engedélyezése"
+
+msgid "Enable this mount"
+msgstr "A csatolás engedélyezése"
+
+msgid "Enable this swap"
+msgstr "A lapozó terület engedélyezése"
+
+msgid "Enable/Disable"
+msgstr "Engedélyezés/Letiltás"
+
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "A Spanning Tree prokoll engedélyezése erre a hídra"
+
+msgid "Encapsulation mode"
+msgstr "Beágyazási mód"
+
+msgid "Encryption"
+msgstr "Titkosítás"
+
+msgid "Erasing..."
+msgstr "Törlés..."
+
+msgid "Error"
+msgstr "Hiba"
+
+msgid "Ethernet Adapter"
+msgstr "Ethernet adapter"
+
+msgid "Ethernet Switch"
+msgstr "Ethernet switch"
+
+msgid "Expand hosts"
+msgstr "Gépek kibontása"
+
+msgid "Expires"
+msgstr "Lejárat"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr "A bérelt címek lejárati ideje, a minimális érték 2 perc."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Külső rendszernapló kiszolgáló"
+
+msgid "External system log server port"
+msgstr "Külső rendszernapló kiszolgáló port"
+
+msgid "Fast Frames"
+msgstr "Gyors keretek"
+
+msgid "File"
+msgstr "Fájl"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "A kliensek részére közzétett betöltö kép fájlneve"
+
+msgid "Filesystem"
+msgstr "Fájlrendszer"
+
+msgid "Filter"
+msgstr "Szűrő"
+
+msgid "Filter private"
+msgstr "Privát kérések szűrése"
+
+msgid "Filter useless"
+msgstr "Használhahatlan kérések szűrése"
+
+msgid "Find and join network"
+msgstr "Hálózatok keresése és csatlakozás"
+
+msgid "Find package"
+msgstr "Csomag keresése"
+
+msgid "Finish"
+msgstr "Befejezés"
+
+msgid "Firewall"
+msgstr "Tűzfal"
+
+msgid "Firewall Settings"
+msgstr "Tűzfal Beállítások"
+
+msgid "Firewall Status"
+msgstr "Tűzfal Állapot"
+
+msgid "Firmware Version"
+msgstr "Tűzfal verzió"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Rögzített forrás port a kimenő DNS kérésekhez"
+
+msgid "Flags"
+msgstr "Flag-ek"
+
+msgid "Flash Firmware"
+msgstr "Firmware flash-elés"
+
+msgid "Flash image..."
+msgstr "Flash image..."
+
+msgid "Flash new firmware image"
+msgstr "Új firmware image flash-elése"
+
+msgid "Flash operations"
+msgstr "Flash műveletek"
+
+msgid "Flashing..."
+msgstr "Flash-elés..."
+
+msgid "Force"
+msgstr "Kényszerítés"
+
+msgid "Force 40MHz mode"
+msgstr "40 MHz mód erőltetése"
+
+msgid "Force CCMP (AES)"
+msgstr "CCMP (AES) kényszerítése"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+"DHCP kényszerítése ezen a hálózaton még akkor is ha van másik szerver "
+"észlelve."
+
+msgid "Force TKIP"
+msgstr "TKIP kényszerítése"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "TKIP és CCMP (AES) kényszerítése"
+
+msgid "Forward DHCP traffic"
+msgstr "DHCP forgalom továbbítás"
+
+msgid "Forward broadcast traffic"
+msgstr "Broadcast forgalom továbbítás"
+
+msgid "Forwarding mode"
+msgstr "Továbbítás módja"
+
+msgid "Fragmentation Threshold"
+msgstr "Töredezettségi küszöb"
+
+msgid "Frame Bursting"
+msgstr "Keretfűzés"
+
+msgid "Free"
+msgstr "Szabad"
+
+msgid "Free space"
+msgstr "Szabad hely"
+
+msgid "Frequency Hopping"
+msgstr "Frekvencia ugrás"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Csak GPRS"
+
+msgid "Gateway"
+msgstr "Átjáró"
+
+msgid "Gateway ports"
+msgstr "Átjáró portok"
+
+msgid "General Settings"
+msgstr "Általános beállítások"
+
+msgid "General Setup"
+msgstr "Általános beállítások"
+
+msgid "Generate archive"
+msgstr "Archívum készítése"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Általános 802.11%s vezeték-nélküli vezérlő"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "A megadott jelszavak nem egyeznek, a jelszó nem lett megváltoztatva!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Ugrás a jelszó beállításhoz..."
+
+msgid "Go to relevant configuration page"
+msgstr "Ugrás a tárgyhoz tartozó beállításokhoz"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "HE.net jelszó"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Kezelő"
+
+msgid "Hang Up"
+msgstr "Befejezés"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Itt állíthatja be az eszköz alapvető tulajdonságait, mint például a gépnév "
+"vagy az időzóna."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Nyilvános kulcs alapú SSH azonosításhoz itt adhat meg nyilvános SSH "
+"kulcsokat (soronként egyet)."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b vezeték nélküli vezérlő"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> elrejtése"
+
+msgid "Host entries"
+msgstr "Host bejegyzések"
+
+msgid "Host expiry timeout"
+msgstr "Host lejárati idő"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> vagy hálózat"
+
+msgid "Hostname"
+msgstr "Gépnév"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "DHCP kérés során küldendő gépnév"
+
+msgid "Hostnames"
+msgstr "Gépnevek"
+
+msgid "IP address"
+msgstr "IP cím"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4 tűzfal"
+
+msgid "IPv4 WAN Status"
+msgstr "IPv4 WAN állapot"
+
+msgid "IPv4 address"
+msgstr "IPv4 cím"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 és IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 broadcast"
+
+msgid "IPv4 gateway"
+msgstr "IPv4 átjáró"
+
+msgid "IPv4 netmask"
+msgstr "IPv4 hálózati maszk"
+
+msgid "IPv4 only"
+msgstr "csak IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "IPv4 prefix hossza"
+
+msgid "IPv4-Address"
+msgstr "IPv4-cím"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6 tűzfal"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "IPv6 WAN állapot"
+
+msgid "IPv6 address"
+msgstr "IPv6 cím"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6 átjáró"
+
+msgid "IPv6 only"
+msgstr "csak IPv6"
+
+msgid "IPv6 prefix"
+msgstr "IPv6 előtag"
+
+msgid "IPv6 prefix length"
+msgstr "IPv6 prefix hossz"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-cím"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6 IPv4-ben (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6 IPv4 felett (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6 IPv4 felett (6to4)"
+
+msgid "Identity"
+msgstr "Identitás"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Megadás esetén az eszköz csomópont helyett UUID alapján történő csatolása"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Megadás esetén az eszköz csomópont helyett címke alapján történő csatolása"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Ha nincs kiválasztva, akkor nincs alapértelmezett útvonal beállítva"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+"Ha nincs kiválasztva, akkor a hirdetett DNS kiszolgáló címeket nem veszi "
+"figyelembe"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Ha a fizikai memória túl kevés a nem használt adatok ideiglenesen áttehetők "
+"egy swap-eszközre mely így nagyobb mennyiségű használható <abbr title="
+"\"Random Access Memory\">RAM</abbr>-ot eredményez. Az adatok áttétele egy "
+"nagyon lassú folyamat mivel a swap-eszköz nem érhető el akkora sebességgel "
+"mint a <abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "A hosts fájlok figyelmen kívül hagyása"
+
+msgid "Ignore interface"
+msgstr "Interfész figyelmen kívül hagyása"
+
+msgid "Ignore resolve file"
+msgstr "A resolve fájl figyelmen kívül hagyása"
+
+msgid "Image"
+msgstr "Image"
+
+msgid "In"
+msgstr "Be"
+
+msgid "Inactivity timeout"
+msgstr "Inaktivitási időtúllépés"
+
+msgid "Inbound:"
+msgstr "Bejövő"
+
+msgid "Info"
+msgstr "Információk"
+
+msgid "Initscript"
+msgstr "Indítási állomány"
+
+msgid "Initscripts"
+msgstr "Indítási állományok"
+
+msgid "Install"
+msgstr "Telepítés"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "%q csomag telepítése"
+
+msgid "Install protocol extensions..."
+msgstr "Protokoll kiterjesztések telepítése..."
+
+msgid "Installed packages"
+msgstr "Telepített csomagok"
+
+msgid "Interface"
+msgstr "Interfész"
+
+msgid "Interface Configuration"
+msgstr "Interfész beállítások"
+
+msgid "Interface Overview"
+msgstr "Interfész áttekintés"
+
+msgid "Interface is reconnecting..."
+msgstr "Interfész újracsatlakoztatása..."
+
+msgid "Interface is shutting down..."
+msgstr "Interfész leállítása..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Az interfész nincs jelen, vagy még nincs csatlakoztatva."
+
+msgid "Interface reconnected"
+msgstr "Interfész újracsatlakoztatva"
+
+msgid "Interface shut down"
+msgstr "Interfész leállítás"
+
+msgid "Interfaces"
+msgstr "Interfészek"
+
+msgid "Internal Server Error"
+msgstr "Belső szerverhiba"
+
+msgid "Invalid"
+msgstr "Érvénytelen"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+"A megadott VLAN azonosító érvénytelen. Az azonosítónak %d és %d közé kell "
+"esnie."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+"A megadott VLAN azonosító érvénytelen! Minden VLAN-hoz egyedi azonosító kell."
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Érvénytelen felhasználói név és/vagy jelszó! Kérem próbálja újra!"
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Úgy tűnik, hogy a flash-elendő kép-file nem fér el a Flash-memóriába. Kérem "
+"ellenőrizze a kép fájlt!"
+
+msgid "Java Script required!"
+msgstr "Javascript szükséges!"
+
+msgid "Join Network"
+msgstr "Csatlakozás a hálózathoz"
+
+msgid "Join Network: Settings"
+msgstr "Csatlakozás a hálózathoz: Beállítások"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Csatlakozás a hálózathoz: vezetéknélküli hálózatok keresése"
+
+msgid "Keep settings"
+msgstr "Beállítások megtartása"
+
+msgid "Kernel Log"
+msgstr "Kernel napló"
+
+msgid "Kernel Version"
+msgstr "Kernel verzió"
+
+msgid "Key"
+msgstr "Kulcs"
+
+msgid "Key #%d"
+msgstr "Kulcs #%d"
+
+msgid "Kill"
+msgstr "Kilövés"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP szerver"
+
+msgid "LCP echo failure threshold"
+msgstr "LCP echo hibaküszöb"
+
+msgid "LCP echo interval"
+msgstr "LCP Echo időtartam"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Címke"
+
+msgid "Language"
+msgstr "Nyelv"
+
+msgid "Language and Style"
+msgstr "Nyelv és megjelenés"
+
+msgid "Lease validity time"
+msgstr "Bérlet érvényességi ideje"
+
+msgid "Leasefile"
+msgstr "Bérlet fájl"
+
+msgid "Leasetime"
+msgstr "Bérlet időtartama"
+
+msgid "Leasetime remaining"
+msgstr "A bérletből hátralévő idő"
+
+msgid "Leave empty to autodetect"
+msgstr "Automatikus észleléshez hagyja üresen"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "A jelenlegi WAN cím használatához hagyja üresen"
+
+msgid "Legend:"
+msgstr "Jelmagyarázat:"
+
+msgid "Limit"
+msgstr "Korlát"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Kapcsolat létrehozva"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr> szerverek listája, ahová a "
+"kérések továbbításra kerülnek"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Domain-ok listája, melyeknél az RFC1918 válaszok megengedettek"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "A hamis NX tartomány eredményeket szolgáltató gépek listája"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Csak a megadott interfészen hallgat, vagy az összesen, amennyiben nem adja "
+"meg"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Szerver port a beérkező DNS kérések számára"
+
+msgid "Load"
+msgstr "Terhelés"
+
+msgid "Load Average"
+msgstr "Átlagos terhelés"
+
+msgid "Loading"
+msgstr "Betöltés"
+
+msgid "Local IPv4 address"
+msgstr "Helyi IPv4 cím"
+
+msgid "Local IPv6 address"
+msgstr "Helyi IPv6 cím"
+
+msgid "Local Startup"
+msgstr "Helyi indítóscript"
+
+msgid "Local Time"
+msgstr "Helyi idő"
+
+msgid "Local domain"
+msgstr "Helyi tartomány"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Helyi tartomány meghatározása. Az ezzel a tartománnyal egyező nevek soha "
+"nincsenek továbbítva és csak DHCP-n vagy host fájlok által kerülnek "
+"feloldásra"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"A helyi tartomány utótag csatolása a DHCP nevekhez és hosts fájl "
+"bejegyzésekhez"
+
+msgid "Local server"
+msgstr "Helyi kiszolgáló"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Gépnév lokalizációja a lekérdező alhálózattól függően, ha több IP cím is "
+"elérhető"
+
+msgid "Localise queries"
+msgstr "Lekérdezések lokalizációja"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Zárolt a %d csatornára az %s által."
+
+msgid "Log output level"
+msgstr "Napló kimeneti szintje"
+
+msgid "Log queries"
+msgstr "Kérések naplózása"
+
+msgid "Logging"
+msgstr "Naplózás"
+
+msgid "Login"
+msgstr "Bejelentkezés"
+
+msgid "Logout"
+msgstr "Kijelentkezés"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "A legalacsonyabb bérleti címnek az interfész címétől való távolsága"
+
+msgid "MAC-Address"
+msgstr "MAC-cím"
+
+msgid "MAC-Address Filter"
+msgstr "MAC-cím szűrő"
+
+msgid "MAC-Filter"
+msgstr "MAC-szűrő"
+
+msgid "MAC-List"
+msgstr "MAC-lista"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Maximális sebesség"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Aktív DHCP bérletek maximális száma"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Párhuzamos DNS kérések maximális száma"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "EDNS.0 UDP csomagok maximális mérete"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Maximális várakozási idő a modem kész állapotára (másodpercben)"
+
+msgid "Maximum hold time"
+msgstr "Maximális tartási idő"
+
+msgid "Maximum number of leased addresses."
+msgstr "DHCP címek maximális száma"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Memory usage (%)"
+msgstr "Memória használat (%)"
+
+msgid "Metric"
+msgstr "Metrika"
+
+msgid "Minimum Rate"
+msgstr "Minimális sebesség"
+
+msgid "Minimum hold time"
+msgstr "Minimális tartási idő"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Hiányzó protokoll kiterjesztés a %q progokoll számára"
+
+msgid "Mode"
+msgstr "Mód"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Modemeszköz"
+
+msgid "Modem init timeout"
+msgstr "Modem inicializálás időtúllépés"
+
+msgid "Monitor"
+msgstr "Ellenőrzés"
+
+msgid "Mount Entry"
+msgstr "Csatolási bejegyzés"
+
+msgid "Mount Point"
+msgstr "Csatolási pont"
+
+msgid "Mount Points"
+msgstr "Csatolási pontok"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Csatolási pontok - Csatolási bejegyzés"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Csatolási pontok - Lapozóterület bejegyzés"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"A csatolási pontok határozzák meg, hogy egy memória eszköz hová lesz "
+"csatlakoztatva a fájlendszeren belül "
+
+msgid "Mount options"
+msgstr "Csatolási beállítások"
+
+msgid "Mount point"
+msgstr "Csatolási pont"
+
+msgid "Mounted file systems"
+msgstr "Csatolt fájlrendszerek"
+
+msgid "Move down"
+msgstr "Mozgatás lefelé"
+
+msgid "Move up"
+msgstr "Mozgatás felfelé"
+
+msgid "Multicast Rate"
+msgstr "Multicast sebesség"
+
+msgid "Multicast address"
+msgstr "Multicast cím"
+
+msgid "NAS ID"
+msgstr "NAS azonosító"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Kijelölt NTP kiszolgálók"
+
+msgid "Name"
+msgstr "Név"
+
+msgid "Name of the new interface"
+msgstr "Az új interfész neve"
+
+msgid "Name of the new network"
+msgstr "Az új hálózat neve"
+
+msgid "Navigation"
+msgstr "Navigáció"
+
+msgid "Netmask"
+msgstr "Hálózati maszk"
+
+msgid "Network"
+msgstr "Hálózat"
+
+msgid "Network Utilities"
+msgstr "Hálózati eszközök"
+
+msgid "Network boot image"
+msgstr "Hálózati rendszertöltő lemezkép"
+
+msgid "Network without interfaces."
+msgstr "Interfészhez nem rendelt hálózat"
+
+msgid "Next »"
+msgstr "Következő »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Ehhez az interfészhez nincs DHCP kiszolgáló beállítva"
+
+msgid "No chains in this table"
+msgstr "Ez a tábla nem tartalmaz láncokat."
+
+msgid "No files found"
+msgstr "Nem találhatók fájlok"
+
+msgid "No information available"
+msgstr "Nincs elérhető információ"
+
+msgid "No negative cache"
+msgstr "Nincs negatív gyorsítótár"
+
+msgid "No network configured on this device"
+msgstr "Ehhez az eszközhöz nincs hálózat beállítva"
+
+msgid "No network name specified"
+msgstr "Nincs megadva hálózatnév"
+
+msgid "No package lists available"
+msgstr "Csomaglisták nem állnak rendelkezésre"
+
+msgid "No password set!"
+msgstr "Nincs jelszó!"
+
+msgid "No rules in this chain"
+msgstr "Ez a lánc nem tartalmaz szabályokat"
+
+msgid "No zone assigned"
+msgstr "Nincs hozzárendelt zóna"
+
+msgid "Noise"
+msgstr "Zaj"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Zaj:"
+
+msgid "None"
+msgstr "Nincs"
+
+msgid "Normal"
+msgstr "Normál"
+
+msgid "Not Found"
+msgstr "Nem található"
+
+msgid "Not associated"
+msgstr "Nincs hozzárendelve"
+
+msgid "Not connected"
+msgstr "Nincs kapcsolódva"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Megjegyzés: konfigurációs fájlok törölve lesznek."
+
+msgid "Notice"
+msgstr "Megjegyzés"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "OPKG-Beállítások"
+
+msgid "Off-State Delay"
+msgstr "Kikapcsolt állapot késleltetés"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Ezen az oldalon a hálózati interfészeket állíthatja be. Több interfész "
+"között híd hozható létre a \"híd interfész\" mező bejelölésével és több "
+"hálózati interfész nevének szóközzel történő elválasztásával. Lehetőség van "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> jelölés "
+"<samp>INTERFÉSZ.VLANSZÁM</samp> használatára is, pl. <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Bekapcsolt állapot késleltetés"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Legalább gépnevet vagy MAC-címet meg kell adni!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Egy vagy több mező érvénytelen adatot tartalmaz!"
+
+msgid "One or more required fields have no value!"
+msgstr "Egy vagy több kötelezően kitöltendő mező üres!"
+
+msgid "Open list..."
+msgstr "Lista megnyitása..."
+
+msgid "Option changed"
+msgstr "Beállítás módosítva"
+
+msgid "Option removed"
+msgstr "Beállítás eltávolítva"
+
+msgid "Options"
+msgstr "Lehetőségek"
+
+msgid "Other:"
+msgstr "Egyéb:"
+
+msgid "Out"
+msgstr "Ki"
+
+msgid "Outbound:"
+msgstr "Kimenő:"
+
+msgid "Outdoor Channels"
+msgstr "Kültéri csatornák"
+
+msgid "Override MAC address"
+msgstr "MAC cím felülbírálása"
+
+msgid "Override MTU"
+msgstr "MTU felülbíráslás"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Átjáró felülbírálása a DHCP válaszokban"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Az ügyfelek részére küldött hálózati masz felülbírálása. Ez alapesetben a "
+"kiszolgált alhálózat alapján kerül meghatározásra."
+
+msgid "Override the table used for internal routes"
+msgstr "A belső útvonalakhoz használt tábla felülbírálása"
+
+msgid "Overview"
+msgstr "Áttekintés"
+
+msgid "Owner"
+msgstr "Tulajdonos"
+
+msgid "PAP/CHAP password"
+msgstr "PAP/CHAP jelszó"
+
+msgid "PAP/CHAP username"
+msgstr "PAP/CHAP felhasználói név"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA beágyazás"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "A libiwinfo csomag szükséges!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "A csomag listák 24 óránál régebbiek"
+
+msgid "Package name"
+msgstr "Csomagnév"
+
+msgid "Packets"
+msgstr "Csomagok"
+
+msgid "Part of zone %q"
+msgstr "A %q zóna része"
+
+msgid "Password"
+msgstr "Jelszó"
+
+msgid "Password authentication"
+msgstr "Jelszó hitelesítés"
+
+msgid "Password of Private Key"
+msgstr "A privát kulcsh jelszava"
+
+msgid "Password successfully changed!"
+msgstr "A jelszó megváltoztatása sikeres!"
+
+msgid "Path to CA-Certificate"
+msgstr "CA tanúsítvány elérési útja"
+
+msgid "Path to Client-Certificate"
+msgstr "Kliens tanúsítvány elérési útja"
+
+msgid "Path to Private Key"
+msgstr "A privát kulcs elérési útja"
+
+msgid "Path to executable which handles the button event"
+msgstr "A gomb eseményeit kezelő végrehajtható állomány elérési útja"
+
+msgid "Peak:"
+msgstr "Csúcs:"
+
+msgid "Perform reboot"
+msgstr "Újraindítás végrehajtása"
+
+msgid "Perform reset"
+msgstr "Visszaállítás végrehajtása"
+
+msgid "Phy Rate:"
+msgstr "Phy sebesség:"
+
+msgid "Physical Settings"
+msgstr "Fizikai beállítások"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "csom."
+
+msgid "Please enter your username and password."
+msgstr "Adja meg a felhasználónevét és a jelszavát."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Kérem várjon: az eszköz újraindul..."
+
+msgid "Policy"
+msgstr "Szabály"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "A %d port egyszerre több VLAN-ban is cimkézetlen!"
+
+msgid "Port status:"
+msgstr "Port állapot:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"A peer halottnak tekintése a megadott számú LCP echo hibák után. Használjon "
+"0-t a hibák figyelmen kívül hagyásához."
+
+msgid "Prevents client-to-client communication"
+msgstr "Ügyfél-ügyfél közötti kommunikáció megakadályozása"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b vezeték nélküli vezérlő"
+
+msgid "Proceed"
+msgstr "Folytatás"
+
+msgid "Processes"
+msgstr "Folyamatok"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Protocol family"
+msgstr "Protokoll család"
+
+msgid "Protocol of the new interface"
+msgstr "Az új interfész protokollja"
+
+msgid "Protocol support is not installed"
+msgstr "Protokoll támogatás nincs telepítve"
+
+msgid "Provide NTP server"
+msgstr "NTP kiszolgáló"
+
+msgid "Provide new network"
+msgstr "Új hálózat nyújtása"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Ál Ad-hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Minőség"
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS küszöbérték"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "RX sebesség"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "RaLink 802.11%s vezeték nélküli vezérlő"
+
+msgid "Radius-Accounting-Port"
+msgstr "Radius-Naplózási-Port"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Radius-Naplózás-Kulcs"
+
+msgid "Radius-Accounting-Server"
+msgstr "Radius-Naplózás-Kiszolgáló"
+
+msgid "Radius-Authentication-Port"
+msgstr "Radius-Hitelesítés-Port"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Radius-Hitelesítés-Kulcs"
+
+msgid "Radius-Authentication-Server"
+msgstr "Radius-Hitelesítés-Kiszolgáló"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Az <code>/etc/ethers</code> fájl olvasása a <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr> kiszolgáló beállításához"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Biztosan törli az interfészt? A törlés nem visszavonható!\n"
+" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen az "
+"interfészen keresztül kapcsolódik."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Biztosan törli ezt a vezetéknélküli hálózatot? A törlés nem visszavonható!\n"
+"Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a hálózaton "
+"keresztül kapcsolódik."
+
+msgid "Really reset all changes?"
+msgstr "Biztos, hogy visszavonja az összes módosítást?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Biztos, hogy leállítja a hálózatot?!\n"
+" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a "
+"hálózaton keresztül kapcsolódik."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Biztos, hogy leállítja a \"%s\" interfészt?\n"
+" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen az "
+"interfészen keresztül kapcsolódik."
+
+msgid "Really switch protocol?"
+msgstr "Biztos, hogy cserélni szeretné a protokollt?"
+
+msgid "Realtime Connections"
+msgstr "Valósidejű kapcsolatok"
+
+msgid "Realtime Graphs"
+msgstr "Valósidejű grafikonok"
+
+msgid "Realtime Load"
+msgstr "Valósidejű terhelés"
+
+msgid "Realtime Traffic"
+msgstr "Valósidejű forgalom"
+
+msgid "Realtime Wireless"
+msgstr "Valósidejű vezetéknélküli adatok"
+
+msgid "Rebind protection"
+msgstr "Rebind elleni védelem"
+
+msgid "Reboot"
+msgstr "Újraindítás"
+
+msgid "Rebooting..."
+msgstr "Újraindítás..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Újraindítja az eszköz operációs rendszerét"
+
+msgid "Receive"
+msgstr "Fogadás"
+
+msgid "Receiver Antenna"
+msgstr "Vevő antenna"
+
+msgid "Reconnect this interface"
+msgstr "Csatlakoztassa újra az interfészt"
+
+msgid "Reconnecting interface"
+msgstr "Interfész újracsatlakoztatása"
+
+msgid "References"
+msgstr "Hivatkozások"
+
+msgid "Regulatory Domain"
+msgstr "Szabályozó tartomány"
+
+msgid "Relay"
+msgstr "Átjátszás"
+
+msgid "Relay Bridge"
+msgstr "Átjátszó híd"
+
+msgid "Relay between networks"
+msgstr "Átjátszás hálózatok között"
+
+msgid "Relay bridge"
+msgstr "Átjátszó híd"
+
+msgid "Remote IPv4 address"
+msgstr "Távoli IPv4 cím"
+
+msgid "Remove"
+msgstr "Eltávolítás"
+
+msgid "Repeat scan"
+msgstr "Felderítés ismétlése"
+
+msgid "Replace entry"
+msgstr "Bejegyés lecserélése"
+
+msgid "Replace wireless configuration"
+msgstr "Vezetéknélküli beállítások lecserélése"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+"Szükséges bizonyos internetszolgáltatók esetén, pl. Charter 'DOCSIS 3'-al"
+
+msgid "Reset"
+msgstr "Visszaállítás"
+
+msgid "Reset Counters"
+msgstr "Számlálók nullázása"
+
+msgid "Reset to defaults"
+msgstr "Alapértelmezések visszaállítása"
+
+msgid "Resolv and Hosts Files"
+msgstr "Resolv és hosts fájlok"
+
+msgid "Resolve file"
+msgstr "Resolv fájl"
+
+msgid "Restart"
+msgstr "Újraindítás"
+
+msgid "Restart Firewall"
+msgstr "Tűzfal újraindítása"
+
+msgid "Restore backup"
+msgstr "Biztonsági mentés visszaállítása"
+
+msgid "Reveal/hide password"
+msgstr "Jelszó mutatása/elrejtése"
+
+msgid "Revert"
+msgstr "Visszavonás"
+
+msgid "Root"
+msgstr "Gyökérkönyvtár"
+
+msgid "Root directory for files served via TFTP"
+msgstr "TFTP-n keresztül megosztott fájlok gyökérkönyvtára"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Router jelszó"
+
+msgid "Routes"
+msgstr "Útvonalak"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Az útvonalak határozzák meg, hogy bizonyos gépek illetve hálózatok melyik "
+"interfészen keresztül érhetők el."
+
+msgid "Rule #"
+msgstr "Szabály #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Fájlrendszer ellenőrzés futtatása az eszköz csatolása előtt"
+
+msgid "Run filesystem check"
+msgstr "Fájlrendszer ellenőrzés futtatása"
+
+msgid "SSH Access"
+msgstr "SSH hozzáférés"
+
+msgid "SSH-Keys"
+msgstr "SSH kulcsok"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Mentés"
+
+msgid "Save & Apply"
+msgstr "Mentés & Alkalmazás"
+
+msgid "Save &#38; Apply"
+msgstr "Mentés &#38; Alkalmazás"
+
+msgid "Scan"
+msgstr "Felderítés"
+
+msgid "Scheduled Tasks"
+msgstr "Ütemezett feladatok"
+
+msgid "Section added"
+msgstr "Szakasz hozzáadva"
+
+msgid "Section removed"
+msgstr "Szakasz eltávolítva"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Részletekért lásd a 'mount' man oldalát"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"LCP echo kérések küldése a másodpercben megadott időközönként, csak a "
+"hibaküszöbbel együtt van hatása."
+
+msgid "Separate Clients"
+msgstr "Kliensek szétválasztása"
+
+msgid "Separate WDS"
+msgstr "WDS szétválasztása"
+
+msgid "Server Settings"
+msgstr "Kiszolgáló beállításai"
+
+msgid "Service Name"
+msgstr "Szolgáltatás neve"
+
+msgid "Service Type"
+msgstr "Szolgáltatás típusa"
+
+msgid "Services"
+msgstr "Szolgáltatások"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Idő szinkronizálás beállítása"
+
+msgid "Setup DHCP Server"
+msgstr "DHCP kiszolgáló beállítása"
+
+msgid "Show current backup file list"
+msgstr "Mentendő fájlok aktuális listájának megjelenítése"
+
+msgid "Shutdown this interface"
+msgstr "Interfész leállítása"
+
+msgid "Shutdown this network"
+msgstr "Hálózat leállítása"
+
+msgid "Signal"
+msgstr "Jel"
+
+msgid "Signal:"
+msgstr "Jel:"
+
+msgid "Size"
+msgstr "Méret"
+
+msgid "Skip"
+msgstr "Ugrás"
+
+msgid "Skip to content"
+msgstr "Ugrás a tartalomhoz"
+
+msgid "Skip to navigation"
+msgstr "Ugrás a navigációhoz"
+
+msgid "Slot time"
+msgstr "Időrés"
+
+msgid "Software"
+msgstr "Szoftver"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Néhán mező érvénytelen, az értékek nem menthetők!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Sajnálom, a kért objektum nem található."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Sajnálom, a szerver váratlan hibát észlelt."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Sajnáljuk, a 'sysupgrade' támogatás nem elérhető, az új firmware fájl "
+"telepítését manuálisan kell elvégezni. Az eszközhöz tartozó telepítési "
+"utasításokért keresse fel az libreCMC wiki-t."
+
+msgid "Sort"
+msgstr "Sorbarendezés"
+
+msgid "Source"
+msgstr "Forrás"
+
+msgid "Specifies the button state to handle"
+msgstr "Meghatározza a gomb kezelendő állapotát"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Megadja az eszköz csatlakozási könyvtárát."
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Megadja a <em>Dropbear</em> példány portját"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Megadja a maximális sikertelen ARP kérések számát, amik után a host nem "
+"elérhetőnek tekinthető"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Megadja a másodpercek számát, amik után a host nem elérhetőnek tekinthető"
+
+msgid "Specify the secret encryption key here."
+msgstr "Itt adja meg a titkosító kulcsot."
+
+msgid "Start"
+msgstr "Indítás"
+
+msgid "Start priority"
+msgstr "Indítás prioritása"
+
+msgid "Startup"
+msgstr "Rendszerindítás"
+
+msgid "Static IPv4 Routes"
+msgstr "Statikus IPv4 útvonalak"
+
+msgid "Static IPv6 Routes"
+msgstr "Statikus IPv6 útvonalak"
+
+msgid "Static Leases"
+msgstr "Statikus bérletek"
+
+msgid "Static Routes"
+msgstr "Statikus útvonalak"
+
+msgid "Static WDS"
+msgstr "Statikus WDS"
+
+msgid "Static address"
+msgstr "Statikus cím"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"A statikus bérletekkel a DHCP kliensekhez fix IP-címet és hostnevet "
+"rendelhet. Olyan nem dinamikus interfész konfigurációk esetén is "
+"szükségesek, ahol a csak a megfelelő bérlettel rendelkező hosztok kerülnek "
+"kiszolgálásra."
+
+msgid "Status"
+msgstr "Állapot"
+
+msgid "Stop"
+msgstr "Leállítás"
+
+msgid "Strict order"
+msgstr "Kötött sorrend"
+
+msgid "Submit"
+msgstr "Elküldés"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Lapozóterület"
+
+msgid "Switch"
+msgstr "Kapcsoló"
+
+msgid "Switch %q"
+msgstr "Kapcsoló %q"
+
+msgid "Switch %q (%s)"
+msgstr "Kapcsoló %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Protokoll csere"
+
+msgid "Sync with browser"
+msgstr "Szinkronizálás a böngészővel"
+
+msgid "Synchronizing..."
+msgstr "Szinkronizálás..."
+
+msgid "System"
+msgstr "Rendszer"
+
+msgid "System Log"
+msgstr "Rendszernapló"
+
+msgid "System Properties"
+msgstr "Rendszer tulajdonságok"
+
+msgid "System log buffer size"
+msgstr "Rendszer napló puffer méret"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "TFTP beállítások"
+
+msgid "TFTP server root"
+msgstr "TFTP szerver gyökér könyvtár"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "TX sebesség"
+
+msgid "Table"
+msgstr "Tábla"
+
+msgid "Target"
+msgstr "Cél"
+
+msgid "Terminate"
+msgstr "Megszakítás"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"Az <em>Eszköz beállítások</em> szakasz a rádió hardver fizikai beállításait, "
+"úgymint csatorna, adóteljesítmény vagy antenna választás teszi lehetővé, "
+"amelyen az összes definiált vezeték nélküli hálózat (ha a rádió hardver "
+"multi-SSID képes) osztozik. A hálózatonkénti beállítások, mint az "
+"titkosítás, mód az <em>Interfész beállítások</em> alá vannak csoportosítva."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"A <em>libiwinfo-lua</em> nincs telepítve. A vezetéknélküli beállítás "
+"működéséhez ezt az összetevőt telepítnei kell."
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"A szolgáltatóhoz rendelt IPv6 előtag, általában így végződik: <code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"A következő karakterek használhatók: <code>A-Z</code>, <code>a-z</code>, "
+"<code>0-9</code> and <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"A memória vagy partíció eszköz fájlja (<abbr title=\"például\">pl.</abbr> "
+"<code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"A memória formázásához használt fájlrendszer típusa (<abbr title=\"for "
+"example\">pl.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</"
+"abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Az image feltöltve. Alább található a fájl ellenőrző összege és mérete, "
+"hasonlítsa össze az eredeti fájllal a feltöltött adatok sértetlenségének "
+"ellenőrzéséhez.<br />Kattintson az alábbi \"Folytatás\" gombra a flash-elési "
+"eljárás elindításához."
+
+msgid "The following changes have been committed"
+msgstr "A következő módosítások lettek alkalmazva"
+
+msgid "The following changes have been reverted"
+msgstr "A következő módosítások lettek visszavonva"
+
+msgid "The following rules are currently active on this system."
+msgstr "Jelenleg a következő szabályok aktívak a rendszeren."
+
+msgid "The given network name is not unique"
+msgstr "A megadott hálózati név már létezik"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"A hardver nem képes többszörös SSID kezelésre ezért a meglévő beállítások "
+"elvesznek ha folytatja."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"Az IPv4 előtag hossza bitekben, a maradék az IPv6 címekben használatos."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Az IPv6 előtag hossza bitekben"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Az eszközön található hálózati portok kombinálhatók több <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>-ba, amelyekben a számítógépek "
+"közvetlenül kommunikálhatnak egmással. A <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>-ok gyakran a hálózati szegmensek elkülönítésére "
+"használják. Gyakran van egy alapértelmezett Uplink port a következő nagyobb "
+"hálózathoz (pl. az internet) való kapcsolódásra és a többi port a helyi "
+"hálózathoz."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "A kiválasztott protokoll eszköz hozzárendelést igényel"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr "A rendszer most törli a konfigurációs partíciót majd újraindul."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"A rendszer frissítése folyamatban.<br /> NE KAPCSOLJA KI AZ ESZKÖZT!<br /> "
+"Várjon néhány percet, amíg az eszköz ismételten elérhető. Az eszköz "
+"eléréséhez a beállításaitól függően szükséges lehet a számítógépe IP-címének "
+"megújítása."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"A feltöltött image fájl formátuma nem támogatott. Ügyeljen arra, hogy a "
+"platformjának megfelelő általános image formátumot válassza ki."
+
+msgid "There are no active leases."
+msgstr "Nincsenek aktív bérletek."
+
+msgid "There are no pending changes to apply!"
+msgstr "Nincsenek alkalmazásra váró módosítások!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Nincsenek visszavonásra váró változtatások!"
+
+msgid "There are no pending changes!"
+msgstr "Nincsenek el nem mentett változtatások!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Nincs hozzárendelt eszköz, kérem csatoljon egy hálózati eszközt a \"Fizikai "
+"beállítások\" fülön."
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"A routeren jelenleg nincs jelszó beállítva. Állítsa be a root felhasználó "
+"jelszavát a felhasználói felület védelme és az SSH elérés engélyezése "
+"érdekében."
+
+msgid "This IPv4 address of the relay"
+msgstr "Az átjátszó IPV4 címe"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Ez egy shell mintákból álló lista a rendszer frissítés során megőrzendő "
+"fájlok és könytárak meghatározására. Az /etc/config/ könyvtárban található "
+"módosított fájlok és bizonyos további beállítások automatikusan megőrződnek."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Ez a /etc/rc.local fájl tartalma. Ide írhatja be a saját parancsait (az "
+"'exit 0' sor elé) a boot folyamat végén történő futtatásukhoz."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Ez az alagút közvetítő (tunnel broker) által megadott helyi végpont címe, "
+"általában így végződik: <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Ez az egyetlen <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> a helyi hálózaton"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "Ez a rendszer crontab, amiben időzített feladatok definiálhatók."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Ez általában a legközelebbi alagút közvetítő (tunnel broker) által vezérelt "
+"jelenléti pont (PoP) címe"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Ez a lista a rendszerben jelenleg futó folyamatokról és azok állapotáról ad "
+"áttekintést."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "Ez a lap a gombok egyedi működésének beállítását teszi lehetővé"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Ez a lap a rendszerben jelenleg aktív hálózati kapcsolatokról ad áttekintést."
+
+msgid "This section contains no values yet"
+msgstr "Ez a szakasz még nem tartalmaz értékeket"
+
+msgid "Time Synchronization"
+msgstr "Idő szinkronizálás"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Idő szinkronizálás még nincs beállítva."
+
+msgid "Timezone"
+msgstr "Időzóna"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Itt tölthet fel egy korábban létrehozott biztonsági mentés archívumot a "
+"konfigurációs fájlok visszaállításához."
+
+msgid "Total Available"
+msgstr "Összes elérhető"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "Forgalom"
+
+msgid "Transfer"
+msgstr "Átvitel"
+
+msgid "Transmission Rate"
+msgstr "Átviteli sebesség"
+
+msgid "Transmit"
+msgstr "Küldés"
+
+msgid "Transmit Power"
+msgstr "Adóteljesítmény"
+
+msgid "Transmitter Antenna"
+msgstr "Adó antenna"
+
+msgid "Trigger"
+msgstr "Trigger"
+
+msgid "Trigger Mode"
+msgstr "Trigger mód"
+
+msgid "Tunnel ID"
+msgstr "Tunnel azonosító"
+
+msgid "Tunnel Interface"
+msgstr "Tunnel interfész"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Turbó mód"
+
+msgid "Tx-Power"
+msgstr "Adóteljesítmény"
+
+msgid "Type"
+msgstr "Típus"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Csak UTMS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB eszköz"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Nem indiítható"
+
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Ismeretlen hiba, a jelszó nem lett megváltoztatva!"
+
+msgid "Unmanaged"
+msgstr "Nem kezelt"
+
+msgid "Unsaved Changes"
+msgstr "El nem mentett módosítások"
+
+msgid "Unsupported protocol type."
+msgstr "Nem támogatott protokoll típus."
+
+msgid "Update lists"
+msgstr "Listák frissítése"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Itt tölthet fel egy új sysupgrade-kompatibilis képet a futó firmware "
+"lecseréléséhez. A jelenlegi beállítások megtartásához jelölje be a "
+"\"Beállítások megtartása\" négyzetet (libreCMC-vel kompatibilis firmware kép "
+"szükséges)."
+
+msgid "Upload archive..."
+msgstr "Archívum feltöltése..."
+
+msgid "Uploaded File"
+msgstr "Feltöltött fájl"
+
+msgid "Uptime"
+msgstr "Működési idő"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "<code>/etc/ethers</code> használata"
+
+msgid "Use DHCP gateway"
+msgstr "DHCP kiszolgáló használata"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Másik fél által ajánlott DNS szerverek használata"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "ISO/IEC 3166 alpha2 országkódok használata"
+
+msgid "Use MTU on tunnel interface"
+msgstr "MTU használata az alagút interfészen"
+
+msgid "Use TTL on tunnel interface"
+msgstr "TTL használata az alagút interfészen"
+
+msgid "Use as root filesystem"
+msgstr "Gyökér fájlrenszerként történő használat"
+
+msgid "Use broadcast flag"
+msgstr "Broadcast flag használata"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Egyedi DNS szerverek használata"
+
+msgid "Use default gateway"
+msgstr "Alapértelmezett átjáró használata"
+
+msgid "Use gateway metric"
+msgstr "Átjáró metrikájának használata"
+
+msgid "Use routing table"
+msgstr "Útválasztó tábla használata"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Használja a <em>Hozzáadás</em> gombot új bérleti bejegyzés hozzáadásához. A "
+"<em>MAC-cím</em> azonosítja a gépet. az <em>IPv4-cím</em> adja meg a "
+"használandó rögzített IP címet és a <em>Gépnév</em> lesz szimbolikus névként "
+"hozzárendelve az igénylő géphez."
+
+msgid "Used"
+msgstr "Használt"
+
+msgid "Used Key Slot"
+msgstr "Használt kulcsindex"
+
+msgid "Username"
+msgstr "Felhasználónév"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "VLAN interfész"
+
+msgid "VLANs on %q"
+msgstr "VLAN-ok %q-n"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLAN-ok %q-n (%s)"
+
+msgid "VPN Server"
+msgstr "VPN kiszolgáló"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "DHCP kérés során küldendő 'Vendor Class'"
+
+msgid "Verify"
+msgstr "Ellenőrzés"
+
+msgid "Version"
+msgstr "Verzió"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "WEP nyílt rendszer"
+
+msgid "WEP Shared Key"
+msgstr "WEP megosztott kulcs"
+
+msgid "WEP passphrase"
+msgstr "WEP jelmondat"
+
+msgid "WMM Mode"
+msgstr "WMM mód"
+
+msgid "WPA passphrase"
+msgstr "WPA jelmondat"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA titkosításhoz kliens módnál 'wpa_supplicant', hozzáférési pont illetve "
+"ad-hoc módnál 'hostapd' telepítése szükséges."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Várakozás a változtatások alkalmazására..."
+
+msgid "Waiting for command to complete..."
+msgstr "Várakozás a parancs befejezésére..."
+
+msgid "Warning"
+msgstr "Figyelmeztetés"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Figyelem: vannak el nem mentett változások melyek el fognak veszni az "
+"újraindítás során!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Vezetéknélküli rész"
+
+msgid "Wireless Adapter"
+msgstr "Vezetéknélküli adapter"
+
+msgid "Wireless Network"
+msgstr "Vezetéknélküli hálózat"
+
+msgid "Wireless Overview"
+msgstr "Vezetéknélküli rész áttekintés"
+
+msgid "Wireless Security"
+msgstr "Vezetéknélküli biztonság"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Vezetéknélküli hálózat le van tiltva vagy nincs kapcsolódva"
+
+msgid "Wireless is restarting..."
+msgstr "Vezetéknélküli rész újraindítása folyamatban..."
+
+msgid "Wireless network is disabled"
+msgstr "Vezetéknélküli hálózat letiltva"
+
+msgid "Wireless network is enabled"
+msgstr "Vezetéknélküli hálózat engedélyezve"
+
+msgid "Wireless restarted"
+msgstr "Vezetéknélküli rész újraindítva"
+
+msgid "Wireless shut down"
+msgstr "Vezetéknélküli rész leállítása"
+
+msgid "Write received DNS requests to syslog"
+msgstr "A kapott DNS kéréseket írja a rendszernaplóba"
+
+msgid "XR Support"
+msgstr "XR támogatás"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Itt engedélyezheti vagy tilthatja le a telepített indítási állományokat. A "
+"módosítások a rendszer újraindítása után lesznek alakalmazva.<br /"
+"><strong>Figyelem: alapvető indítási állomány pl. \"network\" letiltása "
+"esetén, az eszköz elérhetetlenné válhat!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Engélyezze a Java Szkripteket a böngészőjében, mert anélkül a LuCI nem fog "
+"megfelelően működni."
+
+msgid "any"
+msgstr "bármelyik"
+
+msgid "auto"
+msgstr "automatikus"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "áthidalt"
+
+msgid "create:"
+msgstr "új:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "híd létrehozása a megadott interfész(ek) között"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "letiltás"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "lejárt"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"fájl ahová a <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+"bérletek tárolásra kerülnek"
+
+msgid "forward"
+msgstr "továbbítás"
+
+msgid "full-duplex"
+msgstr "full-duplex"
+
+msgid "half-duplex"
+msgstr "half-duplex"
+
+msgid "help"
+msgstr "súgó"
+
+msgid "hidden"
+msgstr "rejtett"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "ha a cél hálózat"
+
+msgid "input"
+msgstr "bemenet"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "helyi <abbr title=\"Domain Name System\">DNS</abbr> fájl"
+
+msgid "no"
+msgstr "nem"
+
+msgid "no link"
+msgstr "nincs link"
+
+msgid "none"
+msgstr "nincs"
+
+msgid "off"
+msgstr "ki"
+
+msgid "on"
+msgstr "be"
+
+msgid "open"
+msgstr "nyitás"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "irányított"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "cimkézett"
+
+msgid "unknown"
+msgstr "ismeretlen"
+
+msgid "unlimited"
+msgstr "korlátlan"
+
+msgid "unspecified"
+msgstr "nincs meghatározva"
+
+msgid "unspecified -or- create:"
+msgstr "nincs magadva -vagy- új:"
+
+msgid "untagged"
+msgstr "cimkézetlen"
+
+msgid "yes"
+msgstr "igen"
+
+msgid "« Back"
+msgstr "« Vissza"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "HE.net felhasználói azonosító"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Ez a 32 bájtos hexadecimálan kódolt felhasználói azonosító, nem a "
+#~ "bejelentkezési név"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40 MHz, második csatorna felette"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40 MHz, második csatorna alatta"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Router hirdetések elfogadása"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "IPv6 hirdetése a hálózaton"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Hirdetett hálózati azonosító"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Engedélyezett tartomány 1-től 65535-ig"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT képességek"
+
+#~ msgid "HT mode"
+#~ msgstr "HT mód"
+
+#~ msgid "Router Model"
+#~ msgstr "Router modell"
+
+#~ msgid "Router Name"
+#~ msgstr "Router név"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Router kérelmezések küldése"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr ""
+#~ "Meghatározza a kihirdetett preferált előtag élettartamát másodpercben"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr ""
+#~ "Meghatározza a kihirdetett érvényes előtag élettartamát másodpercben"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Előnyben részesített élettartam használata"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Érvényességi időtartam használata"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Várakozás a routerre..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Beépített NTP kiszolgáló engedélyezése"
+
+#~ msgid "Active Leases"
+#~ msgstr "Aktív bérletek"
+
+#~ msgid "Open"
+#~ msgstr "Megnyitás"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Bit ráta"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Beállítások / Alkalmaz"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Beállítások / Módosítások"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Beállítások / Visszavonás"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "MAC cím"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encrypted\">Titkosított</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-felderítés"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Válassza ki azt a hálózatot amihez ezt a vezetéknélküli interfészt "
+#~ "csatlakoztatni akarja. Válassza a <em>nincs megadva</em> elemet ha nem "
+#~ "akarja semmilyen hálózathoz csatlakoztatni vagy töltse ki az <em>új</em> "
+#~ "mezőt új hálózat létrehozásához."
+
+#~ msgid "Create Network"
+#~ msgstr "Új hálózat"
+
+#~ msgid "Link"
+#~ msgstr "Kapcsolat"
+
+#~ msgid "Networks"
+#~ msgstr "Hálózatok"
+
+#~ msgid "Power"
+#~ msgstr "Teljesítmény"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Wifi hálózatok az Ön környezetében"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-jelölés: cím/"
+#~ "előtag"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Szerver"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-cím"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "Alternatív IP címek"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "IPv6 beállítás"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Megjegyzés: ha olyan interfészt választ ami másik hálózat része, akkor az "
+#~ "ebbe a hálózatba lesz áthelyezve."
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Biztos, hogy törölni akarja ezt az interfészt? A törlés nem "
+#~ "visszavonható! Elvesztheti a hozzáférést ehhez a routerhez, ha ezen az "
+#~ "interfészen keresztül kapcsolódik hozzá."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Biztos, hogy törölni akarja ezt a vezetéknélküli hálózatot? A törlés nem "
+#~ "visszavonható! Elvesztheti a hozzáférést ehhez a routerhez, ha ezen a "
+#~ "vezetéknélküli hálózaton keresztül kapcsolódik hozzá. "
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Biztos, hogy leállítja a \"%s\" interfészt? Elvesztheti a hozzáféreést "
+#~ "ehhez a routerher ha ezen az interfészen kapcsolódik hozzá."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Biztos, hogy leállítja a hálózatot? Elvesztheti a hozzáférést ehhez a "
+#~ "routerhez, ha ezen a hálózaton keresztül pacsolódik hozzá."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "A hálózati portok a routeren összekapcsolhatók több <abbr title=\"Virtual "
+#~ "Local Area Network\">VLAN</abbr>-ba, melyeken belül a számítógépek "
+#~ "közvetlenül tudnak kommunikálni egymással. A <abbr title=\"Virtual Local "
+#~ "Area Network\">VLAN</abbr>-okat gyakran használják különböző "
+#~ "hálózatrészek szétválasztására. Általában van egy felmenő port a "
+#~ "következő nagyobb hálózathoz mint az internet, és további portok a helyi "
+#~ "hálózathoz."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Átmeneti tárazás engedélyezése"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6 IPv4 felett"
+
+#~ msgid "Time Synchronisation"
+#~ msgstr "Idő szinkronizálás"
+
+#~ msgid "Client Port"
+#~ msgstr "Ügyfél port"
+
+#~ msgid "Statistics"
+#~ msgstr "Statisztikák"
+
+#~ msgid "Client Address"
+#~ msgstr "Ügyfél cím"
+
+#~ msgid "Active UPnP Redirects"
+#~ msgstr "Aktív UPnP átirányítások"
+
+#~ msgid "Age"
+#~ msgstr "Kor"
+
+#~ msgid "The AHCP Service is not running."
+#~ msgstr "Az AHCP szolgáltatás nem fut."
+
+#~ msgid "VnStat Traffic Monitor"
+#~ msgstr "VnStat forgalom figyelő"
+
+#~ msgid "AHCP Server"
+#~ msgstr "AHCP kiszolgáló"
+
+#~ msgid "The AHCP Service is running with ID %s."
+#~ msgstr "Az AHCP szolgáltatás fut, azonosítója: %s."
+
+#~ msgid "SIP devices on Network"
+#~ msgstr "SIP eszközök a hálózaton"
+
+#~ msgid "Devices on Network"
+#~ msgstr "Eszközök a hálózaton"
+
+#~ msgid "There are no active redirects."
+#~ msgstr "Nincsenek aktív átirányítások."
+
+#~ msgid "SIP Devices on Network"
+#~ msgstr "SIP eszközök a hálózaton"
+
+#~ msgid "Active AHCP Leases"
+#~ msgstr "Aktív AHCP bérletek"
diff --git a/trunk/package/luci/po/hu/commands.po b/trunk/package/luci/po/hu/commands.po
new file mode 100644
index 00000000..5cd0ec74
--- /dev/null
+++ b/trunk/package/luci/po/hu/commands.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-24 18:47+0200\n"
+"Last-Translator: Gábor <vargalex@freemail.hu>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "A beállított parancs rövid szöveges leírása"
+
+msgid "Access command with"
+msgstr "Parancs hozzáférése"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Engedélyezi a parancs végrehajtását és kimenetének letöltését előzetes "
+"hitelesítés nélkül"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "A felhasználó által további parancsori argumentumok adhatók meg"
+
+msgid "Arguments:"
+msgstr "Argumentumok:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Bináris adat nem jelenik meg, töltse le helyette."
+
+msgid "Code:"
+msgstr "Kód:"
+
+msgid "Collecting data..."
+msgstr "Adatgyűjtés..."
+
+msgid "Command"
+msgstr "Paracs"
+
+msgid "Command failed"
+msgstr "Parancs végrehajtás sikertelen"
+
+msgid "Command line to execute"
+msgstr "Futtatandó parancssor"
+
+msgid "Command successful"
+msgstr "Parancs végrehajtás sikeres"
+
+msgid "Command:"
+msgstr "Parancs:"
+
+msgid "Configure"
+msgstr "Beállítás"
+
+msgid "Custom Commands"
+msgstr "Egyedi parancsok"
+
+msgid "Custom arguments"
+msgstr "Egyedi argumentumok"
+
+msgid "Dashboard"
+msgstr "Vezérlőpult"
+
+msgid "Description"
+msgstr "Leírás"
+
+msgid "Download"
+msgstr "Letöltés"
+
+msgid "Failed to execute command!"
+msgstr "Parancs végrehajtása sikertelen!"
+
+msgid "Link"
+msgstr "Link"
+
+msgid "Loading"
+msgstr "Betöltés"
+
+msgid "Public access"
+msgstr "Nyilvános hozzáférés"
+
+msgid "Run"
+msgstr "Futtatás"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Ezen az oldalon egyéni shell parancsokat állíthat be, amelyeket könnyen "
+"felhasználhat a webes felületen."
+
+msgid "Waiting for command to complete..."
+msgstr "Várakozás a parancs befejezésére..."
diff --git a/trunk/package/luci/po/hu/coovachilli.po b/trunk/package/luci/po/hu/coovachilli.po
new file mode 100644
index 00000000..5ac8278f
--- /dev/null
+++ b/trunk/package/luci/po/hu/coovachilli.po
@@ -0,0 +1,26 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-07-05 16:44+0200\n"
+"Last-Translator: Gyula <pro564@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Hálózati konfiguráció"
+
+msgid "RADIUS configuration"
+msgstr "RADIUS konfiguráció"
+
+msgid "UAM and MAC Authentication"
+msgstr "UAM és MAC azonosítás"
diff --git a/trunk/package/luci/po/hu/ddns.po b/trunk/package/luci/po/hu/ddns.po
new file mode 100644
index 00000000..561b6163
--- /dev/null
+++ b/trunk/package/luci/po/hu/ddns.po
@@ -0,0 +1,91 @@
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-01-28 13:49+0200\n"
+"Last-Translator: Gábor <vargalex@freemail.hu>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "IP-cím változás ellenőrzése minden"
+
+msgid "Check-time unit"
+msgstr "Időegység"
+
+msgid "Custom update-URL"
+msgstr "Egyéni update-URL"
+
+msgid "Dynamic DNS"
+msgstr "Dinamikus DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"A dinamikus DNS lehetővé teszi, hogy a routere elérhető legyen egy fix host "
+"névvel akkor is ha dinamikusan változó IP címmel rendelkezik."
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "Force update every"
+msgstr "Frissítés erőltetése minden"
+
+msgid "Force-time unit"
+msgstr "Időegység"
+
+msgid "Hostname"
+msgstr "Hostnév"
+
+msgid "Interface"
+msgstr "Interfész"
+
+msgid "Network"
+msgstr "Hálózat"
+
+msgid "Password"
+msgstr "Jelszó"
+
+msgid "Service"
+msgstr "Szervíz"
+
+msgid "Source of IP address"
+msgstr "Az IP cím forrása"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Felhasználónév"
+
+msgid "custom"
+msgstr "egyéni"
+
+# Hours
+msgid "h"
+msgstr "óra"
+
+msgid "interface"
+msgstr "interfész"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "perc"
+
+msgid "network"
+msgstr "hálózat"
+
+#~ msgid "Event interface"
+#~ msgstr "Esemény interfész"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "Melyik interfész indulása váltsa ki a ddns script indítását."
diff --git a/trunk/package/luci/po/hu/diag_core.po b/trunk/package/luci/po/hu/diag_core.po
new file mode 100644
index 00000000..f9f6e66c
--- /dev/null
+++ b/trunk/package/luci/po/hu/diag_core.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-07-05 16:44+0200\n"
+"Last-Translator: Gyula <pro564@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Diagnosztikai beállítások"
+
+msgid "Diagnostics"
+msgstr "Diagnosztika"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Az itt található statisztikák attól függően változnak, hogy milyen modulokat "
+"telepítettél az eszközödre."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Ennek a menünek az elemei lehetővé teszik hálózati diagnosztikai tesztek "
+"elvégzését a rendszeren a hibaelhárítás megkönnyítésére."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Ebben a menüben beállíthatók a hálózati diagnosztika elemei, mint például "
+"eszközök keresése és ping teszt."
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d_diag"
diff --git a/trunk/package/luci/po/hu/diag_devinfo.po b/trunk/package/luci/po/hu/diag_devinfo.po
new file mode 100644
index 00000000..e2e2be25
--- /dev/null
+++ b/trunk/package/luci/po/hu/diag_devinfo.po
@@ -0,0 +1,222 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-31 10:01+0200\n"
+"Last-Translator: Gabor <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Műveletek"
+
+msgid "Add"
+msgstr "Hozzáadás"
+
+msgid "Beginning of MAC address range"
+msgstr "MAC cím tartomány kezdete"
+
+msgid "Config Phone Scan"
+msgstr "Telefon keresés beállításai"
+
+msgid "Configure"
+msgstr "Beállítás"
+
+msgid "Configure Scans"
+msgstr "Keresési beállítások"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Állítsa be az eszközkeresést a megadott hálózatokon. Az 'Időlimit', "
+"'Ismétlésszám', és/vagy 'Alvás a lekérdezések között' csökkentése "
+"felgyorsíthatja a keresést, de lehet, hogy nem talál meg néhány eszközt."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Állítsa be a támogatott SIP eszközök keresését a megadott hálózatokon. Az "
+"'Időlimit', 'Ismétlésszám', és/vagy 'Alvás a lekérdezések között' "
+"csökkentése felgyorsíthatja a keresést, de lehet, hogy nem talál meg néhány "
+"eszközt."
+
+msgid "Delete"
+msgstr "Törlés"
+
+msgid "Device Scan Config"
+msgstr "Eszköz keresés beállításai"
+
+msgid "Device Type"
+msgstr "Eszköztípus"
+
+msgid "Devices discovered for"
+msgstr "Felfedezett eszközök"
+
+msgid "Devices on Network"
+msgstr "Eszközök a hálózatban"
+
+msgid "Edit"
+msgstr "Szerkesztés"
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "End of MAC address range"
+msgstr "MAC cím tartomány vége"
+
+msgid "Go to relevant configuration page"
+msgstr "Ugrás a kapcsolódó beállítások oldalára"
+
+msgid "IP Address"
+msgstr "IP cím"
+
+msgid "Interface"
+msgstr "Interfész"
+
+msgid "Invalid"
+msgstr "Érvénytelen"
+
+msgid "Link to Device"
+msgstr "Eszközre mutató hivatkozás"
+
+msgid "MAC Address"
+msgstr "MAC cím"
+
+msgid "MAC Device Info Overrides"
+msgstr "MAC eszköz információ felülbírálások"
+
+msgid "MAC Device Override"
+msgstr "MAC eszköz felülbírálása"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"A rendszer és IEEE adatbázisok felülbíráláshoz használt MAC cím tartomány és "
+"információ"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+"A kérések küldése közötti szünet időtartama ezredmásodpercben "
+"(alapértelmezés: 100)"
+
+msgid "Model"
+msgstr "Típus"
+
+msgid "Name"
+msgstr "Név"
+
+msgid "Network Device Scan"
+msgstr "Hálózati eszközök keresése"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Hálózati eszközök keresési beállításai"
+
+msgid "Networks to scan for devices"
+msgstr "Eszközök keresése ezekben a hálózatokban"
+
+msgid "Networks to scan for supported devices"
+msgstr "Támogatott eszközök keresése ezekben a hálózatokban"
+
+msgid "No SIP devices"
+msgstr "Nem találhatóak SIP eszközök"
+
+msgid "No devices detected"
+msgstr "Nem található semmilyen eszköz"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Az elküldött kérések száma (alapértelmezés: 1)"
+
+msgid "OUI Owner"
+msgstr "OUI tulajdonos"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"A meghatározott tartományba tartozó MAC címeknél felülbírálja a 'MAC to "
+"Device Info' szkript (mac-to-devinfo) által visszadott információt."
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Keresés (ez eltarthat néhány percig)"
+
+msgid "Phone Information"
+msgstr "Telefon információ"
+
+msgid "Phone Scan"
+msgstr "Telefon keresés"
+
+msgid "Phone Scanning Configuration"
+msgstr "Telefon keresési beállítások"
+
+msgid "Phones"
+msgstr "Telefonok"
+
+msgid "Ports"
+msgstr "Portok"
+
+msgid "Raw"
+msgstr "Nyers"
+
+msgid "Repeat Count"
+msgstr "Ismétlés száma"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Keresés megismétlése (ez eltarthat néhány percig)"
+
+msgid "SIP Device Information"
+msgstr "SIP eszköz információ"
+
+msgid "SIP Device Scan"
+msgstr "SIP eszközök keresése"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "SIP eszköz keresés beállításai"
+
+msgid "SIP Devices on Network"
+msgstr "SIP eszközök a hálózatban"
+
+msgid "SIP devices discovered for"
+msgstr "Megtalált SIP eszközök ehhez:"
+
+msgid "Scan for devices on specified networks."
+msgstr "Eszközök keresése a megadott hálózatokban."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Támogatott SIP eszközök keresése a megadott hálózatokban."
+
+msgid "Scanning Configuration"
+msgstr "Keresési beállítások"
+
+msgid "Scans for devices on specified networks."
+msgstr "Scans for devices on specified networks."
+
+msgid "Sleep Between Requests"
+msgstr "Kérések közötti szünet"
+
+msgid "Subnet"
+msgstr "Alhálózat"
+
+msgid "This section contains no values yet"
+msgstr "Ez a rész még nem tartlamaz értékeket"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Várakozási idő a válasz beérkezésére (alapértelemezés: 10)"
+
+msgid "Timeout"
+msgstr "Várakozási idő"
+
+msgid "Use Configuration"
+msgstr "Beállítás használata"
+
+msgid "Vendor"
+msgstr "Gyártó"
+
+msgid "check other networks"
+msgstr "egyéb hálózatok ellenőrzése"
diff --git a/trunk/package/luci/po/hu/ffwizard.po b/trunk/package/luci/po/hu/ffwizard.po
new file mode 100644
index 00000000..6bae6c55
--- /dev/null
+++ b/trunk/package/luci/po/hu/ffwizard.po
@@ -0,0 +1,175 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Névtelen statisztikák küldésének engedélyezése erről a csomópontról"
+
+msgid "Channel"
+msgstr "Csatorna"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Pipáld be ezt, hogy megvédd a LAN-od más csomópontoktól vagy kliensektől"
+
+msgid "Configure network"
+msgstr "Hálózat beállítása"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+"Csomópontod összekötése más csomópontokkal internetes alagút segítségével"
+
+msgid "DHCP IP range"
+msgstr "DHCP IP tartomány"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "A DHCP automatikusan ki fog osztani IP címeket a klienseknek"
+
+msgid "DNS Server"
+msgstr "DNS szerver"
+
+msgid "Enable DHCP"
+msgstr "DHCP bekapcsolása"
+
+msgid "Gateway"
+msgstr "Átjáró"
+
+msgid "Heartbeat"
+msgstr "Szívverés"
+
+msgid "IP address"
+msgstr "IP cím"
+
+msgid "L2gvpn tunnel"
+msgstr "L2gvpn alagút"
+
+msgid "Limit download bandwidth"
+msgstr "Letöltési sávszélesség korlátozása"
+
+msgid "Limit upload bandwidth"
+msgstr "Feltöltési sávszélesség korlátozása"
+
+msgid "Mesh IP address"
+msgstr "Háló IP cím"
+
+msgid "Mesh IPv6 Address"
+msgstr "Háló IPv6 cím"
+
+msgid "Netmask"
+msgstr "Hálózati maszk"
+
+msgid "Password"
+msgstr "Jelszó"
+
+msgid "Password confirmation"
+msgstr "Jelszó megerősítése"
+
+msgid "Password successfully changed"
+msgstr "Jelszó sikeresen megváltoztatva"
+
+msgid "Protect LAN"
+msgstr "A LAN védelme"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Válaszd ezt a jelölőnégyzetet a hálózati interfészeid beállításához"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Válaszd ezt, ha engedélyezni akarod másoknak, hogy elérjék az internetet a "
+"kapcsolatodon keresztül"
+
+msgid "Share your internet connection"
+msgstr "Internetkapcsolatod megosztása"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Az az IP tartomány, amelyből kikerülnek a kliensek címei (pl. 10.1.2.1/28). "
+"Ha ez egy, a hálózatodon található tartomány, akkor HNA-ként lesz "
+"bejelentve. Minden más tartomány NAT-ot fog használni. Ha üresen hagyod, "
+"akkor a közösségi profilból kiolvasott alapértelmezések lesznek használatban."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "Az IPv6 cím automatikusan számolódik."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Az internetes tevékenységekhez használt protokoll"
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Ez egy egyedi cím a hálózaton (pl. 10.1.1.1), és a helyi közösségnél kell "
+"regisztrálva lennie."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Ez létre fog hozni egy új virtuális vezeték nélküli interfészt Access Point "
+"módban."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Ez a varázsló segíteni fog téged a router beállításában Freifunk és más "
+"hasonló vezeték nélküli közösségi hálózatokhoz."
+
+msgid "Unknown Error"
+msgstr "Ismeretlen hiba"
+
+msgid "Username"
+msgstr "Felhasználói név"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Virtuális hozzáférési pont (VAP)"
+
+msgid "Wizard"
+msgstr "Varázsló"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+"Az eszközödnek és a szomszédos csomópontoknak ugyanazt a csatornát kell "
+"használniuk."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "állandó"
+
+msgid "Configure this interface."
+msgstr "Interfész beállítása."
+
+msgid "recommended"
+msgstr "ajánlott"
+
+msgid "Basic settings"
+msgstr "Alapvető beállítások"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Az alapvető beállítások nem teljesek. Kérem, menjen ide:"
+
+msgid "Error"
+msgstr "Hiba"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr "Nem használhatod a varázslót, mert néhány szükséges érték hiányzik."
+
+msgid "and fill out all required fields."
+msgstr "és töltse ki az összes szükséges mezőt."
diff --git a/trunk/package/luci/po/hu/firewall.po b/trunk/package/luci/po/hu/firewall.po
new file mode 100644
index 00000000..110e0407
--- /dev/null
+++ b/trunk/package/luci/po/hu/firewall.po
@@ -0,0 +1,580 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-31 16:54+0200\n"
+"Last-Translator: Gabor <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s %s-ban"
+
+msgid "%s%s with %s"
+msgstr "%s%s %s-el"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s %s-ben"
+
+msgid "(Unnamed Entry)"
+msgstr "(Névtelen bejegyzés)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Névtelen szabály)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(Névtelen SNAT)"
+
+msgid "-- Please choose --"
+msgstr "-- Kérem válasszon --"
+
+msgid "-- custom --"
+msgstr "-- egyéni --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> csomag/<var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> csom. <var>%s</var>-enként, burst <var>%d</var> csom."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> és korlátozás %s-re"
+
+msgid "Action"
+msgstr "Művelet"
+
+msgid "Add"
+msgstr "Hozzáadás"
+
+msgid "Add and edit..."
+msgstr "Hozzáadás és szerkesztés..."
+
+msgid "Advanced Settings"
+msgstr "Haladó beállítások"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Továbbítás engedélyezése ezekből a <em>forrás zónákból</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Továbbítás engedélyezése ezekbe a <em>cél zónákba</em>:"
+
+msgid "Any"
+msgstr "Bármelyik"
+
+msgid "Covered networks"
+msgstr "Lefedett hálózatok"
+
+msgid "Custom Rules"
+msgstr "Egyéni szabályok"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Az egyedi szabályok lehetővé teszik tetszőleges iptables parancsok "
+"futtatását melyekre a tűzfal keretrendszer egyébként nem biztosít "
+"lehetőséget. A parancsok a tűzfal minden újraindításakor futtatásra "
+"kerülnek, közvetlenül az alapértelmezett szabálykészletek betöltése után."
+
+msgid "Destination IP address"
+msgstr "Cél IP-cím"
+
+msgid "Destination address"
+msgstr "Cél cím"
+
+msgid "Destination port"
+msgstr "Cél port"
+
+msgid "Destination zone"
+msgstr "Cél zóna"
+
+msgid "Do not rewrite"
+msgstr "Ne írja felül"
+
+msgid "Drop invalid packets"
+msgstr "Érvénytelen csomagok eldobása"
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "Enable NAT Loopback"
+msgstr "NAT visszacsatolás engedélyezése"
+
+msgid "Enable SYN-flood protection"
+msgstr "SYN-flood védelem engedélyezése"
+
+msgid "Enable logging on this zone"
+msgstr "Naplózás engeélyezése ezen a zónán"
+
+msgid "External IP address"
+msgstr "Külső IP cím"
+
+msgid "External port"
+msgstr "Külső port"
+
+msgid "External zone"
+msgstr "Külső zóna"
+
+msgid "Extra arguments"
+msgstr "További argumentumok"
+
+msgid "Firewall"
+msgstr "Tűzfal"
+
+msgid "Firewall - Custom Rules"
+msgstr "Tűzfal - Egyéni szabályok"
+
+msgid "Firewall - Port Forwards"
+msgstr "Tűzfal - Port továbbítások"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Tűzfal - Forgalmi szabályok"
+
+msgid "Firewall - Zone Settings"
+msgstr "Tűzfal - Zóna beállítások"
+
+msgid "Force connection tracking"
+msgstr "Kapcsolat követés kényszerítése"
+
+msgid "Forward"
+msgstr "Továbbítás"
+
+msgid "Forward to"
+msgstr "Továbbítás ennek"
+
+msgid "From %s in %s"
+msgstr "%s felől %s-ben"
+
+msgid "From %s in %s with source %s"
+msgstr "%s felől %s-ben %s forrással"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "%s felől %s-ben %s és %s forrással"
+
+msgid "General Settings"
+msgstr "Általános beállítások"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 és IPv6"
+
+msgid "IPv4 only"
+msgstr "csak IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "csak IPv6"
+
+msgid "Input"
+msgstr "Bemenet"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Zónák-közötti továbbítás"
+
+msgid "Internal IP address"
+msgstr "Belső IP cím"
+
+msgid "Internal port"
+msgstr "Belső port"
+
+msgid "Internal zone"
+msgstr "Belső zóna"
+
+msgid "Limit log messages"
+msgstr "Napló üzenetek korlátozása"
+
+msgid "MSS clamping"
+msgstr "MSS clamping engegélyezése"
+
+msgid "Masquerading"
+msgstr "Álcázás"
+
+msgid "Match"
+msgstr "Szűrés"
+
+msgid "Match ICMP type"
+msgstr "Szűrés ICMP típus alapján"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Továbbított forgalom szűrése a megadott cél port, vagy port tartomány "
+"szerint."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Adott portra vagy port tartományra irányított bejövő forgalom szűrése ezen a "
+"gépen"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Az ügyfél gép megadott portjáról, vagy port tartományából indított forgalom "
+"szűrése. "
+
+msgid "Name"
+msgstr "Név"
+
+msgid "New SNAT rule"
+msgstr "Új SNAT szabály"
+
+msgid "New forward rule"
+msgstr "Új továbbítási szabály"
+
+msgid "New input rule"
+msgstr "Új bemeneti szabály"
+
+msgid "New port forward"
+msgstr "Új port továbbítás"
+
+msgid "New source NAT"
+msgstr "Új forrás NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Csak a megadott IP címre irányított bejövő forgalmat egyeztesse."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Csak a megadott MAC címekről érkező bejövő forgalmat egyeztesse."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+"Csak a megadott IP címről illetve IP címtartományból érkező bejövő forgalmat "
+"egyeztesse."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Csak az ügyfél gép megadott forrás portjáról illetve forrás port "
+"tartományába tartozó portról indított bejövő forgalmat egyeztesse."
+
+msgid "Open ports on router"
+msgstr "Port megnyitása a routeren"
+
+msgid "Other..."
+msgstr "Egyéb..."
+
+msgid "Output"
+msgstr "Kimenet"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+"További argumentumok küldése az iptables részére. Használja körültekintően!"
+
+msgid "Port Forwards"
+msgstr "Port továbbítás"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"A port továbbítás lehetővé teszi az interneten lévő távoli számítógépeknek a "
+"privát helyi hálózat bizonyos számítógépéhez vagy szolgáltatásához történő "
+"csatlakozását."
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr "Átirányítja az egyező bejövő forgalmat a belső gép megadott portjához"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Átirányítja az egyező bejövő forgalmat a megadott belső géphez"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Álcázás korlátozása a megadott cél alhálózatokra"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Álcázás korlátozása a megadott forrás alhálózatokra"
+
+msgid "Restrict to address family"
+msgstr "Korlátozás cím családra"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Az összeíllő forgalom átírása a megadott címre."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Az összeillő forgalom átírása a megadott forrás portra. Amennyibe üresen van "
+"hagyva, csak az IP cím kerül átírásra."
+
+msgid "Rewrite to source %s"
+msgstr "Átírás %s forrásra"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Átírás %s, %s forrásra"
+
+msgid "SNAT IP address"
+msgstr "SNAT IP cím"
+
+msgid "SNAT port"
+msgstr "SNAT port"
+
+msgid "Source IP address"
+msgstr "Forrás IP cím"
+
+msgid "Source MAC address"
+msgstr "Forrás MAC cím"
+
+msgid "Source NAT"
+msgstr "Forrás NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"A forrás NAT az álcázás olyan speciális formája, mely lehetővé teszi a "
+"kimenő forgalomhoz használt forrás IP címek aprólékos szabályozását, például "
+"több WAN cím hozzárendelését a belső alhálózatokhoz."
+
+msgid "Source address"
+msgstr "Forrás cím"
+
+msgid "Source port"
+msgstr "Forrás port"
+
+msgid "Source zone"
+msgstr "Forrás zóna"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"A tűzfal zónákat határoz meg a hálózati interfészek fölött a hálózati "
+"forgalom áramlásának szabályozására."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Az alábbi beállítások vezérlik a továbbítási irányelveket a jelenlegi zóna "
+"(%s) és a többi zóna között. A <em>cél zónák</em> fedik le a továbbított "
+"forgalmat <strong>amelynek forrása %q</strong>. A <em>forrás zónák</em> "
+"szűrik a továbbított forgalmat más zónákból <strong>melynek célja %q</"
+"strong>. A továbbítási szabály <em>egyirányú</em>, tehát pl. egy továbbítás "
+"LAN-ból WAN-ba <em>nem</em> jelenti azt, hogy a továbbítás WAN-ból LAN-ba is "
+"engedélyezett."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Ez a lap lehetővé teszi a port továbbítási bejegyzések speciális "
+"tulajdonságainak módosítását. A legtöbb esetben ezeknek a beállításoknak a "
+"módosítása nem szükséges."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Ez a lap lehetővé teszi a forgalmi szabály bejegyzés speciális "
+"tulajdonságainak módosítását, mint a forrás- és célgépek megfeleltetése."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Ez a rész a(z) %q általános beállításait határozza meg. A <em>bejövő</em> és "
+"<em>kimenő</em> beállítások határozzák meg a zónába be- és kilépő forgalom "
+"alapértelmezett szabályait, míg a <em>továbbítási</em> beállítás a különböző "
+"hálózatok közötti forgalomtovábbítás szabályát írja le a zónán belül. A "
+"<em>lefedett hálózatok</em> adják meg, hogy mely elérhető hálózatok tagjai "
+"ennek a zónának."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "%s-re %s-nél a <var>eszközön</var>"
+
+msgid "To %s in %s"
+msgstr "%s-re %s-ben"
+
+msgid "To %s on <var>this device</var>"
+msgstr "%s-re a <var>eszközön</var>"
+
+msgid "To %s, %s in %s"
+msgstr "%s-re, %s %s-ben"
+
+msgid "To source IP"
+msgstr "Forrás IP-re"
+
+msgid "To source port"
+msgstr "Forrás portra"
+
+msgid "Traffic Rules"
+msgstr "Forgalmi szabályok"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"A forgalmi szabályok a különböző zónák között utazó csomagokra vonatkozó "
+"házirendet határozzák meg, például bizonyos gépek közötti forgalom "
+"megakadályozához vagy WAN portok megnyitásához a routeren."
+
+msgid "Via %s"
+msgstr "%s-en át"
+
+msgid "Via %s at %s"
+msgstr "%s-en át %s-nél"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Az \"-- egyéni --\" lehetőség választásával több protokoll megadása "
+"lehetséges egymástól szóközzell elválasztva."
+
+msgid "Zone %q"
+msgstr "Zóna %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zóna ⇒ Továbbítások"
+
+msgid "Zones"
+msgstr "Zónák"
+
+msgid "accept"
+msgstr "elfogadás"
+
+msgid "any"
+msgstr "bármelyik"
+
+msgid "any host"
+msgstr "bármelyik gép"
+
+msgid "any router IP"
+msgstr "bármelyik router IP"
+
+msgid "any zone"
+msgstr "bármelyik zóna"
+
+msgid "don't track"
+msgstr "ne kövesse"
+
+msgid "drop"
+msgstr "eldobás"
+
+msgid "reject"
+msgstr "visszautasítás"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Cél"
+
+#~ msgid "Family"
+#~ msgstr "Család"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "Továbbítás ide:%s/%s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "Továbbítás ide: %s, %s/%s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Forrás"
+
+#~ msgid "Via"
+#~ msgstr "Keresztül"
+
+#~ msgid "Accept forward"
+#~ msgstr "Továbbítás engedélyezése"
+
+#~ msgid "Accept input"
+#~ msgstr "Bemenet engedélyezése"
+
+#~ msgid "Disable"
+#~ msgstr "Letiltás"
+
+#~ msgid "Discard forward"
+#~ msgstr "Kimenet eldobása"
+
+#~ msgid "Discard input"
+#~ msgstr "Bemenet eldobása"
+
+#~ msgid "Do not track forward"
+#~ msgstr "Ne kövesse a továbbítást"
+
+#~ msgid "Do not track input"
+#~ msgstr "Ne kövesse a bemenetet"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "IP tartomány"
+
+#~ msgid "IPs"
+#~ msgstr "IP-k"
+
+#~ msgid "MAC"
+#~ msgstr "MAC cím"
+
+#~ msgid "MACs"
+#~ msgstr "MAC címek"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Továbbítás megtagadása"
+
+#~ msgid "Refuse input"
+#~ msgstr "Bemenet megtagadása"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Szabály letiltva"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Szabály engedélyezve"
+
+#~ msgid "day"
+#~ msgstr "nap"
+
+#~ msgid "hour"
+#~ msgstr "óra"
+
+#~ msgid "minute"
+#~ msgstr "perc"
+
+#~ msgid "not"
+#~ msgstr "nem"
+
+#~ msgid "port"
+#~ msgstr "port"
+
+#~ msgid "ports"
+#~ msgstr "portok"
+
+#~ msgid "second"
+#~ msgstr "másodperc"
+
+#~ msgid "type"
+#~ msgstr "típus"
+
+#~ msgid "types"
+#~ msgstr "típusok"
diff --git a/trunk/package/luci/po/hu/freifunk-policyrouting.po b/trunk/package/luci/po/hu/freifunk-policyrouting.po
new file mode 100644
index 00000000..8d83098d
--- /dev/null
+++ b/trunk/package/luci/po/hu/freifunk-policyrouting.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/hu/freifunk.po b/trunk/package/luci/po/hu/freifunk.po
new file mode 100644
index 00000000..71829ef5
--- /dev/null
+++ b/trunk/package/luci/po/hu/freifunk.po
@@ -0,0 +1,392 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/hu/hd_idle.po b/trunk/package/luci/po/hu/hd_idle.po
new file mode 100644
index 00000000..424532ed
--- /dev/null
+++ b/trunk/package/luci/po/hu/hd_idle.po
@@ -0,0 +1,52 @@
+# Generated from applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-07-10 21:04+0200\n"
+"Last-Translator: Gyula <pro564@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Lemez"
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "Enable debug"
+msgstr "Hibakeresés engedélyezése"
+
+msgid "Idle-time"
+msgstr "Üresjárati idő"
+
+msgid "Idle-time unit"
+msgstr "Üresjárati idő egysége"
+
+msgid "Settings"
+msgstr "Beállítások"
+
+# Hours
+msgid "h"
+msgstr "óra"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle egy a külső lemezek adott üresjárati idő után történő leállítására "
+"szolgáló segédprogram."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "perc"
diff --git a/trunk/package/luci/po/hu/meshwizard.po b/trunk/package/luci/po/hu/meshwizard.po
new file mode 100644
index 00000000..22aeccef
--- /dev/null
+++ b/trunk/package/luci/po/hu/meshwizard.po
@@ -0,0 +1,122 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-09 12:55+0200\n"
+"Last-Translator: Bgray <bgraygms@gmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Globális IPV6 konfiguráció aktiválása vagy kikapcsolása."
+
+msgid "Channel"
+msgstr "Csatorna"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr "DHCP Engedélyezése"
+
+msgid "Enable RA"
+msgstr "RA Engedélyezése"
+
+msgid "Enabled"
+msgstr "Engedélyezés"
+
+msgid "General Settings"
+msgstr "Általános Beállítások"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfészek"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/hu/minidlna.po b/trunk/package/luci/po/hu/minidlna.po
new file mode 100644
index 00000000..52fbe749
--- /dev/null
+++ b/trunk/package/luci/po/hu/minidlna.po
@@ -0,0 +1,199 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-09 19:18+0200\n"
+"Last-Translator: Gábor <vargalex@freemail.hu>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Advanced Settings"
+msgstr "Haladó beállítások"
+
+msgid "Album art names:"
+msgstr "Borító album nevek:"
+
+msgid "Announced model number:"
+msgstr "Közölt modellszám:"
+
+msgid "Announced serial number:"
+msgstr "Közölt sorozatszám:"
+
+msgid "Browse directory"
+msgstr "Könyvtár tallózása"
+
+msgid "Collecting data..."
+msgstr "Adatok gyűjtése..."
+
+msgid "Database directory:"
+msgstr "Adatbázis könyvtár:"
+
+msgid "Enable TIVO:"
+msgstr "TIVO engedélyezése:"
+
+msgid "Enable inotify:"
+msgstr "Inotify engedélyezése:"
+
+msgid "Enable:"
+msgstr "Engedélyezés:"
+
+msgid "Friendly name:"
+msgstr "Egyéni név:"
+
+msgid "General Settings"
+msgstr "Általános beállítások"
+
+msgid "Interfaces:"
+msgstr "Interfészek:"
+
+msgid "Log directory:"
+msgstr "Napló könyvtár:"
+
+msgid "Media directories:"
+msgstr "Média könyvtárak:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"A MiniDLNA egy szerver alkalmazás, ami teljes mértékben kompatibilis a DLNA/"
+"UPnP-AV képes kliensekkel."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"A miniDLNA által az XML leírásban jelentett modellszám a kliensek számára."
+
+msgid "Music"
+msgstr "Zene"
+
+msgid "Network interfaces to serve."
+msgstr "Kiszolgált hálózati interfészek."
+
+msgid "Notify interval in seconds."
+msgstr "Értesítés intervalluma másodpercben."
+
+msgid "Notify interval:"
+msgstr "Értesítési intervallum:"
+
+msgid "Pictures"
+msgstr "Képek"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "HTTP forgalom (leírások, SOAP, média átvitel) portja."
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr "Szolgáltatott URL:"
+
+msgid "Root container:"
+msgstr "Gyökér konténer:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"A miniDLNA által az XML leírásban jelentett szériaszám a kliensek számára."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+"Állítsa be, amennyiben a kliensek számára megjelenő nevet szeretné testre "
+"szabni."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Állítsa be, ha meg szeretné adni azt könyvtárat, ahová a a MiniDLNA az "
+"adatbázisát, illetve az album borító gyorsítótárat rögzítse."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+"Áttítsa be, ha meg szeretné adni azt a könyvtárat, ahová a MiniDLNA a napló "
+"állományait mentse."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Engedélyezze az új fájlok automatikus felfedezéséhez szükséges inotify "
+"monitorozáshoz."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Engedélyezze a .jpg és .mp3 fájlok közvetítéséhez TiVo támogatott HMO-k felé."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Engedélyezze a DLNA követelmények szigorú betartásához. Ez lehetővé teszi a "
+"nagyon nagy JPEG képek szerver oldali leméretezését, amik pl. a Sony DLNA "
+"termékek JPEG kiszolgáló teljesítményére nincsenek kedvező hatással."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Állítsa be a vizsgálandó könyvtárra. Ha a könyvtárat egy adott típusú "
+"tartalom szerint szeretné korlátozni, akkor a neve előtt vesszővel "
+"elválasztva megadhatja a típust ('A' az audió, 'V' a videó, 'P' a képek "
+"számára. pl.: media_dir=A,/mnt/media/Music). Több könyvtár is megadható."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "A MiniSSDPd socket elérési útját határozza meg."
+
+msgid "Standard container"
+msgstr "Szabvány konténer"
+
+msgid "Strict to DLNA standard:"
+msgstr "DLNA követelmények szigorú betartása:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"A miniDLNA szolgáltatás aktív, %d hang, %d videó, %d kép fájl található. "
+
+msgid "The miniDLNA service is not running."
+msgstr "A miniDLNA szolgáltatás nem aktív."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr "Fájlnevek listája, amik ellenőrzésre kerülnek albumborító keresésekor."
+
+msgid "Video"
+msgstr "Videó"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "miniDLNA állapot"
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP socket:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr "Kiszolgált hálózati interfészek vesszővel elválasztott listája."
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "Ez egy lista azokról a fájlnevekről, amelyeket ellenőrizni kell a "
+#~ "lemezborító keresésekor. Megjegyzés: a neveket per jellel ('/') kell "
+#~ "elválasztani egymástól."
diff --git a/trunk/package/luci/po/hu/mmc_over_gpio.po b/trunk/package/luci/po/hu/mmc_over_gpio.po
new file mode 100644
index 00000000..758c7110
--- /dev/null
+++ b/trunk/package/luci/po/hu/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-12-30 19:09+0200\n"
+"Last-Translator: romboyco <romboyco@gmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "Bekapcsolás"
+
+msgid "MMC/SD driver configuration"
+msgstr "MMC/SD driver konfiguráció"
+
+msgid "Mode"
+msgstr "Mód"
+
+msgid "Name"
+msgstr "Név"
+
+msgid "Settings"
+msgstr "Beállítások"
diff --git a/trunk/package/luci/po/hu/multiwan.po b/trunk/package/luci/po/hu/multiwan.po
new file mode 100644
index 00000000..20ff8d60
--- /dev/null
+++ b/trunk/package/luci/po/hu/multiwan.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-12-30 19:12+0200\n"
+"Last-Translator: romboyco <romboyco@gmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Próbálkozások WAN átállás előtt"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Probálkozások WAN helyreállítás előtt"
+
+msgid "Auto"
+msgstr "Automatikus"
+
+msgid "Collecting data..."
+msgstr "Adatok gyűjtése..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Szabályok beállítása a kimenő forgalom megadott WAN kapcsolatra "
+"irányításához."
+
+msgid "DNS Server(s)"
+msgstr "DNS kiszolgáló(k)"
+
+msgid "Default Route"
+msgstr "Alapértelmezett útvonal"
+
+msgid "Destination Address"
+msgstr "Cél cím"
+
+msgid "Disable"
+msgstr "Letiltás"
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "Failing"
+msgstr "Csökkenő"
+
+msgid "Failover Traffic Destination"
+msgstr "Failover forgalom cél"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "ICMP gépek kapcsolat monitorozáshoz"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "ICMP csomagok időtúllépése a kapcsolat monitorozásánál"
+
+msgid "Health Monitor Interval"
+msgstr "Kapcsolat monitorozási intervallum"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"A kapcsolat monitorozás megállapítja és korrigálja a hálózati változásokat "
+"és sikertelen kapcsolatokat."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Load balancer megosztás"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Terhelés kiegyensúlyozás (kompatibilitás)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Terhelés kiegyensúlyozás (teljesítmény)"
+
+msgid "Multi-WAN"
+msgstr "Többszörös WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Többszörös WAN állapot"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Többszörös WAN forgalmi szabályok"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"A Multi-WAN lehetővé teszi több kapcsolat használatát egyidejűleg, vagy az "
+"elsődleges kapcsolat esetleges hibája esetén."
+
+msgid "None"
+msgstr "Nincs"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Portok"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Recovering"
+msgstr "Helyreállítás"
+
+msgid "Source Address"
+msgstr "Forrás cím"
+
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgid "WAN Interfaces"
+msgstr "WAN interfészek"
+
+msgid "WAN Uplink"
+msgstr "WAN kapcsolat"
+
+msgid "all"
+msgstr "összes"
diff --git a/trunk/package/luci/po/hu/ntpc.po b/trunk/package/luci/po/hu/ntpc.po
new file mode 100644
index 00000000..f69046f5
--- /dev/null
+++ b/trunk/package/luci/po/hu/ntpc.po
@@ -0,0 +1,55 @@
+# Generated from applications/luci-ntpc/luasrc/model/cbi/ntpc/*.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-07-10 21:05+0200\n"
+"Last-Translator: Gyula <pro564@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Óra igazítás"
+
+msgid "Count of time measurements"
+msgstr "Időmérések száma"
+
+msgid "Current system time"
+msgstr "Jelenlegi rendszeridő"
+
+msgid "General"
+msgstr "Általános"
+
+msgid "Hostname"
+msgstr "Gépnév"
+
+msgid "Offset frequency"
+msgstr "Frekvencia eltolás"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "A rendszeridő szinkronizálása"
+
+msgid "Time Server"
+msgstr "Időszerver"
+
+msgid "Time Servers"
+msgstr "Időkiszolgálók"
+
+msgid "Time Synchronisation"
+msgstr "Idő szinkronizálás"
+
+msgid "Update interval (in seconds)"
+msgstr "Frissítési időköz (másodpercben)"
+
+msgid "empty = infinite"
+msgstr "üres = végtelen"
diff --git a/trunk/package/luci/po/hu/olsr.po b/trunk/package/luci/po/hu/olsr.po
new file mode 100644
index 00000000..38aa43bf
--- /dev/null
+++ b/trunk/package/luci/po/hu/olsr.po
@@ -0,0 +1,687 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/hu/openvpn.po b/trunk/package/luci/po/hu/openvpn.po
new file mode 100644
index 00000000..7a17ca54
--- /dev/null
+++ b/trunk/package/luci/po/hu/openvpn.po
@@ -0,0 +1,557 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-31 12:06+0200\n"
+"Last-Translator: Gabor <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p' vagy 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "A kiszolgáló által küldött opciók elfogadás"
+
+msgid "Add"
+msgstr "Hozzáadás"
+
+msgid "Add route after establishing connection"
+msgstr "Útvonal hozzáadása a kapcsolat létrejötte után"
+
+msgid "Additional authentication over TLS"
+msgstr "További hitelesítés TLS-en keresztül"
+
+msgid "Allow client-to-client traffic"
+msgstr "Ügyfél-ügyfél közötti kapcsolat engedélyezése"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Több ügyfél engedélyezése ugyanazzal a tanúsítvánnyal"
+
+msgid "Allow only one session"
+msgstr "Csak egy munkafolyamat engedélyezése"
+
+msgid "Allow remote to change its IP or port"
+msgstr "A távoli gép IP címének vagy portjának megváltozatásának engedélyezése"
+
+msgid "Allowed maximum of connected clients"
+msgstr "A csatlakozott ügyfelek maximális megengedett száma"
+
+msgid "Allowed maximum of internal"
+msgstr "Belső kapcsolatok maximális száma"
+
+msgid "Allowed maximum of new connections"
+msgstr "Az új kapcsolatok maximálisan megengedett száma"
+
+msgid "Append log to file"
+msgstr "Napló hozzáfűzése fájlhoz"
+
+msgid "Authenticate using username/password"
+msgstr "Azonosítás felhasználónév és jelszó használatával"
+
+msgid "Automatically redirect default route"
+msgstr "Az alapértelmezett útvonal automatikus átirányítása"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Az alábbi listában találhatóak a beállított OpenVPN példányok és azok "
+"aktuális állapota"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "A TUN/TAP interfész lezárása előtt futtatandó shell script."
+
+msgid "Certificate authority"
+msgstr "Hitelesítésszolgáltató"
+
+msgid "Change process priority"
+msgstr "Folyamat prioritásának módosítása"
+
+msgid "Change to directory before initialization"
+msgstr "Váltás a könyvtárra inicializáslás előtt"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Kliens tanúsítvány összevetése a tiltólistával."
+
+msgid "Chroot to directory after initialization"
+msgstr "Gyökérkönyvtár váltás inicializáció után"
+
+msgid "Client is disabled"
+msgstr "Ügyfél letiltva"
+
+msgid "Configuration category"
+msgstr "Beállítások / Visszavonás"
+
+msgid "Configure client mode"
+msgstr "Ügyfél mód beállítása"
+
+msgid "Configure server bridge"
+msgstr "Kiszolgáló híd beállítása"
+
+msgid "Configure server mode"
+msgstr "Kiszolgáló mód beállítása"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Kapcsolódás Sock5 proxy-n keresztül"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Kapcsolódás a távoli géphez HTTP proxyn keresztül"
+
+msgid "Connection retry interval"
+msgstr "Kapcsolódás újrapróbálkozási időköz"
+
+msgid "Cryptography"
+msgstr "Titkosítás"
+
+msgid "Daemonize after initialization"
+msgstr "Váltás démon módba inicializálás után"
+
+msgid "Delay n seconds after connection"
+msgstr "Kapcsolat felépítés után 'n' másodperc késleltetés"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr "Diffie Hellman paraméterek"
+
+msgid "Directory for custom client config files"
+msgstr "Egyéni ügyfél konfigurációs fájlok könyvtára "
+
+msgid "Disable Paging"
+msgstr "Lapozás letiltása"
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr "Újrajátszás védelem letiltása"
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr "Ne adjon hozzá útvonalakat automatikusan "
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr "Időbélyegeket ne naplózza"
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Ne használjon adaptív LZO tömörítést"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr "A paramétereket írja a naplóba"
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "OpenSSL hardveres titkosítás engedélyezése"
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr "Érvénytelen"
+
+msgid "Keep local IP address on restart"
+msgstr "Helyi IP cím megtartása újraindításkor"
+
+msgid "Keep remote IP address on restart"
+msgstr "Távoli IP cím megtartása újraindításkor"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "tun/tap eszközök nyitva tartása újraindításkor"
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr "Helyi tanúsítvány"
+
+msgid "Local host name or ip address"
+msgstr "Helyi gép név vagy IP cím"
+
+msgid "Local private key"
+msgstr "Helyi privát kulcs"
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "A sorbaállított kimenő TCP csomagok maximális száma"
+
+msgid "Networking"
+msgstr "Hálózatkezelés"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Lefoglalt broadcast pufferek száma"
+
+msgid "Number of lines for log file history"
+msgstr "Naplófájl történet sorainak száma"
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN példányok"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr "Áttekintés"
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Proxy timeout in seconds"
+msgstr "Proxy várakozási idő (másodperc)"
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr "Kapcsolat megtagadás ha nincs egyéni ügyfél konfiguráció"
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr "Távoli gép név vagy IP cím"
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr "Szolgáltatás"
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr "Indítás/Leállítás"
+
+msgid "Started"
+msgstr "Elindítva"
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr "Váltás haladó beállításokra »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr "TLS titkosító"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr "A használt eszköz típusa"
+
+msgid "Use fast LZO compression"
+msgstr "Gyors LZO tömörítés használata"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Egyedi címek használata /30 alhálózat helyett"
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "Napló írása fájlba"
+
+msgid "Write process ID to file"
+msgstr "Folyamat azonosító (PID) fájlba írása"
+
+msgid "Write status to file every n seconds"
+msgstr "Állapot fájlba írása 'n' másodpercenként"
+
+msgid "no"
+msgstr "nem"
+
+msgid "tun/tap device"
+msgstr "tun/tap/ eszköz"
+
+msgid "tun/tap inactivity timeout"
+msgstr "tun/tap tétlenségi idő"
+
+msgid "yes (%i)"
+msgstr "igen (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Váltás alap beállításokra"
+
+#~ msgid "openvpn_%s"
+#~ msgstr "openvpn_%s"
+
+#~ msgid "openvpn_%s_desc"
+#~ msgstr "openvpn_%s_desc"
diff --git a/trunk/package/luci/po/hu/p2pblock.po b/trunk/package/luci/po/hu/p2pblock.po
new file mode 100644
index 00000000..badf17e3
--- /dev/null
+++ b/trunk/package/luci/po/hu/p2pblock.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-01 19:16+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Block Time"
+msgstr "Blokkolási idő"
+
+msgid "Enable P2P-Block"
+msgstr "P2P-Block engedélyezése"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Layer7 protokollok"
+
+msgid "P2P-Block"
+msgstr "P2P-Block"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"A P2P-Block különféle peer-to-peer protokollok blokkolására szolgáló "
+"mechanizmus, a fehérlistában nem szereplő ügyfelek részére."
+
+msgid "Portrange"
+msgstr "Port tartomány"
+
+msgid "Whitelisted IPs"
+msgstr "Fehérlistás IP címek"
+
+msgid "seconds"
+msgstr "másodperc"
diff --git a/trunk/package/luci/po/hu/p910nd.po b/trunk/package/luci/po/hu/p910nd.po
new file mode 100644
index 00000000..71798719
--- /dev/null
+++ b/trunk/package/luci/po/hu/p910nd.po
@@ -0,0 +1,49 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-28 16:41+0200\n"
+"Last-Translator: Gábor <vargalex@freemail.hu>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Bidirectional mode"
+msgstr "Kétirányú mód"
+
+msgid "Device"
+msgstr "Eszköz"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"A p910nd használata előtt szükséges az USB (kmod-usb-printer), vagy "
+"párhuzamos (kmod-lp) portokat támogató csomagok telepítése."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Beállítások"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "TCP port"
+
+msgid "enable"
+msgstr "Engedélyezés"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Nyomtató szerver"
+
+#~ msgid "port_help"
+#~ msgstr "port_súgó"
diff --git a/trunk/package/luci/po/hu/pbx-voicemail.po b/trunk/package/luci/po/hu/pbx-voicemail.po
new file mode 100644
index 00000000..be25f0b5
--- /dev/null
+++ b/trunk/package/luci/po/hu/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/hu/pbx.po b/trunk/package/luci/po/hu/pbx.po
new file mode 100644
index 00000000..2a458214
--- /dev/null
+++ b/trunk/package/luci/po/hu/pbx.po
@@ -0,0 +1,484 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/hu/polipo.po b/trunk/package/luci/po/hu/polipo.po
new file mode 100644
index 00000000..931228e5
--- /dev/null
+++ b/trunk/package/luci/po/hu/polipo.po
@@ -0,0 +1,202 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/hu/qos.po b/trunk/package/luci/po/hu/qos.po
new file mode 100644
index 00000000..d69ff082
--- /dev/null
+++ b/trunk/package/luci/po/hu/qos.po
@@ -0,0 +1,111 @@
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2012-12-30 19:18+0200\n"
+"Last-Translator: romboyco <romboyco@gmail.com>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Többletforgalom számítása"
+
+msgid "Classification Rules"
+msgstr "Besorolási szabályok"
+
+msgid "Classification group"
+msgstr "Besorolási csoport"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Cél gép"
+
+msgid "Download speed (kbit/s)"
+msgstr "Letöltési sebesség (kbit/s)"
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "Half-duplex"
+msgstr "Fél-duplex"
+
+msgid "Interfaces"
+msgstr "Interfészek"
+
+msgid "Number of bytes"
+msgstr "Bájtok száma"
+
+msgid "Ports"
+msgstr "Portok"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Quality of Service"
+
+msgid "Service"
+msgstr "Szolgáltatás"
+
+msgid "Source host"
+msgstr "Forrás gép"
+
+msgid "Target"
+msgstr "Cél"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Feltöltési sebesség (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"A <abbr title=\"Quality of Service\">QoS</abbr> segítségével beállítható "
+"cím, portok vagy szolgáltatások alapján kiválasztott hálózati forgalom "
+"prioritása."
+
+msgid "all"
+msgstr "összes"
+
+msgid "default"
+msgstr "alapértelmezett"
+
+msgid "express"
+msgstr "sürgős"
+
+msgid "low"
+msgstr "alacsony"
+
+msgid "normal"
+msgstr "normál"
+
+msgid "priority"
+msgstr "prioritás"
+
+#~ msgid "Downlink"
+#~ msgstr "Downlink"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Internet kapcsolat"
+
+#~ msgid "Uplink"
+#~ msgstr "Uplink"
+
+#~ msgid "allf"
+#~ msgstr "allf"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "qos_connbytes"
diff --git a/trunk/package/luci/po/hu/radvd.po b/trunk/package/luci/po/hu/radvd.po
new file mode 100644
index 00000000..c0b6a303
--- /dev/null
+++ b/trunk/package/luci/po/hu/radvd.po
@@ -0,0 +1,372 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-31 12:14+0200\n"
+"Last-Translator: Gabor <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "6to4 interface"
+msgstr "6to4 interfész"
+
+msgid "Address"
+msgstr "Cím"
+
+msgid "Addresses"
+msgstr "Címek"
+
+msgid "Advanced"
+msgstr "Fejlett"
+
+msgid "Advertise Home Agent flag"
+msgstr "Otthoni Ügynök jelző közzététele"
+
+msgid "Advertise router address"
+msgstr "Útválasztó cím közzététele"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Közzétett domain utótagok"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Közzétett IPv6 előtagok"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Közzétett IPv6 előtagok. Ha üres, a jelenlegi interfész előtag lesz "
+"használva."
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "DNSSL konfiguráció"
+
+msgid "Default lifetime"
+msgstr "Alapértelemezett élettartam"
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfészek"
+
+msgid "Lifetime"
+msgstr "Élettartam"
+
+msgid "Link MTU"
+msgstr "Kapcsolat MTU"
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "RDNSS beállítások"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - %q interfész"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Előtag"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Útvonal"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr "Útvonal beállítás"
+
+msgid "Routes"
+msgstr "Útvonalak"
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr "Időzítés"
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr "alípértelmezett"
+
+msgid "high"
+msgstr "magas"
+
+msgid "low"
+msgstr "alacsony"
+
+msgid "medium"
+msgstr "közepes"
+
+msgid "no"
+msgstr "nem"
+
+msgid "yes"
+msgstr "igen"
diff --git a/trunk/package/luci/po/hu/rrdtool.po b/trunk/package/luci/po/hu/rrdtool.po
new file mode 100644
index 00000000..ab2245d4
--- /dev/null
+++ b/trunk/package/luci/po/hu/rrdtool.po
@@ -0,0 +1,359 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-01 10:38+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Vezetéknélküli - Jel-zaj arány"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Zajszint"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Jelerősség"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Vezetéknélküli - Jel minőség"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Jelminőség"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: ICMP oda-vissza idő"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Tűzfal - feldolgozott csomagok"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "csomag/másodperc"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Lánc \\\"%di\\\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - %pi forgalma"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "bájt/másodperc"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "bájtok (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - %pi csomagjai"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "csomag/másodperc"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "feldolgozva (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "eldobva (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "hibák (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - multicast %pi-n"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "csomag/másodperc"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "csomagok"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - ütközések %pi-n"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "ütközés/másodperc"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Ütközések"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - hibák %pi-n"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "hiba/másodperc"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Folyamatok"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "folyamat/másodperc"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Folyamat %pi - processzor idő"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "jiffie-k"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "rendszer"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "felhasználó"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Folyamat %pi - szálak és folyamatok"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "darab"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Folyamat %pi - laphibák"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Laphibák"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "laphibák"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Folymat %pi - virtuális memória mérete"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bájtok"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "virtuális memória"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: %pi processzor kihasználtsága"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: %di forgalma"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "bájt/másodperc"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: %di csomagjai"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "csomag/másodperc"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: TCP kapcsolatok a %pi portra"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "kapcsolat/másodperc"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: lemezterület felhasználás %di-n"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "bájt"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: megszakítások"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "darab/másodperc"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Rendszer terhelés"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Terhelés"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 perc"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 perc"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 perc"
diff --git a/trunk/package/luci/po/hu/samba.po b/trunk/package/luci/po/hu/samba.po
new file mode 100644
index 00000000..164e68a4
--- /dev/null
+++ b/trunk/package/luci/po/hu/samba.po
@@ -0,0 +1,84 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-06 10:56+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Vendég hozzáférés"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"A rendszerfelhasználók hálózati megosztáson keresztül hozzáférhetnek a home "
+"könyvtárukhoz."
+
+msgid "Allowed users"
+msgstr "Engedélyezett felhasználók"
+
+msgid "Create mask"
+msgstr "Létrehozási maszk"
+
+msgid "Description"
+msgstr "Leírás"
+
+msgid "Directory mask"
+msgstr "Könyvtár maszk"
+
+msgid "Edit Template"
+msgstr "Sablon szerkesztése"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Itt szerkesztheti a sablont, ami a végleges samba konfiguráció "
+"elkészítéséhez kerül felhasználásra."
+
+msgid "General Settings"
+msgstr "Általános beállítások"
+
+msgid "Hostname"
+msgstr "Gépnév"
+
+msgid "Mask for new directories"
+msgstr "Új könyvtárak maszkja"
+
+msgid "Mask for new files"
+msgstr "Új fájlok maszkja"
+
+msgid "Name"
+msgstr "Név"
+
+msgid "Network Shares"
+msgstr "Hálózati megosztások"
+
+msgid "Path"
+msgstr "Elérési út"
+
+msgid "Read-only"
+msgstr "Csak olvasható"
+
+msgid "Share home-directories"
+msgstr "Home könyvtárak megosztása"
+
+msgid "Shared Directories"
+msgstr "Megosztott könyvtárak"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Itt látható a /etc/samba/smb.conf.template file tartalma, ami a samba "
+"konfiguráció előállításához kerül felhasználásra. A pipe szimbólumok ('|') "
+"közé zárt értékek módosítása nem szükséges, az értéküket az általános "
+"beállítások fülről kapják."
+
+msgid "Workgroup"
+msgstr "Munkacsoport"
diff --git a/trunk/package/luci/po/hu/splash.po b/trunk/package/luci/po/hu/splash.po
new file mode 100644
index 00000000..f2c7da14
--- /dev/null
+++ b/trunk/package/luci/po/hu/splash.po
@@ -0,0 +1,303 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/hu/statistics.po b/trunk/package/luci/po/hu/statistics.po
new file mode 100644
index 00000000..2480c80b
--- /dev/null
+++ b/trunk/package/luci/po/hu/statistics.po
@@ -0,0 +1,693 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-31 18:58+0200\n"
+"Last-Translator: Sixtus <gelencser12@freemail.hu>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Tevékenység (cél)"
+
+msgid "Add command for reading values"
+msgstr "Érték olvasására szolgáló parancs hozzáadása"
+
+msgid "Add matching rule"
+msgstr "Szabály hozzáadása"
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr "Értesítési parancs hozzáadása"
+
+msgid "Base Directory"
+msgstr "Alapkönyvtár"
+
+msgid "Basic monitoring"
+msgstr "Általános figyelés"
+
+msgid "CPU Plugin Configuration"
+msgstr "CPU bővítmény beállítása"
+
+msgid "CSV Output"
+msgstr "CSV kimenet"
+
+msgid "CSV Plugin Configuration"
+msgstr "CSV bővítmény konfigurálása"
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr "Gyorsítótár ürítési időköz"
+
+msgid "Chain"
+msgstr "Lánc"
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Collectd beállítások"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"A collectd változatos forrásokból különféle bővítményeken keresztül történő "
+"adatgyűjtésre szolgáló kisméretű démon. Ezen az oldalon módosíthatja a "
+"collectd démon általános beállításait."
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Conntrack bővítmény beállítása"
+
+msgid "DF Plugin Configuration"
+msgstr "DF bővítmény beállítása"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "DNS bővítmény beállítása"
+
+msgid "Data collection interval"
+msgstr "Adatgyűjtési időszak"
+
+msgid "Datasets definition file"
+msgstr "Adatkészlet leíró fálj"
+
+msgid "Destination ip range"
+msgstr "Cél IP tartomány"
+
+msgid "Directory for collectd plugins"
+msgstr "Öszegyűjtött plug-in-ek könyvtára"
+
+msgid "Directory for sub-configurations"
+msgstr "Al-beállítások könyvtára"
+
+msgid "Disk Plugin Configuration"
+msgstr "Lemez bővítmény beállítása"
+
+msgid "Disk Space Usage"
+msgstr "Felhasznált lemezterület"
+
+msgid "Disk Usage"
+msgstr "Lemezhasználat"
+
+msgid "Display Host »"
+msgstr "Host mutatása »"
+
+msgid "Display timespan »"
+msgstr "Időszak megjelenítése »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "E-Mail bővítmény beállítása"
+
+msgid "Email"
+msgstr "E-mail"
+
+msgid "Enable this plugin"
+msgstr "Bővítmény engedélyezése"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Exec bővítmény beállítása"
+
+msgid "Filter class monitoring"
+msgstr "Szűrő osztály figyelése"
+
+msgid "Firewall"
+msgstr "Tűzfal"
+
+msgid "Flush cache after"
+msgstr "Gyorsítótár ürítése ezután:"
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr "Grafikonok"
+
+msgid "Group"
+msgstr "Csoport"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Itt megadhatók külső parancsok amelyek a collectd által lesznek futtatva "
+"bizonyos értékeke beolvasására. Az értékek a szabványos kimenetről lesznek "
+"beolvasva."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Itt megadhatók külső parancsok amelyek a collectd által lesznek futtatva "
+"amikor bizonyos küszbértékek elérésre kerülnek. A hívást kiváltó értékek a "
+"meghívott programok szabványos bemenetére lesznek küldve."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Itt addhatók meg különböző feltételek, amelyek alapján a megfigyelt iptables "
+"szabályok kiválasztásra kerülnek."
+
+msgid "Host"
+msgstr "Gép"
+
+msgid "Hostname"
+msgstr "Gépnév"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+"Annak a gépnek a neve vagy IP címe ahonnan a txtinfo kimenete származik"
+
+msgid "IRQ Plugin Configuration"
+msgstr "IRQ bővítmény beállítása"
+
+msgid "Ignore source addresses"
+msgstr "Forrás címek figyelmen kívül hagyása"
+
+msgid "Incoming interface"
+msgstr "Bejövő interfész"
+
+msgid "Interface Plugin Configuration"
+msgstr "Interfész bővítmény beállítása"
+
+msgid "Interfaces"
+msgstr "Interfészek"
+
+msgid "Interrupts"
+msgstr "Megszakítások"
+
+msgid "Interval for pings"
+msgstr "Ping-ek közötti idő"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Iptables bővítmény beállítása"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Bejelölés nélkül a figyelendő iterfészek automatikusan kerülnek "
+"kiválasztásra."
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr "Terhelés bővítmény beállítása"
+
+msgid "Maximum allowed connections"
+msgstr "Megengedett kapcsolatok maximális száma"
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Memory Plugin Configuration"
+msgstr "Memória bővítmény beállítása"
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr "Eszközök figyelése"
+
+msgid "Monitor disks and partitions"
+msgstr "Lemezek és partíciók figyelése"
+
+msgid "Monitor filesystem types"
+msgstr "Fájlrendszer típusok figyelése"
+
+msgid "Monitor hosts"
+msgstr "Gépek figyelése"
+
+msgid "Monitor interfaces"
+msgstr "Interfészek figyelése"
+
+msgid "Monitor interrupts"
+msgstr "Megszakítások figyelése"
+
+msgid "Monitor local ports"
+msgstr "Helyi portok figyelése"
+
+msgid "Monitor mount points"
+msgstr "Csatolási pontok figyelése"
+
+msgid "Monitor processes"
+msgstr "Folyamatok figyelése"
+
+msgid "Monitor remote ports"
+msgstr "Távoli portok figyelése"
+
+msgid "Name of the rule"
+msgstr "A szabály neve"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Netlink bővítmény beállítása"
+
+msgid "Network"
+msgstr "Hálózat"
+
+msgid "Network Plugin Configuration"
+msgstr "Hálózat bővítmény beállítása"
+
+msgid "Network plugins"
+msgstr "Hálózati bővítmények"
+
+msgid "Network protocol"
+msgstr "Hálózati protokoll"
+
+msgid "Number of threads for data collection"
+msgstr "Az adatgyűjtő szálak száma"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "OLSRd bővítmény beállítása"
+
+msgid "Only create average RRAs"
+msgstr "Csak átlag RRA-k létrehozása"
+
+msgid "Options"
+msgstr "Lehetőségek"
+
+msgid "Outgoing interface"
+msgstr "Kimenő interfész"
+
+msgid "Output plugins"
+msgstr "Kimeneti bővítmények"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Ping bővítmény beállítása"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Processes"
+msgstr "Folyamatok"
+
+msgid "Processes Plugin Configuration"
+msgstr "Folyamatok bővítmény beállítása"
+
+msgid "Processes to monitor separated by space"
+msgstr "Figyelendő folyamatok szóközzel elválasztva"
+
+msgid "Processor"
+msgstr "Processzor"
+
+msgid "Qdisc monitoring"
+msgstr "Qdisc figyelés"
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "RRDTool bővítmény beállítása"
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr "Parancsfájl"
+
+msgid "Seconds"
+msgstr "másodperc"
+
+msgid "Server host"
+msgstr "Kiszolgáló gép"
+
+msgid "Server port"
+msgstr "Kiszolgáló port"
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr "Socket fájlok"
+
+msgid "Socket group"
+msgstr "Socket csoport"
+
+msgid "Socket permissions"
+msgstr "Socket jogosultságok"
+
+msgid "Source ip range"
+msgstr "Forrás IP tartomány"
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+"Azt határozza meg, hogy az kapcsolatokról milyen információkat kell gyűjteni."
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+"Azt határozza meg, hogy az útvonalakról milyen információkat kell gyűjteni."
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+"Azt határozza meg, hogy a globális topológiáról milyen információkat kell "
+"gyűjteni."
+
+msgid "Statistics"
+msgstr "Statisztikák"
+
+msgid "Storage directory"
+msgstr "Tárolási könyvtár"
+
+msgid "Storage directory for the csv files"
+msgstr "A csv fájlok tárolási könyvtára"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Az adatok arányként történő tárolása abszolút értékek helyett"
+
+msgid "Stored timespans"
+msgstr "Tárolt időszakok"
+
+msgid "System Load"
+msgstr "Rendszerterhelés"
+
+msgid "System plugins"
+msgstr "Rendszer bővítmények"
+
+msgid "TCP Connections"
+msgstr "TCP kapcsolatok"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "TCPConns bővítény beállítása"
+
+msgid "TTL for network packets"
+msgstr "TTL a hálózati csomagokhoz"
+
+msgid "TTL for ping packets"
+msgstr "TTL a ping csomagokhoz"
+
+msgid "Table"
+msgstr "Táblázat"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr "A NUT bővítmény a szünetmentes tápokról ad információkat."
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+"Az OLSRd bővítmény a összekapcsolt hálózatokról olvas információkat az OLSRd "
+"txttinfo bővítményén keresztül."
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+"A conntrack bővítmény a nyomon követett kapcsolatok számáról gyűjt "
+"statisztikákat."
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+"A processzor bővítmény a processzorhasználatról gyűjt alapvető "
+"statisztikákat."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"A csv bővítmény segítségével az összegyűjtött adatok csv formátumú fájlba "
+"menthetők külső programmal történő további feldolgozás céljára."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"A df bővítmény a lemezterület használatáról gyűjt statisztikákat különböző "
+"eszközökön, csatolási pontokon vagy fájlrendszereken."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"A lemez bővítmény részletes használati statisztikákat készít a kiválasztott "
+"paticiókhoz vagy teljes lemezekhez."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"A DNS bővítmény részletes adatokat gyűjt a kiválasztott interfészek DNS-hez "
+"tartozó forgalmáról."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"Az email bővítmény egy unix socket-et hoz létre amely lehetővé teszi email-"
+"statisztikáknak a továbbítását egy futó collect démonhoz. A bővítmény "
+"elsősorban a Mail::SpamAssasin::Plugin::Collectd bővítménnyel együtt történő "
+"használatra szolgál, de egyéb módokon is használható."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"Az exec bővítmény külső parancsokat indít értékek olvasására vagy külső "
+"folyamatok értesítésére bizonyos küszöbértékek elérése esetén."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"Az interface bővítmény forgalmi statisztikákat gyűjt a kiválasztott "
+"interfészekről."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"Az iptables bővítmény kiválasztott tűzfal szabályok alapján információt "
+"gyűjt a szabályonként feldolgozott bájtokról és csomagokról."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+"A load bővítmény az általános rendszzer terhelésről gyűjt statisztikákat."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "A memória bővítmény a memórahasználatról gyűjt információkat."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"A ping bővítmény ICMP echo kéréseket küld a kiválasztott gépekre és méri az "
+"oda-vissza eltelt időt minden gép esetében."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"A statisztikai csomag a <a href=\"http://collectd.org/index.shtml"
+"\">collectd</a> segédprogramon alapul és az <a href=\"http://oss.oetiker.ch/"
+"rrdtool/\">RRD Tool</a> segédprogramot használja a grafikonok elkészítésére "
+"az összegyűjtött adatokból."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"A tcpconns bővítmény a kiválasztott portokon lévő TCP kapcsolatokról gyűjt "
+"információkat."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"A unixsock bővítmény létrehoz egy unix socket-et melyen keresztül "
+"kiolvashatók az összegyűjtött adatok egy futó collectd-ből. "
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Ez a szakasz határozza meg, hogy a helyileg összegyűjtött adatokat melyik "
+"kiszolgálókra kell továbbítani."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "UnixSock bővítmény beállítása"
+
+msgid "Used PID file"
+msgstr "Használt PID fájl"
+
+msgid "User"
+msgstr "Felhasználó"
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr "Vezeték nélküli"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "iwinfo vezeték nélküli bővítmény beállítása"
+
+msgid "e.g. br-ff"
+msgstr "pl. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "pl. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "pl. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "max. 16 karakter"
+
+msgid "reduces rrd size"
+msgstr "csökkenti az rrd adatbázis méretét"
+
+msgid "seconds; multiple separated by space"
+msgstr "másodpercek; több szóközzel elválasztott érték is megadható"
+
+msgid "server interfaces"
+msgstr "kiszolgáló interfész"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Telepített hálózati bővítmények:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Telepített kimeneti bővítmények:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "A hálózati bővítmények nyitott TCP kapcsolatok, interfész forgalom, iptables "
+#~ "szabályok és ehhez hasonló információk gyűjtésére használhatók."
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "A kimeneti bővítmények különféle lehetőségeket biztosítanak az összegyűjtött "
+#~ "adatok tárolásához. Lehetőség van többféle bővítmény egyidejű "
+#~ "engedélyezésére, például az összegyűjtött adatok RRD adatbázisban történő "
+#~ "tárolására és egyidejűleg hálózaton keresztül másik collectd példányhoz való "
+#~ "továbbítására."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr ""
+#~ "A rendszer bővítmények a rendszer állapotáról és az erőforrások "
+#~ "használatáról gyűjtenek adatokat az eszközön."
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "A vezetéknélküli bővítmény vezetéknélküli jelerősségről, zajról és "
+#~ "minőségről gyűjt információkat."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Vezetéknélküli bővítmény beállítása"
diff --git a/trunk/package/luci/po/hu/tinyproxy.po b/trunk/package/luci/po/hu/tinyproxy.po
new file mode 100644
index 00000000..5c4ddddb
--- /dev/null
+++ b/trunk/package/luci/po/hu/tinyproxy.po
@@ -0,0 +1,255 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/hu/transmission.po b/trunk/package/luci/po/hu/transmission.po
new file mode 100644
index 00000000..040f8380
--- /dev/null
+++ b/trunk/package/luci/po/hu/transmission.po
@@ -0,0 +1,300 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-17 20:30+0200\n"
+"PO-Revision-Date: 2012-04-26 14:30+0200\n"
+"Last-Translator: Gyula <pro564@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Alternative download speed"
+msgstr "Alternatív letöltési sebesség"
+
+msgid "Alternative speed enabled"
+msgstr "Alternatív sebesség engedélyezve"
+
+msgid "Alternative speed time begin"
+msgstr "Alternatív sebesség kezdő időpont"
+
+msgid "Alternative speed time day"
+msgstr "Alternatív sebesség napok"
+
+msgid "Alternative speed time end"
+msgstr "Alternatív sebesség záró időpont"
+
+msgid "Alternative speed timing enabled"
+msgstr "Alternatív sebesség időzítés engedélyezve"
+
+msgid "Alternative upload speed"
+msgstr "Alternatív feltöltési sebesség"
+
+msgid "Automatically start added torrents"
+msgstr "Hozzáadott torrentek automatikus indítása"
+
+msgid "Bandwidth settings"
+msgstr "Sávszélesség beállítások"
+
+msgid "Binding address IPv4"
+msgstr "Rögzített IPv4 cím"
+
+msgid "Binding address IPv6"
+msgstr "Rögzített IPv6 cím"
+
+msgid "Block list enabled"
+msgstr "Tiltólista engedélyezés"
+
+msgid "Blocklist URL"
+msgstr "Tiltólista URL"
+
+msgid "Blocklists"
+msgstr "Tiltólista"
+
+msgid "Cache size in MB"
+msgstr "Puffer méret (MB)"
+
+msgid "Config file directory"
+msgstr "Beállítási fájl könyvtára"
+
+msgid "DHT enabled"
+msgstr "DHT engedélyezve"
+
+msgid "Debug"
+msgstr "Nyomkövetés"
+
+msgid "Download directory"
+msgstr "Letöltési könyvtár"
+
+msgid "Download queue enabled"
+msgstr "Letöltési sor engedélyezve"
+
+msgid "Download queue size"
+msgstr "Letöltési sor mérete"
+
+msgid "Enable watch directory"
+msgstr "Figyelt könyvtár(aut. indítás)"
+
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+msgid "Encryption"
+msgstr "Titkosítás"
+
+msgid "Error"
+msgstr "Hiba"
+
+msgid "Fast"
+msgstr "Gyors"
+
+msgid "Files and Locations"
+msgstr "Fájlok és helyek"
+
+msgid "Forced"
+msgstr "Erőltetve"
+
+msgid "Full"
+msgstr "Teljes"
+
+msgid "Global peer limit"
+msgstr "Globális partnerkorlát"
+
+msgid "Global settings"
+msgstr "Globális beálllítások"
+
+msgid "Idle seeding limit"
+msgstr "Üresjárati seedkorlát"
+
+msgid "Idle seeding limit enabled"
+msgstr "Üresjárati seedkorlát engedélyezése"
+
+msgid "Incomplete directory"
+msgstr "Befejezetlen fájlok mappája"
+
+msgid "Incomplete directory enabled"
+msgstr "Befejezetlen fájlok mappájának engedélyezése"
+
+msgid "Info"
+msgstr "Infó"
+
+msgid "LPD enabled"
+msgstr "LPD engedélyezése"
+
+msgid "Lazy bitfield enabled"
+msgstr "Lazy bitfield engedélyezése"
+
+msgid "Message level"
+msgstr "Naplózási szint"
+
+msgid "Miscellaneous"
+msgstr "Egyéb"
+
+msgid "None"
+msgstr "Nincs"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"Szám/bitmező. Kezdj 0-val, és minden napnál, amikor az ütemezőt be akarod "
+"kapcsolni, adj hozzá egy értéket. Vasárnap - 1, Hétfő - 2, Kedd - 4, Szerda "
+"- 8, Csütörtök - 16, Péntek - 32, Szombat - 64"
+
+msgid "Off"
+msgstr "Ki"
+
+msgid "Open Web Interface"
+msgstr "Webes felület megnyitása"
+
+msgid "PEX enabled"
+msgstr "PEX engedélyezése"
+
+msgid "Peer Port settings"
+msgstr "Partner port beállítások"
+
+msgid "Peer congestion algorithm"
+msgstr "Partner torlódási algoritmus"
+
+msgid "Peer limit per torrent"
+msgstr "Torrentenkénti partnerkorlát"
+
+msgid "Peer port"
+msgstr "Partner port"
+
+msgid "Peer port random high"
+msgstr "Véletlenszerű magas partner port"
+
+msgid "Peer port random low"
+msgstr "Véletlenszerű alacsony partner port"
+
+msgid "Peer port random on start"
+msgstr "Véletlenszerű partner port induláskor"
+
+msgid "Peer settings"
+msgstr "Partner beállítások"
+
+msgid "Peer socket tos"
+msgstr "Partner szolgáltatás típus"
+
+msgid "Port forwarding enabled"
+msgstr "Portátirányítás engedélyezése"
+
+msgid "Preferred"
+msgstr "Előnyben részesített"
+
+msgid "Prefetch enabled"
+msgstr "Előtöltés engedélyezése"
+
+msgid "Queue stalled enabled"
+msgstr "Elakadt sor engedélyezése"
+
+msgid "Queue stalled minutes"
+msgstr "Elakadás időtartama"
+
+msgid "Queueing"
+msgstr "Sorbaállítás"
+
+msgid "RPC URL"
+msgstr "RPC URL"
+
+msgid "RPC authentication required"
+msgstr "RPC azonosítás megkövetelése"
+
+msgid "RPC bind address"
+msgstr "RPC cím rögzítése"
+
+msgid "RPC enabled"
+msgstr "RPC engedélyezése"
+
+msgid "RPC password"
+msgstr "RPC jelszó"
+
+msgid "RPC port"
+msgstr "RPC port"
+
+msgid "RPC settings"
+msgstr "RPC beállítások"
+
+msgid "RPC username"
+msgstr "RPC felhasználónév"
+
+msgid "RPC whitelist"
+msgstr "RPC fehérlista"
+
+msgid "RPC whitelist enabled"
+msgstr "RPC fehérlista engedélyezése"
+
+msgid "Ratio limit"
+msgstr "Aránykorlát"
+
+msgid "Ratio limit enabled"
+msgstr "Aránykorlát engedélyezése"
+
+msgid "Rename partial files"
+msgstr "Félkész fájlok átnevezése"
+
+msgid "Run daemon as user"
+msgstr "Daemon indítása, mint"
+
+msgid "Scheduling"
+msgstr "Ütemezés"
+
+msgid "Scrape paused torrents enabled"
+msgstr "Álló torrentek adatainak lekérdezése"
+
+msgid "Script torrent done enabled"
+msgstr "Letöltés utáni script engedélyezése"
+
+msgid "Script torrent done filename"
+msgstr "Letöltés utáni script fájlneve"
+
+msgid "Seed queue enabled"
+msgstr "Feltöltési sor engedélyezése"
+
+msgid "Seed queue size"
+msgstr "Feltöltési sor mérete"
+
+msgid "Speed limit down"
+msgstr "Letöltési korlát"
+
+msgid "Speed limit down enabled"
+msgstr "Letöltési korlát engedélyezése"
+
+msgid "Speed limit up"
+msgstr "Feltöltési korlát"
+
+msgid "Speed limit up enabled"
+msgstr "Feltöltési korlát engedélyezése"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"A Transmission daemon egy egyszerű bittorrent kliens, itt módosíthatod a "
+"beállításait."
+
+msgid "Trash original torrent files"
+msgstr "Eredeti torrent fájlok eldobása"
+
+msgid "Upload slots per torrent"
+msgstr "Feltöltési szálak torrentenként"
+
+msgid "Watch directory"
+msgstr "Figyelt könyvtár"
+
+msgid "in minutes from midnight"
+msgstr "percek száma éjféltől"
+
+msgid "preallocation"
+msgstr "előre lefoglalás"
+
+msgid "uTP enabled"
+msgstr "uTP engedélyezése"
diff --git a/trunk/package/luci/po/hu/upnp.po b/trunk/package/luci/po/hu/upnp.po
new file mode 100644
index 00000000..87ff2608
--- /dev/null
+++ b/trunk/package/luci/po/hu/upnp.po
@@ -0,0 +1,155 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-31 18:32+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Az ACL-ek határozzák meg, hogy melyik külső portok melyik belső portokra és "
+"címekre kerülhetnek továbbításra"
+
+msgid "Action"
+msgstr "Művelet"
+
+msgid "Active UPnP Redirects"
+msgstr "Aktív UPnP átirányítások"
+
+msgid "Advanced Settings"
+msgstr "Haladó beállítások"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+"Kizárólag a kérést küldő IP címre történő továbbítás hozzáadásának "
+"engedélyezése"
+
+msgid "Announced model number"
+msgstr "Közzétett modelszám"
+
+msgid "Announced serial number"
+msgstr "Közzétett sorozatszám"
+
+msgid "Clean rules interval"
+msgstr "Szabály törlési időköz"
+
+msgid "Clean rules threshold"
+msgstr "Szabály törlési küszöbérték"
+
+msgid "Client Address"
+msgstr "Ügyfél cím"
+
+msgid "Client Port"
+msgstr "Ügyfél port"
+
+msgid "Collecting data..."
+msgstr "Adatok összegyűjtése..."
+
+msgid "Comment"
+msgstr "Megjegyzés"
+
+msgid "Delete Redirect"
+msgstr "Átirányítás törlése"
+
+msgid "Device UUID"
+msgstr "Eszköz UUID"
+
+msgid "Downlink"
+msgstr "Letöltés"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "NAT-PMP funkció engedélyezése"
+
+msgid "Enable UPnP functionality"
+msgstr "UPnP funkció engedélyezése"
+
+msgid "Enable additional logging"
+msgstr "További naplózás engedélyezése"
+
+msgid "Enable secure mode"
+msgstr "Biztonságos mód engedélyezése"
+
+msgid "External Port"
+msgstr "Külső port"
+
+msgid "External ports"
+msgstr "Külső portok"
+
+msgid "General Settings"
+msgstr "Általános beállítások"
+
+msgid "Internal addresses"
+msgstr "Belső címek"
+
+msgid "Internal ports"
+msgstr "Belső portok"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP ACL-ek"
+
+msgid "MiniUPnP settings"
+msgstr "MiniUPnP beállítások"
+
+msgid "Notify interval"
+msgstr "Értesítési időköz"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr "Bemutatkozó URL"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "További nyomkövetési információk írása a rendszernaplóba."
+
+msgid "Report system instead of daemon uptime"
+msgstr "A démon helyett a rendszer működési idejét jeleníti meg"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "UPnP és NAT-PMP szolgáltatás elindítása"
+
+msgid "There are no active redirects."
+msgstr "Nincsenek aktív átírányítások."
+
+msgid "UPNP"
+msgstr "UPNP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"Az UPnP lehetővé teszi a hálózatban lévő ügyfelek számára hogy automatikusan "
+"beállítsák a routert."
+
+msgid "UPnP lease file"
+msgstr "UPnP bérlet fájl"
+
+msgid "Universal Plug & Play"
+msgstr "Univerzális Plug and Play"
+
+msgid "Uplink"
+msgstr "Feltöltés"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Érték KByte/s-ban, csak tájékoztató jellegű"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "Az UPnP lehetővé teszi a hálózatban lévő ügyfelek számára hogy automatikusan "
+#~ "beállítsák a routert."
+
+#~ msgid "enable"
+#~ msgstr "engedélyezés"
diff --git a/trunk/package/luci/po/hu/ushare.po b/trunk/package/luci/po/hu/ushare.po
new file mode 100644
index 00000000..6efa5211
--- /dev/null
+++ b/trunk/package/luci/po/hu/ushare.po
@@ -0,0 +1,53 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-13 18:29+0200\n"
+"Last-Translator: Gábor <vargalex@freemail.hu>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Megosztott könyvtárak"
+
+msgid "Disable telnet console"
+msgstr "Telnet-konzol tiltása"
+
+msgid "Disable webinterface"
+msgstr "Web felület tiltása"
+
+msgid "Enable"
+msgstr "Engedélyezés"
+
+msgid "Interface"
+msgstr "Interfész"
+
+msgid "Options"
+msgstr "Opciók"
+
+msgid "Servername"
+msgstr "Szerver név"
+
+msgid "Settings"
+msgstr "Beállítások"
+
+msgid "Username"
+msgstr "Felhasználónév"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"Az uShare egy UPnP (TM) A/V & DLNA média szerver. A szerver komponenst "
+"valósítja meg, amely információt szolgáltat az elérhető multimédia fájlokról "
+"az uPnP média eszközök számára."
diff --git a/trunk/package/luci/po/hu/uvc_streamer.po b/trunk/package/luci/po/hu/uvc_streamer.po
new file mode 100644
index 00000000..a89c74b1
--- /dev/null
+++ b/trunk/package/luci/po/hu/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-30 09:02+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Másodpercenkénti képkockák"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Felbontás"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Beállítások"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Webkamera stream-elés"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Állítsa be a Linux-UVC kompatibilis webkameráját. Nyissa meg böngészővel "
+"pl.  <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/hu/vnstat.po b/trunk/package/luci/po/hu/vnstat.po
new file mode 100644
index 00000000..b198c5db
--- /dev/null
+++ b/trunk/package/luci/po/hu/vnstat.po
@@ -0,0 +1,65 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr "Beállítások"
+
+msgid "Daily traffic"
+msgstr "Napi forgalom"
+
+msgid "Graphs"
+msgstr "Grafikonok"
+
+msgid "Hourly traffic"
+msgstr "Óránkénti forgalom"
+
+msgid "Monitor selected interfaces"
+msgstr "Kiválasztott interfészek figyelése"
+
+msgid "Monthly traffic"
+msgstr "Havi forgalom"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Adatbázis még nem lett beállítva. Engedélyezze egy vagy több interfész "
+"figyelését a VnStat beállításoknál."
+
+msgid "Restart VnStat"
+msgstr "VnStat újraíndítása"
+
+msgid "Summary display"
+msgstr "Összefoglaló nézet"
+
+msgid "Top 10 display"
+msgstr "Top 10 nézet"
+
+msgid "Update »"
+msgstr "Frissítés »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "VnStat grafikonok"
+
+msgid "VnStat Traffic Monitor"
+msgstr "VnStat Forgalom Figyelő"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat egy hálózati forgalom figyelő alkalmazás Linux alá ami naplózza a "
+"kiválasztott interfész(ek) hálózati forgalmát."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "A VnStat szolgáltatás újra lett índítva."
diff --git a/trunk/package/luci/po/hu/voice_core.po b/trunk/package/luci/po/hu/voice_core.po
new file mode 100644
index 00000000..4b69867b
--- /dev/null
+++ b/trunk/package/luci/po/hu/voice_core.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-01 09:34+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Phones"
+msgstr "Telefonok"
+
+msgid "Voice"
+msgstr "Hang"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/hu/voice_diag.po b/trunk/package/luci/po/hu/voice_diag.po
new file mode 100644
index 00000000..79d23798
--- /dev/null
+++ b/trunk/package/luci/po/hu/voice_diag.po
@@ -0,0 +1,30 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Diagnostics"
+msgstr "Diagnosztika"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Az eszközön elérhető diagnosztikai lehetőségek a telepített összetevőktől "
+"függenek."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Ez alatt a menüpont alatt olyan lehetőségek vannak, amelyek lehetővé teszik, "
+"hogy beállítsa és tesztelje az eszköz hangrendszerének a működését. Ezek "
+"diagnosztikaként ismertek."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/hu/watchcat.po b/trunk/package/luci/po/hu/watchcat.po
new file mode 100644
index 00000000..253eb77d
--- /dev/null
+++ b/trunk/package/luci/po/hu/watchcat.po
@@ -0,0 +1,64 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-31 18:09+0200\n"
+"Last-Translator: Sixtus <gelencser12@freemail.hu>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "Kényszerített újraindítás késleltetése"
+
+#, fuzzy
+msgid "Host address to ping"
+msgstr "Pingelendő szerver címe"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Internet kapcsolat ellenőrzésének gyakorisága. Alapértelmezett egység a "
+"másodperc, percekhez használd az 'm', órákhoz a 'h', vagy napokhoz a 'd' "
+"utótagot."
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"Periodikus üzemmódban ez határozza meg az újraindítás gyakoriságát. Internet "
+"üzemmódban meghatározza a leghosszabb időt újraindításig, amikor nincs "
+"internet kapcsolat. Alapértelmezett egység a másodperc, percekhez használd "
+"az 'm', órákhoz a 'h', vagy napokhoz a 'd' utótagot."
+
+msgid "Operating mode"
+msgstr "Üzemmód"
+
+msgid "Period"
+msgstr "Periódus"
+
+msgid "Ping host"
+msgstr "Ping címe"
+
+msgid "Ping period"
+msgstr "Pingelések közti idő"
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/hu/wol.po b/trunk/package/luci/po/hu/wol.po
new file mode 100644
index 00000000..5bba2e63
--- /dev/null
+++ b/trunk/package/luci/po/hu/wol.po
@@ -0,0 +1,59 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2012-04-06 10:42+0200\n"
+"Last-Translator: juhosg <juhosg@librecmc.org>\n"
+"Language-Team: none\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Szórás az összes interfészen"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+"Válassza ki a felélesztendő gépet, vagy adja meg a haszálandó egyedi MAC "
+"címet"
+
+msgid "Host to wake up"
+msgstr "Felélesztendő gép"
+
+msgid "Network interface to use"
+msgstr "Használandó interfész"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Néha csak az egyik eszköz működik. Ha valamelyik nem működik, próbálja ki a "
+"másikat."
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+"Megadja azt az interfészt amelyiken keresztül a WoL csomag kiküldésre kerül"
+
+msgid "Starting WoL utility:"
+msgstr "WoL segédprogram elindítása:"
+
+msgid "Wake on LAN"
+msgstr "Felélesztés hálózaton keresztül"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"A felélesztés hálózaton keresztül a helyi hálózatban lévő számítógépek "
+"távoli elindítására szolgáló módszer."
+
+msgid "Wake up host"
+msgstr "Gép felélesztése"
+
+msgid "WoL program"
+msgstr "WoL program"
diff --git a/trunk/package/luci/po/hu/wshaper.po b/trunk/package/luci/po/hu/wshaper.po
new file mode 100644
index 00000000..2377fa54
--- /dev/null
+++ b/trunk/package/luci/po/hu/wshaper.po
@@ -0,0 +1,54 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Downlink"
+msgstr "Letöltés"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Letöltési sebesség kbit/másodberc-ben"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Gép vagy hálózat (CIDR jelöléssel)"
+
+msgid "Interface"
+msgstr "Interfész"
+
+msgid "Low priority destination ports"
+msgstr "Alacsony prioritású cél portok"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Alacson prioritású cél gépek"
+
+msgid "Low priority hosts (Source)"
+msgstr "Alacsony prioritású forrás gépek"
+
+msgid "Low priority source ports"
+msgstr "Alacson prioritású forrás portok"
+
+msgid "Uplink"
+msgstr "Feltöltés"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Feltöltési sebesség kbit/másodperc-ben"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Wondershaper beállítások"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"A Wondershaper 'traffic shaping'-et használatával biztosítja az interaktív "
+"forgalom alacsony késleletetését még akkor is ha az internet kapcsolat "
+"erősen leterhelt."
diff --git a/trunk/package/luci/po/it/ahcp.po b/trunk/package/luci/po/it/ahcp.po
new file mode 100644
index 00000000..56d9516b
--- /dev/null
+++ b/trunk/package/luci/po/it/ahcp.po
@@ -0,0 +1,114 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-03 12:53+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Server AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP è un protocollo di configurazione automatica per reti IPv6 e dual-stack "
+"IPv6/IPv4 progettato per essere usato al posto del router discovery e DHCP "
+"su reti dove è difficile o impossibile configurare un server all'interno di "
+"ogni dominio di broadcast, per esempio reti ad-hoc mobili."
+
+msgid "Active AHCP Leases"
+msgstr "Lease AHCP Attivi"
+
+msgid "Address"
+msgstr "Indirizzo"
+
+msgid "Advanced Settings"
+msgstr "Impostazioni Avanzate"
+
+msgid "Age"
+msgstr "Età"
+
+msgid "Announced DNS servers"
+msgstr "Server DNS indicati"
+
+msgid "Announced NTP servers"
+msgstr "Server NTP indicati"
+
+msgid "Announced prefixes"
+msgstr "Prefissi indicati"
+
+msgid "Collecting data..."
+msgstr "Raccolta dei dati..."
+
+msgid "Forwarder"
+msgstr "Mittente"
+
+msgid "General Setup"
+msgstr "Setup Generale"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Solo IPv4"
+
+msgid "IPv6 only"
+msgstr "Solo IPv6"
+
+msgid "Lease directory"
+msgstr "Directory di Lease"
+
+msgid "Lease validity time"
+msgstr "Tempo di validità del Lease"
+
+msgid "Log file"
+msgstr "File di log"
+
+msgid "Multicast address"
+msgstr "Indirizzo Multicast"
+
+msgid "Operation mode"
+msgstr "Modalità di funzionamento"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Protocol family"
+msgstr "Protocollo famiglia"
+
+msgid "Served interfaces"
+msgstr "Interfacce servite"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Specifica i server NTP IPv4 e IPv6 annunciati"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Specifica il server dei nomi IPv4 e IPv6"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Specifica i prefissi delle reti IPv4 e IPv6 in notazione CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "Il servizio AHCP non è in esecuzione."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Il servizio AHCP è in esecuzione con ID %s."
+
+msgid "There are no active leases."
+msgstr "Non ci sono leases attivi."
+
+msgid "Unique ID file"
+msgstr "File degli Unique ID"
diff --git a/trunk/package/luci/po/it/asterisk.po b/trunk/package/luci/po/it/asterisk.po
new file mode 100644
index 00000000..9eb24da5
--- /dev/null
+++ b/trunk/package/luci/po/it/asterisk.po
@@ -0,0 +1,162 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-04-19 23:40+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Asterisk Opzioni Generali"
+
+#~ msgid "AGI directory"
+#~ msgstr "AGI directory"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Cache dei file audio registrati durante la registrazione"
+
+#~ msgid "Debug Level"
+#~ msgstr "Livello di debug"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Disattivare alcuni avvis"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Effettua il core dump al crash"
+
+#~ msgid "High Priority"
+#~ msgstr "Alta Priorità"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Usa temporizzazione interna"
+
+#~ msgid "Log directory"
+#~ msgstr "Accedi alla directory"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Numero massimo di chiamate consentite"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Smettere di accettare carico massimo di nuove chiamate"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Disabilitare la console dei colori"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Cache directori files suoni"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Prefisso UniquID con il nome di sistema"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "Costruire percorsi di transcodifica via SLINEAR, non direttamente"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Livello verbose"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Sezione dialplan"
+
+#~ msgid "include"
+#~ msgstr "include"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Estensione Dialplan"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Opzioni generali Dialplan"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Permettere il trasferimento"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Cancella le variabili globali"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Conferenza Dialplan"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "Aggiungere il prefisso corrispondente per Dialplans"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr ""
+#~ "Prefisso (0) per aggiungere / rimuovere a / da numeri internazionali"
+
+#~ msgid "localzone"
+#~ msgstr "localzone"
+
+#~ msgid "Connection to use"
+#~ msgstr "Connessione da utilizzare"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Caratteristica chiave delle mappe"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Chiave per disconnettere una chiamata"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Chiave di riserva per chiamata"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Riserva futura"
+
+#~ msgid "ADSI Park"
+#~ msgstr "Riserva ADSI"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Ascolta il tono di cortesia per"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Abilita la sosta"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Ora di sosta (in secondi)"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "Gamma di estensioni per la sosta di chiamata"
+
+#~ msgid "Pickup extension"
+#~ msgstr "Estensione Pickup"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Secondi di attesa tra le cifre per il trasferimento"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "Suono quando il trasferimento non ha partecipato"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Ricarica Hardware Config"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Metodo per riavviare"
+
+#~ msgid "Parameter"
+#~ msgstr "Parametro"
+
+#~ msgid "Option type"
+#~ msgstr "Tipo di opzione"
+
+#~ msgid "User name"
+#~ msgstr "Usare il nome"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Opzione generale per IAX"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Lasciare il codec"
+
+#~ msgid "Static"
+#~ msgstr "Statico"
+
+#~ msgid "Write Protect"
+#~ msgstr "Protezione da scrittura"
+
+#~ msgid "Message Format"
+#~ msgstr "Formato messaggio"
diff --git a/trunk/package/luci/po/it/base.po b/trunk/package/luci/po/it/base.po
new file mode 100644
index 00000000..94966f53
--- /dev/null
+++ b/trunk/package/luci/po/it/base.po
@@ -0,0 +1,3921 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2013-04-23 22:38+0200\n"
+"Last-Translator: muxator <a.mux@inwind.it>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d finestra in minuti , %d secondi intervallo)"
+
+msgid "(%s available)"
+msgstr "(%s disponibile)"
+
+msgid "(empty)"
+msgstr "(vuoto)"
+
+msgid "(no interfaces attached)"
+msgstr "(nessuna interfaccia collegata)"
+
+msgid "-- Additional Field --"
+msgstr "-- Campo aggiuntivo --"
+
+msgid "-- Please choose --"
+msgstr "-- Per favore scegli --"
+
+msgid "-- custom --"
+msgstr "-- personalizzato --"
+
+msgid "1 Minute Load:"
+msgstr "Carico in 1 minuto:"
+
+msgid "15 Minute Load:"
+msgstr "Carico in 15 minut:"
+
+msgid "5 Minute Load:"
+msgstr "Carico in 5 minuti:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+"<abbr title=\"Servizio basilare di impostazione Identificatore\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "Richiesta porta <abbr title=\"Sistema Nome Dominio\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "Porta Server <abbr title=\"Sistema Nome Dominio\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Sistema Nome Dominio\">DNS</abbr> I server che verranno "
+"interrogati nell'ordine del resolv file"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"<abbr title=\"Impostazione Identificatore Servizio Esteso\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Indirizzo <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "Gateway <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+"Maschera di rete <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"Indirizzo <abbr title=\"Protocollo Internet Versione 6\">IPv6</abbr> o rete "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "Gateway <abbr title=\"Protocollo Internet Versione 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Configurazione <abbr title=\"Diodo ad Emissione di Luce\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Diodo ad Emissione di Luce\">LED</abbr> Nome"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Indirizzo <abbr title=\"Controllo Accesso Supporto\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> Contratto <abbr title=\"Configurazione "
+"Protocollo Host Dinamico\">DHCP</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> dimensione pacchetti <abbr title="
+"\"Estensione Meccanismi per il Sistema dei Nomi dei Domini\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">Max.</abbr> Richiesta in uso"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Accoppiata: %s / Gruppo: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Supporto AR"
+
+msgid "ARP retry threshold"
+msgstr "riprova soglia ARP"
+
+msgid "ATM Bridges"
+msgstr "Ponti ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Identificatore Canale Virtuale ATM (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Identificatore Percorso Virtuale ATM (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"I ponti ATM incapsulano connessioni in AAL5, in modo che i dispositivi "
+"virtuali si possono interfacciare con le reti virtuali Linux in congiunzione "
+"con la comunicazione DHCP o PPP dell'ISP."
+
+msgid "ATM device number"
+msgstr "Numero dispositivo ATM "
+
+msgid "Access Concentrator"
+msgstr "Accesso Concentratore"
+
+msgid "Access Point"
+msgstr "Punto di Accesso"
+
+msgid "Action"
+msgstr "Azione"
+
+msgid "Actions"
+msgstr "Azioni"
+
+msgid "Activate this network"
+msgstr "Attiva questa rete"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Instradamento <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr> "
+"attivo"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Instradamento <abbr title=\"Protocollo Internet Versione 6\">IPv6</abbr> "
+"attivo"
+
+msgid "Active Connections"
+msgstr "Connessioni attive"
+
+msgid "Active DHCP Leases"
+msgstr "Attiva contratti DHCP"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Attiva contratti DHCPv6"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Aggiungere il suffisso di dominio locale ai nomi serviti dal file hosts"
+
+msgid "Add new interface..."
+msgstr "Aggiungi nuova interfaccia..."
+
+msgid "Additional Hosts files"
+msgstr "File Hosts Aggiuntivo"
+
+msgid "Address"
+msgstr "Indirizzo"
+
+msgid "Address to access local relay bridge"
+msgstr "Indirizzo per accedere al ponte locale di trasmissione"
+
+msgid "Administration"
+msgstr "Amministrazione"
+
+msgid "Advanced Settings"
+msgstr "Opzioni Avanzate"
+
+msgid "Alert"
+msgstr "Avviso"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Permetti autenticazione <abbr title=\"Secure Shell\">SSH</abbr> tramite "
+"password"
+
+msgid "Allow all except listed"
+msgstr "Consenti tutti tranne quelli nell'elenco"
+
+msgid "Allow listed only"
+msgstr "Consenti solo quelli nell'elenco"
+
+msgid "Allow localhost"
+msgstr "Permetti localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Permetti agli host remoti di connettersi tramite ssh reindirizzando le porte"
+
+msgid "Allow root logins with password"
+msgstr "Permetti l'accesso a root con password"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Abilita l'utente root con l'accesso via password"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Permetti le risposte upstream nell'intervallo 127.0.0.0/8, per esempio nei "
+"servizi RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Usare sempre i canali a 40MHz anche se con le sovrapposizioni dei canali "
+"secondari. Utilizzando questa opzione non è conforme con gli standard IEEE "
+"802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Sarà creata una rete aggiuntiva se lasci questo senza spunta."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antenna 1"
+
+msgid "Antenna 2"
+msgstr "Antenna 2"
+
+msgid "Antenna Configuration"
+msgstr "Configurazione dell'Antenna"
+
+msgid "Any zone"
+msgstr "Qualsiasi Zona"
+
+msgid "Apply"
+msgstr "Applica"
+
+msgid "Applying changes"
+msgstr "Applica modifiche"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Assegna Interfacce..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Dispositivi Wi-Fi connessi"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Dispositivo Wireless Atheros 802.11%s"
+
+msgid "Authentication"
+msgstr "Autenticazione PEAP"
+
+msgid "Authoritative"
+msgstr "Autoritativo"
+
+msgid "Authorization Required"
+msgstr "Autorizzazione richiesta"
+
+msgid "Auto Refresh"
+msgstr "Aggironamento Automatico"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponibili"
+
+msgid "Available packages"
+msgstr "Pacchetti disponibili"
+
+msgid "Average:"
+msgstr "Media:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Indietro"
+
+msgid "Back to Overview"
+msgstr "Ritorna alla panoramica"
+
+msgid "Back to configuration"
+msgstr "Indietro alla configurazione"
+
+msgid "Back to overview"
+msgstr "Ritorna alla panoramica"
+
+msgid "Back to scan results"
+msgstr "Ritorno ai risultati della scansione"
+
+msgid "Background Scan"
+msgstr "Scansione in background"
+
+msgid "Backup / Flash Firmware"
+msgstr "Copia di Sicurezza / Flash Firmware"
+
+msgid "Backup / Restore"
+msgstr "Copia di Sicurezza / Ripristina"
+
+msgid "Backup file list"
+msgstr "Elenco dei file di cui effettuare una copia di sicurezza"
+
+msgid "Bad address specified!"
+msgstr "E' stato specificato un indirizzo errato!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Di seguito l'elenco dei file di cui effettuare la copia di sicurezza. Essa è "
+"composta dai file di configurazione modificati installati da opkg, file di "
+"base essenziali e i file di backup definiti dall'utente."
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Bogus NX Domain Override"
+msgstr "Ignora Dominio Bogus NX"
+
+msgid "Bridge"
+msgstr "Ponte"
+
+msgid "Bridge interfaces"
+msgstr "Interfacce Ponte"
+
+msgid "Bridge unit number"
+msgstr "Numero Unità Ponte"
+
+msgid "Bring up on boot"
+msgstr "Attivare all'avvio"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Dispositivo Wireless Broadcom 802.11%s"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Dispositivo Wireless Broadcom BCM%04x 802.11"
+
+msgid "Buffered"
+msgstr "Buffered"
+
+msgid "Buttons"
+msgstr "Pulsanti"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Uso CPU (%)"
+
+msgid "Cached"
+msgstr "Nella cache"
+
+msgid "Cancel"
+msgstr "Annulla"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Catena"
+
+msgid "Changes"
+msgstr "Modifiche"
+
+msgid "Changes applied."
+msgstr "Modifiche applicate."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Cambia la password di amministratore per accedere al dispositivo"
+
+msgid "Channel"
+msgstr "Canale"
+
+msgid "Check"
+msgstr "Verifica"
+
+msgid "Checksum"
+msgstr "Checksum"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Scegli la zona del firewall che si desidera assegnare a questa interfaccia. "
+"Selezionare <em>non specificato</em> per rimuovere l'interfaccia dalla zona "
+"associata o compilare il campo <em>crea</em> per definire una nuova zona e "
+"collegare l'interfaccia ad esso."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Segliere la/le rete/reti a cui vuoi collegare questa interfaccia wireless o "
+"riempire il campo <em>crea<em> per definire una nuova rete."
+
+msgid "Cipher"
+msgstr "Cifratura"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Premi su \"Genera archivio\" per scaricare un archivio tar di backup dei "
+"file di configurazione attuali. Per ripristinare il firmware al suo stato "
+"iniziale premi \"Esegui RIpristino\" (solo per firmware basati su squashfs)."
+
+msgid "Client"
+msgstr "Cliente"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "ID Cliente da inviare all'interno della richiesta DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Chiudi le connessioni inattive dopo x secondi, usa 0 per connessioni "
+"persistenti"
+
+msgid "Close list..."
+msgstr "Scegliere dall'elenco..."
+
+msgid "Collecting data..."
+msgstr "Raccolgo i dati..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Common Configuration"
+msgstr "Configurazioni Comuni"
+
+msgid "Compression"
+msgstr "Compressione"
+
+msgid "Configuration"
+msgstr "Configurazione"
+
+msgid "Configuration applied."
+msgstr "Configurazione salvata."
+
+msgid "Configuration files will be kept."
+msgstr "I file di configurazione verranno mantenuti."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Configura questo mount come memoria di sovrapposizione per il blocco-extroot"
+
+msgid "Confirmation"
+msgstr "Conferma"
+
+msgid "Connect"
+msgstr "Connetti"
+
+msgid "Connected"
+msgstr "Connesso"
+
+msgid "Connection Limit"
+msgstr "Limite connessioni"
+
+msgid "Connections"
+msgstr "Connessioni"
+
+msgid "Country"
+msgstr "Nazione"
+
+msgid "Country Code"
+msgstr "Codice Nazione"
+
+msgid "Cover the following interface"
+msgstr "Coprire la seguente interfaccia"
+
+msgid "Cover the following interfaces"
+msgstr "Coprire le seguenti interfacce"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Crea / Assegna zona firewall"
+
+msgid "Create Interface"
+msgstr "Crea Interfaccia"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Crea un ponte tra interfaccie multiple"
+
+msgid "Critical"
+msgstr "Critico"
+
+msgid "Cron Log Level"
+msgstr "Livello di log del Cron"
+
+msgid "Custom Interface"
+msgstr "Interfaccia personalizzata"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Personalizza la configurazione dei <abbr title=\"Light Emitting Diode\">LED</"
+"abbr> del sistema se possibile."
+
+msgid "DHCP Leases"
+msgstr "Contratta DHCP"
+
+msgid "DHCP Server"
+msgstr "Server DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP e DNS"
+
+msgid "DHCP client"
+msgstr "Client DHCP"
+
+msgid "DHCP-Options"
+msgstr "Opzioni DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Locazioni DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Inoltri DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "Default %d"
+msgstr "Predefinito %d"
+
+msgid "Default gateway"
+msgstr "Gateway predefinito"
+
+msgid "Default state"
+msgstr "Stato Predefinito"
+
+msgid "Define a name for this network."
+msgstr "Definisci un nome per questa rete."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Definisci opzioni DHCP aggiuntive, per esempio "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" fornisce differenti server DNS ai "
+"client."
+
+msgid "Delete"
+msgstr "Elimina"
+
+msgid "Delete this interface"
+msgstr "Rimuovi questa interfaccia"
+
+msgid "Delete this network"
+msgstr "Rimuovi questa rete"
+
+msgid "Description"
+msgstr "Descrizione"
+
+msgid "Design"
+msgstr "Disegno"
+
+msgid "Destination"
+msgstr "Destinazione"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "Device Configuration"
+msgstr "Configurazione del dispositivo"
+
+msgid "Diagnostics"
+msgstr "Diagnostica"
+
+msgid "Directory"
+msgstr "Cartella"
+
+msgid "Disable"
+msgstr "Disabilita"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Disabilita <abbr title=\"Protocollo di Configurazione Host Dinamico\">DHCP</"
+"abbr> per questa interfaccia."
+
+msgid "Disable DNS setup"
+msgstr "Disabilita il setup dei DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Disabilita Timer Beacon HW"
+
+msgid "Disabled"
+msgstr "Disabilitato"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Ignora risposte RFC1918 upstream"
+
+msgid "Displaying only packages containing"
+msgstr "Visualizza solo i pacchetti contenenti"
+
+msgid "Distance Optimization"
+msgstr "Ottimizzazione distanza"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distanza del membro più lontano della rete in metri."
+
+msgid "Diversity"
+msgstr "Diversità"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq è un server <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> e inoltratore <abbr title=\"Domain Name System\">DNS</abbr> "
+"per firewall <abbr title=\"Network Address Translation\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "Non memorizzare le repliche negative, es. per domini non esistenti"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Non inoltrare le richieste che non possono essere risolte dai name server "
+"pubblici"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Non proseguire con le ricerche inverse per le reti locali."
+
+msgid "Do not send probe responses"
+msgstr "Disabilita Probe-Responses"
+
+msgid "Domain required"
+msgstr "Dominio richiesto"
+
+msgid "Domain whitelist"
+msgstr "Elenco Domini consentiti"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Non inoltrare le richieste <abbr title=\"Domain Name System\">DNS</abbr> "
+"senza nome <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "Download and install package"
+msgstr "Scarica e installa pacchetto"
+
+msgid "Download backup"
+msgstr "Download backup"
+
+msgid "Dropbear Instance"
+msgstr "Instanza di Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear offre accesso <abbr title=\"Secure Shell\">SSH</abbr> e integra un "
+"server <abbr title=\"Secure Copy\">SCP</abbr>"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinamico"
+
+msgid "Dynamic tunnel"
+msgstr "Dynamic tunnel"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Fornisci dinamicamente gli indirizzi DHCP ai client. Se disabilitato, solo i "
+"client con un indirizzo statico saranno serviti."
+
+msgid "EAP-Method"
+msgstr "Metodo EAP"
+
+msgid "Edit"
+msgstr "Modifica"
+
+msgid "Edit this interface"
+msgstr "Modifica questa interfaccia"
+
+msgid "Edit this network"
+msgstr "Modifica questa rete"
+
+msgid "Emergency"
+msgstr "Emergenza"
+
+msgid "Enable"
+msgstr "Abilita"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Abilita <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Abilitazione aggiornamento endpoint dinamico HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Attiva la negoziazione IPv6 sul collegamento PPP"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Abilita Jumbo Frame passthrough"
+
+msgid "Enable NTP client"
+msgstr "Attiva il client NTP"
+
+msgid "Enable TFTP server"
+msgstr "Abilita il server TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Abilita la funzionalità VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Attivare l'apprendimento e l'invecchiamento"
+
+msgid "Enable this mount"
+msgstr "Abilita questo mount"
+
+msgid "Enable this swap"
+msgstr "Abilita questo swap"
+
+msgid "Enable/Disable"
+msgstr "Abilita/Disabilita"
+
+msgid "Enabled"
+msgstr "Abilitato"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Abilita il protocollo di Spanning Tree su questo bridge"
+
+msgid "Encapsulation mode"
+msgstr "Modalità di incapsulamento"
+
+msgid "Encryption"
+msgstr "Crittografia"
+
+msgid "Erasing..."
+msgstr "Cancellazione..."
+
+msgid "Error"
+msgstr "Errore"
+
+msgid "Ethernet Adapter"
+msgstr "Scheda di Rete"
+
+msgid "Ethernet Switch"
+msgstr "Switch di Rete"
+
+msgid "Expand hosts"
+msgstr "Espandi gli hosts"
+
+msgid "Expires"
+msgstr "Scadenze"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Tempo di scadenza di indirizzi localizzati, il minimo è di 2 minuti (<code> "
+"2m </ code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Server Log di Sistema esterno"
+
+msgid "External system log server port"
+msgstr "Porta Server Log di Sistema esterno"
+
+msgid "Fast Frames"
+msgstr "Frame veloci"
+
+msgid "File"
+msgstr "File"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Nome del file dell'immagine di avvio annunciato ai clienti."
+
+msgid "Filesystem"
+msgstr "Filesystem"
+
+msgid "Filter"
+msgstr "Filtro"
+
+msgid "Filter private"
+msgstr "Filtra privati"
+
+msgid "Filter useless"
+msgstr "Filtra inutili"
+
+msgid "Find and join network"
+msgstr "Trova e aggiungi una rete"
+
+msgid "Find package"
+msgstr "Cerca pacchetto"
+
+msgid "Finish"
+msgstr "Fine"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Impostazioni Firewall"
+
+msgid "Firewall Status"
+msgstr "Stato del Firewall"
+
+msgid "Firmware Version"
+msgstr "Versione del Firmware"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Porta di origine fissa per le richieste DNS in uscita"
+
+msgid "Flags"
+msgstr "Flags"
+
+msgid "Flash Firmware"
+msgstr "Flash Firmware"
+
+msgid "Flash image..."
+msgstr "Flash immagine..."
+
+msgid "Flash new firmware image"
+msgstr "Flash immagine nuovo firmware"
+
+msgid "Flash operations"
+msgstr "Operazioni Flash"
+
+msgid "Flashing..."
+msgstr "Flashing..."
+
+msgid "Force"
+msgstr "Forza"
+
+msgid "Force 40MHz mode"
+msgstr "Forza la modalità a 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Forza CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Forza DHCP su questa rete, anche se un altro server viene rilevato."
+
+msgid "Force TKIP"
+msgstr "Forza TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Forza TKIP e CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Inoltra il traffico DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Inoltra il traffico broadcast"
+
+msgid "Forwarding mode"
+msgstr "Modalità di Inoltro"
+
+msgid "Fragmentation Threshold"
+msgstr "Soglia di frammentazione"
+
+msgid "Frame Bursting"
+msgstr "Frame Bursting"
+
+msgid "Free"
+msgstr "Disponibile"
+
+msgid "Free space"
+msgstr "Spazio libero"
+
+msgid "Frequency Hopping"
+msgstr "Frequency Hopping"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Solo GPRS"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Gateway ports"
+msgstr "Porte Gateway"
+
+msgid "General Settings"
+msgstr "Opzioni Generali"
+
+msgid "General Setup"
+msgstr "Impostazioni Generali"
+
+msgid "Generate archive"
+msgstr "Genera Archivio"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Dispositivo Wireless 802.11%s Generico"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+"La conferma della password assegnata non ha prodotto risultati, la password "
+"non è stata cambiata!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Vai alla configurazione della password..."
+
+msgid "Go to relevant configuration page"
+msgstr "Vai alla pagina di configurazione relativa"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Password HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Gestore"
+
+msgid "Hang Up"
+msgstr "Hangup"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Qui puoi configurare gli aspetti base del tuo dispositivo come l&#39;"
+"hostname o il fuso orario."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Qui è possibile incollare le chiavi pubbliche SSH (uno per riga) per "
+"l'autenticazione con chiave pubblica SSH."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Dispositivo Wireless Hermes 802.11b"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Nascondi <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Campi host"
+
+msgid "Host expiry timeout"
+msgstr "Timeout scadenza Host"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"<abbr title=\"Internet Protocol Address\">IP</abbr> dell&#39;host o rete"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Nome host da inviare al momento della richiesta DHCP"
+
+msgid "Hostnames"
+msgstr "Hostname"
+
+msgid "IP address"
+msgstr "Indirizzo IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4 Firewall"
+
+msgid "IPv4 WAN Status"
+msgstr "Stato WAN IPv4"
+
+msgid "IPv4 address"
+msgstr "Indirizzi IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "trasmissione IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Gateway IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Maschera rete IPv4"
+
+msgid "IPv4 only"
+msgstr "Solo IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Lunghezza prefisso IPv4"
+
+msgid "IPv4-Address"
+msgstr "Indirizzo-IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6 Firewall"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Stato WAN IPv6"
+
+msgid "IPv6 address"
+msgstr "Indirizzi IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Gateway IPv6"
+
+msgid "IPv6 only"
+msgstr "Solo IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Prefisso IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Lunghezza prefisso IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "Indirizzo-IPv6"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-in-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-su-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-su-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Identità PEAP"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Se specificato, montare il dispositivo dal suo UUID invece che dal nodo di "
+"dispositivo fisso"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Se specificato, montare il dispositivo dall'etichetta della partizione al "
+"posto di un nodo di un dispositivo fisso"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Se deselezionata, alcun percorso predefinito è configurato"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+"Se deselezionata, gli indirizzi ai Server DNS annunciati saranno ignorati"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Se la tua memoria è insufficiente i dati non usati possono venire "
+"temporaneamente spostati in un'area di swap risultando in un più grande "
+"quantitativo di <abbr title=\"Random Access Memory\">RAM</abbr> usabile. "
+"Sappi che spostare dati in swap è un processo molto lento e che il "
+"dispositivo di swap non può essere acceduto alle alte velocità della <abbr "
+"title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ignora i files Hosts"
+
+msgid "Ignore interface"
+msgstr "Ignora interfaccia"
+
+msgid "Ignore resolve file"
+msgstr "Ignora file resolv"
+
+msgid "Image"
+msgstr "Immagine"
+
+msgid "In"
+msgstr "In"
+
+msgid "Inactivity timeout"
+msgstr "Tempo di Inattività"
+
+msgid "Inbound:"
+msgstr "in entrata:"
+
+msgid "Info"
+msgstr "Informazioni"
+
+msgid "Initscript"
+msgstr "Script di avvio"
+
+msgid "Initscripts"
+msgstr "Scripts di avvio"
+
+msgid "Install"
+msgstr "Installa"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Installa il pacchetto %q"
+
+msgid "Install protocol extensions..."
+msgstr "Installa le estensioni del protocollo..."
+
+msgid "Installed packages"
+msgstr "Pacchetti installati"
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid "Interface Configuration"
+msgstr "Configurazione Interfaccia"
+
+msgid "Interface Overview"
+msgstr "Riassunto Interfaccia"
+
+msgid "Interface is reconnecting..."
+msgstr "L'interfaccia si sta ricollegando..."
+
+msgid "Interface is shutting down..."
+msgstr "L'intefaccia si sta spegnendo..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Interfaccia non presente o non ancora connessa."
+
+msgid "Interface reconnected"
+msgstr "Interfaccia ricollegata."
+
+msgid "Interface shut down"
+msgstr "Interfaccia spenta"
+
+msgid "Interfaces"
+msgstr "Interfacce"
+
+msgid "Internal Server Error"
+msgstr "Errore del Server Interno"
+
+msgid "Invalid"
+msgstr "Valore immesso non valido"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "ID VLAN non valido! Solo gli ID compresi tra %d e %d sono consentiti."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "ID VLAN non valido! Solo gli ID unici sono consentiti"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Username o password non validi! Per favore riprova."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Sembra tu stia provando a flashare un'immagine più grande delle dimensioni "
+"della memoria flash, per favore controlla il file!"
+
+msgid "Java Script required!"
+msgstr "Richiesto Java Script!"
+
+msgid "Join Network"
+msgstr "Aggiungi Rete"
+
+msgid "Join Network: Settings"
+msgstr "Aggiunta Rete: Impostazioni"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Aggiunta Rete: Rilevamento Wireless"
+
+msgid "Keep settings"
+msgstr "Mantieni le Impostazioni"
+
+msgid "Kernel Log"
+msgstr "Log del kernel"
+
+msgid "Kernel Version"
+msgstr "Versione del kernel"
+
+msgid "Key"
+msgstr "Chiave"
+
+msgid "Key #%d"
+msgstr "Chiave #%d"
+
+msgid "Kill"
+msgstr "Uccidi"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Server L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr "fallimento soglia echo LCP"
+
+msgid "LCP echo interval"
+msgstr "Intervallo echo LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Etichetta"
+
+msgid "Language"
+msgstr "Lingua"
+
+msgid "Language and Style"
+msgstr "Lingua e Stile"
+
+msgid "Lease validity time"
+msgstr "Periodo di Validità del Lease"
+
+msgid "Leasefile"
+msgstr "File di lease"
+
+msgid "Leasetime"
+msgstr "Tempo di lease"
+
+msgid "Leasetime remaining"
+msgstr "Tempo lease residuo"
+
+msgid "Leave empty to autodetect"
+msgstr "Lasciare vuoto per l'autorilevamento"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Lasciare vuoto per usare l'indirizzo WAN attuale"
+
+msgid "Legend:"
+msgstr "Legenda:"
+
+msgid "Limit"
+msgstr "Limite"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Collegamento on"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Elenco di Server <abbr title=\"Sistema Nome Dimio\">DNS</abbr>a cui "
+"inoltrare le richieste in"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Elenco di domini da consentire le risposte RFC1918 per"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Elenco degli host che forniscono falsi risultati di dominio NX"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr "Ascolta solo l'interfaccia data o, se non specificato, su tutte"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Porta di ascolto per le richieste DNS in entrata"
+
+msgid "Load"
+msgstr "Carico"
+
+msgid "Load Average"
+msgstr "Carico Medio"
+
+msgid "Loading"
+msgstr "Caricamento"
+
+msgid "Local IPv4 address"
+msgstr "Indirizzo IPv4 locale"
+
+msgid "Local IPv6 address"
+msgstr "Indirizzo IPv6 locale"
+
+msgid "Local Startup"
+msgstr "Avvio Locale"
+
+msgid "Local Time"
+msgstr "Ora locale"
+
+msgid "Local domain"
+msgstr "Dominio Locale"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Specifiche dominio locale. I nomi di dominio corrispondenti a questi criteri "
+"non sono mai inoltrate e risolti solo da DHCP o file hosts"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Suffisso di dominio locale aggiunto ai nomi dei DHCP e voci del file hosts"
+
+msgid "Local server"
+msgstr "Server Locale"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Localizzare nome host a seconda della sottorete richiedente se sono "
+"disponibili IP multipli"
+
+msgid "Localise queries"
+msgstr "Localizza richieste"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Bloccato al canale %d utilizzato da %s"
+
+msgid "Log output level"
+msgstr "Livello di dettaglio registro"
+
+msgid "Log queries"
+msgstr "Logga richieste"
+
+msgid "Logging"
+msgstr "Logging"
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr "Filtro dei MAC-Address"
+
+msgid "MAC-Filter"
+msgstr "Filtro MAC"
+
+msgid "MAC-List"
+msgstr "Lista MAC"
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Velocità massima"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr "Velocità massima"
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr "Memoria"
+
+msgid "Memory usage (%)"
+msgstr "Uso Memory (%)"
+
+msgid "Metric"
+msgstr "Metrica"
+
+msgid "Minimum Rate"
+msgstr "Velocità minima"
+
+msgid "Minimum hold time"
+msgstr "Velocità minima"
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr "Modalità"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Dispositivo modem"
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr "Punto di mount"
+
+msgid "Mount Points"
+msgstr "Punto di mount"
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"I punti di mount definiscono in quale punto un dispositivo di memoria verrà "
+"attaccato al tuo filesystem"
+
+msgid "Mount options"
+msgstr "Opzioni di mount"
+
+msgid "Mount point"
+msgstr "Punto di mount"
+
+msgid "Mounted file systems"
+msgstr "File system montati"
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr "Velocità multicast"
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr "ID della NAS"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Name of the new interface"
+msgstr "Nome della nuova interfaccia"
+
+msgid "Name of the new network"
+msgstr "Nome della nuova rete"
+
+msgid "Navigation"
+msgstr "Navigazione"
+
+msgid "Netmask"
+msgstr "Maschera di rete"
+
+msgid "Network"
+msgstr "Rete"
+
+msgid "Network Utilities"
+msgstr "Utilità di Rete"
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr "Prossimo »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr "Nessun file trovato"
+
+msgid "No information available"
+msgstr "Nessuna informazione disponibile"
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr "Nessuna rete è configurata su questo dispositivo"
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr "Rumore"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr "Nessuno"
+
+msgid "Normal"
+msgstr "Normale"
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr "Non associato"
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr "Avviso"
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Configurazione di OPKG"
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"In questa pagina puoi configurare le interfacce di rete.Puoi unire più "
+"interfacce spuntando la voce \"unisci interfacce\" e inserendo i nomi di più "
+"interfacce di rete separate da spazi. Puoi anche usare la notazione <abbr "
+"title=\"Virtual Local Area Network\">VLAN</abbr> <samp>INTERFACCIA.VLANNUM</"
+"samp> (<abbr title=\"per esempio\">e.s.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr "Uno o più campi contengono valori non validi!"
+
+msgid "One or more required fields have no value!"
+msgstr "Uno o più campi obbligatori sono vuoti!"
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr "Opzione cambiata"
+
+msgid "Option removed"
+msgstr "Opzione cancellata"
+
+msgid "Options"
+msgstr "Opzioni"
+
+msgid "Other:"
+msgstr "Altro:"
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Riassunto"
+
+msgid "Owner"
+msgstr "Proprietario"
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr "Incapsulamento PPPoA"
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr "E' richiesto il pacchetto libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr "Nome pacchetto"
+
+msgid "Packets"
+msgstr "Pacchetti"
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Password authentication"
+msgstr "Password di authenticazione"
+
+msgid "Password of Private Key"
+msgstr "Password della chiave privata"
+
+msgid "Password successfully changed!"
+msgstr "Password cambiata con successo!"
+
+msgid "Path to CA-Certificate"
+msgstr "Percorso al certificato CA"
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr "Percorso alla chiave privata"
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr "Picco:"
+
+msgid "Perform reboot"
+msgstr "Esegui un riavvio"
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr "Per favore inserisci il tuo username e la password."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Per favore attendi: Riavvio del dispositivo..."
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Port %d"
+msgstr "Porta %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr "Impedisci la comunicazione fra Client"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr "Continuare"
+
+msgid "Processes"
+msgstr "Processi"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr "Soglia RTS/CTS"
+
+msgid "RX"
+msgstr ""
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Leggi <code>/etc/ethers</code> per configurare il server <abbr title="
+"\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Vuoi davvero spegnere questa interfaccia \"%s\" ?\\nPotresti perdere "
+"l'accesso a questo router se stai usando questa interfaccia."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr "Connessioni in tempo reale"
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr "Carico in tempo reale"
+
+msgid "Realtime Traffic"
+msgstr "Traffico in tempo reale"
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr "Riavvia"
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr "Riavvia il sistema operativo del tuo dispositivo"
+
+msgid "Receive"
+msgstr "Ricezione"
+
+msgid "Receiver Antenna"
+msgstr "Antenna ricevente"
+
+msgid "Reconnect this interface"
+msgstr "Ricollega questa interfaccia"
+
+msgid "Reconnecting interface"
+msgstr "Sto ricollegando l'interfaccia"
+
+msgid "References"
+msgstr ""
+
+msgid "Regulatory Domain"
+msgstr ""
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr "Rimuovi"
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr "Sostituisci campo"
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Reset Counters"
+msgstr "Azzera Contatori"
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr "File Resolve"
+
+msgid "Restart"
+msgstr "Riavvia"
+
+msgid "Restart Firewall"
+msgstr "Riavvia Firewall"
+
+msgid "Restore backup"
+msgstr "Ripristina backup"
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr "Ripristina"
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr "Route"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Le route specificano attraverso quale interfaccia e gateway un certo host o "
+"rete può essere raggiunto."
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid "Save"
+msgstr "Salva"
+
+msgid "Save & Apply"
+msgstr "Salva & applica"
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr "Scan"
+
+msgid "Scheduled Tasks"
+msgstr "Operazioni programmate"
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr "Isola utenti"
+
+msgid "Separate WDS"
+msgstr "WDS separati"
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr "Servizi"
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr "Segnale"
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr "Dimensione"
+
+msgid "Skip"
+msgstr "Salta"
+
+msgid "Skip to content"
+msgstr "Salta a contenuto"
+
+msgid "Skip to navigation"
+msgstr "Salta a navigazione"
+
+msgid "Slot time"
+msgstr "Slot time"
+
+msgid "Software"
+msgstr "Software"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Alcuni campi non sono validi, non è possibile salvare i valori!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Siamo spiacenti, l'oggetto che hai richiesto non è stato trovato."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Spiacente, il server ha rilevato un errore imprevisto."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Spiacenti, non è presente alcun supporto sysupgrade, una nuova immagine "
+"firmware deve essere memorizzata (Flash) manualmente. Si prega di fare "
+"riferimento al wiki di libreCMC per le istruzioni di installazione di "
+"dispositivi specifici."
+
+msgid "Sort"
+msgstr "Elenca"
+
+msgid "Source"
+msgstr "Origine"
+
+msgid "Specifies the button state to handle"
+msgstr "Specifica lo stato del pulsante da gestire"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Specifica la cartella a cui è collegato il dispositivo in"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Specifica la porta di ascolto di questa istanza <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Consente di specificare la quantità massima di richieste ARP fallite finché "
+"gli host si presume siano morti."
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Specifica la quantità massima di secondi dopo di che si presume che gli host "
+"siano morti."
+
+msgid "Specify the secret encryption key here."
+msgstr "Specificare la chiave di cifratura qui."
+
+msgid "Start"
+msgstr "Inizio"
+
+msgid "Start priority"
+msgstr "Priorità di avvio"
+
+msgid "Startup"
+msgstr "Avvio"
+
+msgid "Static IPv4 Routes"
+msgstr "Instradamento statico IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Instradamento statico IPv6"
+
+msgid "Static Leases"
+msgstr "Leases statici"
+
+msgid "Static Routes"
+msgstr "Instradamenti Statici"
+
+msgid "Static WDS"
+msgstr "WDS statico"
+
+msgid "Static address"
+msgstr "Indirizzo Statico"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Leasing statici vengono utilizzati per assegnare indirizzi IP fissi e nomi "
+"host simbolici ai client DHCP. Essi sono necessari anche per interfacce di "
+"configurazione non dinamici, dove solo gli host con lease corrispondente "
+"servito vengono serviti."
+
+msgid "Status"
+msgstr "Stato"
+
+msgid "Stop"
+msgstr "Ferma"
+
+msgid "Strict order"
+msgstr "Ordine severo"
+
+msgid "Submit"
+msgstr "Invia"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Scambia ingresso"
+
+msgid "Switch"
+msgstr "Switch"
+
+msgid "Switch %q"
+msgstr "Switch %q"
+
+msgid "Switch %q (%s)"
+msgstr "Switch %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Cambia protocollo"
+
+msgid "Sync with browser"
+msgstr "Sincronizza con il browser"
+
+msgid "Synchronizing..."
+msgstr "Sincronizzazione..."
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "System Log"
+msgstr "Log di sistema"
+
+msgid "System Properties"
+msgstr "Proprietà di Sistema"
+
+msgid "System log buffer size"
+msgstr "Dimensione Buffer Log di Sistema"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Impostazioni TFTP"
+
+msgid "TFTP server root"
+msgstr "Server TFTP principale"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "Velocità di TX"
+
+msgid "Table"
+msgstr "Tabella"
+
+msgid "Target"
+msgstr "Destinazione"
+
+msgid "Terminate"
+msgstr "Termina"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"La sezione <em>Configurazione del Dispositivo</em> illustra le impostazioni "
+"fisiche del hardware radio come canale, la potenza di trasmissione o la "
+"selezione dell'antenna che viene condiviso tra tutte le reti wireless "
+"definite (se l'hardware radio è multi-SSID compatibilie). Per le "
+"impostazioni di rete come la crittografia o la modalità di funzionamento "
+"sono raggruppati nella <em>configurazione dell'interfaccia</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Il pacchetto <em>libiwinfo-lua</em> non è installato. È necessario "
+"installare questo componente per il lavoro di configurazione wireless!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"Il prefisso IPv6 assegnati dal provider, si conclude di solito con <code>::</"
+"code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"Il file del dispositivo di memoria o della partizione (<abbr title=\"per "
+"esempio\">e.s.</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Il filesystem usato per formattare la memoria (<abbr title=\"per esempio\">e."
+"s.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr "Le seguenti modifiche sono state annullate"
+
+msgid "The following rules are currently active on this system."
+msgstr "Le seguenti regole sono al momento attive su questo sistema."
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes until you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Questo è l&#39;unico server <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> nella tua rete locale"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Questa è la crontab del sistema nella quale possono essere definiti le "
+"operazioni da programmare."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Questa lista da un riassunto dei processi correntemente attivi e del loro "
+"stato."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Questa pagina ti da una riassunto delle connessioni al momento attive."
+
+msgid "This section contains no values yet"
+msgstr "Questa sezione non contiene ancora valori"
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr "Fuso orario"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr "Totale"
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr "Traffico"
+
+msgid "Transfer"
+msgstr ""
+
+msgid "Transmission Rate"
+msgstr "Velocità di transmissione"
+
+msgid "Transmit"
+msgstr "Trasmissione"
+
+msgid "Transmit Power"
+msgstr "Potenza di trasmissione"
+
+msgid "Transmitter Antenna"
+msgstr "Antenna trasmettente"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Modalità turbo"
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr "Tipo"
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr "Modifiche non salvate"
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Carica un'immagine sysupgrade compatibile quì per sostituire il firmware in "
+"esecuzione. Attivare la spunta \"Mantieni Impostazioni\" per mantenere la "
+"configurazione corrente (richiede un immagine del firmware libreCMC "
+"compatibile)."
+
+msgid "Upload archive..."
+msgstr "Carica archivio..."
+
+msgid "Uploaded File"
+msgstr "Invia file"
+
+msgid "Uptime"
+msgstr "Tempo di attività"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Usa <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Usa il DHCP del gateway"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Usa i server DNS annunciati dal peer"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Usa i codici delle nazioni ISO/IEC 3166 alpha2."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Usa MTU nel tunnel dell'interfaccia"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Usa TTL nel tunnel dell'interfaccia"
+
+msgid "Use as root filesystem"
+msgstr "Utilizzare come filesystem di root"
+
+msgid "Use broadcast flag"
+msgstr "Usa flag broadcast"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Usa server DNS personalizzati"
+
+msgid "Use default gateway"
+msgstr "Usa il gateway predefinito"
+
+msgid "Use gateway metric"
+msgstr "Usa la metrica del gateway"
+
+msgid "Use routing table"
+msgstr "Utilizzare tabella di instradamento"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Utilizzare il pulsante <em>Aggiungi</ em> per aggiungere una nuova voce di "
+"locazione. L'<em>Indirizzo-MAC</ em> identifica l'host, l'<em>Indirizzo-"
+"IPv4</ em> specifica l'indirizzo fisso da utilizzare e il <em> Nome Host</ "
+"em> è assegnato come nome simbolico alla richiesta dell'host."
+
+msgid "Used"
+msgstr "Usato"
+
+msgid "Used Key Slot"
+msgstr "Slot Chiave Usata"
+
+msgid "Username"
+msgstr "Nome Utente"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Interfaccia VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANs su %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs su %q (%s)"
+
+msgid "VPN Server"
+msgstr "Server VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Classe del Produttore da 'inviare al momento della richiesta DHCP"
+
+msgid "Verify"
+msgstr "Verifica"
+
+msgid "Version"
+msgstr "Versione"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Sistema Aperto WEP"
+
+msgid "WEP Shared Key"
+msgstr "Chiave Condivisa WEP"
+
+msgid "WEP passphrase"
+msgstr "frase di accesso WEP"
+
+msgid "WMM Mode"
+msgstr "Modalità WMM"
+
+msgid "WPA passphrase"
+msgstr "frase di accesso WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"La crittografia WPA richiede wpa_supplicant (per la modalità client) o "
+"hostapd (per AP e modalità ad hoc) per essere installato."
+
+msgid "Waiting for changes to be applied..."
+msgstr "In attesa delle modifiche da applicare ..."
+
+msgid "Waiting for command to complete..."
+msgstr "In attesa del comando da completare..."
+
+msgid "Warning"
+msgstr "Avviso"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Attenzione: Ci sono modifiche non salvate che verranno persi riavviando!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless Adapter"
+msgstr "Dispositivo Wireless"
+
+msgid "Wireless Network"
+msgstr "Rete Wireless"
+
+msgid "Wireless Overview"
+msgstr "Panoramica Wireless"
+
+msgid "Wireless Security"
+msgstr "Sicurezza Wireless"
+
+msgid "Wireless is disabled or not associated"
+msgstr "La rete Wireless è disattivata o non associata"
+
+msgid "Wireless is restarting..."
+msgstr "Riavvio della Wireless..."
+
+msgid "Wireless network is disabled"
+msgstr "La rete Wireless è disattivata"
+
+msgid "Wireless network is enabled"
+msgstr "La rete wireless è attivata"
+
+msgid "Wireless restarted"
+msgstr "Wireless riavviato"
+
+msgid "Wireless shut down"
+msgstr "Wireless spento"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Scrittura delle richiesta DNS ricevute nel syslog"
+
+msgid "XR Support"
+msgstr "Supporto XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"È possibile abilitare o disabilitare gli script di inizializzazione "
+"installati qui. Le modifiche saranno applicate dopo il riavvio del "
+"dispositivo <br/><strong>Attenzione: Se si disattiva gli script di "
+"inizializzazione essenziali come ad esempio la \"rete\", il dispositivo "
+"potrebbe diventare inaccessibile!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"È necessario attivare Java Script nel tuo browser o LuCI non funzionerà "
+"correttamente."
+
+msgid "any"
+msgstr "qualsiasi"
+
+msgid "auto"
+msgstr "auto"
+
+#, fuzzy
+msgid "automatic"
+msgstr "statico"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "ponte"
+
+msgid "create:"
+msgstr "crea:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "Crea un ponte sulle interfacce selezionate"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "disabilita"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "scaduto"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"file dove vengono salvati le richieste <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr> assegnate"
+
+msgid "forward"
+msgstr "inoltro"
+
+msgid "full-duplex"
+msgstr "full-duplex"
+
+msgid "half-duplex"
+msgstr "half-duplex"
+
+msgid "help"
+msgstr "aiuto"
+
+msgid "hidden"
+msgstr "nascosto"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "se la destinazione è una rete"
+
+msgid "input"
+msgstr "ingresso"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "File <abbr title=\"Sistema Nome Dominio\">DNS</abbr> locale"
+
+msgid "no"
+msgstr "no"
+
+msgid "no link"
+msgstr "Nessun collegamento"
+
+msgid "none"
+msgstr "nessuna"
+
+msgid "off"
+msgstr "spento"
+
+msgid "on"
+msgstr "acceso"
+
+msgid "open"
+msgstr "apri"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "instradato"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "etichettato"
+
+msgid "unknown"
+msgstr "sconosciuto"
+
+msgid "unlimited"
+msgstr "illimitato"
+
+msgid "unspecified"
+msgstr "non specificato"
+
+msgid "unspecified -or- create:"
+msgstr "non specificato - o - creato:"
+
+msgid "untagged"
+msgstr "non etichettato"
+
+msgid "yes"
+msgstr "Sì"
+
+msgid "« Back"
+msgstr "« Indietro"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "ID Utente HE.net"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "secondo canale superiore a 40MHz"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "secondo canale inferiore a 40MHz"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Accetta gli annunci di router"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Annuncia IPv6 sulla rete"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ID di Rete Annunciato"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Intervallo permesso 1-65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "capacità HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Modalità HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Modello Router"
+
+#~ msgid "Router Name"
+#~ msgstr "Nome Router"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr ""
+#~ "Specifica la durata dell'annuncio con prefisso preferito della durata in "
+#~ "secondi"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr ""
+#~ "Specifica la validità dell'annuncio con prefisso preferito della durata "
+#~ "in secondi"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Utilizzare durata preferita"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Utilizzare durata valida"
+
+#~ msgid "Active Leases"
+#~ msgstr "Lease attivi"
+
+#~ msgid "Open"
+#~ msgstr "Apri"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Bit Rate"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Configurazione / Applica"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Configurazioni / cambiamenti"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Configuration / Annullali"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encrypted\">Encr.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Wireless Local Area Network\">Scansione WLAN</abbr>"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Scegli quale rete vuoi attaccare all'interfaccia wireless. Selezionando "
+#~ "<em>unspecified</em> per non associarne alcuna o <em>create</em> per "
+#~ "definirne una nuova ora."
+
+#~ msgid "Create Network"
+#~ msgstr "Crea rete"
+
+#~ msgid "Link"
+#~ msgstr "Collegamento"
+
+#~ msgid "Networks"
+#~ msgstr "Reti"
+
+#~ msgid "Power"
+#~ msgstr "Potenza"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Reti Wifi nell&#39;ambiente circostante"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "Notazione <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
+#~ "indirizzo/prefisso"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "Broadcast <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Indirizzo <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Nota: Se scegli un interfaccia qui che fa parte di un altro network, sarà "
+#~ "spostata in questo network."
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Vuoi davvero cancellare questa interfaccia? Non potrai tornare indietro!"
+#~ "\\nPotresti perdere l'accesso a questo router se stai usando questa "
+#~ "interfaccia."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Vuoi davvero cancellare questa rete wireless? Non potrai tornare indietro!"
+#~ "\\nPotresti perdere l'accesso a questo router se stai usando questa rete."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Le porte di rete del tuo router possono essere combinate in molte <abbr "
+#~ "title=\"Virtual Local Area Network\">VLAN</abbr> nelle quali i computer "
+#~ "possono comunicare direttamente fra di loro. Le <abbr title=\"Virtual "
+#~ "Local Area Network\">VLAN</abbr> sono spesso usate per separare segmenti "
+#~ "di rete differenti. Spesso c&#39;è come predefinita una porta per la "
+#~ "connessione alla prossiam rete più grande come Internet e altre porte per "
+#~ "le reti locali."
+
+#~ msgid "Custom Files"
+#~ msgstr "Files personalizzati"
+
+#~ msgid "Custom files"
+#~ msgstr "Files personalizzati"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Files da conservare quando si aggiorna un nuovo firmware"
+
+#~ msgid "General"
+#~ msgstr "Generale"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Qui puoi personalizzare i settaggi e le funzionalità di <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Azioni post-modifica"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Questi comandi verranno eseguiti automaticamente quando un comando di "
+#~ "configurazione <abbr title=\"Unified Configuration Interface\">UCI</abbr> "
+#~ "viene applicato permettendo alle modifiche di essere applicate "
+#~ "immediatamente."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "<abbr title=\"User Interface\">UI</abbr> web"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "Server <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "tentativi ping ARP "
+
+#~ msgid "ATM Settings"
+#~ msgstr "Impostazioni ATM"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "Accetta annunciamenti router"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Access point (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Opzioni pppd aggiuntive"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "Intervallo ammesso è tra 1 e FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Disconnetti automaticamente"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Archivio di backup"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configura il server DNS locale per usare i server DNS negoziati da PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Script connessione"
+
+#~ msgid "Create backup"
+#~ msgstr "Crea un backup"
+
+#~ msgid "Default"
+#~ msgstr "Default"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Script disconnessione"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Modifica lista dei pacchetti e destinazione dell'installazione"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "Abilita 4K VLANs"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Attiva IPv6 sul collegamento PPP"
+
+#, fuzzy
+#~ msgid "Firmware image"
+#~ msgstr "Firmware image"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Qui puoi salvare e ripristinare la configurazione del tuo router e - se "
+#~ "possibile - resettare il router con le impostazioni predefinite."
+
+#~ msgid "Installation targets"
+#~ msgstr "Destinazione installazione"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Conserva i files di configurazione"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid "Kernel"
+#~ msgstr "Kernel"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Consenti a pppd di sostituire la route di default con la route corrente "
+#~ "per usare l&#39;interfaccia PPP dopo una connessione riuscita"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr ""
+#~ "Permette a pppd di avviare questo script dopo l&#39;avvenuta connessione "
+#~ "PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr ""
+#~ "Permette a pppd di avviare questo script prima della disconnessione PPP"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Fai attenzione di inserire il codice PIN corretto qui o potresti bloccare "
+#~ "la tua sim card!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "Molti di loro sono servers, che offrono un determinato servizio al tuo "
+#~ "dispositivo o alla tua rete come accesso shell, servire pagine web come "
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>, fare mesh "
+#~ "routing, inviare e-mails, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr "Numero di test di connettività falliti prima di una riconnessione"
+
+#~ msgid "PIN code"
+#~ msgstr "Codice PIN"
+
+#~ msgid "PPP Settings"
+#~ msgstr "Opzioni PPP"
+
+#~ msgid "Package lists"
+#~ msgstr "Lista pacchetti"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr ""
+#~ "Procedi annullando tutte le modifiche e resettando ai predefiniti del "
+#~ "firmware?"
+
+#~ msgid "Processor"
+#~ msgstr "Processore"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Porta Radius"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Server Radius"
+
+#~ msgid "Relay Settings"
+#~ msgstr "Opzioni Relay"
+
+#~ msgid "Replace default route"
+#~ msgstr "Sostituisci route di default"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Ripristina il router come predefinito"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Secondi da attendere prima che il modem diventi pronto prima di provare a "
+#~ "connettersi"
+
+#~ msgid "Service type"
+#~ msgstr "Tipo di servizio"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "Servizi e demoni svolgono alcune azioni sul tuo dispositivo."
+
+#~ msgid "Settings"
+#~ msgstr "Impostazioni"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Tempo di attesa inizializzazione"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Specifica opzioni linea di comando aggiuntive per pppd qui"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Il device node del tuo modem, e.s. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr ""
+#~ "Tempo (in secondi) dopo il quale una connessione inattiva verrà chiusa"
+
+#~ msgid "Update package lists"
+#~ msgstr "Aggiorna lista pacchetti"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Upload an libreCMC image file to reflash the device."
+
+#~ msgid "Upload image"
+#~ msgstr "Upload image"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Usa DNS ottenuti"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Devi installare \"comgt\" per il supporto UMTS/GPRS, \"ppp-mod-pppoe\" "
+#~ "per PPPoE, \"ppp-mod-pppoa\" per PPPoA e \"pptp\" per PPtP"
+
+#~ msgid "back"
+#~ msgstr "indietro"
+
+#~ msgid "buffered"
+#~ msgstr "in buffer"
+
+#~ msgid "cached"
+#~ msgstr "in cache"
+
+#~ msgid "free"
+#~ msgstr "libera"
+
+#~ msgid "static"
+#~ msgstr "statico"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> è una collezione "
+#~ "di software libero scritto in Lua comprendente un Webframework e "
+#~ "interfaccia web <abbr title=\"Model-View-Controller\">MVC</abbr> per "
+#~ "dispositivi integrati. <abbr title=\"Lua Configuration Interface\">LuCI</"
+#~ "abbr> è rilasciato sotto la Apache-License."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "Chiavi <abbr title=\"Secure Shell\">SSH</abbr>s"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Un piccolo e leggero web-server scritto in C è disegnato per integrarsi "
+#~ "con LuCi"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Un piccolo webserver che può essere usato per servire <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "Informazioni su"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "Connessioni IP attive"
+
+#~ msgid "Addresses"
+#~ msgstr "Indirizzi"
+
+#~ msgid "Admin Password"
+#~ msgstr "Password di Amministratore"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Authentication Realm"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Porta Bridge"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Cambia la password dell'amministratore di sistema (Utente <code>root</"
+#~ "code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Client + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "File di configurazione"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Timeout Connessione"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Contributing Developers"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP assegnato"
+
+#~ msgid "Document root"
+#~ msgstr "Radice dei documenti"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Abilita Keep-Alive"
+
+#~ msgid "Enable device"
+#~ msgstr "Abilita dispositivo"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Qui puoi incollare le tue chiavi <abbr title=\"Secure Shell\">SSH</abbr> "
+#~ "(una per linea) per l&#39;autenticazione <abbr title=\"Secure Shell"
+#~ "\">SSH</abbr> a chiave pubblica."
+
+#~ msgid "Interface Status"
+#~ msgstr "Stato Interfaccia"
+
+#~ msgid "Lead Development"
+#~ msgstr "Lead Development"
+
+#~ msgid "No address configured on this interface."
+#~ msgstr "Nessun indirizzo è configurato su questa interfaccia."
+
+#~ msgid "Not configured"
+#~ msgstr "Non configurato"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Password cambiata con successo"
+
+#~ msgid "Plugin path"
+#~ msgstr "Percorso plugin"
+
+#~ msgid "Ports"
+#~ msgstr "Porte"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Sito del progetto"
+
+#~ msgid "Thanks To"
+#~ msgstr "Ringraziamenti"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "Il realm che verrà visualizzato al prompt di autenticazione per le pagine "
+#~ "protette."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Errore sconosciuto"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "predefinito <code>/etc/httpd.conf</code>"
+
+#~ msgid "Enable this switch"
+#~ msgstr "Abilita questo switch"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG codice di errore %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Lista pacchetti aggiornata"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Upgrade installed packages"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Inoltre i log del kernel o dei servizi sono visualizzabili qui per avere "
+#~ "un riassunto dello stato attuale."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Qui puoi trovare informazione sullo stato del sistema come frequenza di "
+#~ "clock della <abbr title=\"Central Processing Unit\">CPU</abbr>, uso della "
+#~ "memoria o dati della scheda di rete."
+
+#~ msgid "Search file..."
+#~ msgstr "Cerca file..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> è un&#39;"
+#~ "interfaccia grafica gratuita, flessibile, e amichevole per configurare "
+#~ "libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "Ed ora buon divertimento con il tuo router!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "dal momento che vogliamo migliorare quest&#39;interfaccia accettiamo "
+#~ "suggerimenti."
+
+#~ msgid "Hello!"
+#~ msgstr "Ciao!"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Nota: Le modifiche devono essere confermate in <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr> cliccando Modifiche - Salva e "
+#~ "Applica prima di essere applicate."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Nelle seguenti pagine puoi impostare tutti i settaggi più importanti del "
+#~ "tuo router"
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "Il Team di <abbr title=\"Lua Configuration Interface\">LuCI</abbr>"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Questa è l&#39;area d&#39;amministrazione di <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Interfaccia utente"
+
+#~ msgid "enable"
+#~ msgstr "abilita"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr " (opzionale)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "Porta <abbr title=\"Domain Name System\">DNS</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "I server <abbr title=\"Domain Name System\">DNS</abbr> verranno "
+#~ "contattati nell&#39;ordine del file resolv"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "Numero massimo di lease <abbr title=\"Dynamic Host Configuration Protocol"
+#~ "\">DHCP</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "Dimensione massima pacchetto <abbr title=\"Extension Mechanisms for "
+#~ "Domain Name System\">EDNS0</abbr>"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "Isolazione AP"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Aggiungi la rete Wifi alla rete fisica"
+
+#~ msgid "Aliases"
+#~ msgstr "Alias"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Crea rete"
+
+#~ msgid "Devices"
+#~ msgstr "Dispositivi"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Non inoltrare richieste per le reti locali"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Abilita server TFTP"
+
+#~ msgid "Errors"
+#~ msgstr "Errori"
+
+#~ msgid "Essentials"
+#~ msgstr "Essenziali"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Espandi host"
+
+#~ msgid "First leased address"
+#~ msgstr "Primo indirizzo offerto"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Hardware Address"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Qui puoi configurare i tuoi dispositivi wireless installati."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignora <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Independente (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Connessione Internet"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Partecipa (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Lease"
+
+#~ msgid "Local Domain"
+#~ msgstr "Dominio locale"
+
+#~ msgid "Local Network"
+#~ msgstr "Rete locale"
+
+#~ msgid "Local Server"
+#~ msgstr "Server locale"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Immagine boot da rete"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Nome rete (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Numero di indirizzi offerti"
+
+#~ msgid "Path"
+#~ msgstr "Percorso"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Esegui azioni"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Impedisci la comunicazione fra Client"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Offri (Access Point)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "File resolv"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Radice del server TFTP"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Le seguenti modifiche sono state applicate"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Quando si aggiorna un firmware con <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> questi files verranno aggiunti al nuovo firmware."
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Con <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> i "
+#~ "membri della rete possono ricevere automaticamente le loro impostazioni "
+#~ "di rete (indirizzi <abbr title=\"Internet Protocol\">IP</abbr>, maschere "
+#~ "di rete, server <abbr title=\"Domain Name System\">DNS</abbr>, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Puoi avere più reti wifi con un solo dispositivo. Sappi ceh ci sono "
+#~ "alcune restrizioni relative all&#39;hardware ed al driver.Normalmente "
+#~ "puoi avere 1 rete Ad-Hoc o fino a 3 reti Master e uan rete in modalità "
+#~ "Client contemporaneamente."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Devi installare \"ppp-mod-pppoe\" per il supporto PPPoE e \"pptp\" per "
+#~ "PPtP"
+
+#~ msgid "additional hostfile"
+#~ msgstr "file hosts aggiuntivo"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "aggiungi nomi di dominio nel file resolv"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "riconnetti automaticamente"
+
+#~ msgid "concurrent queries"
+#~ msgstr "richieste contemporanee"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "disabilita <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+#~ "abbr> per queste interfacce"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "disconnetti quando non usata per"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "non tenere sconosciuti in cache"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "Filtra richieste <abbr title=\"Domain Name System\">DNS</abbr> inutili di "
+#~ "sistemi windows"
+
+#~ msgid "installed"
+#~ msgstr "installato"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "localizza l&#39;hostname a seconda delle sue sottoreti"
+
+#~ msgid "not installed"
+#~ msgstr "non installato"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "impedisci la cache di risposte <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr> negative"
+
+#~ msgid "query port"
+#~ msgstr "porta per le richieste"
+
+#~ msgid "transmitted / received"
+#~ msgstr "transmessi / ricevuti"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "Rete"
+
+#~ msgid "all"
+#~ msgstr "tutti"
+
+#~ msgid "Code"
+#~ msgstr "Codice"
+
+#~ msgid "Distance"
+#~ msgstr "Distanza"
+
+#~ msgid "Legend"
+#~ msgstr "Legenda"
+
+#~ msgid "Library"
+#~ msgstr "Libreria"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "leggi il manuale di &#39;%s&#39;"
+
+#~ msgid "Package Manager"
+#~ msgstr "Gestore pacchetti"
+
+#~ msgid "Service"
+#~ msgstr "Servizio"
+
+#~ msgid "Statistics"
+#~ msgstr "Statistiche"
+
+#~ msgid "zone"
+#~ msgstr "Zona"
diff --git a/trunk/package/luci/po/it/commands.po b/trunk/package/luci/po/it/commands.po
new file mode 100644
index 00000000..c14b910f
--- /dev/null
+++ b/trunk/package/luci/po/it/commands.po
@@ -0,0 +1,99 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-03 13:52+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Una breve descrizione testuale del comando configurato"
+
+msgid "Access command with"
+msgstr "Accesso comando con"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Consentire l'esecuzione del comando e il download del suo output senza "
+"previa autenticazione"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+"Consente all'utente di fornire ulteriori argomenti della riga di comando"
+
+msgid "Arguments:"
+msgstr "Argomenti:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "I dati binari non vengono visualizzati, ma possono essere scaricati."
+
+msgid "Code:"
+msgstr "Codice:"
+
+msgid "Collecting data..."
+msgstr "Raccolta dei dati..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Command failed"
+msgstr "Comando fallito"
+
+msgid "Command line to execute"
+msgstr "Riga di comando da eseguire"
+
+msgid "Command successful"
+msgstr "Comando riuscito"
+
+msgid "Command:"
+msgstr "Comando:"
+
+msgid "Configure"
+msgstr "Configura"
+
+msgid "Custom Commands"
+msgstr "Comandi Personalizzati"
+
+msgid "Custom arguments"
+msgstr "Argomenti Personalizzati"
+
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgid "Description"
+msgstr "Descrizione"
+
+msgid "Download"
+msgstr "Download"
+
+msgid "Failed to execute command!"
+msgstr "Impossibile eseguire il comando!"
+
+msgid "Link"
+msgstr "Collegamento"
+
+msgid "Loading"
+msgstr "Caricamento"
+
+msgid "Public access"
+msgstr "Accesso Pubblico"
+
+msgid "Run"
+msgstr "Esegui"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Questa pagina consente di configurare i comandi della shell personalizzate "
+"che possono essere facilmente richiamati dall'interfaccia web."
+
+msgid "Waiting for command to complete..."
+msgstr "In attesa del comando da completare..."
diff --git a/trunk/package/luci/po/it/coovachilli.po b/trunk/package/luci/po/it/coovachilli.po
new file mode 100644
index 00000000..dbf5b963
--- /dev/null
+++ b/trunk/package/luci/po/it/coovachilli.po
@@ -0,0 +1,75 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2013-02-03 13:43+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Configurazione della Rete"
+
+msgid "RADIUS configuration"
+msgstr "Configurazione RAGGIO"
+
+msgid "UAM and MAC Authentication"
+msgstr "Autenticazione UAM e MAC"
+
+#~ msgid "General configuration"
+#~ msgstr "Configurazione generale"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Impostazioni generali di CoovaChilli"
+
+#~ msgid "Command socket"
+#~ msgstr "Socket di comando"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "Socket UNIX usato per la comunicazione con chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Intervallo di aggiornamento configurazione"
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Rilegge il file di configurazione ed esegue una ricerca DNS ogni "
+#~ "intervallo in secondi. Questo ha lo stesso risultato dell'invio del "
+#~ "segnale HUP. Se l'intervallo è 0 (zero) questa funzionalità è "
+#~ "disabilitata."
+
+#~ msgid "Pid file"
+#~ msgstr "File Pid"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "Configurazione TUN/TAP"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Configurazione Rete/TUN"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Server DNS Primario"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Server DNS Secondario"
+
+#~ msgid "Domain name"
+#~ msgstr "Nome di dominio"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Specifica un pool di indirizzi IP dinamici"
+
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr "Indirizzo di rete dell'interfaccia di uplink (CIDR notazione)"
diff --git a/trunk/package/luci/po/it/ddns.po b/trunk/package/luci/po/it/ddns.po
new file mode 100644
index 00000000..9b16f399
--- /dev/null
+++ b/trunk/package/luci/po/it/ddns.po
@@ -0,0 +1,89 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-02-03 13:53+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Controlla se cambia l'IP ogni"
+
+msgid "Check-time unit"
+msgstr "Check-time unit"
+
+msgid "Custom update-URL"
+msgstr "URL di aggiornamento personalizzato"
+
+msgid "Dynamic DNS"
+msgstr "DNS Dinamico"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"DNS Dinamico permette al tuo router di essere raggiunto con un indirizzo "
+"statico anche nel caso in cui tu disponga di un indirizzo IP dinamico."
+
+msgid "Enable"
+msgstr "Abilita"
+
+msgid "Force update every"
+msgstr "Forza aggiornamento ogni"
+
+msgid "Force-time unit"
+msgstr "Unità di tempo per l'aggiornamento"
+
+msgid "Hostname"
+msgstr "Nome Host"
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid "Network"
+msgstr "Rete"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Service"
+msgstr "Servizio"
+
+msgid "Source of IP address"
+msgstr "Origine dell'indirizzo IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Nome Utente"
+
+msgid "custom"
+msgstr "personalizzato"
+
+# Hours
+msgid "h"
+msgstr "o"
+
+msgid "interface"
+msgstr "interfaccia"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "rete"
+
+#~ msgid "Event interface"
+#~ msgstr "Evento interfaccia"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "Su quale interfaccia dovrebbe iniziare il processo di script DDNS."
diff --git a/trunk/package/luci/po/it/diag_core.po b/trunk/package/luci/po/it/diag_core.po
new file mode 100644
index 00000000..39d4cedf
--- /dev/null
+++ b/trunk/package/luci/po/it/diag_core.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-03 13:54+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configura Diagnostici"
+
+msgid "Diagnostics"
+msgstr "Diagnostiche"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Le funzioni di diagnostica disponibili in questo menu dipendono dai moduli "
+"che avete installato sul vostro dispositivo."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Gli stumenti nel menù possono servirti per diagnosi e test per aiutarti "
+"nello scoprire le problematiche."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Con questo menu puoi configurare la diagnostica di rete, come la scansione "
+"di un dispositivo di rete o dei ping di test."
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d_diag"
diff --git a/trunk/package/luci/po/it/diag_devinfo.po b/trunk/package/luci/po/it/diag_devinfo.po
new file mode 100644
index 00000000..767245c8
--- /dev/null
+++ b/trunk/package/luci/po/it/diag_devinfo.po
@@ -0,0 +1,221 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-09 20:40+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Azioni"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Beginning of MAC address range"
+msgstr "Inizio del campo di indirizzi MAC"
+
+msgid "Config Phone Scan"
+msgstr "Configura Scansione Telefono"
+
+msgid "Configure"
+msgstr "Configura"
+
+msgid "Configure Scans"
+msgstr "Configura Scansioni"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Configurare la scansione per i dispositivi su reti specifiche. Diminuendo il "
+"'Timeout', 'Numero Ripetizioni' e/o ''Pausa tra le Richieste'  è possibile "
+"aumentare la velocità delle scansioni, ma può anche non riuscire a trovare "
+"alcuni dispositivo."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Configurare la scansione dei dispositivi SIP supportati  su reti specifiche. "
+"Diminuendo il 'Timeout', 'Numero ripetizioni' e / o ''Pausa tra le "
+"richieste' è possibile aumentare la velocità delle scansioni, ma può anche "
+"non riuscire a trovare alcuni dispositivo."
+
+msgid "Delete"
+msgstr "Elimina"
+
+msgid "Device Scan Config"
+msgstr "Configura Scansione Periferica"
+
+msgid "Device Type"
+msgstr "Tipo di Periferica"
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr "Periferiche in Rete"
+
+msgid "Edit"
+msgstr "Modifica"
+
+msgid "Enable"
+msgstr "Attiva"
+
+msgid "End of MAC address range"
+msgstr "Fine intervallo dell' indirizzo MAC"
+
+msgid "Go to relevant configuration page"
+msgstr "Vai alla pagina di configurazione rilevanti"
+
+msgid "IP Address"
+msgstr "Indirizzo IP"
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid "Invalid"
+msgstr "Non valido"
+
+msgid "Link to Device"
+msgstr "Collegamento alla Periferica"
+
+msgid "MAC Address"
+msgstr "Indirizzo MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr "Informazioni su Sostituzioni della Periferica MAC"
+
+msgid "MAC Device Override"
+msgstr "Sostituzione del MAC del dispositivo"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"La gamma e le informazioni MAC  utilizzate per eseguire la sostituzione dei "
+"database di sistema e IEEE"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Millisecondi di attesa tra le richieste (predefinito: 100)"
+
+msgid "Model"
+msgstr "Modello"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Device Scan"
+msgstr "Dispositivo Scansione della Rete"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Configurazione Dispositivo di Scansione della Rete"
+
+msgid "Networks to scan for devices"
+msgstr "Reti da scandire per i dispositivi"
+
+msgid "Networks to scan for supported devices"
+msgstr "Reti da scandire per i dispositivi supportati"
+
+msgid "No SIP devices"
+msgstr "Nessun dispositivo SIP"
+
+msgid "No devices detected"
+msgstr "Nessun dispositivo rilevato"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Numero di volte delle richieste da inviare (predefinito: 1)"
+
+msgid "OUI Owner"
+msgstr "Proprietario OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Ignora le informazioni restituite dal MAC su Script per le Informazioni sul "
+"dispositivo (mac-in-devinfo) per un determinato intervallo di indirizzi MAC"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Rilevamento (richiede alcuni minuti)"
+
+msgid "Phone Information"
+msgstr "Informazione Telefono"
+
+msgid "Phone Scan"
+msgstr "Rilevamento Telefono"
+
+msgid "Phone Scanning Configuration"
+msgstr "Configurazione Rilevamento Telefono"
+
+msgid "Phones"
+msgstr "Telefoni"
+
+msgid "Ports"
+msgstr "Porte"
+
+msgid "Raw"
+msgstr "Raw"
+
+msgid "Repeat Count"
+msgstr "Ripetizione Conteggio"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Ripetizione Rilevamento (richiede alcuni minuti)"
+
+msgid "SIP Device Information"
+msgstr "Informazioni Periferica SIP"
+
+msgid "SIP Device Scan"
+msgstr "Rilevamento Periferica SIP"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Configurazione Rilevamento Periferica SIP"
+
+msgid "SIP Devices on Network"
+msgstr "Periferiche SIP in Rete"
+
+msgid "SIP devices discovered for"
+msgstr "Periferiche SIP rilevate per"
+
+msgid "Scan for devices on specified networks."
+msgstr "Rilevamento per periferiche su reti specificate."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Rilevamento per periferiche SIP supportate sulle reti specificate."
+
+msgid "Scanning Configuration"
+msgstr "Configurazione Rilevamento"
+
+msgid "Scans for devices on specified networks."
+msgstr "Rilevamento periferiche sulle reti specificate."
+
+msgid "Sleep Between Requests"
+msgstr "Attendi tra le richieste"
+
+msgid "Subnet"
+msgstr "Sottorete"
+
+msgid "This section contains no values yet"
+msgstr "Questa sezione non contiene ancora valori"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Tempo di attesa per le risposte in secondi (predefinito: 10)"
+
+msgid "Timeout"
+msgstr "Timeout"
+
+msgid "Use Configuration"
+msgstr "Usa Configurazione"
+
+msgid "Vendor"
+msgstr "Produttore"
+
+msgid "check other networks"
+msgstr "Controlla altre reti"
diff --git a/trunk/package/luci/po/it/ffwizard.po b/trunk/package/luci/po/it/ffwizard.po
new file mode 100644
index 00000000..f00ce418
--- /dev/null
+++ b/trunk/package/luci/po/it/ffwizard.po
@@ -0,0 +1,180 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-09 21:27+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Permette di trasferire le statistiche in forma anonima su questo nodo"
+
+msgid "Channel"
+msgstr "Canale"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Selezionare questa opzione per proteggere la LAN da altri nodi o clienti"
+
+msgid "Configure network"
+msgstr "Configura la Rete"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Collegare il nodo con gli altri nodi con un tunnel via Internet."
+
+msgid "DHCP IP range"
+msgstr "Intervallo IP DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP assegna automaticamente gli indirizzi IP ai client"
+
+msgid "DNS Server"
+msgstr "Server DNS"
+
+msgid "Enable DHCP"
+msgstr "Attiva DHCP"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Heartbeat"
+msgstr "Heartbeat"
+
+msgid "IP address"
+msgstr "Indirizzo IP"
+
+msgid "L2gvpn tunnel"
+msgstr "Tunnel L2gvpn"
+
+msgid "Limit download bandwidth"
+msgstr "Limitare la banda passante in download"
+
+msgid "Limit upload bandwidth"
+msgstr "Limitare la banda passante in upload"
+
+msgid "Mesh IP address"
+msgstr "Indirizzo IP Mesh"
+
+msgid "Mesh IPv6 Address"
+msgstr "Indirizzo IPv6 Mesh"
+
+msgid "Netmask"
+msgstr "Maschera Rete"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Password confirmation"
+msgstr "Conferma Password"
+
+msgid "Password successfully changed"
+msgstr "Password modificata correttamente"
+
+msgid "Protect LAN"
+msgstr "Proteggi LAN"
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+"Selezionare questa casella di controllo per configurare le interfacce di "
+"rete"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Selezionare questa opzione per consentire ad altri di utilizzare la "
+"connessione per accedere a Internet."
+
+msgid "Share your internet connection"
+msgstr "Condividi la tua connessione a Internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"L'intervallo di IP i quali vengono assegnati ai client gli indirizzi IP (ad "
+"esempio 10.1.2.1/28). Se si tratta di un intervallo all'interno della rete "
+"Mesh, allora sarà annunciato come HNA. Ogni altro intervallo userà il NAT. "
+"Se lasciato vuoto, le impostazioni predefinite del profilo della comunità "
+"verrà utilizzato."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "L'indirizzo IPv6 viene calcolato automaticamente."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Il protocollo da utilizzare per la connettività internet."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Si tratta di un indirizzo univoco nella mesh (ad esempio 10.1.1.1) e deve "
+"essere registrato presso la comunità locale."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"In questo modo isi mposta una nuova interfaccia virtuale wireless in "
+"modalità Punto di Accesso."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Questa procedura guidata vi aiuterà a configurare il router per Freifunk o "
+"un'altra comunità di Rete wireless simile."
+
+msgid "Unknown Error"
+msgstr "Errore Sconosciuto"
+
+msgid "Username"
+msgstr "Nome Utente"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Punto di Accesso Virtuale (VAP)"
+
+msgid "Wizard"
+msgstr "Procedura Guidata"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Il dispositivo e nodi adiacenti devono utilizzare lo stesso canale."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "statico"
+
+msgid "Configure this interface."
+msgstr "Configura questa interfaccia."
+
+msgid "recommended"
+msgstr "raccomandato"
+
+msgid "Basic settings"
+msgstr "Impostazioni Base"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Le impostazioni base sono incomplete. Andare in"
+
+msgid "Error"
+msgstr "Errore"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+"Non è possibile utilizzare la procedura guidata perché alcuni valori "
+"necessari sono mancanti."
+
+msgid "and fill out all required fields."
+msgstr "e compilare tutti i campi richiesti."
diff --git a/trunk/package/luci/po/it/firewall.po b/trunk/package/luci/po/it/firewall.po
new file mode 100644
index 00000000..2f87efc6
--- /dev/null
+++ b/trunk/package/luci/po/it/firewall.po
@@ -0,0 +1,502 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2012-04-19 23:05+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr "%s%s con %s"
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr " -- Selezionare --"
+
+msgid "-- custom --"
+msgstr " -- personalizzata --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> e limita a %s"
+
+msgid "Action"
+msgstr "Azione"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Add and edit..."
+msgstr "Aggiungi e edita..."
+
+msgid "Advanced Settings"
+msgstr "Opzioni Avanzate"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Permetti routing da <em>zone di origini</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Permetti rountin a <em>zone di destinazione</em>:"
+
+msgid "Any"
+msgstr "Qualsiasi"
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr "Regole Personalizzate"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Le regole personalizzate ti permettorno di eseguire comandi iptables "
+"arbitrari che non solo altrimenti coperti dall'applicazione firewall. I "
+"comandi sono eseguiti dopo ogni riavvio del firewall, giusto dopo le altre "
+"regole che son state caricate."
+
+msgid "Destination IP address"
+msgstr "Indirizzo IP destinazione"
+
+msgid "Destination address"
+msgstr "Indirizzo di destinazione"
+
+msgid "Destination port"
+msgstr "Porta di destinazione"
+
+msgid "Destination zone"
+msgstr "Zona di destinazione"
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr "Porta Esterna"
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr "Firewall - Opzioni delle Zone"
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Opzioni Generali"
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Solo IPv4"
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr "Solo IPv6"
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr "Indirizzo IP Interno"
+
+msgid "Internal port"
+msgstr "Porta interna"
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# msgid "Traffic Redirection"
+# msgstr ""
+# msgid ""
+# "Traffic redirection allows you to change the destination address of "
+# "forwarded packets."
+# msgstr ""
+# msgid "Overview"
+# msgstr ""
+# msgid "Name"
+# msgstr ""
+# msgid "Source zone"
+# msgstr ""
+# msgid "Source MAC-address"
+# msgstr ""
+# msgid "Source port"
+# msgstr ""
+# msgid "Protocol"
+# msgstr ""
+msgid "Source IP address"
+msgstr "Indirizzo IP di origine"
+
+msgid "Source MAC address"
+msgstr "Indirizzo MAC di origine"
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr "Indirizzo di origine"
+
+msgid "Source port"
+msgstr "Porta di origine"
+
+msgid "Source zone"
+msgstr "Zona di origine"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr "accetta"
+
+msgid "any"
+msgstr "qualsiasi"
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr "rifiuta"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Destinazione"
+
+#~ msgid "Source"
+#~ msgstr "Origine"
+
+#~ msgid "Accept input"
+#~ msgstr "Accetta INPUT"
+
+#~ msgid "(optional)"
+#~ msgstr "(facoltativo)"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Porta interna (opzionale)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Opzioni Avanzate"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regole Avanzate"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Le regole avanzate consentono di personalizzare il firewall per le tue "
+#~ "necessità. Solo le nuove connessioni saranno combinate. I pacchetti "
+#~ "appartenenti alle connessioni già aperte sono automaticamente autorizzate "
+#~ "ad oltrepassare il firewall."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Regole Personalizzate (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid "Rules"
+#~ msgstr "Regole"
diff --git a/trunk/package/luci/po/it/freifunk-policyrouting.po b/trunk/package/luci/po/it/freifunk-policyrouting.po
new file mode 100644
index 00000000..61ac6c0d
--- /dev/null
+++ b/trunk/package/luci/po/it/freifunk-policyrouting.po
@@ -0,0 +1,69 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-09 20:22+0200\n"
+"PO-Revision-Date: 2013-02-09 20:27+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Tutto il traffico dalle interfacce appartenenti a tali zone saranno inviate "
+"tramite un gateway nella rete mesh."
+
+msgid "Enable Policy Routing"
+msgstr "Attiva la politica di instradamento"
+
+msgid "Fallback to mesh"
+msgstr "Posizione di sicurezza in mesh"
+
+msgid "Firewall zones"
+msgstr "Zone Firewall"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"Se nessun percorso predefinito viene ricevuto dalla rete mesh, il traffico "
+"che fa parte delle zone del firewall selezionato verranno instradate tramite "
+"la connessione a Internet come ripiego. Se non si desidera questo  invece "
+"di bloccare il traffico è necessario selezionare questa opzione."
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+"Se il proprio gateway non è disponibile, ripiego per il gateway predefinito "
+"mash."
+
+msgid "Policy Routing"
+msgstr "Politica di Instradamento"
+
+msgid "Strict Filtering"
+msgstr "Livello massimo di filtraggio"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"Queste pagine possono essere utilizzati per impostare la politica di "
+"instradamento per le zone del firewall determinati. Questo è utile se è "
+"necessario utilizzare la vostra connessione internet per de stesso, ma non "
+"si desidera condividere con gli altri (questo è il motivo per cui può anche "
+"essere chiamato 'Modalità Ego'). Il tuo traffico viene poi inviato tramite "
+"la tua connessione a Internet mentre il traffico proveniente dalla rete "
+"utilizzerà un altro gateway in mesh."
diff --git a/trunk/package/luci/po/it/freifunk.po b/trunk/package/luci/po/it/freifunk.po
new file mode 100644
index 00000000..9bbeebc5
--- /dev/null
+++ b/trunk/package/luci/po/it/freifunk.po
@@ -0,0 +1,422 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-07-19 16:27+0200\n"
+"Last-Translator: clagir <cgirlanda@girtech.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Difettoso (ETX > 10)"
+
+msgid "Basic Settings"
+msgstr "Impostazioni Base"
+
+msgid "Basic settings"
+msgstr "Impostazioni Base"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Le impostazioni base sono incomplete. Si prega di andare a"
+
+msgid "Basic system settings"
+msgstr "Impostazioni Base del Sistema"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Channel"
+msgstr "Canale"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+"Verificare la presenza di nuove versioni del firmware ed eseguire gli "
+"aggiornamenti automatici."
+
+msgid "Client network size"
+msgstr "Dimensione Rete Client"
+
+msgid "Community"
+msgstr "Comunità"
+
+msgid "Community profile"
+msgstr "Profilo Comunità"
+
+msgid "Community settings"
+msgstr "Impostazioni Comunità"
+
+msgid "Confirm Upgrade"
+msgstr "Conferma Aggiornamento"
+
+msgid "Contact"
+msgstr "Contatto"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "Le informazioni di contatto sono incomplete. Si prega di andare a"
+
+msgid "Coordinates"
+msgstr "Coordinate"
+
+msgid "Country code"
+msgstr "Codice Nazione"
+
+msgid "Default routes"
+msgstr "Instradamenti Predefiniti"
+
+msgid "Disable default content"
+msgstr "Disattivare contenuto predefinito"
+
+msgid "Diversity is enabled for device"
+msgstr "La diversità è abilitata per il dispositivo"
+
+msgid "E-Mail"
+msgstr "E-Mail"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "Modifica indice pagina"
+
+msgid "Enable IPv6"
+msgstr "Attiva IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr "Attiva un access point virtuale (VAP) di default se possibile"
+
+msgid "Error"
+msgstr "Errore"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Trova le coordinate con OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Panoramica Freifunk"
+
+msgid "Freifunk Remote Update"
+msgstr "Aggiornamento Remoto Freifunk"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Go to"
+msgstr "Vai a"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Buono (2 < ETX < 4)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Hello and welcome in the network of"
+msgstr "Ciao e benvenuto nella rete di"
+
+msgid "Hide OpenStreetMap"
+msgstr "Nascondi OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Homepage"
+
+msgid "Hostname"
+msgstr "Nome Host"
+
+msgid "IPv6 Config"
+msgstr "Configura IPv6"
+
+msgid "IPv6 Prefix"
+msgstr "Prefisso IPv6"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "Rete IPv6 in notazione CIDR."
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+"Se selezionata, l'elemento di contenuto predefinito non viene visualizzato."
+
+msgid "If you are interested in our project then contact the local community"
+msgstr "Se siete interessati al nostro progetto, contattare la comunità locale"
+
+msgid "Index Page"
+msgstr "Indice Pagina"
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"L'accesso a Internet dipende dalle condizioni tecniche e organizzative e può "
+"o non può funzionare per voi."
+
+msgid "It is operated by"
+msgstr "E' gestito da"
+
+msgid "Keep configuration"
+msgstr "Mantieni configurazione"
+
+msgid "Latitude"
+msgstr "Latitudine"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Load"
+msgstr "Carica"
+
+msgid "Local Time"
+msgstr "Ora Locale"
+
+msgid "Location"
+msgstr "Posizione"
+
+msgid "Longitude"
+msgstr "Longitudine"
+
+msgid "Map"
+msgstr "Mappa"
+
+msgid "Map Error"
+msgstr "Errore Mappa"
+
+msgid "Memory"
+msgstr "Memoria"
+
+msgid "Mesh prefix"
+msgstr "Prefisso Rete"
+
+msgid "Metric"
+msgstr "Metrica"
+
+msgid "Mode"
+msgstr "Modalità"
+
+msgid "Network"
+msgstr "Rete"
+
+msgid "Network for client DHCP addresses"
+msgstr "Rete per indirizzi Client DHCP"
+
+msgid "Nickname"
+msgstr "Nome Nick"
+
+msgid "No default routes known."
+msgstr "Nessun instradamento predefinito conosciuto."
+
+msgid "Notice"
+msgstr "Avviso"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Operatore"
+
+msgid "Orange"
+msgstr "Arancio"
+
+msgid "Overview"
+msgstr "Panoramica"
+
+msgid "Package libiwinfo required!"
+msgstr "Il pacchetto libiwinfo è richiesto!"
+
+msgid "Phone"
+msgstr "Telefono"
+
+msgid "Please fill in your contact details below."
+msgstr "Inserisci i tuoi dati di contatto qui sotto."
+
+msgid "Please set your contact information"
+msgstr "Vi preghiamo di impostare le informazioni di contatto"
+
+msgid "Power"
+msgstr "Potenza"
+
+msgid "Processor"
+msgstr "Processore"
+
+msgid "Profile"
+msgstr "Profilo"
+
+msgid "Profile (Expert)"
+msgstr "Profilo (Esperto)"
+
+msgid "Realname"
+msgstr "Nome Reale"
+
+msgid "Red"
+msgstr "Rosso"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Selezionare la propria posizione con un clic del mouse sulla mappa. La mappa "
+"viene visualizzata solo se si è connessi a Internet."
+
+msgid "Show OpenStreetMap"
+msgstr "Mostra OpenStreetMap"
+
+msgid "Show on map"
+msgstr "Mostra sulla mappa"
+
+msgid "Signal"
+msgstr "Segnale"
+
+msgid "Splash"
+msgstr "Splash"
+
+msgid "Start Upgrade"
+msgstr "Avvia Aggiornamento"
+
+msgid "Statistics"
+msgstr "Statistiche"
+
+msgid "Status"
+msgstr "Stato"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Ancora utilizzabile (4 < ETX < 10)"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Il pacchetto <em>libiwinfo</em> non è installato. Si deve installare questo "
+"componente per usare di configurazione wireless!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"Il servizio OLSRd non è configurato per acquisire i dati di posizione della "
+"rete. <br/> Assicurarsi che il plugin nameservice sia configurato "
+"correttamente e che l'opzione <em>latlon_file</ em> è abilitata."
+
+msgid "The installed firmware is the most recent version."
+msgstr "Il firmware installato è la versione più recente."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"Queste sono le impostazioni di base per la vostra comunità locale wireless. "
+"Queste impostazioni definiscono i valori predefiniti per la procedura "
+"guidata e non influenzano la configurazione attuale del router."
+
+msgid "These are the settings of your local community."
+msgstr "Queste sono le impostazioni della vostra comunità locale."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Queste pagine vi aiuteranno a configurare il router per Freifunk o reti "
+"wireless della comunità simile."
+
+msgid "This is the access point"
+msgstr "Questo è il punto di accesso"
+
+msgid "Update Settings"
+msgstr "Aggiorna impostazioni"
+
+msgid "Update available!"
+msgstr "Aggiornamento disponibile!"
+
+msgid "Uptime"
+msgstr "Tempo di attività"
+
+msgid "VAP"
+msgstr "VAP"
+
+msgid "Verify downloaded images"
+msgstr "Verifica delle immagini scaricate"
+
+msgid "Very good (ETX < 2)"
+msgstr "Molto buono (ETX < 2)"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Siamo un'iniziativa per creare una rete libera, indipendente e aperto "
+"wireless mesh."
+
+msgid "Wireless Overview"
+msgstr "Panoramica Wireless"
+
+msgid "Yellow"
+msgstr "Giallo"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"È possibile visualizzare contenuti aggiuntivi nella pagina indice pubblica "
+"inserendo XHTML valida nel modulo sottostante. <br/> I titoli dovrebbero "
+"essere racchiusi tra &lt;h2&gt; e &lt;/h2&gt;."
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+"È possibile trovare ulteriori informazioni sull'iniziativa Freifunk globale a"
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+"È possibile modificare manualmente il profilo selezionato della comunità qui"
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+"È necessario selezionare un profilo prima di poterlo modificare. Per "
+"selezionare un profilo andare a"
+
+msgid "and fill out all required fields."
+msgstr "e compilare tutti i campi richiesti."
+
+msgid "buffered"
+msgstr "buffered"
+
+msgid "cached"
+msgstr "in memoria cache"
+
+msgid "e.g."
+msgstr "es."
+
+msgid "free"
+msgstr "libero"
+
+msgid "to disable it."
+msgstr "per disattivarlo."
+
+msgid "used"
+msgstr "usato"
+
+msgid "wireless settings"
+msgstr "Impostazioni Wireless"
diff --git a/trunk/package/luci/po/it/hd_idle.po b/trunk/package/luci/po/it/hd_idle.po
new file mode 100644
index 00000000..09c7c095
--- /dev/null
+++ b/trunk/package/luci/po/it/hd_idle.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2013-02-03 13:54+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disco"
+
+msgid "Enable"
+msgstr "Abilita"
+
+msgid "Enable debug"
+msgstr "Abilita debug"
+
+msgid "Idle-time"
+msgstr "Tempo di inattività"
+
+msgid "Idle-time unit"
+msgstr "Unità di misura del tempo di inattività"
+
+msgid "Settings"
+msgstr "Opzioni"
+
+# Hours
+msgid "h"
+msgstr "ora/e"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"HD-idle è un programma per mettere in standby i dischi esterni dopo un "
+"periodo di inattività."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
diff --git a/trunk/package/luci/po/it/meshwizard.po b/trunk/package/luci/po/it/meshwizard.po
new file mode 100644
index 00000000..b1b97995
--- /dev/null
+++ b/trunk/package/luci/po/it/meshwizard.po
@@ -0,0 +1,143 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-06 18:07+0200\n"
+"PO-Revision-Date: 2013-02-09 20:46+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Attivare o disattivare la configurazione IPv6 a livello globale."
+
+msgid "Channel"
+msgstr "Canale"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Abilita per proteggere la tua LAN da altri nodi o clienti"
+
+msgid "Cleanup config"
+msgstr "Ripulisci config"
+
+msgid "Configure this interface"
+msgstr "Configura questa interfaccia"
+
+msgid "DHCP IP range"
+msgstr "Range DHCP IP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP assegnerà indirizzi ip ai client"
+
+msgid "Enable DHCP"
+msgstr "Abilità DHCP"
+
+msgid "Enable RA"
+msgstr "Attiva RA"
+
+msgid "Enabled"
+msgstr "Attivato"
+
+msgid "General Settings"
+msgstr "Impostazioni generali"
+
+msgid "IPv6 Settings"
+msgstr "Impostazioni IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Se questa opzione è selezionata, config viene pulita prima di nuove opzioni "
+"di configurazione."
+
+msgid "Interfaces"
+msgstr "Interfacce"
+
+msgid "Mesh IP address"
+msgstr "Rete indirizzo IP"
+
+msgid "Mesh IPv6 address"
+msgstr "Rete indirizzo IPv6"
+
+msgid "Mesh Wizard"
+msgstr "Configurazione Rete"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Nota: questo permette di configurare questa interfaccia per il funzionamento "
+"in rete, vale a dire aggiungere nella zona 'Freifunk' e consentire OLSR."
+
+msgid "Protect LAN"
+msgstr "Proteggi LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Selezionare per permettere ad altri di usare la tua connessione per accedere "
+"a internet."
+
+msgid "Send router advertisements on this device."
+msgstr "Inviare annunci router su questo dispositivo."
+
+msgid "Share your internet connection"
+msgstr "Condividi la tua connessione internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Il range IP dal quale i client ricevono gli indirizzi (es. 10.1.2.1/28). Se "
+"questa subnet è all'interno della tua rete mesh, sarà annunciata as HNA. "
+"Ogni altro range userà il NAT. Se lasciato vuoto allora la scelta "
+"predefinita della community sarà usata."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr "L'IP dato non è all'interno del range degli indirizzi di rete mesh"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+"Si tratta di un indirizzo IPv6 unico in notazione CIDR (ad esempio "
+"2001:1:2:3::1/64) e deve essere registrato presso la comunità locale."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Questo è un indirizzo univoco nella mesh (es. 10.1.1.1) e deve essere "
+"accordato con la tua community."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Questo confgurerà una nuova interfaccia wireless virtuale in modalità Access "
+"Point."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Questo wizard ti assisterà nel setup del tuo router per l'uso in una rete "
+"wireless comunitaria come Freifunk o Ninux."
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Punto di Accesso Virtuale (VAP)"
+
+msgid "Wizard"
+msgstr "Creazione guidata"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Il tuo device a i nodi confinanti devono sare lo stesso canale."
+
+msgid "recommended"
+msgstr "raccomandato"
diff --git a/trunk/package/luci/po/it/minidlna.po b/trunk/package/luci/po/it/minidlna.po
new file mode 100644
index 00000000..1c0abc67
--- /dev/null
+++ b/trunk/package/luci/po/it/minidlna.po
@@ -0,0 +1,194 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-05 11:41+0200\n"
+"Last-Translator: morganfw <morganfw@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Opzioni avanzate"
+
+msgid "Album art names:"
+msgstr "Nome Copertina Album:"
+
+msgid "Announced model number:"
+msgstr "Numero modello annunciato:"
+
+msgid "Announced serial number:"
+msgstr "Numero seriale annunciato:"
+
+msgid "Browse directory"
+msgstr "Esplora directory"
+
+msgid "Collecting data..."
+msgstr "Recuperando i dati..."
+
+msgid "Database directory:"
+msgstr "Directory database:"
+
+msgid "Enable TIVO:"
+msgstr "Abilita TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Abilita inotify:"
+
+msgid "Enable:"
+msgstr "Abilita:"
+
+msgid "Friendly name:"
+msgstr "Nome Comune:"
+
+msgid "General Settings"
+msgstr "Impostazioni generali"
+
+msgid "Interfaces:"
+msgstr "Interfacce:"
+
+msgid "Log directory:"
+msgstr "Directory di log:"
+
+msgid "Media directories:"
+msgstr "Cartelle Supporto:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA è un server il cui intento è di essere completamente compatibile "
+"con i DLNA/UPnP-AV client disponibili."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Numero del modello che il demone miniDLNA riporterà ai client nella sua "
+"descrizione XML."
+
+msgid "Music"
+msgstr "Musica"
+
+msgid "Network interfaces to serve."
+msgstr "Interfaccia di rete usata."
+
+msgid "Notify interval in seconds."
+msgstr "Intervallo di notifica in secondi."
+
+msgid "Notify interval:"
+msgstr "Intervallo di notifica:"
+
+msgid "Pictures"
+msgstr "Immagini"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Porta per traffico (descrizione, SOAP, trasferimento supporto) HTTP:"
+
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "Presentation URL:"
+msgstr "URL di Presentazione:"
+
+msgid "Root container:"
+msgstr "Contenitore Principale:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Serial number che il server miniDLNA invierà ai client nella descrizione "
+"XML."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "Imposta se si desidera personalizzare il nome da mostrare ai client."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Impostare questa opzione se si desidera specificare la cartella in cui si "
+"desidera archiviare i database MiniDLNA e le copertine della cache album."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+"Impostare questa opzione se si desidera specificare la cartella in cui si "
+"desidera che MiniDLNA archivi i propri file di registro."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Impostare questa opzione per consentire il monitoraggio inotify per rilevare "
+"automaticamente i nuovi file."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Impostare questo per abilitare il supporto per lo streaming di file .jpg e "
+".mp3 ad un supporto TiVo che supporta HMO."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Impostare questo parametro per far rispettare rigorosamente gli standard "
+"DLNA. Ciò consentirà sul lato server il ridimensionamento delle immagini "
+"JPEG di grandi dimensioni che possono influire negativamente sulle "
+"prestazioni JPEG del servizio su (almeno)  i prodotti Sony DLNA."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Impostare la cartella che si desidera sottoporre a scansione. Se si desidera "
+"limitare la directory per un tipo di contenuto specifico, è possibile "
+"anteporre il tipo ('A' per l'audio, 'V' per video, 'P' per le immagini), "
+"seguito da una virgola, nella cartella (es. media_dir = A,/mnt/media/Music). "
+"Cartelle multiple possono essere specificate."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Specificare il percorso del socket MiniSSDPd."
+
+msgid "Standard container"
+msgstr "Contenitore Standard"
+
+msgid "Strict to DLNA standard:"
+msgstr "Scrupolosamente DLNA standard:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"Il servizio miniDLNA è attivo, servo %d audio, %d video, %d file di "
+"immagine."
+
+msgid "The miniDLNA service is not running."
+msgstr "Il servizio miniDLNA non è in esecuzione."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+"Questo è un elenco di nomi di file per verificare la presenza durante la "
+"ricerca di copertine degli album."
+
+msgid "Video"
+msgstr "Video"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "Stato miniDLNA"
+
+msgid "miniSSDP socket:"
+msgstr "Socket miniSSDP:"
diff --git a/trunk/package/luci/po/it/mmc_over_gpio.po b/trunk/package/luci/po/it/mmc_over_gpio.po
new file mode 100644
index 00000000..e0f371a1
--- /dev/null
+++ b/trunk/package/luci/po/it/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-02-03 13:57+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "Attiva"
+
+msgid "MMC/SD driver configuration"
+msgstr "Configurazione driver MMC/SD"
+
+msgid "Mode"
+msgstr "Modalità"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Settings"
+msgstr "Opzioni"
diff --git a/trunk/package/luci/po/it/multiwan.po b/trunk/package/luci/po/it/multiwan.po
new file mode 100644
index 00000000..863b3510
--- /dev/null
+++ b/trunk/package/luci/po/it/multiwan.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-03 14:00+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Tentativi su WAN prima del Failover"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Tentativi su WAN prima del Recovery"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Collecting data..."
+msgstr "Raccolta di dati..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Configura le regole per inviare direttamente in uscita il traffico su una "
+"uplink Wan specifico."
+
+msgid "DNS Server(s)"
+msgstr "DNS Server(s)"
+
+msgid "Default Route"
+msgstr "Default Route"
+
+msgid "Destination Address"
+msgstr "Indirizzo di destinazione"
+
+msgid "Disable"
+msgstr "Disable"
+
+msgid "Enable"
+msgstr "Enable"
+
+msgid "Failing"
+msgstr "Fallimento"
+
+msgid "Failover Traffic Destination"
+msgstr "Destinazione del traffico in failover"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Health Monitor ICMP Host(s)"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Health Monitor ICMP Timeout"
+
+msgid "Health Monitor Interval"
+msgstr "Health Monitor Interval"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"L'health monitor monitora e identifica i cambiamenti e la manca di "
+"connessioni."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Bilanciamento del carico"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Carica Bilanciatore (Compatibilità)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Carica Bilanciatore (Performance)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Stato Multi-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Regole del Traffico Multi-WAN"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN permette di usare uplink multipi per il bilanciamento del carico e "
+"la ridondanza da failover."
+
+msgid "None"
+msgstr "None"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Porte"
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "Recovering"
+msgstr "Recupero"
+
+msgid "Source Address"
+msgstr "Indirizzo sorgente"
+
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+msgid "WAN Interfaces"
+msgstr "Interfaccia WAN"
+
+msgid "WAN Uplink"
+msgstr "Collegamento ascendente WAN"
+
+msgid "all"
+msgstr "all"
diff --git a/trunk/package/luci/po/it/ntpc.po b/trunk/package/luci/po/it/ntpc.po
new file mode 100644
index 00000000..4b027b7f
--- /dev/null
+++ b/trunk/package/luci/po/it/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2013-02-03 13:56+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Impostazione Ora"
+
+msgid "Count of time measurements"
+msgstr "Conteggio delle misure del tempo"
+
+msgid "Current system time"
+msgstr "Ora corrente del sistema"
+
+msgid "General"
+msgstr "Generale"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Offset frequency"
+msgstr "Offset delle frequenza"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Synchronizes the system time"
+msgstr "Sincronizza l'ora di sistema"
+
+msgid "Time Server"
+msgstr "Server Orologio"
+
+msgid "Time Servers"
+msgstr "Server dell'ora"
+
+msgid "Time Synchronisation"
+msgstr "Sincronizzazione dell'ora"
+
+msgid "Update interval (in seconds)"
+msgstr "Intervallo di aggiornamento (in secondi)"
+
+msgid "empty = infinite"
+msgstr "vuoto = infinito"
diff --git a/trunk/package/luci/po/it/olsr.po b/trunk/package/luci/po/it/olsr.po
new file mode 100644
index 00000000..a88d2970
--- /dev/null
+++ b/trunk/package/luci/po/it/olsr.po
@@ -0,0 +1,733 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-02-10 15:13+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "Annunci MID attivi"
+
+msgid "Active OLSR nodes"
+msgstr "Nodi OLSR attivi"
+
+msgid "Active host net announcements"
+msgstr "Annunci rete host attiva"
+
+msgid "Advanced Settings"
+msgstr "Opzioni avanzate"
+
+msgid "Allow gateways with NAT"
+msgstr "Permetti gateway con NAT"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "Permetti l'uso di gateway in uscita con NAT"
+
+msgid "Announce uplink"
+msgstr "Annuncia uplink"
+
+msgid "Announced network"
+msgstr "Rete da annnunciare"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr "Entrambi i valori devono essere nella notazione decimale puntata"
+
+msgid "Broadcast address"
+msgstr "Indirizzo di broadcast"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configurazione"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "Display"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Download Config"
+msgstr "Configurazione Download"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Attiva"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"Abitita SmartGateway. Se è disattivata, tutti gli altri parametri "
+"SmartGateway verrano ignorati. Predefinito è \"no\"."
+
+msgid "Enable this interface."
+msgstr "Attiva questa interfaccia."
+
+msgid "Enabled"
+msgstr "Attivato"
+
+msgid "Expected retransmission count"
+msgstr "Expected retransmission count"
+
+msgid "FIB metric"
+msgstr "Metrica FIB"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "General Settings"
+msgstr "Impostazioni Generali"
+
+msgid "General settings"
+msgstr "Impostazioni Generali"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "Annuncio di HNA"
+
+msgid "HNA interval"
+msgstr "Intervallo HNA"
+
+msgid "HNA validity time"
+msgstr "Durata di validità HNA"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Annuncio di HNA"
+
+msgid "Hello"
+msgstr "Ciao"
+
+msgid "Hello interval"
+msgstr "Intervallo Saluto"
+
+msgid "Hello validity time"
+msgstr "Durata validità Saluto"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "Hops"
+
+msgid "Hostname"
+msgstr "Nome Host"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+"Isteresi del link (solo per la metrica hopocount). L'isteresi aggiunge "
+"robustezza alla sensibilità del link ma rallenta la registrazione dei "
+"vicini. Default è \"si\""
+
+msgid "IP Addresses"
+msgstr "Indirizzi IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+"Versione IP da usare. Se entrambe sono selezionate una istanza di olsrd è "
+"avviata per ogni versione."
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+"Indirizzo di broadcast per i pacchetti OLSR. Per esempio potresti avere "
+"255.255.255.255. Default is 0.0.0.0, il che abilita l'uso dell'ip di "
+"broadcast di default."
+
+msgid "IPv4 source"
+msgstr "IPv4 source"
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+"IPv4 source per i pacchetti uscenti da OLSR. Predefinito \"0.0.0.0\", il che "
+"abilita l'uso dell'IP dell'interfaccia di uscita."
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "IPv6 multicast"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"IPv6 network deve essere specificata in full notation, il prefisso deve "
+"essere in CIDR notation."
+
+msgid "IPv6 source"
+msgstr "IPv6 source"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+"IPv6 src prefix. OLSRd sceglierà uno degli IP dell'interfaccia che matchano "
+"questo parametro. Predefinito è \"0::/0\", il che abilita l'uso di un IP non-"
+"linklocal."
+
+msgid "IPv6-Prefix of the uplink"
+msgstr "IPv6-Prefix dell' uplink"
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+"Se la rotta del gateway attuale viene modificata, il valore di ETX del "
+"gateway è moltiplicata per questo valore prima che sia comparato con nuovo "
+"valore.Il parametro può essere compreso tra 0.1 e 1.0, ma si consiglia un "
+"valore vicino a 1.0. <br /><b>ATTENZIONE:</b> Questo valore non deve essere "
+"utilizzato insieme con la metrica etx_ffeth!<br />Defaults a \"1.0\"."
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+"Se questo nodo usa un NAT per connettersi a Internet. Predefinito è \"si\"."
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "Annuncio di HNA"
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Impossibile connetersi al demone OLSR!"
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr "L'uplink usa il NAT"
+
+msgid "Use hysteresis"
+msgstr "Usa l'isteresi"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Versione"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr "Peso"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+"Quando link multipli esisto tra gli hosts il peso dell'interfaccia viene "
+"usato. Normalmente il peso è automaticamente calcolato dal demone olsrd in "
+"base alle caratteristiche del link, ma qui puoi specificare un valore di "
+"contrappeso. OLSRd sceglierà il link con il più basso valore.<br><b>Nota:</"
+"b>Il peso dell'interfaccia è uso quando LinkQualityLevel è 0. Per ogni altro "
+"valore di LinkQualityLevel,  il valore di ETX è usato."
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+"Quale tipo di uplink è mostrato agli altri nodi. Un uplink è individuato "
+"cercando un HNA del tipo 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Quale tipo di uplink è mostrato agli altri nodi. Un uplink è individuato "
+"cercando un HNA del tipo 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "Periferica"
diff --git a/trunk/package/luci/po/it/openvpn.po b/trunk/package/luci/po/it/openvpn.po
new file mode 100644
index 00000000..0ee93063
--- /dev/null
+++ b/trunk/package/luci/po/it/openvpn.po
@@ -0,0 +1,553 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-04-20 10:36+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr "Accetta opzioni inviate dal server"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Add route after establishing connection"
+msgstr "Aggiungi rotte dopo aver stabilito la connessione"
+
+msgid "Additional authentication over TLS"
+msgstr "Autenticazione addizionale over TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Permetti traffico client-client"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Permetti più client con lo stesso certificato"
+
+msgid "Allow only one session"
+msgstr "Permetti solo una sessione"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Permetti ai remote di cambiare il proprio IP o porta"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Numero massimo di clienti connessi"
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr "Numero massimo di nuove connessioni ammesse"
+
+msgid "Append log to file"
+msgstr "Appendi il log al file"
+
+msgid "Authenticate using username/password"
+msgstr "Autenticazione usando username/passoword"
+
+msgid "Automatically redirect default route"
+msgstr "Modifica automaticamente la default route"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Sotto c'è una lista di istanze di OpenVPN configurate e il loro stato "
+"corrente"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr "Cambia priorità del processo"
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr "Connetti attraverso un proxy Socks5"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Connetti attraverso un proxy HTTP"
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr "Non effettuare il bind sull'indirizzo/porta locale"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Non eseguire realmente ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "Non aggiungere rotte automaticamente"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr "Non loggare il timestamps"
+
+msgid "Don't re-read key on restart"
+msgstr "Non rileggere le chiavi al riavvio"
+
+msgid "Don't require client certificate"
+msgstr "Non richiedere certificati dei client"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Non usare compressione lzo adattiva"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr "Misura empericamente l'MTU"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Abilita il supporto criptografico hardware per OpenSSL"
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Abilita frammentazione interna dei datagram"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Abilitato"
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Esegui un comando shell dopo che le rotte sono aggiunte"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Esegui un comando shell al cambio di ip remoto"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr "Istanza \"%s\""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr "Mantieni l'IP local al riavvio"
+
+msgid "Keep remote IP address on restart"
+msgstr "Mantieni l'IP remoto al riavvio"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Mantienti il device tun/tap aperto al riavvio"
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr "Limita le ripetizioni di messaggi nel log"
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr "Chiave privata local"
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr "Rendi il device tun ipv6 ready"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN istanze"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Ottimizza le scritture su TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr "Anteprima"
+
+msgid "PKCS#12 file containing keys"
+msgstr "PKCS#12 file containing keys"
+
+msgid "Pass environment variables to script"
+msgstr "Passa le variabili d'ambiente allo script"
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr "Avviato"
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr "Passa alla configurazione avanzata »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr "no"
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr "si (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Passa alla configurazione base"
diff --git a/trunk/package/luci/po/it/p2pblock.po b/trunk/package/luci/po/it/p2pblock.po
new file mode 100644
index 00000000..3be50105
--- /dev/null
+++ b/trunk/package/luci/po/it/p2pblock.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-20 10:18+0200\n"
+"PO-Revision-Date: 2012-04-20 10:21+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Block Time"
+msgstr "Periodo di censura"
+
+msgid "Enable P2P-Block"
+msgstr "Abilita la censura del P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Protocolli di Layer7"
+
+msgid "P2P-Block"
+msgstr "Censura P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"La censura, block, del P2P è un meccanismo per bloccare diversi protocolli "
+"peer-to-peer da parte di clienti non apparteneti alla whitelist."
+
+msgid "Portrange"
+msgstr "Range delle porte"
+
+msgid "Whitelisted IPs"
+msgstr "IP in whitelist"
+
+msgid "seconds"
+msgstr "secondi"
diff --git a/trunk/package/luci/po/it/p910nd.po b/trunk/package/luci/po/it/p910nd.po
new file mode 100644
index 00000000..47bf6873
--- /dev/null
+++ b/trunk/package/luci/po/it/p910nd.po
@@ -0,0 +1,55 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2014-08-05 11:23+0200\n"
+"Last-Translator: morganfw <morganfw@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Modalità bidirezionale"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Devi prima aver installato i pacchetti per avere il supporto dell'USB (kmod-"
+"usb-printer) o della porta parallela (kmod-lp)."
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Settings"
+msgstr "Impostazioni"
+
+msgid "Specifies the interface to listen on."
+msgstr "Specifica l'interfaccia per l'ascolto."
+
+msgid "TCP listener port."
+msgstr "Porta d'ascolto TCP."
+
+msgid "enable"
+msgstr "Attiva"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Server di stampa"
+
+#~ msgid "port_help"
+#~ msgstr "Porta d'aiuto"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr ""
+#~ "p910nd è in ascolto sulla porta 910+N. Ad es. 9100 per la prima stampante."
diff --git a/trunk/package/luci/po/it/pbx-voicemail.po b/trunk/package/luci/po/it/pbx-voicemail.po
new file mode 100644
index 00000000..fe8c4bf0
--- /dev/null
+++ b/trunk/package/luci/po/it/pbx-voicemail.po
@@ -0,0 +1,110 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-09 21:15+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "Indirizzi e-mail che ricevono Voicemail"
+
+msgid "Enable Voicemail"
+msgstr "Attiva Voicemail"
+
+msgid "Global Voicemail Setup"
+msgstr "Attiva Voicemail"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"Qui è possibile configurare un messaggio vocale globale per questo PBX. "
+"Poiché questo sistema è destinato a girare su sistemi embedded come router, "
+"non vi è alcuna memorizzazione locale di segreteria - deve essere inviato "
+"via e-mail. Pertanto, è necessario configurare un server di posta in uscita "
+"(SMTP) (ad esempio del vostro ISP, di Google, Server Yahoo  SMTP), e di "
+"fornire un elenco di indirizzi che ricevono posta vocale registrato."
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"Affinché questo PBX possa inviare messaggi di posta elettronica contenenti "
+"le registrazioni vocali, è necessario impostare un server SMTP qui. Il tuo "
+"ISP in genere fornisce un server SMTP per tale scopo. È inoltre possibile "
+"impostare un terzo SMTP  come quello fornito da Google o Yahoo."
+
+msgid "Last Sent Voicemail Log"
+msgstr "Ultimo file di registro Voicemail inviato"
+
+msgid "Local Storage Directory"
+msgstr "Cartella di memorizzazione Locale"
+
+msgid "No"
+msgstr "No"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Server posta in uscita (SMTP)"
+
+msgid "SMTP Password"
+msgstr "Password SMTP"
+
+msgid "SMTP Port Number"
+msgstr "Numero Porta SMTP"
+
+msgid "SMTP Server Authentication"
+msgstr "Autenticazione Server SMTP"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "Nome Host Server SMTP o Indirizzo IP"
+
+msgid "SMTP User Name"
+msgstr "Nome Utente SMTP"
+
+msgid "Secure Connection Using TLS"
+msgstr "Connessione Sicura utilizzando TLS"
+
+msgid "Voicemail Setup"
+msgstr "Impostazione Voicemail"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"Quando si attiva la segreteria telefonica, si avrà la possibilità di "
+"specificare gli indirizzi e-mail che ricevono i messaggi vocali registrati. "
+"È inoltre necessario impostare un server SMTP di seguito."
+
+msgid "Yes"
+msgstr "Sì"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"È inoltre possibile conservare copie dei messaggi vocali sul dispositivo che "
+"esegue il PBX. Il percorso specificato in questo campo viene creato se non "
+"esiste. Attenzione lo spazio è limitato sui dispositivi embedded come "
+"router, e abilitare questa opzione solo se si sa cosa si sta facendo."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"La tua password SMTP reale non viene visualizzata per la vostra protezione. "
+"Verrà modificato solo quando si modifica il valore in questa casella."
diff --git a/trunk/package/luci/po/it/pbx.po b/trunk/package/luci/po/it/pbx.po
new file mode 100644
index 00000000..6da8e45d
--- /dev/null
+++ b/trunk/package/luci/po/it/pbx.po
@@ -0,0 +1,487 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-12-15 19:31+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Opzioni avanzate"
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/it/polipo.po b/trunk/package/luci/po/it/polipo.po
new file mode 100644
index 00000000..6bc06690
--- /dev/null
+++ b/trunk/package/luci/po/it/polipo.po
@@ -0,0 +1,219 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-02-09 19:56+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Impostazioni avanzate"
+
+msgid "Allowed clients"
+msgstr "Clients permessi"
+
+# che è sto DNS RESOLVER?
+msgid "Always use system DNS resolver"
+msgstr "Usa sempre DNS resolver"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Autenticazione base HTTP supportata. Fornire username e password in formato "
+"username:password."
+
+msgid "Configuration"
+msgstr "Configurazione"
+
+msgid "DNS and Query Settings"
+msgstr "Settaggi DNS e Query"
+
+msgid "DNS server address"
+msgstr "Indirizzo del server DNS"
+
+msgid "Delete cache files time"
+msgstr "Svuota la cache file dopo"
+
+msgid "Disk cache location"
+msgstr "Percorso della cache del disco"
+
+msgid "Do not query IPv6"
+msgstr "Non ignorare query IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Abilita se la cache (del proxy) e' condivisa tra gli utenti."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Dimensione del primo segmento PMM (in bytes)"
+
+msgid "General Settings"
+msgstr "Impostazioni genarali"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Quanta RAM dovrebbe Polipo usa come sua cache."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "In RAM cache size (in bytes)"
+
+msgid "Listen address"
+msgstr "Indirizzi ip da \"ascoltare\""
+
+msgid "Listen port"
+msgstr "Porta"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Percorso dove polipo memorizzerà i files di cache permanentemente. L'uso di "
+"un dispositivo di memorizzazione esterno è raccomandato. Lasciare vuoto per "
+"disabilitare la cache sul disco."
+
+msgid "Log file location"
+msgstr "Percorso del file di log"
+
+msgid "Log to syslog"
+msgstr "Pubblica il log nel syslog"
+
+msgid "Logging and RAM"
+msgstr "Registra in RAM"
+
+msgid "Never use system DNS resolver"
+msgstr "Non usare mai DNS RESOLVER"
+
+msgid "On-Disk Cache"
+msgstr "On-Disk Cache"
+
+msgid "PMM segments size (in bytes)"
+msgstr "DImensione segmenti PMM  (in bytes)"
+
+msgid "Parent Proxy"
+msgstr "Parent Proxy"
+
+msgid "Parent proxy address"
+msgstr "Indirizzo parent proxy"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Indirizzi del parent proxy (nel formato ip:porta), al quale Polipo dovrà "
+"inoltrare le richieste."
+
+msgid "Parent proxy authentication"
+msgstr "Autentificazione Parent proxy"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Stato Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo è un piccolo e veloce webcache proxy."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Poor Man's Multiplexing"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Poor Man's Multiplexing (PMM) è una tecnica che simula il multiplexing "
+"richiedendo una nuova istanza del segmento. Questo server per abbassare la "
+"latenza causata dalla debolezza del protocollo HTTP. NOTA: alcuni siti "
+"potrebbero non funzionare con PMM abilitato."
+
+msgid "Port on which Polipo will listen"
+msgstr "Porta sulla quale Polipo deve rimanere in ascolto"
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr "Richiesta DNS da parte dell'host"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr "Abilita"
diff --git a/trunk/package/luci/po/it/qos.po b/trunk/package/luci/po/it/qos.po
new file mode 100644
index 00000000..00fb331b
--- /dev/null
+++ b/trunk/package/luci/po/it/qos.po
@@ -0,0 +1,108 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2014-07-19 16:26+0200\n"
+"Last-Translator: clagir <cgirlanda@girtech.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Calcola l'overhead"
+
+msgid "Classification Rules"
+msgstr "Regole di classificazione"
+
+msgid "Classification group"
+msgstr "Gruppo di Priorità"
+
+msgid "Comment"
+msgstr "Commento"
+
+msgid "Destination host"
+msgstr "Host di destinazione"
+
+msgid "Download speed (kbit/s)"
+msgstr "Velocità di download (kbit/s)"
+
+msgid "Enable"
+msgstr "Abilita"
+
+msgid "Half-duplex"
+msgstr "Half-duplex"
+
+msgid "Interfaces"
+msgstr "Interfacce"
+
+msgid "Number of bytes"
+msgstr "Numeri di bytes"
+
+msgid "Ports"
+msgstr "Porte"
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Qualità del Servizio"
+
+msgid "Service"
+msgstr "Servizi"
+
+msgid "Source host"
+msgstr "Host sorgente"
+
+msgid "Target"
+msgstr "Target"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Velocità di upload (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Con <abbr title=\"Qualità del Servizio\">QoS</abbr> puoi dare priorità al "
+"traffico di rete in base ad un ip, una porta o dei servizi."
+
+msgid "all"
+msgstr "tutti"
+
+msgid "default"
+msgstr "default"
+
+msgid "express"
+msgstr "express"
+
+msgid "low"
+msgstr "basso"
+
+msgid "normal"
+msgstr "normale"
+
+msgid "priority"
+msgstr "priorità"
+
+#~ msgid "Downlink"
+#~ msgstr "Collegamento discendente"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Connessione Internet"
+
+#~ msgid "Uplink"
+#~ msgstr "Collegamento ascendente"
+
+#~ msgid "allf"
+#~ msgstr "allf"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "qos_connbytes"
diff --git a/trunk/package/luci/po/it/radvd.po b/trunk/package/luci/po/it/radvd.po
new file mode 100644
index 00000000..cda09b70
--- /dev/null
+++ b/trunk/package/luci/po/it/radvd.po
@@ -0,0 +1,374 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-10 19:21+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: German\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "6to4 interface"
+msgstr "Interfaccia 6to4"
+
+msgid "Address"
+msgstr "Indirizzo"
+
+msgid "Addresses"
+msgstr "Indirizzi"
+
+msgid "Advanced"
+msgstr "Avanzato"
+
+msgid "Advertise Home Agent flag"
+msgstr "Advertise Home Agent flag"
+
+msgid "Advertise router address"
+msgstr "Annuncia indirizzo router"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Annuncia Suffissi Dominio"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Annuncia RDNSS IPv6. Se vuoto, l'indirizzo IPv6 attuale dell'interfaccia "
+"verrà usato"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Prefissi IPv6 Annunciati"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Prefissi IPv6 Annunciati. Se vuoto, il prefisso dell'interfaccia attuale "
+"verrà usato"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Annuncia la capacità dell'Agente Home IPv6 Mobile (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr "Abilita"
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/it/rrdtool.po b/trunk/package/luci/po/it/rrdtool.po
new file mode 100644
index 00000000..8ae44722
--- /dev/null
+++ b/trunk/package/luci/po/it/rrdtool.po
@@ -0,0 +1,359 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-02-03 14:50+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "stat_dg_title_wireless__signal_noise"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "stat_dg_label_wireless__signal_noise"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "stat_ds_signal_noise"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "stat_ds_signal_power"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "stat_dg_title_wireless__signal_quality"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "stat_dg_label_wireless__signal_quality"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "stat_ds_signal_quality"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "stat_dg_title_ping"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "stat_dg_label_ping"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "stat_ds_ping"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "stat_dg_title_iptables__ipt_packets"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "stat_dg_label_iptables__ipt_packets"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "stat_ds_ipt_packets"
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "stat_dg_title_netlink__if_octets"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "stat_dg_label_netlink__if_octets"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "stat_ds_if_octets"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "stat_dg_title_netlink__if_packets"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "stat_dg_label_netlink__if_packets"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "stat_ds_if_packets"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "stat_ds_if_dropped"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "stat_ds_if_errors"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "stat_dg_title_netlink__if_multicast"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "stat_dg_label_netlink__if_multicast"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "stat_ds_if_multicast"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "stat_dg_title_netlink__if_collisions"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "stat_dg_label_netlink__if_collisions"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "stat_ds_if_collisions"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "stat_dg_title_netlink__if_tx_errors"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "stat_dg_label_netlink__if_tx_errors"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "stat_ds_if_tx_errors"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "stat_ds_if_rx_errors"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "stat_dg_title_processes"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "stat_dg_label_processes"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "stat_ds_ps_state"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "stat_dg_title_processes__ps_cputime"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "stat_dg_label_processes__ps_cputime"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "stat_ds_ps_cputime__syst"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "stat_ds_ps_cputime__user"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "stat_dg_title_processes__ps_count"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "stat_dg_label_processes__ps_count"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "stat_ds_ps_count"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "stat_dg_title_processes__ps_pagefaults"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "stat_dg_label_processes__ps_pagefaults"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "stat_ds_ps_pagefaults"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "stat_dg_title_processes__ps_rss"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "stat_dg_label_processes__ps_rss"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "stat_ds_ps_rss"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "stat_dg_title_cpu"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "stat_dg_label_cpu"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "stat_ds_cpu"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "stat_dg_title_interface__if_octets"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "stat_dg_label_interface__if_octets"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "stat_dg_title_interface__if_packets"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "stat_dg_label_interface__if_packets"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "stat_dg_title_tcpconns"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "stat_dg_label_tcpconns"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "stat_ds_tcp_connections"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "stat_dg_title_df"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "stat_dg_label_df"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "stat_ds_df__free"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "stat_ds_df__used"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "stat_dg_title_irq"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "stat_dg_label_irq"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "stat_ds_irq"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "stat_dg_title_load"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "stat_dg_label_load"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "stat_ds_load__shortterm"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "stat_ds_load__midterm"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "stat_ds_load__longterm"
diff --git a/trunk/package/luci/po/it/samba.po b/trunk/package/luci/po/it/samba.po
new file mode 100644
index 00000000..46457825
--- /dev/null
+++ b/trunk/package/luci/po/it/samba.po
@@ -0,0 +1,85 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-04-19 22:28+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Permetti ospiti"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Autorizza gli utenti del sistema a raggiungere la loro cartella home "
+"attraverso le condivisioni di rete"
+
+msgid "Allowed users"
+msgstr "Utenti ammessi"
+
+msgid "Create mask"
+msgstr "Mask di creazione dei file"
+
+msgid "Description"
+msgstr "Descrizione"
+
+msgid "Directory mask"
+msgstr "Maschera della cartella"
+
+msgid "Edit Template"
+msgstr "Modifica Template"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Modifica il template utilizzato per generare la configurazione di samba."
+
+msgid "General Settings"
+msgstr "Opzioni Generali"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Mask for new directories"
+msgstr "Maschera per le nuove cartelle"
+
+msgid "Mask for new files"
+msgstr "Maschera per i nuovi files"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Shares"
+msgstr "Condivisioni di rete"
+
+msgid "Path"
+msgstr "Percorso"
+
+msgid "Read-only"
+msgstr "Solo lettura"
+
+msgid "Share home-directories"
+msgstr "Condividi cartelle home"
+
+msgid "Shared Directories"
+msgstr "Cartelle Condivise"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Questo è il contenuto del file '/etc/samba/smb.conf.template' dal quale sarà "
+"generata la tua configurazione di samba. I valori racchiusi tra il simbolo "
+"('|') non dovrebbero essere toccati. Essi vengono generati dalla schermata "
+"'Opzioni Generali'."
+
+msgid "Workgroup"
+msgstr "Gruppo di lavoro"
diff --git a/trunk/package/luci/po/it/splash.po b/trunk/package/luci/po/it/splash.po
new file mode 100644
index 00000000..8964b6c3
--- /dev/null
+++ b/trunk/package/luci/po/it/splash.po
@@ -0,0 +1,361 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-10 18:43+0200\n"
+"PO-Revision-Date: 2013-02-10 19:08+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Accetta"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"L'accesso a Internet potrebbe essere possibile, perché alcuni attivisti di "
+"questo progetto condividono le loro connessioni internet private​​. Queste "
+"poche connessioni sono condivise tra tutti gli utenti. Ciò significa che la "
+"larghezza di banda a disposizione è limitato e per questo vi chiediamo di "
+"non fare una delle seguenti operazioni:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr "Attiva Clienti"
+
+msgid "Allowed hosts/subnets"
+msgstr "Hosts/Sottoreti Consentite"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"Il limite della larghezza di banda per i clienti viene attivato solo quando "
+"entrambi i limiti di upload e download sono impostati. Utilizzare un valore "
+"pari a 0 qui per disattivare completamente questa limitazione. I client "
+"inseriti nell'elenco dei consentiti non sono limitati."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+"Diventare un membro attivo di questa comunità e aiutaci nell'utilizzo del "
+"proprio nodo"
+
+msgid "Blacklist"
+msgstr "Lista Nera"
+
+msgid "Blocked"
+msgstr "Bloccato"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr "Spazio tempo"
+
+msgid "Client-Splash"
+msgstr "Client-Splash"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+"Client-Splash è un sistema di autenticazione hotspot per le reti mesh "
+"wireless."
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr "La velocità di download dei clienti è limitata a tale valore (kbyte/s)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+"I clienti che hanno accettato lo splash sono autorizzati ad utilizzare la "
+"rete anche per molte ore."
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr "La velocità di upload dei clienti è limitata a questo valore (kbyte/s)"
+
+msgid "Contact"
+msgstr "Contatto"
+
+msgid "Decline"
+msgstr "Rifiuta"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+"Effettua una donazione per aiutare a mantenere in attività questo progetto."
+
+msgid "Download limit"
+msgstr "Limite di download"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr "Zona Firewall"
+
+msgid "General"
+msgstr "Generale"
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nome Host"
+
+msgid "IP Address"
+msgstr "Indirizzo IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+"Se si utilizza una propria apparecchiatura wifi utilizzare canali differenti "
+"dalle nostre."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+"Se si utilizza questa rete su base regolare vi chiediamo il vostro sostegno:"
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Intercettare il traffico cliente su questa interfaccia"
+
+msgid "Interfaces"
+msgstr "Interfacce"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Interfacce usate per lo Splash."
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"KB/s (Download/Upload). Si può essere in grado di rimuovere questo limite, "
+"contribuendo attivamente a questo progetto."
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "Indirizzo MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "gli indirizzi MAC in questo elenco sono bloccati."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"Gli indirizzi MAC dei clienti dell'elenco consentito. Questi non hanno "
+"bisogno di accettare lo splash e non hanno la larghezza di banda limitata."
+
+msgid "Netmask"
+msgstr "Maschera Rete"
+
+msgid "Network"
+msgstr "Rete"
+
+msgid "No clients connected"
+msgstr "Nessun cliente connesso"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Si prega di notare che non siamo un provider di servizi internet, ma una "
+"rete di comunità sperimentale."
+
+msgid "Policy"
+msgstr "Politica"
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr "Salva"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr "Le regole Splash sono integrate in questa zona firewall"
+
+msgid "Splashtext"
+msgstr "Splashtext"
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr "Tempo restante"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Per richiedere il motivo per cui sono state bloccate o chiedere l'accesso di "
+"nuovo si può provare a contattare il proprietario di questo punto di accesso:"
+
+msgid "Traffic in/out"
+msgstr "Traffico ingresso/uscita"
+
+msgid "Upload limit"
+msgstr "Limite di upload"
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr "Benvenuti"
+
+msgid "Whitelist"
+msgstr "Elenco Consentiti"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr "Ora si è connessi alla rete mesh wireless gratuita"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"È possibile inserire il proprio testo che viene visualizzato ai clienti qui "
+"<br/> È possibile utilizzare i seguenti marcatori.: ###COMMUNITY###, "
+"###COMMUNITY_URL###, ###CONTACTURL###, ###LEASETIME###, ###LIMIT### and "
+"###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"L'accesso a questa rete è stata bloccata, molto probabilmente perché hai "
+"fatto qualcosa che le nostre regole vietano espressamente."
+
+msgid "Your bandwidth is limited to"
+msgstr "La tua larghezza di banda è limitata a"
+
+msgid "blacklisted"
+msgstr "Lista Nera"
+
+msgid "expired"
+msgstr "scaduto"
+
+msgid "optional when using host addresses"
+msgstr "opzionale quando si utilizza indirizzi host"
+
+msgid "perform any kind of illegal activities"
+msgstr "eseguire qualsiasi tipo di attività illegali"
+
+msgid "splashed"
+msgstr "splashed"
+
+msgid "temporarily blocked"
+msgstr "temporaneamente bloccato"
+
+msgid "unknown"
+msgstr "sconosciuto"
+
+msgid "use filesharing applications on this network"
+msgstr "utilizzare le applicazioni di filesharing su questa rete"
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "sprecate banda con download o flussi inutili"
+
+msgid "whitelisted"
+msgstr "Elenco contensiti"
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr ""
+#~ "Le reti e gli host che sono elencate qui sono esclusi dallo splashing, cio* "
+#~ "sono sempre ammessi."
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "Accettando queste regole è possibile utilizzare questa rete per"
+
+#~ msgid "Edit Splash text"
+#~ msgstr "Modifica il testo Splash"
+
+#~ msgid "hour(s). After this time you need to accept these rules again."
+#~ msgstr ""
+#~ "ora(e). Trascorso questo tempo è necessario accettare queste regole di "
+#~ "nuovo."
+
+#~ msgid "the owner of this access point."
+#~ msgstr "il proprietario di questo punto di accesso."
diff --git a/trunk/package/luci/po/it/statistics.po b/trunk/package/luci/po/it/statistics.po
new file mode 100644
index 00000000..1e3fc6db
--- /dev/null
+++ b/trunk/package/luci/po/it/statistics.po
@@ -0,0 +1,608 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2014-08-05 11:41+0200\n"
+"Last-Translator: morganfw <morganfw@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Azione (destinazione)"
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd è un piccolo demone usato per raccogliere dati da varie fonti "
+"grazie a diversi plugin. Su questa pagina puoi cambiare le opzioni generali "
+"del demone collectd."
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr "Abilita questo plugin"
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr "Gruppo"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Qui puoi definire un comando che sarà avviato da collectd per leggere dei "
+"valori. Il valore sarà letto dallo stdout."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Qui puoi definire un comando che sarà avviato da collectd quando un certo "
+"valore soglia sia raggiunto. Il valore in questione sarà passato al comando "
+"incovato come stdin."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfacce"
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Lasciare deselezionato per determinare automaticamente l'interfaccia da "
+"monitorare."
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr "Tabella"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/it/tinyproxy.po b/trunk/package/luci/po/it/tinyproxy.po
new file mode 100644
index 00000000..34528c11
--- /dev/null
+++ b/trunk/package/luci/po/it/tinyproxy.po
@@ -0,0 +1,265 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-12-15 19:29+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Aggiungi una intestazione http \"X-Tinyproxy\" contenente l'IP del client a "
+"cui forwardare la richiesta"
+
+msgid "Allowed clients"
+msgstr "Client permessi"
+
+msgid "Allowed connect ports"
+msgstr "Porte di connessione permesse"
+
+msgid "Bind address"
+msgstr "Bind Address"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"Di default, il filto è basato sul nome di dominio. Abilita questa opzione "
+"per effettuare il match con URL"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configurazione"
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr "Abilita il server Tinyproxy"
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "Impossibile recuperare le statistiche dall'url:"
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Lista di indirizzi IP o range di indirizzi a cui è permesso l'uso del proxy"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "Numero massimo di client simultanei permessi"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/it/transmission.po b/trunk/package/luci/po/it/transmission.po
new file mode 100644
index 00000000..1008fad2
--- /dev/null
+++ b/trunk/package/luci/po/it/transmission.po
@@ -0,0 +1,295 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-09 21:28+0200\n"
+"PO-Revision-Date: 2013-02-09 21:30+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Velocità di download alternativo"
+
+msgid "Alternative speed enabled"
+msgstr "Velocità alternativa attivata"
+
+msgid "Alternative speed time begin"
+msgstr "Tempo di velocità alternativa inizio"
+
+msgid "Alternative speed time day"
+msgstr "Tempo di velocità alternativa giorno"
+
+msgid "Alternative speed time end"
+msgstr "Tempo di velocità alternativa fine"
+
+msgid "Alternative speed timing enabled"
+msgstr "Periodo di velocità alternativa attiva"
+
+msgid "Alternative upload speed"
+msgstr "Velocità alternativa di upload"
+
+msgid "Automatically start added torrents"
+msgstr "Avvia automaticamente i torrent aggiunti"
+
+msgid "Bandwidth settings"
+msgstr "Impostazioni larghezza della banda"
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/it/upnp.po b/trunk/package/luci/po/it/upnp.po
new file mode 100644
index 00000000..a8ef2e98
--- /dev/null
+++ b/trunk/package/luci/po/it/upnp.po
@@ -0,0 +1,155 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-02-03 13:52+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Le ACL specificano quali porte esterne possono essere redirezionate agli "
+"indirizzi interni e porte."
+
+msgid "Action"
+msgstr "Azione"
+
+msgid "Active UPnP Redirects"
+msgstr "Attiva reindirizzamento UPnP"
+
+msgid "Advanced Settings"
+msgstr "Opzioni Avanzate"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Permetti l'aggiunta della mappatura solo agli indirizzi IP richiedenti"
+
+msgid "Announced model number"
+msgstr "Numero di modello annunciato"
+
+msgid "Announced serial number"
+msgstr "Numero seriale annunciato"
+
+msgid "Clean rules interval"
+msgstr "Cancella le regole"
+
+msgid "Clean rules threshold"
+msgstr "Pulisci le regole degli eventi"
+
+msgid "Client Address"
+msgstr "Indirizzo IP"
+
+msgid "Client Port"
+msgstr "Porta"
+
+msgid "Collecting data..."
+msgstr "Raccolgo i dati..."
+
+msgid "Comment"
+msgstr "Descrizione"
+
+msgid "Delete Redirect"
+msgstr "Cancella Mappatura"
+
+msgid "Device UUID"
+msgstr "UUID del dispositivo"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Abilita il protocollo NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Abilita il protocollo UPnP"
+
+msgid "Enable additional logging"
+msgstr "Abilita log addizionale"
+
+msgid "Enable secure mode"
+msgstr "Abilita la modalità sicura"
+
+msgid "External Port"
+msgstr "Porta Esterna"
+
+msgid "External ports"
+msgstr "Porte Esterne"
+
+msgid "General Settings"
+msgstr "Opzioni Generali"
+
+msgid "Internal addresses"
+msgstr "Indirizzi Interni"
+
+msgid "Internal ports"
+msgstr "Porte Interne"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP ACLs"
+
+msgid "MiniUPnP settings"
+msgstr "Opzioni di MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Intervello di notifica"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Presentation URL"
+msgstr "URL di presentazione"
+
+msgid "Protocol"
+msgstr "Protocollo"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Scrivi nel log di sistema le informazioni di extra debugging"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Mostra l'uptime del sistema invece del demone"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Avvia il servizo UPnP e NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Non ci sono mappature attive."
+
+msgid "UPNP"
+msgstr "UPNP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP permette ai dispositivi nella rete locale di configurare "
+"automaticamente il router."
+
+msgid "UPnP lease file"
+msgstr "UPnP lease file"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Valori in KByte/s, (informativo)"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP permette ai dispositivi nella rete locale di configurare "
+#~ "automaticamente il router."
+
+#~ msgid "enable"
+#~ msgstr "abilita"
diff --git a/trunk/package/luci/po/it/ushare.po b/trunk/package/luci/po/it/ushare.po
new file mode 100644
index 00000000..5837a11a
--- /dev/null
+++ b/trunk/package/luci/po/it/ushare.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-02-03 14:03+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Percorso dei contenuti"
+
+msgid "Disable telnet console"
+msgstr "Disabilita console telnet"
+
+msgid "Disable webinterface"
+msgstr "Disabilita l'interfaccia web"
+
+msgid "Enable"
+msgstr "Attiva"
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid "Options"
+msgstr "Opzioni"
+
+msgid "Servername"
+msgstr "Nome del server"
+
+msgid "Settings"
+msgstr "Impostazioni"
+
+msgid "Username"
+msgstr "Nome Utente"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare è un Server Multimediale UPnP (TM) A / V e DLNA. Implementa il "
+"componente server che fornisce ai dispositivi multimediali UPnP, le "
+"informazioni su file multimediali disponibili."
diff --git a/trunk/package/luci/po/it/uvc_streamer.po b/trunk/package/luci/po/it/uvc_streamer.po
new file mode 100644
index 00000000..11cb6c21
--- /dev/null
+++ b/trunk/package/luci/po/it/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-19 23:17+0200\n"
+"Last-Translator: claudyus <claudyus84@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Frame per secondo"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Risoluzione"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Impostazioni"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Streaming della webcam"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configura la tua webcam compatibile Linux-UVC. Prova con il browser <a href="
+"\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/it/vnstat.po b/trunk/package/luci/po/it/vnstat.po
new file mode 100644
index 00000000..8cc6e5b3
--- /dev/null
+++ b/trunk/package/luci/po/it/vnstat.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-05-17 22:00+0200\n"
+"Last-Translator: coatto87 <coatto87@gmail.com>\n"
+"Language-Team: German\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configuration"
+msgstr "Configurazione"
+
+msgid "Daily traffic"
+msgstr "Traffico giornaliero"
+
+msgid "Graphs"
+msgstr "Grafici"
+
+msgid "Hourly traffic"
+msgstr "Traffico orario"
+
+msgid "Monitor selected interfaces"
+msgstr "Monitora le interfacce selezionate"
+
+msgid "Monthly traffic"
+msgstr "Traffico mensile"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Non è ancora stato configurato un database. Vai nella configurazione di "
+"VnStat e abilita il monitoraggio per una o più interfacce."
+
+msgid "Restart VnStat"
+msgstr "Riavvia VnStat"
+
+msgid "Summary display"
+msgstr "Riassunto"
+
+msgid "Top 10 display"
+msgstr "Top 10 display"
+
+msgid "Update »"
+msgstr "Aggiorna"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Grafici VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Monitor del traffico VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat è un monitor del traffico di rete per Linux che scrive un log per le "
+"interfacce selezionate."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "Il servizio VnStat è stato riavviato."
diff --git a/trunk/package/luci/po/it/voice_core.po b/trunk/package/luci/po/it/voice_core.po
new file mode 100644
index 00000000..4d22ff03
--- /dev/null
+++ b/trunk/package/luci/po/it/voice_core.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-03 14:00+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefoni"
+
+msgid "Voice"
+msgstr "Voce"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/it/voice_diag.po b/trunk/package/luci/po/it/voice_diag.po
new file mode 100644
index 00000000..620aedf5
--- /dev/null
+++ b/trunk/package/luci/po/it/voice_diag.po
@@ -0,0 +1,30 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-03 14:13+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Diagnostics"
+msgstr "Diagnostiche"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Le funzioni di diagnostica disponibili sul dispositivo dipendono i moduli "
+"che sono stati installati."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"In questo menu ci sono delle opzioni che consentono di configurare ed "
+"eseguire test sulle operazioni vocali del sistema. Questi sono noti come "
+"diagnostica."
diff --git a/trunk/package/luci/po/it/watchcat.po b/trunk/package/luci/po/it/watchcat.po
new file mode 100644
index 00000000..0acdd180
--- /dev/null
+++ b/trunk/package/luci/po/it/watchcat.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-02-03 14:12+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "Ritardo riavvio forzato"
+
+msgid "Host address to ping"
+msgstr "Indirizzo dell'host da pingare"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Ogni quanto si vuole controllare la connessione. Di default espresso in "
+"secondi, puoi usare il sufisso 'm' per i minuti, 'h' per le ore o 'd' per i "
+"giorni"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"In modalità periodica, definisce il periodo di riavvio. In modalità "
+"internet, definisce il più lungo periodo del tempo senza connessione "
+"internet prima di un riavvio è  pianificato. L'unità predefinita è in "
+"secondi, si può usare il suffisso 'm' per i minuti, 'h' per le ore o 'd' per "
+"i giorni."
+
+msgid "Operating mode"
+msgstr "Modalità"
+
+msgid "Period"
+msgstr "Periodo"
+
+msgid "Ping host"
+msgstr "Ping host"
+
+msgid "Ping period"
+msgstr "Periodo del Ping"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat ti permette di configurare un riavvio periodico quando la "
+"connessione a internet è stata persa per un certo periodo."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"Quando watchcat vuole riavviare il sistema usa un soft reboot, immetendo un "
+"valore diverso da 0 in questo campo il proverà un hard reboot se il soft "
+"reboot fallisce. Inserire un numero espresso in secondi per abilitare, usa 0 "
+"per disabilitare"
diff --git a/trunk/package/luci/po/it/wol.po b/trunk/package/luci/po/it/wol.po
new file mode 100644
index 00000000..63ac0d8d
--- /dev/null
+++ b/trunk/package/luci/po/it/wol.po
@@ -0,0 +1,56 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2013-02-03 14:01+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Broadcast su tutte le interfaccie"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Scegli l'host da \"svegliare\" o inserisci il MAC address da usare"
+
+msgid "Host to wake up"
+msgstr "Host da \"svegliare\""
+
+msgid "Network interface to use"
+msgstr "Interfacci di rete da usare"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Avvolte solo uno dei due tools funziona. Se uno fallisce, tenta di usare il "
+"secondo"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Secifica l'interfaccia su cui il pacchetto \"magico\" WoL è inviato"
+
+msgid "Starting WoL utility:"
+msgstr "Avvia l'utility WoL:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LAN è un meccanismo che ti permette di avviare da remoto un computer "
+"collegato alla LAN."
+
+msgid "Wake up host"
+msgstr "Sveglia Host"
+
+msgid "WoL program"
+msgstr "Programma WoL"
diff --git a/trunk/package/luci/po/it/wshaper.po b/trunk/package/luci/po/it/wshaper.po
new file mode 100644
index 00000000..6a72c7e5
--- /dev/null
+++ b/trunk/package/luci/po/it/wshaper.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-01-28 01:36+0200\n"
+"PO-Revision-Date: 2013-02-03 14:07+0200\n"
+"Last-Translator: Francesco <3gasas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr "Collegamento discendente"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Larghezza di banda in downstream in kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Host o rete in notazione CIDR."
+
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgid "Low priority destination ports"
+msgstr "Porte di destinazione a bassa priorità"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Hosts a bassa priorità (Destinazione)"
+
+msgid "Low priority hosts (Source)"
+msgstr "Hosts a bassa priorità (Fonte)"
+
+msgid "Low priority source ports"
+msgstr "Porte sorgenti a bassa priorità"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Larghezza di banda in upstream in kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Impostazioni Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"WonderShaper usa la regolazione del traffico per garantire bassa latenza per "
+"il traffico interattivo anche quando la connessione a Internet è molto "
+"satura."
diff --git a/trunk/package/luci/po/ja/ahcp.po b/trunk/package/luci/po/ja/ahcp.po
new file mode 100644
index 00000000..dd78ccdf
--- /dev/null
+++ b/trunk/package/luci/po/ja/ahcp.po
@@ -0,0 +1,117 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-19 07:54+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "AHCP Server"
+msgstr "AHCPサーバー"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCPはIPv6及びIPv6/IPv4デュアルスタックを使用するネットワークにおいて、ルー"
+"ターディスカバリの代わりとして使用するためにデザインされた自動設定プロトコル"
+"です。また、AHCPはモバイル・アドホックネットワークのような、リンク層のドメイ"
+"ンブロードキャスト毎に設定を行うことが困難なネットワークでのDHCP機能としても"
+"使用することができます。"
+
+msgid "Active AHCP Leases"
+msgstr "有効なAHCPリース"
+
+msgid "Address"
+msgstr "アドレス"
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Age"
+msgstr "Age"
+
+msgid "Announced DNS servers"
+msgstr "通知するDNSサーバー"
+
+msgid "Announced NTP servers"
+msgstr "通知するNTPサーバー"
+
+msgid "Announced prefixes"
+msgstr "通知するプレフィクス"
+
+msgid "Collecting data..."
+msgstr "データ収集中です..."
+
+msgid "Forwarder"
+msgstr "転送"
+
+msgid "General Setup"
+msgstr "一般設定"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4及びIPv6"
+
+msgid "IPv4 only"
+msgstr "IPv4のみ"
+
+msgid "IPv6 only"
+msgstr "IPv6のみ"
+
+msgid "Lease directory"
+msgstr "リースファイル・ディレクトリ"
+
+msgid "Lease validity time"
+msgstr "リース有効時間"
+
+msgid "Log file"
+msgstr "ログファイル"
+
+msgid "Multicast address"
+msgstr "マルチキャストアドレス"
+
+msgid "Operation mode"
+msgstr "動作モード"
+
+msgid "Port"
+msgstr "ポート"
+
+msgid "Protocol family"
+msgstr "プロトコルファミリ"
+
+msgid "Served interfaces"
+msgstr "対象インターフェース"
+
+msgid "Server"
+msgstr "サーバー"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "通知するNTPサーバーのIPv4及びIPv6アドレスを設定します"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "通知するDNSサーバーのIPv4及びIPv6アドレスを設定します"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"通知するIPv4及びIPv6アドレスのネットワーク・プレフィクスをCIDR形式で設定しま"
+"す"
+
+msgid "The AHCP Service is not running."
+msgstr "AHCP サービスは稼働していません。"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "AHCP サービスは稼働中です。(ID %s)"
+
+msgid "There are no active leases."
+msgstr "有効なリースはありません。"
+
+msgid "Unique ID file"
+msgstr "ユニークIDファイル"
diff --git a/trunk/package/luci/po/ja/asterisk.po b/trunk/package/luci/po/ja/asterisk.po
new file mode 100644
index 00000000..98bd10b4
--- /dev/null
+++ b/trunk/package/luci/po/ja/asterisk.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-01-08 13:20+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Asterisk の全般オプション"
+
+#~ msgid "AGI directory"
+#~ msgstr "AGI ディレクトリ"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "録音されたサウンドを録音中にキャッシュ"
+
+#~ msgid "Debug Level"
+#~ msgstr "デバッグレベル"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "いくつかの警告を無効にする"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "クラッシュ時にコアダンプを出力する"
+
+#~ msgid "High Priority"
+#~ msgstr "高優先度"
+
+#~ msgid "Log directory"
+#~ msgstr "ログ ディレクトリ"
+
+#~ msgid "Allow transfer"
+#~ msgstr "転送を許可"
+
+#~ msgid "Clear global vars"
+#~ msgstr "グローバル変数を消去"
diff --git a/trunk/package/luci/po/ja/base.po b/trunk/package/luci/po/ja/base.po
new file mode 100644
index 00000000..be03e257
--- /dev/null
+++ b/trunk/package/luci/po/ja/base.po
@@ -0,0 +1,4061 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2013-10-06 02:29+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d 分幅, %d 秒間隔)"
+
+msgid "(%s available)"
+msgstr "(%s 使用可能)"
+
+msgid "(empty)"
+msgstr "(空)"
+
+msgid "(no interfaces attached)"
+msgstr "(インターフェースが接続されていません)"
+
+msgid "-- Additional Field --"
+msgstr "-- 追加項目 --"
+
+msgid "-- Please choose --"
+msgstr "-- 選択してください --"
+
+msgid "-- custom --"
+msgstr "-- 手動設定 --"
+
+msgid "1 Minute Load:"
+msgstr "過去1分の負荷:"
+
+msgid "15 Minute Load:"
+msgstr "過去15分の負荷:"
+
+msgid "5 Minute Load:"
+msgstr "過去5分の負荷:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> クエリポート"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> サーバーポート"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"リゾルバファイルの順番に、<abbr title=\"Domain Name System\">DNS</abbr>サー"
+"バーに問い合わせを行います"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-アドレス"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-ゲートウェイ"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-ネットマスク"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-アドレス又はネット"
+"ワーク (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-ゲートウェイ"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 名"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-アドレス"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"maximal\">最大</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> リース"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">最大</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> パケットサイズ"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">最大</abbr> 並列処理クエリ"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "ARサポート"
+
+msgid "ARP retry threshold"
+msgstr "ARP再試行しきい値"
+
+msgid "ATM Bridges"
+msgstr "ATMブリッジ"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM仮想チャネル識別子 (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM仮想パス識別子 (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr "ATMデバイス番号"
+
+msgid "Access Concentrator"
+msgstr "Access Concentrator"
+
+msgid "Access Point"
+msgstr "アクセスポイント"
+
+msgid "Action"
+msgstr "動作"
+
+msgid "Actions"
+msgstr "動作"
+
+msgid "Activate this network"
+msgstr "このネットワークを有効にする"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"稼働中の <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-経路情報"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"稼働中の <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-経路情報"
+
+msgid "Active Connections"
+msgstr "アクティブコネクション"
+
+msgid "Active DHCP Leases"
+msgstr "アクティブなDHCPリース"
+
+msgid "Active DHCPv6 Leases"
+msgstr "アクティブなDHCPv6リース"
+
+msgid "Ad-Hoc"
+msgstr "アドホック"
+
+msgid "Add"
+msgstr "追加"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr "インターフェースの新規作成..."
+
+msgid "Additional Hosts files"
+msgstr "追加のホストファイル"
+
+msgid "Address"
+msgstr "アドレス"
+
+msgid "Address to access local relay bridge"
+msgstr "ローカル・リレーブリッジにアクセスするためのIPアドレス"
+
+msgid "Administration"
+msgstr "管理画面"
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Alert"
+msgstr "警告"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "<abbr title=\"Secure Shell\">SSH</abbr> パスワード認証を許可します"
+
+msgid "Allow all except listed"
+msgstr "リスト内の端末からのアクセスを禁止"
+
+msgid "Allow listed only"
+msgstr "リスト内の端末からのアクセスを許可"
+
+msgid "Allow localhost"
+msgstr "ローカルホストを許可する"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"リモートホストがSSH転送されたローカルのポートに接続することを許可します"
+
+msgid "Allow root logins with password"
+msgstr "パスワードを使用したroot権限でのログインを許可する"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "パスワードを使用した<em>root</em>権限でのログインを許可する"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"第2チャネルが重複しても、常に40MHz帯域幅を使用します。ただし本オプションは"
+"IEEE 802.11n-2009を満たしていません!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "チェックボックスがオフの場合、追加のネットワークが作成されます。"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "アンテナ 1"
+
+msgid "Antenna 2"
+msgstr "アンテナ 2"
+
+msgid "Antenna Configuration"
+msgstr "アンテナ設定"
+
+msgid "Any zone"
+msgstr "全てのゾーン"
+
+msgid "Apply"
+msgstr "適用"
+
+msgid "Applying changes"
+msgstr "変更を適用"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "認証済み端末"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s 無線LANコントローラ"
+
+msgid "Authentication"
+msgstr "認証"
+
+msgid "Authoritative"
+msgstr "Authoritative"
+
+msgid "Authorization Required"
+msgstr "ログイン認証"
+
+msgid "Auto Refresh"
+msgstr "自動更新"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "使用可"
+
+msgid "Available packages"
+msgstr "インストール可能なパッケージ"
+
+msgid "Average:"
+msgstr "平均値:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "戻る"
+
+msgid "Back to Overview"
+msgstr "概要へ戻る"
+
+msgid "Back to configuration"
+msgstr "設定へ戻る"
+
+msgid "Back to overview"
+msgstr "概要へ戻る"
+
+msgid "Back to scan results"
+msgstr "スキャン結果へ戻る"
+
+msgid "Background Scan"
+msgstr "バックグラウンドスキャン"
+
+msgid "Backup / Flash Firmware"
+msgstr "バックアップ / ファームウェア更新"
+
+msgid "Backup / Restore"
+msgstr "バックアップ / 復元"
+
+msgid "Backup file list"
+msgstr "バックアップ・ファイルリスト"
+
+msgid "Bad address specified!"
+msgstr "無効なアドレスです!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"以下はバックアップの際に含まれるファイルリストです。このリストは、opkgによっ"
+"て認識されている設定ファイル、重要なベースファイル、ユーザーが設定した正規表"
+"現に一致したファイルの一覧です。"
+
+msgid "Bitrate"
+msgstr "ビットレート"
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr "ブリッジ"
+
+msgid "Bridge interfaces"
+msgstr "ブリッジインターフェース"
+
+msgid "Bridge unit number"
+msgstr "ブリッジユニット番号"
+
+msgid "Bring up on boot"
+msgstr "デフォルトで起動する"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s 無線LANコントローラ"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 無線LANコントローラ"
+
+msgid "Buffered"
+msgstr "バッファ"
+
+msgid "Buttons"
+msgstr "ボタン"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "CPU使用率 (%)"
+
+msgid "Cached"
+msgstr "キャッシュ"
+
+msgid "Cancel"
+msgstr "キャンセル"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "チェイン"
+
+msgid "Changes"
+msgstr "変更"
+
+msgid "Changes applied."
+msgstr "変更が適用されました。"
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "デバイスの管理者パスワードを変更します"
+
+msgid "Channel"
+msgstr "チャネル"
+
+msgid "Check"
+msgstr "チェック"
+
+msgid "Checksum"
+msgstr "チェックサム"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"このインターフェースに設定するファイウォール・ゾーンを選択してください。<em>"
+"設定しない</em>を選択すると、設定済みのゾーンを削除します。また、<em>作成</"
+"em>フィールドにゾーン名を入力すると、新しくゾーンを作成し、このインターフェー"
+"スに設定します。"
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"無線インターフェースをアタッチするネットワークを選択してください。または、"
+"<em>作成</em>欄を選択すると新しいネットワークを作成します。"
+
+msgid "Cipher"
+msgstr "暗号化方式"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"\"バックアップアーカイブの作成\"をクリックすると、現在の設定ファイルをtar形式"
+"のアーカイブファイルとしてダウンロードします。設定のリセットを行う場合、\"設"
+"定リセット\"をクリックしてください。(ただし、squashfsをお使いの場合のみ使用可"
+"能です)"
+
+msgid "Client"
+msgstr "クライアント"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "DHCPリクエスト時に送信するクライアントID"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"設定した秒数後に、使用していない接続を閉じます。0を設定した場合、接続を維持し"
+"ます"
+
+msgid "Close list..."
+msgstr "リストを閉じる"
+
+msgid "Collecting data..."
+msgstr "データ収集中です..."
+
+msgid "Command"
+msgstr "コマンド"
+
+msgid "Common Configuration"
+msgstr "一般設定"
+
+msgid "Compression"
+msgstr "圧縮"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "Configuration applied."
+msgstr "設定を適用しました。"
+
+msgid "Configuration files will be kept."
+msgstr "設定ファイルは保持されます。"
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr "このマウント設定をblock-extrootのオーバーレイ記憶領域として設定する"
+
+msgid "Confirmation"
+msgstr "確認"
+
+msgid "Connect"
+msgstr "接続"
+
+msgid "Connected"
+msgstr "接続中"
+
+msgid "Connection Limit"
+msgstr "接続制限"
+
+msgid "Connections"
+msgstr "ネットワーク接続"
+
+msgid "Country"
+msgstr "国"
+
+msgid "Country Code"
+msgstr "国コード"
+
+msgid "Cover the following interface"
+msgstr "インターフェースの指定"
+
+msgid "Cover the following interfaces"
+msgstr "インターフェースの指定"
+
+msgid "Create / Assign firewall-zone"
+msgstr "ファイアウォールゾーンの作成 / 割り当て"
+
+msgid "Create Interface"
+msgstr "インターフェースの作成"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "複数のインタフェースを指定してブリッジを作成します"
+
+msgid "Critical"
+msgstr "重大"
+
+msgid "Cron Log Level"
+msgstr "Cronのログ出力レベル"
+
+msgid "Custom Interface"
+msgstr "新しいインターフェース"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"<abbr title=\"Light Emitting Diode\">LED</abbr> デバイスの挙動をカスタマイズ"
+"します。"
+
+msgid "DHCP Leases"
+msgstr "DHCPリース"
+
+msgid "DHCP Server"
+msgstr "DHCPサーバー"
+
+msgid "DHCP and DNS"
+msgstr "DHCP 及び DNS"
+
+msgid "DHCP client"
+msgstr "DHCP クライアント"
+
+msgid "DHCP-Options"
+msgstr "DHCPオプション"
+
+msgid "DHCPv6 Leases"
+msgstr "DHCPv6 リース"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "DNSフォワーディング"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "デバッグ"
+
+msgid "Default %d"
+msgstr "標準設定 %d"
+
+msgid "Default gateway"
+msgstr "デフォルトゲートウェイ"
+
+msgid "Default state"
+msgstr "標準状態"
+
+msgid "Define a name for this network."
+msgstr "ネットワーク名を設定してください。"
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"追加のDHCPオプションを設定します。（例：\"<code>6,192.168.2.1,192.168.2.2</"
+"code>\" と設定することで、クライアントに指定のDNSサーバーを通知します。）"
+
+msgid "Delete"
+msgstr "削除"
+
+msgid "Delete this interface"
+msgstr "インターフェースを削除します"
+
+msgid "Delete this network"
+msgstr "ネットワークを削除します"
+
+msgid "Description"
+msgstr "詳細"
+
+msgid "Design"
+msgstr "デザイン"
+
+msgid "Destination"
+msgstr "宛先"
+
+msgid "Device"
+msgstr "デバイス"
+
+msgid "Device Configuration"
+msgstr "デバイス設定"
+
+msgid "Diagnostics"
+msgstr "診断機能"
+
+msgid "Directory"
+msgstr "ディレクトリ"
+
+msgid "Disable"
+msgstr "無効"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"このインターフェースでは<abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>機能を使用しません。"
+
+msgid "Disable DNS setup"
+msgstr "DNSセットアップを無効にする"
+
+msgid "Disable HW-Beacon timer"
+msgstr "HWビーコンタイマーを無効にする"
+
+msgid "Disabled"
+msgstr "無効"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "RFC1918の応答を破棄します"
+
+msgid "Displaying only packages containing"
+msgstr "右記の表示を含んだパッケージのみを表示中"
+
+msgid "Distance Optimization"
+msgstr "距離の最適化"
+
+msgid "Distance to farthest network member in meters."
+msgstr "最も遠い端末との距離(メートル)を設定してください。"
+
+msgid "Diversity"
+msgstr "ダイバシティ"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq は <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+"サーバーと <abbr title=\"Network Address Translation\">NAT</abbr>ファイア"
+"ウォールの為の <abbr title=\"Domain Name System\">DNS</abbr>フォワーダーを複"
+"合したサービスです。"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+"無効なリプライをキャッシュしません (例：存在しないドメインからの返答など)"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr "パブリックDNSサーバーが返答できなかったリクエストを転送しません"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "ローカルネットワークへの逆引きを転送しません"
+
+msgid "Do not send probe responses"
+msgstr "プローブレスポンスを送信しない"
+
+msgid "Domain required"
+msgstr "ドメイン必須"
+
+msgid "Domain whitelist"
+msgstr "ドメイン・ホワイトリスト"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr>名の無い <abbr title=\"Domain "
+"Name System\">DNS</abbr>リクエストを転送しません"
+
+msgid "Download and install package"
+msgstr "パッケージのダウンロードとインストール"
+
+msgid "Download backup"
+msgstr "バックアップアーカイブのダウンロード"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear設定"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear は <abbr title=\"Secure Shell\">SSH</abbr> ネットワークへのシェルア"
+"クセスと統合された <abbr title=\"Secure Copy\">SCP</abbr> サーバーを提供しま"
+"す。"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"ダイナミック <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "動的トンネル機能"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"クライアントに対して動的にDHCPアドレスを割り振ります。無効に設定した場合、静"
+"的リースのみを行います。"
+
+msgid "EAP-Method"
+msgstr "EAPメソッド"
+
+msgid "Edit"
+msgstr "編集"
+
+msgid "Edit this interface"
+msgstr "インターフェースを編集"
+
+msgid "Edit this network"
+msgstr "ネットワークを編集"
+
+msgid "Emergency"
+msgstr "緊急"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr>を有効にする"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "HE.netの動的endpoint更新を有効にします"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "PPPリンクのIPv6ネゴシエーションを有効にする"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "ジャンボフレーム・パススルーを有効にする"
+
+msgid "Enable NTP client"
+msgstr "NTPクライアント機能を有効にする"
+
+msgid "Enable TFTP server"
+msgstr "TFTPサーバーを有効にする"
+
+msgid "Enable VLAN functionality"
+msgstr "VLAN機能を有効にする"
+
+msgid "Enable learning and aging"
+msgstr "ラーニング・エイジング機能を有効にする"
+
+msgid "Enable this mount"
+msgstr "マウント設定を有効にする"
+
+msgid "Enable this swap"
+msgstr "スワップ設定を有効にする"
+
+msgid "Enable/Disable"
+msgstr "有効/無効"
+
+msgid "Enabled"
+msgstr "有効"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "スパニングツリー・プロトコルを有効にする"
+
+msgid "Encapsulation mode"
+msgstr "カプセル化モード"
+
+msgid "Encryption"
+msgstr "暗号化モード"
+
+msgid "Erasing..."
+msgstr "消去中..."
+
+msgid "Error"
+msgstr "エラー"
+
+msgid "Ethernet Adapter"
+msgstr "イーサネットアダプタ"
+
+msgid "Ethernet Switch"
+msgstr "イーサネットスイッチ"
+
+msgid "Expand hosts"
+msgstr "拡張ホスト設定"
+
+msgid "Expires"
+msgstr "期限切れ"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"リースアドレスの有効時間を入力します。最小設定値は2分です。 (<code>2m</"
+"code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "外部システムログ・サーバー"
+
+msgid "External system log server port"
+msgstr "外部システムログ・サーバーポート"
+
+msgid "Fast Frames"
+msgstr "ファスト・フレーム"
+
+msgid "File"
+msgstr "ファイル"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "クライアントに通知するブートイメージのファイル名"
+
+msgid "Filesystem"
+msgstr "ファイルシステム"
+
+msgid "Filter"
+msgstr "フィルタ"
+
+msgid "Filter private"
+msgstr "プライベートフィルター"
+
+msgid "Filter useless"
+msgstr "Filter useless"
+
+msgid "Find and join network"
+msgstr "ネットワークを検索して参加"
+
+msgid "Find package"
+msgstr "パッケージを検索"
+
+msgid "Finish"
+msgstr "終了"
+
+msgid "Firewall"
+msgstr "ファイアウォール"
+
+msgid "Firewall Settings"
+msgstr "ファイアウォール設定"
+
+msgid "Firewall Status"
+msgstr "ファイアウォール・ステータス"
+
+msgid "Firmware Version"
+msgstr "ファームウェア・バージョン"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "DNSクエリを送信する送信元ポートを固定します"
+
+msgid "Flags"
+msgstr "フラグ"
+
+msgid "Flash Firmware"
+msgstr "ファームウェアの更新"
+
+msgid "Flash image..."
+msgstr "更新"
+
+msgid "Flash new firmware image"
+msgstr "ファームウェアの更新"
+
+msgid "Flash operations"
+msgstr "更新機能"
+
+msgid "Flashing..."
+msgstr "更新中..."
+
+msgid "Force"
+msgstr "強制"
+
+msgid "Force 40MHz mode"
+msgstr "強制的に40MHzモードで動作する"
+
+msgid "Force CCMP (AES)"
+msgstr "CCMP (AES) を使用"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+"別のDHCPサーバーが検出された場合でも、DHCPサーバー機能を強制的に起動します。"
+
+msgid "Force TKIP"
+msgstr "TKIP を使用"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "TKIP 及びCCMP (AES) を使用"
+
+msgid "Forward DHCP traffic"
+msgstr "DHCPトラフィックを転送する"
+
+msgid "Forward broadcast traffic"
+msgstr "ブロードキャスト・トラフィックを転送する"
+
+msgid "Forwarding mode"
+msgstr "転送モード"
+
+msgid "Fragmentation Threshold"
+msgstr "フラグメンテーション閾値"
+
+msgid "Frame Bursting"
+msgstr "フレームバースト"
+
+msgid "Free"
+msgstr "空き"
+
+msgid "Free space"
+msgstr "ディスクの空き容量"
+
+msgid "Frequency Hopping"
+msgstr "周波数ホッピング"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "GPRSのみ"
+
+msgid "Gateway"
+msgstr "ゲートウェイ"
+
+msgid "Gateway ports"
+msgstr "ゲートウェイ・ポート"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "General Setup"
+msgstr "一般設定"
+
+msgid "Generate archive"
+msgstr "バックアップアーカイブの作成"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "802.11%s 無線LANコントローラ"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "入力されたパスワードが一致しません。パスワードは変更されませんでした!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "パスワード設定へ移動..."
+
+msgid "Go to relevant configuration page"
+msgstr "関連する設定ページへ移動"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "HE.net パスワード"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "ハンドラ"
+
+msgid "Hang Up"
+msgstr "再起動"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"このページではホスト名やタイムゾーンなどの基本的な設定を行うことが出来ます。"
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr "SSH公開鍵認証で使用するSSH公開鍵を1行づつペーストしてください。"
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b 無線LANコントローラ"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>の隠匿"
+
+msgid "Host entries"
+msgstr "ホストエントリー"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"ホスト<abbr title=\"Internet Protocol Address\">IP</abbr> または ネットワーク"
+
+msgid "Hostname"
+msgstr "ホスト名"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "DHCPリクエスト時に送信するホスト名"
+
+msgid "Hostnames"
+msgstr "ホスト名"
+
+msgid "IP address"
+msgstr "IPアドレス"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4 ファイアウォール"
+
+msgid "IPv4 WAN Status"
+msgstr "IPv4 WAN ステータス"
+
+msgid "IPv4 address"
+msgstr "IPv4 アドレス"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4及びIPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 ブロードキャスト"
+
+msgid "IPv4 gateway"
+msgstr "IPv4 ゲートウェイ"
+
+msgid "IPv4 netmask"
+msgstr "IPv4 ネットマスク"
+
+msgid "IPv4 only"
+msgstr "IPv4のみ"
+
+msgid "IPv4 prefix length"
+msgstr "IPv4 プレフィクス長"
+
+msgid "IPv4-Address"
+msgstr "IPv4-アドレス"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6 ファイアウォール"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "IPv6 WAN ステータス"
+
+msgid "IPv6 address"
+msgstr "IPv6 アドレス"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6 ゲートウェイ"
+
+msgid "IPv6 only"
+msgstr "IPv6のみ"
+
+msgid "IPv6 prefix"
+msgstr "IPv6 プレフィクス"
+
+msgid "IPv6 prefix length"
+msgstr "IPv6 プレフィクス長"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-アドレス"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-in-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-over-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-over-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "識別子"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr "固定のデバイスノード名のかわりに、設定したUUIDを使用してマウントします"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"固定のデバイスノード名のかわりに、設定したパーティションラベルを使用してマウ"
+"ントします。"
+
+msgid "If unchecked, no default route is configured"
+msgstr "チェックされていない場合、デフォルトルートを設定しません"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "チェックされていない場合、通知されたDNSサーバーアドレスを無視します"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"物理メモリが不足する場合、一時的にデータをより大容量な<abbr title=\"Random "
+"Access Memory\">RAM</abbr>デバイスにスワップすることが出来ます。ただし、デー"
+"タのスワップは非常に遅い処理であるため、スワップするデバイスには高速に<abbr "
+"title=\"Random Access Memory\">RAM</abbr>にアクセスすることができなくなる恐れ"
+"があります。"
+
+msgid "Ignore Hosts files"
+msgstr "ホストファイルを無視する"
+
+msgid "Ignore interface"
+msgstr "インターフェースを無視する"
+
+msgid "Ignore resolve file"
+msgstr "リゾルバファイルを無視する"
+
+msgid "Image"
+msgstr "イメージ"
+
+msgid "In"
+msgstr "イン"
+
+msgid "Inactivity timeout"
+msgstr "未使用時タイムアウト"
+
+msgid "Inbound:"
+msgstr "受信:"
+
+msgid "Info"
+msgstr "情報"
+
+msgid "Initscript"
+msgstr "起動スクリプト"
+
+msgid "Initscripts"
+msgstr "起動スクリプト"
+
+msgid "Install"
+msgstr "インストール"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "%q パッケージをインストールします"
+
+msgid "Install protocol extensions..."
+msgstr "プロトコル拡張機能をインストールします..."
+
+msgid "Installed packages"
+msgstr "インストール済みパッケージ"
+
+msgid "Interface"
+msgstr "インターフェース"
+
+msgid "Interface Configuration"
+msgstr "インターフェース設定"
+
+msgid "Interface Overview"
+msgstr "インターフェース一覧"
+
+msgid "Interface is reconnecting..."
+msgstr "インターフェース再接続中..."
+
+msgid "Interface is shutting down..."
+msgstr "インターフェース終了中..."
+
+msgid "Interface not present or not connected yet."
+msgstr "インターフェースが存在しないか、接続していません"
+
+msgid "Interface reconnected"
+msgstr "インターフェースの再接続"
+
+msgid "Interface shut down"
+msgstr "インターフェースの終了"
+
+msgid "Interfaces"
+msgstr "インターフェース"
+
+msgid "Internal Server Error"
+msgstr "内部サーバーエラー"
+
+msgid "Invalid"
+msgstr "入力値が不正です"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "無効なVLAN IDです! IDは%dから%dまでの値のみ入力可能です。"
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "無効なVLAN IDです! ユニークなIDを入力してください。"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "ユーザー名とパスワードが不正です! もう一度入力してください。"
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"更新しようとしたイメージファイルはこのフラッシュメモリに適合しません。もう一"
+"度イメージファイルを確認してください!"
+
+msgid "Java Script required!"
+msgstr "JavaScriptを有効にしてください!"
+
+msgid "Join Network"
+msgstr "ネットワークに接続する"
+
+msgid "Join Network: Settings"
+msgstr "ネットワークに接続する: 設定"
+
+msgid "Join Network: Wireless Scan"
+msgstr "ネットワークに接続する: 無線LANスキャン"
+
+msgid "Keep settings"
+msgstr "設定を保持する"
+
+msgid "Kernel Log"
+msgstr "カーネルログ"
+
+msgid "Kernel Version"
+msgstr "カーネルバージョン"
+
+msgid "Key"
+msgstr "暗号キー"
+
+msgid "Key #%d"
+msgstr "キー #%d"
+
+msgid "Kill"
+msgstr "強制終了"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP サーバー"
+
+msgid "LCP echo failure threshold"
+msgstr "LCP echo 失敗数しきい値"
+
+msgid "LCP echo interval"
+msgstr "LCP echo 送信間隔"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "ラベル"
+
+msgid "Language"
+msgstr "言語"
+
+msgid "Language and Style"
+msgstr "言語とスタイル"
+
+msgid "Lease validity time"
+msgstr "リース有効時間"
+
+msgid "Leasefile"
+msgstr "リースファイル"
+
+msgid "Leasetime"
+msgstr "リース時間"
+
+msgid "Leasetime remaining"
+msgstr "残りリース時間"
+
+msgid "Leave empty to autodetect"
+msgstr "空欄の場合、自動検知を行います"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "空欄の場合、現在のWANアドレスを使用します"
+
+msgid "Legend:"
+msgstr "凡例:"
+
+msgid "Limit"
+msgstr "割り当て数"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "リンクオン"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"問い合わせを転送する<abbr title=\"Domain Name System\">DNS</abbr> サーバーの"
+"リストを設定します"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "RFC1918の応答を許可するリスト"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"指定したインターフェースでのみアクセスを有効にします。設定しない場合はすべて"
+"のインタフェースが対象です"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "DNSクエリを受信するポート"
+
+msgid "Load"
+msgstr "負荷"
+
+msgid "Load Average"
+msgstr "システム平均負荷"
+
+msgid "Loading"
+msgstr "ロード中"
+
+msgid "Local IPv4 address"
+msgstr "ローカル IPv4 アドレス"
+
+msgid "Local IPv6 address"
+msgstr "ローカル IPv6 アドレス"
+
+msgid "Local Startup"
+msgstr "ローカル Startup"
+
+msgid "Local Time"
+msgstr "時刻"
+
+msgid "Local domain"
+msgstr "ローカルドメイン"
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr "ローカルサーバー"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr "ローカライズクエリ"
+
+msgid "Locked to channel %d used by %s"
+msgstr "%sが使用しているためチャネル%dはロックされています"
+
+msgid "Log output level"
+msgstr "ログ出力レベル"
+
+msgid "Log queries"
+msgstr "ログクエリー"
+
+msgid "Logging"
+msgstr "ログ"
+
+msgid "Login"
+msgstr "ログイン"
+
+msgid "Logout"
+msgstr "ログアウト"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+"ネットワークアドレスをオフセットとして、最小のアドレスを設定してください"
+
+msgid "MAC-Address"
+msgstr "MAC-アドレス"
+
+msgid "MAC-Address Filter"
+msgstr "MAC-アドレスフィルタ"
+
+msgid "MAC-Filter"
+msgstr "MAC-フィルタ"
+
+msgid "MAC-List"
+msgstr "MAC-リスト"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "最大レート"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "DHCPリースの許可される最大数"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "並列DNSクエリの許可される最大数"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "EDNS.0 UDP パケットサイズの許可される最大数"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "モデムが準備完了状態になるまでの最大待ち時間"
+
+msgid "Maximum hold time"
+msgstr "最大保持時間"
+
+msgid "Maximum number of leased addresses."
+msgstr "リースするアドレスの最大数です"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "メモリー"
+
+msgid "Memory usage (%)"
+msgstr "メモリ使用率 (%)"
+
+msgid "Metric"
+msgstr "メトリック"
+
+msgid "Minimum Rate"
+msgstr "最小レート"
+
+msgid "Minimum hold time"
+msgstr "最短保持時間"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "プロトコル %qのプロトコル拡張が見つかりません"
+
+msgid "Mode"
+msgstr "モード"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "モデムデバイス"
+
+msgid "Modem init timeout"
+msgstr "モデム初期化タイムアウト"
+
+msgid "Monitor"
+msgstr "モニター"
+
+msgid "Mount Entry"
+msgstr "マウント機能"
+
+msgid "Mount Point"
+msgstr "マウントポイント"
+
+msgid "Mount Points"
+msgstr "マウントポイント"
+
+msgid "Mount Points - Mount Entry"
+msgstr "マウントポイント - マウント"
+
+msgid "Mount Points - Swap Entry"
+msgstr "マウントポイント - スワップ"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"マウントポイントは、記憶デバイスがファイルシステムのどこに接続されているかを"
+"表示しています。"
+
+msgid "Mount options"
+msgstr "マウントオプション"
+
+msgid "Mount point"
+msgstr "マウントポイント"
+
+msgid "Mounted file systems"
+msgstr "マウント中のファイルシステム"
+
+msgid "Move down"
+msgstr "下へ"
+
+msgid "Move up"
+msgstr "上へ"
+
+msgid "Multicast Rate"
+msgstr "マルチキャストレート"
+
+msgid "Multicast address"
+msgstr "マルチキャストアドレス"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "NTPサーバー候補"
+
+msgid "Name"
+msgstr "名前"
+
+msgid "Name of the new interface"
+msgstr "新しいインターフェースの名前"
+
+msgid "Name of the new network"
+msgstr "新しいネットワークの名前"
+
+msgid "Navigation"
+msgstr "ナビゲーション"
+
+msgid "Netmask"
+msgstr "ネットマスク"
+
+msgid "Network"
+msgstr "ネットワーク"
+
+msgid "Network Utilities"
+msgstr "ネットワーク・ユーティリティ"
+
+msgid "Network boot image"
+msgstr "ネットワーク・ブート用イメージ"
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr "次 »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "このインターフェースにはDHCPサーバーが設定されていません"
+
+msgid "No chains in this table"
+msgstr "チェイン内にルールがありません"
+
+msgid "No files found"
+msgstr "ファイルが見つかりませんでした"
+
+msgid "No information available"
+msgstr "情報がありません"
+
+msgid "No negative cache"
+msgstr "ネガティブキャッシュを行なわない"
+
+msgid "No network configured on this device"
+msgstr "このデバイスに設定されているネットワークがありません"
+
+msgid "No network name specified"
+msgstr "ネットワーク名が設定されていません"
+
+msgid "No package lists available"
+msgstr "パッケージリストがありません"
+
+msgid "No password set!"
+msgstr "パスワードが設定されていません!"
+
+msgid "No rules in this chain"
+msgstr "チェイン内にルールがありません"
+
+msgid "No zone assigned"
+msgstr "ゾーンが設定されていません"
+
+msgid "Noise"
+msgstr "ノイズ"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "ノイズ:"
+
+msgid "None"
+msgstr "なし"
+
+msgid "Normal"
+msgstr "標準"
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr "アソシエーションされていません"
+
+msgid "Not connected"
+msgstr "未接続"
+
+msgid "Note: Configuration files will be erased."
+msgstr "注意: 設定ファイルは消去されます。"
+
+msgid "Notice"
+msgstr "注意"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "OPKG-設定"
+
+msgid "Off-State Delay"
+msgstr "消灯時間"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"このページではネットワークインターフェースの設定を行うことが出来ます。\"ブ"
+"リッジインターフェース\"フィールドをチェックし、複数のネットワークインター"
+"フェース名をスペースで区切りで入力することで複数のインターフェースをブリッジ"
+"することが出来ます。また、<samp>INTERFACE.VLANNR</samp>という表記により<abbr "
+"title=\"Virtual Local Area Network\">VLAN</abbr>も使用することが出来ます。"
+"(<abbr title=\"for example\">例</abbr>: <samp>eth0.1</samp>)"
+
+msgid "On-State Delay"
+msgstr "点灯時間"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "1つ以上のホスト名またはmacアドレスを設定してください!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "1つ以上のフィールドに無効な値が設定されています！"
+
+msgid "One or more required fields have no value!"
+msgstr "1つ以上のフィールドに値が設定されていません！"
+
+msgid "Open list..."
+msgstr "リストを開く"
+
+msgid "Option changed"
+msgstr "変更されるオプション"
+
+msgid "Option removed"
+msgstr "削除されるオプション"
+
+msgid "Options"
+msgstr "オプション"
+
+msgid "Other:"
+msgstr "その他:"
+
+msgid "Out"
+msgstr "アウト"
+
+msgid "Outbound:"
+msgstr "送信:"
+
+msgid "Outdoor Channels"
+msgstr "屋外用周波数"
+
+msgid "Override MAC address"
+msgstr "MACアドレスを上書きする"
+
+msgid "Override MTU"
+msgstr "MTUを上書きする"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "DHCPレスポンス内のゲートウェイアドレスを上書きする"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"クライアントへ通知するネットマスクを上書きします。通常は、設定されているサブ"
+"ネットから計算されます。"
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "概要"
+
+msgid "Owner"
+msgstr "所有者"
+
+msgid "PAP/CHAP password"
+msgstr "PAP/CHAP パスワード"
+
+msgid "PAP/CHAP username"
+msgstr "PAP/CHAP ユーザー名"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoAカプセル化"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "libiwinfo パッケージをインストールしてください！"
+
+msgid "Package lists are older than 24 hours"
+msgstr "パッケージリストは24時間以上前のものです"
+
+msgid "Package name"
+msgstr "パッケージ名"
+
+msgid "Packets"
+msgstr "パケット"
+
+msgid "Part of zone %q"
+msgstr "ゾーン %qの一部"
+
+msgid "Password"
+msgstr "パスワード"
+
+msgid "Password authentication"
+msgstr "パスワード認証"
+
+msgid "Password of Private Key"
+msgstr "秘密鍵のパスワード"
+
+msgid "Password successfully changed!"
+msgstr "パスワードを変更しました"
+
+msgid "Path to CA-Certificate"
+msgstr "CA証明書のパス"
+
+msgid "Path to Client-Certificate"
+msgstr "クライアント証明書のパス"
+
+msgid "Path to Private Key"
+msgstr "秘密鍵のパス"
+
+msgid "Path to executable which handles the button event"
+msgstr "ボタンイベントをハンドルする実行ファイルのパス"
+
+msgid "Peak:"
+msgstr "ピーク:"
+
+msgid "Perform reboot"
+msgstr "再起動を実行"
+
+msgid "Perform reset"
+msgstr "設定リセットを実行"
+
+msgid "Phy Rate:"
+msgstr "物理レート:"
+
+msgid "Physical Settings"
+msgstr "デバイス設定"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "パケット"
+
+msgid "Please enter your username and password."
+msgstr "ユーザー名とパスワードを入力してください。"
+
+msgid "Please wait: Device rebooting..."
+msgstr "しばらくお待ちください: 再起動中です..."
+
+msgid "Policy"
+msgstr "ポリシー"
+
+msgid "Port"
+msgstr "ポート"
+
+msgid "Port %d"
+msgstr "ポート %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr "ポート ステータス:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"設定回数のLCP echo 確認失敗後、ピアノードがダウンしているものと見なします。0"
+"を設定した場合、失敗しても無視します"
+
+msgid "Prevents client-to-client communication"
+msgstr "クライアント同士の通信を制限します"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b 無線LANコントローラ"
+
+msgid "Proceed"
+msgstr "続行"
+
+msgid "Processes"
+msgstr "プロセス"
+
+msgid "Prot."
+msgstr "プロトコル"
+
+msgid "Protocol"
+msgstr "プロトコル"
+
+msgid "Protocol family"
+msgstr "プロトコルファミリ"
+
+msgid "Protocol of the new interface"
+msgstr "新しいインターフェースのプロトコル"
+
+msgid "Protocol support is not installed"
+msgstr "プロトコルサポートがインストールされていません"
+
+msgid "Provide NTP server"
+msgstr "NTPサーバー機能を有効にする"
+
+msgid "Provide new network"
+msgstr "新しいネットワークを設定する"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "擬似アドホック (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "クオリティ"
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS閾値"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "受信レート"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "RaLink 802.11%s 無線LANコントローラ"
+
+msgid "Radius-Accounting-Port"
+msgstr "Radiusアカウントサーバー・ポート番号"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Radiusアカウント秘密鍵"
+
+msgid "Radius-Accounting-Server"
+msgstr "Radiusアカウントサーバー"
+
+msgid "Radius-Authentication-Port"
+msgstr "Radius認証サーバー・ポート番号"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Radius認証秘密鍵"
+
+msgid "Radius-Authentication-Server"
+msgstr "Radius認証サーバー"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>サーバーの設定"
+"として<code>/etc/ethers</code> をロードします"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"本当にこのインターフェースを削除しますか?一度削除すると、元に戻すことはできま"
+"せん!\n"
+"このインターフェースを経由して接続している場合、デバイスにアクセスできなくな"
+"る場合があります。"
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"本当にこの無線ネットワークを削除しますか?一度削除すると、元に戻すことはできま"
+"せん!\n"
+"このネットワークを経由して接続している場合、デバイスにアクセスできなくなる場"
+"合があります。"
+
+msgid "Really reset all changes?"
+msgstr "本当に全ての変更をリセットしますか?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"本当にネットワークを停止しますか?\n"
+"このネットワークを経由して接続している場合、デバイスにアクセスできなくなる場"
+"合があります。"
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"本当にインターフェース \"%s\" を停止しますか?\n"
+"このインターフェースを経由して接続している場合、デバイスにアクセスできなくな"
+"る場合があります。"
+
+msgid "Really switch protocol?"
+msgstr "本当にプロトコルを切り替えますか?"
+
+msgid "Realtime Connections"
+msgstr "リアルタイム・コネクション"
+
+msgid "Realtime Graphs"
+msgstr "リアルタイム・グラフ"
+
+msgid "Realtime Load"
+msgstr "リアルタイム・ロード"
+
+msgid "Realtime Traffic"
+msgstr "リアルタイム・トラフィック"
+
+msgid "Realtime Wireless"
+msgstr "リアルタイム・無線LAN"
+
+msgid "Rebind protection"
+msgstr "DNSリバインディング・プロテクション"
+
+msgid "Reboot"
+msgstr "再起動"
+
+msgid "Rebooting..."
+msgstr "再起動中..."
+
+msgid "Reboots the operating system of your device"
+msgstr "デバイスのオペレーティングシステムを再起動します。"
+
+msgid "Receive"
+msgstr "受信"
+
+msgid "Receiver Antenna"
+msgstr "受信アンテナ"
+
+msgid "Reconnect this interface"
+msgstr "インターフェースの再接続"
+
+msgid "Reconnecting interface"
+msgstr "インターフェース再接続中"
+
+msgid "References"
+msgstr "参照カウンタ"
+
+msgid "Regulatory Domain"
+msgstr "規制ドメイン"
+
+msgid "Relay"
+msgstr "リレー"
+
+msgid "Relay Bridge"
+msgstr "リレーブリッジ"
+
+msgid "Relay between networks"
+msgstr "ネットワーク間のリレー設定"
+
+msgid "Relay bridge"
+msgstr "リレーブリッジ"
+
+msgid "Remote IPv4 address"
+msgstr "リモートIPv4アドレス"
+
+msgid "Remove"
+msgstr "削除"
+
+msgid "Repeat scan"
+msgstr "再スキャン"
+
+msgid "Replace entry"
+msgstr "エントリーの置換"
+
+msgid "Replace wireless configuration"
+msgstr "無線設定を置換する"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "DOCSIS 3.0を使用するいくつかのISPでは必要になります"
+
+msgid "Reset"
+msgstr "リセット"
+
+msgid "Reset Counters"
+msgstr "カウンタのリセット"
+
+msgid "Reset to defaults"
+msgstr "標準設定にリセット"
+
+msgid "Resolv and Hosts Files"
+msgstr "名前解決およびホストファイル設定"
+
+msgid "Resolve file"
+msgstr "リゾルバファイル"
+
+msgid "Restart"
+msgstr "再起動"
+
+msgid "Restart Firewall"
+msgstr "ファイアウォールの再起動"
+
+msgid "Restore backup"
+msgstr "バックアップから復元する"
+
+msgid "Reveal/hide password"
+msgstr "パスワードを表示する/隠す"
+
+msgid "Revert"
+msgstr "元に戻す"
+
+msgid "Root"
+msgstr "ルート"
+
+msgid "Root directory for files served via TFTP"
+msgstr "TFTP経由でファイルを取り扱う際のルートディレクトリ"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "ルーター・パスワード"
+
+msgid "Routes"
+msgstr "経路情報"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"特定のホスト又はネットワークに、どのインターフェース及びゲートウェイを通して"
+"通信を行うか、経路情報を設定します。"
+
+msgid "Rule #"
+msgstr "ルール #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "デバイスのマウントを行う前にファイルシステムチェックを行う"
+
+msgid "Run filesystem check"
+msgstr "ファイルシステムチェックを行う"
+
+msgid "SSH Access"
+msgstr "SSHアクセス"
+
+msgid "SSH-Keys"
+msgstr "SSHキー"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Save & Apply"
+msgstr "保存 & 適用"
+
+msgid "Save &#38; Apply"
+msgstr "保存 &#38; 適用"
+
+msgid "Scan"
+msgstr "スキャン"
+
+msgid "Scheduled Tasks"
+msgstr "スケジュールタスク"
+
+msgid "Section added"
+msgstr "追加されるセクション"
+
+msgid "Section removed"
+msgstr "削除されるセクション"
+
+msgid "See \"mount\" manpage for details"
+msgstr "詳細情報は \"mount\" のmanページを参照してください"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"設定された秒間隔でLCP echoリクエストを送信します。失敗数しきい値を設定した場"
+"合のみ、機能が有効になります。"
+
+msgid "Separate Clients"
+msgstr "クライアントの分離"
+
+msgid "Separate WDS"
+msgstr "WDSを分離する"
+
+msgid "Server Settings"
+msgstr "サーバー設定"
+
+msgid "Service Name"
+msgstr "サービス名"
+
+msgid "Service Type"
+msgstr "サービスタイプ"
+
+msgid "Services"
+msgstr "サービス"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "時刻設定"
+
+msgid "Setup DHCP Server"
+msgstr "DHCPサーバーを設定"
+
+msgid "Show current backup file list"
+msgstr "現在のバックアップファイルのリストを表示する"
+
+msgid "Shutdown this interface"
+msgstr "インターフェースを終了"
+
+msgid "Shutdown this network"
+msgstr "ネットワークを終了"
+
+msgid "Signal"
+msgstr "信号強度"
+
+msgid "Signal:"
+msgstr "信号:"
+
+msgid "Size"
+msgstr "サイズ"
+
+msgid "Skip"
+msgstr "スキップ"
+
+msgid "Skip to content"
+msgstr "コンテンツへ移動"
+
+msgid "Skip to navigation"
+msgstr "ナビゲーションへ移動"
+
+msgid "Slot time"
+msgstr "スロット時間"
+
+msgid "Software"
+msgstr "ソフトウェア"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "無効な値が設定されているフィールドがあるため、保存できません。"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "申し訳ありません。リクエストされたオブジェクトは見つかりませんでした。"
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "申し訳ありません。サーバーに予期せぬエラーが発生しました。"
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"申し訳ありません。現在このボードではsysupgradeがサポートがされていないため、"
+"ファームウェア更新は手動で行っていただく必要があります。libreCMC wikiを参照し"
+"て、このデバイスのインストール手順を参照してください。"
+
+msgid "Sort"
+msgstr "ソート"
+
+msgid "Source"
+msgstr "送信元"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr "デバイスが接続するディレクトリを設定します"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "<em>Dropbear</em>の受信ポートを設定してください"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr "暗号鍵を設定します。"
+
+msgid "Start"
+msgstr "開始"
+
+msgid "Start priority"
+msgstr "優先順位"
+
+msgid "Startup"
+msgstr "Startup"
+
+msgid "Static IPv4 Routes"
+msgstr "IPv4 静的ルーティング"
+
+msgid "Static IPv6 Routes"
+msgstr "IPv6 静的ルーティング"
+
+msgid "Static Leases"
+msgstr "静的リース"
+
+msgid "Static Routes"
+msgstr "静的ルーティング"
+
+msgid "Static WDS"
+msgstr "静的WDS"
+
+msgid "Static address"
+msgstr "静的アドレス"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"静的リース機能は、DHCPクライアントに対して固定のIPアドレス及び一時的なホスト"
+"名をアサインします。また、クライアントは対応するリースを使用するホストがその1"
+"台のみで、かつ静的なインターフェース設定にする必要があります。"
+
+msgid "Status"
+msgstr "ステータス"
+
+msgid "Stop"
+msgstr "停止"
+
+msgid "Strict order"
+msgstr "問い合わせの制限"
+
+msgid "Submit"
+msgstr "送信"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "スワップ機能"
+
+msgid "Switch"
+msgstr "スイッチ"
+
+msgid "Switch %q"
+msgstr "スイッチ %q"
+
+msgid "Switch %q (%s)"
+msgstr "スイッチ %q (%s)"
+
+msgid "Switch protocol"
+msgstr "プロトコルの切り替え"
+
+msgid "Sync with browser"
+msgstr "ブラウザの時刻と同期"
+
+msgid "Synchronizing..."
+msgstr "同期中..."
+
+msgid "System"
+msgstr "システム"
+
+msgid "System Log"
+msgstr "システムログ"
+
+msgid "System Properties"
+msgstr "システム・プロパティ"
+
+msgid "System log buffer size"
+msgstr "システムログ・バッファサイズ"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "TFTP設定"
+
+msgid "TFTP server root"
+msgstr "TFTPサーバー・ルート"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "送信レート"
+
+msgid "Table"
+msgstr "テーブル"
+
+msgid "Target"
+msgstr "ターゲット"
+
+msgid "Terminate"
+msgstr "停止"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"<em>デバイス設定</em>セクションでは、チャネル、送信出力、アンテナ設定などの無"
+"線ハードウェアの設定を行います。また、無線ハードウェアがマルチSSID機能をサ"
+"ポートしている場合、これらの設定は全て共通の設定として扱われます。暗号化設定"
+"や無線モードなどのネットワーク毎の設定は、<em>インターフェース設定</em>で設定"
+"を行います。"
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"<em>libiwinfo-lua</em> パッケージがインストールされていません。無線設定機能を"
+"正しく動作させるために、このパッケージをインストールする必要があります。"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"使用可能な文字は右記の通りです: <code>A-Z</code>, <code>a-z</code>, "
+"<code>0-9</code>, <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"デバイスファイルまたはパーティション(<abbr title=\"for example\">例</abbr> "
+"<code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"記憶領域をフォーマットしているファイルシステムを指定します。(<abbr title="
+"\"for example\">例</abbr> <samp><abbr title=\"Third Extended Filesystem"
+"\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"更新用イメージがアップロードされました。以下はそのチェックサム及びファイルサ"
+"イズです。オリジナルファイルと比較し、整合性を確認してください。<br />\"続行"
+"\"ボタンをクリックすると、更新処理を開始します。"
+
+msgid "The following changes have been committed"
+msgstr "以下の変更が適用されました"
+
+msgid "The following changes have been reverted"
+msgstr "以下の変更が取り消されました"
+
+msgid "The following rules are currently active on this system."
+msgstr "このシステムでは、現在以下のルールが有効になっています。"
+
+msgid "The given network name is not unique"
+msgstr "設定されたネットワーク名はユニークなものではありません"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"このハードウェアではマルチESSIDを設定することができないため、続行した場合、設"
+"定は既存の設定と置き換えられます。"
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr "選択中のプロトコルを使用する場合、デバイスを設定する必要があります"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr "システムは設定領域を消去中です。完了後、自動的に再起動します。"
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"システム更新中です。<br />絶対に電源を切らないでください！<br />ルーターの再"
+"接続まで数分お待ち下さい。システムが更新されることにより、ルーターの設定が変"
+"わる可能性があるため、再接続時にあなたのコンピュータのIPアドレスを変更しなけ"
+"ればならない場合があります。"
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"アップロードされたイメージファイルは、このボードでサポートされているフォー"
+"マットではありません。このプラットフォームに適合したイメージファイルかどう"
+"か、確認してください。"
+
+msgid "There are no active leases."
+msgstr "リース中のIPアドレスはありません。"
+
+msgid "There are no pending changes to apply!"
+msgstr "適用が未完了の変更はありません！"
+
+msgid "There are no pending changes to revert!"
+msgstr "復元が未完了の変更はありません！"
+
+msgid "There are no pending changes!"
+msgstr "未完了の変更はありません！"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"デバイスが設定されていません。\"デバイス設定\"タブで、ネットワークデバイスを"
+"選択してください。"
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"ルーターにパスワードが設定されていません。Webインターフェースの保護及びSSH"
+"サービスを有効にするために、管理者パスワードを設定してください。"
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"以下は、sysupgrade中にバックアップ対象に含めるファイルとディレクトリのパター"
+"ンリストです。/etc/config/内の設定ファイル及びその他特定の設定ファイルは自動"
+"的に保持されます。"
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"/etc/rc.localを表示しています。あなたの実行したいコマンドを'exit 0'行より上に"
+"入力してください。これらのコマンドはブートプロセスの最後に実行されます。"
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"プロバイダからアサインされた、ローカルのエンドポイント・アドレスです。通常、"
+"<code>:2</code>が終端に設定されます。"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"ローカルネットワーク内のみの <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr>として使用する"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"スケジュールタスクシステムを使用することで、定期的に特定のタスクの実行を行う"
+"ことが可能です。"
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"このリストは現在システムで動作しているプロセスとそのステータスを表示していま"
+"す。"
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "このページでは、ボタンの動作を変更することができます。"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "このページでは、現在アクティブなネットワーク接続を表示します。"
+
+msgid "This section contains no values yet"
+msgstr "このセクションは未設定です。"
+
+msgid "Time Synchronization"
+msgstr "時刻設定"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "時刻同期機能はまだ設定されていません。"
+
+msgid "Timezone"
+msgstr "タイムゾーン"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"設定を復元するには、作成しておいたバックアップアーカイブをアップロードしてく"
+"ださい。"
+
+msgid "Total Available"
+msgstr "合計"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "トラフィック"
+
+msgid "Transfer"
+msgstr "転送"
+
+msgid "Transmission Rate"
+msgstr "転送レート"
+
+msgid "Transmit"
+msgstr "送信"
+
+msgid "Transmit Power"
+msgstr "電波出力"
+
+msgid "Transmitter Antenna"
+msgstr "送信アンテナ"
+
+msgid "Trigger"
+msgstr "トリガー"
+
+msgid "Trigger Mode"
+msgstr "トリガーモード"
+
+msgid "Tunnel ID"
+msgstr "トンネル ID"
+
+msgid "Tunnel Interface"
+msgstr "トンネルインターフェース"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "ターボモード"
+
+msgid "Tx-Power"
+msgstr "送信電力"
+
+msgid "Type"
+msgstr "タイプ"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "UMTSのみ"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USBデバイス"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr "不明"
+
+msgid "Unknown Error, password not changed!"
+msgstr "不明なエラーです。パスワードは変更されていません！"
+
+msgid "Unmanaged"
+msgstr "Unmanaged"
+
+msgid "Unsaved Changes"
+msgstr "保存されていない変更"
+
+msgid "Unsupported protocol type."
+msgstr "サポートされていないプロトコルタイプ"
+
+msgid "Update lists"
+msgstr "リストの更新"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"システムをアップデートする場合、sysupgrade機能に互換性のあるファームウェアイ"
+"メージをアップロードしてください。\"設定の保持\"を有効にすると、現在の設定を"
+"維持してアップデートを行います。ただし、libreCMC互換のファームウェアイメージが"
+"アップロードされた場合のみ、設定は保持されます。"
+
+msgid "Upload archive..."
+msgstr "アーカイブをアップロード"
+
+msgid "Uploaded File"
+msgstr "アップロード完了"
+
+msgid "Uptime"
+msgstr "起動時間"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "<code>/etc/ethers</code> を使用する"
+
+msgid "Use DHCP gateway"
+msgstr "DHCPゲートウェイを使用する"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "ピアから通知されたDNSサーバーを使用する"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "ISO/IEC 3166 alpha2の国コードを使用します。"
+
+msgid "Use MTU on tunnel interface"
+msgstr "トンネルインターフェースのMTUを設定"
+
+msgid "Use TTL on tunnel interface"
+msgstr "トンネルインターフェースのTTLを設定"
+
+msgid "Use as root filesystem"
+msgstr "ルート・ファイルシステムとして使用する"
+
+msgid "Use broadcast flag"
+msgstr "ブロードキャスト・フラグを使用する"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "DNSサーバーを手動で設定"
+
+msgid "Use default gateway"
+msgstr "デフォルトゲートウェイを使用する"
+
+msgid "Use gateway metric"
+msgstr "ゲートウェイ・メトリックを使用する"
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"<em>追加</em> ボタンを押して、新しくエントリーを作成してください。<em>MAC-ア"
+"ドレス</em> はそのホストを識別し, <em>IPv4-アドレス</em> には払いだす固定のア"
+"ドレスを設定します。また、<em>ホスト名</em> はそのホストに対して一時的なホス"
+"ト名をアサインします。"
+
+msgid "Used"
+msgstr "使用"
+
+msgid "Used Key Slot"
+msgstr "使用するキースロット"
+
+msgid "Username"
+msgstr "ユーザー名"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "VLANインターフェース"
+
+msgid "VLANs on %q"
+msgstr "%q上のVLANs"
+
+msgid "VLANs on %q (%s)"
+msgstr "%q上のVLAN (%s)"
+
+msgid "VPN Server"
+msgstr "VPN サーバー"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "DHCPリクエスト送信時のベンダークラスを設定"
+
+msgid "Verify"
+msgstr "確認"
+
+msgid "Version"
+msgstr "バージョン"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "WEP オープンシステム"
+
+msgid "WEP Shared Key"
+msgstr "WEP 共有キー"
+
+msgid "WEP passphrase"
+msgstr "WEP 暗号フレーズ"
+
+msgid "WMM Mode"
+msgstr "WMM モード"
+
+msgid "WPA passphrase"
+msgstr "WPA 暗号フレーズ"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA暗号化を使用する場合、wpa_supplicant (クライアントモードの場合)又は "
+"hostapd (アクセスポイント及びアドホック) がインストールされている必要がありま"
+"す。"
+
+msgid "Waiting for changes to be applied..."
+msgstr "変更を適用中です..."
+
+msgid "Waiting for command to complete..."
+msgstr "コマンド実行中です..."
+
+msgid "Warning"
+msgstr "警告"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "警告: 保存されていない変更は再起動後に失われます!"
+
+msgid "Wifi"
+msgstr "無線LAN"
+
+msgid "Wireless"
+msgstr "無線"
+
+msgid "Wireless Adapter"
+msgstr "無線アダプタ"
+
+msgid "Wireless Network"
+msgstr "無線ネットワーク"
+
+msgid "Wireless Overview"
+msgstr "無線LANデバイス一覧"
+
+msgid "Wireless Security"
+msgstr "無線LANセキュリティ"
+
+msgid "Wireless is disabled or not associated"
+msgstr "無線LAN機能が無効になっているか、アソシエーションされていません"
+
+msgid "Wireless is restarting..."
+msgstr "無線LAN機能再起動中..."
+
+msgid "Wireless network is disabled"
+msgstr "無線LAN機能は無効になっています"
+
+msgid "Wireless network is enabled"
+msgstr "無線LAN機能は有効になっています"
+
+msgid "Wireless restarted"
+msgstr "無線LAN機能の再起動"
+
+msgid "Wireless shut down"
+msgstr "無線LAN機能停止"
+
+msgid "Write received DNS requests to syslog"
+msgstr "受信したDNSリクエストをsyslogへ記録します"
+
+msgid "XR Support"
+msgstr "XRサポート"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"ルーターが起動する際のサービスの有効化/無効化を行うことができます。また、変更"
+"は再起動後に適用されます。<br /><strong>警告: \"network\"のような重要なサービ"
+"スを無効にすると, ルーターにアクセスできなくなりますので、注意してください。"
+"</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr "Java Scriptを有効にしない場合、LuCIは正しく動作しません。"
+
+msgid "any"
+msgstr "全て"
+
+msgid "auto"
+msgstr "自動"
+
+#, fuzzy
+msgid "automatic"
+msgstr "static"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "ブリッジ"
+
+msgid "create:"
+msgstr "作成:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "指定したインターフェースでブリッジを作成します"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "無効"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "期限切れ"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>リース情報を記"
+"録するファイル"
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr "全二重"
+
+msgid "half-duplex"
+msgstr "半二重"
+
+msgid "help"
+msgstr "ヘルプ"
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "ターゲットがネットワークの場合"
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル"
+
+msgid "no"
+msgstr "いいえ"
+
+msgid "no link"
+msgstr "リンクなし"
+
+msgid "none"
+msgstr "なし"
+
+msgid "off"
+msgstr "オフ"
+
+msgid "on"
+msgstr "オン"
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "routed"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "tagged"
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr "無期限"
+
+msgid "unspecified"
+msgstr "設定しない"
+
+msgid "unspecified -or- create:"
+msgstr "設定しない -又は- 作成:"
+
+msgid "untagged"
+msgstr "untagged"
+
+msgid "yes"
+msgstr "はい"
+
+msgid "« Back"
+msgstr "« 戻る"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "HE.net ユーザーID"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "ログイン名ではなく、32バイト、16進数でエンコードされたユーザーIDを設定して"
+#~ "ください"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz 上側第2チャネル"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz 下側第2チャネル"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "ルーター広告の受信を許可する"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "ネットワーク上のにIPv6 アドレスを広告する"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ネットワークIDを広告する"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "設定可能な範囲は1から65535です"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT機能"
+
+#~ msgid "HT mode"
+#~ msgstr "HTモード"
+
+#~ msgid "Router Model"
+#~ msgstr "ルーターモデル"
+
+#~ msgid "Router Name"
+#~ msgstr "ルーター名"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "ルータ要請を送信する"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "通知する推奨有効時間を設定してください。(秒単位)"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "通知する最終有効時間を設定してください。(秒単位)"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "推奨有効時間"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "最終有効時間"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "ルーターに接続中..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "内蔵のNTPサーバーを有効にする"
+
+#~ msgid "Active Leases"
+#~ msgstr "有効なリース"
+
+#~ msgid "Open"
+#~ msgstr "開く"
+
+#~ msgid "KB"
+#~ msgstr "キロバイト"
+
+#~ msgid "Bit Rate"
+#~ msgstr "ビットレート"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "設定 / 適用"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "設定 / 変更箇所"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "設定 / 変更箇所の復元"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "MACアドレス"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encrypted\">暗号化</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-スキャン"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "この無線インターフェースを接続するネットワークを選択してください。<em>設定"
+#~ "しない</em>を選択すると、設定済みのネットワークを削除します。また、<em>作"
+#~ "成</em>フィールドにネットワーク名を入力すると、新しくネットワークを設定し"
+#~ "ます。"
+
+#~ msgid "Create Network"
+#~ msgstr "ネットワークの作成"
+
+#~ msgid "Link"
+#~ msgstr "リンク"
+
+#~ msgid "Networks"
+#~ msgstr "ネットワーク"
+
+#~ msgid "Power"
+#~ msgstr "出力"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "ローカル環境内の無線ネットワーク"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>表記: アドレス/"
+#~ "プレフィクス"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-サーバー"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr ""
+#~ "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-ブロードキャスト"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-アドレス"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "IPエイリアス"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "IPv6設定"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "注意: 他のネットワークに属するインターフェースを指定した場合, 選択したネッ"
+#~ "トワークへ移動します。"
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "本当にこのインターフェースを削除しますか? 削除すると元に戻すことはできませ"
+#~ "ん!\\nこのインターフェースを介してルーターにアクセスしている場合、ルーター"
+#~ "に接続できなくなる可能性があります。"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "本当にこの無線ネットワークを削除しますか？ 削除すると元に戻すことはできま"
+#~ "せん!\\nこのネットワークを介してルーターにアクセスしている場合、ルーターに"
+#~ "接続できなくなる可能性があります。"
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "本当にインターフェース \"%s\" を削除しますか?\\nこのインターフェースを介し"
+#~ "てルーターにアクセスしている場合、ルーターに接続できなくなる可能性がありま"
+#~ "す。"
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "本当にこのネットワークを終了しますか?\\nこのインターフェースを介してルー"
+#~ "ターにアクセスしている場合、接続できなくなる可能性があります。"
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "ルーターのネットワークポートはコンピューターがお互いに直接通信することが出"
+#~ "来る幾つかの <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s を組"
+#~ "み合わせることが出来ます。<abbr title=\"Virtual Local Area Network"
+#~ "\">VLAN</abbr> は異なるネットワークセグメントに別ける際によく使われます。"
+#~ "例えばデフォルトの1つをインターネットの用な大きなネットワークの為のアップ"
+#~ "リンクポート接続に使用し、その他のポートをローカルネットワークに使用しま"
+#~ "す。"
+
+#~ msgid "Enable buffering"
+#~ msgstr "バッファリングを有効にする"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6-over-IPv4"
+
+#~ msgid "Custom Files"
+#~ msgstr "手動で指定したファイル"
+
+#~ msgid "Custom files"
+#~ msgstr "手動指定ファイル"
+
+#~ msgid "Detected Files"
+#~ msgstr "検出されたファイル"
+
+#~ msgid "Detected files"
+#~ msgstr "検出されたファイル"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "新しいファームウェアを書き込んだ時に維持するファイル"
+
+#~ msgid "General"
+#~ msgstr "一般"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "このページでは<abbr title=\"Lua Configuration Interface\">LuCI</abbr> の機"
+#~ "能と設定をカスタマイズ出来ます。"
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Post-commit actions"
+
+#~ msgid ""
+#~ "The following files are detected by the system and will be kept "
+#~ "automatically during sysupgrade"
+#~ msgstr ""
+#~ "以下のファイルがシステムによって検出されました。これらのファイルはファーム"
+#~ "ウェア更新時に自動的に保存されます。"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "これらのコマンドはコミットされた <abbr title=\"Unified Configuration "
+#~ "Interface\">UCI</abbr>設定の変更を即座に適応する為に、自動的に実行されま"
+#~ "す。"
+
+#~ msgid ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+#~ msgstr ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr "<abbr title=\"Hypertext Transfer Protocol\">PPTP</abbr>-サーバー"
+
+#~ msgid "AHCP Settings"
+#~ msgstr "AHCP 設定"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "ARP pingリトライ"
+
+#~ msgid "ATM Settings"
+#~ msgstr "ATM設定"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "ルーターアドバタイズを許可する"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "アクセスポイント (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "pppd 追加オプション"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "1からFFFFまで使用可能です。"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "自動切断"
+
+#~ msgid "Backup Archive"
+#~ msgstr "バックアップアーカイブ"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "ローカルDNSサーバーにPPP接続先から通知されたネームサーバーを使用するように"
+#~ "設定します"
+
+#~ msgid "Connect script"
+#~ msgstr "接続スクリプト"
+
+#~ msgid "Create backup"
+#~ msgstr "バックアップの作成"
+
+#~ msgid "Default"
+#~ msgstr "標準"
+
+#~ msgid "Disconnect script"
+#~ msgstr "切断スクリプト"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "パッケージリストとインストールターゲットの編集"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "4K VLANを有効にする"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "IPv6のPPPリンクを有効にする"
+
+#~ msgid "Firmware image"
+#~ msgstr "ファームウェア・イメージ"
+
+#~ msgid "Forward DHCP"
+#~ msgstr "DHCPパケットの転送"
+
+#~ msgid "Forward broadcasts"
+#~ msgstr "ブロードキャストの転送"
+
+#~ msgid "HE.net Tunnel ID"
+#~ msgstr "HE.net トンネルID"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "このページではルーターの設定のバックアップと復元と、可能であればルーターを"
+#~ "初期状態にリセットします。"
+
+#~ msgid "Installation targets"
+#~ msgstr "インストールターゲット"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "設定ファイルを保持する"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "キープアライブ"
+
+#~ msgid "Kernel"
+#~ msgstr "カーネル"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "接続に成功した後、pppdはデフォルトの経路をPPPインターフェースを使用する様"
+#~ "に変更します"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "PPPリンクの確立後、pppd はこのスクリプトを実行します。"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "PPPリンクの切断後、pppd はこのスクリプトを実行します。"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "PINコードが正しく入力されていることと、SIMカードがロックされていないことを"
+#~ "確認してください！"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "デーモンやサービスは、シェルアクセス、<abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>のようなWEBアクセス機能、メッシュルーティング機能、"
+#~ "メール送信機能など、デバイスやネットワークの機能を提供します。"
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr "自動再接続時に行う接続テストの失敗数"
+
+#~ msgid "Override Gateway"
+#~ msgstr "ゲートウェイアドレスを上書きする"
+
+#~ msgid "PIN code"
+#~ msgstr "PINコード"
+
+#~ msgid "PPP Settings"
+#~ msgstr "PPP設定"
+
+#~ msgid "Package lists"
+#~ msgstr "パッケージリスト"
+
+#~ msgid "Port PVIDs on %q"
+#~ msgstr "ポート PVIDs on %q"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "全ての設定を元に戻し、ファームウェアを初期状態にリセットしますか?"
+
+#~ msgid "Processor"
+#~ msgstr "プロセッサ"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radiusポート"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radiusサーバー"
+
+#~ msgid "Relay Settings"
+#~ msgstr "リレー設定"
+
+#~ msgid "Replace default route"
+#~ msgstr "デフォルトルートを置換する"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "ルーターを初期状態にリセット"
+
+#~ msgid "Routing table ID"
+#~ msgstr "経路テーブルID"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr "接続する前に、モデムの準備が完了するための待ち時間を設けます（秒）"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "IPv4-アドレス サーバー"
+
+#~ msgid "Service type"
+#~ msgstr "サービス・タイプ"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "サービスとデーモンはデバイス上で、様々な処理を行ないます。"
+
+#~ msgid "Settings"
+#~ msgstr "設定"
+
+#~ msgid "Setup wait time"
+#~ msgstr "待ち時間の設定"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "申し訳ありません。libreCMCではこのプラットフォーム上でのシステムアップレー"
+#~ "ドを行うことができません。<br />手動でデバイスを更新してください。"
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "pppd の追加のコマンドライン引数を指定します。"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "モデムのデバイスファイルを設定してください。(例: /dev/ttyUSB0)"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "指定した期間(秒)コネクションが使用されない場合に接続を閉じます"
+
+#~ msgid "Time Server (rdate)"
+#~ msgstr "時刻サーバー (rdate)"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "トンネリング設定"
+
+#~ msgid "Update package lists"
+#~ msgstr "パッケージリストの更新"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "更新用のlibreCMCイメージファイルをアップロードしてください。"
+
+#~ msgid "Upload image"
+#~ msgstr "アップロード"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "ピアDNSを使用する"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid ""
+#~ "You can specify multiple DNS servers here, press enter to add a new "
+#~ "entry. Servers entered here will override automatically assigned ones."
+#~ msgstr ""
+#~ "複数のDNSサーバーを設定することができます。Enterキーを押すと、エントリーを"
+#~ "追加できます。また、自動的に割り当てられたアドレスを、入力されたサーバーの"
+#~ "アドレスで上書きします。"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "サービスを追加して使用する場合、それぞれ対応するパッケージをインストールす"
+#~ "る必要があります。(UMTS/GPRS - \"comgt\"、PPPoE - \"ppp-mod-pppoe\"、"
+#~ "PPPoA - \"ppp-mod-pppoa\"、PPTP - \"pptp\")"
+
+#~ msgid "back"
+#~ msgstr "戻る"
+
+#~ msgid "buffered"
+#~ msgstr "バッファキャッシュ"
+
+#~ msgid "cached"
+#~ msgstr "ページキャッシュ"
+
+#~ msgid "free"
+#~ msgstr "空き"
+
+#~ msgid "static"
+#~ msgstr "静的"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> は <abbr title="
+#~ "\"Model-View-Controller\">MVC</abbr> ウェブフレームワークや組み込みデバイ"
+#~ "スの為のウェブインターフェースを含む、フリーの Lua ソフトウェアコレクショ"
+#~ "ンです。<abbr title=\"Lua Configuration Interface\">LuCI</abbr> は Apache-"
+#~ "License の元で配布されています。"
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-キー"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "軽量な HTTP/1.1 WEBサーバーはCとLuaで書かれ LuCI に役立つ様に設計されてい"
+#~ "ます"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>を動作させるのに使"
+#~ "用することが出来る小さな WEBサーバーです。"
+
+#~ msgid "About"
+#~ msgstr "情報"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "有効なIP接続"
+
+#~ msgid "Addresses"
+#~ msgstr "アドレス"
+
+#~ msgid "Admin Password"
+#~ msgstr "管理者パスワード"
+
+#~ msgid "Alias"
+#~ msgstr "エイリアス"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "認証レルム"
+
+#~ msgid "Bridge Port"
+#~ msgstr "ブリッジポート"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr "システム管理者のパスワードを変更します(ユーザー <code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "クライアント + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "設定ファイル"
+
+#~ msgid "Connection timeout"
+#~ msgstr "接続タイムアウト"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "貢献者"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP アサイン"
+
+#~ msgid "Document root"
+#~ msgstr "ドキュメントルート"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "キープアライブ機能を有効にする"
+
+#~ msgid "Enable device"
+#~ msgstr "デバイスを有効にする"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "イーサネットブリッジ"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "<abbr title=\"Secure Shell\">SSH</abbr>公開鍵認証で使用する <abbr title="
+#~ "\"Secure Shell\">SSH</abbr>公開鍵を１行づつ貼り付けてください。"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "IP 設定"
+
+#~ msgid "Interface Status"
+#~ msgstr "インターフェース・ステータス"
+
+#~ msgid "Lead Development"
+#~ msgstr "開発リーダー"
+
+#~ msgid "Master"
+#~ msgstr "マスター"
+
+#~ msgid "Master + WDS"
+#~ msgstr "マスター + WDS"
+
+#~ msgid "No address configured on this interface."
+#~ msgstr "アドレスが設定されていません"
+
+#~ msgid "Not configured"
+#~ msgstr "未設定"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "パスワードを変更しました"
+
+#~ msgid "Plugin path"
+#~ msgstr "プラグインパス"
+
+#~ msgid "Ports"
+#~ msgstr "ポート"
+
+#~ msgid "Primary"
+#~ msgstr "プライマリ"
+
+#~ msgid "Project Homepage"
+#~ msgstr "プロジェクトホームページ"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "擬似アドホック"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "ありがとう"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr "レルムは保護されたページで認証プロンプトを表示します。"
+
+#~ msgid "Unknown Error"
+#~ msgstr "不明なエラー"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "デフォルトは <code>/etc/httpd.conf</code>"
+
+#~ msgid "Enable this switch"
+#~ msgstr "スイッチを有効にする"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKGエラーコード %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "パッケージリストを更新しました"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "起動時にスイッチをリセットする"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "インストールされているパッケージのアップグレード"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "また、カーネルやサービスのログファイルも現在の状態を得るために参照する事が"
+#~ "出来ます。"
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "ここでは、<abbr title=\"Central Processing Unit\">CPU</abbr>クロック周波"
+#~ "数、メモリ使用量やネットワークインターフェースデータなどの現在のシステムの"
+#~ "状態に関する情報を見つけることが出来ます。"
+
+#~ msgid "Search file..."
+#~ msgstr "Search file..."
+
+#~ msgid "Server"
+#~ msgstr "サーバー"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> は libreCMC "
+#~ "Kamikaze の為の自由で、柔軟で、ユーザーフレンドリなグラフィカルインター"
+#~ "フェースです。"
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "それでは、あなたのルーターを楽しんでください!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "私たちとしては、いつでもこのインターフェースを改良したいと望んでおり、あな"
+#~ "たからのフィードバックと提案をお待ちしています。"
+
+#~ msgid "Hello!"
+#~ msgstr "こんにちは!"
+
+#~ msgid "LuCI Components"
+#~ msgstr "LuCIコンポーネント"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "注意: <abbr title=\"Lua Configuration Interface\">LuCI</abbr> で変更を行う"
+#~ "には適用前に「保存 &amp; 適用」をクリックして確認する必要があります。"
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "以下のページからルーターの全ての重要な設定を調整することが出来ます。"
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> チーム"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> の管理パネルです。"
+
+#~ msgid "User Interface"
+#~ msgstr "ユーザーインターフェース"
+
+#~ msgid "enable"
+#~ msgstr "有効"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr " (任意)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>サーバーはリゾルバファイルの"
+#~ "順に問い合わせを行います。"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>リース"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "APの分離"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "物理ネットワークに無線ネットワークを追加します"
+
+#~ msgid "Aliases"
+#~ msgstr "エイリアス"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "ネットワークの作成"
+
+#~ msgid "Devices"
+#~ msgstr "デバイス"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "ローカルネットワークの為の逆引きを転送しません"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "TFTPサーバーを有効にする"
+
+#~ msgid "Errors"
+#~ msgstr "エラー"
+
+#~ msgid "Essentials"
+#~ msgstr "簡易設定"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "ホスト名展開"
+
+#~ msgid "First leased address"
+#~ msgstr "先頭リースアドレス"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+
+#~ msgid "Hardware Address"
+#~ msgstr "ハードウェアアドレス"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "ここではインストールされた無線デバイスの設定を行うことが出来ます。"
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "<code>/etc/hosts</code>を無視"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "アドホック"
+
+#~ msgid "Internet Connection"
+#~ msgstr "インターネット接続"
+
+#~ msgid "Join (Client)"
+#~ msgstr "クライアント"
+
+#~ msgid "Leases"
+#~ msgstr "リース"
+
+#~ msgid "Local Domain"
+#~ msgstr "ローカルドメイン"
+
+#~ msgid "Local Network"
+#~ msgstr "ローカルネットワーク"
+
+#~ msgid "Local Server"
+#~ msgstr "ローカルサーバー"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "ネットワークブートイメージ"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "ネットワーク名(<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "リースアドレス数"
+
+#~ msgid "Path"
+#~ msgstr "パス"
+
+#~ msgid "Perform Actions"
+#~ msgstr "実行"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "クライアント同士の通信を制限します"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "アクセスポイント"
+
+#~ msgid "Resolvfile"
+#~ msgstr "リゾルバファイル"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "TFTPサーバールート"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "以下の変更が適用されました"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> によって新しい"
+#~ "ファームウェアを書き込んだ時に、これらのファイルは新しいファームウェアイン"
+#~ "ストールでも追加されます。"
+
+#, fuzzy
+#~ msgid "Wireless Scan"
+#~ msgstr "無線アダプタ"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> によって"
+#~ "ネットワークメンバは自動的にネットワーク設定(<abbr title=\"Internet "
+#~ "Protocol\">IP</abbr>アドレス、netmask, <abbr title=\"Domain Name System"
+#~ "\">DNS</abbr>サーバー、...)を受信します。"
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "1つのデバイスで複数の無線ネットワークを運用することが出来ます。特定のハー"
+#~ "ドウェアとドライバの仕様の制限が在ることに注意してください。通常では1つの"
+#~ "アドホックモード、もしくは3つまでのマスターモードと1つのクライアントモード"
+#~ "ネットワークを同時に稼働できます。"
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "PPPoE をサポートする為には \"ppp-mod-pppoe\" を、PPtP をサポートする為に "
+#~ "\"pptp\" をインストールする必要があります。"
+
+#~ msgid "additional hostfile"
+#~ msgstr "追加のホストファイル"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "リゾルバファイルのホストエントリにドメイン名を追加します"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "自動再接続"
+
+#~ msgid "concurrent queries"
+#~ msgstr "並列問い合わせ"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "このインターフェースで <abbr title=\"Dynamic Host Configuration Protocol"
+#~ "\">DHCP</abbr> を無効にします。"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "disconnect when idle for"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "ネガティブキャッシュを行わない"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "Windowsシステムの無駄な <abbr title=\"Domain Name System\">DNS</abbr>クエ"
+#~ "リをフィルタします"
+
+#~ msgid "installed"
+#~ msgstr "インストール済み"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "サブネットに依存したホスト名をローカライズします"
+
+#~ msgid "not installed"
+#~ msgstr "未インストール"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "ネガティブキャッシュの<abbr title=\"Domain Name System\">DNS</abbr>応答を"
+#~ "防ぎます"
+
+#~ msgid "query port"
+#~ msgstr "問い合わせポート"
+
+#~ msgid "transmitted / received"
+#~ msgstr "送信 / 受信"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "ネットワーク"
+
+#~ msgid "all"
+#~ msgstr "全て"
+
+#~ msgid "Code"
+#~ msgstr "コード"
+
+#~ msgid "Distance"
+#~ msgstr "Distance"
+
+#~ msgid "Legend"
+#~ msgstr "Legend"
+
+#~ msgid "Library"
+#~ msgstr "Library"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "see &#39;%s&#39; manpage"
+
+#~ msgid "Package Manager"
+#~ msgstr "パッケージ管理"
+
+#~ msgid "Service"
+#~ msgstr "サービス"
+
+#~ msgid "Statistics"
+#~ msgstr "統計"
+
+#~ msgid "zone"
+#~ msgstr "ゾーン"
diff --git a/trunk/package/luci/po/ja/commands.po b/trunk/package/luci/po/ja/commands.po
new file mode 100644
index 00000000..3b01a35c
--- /dev/null
+++ b/trunk/package/luci/po/ja/commands.po
@@ -0,0 +1,94 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-05 17:15+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "設定したコマンドの簡単な説明文を記載します"
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "コマンドラインに対する引数の追記を許可するか設定します"
+
+msgid "Arguments:"
+msgstr "引数:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "バイナリデータは表示されずにダウンロードされます。"
+
+msgid "Code:"
+msgstr "コード:"
+
+msgid "Collecting data..."
+msgstr "データ収集中です..."
+
+msgid "Command"
+msgstr "コマンド"
+
+msgid "Command failed"
+msgstr "コマンド失敗"
+
+msgid "Command line to execute"
+msgstr "実行するコマンドラインを記載します"
+
+msgid "Command successful"
+msgstr "コマンド成功"
+
+msgid "Command:"
+msgstr "コマンド:"
+
+msgid "Configure"
+msgstr "設定"
+
+msgid "Custom Commands"
+msgstr "カスタムコマンド"
+
+msgid "Custom arguments"
+msgstr "カスタム引数"
+
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+msgid "Description"
+msgstr "説明"
+
+msgid "Download"
+msgstr "ダウンロード"
+
+msgid "Failed to execute command!"
+msgstr "コマンドの実行に失敗しました!"
+
+msgid "Link"
+msgstr "リンク"
+
+msgid "Loading"
+msgstr "読み込み中"
+
+msgid "Public access"
+msgstr "パブリック・アクセス"
+
+msgid "Run"
+msgstr "実行"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr "このページでは、ウェブインターフェースから簡単にシェル・コマンドを実行することができます。"
+
+msgid "Waiting for command to complete..."
+msgstr "コマンド実行中です..."
diff --git a/trunk/package/luci/po/ja/coovachilli.po b/trunk/package/luci/po/ja/coovachilli.po
new file mode 100644
index 00000000..94157125
--- /dev/null
+++ b/trunk/package/luci/po/ja/coovachilli.po
@@ -0,0 +1,25 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "CoovaChilli"
+msgstr ""
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/ddns.po b/trunk/package/luci/po/ja/ddns.po
new file mode 100644
index 00000000..66aff8ca
--- /dev/null
+++ b/trunk/package/luci/po/ja/ddns.po
@@ -0,0 +1,89 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-10-05 17:19+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "IPアドレスが変化したかチェックを行う間隔"
+
+msgid "Check-time unit"
+msgstr "チェックの時間単位"
+
+msgid "Custom update-URL"
+msgstr "手動アップデート-URL"
+
+msgid "Dynamic DNS"
+msgstr "ダイナミックDNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"ダイナミックDNSを使用することで、IPアドレスが変更されても固定のホスト名を使っ"
+"てルーターにアクセスすることができます。"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "Force update every"
+msgstr "強制的にアップデートを行う間隔"
+
+msgid "Force-time unit"
+msgstr "アップデートの時間単位"
+
+msgid "Hostname"
+msgstr "ホスト名"
+
+msgid "Interface"
+msgstr "インターフェース"
+
+msgid "Network"
+msgstr "ネットワーク"
+
+msgid "Password"
+msgstr "パスワード"
+
+msgid "Service"
+msgstr "サービス"
+
+msgid "Source of IP address"
+msgstr "送信元IPアドレス"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "ユーザー名"
+
+msgid "custom"
+msgstr "手動設定"
+
+# Hours
+msgid "h"
+msgstr "時"
+
+msgid "interface"
+msgstr "インターフェース"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "分"
+
+msgid "network"
+msgstr "ネットワーク"
+
+#~ msgid "Event interface"
+#~ msgstr "イベントインターフェース"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "どのインターフェースが起動した際にddnsスクリプトを開始するか設定してください。"
diff --git a/trunk/package/luci/po/ja/diag_core.po b/trunk/package/luci/po/ja/diag_core.po
new file mode 100644
index 00000000..f67657fd
--- /dev/null
+++ b/trunk/package/luci/po/ja/diag_core.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 14:36+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configure Diagnostics"
+msgstr "診断機能設定"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/ja/diag_devinfo.po b/trunk/package/luci/po/ja/diag_devinfo.po
new file mode 100644
index 00000000..1ef3dadc
--- /dev/null
+++ b/trunk/package/luci/po/ja/diag_devinfo.po
@@ -0,0 +1,209 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-19 07:59+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr "追加"
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr "設定"
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "削除"
+
+msgid "Device Scan Config"
+msgstr "デバイススキャン設定"
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr ""
+
+msgid "Devices on Network"
+msgstr "ネットワーク上のデバイス"
+
+msgid "Edit"
+msgstr "編集"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IPアドレス"
+
+msgid "Interface"
+msgstr "インターフェース"
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "MACアドレス"
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "リクエスト間のスリープ時間 (単位:ミリ秒, 標準設定:100)"
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr "SIPデバイスは見つかりませんでした。"
+
+msgid "No devices detected"
+msgstr "デバイスは検出されませんでした。"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "リクエスト送信回数 (標準設定:1)"
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr "電話"
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr "リピート回数"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr "SIPデバイス情報"
+
+msgid "SIP Device Scan"
+msgstr "SIPデバイスのスキャン"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "SIPデバイススキャン設定"
+
+msgid "SIP Devices on Network"
+msgstr "ネットワーク上のSIPデバイス"
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr "リクエスト間のスリープ時間"
+
+msgid "Subnet"
+msgstr "サブネット"
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "応答待ち時間 (単位:秒, 標準設定:10)"
+
+msgid "Timeout"
+msgstr "タイムアウト"
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/ffwizard.po b/trunk/package/luci/po/ja/ffwizard.po
new file mode 100644
index 00000000..408745d2
--- /dev/null
+++ b/trunk/package/luci/po/ja/ffwizard.po
@@ -0,0 +1,159 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/ja/firewall.po b/trunk/package/luci/po/ja/firewall.po
new file mode 100644
index 00000000..877a6f0e
--- /dev/null
+++ b/trunk/package/luci/po/ja/firewall.po
@@ -0,0 +1,687 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2012-11-14 17:32+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr "%s%s ,%s"
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr "(名前設定の無いエントリー)"
+
+msgid "(Unnamed Rule)"
+msgstr "(名前設定の無いルール)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(名前設定の無いSNAT)"
+
+msgid "-- Please choose --"
+msgstr "-- 選択してください --"
+
+msgid "-- custom --"
+msgstr "-- 手動設定 --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> パケット / <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+"<var>%d</var> パケット / <var>%s</var>, バースト <var>%d</var> パケット"
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var>, %s を上限に設定"
+
+msgid "Action"
+msgstr "動作"
+
+msgid "Add"
+msgstr "追加"
+
+msgid "Add and edit..."
+msgstr "追加及び編集..."
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "<em>宛先ゾーン</em>への転送を許可する:"
+
+msgid "Any"
+msgstr "全て"
+
+msgid "Covered networks"
+msgstr "対象ネットワーク"
+
+msgid "Custom Rules"
+msgstr "手動設定ルール"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"手動設定ルールの設定では、ファイアウォールの設定画面ではサポートされていない"
+"ような、任意のiptablesコマンドを実行することが可能です。これらの任意のコマン"
+"ドは、ファイアウォール機能の起動ごとに、標準のルールが読み込まれた後に実行さ"
+"れます。"
+
+msgid "Destination IP address"
+msgstr "宛先IPアドレス"
+
+msgid "Destination address"
+msgstr "宛先アドレス"
+
+msgid "Destination port"
+msgstr "宛先ポート"
+
+msgid "Destination zone"
+msgstr "宛先ゾーン"
+
+msgid "Do not rewrite"
+msgstr "リライトしない"
+
+msgid "Drop invalid packets"
+msgstr "無効なパケットを遮断する"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "Enable NAT Loopback"
+msgstr "NATループバックを有効にする"
+
+msgid "Enable SYN-flood protection"
+msgstr "SYN-Floodプロテクションを有効にする"
+
+msgid "Enable logging on this zone"
+msgstr "このゾーンのログ記録を有効にする"
+
+msgid "External IP address"
+msgstr "外部IPアドレス"
+
+msgid "External port"
+msgstr "外部ポート"
+
+msgid "External zone"
+msgstr "外部ゾーン"
+
+msgid "Extra arguments"
+msgstr "追加設定"
+
+msgid "Firewall"
+msgstr "ファイアウォール"
+
+msgid "Firewall - Custom Rules"
+msgstr "ファイアウォール - 手動設定ルール"
+
+msgid "Firewall - Port Forwards"
+msgstr "ファイアウォール - ポートフォワーディング"
+
+msgid "Firewall - Traffic Rules"
+msgstr "ファイアウォール - トラフィック・ルール"
+
+msgid "Firewall - Zone Settings"
+msgstr "ファイアウォール - ゾーン設定"
+
+msgid "Force connection tracking"
+msgstr "強制的にコネクション追跡を行う"
+
+msgid "Forward"
+msgstr "転送"
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr "送信元 %s (%s)"
+
+msgid "From %s in %s with source %s"
+msgstr "送信元 %s (%s) , 送信元 %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "送信元 %s (%s) , 送信元 %s, 送信元 %s"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4及びIPv6"
+
+msgid "IPv4 only"
+msgstr "IPv4のみ"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "IPv6のみ"
+
+msgid "Input"
+msgstr "受信"
+
+msgid "Inter-Zone Forwarding"
+msgstr "内部ゾーン転送"
+
+msgid "Internal IP address"
+msgstr "内部IPアドレス"
+
+msgid "Internal port"
+msgstr "内部ポート"
+
+msgid "Internal zone"
+msgstr "内部ゾーン"
+
+msgid "Limit log messages"
+msgstr "ログメッセージを制限"
+
+msgid "MSS clamping"
+msgstr "MSSクランプ"
+
+msgid "Masquerading"
+msgstr "マスカレード"
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr "ICMPタイプの一致"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"設定された宛先ポート(またはポート範囲)に一致した転送トラフィックが対象になり"
+"ます"
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"設定された宛先ポート(またはポート範囲)に一致した受信トラフィックが対象になり"
+"ます"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
+"フィックと一致したトラフィックが対象になります。"
+
+msgid "Name"
+msgstr "名前"
+
+msgid "New SNAT rule"
+msgstr "SNATルールの新規作成"
+
+msgid "New forward rule"
+msgstr "転送ルールの新規作成"
+
+msgid "New input rule"
+msgstr "受信ルールの新規作成"
+
+msgid "New port forward"
+msgstr "転送設定の新規作成"
+
+msgid "New source NAT"
+msgstr "SNATルールの新規作成"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "設定された宛先IPアドレスと一致した受信トラフィックが対象になります。"
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "設定されたMACアドレスと一致した受信したトラフィックが対象になります。"
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+"設定されたIPアドレス (または範囲) と一致した受信したトラフィックが対象になり"
+"ます。"
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
+"フィックと一致したトラフィックのみを対象にします。"
+
+msgid "Open ports on router"
+msgstr "ポートの開放"
+
+msgid "Other..."
+msgstr "その他のプロトコル"
+
+msgid "Output"
+msgstr "送信"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+"iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
+"てください!"
+
+msgid "Port Forwards"
+msgstr "ポートフォワーディング"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"ポートフォワーディングは、インターネット上のリモートコンピュータから、プライ"
+"ベートなネットワーク上の、特定のコンピュータやサービスへのアクセスを可能にし"
+"ます。"
+
+msgid "Protocol"
+msgstr "プロトコル"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"ルールに一致した受信トラフィックを、内部ホストの設定されたポートへ転送します"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "設定された宛先サブネットへのマスカレードを制限する"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "設定された送信元サブネットへのマスカレードを制限する"
+
+msgid "Restrict to address family"
+msgstr "アドレスファミリの制限"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+"ルールに一致したトラフィックの送信元アドレスを設定した値にリライトします。"
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"ルールに一致したトラフィックの送信元ポートを設定した値にリライトします。空欄"
+"にした場合、IPアドレスのみを書き直します。"
+
+msgid "Rewrite to source %s"
+msgstr "送信元 %s にリライト"
+
+msgid "Rewrite to source %s, %s"
+msgstr "送信元 %s, %s にリライト"
+
+msgid "SNAT IP address"
+msgstr "SNAT IPアドレス"
+
+msgid "SNAT port"
+msgstr "SNAT ポート"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Traffic Redirection"
+# msgstr ""
+#
+# msgid ""
+# "Traffic redirection allows you to change the destination address of "
+# "forwarded packets."
+# msgstr ""
+#
+# msgid "Overview"
+# msgstr ""
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Source zone"
+# msgstr ""
+#
+# msgid "Source MAC-address"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+msgid "Source IP address"
+msgstr "送信元IPアドレス"
+
+msgid "Source MAC address"
+msgstr "送信元MACアドレス"
+
+msgid "Source NAT"
+msgstr "送信元NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"送信元NAT設定は、複数のWANアドレスを内部のサブネットにマッピングするような、"
+"出力トラフィックに対する送信元IPアドレスのきめ細かい制御を行うマスカレードの"
+"設定フォームです。"
+
+msgid "Source address"
+msgstr "送信元アドレス"
+
+msgid "Source port"
+msgstr "送信元ポート"
+
+msgid "Source zone"
+msgstr "送信元ゾーン"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
+"ラフィックの制御を行います。"
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"下記の設定は、このゾーン (%s)とその他のゾーン間の転送ポリシーを制御します。"
+"<em>宛先ゾーンへの転送</em> は、<strong>%q から</strong>転送されたトラフィッ"
+"クに対して転送を許可します。 <em>送信元ゾーンからの転送</em> は、別のゾーンか"
+"ら<strong>%qへ</strong> の転送を許可します。トラフィック転送設定は、<em>一方"
+"向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
+"ません。</em>"
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"このページでは、各転送ルールの詳細設定を行うことができます。ただし、ほとんど"
+"のケースは、これらの設定を変更する必要はありません。"
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"このページでは、各トラフィックルールの送信元・宛先ホストの設定などの詳細設定"
+"を行うことができます。"
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"このセクションでは、%sの標準的な動作を設定します。<em>受信</em>及び<em>送信</"
+"em>オプションは、このゾーンに対して入出力するトラフィックに対する標準のポリ"
+"シーを設定し、<em>転送</em>オプションは、ゾーン間の転送トラフィックに対する標"
+"準のポリシーになります。<em>対象ネットワーク</em>は、どのネットワーク設定がこ"
+"のゾーンに属するかを設定します。"
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "宛先 %s, %s (<var>デバイス</var>)"
+
+msgid "To %s in %s"
+msgstr "宛先 %s (%s)"
+
+msgid "To %s on <var>this device</var>"
+msgstr "宛先 %s (<var>デバイス</var>)"
+
+msgid "To %s, %s in %s"
+msgstr "宛先 %s, %s (%s)"
+
+msgid "To source IP"
+msgstr "変換後送信元IP"
+
+msgid "To source port"
+msgstr "変換後送信元ポート"
+
+msgid "Traffic Rules"
+msgstr "トラフィック・ルール"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"トラフィック・ルールの設定では、ゾーン間を行き来するパケットのポリシーを設定"
+"します。例えば、特定のホスト間や、ルーターのWANポートへのトラフィックの拒否を"
+"設定することができます。"
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"\"-- 手動設定 --\"を選択し、プロトコルをスペースで区切って入力することで複数"
+"のプロトコルを指定することができます。"
+
+msgid "Zone %q"
+msgstr "ゾーン %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "ゾーン ⇒ 転送"
+
+msgid "Zones"
+msgstr "ゾーン"
+
+msgid "accept"
+msgstr "許可"
+
+msgid "any"
+msgstr "全て"
+
+msgid "any host"
+msgstr "全てのホスト"
+
+msgid "any router IP"
+msgstr "全てのルーターIP"
+
+msgid "any zone"
+msgstr "全てのゾーン"
+
+msgid "don't track"
+msgstr "コネクション追跡を行わない"
+
+msgid "drop"
+msgstr "遮断"
+
+msgid "reject"
+msgstr "拒否"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "宛先"
+
+#~ msgid "Family"
+#~ msgstr "アドレスファミリ"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "転送先 %s (%s)"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "転送先 %s, %s (%s)"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "送信元"
+
+#~ msgid "To %s"
+#~ msgstr "宛先 %s"
+
+#~ msgid "To %s at %s"
+#~ msgstr "宛先 %s, %s"
+
+#~ msgid "Via"
+#~ msgstr "経由"
+
+#~ msgid "Accept forward"
+#~ msgstr "転送を許可"
+
+#~ msgid "Accept input"
+#~ msgstr "受信を許可"
+
+#~ msgid "Disable"
+#~ msgstr "無効"
+
+#~ msgid "Discard forward"
+#~ msgstr "転送を破棄"
+
+#~ msgid "Discard input"
+#~ msgstr "入力を破棄"
+
+#~ msgid "Do not track forward"
+#~ msgstr "転送の追跡を行わない"
+
+#~ msgid "Do not track input"
+#~ msgstr "入力の追跡を行わない"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "IPレンジ"
+
+#~ msgid "IPs"
+#~ msgstr "IP"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "MAC"
+
+#~ msgid "Refuse forward"
+#~ msgstr "転送を拒否"
+
+#~ msgid "Refuse input"
+#~ msgstr "受信を拒否"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "ルール設定は無効になっています"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "ルール設定は有効になっています"
+
+#~ msgid "day"
+#~ msgstr "日"
+
+#~ msgid "hour"
+#~ msgstr "時"
+
+#~ msgid "minute"
+#~ msgstr "分"
+
+#~ msgid "not"
+#~ msgstr "not"
+
+#~ msgid "port"
+#~ msgstr "ポート"
+
+#~ msgid "ports"
+#~ msgstr "ポート"
+
+#~ msgid "second"
+#~ msgstr "秒"
+
+#~ msgid "type"
+#~ msgstr "タイプ"
+
+#~ msgid "types"
+#~ msgstr "タイプ"
+
+#~ msgid "(optional)"
+#~ msgstr "(オプション)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "意図された宛先アドレス"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "内部ポート（オプション）"
+
+#~ msgid "Advanced Options"
+#~ msgstr "詳細なオプション"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "詳細なルール"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "詳細なルール設定を行うことができます。ただし、すでに接続が行われているパ"
+#~ "ケットに関しては、自動的にファイアウォールの通過を許可されます。"
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "手動設定ルール (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "デバイス"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "DNATの場合、設定された宛先アドレスのトラフィックに対して合致を行います。"
+#~ "SNATの場合、送信元アドレスを設定されたアドレスで上書きします。"
+
+#~ msgid "Overview"
+#~ msgstr "概要"
+
+#~ msgid "Port forwarding"
+#~ msgstr "ポートフォワーディング"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "ポートフォワーディングを使用することで、内部ネットワークのサービスを外部に"
+#~ "提供することができます。"
+
+#~ msgid "Redirection type"
+#~ msgstr "転送タイプ"
+
+#~ msgid "Redirections"
+#~ msgstr "転送"
+
+#~ msgid "Rules"
+#~ msgstr "ルール"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "トラフィック転送"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "トラフィック転送機能を用いることで、転送したパケットの宛先アドレスを変更す"
+#~ "ることが可能です。"
diff --git a/trunk/package/luci/po/ja/freifunk-policyrouting.po b/trunk/package/luci/po/ja/freifunk-policyrouting.po
new file mode 100644
index 00000000..3c9a17e0
--- /dev/null
+++ b/trunk/package/luci/po/ja/freifunk-policyrouting.po
@@ -0,0 +1,39 @@
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/ja/freifunk.po b/trunk/package/luci/po/ja/freifunk.po
new file mode 100644
index 00000000..028a2ce2
--- /dev/null
+++ b/trunk/package/luci/po/ja/freifunk.po
@@ -0,0 +1,395 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/hd_idle.po b/trunk/package/luci/po/ja/hd_idle.po
new file mode 100644
index 00000000..0ec9d685
--- /dev/null
+++ b/trunk/package/luci/po/ja/hd_idle.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-11-14 14:40+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "ディスク"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "Enable debug"
+msgstr "デバッグを有効にする"
+
+msgid "Idle-time"
+msgstr "アイドル時間"
+
+msgid "Idle-time unit"
+msgstr "アイドル時間 (単位)"
+
+msgid "Settings"
+msgstr "設定"
+
+# Hours
+msgid "h"
+msgstr "時"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idleはアイドル時に外部ディスクをスピンダウンさせるための、ユーティリティプ"
+"ログラムです。"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "分"
diff --git a/trunk/package/luci/po/ja/meshwizard.po b/trunk/package/luci/po/ja/meshwizard.po
new file mode 100644
index 00000000..a67c71f5
--- /dev/null
+++ b/trunk/package/luci/po/ja/meshwizard.po
@@ -0,0 +1,109 @@
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/minidlna.po b/trunk/package/luci/po/ja/minidlna.po
new file mode 100644
index 00000000..4cfc3385
--- /dev/null
+++ b/trunk/package/luci/po/ja/minidlna.po
@@ -0,0 +1,198 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-10 09:10+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Album art names:"
+msgstr "アルバムアートワーク・ファイル名:"
+
+msgid "Announced model number:"
+msgstr "通知するモデル番号:"
+
+msgid "Announced serial number:"
+msgstr "通知するシリアルナンバー:"
+
+msgid "Browse directory"
+msgstr "Browse directory"
+
+msgid "Collecting data..."
+msgstr "データ収集中です..."
+
+msgid "Database directory:"
+msgstr "データベース・ディレクトリ:"
+
+msgid "Enable TIVO:"
+msgstr "TIVO を有効にする:"
+
+msgid "Enable inotify:"
+msgstr "inotify を有効にする:"
+
+msgid "Enable:"
+msgstr "サービスを有効にする:"
+
+msgid "Friendly name:"
+msgstr "Friendly名:"
+
+msgid "General Settings"
+msgstr "基本設定"
+
+msgid "Interfaces:"
+msgstr "インターフェース:"
+
+msgid "Log directory:"
+msgstr "ログディレクトリ:"
+
+msgid "Media directories:"
+msgstr "メディアディレクトリ:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNAは、DLNA/UPnP-AVクライアントの完全互換を目的としたサーバー・ソフト"
+"ウェアです。"
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr "miniDLNAがクライアントに通知するXML中のモデル番号を設定します。"
+
+msgid "Music"
+msgstr "ミュージック"
+
+msgid "Network interfaces to serve."
+msgstr "サービスが使用するネットワーク・インターフェースを設定します。"
+
+msgid "Notify interval in seconds."
+msgstr "通知間隔を秒単位で設定します。"
+
+msgid "Notify interval:"
+msgstr "通知間隔:"
+
+msgid "Pictures"
+msgstr "ピクチャ"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "ステータス表示のためのHTTPポート番号を設定してください。"
+
+msgid "Port:"
+msgstr "ポート:"
+
+msgid "Presentation URL:"
+msgstr "プレゼンテーションURL:"
+
+msgid "Root container:"
+msgstr "ルート・コンテナ:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr "miniDLNAがクライアントに通知するXML中のシリアルナンバーを設定します。"
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "クライアント上で表示されるUPnPノード名を設定してください。"
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"miniDLNAが使用するデータベースおよびアルバムアートのキャッシュを保存するディ"
+"レクトリパスを設定してください。"
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr "miniDLNAが書きだすログファイルのディレクトリパスを設定してください。"
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"inotifyを使用した新規ファイルの自動検知を有効にする場合、このオプションを有効"
+"にしてください。"
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"TiVoサポートのための.jpgおよび.mp3ファイルのストリーミングを行う場合、このオ"
+"プションを有効にしてください。"
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"DLNA規格を厳守する場合、このオプションを有効にしてください。オプションを有効"
+"にすると、サーバー側で、大きいサイズのJPEGファイルのダウンスケールを行いま"
+"す。しかし、この機能はSonyなどのDLNA製品において、JPEGサービスのパフォーマン"
+"スを損なう可能性があります。"
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"miniDLNA がスキャンするディレクトリを設定します。ディレクトリを特定のコンテン"
+"ツに制限したい場合、タイプをパスのはじめに付け、コンマ記号で区切ることで設定"
+"できます ('A'=オーディオ \"audio\", 'V'=ビデオ \"video\", 'P'=写真 \"images"
+"\", 例: media_dir=A,/mnt/media/Music)。また、このオプションは複数のディレクト"
+"リを登録可能です。"
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "MiniSSDPd ソケットのパスを設定してください。"
+
+msgid "Standard container"
+msgstr "標準コンテナ"
+
+msgid "Strict to DLNA standard:"
+msgstr "DLNA規格の厳守:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"miniDLNA サービスは稼働中です。%d 個の音楽ファイル , %d 個のビデオファイル, %"
+"d 個の写真ファイルを認識しています。"
+
+msgid "The miniDLNA service is not running."
+msgstr "miniDLNA サービスは稼働していません。"
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr "アルバムアート検索時にチェックするファイル名のリストを設定します。"
+
+msgid "Video"
+msgstr "ビデオ"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "miniDLNA ステータス"
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP ソケット:"
+
+#~ msgid "Network interfaces to serve, comma delimited list."
+#~ msgstr ""
+#~ "サービスが使用するネットワーク・インターフェースを設定します。カンマ記号 "
+#~ "\",\" で区切ってください。"
+
+#~ msgid ""
+#~ "This is a list of file names to check for when searching for album art. "
+#~ "Note: names must be delimited with a forward slash '/'"
+#~ msgstr ""
+#~ "アルバムアート検索時にチェックするファイル名のリストを設定します。注意: "
+#~ "ファイル名はスラッシュ記号 '/' で区切ってください。"
diff --git a/trunk/package/luci/po/ja/mmc_over_gpio.po b/trunk/package/luci/po/ja/mmc_over_gpio.po
new file mode 100644
index 00000000..5c0f1028
--- /dev/null
+++ b/trunk/package/luci/po/ja/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-10-05 16:45+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "MMC/SD driver configuration"
+msgstr "MMC/SD ドライバ設定"
+
+msgid "Mode"
+msgstr "モード"
+
+msgid "Name"
+msgstr "名前"
+
+msgid "Settings"
+msgstr "設定"
diff --git a/trunk/package/luci/po/ja/multiwan.po b/trunk/package/luci/po/ja/multiwan.po
new file mode 100644
index 00000000..ab415629
--- /dev/null
+++ b/trunk/package/luci/po/ja/multiwan.po
@@ -0,0 +1,120 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-06 17:17+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr "自動"
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr "DNSサーバー"
+
+msgid "Default Route"
+msgstr "デフォルトルート"
+
+msgid "Destination Address"
+msgstr "宛先アドレス"
+
+msgid "Disable"
+msgstr "無効"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "ヘルスモニタ ICMP宛先"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "ヘルスモニタ ICMP タイムアウト"
+
+msgid "Health Monitor Interval"
+msgstr "ヘルスモニタ更新間隔"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr "ヘルスモニタは、ネットワークの変更及び接続失敗の検出と調整を行います。"
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr "ロードバランサ ディストリビューション"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "ロードバランサ (互換性)"
+
+msgid "Load Balancer(Performance)"
+msgstr "ロードバランサ (パフォーマンス)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Multi-WAN トラフィック・ルール"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WANを用いることで、複数の上りリンクを使用してロードバランサとフェイル"
+"オーバー機能を使用することができます。"
+
+msgid "None"
+msgstr "なし"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "ポート"
+
+msgid "Protocol"
+msgstr "プロトコル"
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr "送信元アドレス"
+
+msgid "Unknown"
+msgstr "不明"
+
+msgid "WAN Interfaces"
+msgstr "WAN インターフェースリスト"
+
+msgid "WAN Uplink"
+msgstr "WAN アップリンク"
+
+msgid "all"
+msgstr "全て"
diff --git a/trunk/package/luci/po/ja/ntpc.po b/trunk/package/luci/po/ja/ntpc.po
new file mode 100644
index 00000000..bb6135cc
--- /dev/null
+++ b/trunk/package/luci/po/ja/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-11-14 14:41+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "時刻調整"
+
+msgid "Count of time measurements"
+msgstr "時間計測回数"
+
+msgid "Current system time"
+msgstr "現在時刻"
+
+msgid "General"
+msgstr "一般設定"
+
+msgid "Hostname"
+msgstr "ホスト名"
+
+msgid "Offset frequency"
+msgstr "オフセット周波数"
+
+msgid "Port"
+msgstr "ポート"
+
+msgid "Synchronizes the system time"
+msgstr "システムの時間を同期します。"
+
+msgid "Time Server"
+msgstr "時刻サーバー"
+
+msgid "Time Servers"
+msgstr "時刻サーバー"
+
+msgid "Time Synchronisation"
+msgstr "Time Synchronisation"
+
+msgid "Update interval (in seconds)"
+msgstr "アップデート間隔 (秒)"
+
+msgid "empty = infinite"
+msgstr "空の場合、無限大になります"
diff --git a/trunk/package/luci/po/ja/olsr.po b/trunk/package/luci/po/ja/olsr.po
new file mode 100644
index 00000000..b3f01093
--- /dev/null
+++ b/trunk/package/luci/po/ja/olsr.po
@@ -0,0 +1,800 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-11-14 14:40+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "アクティブなMID(Multi Interface Declaration) 通知"
+
+msgid "Active OLSR nodes"
+msgstr "アクティブなOLSRノード"
+
+msgid "Active host net announcements"
+msgstr "アクティブなホストネットワーク通知"
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Allow gateways with NAT"
+msgstr "NATを使用するゲートウェイを選択可能にする"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "NATを介してパケットを送信するIPv4 ゲートウェイを選択可能にします"
+
+msgid "Announce uplink"
+msgstr "通知するアップリンク"
+
+msgid "Announced network"
+msgstr "通知ネットワーク"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr "どちらの値もドット付き十進数の形式で入力してください。"
+
+msgid "Broadcast address"
+msgstr "ブロードキャストアドレス"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "ディスプレイ"
+
+msgid "Downlink"
+msgstr "ダウンリンク"
+
+msgid "Download Config"
+msgstr "設定ダウンロード"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"スマートゲートウェイを有効にします。無効の場合、その他全てのスマートゲート"
+"ウェイの設定値は無視されます。標準設定は\"無効\"です。"
+
+msgid "Enable this interface."
+msgstr "このインターフェースを有効にします。"
+
+msgid "Enabled"
+msgstr "有効"
+
+msgid "Expected retransmission count"
+msgstr "再送数の期待値"
+
+msgid "FIB metric"
+msgstr "FIB メトリック"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+"FIB メトリックは、OLSRdが設定するホスト経路のメトリック値をコントロールしま"
+"す。\"flat\"を選択した場合、メトリック値は常に\"2\"となります。この設定は、"
+"Linuxカーネルが古い経路を消去するのに有効なため、好ましい設定です。\"correct"
+"\"はホップ数をメトリック値として使用します。\"approx\"も同様にホップ数をメト"
+"リック値として使用しますが、次ホップが変更した場合のみ更新を行います。標準設"
+"定は\"flat\"です。"
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr "TCsのfisheyeメカニズムを使用します。標準設定は\"有効\"です。"
+
+msgid "Gateway"
+msgstr "ゲートウェイ"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "General settings"
+msgstr "一般設定"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "HNA 通知"
+
+msgid "HNA interval"
+msgstr "HNA 送信間隔"
+
+msgid "HNA validity time"
+msgstr "HNA 有効時間"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "HNA 通知"
+
+msgid "Hello"
+msgstr "Hello"
+
+msgid "Hello interval"
+msgstr "Hello 送信間隔"
+
+msgid "Hello validity time"
+msgstr "Hello 有効時間"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "ホップ"
+
+msgid "Hostname"
+msgstr "ホスト名"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+"リンク検出に対するヒステリシスを設定します (ホップ数メトリックの場合のみ有"
+"効)。ヒステリシスはリンク検出に対するロバスト性を向上させますが、隣接ノードの"
+"登録が遅くなります。標準設定は\"有効\"です。"
+
+msgid "IP Addresses"
+msgstr "IPアドレス"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+"使用するIPプロトコルバージョンを指定します。6and4が選択された場合、各プロトコ"
+"ルに対して1つづつOLSRdインスタンスが起動します。"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 ブロードキャスト"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+"送信するOLSRパケットのIPv4ブロードキャストアドレスです。便利な一例として、"
+"255.255.255.255が挙げられます。標準設定は\"0.0.0.0\"であり、インターフェース"
+"のブロードキャストIPを使用します。"
+
+msgid "IPv4 source"
+msgstr "IPv4 送信元"
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+"送信するOLSRパケットのIPv4送信元アドレスです。標準設定は\"0.0.0.0\"であり、イ"
+"ンターフェースのIPを使用します。"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "IPv6 マルチキャスト"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+"IPv6 マルチキャストアドレスを設定します。標準はMANETルーターが使用するリンク"
+"ローカル・マルチキャストである\"FF02::6D\"です。"
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"IPv6 ネットワークアドレスは省略せずに入力してください。プレフィクスはCIDR形式"
+"で入力してください。"
+
+msgid "IPv6 source"
+msgstr "IPv6 送信元"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+"IPv6送信元プレフィクスを設定します。OLSRdはインターフェースの中から、このプレ"
+"フィクス値に一致するものを選択します。標準設定は\"0::/0\"であり、リンクローカ"
+"ルIPでないインターフェースIPを使用します。"
+
+msgid "IPv6-Prefix of the uplink"
+msgstr "アップリンクIPv6 プレフィクス"
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+"現在のゲートウェイへの経路が変わる場合、このゲートウェイのETX値は新しい値と比"
+"較される前に、このパラメータの値と乗算されます。パラメータは0.1から1.0の間で"
+"設定可能です。ただし、変更する場合、1.0に近い値を設定する事をお薦めします。"
+"<br /><b>警告:</b>このパラメータはetx_ffeth メトリックと同時に使用しないでく"
+"ださい!<br />標準設定は\"1.0\"です。"
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+"このノードがNATを使用してインターネットに接続する場合、有効にしてください。標"
+"準設定は\"有効\"です。"
+
+msgid "Interface"
+msgstr "インターフェース"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+"インターフェースモードは、スイッチ上のイーサネットインターフェースに不必要な"
+"パケットの送信を抑制するために使用します。有効なモードは\"mesh\"及び\"ether"
+"\"です。標準設定は\"mesh\"です。"
+
+msgid "Interfaces"
+msgstr "インターフェース"
+
+msgid "Interfaces Defaults"
+msgstr "インターフェース デフォルト設定"
+
+msgid "Internet protocol"
+msgstr "インターネットプロトコル"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+"ネットワーク・インターフェースの設定が変更されたかをチェックするポーリング間"
+"隔を秒単位で設定します。標準設定は\"2.5\"です。"
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "OLSR ルーティング"
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr "LQ エイジング"
+
+msgid "LQ algorithm"
+msgstr "LQ アルゴリズム"
+
+msgid "LQ fisheye"
+msgstr "LQ fisheye"
+
+msgid "LQ level"
+msgstr "LQ レベル"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "最終ホップ"
+
+msgid "Legend"
+msgstr "凡例"
+
+msgid "Library"
+msgstr "ライブラリ"
+
+msgid "Link Quality Settings"
+msgstr "リンク品質 (LQ) 設定"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+"リンク品質 (LQ) のエイジング要素の設定を行います (LQ レベルが2の場合のみ有"
+"効)。etx_float及びetx_fpmの値の調整を行います。値が小さくなると、ETX値の変化"
+"が遅くなります。設定可能な値は0.01-1.0です。"
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+"リンク品質 (LQ) アルゴリズムを設定します (LQ レベルが2の場合のみ有効)。<br /"
+"><b>etx_float</b>: 浮動小数点演算＋指数関数エイジング<br /><b>etx_fpm</b> : "
+"etx_floatと同様、ただし整数値演算を行います<br /><b>etx_ff</b> : ETX "
+"freifunk, ETXの変形版であり、ETX算出のためにHelloパケットだけでなく全てのOLSR"
+"トラフィックを使用します<br /><b>etx_ffeth</b>: etx_ffと互換性のない変形版で"
+"す。イーサネットのリンクにETX 0.1を設定することができます<br />標準設定は"
+"\"etx_ff\"です。"
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+"リンク品質(LQ) レベルの設定では、ホップ数ベースまたはコストベース(ETX) のどち"
+"らかにルーティング方法を切り替えます。<br /><b>0</b> = リンク品質を加味しない"
+"<br /><b>2</b> = MPR集合及びルーティングにリンク品質を加味する<br />標準設定"
+"は\"2\"です。"
+
+msgid "LinkQuality Multiplicator"
+msgstr "リンク品質 (LQ) マルチプリケーター"
+
+msgid "Links per node (average)"
+msgstr "ノードあたりのリンク数 (平均)"
+
+msgid "Links total"
+msgstr "リンク数の合計"
+
+msgid "Local interface IP"
+msgstr "ローカルインターフェース IP"
+
+msgid "MID"
+msgstr "MID"
+
+msgid "MID interval"
+msgstr "MID 送信間隔"
+
+msgid "MID validity time"
+msgstr "MID 有効時間"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "メインIP"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr "メトリック"
+
+msgid "Mode"
+msgstr "モード"
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"経路のLQと設定値の乗算を行います。設定可能な値は0.01-1です。この設定はLQ レベ"
+"ルが0以上の場合のみ設定可能です。<br />例:192.168.0.1へのLQを半分にする場合: "
+"192.168.0.1 0.5<br />このインターフェースから全てのノードへ対して20%減らす場"
+"合: default 0.8"
+
+msgid "NAT threshold"
+msgstr "NAT しきい値"
+
+msgid "NLQ"
+msgstr "NLQ"
+
+msgid "Neighbors"
+msgstr "隣接ノード"
+
+msgid "Neighbour IP"
+msgstr "隣接ノード IP"
+
+msgid "Neighbours"
+msgstr "隣接ノード"
+
+msgid "Netmask"
+msgstr "ネットマスク"
+
+msgid "Network"
+msgstr "ネットワーク"
+
+msgid "Network address"
+msgstr "ネットワークアドレス"
+
+msgid "Nic changes poll interval"
+msgstr "NIC変更ポーリング間隔"
+
+msgid "Nodes"
+msgstr "ノード"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr "OLSR - 表示オプション"
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - HNA (Host and Network Association) 通知"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA (Host and Network Association) 通知"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - プラグイン"
+
+msgid "OLSR Daemon"
+msgstr "OLSR デーモン"
+
+msgid "OLSR Daemon - Interface"
+msgstr "OLSR デーモン - インターフェース"
+
+msgid "OLSR connections"
+msgstr "OLSR コネクション"
+
+msgid "OLSR gateway"
+msgstr "OLSR ゲートウェイ"
+
+msgid "OLSR node"
+msgstr "OLSR ノード"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr "概要"
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "現在アクティブなOLSR HNA 一覧"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "現在確立済のOLSR接続一覧"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "現在既知のOLSRノードの一覧"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "現在のその他のOLSRノードへの経路一覧"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr "OLSR稼働中のインターフェース一覧"
+
+msgid "Overview of known multiple interface announcements"
+msgstr "通知されているマルチ・インターフェースの一覧"
+
+msgid "Overview of smart gateways in this network"
+msgstr "ネットワーク内のスマート・ゲートウェイ一覧"
+
+msgid "Plugin configuration"
+msgstr "プラグイン設定"
+
+msgid "Plugins"
+msgstr "プラグイン"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr "OLSRソケットのポーリング間隔を秒単位で設定します。標準は0.05です。"
+
+msgid "Pollrate"
+msgstr "ポーリング間隔"
+
+msgid "Port"
+msgstr "ポート"
+
+msgid "Prefix"
+msgstr "プレフィックス"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr "名前解決"
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+"ステータス・ページでホスト名の名前解決を行います。一般的には本機能を使用して"
+"も問題が起こることはありませんが、もしあなたがパブリックIPや不安定なDNS設定を"
+"使用している場合、ページの読み込み速度が極端に遅くなります。その場合はこの機"
+"能を無効にしてください。"
+
+msgid "Routes"
+msgstr "経路"
+
+msgid "Secondary OLSR interfaces"
+msgstr "セカンダリOLSR インターフェース"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+"ルーターのメインIP (発信元IP)を設定してください。このIPは、OLSRdの稼働中は決"
+"して変更しません。標準設定は0.0.0.0であり、プライマリ・インターフェースのIPを"
+"自動的に使用します。"
+
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"ルーターのメインIP (発信元IP)を設定してください。このIPは、OLSRdの稼働中は決"
+"して変更しません。標準設定は0.0.0.0であり、プライマリ・インターフェースのIPを"
+"自動的に使用します。"
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr "SmartGW 通知"
+
+msgid "SmartGateway is not configured on this system."
+msgstr "スマート・ゲートウェイ(SmartGW)は設定されていません。"
+
+msgid "Source address"
+msgstr "送信元アドレス"
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+"アップリンク速度をキロビット/秒で設定してください。1つ目のパラメータは上り、2"
+"つ目のパラメータは下りのストリームです。標準は\"128 1024\"です。"
+
+msgid "Speed of the uplink"
+msgstr "アップリンク速度"
+
+msgid "State"
+msgstr "状態"
+
+msgid "Status"
+msgstr "ステータス"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr "隣接ノードから受信したパケットの受信成功率"
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr "隣接ノードへ送信したパケットの送信成功率"
+
+msgid "TC"
+msgstr "TC"
+
+msgid "TC interval"
+msgstr "TC 送信間隔"
+
+msgid "TC validity time"
+msgstr "TC 有効時間"
+
+msgid "TOS value"
+msgstr "TOS値"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+"OLSRデーモンは、Optimized Link State Routingプロコトルを実装したサービスで"
+"す。OLSRはどのようなネットワーク環境でもメッシュルーティングを実現します。"
+"OLSRはアドホック・モードをサポートした全ての無線LANカードをサポートし、もちろ"
+"ん全てのイーサネットデバイスでも使用可能です。<a href='http://www.olsr."
+"org'>olsrd.org</a>にアクセスして、ヘルプ及びドキュメントを参照してください。"
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+"willingnessを固定する場合に使用します。willingnessが設定されていない場合、"
+"バッテリや電源のステータスによって動的に計算されます。標準は\"3\"です。"
+
+msgid "The interface OLSRd should serve."
+msgstr "OLSRdが使用するインターフェースです。"
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+"OLSRが使用するポート番号です。通常、このポート番号はIANAがアサインした698番で"
+"あるべきです。1-65535の間で設定可能です。"
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr "送信間隔及び有効時間"
+
+msgid "Topology"
+msgstr "トポロジー"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+"OLSRコントロールパケットにおける、IPヘッダのTOS (Type Of Service) 値を設定し"
+"ます。標準設定は\"16\"です。"
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "OLSRデーモンに接続できません！"
+
+msgid "Uplink"
+msgstr "アップリンク"
+
+msgid "Uplink uses NAT"
+msgstr "NATを使用して上位ネットワークに接続する"
+
+msgid "Use hysteresis"
+msgstr "ヒステリシスを使用する"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "バージョン"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+"警告: kmod-ipipがインストールされていません。スマートゲートウェイはkmod-ipip"
+"なしでは動作しません。まず初めにインストールを行なってください。"
+
+msgid "Weight"
+msgstr "Weight"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+"ホスト間において複数の経路が存在する場合に、どちらのリンクを使用するかの決定"
+"を行うために、インターフェースの重み付けを行います。通常、weightはインター"
+"フェースの特性を基に、OLSRdが自動的に計算を行いますが、固定値を設定することも"
+"可能です。OLSRdは最も低い値のリンクを選択します。<br /><b>注意:</b>インター"
+"フェースの重み付けは、LQ レベルが0の場合のみ、設定可能です。LQ レベルが0以外"
+"の値の場合、インターフェース ETX値が代わりに使用されます。"
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+"どのアップリンクを他のメッシュノードへ通知するかを設定します。アップリンクは"
+"ローカルのHNAである0.0.0.0/0、::ffff:0:0/96、2000::/3を探索することで検出しま"
+"す。標準設定は、\"both\"です。"
+
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"どのアップリンクを他のメッシュノードへ通知するかを設定します。アップリンクは"
+"ローカルのHNAである0.0.0.0/0、::ffff:0:0/96、2000::/3を探索することで検出しま"
+"す。標準設定は、\"both\"です。"
+
+msgid "Willingness"
+msgstr "Willingness"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "デバイス"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "OLSRdが稼働中であること、\"txinfo\"プラグインがロードされていること、ポー"
+#~ "ト2006番が設定されていること、\"127.0.0.1\"からの接続が許可されていること"
+#~ "を確認してください。"
diff --git a/trunk/package/luci/po/ja/openvpn.po b/trunk/package/luci/po/ja/openvpn.po
new file mode 100644
index 00000000..c4aaae96
--- /dev/null
+++ b/trunk/package/luci/po/ja/openvpn.po
@@ -0,0 +1,551 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-04-09 08:12+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', または 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr "追加"
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr "クライアント間通信を許可する"
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr "1つのセッションのみを許可する"
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr "現在設定済のOpenVPNの設定とステータスを表示しています。"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr "設定カテゴリ"
+
+msgid "Configure client mode"
+msgstr "クライアントモードに設定"
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr "サーバーモードに設定"
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr "再接続間隔"
+
+msgid "Cryptography"
+msgstr "暗号設定"
+
+msgid "Daemonize after initialization"
+msgstr "初期化後にデーモン化する"
+
+msgid "Delay n seconds after connection"
+msgstr "セッション接続後、n秒ディレイする"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr "Diffie Hellman パラメータ"
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr "ページングを無効にする"
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr "時刻をログに書き込まない"
+
+msgid "Don't re-read key on restart"
+msgstr "再起動時にキーの再読み込みを行わない"
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "OpenSSL暗号化のハードウェアサポートを有効にする"
+
+msgid "Enable Path MTU discovery"
+msgstr "Path MTU discovery を有効にする"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr "有効"
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr "設定 \"%s\""
+
+msgid "Invalid"
+msgstr "無効"
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr "tun デバイスでIPv6機能を有効にする"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr "ネットワーク"
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN 設定"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr "概要"
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "ポート"
+
+msgid "Protocol"
+msgstr "プロトコル"
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr "サービス"
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr "TCP/UDP のMTUを設定"
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr "ログ出力レベルの設定"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "TCP/UDP の受信バッファサイズ"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "TCP/UDP の送信バッファサイズ"
+
+msgid "Set tun/tap TX queue length"
+msgstr "tun/tap デバイスの送信キューサイズ"
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr "tun/tap デバイスのMTU設定"
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr "開始 / 停止"
+
+msgid "Started"
+msgstr "実行中"
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr "詳細設定へ移動 »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "TCP/UDP ポート (ローカル・リモート共用)"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "TCP/UDP ポート (ローカル, 標準設定=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "TCP/UDP ポート (リモート, 標準設定=1194)"
+
+msgid "TLS cipher"
+msgstr "TLS 暗号化方式"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr "高速LZO圧縮機能を使用する"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr "使用するプロトコル"
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr "いいえ"
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr "はい (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« 基本設定へ移動"
diff --git a/trunk/package/luci/po/ja/p2pblock.po b/trunk/package/luci/po/ja/p2pblock.po
new file mode 100644
index 00000000..00cccc8e
--- /dev/null
+++ b/trunk/package/luci/po/ja/p2pblock.po
@@ -0,0 +1,28 @@
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr ""
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/p910nd.po b/trunk/package/luci/po/ja/p910nd.po
new file mode 100644
index 00000000..42335cef
--- /dev/null
+++ b/trunk/package/luci/po/ja/p910nd.po
@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-11-04 18:11+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Bidirectional mode"
+msgstr "双方向モード"
+
+msgid "Device"
+msgstr "デバイス"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"まず初めに、USB(kmod-usb-printer)または、パラレルポート(kmod-lp)をサポートす"
+"るためのパッケージをインストールしてください。"
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "ポート番号"
+
+msgid "Settings"
+msgstr "設定"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "TCP接続待ちポート"
+
+msgid "enable"
+msgstr "有効"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - プリンタサーバー"
+
+#~ msgid "port_help"
+#~ msgstr "port_help"
diff --git a/trunk/package/luci/po/ja/pbx-voicemail.po b/trunk/package/luci/po/ja/pbx-voicemail.po
new file mode 100644
index 00000000..19e26bff
--- /dev/null
+++ b/trunk/package/luci/po/ja/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/ja/pbx.po b/trunk/package/luci/po/ja/pbx.po
new file mode 100644
index 00000000..76199f41
--- /dev/null
+++ b/trunk/package/luci/po/ja/pbx.po
@@ -0,0 +1,493 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-21 07:57+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr "Eメール"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr "外部SIPポート"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr "基本設定"
+
+msgid "Google Accounts"
+msgstr "Google アカウント"
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Google Voice/Talk アカウント"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr "QoS ルール設定を有効にする"
+
+msgid "Makes Outgoing Calls"
+msgstr "発信を許可する"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr "いいえ"
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr "PBX メインページ"
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "パスワード"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr "QoS 設定"
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr "受信を許可する"
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr "SIP アカウント"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "SIP デバイス/ソフトフォン アカウント"
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr "サーバー設定"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr "ユーザーエージェント名"
+
+msgid "User Name"
+msgstr "ユーザー名"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "はい"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+#~ msgid "Account Status"
+#~ msgstr "アカウントのステータス"
+
+#~ msgid "Account Status Message"
+#~ msgstr "アカウントステータス・メッセージ"
diff --git a/trunk/package/luci/po/ja/polipo.po b/trunk/package/luci/po/ja/polipo.po
new file mode 100644
index 00000000..81ce9a78
--- /dev/null
+++ b/trunk/package/luci/po/ja/polipo.po
@@ -0,0 +1,229 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-10-06 17:01+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Allowed clients"
+msgstr "アクセスを許可するクライアント"
+
+msgid "Always use system DNS resolver"
+msgstr "常にシステムのDNS名前解決を使用する"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Basic認証をサポートしています。\"ユーザー名:パスワード\"の形式で入力してくだ"
+"さい。"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "DNS and Query Settings"
+msgstr "DNSおよびクエリ設定"
+
+msgid "DNS server address"
+msgstr "DNSサーバーアドレス"
+
+msgid "Delete cache files time"
+msgstr "キャッシュファイルを保持する時間"
+
+msgid "Disk cache location"
+msgstr "ディスクキャッシュの保存場所"
+
+msgid "Do not query IPv6"
+msgstr "IPv6の問い合わせを行わない"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "複数ユーザーでキャッシュを共有する場合、有効にしてください。"
+
+msgid "First PMM segment size (in bytes)"
+msgstr "ファーストPMM セグメントサイズ (単位:バイト)"
+
+msgid "General Settings"
+msgstr "基本設定"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "PolipoがRAM上で使用するキャッシュサイズを設定してください。"
+
+msgid "In RAM cache size (in bytes)"
+msgstr "RAM キャッシュサイズ (単位:バイト)"
+
+msgid "Listen address"
+msgstr "待ち受けアドレス"
+
+msgid "Listen port"
+msgstr "待ち受けポート"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Polipoが使用するキャッシュファイルの保存場所を設定します。キャッシュは頻繁に"
+"更新されるため、外部デバイスに保存することを推奨します。空欄に設定した場合、"
+"ディスクキャッシュは無効化されます。"
+
+msgid "Log file location"
+msgstr "ログファイルの保存場所"
+
+msgid "Log to syslog"
+msgstr "syslogにログを記録する"
+
+msgid "Logging and RAM"
+msgstr "ログとRAM設定"
+
+msgid "Never use system DNS resolver"
+msgstr "システムのDNS名前解決を使用しない"
+
+msgid "On-Disk Cache"
+msgstr "ディスクキャッシュ"
+
+msgid "PMM segments size (in bytes)"
+msgstr "PMM セグメントサイズ (単位:バイト)"
+
+msgid "Parent Proxy"
+msgstr "親プロキシ"
+
+msgid "Parent proxy address"
+msgstr "親プロキシ・アドレス"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Polipoがリクエストを転送する、親プロキシサーバーのアドレスを\"ホスト:ポート番"
+"号\"の形式で設定してください。"
+
+msgid "Parent proxy authentication"
+msgstr "親プロキシの認証"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Polipo ステータス"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipoは、軽量で高速なWEBプロキシキャッシュサーバーです。"
+
+msgid "Poor Man's Multiplexing"
+msgstr "Poor Man's Multiplexing"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Poor Man's Multiplexing (PMM) は、複数のセグメントに渡ってインスタンスをリク"
+"エストすることで、多重化をシュミレートする技術であり、HTTPプロトコルの弱点に"
+"よるレイテンシを低減する試みを行います。注意:PMMを有効にしていると、いくつか"
+"のサイトではつながらなくなる可能性があります。"
+
+msgid "Port on which Polipo will listen"
+msgstr "Polipoが待ち受けを行うポート番号です。"
+
+msgid "Proxy"
+msgstr "プロキシ"
+
+msgid "Query DNS by hostname"
+msgstr "ホスト名のDNS問い合わせ"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr "IPv6 DNS問い合わせ"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "IPv4とIPv6の問い合わせを行う (IPv4を優先)"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "IPv4とIPv6の問い合わせを行う (IPv6を優先)"
+
+msgid "Query only IPv6"
+msgstr "IPv6のみ問い合わせを行う"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Polipoがシステムとは別のDNSサーバーを使用する場合、DNSサーバーのアドレスを設"
+"定してください。"
+
+msgid "Shared cache"
+msgstr "共有キャッシュ"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"最初のPMM セグメントのサイズを設定します。設定されなかった場合、PMM セグメン"
+"トサイズの倍のサイズをデフォルト値として設定します。"
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr "ステータス"
+
+msgid "Syslog facility"
+msgstr "Syslog ファシリティ"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"Polipoが待ち受けを行うインターフェースです。0.0.0.0 または :: (IPv6) を設定し"
+"た場合、全てのインターフェースで待ち受けを行います。"
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr "PMM を有効にする場合、PMM セグメントサイズには正の値を設定してください。"
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"ログファイルは頻繁に更新されるため、外部デバイスに保存することを推奨します。"
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+"待ち受けアドレスを0.0.0.0 または :: (IPv6) に設定した場合、アクセスを許可する"
+"クライアントアドレスを設定してください。設定フォーマットはIPアドレスかネット"
+"ワークアドレスです。(例:192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 "
+"(IPv6))"
+
+msgid "enable"
+msgstr "サービスを有効にする"
diff --git a/trunk/package/luci/po/ja/qos.po b/trunk/package/luci/po/ja/qos.po
new file mode 100644
index 00000000..857cf5b8
--- /dev/null
+++ b/trunk/package/luci/po/ja/qos.po
@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2011-10-28 11:02+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Calculate overhead"
+msgstr "オーバーヘッドを考慮する"
+
+msgid "Classification Rules"
+msgstr "区分ルール"
+
+msgid "Classification group"
+msgstr "区分グループ"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "宛先ホスト"
+
+msgid "Download speed (kbit/s)"
+msgstr "ダウンロード速度 (kbit/s)"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "Half-duplex"
+msgstr "半二重"
+
+msgid "Interfaces"
+msgstr "インターフェース"
+
+msgid "Number of bytes"
+msgstr "バイト数"
+
+msgid "Ports"
+msgstr "ポート"
+
+msgid "Protocol"
+msgstr "プロトコル"
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr "Quality of Service"
+
+msgid "Service"
+msgstr "サービス"
+
+msgid "Source host"
+msgstr "送信元ホスト"
+
+msgid "Target"
+msgstr "対象"
+
+msgid "Upload speed (kbit/s)"
+msgstr "アップロード速度 (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"<abbr title=\"Quality of Service\">QoS</abbr>はアドレス、ポート、サービスで区"
+"別して、ネットワークトラフィックに優先度を付与することが可能です。"
+
+msgid "all"
+msgstr "全て"
+
+msgid "default"
+msgstr "標準"
+
+msgid "express"
+msgstr "高速"
+
+msgid "low"
+msgstr "低速"
+
+msgid "normal"
+msgstr "標準"
+
+msgid "priority"
+msgstr "最優先"
diff --git a/trunk/package/luci/po/ja/radvd.po b/trunk/package/luci/po/ja/radvd.po
new file mode 100644
index 00000000..35cde34f
--- /dev/null
+++ b/trunk/package/luci/po/ja/radvd.po
@@ -0,0 +1,378 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-16 09:35+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: German\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "6to4 interface"
+msgstr "6to4 インターフェース"
+
+msgid "Address"
+msgstr "アドレス"
+
+msgid "Addresses"
+msgstr "アドレス"
+
+msgid "Advanced"
+msgstr "詳細設定"
+
+msgid "Advertise Home Agent flag"
+msgstr "ホームエージェントフラグの広告"
+
+msgid "Advertise router address"
+msgstr "ルーターアドレスの広告"
+
+msgid "Advertised Domain Suffixes"
+msgstr "広告するドメインサフィックスを設定します。"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"広告するIPv6 RDNSSを設定します。未設定の場合、現在のインターフェースのIPv6 ア"
+"ドレスに設定します。"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "広告するIPv6 プレフィクスを設定します"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"広告するIPv6 プレフィクスを設定します。未設定の場合、現在のインターフェースの"
+"プレフィクスに設定します。"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "モバイルIPv6 ホームエージェント機能の広告を行います。 (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr "広告"
+
+msgid "Autonomous"
+msgstr "Autonomous"
+
+msgid "Clients"
+msgstr "クライアント"
+
+msgid "Configuration flag"
+msgstr "Configuration フラグ"
+
+msgid "Current hop limit"
+msgstr "現在のホップ数制限"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "DNSSL 設定"
+
+msgid "Default lifetime"
+msgstr "標準有効時間"
+
+msgid "Default preference"
+msgstr "標準優先度設定"
+
+msgid "Enable"
+msgstr "有効"
+
+msgid "Enable advertisements"
+msgstr "広告を有効にする"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "ルータ広告および要請を有効にする"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr "基本設定"
+
+msgid "Home Agent information"
+msgstr "ホームエージェント 情報"
+
+msgid "Home Agent lifetime"
+msgstr "ホームエージェント 有効時間"
+
+msgid "Home Agent preference"
+msgstr "ホームエージェント 優先度"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "ルータ広告 (RA) にホームエージェント情報を含める"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr "インターフェース"
+
+msgid "Interface Configuration"
+msgstr "インターフェース設定"
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "インターフェース"
+
+msgid "Lifetime"
+msgstr "有効時間"
+
+msgid "Link MTU"
+msgstr "リンクMTU"
+
+msgid "Managed flag"
+msgstr "Managed フラグ"
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr "ルータ要請最大送信間隔"
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr "ルータ要請最低送信間隔"
+
+msgid "Mobile IPv6"
+msgstr "モバイル IPv6"
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr "モバイル IPv6 ルータ登録"
+
+msgid "Multicast"
+msgstr "マルチキャスト"
+
+msgid "On-link"
+msgstr "On-link"
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr "優先度"
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr "プレフィクス"
+
+msgid "Prefix Configuration"
+msgstr "プレフィクス設定"
+
+msgid "Prefixes"
+msgstr "プレフィクス"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "RDNSS 設定"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - インターフェース %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - プレフィクス"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - 経路"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"Radvdは、IPv6用のルータ広告デーモンです。RadvdはRFC 4861に規定されている、"
+"ルータ要請の受信と、ルータ広告の送信を行います。"
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"設定されたクライアントに対してのみ通信を行います。設定しない場合、マルチキャ"
+"ストを行います。"
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr "経路設定"
+
+msgid "Routes"
+msgstr "経路"
+
+msgid "Source link-layer address"
+msgstr "送信元リンク層アドレス"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr "このセクションで使用する論理インターフェース名を設定してください。"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr "サフィックス"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr "タイミング設定"
+
+msgid "Unicast only"
+msgstr "ユニキャストのみ"
+
+msgid "Valid lifetime"
+msgstr "有効時間の設定"
+
+msgid "Validity time"
+msgstr "有効時間"
+
+msgid "default"
+msgstr "default"
+
+msgid "high"
+msgstr "高"
+
+msgid "low"
+msgstr "低"
+
+msgid "medium"
+msgstr "中"
+
+msgid "no"
+msgstr "いいえ"
+
+msgid "yes"
+msgstr "はい"
diff --git a/trunk/package/luci/po/ja/rrdtool.po b/trunk/package/luci/po/ja/rrdtool.po
new file mode 100644
index 00000000..95545db6
--- /dev/null
+++ b/trunk/package/luci/po/ja/rrdtool.po
@@ -0,0 +1,358 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/samba.po b/trunk/package/luci/po/ja/samba.po
new file mode 100644
index 00000000..c5275075
--- /dev/null
+++ b/trunk/package/luci/po/ja/samba.po
@@ -0,0 +1,81 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-11-03 18:09+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "ゲストアクセスを許可"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "sambaを介してユーザーのホームディレクトリへのアクセスを許可します"
+
+msgid "Allowed users"
+msgstr "許可されたユーザー"
+
+msgid "Create mask"
+msgstr "マスクの作成"
+
+msgid "Description"
+msgstr "説明"
+
+msgid "Directory mask"
+msgstr "ディレクトリのマスク"
+
+msgid "Edit Template"
+msgstr "テンプレートの編集"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "samba設定を生成するテンプレートを編集します。"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "Hostname"
+msgstr "ホスト名"
+
+msgid "Mask for new directories"
+msgstr "新規ディレクトリのマスク"
+
+msgid "Mask for new files"
+msgstr "新規ファイルのマスク"
+
+msgid "Name"
+msgstr "名前"
+
+msgid "Network Shares"
+msgstr "ネットワーク共有"
+
+msgid "Path"
+msgstr "パス"
+
+msgid "Read-only"
+msgstr "読み込みのみ"
+
+msgid "Share home-directories"
+msgstr "ホームディレクトリの共有"
+
+msgid "Shared Directories"
+msgstr "共有ディレクトリ"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"これは、samba設定を生成するための'/etc/samba/smb.conf.template' ファイルの内"
+"容です。パイプ('|')で閉じられた値は変更しないでください。これらの値は'一般設"
+"定'タブ内の値によって置き換えられます。"
+
+msgid "Workgroup"
+msgstr "ワークグループ"
diff --git a/trunk/package/luci/po/ja/splash.po b/trunk/package/luci/po/ja/splash.po
new file mode 100644
index 00000000..615be16b
--- /dev/null
+++ b/trunk/package/luci/po/ja/splash.po
@@ -0,0 +1,292 @@
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/statistics.po b/trunk/package/luci/po/ja/statistics.po
new file mode 100644
index 00000000..99c5e1bc
--- /dev/null
+++ b/trunk/package/luci/po/ja/statistics.po
@@ -0,0 +1,601 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-04-20 08:55+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr "ベース・ディレクトリ"
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr "CSV プラグイン設定"
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Collectd 設定"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr "DF プラグイン設定"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr "データの収集間隔"
+
+msgid "Datasets definition file"
+msgstr "データベース定義ファイル"
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr "collectd プラグインディレクトリ"
+
+msgid "Directory for sub-configurations"
+msgstr "サブ設定ディレクトリ"
+
+msgid "Disk Plugin Configuration"
+msgstr "ディスクプラグイン設定"
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr "時間帯表示 »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "E-メールプラグイン設定"
+
+msgid "Email"
+msgstr "Eメール"
+
+msgid "Enable this plugin"
+msgstr "プラグイン設定を有効にする"
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr "ファイアウォール"
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr "グラフ"
+
+msgid "Group"
+msgstr "グループ"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "ホスト名"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr "IRQ プラグイン設定"
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr "設定値以外の全てのインターフェースをモニターする"
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr "モニターするインターフェースの設定"
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Netlink プラグイン設定"
+
+msgid "Network"
+msgstr "ネットワーク"
+
+msgid "Network Plugin Configuration"
+msgstr "ネットワークプラグイン設定"
+
+msgid "Network plugins"
+msgstr "ネットワークプラグイン"
+
+msgid "Network protocol"
+msgstr "ネットワークプロトコル"
+
+msgid "Number of threads for data collection"
+msgstr "データ収集用スレッド数"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "OLSRd プラグイン設定"
+
+msgid "Only create average RRAs"
+msgstr "平均値のRRAsのみ作成する"
+
+msgid "Options"
+msgstr "オプション"
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr "出力プラグイン"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Ping プラグイン設定"
+
+msgid "Port"
+msgstr "ポート"
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "RRDTool プラグイン設定"
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr "スクリプト"
+
+msgid "Seconds"
+msgstr "秒"
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr "保存先ディレクトリ"
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr "システムプラグイン"
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"インターフェースプラグインは、選択したインターフェースのトラフィックの統計情"
+"報を収集します。"
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"iwinfo プラグインは、無線信号強度、ノイズ、クオリティ情報を収集します。"
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "負荷プラグインは、システム負荷の統計情報を収集します。"
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr "使用するPIDファイルの保存場所"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "無線LAN iwinfo プラグイン設定"
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr "rrdファイルのサイズを小さくします。"
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/ja/tinyproxy.po b/trunk/package/luci/po/ja/tinyproxy.po
new file mode 100644
index 00000000..03ea890f
--- /dev/null
+++ b/trunk/package/luci/po/ja/tinyproxy.po
@@ -0,0 +1,280 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-10-05 17:53+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"転送するリクエストのHTTPヘッダに\"X-Tinyproxy\"及びクライアントIPアドレスを追"
+"加します。"
+
+msgid "Allowed clients"
+msgstr "接続を許可するクライアント"
+
+msgid "Allowed connect ports"
+msgstr "接続を許可するポート番号"
+
+msgid "Bind address"
+msgstr "バインドするIPアドレス"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"標準では、基本的なPOSIX正規表現がフィルタリングに使用されますが、このオプショ"
+"ンが有効に設定されている場合、拡張版のPOSIX正規表現が用いられます。"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+"標準では、フィルターの文字列は大文字小文字を区別しませんが、このオプションが"
+"有効に設定されている場合、区別してフィルタリングを行います。"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"標準では、ドメイン名を使用してフィルタリングを行いますが、このオプションが有"
+"効に設定されている場合、代わりにURLに対してフィルタリングを行います。"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"標準では、フィルタリング・ルールはブラックリストとして動作しますが、このオプ"
+"ションが有効に設定されている場合、URLまたはドメイン名が一致した場合のみ、接続"
+"が許可されます。"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr "接続タイムアウト"
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr "Tinyproxy サーバーを有効にする"
+
+msgid "Error page"
+msgstr "エラーページ"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr "正規表現フィルタリング"
+
+msgid "Filter by URLs"
+msgstr "URL フィルタリング"
+
+msgid "Filter case-sensitive"
+msgstr "大文字小文字を区別してフィルタリング"
+
+msgid "Filter file"
+msgstr "フィルタファイル"
+
+msgid "Filtering and ACLs"
+msgstr "フィルタリングとアクセス制御"
+
+msgid "General settings"
+msgstr "基本設定"
+
+msgid "Group"
+msgstr "グループ"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr "リクエスト数を表示するHTMLテンプレートファイル"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "HTTPエラー時に表示するHTMLテンプレートファイル"
+
+msgid "Header whitelist"
+msgstr "ヘッダー・ホワイトリスト"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr "プロキシサーバーの使用を許可するIPアドレスリストです。"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"プロキシサーバーから接続可能なポートリストです。\"0\"を設定した場合、すべての"
+"ポートを許可します。"
+
+msgid "Listen address"
+msgstr "待受アドレス"
+
+msgid "Listen port"
+msgstr "待受ポート"
+
+msgid "Log file"
+msgstr "ログファイル"
+
+msgid "Log file to use for dumping messages"
+msgstr "メッセージを書き込むログファイルを指定します。"
+
+msgid "Log level"
+msgstr "ログレベル"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "Tinyproxyプロセスのログの詳細度を設定"
+
+msgid "Max. clients"
+msgstr "最大クライアント数"
+
+msgid "Max. requests per server"
+msgstr "サーバー毎の最大リクエスト数"
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+"プロセス毎の許可される最大リクエスト数を設定します。設定値を超えた場合、プロ"
+"セスを再起動します。0を入力すると、無制限に設定されます。"
+
+msgid "Maximum number of prepared idle processes"
+msgstr "アイドル状態で準備するプロセスの最大数"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr "アイドル状態で準備するプロセスの最小数"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr "ポリシー"
+
+msgid "Privacy settings"
+msgstr "プライバシー設定"
+
+msgid "Reject access"
+msgstr "アクセス拒否"
+
+msgid "Server Settings"
+msgstr "サーバー設定"
+
+msgid "Server limits"
+msgstr "サーバー制限設定"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "リクエストに対して、Tinyproxyが待ち受けるHTTPポートを設定します"
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr "リクエストに対して、Tinyproxyが待ち受けるアドレスを設定します。"
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr "Tinyproxyを実行するグループを設定します"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+"特定のホストにアクセスする際に使用する、上位のプロキシサーバーを設定します。"
+"書式は <code>アドレス:ポート</code> です。"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr "Tinyproxyを実行するユーザーを設定します"
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr "宛先ホスト"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+"Tinyproxyは、軽量で高速なキャッシュを行わないHTTP(S)-プロキシサーバーです。"
+
+msgid "Upstream Proxies"
+msgstr "上位のプロキシサーバー"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+"特定のIPアドレスやドメインに接続する場合に、上位のプロキシサーバーを使用する"
+"ように設定することができます。"
+
+msgid "Use syslog"
+msgstr "Syslogを使用する"
+
+msgid "User"
+msgstr "ユーザー"
+
+msgid "Via hostname"
+msgstr "経由するホスト名"
+
+msgid "Via proxy"
+msgstr "経由するプロキシ"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr "ログファイルの代わりにsyslogへメッセージを記録します"
+
+msgid "X-Tinyproxy header"
+msgstr "X-Tinyproxy ヘッダー"
diff --git a/trunk/package/luci/po/ja/transmission.po b/trunk/package/luci/po/ja/transmission.po
new file mode 100644
index 00000000..dded6503
--- /dev/null
+++ b/trunk/package/luci/po/ja/transmission.po
@@ -0,0 +1,295 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-18 11:15+0200\n"
+"PO-Revision-Date: 2013-10-05 17:17+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "一時的な下り速度制限"
+
+msgid "Alternative speed enabled"
+msgstr "一時的な速度制限機能を有効にする"
+
+msgid "Alternative speed time begin"
+msgstr "一時的な速度制限 開始時間"
+
+msgid "Alternative speed time day"
+msgstr "一時的な速度制限 制限日"
+
+msgid "Alternative speed time end"
+msgstr "一時的な速度制限 終了時間"
+
+msgid "Alternative speed timing enabled"
+msgstr "一時的な速度制限のスケジューリング機能を有効にする"
+
+msgid "Alternative upload speed"
+msgstr "一時的な上り速度制限"
+
+msgid "Automatically start added torrents"
+msgstr "追加されたtorrent は自動的に開始する"
+
+msgid "Bandwidth settings"
+msgstr "帯域設定"
+
+msgid "Binding address IPv4"
+msgstr "バインドするIPv4 アドレス"
+
+msgid "Binding address IPv6"
+msgstr "バインドするIPv6 アドレス"
+
+msgid "Block list enabled"
+msgstr "ブロックリストを有効にする"
+
+msgid "Blocklist URL"
+msgstr "ブロックリスト URL"
+
+msgid "Blocklists"
+msgstr "ブロックリスト"
+
+msgid "Cache size in MB"
+msgstr "キャッシュサイズ (MB)"
+
+msgid "Config file directory"
+msgstr "コンフィグファイル・ディレクトリ"
+
+msgid "DHT enabled"
+msgstr "DHTを有効にする"
+
+msgid "Debug"
+msgstr "デバッグ情報"
+
+msgid "Download directory"
+msgstr "ダウンロード先のディレクトリ"
+
+msgid "Download queue enabled"
+msgstr "ダウンロード・キュー機能を有効にする"
+
+msgid "Download queue size"
+msgstr "ダウンロード・キューのサイズ"
+
+msgid "Enable watch directory"
+msgstr "ディレクトリ監視機能を有効にする"
+
+msgid "Enabled"
+msgstr "サービスを有効にする"
+
+msgid "Encryption"
+msgstr "暗号化"
+
+msgid "Error"
+msgstr "エラー情報"
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr "ファイルおよびロケーション設定"
+
+msgid "Forced"
+msgstr "強制する"
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr "全体の最大ピア数"
+
+msgid "Global settings"
+msgstr "グローバル設定"
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr "情報"
+
+msgid "LPD enabled"
+msgstr "LPD を有効にする"
+
+msgid "Lazy bitfield enabled"
+msgstr "Lazy bitfield を有効にする"
+
+msgid "Message level"
+msgstr "メッセージレベル"
+
+msgid "Miscellaneous"
+msgstr "詳細設定"
+
+msgid "None"
+msgstr "なし"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr "使用しない"
+
+msgid "Open Web Interface"
+msgstr "WEBブラウザで開く"
+
+msgid "PEX enabled"
+msgstr "PEX を有効にする"
+
+msgid "Peer Port settings"
+msgstr "ピアポート設定"
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr "torrent 毎の最大ピア数"
+
+msgid "Peer port"
+msgstr "ピアポート"
+
+msgid "Peer port random high"
+msgstr "ポートをランダムに選択する際の上限値"
+
+msgid "Peer port random low"
+msgstr "ポートをランダムに選択する際の下限値"
+
+msgid "Peer port random on start"
+msgstr "サービススタート時にポートをランダムに選択する"
+
+msgid "Peer settings"
+msgstr "ピア設定"
+
+msgid "Peer socket tos"
+msgstr "ピアソケットのTOS"
+
+msgid "Port forwarding enabled"
+msgstr "ポート転送を有効にする"
+
+msgid "Preferred"
+msgstr "優先する"
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr "キューイング設定"
+
+msgid "RPC URL"
+msgstr "RPC URL"
+
+msgid "RPC authentication required"
+msgstr "RPC 認証機能を有効にする"
+
+msgid "RPC bind address"
+msgstr "RPC バインドアドレス"
+
+msgid "RPC enabled"
+msgstr "RPC機能を有効にする"
+
+msgid "RPC password"
+msgstr "RPC パスワード"
+
+msgid "RPC port"
+msgstr "RPC ポート"
+
+msgid "RPC settings"
+msgstr "RPC 設定"
+
+msgid "RPC username"
+msgstr "RPC ユーザー名"
+
+msgid "RPC whitelist"
+msgstr "RPC ホワイトリスト"
+
+msgid "RPC whitelist enabled"
+msgstr "RPC ホワイトリスト機能を有効にする"
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr "デーモンのユーザー権限設定"
+
+msgid "Scheduling"
+msgstr "スケジューラ設定"
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr "torrent 完了時にスクリプトを実行する"
+
+msgid "Script torrent done filename"
+msgstr "torrent 完了時に実行するスクリプト・ファイルパス"
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr "下り速度制限"
+
+msgid "Speed limit down enabled"
+msgstr "下り速度制限機能を有効にする"
+
+msgid "Speed limit up"
+msgstr "上り速度制限"
+
+msgid "Speed limit up enabled"
+msgstr "上り速度制限機能を有効にする"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr "Transmissionは、シンプルなbittorrentクライアントです。"
+
+msgid "Trash original torrent files"
+msgstr "オリジナルのtorrent ファイルをゴミ箱に移動する"
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr "監視するディレクトリ"
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr "uTP を有効にする"
diff --git a/trunk/package/luci/po/ja/upnp.po b/trunk/package/luci/po/ja/upnp.po
new file mode 100644
index 00000000..79e21536
--- /dev/null
+++ b/trunk/package/luci/po/ja/upnp.po
@@ -0,0 +1,160 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-10-05 17:27+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"アクセス制御リスト(ACL) は、どの外部ポートからどの内部アドレス及びポートへリ"
+"ダイレクトするかを設定します。"
+
+msgid "Action"
+msgstr "動作"
+
+msgid "Active UPnP Redirects"
+msgstr "稼働中のUPnPリダイレクト"
+
+msgid "Advanced Settings"
+msgstr "詳細設定"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr "通知するモデル番号"
+
+msgid "Announced serial number"
+msgstr "通知するシリアル番号"
+
+msgid "Clean rules interval"
+msgstr "ルール消去間隔"
+
+msgid "Clean rules threshold"
+msgstr "ルール消去しきい値"
+
+msgid "Client Address"
+msgstr "クライアント・アドレス"
+
+msgid "Client Port"
+msgstr "クライアント・ポート"
+
+msgid "Collecting data..."
+msgstr "データ収集中です..."
+
+msgid "Comment"
+msgstr "コメント"
+
+msgid "Delete Redirect"
+msgstr "リダイレクトを削除"
+
+msgid "Device UUID"
+msgstr "デバイス UUID"
+
+msgid "Downlink"
+msgstr "ダウンリンク"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "NAT-PMP機能を有効にする"
+
+msgid "Enable UPnP functionality"
+msgstr "UPnP機能を有効にする"
+
+msgid "Enable additional logging"
+msgstr "ログ機能を有効にする"
+
+msgid "Enable secure mode"
+msgstr "セキュアモードを有効にする"
+
+msgid "External Port"
+msgstr "外部ポート"
+
+msgid "External ports"
+msgstr "外部ポート"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "Internal addresses"
+msgstr "内部アドレス"
+
+msgid "Internal ports"
+msgstr "内部ポート"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP アクセス制御リスト (ACL)"
+
+msgid "MiniUPnP settings"
+msgstr "MiniUPnP 設定"
+
+msgid "Notify interval"
+msgstr "通知間隔"
+
+msgid "Port"
+msgstr "ポート"
+
+msgid "Presentation URL"
+msgstr "プレゼンテーション URL"
+
+msgid "Protocol"
+msgstr "プロトコル"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "追加のデバッグ情報をシステムログへ挿入する"
+
+msgid "Report system instead of daemon uptime"
+msgstr "サービスの起動時間の代わりにシステムの起動時間を使用する"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "UPnP及びNAT-PMPサービスを開始する"
+
+msgid "There are no active redirects."
+msgstr "有効なリダイレクトはありません。"
+
+msgid "UPNP"
+msgstr "UPnP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータを"
+"構成することができます。"
+
+msgid "UPnP lease file"
+msgstr "UPnP リースファイル"
+
+msgid "Universal Plug & Play"
+msgstr "ユニバーサル プラグ &#38; プレイ"
+
+msgid "Uplink"
+msgstr "アップリンク"
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr "UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータを構成することができます。"
+
+#~ msgid "enable"
+#~ msgstr "有効"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPnPはあなたの使用するネットワークに対して、セキュリティリスクが生じる可能"
+#~ "性があるため、必要な場合のみ有効にしてください。"
diff --git a/trunk/package/luci/po/ja/ushare.po b/trunk/package/luci/po/ja/ushare.po
new file mode 100644
index 00000000..a217ecea
--- /dev/null
+++ b/trunk/package/luci/po/ja/ushare.po
@@ -0,0 +1,52 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-05-04 14:28+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "コンテンツディレクトリ"
+
+msgid "Disable telnet console"
+msgstr "telnelコンソールを無効にする"
+
+msgid "Disable webinterface"
+msgstr "Webインターフェースを無効にする"
+
+msgid "Enable"
+msgstr "サービスを有効にする"
+
+msgid "Interface"
+msgstr "インターフェース"
+
+msgid "Options"
+msgstr "オプション"
+
+msgid "Servername"
+msgstr "サーバー名"
+
+msgid "Settings"
+msgstr "設定"
+
+msgid "Username"
+msgstr "ユーザー名"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShareはUPnP (TM) A/V および DLNA "
+"メディアサーバーであり、UPnPメディアデバイスに対してマルチメディア・ファイル情報を提供するサーバー・コンポーネント機能を実装しています。"
diff --git a/trunk/package/luci/po/ja/uvc_streamer.po b/trunk/package/luci/po/ja/uvc_streamer.po
new file mode 100644
index 00000000..ac20906a
--- /dev/null
+++ b/trunk/package/luci/po/ja/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-06-17 10:56+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "FPS"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "解像度"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "設定"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "ウェブカムストリーミング"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Linux-UVC互換のウェブカムを設定します。ブラウザで<a href=\"http://%s:%i/"
+"\">http://%s:%i/</a>にアクセスしてください。"
diff --git a/trunk/package/luci/po/ja/vnstat.po b/trunk/package/luci/po/ja/vnstat.po
new file mode 100644
index 00000000..8708c6fb
--- /dev/null
+++ b/trunk/package/luci/po/ja/vnstat.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-08-19 06:15+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: German\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "Daily traffic"
+msgstr "１日周期のトラフィック"
+
+msgid "Graphs"
+msgstr "グラフ"
+
+msgid "Hourly traffic"
+msgstr "１時間周期のトラフィック"
+
+msgid "Monitor selected interfaces"
+msgstr "モニターするインターフェースを選択"
+
+msgid "Monthly traffic"
+msgstr "１月周期のトラフィック"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"データベースが設定されていません。VnStat設定ページへ移動し、１つ以上のイン"
+"ターフェースのモニタリングを有効にしてください。"
+
+msgid "Restart VnStat"
+msgstr "VnStatを再起動"
+
+msgid "Summary display"
+msgstr "サマリーを表示"
+
+msgid "Top 10 display"
+msgstr "トップ10を表示"
+
+msgid "Update »"
+msgstr "更新 »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "VnStat グラフ"
+
+msgid "VnStat Traffic Monitor"
+msgstr "VnStatトラフィックモニタ"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStatは選択したインタフェースのネットワークトラフィックをロギングするLinuxの"
+"トラフィックモニターです。"
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "VnStatサービスは再起動しました。"
diff --git a/trunk/package/luci/po/ja/voice_core.po b/trunk/package/luci/po/ja/voice_core.po
new file mode 100644
index 00000000..c7e60e20
--- /dev/null
+++ b/trunk/package/luci/po/ja/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Phones"
+msgstr "電話"
+
+msgid "Voice"
+msgstr ""
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/ja/voice_diag.po b/trunk/package/luci/po/ja/voice_diag.po
new file mode 100644
index 00000000..715f4118
--- /dev/null
+++ b/trunk/package/luci/po/ja/voice_diag.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/ja/watchcat.po b/trunk/package/luci/po/ja/watchcat.po
new file mode 100644
index 00000000..1ae0eb4c
--- /dev/null
+++ b/trunk/package/luci/po/ja/watchcat.po
@@ -0,0 +1,70 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-06 17:09+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "強制再起動ディレイ時間"
+
+msgid "Host address to ping"
+msgstr "ping を実行する宛先を設定してください。"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"どの程度の間隔でインターネット接続をチェックするか設定します。標準の単位は秒"
+"ですが、'm'を接尾に付けると分、'h'を付けると時、'd'を付けると日数に設定されま"
+"す。"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"定期動作モードの場合、再起動する周期を設定します。インターネットモードの場"
+"合、インターネット接続が切断状態にある許容する期間を設定します。標準の単位は"
+"秒ですが、'm'を接尾に付けると分、'h'を付けると時、'd'を付けると日数に設定され"
+"ます。"
+
+msgid "Operating mode"
+msgstr "動作モード"
+
+msgid "Period"
+msgstr "周期"
+
+msgid "Ping host"
+msgstr "Ping 宛先ホスト"
+
+msgid "Ping period"
+msgstr "Ping 間隔"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcatでは、定期的な再起動や、インターネット接続が一定期間切断された際の再"
+"起動を行うような設定が可能です。"
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"再起動時にwatchcatはソフトウェアリセットを実行しますが、0以外の値を設定した場"
+"合、ソフトウェアリセットが失敗した際に設定された秒数後にハードウェアリセット"
+"を行います。0を設定した場合は無効になります。"
diff --git a/trunk/package/luci/po/ja/wol.po b/trunk/package/luci/po/ja/wol.po
new file mode 100644
index 00000000..c18b8319
--- /dev/null
+++ b/trunk/package/luci/po/ja/wol.po
@@ -0,0 +1,56 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2013-10-06 17:12+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "全てのインターフェースへブロードキャスト"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "起動するホストのMACアドレスを選択または入力してください"
+
+msgid "Host to wake up"
+msgstr "起動するホストを指定"
+
+msgid "Network interface to use"
+msgstr "使用するネットワークインターフェース"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"片方のツールのみが動作する場合があるため、片方が失敗する場合は別のツールを試"
+"してみてください。"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "WoLパケットを送信するインタフェースを指定"
+
+msgid "Starting WoL utility:"
+msgstr "WoLユーティリティを起動:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LANはローカルネットワーク内のコンピュータを遠隔で起動させることができ"
+"る機能です。"
+
+msgid "Wake up host"
+msgstr "ホストを起動"
+
+msgid "WoL program"
+msgstr "WoLプログラム"
diff --git a/trunk/package/luci/po/ja/wshaper.po b/trunk/package/luci/po/ja/wshaper.po
new file mode 100644
index 00000000..d58476cf
--- /dev/null
+++ b/trunk/package/luci/po/ja/wshaper.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-17 18:28+0200\n"
+"PO-Revision-Date: 2012-03-18 09:07+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Downlink"
+msgstr "下りリンク"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "下りリンク帯域 (kbit/sec)"
+
+msgid "Host or Network in CIDR notation."
+msgstr "ホスト名またはCIDR表記のネットワークアドレス"
+
+msgid "Interface"
+msgstr "インターフェース"
+
+msgid "Low priority destination ports"
+msgstr "低優先度の宛先ポート"
+
+msgid "Low priority hosts (Destination)"
+msgstr "低優先度の宛先ホスト"
+
+msgid "Low priority hosts (Source)"
+msgstr "低優先度の送信元ホスト"
+
+msgid "Low priority source ports"
+msgstr "低優先度の送信元ポート"
+
+msgid "Uplink"
+msgstr "上りリンク"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "上りリンク帯域 (kbit/sec)"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Wondershaper 設定"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondweshaperは、インターネット接続が飽和状態の場合でも、低いレイテンシ・円滑"
+"な通信を実現するためにトラフィック・シェーピングを行います。"
diff --git a/trunk/package/luci/po/ms/ahcp.po b/trunk/package/luci/po/ms/ahcp.po
new file mode 100644
index 00000000..0b6963b1
--- /dev/null
+++ b/trunk/package/luci/po/ms/ahcp.po
@@ -0,0 +1,105 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "AHCP Server"
+msgstr ""
+
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+
+msgid "Active AHCP Leases"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Age"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Announced NTP servers"
+msgstr ""
+
+msgid "Announced prefixes"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Forwarder"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Lease directory"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "Operation mode"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Served interfaces"
+msgstr ""
+
+msgid "Server"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+
+msgid "The AHCP Service is not running."
+msgstr ""
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "Unique ID file"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/asterisk.po b/trunk/package/luci/po/ms/asterisk.po
new file mode 100644
index 00000000..e1260e1b
--- /dev/null
+++ b/trunk/package/luci/po/ms/asterisk.po
@@ -0,0 +1,611 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-03 12:40+1000\n"
+"PO-Revision-Date: 2010-05-05 23:32+1000\n"
+"Last-Translator: Wai Chet Teow <waichet@hotmail.com>\n"
+"Language-Team: LANGUAGE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Pilihan Umum Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "AGI Direktori"
+
+#, fuzzy
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Cache dicatat semasa rakaman fail bunyi"
+
+#, fuzzy
+#~ msgid "Debug Level"
+#~ msgstr "Tingkatan debug"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Mematikan beberapa amaran"
+
+#, fuzzy
+#~ msgid "Dump core on crash"
+#~ msgstr "Dump teras dalam kemalangan"
+
+#~ msgid "High Priority"
+#~ msgstr "Keutamaan Tinggi"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Menginisialisasinya Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Gunakan Intern pemilihan waktu"
+
+#, fuzzy
+#~ msgid "Log directory"
+#~ msgstr "Direktori log"
+
+#, fuzzy
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Jumlah maksimum panggilan dibenarkan"
+
+#, fuzzy
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "beban maksimum untuk berhenti menerima panggilan baru"
+
+#, fuzzy
+#~ msgid "Disable console colors"
+#~ msgstr "Matikan warna konsol"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Sound fail Direktori Cache"
+
+#, fuzzy
+#~ msgid "The Group to run as"
+#~ msgstr "Kumpulan untuk menjalankan sebagai"
+
+#, fuzzy
+#~ msgid "The User to run as"
+#~ msgstr "Pengguna untuk menjalankan sebagai"
+
+#, fuzzy
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Surat suara spool Direktori"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Awalan UniquID dengan nama sistem"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "Membangun transcode jalan melalui SLINEAR, tidak secara langsung"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Transmit SLINEAR keheningan ketika sedang merakam saluran"
+
+#, fuzzy
+#~ msgid "Verbose Level"
+#~ msgstr "Tingkat verbose"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Bahagian dial rencana"
+
+#~ msgid "include"
+#~ msgstr "memasukkan"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Ekstensi dial rencana"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Pilihan Umum Dialplan"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Membolehkan pemindahan"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Hapus variable global"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "Buka dial rencana"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Persidangan dial rencana"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Masa dial rencana"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Surat suara dial rencana"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Dial Zon untuk dial rencana"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "Prefix untuk menambah pencocokan dial rencana"
+
+#~ msgid "Match International prefix"
+#~ msgstr "Awalan Antarabangsa Match"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Awalan (0) untuk menambah / memadam ke / dari nombor antarabangsa"
+
+#~ msgid "localzone"
+#~ msgstr "zon tempatan"
+
+#~ msgid "Match plan"
+#~ msgstr "Rencana sesuai"
+
+#~ msgid "Connection to use"
+#~ msgstr "Sambungan yang digunakan"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Ciri-ciri kunci peta"
+
+#~ msgid "Attended transfer key"
+#~ msgstr "Mengikuti memindahkan kunci"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "kunci pemindahkan buta"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Kunci untuk Putus panggilan"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Kunci untuk Park panggilan"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Parkir Ciri-ciri"
+
+#~ msgid "ADSI Park"
+#~ msgstr "ADSI Park"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "Mengikuti pemindahan timeout (saat)"
+
+#~ msgid "One touch record key"
+#~ msgstr "Satu nota sentuh butang"
+
+#~ msgid "Name of call context for parking"
+#~ msgstr "Nama konteks panggilan untuk parkir"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Fail bunyi untuk memainkan ke pemanggil parkir"
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr "Maksimum masa (milidetik) antara nombor untuk pengaktifan ciri"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Kaedah untuk Menemukan slot Parkir"
+
+#~ msgid "parkedmusicclass"
+#~ msgstr "parkir muzik kelas"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Nada kebaikan yang dimainkan untuk"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Aktifkan Parkir"
+
+#~ msgid "Extension to dial to park"
+#~ msgstr "Extension untuk dial ke taman"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Parkir waktu (saat)"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "Rentang sambungan untuk parkir panggilan"
+
+#~ msgid "Pickup extension"
+#~ msgstr "Angkat sambungan"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Detik untuk menunggu antara nombor ketika memindahkan"
+
+#~ msgid "sound when attended transfer is complete"
+#~ msgstr "suara saat menghadiri pemindahan selesai"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "Suara saat menghadiri gagal transfer"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Beban kembali menatarajah peranti keras"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Kaedah Reboot"
+
+#~ msgid "Parameter"
+#~ msgstr "Parameter"
+
+#~ msgid "Option type"
+#~ msgstr "Pilihan jenis"
+
+#~ msgid "User name"
+#~ msgstr "Nama pemakai"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Pilihan Umum IAX"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Izinkan Codec"
+
+#~ msgid "Static"
+#~ msgstr "Statik"
+
+#~ msgid "Write Protect"
+#~ msgstr "Dilindungi Menulis"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Persidangan Meetme"
+
+#~ msgid "Admin PIN"
+#~ msgstr "PIN Admin"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "PIN Pertemuan"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Pilihan Umum Persidangan Meetme"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Jumlah buffer audio yang akan digunakan dalam 20 mili detik"
+
+#~ msgid "Modules"
+#~ msgstr "Modul"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Penggera Aplikasi Penerima"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Pengesahan Aplikasi"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "Membuat asterisk yakin tidak menyimpan CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Periksa sama ada saluran sedia"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Mendengar pada setiap saluran"
+
+#~ msgid "Control Playback Application"
+#~ msgstr "Kawalan Main Aplikasi"
+
+#~ msgid "Cuts up variables"
+#~ msgstr "Memotong pembolehubah"
+
+#~ msgid "Database access functions"
+#~ msgstr "fungsi untuk mengakses dasar data"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Aplikasi Panggilan"
+
+#~ msgid "Virtual Dictation Machine Application"
+#~ msgstr "Aplikasi Dikte Virtual Machine"
+
+#~ msgid "Directed Call Pickup Support"
+#~ msgstr "Sokongan Pengarah Angkatan Pangillan"
+
+#~ msgid "Extension Directory"
+#~ msgstr "Extension Direktori"
+
+#~ msgid "DISA (Direct Inward System Access) Application"
+#~ msgstr "Aplikasi DISA (Direct Inward System Access)"
+
+#~ msgid "Dump channel variables Application"
+#~ msgstr "Aplikasi membuang variable saluran"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Echo Aplikasi Mudah"
+
+#~ msgid "ENUM Lookup"
+#~ msgstr "Pencarian ENUM"
+
+#~ msgid "Reevaluates strings"
+#~ msgstr "Menilai semula string"
+
+#~ msgid "Executes applications"
+#~ msgstr "Menjalankan aplikasi"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "IVR aplikasi antara muka luaran"
+
+#~ msgid "Fork The CDR into 2 seperate entities"
+#~ msgstr "CDR garpu menjadi 2 entiti yang berasingan"
+
+#~ msgid "Get ADSI CPE ID"
+#~ msgstr "Dapatkan ADSI CPE ID"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Pengurusan Kumpulan Rutinitas"
+
+#~ msgid "Encode and Stream via icecast and ices"
+#~ msgstr "Menyandi dan Stream melalui icecast dan es"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Aplikasi Transmisi Gambar"
+
+#~ msgid "Look up Caller*ID name/number from black"
+#~ msgstr "Mencari nama / nombor Pemangil dari hitam"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr "Mencari Nama Pemangil dari database tempatan"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Makro Extension"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Sebuah Aplikasi matematik senang"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "Aplikasi MD5 checksum"
+
+#~ msgid "Digital Milliwatt (mu-law) Test Application"
+#~ msgstr "Milliwatt digital (mu-law) Aplikasi Uji"
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Merakam panggilan dan campuran audio semasa rakaman"
+
+#~ msgid "Call Parking and Announce Application"
+#~ msgstr "Panggilan Parkir dan Aplikasi Pengumuman"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Aplikasi Pemain Trivial"
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Nombor telefon diperlukan untuk dimasuk"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "Panggilan antrian benar"
+
+#~ msgid "Random goto"
+#~ msgstr "Pergi ke random"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Aplikasi Baca Variabel"
+
+#~ msgid "Read in a file"
+#~ msgstr "Baca dalam fail"
+
+#~ msgid "Realtime Data Lookup/Rewrite"
+#~ msgstr "Masa benar mencari / menulis kembali data "
+
+#~ msgid "Trivial Record Application"
+#~ msgstr "Aplikasi Trivial Rakam"
+
+#~ msgid "Say time"
+#~ msgstr "Katakan masa"
+
+#~ msgid "Send DTMF digits Application"
+#~ msgstr "Aplikasi Hantar DTMF angka"
+
+#~ msgid "Send Text Applications"
+#~ msgstr "Aplikasi Kirim Mesej"
+
+#~ msgid "Set CallerID Application"
+#~ msgstr "Aplikasi menetapkan CallerID"
+
+#~ msgid "CDR user field apps"
+#~ msgstr "Aplikasi CDR bidang pengguna"
+
+#~ msgid "load => .so ; Set CallerID Name"
+#~ msgstr "beban => .so ; Menetapkan Nama CallerID"
+
+#~ msgid "Set RDNIS Number"
+#~ msgstr "Menetapkan Nombor RDNIS"
+
+#~ msgid "Set ISDN Transfer Capability"
+#~ msgstr "Menetapkan Kemampuan Transfer ISDN"
+
+#~ msgid "SMS/PSTN handler"
+#~ msgstr "Penangan SMS/PSTN"
+
+#~ msgid "Hangs up the requested channel"
+#~ msgstr "Menutup saluran yang diminta"
+
+#~ msgid "Stack Routines"
+#~ msgstr "Rutinitas Stack"
+
+#~ msgid "Generic System() application"
+#~ msgstr "Aplikasi Generic Sistem()"
+
+#~ msgid "Playback with Talk Detection"
+#~ msgstr "Putar dengan Pengesanan Bicara"
+
+#~ msgid "Interface Test Application"
+#~ msgstr "Aplikasi Antarmuka Test"
+
+#~ msgid "Transfer"
+#~ msgstr "Transfer"
+
+#~ msgid "TXTCIDName"
+#~ msgstr "Nama TXTCID"
+
+#~ msgid "Send URL Applications"
+#~ msgstr "Aplikasi Kirim URL"
+
+#~ msgid "Custom User Event Application"
+#~ msgstr "Aplikasi Acara Pengguna Tersuai"
+
+#~ msgid "Send verbose output"
+#~ msgstr "Kirim keluaran verbose"
+
+#~ msgid "Voicemail"
+#~ msgstr "Voicemail"
+
+#~ msgid "Waits until first ring after time"
+#~ msgstr "Menunggu waktu sampai setelah deringan pertama"
+
+#~ msgid "Wait For Silence Application"
+#~ msgstr "Aplikasi Tunggu Untuk Tenang"
+
+#~ msgid "While Loops and Conditional Execution"
+#~ msgstr "Sementara Loops dan Pelaksanaan bersyarat"
+
+#~ msgid "Comma Separated Values CDR Backend"
+#~ msgstr "Hujung belakang nilai-nilai dipisahkan koma CDR"
+
+#~ msgid "Customizable Comma Separated Values CDR Backend"
+#~ msgstr "Nilai-nilai dipisahkan koma CDR hujung belakang yang disesuaikan"
+
+#~ msgid "Asterisk Call Manager CDR Backend"
+#~ msgstr "Hujung belakang asterisk panggilan pengurus CDR "
+
+#~ msgid "MySQL CDR Backend"
+#~ msgstr "Hujung belakang MySQL CDR"
+
+#~ msgid "PostgreSQL CDR Backend"
+#~ msgstr "Hujung belakang PostgreSQL CDR"
+
+#~ msgid "SQLite CDR Backend"
+#~ msgstr "Hujung belakang SQLite CDR"
+
+#~ msgid "Agent Proxy Channel"
+#~ msgstr "Agen Proksi Saluran"
+
+#~ msgid "Option chan_iax2"
+#~ msgstr "Pilihan chan_iax2"
+
+#~ msgid "Local Proxy Channel"
+#~ msgstr "Saluran Proksi Tempatan"
+
+#~ msgid "Session Initiation Protocol (SIP)"
+#~ msgstr "Session Initiation Protocol (SIP)"
+
+#~ msgid "Adaptive Differential PCM Coder/Decoder"
+#~ msgstr "Adaptif Pengkamiran PCM Coder/Decoder"
+
+#~ msgid "GSM/PCM16 (signed linear) Codec Translation"
+#~ msgstr "GSM/PCM16 (ditandatangani linier) Codec Terjemahan"
+
+#~ msgid "Speex/PCM16 (signed linear) Codec Translator"
+#~ msgstr "Speex/PCM16 (ditandatangani linier) Codec Terjemahan"
+
+#~ msgid "Sun Microsystems AU format (signed linear)"
+#~ msgstr "Sun Microsystems AU format (ditandatangani linier)"
+
+#~ msgid "Asterisk Extension Language Compiler"
+#~ msgstr "Asterisk Sambungan Bahasa Compiler"
+
+#~ msgid "Text Extension Configuration"
+#~ msgstr "Teks Sambungan Tatarajah"
+
+#~ msgid "Loopback Switch"
+#~ msgstr "Loop Beralih Kembali"
+
+#~ msgid "MySQL Config Resource"
+#~ msgstr "MySQL menatarajah sumber daya"
+
+#~ msgid "ODBC Config Resource"
+#~ msgstr "ODBC tatarajah sumber daya"
+
+#~ msgid "PGSQL Module"
+#~ msgstr "Modul PGSQL"
+
+#~ msgid "Cryptographic Digital Signatures"
+#~ msgstr "tanda tangan digital kriptografi"
+
+#~ msgid "Call Parking Resource"
+#~ msgstr "Panggilan Parkir Sumber Daya"
+
+#~ msgid "Indications Configuration"
+#~ msgstr "Penunjuk Konfigurasi"
+
+#~ msgid "Call Monitoring Resource"
+#~ msgstr "panggilan pemantauan sumber daya"
+
+#~ msgid "Music On Hold Resource"
+#~ msgstr "Muzik Pada Sumber Daya Tahan"
+
+#~ msgid "ODBC Resource"
+#~ msgstr "Sumber ODBC"
+
+#~ msgid "SMDI Module"
+#~ msgstr "Modul SMDI"
+
+#~ msgid "SNMP Module"
+#~ msgstr "Modul SNMP"
+
+#~ msgid "Music On Hold"
+#~ msgstr "Muzik Di Tahan"
+
+#~ msgid "Application"
+#~ msgstr "Aplikasi"
+
+#~ msgid "Directory of Music"
+#~ msgstr "Direktori Muzik"
+
+#~ msgid "Option mode"
+#~ msgstr "Pilihan mod"
+
+#~ msgid "Random Play"
+#~ msgstr "Bermain Rawak"
+
+#~ msgid "DTMF mode"
+#~ msgstr "Mode DTMF"
+
+#~ msgid "Primary domain identity for From: headers"
+#~ msgstr "Domain utama identiti untuk Dari: header"
+
+#~ msgid "From user (required by many SIP providers)"
+#~ msgstr "Dari pengguna (diperlukan oleh banyak pembekal SIP)"
+
+#~ msgid "Ring on incoming dialplan contexts"
+#~ msgstr "Dering pada konteks rancangan panggilan masuk"
+
+#~ msgid "Allow Insecure for"
+#~ msgstr "Biarkan tidak selamat untuk"
+
+#~ msgid "Mailbox for MWI"
+#~ msgstr "Peti mel untuk MWI"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "NAT antara telefon dan asterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "Menyemak tag di header"
+
+#~ msgid "Reply Timeout (ms) for down connection"
+#~ msgstr "Balas Masa tamat (ms) untuk sambungan ke bawah"
+
+#~ msgid "Register connection"
+#~ msgstr "Register sambungan"
+
+#~ msgid "Dial own extension for mailbox"
+#~ msgstr "Dial perpanjangan sendiri untuk peti mel"
+
+#~ msgid "Client Type"
+#~ msgstr "Pelanggan Jenis"
+
+#~ msgid "Section sipgeneral"
+#~ msgstr "Bahagian sipgeneral"
+
+#~ msgid "Allow codecs"
+#~ msgstr "Membenarkan codec"
+
+#~ msgid "SIP realm"
+#~ msgstr "Dunia SIP"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "Pilihan umum Voicemail"
+
+#~ msgid "From Email address of server"
+#~ msgstr "Dari alamat email server"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "Kotak mail suara"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "Email mengandungi lampiran"
+
+#~ msgid "Display Name"
+#~ msgstr "Nama Paparan"
+
+#~ msgid "Password"
+#~ msgstr "Kata laluan"
+
+#~ msgid "zone"
+#~ msgstr "daerah"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Tetapan Zon Suara"
+
+#~ msgid "Message Format"
+#~ msgstr "Format Mesej"
diff --git a/trunk/package/luci/po/ms/base.po b/trunk/package/luci/po/ms/base.po
new file mode 100644
index 00000000..22ce8e2c
--- /dev/null
+++ b/trunk/package/luci/po/ms/base.po
@@ -0,0 +1,3719 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-07 17:57+1000\n"
+"PO-Revision-Date: 2010-05-07 17:57+1000\n"
+"Last-Translator: Wai Chet Teow <waichet@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr ""
+
+msgid "(%s available)"
+msgstr "(%s sedia)"
+
+msgid "(empty)"
+msgstr ""
+
+msgid "(no interfaces attached)"
+msgstr "(tiada interface dipasang)"
+
+msgid "-- Additional Field --"
+msgstr "-- Gelanggang Tambahan --"
+
+msgid "-- Please choose --"
+msgstr "-- Sila pilih --"
+
+msgid "-- custom --"
+msgstr "-- memperibadi --"
+
+msgid "1 Minute Load:"
+msgstr ""
+
+msgid "15 Minute Load:"
+msgstr ""
+
+msgid "5 Minute Load:"
+msgstr ""
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"<abbr title=\"perkhidmatan set mengenalpasti diperpanjangkan\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "IPv4-Alamat"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "IPv4-Pintu gerbang"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "IPv4-Netmask"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr "IPv6 Host-Alamat atau Rangkaian (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "IPv6-Pintu gerbang"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Konfigurasi lampu LED"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr ""
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "MAC-Alamat"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+
+msgid "AR Support"
+msgstr "AR-Penyokong"
+
+msgid "ARP retry threshold"
+msgstr ""
+
+msgid "ATM Bridges"
+msgstr ""
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr ""
+
+msgid "Access Concentrator"
+msgstr ""
+
+msgid "Access Point"
+msgstr "Pusat akses"
+
+msgid "Action"
+msgstr "Aksi"
+
+msgid "Actions"
+msgstr "Aksi"
+
+msgid "Activate this network"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Aktive IPv4-Routen"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Aktif IPv6-Laluan"
+
+msgid "Active Connections"
+msgstr "Sambungan Aktif"
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Tambah"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr ""
+
+msgid "Additional Hosts files"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr "Pentadbiran"
+
+msgid "Advanced Settings"
+msgstr "Tetapan Lanjutan"
+
+msgid "Alert"
+msgstr ""
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "Membenarkan pengesahan kata laluan SSH"
+
+msgid "Allow all except listed"
+msgstr "Izinkan semua kecualian yang disenaraikan"
+
+msgid "Allow listed only"
+msgstr "Izinkan senarai saja"
+
+msgid "Allow localhost"
+msgstr ""
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antena 1"
+
+msgid "Antenna 2"
+msgstr "Antena 2"
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr ""
+
+msgid "Apply"
+msgstr "Melaksanakan"
+
+msgid "Applying changes"
+msgstr "Melaksanakan perubahan"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Associated Stesen"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr "Authentifizierung"
+
+msgid "Authoritative"
+msgstr "Pengesahan"
+
+msgid "Authorization Required"
+msgstr "Otorisasi Diperlukan"
+
+msgid "Auto Refresh"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Boleh didapati"
+
+msgid "Available packages"
+msgstr ""
+
+msgid "Average:"
+msgstr ""
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to Overview"
+msgstr ""
+
+msgid "Back to configuration"
+msgstr ""
+
+msgid "Back to overview"
+msgstr "Kembali ke ikhtisar"
+
+msgid "Back to scan results"
+msgstr "Kembali ke keputusan scan"
+
+msgid "Background Scan"
+msgstr "Latar Belakang Scan"
+
+msgid "Backup / Flash Firmware"
+msgstr ""
+
+msgid "Backup / Restore"
+msgstr "Sandaran / Mengembalikan"
+
+msgid "Backup file list"
+msgstr ""
+
+msgid "Bad address specified!"
+msgstr ""
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr "Bridge"
+
+msgid "Bridge interfaces"
+msgstr "Antara Muka Bridge"
+
+msgid "Bridge unit number"
+msgstr ""
+
+msgid "Bring up on boot"
+msgstr ""
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr "Butang"
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr "Penggunaan CPU (%)"
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr "Batal"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Rantai"
+
+msgid "Changes"
+msgstr "Laman"
+
+msgid "Changes applied."
+msgstr "Laman diterapkan."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+
+msgid "Channel"
+msgstr "Saluran"
+
+msgid "Check"
+msgstr ""
+
+msgid "Checksum"
+msgstr "Jumlah disemak "
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr "Pilih zon firewall yang anda ingin tetapkan untuk antar muka ini."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+#, fuzzy
+msgid "Client"
+msgstr "Pelanggan"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr "Perintah"
+
+msgid "Common Configuration"
+msgstr ""
+
+msgid "Compression"
+msgstr "Mampatan"
+
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+msgid "Configuration applied."
+msgstr ""
+
+msgid "Configuration files will be kept."
+msgstr ""
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr "Pengesahan"
+
+msgid "Connect"
+msgstr ""
+
+msgid "Connected"
+msgstr ""
+
+msgid "Connection Limit"
+msgstr "Sambungan Batas"
+
+msgid "Connections"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Country Code"
+msgstr "Kod negara"
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr "Buat / Menetapkan dinding api-zon"
+
+msgid "Create Interface"
+msgstr ""
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr "Mengkustomisasi perilaku peranti LED jika mungkin."
+
+msgid "DHCP Leases"
+msgstr ""
+
+msgid "DHCP Server"
+msgstr ""
+
+msgid "DHCP and DNS"
+msgstr ""
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr "DHCP-Pilihan"
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr ""
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr "Padam"
+
+msgid "Delete this interface"
+msgstr ""
+
+msgid "Delete this network"
+msgstr ""
+
+msgid "Description"
+msgstr "Keterangan"
+
+msgid "Design"
+msgstr "Disain"
+
+msgid "Destination"
+msgstr "Tempat tujuan"
+
+msgid "Device"
+msgstr "Alat"
+
+msgid "Device Configuration"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr "Mematikan pemasa HW-Beacon"
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr "Jarak Optimasi"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Jarak ke rangkaian terjauh ahli dalam meter."
+
+msgid "Diversity"
+msgstr "Keanekaragaman"
+
+# Nur für NAT-Firewalls?
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq adalah gabungan <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Pelayan dan<abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder untuk <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewall"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr "Jangan menghantar jawapan penyelidikan"
+
+msgid "Domain required"
+msgstr "Domain diperlukan"
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr "Jangan hantar permintaan DNS tanpa nama DNS"
+
+msgid "Download and install package"
+msgstr "Turun dan memasang pakej"
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear menawarkan SSH kulit rangkaian aksesdan pelayan yang terintegrasi."
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr "Dinamik DHCP"
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr "EAP-Kaedah"
+
+msgid "Edit"
+msgstr "Sunting"
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Mengaktifkan <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Aktifkan spanning Tree Protokol di jambatan ini"
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr "Enkripsi"
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr "Kesalahan"
+
+msgid "Ethernet Adapter"
+msgstr "Ethernet Adapter"
+
+msgid "Ethernet Switch"
+msgstr "Ethernet Beralih"
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr "Frame Cepat"
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr "Fail Sistem"
+
+msgid "Filter"
+msgstr "Penapis"
+
+msgid "Filter private"
+msgstr "Penapis swasta"
+
+msgid "Filter useless"
+msgstr "Penapis tak berguna"
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr "Cari pakej"
+
+msgid "Finish"
+msgstr "Selesai"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Tetapan Firewall"
+
+msgid "Firewall Status"
+msgstr "Status Firewall"
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr "Parameter"
+
+msgid "Flash Firmware"
+msgstr "Firmware Flash"
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr "Paksa"
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr "Fragmentasi Ambang"
+
+msgid "Frame Bursting"
+msgstr "Bingkai Meletup"
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr "Melompat Frekuensi"
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr "Setup Umum"
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr "Menuju ke halaman konfigurasi yang relevan"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Kawalan"
+
+msgid "Hang Up"
+msgstr "Menutup"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Di sini anda boleh mengkonfigurasi aspek asas peranti anda seperti nama host "
+"atau zon."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Menyembunyikan ESSID"
+
+msgid "Host entries"
+msgstr "Entri host"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "IP host atau rangkaian"
+
+msgid "Hostname"
+msgstr "Nama Host"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr "Nama Host"
+
+msgid "IP address"
+msgstr "Alamat IP"
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr "Konfigurasi IPv6"
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr "Identiti"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Jika memori fizikal anda tidak cukup data yang boleh digunakan sementara "
+"menukar ke peranti-penukar yang dihasilkan dalam jumlah RAM berguna yang "
+"lebih tinggi. Berhati-hatilah bahawa penukaran data adalah proses yang "
+"sangat lambat kerana peranti-penukar tidak boleh diakses dengan datarates "
+"yang tinggi pada RAM."
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr "Abaikan antara muka"
+
+msgid "Ignore resolve file"
+msgstr "Abaikan fail yang selesai"
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr "Masuk"
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr ""
+
+msgid "Initscripts"
+msgstr ""
+
+msgid "Install"
+msgstr "Memasang"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interface"
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr "Tak Sah"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Username dan / atau password tak sah! Sila cuba lagi."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Tampak bahawa anda cuba untuk flash fail gambar yang tidak sesuai dengan "
+"memori flash, sila buat pengesahan pada fail gambar!"
+
+msgid "Java Script required!"
+msgstr ""
+
+#, fuzzy
+msgid "Join Network"
+msgstr "Gabung Rangkaian"
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr "Log Kernel"
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr "Kunci"
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr "Tamatkan"
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr "Bahasa"
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr "Sewa fail"
+
+msgid "Leasetime"
+msgstr "Masa penyewaan"
+
+msgid "Leasetime remaining"
+msgstr "Sisa masa penyewaan"
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr "Batas"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Link Pada"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr "Load"
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr "Masa Tempatan"
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr "Soalan tempatan"
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr "Log soalan"
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr "Penapis alamat MAC"
+
+msgid "MAC-Filter"
+msgstr "Penapis MAC"
+
+msgid "MAC-List"
+msgstr "Senarai MAC"
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr "Rate Maksimum"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+#, fuzzy
+msgid "Maximum hold time"
+msgstr "Memegang masa maksimum"
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr "Memori"
+
+msgid "Memory usage (%)"
+msgstr "Penggunaan Memori (%)"
+
+msgid "Metric"
+msgstr "Metrik"
+
+msgid "Minimum Rate"
+msgstr "Rate Minimum"
+
+#, fuzzy
+msgid "Minimum hold time"
+msgstr "Memegang masa minimum"
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr "Mode"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Alat modem"
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr "Mount Point"
+
+msgid "Mount Points"
+msgstr "Mount Points"
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Mount Points menentukan di mana titik peranti memori akan melekat pada fail "
+"sistem"
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr "Mounted fail sistems"
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr "Multicast Rate"
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr "Nama"
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr "Nama rangkaian baru"
+
+msgid "Navigation"
+msgstr "Navigation"
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr "Rangkaian"
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr "Kemudian »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr "Tiada rantai dalam jadual ini"
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr "Tidak ada peraturan dalam rantai ini"
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr "Kebisingan"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr "Baik"
+
+msgid "OPKG-Configuration"
+msgstr "OPKG-Konfigurasi"
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Pada halaman ini anda boleh mengkonfigurasi antara muka rangkaian. Anda "
+"boleh menjembatani beberapa antara muka dengan menanda jambatan antara muka "
+"gelanggang dan masukkan beberapa nama antara muka rangkaian dipisahkan "
+"dengan ruang. Anda juga boleh menggunakan antara muka VLAN notasi. Seperti "
+"eth0.1."
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr "Pilihan"
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr "Keluar"
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr "Saluran Outdoor"
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Keseluruhan"
+
+msgid "Owner"
+msgstr "Pemilik"
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr "Pengkapsulan PPPoA"
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr "Nama pakej"
+
+msgid "Packets"
+msgstr "Paket"
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr "Kata laluan"
+
+msgid "Password authentication"
+msgstr "Kata laluan pengesahan"
+
+msgid "Password of Private Key"
+msgstr "Kata Laluan Kunci Swasta"
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr "Path ke CA-Sijil"
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr "Path ke Kunci Swasta"
+
+msgid "Path to executable which handles the button event"
+msgstr "Path ke eksekusi yang mengendalikan acara butang"
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr "Lakukan reboot"
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr "Tetapan Fizikal"
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr "Pkts."
+
+msgid "Please enter your username and password."
+msgstr "Sila masukkan username dan kata laluan anda."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Sila tunggu: Peranti sedang reboot..."
+
+msgid "Policy"
+msgstr "Dasar"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr "Mencegah komunikasi sesama Pelanggan"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr "Teruskan"
+
+msgid "Processes"
+msgstr "Proses"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS-Ambang"
+
+# Ein / Aus, eingehend / ausgehend?
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr "Baca /etc/ethers untuk mengkonfigurasikan DHCP-Server"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr "Reboot"
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr "Reboot sistem operasi peranti anda"
+
+msgid "Receive"
+msgstr "Menerima"
+
+msgid "Receiver Antenna"
+msgstr "Antena Penerima"
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr "Rujukan"
+
+msgid "Regulatory Domain"
+msgstr "Peraturan Domain"
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr "Menghapuskan"
+
+msgid "Repeat scan"
+msgstr "Ulangi scan"
+
+msgid "Replace entry"
+msgstr "Tukar entri"
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Reset Counters"
+msgstr "Reset Loket"
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr "Restart Firewall"
+
+msgid "Restore backup"
+msgstr "Kembalikan sandaran"
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr "Kembali"
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr "Laluan"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Laluan menentukan di mana interface dan gateway host atau rangkaian tertentu "
+"yang boleh dicapai."
+
+msgid "Rule #"
+msgstr "Peraturan #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Simpan"
+
+msgid "Save & Apply"
+msgstr "Simpan & Melaksanakan"
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr "Scan"
+
+msgid "Scheduled Tasks"
+msgstr "Tugas Jadual"
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr "Rujuk \"mount\" laman manual untuk detail"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr "Pisahkan Pelanggan"
+
+msgid "Separate WDS"
+msgstr "Pisahkan WDS"
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr "Perkhidmatan"
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr "Isyarat"
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr "Saiz"
+
+msgid "Skip"
+msgstr "Skip"
+
+msgid "Skip to content"
+msgstr "Skip ke kadar"
+
+msgid "Skip to navigation"
+msgstr "Skip ke navigation"
+
+msgid "Slot time"
+msgstr "Slot masa"
+
+msgid "Software"
+msgstr "Perisian"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr "Sumber"
+
+#, fuzzy
+msgid "Specifies the button state to handle"
+msgstr "Menentukan state butang untuk melaku"
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr "Mula"
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr "Laluan IPv4 Statik"
+
+msgid "Static IPv6 Routes"
+msgstr "Laluan IPv6 Statik"
+
+msgid "Static Leases"
+msgstr "Statische Einträge"
+
+msgid "Static Routes"
+msgstr "Laluan Statik"
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr "Order Ketat"
+
+msgid "Submit"
+msgstr "Menyerahkan"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr "Beralih"
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr "Sistem"
+
+msgid "System Log"
+msgstr "Log Sistem"
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+# same as RX
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr "Meja"
+
+msgid "Target"
+msgstr "Sasaran"
+
+msgid "Terminate"
+msgstr "Menamatkan"
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Karakter yang diizinkan adalah: <code>A-Z</code>, <code>a-z</code>, "
+"<code>0-9</code> dan <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr "Fail peranti memori atau partisyen, (contohnya: /dev/sda)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr "Failsistem yang digunakan untuk memformat memori (contohnya: ext3)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Fail gambar flash telah di-upload. Berikut ini adalah checksum dan saiz fail "
+"yang berdaftar, membandingkannya dengan fail gambar asli untuk memastikan "
+"integriti data.<br /> Klik butang terus di bawah untuk memulakan prosedur "
+"flash."
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr "Laman berikut telah kembali"
+
+msgid "The following rules are currently active on this system."
+msgstr "Peraturan berikut sedang aktif pada sistem ini."
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Sistem ini sekarang mula flash.<br /> JANGAN TUTUP KUASA UNTUK PERANTI!<br /"
+"> Tunggu beberapa minit sehingga anda cuba untuk menyambung kembali. Mungkin "
+"anda perlu mengemas kini alamat komputer anda untuk mencapai peranti lagi, "
+"bergantung pada tetapan anda."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Format Fail gambar yang diupload tidak disokongkan. Pastikan anda memilih "
+"fail format gambar yang generik untuk platform anda."
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr "Ini adalah DHCP hanya dalam rangkaian tempatan."
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Ini adalah crontab sistem di mana tugas-tugas yang dijadualkan boleh "
+"ditakrifkan."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Senarai ini memberikan gambaran lebih pada proses sistem yang sedang "
+"berjalan dan statusnya."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "Laman ini membolehkan konfigurasi butang tindakan peribadi"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Laman ini memberikan gambaran lebih dari saat ini sambungan rangkaian yang "
+"aktif."
+
+msgid "This section contains no values yet"
+msgstr "Bahagian ini belum mengandungi nilai-nilai lagi"
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr "Zon masa"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr "Lalu lintas"
+
+msgid "Transfer"
+msgstr "Pemindahan"
+
+msgid "Transmission Rate"
+msgstr "Kelajuan Penghantaran"
+
+msgid "Transmit"
+msgstr "Pancar"
+
+msgid "Transmit Power"
+msgstr "Daya Pancar"
+
+msgid "Transmitter Antenna"
+msgstr "Antena Pemancar"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Mod Turbo"
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr "Jenis"
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr "Perubahan yang belum disimpan"
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr "Uploaded Fail"
+
+msgid "Uptime"
+msgstr "Masa Aktif"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Guna /etc/ethers"
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr "Diguna"
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr "Username"
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr "Versi"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr "WMM Mod"
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA-Enkripsi memerlukan pemohan wpa (untuk mod pelanggan) atau hostapd "
+"(untuk AP dan mod ad-hoc) yang akan dipasangkan."
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "Amaran: Ada perubahan yang belum disimpan akan hilang saat reboot!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr "Adapter Wayarles"
+
+msgid "Wireless Network"
+msgstr "Rangkaian Wayarles"
+
+msgid "Wireless Overview"
+msgstr "Gambaran keseluruhan Wayarles"
+
+msgid "Wireless Security"
+msgstr "Keselamatan WLAN"
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr "Sokongan XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr "auto"
+
+msgid "automatic"
+msgstr "automatik"
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "mencipta jambatan di antara muka tertentu"
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr "mematikan"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr "fail dimana DHCP-sewa akan disimpan"
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr "Membantu"
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "jika target itu ialah rangkaian"
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "Fail DNS tempatan"
+
+msgid "no"
+msgstr ""
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr "tidak ada"
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr ""
+
+msgid "unspecified"
+msgstr ""
+
+msgid "unspecified -or- create:"
+msgstr "Tidak dirinci -atau- buat:"
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "« Back"
+msgstr "« Kembali"
+
+#~ msgid "Active Leases"
+#~ msgstr "Penyewaan Aktif"
+
+#~ msgid "MAC"
+#~ msgstr "Alamat MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Disulitkan\">Vers.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "WLAN-Scan"
+
+#~ msgid "Create Network"
+#~ msgstr "Buat Jaringan"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Networks"
+#~ msgstr "Rangkaian"
+
+#~ msgid "Power"
+#~ msgstr "Daya"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Rangkaian wifi di lingkungan tempatan"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr "CIDR-Notation: Adresse/Prefix"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "DNS-Server"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "IPv4-Siaran"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "IPv6-Alamat"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Setup IPv6"
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Rangkaian port pada router anda boleh digabungkan untuk beberapa VLAN di "
+#~ "mana komputer dapat berkomunikasi secara langsung dengan satu sama lain. "
+#~ "VLAN sering digunakan untuk memisahkan segmen rangkaian yang berbeza. "
+#~ "Seringkali ada secara default satu port Uplink untuk sambungan kepada "
+#~ "rangkaian yang lebih besar seterusnya seperti internet dan port lain "
+#~ "untuk rangkaian tempatan."
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Fail yang akan disimpan saat flash firmware baru"
+
+#~ msgid "General"
+#~ msgstr "Umum"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr "Di sini anda boleh melaraskan tetapan dan fungsi Luci"
+
+#~ msgid "Post-commit actions"
+#~ msgstr "UCI-komit tindakan"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Perintah-perintah ini akan dijalankan secara automatik apabila tatarajah "
+#~ "UCI diberikan komited membolehkan perubahan yang akan diterapkan langsung."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Antarmuka pengguna Web"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Pusat akses (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Pilihan Tambahan Pppd"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Pemutusan automatik"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Arkib Sandaran"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Mengkonfigurasi pelayan DNS tempatan untuk menggunakan pelayan nama "
+#~ "diiklan oleh rakan PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Menyambung script"
+
+#~ msgid "Create backup"
+#~ msgstr "Buat Sandaran"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Putuskan naskah"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Edit senarai pakej dan target pemasangan"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Aktifkan IPv6 di PPP link"
+
+#~ msgid "Firmware image"
+#~ msgstr "Gambar Firmware"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Di sini anda boleh sandaran dan mengembalikan konfigurasi router dan - "
+#~ "jika mungkin - Reset router ke tetapan lalai."
+
+#~ msgid "Installation targets"
+#~ msgstr "Target pemasangan"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Simpan fail konfigurasi"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Biarkan pppd menggantikan laluan asal saat ini untuk menggunakan "
+#~ "antaramuka PPP selepas berjaya menyambung"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "Biarkan pppd menjalankan naskah ini setelah menetapkan link PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Biarkan pppd menjalankan naskah ini sebelum menghancurkan link PPP"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Pastikan bahawa anda mempunyai kod pin yang sah. Kalau tidak anda mungkin "
+#~ "akan terkunci kad sim anda!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "Kebanyakan dari mereka adalah pelayan rangkaian, yang menawarkan "
+#~ "perkhidmatan tertentu untuk peranti anda atau rangkaian seperti akses "
+#~ "shell, melayani laman web seperti LuCI, melakukan mesh routing, "
+#~ "menghantar e-mel, dan lain-lain"
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Jumlah ujian sambungan gagal sebelum memulakan semula sambungan automatik"
+
+#~ msgid "PIN code"
+#~ msgstr "PIN-Code"
+
+#~ msgid "PPP Settings"
+#~ msgstr "Tetapan PPP"
+
+#~ msgid "Package lists"
+#~ msgstr "Senarai pakej"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Teruskan mengembalikan semua tatacara dan ulang ke firmware asal?"
+
+#~ msgid "Processor"
+#~ msgstr "Processor"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radius-Port"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radius-Server"
+
+#~ msgid "Replace default route"
+#~ msgstr "Tukar laluan asal"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Reset router ke tetapan lalai"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Detik untuk menunggu modem bersedia sebelum mencuba untuk menyambung"
+
+#~ msgid "Service type"
+#~ msgstr "Jenis Perkhidmatan"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr ""
+#~ "Perkhidmatan dan daemon melakukan tugas tertentu dalam peranti anda."
+
+#~ msgid "Settings"
+#~ msgstr "Tetapan"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Menetapkan masa menunggu"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Maafkan. libreCMC tidak menyokong meningkatkan sistem pada peron ini. <br /"
+#~ ">Anda perlu flash peranti anda secara manual."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Tentukan arahan tambahan untuk pppd di sini"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Node peranti modem anda, contohnya /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr ""
+#~ "Waktu (dalam detik) selepas mana sambungan yang tidak terpakai akan "
+#~ "ditutup"
+
+#~ msgid "Update package lists"
+#~ msgstr "Mengemas kini senarai pakej"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Upload fail gambar libreCMC untuk flash semula peranti."
+
+#~ msgid "Upload image"
+#~ msgstr "Upload fail gambar"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Guna rakan DNS"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Anda perlu memasang \"comgt\" untuk UMTS/GPRS, \"ppp-mod-pppoe\" untuk "
+#~ "PPPoE, \"ppp-mod-pppoa\" untuk PPPoA atau \"pptp\" untuk sokongan PPtP"
+
+#~ msgid "back"
+#~ msgstr "kembali"
+
+#~ msgid "buffered"
+#~ msgstr "buffer"
+
+#~ msgid "cached"
+#~ msgstr "cache"
+
+#~ msgid "free"
+#~ msgstr "Membebaskan"
+
+#~ msgid "static"
+#~ msgstr "statik"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "Luci adalah kumpulan perisian bebas Lua termasuk MVC-Kerangka dan muka "
+#~ "web untuk peranti embedded. LuCI di lesen Lesen Apache."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "SSH-Kunci"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Sebuah webserver HTTP/1.1 ringan ditulis dalam C dan Lua direka untuk "
+#~ "melayani Luci"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Sebuah webserver kecil yang boleh digunakan untuk melayani muka "
+#~ "Konfigurasi Lua LuCI"
+
+#~ msgid "About"
+#~ msgstr "Tentang"
+
+#~ msgid "Addresses"
+#~ msgstr "Alamat"
+
+#~ msgid "Admin Password"
+#~ msgstr "Kata Laluan Admin"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Anmeldeaufforderung"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Bridge Port"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr "Mengubah kata laluan sistem pentadbir (User \"root\")"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Pelanggan + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "fail konfigurasi"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Sambungan timeout"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Menyumbang Pengembang"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP ditugaskan"
+
+#~ msgid "Document root"
+#~ msgstr "Dokumen root"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Aktifkan Keep-Alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Jambatan Ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr "Di sini anda boleh memasukkan kunci awam SSH untuk pengesahan."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Konfigurasi IP"
+
+#~ msgid "Interface Status"
+#~ msgstr "Status Interface"
+
+#~ msgid "Lead Development"
+#~ msgstr "Pemimpin Pengembangan"
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Master + WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "Belum dikonfigurasikan"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Kata laluan berjaya ditukar"
+
+#~ msgid "Plugin path"
+#~ msgstr "Tunjuk locasi Plugin"
+
+#~ msgid "Ports"
+#~ msgstr "Ports"
+
+#~ msgid "Primary"
+#~ msgstr "Primary"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Tapak Web Projek"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo-Ad-Hoc (Atheros)"
+
+#~ msgid "STP"
+#~ msgstr "Spanning-Tree-Protokol"
+
+#~ msgid "Thanks To"
+#~ msgstr "Terima Kasih kepada"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "Wilayah yang akan dipaparkan di pengesahan prompt untuk laman yang "
+#~ "dilindungi."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Kesalahan tidak diketahui"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "defaultnya <code>/etc/httpd.conf</code>"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG kod kesalahan %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Senarai pakej dikemaskini"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Mengemas kini pakej dipasang"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "kernel atau perkhidmatan logfiles yang juga dapat dilihat di sini untuk "
+#~ "mendapatkan gambaran atassituasi kini."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Di sini anda dapat mencari maklumat tentang sistem saat ini status "
+#~ "seperti frekuensi masa CPU, penggunaan memori atau antara muka rangkaian "
+#~ "data."
+
+#~ msgid "Search file..."
+#~ msgstr "Cari fail ..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "LuCI adalah percuma, fleksibel, dan mempunyai muka pengguna grafik yang "
+#~ "ramah untuk mengkonfigurasikan libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "Nikmati router anda!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Kami ingin selalu memperbaiki interface ini, kita berharap memperolehi "
+#~ "tanggapan dan cadangan anda"
+
+#~ msgid "Hello!"
+#~ msgstr "Halo!"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Perhatikan: Pada perubahan Luci harus disahkan dengan mengklik Laman - "
+#~ "Simpan &amp; terap sebelum perubahan diterapkan"
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Pada halaman berikut, anda boleh menetapkan semua tatacara penting dari "
+#~ "router anda."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "Pasukan LuCI"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr "Ini adalah wilayah pentadbiran LuCI."
+
+#~ msgid "User Interface"
+#~ msgstr "Antara muka pengguna"
+
+#~ msgid "enable"
+#~ msgstr "membolehkan"
+
+#~ msgid "(hidden)"
+#~ msgstr "(tersembunyi)"
+
+#~ msgid "(optional)"
+#~ msgstr "(pilihan)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "DNS-Port"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "DNS-Pelayan akan dipertanyakan pada urutan menyelesaikan jumlah fail"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr "maksimum DHCP untuk disewa"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "maksimum <abbr title=\"Mekanisme perpanjangan untuk DNS\">EDNS.0</abbr> "
+#~ "saiz paket"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "AP-Isolasi"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Tambah rangkaian Wifi ke rangkaian fizikal"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliases"
+
+#~ msgid "Attach to existing network"
+#~ msgstr "Lampir rangkaian yang ada"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Saiz Klip Segmen"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Buat Atau Lampir Rangkaian"
+
+#~ msgid "DHCP"
+#~ msgstr "DHCP"
+
+#~ msgid "Devices"
+#~ msgstr "Alat"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Jangan hantar reverse lookup untuk rangkaian tempatan"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Aktifkan Tftp Server"
+
+#~ msgid "Errors"
+#~ msgstr "Kesalahan"
+
+#~ msgid "Essentials"
+#~ msgstr "Keperluan"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Memperluaskan Host"
+
+#~ msgid "First leased address"
+#~ msgstr "Alamat sewaan pertama"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Perbaikan masalah hubungan dengan laman web, menghantar bentuk atau "
+#~ "lainnya perilaku ISP yang tak terduga."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Alamat Peranti"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Di sini anda boleh mengkonfigurasi peranti wifi dipasang."
+
+#~ msgid ""
+#~ "If the interface is attached to an existing network it will be "
+#~ "<em>bridged</em> to the existing interfaces and is covered by the "
+#~ "firewall zone of the choosen network.<br />Uncheck the attach option to "
+#~ "define a new standalone network for this interface."
+#~ msgstr ""
+#~ "Jika antara muka dipasang ke rangkaian yang ada akan dijembatani kepada "
+#~ "antara muka yang ada dan ditutupi oleh zon firewall dari rangkaian yang "
+#~ "dipilih. Hapus tanda pada pilihan untuk menentukan melampirkan rangkaian "
+#~ "mandiri baru untuk antara muka ini."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Mengabaikan /etc/hosts"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "(Ad-Hoc) Tersendiri"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Sambungan Internet"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Gabung dengan (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Penyewaan"
+
+#~ msgid "Local Domain"
+#~ msgstr "Domain Tempatan"
+
+#~ msgid "Local Network"
+#~ msgstr "Rangkaian Tempatan"
+
+#~ msgid "Local Server"
+#~ msgstr "Server Tempatan"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Boot fail gambar rangkaian"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr "Nama Rangkaian (ESSID)"
+
+#~ msgid "Network to attach interface to"
+#~ msgstr "Rangkaian untuk melampirkan antara muka ke"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Jumlah alamat disewakan"
+
+#~ msgid "Path"
+#~ msgstr "Path"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Lakukan Tindakan"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Mencegah komunikasi sesama Pelanggan"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Menyediakan (Access Point)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Resolvfail"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "TFTP-Server Root"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Laman berikut telah dilaksanakan"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Ketika flash firmware baru dengan LuCI semua fail akan ditambah ketika "
+#~ "pemasangan firmware baru."
+
+#~ msgid "Wireless Scan"
+#~ msgstr "WLAN-Scan"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Dengan rangkaian <abbr title=\"Dynamic Host Configuration Protocol"
+#~ "\">DHCP</abbr> ahli boleh menerima tetapan rangkaian Alamat-<abbr title="
+#~ "\"Internet Protocol\">IP</abbr>, Awalan, Pelayan-<abbr title=\"Domain "
+#~ "Name System\">DNS</abbr>, dan lain-lain secara automatik"
+
+#~ msgid ""
+#~ "You are about to join the wireless network <em><strong>%s</strong></em>. "
+#~ "In order to complete the process, you need to provide some additional "
+#~ "details."
+#~ msgstr ""
+#~ "Anda akan menyertai rangkaian wayarles <em><strong>%s</strong></em>.Untuk "
+#~ "melengkapkan proses, anda perlu memberi beberapa butiran tambahan."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Anda boleh menjalankan beberapa rangkaian wifi dengan satu peranti. Perlu "
+#~ "diketahui bahawa ada peranti keras tertentu dan sekatan driverspecific. "
+#~ "Biasanya anda boleh beroperasi 1 Ad-Hoc atau sampai dengan 3 Master-Mode "
+#~ "dan 1 Client-Mode rangkaian secara serentak."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Anda perlu memasang \"ppp-mod-pppoe\" untuk PPPoE atau \"pptp\" untuk "
+#~ "sokongan PPtP"
+
+#~ msgid ""
+#~ "You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
+#~ msgstr ""
+#~ "Anda perlu memasang <a href='%s'><em>pemohan-wpa</em></a> untuk "
+#~ "menggunakan WPA!"
+
+#~ msgid ""
+#~ "You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> "
+#~ "to use WPA!"
+#~ msgstr ""
+#~ "Anda perlu memasang pemohan <a href='%s'>Broadcom <em>nas</em> untuk "
+#~ "menggunakan WPA!"
+
+#~ msgid "Zone"
+#~ msgstr "Zon"
+
+#~ msgid "additional hostfile"
+#~ msgstr "tambahan hostfail"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "Menambah nama domain ke hostentries di resolv fail"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "menyambung semula secara automatik"
+
+#~ msgid "concurrent queries"
+#~ msgstr "konkuren query"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr "mematikan DHCP untuk antara muka ini"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "menamatkan sambungan apabila diam selama"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "jangan cache yang tidak diketahui"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr "menapis soalan-DNS yang tidak berguna untuk Windows-sistem"
+
+#~ msgid "installed"
+#~ msgstr "dipasang"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "Menempatkan nama host yang bergantung pada subnetnya"
+
+#~ msgid "manual"
+#~ msgstr "manual"
+
+#~ msgid "not installed"
+#~ msgstr "tidak dipasang"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr "mencegah caching untuk balasan negatif dari DNS"
+
+#~ msgid "query port"
+#~ msgstr "penyoalan port"
+
+#~ msgid "transmitted / received"
+#~ msgstr "dihantar / diterima"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "Gabung rangkaian"
+
+#~ msgid "all"
+#~ msgstr "semua"
+
+#~ msgid "Code"
+#~ msgstr "Kod"
+
+#~ msgid "Distance"
+#~ msgstr "Jarak"
+
+#~ msgid "Legend"
+#~ msgstr "Legenda"
+
+#~ msgid "Library"
+#~ msgstr "Perpustakaan"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "Rujuk &#39;%s&#39; manpage"
+
+#~ msgid "Package Manager"
+#~ msgstr "Pengurus-Paket"
+
+#~ msgid "Service"
+#~ msgstr "Servis"
+
+#~ msgid "Statistics"
+#~ msgstr "Statistik"
+
+#~ msgid "zone"
+#~ msgstr "Zon"
diff --git a/trunk/package/luci/po/ms/commands.po b/trunk/package/luci/po/ms/commands.po
new file mode 100644
index 00000000..6fbb9834
--- /dev/null
+++ b/trunk/package/luci/po/ms/commands.po
@@ -0,0 +1,90 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/coovachilli.po b/trunk/package/luci/po/ms/coovachilli.po
new file mode 100644
index 00000000..d910ef2d
--- /dev/null
+++ b/trunk/package/luci/po/ms/coovachilli.po
@@ -0,0 +1,22 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "CoovaChilli"
+msgstr ""
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/ddns.po b/trunk/package/luci/po/ms/ddns.po
new file mode 100644
index 00000000..7404e255
--- /dev/null
+++ b/trunk/package/luci/po/ms/ddns.po
@@ -0,0 +1,81 @@
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2010-04-02 13:44+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Check for changed IP every"
+msgstr ""
+
+msgid "Check-time unit"
+msgstr ""
+
+msgid "Custom update-URL"
+msgstr ""
+
+msgid "Dynamic DNS"
+msgstr ""
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Force update every"
+msgstr ""
+
+msgid "Force-time unit"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source of IP address"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "custom"
+msgstr ""
+
+# Hours
+msgid "h"
+msgstr ""
+
+msgid "interface"
+msgstr ""
+
+# Minutes (not minimum)
+msgid "min"
+msgstr ""
+
+msgid "network"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/diag_core.po b/trunk/package/luci/po/ms/diag_core.po
new file mode 100644
index 00000000..90fefc50
--- /dev/null
+++ b/trunk/package/luci/po/ms/diag_core.po
@@ -0,0 +1,29 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/diag_devinfo.po b/trunk/package/luci/po/ms/diag_devinfo.po
new file mode 100644
index 00000000..27d2b461
--- /dev/null
+++ b/trunk/package/luci/po/ms/diag_devinfo.po
@@ -0,0 +1,205 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/ffwizard.po b/trunk/package/luci/po/ms/ffwizard.po
new file mode 100644
index 00000000..6217b8fb
--- /dev/null
+++ b/trunk/package/luci/po/ms/ffwizard.po
@@ -0,0 +1,158 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/firewall.po b/trunk/package/luci/po/ms/firewall.po
new file mode 100644
index 00000000..ccbec607
--- /dev/null
+++ b/trunk/package/luci/po/ms/firewall.po
@@ -0,0 +1,431 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr ""
+
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr ""
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
+msgstr ""
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/freifunk-policyrouting.po b/trunk/package/luci/po/ms/freifunk-policyrouting.po
new file mode 100644
index 00000000..3c9a17e0
--- /dev/null
+++ b/trunk/package/luci/po/ms/freifunk-policyrouting.po
@@ -0,0 +1,39 @@
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/freifunk.po b/trunk/package/luci/po/ms/freifunk.po
new file mode 100644
index 00000000..262991d2
--- /dev/null
+++ b/trunk/package/luci/po/ms/freifunk.po
@@ -0,0 +1,391 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/hd_idle.po b/trunk/package/luci/po/ms/hd_idle.po
new file mode 100644
index 00000000..7facf69f
--- /dev/null
+++ b/trunk/package/luci/po/ms/hd_idle.po
@@ -0,0 +1,47 @@
+# Generated from applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2010-04-14 10:33+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Disk"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable debug"
+msgstr ""
+
+msgid "Idle-time"
+msgstr ""
+
+msgid "Idle-time unit"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+# Hours
+msgid "h"
+msgstr ""
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+
+# Minutes (not minimum)
+msgid "min"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/meshwizard.po b/trunk/package/luci/po/ms/meshwizard.po
new file mode 100644
index 00000000..a67c71f5
--- /dev/null
+++ b/trunk/package/luci/po/ms/meshwizard.po
@@ -0,0 +1,109 @@
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/minidlna.po b/trunk/package/luci/po/ms/minidlna.po
new file mode 100644
index 00000000..8df98a82
--- /dev/null
+++ b/trunk/package/luci/po/ms/minidlna.po
@@ -0,0 +1,163 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/mmc_over_gpio.po b/trunk/package/luci/po/ms/mmc_over_gpio.po
new file mode 100644
index 00000000..edbb2ce6
--- /dev/null
+++ b/trunk/package/luci/po/ms/mmc_over_gpio.po
@@ -0,0 +1,37 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/multiwan.po b/trunk/package/luci/po/ms/multiwan.po
new file mode 100644
index 00000000..d175246e
--- /dev/null
+++ b/trunk/package/luci/po/ms/multiwan.po
@@ -0,0 +1,114 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/ntpc.po b/trunk/package/luci/po/ms/ntpc.po
new file mode 100644
index 00000000..abbfdbe6
--- /dev/null
+++ b/trunk/package/luci/po/ms/ntpc.po
@@ -0,0 +1,52 @@
+# Generated from applications/luci-ntpc/luasrc/model/cbi/ntpc/*.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2010-04-14 13:24+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Clock Adjustment"
+msgstr ""
+
+msgid "Count of time measurements"
+msgstr ""
+
+msgid "Current system time"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Offset frequency"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Synchronizes the system time"
+msgstr ""
+
+msgid "Time Server"
+msgstr ""
+
+msgid "Time Servers"
+msgstr ""
+
+msgid "Time Synchronisation"
+msgstr ""
+
+msgid "Update interval (in seconds)"
+msgstr ""
+
+msgid "empty = infinite"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/olsr.po b/trunk/package/luci/po/ms/olsr.po
new file mode 100644
index 00000000..c0edce15
--- /dev/null
+++ b/trunk/package/luci/po/ms/olsr.po
@@ -0,0 +1,686 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/openvpn.po b/trunk/package/luci/po/ms/openvpn.po
new file mode 100644
index 00000000..5cac2c23
--- /dev/null
+++ b/trunk/package/luci/po/ms/openvpn.po
@@ -0,0 +1,546 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/p2pblock.po b/trunk/package/luci/po/ms/p2pblock.po
new file mode 100644
index 00000000..00cccc8e
--- /dev/null
+++ b/trunk/package/luci/po/ms/p2pblock.po
@@ -0,0 +1,28 @@
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr ""
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/p910nd.po b/trunk/package/luci/po/ms/p910nd.po
new file mode 100644
index 00000000..254fc66c
--- /dev/null
+++ b/trunk/package/luci/po/ms/p910nd.po
@@ -0,0 +1,43 @@
+#  p910nd.pot
+#  generated from ./applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Bidirectional mode"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+msgid "p910nd - Printer server"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/pbx-voicemail.po b/trunk/package/luci/po/ms/pbx-voicemail.po
new file mode 100644
index 00000000..bf633a67
--- /dev/null
+++ b/trunk/package/luci/po/ms/pbx-voicemail.po
@@ -0,0 +1,87 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/pbx.po b/trunk/package/luci/po/ms/pbx.po
new file mode 100644
index 00000000..23403f29
--- /dev/null
+++ b/trunk/package/luci/po/ms/pbx.po
@@ -0,0 +1,483 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/polipo.po b/trunk/package/luci/po/ms/polipo.po
new file mode 100644
index 00000000..7517dccf
--- /dev/null
+++ b/trunk/package/luci/po/ms/polipo.po
@@ -0,0 +1,201 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/qos.po b/trunk/package/luci/po/ms/qos.po
new file mode 100644
index 00000000..ab304921
--- /dev/null
+++ b/trunk/package/luci/po/ms/qos.po
@@ -0,0 +1,90 @@
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2010-03-25 22:10+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "priority"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/radvd.po b/trunk/package/luci/po/ms/radvd.po
new file mode 100644
index 00000000..8e0fb01a
--- /dev/null
+++ b/trunk/package/luci/po/ms/radvd.po
@@ -0,0 +1,368 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-21 04:06+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/rrdtool.po b/trunk/package/luci/po/ms/rrdtool.po
new file mode 100644
index 00000000..1f81fc66
--- /dev/null
+++ b/trunk/package/luci/po/ms/rrdtool.po
@@ -0,0 +1,355 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/samba.po b/trunk/package/luci/po/ms/samba.po
new file mode 100644
index 00000000..e29133e1
--- /dev/null
+++ b/trunk/package/luci/po/ms/samba.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/splash.po b/trunk/package/luci/po/ms/splash.po
new file mode 100644
index 00000000..615be16b
--- /dev/null
+++ b/trunk/package/luci/po/ms/splash.po
@@ -0,0 +1,292 @@
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/statistics.po b/trunk/package/luci/po/ms/statistics.po
new file mode 100644
index 00000000..e8280534
--- /dev/null
+++ b/trunk/package/luci/po/ms/statistics.po
@@ -0,0 +1,595 @@
+#  statistics.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/statistics.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/tinyproxy.po b/trunk/package/luci/po/ms/tinyproxy.po
new file mode 100644
index 00000000..08ed7dc4
--- /dev/null
+++ b/trunk/package/luci/po/ms/tinyproxy.po
@@ -0,0 +1,254 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/transmission.po b/trunk/package/luci/po/ms/transmission.po
new file mode 100644
index 00000000..3125fc27
--- /dev/null
+++ b/trunk/package/luci/po/ms/transmission.po
@@ -0,0 +1,280 @@
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/upnp.po b/trunk/package/luci/po/ms/upnp.po
new file mode 100644
index 00000000..c3e71846
--- /dev/null
+++ b/trunk/package/luci/po/ms/upnp.po
@@ -0,0 +1,135 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/ushare.po b/trunk/package/luci/po/ms/ushare.po
new file mode 100644
index 00000000..40b24f20
--- /dev/null
+++ b/trunk/package/luci/po/ms/ushare.po
@@ -0,0 +1,46 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Content directories"
+msgstr ""
+
+msgid "Disable telnet console"
+msgstr ""
+
+msgid "Disable webinterface"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Servername"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/uvc_streamer.po b/trunk/package/luci/po/ms/uvc_streamer.po
new file mode 100644
index 00000000..b88074a9
--- /dev/null
+++ b/trunk/package/luci/po/ms/uvc_streamer.po
@@ -0,0 +1,37 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr ""
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr ""
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr ""
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr ""
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/vnstat.po b/trunk/package/luci/po/ms/vnstat.po
new file mode 100644
index 00000000..9d237780
--- /dev/null
+++ b/trunk/package/luci/po/ms/vnstat.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-16 20:54+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/voice_core.po b/trunk/package/luci/po/ms/voice_core.po
new file mode 100644
index 00000000..a866bec5
--- /dev/null
+++ b/trunk/package/luci/po/ms/voice_core.po
@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Phones"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/voice_diag.po b/trunk/package/luci/po/ms/voice_diag.po
new file mode 100644
index 00000000..bf65c145
--- /dev/null
+++ b/trunk/package/luci/po/ms/voice_diag.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/ms/watchcat.po b/trunk/package/luci/po/ms/watchcat.po
new file mode 100644
index 00000000..0da283c7
--- /dev/null
+++ b/trunk/package/luci/po/ms/watchcat.po
@@ -0,0 +1,52 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/wol.po b/trunk/package/luci/po/ms/wol.po
new file mode 100644
index 00000000..74380f27
--- /dev/null
+++ b/trunk/package/luci/po/ms/wol.po
@@ -0,0 +1,48 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2010-04-19 00:29+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/ms/wshaper.po b/trunk/package/luci/po/ms/wshaper.po
new file mode 100644
index 00000000..d646e764
--- /dev/null
+++ b/trunk/package/luci/po/ms/wshaper.po
@@ -0,0 +1,40 @@
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/no/ahcp.po b/trunk/package/luci/po/no/ahcp.po
new file mode 100644
index 00000000..4c3bc03a
--- /dev/null
+++ b/trunk/package/luci/po/no/ahcp.po
@@ -0,0 +1,117 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-06-14 20:11+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language-Team: none\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "AHCP Server"
+msgstr "AHCP Server"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP er en autokonfigurasjon protokoll for IPv6, og dual-stack IPv6/IPv4 "
+"nettverk. Det er laget for bruk der DHCP og Ruter oppdagelse er problematisk "
+"eller umulig å bruke for hvert link-lags broadcast domene, f.eks. mobile ad-"
+"hoc nettverk."
+
+msgid "Active AHCP Leases"
+msgstr "Aktive AHCP Leier"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Advanced Settings"
+msgstr "Avanserte Innstillinger"
+
+msgid "Age"
+msgstr "Alder"
+
+msgid "Announced DNS servers"
+msgstr "Annonserte DNS servere"
+
+msgid "Announced NTP servers"
+msgstr "Annonserte NTP servere"
+
+msgid "Announced prefixes"
+msgstr "Annonserte prefikser"
+
+msgid "Collecting data..."
+msgstr "Henter data..."
+
+#, fuzzy
+msgid "Forwarder"
+msgstr "Sender"
+
+msgid "General Setup"
+msgstr "Generelt Oppsett"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 og IPv6"
+
+msgid "IPv4 only"
+msgstr "Kun IPv4"
+
+msgid "IPv6 only"
+msgstr "Kun IPv6"
+
+#, fuzzy
+msgid "Lease directory"
+msgstr "Leie katalog"
+
+msgid "Lease validity time"
+msgstr "Gyldig leietid"
+
+msgid "Log file"
+msgstr "Logg fil"
+
+msgid "Multicast address"
+msgstr "Multicast adresse"
+
+msgid "Operation mode"
+msgstr "Driftsmodus"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Protokoll familie"
+
+#, fuzzy
+msgid "Served interfaces"
+msgstr "Utdelte grensesnitt"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Angir annonserte IPv4 og IPv6 NTP-servere"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Angir annonserte IPv4 og IPv6 navnetjenere"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Angir annonserte IPv4 og IPv6 nettverk prefikser i CIDR-notasjon"
+
+msgid "The AHCP Service is not running."
+msgstr ""
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr "Det er ingen aktive leieavtaler."
+
+msgid "Unique ID file"
+msgstr "Unik ID fil"
diff --git a/trunk/package/luci/po/no/asterisk.po b/trunk/package/luci/po/no/asterisk.po
new file mode 100644
index 00000000..70c448d9
--- /dev/null
+++ b/trunk/package/luci/po/no/asterisk.po
@@ -0,0 +1,12 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/trunk/package/luci/po/no/base.po b/trunk/package/luci/po/no/base.po
new file mode 100644
index 00000000..a648bdb7
--- /dev/null
+++ b/trunk/package/luci/po/no/base.po
@@ -0,0 +1,3706 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2013-03-25 23:36+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language: no\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d minutters vindu, %d sekunds intervall)"
+
+msgid "(%s available)"
+msgstr "(%s Tilgjengelig)"
+
+msgid "(empty)"
+msgstr "(tom)"
+
+msgid "(no interfaces attached)"
+msgstr "(ingen grensesnitt tilknyttet)"
+
+msgid "-- Additional Field --"
+msgstr "-- Tilleggs Felt --"
+
+msgid "-- Please choose --"
+msgstr "-- Vennligst velg --"
+
+msgid "-- custom --"
+msgstr "-- egendefinert --"
+
+msgid "1 Minute Load:"
+msgstr "1 minutts belastning:"
+
+msgid "15 Minute Load:"
+msgstr "15 minutters belastning:"
+
+msgid "5 Minute Load:"
+msgstr "5 minutters belastning:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> spørre port"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servere skal følge rekkefølgen "
+"i oppslagsfilen ved spørringer"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Adresse"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Nettmaske"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Adresse eller "
+"Nettverk (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurasjon"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Navn"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Adresse"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"Maksimalt antall <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> leier"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"Maksimal\">Maks.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> pakke størrelse"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"Maksimal\">Maks.</abbr> samtidige spørringer"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Parvis: %s / Gruppe: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "<abbr title=\"Aksesspunkt Navn\">APN</abbr>"
+
+msgid "AR Support"
+msgstr "AR Støtte"
+
+msgid "ARP retry threshold"
+msgstr "APR terskel for nytt forsøk"
+
+msgid "ATM Bridges"
+msgstr "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> Broer"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+"<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> Virtuell kanal "
+"identifikator <abbr title=\"Virtual Channel Identifier\">(VCI)</abbr>"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+"<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> Virtuell plasserings "
+"identifikator <abbr title=\"Virtual Path Identifier\">(VPI)</abbr>"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"ATM broer viser innkapslede ethernet i AAL5 forbindelser som virtuelle Linux-"
+"nettverk grensesnitt, dette kan brukes sammen med DHCP eller PPP for å koble "
+"seg mot en leverandørs nettverk."
+
+msgid "ATM device number"
+msgstr "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> enhetsnummer"
+
+msgid "Access Concentrator"
+msgstr "Tilgangskonsentrator"
+
+msgid "Access Point"
+msgstr "Aksesspunkt"
+
+msgid "Action"
+msgstr "Handling"
+
+msgid "Actions"
+msgstr "Handlinger"
+
+msgid "Activate this network"
+msgstr "Aktiver dette nettverket"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Aktive <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Ruter"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Aktive <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Ruter"
+
+msgid "Active Connections"
+msgstr "Aktive Tilkoblinger"
+
+msgid "Active DHCP Leases"
+msgstr "Aktive DHCP Leier"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Aktive DHCPv6 Leier"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc (Uavhengig)"
+
+msgid "Add"
+msgstr "Legg til"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Legg det lokale domenesuffikset til navn utgitt fra vertsfiler"
+
+msgid "Add new interface..."
+msgstr "Legg til grensesnitt..."
+
+msgid "Additional Hosts files"
+msgstr "Tilleggs vertsfiler"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Address to access local relay bridge"
+msgstr "Adresse for tilgang til lokal relébro"
+
+msgid "Administration"
+msgstr "Administrasjon"
+
+msgid "Advanced Settings"
+msgstr "Avanserte Innstillinger"
+
+msgid "Alert"
+msgstr "Varsle"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "Tillat <abbr title=\"Secure Shell\">SSH</abbr> passord godkjenning"
+
+msgid "Allow all except listed"
+msgstr "Tillat alle unntatt oppførte"
+
+msgid "Allow listed only"
+msgstr "Tillat kun oppførte"
+
+msgid "Allow localhost"
+msgstr "Tillat lokalvert"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr "Tillat eksterne verter å koble til lokale SSH videresendt porter"
+
+msgid "Allow root logins with password"
+msgstr "Tillat root pålogginger med passord"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Tillat bruker <em>root</em> å logge inn med passord"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr "Tillat oppstrøms svar i 127.0.0.0/8 nettet, f.eks for RBL tjenester"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Bruk alltid 40MHz kanaler selv om sekundær kanal overlapper. Dette "
+"alternativet er ikke i samsvar med IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Et nytt nettverk vil bli opprettet hvis du tar bort haken."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antenne 1"
+
+msgid "Antenna 2"
+msgstr "Antenne 2"
+
+msgid "Antenna Configuration"
+msgstr "Antennekonfigurasjon"
+
+msgid "Any zone"
+msgstr "Alle soner"
+
+msgid "Apply"
+msgstr "Bruk"
+
+msgid "Applying changes"
+msgstr "Utfører endringer"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Tilknytt grensesnitt..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Tilkoblede Klienter"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s Trådløs Kontroller"
+
+msgid "Authentication"
+msgstr "Godkjenning"
+
+msgid "Authoritative"
+msgstr "Autoritativ"
+
+msgid "Authorization Required"
+msgstr "Autorisasjon er nødvendig"
+
+msgid "Auto Refresh"
+msgstr "Automatisk oppdatering"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Tilgjengelig"
+
+msgid "Available packages"
+msgstr "Tilgjengelige pakker"
+
+msgid "Average:"
+msgstr "Gjennomsnitt:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Tilbake"
+
+msgid "Back to Overview"
+msgstr "Tilbake til oversikt"
+
+msgid "Back to configuration"
+msgstr "Tilbake til konfigurasjon"
+
+msgid "Back to overview"
+msgstr "Tilbake til oversikt"
+
+msgid "Back to scan results"
+msgstr "Tilbake til skanne resultat"
+
+msgid "Background Scan"
+msgstr "Bakgrunns Skanning"
+
+msgid "Backup / Flash Firmware"
+msgstr "Sikkerhetskopiering/Firmware oppgradering"
+
+msgid "Backup / Restore"
+msgstr "Sikkerhetskopi/Gjenoppretting"
+
+msgid "Backup file list"
+msgstr "Sikkerhetskopier filliste"
+
+msgid "Bad address specified!"
+msgstr "Ugyldig adresse oppgitt!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Nedenfor er listen med filer som blir sikkerthetskopiert. Listen består av "
+"konfigurasjonsfiler som er merket av opkg, essensielle enhets filer og andre "
+"filer valgt av bruker."
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Bogus NX Domain Override"
+msgstr "Overstyr falske NX Domener"
+
+msgid "Bridge"
+msgstr "Bro"
+
+msgid "Bridge interfaces"
+msgstr "Sammenkoble grensesnitt"
+
+msgid "Bridge unit number"
+msgstr "Bro enhetsnummer"
+
+msgid "Bring up on boot"
+msgstr "Slå på ved oppstart"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s Trådløs Kontroller"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 Trådløs Kontroller"
+
+msgid "Buffered"
+msgstr "Bufret"
+
+msgid "Buttons"
+msgstr "Knapper"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "CPU forbruk (%)"
+
+msgid "Cached"
+msgstr "Hurtigbufret"
+
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Lenke"
+
+msgid "Changes"
+msgstr "Endringer"
+
+msgid "Changes applied."
+msgstr "Endringer utført."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Endrer administrator passordet for tilgang til enheten"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Check"
+msgstr "Kontroller"
+
+msgid "Checksum"
+msgstr "Kontrollsum"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Velg brannmur sonen du ønsker å knytte til dette grensesnittet. Velg "
+"<em>uspesifisert</em> for å fjerne grensesnittet fra den tilknyttede sonen. "
+"Eller fyll ut <em>Opprett</em> feltet for å definere en ny sone og tilknytte "
+"grensesnittet til det."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Velg det eller de nettverk du vil legge til dette trådløse grensesnittet, "
+"eller fyll ut <em>Opprett</em> feltet for å definere et nytt nettverk."
+
+msgid "Cipher"
+msgstr "Krypteringsmetode"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Klikk \"Opprett arkiv\" for å laste ned et tar arkiv av de gjeldende "
+"konfigurasjons filer. For å nullstille firmwaren til opprinnelig tilstand, "
+"klikker du på \"Utfør nullstilling\" (kun mulig på squashfs firmwarer)."
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Klient ID som sendes ved DHCP spørring"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Lukk inaktiver tilkoblinger etter angitt antall sekunder, bruk 0 for en "
+"kontinuerlig tilkobling"
+
+msgid "Close list..."
+msgstr "Lukk liste..."
+
+msgid "Collecting data..."
+msgstr "Henter data..."
+
+msgid "Command"
+msgstr "Kommando"
+
+msgid "Common Configuration"
+msgstr "Vanlige Innstillinger"
+
+msgid "Compression"
+msgstr "Komprimering"
+
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+msgid "Configuration applied."
+msgstr "Konfigurasjons endring utført."
+
+msgid "Configuration files will be kept."
+msgstr "Konfigurasjonsfiler vil bli bevart."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Konfigurerer dette monteringspunktet som overlay lagringspunkt for block-"
+"extroot"
+
+msgid "Confirmation"
+msgstr "Bekreftelse"
+
+msgid "Connect"
+msgstr "Koble til"
+
+msgid "Connected"
+msgstr "Tilkoblet"
+
+msgid "Connection Limit"
+msgstr "Tilkoblingsgrense (antall)"
+
+msgid "Connections"
+msgstr "Tilkoblinger"
+
+msgid "Country"
+msgstr "Land"
+
+msgid "Country Code"
+msgstr "Landskode"
+
+msgid "Cover the following interface"
+msgstr "Gjelder det følgende grensesnitt"
+
+msgid "Cover the following interfaces"
+msgstr "Gjelder de følgende grensesnitt"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Opprett/Tildel brannmur sone"
+
+msgid "Create Interface"
+msgstr "Opprett Grensesnitt"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Opprett en bro over flere grensesnitt"
+
+msgid "Critical"
+msgstr "Kritisk"
+
+msgid "Cron Log Level"
+msgstr "Cron logg nivå"
+
+msgid "Custom Interface"
+msgstr "Egendefinerte Grensesnitt"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Tilpasser oppførselen til enhetens <abbr title=\"Light Emitting Diode\">LED</"
+"abbr>s om mulig."
+
+msgid "DHCP Leases"
+msgstr "DHCP Leier"
+
+msgid "DHCP Server"
+msgstr "DHCP Server"
+
+msgid "DHCP and DNS"
+msgstr "DHCP og DNS"
+
+msgid "DHCP client"
+msgstr "DHCP klient"
+
+msgid "DHCP-Options"
+msgstr "DHCP-Alternativer"
+
+msgid "DHCPv6 Leases"
+msgstr "DHCPv6 Leier"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "DNS videresendinger"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Feilsøking"
+
+msgid "Default %d"
+msgstr "Standard %d"
+
+msgid "Default gateway"
+msgstr "Standard gateway"
+
+msgid "Default state"
+msgstr "Standard tilstand"
+
+msgid "Define a name for this network."
+msgstr "Definer et navn for dette nettverket."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Definer flere DHCP valg, f.eks \"<code>192.168.2.1,192.168.2.2</code>\" som "
+"annonserer forskjellige DNS servere til klientene."
+
+msgid "Delete"
+msgstr "Fjern"
+
+msgid "Delete this interface"
+msgstr "Fjern dette grensesnitt"
+
+msgid "Delete this network"
+msgstr "Fjern dette nettverket"
+
+msgid "Description"
+msgstr "Beskrivelse"
+
+msgid "Design"
+msgstr "Design"
+
+msgid "Destination"
+msgstr "Destinasjon"
+
+msgid "Device"
+msgstr "Enhet"
+
+msgid "Device Configuration"
+msgstr "Enhet Konfigurasjon"
+
+msgid "Diagnostics"
+msgstr "Nettverksdiagnostikk"
+
+msgid "Directory"
+msgstr "Katalog"
+
+msgid "Disable"
+msgstr "Deaktiver"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Deaktiver <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+"for dette nettverket."
+
+msgid "Disable DNS setup"
+msgstr "Deaktiver DNS oppsett"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Deaktiver HW-Beacon timer"
+
+msgid "Disabled"
+msgstr "Deaktivert"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Forkast oppstrøms RFC1918 svar"
+
+msgid "Displaying only packages containing"
+msgstr "Viser bare pakker som inneholder"
+
+msgid "Distance Optimization"
+msgstr "Avstand Optimalisering"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Avstand i meter til det medlem av nettverket som er lengst unna."
+
+msgid "Diversity"
+msgstr "Antennevariasjon"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq er en kombinert <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server og <abbr title=\"Domain Navn System\">DNS</abbr>-"
+"Fremsender for <abbr title =\"Network Address Translation\">NAT</abbr> "
+"brannmurer"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "Ikke cache negative svar, f.eks for ikke eksisterende domener"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Ikke videresend forespørsler som ikke kan besvares med offentlige "
+"navneservere"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Ikke videresend reverserte oppslag for lokale nettverk"
+
+msgid "Do not send probe responses"
+msgstr "Ikke send probe svar"
+
+msgid "Domain required"
+msgstr "Domene kreves"
+
+msgid "Domain whitelist"
+msgstr "Domene hviteliste"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Ikke videresend <abbr title=\"Domain Name System\">DNS</abbr>-Forespørsler "
+"uten <abbr title=\"Domain Name System\">DNS</abbr>-Navn"
+
+msgid "Download and install package"
+msgstr "Last ned og installer pakken"
+
+msgid "Download backup"
+msgstr "Last ned sikkerhetskopi"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear Instans"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear tilbyr <abbr title=\"Secure Shell\">SSH</abbr>-nettverks shell "
+"tilgang og en integrert <abbr title=\"Secure Copy\">SCP</abbr> server"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Dynamisk <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "Dynamisk tunnel"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Dynamisk tildeling av DHCP adresser til klienter. Om deaktivert, kan en kun "
+"bruke klienter med statisk leie."
+
+msgid "EAP-Method"
+msgstr "EAP-metode"
+
+msgid "Edit"
+msgstr "Endre"
+
+msgid "Edit this interface"
+msgstr "Endre dette grensesnittet"
+
+msgid "Edit this network"
+msgstr "Endre dette nettverket"
+
+msgid "Emergency"
+msgstr "Krisesituasjon"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Aktiver <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Aktiver HE,net dynamisk endepunkt oppdatering"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Aktiver IPv6 på PPP lenke"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Aktiver Jumbo Frames gjennomgang"
+
+msgid "Enable NTP client"
+msgstr "Aktiver NTP klient"
+
+msgid "Enable TFTP server"
+msgstr "Aktiver TFTP server"
+
+msgid "Enable VLAN functionality"
+msgstr "Aktiver VLAN funksjonalitet"
+
+msgid "Enable learning and aging"
+msgstr "Aktiver 'læring' og 'aldring'"
+
+msgid "Enable this mount"
+msgstr "Aktiver dette monteringspunktet"
+
+msgid "Enable this swap"
+msgstr "Aktiver denne swapenhet"
+
+msgid "Enable/Disable"
+msgstr "Aktiver/Deaktiver"
+
+msgid "Enabled"
+msgstr "Aktivert"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Aktiverer Spanning Tree Protocol på denne broen"
+
+msgid "Encapsulation mode"
+msgstr "Innkapsling modus"
+
+msgid "Encryption"
+msgstr "Kryptering"
+
+msgid "Erasing..."
+msgstr "Sletter..."
+
+msgid "Error"
+msgstr "Feil"
+
+msgid "Ethernet Adapter"
+msgstr "Ethernet Tilslutning"
+
+msgid "Ethernet Switch"
+msgstr "Ethernet Svitsj"
+
+msgid "Expand hosts"
+msgstr "Utvid vertsliste"
+
+msgid "Expires"
+msgstr "Utgår"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr "Utløpstid på leide adresser, minimum er 2 minutter (<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Ekstern systemlogg server"
+
+msgid "External system log server port"
+msgstr "Ekstern systemlogg server port"
+
+msgid "Fast Frames"
+msgstr "Fast Frames"
+
+msgid "File"
+msgstr "Fil"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Filnavn fra boot image annonsert til klienter"
+
+msgid "Filesystem"
+msgstr "Filsystem"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Filter private"
+msgstr "Filtrer private"
+
+msgid "Filter useless"
+msgstr "Filtrer ubrukelige"
+
+msgid "Find and join network"
+msgstr "Finn og koble til nettverk"
+
+msgid "Find package"
+msgstr "Finn pakke"
+
+msgid "Finish"
+msgstr "Fullfør"
+
+msgid "Firewall"
+msgstr "Brannmur"
+
+msgid "Firewall Settings"
+msgstr "Brannmur Innstillinger"
+
+msgid "Firewall Status"
+msgstr "Brannmur Status"
+
+msgid "Firmware Version"
+msgstr "Firmware Versjon"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Fast kilde port for utgående DNS-spørringer"
+
+msgid "Flags"
+msgstr "Flagg"
+
+msgid "Flash Firmware"
+msgstr "Firmware Oppradering"
+
+msgid "Flash image..."
+msgstr "Flash firmware..."
+
+msgid "Flash new firmware image"
+msgstr "Flash nytt firmware image"
+
+msgid "Flash operations"
+msgstr "Flash operasjoner"
+
+msgid "Flashing..."
+msgstr "Flasher..."
+
+msgid "Force"
+msgstr "Bruk"
+
+msgid "Force 40MHz mode"
+msgstr "Bruk 40MHz modus"
+
+msgid "Force CCMP (AES)"
+msgstr "Bruk CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+"Bruk DHCP i dette nettverket, selv om en annen DHCP server er oppdaget."
+
+msgid "Force TKIP"
+msgstr "Bruk TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Bruk TKIP og CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Videresend DHCP trafikk"
+
+msgid "Forward broadcast traffic"
+msgstr "Videresend kringkastingstrafikk"
+
+msgid "Forwarding mode"
+msgstr "Videresending modus"
+
+msgid "Fragmentation Threshold"
+msgstr "Fragmenterings Terskel"
+
+msgid "Frame Bursting"
+msgstr "Frame Bursting"
+
+msgid "Free"
+msgstr "Ledig"
+
+msgid "Free space"
+msgstr "Ledig plass"
+
+msgid "Frequency Hopping"
+msgstr "Frekvens Hopping"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Kun GPRS"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Gateway ports"
+msgstr "Gateway porter"
+
+msgid "General Settings"
+msgstr "Generelle Innstillinger"
+
+msgid "General Setup"
+msgstr "Generelt Oppsett"
+
+msgid "Generate archive"
+msgstr "Opprett arkiv"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Generell 802.11%s Trådløs Kontroller"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "Det oppgitte passordet var ikke korrekt, passord ble ikke endret!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "GÃ¥ til passord konfigurasjon..."
+
+msgid "Go to relevant configuration page"
+msgstr "GÃ¥ til relevant konfigurasjonen side"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "HE.net passord"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Behandler"
+
+msgid "Hang Up"
+msgstr "Slå av"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Her kan du konfigurere grunnleggende aspekter av enheten som f.eks. dens "
+"vertsnavn eller tidssone."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Her kan du lime inn felles SSH-nøkler(en per linje), for SSH godkjenning."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b Trådløs Kontroller"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Skjul <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Vertsoppføringer"
+
+msgid "Host expiry timeout"
+msgstr "Verts utløpstid"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"Verts-<abbr title=\"Internet Protocol Address\">IP</abbr> eller Nettverk"
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Vertsnavn som sendes ved DHCP forespørsel"
+
+msgid "Hostnames"
+msgstr "Vertsnavn"
+
+msgid "IP address"
+msgstr "IP adresse"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4 Brannmur"
+
+msgid "IPv4 WAN Status"
+msgstr "IPv4 WAN Status"
+
+msgid "IPv4 address"
+msgstr "IPv4 adresse"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 og IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 kringkasting"
+
+msgid "IPv4 gateway"
+msgstr "IPv4 gateway"
+
+msgid "IPv4 netmask"
+msgstr "IPv4 nettmaske"
+
+msgid "IPv4 only"
+msgstr "Kun IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "IPv4 prefikslengde"
+
+msgid "IPv4-Address"
+msgstr "IPv4-Adresse"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6 Brannmur"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "IPv6 WAN Status"
+
+msgid "IPv6 address"
+msgstr "IPv6 adresse"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6 gateway"
+
+msgid "IPv6 only"
+msgstr "Kun IPv6"
+
+msgid "IPv6 prefix"
+msgstr "IPv6 prefiks"
+
+msgid "IPv6 prefix length"
+msgstr "IPv6 prefikslengde"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-Adresse"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-i-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-over-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-over-IPv4 (6til4)"
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr "Hvis oppgitt vil denne enhet monteres ut fra dens UUID"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr "Hvis oppgitt vil denne enheten bli montert utfra dens Volumnavn"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Dersom ikke avmerket blir ingen standard rute konfigurert"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Dersom ikke avmerket blir de annonserte DNS server adresser ignorert"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Om ruterens fysiske minne er utilstrekkelig, ubrukte data kan midlertidig "
+"gjøres om til en swap-enhet som gir deg mere tilgjengelig <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Vær oppmerksom på at bruk av swap er "
+"mye langsommere en <abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ignorer vertsfiler"
+
+msgid "Ignore interface"
+msgstr "Ignorer grensesnitt"
+
+msgid "Ignore resolve file"
+msgstr "Ignorer oppslagsfil"
+
+msgid "Image"
+msgstr "Firmware"
+
+msgid "In"
+msgstr "i"
+
+msgid "Inactivity timeout"
+msgstr "Tidsavbrudd etter innaktivitet"
+
+msgid "Inbound:"
+msgstr "Innkommende:"
+
+msgid "Info"
+msgstr "Informasjon"
+
+msgid "Initscript"
+msgstr "Oppstartskript"
+
+msgid "Initscripts"
+msgstr "Oppstartsskript"
+
+msgid "Install"
+msgstr "Installer"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Installer pakken %q"
+
+msgid "Install protocol extensions..."
+msgstr "Installer protokoll utvidelser..."
+
+msgid "Installed packages"
+msgstr "Installerte pakker"
+
+msgid "Interface"
+msgstr "Grensesnitt"
+
+msgid "Interface Configuration"
+msgstr "Grensesnitt Konfigurasjon"
+
+msgid "Interface Overview"
+msgstr "Grensesnitt Oversikt"
+
+msgid "Interface is reconnecting..."
+msgstr "Grensesnittet kobler til igjen..."
+
+msgid "Interface is shutting down..."
+msgstr "Grensesnittet slår seg av..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Grensesnittet er ikke tilgjengelig eller er ikke tilknyttet."
+
+msgid "Interface reconnected"
+msgstr "Grensesnittet er koblet til igjen"
+
+msgid "Interface shut down"
+msgstr "Grensesnittet er slått av"
+
+msgid "Interfaces"
+msgstr "Grensesnitt"
+
+msgid "Internal Server Error"
+msgstr "Intern server feil"
+
+msgid "Invalid"
+msgstr "Ugyldig"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "Ugyldig VLAN ID gitt! Bare IDer mellom %d og %d er tillatt."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "Ugyldig VLAN ID gitt! Bare unike ID'er er tillatt"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Ugyldig brukernavn og/eller passord! Vennligst prøv igjen."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Det virker som du prøver å flashe med en firmware som ikke passer inn i "
+"flash-minnet, vennligst kontroller firmware filen!"
+
+msgid "Java Script required!"
+msgstr "Java Script kreves!"
+
+msgid "Join Network"
+msgstr "Koble til nettverket"
+
+msgid "Join Network: Settings"
+msgstr "Koble til nettverk: Innstilling"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Koble til nettverk: Trådløs Skanning"
+
+msgid "Keep settings"
+msgstr "Behold innstillinger"
+
+msgid "Kernel Log"
+msgstr "Kjerne Logg"
+
+msgid "Kernel Version"
+msgstr "Kjerne Versjon"
+
+msgid "Key"
+msgstr "Nøkkel"
+
+msgid "Key #%d"
+msgstr "Nøkkel #%d"
+
+msgid "Kill"
+msgstr "Drep"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP Server"
+
+msgid "LCP echo failure threshold"
+msgstr "LCP ekko feil terskel"
+
+msgid "LCP echo interval"
+msgstr "LCP ekko intervall"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Volumnavn"
+
+msgid "Language"
+msgstr "Språk"
+
+msgid "Language and Style"
+msgstr "Språk og Utseende"
+
+msgid "Lease validity time"
+msgstr "Gyldig leietid"
+
+msgid "Leasefile"
+msgstr "<abbr title=\"Leasefile\">Leie-fil</abbr>"
+
+msgid "Leasetime"
+msgstr "<abbr title=\"Leasetime\">Leietid</abbr>"
+
+msgid "Leasetime remaining"
+msgstr "Gjenværende leietid"
+
+msgid "Leave empty to autodetect"
+msgstr "La stå tomt for automatisk oppdagelse"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "La stå tomt for å bruke gjeldene WAN adresse"
+
+msgid "Legend:"
+msgstr "Forklaring:"
+
+msgid "Limit"
+msgstr "Grense"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Forbindelse"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Liste med <abbr title=\"Domain Name System\">DNS</abbr> servere som "
+"forespørsler blir videresendt til"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Liste over domener hvor en tillater RFC1918 svar"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Liste over verter som returneren falske NX domene resultater"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Lytt kun på det angitte grensesnitt, om ingen er angitt lyttes det på alle"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Lytte-port for innkommende DNS-spørring"
+
+msgid "Load"
+msgstr "Belastning"
+
+msgid "Load Average"
+msgstr "Belastning Gjennomsnitt"
+
+msgid "Loading"
+msgstr "Laster"
+
+msgid "Local IPv4 address"
+msgstr "Lokal IPv4 adresse"
+
+msgid "Local IPv6 address"
+msgstr "Lokal IPv6 adresse"
+
+msgid "Local Startup"
+msgstr "Lokal Oppstart"
+
+msgid "Local Time"
+msgstr "Lokal tid"
+
+msgid "Local domain"
+msgstr "Lokalt domene"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Lokalt domene spesifikasjon. Navn som passer dette domenet blir aldri "
+"videresendt, de blir kun løst av DHCP eller vertsfiler"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr "Lokalt domenesuffiks lagt til DHCP navn og vertsfil oppføringer"
+
+msgid "Local server"
+msgstr "Lokal server"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Lokaliser vertsnavn avhengig av subnett hvis flere IP-adresser er "
+"tilgjengelig"
+
+msgid "Localise queries"
+msgstr "Lokalisere søk"
+
+msgid "Locked to channel %d used by %s"
+msgstr "LÃ¥st til kanal %d brukt av %s"
+
+msgid "Log output level"
+msgstr "Logg nivå"
+
+msgid "Log queries"
+msgstr "Logg spørringer"
+
+msgid "Logging"
+msgstr "Logging"
+
+msgid "Login"
+msgstr "Logg inn"
+
+msgid "Logout"
+msgstr "Logg ut"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "Laveste leide adresse, forskjøvet fra nettverks adressen."
+
+msgid "MAC-Address"
+msgstr "MAC-Adresse"
+
+msgid "MAC-Address Filter"
+msgstr "MAC-Addresse Filter"
+
+msgid "MAC-Filter"
+msgstr "MAC-Filter"
+
+msgid "MAC-List"
+msgstr "MAC-Liste"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Maksimal hastighet"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Maksimalt antall aktive DHCP leieavtaler"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Maksimalt antall samtidige DNS spørringer"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Maksimal tillatt størrelse på EDNS.0 UDP-pakker"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Maksimalt antall sekunder å vente på at modemet skal bli klart"
+
+msgid "Maximum hold time"
+msgstr "Maksimal holde tid"
+
+msgid "Maximum number of leased addresses."
+msgstr "Maksimalt antall utleide adresser."
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Minne"
+
+msgid "Memory usage (%)"
+msgstr "Minne forbruk (%)"
+
+msgid "Metric"
+msgstr "Metrisk"
+
+msgid "Minimum Rate"
+msgstr "Minimum hastighet"
+
+msgid "Minimum hold time"
+msgstr "Minimum holde tid"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Mangler protokoll utvidelse for proto %q"
+
+msgid "Mode"
+msgstr "Modus"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Modem"
+
+msgid "Modem init timeout"
+msgstr "Modem initiering tidsavbrudd"
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr "Monterings Enhet"
+
+msgid "Mount Point"
+msgstr "Monterings Punkt"
+
+msgid "Mount Points"
+msgstr "Monterings Punkter"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Monterings Punkter - Monterings Enhet"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Monterings Punkter - Swap Enhet"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Monterings punkter definerer hvor lagrings enheter blir tilsluttet "
+"filsystemet"
+
+msgid "Mount options"
+msgstr "Monterings alternativer"
+
+msgid "Mount point"
+msgstr "Monterings punkt"
+
+msgid "Mounted file systems"
+msgstr "Monterte Filsystemer"
+
+msgid "Move down"
+msgstr "Flytt ned"
+
+msgid "Move up"
+msgstr "Flytt opp"
+
+msgid "Multicast Rate"
+msgstr "Multicast hastighet"
+
+msgid "Multicast address"
+msgstr "Multicast adresse"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "NTP server kandidater"
+
+msgid "Name"
+msgstr "Navn"
+
+msgid "Name of the new interface"
+msgstr "Navnet til det nye grensesnittet"
+
+msgid "Name of the new network"
+msgstr "Navnet til det nye nettverket"
+
+msgid "Navigation"
+msgstr "Navigasjon"
+
+msgid "Netmask"
+msgstr "Nettmaske"
+
+msgid "Network"
+msgstr "Nettverk"
+
+msgid "Network Utilities"
+msgstr "Nettverks Verktøy"
+
+msgid "Network boot image"
+msgstr "Nettverks boot image"
+
+msgid "Network without interfaces."
+msgstr "Nettverk uten grensesnitt."
+
+msgid "Next »"
+msgstr "Neste »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Ingen DHCP server er konfigurert for dette grensesnittet"
+
+msgid "No chains in this table"
+msgstr "Ingen lenker i denne tabellen"
+
+msgid "No files found"
+msgstr "Ingen filer funnet"
+
+msgid "No information available"
+msgstr "Ingen informasjon tilgjengelig"
+
+msgid "No negative cache"
+msgstr "Ingen negative cache"
+
+msgid "No network configured on this device"
+msgstr "Ingen nettverk er konfigurert på denne enheten"
+
+msgid "No network name specified"
+msgstr "Ingen nettverksnavn spesifisert"
+
+msgid "No package lists available"
+msgstr "Ingen pakkelister tilgjengelig"
+
+msgid "No password set!"
+msgstr "Ruteren er ikke passordbeskyttet!"
+
+msgid "No rules in this chain"
+msgstr "Ingen regler i denne tabellen"
+
+msgid "No zone assigned"
+msgstr "Ingen sone tilknyttet"
+
+msgid "Noise"
+msgstr "Støy"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Støy:"
+
+msgid "None"
+msgstr "Ingen"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "Ikke funnet"
+
+msgid "Not associated"
+msgstr "Ikke tilknyttet"
+
+msgid "Not connected"
+msgstr "Ikke tilkoblet"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Merk: Konfigurasjonsfiler vil bli slettet"
+
+msgid "Notice"
+msgstr "Merk"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "<abbr title=\"Open PacKaGe Management\">OPKG</abbr>-Konfigurasjon"
+
+msgid "Off-State Delay"
+msgstr "Forsinkelse ved tilstand Av"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"PÃ¥ denne siden kan du konfigurere nettverks grensesnittet. Du kan "
+"sammenkoble flere grensesnitt ved å hake av \"Sammekoble grensesnitt\" "
+"feltet og skrive inn navn på grensesnittene atskilt med mellomrom. Du kan "
+"også bruke <abbr title=\"Virtual Local Area Network\">VLAN</abbr> betegnelse "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for eksempel\">f.eks</abbr>: "
+"<samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Forsinkelse ved tilstand -PÃ¥-"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Enten Vertsnavn eller Mac-adresse må oppgis!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Ett eller flere felt inneholder ugyldige verdier!"
+
+msgid "One or more required fields have no value!"
+msgstr "Ett eller flere obligatoriske felter har ingen verdi!"
+
+msgid "Open list..."
+msgstr "Åpne liste..."
+
+msgid "Option changed"
+msgstr "Innstilling endret"
+
+msgid "Option removed"
+msgstr "Innstilling fjernet"
+
+msgid "Options"
+msgstr "Alternativer"
+
+msgid "Other:"
+msgstr "Andre:"
+
+msgid "Out"
+msgstr "Ut"
+
+msgid "Outbound:"
+msgstr "Ugående:"
+
+msgid "Outdoor Channels"
+msgstr "Utendørs Kanaler"
+
+msgid "Override MAC address"
+msgstr "Overstyr MAC adresse"
+
+msgid "Override MTU"
+msgstr "Overstyr MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Overstyr gatewayen mottatt av DHCP respons"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Overstyr nettmaske sendt til klienter. Normalt er nettmasken beregnet ut fra "
+"subnettet som blir tildelt."
+
+msgid "Override the table used for internal routes"
+msgstr "Overstyr tabellen som brukes for interne ruter"
+
+msgid "Overview"
+msgstr "Oversikt"
+
+msgid "Owner"
+msgstr "Eier"
+
+msgid "PAP/CHAP password"
+msgstr "PAP/CHAP passord"
+
+msgid "PAP/CHAP username"
+msgstr "PAP/CHAP brukernavn"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA Innkapsling"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Pakken libiwinfo er nødvendig!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Pakkelistene er eldre enn 24 timer"
+
+msgid "Package name"
+msgstr "Pakkenavn"
+
+msgid "Packets"
+msgstr "Pakker"
+
+msgid "Part of zone %q"
+msgstr "En del av sone %q"
+
+msgid "Password"
+msgstr "Passord"
+
+msgid "Password authentication"
+msgstr "Passord godkjenning"
+
+msgid "Password of Private Key"
+msgstr "Passord for privatnøkkel"
+
+msgid "Password successfully changed!"
+msgstr "Passordet er endret!"
+
+msgid "Path to CA-Certificate"
+msgstr "Sti til CA-sertifikat"
+
+msgid "Path to Client-Certificate"
+msgstr "Sti til klient-sertifikat"
+
+msgid "Path to Private Key"
+msgstr "Sti til privatnøkkel"
+
+msgid "Path to executable which handles the button event"
+msgstr "Sti til program som håndterer handling ved bruk av knapp"
+
+msgid "Peak:"
+msgstr "Maksimalt:"
+
+msgid "Perform reboot"
+msgstr "Omstart nå"
+
+msgid "Perform reset"
+msgstr "Foreta nullstilling"
+
+msgid "Phy Rate:"
+msgstr "Phy Hastighet:"
+
+msgid "Physical Settings"
+msgstr "Fysiske Innstillinger"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "Pakker."
+
+msgid "Please enter your username and password."
+msgstr "Skriv inn ditt brukernavn og passord."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Vent: Enheten starter på nytt..."
+
+msgid "Policy"
+msgstr "Policy"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Port %d er utagget i flere VLANs!"
+
+msgid "Port status:"
+msgstr "Port status:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Annta at peer er uten forbindelse om angitt LCP ekko feiler, bruk verdi 0 "
+"for å overse feil"
+
+msgid "Prevents client-to-client communication"
+msgstr "Hindrer klient-til-klient kommunikasjon"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b Trådløs Kontroller"
+
+msgid "Proceed"
+msgstr "Fortsett"
+
+msgid "Processes"
+msgstr "Prosesser"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Protocol family"
+msgstr "Protokoll familie"
+
+msgid "Protocol of the new interface"
+msgstr "Protokoll til det nye grensesnittet"
+
+msgid "Protocol support is not installed"
+msgstr "Protokoll støtte er ikke installert"
+
+msgid "Provide NTP server"
+msgstr "Funger som NTP Server"
+
+msgid "Provide new network"
+msgstr "Lag nytt nettverk"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Kvalitet"
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS Terskel"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "RX Rate"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "RaLink 802.11%s Trådløs Kontroller"
+
+msgid "Radius-Accounting-Port"
+msgstr "Radius-Accounting-Port"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Radius-Accounting-Secret"
+
+msgid "Radius-Accounting-Server"
+msgstr "Radius-Accounting-Server"
+
+msgid "Radius-Authentication-Port"
+msgstr "Radius-Authentication-Port"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Radius-Authentication-Secret"
+
+msgid "Radius-Authentication-Server"
+msgstr "Radius-Authentication-Server"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Benytt <code>/etc/ethers</code> for å konfigurere <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Fjerne dette grensesnittet? Slettingen kan ikke omgjøres!\n"
+"Du kan miste kontakten med ruteren om du er tilkoblet via dette "
+"grensesnittet."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Fjerne dette trådløse nettverket? Slettingen kan ikke omgjøres!\n"
+"Du kan miste kontakten med ruteren om du er tilkoblet via dette nettverket."
+
+msgid "Really reset all changes?"
+msgstr "Vil du nullstille alle endringer?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Slå av dette nettverket ?\n"
+"Du kan miste kontakten med ruteren om du er tilkoblet via dette "
+"grensesnittet."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Slå av dette grensesnittet \"%s\" ?\n"
+"Du kan miste kontakten med ruteren om du er tilkoblet via dette "
+"grensesnittet."
+
+msgid "Really switch protocol?"
+msgstr "Vil du endre protokoll?"
+
+msgid "Realtime Connections"
+msgstr "Tilkoblinger Sanntid"
+
+msgid "Realtime Graphs"
+msgstr "Grafer i sanntid"
+
+msgid "Realtime Load"
+msgstr "Belastning Sanntid"
+
+msgid "Realtime Traffic"
+msgstr "Trafikk Sanntid"
+
+msgid "Realtime Wireless"
+msgstr "Trådløst i sanntid"
+
+msgid "Rebind protection"
+msgstr "Binde beskyttelse"
+
+msgid "Reboot"
+msgstr "Omstart"
+
+msgid "Rebooting..."
+msgstr "Starter på nytt..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Omstarter operativsystemet på enheten"
+
+msgid "Receive"
+msgstr "Motta"
+
+msgid "Receiver Antenna"
+msgstr "Mottak antenne"
+
+msgid "Reconnect this interface"
+msgstr "Koble til igjen"
+
+msgid "Reconnecting interface"
+msgstr "Kobler til igjen"
+
+msgid "References"
+msgstr "Referanser"
+
+msgid "Regulatory Domain"
+msgstr "Regulerende Domene"
+
+msgid "Relay"
+msgstr "Relay"
+
+msgid "Relay Bridge"
+msgstr "Relay bro"
+
+msgid "Relay between networks"
+msgstr "Relay mellom nettverk"
+
+msgid "Relay bridge"
+msgstr "Relay bro"
+
+msgid "Remote IPv4 address"
+msgstr "Ekstern IPv4 adresse"
+
+msgid "Remove"
+msgstr "Avinstaller"
+
+msgid "Repeat scan"
+msgstr "Skann på nytt"
+
+msgid "Replace entry"
+msgstr "Erstatt oppføring"
+
+msgid "Replace wireless configuration"
+msgstr "Erstatt trådløs konfigurasjon"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Er nødvendig for noen nettleverandører, f.eks Charter med DOCSIS 3"
+
+msgid "Reset"
+msgstr "Nullstill"
+
+msgid "Reset Counters"
+msgstr "Nullstill Tellere"
+
+msgid "Reset to defaults"
+msgstr "Nullstill til standard innstilling"
+
+msgid "Resolv and Hosts Files"
+msgstr "Oppslag og Vertsfiler"
+
+msgid "Resolve file"
+msgstr "<abbr title=\"Resolvefile\">Oppslagsfil</abbr>"
+
+msgid "Restart"
+msgstr "Omstart"
+
+msgid "Restart Firewall"
+msgstr "Omstart Brannmur"
+
+msgid "Restore backup"
+msgstr "Gjenopprett sikkerhetskopi"
+
+msgid "Reveal/hide password"
+msgstr "Vis/Skjul passord"
+
+msgid "Revert"
+msgstr "Tilbakestill"
+
+msgid "Root"
+msgstr "Rot"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Rot katalog for filer gitt fra TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Ruter Passord"
+
+msgid "Routes"
+msgstr "Ruter"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Ruter, angir hvilket nettverksgrensesnitt og hvilken gateway som brukes for "
+"å nå et gitt nettverk eller vert."
+
+msgid "Rule #"
+msgstr "Regel #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Kjør filsystem sjekk før montering av enheten"
+
+msgid "Run filesystem check"
+msgstr "Kjør filsystem sjekk"
+
+msgid "SSH Access"
+msgstr "SSH Tilgang"
+
+msgid "SSH-Keys"
+msgstr "SSH-Nøkler"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Lagre"
+
+msgid "Save & Apply"
+msgstr "Lagre & Aktiver"
+
+msgid "Save &#38; Apply"
+msgstr "Lagre &#38; Aktiver"
+
+msgid "Scan"
+msgstr "Skann"
+
+msgid "Scheduled Tasks"
+msgstr "Planlagte Oppgaver"
+
+msgid "Section added"
+msgstr "Seksjon lagt til"
+
+msgid "Section removed"
+msgstr "Seksjon fjernet"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Se \"mount\" manpage for detaljer"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Send LCP ekko forespørsler etter angitt intervall i sekunder, dette er kun "
+"gjeldene dersom feilterskelen er nådd"
+
+msgid "Separate Clients"
+msgstr "Separerte Klienter"
+
+msgid "Separate WDS"
+msgstr "Separert WDS"
+
+msgid "Server Settings"
+msgstr "Server Innstillinger"
+
+msgid "Service Name"
+msgstr "Tjeneste navn"
+
+msgid "Service Type"
+msgstr "Tjeneste type"
+
+msgid "Services"
+msgstr "Tjenester"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Oppsett tidssynkronisering"
+
+msgid "Setup DHCP Server"
+msgstr "Oppsett DHCP server"
+
+msgid "Show current backup file list"
+msgstr "Vis gjeldende liste med sikkerhetskopifiler"
+
+msgid "Shutdown this interface"
+msgstr "Slå av dette grensesnittet"
+
+msgid "Shutdown this network"
+msgstr "Slå av dette nettverket"
+
+msgid "Signal"
+msgstr "Signal"
+
+msgid "Signal:"
+msgstr "Signal:"
+
+msgid "Size"
+msgstr "Størrelse"
+
+msgid "Skip"
+msgstr "GÃ¥ videre"
+
+msgid "Skip to content"
+msgstr "GÃ¥ til innhold"
+
+msgid "Skip to navigation"
+msgstr "GÃ¥ til navigasjon"
+
+msgid "Slot time"
+msgstr "Slot tid"
+
+msgid "Software"
+msgstr "Programvare"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Noen felt er ugyldige, kan ikke lagre verdier!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Beklager, objektet du spurte om ble ikke funnet."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Beklager, det oppstod en uventet feil på serveren."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Beklager, men finner ikke støtte for 'sysupgrade', ny firmware må derfor "
+"flashes manuelt. Viser til libreCMC wiki for installering av firmare på "
+"forskjellige enheter."
+
+msgid "Sort"
+msgstr "Sortering"
+
+msgid "Source"
+msgstr "Kilde"
+
+msgid "Specifies the button state to handle"
+msgstr "Spesifiserer knappens handlemønster"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Hvor lagrings enheten blir tilsluttet filsystemet (f.eks. /mnt/sda1)"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Angir den lyttende porten for denne <em>Dropbear</em> instansen"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Angir maksimalt antall feilede ARP forespørsler før verter ansees frakoblet"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr "Angir maksimalt antall sekunder før verter ansees som frakoblet"
+
+msgid "Specify the secret encryption key here."
+msgstr "Angi krypteringsnøkkelen her."
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Start priority"
+msgstr "Start prioritet"
+
+msgid "Startup"
+msgstr "Oppstart"
+
+msgid "Static IPv4 Routes"
+msgstr "Statiske IPv4 Ruter"
+
+msgid "Static IPv6 Routes"
+msgstr "Statiske IPv6 Ruter"
+
+msgid "Static Leases"
+msgstr "Statiske Leier"
+
+msgid "Static Routes"
+msgstr "Statiske Ruter"
+
+msgid "Static WDS"
+msgstr "Statisk WDS"
+
+msgid "Static address"
+msgstr "Statisk adresse"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Statisk leieavtaler brukes til å tildele faste IP adresser og symbolske "
+"vertsnavn til DHCP klienter. Dette er nødvendig om grensesnittet ikke er "
+"dynamisk konfigurert og kun klienter med dhcp leieavtale får IP."
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Stop"
+msgstr "Stop"
+
+msgid "Strict order"
+msgstr "Streng overholdelse"
+
+msgid "Submit"
+msgstr "Send"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Swap Enhet"
+
+msgid "Switch"
+msgstr "Svitsj"
+
+msgid "Switch %q"
+msgstr "Svitsj %q"
+
+msgid "Switch %q (%s)"
+msgstr "Svitsj %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Svitsj protokoll"
+
+msgid "Sync with browser"
+msgstr "Synkroniser med nettleser"
+
+msgid "Synchronizing..."
+msgstr "Synkroniser..."
+
+msgid "System"
+msgstr "System"
+
+msgid "System Log"
+msgstr "System Logg"
+
+msgid "System Properties"
+msgstr "System Egenskaper"
+
+msgid "System log buffer size"
+msgstr "System logg buffer størrelse"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "TFTP Innstillinger"
+
+msgid "TFTP server root"
+msgstr "TFTP server roten"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "TX rate"
+
+msgid "Table"
+msgstr "Tabell"
+
+msgid "Target"
+msgstr "MÃ¥l"
+
+msgid "Terminate"
+msgstr "Avslutte"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"<em>Enhet Konfigurasjon</em> seksjonen omhandler innstillingene av den "
+"trådløse enheten som kanaler, sende stryke eller antenne valg. Disse "
+"innstillingene er delt mellom alle definerte trådløse nettverk opprettet "
+"utfra denne enhet. (om den trådløse enheten støtter mulit-SSID). Nettverks "
+"innstillinger som kryptering eller kanaler er gruppert i <em>Grensesnitt "
+"Konfigurasjon</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Pakken <em>libiwinfo-lua</em> er ikke installert. Du må installere denne "
+"pakken for å kunne konfigurerer trådløse enheter!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"IPv6 prefikset tilordnet mot leverandør, ender som regel med <code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Gyldige tegn er: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> og "
+"<code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"Filenheten til partisjonen eller minnet (<abbr title=\"for eksempel\">f.eks."
+"</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Filsystemet som ble brukt til å formatere partisjonen eller minnet. (<abbr "
+"title=\"for eksempel\">f.eks.</abbr> <samp><abbr title=\"Third Extended "
+"Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Firmwaren ble lastet opp. Nedenfor er kontrollsum og filstørrelse oppført, "
+"sammenlign dem med den opprinnelige filen for å sikre dataintegriteten.<br /"
+"> Klikk \"Fortsett\" nedenfor for å starte flash prosedyren."
+
+msgid "The following changes have been committed"
+msgstr "Følgende endringer er foretatt"
+
+msgid "The following changes have been reverted"
+msgstr "Følgende endringer er forkastet"
+
+msgid "The following rules are currently active on this system."
+msgstr "Følgende regler er aktiver på systemet."
+
+msgid "The given network name is not unique"
+msgstr "Det angitte nettverksnavnet er ikke unikt"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Maskinvaren er ikke multi-SSID kapabel og den ekisterende konfigurasjonen "
+"vil bli erstattet om du fortsetter."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr "Lengden IPv4 prefikset i bits, resten brukt i IPv6-adresser."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Lengden på IPv6 prefikset i bits"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Nettverks portene på ruteren kan kombineres til flere <abbr title=\"Virtual "
+"Local Area Network\">VLAN</abbr>s der datamaskiner kan kommunisere direkte "
+"med hverandre. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s "
+"brukes ofte for å skille ulike nettverk segmenter. Det er vanlig og ha en "
+"Uplink port for tilkobling til større nettverk som internett og andre porter "
+"til lokalt nettverk."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Den valgte protokoll må ha en enhet tilknyttet"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"Systemet sletter konfigurasjonspartisjonen nå, enheten vil bli startet på "
+"nytt når dette er utført."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Systemet flashes nå.<br /> IKKE SLÅ AV ENHETEN!<br /> Vent noen minutter før "
+"du prøver å koble til igjen. Det kan være nødvendig å fornye ip-adressen til "
+"datamaskinen din for å nå enheten på nytt. (avhengig av innstillingene dine)"
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Den opplastede programvaren er av et format som ikke støttes. Sørg for at du "
+"velger det generelle firmware-bildet for din plattform."
+
+msgid "There are no active leases."
+msgstr "Det er ingen aktive leieavtaler."
+
+msgid "There are no pending changes to apply!"
+msgstr "Det finnes ingen endringer som kan utføres!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Det finnes ingen endriger å reversere!"
+
+msgid "There are no pending changes!"
+msgstr "Det finnes ingen endringer!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Det er ingen enhet som er tilordnet ennå, vennligst legg til en "
+"nettverksenhet i \"Fysiske Innstillinger\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Det er ikke satt noe passord på denne ruter. Vennligst konfigurer et "
+"passord, dette beskytter webgrensesnittet og aktiverer SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "Dette IPv4 adressen til relayet"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Dette er en liste med 'shell glob patterns' for å matche filer og kataloger "
+"som skal inkluderes under sysupgrade. Endrede filer i /etc/config/ og "
+"enkelte andre konfigurasjoner blir automatisk bevart."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Dette er innholdet i /etc/rc.local. Her kan du legge til egne kommandoer som "
+"blir startet ved slutten av boot sekvensen. (før 'exit 0')"
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Dette er den lokale endepunkt adressen som ble tildelt av tunnel 'broker', "
+"adressen ender vanligvis med <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Dette er den eneste <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> server i det lokale nettverket"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "Dette er systemets crontab, hvor planlagte oppgaver kan defineres."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Dette er vanligvis adressen til nærmeste PoP som drives av tunell 'broker'"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr "Denne listen gir en oversikt over kjørende prosesser og deres status."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+"Denne siden gir mulighet for å definerte egne knappers handlingsmønster"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Denne siden gir en oversikt over gjeldende aktive nettverkstilkoblinger."
+
+msgid "This section contains no values yet"
+msgstr "Denne seksjonen inneholder ennå ingen verdier"
+
+msgid "Time Synchronization"
+msgstr "Tidssynkronisering"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Tiden Synkroniseringen er ikke konfigurert ennå."
+
+msgid "Timezone"
+msgstr "Tidssone"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"For å gjenopprette konfigurasjonsfiler, kan du her laste opp et backup arkiv "
+"som ble opprettet tidligere."
+
+msgid "Total Available"
+msgstr "Totalt Tilgjengelig"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "Trafikk"
+
+msgid "Transfer"
+msgstr "Overføring"
+
+msgid "Transmission Rate"
+msgstr "Overførings rate"
+
+msgid "Transmit"
+msgstr "Sende"
+
+msgid "Transmit Power"
+msgstr "Sende styrke"
+
+msgid "Transmitter Antenna"
+msgstr "Sende Antenne"
+
+msgid "Trigger"
+msgstr "Utløser"
+
+msgid "Trigger Mode"
+msgstr "Utløsende Tilstand"
+
+msgid "Tunnel ID"
+msgstr "Tunnel ID"
+
+msgid "Tunnel Interface"
+msgstr "Tunnel grensesnitt"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Turbo Modus"
+
+msgid "Tx-Power"
+msgstr "Tx-Styrke"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Kun UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB Enhet"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Kan ikke sende"
+
+msgid "Unknown"
+msgstr "Ukjent"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Ukjent feil, passordet ble ikke endret!"
+
+msgid "Unmanaged"
+msgstr "Uhåndtert"
+
+msgid "Unsaved Changes"
+msgstr "Ulagrede Endringer"
+
+msgid "Unsupported protocol type."
+msgstr "Protokoll type er ikke støttet."
+
+msgid "Update lists"
+msgstr "Oppdater lister"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Last her opp en sysupgrade-kompatibel firmware som skal erstatte den "
+"kjørende firmware. Merk av \"Behold innstillinger\" for å beholde gjeldene "
+"konfigurasjon. (en libreCMC kompatibel firmware er nødvendig)"
+
+msgid "Upload archive..."
+msgstr "Last opp arkiv..."
+
+msgid "Uploaded File"
+msgstr "Opplastet Fil"
+
+msgid "Uptime"
+msgstr "Oppetid"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Bruk <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Bruk DHCP gateway"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Bruk DNS servere annonsert av peer"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Bruk ISO/IEC 3166 alpha2 landskoder."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Bruk MTU på tunnel grensesnitt"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Bruk TTL på tunnel grensesnitt"
+
+msgid "Use as root filesystem"
+msgstr "Bruk som rot filsystem"
+
+msgid "Use broadcast flag"
+msgstr "Bruk kringkasting flagg"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Bruk egendefinerte DNS servere"
+
+msgid "Use default gateway"
+msgstr "Bruk standard gateway"
+
+msgid "Use gateway metric"
+msgstr "Bruk gateway metrikk"
+
+msgid "Use routing table"
+msgstr "Bruk rutingtabellen"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Bruk <em>Legg til</em> knappen får å legge til en leieavtale. <em>MAC-"
+"Adresse</em> identifiserer verten, <em>IPv4-Adresse</em> angir hvilken "
+"statisk IP adresse som skal brukes og <em>Vertsnavn</em> blir symbolsk "
+"tilknyttet den anmodende verten."
+
+msgid "Used"
+msgstr "Brukt"
+
+msgid "Used Key Slot"
+msgstr "Brukte Nøkler"
+
+msgid "Username"
+msgstr "Brukernavn"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "VLAN grensesnitt"
+
+msgid "VLANs on %q"
+msgstr "VLANs på %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs på %q (%s)"
+
+msgid "VPN Server"
+msgstr "VPN server"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Leverandør klasse som sendes ved DHCP spørring"
+
+msgid "Verify"
+msgstr "Bekreft"
+
+msgid "Version"
+msgstr "Versjon"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "WEP åpent system"
+
+msgid "WEP Shared Key"
+msgstr "WEP delt nøkkel"
+
+msgid "WEP passphrase"
+msgstr "WEP passord"
+
+msgid "WMM Mode"
+msgstr "WMM Modus"
+
+msgid "WPA passphrase"
+msgstr "WPA passord"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA-Kryptering krever at wpa_supplicant (for klient-modus) eller hostapd "
+"(for AP og ad-hoc-modus) er installert."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Venter på at endringer utføres..."
+
+msgid "Waiting for command to complete..."
+msgstr "Venter på at kommando fullføres..."
+
+msgid "Warning"
+msgstr "Advarsel"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "Advarsel: Det er ulagrede endringer som vil gå tapt under omstarten!"
+
+msgid "Wifi"
+msgstr "Trådløs"
+
+msgid "Wireless"
+msgstr "Trådløs"
+
+msgid "Wireless Adapter"
+msgstr "Trådløs Tilslutning"
+
+msgid "Wireless Network"
+msgstr "Trådløst Nettverk"
+
+msgid "Wireless Overview"
+msgstr "Trådløs Oversikt"
+
+msgid "Wireless Security"
+msgstr "Trådløs Sikkerhet"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Trådløs er deaktiver eller ikke tilknyttet"
+
+msgid "Wireless is restarting..."
+msgstr "Trådløst starter på nytt..."
+
+msgid "Wireless network is disabled"
+msgstr "Trådløst nettverk er deaktivert"
+
+msgid "Wireless network is enabled"
+msgstr "Trådløst nettverk er aktivert"
+
+msgid "Wireless restarted"
+msgstr "Trådløst startet på nytt"
+
+msgid "Wireless shut down"
+msgstr "Trådløst er slått av"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Skriv mottatte DNS forespørsler til syslog"
+
+msgid "XR Support"
+msgstr "XR Støtte"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Her kan du aktivere eller deaktivere installerte oppstartsskript. Enheten må "
+"omstartes før endringene blir tatt i bruk.<br /><strong>Advarsel: Om du "
+"deaktiverer nødvendige init skript som f.eks. \"nettverk\", kan enheten bli "
+"utilgjengelig! </strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Du må aktivere Java Script i nettleseren din ellers vil ikke LuCI fungere "
+"skikkelig."
+
+msgid "any"
+msgstr "enhver"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "brokoblet"
+
+msgid "create:"
+msgstr "opprett:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "Oppretter en bro mellom angitte grensesnitt"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "Deaktiver"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "utgått"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"filen der gitt <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leier vil bli lagret"
+
+msgid "forward"
+msgstr "videresend"
+
+msgid "full-duplex"
+msgstr "full-dupleks"
+
+msgid "half-duplex"
+msgstr "halv-dupleks"
+
+msgid "help"
+msgstr "Hjelp"
+
+msgid "hidden"
+msgstr "skjult"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "Dersom målet er et nettverk"
+
+msgid "input"
+msgstr "inndata"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "lokal <abbr title=\"Domain Navn System\">DNS</abbr>-fil"
+
+msgid "no"
+msgstr "nei"
+
+msgid "no link"
+msgstr "ingen forbindelse"
+
+msgid "none"
+msgstr "ingen"
+
+msgid "off"
+msgstr "av"
+
+msgid "on"
+msgstr "på"
+
+msgid "open"
+msgstr "Ã¥pen"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "rutet"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "tagget"
+
+msgid "unknown"
+msgstr "ukjent"
+
+msgid "unlimited"
+msgstr "ubegrenset"
+
+msgid "unspecified"
+msgstr "uspesifisert"
+
+msgid "unspecified -or- create:"
+msgstr "uspesifisert --eller-- opprett:"
+
+msgid "untagged"
+msgstr "utagget"
+
+msgid "yes"
+msgstr "ja"
+
+msgid "« Back"
+msgstr "« Tilbake"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "HE.net bruker ID"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr "Dette er det 32 byte hexkodede bruker ID'en, ikke påloggingsnavnet"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz, Sekundær kanal over"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz, Sekundær kanal under"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Godta ruterkunngjøringer"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Annonser IPv6 på nettverket"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Annonsert nettverks ID"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Det tillatte området er fra 1 til 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT Muligheter"
+
+#~ msgid "HT mode"
+#~ msgstr "HT Modus"
+
+#~ msgid "Router Model"
+#~ msgstr "Ruter Modell"
+
+#~ msgid "Router Name"
+#~ msgstr "Ruter Navn"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Send ruter anmodninger"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "Angir den annonserte foretrukne prefikslevetiden i sekunder"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Angir den annonserte gyldige prefikslevetiden i sekunder"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Bruk foretrukket levetid"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Bruk gyldig levetid"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Venter på ruter..."
+
+#~ msgid "Active Leases"
+#~ msgstr "Aktive leier"
+
+#~ msgid "Open"
+#~ msgstr "Åpne"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Bithastighet"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Konfigurasjon / Bruk"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Konfigurasjon / Endringer"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Konfigurasjon / Tilbakestill"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "MAC adresse"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encrypted\">Kryptert</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Skanning"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Velg det nettverket du ønsker å knytte til dette trådløse grensesnittet. "
+#~ "Velg <em>uspesifisert</em> for ikke tilknytte noe nettverk, eller fyll ut "
+#~ "<em>opprett</em> feltet for å definere et nytt nettverk."
+
+#~ msgid "Create Network"
+#~ msgstr "Opprett Nettverk"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Networks"
+#~ msgstr "Nettverk"
+
+#~ msgid "Power"
+#~ msgstr "Styrke"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Trådløse nettverk i nærheten av deg"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notasjon: "
+#~ "adresse/prefiks"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr ""
+#~ "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Kringkasting"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Adresse"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "IP aliaser"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "IPv6 oppsett"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Vær oppmerksom på at om du velger et grensesnitt som allerede er med et "
+#~ "annet nettverk, blir det flyttet til dette nettverket"
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Fjerne dette grensesnittet? Slettingen kan ikke omgjøres!\\nDu kan miste "
+#~ "kontakten med ruteren om du er tilkoblet via dette grensesnittet."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Fjerne dette trådløse nettverket? Slettingen kan ikke omgjøres!\\nDu kan "
+#~ "miste kontakten med ruteren om du er tilkoblet via dette nettverket."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Slå av dette grensesnittet? \"%s\" ?\\nDu kan miste kontakten med ruteren "
+#~ "om du er tilkoblet via dette grensesnittet."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Nettverks portene på ruteren kan kombineres til flere <abbr title="
+#~ "\"Virtual Lokal Network\">VLAN</abbr>s der datamaskiner kan kommunisere "
+#~ "direkte med hverandre. <abbr title=\"Virtual Lokal Network\">VLAN</abbr>s "
+#~ "brukes ofte for å skille ulike nettverk segmenter. Det er vanlig og ha en "
+#~ "uplink-port for tilkobling til større nettverk som internett og andre "
+#~ "porter til lokalt nettverk."
+
+#~ msgid "Custom Files"
+#~ msgstr "Egendefinerte Filer"
+
+#~ msgid "Custom files"
+#~ msgstr "Egendefinerte filer"
+
+#~ msgid "Detected Files"
+#~ msgstr "Filer funnet"
+
+#~ msgid "Detected files"
+#~ msgstr "Filer funnet"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Beholde filer ved programvare oppgradering"
+
+#~ msgid "General"
+#~ msgstr "Generelt"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr "Her kan du endre innstillinger og funksjonaliteten til LuCI."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Aktiver endringer"
+
+#~ msgid ""
+#~ "The following files are detected by the system and will be kept "
+#~ "automatically during sysupgrade"
+#~ msgstr ""
+#~ "Følgende filer er oppdaget av systemet og vil automatisk bli bevart under "
+#~ "systemoppgradering"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Disse endringene vil bli utført automatisk når en <abbr title=\"Unified "
+#~ "Configuration Interface\">UCI</abbr> konfigurasjon brukes, endringen trer "
+#~ "i kraft umiddelbart."
+
+#~ msgid ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+#~ msgstr ""
+#~ "Dette er en liste med filer og regler som skal inkluderes ved "
+#~ "systemoppgradering"
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web Brukergrensesnitt"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+
+#~ msgid "AHCP Settings"
+#~ msgstr "AHCP Innstillinger"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "ARP ping forsøk"
+
+#~ msgid "ATM Settings"
+#~ msgstr "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr>Innstillinger"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "Godta Ruter Annonseringer"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Aksesspunkt (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Andre pppd alternativer"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "Det tillatte området er 1 til FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Automatisk nedkobling"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Sikkerhetskopi arkiv"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Konfigurer den lokale DNS-serveren slik at den bruker navnetjeneren som "
+#~ "blir gitt av PPP peer"
+
+#~ msgid "Connect script"
+#~ msgstr "Oppkoblings skript"
+
+#~ msgid "Create backup"
+#~ msgstr "Lag sikkerhetskopi"
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Frakoblings skript"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Endre pakke-liste og installasjon mål"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "Aktiver 4K VLANs"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Aktiver IPv6 på PPP lenke"
+
+#~ msgid "Firmware image"
+#~ msgstr "Firmware fil"
+
+#~ msgid "Forward DHCP"
+#~ msgstr "Videresend DHCP"
+
+#~ msgid "Forward broadcasts"
+#~ msgstr "Videresend broadcast"
+
+#~ msgid "HE.net Tunnel ID"
+#~ msgstr "HE.net Tunnel ID"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Her kan du ta sikkerhetskopi og gjenopprette ruterens konfigurasjon og -"
+#~ "om mulig- tilbakestille ruteren til standardinnstillingene."
+
+#~ msgid "Installation targets"
+#~ msgstr "Installasjon mål"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Behold konfigurasjonsfiler"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid "Kernel"
+#~ msgstr "Kjerne"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Etter vellykket oppkobling, la pppd erstatte standard rute og sett den "
+#~ "opp for PPP-grensesnittet"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "La pppd kjøre dette skriptet etter PPP oppkobling"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "La pppd kjøre dette skriptet før frakobling av PPP lenke"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Pass på at du oppgir riktig PIN-kode her, om ikke kan du låse SIM-kortet!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "De fleste av dem er nettverkstjenere som tilbyr tjenester på enheten "
+#~ "eller nettverket. Som f.eks. shell tilgang, webserver for <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, mesh ruting, sende e-"
+#~ "post, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Antallet mislykkede forsøk på forbindelse før automatisk oppkobling blir "
+#~ "initiert."
+
+#~ msgid "Override Gateway"
+#~ msgstr "Overstyr Gateway"
+
+#~ msgid "PIN code"
+#~ msgstr "PIN kode"
+
+#~ msgid "PPP Settings"
+#~ msgstr "PPP Innstillinger"
+
+#~ msgid "Package lists"
+#~ msgstr "Pakke-lister"
+
+#~ msgid ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> specify the default "
+#~ "VLAN ID added to received untagged frames."
+#~ msgstr ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> spesifiserer standard "
+#~ "VLAN ID som legges på mottatte utaggete ethernet-rammer.<br />"
+
+#~ msgid "Port PVIDs on %q"
+#~ msgstr "Port PVIDs på %q"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Fortsette tilbakestilling av alle innstillinger til standard?"
+
+#~ msgid "Processor"
+#~ msgstr "Prosessor"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radius-Port"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radius-Server"
+
+#~ msgid "Relay Settings"
+#~ msgstr "Relay Innstillinger"
+
+#~ msgid "Replace default route"
+#~ msgstr "Erstatt standard rute"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Tilbakestill ruteren til standard innstilling"
+
+#~ msgid "Routing table ID"
+#~ msgstr "Ruting tabell ID"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr "Antall sekunder en må vente før modemet er klar for oppkobling"
+
+#~ msgid "Send Router Solicitiations"
+#~ msgstr "Send Ruter Anmodninger"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "Server IPv4-Adresse"
+
+#~ msgid "Service type"
+#~ msgstr "Tjeneste type"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "Tjenester og daemoner utfører forskjellige oppgaver på enheten."
+
+#~ msgid "Settings"
+#~ msgstr "Innstillinger"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Initialiserings ventetid"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Beklager. libreCMC støtter ikke systemoppgradering på denne plattformen."
+#~ "<br /> Du må flashe enheten manuelt."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Angi flere kommandolinje argumenter for pppd her"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Node enheten for modemet, f.eks. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "Tid (i sekunder) før ubrukt forbindelse vil bli frakoblet"
+
+#~ msgid "Time Server (rdate)"
+#~ msgstr "Tids Server (rdate)"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "Tunnel Innstillinger"
+
+#~ msgid "Update package lists"
+#~ msgstr "Oppdater pakke-listene"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr ""
+#~ "Last opp en libreCMC Firmware fil, som deretter blir brukt til å "
+#~ "oppgradere enheten."
+
+#~ msgid "Upload image"
+#~ msgstr "Last opp firmware"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Bruk peer DNS"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid ""
+#~ "You can specify multiple DNS servers here, press enter to add a new "
+#~ "entry. Servers entered here will override automatically assigned ones."
+#~ msgstr ""
+#~ "Her kan du definere flere DNS servere, trykk 'Enter' for å legge til en "
+#~ "ny oppføring. Servere definert her vil overstyre de automatisk tildelte."
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Du må installere \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA eller \"pptp\" for PPtP støtte"
+
+#~ msgid "back"
+#~ msgstr "tilbake"
+
+#~ msgid "buffered"
+#~ msgstr "bufret"
+
+#~ msgid "cached"
+#~ msgstr "hurtigbufrede"
+
+#~ msgid "free"
+#~ msgstr "tilgjengelig"
+
+#~ msgid "static"
+#~ msgstr "Statisk"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> er en samling av "
+#~ "fri Lua programvare som inkluderer <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework og webgrensnitt for innebygde enheter. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> er lisensert under "
+#~ "Apache-lisensen."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Nøkler"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr "En lettvekts HTTP/1.1 webserver skrevet i C og Lua laget for LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "En lettvekts webserver som kan brukes til å tjene <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "Aktive IP tilkoblinger"
+
+#~ msgid "Addresses"
+#~ msgstr "Adresser"
+
+#~ msgid "Admin Password"
+#~ msgstr "Admin Passord"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Passord beskyttet område"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Bro Port"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr "Endre passordet for systemansvarlig (Bruker <code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Klient + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Konfigurasjonsfil"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Tidsavbrudd for tilkobling"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Medvirkende utviklere"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP tildelt"
+
+#~ msgid "Document root"
+#~ msgstr "Dokument-roten"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Aktiver Keep-Alive"
+
+#~ msgid "Enable device"
+#~ msgstr "Aktiver enhet"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Ethernet Bro"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Her kan du lime inn felles <abbr title=\"Secure Shell\">SSH</abbr>-nøkler "
+#~ "(en per linje) for <abbr title=\"Secure Shell\">SSH</abbr> godkjenning."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "IP Konfigurasjon"
+
+#~ msgid "Interface Status"
+#~ msgstr "Grensesnitt Status"
+
+#~ msgid "Lead Development"
+#~ msgstr "Hovedutviklere"
+
+#~ msgid "Master"
+#~ msgstr "Aksesspunkt"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Aksesspunkt + WDS"
+
+#~ msgid "No address configured on this interface."
+#~ msgstr "Ingen adresse er konfigurert på dette grensesnittet."
+
+#~ msgid "Not configured"
+#~ msgstr "Ikke konfigurert"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Passordet er endret"
+
+#~ msgid "Plugin path"
+#~ msgstr "Plugin sti"
+
+#~ msgid "Ports"
+#~ msgstr "Porter"
+
+#~ msgid "Primary"
+#~ msgstr "Primær"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Prosjektets Hjemmeside"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Takk til"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr "Beskrivelse av passord beskyttet område, vises ved innlogging."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Ukjent feil"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "Standard <code>/etc/httpd.conf</code>"
+
+#~ msgid "Enable this switch"
+#~ msgstr "Aktiver denne svitsj"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG feil kode %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Pakke-listene oppdatert"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "Nullstill svitsj under oppstart"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Oppgrader installerte pakker"
diff --git a/trunk/package/luci/po/no/commands.po b/trunk/package/luci/po/no/commands.po
new file mode 100644
index 00000000..29b76e5a
--- /dev/null
+++ b/trunk/package/luci/po/no/commands.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-03-25 23:38+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language-Team: none\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "En kort tekstlig beskrivelse av den konfigurerte kommandoen"
+
+msgid "Access command with"
+msgstr "Åpne kommandoen med"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Tillat å utføre kommandoen og laste ned resultatet uten forutgående "
+"godkjenning"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Tillat brukeren å gi ytterligere kommandolinjeargumenter"
+
+msgid "Arguments:"
+msgstr "Argumenter:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Binære data vises ikke, last ned i stedet."
+
+msgid "Code:"
+msgstr "Kode:"
+
+msgid "Collecting data..."
+msgstr "Henter data..."
+
+msgid "Command"
+msgstr "Kommando"
+
+msgid "Command failed"
+msgstr "Kommando feilet"
+
+msgid "Command line to execute"
+msgstr "Kommandolinje å utføre"
+
+msgid "Command successful"
+msgstr "Kommando vellykket"
+
+msgid "Command:"
+msgstr "Kommando:"
+
+msgid "Configure"
+msgstr "Konfigurer"
+
+msgid "Custom Commands"
+msgstr "Egendefinerte Kommandoer"
+
+msgid "Custom arguments"
+msgstr "Egendefinerte argumenter"
+
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgid "Description"
+msgstr "Beskrivelse"
+
+msgid "Download"
+msgstr "Nedlasting"
+
+msgid "Failed to execute command!"
+msgstr "Kunne ikke utføre kommandoen!"
+
+msgid "Link"
+msgstr "Link"
+
+msgid "Loading"
+msgstr "Laster"
+
+msgid "Public access"
+msgstr "Tilgjengelig for alle"
+
+msgid "Run"
+msgstr "Kjør"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Denne siden lar deg konfigurere egendefinerte shell-kommandoer som lett kan "
+"startes fra webgrensesnittet."
+
+msgid "Waiting for command to complete..."
+msgstr "Venter på at kommandoen fullføres..."
diff --git a/trunk/package/luci/po/no/coovachilli.po b/trunk/package/luci/po/no/coovachilli.po
new file mode 100644
index 00000000..f37afdd5
--- /dev/null
+++ b/trunk/package/luci/po/no/coovachilli.po
@@ -0,0 +1,26 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-04-05 08:41+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language-Team: none\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Nettverk Konfigurasjon"
+
+msgid "RADIUS configuration"
+msgstr "RADIUS Konfigurasjon"
+
+msgid "UAM and MAC Authentication"
+msgstr "UAM og MAC Autentisering"
diff --git a/trunk/package/luci/po/no/ddns.po b/trunk/package/luci/po/no/ddns.po
new file mode 100644
index 00000000..50b313a1
--- /dev/null
+++ b/trunk/package/luci/po/no/ddns.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Check for changed IP every"
+msgstr "Undersøk om IP er endret hver"
+
+msgid "Check-time unit"
+msgstr "Tidsenhet"
+
+msgid "Custom update-URL"
+msgstr "Egendefinert oppdaterings-URL"
+
+msgid "Dynamic DNS"
+msgstr "Dynamisk DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Dynamisk DNS tillater at enheten kan kontaktes ved hjelp av et fast "
+"vertsnavn, uavhengig av om IP adressen endres dynamisk."
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Force update every"
+msgstr "Tving oppdatering hver"
+
+msgid "Force-time unit"
+msgstr "Tidsenhet"
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "Interface"
+msgstr "Grensesnitt"
+
+msgid "Network"
+msgstr "Nettverk"
+
+msgid "Password"
+msgstr "Passord"
+
+msgid "Service"
+msgstr "Tjeneste"
+
+msgid "Source of IP address"
+msgstr "Kilden til IP adresse"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Brukernavn"
+
+msgid "custom"
+msgstr "egendefinert"
+
+msgid "h"
+msgstr "timer"
+
+msgid "interface"
+msgstr "grensesnitt"
+
+msgid "min"
+msgstr "minutter"
+
+msgid "network"
+msgstr "nettverk"
diff --git a/trunk/package/luci/po/no/diag_core.po b/trunk/package/luci/po/no/diag_core.po
new file mode 100644
index 00000000..4955d473
--- /dev/null
+++ b/trunk/package/luci/po/no/diag_core.po
@@ -0,0 +1,35 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Configure Diagnostics"
+msgstr "Konfigurer Diagnostikk"
+
+msgid "Diagnostics"
+msgstr "Diagnostikk"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Diagnostikken tilgjengelig under denne menyen avhenger av hvilke moduler du "
+"har installert på enheten."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Oppføringene i menyen lar deg utføre diagnostiske tester på systemet ditt "
+"til hjelp ved feilsøking."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Her kan du konfigurere nettverks diagnostikk, som skanning etter nettverks "
+"enheter og ping tester."
+
+#~ msgid "l_d_diag"
+#~ msgstr "Nettverks Diagnostikk"
diff --git a/trunk/package/luci/po/no/diag_devinfo.po b/trunk/package/luci/po/no/diag_devinfo.po
new file mode 100644
index 00000000..4ada96ba
--- /dev/null
+++ b/trunk/package/luci/po/no/diag_devinfo.po
@@ -0,0 +1,213 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Actions"
+msgstr "Handlinger"
+
+msgid "Add"
+msgstr "Legg til"
+
+msgid "Beginning of MAC address range"
+msgstr "Begynnelsen av MAC adresseområde"
+
+msgid "Config Phone Scan"
+msgstr "Konfigurer Telefon Skanning"
+
+msgid "Configure"
+msgstr "Konfigurer"
+
+msgid "Configure Scans"
+msgstr "Konfigurer Skanning"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Konfigurer skanning etter enheter på angitte nettverk. Ved å minske verdiene "
+"til 'Tidsavbrudd', 'Gjentagelser' og/eller Tid mellom forespørsler blir "
+"skanningen utført raskere, men det kan også medføre at noen enheter ikke "
+"blir funnet."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Konfigurer skanning etter støttede SIP enheter på angitte nettverk. Ved å "
+"minske verdiene til 'Tidsavbrudd', 'Gjentagelser' og/eller tid mellom "
+"forespørsler blir skanningen utført raskere, men det kan også medføre at "
+"noen enheter ikke blir funnet."
+
+msgid "Delete"
+msgstr "Slett"
+
+msgid "Device Scan Config"
+msgstr "Enhets skann konfigurasjon"
+
+msgid "Device Type"
+msgstr "Enhets type"
+
+msgid "Devices discovered for"
+msgstr "Enheter oppdaget for"
+
+msgid "Devices on Network"
+msgstr "Enheter i Nettverket"
+
+msgid "Edit"
+msgstr "Rediger"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "End of MAC address range"
+msgstr "Slutten av MAC område"
+
+msgid "Go to relevant configuration page"
+msgstr "GÃ¥ til relevant konfigurasjons side"
+
+msgid "IP Address"
+msgstr "IP Adresse"
+
+msgid "Interface"
+msgstr "Grensesnitt"
+
+msgid "Invalid"
+msgstr "Ugyldig"
+
+msgid "Link to Device"
+msgstr "Link til Enhet"
+
+msgid "MAC Address"
+msgstr "MAC Adresse"
+
+msgid "MAC Device Info Overrides"
+msgstr "MAC Enhets Info Overstyring"
+
+msgid "MAC Device Override"
+msgstr "MAC Enhets Overstyring"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"MAC område og informasjon brukt til å overstyre system og IEEE databaser"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Antall millisekunder ventetid mellom forespørsler (standard 100)"
+
+msgid "Model"
+msgstr "Modell"
+
+msgid "Name"
+msgstr "Navn"
+
+msgid "Network Device Scan"
+msgstr "Nettverks Enhets Skanning"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Nettverks Enhets Skanning Konfigurasjon"
+
+msgid "Networks to scan for devices"
+msgstr "Nettverk som blir skannet"
+
+msgid "Networks to scan for supported devices"
+msgstr "Nettverk som blir skannet for støttede enheter"
+
+msgid "No SIP devices"
+msgstr "Ingen SIP enheter"
+
+msgid "No devices detected"
+msgstr "Ingen enheter oppdaget"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Antall ganger å sende forespørsel (standard 1)"
+
+msgid "OUI Owner"
+msgstr "OUI Eier"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Overstyr informasjonen hentet fra MAC til enhets info skriptet (mac-til-"
+"devinfo) for et gitt område med MAC adresser"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Utfør Skanning (dette kan ta noen minutter)"
+
+msgid "Phone Information"
+msgstr "Telefon Informasjon"
+
+msgid "Phone Scan"
+msgstr "Telefon skanning"
+
+msgid "Phone Scanning Configuration"
+msgstr "Telefon skanning konfigurasjon"
+
+msgid "Phones"
+msgstr "Telefoner"
+
+msgid "Ports"
+msgstr "Porter"
+
+msgid "Raw"
+msgstr "RÃ¥"
+
+msgid "Repeat Count"
+msgstr "Gjentagelser"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Gjennta Skanning (dette kan ta noen minutter)"
+
+msgid "SIP Device Information"
+msgstr "SIP Enhets Informasjon"
+
+msgid "SIP Device Scan"
+msgstr "SIP Enhets Skanning"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "SIP Enhets Skann Konfigurasjon"
+
+msgid "SIP Devices on Network"
+msgstr "SIP Enheter i Nettverket"
+
+msgid "SIP devices discovered for"
+msgstr "SIP enheter oppdaget på"
+
+msgid "Scan for devices on specified networks."
+msgstr "Skann etter enheter på spesifiserte nettverk"
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Skann etter SIP enheter på spesifiserte nettverk"
+
+msgid "Scanning Configuration"
+msgstr "Skanning Konfigurasjon"
+
+msgid "Scans for devices on specified networks."
+msgstr "Nettverks Skanning Informasjon"
+
+msgid "Sleep Between Requests"
+msgstr "Tid mellom forespørsler"
+
+msgid "Subnet"
+msgstr "Subnett"
+
+msgid "This section contains no values yet"
+msgstr "Denne seksjonen inneholder ennå ingen verdier"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Tid for å vente på svar i sekunder (standard 10)"
+
+msgid "Timeout"
+msgstr "Tidsavbrudd"
+
+msgid "Use Configuration"
+msgstr "Bruk Konfigurasjonen"
+
+msgid "Vendor"
+msgstr "Leverandør"
+
+msgid "check other networks"
+msgstr "skjekk andre nettverk"
diff --git a/trunk/package/luci/po/no/ffwizard.po b/trunk/package/luci/po/no/ffwizard.po
new file mode 100644
index 00000000..3b13704d
--- /dev/null
+++ b/trunk/package/luci/po/no/ffwizard.po
@@ -0,0 +1,159 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/no/firewall.po b/trunk/package/luci/po/no/firewall.po
new file mode 100644
index 00000000..e49f3ac9
--- /dev/null
+++ b/trunk/package/luci/po/no/firewall.po
@@ -0,0 +1,565 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2013-03-25 16:42+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language: no\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s i %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s med %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s i %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(oppføring uten navn)"
+
+msgid "(Unnamed Rule)"
+msgstr "(regel uten navn)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT uten navn)"
+
+msgid "-- Please choose --"
+msgstr "-- Vennligst velg --"
+
+msgid "-- custom --"
+msgstr "-- egendefinert --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> pakker per <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> pakker per <var>%s</var>, burst <var>%d</var>pakker."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> og begrens til %s"
+
+msgid "Action"
+msgstr "Handling"
+
+msgid "Add"
+msgstr "Legg til"
+
+msgid "Add and edit..."
+msgstr "Legg til og redigere..."
+
+msgid "Advanced Settings"
+msgstr "Avanserte Innstillinger"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Tillat videresending fra <em>kilde soner</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Tillat videresending til <em>destinasjon soner</em>:"
+
+msgid "Any"
+msgstr "Enhver"
+
+msgid "Covered networks"
+msgstr "Gjeldene nettverk"
+
+msgid "Custom Rules"
+msgstr "Egendefinerte Regler"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Egendefinerte regler tillater deg å utføre vilkårlige iptables kommandoer "
+"som ikke dekkes av brannmurens standardoppsett. Kommandoene utføres etter "
+"hver omstart av brannmuren, rett etter at standard regelsett er lastet."
+
+msgid "Destination IP address"
+msgstr "Destinasjon IP adresse"
+
+msgid "Destination address"
+msgstr "Destinasjon adresse"
+
+msgid "Destination port"
+msgstr "Destinasjon port"
+
+msgid "Destination zone"
+msgstr "Destinasjon sone"
+
+msgid "Do not rewrite"
+msgstr "Ikke omskriv"
+
+msgid "Drop invalid packets"
+msgstr "Forkast ugyldige pakker"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Enable NAT Loopback"
+msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
+
+msgid "Enable SYN-flood protection"
+msgstr "Aktiver SYN-flood beskyttelse"
+
+msgid "Enable logging on this zone"
+msgstr "Aktiver logging av denne sonen"
+
+msgid "External IP address"
+msgstr "Ekstern IP adressse"
+
+msgid "External port"
+msgstr "Ekstern port"
+
+msgid "External zone"
+msgstr "Ekstern sone"
+
+msgid "Extra arguments"
+msgstr "Ekstra argumenter"
+
+msgid "Firewall"
+msgstr "Brannmur"
+
+msgid "Firewall - Custom Rules"
+msgstr "Brannmur - Egendefinerte Regler"
+
+msgid "Firewall - Port Forwards"
+msgstr "Brannmur - Port Videresending"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Brannmur - Trafikk Regler"
+
+msgid "Firewall - Zone Settings"
+msgstr "Brannmur - Sone Innstillinger"
+
+msgid "Force connection tracking"
+msgstr ""
+"Bruk <abbr title=\\\"connection tracking\\\">forbindelse sporing</abbr>"
+
+msgid "Forward"
+msgstr "Videresend"
+
+msgid "Forward to"
+msgstr "Videresend til"
+
+msgid "From %s in %s"
+msgstr "Fra %s i %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Fra %s i %s med kilde %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Fra %s i %s med kilde %s og %s"
+
+msgid "General Settings"
+msgstr "Generelle Innstillinger"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 og IPv6"
+
+msgid "IPv4 only"
+msgstr "Kun IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Kun IPv6"
+
+msgid "Input"
+msgstr "Inndata"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Sone til Sone Videresending"
+
+msgid "Internal IP address"
+msgstr "Intern IP adresse"
+
+msgid "Internal port"
+msgstr "Intern port"
+
+msgid "Internal zone"
+msgstr "Intern sone"
+
+msgid "Limit log messages"
+msgstr "Begrens logging"
+
+msgid "MSS clamping"
+msgstr "MSS Kontroll (Clamping)"
+
+msgid "Masquerading"
+msgstr "Masquerading"
+
+msgid "Match"
+msgstr "Match"
+
+msgid "Match ICMP type"
+msgstr "Match ICMP type"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Match videresendt trafikk til den oppgitte destinasjonsport eller "
+"portområdet."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Match innkommende trafikk rettet mot den oppgitte destinasjonsport eller "
+"portområdet på denne verten"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Match innkommende trafikk som kommer fra den oppgitte kildeport eller "
+"portområdet på klienten."
+
+msgid "Name"
+msgstr "Navn"
+
+msgid "New SNAT rule"
+msgstr "Ny SNAT regel"
+
+msgid "New forward rule"
+msgstr "Ny videresending regel"
+
+msgid "New input rule"
+msgstr "Ny inndata regel"
+
+msgid "New port forward"
+msgstr "Ny port videresending"
+
+msgid "New source NAT"
+msgstr "Ny kilde NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Match kun innkommende trafikk fra disse MAC adresser."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Match kun innkommende trafikk fra denne IP eller IP område."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Match kun innkommende trafikk som kommer fra den oppgitte kildeport eller "
+"fra portområdet til klienten"
+
+msgid "Open ports on router"
+msgstr "Åpne porter på ruteren"
+
+msgid "Other..."
+msgstr "Andre..."
+
+msgid "Output"
+msgstr "Utdata"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
+
+msgid "Port Forwards"
+msgstr "Port Videresendinger"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"Port videresending tillater at eksterne datamaskiner på Internett kan koble "
+"seg til en bestemt maskin eller tjeneste innenfor det private LAN."
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Viderekoble matchet innkommende trafikk til den oppgitte porten på intern "
+"vert"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Viderekoble matchet innkommende trafikk til den angitte interne vert"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
+
+msgid "Restrict to address family"
+msgstr "Begrens til adresse familie"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Omskriv matchet trafikk til den oppgitte adressen."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Omskriv matchet trafikk til den oppgitte kildeport. Kan stå tom for kun "
+"omskriving av IP adressen."
+
+msgid "Rewrite to source %s"
+msgstr "Omskriv til kilde %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Omskriv til kilde %s, %s"
+
+msgid "SNAT IP address"
+msgstr "SNAT IP adresse"
+
+msgid "SNAT port"
+msgstr "SNAT port"
+
+msgid "Source IP address"
+msgstr "Kilde IP adresse"
+
+msgid "Source MAC address"
+msgstr "Kilde MAC adresse"
+
+msgid "Source NAT"
+msgstr "Kilde NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Kilde NAT er en spesifikk form for masquerading som tillater finkornet "
+"kontroll over kilde IP adressen som brukes for utgående trafikk, for "
+"eksempel for å mappe flere WAN adresser til interne subnett."
+
+msgid "Source address"
+msgstr "Kilde adresse"
+
+msgid "Source port"
+msgstr "Kilde port"
+
+msgid "Source zone"
+msgstr "Kilde sone"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Brannmuren skaper soner over nettverkets grensesnitt for å styre "
+"nettverkstrafikken."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Med valgene under konfigurerer man videresending mellom denne sone (%s) og "
+"andre soner. <em>Destinasjons soner</em> omhandler videresendt trafikk "
+"<strong>med opprinnelse fra %q</strong>. <em>Kilde soner</em> matcher "
+"videresendt trafikk fra andre soner <strong>rettet mot %q</strong>. Reglene "
+"ved videresending er <em>enveis</em>, d.v.s at videresending fra LAN til WAN "
+"<em>ikke</em> automatisk også tillater videresending fra WAN til LAN."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Denne siden lar deg endre avanserte egenskaper til port videresending "
+"oppføringer. I de fleste tilfeller er det ikke nødvendig å endre disse "
+"innstillingene."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Denne siden lar deg endre de avanserte egenskapene til trafikken regel "
+"oppføringer, som for eksempel matchet kilde og destinasjons vert."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Denne seksjonen definerer de vanligste valg for %q. Med <em>Inndata</em> og "
+"<em>Utdata</em> fastsetter man vanlige regler for trafikk gjennom sonen, "
+"mens <em>videresend</em> valget definerer regler for videresendt trafikk "
+"mellom forskjellige nettverk i sonen. <em>Gjeldene nettverk</em> "
+"spesifiserer hvilken av de tilgjengelige nettverk som er medlem av denne "
+"sone."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "Til %s på %s på <var>denne enheten</var>"
+
+msgid "To %s in %s"
+msgstr "Til %s i %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "Til %s på <var>denne enheten</var>"
+
+msgid "To %s, %s in %s"
+msgstr "Til %s, %s i %s"
+
+msgid "To source IP"
+msgstr "Til kilde IP"
+
+msgid "To source port"
+msgstr "Til kilde port"
+
+msgid "Traffic Rules"
+msgstr "Trafikk Regler"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Trafikk regler definerer regler for sending av pakker mellom ulike soner, "
+"for eksempel for å avvise trafikk mellom visse verter eller for å åpne WAN "
+"porter på ruteren."
+
+msgid "Via %s"
+msgstr "Via %s"
+
+msgid "Via %s at %s"
+msgstr "Via %s på %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Du kan spesifisere flere ved å velge \"-- egendefinert --\" og deretter "
+"skrive flere protokoller atskilt med mellomrom."
+
+msgid "Zone %q"
+msgstr "Sone %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Sone = Videresendinger"
+
+msgid "Zones"
+msgstr "Soner"
+
+msgid "accept"
+msgstr "godta"
+
+msgid "any"
+msgstr "enhver"
+
+msgid "any host"
+msgstr "enhver vert"
+
+msgid "any router IP"
+msgstr "enhver ruter IP"
+
+msgid "any zone"
+msgstr "enhver sone"
+
+msgid "don't track"
+msgstr "ikke track"
+
+msgid "drop"
+msgstr "forkast"
+
+msgid "reject"
+msgstr "avslå"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Destinasjon"
+
+#~ msgid "Family"
+#~ msgstr "Adressefamilie"
+
+#~ msgid "Source"
+#~ msgstr "Kilde"
+
+#~ msgid "Via"
+#~ msgstr "Via"
+
+#~ msgid "(optional)"
+#~ msgstr "(valgfritt)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "Ønsket destinasjon adresse"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Intern port (valgfritt)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Avanserte Valg"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Avanserte Regler"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Avanserte regler lar deg tilpasse brannmuren til dine behov. Kun nye "
+#~ "tilkoblinger blir berørt. Pakker som tilhører eksisterende tilkoblinger "
+#~ "slipper derfor igjennom brannmuren."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Egendefinerte Regler (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Enhet"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "DNAT: Matcher innkommende trafikk som er rettet mot destinasjons IP-"
+#~ "adressen du angir her. SNAT: Omskriver kilde IP-adressen slik at den blir "
+#~ "lik den IP-adressen du angir her."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr "Match innkommende trafikk som kommer fra dette port/portområde"
+
+#~ msgid "Overview"
+#~ msgstr "Oversikt"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Port Videresending"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "<abbr title=\"Port Forwarding\">Port Videresending</abbr> tillater at "
+#~ "tjenester fra det interne nettverket kan tilbys et eksternt nettverk."
+
+#~ msgid "Redirection type"
+#~ msgstr "Omadressering type"
+
+#~ msgid "Redirections"
+#~ msgstr "Omadresseringer"
+
+#~ msgid "Rules"
+#~ msgstr "Regler"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Trafikk Omadressering"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "<abbr title=\"Traffic Redirection\">Trafikk Omadressering</abbr> lar deg "
+#~ "endre destinasjons adresse på videresendte pakker."
diff --git a/trunk/package/luci/po/no/freifunk-policyrouting.po b/trunk/package/luci/po/no/freifunk-policyrouting.po
new file mode 100644
index 00000000..3c9a17e0
--- /dev/null
+++ b/trunk/package/luci/po/no/freifunk-policyrouting.po
@@ -0,0 +1,39 @@
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/no/freifunk.po b/trunk/package/luci/po/no/freifunk.po
new file mode 100644
index 00000000..62df8b9f
--- /dev/null
+++ b/trunk/package/luci/po/no/freifunk.po
@@ -0,0 +1,430 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr "Grunnleggende Innstillinger"
+
+msgid "Basic settings"
+msgstr "Grunnleggende innstillinger"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Grunnleggende innstillinger er mangelfull. GÃ¥ til"
+
+msgid "Basic system settings"
+msgstr "Grunnleggende system innstillinger"
+
+msgid "Bitrate"
+msgstr "Bithastighet"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr "Se etter nye firmware-versjoner og utfør automatiske oppdatering."
+
+msgid "Client network size"
+msgstr "Klient nettverk størrelse"
+
+msgid "Community"
+msgstr "Sted"
+
+msgid "Community profile"
+msgstr "Sted profil"
+
+msgid "Community settings"
+msgstr "Sted innstillinger"
+
+msgid "Confirm Upgrade"
+msgstr "Bekreft Oppgradering"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "Kontaktinformasjonen er mangelfull. GÃ¥ til"
+
+msgid "Coordinates"
+msgstr "Koordinater"
+
+msgid "Country code"
+msgstr "Landskode"
+
+msgid "Default routes"
+msgstr "Standard ruter"
+
+msgid "Disable default content"
+msgstr "Deaktiver standard innhold"
+
+msgid "Diversity is enabled for device"
+msgstr "Antennevariasjon er aktivert på enhet"
+
+msgid "E-Mail"
+msgstr "E-Post"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "Rediger indeks side"
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "Feil"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Finn koordinatene dine med OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Freifunk Oversikt"
+
+msgid "Freifunk Remote Update"
+msgstr "Freifunk Fjernkontrollert Oppgradering"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Go to"
+msgstr "GÃ¥ til"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr "Hei og velkommen til nettverket av"
+
+msgid "Hide OpenStreetMap"
+msgstr "Skjul OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Hjemmeside"
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr "Om valgt vises ikke det vanlige innholdselementet"
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Hvis du er interessert i prosjektet vårt så ta kontakt med en lokale gruppe "
+"på"
+
+msgid "Index Page"
+msgstr "Indeks Side"
+
+msgid "Interface"
+msgstr "Grensesnitt"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Internett tilgang er avhengig av tekniske og organisatoriske forhold, defor "
+"er det ikke sikkert det fungerer for deg."
+
+msgid "It is operated by"
+msgstr "Det drives av"
+
+msgid "Keep configuration"
+msgstr "Behold konfigurasjonen"
+
+msgid "Latitude"
+msgstr "Breddegrad"
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr "Last"
+
+msgid "Local Time"
+msgstr "Lokal Tid"
+
+msgid "Location"
+msgstr "Sted"
+
+msgid "Longitude"
+msgstr "Lengdegrad"
+
+msgid "Map"
+msgstr "Kart"
+
+msgid "Map Error"
+msgstr "Kart Feil"
+
+msgid "Memory"
+msgstr "Minne"
+
+msgid "Mesh prefix"
+msgstr "Mesh prefiks"
+
+msgid "Metric"
+msgstr "Metrisk"
+
+msgid "Mode"
+msgstr "Modus"
+
+msgid "Network"
+msgstr "Nettverk"
+
+msgid "Network for client DHCP addresses"
+msgstr "Nettverk for klient DHCP adresser"
+
+msgid "Nickname"
+msgstr "Kallenavn"
+
+msgid "No default routes known."
+msgstr "Ingen standard rute er kjent"
+
+msgid "Notice"
+msgstr "Merknad"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr "Oversikt"
+
+msgid "Package libiwinfo required!"
+msgstr "Pakken libiwinfo er nødvendig!"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Please fill in your contact details below."
+msgstr "Vennligst fyll ut skjema nedenfor."
+
+msgid "Please set your contact information"
+msgstr "Vennligst oppgi din kontaktinformasjon"
+
+msgid "Power"
+msgstr "Styrke"
+
+msgid "Processor"
+msgstr "Prosessor"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Profile (Expert)"
+msgstr "Profil (Ekspert)"
+
+msgid "Realname"
+msgstr "Virkelig Navn"
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Velg din posisjon med et museklikk på kartet. Kartet vises bare om du er "
+"koblet til internett."
+
+msgid "Show OpenStreetMap"
+msgstr "Vis OpenStreetMap"
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr "Signal"
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr "Start Oppgradering"
+
+msgid "Statistics"
+msgstr "Statistikk"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr "System"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"OLSRd tjenesten er ikke konfigurert til å hente posisjons data fra "
+"nettverket.<br/>Kontroller at navnetjener pluginen er riktig konfigurert og "
+"at <em>latlon_file</em> alternativet er aktivert."
+
+msgid "The installed firmware is the most recent version."
+msgstr "Den installerte firmware er den nyeste versjonen."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"Dette er de grunnleggende innstillinger for det lokale trådløse stedet. "
+"Disse innstillingene definerer standard verdiene for veiviseren og vil "
+"derfor IKKE gjøre noen endringer på ruteren."
+
+msgid "These are the settings of your local community."
+msgstr "Dette er innstillingene for det lokale stedet"
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Disse sidene vil hjelpe deg med å sette opp ruteren til for Freifunk og "
+"lignende trådløse nettverk."
+
+msgid "This is the access point"
+msgstr "Dette er aksess punktet"
+
+msgid "Update Settings"
+msgstr "Oppdater Innstillingene"
+
+msgid "Update available!"
+msgstr "Oppdatering tilgjengelig!"
+
+msgid "Uptime"
+msgstr "Oppetid"
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr "Verifiser nedlastede filer"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Vi er et initiativ for å etablere fri, uavhengig og åpne trådløse mesh-"
+"nettverk."
+
+msgid "Wireless Overview"
+msgstr "Trådløs Oversikt"
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"Du kan vise ytterligere innhold på den offentlige side ved å legge til "
+"gyldig XHTML med form som vist under.<br />Overskrifter bør legges mellom "
+"&lt;h2&gt; og &lt;/h2&gt;."
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "Du kan finne mere informasjon om den globale Freifunk initiativ på"
+
+msgid "You can manually edit the selected community profile here."
+msgstr "Du kan manuelt endre den valgte stedsprofilen here"
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+"Du må velge en profil før du kan endre den. For å velge en profil går du til"
+
+msgid "and fill out all required fields."
+msgstr "og fylle ut alle nødvendige felt"
+
+msgid "buffered"
+msgstr "bufret"
+
+msgid "cached"
+msgstr "hurtigbufret"
+
+msgid "e.g."
+msgstr "f.eks."
+
+msgid "free"
+msgstr "tilgjengelig"
+
+msgid "to disable it."
+msgstr "Ã¥ deaktivere det"
+
+msgid "used"
+msgstr "brukt"
+
+msgid "wireless settings"
+msgstr "trådløse innstillinger"
+
+#~ msgid ""
+#~ "No services can be shown, because olsrd is not running or the olsrd-"
+#~ "nameservice Plugin is not loaded."
+#~ msgstr ""
+#~ "Ingen tjenester kan vises her, dette kan være pga. at olsrd ikke kjører "
+#~ "eller fordi olsrd-navnetjener plugin ikke er lastet."
+
+#~ msgid "Services"
+#~ msgstr "Tjenester"
+
+#~ msgid "Source"
+#~ msgstr "Kilde"
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Pakken <em>libiwinfo-lua</em> er ikke installert. Du må installere denne "
+#~ "pakken for å kunne konfigurerer trådløse enheter!"
+
+#~ msgid "Url"
+#~ msgstr "Url"
diff --git a/trunk/package/luci/po/no/hd_idle.po b/trunk/package/luci/po/no/hd_idle.po
new file mode 100644
index 00000000..24ae1d00
--- /dev/null
+++ b/trunk/package/luci/po/no/hd_idle.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Enable debug"
+msgstr "Aktiver feilsøking"
+
+msgid "Idle-time"
+msgstr "Tid inaktiv"
+
+msgid "Idle-time unit"
+msgstr "Tidsenhet"
+
+msgid "Settings"
+msgstr "Innstillinger"
+
+msgid "h"
+msgstr "timer"
+
+msgid "hd-idle"
+msgstr "Hd-Idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle er et verktøy for å spinne ned eksterne disker etter en periode med "
+"inaktivitet."
+
+msgid "min"
+msgstr "minutter"
diff --git a/trunk/package/luci/po/no/meshwizard.po b/trunk/package/luci/po/no/meshwizard.po
new file mode 100644
index 00000000..a67c71f5
--- /dev/null
+++ b/trunk/package/luci/po/no/meshwizard.po
@@ -0,0 +1,109 @@
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/no/minidlna.po b/trunk/package/luci/po/no/minidlna.po
new file mode 100644
index 00000000..4b24712f
--- /dev/null
+++ b/trunk/package/luci/po/no/minidlna.po
@@ -0,0 +1,189 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-03-25 17:25+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language-Team: none\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Avanserte Innstillinger"
+
+msgid "Album art names:"
+msgstr "Albumbilder navn:"
+
+msgid "Announced model number:"
+msgstr "Annonsert modellnummer:"
+
+msgid "Announced serial number:"
+msgstr "Annonsert serienummer:"
+
+msgid "Browse directory"
+msgstr "Bla katalog"
+
+msgid "Collecting data..."
+msgstr "Samler inn data..."
+
+msgid "Database directory:"
+msgstr "Database katalog:"
+
+msgid "Enable TIVO:"
+msgstr "Aktiver TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Aktiver inotify:"
+
+msgid "Enable:"
+msgstr "Aktiver:"
+
+msgid "Friendly name:"
+msgstr "Vennlig navn:"
+
+msgid "General Settings"
+msgstr "Generelle Innstillinger"
+
+msgid "Interfaces:"
+msgstr "Grensesnitt:"
+
+msgid "Log directory:"
+msgstr "Logg katalog:"
+
+msgid "Media directories:"
+msgstr "Media kataloger:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA er serverprogramvare som sikter på å være fullt kompatibel med DLNA"
+"/UPnP-AV klienter."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Modellnummer som MiniDLNA daemon vil rapportere til klienter. (XML "
+"beskrivelse)"
+
+msgid "Music"
+msgstr "Musikk"
+
+msgid "Network interfaces to serve."
+msgstr "Nettverksgrensesnittene å tjene."
+
+msgid "Notify interval in seconds."
+msgstr "Notify intervall i sekunder."
+
+msgid "Notify interval:"
+msgstr "Notify intervall:"
+
+msgid "Pictures"
+msgstr "Bilder"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port for HTTP (beskrivelser, SOAP, media overføring) trafikk."
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr "Presentasjon URL:"
+
+msgid "Root container:"
+msgstr "Root katalog:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Serienummeret miniDLNA daemon vil rapportere til klienter. (XML beskrivelse)"
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "Her kan en tilpasse navnet som dukker opp på MiniDLNA klientene."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Her kan en spesifisere hvilken katalog som MiniDLNA bruker for å lagre sin "
+"database og albumcover cache."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+"Her kan en definere hvilken katalog som MiniDLNA skal bruke til å lagre log "
+"filen i."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Her kan en aktivere inotify som overvåker mediakatalogene og dermed "
+"automatisk oppdage om det kommer nytt innhold."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Her kan en aktivere støtte for strømming av .jpg og .mp3 filer til en TiVo "
+"med HMO støtte."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Her kan en aktivere at en holder seg til DLNA-standarder. Dette vil tillate "
+"server-side nedskalering av svært store JPEG-bilder, noe som kan skade JPEG "
+"serverens ytelse på (minst) Sony DLNA-produkter."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Her kan en velge den katalogen som blir skannet. Om du ønsker å begrense "
+"katalogen til en spesifikk innholdstype kan sette en bokstav foran ('A' for "
+"lyd, 'V' for video, 'P' for bilder), etterfulgt av et komma og katalogen. "
+"(f.eks media_dir=A,/mnt/media/Musikk). Flere kataloger kan brukes."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Angi banen til MiniSSDPd socketen."
+
+msgid "Standard container"
+msgstr "Standard container"
+
+msgid "Strict to DLNA standard:"
+msgstr "Streng overholdelse av DLNA-standarden:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"MiniDLNA tjenesten er aktiv, serverer %d lyd, %d video og %d bildefiler."
+
+msgid "The miniDLNA service is not running."
+msgstr "MiniDLNA tjenesten kjører ikke."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+"Dette er en liste over filnavn for å se etter når du søker etter albumcover."
+
+msgid "Video"
+msgstr "Video"
+
+msgid "miniDLNA"
+msgstr "MiniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "MiniDLNA Status"
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP socket:"
diff --git a/trunk/package/luci/po/no/mmc_over_gpio.po b/trunk/package/luci/po/no/mmc_over_gpio.po
new file mode 100644
index 00000000..ea9a533d
--- /dev/null
+++ b/trunk/package/luci/po/no/mmc_over_gpio.po
@@ -0,0 +1,32 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "MMC/SD driver configuration"
+msgstr "MMC/SD Konfigurasjon"
+
+msgid "Mode"
+msgstr "Modus"
+
+msgid "Name"
+msgstr "Navn"
+
+msgid "Settings"
+msgstr "Innstillinger"
diff --git a/trunk/package/luci/po/no/multiwan.po b/trunk/package/luci/po/no/multiwan.po
new file mode 100644
index 00000000..a6e8bc4d
--- /dev/null
+++ b/trunk/package/luci/po/no/multiwan.po
@@ -0,0 +1,117 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Antall forsøk før WAN feilsikkerhet"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Antall forsøk før WAN gjenoppretting"
+
+msgid "Auto"
+msgstr "Auto"
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Konfigurer regler for å styre utgående trafikk gjennom spesifiserte WAN "
+"koblinger."
+
+msgid "DNS Server(s)"
+msgstr "DNS Server(e)"
+
+msgid "Default Route"
+msgstr "Standard rute"
+
+msgid "Destination Address"
+msgstr "Destinasjonsadresse"
+
+msgid "Disable"
+msgstr "Deaktiver"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr "Feilsikkerhet trafikk destinasjon"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Health monitor ICMP vert(er)"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Health monitor ICMP tidsavbrudd"
+
+msgid "Health Monitor Interval"
+msgstr "Health monitor intervall"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"Health monitor oppdager og korrigerer nettverks endringer og mislykkede "
+"tilkoblinger."
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr "Lastbalansering fordeling"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Lastbalansering (kompatibilitet)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Lastbalansering (ytelse)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Multi-WAN trafikk regler"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN tillater bruk av flere internett oppkoblinger for lastbalansering "
+"og feilsikkerhet."
+
+msgid "None"
+msgstr "Ingen"
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr "Porter"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr "Kildeadresse"
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr "WAN Grensesnitt"
+
+msgid "WAN Uplink"
+msgstr "WAN Opplinje"
+
+msgid "all"
+msgstr "alle"
diff --git a/trunk/package/luci/po/no/ntpc.po b/trunk/package/luci/po/no/ntpc.po
new file mode 100644
index 00000000..7b3fd0b3
--- /dev/null
+++ b/trunk/package/luci/po/no/ntpc.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Clock Adjustment"
+msgstr "Tidskorrigering"
+
+msgid "Count of time measurements"
+msgstr "Antall tidsmålinger"
+
+msgid "Current system time"
+msgstr "Nåværende system tid"
+
+msgid "General"
+msgstr "Generelt"
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "Offset frequency"
+msgstr "Frekvens forskyvning"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Synkroniserer systemets tid"
+
+msgid "Time Server"
+msgstr "Tids Server"
+
+msgid "Time Servers"
+msgstr "Tids Servere"
+
+msgid "Time Synchronisation"
+msgstr "Tidssynkronisering"
+
+msgid "Update interval (in seconds)"
+msgstr "Oppdateringsintervall (i sek)"
+
+msgid "empty = infinite"
+msgstr "tomt = uendelig"
diff --git a/trunk/package/luci/po/no/olsr.po b/trunk/package/luci/po/no/olsr.po
new file mode 100644
index 00000000..38aa43bf
--- /dev/null
+++ b/trunk/package/luci/po/no/olsr.po
@@ -0,0 +1,687 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/no/openvpn.po b/trunk/package/luci/po/no/openvpn.po
new file mode 100644
index 00000000..bf02ef3d
--- /dev/null
+++ b/trunk/package/luci/po/no/openvpn.po
@@ -0,0 +1,547 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/no/p2pblock.po b/trunk/package/luci/po/no/p2pblock.po
new file mode 100644
index 00000000..af9c25ea
--- /dev/null
+++ b/trunk/package/luci/po/no/p2pblock.po
@@ -0,0 +1,36 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Block Time"
+msgstr "Blokkerings tid"
+
+msgid "Enable P2P-Block"
+msgstr "Aktiver P2P-Blokkering"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Lag7-Protokoller"
+
+msgid "P2P-Block"
+msgstr "P2P-Blokkering"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"P2P-blokkering er en mekanisme for å blokkere ulike peer-to-peer protokoller "
+"for klienter som ikke er hvitelistede."
+
+msgid "Portrange"
+msgstr "Portområde"
+
+msgid "Whitelisted IPs"
+msgstr "Hvitelistede IP'er"
+
+msgid "seconds"
+msgstr "sekunder"
diff --git a/trunk/package/luci/po/no/p910nd.po b/trunk/package/luci/po/no/p910nd.po
new file mode 100644
index 00000000..3bf49c56
--- /dev/null
+++ b/trunk/package/luci/po/no/p910nd.po
@@ -0,0 +1,47 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2013-03-21 23:05+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language: no\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Toveis modus (bidirectional)"
+
+msgid "Device"
+msgstr "Enhet"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Du må først installere pakkene som gir støtte for USB (kmod-usb-printer) "
+"eller parallellport (kmod-lp) skriver."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Innstillinger"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "TCP lytte port."
+
+msgid "enable"
+msgstr "Aktiver"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Skriverserver"
+
+#~ msgid "port_help"
+#~ msgstr ""
+#~ "p910nd lytter på port 910+N. (N=0 blir port 9100 for første skriver)"
diff --git a/trunk/package/luci/po/no/pbx-voicemail.po b/trunk/package/luci/po/no/pbx-voicemail.po
new file mode 100644
index 00000000..be25f0b5
--- /dev/null
+++ b/trunk/package/luci/po/no/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/no/pbx.po b/trunk/package/luci/po/no/pbx.po
new file mode 100644
index 00000000..2a458214
--- /dev/null
+++ b/trunk/package/luci/po/no/pbx.po
@@ -0,0 +1,484 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/no/polipo.po b/trunk/package/luci/po/no/polipo.po
new file mode 100644
index 00000000..931228e5
--- /dev/null
+++ b/trunk/package/luci/po/no/polipo.po
@@ -0,0 +1,202 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/no/qos.po b/trunk/package/luci/po/no/qos.po
new file mode 100644
index 00000000..a560b0fa
--- /dev/null
+++ b/trunk/package/luci/po/no/qos.po
@@ -0,0 +1,106 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2013-03-21 23:04+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language: no\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Beregn overhead"
+
+msgid "Classification Rules"
+msgstr "Klassifisering Regler"
+
+msgid "Classification group"
+msgstr "Klassifisering gruppe"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Destinasjon vert"
+
+msgid "Download speed (kbit/s)"
+msgstr "Nedlasting hastighet (kbit/s)"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Half-duplex"
+msgstr "Halv dupleks"
+
+msgid "Interfaces"
+msgstr "Grensesnitt"
+
+msgid "Number of bytes"
+msgstr "Antall bytes"
+
+msgid "Ports"
+msgstr "Porter"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Quality of Service"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Source host"
+msgstr "Kilde vert"
+
+msgid "Target"
+msgstr "MÃ¥l"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Opplasting hastighet (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Med <abbr title=\"Quality of Service\">QoS</abbr> kan du prioritere "
+"nettverkstrafikk valgt av adresser, porter eller tjenester."
+
+msgid "all"
+msgstr "alle"
+
+msgid "default"
+msgstr "standard"
+
+msgid "express"
+msgstr "ekspress"
+
+msgid "low"
+msgstr "lav"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "prioritet"
+
+#~ msgid "Downlink"
+#~ msgstr "Nedlinje"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Internett Tilkobling"
+
+#~ msgid "Uplink"
+#~ msgstr "Opplinje"
+
+#~ msgid "allf"
+#~ msgstr "alle"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "Bytes sendt"
+
+#~ msgid "Half-Duplex"
+#~ msgstr "Halvdupleks"
diff --git a/trunk/package/luci/po/no/radvd.po b/trunk/package/luci/po/no/radvd.po
new file mode 100644
index 00000000..1c43442e
--- /dev/null
+++ b/trunk/package/luci/po/no/radvd.po
@@ -0,0 +1,435 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "6to4 interface"
+msgstr "6til4 grensesnitt"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Addresses"
+msgstr "Adresser"
+
+msgid "Advanced"
+msgstr "Avansert"
+
+msgid "Advertise Home Agent flag"
+msgstr "Annonser Home Agent flagg"
+
+msgid "Advertise router address"
+msgstr "Annonser ruteradressen"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Annonserte Domenesuffikser"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Annonsert IPv6 RDNSS. Hvis tom, brukes den gjeldende IPv6-adressen til "
+"grensesnittet"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Annonserte IPv6 prefikser"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Annonserte IPv6 prefikser. Hvis tom, brukes gjeldende grensesnitt prefiks"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Annonserer Mobile IPv6 Home Agent muligheter (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "Annonserer Mobile Router registration muligheter (NEMO Basic)"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Annonserer antatt tilgjengelighet i millisekunder for naboer i RA. 0 "
+"deaktiverer annonsenering av tilgjengelighet"
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Annonserer standard Hop Count verdien for utgående unicast pakker i RA. 0 "
+"deaktierer annonsering av hopcount"
+
+msgid "Advertises the default router preference"
+msgstr "Annonserer standard ruter preferanse"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr "Annonserer angitt link MTU i RA. 0 deaktiverer annonsereing av MTU"
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+"Annonserer levetiden for standard ruter i sekunder. 0 indikerer at noden "
+"ikke er standard ruter"
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+"Annonserer tiden i sekunder der ruteren tilbyr Mobile IPv6 Home Agent "
+"tjenester"
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+"Annonserer ventetiden i millisekunder mellom Neighbor Solicitation meldinger "
+"i RA. 0 deaktiverer omsendte annonseringer"
+
+msgid "Advertising"
+msgstr "Annonsering"
+
+msgid "Autonomous"
+msgstr "Selvstendig"
+
+msgid "Clients"
+msgstr "Klienter"
+
+msgid "Configuration flag"
+msgstr "Konfigurasjon flagg"
+
+msgid "Current hop limit"
+msgstr "Nåværende hop grense"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "DNSSL Konfigurasjon"
+
+msgid "Default lifetime"
+msgstr "Standard levetid"
+
+msgid "Default preference"
+msgstr "Standard prepreferanse"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Enable advertisements"
+msgstr "Aktiver annonsering"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Aktiverer ruter annonsering og anmodning"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+"Aktiverer den ekstra 'stateful' administrerte autokonfigurasjon protokoll "
+"(RFC2462)"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+"Aktiverer autokonfigurasjon for annen ikke adresse informasjon (RFC2462)"
+
+msgid "General"
+msgstr "Generell"
+
+msgid "Home Agent information"
+msgstr "Home Agen informasjon"
+
+msgid "Home Agent lifetime"
+msgstr "Home Agent levetid"
+
+msgid "Home Agent preference"
+msgstr "Home Agent preferanse"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "Inkluder Home Agent informasjon i RA"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr "Inkluder Mobile IPv6 annonserings intervall alternativer til RA"
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr "Inkluder utgående grensesnitts link-layer adresse til RA"
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+"Indikerer at grensesnittets adresse er sendt istedet for nettverks "
+"prefikset, noe som er nødvendig for Mobile IPv6"
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+"Indikerer at underliggende link ikke er broadcast kapabel, dette forhindrer "
+"spontane annonsering"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+"Indikerer at dette prefikset kan bli brukt for autonom adresse konfigurasjon "
+"(RFC4862)"
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+"Indikerer at dette prefikset kan bli brukt for on-link bestemmelse (RFC4861)"
+
+msgid "Interface"
+msgstr "Grensesnitt"
+
+msgid "Interface Configuration"
+msgstr "Grensesnitt Konfigurasjon"
+
+msgid "Interface required"
+msgstr "Grenesnitt er nødvendig"
+
+msgid "Interfaces"
+msgstr "Grensesnitt"
+
+msgid "Lifetime"
+msgstr "Levetid"
+
+msgid "Link MTU"
+msgstr "Link MTU"
+
+msgid "Managed flag"
+msgstr "Managed flagg"
+
+msgid "Max. interval"
+msgstr "Maks. intervall"
+
+msgid "Maximum advertisement interval"
+msgstr "Maksimum annonsering intervall"
+
+msgid "Minimum advertisement delay"
+msgstr "Minimum annonsering forsinkelse"
+
+msgid "Minimum advertisement interval"
+msgstr "Minimum annonsering intervall"
+
+msgid "Mobile IPv6"
+msgstr "Mobile IPv6"
+
+msgid "Mobile IPv6 interval option"
+msgstr "Mobile IPv6 intervall alternativer"
+
+msgid "Mobile IPv6 router registration"
+msgstr "Mobile IPv6 ruter registrering"
+
+msgid "Multicast"
+msgstr "Multicast"
+
+msgid "On-link"
+msgstr "On-link"
+
+msgid "On-link determination"
+msgstr "On-link bestemmelse"
+
+msgid "Preference"
+msgstr "Preferanse"
+
+msgid "Preferred lifetime"
+msgstr "Foretrukket levetid"
+
+msgid "Prefix"
+msgstr "Prefiks"
+
+msgid "Prefix Configuration"
+msgstr "Prefiks Konfigurasjon"
+
+msgid "Prefixes"
+msgstr "Prefikser"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "RDNSS Konfigurasjon"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Grensesnitt %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Prefiks"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Rute"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"Radvd er en ruter annonserings tjeneste for IPv6. Den lytter etter ruter "
+"anmodninger og sender ruter annonsering som beskrevet i RFC 4861"
+
+msgid "Reachable time"
+msgstr "Tilgjengelighet tid"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"Begrens kommunikasjonen til klienter spesifisert her, la stå tomt for å "
+"bruke multicast"
+
+msgid "Retransmit timer"
+msgstr "Omsendelse tidsmåler"
+
+msgid "Route Configuration"
+msgstr "Rute Konfigurasjon"
+
+msgid "Routes"
+msgstr "Ruter"
+
+msgid "Source link-layer address"
+msgstr "Kilde link-lag adresse"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+"Angir et logisk grensenittsnavn å hente 6til4 prefiks fra. Grensesnittets "
+"offentlige IPv4 adresse er kombinert med 2002::/3 og verdien av prefiks "
+"alternativet"
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr "Angir det logiske grensesnittsnavnet som denne seksjonen tilhører"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr "Angir preferanse knyttet til standard ruteren"
+
+msgid "Suffix"
+msgstr "Suffiks"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Maksimal tillatt tid mellom sending av spontane multicast annonseringer fra "
+"grensesnittet, i sekunder"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+"Minimum tillatt tid mellom sending av multicast annonseringer fra "
+"grensesnittet, i sekunder"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Minimum tillatt tid mellom sending av spontane multicast annonseringer fra "
+"grensesnittet, i sekunder"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr "Referansen til Home Agenten som sender denne RA"
+
+msgid "Timing"
+msgstr "Timing"
+
+msgid "Unicast only"
+msgstr "Kun Unikast"
+
+msgid "Valid lifetime"
+msgstr "Gyldig levetid"
+
+msgid "Validity time"
+msgstr "Gyldighetsperiode"
+
+msgid "default"
+msgstr "standard"
+
+msgid "high"
+msgstr "høy"
+
+msgid "low"
+msgstr "lav"
+
+msgid "medium"
+msgstr "medium"
+
+msgid "no"
+msgstr "nei"
+
+msgid "yes"
+msgstr "ja"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that addresses generated from "
+#~ "the prefix via stateless address autoconfiguration remain preferred. Use "
+#~ "0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Annonserer tiden i sekunder hvor adresser generert ut fra prefikset via "
+#~ "tilstandsløs autokonfigurasjon er foretrukket. Bruk 0 for ubegrenset "
+#~ "levetid"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that the prefix is valid for the "
+#~ "purpose of on-link determination. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Annonserer tiden i sekunder hvor prefikset er gyldig, hvor formålet er on-"
+#~ "link fastsettelse. Bruk 0 for ubegrenset levetid."
+
+#~ msgid ""
+#~ "Specifies the lifetime associated with the route in seconds. Use 0 to "
+#~ "specify an infinite lifetime"
+#~ msgstr ""
+#~ "Angir levetiden tilknyttet ruten i sekunder. Bruk 0 for ubegrenset levetid"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the DNSSL entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Angir den maksimale varighet av DNSSL navne oppslag. Bruk 0 for "
+#~ "ubegrenset levetid"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the RDNSS entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Angir den maksimale varighet av RDNSS navne oppslag. Bruk 0 for "
+#~ "ubegrenset levetid"
diff --git a/trunk/package/luci/po/no/rrdtool.po b/trunk/package/luci/po/no/rrdtool.po
new file mode 100644
index 00000000..d336ec3d
--- /dev/null
+++ b/trunk/package/luci/po/no/rrdtool.po
@@ -0,0 +1,354 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2013-03-25 14:24+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language: no\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Trådløs - Signal Støy Forhold"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Støy Nivå"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Signal Styrke"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Trådløs - Signal Kvalitet"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Signal Kvalitet"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: ICMP Rundtur Antall"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Brannmur - Pakker Behandlet"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pakker/Sek"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Lenke \\\"%di\\\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - Overført på %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/Sek"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bytes (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - Pakker på %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Pakker/Sek"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Behandlet (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Droppet (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Feil (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - Multicast på %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pakker/Sek"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Pakker"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - Kollisjoner på %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Kollisjoner/Sek"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Kollisjoner"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Feil på %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Feil/Sek"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Prosesser"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Prosesser/Sek"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Prosesser %pi - brukt cpu tid"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffier"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "system"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "bruker"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Prosess %pi - tråder og prosesser"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Telle"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Prosess %pi - sidefeil"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Sidefeil"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "side feil"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Prosess %pi - virtuelt minne størrelse"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "virtuelt minne"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Bruk av prosessor #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Overført på %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/Sek"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Pakker på %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pakker/Sek"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: TCP-tilkoblinger på port %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Tilkoblinger/Sek"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Disk forbruk på %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Avbrudd"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Problemer/Sek"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: System Belastning"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Belastning"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 min"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 min"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 min"
diff --git a/trunk/package/luci/po/no/samba.po b/trunk/package/luci/po/no/samba.po
new file mode 100644
index 00000000..1c5c8077
--- /dev/null
+++ b/trunk/package/luci/po/no/samba.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Allow guests"
+msgstr "Tillat gjester"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "Tillat systembrukere å nå sine hjemmekataloger via nettverks mapper."
+
+msgid "Allowed users"
+msgstr "Tillatte brukere"
+
+msgid "Create mask"
+msgstr "Opprett Maske"
+
+msgid "Description"
+msgstr "Beskrivelse"
+
+msgid "Directory mask"
+msgstr "Katalog maske"
+
+msgid "Edit Template"
+msgstr "Rediger Mal"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Rediger malen som brukes til å generere samba konfigurasjonen."
+
+msgid "General Settings"
+msgstr "Generelle Innstillinger"
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "Mask for new directories"
+msgstr "Maske for nye kataloger"
+
+msgid "Mask for new files"
+msgstr "Maske for nye filer"
+
+msgid "Name"
+msgstr "Navn"
+
+msgid "Network Shares"
+msgstr "Nettverks Mapper"
+
+msgid "Path"
+msgstr "Fysisk bane"
+
+msgid "Read-only"
+msgstr "Skrivebeskyttet"
+
+msgid "Share home-directories"
+msgstr "Del Hjemmekataloger"
+
+msgid "Shared Directories"
+msgstr "Delte Kataloger"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Dette er innholdet av filen '/etc/samba/smb.conf.template' som din samba "
+"konfigurasjon vil bli generert fra. Verdier omsluttet av ('|') bør ikke "
+"endres. De får sine verdier fra 'Generelle Innstillinger' fanen."
+
+msgid "Workgroup"
+msgstr "Arbeidsgruppe"
diff --git a/trunk/package/luci/po/no/splash.po b/trunk/package/luci/po/no/splash.po
new file mode 100644
index 00000000..615be16b
--- /dev/null
+++ b/trunk/package/luci/po/no/splash.po
@@ -0,0 +1,292 @@
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/no/statistics.po b/trunk/package/luci/po/no/statistics.po
new file mode 100644
index 00000000..a4706b77
--- /dev/null
+++ b/trunk/package/luci/po/no/statistics.po
@@ -0,0 +1,678 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Action (target)"
+msgstr "Handling (mål)"
+
+msgid "Add command for reading values"
+msgstr "Legg til kommando for lesing av verdier"
+
+msgid "Add matching rule"
+msgstr "Legg til matchende regel"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Legg til flere verter adskilt med mellomrom."
+
+msgid "Add notification command"
+msgstr "Legg til varsling kommando"
+
+msgid "Base Directory"
+msgstr "Hoved Katalog"
+
+msgid "Basic monitoring"
+msgstr "Enkel overvåking"
+
+msgid "CPU Plugin Configuration"
+msgstr "CPU plugin konfigurasjon"
+
+msgid "CSV Output"
+msgstr "CSV Utdata"
+
+msgid "CSV Plugin Configuration"
+msgstr "CSV plugin konfigurasjon"
+
+msgid "Cache collected data for"
+msgstr "Hurtigbufre innsamlede data for"
+
+msgid "Cache flush interval"
+msgstr "Intervall for tømming av hurtigbuffer"
+
+msgid "Chain"
+msgstr "Lenke"
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Collectd Innstillinger"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd er en liten daemon for innsamling av data fra ulike kilder gjennom "
+"ulike plugins. PÃ¥ denne siden kan du endre generelle innstillinger for "
+"collectd daemon."
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr "DF plugin konfigurasjon"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "DNS plugin konfigurasjon"
+
+msgid "Data collection interval"
+msgstr "Datainnsamling intervall"
+
+msgid "Datasets definition file"
+msgstr "Datasett definisjonsfil"
+
+msgid "Destination ip range"
+msgstr "Destinasjon ip område"
+
+msgid "Directory for collectd plugins"
+msgstr "Katalog for collectd plugins"
+
+msgid "Directory for sub-configurations"
+msgstr "Katalog for sub-konfigurasjoner"
+
+msgid "Disk Plugin Configuration"
+msgstr "Disk plugin konfigurasjon"
+
+msgid "Disk Space Usage"
+msgstr "Disk Forbruk"
+
+msgid "Disk Usage"
+msgstr "Disk Anvendelse"
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr "Vis tidsperiode »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "E-Post plugin konfigurasjon"
+
+msgid "Email"
+msgstr "Epost"
+
+msgid "Enable this plugin"
+msgstr "Aktiver denne plugin"
+
+msgid "Exec"
+msgstr "Program"
+
+msgid "Exec Plugin Configuration"
+msgstr "Program plugin konfigurasjon"
+
+msgid "Filter class monitoring"
+msgstr "Filter class overvåking"
+
+msgid "Firewall"
+msgstr "Brannmur"
+
+msgid "Flush cache after"
+msgstr "Tømme hurtigbufferen etter"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Videresending mellom lyttende og server adresser"
+
+msgid "Graphs"
+msgstr "Grafer"
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Her kan du definere eksterne kommandoer som blir startet av collectd for å "
+"lese enkelte verdier. Verdiene skal leses fra stdout."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Her kan du definere eksterne kommandoer som blir startet av collectd når "
+"visse grenseverdier er blitt nådd. Verdiene som fører til aktivering vil bli "
+"overført til det påkallede programs stdin."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr "Her kan du definere kriterier for reglene som overvåker iptables."
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Vertsnavn"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr "IRQ plugin konfigurasjon"
+
+msgid "Ignore source addresses"
+msgstr "Ignorer kilde adresser"
+
+msgid "Incoming interface"
+msgstr "Innkommende grensesnitt"
+
+msgid "Interface Plugin Configuration"
+msgstr "Grensesnitt plugin konfigurasjon"
+
+msgid "Interfaces"
+msgstr "Grensesnitt"
+
+msgid "Interrupts"
+msgstr "Avbrudd"
+
+msgid "Interval for pings"
+msgstr "Intervall ping"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Iptable plugin konfigurasjon"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr "Lyttende vert"
+
+msgid "Listen port"
+msgstr "Lyttende port"
+
+msgid "Listener interfaces"
+msgstr "Lyttende grensesnitt"
+
+msgid "Load Plugin Configuration"
+msgstr "Belastning plugin konfigurasjon"
+
+msgid "Maximum allowed connections"
+msgstr "Maksimum tillatte tilkoblinger"
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr "Overvåk alle lokale lyttende porter"
+
+msgid "Monitor devices"
+msgstr "Overvåk enheter"
+
+msgid "Monitor disks and partitions"
+msgstr "Overvåk disker og partisjoner"
+
+msgid "Monitor filesystem types"
+msgstr "Overvåk filsystem typer"
+
+msgid "Monitor hosts"
+msgstr "Overvåk verter"
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr "Overvåk avbrudd"
+
+msgid "Monitor local ports"
+msgstr "Overvåk lokale porter"
+
+msgid "Monitor mount points"
+msgstr "Overvåk monterings punkter"
+
+msgid "Monitor processes"
+msgstr "Overvåk prosesser"
+
+msgid "Monitor remote ports"
+msgstr "Overvåk eksterne porter"
+
+msgid "Name of the rule"
+msgstr "Navnet på regelen"
+
+msgid "Netlink"
+msgstr "Nettlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Netlink plugin konfigurasjon"
+
+msgid "Network"
+msgstr "Nettverk"
+
+msgid "Network Plugin Configuration"
+msgstr "Nettverks plugin konfigurasjon"
+
+msgid "Network plugins"
+msgstr "Nettverks plugin"
+
+msgid "Network protocol"
+msgstr "Nettverks protokoll"
+
+msgid "Number of threads for data collection"
+msgstr "Antall tråder for datainnsamling"
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr "Lag kun gjennomsnittlige RRAs"
+
+msgid "Options"
+msgstr "Alternativer"
+
+msgid "Outgoing interface"
+msgstr "Utgående grensesnitt"
+
+msgid "Output plugins"
+msgstr "Utdata Plugin"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Ping plugin konfigurasjon"
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr "Prosesser"
+
+msgid "Processes Plugin Configuration"
+msgstr "Prosess plugin konfigurasjon"
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Prosessor"
+
+msgid "Qdisc monitoring"
+msgstr "Qdisc overvåking"
+
+msgid "RRD XFiles Factor"
+msgstr "RRD XFiles Faktor"
+
+msgid "RRD heart beat interval"
+msgstr "RRD \"heartbeat\" intervall"
+
+msgid "RRD step interval"
+msgstr "RRD steg intervall"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "RRDTool plugin konfigursjon"
+
+msgid "Rows per RRA"
+msgstr "Rader per RRA"
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Sekunder"
+
+msgid "Server host"
+msgstr "Server vert"
+
+msgid "Server port"
+msgstr "Server port"
+
+msgid "Shaping class monitoring"
+msgstr "Shaping class overvåking"
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr "Kilde ip område"
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr "Statistikk"
+
+msgid "Storage directory"
+msgstr "Lagrings katalog"
+
+msgid "Storage directory for the csv files"
+msgstr "Katalog for lagring av CSV filer"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Lagre dataverdier som rater i stedet for absolutte verdier"
+
+msgid "Stored timespans"
+msgstr "Lagrede tidsperioder"
+
+msgid "System Load"
+msgstr "System Belastning"
+
+msgid "System plugins"
+msgstr "System plugins"
+
+msgid "TCP Connections"
+msgstr "TCP Forbindelser"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "TCPConns plugin konfigurasjon"
+
+msgid "TTL for network packets"
+msgstr "TTL for nettverkspakker"
+
+msgid "TTL for ping packets"
+msgstr "TTL for ping pakker"
+
+msgid "Table"
+msgstr "Tabell"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "CPU plugin samler grunnleggende statistikk om prosessor bruk."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"CSV plugin lagrer de innsamlede dataene i CSV format for videre bearbeiding "
+"av eksterne programmer."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"DF plugin samler statistikk om disker på forskjellige enheter, monterings "
+"punkter eller filsystem typer."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"Disk plugin samler detaljert brukerstatistikk for utvalgte partisjoner og "
+"hele disker."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"DNS pluging samler detaljert statistikk om DNS relatert trafikk på utvalgte "
+"grensesnitt."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"E-Post plugin skaper en unix socket som kan brukes til å sende e-post "
+"statistikk til en kjørende collectd daemon. Denne plugin er primært ment å "
+"bli brukt i forbindelse med Mail::SpamAssasin::Plugin::Collectd men kan også "
+"brukes på andre måter."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"Program plugin starter eksterne kommandoer for å lese verdier fra de, eller "
+"for å varsle eksterne prosesser når visse grenseverdier er blitt nådd."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr "Grensesnitt plugin samler trafikk statistikk på utvalgte grensesnitt."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"Iptables plugin vil overvåke utvalgte brannmurregler og samle informasjon om "
+"bearbeidet data per regel."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"IRQ plugin vil overvåke hastigheten på forespørsler per sekund for hver "
+"valgte avbrudd. Hvis ingen avbrudd er valgt vil alle avbrudd bli overvåket."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "Belastning plugin samler statistikk systemets belastning."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"Netlink plugin samler utvidet informasjon som qdisc-, klasse- og filter-"
+"statistikk for utvalgte grensesnitt."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"Nettverk plugin gir nettverk basert kommunikasjon mellom ulike collectd "
+"forekomster. Collectd kan operere i både klient og server modus. I "
+"klientmodus blir lokalt innsamlede data overført til en collectd server. I "
+"server modus mottar enheten data fra andre klienter."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"Ping plugin sender icmp echo svar til utvalgte verter og måle tiden en "
+"rundtur tar for hver vert."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"Prosess plugin samler informasjon som f.eks. CPU tid, sidefeil og minnebruk "
+"for utvalgte prosesser."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"RRDTool plugin lagrer innsamlede data i rrd databasefiler som er grunnlaget "
+"for diagrammene.<br /><br /><strong>Advarsel: Innsetting av feile verdier "
+"vil kunne resultere i et svært høyt minneforbruk i den midlertidige "
+"katalogen (temp). Dette kan gjøre enheten ubrukelig!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Statistikk pakken er basert på <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> og bruker <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> for å tegne diagram bilder fra innsamlede data."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"Tcpconns plugin samler informasjon om åpne TCP tilkoblinger på utvalgte "
+"porter."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"Unixsock plugin skaper en unix socket som kan brukes til å lese innsamlet "
+"data fra collectd prosess."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Denne seksjonen definerer hvilke grensesnitt collectd vil lytte på for "
+"innkommende tilkoblinger."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Denne seksjonen definerer hvilke servere de lokalt innsamlede data blir "
+"sendt til."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Prøv å søk etter fullstendig vertsnavn"
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Unixsock plugin konfigurasjon"
+
+msgid "Used PID file"
+msgstr "Brukt PID fil"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr "Detaljert overvåking"
+
+msgid "Wireless"
+msgstr "Trådløs"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr "f.eks. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "f.eks. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "f.eks. forkast med tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "maks. 16 tegn"
+
+msgid "reduces rrd size"
+msgstr "reduserer RRD størrelse"
+
+msgid "seconds; multiple separated by space"
+msgstr "sekunder; flere adskilt med mellomrom"
+
+msgid "server interfaces"
+msgstr "Server grensesnitt"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Installerte nettverks plugin:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Installerte utdata plugin:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "Nettverks plugin er brukt til å samle inn informasjon om åpne tcp koblinger, "
+#~ "trafikk over grensesnitt, iptables regler osv."
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "Utdata plugins gir ulike muligheter til å lagre innsamlede data. Det er "
+#~ "mulig å aktivere flere pluginer på en, for eksempel for å lagre innsamlede "
+#~ "data i RRD databaser og å overføre data over nettverket til andre collectd "
+#~ "forekomster."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr "System plugins samler verdier om systemets tilstand og ressurs-bruk.:"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "Trådløs plugin samler statistikk om trådløs signalstyrke, støy og kvalitet."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Trådløs plugin konfigurasjon"
diff --git a/trunk/package/luci/po/no/tinyproxy.po b/trunk/package/luci/po/no/tinyproxy.po
new file mode 100644
index 00000000..5c4ddddb
--- /dev/null
+++ b/trunk/package/luci/po/no/tinyproxy.po
@@ -0,0 +1,255 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/no/transmission.po b/trunk/package/luci/po/no/transmission.po
new file mode 100644
index 00000000..cb868418
--- /dev/null
+++ b/trunk/package/luci/po/no/transmission.po
@@ -0,0 +1,298 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-25 21:10+0200\n"
+"PO-Revision-Date: 2013-04-05 09:10+0200\n"
+"Last-Translator: protx <lars.hardy@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Alternativ nedlastingshastighet"
+
+msgid "Alternative speed enabled"
+msgstr "Alternativ hastighet aktivert"
+
+msgid "Alternative speed time begin"
+msgstr "Alternativ hastighet start tid"
+
+msgid "Alternative speed time day"
+msgstr "Alternativ hastighet tid på dagen"
+
+msgid "Alternative speed time end"
+msgstr "Alternativ hastighet tid når ferdig"
+
+msgid "Alternative speed timing enabled"
+msgstr "Alternativ hastighet tidspunkt aktivert"
+
+msgid "Alternative upload speed"
+msgstr "Alternativ opplastingshastighet"
+
+msgid "Automatically start added torrents"
+msgstr "Start automatisk torrents som legges til"
+
+msgid "Bandwidth settings"
+msgstr "BÃ¥ndbredde innstillinger"
+
+msgid "Binding address IPv4"
+msgstr "Bindinger IPv4 adresse"
+
+msgid "Binding address IPv6"
+msgstr "Bindinger IPv6 adresse"
+
+msgid "Block list enabled"
+msgstr "Blokkeringsliste aktivert"
+
+msgid "Blocklist URL"
+msgstr "Blokkeringsliste URL"
+
+msgid "Blocklists"
+msgstr "Blokkeringsliste"
+
+msgid "Cache size in MB"
+msgstr "Bufferstørrelse i MB"
+
+msgid "Config file directory"
+msgstr "Mappe for konfigurasjonsfil"
+
+msgid "DHT enabled"
+msgstr "DHT aktivert"
+
+msgid "Debug"
+msgstr "Feilsøking"
+
+msgid "Download directory"
+msgstr "Nedlastingsmappe"
+
+msgid "Download queue enabled"
+msgstr "Nedlastingkø aktivert"
+
+msgid "Download queue size"
+msgstr "Nedlastingkø størrelse"
+
+msgid "Enable watch directory"
+msgstr "Aktiver overvåking av torrent mappe"
+
+msgid "Enabled"
+msgstr "Aktivert"
+
+msgid "Encryption"
+msgstr "Kryptering"
+
+msgid "Error"
+msgstr "Feil"
+
+msgid "Fast"
+msgstr "Rask"
+
+msgid "Files and Locations"
+msgstr "Filer og plasseringer"
+
+msgid "Forced"
+msgstr "Tvunget"
+
+msgid "Full"
+msgstr "Full"
+
+msgid "Global peer limit"
+msgstr "Global peer grense"
+
+msgid "Global settings"
+msgstr "Globale innstillinger"
+
+msgid "Idle seeding limit"
+msgstr "Inaktiv seeding grense"
+
+msgid "Idle seeding limit enabled"
+msgstr "Inaktiv seeding grense aktivert"
+
+msgid "Incomplete directory"
+msgstr "Ufullstendig mappe"
+
+msgid "Incomplete directory enabled"
+msgstr "Ufullstendig mappe aktivert"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "LPD enabled"
+msgstr "LPD aktivert"
+
+msgid "Lazy bitfield enabled"
+msgstr "Lazy bitfield aktivert"
+
+msgid "Message level"
+msgstr "Nivå for meldinger"
+
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+msgid "None"
+msgstr "Ingen"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"Nummer/bitfield. Start med 0, og for hver dag en vil at planleggeren skal "
+"være aktivert legger en til en verdi. For Søndag - 1, Mandag - 2, Tirsdag - "
+"4, Onsdag - 8, Torsdag - 16, Fredag - 32, Lørdag - 64"
+
+msgid "Off"
+msgstr "Av"
+
+msgid "Open Web Interface"
+msgstr "Åpne webgrensesnitt"
+
+msgid "PEX enabled"
+msgstr "PEX aktivert"
+
+msgid "Peer Port settings"
+msgstr "Peer port innstillinger"
+
+msgid "Peer congestion algorithm"
+msgstr "Peer congestion algoritme"
+
+msgid "Peer limit per torrent"
+msgstr "Peer grense per torrent"
+
+msgid "Peer port"
+msgstr "Peer port"
+
+msgid "Peer port random high"
+msgstr "Peer port tilfeldig høy"
+
+msgid "Peer port random low"
+msgstr "Peer port tilfeldig lav"
+
+msgid "Peer port random on start"
+msgstr "Peer port tilfeldig ved start"
+
+msgid "Peer settings"
+msgstr "Peer innstillinger"
+
+msgid "Peer socket tos"
+msgstr "Peer tilslutning tos"
+
+msgid "Port forwarding enabled"
+msgstr "Port videresending aktivert"
+
+msgid "Preferred"
+msgstr "Prioritert"
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/no/upnp.po b/trunk/package/luci/po/no/upnp.po
new file mode 100644
index 00000000..37ff9bff
--- /dev/null
+++ b/trunk/package/luci/po/no/upnp.po
@@ -0,0 +1,146 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"ACL angir hvilke eksterne porter som kan bli viderekoblet, og til hvilke "
+"interne adresser og porter."
+
+msgid "Action"
+msgstr "Handling"
+
+msgid "Active UPnP Redirects"
+msgstr "Aktive UPnP Viderekoblinger"
+
+msgid "Advanced Settings"
+msgstr "Avanserte Innstillinger"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Tillat videkobling kun til IP adresser som ber om det"
+
+msgid "Announced model number"
+msgstr "Annonsert modellnummer"
+
+msgid "Announced serial number"
+msgstr "Annonsert serienummer"
+
+msgid "Clean rules interval"
+msgstr "Nullstill UPnP Viderekoblinger intervall"
+
+msgid "Clean rules threshold"
+msgstr "Nullstill UPnP terskel"
+
+msgid "Client Address"
+msgstr "Klient adresse"
+
+msgid "Client Port"
+msgstr "Klient port"
+
+msgid "Collecting data..."
+msgstr "Henter data..."
+
+msgid "Comment"
+msgstr "Kommentar"
+
+msgid "Delete Redirect"
+msgstr "Fjern Viderekobling"
+
+msgid "Device UUID"
+msgstr "Enhet UUID"
+
+msgid "Downlink"
+msgstr "Nedlinje"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Aktiver NAT-PMP funksjonalitet"
+
+msgid "Enable UPnP functionality"
+msgstr "Aktiver UPnP funksjonalitet"
+
+msgid "Enable additional logging"
+msgstr "Aktiver tilleggs logging"
+
+msgid "Enable secure mode"
+msgstr "Aktiver sikker modus"
+
+msgid "External Port"
+msgstr "Ekstern port"
+
+msgid "External ports"
+msgstr "Eksterne porter"
+
+msgid "General Settings"
+msgstr "Generelle Innstillinger"
+
+msgid "Internal addresses"
+msgstr "Interne adresser"
+
+msgid "Internal ports"
+msgstr "Interne porter"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP ACL'er"
+
+msgid "MiniUPnP settings"
+msgstr "MiniUPnP Innstillinger"
+
+msgid "Notify interval"
+msgstr "Informasjons intervall"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr "Presentasjon URL"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Setter ekstra debugging informasjon i systemloggen"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Rapporter systemets oppetid istedenfor daemon oppetid"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Start UPnP og NAT-PMP tjenesten"
+
+msgid "There are no active redirects."
+msgstr "Det finnes ingen aktive viderekoblinger"
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP gjør at klientene i det lokale nettverket automatisk kan konfigurere "
+"ruteren."
+
+msgid "UPnP lease file"
+msgstr "UPnP leie fil"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Opplinje"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Verdi i KByte/sek, kun for informasjon"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP gjør at klientene i det lokale nettverket automatisk kan konfigurere "
+#~ "ruteren."
+
+#~ msgid "enable"
+#~ msgstr "Aktiver"
diff --git a/trunk/package/luci/po/no/ushare.po b/trunk/package/luci/po/no/ushare.po
new file mode 100644
index 00000000..321d29e3
--- /dev/null
+++ b/trunk/package/luci/po/no/ushare.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Content directories"
+msgstr "Innholdskataloger"
+
+msgid "Disable telnet console"
+msgstr "Deaktiver telnet konsoll"
+
+msgid "Disable webinterface"
+msgstr "Deaktiver webgrensesnitt"
+
+msgid "Enable"
+msgstr "Aktiver"
+
+msgid "Interface"
+msgstr "Grensesnitt"
+
+msgid "Options"
+msgstr "Alternativer"
+
+msgid "Servername"
+msgstr "Servernavn"
+
+msgid "Settings"
+msgstr "Innstillinger"
+
+msgid "Username"
+msgstr "Brukernavn"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+
+#~ msgid "ushare_desc"
+#~ msgstr "UPnP A/V og DLNA Media Server for Linux."
diff --git a/trunk/package/luci/po/no/uvc_streamer.po b/trunk/package/luci/po/no/uvc_streamer.po
new file mode 100644
index 00000000..fc111f0a
--- /dev/null
+++ b/trunk/package/luci/po/no/uvc_streamer.po
@@ -0,0 +1,38 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr ""
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr ""
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr ""
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr ""
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
diff --git a/trunk/package/luci/po/no/vnstat.po b/trunk/package/luci/po/no/vnstat.po
new file mode 100644
index 00000000..c1e94d29
--- /dev/null
+++ b/trunk/package/luci/po/no/vnstat.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+msgid "Daily traffic"
+msgstr "Trafikk hver dag"
+
+msgid "Graphs"
+msgstr "Grafer"
+
+msgid "Hourly traffic"
+msgstr "Trafikk hver time"
+
+msgid "Monitor selected interfaces"
+msgstr "Overvåk valgte grensesnitt"
+
+msgid "Monthly traffic"
+msgstr "Trafikk hver måned"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Ingen database har blitt satt opp ennå. Gå til VnStat konfigurasjonen og "
+"aktiver overvåking for ett eller flere grensesnitt."
+
+msgid "Restart VnStat"
+msgstr "Omstart VnStat"
+
+msgid "Summary display"
+msgstr "Visning av sammendrag"
+
+msgid "Top 10 display"
+msgstr "Top 10 visning"
+
+msgid "Update »"
+msgstr "Oppdater »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "VnStat Grafer"
+
+msgid "VnStat Traffic Monitor"
+msgstr "VnStat Trafikk Monitor"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat er en nettverks trafikk monitor for Linux som loggfører "
+"nettverks trafikk for de valgte grensesnitt."
diff --git a/trunk/package/luci/po/no/voice_core.po b/trunk/package/luci/po/no/voice_core.po
new file mode 100644
index 00000000..a0149da4
--- /dev/null
+++ b/trunk/package/luci/po/no/voice_core.po
@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Phones"
+msgstr "Telefoner"
+
+msgid "Voice"
+msgstr "Voice"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "Admin Telefoner"
diff --git a/trunk/package/luci/po/no/voice_diag.po b/trunk/package/luci/po/no/voice_diag.po
new file mode 100644
index 00000000..de7aaf2f
--- /dev/null
+++ b/trunk/package/luci/po/no/voice_diag.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Diagnostics"
+msgstr "Diagnostikk"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Diagnostikk tilgjengelig på denne enheten avhenger av hvilken moduler som er "
+"installert."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Under denne meny finner du instillinger som gjør det mulig å konfigurere og "
+"utføre 'Voice' operasjoner på systemet ditt. Dette er kjent som diagnostikk."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "Administrasjon Diagnostikk"
diff --git a/trunk/package/luci/po/no/watchcat.po b/trunk/package/luci/po/no/watchcat.po
new file mode 100644
index 00000000..4aa0c6b6
--- /dev/null
+++ b/trunk/package/luci/po/no/watchcat.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/no/wol.po b/trunk/package/luci/po/no/wol.po
new file mode 100644
index 00000000..2f0a8ad6
--- /dev/null
+++ b/trunk/package/luci/po/no/wol.po
@@ -0,0 +1,47 @@
+msgid ""
+msgstr ""
+"Last-Translator: Lars Hardy <lars.hardy@gmail.com>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Send på alle grensesnitt"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+"Velg hvilken vert som skal startes opp, eller angi en MAC adresse som skal "
+"brukes"
+
+msgid "Host to wake up"
+msgstr "Vert som skal startes opp"
+
+msgid "Network interface to use"
+msgstr "Nettverksgrensesnitt"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Noen ganger virker bare ett av disse verktøyene. Hvis ett av de ikke lykkes "
+"med å starte opp verten kan du prøve det andre."
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Angir grensesnittet som WoL pakken blir sendt ut på"
+
+msgid "Starting WoL utility:"
+msgstr "Starter WoL:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LAN er en mekanisme for å starte opp datamaskiner i det lokale "
+"nettverket."
+
+msgid "Wake up host"
+msgstr "Start vert"
+
+msgid "WoL program"
+msgstr "WoL programm"
diff --git a/trunk/package/luci/po/no/wshaper.po b/trunk/package/luci/po/no/wshaper.po
new file mode 100644
index 00000000..d646e764
--- /dev/null
+++ b/trunk/package/luci/po/no/wshaper.po
@@ -0,0 +1,40 @@
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/pl/ahcp.po b/trunk/package/luci/po/pl/ahcp.po
new file mode 100644
index 00000000..50952249
--- /dev/null
+++ b/trunk/package/luci/po/pl/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-14 16:40+0200\n"
+"Last-Translator: Tomecki <przykryweczka@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "AHCP Server"
+msgstr "Serwer AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP to protokół automatycznej konfiguracji sieci IPv6 i IPv6/IPv4 "
+"przeznaczone do stosowania zamiast DHCP w sieciach, w których jest trudne "
+"lub wręcz niemożliwe, aby skonfigurować serwer w każdej warstwie łącza "
+"domeny rozgłoszeniowej, na przykład w mobilnych sieciach ad-hoc."
+
+msgid "Active AHCP Leases"
+msgstr "Aktywne dzierżawy AHCP"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Age"
+msgstr "Wiek"
+
+msgid "Announced DNS servers"
+msgstr "Rozgłaszane serwery DNS"
+
+msgid "Announced NTP servers"
+msgstr "Rozgłaszane serwery NTP"
+
+msgid "Announced prefixes"
+msgstr "Rozgłaszane prefiksy"
+
+msgid "Collecting data..."
+msgstr "Zbieranie informacji..."
+
+msgid "Forwarder"
+msgstr "Przekierowanie"
+
+msgid "General Setup"
+msgstr "Ustawienia podstawowe"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 oraz IPv6"
+
+msgid "IPv4 only"
+msgstr "Tylko IPv4"
+
+msgid "IPv6 only"
+msgstr "Tylko IPv6"
+
+msgid "Lease directory"
+msgstr "Katalog dzierżaw"
+
+msgid "Lease validity time"
+msgstr "Czas dzierżawy"
+
+msgid "Log file"
+msgstr "Plik dziennika"
+
+msgid "Multicast address"
+msgstr "Adres Multicast"
+
+msgid "Operation mode"
+msgstr "Tryb pracy"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Rodzina protokołów"
+
+msgid "Served interfaces"
+msgstr "Udostępniane interfejsy"
+
+msgid "Server"
+msgstr "Serwer"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Określa rozgłaszane adresy IPv4/6 serwerów NTP"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Określa rozgłaszane adresy IPv4/6 serwerów nazw"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Określa rozgłaszane prefiksy sieciowe w notacji CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "Usługa AHCP nie jest uruchomiona."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Usługa AHCP jest uruchomiona z ID %s."
+
+msgid "There are no active leases."
+msgstr "Nie ma aktywnych dzierżaw."
+
+msgid "Unique ID file"
+msgstr "Unikalny plik ID"
diff --git a/trunk/package/luci/po/pl/asterisk.po b/trunk/package/luci/po/pl/asterisk.po
new file mode 100644
index 00000000..f0928532
--- /dev/null
+++ b/trunk/package/luci/po/pl/asterisk.po
@@ -0,0 +1,75 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-18 01:39+0200\n"
+"Last-Translator: Michał <msjablonsky@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Ustawienia Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Katalog AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Buforuj nagrane pliki podczas nagrywania"
+
+#~ msgid "Debug Level"
+#~ msgstr "Poziom debugowania"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Wyłącz niektóre ostrzeżenia"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Wykonaj zrzut pamięci podczas awarii"
+
+#~ msgid "High Priority"
+#~ msgstr "Wysoki Priorytet"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Uruchom Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Użyj wbudowanego próbkowania"
+
+#~ msgid "Log directory"
+#~ msgstr "Katalog logów"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Max. dozwolona ilość połączeń"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Max. obciążenie powodujące odrzucanie nowych połączeń"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Wyłącz kolory konsoli"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Katalog tymczasowy dla plików dźwiękowych"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Grupa dla uruchamiania"
+
+#~ msgid "The User to run as"
+#~ msgstr "Użytkownik dla uruchamiania"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Katalog bufora poczty głosowej"
+
+#~ msgid "Time Zone"
+#~ msgstr "Strefa Czasowa"
+
+#~ msgid "localzone"
+#~ msgstr "localzone"
+
+#~ msgid "parkedmusicclass"
+#~ msgstr "parkedmusicclass"
diff --git a/trunk/package/luci/po/pl/base.po b/trunk/package/luci/po/pl/base.po
new file mode 100644
index 00000000..fd55a1e2
--- /dev/null
+++ b/trunk/package/luci/po/pl/base.po
@@ -0,0 +1,3198 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-20 09:40+0200\n"
+"PO-Revision-Date: 2014-04-23 19:15+0200\n"
+"Last-Translator: goodgod261 <goodgod261@wp.pl>\n"
+"Language-Team: Polish\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(okno %d minut, interwał %d sekund)"
+
+msgid "(%s available)"
+msgstr "(dostępne %s)"
+
+msgid "(empty)"
+msgstr "(pusty)"
+
+msgid "(no interfaces attached)"
+msgstr "(brak podłączonych interfejsów)"
+
+msgid "-- Additional Field --"
+msgstr "-- Dodatkowe pole --"
+
+msgid "-- Please choose --"
+msgstr "-- Proszę wybrać --"
+
+msgid "-- custom --"
+msgstr "-- własne --"
+
+msgid "1 Minute Load:"
+msgstr "Obciążenie w ciągu 1 minuty:"
+
+msgid "15 Minute Load:"
+msgstr "Obciążenie w ciągu 15 minut:"
+
+msgid "5 Minute Load:"
+msgstr "Obciążenie w ciągu 5 minut:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "Port wywołania <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "Port serwera <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"Nazwa <abbr title=\"Domain Name System\">DNS</abbr> będzie rozwijana przez "
+"kolejne serwery w porządku podanym w resolvfile"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Adres <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "Brama <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "Maska sieci <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"Adres sieci (CIDR) <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "Brama <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Konfiguracja diod <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Nazwa diody <abbr title=\"Light Emitting Diode\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Adres <abbr title=\"Media Access Control\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"Maksymalna ilość\">Maks.</abbr> dzierżaw <abbr title=\"Dynamic "
+"Host Configuration Protocol\">DHCP</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"Maksymalny\">Maks.</abbr> rozmiar pakietu <abbr title="
+"\"Extension Mechanisms for Domain Name System\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"Maksymalna ilość\">Maks.</abbr> zapytań równoczesnych"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Par: %s / Grup: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+# Wydaje mi się że brakuje litery R...
+msgid "AR Support"
+msgstr "Wsparcie dla ARP"
+
+msgid "ARP retry threshold"
+msgstr "Próg powtórzeń ARP"
+
+msgid "ATM Bridges"
+msgstr "Mostki ATM"
+
+# Nie wiem czy to powinno się tłumaczyć wg. mnie lepiej zostawić po angielsku
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Identyfikator kanału wirtualnego ATM (VCI)"
+
+# j.w.
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Identyfikator ścieżki wirtualnej ATM (VPI)"
+
+# Jak zwykle zakręciłem...niech ktoś poprawi
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Mostki ATM maskują za-kapsułkowane ramki Ethernet w połączeniach AAL5 jako "
+"wirtualne interfejsy w Linuksie. Interfejsy takie mogą być użyte w "
+"połączeniu z protokołami DHCP lub PPP do wdzwaniania się do sieci provider`a"
+
+msgid "ATM device number"
+msgstr "Numer urządzenia ATM"
+
+# co to takiego?
+msgid "Access Concentrator"
+msgstr "Koncentrator dostępowy ATM"
+
+msgid "Access Point"
+msgstr "Punkt dostępowy"
+
+msgid "Action"
+msgstr "Akcja"
+
+msgid "Actions"
+msgstr "Akcje"
+
+msgid "Activate this network"
+msgstr "Aktywuj tą sieć"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Aktywne trasy routingu <abbr title=\"Internet Protocol Version 4\">IPv4</"
+"abbr>"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Aktywne trasy routingu <abbr title=\"Internet Protocol Version 6\">IPv6</"
+"abbr>"
+
+msgid "Active Connections"
+msgstr "Aktywne połączenia"
+
+msgid "Active DHCP Leases"
+msgstr "Aktywne dzierżawy DHCP"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Aktywne dzierżawy DHCPv6"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Dodaj lokalny sufiks domeny do nazw urządzeń z pliku hosts"
+
+msgid "Add new interface..."
+msgstr "Dodaj nowy interfejs..."
+
+msgid "Additional Hosts files"
+msgstr "Dodatkowe pliki Hosts"
+
+msgid "Address"
+msgstr "Adres"
+
+# Na upartego można by zrobić Adres dostępowy mostu przekaźnikowego - ale kto to zrozumie?
+msgid "Address to access local relay bridge"
+msgstr "Adres dostępowy do \"relay bridge\""
+
+msgid "Administration"
+msgstr "Zarządzanie"
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Alert"
+msgstr "Alarm"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "Pozwól na logowanie <abbr title=\"Secure Shell\">SSH</abbr>"
+
+msgid "Allow all except listed"
+msgstr "Pozwól wszystkim oprócz wymienionych"
+
+msgid "Allow listed only"
+msgstr "Pozwól tylko wymienionym"
+
+msgid "Allow localhost"
+msgstr "Pozwól tylko sobie (localhost)"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Pozwól zdalnym komputerom na połączenia SSH do lokalnych przekierowanych "
+"portów"
+
+msgid "Allow root logins with password"
+msgstr "Zezwól na logowanie roota przy pomocy hasła"
+
+# Brak spacji...
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Pozwól użytkownikowi <em>root</em> na logowanie przy pomocy hasła"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Pozwól na ruch wychodzący (odpowiedzi) z podsieci 127.0.0.0/8, np. usługi RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Zawsze używaj kanał 40MHz nawet jeśli drugi kanał pokrywa się. Użycie tej "
+"opcji nie jest zgodne ze standardem IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+"Zostanie utworzona dodatkowa sieć jeśli zostawisz tą opcję niezaznaczoną."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antena 1"
+
+msgid "Antenna 2"
+msgstr "Antena 2"
+
+msgid "Antenna Configuration"
+msgstr "Ustawienia anteny"
+
+msgid "Any zone"
+msgstr "Dowolna strefa"
+
+msgid "Apply"
+msgstr "Zatwierdź"
+
+msgid "Applying changes"
+msgstr "Wprowadzam zmiany"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Przypisz interfejsy..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Połączone stacje"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Bezprzewodowy kontroler Atheros 802.11%s"
+
+msgid "Authentication"
+msgstr "Uwierzytelnianie"
+
+# Nawet M$ tego nie tłumaczy;)
+msgid "Authoritative"
+msgstr "Autorytatywny"
+
+msgid "Authorization Required"
+msgstr "Wymagana autoryzacja"
+
+msgid "Auto Refresh"
+msgstr "Automatyczne odświeżanie"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Dostępne"
+
+msgid "Available packages"
+msgstr "Dostępne pakiety"
+
+msgid "Average:"
+msgstr "Średnia:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Wróć"
+
+msgid "Back to Overview"
+msgstr "Wróć do przeglądu"
+
+msgid "Back to configuration"
+msgstr "Wróć do konfiguracji"
+
+msgid "Back to overview"
+msgstr "Wróć do przeglądu"
+
+msgid "Back to scan results"
+msgstr "Wróć do wyników skanowania"
+
+msgid "Background Scan"
+msgstr "Skanowanie w tle"
+
+msgid "Backup / Flash Firmware"
+msgstr "Kopia zapasowa/aktualizacja firmware"
+
+# NIe ma powodu skracać tekstu, zmieści się w polu.
+msgid "Backup / Restore"
+msgstr "Kopia zapasowa/Przywróć"
+
+msgid "Backup file list"
+msgstr "Kopia zapas. listy plików"
+
+msgid "Bad address specified!"
+msgstr "Wprowadzono zły adres"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Poniżej widoczna jest lista plików przeznaczonych do kopii zapasowej. "
+"Zawiera ona zmienione pliki konfiguracyjne oznaczone przez opkg, podstawowe "
+"pliki systemowe, oraz pliki oznaczone do kopiowania przez użytkownika."
+
+msgid "Bitrate"
+msgstr "Przepływność"
+
+msgid "Bogus NX Domain Override"
+msgstr "Podrób statystyki NXDOMAIN"
+
+msgid "Bridge"
+msgstr "Most"
+
+msgid "Bridge interfaces"
+msgstr "Interfejs mostu"
+
+msgid "Bridge unit number"
+msgstr "Numer Mostu (urządzenia)"
+
+# Podejrzewam że chodzi o interfejs? mam rację?
+msgid "Bring up on boot"
+msgstr "Podnieś przy stracie"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Bezprzewodowy kontroler Broadcom 802.11%s"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Bezprzewodowy kontroler Broadcom BCM%04x 802.11"
+
+msgid "Buffered"
+msgstr "Buforowana"
+
+msgid "Buttons"
+msgstr "Przyciski"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Użycie CPU (%)"
+
+msgid "Cached"
+msgstr "Cache"
+
+msgid "Cancel"
+msgstr "Anuluj"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Łańcuch"
+
+msgid "Changes"
+msgstr "Zmiany"
+
+msgid "Changes applied."
+msgstr "Zmiany zostały zastosowane."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Zmienia hasło administratora"
+
+msgid "Channel"
+msgstr "Kanał"
+
+msgid "Check"
+msgstr "Sprawdź"
+
+msgid "Checksum"
+msgstr "Suma kontrolna"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Wybierz strefę firewalla którą chcesz przypisać do tego interfejsu. Wybierz "
+"<em>unspecified</em> aby usunąć interfejs z przypisanej strefy lub wybierz "
+"pole <em>create</em> aby zdefiniować nową strefę i przypisać ją do "
+"interfejsu."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Wybierz sieć/sieci które chcesz przyłączyć do tego interfejsu "
+"bezprzewodowego lub wypełnij pole <em>utwórz</em> aby utworzyć nową sieć."
+
+msgid "Cipher"
+msgstr "Szyfr"
+
+# Przyciski nazywają sie "Twórz archiwum" i "Wykonaj reset" a nie Przywróć Ustawienia
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Wciśnij \"Twórz archiwum\" aby pobrać archiwum tar zawierające bieżące pliki "
+"konfiguracyjne. Aby przywrócić ustawienia domyślne wciśnij \"Wykonaj reset"
+"\" (możliwe tylko w przypadku obrazu squashfs)."
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Nazwa (ID) klienta do wysłania podczas negocjacji DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Zamykaj nieaktywne połączenia po określonym czasie podanym w sekundach, "
+"wpisz 0 aby uzyskać stałe połączenie."
+
+msgid "Close list..."
+msgstr "Zamknij listę..."
+
+msgid "Collecting data..."
+msgstr "Zbieranie danych..."
+
+msgid "Command"
+msgstr "Polecenie"
+
+msgid "Common Configuration"
+msgstr "Konfiguracja podstawowa"
+
+msgid "Compression"
+msgstr "Kompresja"
+
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+msgid "Configuration applied."
+msgstr "Konfiguracja została zastosowana."
+
+msgid "Configuration files will be kept."
+msgstr "Pliki konfiguracyjne zostaną zachowane."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr "Konfiguruje ten zasób jako zasób overlay dla block-extroot"
+
+msgid "Confirmation"
+msgstr "Potwierdzenie"
+
+msgid "Connect"
+msgstr "Połącz"
+
+msgid "Connected"
+msgstr "Połączony"
+
+msgid "Connection Limit"
+msgstr "Limit połączeń"
+
+msgid "Connections"
+msgstr "Połączenia"
+
+msgid "Country"
+msgstr "Kraj"
+
+msgid "Country Code"
+msgstr "Kod kraju"
+
+# Pokrywa następujące interfejsy
+msgid "Cover the following interface"
+msgstr "Pokrywa następujący interfejs"
+
+msgid "Cover the following interfaces"
+msgstr "Pokrywa następujące interfejsy"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Utwórz / Przypisz strefę firewalla"
+
+msgid "Create Interface"
+msgstr "Utwórz interfejs"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Utwórz most pomiędzy wieloma interfejsami"
+
+msgid "Critical"
+msgstr "Krytyczne"
+
+msgid "Cron Log Level"
+msgstr "Poziom logowania Cron`a"
+
+msgid "Custom Interface"
+msgstr "Interfejs Niestandardowy"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+# Spacji zabrało i napisy się skleiły
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Dostosuj zachowanie diod <abbr title=\"Light Emitting Diode\">LED</abbr> "
+"urządzenia jeśli jest to możliwe."
+
+msgid "DHCP Leases"
+msgstr "Dzierżawy DHCP"
+
+msgid "DHCP Server"
+msgstr "Serwer DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP i DNS"
+
+msgid "DHCP client"
+msgstr "Klient DHCP"
+
+msgid "DHCP-Options"
+msgstr "Opcje DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Dzierżawy DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Przekierowania DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "Default %d"
+msgstr "Domyślne %d"
+
+msgid "Default gateway"
+msgstr "Brama domyślna"
+
+msgid "Default state"
+msgstr "Stan domyślny"
+
+msgid "Define a name for this network."
+msgstr "Określ nazwę dla tej sieci."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Zdefiniuj dodatkowe opcje DHCP, np. \"<code>6,192.168.2.1,192.168.2.2</code>"
+"\" rozgłasza domyślne serwery DNS klientom DHCP."
+
+msgid "Delete"
+msgstr "Usuń"
+
+msgid "Delete this interface"
+msgstr "Usuń ten interfejs"
+
+msgid "Delete this network"
+msgstr "Usuń tą sieć"
+
+msgid "Description"
+msgstr "Opis"
+
+# Ktoś tłumaczył bez zobaczenia tego w gui. Dotyczy zmiany motywu ten opis.
+msgid "Design"
+msgstr "Motyw"
+
+msgid "Destination"
+msgstr "Przeznaczenie"
+
+msgid "Device"
+msgstr "Urządzenie"
+
+msgid "Device Configuration"
+msgstr "Konfiguracja urządzenia"
+
+msgid "Diagnostics"
+msgstr "Diagnostyka"
+
+msgid "Directory"
+msgstr "Katalog"
+
+msgid "Disable"
+msgstr "Wyłącz"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Wyłącz <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> na "
+"tym interfejsie."
+
+msgid "Disable DNS setup"
+msgstr "Wyłącz konfigurowanie DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Wyłącz zegar HW-Beacon"
+
+msgid "Disabled"
+msgstr "Wyłączony"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Odrzuć wychodzące odpowiedzi RFC1918"
+
+msgid "Displaying only packages containing"
+msgstr "Pokazuję tylko paczki zawierające"
+
+msgid "Distance Optimization"
+msgstr "Optymalizacja odległości"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Odległość do najdalej oddalonego członka sieci w metrach."
+
+# Jak poprzednio trzymam się konwencji
+msgid "Diversity"
+msgstr "Wielorakość"
+
+# Nie wiem czy nie zamotałem ja rozumiem;)
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq jest to serwer <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> połączony z serwerem <abbr title=\"Domain Name System\">DNS</"
+"abbr>. Jest to serwer przekazujący (Fowarder) dla firewalli <abbr title="
+"\"Network Address Translation\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "Nie cache`uj odpowiedzi negatywnych, np. nie dla bieżących domen"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Nie przekazuj zapytań które nie mogą być zrealizowane przez publiczne "
+"serwery nazw"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Nie przekazuj odwrotnych lookup`ów do sieci lokalnych"
+
+msgid "Do not send probe responses"
+msgstr "Nie wysyłaj ramek probe response"
+
+msgid "Domain required"
+msgstr "Wymagana domena"
+
+msgid "Domain whitelist"
+msgstr "Whitelist domen (Dozwolone domeny)"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Nie przekazuj zapytań <abbr title=\"Domain Name System\">DNS</abbr> bez "
+"nazwy <abbr title=\"Domain Name System\">DNS</abbr>'a"
+
+msgid "Download and install package"
+msgstr "Pobierz i zainstaluj pakiet"
+
+msgid "Download backup"
+msgstr "Pobierz kopię zapasową"
+
+msgid "Dropbear Instance"
+msgstr "Usługa Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear oferuje zdalny dostęp do konsoli (shell`a) poprzez swojego klienta "
+"<abbr title=\"Secure Shell\">SSH</abbr> oraz serwer <abbr title=\"Secure Copy"
+"\">SCP</abbr>"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+# "n"  brakowało...
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dynamiczne"
+
+msgid "Dynamic tunnel"
+msgstr "Tunel dynamiczny"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Dynamicznie rezerwuje adresy DHCP dla klientów. Jeśli jest wyłączone tylko "
+"klienci posiadający stałe dzierżawy będą obsłużeni."
+
+msgid "EAP-Method"
+msgstr "Metoda EAP"
+
+msgid "Edit"
+msgstr "Edycja"
+
+msgid "Edit this interface"
+msgstr "Edytuj ten interfejs"
+
+msgid "Edit this network"
+msgstr "Edytuj tą sieć"
+
+# dosłownie nagły wypadek
+msgid "Emergency"
+msgstr "Zagrożenie"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Włącz <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Włącz dynamiczną aktualizację punktu końcowego sieci HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Włącz negocjację IPv6 na łączu PPP"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Włącz przechodzenie ramek Jumbo"
+
+msgid "Enable NTP client"
+msgstr "Włącz klienta NTP"
+
+msgid "Enable TFTP server"
+msgstr "Włącz serwer TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Włącz funkcjonalność VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Włącz uczenie się i starzenie"
+
+msgid "Enable this mount"
+msgstr "Włącz ten punkt montowania"
+
+msgid "Enable this swap"
+msgstr "Włącz ten swap"
+
+msgid "Enable/Disable"
+msgstr "Wlącz/Wyłącz"
+
+msgid "Enabled"
+msgstr "Włączony"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+"Włącz protokół <abbr title=\"Spanning Tree Protocol\">STP</abbr> na tym "
+"moście"
+
+# a może sposób kapsułkowania byłby lepszy?
+msgid "Encapsulation mode"
+msgstr "Sposób Enkapsulacji"
+
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+msgid "Erasing..."
+msgstr "Usuwanie..."
+
+msgid "Error"
+msgstr "Błąd"
+
+msgid "Ethernet Adapter"
+msgstr "Karta Ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Switch Ethernet"
+
+msgid "Expand hosts"
+msgstr "Rozwiń hosty"
+
+msgid "Expires"
+msgstr "Wygasa"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Czas wygasania dzierżawy adresu, minimum to 2 Minuty (<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Zewnętrzny serwer dla loga systemowego"
+
+msgid "External system log server port"
+msgstr "Port zewnętrznego serwera dla loga systemowego"
+
+msgid "Fast Frames"
+msgstr "Szybkie ramki (Fast Frames)"
+
+msgid "File"
+msgstr "Plik"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Rozgłoszono nazwę pliku obrazu startowego do klientów"
+
+msgid "Filesystem"
+msgstr "System plików"
+
+msgid "Filter"
+msgstr "Filtr"
+
+msgid "Filter private"
+msgstr "Filtruj prywatne"
+
+msgid "Filter useless"
+msgstr "Filtruj bezużyteczne"
+
+msgid "Find and join network"
+msgstr "Znajdź i podłącz się do sieci"
+
+msgid "Find package"
+msgstr "Znajdź pakiet"
+
+msgid "Finish"
+msgstr "Zakończ"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+# Nie ma potrzeby pisania z dużej litery
+msgid "Firewall Settings"
+msgstr "Ustawienia firewalla"
+
+msgid "Firewall Status"
+msgstr "Stan firewalla"
+
+msgid "Firmware Version"
+msgstr "Wersja firmware"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Stały port źródłowy dla wychodzących zapytań DNS"
+
+msgid "Flags"
+msgstr "Flagi"
+
+msgid "Flash Firmware"
+msgstr "Aktualizuj firmware"
+
+msgid "Flash image..."
+msgstr "Wgraj obraz..."
+
+msgid "Flash new firmware image"
+msgstr "Wgraj nowy firmware"
+
+msgid "Flash operations"
+msgstr "Operacje aktualizacji"
+
+msgid "Flashing..."
+msgstr "Flashowanie..."
+
+msgid "Force"
+msgstr "Wymuś"
+
+msgid "Force 40MHz mode"
+msgstr "Wymuś tryb 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Wymuś CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+"Wymuś uruchomienie serwera DHCP w tej sieci nawet gdy wykryto inny serwer."
+
+msgid "Force TKIP"
+msgstr "Wymuś TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Wymuś TKIP i CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Przekazuj ruch DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Przekazuj broadcast`y"
+
+msgid "Forwarding mode"
+msgstr "Tryb przekazywania"
+
+msgid "Fragmentation Threshold"
+msgstr "Próg Fragmentacji"
+
+msgid "Frame Bursting"
+msgstr "Dzielenie ramek"
+
+msgid "Free"
+msgstr "Wolna"
+
+msgid "Free space"
+msgstr "Wolna przestrzeń"
+
+msgid "Frequency Hopping"
+msgstr "Skakanie po częstotliwościach"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Tylko GPRS"
+
+msgid "Gateway"
+msgstr "Brama"
+
+msgid "Gateway ports"
+msgstr "Porty bramy"
+
+msgid "General Settings"
+msgstr "Ustawienia główne"
+
+msgid "General Setup"
+msgstr "Ustawienia podstawowe"
+
+msgid "Generate archive"
+msgstr "Twórz archiwum"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Ogólny bezprzewodowy kontroler 802.11%s"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+"Hasło nie zostało zmienione, wpisane poprzednie hasło routera jest "
+"niewłaściwe!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Przejdź do konfiguracji hasła..."
+
+msgid "Go to relevant configuration page"
+msgstr "Przejdź do powiązanych ustawień"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Hasło HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Uchwyt"
+
+msgid "Hang Up"
+msgstr "Rozłącz"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Tutaj możesz skonfigurować podstawowe ustawienia twojego urządzenia, np. "
+"nazwę hosta, strefę czasową."
+
+# nie ma słowa "autentykacji". Uwierzytelnianie!
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Tutaj wklej swoje klucze publiczne SSH (po jednym w linii), dla "
+"uwierzytelniania SSH"
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Kontroler bezprzewodowy Hermes 802.11b"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"Ukryj <abbr title=\"Extended Service Set Identifier (Nazwę sieci)\">ESSID</"
+"abbr>"
+
+msgid "Host entries"
+msgstr "Wpisy PC"
+
+msgid "Host expiry timeout"
+msgstr "Czas wygasania hosta"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "<abbr title=\"Internet Protocol Address\">IP</abbr> lub sieć Hosta"
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Nazwa hosta do wysłania podczas negocjacji DHCP"
+
+msgid "Hostnames"
+msgstr "Nazwy hostów"
+
+msgid "IP address"
+msgstr "Adres IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Firewall IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Status IPv4 WAN"
+
+msgid "IPv4 address"
+msgstr "Adres IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 oraz IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Broadcast IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Brama IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Maska IPv4"
+
+msgid "IPv4 only"
+msgstr "Tylko IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Długość prefiksu IPv4"
+
+msgid "IPv4-Address"
+msgstr "Adres IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Firewall IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Status WAN IPv6"
+
+msgid "IPv6 address"
+msgstr "Adres IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Brama IPv6"
+
+msgid "IPv6 only"
+msgstr "Tylko IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Prefiks IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Długość prefiksu IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "Adres IPv6"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-w-IPv4 (RFC4213)"
+
+# 6rd to nie "szóste", tylko IPv6 rapid deployment
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-przez-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-przez-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Tożsamość"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Jeśli podano, zainstaluj urządzenie poprzez jego UUID zamiast <abbr title="
+"\"fixed device node\">ustalonego węzła urządzenia</abbr>"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Jeśli podano, zainstaluj urządzenie poprzez nazwę partycji zamiast <abbr "
+"title=\"fixed device node\">ustalonego węzła urządzenia</abbr>"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Jeśli odznaczone, nie ma zdefiniowanej domyślnej ścieżki routingu"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Jeśli odznaczone, rozgłoszane adresy serwerów DNS są ignorowane"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Jeśli ilość twojej pamięci fizycznej jest niewystarczająca, nieużywane "
+"miejsce na dysku może być tymczasowo wykorzystane na urządzenie pliku "
+"wymiany. W rezultacie większa ilość pamięci <abbr title=\"Random Access "
+"Memory\">RAM</abbr> będzie dostępna. Uwaga - plik wymiany jest dużo "
+"wolniejszy niż pamięć <abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ignoruj pliki Hosts"
+
+msgid "Ignore interface"
+msgstr "Ignoruj interfejs"
+
+msgid "Ignore resolve file"
+msgstr "Ignoruj pliki resolve"
+
+msgid "Image"
+msgstr "Obraz"
+
+msgid "In"
+msgstr "W"
+
+msgid "Inactivity timeout"
+msgstr "Czas bezczynności"
+
+msgid "Inbound:"
+msgstr "Przychodzący:"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Initscript"
+msgstr "Skrypt startowy"
+
+msgid "Initscripts"
+msgstr "Skrypty startowe"
+
+msgid "Install"
+msgstr "Instaluj"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Instaluj pakiet %q"
+
+msgid "Install protocol extensions..."
+msgstr "Instaluj rozszerzenia protokołów..."
+
+msgid "Installed packages"
+msgstr "Zainstalowane pakiety"
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid "Interface Configuration"
+msgstr "Konfiguracja Interfejsu"
+
+# Tam jest lista interfejsów....
+msgid "Interface Overview"
+msgstr "Przegląd Interfejsów"
+
+msgid "Interface is reconnecting..."
+msgstr "Ponowne łączenie interfejsu..."
+
+msgid "Interface is shutting down..."
+msgstr "Interfejs jest wyłączany..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Interfejs nie istnieje lub nie jest jeszcze podłączony."
+
+msgid "Interface reconnected"
+msgstr "Połączono ponownie interfejs"
+
+msgid "Interface shut down"
+msgstr "Wyłączono interfejs"
+
+msgid "Interfaces"
+msgstr "Interfejsy"
+
+# Nadużycie tagu abbr uważam za uzasadnione.
+msgid "Internal Server Error"
+msgstr "Wewnętrzny błąd serwera"
+
+msgid "Invalid"
+msgstr "Niewłaściwy"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "Podano niewłaściwy ID VLAN`u! Dozwolone są tylko ID pomiędzy %d a %d."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "Podano niewłaściwy ID VLAN`u! Dozwolone są tylko unikalne ID."
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Niewłaściwy login i/lub hasło! Spróbuj ponownie."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Wygląda na to, że próbujesz wgrać obraz większy niż twoja pamięć flash, "
+"proszę sprawdź czy to właściwy obraz!"
+
+msgid "Java Script required!"
+msgstr "Java Script jest wymagany!"
+
+msgid "Join Network"
+msgstr "Połącz z siecią"
+
+msgid "Join Network: Settings"
+msgstr "Przyłącz do sieci: Ustawienia"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Przyłącz do sieci: Skanuj sieci WiFi"
+
+msgid "Keep settings"
+msgstr "Zachowaj ustawienia"
+
+msgid "Kernel Log"
+msgstr "Log jądra"
+
+msgid "Kernel Version"
+msgstr "Wersja jądra"
+
+msgid "Key"
+msgstr "Klucz"
+
+msgid "Key #%d"
+msgstr "Klucz #%d"
+
+msgid "Kill"
+msgstr "Zabij"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Serwer L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr "Próg błędu echa LCP"
+
+msgid "LCP echo interval"
+msgstr "Częstotliwość echa LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Oznaczenie"
+
+msgid "Language"
+msgstr "Język"
+
+msgid "Language and Style"
+msgstr "Wygląd i język"
+
+msgid "Lease validity time"
+msgstr "Czas ważności dzierżawy"
+
+msgid "Leasefile"
+msgstr "Plik dzierżaw"
+
+msgid "Leasetime"
+msgstr "Czas dzierżawy"
+
+msgid "Leasetime remaining"
+msgstr "Pozostały czas dzierżawy"
+
+msgid "Leave empty to autodetect"
+msgstr "Pozostaw niewypełnione dla autodetekcji"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Pozostaw niewypełnione aby użyć bieżącego adresu WAN"
+
+msgid "Legend:"
+msgstr "Legenda:"
+
+msgid "Limit"
+msgstr "Limit"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Połączenie aktywne"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Lista serwerów <abbr title=\"Domain Name System\">DNS</abbr> do których będą "
+"przekazywane zapytania"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Lista domen zezwalających na odpowiedzi RFC1918"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Lista hostów które dostarczają zafałszowane wyniki NX domain"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Słuchaj tylko na podanym interfejsie, lub jeśli nie podano na wszystkich"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Port nasłuchu dla przychodzących zapytań DNS"
+
+msgid "Load"
+msgstr "Obciążenie"
+
+msgid "Load Average"
+msgstr "Średnie obciążenie"
+
+msgid "Loading"
+msgstr "Ładowanie"
+
+msgid "Local IPv4 address"
+msgstr "Lokalny adres IPv4"
+
+msgid "Local IPv6 address"
+msgstr "Lokalny adres IPv6"
+
+msgid "Local Startup"
+msgstr "Lokalny autostart"
+
+msgid "Local Time"
+msgstr "Czas lokalny"
+
+msgid "Local domain"
+msgstr "Domena lokalna"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Specyfikacja domeny lokalnej. Nazwy należące do tej domeny nie są "
+"przekazywane dalej ani rozwijane przez DHCP lub tylko pliki hosts"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Przyrostek (suffiks) domeny przyłączany do nazw DHCP i wpisów w pliku hosts"
+
+msgid "Local server"
+msgstr "Serwer lokalny"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Zlokalizuj nazwę hosta w zależności od odpytującej podsieci jeśli jest "
+"dostępne więcej niż jedno IP"
+
+msgid "Localise queries"
+msgstr "Zapytania lokalizujące"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Zablokowano dla kanału %d używanego przez %s"
+
+msgid "Log output level"
+msgstr "Poziom logowania"
+
+msgid "Log queries"
+msgstr "Loguj zapytania"
+
+msgid "Logging"
+msgstr "Logowanie"
+
+msgid "Login"
+msgstr "Zaloguj"
+
+msgid "Logout"
+msgstr "Wyloguj"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "Najniższy wydzierżawiony adres jako offset dla adresu sieci."
+
+msgid "MAC-Address"
+msgstr "Adres MAC"
+
+msgid "MAC-Address Filter"
+msgstr "Filtr adresów MAC"
+
+msgid "MAC-Filter"
+msgstr "Filtr adresów MAC"
+
+msgid "MAC-List"
+msgstr "Lista MAC"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Maksymalna Szybkość"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Maksymalna dozwolona liczba aktywnych dzierżaw DHCP"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Maksymalna dozwolona liczba jednoczesnych zapytań DNS"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Maksymalny dozwolony rozmiar pakietu EDNS.0 UDP"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Maksymalny czas podany w sekundach do pełnej gotowości modemu"
+
+msgid "Maximum hold time"
+msgstr "Maksymalny czas podtrzymania"
+
+msgid "Maximum number of leased addresses."
+msgstr "Maksymalna liczba dzierżawionych adresów."
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Pamięć"
+
+msgid "Memory usage (%)"
+msgstr "Użycie pamięci (%)"
+
+msgid "Metric"
+msgstr "Metryka"
+
+msgid "Minimum Rate"
+msgstr "Minimalna Szybkość"
+
+msgid "Minimum hold time"
+msgstr "Minimalny czas podtrzymania"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Brakujące rozszerzenie protokołu dla protokołu %q"
+
+msgid "Mode"
+msgstr "Tryb"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Modem"
+
+msgid "Modem init timeout"
+msgstr "Limit czasu inicjacji modemu"
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr "Wpis montowania"
+
+msgid "Mount Point"
+msgstr "Punkt montowania"
+
+msgid "Mount Points"
+msgstr "Punkty montowania"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Punkty montowania - Wpis montownia"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Punkty montowania - Wpis Swap"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Punkty montowania definiują gdzie urządzenie pamięci zostanie podłączone do "
+"systemu plików"
+
+msgid "Mount options"
+msgstr "Opcje montowania"
+
+msgid "Mount point"
+msgstr "Punkt montownia"
+
+msgid "Mounted file systems"
+msgstr "Zamontowane systemy plików"
+
+msgid "Move down"
+msgstr "Przesuń w dół"
+
+msgid "Move up"
+msgstr "Przesuń w górę"
+
+msgid "Multicast Rate"
+msgstr "Szybkość Multicast`u"
+
+msgid "Multicast address"
+msgstr "Adres Multicast`u"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Lista serwerów NTP"
+
+msgid "Name"
+msgstr "Nazwa"
+
+msgid "Name of the new interface"
+msgstr "Nazwa nowego interfejsu"
+
+msgid "Name of the new network"
+msgstr "Nazwa nowej sieci"
+
+msgid "Navigation"
+msgstr "Nawigacja"
+
+msgid "Netmask"
+msgstr "Maska sieci"
+
+msgid "Network"
+msgstr "Sieć"
+
+msgid "Network Utilities"
+msgstr "Narzędzia sieciowe"
+
+msgid "Network boot image"
+msgstr "Sieciowy obraz startowy"
+
+msgid "Network without interfaces."
+msgstr "Sieć bez interfejsów"
+
+msgid "Next »"
+msgstr "Następna »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Brak skonfigurowanego serwera DHCP dla tego interfejsu"
+
+msgid "No chains in this table"
+msgstr "Brak łańcuchów w tej tablicy"
+
+msgid "No files found"
+msgstr "Nie znaleziono plików"
+
+msgid "No information available"
+msgstr "Brak dostępnych informacji"
+
+msgid "No negative cache"
+msgstr "Brak odwrotnego cache`a"
+
+msgid "No network configured on this device"
+msgstr "Brak skonfigurowanych sieci na tym urządzeniu"
+
+msgid "No network name specified"
+msgstr "Nie podano nazwy sieci"
+
+msgid "No package lists available"
+msgstr "Brak dostępu do listy pakietów"
+
+msgid "No password set!"
+msgstr "Nie ustawiono hasła!"
+
+msgid "No rules in this chain"
+msgstr "Brak zasad w tym łańcuchu"
+
+msgid "No zone assigned"
+msgstr "Brak przypisanej strefy"
+
+msgid "Noise"
+msgstr "Szum"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Szum:"
+
+msgid "None"
+msgstr "Brak"
+
+msgid "Normal"
+msgstr "Normalny"
+
+msgid "Not Found"
+msgstr "Nie znaleziono"
+
+msgid "Not associated"
+msgstr "Nie powiązany"
+
+msgid "Not connected"
+msgstr "Nie podłączony"
+
+msgid "Note: Configuration files will be erased."
+msgstr "UWAGA: Pliki konfiguracyjne zostaną usunięte."
+
+msgid "Notice"
+msgstr "Spostrzeżenie"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Konfiguracja OPKG"
+
+msgid "Off-State Delay"
+msgstr "Zwłoka wyłączenia"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Na tej stronie można skonfigurować interfejsy urządzenia. Możesz zmostkować "
+"kilka interfejsów zaznaczając pole \"mostkuj interfejsy\", a następnie "
+"wpisując ich nazwy oddzielone spacjami. Można także użyć notacji <abbr title="
+"\"Virtual Local Area Network\">VLAN`ów</abbr> <samp>INTERFACE.VLANNR</samp> "
+"(<abbr title=\"na przykład\">np.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Zwłoka włączenia"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Nazwa hosta lub adres MAC musu być podany!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Jedno lub więcej pól zawiera nieprawidłowe wartości!"
+
+msgid "One or more required fields have no value!"
+msgstr "Jedno lub więcej pól nie posiada wpisanych wartości!"
+
+msgid "Open list..."
+msgstr "Otwórz listę..."
+
+msgid "Option changed"
+msgstr "Wartość zmieniona"
+
+msgid "Option removed"
+msgstr "Usunięto wartość"
+
+msgid "Options"
+msgstr "Opcje"
+
+msgid "Other:"
+msgstr "Inne:"
+
+msgid "Out"
+msgstr "Wychodzące"
+
+msgid "Outbound:"
+msgstr "Wychodzące:"
+
+msgid "Outdoor Channels"
+msgstr "Kanały zewnętrzne"
+
+msgid "Override MAC address"
+msgstr "Nadpisz adres MAC"
+
+msgid "Override MTU"
+msgstr "Nadpisz MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Nadpisz adres bramy w odpowiedziach DHCP"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Nadpisz maskę sieci wysyłaną do klientów. Zazwyczaj jest ona wyliczana z "
+"podsieci która jest rozsyłana."
+
+msgid "Override the table used for internal routes"
+msgstr "Nadpisz tablicę routingu używaną dla wewnętrznych tras routowania"
+
+msgid "Overview"
+msgstr "Przegląd"
+
+msgid "Owner"
+msgstr "Właściciel"
+
+msgid "PAP/CHAP password"
+msgstr "Hasło PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Nazwa użytkownika PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Enkapsulacja PPPoA"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Wymagany pakiet libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Lista pakietów jest starsza niż 24 godziny"
+
+msgid "Package name"
+msgstr "Nazwa pakietu"
+
+msgid "Packets"
+msgstr "Pakiety"
+
+msgid "Part of zone %q"
+msgstr "Część strefy %q"
+
+msgid "Password"
+msgstr "Hasło"
+
+msgid "Password authentication"
+msgstr "Identyfikacja hasłem"
+
+msgid "Password of Private Key"
+msgstr "Hasło lub klucz prywatny"
+
+msgid "Password successfully changed!"
+msgstr "Pomyślnie zmieniono hasło!"
+
+msgid "Path to CA-Certificate"
+msgstr "Ścieżka do certyfikatu CA"
+
+msgid "Path to Client-Certificate"
+msgstr "Ścieżka do certyfikatu Klienta"
+
+msgid "Path to Private Key"
+msgstr "Ścieżka do Klucza Prywatnego"
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+"Ścieżka do pliku wykonywalnego, który obsługuje zdarzenie dla danego "
+"przycisku"
+
+msgid "Peak:"
+msgstr "Szczyt:"
+
+msgid "Perform reboot"
+msgstr "Wykonaj restart"
+
+msgid "Perform reset"
+msgstr "Wykonaj reset"
+
+msgid "Phy Rate:"
+msgstr "Szybkość Phy:"
+
+msgid "Physical Settings"
+msgstr "Ustawienia sprzętowe"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "Pktw."
+
+msgid "Please enter your username and password."
+msgstr "Proszę wprowadź swój login i hasło."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Proszę czekać: Ponowne uruchamianie..."
+
+msgid "Policy"
+msgstr "Zasada"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Port %d jest nietagowany w wielu VLAN`ach!"
+
+msgid "Port status:"
+msgstr "Status portu:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Zakładaj że klient jest martwy po danej ilości błedów odpowiedzi echa LCP, "
+"wpisz 0 aby zignorować błędy"
+
+msgid "Prevents client-to-client communication"
+msgstr "Zapobiegaj komunikacji klientów pomiędzy sobą"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Kontroler bezprzewodowy Prism2/2.5/3 802.11b"
+
+msgid "Proceed"
+msgstr "Wykonaj"
+
+msgid "Processes"
+msgstr "Procesy"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protokół"
+
+msgid "Protocol family"
+msgstr "Rodzina protokołów"
+
+msgid "Protocol of the new interface"
+msgstr "Protokół nowego interfejsu"
+
+msgid "Protocol support is not installed"
+msgstr "Wsparcie dla protokołu nie jest zainstalowane"
+
+# Opcja dotyczy włączenia serwera czasu, więc "podaj" nie jest właściwym tłumaczeniem w tym miejscu - obsy
+msgid "Provide NTP server"
+msgstr "Włącz serwer NTP"
+
+msgid "Provide new network"
+msgstr "Utwórz nową sieć"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Jakość"
+
+msgid "RTS/CTS Threshold"
+msgstr "Próg RTS/CTS"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "Szybkość RX"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "Kontroler bezprzewodowy RaLink 802.11%s"
+
+msgid "Radius-Accounting-Port"
+msgstr "Port Radius-Accounting"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Sekret Radius-Accounting"
+
+msgid "Radius-Accounting-Server"
+msgstr "Serwer Radius-Accounting"
+
+msgid "Radius-Authentication-Port"
+msgstr "Port Radius-Authentication"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Sekret Radius-Authentication"
+
+msgid "Radius-Authentication-Server"
+msgstr "Serwer Radius-Authentication"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Przejrzyj plik <code>/etc/ethers</code> aby skonfigurować serwer <abbr title="
+"\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Naprawdę usunąć ten interfejs? Usunięcie nie może zostać cofnięte!\n"
+"Możesz stracić dostęp do tego urządzenia, jeśli jesteś połączony przez ten "
+"interfejs!"
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Naprawdę usunąć tę sieć bezprzewodową? Usunięcie nie może zostać cofnięte!\n"
+"Możesz stracić dostęp do tego urządzenia, jeśli jesteś połączony przez tę "
+"sieć!"
+
+msgid "Really reset all changes?"
+msgstr "Naprawdę usunąć wszelkie zmiany?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Naprawdę wyłączyć tę sieć?\n"
+"Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten "
+"interfejs!"
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Naprawdę wyłączyć interfejs \"%s\"?\n"
+"Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten "
+"interfejs!"
+
+msgid "Really switch protocol?"
+msgstr "Naprawdę zmienić protokół?"
+
+msgid "Realtime Connections"
+msgstr "Połączenia w czasie rzeczywistym"
+
+msgid "Realtime Graphs"
+msgstr "Wykresy w czasie rzeczywistym"
+
+msgid "Realtime Load"
+msgstr "Obciążenie w czasie rzeczywistym"
+
+msgid "Realtime Traffic"
+msgstr "Ruch w czasie rzeczywistym"
+
+msgid "Realtime Wireless"
+msgstr "WiFi w czasie rzeczywistym"
+
+msgid "Rebind protection"
+msgstr "Przypisz ochronę"
+
+msgid "Reboot"
+msgstr "Restart"
+
+msgid "Rebooting..."
+msgstr "Ponowne uruchamianie..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Uruchamia ponownie system na twoim urządzeniu"
+
+msgid "Receive"
+msgstr "Odebrane"
+
+msgid "Receiver Antenna"
+msgstr "Antena odbiorcza"
+
+msgid "Reconnect this interface"
+msgstr "Połącz ponownie ten interfejs"
+
+msgid "Reconnecting interface"
+msgstr "Łączę ponownie interfejs"
+
+msgid "References"
+msgstr "Referencje"
+
+msgid "Regulatory Domain"
+msgstr "Domena regulacji"
+
+msgid "Relay"
+msgstr "Przekaźnik"
+
+msgid "Relay Bridge"
+msgstr "Most przekaźnikowy"
+
+msgid "Relay between networks"
+msgstr "Przekaźnik pomiędzy sieciami"
+
+msgid "Relay bridge"
+msgstr "Most przekaźnikowy"
+
+msgid "Remote IPv4 address"
+msgstr "Zdalny adres IPv4"
+
+msgid "Remove"
+msgstr "Usuń"
+
+msgid "Repeat scan"
+msgstr "Powtórz skanowanie"
+
+msgid "Replace entry"
+msgstr "Zamień wpis"
+
+msgid "Replace wireless configuration"
+msgstr "Zamień konfigurację WiFi"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Wymagany dla niektórych dostawców internetu, np. Charter z DOCSIS 3"
+
+msgid "Reset"
+msgstr "Resetuj"
+
+msgid "Reset Counters"
+msgstr "Wyczyść liczniki"
+
+msgid "Reset to defaults"
+msgstr "Resetuj do domyślnych"
+
+msgid "Resolv and Hosts Files"
+msgstr "Pliki Resolv i Hosts"
+
+msgid "Resolve file"
+msgstr "Plik Resolve"
+
+msgid "Restart"
+msgstr "Uruchom ponownie"
+
+msgid "Restart Firewall"
+msgstr "Uruchom ponownie firewalla"
+
+msgid "Restore backup"
+msgstr "Przywróć kopię zapasową"
+
+msgid "Reveal/hide password"
+msgstr "Odsłoń/Ukryj hasło"
+
+msgid "Revert"
+msgstr "Przywróć"
+
+msgid "Root"
+msgstr "Root"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Katalog Root`a dla plików udostępnianych przez TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Hasło routera"
+
+msgid "Routes"
+msgstr "Ścieżki routingu"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Ścieżki routingu pokazują routerowi przez który interfejs oraz którą bramę "
+"może skomunikować się z daną siecią lub komputerem."
+
+msgid "Rule #"
+msgstr "Zasada #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+"Sprawdź czy system plików nie zawiera błędów przed zamontowaniem urządzenia"
+
+msgid "Run filesystem check"
+msgstr "Sprawdź czy system plików nie zawiera błędów"
+
+msgid "SSH Access"
+msgstr "Dostęp SSH"
+
+msgid "SSH-Keys"
+msgstr "Klucze SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Zapisz"
+
+msgid "Save & Apply"
+msgstr "Zapisz i zastosuj"
+
+msgid "Save &#38; Apply"
+msgstr "Zapisz i zastosuj"
+
+msgid "Scan"
+msgstr "Skanuj"
+
+# Raczej nie stosuje się kilku dużych liter w tym samym
+msgid "Scheduled Tasks"
+msgstr "Zaplanowane zadania"
+
+msgid "Section added"
+msgstr "Dodano sekcję"
+
+msgid "Section removed"
+msgstr "Usunięto sekcję"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Aby poznać szczegóły przeczytaj stronę instrukcji \"mount\""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Co podany czas (w sekundach) wyślij zapytania LCP echo, to ustawienie działa "
+"tylko gdy ustawiony jest próg błędu LCP echo"
+
+msgid "Separate Clients"
+msgstr "Rozdziel klientów"
+
+msgid "Separate WDS"
+msgstr "Rozdziel WDS"
+
+msgid "Server Settings"
+msgstr "Ustawienia serwera"
+
+msgid "Service Name"
+msgstr "Nazwa serwisu"
+
+msgid "Service Type"
+msgstr "Typ serwisu"
+
+msgid "Services"
+msgstr "Serwisy"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Ustawienia synchronizacji czasu"
+
+msgid "Setup DHCP Server"
+msgstr "Ustawienia serwera DHCP"
+
+msgid "Show current backup file list"
+msgstr "Pokaż aktualną listę plików do backupu"
+
+msgid "Shutdown this interface"
+msgstr "Wyłącz ten interfejs"
+
+msgid "Shutdown this network"
+msgstr "Wyłącz tą sieć"
+
+msgid "Signal"
+msgstr "Sygnał"
+
+msgid "Signal:"
+msgstr "Sygnał:"
+
+msgid "Size"
+msgstr "Rozmiar"
+
+msgid "Skip"
+msgstr "Pomiń"
+
+msgid "Skip to content"
+msgstr "Pomiń do zawartości"
+
+msgid "Skip to navigation"
+msgstr "Pomiń do nawigacji"
+
+msgid "Slot time"
+msgstr "Szczelina czasowa"
+
+msgid "Software"
+msgstr "Oprogramowanie"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Wartości pewnych pól są niewłaściwe, nie mogę ich zachować!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Przepraszamy, ale żądany obiekt nie został znaleziony."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Przepraszamy, ale serwer napotkał nieoczekiwany błąd."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Przepraszamy, ale nie ma wsparcia dla trybu sysupgrade. Nowy firmware musi "
+"być wgrany ręcznie. Sprawdź stronę libreCMC wiki, aby uzyskać instrukcję dla "
+"danego urządzenia."
+
+msgid "Sort"
+msgstr "Posortuj"
+
+msgid "Source"
+msgstr "Źródło"
+
+msgid "Specifies the button state to handle"
+msgstr "Określa zachowanie w zależności od stanu przycisku"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Podaje katalog do którego jest podłączone urządzenie"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Określa port nasłuchu dla tej instancji <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Określa maksymalną ilość błędów dla zapytania ARP przed założeniem, że host "
+"jest martwy"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Określa maksymalny czas w sekundach przed założeniem, że host jest martwy"
+
+msgid "Specify the secret encryption key here."
+msgstr "Określ tajny klucz szyfrowania."
+
+msgid "Start"
+msgstr "Uruchomienie"
+
+msgid "Start priority"
+msgstr "Priorytet uruchomienia"
+
+msgid "Startup"
+msgstr "Autostart"
+
+msgid "Static IPv4 Routes"
+msgstr "Statyczne ścieżki routingu IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Statyczne ścieżki routingu IPv6"
+
+msgid "Static Leases"
+msgstr "Dzierżawy statyczne"
+
+msgid "Static Routes"
+msgstr "Statyczne ścieżki routingu"
+
+msgid "Static WDS"
+msgstr "Statyczny WDS"
+
+msgid "Static address"
+msgstr "Stały adres"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Statyczne dzierżawy są używane do przypisania stałych adresów IP i "
+"symbolicznych nazw klientom DHCP. Są one również wymagane dla "
+"niedynamicznych konfiguracji interfejsu, gdzie obsługiwane są tylko hosty z "
+"odpowiednim dzierżawami."
+
+msgid "Status"
+msgstr "Stan"
+
+msgid "Stop"
+msgstr "Stop"
+
+msgid "Strict order"
+msgstr "Zachowaj kolejność"
+
+msgid "Submit"
+msgstr "Wyślij"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Zamień wpis"
+
+msgid "Switch"
+msgstr "Przełącznik"
+
+msgid "Switch %q"
+msgstr "Przełącznik %q"
+
+msgid "Switch %q (%s)"
+msgstr "Przełącznik %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Protokół przełącznika"
+
+msgid "Sync with browser"
+msgstr "Synchronizuj z przeglądarką"
+
+msgid "Synchronizing..."
+msgstr "Synchronizacja..."
+
+msgid "System"
+msgstr "System"
+
+msgid "System Log"
+msgstr "Log systemowy"
+
+msgid "System Properties"
+msgstr "Właściwości systemu"
+
+# Wszędzie używane jest "loga" z małej litery.
+msgid "System log buffer size"
+msgstr "Rozmiar bufora loga systemu"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Ustawienia TFTP"
+
+msgid "TFTP server root"
+msgstr "Root serwera TFTP"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "Szybkość TX"
+
+msgid "Table"
+msgstr "Tablica"
+
+msgid "Target"
+msgstr "Cel"
+
+msgid "Terminate"
+msgstr "Zakończ"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"Sekcja <em>Konfiguracja Urządzenia</em> zawiera sprzętowe ustawienia toru "
+"transmisji radiowej takie jak kanał, moc sygnału, czy wybór anteny, które to "
+"są wspólne dla wszystkich zdefiniowanych sieci bezprzewodowych (jeśli tor "
+"transmisji jest kompatybilny z transmisją multi-SSID). Ustawienia sieci "
+"takie jak szyfrowanie lub tryb operacji są zebrane w sekcji <em>Konfiguracja "
+"Interfejsu</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Pakiet <em>libiwinfo-lua</em> nie jest zainstalowany. Musisz go zainstalować "
+"aby WiFi prawidłowo zadziałało!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"Prefiks IPv6 przypisany do dostawcy, zazwyczaj kończy się <code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Dozwolone znaki to: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> "
+"oraz <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"Plik urządzenia - pamięci lub partycji (<abbr title=\"na przykład\">np.</"
+"abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"System plików, który został użyty do sformatowania nośnika (<abbr title=\"na "
+"przykład\">np.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</"
+"abbr></samp>)"
+
+# Przycisk nazywa się "Wykonaj", więc taki sam opis ma być w podpowiedzi.
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Obraz flash`a został przesłany. Poniżej znajduje się suma kontrolna i "
+"rozmiar obrazu, porównaj je z sumą kontrolną i rozmiarem oryginału, aby "
+"upewnić się, że został przesłany poprawnie.<br /> Wciśnij \"Wykonaj\" aby "
+"kontynuować aktualizację."
+
+msgid "The following changes have been committed"
+msgstr "Następujące zmiany zostały zatwierdzone"
+
+msgid "The following changes have been reverted"
+msgstr "Następujące zmiany zostały odrzucone"
+
+msgid "The following rules are currently active on this system."
+msgstr "Następujące zasady są obecnie aktywne w tym systemie."
+
+msgid "The given network name is not unique"
+msgstr "Podana sieć NIE jest unikalna"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Sprzęt nie jest urządzeniem typu multi-SSID, więc bieżąca konfiguracja "
+"zostanie nadpisana nową jeśli będziesz kontynuować."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"Długość prefiksu IPv4 w bitach, pozostała część jest używana w adresach IPv6."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Długość prefiksu IPv6 w bitach"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Porty sieciowe na tym urządzeniu mogą być łączone w kilka sieci <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>, w których komputery mogą "
+"komunikować się ze sobą bezpośrednio. Sieci <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr> są często stosowane w celu oddzielenia różnych "
+"segmentów sieci. Często domyślnie jeden port typu Uplink jest wykorzystywany "
+"do połączenia z większą siecią, taką jak Internet, a inne porty dla sieci "
+"lokalnej."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Wybrany protokół potrzebuje przypisanego urządzenia"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"System usuwa teraz partycję konfiguracji i zrestartuje się po zakończeniu."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"System wykonuje flashowanie.<br /> NIE WYŁĄCZAĆ URZĄDZENIA!<br /> Poczekaj "
+"kilka minut, zanim spróbujesz połączyć się ponownie. W zależności od "
+"ustawień może być konieczne odnowienie adresu Twojego komputera, aby dostać "
+"się do urządzenia."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Przesłany plik obrazu nie zawiera obsługiwanego formatu. Upewnij się, że "
+"wybrałeś odpowiedni format obrazu dla danej platformy."
+
+msgid "There are no active leases."
+msgstr "Brak aktywnych dzierżaw."
+
+msgid "There are no pending changes to apply!"
+msgstr "Brak oczekujących zmian do zastosowania!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Brak oczekujących zmian do przywrócenia!"
+
+msgid "There are no pending changes!"
+msgstr "Brak oczekujących zmian!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Żadne urządzenie nie jest jeszcze przypisane. Proszę dołączyć urządzenie "
+"sieciowe na karcie \"Ustawienia sprzętowe\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Hasło nie zostało ustawione. Proszę skonfigurować hasło roota, aby "
+"zabezpieczyć interfejs WWW i włączyć SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "Ten adres IPv4 przekaźnika"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Jest to lista globalnych wzorców dopasowywania plików i katalogów "
+"uwzględnianych podczas przeprowadzania aktualizacji z użyciem \"sysupgrade"
+"\". Zmodyfikowane pliki w /etc/config/ i w niektórych innych ustawieniach są "
+"automatycznie zachowywane."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"To jest zawartość pliku /etc/rc.local. Wstaw tutaj własne komendy (przed "
+"'exit 0'), aby zostały wykonane pod koniec procesu rozruchu."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"To jest lokalny adres końcowy przypisany przez tunnel broker'a, zwykle "
+"kończący się z <code>:2</code>"
+
+# w tłumaczeniu pojawiła się spacja po DHCP</ abbr> co powoduje niepoprawne wyświetlanie się strony z lang PL
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"To jest jedyny serwer <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr> w sieci lokalnej"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"To jest system crontab, w którym mogą być zdefiniowane zaplanowane zadania."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Zwykle jest to adres najbliższego PoP prowadzonego przez tunnel broker'a"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Poniższa lista przedstawia aktualnie uruchomione procesy systemowe i ich "
+"status."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+"Poniższa strona umożliwia konfigurację działania niestandardowych przycisków"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Poniższa strona przedstawia aktualnie aktywne połączenia sieciowe."
+
+msgid "This section contains no values yet"
+msgstr "Ta sekcja nie zawiera jeszcze żadnych wartości"
+
+msgid "Time Synchronization"
+msgstr "Synchronizacja czasu"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Synchronizacja czasu nie jest jeszcze skonfigurowana."
+
+msgid "Timezone"
+msgstr "Strefa czasowa"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Aby przywrócić pliki konfiguracyjne, można tutaj wczytać wcześniej utworzone "
+"archiwum kopii zapasowej."
+
+msgid "Total Available"
+msgstr "Całkowicie dostępna"
+
+msgid "Traceroute"
+msgstr "Trasa routowania"
+
+msgid "Traffic"
+msgstr "Ruch"
+
+msgid "Transfer"
+msgstr "Transfer"
+
+msgid "Transmission Rate"
+msgstr "Prędkość transmisji"
+
+msgid "Transmit"
+msgstr "Nadawanie"
+
+msgid "Transmit Power"
+msgstr "Siła nadawania"
+
+msgid "Transmitter Antenna"
+msgstr "Antena nadajnika"
+
+msgid "Trigger"
+msgstr "Trigger"
+
+msgid "Trigger Mode"
+msgstr "Tryb Trigger"
+
+msgid "Tunnel ID"
+msgstr "Numer identyfikacyjny tunelu"
+
+msgid "Tunnel Interface"
+msgstr "Interfejs tunelu"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Tryb Turbo"
+
+msgid "Tx-Power"
+msgstr "Moc nadawania"
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Tylko UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "Urządzenie USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Nie można wysłać"
+
+msgid "Unknown"
+msgstr "Nieznany"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Nieznany błąd, hasło nie zostało zmienione"
+
+msgid "Unmanaged"
+msgstr "Niezarządzalny"
+
+msgid "Unsaved Changes"
+msgstr "Niezapisane zmiany"
+
+msgid "Unsupported protocol type."
+msgstr "Nieobsługiwany typ protokołu."
+
+msgid "Update lists"
+msgstr "Aktualizuj listy"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Prześlij zgodny z funkcją sysupgrade obraz tutaj, aby zastąpić aktualnie "
+"działające firmware. Zaznacz opcję \"Zachowaj ustawienia\", aby zachować "
+"bieżącą konfigurację (wymaga zgodnego obrazu firmware libreCMC)."
+
+msgid "Upload archive..."
+msgstr "Załaduj archiwum..."
+
+msgid "Uploaded File"
+msgstr "Załaduj plik"
+
+msgid "Uptime"
+msgstr "Czas pracy"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Użyj <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Użyj bramy DHCP"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Użyj serwerów DNS rozgłaszanych przez peera"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Użyj kodów kraju ISO/IEC 3166 alpha2"
+
+msgid "Use MTU on tunnel interface"
+msgstr "Użyj MTU na interfejsie tunelu"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Użyj TTL na interfejsie tunelu"
+
+msgid "Use as root filesystem"
+msgstr "Użyj systemu plików root'a"
+
+msgid "Use broadcast flag"
+msgstr "Użyj flagi rozgłaszania"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Użyj własnych serwerów DNS"
+
+msgid "Use default gateway"
+msgstr "Użyj domyślnej bramy"
+
+msgid "Use gateway metric"
+msgstr "Użyj metryki bramy"
+
+msgid "Use routing table"
+msgstr "Użyj tabeli routingu"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Użyj przycisku <em>Dodaj</em>, aby dodać nowy wpis dzierżawy. <em>Adres MAC</"
+"em> identyfikuje hosta, <em>Adres IPv4</em> określa, którego stałego adresu "
+"użyć, natomiast <em>Nazwa hosta</em> jest przypisana jako symboliczna nazwa "
+"do określonego hosta."
+
+# Przy liście zamontowanych systemów plików
+msgid "Used"
+msgstr "Użyte"
+
+msgid "Used Key Slot"
+msgstr "Użyte gniazdo klucza"
+
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Interfejs VLAN"
+
+msgid "VLANs on %q"
+msgstr "Sieci VLAN na %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "Sieci VLAN na %q (%s)"
+
+msgid "VPN Server"
+msgstr "Serwer VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Klasa producenta do wysłania podczas żądania DHCP"
+
+msgid "Verify"
+msgstr "Zweryfikuj"
+
+msgid "Version"
+msgstr "Wersja"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Otwarty system WEP"
+
+msgid "WEP Shared Key"
+msgstr "Współdzielony klucz WEP"
+
+msgid "WEP passphrase"
+msgstr "Hasło WEP"
+
+msgid "WMM Mode"
+msgstr "Tryb WMM"
+
+msgid "WPA passphrase"
+msgstr "Hasło WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"Kodowanie WPA wymaga zainstalowanych modułów wpa_supplicant (na tryb "
+"klienta) lub hostapd (dla trybów AP lub ad-hoc)"
+
+# obsy: Brzmi to lepiej niż "czekanie na wprowadzanie zmian.
+msgid "Waiting for changes to be applied..."
+msgstr "Trwa wprowadzenie zmian..."
+
+msgid "Waiting for command to complete..."
+msgstr "Trwa wykonanie polecenia..."
+
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Ostrzeżenie: Pozostały niezapisane zmian, które zostaną utracone podczas "
+"restartu!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Sieć bezprzewodowa"
+
+msgid "Wireless Adapter"
+msgstr "Adapter bezprzewodowy"
+
+msgid "Wireless Network"
+msgstr "Sieć bezprzewodowa"
+
+msgid "Wireless Overview"
+msgstr "Przegląd sieci bezprzewodowych"
+
+msgid "Wireless Security"
+msgstr "Zabezpieczenia sieci bezprzewodowych"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Sieć bezprzewodowa jest wyłączona lub niepołączona"
+
+msgid "Wireless is restarting..."
+msgstr "Restart sieci bezprzewodowej..."
+
+msgid "Wireless network is disabled"
+msgstr "Sieć bezprzewodowa jest wyłączona"
+
+msgid "Wireless network is enabled"
+msgstr "Sieć bezprzewodowa jest włączona"
+
+msgid "Wireless restarted"
+msgstr "Zrestartowano sieć bezprzewodową"
+
+msgid "Wireless shut down"
+msgstr "Wyłączanie sieci bezprzewodowej"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Zapisz otrzymane żądania DNS do syslog'a"
+
+msgid "XR Support"
+msgstr "Wsparcie XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Tutaj można włączyć lub wyłączyć zainstalowane skrypty. Zmiany zostaną "
+"zastosowane po ponownym uruchomieniu urządzenia.<br /><strong>Ostrzeżenie: "
+"Jeśli wyłączysz podstawowe skrypty typu \"networks\", urządzenie może stać "
+"się nieosiągalne!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Musisz włączyć obsługę Java Script w swojej przeglądarce, inaczej LuCI nie "
+"będzie działać poprawnie."
+
+msgid "any"
+msgstr "dowolny"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "bridged"
+
+msgid "create:"
+msgstr "utwórz:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "utwórz bridge na określonych interfejsach"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "wyłącz"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "wygasły"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"plik, w którym podano żądania <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr>, zostanie zachowany"
+
+msgid "forward"
+msgstr "przekaż"
+
+msgid "full-duplex"
+msgstr "pełny-duplex"
+
+msgid "half-duplex"
+msgstr "pół-duplex"
+
+msgid "help"
+msgstr "pomoc"
+
+msgid "hidden"
+msgstr "ukryty"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "jeżeli celem jest sieć"
+
+msgid "input"
+msgstr "wejście"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "lokalny plik <abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "no"
+msgstr "nie"
+
+# skorzystałem z niemieckiego tłumaczenia
+msgid "no link"
+msgstr "niepowiązane"
+
+msgid "none"
+msgstr "żaden"
+
+msgid "off"
+msgstr "wyłączone"
+
+msgid "on"
+msgstr "włączone"
+
+msgid "open"
+msgstr "otwarte"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "routowane"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "tagowane"
+
+msgid "unknown"
+msgstr "nieznane"
+
+msgid "unlimited"
+msgstr "nielimitowane"
+
+msgid "unspecified"
+msgstr "nieokreślone"
+
+msgid "unspecified -or- create:"
+msgstr "nieokreślone -lub- utwórz:"
+
+msgid "untagged"
+msgstr "nietagowane"
+
+msgid "yes"
+msgstr "tak"
+
+msgid "« Back"
+msgstr "« Wróć"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "Login (ID) HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "To jest 32-bajtowy heksadecymalny zakodowany identyfikator użytkownika, a "
+#~ "nie login"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz drugi kanał powyżej"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz drugi kanał poniżej"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Akceptuj rozgłoszenia routera"
+
+# Dosłowne tłumaczenie
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Rozgłoś protokół IPv6 w sieci"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Rozgłoś identyfikator sieci (network ID)"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Dopuszczalny zakres to 1 do 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Możliwości HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Tryb HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Model routera"
+
+#~ msgid "Router Name"
+#~ msgstr "Nazwa routera"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Wyślij pakiet wymuszający rozgłoszenia routera"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "Określa czas życia rozgłoszenia preferowanego prefiksu w sekundach"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Określa czas życia rozgłoszenia obowiązującego prefiksu w sekundach"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Użyj preferowanego czasu życia"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Użyj prawidłowego czasu życia"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Czekanie na router..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Włącz wbudowany serwer NTP"
+
+#~ msgid "Active Leases"
+#~ msgstr "Aktywne dzierżawy"
+
+#~ msgid "Open"
+#~ msgstr "Otwórz"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Przepływność"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Konfiguracja / Zastosuj"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Konfiguracja / zmiany"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Konfiguracja / cofnięcie zmian"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "Adres MAC"
diff --git a/trunk/package/luci/po/pl/commands.po b/trunk/package/luci/po/pl/commands.po
new file mode 100644
index 00000000..6f660ba1
--- /dev/null
+++ b/trunk/package/luci/po/pl/commands.po
@@ -0,0 +1,99 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-02-25 18:03+0200\n"
+"Last-Translator: TheTranslator2238 <mateusz2238@outlook.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Krótki opis konfigurowanej komendy"
+
+msgid "Access command with"
+msgstr "Dostęp do komendy przez"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Zezwól na uruchomienie komendy i pobranie wyjścia bez uprzedniego "
+"uwierzytelnienia"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Pozwól użytkownikowi dodać argumenty wiersza poleceń"
+
+msgid "Arguments:"
+msgstr "Argumenty:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Nie wyświetlono danych binarnych, możesz je pobrać."
+
+msgid "Code:"
+msgstr "Kod:"
+
+msgid "Collecting data..."
+msgstr "Zbieram dane:"
+
+msgid "Command"
+msgstr "Komenda"
+
+msgid "Command failed"
+msgstr "Zła komenda"
+
+msgid "Command line to execute"
+msgstr "Linia Komendy do wykonania"
+
+msgid "Command successful"
+msgstr "Komenda Wykonana"
+
+msgid "Command:"
+msgstr "Komenda:"
+
+msgid "Configure"
+msgstr "Konfiguracja"
+
+msgid "Custom Commands"
+msgstr "Własne komendy"
+
+msgid "Custom arguments"
+msgstr "Własne argumenty"
+
+msgid "Dashboard"
+msgstr "Tablica"
+
+msgid "Description"
+msgstr "Opis"
+
+msgid "Download"
+msgstr "Download"
+
+msgid "Failed to execute command!"
+msgstr "Nie można wykonać komendy!"
+
+msgid "Link"
+msgstr "Łącze"
+
+msgid "Loading"
+msgstr "Ładowanie"
+
+msgid "Public access"
+msgstr "Publiczny dostęp"
+
+msgid "Run"
+msgstr "Uruchom"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Ta strona pozwala ci skonfigurować niestandardową komendę którą można łatwo "
+"użyć z Web Interfejsa"
+
+msgid "Waiting for command to complete..."
+msgstr "Czekanie na wykonanie komendy..."
diff --git a/trunk/package/luci/po/pl/coovachilli.po b/trunk/package/luci/po/pl/coovachilli.po
new file mode 100644
index 00000000..7dc2ef85
--- /dev/null
+++ b/trunk/package/luci/po/pl/coovachilli.po
@@ -0,0 +1,27 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-25 06:22+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Konfiguracja sieci"
+
+msgid "RADIUS configuration"
+msgstr "Konfiguracja RADIUS`a"
+
+msgid "UAM and MAC Authentication"
+msgstr "Uwierzytelnianie UAM oraz MAC"
diff --git a/trunk/package/luci/po/pl/ddns.po b/trunk/package/luci/po/pl/ddns.po
new file mode 100644
index 00000000..39097830
--- /dev/null
+++ b/trunk/package/luci/po/pl/ddns.po
@@ -0,0 +1,90 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-01-06 13:08+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Sprawdzaj zmiany adresu IP co"
+
+msgid "Check-time unit"
+msgstr "Jednostka czasu sprawdzania"
+
+msgid "Custom update-URL"
+msgstr "Niestandardowy adres aktualizacyjny"
+
+msgid "Dynamic DNS"
+msgstr "Dynamiczny DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Dynamiczny DNS umożliwia dostęp do routera z użyciem stałej nazwy hosta, "
+"pomimo posiadania dynamicznie zmieniającego się adresu IP."
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "Force update every"
+msgstr "Wymuszaj aktualizację co"
+
+msgid "Force-time unit"
+msgstr "Jednostka czasu wymuszania"
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid "Network"
+msgstr "Sieć"
+
+msgid "Password"
+msgstr "Hasło"
+
+msgid "Service"
+msgstr "Usługa"
+
+msgid "Source of IP address"
+msgstr "Źródło adresu IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+msgid "custom"
+msgstr "niestandardowe"
+
+# Hours
+msgid "h"
+msgstr "godz."
+
+msgid "interface"
+msgstr "interfejs"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "sieć"
+
+#~ msgid "Event interface"
+#~ msgstr "Interfejs"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "Określa interfejs na którym zostanie uruchomiony skrypt ddns."
diff --git a/trunk/package/luci/po/pl/diag_core.po b/trunk/package/luci/po/pl/diag_core.po
new file mode 100644
index 00000000..0935fdbf
--- /dev/null
+++ b/trunk/package/luci/po/pl/diag_core.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-08 13:17+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Konfiguracja diagnostyki"
+
+msgid "Diagnostics"
+msgstr "Diagnostyka"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Liczba testów diagnostycznych dostępnych w tym menu jest uzależniona od "
+"modułów zainstalowanych w tym urządzeniu."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Wpisy w menu pozwalają na wykonanie testów diagnostycznych systemu pomocnych "
+"w rozwiązywaniu problemów."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"W tym menu można skonfigurować diagnostykę sieci, jak np. skanowanie "
+"urządzeń sieciowych lub testy ping."
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d_diag"
diff --git a/trunk/package/luci/po/pl/diag_devinfo.po b/trunk/package/luci/po/pl/diag_devinfo.po
new file mode 100644
index 00000000..32ccdce5
--- /dev/null
+++ b/trunk/package/luci/po/pl/diag_devinfo.po
@@ -0,0 +1,222 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 13:44+0200\n"
+"Last-Translator: mesiu84 <kmesek84@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Akcje"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Beginning of MAC address range"
+msgstr "Początek zakresu MAC adresów"
+
+msgid "Config Phone Scan"
+msgstr "Konfiguruj skanowanie telefonów"
+
+msgid "Configure"
+msgstr "Konfiguruj"
+
+msgid "Configure Scans"
+msgstr "Konfiguruj skany"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Konfiguruj skanowanie dla urządzeń w wybranych sieciach. Zmniejszanie "
+"\"Limitu czasu\", \"Liczby powtórzeń\" i/lub \"Oczekiwania między żądaniami"
+"\" może przyspieszyć skany, ale może też uniemożliwić wykrycie niektórych "
+"urządzeń."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Konfiguruj skanowanie dla wspieranych urządzeń SIP w wybranych sieciach. "
+"Zmniejszanie \"Limitu czasu\", \"Liczby powtórzeń\" i/lub \"Oczekiwania "
+"między żądaniami\" może przyspieszyć skany, ale może też uniemożliwić "
+"wykrycie niektórych urządzeń."
+
+msgid "Delete"
+msgstr "Usuń"
+
+msgid "Device Scan Config"
+msgstr "Konfiguruj skanowanie urządzeń"
+
+msgid "Device Type"
+msgstr "Typ urządzenia"
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr "Urządzenia w sieci"
+
+msgid "Edit"
+msgstr "Edytuj"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "End of MAC address range"
+msgstr "Koniec zakresu adresów MAC"
+
+msgid "Go to relevant configuration page"
+msgstr "Idź do stosownej strony konfiguracyjnej"
+
+msgid "IP Address"
+msgstr "Adres IP"
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid "Invalid"
+msgstr "Nieprawidłowe"
+
+msgid "Link to Device"
+msgstr "Połączenie do urządzenia"
+
+msgid "MAC Address"
+msgstr "Adres MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr "Nadpisywanie informacji o adresie MAC urządzenia"
+
+msgid "MAC Device Override"
+msgstr "Pomijanie adresu MAC urządzenia"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"Zakres adresów MAC i informacje użyte do zastąpienia baz danych systemowych "
+"i IEEE"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Ilośś milisekund pauzy pomiędzy zapytaniami (domyślnie 100)"
+
+msgid "Model"
+msgstr "Model"
+
+msgid "Name"
+msgstr "Nazwa"
+
+msgid "Network Device Scan"
+msgstr "Skan urządzeń w sieci"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Ustawienia skanowania urządzeń w sieci"
+
+msgid "Networks to scan for devices"
+msgstr "Sieci do skanowania w poszukiwaniu urządzeń"
+
+msgid "Networks to scan for supported devices"
+msgstr "Sieci do skanowania w poszukiwaniu wspieranych urządzeń"
+
+msgid "No SIP devices"
+msgstr "Brak urządzeń SIP"
+
+msgid "No devices detected"
+msgstr "Nie wykryto urządzeń"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Ilość powtórzeń wysłania żądania (domyślnie 1)"
+
+msgid "OUI Owner"
+msgstr "Właściciel OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Zastąp informacje zwracanych przez skrypt MAC to Device Info Script (MAC-to-"
+"devinfo) dla określonego zakresu adresów MAC"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Wykonaj skany (to może potrwać kilka minut)"
+
+msgid "Phone Information"
+msgstr "Informacje o telefonie"
+
+msgid "Phone Scan"
+msgstr "Skanowanie telefonów"
+
+msgid "Phone Scanning Configuration"
+msgstr "Konfiguracja skanowania telefonu"
+
+msgid "Phones"
+msgstr "Telefony"
+
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Raw"
+msgstr "Surowe"
+
+msgid "Repeat Count"
+msgstr "Ilość powtórzeń"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Powtórz skany (to może potrwać kilka minut)"
+
+msgid "SIP Device Information"
+msgstr "Informacje o urządzeniu SIP"
+
+msgid "SIP Device Scan"
+msgstr "Skanowanie urządzeń SIP"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Konfiguracja skanowania urządzeń SIP"
+
+msgid "SIP Devices on Network"
+msgstr "Urządzenia SIP w sieci"
+
+msgid "SIP devices discovered for"
+msgstr "Urządzenia SIP znalezione dla"
+
+msgid "Scan for devices on specified networks."
+msgstr "Skanuj w poszukiwaniu urządzeń w wybranych sieciach."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Skanuj w poszukiwaniu wspieranych urządzeń SIP w wybranych sieciach."
+
+msgid "Scanning Configuration"
+msgstr "Ustawienia skanowania"
+
+msgid "Scans for devices on specified networks."
+msgstr "Scans for devices on specified networks."
+
+msgid "Sleep Between Requests"
+msgstr "Pauza pomiędzy zapytaniami"
+
+msgid "Subnet"
+msgstr "Podsieć"
+
+msgid "This section contains no values yet"
+msgstr "Ta sekcja nie zawiera jeszcze wartości"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Czas oczekiwania na odpowiedź w sekundach (domyślnie 10)"
+
+msgid "Timeout"
+msgstr "Czas oczekiwania"
+
+msgid "Use Configuration"
+msgstr "Użyj konfiguracji"
+
+msgid "Vendor"
+msgstr "Sprzedawca"
+
+msgid "check other networks"
+msgstr "sprawdź inne sieci"
diff --git a/trunk/package/luci/po/pl/ffwizard.po b/trunk/package/luci/po/pl/ffwizard.po
new file mode 100644
index 00000000..a944149e
--- /dev/null
+++ b/trunk/package/luci/po/pl/ffwizard.po
@@ -0,0 +1,178 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-30 12:42+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Pozwól na wysyłanie anonimowych statystyk o tym węźle"
+
+msgid "Channel"
+msgstr "Kanał"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Zaznacz to, aby chronić Twoją sieć LAN przed innymi węzłami i klientami"
+
+msgid "Configure network"
+msgstr "Skonfiguruj sieć"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Połącz swój węzeł z innymi węzłami przez tunel przez internet."
+
+msgid "DHCP IP range"
+msgstr "Zakres IP dla DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP automatycznie przypisze adresy IP klientom"
+
+msgid "DNS Server"
+msgstr "Serwer DNS"
+
+msgid "Enable DHCP"
+msgstr "Włącz DHCP"
+
+msgid "Gateway"
+msgstr "Brama"
+
+msgid "Heartbeat"
+msgstr "Bicie serca"
+
+msgid "IP address"
+msgstr "Adres IP"
+
+# Po polsku dla polaka jest tak samo niezrozumiałe jak po angielsku dla anglika, więc tłumaczenie uważam za dobre.
+msgid "L2gvpn tunnel"
+msgstr "Tunel L2gvpn"
+
+msgid "Limit download bandwidth"
+msgstr "Ogranicz szybkość pobierania"
+
+msgid "Limit upload bandwidth"
+msgstr "Ogranicz szybkość wysyłania"
+
+msgid "Mesh IP address"
+msgstr "Adres IP typu Mesh"
+
+msgid "Mesh IPv6 Address"
+msgstr "Adres IPv6 typu Mesh"
+
+msgid "Netmask"
+msgstr "Maska sieci"
+
+msgid "Password"
+msgstr "Hasło"
+
+msgid "Password confirmation"
+msgstr "Potwierdź hasło"
+
+msgid "Password successfully changed"
+msgstr "Hasło pomyślnie zmienione"
+
+msgid "Protect LAN"
+msgstr "Chroń LAN"
+
+msgid "Protocol"
+msgstr "Protokół"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Zaznacz to pole, aby skonfigurować interfejsy sieciowe."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Zaznacz to, aby pozwolić innym na używanie Twojego łącza, by korzystać z "
+"internetu."
+
+msgid "Share your internet connection"
+msgstr "Udostępnij swoje łącze innym"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Zakres IP, z którego klientom są przyznawane adresy IP (np. 10.1.2.1/28). "
+"Jeśli to zakres wewnątrz zakresu Twojej sieci mesh, będzie ogłoszony jako "
+"HNA. Każdy inny zakres będzie używał NAT. Jeśli pozostawisz pole puste, "
+"zostanie użyta domyślna wartość z profilu społeczności."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "Adres IPv6 jest wyliczany automatycznie."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Protokół używany do łączenia z internetem."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Jest to unikalny adres w sieci mesh (np. 10.1.1.1) i musi być zarejestrowany "
+"w lokalnej społeczności."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"To ustawi nowy wirtualny interfejs bezprzewodowy w trybie punktu dostępowego "
+"(AP)."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Ten kreator pomoże Ci w konfiguracji routera do działania z kratową siecią "
+"typu Freifunk lub innej podobnej wspólnotowej sieci bezprzewodowej."
+
+msgid "Unknown Error"
+msgstr "Nieznany błąd"
+
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Wirtualny punkt dostępowy (VAP)"
+
+msgid "Wizard"
+msgstr "Kreator"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Twoje urządzenie i okoliczne węzły muszą używać tego samego kanału."
+
+msgid "dhcp"
+msgstr "DHCP"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "stały"
+
+msgid "Configure this interface."
+msgstr "Skonfiguruj ten interfejs."
+
+msgid "recommended"
+msgstr "zalecane"
+
+msgid "Basic settings"
+msgstr "Podstawowe ustawienia"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Podstawowe ustawienia są niekompletne. Idź do"
+
+msgid "Error"
+msgstr "Błąd"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+"Nie możesz użyć tego kreatora, ponieważ brakuje części niezbędnych danych."
+
+msgid "and fill out all required fields."
+msgstr "i wypełnij wszystkie wymagane pola."
diff --git a/trunk/package/luci/po/pl/firewall.po b/trunk/package/luci/po/pl/firewall.po
new file mode 100644
index 00000000..18be74d2
--- /dev/null
+++ b/trunk/package/luci/po/pl/firewall.po
@@ -0,0 +1,621 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2013-06-22 15:49+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s w %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s z %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s w %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Nienazwany wpis)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Nienazwana reguła)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(Nienazwany SNAT)"
+
+msgid "-- Please choose --"
+msgstr "-- Proszę wybrać --"
+
+msgid "-- custom --"
+msgstr "-- własne --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> pakiet. na <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+"<var>%d</var> pakiet. na <var>%s</var>, popsutych <var>%d</var> pakiet."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> i ograniczone do %s"
+
+msgid "Action"
+msgstr "Działanie"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Add and edit..."
+msgstr "Dodaj i edytuj..."
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Zezwól na przekazywanie z <em>source zones</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Zezwól na przekazywanie do <em>destination zones</em>:"
+
+msgid "Any"
+msgstr "Każdy"
+
+msgid "Covered networks"
+msgstr "Objęte sieci"
+
+msgid "Custom Rules"
+msgstr "Własne reguły"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Własne reguły pozwalają na arbitralne wykonanie poleceń iptables, które nie "
+"są objęte składnią zapory. Polecenia wykonywane są po każdym restarcie "
+"zapory, zaraz po załadowaniu zestawu reguł domyślnych."
+
+msgid "Destination IP address"
+msgstr "Docelowy adres IP"
+
+msgid "Destination address"
+msgstr "Adres docelowy"
+
+msgid "Destination port"
+msgstr "Port docelowy"
+
+msgid "Destination zone"
+msgstr "Strefa docelowa"
+
+msgid "Do not rewrite"
+msgstr "Nie przepisuj"
+
+msgid "Drop invalid packets"
+msgstr "Porzuć wadliwe pakiety"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "Enable NAT Loopback"
+msgstr "Włącz NAT Loopback"
+
+msgid "Enable SYN-flood protection"
+msgstr "Włącz ochronę przed atakiem SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr "Włącz logowanie na tej strefy"
+
+msgid "External IP address"
+msgstr "Zewnętrzne adresy IP"
+
+msgid "External port"
+msgstr "Port zewnętrzny"
+
+msgid "External zone"
+msgstr "Strefa zewnętrzna"
+
+msgid "Extra arguments"
+msgstr "Dodatkowe argumenty"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+msgid "Firewall"
+msgstr "Zapora"
+
+msgid "Firewall - Custom Rules"
+msgstr "Zapora - Reguły własne"
+
+msgid "Firewall - Port Forwards"
+msgstr "Zapora - Przekazywanie portów"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Zapora - Reguły ruchu"
+
+msgid "Firewall - Zone Settings"
+msgstr "Zapora - Ustawienia strefy"
+
+msgid "Force connection tracking"
+msgstr "Wymuś śledzenie połączeń"
+
+msgid "Forward"
+msgstr "Przekazuj"
+
+msgid "Forward to"
+msgstr "Przekazuj do"
+
+msgid "From %s in %s"
+msgstr "Z %s w %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Z %s w %s ze źródłem %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Z %s w %s ze źródłem %s i %s"
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 i IPv6"
+
+msgid "IPv4 only"
+msgstr "Tylko IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Tylko IPv6"
+
+msgid "Input"
+msgstr "Ruch przychodzący"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Przekazywanie pomiędzy strefami"
+
+msgid "Internal IP address"
+msgstr "Wewnętrzny adres IP"
+
+msgid "Internal port"
+msgstr "Wewnętrzny port"
+
+msgid "Internal zone"
+msgstr "Strefa wewnętrzna"
+
+msgid "Limit log messages"
+msgstr "Ograniczenie logowania"
+
+msgid "MSS clamping"
+msgstr "Dostosuj MSS"
+
+msgid "Masquerading"
+msgstr "Maskarada"
+
+msgid "Match"
+msgstr "Dopasuj"
+
+msgid "Match ICMP type"
+msgstr "Dopasuj typ ICMP"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Dopasuj przekazywany ruch do danego docelowego portu lub zakresu portów"
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Dopasuj ruch przychodzący do danego portu docelowego lub zakresu portów na "
+"tym hoście"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Dopasuj przychodzący ruch pochodzący z danego portu źródłowego lub zakresu "
+"portów na hoście klienta."
+
+msgid "Name"
+msgstr "Nazwa"
+
+msgid "New SNAT rule"
+msgstr "Nowa reguła SNAT"
+
+msgid "New forward rule"
+msgstr "Nowa reguła przekazywania (forward)"
+
+msgid "New input rule"
+msgstr "Nowa reguła wejściowa (input)"
+
+msgid "New port forward"
+msgstr "Nowe przekierowanie portu"
+
+msgid "New source NAT"
+msgstr "Nowy NAT źródłowy"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Dopasuj tylko przychodzący ruch skierowany do danego adresu IP."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Dopasuj tylko ruch z tych adresów MAC."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Dopasuj tylko ruch przychodzący z tego adresu IP lub zakresu adresów."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Dopasuj tylko ruch przychodzący z podanego portu źródłowego lub zakresu "
+"portów na hoście klienta"
+
+msgid "Open ports on router"
+msgstr "Otwarte porty na routerze"
+
+msgid "Other..."
+msgstr "Inne..."
+
+msgid "Output"
+msgstr "Wyjście (Output)"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+"Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
+
+msgid "Port Forwards"
+msgstr "Przekierowania portów"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"Przekierowanie portów pozwala komputerom z internetu na połączenia z "
+"komputerami z sieci LAN."
+
+msgid "Protocol"
+msgstr "Protokół"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Przekieruj ruch przychodzący na podany port do wskazanego hosta w sieci "
+"wewnętrznej"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Przekieruj ruch przychodzący do wskazanego hosta w sieci wewnętrznej"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Ogranicz maskaradę do wskazanych sieci docelowych"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Ogranicz maskaradę do wskazanych sieci żródłowych"
+
+# Wstawiłem rodzinę gdyż gdzieś wcześniej było tak opisane ale klasa pasuje mi tu bardziej.
+# Obsy - niestety ale "rodzina". W gui dotyczy to wyboru IPv4/IPv6, więc "rodzina" a nie klasa.
+msgid "Restrict to address family"
+msgstr "Ogranicz do rodziny adresów"
+
+# Dosłownie przetłumaczone, nie bardzo wiem czy chodzi o czynność przepisywania pakietu przez usługę czy to jakieś ogólne sformułowanie...
+msgid "Rewrite matched traffic to the given address."
+msgstr "Przepisz dopasowany ruch do wskazanych adresów."
+
+# Jak wyżej chodzi o przepisanie pakietu przez usługę?
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Przepisz dopasowany ruch do danego portu żródłowego. Można zostawić puste "
+"aby przepisać tylko adres IP"
+
+msgid "Rewrite to source %s"
+msgstr "Przepisz do źródła %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Przepisz do źródła %s, %s"
+
+msgid "SNAT IP address"
+msgstr "Adres IP SNAT"
+
+msgid "SNAT port"
+msgstr "Port SNAT"
+
+msgid "Source IP address"
+msgstr "Źródłowy adres IP"
+
+msgid "Source MAC address"
+msgstr "Źródłowy adres MAC"
+
+msgid "Source NAT"
+msgstr "NAT żródłowy"
+
+# http://www.digipedia.pl/def/doc/id/677604507/name/SNAT/
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"SNAT używany jest wtedy, gdy zmieniane są adresy pakietów połączenia "
+"wychodzącego, czyli pakiety żródłowe. Wykonywany jest zawsze po routowaniu "
+"(POSTROUTING), a więc w chwili, gdy pakiety są gotowe opuścić host. "
+"IPmasquerading jest formą SNAT."
+
+msgid "Source address"
+msgstr "Adres źródłowy"
+
+msgid "Source port"
+msgstr "Port źródłowy"
+
+msgid "Source zone"
+msgstr "Strefa źródłowa"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Firewall tworzy strefy z Twoich interfejsów sieciowych, aby kontrolować ruch "
+"sieciowy."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Opcje poniżej kontrolują politykę przekazywania pomiędzy tą strefą (%s) a "
+"innymi strefami. <em>Strefy docelowe</em> obejmują przekazywany ruch "
+"<strong>pochodzący z %q</strong>. <em>Strefy źródłowe</em> match forwarded "
+"traffic from other zones <strong>skierowane do %q</strong>. Reguła "
+"przekazywania jest <em>jednokierunkowa</em>, np. przekazywanie z sieci LAN "
+"do WAN <em>nie</em> implikuje pozwolenia na przekazywanie z sieci WAN do LAN."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Ta strona pozwala zmienić zaawansowane ustawienia przekierowania portów. W "
+"większości przypadków nie ma potrzeby zmieniać tych ustawień."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Ta strona pozwala zmienić zaawansowane ustawienia reguły ruchu sieciowego, "
+"takie jak pasujące źródło i hosty docelowe."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Ta sekcja definiuje ustawienia ogólne %q. Opcje <em>\"wejście\"</em> i <em>"
+"\"wyjście\"</em> określają domyślną politykę dla ruchu przychodzącego i "
+"wychodzącego w tej strefie, podczas gdy <em>\"przekazywanie\"</em> opisuje "
+"politykę ruchu przekazywanego pomiędzy różnymi sieciami wewnątrz strefy. "
+"<em>Objęte sieci</em> określają dostępne sieci będące członkami tej strefy."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "Do %s w %s na <var>tym urządzeniu</var>"
+
+msgid "To %s in %s"
+msgstr "Do %s w %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "Do %s na <var>tym urządzeniu</var>"
+
+msgid "To %s, %s in %s"
+msgstr "Do %s, %s w %s"
+
+msgid "To source IP"
+msgstr "Do źródłowego IP"
+
+msgid "To source port"
+msgstr "Do źródłowego portu"
+
+msgid "Traffic Rules"
+msgstr "Reguły ruchu sieciowego"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Reguły ruchu sieciowego definiują politykę dla pakietów przechodzących "
+"między strefami, na przykład aby odrzucać ruch między konkretnymi hostami "
+"albo otworzyć porty WAN routera."
+
+msgid "Via %s"
+msgstr "Przez %s"
+
+msgid "Via %s at %s"
+msgstr "Przez %s w %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Możesz określić kilka wybierając \"-- własne --\" i wpisując protokoły "
+"rozdzielone spacją."
+
+msgid "Zone %q"
+msgstr "Strefa %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Strefa ⇒ Przekazywanie"
+
+msgid "Zones"
+msgstr "Strefy"
+
+msgid "accept"
+msgstr "akceptuj"
+
+msgid "any"
+msgstr "dowolny"
+
+msgid "any host"
+msgstr "dowolny host"
+
+msgid "any router IP"
+msgstr "dowolne IP routera"
+
+msgid "any zone"
+msgstr "dowolna strefa"
+
+msgid "don't track"
+msgstr "nie śledź"
+
+msgid "drop"
+msgstr "porzucaj"
+
+msgid "reject"
+msgstr "odrzucaj"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Miejsce przeznaczenia"
+
+#~ msgid "Family"
+#~ msgstr "Rodzina"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "Przekazuj do %s w %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "Przekazuj d0 %s, %s w %s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Źródło"
+
+#~ msgid "To %s"
+#~ msgstr "Do %s"
+
+#~ msgid "Via"
+#~ msgstr "przez"
+
+#~ msgid "Accept forward"
+#~ msgstr "Akceptuj przekazywanie"
+
+#~ msgid "Accept input"
+#~ msgstr "Akceptuj wejście"
+
+#~ msgid "Disable"
+#~ msgstr "Wyłącz"
+
+#~ msgid "Discard forward"
+#~ msgstr "Odrzuć przekazywanie"
+
+#~ msgid "Discard input"
+#~ msgstr "Odrzuć wejście"
+
+#~ msgid "Do not track forward"
+#~ msgstr "Nie śledź przekazywania"
+
+#~ msgid "Do not track input"
+#~ msgstr "Nie śledź wejścia"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "Zakres IP"
+
+#~ msgid "IPs"
+#~ msgstr "Numery IP"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "Adresy MAC"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Reguła jest wyłączona"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Reguła jest włączona"
+
+#~ msgid "day"
+#~ msgstr "dzień"
+
+#~ msgid "port"
+#~ msgstr "port"
+
+#~ msgid "ports"
+#~ msgstr "porty"
+
+#~ msgid "(optional)"
+#~ msgstr "(opcjonalne)"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Wewnętrzny port (opcjonalnie)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Opcje zaawansowane"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# msgid "Name"
+# msgstr ""
+# msgid "(optional)"
+# msgstr ""
+# msgid "Protocol"
+# msgstr ""
+# msgid "Source port"
+# msgstr ""
+# msgid "Destination port"
+# msgstr ""
+# msgid "Action"
+# msgstr ""
+# msgid "drop"
+# msgstr ""
+# msgid "accept"
+# msgstr ""
+# msgid "reject"
+# msgstr ""
+#~ msgid "Advanced Rules"
+#~ msgstr "Reguły zaawansowane"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Reguły zaawansowane pozwalają dostosować zaporę do Twoich potrzeb. Tylko "
+#~ "nowe połączenia zostaną nimi objęte. Pakiety należące do połączeń już "
+#~ "otwarte są automatycznie przepuszczane przez zaporę."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Reguły własne (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Urządzenie"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Dla DNAT, dopasuj ruch przychodzący kierowane na podany adres IP. Dla "
+#~ "SNAT zmienić adres źródłowy na podany adres."
diff --git a/trunk/package/luci/po/pl/freifunk-policyrouting.po b/trunk/package/luci/po/pl/freifunk-policyrouting.po
new file mode 100644
index 00000000..bcb4492a
--- /dev/null
+++ b/trunk/package/luci/po/pl/freifunk-policyrouting.po
@@ -0,0 +1,69 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-24 07:01+0200\n"
+"PO-Revision-Date: 2012-08-24 08:02+0200\n"
+"Last-Translator: goodgod261 <goodgod261@wp.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Cały ruch sieciowy z interfejsów należących do tych stref będzie wysyłany "
+"przez bramę w sieci mesh."
+
+msgid "Enable Policy Routing"
+msgstr "Włącz politykę trasowania (routingu)"
+
+msgid "Fallback to mesh"
+msgstr "Fallback do mesh"
+
+msgid "Firewall zones"
+msgstr "Strefy firewalla"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"Jeśli nie otrzymano domyślnej trasy z sieci mesh, ruch sieciowy należący do "
+"wybranej strefy firewalla jest trasowany przez Twoje połączenie z internetem "
+"jako fallback. Jeśli tego nie chcesz i zamiast tego chciałbyś blokować taki "
+"ruch sieciowy, powinieneś zaznaczyć tę opcję."
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+"Jeśli Twoja własna brama nie jest dostępna, wykonaj fallback do domyślnej "
+"bramy sieci mesh."
+
+msgid "Policy Routing"
+msgstr "Polityka trasowania (routingu)"
+
+msgid "Strict Filtering"
+msgstr "Ścisłe filtrowanie"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"Te strony mogą zostać użyte do ustawienia polityki trasowania (routingu) dla "
+"wybranych stref firewalla. Jest to użyteczne jeśli chcesz używać swojego "
+"połączenia z internetem sam i nie chcesz dzielić się nim z innymi (stąd "
+"alternatywna nazwa \"tryb ego\"). Twój własny ruch sieciowy jest wysyłany "
+"przez Twoje połączenie, zaś ruch pochodzący z sieci mesh będzie używać innej "
+"bramy w sieci."
diff --git a/trunk/package/luci/po/pl/freifunk.po b/trunk/package/luci/po/pl/freifunk.po
new file mode 100644
index 00000000..ac46e1fd
--- /dev/null
+++ b/trunk/package/luci/po/pl/freifunk.po
@@ -0,0 +1,422 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-23 19:16+0200\n"
+"Last-Translator: goodgod261 <goodgod261@wp.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Błąd (Etx > 10)"
+
+msgid "Basic Settings"
+msgstr "Ustawienia Podstawowe"
+
+msgid "Basic settings"
+msgstr "Ustawienia podstawowe"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Niekompletne ustawienia podstawowe. Proszę uzupełnić"
+
+msgid "Basic system settings"
+msgstr "Podstawowe ustawienia systemu"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Channel"
+msgstr "Kanał"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr "Automatycznie sprawdź i uaktualnij wersję firmware`u"
+
+msgid "Client network size"
+msgstr "Rozmiar sieci klientów"
+
+msgid "Community"
+msgstr "Społeczność"
+
+msgid "Community profile"
+msgstr "Profil w społeczności"
+
+msgid "Community settings"
+msgstr "Ustawienia społeczności"
+
+msgid "Confirm Upgrade"
+msgstr "Potwierdź uaktualnienie"
+
+msgid "Contact"
+msgstr "Dane kontaktowe"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "Dane kontaktowe są niekompletne. Proszę uzupełnij je"
+
+msgid "Coordinates"
+msgstr "Współrzędne"
+
+msgid "Country code"
+msgstr "Prefiks kraju"
+
+msgid "Default routes"
+msgstr "Domyślne trasy (routes)"
+
+msgid "Disable default content"
+msgstr "Wyłącz domyślną zawartość"
+
+# Nie przetłumaczymy tego lepiej.
+msgid "Diversity is enabled for device"
+msgstr "Różnorodność jest włączona dla urządzenia"
+
+msgid "E-Mail"
+msgstr "E-Mail"
+
+msgid "ESSID"
+msgstr "Nazwa sieci (ESSID)"
+
+msgid "Edit index page"
+msgstr "Edytuj stronę główną"
+
+msgid "Enable IPv6"
+msgstr "Włącz IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "Błąd"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Znajdź swoje współrzędne w OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Przegląd sieci Freifunk"
+
+msgid "Freifunk Remote Update"
+msgstr "Zdalna aktualizacja Freifunk"
+
+msgid "Gateway"
+msgstr "Brama"
+
+msgid "Go to"
+msgstr "Przejdź do"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Dobrze (2 < ETX < 4)"
+
+msgid "Green"
+msgstr "Zielone"
+
+msgid "Hello and welcome in the network of"
+msgstr "Cześć! Witamy w sieci"
+
+msgid "Hide OpenStreetMap"
+msgstr "Ukryj OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Strona domowa"
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "IPv6 Config"
+msgstr "Konfiguracja IPv6"
+
+msgid "IPv6 Prefix"
+msgstr "Prefiks IPv6"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "Sieć IPv6 w notacji CIDR"
+
+msgid "If selected then the default content element is not shown."
+msgstr "Jeśli zaznaczone domyślna zawartość nie jest widoczna"
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Jeśli jesteś zainteresowany projektem kontaktuj się z lokalna społecznością "
+"Freifunk"
+
+msgid "Index Page"
+msgstr "Strona początkowa"
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Dostęp do internetu zależy od warunków technicznych i organizacyjnych, i "
+"dlatego może nie działać."
+
+msgid "It is operated by"
+msgstr "Jest zarządzany przez"
+
+msgid "Keep configuration"
+msgstr "Zachowaj konfigurację"
+
+msgid "Latitude"
+msgstr "Szerokość"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Load"
+msgstr "Obciążenie"
+
+msgid "Local Time"
+msgstr "Czas Lokalny"
+
+# Może ktoś ma lepsze słowo?
+msgid "Location"
+msgstr "Lokacja"
+
+msgid "Longitude"
+msgstr "Długość"
+
+msgid "Map"
+msgstr "Mapa"
+
+msgid "Map Error"
+msgstr "Błąd Mapy"
+
+msgid "Memory"
+msgstr "Pamięć"
+
+# Dosłownie prefiks kraty
+msgid "Mesh prefix"
+msgstr "Prefiks komórki"
+
+msgid "Metric"
+msgstr "Metryka"
+
+msgid "Mode"
+msgstr "Tryb"
+
+msgid "Network"
+msgstr "Sieć"
+
+msgid "Network for client DHCP addresses"
+msgstr "Sieć dla adresów klienta DHCP"
+
+msgid "Nickname"
+msgstr "Twoja ksywka"
+
+msgid "No default routes known."
+msgstr "Nie są znane żadne domyślne ścieżki routingu."
+
+msgid "Notice"
+msgstr "Uwaga"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Zarządca"
+
+msgid "Orange"
+msgstr "Pomarańczowe"
+
+msgid "Overview"
+msgstr "Przegląd"
+
+msgid "Package libiwinfo required!"
+msgstr "Wymagany pakiet libiwinfo !"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Please fill in your contact details below."
+msgstr "Proszę uzupełnij dane kontaktowe poniżej."
+
+msgid "Please set your contact information"
+msgstr "Proszę uzupełnić swoje dane kontaktowe"
+
+msgid "Power"
+msgstr "Moc"
+
+msgid "Processor"
+msgstr "Procesor"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Profile (Expert)"
+msgstr "Profil (tryb eksperta)"
+
+msgid "Realname"
+msgstr "Imię i Nazwisko (prawdziwe)"
+
+msgid "Red"
+msgstr "Czerwone"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Proszę zaznaczyć swoją lokację na mapie. Mapa jest pokazywana tylko jeśli "
+"masz dostęp do internetu."
+
+msgid "Show OpenStreetMap"
+msgstr "Pokaż OpenStreetMap"
+
+msgid "Show on map"
+msgstr "Pokaż na mapie"
+
+msgid "Signal"
+msgstr "Sygnał"
+
+msgid "Splash"
+msgstr "Splash"
+
+msgid "Start Upgrade"
+msgstr "Zacznij aktualizację"
+
+msgid "Statistics"
+msgstr "Statystyki"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Cały Czas do użycia (4 < ETX < 10)"
+
+msgid "System"
+msgstr "System"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Pakiet <em>libiwinfo</em> nie jest zainstalowany. Musisz go zainstalować, "
+"aby konfiguracja sieci bezprzewodowej mogła być uaktywniona!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"Usługa OLSRd nie jest skonfigurowana do pozyskiwania nazwy z sieci.<br /> "
+"Proszę się upewnić, że plugin nameservice jest poprawnie skonfigurowany, "
+"oraz opcja użycia pliku <em>latlon_file</em> jest zaznaczona."
+
+msgid "The installed firmware is the most recent version."
+msgstr "Zainstalowany firmware jest aktualny."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"Są to podstawowe ustawienia dla twojej lokalnej bezprzewodowej społeczności. "
+"Te ustawienia określają domyślne wartości dla kreatora i NIE MAJĄ wpływu na "
+"aktualną konfigurację routera."
+
+msgid "These are the settings of your local community."
+msgstr "To są ustawienia twojej lokalnej społeczności (community)."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Te strony pomogą ci skonfigurować twój router do sieci Freifunk, lub innej "
+"sieci społecznościowej ."
+
+msgid "This is the access point"
+msgstr "To jest punk dostępowy (AP)"
+
+msgid "Update Settings"
+msgstr "Uaktualnij ustawienia"
+
+msgid "Update available!"
+msgstr "Aktualizacja dostępna!!!"
+
+msgid "Uptime"
+msgstr "Aktualizacja"
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr "Sprawdź pobrane obrazy"
+
+msgid "Very good (ETX < 2)"
+msgstr "Bardzo Dobrze (ETX < 2)"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Jesteśmy inicjatywą na rzecz ustanowienia wolnej, niezależnej i otwartej "
+"bezprzewodowej siatki kratowej."
+
+msgid "Wireless Overview"
+msgstr "Przegląd Ustawień WiFi"
+
+msgid "Yellow"
+msgstr "Żółty"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"Można wyświetlić dodatkową zawartość na publicznej stronie indeksu "
+"wstawiając poprawny XHTML do formularza poniżej.<br />Nagłówki powinny być "
+"zamknięte tagami &lt;h2&gt; i &lt;/h2&gt;."
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+"Możesz znaleźć więcej informacji o naszej globalnej inicjatywie Freifunk na"
+
+msgid "You can manually edit the selected community profile here."
+msgstr "Możesz ręcznie edytować wybrany profil społeczności tutaj"
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+"Aby edytować profil musisz go najpierw zaznaczyć. Zaznacz profil aby "
+"kontynuować"
+
+msgid "and fill out all required fields."
+msgstr "i wypełnij wszystkie wymagane pola."
+
+msgid "buffered"
+msgstr "buforowany"
+
+msgid "cached"
+msgstr "cachowany"
+
+msgid "e.g."
+msgstr "np."
+
+msgid "free"
+msgstr "darmowy"
+
+msgid "to disable it."
+msgstr "aby wyłączyć"
+
+msgid "used"
+msgstr "używany"
+
+msgid "wireless settings"
+msgstr "ustawienia sieci bezprzewodowej"
diff --git a/trunk/package/luci/po/pl/hd_idle.po b/trunk/package/luci/po/pl/hd_idle.po
new file mode 100644
index 00000000..e66e3a9e
--- /dev/null
+++ b/trunk/package/luci/po/pl/hd_idle.po
@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2011-06-03 16:09+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Disk"
+msgstr "Dysk"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "Enable debug"
+msgstr "Włącz tryb debugowania"
+
+msgid "Idle-time"
+msgstr "Czas bezczynności"
+
+msgid "Idle-time unit"
+msgstr "Jednostka czasu bezczynności"
+
+msgid "Settings"
+msgstr "Ustawienia"
+
+# Hours
+msgid "h"
+msgstr "godz."
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle jest narzędziem do zwalniania obrotów zewnętrznych dysków po "
+"określonym czasie bezczynności."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
diff --git a/trunk/package/luci/po/pl/meshwizard.po b/trunk/package/luci/po/pl/meshwizard.po
new file mode 100644
index 00000000..79409aa4
--- /dev/null
+++ b/trunk/package/luci/po/pl/meshwizard.po
@@ -0,0 +1,147 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-19 21:15+0200\n"
+"PO-Revision-Date: 2014-04-23 19:18+0200\n"
+"Last-Translator: goodgod261 <goodgod261@wp.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Aktywuj lub dezaktywuj ipv6 konfiguracja globalna"
+
+msgid "Channel"
+msgstr "Kanał"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Zaznacz, aby zabezpieczyć sieć lokalną przed innymi węzłami lub klientami "
+"sieci"
+
+msgid "Cleanup config"
+msgstr "Wyczyść konfigurację"
+
+msgid "Configure this interface"
+msgstr "Skonfiguruj ten interfejs"
+
+msgid "DHCP IP range"
+msgstr "Pula adresów DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP automatycznie przypisze adresy IP klientom"
+
+msgid "Enable DHCP"
+msgstr "Włącz DHCP"
+
+msgid "Enable RA"
+msgstr "Włącz RA"
+
+msgid "Enabled"
+msgstr "Włączone"
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "IPv6 Settings"
+msgstr "IPv6 Ustawienia"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Jeśli ta opcja jest zaznaczona to stara konfiguracja jest usuwana przed "
+"zapisaniem nowych opcji."
+
+msgid "Interfaces"
+msgstr "Interfejsy"
+
+msgid "Mesh IP address"
+msgstr "Adres Mesh IP"
+
+msgid "Mesh IPv6 address"
+msgstr "Adres Mech IPv6"
+
+msgid "Mesh Wizard"
+msgstr "Kreator Mesh"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Nota: To są ustawienia interfejsu mesh operacja i.e Dodawanie Strefy "
+"'Freifunk' oraz włączyć olsr"
+
+msgid "Protect LAN"
+msgstr "Chroń LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Zaznacz tę opcję aby inni użytkownicy mogli używać twojego połączenia do "
+"korzystania z internetu"
+
+msgid "Send router advertisements on this device."
+msgstr "Wyślij Routera Reklamę na urządzenie"
+
+msgid "Share your internet connection"
+msgstr "Współdziel swoje połączenie internetowe"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Zakres adresów IP, z którego klientom są przypisywane adresy IP (np. "
+"10.1.2.1/28). Jeżeli jest to zakres wewnątrz twojej sieci mesh, wówczas "
+"zostanie rozgłoszony jako HNA. Każdy inny zakres będzie używać NAT. Jeżeli "
+"pozostanie pusty, wówczas zostanie użyty domyślny profil społeczności."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr "Podany adres IP nie należy do zakresu sieci mesh"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+"To jest unikalny adres IPv6 w notacji <abbr title=\"Classless Inter-Domain "
+"Routing\">CIDR</abbr> (np. 2001:1:2:3:1/64) i musi zostać zarejestrowany w "
+"Twojej lokalnej społeczności"
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Jest to unikalny adres w sieci mesh (np. 10.1.1.1) i musi być zarejestrowana "
+"w lokalnej społeczności."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Ta opcja skonfiguruje nowy wirtualny interfejs bezprzewodowy w trybie Access "
+"Point`a"
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Ten kreator pomoże skonfigurować router do korzystania z Freifunk lub "
+"podobnej społecznej sieci bezprzewodowej (darmowe WiFi)"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Access Point Wirtualny (VAP)"
+
+msgid "Wizard"
+msgstr "Kreator"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Twój router i sąsiedzkie węzły sieci używają tego samego kanału."
+
+msgid "recommended"
+msgstr "zalecane"
diff --git a/trunk/package/luci/po/pl/minidlna.po b/trunk/package/luci/po/pl/minidlna.po
new file mode 100644
index 00000000..b4a8a6f6
--- /dev/null
+++ b/trunk/package/luci/po/pl/minidlna.po
@@ -0,0 +1,189 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-24 07:53+0200\n"
+"Last-Translator: goodgod261 <goodgod261@wp.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Album art names:"
+msgstr "Nazwy okładek albumów:"
+
+msgid "Announced model number:"
+msgstr "Rozgłaszany model:"
+
+msgid "Announced serial number:"
+msgstr "Rozgłaszany numer seryjny:"
+
+msgid "Browse directory"
+msgstr "Przeglądaj folder"
+
+msgid "Collecting data..."
+msgstr "Zbieranie informacji..."
+
+msgid "Database directory:"
+msgstr "Katalog bazy danych:"
+
+msgid "Enable TIVO:"
+msgstr "Włącz TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Włącz inotify:"
+
+msgid "Enable:"
+msgstr "Włącz:"
+
+msgid "Friendly name:"
+msgstr "Przyjazna nazwa:"
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "Interfaces:"
+msgstr "Interfejsy:"
+
+msgid "Log directory:"
+msgstr "Katalog dzienników (logów):"
+
+msgid "Media directories:"
+msgstr "Katalog mediów:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA jest oprogramowaniem serwerowym mającym na celu pełną zgodność z "
+"klientami DLNA/UPnP-AV."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr "Model, który demon miniDLNA zgłosi klientom w swoim opisie XML."
+
+msgid "Music"
+msgstr "Muzyka"
+
+msgid "Network interfaces to serve."
+msgstr "Interfejsy sieciowe do obsługiwania."
+
+msgid "Notify interval in seconds."
+msgstr "Interwał powiadamiania w sekundach."
+
+msgid "Notify interval:"
+msgstr "Interwał powiadamiania."
+
+msgid "Pictures"
+msgstr "Obrazy"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port dla ruchu HTTP (opisy, SOAP, transfer mediów)."
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr "URL prezentacyjny:"
+
+msgid "Root container:"
+msgstr "Kontener główny (root):"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Numer seryjny, który demon miniDLNA zgłosi klientom w swoim opisie XML."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "Ustaw to, jeśli chcesz wybrać własną nazwę pokazującą się w klientach."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Ustaw to, jeśli chcesz podać folder, w którym miniDLNA powinien przechowywać "
+"bazę danych i cache okładek albumów."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+"Ustaw to, jeśli chcesz podać folder, w którym miniDLNA powinien przechowywać "
+"dzienniki (logi)."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Ustaw to, aby włączyć monitorowanie inotify, by automatycznie wykrywać nowe "
+"pliki."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Ustaw to, aby włączyć wsparcie dla streamingu plików .jpg i .mp3 do TiVo "
+"obsługującego HMO."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Ustaw to, aby ściśle przestrzegać standardów DLNA. Pozwoli to na "
+"zmniejszanie wielkich plików JPEG po stronie serwera, co może obniżyć "
+"wydajność dostarczania plików JPEG (przynajmniej) na urządzeniach DLNA Sony."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Ustaw tu folder, który chcesz skanować. Jeśli chcesz ograniczyć folder do "
+"konkretnego typu zawartości, możesz poprzedzić ścieżkę typem (\"A\" dla "
+"audio, \"V\" dla wideo, \"P\" dla obrazów) i przecinkiem (np media_dir=A,/"
+"mnt/media/Muzyka). Możesz podać kilka folderów."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Podaj ścieżkę do gniazda (socketu) miniSSDPd."
+
+msgid "Standard container"
+msgstr "Standardowy kontener"
+
+msgid "Strict to DLNA standard:"
+msgstr "Ściśle trzymaj się standardów DLNA:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"Usługa miniDLNA jest aktywna, dostarczając %d utworów, %d filmów i %d "
+"obrazów."
+
+msgid "The miniDLNA service is not running."
+msgstr "Usługa miniDLNA nie jest włączona."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+"To jest lista nazw plików do sprawdzenia podczas wyszukiwania okładki albumu."
+
+msgid "Video"
+msgstr "Wideo"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "Status miniDLNA"
+
+msgid "miniSSDP socket:"
+msgstr "Gniazdo (socket) miniSSDP:"
diff --git a/trunk/package/luci/po/pl/mmc_over_gpio.po b/trunk/package/luci/po/pl/mmc_over_gpio.po
new file mode 100644
index 00000000..ff5b51b2
--- /dev/null
+++ b/trunk/package/luci/po/pl/mmc_over_gpio.po
@@ -0,0 +1,42 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-08-26 12:23+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "CLK_pin"
+msgstr "Pin CLK"
+
+msgid "CS_pin"
+msgstr "Pin CS"
+
+msgid "DI_pin"
+msgstr "Pin DI"
+
+msgid "DO_pin"
+msgstr "Pin DO"
+
+msgid "Enable"
+msgstr "Uaktywnij"
+
+msgid "MMC/SD driver configuration"
+msgstr "Konfiguracja sterownika MMC/SD"
+
+msgid "Mode"
+msgstr "Tryb"
+
+msgid "Name"
+msgstr "Nazwa"
+
+msgid "Settings"
+msgstr "Ustawienia"
diff --git a/trunk/package/luci/po/pl/multiwan.po b/trunk/package/luci/po/pl/multiwan.po
new file mode 100644
index 00000000..5904aed2
--- /dev/null
+++ b/trunk/package/luci/po/pl/multiwan.po
@@ -0,0 +1,125 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-01 15:25+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Liczba prób przed procedurą WAN Failover (połączenie awaryjne WAN)"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Liczba prób przed procedurą WAN Recovery (przywrócenie WAN)"
+
+msgid "Auto"
+msgstr "Automatycznie"
+
+msgid "Collecting data..."
+msgstr "Zbieranie informacji..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Skonfiguruj zasady kierowania ruchu wychodzącego za pośrednictwem "
+"określonych łączy WAN."
+
+msgid "DNS Server(s)"
+msgstr "Serwer(y) DNS"
+
+msgid "Default Route"
+msgstr "Trasa domyślna"
+
+msgid "Destination Address"
+msgstr "Adres docelowy"
+
+msgid "Disable"
+msgstr "Wyłącz"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "Failing"
+msgstr "Niepowodzenie"
+
+msgid "Failover Traffic Destination"
+msgstr "Cel ruch dla połączenia awaryjnego"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Monitorowane hosty przy użyciu protokołu ICMP (ping)"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+"Czas nieosiągalności monitorowanych hostów przy użyciu protokołu ICMP (ping)"
+
+msgid "Health Monitor Interval"
+msgstr "Odstęp pomiędzy próbami monitoringu"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"Monitor stanu wykrywa i koryguje zmiany sieci oraz nieudane połączenia."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Dystrybucja równoważenia obciążenia"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Równoważenie obciążenia (Zgodność)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Równoważenie obciążenia (Wydajność)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Status Multi-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Reguły ruchu Multi-WAN"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Multi-WAN pozwala na używanie kilku łącz w celu równoważenia obciążenia lub "
+"omijania awarii."
+
+msgid "None"
+msgstr "Żaden"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Protocol"
+msgstr "Protokół"
+
+msgid "Recovering"
+msgstr "Odzyskiwanie"
+
+msgid "Source Address"
+msgstr "Adres źródłowy"
+
+msgid "Unknown"
+msgstr "Nieznany"
+
+msgid "WAN Interfaces"
+msgstr "Interfejsy WAN"
+
+msgid "WAN Uplink"
+msgstr "Łącze WAN"
+
+msgid "all"
+msgstr "wszystkie"
diff --git a/trunk/package/luci/po/pl/ntpc.po b/trunk/package/luci/po/pl/ntpc.po
new file mode 100644
index 00000000..c2cb3e8a
--- /dev/null
+++ b/trunk/package/luci/po/pl/ntpc.po
@@ -0,0 +1,54 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2011-09-18 02:23+0200\n"
+"Last-Translator: Michał <wispwind@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Clock Adjustment"
+msgstr "Regulacja zegara"
+
+msgid "Count of time measurements"
+msgstr "Liczba pomiarów czasu"
+
+msgid "Current system time"
+msgstr "Aktualny czas systemowy"
+
+msgid "General"
+msgstr "Główne"
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "Offset frequency"
+msgstr "Przesunięcie częstotliwości"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Synchronizuje czas systemowy"
+
+msgid "Time Server"
+msgstr "Serwer czasu"
+
+msgid "Time Servers"
+msgstr "Serwery czasu"
+
+msgid "Time Synchronisation"
+msgstr "Synchronizacja czasu"
+
+msgid "Update interval (in seconds)"
+msgstr "Interwał aktualizacji (w sekundach)"
+
+msgid "empty = infinite"
+msgstr "puste = nieskończone"
diff --git a/trunk/package/luci/po/pl/olsr.po b/trunk/package/luci/po/pl/olsr.po
new file mode 100644
index 00000000..64a99f60
--- /dev/null
+++ b/trunk/package/luci/po/pl/olsr.po
@@ -0,0 +1,749 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-05 03:22+0200\n"
+"Last-Translator: piosl <sleczek.piotr@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "Aktywne ogłoszenia MID"
+
+msgid "Active OLSR nodes"
+msgstr "Aktywne węzły OLSR"
+
+msgid "Active host net announcements"
+msgstr "Aktywne ogłoszenia hostnet"
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Allow gateways with NAT"
+msgstr "Zezwól na bramy z NAT"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "Zezwól na wybieranie wychodzącej bramy IPv4 przez NAT"
+
+msgid "Announce uplink"
+msgstr "Ogłaszaj uplink"
+
+msgid "Announced network"
+msgstr "Ogłaszana sieć"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+"Obie wartości muszą używać zapisu dziesiętnego z kropką przed częścią "
+"dziesiętną."
+
+msgid "Broadcast address"
+msgstr "Adres rozgłoszeniowy (broadcast)"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "Wyświetl"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Download Config"
+msgstr "Ustawienia pobierania"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"Włącz SmartGateway. Jeśli wyłączone, wszystkie inne parametry SmartGateway "
+"są ignorowane. Domyślnie jest wyłączone."
+
+msgid "Enable this interface."
+msgstr "Włącz ten interfejs."
+
+msgid "Enabled"
+msgstr "Włączone"
+
+msgid "Expected retransmission count"
+msgstr "Oczekiwana wartość retransmisji"
+
+msgid "FIB metric"
+msgstr "Metryka FIB"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+# skorzystałem z niemieckiego tłumaczenia
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+"Mechanizm Fisheye dla TCs (zaznaczone oznacza \"włączone\"). Domyślnie jest "
+"\"włączone\""
+
+msgid "Gateway"
+msgstr "Brama"
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "General settings"
+msgstr "Ustawienia ogólne"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "Ogłoszenia HNA"
+
+msgid "HNA interval"
+msgstr "Interwał HNA"
+
+msgid "HNA validity time"
+msgstr "Czas poprawności HNA"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Ogłoszenia HNA"
+
+msgid "Hello"
+msgstr "Hello"
+
+msgid "Hello interval"
+msgstr "Interwał Hello"
+
+msgid "Hello validity time"
+msgstr "Czas poprawności Hello"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "Skoki (hops)"
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+"Hosty w sieci OLSR mogą ogłaszać połączenia z zewnętrznymi sieciami poprzez "
+"wiadomości HNA."
+
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Hosty w sieci OLSR mogą ogłaszać połączenia z zewnętrznymi sieciami poprzez "
+"wiadomości HNA."
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr "Adresy IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+"Wersja protokołu IP. Jeśli jest wybrana 6and4 wtedy instancja olsrd jest "
+"uruchomiona dla każdego protokołu."
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "Rozgłaszanie IPv4"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+"Adres rozgłoszeniowy (broadcast) IPv4 dla wychodzących pakietów OLSR. "
+"Przydatnym przykładem byłoby 255.255.255.255. Domyślna wartość to "
+"\"0.0.0.0\" - jest wtedy używany adres rozgłoszeniowy interfejsu."
+
+msgid "IPv4 source"
+msgstr "Źródło IPv4"
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+"Adres źródłowy IPv4 dla wychodzących pakietów. Domyślna wartość to "
+"\"0.0.0.0\" - jest wtedy używany adres IP interfejsu."
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "Multicast IPv6"
+
+# Nie mam pojęcia, jak to lepiej przetłumaczyć, ale w moich tłumaczeniach kieruję się zasadą "release early, release often".
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+"Adres multicast IPv6. Domyślna wartość to \"FF02::6D\", multicast lokalnego "
+"routera."
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"Sieć IPv6 musi być podana w pełnej notacji, prefiks musi być w notacji CIDR."
+
+msgid "IPv6 source"
+msgstr "Źródło IPv6"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+"Prefiks źródła IPv6. OLSRd wybierze jeden z adresów IP interfejsów, który "
+"będzie pasował do tego prefiksu. Domyślna wartość to \"0::/0\" - jest wtedy "
+"używany adres IP interfejsu."
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr "Czy węzeł korzysta z NAT do połączenia z Internetem. Domyślnie \"Tak\""
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+"Tryb interfejsu jest używany, aby zapobiec niepotrzebnemu przekazywaniu "
+"pakietów. Prawidłowe tryby to \"mesh\" i \"ether\". Domyślna wartość to "
+"\"mesh\"."
+
+msgid "Interfaces"
+msgstr "Interfejsy"
+
+# by Google :D po części
+msgid "Interfaces Defaults"
+msgstr "Standardy interfejsów"
+
+msgid "Internet protocol"
+msgstr "Protokół internetowy"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "Znane ścieżki OLSR"
+
+msgid "LQ"
+msgstr "LQ"
+
+msgid "LQ aging"
+msgstr "Starzenie się LQ"
+
+msgid "LQ algorithm"
+msgstr "Algorytm LQ"
+
+msgid "LQ fisheye"
+msgstr "LQ-Fisheye"
+
+msgid "LQ level"
+msgstr "Poziom LQ"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "Ostatni skok (hop)"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Library"
+msgstr "Biblioteka"
+
+#, fuzzy
+msgid "Link Quality Settings"
+msgstr "Ustawienia jakości linków"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr "Mnożnik LinkQuality"
+
+msgid "Links per node (average)"
+msgstr "Linków na węzeł (średnio)"
+
+msgid "Links total"
+msgstr "Linków w sumie"
+
+msgid "Local interface IP"
+msgstr "IP lokalnego interfejsu"
+
+msgid "MID"
+msgstr "MID"
+
+msgid "MID interval"
+msgstr "Interwał MID"
+
+msgid "MID validity time"
+msgstr "Czas poprawności MID"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "Główny IP"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+#, fuzzy
+msgid "Metric"
+msgstr "Miara"
+
+msgid "Mode"
+msgstr "Tryb"
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr "Próg NAT"
+
+msgid "NLQ"
+msgstr "NLQ"
+
+msgid "Neighbors"
+msgstr "Sąsiedzi"
+
+msgid "Neighbour IP"
+msgstr "IP sąsiadów"
+
+msgid "Neighbours"
+msgstr "Sąsiedzi"
+
+msgid "Netmask"
+msgstr "Maska sieciowa"
+
+msgid "Network"
+msgstr "Sieć"
+
+msgid "Network address"
+msgstr "Adres sieci"
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr "Węzły"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - ogłoszenia HNA"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - ogłoszenia HNA"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - pluginy"
+
+msgid "OLSR Daemon"
+msgstr "Demon OLSR"
+
+msgid "OLSR Daemon - Interface"
+msgstr "Demon OLSR - interfejs"
+
+msgid "OLSR connections"
+msgstr "Połączenia OLSR"
+
+msgid "OLSR gateway"
+msgstr "Brama OLSR"
+
+msgid "OLSR node"
+msgstr "Węzeł OLSR"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr "Przegląd"
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Przegląd aktywnych ogłoszeń hostnet OLSR"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Przegląd nawiązanych połączeń OLSR"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Przegląd znanych węzłów OLSR"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Przegląd znanych tras do innych węzłów OLSR"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr "Przegląd interfejsów z włączonym OLSR"
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Przegląd znanych wielointerfejsowych ogłoszeń"
+
+msgid "Overview of smart gateways in this network"
+msgstr "Przegląd bram SmartGateway w tej sieci"
+
+msgid "Plugin configuration"
+msgstr "Ustawienia pluginu"
+
+msgid "Plugins"
+msgstr "Pluginy"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Prefix"
+msgstr "Prefiks"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr "Rozwiąż"
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr "Trasy (routes)"
+
+msgid "Secondary OLSR interfaces"
+msgstr "Zapasowy interfejs OLSR"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr "Ogłoszenia SmartGW"
+
+msgid "SmartGateway is not configured on this system."
+msgstr "SmartGateway jest nieskonfigurowane."
+
+msgid "Source address"
+msgstr "Adres źródłowy"
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr "Stan"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+#, fuzzy
+msgid "Success rate of packages received from the neighbour"
+msgstr "Wartość poprawnie otrzymanych od sąsiada pakietów"
+
+#, fuzzy
+msgid "Success rate of packages sent to the neighbour"
+msgstr "Wartość poprawnie wysłanych pakietów do sąsiada"
+
+msgid "TC"
+msgstr "TC"
+
+msgid "TC interval"
+msgstr "Interwał TC"
+
+msgid "TC validity time"
+msgstr "Czas poprawności TC"
+
+msgid "TOS value"
+msgstr "Wartość TOS"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr "Interfejs, który powinien oferować OLSRd."
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+"Port używany przez OLSR. Zwykle powinien pozostać na przydzielonym przez "
+"IANA porcie 698. Może mieć wartość pomiędzy 1 a 65535."
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr "Topologia"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Połączenie z demonem OLSR nieudane!"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Uplink uses NAT"
+msgstr "Uplink używa NAT"
+
+msgid "Use hysteresis"
+msgstr "Używaj histerezy"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Wersja"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+"Uwaga: kmod-ipip nie jest zainstalowany. Bez kmod-ipip bramy SmartGateway "
+"nie będą działać. Proszę go zainstalować."
+
+msgid "Weight"
+msgstr "Waga"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+"Kiedy istnieje wiele połączeń między hostami, waga interfejsów określa, "
+"którego z nich użyć. Zwykle jest liczona automatycznie przez olsrd opartym "
+"na charakterystyce interfejsu, ale tu możesz podać stałą wartość. Olsrd "
+"wybierze połączenie z najniższą wartością.<br /><b>Uwaga:</b> Waga "
+"interfejsu jest używana tylko kiedy LinkQualityLevel jest ustawione na 0. "
+"Dla dowolnej innej wartości LinkQualityLevel, zamiast tego jest używana "
+"wartość ETX."
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr "Gotowość"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "Urządzenie"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Upewnij się że OLSRd jest uruchomione, \"txtinfo\" plugin jest "
+#~ "załadowany, skonfigurowany na porcie 2006 i akceptuje połączenia z "
+#~ "127.0.0.1 (localhost)"
diff --git a/trunk/package/luci/po/pl/openvpn.po b/trunk/package/luci/po/pl/openvpn.po
new file mode 100644
index 00000000..c514157d
--- /dev/null
+++ b/trunk/package/luci/po/pl/openvpn.po
@@ -0,0 +1,566 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-05 03:41+0200\n"
+"Last-Translator: piosl <sleczek.piotr@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', lub 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Zaakceptuj opcje narzucone przez serwer"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Add route after establishing connection"
+msgstr "Dodaj trasę po nawiązaniu połączenia"
+
+msgid "Additional authentication over TLS"
+msgstr "Dodatkowe uwierzytelnianie poprzez TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Zezwól na łączność klient-klient"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Zezwól na łączenie wielu klientów z tym samym certyfikatem."
+
+msgid "Allow only one session"
+msgstr "Zezwól tylko na jedną sesję"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Zezwól na zmianę IP lub portu odległemu hostowi."
+
+msgid "Allowed maximum of connected clients"
+msgstr "Maksymalna dozwolona liczba klientów"
+
+msgid "Allowed maximum of internal"
+msgstr "Maksymalna dozwolona liczba wewnętrznych"
+
+msgid "Allowed maximum of new connections"
+msgstr "Maksymalna dozwolona liczba nowych połączeń"
+
+msgid "Append log to file"
+msgstr "Dopisz log do pliku"
+
+msgid "Authenticate using username/password"
+msgstr "Autoryzacja z użyciem loginu oraz hasła"
+
+msgid "Automatically redirect default route"
+msgstr "Automatycznie przekieruj domyślną trasę"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Ponieżej znajduje się lista skonfigurowanych procesów OpenVPN wraz z ich "
+"aktualnymi stanami."
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "Zatrzymaj skrypt przed wyłączeniem interfejsu TUN/TAP"
+
+msgid "Certificate authority"
+msgstr "Urząd certyfikacji"
+
+msgid "Change process priority"
+msgstr "Zmień priorytet procesu"
+
+msgid "Change to directory before initialization"
+msgstr "Przejdź do katalogu przed inicjalizacją"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Sprawdź certyfikat peera na obecność w CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Zmień root (chroot) na katalog po inicjalizacji"
+
+msgid "Client is disabled"
+msgstr "Klient jest wyłączony"
+
+msgid "Configuration category"
+msgstr "Kategoria konfiguracji"
+
+msgid "Configure client mode"
+msgstr "Konfiguruj tryb klienta"
+
+msgid "Configure server bridge"
+msgstr "Konfiguruj serwer w trybie mostu"
+
+msgid "Configure server mode"
+msgstr "Konfiguruj serwer"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Połącz poprzez SOCKS5 proxy"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Połącz ze zdalnym hostem poprzez HTTP proxy"
+
+msgid "Connection retry interval"
+msgstr "Interwał powtarzania połączeń"
+
+msgid "Cryptography"
+msgstr "Kryptografia"
+
+msgid "Daemonize after initialization"
+msgstr "Przejdź w tryb demona po inicjalizacji"
+
+msgid "Delay n seconds after connection"
+msgstr "Opóźnienie n sekund po nawiązaniu połączenia"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Opóźnienie otwarcia interfejsu tun/tap i wykonania skryptu"
+
+msgid "Diffie Hellman parameters"
+msgstr "Parametry Diffie Hellman"
+
+msgid "Directory for custom client config files"
+msgstr "Katalog na pliki konfiguracyjne"
+
+msgid "Disable Paging"
+msgstr "Wyłącz stronicowanie"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Wyłącz wektor inicjalizacji szyfru"
+
+msgid "Disable options consistency check"
+msgstr "Wyłącz sprawdzanie poprawności ustawień"
+
+msgid "Disable replay protection"
+msgstr "Wyłącz ochronę odpowiedzi"
+
+msgid "Do not bind to local address and port"
+msgstr "Nie związuj z lokalnym adresem i portem"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Nie uruchamiaj obecnie ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "Nie dodawaj tras (routes) automatycznie"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "Nie cacheuj haseł --askpass lub --auth-user-pass"
+
+msgid "Don't inherit global push options"
+msgstr "Nie dziedzicz globalnej opcji push"
+
+msgid "Don't log timestamps"
+msgstr "Nie zapisuj czasu w logu"
+
+msgid "Don't re-read key on restart"
+msgstr "Nie wczytuj ponownie klucza podczas restartu"
+
+msgid "Don't require client certificate"
+msgstr "Nie wymagaj certyfikatu od klienta"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Nie używaj adaptatywnej kompresji lzo"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Nie ostrzegaj przed niespójnością w ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Zapisuj parametry w logu"
+
+msgid "Empirically measure MTU"
+msgstr "Mierz MTU empirycznie"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Włącz sprzętowe przyspieszenie OpenSSL"
+
+msgid "Enable Path MTU discovery"
+msgstr "Włącz wykrywanie \"Path MTU\""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Włącz tryb szyfrowania statycznym kluczem (non-TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Włącz TLS i przyjmij rolę klienta"
+
+msgid "Enable TLS and assume server role"
+msgstr "Włącz TLS i przyjmij rolę serwera"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Włącz wewnętrzną fragmentację datagramu"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Włącz interfejs zarządzalny na <em>IP</em> <em>port</em>"
+
+msgid "Enabled"
+msgstr "Włączone"
+
+msgid "Encryption cipher for packets"
+msgstr "Szyfrowanie dla pakietów"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Wykonaj komendę powłoki po dodaniu tras"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Wykonaj komendę powłoki po zmianie zdalnego IP"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+"Wykonane w trybie serwera na nowych połączeniach klienta, gdy klient jest "
+"nadal niezaufany"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+"Wykonane w trybie serwera, gdy adres IPv4, trasa lub adres MAC są dodane do "
+"wewnętrznej tablicy routingu w OpenVPN"
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Wyjdź przy niepowodzeniu negocjacji TLS"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Uzyskaj hasło PEM z kontroli tty przed demonizacją"
+
+msgid "HMAC authentication for packets"
+msgstr "Autoryzacja HMAC dla pakietów"
+
+msgid "Handling of authentication failures"
+msgstr "Postępowanie z błędami uwierzytelniania"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+"Dyrektywa Helper w celu uproszczenia wyrażenie --ping i --ping-restart w "
+"konfiguracjach w trybie serwera"
+
+msgid "If hostname resolve fails, retry"
+msgstr "Jeżeli ustanowienie nazwy hosta nie powiedzie się, spróbuj ponownie"
+
+msgid "Instance \"%s\""
+msgstr "Instancja \"%s\""
+
+msgid "Invalid"
+msgstr "Nieprawidłowe"
+
+msgid "Keep local IP address on restart"
+msgstr "Zachowaj lokalny adres IP przy restarcie"
+
+msgid "Keep remote IP address on restart"
+msgstr "Zachowaj zdalny adres IP przy restarcie"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Utrzymaj urządzenie tun/tap po restarcie jako otwarte"
+
+msgid "Key transition window"
+msgstr "Okno zmiany klucza"
+
+msgid "Limit repeated log messages"
+msgstr "Limit powtarzających się wiadomości w logu"
+
+msgid "Local certificate"
+msgstr "Certyfikat lokalny"
+
+msgid "Local host name or ip address"
+msgstr "Lokalna nazwa hosta lub adres IP"
+
+msgid "Local private key"
+msgstr "Lokalny klucz prywatny"
+
+msgid "Major mode"
+msgstr "Tryb główny"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Urządzenie tun zgodne z IPv6"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Maksymalna liczba wychodzących pakietów TCP w kolejce"
+
+msgid "Networking"
+msgstr "Ustawienia sieciowe"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Liczba przydzielonych buforów nadawczych"
+
+msgid "Number of lines for log file history"
+msgstr "Liczba linii w pliku dziennika historii"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Akceptuj tylko połączenia z podanej nazwy X509"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Wykonaj procedurę \"ping timeout\" tylko jeżeli trasy istnieją"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Instancje OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Optymalizuj wpisy TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Wysyłaj do syslog'a i nie demonizuj"
+
+msgid "Overview"
+msgstr "Przegląd"
+
+msgid "PKCS#12 file containing keys"
+msgstr "Plik PKCS#12 zawierający klucze"
+
+msgid "Pass environment variables to script"
+msgstr "Przekaż zmienne środowiskowe do skryptu"
+
+msgid "Persist replay-protection state"
+msgstr "Utrzymaj status ochrony odpowiedzi"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Utrzymuj/Nie utrzymuj ifconfig-pool"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Pinguj zdalnego co n sekund przez port TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+"Poziom zasad odnoszących się do używania zewnętrznych programów i skryptów"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol"
+msgstr "Protokół"
+
+msgid "Proxy timeout in seconds"
+msgstr "Czas bezczynności proxy w sekundach"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Wyślij opcje ifconfig do zdalnego"
+
+msgid "Push options to peer"
+msgstr "Wyślij opcje do peera"
+
+msgid "Query management channel for private key"
+msgstr "Kanał zarządzania zapytaniami dla klucza prywatnego"
+
+msgid "Randomly choose remote server"
+msgstr "Losowo wybierz serwer zdalny"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Odmów połączenie gdy nie standardowy klient konfiguracja"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Przemapuj SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Nazwa lub IP zdalnego hosta"
+
+msgid "Remote ping timeout"
+msgstr "Zdalny ping upłynął czas"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Renegocjacja danych charakteru klucza po bajtach"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Renegocjacja danych charakteru klucza po pakietach"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Renegocjacja danych charakteru klucza po sekundach"
+
+msgid "Replay protection sliding window size"
+msgstr "Powtórzenie osłony okna rozmiaru"
+
+msgid "Require explicit designation on certificate"
+msgstr "Potrzebna Podpis na Certyfikacie"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Potrzebna klucza używanego w certyfikacie"
+
+msgid "Restart after remote ping timeout"
+msgstr "restart po zdalnym ping upływie czasu"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Retransmisja po upływie czasu TLS na kanale kontrolnym"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Ponownie spróbować na Http proxy Błędzie"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr "Trasa podsieci do klienta"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Uruchom jako serwer inetd lub xinetd"
+
+msgid "Run script cmd on client connection"
+msgstr "Uruchom skrypt cmd po połączeniu klienta"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Uruchom skrypt cmd po rozłączeniu klienta"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Uruchom skrypty up/down dla wszystkich restartów"
+
+#, fuzzy
+msgid "Send notification to peer on disconnect"
+msgstr "Wyślij zgłoszenie o rozłączeniu do peer"
+
+msgid "Service"
+msgstr "Serwis"
+
+msgid "Set GID to group"
+msgstr "Ustaw GID dla grupy"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Ustaw TCP/UDP MTU"
+
+msgid "Set UID to user"
+msgstr "Ustaw UID dla użytkownika"
+
+#, fuzzy
+msgid "Set aside a pool of subnets"
+msgstr "Odłożyć na bok pulę podsieci"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Ustaw rozszerzone opcje proxy HTTP"
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Ustaw rozmiar rzeczywistych i wirtualnych adresów tablicy hash"
+
+#, fuzzy
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Ustaw rozmiar buforu wysyłania TCP/UDP"
+
+#, fuzzy
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Ustaw rozmiar buforu wysyłania TCP/UDP"
+
+#, fuzzy
+msgid "Set tun/tap TX queue length"
+msgstr "Ustaw długość kolejki tun / tap TX "
+
+msgid "Set tun/tap adapter parameters"
+msgstr "Ustaw parametr adaptera tun/tap"
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Ustaw górną granicę TCP MSS"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Formowanie wzajemnego pasma"
+
+#, fuzzy
+msgid "Shell cmd to execute after tun device open"
+msgstr "cmd Shell po uruchomieniu urzadzenie tun"
+
+#, fuzzy
+msgid "Shell cmd to run after tun device close"
+msgstr "cmd Shell po wyłączeniu urzadzenie tun"
+
+msgid "Shell command to verify X509 name"
+msgstr "polecenie Shell aby sprawdzić nazwę X509"
+
+msgid "Silence the output of replay warnings"
+msgstr "Wycisz powtórne pojawianie się ostrzeżeń"
+
+msgid "Size of cipher key"
+msgstr "Rozmiar klucza szyfrowania"
+
+msgid "Specify a default gateway for routes"
+msgstr "Określ domyślną bramę dla tras"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Uruchom OpenVPN w stanie hibernacji"
+
+msgid "Start/Stop"
+msgstr "Start/Stop"
+
+msgid "Started"
+msgstr "Uruchomiono"
+
+msgid "Status file format version"
+msgstr "Wersja formatu pliku statusu"
+
+msgid "Switch to advanced configuration »"
+msgstr "Konfiguracja zaawansowana »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Numer portu TCP/UDP zarówno dla lokalnego jak i zdalnego"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Numer portu TCP/UDP dla lokalnego (domyślnie=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Numer portu TCP/UDP dla zdalnego (domyślnie=1194)"
+
+msgid "TLS cipher"
+msgstr "Kodowanie TLS"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "Przepuszczanie TOS (dotyczy tylko IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Katalog tymczasowy dla pliku zwrotnego połączenia klienta"
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr "Typ użytego urządzenia"
+
+msgid "Use fast LZO compression"
+msgstr "Użyj szybkiej kompresji LZO"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Użyj indywidualnego adresu zamiast podsieci /30"
+
+msgid "Use protocol"
+msgstr "Użyj protokołu"
+
+msgid "Use tun/tap device node"
+msgstr "Użyj węzła urządzenia tun/tap"
+
+msgid "Use username as common name"
+msgstr "Użyj nazwy użytkownika jako nazwy wspólnej"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "Zapisz log do pliku"
+
+msgid "Write process ID to file"
+msgstr "Zapisz numer ID procesu do pliku"
+
+msgid "Write status to file every n seconds"
+msgstr "Zapisz status do pliku co n sekund"
+
+msgid "no"
+msgstr "nie"
+
+msgid "tun/tap device"
+msgstr "urządzenie tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr "czas bezczynności tun/tap"
+
+msgid "yes (%i)"
+msgstr "tak (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Konfiguracja podstawowa"
diff --git a/trunk/package/luci/po/pl/p2pblock.po b/trunk/package/luci/po/pl/p2pblock.po
new file mode 100644
index 00000000..9222a086
--- /dev/null
+++ b/trunk/package/luci/po/pl/p2pblock.po
@@ -0,0 +1,46 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-29 10:53+0200\n"
+"PO-Revision-Date: 2012-03-29 10:55+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Block Time"
+msgstr "Czas blokowania"
+
+msgid "Enable P2P-Block"
+msgstr "Włącz P2P-Block"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Protokoły Layer7"
+
+msgid "P2P-Block"
+msgstr "P2P-Block"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"P2P-Block jest mechanizmem który blokuje rozmaite protokoły peer-to-peer dla "
+"klientów spoza dozwolonej listy."
+
+msgid "Portrange"
+msgstr "Zakres portów"
+
+msgid "Whitelisted IPs"
+msgstr "Dozwolone adresy IP"
+
+msgid "seconds"
+msgstr "sekund"
diff --git a/trunk/package/luci/po/pl/p910nd.po b/trunk/package/luci/po/pl/p910nd.po
new file mode 100644
index 00000000..c5f611ab
--- /dev/null
+++ b/trunk/package/luci/po/pl/p910nd.po
@@ -0,0 +1,56 @@
+#  p910nd.pot
+#  generated from ./applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-02 19:31+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Tryb dwukierunkowy"
+
+msgid "Device"
+msgstr "Urządzenie"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Po pierwsze, musisz zainstalować pakiety obsługujące interfejs USB (kmod-"
+"usb-printer) lub LPT (kmod-lp)."
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Ustawienia"
+
+msgid "Specifies the interface to listen on."
+msgstr "Określa interfejs do nasłuchu."
+
+msgid "TCP listener port."
+msgstr "Port nasłuchu TCP"
+
+msgid "enable"
+msgstr "Włączony"
+
+# W sambie usługa też się nazywa "network shares", więc nie ma specjalnie potrzeby używania nazwy własnej demona "p910nd".
+msgid "p910nd - Printer server"
+msgstr "Serwer wydruku"
+
+#~ msgid "port_help"
+#~ msgstr "port_help"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd nasłuchuje na porcie 910X, np. 9100 dla pierwszej drukarki."
diff --git a/trunk/package/luci/po/pl/pbx-voicemail.po b/trunk/package/luci/po/pl/pbx-voicemail.po
new file mode 100644
index 00000000..3f07fe4b
--- /dev/null
+++ b/trunk/package/luci/po/pl/pbx-voicemail.po
@@ -0,0 +1,111 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-05 02:29+0200\n"
+"Last-Translator: piosl <sleczek.piotr@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "Adres e-mail do odbierania poczty głosowej"
+
+msgid "Enable Voicemail"
+msgstr "Włącz pocztę głosową"
+
+msgid "Global Voicemail Setup"
+msgstr "Ustawienia globalnej poczty głosowej"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"Tutaj można skonfigurować globalną pocztę głosową dla PBX. Ponieważ system "
+"ten jest przeznaczony do pracy w systemach wbudowanych, takich jak routery, "
+"nie ma możliwości lokalnego przechowywania poczty głosowej - wiadomości "
+"muszą być wysłane e-mailem. Z tego powodu należy skonfigurować serwer poczty "
+"wychodzącej (SMTP) i podać listę adresów, które będą otrzymywać nagrania z "
+"poczty głosowej"
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"W celu wysyłało e-maili zawierających nagrania poczty głosowej przez PBX, "
+"należy skonfigurować serwer SMTP. Twój dostawca usług internetowych "
+"zazwyczaj dostarcza serwer SMTP. Można również skonfigurować serwer SMTP "
+"firm trzecich, takich jak Google lub Yahoo."
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr "Lokalny katalog przechowywania"
+
+msgid "No"
+msgstr "Nie"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Serwer poczty wychodzącej (SMTP)"
+
+msgid "SMTP Password"
+msgstr "Hasło SMTP"
+
+msgid "SMTP Port Number"
+msgstr "Numer portu SMTP"
+
+msgid "SMTP Server Authentication"
+msgstr "Uwierzytelnianie serwera SMTP"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "Nazwa hosta serwera SMTP lub adres IP"
+
+msgid "SMTP User Name"
+msgstr "Nazwa użytkownika SMTP"
+
+msgid "Secure Connection Using TLS"
+msgstr "Bezpieczne połączenie za pomocą protokołu TLS"
+
+msgid "Voicemail Setup"
+msgstr "Ustawienia Poczty głosowej"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"Po włączeniu poczty głosowej, będziesz miał szansę na podanie adresów "
+"e-mail, które będą otrzymywać nagrane wiadomości głosowe. Musisz również "
+"skonfigurować serwer SMTP."
+
+msgid "Yes"
+msgstr "Tak"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"Możesz też zachować kopie nagrań poczty głosowej na urządzeniu, na którym "
+"działa PBX. Ścieżka określona tutaj zostanie utworzona, jeśli nie istnieje. "
+"Pamiętaj o ograniczonym miejscu na urządzeniach takich jak routery i włącz "
+"tę opcję tylko jeśli wiesz co robisz."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"Twoje prawdziwe hasło SMTP nie jest pokazane dla Twojej ochrony. Zostanie "
+"zmienione tylko jeśli zmienisz wartość w tym polu."
diff --git a/trunk/package/luci/po/pl/pbx.po b/trunk/package/luci/po/pl/pbx.po
new file mode 100644
index 00000000..4e80a458
--- /dev/null
+++ b/trunk/package/luci/po/pl/pbx.po
@@ -0,0 +1,508 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-05 04:37+0200\n"
+"Last-Translator: piosl <sleczek.piotr@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Available"
+msgstr "Dostępny"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr "Unikaj znaków innych niż alfanumeryczne, spacja, przecinek i kropka."
+
+msgid "Away"
+msgstr "Oddalony"
+
+msgid "Blacklisted Numbers"
+msgstr "Numery na czarnej liście"
+
+msgid "Call Routing"
+msgstr "Przekierowanie połączeń"
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+# Chodzi tu o numery, przez które dzwoni się, aby obniżyć koszta połączeń zagranicznych. Jeśli ktoś ma pomysł na lepsze tłumaczenie, proszę zmienić. W sieci nie znalazłem.
+msgid "Call-through Numbers"
+msgstr "Numery pośredniczące"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Wklej tu wielkie listy numerów."
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr "Nie przeszkadzać"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "Domena/adres IP/dynamiczna domena"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Dynamiczna czarna lista numerów"
+
+msgid "Email"
+msgstr "E-mail"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Włącz połączenia przychodzące (rejestruj przez SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Włącz połączenia przychodzące (zobacz status poniżej)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Włącz połączenia wychodzące"
+
+msgid "Enabled"
+msgstr "Włączone"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"Podaj numery telefonów, które powinny być automatycznie odrzucane. "
+"Prawdopodobnie powinieneś pominąć numer kierunkowy kraju i zera z przodu, "
+"ale samemu to przetestuj, aby upewnić się, że blokowanie działa prawidłowo "
+"dla Twojego położenia."
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"Podaj to IP (lub parę IP:port) w ustawieniach serwera/rejestratora urządzeń "
+"SIP których będziesz używać WYŁĄCZNIE lokalnie i nigdy z zewnątrz."
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"Podaj tę nazwę hosta (lub parę nazwa hosta:port) w ustawieniach serwera/"
+"rejestratora urządzeń SIP których będziesz używać z zewnątrz (będą też "
+"działać lokalnie)."
+
+msgid "External SIP Port"
+msgstr "Zewnętrzny port SIP"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+"Dla każdego użytkownika z prawem wykonywania połączeń wychodzących możesz "
+"ograniczyć których operatorów mogą używać do tych połączeń. Domyślnie każdy "
+"użytkownik może używać dowolnego operatora. Użytkownik musi mieć prawo "
+"wykonywania połączeń wychodzących ustawione na stronie \"Konta użytkowników"
+"\", aby pojawić się na poniższej liście. Podaj operatorów VoIP w formacie "
+"nazwa.użytkownika@jakaś.nazwa.hosta, tak jak są wypisani w \"Połączeniach "
+"wychodzących\" powyżej. Łatwiej jest skopiować powyższych operatorów. "
+"Nieprawidłowe wpisy, włącznie z operatorami bez prawa do połączeń "
+"wychodzących, będą odrzucani bez komunikatów. Wpisy mogą być rozdzielone "
+"spacjami albo podane po jednym w wierszu."
+
+msgid "Full Name"
+msgstr "Pełne imię i nazwisko"
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "Google Accounts"
+msgstr "Konta Google"
+
+msgid "Google Talk Status"
+msgstr "Status Google Talk"
+
+msgid "Google Talk Status Message"
+msgstr "Opis Google Talk"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Konta Google Voice/Talk"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "Połączenia przychodzące"
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/pl/polipo.po b/trunk/package/luci/po/pl/polipo.po
new file mode 100644
index 00000000..698edc98
--- /dev/null
+++ b/trunk/package/luci/po/pl/polipo.po
@@ -0,0 +1,231 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-01-06 22:57+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Allowed clients"
+msgstr "Dozwolone klienty"
+
+msgid "Always use system DNS resolver"
+msgstr "Zawsze używaj systemowej obsługi DNS"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Obsługiwana podstawowa autoryzacja HTTP. Podaj nazwę użytkownika i hasło w "
+"formie username:hasło."
+
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+msgid "DNS and Query Settings"
+msgstr "Ustawienia DNS i zapytań"
+
+msgid "DNS server address"
+msgstr "Adres serwera DNS"
+
+msgid "Delete cache files time"
+msgstr "Czas usuwania plików cache"
+
+msgid "Disk cache location"
+msgstr "Położenie cache na dysku"
+
+msgid "Do not query IPv6"
+msgstr "Nie wykonuj zapytań IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Włącz, aby cache (proxy) był współdzielony przez wielu użytkowników."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Rozmiar pierwszego segmentu PMM (w bajtach)"
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Ile pamięci RAM powinien używać Polipo jako cache."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Rozmiar cache w RAM (w bajtach)"
+
+msgid "Listen address"
+msgstr "Nasłuchuj adres"
+
+msgid "Listen port"
+msgstr "Nasłuchuj port"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Miejsce, w którym Polipo będzie przechowywać pliki cache na stałe. Użycie "
+"zewnętrznego magazynu jest zalecane. Cache może się poważnie zwiększyć. "
+"Pozostaw puste, aby wyłączyć cache na dysku."
+
+msgid "Log file location"
+msgstr "Katalog logów"
+
+msgid "Log to syslog"
+msgstr "Loguj do logu systemowego (syslog)"
+
+msgid "Logging and RAM"
+msgstr "Dziennik i RAM"
+
+msgid "Never use system DNS resolver"
+msgstr "Nigdy nie używaj systemowej obsługi DNS"
+
+msgid "On-Disk Cache"
+msgstr "Cache na dysku"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Rozmiar segmentu PMM (w bajtach)"
+
+msgid "Parent Proxy"
+msgstr "Nadrzędne proxy"
+
+msgid "Parent proxy address"
+msgstr "Adres nadrzędnego proxy"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Adres nadrzędnego proxy (podany jako host:port), do którego Polipo będzie "
+"przekierowywać żądania."
+
+msgid "Parent proxy authentication"
+msgstr "Autoryzacja nadrzędnego proxy"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Status Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo jest małym i szybkim web proxy z obsługą cache."
+
+# "Multipleksowanie Biedaka" brzmi fajniej, ale nie chcę mieć usuniętego konta.
+msgid "Poor Man's Multiplexing"
+msgstr "Poor Man's Multiplexing"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Poor Man's Multiplexing (PMM) to technika symulująca multipleksowanie "
+"poprzez żądanie instancji w wielu segmentach. Próbuje obniżyć opóźnienia "
+"spowodowane wadami protokołu HTTP. UWAGA: niektóre strony mogą nie działać "
+"przy włączonym PMM!"
+
+msgid "Port on which Polipo will listen"
+msgstr "Port, na którym Polipo będzie nasłuchiwać."
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr "Zapytanie DNS po nazwie hosta"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr "Odpytuj DNS bezpośrednio, powracając do resolvera systemu"
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+"Odpytuj DNS bezpośrednio, dla nieznanych hostów powróć do resolvera systemu"
+
+msgid "Query DNS for IPv6"
+msgstr "Zapytanie DNS dla IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "Zapytanie DNS dla IPv4 i IPv6, preferowane IPv4"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "Zapytanie DNS dla IPv4 i IPv6, preferowane IPv6"
+
+msgid "Query only IPv6"
+msgstr "Zapytanie tylko IPv6"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Ustaw adres serwera DNS do użycia, jeśli chcesz aby Polipo używał innego "
+"DNS`a niż system hosta."
+
+msgid "Shared cache"
+msgstr "Cache udostępniany"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Rozmiar PIERWSZEGO segmentu PMM. Jeśli nie zdefiniowano, jego domyślny "
+"rozmiar to dwu-krotność rozmiaru segmentu PMM."
+
+msgid "Size to which cached files should be truncated"
+msgstr "Rozmiar do którego pliki cache`owane mają być przycięte"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Syslog facility"
+msgstr "Funkcja (facility) loga systemowego"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"Interfejs na którym słucha proxy Polipo. Aby słuchać na wszystkich "
+"interfejsach użyj 0.0.0.0 lub :: dla IPv6"
+
+msgid "Time after which cached files will be deleted"
+msgstr "Czas po którym pliki cache będą skasowane"
+
+msgid "Time after which cached files will be truncated"
+msgstr "Czas po którym pliki cache będą przycięte"
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+"Aby włączyć PMM, rozmiar segmentu PMM musi mieć ustawioną wartość dodatnią."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Rozmiar przycinanych plików w cache(w bajtach)"
+
+msgid "Truncate cache files time"
+msgstr "Czas przycinanych plików w cache"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Użycie zewnętrznego nośnika danych wysoce zalecane, plik loga jest "
+"zapisywany okresowo i może urosnąć znacząco."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+"Jeśli adres nasłuchu ustawiony jest na 0.0.0.0 lub ::(IPv6), musisz "
+"wyszczególnić klientów mających pozwolenie na połączenie. Format to adres IP "
+"lub adres sieci (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+
+msgid "enable"
+msgstr "włączone"
diff --git a/trunk/package/luci/po/pl/qos.po b/trunk/package/luci/po/pl/qos.po
new file mode 100644
index 00000000..7b740c78
--- /dev/null
+++ b/trunk/package/luci/po/pl/qos.po
@@ -0,0 +1,111 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2012-08-31 18:14+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Oblicz narzut"
+
+msgid "Classification Rules"
+msgstr "Reguły klasyfikacji"
+
+msgid "Classification group"
+msgstr "Grupa klasyfikacji"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Host docelowy"
+
+msgid "Download speed (kbit/s)"
+msgstr "Prędkość pobierania (kbit/s)"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "Half-duplex"
+msgstr "Półdupleks"
+
+msgid "Interfaces"
+msgstr "Interfejsy"
+
+msgid "Number of bytes"
+msgstr "Ilość bajtów"
+
+msgid "Ports"
+msgstr "Porty"
+
+msgid "Protocol"
+msgstr "Protokół"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Jakość usługi (ang. Quality of Service)"
+
+msgid "Service"
+msgstr "Usługa"
+
+msgid "Source host"
+msgstr "Host źródłowy"
+
+msgid "Target"
+msgstr "Cel"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Prędkość wysyłania (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Z <abbr title=\"Quality of Service\">QoS</abbr> można ustalać priorytet "
+"ruchu sieciowego na podstawie adresów, portów lub usług."
+
+msgid "all"
+msgstr "wszystko"
+
+msgid "default"
+msgstr "domyślna"
+
+msgid "express"
+msgstr "ekspresowy"
+
+msgid "low"
+msgstr "niski"
+
+msgid "normal"
+msgstr "normalny"
+
+msgid "priority"
+msgstr "priorytetowy"
+
+#~ msgid "Downlink"
+#~ msgstr "Ruch przychodzący"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Połączenie Internetowe"
+
+#~ msgid "Uplink"
+#~ msgstr "Ruch wychodzący"
+
+# Jeśli w ogóle jest to gdzieś używane, to i w angielskiej wersji jest błąd. W takiej sytuacji należy udawać idiotę.
+#~ msgid "allf"
+#~ msgstr "allf"
+
+# Patrz - allf.
+#~ msgid "qos_connbytes"
+#~ msgstr "qos_connbytes"
diff --git a/trunk/package/luci/po/pl/radvd.po b/trunk/package/luci/po/pl/radvd.po
new file mode 100644
index 00000000..a080c978
--- /dev/null
+++ b/trunk/package/luci/po/pl/radvd.po
@@ -0,0 +1,377 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-05 04:35+0200\n"
+"Last-Translator: piosl <sleczek.piotr@gmail.com>\n"
+"Language-Team: German\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+# Na polskiej Wikipedii jest artykuł "6to4", więc chyba ok.
+msgid "6to4 interface"
+msgstr "Interfejs 6to4"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "Addresses"
+msgstr "Adresy"
+
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr "Rozgłaszaj adres routera"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Rozgłaszana Domena Rozszerzenia"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Rozgłaszane IPv6 RDNSS. Jeżeli jest puste, używany jest aktualny adres IPv6 "
+"interfejsu"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Rozgłaszany prefixy IPv6 "
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Rozgłaszany prefixy IPv6. Jeżeli jest puste, używany jest aktualny prefix "
+"interfejsu"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr "Rozgłaszanie"
+
+msgid "Autonomous"
+msgstr "Autonomiczny"
+
+msgid "Clients"
+msgstr "Klienci"
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Konfiguracja DNSSL"
+
+msgid "Default lifetime"
+msgstr "Domyślna żywotność"
+
+msgid "Default preference"
+msgstr "preferencje domyślne"
+
+msgid "Enable"
+msgstr "umożliwiać"
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr "Ogólny"
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid "Interface Configuration"
+msgstr "Konfiguracja interfejsu"
+
+msgid "Interface required"
+msgstr "wymagany interfejs"
+
+msgid "Interfaces"
+msgstr "Interfejs"
+
+msgid "Lifetime"
+msgstr "Dożywotni"
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr "Max. Przedział"
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr "preferencje"
+
+msgid "Preferred lifetime"
+msgstr "preferowana żywotność"
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "Konfiguracja RDNSS"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - interfejs %q"
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+#, fuzzy
+msgid "Timing"
+msgstr "Timing"
+
+msgid "Unicast only"
+msgstr "Tylko unicast"
+
+msgid "Valid lifetime"
+msgstr "ważne dożywotnio"
+
+msgid "Validity time"
+msgstr "czas ważności"
+
+msgid "default"
+msgstr "domyślne"
+
+msgid "high"
+msgstr "wysoki"
+
+msgid "low"
+msgstr "niski"
+
+msgid "medium"
+msgstr "średni"
+
+msgid "no"
+msgstr "nie"
+
+msgid "yes"
+msgstr "tak"
diff --git a/trunk/package/luci/po/pl/rrdtool.po b/trunk/package/luci/po/pl/rrdtool.po
new file mode 100644
index 00000000..bf451ecc
--- /dev/null
+++ b/trunk/package/luci/po/pl/rrdtool.po
@@ -0,0 +1,360 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-31 11:06+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Sieć bezprzewodowa - Poziom Szumów"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Poziom szumów"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Moc sygnału"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Sieć bezprzewodowa - Jakość sygnału"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Jakość sygnału"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: ICMP - Czasy odpowiedzi"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Firewall - Przetworzone pakiety"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pakiety/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Łańcuch \"%di\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - Transfer przez %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bajty/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bajtów (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - Pakiety na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Pakiety/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Przetworzone (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Odrzucone (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Błędy (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - Multicasty na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pakiety/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Pakiety"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - Kolizje na %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Kolizje/s"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Kolizje"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Błędy na %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Błędy/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Procesy"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Procesy/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Proces %pi - użyty czas Procesora"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "system"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "użytkownik"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Proces %pi - wątki i procesy"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Liczba"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Proces %pi - błędy stronnicowania"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Błędy stronnicowania"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "błędy stronnicowania"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Proces %pi - rozmiar pamięci wirtualnej"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bajtów"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "pamięć wirtualna"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Użycie Procesora #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Transfer na %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bajtów/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Pakietów na %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pakietów/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: TCP-połączeń na port %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Połączeń/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Użycie przestrzeni dyskowej na %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bajtów"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Przerwania"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Problem(y)"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Obciążenie Systemu"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Obciążenie"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 min"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 min"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 min"
diff --git a/trunk/package/luci/po/pl/samba.po b/trunk/package/luci/po/pl/samba.po
new file mode 100644
index 00000000..74826227
--- /dev/null
+++ b/trunk/package/luci/po/pl/samba.po
@@ -0,0 +1,83 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-08-26 09:51+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Zezwalaj Gościom"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Użytkownicy systemu mogą dostać się do swoich katalogów domowych za "
+"pośrednictwem udziałów sieciowych."
+
+msgid "Allowed users"
+msgstr "Użytkownicy z prawem dostępu"
+
+msgid "Create mask"
+msgstr "Utwórz maskę"
+
+msgid "Description"
+msgstr "Opis"
+
+msgid "Directory mask"
+msgstr "Maska katalogu"
+
+msgid "Edit Template"
+msgstr "Edytuj szablon"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edytuj szablon, który jest używany do generowania konfiguracji samby."
+
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "Mask for new directories"
+msgstr "Maska dla nowych katalogów"
+
+msgid "Mask for new files"
+msgstr "Maska dla nowych plików"
+
+msgid "Name"
+msgstr "Nazwa"
+
+msgid "Network Shares"
+msgstr "Udziały sieciowe"
+
+msgid "Path"
+msgstr "Ścieżka"
+
+msgid "Read-only"
+msgstr "Tylko do odczytu"
+
+msgid "Share home-directories"
+msgstr "Udostępniaj katalogi domowe"
+
+msgid "Shared Directories"
+msgstr "Udostępniane katalogi"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"To jest zawartość pliku '/etc/samba/smb.conf.template\", na podstawie "
+"którego zostanie wygenerowana konfiguracja samby. Wartości otoczone symbolem "
+"kreski pionowej ('|') nie powinny być zmieniane. Wartości ich zostaną "
+"pobrane z zakładki \"Ustawienia ogólne\"."
+
+msgid "Workgroup"
+msgstr "Grupa robocza"
diff --git a/trunk/package/luci/po/pl/splash.po b/trunk/package/luci/po/pl/splash.po
new file mode 100644
index 00000000..68568848
--- /dev/null
+++ b/trunk/package/luci/po/pl/splash.po
@@ -0,0 +1,385 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-24 06:17+0200\n"
+"PO-Revision-Date: 2014-05-05 04:17+0200\n"
+"Last-Translator: piosl <sleczek.piotr@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Akceptuj"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"Dostęp do internetu może być mimo wszystko możliwy, ponieważ niektórzy "
+"aktywiści tego projektu dzielą się swoimi prywatnymi łączami. Te kilka łącz "
+"jest rozdzielanych między wszystkich użytkowników. Oznacza to, że transfer "
+"jest ograniczony. Z tego powodu prosimy, abyś nie:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+"Dostęp do sieci nie jest gwarantowany. Może być przerwany w każdej chwili i "
+"bez podawania jakiegokolwiek powodu, dla niektórych urządzeń i/lub "
+"niektórych użytkowników."
+
+msgid "Active Clients"
+msgstr "Aktywni klienci"
+
+msgid "Allowed hosts/subnets"
+msgstr "Dozwolone hosty/podsieci"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+"Jako alternatywę do edycji pełnego tekstu powitalnego możesz po prostu "
+"zawrzeć własny tekst wpisując go tutaj."
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"Limit transferu dla klientów jest aktywny tylko jeśli aktywne są oba limity "
+"- pobierania i wysyłania. Ustaw 0, aby całkowicie wyłączyć to ograniczenie. "
+"Nie dotyczy ono klientów z białej listy."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+"Zostań aktywnym członkiem tej społeczności i pomóż, zakładając własny węzeł"
+
+msgid "Blacklist"
+msgstr "Czarna lista"
+
+msgid "Blocked"
+msgstr "Zablokowane"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+"Akceptując te zasady można korzystać z tej sieci na %s godzin(y). Po tym "
+"czasie należy zaakceptować te zasady ponownie."
+
+# z niemieckiego tłumaczenia
+#, fuzzy
+msgid "Clearance time"
+msgstr "Czas wyzwalacza"
+
+msgid "Client-Splash"
+msgstr "Splash kliencki"
+
+# nie ma słowa "autentykacja" - to brzydka kalka z angielskiego. 
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+"Klient Splash - sposób uwierzytelniania użytkowników dla sieci WiFi oparty o "
+"wyświetlanie komunikatów."
+
+#, fuzzy
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+"Klienci są przekierowywani do tej strony po tym, jak zaakceptują powitanie. "
+"Jeśli to miejsce jest puste zostaną przekierowani do strony którą wybrali."
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr "Prędkość pobierania dla klienta jest ograniczona do wartości (kb/s)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr "Klienci, którzy zaakceptowali okienko mogą korzystać z sieci przez."
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr "Prędkość pobierania dla klienta jest ograniczona do wartości (kb/s)"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Decline"
+msgstr "Odrzuć"
+
+#, fuzzy
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+"Hosty przeznaczenia i sieci, które są wykluczone z powitania, tzn. są zawsze "
+"dozwolone."
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "Możesz zasposorować ten projekt aby utrzymać go przy życiu"
+
+msgid "Download limit"
+msgstr "Limit ściągania"
+
+msgid "Edit the complete splash text"
+msgstr "Edit the complete splash text"
+
+msgid "Fair Use Policy"
+msgstr "Zasady dozwolonego użytku"
+
+msgid "Firewall zone"
+msgstr "Strefa firewall"
+
+msgid "General"
+msgstr "Ogólne"
+
+msgid "Get in %s with the operator of this access point."
+msgstr "Uzyskaj %s z operatorem tego punktu dostępu."
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "IP Address"
+msgstr "Adres IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+"Jeśli używasz własnych urządzeń WiFi korzystaj z innych kanałów niż nasze."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "Jeśli korzystasz z tej sieci regularnie prosimy cię o wsparcie."
+
+msgid "Include your own text in the default splash"
+msgstr "Zamieść własny tekst w miejscu domyślnego powitania"
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Przechwytuj ruchu klienta w tym interfejsie"
+
+msgid "Interfaces"
+msgstr "Interfejs"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Interfejsy wykorzystywane przez komunikat (Splash)"
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"KB/s (Download/Upload). Będziesz w stanie usunąć ten limit jeśli aktywnie "
+"przyłączysz się do tego projektu."
+
+msgid "Legally Prohibited Activities"
+msgstr "Działania zabronione prawnie"
+
+msgid "Legally Prohibited content"
+msgstr "Treści zabronione prawnie"
+
+msgid "MAC Address"
+msgstr "Adres MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "Adresy MAC z tej listy są zablokowane."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"Biała lista adresów MAC, wszyscy z tej listy nie muszą akceptować komunikatu "
+"(Splash) i nie mają ograniczanego połączenia"
+
+msgid "Netmask"
+msgstr "Maska sieci"
+
+msgid "Network"
+msgstr "Sieć"
+
+msgid "No clients connected"
+msgstr "Nie ma podłączonych klientów"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Zwróć uwagę na to że nie jesteśmy providerem internetowym ale "
+"eksperymentalną siecią"
+
+msgid "Policy"
+msgstr "Zasady"
+
+msgid "Redirect target"
+msgstr "przekierować cel"
+
+msgid "Safety"
+msgstr "Bezpieczeństwo"
+
+msgid "Save"
+msgstr "Zachowaj"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+"Reguły komunikatu (Splash) są integrowane z ustawieniami firewalla tej strefy"
+
+msgid "Splashtext"
+msgstr "Tekst komunikatu (Splash)"
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+"Sieci, takie jak Internet, są otwarte i nieszyfrowane. Każdy uczestnik jest "
+"odpowiedzialny za bezpieczeństwo swoich połączeń i urządzeń."
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+"Właściciel sieci nie ponosi odpowiedzialności za utratę danych, "
+"nieautoryzowanego dostępu / uszkodzenia urządzeń lub strat finansowych, "
+"które uczestnicy mogą ponieść podczas korzystania z sieci."
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+"Uczestnik zobowiązuje się nie wykonywać żadnych działań, i powstrzymać się "
+"od działań, które naruszają prawo lub naruszające prawa osób trzecich."
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+"Uczestnik zobowiązuje się do nie przesyłania w sieci treści, które naruszają "
+"prawo."
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+"Uczestnik zobowiązuje się nie korzystać z sieci w sposób, który zagraża "
+"infrastrukturze, samej sieci, jej podmiotom lub innym uczestnikom."
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+"Niniejszy Regulamin reguluje wykorzystanie komputera w sieci przez swoich "
+"uczestników, PDA, lub podobnego urządzenia (\"Urządzeń\") w ramach sieci."
+
+msgid "Time remaining"
+msgstr "Pozostały czas"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Aby poznać z jakiego powodu zostałeś zablokowany lub prosić o ponowne "
+"odblokowanie możesz spróbować skontaktować się z właścicielem tego Access "
+"Point'a:"
+
+msgid "Traffic in/out"
+msgstr "Ruch do/od"
+
+msgid "Upload limit"
+msgstr "Limit wysyłania"
+
+msgid "Usage Agreement"
+msgstr "Umowa użytkowania"
+
+msgid "Welcome"
+msgstr "Witamy"
+
+msgid "Whitelist"
+msgstr "Biała lista"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr "Jesteś teraz podłączony do darmowej sieci"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"Możesz umieścić tutaj własny tekst wyświetlany dla klientów.<br /> "
+"Dopuszczalne jest używanie następujących znaków: ###COMMUNITY###, "
+"###COMMUNITY_URL###, ###CONTACTURL###, ###LEASETIME###, ###LIMIT### and "
+"###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"Twój dostęp do sieci został zablokowany, najprawdopodobniej dlatego że "
+"wykonałeś jedną z akcji zabronionych przez nasze reguły."
+
+msgid "Your bandwidth is limited to"
+msgstr "Twój transfer jest ograniczony do"
+
+msgid "blacklisted"
+msgstr "czarna lista"
+
+msgid "expired"
+msgstr "wygasło"
+
+msgid "optional when using host addresses"
+msgstr "opcjonalne w przypadku używania adresów hostów"
+
+msgid "perform any kind of illegal activities"
+msgstr "wykonywał którąkolwiek z zakazanych akcji"
+
+msgid "splashed"
+msgstr "Powitanie"
+
+msgid "temporarily blocked"
+msgstr "tymczasowo zablokowane"
+
+msgid "unknown"
+msgstr "nieznane"
+
+# Zgaduję, że to jest wyświetlane tuż po komunikacie nr 2, więc tak powinno pasować.
+msgid "use filesharing applications on this network"
+msgstr "używał programów do dzielenia się plikami w tej sieci"
+
+# j.w.
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "marnował transfer na niepotrzebne pobieranie plików i strumieni"
+
+msgid "whitelisted"
+msgstr "biała lista"
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr ""
+#~ "Hosty i sieci wylistowane tutaj są wyłączone z konieczności klikania "
+#~ "komunikatu, zawsze mogą połączyć się do sieci."
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "Akceptując te reguły możesz używać sieci do:"
+
+#~ msgid "Edit Splash text"
+#~ msgstr "Edytuj tekst Komunikatu (Splash)"
+
+#~ msgid "hour(s). After this time you need to accept these rules again."
+#~ msgstr "Czas po jakim musisz zaakceptować te reguły (w godzinach)"
+
+#~ msgid "the owner of this access point."
+#~ msgstr "Właściciel tego Access Point'a"
diff --git a/trunk/package/luci/po/pl/statistics.po b/trunk/package/luci/po/pl/statistics.po
new file mode 100644
index 00000000..8b4c6143
--- /dev/null
+++ b/trunk/package/luci/po/pl/statistics.po
@@ -0,0 +1,697 @@
+#  statistics.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/statistics.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-02 19:52+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Akcja (cel)"
+
+msgid "Add command for reading values"
+msgstr "Dodaj polecenie do odczytywania wartości"
+
+msgid "Add matching rule"
+msgstr "Dodaj pasującą regułę"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Dodaj wiele hostów rozdzielonych spacjami."
+
+msgid "Add notification command"
+msgstr "Dodaj komendę powiadamiającą"
+
+msgid "Base Directory"
+msgstr "Główny katalog"
+
+msgid "Basic monitoring"
+msgstr "Podstawowy monitoring"
+
+msgid "CPU Plugin Configuration"
+msgstr "Konfiguracja CPU"
+
+msgid "CSV Output"
+msgstr "Wyjście CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Konfiguracja CSV"
+
+msgid "Cache collected data for"
+msgstr "Ciasteczka zbierane dla"
+
+msgid "Cache flush interval"
+msgstr "Odstępy czyszczenia cache"
+
+msgid "Chain"
+msgstr "Łańcuch"
+
+msgid "CollectLinks"
+msgstr "CollectLinks"
+
+msgid "CollectRoutes"
+msgstr "CollectRoutes"
+
+msgid "CollectTopology"
+msgstr "CollectTopology"
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Ustawienia Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd to mały deomon do zbieranie danych z różnych źródeł za pomocą "
+"różnych wtyczek. Na tej stronie można zmienić ogólne ustawienia demona "
+"collectd."
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Konfiguracja wtyczki Conntrack"
+
+msgid "DF Plugin Configuration"
+msgstr "Konfiguracja wtyczki DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Konfiguracja wtyczki DNS"
+
+msgid "Data collection interval"
+msgstr "Odstępy zbierania danych"
+
+msgid "Datasets definition file"
+msgstr "Zdefiniowany plik ustawień"
+
+msgid "Destination ip range"
+msgstr "Zakres docelowych adresów IP"
+
+msgid "Directory for collectd plugins"
+msgstr "Katalog wtyczek collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Katalog podkonfiguracji"
+
+msgid "Disk Plugin Configuration"
+msgstr "Konfiguracja wtyczki dysk"
+
+msgid "Disk Space Usage"
+msgstr "Zużycie przestrzeni dyskowej"
+
+msgid "Disk Usage"
+msgstr "Użycie dysku"
+
+msgid "Display Host »"
+msgstr "Wyświetl Host >"
+
+msgid "Display timespan »"
+msgstr "Przedział czasu wyświetlania »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Konfiguracja wtyczki E-mail"
+
+msgid "Email"
+msgstr "E-mail"
+
+msgid "Enable this plugin"
+msgstr "Włącz tę wtyczkę"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Konfiguracja wtyczki Exec"
+
+msgid "Filter class monitoring"
+msgstr "Monitorowanie filtra klas"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Opróżnić cache po"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Przekazać przez słuchacza na adres serwera"
+
+msgid "Graphs"
+msgstr "Wykresy"
+
+msgid "Group"
+msgstr "Grupa"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Tutaj można zdefiniować zewnętrzne komendy, które będą włączane przez "
+"collectd, by odczytać konkretne wartości. Będą one odczytywane z stdout."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Tutaj można zdefiniować zewnętrzne komendy, które będą włączane przez "
+"collectd, kiedy zostaną osiągnięte konkretne wartości progowe. Wartości "
+"powodujące włączenie będą wysyłane do programów przez stdin."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Tutaj można zdefiniować różne kryteria według których wybierane są "
+"monitorowane reguły iptables."
+
+msgid "Host"
+msgstr "Host"
+
+msgid "Hostname"
+msgstr "Nazwa hosta"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr "Numer IP lub nazwa hosta jako wyjście txtinfo"
+
+msgid "IRQ Plugin Configuration"
+msgstr "Konfiguracja wtyczki IRQ"
+
+msgid "Ignore source addresses"
+msgstr "Ignoruj adresy źródłowe"
+
+msgid "Incoming interface"
+msgstr "Interfejs przychodzący"
+
+msgid "Interface Plugin Configuration"
+msgstr "Konfiguracja wtyczki Interfejs"
+
+msgid "Interfaces"
+msgstr "Interfejsy"
+
+msgid "Interrupts"
+msgstr "Przerwania"
+
+msgid "Interval for pings"
+msgstr "Odstępy dla pingów"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Konfiguracja wtyczki iptables"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Pozostaw niezaznaczone do automatycznego określenia interfejsu do "
+"monitorowania."
+
+msgid "Listen host"
+msgstr "Nasłuchuj host"
+
+msgid "Listen port"
+msgstr "Nasłuchuj port"
+
+msgid "Listener interfaces"
+msgstr "Interfejsy nasłuchującego"
+
+msgid "Load Plugin Configuration"
+msgstr "Konfiguracja wtyczki Obciążenie"
+
+msgid "Maximum allowed connections"
+msgstr "Maksymalna ilość połączeń"
+
+msgid "Memory"
+msgstr "Pamięć"
+
+msgid "Memory Plugin Configuration"
+msgstr "Konfiguracja wtyczki Pamięć"
+
+msgid "Monitor all except specified"
+msgstr "Monitoruj wszystko oprócz podanych"
+
+msgid "Monitor all local listen ports"
+msgstr "Monitoruj wszystkie lokalne otwarte porty"
+
+msgid "Monitor devices"
+msgstr "Monitoruj urządzenia"
+
+msgid "Monitor disks and partitions"
+msgstr "Monitoruj dyski i partycje"
+
+msgid "Monitor filesystem types"
+msgstr "Monitoruj system plików"
+
+msgid "Monitor hosts"
+msgstr "Monitoruj hosty"
+
+msgid "Monitor interfaces"
+msgstr "Monitoruj interfejsy"
+
+msgid "Monitor interrupts"
+msgstr "Monitoruj przerwania"
+
+msgid "Monitor local ports"
+msgstr "Monitoruj porty lokalne"
+
+msgid "Monitor mount points"
+msgstr "Monitoruj punkty zamontowania"
+
+msgid "Monitor processes"
+msgstr "Monitoruj procesy"
+
+msgid "Monitor remote ports"
+msgstr "Monitoruj porty zdalne"
+
+msgid "Name of the rule"
+msgstr "Nazwa tej reguły"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Konfiguracja wtyczki Netlink"
+
+msgid "Network"
+msgstr "Sieć"
+
+msgid "Network Plugin Configuration"
+msgstr "Konfiguracja wtyczki Sieć"
+
+msgid "Network plugins"
+msgstr "Wtyczki sieciowe"
+
+msgid "Network protocol"
+msgstr "Protokoły sieciowe"
+
+msgid "Number of threads for data collection"
+msgstr "Liczba wątków do zbierania danych"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "Konfiguracja wtyczki OLSRd"
+
+msgid "Only create average RRAs"
+msgstr "Twórz tylko średnie archiwa RRA"
+
+msgid "Options"
+msgstr "Opcje"
+
+msgid "Outgoing interface"
+msgstr "Interfejs wychodzący"
+
+msgid "Output plugins"
+msgstr "Pluginy wyjścia"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Konfiguracja wtyczki Ping"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Processes"
+msgstr "Procesy"
+
+msgid "Processes Plugin Configuration"
+msgstr "Konfiguracja wtyczki Procesy"
+
+msgid "Processes to monitor separated by space"
+msgstr "Monitorowane procesy oddzielone spacją"
+
+msgid "Processor"
+msgstr "Procesor"
+
+msgid "Qdisc monitoring"
+msgstr "Monitorowanie Qdisc"
+
+msgid "RRD XFiles Factor"
+msgstr "RRD XFiles Factor"
+
+msgid "RRD heart beat interval"
+msgstr "RRD heart beat interval"
+
+msgid "RRD step interval"
+msgstr "RRD Krok interval"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Konfiguracja wtyczki RRDTool"
+
+msgid "Rows per RRA"
+msgstr "Wierszy w archiwum RRA"
+
+msgid "Script"
+msgstr "Skrypt"
+
+msgid "Seconds"
+msgstr "Sekundy"
+
+msgid "Server host"
+msgstr "Host serwer"
+
+msgid "Server port"
+msgstr "Port serwera"
+
+msgid "Shaping class monitoring"
+msgstr "Shaping Klasa Monitoring"
+
+msgid "Socket file"
+msgstr "Plik Gniazdo"
+
+msgid "Socket group"
+msgstr "Gniazdo Grupy"
+
+msgid "Socket permissions"
+msgstr "Uprawnienia Gniazda"
+
+msgid "Source ip range"
+msgstr "Zakres źródłowych adresów ip"
+
+msgid "Specifies what information to collect about links."
+msgstr "Określa jakie informacje zbierać o linkach."
+
+msgid "Specifies what information to collect about routes."
+msgstr "Określa jakie informacje zbierać o trasach."
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "Określa jakie informacje zbierać o globalnej topologii."
+
+msgid "Statistics"
+msgstr "Statystyki"
+
+msgid "Storage directory"
+msgstr "Katalog przechowywania"
+
+msgid "Storage directory for the csv files"
+msgstr "Katalog przechowywania plików csv"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+"Przechowuj wartości danych jako wskaźniki zamiast wartości bezwzględnych"
+
+msgid "Stored timespans"
+msgstr "Przechowywane okresy czasu"
+
+msgid "System Load"
+msgstr "Obciążenie systemu"
+
+msgid "System plugins"
+msgstr "Wtyczki systemowe"
+
+msgid "TCP Connections"
+msgstr "Połączenia TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Konfiguracja wtyczki Połączenia TCP"
+
+msgid "TTL for network packets"
+msgstr "TTL dla pakietów sieciowych"
+
+msgid "TTL for ping packets"
+msgstr "TTL dla pakietów ping"
+
+msgid "Table"
+msgstr "Tabela"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr "Wtyczka Nut Informuje o Nie przerywalnym Zasilaniu"
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+"Wtyczka OLSRd odczytuje informacje o sieciach mesh z wtyczki txtinfo dla "
+"OLSRd."
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr "Wtyczka Conntrack zbiera statystyki o liczbie śledzonych połączeń."
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "Wtyczka CPU zbiera podstawowe statystyki o użyciu procesora"
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"Wtyczka CSV gromadzi zebrane dane w formacie plików csv do dalszej obróbki "
+"przez zewnętrzne programy."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"Wtyczka \"df\" zbiera statystyki dotyczące wykorzystania miejsca na różnych "
+"urządzenia, dyskach i systemach plików."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"Wtyczka \"disk\" zbiera szczegółowe informacje z poszczególnych partycji lub "
+"całych dysków."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"Wtyczka \"dns\" zbiera statystyki odnośnie ruchu DNS dla wybranych "
+"interfejsów."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"Wtyczka Email Tworzy gniazdo w unix do transmisji statystyki-poczty do "
+"demona collectd. This plugin is primarily intended to be used in conjunction "
+"with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as "
+"well."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"Wtyczka Exec startuje zewnętzną komendę do czytnika values z lub do procesu "
+"zewnętrznego powiadomienia gdy wartość została zmieniona"
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr "Wtyczka \"interface\" zbiera statystyki z wybranych interfejsów."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"Wtyczka \"iptables\" monitoruje wybrane reguły firewalla i zbiera statystyki "
+"o procesach, bajtach i pakietach przypadających na daną regułę."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"Wtyczka \"irq\" monitoruje liczbę przerwań na sekundę dla każdego wybranego "
+"przerwania. Jeśli nie wybrano żadnego przerwania, monitoruje wszystkie."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"Wtyczka \"iwinfo\" zbiera statystyki o sygnale, zakłóceniach i jakości sieci "
+"WiFi."
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "Wtyczka \"load\" zbiera statystyki o ogólnych obciążeniu systemu."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "Wtyczka \"memory\" zbiera statystyki dotyczące wykorzystania pamięci."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"Wtyczki netlink zbiera rozszerzone informacje statystyk z qdisc-, klasa- i "
+"filter- dla wybranych interfejsów."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"Wtyczka zapewnia podstawową komunikacje między różnymi instancjami collectd. "
+"Collectd może pracować zarówno w trybie klienta i serwera. W trybie klienta "
+"lokalnie zebrane dane przenosi się do instancji serwera collectd, w trybie "
+"serwera lokalnego instancja odbiera dane z innych komputerów."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"Wtyczka \"ping\" wysyła komunikaty icmp i nasłuchuje odpowiedzi z wybranych "
+"hostów oraz mierzy czasy odpowiedzi zwrotnych dla każdego z nich."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"Wtyczki processes zbiera informacje o czasie procesora, błędach strony i "
+"pamięci wybranych procesów."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"Wtyczki rrdtool przechowuje zebrane dane w plikach RRD, które są "
+"wykorzystywane do tworzenia diagramów. <br /> <br /> <strong> Ostrzeżenie:. "
+"Ustawianie błędnej wartości może spowodować bardzo wysokie zużycie pamięci w "
+"katalogu tymczasowym. Może to sprawić, że urządzenie nie będzie nadawało "
+"się do użytku! </ Strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Statystyki bazuja na <a href=\"http://collectd.org/index.shtml\">Collectd</"
+"a> oraz wykorzystują <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> "
+"do generowania diagramów i wykresów z zebranych danych."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"Wtyczka \"tcpconns\" zbiera informacje o otwartych połączeniach tcp dla "
+"wybranych portów."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"Wtyczka unixsock tworzy socket unix, który może być używany do odczytu "
+"danych zebranych z bieżącej instancji collectd."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Sekcja ta definiuje interfejsy na którym collectd będzie czekać na "
+"połączenia przychodzące."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr "Ta sekcja określa do jakich serwerów zebrane dane zostaną wysłane."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Spróbuj znaleźć pełną nazwę hosta"
+
+msgid "UPS"
+msgstr "UPS"
+
+msgid "UPS Plugin Configuration"
+msgstr "Plugin Konfiguracji UPS"
+
+msgid "UPS name in NUT ups@host format"
+msgstr "Format nazwa UPS w NUT ups@host"
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Konfiguracja wtyczki UnixSock"
+
+msgid "Used PID file"
+msgstr "Używany plik PID"
+
+msgid "User"
+msgstr "Użytkownik"
+
+msgid "Verbose monitoring"
+msgstr "Pełny monitoring"
+
+msgid "Wireless"
+msgstr "WiFi"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "Konfiguracja bezprzewodowego pluginu iwinfo"
+
+msgid "e.g. br-ff"
+msgstr "np. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "np. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "np. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "max. 16 znaków"
+
+msgid "reduces rrd size"
+msgstr "zmniejsza rozmiar RRD"
+
+msgid "seconds; multiple separated by space"
+msgstr "sekundy; wielokrotnie oddzielone spacją"
+
+msgid "server interfaces"
+msgstr "interfejsy serwera"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Zainstalowane wtyczki sieciowe:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Zainstalowane wtyczki wyjścia:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "Wtyczki sieciowe służą do zbierania informacji o otwartych połączeniach TCP, "
+#~ "ruchu sieciowym na danym interfejsie, regułach iptables itp."
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "Pluginy wyjścia dostarczają różnych możliwości przechowywania zgromadzonych "
+#~ "danych. Można włączyć wiele pluginów naraz, na przykład przechowywać dane w "
+#~ "bazach danych RRD i wysyłać je do innych instancji collectd w sieci."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr ""
+#~ "Wtyczki systemowe zbierają wartości o stanie systemu i użyciu zasobów "
+#~ "urządzenia.:"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "Wtyczka \"wireless\" zbiera dane o sile sygnału, zakłóceniach i jakości WiFi."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "konfiguracja wtyczki WiFi"
diff --git a/trunk/package/luci/po/pl/tinyproxy.po b/trunk/package/luci/po/pl/tinyproxy.po
new file mode 100644
index 00000000..8e3bfc7f
--- /dev/null
+++ b/trunk/package/luci/po/pl/tinyproxy.po
@@ -0,0 +1,292 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-04 11:50+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"<em>Przez proxy</em> kieruje żądania do danego celu przez określone "
+"\"upstream proxy\", <em>Odrzuć dostęp</em> wyłącza jakiekolwiek \"upstream "
+"proxy\" dla danego celu."
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Dodaje nagłówek http \"X-Tinyproxy\" z adresem IP klienta do przekazywanych "
+"żądań"
+
+msgid "Allowed clients"
+msgstr "Akceptowane klienty"
+
+msgid "Allowed connect ports"
+msgstr "Akceptowane porty połączenia"
+
+msgid "Bind address"
+msgstr "zwiąż adres"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"Domyślnie do filtrowania używane są podstawowe wyrażenia POSIX. Włącz tę "
+"opcję, aby aktywować rozszerzone wyrażenia regularne."
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+"Domyślnie ciągi filtrowania traktowane są jako wrażliwe na wielkość liter. "
+"Włącz tę opcję, aby dopasowania były wrażliwe na wielkości liter."
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"Domyślnie filtrowanie jest wykonywane w oparciu o nazwy domen. Włącz tę "
+"opcję, aby zamiast tego używać URL-i."
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"Domyślnie, reguły filtra działają jako czarna lista. Zaznacz tę opcję, aby "
+"zezwalać wyłącznie na pasujące URL-e lub nazwy domen."
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+"Może być adresem lub zakresem adresów IP, nazwą domeny lub \".\" dla "
+"dowolnego hosta bez domeny."
+
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+msgid "Connection timeout"
+msgstr "Limit czasu połączenia"
+
+msgid "Default deny"
+msgstr "Domyślnie blokuj"
+
+msgid "Enable Tinyproxy server"
+msgstr "Włącz serwer Tinyproxy"
+
+msgid "Error page"
+msgstr "Strona błędu"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "Nieudane pobieranie statystyk z URL-a:"
+
+msgid "Filter by RegExp"
+msgstr "Filtruj z użyciem rozszerzonych wyrażeń regularnych"
+
+msgid "Filter by URLs"
+msgstr "Filtruj po adresach URL"
+
+msgid "Filter case-sensitive"
+msgstr "Filtr wrażliwy na wielkość liter"
+
+msgid "Filter file"
+msgstr "Plik z filtrami"
+
+msgid "Filtering and ACLs"
+msgstr "Filtrowanie i Listy kontroli dostępu"
+
+msgid "General settings"
+msgstr "Ustawienia ogólne"
+
+msgid "Group"
+msgstr "Grupa"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr "Plik szablonu HTML używany do prezentacji statystyk"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "Plik szablonu HTML używany do prezentacji komunikatów błędu"
+
+# Zgaduję, że to ma coś wspólnego z nagłówkami zapytań - stąd takie tłumaczenie.
+msgid "Header whitelist"
+msgstr "Biała lista nagłówków"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Lista adresów IP lub zakresów, które są dopuszczone do korzystania z serwera "
+"proxy"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"Lista dozwolonych portów dla metody CONNECT. Pojedyncza wartość \"0\" "
+"pozwala użyć wszystkich portów"
+
+msgid "Listen address"
+msgstr "Nasłuchiwany adres"
+
+msgid "Listen port"
+msgstr "Nasłuchiwany port"
+
+msgid "Log file"
+msgstr "Plik logowania"
+
+msgid "Log file to use for dumping messages"
+msgstr "Plik logowania zrzucanych wiadomości"
+
+msgid "Log level"
+msgstr "Poziom logowania"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "Szczegółowość logowania procesów Tinyproxy"
+
+msgid "Max. clients"
+msgstr "Maks. klientów"
+
+msgid "Max. requests per server"
+msgstr "Maks. żądań na serwer"
+
+msgid "Max. spare servers"
+msgstr "Maks. uruchomionych serwerów"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "Maksymalna dopuszczalna liczba jednocześnie podłączonych klientów"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+"Maksymalna dopuszczalna liczba żądań na proces. Jeśli zostanie przekroczona, "
+"proces zostanie ponownie uruchomiony. Zero oznacza bez limitu."
+
+msgid "Maximum number of prepared idle processes"
+msgstr "Maksymalna liczba przygotowanych bezczynnych procesów"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+"Maksymalna liczba sekund dla podtrzymywania otwartego nieaktywnego połączenie"
+
+msgid "Min. spare servers"
+msgstr "Min. liczba zapasowych serwerów"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "Minimalna liczba przygotowanych bezczynnych procesów"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+"Liczba bezczynnych procesów do włączenia podczas uruchamiania Tinyproxy"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+"Plik tekstowy z URL-ami lub domenami do filtowania. Jeden wpis na linię."
+
+msgid "Policy"
+msgstr "Polityka"
+
+msgid "Privacy settings"
+msgstr "Ustawienia prywatności"
+
+msgid "Reject access"
+msgstr "Odmów dostępu"
+
+msgid "Server Settings"
+msgstr "Ustawienia serwera"
+
+msgid "Server limits"
+msgstr "Limity serwera"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+"Określa nazwy nagłówków HTTP, które mogą zostać przesłane dalej. Pozostałe "
+"będą odrzucone. Pozostaw puste, aby wyłączyć filtrowanie nagłówków."
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "Określa port, na którym Tinyproxy będzie oczekiwać żądań HTTP."
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr "Określa nazwę hosta używaną przez Tinyproxy w nagłówku HTTP \"Via\"."
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+"Określ adres, z którym zostanie powiązane Tinyproxy dla wychodzących "
+"przekazywanych żądań"
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr "Określa adresy, z których Tinyproxy oczekuje żądań."
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr "Określ nazwę grupy, pod jaką będzie pracował proces Tinyproxy"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+"Określ serwer proxy typu upstream, który ma zostać użyty w przypadku dostępu "
+"do hosta docelowego. Format to <code>adres:port</code>"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr "Określ nazwę użytkownika, pod jaką będzie pracował proces Tinyproxy"
+
+msgid "Start spare servers"
+msgstr "Uruchamiane serwery zapasowe"
+
+msgid "Statistics page"
+msgstr "Strona statystyk"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Target host"
+msgstr "Host docelowy"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Status serwera Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy to mały i szybki niecacheujący serwer proxy HTTP(S)"
+
+msgid "Upstream Proxies"
+msgstr "Serwery proxy typu upstream"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+"Reguły serwerów proxy typu upstream definiują serwery proxy, które mają "
+"zostać użyte w przypadku dostępu do określonych adresów IP lub domen."
+
+msgid "Use syslog"
+msgstr "Użyj sysloga"
+
+msgid "User"
+msgstr "Użytkownik"
+
+msgid "Via hostname"
+msgstr "Nazwa hosta via"
+
+msgid "Via proxy"
+msgstr "Proxy via"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr "Zapisuje komunikaty do sysloga zamiast pliku dziennika"
+
+msgid "X-Tinyproxy header"
+msgstr "Nagłówek X-Tinyproxy"
diff --git a/trunk/package/luci/po/pl/transmission.po b/trunk/package/luci/po/pl/transmission.po
new file mode 100644
index 00000000..f010d56d
--- /dev/null
+++ b/trunk/package/luci/po/pl/transmission.po
@@ -0,0 +1,302 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-19 21:20+0200\n"
+"PO-Revision-Date: 2014-02-25 18:13+0200\n"
+"Last-Translator: TheTranslator2238 <mateusz2238@outlook.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Alternatywna prędkość pobierania"
+
+msgid "Alternative speed enabled"
+msgstr "Prędkość alternatywna włączona"
+
+msgid "Alternative speed time begin"
+msgstr "Godzina włączenia prędkości alternatywnej"
+
+msgid "Alternative speed time day"
+msgstr "Dzień prędkości alternatywnej"
+
+msgid "Alternative speed time end"
+msgstr "Godzina wyłączenia prędkości alternatywnej"
+
+msgid "Alternative speed timing enabled"
+msgstr "Włączanie prędkości alternatywnej w podanym czasie"
+
+msgid "Alternative upload speed"
+msgstr "Alternatywna prędkość wysyłania"
+
+msgid "Automatically start added torrents"
+msgstr "Automatyczne rozpoczęcie pobierania nowych torrentów"
+
+msgid "Bandwidth settings"
+msgstr "Ustawienia przepustowości"
+
+msgid "Binding address IPv4"
+msgstr "Przypisanie adresu IPv4"
+
+msgid "Binding address IPv6"
+msgstr "Przypisanie adresu IPv6"
+
+msgid "Block list enabled"
+msgstr "Lista blokowania włączona"
+
+msgid "Blocklist URL"
+msgstr "URL listy blokowania"
+
+msgid "Blocklists"
+msgstr "Listy blokowania"
+
+msgid "Cache size in MB"
+msgstr "Wielkość cache w MB"
+
+msgid "Config file directory"
+msgstr "Katalog z plikiem konfiguracyjnym"
+
+msgid "DHT enabled"
+msgstr "DHT włączone"
+
+msgid "Debug"
+msgstr "Debug"
+
+msgid "Download directory"
+msgstr "Katalog pobierania"
+
+msgid "Download queue enabled"
+msgstr "Kolejka pobierania włączona"
+
+msgid "Download queue size"
+msgstr "Rozmiar kolejki pobierania"
+
+msgid "Enable watch directory"
+msgstr "Włącz folder obserwowany"
+
+msgid "Enabled"
+msgstr "Włączone"
+
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+msgid "Error"
+msgstr "Błąd"
+
+msgid "Fast"
+msgstr "Szybko"
+
+msgid "Files and Locations"
+msgstr "Pliki i położenia"
+
+msgid "Forced"
+msgstr "Wymuszone"
+
+msgid "Full"
+msgstr "Pełne"
+
+msgid "Global peer limit"
+msgstr "Globalny limit peerów"
+
+msgid "Global settings"
+msgstr "Ustawienia globalne"
+
+msgid "Idle seeding limit"
+msgstr "Limit przesyłu w bezczynności"
+
+msgid "Idle seeding limit enabled"
+msgstr "Włączony limit transferu podczas bezczynności"
+
+msgid "Incomplete directory"
+msgstr "Niekompletny katalog"
+
+msgid "Incomplete directory enabled"
+msgstr "Opcja \"Niekompletny katalog\" włączona"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "LPD enabled"
+msgstr "LPD włączone"
+
+msgid "Lazy bitfield enabled"
+msgstr "Lazy bitfield włączone"
+
+msgid "Message level"
+msgstr "Poziom komunikatów"
+
+msgid "Miscellaneous"
+msgstr "Różności"
+
+msgid "None"
+msgstr "Żaden"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"Liczba/pole bitowe. Zaczyna się od 0, następnie dla każdego dnia dla jakiego "
+"chcesz włączyć harmonogram dodaj odpowiednią wartość. Niedziela - 1, "
+"Poniedziałek - 2, Wtorek - 4, Środa - 8, Czwartek - 16, Piątek - 32, sobota "
+"- 64."
+
+msgid "Off"
+msgstr "Wyłączone"
+
+msgid "Open Web Interface"
+msgstr "Otwórz interfejs Web"
+
+msgid "PEX enabled"
+msgstr "PEX włączony"
+
+msgid "Peer Port settings"
+msgstr "Ustawienia portu peer"
+
+msgid "Peer congestion algorithm"
+msgstr "Algorytm przeciążenia peer"
+
+msgid "Peer limit per torrent"
+msgstr "Limit peer'a dla torrenta"
+
+msgid "Peer port"
+msgstr "Port peer"
+
+msgid "Peer port random high"
+msgstr "Maksymalny port peer`a"
+
+msgid "Peer port random low"
+msgstr "Minimalny port peer`a"
+
+msgid "Peer port random on start"
+msgstr "Losowy port peer`a przy starcie"
+
+msgid "Peer settings"
+msgstr "Ustawienia peer"
+
+msgid "Peer socket tos"
+msgstr "Typ gniazda <abbr title=\"Type-Of-Service w TCP\">TOS</abbr> peer`a"
+
+msgid "Port forwarding enabled"
+msgstr "Przekazywanie portów włączone"
+
+msgid "Preferred"
+msgstr "Preferowany"
+
+msgid "Prefetch enabled"
+msgstr "Pobieranie wstępne włączone"
+
+msgid "Queue stalled enabled"
+msgstr "Blokada kolejki włączona"
+
+msgid "Queue stalled minutes"
+msgstr "Blokada kolejki w min."
+
+msgid "Queueing"
+msgstr "Kolejkowanie"
+
+msgid "RPC URL"
+msgstr "Adres URL RPC"
+
+msgid "RPC authentication required"
+msgstr "Wymagana autoryzacja RPC"
+
+msgid "RPC bind address"
+msgstr "Adres węzła RPC"
+
+msgid "RPC enabled"
+msgstr "RPC włączone"
+
+msgid "RPC password"
+msgstr "Hasło RPC"
+
+msgid "RPC port"
+msgstr "Port RPC"
+
+msgid "RPC settings"
+msgstr "Ustawienia RPC"
+
+msgid "RPC username"
+msgstr "Nazwa użytkownika RPC"
+
+msgid "RPC whitelist"
+msgstr "Biała lista RPC"
+
+msgid "RPC whitelist enabled"
+msgstr "Biała lista RPC włączona"
+
+msgid "Ratio limit"
+msgstr "Dopuszczalna wartość"
+
+msgid "Ratio limit enabled"
+msgstr "Dopuszczalna wartość włączona"
+
+msgid "Rename partial files"
+msgstr "Zmień nazwy plików częściowych"
+
+msgid "Run daemon as user"
+msgstr "Włączaj demona jako użytkownik"
+
+msgid "Scheduling"
+msgstr "Harmonogramowanie"
+
+msgid "Scrape paused torrents enabled"
+msgstr "Zdzieranie wstrzymanych torentów włączone"
+
+msgid "Script torrent done enabled"
+msgstr "Włączenie wykonywania skryptu po zakończeniu pobierania"
+
+msgid "Script torrent done filename"
+msgstr "Nazwa skryptu wykonywanego po zakończeniu pobierania"
+
+msgid "Seed queue enabled"
+msgstr "Kolejkowanie Seed'ów włączone"
+
+msgid "Seed queue size"
+msgstr "Rozmiar kolejki Seed'ów"
+
+msgid "Speed limit down"
+msgstr "Limit prędkości pobierania"
+
+msgid "Speed limit down enabled"
+msgstr "Limit prędkości pobierania włączony"
+
+msgid "Speed limit up"
+msgstr "Limit prędkości wysyłania"
+
+msgid "Speed limit up enabled"
+msgstr "Limit prędkości wysyłania włączony"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"Demon Transmission jest prostym klientem BitTorrent. Tutaj możesz zmienić "
+"jego ustawienia."
+
+msgid "Trash original torrent files"
+msgstr "Usuń oryginalne pliki torrent"
+
+msgid "Upload slots per torrent"
+msgstr "Liczba połączeń na plik torrent - wysyłanie"
+
+msgid "Watch directory"
+msgstr "Obserwowany folder"
+
+msgid "in minutes from midnight"
+msgstr "w minutach od północy"
+
+msgid "preallocation"
+msgstr "prealokacja"
+
+msgid "uTP enabled"
+msgstr "uTP włączone"
diff --git a/trunk/package/luci/po/pl/upnp.po b/trunk/package/luci/po/pl/upnp.po
new file mode 100644
index 00000000..e891dce4
--- /dev/null
+++ b/trunk/package/luci/po/pl/upnp.po
@@ -0,0 +1,153 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-02 19:28+0200\n"
+"Last-Translator: obsy <cezary@eko.one.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Listy kontroli dostępu (ang. ACL) określają jakie porty mogą być "
+"przekierowane do jakich wewnętrznych adresów i portów"
+
+msgid "Action"
+msgstr "Akcja"
+
+msgid "Active UPnP Redirects"
+msgstr "Aktywne przekierowania UPnP"
+
+msgid "Advanced Settings"
+msgstr "Ustawienia zaawansowane"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Zezwól na dodawanie przekierowań tylko do odpytujących adresów IP"
+
+msgid "Announced model number"
+msgstr "Rozgłaszany nr modelu"
+
+msgid "Announced serial number"
+msgstr "rozgłaszany nr seryjny"
+
+msgid "Clean rules interval"
+msgstr "Interwał czyszczenia reguł"
+
+msgid "Clean rules threshold"
+msgstr "Próg czyszczenia reguł"
+
+msgid "Client Address"
+msgstr "Adres klienta"
+
+msgid "Client Port"
+msgstr "Port klienta"
+
+msgid "Collecting data..."
+msgstr "Zbieranie danych..."
+
+msgid "Comment"
+msgstr "Komentarz"
+
+msgid "Delete Redirect"
+msgstr "Usuń przekierowanie"
+
+msgid "Device UUID"
+msgstr "UUID urządzenia"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Włącz funkcjonalność NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Włącz funkcjonalność UPnP"
+
+msgid "Enable additional logging"
+msgstr "Włącz rozszerzone raportowanie"
+
+msgid "Enable secure mode"
+msgstr "Włącz tryb bezpieczny"
+
+msgid "External Port"
+msgstr "Port zewnętrzny"
+
+msgid "External ports"
+msgstr "Porty zewnętrzne"
+
+msgid "General Settings"
+msgstr "Ustawienia główne"
+
+msgid "Internal addresses"
+msgstr "Adresy wewnętrzne"
+
+msgid "Internal ports"
+msgstr "Porty wewnętrzne"
+
+msgid "MiniUPnP ACLs"
+msgstr "Listy kontroli dostępu MiniUPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Ustawienia MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Interwał powiadamiania"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr "Przedstawiany URL"
+
+msgid "Protocol"
+msgstr "Protokół"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Dodaje dodatkowe informacje debugowania do loga systemowego"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Zgłaszaj czas pracy systemu zamiast czas pracy usługi"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Uruchom usługi UPnP i NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Nie ma aktywnych przekierowań"
+
+msgid "UPNP"
+msgstr "UPnP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP umożliwia klientom w sieci lokalnej automatyczne konfigurowanie routera."
+
+msgid "UPnP lease file"
+msgstr "Plik dzierżawy UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Wartość w KBajt/s, tylko informacyjnie"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP umożliwia klientom w sieci lokalnej automatyczne konfigurowanie "
+#~ "routera."
+
+#~ msgid "enable"
+#~ msgstr "enable"
diff --git a/trunk/package/luci/po/pl/ushare.po b/trunk/package/luci/po/pl/ushare.po
new file mode 100644
index 00000000..2a26404a
--- /dev/null
+++ b/trunk/package/luci/po/pl/ushare.po
@@ -0,0 +1,54 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-08 13:18+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Katalogi zawartości"
+
+msgid "Disable telnet console"
+msgstr "Wyłącz konsolę telnet"
+
+msgid "Disable webinterface"
+msgstr "Wyłącz interfejs web"
+
+msgid "Enable"
+msgstr "Włącz"
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid "Options"
+msgstr "Opcje"
+
+msgid "Servername"
+msgstr "Nazwa serwera"
+
+msgid "Settings"
+msgstr "Ustawienia"
+
+msgid "Username"
+msgstr "Użytkownik"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare jest serwerem mediów UPnP (TM) i DLNA. Implementuje serwer, który "
+"udostępnia urządzenia medialne UPnP z informacjami na temat dostępnych "
+"plików multimedialnych."
diff --git a/trunk/package/luci/po/pl/uvc_streamer.po b/trunk/package/luci/po/pl/uvc_streamer.po
new file mode 100644
index 00000000..cd366630
--- /dev/null
+++ b/trunk/package/luci/po/pl/uvc_streamer.po
@@ -0,0 +1,44 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-08-25 19:35+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Klatek na sekundę"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Rozdzielczość"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Ustawienia"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Strumieniowanie z kamery internetowej"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Skonfiguruj swoją kamerę internetową zgodną z Linux-UVC. Wpisz w "
+"przeglądarce adres <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/pl/vnstat.po b/trunk/package/luci/po/pl/vnstat.po
new file mode 100644
index 00000000..5b0d8b09
--- /dev/null
+++ b/trunk/package/luci/po/pl/vnstat.po
@@ -0,0 +1,69 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-09-20 12:21+0200\n"
+"Last-Translator: Michał <wispwind@gmail.com>\n"
+"Language-Team: German\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+msgid "Daily traffic"
+msgstr "Obciążenie dzienne"
+
+msgid "Graphs"
+msgstr "Wykresy"
+
+msgid "Hourly traffic"
+msgstr "Obciążenie godzinowe"
+
+msgid "Monitor selected interfaces"
+msgstr "Monitoruj wybrane interfejsy"
+
+msgid "Monthly traffic"
+msgstr "Obciążenie miesięczne"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Nie ustawiono żadnej bazy danych. Idź do konfiguracji VnStat i włącz "
+"monitorowanie dla jednego lub więcej interfejsów."
+
+msgid "Restart VnStat"
+msgstr "Restartuj VnStat"
+
+msgid "Summary display"
+msgstr "Podsumowanie"
+
+msgid "Top 10 display"
+msgstr "TOP 10"
+
+msgid "Update »"
+msgstr "Aktualizuj »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Wykresy VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Monitor obciążenia VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat to aplikacja monitorująca ruch sieciowy w Linuxie, który utrzymuje "
+"loga ruchu sieciowego dla określonych interfejsów."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "Usługa VnStat została uruchomiona ponownie."
diff --git a/trunk/package/luci/po/pl/voice_core.po b/trunk/package/luci/po/pl/voice_core.po
new file mode 100644
index 00000000..39950f85
--- /dev/null
+++ b/trunk/package/luci/po/pl/voice_core.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-08-24 07:03+0200\n"
+"Last-Translator: goodgod261 <goodgod261@wp.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefony"
+
+msgid "Voice"
+msgstr "Głos"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/pl/voice_diag.po b/trunk/package/luci/po/pl/voice_diag.po
new file mode 100644
index 00000000..cb19e22c
--- /dev/null
+++ b/trunk/package/luci/po/pl/voice_diag.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-09-20 12:16+0200\n"
+"Last-Translator: Michał <wispwind@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Diagnostics"
+msgstr "Diagnostyka"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Diagnostyka dostępna na Twoim urządzeniu zależna jest od zainstalowanych "
+"modułów."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"To menu zawiera opcje pozwalające na konfiguracje i testowanie operacji "
+"głosowych w Twoim systemie. Opcje te nazwamy Diagnostyką."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/pl/watchcat.po b/trunk/package/luci/po/pl/watchcat.po
new file mode 100644
index 00000000..ebb67eea
--- /dev/null
+++ b/trunk/package/luci/po/pl/watchcat.po
@@ -0,0 +1,71 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-21 02:13+0200\n"
+"Last-Translator: Tomecki <przykryweczka@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Forced reboot delay"
+msgstr "Wymuszone opóźnienie restartu"
+
+msgid "Host address to ping"
+msgstr "Adres hosta do pingowania"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Jak często sprawdzać połączenie internetowe. Domyślną jednostką jest "
+"sekunda, można także użyć 'm' dla minut, 'h' dla godzin lub 'd' dla dni"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"W trybie okresowym, określa to restart. W trybie internetowym, określa "
+"najdłuższy okres czasu bez dostępu do internetu przed restartem. Domyślną "
+"jednostką jest sekunda, można także użyć 'm' dla minut, 'h' dla godzin lub "
+"'d' dla dni"
+
+msgid "Operating mode"
+msgstr "Tryb pracy"
+
+msgid "Period"
+msgstr "Okres"
+
+msgid "Ping host"
+msgstr "Host do pingowania"
+
+msgid "Ping period"
+msgstr "Czas pomiędzy wysyłaniem pingów"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat pozwala na skonfigurowanie okresowych restartów, jeśli połączenie "
+"internetowe zostanie utracone na określony czas."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"Restart routera Watchcat wykonuje za pomocą tzw. \"miękkiego restartu\". "
+"Wpisując tutaj wartość niezerową, wymusimy \"twardy restart\" jeśli \"miękki "
+"restart\" się nie powiedzie. Podaj czas w sekundach lub wpisz 0 (zero) aby "
+"wyłączyć restarty."
diff --git a/trunk/package/luci/po/pl/wol.po b/trunk/package/luci/po/pl/wol.po
new file mode 100644
index 00000000..c599b9ec
--- /dev/null
+++ b/trunk/package/luci/po/pl/wol.po
@@ -0,0 +1,57 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2011-08-25 19:04+0200\n"
+"Last-Translator: Staszek <fistaszek@tlen.pl>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Rozgłaszaj na wszystkie interfejsy"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Wybierz hosta z listy lub podaj adres MAC maszyny do wybudzenia"
+
+msgid "Host to wake up"
+msgstr "Host do wybudzenia"
+
+msgid "Network interface to use"
+msgstr "Użyty interfejs sieciowy"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Czasem działa tylko jedno z narzędzi. Jeżeli jedno z nich nie zadziała, "
+"proszę użyć drugiego."
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Definiuje interfejs, na który będzie wysłany pakiet WoL"
+
+msgid "Starting WoL utility:"
+msgstr "Uruchamianie narzędzia WoL:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"\"Wake on LAN\" to mechanizm służący do zdalnego włączania komputerów w "
+"sieci lokalnej."
+
+msgid "Wake up host"
+msgstr "Wybudź hosta"
+
+msgid "WoL program"
+msgstr "Narzędzie WoL"
diff --git a/trunk/package/luci/po/pl/wshaper.po b/trunk/package/luci/po/pl/wshaper.po
new file mode 100644
index 00000000..a85bf004
--- /dev/null
+++ b/trunk/package/luci/po/pl/wshaper.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-14 14:15+0200\n"
+"PO-Revision-Date: 2012-04-14 17:21+0200\n"
+"Last-Translator: Tomecki <przykryweczka@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Przepustowość pobierania w kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Adres hosta lub adres sieci w notacji CIDR"
+
+msgid "Interface"
+msgstr "Interfejs"
+
+msgid "Low priority destination ports"
+msgstr "Porty docelowe o niskim priorytecie"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Hosty docelowe o niskim priorytecie"
+
+msgid "Low priority hosts (Source)"
+msgstr "Hosty źródłowe o niskim priorytecie"
+
+msgid "Low priority source ports"
+msgstr "Porty źródłowe o niskim priorytecie"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Przepustowość wysyłania w kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Ustawienia Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper wykorzystuje kształtowanie ruchu aby zapewnić niskie opóźnienia "
+"nawet wtedy, gdy Twoje połączenie internetowe jest wysycone."
diff --git a/trunk/package/luci/po/pt/ahcp.po b/trunk/package/luci/po/pt/ahcp.po
new file mode 100644
index 00000000..f96fc453
--- /dev/null
+++ b/trunk/package/luci/po/pt/ahcp.po
@@ -0,0 +1,116 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-02 21:12+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Servidor AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"O AHCP é um protocolo de auto-configuração para redes IPv6 e IPv6/IPv4 dual-"
+"stack foi desenhado para ser usado no lugar do router discovery e DHCP nas "
+"redes onde é difícil ou impossível configurar o servidor dentro de cada "
+"camada de ligação no dominio de broadcast, por exemplo, redes ad-hoc móveis."
+
+msgid "Active AHCP Leases"
+msgstr "Concessões AHCP Ativas"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "Advanced Settings"
+msgstr "Definições Avançadas"
+
+msgid "Age"
+msgstr "Idade"
+
+msgid "Announced DNS servers"
+msgstr "Servidores DNS anunciados"
+
+msgid "Announced NTP servers"
+msgstr "Servidores NTP anunciados"
+
+msgid "Announced prefixes"
+msgstr "Prefixos anunciados"
+
+msgid "Collecting data..."
+msgstr "A obter dados..."
+
+msgid "Forwarder"
+msgstr "Encaminhador"
+
+msgid "General Setup"
+msgstr "Configuração Geral"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Só IPv4"
+
+msgid "IPv6 only"
+msgstr "Só IPv6"
+
+msgid "Lease directory"
+msgstr "Directório de concessões"
+
+msgid "Lease validity time"
+msgstr "Prazo de validade das concessões"
+
+msgid "Log file"
+msgstr "Ficheiro log"
+
+msgid "Multicast address"
+msgstr "Endereço de multicast"
+
+msgid "Operation mode"
+msgstr "Modo de operação"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Protocol family"
+msgstr "Família do protocolo"
+
+msgid "Served interfaces"
+msgstr "Interfaces servidas"
+
+msgid "Server"
+msgstr "Servidor"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Especifica os servidores NTP anunciados em IPv4 e IPv6"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Especifica os servidores de nomes anunciados em IPv4 e IPv6"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"Especifica os prefixos de rede na notação CIDR a serem anunciados em IPv4 e "
+"IPv6"
+
+msgid "The AHCP Service is not running."
+msgstr "O serviço AHCP não está a correr."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "O serviço AHCP está a correr com o ID %s"
+
+msgid "There are no active leases."
+msgstr "Não existem concessões activas."
+
+msgid "Unique ID file"
+msgstr "Ficheiro de ID único"
diff --git a/trunk/package/luci/po/pt/asterisk.po b/trunk/package/luci/po/pt/asterisk.po
new file mode 100644
index 00000000..d1b98363
--- /dev/null
+++ b/trunk/package/luci/po/pt/asterisk.po
@@ -0,0 +1,150 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2009-05-20 11:54+0200\n"
+"Last-Translator: Jose Monteiro <jm@unimos.net>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Opções Gerais do Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Directorio AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Guardar em cache os ficheiros de som durante a gravação"
+
+#~ msgid "Debug Level"
+#~ msgstr "Nível de debug"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Desactivar alguns avisos"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Guardar o core quando houver crash"
+
+#~ msgid "High Priority"
+#~ msgstr "Alta Prioridade"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Inicializar Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Usar temporizações internas"
+
+#~ msgid "Log directory"
+#~ msgstr "Directorio de registos"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Maximo de chamadas permitidas"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Maximo de carga para deixar de aceitar novas chamadas"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Desactivar cores na consola"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Directorio de cache para ficheiros de som"
+
+#~ msgid "The Group to run as"
+#~ msgstr "O grupo sob o qual o asterisk será executado"
+
+#~ msgid "The User to run as"
+#~ msgstr "O utilizador sob o qual o asterisk será executado"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Directorio da spool de voicemail"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Prefixar o nome de sistema à UniquID"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr ""
+#~ "Construir os caminhos de transcode atraves de SLINEAR e não directamente"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Transmitir silencio SLINEAR durante a gravação de um canal"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Nivel de verbosidade"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fuso Horário"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Secção do Plano de Marcação"
+
+#~ msgid "include"
+#~ msgstr "incluir"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Extensão do Plano de Marcação"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Opções Gerais do Plano de Marcação"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Permitir transferência"
+
+#~ msgid "Reinvite/redirect media connections"
+#~ msgstr "Redirigir/Repetir ligações multimedia"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Limpar variaveis globais"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "Encaminhamento do Plano de Marcação"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Conferencia do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Dialplan Time"
+#~ msgstr "Conferencia do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Encaminhamento do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Secção do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Connection to use"
+#~ msgstr "Secção do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "IAX General Options"
+#~ msgstr "Opções Gerais do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Allow Codecs"
+#~ msgstr "Opções Gerais do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Section sipgeneral"
+#~ msgstr "Opções Gerais do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Allow codecs"
+#~ msgstr "Opções Gerais do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "SIP realm"
+#~ msgstr "Opções Gerais do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Voicemail general options"
+#~ msgstr "Opções Gerais do Plano de Marcação"
+
+#, fuzzy
+#~ msgid "Voice Zone settings"
+#~ msgstr "Secção do Plano de Marcação"
diff --git a/trunk/package/luci/po/pt/base.po b/trunk/package/luci/po/pt/base.po
new file mode 100644
index 00000000..c25d39cc
--- /dev/null
+++ b/trunk/package/luci/po/pt/base.po
@@ -0,0 +1,3855 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-09-22 18:50+0200\n"
+"Last-Translator: Low <pedroloureiro1@sapo.pt>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(janela de %d minutos, intervalo de %d segundos)"
+
+msgid "(%s available)"
+msgstr "(%s disponível)"
+
+msgid "(empty)"
+msgstr "(vazio)"
+
+msgid "(no interfaces attached)"
+msgstr "(não existem interfaces ligadas)"
+
+msgid "-- Additional Field --"
+msgstr "-- Campo Adicional --"
+
+msgid "-- Please choose --"
+msgstr "-- Por favor escolha --"
+
+msgid "-- custom --"
+msgstr "-- personalizado --"
+
+msgid "1 Minute Load:"
+msgstr "Carga de 1 Minuto:"
+
+msgid "15 Minute Load:"
+msgstr "Carga de 15 minutos:"
+
+msgid "5 Minute Load:"
+msgstr "Carga 5 Minutos:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+"<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+"Porta de consulta de <abbr title=\"Servidor de Nomes de Domínio\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+"Porta do servidor<abbr title=\"Servidor de Nomes de Domínio\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"Os servidores de <abbr title=\"Servidor de Nomes de Domínio\">DNS</abbr> "
+"serão consultados pela ordem no ficheiro resolv"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"<abbr title=\"Identificador de Conjunto de Serviços Estendidos\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+"Máscara de rede <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>-Endereço ou Rede "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Nome da <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"Máximo\">Max.</abbr> de concessões<abbr title=\"Protocolo de "
+"Configuracao Dinamica de Hosts\">DHCP</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"Tamanho <abbr title=\"Máximo\">Max.</abbr> do pacote <abbr title="
+"\"Mecanismos de Extensão para Sistemas de Nomes de Domínio\">EDNS0</abbr> "
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"máximo\">Max.</abbr> consultas concorrentes"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Emparelhada: %s / Grupo: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Suporte AR"
+
+msgid "ARP retry threshold"
+msgstr "Limiar de tentativas ARP"
+
+msgid "ATM Bridges"
+msgstr "Bridges ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Identificador Canais Virtuais ATM (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Identificador de Caminho Virtual ATM (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"As bridges ATM expõem o encapsulamento ethernet em ligações AAL5 como uma "
+"interface de Rede Virtual Linux que pode ser usada em conjugação com o DHCP "
+"ou PPP para marcar para a rede ISP."
+
+msgid "ATM device number"
+msgstr "Número de Dispositivo ATM"
+
+msgid "Access Concentrator"
+msgstr "Concentrador de Acesso"
+
+msgid "Access Point"
+msgstr "Access Point (AP)"
+
+msgid "Action"
+msgstr "Acção"
+
+msgid "Actions"
+msgstr "Acções"
+
+msgid "Activate this network"
+msgstr "Ativar esta rede"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Rotas-<abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr> ativas"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Rotas-<abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr> ativas"
+
+msgid "Active Connections"
+msgstr "Ligações Ativas"
+
+msgid "Active DHCP Leases"
+msgstr "Concessões DHCP Ativas"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Concessões DHCPv6 Ativas"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Adicionar um sufixo de domínio local aos nomes servidos dos ficheiros de "
+"hosts"
+
+msgid "Add new interface..."
+msgstr "Adicionar uma nova interface..."
+
+msgid "Additional Hosts files"
+msgstr "Ficheiro Adicional de Hosts"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr "Administração"
+
+msgid "Advanced Settings"
+msgstr "Definições Avançadas"
+
+msgid "Alert"
+msgstr "Alerta"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Permitir autenticação <abbr title=\"Shell Seguro\">SSH</abbr> por senha"
+
+msgid "Allow all except listed"
+msgstr "Permitir todos, excepto os listados"
+
+msgid "Allow listed only"
+msgstr "Permitir somente os listados"
+
+msgid "Allow localhost"
+msgstr "Permitir localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Permitir que hosts remotos se conectem às portas encaminhadas do SSH local"
+
+msgid "Allow root logins with password"
+msgstr "Permitir o login como root só com password"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Permitir que o utilizador <em>root</em> faça login só com password"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Permitir respostas a montante na gama 127.0.0.1/8, p.e. para serviços RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Usar sempre os canais de 40MHz mesmo se o segundo canal se sobrepuser. "
+"Usando esta opção não obdece com IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Uma rede adicional será criada se deixar isto desmarcado."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antena 1"
+
+msgid "Antenna 2"
+msgstr "Antena 2"
+
+msgid "Antenna Configuration"
+msgstr "Configuração das Antenas"
+
+msgid "Any zone"
+msgstr "Qualquer zona"
+
+msgid "Apply"
+msgstr "Aplicar"
+
+msgid "Applying changes"
+msgstr "A aplicar as alterações"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Atribuir interfaces..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Estações Associadas"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Controlador Wireless Atheros 802.11%s"
+
+msgid "Authentication"
+msgstr "Autenticação"
+
+msgid "Authoritative"
+msgstr "Autoritário"
+
+msgid "Authorization Required"
+msgstr "Autorização Requerida"
+
+msgid "Auto Refresh"
+msgstr "Actualização Automática"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponível"
+
+msgid "Available packages"
+msgstr "Pacotes disponíveis"
+
+msgid "Average:"
+msgstr "Média:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Voltar"
+
+msgid "Back to Overview"
+msgstr "Voltar à Visão Global"
+
+msgid "Back to configuration"
+msgstr "Voltar à configuração"
+
+msgid "Back to overview"
+msgstr "Voltar à vista global"
+
+msgid "Back to scan results"
+msgstr "Voltar aos resultados do scan"
+
+msgid "Background Scan"
+msgstr "Procurar em Segundo Plano"
+
+msgid "Backup / Flash Firmware"
+msgstr "Backup / Flashar Firmware"
+
+msgid "Backup / Restore"
+msgstr "Backup / Restauração"
+
+msgid "Backup file list"
+msgstr "Lista de ficheiros para backup"
+
+msgid "Bad address specified!"
+msgstr "Endereço mal especificado!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Abaixo está a lista de ficheiros para backup. Este consiste nos ficheiros de "
+"configuração alterados e marcados pelo opkg, ficheiros base essenciais e "
+"padrões de backup definidos pelo utilizador."
+
+msgid "Bitrate"
+msgstr "Taxa de bits"
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr "Bridge"
+
+msgid "Bridge interfaces"
+msgstr "Ativar brigde nas interfaces"
+
+msgid "Bridge unit number"
+msgstr "Número de unidade da bridge"
+
+msgid "Bring up on boot"
+msgstr "Levantar no arranque"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Controlador Wireless Broadcom 802.11%s"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Controlador Wireless Broadcom BCM%04x 802.11"
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr "Botões"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Uso da CPU (%)"
+
+msgid "Cached"
+msgstr "Em cache"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Cadeia"
+
+msgid "Changes"
+msgstr "Alterações"
+
+msgid "Changes applied."
+msgstr "Alterações aplicadas."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Altera a password de administrador para acesso ao dispositivo"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check"
+msgstr "Verificar"
+
+msgid "Checksum"
+msgstr "Checksum"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Escolha a zona de firewall que pretende associar a esta interface. Escolha "
+"<em>não especificado</em> para remover a interface da zona associada ou "
+"coloque em branco o campo <em>criar</em> para definir a nova zona e ligar-"
+"lhe a interface."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Escolha a rede(s) à(s) qual(is) deseja ligar esta interface wireless ou "
+"preencha o campo <em>criar</em> para definir a nova rede."
+
+msgid "Cipher"
+msgstr "Cifra"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Clique em \"Gerar arquivo\" para descarregar o ficheiro tar com os actuais "
+"ficheiros de configuração. Para voltar as definições originais do firmware, "
+"clique \" Fazer reset\" (só possível com imagens squashfs)"
+
+msgid "Client"
+msgstr "Cliente"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "ID de cliente a enviar para pedidos de DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Fechar ligação inativa após um dado tempo em segundos, usando 0 a ligação é "
+"persistente"
+
+msgid "Close list..."
+msgstr "Fechar lista..."
+
+msgid "Collecting data..."
+msgstr "A obter dados..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Common Configuration"
+msgstr "Configuração comum"
+
+msgid "Compression"
+msgstr "Compressão"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "Configuration applied."
+msgstr "Configuração aplicada."
+
+msgid "Configuration files will be kept."
+msgstr "Os ficheiros de configuração serão mantidos."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr "Confirmação"
+
+msgid "Connect"
+msgstr "Ligar"
+
+msgid "Connected"
+msgstr "Ligado"
+
+msgid "Connection Limit"
+msgstr "Limite de Ligações"
+
+msgid "Connections"
+msgstr "Ligações"
+
+msgid "Country"
+msgstr "País"
+
+msgid "Country Code"
+msgstr "Código do País"
+
+msgid "Cover the following interface"
+msgstr "Abranger a seguinte interface"
+
+msgid "Cover the following interfaces"
+msgstr "Abranger as seguintes interfaces"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Criar / Atribuir a uma zona de firewall"
+
+msgid "Create Interface"
+msgstr "Criar interface"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Criar uma bridge entre múltiplas interfaces "
+
+msgid "Critical"
+msgstr "Critico"
+
+msgid "Cron Log Level"
+msgstr "Nível de Log do Cron"
+
+msgid "Custom Interface"
+msgstr "Interface Personalizada"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Customiza o comportamento dos <abbr title=\"Diodo Emissor de Luz\">LED</"
+"abbr>s, se possível."
+
+msgid "DHCP Leases"
+msgstr "Concessões DHCP"
+
+msgid "DHCP Server"
+msgstr "Servidor DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP e DNS"
+
+msgid "DHCP client"
+msgstr "Cliente DHCP"
+
+msgid "DHCP-Options"
+msgstr "Opções DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Concessões DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Encaminhamentos DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Depurar"
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr "Gateway predefinido"
+
+msgid "Default state"
+msgstr "Estado predefinido"
+
+msgid "Define a name for this network."
+msgstr "Definir um nome para esta rede."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Definir opções adicionais de DHCP, por exemplo "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" informa os clientes de diferentes "
+"servidores DNS."
+
+msgid "Delete"
+msgstr "Apagar"
+
+msgid "Delete this interface"
+msgstr "Apagar esta interface"
+
+msgid "Delete this network"
+msgstr "Apagar esta rede"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Design"
+msgstr "Tema"
+
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "Device Configuration"
+msgstr "Configuração do Dispositivo"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+msgid "Directory"
+msgstr "Directório"
+
+msgid "Disable"
+msgstr "Desativar"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Desativar <abbr title=\"Protocolo Configuração Dinâmica de Hosts\">DHCP</"
+"abbr> para esta interface."
+
+msgid "Disable DNS setup"
+msgstr "Desativar configuração de DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Desativar temporizador de HW-Beacon"
+
+msgid "Disabled"
+msgstr "Desativado"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Descartar respostas RFC1918 a montante"
+
+msgid "Displaying only packages containing"
+msgstr "Mostrar somente pacotes contendo"
+
+msgid "Distance Optimization"
+msgstr "Optimização de Distância"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distância para o último host da rede em metros."
+
+msgid "Diversity"
+msgstr "Diversidade"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq é um servidor combinado de <abbr title=\"Protocolo de Configuração "
+"Dinâmica de Hosts\">DHCP</abbr> e <abbr title=\"Sistema de Nomes de Domínios"
+"\">DNS</abbr> para firewalls <abbr title=\"Tradução de Endereço de Rede"
+"\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+"Não colocar em cache as respostas negativas, p.e. para dominios inexistentes"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Não encaminhar pedidos que não possam ser respondidos por servidor públicos "
+"de nomes"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Não encaminhar lookups reversos para as redes locais"
+
+msgid "Do not send probe responses"
+msgstr "Não enviar respostas a sondas"
+
+msgid "Domain required"
+msgstr "Requerer domínio"
+
+msgid "Domain whitelist"
+msgstr "Lista Branca do Dominio"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Não encaminhar consultas <abbr title=\"Sistema de Nomes de Domínios\">DNS</"
+"abbr> sem o nome do <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+msgid "Download and install package"
+msgstr "Descarregar e instalar pacote"
+
+msgid "Download backup"
+msgstr "Descarregar backup"
+
+msgid "Dropbear Instance"
+msgstr "Instância do Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear oferece um acesso shell seguro à rede <abbr title=\"Shell Seguro"
+"\">SSH</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> integrado"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"<abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
+"Dinâmico"
+
+msgid "Dynamic tunnel"
+msgstr "Túnel dinâmico"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Alocar dinamicamente endereços DHCP para clientes. Se desativado, só os "
+"clientes com reservas estáticas serão servidos."
+
+msgid "EAP-Method"
+msgstr "Metodo-EAP"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Edit this interface"
+msgstr "Editar esta interface"
+
+msgid "Edit this network"
+msgstr "Editar esta rede"
+
+msgid "Emergency"
+msgstr "Emergência"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Ativar a atualização dinâmica de ponto final HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Ativar a negociação IPv6 no link PPP"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Ativar a passagem de Jumbo Frames"
+
+msgid "Enable NTP client"
+msgstr "Ativar o cliente NTP"
+
+msgid "Enable TFTP server"
+msgstr "Ativar o servidor TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Ativar a funcionalidade VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Ativar aprendizagem e envelhecimento"
+
+msgid "Enable this mount"
+msgstr "Ativar este mount"
+
+msgid "Enable this swap"
+msgstr "Ativar esta swap"
+
+msgid "Enable/Disable"
+msgstr "Ativar/Desativar"
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Ativa o Spanning Tree nesta bridge"
+
+msgid "Encapsulation mode"
+msgstr "Modo de encapsulamento"
+
+msgid "Encryption"
+msgstr "Encriptação"
+
+msgid "Erasing..."
+msgstr "A apagar..."
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "Ethernet Adapter"
+msgstr "Adaptador Ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Switch Ethernet"
+
+msgid "Expand hosts"
+msgstr "Expandir hosts"
+
+msgid "Expires"
+msgstr "Expira"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"O tempo de caducidade dos endereços concessionados, minimo de 2 minutos "
+"(<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Servidor externo de logs de sistema"
+
+msgid "External system log server port"
+msgstr "Porta do Servidor externo de logs de sistema"
+
+msgid "Fast Frames"
+msgstr "Frames Rápidas"
+
+msgid "File"
+msgstr "Ficheiro"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Nome de ficheiro da imagem de boot a anunciar aos clientes"
+
+msgid "Filesystem"
+msgstr "Sistema de ficheiros"
+
+msgid "Filter"
+msgstr "Filtro"
+
+msgid "Filter private"
+msgstr "Filtrar endereços privados"
+
+msgid "Filter useless"
+msgstr "Filtro inútil"
+
+msgid "Find and join network"
+msgstr "Procurar e ligar rede"
+
+msgid "Find package"
+msgstr "Procurar pacote"
+
+msgid "Finish"
+msgstr "Terminar"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Definições da Firewall"
+
+msgid "Firewall Status"
+msgstr "Estado da Firewall"
+
+msgid "Firmware Version"
+msgstr "Versão do Firmware"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Porta fixa de origem para saída das consultas DNS"
+
+msgid "Flags"
+msgstr "Flags"
+
+msgid "Flash Firmware"
+msgstr "Gravar Firmware"
+
+msgid "Flash image..."
+msgstr "Flashar imagem..."
+
+msgid "Flash new firmware image"
+msgstr "Flashar nova imagem do firmware"
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr "A programar...."
+
+msgid "Force"
+msgstr "Forçar"
+
+msgid "Force 40MHz mode"
+msgstr "Forçar modo 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Forçar CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Forçar DHCP nesta rede mesmo se outro servidor for detectado."
+
+msgid "Force TKIP"
+msgstr "Forçar TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Forçar TKIP e CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Encaminhar tráfego DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Encaminhar trafego de broadcast"
+
+msgid "Forwarding mode"
+msgstr "Modo de encaminhamento"
+
+msgid "Fragmentation Threshold"
+msgstr "Margem de Fragmentação"
+
+msgid "Frame Bursting"
+msgstr "Frame Bursting"
+
+msgid "Free"
+msgstr "Livre"
+
+msgid "Free space"
+msgstr "Espaço livre"
+
+msgid "Frequency Hopping"
+msgstr "Salto de Frequência"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Só GPRS"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Gateway ports"
+msgstr "Portas de gateway"
+
+msgid "General Settings"
+msgstr "Definições Gerais"
+
+msgid "General Setup"
+msgstr "Configuração Geral"
+
+msgid "Generate archive"
+msgstr "Gerar arquivo"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Controlador Wireless Genérico 802.11%s"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+"A confirmação de password não corresponde, a password não foi alterada!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Ir para a configuração da password"
+
+msgid "Go to relevant configuration page"
+msgstr "Ir para a página respectiva de configuração"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Password HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Handler"
+
+msgid "Hang Up"
+msgstr "Suspender"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Aqui pode configurar os aspectos básicos do seu equipamento, como o nome do "
+"host ou o fuso horário."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Aqui pode colar as chaves SSH (uma por linha) para a autenticação SSH por "
+"chave pública."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Controlador Wireless Hermes 802.11b"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos"
+"\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Entradas de hosts"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"<abbr title=\"Endereço do Protocolo de Internet\">IP</abbr> do host ou rede"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Hostname a enviar quando houver solicitação por DHCP"
+
+msgid "Hostnames"
+msgstr "Hostnames"
+
+msgid "IP address"
+msgstr "Endereço IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Firewall IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Estado WAN IPv4"
+
+msgid "IPv4 address"
+msgstr "Endereço IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Broadcast IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Gateway IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Máscara IPv4"
+
+msgid "IPv4 only"
+msgstr "Só IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Comprimento do prefixo IPv4"
+
+msgid "IPv4-Address"
+msgstr "Endereço-IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Firewall IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Estado WAN IPv6"
+
+msgid "IPv6 address"
+msgstr "Endereço IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Gateway IPv6"
+
+msgid "IPv6 only"
+msgstr "Só IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Prefixo IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Comprimento do prefixo IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "Endereço-IPv6"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-em-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-sobre-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-sobre-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Identidade"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr "Se desmarcado, não é configurada uma rota pré-definida"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Se desmarcado, os endereços servidor DNS anunciados são ignorados "
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Se a memória física for insuficiente, os dados poderão ser trocados "
+"temporariamente para um dispositivo swap, resultando em uma maior quantidade "
+"de memória utilizável <abbr title=\"Memória de Acesso Aleatório\">RAM</"
+"abbr>. Esteja ciente de que a troca de dados (swap) é um processo muito "
+"lento pois o dispositivo swap não pode ser acedido com um nível elevado de "
+"memória <abbr title=\"Memória de Acesso Aleatório\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ignorar ficheiros de Hosts"
+
+msgid "Ignore interface"
+msgstr "Ignorar interface"
+
+msgid "Ignore resolve file"
+msgstr "Ignorar ficheiro resolv.conf"
+
+msgid "Image"
+msgstr "Imagem"
+
+msgid "In"
+msgstr "Entrada"
+
+msgid "Inactivity timeout"
+msgstr "Tempo de inatividade"
+
+msgid "Inbound:"
+msgstr "Entrada:"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Initscript"
+msgstr "Script de inicialização"
+
+msgid "Initscripts"
+msgstr "Scripts de Inicialização"
+
+msgid "Install"
+msgstr "Instalar"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Instalar pacote %q"
+
+msgid "Install protocol extensions..."
+msgstr "Instalar extensões do protocolo..."
+
+msgid "Installed packages"
+msgstr "Instalar pacotes"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Interface Configuration"
+msgstr "Configuração da Interface"
+
+msgid "Interface Overview"
+msgstr "Visão Geral da Interface"
+
+msgid "Interface is reconnecting..."
+msgstr "A interface está a religar..."
+
+msgid "Interface is shutting down..."
+msgstr "A interface está a desligar..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Interface não presente ou ainda não ligada."
+
+msgid "Interface reconnected"
+msgstr "Interface religada"
+
+msgid "Interface shut down"
+msgstr "Desligar interface"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Internal Server Error"
+msgstr "Erro Interno do Servidor"
+
+msgid "Invalid"
+msgstr "Valor inválido"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+"O ID de VLAN fornecido é inválido! Só os IDs entre %d e %d são permitidos."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "O ID de VLAN fornecido é inválido! Só os IDs únicos são permitidos."
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Username inválido e/ou a password! Por favor, tente novamente."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"A imagem que está a tentar carregar aparenta não caber na flash do "
+"equipamento. Por favor verifique o ficheiro de imagem."
+
+msgid "Java Script required!"
+msgstr "É necessário Javascript!"
+
+msgid "Join Network"
+msgstr "Associar Rede"
+
+msgid "Join Network: Settings"
+msgstr "Associar Rede: Definições"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Associar Rede: Procurar Redes Wireless"
+
+msgid "Keep settings"
+msgstr "Manter definições"
+
+msgid "Kernel Log"
+msgstr "Registo do Kernel"
+
+msgid "Kernel Version"
+msgstr "Versão do Kernel"
+
+msgid "Key"
+msgstr "Chave"
+
+msgid "Key #%d"
+msgstr "Chave #%d"
+
+msgid "Kill"
+msgstr "Matar"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Servidor L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr "Intervalo de echo LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Etiqueta"
+
+msgid "Language"
+msgstr "Idioma"
+
+msgid "Language and Style"
+msgstr "Língua e Tema"
+
+msgid "Lease validity time"
+msgstr "Tempo de validade da concessão"
+
+msgid "Leasefile"
+msgstr "Ficheiro de concessões"
+
+msgid "Leasetime"
+msgstr "Tempo de concessão"
+
+msgid "Leasetime remaining"
+msgstr "Tempo de atribuição restante"
+
+msgid "Leave empty to autodetect"
+msgstr "Deixar em branco para auto-detecção"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Deixar em branco para usar o endereço WAN actual"
+
+msgid "Legend:"
+msgstr "Legenda:"
+
+msgid "Limit"
+msgstr "Limite"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Link Ativo"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Lista de servidores <abbr title=\"Sistema Nomes de Domínio\">DNS</abbr> para "
+"onde encaminhar os pedidos"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Lista de dominios que permitem respostas RFC1918 para"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Escutar apenas na interface fornecida ou, se não especificada, em todas"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Porta de escuta para entrada de consultas DNS"
+
+msgid "Load"
+msgstr "Carga"
+
+msgid "Load Average"
+msgstr "Carga Média"
+
+msgid "Loading"
+msgstr "A carregar"
+
+msgid "Local IPv4 address"
+msgstr "Endereço IPv4 Local"
+
+msgid "Local IPv6 address"
+msgstr "Endereço IPv6 Local"
+
+msgid "Local Startup"
+msgstr "Arranque Local"
+
+msgid "Local Time"
+msgstr "Hora Local"
+
+msgid "Local domain"
+msgstr "Domínio local"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Especificação de dominio local. Os nomes que correspondam a este dominio "
+"nunca são encaminhados e resolvidos do DHCP ou do ficheiro de hosts"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Sufixos de dominio local a juntar aos nomes DHCP e às entradas do ficheiro "
+"de hosts"
+
+msgid "Local server"
+msgstr "Servidor local"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr "Localizar consultas"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Bloqueado ao canal %d usado por %s"
+
+msgid "Log output level"
+msgstr "Nível de output do log"
+
+msgid "Log queries"
+msgstr "Registo das consultas"
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr "Endereço-MAC"
+
+msgid "MAC-Address Filter"
+msgstr "Filtro de Endereço-MAC"
+
+msgid "MAC-Filter"
+msgstr "Filtro-MAC"
+
+msgid "MAC-List"
+msgstr "Lista-MAC"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Taxa Máxima"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Número máximo permitido de concessões DHCP ativas"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Número máximo permitido de consultas DNS permitidas"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Número máximo de segundos a esperar pelo modem para ficar pronto"
+
+msgid "Maximum hold time"
+msgstr "Tempo máximo de espera"
+
+msgid "Maximum number of leased addresses."
+msgstr "Número máximo de endereços concessionados."
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Memory usage (%)"
+msgstr "Uso de memória (%)"
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Minimum Rate"
+msgstr "Taxa Mínima"
+
+msgid "Minimum hold time"
+msgstr "Tempo de retenção mínimo"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Falta a extensão de protocolo para o protocolo %q"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Dispositivo do modem"
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr "Montar Entrada"
+
+msgid "Mount Point"
+msgstr "Ponto de Montagem"
+
+msgid "Mount Points"
+msgstr "Pontos de Montagem"
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Pontos de montagem definem em que ponto um dispositivo de memória será "
+"anexado ao sistema de arquivos"
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr "Ponto de montagem"
+
+msgid "Mounted file systems"
+msgstr "Sistemas de arquivos montados"
+
+msgid "Move down"
+msgstr "Subir"
+
+msgid "Move up"
+msgstr "Descer"
+
+msgid "Multicast Rate"
+msgstr "Taxa de Multicast"
+
+msgid "Multicast address"
+msgstr "Endereço de multicast"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Candidatos a servidor NTP"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Name of the new interface"
+msgstr "Nome da nova interface"
+
+msgid "Name of the new network"
+msgstr "Nome da nova rede"
+
+msgid "Navigation"
+msgstr "Navegação"
+
+msgid "Netmask"
+msgstr "Mascara de rede"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Network Utilities"
+msgstr "Ferramentas de Rede"
+
+msgid "Network boot image"
+msgstr "Imagem de arranque via rede"
+
+msgid "Network without interfaces."
+msgstr "Rede sem interfaces."
+
+msgid "Next »"
+msgstr "Seguinte »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Sem Servidor DHCP configurado nesta interface"
+
+msgid "No chains in this table"
+msgstr "Tabela sem chains"
+
+msgid "No files found"
+msgstr "Não foram encontrados ficheiros"
+
+msgid "No information available"
+msgstr "Sem informação disponível"
+
+msgid "No negative cache"
+msgstr "Sem cache negativa"
+
+msgid "No network configured on this device"
+msgstr "Nenhuma rede configurada no dispositivo"
+
+msgid "No network name specified"
+msgstr "Nome de rede não especificado"
+
+msgid "No package lists available"
+msgstr "Não há listas de pacotes disponiveis"
+
+msgid "No password set!"
+msgstr "Sem password definida!"
+
+msgid "No rules in this chain"
+msgstr "Sem regras nesta cadeia"
+
+msgid "No zone assigned"
+msgstr "Sem zona atribuída"
+
+msgid "Noise"
+msgstr "Ruído"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Ruído:"
+
+msgid "None"
+msgstr "Nenhum"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "Não encontrado"
+
+msgid "Not associated"
+msgstr "Não associado"
+
+msgid "Not connected"
+msgstr "Não ligado"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Nota: Os ficheiros de configuração serão apagados."
+
+msgid "Notice"
+msgstr "Reparo"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Configuração-OPKG"
+
+msgid "Off-State Delay"
+msgstr "Atraso do Off-State"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Nesta página pode configurar as interfaces de rede. Pode ter várias "
+"interfaces do tipo bridge, assinalando o campo \"interfaces bridge\" e "
+"inserir os nomes de várias interfaces de rede separadas por espaços. Pode "
+"também usar a notação para <abbr title=\"Rede Local Virtual\">VLAN</abbr> "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo\">ex.</abbr>: "
+"<samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Atraso do On-State"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Um nome de host ou endereço MAC deve ser especificado!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Um ou mais campos contêm valores inválidos!"
+
+msgid "One or more required fields have no value!"
+msgstr "Um ou mais campos obrigatórios não têm valores!"
+
+msgid "Open list..."
+msgstr "Abrir lista..."
+
+msgid "Option changed"
+msgstr "Opção alterada"
+
+msgid "Option removed"
+msgstr "Opção removida"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Other:"
+msgstr "Outro:"
+
+msgid "Out"
+msgstr "Saída"
+
+msgid "Outbound:"
+msgstr "Saída:"
+
+msgid "Outdoor Channels"
+msgstr "Canais de Outdoor"
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Visão Geral"
+
+msgid "Owner"
+msgstr "Dono"
+
+msgid "PAP/CHAP password"
+msgstr "Password PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Utilizador PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Encapsulamento PPPoA "
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtp"
+
+msgid "Package libiwinfo required!"
+msgstr "O pacote libiwinfo é necessário!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "As listas de pacotes têm mais de 24 horas"
+
+msgid "Package name"
+msgstr "Nome do pacote"
+
+msgid "Packets"
+msgstr "Pacotes"
+
+msgid "Part of zone %q"
+msgstr "Parte da zona %q"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid "Password authentication"
+msgstr "Autenticação por senha"
+
+msgid "Password of Private Key"
+msgstr "Senha da Chave Privada"
+
+msgid "Password successfully changed!"
+msgstr "Password alterada com sucesso!"
+
+msgid "Path to CA-Certificate"
+msgstr "Directorio do Certificado CA"
+
+msgid "Path to Client-Certificate"
+msgstr "Caminho para o Certificado de Cliente"
+
+msgid "Path to Private Key"
+msgstr "Caminho da Chave Privada"
+
+msgid "Path to executable which handles the button event"
+msgstr "Caminho do executável que lida com o botão de eventos"
+
+msgid "Peak:"
+msgstr "Pico:"
+
+msgid "Perform reboot"
+msgstr "Executar reinicialização"
+
+msgid "Perform reset"
+msgstr "Executar reset"
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr "Definições Físicas"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "Pkts."
+
+msgid "Please enter your username and password."
+msgstr "Insira o seu username e password."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Por favor aguarde: Equipamento a reiniciar..."
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Port %d"
+msgstr "Porta %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr "Estado da porta:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr "Impede a comunicação cliente-a-cliente"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Controlador Wireless Prism2/2.5/3 802.11b"
+
+msgid "Proceed"
+msgstr "Proceder"
+
+msgid "Processes"
+msgstr "Processos"
+
+msgid "Prot."
+msgstr "Protocolo"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Protocol family"
+msgstr "Família do protocolo"
+
+msgid "Protocol of the new interface"
+msgstr "Protocolo da nova interface"
+
+msgid "Protocol support is not installed"
+msgstr "O protocolo suportado não está instalado"
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Qualidade"
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS Threshold"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "Taxa RX"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "Controlador Wireless RaLink 802.11%s"
+
+msgid "Radius-Accounting-Port"
+msgstr "Porta-Conta-Radius"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Segredo-Conta-Radius"
+
+msgid "Radius-Accounting-Server"
+msgstr "Servidor-Conta-Radius"
+
+msgid "Radius-Authentication-Port"
+msgstr "Porta-Autenticação-Radius"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Segredo-Autenticação-Radius"
+
+msgid "Radius-Authentication-Server"
+msgstr "Servidor-Autenticação-Radius"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Ler <code>/etc/ethers</code> para configurar o Servidor-<abbr title="
+"\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr>"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Deseja mesmo apagar esta interface? A eliminação não poder desfeita!\n"
+"Pode perde a ligação ao dispositivo, caso esta ligado através desta "
+"interface."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Deseja mesmo apagar esta rede? A eliminação não poder desfeita!\n"
+"Pode perde a ligação ao dispositivo, caso esta ligado através desta rede."
+
+msgid "Really reset all changes?"
+msgstr "Deseja mesmo limpar todas as alterações?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Deseja mesmo desligar esta rede?\n"
+"Pode perder o acesso ao dispositivo se estiver ligado através desta rede."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Deseja mesmo desligar a interface \"%s\" ?\n"
+"Pode perder o acesso ao dispositivo se estiver ligado através desta "
+"interface."
+
+msgid "Really switch protocol?"
+msgstr "Deseja mesmo trocar o protocolo?"
+
+msgid "Realtime Connections"
+msgstr "Ligações em Tempo Real"
+
+msgid "Realtime Graphs"
+msgstr "Gráficos em Tempo Real"
+
+msgid "Realtime Load"
+msgstr "Carga em Tempo Real"
+
+msgid "Realtime Traffic"
+msgstr "Tráfego em Tempo Real"
+
+msgid "Realtime Wireless"
+msgstr "Wireless em Tempo Real"
+
+msgid "Rebind protection"
+msgstr "Religar protecção"
+
+msgid "Reboot"
+msgstr "Reiniciar"
+
+msgid "Rebooting..."
+msgstr "A reiniciar..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Reinicia o seu dispositivo"
+
+msgid "Receive"
+msgstr "Receber"
+
+msgid "Receiver Antenna"
+msgstr "Antena de Recepção"
+
+msgid "Reconnect this interface"
+msgstr "Reconetar esta interface"
+
+msgid "Reconnecting interface"
+msgstr "A reconectar interface"
+
+msgid "References"
+msgstr "Referências"
+
+msgid "Regulatory Domain"
+msgstr "Domínio Regulatório"
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr "Endereço IPv4 remoto"
+
+msgid "Remove"
+msgstr "Remover"
+
+msgid "Repeat scan"
+msgstr "Repetir scan"
+
+msgid "Replace entry"
+msgstr "Substituir entrada"
+
+msgid "Replace wireless configuration"
+msgstr "Substituir configuração wireless"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Necessário para certos ISPs, p.ex. Charter with DOCSIS 3"
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Reset Counters"
+msgstr "Limpar contadores"
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr "Ficheiros Resolv e Hosts"
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgid "Restart Firewall"
+msgstr "Reiniciar Firewall"
+
+msgid "Restore backup"
+msgstr "Restaurar backup"
+
+msgid "Reveal/hide password"
+msgstr "Revelar/esconder password"
+
+msgid "Revert"
+msgstr "Reverter"
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Password do Router"
+
+msgid "Routes"
+msgstr "Rotas"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"As rotas especificam através de que interfaces ou gateways podem ser "
+"alcançados determinadas redes ou hosts."
+
+msgid "Rule #"
+msgstr "Regra #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+"Correr uma verificação do sistema de ficheiros antes de montar um dispositivo"
+
+msgid "Run filesystem check"
+msgstr "Correr uma verificação do sistema de ficheiros"
+
+msgid "SSH Access"
+msgstr "Acesso SSH"
+
+msgid "SSH-Keys"
+msgstr "Chaves-SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Salvar"
+
+msgid "Save & Apply"
+msgstr "Salvar & Aplicar"
+
+msgid "Save &#38; Apply"
+msgstr "Salvar &#38; Aplicar"
+
+msgid "Scan"
+msgstr "Procurar"
+
+msgid "Scheduled Tasks"
+msgstr "Tarefas Agendadas"
+
+msgid "Section added"
+msgstr "Secção adicionada"
+
+msgid "Section removed"
+msgstr "Secção removida"
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr "Isolar Clientes"
+
+msgid "Separate WDS"
+msgstr "Separar WDS"
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr "Nome do Serviço"
+
+msgid "Service Type"
+msgstr "Tipo de Serviço"
+
+msgid "Services"
+msgstr "Serviços"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurar Sincronização Horária"
+
+msgid "Setup DHCP Server"
+msgstr "Configurar Servidor DHCP"
+
+msgid "Show current backup file list"
+msgstr "Mostrar lista ficheiros para backup"
+
+msgid "Shutdown this interface"
+msgstr "Desligar esta interface"
+
+msgid "Shutdown this network"
+msgstr "Desligar esta rede"
+
+msgid "Signal"
+msgstr "Sinal"
+
+msgid "Signal:"
+msgstr "Sinal:"
+
+msgid "Size"
+msgstr "Tamanho"
+
+msgid "Skip"
+msgstr "Saltar"
+
+msgid "Skip to content"
+msgstr "Ir para o conteúdo"
+
+msgid "Skip to navigation"
+msgstr "Ir para a navegação"
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr "Software"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Alguns campos são inválidos, não é possível gravar valores!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Lamento, o objecto que pediu não foi encontrado."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Lamento, o servidor encontrou um erro inesperado."
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr "Ordenar"
+
+msgid "Source"
+msgstr "Origem"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Especifica as portas de escuta desta instância <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Start priority"
+msgstr "Prioridade de inicialização"
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr "Rotas Estáticas IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Rotas Estáticas IPv6"
+
+msgid "Static Leases"
+msgstr "Atribuições Estáticas"
+
+msgid "Static Routes"
+msgstr "Rotas Estáticas"
+
+msgid "Static WDS"
+msgstr "WDS Estático"
+
+msgid "Static address"
+msgstr "Endereço estático"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Stop"
+msgstr "Parar"
+
+msgid "Strict order"
+msgstr "Ordem exacta"
+
+msgid "Submit"
+msgstr "Enviar"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr "Switch"
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr "Sincronizar com o browser"
+
+msgid "Synchronizing..."
+msgstr "A sincronizar..."
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "System Log"
+msgstr "Registo do Sistema"
+
+msgid "System Properties"
+msgstr "Propriedades do Sistema"
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Definições TFTP"
+
+msgid "TFTP server root"
+msgstr "Raíz do servidor TFTP"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr "Tabela"
+
+msgid "Target"
+msgstr "Destino"
+
+msgid "Terminate"
+msgstr "Terminar"
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"O pacote <em>libiwinfo-lua</em> não está instalado. Precisa de instalar este "
+"pacote para que a configuração wireless funcione!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"O prefixo IPv6 atribuído ao provider, habitualmente termina com <code>::</"
+"code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Os caracteres permitidos são: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> e <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"O arquivo do dispositivo de memória ou da partição (<abbr title=\"por exemplo"
+"\">ex.</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"O sistema que foi usado para formatar a memória (<abbr title=\"por exemplo"
+"\">ex.</abbr> <samp><abbr title=\"Sistema de Arquivos ext3\">ext3</abbr></"
+"samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"A imagem foi carregada. Abaixo está o checksum e o tamanho dos ficheiros, "
+"compare com o ficheiro original para assegurar a integração de dados.<br /> "
+"Click em \"Proceder\" para iniciar o procedimento."
+
+msgid "The following changes have been committed"
+msgstr "As seguintes alterações foram escritas"
+
+msgid "The following changes have been reverted"
+msgstr "Foram recuperadas as seguintes alterações "
+
+msgid "The following rules are currently active on this system."
+msgstr "As seguintes regras estão actualmente acivas neste sistema."
+
+msgid "The given network name is not unique"
+msgstr "O nome dado não é único"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"O hardware não é comporta multi-SSIDs a configuração será substituída se "
+"prosseguir."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"O tamanho do perfico IPv4 em bits, o restante é usado em endereços IPv6."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "O comprimento do prefixo IPv6 em bits"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"As portas de rede neste dispositivo podem ser combinadas com várias <abbr "
+"title=\"Rede de Área Local Virtual\">VLAN</abbr>s onde os computadores podem "
+"comunicar directamente entre eles. <abbr title=\"Rede de Área Local Virtual"
+"\">VLAN</abbr>s são muito utilizadas para separar dois segmentos de rede "
+"diferentes. Muitas vezes existe por defeito uma porta de Uplink  para uma "
+"ligação para a rede acima como a internet ou outras portas de uma rede local."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "O protocolo escolhido precisa de um dispositivo atribuído."
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"O sistema está agora a limpar a partição de configuração e irá reiniciar-se "
+"quando terminar."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"O sistema está a carregar o firmware para a flash.<br /> NÃO DESLIGUE O "
+"EQUIPAMENTO!<br /> Espere alguns minutos até tentar uma ligação. Dependendo "
+"da sua configuração, ode ser necessário renovar o endereço do seu computador "
+"para poder ligar novamente ao router."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"A imagem carregada não contém um formato suportado. Confirme que escolhe uma "
+"imagem genérica para a sua plataforma."
+
+msgid "There are no active leases."
+msgstr "Não há concessões ativas."
+
+msgid "There are no pending changes to apply!"
+msgstr "Não há alterações pendentes para aplicar!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Não há alterações pendentes para reverter!"
+
+msgid "There are no pending changes!"
+msgstr "Não há alterações pendentes!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Ainda não há um dispositivo atribuído, por favor ligue um dispositivo de "
+"rede nas \"Definições Físicas\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Não há uma password definida neste router. Por favor defina uma senha de "
+"root para proteger a interface web e ativar o SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Este é o conteúdo de /etc/rc.local. Insira os seus próprios comandos aqui "
+"(antes de 'exit 0') para executá-los no final do processo de arranque."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Este é o único <abbr title=\"Protocolo de Configuração Dinâmica de Hosts"
+"\">DHCP</abbr> na rede local"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "Este é o sistema de agendamento de tarefas."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Esta lista fornece uma visão geral sobre os processos em execução no sistema."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+"Esta página permite a configuração de botões para acções personalizadas."
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Esta página fornece informações sobre as ligações de rede ativas."
+
+msgid "This section contains no values yet"
+msgstr "Esta secção ainda não contêm valores"
+
+msgid "Time Synchronization"
+msgstr "Sincronização Horária"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "A sincronização horária ainda não está configurada."
+
+msgid "Timezone"
+msgstr "Fuso Horário"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Para restaurar os ficheiros de configuração, pode carregar aqui um ficheiro "
+"de backup gerado anteriormente."
+
+msgid "Total Available"
+msgstr "Total Disponível"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "Tráfego"
+
+msgid "Transfer"
+msgstr "Transferências"
+
+msgid "Transmission Rate"
+msgstr "Taxa de Transmissão"
+
+msgid "Transmit"
+msgstr "Transmitir"
+
+msgid "Transmit Power"
+msgstr "Potência de Transmissão"
+
+msgid "Transmitter Antenna"
+msgstr "Antena de Transmissão"
+
+msgid "Trigger"
+msgstr "Trigger"
+
+msgid "Trigger Mode"
+msgstr "Modo de Trigger"
+
+msgid "Tunnel ID"
+msgstr "ID do Túnel"
+
+msgid "Tunnel Interface"
+msgstr "Interface de Túnel"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Modo Turbo"
+
+msgid "Tx-Power"
+msgstr "Potência de Tx"
+
+msgid "Type"
+msgstr "Tipo"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Só UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "Dispositivo USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Erro Desconhecido, a password não foi alterada!"
+
+msgid "Unmanaged"
+msgstr "Não gerido"
+
+msgid "Unsaved Changes"
+msgstr "Alterações não Guardadas"
+
+msgid "Unsupported protocol type."
+msgstr "Tipo de protocolo não suportado."
+
+msgid "Update lists"
+msgstr "Actualizar listas"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr "Carregar arquivo..."
+
+msgid "Uploaded File"
+msgstr "Ficheiro carregado"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Usar <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Usar a gateway do DHCP"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Usar os servidores DNS fornecidos pelo parceiro"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Usar servidores DNS personalizados"
+
+msgid "Use default gateway"
+msgstr "Usar gateway pre-definida"
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr "Usar tabela de roteamento"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr "Usado"
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr "Utilizador"
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr "Interface VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANs em %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs em %q (%s)"
+
+msgid "VPN Server"
+msgstr "Servidor VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr "Verificar"
+
+msgid "Version"
+msgstr "Versão"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Sistema Aberto WEP"
+
+msgid "WEP Shared Key"
+msgstr "Chave partilhada WEP"
+
+msgid "WEP passphrase"
+msgstr "Palavra-Passe WEP"
+
+msgid "WMM Mode"
+msgstr "Modo WMM"
+
+msgid "WPA passphrase"
+msgstr "Palavra-Passe WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"A encriptação-WPA necessita do wpa_supplicant (para modo cliente) ou do "
+"hostapd (para modo AP ou ah-hoc) esteja instalado."
+
+msgid "Waiting for changes to be applied..."
+msgstr "A aguardar que as mudanças sejam aplicadas..."
+
+msgid "Waiting for command to complete..."
+msgstr "A aguardar que o comando termine..."
+
+msgid "Warning"
+msgstr "Aviso"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Aviso: Existem alterações não salvas que serão perdidas durante a "
+"reinicialização!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Rede Wireless"
+
+msgid "Wireless Adapter"
+msgstr "Adaptador Wireless"
+
+msgid "Wireless Network"
+msgstr "Rede Wireless"
+
+msgid "Wireless Overview"
+msgstr "Vista Global Wireless"
+
+msgid "Wireless Security"
+msgstr "Segurança Wireless"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Wireless desativada ou não associada"
+
+msgid "Wireless is restarting..."
+msgstr "A Wireless está a reiniciar..."
+
+msgid "Wireless network is disabled"
+msgstr "Wireless está desativado."
+
+msgid "Wireless network is enabled"
+msgstr "A rede wireless está ativada"
+
+msgid "Wireless restarted"
+msgstr "Rede wireless reiniciada"
+
+msgid "Wireless shut down"
+msgstr "Desligar wireless"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Escrever os pedidos de DNS para o syslog"
+
+msgid "XR Support"
+msgstr "Suporte XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Você pode ativar ou desativar os scripts de inicialização instalados aqui. "
+"As mudanças serão aplicadas após a reinicialização do equipamento.<br /"
+"><strong>Aviso: Se você desativar algum script de inicialização essencial "
+"como por exemplo \"rede/network\", o dispositivo poderá tornar-se "
+"inacessível!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Tem de activar o Java Script no seu browser ou a LuCI não funcionará "
+"corretamente."
+
+msgid "any"
+msgstr "qualquer"
+
+msgid "auto"
+msgstr "automático"
+
+#, fuzzy
+msgid "automatic"
+msgstr "estático"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr "criar:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "cria uma bridge sobre determinada(s) interface(s)"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "desativar"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "expirou"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"Ficheiro onde as atribuições <abbr title=\"Protocolo de Configuração "
+"Dinâmica de Hosts\">DHCP</abbr> são armazenadas"
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr "full-duplex"
+
+msgid "half-duplex"
+msgstr "half-duplex"
+
+msgid "help"
+msgstr "ajuda"
+
+msgid "hidden"
+msgstr "escondido"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "se o destino for uma rede"
+
+msgid "input"
+msgstr "entrada"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+"Ficheiro local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+msgid "no"
+msgstr "não"
+
+msgid "no link"
+msgstr "sem link"
+
+msgid "none"
+msgstr "nenhum"
+
+msgid "off"
+msgstr "desligado"
+
+msgid "on"
+msgstr "ligado"
+
+msgid "open"
+msgstr "abrir"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr "desconhecido"
+
+msgid "unlimited"
+msgstr "ilimitado"
+
+msgid "unspecified"
+msgstr "não especificado"
+
+msgid "unspecified -or- create:"
+msgstr ""
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr "sim"
+
+msgid "« Back"
+msgstr "« Voltar"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "ID utilizador HE.net"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40 Mhz 2.º canal acima"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz 2.º canal abaixo"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Aceitar os avisos do router"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Anúnciar IPv6 na rede"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ID da rede anunciada"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "O intervalo permitido é de 1 até 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Capacidades HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Modo HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Modelo do Router"
+
+#~ msgid "Router Name"
+#~ msgstr "Nome do Router"
+
+#~ msgid "Active Leases"
+#~ msgstr "Atribuições Activas"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encriptado\">Encr.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Rede Local Wireless\">WLAN</abbr>-Pesquisa"
+
+#~ msgid "Create Network"
+#~ msgstr "Criar Rede"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Networks"
+#~ msgstr "Redes"
+
+#~ msgid "Power"
+#~ msgstr "Potência"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Redes Wifi no seu ambiente local"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "Notação <abbr title=\"Roteamento entre Domínios sem Classe\">CIDR</abbr>: "
+#~ "endereço/prefixo"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr ""
+#~ "Broadcast <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "As portas de rede do seu router podem ser combinadas com diversas <abbr "
+#~ "title=\"Rede Local Virtual\">VLAN</abbr>s em que os computadores podem "
+#~ "comunicar directamente entre si. As <abbr title=\"Rede Local Virtual"
+#~ "\">VLAN</abbr>s são frequentemente utilizadas para separar segmentos de "
+#~ "redes diferentes. Muitas vezes é padrão uma porta Uplink para a ligação "
+#~ "com a próxima rede, como a Internet e outras portas para uma rede local."
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Ficheiros que devem ser mantidos quando gravar um novo firmware."
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Aqui pode personalizar as configurações e funcionalidades do <abbr title="
+#~ "\"Interface de configuração Lua\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Acções pós-gravação"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Estes comandos são executados automaticamente quando uma determinada "
+#~ "configuração da <abbr title=\"Interface de configuração unificada\">UCI</"
+#~ "abbr> está gravada, permitindo mudanças a serem aplicadas "
+#~ "instantaneamente."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"Interface do Utilizador\">UI</abbr>"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Ponto de acesso (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Opções adicionais do pppd"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Fim automático de ligação"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Arquivo de backup"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configurar o servidor DNS local para usar o servidores de nomes "
+#~ "fornecidos pelo PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Script de ligação"
+
+#~ msgid "Create backup"
+#~ msgstr "Criar backup"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Script de fim de ligação"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Editar listas de pacotes e destinos de instalação"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Activar IPv6 no link PPP"
+
+#~ msgid "Firmware image"
+#~ msgstr "Imagem de Firmware"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Aqui pode fazer o backup e restaurar as configurações do seu router. "
+#~ "Também pode restaurar seu router para as configurações pré-definidas."
+
+#~ msgid "Installation targets"
+#~ msgstr "Destino de Instalação"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Manter ficheiros de configuração"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Manter em Actividade"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Permitir o pppd substituir a rota padrão actual e usar a interface PPP "
+#~ "como padrão após a ligação ser efectuada com sucesso"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr ""
+#~ "Deixar o pppd executar este script após o estabelecimento do link PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Deixar o pppd executar este script antes de terminar o link PPP"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Certifique-se que forneceu o código PIN correcto aqui, ou pode bloquear o "
+#~ "seu cartão SIM"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "A maioria deles são servidores de rede, que oferecem um determinado "
+#~ "serviço para seu equipamento ou rede como acesso shell, servindo páginas "
+#~ "web como o <abbr title=\"Interface de configuração Lua\">LuCI</abbr>, "
+#~ "fazendo roteamento, enviando e-mails, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Número de falhas do teste de ligação para reiniciar uma ligação automática"
+
+#~ msgid "PIN code"
+#~ msgstr "Código PIN"
+
+#~ msgid "Package lists"
+#~ msgstr "Listas de pacotes"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Proceder com a restauração das configurações pré-definidas?"
+
+#~ msgid "Processor"
+#~ msgstr "Processador"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Porta RADIUS"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Servidor RADIUS"
+
+#~ msgid "Replace default route"
+#~ msgstr "Substituir a rota padrão"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Restaurar as configurações pré-definidas do router"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Segundos de espera para o modem ficar pronto antes de tentar uma ligação"
+
+#~ msgid "Service type"
+#~ msgstr "Tipo do serviço"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr ""
+#~ "Serviços e daemons que estão a executar diversas tarefas no seu "
+#~ "equipamento."
+
+#~ msgid "Settings"
+#~ msgstr "Definições"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Configurar tempo de espera"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Lamentamos, mas o libreCMC não suporta uma actualização do sistema para "
+#~ "esta plataforma.<br /> É necessário carregar manualmente uma imagem para "
+#~ "a flash do seu equipamento."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr ""
+#~ "Especificar argumentos adicionais por linha de comando para o pppd aqui"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "O caminho do dispositivo do seu modem, ex. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "Tempo (em segundos) para fim de uma ligação já não utilizada"
+
+#~ msgid "Update package lists"
+#~ msgstr "Actualizar listas de pacotes"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Carregar uma imagem libreCMC para a flash do router."
+
+#~ msgid "Upload image"
+#~ msgstr "Carregar imagem"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Utilizar DNS do peer"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Precisa de instalar os pacotes \"comgt\" para UMTS/GPRS, \"ppp-mod-pppoe"
+#~ "\" para PPPoE, \"ppp-mod-pppoa\" para PPPoA ou \"pptp\" para o suporte "
+#~ "PPtP"
+
+#~ msgid "back"
+#~ msgstr "voltar"
+
+#~ msgid "buffered"
+#~ msgstr "em buffer"
+
+#~ msgid "cached"
+#~ msgstr "em cache"
+
+#~ msgid "free"
+#~ msgstr "livre"
+
+#~ msgid "static"
+#~ msgstr "estático"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Interface de configuração Lua\">LuCI</abbr> é uma colecção "
+#~ "gratuita de programas Lua incluindo um Framework Web <abbr title=\"Modelo-"
+#~ "Visualização-Controle\">MVC</abbr> e uma Interface Web para micro-"
+#~ "dispositivos. <abbr title=\"Interface de configuração Lua\">LuCI</abbr> é "
+#~ "licenciado sob a Licença Apache."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "Chaves-<abbr title=\"Shell Seguro\">SSH</abbr>"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Um servidor web HTTP/1.1 ligeiro escrito em C e desenvolvido em Lua para "
+#~ "servir LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Um pequeno servidor web que pode ser utilizado para servir a interface "
+#~ "<abbr title=\"Interface de configuração Lua\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "Addresses"
+#~ msgstr "Endereços"
+
+#~ msgid "Admin Password"
+#~ msgstr "Password do Administrador"
+
+#~ msgid "Alias"
+#~ msgstr "Configuração IP alternativa"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Área de autenticação"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Porta do interface em ponte"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Altera a senha do administrador do sistema (Login <code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Cliente (WDS)"
+
+#~ msgid "Configuration file"
+#~ msgstr "Ficheiro de configuração"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Esgotado o tempo de ligação"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Programadores Contribuintes"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP atribuido"
+
+#~ msgid "Document root"
+#~ msgstr "Diretório raiz"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Activar keep-alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Ponte Ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Aqui pode colar suas Chaves-<abbr title=\"Shell Seguro\">SSH</abbr> "
+#~ "públicas (uma por linha) para a autenticação <abbr title=\"Shell Seguro"
+#~ "\">SSH</abbr> por chave-pública."
+
+#~ msgid "ID"
+#~ msgstr "Identificação de interface em ponte"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Configuração IP"
+
+#~ msgid "Interface Status"
+#~ msgstr ""
+#~ "Aqui encontra informações sobre o estado actual do sistema, como <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr>, frequência do relógio, uso "
+#~ "de memória ou uso da interface de rede de dados."
+
+#~ msgid "Lead Development"
+#~ msgstr "Equipa de Desenvolvimento"
+
+#~ msgid "Master"
+#~ msgstr "AP"
+
+#~ msgid "Master + WDS"
+#~ msgstr "AP+WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "Não configurado"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Senha alterada com sucesso"
+
+#~ msgid "Plugin path"
+#~ msgstr "Directorio de plugins"
+
+#~ msgid "Ports"
+#~ msgstr "Portas"
+
+#~ msgid "Primary"
+#~ msgstr "Primário"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Página do Projecto"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Ahdemo"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Obrigado a"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "A área de autenticação (realm) que será mostrada na prompt de "
+#~ "autenticação das páginas protegidas."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Erro Desconhecido"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "padrão é <code>/etc/httpd.conf</code>"
+
+#~ msgid "Package lists updated"
+#~ msgstr "As listas de pacotes foram actualizadas"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Actualizar os pacotes instalados"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Também os arquivos de logs do kernel ou dos serviços podem ser "
+#~ "consultados aqui para obter uma visão geral sobre o seu estado actual."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Aqui você pode encontrar informações sobre o estado actual do sistema, "
+#~ "tais como <abbr title=\"Central Processing Unit\">CPU</abbr>, frequência "
+#~ "do relógio, uso de memória ou da interface de rede de dados."
+
+#~ msgid "Search file..."
+#~ msgstr "Procurar ficheiro..."
+
+# "free as in freedom" equivale a "livre de liberdade" não de "grátis"
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "O <abbr title=\"Interface de configuração Lua\">LuCI</abbr> é um "
+#~ "interface gráfico livre, flexível e fácil de utilizar para configurar o "
+#~ "libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "E agora divirta-se com o seu router!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Agradecemos os seus comentários e sugestões por forma a podermos "
+#~ "continuar a melhorar este interface."
+
+#~ msgid "Hello!"
+#~ msgstr "Olá!"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Aviso: No <abbr title=\"Interface de configuração Lua\">LuCI</abbr> as "
+#~ "alterações devem ser confirmadas clicando em Alterações - Salvar &amp; "
+#~ "Aplicar antes de serem aplicadas."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Nas próximas páginas, pode ajustar todas as definições importantes do seu "
+#~ "router."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr ""
+#~ "A equipa do <abbr title=\"Interface de configuração Lua\">LuCI</abbr>"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Esta é a área de administração do <abbr title=\"Interface de configuração "
+#~ "Lua\">LuCI</abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Interface do Utilizador"
+
+#~ msgid "enable"
+#~ msgstr "activar"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr " (opcional)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "Porta do <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr> será "
+#~ "consultado na ordem do arquivo resolv.conf"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"máximo\">max.</abbr> de <abbr title=\"Protocolo de "
+#~ "Configuração Dinâmica de Hosts\">DHCP</abbr>-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "tamanho <abbr title=\"máximo\">max.</abbr> do pacote <abbr title="
+#~ "\"Mecanismos de Extensão do Sistema de Nomes de Domínios\">EDNS0</abbr>"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "Isolamento do AP"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Adicione a rede Wifi à rede física"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliases"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Criar Rede"
+
+#~ msgid "Devices"
+#~ msgstr "Dispositivos"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Não encaminhar as pesquisas reversas para redes locais"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Activar servidor TFTP"
+
+#~ msgid "Errors"
+#~ msgstr "Erros"
+
+#~ msgid "Essentials"
+#~ msgstr "Básico"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Expandir Hosts"
+
+#~ msgid "First leased address"
+#~ msgstr "Primeiro endereço de atribuição"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Resolve problemas com websites indisponíveis, submissão de formulários ou "
+#~ "comportamentos inesperados de alguns ISP's."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Endereço do Hardware"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Aqui pode configurar os dispositivos wifi instalados. "
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignorar <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Independente (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Ligação Internet"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Cliente (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Atribuições"
+
+#~ msgid "Local Domain"
+#~ msgstr "Domínio Local"
+
+#~ msgid "Local Network"
+#~ msgstr "Rede Local"
+
+#~ msgid "Local Server"
+#~ msgstr "Servidor Local"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Imagem para o boot remoto (PXE)"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Nome da Rede (<abbr title=\"Identificador de Conjunto de Serviços "
+#~ "Estendidos\">ESSID</abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Número de endereços atribuidos"
+
+#~ msgid "Path"
+#~ msgstr "Directório"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Executar Acções"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Impede a comunicação de Cliente para Cliente"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Ponto de Acesso (Access Point)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Ficheiro resolv.conf"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Directório raiz do servidor TFTP"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Foram aplicadas as seguintes alterações "
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Quando gravar um novo firmware com o <abbr title=\"Interface de "
+#~ "configuração Lua\">LuCI</abbr> estes arquivos serão adicionados ao novo "
+#~ "firmware instalado."
+
+#, fuzzy
+#~ msgid "Wireless Scan"
+#~ msgstr "Wireless"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Com o <abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</"
+#~ "abbr> os membros da rede podem automaticamente receber as suas "
+#~ "configurações de rede (endereço-<abbr title=\"Protocolo de Internet\">IP</"
+#~ "abbr>, netmask, servidor-<abbr title=\"Sistema de Nomes de Domínios"
+#~ "\">DNS</abbr>, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Pode servir várias redes wifi com o mesmo dispositivo. Esteja ciente de "
+#~ "que existem certas restrições específicas do hardware e do controlador. "
+#~ "Pode normalmente operar 1 rede Ad-Hoc ou até 3 redes AP e 1 Cliente "
+#~ "simultaneamente."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Precisa de instalar os pacotes \"ppp-mod-pppoe\" para PPPoE ou \"pptp\" "
+#~ "para o suporte PPtP"
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#~ msgid "additional hostfile"
+#~ msgstr "ficheiro de hosts adicional"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr ""
+#~ "Adiciona os nomes dos domínios às entradas de hosts no arquivo resolv.conf"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "ligação automática"
+
+#~ msgid "concurrent queries"
+#~ msgstr "Consultas simultâneas"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "desabilitar <abbr title=\"Protocolo de Configuração Dinâmica de Hosts"
+#~ "\">DHCP</abbr> para esta interface"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "desligar quando ocioso por"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "Não fazer cache de desconhecidos"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "Filtro de consultas inuteis-<abbr title=\"Sistema de Nomes de Domínios"
+#~ "\">DNS</abbr> de sistemas windows"
+
+#~ msgid "installed"
+#~ msgstr "instalado"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "Localizar o hostname dependendo de sua sub-rede"
+
+#~ msgid "not installed"
+#~ msgstr "não instalado"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "Impede o cache de respostas-<abbr title=\"Sistema de Nomes de Domínios"
+#~ "\">DNS</abbr> negativas"
+
+#~ msgid "query port"
+#~ msgstr "porta para consultas"
+
+#~ msgid "transmitted / received"
+#~ msgstr "transmitido / recebido"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "redes contidas"
+
+#~ msgid "all"
+#~ msgstr "todos"
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid "Distance"
+#~ msgstr "Distância"
+
+#~ msgid "Legend"
+#~ msgstr "Legenda"
+
+#~ msgid "Library"
+#~ msgstr "Biblioteca"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "veja sobre &#39;%s&#39; na página de manual (man)"
+
+#~ msgid "Package Manager"
+#~ msgstr "Gestor de Pacotes"
+
+#~ msgid "Service"
+#~ msgstr "Serviço"
+
+#~ msgid "Statistics"
+#~ msgstr "Estatísticas"
+
+#~ msgid "zone"
+#~ msgstr "Zona"
diff --git a/trunk/package/luci/po/pt/commands.po b/trunk/package/luci/po/pt/commands.po
new file mode 100644
index 00000000..a46b7d21
--- /dev/null
+++ b/trunk/package/luci/po/pt/commands.po
@@ -0,0 +1,99 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-02 19:17+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Uma pequena descrição textual do comando configurado"
+
+msgid "Access command with"
+msgstr "Aceder ao comando com"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Permitir a execução do comando e descarregar o resultado sem autenticação "
+"prévia"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+"Permitir que o utilizador forneça argumentos adicionais na linha de comandos"
+
+msgid "Arguments:"
+msgstr "Argumentos:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Dados binários não mostrados, mas pode descarregar."
+
+msgid "Code:"
+msgstr "Código:"
+
+msgid "Collecting data..."
+msgstr "A obter dados..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Command failed"
+msgstr "O comando falhou"
+
+msgid "Command line to execute"
+msgstr "Linha de comandos a executar"
+
+msgid "Command successful"
+msgstr "Comando executado com sucesso"
+
+msgid "Command:"
+msgstr "Comando:"
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Custom Commands"
+msgstr "Comandos Personalizados"
+
+msgid "Custom arguments"
+msgstr "Argumentos personalizados"
+
+msgid "Dashboard"
+msgstr "Painel de Controlo"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Download"
+msgstr "Descarregar"
+
+msgid "Failed to execute command!"
+msgstr "Falha ao executar comando!"
+
+msgid "Link"
+msgstr "Link"
+
+msgid "Loading"
+msgstr "A carregar"
+
+msgid "Public access"
+msgstr "Acesso público"
+
+msgid "Run"
+msgstr "Executar"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Esta página permite-lhe configurar uma linha de comandos personalizada que "
+"pode facilmente ser executada a partir da interface web."
+
+msgid "Waiting for command to complete..."
+msgstr "A aguardar que o comando termine..."
diff --git a/trunk/package/luci/po/pt/coovachilli.po b/trunk/package/luci/po/pt/coovachilli.po
new file mode 100644
index 00000000..115ae03a
--- /dev/null
+++ b/trunk/package/luci/po/pt/coovachilli.po
@@ -0,0 +1,372 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-05-01 00:43+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Configuração da Rede"
+
+msgid "RADIUS configuration"
+msgstr "Configuração RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Autenticação UAM e MAC"
+
+#~ msgid "General configuration"
+#~ msgstr "Configuração Geral"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Definições gerais do CoovaChilli"
+
+#~ msgid "Command socket"
+#~ msgstr "Socket de comando"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "Socket UNIX para comunicação com  chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Intervalo de refrescamento da configuração"
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Reler o ficheiro de configuração e executar verificações DNS n segundos "
+#~ "de intervalo. Tem o mesmo efeito que o envio do sinal HUP. Se o intervalo "
+#~ "for 0 (zero) esta funcionalidade será desactivada."
+
+#~ msgid "Pid file"
+#~ msgstr "Ficheiro PID"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr "Nome do ficheiro onde será guardado o PID"
+
+#~ msgid "State directory"
+#~ msgstr "Directorio de estado"
+
+#~ msgid "Directory of non-volatile data"
+#~ msgstr "Directorio para dados não-volateis"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "Configuração tun/tap"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Configuração de rede/tun"
+
+#~ msgid "Network down script"
+#~ msgstr "Script de rede/tun em baixo"
+
+#~ msgid ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+#~ msgstr ""
+#~ "Script executado após o estado de uma sessão ser alterado de autorizado "
+#~ "para não-autorizado "
+
+#~ msgid "Network up script"
+#~ msgstr "Script de rede/tun em cima"
+
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr "Script executado apos o interface tun de rede ter sido levantado"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Servidor primário de DNS"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Servidor secundário de DNS"
+
+#~ msgid "Domain name"
+#~ msgstr "Domínio"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Servidor primário de DNS"
+
+#, fuzzy
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o endereço de servidor DNS a usar "
+#~ "para a resolução de nomes"
+
+#, fuzzy
+#~ msgid "IP down script"
+#~ msgstr "Script de rede/tun em baixo"
+
+#, fuzzy
+#~ msgid "Script executed after the tun network interface has been taken down"
+#~ msgstr ""
+#~ "Script executado após o estado de uma sessão ser alterado de autorizado "
+#~ "para não-autorizado "
+
+#, fuzzy
+#~ msgid "IP up script"
+#~ msgstr "Script de rede/tun em cima"
+
+#, fuzzy
+#~ msgid ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+#~ msgstr "Script executado apos o interface tun de rede ter sido levantado"
+
+#, fuzzy
+#~ msgid "Uplink subnet"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o endereço de servidor DNS a usar "
+#~ "para a resolução de nomes"
+
+#, fuzzy
+#~ msgid "Static IP address pool"
+#~ msgstr "Script de rede/tun em cima"
+
+#, fuzzy
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Script executado apos o interface tun de rede ter sido levantado"
+
+#, fuzzy
+#~ msgid "TUN/TAP device"
+#~ msgstr "Script de rede/tun em baixo"
+
+#, fuzzy
+#~ msgid "The specific device to use for the TUN/TAP interface"
+#~ msgstr ""
+#~ "Script executado após o estado de uma sessão ser alterado de autorizado "
+#~ "para não-autorizado "
+
+#, fuzzy
+#~ msgid "TX queue length"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "Use TAP device"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Script executado apos o interface tun de rede ter sido levantado"
+
+#, fuzzy
+#~ msgid "DHCP configuration"
+#~ msgstr "Configuração tun/tap"
+
+#, fuzzy
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "DHCP end number"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "DHCP interface"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Ethernet interface to listen to for the downlink interface"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Listen MAC address"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Leasetime"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Use a DHCP lease of seconds (default 600)"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Admin user"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "NAS IP"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Value to use in RADIUS NAS-IP-Address attribute"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "NAS MAC"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Allow WPA guests"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "UAM configuration"
+#~ msgstr "Configuração tun/tap"
+
+#, fuzzy
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "Allow any DNS server"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "Allow any IP address"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "Allowed domains"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid ""
+#~ "Defines a list of domain names to automatically add to the walled garden"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM homepage"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM static content port"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid "TCP port to bind to for only serving embedded content"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM listening address"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM logout IP"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM listening port"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid "TCP port to bind to for authenticating clients (default 3990)"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM secret"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid "Shared secret between uamserver and chilli"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM server"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "UAM user interface"
+#~ msgstr "Domínio"
+
+#, fuzzy
+#~ msgid ""
+#~ "An init.d style program to handle local content on the uamuiport web "
+#~ "server"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid ""
+#~ "Executable to run as a CGI type program (like haserl) for URLs with "
+#~ "extention .chi"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
+
+#, fuzzy
+#~ msgid "MAC configuration"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Configuração de rede/tun"
+
+#, fuzzy
+#~ msgid "Try to authenticate all users based on their mac address alone"
+#~ msgstr "Configuração de rede/tun"
diff --git a/trunk/package/luci/po/pt/ddns.po b/trunk/package/luci/po/pt/ddns.po
new file mode 100644
index 00000000..748097e5
--- /dev/null
+++ b/trunk/package/luci/po/pt/ddns.po
@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-05-31 23:52+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Intervalo para verificação de alteração do endereço IP"
+
+#, fuzzy
+msgid "Check-time unit"
+msgstr "Unidade de tempo para verificação"
+
+#, fuzzy
+msgid "Custom update-URL"
+msgstr "URL para actualização personalizada"
+
+msgid "Dynamic DNS"
+msgstr "DNS Dinâmico"
+
+#, fuzzy
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"O DNS dinâmico permite que o seu router possa ser encontrado a partir de um "
+"hostname fixo, mesmo usando um Endereço IP dinâmico."
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Force update every"
+msgstr "Forçar actualização a cada"
+
+#, fuzzy
+msgid "Force-time unit"
+msgstr "Unidade de tempo para actualização forçada"
+
+msgid "Hostname"
+msgstr "Nome de Host"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Service"
+msgstr "Serviço"
+
+msgid "Source of IP address"
+msgstr "Origem do Endereço IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Nome de Utilizador"
+
+msgid "custom"
+msgstr "personalizado"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "interface"
+msgstr "interface"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "rede"
+
+#~ msgid "Event interface"
+#~ msgstr "Interface do evento"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "Em que interface deve ser iniciado o script para o processo de ddns."
diff --git a/trunk/package/luci/po/pt/diag_core.po b/trunk/package/luci/po/pt/diag_core.po
new file mode 100644
index 00000000..6083f285
--- /dev/null
+++ b/trunk/package/luci/po/pt/diag_core.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-30 22:57+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configurar Diagnósticos"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos "
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Os diagnósticos disponíveis neste menu dependem dos módulos que tem "
+"instalados no seu dispositivo. "
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"As entradas neste menu permitem levar a cabo testes de diagnóstico no seu "
+"sistema para o ajudar na resolução de problemas."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Com este menu pode configurar o diagnóstico de rede, tal como explorar "
+"dispositivos de rede e testes ping."
diff --git a/trunk/package/luci/po/pt/diag_devinfo.po b/trunk/package/luci/po/pt/diag_devinfo.po
new file mode 100644
index 00000000..afe48850
--- /dev/null
+++ b/trunk/package/luci/po/pt/diag_devinfo.po
@@ -0,0 +1,209 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-03 12:23+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Acções"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Beginning of MAC address range"
+msgstr "Inicio da gama de endereços MAC"
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "Apagar"
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr "Tipo de Dispositivo"
+
+msgid "Devices discovered for"
+msgstr "Dispositivos descobertos para"
+
+msgid "Devices on Network"
+msgstr "Dispositivos na Rede"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "End of MAC address range"
+msgstr "Fim da gama de endereços MAC"
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Invalid"
+msgstr "Inválido"
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "Endereço MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr "Modelo"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr "Não há dispositivos SIP"
+
+msgid "No devices detected"
+msgstr "Não foram detetados dispositivos"
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr "Dono OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr "Informação do Telefone"
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr "Repetir Contagem"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr "Sub-rede"
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr "verificar outras redes"
diff --git a/trunk/package/luci/po/pt/ffwizard.po b/trunk/package/luci/po/pt/ffwizard.po
new file mode 100644
index 00000000..deff99c2
--- /dev/null
+++ b/trunk/package/luci/po/pt/ffwizard.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-03 12:19+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Permitir a transferência de estatísticas anónimas acerca deste nó"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Selecione isto para proteger a sua LAN de outros nós ou clientes"
+
+msgid "Configure network"
+msgstr "Configurar rede"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Ligue o seu nó com outros nós com um túnel via internet"
+
+msgid "DHCP IP range"
+msgstr "Gama de IPs DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "O DHCP irá atribuir automaticamente endereços IP aos clientes"
+
+msgid "DNS Server"
+msgstr "Servidor DNS"
+
+msgid "Enable DHCP"
+msgstr "Ativar DHCP"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Heartbeat"
+msgstr "Heartbeat"
+
+msgid "IP address"
+msgstr "Endereço IP"
+
+msgid "L2gvpn tunnel"
+msgstr "Túnel L2gvpn"
+
+msgid "Limit download bandwidth"
+msgstr "Limitar largura de banda de download"
+
+msgid "Limit upload bandwidth"
+msgstr "Limitar largura de banda de upload"
+
+msgid "Mesh IP address"
+msgstr "Endereço IP da malha"
+
+msgid "Mesh IPv6 Address"
+msgstr "Endereço IPv6 da malha"
+
+msgid "Netmask"
+msgstr "Máscara de rede"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Password confirmation"
+msgstr "Confirmar password"
+
+msgid "Password successfully changed"
+msgstr "Password alterada com sucesso"
+
+msgid "Protect LAN"
+msgstr "Proteger LAN"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Selecione esta caixa para configurar as suas interfaces de rede."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr "Selecione isto para permitir a utilização do seu acesso à internet."
+
+msgid "Share your internet connection"
+msgstr "Partilhe a sua ligação à internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"A gama de IP a partir da qual os clientes atribuem os endereços IP (ex. "
+"10.1.2.1./28). Se esta é uma gama dentro das suas gamas de rede, então eles "
+"serão anunciados como HNA. Qualquer outra gama usará NAT. Se for deixado em "
+"branco será aplicadas as pré-definições do perfil comunitário."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "O endereço IPv6 é calculado automaticamente."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "O protocolo a ser usado na conectividade à internet."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Este é o endereço único na rede (e.g. 10.1.1.1) e tem de estar na sua "
+"comunidade local."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Isto irá configurar a nova interface wireless virtual no modo de Ponto de "
+"Acesso."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Este assistente írá ajudá-lo a configurar o seu router para a Freifunk ou "
+"outras redes wireless comunitárias similares."
+
+msgid "Unknown Error"
+msgstr "Erro Desconhecido"
+
+msgid "Username"
+msgstr "Utilizador"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Ponto de Acesso Virtual (VAP)"
+
+msgid "Wizard"
+msgstr "Assistente"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "O seu dispositivo e os nós vizinhos têm de usar o mesmo canal."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "estático"
+
+msgid "Configure this interface."
+msgstr "Configurar esta interface."
+
+msgid "recommended"
+msgstr "recomendado"
+
+msgid "Basic settings"
+msgstr "Definições básicas"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "As definições básicas não estão completas. Vá até"
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+"Não pode utilizar o assistente porque alguns parâmetros necessários estão em "
+"falta."
+
+msgid "and fill out all required fields."
+msgstr "e preencha os campos necessários."
diff --git a/trunk/package/luci/po/pt/firewall.po b/trunk/package/luci/po/pt/firewall.po
new file mode 100644
index 00000000..304e3659
--- /dev/null
+++ b/trunk/package/luci/po/pt/firewall.po
@@ -0,0 +1,585 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2013-06-03 13:37+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s em %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s with %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s em %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Entrada Sem Nome)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Regra Sem Nome)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT Sem Nome)"
+
+msgid "-- Please choose --"
+msgstr "-- Escolha por favor --"
+
+msgid "-- custom --"
+msgstr "-- personalizado --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> pkts. por <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr "Acção"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Add and edit..."
+msgstr "Adicionar e editar..."
+
+msgid "Advanced Settings"
+msgstr "Definições Avançadas"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Permitir encaminhamento de <em>zonas de origem</em>"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Permitir encaminhamento para <em>zonas de destino</em>"
+
+msgid "Any"
+msgstr "Qualquer"
+
+msgid "Covered networks"
+msgstr "Redes abrangidas"
+
+msgid "Custom Rules"
+msgstr "Regras Personalizadas"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"As regras personalizadas permitem-lhe executar comandos arbitrários iptables "
+"os quais não são possiveis de aplicar usando a framework da firewall. Os "
+"comandos são executados a seguir ao reinicio da firewall, logo a seguir ao "
+"conjunto de regras predefinidas serem carregadas."
+
+msgid "Destination IP address"
+msgstr "Endereço IP de destino"
+
+msgid "Destination address"
+msgstr "Endereço de destino"
+
+msgid "Destination port"
+msgstr "Porta de destino"
+
+msgid "Destination zone"
+msgstr "Zona de destino"
+
+msgid "Do not rewrite"
+msgstr "Não re-escrever"
+
+msgid "Drop invalid packets"
+msgstr "Cancelar pacotes inválidos"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Enable NAT Loopback"
+msgstr "Ativar NAT Loopback"
+
+msgid "Enable SYN-flood protection"
+msgstr "Ativar a Proteção SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr "Ativar registo nesta zona"
+
+msgid "External IP address"
+msgstr "Endereço IP externo"
+
+msgid "External port"
+msgstr "Porta externa"
+
+msgid "External zone"
+msgstr "Zona externa"
+
+msgid "Extra arguments"
+msgstr "Argumentos extra"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr "Firewall - Regras Personalizadas"
+
+msgid "Firewall - Port Forwards"
+msgstr "Firewall - Encaminhamento de Portas"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Firewall - Regras de Tráfego"
+
+msgid "Firewall - Zone Settings"
+msgstr "Firewall - Definições de Zona"
+
+msgid "Force connection tracking"
+msgstr "Forçar rasto de ligação"
+
+msgid "Forward"
+msgstr "Encaminhar"
+
+msgid "Forward to"
+msgstr "Encaminhar para"
+
+msgid "From %s in %s"
+msgstr "De %s em %s"
+
+msgid "From %s in %s with source %s"
+msgstr "De %s em %s com origem %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "De %s em %s com origem %s e %s"
+
+msgid "General Settings"
+msgstr "Definições Gerais"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Só IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Só IPv6"
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Encaminhamento Inter-Zona"
+
+msgid "Internal IP address"
+msgstr "Endereço IP interno"
+
+msgid "Internal port"
+msgstr "Porta interna"
+
+msgid "Internal zone"
+msgstr "Zona Interna"
+
+msgid "Limit log messages"
+msgstr "Limitar registo de mensagens"
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "MSS-Correction"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr "Corresponder"
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"O tráfego encaminhado corresponde a uma determinada porta de destino ou "
+"intervalo de portas."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"O tráfego de entrada corresponde a uma dada porta de destino ou intervalo de "
+"portas neste host"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"O tráfego de entrada corresponde a uma dada porta ou de um intervalo de "
+"portas no host cliente."
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "New SNAT rule"
+msgstr "Nova regra SNAT"
+
+msgid "New forward rule"
+msgstr "Nova regra de encaminhamento"
+
+msgid "New input rule"
+msgstr "Nova regra de entrada"
+
+msgid "New port forward"
+msgstr "Novo encaminhamento de porta"
+
+msgid "New source NAT"
+msgstr "Nova origem de NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Só se tráfego de entrada corresponder ao endereço IP fornecido."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Só se o tráfego de entrada corresponder a um destes MACs."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Só se o tráfego de entrada corresponder a este IP ou intervalo."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Só se o tráfego de entrada corresponder à porta de origem fornecida ou de um "
+"intervalo de portas no host cliente"
+
+msgid "Open ports on router"
+msgstr "Abrir portas no router"
+
+msgid "Other..."
+msgstr "Outro..."
+
+msgid "Output"
+msgstr "Saída"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
+
+msgid "Port Forwards"
+msgstr "Encaminhamento de Portas"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"O Encaminhamento de Portas permite que computadores remotos na internet se "
+"liguem a um computador ou serviço especifico na rede privada (LAN)."
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Redirecionar a entrada de trafego correspondente à porta fornecida no host "
+"interno"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Redirecionar o tráfego de entrada correspondente para o host interno"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr "Restringir a família de endereços"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr "Re-escrever para a origem %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Re-escrever para a origem %s, %s"
+
+msgid "SNAT IP address"
+msgstr "Endereço IP da SNAT"
+
+msgid "SNAT port"
+msgstr "Porta SNAT"
+
+msgid "Source IP address"
+msgstr "Endereço IP de origem"
+
+msgid "Source MAC address"
+msgstr "Endereço MAC de origem"
+
+msgid "Source NAT"
+msgstr "NAT de origem"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"NAT de origem é uma forma especifica de mascarar que permite um controlo "
+"melhorado sobre o IP de origem usado para o tráfego de saída, por exemplo, "
+"para mapear múltiplos endereços para as sub-redes internas."
+
+msgid "Source address"
+msgstr "Endereço de origem"
+
+msgid "Source port"
+msgstr "Porta de origem"
+
+msgid "Source zone"
+msgstr "Zona de origem"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"A firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
+"tráfego."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Esta página permite-lhe alterar as definições avançadas da regra de entrada "
+"de tráfego, tal como correspondências de hosts de origem e destino."
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "Para %s no %s em <var>este dispositivo</var>"
+
+msgid "To %s in %s"
+msgstr "Para %s em %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "Para %s em <var>este dispositivo</var>"
+
+msgid "To %s, %s in %s"
+msgstr "Para %s, %s em %s"
+
+msgid "To source IP"
+msgstr "Para o IP de origem"
+
+msgid "To source port"
+msgstr "Para a porta de origem"
+
+msgid "Traffic Rules"
+msgstr "Regras de Tráfego"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"As Regras de Tráfego definem políticas para os pacotes que viajam entre "
+"diferentes zonas, por exemplo, para rejeitar trafego entre certos hosts ou "
+"para abrir portas WAN no router."
+
+msgid "Via %s"
+msgstr "Via %s"
+
+msgid "Via %s at %s"
+msgstr "Via %s no %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Pode especificar múltiplos seleccionando \"-- personalizado --\" e depois "
+"introduzir os protocolos separados por espaço."
+
+msgid "Zone %q"
+msgstr "Zona %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zona ⇒ Encaminhamentos"
+
+msgid "Zones"
+msgstr "Zonas"
+
+msgid "accept"
+msgstr "aceitar"
+
+msgid "any"
+msgstr "qualquer"
+
+msgid "any host"
+msgstr "qualquer host"
+
+msgid "any router IP"
+msgstr "qualquer IP do router"
+
+msgid "any zone"
+msgstr "qualquer zona"
+
+msgid "don't track"
+msgstr "não seguir"
+
+msgid "drop"
+msgstr "drop"
+
+msgid "reject"
+msgstr "rejeitar"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Destino"
+
+#~ msgid "Source"
+#~ msgstr "Origem"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Porta interna (opcional)"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regras Avançadas"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "As regras avançadas permitem a personalização da firewall de acordo com "
+#~ "as necessidades. Apenas as novas ligações serão processadas. Pacotes que "
+#~ "pertençam a ligações já abertas estão automaticamente autorizados a "
+#~ "passar pela firewall."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Redirecionamento de portas"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "O redirecionamento de portas permite disponibilizar serviços na rede "
+#~ "interna para uma rede externa."
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirecionamento de Tráfego"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Redirecionamento do tráfego permite a alteração do endereço de destino "
+#~ "dos pacotes enviados."
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Redes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Controle de Tráfego"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tráfego de Zona-para-Zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Aqui você pode especificar qual tráfego de rede será permitido para o "
+#~ "fluxo entre zonas das redes. Somente novas conexões serão processadas. "
+#~ "Pacotes pertencentes à conexões já abertas estão automaticamente "
+#~ "permitidos para passar pelo firewall."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destino"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Endereço IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Endereço MAC de origem"
+
+#~ msgid "Custom forwarding"
+#~ msgstr "Redirecionamento personalizado"
+
+#~ msgid "Input Zone"
+#~ msgstr "Zona de Entrada"
+
+#~ msgid "Output Zone"
+#~ msgstr "Zona de Saída"
+
+#~ msgid "External Zone"
+#~ msgstr "Zona Externa"
+
+#~ msgid "Source MAC"
+#~ msgstr "MAC de origem"
+
+#~ msgid "Defaults"
+#~ msgstr "Padrões"
+
+#~ msgid ""
+#~ "These are the default settings that are used if no other rules match."
+#~ msgstr ""
+#~ "Estas são as configurações padrões, que serão usadas se não houver outras "
+#~ "regras."
+
+#~ msgid ""
+#~ "Zones part the network interfaces into certain isolated areas to separate "
+#~ "network traffic. One or more networks can belong to a zone. The MASQ-flag "
+#~ "enables NAT masquerading for all outgoing traffic on this zone."
+#~ msgstr ""
+#~ "Zonas são interfaces de redes usadas para separar o tráfego da rede. Uma "
+#~ "ou mais redes podem pertencer a uma zona. A flag-MASQ ativa o "
+#~ "mascaramento NAT para todo o tráfego de saída desta zona."
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
+
+#~ msgid "contained networks"
+#~ msgstr "redes contidas"
diff --git a/trunk/package/luci/po/pt/freifunk-policyrouting.po b/trunk/package/luci/po/pt/freifunk-policyrouting.po
new file mode 100644
index 00000000..41a6b21b
--- /dev/null
+++ b/trunk/package/luci/po/pt/freifunk-policyrouting.po
@@ -0,0 +1,56 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-31 11:53+0200\n"
+"PO-Revision-Date: 2013-05-31 11:54+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Todo o trafego das interfaces que pertencem a estas zonas será enviado pela "
+"gateway de rede."
+
+msgid "Enable Policy Routing"
+msgstr "Ativar a Politica de Routing"
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr "Zonas da Firewall"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr "Política de Routing"
+
+msgid "Strict Filtering"
+msgstr "Filtragem Estrita"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/pt/freifunk.po b/trunk/package/luci/po/pt/freifunk.po
new file mode 100644
index 00000000..b5b822b8
--- /dev/null
+++ b/trunk/package/luci/po/pt/freifunk.po
@@ -0,0 +1,401 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2009-05-19 17:33+0200\n"
+"Last-Translator: Jose Monteiro <jm@unimos.net>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr "Coordenadas"
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr "email"
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr "Olá e benvindo à rede "
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Se estiver interessado no nosso projecto, entre em contacto com a sua "
+"comunidade local"
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"O acesso à Internet depende de factores técnicos e organizacionais, e pode "
+"funcionar ou não no seu caso."
+
+msgid "It is operated by"
+msgstr "É operado por "
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr "Localização"
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr "Nome curto (nick)"
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr "Notas"
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telefone"
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr "Nome"
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr "Este é o ponto de acesso "
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Somos uma iniciativa para implementação de uma rede livre, independente e "
+"não-comercial."
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "Pode encontrar mais informações sobre a iniciativa global Freifunk em "
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/pt/hd_idle.po b/trunk/package/luci/po/pt/hd_idle.po
new file mode 100644
index 00000000..9ce3829e
--- /dev/null
+++ b/trunk/package/luci/po/pt/hd_idle.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2013-05-31 15:28+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disco"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Enable debug"
+msgstr "Ativar debug"
+
+msgid "Idle-time"
+msgstr "Tempo de ociosidade"
+
+msgid "Idle-time unit"
+msgstr "Unidade de tempo de ociosidade"
+
+msgid "Settings"
+msgstr "Configurações"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle é um programa utilitário para activar o modo \"economia de energia\" "
+"(spinning-down) de discos externos após um período de ociosidade."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
diff --git a/trunk/package/luci/po/pt/meshwizard.po b/trunk/package/luci/po/pt/meshwizard.po
new file mode 100644
index 00000000..41957698
--- /dev/null
+++ b/trunk/package/luci/po/pt/meshwizard.po
@@ -0,0 +1,133 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-03 16:20+0200\n"
+"PO-Revision-Date: 2013-06-03 18:01+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Ativar ou desativar a configuração IPv6 globalmente."
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "Marcar isto para proteger a sua LAN de outros nós ou clientes"
+
+msgid "Cleanup config"
+msgstr "Limpar configuração"
+
+msgid "Configure this interface"
+msgstr "Configurar esta interface"
+
+msgid "DHCP IP range"
+msgstr "Intervalo de IPs DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "O DHCP irá atribuir automaticamente endereços IP aos clientes"
+
+msgid "Enable DHCP"
+msgstr "Ativar DHCP"
+
+msgid "Enable RA"
+msgstr "Ativar RA"
+
+msgid "Enabled"
+msgstr "Ativo"
+
+msgid "General Settings"
+msgstr "Definições Gerais"
+
+msgid "IPv6 Settings"
+msgstr "Definições IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Se isto estiver selecionado a configuração é limpa antes de serem definidas "
+"novas opções na configuração."
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Nota: Isto irá configurar a interface para operação em malha, p. ex. "
+"adicionar à zona 'freifunk' e ativar OLSR."
+
+msgid "Protect LAN"
+msgstr "Proteger LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Ative isto para permitir que outros usem a sua ligação para aceder à "
+"internet."
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Irá ser configurado uma nova interface virtual wireless em modo de Ponto de "
+"Acesso."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Ponto de Acesso Virtual (VAP)"
+
+msgid "Wizard"
+msgstr "Assistente"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "O seu dispositivo e os nós vizinhos têm de usar o mesmo canal."
+
+msgid "recommended"
+msgstr "recomendado"
diff --git a/trunk/package/luci/po/pt/minidlna.po b/trunk/package/luci/po/pt/minidlna.po
new file mode 100644
index 00000000..96132cdf
--- /dev/null
+++ b/trunk/package/luci/po/pt/minidlna.po
@@ -0,0 +1,171 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-03 23:36+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Definições Avançadas"
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr "Número modelo anunciado:"
+
+msgid "Announced serial number:"
+msgstr "Número de série anunciado:"
+
+msgid "Browse directory"
+msgstr "Procurar directório"
+
+msgid "Collecting data..."
+msgstr "A obter dados..."
+
+msgid "Database directory:"
+msgstr "Directório da base de dados:"
+
+msgid "Enable TIVO:"
+msgstr "Ativar TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Ativar inotify:"
+
+msgid "Enable:"
+msgstr "Ativar:"
+
+msgid "Friendly name:"
+msgstr "Nome amigável:"
+
+msgid "General Settings"
+msgstr "Definições Gerais"
+
+msgid "Interfaces:"
+msgstr "Interfaces:"
+
+msgid "Log directory:"
+msgstr "Directório de Log:"
+
+msgid "Media directories:"
+msgstr "Pastas multimédia:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"O MiniDLNA é um software de servidor com o objectivo de ser totalmente "
+"compatível com clientes de DLNA/UPnP-AV."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Número de modelo que o serviço de miniDLNA irá reportar aos clientes na sua "
+"descrição XML."
+
+msgid "Music"
+msgstr "Música"
+
+msgid "Network interfaces to serve."
+msgstr "Interfaces de rede a serem seervidas."
+
+msgid "Notify interval in seconds."
+msgstr "Intervalo de notificação em segundos."
+
+msgid "Notify interval:"
+msgstr "Intervalo de Notificação:"
+
+msgid "Pictures"
+msgstr "Imagens"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Porta para tráfego HTTP (descrições, SOAP, tranferencia de conteudos)."
+
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/pt/mmc_over_gpio.po b/trunk/package/luci/po/pt/mmc_over_gpio.po
new file mode 100644
index 00000000..497c0b09
--- /dev/null
+++ b/trunk/package/luci/po/pt/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-05-31 15:28+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "MMC/SD driver configuration"
+msgstr "Configuração do driver MMC/SD"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Settings"
+msgstr "Definições"
diff --git a/trunk/package/luci/po/pt/multiwan.po b/trunk/package/luci/po/pt/multiwan.po
new file mode 100644
index 00000000..95eeba82
--- /dev/null
+++ b/trunk/package/luci/po/pt/multiwan.po
@@ -0,0 +1,118 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-22 18:29+0200\n"
+"Last-Translator: Low <pedroloureiro1@sapo.pt>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr "Automático"
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr "Servidor(s) DNS"
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr "Endereço de Destino"
+
+msgid "Disable"
+msgstr "Desativar"
+
+msgid "Enable"
+msgstr "Activar"
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr "Nenhum"
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Protocol"
+msgstr "Procotolo"
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr "Endereço de Origem"
+
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr "todos"
diff --git a/trunk/package/luci/po/pt/ntpc.po b/trunk/package/luci/po/pt/ntpc.po
new file mode 100644
index 00000000..70e7952c
--- /dev/null
+++ b/trunk/package/luci/po/pt/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2013-05-01 01:16+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Ajuste do Relógio"
+
+msgid "Count of time measurements"
+msgstr "Quantas vezes irá atualizar"
+
+msgid "Current system time"
+msgstr "Hora actual do sistema"
+
+msgid "General"
+msgstr "Geral"
+
+msgid "Hostname"
+msgstr "Nome do Host"
+
+msgid "Offset frequency"
+msgstr "Frequência do Offset"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Synchronizes the system time"
+msgstr "Sincroniza a hora do sistema"
+
+msgid "Time Server"
+msgstr "Servidor de Hora"
+
+msgid "Time Servers"
+msgstr "Servidores de Hora"
+
+msgid "Time Synchronisation"
+msgstr "Sincronização de Horário"
+
+msgid "Update interval (in seconds)"
+msgstr "Intervalo de Actualização (em s)"
+
+msgid "empty = infinite"
+msgstr "vazio = infinito"
diff --git a/trunk/package/luci/po/pt/olsr.po b/trunk/package/luci/po/pt/olsr.po
new file mode 100644
index 00000000..4e04248f
--- /dev/null
+++ b/trunk/package/luci/po/pt/olsr.po
@@ -0,0 +1,715 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-06-03 16:17+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "Anuncios MID ativos"
+
+msgid "Active OLSR nodes"
+msgstr "Nós OLSR ativos"
+
+#, fuzzy
+msgid "Active host net announcements"
+msgstr "Anuncios activos de hosts"
+
+msgid "Advanced Settings"
+msgstr "Definições Avançadas"
+
+msgid "Allow gateways with NAT"
+msgstr "Permitir gateways com NAT"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "Permitir a selecção de uma gateway IPv4 para saída com NAT"
+
+msgid "Announce uplink"
+msgstr "Anunciar uplink"
+
+msgid "Announced network"
+msgstr "Rede anunciada"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr "Os valores tem de usar a dotação decimal."
+
+msgid "Broadcast address"
+msgstr "Endereço de broadcast"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "Mostrar"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr "Descarregar Configuração"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"Ativar SmartGateway. Se estiver desativado, então todos os outros parâmetros "
+"SmartGateway são ignorados. Por defeito é \"não\""
+
+msgid "Enable this interface."
+msgstr "Ativar esta interface."
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid "Expected retransmission count"
+msgstr "Contagem de retransmissões esperada"
+
+msgid "FIB metric"
+msgstr "métrica FIB"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr "Definições gerais"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr "Intervalo entre HNA"
+
+msgid "HNA validity time"
+msgstr "Validade de HNA"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "OLSR - Anuncios HNA4"
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr "Intervalo entre Hello"
+
+msgid "Hello validity time"
+msgstr "Validade de Hello"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr "Endereços IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "Endereço IPv4 de Broadcast"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "Multicast IPv6"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"A rede IPv6 deve ser fornecido em dotação completa, o prefixo deve estar na "
+"notação CIDR."
+
+msgid "IPv6 source"
+msgstr "Origem IPv6"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+"O Modo de Interface é usado para para prevenir encaminhamentos "
+"desnecessários de pacotes em interfaces switched ethernet. Os Modos válidos "
+"são \"mesh\" e \"ether\". Por defeito é \"mesh\"."
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interfaces Defaults"
+msgstr "Predefinições das Interfaces"
+
+msgid "Internet protocol"
+msgstr "Protocolo de Internet"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "Rotas OLSR conhecidas"
+
+msgid "LQ"
+msgstr "LQ"
+
+msgid "LQ aging"
+msgstr "Envelhecimento LQ"
+
+msgid "LQ algorithm"
+msgstr "Algoritmo LQ"
+
+#, fuzzy
+msgid "LQ fisheye"
+msgstr "LQ Fisheye"
+
+msgid "LQ level"
+msgstr "Nível LQ"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "Ultimo salto"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Library"
+msgstr "Biblioteca"
+
+msgid "Link Quality Settings"
+msgstr "Definições de Qualidade do Link"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr "Endereço IP do interface local"
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr "Intervalo de MID"
+
+msgid "MID validity time"
+msgstr "Validade de MID"
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr "IP Principal"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr "Vizinhos"
+
+msgid "Neighbour IP"
+msgstr "Endereço IP do Vizinho"
+
+msgid "Neighbours"
+msgstr "Vizinhos"
+
+msgid "Netmask"
+msgstr "Máscara de rede"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Network address"
+msgstr "Endereço de rede"
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr "Nós"
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - Anuncios HNA4"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - Anuncios HNA4"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Plugins"
+
+msgid "OLSR Daemon"
+msgstr "Servidor OLSR"
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr "OLSR - Ligações"
+
+msgid "OLSR gateway"
+msgstr "Gateway OLSR"
+
+msgid "OLSR node"
+msgstr "Nó OLSR"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+#, fuzzy
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Resumo de anuncios activos de hosts"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Resumo das ligações OLSR actualmente estabelecidas"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Resumo dos nós OLSR conhecidos"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Resumo das rotas conhecidas para outros nós OLSR"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Resumo de anuncios de nós com multiplos interfaces activos"
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr "Configuração de Plugin"
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr "Pollrate"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Prefix"
+msgstr "Prefixo"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr "Rotas"
+
+msgid "Secondary OLSR interfaces"
+msgstr "Interfaces OLSR secundários"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr "Endereço de origem"
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr "Velocidade do uplink"
+
+msgid "State"
+msgstr "Estado"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr "Intervalo de TC"
+
+msgid "TC validity time"
+msgstr "Validade de TC"
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr "Topologia"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Não foi possivel ligar ao servidor OLSR!"
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr "O uplink usa NAT"
+
+msgid "Use hysteresis"
+msgstr "Usar histerese"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Versão"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr "Disponibilidade"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Certifique-se que o processo olsrd está em execução, que o plugin "
+#~ "\"txtinfo\" está carregado e configurado para a porta 2006 e que aceita "
+#~ "ligações a partir de \"127.0.0.1\"."
diff --git a/trunk/package/luci/po/pt/openvpn.po b/trunk/package/luci/po/pt/openvpn.po
new file mode 100644
index 00000000..9da2d956
--- /dev/null
+++ b/trunk/package/luci/po/pt/openvpn.po
@@ -0,0 +1,559 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-06-03 13:43+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', ou 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Aceitar opções enviadas pelo servidor"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Add route after establishing connection"
+msgstr "Adicionar rota após estabelecimento da ligação"
+
+msgid "Additional authentication over TLS"
+msgstr "Autenticação adicional por TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Permitir tráfego cliente-a-cliente"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Permitir multiplos clientes com o mesmo certificado"
+
+msgid "Allow only one session"
+msgstr "Permitir apenas uma sessão"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Permitir a um host remoto que altere o seu IP ou porta"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Máximo permitido de clientes ligados"
+
+msgid "Allowed maximum of internal"
+msgstr "Máximo permitido internamente para rotas de clientes"
+
+msgid "Allowed maximum of new connections"
+msgstr "Maximo permitido de novas ligações"
+
+msgid "Append log to file"
+msgstr "Acrescentar registos ao ficheiro"
+
+msgid "Authenticate using username/password"
+msgstr "Autenticar com username/password"
+
+msgid "Automatically redirect default route"
+msgstr "Redireccionar automaticamente a rota pre-definida"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Abaixo está uma lista de todas as instâncias OpenVPN configuradas e o seu "
+"estado actual"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "Executar o comando/script antes do fecho tun/tap"
+
+msgid "Certificate authority"
+msgstr "Autoridade certificadora"
+
+msgid "Change process priority"
+msgstr "Alterar prioridade do processo"
+
+msgid "Change to directory before initialization"
+msgstr "Mudar para o directório antes da inicialização"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Verificar certificado do remoto conta uma CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Chroot para o directorio apos a inicialização"
+
+msgid "Client is disabled"
+msgstr "Cliente desativado"
+
+msgid "Configuration category"
+msgstr "Categoria da configuração"
+
+msgid "Configure client mode"
+msgstr "Configurar modo cliente"
+
+msgid "Configure server bridge"
+msgstr "Configurar bridge de servidor"
+
+msgid "Configure server mode"
+msgstr "Configurar modo de servidor"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Ligar através de um proxy Socks5"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Ligar ao host remoto através de um proxy HTTP"
+
+msgid "Connection retry interval"
+msgstr "Intervalo de reestabelecimento de ligação"
+
+msgid "Cryptography"
+msgstr "Criptografia"
+
+msgid "Daemonize after initialization"
+msgstr "Passar a daemon após a inicialização"
+
+msgid "Delay n seconds after connection"
+msgstr "Aguardar n segundos após a ligação"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Retardar o script de abertura/ativação tun/tap"
+
+msgid "Diffie Hellman parameters"
+msgstr "Parametros Diffie-Hellman"
+
+msgid "Directory for custom client config files"
+msgstr "Directório para configurações personalizadas dos clientes"
+
+msgid "Disable Paging"
+msgstr "Desativar Paging"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Desativar o vector de inicialização da cifra"
+
+msgid "Disable options consistency check"
+msgstr "Desativar opções de verificação de consistência"
+
+msgid "Disable replay protection"
+msgstr "Desativar protecção contra replay"
+
+msgid "Do not bind to local address and port"
+msgstr "Não vincular o endereço e porta locais"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Não executar ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "Não adicionar rotas automaticamente"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "Não colocar em cache as passwords --askpass ou --auth-user-pass "
+
+msgid "Don't inherit global push options"
+msgstr "Não herdar as opções globais de envio (push)"
+
+msgid "Don't log timestamps"
+msgstr "Não registar timestamps"
+
+msgid "Don't re-read key on restart"
+msgstr "Não reler a chave entre reinicios"
+
+msgid "Don't require client certificate"
+msgstr "Não solicitar certificado ao cliente"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Não usar compressão LZO adaptiva"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Não avisar quando existirem inconsistencias no ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Escrever parametros no registo"
+
+msgid "Empirically measure MTU"
+msgstr "Medição empírica de MTU"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Ativar motor OpenSSL por hardware"
+
+msgid "Enable Path MTU discovery"
+msgstr "Ativar a descoberta do MTU do caminho"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Ativar modo de encriptação por chave estática (não-TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Activar TLS e assumir papel de cliente"
+
+msgid "Enable TLS and assume server role"
+msgstr "Activar TLS e assumir papel de servidor"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Activar a fragmentação interna de datagramas"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Activar o interface de gestão em <em>IP</em> <em>porta</em>"
+
+msgid "Enabled"
+msgstr "Activado"
+
+msgid "Encryption cipher for packets"
+msgstr "Cifra de encriptação para pacotes"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Executar o comando shell após as rotas serem adicionadas"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Executar o comando shell quando existir alteração do IP remoto"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+"Executado em modo de servidor em novas ligações de cliente, quando o cliente "
+"ainda não é de confiável"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+"Executado em modo de servidor quando um endereço IPv4/rota ou endereço MAC é "
+"adicionado à tabela interna de roteamento do OpernVPN."
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Fechar quando existir falha na negociação TLS"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
+
+msgid "HMAC authentication for packets"
+msgstr "Autenticação HMAC para pacotes"
+
+msgid "Handling of authentication failures"
+msgstr "Gestão de falhas de autenticação"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+"Directiva auxiliar para simplificar a expressão de --ping e --ping-restart "
+"nas configurações do modo servidor"
+
+msgid "If hostname resolve fails, retry"
+msgstr "Se a resolução de nomes falhar, tentar novamente"
+
+msgid "Instance \"%s\""
+msgstr "Instância \"%s\""
+
+msgid "Invalid"
+msgstr "Inválido"
+
+msgid "Keep local IP address on restart"
+msgstr "Manter o endereço IP local entre reinicios"
+
+msgid "Keep remote IP address on restart"
+msgstr "Manter o endereço IP remoto entre reinicios"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Manter o dispositivo tun/tap aberto entre reinicios"
+
+msgid "Key transition window"
+msgstr "Janela para transição de chaves"
+
+msgid "Limit repeated log messages"
+msgstr "Limitar repetição de entradas no registo"
+
+msgid "Local certificate"
+msgstr "Certificado local"
+
+msgid "Local host name or ip address"
+msgstr "Hostname ou endereço IP local"
+
+msgid "Local private key"
+msgstr "Chave privada local"
+
+msgid "Major mode"
+msgstr "Modo principal"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Tornar o dispositivo tun capaz de IPv6"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Maximo de pacotes TCP na queue de output"
+
+msgid "Networking"
+msgstr "Rede"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Numero de buffers de broadcast alocados"
+
+msgid "Number of lines for log file history"
+msgstr "Numero de linhas para o historico do registo"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Aceitar ligações apenas de um dado nome X509"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Só processar timeouts de pings se existirem rotas"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Instâncias OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Optimizar as escritas TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Registos para o syslog e não passar a daemon"
+
+msgid "Overview"
+msgstr "Visão Geral"
+
+msgid "PKCS#12 file containing keys"
+msgstr "Ficheiro PKCS#12 com chaves"
+
+msgid "Pass environment variables to script"
+msgstr "Passar variaveis de ambiente ao script"
+
+msgid "Persist replay-protection state"
+msgstr "Manter persistência da protecção replay"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Manter ou não o conjunto de subredes"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Pingar o remoto a cada n segundos sobre a porta TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr "Nível da política sobre o uso de programas externos e scripts"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Proxy timeout in seconds"
+msgstr "Timeout do proxy em segundos"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Enviar uma opção ifconfig ao remoto"
+
+msgid "Push options to peer"
+msgstr "Enviar opções ao remoto"
+
+msgid "Query management channel for private key"
+msgstr "Solicitar chave privada ao canal de gestão"
+
+msgid "Randomly choose remote server"
+msgstr "Escolher o server remoto aleatoriamente"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Recusar ligações de clientes que não tenham configurações "
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Mapear os sinais SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Hostname endereço IP remoto"
+
+msgid "Remote ping timeout"
+msgstr "Timeout do ping remoto"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Renegociar chave do canal de dados após n bytes "
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Renegociar chave do canal de dados após n pacotes"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Renegociar chave do canal de dados após n segundos"
+
+msgid "Replay protection sliding window size"
+msgstr "Tamanho da janela de protecção conta replay"
+
+msgid "Require explicit designation on certificate"
+msgstr "Requerer designação específica no certificado"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Requerer utilização explicita de utilização de chave no certificado"
+
+msgid "Restart after remote ping timeout"
+msgstr "Reiniciar após timeout do ping remoto"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Timeout de retransmissão no canal de controlo TLS"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Tentar infinitamente sempre que existam erros de proxy HTTP"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Tentar continuamente a ligação quando existirem erros de proxy Socks"
+
+msgid "Route subnet to client"
+msgstr "Encaminhar rota da subrede para o cliente"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Executar via inetd ou xinetd"
+
+msgid "Run script cmd on client connection"
+msgstr "Executar script quando o cliente ligar"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Executar script quando o cliente desligar"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Executar scripts de abertura/activação para todos os reinicios"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Notificar remoto ao desligar"
+
+msgid "Service"
+msgstr "Serviço"
+
+msgid "Set GID to group"
+msgstr "Assumir GID para o grupo"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Definir o MTU TCP/UDP"
+
+msgid "Set UID to user"
+msgstr "Assumir UID para o utilizador"
+
+msgid "Set aside a pool of subnets"
+msgstr "Reservar um conjunto de subredes"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Definir opções extra para o proxy HTTP"
+
+msgid "Set output verbosity"
+msgstr "Definir verbosidade do registo"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Definir tamanho das tabelas hash de endereços reais e virtuais"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Definir o buffer de recepção TCP/UDP"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Definir o buffer de envio TCP/UDP"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Definir o tamanho da queue de transmissão tun/tap"
+
+msgid "Set tun/tap adapter parameters"
+msgstr "Definir os parâmetros do adaptador tun/tap"
+
+msgid "Set tun/tap device MTU"
+msgstr "Definir o MTU do dispositivo tun/tap"
+
+msgid "Set tun/tap device overhead"
+msgstr "Definir o overhead do dispositivo tun/tap"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Definir tecto do MSS TCP"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Restringir a largura de banda ao remoto"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Comando shell a executar após abertura do dispositivo tun"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Comando shell a executar após fecho do dispositivo tun"
+
+msgid "Shell command to verify X509 name"
+msgstr "Comando shell para verificar o nome X509"
+
+msgid "Silence the output of replay warnings"
+msgstr "Silenciar o output dos avisos de replay"
+
+msgid "Size of cipher key"
+msgstr "Tamanho da chave de cifra"
+
+msgid "Specify a default gateway for routes"
+msgstr "Especificar uma gateway para as rotas"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Iniciar o OpenVPN em estado de hibernação"
+
+msgid "Start/Stop"
+msgstr "Iniciar/Parar"
+
+msgid "Started"
+msgstr "Iniciado"
+
+msgid "Status file format version"
+msgstr "Versão de formato do ficheiro de estado"
+
+msgid "Switch to advanced configuration »"
+msgstr "Mudar para configuração avançada"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Porta TCP/UDP para local e remoto"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Porta TCP/UDP para local (predefinição=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Porta TCP/UDP para remoto (predefinição=1194)"
+
+msgid "TLS cipher"
+msgstr "Cifra TLS"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "Passthrough TOS (aplicavel apenas a IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Directório temporário para ficheiro de retorno de ligação-cliente"
+
+msgid "Timeframe for key exchange"
+msgstr "Janela temporal para troca de chaves"
+
+msgid "Type of used device"
+msgstr "Tipo de dispositivo utilizado"
+
+msgid "Use fast LZO compression"
+msgstr "Usar compressão LZO rápida"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Usar endereços individuais em vez de subredes /30"
+
+msgid "Use protocol"
+msgstr "Usar protocolo"
+
+msgid "Use tun/tap device node"
+msgstr "Utilizar dispositivo tun/tap"
+
+msgid "Use username as common name"
+msgstr "Usar o username como nome comum"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "Escrever registo para o ficheiro"
+
+msgid "Write process ID to file"
+msgstr "Escrever PID no ficheiro"
+
+msgid "Write status to file every n seconds"
+msgstr "Escrever estado para ficheiro a cada n segundos"
+
+msgid "no"
+msgstr "não"
+
+msgid "tun/tap device"
+msgstr "Dispositivo tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr "Timeout de inactividade tun/tap"
+
+msgid "yes (%i)"
+msgstr "sim (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "Mudar para configuração básica"
diff --git a/trunk/package/luci/po/pt/p2pblock.po b/trunk/package/luci/po/pt/p2pblock.po
new file mode 100644
index 00000000..365f9f27
--- /dev/null
+++ b/trunk/package/luci/po/pt/p2pblock.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-01 01:17+0200\n"
+"PO-Revision-Date: 2013-05-01 01:30+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "Tempo a bloquear"
+
+msgid "Enable P2P-Block"
+msgstr "Activar Bloqueio P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Portocolos Layer7"
+
+msgid "P2P-Block"
+msgstr "Bloqueio P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"Bloqueio P2P é um mecanismo lista verde para bloquear vários protocolos "
+"peer-to-peer para clientes que não se encontram na lista branca"
+
+msgid "Portrange"
+msgstr "Intervalo de Portas"
+
+msgid "Whitelisted IPs"
+msgstr "IPs na lista branca"
+
+msgid "seconds"
+msgstr "segundos"
diff --git a/trunk/package/luci/po/pt/p910nd.po b/trunk/package/luci/po/pt/p910nd.po
new file mode 100644
index 00000000..734967e8
--- /dev/null
+++ b/trunk/package/luci/po/pt/p910nd.po
@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-05-01 00:41+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Modo bidirecional"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Primeiro você deve instalar os pacotes para obter suporte USB (kmod-usb-"
+"printer) ou porta paralela (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Settings"
+msgstr "Definições"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "Porta TCP ouvinte"
+
+msgid "enable"
+msgstr "activar"
+
+msgid "p910nd - Printer server"
+msgstr "P910nd - Servidor de impressão"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd escuta na porta 910+N. Ex. 9100 para a primeira impressora."
diff --git a/trunk/package/luci/po/pt/pbx-voicemail.po b/trunk/package/luci/po/pt/pbx-voicemail.po
new file mode 100644
index 00000000..f5cfd89e
--- /dev/null
+++ b/trunk/package/luci/po/pt/pbx-voicemail.po
@@ -0,0 +1,91 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-03 18:28+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr "Ativar Voicemail"
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr "Não"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Servidor de Envio de mail (SMTP)"
+
+msgid "SMTP Password"
+msgstr "Password SMTP"
+
+msgid "SMTP Port Number"
+msgstr "Porta SMTP"
+
+msgid "SMTP Server Authentication"
+msgstr "Servidor de Autenticação SMTP"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "Nome ou Endereço IP do Servidor SMTP"
+
+msgid "SMTP User Name"
+msgstr "Utilizador SMTP"
+
+msgid "Secure Connection Using TLS"
+msgstr "Ligação Segura usando TLS"
+
+msgid "Voicemail Setup"
+msgstr "Configuração do Voicemail"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr "Sim"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/pt/pbx.po b/trunk/package/luci/po/pt/pbx.po
new file mode 100644
index 00000000..75b6c8cd
--- /dev/null
+++ b/trunk/package/luci/po/pt/pbx.po
@@ -0,0 +1,487 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-22 19:17+0200\n"
+"Last-Translator: Low <pedroloureiro1@sapo.pt>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponível"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Nome Completo"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr "Não"
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "Sim"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/pt/polipo.po b/trunk/package/luci/po/pt/polipo.po
new file mode 100644
index 00000000..cdce586d
--- /dev/null
+++ b/trunk/package/luci/po/pt/polipo.po
@@ -0,0 +1,305 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-06-02 19:10+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Definições avançadas"
+
+msgid "Allowed clients"
+msgstr "Clientes permitidos"
+
+msgid "Always use system DNS resolver"
+msgstr "Usar sempre o resolvedor DNS de Sistema"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"É suportada a autenticação basica HTTP. Indique username e password no "
+"formato username:password."
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "DNS and Query Settings"
+msgstr "Definições de DNS e de Consulta"
+
+msgid "DNS server address"
+msgstr "Endereço do servidor DNS"
+
+msgid "Delete cache files time"
+msgstr "Tempo para remoção dos ficheiros de cache"
+
+msgid "Disk cache location"
+msgstr "Localização da cache em disco"
+
+msgid "Do not query IPv6"
+msgstr "Não consulta o IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Activar se a cache (proxy) for partilhada por multiplos utilizadores."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Tamanho do primeiro segmento PMM (em bytes)"
+
+msgid "General Settings"
+msgstr "Definições Gerais"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Quanta memória RAM deverá ser usada pelo polipo para cache."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Tamanho da cache em RAM (bytes)"
+
+msgid "Listen address"
+msgstr "Endereço de escuta"
+
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Local onde o polipo guardará permanentemente os ficheiros de cache. É "
+"recomendada a utilização de dispositivos de armazenamento remoto devido ao "
+"grande crescimento da cache. Deixe em branco para desactivar a cache em "
+"disco."
+
+msgid "Log file location"
+msgstr "Localização do ficheiro de registo"
+
+msgid "Log to syslog"
+msgstr "Registar para o syslog"
+
+msgid "Logging and RAM"
+msgstr "RAM e Logging"
+
+msgid "Never use system DNS resolver"
+msgstr "Nunca usar o DNS de sistema"
+
+msgid "On-Disk Cache"
+msgstr "Cache em disco"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Tamanho do segmento PMM (em bytes)"
+
+msgid "Parent Proxy"
+msgstr "Proxy Superior"
+
+msgid "Parent proxy address"
+msgstr "Endereço do proxy de hierarquia superior."
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Endereço do proxy de hierarquia superior (no formato host:porta), ao qual o "
+"polipo irá encaminhar os seus pedidos."
+
+msgid "Parent proxy authentication"
+msgstr "Autenticação em cache de hierarquia superior"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Estado do Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "O polipo é um proxy web ligeiro e rápido."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Multiplexagem simples"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
+"da requesição de um pedido em multiplos segmentos. O método tenta baixar a "
+"latencia causada pela debilidade do protocolo HTTP. Nota: alguns sites web "
+"não funcionam com a activação de PMM."
+
+msgid "Port on which Polipo will listen"
+msgstr "Porta na qual o Polipo irá escutar"
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr "Pedidos ao DNS através de hostname"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr "Consultar o DNS diretamente, voltar à resolução de nomes do sistema"
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+"Consultar o DNS diretamente, para hosts desconhecidos voltar à resolução de "
+"nomes de sistema"
+
+msgid "Query DNS for IPv6"
+msgstr "Consultar DNS para o IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "Consultar IPv4 e IPv6, preferência por IPv4"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "Consultar IPv4 e IPv6, preferência por IPv6"
+
+msgid "Query only IPv6"
+msgstr "Consultar apenas IPv6"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Define o endereço do servidor de DNS a usar, caso pretenda que o polipo "
+"utilize um servidor alternativo ao do sistema."
+
+msgid "Shared cache"
+msgstr "Cache partilhada"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
+"dobro do tamanho do segmento PMM."
+
+msgid "Size to which cached files should be truncated"
+msgstr "Tamanho a partir do qual os ficheiro em cache devem ser truncados"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Syslog facility"
+msgstr "Categoria dos eventos polipo no registo do sistema"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"O interface no qual o polipo será activado. Para activar em todos os "
+"endereços, use 0.0.0.0 ou :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr "Tempo após o qual os ficheiro em cache devem ser eliminados"
+
+msgid "Time after which cached files will be truncated"
+msgstr "Tempo após o qual os ficheiro em cache devem ser truncados"
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+"Para ativar PMM, o tamanho do segmento PMM tem de ser definido para um valor "
+"positivo."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Tamanho de trancagem dos ficheiros de cache (bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Tempo de trancagem dos ficheiros de cache"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"É recomendado o recurso a sistemas de armazenamento de ficheiros externos, "
+"devido ao rápido crescimento do ficheiro de registo."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+"Quando o endereço de escuta está definido como 0.0.0.0 ou :: (IPv6), tem de "
+"listar os clientes que estão autorizados a ligar. O formato do endereço IP "
+"ou o endereço de rede (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 "
+"(IPv6))"
+
+msgid "enable"
+msgstr "ativar"
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Para activar a limpeza de cache em disco (altamente recomendado), deve "
+#~ "acrescentar uma tarefa cron (\"Serviços\") que execute o script /usr/sbin/"
+#~ "polipo_purge. Como exemplo, para executar uma limpeza da cache "
+#~ "diariamente pelas 06H00 deve acrescentar a seguinte linha: \"0 6 * * * /"
+#~ "usr/sbin/polipo_purge\" (sem as aspas)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
+#~ "definido: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
+#~ "definido: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Tempo apos o qual os ficheiros de cache serão removidos. (valor pré-"
+#~ "definido: 32d)"
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar "
+#~ "os clientes que tiverem permissão para ligação. O formato é endereço de "
+#~ "host ou endereço de rede (192.168.1.123, 192.168.1.0/24, "
+#~ "2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
+#~ "happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false=nunca usar o resolver do sistema; reluctantly=pedir DNS "
+#~ "directamente, se o servidor DNS estiver indisponivel recorrer do resolver "
+#~ "DNS do sistema; happily=pedir DNS directamente, se o host nao for "
+#~ "encontrado, recorrer ao resolver DNS do sistema; true=Usar sempre o "
+#~ "resolver DNS do sistema"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Para activar PMM, o tamanho do segmento PMM deve ser definido para um "
+#~ "qualquer valor positivo."
diff --git a/trunk/package/luci/po/pt/qos.po b/trunk/package/luci/po/pt/qos.po
new file mode 100644
index 00000000..2299a784
--- /dev/null
+++ b/trunk/package/luci/po/pt/qos.po
@@ -0,0 +1,122 @@
+#  qos.po
+#  generated from ./applications/luci-qos/luasrc/i18n/qos.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2013-05-31 23:49+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Calcular Overhead"
+
+msgid "Classification Rules"
+msgstr "Regras de Classificação"
+
+msgid "Classification group"
+msgstr "Grupo de Classificação"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Host de destino"
+
+msgid "Download speed (kbit/s)"
+msgstr "Velocidade de Download (kbit/s)"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Half-duplex"
+msgstr "Half-duplex"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Number of bytes"
+msgstr "Número de bytes"
+
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Qualidade de Serviço"
+
+msgid "Service"
+msgstr "Serviço"
+
+msgid "Source host"
+msgstr "Host de origem"
+
+msgid "Target"
+msgstr "Host de destino"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Velocidade de Upload (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Com o <abbr title=\"Qualidade de Serviço\">QoS</abbr> pode dar prioridade ao "
+"tráfego na rede por endereço, portas ou serviço."
+
+msgid "all"
+msgstr "todos"
+
+msgid "default"
+msgstr "Por defeito"
+
+msgid "express"
+msgstr "expressa"
+
+msgid "low"
+msgstr "baixa"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "prioridade"
+
+#~ msgid "Downlink"
+#~ msgstr "Link para download"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Ligação à Internet"
+
+#~ msgid "Uplink"
+#~ msgstr "Link para upload"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "qos_connbytes"
+
+#~ msgid "Prioritization"
+#~ msgstr "Priorização"
+
+#~ msgid "source network / source host"
+#~ msgstr "rede de origem / host de origem"
+
+#~ msgid "target network / target host"
+#~ msgstr "rede de destino / host de destino"
+
+#~ msgid "portrange"
+#~ msgstr "faixa de portas"
+
+#~ msgid "Bytes sent"
+#~ msgstr "Bytes enviados"
diff --git a/trunk/package/luci/po/pt/radvd.po b/trunk/package/luci/po/pt/radvd.po
new file mode 100644
index 00000000..8e0fb01a
--- /dev/null
+++ b/trunk/package/luci/po/pt/radvd.po
@@ -0,0 +1,368 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-21 04:06+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/pt/rrdtool.po b/trunk/package/luci/po/pt/rrdtool.po
new file mode 100644
index 00000000..6abbaf7c
--- /dev/null
+++ b/trunk/package/luci/po/pt/rrdtool.po
@@ -0,0 +1,359 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-06-02 21:10+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Wireless - Relação Sinal/Ruido"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Nivel de Ruido"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Forca do Sinal"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Wireless - Qualidade do Sinal"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Qualidade do Sinal"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: Tempo de resposta ICMP"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Firewall - Pacotes Processados"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pacote/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Cadeia \"%di\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - Transferencia na %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bytes (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - Pacotes na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Packets/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Processado (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Dropado    (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Erros      (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - Multicast na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pacote/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Pacotes"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - Colisoes na %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Colisao(es)"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Colisoes"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Erros na %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Erro/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Processos"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Processo/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Processo %pi - tempo usado da cpu"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "sistema"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "utilizador"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Processo %pi - threads e processos"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Contagem"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Prcesso %pi - pagina de erros"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Pagina de erros"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "pagina de erros"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Processo %pi - tamanho da memoria virtual"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "memoria virtual"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Usado no Processado #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Transferencia na %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Pacotes na %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pacote/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: Ligações TCP na Porta %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Ligação(ões)"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Utilizacao de Espaco em Disco em %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Interrupcoes"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Erro/s"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Carga do Sistema"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Carga"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 min"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 min"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 min"
diff --git a/trunk/package/luci/po/pt/samba.po b/trunk/package/luci/po/pt/samba.po
new file mode 100644
index 00000000..4c5a2cd2
--- /dev/null
+++ b/trunk/package/luci/po/pt/samba.po
@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-05-01 01:13+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permitir Convidados"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Utilizadores do sistema poderão aceder ao seu directório home através das "
+"partilhas de rede."
+
+msgid "Allowed users"
+msgstr "Utilizadores Permitidos"
+
+msgid "Create mask"
+msgstr "Criar Máscara"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Directory mask"
+msgstr "Máscara do Directório"
+
+msgid "Edit Template"
+msgstr "Editar Template"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Editar a template que é utilizada para gerar a configuração samba"
+
+msgid "General Settings"
+msgstr "Definições Gerais"
+
+msgid "Hostname"
+msgstr "Nome do host"
+
+msgid "Mask for new directories"
+msgstr "Máscara para novos directórios"
+
+msgid "Mask for new files"
+msgstr "Máscara para novos ficheiros"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Shares"
+msgstr "Partilhas da Rede"
+
+msgid "Path"
+msgstr "Caminho"
+
+msgid "Read-only"
+msgstr "Apenas Leitura"
+
+msgid "Share home-directories"
+msgstr "Partilha de directórios home"
+
+msgid "Shared Directories"
+msgstr "Directórios Partilhados"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Isto é o conteúdo do ficheiro 'etc/samba/smb.conf.template' a partir do qual "
+"será gerado o ficheiro de configuração do samba. Os valores entre o símbolo "
+"| não devem ser alterados. Eles recebem os valores do separador 'Definições "
+"Gerais'."
+
+msgid "Workgroup"
+msgstr "Grupo de trabalho"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Diretório Compartilhado"
+
+#~ msgid "Physical Path"
+#~ msgstr "Caminho Físico"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/trunk/package/luci/po/pt/splash.po b/trunk/package/luci/po/pt/splash.po
new file mode 100644
index 00000000..05bee4f3
--- /dev/null
+++ b/trunk/package/luci/po/pt/splash.po
@@ -0,0 +1,309 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-31 22:29+0200\n"
+"PO-Revision-Date: 2013-06-03 12:17+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Aceitar"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr "Clientes Activos"
+
+msgid "Allowed hosts/subnets"
+msgstr "Hosts/Subnets permitidos"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr "Bloqueado"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr "Aceitando estas regras só pode usar esta regra para"
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr "A velocidade de upload está limitado a (kbyte/s)"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Decline"
+msgstr "Declinar"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "Doe algum dinheiro para nos ajudar a manter este projeto vivo."
+
+msgid "Download limit"
+msgstr "Limite de Download"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr "Zona de Firewall"
+
+msgid "General"
+msgstr "Geral"
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nome de Host"
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+"Se tem o seu próprio equipamento de rede wireless, use canais diferentes dos "
+"nossos."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr "Endereço MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "Endereços MAC nesta lista estão bloqueados."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr "Mascara de Rede"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "No clients connected"
+msgstr "Não há clientes ligados"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr "Gravar"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr "Limite de Upload"
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr "Bem-vindo"
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr "A largura de banda está limitada a"
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr "desconhecido"
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/pt/statistics.po b/trunk/package/luci/po/pt/statistics.po
new file mode 100644
index 00000000..7a71434a
--- /dev/null
+++ b/trunk/package/luci/po/pt/statistics.po
@@ -0,0 +1,668 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-06-01 00:10+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Ação (destino)"
+
+msgid "Add command for reading values"
+msgstr "Adicionar comando para leitura de valores"
+
+msgid "Add matching rule"
+msgstr "Adicionar regra"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Adicionar hosts múltiplos separados por espaço."
+
+msgid "Add notification command"
+msgstr "Adicionar o comando de notificação"
+
+msgid "Base Directory"
+msgstr "Diretório Base"
+
+msgid "Basic monitoring"
+msgstr "Monitoramento básico"
+
+msgid "CPU Plugin Configuration"
+msgstr "Configuração do plugin CPU"
+
+msgid "CSV Output"
+msgstr "Formato CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Configuração do plugin CSV"
+
+msgid "Cache collected data for"
+msgstr "Cache dos dados coletados"
+
+msgid "Cache flush interval"
+msgstr "Intervalo de limpeza do cache"
+
+msgid "Chain"
+msgstr "Cadeia"
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Configurações do Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd é um pequeno daemon que coleta dados de várias fontes através de "
+"diferentes plugins. Nesta página você pode alterar as configurações gerais "
+"do daemon collectd."
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr "Configuração do plugin DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Configuração do plugin DNS"
+
+msgid "Data collection interval"
+msgstr "Intervalo da coleta de dados"
+
+msgid "Datasets definition file"
+msgstr "Arquivo com a definição de dados"
+
+msgid "Destination ip range"
+msgstr "IP de destino"
+
+msgid "Directory for collectd plugins"
+msgstr "Diretório para os plugins do collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Diretório para sub-configurações"
+
+msgid "Disk Plugin Configuration"
+msgstr "Configuração do plugin Disco"
+
+msgid "Disk Space Usage"
+msgstr "Utilização de espaço em disco"
+
+msgid "Disk Usage"
+msgstr "Utilização do Disco"
+
+msgid "Display Host »"
+msgstr "Mostrar Host »"
+
+msgid "Display timespan »"
+msgstr "Mostrar intervalo »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Configuração do plugin E-Mail"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable this plugin"
+msgstr "Habilitar este plugin"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Configuração do plugin Exec"
+
+msgid "Filter class monitoring"
+msgstr "Monitoramento das Classes de Filtros"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Limpar cache após"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Transmissão entre o endereço de escuta e dos servidores"
+
+msgid "Graphs"
+msgstr "Gráficos"
+
+msgid "Group"
+msgstr "grupo"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Aqui pode definir comandos externos que serão iniciados pelo collectd a fim "
+"de ler determinados valores. Os valores serão lidos a partir do stdout."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Aqui pode definir os comandos externos que serão iniciados pelo collectd "
+"quando determinados valores limite forem  atingidos. Os valores passados ao "
+"comando serão enviados para o stdin."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Aqui você pode definir diversos critérios para as regras iptables "
+"selecionadas serem monitoradas."
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr "Configuração do plugin IRQ"
+
+msgid "Ignore source addresses"
+msgstr "Ignorar endereços de origem"
+
+msgid "Incoming interface"
+msgstr "Interface de entrada"
+
+msgid "Interface Plugin Configuration"
+msgstr "Configuração do plugin Interface"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interrupts"
+msgstr "Interrupções"
+
+msgid "Interval for pings"
+msgstr "Intervalo dos pings"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Configuração do plugin Iptables"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Deixar desmarcada para determinar automaticamente as interfaces a "
+"monitorizar."
+
+msgid "Listen host"
+msgstr "Endereço de escuta do Host"
+
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+msgid "Listener interfaces"
+msgstr "Escutar na(s) interface(s)"
+
+msgid "Load Plugin Configuration"
+msgstr "Configuração do plugin carga"
+
+msgid "Maximum allowed connections"
+msgstr "Máximo de conexões permitidas"
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Memory Plugin Configuration"
+msgstr "Configuração do Plugin de Memória"
+
+msgid "Monitor all except specified"
+msgstr "Monitorizar tudo excepto os especificados"
+
+msgid "Monitor all local listen ports"
+msgstr "Monitorar todas as portas locais"
+
+msgid "Monitor devices"
+msgstr "Monitorar dispositivos"
+
+msgid "Monitor disks and partitions"
+msgstr "Monitoras discos e partições"
+
+msgid "Monitor filesystem types"
+msgstr "Monitorar tipos de sistemas de arquivos"
+
+msgid "Monitor hosts"
+msgstr "Monitorar os hosts"
+
+msgid "Monitor interfaces"
+msgstr "Monitorizar interfaces"
+
+msgid "Monitor interrupts"
+msgstr "Monitorar interrupções"
+
+msgid "Monitor local ports"
+msgstr "Monitorar as portas locais"
+
+msgid "Monitor mount points"
+msgstr "Monitorar pontos de montagem"
+
+msgid "Monitor processes"
+msgstr "Monitorar processos"
+
+msgid "Monitor remote ports"
+msgstr "Monitorar portas remotas"
+
+msgid "Name of the rule"
+msgstr "Nome da regra"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Configuração do plugin Netlink"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Network Plugin Configuration"
+msgstr "Configuração do plugin Rede"
+
+msgid "Network plugins"
+msgstr "Plugins de rede"
+
+msgid "Network protocol"
+msgstr "Protocolo de rede"
+
+msgid "Number of threads for data collection"
+msgstr "Número de threads para o coletor de dados"
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr "Somente criar RRAs de média"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Outgoing interface"
+msgstr "Interface de saída"
+
+msgid "Output plugins"
+msgstr "Plugins de saída"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Configuração do plugin Ping"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Processes"
+msgstr "Processos"
+
+msgid "Processes Plugin Configuration"
+msgstr "Configuração do plugin Processos"
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Processador"
+
+msgid "Qdisc monitoring"
+msgstr "Monitoramento do Qdisc"
+
+msgid "RRD XFiles Factor"
+msgstr "Arquivos RRD XFiles Factor"
+
+msgid "RRD heart beat interval"
+msgstr "Intervalo entre duas atualizações"
+
+msgid "RRD step interval"
+msgstr "Intervalo de atualização"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Configuração do plugin RRDTool"
+
+msgid "Rows per RRA"
+msgstr "Linhas por RRA"
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Segundos"
+
+msgid "Server host"
+msgstr "IP/Hostname do servidor"
+
+msgid "Server port"
+msgstr "Porta do servidor"
+
+msgid "Shaping class monitoring"
+msgstr "Monitoramento das Classes de Shaping"
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr "IP de origem"
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr "Diretório de armazenamento"
+
+msgid "Storage directory for the csv files"
+msgstr "Diretório para armazenamento dos arquivos csv"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Armazenar os valores dos dados como taxas em vez de valores absolutos"
+
+msgid "Stored timespans"
+msgstr "Intervalos armazenados"
+
+msgid "System Load"
+msgstr "Carga do Sistema"
+
+msgid "System plugins"
+msgstr "Plugis de Sistema"
+
+msgid "TCP Connections"
+msgstr "Conexões TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Configuração do plugin TCPConns"
+
+msgid "TTL for network packets"
+msgstr "TTL para os pacotes de rede"
+
+msgid "TTL for ping packets"
+msgstr "TTL para os pacotes do ping"
+
+msgid "Table"
+msgstr "Tabela"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+"O plugin cpu coleta as estatísticas básicas sobre o uso do processador."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"O plugin csv armazena os dados coletados em um arquivo no formato csv para "
+"um futuro processamento por outros programas."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"O plugin df coleta estatísticas sobre a utilização de espaço em disco em "
+"diferentes dispositivos, pontos de montagem ou tipos de sistemas de arquivos."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"O plugin disco coleta estatísticas de uso detalhadas das partições "
+"selecionadas ou discos inteiros."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"O plugin dns coleta estatísticas detalhadas sobre o tráfego do dns nas "
+"interfaces selecionadas."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"O plugin de email cria um socket unix que pode ser usado para transmitir "
+"estatísticas de email o daemon collectd. Este plugin é essencialmente "
+"destinado a ser utilizado em conjunto com o plugin Mail::SpamAssasin::"
+"Plugin::Collectd mas pode ser utilizado de outras maneiras também."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"O plugin exec inicia comandos externos para leitura de valores ou notificar "
+"processos externos quando um determinado valor limite for atingido."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"O plugin interface plugin coleta estatísticas sobre o tráfego das interfaces "
+"selecionadas."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"O plugin iptables irá monitorar as regras de firewall selecionadas e coletar "
+"informações sobre pacotes e bytes processados pela regra."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"O plugin irq irá monitorar a taxa de erros por segundo de cada interrupção "
+"selecionada. Se nenhuma interrupção for selecionada então todas as "
+"interrupções serão monitoradas."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "O plugin carga coleta estatísticas gerais sobre a carga do sistema."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"O plugin Netlink coleta informações detalhadas como qdisc-, classe- e filtro "
+"de estatísticas das interfaces selecionadas."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"O plugin rede fornece informações de rede baseadas na comunicação entre as "
+"diferentes instâncias do collectd. O Collectd pode operar tanto no modo "
+"cliente quanto no modo servidor. No modo cliente os dados coletados "
+"localmente são transferidos para um servidor collectd, no modo de servidor a "
+"instância local recebe dados de outros hosts."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"O plugin ping irá enviar pacotes ICMP to tipo echo aos hosts selecionados e "
+"medir o tempo de resposta para cada host."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"O plugin processo coleta informações como o tempo da cpu, página falhas e "
+"uso de memória dos processos selecionados."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"O plugin rrdtool armazena os dados coletados no arquivo de banco de dados "
+"rrd.<br /><br /><strong>Aviso: A má configuração desses valores, resultará "
+"em um valor muito elevado no consumo de memória no diretório temporário. "
+"Isso pode tornar o equipamento inutilizável!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"As estatísticas são baseadas no <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> e é utilizado o <a href=\"http://oss.oetiker.ch/rrdtool/"
+"\">RRD Tool</a> para renderização das imagens à partir dos dados coletados."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"O plugin tcpconns coleta informações sobre as conexões TCP abertas das "
+"portas selecionadas."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"O plugin unixsock cria um socket unix, que pode ser usado para ler os dados "
+"coletados a partir de uma instância do collectd."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Esta seção define em quais interfaces o collectd irá aguardar para receber "
+"conexões."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Esta seção define para qual servidor os dados coletados localmente serão "
+"enviados."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Tentar encontrar o nome do host completo (FQDN)"
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Configuração do plugin Unixsock"
+
+msgid "Used PID file"
+msgstr "Arquivo PID usado"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr "Monitoramento no modo verbose"
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr "ex. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "ex. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "ex. rejeitar-com tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "max. 16 caract."
+
+msgid "reduces rrd size"
+msgstr "reduzir o tamanho do rrd"
+
+msgid "seconds; multiple separated by space"
+msgstr "segundos; vários valores, separar com espaço"
+
+msgid "server interfaces"
+msgstr "Interfaces do servidor"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "O plugin wireless coleta estatísticas sobre o nível de sinal wireless, o "
+#~ "ruído e qualidade."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Configuração do plugin Wireless"
diff --git a/trunk/package/luci/po/pt/tinyproxy.po b/trunk/package/luci/po/pt/tinyproxy.po
new file mode 100644
index 00000000..833a7fa6
--- /dev/null
+++ b/trunk/package/luci/po/pt/tinyproxy.po
@@ -0,0 +1,334 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-05-31 23:38+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr "Clientes permitidos"
+
+msgid "Allowed connect ports"
+msgstr "Portas onde é permitido ligar"
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr "Ativar servidor Tinyproxy"
+
+msgid "Error page"
+msgstr "Página de erro"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr "Definições globais"
+
+msgid "Group"
+msgstr "Grupo"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr "Endereço de escuta"
+
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+msgid "Log file"
+msgstr "Ficheiro de log"
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr "Nível do log"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr "Max. servidores sobressalentes"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr "Min. servidores sobressalentes"
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Privacy settings"
+msgstr "Definições de Privacidade"
+
+msgid "Reject access"
+msgstr "Rejeitar o acesso"
+
+msgid "Server Settings"
+msgstr "Definições do Servidor"
+
+msgid "Server limits"
+msgstr "Limites do servidor"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+"Especifica o nome do grupo que através do qual o processo do Tinyproxy é "
+"executado"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr "Iniciar servidores suplentes"
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Target host"
+msgstr "Host de destino"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Estado do Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr "Usar o syslog"
+
+msgid "User"
+msgstr "Utilizador"
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr "Escreve as mensagens para o syslog ao invés do ficheiro de log"
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Permitir acesso de"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Cabeçalhos permitidos para proxy anônimo"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Associar o tráfego de saída ao endereço"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Portas permitidas para o método CONNECT "
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = desativado, vazio = todas"
+
+#~ msgid "Error document"
+#~ msgstr "Documento de erro"
+
+#~ msgid "Filter list"
+#~ msgstr "Lista de filtros"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtros \"case sensitive\""
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "A lista de filtros é uma lista branca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtros com suporte à expressões regulares"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtrar URLs em vez de domínios"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escutar no endereço"
+
+#~ msgid "Logfile"
+#~ msgstr "Arquivo de log"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Número máximo de clientes"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Máximo de solicitações por thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Servidores sobressalentes iniciar com"
+
+#~ msgid "Statistic document"
+#~ msgstr "Documento de estatísticas"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escrever para syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Timeout de conexão"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor do cabeçalho \"Via-Header\""
+
+#~ msgid "Include client IP"
+#~ msgstr "Incluir o IP do cliente"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Controle de Upstream"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy para Upstream"
diff --git a/trunk/package/luci/po/pt/transmission.po b/trunk/package/luci/po/pt/transmission.po
new file mode 100644
index 00000000..512ca970
--- /dev/null
+++ b/trunk/package/luci/po/pt/transmission.po
@@ -0,0 +1,297 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-31 23:40+0200\n"
+"PO-Revision-Date: 2013-05-31 23:47+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Velocidade de download alternativa"
+
+msgid "Alternative speed enabled"
+msgstr "Velocidade alternativa activada"
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr "Definições de largura de banda"
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr "Directório do ficheiro de configuração"
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr "Depurar"
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr "Encriptação"
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "Fast"
+msgstr "Rápido"
+
+msgid "Files and Locations"
+msgstr "Ficheiros e Localizações"
+
+msgid "Forced"
+msgstr "Forçado"
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr "Info"
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr "Nenhum"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr "Desligado"
+
+msgid "Open Web Interface"
+msgstr "Abrir Interface Web"
+
+msgid "PEX enabled"
+msgstr "PEX ativado"
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr "URL RPC"
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr "RPC ativado"
+
+msgid "RPC password"
+msgstr "Password RPC"
+
+msgid "RPC port"
+msgstr "Porta RPC"
+
+msgid "RPC settings"
+msgstr "Definições RPC"
+
+msgid "RPC username"
+msgstr "Utilizador RPC"
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr "Executar serviço como"
+
+msgid "Scheduling"
+msgstr "Agendamento"
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"Transmission é um client simples de bittorrent, aqui pode configurar as "
+"definições."
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/pt/upnp.po b/trunk/package/luci/po/pt/upnp.po
new file mode 100644
index 00000000..91c94f34
--- /dev/null
+++ b/trunk/package/luci/po/pt/upnp.po
@@ -0,0 +1,157 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Link para download"
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Enable secure mode"
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr "Plug & Play Universal"
+
+msgid "Uplink"
+msgstr "Link para Upload"
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPNP permite os clientes da rede local automaticamente configurar o "
+#~ "roteador."
+
+#~ msgid "Log output"
+#~ msgstr "Log de saída"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
+#~ "pode resultar em elevados riscos de segurança para sua rede."
diff --git a/trunk/package/luci/po/pt/ushare.po b/trunk/package/luci/po/pt/ushare.po
new file mode 100644
index 00000000..795a963d
--- /dev/null
+++ b/trunk/package/luci/po/pt/ushare.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 19:03+0200\n"
+"PO-Revision-Date: 2013-06-03 23:32+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Diretórios de conteúdo"
+
+msgid "Disable telnet console"
+msgstr "Desativar console telnet"
+
+msgid "Disable webinterface"
+msgstr "Desativar interface web"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Servername"
+msgstr "Nome do servidor"
+
+msgid "Settings"
+msgstr "Configurações"
+
+msgid "Username"
+msgstr "Nome Utilizador"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"O uShare é um Servidor Multimédia UPnP (TM) A/V & DLNA. Implementa o "
+"componente de servidor que fornece aos dispositivos multimédia UPnP "
+"informações sobre os ficheiros disponiveis."
diff --git a/trunk/package/luci/po/pt/uvc_streamer.po b/trunk/package/luci/po/pt/uvc_streamer.po
new file mode 100644
index 00000000..a8a89993
--- /dev/null
+++ b/trunk/package/luci/po/pt/uvc_streamer.po
@@ -0,0 +1,43 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-01 00:50+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Frames por segundo"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Resolução"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Definições"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Streaming de Webcam"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configure a sua webcam Linux-UVC compatível. Encaminhe o seu browser para "
+"ex: <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/pt/vnstat.po b/trunk/package/luci/po/pt/vnstat.po
new file mode 100644
index 00000000..72978905
--- /dev/null
+++ b/trunk/package/luci/po/pt/vnstat.po
@@ -0,0 +1,65 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-31 16:25+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: German\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "Daily traffic"
+msgstr "Tráfego Diário"
+
+msgid "Graphs"
+msgstr "Gráficos"
+
+msgid "Hourly traffic"
+msgstr "Tráfego por hora"
+
+msgid "Monitor selected interfaces"
+msgstr "Monitorizar as interfaces selecionadas"
+
+msgid "Monthly traffic"
+msgstr "Tráfego mensal"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Ainda não foi configurada uma base de dados. Vá até à configuração do VnStat "
+"e ative a monitorização para uma ou mais interfaces."
+
+msgid "Restart VnStat"
+msgstr "Reiniciar VnStat"
+
+msgid "Summary display"
+msgstr "Mostrar resumo"
+
+msgid "Top 10 display"
+msgstr "Mostrar Top 10"
+
+msgid "Update »"
+msgstr "Atualizar »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Gráficos VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Monitor de Tráfego VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"O VnStat é um monitor de tráfego para Linux que mantêm um registo do tráfego "
+"para as interface (s) selecionadas."
diff --git a/trunk/package/luci/po/pt/voice_core.po b/trunk/package/luci/po/pt/voice_core.po
new file mode 100644
index 00000000..07d6093f
--- /dev/null
+++ b/trunk/package/luci/po/pt/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-01 00:34+0200\n"
+"Last-Translator: pedromrgoncalves <pedromrgoncalves@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefones"
+
+msgid "Voice"
+msgstr "Voz"
diff --git a/trunk/package/luci/po/pt/voice_diag.po b/trunk/package/luci/po/pt/voice_diag.po
new file mode 100644
index 00000000..5162c843
--- /dev/null
+++ b/trunk/package/luci/po/pt/voice_diag.po
@@ -0,0 +1,29 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-01 00:00+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Os diagnósticos disponiveis no dispositivo dependem dos módulos que tem "
+"instalados."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Neste menu há opções que lhe permitem configurar e executar testes nas "
+"operações de voz do seu sistema. Estes são conhecidos como diagnósticos."
diff --git a/trunk/package/luci/po/pt/watchcat.po b/trunk/package/luci/po/pt/watchcat.po
new file mode 100644
index 00000000..f939dc9c
--- /dev/null
+++ b/trunk/package/luci/po/pt/watchcat.po
@@ -0,0 +1,56 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-06-01 00:02+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr "Modo de operação"
+
+msgid "Period"
+msgstr "Periodo"
+
+msgid "Ping host"
+msgstr "Pingar host"
+
+msgid "Ping period"
+msgstr "Periodo de ping"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/pt/wol.po b/trunk/package/luci/po/pt/wol.po
new file mode 100644
index 00000000..540e5436
--- /dev/null
+++ b/trunk/package/luci/po/pt/wol.po
@@ -0,0 +1,54 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2013-05-30 22:54+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Broadcast em todas as interfaces"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Escolha ao host a acordar ou escreva um MAC personalizado a ser usado"
+
+msgid "Host to wake up"
+msgstr "Host a acordar"
+
+msgid "Network interface to use"
+msgstr "Interface de rede a usar"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr "Às vezes só uma das ferramentas funciona. Se uma falhar, tente a outra"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Especifica a interface pela qual é enviado o pacota WoL"
+
+msgid "Starting WoL utility:"
+msgstr "A iniciar a ferramenta WoL"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LAN é um mecanismo para remotamente iniciar computadores numa rede "
+"local."
+
+msgid "Wake up host"
+msgstr "Acordar host"
+
+msgid "WoL program"
+msgstr "Programa de WoL"
diff --git a/trunk/package/luci/po/pt/wshaper.po b/trunk/package/luci/po/pt/wshaper.po
new file mode 100644
index 00000000..96a7be81
--- /dev/null
+++ b/trunk/package/luci/po/pt/wshaper.po
@@ -0,0 +1,55 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-31 12:13+0200\n"
+"PO-Revision-Date: 2013-05-31 12:15+0200\n"
+"Last-Translator: joao.f.vieira <joao.f.vieira@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Low priority destination ports"
+msgstr "Porta de destino com baixa prioridade"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Hosts com baixa prioridade (Destino)"
+
+msgid "Low priority hosts (Source)"
+msgstr "Hosts com baixa prioridade (Origem)"
+
+msgid "Low priority source ports"
+msgstr "Portas de origem com baixa prioridade"
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/pt_BR/ahcp.po b/trunk/package/luci/po/pt_BR/ahcp.po
new file mode 100644
index 00000000..55ec29cd
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-03-29 23:07+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Servidor AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP é um protocolo de autoconfiguração para redes IPv6 ou IPv6/IPv4 "
+"projetado para ser usado no lugar da \"descoberta de roteador\" ou DHCP em "
+"redes onde é difícil ou impossível configurar um servidor em cada camada de "
+"enlace de domínio de broadcast, como exemplo as redes móvel ad-hoc."
+
+msgid "Active AHCP Leases"
+msgstr "Alocações AHCP Ativas"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "Advanced Settings"
+msgstr "Configurações Avançadas"
+
+msgid "Age"
+msgstr "Tempo de vida"
+
+msgid "Announced DNS servers"
+msgstr "Servidores DNS anunciados"
+
+msgid "Announced NTP servers"
+msgstr "Servidores NTP anunciados"
+
+msgid "Announced prefixes"
+msgstr "Prefixos anunciados"
+
+msgid "Collecting data..."
+msgstr "Coletando dados..."
+
+msgid "Forwarder"
+msgstr "Forwarder"
+
+msgid "General Setup"
+msgstr "Configurações Gerais"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Apenas IPv4"
+
+msgid "IPv6 only"
+msgstr "Apenas IPv6"
+
+msgid "Lease directory"
+msgstr "Diretório de atribuições"
+
+msgid "Lease validity time"
+msgstr "Tempo de validade da atribuição"
+
+msgid "Log file"
+msgstr "Arquivo de registro"
+
+msgid "Multicast address"
+msgstr "Endereço multicast"
+
+msgid "Operation mode"
+msgstr "Modo de operação"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Protocol family"
+msgstr "Família de protocolos"
+
+msgid "Served interfaces"
+msgstr "Interfaces configuradas"
+
+msgid "Server"
+msgstr "Servidor"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Especifica os servidores NTP IPv4 e IPv6 anunciados"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Especifica os servidores de nomes IPv4 e IPv6 anunciados"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"Especifica os prefixos de rede IPv4 e IPv6, em notação CIDR, anunciados"
+
+msgid "The AHCP Service is not running."
+msgstr "O serviço AHCP está parado"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "O serviço AHCP esta executando com o ID %s."
+
+msgid "There are no active leases."
+msgstr "Não existe alocações ativas."
+
+msgid "Unique ID file"
+msgstr "Arquivo de identificador único"
diff --git a/trunk/package/luci/po/pt_BR/asterisk.po b/trunk/package/luci/po/pt_BR/asterisk.po
new file mode 100644
index 00000000..07d70528
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/asterisk.po
@@ -0,0 +1,691 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2011-10-18 22:20+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Opções Gerais do Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Diretório do AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Guardar em cache os arquivos de som durante a gravação"
+
+#~ msgid "Debug Level"
+#~ msgstr "Nível de detalhamento"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Desativar alguns avisos"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Guardar o core quando o programa estourar"
+
+#~ msgid "High Priority"
+#~ msgstr "Alta Prioridade"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Inicializar Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Usar Temporização Interna"
+
+#~ msgid "Log directory"
+#~ msgstr "Diretório de registos"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Número máximo de chamadas permitidas"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Carga máxima para deixar de aceitar novas chamadas"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Desativar cores no console"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Diretório de cache para arquivos de som"
+
+#~ msgid "The Group to run as"
+#~ msgstr "O grupo sob o qual o asterisk será executado"
+
+#~ msgid "The User to run as"
+#~ msgstr "O usuário sob o qual o asterisk será executado"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Directorio da spool de voicemail"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Prefixar o nome de sistema à UniquID"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr ""
+#~ "Construir os caminhos de transcode atraves de SLINEAR e não directamente"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Transmitir silencio SLINEAR durante a gravação de um canal"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Nível de Detalhamento"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fuso Horário"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Seção do Plano de Marcação"
+
+#~ msgid "include"
+#~ msgstr "incluir"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Extensão do Plano de Discagem"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Opções Gerais do Plano de Discagem"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Permitir transferência"
+
+#~ msgid "Reinvite/redirect media connections"
+#~ msgstr "Reconvidar/redirecionar conexões multimídia"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Limpar variáveis globais"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "Encaminhamento do Plano de Discagem"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Conferência do Plano de Discagem"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Tempo do Plano de Discagem"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Correio de voz do Plano de Discagem"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Zonas do Plano de Discagem"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "Prefixo para adicionar aos planos de discagem correspondentes"
+
+#~ msgid "Match International prefix"
+#~ msgstr "Coincidir com o prefixo internacional"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Prefixo (0) para adicionar/remover para/de números internacionais"
+
+#~ msgid "localzone"
+#~ msgstr "zona local"
+
+#~ msgid "Match plan"
+#~ msgstr "Plano de combinação"
+
+#~ msgid "Connection to use"
+#~ msgstr "Conexão usada"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Mapeamentos de Tecla de Função"
+
+#~ msgid "Attended transfer key"
+#~ msgstr "Tecla de transferência assistida"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "Tecla de transferência cega"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Tecla para Desligar a chamada"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Tecla para Estacionar a chamada"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Recurso de Estacionamento"
+
+#~ msgid "ADSI Park"
+#~ msgstr "Estacionamento ADSI"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "Tempo limite (seg) da transferência assistida"
+
+#~ msgid "One touch record key"
+#~ msgstr "Tecla de gravação em um toque"
+
+#~ msgid "Name of call context for parking"
+#~ msgstr "Nome do contexto de chamada para o estacionamento"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Arquivo de som para tocar para o chamador estacionado"
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr "Tempo máximo (ms) entre os dígitos para ativação de recursos"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Método para Encontrar uma Vaga de Estacionamento"
+
+#~ msgid "parkedmusicclass"
+#~ msgstr "parkedmusicclass"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Toque o tom de cortesia para"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Habilitar Estacionamento"
+
+#~ msgid "Extension to dial to park"
+#~ msgstr "Extensão para discar para estacionar"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Tempo de estacionamento (seg)"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "faixa de extensões para o estacionamento de chamada"
+
+#~ msgid "Pickup extension"
+#~ msgstr "Extensão de captura"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Segundos para esperar entre os dígitos quando transferindo"
+
+#~ msgid "sound when attended transfer is complete"
+#~ msgstr "emitir som quando a transferência assistida estiver completa"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "Emitir som quando a transferência assistida falhar"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Recarregar a Configuração de Hardware"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Método de Reinicialização"
+
+#~ msgid "Parameter"
+#~ msgstr "Parâmetro"
+
+#~ msgid "Option type"
+#~ msgstr "Tipo de Opção"
+
+#~ msgid "User name"
+#~ msgstr "Nome do usuário"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Opções Gerais do Plano de Discagem"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Permitir Codificadores (codecs)"
+
+#~ msgid "Static"
+#~ msgstr "Estático"
+
+#~ msgid "Write Protect"
+#~ msgstr "Proteção à Escrita"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Conferência Encontre-me"
+
+#~ msgid "Admin PIN"
+#~ msgstr "PIN do Administrador"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "PIN da Conferência"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Opções Gerais da Conferência Encontre-me"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Número de buffers de 20ms que serão usados"
+
+#~ msgid "Modules"
+#~ msgstr "Módulos"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Aplicativo de Recepção de Alarmes"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Aplicativo de Autenticação"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "Garanta que o asterisk não salva o CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Verifique se o canal está disponível"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Escute em qualquer canal"
+
+#~ msgid "Control Playback Application"
+#~ msgstr "Controlar o Aplicativo de Reprodução"
+
+#~ msgid "Cuts up variables"
+#~ msgstr "Variáveis de Cortes"
+
+#~ msgid "Database access functions"
+#~ msgstr "Funções de acesso ao banco de dados"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Aplicativo de Discagem"
+
+#~ msgid "Virtual Dictation Machine Application"
+#~ msgstr "Aplicativo de Máquina de Ditado Virtual"
+
+#~ msgid "Directed Call Pickup Support"
+#~ msgstr "Suporte a Captura de Chamadas Direcionadas"
+
+#~ msgid "Extension Directory"
+#~ msgstr "Diretório de Extensão"
+
+#~ msgid "DISA (Direct Inward System Access) Application"
+#~ msgstr "Aplicativo DISA (Acesso Direto ao Sistema Interior)"
+
+#~ msgid "Dump channel variables Application"
+#~ msgstr "Descarregar Aplicativo de variáveis do canal"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Aplicativo de Eco Simples"
+
+#~ msgid "ENUM Lookup"
+#~ msgstr "Pesquisa ENUM"
+
+#~ msgid "Reevaluates strings"
+#~ msgstr "Reavaliar sequências de caracteres"
+
+#~ msgid "Executes applications"
+#~ msgstr "Executa aplicativos"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "Interface de aplicativo IVR externo"
+
+#~ msgid "Fork The CDR into 2 seperate entities"
+#~ msgstr "Bifurcar o CDR em duas entidades separadas"
+
+#~ msgid "Get ADSI CPE ID"
+#~ msgstr "Pegar o ID do CPE ADSI"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Rotinas de Gerenciamento e Grupo"
+
+#~ msgid "Encode and Stream via icecast and ices"
+#~ msgstr "Codificar e Transmitir através do icecast e ices"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Aplicativo de Transmissão de Imagem"
+
+# what is this black? Seems to be truncated!
+#~ msgid "Look up Caller*ID name/number from black"
+#~ msgstr "Buscar o Identificador de chamadas/nome/número do preto"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr "Buscar o Identificador de chamadas/nome/número do banco de dados"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Macros de extensão"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Um Aplicativo simples de matemática"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "Aplicativo de soma de verificação MD5"
+
+#~ msgid "Digital Milliwatt (mu-law) Test Application"
+#~ msgstr "Aplicativo de Teste de Miliwatt (mu-law) Digital"
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Gravar uma ligação e mixar o áudio durante a gravação"
+
+#~ msgid "Call Parking and Announce Application"
+#~ msgstr "Aplicativo de Anúncio e Estacionamento de Chamada"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Aplicativo de Reprodução Trivial"
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Requer que seja informado um número de telefone"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "Enfileiramento Real da Chamada"
+
+#~ msgid "Random goto"
+#~ msgstr "Vá para aleatório"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Aplicativo de Leitura de Variável"
+
+#~ msgid "Read in a file"
+#~ msgstr "Ler em um arquivo"
+
+#~ msgid "Realtime Data Lookup/Rewrite"
+#~ msgstr "Escrita/Consulta de Dados em Tempo Real"
+
+#~ msgid "Trivial Record Application"
+#~ msgstr "Aplicativo de Gravação Trivial"
+
+#~ msgid "Say time"
+#~ msgstr "Dizer a hora"
+
+#~ msgid "Send DTMF digits Application"
+#~ msgstr "Aplicativo para Enviar dígitos DTMF"
+
+#~ msgid "Send Text Applications"
+#~ msgstr "Aplicativos para Enviar Texto"
+
+#~ msgid "Set CallerID Application"
+#~ msgstr "Aplicativo de Definir a Identificação da Chamada"
+
+# I guess there is something wrong with English here
+#~ msgid "CDR user field apps"
+#~ msgstr "Aplicativos do campo do usuário no CDR"
+
+#~ msgid "load => .so ; Set CallerID Name"
+#~ msgstr "Carregar => .so ; Definir o Nome na Identificação da Chamada"
+
+#~ msgid "load => .so ; Set CallerID Number"
+#~ msgstr "Carregar => .so ; Definir o Número na Identificação da Chamada"
+
+#~ msgid "Set RDNIS Number"
+#~ msgstr "Definir o Número do RDNIS"
+
+#~ msgid "Set ISDN Transfer Capability"
+#~ msgstr "Definir Capacidade de Transferência ISDN"
+
+#~ msgid "SMS/PSTN handler"
+#~ msgstr "Tratador do SMS/PSTN"
+
+#~ msgid "Hangs up the requested channel"
+#~ msgstr "Termina a ligação no canal requisitado"
+
+#~ msgid "Stack Routines"
+#~ msgstr "Rotinas de Empilhamento"
+
+#~ msgid "Generic System() application"
+#~ msgstr "Aplicativo de Sistema Genérico"
+
+#~ msgid "Playback with Talk Detection"
+#~ msgstr "Reprodução com Detecção de Conversa"
+
+#~ msgid "Interface Test Application"
+#~ msgstr "Aplicativo de Teste de Interface"
+
+#~ msgid "Transfer"
+#~ msgstr "Transferir"
+
+#~ msgid "TXTCIDName"
+#~ msgstr "TXTCIDName"
+
+#~ msgid "Send URL Applications"
+#~ msgstr "Aplicativo para Enviar URL"
+
+#~ msgid "Custom User Event Application"
+#~ msgstr "Aplicativo para Eventos do Usuário Personalizados"
+
+#~ msgid "Send verbose output"
+#~ msgstr "Enviar saída detalhada"
+
+#~ msgid "Voicemail"
+#~ msgstr "Correio de Voz"
+
+#~ msgid "Waits until first ring after time"
+#~ msgstr "Espere até o primeiro toque após tempo"
+
+#~ msgid "Wait For Silence Application"
+#~ msgstr "Aplicativo para Esperar Por Silêncio"
+
+#~ msgid "While Loops and Conditional Execution"
+#~ msgstr "Laços de Repetição e Execução Condicional"
+
+#~ msgid "Comma Separated Values CDR Backend"
+#~ msgstr "Serviço de CDR em Valores Separados por Vírgula"
+
+#~ msgid "Customizable Comma Separated Values CDR Backend"
+#~ msgstr "Serviço de CDR em Valores Separados por Vírgula Personalizável"
+
+#~ msgid "Asterisk Call Manager CDR Backend"
+#~ msgstr "Serviço de CDR de Gerenciamento de Chamadas Asterisk"
+
+#~ msgid "MySQL CDR Backend"
+#~ msgstr "Serviço de CDR em MySQL"
+
+#~ msgid "PostgreSQL CDR Backend"
+#~ msgstr "Serviço de CDR em PostgreSQL"
+
+#~ msgid "SQLite CDR Backend"
+#~ msgstr "Serviço de CDR em SQLite"
+
+#~ msgid "Agent Proxy Channel"
+#~ msgstr "Canal de Proxy do Agente"
+
+#~ msgid "Option chan_iax2"
+#~ msgstr "Opção chan_iax2"
+
+#~ msgid "Local Proxy Channel"
+#~ msgstr "Canal de Proxy Local"
+
+#~ msgid "Session Initiation Protocol (SIP)"
+#~ msgstr "Protocolo de Iniciação de Sessão (SIP)"
+
+#~ msgid "Adaptive Differential PCM Coder/Decoder"
+#~ msgstr "Codificador/Decodificador PCM Diferencial Adaptativo"
+
+#~ msgid "A-law Coder/Decoder"
+#~ msgstr "Codificador/Decodificador A-law"
+
+#~ msgid "A-law and Mulaw direct Coder/Decoder"
+#~ msgstr "Codificador/Decodificador direto A-law e Mulaw"
+
+#~ msgid "ITU G.726-32kbps G726 Transcoder"
+#~ msgstr "Transcodificador G726 ITU G.726-32kbps"
+
+#~ msgid "GSM/PCM16 (signed linear) Codec Translation"
+#~ msgstr "Tradutor de codificação GSM/PCM16 (linear com sinal)"
+
+#~ msgid "Speex/PCM16 (signed linear) Codec Translator"
+#~ msgstr "Tradutor de codificação Speex/PCM16 (linear com sinal)"
+
+#~ msgid "Mu-law Coder/Decoder"
+#~ msgstr "Codificador/Decodificador Mu-law"
+
+#~ msgid "Sun Microsystems AU format (signed linear)"
+#~ msgstr "Formato AU Sun Microsystems (linear com sinal)"
+
+#~ msgid "G.723.1 Simple Timestamp File Format"
+#~ msgstr "Formato de Arquivo de Selo Temporal Simples G.723.1"
+
+#~ msgid "Raw G.726 (16/24/32/40kbps) data"
+#~ msgstr "Dado G.726 bruto (16/24/32/40kbps)"
+
+#~ msgid "Raw G729 data"
+#~ msgstr "Dado G729 bruto"
+
+#~ msgid "Raw GSM data"
+#~ msgstr "Dado GSM bruto"
+
+#~ msgid "Raw h263 data"
+#~ msgstr "Dado h263 bruto"
+
+#~ msgid "JPEG (Joint Picture Experts Group) Image"
+#~ msgstr "Imagem JPEG ((Joint Picture Experts Group)"
+
+#~ msgid "Raw uLaw 8khz Audio support (PCM)"
+#~ msgstr "Suporte a uLaw 8khz Áudio bruto (PCM)"
+
+#~ msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
+#~ msgstr "carregar => .so ; Suporte a uLaw 8khz Áudio PCM bruto"
+
+#~ msgid "Raw Signed Linear Audio support (SLN)"
+#~ msgstr "Suporte a Áudio Linear com Sinal (SLN)"
+
+#~ msgid "Dialogic VOX (ADPCM) File Format"
+#~ msgstr "Formato de Arquivo Dialogic VOX (ADPCM)"
+
+#~ msgid "Microsoft WAV format (8000hz Signed Line"
+#~ msgstr "Formato WAV da Microsoft (8000hz Linear com Sinal)"
+
+#~ msgid "Microsoft WAV format (Proprietary GSM)"
+#~ msgstr "Formato WAV da Microsoft (GSM Proprietário) "
+
+#~ msgid "Caller ID related dialplan functions"
+#~ msgstr ""
+#~ "Funções do plano de discagem relacionadas ao identificador da chamada"
+
+#~ msgid "ENUM Functions"
+#~ msgstr "Funções ENUM"
+
+#~ msgid "URI encoding / decoding functions"
+#~ msgstr "Funções de codificação / decodificação de URI"
+
+#~ msgid "Asterisk Extension Language Compiler"
+#~ msgstr "Compilador da Linguagem de Extensão do Asterisk"
+
+#~ msgid "Text Extension Configuration"
+#~ msgstr "Configuração da Extensão de Texto"
+
+#~ msgid "load => .so ; Builtin dialplan functions"
+#~ msgstr "carregar => .so ; Funções de plano de discagem embutidas"
+
+#~ msgid "Loopback Switch"
+#~ msgstr "Interruptor loopback"
+
+#~ msgid "Realtime Switch"
+#~ msgstr "Interruptor de Tempo Real"
+
+#~ msgid "Outgoing Spool Support"
+#~ msgstr "Suporte a bufferização da Saída"
+
+#~ msgid "Wil Cal U (Auto Dialer)"
+#~ msgstr "Wil Cal U (Discador Automático)"
+
+#~ msgid "MySQL Config Resource"
+#~ msgstr "Recurso de Configuração do Mysql"
+
+#~ msgid "ODBC Config Resource"
+#~ msgstr "Recurso de Configuração do ODBC"
+
+#~ msgid "PGSQL Module"
+#~ msgstr "Módulo do PGSQL"
+
+#~ msgid "Cryptographic Digital Signatures"
+#~ msgstr "Assinaturas Digitais Criptográficas"
+
+#~ msgid "Call Parking Resource"
+#~ msgstr "Recurso de Estacionamento de Chamadas"
+
+#~ msgid "Indications Configuration"
+#~ msgstr "Configuração dos Indicadores"
+
+#~ msgid "Call Monitoring Resource"
+#~ msgstr "Recurso de Monitoramento de Chamada"
+
+#~ msgid "Music On Hold Resource"
+#~ msgstr "Recurso da Música de Espera"
+
+#~ msgid "ODBC Resource"
+#~ msgstr "Recurso do ODBC"
+
+#~ msgid "SMDI Module"
+#~ msgstr "Módulo SMDI"
+
+#~ msgid "SNMP Module"
+#~ msgstr "Módulo SNMP"
+
+#~ msgid "Music On Hold"
+#~ msgstr "Música de Espera"
+
+#~ msgid "Application"
+#~ msgstr "Aplicativo"
+
+#~ msgid "Directory of Music"
+#~ msgstr "Diretório de Música"
+
+#~ msgid "Option mode"
+#~ msgstr "Modo da opção"
+
+#~ msgid "Random Play"
+#~ msgstr "Toque Aleatoriamente"
+
+#~ msgid "DTMF mode"
+#~ msgstr "Modo DTMF"
+
+#~ msgid "Primary domain identity for From: headers"
+#~ msgstr "Identidade do primeiro domínio para cabeçalhos De:"
+
+#~ msgid "From user (required by many SIP providers)"
+#~ msgstr "Do usuário (necessário para muitos provedores de SIP)"
+
+# I didn't undestand this one
+#~ msgid "Ring on incoming dialplan contexts"
+#~ msgstr "Tocar no contextos de plano de discagem recebidas"
+
+#~ msgid "Allow Insecure for"
+#~ msgstr "Permitir Inseguro para"
+
+#~ msgid "Mailbox for MWI"
+#~ msgstr "Caixa de Correio para MWI"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "NAT entre o telefone e o Asterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "Verifique as etiquetas nos cabeçalhos"
+
+#~ msgid "Reply Timeout (ms) for down connection"
+#~ msgstr "Tempo Limite da Resposta (ms) para conexões desconectadas"
+
+#~ msgid "Register connection"
+#~ msgstr "Registro da conexão"
+
+#~ msgid "Dial own extension for mailbox"
+#~ msgstr "Discar extensão própria para a caixa de correio"
+
+#~ msgid "Client Type"
+#~ msgstr "Tipo de Cliente"
+
+#~ msgid "Username"
+#~ msgstr "Usuário"
+
+#~ msgid "Section sipgeneral"
+#~ msgstr "Opções Gerais do SIP"
+
+#~ msgid "Allow codecs"
+#~ msgstr "Permitir codificações"
+
+#~ msgid "SIP realm"
+#~ msgstr "Domínio do SIP (realm)"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "Opções gerais do correio de voz"
+
+#~ msgid "From Email address of server"
+#~ msgstr "Endereço do email de origem do servidor"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "Caixas de Correio de Voz"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "O email contém anexos"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Display Name"
+#~ msgstr "Nome para exibição"
+
+#~ msgid "Password"
+#~ msgstr "Senha"
+
+#~ msgid "zone"
+#~ msgstr "zona"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Configuração de Zona da Voz"
+
+#~ msgid "Message Format"
+#~ msgstr "Formato da Mensagem"
diff --git a/trunk/package/luci/po/pt_BR/base.po b/trunk/package/luci/po/pt_BR/base.po
new file mode 100644
index 00000000..75116729
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/base.po
@@ -0,0 +1,4145 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-03-29 23:31+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(janela de %d minutos, intervalo de %d segundos)"
+
+msgid "(%s available)"
+msgstr "(%s disponível)"
+
+msgid "(empty)"
+msgstr "(vazio)"
+
+msgid "(no interfaces attached)"
+msgstr "(nenhuma interface conectada)"
+
+msgid "-- Additional Field --"
+msgstr "-- Campo Adicional --"
+
+msgid "-- Please choose --"
+msgstr "-- Por favor, escolha --"
+
+msgid "-- custom --"
+msgstr "-- personalizado --"
+
+msgid "1 Minute Load:"
+msgstr "Carga 1 Minuto:"
+
+msgid "15 Minute Load:"
+msgstr "Carga 15 Minutos:"
+
+msgid "5 Minute Load:"
+msgstr "Carga 5 Minutos:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+"<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+"Porta de consulta <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+"Porta do servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"O servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr> irá "
+"consultar na ordem do arquivo resolvfile"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"<abbr title=\"Identificador de Conjunto de Serviços Estendidos\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "Roteador <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+"Máscara de rede <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"Endereço do <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr> "
+"Endereço ou rede (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "Roteador <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Nome do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"Numero máximo de alocações <abbr title=\"Protocolo de Configuração Dinâmica "
+"de Equipamentos\">DHCP</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"Tamanho máximo do pacote do <abbr title=\"Extension Mechanisms for Domain "
+"Name System\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "Número máximo de consultas concorrentes"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Par: %s / Grupo: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "<abbr title=\"Access Point Name\">APN</abbr>"
+
+msgid "AR Support"
+msgstr "Suporte AR"
+
+msgid "ARP retry threshold"
+msgstr ""
+"Limite de retentativas do <abbr title=\"Address Resolution Protocol\">ARP</"
+"abbr>"
+
+msgid "ATM Bridges"
+msgstr "Ponte ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Identificador de Canal Virtual ATM (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Identificador de Caminho Virtual ATM (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Pontes ATM expõem ethernet encapsuladas em conexões AAL5 como interfaces de "
+"rede virutais no Linux. Estas podem ser usadas em conjunto com o DHCP ou PPP "
+"para discar em um provedor de rede."
+
+msgid "ATM device number"
+msgstr "Número do dispositivo ATM"
+
+msgid "Access Concentrator"
+msgstr "Concentrador de Acesso"
+
+msgid "Access Point"
+msgstr "Ponto de Acceso (AP)"
+
+msgid "Action"
+msgstr "Ação"
+
+msgid "Actions"
+msgstr "Ações"
+
+msgid "Activate this network"
+msgstr "Ativar esta rede"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Rotas <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr> ativas"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Rotas <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr> ativas"
+
+msgid "Active Connections"
+msgstr "Conexões Ativas"
+
+msgid "Active DHCP Leases"
+msgstr "Alocações DHCP ativas"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Alocações DHCPv6 ativas"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Adiciona um sufixo de domínio local para equipamentos conhecidos"
+
+msgid "Add new interface..."
+msgstr "Adiciona uma nova interface..."
+
+msgid "Additional Hosts files"
+msgstr "Arquivos adicionais de equipamentos conhecidos (hosts)"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "Address to access local relay bridge"
+msgstr "Endereço para acessar a ponte por retransmissão local "
+
+msgid "Administration"
+msgstr "Administração"
+
+msgid "Advanced Settings"
+msgstr "Opções Avançadas"
+
+msgid "Alert"
+msgstr "Alerta"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Permitir autenticação <abbr title=\"Shell Seguro\">SSH</abbr> por senha"
+
+msgid "Allow all except listed"
+msgstr "Permitir todos, exceto os listados"
+
+msgid "Allow listed only"
+msgstr "Permitir somente os listados"
+
+msgid "Allow localhost"
+msgstr "Permitir computador local"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Permitir que equipamentos remotos conectem à portas locais encaminhadas por "
+"SSH"
+
+msgid "Allow root logins with password"
+msgstr "Permite autenticação do root com senha"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Permite que o usuário <em>root</em> se autentique utilizando senha"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Permite respostas que apontem para 127.0.0.0/8 de servidores externos, por "
+"exemplo, para os serviços RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Sempre use canais 40MHz mesmo se o canal secundário estiver sobreposto. "
+"Usando esta opção, você não estará de acordo com a norma IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Uma rede adicional será criada se você deixar isto desmarcado."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antena 1"
+
+msgid "Antenna 2"
+msgstr "Antena 2"
+
+msgid "Antenna Configuration"
+msgstr "configuração de antena"
+
+msgid "Any zone"
+msgstr "Qualquer zona"
+
+msgid "Apply"
+msgstr "Aplicar"
+
+msgid "Applying changes"
+msgstr "Aplicar as alterações"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "atribuir as interfaces"
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Estações associadas"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Controlador Wireless Atheros 802.11%s"
+
+msgid "Authentication"
+msgstr "Autenticação"
+
+msgid "Authoritative"
+msgstr "Autoritário"
+
+msgid "Authorization Required"
+msgstr "Autorização Necessária"
+
+msgid "Auto Refresh"
+msgstr "Atualização Automática"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponível"
+
+msgid "Available packages"
+msgstr "Pacotes disponíveis"
+
+msgid "Average:"
+msgstr "Média:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Voltar"
+
+msgid "Back to Overview"
+msgstr "Voltar para Visão Geral"
+
+msgid "Back to configuration"
+msgstr "Voltar para configuração"
+
+msgid "Back to overview"
+msgstr "Voltar para visão geral"
+
+msgid "Back to scan results"
+msgstr "Voltar para os resultados da busca"
+
+msgid "Background Scan"
+msgstr "Busca em Segundo Plano"
+
+msgid "Backup / Flash Firmware"
+msgstr "Cópia de Segurança / Gravar Firmware"
+
+msgid "Backup / Restore"
+msgstr "Cópia de Segurança / Restauração"
+
+msgid "Backup file list"
+msgstr "Lista de arquivos para a cópia de segurança"
+
+msgid "Bad address specified!"
+msgstr "Endereço especificado está incorreto!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Abaixo estão os arquivos para a cópia de segurança. Ela consiste de arquivos "
+"de configuração alterados marcados pelo opkg, arquivos base essenciais e "
+"padrões para a cópia de segurança definidos pelo usuário."
+
+msgid "Bitrate"
+msgstr "Taxa de bits"
+
+msgid "Bogus NX Domain Override"
+msgstr "Substituir Domínio NX Falsos"
+
+msgid "Bridge"
+msgstr "Ponte"
+
+msgid "Bridge interfaces"
+msgstr "Juntar interfaces em uma ponte"
+
+msgid "Bridge unit number"
+msgstr "Número da ponte"
+
+msgid "Bring up on boot"
+msgstr "Levantar na iniciação"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Controlador Wireless Broadcom 802.11%s"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 Wireless Controlador"
+
+msgid "Buffered"
+msgstr "Buffered"
+
+msgid "Buttons"
+msgstr "Botões"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "Uso da CPU (%)"
+
+msgid "Cached"
+msgstr "Cached"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Cadeia"
+
+msgid "Changes"
+msgstr "Alterações"
+
+msgid "Changes applied."
+msgstr "Alterações aplicadas."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Muda a senha do administrador para acessar este dispositivo"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check"
+msgstr "Verificar"
+
+msgid "Checksum"
+msgstr "Soma de verificação"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Escolha a zona do firewall que você quer definir para esta interface. "
+"Selecione <em>não especificado -ou- criar</em> para remover a interface da "
+"zona associada ou preencha o campo para criar uma nova zona associada a esta "
+"interface."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Escolha a rede (s) que deseja anexar a este interface wireless ou preencha o "
+"<em> criar </em> campo para definir uma nova rede."
+
+msgid "Cipher"
+msgstr "Cifra"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Clique em \"Gerar arquivo\" para baixar um arquivo tar com os arquivos de "
+"configuração atuais. Para retornar o roteador para o seu estado inicial, "
+"clique em \"Zerar configuração\" (somente possível para imagens squashfs)."
+
+msgid "Client"
+msgstr "Cliente"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+"Identificador do cliente enviando quando a requisição do DHCP é realizada"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Feche as conexões inativas após uma dada quantidade de segundos. Use 0 para "
+"manter as conexões."
+
+msgid "Close list..."
+msgstr "Fechar a lista..."
+
+msgid "Collecting data..."
+msgstr "Coletando dados..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Common Configuration"
+msgstr "Configuração Comum"
+
+msgid "Compression"
+msgstr "Compressão"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "Configuration applied."
+msgstr "Configuração aplicada."
+
+msgid "Configuration files will be kept."
+msgstr "Os arquivos de configuração serão mantidos."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Configura esta montagem como um armazenamento sobreposto para o bloco-extroot"
+
+msgid "Confirmation"
+msgstr "Confirmação"
+
+msgid "Connect"
+msgstr "Conectar"
+
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection Limit"
+msgstr "Limite de conexão"
+
+msgid "Connections"
+msgstr "Conexões"
+
+msgid "Country"
+msgstr "País"
+
+msgid "Country Code"
+msgstr "Código do País"
+
+msgid "Cover the following interface"
+msgstr "Utilizando a seguinte interface"
+
+msgid "Cover the following interfaces"
+msgstr "Utilizando as seguintes interfaces"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Criar / Atribuir a uma zona de firewall"
+
+msgid "Create Interface"
+msgstr "Criar Interface"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Criar uma ponte juntando múltiplas interfaces"
+
+msgid "Critical"
+msgstr "Crítico"
+
+msgid "Cron Log Level"
+msgstr "Nível de Registro da Cron"
+
+msgid "Custom Interface"
+msgstr "Interface Personalizada"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Se possível, personaliza o comportamento dos <abbr title=\"Diodo Emissor de "
+"Luz\">LED</abbr>s."
+
+msgid "DHCP Leases"
+msgstr "Alocações do DHCP"
+
+msgid "DHCP Server"
+msgstr "Servidor DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP e DNS"
+
+msgid "DHCP client"
+msgstr "Cliente DHCP"
+
+msgid "DHCP-Options"
+msgstr "Opções de DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Alocações DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Encaminhamentos DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Depurar"
+
+msgid "Default %d"
+msgstr "Padrão %d"
+
+msgid "Default gateway"
+msgstr "Roteador Padrão"
+
+msgid "Default state"
+msgstr "Estado padrão"
+
+msgid "Define a name for this network."
+msgstr "Define um nome para esta rede."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Define opções adicionais do DHCP. Por exemplo "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" que anuncia diferentes servidores "
+"DNS para os clientes."
+
+msgid "Delete"
+msgstr "Apagar"
+
+msgid "Delete this interface"
+msgstr "Apagar esta interface"
+
+msgid "Delete this network"
+msgstr "Apagar esta rede"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Design"
+msgstr "Tema"
+
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid "Device Configuration"
+msgstr "Configuração do Dispositivo"
+
+msgid "Diagnostics"
+msgstr "Diagnóstico"
+
+msgid "Directory"
+msgstr "Diretório"
+
+msgid "Disable"
+msgstr "Desabilitar"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Desabilita <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+"para esta interface."
+
+msgid "Disable DNS setup"
+msgstr "Desabilita a configuração do DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Desativar temporizador de Beacon de Hardware"
+
+msgid "Disabled"
+msgstr "Desabilitado"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+"Descartar respostas de servidores externos para redes privadas (RFC1918)"
+
+msgid "Displaying only packages containing"
+msgstr "Mostre somente os pacotes contendo"
+
+msgid "Distance Optimization"
+msgstr "Otimização de Distância"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distância para o computador mais distante da rede (em metros)."
+
+msgid "Diversity"
+msgstr "Diversidade"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq é um servidor combinado de <abbr title=\"Protocolo de Configuração "
+"Dinâmica de Hosts\">DHCP</abbr> e <abbr title=\"Sistema de Nomes de Domínios"
+"\">DNS</abbr> para firewalls <abbr title=\"Tradução de Endereço de Rede"
+"\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+"Não mantenha em cache para respostas negativas como, por exemplo, para os "
+"domínios inexistentes"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Não encaminhe requisições que não podem ser respondidas por servidores de "
+"nomes públicos"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Não encaminhe buscas por endereço reverso das redes local"
+
+msgid "Do not send probe responses"
+msgstr "Não enviar respostas de exames"
+
+msgid "Domain required"
+msgstr "Requerer domínio"
+
+msgid "Domain whitelist"
+msgstr "Lista branca de domínios"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Não encaminhar consultas <abbr title=\"Sistema de Nomes de Domínios\">DNS</"
+"abbr> sem o nome completo do <abbr title=\"Sistema de Nomes de Domínios"
+"\">DNS</abbr>"
+
+msgid "Download and install package"
+msgstr "Baixe e instale o pacote"
+
+msgid "Download backup"
+msgstr "Baixar a cópia de segurança"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear oferece um acesso shell seguro à rede <abbr title=\"Shell Seguro"
+"\">(SSH)</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> "
+"integrado"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"<abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
+"Dinâmico"
+
+msgid "Dynamic tunnel"
+msgstr "Túnel dinâmico"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Aloca dinamicamente os endereços do DHCP para os clientes. Se desabilitado, "
+"somente os clientes com atribuições estáticas serão servidos. "
+
+msgid "EAP-Method"
+msgstr "Método EAP"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Edit this interface"
+msgstr "Editar esta interface"
+
+msgid "Edit this network"
+msgstr "Editar esta rede"
+
+msgid "Emergency"
+msgstr "Emergência"
+
+msgid "Enable"
+msgstr "Ativar"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Ativar a atualização de ponto final dinâmico HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Ativar a negociação de IPv6 no enlace PPP"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Ativar o encaminhamento de quadros jumbos (Jumbo Frames)"
+
+msgid "Enable NTP client"
+msgstr "Ativar o cliente <abbr title=\"Network Time Protocol\">NTP</abbr>"
+
+msgid "Enable TFTP server"
+msgstr "Ativar servidor TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Ativar funcionalidade de VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Ativar o aprendizado e obsolescência"
+
+msgid "Enable this mount"
+msgstr "Ativar esta montagem"
+
+msgid "Enable this swap"
+msgstr "Ativar este espaço de troca (swap)"
+
+msgid "Enable/Disable"
+msgstr "Ativar/Desativar"
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Ativa o protocolo STP nesta ponte"
+
+msgid "Encapsulation mode"
+msgstr "Modo de encapsulamento"
+
+msgid "Encryption"
+msgstr "Cifragem"
+
+msgid "Erasing..."
+msgstr "Apagando..."
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "Ethernet Adapter"
+msgstr "Adaptador Ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Switch Ethernet"
+
+msgid "Expand hosts"
+msgstr "Expandir arquivos de equipamentos conhecidos (hosts)"
+
+msgid "Expires"
+msgstr "Expira"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Tempo de expiração dos endereços atribuídos. Mínimo é 2 minutos (<code>2m</"
+"code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Servidor externo de registros do sistema (syslog)"
+
+msgid "External system log server port"
+msgstr "Porta do servidor externo de registro do sistema (syslog)"
+
+msgid "Fast Frames"
+msgstr "Quadros Rápidos"
+
+msgid "File"
+msgstr "Arquivo"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Nome do arquivo da imagem de boot anunciada para os clientes"
+
+msgid "Filesystem"
+msgstr "Sistema de Arquivos"
+
+msgid "Filter"
+msgstr "Filtro"
+
+msgid "Filter private"
+msgstr "Filtrar endereços privados"
+
+msgid "Filter useless"
+msgstr "Filtrar consultas inúteis"
+
+msgid "Find and join network"
+msgstr "Procurar e conectar à rede"
+
+msgid "Find package"
+msgstr "Procurar pacote"
+
+msgid "Finish"
+msgstr "Terminar"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Configurações do Firewall"
+
+msgid "Firewall Status"
+msgstr "Estado do Firewall"
+
+msgid "Firmware Version"
+msgstr "Versão do Firmware"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Porta de origem fixa para saída de consultas DNS"
+
+msgid "Flags"
+msgstr "Marcadores"
+
+msgid "Flash Firmware"
+msgstr "Gravar Firmware"
+
+msgid "Flash image..."
+msgstr "Gravar imagem..."
+
+msgid "Flash new firmware image"
+msgstr "Gravar nova imagem do firmware"
+
+msgid "Flash operations"
+msgstr "Operações na memória flash"
+
+msgid "Flashing..."
+msgstr "Gravando na flash..."
+
+msgid "Force"
+msgstr "Forçar"
+
+msgid "Force 40MHz mode"
+msgstr "Forçar modo 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Forçar CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Forçar o DHCP nesta rede mesmo se outro servidor for detectado."
+
+msgid "Force TKIP"
+msgstr "Forçar TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Forçar TKIP e CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Encaminhar tráfego DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Encaminhar tráfego broadcast"
+
+msgid "Forwarding mode"
+msgstr "Modo de encaminhamento"
+
+msgid "Fragmentation Threshold"
+msgstr "Limiar de Fragmentação"
+
+msgid "Frame Bursting"
+msgstr "Explosão de Quadros (Frame Bursting)"
+
+msgid "Free"
+msgstr "Livre"
+
+msgid "Free space"
+msgstr "Espaço livre"
+
+msgid "Frequency Hopping"
+msgstr "Salto de Frequência"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "Somente GPRS"
+
+msgid "Gateway"
+msgstr "Roteador"
+
+msgid "Gateway ports"
+msgstr "Acesso remoto a portas encaminhadas"
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "General Setup"
+msgstr "Configurações Gerais"
+
+msgid "Generate archive"
+msgstr "Gerar arquivo"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Generico 802.11%s Wireless Controlador"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "A senha de confirmação informada não casa. Senha não alterada!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Ir para a configuração de senha..."
+
+msgid "Go to relevant configuration page"
+msgstr "Ir para a página de configuração pertinente"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Senha HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+# Não sei que contexto isto está sendo usado
+msgid "Handler"
+msgstr "Responsável"
+
+msgid "Hang Up"
+msgstr "Suspender"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Aqui você pode configurar os aspectos básicos do seu equipamento, como o "
+"nome do equipamento ou o fuso horário."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Aqui você pode colar as chaves públicas do SSH (uma por linha) para a "
+"autenticação por chaves do SSH."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b Wireless Controlador"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos"
+"\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Entradas de Equipamentos"
+
+msgid "Host expiry timeout"
+msgstr "Tempo limite de expiração de equipamento"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+"<abbr title=\"Endereço do Protocolo de Internet\">IP</abbr> do Equipamento "
+"ou Rede"
+
+msgid "Hostname"
+msgstr "Nome do equipamento"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Nome do equipamento enviado quando requisitar DHCP"
+
+msgid "Hostnames"
+msgstr "Nome dos equipamentos"
+
+msgid "IP address"
+msgstr "Endereço IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Firewall para IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Estado IPv4 da WAN"
+
+msgid "IPv4 address"
+msgstr "Endereço IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Broadcast IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Roteador padrão IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Máscara de rede IPv4"
+
+msgid "IPv4 only"
+msgstr "Somente IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Tamanho do prefixo IPv4"
+
+msgid "IPv4-Address"
+msgstr "Endereço IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Firewall para IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Estado IPv6 da WAN"
+
+msgid "IPv6 address"
+msgstr "Endereço IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Roteador padrão do IPv6"
+
+msgid "IPv6 only"
+msgstr "Somente IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Prefixo IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Tamanho Prefixo IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "Endereço IPv6"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-in-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-sobre-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-sobre-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Identidade PEAP"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Se especificado, monta o dispositivo pelo seu UUID ao invés de um nó de "
+"dispositivo fixo"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Se especificado, monta o dispositivo pela etiqueta da partiçãoo ao invés de "
+"um nó de dispositivo fixo"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Se desmarcado, nenhuma rota padrão será configurada"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+"Se desmarcado, os endereços dos servidores DNS anunciados serão ignorados"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Se a sua memória física for insuficiente, os dados não utilizados poderão "
+"ser armazenados temporariamente em um dispositivo swap, resultando em uma "
+"maior quantidade de memória <abbr title=\"Memória de Acesso Aleatório\">RAM</"
+"abbr> utilizável. Esteja ciente de que a troca de dados (swap) é um processo "
+"muito lento, uma vez que o dispositivo swap não pode ser acessado com taxas "
+"de transferência tão altas com a memória <abbr title=\"Memória de Acesso "
+"Aleatório\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ignorar arquivos de equipamentos conhecidos (hosts)"
+
+msgid "Ignore interface"
+msgstr "Ignorar interface"
+
+msgid "Ignore resolve file"
+msgstr "Ignorar arquivo de resolução de nomes (resolv.conf)"
+
+msgid "Image"
+msgstr "Imagem"
+
+msgid "In"
+msgstr "Entrada"
+
+msgid "Inactivity timeout"
+msgstr "Tempo limite de inatividade"
+
+msgid "Inbound:"
+msgstr "Entrando:"
+
+msgid "Info"
+msgstr "Informação"
+
+msgid "Initscript"
+msgstr "Script de iniciação"
+
+msgid "Initscripts"
+msgstr "Scripts de iniciação"
+
+msgid "Install"
+msgstr "Instalar"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Instalar pacote %q"
+
+msgid "Install protocol extensions..."
+msgstr "Instalar extensões de protocolo..."
+
+msgid "Installed packages"
+msgstr "Pacotes instalados"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Interface Configuration"
+msgstr "Configuração da Interface"
+
+msgid "Interface Overview"
+msgstr "Visão Geral da Interface"
+
+msgid "Interface is reconnecting..."
+msgstr "A interface está reconectando..."
+
+msgid "Interface is shutting down..."
+msgstr "A interface está desligando..."
+
+msgid "Interface not present or not connected yet."
+msgstr "A interface não está presente ou não está conectada ainda."
+
+msgid "Interface reconnected"
+msgstr "Interface reconectada"
+
+msgid "Interface shut down"
+msgstr "Interface desligada"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Internal Server Error"
+msgstr "erro no servidor interno"
+
+msgid "Invalid"
+msgstr "Valor inválido"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+"O valor informado do ID da VLAN é inválido! Somente valores entre %d e %d "
+"são permitidos."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+"O valor informado do ID da VLAN é inválido! Somente valores únicos são "
+"permitidos."
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Usuário e/ou senha inválida! Por favor, tente novamente."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"A imagem que está a tentar carregar aparenta nao caber na flash do "
+"equipamento. Por favor verifique o arquivo da imagem!"
+
+msgid "Java Script required!"
+msgstr "É necessário Java Script!"
+
+msgid "Join Network"
+msgstr "Conectar à Rede"
+
+msgid "Join Network: Settings"
+msgstr "Conectar à Rede: Configurações"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Conectar à Rede: Busca por Rede Sem Fio"
+
+msgid "Keep settings"
+msgstr "Manter configurações"
+
+msgid "Kernel Log"
+msgstr "Registo do Kernel"
+
+msgid "Kernel Version"
+msgstr "Versão do Kernel"
+
+msgid "Key"
+msgstr "Chave"
+
+msgid "Key #%d"
+msgstr "Chave #%d"
+
+msgid "Kill"
+msgstr "Matar"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Servidor L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr "Limite de falha no eco do LCP"
+
+msgid "LCP echo interval"
+msgstr "Intervalo do eco do LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Etiqueta"
+
+msgid "Language"
+msgstr "Idioma"
+
+msgid "Language and Style"
+msgstr "Idioma e Estilo"
+
+msgid "Lease validity time"
+msgstr "Tempo de validade da atribuição"
+
+msgid "Leasefile"
+msgstr "Arquivo de atribuições"
+
+msgid "Leasetime"
+msgstr "Tempo de atribuição do DHCP"
+
+msgid "Leasetime remaining"
+msgstr "Tempo restante da atribuição"
+
+msgid "Leave empty to autodetect"
+msgstr "Deixe vazio para detectar automaticamente"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Deixe vazio para usar o endereço WAN atual"
+
+msgid "Legend:"
+msgstr "Legenda:"
+
+msgid "Limit"
+msgstr "Limite"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Enlace Ativo"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Lista dos servidores <abbr title=\"Domain Name System\">DNS</abbr> para "
+"encaminhar as requisições"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+"Lista dos domínios para os quais será permitido respostas apontando para "
+"redes privadas (RFC1918)"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+"Lista de servidores <abbr title=\"Domain Name System\">DNS</abbr> que "
+"fornecem resultados errados para consultas a domínios inexistentes (NX)"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Escuta apenas na interface especificada. Se não especificado, escuta em todas"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Porta de escuta para a entrada das consultas DNS"
+
+msgid "Load"
+msgstr "Carga"
+
+msgid "Load Average"
+msgstr "Carga Média"
+
+msgid "Loading"
+msgstr "Carregando"
+
+msgid "Local IPv4 address"
+msgstr "Endereço IPv4 local"
+
+msgid "Local IPv6 address"
+msgstr "Endereço IPv6 local"
+
+msgid "Local Startup"
+msgstr "Iniciação Local"
+
+msgid "Local Time"
+msgstr "Hora Local"
+
+msgid "Local domain"
+msgstr "Domínio Local"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Especificação do domínio local. Nomes que casam com este domínio nunca serão "
+"encaminhados e são resolvidos somente pelo DHCP ou pelo arquivos de "
+"equipamentos conhecidos (hosts)"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Sufixo do domínio local adicionado aos nomes no DHCP e nas entradas dos "
+"arquivo de equipamentos conhecidos (hosts)"
+
+msgid "Local server"
+msgstr "Servidor local"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Localizar o nome do equipamento dependendo da subrede requisitante se "
+"mútliplos endereços IPs estiverem disponíveis"
+
+msgid "Localise queries"
+msgstr "Localizar consultas"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Travado para o canal %d usado por %s"
+
+msgid "Log output level"
+msgstr "Nível de detalhamento de saída dos registros"
+
+msgid "Log queries"
+msgstr "Registar as consultas"
+
+msgid "Logging"
+msgstr "Registrando os eventos"
+
+msgid "Login"
+msgstr "Entrar"
+
+msgid "Logout"
+msgstr "Sair"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "O endereço mais baixo concedido como deslocamento do endereço da rede."
+
+msgid "MAC-Address"
+msgstr "Endereço MAC"
+
+msgid "MAC-Address Filter"
+msgstr "Filtro de Endereço MAC"
+
+msgid "MAC-Filter"
+msgstr "Filtro de MAC"
+
+msgid "MAC-List"
+msgstr "Lista de MAC"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr ""
+"<abbr title=\"Maximum Transmission Unit/Unidade Máxima de Transmissão\">MTU</"
+"abbr>"
+
+msgid "Maximum Rate"
+msgstr "Taxa Máxima"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Número máximo permitido de alocações DHCP ativas"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Número máximo permitido de consultas DNS concorrentes"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Tamanho máximo permitido dos pacotes UDP EDNS.0"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Tempo máximo, em segundos, para esperar que o modem fique pronto"
+
+# Desconheço o uso
+msgid "Maximum hold time"
+msgstr "Tempo máximo de espera"
+
+msgid "Maximum number of leased addresses."
+msgstr "Número máximo de endereços atribuídos."
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Memory usage (%)"
+msgstr "Uso da memória (%)"
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Minimum Rate"
+msgstr "Taxa Mínima"
+
+msgid "Minimum hold time"
+msgstr "Tempo mínimo de espera"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Extensão para o protocolo %q está ausente"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Dispositivo do Modem"
+
+msgid "Modem init timeout"
+msgstr "Estouro de tempo da iniciação do modem"
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr "Entrada de Montagem"
+
+msgid "Mount Point"
+msgstr "Ponto de Montagem"
+
+msgid "Mount Points"
+msgstr "Pontos de Montagem"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Pontos de Montagem - Entrada de Montagem"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Pontos de Montagem - Entrada da Swap"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Pontos de montagem definem em que ponto um dispositivo de armazenamento será "
+"anexado ao sistema de arquivos"
+
+msgid "Mount options"
+msgstr "Opções de montagem"
+
+msgid "Mount point"
+msgstr "Ponto de montagem"
+
+msgid "Mounted file systems"
+msgstr "Sistemas de arquivos montados"
+
+msgid "Move down"
+msgstr "Mover para baixo"
+
+msgid "Move up"
+msgstr "Mover para cima"
+
+msgid "Multicast Rate"
+msgstr "Taxa de Multicast"
+
+msgid "Multicast address"
+msgstr "Endereço de Multicast"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Candidatos a servidor NTP"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Name of the new interface"
+msgstr "Nome da nova interface"
+
+msgid "Name of the new network"
+msgstr "Nome da nova rede"
+
+msgid "Navigation"
+msgstr "Navegação"
+
+msgid "Netmask"
+msgstr "Máscara de rede"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Network Utilities"
+msgstr "Utilitários de Rede"
+
+msgid "Network boot image"
+msgstr "Imagem de boot pela rede"
+
+msgid "Network without interfaces."
+msgstr "Rede sem interfaces."
+
+msgid "Next »"
+msgstr "Próximo »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Nenhum Servidor DHCP configurado para esta interface"
+
+msgid "No chains in this table"
+msgstr "Nenhuma cadeira nesta tabela"
+
+msgid "No files found"
+msgstr "Nenhum arquivo encontrado"
+
+msgid "No information available"
+msgstr "Nenhuma informação disponível"
+
+msgid "No negative cache"
+msgstr "Nenhum cache negativo"
+
+msgid "No network configured on this device"
+msgstr "Nenhuma rede configurada neste dispositivo"
+
+msgid "No network name specified"
+msgstr "Nenhum nome de rede foi especificado"
+
+msgid "No package lists available"
+msgstr "Nenhuma lista de pacotes disponível"
+
+msgid "No password set!"
+msgstr "Nenhuma senha definida!"
+
+msgid "No rules in this chain"
+msgstr "Sem regras nesta cadeia"
+
+msgid "No zone assigned"
+msgstr "Nenhuma zona definida"
+
+msgid "Noise"
+msgstr "Ruído"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Ruído:"
+
+msgid "None"
+msgstr "Nenhum"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "Não Encontrado"
+
+msgid "Not associated"
+msgstr "Não conectado"
+
+msgid "Not connected"
+msgstr "Não conectado"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Nota: Os arquivos de configuração serão apagados."
+
+msgid "Notice"
+msgstr "Aviso"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Configuração-OPKG"
+
+msgid "Off-State Delay"
+msgstr "Atraso no estado de desligado"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Nesta página pode configurar as interfaces de rede. Esta interface pode "
+"formar uma ponte juntando várias interfaces. Para isto, marque o campo "
+"\"Juntar interfaces em uma ponte\" e informar as várias interfaces de rede. "
+"Pode também usar a notação para <abbr title=\"Rede Local Virtual\">VLAN</"
+"abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo\">ex.</abbr>: "
+"<samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Atraso no estado de conexões"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+"É necessário especificar ao menos um nome de equipamento ou endereço MAC!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Um ou mais campos contém valores inválidos!"
+
+msgid "One or more required fields have no value!"
+msgstr "Um ou mais campos obrigatórios não tem valor!"
+
+msgid "Open list..."
+msgstr "Abrir lista..."
+
+msgid "Option changed"
+msgstr "Opção alterada"
+
+msgid "Option removed"
+msgstr "Opção removida"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Other:"
+msgstr "Outro:"
+
+msgid "Out"
+msgstr "Saída"
+
+msgid "Outbound:"
+msgstr "Saindo:"
+
+msgid "Outdoor Channels"
+msgstr "Canais para externo"
+
+msgid "Override MAC address"
+msgstr "Sobrescrever o endereço MAC"
+
+msgid "Override MTU"
+msgstr "Sobrescrever o MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Sobrescrever o roteador padrão nas respostas do DHCP"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Sobrescrever a máscara de rede enviada aos clientes. Normalmente, ela é "
+"calculada a partir da máscara da subrede de onde o cliente solicitou o "
+"endereço."
+
+msgid "Override the table used for internal routes"
+msgstr "Sobrescrever a tabela usada para as rotas internas"
+
+msgid "Overview"
+msgstr "Visão geral"
+
+msgid "Owner"
+msgstr "Dono"
+
+msgid "PAP/CHAP password"
+msgstr "Senha do PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Usuário do PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Encapsulamento PPPoA "
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "O pacote libiwinfo é necessário!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "As listas de pacotes são mais antigas do que 24 horas"
+
+msgid "Package name"
+msgstr "Nome do Pacote"
+
+msgid "Packets"
+msgstr "Pacotes"
+
+msgid "Part of zone %q"
+msgstr "Parte da zona %q"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid "Password authentication"
+msgstr "Autenticação por senha"
+
+msgid "Password of Private Key"
+msgstr "Senha da Chave Privada"
+
+msgid "Password successfully changed!"
+msgstr "A senha foi alterada com sucesso!"
+
+msgid "Path to CA-Certificate"
+msgstr "Caminho para o Certificado da AC"
+
+msgid "Path to Client-Certificate"
+msgstr "Caminho para o Certificado do Cliente"
+
+msgid "Path to Private Key"
+msgstr "Caminho para a Chave Privada"
+
+msgid "Path to executable which handles the button event"
+msgstr "Caminho para o executável que trata o evento do botão"
+
+msgid "Peak:"
+msgstr "Pico:"
+
+msgid "Perform reboot"
+msgstr "Reiniciar o sistema"
+
+msgid "Perform reset"
+msgstr "Zerar configuração"
+
+msgid "Phy Rate:"
+msgstr "Taxa física:"
+
+msgid "Physical Settings"
+msgstr "Configurações Físicas"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "Pcts."
+
+msgid "Please enter your username and password."
+msgstr "Entre com o seu usuário e senha."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Por favor aguarde: Equipamento reiniciando..."
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Port %d"
+msgstr "Porta %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Porta %d está sem etiqueta para mútliplas VLANs!"
+
+msgid "Port status:"
+msgstr "Status da porta"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Assumir que o parceiro está morto depois de uma data quantidade de falhas de "
+"echo do LCP. Use 0 para ignorar as falhas"
+
+msgid "Prevents client-to-client communication"
+msgstr "Impede a comunicação de cliente para cliente"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b Wireless Controlador"
+
+msgid "Proceed"
+msgstr "Proceder"
+
+msgid "Processes"
+msgstr "Processos"
+
+msgid "Prot."
+msgstr "Protocolo"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Protocol family"
+msgstr "Família do protocolo"
+
+msgid "Protocol of the new interface"
+msgstr "Protocolo para a nova interface"
+
+msgid "Protocol support is not installed"
+msgstr "O suporte ao protocolo não está instalado"
+
+msgid "Provide NTP server"
+msgstr "Fornecer serviço <abbr title=\"Network Time Protocol\">NTP</abbr>"
+
+msgid "Provide new network"
+msgstr "Prover nova rede"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Ad-Hoc falso (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Qualidade"
+
+msgid "RTS/CTS Threshold"
+msgstr "Limiar RTS/CTS"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "Taxa de RX"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "RaLink 802.11%s Wireless Controlador"
+
+msgid "Radius-Accounting-Port"
+msgstr "Porta de contabilidade do RADIUS"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Segredo da contabilidade do RADIUS"
+
+msgid "Radius-Accounting-Server"
+msgstr "Servidor da contabilidade do RADIUS"
+
+msgid "Radius-Authentication-Port"
+msgstr "Porta de autenticação do RADIUS"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Segredo da autenticação do RADIUS"
+
+msgid "Radius-Authentication-Server"
+msgstr "Servidor da autenticação do RADIUS"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Ler <code>/etc/ethers</code> para configurar o Servidor-<abbr title="
+"\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr>"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Realmente excluir esta interface? A exclusão não pode ser desfeita!\n"
+" Você poderá perder o acesso a este dispositivo se você estiver conectado "
+"através desta interface."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Realmente excluir esta interface Wireless? A exclusão não pode ser "
+"desfeita!\n"
+"Você poderá perder o acesso a este dispositivo se você estiver conectado "
+"através desta interface."
+
+msgid "Really reset all changes?"
+msgstr "Realmente limpar todas as mudanças?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Realmente desligar esta rede\"%s\" ?\n"
+"Você poderá perder o acesso a este dispositivo se você estiver conectado "
+"através desta interface."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Realmente desligar esta interface\"%s\" ?\n"
+"Você poderá perder o acesso a este dispositivo se você estiver conectado "
+"através desta interface."
+
+msgid "Really switch protocol?"
+msgstr "Realmente trocar o protocolo?"
+
+msgid "Realtime Connections"
+msgstr "Conexões em Tempo Real"
+
+msgid "Realtime Graphs"
+msgstr "Gráficos em Tempo Real"
+
+msgid "Realtime Load"
+msgstr "Carga em Tempo Real"
+
+msgid "Realtime Traffic"
+msgstr "Tráfego em Tempo Real"
+
+msgid "Realtime Wireless"
+msgstr "Rede sem fio em Tempo Real"
+
+msgid "Rebind protection"
+msgstr "Proteção contra \"Rebind\""
+
+msgid "Reboot"
+msgstr "Reiniciar"
+
+msgid "Rebooting..."
+msgstr "Reiniciando..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Reinicia o sistema operacional do seu dispositivo"
+
+msgid "Receive"
+msgstr "Receber"
+
+msgid "Receiver Antenna"
+msgstr "Antena de Recepção"
+
+msgid "Reconnect this interface"
+msgstr "Reconectar esta interface"
+
+msgid "Reconnecting interface"
+msgstr "Reconectando interface"
+
+msgid "References"
+msgstr "Referências"
+
+msgid "Regulatory Domain"
+msgstr "Domínio Regulatório"
+
+msgid "Relay"
+msgstr "Retransmissor"
+
+msgid "Relay Bridge"
+msgstr "Ponte por Retransmissão"
+
+msgid "Relay between networks"
+msgstr "Encaminha o tráfego entre as redes"
+
+msgid "Relay bridge"
+msgstr "Ponte por retransmissão"
+
+msgid "Remote IPv4 address"
+msgstr "Endereço IPv4 remoto"
+
+msgid "Remove"
+msgstr "Remover"
+
+msgid "Repeat scan"
+msgstr "Repetir busca"
+
+msgid "Replace entry"
+msgstr "Substituir entrada"
+
+msgid "Replace wireless configuration"
+msgstr "Substituir a configuração da rede sem fio"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Requerido para alguns provedores de internet, ex. Charter com DOCSIS 3"
+
+msgid "Reset"
+msgstr "Limpar"
+
+msgid "Reset Counters"
+msgstr "Reiniciar contadores"
+
+msgid "Reset to defaults"
+msgstr "Redefinir para os valores padrão"
+
+msgid "Resolv and Hosts Files"
+msgstr "Arquivos de Resolv e Hosts"
+
+msgid "Resolve file"
+msgstr "Arquivo Resolv"
+
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgid "Restart Firewall"
+msgstr "Reiniciar o firewall"
+
+msgid "Restore backup"
+msgstr "Restaurar cópia de segurança"
+
+msgid "Reveal/hide password"
+msgstr "Relevar/esconder senha"
+
+msgid "Revert"
+msgstr "Reverter"
+
+msgid "Root"
+msgstr "Raiz"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Diretório raiz para arquivos disponibilizados pelo TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Senha do Roteador"
+
+msgid "Routes"
+msgstr "Rotas"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"As rotas especificam através de qual interface e roteador um certo destino "
+"podem ser alcançado."
+
+msgid "Rule #"
+msgstr "Regra #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+"Execute a verificação do sistema de arquivos antes da montagem do dispositivo"
+
+msgid "Run filesystem check"
+msgstr "Execute a verificação do sistema de arquivos "
+
+msgid "SSH Access"
+msgstr "Acesso SSH"
+
+msgid "SSH-Keys"
+msgstr "Chaves SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Salvar"
+
+msgid "Save & Apply"
+msgstr "Salvar & Aplicar"
+
+msgid "Save &#38; Apply"
+msgstr "Save &#38; Aplicar"
+
+msgid "Scan"
+msgstr "Procurar"
+
+msgid "Scheduled Tasks"
+msgstr "Tarefas Agendadas"
+
+msgid "Section added"
+msgstr "Seção adicionada"
+
+msgid "Section removed"
+msgstr "Seção removida"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Veja o manual (man) do comando \"mount\" para detalhes"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Enviar requisições de eco do LCP no dado intervalo em segundos. Somente "
+"efetivo em conjunto com o limite de falhas."
+
+msgid "Separate Clients"
+msgstr "Isolar Clientes"
+
+msgid "Separate WDS"
+msgstr "Separar WDS"
+
+msgid "Server Settings"
+msgstr "Configurações do Servidor"
+
+msgid "Service Name"
+msgstr "Nome do Serviço"
+
+msgid "Service Type"
+msgstr "Tipo do Serviço"
+
+msgid "Services"
+msgstr "Serviços"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurar a Sincronização do Horário"
+
+msgid "Setup DHCP Server"
+msgstr "Configurar Servidor DHCP"
+
+msgid "Show current backup file list"
+msgstr "Mostra a lista atual de arquivos para a cópia de segurança"
+
+msgid "Shutdown this interface"
+msgstr "Desligar esta interface"
+
+msgid "Shutdown this network"
+msgstr "Desligar esta rede"
+
+msgid "Signal"
+msgstr "Sinal"
+
+msgid "Signal:"
+msgstr "Sinal:"
+
+msgid "Size"
+msgstr "Tamanho"
+
+msgid "Skip"
+msgstr "Pular"
+
+msgid "Skip to content"
+msgstr "Pular para o conteúdo"
+
+msgid "Skip to navigation"
+msgstr "Pular para a navegação"
+
+msgid "Slot time"
+msgstr "Intervalo de tempo"
+
+msgid "Software"
+msgstr "Software"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Alguns campos estão inválidos e os valores não podem ser salvos!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Desculpe o objeto solicitado não foi encontrado"
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Desculpe, o servidor encontrou um erro inesperado."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"Sinto muito, não existe suporte para o sysupgrade. Uma nova imagem de "
+"firmware deve ser gravada manualmente. Por favor, consulte a wiki do libreCMC "
+"para instruções específicas da instalação deste dispositivo."
+
+msgid "Sort"
+msgstr "Ordenar"
+
+msgid "Source"
+msgstr "Origem"
+
+msgid "Specifies the button state to handle"
+msgstr "Especifica o estado do botão para ser tratado"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Especifica o diretório que o dispositivo está conectado"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Especifica a porta de escuta deste <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Especifica a quantidade máxima de requisições ARP falhadas antes de "
+"considerar que um equipamento está morto"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Especifica a quantidade máxima de segundos antes de considerar que um "
+"equipamento está morto"
+
+msgid "Specify the secret encryption key here."
+msgstr "Especifique a chave de cifragem secreta aqui."
+
+msgid "Start"
+msgstr "Iniciar"
+
+msgid "Start priority"
+msgstr "Prioridade de iniciação"
+
+msgid "Startup"
+msgstr "Iniciação"
+
+msgid "Static IPv4 Routes"
+msgstr "Rotas Estáticas IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Rotas Estáticas IPv6"
+
+msgid "Static Leases"
+msgstr "Alocações Estáticas"
+
+msgid "Static Routes"
+msgstr "Rotas Estáticas"
+
+msgid "Static WDS"
+msgstr "WDS Estático"
+
+msgid "Static address"
+msgstr "Endereço Estático"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Alocações estáticas são usadas para definir um endereço IP fixo e nome "
+"simbólico para os clientes do DHCP. Elas também são necessárias para "
+"configurações não dinâmicas onde um computador com a alocação correspondente "
+"é provido."
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Stop"
+msgstr "Parar"
+
+msgid "Strict order"
+msgstr "Ordem Exata"
+
+msgid "Submit"
+msgstr "Enviar"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Entrada do espaço de troca (Swap)"
+
+msgid "Switch"
+msgstr "Switch"
+
+msgid "Switch %q"
+msgstr "Switch %q"
+
+msgid "Switch %q (%s)"
+msgstr "Switch %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Trocar o protocolo"
+
+msgid "Sync with browser"
+msgstr "Sincronizar com o navegador"
+
+msgid "Synchronizing..."
+msgstr "Sincronizando..."
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "System Log"
+msgstr "Registo do Sistema"
+
+msgid "System Properties"
+msgstr "Propriedades do Sistema"
+
+msgid "System log buffer size"
+msgstr "Tamanho do buffer de registro do sistema"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Configurações do TFTP"
+
+msgid "TFTP server root"
+msgstr "Raiz do servidor TFTP"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "Taxa de TX"
+
+msgid "Table"
+msgstr "Tabela"
+
+msgid "Target"
+msgstr "Destino"
+
+msgid "Terminate"
+msgstr "Terminar"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"A seção da <em>Configuração do Dispositivo</em> engloba as configurações "
+"físicas do rádio como canal, potência de transmissão ou seleção da antena. "
+"Estas configurações são compartilhadas entre todas as redes sem fio (se o "
+"hardware for capaz de utilizar múltiplas SSID). As configurações específicas "
+"de cada rede, como cifragem ou modo de operação estão agrupadas na "
+"<em>Configuração da Interface</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"O pacote <em>libiwinfo-lua</em> não está instalado. Você precisa instalar "
+"este componente para ter uma configuração da rede sem fio funcional!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"O prefixo IPv6 atribuído pelo provedor, geralmente termina com<code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Os caracteres permitidos são: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> e <code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"O arquivo do dispositivo de armazenamento ou da partição (<abbr title=\"por "
+"exemplo\">ex.</abbr> <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"O sistema de arquivos que foi usado para formatar a unidade de armazenamento "
+"(<abbr title=\"por exemplo\">ex.</abbr> <samp><abbr title=\"Sistema de "
+"Arquivos ext3\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"A imagem do firmware foi enviada. Abaixo estão a soma de verificação "
+"(checksum) e o tamanho dom arquivo. Compare-os com o arquivo original para "
+"garantir a integridade dos dados. <br /> Clique em \"Proceder\" para iniciar "
+"o procedimetno de gravação."
+
+msgid "The following changes have been committed"
+msgstr "As seguintes mudanças foram aplicadas"
+
+msgid "The following changes have been reverted"
+msgstr "As seguintes alterações foram revertidas"
+
+msgid "The following rules are currently active on this system."
+msgstr "As seguintes regras estão atualmente ativas neste sistema."
+
+msgid "The given network name is not unique"
+msgstr "O nome de rede informado não é único"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Este equipamento não é capaz de utilizar SSID múltiplos e as configurações "
+"existentes serão substituídas se você proceder."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"O comprimento do prefixo IPv4 em bits, o restante é usado nos endereços IPv6."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "O comprimento do prefixo IPv6 em bits"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"As portas de rede neste dispositivo podem ser configuradas em diversas <abbr "
+"title=\"Virtual local Network\">VLAN</abbr>s nas quais computadores em uma "
+"mesma <abbr title=\"Virtual local Network\">VLAN</abbr> podem se comunicar "
+"diretamente. <abbr title=\"Virtual local Network\">VLAN</abbr>s são muitas "
+"vezes utilizadas para separar diferentes segmentos de rede. Em geral, existe "
+"uma porta para o enlace superior (uplink) e as demais portas são utilizadas "
+"para a rede local."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "O protocolo selecionado necessita estar associado a um dispositivo"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"O sistema está apagando agora a partição da configuração e irá reiniciar "
+"quando terminado."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"O sistema está gravando o firmware para a flash.<br /> NÃO DESLIGUE O "
+"EQUIPAMENTO!<br /> Espere alguns minutos até tentar reconectar. Dependendo "
+"da sua configuração, pode ser necessário renovar o endereço do seu "
+"computador para poder conectar novamente ao roteador."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"A imagem carregada não contém um formato suportado. Confirme que você "
+"escolheu uma imagem para a sua plataforma."
+
+msgid "There are no active leases."
+msgstr "Não existem alocações ativas."
+
+msgid "There are no pending changes to apply!"
+msgstr "Não existem modificações pendentes para aplicar!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Não existem modificações pendentes para reverter!"
+
+msgid "There are no pending changes!"
+msgstr "Não existem modificações pendentes!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Ainda não existe um dispositivo associado. Por favor, associe um dispositivo "
+"de rede na aba \"Configurações Físicas\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Não existem uma senha definida para este roteador. Por favor, configure uma "
+"senha para o root para proteger a interface WEB e habilitar o SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "Este endereço IPv4 do repassar"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Esta é a lista dos padrões de expressão shell para casar com os arquivos e "
+"diretórios incluídos durante a atualização do sistema. Arquivos modificados "
+"em /etc/config/ e alguns outros arquivos de configuração são automaticamente "
+"preservados."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Este é o conteúdo do /etc/rc.local. Insira seus próprios comandos aqui "
+"(antes de 'exit 0') para executá-los no final do processo de boot."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Este é o endereço da ponta local designado pelo agente de túnel. normalmente "
+"ele termina com <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Este é o único <abbr title=\"Protocolo de Configuração Dinâmica de Hosts"
+"\">DHCP</abbr> na rede local"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "Este é o sistema de agendamento de tarefas."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Este é normalmente o endereço do <abbr title=\"Point of Presence, Ponto de "
+"Presença\">PoP</abbr> mais próximo operado pelo agente de túnel"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"Esta lista fornece uma visão geral sobre os processos em execução no sistema."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+"Esta página permite a configuração de ações personalizadas para os botões"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Esta página fornece informações sobre as conexões de rede ativas."
+
+msgid "This section contains no values yet"
+msgstr "Esta seção ainda não contêm valores"
+
+msgid "Time Synchronization"
+msgstr "Sincronização de horário"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "A sincronização do horário ainda não está configurada."
+
+msgid "Timezone"
+msgstr "Fuso Horário"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Para recuperar os arquivos de configuração, você pode enviar aqui uma cópia "
+"de segurança anterior."
+
+msgid "Total Available"
+msgstr "Total Disponível"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "Tráfego"
+
+msgid "Transfer"
+msgstr "Transferências"
+
+msgid "Transmission Rate"
+msgstr "Taxa de Transmissão"
+
+msgid "Transmit"
+msgstr "Transmitir"
+
+msgid "Transmit Power"
+msgstr "Potência de Transmissão"
+
+msgid "Transmitter Antenna"
+msgstr "Antena de Transmissão"
+
+msgid "Trigger"
+msgstr "Disparo"
+
+msgid "Trigger Mode"
+msgstr "Modo de disparo"
+
+msgid "Tunnel ID"
+msgstr "Identificador do Túnel"
+
+msgid "Tunnel Interface"
+msgstr "Interface de Tunelamento"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Modo Turbo"
+
+msgid "Tx-Power"
+msgstr "Potência de transmissão"
+
+msgid "Type"
+msgstr "Tipo"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "UMTS somente"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "Dispositivo USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Não é possível a expedição"
+
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Erro Desconhecido, a senha não foi alterada!"
+
+msgid "Unmanaged"
+msgstr "Não gerenciado"
+
+msgid "Unsaved Changes"
+msgstr "Alterações Não Salvas"
+
+msgid "Unsupported protocol type."
+msgstr "Tipo de protocolo não suportado."
+
+msgid "Update lists"
+msgstr "Atualizar listas"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Envia uma imagem compatível do sistema para substituir o firmware em "
+"execução. Marque \"Manter configurações\" para manter as configurações "
+"atuais (requer uma imagem libreCMC compatível)."
+
+msgid "Upload archive..."
+msgstr "Enviar arquivo..."
+
+msgid "Uploaded File"
+msgstr "Arquivo Carregado"
+
+msgid "Uptime"
+msgstr "Tempo de atividade"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Usar <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Use o roteador do DHCP"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Use os servidores DNS anunciados pelo parceiro"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Usar códigos de países ISO/IEC 3166 alpha2."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Use MTU na interface do túnel"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Use TTL na interface do túnel"
+
+msgid "Use as root filesystem"
+msgstr "Usar como sistema de arquivos raiz"
+
+msgid "Use broadcast flag"
+msgstr "Use a marcação de broadcast"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Use servidores DNS personalizados"
+
+msgid "Use default gateway"
+msgstr "Use o roteador padrão"
+
+msgid "Use gateway metric"
+msgstr "Use a métrica do roteador"
+
+msgid "Use routing table"
+msgstr "Use a tabela de roteamento"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Use o botão <em>Adicionar</em> para adicionar uma nova entrada de "
+"atribuição. O endereço <em>MAC-Address</em> identifica o equipamento, o "
+"endereço <em>IPv4</em> especifica o endereço fixo para usar e o <em>nome do "
+"equipamento</em> é designado como nome simbólico (DNS) para o equipamento "
+"requisitante."
+
+msgid "Used"
+msgstr "Usado"
+
+msgid "Used Key Slot"
+msgstr "Posição da Chave Usada"
+
+msgid "Username"
+msgstr "Usuário"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Interface VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANs em %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANs em %q (%s)"
+
+msgid "VPN Server"
+msgstr "Servidor VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Classe do fabricante para enviar quando requisitar o DHCP"
+
+msgid "Verify"
+msgstr "Verificar"
+
+msgid "Version"
+msgstr "Versão"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "WEP Sistema Aberto"
+
+msgid "WEP Shared Key"
+msgstr "WEP Chave Compartilhada"
+
+msgid "WEP passphrase"
+msgstr "WEP Senha"
+
+msgid "WMM Mode"
+msgstr "Modo WMM"
+
+msgid "WPA passphrase"
+msgstr "WPA Senha"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"A cifragem WPA requer a instalação do wpa_supplicant (para modo cliente) ou "
+"do hostapd (para modo AP ou ad-hoc)."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Esperando a aplicação das mudanças..."
+
+msgid "Waiting for command to complete..."
+msgstr "Esperando o término do comando..."
+
+msgid "Warning"
+msgstr "Atenção"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Aviso: Existem alterações não salvas que serão perdidas durante a "
+"reiniciação!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Rede sem fio"
+
+msgid "Wireless Adapter"
+msgstr "Dispositivo de Rede sem Fio"
+
+msgid "Wireless Network"
+msgstr "Rede sem Fio"
+
+msgid "Wireless Overview"
+msgstr "Visão Geral da Rede sem Fio"
+
+msgid "Wireless Security"
+msgstr "Segurança da Rede sem Fio"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Rede sem fio está desabilitada ou não conectada"
+
+msgid "Wireless is restarting..."
+msgstr "A rede sem fio está reiniciando..."
+
+msgid "Wireless network is disabled"
+msgstr "A rede sem fio está desabilitada"
+
+msgid "Wireless network is enabled"
+msgstr "A rede sem fio está habilitada"
+
+msgid "Wireless restarted"
+msgstr "A rede sem fio reiniciou"
+
+msgid "Wireless shut down"
+msgstr "Rede sem fio desligada"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Escreva as requisições DNS para o servidor de registro (syslog)"
+
+msgid "XR Support"
+msgstr "Suporte a XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Neste local, você pode ativar ou desativar os scripts de iniciação "
+"instalados. As mudanças serão aplicadas após a reiniciação do equipamento."
+"<br /><strong>Aviso: Se você desativar algum script de iniciação essencial "
+"como por exemplo \"rede/network\", o dispositivo poderá tornar-se "
+"inacessível!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Você precisa habilitar o JavaScript no seu navegador ou o LuCI não irá "
+"funcionar corretamente."
+
+msgid "any"
+msgstr "qualquer"
+
+msgid "auto"
+msgstr "automático"
+
+#, fuzzy
+msgid "automatic"
+msgstr "estático"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "em ponte"
+
+msgid "create:"
+msgstr "criar"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "cria uma ponte sobre determinada(s) interface(s)"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "desativar"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "expirado"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"Arquivo onde as alocações <abbr title=\"Protocolo de Configuração Dinâmica "
+"de Hosts\">DHCP</abbr> são armazenadas"
+
+msgid "forward"
+msgstr "encaminhar"
+
+msgid "full-duplex"
+msgstr "full-duplex"
+
+msgid "half-duplex"
+msgstr "half-duplex"
+
+msgid "help"
+msgstr "ajuda"
+
+msgid "hidden"
+msgstr "ocultar"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "se o destino for uma rede"
+
+msgid "input"
+msgstr "entrada"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+"Arquivo local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+# Is this yes/no or no like in no one?
+msgid "no"
+msgstr "não"
+
+msgid "no link"
+msgstr "sem link"
+
+msgid "none"
+msgstr "nenhum"
+
+msgid "off"
+msgstr "desligado"
+
+msgid "on"
+msgstr "ligado"
+
+msgid "open"
+msgstr "aberto"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "roteado"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "etiquetado"
+
+msgid "unknown"
+msgstr "desconhecido"
+
+msgid "unlimited"
+msgstr "ilimitado"
+
+msgid "unspecified"
+msgstr "não especificado"
+
+msgid "unspecified -or- create:"
+msgstr "não especificado -ou- criar:"
+
+msgid "untagged"
+msgstr "não etiquetado"
+
+msgid "yes"
+msgstr "sim"
+
+msgid "« Back"
+msgstr "« Voltar"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "Identificador do usuário HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Este é o identificador do usuário de 32 bytes codificado em hexadecimal, "
+#~ "não o nome do usuário"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz, 2º canal acima"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz, 2º canal abaixo"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Aceita anúncios de roteador"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Anuncie IPv6 na rede"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Identificador da rede anunciado"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Faixa permitida de 1 a 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Capacidade de HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Modo HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Modelo do Roteador"
+
+#~ msgid "Router Name"
+#~ msgstr "Nome do Roteador"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Enviar solicitações de roteador"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr ""
+#~ "Especifica o tempo de vida, em segundos, do prefixo preferencial anunciado"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr ""
+#~ "Especifica o tempo de vida, em segundos, do prefixo válido anunciado"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Use o tempo de vida preferencial"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Use o tempo de vida válido"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Esperando pelo roteador..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Ativar o servidor NTP embutido"
+
+#~ msgid "Active Leases"
+#~ msgstr "Atribuições Ativas"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Taxa de Bits"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Configuração / Aplicar"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Configuração / Mudanças"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Configuração / Reverter"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "Endereço Físico (MAC)"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encriptado\">Encr.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Rede Local Sem FIo\">WLAN</abbr>-Pesquisa"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Escolha a rede que você quer associar com esta interface de rede sem fio. "
+#~ "Selecione <em>não especificado</em> para não ligar a interface a qualquer "
+#~ "rede ou preencha o campo <em>criar</em> para definir uma nova rede."
+
+#~ msgid "Create Network"
+#~ msgstr "Criar Rede"
+
+#~ msgid "Link"
+#~ msgstr "Enlace"
+
+#~ msgid "Networks"
+#~ msgstr "Redes"
+
+#~ msgid "Power"
+#~ msgstr "Potência"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Redes Wifi no seu ambiente local"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "Notação <abbr title=\"Roteamento entre Domínios sem Classe\">CIDR</abbr>: "
+#~ "endereço/prefixo"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr ""
+#~ "Broadcast <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "Endereços IP alternativos"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Configuração do IPv6"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Nota: Se você escolher a interface aqui que é pertencente a outra rede, "
+#~ "ela será movida para esta rede."
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Você realmente deseja apagar esta interface? A operação não pode ser "
+#~ "revertida!\\nVocê pode perder acesso a este roteador se voc6e está "
+#~ "conectado através desta interface."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Você realmente deseja apagar esta rede sem fio? A operação não pode ser "
+#~ "revertida!\\nVocê pode perder acesso a este roteador se voc6e está "
+#~ "conectado através desta interface."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Você realmente deseja desligar a interface \"%s\"?\\nVocê pode perder "
+#~ "acesso a este roteador se voc6e está conectado através desta interface."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Você realmente deseja desligar a rede?\\nVocê pode perder acesso a este "
+#~ "roteador se voc6e está conectado através desta rede."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "As portas de rede do seu router podem ser combinadas com diversas <abbr "
+#~ "title=\"Rede Local Virtual\">VLAN</abbr>s em que os computadores podem "
+#~ "comunicar diretamente entre si. As <abbr title=\"Rede Local Virtual"
+#~ "\">VLAN</abbr>s são frequentemente utilizadas para separar segmentos de "
+#~ "redes diferentes. Muitas vezes é padrão uma porta para o enlace superior "
+#~ "(Uplink) para a conexão com a próxima rede maior, como a Internet. As "
+#~ "outras portas são, por padrão, utilizadas para conectar uma rede local."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Ativar bufferização"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6-over-IPv4"
+
+#~ msgid "Custom Files"
+#~ msgstr "Arquivos Personalizados"
+
+#~ msgid "Custom files"
+#~ msgstr "Arquivos personalizados"
+
+#~ msgid "Detected Files"
+#~ msgstr "Arquivos Detectados"
+
+#~ msgid "Detected files"
+#~ msgstr "Arquivos detectados"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Arquivos que devem ser mantidos quando gravar um novo firmware"
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Aqui você pode personalizar as configurações e funcionalidades do <abbr "
+#~ "title=\"Interface de configuração Lua\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Ações após a gravação"
+
+#~ msgid ""
+#~ "The following files are detected by the system and will be kept "
+#~ "automatically during sysupgrade"
+#~ msgstr ""
+#~ "Os seguintes arquivos foram detectados pelo sistema e serão mantidos "
+#~ "automaticamente durante uma atualização do sistema"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Estes comandos são executados automaticamente quando uma determinada "
+#~ "configuração da <abbr title=\"Interface de configuração unificada\">UCI</"
+#~ "abbr> está gravada, permitindo mudanças a serem aplicadas "
+#~ "instantaneamente."
+
+#~ msgid ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+#~ msgstr ""
+#~ "Esta é a lista dos padrões de expressão shell para casar com os arquivos "
+#~ "e diretórios incluídos durante a atualização do sistema"
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Interface Web"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "Servidor <abbr title=\"Protocolo de Tunelamento Ponto a Ponto\">PPTP</"
+#~ "abbr>"
+
+#~ msgid "AHCP Settings"
+#~ msgstr "Configurações AHCP"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "Retentativa de ping ARP"
+
+#~ msgid "ATM Settings"
+#~ msgstr "Configurações ATM"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "Aceita anúncios de roteador"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Ponto de acesso (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Opções adicionais do pppd"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "A faixa permitida é de 1 a FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Desconexão automática"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Arquivo de Backup"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configurar o servidor DNS local para usar o servidores de nomes "
+#~ "fornecidos pelo PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Script de conexão"
+
+#~ msgid "Create backup"
+#~ msgstr "Criar backup"
+
+#~ msgid "Default"
+#~ msgstr "Padrão"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Script de desconexão"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Editar listas de pacotes e destinos da instalação"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "Ativar VLANs 4K"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Ativar IPv6 na conexão PPP"
+
+#~ msgid "Firmware image"
+#~ msgstr "Imagem de Firmware"
+
+#~ msgid "Forward DHCP"
+#~ msgstr "Encaminhar DHCP"
+
+#~ msgid "Forward broadcasts"
+#~ msgstr "Encaminhar broadcast"
+
+#~ msgid "HE.net Tunnel ID"
+#~ msgstr "HE.net Tunnel ID"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Aqui você pode fazer o backup e restaurar as configurações do router. "
+#~ "Também pode retornar o router para as configurações padrão."
+
+#~ msgid "Installation targets"
+#~ msgstr "Destinos da Instalação"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Manter arquivos de configuração"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Manter conectada"
+
+#~ msgid "Kernel"
+#~ msgstr "Kernel"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Permitir o pppd substituir a rota padrão atual e usar a interface PPP "
+#~ "como padrão após a conexão ser efeuada com sucesso"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr ""
+#~ "Deixar o pppd executar este script após o estabelecimento do enlace PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Deixar o pppd executar este script antes de terminar o enlace PPP"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Certifique-se que forneceu o código PIN correcto aqui, ou pode bloquear o "
+#~ "seu cartão SIM!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "A maioria deles são servidores de rede, que oferecem um determinado "
+#~ "serviço para seu equipamento ou rede como acesso shell, servindo páginas "
+#~ "web como o <abbr title=\"Interface de configuração Lua\">LuCI</abbr>, "
+#~ "fazendo roteamento, enviando e-mails, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Número de testes de conexão falhadas para iniciar a reconexão automática"
+
+#~ msgid "Override Gateway"
+#~ msgstr "Sobrescrever Gateway"
+
+#~ msgid "PIN code"
+#~ msgstr "Código PIN"
+
+#~ msgid "PPP Settings"
+#~ msgstr "Configurações do PPP"
+
+#~ msgid "Package lists"
+#~ msgstr "Listas de pacotes"
+
+#~ msgid ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> specify the default "
+#~ "VLAN ID added to received untagged frames."
+#~ msgstr ""
+#~ "O <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> da porta especifica o ID "
+#~ "padrão da VLAN adicionado a quadros sem etiquetas."
+
+#~ msgid "Port PVIDs on %q"
+#~ msgstr "PVIDs da Porta em %q"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Proceder com a restauração das configurações padrão do firmware?"
+
+#~ msgid "Processor"
+#~ msgstr "Processador"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Porta RADIUS"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Servidor RADIUS"
+
+#~ msgid "Relay Settings"
+#~ msgstr "Configuração de Relay"
+
+#~ msgid "Replace default route"
+#~ msgstr "Substituir a rota padrão"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Restaurar as configurações para o padrão"
+
+#~ msgid "Routing table ID"
+#~ msgstr "ID da tabela de roteamento"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Segundos de espera para o modem ficar pronto antes de tentar uma conexão"
+
+#~ msgid "Send Router Solicitiations"
+#~ msgstr "Enviar Solicitações de Roteador"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "Endereço IPv4 do Servidor"
+
+#~ msgid "Service type"
+#~ msgstr "Tipo de serviço"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "Serviços executam diversas tarefas no seu equipamento."
+
+#~ msgid "Settings"
+#~ msgstr "Configurações"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Configurar tempo de espera"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Lamentamos, mas o libreCMC não suporta uma atualização do sistema para "
+#~ "esta plataforma.<br /> É necessário gravar manualmente seu equipamento."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr ""
+#~ "Especifique os argumentos adicionais de linha de comando para o pppd aqui"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "O caminho do dispositivo do seu modem, ex. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "Tempo (em segundos) para fim de uma conexão já não utilizada"
+
+#~ msgid "Time Server (rdate)"
+#~ msgstr "Servidor de Hora (rdate)"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "Configurações de Tunelamento"
+
+#~ msgid "Update package lists"
+#~ msgstr "Atualizar listas de pacotes"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Carregar uma imagem libreCMC para a gravar no roteador."
+
+#~ msgid "Upload image"
+#~ msgstr "Carregar imagem"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Utilizar DNS do parceiro"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid ""
+#~ "You can specify multiple DNS servers here, press enter to add a new "
+#~ "entry. Servers entered here will override automatically assigned ones."
+#~ msgstr ""
+#~ "Você pode especificar aqui múltiplos servidores DNS. Pressione \"enter\" "
+#~ "para adicionar uma nova entrada. Os servidores informados aqui "
+#~ "sobrescreverão automaticamente os designados."
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Você precisa instalar os pacotes \"comgt\" para usar UMTS/GPRS, \"ppp-mod-"
+#~ "pppoe\" para PPPoE, \"ppp-mod-pppoa\" para PPPoA ou \"pptp\" para o "
+#~ "suporte PPtP"
+
+#~ msgid "back"
+#~ msgstr "voltar"
+
+#~ msgid "buffered"
+#~ msgstr "em buffer"
+
+#~ msgid "cached"
+#~ msgstr "em cache"
+
+#~ msgid "free"
+#~ msgstr "livre"
+
+#~ msgid "static"
+#~ msgstr "estático"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Interface de configuração Lua\">LuCI</abbr> é uma colecção "
+#~ "gratuita de programas Lua incluindo um Framework Web <abbr title=\"Modelo-"
+#~ "Visualização-Controle\">MVC</abbr> e uma Interface Web para micro-"
+#~ "dispositivos. <abbr title=\"Interface de configuração Lua\">LuCI</abbr> é "
+#~ "licenciado sob a Licença Apache."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "Chaves-<abbr title=\"Shell Seguro\">SSH</abbr>"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Um servidor web HTTP/1.1 ligeiro escrito em C e desenvolvido em Lua para "
+#~ "servir LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Um pequeno servidor web que pode ser utilizado para servir a interface "
+#~ "<abbr title=\"Interface de configuração Lua\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "Addresses"
+#~ msgstr "Endereços"
+
+#~ msgid "Admin Password"
+#~ msgstr "Password do Administrador"
+
+#~ msgid "Alias"
+#~ msgstr "Configuração IP alternativa"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Área de autenticação"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Porta do interface em ponte"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Altera a senha do administrador do sistema (Login <code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Cliente (WDS)"
+
+#~ msgid "Configuration file"
+#~ msgstr "Ficheiro de configuração"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Esgotado o tempo de ligação"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Programadores Contribuintes"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP atribuido"
+
+#~ msgid "Document root"
+#~ msgstr "Diretório raiz"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Activar keep-alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Ponte Ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Aqui pode colar suas Chaves-<abbr title=\"Shell Seguro\">SSH</abbr> "
+#~ "públicas (uma por linha) para a autenticação <abbr title=\"Shell Seguro"
+#~ "\">SSH</abbr> por chave-pública."
+
+#~ msgid "ID"
+#~ msgstr "Identificação de interface em ponte"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Configuração IP"
+
+#~ msgid "Interface Status"
+#~ msgstr ""
+#~ "Aqui encontra informações sobre o estado actual do sistema, como <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr>, frequência do relógio, uso "
+#~ "de memória ou uso da interface de rede de dados."
+
+#~ msgid "Lead Development"
+#~ msgstr "Equipa de Desenvolvimento"
+
+#~ msgid "Master"
+#~ msgstr "AP"
+
+#~ msgid "Master + WDS"
+#~ msgstr "AP+WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "Não configurado"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Senha alterada com sucesso"
+
+#~ msgid "Plugin path"
+#~ msgstr "Directorio de plugins"
+
+#~ msgid "Ports"
+#~ msgstr "Portas"
+
+#~ msgid "Primary"
+#~ msgstr "Primário"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Página do Projecto"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Ahdemo"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Obrigado a"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "A área de autenticação (realm) que será mostrada na prompt de "
+#~ "autenticação das páginas protegidas."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Erro Desconhecido"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "padrão é <code>/etc/httpd.conf</code>"
+
+#~ msgid "Package lists updated"
+#~ msgstr "As listas de pacotes foram actualizadas"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Actualizar os pacotes instalados"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Também os arquivos de logs do kernel ou dos serviços podem ser "
+#~ "consultados aqui para obter uma visão geral sobre o seu estado actual."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Aqui você pode encontrar informações sobre o estado actual do sistema, "
+#~ "tais como <abbr title=\"Central Processing Unit\">CPU</abbr>, frequência "
+#~ "do relógio, uso de memória ou da interface de rede de dados."
+
+#~ msgid "Search file..."
+#~ msgstr "Procurar ficheiro..."
+
+# "free as in freedom" equivale a "livre de liberdade" não de "grátis"
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "O <abbr title=\"Interface de configuração Lua\">LuCI</abbr> é um "
+#~ "interface gráfico livre, flexível e fácil de utilizar para configurar o "
+#~ "libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "E agora divirta-se com o seu router!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Agradecemos os seus comentários e sugestões por forma a podermos "
+#~ "continuar a melhorar este interface."
+
+#~ msgid "Hello!"
+#~ msgstr "Olá!"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Aviso: No <abbr title=\"Interface de configuração Lua\">LuCI</abbr> as "
+#~ "alterações devem ser confirmadas clicando em Alterações - Salvar &amp; "
+#~ "Aplicar antes de serem aplicadas."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Nas próximas páginas, pode ajustar todas as definições importantes do seu "
+#~ "router."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr ""
+#~ "A equipa do <abbr title=\"Interface de configuração Lua\">LuCI</abbr>"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Esta é a área de administração do <abbr title=\"Interface de configuração "
+#~ "Lua\">LuCI</abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Interface do Utilizador"
+
+#~ msgid "enable"
+#~ msgstr "activar"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr " (opcional)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "Porta do <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr> será "
+#~ "consultado na ordem do arquivo resolv.conf"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"máximo\">max.</abbr> de <abbr title=\"Protocolo de "
+#~ "Configuração Dinâmica de Hosts\">DHCP</abbr>-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "tamanho <abbr title=\"máximo\">max.</abbr> do pacote <abbr title="
+#~ "\"Mecanismos de Extensão do Sistema de Nomes de Domínios\">EDNS0</abbr>"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "Isolamento do AP"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Adicione a rede Wifi à rede física"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliases"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Criar Rede"
+
+#~ msgid "Devices"
+#~ msgstr "Dispositivos"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Não encaminhar as pesquisas reversas para redes locais"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Activar servidor TFTP"
+
+#~ msgid "Errors"
+#~ msgstr "Erros"
+
+#~ msgid "Essentials"
+#~ msgstr "Básico"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Expandir Hosts"
+
+#~ msgid "First leased address"
+#~ msgstr "Primeiro endereço de atribuição"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Resolve problemas com websites indisponíveis, submissão de formulários ou "
+#~ "comportamentos inesperados de alguns ISP's."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Endereço do Hardware"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Aqui pode configurar os dispositivos wifi instalados. "
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignorar <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Independente (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Ligação Internet"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Cliente (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Atribuições"
+
+#~ msgid "Local Domain"
+#~ msgstr "Domínio Local"
+
+#~ msgid "Local Network"
+#~ msgstr "Rede Local"
+
+#~ msgid "Local Server"
+#~ msgstr "Servidor Local"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Imagem para o boot remoto (PXE)"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Nome da Rede (<abbr title=\"Identificador de Conjunto de Serviços "
+#~ "Estendidos\">ESSID</abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Número de endereços atribuidos"
+
+#~ msgid "Path"
+#~ msgstr "Directório"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Executar Acções"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Impede a comunicação de Cliente para Cliente"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Ponto de Acesso (Access Point)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Ficheiro resolv.conf"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Directório raiz do servidor TFTP"
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Foram aplicadas as seguintes alterações "
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Quando gravar um novo firmware com o <abbr title=\"Interface de "
+#~ "configuração Lua\">LuCI</abbr> estes arquivos serão adicionados ao novo "
+#~ "firmware instalado."
+
+#, fuzzy
+#~ msgid "Wireless Scan"
+#~ msgstr "Wireless"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Com o <abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</"
+#~ "abbr> os membros da rede podem automaticamente receber as suas "
+#~ "configurações de rede (endereço-<abbr title=\"Protocolo de Internet\">IP</"
+#~ "abbr>, netmask, servidor-<abbr title=\"Sistema de Nomes de Domínios"
+#~ "\">DNS</abbr>, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Pode servir várias redes wifi com o mesmo dispositivo. Esteja ciente de "
+#~ "que existem certas restrições específicas do hardware e do controlador. "
+#~ "Pode normalmente operar 1 rede Ad-Hoc ou até 3 redes AP e 1 Cliente "
+#~ "simultaneamente."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Precisa de instalar os pacotes \"ppp-mod-pppoe\" para PPPoE ou \"pptp\" "
+#~ "para o suporte PPtP"
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#~ msgid "additional hostfile"
+#~ msgstr "ficheiro de hosts adicional"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr ""
+#~ "Adiciona os nomes dos domínios às entradas de hosts no arquivo resolv.conf"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "ligação automática"
+
+#~ msgid "concurrent queries"
+#~ msgstr "Consultas simultâneas"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "desabilitar <abbr title=\"Protocolo de Configuração Dinâmica de Hosts"
+#~ "\">DHCP</abbr> para esta interface"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "desligar quando ocioso por"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "Não fazer cache de desconhecidos"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "Filtro de consultas inuteis-<abbr title=\"Sistema de Nomes de Domínios"
+#~ "\">DNS</abbr> de sistemas windows"
+
+#~ msgid "installed"
+#~ msgstr "instalado"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "Localizar o hostname dependendo de sua sub-rede"
+
+#~ msgid "not installed"
+#~ msgstr "não instalado"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "Impede o cache de respostas-<abbr title=\"Sistema de Nomes de Domínios"
+#~ "\">DNS</abbr> negativas"
+
+#~ msgid "query port"
+#~ msgstr "porta para consultas"
+
+#~ msgid "transmitted / received"
+#~ msgstr "transmitido / recebido"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "redes contidas"
+
+#~ msgid "all"
+#~ msgstr "todos"
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid "Distance"
+#~ msgstr "Distância"
+
+#~ msgid "Legend"
+#~ msgstr "Legenda"
+
+#~ msgid "Library"
+#~ msgstr "Biblioteca"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "veja sobre &#39;%s&#39; na página de manual (man)"
+
+#~ msgid "Package Manager"
+#~ msgstr "Gestor de Pacotes"
+
+#~ msgid "Service"
+#~ msgstr "Serviço"
+
+#~ msgid "Statistics"
+#~ msgstr "Estatísticas"
+
+#~ msgid "zone"
+#~ msgstr "Zona"
diff --git a/trunk/package/luci/po/pt_BR/commands.po b/trunk/package/luci/po/pt_BR/commands.po
new file mode 100644
index 00000000..83c7bd5d
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/commands.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-03-15 22:02+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Uma pequena descrição textual do comando configurado"
+
+msgid "Access command with"
+msgstr "Acessar o comando com"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Permitir a execução do comando e descarregar o resultado sem autenticação "
+"prévia"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Permitir ao usuário inserir argumentos de linha de comando adicionais"
+
+msgid "Arguments:"
+msgstr "Argumentos:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Dados binários não mostrados, mas podem ser baixados."
+
+msgid "Code:"
+msgstr "Código:"
+
+msgid "Collecting data..."
+msgstr "Adquirindo dados..."
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Command failed"
+msgstr "O comando falhou"
+
+msgid "Command line to execute"
+msgstr "Linha de comandos a executar"
+
+msgid "Command successful"
+msgstr "Comando executado com sucesso"
+
+msgid "Command:"
+msgstr "Comando:"
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Custom Commands"
+msgstr "Comandos Personalizados"
+
+msgid "Custom arguments"
+msgstr "Argumentos personalizados"
+
+msgid "Dashboard"
+msgstr "Painel de Controle"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Download"
+msgstr "Baixar"
+
+msgid "Failed to execute command!"
+msgstr "Falha ao executar comando!"
+
+msgid "Link"
+msgstr "Endereço"
+
+msgid "Loading"
+msgstr "Carregando"
+
+msgid "Public access"
+msgstr "Acesso público"
+
+msgid "Run"
+msgstr "Executar"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Esta página permite a configuração de comandos personalizados que podem ser "
+"facilmente executados através da interface web."
+
+msgid "Waiting for command to complete..."
+msgstr "Aguardando a conclusão do comando..."
diff --git a/trunk/package/luci/po/pt_BR/coovachilli.po b/trunk/package/luci/po/pt_BR/coovachilli.po
new file mode 100644
index 00000000..9c219812
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/coovachilli.po
@@ -0,0 +1,657 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2011-10-18 20:37+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Configuração de rede"
+
+msgid "RADIUS configuration"
+msgstr "Configuração de RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Autenticação UAM e MAC"
+
+#~ msgid "General configuration"
+#~ msgstr "Configuração Geral"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Definições gerais do CoovaChilli"
+
+#~ msgid "Command socket"
+#~ msgstr "Soquete de comando"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "Soquete UNIX para comunicação com chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Intervalo de atualização da configuração"
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Reler o arquivo de configuração e faça a busca DNS a cada intervalo de "
+#~ "segundos. Isto tem o mesmo efeito que o envio do sinal HUP. Se o "
+#~ "intervalo for 0, (zero) esta funcionalidade será desativada."
+
+#~ msgid "Pid file"
+#~ msgstr "Arquivo de PID"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr "Nome do arquivo onde será armazenado o PID"
+
+#~ msgid "State directory"
+#~ msgstr "Diretório de estado"
+
+#~ msgid "Directory of non-volatile data"
+#~ msgstr "Diretório para dados não-voláteis"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "Configuração TUN/TAP"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Configuração de Rede/Tun"
+
+#~ msgid "Network down script"
+#~ msgstr "Script de descida de rede"
+
+#~ msgid ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+#~ msgstr ""
+#~ "Script executado após o estado de uma sessão ser alterado de autorizado "
+#~ "para não-autorizado"
+
+#~ msgid "Network up script"
+#~ msgstr "Script de subida da rede"
+
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr "Script executado após a interface tun de rede ter sido levantada"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Servidor DNS primário"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Servidor DNS secundário"
+
+#~ msgid "Domain name"
+#~ msgstr "Domínio"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr ""
+#~ "Usado para informar o cliente sobre o domínio a ser utilizado para "
+#~ "consultas DNS"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Conjunto de endereços IP dinâmicos"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Especifica um conjunto de endereços IP dinâmicos"
+
+#~ msgid "IP down script"
+#~ msgstr "Script de descida da rede IP"
+
+#~ msgid "Script executed after the tun network interface has been taken down"
+#~ msgstr "Script executado após a rede da interface tun seja baixada"
+
+#~ msgid "IP up script"
+#~ msgstr "Script de subida da rede IP"
+
+#~ msgid ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+#~ msgstr "Script executado após a rede da interface TUN/TAP seja levantadas"
+
+#~ msgid "Uplink subnet"
+#~ msgstr "Subrede do enlace superior (uplink)"
+
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr "Endereço de rede da interface do enlace superior (notação CIDR)"
+
+#~ msgid "Static IP address pool"
+#~ msgstr "Conjunto de endereços IP estáticos"
+
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Especifica um conjunto de endereços IP estáticos"
+
+#~ msgid "TUN/TAP device"
+#~ msgstr "Dispositivo TUN/TAP"
+
+#~ msgid "The specific device to use for the TUN/TAP interface"
+#~ msgstr "O dispositivo especificado para ser usado pela interface TUN/TAP"
+
+#~ msgid "TX queue length"
+#~ msgstr "Tamanho da fila de envio (TX)"
+
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr "O tamanho da fila de envio (TX) para ser usado na interface TUN/TAP"
+
+#~ msgid "Use TAP device"
+#~ msgstr "Use dispositivo TAP"
+
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Use o dispositivo TAP ao invés de TUN"
+
+#~ msgid "DHCP configuration"
+#~ msgstr "Configuração do DHCP"
+
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Ajusta as opções do DHCP para clientes a se conectarem"
+
+#~ msgid "DHCP end number"
+#~ msgstr "Número final do DHCP"
+
+#~ msgid "Where to stop assigning IP addresses (default 254)"
+#~ msgstr "Onde terminar a atribuição de endereços IP (padrão 254)"
+
+#~ msgid "DHCP interface"
+#~ msgstr "Interface DHCP"
+
+#~ msgid "Ethernet interface to listen to for the downlink interface"
+#~ msgstr "Interface Ethernet para escutar por conexões dos clientes"
+
+#~ msgid "Listen MAC address"
+#~ msgstr "Endereço MAC de escuta"
+
+#~ msgid ""
+#~ "MAC address to listen to. If not specified the MAC address of the "
+#~ "interface will be used"
+#~ msgstr ""
+#~ "Endereço MAC de escuta. Se não especificado, o endereço MAC da interface "
+#~ "será usado"
+
+#~ msgid "DHCP start number"
+#~ msgstr "Número inicial do DHCP"
+
+#~ msgid "Where to start assigning IP addresses (default 10)"
+#~ msgstr "A partir de onde iniciará a atribuição de endereços IP (padrão 10)"
+
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Habilite IEEE 802.1x"
+
+#~ msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
+#~ msgstr "Habilite autenticação IEEE 802.1x e escute por requisições EAP"
+
+#~ msgid "Leasetime"
+#~ msgstr "Tempo de atribuição"
+
+#~ msgid "Use a DHCP lease of seconds (default 600)"
+#~ msgstr "Use o tempo de atribuição do DHCP, em segundos (padrão 600)"
+
+#~ msgid "Allow session update through RADIUS"
+#~ msgstr "Permite a atualização da sessão através do RADIUS"
+
+#~ msgid ""
+#~ "Allow updating of session parameters with RADIUS attributes sent in "
+#~ "Accounting-Response"
+#~ msgstr ""
+#~ "Permite a atualização dos parâmetros da sessão com atributos RADIUS "
+#~ "enviados na Contabilidade-Resposta"
+
+#~ msgid "Admin password"
+#~ msgstr "Senha do Administrador"
+
+#~ msgid ""
+#~ "Password to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Senha para a autenticação do usuário administrador para pegar as "
+#~ "configurações do chili e estabelecer uma sessão de dispositivo \"sistema\""
+
+#~ msgid "Admin user"
+#~ msgstr "Usuário administrador"
+
+#~ msgid ""
+#~ "User-name to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Nome do usuário para a autenticação do usuário administrador para pegar "
+#~ "as configurações do chili e estabelecer uma sessão de dispositivo "
+#~ "\"sistema\""
+
+#~ msgid "Do not check disconnection requests"
+#~ msgstr "Não verifique as requisições de desconexão"
+
+#~ msgid "Do not check the source IP address of radius disconnect requests"
+#~ msgstr ""
+#~ "Não verifique o endereço IP de origem das requisições de desconexão do "
+#~ "radius"
+
+#~ msgid "RADIUS disconnect port"
+#~ msgstr "Porta de desconexão do RADIUS"
+
+#~ msgid "UDP port to listen to for accepting radius disconnect requests"
+#~ msgstr ""
+#~ "Porta UDP de escuta para aceitar requisições de desconexão do radius"
+
+#~ msgid "NAS IP"
+#~ msgstr "IP do NAS"
+
+#~ msgid "Value to use in RADIUS NAS-IP-Address attribute"
+#~ msgstr "Valor para usar no atributo NAS-IP-Address do RADIUS"
+
+#~ msgid "NAS MAC"
+#~ msgstr "MAC do NAS"
+
+#~ msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
+#~ msgstr "Endereço MAC para usar no atributo Called-Station-ID do RADIUS"
+
+#~ msgid "Allow OpenID authentication"
+#~ msgstr "Permitir autenticação OpenID"
+
+#~ msgid ""
+#~ "Allows OpenID authentication by sending ChilliSpot-Config=allow-"
+#~ "openidauth in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Permitir autenticação OpenID enviando ChilliSpot-Config=allow-openidauth "
+#~ "na Resquisição de Acesso do Radius"
+
+#~ msgid "RADIUS accounting port"
+#~ msgstr "Porta de contabilidade do RADIUS"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius accounting requests (default 1813)"
+#~ msgstr ""
+#~ "O número da porta UDP para ser usada pela requisição de contabilização do "
+#~ "radius (padrão 1813)"
+
+#~ msgid "RADIUS authentication port"
+#~ msgstr "Porta de autenticação do RADIUS"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius authentication requests (default "
+#~ "1812)"
+#~ msgstr ""
+#~ "O número da porta UDP para ser usada pela requisição de autenticação do "
+#~ "radius (padrão 1812)"
+
+#~ msgid "Option radiuscalled"
+#~ msgstr "Opção radiuscalled"
+
+#~ msgid "RADIUS listen address"
+#~ msgstr "Endereço de escuta do RADIUS"
+
+#~ msgid "Local interface IP address to use for the radius interface"
+#~ msgstr "Endereço IP da interface local para a interface radius"
+
+#~ msgid "RADIUS location ID"
+#~ msgstr "ID da localização do RADIUS"
+
+#~ msgid "WISPr Location ID"
+#~ msgstr "ID da Localização WISPr"
+
+#~ msgid "RADIUS location name"
+#~ msgstr "Nome da localização do RADIUS"
+
+#~ msgid "WISPr Location Name"
+#~ msgstr "Nome da localização WISPr"
+
+#~ msgid "NAS ID"
+#~ msgstr "ID do NAS"
+
+#~ msgid "Network access server identifier"
+#~ msgstr "Identificador do servidor de acesso à rede"
+
+#~ msgid "Option radiusnasip"
+#~ msgstr "Opção radiusnasip"
+
+#~ msgid "NAS port type"
+#~ msgstr "Tipo de porta NAS"
+
+#~ msgid ""
+#~ "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
+#~ msgstr ""
+#~ "Valor do atributo do NAS-Port-Type. O padrão é 19 (IEEE-802.11-Sem fio)"
+
+#~ msgid "Send RADIUS VSA"
+#~ msgstr "Enviar VSA do RADIUS"
+
+#~ msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
+#~ msgstr ""
+#~ "Enviar o ChilliSpot-OriginalURL do VSA do RADIUS na Requisição de Acesso"
+
+#~ msgid "RADIUS secret"
+#~ msgstr "Segredo do RADIUS"
+
+#~ msgid "Radius shared secret for both servers"
+#~ msgstr "Segredo compartilhado entre ambos os servidores Radius"
+
+#~ msgid "RADIUS server 1"
+#~ msgstr "Servidor 1 do RADIUS"
+
+#~ msgid "The IP address of radius server 1"
+#~ msgstr "Endereço IP do servidor 1 do radius"
+
+#~ msgid "RADIUS server 2"
+#~ msgstr "Servidor 2 do RADIUS"
+
+#~ msgid "The IP address of radius server 2"
+#~ msgstr "Endereço IP do servidor 2 do radius"
+
+#~ msgid "Swap octets"
+#~ msgstr "Troque octetos"
+
+#~ msgid ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+#~ msgstr ""
+#~ "Troca o significado de \"octetos de entrada\" e \"octetos de saída\" como "
+#~ "está relatado nos atributos RADIUS"
+
+#~ msgid "Allow WPA guests"
+#~ msgstr "Permite convidados WPA"
+
+#~ msgid ""
+#~ "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+#~ "guests in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Permite a autenticação de convidados WPA enviando ChilliSpot-Config=allow-"
+#~ "wpa-guests na Requisição de Acesso do RADIUS"
+
+#~ msgid "Proxy client"
+#~ msgstr "Cliente proxy"
+
+#~ msgid ""
+#~ "IP address from which radius requests are accepted. If omitted the server "
+#~ "will not accept radius requests"
+#~ msgstr ""
+#~ "Endereço IP do qual as requisições radius serão aceitas. Se omitido, o "
+#~ "servidor não vai aceitar requisições radius"
+
+#~ msgid "Proxy listen address"
+#~ msgstr "Endereço de escuta do proxy"
+
+#~ msgid "Local interface IP address to use for accepting radius requests"
+#~ msgstr ""
+#~ "Endereço IP da interface local usado para aceitar as requisições radius"
+
+#~ msgid "Proxy port"
+#~ msgstr "Porta do Proxy"
+
+#~ msgid "UDP Port to listen to for accepting radius requests"
+#~ msgstr "Porta UDP para aceitar requisições radius"
+
+#~ msgid "Proxy secret"
+#~ msgstr "Segredo do Proxy"
+
+#~ msgid "Radius shared secret for clients"
+#~ msgstr "Segredo compartilhado do Radius para clientes"
+
+#~ msgid "UAM configuration"
+#~ msgstr "Configuração UAM"
+
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Configurações do Método de Configuração Unificado"
+
+#~ msgid "Use Chilli XML"
+#~ msgstr "Use XML do Chilli"
+
+#~ msgid "Return the so-called Chilli XML along with WISPr XML"
+#~ msgstr "Retorna o famoso XML do Chili juntamente com o XML do WISPr"
+
+#~ msgid "Default idle timeout"
+#~ msgstr "Estouro de tempo de ociosidade padrão"
+
+#~ msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Estouro de tempo de ociosidade padrão, a não ser que seja definido pelo "
+#~ "RADIUS (padrão é 0)"
+
+#~ msgid "Default interim interval"
+#~ msgstr "Intervalo padrão como interino"
+
+#~ msgid ""
+#~ "Default interim-interval for RADIUS accounting unless otherwise set by "
+#~ "RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Intervalo padrão como interino para a contabilidade do RADIUS, a não ser "
+#~ "que seja definido pelo RADIUS (padrão é 0)"
+
+#~ msgid "Default session timeout"
+#~ msgstr "Estouro de tempo padrão da sessão"
+
+#~ msgid ""
+#~ "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Estouro de tempo padrão da sessão, a não ser que seja definido pelo "
+#~ "RADIUS (padrão é 0)"
+
+#~ msgid "Inspect DNS traffic"
+#~ msgstr "Inspeciona tráfego DNS"
+
+#~ msgid ""
+#~ "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
+#~ "records to prevent dns tunnels (experimental)"
+#~ msgstr ""
+#~ "Inspeciona os pacotes DNS e descarta respostas para qualquer registro que "
+#~ "não seja A, CNAME, SOA ou MX. Isto evita túneis pelo DNS (experimental)"
+
+#~ msgid "Local users file"
+#~ msgstr "Arquivo de usuários locais"
+
+#~ msgid ""
+#~ "A colon seperated file containing usernames and passwords of locally "
+#~ "authenticated users"
+#~ msgstr ""
+#~ "Um arquivo separado por dois pontos (:) contendo o nome de usuário e "
+#~ "senhas para usuários autenticados localmente"
+
+#~ msgid "Location name"
+#~ msgstr "Nome da localização"
+
+#~ msgid "Human readable location name used in JSON interface"
+#~ msgstr "Nome da localização legível usado na interface JSON"
+
+#~ msgid "Do not redirect to UAM server"
+#~ msgstr "Não redirecionar para servidor UAM"
+
+#~ msgid ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+#~ msgstr ""
+#~ "Não redirecione para o servidor UAM quando o login for bem sucedido. "
+#~ "Somente redirecione para a URL original"
+
+#~ msgid "Do not do WISPr"
+#~ msgstr "Não faça WISPr"
+
+#~ msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
+#~ msgstr ""
+#~ "Não faça qualquer XML do WISPr. Ao invés disto, assuma que o servidor "
+#~ "está fazendo isto"
+
+#~ msgid "Post auth proxy"
+#~ msgstr "Proxy após a autenticação"
+
+#~ msgid ""
+#~ "Used with postauthproxyport to define a post authentication HTTP proxy "
+#~ "server"
+#~ msgstr ""
+#~ "Usado em conjunto com postauthproxyport para definir um servidor PROXY "
+#~ "HTTP após a autenticação"
+
+#~ msgid "Post auth proxy port"
+#~ msgstr "Porta do proxy após a autenticação"
+
+#~ msgid ""
+#~ "Used with postauthproxy to define a post authentication HTTP proxy server"
+#~ msgstr ""
+#~ "Usado em conjunto com postauthproxyport para definir um servidor PROXY "
+#~ "HTTP após a autenticação"
+
+#~ msgid "Allowed resources"
+#~ msgstr "Recursos permitidos"
+
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr ""
+#~ "Lista de recursos que o cliente pode acessar sem antes se autenticar"
+
+#~ msgid "Allow any DNS server"
+#~ msgstr "Permitir qualquer Servidor DNS"
+
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr "Permitir qualquer servidor DNS para clientes não autenticados"
+
+#~ msgid "Allow any IP address"
+#~ msgstr "Permitir qualquer endereço IP"
+
+#~ msgid ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+#~ msgstr ""
+#~ "Permitir que clientes usem qualquer configuração de IP desejada usando a "
+#~ "técnica de falsificação de APR (experimental)"
+
+#~ msgid "Allowed domains"
+#~ msgstr "Domínios permitidos"
+
+#~ msgid ""
+#~ "Defines a list of domain names to automatically add to the walled garden"
+#~ msgstr ""
+#~ "Define uma lista de domínios automaticamente adicionados para acesso da "
+#~ "zona controlada"
+
+#~ msgid "UAM homepage"
+#~ msgstr "Página do UAM"
+
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr "URL da página para onde redirecionar os usuários não autenticados"
+
+#~ msgid "UAM static content port"
+#~ msgstr "Porta de conteúdo estático do UAM"
+
+#~ msgid "TCP port to bind to for only serving embedded content"
+#~ msgstr "Porta TCP para somente servidor conteúdo embutido"
+
+#~ msgid "UAM listening address"
+#~ msgstr "Endereço de escuta do UAM"
+
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr "Endereço IP para escutar pela autenticação dos clientes"
+
+#~ msgid "UAM logout IP"
+#~ msgstr "IP de desautenticação do UAM"
+
+#~ msgid ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+#~ msgstr ""
+#~ "Use este endereço IP para instantaneamente desautenticar um cliente que a "
+#~ "acessar (padrão é 1.1.1.1)"
+
+#~ msgid "UAM listening port"
+#~ msgstr "Porta de escuta do UAM"
+
+#~ msgid "TCP port to bind to for authenticating clients (default 3990)"
+#~ msgstr "Porta de escuta do UAM para autenticar clientes (padrão é 3990)"
+
+#~ msgid "UAM secret"
+#~ msgstr "Segredo do UAM"
+
+#~ msgid "Shared secret between uamserver and chilli"
+#~ msgstr "Segredo compatilhado entre o servidor UAM e o chilli"
+
+#~ msgid "UAM server"
+#~ msgstr "Servidor UAM"
+
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr "URL do servidor web usado para autenticar os clientes"
+
+#~ msgid "UAM user interface"
+#~ msgstr "Interface do usuário do UAM"
+
+#~ msgid ""
+#~ "An init.d style program to handle local content on the uamuiport web "
+#~ "server"
+#~ msgstr ""
+#~ "Um programa estilo init.d para tratar o conteúdo local no servidor web "
+#~ "uamuiport"
+
+#~ msgid "Use status file"
+#~ msgstr "Usar o arquivo de estado"
+
+#~ msgid ""
+#~ "Write the status of clients in a non-volatile state file (experimental)"
+#~ msgstr ""
+#~ "Escreva o estado dos clientes em um arquivo de estado não volátil "
+#~ "(experimental)"
+
+#~ msgid "WISPr login url"
+#~ msgstr "URL de login do WISPr"
+
+#~ msgid "Specific URL to be given in WISPr XML LoginURL"
+#~ msgstr "Especifica a URL para ser dada no LoginURL do XML do WISPr"
+
+#~ msgid "CGI program"
+#~ msgstr "Programa CGI"
+
+#~ msgid ""
+#~ "Executable to run as a CGI type program (like haserl) for URLs with "
+#~ "extention .chi"
+#~ msgstr ""
+#~ "Executável para rodar como um programa do tipo CGI (como o haserl) para "
+#~ "URLs com a extensão .chi"
+
+#~ msgid "Web content directory"
+#~ msgstr "Diretório de conteúdo Web"
+
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr "Diretório onde o conteúdo web local embutido fica localizado"
+
+#~ msgid "MAC configuration"
+#~ msgstr "Configuração do MAC"
+
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Configurar a autenticação MAC"
+
+#~ msgid "Allowed MAC addresses"
+#~ msgstr "Endereços MAC permitidos"
+
+#~ msgid "List of MAC addresses for which MAC authentication will be performed"
+#~ msgstr ""
+#~ "Lista dos endereços MAC permitidos para os quais a autenticação MAC será "
+#~ "realizada"
+
+#~ msgid "Authenticate locally allowed MACs"
+#~ msgstr "Autenticar MACs autorizados localmente"
+
+#~ msgid "Authenticate allowed MAC addresses without the use of RADIUS"
+#~ msgstr "Autenticar os endereços MAC autorizados sem usar o RADIUS"
+
+#~ msgid "Enable MAC authentification"
+#~ msgstr "Habilita a autenticação MAC"
+
+#~ msgid "Try to authenticate all users based on their mac address alone"
+#~ msgstr ""
+#~ "Tente autenticar todos os usuários baseados somente no seu endereço MAC"
+
+#~ msgid "Password"
+#~ msgstr "Senha"
+
+#~ msgid "Password used when performing MAC authentication"
+#~ msgstr "Senha usada para realizar a autenticação MAC"
+
+#~ msgid "Suffix"
+#~ msgstr "Sufixo"
+
+#~ msgid ""
+#~ "Suffix to add to the MAC address in order to form the User-Name, which is "
+#~ "sent to the radius server"
+#~ msgstr ""
+#~ "Sufixo para adicionar ao endereço MAC que forma o nome do usuário, o qual "
+#~ "é enviado ao servidor radius"
diff --git a/trunk/package/luci/po/pt_BR/ddns.po b/trunk/package/luci/po/pt_BR/ddns.po
new file mode 100644
index 00000000..49fa5cee
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/ddns.po
@@ -0,0 +1,90 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2012-11-03 07:02+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Verifique por alterações no endereço IP a cada"
+
+msgid "Check-time unit"
+msgstr "Unidade de tempo para verificação"
+
+msgid "Custom update-URL"
+msgstr "URL para atualização personalizada"
+
+msgid "Dynamic DNS"
+msgstr "DNS Dinâmico"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"O DNS dinâmico permite que o seu roteador possa ser encontrado a partir de "
+"um nome fixo, mesmo usando um Endereço IP dinâmico."
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "Force update every"
+msgstr "Forçar atualização a cada"
+
+msgid "Force-time unit"
+msgstr "Unidade de tempo para atualização forçada"
+
+msgid "Hostname"
+msgstr "Nome do computador"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid "Service"
+msgstr "Serviço"
+
+msgid "Source of IP address"
+msgstr "Origem do Endereço IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Usuário"
+
+msgid "custom"
+msgstr "personalizado"
+
+# Hours
+msgid "h"
+msgstr "h"
+
+msgid "interface"
+msgstr "interface"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "min"
+
+msgid "network"
+msgstr "rede"
+
+#~ msgid "Event interface"
+#~ msgstr "Interface de eventos"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr ""
+#~ "Na subida de qual interface que o processo do script ddns deve ser iniciado"
diff --git a/trunk/package/luci/po/pt_BR/diag_core.po b/trunk/package/luci/po/pt_BR/diag_core.po
new file mode 100644
index 00000000..e27315bc
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/diag_core.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-08 03:14+0200\n"
+"Last-Translator: luizluca <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configura os Diagnósticos"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Os diagnósticos disponíveis neste menu dependem de quais módulos você tem "
+"instalado no seu dispositivo."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"As entradas no menu permitem que você realize diagnósticos em seu sistema "
+"para ajudar na resolução de problemas."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Com este menu, você pode configurar o diagnóstico de rede como varredura de "
+"dispositivos e testes de ping."
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d_diag"
diff --git a/trunk/package/luci/po/pt_BR/diag_devinfo.po b/trunk/package/luci/po/pt_BR/diag_devinfo.po
new file mode 100644
index 00000000..53face0d
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/diag_devinfo.po
@@ -0,0 +1,220 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-17 23:51+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Actions"
+msgstr "Ações"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Beginning of MAC address range"
+msgstr "Começo da faixa de endereços MAC"
+
+msgid "Config Phone Scan"
+msgstr "Configurar a Busca por Telefone"
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Configure Scans"
+msgstr "Configurar Scans"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Configura busca por dispositivos em redes específicas. Ao se reduzir "
+"'Timeout', 'Repeat Count' e/ou 'Sleep Between Requests' pode-se agilizar "
+"buscas, mas também pode não encontrar alguns dispositivos."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Configura busca por dispositivos com suporte a SIP em redes específicas. Ao "
+"se reduzir 'Timeout', 'Repeat Count' e/ou 'Sleep Between Requests' pode-se "
+"agilizar buscas, mas também pode não encontrar alguns dispositivos."
+
+msgid "Delete"
+msgstr "Apagar"
+
+msgid "Device Scan Config"
+msgstr "Configurar a Busca por Dispositivos"
+
+msgid "Device Type"
+msgstr "Tipo de dispositivo"
+
+msgid "Devices discovered for"
+msgstr "Dispositivos descobertos para"
+
+msgid "Devices on Network"
+msgstr "Dispositivos na Rede"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "End of MAC address range"
+msgstr "Final da faixa de endereços MAC"
+
+msgid "Go to relevant configuration page"
+msgstr "Vá para página de configuração relevante"
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Invalid"
+msgstr "Inválido"
+
+# Link like <a> or network link?
+msgid "Link to Device"
+msgstr "Ligar ao Dispositivo"
+
+msgid "MAC Address"
+msgstr "Endereço MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr "Sobrescrição da informação do dispositivo MAC"
+
+msgid "MAC Device Override"
+msgstr "Sobrescreve o Dispositivo MAC"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"Faixa MAC e informação usada para sobrescrever os bancos de dados do sistema "
+"e IEEE"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Milissegundos para esperar entre requisições (padrão 100)"
+
+msgid "Model"
+msgstr "Modelo"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Device Scan"
+msgstr "Busca por dispositivo de rede"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Configuração de busca por dispositivo de rede"
+
+msgid "Networks to scan for devices"
+msgstr "Redes a serem pesquisadas por dispositivos"
+
+msgid "Networks to scan for supported devices"
+msgstr "Redes a serem pesquisadas por dispositivos suportados"
+
+msgid "No SIP devices"
+msgstr "Nenhum dispositivo SIP"
+
+msgid "No devices detected"
+msgstr "Nenhum dispositivo detectado"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Número de vezes para enviar requisições (padrão 1 )"
+
+msgid "OUI Owner"
+msgstr "Dono da OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Sobrescrever a informação retornada pelo MAC para o Script de Informação do "
+"Dispositivo (mac-to_devinfo) para uma faixa especificada de Endereços MAC"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Realiza buscas (pode levar alguns minutos)"
+
+msgid "Phone Information"
+msgstr "Informação do Telefone"
+
+msgid "Phone Scan"
+msgstr "Busca por Telefone"
+
+msgid "Phone Scanning Configuration"
+msgstr "Configuração da Busca por Telefone"
+
+msgid "Phones"
+msgstr "Telefones"
+
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Raw"
+msgstr "Bruto"
+
+msgid "Repeat Count"
+msgstr "Quantidade de Repetições"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Buscas Repetidas (pode levar alguns minutos)"
+
+msgid "SIP Device Information"
+msgstr "Informação de Dispositivo SIP"
+
+msgid "SIP Device Scan"
+msgstr "Busca por Dispositivos SIP"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Configuração da Busca por Dispositivos SIP"
+
+msgid "SIP Devices on Network"
+msgstr "Dispositivos SIP na Rede"
+
+msgid "SIP devices discovered for"
+msgstr "Dispositivos SIP descobertos para"
+
+msgid "Scan for devices on specified networks."
+msgstr "Busca por dispositivos nas redes especificadas."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Busca por dispositivos com suporte a SIP em redes especificadas."
+
+msgid "Scanning Configuration"
+msgstr "Configuração de busca"
+
+msgid "Scans for devices on specified networks."
+msgstr "Busca por dispositivos nas redes especificadas."
+
+msgid "Sleep Between Requests"
+msgstr "Espera Entre Requisições"
+
+msgid "Subnet"
+msgstr "Subrede"
+
+msgid "This section contains no values yet"
+msgstr "Esta seção contém nenhum valor ainda"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Tempo para esperar por respostas em segundos (padrão 10)"
+
+msgid "Timeout"
+msgstr "Estouro de tempo"
+
+msgid "Use Configuration"
+msgstr "Usar configuração"
+
+msgid "Vendor"
+msgstr "Fabricante"
+
+msgid "check other networks"
+msgstr "verifique outras redes"
diff --git a/trunk/package/luci/po/pt_BR/ffwizard.po b/trunk/package/luci/po/pt_BR/ffwizard.po
new file mode 100644
index 00000000..5bc0c118
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/ffwizard.po
@@ -0,0 +1,178 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-27 00:35+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Permitir a transferência de estatísticas anônimas sobre este nó"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Marque isto para proteger sua rede local (LAN) de outros nós ou clientes"
+
+msgid "Configure network"
+msgstr "Configurar a rede"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Conecte seu nó com outros nós por um túnel pela internet."
+
+msgid "DHCP IP range"
+msgstr "Faixa de IP do DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "O DHCP irá atribuir automaticamente endereços IP para os clientes"
+
+msgid "DNS Server"
+msgstr "Servidor DNS"
+
+msgid "Enable DHCP"
+msgstr "Habilitar DHCP"
+
+msgid "Gateway"
+msgstr "Roteador"
+
+msgid "Heartbeat"
+msgstr "Pulsação de Monitoramento (Heartbeat)"
+
+msgid "IP address"
+msgstr "Endereço IP"
+
+msgid "L2gvpn tunnel"
+msgstr "Tunel l2gvpn"
+
+msgid "Limit download bandwidth"
+msgstr "Limitar a velocidade para baixar"
+
+msgid "Limit upload bandwidth"
+msgstr "Limitar a velocidade para subir"
+
+msgid "Mesh IP address"
+msgstr "Endereço IP da rede em malha"
+
+msgid "Mesh IPv6 Address"
+msgstr "Endereço IPv6 da rede em malha"
+
+msgid "Netmask"
+msgstr "Máscara de Rede"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid "Password confirmation"
+msgstr "Confirmação da Senha"
+
+msgid "Password successfully changed"
+msgstr "A senha foi alterada com sucesso"
+
+msgid "Protect LAN"
+msgstr "Proteger rede local (LAN)"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Selecione esta opção para configurar suas interfaces de rede."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Selecione isto para permitir que outros usem sua conexão para acessar a "
+"internet."
+
+msgid "Share your internet connection"
+msgstr "Compartilhar sua conexão com a internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Faixa de endereços IP atribuídos aos clientes (ex: 10.1.2.1/28). Se esta "
+"faixa está dentro da faixa da rede em malha, então ela será anunciada como "
+"<abbr title=\"Host and network association, Associação de equipamentos e "
+"redes\">HNA</abbr>. Qualquer outra faixa irá utilizar NAT. Se deixada vazia, "
+"os padrões do perfil da comunidade será usada."
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "O endereço IPv6 é calculado automaticamente."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "O protocolo usado para a conectividade com a internet."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Este é um endereço único na rede em malha (ex: 10.1.1.1) e tem que ser "
+"registrado na sua comunidade local."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Isto configurará uma nova interface de rede sem fio virtual em modo de ponto "
+"de acesso."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Este assistente irá ajudá-lo na configuração do seu roteador para Freifunk "
+"outra rede comunitária sem fio similar."
+
+msgid "Unknown Error"
+msgstr "Erro Desconhecido"
+
+msgid "Username"
+msgstr "Usuário"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Ponto de Acesso Virtual (VAP)"
+
+msgid "Wizard"
+msgstr "Assistente"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Seu dispositivo e os nós vizinhos devem utilizar o mesmo canal."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "estático"
+
+msgid "Configure this interface."
+msgstr "Configurar esta interface."
+
+msgid "recommended"
+msgstr "recomendado"
+
+msgid "Basic settings"
+msgstr "Configuração básica"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "As configurações básicas estão incompletas. Por favor vá para"
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+"Você não pode usar o assistente porque algum dos valores necessários estão "
+"ausentes."
+
+msgid "and fill out all required fields."
+msgstr "e preencha todos os campos necessários."
diff --git a/trunk/package/luci/po/pt_BR/firewall.po b/trunk/package/luci/po/pt_BR/firewall.po
new file mode 100644
index 00000000..f32f70e5
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/firewall.po
@@ -0,0 +1,740 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2014-06-21 19:03+0200\n"
+"Last-Translator: Éder <eder.grigorio@openmailbox.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s in %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s com %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s em %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Entrada Sem Nome)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Regra Sem Nome)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT Sem Nome)"
+
+msgid "-- Please choose --"
+msgstr "-- Por favor, escolha --"
+
+msgid "-- custom --"
+msgstr "-- personalizado --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> pcts. por <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> pcts. por <var>%s</var>, pico <var>%d</var> pcts."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> e limite a %s"
+
+msgid "Action"
+msgstr "Ação"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Add and edit..."
+msgstr "Adicionar e editar..."
+
+msgid "Advanced Settings"
+msgstr "Configurações Avançadas"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Permite o encaminhamento para a <em>zona de destino</em>:"
+
+msgid "Any"
+msgstr "Qualquer"
+
+msgid "Covered networks"
+msgstr "Redes cobertas"
+
+msgid "Custom Rules"
+msgstr "Regras Personalizadas"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"As regras personalizadas permitem executar comandos iptables arbitrários não "
+"cobertos por esta ferramenta. Os comandos serão executados após cada "
+"reinício do firewall, logo após a carga do conjunto de regras padrão."
+
+msgid "Destination IP address"
+msgstr "Endereço IP de destino"
+
+msgid "Destination address"
+msgstr "Endereço de destino"
+
+msgid "Destination port"
+msgstr "Porta de destino"
+
+msgid "Destination zone"
+msgstr "Zona de destino"
+
+msgid "Do not rewrite"
+msgstr "Não sobrescreva"
+
+msgid "Drop invalid packets"
+msgstr "Descartar pacotes inválidos"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "Enable NAT Loopback"
+msgstr "Habilite o Loopback do NAT"
+
+msgid "Enable SYN-flood protection"
+msgstr "Habilite proteção contra SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr "Habilite o registro nesta zona"
+
+msgid "External IP address"
+msgstr "Endereço IP externo"
+
+msgid "External port"
+msgstr "Porta Externa"
+
+msgid "External zone"
+msgstr "Zona externa"
+
+msgid "Extra arguments"
+msgstr "Argumentos extras"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr "Firewall - Regras personalizadas"
+
+msgid "Firewall - Port Forwards"
+msgstr "Firewall - Encaminhamento de Portas"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Firewall - Regras de Tráfego"
+
+msgid "Firewall - Zone Settings"
+msgstr "Firewall - Configurações de Zona"
+
+msgid "Force connection tracking"
+msgstr "Force o rastreamento da conexão"
+
+msgid "Forward"
+msgstr "Encaminhar"
+
+msgid "Forward to"
+msgstr "Encaminhar para"
+
+msgid "From %s in %s"
+msgstr "Vindo de %s em %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Vindo de %s em %s com origem %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Vindo de %s em %s com origem %s e %s"
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 e IPv6"
+
+msgid "IPv4 only"
+msgstr "Somente IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Somente IPv6"
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Encaminhamento entre Zonas"
+
+msgid "Internal IP address"
+msgstr "Endereço IP interno"
+
+msgid "Internal port"
+msgstr "Porta Interna"
+
+msgid "Internal zone"
+msgstr "Zona interna"
+
+msgid "Limit log messages"
+msgstr "Limita as mensagens de registro"
+
+msgid "MSS clamping"
+msgstr "Ajuste do MSS"
+
+msgid "Masquerading"
+msgstr "Mascaramento"
+
+msgid "Match"
+msgstr "casol"
+
+msgid "Match ICMP type"
+msgstr "Casa com ICMP tipo"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Casa o tráfego encaminhado para uma porta ou faixa de portas de destino "
+"específica."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Casa o tráfego entrante direcionado para uma porta ou faixa de portas de "
+"destino específica neste computador"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Casa o tráfego entrante originado de uma porta ou faixa de portas no "
+"equipamento cliente."
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "New SNAT rule"
+msgstr "Nova regra de SNAT"
+
+msgid "New forward rule"
+msgstr "Nova regra de encaminhamento"
+
+msgid "New input rule"
+msgstr "Nova regra de entrada"
+
+msgid "New port forward"
+msgstr "Novo encaminhamento de porta"
+
+msgid "New source NAT"
+msgstr "Nova origem NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+"Somente case o tráfego entrante direcionado para o endereço IP fornecido."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Somente case o tráfego entrante destes endereços MAC."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Somente case o tráfego entrante desta faixa de endereços IP."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Somente case o tráfego entrante vindo da porta de origem fornecida ou "
+"intervalo de portas no equipamento cliente"
+
+msgid "Open ports on router"
+msgstr "Abrir portas no roteador"
+
+msgid "Other..."
+msgstr "Outro..."
+
+msgid "Output"
+msgstr "Saída"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
+
+msgid "Port Forwards"
+msgstr "Encaminhamentos de Porta"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"O encaminhamento de portas permite que computadores remotos na Internet "
+"conectem a um computador ou serviço específico dentro da rede local privada."
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Redireciona tráfego entrante para a porta especificada no computador interno"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Redireciona tráfego entrante para o computador interno especificado"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Restringe o mascaramento para uma subrede de destino específica"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Restringe o mascaramento para uma subrede de origem específica"
+
+msgid "Restrict to address family"
+msgstr "Restringe para uma família de endereços"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Reescreva o tráfego correspondente para o endereço fornecido."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Reescreva o tráfego correspondente para a porta de origem fornecida. Pode "
+"ficar em branco para somente reescrever o endereço IP."
+
+msgid "Rewrite to source %s"
+msgstr "Reescrever para a origem %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Reescrever para a origem %s, %s"
+
+msgid "SNAT IP address"
+msgstr "Endereço IP da SNAT"
+
+msgid "SNAT port"
+msgstr "Porta da SNAT"
+
+msgid "Source IP address"
+msgstr "Endereço IP de origem"
+
+msgid "Source MAC address"
+msgstr "Endereço MAC de origem"
+
+msgid "Source NAT"
+msgstr "NAT origem"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"NAT origem é uma forma específica de mascaramento que permite o controle "
+"fino do endereço IP de origem usado no tráfego sainte. Por exemplo, para "
+"mapear múltiplos endereços WAN para subredes internas."
+
+msgid "Source address"
+msgstr "Endereço de origem"
+
+msgid "Source port"
+msgstr "Porta de origem"
+
+msgid "Source zone"
+msgstr "Zona de origem"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
+"tráfego de rede."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"As opções abaixo controlam as políticas de encaminhamento entre esta zona "
+"(%s) e outras zonas. <em>Zonas de destino</em> incluem tráfego encaminhado "
+"<strong>originado de %q</strong>. <em>Zonas de origem</em> casam com tráfego "
+"encaminhado de outras zonas <strong>apontando para %q</strong>. A regra de "
+"encaminhamento é <em>unidirecional</em>, ex: um encaminhamento da LAN para "
+"WAN <em>não</em> implica na permissão de encaminhar da WAN para LAN."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Esta página permite que você mude propriedades avançadas da entrada do "
+"encaminhamento de porta. Na maioria dos casos, não é necessário modificar "
+"estas configurações."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Esta página permite que você mude propriedades avançadas da entrada da regra "
+"de tráfego, como os equipamentos de origem e destino."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Esta seção define as propriedades comuns de %q. As opções de <em>entrada</"
+"em> e <em>saída</em> definem as políticas padrão para o tráfego entrando e "
+"saindo desta zona, enquanto a opção de <em>encaminhamento</em> descreve a "
+"política para encaminhar o tráfego entre diferentes redes dentro da zona. "
+"<em>Redes Cobertas</em> especificam que redes disponíveis são membros desta "
+"zona."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "Para %s em %s <var>neste dispositivo</var>"
+
+msgid "To %s in %s"
+msgstr "Para %s em %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "Para %s <var>neste dispositivo</var>"
+
+msgid "To %s, %s in %s"
+msgstr "Para %s, %s em %s"
+
+msgid "To source IP"
+msgstr "Para o endereço IP de origem"
+
+msgid "To source port"
+msgstr "Para a porta de origem"
+
+msgid "Traffic Rules"
+msgstr "Regras de tráfego"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Regras de tráfego definem políticas para a passagem de pacotes entre as "
+"diferentes zonas. Por exemplo, rejeitar o tráfego entre certos equipamentos "
+"ou abrir portas WAN no roteador."
+
+msgid "Via %s"
+msgstr "Via %s"
+
+msgid "Via %s at %s"
+msgstr "Via %s at %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Você pode especificar múltiplas entradas selecionando \"-- personalizado --"
+"\" e então entrando os protocolos separados por espaço."
+
+msgid "Zone %q"
+msgstr "Zona %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Zona ⇒ Encaminhamentos"
+
+msgid "Zones"
+msgstr "Zonas"
+
+msgid "accept"
+msgstr "aceitar"
+
+msgid "any"
+msgstr "qualquer"
+
+msgid "any host"
+msgstr "qualquer equipamento"
+
+msgid "any router IP"
+msgstr "qualquer endereço IP do roteador"
+
+msgid "any zone"
+msgstr "qualquer zona"
+
+msgid "don't track"
+msgstr "não rastrear"
+
+msgid "drop"
+msgstr "descartar"
+
+msgid "reject"
+msgstr "rejeitar"
+
+# 20140621: edersg: tradução
+msgid "traffic"
+msgstr "Tráfego"
+
+#~ msgid "Destination"
+#~ msgstr "Destino"
+
+#~ msgid "Family"
+#~ msgstr "Família"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "Encaminhar para %s em %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "Encaminhar para %s, %s em %s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Origem"
+
+#~ msgid "To %s"
+#~ msgstr "Para %s"
+
+#~ msgid "To %s at %s"
+#~ msgstr "Para %s em %s"
+
+#~ msgid "Via"
+#~ msgstr "Via"
+
+#~ msgid "Accept forward"
+#~ msgstr "Aceitar encaminhamento"
+
+#~ msgid "Accept input"
+#~ msgstr "Aceitar entrada"
+
+#~ msgid "Disable"
+#~ msgstr "Desabilitado"
+
+#~ msgid "Discard forward"
+#~ msgstr "Descartar o encaminhamento"
+
+#~ msgid "Discard input"
+#~ msgstr "Descartar a entrada"
+
+#~ msgid "Do not track forward"
+#~ msgstr "Não rastreie o encaminhamento"
+
+#~ msgid "Do not track input"
+#~ msgstr "Não rastreie a entrada"
+
+#~ msgid "IP"
+#~ msgstr "Endereço IP"
+
+#~ msgid "IP range"
+#~ msgstr "Faixa de endereço IP"
+
+#~ msgid "IPs"
+#~ msgstr "Endereços IP"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "MACs"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Rejeitar encaminhamento"
+
+#~ msgid "Refuse input"
+#~ msgstr "Rejeitar entrada"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "A regra está desabilitada"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "A regra está habilitada"
+
+#~ msgid "day"
+#~ msgstr "dia"
+
+#~ msgid "hour"
+#~ msgstr "hora"
+
+#~ msgid "minute"
+#~ msgstr "minuto"
+
+#~ msgid "not"
+#~ msgstr "não"
+
+#~ msgid "port"
+#~ msgstr "porta"
+
+#~ msgid "ports"
+#~ msgstr "portas"
+
+#~ msgid "second"
+#~ msgstr "segundo"
+
+#~ msgid "type"
+#~ msgstr "tipo"
+
+#~ msgid "types"
+#~ msgstr "tipos"
+
+#~ msgid "(optional)"
+#~ msgstr "(opcional)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "Endereço de destino planejado"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Porta interna (opcional)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Opções Avançadas"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regras Avançadas"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "As regras avançadas permitem a personalização da firewall de acordo com "
+#~ "as necessidades. Apenas as novas conexões serão processadas. Pacotes que "
+#~ "pertençam a conexões já abertas estão automaticamente autorizados a "
+#~ "passar pelo firewall."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Regras Personalizadas (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Para DNAT, casa com tráfego entrante direcionado para um dado endereço IP "
+#~ "de destino. Para SNAT, reescreve o endereço de origem para um dado "
+#~ "endereço."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Casa o tráfego entrante originado de uma porta ou faixa de portas de "
+#~ "origem específica no computador do cliente"
+
+#~ msgid "Overview"
+#~ msgstr "Visão geral"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Redirecionamento de portas"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "O redirecionamento de portas permite disponibilizar serviços da rede "
+#~ "interna para uma rede externa."
+
+#~ msgid "Redirection type"
+#~ msgstr "Tipo de redirecionamento"
+
+#~ msgid "Redirections"
+#~ msgstr "Redirecionamentos"
+
+#~ msgid "Rules"
+#~ msgstr "Regras"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirecionamento de Tráfego"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Redirecionamento do tráfego permite a alteração do endereço de destino "
+#~ "dos pacotes encaminhados."
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Redes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Controle de Tráfego"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tráfego de Zona-para-Zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Aqui você pode especificar qual tráfego de rede será permitido para o "
+#~ "fluxo entre zonas das redes. Somente novas conexões serão processadas. "
+#~ "Pacotes pertencentes à conexões já abertas estão automaticamente "
+#~ "permitidos para passar pelo firewall."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destino"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Endereço IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Endereço MAC de origem"
+
+#~ msgid "Custom forwarding"
+#~ msgstr "Redirecionamento personalizado"
+
+#~ msgid "Input Zone"
+#~ msgstr "Zona de Entrada"
+
+#~ msgid "Output Zone"
+#~ msgstr "Zona de Saída"
+
+#~ msgid "External Zone"
+#~ msgstr "Zona Externa"
+
+#~ msgid "Source MAC"
+#~ msgstr "MAC de origem"
+
+#~ msgid "Defaults"
+#~ msgstr "Padrões"
+
+#~ msgid ""
+#~ "These are the default settings that are used if no other rules match."
+#~ msgstr ""
+#~ "Estas são as configurações padrões, que serão usadas se não houver outras "
+#~ "regras."
+
+#~ msgid ""
+#~ "Zones part the network interfaces into certain isolated areas to separate "
+#~ "network traffic. One or more networks can belong to a zone. The MASQ-flag "
+#~ "enables NAT masquerading for all outgoing traffic on this zone."
+#~ msgstr ""
+#~ "Zonas são interfaces de redes usadas para separar o tráfego da rede. Uma "
+#~ "ou mais redes podem pertencer a uma zona. A flag-MASQ ativa o "
+#~ "mascaramento NAT para todo o tráfego de saída desta zona."
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
+
+#~ msgid "contained networks"
+#~ msgstr "redes contidas"
diff --git a/trunk/package/luci/po/pt_BR/freifunk-policyrouting.po b/trunk/package/luci/po/pt_BR/freifunk-policyrouting.po
new file mode 100644
index 00000000..4aac8ca1
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/freifunk-policyrouting.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-12 09:13+0200\n"
+"PO-Revision-Date: 2012-09-27 00:40+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Todo o tráfego das interfaces pertencentes a estas zonas será enviado "
+"através de um roteador padrão na rede em malha."
+
+msgid "Enable Policy Routing"
+msgstr "Habilitar a Política de Roteamento"
+
+msgid "Fallback to mesh"
+msgstr "Se falhar, usar a malha"
+
+msgid "Firewall zones"
+msgstr "Zonas do firewall"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"Se nenhuma rota padrão for recebida da rede em malha, então o tráfego que "
+"pertencer a zona de firewall selecionada através da sua conexão internet "
+"como solução de contorno. Se você não quer isto e, ao contrário, deseja "
+"bloquear este tráfego, então você deve selecionar esta opção."
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+"Se o seu roteador não estiver disponível, usar como alternativa o roteador "
+"padrão da malha."
+
+msgid "Policy Routing"
+msgstr "Política de Roteamento"
+
+msgid "Strict Filtering"
+msgstr "Filtragem Estrita"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"Estas páginas podem ser usadas para configurar a política de roteamento para "
+"certas zonas de firewall. Isto pode ser útil se você precisa usar sua "
+"própria conexão com a internet para si e não quer compartilhá-la com outros "
+"(é por isto que isto pode ser chamado de 'Modo Egocêntrico'). Seu próprio "
+"tráfego é enviado através de sua conexão com a internet enquanto o tráfego "
+"originado da rede em malha irá usar outro roteador na malha."
diff --git a/trunk/package/luci/po/pt_BR/freifunk.po b/trunk/package/luci/po/pt_BR/freifunk.po
new file mode 100644
index 00000000..a906a937
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/freifunk.po
@@ -0,0 +1,447 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-06-21 19:00+0200\n"
+"Last-Translator: Éder <eder.grigorio@openmailbox.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Mal (ETX > 10)"
+
+msgid "Basic Settings"
+msgstr "Configurações Básicas"
+
+msgid "Basic settings"
+msgstr "Configurações básicas"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "As configurações básicas estão incompletas. Por favor vá para"
+
+msgid "Basic system settings"
+msgstr "Configurações básicas do sistema"
+
+msgid "Bitrate"
+msgstr "Taxa de bit"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+"Verifique a existência de novas versões e realize a atualização "
+"automaticamente."
+
+msgid "Client network size"
+msgstr "Tamanho da rede dos clientes"
+
+msgid "Community"
+msgstr "Comunidade"
+
+msgid "Community profile"
+msgstr "Perfil da comunidade"
+
+msgid "Community settings"
+msgstr "Configurações da comunidade"
+
+msgid "Confirm Upgrade"
+msgstr "Confirmar a atualização"
+
+msgid "Contact"
+msgstr "Contato"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "A informação de contato está incompleta. Por favor, vá para"
+
+msgid "Coordinates"
+msgstr "Coordenadas"
+
+msgid "Country code"
+msgstr "Código do país"
+
+msgid "Default routes"
+msgstr "Rotas padrão"
+
+msgid "Disable default content"
+msgstr "Desabilitar o conteúdo padrão"
+
+msgid "Diversity is enabled for device"
+msgstr "A diversidade está habilitada neste dispositivo"
+
+msgid "E-Mail"
+msgstr "E-mail"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "Edita a página índice"
+
+msgid "Enable IPv6"
+msgstr "Habilitar IPv6"
+
+# 20140621: edersg: tradução
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr "Habilitar um ponto de acesso virtual (VAP) por padrão, se possível"
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Encontre sua coordenada com o OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Visão Geral do Freifunk"
+
+msgid "Freifunk Remote Update"
+msgstr "Atualização Remota do Freifunk"
+
+msgid "Gateway"
+msgstr "Roteador"
+
+msgid "Go to"
+msgstr "Vá para"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Bom (2 < ETX < 4)"
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Hello and welcome in the network of"
+msgstr "Olá e seja bem-vindo à rede do"
+
+msgid "Hide OpenStreetMap"
+msgstr "Esconder o OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Página"
+
+msgid "Hostname"
+msgstr "Nome do equipamento"
+
+msgid "IPv6 Config"
+msgstr "Configuração IPv6"
+
+msgid "IPv6 Prefix"
+msgstr "Prefixo IPv6"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "Rede IPv6 em notação CIDR."
+
+msgid "If selected then the default content element is not shown."
+msgstr "Se selecionado, o conteúdo padrão não é mostrado."
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Se estiver interessado no nosso projeto, entre em contacto com a comunidade "
+"local"
+
+msgid "Index Page"
+msgstr "Página Índice"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"O acesso à Internet depende de fatores técnicos e organizacionais, e pode "
+"funcionar ou não no seu caso."
+
+msgid "It is operated by"
+msgstr "É operado por"
+
+msgid "Keep configuration"
+msgstr "Manter a configuração"
+
+msgid "Latitude"
+msgstr "Latitude"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Load"
+msgstr "Carregar"
+
+msgid "Local Time"
+msgstr "Horário Local"
+
+msgid "Location"
+msgstr "Localização"
+
+msgid "Longitude"
+msgstr "Longitude"
+
+msgid "Map"
+msgstr "Mapa"
+
+msgid "Map Error"
+msgstr "Erro do Mapa"
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Mesh prefix"
+msgstr "Prefixo da rede em malha"
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Network for client DHCP addresses"
+msgstr "Rede para os endereços dos clientes DHCP"
+
+msgid "Nickname"
+msgstr "Apelido"
+
+msgid "No default routes known."
+msgstr "Nenhuma rota padrão conhecida."
+
+msgid "Notice"
+msgstr "Aviso"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Operador"
+
+msgid "Orange"
+msgstr "Laranja"
+
+msgid "Overview"
+msgstr "Visão Geral"
+
+msgid "Package libiwinfo required!"
+msgstr "O pacote libiwinfo é necessário!"
+
+msgid "Phone"
+msgstr "Telefone"
+
+msgid "Please fill in your contact details below."
+msgstr "Por favor, preencha seus detalhes de contato abaixo."
+
+msgid "Please set your contact information"
+msgstr "Por favor, defina a informação de contato"
+
+msgid "Power"
+msgstr "Potência"
+
+msgid "Processor"
+msgstr "Processador"
+
+msgid "Profile"
+msgstr "Perfil"
+
+msgid "Profile (Expert)"
+msgstr "Perfil (Especialista)"
+
+msgid "Realname"
+msgstr "Nome Real"
+
+msgid "Red"
+msgstr "Vermelho"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Selecione a sua localização com o mouse clicando no mapa. O mapa irá mostrar "
+"se você está conectado na internet."
+
+msgid "Show OpenStreetMap"
+msgstr "Mostrar o OpenStreetMap"
+
+msgid "Show on map"
+msgstr "Mostrar no mapa"
+
+msgid "Signal"
+msgstr "Sinal"
+
+msgid "Splash"
+msgstr "Splash"
+
+msgid "Start Upgrade"
+msgstr "Iniciar a Atualização"
+
+msgid "Statistics"
+msgstr "Estatística"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Ainda usável (4 < ETX < 10)"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"O pacote <em>libiwinfo</em> não está instalado. Você precisa instalar este "
+"componente para ter uma configuração sem fio funcional!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"O serviço OLSRd não está configurado para capturar os dados de posição da "
+"rede.<br /> Por favor, garnta que o plugin nameservice está corretametne "
+"configurado e que a opção <em>latlon_file</em> está habilitada."
+
+msgid "The installed firmware is the most recent version."
+msgstr "O firmware instalado é a última versão."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"Estas são as configurações básicas para a comunidade sem fio local. Estas "
+"configurações definem os valores padrão para o assistente e NÃO afetam a "
+"configuração atual do roteador."
+
+msgid "These are the settings of your local community."
+msgstr "Estas são as configurações da sua comunidade local."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Esta página ajudará você na configuração do seu roteador Freifunk ou de "
+"redes comunitárias sem fio similares."
+
+msgid "This is the access point"
+msgstr "Este é o ponto de acesso "
+
+msgid "Update Settings"
+msgstr "Configurações da Atualização"
+
+msgid "Update available!"
+msgstr "Existe uma atualização disponível!"
+
+msgid "Uptime"
+msgstr "Tempo de atividade"
+
+# 20140621: edersg: tradução
+msgid "VAP"
+msgstr "VAP"
+
+msgid "Verify downloaded images"
+msgstr "Verifique as imagens baixadas"
+
+msgid "Very good (ETX < 2)"
+msgstr "Muito bom (ETX < 2)"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Somos uma iniciativa para implementação de uma rede sem fio em malha livre, "
+"independente e não-comercial."
+
+msgid "Wireless Overview"
+msgstr "Visão Geral da Rede Sem Fio"
+
+msgid "Yellow"
+msgstr "Amarelo"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"Você pode mostrar conteúdo adicional na página índice pública inserindo "
+"XHTML válido no formulário abaixo.<br />As manchetes devem ficam entre &lt;"
+"h2&gt; e &lt;/h2&gt;."
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+"Você pode encontrar mais informações sobre a iniciativa global Freifunk em"
+
+msgid "You can manually edit the selected community profile here."
+msgstr "Você pode editar manualmente o perfil da comunidade selecionada aqui."
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+"Você precisa selecionar um perfil antes de poder editá-lo. Para selecionar "
+"um perfil, vá para"
+
+msgid "and fill out all required fields."
+msgstr "e preencher todos os campos obrigatórios."
+
+msgid "buffered"
+msgstr "no Buffer"
+
+msgid "cached"
+msgstr "no Cache"
+
+msgid "e.g."
+msgstr "ex:"
+
+msgid "free"
+msgstr "livre"
+
+msgid "to disable it."
+msgstr "para desabilitá-lo."
+
+msgid "used"
+msgstr "usado"
+
+msgid "wireless settings"
+msgstr "configurações da rede sem fio"
+
+#~ msgid ""
+#~ "No services can be shown, because olsrd is not running or the olsrd-"
+#~ "nameservice Plugin is not loaded."
+#~ msgstr ""
+#~ "Nenhum serviço pode ser mostrado porque o olsrd não está rodando ou o "
+#~ "plugin do olsrd-nameservice não está carregado."
+
+#~ msgid "Services"
+#~ msgstr "Serviços"
+
+#~ msgid "Source"
+#~ msgstr "Origem"
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "O pacote <em>libiwinfo-lua</em> não está instalado. Você deve instalar "
+#~ "este componente para ter uma configuração sem fio funcional!"
+
+#~ msgid "Url"
+#~ msgstr "URL"
diff --git a/trunk/package/luci/po/pt_BR/hd_idle.po b/trunk/package/luci/po/pt_BR/hd_idle.po
new file mode 100644
index 00000000..9abeb927
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/hd_idle.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2011-10-08 03:12+0200\n"
+"Last-Translator: luizluca <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Disk"
+msgstr "Disco"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "Enable debug"
+msgstr "Ativar depuração"
+
+msgid "Idle-time"
+msgstr "Tempo de ociosidade"
+
+msgid "Idle-time unit"
+msgstr "Unidade do tempo da ociosidade"
+
+msgid "Settings"
+msgstr "Configurações"
+
+# Hours
+msgid "h"
+msgstr "horas"
+
+msgid "hd-idle"
+msgstr "Hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"Hd-idle é um programa utilitário para ativar o modo \"economia de energia"
+"\" (spinning-down) de discos externos após um período de ociosidade."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "minutos"
diff --git a/trunk/package/luci/po/pt_BR/meshwizard.po b/trunk/package/luci/po/pt_BR/meshwizard.po
new file mode 100644
index 00000000..a2238e52
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/meshwizard.po
@@ -0,0 +1,150 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 00:23+0200\n"
+"PO-Revision-Date: 2014-03-17 10:01+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Habilita e desabilita a configuração IPv6 globalmente."
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Marque isto para proteger sua rede local (LAN) de outros nós ou clientes"
+
+msgid "Cleanup config"
+msgstr "Limpar configuração"
+
+msgid "Configure this interface"
+msgstr "Configure esta interface"
+
+msgid "DHCP IP range"
+msgstr "Faixa de IP do DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "O DHCP irá atribuir automaticamente endereços IP para os clientes"
+
+msgid "Enable DHCP"
+msgstr "Habilitar DHCP"
+
+msgid "Enable RA"
+msgstr ""
+"Habilitar <abbr title=\\\"Router Advertisement, Anúncio de Roteador\\\">RA</"
+"abbr>"
+
+msgid "Enabled"
+msgstr "Habilitado"
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "IPv6 Settings"
+msgstr "Configurações IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Se selecionado, a configuração é limpa antes de definir as novas opções de "
+"configuração."
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Mesh IP address"
+msgstr "Endereço IP da rede em malha"
+
+msgid "Mesh IPv6 address"
+msgstr "Endereço IPv6 da rede em malha"
+
+msgid "Mesh Wizard"
+msgstr "Assistente de Configuração da Rede em Malha"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Nota: Isto irá configurar a interface para operação em malha, p. ex. "
+"adicionar à zona 'freifunk' e ativar o OLSR. "
+
+msgid "Protect LAN"
+msgstr "Proteget Rede Local (LAN)"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Selecione isto para permitir que outros usem sua conexão para acessar a "
+"internet."
+
+msgid "Send router advertisements on this device."
+msgstr ""
+"Envia <abbr title=\\\"Router Advertisement, Anúncio de Roteador\\\">RA</"
+"abbr> a partir deste dispositivo."
+
+msgid "Share your internet connection"
+msgstr "Compartilhar sua conexão com a internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Faixa de endereços IP atribuídos aos clientes (ex: 10.1.2.1/28). Se esta "
+"faixa está dentro da faixa da rede em malha, então ela será anunciada no "
+"<abbr title=\"Host and network association, Associação de equipamentos e "
+"redes\">HNA</abbr>. Qualquer outra faixa irá utilizar NAT. Se deixada vazia, "
+"os padrões do perfil da comunidade será usada."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+"O endereço IP informado não está na faixa de endereços da rede em malha"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+"Este é um endereço IPv6 único na notação CIDR (ex: 2001:1:2:3::1/64) e deve "
+"ser registrado na sua comunidade local."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Este é um endereço único na rede em malha (ex: 10.1.1.1) e tem que ser "
+"registrado na sua comunidade local."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Isto configurará uma nova interface de rede sem fio virtual em modo de ponto "
+"de acesso."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Este assistente irá ajudá-lo na configuração do seu roteador para Freifunk "
+"ou outra rede comunitária sem fio similar."
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Ponto de Acesso Virtual (VAP)"
+
+msgid "Wizard"
+msgstr "Assistente"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Seu dispositivo e os nós vizinhos devem utilizar o mesmo canal."
+
+msgid "recommended"
+msgstr "recomendado"
diff --git a/trunk/package/luci/po/pt_BR/minidlna.po b/trunk/package/luci/po/pt_BR/minidlna.po
new file mode 100644
index 00000000..3d53abd4
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/minidlna.po
@@ -0,0 +1,193 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Advanced Settings"
+msgstr "Configuração Avançada"
+
+msgid "Album art names:"
+msgstr "Nomes do Álbum artistico: "
+
+msgid "Announced model number:"
+msgstr "numero de modelo anunciado:"
+
+msgid "Announced serial number:"
+msgstr "Anunciar serial:"
+
+msgid "Browse directory"
+msgstr "Procurar diretório "
+
+msgid "Collecting data..."
+msgstr "Coletando dados..."
+
+msgid "Database directory:"
+msgstr "Banco de dados de diretório:"
+
+msgid "Enable TIVO:"
+msgstr "Ativar TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Ativar inotify:"
+
+msgid "Enable:"
+msgstr "Ativado"
+
+msgid "Friendly name:"
+msgstr "Nome amigável:"
+
+msgid "General Settings"
+msgstr "Configuração Geral"
+
+msgid "Interfaces:"
+msgstr "Interfaces:"
+
+msgid "Log directory:"
+msgstr "Diretório de Log"
+
+msgid "Media directories:"
+msgstr "Diretórios de mídia:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA é um software de servidor com o objetivo de ser totalmente "
+"compatível com os clientes DLNA / UPnP-AV."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Número do modelo do daemon miniDLNA irá relatar aos clientes em sua "
+"descrição XML."
+
+msgid "Music"
+msgstr "Musica"
+
+msgid "Network interfaces to serve."
+msgstr "As interfaces de rede para servir."
+
+msgid "Notify interval in seconds."
+msgstr "Notificação de intervalo em segundos."
+
+msgid "Notify interval:"
+msgstr "Intervalo de Notificação:"
+
+msgid "Pictures"
+msgstr "Imagems"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Porta para HTTP (descrições, SOAP, transferência de mídia) de tráfego."
+
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "Presentation URL:"
+msgstr "URL para Apresentação:"
+
+msgid "Root container:"
+msgstr "Root container:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Numero serial do miniDLNA daemon apresentará um relatório a clientes em sua "
+"descrição XML."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+"Defina esta opção se você quiser personalizar o nome que aparece em seus "
+"clientes."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Defina esta opção se você gostaria de especificar o diretório onde você "
+"deseja MiniDLNA para armazenar seu banco de dados e cache de arte do álbum."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+"Defina esta opção se você gostaria de especificar o diretório onde você "
+"deseja MiniDLNA para armazenar seu arquivo de log."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Defina esta opção para permitir o monitoramento inotify para descobrir "
+"automaticamente novos arquivos."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Defina esta opção para habilitar o suporte para streaming. Jpg e. Arquivos "
+"MP3 para um TiVo suporte HMO."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Defina esta opção para aderir estritamente às normas DLNA. Isso permitirá "
+"que do lado do servidor downscaling de imagens muito grandes JPEG, que podem "
+"prejudicar o desempenho servindo em JPEG (pelo menos) os produtos da Sony "
+"DLNA."
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Defina esta opção para o diretório que você deseja verificar. Se você quiser "
+"restringir o diretório para um tipo específico de conteúdo, você pode "
+"prefixar o tipo ('A' para áudio, 'V' para o vídeo, 'P' para imagens), "
+"seguido por uma vírgula, para o diretório (por exemplo media_dir = A, / "
+"mnt / media / Música). Vários diretórios podem ser especificados."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Especifique o caminho para o soquete MiniSSDPd."
+
+msgid "Standard container"
+msgstr "container padrão"
+
+msgid "Strict to DLNA standard:"
+msgstr "Strict para DLNA padrão:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"O serviço está ativo miniDLNA, servindo% d áudio, vídeo e arquivos% d% d "
+"imagem."
+
+msgid "The miniDLNA service is not running."
+msgstr "O serviço miniDLNA não está funcionando."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+"Esta é uma lista de nomes de arquivos para verificar quando procurando arte "
+"do álbum."
+
+msgid "Video"
+msgstr "Video"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "miniDLNA Status"
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP soquete:"
diff --git a/trunk/package/luci/po/pt_BR/mmc_over_gpio.po b/trunk/package/luci/po/pt_BR/mmc_over_gpio.po
new file mode 100644
index 00000000..9fbbf0f9
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-07-05 06:43+0200\n"
+"Last-Translator: rafaelff1 <rafael.f.f1@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "MMC/SD driver configuration"
+msgstr "Configuração de driver MMC/SD"
+
+msgid "Mode"
+msgstr "Modo"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Settings"
+msgstr "Configurações"
diff --git a/trunk/package/luci/po/pt_BR/multiwan.po b/trunk/package/luci/po/pt_BR/multiwan.po
new file mode 100644
index 00000000..ba72b820
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/multiwan.po
@@ -0,0 +1,124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-11-11 04:01+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Tentativas Antes da Solução de Contorno da WAN"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Tentativas Antes da Recuperação da WAN"
+
+msgid "Auto"
+msgstr "Automático"
+
+msgid "Collecting data..."
+msgstr "Coletando dados..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Configurar regras para direcionar a saída de tráfego através de uma conexão "
+"WAN específica."
+
+msgid "DNS Server(s)"
+msgstr "Servidor(es) DNS"
+
+msgid "Default Route"
+msgstr "Rota Padrão"
+
+msgid "Destination Address"
+msgstr "Endereço de Destino"
+
+msgid "Disable"
+msgstr "Desabilitar"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "Failing"
+msgstr "Falha"
+
+msgid "Failover Traffic Destination"
+msgstr "Destino do Tráfego para a Recuperação"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "Equipamento(s) para Monitoramento da Saúde por ICMP"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Limite de tempo do Monitoramento da Saúde por ICMP"
+
+msgid "Health Monitor Interval"
+msgstr "Intervalo do Monitoramento da Saúde"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"O Monitoramento da Saúde detecta e corrige as mudanças de rede e falhas nas "
+"conexões."
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "Distribuição do Balanceador de Carga"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Balanceador de Carga(Compatibilidade)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Balanceador de Carga(Desempenho)"
+
+msgid "Multi-WAN"
+msgstr "Multi-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Status de Multi-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Regras de Tráfego Multi-WAN"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"O Multi-WAN permite o use de múltiplas conexões ao enlace superior (ex: "
+"internet) para o balanceamento de carga e tolerância a falha."
+
+msgid "None"
+msgstr "Nenhum"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Protocol"
+msgstr "Procotolo"
+
+msgid "Recovering"
+msgstr "Recuperação"
+
+msgid "Source Address"
+msgstr "Endereço de Origem"
+
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgid "WAN Interfaces"
+msgstr "Interfaces WAN"
+
+msgid "WAN Uplink"
+msgstr "Conexão WAN"
+
+msgid "all"
+msgstr "todos"
diff --git a/trunk/package/luci/po/pt_BR/ntpc.po b/trunk/package/luci/po/pt_BR/ntpc.po
new file mode 100644
index 00000000..9e8849a2
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2011-10-18 22:38+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Clock Adjustment"
+msgstr "Ajuste do Relógio"
+
+msgid "Count of time measurements"
+msgstr "Quantidade de medições do tempo"
+
+msgid "Current system time"
+msgstr "Hora atual do sistema"
+
+msgid "General"
+msgstr "Geral"
+
+msgid "Hostname"
+msgstr "Nome do computador"
+
+msgid "Offset frequency"
+msgstr "Frequência da compensação"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Synchronizes the system time"
+msgstr "Sincroniza a hora do sistema"
+
+msgid "Time Server"
+msgstr "Servidor de Hora."
+
+msgid "Time Servers"
+msgstr "Servidores de Hora"
+
+msgid "Time Synchronisation"
+msgstr "Sincronização de Horário"
+
+msgid "Update interval (in seconds)"
+msgstr "Intervalo de atualização (em segundos)"
+
+msgid "empty = infinite"
+msgstr "vazio = infinito"
diff --git a/trunk/package/luci/po/pt_BR/olsr.po b/trunk/package/luci/po/pt_BR/olsr.po
new file mode 100644
index 00000000..1461c1dd
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/olsr.po
@@ -0,0 +1,906 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-06-21 19:36+0200\n"
+"Last-Translator: Éder <eder.grigorio@openmailbox.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr ""
+"Anúncios <abbr title=\"Multiple interface declaration,Declaração de "
+"interface múltipla\">MID</abbr> ativos"
+
+msgid "Active OLSR nodes"
+msgstr "Nós OLSR ativos"
+
+msgid "Active host net announcements"
+msgstr "Anúncios ativos de equipamentos"
+
+msgid "Advanced Settings"
+msgstr "Configurações Avançadas"
+
+msgid "Allow gateways with NAT"
+msgstr "Permitir rotadores com NAT"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "Permitir a seleção de rotador de saída IPv4 com NAT"
+
+msgid "Announce uplink"
+msgstr "Anunciar enlace superior (uplink)"
+
+msgid "Announced network"
+msgstr "Rede anunciada"
+
+# 20140621: edersg: tradução
+msgid "Bad (ETX > 10)"
+msgstr "Ruim (ETX > 10)"
+
+# 20140621: edersg: tradução
+msgid "Bad (SNR < 5)"
+msgstr "Ruim (SNR < 5)"
+
+msgid "Both values must use the dotted decimal notation."
+msgstr "Ambos os valores devem usar a notação decimal com pontos."
+
+msgid "Broadcast address"
+msgstr "Endereço de broadcast"
+
+# 20140621: edersg: tradução
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+"Somente pode ser um endereço IPv4 ou IPv6 válidos ou um endereço 'padrão'"
+
+# 20140621: edersg: tradução
+#, fuzzy
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+"Somente pode ser um endereço IPv4 ou IPv6 válidos ou um endereço 'padrão'"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+# 20140621: edersg: tradução
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+"Não foi possível obter nenhuma informação. Certifique-se que a extensão "
+"jsoninfo está instalada e permite conexões a partir da sua máquina local "
+"(localhost)."
+
+msgid "Display"
+msgstr "Visão"
+
+msgid "Downlink"
+msgstr "Enlace inferior (downlink)"
+
+# I didn't find in GUI this one
+msgid "Download Config"
+msgstr "Configuração do Recebimento de Dados "
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"Habilita o SmartGateway. Se isto está desabilitado, então todos os demais "
+"parâmetros do SmartGateway são ignorados. Padrão é \"não\"."
+
+msgid "Enable this interface."
+msgstr "Habilita esta interface."
+
+msgid "Enabled"
+msgstr "Habilitado"
+
+msgid "Expected retransmission count"
+msgstr "Contagem esperada de retransmissões"
+
+msgid "FIB metric"
+msgstr "Métrica FIB"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+"A métrica FIB controla o valor da métrica dos conjuntos de equipamentos-"
+"roteadores. \"flat\" significa que o valor da métrica é sempre 2. Este é o "
+"valor preferido porque ele ajuda o roteamento do kernel do Linux limpar as "
+"rotas antigas. \"correct\" usa a contagem de saltos como valor da métrica. "
+"\"approx\" também usa a contagem de saltos como métrica, mas somente "
+"atualiza a contagem de saltos se o próximo salto também mudar. O padrão é "
+"\"flat\"."
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+"Mecanismo Fisheye para <abbr title=\"Topology Control, Controle de Topologia"
+"\">TC</abbr>s (marcado significa ligado). O padrão é \"ligado\""
+
+msgid "Gateway"
+msgstr "Roteador"
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "General settings"
+msgstr "Configurações gerais"
+
+# 20140621: edersg: tradução
+msgid "Good (2 < ETX < 4)"
+msgstr "Bom (2 < ETX < 4)"
+
+# 20140621: edersg: tradução
+msgid "Good (30 > SNR > 20)"
+msgstr "Bom (30 > SNR > 20)"
+
+# 20140621: edersg: tradução
+msgid "Green"
+msgstr "Verde"
+
+msgid "HNA"
+msgstr ""
+"<abbr title=\"Host and network association, Associação de equipamentos e "
+"redes\">HNA</abbr>"
+
+msgid "HNA Announcements"
+msgstr ""
+"Anúncios do <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
+msgid "HNA interval"
+msgstr ""
+"Intervalo entre <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
+msgid "HNA validity time"
+msgstr ""
+"Validade do <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr ""
+"Anúncios do <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
+msgid "Hello"
+msgstr "Saudação (Hello)"
+
+msgid "Hello interval"
+msgstr "Intervalo entre Saudações (Hello)"
+
+msgid "Hello validity time"
+msgstr "Validade da Saudação (Hello)"
+
+# 20140621: edersg: tradução
+msgid "Hide IPv4"
+msgstr "Ocultar IPv4"
+
+# 20140621: edersg: tradução
+msgid "Hide IPv6"
+msgstr "Ocultar IPv6"
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "Saltos"
+
+msgid "Hostname"
+msgstr "Nome do equipamento"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+"Equipamentos em uma rede roteada por OLSR podem anunciar conectividade para "
+"redes externas usando mensagens HNA."
+
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Equipamentos em uma rede roteada por OLSR podem anunciar conectividade para "
+"redes externas usando mensagens HNA."
+
+# Hysteresis é Histerese que significa "retardo"
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+"Retardo para a sensibilidade do enlace (somente para a métrica de contagem "
+"de saltos), Retardo incrementa a robustez da sensibilidade do enlace mas "
+"atrasa o registro dos vizinhos. O padrão é \"sim\""
+
+msgid "IP Addresses"
+msgstr "Endereços IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+"Versão do IP para usar. Se 6and4 for selecionado, então uma instância é "
+"disparada para cada protocolo."
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "Endereço IPv4 de Broadcast"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+"Endereço IPv5 de broadcast para a saída de pacotes OLSR. Um exemplo útil "
+"seria 255.255.255.255. O padrão é \"0.0.0.0\", que indica o uso do endereço "
+"IP de broadcast da interface."
+
+msgid "IPv4 source"
+msgstr "Origem IPv4"
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+"Endereço IPv4 de origem para a saída de pacotes OLSR. Um exemplo útil seria "
+"255.255.255.255. O padrão é \"0.0.0.0\", que indica o uso do endereço IP da "
+"interface."
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "Multicast IPv6"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+"Endereço de multicast IPv6. O padrão é \"FF02::6D\", o multicast do enlace "
+"local do roteador MANET."
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"A rede IPv6 deve ser informada em notação completa. O prefixo deve ser em "
+"notação CIDR."
+
+msgid "IPv6 source"
+msgstr "Origem IPv6"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+"Prefixo de origem IPv6. O OLSRd escolherá um dos IPs da interface que casam "
+"com o prefixo do parâmetro. O padrão é \"0::/0\", que faz com que seja usado "
+"um endereço IP não local da interface."
+
+msgid "IPv6-Prefix of the uplink"
+msgstr "Prefixo IPv6 do enlace superior (uplink)"
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+"Se a rota para o roteador está para ser alterada, o valor ETX deste roteador "
+"é multiplicado com o este valor antes que ele seja comparado com o novo "
+"valor. O parâmetro pode ser um valor entre 0.1 e 1.0, mas deve ser próximo a "
+"1.0 se alterado..<br /><b>CUIDADO:</b> Este parâmetro não deve ser usado em "
+"conjunto com a métrica etx_ffeth!<br />O padrão é \"1.0\"."
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr "Se este Nó usa NAT para conexões com a internet. Padrão é \"sim\"."
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+"Modo da Interface é usado para evitar o encaminhamento desnecessário de "
+"pacotes na interface ethernet em ponte. Os modos válidos são \"mesh\" e "
+"\"ether\". O padrão é \"mesh\"."
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interfaces Defaults"
+msgstr "Padrões da Interface"
+
+msgid "Internet protocol"
+msgstr "Protocolo internet"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+"Intervalo para consultar as interfaces de rede por mudanças nas "
+"configurações (em segundos). O padrão é \"2.5\"."
+
+# 20140621: edersg: tradução
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr "Valor inválido para LQMult-Value. Deve estar entre 0.01 e 1.0."
+
+# 20140621: edersg: tradução
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+"Valor inválido para LQMult-Value. Você deve utilizar aqui um número decimal "
+"entre 0.01 e 1.0."
+
+msgid "Known OLSR routes"
+msgstr "Rotas OLSR conhecidas"
+
+msgid "LQ"
+msgstr "<abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
+
+msgid "LQ aging"
+msgstr ""
+"Envelhecimento do <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
+
+msgid "LQ algorithm"
+msgstr "Algoritmo <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
+
+msgid "LQ fisheye"
+msgstr "Fisheye <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
+
+msgid "LQ level"
+msgstr "Nível <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
+
+# 20140621: edersg: tradução
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+"LQMult exige dois valores (endereço IP ou 'padrão' e multiplicador) "
+"separados por espaços."
+
+msgid "Last hop"
+msgstr "Último salto"
+
+msgid "Legend"
+msgstr "Legenda"
+
+msgid "Library"
+msgstr "Biblioteca"
+
+msgid "Link Quality Settings"
+msgstr "Configurações da Qualidade do Enlace"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+"O fator de envelhecimento da qualidade do enlace (somente para <abbr title="
+"\"Link Quality, Qualidade do Enlace\">LQ</abbr> nível 2). Parâmtro de ajuste "
+"para etx_float e etx_fpm, Valores menores significam mudanças mais lentas do "
+"valor ETX. (permitido valores entre 0.01 e 1.0)"
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+"Algoritmo de qualidade do enlace (somente para <abbr title=\"Link Quality, "
+"Qualidade do Enlace\">LQ</abbr> nível 2). <br /><b>etx_float</b>: ETX ponto "
+"flutuante com o envelhecimento exponencial<br /><b>etx_fpm</b> : o mesmo que "
+"etx_float, mas com aritmética inteira<br /><b>etx_ff</b> : ETX freifunk, uma "
+"variante do etx que usa todo tráfego OLSE (ao invés de somente as saudações) "
+"para o cálculo do ETX<br /><b>etx_ffeth</b>: variação incompatível do etx_ff "
+"que permite enlaces ethernet com ETX 0.1.<br />O padrão é \"etx_ff\""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+"O nível de qualidade do enlace escolhe entre o roteamento por contagem de "
+"saltos e o roteamento baseado em custos (na sua maioria, ETX). <br /><b>0</"
+"b> = não use a qualidade do enlace<br /><b>2</b> = use a qualidade do enlace "
+"para a seleção do MPR e roteamento<br />O padrão é \"2\""
+
+msgid "LinkQuality Multiplicator"
+msgstr "Multiplicador da Qualidade do Enlace"
+
+msgid "Links per node (average)"
+msgstr "Enlaces por nó (média)"
+
+msgid "Links total"
+msgstr "Total de enlaces"
+
+msgid "Local interface IP"
+msgstr "Endereço IP da interface local"
+
+msgid "MID"
+msgstr ""
+"<abbr title=\"Multiple interface declaration,Declaração de interface múltipla"
+"\">MID</abbr>"
+
+msgid "MID interval"
+msgstr ""
+"Intervalo do <abbr title=\"Multiple interface declaration,Declaração de "
+"interface múltipla\">MID</abbr>"
+
+msgid "MID validity time"
+msgstr ""
+"Validade do <abbr title=\"Multiple interface declaration,Declaração de "
+"interface múltipla\">MID</abbr>"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "IP Principal"
+
+# 20140621: edersg: tradução
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+"Certifique-se de que a extensão \"jsoninfo\" esteja carregada e o serviço "
+"OLSRd esteja rodando e configurado na porta 9090 aceitando conexões a partir "
+"de \"127.0.0.1\"."
+
+msgid "Metric"
+msgstr "Métrica"
+
+msgid "Mode"
+msgstr "Modo"
+
+# 20140621: edersg: tradução
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Múltiplas rotas com o fator configurado aqui. Os valores permitidos estão "
+"entre 0.01 e 1.0. Ele somente é utilizado quando o nível-LQ é maior que 0. "
+"Exemplos: <br />reduzir LQ para 192.168.0.1 pela metade: 192.168.0.1 0.5<br /"
+"> reduzir LQ para todos os nós nesta interface em 20%: padrão 0.8"
+
+# 20140621: edersg: tradução
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Múltiplas rotas com o fator configurado aqui. Os valores permitidos estão "
+"entre 0.01 e 1.0. Ele somente é utilizado quando o nível-LQ é maior que 0. "
+"Exemplos: <br />reduzir LQ para 192.168.0.1 pela metade: 192.168.0.1 0.5<br /"
+"> reduzir LQ para todos os nós nesta interface em 20%: padrão 0.8"
+
+msgid "NAT threshold"
+msgstr "Limiar do NAT"
+
+msgid "NLQ"
+msgstr ""
+"<abbr title=\"Neighbor Link Quality, Qualidade do Enlace do Vizinho\">NLQ</"
+"abbr>"
+
+msgid "Neighbors"
+msgstr "Vizinhos"
+
+msgid "Neighbour IP"
+msgstr "Endereço IP do Vizinho"
+
+msgid "Neighbours"
+msgstr "Vizinhos"
+
+msgid "Netmask"
+msgstr "Máscara de rede"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Network address"
+msgstr "Endereço de rede"
+
+msgid "Nic changes poll interval"
+msgstr "Intervalo de consulta de mudanças na placa de rede"
+
+msgid "Nodes"
+msgstr "Nós"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr "OLSR - Opções de Visão"
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+"OLSR - Anúncios <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+"OLSR - Anúncios <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Plugins"
+
+msgid "OLSR Daemon"
+msgstr "Servidor OLSR"
+
+msgid "OLSR Daemon - Interface"
+msgstr "Servidor OLSR - Interface"
+
+msgid "OLSR connections"
+msgstr "Conexões do OLSR"
+
+msgid "OLSR gateway"
+msgstr "Roteador OLSR"
+
+msgid "OLSR node"
+msgstr "Nó OLSR"
+
+# 20140621: edersg: tradução
+msgid "Orange"
+msgstr "Laranja"
+
+msgid "Overview"
+msgstr "Visão Geral"
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Visão geral os anúncios de rede de equipamentos OLSR atualmente ativos"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Visão geral das conexões OLSR atualmente estabelecidas"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Visão geral dos nós OLSR conhecidos atualmente"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Visão geral das rotas conhecidas atualmente para outros nós OLSR"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr "Visão geral das interfaces onde o OLSR está rodando"
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Visão geral de anúncios de nós com múltiplas interfaces conhecidas"
+
+msgid "Overview of smart gateways in this network"
+msgstr "Visão geral dos SmartGateways na rede"
+
+msgid "Plugin configuration"
+msgstr "Configuração do Plugin"
+
+msgid "Plugins"
+msgstr "Plugins"
+
+# Que socket?
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr "Taxa de consulta por conexões OLSR, em segundos. Padrão é 0.05."
+
+msgid "Pollrate"
+msgstr "Taxa de consulta"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Prefix"
+msgstr "Prefixo"
+
+# 20140621: edersg: tradução
+msgid "Red"
+msgstr "Vermelho"
+
+msgid "Resolve"
+msgstr "Resolver"
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+"Resolve os nomes dos equipamentos na página de estado. É geralmente seguro "
+"permitir isto, mas se você usa IPs públicos e tem uma configuração DNS "
+"instável, então estas páginas podem carregar de forma extremamente lenta. "
+"Neste caso, desabilite isto aqui."
+
+msgid "Routes"
+msgstr "Rotas"
+
+msgid "Secondary OLSR interfaces"
+msgstr "Interfaces OLSR secundárias"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+"Define o IP principal (ip originador) do seu roteador. Este IP nunca muda "
+"durante o funcionamento do olsrd. O padrão é 0.0.0.0, que faz com que o "
+"endereço da primeira interface seja usado."
+
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Define o IP principal (ip originador) do seu roteador. Este IP nunca muda "
+"durante o funcionamento do olsrd. O padrão é 0.0.0.0, que faz com que o "
+"endereço da primeira interface seja usado."
+
+# 20140621: edersg: tradução
+msgid "Show IPv4"
+msgstr "Exibir IPv4"
+
+# 20140621: edersg: tradução
+msgid "Show IPv6"
+msgstr "Exibir IPv6"
+
+# 20140621: edersg: tradução
+msgid "Signal Noise Ratio in dB"
+msgstr "Relação do ruído do sinal em dB"
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr "Anúncios do SmartGW"
+
+msgid "SmartGateway is not configured on this system."
+msgstr "SmartGateway não está configurado no seu sistema."
+
+msgid "Source address"
+msgstr "Endereço de origem"
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+"Especifica a velocidade do enlace superior (uplink) em kilobits/s. O "
+"primeiro parâmetro é a taxa de envio (upstream) e o segundo parâmetro é a "
+"taxa de recebimento (downstream). O padrão é \"128 1024\"."
+
+msgid "Speed of the uplink"
+msgstr "Velocidade do enlace superior"
+
+msgid "State"
+msgstr "Estado"
+
+msgid "Status"
+msgstr "Estado"
+
+# 20140621: edersg: tradução
+msgid "Still usable (20 > SNR > 5)"
+msgstr "Ainda utilizável (20 > SNR > 5)"
+
+# 20140621: edersg: tradução
+msgid "Still usable (4 < ETX < 10)"
+msgstr "Ainda utilizável (4 > ETX > 10)"
+
+msgid "Success rate of packages received from the neighbour"
+msgstr "Taxa de sucesso de pacotes recebidos de vizinhos"
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr "Taxa de sucesso de pacotes enviados a vizinhos"
+
+msgid "TC"
+msgstr "<abbr title=\"Topology Control, Controle de Topologia\">TC</abbr>"
+
+msgid "TC interval"
+msgstr ""
+"Intervalo do <abbr title=\"Topology Control, Controle de Topologia\">TC</"
+"abbr>"
+
+msgid "TC validity time"
+msgstr ""
+"Validade do <abbr title=\"Topology Control, Controle de Topologia\">TC</abbr>"
+
+msgid "TOS value"
+msgstr "Valor do TOS"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+"O servidor OLSR é uma implementação do protoloco de Roteamento de Estado de "
+"Enlace Otimizado. Como tal, ele permite o roteamento em malha para qualquer "
+"equipamento de rede. Ele roda sobre qualquer placa de rede sem fio que "
+"suporte o modo ad-hoc e, é claro, em qualquer dispositivo ethernet. Visite "
+"<a href='http://www.olsr.org'>olsrd.org</a> para ajuda e documentação."
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+"A disponibilidade fixa para ser usada. Se a disponibilidade não for "
+"definida, ela será dinamicamente calculada baseada no estado da energia/"
+"bateria, O padrão é \"3\"."
+
+msgid "The interface OLSRd should serve."
+msgstr "A interface onde o OLSRd deve servir."
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+"A porta que o OLSR usa. Isto geralmente deve ficar na porta 698, designada "
+"pela IANA. Pode ter qualquer valor entre 1 e 65535."
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+"Isto pode ser usado para sinalizar o prefixo IPv6 externo do enlace superior "
+"(uplink) para os clientes. Isto pode permitir que um cliente mude o endereço "
+"IPv6 local para usar o roteador IPv6 sem qualquer tradução de endereços. O "
+"tamanho máximo do prefixo é 64 bits. O padrão é \"::/0\" (nenhum prefixo)."
+
+msgid "Timing and Validity"
+msgstr "Temporização e Validade"
+
+msgid "Topology"
+msgstr "Topologia"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+"Valor do tipo de serviço para o cabeçalho IP para controle de tráfego. O "
+"padrao é \"16\"."
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Não foi possível conectar ao servidor OLSR!"
+
+msgid "Uplink"
+msgstr "Enlace superior (uplink)"
+
+msgid "Uplink uses NAT"
+msgstr "Enlace superior (uplink) usa NAT"
+
+msgid "Use hysteresis"
+msgstr "Usar retardo"
+
+# 20140621: edersg: tradução
+msgid "Validity Time"
+msgstr "Tempo de validade"
+
+msgid "Version"
+msgstr "Versão"
+
+# 20140621: edersg: tradução
+msgid "Very good (ETX < 2)"
+msgstr "Muito bom (ETX < 2)"
+
+# 20140621: edersg: tradução
+msgid "Very good (SNR > 30)"
+msgstr "Muito bom (SNR > 30)"
+
+msgid "WLAN"
+msgstr "Rede sem fio (WLAN)"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+"Atenção: o kmod-ipip não está instalado. Sem o kmod-ipip, o SmartGateway não "
+"irá funcionar. Por favor, instale-o."
+
+msgid "Weight"
+msgstr "Peso"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+"Quando múltiplos enlaces existirem entre dois equipamentos, o peso da "
+"interface é usado para determinar o enlace usado. Normalmente, o peso é "
+"automaticamente calculado pelo olsrd baseado nas características da "
+"interface, mas aqui você pode especificar um valor fixo. Olsrd escolherá "
+"enlaces com o valor mais baixo.<br /><b>Nota:</b> O peso da interface é "
+"usado somente quando o nível de qualidade do enlace está definido como 0. "
+"Para qualquer outro valor do nível de qualidade do enlace, o valor ETX da "
+"interface é usado."
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+"Que tipo de enlace superior (uplink) é exportado para outros nós da rede em "
+"malha. Um enlace superior é detectado buscando por uma <abbr title=\"Host "
+"and network association, Associação de equipamentos e redes\">HNA</abbr> "
+"local de 0.0.0.0/0, ::ffff:0:0/96 ou 2000::/3. O padrão é \"ambos\"."
+
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Que tipo de enlace superior (uplink) é exportado para outros nós da rede em "
+"malha. Um enlace superior é detectado buscando por uma <abbr title=\"Host "
+"and network association, Associação de equipamentos e redes\">HNA</abbr> "
+"local de 0.0.0.0/0, ::ffff:0:0/96 ou 2000::/3. O padrão é \"ambos\"."
+
+msgid "Willingness"
+msgstr "Disponibilidade"
+
+msgid "Yellow"
+msgstr "Amarelo"
+
+msgid "no"
+msgstr "Não"
+
+msgid "yes"
+msgstr "Sim"
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Certifique-se que o processo OLSRd está em execução, que o plugin "
+#~ "\"txtinfo\" está carregado e configurado para a porta 2006 e que aceita "
+#~ "conexões a partir de \"127.0.0.1\"."
+
+#~ msgid ""
+#~ "Multiply routes with the factor given here. Allowed values are between "
+#~ "0.01 and 1. It is only used when LQ-Level is greater than 0. Examples:"
+#~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
+#~ "all nodes on this interface by 20%: default 0.8"
+#~ msgstr ""
+#~ "Multiplica rotas com o fator informado. Os valores válidos são entre 0.01 "
+#~ "e 1. Somente é usado quando o nível <abbr title=\"Link Quality, Qualidade "
+#~ "do Enlace\">LQ</abbr> é maior que 0. Exemplos:<br />reduzir o <abbr title="
+#~ "\"Link Quality, Qualidade do Enlace\">LQ</abbr> para 192.168.0.1 pela "
+#~ "metade: 192.168.0.1 0.5<br />reduzir o <abbr title=\"Link Quality, "
+#~ "Qualidade do Enlace\">LQ</abbr> de todos os nós desta interface para 20%: "
+#~ "Padrão 0.8"
diff --git a/trunk/package/luci/po/pt_BR/openvpn.po b/trunk/package/luci/po/pt_BR/openvpn.po
new file mode 100644
index 00000000..002c3885
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/openvpn.po
@@ -0,0 +1,566 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-03-29 23:19+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', ou 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Aceitar opções enviadas pelo servidor"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Add route after establishing connection"
+msgstr "Adicionar rota após estabelecimento da conexão"
+
+msgid "Additional authentication over TLS"
+msgstr "Autenticação adicional por TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Permitir tráfego entre os clientes"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Permitir múltiplos clientes com o mesmo certificado"
+
+msgid "Allow only one session"
+msgstr "Permitir apenas uma sessão"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Permitir a um equipamento remoto altere o seu IP ou porta"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Máximo permitido de clientes conectados"
+
+msgid "Allowed maximum of internal"
+msgstr "Máximo permitido internamente para rotas de clientes"
+
+msgid "Allowed maximum of new connections"
+msgstr "Máximo permitido de novas conexões"
+
+msgid "Append log to file"
+msgstr "Acrescentar registos ao arquivo"
+
+msgid "Authenticate using username/password"
+msgstr "Autenticar com usuário/senha"
+
+msgid "Automatically redirect default route"
+msgstr "Redirecionar automaticamente a rota padrão"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Abaixo está uma lista de todas as instâncias OpenVPN configuradas e o seu "
+"estado atual"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "Executar o comando/script antes do tun/tap fechar"
+
+msgid "Certificate authority"
+msgstr "Autoridade certificadora"
+
+msgid "Change process priority"
+msgstr "Alterar prioridade do processo"
+
+msgid "Change to directory before initialization"
+msgstr "Mudar para o diretório antes da iniciação"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Verificar certificado do parceiro conta uma CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Chroot para o diretório após a iniciação"
+
+msgid "Client is disabled"
+msgstr "Cliente desativado"
+
+msgid "Configuration category"
+msgstr "Categoria da configuração"
+
+msgid "Configure client mode"
+msgstr "Configurar modo cliente"
+
+msgid "Configure server bridge"
+msgstr "Configurar ponte de servidor"
+
+msgid "Configure server mode"
+msgstr "Configurar modo de servidor"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Conectar através de um proxy Socks5"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Conectar a equipamento remoto através de um proxy HTTP"
+
+msgid "Connection retry interval"
+msgstr "Intervalo de reestabelecimento de conexão"
+
+msgid "Cryptography"
+msgstr "Criptografia"
+
+msgid "Daemonize after initialization"
+msgstr "Entre em segundo plano após a iniciação"
+
+msgid "Delay n seconds after connection"
+msgstr "Atrase n segundos depois da conexão"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Retardar o script de abertura e ativação do tun/tap"
+
+msgid "Diffie Hellman parameters"
+msgstr "Parâmetros Diffie-Hellman"
+
+msgid "Directory for custom client config files"
+msgstr "Diretório para configurações personalizadas dos clientes"
+
+msgid "Disable Paging"
+msgstr "Desativar paginação"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Desativar o vetor de iniciação da cifra"
+
+msgid "Disable options consistency check"
+msgstr "Desativar opções de verificação de consistência"
+
+msgid "Disable replay protection"
+msgstr "Desativar proteção contra replay"
+
+msgid "Do not bind to local address and port"
+msgstr "Não ativar no endereço e porta locais"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Não executar ifconfig de verdade"
+
+msgid "Don't add routes automatically"
+msgstr "Não adicionar rotas automaticamente"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "Não colocar em cache as senhas do --askpass ou --auth-user-pass "
+
+msgid "Don't inherit global push options"
+msgstr "Não herdar as opções globais de envio (push)"
+
+msgid "Don't log timestamps"
+msgstr "Não registar a data/hora"
+
+msgid "Don't re-read key on restart"
+msgstr "Não reler a chave entre os reinícios"
+
+msgid "Don't require client certificate"
+msgstr "Não solicitar certificado ao cliente"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Não usar compressão LZO adaptiva"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Não avisar quando existirem inconsistências no ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Escrever parâmetros no registo"
+
+msgid "Empirically measure MTU"
+msgstr "Medir empíricamente o MTU"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Ativar motor OpenSSL por hardware"
+
+msgid "Enable Path MTU discovery"
+msgstr "Ativar a descoberta do MTU do caminho"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Ativar modo de encriptação por chave estática (não-TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Ativar TLS e assumir papel de cliente"
+
+msgid "Enable TLS and assume server role"
+msgstr "Ativar TLS e assumir papel de servidor"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Ativar a fragmentação interna de datagramas"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Ativar o interface de gestão em <em>IP</em> <em>porta</em>"
+
+msgid "Enabled"
+msgstr "Ativado"
+
+msgid "Encryption cipher for packets"
+msgstr "Cifra de encriptação para pacotes"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Executar o comando shell após as rotas serem adicionadas"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Executar o comando shell quando existir alteração do IP remoto"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+"Executado em modo servidor na nova conexão de cliente, enquanto o cliente "
+"ainda não é confiável"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+"Executado em modo servidor quando um endereço/rota IPv4 é adicionao na "
+"tabela de roteamento interna do OpenVPN"
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Fechar quando existir falha na negociacao TLS"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
+
+msgid "HMAC authentication for packets"
+msgstr "Autenticação HMAC para pacotes"
+
+msgid "Handling of authentication failures"
+msgstr "Gestão de falhas de autenticação"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+"Diretiva de ajuda para simplificar a expressão --ping e --ping-restart nas "
+"configurações de modo servidor"
+
+msgid "If hostname resolve fails, retry"
+msgstr "Se a resolução de nomes falhar, tentar novamente"
+
+msgid "Instance \"%s\""
+msgstr "Instância \"%s\""
+
+msgid "Invalid"
+msgstr "Inválido"
+
+msgid "Keep local IP address on restart"
+msgstr "Manter o endereço IP local entre os reinícios"
+
+msgid "Keep remote IP address on restart"
+msgstr "Manter o endereço IP remoto entre os reinícios"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Manter o dispositivo tun/tap aberto entre os reinícios"
+
+msgid "Key transition window"
+msgstr "Janela para transição de chaves"
+
+msgid "Limit repeated log messages"
+msgstr "Limitar entradas repetidas no registo"
+
+msgid "Local certificate"
+msgstr "Certificado local"
+
+msgid "Local host name or ip address"
+msgstr "Nome do equipamento ou endereço IP local"
+
+msgid "Local private key"
+msgstr "Chave privada local"
+
+msgid "Major mode"
+msgstr "Modo principal"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Tornar o dispositivo tun capaz de IPv6"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Número máximo de pacotes TCP na fila de saída"
+
+# Which context?
+msgid "Networking"
+msgstr "Rede"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Número de buffers de broadcast alocados"
+
+msgid "Number of lines for log file history"
+msgstr "Número de linhas para o histórico do registo"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Aceitar conexões apenas de um dado nome X509"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Só processe os estouros de tempo de pings se as rotas existirem"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Instâncias OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Otimizar as escritas TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Enviar para o syslog os registos e não vá para segundo plano"
+
+msgid "Overview"
+msgstr "Visão Geral"
+
+msgid "PKCS#12 file containing keys"
+msgstr "Arquivo PKCS#12 com as chaves"
+
+msgid "Pass environment variables to script"
+msgstr "Passar variáveis de ambiente ao script"
+
+msgid "Persist replay-protection state"
+msgstr "Manter persistência da proteção replay"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Manter ou não o conjunto de subredes"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Pingar o remoto a cada n segundos sobre a porta TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr "Nível da política sobre o uso de programas e scripts externos"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Proxy timeout in seconds"
+msgstr "Tempo limite do proxy em segundos"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Enviar uma opção ifconfig ao remoto"
+
+msgid "Push options to peer"
+msgstr "Enviar opções ao remoto"
+
+msgid "Query management channel for private key"
+msgstr "Solicitar chave privada ao canal de gestão"
+
+msgid "Randomly choose remote server"
+msgstr "Escolher o server remoto aleatoriamente"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Recusar conexões de clientes que não tenham configuração personalizada"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Remapear os sinais SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Nome do equipamento ou endereço IP remoto"
+
+msgid "Remote ping timeout"
+msgstr "Tempo limite do ping remoto"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Renegociar chave do canal de dados após n bytes"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Renegociar chave do canal de dados após n pacotes"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Renegociar chave do canal de dados após n segundos"
+
+msgid "Replay protection sliding window size"
+msgstr "Tamanho da janela de proteção conta replay"
+
+msgid "Require explicit designation on certificate"
+msgstr "Requerer designação específica no certificado"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Requerer que o uso da chave seja explicitado no certificado"
+
+msgid "Restart after remote ping timeout"
+msgstr "Reiniciar após estouro do tempo do ping remoto"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Estouro de tempo de retransmissão no canal de controle TLS"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Tentar infinitamente a conexão quando existirem erros de proxy Socks"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Tentar infinitamente a conexão quando existirem erros de proxy Socks"
+
+msgid "Route subnet to client"
+msgstr "Encaminhar rota da subrede para o cliente"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Executar através do inetd ou xinetd"
+
+msgid "Run script cmd on client connection"
+msgstr "Executar script quando o cliente conectar"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Executar script quando o cliente desconectar"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Executar scripts de subida/descida para todos os reinícios"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Notificar parceiro remoto ao desconectar"
+
+msgid "Service"
+msgstr "Serviço"
+
+msgid "Set GID to group"
+msgstr "Usar o GID do grupo"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Definir o MTU TCP/UDP"
+
+msgid "Set UID to user"
+msgstr "Usar o UID do usuário"
+
+msgid "Set aside a pool of subnets"
+msgstr "Reservar um conjunto de subredes"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Definir opções extendidas para o proxy HTTP"
+
+msgid "Set output verbosity"
+msgstr "Definir detalhamento do registo"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Definir tamanho das tabelas hash de endereços reais e virtuais"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Definir o tamanho do buffer de recepção TCP/UDP"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Definir o tamanho do buffer de envio TCP/UDP"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Definir o tamanho da fila de transmissão tun/tap"
+
+msgid "Set tun/tap adapter parameters"
+msgstr "Definir parâmetros do adaptador TUN/TAP"
+
+msgid "Set tun/tap device MTU"
+msgstr "Definir o MTU do dispositivo tun/tap"
+
+msgid "Set tun/tap device overhead"
+msgstr "Definir o overhead do dispositivo tun/tap"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Definir teto do MSS TCP"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Restringir a largura de banda ao parceiro"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Comando shell para executar após abertura do dispositivo tun"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Comando shell para executar após o fechamento do dispositivo tun"
+
+msgid "Shell command to verify X509 name"
+msgstr "Comando shell para verificar o nome do X509"
+
+msgid "Silence the output of replay warnings"
+msgstr "Silenciar a saída dos avisos de replay"
+
+msgid "Size of cipher key"
+msgstr "Tamanho da chave de cifragem"
+
+msgid "Specify a default gateway for routes"
+msgstr "Especificar uma roteador padrão para as rotas"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Iniciar o OpenVPN em estado de hibernação"
+
+msgid "Start/Stop"
+msgstr "Iniciar/Parar"
+
+msgid "Started"
+msgstr "Iniciado"
+
+msgid "Status file format version"
+msgstr "Versão de formato do arquivo de estado"
+
+msgid "Switch to advanced configuration »"
+msgstr "Mudar para configuração avançada »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Porta TCP/UDP tanto para local e remoto"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Porta TCP/UDP para local (padrão=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Porta TCP/UDP para remoto (padrão=1194)"
+
+msgid "TLS cipher"
+msgstr "Cifra TLS"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "Encaminhe TOS (aplicável apenas a IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Diretório temporário para arquivo de retorno de conexão-cliente"
+
+msgid "Timeframe for key exchange"
+msgstr "Janela temporal para troca de chaves"
+
+msgid "Type of used device"
+msgstr "Tipo de dispositivo utilizado"
+
+msgid "Use fast LZO compression"
+msgstr "Usar compressão LZO rápida"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Usar endereços individuais em vez de subredes /30"
+
+msgid "Use protocol"
+msgstr "Usar protocolo"
+
+msgid "Use tun/tap device node"
+msgstr "Utilizar dispositivo tun/tap"
+
+msgid "Use username as common name"
+msgstr "Usar o nome do usuário como 'common name' (CN)"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "Escrever registo no arquivo"
+
+msgid "Write process ID to file"
+msgstr "Escrever PID no arquivo"
+
+msgid "Write status to file every n seconds"
+msgstr "Escrever estado para arquivo a cada n segundos"
+
+msgid "no"
+msgstr "não"
+
+msgid "tun/tap device"
+msgstr "Dispositivo tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr "Tempo limite de inatividade tun/tap"
+
+msgid "yes (%i)"
+msgstr "sim (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Mudar para configuração básica"
+
+#~ msgid "openvpn_%s"
+#~ msgstr "openvpn_%s"
+
+#~ msgid "openvpn_%s_desc"
+#~ msgstr "openvpn_%s_desc"
diff --git a/trunk/package/luci/po/pt_BR/p2pblock.po b/trunk/package/luci/po/pt_BR/p2pblock.po
new file mode 100644
index 00000000..de363816
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/p2pblock.po
@@ -0,0 +1,30 @@
+msgid "Block Time"
+msgstr "Tempo de bloqueio"
+
+msgid "Enable P2P-Block"
+msgstr "Habilite o bloqueio P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Protocolos da camada de aplicação"
+
+msgid "P2P-Block"
+msgstr "P2P-Block"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"P2P-Block é um mecanismo de lista cinza para bloquear vários protocolos "
+"peer-to-peer para clientes fora da lista branca."
+
+msgid "Portrange"
+msgstr "Faixa de porta"
+
+msgid "Whitelisted IPs"
+msgstr "IPs na lista branca"
+
+msgid "seconds"
+msgstr "segundos"
diff --git a/trunk/package/luci/po/pt_BR/p910nd.po b/trunk/package/luci/po/pt_BR/p910nd.po
new file mode 100644
index 00000000..de7c4294
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/p910nd.po
@@ -0,0 +1,57 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-06-21 19:02+0200\n"
+"Last-Translator: Éder <eder.grigorio@openmailbox.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Modo bidirecional"
+
+msgid "Device"
+msgstr "Dispositivo"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Primeiro você deve instalar os pacotes para obter suporte USB (kmod-usb-"
+"printer) ou porta paralela (kmod-lp)."
+
+# 20140621: edersg: tradução
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Settings"
+msgstr "Configurações"
+
+# 20140621: edersg: tradução
+msgid "Specifies the interface to listen on."
+msgstr "Especifica a interface para escuta."
+
+msgid "TCP listener port."
+msgstr "Porta TCP de escuta."
+
+msgid "enable"
+msgstr "habilitado"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Servidor de impressão"
+
+#~ msgid "port_help"
+#~ msgstr ""
+#~ "p910nd escuta na porta 910x. Por exemplo, 9100 para a primeira impressora."
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd escuta na porta 910+N. Ex. 9100 para a primeira impressora."
diff --git a/trunk/package/luci/po/pt_BR/pbx-voicemail.po b/trunk/package/luci/po/pt_BR/pbx-voicemail.po
new file mode 100644
index 00000000..2e3a51e7
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/pbx-voicemail.po
@@ -0,0 +1,175 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-16 02:32+0200\n"
+"Last-Translator: Julio Cezar <jsilvestree@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "Endereços de correio eletrônicos que Recebem Correio de Voz"
+
+msgid "Enable Voicemail"
+msgstr "Habilitar o Correio de Voz"
+
+msgid "Global Voicemail Setup"
+msgstr "Configuração Global do Correio de Voz"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"Aqui você pode configurar um correio de voz global para este PBX. Uma vez "
+"que este sistema é previsto para ser executado em ambientes embarcados como "
+"roteadores, não existe armazenamento local do correio de voz - ele deve ser "
+"enviado por correio eletrônico. Desta maneira, você deve configurar um "
+"servidor (SMTP) de correio eletrônico (por exemplo, o servidor SMTP do seu "
+"provedor de Internet, do Google ou do Yahool), e fornecer uma lista dos "
+"endereços para os quais o correio de voz será enviado."
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"Para este PBX enviar mensagens eletrônicas contendo as gravações do correio "
+"de voz, você precisa definir aqui um servidor SMTP. Seu provedor de Internet "
+"geralmente fornece um servidor SMTP para este propósito. Você também pode "
+"usar um servidor de terceiros como os fornecidos pelo GMail ou Yahoo."
+
+msgid "Last Sent Voicemail Log"
+msgstr "Registro do Último Correio de Voz Enviado"
+
+msgid "Local Storage Directory"
+msgstr "Diretório de Armazenamento Local"
+
+msgid "No"
+msgstr "Não"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Servidor de correio eletrônico (SMTP) para envio"
+
+msgid "SMTP Password"
+msgstr "Senha do SMTP"
+
+msgid "SMTP Port Number"
+msgstr "Porta do SMTP"
+
+msgid "SMTP Server Authentication"
+msgstr "Autenticação do Servidor SMTP"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "Nome do Equipamento ou Endereço IP do Servidor SMTP"
+
+msgid "SMTP User Name"
+msgstr "Nome do Usuário do SMTP"
+
+msgid "Secure Connection Using TLS"
+msgstr "Proteja a Conexão Usando TLS"
+
+msgid "Voicemail Setup"
+msgstr "Configuração do Correio de Voz"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"Quando você habilita o correio de voz, você terá a oportunidade de "
+"especificar endereços de correio eletrônio que recebem o correio de voz "
+"gravado. Você precisa também configurar um servidor SMTP abaixo."
+
+msgid "Yes"
+msgstr "Sim"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"Você pode também manter cópias das mensagens de correio de voz no "
+"dispositivo executando o seu PBX. O caminho especificado aqui será criado se "
+"ele não existe. Cuidado com espaço limitado em dispositivos embarcados, como "
+"roteadores, e habilite esta opção apenas se você sabe o que você está "
+"fazendo."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"Sua senha real do SMTP não é mostrada para a sua proteção. Ela será alterada "
+"apenas quando você modificar o valor neste campo."
+
+#~ msgid "Directory to save voicemail into"
+#~ msgstr "Diretório para salvar o correio de voz"
+
+#~ msgid "Email addresses to forward to"
+#~ msgstr "Endereços de correio eletrônicos para encaminhar"
+
+#~ msgid "Enabled"
+#~ msgstr "Habilitado"
+
+#~ msgid ""
+#~ "Here you can configure a global voicemail for this PBX. Since this system "
+#~ "is intended to run on embedded systems like routers, there is no local "
+#~ "storage of voicemail - it must be sent out by email. Therefore you need "
+#~ "to configure an outgoing mail (SMTP) server (for example the SMTP server "
+#~ "your ISP provides, or GMail), and provide a list of addresses the "
+#~ "voicemail will be sent to."
+#~ msgstr ""
+#~ "Aqui você pode configurar um correio de voz global para este PBX. Uma vez "
+#~ "que este sistema é previsto para ser executado em ambientes embarcados "
+#~ "como roteadores, não existe armazenamento local do correio de voz - ele "
+#~ "deve ser enviado por correio eletrônico. Desta maneira, você deve "
+#~ "configurar um servidor (SMTP) de correio eletrônico (por exemplo, o "
+#~ "servidor SMTP do seu provedor de Internet, ou o do GMail), e fornecer uma "
+#~ "lista dos endereços para os quais o correio de voz será enviado."
+
+#~ msgid ""
+#~ "In order for this PBX to send emails containing voicemail recordings, you "
+#~ "need to set up an SMTP server here. Your ISP usually provides an SMTP "
+#~ "server for that purpose. You can also set up a GMail, Yahoo, or other 3rd "
+#~ "party SMTP server."
+#~ msgstr ""
+#~ "Para este PBX enviar mensagens eletrônicas contendo as gravações do "
+#~ "correio de voz, você precisa definir aqui um servidor SMTP. Seu provedor "
+#~ "de Internet geralmente fornece um servidor SMTP para este propósito. Você "
+#~ "também pode usar o servidor SMTP do GMail, Yahoo, ou outro de terceiros."
+
+#~ msgid "SMTP port number"
+#~ msgstr "Número da porta do SMTP"
+
+#~ msgid "SMTP server authentication"
+#~ msgstr "Autenticação do servidor SMTP"
+
+#~ msgid "SMTP server hostname or IP"
+#~ msgstr "Nome do equipamento ou endereço IP do servidor SMTP"
+
+#~ msgid "SMTP user name"
+#~ msgstr "Nome do usuário do SMTP"
+
+#~ msgid "Timeout before sending callers to voicemail"
+#~ msgstr "Tempo de espera antes de enviar chamadas para correio de voz"
+
+#~ msgid "Use TLS (secure connection)"
+#~ msgstr "Usar TLS (conexão segura)"
+
+#~ msgid ""
+#~ "When you enable voicemail, you will have the opportunity to specify email "
+#~ "addresses which receive the message. You must also set up an SMTP server "
+#~ "below."
+#~ msgstr ""
+#~ "Quando você habilita o correio de voz, você terá a oportunidade de "
+#~ "especificar endereços de correio eletrônio que recebem a mensagem. Você "
+#~ "também deve configurar um servidor SMTP abaixo."
diff --git a/trunk/package/luci/po/pt_BR/pbx.po b/trunk/package/luci/po/pt_BR/pbx.po
new file mode 100644
index 00000000..fd93e4ff
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/pbx.po
@@ -0,0 +1,744 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-08-04 09:00+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Configurações Avançadas"
+
+msgid "Available"
+msgstr "Disponível"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+"Evite usar qualquer carácter que não seja um alfanumérico, espaço, vírgula "
+"ou ponto."
+
+msgid "Away"
+msgstr "Ausente"
+
+msgid "Blacklisted Numbers"
+msgstr "Números na Lista Negra"
+
+msgid "Call Routing"
+msgstr "Roteamento de Chamada"
+
+# 20140630: edersg: tradução
+msgid "Call-back Numbers"
+msgstr "Voltar a discar os números"
+
+# 20140630: edersg: tradução
+msgid "Call-back Provider"
+msgstr "Voltar a chamar o provedor"
+
+msgid "Call-through Numbers"
+msgstr "Números de Ligação Direta"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Copie e cole aqui listas de números extensas."
+
+# 20140630: edersg: tradução
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+"Designar os números que estão autorizados a chamar por este sistema e quais "
+"privilégios do usuário eles terão."
+
+# 20140630: edersg: tradução
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+"Designar números para os quais o sistema irá desligar e ligar de volta, qual "
+"provedor será utilizado para chamá-los, e quais privilégios do usuário "
+"serão concedidos a eles."
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr "Disca números que não casam em qualquer lugar."
+
+msgid "Do Not Disturb"
+msgstr "Não Perturbe"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "Domínio/Endereço IP/Domínio Dinâmico"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Lista Dinâmica dos Números da Lista Negra"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Habilitar Chamadas Recebidas (Registrar pelo SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Habilitar Chamadas Recebidas (defina o Estado abaixo)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Habilitar Chamadas para Fora"
+
+msgid "Enabled"
+msgstr "Habilitado"
+
+# 20140630: edersg: tradução
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+"Digite um provedor VoIP para utilizar para voltar a chamada no formato "
+"username@some.host.name conforme listado acima em \"Chamadas Originadas\". É "
+"mais fácil copiar e colar os provedores. As entradas inválidas, incluindo "
+"provedores não habilitados para chamadas de saída, serão rejeitados em "
+"silêncio."
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"Entre com os números de telefone que você deseja rejeitar automaticamente. "
+"Você pode omitir o código do país e qualquer zeros no início, mas, por "
+"favor, teste para ter certeza que você está bloqueando da área desejada com "
+"sucesso."
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"Entre este endereço IP (ou IP:porta) na configuração de servidor/registrador "
+"dos seus dispositivos SIP que você irá usar SOMENTE localmente e nunca de um "
+"local remoto."
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"Entre com o nome do equipamento (ou equipamento:porta) na configuração de "
+"servidor/Registrar do seus dispositivos SIP que você irá usar de um local "
+"remoto (eles também funcionarão localmente)."
+
+msgid "External SIP Port"
+msgstr "Porta SIP Externa"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+"Para cada provedor habilitado para receber chamadas, aqui você pode "
+"restringir quais usuários tocarão quando receber chamadas. Se a lista "
+"estiver vazia, o sistema indicará que todos os usuários com recepção de "
+"chamadas habilitada tocarão. Nome de usuários inválidos serão rejeitados "
+"silenciosamente. Além disto, entrar com um nome de usuário aqui sobrescreve "
+"a configuração do usuário para não receber chamadas. Desta forma, você pode "
+"fazer com que alguns usuários toquem somente para alguns provedores "
+"específicos. As entradas podem ser inseridas usando uma lista separada por "
+"espaço ou um por nova linha."
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+"Para cada usuário habilitado para realizar chamadas externas, você pode "
+"restringir quais provedores o usuário poderá usar. Por padrão, todos os "
+"usuários podem usar todos os provedores. Para aparecer na lista abaixo, o "
+"usuário deve estar habilitado para realizar chamadas externas na página de "
+"\"Contas de Usuários\". Entre com os provedores de VoIP no formato "
+"usuário@algum.nome.de.equipamento, como listado em \"Chamadas Efetuadas\" "
+"abaixo. É mais fácil copiar e colar os provedores da lista abaixo. Entradas "
+"inválidas, includindo provedores não habilitados para chamadas externas, "
+"serão rejeitadas silenciosamente. As entradas podem ser inseridas usando uma "
+"lista separada por espaço ou um por nova linha."
+
+msgid "Full Name"
+msgstr "Nome Completo"
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "Google Accounts"
+msgstr "Contas do Google"
+
+msgid "Google Talk Status"
+msgstr "Estado do Google Talk"
+
+msgid "Google Talk Status Message"
+msgstr "Mensagem de Estado do Google Talk"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Contas do Google Voice/Talk"
+
+# 20140630: edersg: tradução
+msgid "Hang-up Delay"
+msgstr "Atraso de hang-up"
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+"Aqui você deve configurar pelo menos uma conta SIP, que você irá usar para "
+"se cadastrar neste serviço. Use essa conta, seja em um adaptador de "
+"telefonia analógica (ATA), ou em um softphone SIP como Linphone, CSipSimple, "
+"ou Sipdroid em seu smartphone, ou o Ekiga, Linphone, ou X-Lite no seu "
+"computador. Por padrão, ao receber uma chamada em uma das suas contas nos "
+"provedores VoIP ou em números GV, todas as contas SIP tocarão "
+"simultaneamente."
+
+# 20140630: edersg: tradução
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+"Quanto tempo esperar antes de desligar. Se o provedor que você utiliza para "
+"discar automaticamente encaminha para a caixa postal de voz, você pode "
+"definir este valor para um atraso que irá permitir que você desligue sua "
+"chamada antes de ser encaminhada e cobrado financeiramente por isso."
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+"Se definir o servidor/registrador como %s ou %s não funcionar para você, "
+"tente defini-lo como %s ou %s e entre com este número de porta em um campo "
+"separado que especifica o número da porta do servidor/registrador. Fique "
+"ciente que alguns dispositivos têm uma configuração confusa que define a "
+"porta de origem das solicitações SIP no dispositivo SIP em si (a porta local "
+"no dispositivo). A porta especificada nesta página não é essa porta de "
+"ligação, mas a porta na qual o serviço escutará serviço."
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+"Se você sentir falhas ou alta latência enquanto baixa conteúdos pesados​​, "
+"você pode querer habilitar o <abbr title=\"Quality of Service, Qualidade de "
+"serviço\">QoS</abbr>. O <abbr title=\"Quality of Service, Qualidade de "
+"serviço\">QoS</abbr> prioriza o tráfego de e para a sua rede para endereços "
+"IP e portas específicas, resultando em melhor latência e redimento de som. "
+"Se ativado, será configurada automaticamente pelo PABX uma regra de <abbr "
+"title=\"Quality of Service, Qualidade de serviço\">QoS</abbr> para este "
+"serviço, mas você deve visitar a página de configuração de <abbr title="
+"\"Quality of Service, Qualidade de serviço\">QoS</abbr> (Rede -> QoS) para "
+"configurar outras configurações críticas de QoS como as velocidades da sua "
+"conexão."
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+"Se você tiver mais de uma conta que pode fazer chamadas externas, você deve "
+"informar uma lista de números de telefone e/ou prefixos nos seguintes campos "
+"para cada provedor listados. Prefixos inválidos são removidos "
+"silênciosamente, e some os caracteres 0-9, X, Z, N, # *,, e + são válidos. A "
+"letra X corresponde a 0-9, Z corresponde a 1-9, e N corresponde a 2-9. Por "
+"exemplo, para fazer chamadas para a Alemanha através de um provedor, você "
+"pode digitar 49. Para fazer chamadas para a América do Norte, você pode "
+"entrar 1NXXNXXXXXX. Se um de seus provedores pode fazer chamadas locais para "
+"um código de área como Nova York (646), você pode entrar com 646NXXXXXX para "
+"esse provedor. Você deve deixar uma conta com uma lista vazia para fazer "
+"chamadas com ele por padrão para o caso do prefixo não casar com nenhum "
+"outro fornecedor. O sistema irá substituir automaticamente uma lista vazia "
+"com uma mensagem que os este provedor será utilizado caso nenhuma das regras "
+"dos demais provedores casem. Seja tão específico quanto possível (isto é "
+"1NXXNXXXXXX é melhor do que 1). Por favor, note que todos os códigos de "
+"discagem internacionais são descartados (por exemplo 00, 011, 010, 0011). As "
+"entradas podem ser feitas em uma lista separada por espaços ou por nova "
+"linha."
+
+msgid "Incoming Calls"
+msgstr "Chamadas Recebidas"
+
+msgid "Insert QoS Rules"
+msgstr "Inserir Regras QoS"
+
+msgid "Makes Outgoing Calls"
+msgstr "Realiza Chamadas para Fora"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr "NOTA: Não existe uma conta Google ou provedor SIP configurado."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+"NOTA: Não existe uma conta Google ou provedor SIP habilitado para receber "
+"chamadas."
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+"NOTA: Não existe uma conta Google ou provedor SIP habilitado para efetuar "
+"chamadas externas."
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr "NOTA: Não existe uma conta local configurada."
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+"NOTA: Não existe uma conta local configurada para efetuar chamadas externas."
+
+msgid "No"
+msgstr "Não"
+
+msgid "Number of Seconds to Ring"
+msgstr "Número de Segundos para Tocar"
+
+msgid "Outbound Proxy"
+msgstr "Proxy Externo"
+
+msgid "Outgoing Calls"
+msgstr "Chamadas Efetuadas"
+
+msgid "PBX Main Page"
+msgstr "Página Principal do PBX"
+
+msgid "PBX Service Status"
+msgstr "Estado do Serviço PBX"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+"Escolha uma porta aleatória entre 6500 e 9500 onde o serviço irá escutar. "
+"Não escolha a porta padrão 5060 pois ela é frequentemente alvo de ataques de "
+"força bruta. Quanto terminar, (1) clique em \"Salvar e Aplicar\", e (2) olhe "
+"na seção \"Dispositivo SIP/Contas do Softphone\" para as configurações "
+"atualizadas do servidor e porta para o seu Dispositivo SIP/Softphone."
+
+msgid "Port Setting for SIP Devices"
+msgstr "Configuração da Porta para Dispositivos SIP"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "Provedores Usados para as Chamadas para Fora"
+
+msgid "QoS Settings"
+msgstr "Configurações de QoS"
+
+msgid "RTP Port Range End"
+msgstr "Final da Faixa de Portas RTP"
+
+msgid "RTP Port Range Start"
+msgstr "Inicio da Faixa de Portas RTP"
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+"O tráfego RTP transporta de fato os pacotes de voz. Este é o início do "
+"intervalo de portas que será usado para a estabelecer uma comunicação RTP. "
+"Geralmente não é um problema deixar esta configuração com o valor padrão."
+
+msgid "Receives Incoming Calls"
+msgstr "Recebe Chamadas para Dentro"
+
+msgid "Remote Usage"
+msgstr "Uso Remoto"
+
+msgid "Rings users enabled for incoming calls"
+msgstr "Toca usuários habilitados para receber chamadas"
+
+msgid "SIP Accounts"
+msgstr "Contas SIP"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "Contas de Dispositivos SIP/Telefones em Software"
+
+msgid "SIP Provider Accounts"
+msgstr "Contas dos Provedores SIP"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "Domínio SIP (necessário para alguns provedores)"
+
+msgid "SIP Server/Registrar"
+msgstr "Servidor SIP/Registrador"
+
+msgid "SIP Server/Registrar Port"
+msgstr "Porta do Servidor SIP/Registrador"
+
+msgid "Server Setting"
+msgstr "Configuração do Servidor"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "Configuração do Servidor para Dispositivos SIP Locais"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "Configuração do Servidor para Dispositivos SIP Remotos"
+
+msgid "Service Status"
+msgstr "Estado do Serviço"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+"Define o número de segundos para tocar o telefone ao receber chamadas antes "
+"de desligar ou ir para a caixa postal, se o correio de voz estiver instalado "
+"e habilitado."
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr "Números na Lista Negra separados por Espaço"
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+"Especifique os números individualmente aqui. Pressione o Enter para "
+"adicionar mais números."
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+"Especifique aqui os números individualmente. Pressione o \"Enter\" para "
+"adicionar mais números. Você terá que experimentar com qual código de país "
+"ou de área você precisa adicionar aos números."
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+"O número(s) acima especificados serão capazes de discar com os provedores "
+"deste usuário. Nomes inválidos, incluindo usuários não habilitados para "
+"chamadas externas, serão descartados silenciosamente. Por favor, verifique "
+"se a entrada foi aceita."
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+"Esta página de configuração permite configurar um sistema de serviço de "
+"telefone (PABX), que permite fazer chamadas telefônicas através do Google "
+"múltipla e SIP (como Sipgate, SipSorcery e Betamax) contas e compartilhá-los "
+"entre diversos dispositivos SIP. Note-se que as contas do Google, contas "
+"SIP, e contas de usuários locais são configurados em \"Contas do Google\", "
+"\"Contas SIP\" e \"Contas de Usuário\" sub-seções. Você deve adicionar pelo "
+"menos uma conta de usuário para este PABX e configurar um dispositivo SIP ou "
+"softphone para usar a conta, a fim de fazer e receber chamadas com o "
+"Google / SIP contas. Configurando vários usuários permitem que você faça "
+"chamadas gratuitas entre todos os usuários, e partilhar o Google configurado "
+"e contas SIP. Se você tem mais de um Google e contas SIP configurado, você "
+"provavelmente deve configurar como as chamadas de e para eles são "
+"encaminhados para a \"Call Routing\" página. Se você está interessado em "
+"usar o seu próprio PABX de qualquer lugar do mundo, então, visitar o "
+"\"Remote Uso\" na seção \"Advanced Settings\" página."
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+"Este é o nome que o servidor VoIP será usado para identificar-se quando se "
+"registrar para VoIP (SIP) fornecedores. Alguns provedores exigem isso para "
+"uma seqüência específica de correspondência de um dispositivo de hardware "
+"SIP."
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+"Este é o local onde você indica quais contas Google/SIP serão usadas para "
+"chamar quais códigos de área/país, que usuários poderão usar quais contas "
+"Google/SIP, como as chamadas recebidas serão roteadas, que números podem ser "
+"recebidos por este PBX com uma senha e qual números estão banidos."
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+"Este é o local onde você configura suas contas Google (Talk e Voice) para "
+"poder usá-las para realizar ou receber chamadas (conversa por voz e chamadas "
+"para telefones reais). Por favor, realize ao menos uma chamada de voz usando "
+"o plugin do Google Talk, instalável na interface do GMail. Após esta "
+"chamada, saia da sua conta em todos os serviços. Clique em \"Adicionar\" "
+"para adicionar quantas contas você desejar."
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+"Este é o local onde você configura suas contas SIP (VoIP) como Sipgate, "
+"SipSorcery, os populares provedores Betamax, e qualquer outro provedor com "
+"suporte a SIP para permitir o uso destas contas para efetuar e receber "
+"chamadas (URI de SIP e chamads para números reais). Clique em \"Adicionar\" "
+"para adicionar quantas contas você desejar."
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+"Esta opção deve estar definida como \"Sim\" se você tem um DDR (Discagem "
+"Direta a Ramal) associado com esta conta SIP or quer receber chamadas URI de "
+"SIP através deste provedor."
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+"Esta seção contém configurações que não precisam ser modificadas em "
+"condições normais. Aqui você pode configurar seu sistema para usar com "
+"dispositivos SIP remotos e resolver problemas com a qualidade das chamadas "
+"através da inserção de regras de <abbr title=\"Quality of Service, Qualidade "
+"de serviço\">QoS</abbr>."
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+"Use o nome de usuário numérico (4 a 5 dígitos) se você estiver conectando "
+"telefones normais com ATAs para este sistema (para que eles possam discar os "
+"nomes de seus usuários)."
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+"Use esta conta para realizar chamadas externas como configurado na seção de "
+"\"Roteamento de Chamada\"."
+
+msgid "Use this account to make outgoing calls."
+msgstr "Use esta conta para realizar chamadas externas."
+
+msgid "User Accounts"
+msgstr "Contas de Usuários"
+
+msgid "User Agent String"
+msgstr "Texto para o Agente do Usuário"
+
+msgid "User Name"
+msgstr "Nome do Usuário"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr "Usa provedores habilitados para chamadas externas"
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+"Quando alguém iniciar uma conversa por voz com sua conta do GTalk ou chamar "
+"seu número GVoice (se você tiver uma conta Google Voice), a chamada será "
+"encaminhada para qualquer usuários que estão conectados (registados "
+"utilizando um dispositivo SIP ou softphone) e autorizados a receber a "
+"chamada. Se você tiver uma conta Google Voice, você deve ir para as "
+"configurações da sua conta GVoice e encaminhar as chamadas para o Google "
+"Chat, a fim de realmente receber chamadas feitas para o seu número GVoice. "
+"Se você tiver problemas para receber chamadas oriundas do GVoice, "
+"experimente a opção \"Call Screening/Monitoramento de Chamadas\" na "
+"configurações da sua conta GVoice. Finalmente, certifique-se de nenhum outro "
+"cliente está online com essa conta (navegador contado no GMail, aplicativo "
+"Google Talk no Desktop ou Celular), pois isto pode interferir."
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+"Quando a sua senha for salva, ela desaparece deste campo e não será exibida "
+"para sua proteção. A senha será alterada somente quando você informar uma "
+"nova senha diferente da que foi salva anteriormente."
+
+msgid "Yes"
+msgstr "Sim"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+"Você pode informar aqui o nome do domínio, endereço IP externo, ou um nome "
+"de domínio dinâmico. O melhor é informar um endereço IP estático. Se o seu "
+"endereço IP é dinâmico e ele muda, sua configuração se tornará inválida. "
+"Desta forma, é recomendado configurar um serviço de domínios dinâmicos e "
+"utilizar este nome aqui. Você pode configurar o serviço de domínios "
+"dinâmicos com o pacote luci-app-ddns."
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+"Você pode especificar um nome real para aparecer no identificador de "
+"chamadas."
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+"Você pode usar seus dispositivos SIP/softphones com este sistema a partir de "
+"um local remoto, desde que o seu provedor de Internet lhe forneça um "
+"endereço IP público. Você poderá ligar para outros usuários locais sem custo "
+"(por exemplo, outros adaptadores de telefone analógico (ATAs)) e usar seus "
+"provedores de VoIP para fazer chamadas como se fossem originadas do local do "
+"seu PBX. Depois de configurar esta aba, volte para onde os usuários são "
+"configurados e veja as novas configurações de servidor e porta com as quais "
+"você precisa configurar os seus dispositivos SIP remotos. Por favor, note "
+"que se este PABX não está rodando no seu roteador, você terá que configurar "
+"o redirecionamento de portas (NAT) no seu roteador. Por favor, encaminhe as "
+"portas abaixo (porta SIP e intervalo de porta RTP) para o endereço IP do "
+"dispositivo que executa este PBX."
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+"Seu PIN desaparece deste campo quando for salvo e não será exibido para sua "
+"proteção. Ele será alterada somente quando você informar um PIN diferente do "
+"que foi salvo anteriormente. É possível deixá-lo em branco mas fique atento "
+"quanto as implicações na segurança."
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+"Sua senha desaparece deste campo quando for salva e não será exibida para "
+"sua proteção. A senha será alterada somente quando você informar uma nova "
+"senha diferente da que foi salva anteriormente."
+
+#~ msgid ""
+#~ "Designate numbers that are allowed to call through this system and which "
+#~ "user's privileges it will have."
+#~ msgstr ""
+#~ "Números definidos que poderão realizar chamadas através deste sistema e "
+#~ "quais privilégios o usuário terá."
+
+#~ msgid ""
+#~ "Pick a random port number between 6500 and 9500 for the service to listen "
+#~ "on. Do not pick the standard 5060, because it is often subject to brute-"
+#~ "force attacks. When finished, (1) click \"Save and Apply\", and (2) click "
+#~ "the \"Restart VoIP Service\" button above. Finally, (3) look in the \"SIP "
+#~ "Device/Softphone Accounts\" section for updated Server and Port settings "
+#~ "for your SIP Devices/Softphones."
+#~ msgstr ""
+#~ "Escolha um número de porta aleatória entre 6500 e 9500 para o serviço "
+#~ "escutar. Não escolher o padrão 5060, porque é frequentemente alvo de ataques "
+#~ "de força bruta. Quando terminar, (1) clique em \"Salvar e Aplicar\", e (2) "
+#~ "clique no \"Reiniciar o serviço VoIP\" acima. Finalmente, (3) olhe na seção "
+#~ "\"Contas de Dispositivos SIP/Telefones em Software\" para atualizar o endereço "
+#~ "e porta do servidor para seu Dispositivos SIP/Telefones em Software."
+
+#~ msgid ""
+#~ "You can enter your domain name, external IP address, or dynamic domain "
+#~ "name here Please keep in mind that if your IP address is dynamic and it "
+#~ "changes your configuration will become invalid. Hence, it's recommended "
+#~ "to set up Dynamic DNS in this case."
+#~ msgstr ""
+#~ "Você pode digitar aqui o seu nome de domínio, endereço IP externo, ou nome "
+#~ "de domínio dinâmico. Tenha em mente que se o seu endereço IP é dinâmico e "
+#~ "ele mudar, a sua configuração se tornará inválida. Por isso, é recomendado "
+#~ "configurar um DNS dinâmico neste caso."
+
+#~ msgid "Account Status"
+#~ msgstr "Estado da Conta"
+
+#~ msgid "Account Status Message"
+#~ msgstr "Mensagem do Estado da Conta"
+
+#~ msgid "Domain Name/Dynamic Domain Name"
+#~ msgstr "Nome do Domínio/Nome do Domínio Dinâmico"
+
+#~ msgid "Enable Incoming Calls (See Status, Message below)"
+#~ msgstr "Habilitar Chamadas Recebidas (Veja o Estado, Mensagem abaixo)"
+
+#~ msgid "Service Control and Connection Status"
+#~ msgstr "Controle do Serviço e Estado da Conexão"
diff --git a/trunk/package/luci/po/pt_BR/polipo.po b/trunk/package/luci/po/pt_BR/polipo.po
new file mode 100644
index 00000000..881d5c07
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/polipo.po
@@ -0,0 +1,306 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-09-16 02:36+0200\n"
+"Last-Translator: Julio Cezar <jsilvestree@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Opções Avançadas"
+
+msgid "Allowed clients"
+msgstr "Clientes permitidos"
+
+msgid "Always use system DNS resolver"
+msgstr "Sempre use o resolvedor de DNS do sistema"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"A autenticação básica HTTP é suportada. Indique o usuário e senha no formato "
+"usuário:senha."
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "DNS and Query Settings"
+msgstr "Configurações de DNS e Consulta"
+
+msgid "DNS server address"
+msgstr "Endereço do servidor DNS"
+
+msgid "Delete cache files time"
+msgstr "Tempo para remoção dos arquivos de cache"
+
+msgid "Disk cache location"
+msgstr "Localização da cache em disco"
+
+msgid "Do not query IPv6"
+msgstr "Não consulte IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Ativar se a cache (proxy) for compartilhada por múltiplos usuários."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Tamanho do primeiro segmento PMM (em bytes)"
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Quanta memória RAM deverá ser usada pelo Polipo para a sua cache."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Tamanho da cache na RAM (bytes)"
+
+msgid "Listen address"
+msgstr "Endereço de escuta"
+
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Local onde o polipo guardará permanentemente os arquivos de cache. É "
+"recomendada a utilização de dispositivos de armazenamento externo uma vez "
+"que o cache pode crescer consideravelmente. Deixe em branco para desativar a "
+"cache em disco."
+
+msgid "Log file location"
+msgstr "Localização do arquivo de registo"
+
+msgid "Log to syslog"
+msgstr "Registar para o syslog"
+
+msgid "Logging and RAM"
+msgstr "Registro e RAM"
+
+msgid "Never use system DNS resolver"
+msgstr "Nunca use o resolvedor de DNS do sistema"
+
+msgid "On-Disk Cache"
+msgstr "Cache em Disco"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Tamanho do segmento PMM (em bytes)"
+
+msgid "Parent Proxy"
+msgstr "Porxy Superior"
+
+msgid "Parent proxy address"
+msgstr "Endereço do proxy superior"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Endereço do proxy superior (no formato host:porta), ao qual o Polipo irá "
+"encaminhar os seus pedidos."
+
+msgid "Parent proxy authentication"
+msgstr "Autenticação no proxy superior"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Estado do Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "O polipo é um proxy web pequeno e rápido."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Multiplexagem simples"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
+"da requisição de um pedido em múltiplos segmentos. O método tenta baixar a "
+"latência causada pela fraqueza do protocolo HTTP. Nota: alguns sites web não "
+"funcionam com a ativação de PMM."
+
+msgid "Port on which Polipo will listen"
+msgstr "Porta na qual o Polipo irá escutar"
+
+msgid "Proxy"
+msgstr "Proxy"
+
+msgid "Query DNS by hostname"
+msgstr "Consultar DNS pelo nome do equipamento"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+"Consulte o DNS diretamente. Alternativamente, use o resolvedor do sistema"
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+"Consulte o DNS diretamente. Para nomes desconhecidos, use o resolvedor do "
+"sistema"
+
+msgid "Query DNS for IPv6"
+msgstr "Consultar DNS para IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "Consulta IPv4 e IPv6, prefere IPv4"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "Consulta IPv4 e IPv6, prefere IPv6"
+
+msgid "Query only IPv6"
+msgstr "Consulta somente IPv6"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Define o endereço do servidor de DNS, caso pretenda que o polipo utilize um "
+"servidor DNS diferente do utilizado pelo sistema."
+
+msgid "Shared cache"
+msgstr "Cache compartilhada"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
+"dobro do tamanho do segmento PMM."
+
+msgid "Size to which cached files should be truncated"
+msgstr "Tamanho que os arquivos de cache serão truncados"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Syslog facility"
+msgstr "Categoria dos eventos Polipo no registo do sistema (syslog)"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"A interface na qual o Polipo será ativado. Para ativar em todas as "
+"interfaces, use 0.0.0.0 ou :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr "Tempo máximo antes que um arquivo de cache seja apagado"
+
+msgid "Time after which cached files will be truncated"
+msgstr "Tempo máximo antes que um arquivo de cache seja truncado"
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+"Para habilitar o PMM, o tamanho do segmento PMM deve ser definido para algum "
+"valor positivo."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Tamanho de truncagem dos arquivos de cache (em bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Tempo de truncagem dos arquivos de cache"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"É recomendado o uso de armazenamento de externos pois o arquivo de registro "
+"é escrito frequentemente e pode crescer consideravelmente."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+"Quando o endereço de escuta for definido como 0.0.0.0 ou :: (IPv6), é "
+"necessário listar quais clientes são permitidos. O formato é o endereço IP "
+"ou o endereço derede (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 "
+"(IPv6))"
+
+msgid "enable"
+msgstr "habilitado"
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Para activar a limpeza de cache em disco (altamente recomendado), deve "
+#~ "acrescentar uma tarefa cron (\"Serviços\") que execute o script /usr/sbin/"
+#~ "polipo_purge. Como exemplo, para executar uma limpeza da cache "
+#~ "diariamente pelas 06H00 deve acrescentar a seguinte linha: \"0 6 * * * /"
+#~ "usr/sbin/polipo_purge\" (sem as aspas)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr ""
+#~ "Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
+#~ "definido: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr ""
+#~ "Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
+#~ "definido: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr ""
+#~ "Tempo apos o qual os ficheiros de cache serão removidos. (valor pré-"
+#~ "definido: 32d)"
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar "
+#~ "os clientes que tiverem permissão para ligação. O formato é endereço de "
+#~ "host ou endereço de rede (192.168.1.123, 192.168.1.0/24, "
+#~ "2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
+#~ "happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false=nunca usar o resolver do sistema; reluctantly=pedir DNS "
+#~ "directamente, se o servidor DNS estiver indisponivel recorrer do resolver "
+#~ "DNS do sistema; happily=pedir DNS directamente, se o host nao for "
+#~ "encontrado, recorrer ao resolver DNS do sistema; true=Usar sempre o "
+#~ "resolver DNS do sistema"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Para activar PMM, o tamanho do segmento PMM deve ser definido para um "
+#~ "qualquer valor positivo."
diff --git a/trunk/package/luci/po/pt_BR/qos.po b/trunk/package/luci/po/pt_BR/qos.po
new file mode 100644
index 00000000..1ebaea2a
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/qos.po
@@ -0,0 +1,127 @@
+#  qos.po
+#  generated from ./applications/luci-qos/luasrc/i18n/qos.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2014-06-21 19:00+0200\n"
+"Last-Translator: Éder <eder.grigorio@openmailbox.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Calcular overhead"
+
+msgid "Classification Rules"
+msgstr "Classificação"
+
+msgid "Classification group"
+msgstr "Classificação"
+
+# 20140621: edersg: tradução
+msgid "Comment"
+msgstr "Comentário"
+
+msgid "Destination host"
+msgstr "Endereço de destino"
+
+msgid "Download speed (kbit/s)"
+msgstr "Velocidade de recebimento (kbit/s)"
+
+msgid "Enable"
+msgstr "Habilitado"
+
+msgid "Half-duplex"
+msgstr "Half-duplex"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Number of bytes"
+msgstr "Número de bytes"
+
+msgid "Ports"
+msgstr "Portas"
+
+msgid "Protocol"
+msgstr "Prococolo"
+
+msgid "QoS"
+msgstr "<abbr title=\"Quality of Service, Qualidade de serviço\">QoS</abbr>"
+
+msgid "Quality of Service"
+msgstr "Qualidade de Serviço"
+
+msgid "Service"
+msgstr "Serviço"
+
+msgid "Source host"
+msgstr "Endereço de origem"
+
+msgid "Target"
+msgstr "Alvo"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Velocidade de envio (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Com <abbr title=\"Quality of Service, Qualidade de serviço\">QoS</abbr>, "
+"você pode priorizar o tráfego da rede selecionada por endereços, portas ou "
+"serviços."
+
+msgid "all"
+msgstr "todos"
+
+msgid "default"
+msgstr "padrão"
+
+msgid "express"
+msgstr "expressa"
+
+msgid "low"
+msgstr "baixa"
+
+msgid "normal"
+msgstr "normal"
+
+msgid "priority"
+msgstr "prioritário"
+
+#~ msgid "Downlink"
+#~ msgstr "Link para download"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Conexão com a Internet"
+
+#~ msgid "Uplink"
+#~ msgstr "Link para upload"
+
+#~ msgid "allf"
+#~ msgstr "allf"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "qos_connbytes"
+
+#~ msgid "Prioritization"
+#~ msgstr "Priorização"
+
+#~ msgid "source network / source host"
+#~ msgstr "rede de origem / host de origem"
+
+#~ msgid "target network / target host"
+#~ msgstr "rede de destino / host de destino"
+
+#~ msgid "portrange"
+#~ msgstr "faixa de portas"
+
+#~ msgid "Bytes sent"
+#~ msgstr "Bytes enviados"
diff --git a/trunk/package/luci/po/pt_BR/radvd.po b/trunk/package/luci/po/pt_BR/radvd.po
new file mode 100644
index 00000000..62c63bb1
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/radvd.po
@@ -0,0 +1,469 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-17 23:13+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: German\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "6to4 interface"
+msgstr "Interface 6to4"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "Addresses"
+msgstr "Endereços"
+
+msgid "Advanced"
+msgstr "Avançado"
+
+msgid "Advertise Home Agent flag"
+msgstr "Anuncie a opção de Agente Local"
+
+msgid "Advertise router address"
+msgstr "Anuncie o endereço do roteador"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Anuncie o Sufixo do Domínio"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Anuncia IPv6 RDNSS. Se vazio, o endereço IPv6 atual da interface será usado"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Anuncie os prefixos IPv6"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Anuncie os prefixos IPv6. Se vazio, o prefixo da interface atual será usado"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Anuncia a capacidade de Agente Local para IPv6 Móvel (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "Anuncia a capacidade de registro de Roteador Móvel (NEMO Básico)"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Se especificado, anuncia no RA o tempo assumido de alcance dos vizinhos, em "
+"milissegundos. Especifique 0 para desabilita este anuncio"
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Anuncia no RA o valor padrão para a contagem de saltos nos pacotes unicast "
+"saindo da rede. Especifique 0 para desabilita este anuncio"
+
+msgid "Advertises the default router preference"
+msgstr "Anuncia a preferência do roteador padrão"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+"Anuncia no RA o MTU da conexão. Especifique 0 para desabilita este anuncio"
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+"Divulga a duração do tempo em segundos que endereços gerados a partir do "
+"prefixo através apátridas endereço autoconfiguração permanecem preferido."
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+"Divulga a duração do tempo em segundos que o prefixo é válido para o "
+"propósito de sobre-link determinado."
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+"Anuncia o período de tempo, em segundos, da validade do roteador padrão. "
+"Especifique 0 para período infinito"
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+"Anuncia o período de tempo, em segundos, que o roteador está oferecendo o "
+"serviço de Agente Local para IPv6 Móvel"
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+"Anuncia o tempo de espera, em milissegundos, entre mensagens de Solicitação "
+"de Vizinhos no RA. Especifique 0 para desabilitar a retransmissão do anúncio"
+
+msgid "Advertising"
+msgstr "Anúncio"
+
+msgid "Autonomous"
+msgstr "Autônomo"
+
+msgid "Clients"
+msgstr "Clientes"
+
+msgid "Configuration flag"
+msgstr "Marcação de configuração"
+
+msgid "Current hop limit"
+msgstr "Limite de saltos atual"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Configuração DNSSL"
+
+msgid "Default lifetime"
+msgstr "Validade padrão"
+
+msgid "Default preference"
+msgstr "Preferências padrão"
+
+msgid "Enable"
+msgstr "Habilita"
+
+msgid "Enable advertisements"
+msgstr "Habilita anúncios"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Habilita as solicitações e os anúncios do roteador"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+"Habilita o protoloco de autoconfiguração administrada com estado (RFC2462)"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+"Habilita a autoconfiguração de informação adicional, não endereço (RFC2462)"
+
+msgid "General"
+msgstr "Geral"
+
+msgid "Home Agent information"
+msgstr "Informação do Agente Local"
+
+msgid "Home Agent lifetime"
+msgstr "Validade do Agente Local"
+
+msgid "Home Agent preference"
+msgstr "Preferências do Agente Local"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "Inclui Informação do Agente Local no RA"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr "Inclui a opção de Intervalo de Anúncio de IPv6 Móvel no RA"
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr "Inclui o endereço da camada de rede da interface de saída no RA"
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+"Indica que o endereço da interface é enviado ao invés do prefixo de rede, "
+"como é necessário para IPv6 Móvel"
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+"Indica que a conexão abaixo não é capaz de utilizar broadcast. Isto inibe o "
+"envio de anúncios não solicitados"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+"Indica que este prefixo pode ser usado para configuração autônoma de "
+"endereços (RFC4862)"
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+"Indica que este prefixo pode ser usado para a determinação da presença no "
+"enlace local (RFC4861)"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Interface Configuration"
+msgstr "Configuração da Interface"
+
+msgid "Interface required"
+msgstr "Requer uma interface"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Lifetime"
+msgstr "Validade"
+
+msgid "Link MTU"
+msgstr "MTU da conexão"
+
+msgid "Managed flag"
+msgstr "Marcação de gerenciado"
+
+msgid "Max. interval"
+msgstr "Intervalo Máximo"
+
+msgid "Maximum advertisement interval"
+msgstr "Intervalo máximo de anúncio"
+
+msgid "Minimum advertisement delay"
+msgstr "Atraso mínimo de anúncio"
+
+msgid "Minimum advertisement interval"
+msgstr "Intervalo mínimo de anúncio"
+
+msgid "Mobile IPv6"
+msgstr "IPv6 Móvel"
+
+msgid "Mobile IPv6 interval option"
+msgstr "Opçao de intervalo de IPv6 móvel"
+
+msgid "Mobile IPv6 router registration"
+msgstr "Registro de roteador IPv6 móvel"
+
+msgid "Multicast"
+msgstr "Multicast"
+
+msgid "On-link"
+msgstr "Presença no enlace local"
+
+msgid "On-link determination"
+msgstr "Determinação da presença no enlace local"
+
+msgid "Preference"
+msgstr "Preferência"
+
+msgid "Preferred lifetime"
+msgstr "Validade preferida"
+
+msgid "Prefix"
+msgstr "Prefixo"
+
+msgid "Prefix Configuration"
+msgstr "Configuração do Prefixo"
+
+msgid "Prefixes"
+msgstr "Prefixos"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "Configuração do RDNSS"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Interface %q"
+
+msgid "Radvd - Prefix"
+msgstr "advd - Prefixo"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Rota"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"Radvd é um programa de anúncio de rotas para IPv6. Ele escuta por "
+"solicitações de rota e envia anúncios de roteador (RA) como descrito em RFC "
+"4861."
+
+msgid "Reachable time"
+msgstr "Tempo de alcance"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"Restringe a comnuicação para clientes específicos. Deixe vazio para usar "
+"multicast"
+
+msgid "Retransmit timer"
+msgstr "Cronômetro de retransmissão"
+
+msgid "Route Configuration"
+msgstr "Configuração da Rota"
+
+msgid "Routes"
+msgstr "Rotas"
+
+msgid "Source link-layer address"
+msgstr "Endereço de origem da camada de enlace"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+"Especifica o nome da interface lógica da qual será derivada o prefixo 6to4. "
+"O endereço IPv4 público da interface é combinado com 2002::/3 e o valor da "
+"opção de prefixo"
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr "Especifica o tempo de vida associado com o trajecto em segundos."
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr "Especifica o nome da interface lógica que esta seção pertence"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+"Especifica a duração máxima de quanto tempo as entradas DNSSL são usados ​​"
+"para resolução de nomes."
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+"Especifica a duração máxima de quanto tempo as entradas RDNSS são usados ​​"
+"para resolução de nomes."
+
+msgid "Specifies the preference associated with the default router"
+msgstr "Especifica as preferências associadas com o roteador padrão"
+
+msgid "Suffix"
+msgstr "Sufixo"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"O tempo máximo, em segundos, permitido entre o envio de RAs não solicitados "
+"a partir desta interface"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+"O tempo mínimo, em segundos, permitido entre o envio de RAs a partir desta "
+"interface"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"O tempo mínimo, em segundos, permitido entre o envio de RAs não solicitados "
+"a partir desta interface"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr "As preferencias para o Agente Local enviando este RA"
+
+msgid "Timing"
+msgstr "Cronometragem"
+
+msgid "Unicast only"
+msgstr "Somente Unicast"
+
+msgid "Valid lifetime"
+msgstr "Duração da validade"
+
+msgid "Validity time"
+msgstr "Tempo de validade"
+
+msgid "default"
+msgstr "padrão"
+
+msgid "high"
+msgstr "alto"
+
+msgid "low"
+msgstr "baixo"
+
+msgid "medium"
+msgstr "médio"
+
+msgid "no"
+msgstr "não"
+
+msgid "yes"
+msgstr "sim"
+
+#~ msgid "Advertised IPv6 prefix"
+#~ msgstr "Anuncie o prefixo IPv6"
+
+#~ msgid ""
+#~ "Advertised IPv6 prefix. If empty, the current interface prefix is used"
+#~ msgstr ""
+#~ "Anuncie o prefixo IPv6. Se vazio, o prefixo da interface atual será usado"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that addresses generated from "
+#~ "the prefix via stateless address autoconfiguration remain preferred. Use "
+#~ "0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Anuncia o período de tempo, em segundos, que endereços gerados a partir "
+#~ "do prefixo através da autoconfiguração de endereço sem estado terão "
+#~ "preferência. Especifique 0 para período infinito"
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that the prefix is valid for the "
+#~ "purpose of on-link determination. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Anuncia o período de tempo, em segundos, que o prefixo é valido para o "
+#~ "propósito de determinação da presença no enlace local. Especifique 0 para "
+#~ "período infinito"
+
+#~ msgid ""
+#~ "Indicates whether that RDNSS continues to be available to hosts even if "
+#~ "they moved to a different subnet"
+#~ msgstr ""
+#~ "Indica se o RDNSS continuará a estar disponível mesmo se o cliente for "
+#~ "movido para uma subrede diferente"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#~ msgid ""
+#~ "Specifies the lifetime associated with the route in seconds. Use 0 to "
+#~ "specify an infinite lifetime"
+#~ msgstr "Especifica a validade da rota em segundos. Utilize 0 para infinita"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the DNSSL entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Especifica a validade da entrada DNSSL para a resolução de nomes. Utilize "
+#~ "0 para duração infinita"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the RDNSS entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Especifica a validade da entrada RDNS para a resolução de nomes. Utilize "
+#~ "0 para duração infinita"
diff --git a/trunk/package/luci/po/pt_BR/rrdtool.po b/trunk/package/luci/po/pt_BR/rrdtool.po
new file mode 100644
index 00000000..510b4a8f
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/rrdtool.po
@@ -0,0 +1,359 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2011-10-11 21:17+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Wireless - Relação Sinal/Ruido"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "dBm"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Nivel de Ruído"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Força do Sinal"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Wireless - Qualidade do Sinal"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Qualidade do Sinal"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: Tempo de resposta ICMP"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "ms"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Firewall - Pacotes Processados"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pacote/s"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "Cadeia \"%di\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - Transferência na %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Bytes (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - Pacotes na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Packets/s"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Processado (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Descartados (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Erros      (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - Multicast na %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pacote/s"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Pacotes"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - Colisões na %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "Colisão(es)"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Colisões"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Erros na %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "Erro/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Processos"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Processo/s"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Processo %pi - tempo usado da cpu"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "sistema"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "usuário"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Processo %pi - threads e processos"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Contagem"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Processo %pi - pagina de erros"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Pagina de erros"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "pagina de erros"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Processo %pi - tamanho da memória virtual"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "memória virtual"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Usado no Processado #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Transferência na %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Pacotes na %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pacote/s"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: Ligações TCP na Porta %pi"
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "Ligação(ões)"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Utilização de Espaço em Disco em %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: Interrupções"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "Erro/s"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Carga do Sistema"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Carga"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 min"
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 min"
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 min"
diff --git a/trunk/package/luci/po/pt_BR/samba.po b/trunk/package/luci/po/pt_BR/samba.po
new file mode 100644
index 00000000..a7531522
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/samba.po
@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2013-04-06 22:54+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "Permitir convidados"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Usuários do sistema poderão acessar seu diretório home através dos "
+"compartilhamentos de rede"
+
+msgid "Allowed users"
+msgstr "Usuários permitidos"
+
+msgid "Create mask"
+msgstr "Máscara de criação"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Directory mask"
+msgstr "Máscara do diretório"
+
+msgid "Edit Template"
+msgstr "Editar modelo"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Edita o modelo que é usado para gerar a configuração do samba."
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "Hostname"
+msgstr "Nome do equipamento"
+
+msgid "Mask for new directories"
+msgstr "Máscara para novos diretórios"
+
+msgid "Mask for new files"
+msgstr "Máscara para novos arquivos"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Network Shares"
+msgstr "Compartilhamentos de Rede"
+
+msgid "Path"
+msgstr "Caminho"
+
+msgid "Read-only"
+msgstr "Somente leitura"
+
+msgid "Share home-directories"
+msgstr "Compartilhar diretórios home"
+
+msgid "Shared Directories"
+msgstr "Diretórios Compartilhados"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Este é o conteúdo do arquivo '/etc/samba/smb.conf.template' a partir do qual "
+"sua configuração do samba será gerada. Valores entre simbolos de pipe ('|') "
+"não devem ser alterados. Estes valores serão obtidos a partir da aba "
+"'Configurações Gerais'."
+
+msgid "Workgroup"
+msgstr "Grupo de trabalho"
+
+#~ msgid "Shared Directory"
+#~ msgstr "Diretório Compartilhado"
+
+#~ msgid "Physical Path"
+#~ msgstr "Caminho Físico"
+
+#~ msgid "optional"
+#~ msgstr "opcional"
diff --git a/trunk/package/luci/po/pt_BR/splash.po b/trunk/package/luci/po/pt_BR/splash.po
new file mode 100644
index 00000000..cbdc8016
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/splash.po
@@ -0,0 +1,402 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-02 05:36+0200\n"
+"PO-Revision-Date: 2014-06-21 19:10+0200\n"
+"Last-Translator: Éder <eder.grigorio@openmailbox.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "Aceitar"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"O acesso à internet, no entanto, pode ser possível porque alguns ativistas "
+"deste projeto compartilham duas conexões privadas com a internet. Estas "
+"poucas conexões são compartilhadas entre todos os usuários. Isto significa "
+"que a banda disponível é limitada e, por este motivo, pedimos que você não "
+"faça qualquer uma destas coisas:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+"O acesso à rede não é garantido. Ele pode ser interrompido a qualquer "
+"momento sem aviso e por qualquer motivo, para alguns equipamentos e/ou pode "
+"bloquear alguns usuários."
+
+msgid "Active Clients"
+msgstr "Clientes Ativos"
+
+msgid "Allowed hosts/subnets"
+msgstr "Subredes/equipamentos permitidos"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+"Como uma alternativa a edição completa do texto do termo de uso, você pode "
+"também entrar aqui algum texto personalizado para incluir na página padrão."
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"O limite da taxa de transferência somente é ativado quando ambos os limites, "
+"para subir e baixar, estão definidos. Use o valor 0 para desabilitar "
+"completamente esta limitação. Clientes na lista branca não são limitados."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+"Torne-se um membro ativo desta comunidade e ajude operando seu próprio nó."
+
+msgid "Blacklist"
+msgstr "Lista negra"
+
+msgid "Blocked"
+msgstr "Bloqueado"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+"Aceitando estas regras, você pode usar esta rede por %s hora(s). Depois "
+"deste prazo, você terá que aceitar estas regras novamente."
+
+msgid "Clearance time"
+msgstr "Tempo de eliminação"
+
+msgid "Client-Splash"
+msgstr "Client-Splash"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+"Client-Splash é um sistema de autenticação de ponto de acesso para redes sem "
+"fio em malha."
+
+# 20140621: edersg: tradução
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+"Os clientes são redirecionados para esta página depois de terem aceitado a "
+"*splash* Se esta for deixada em branco, eles são redirecionados para a "
+"página que haviam solicitado."
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+"A velocidade para baixar dos clientes é limitada por este valor (kbytes/s)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+"Os clientes que aceitarem o termo de uso estarão autorizados a usar a rede "
+"por esta quantidade de horas."
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+"A velocidade para subir dos clientes é limitada por este valor (kbytes/s)"
+
+msgid "Contact"
+msgstr "Contato"
+
+msgid "Decline"
+msgstr "Rejeitar"
+
+# 20140621: edersg: tradução
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+"As redes e as máquinas de destino que são excluídas a partir da *splashing*, "
+" são sempre permitidas."
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "Doar algum dinheiro para ajudar a manter este projeto vivo."
+
+msgid "Download limit"
+msgstr "Limite para baixar"
+
+msgid "Edit the complete splash text"
+msgstr "Edite todo o termo de uso"
+
+msgid "Fair Use Policy"
+msgstr "Política de uso adequado"
+
+msgid "Firewall zone"
+msgstr "Zona do Firewall"
+
+msgid "General"
+msgstr "Geral"
+
+# Very strange text... Used at http://luci.subsignal.org/trac/browser/luci/trunk/applications/luci-splash/luasrc/view/splash/splash.htm:58
+msgid "Get in %s with the operator of this access point."
+msgstr "Entre em %s com o operador deste ponto de acesso."
+
+msgid "Hostname"
+msgstr "Nome do Equipamento"
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+"Se você opera seu próprio equipamento WiFi, use canais diferentes dos nossos."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "Se você usa esta rede regularmente, nós pedimos a sua ajuda:"
+
+msgid "Include your own text in the default splash"
+msgstr "Inclua seu próprio texto no termo de uso padrão"
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Interceptar o tráfego do cliente nesta interface"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Interfaces usadas pelo Splash."
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"KB/s (Baixando/Subindo). Você pode remover esta limitação contribuindo "
+"ativamente para este projeto."
+
+msgid "Legally Prohibited Activities"
+msgstr "Atividades Proibidas por Lei"
+
+msgid "Legally Prohibited content"
+msgstr "Conteúdo Proibido por Lei"
+
+msgid "MAC Address"
+msgstr "Endereço MAC"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "Os endereços MAC nesta lista serão bloqueados."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"Endereços MAC dos clientes na lista branca. Estes não precisam aceitar o "
+"termo de uso e não possuem limitação na sua taxa de transferência."
+
+msgid "Netmask"
+msgstr "Máscara de Rede"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "No clients connected"
+msgstr "Nenhum cliente conectado"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Observe que nós não somos um provedor de internet mas uma rede comunitária "
+"experimental."
+
+msgid "Policy"
+msgstr "Política"
+
+# 20140621: edersg: tradução
+msgid "Redirect target"
+msgstr "Redirecionar alvo"
+
+msgid "Safety"
+msgstr "Segurança"
+
+msgid "Save"
+msgstr "Salvar"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr "As regras do Slapsh estão integradas a esta zona do firewall"
+
+msgid "Splashtext"
+msgstr "Texto do termo de uso"
+
+# 20140621: edersg: tradução
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+"Uma rede como a Internet não é criptografada e aberta. Cada usuário é "
+"responsável pela segurança de suas próprias conexões e dispositivos."
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+"A rede sem fio aberta e livre dos voluntários (\"Operadores\") provê o "
+"equipamento necessário e conexão com a Internet (\"Infraestrutura\") do seu "
+"próprio bolso."
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+"O operador não se responsabiliza por perda de dados, acesso não autorizado "
+"ou dano aos dispositivos, ou perdas financeiras que os participantes possam "
+"sofrer pelo o uso da rede."
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+"O participante concorda que não realizará nenhuma atividade e se absterá de "
+"atos que possam violar a lei ou infringir os direitos de terceiros."
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+"O participante concorda em não transferir conteúdo pela rede que viole a lei."
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+"O participante concorda em não usar a rede de qualquer maneira que possa "
+"prejudicar a infraestrutura, a própria rede, seus operadores ou outros "
+"participantes."
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+"Estes \"Termos de Uso\" regem o uso da rede por equipamentos dos "
+"participantes em uso desta rede."
+
+msgid "Time remaining"
+msgstr "Tempo restante"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Para perguntar por qual razão você foi bloqueado ou para solicitar novamente "
+"seu acesso, você pode tentar contatar o dono deste ponto de acesso:"
+
+msgid "Traffic in/out"
+msgstr "Tráfego de entrada/saída"
+
+msgid "Upload limit"
+msgstr "Limite de subida"
+
+msgid "Usage Agreement"
+msgstr "Acordo de Uso"
+
+msgid "Welcome"
+msgstr "Bem-vindo"
+
+msgid "Whitelist"
+msgstr "Lista branca"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr "Você está agora conectado à rede livre em malha sem fio"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"Vocẽ pode entrar aqui com seu próprio texto que será mostrado para os "
+"clientes.<br />É possível usar os seguintes marcadores: ###COMMUNITY###, "
+"###COMMUNITY_URL###, ###CONTACTURL###, ###LEASETIME###, ###LIMIT### and "
+"###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"Seu acesso para esta rede foi bloqueado, provavelmente porque você fez algo "
+"que as regras explicitamente proibiam."
+
+msgid "Your bandwidth is limited to"
+msgstr "Sua banda está limitada à"
+
+msgid "blacklisted"
+msgstr "na lista negra"
+
+msgid "expired"
+msgstr "expirado"
+
+msgid "optional when using host addresses"
+msgstr "opcional quando é usado o endereço do equipamento"
+
+msgid "perform any kind of illegal activities"
+msgstr "realizar qualquer tipo de atividades ilegais"
+
+msgid "splashed"
+msgstr "termo mostrado"
+
+msgid "temporarily blocked"
+msgstr "bloqueado temporariamente"
+
+msgid "unknown"
+msgstr "desconhecido"
+
+msgid "use filesharing applications on this network"
+msgstr "usar aplicativos de compartilhamento de arquivos nesta rede"
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "usar banda com fluxos ou arquivos baixados não necessários"
+
+msgid "whitelisted"
+msgstr "na lista branca"
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr ""
+#~ "Equipamentos ou Redes listadas aqui estarão excluídas do termo de uso. Eles "
+#~ "estarão sempre autorizados."
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "Aceitando estas regras, você pode usar esta rede para"
+
+#~ msgid "Edit Splash text"
+#~ msgstr "Editar texto do termo de uso"
+
+#~ msgid "hour(s). After this time you need to accept these rules again."
+#~ msgstr ""
+#~ "horas(s). Depois deste tempo, você terá que aceitar as regras novamente."
+
+#~ msgid "the owner of this access point."
+#~ msgstr "o dono deste ponto de acesso."
+
+#~ msgid ""
+#~ "You can change the text that is displayed to clients here.<br /> It is "
+#~ "possible to use the following markers: ###COMMUNITY###, "
+#~ "###COMMUNITY_URL###, ###LEASETIME### and ###ACCEPT###.<br />Click here to "
+#~ "<a href='/luci/splash/'>test the splash page</a> after you saved it."
+#~ msgstr ""
+#~ "Aqui você pode mudar o texto do termo de uso que é mostrado aos clientes."
+#~ "<br /> É possível usar as seguintes marcações: ###COMMUNITY###, "
+#~ "###COMMUNITY_URL###, ###LEASETIME### e ###ACCEPT###.<br />Clique aqui "
+#~ "para <a href='/luci/splash/'>testar a página de termo de uso</a> depois "
+#~ "que você salvá-la."
diff --git a/trunk/package/luci/po/pt_BR/statistics.po b/trunk/package/luci/po/pt_BR/statistics.po
new file mode 100644
index 00000000..81d036ce
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/statistics.po
@@ -0,0 +1,705 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2014-03-15 22:12+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "Ação (destino)"
+
+msgid "Add command for reading values"
+msgstr "Adicionar comando para leitura de valores"
+
+msgid "Add matching rule"
+msgstr "Adicionar regra"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Adicione múltiplos equipamentos separados por espaço."
+
+msgid "Add notification command"
+msgstr "Adicionar o comando de notificação"
+
+msgid "Base Directory"
+msgstr "Diretório Base"
+
+msgid "Basic monitoring"
+msgstr "Monitoramento básico"
+
+msgid "CPU Plugin Configuration"
+msgstr "Configuração do plugin CPU"
+
+msgid "CSV Output"
+msgstr "Saida CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Configuração do plugin CSV"
+
+msgid "Cache collected data for"
+msgstr "Cache dos dados coletados"
+
+msgid "Cache flush interval"
+msgstr "Intervalo de limpeza do cache"
+
+msgid "Chain"
+msgstr "Cadeia"
+
+msgid "CollectLinks"
+msgstr "Coleção de Links"
+
+msgid "CollectRoutes"
+msgstr "Coleção de Rotas"
+
+msgid "CollectTopology"
+msgstr "Coleção de Topologias"
+
+msgid "Collectd"
+msgstr "Coletar"
+
+msgid "Collectd Settings"
+msgstr "Configurações do Coletadas"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd é um pequeno daemon que coleta dados de várias fontes através de "
+"diferentes plugins. Nesta página você pode alterar as configurações gerais "
+"do daemon collectd."
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Configuração do Plugin do Conntrack"
+
+msgid "DF Plugin Configuration"
+msgstr "Configuração do plugin DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Configuração do plugin DNS"
+
+msgid "Data collection interval"
+msgstr "Intervalo da coleta de dados"
+
+msgid "Datasets definition file"
+msgstr "Arquivo com a definição de dados"
+
+msgid "Destination ip range"
+msgstr "Faixa IP de destino"
+
+msgid "Directory for collectd plugins"
+msgstr "Diretório para os plugins do collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Diretório para sub-configurações"
+
+msgid "Disk Plugin Configuration"
+msgstr "Configuração do plugin Disco"
+
+msgid "Disk Space Usage"
+msgstr "Utilização de espaço em disco"
+
+msgid "Disk Usage"
+msgstr "Utilização do Disco"
+
+msgid "Display Host »"
+msgstr "Mostrar Host"
+
+msgid "Display timespan »"
+msgstr "Mostrar intervalo »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Configuração do plugin E-Mail"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable this plugin"
+msgstr "Habilitar este plugin"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Configuração do plugin Exec"
+
+msgid "Filter class monitoring"
+msgstr "Monitoramento das Classes de Filtros"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Limpar cache após"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Encaminhamento entre o endereço de escuta e os endereços dos servidores"
+
+msgid "Graphs"
+msgstr "Gráficos"
+
+msgid "Group"
+msgstr "Grupo"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Aqui você pode definir comandos externos que serão iniciados pelo collectd a "
+"fim de ler determinados valores. Os valores serão lidos a partir do stdout."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Aqui você pode definir os comandos externos que serão iniciados pelo "
+"collectd quando determinados valores limite forem atingidos. Os valores "
+"passados ao comando serão enviados para o stdin."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Aqui você pode definir diversos critérios para as regras iptables "
+"selecionadas serem monitoradas."
+
+msgid "Host"
+msgstr "Equipamento"
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr "Endereço IP ou nome do equipamento de onde obter a saída do txtinfo"
+
+msgid "IRQ Plugin Configuration"
+msgstr "Configuração do plugin IRQ"
+
+msgid "Ignore source addresses"
+msgstr "Ignorar endereços de origem"
+
+msgid "Incoming interface"
+msgstr "Interface de entrada"
+
+msgid "Interface Plugin Configuration"
+msgstr "Configuração do plugin Interface"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interrupts"
+msgstr "Interrupções"
+
+msgid "Interval for pings"
+msgstr "Intervalo para pings"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Configuração do plugin Iptables"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Deixe não selecionado para determinar automaticamente a interface a ser "
+"monitorada"
+
+msgid "Listen host"
+msgstr "Endereço de escuta do Host"
+
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+msgid "Listener interfaces"
+msgstr "Escutar na(s) interface(s)"
+
+msgid "Load Plugin Configuration"
+msgstr "Configuração do plugin carga"
+
+msgid "Maximum allowed connections"
+msgstr "Máximo de conexões permitidas"
+
+msgid "Memory"
+msgstr "Memória"
+
+msgid "Memory Plugin Configuration"
+msgstr "Configuração do Plugin da Memória"
+
+msgid "Monitor all except specified"
+msgstr "Monitore tudo exceto se especificado"
+
+msgid "Monitor all local listen ports"
+msgstr "Monitorar todas as portas locais"
+
+msgid "Monitor devices"
+msgstr "Monitorar dispositivos"
+
+msgid "Monitor disks and partitions"
+msgstr "Monitoras discos e partições"
+
+msgid "Monitor filesystem types"
+msgstr "Monitorar tipos de sistemas de arquivos"
+
+msgid "Monitor hosts"
+msgstr "Monitorar os equipamentos"
+
+msgid "Monitor interfaces"
+msgstr "Monitorar interfaces"
+
+msgid "Monitor interrupts"
+msgstr "Monitorar interrupções"
+
+msgid "Monitor local ports"
+msgstr "Monitorar as portas locais"
+
+msgid "Monitor mount points"
+msgstr "Monitorar pontos de montagem"
+
+msgid "Monitor processes"
+msgstr "Monitorar processos"
+
+msgid "Monitor remote ports"
+msgstr "Monitorar portas remotas"
+
+msgid "Name of the rule"
+msgstr "Nome da regra"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Configuração do plugin Netlink"
+
+msgid "Network"
+msgstr "Rede"
+
+msgid "Network Plugin Configuration"
+msgstr "Configuração do plugin Rede"
+
+msgid "Network plugins"
+msgstr "Plugins de rede"
+
+msgid "Network protocol"
+msgstr "Protocolo de rede"
+
+msgid "Number of threads for data collection"
+msgstr "Número de threads para o coletor de dados"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "Configuração do Plugin OLSRd"
+
+msgid "Only create average RRAs"
+msgstr "Somente criar RRAs de média"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Outgoing interface"
+msgstr "Interface de saída"
+
+msgid "Output plugins"
+msgstr "Plugins de saída"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Configuração do plugin Ping"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Processes"
+msgstr "Processos"
+
+msgid "Processes Plugin Configuration"
+msgstr "Configuração do plugin Processos"
+
+msgid "Processes to monitor separated by space"
+msgstr "Processos para monitorar, separado por espaços"
+
+msgid "Processor"
+msgstr "Processador"
+
+msgid "Qdisc monitoring"
+msgstr "Monitoramento do Qdisc"
+
+msgid "RRD XFiles Factor"
+msgstr "Fator RRD XFiles"
+
+msgid "RRD heart beat interval"
+msgstr "Intervalo entre duas atualizações"
+
+msgid "RRD step interval"
+msgstr "Intervalo de atualização"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Configuração do plugin RRDTool"
+
+msgid "Rows per RRA"
+msgstr "Linhas por RRA"
+
+msgid "Script"
+msgstr "Script"
+
+msgid "Seconds"
+msgstr "Segundos"
+
+msgid "Server host"
+msgstr "Endereço do servidor"
+
+msgid "Server port"
+msgstr "Porta do servidor"
+
+msgid "Shaping class monitoring"
+msgstr "Monitoramento das Classes de Shaping"
+
+msgid "Socket file"
+msgstr "Arquivo do socket"
+
+msgid "Socket group"
+msgstr "Grupo do socket"
+
+msgid "Socket permissions"
+msgstr "Permissões do socket"
+
+msgid "Source ip range"
+msgstr "Faixa de IP de origem"
+
+msgid "Specifies what information to collect about links."
+msgstr "Especifica quais informações serão coletadas sobre os enlaces."
+
+msgid "Specifies what information to collect about routes."
+msgstr "Especifica quais informações serão coletadas sobre as rotas."
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "Especifica quais informações serão coletadas sobre a topologia global."
+
+msgid "Statistics"
+msgstr "Estatística"
+
+msgid "Storage directory"
+msgstr "Diretório de armazenamento"
+
+msgid "Storage directory for the csv files"
+msgstr "Diretório para armazenamento dos arquivos csv"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Armazenar os valores dos dados como taxas em vez de valores absolutos"
+
+msgid "Stored timespans"
+msgstr "Intervalos armazenados"
+
+msgid "System Load"
+msgstr "Carga do Sistema"
+
+msgid "System plugins"
+msgstr "Plugins de sistema"
+
+msgid "TCP Connections"
+msgstr "Conexões TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Configuração do plugin TCPConns"
+
+msgid "TTL for network packets"
+msgstr "TTL para os pacotes de rede"
+
+msgid "TTL for ping packets"
+msgstr "TTL para os pacotes do ping"
+
+msgid "Table"
+msgstr "Tabela"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr "O plugin NUT lê informações sobre Fontes de alimentação ininterruptas."
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+"O plugin OLSRd lê informações sobre redes em malha (mesh) a partir do plugin "
+"txtinfo do OLSRd."
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+"O plugin do conntrack coleta estatísticas sobre o número de conexões "
+"rastreadas."
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+"O plugin cpu coleta as estatísticas básicas sobre o uso do processador."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"O plugin csv armazena os dados coletados em um arquivo no formato csv para "
+"um futuro processamento por outros programas."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"O plugin df coleta estatísticas sobre a utilização de espaço em disco em "
+"diferentes dispositivos, pontos de montagem ou tipos de sistemas de arquivos."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"O plugin disco coleta estatísticas de uso detalhadas das partições "
+"selecionadas ou discos inteiros."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"O plugin dns coleta estatísticas detalhadas sobre o tráfego do dns nas "
+"interfaces selecionadas."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"O plugin de email cria um socket unix que pode ser usado para transmitir "
+"estatísticas de email para o collectd. Este plugin é essencialmente "
+"destinado a ser utilizado em conjunto com o plugin Mail::SpamAssasin::"
+"Plugin::Collectd mas pode ser utilizado de outras maneiras também."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"O plugin exec inicia comandos externos para leitura de valores ou notificar "
+"processos externos quando um determinado valor limite for atingido."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"O plugin interface plugin coleta estatísticas sobre o tráfego das interfaces "
+"selecionadas."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"O plugin iptables irá monitorar as regras de firewall selecionadas e coletar "
+"informações sobre pacotes e bytes processados pela regra."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"O plugin irq irá monitorar a taxa de ocorrências por segundo de cada "
+"interrupção selecionada. Se nenhuma interrupção for selecionada então todas "
+"as interrupções serão monitoradas."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"O plugin iwinfo coleta estatísticas sobre a força, ruído e qualidade do "
+"sinal da rede sem fio."
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "O plugin de carga coleta estatísticas gerais sobre a carga do sistema."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "O plugin de memória coleta estatísticas sobre o uso da memória."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"O plugin Netlink coleta informações detalhadas como qdisc-, classe- e "
+"estatísticas de filtro das interfaces selecionadas."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"O plugin rede fornece informações de rede baseadas na comunicação entre as "
+"diferentes instâncias do collectd. O Collectd pode operar tanto no modo "
+"cliente quanto no modo servidor. No modo cliente os dados coletados "
+"localmente são transferidos para um servidor collectd. No modo de servidor, "
+"o servidor local recebe os dados de outros servidores."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"O plugin ping irá enviar pacotes ICMP to tipo echo aos equipamentos "
+"selecionados e medir o tempo de resposta para cada equipamento."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"O plugin de processos coleta informações como o tempo da cpu, falha de "
+"página e uso de memória dos processos selecionados."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"O plugin rrdtool armazena os dados coletados no arquivo de banco de dados "
+"rrd.<br /><br /><strong>Aviso: A má configuração desses valores, resultará "
+"em um valor muito elevado no consumo de memória no diretório temporário. "
+"Isso pode tornar o equipamento inutilizável!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"As estatísticas são baseadas no <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> e é utilizado o <a href=\"http://oss.oetiker.ch/rrdtool/"
+"\">RRD Tool</a> para renderização das imagens a partir dos dados coletados."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"O plugin tcpconns coleta informações sobre as conexões TCP abertas das "
+"portas selecionadas."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"O plugin unixsock cria um socket unix, que pode ser usado para ler os dados "
+"coletados a partir de uma collectd em execução."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Esta seção define em quais interfaces o collectd irá aguardar para receber "
+"conexões."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Esta seção define para qual servidor os dados coletados localmente serão "
+"enviados."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Tentar encontrar o nome completo do equipamento (FQDN)"
+
+msgid "UPS"
+msgstr "UPS (no-breaks)"
+
+msgid "UPS Plugin Configuration"
+msgstr "Plugin de configuração UPS"
+
+msgid "UPS name in NUT ups@host format"
+msgstr "Nome do UPS no NUT em formato ups@equipamento"
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Configuração do plugin Unixsock"
+
+msgid "Used PID file"
+msgstr "Arquivo PID usado"
+
+msgid "User"
+msgstr "usuário"
+
+msgid "Verbose monitoring"
+msgstr "Monitoramento no modo detalhado"
+
+msgid "Wireless"
+msgstr "Rede Sem Fio (Wireless)"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "Configuração do Plugin iwinfo da Rede Sem Fio (Wireless)"
+
+msgid "e.g. br-ff"
+msgstr "ex: br-ff"
+
+msgid "e.g. br-lan"
+msgstr "ex: br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "ex: rejeitar-com tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "máx. 16 caracteres"
+
+msgid "reduces rrd size"
+msgstr "reduzir o tamanho do rrd"
+
+msgid "seconds; multiple separated by space"
+msgstr "segundos; vários valores, separar com espaço"
+
+msgid "server interfaces"
+msgstr "interfaces do servidor"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Plugins de rede instalados:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Plugins de saída instalados:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "Os plugins de rede são utilizados para coletar informações sobre conexões "
+#~ "tcp abertas, tráfego da interface, regras do iptables, etc."
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "Os plugins de saída proveem diferentes possibilidades para armazenar os "
+#~ "dados coletados. É possível habilitar diversos plugin para, por exemplo, "
+#~ "coletar dados em bancos de dados rrd e transmitir os dados através da rede "
+#~ "para outro serviço collectd."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr ""
+#~ "Plugins do sistema coletando valores sobre o estado do sistema e uso dos "
+#~ "recursos neste dispositivo.:"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "O plugin wireless coleta estatísticas sobre o nível de sinal wireless, o "
+#~ "ruído e qualidade."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Configuração do Plugin da Rede Sem Fio (Wireless)"
diff --git a/trunk/package/luci/po/pt_BR/tinyproxy.po b/trunk/package/luci/po/pt_BR/tinyproxy.po
new file mode 100644
index 00000000..ef7ffdad
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/tinyproxy.po
@@ -0,0 +1,367 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-09-16 02:38+0200\n"
+"Last-Translator: Julio Cezar <jsilvestree@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"<em>Via proxy</em> encaminha as requisições para um dado destino através do "
+"proxy superior especificado, <em>Rejeitar acesso</em> desabilita qualquer "
+"proxy superior para o alvo"
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Adiciona no cabeçalho do HTTP o campo \"X-Tinyproxy\" com o endereço IP do "
+"cliente para encaminhar a requisição"
+
+msgid "Allowed clients"
+msgstr "Clientes permitidos"
+
+msgid "Allowed connect ports"
+msgstr "Portas de conexão permitidas"
+
+msgid "Bind address"
+msgstr "Endereço de saída"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"Por padrão, os filtros usam expressões POSIX básicas. Habilite esta opção "
+"para usar expressões regulares extendidas"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+"Por padrão, as regras são tratadas como insensíveis a caixa. Habilite esta "
+"opção para diferenciar maiúsculas e minúsculas"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"Por padrão, a filtragem é feita baseada nos domínios. Habilite esta opção "
+"para, ao invés disto, casar com URLs"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"Por padrão, as regras de filtragem atuam como uma lista negra. Habilite esta "
+"opção para somente permitir URLs ou domínios que casem"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+"Pode ser tanto um como uma faixa de endereços IP, um nome de dompínio ou \"."
+"\" para qualquer computador sem domínio"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "Connection timeout"
+msgstr "Tempo limite de conexão"
+
+msgid "Default deny"
+msgstr "Nege por padrão"
+
+msgid "Enable Tinyproxy server"
+msgstr "Habilitar o servidor Tinyproxy"
+
+msgid "Error page"
+msgstr "Página de erro"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "Falhou ao tentar obter estatísticas da URL:"
+
+msgid "Filter by RegExp"
+msgstr "Filtrar por Expressão Regular"
+
+msgid "Filter by URLs"
+msgstr "Filtrar por URLs"
+
+msgid "Filter case-sensitive"
+msgstr "Diferenciar maiúsculo/minúsculo no filtro"
+
+msgid "Filter file"
+msgstr "Arquivo de filtro"
+
+msgid "Filtering and ACLs"
+msgstr "Filtragem e ACLs"
+
+msgid "General settings"
+msgstr "Configurações gerais"
+
+msgid "Group"
+msgstr "Grupo"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+"Modelo de arquivo HTML para servir para requisições de estado do computador"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "Modelo de arquivo HTML para servir quando ocorrer error HTTP"
+
+msgid "Header whitelist"
+msgstr "Lista branca do cabeçalho"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Lista ou faixa de endereços IP a quem é permitido o uso do servidor proxy"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"List as portas que podem utilizar o método CONNECT. Um valor \"0\" único "
+"permitirá todas as portas"
+
+msgid "Listen address"
+msgstr "Endereço de escuta"
+
+msgid "Listen port"
+msgstr "Porta de escuta"
+
+msgid "Log file"
+msgstr "Arquivo de registro"
+
+msgid "Log file to use for dumping messages"
+msgstr "Arquivo de registro usado para despejar as mensagens"
+
+msgid "Log level"
+msgstr "Nível do registro"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "Detalhamento dos registors do Tinyproxy"
+
+msgid "Max. clients"
+msgstr "Número máximo de clientes"
+
+msgid "Max. requests per server"
+msgstr "Numero máximo de requisições por servidor"
+
+msgid "Max. spare servers"
+msgstr "Max. servidores sobressalentes"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "Numero máximo permitido de cliente conectados concorrentemente"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+"Numero máximo de requisições permitidas por processo. Se este limite é "
+"excedido, o processo é redisparado. Zero significa ilimitado."
+
+msgid "Maximum number of prepared idle processes"
+msgstr "Número máximo de processos em espera preparados"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr "Número máximo de segundos que uma conexão inativa é mantida aberta"
+
+msgid "Min. spare servers"
+msgstr "Número mínimo de servidores sobressalentes"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "Número mínimo de processos em espera preparados"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr "Número de processos em espera iniciado quando o Tinyproxy é disparado"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+"Arquivo de texto simples com as URLs ou os domínios para filtrar. Uma "
+"entrada por linha"
+
+msgid "Policy"
+msgstr "Política"
+
+msgid "Privacy settings"
+msgstr "Configurações de privacidade"
+
+msgid "Reject access"
+msgstr "Rejeitar acesso"
+
+msgid "Server Settings"
+msgstr "Configurações do Servidor"
+
+msgid "Server limits"
+msgstr "Limites do servidor"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+"Especifica os nomes dos cabeçalhos HTTP que serão permitidos. Todos os "
+"demais serão descartados. Deixe em branco para desabilitar a filtragem de "
+"cabeçalho"
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "Especifica a porta na qual o Tinyproxy escutará pelas requisições"
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+"Especifica o nome do computador que o Tinyproxy usará no cabeçalho HTTP"
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+"Especifica o endereço que o Tinyproxy utilizará para encaminhar as "
+"requisições"
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr "Especifica o endereço no qual o Tinyproxy escutará pelas requisições"
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr "Especifica o nome do grupo com o qual o processo do Tinyproxy rodará"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+"Especifica o proxy superior para usar quando acessar o alvo. Formato é "
+"<code>address:port</code>"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr "Especifica o nome do usuário com o qual o processo do Tinyproxy rodará"
+
+msgid "Start spare servers"
+msgstr "Dispare servidores de espera"
+
+msgid "Statistics page"
+msgstr "Página de estatística"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Target host"
+msgstr "Host de destino"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Estado do Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte a cache"
+
+msgid "Upstream Proxies"
+msgstr "Proxies superiores"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+"As regras do proxy superior define os servidores de proxy para uso quando "
+"certos endereços IP ou domínios forem acessados."
+
+msgid "Use syslog"
+msgstr "Use o syslog"
+
+msgid "User"
+msgstr "Usuário"
+
+msgid "Via hostname"
+msgstr "Via nome do computador"
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+"Escreve as mensagens de registros para o syslog ao invéz do arquivo de "
+"registro"
+
+msgid "X-Tinyproxy header"
+msgstr "Cabeçalho do X-Tinyproxy"
+
+#~ msgid "Allow access from"
+#~ msgstr "Permitir acesso de"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Cabeçalhos permitidos para proxy anônimo"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Associar o tráfego de saída ao endereço"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Portas permitidas para o método CONNECT "
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0 = desativado, vazio = todas"
+
+#~ msgid "Error document"
+#~ msgstr "Documento de erro"
+
+#~ msgid "Filter list"
+#~ msgstr "Lista de filtros"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Filtros \"case sensitive\""
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "A lista de filtros é uma lista branca"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Filtros com suporte à expressões regulares"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Filtrar URLs em vez de domínios"
+
+#~ msgid "Listen on address"
+#~ msgstr "Escutar no endereço"
+
+#~ msgid "Logfile"
+#~ msgstr "Arquivo de log"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Número máximo de clientes"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Máximo de solicitações por thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Servidores sobressalentes iniciar com"
+
+#~ msgid "Statistic document"
+#~ msgstr "Documento de estatísticas"
+
+#~ msgid "Write to syslog"
+#~ msgstr "Escrever para syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Timeout de conexão"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Valor do cabeçalho \"Via-Header\""
+
+#~ msgid "Include client IP"
+#~ msgstr "Incluir o IP do cliente"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Controle de Upstream"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Proxy para Upstream"
diff --git a/trunk/package/luci/po/pt_BR/transmission.po b/trunk/package/luci/po/pt_BR/transmission.po
new file mode 100644
index 00000000..82ba6a46
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/transmission.po
@@ -0,0 +1,300 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-06 16:27+0200\n"
+"PO-Revision-Date: 2013-04-06 22:58+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Velocidade alternativa para baixar"
+
+msgid "Alternative speed enabled"
+msgstr "Velocidade alternativa ativada"
+
+msgid "Alternative speed time begin"
+msgstr "Hora de início da velocidade alternativa"
+
+msgid "Alternative speed time day"
+msgstr "Dia da velocidade alternativa"
+
+msgid "Alternative speed time end"
+msgstr "Hora final da velocidade alternativa"
+
+msgid "Alternative speed timing enabled"
+msgstr "Temporização da velocidade alternativa habilitada"
+
+msgid "Alternative upload speed"
+msgstr "Velocidade de subida alternativa"
+
+msgid "Automatically start added torrents"
+msgstr "Iniciar automaticamente os torrents adicionados"
+
+msgid "Bandwidth settings"
+msgstr "Configurações da velocidade do enlace"
+
+msgid "Binding address IPv4"
+msgstr "Endereço de escuta IPv4"
+
+msgid "Binding address IPv6"
+msgstr "Endereço de escuta IPv6"
+
+msgid "Block list enabled"
+msgstr "Lista de Bloqueios habilitada"
+
+msgid "Blocklist URL"
+msgstr "URL da lista de bloqueio"
+
+msgid "Blocklists"
+msgstr "Lista de Bloqueio"
+
+msgid "Cache size in MB"
+msgstr "Tamanho em MB do cache"
+
+msgid "Config file directory"
+msgstr "Diretório dos arquivos de configuração"
+
+msgid "DHT enabled"
+msgstr "DHT habilitado"
+
+msgid "Debug"
+msgstr "Depuração"
+
+msgid "Download directory"
+msgstr "Diretório de arquivos baixados"
+
+msgid "Download queue enabled"
+msgstr "Fila para baixar habilitada"
+
+msgid "Download queue size"
+msgstr "Tamanho da fila para baixar"
+
+msgid "Enable watch directory"
+msgstr "Habilitar monitoramento de diretório"
+
+msgid "Enabled"
+msgstr "Habilitar"
+
+msgid "Encryption"
+msgstr "Cifragem"
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "Fast"
+msgstr "Rápido"
+
+msgid "Files and Locations"
+msgstr "Arquivos e Locais"
+
+msgid "Forced"
+msgstr "Forçado"
+
+msgid "Full"
+msgstr "Cheio"
+
+msgid "Global peer limit"
+msgstr "Limite global de parceiros conectados"
+
+msgid "Global settings"
+msgstr "Configurações Globais"
+
+msgid "Idle seeding limit"
+msgstr "Limite para parar de semear se ocioso"
+
+msgid "Idle seeding limit enabled"
+msgstr "Habilitar limite para parar de semear se ocioso"
+
+msgid "Incomplete directory"
+msgstr "Diretório de incompletos"
+
+msgid "Incomplete directory enabled"
+msgstr "Ativado diretório para arquivos incompletos"
+
+msgid "Info"
+msgstr "Informação"
+
+msgid "LPD enabled"
+msgstr "LPD habilitado"
+
+msgid "Lazy bitfield enabled"
+msgstr "Envio de campo de bits incompletos habilitado"
+
+msgid "Message level"
+msgstr "Nível de mensagens"
+
+msgid "Miscellaneous"
+msgstr "Diversos"
+
+msgid "None"
+msgstr "Nada"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"Número/Campo de bits. Comece com 0 e, então, para cada dia você quer o "
+"agendador habilitado, adicione um valor. Para domingo - 1, segunda-feira - "
+"2, terça-feira - 4, quarta-feira - 8, quinta-feira - 16, sexta-feira - 32, "
+"Sábado - 64"
+
+msgid "Off"
+msgstr "Desligado"
+
+msgid "Open Web Interface"
+msgstr "Abrir interface Web"
+
+msgid "PEX enabled"
+msgstr "PEX habilitado"
+
+msgid "Peer Port settings"
+msgstr "Configuração de porta do parceiro"
+
+msgid "Peer congestion algorithm"
+msgstr "Algoritmo de congestionamento dos parceiro"
+
+msgid "Peer limit per torrent"
+msgstr "Limite de torrents por parceiro"
+
+msgid "Peer port"
+msgstr "Porta do parceiro"
+
+msgid "Peer port random high"
+msgstr "Limite superior da porta aleatória do parceiro"
+
+msgid "Peer port random low"
+msgstr "Limite inferior da porta aleatória do parceiro"
+
+msgid "Peer port random on start"
+msgstr "Porta aleatória inicial do parceiro"
+
+msgid "Peer settings"
+msgstr "Configuração do parceiro"
+
+msgid "Peer socket tos"
+msgstr "TOS da conexão do parceiro"
+
+msgid "Port forwarding enabled"
+msgstr "Encaminhamento de porta ativado"
+
+msgid "Preferred"
+msgstr "Preferencial"
+
+msgid "Prefetch enabled"
+msgstr "Adiantamento de leitura de disco habilitado"
+
+msgid "Queue stalled enabled"
+msgstr "Parada de fila habilitada"
+
+msgid "Queue stalled minutes"
+msgstr "Parada de fila em minutos"
+
+msgid "Queueing"
+msgstr "Filas"
+
+msgid "RPC URL"
+msgstr "RPC URL"
+
+msgid "RPC authentication required"
+msgstr "RPC requer autenticação"
+
+msgid "RPC bind address"
+msgstr "Endereço de escuta do RPC"
+
+msgid "RPC enabled"
+msgstr "RPC habilitado"
+
+msgid "RPC password"
+msgstr "Senha do RPC"
+
+msgid "RPC port"
+msgstr "Porta do RPC"
+
+msgid "RPC settings"
+msgstr "Configuração do RPC"
+
+msgid "RPC username"
+msgstr "Nome do usuario do RPC"
+
+msgid "RPC whitelist"
+msgstr "Lista branca do RPC"
+
+msgid "RPC whitelist enabled"
+msgstr "Lista branca do RPC habilitada"
+
+msgid "Ratio limit"
+msgstr "Limite da relação"
+
+msgid "Ratio limit enabled"
+msgstr "Limite da relação habilitado"
+
+msgid "Rename partial files"
+msgstr "Renomear arquivos parciais"
+
+msgid "Run daemon as user"
+msgstr "Executar serviço como usuário"
+
+msgid "Scheduling"
+msgstr "Agendamento"
+
+msgid "Scrape paused torrents enabled"
+msgstr "Busca de informações de torrents pausados ​​habilitada"
+
+msgid "Script torrent done enabled"
+msgstr "Script de conclusão de torrent habilitado"
+
+msgid "Script torrent done filename"
+msgstr "Nome do arquivo do script de conclusão de torrent"
+
+msgid "Seed queue enabled"
+msgstr "Fila de semeadura habilitada"
+
+msgid "Seed queue size"
+msgstr "Tamanho da fila de semeadura"
+
+msgid "Speed limit down"
+msgstr "Limite inferior de velocidade"
+
+msgid "Speed limit down enabled"
+msgstr "Limite inferior de velocidade habilitado"
+
+msgid "Speed limit up"
+msgstr "Limite superior de velocidade"
+
+msgid "Speed limit up enabled"
+msgstr "Limite superior de velocidade habilitado"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"O Transmission é um cliente BitTorrent simples, aqui você pode configurá-lo."
+
+msgid "Trash original torrent files"
+msgstr "Apague os arquivos torrent originais"
+
+msgid "Upload slots per torrent"
+msgstr "Vagas para conexão de envio por torrent"
+
+msgid "Watch directory"
+msgstr "Monitorar diretório"
+
+msgid "in minutes from midnight"
+msgstr "em minutos a partir da meia-noite"
+
+msgid "preallocation"
+msgstr "pré-alocação"
+
+msgid "uTP enabled"
+msgstr "uTP habilitado"
diff --git a/trunk/package/luci/po/pt_BR/upnp.po b/trunk/package/luci/po/pt_BR/upnp.po
new file mode 100644
index 00000000..ae9e7fe0
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/upnp.po
@@ -0,0 +1,166 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2011-10-18 22:17+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"ACLs especificam quais portas externas podem ser redirecionadas para quais "
+"endereços e portas internos"
+
+msgid "Action"
+msgstr "Ação"
+
+msgid "Active UPnP Redirects"
+msgstr "Redirecionamentos UPnP Ativos"
+
+msgid "Advanced Settings"
+msgstr "Configurações Avançadas"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+"Permite adicionar encaminhamento apenas para o endereço IP requisitante"
+
+msgid "Announced model number"
+msgstr "Número do modelo anunciado"
+
+msgid "Announced serial number"
+msgstr "Número serial anunciado"
+
+msgid "Clean rules interval"
+msgstr "Intervalo de limpeza das regras"
+
+msgid "Clean rules threshold"
+msgstr "Limiar de limpeza das regras"
+
+msgid "Client Address"
+msgstr "Endereço do cliente"
+
+msgid "Client Port"
+msgstr "Porta do Cliente"
+
+msgid "Collecting data..."
+msgstr "Coletando dados..."
+
+msgid "Comment"
+msgstr "Comentário"
+
+msgid "Delete Redirect"
+msgstr "Apague o Redirecionamento"
+
+msgid "Device UUID"
+msgstr "UUID do Dispositivo"
+
+msgid "Downlink"
+msgstr "Velocidade de recebimento do enlace (downlink)"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Habilite a função NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Habilite a função UPnP"
+
+msgid "Enable additional logging"
+msgstr "Habilite registros adicionais"
+
+msgid "Enable secure mode"
+msgstr "Habilite modo seguro"
+
+msgid "External Port"
+msgstr "Porta Externa"
+
+msgid "External ports"
+msgstr "Portas Externas"
+
+msgid "General Settings"
+msgstr "Configurações Gerais"
+
+msgid "Internal addresses"
+msgstr "Endereços internos"
+
+msgid "Internal ports"
+msgstr "Portas internas"
+
+msgid "MiniUPnP ACLs"
+msgstr "ACLs do MiniUPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Configurações do MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Intervalo de notificação"
+
+msgid "Port"
+msgstr "Porta"
+
+msgid "Presentation URL"
+msgstr "URL de apresentação"
+
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Envie informações extra de depuração ao registro do sistema"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Informe o tempo de vida do sistema ao invés do tempo do processo"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Dispare os serviços de UPnP e NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Não existe redirecionamentos ativos."
+
+msgid "UPNP"
+msgstr ""
+"<abbr title=\"Universal Plug and Play, Plugue e Use Universal\">UPnP</abbr>"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP permite os clientes da rede local configurem automaticamente o roteador."
+
+msgid "UPnP lease file"
+msgstr "Arquivo de concessão do UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Plug & Play Universal"
+
+msgid "Uplink"
+msgstr "Velocidade de envio do enlace (uplink)"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Valores em KByte/s, apenas informativas"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP permite os clientes da rede local configurem automaticamente o "
+#~ "roteador."
+
+#~ msgid "enable"
+#~ msgstr "habilitar"
+
+#~ msgid "Log output"
+#~ msgstr "Log de saída"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
+#~ "pode resultar em elevados riscos de segurança para sua rede."
diff --git a/trunk/package/luci/po/pt_BR/ushare.po b/trunk/package/luci/po/pt_BR/ushare.po
new file mode 100644
index 00000000..5fc872e8
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/ushare.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"PO-Revision-Date: 2012-09-26 23:09+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Diretórios de conteúdo"
+
+msgid "Disable telnet console"
+msgstr "Desativar console telnet"
+
+msgid "Disable webinterface"
+msgstr "Desativar interface web"
+
+msgid "Enable"
+msgstr "Habilitar"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Servername"
+msgstr "Nome do servidor"
+
+msgid "Settings"
+msgstr "Configurações"
+
+msgid "Username"
+msgstr "Nome do usuário"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare é um Servidor de Mídia DLNA & UPnP (TM) A/V. Implementa o componente "
+"do servidor que provê aos dispositivos de mídia UPnP informações sobre os "
+"arquivos multimídias disponíveis."
diff --git a/trunk/package/luci/po/pt_BR/uvc_streamer.po b/trunk/package/luci/po/pt_BR/uvc_streamer.po
new file mode 100644
index 00000000..9ae2e616
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/uvc_streamer.po
@@ -0,0 +1,40 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Quadros por segundo"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Resolução"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Definições"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Webcam transmitindo"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configure sua webcam compatível com Linux-UVC. Aponte seu navegador para, "
+"por exemplo, <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/pt_BR/vnstat.po b/trunk/package/luci/po/pt_BR/vnstat.po
new file mode 100644
index 00000000..47cf09ae
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/vnstat.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-11 21:02+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: German\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "Daily traffic"
+msgstr "Tráfego diário"
+
+msgid "Graphs"
+msgstr "Gráficos"
+
+msgid "Hourly traffic"
+msgstr "Tráfego horário"
+
+msgid "Monitor selected interfaces"
+msgstr "Monitore as interfaces selecionadas"
+
+msgid "Monthly traffic"
+msgstr "Tráfego mensal"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Ainda nenhum banco de dados foi definido. Vá para a configuração do VnStat "
+"ehabilite o monitoramento para um ou mais interfaces."
+
+msgid "Restart VnStat"
+msgstr "Reiniciar VnStat"
+
+msgid "Summary display"
+msgstr "Tela de resumo"
+
+msgid "Top 10 display"
+msgstr "Tela dos 10 mais"
+
+msgid "Update »"
+msgstr "Atualizar »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Gráficos VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Monitor de Tráfego VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat é um monitor de tráfego de rede para Linux que mantém um registro do "
+"tráfego para a(s) interface(s) selecionada(s)."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "O serviço VnStat foi reiniciado."
diff --git a/trunk/package/luci/po/pt_BR/voice_core.po b/trunk/package/luci/po/pt_BR/voice_core.po
new file mode 100644
index 00000000..18cab723
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/voice_core.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-07-05 06:44+0200\n"
+"Last-Translator: rafaelff1 <rafael.f.f1@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefones"
+
+msgid "Voice"
+msgstr "Voz"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/pt_BR/voice_diag.po b/trunk/package/luci/po/pt_BR/voice_diag.po
new file mode 100644
index 00000000..c5d426df
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/voice_diag.po
@@ -0,0 +1,32 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-11 20:31+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Diagnostics"
+msgstr "Diagnósticos"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Os diagnósticos disponíveis em seu dispositivo dependem dos módulos que você "
+"instalou."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Neste menu existem opções que permite a configuração e execução de testes "
+"nas operações de voz em seu sistema. Estas são conhecidas como diagósticos."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/pt_BR/watchcat.po b/trunk/package/luci/po/pt_BR/watchcat.po
new file mode 100644
index 00000000..fe970363
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/watchcat.po
@@ -0,0 +1,71 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-03-29 23:20+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "Atraso para reinício forçado"
+
+msgid "Host address to ping"
+msgstr "Endereço do equipamento para efetuar o PING"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Com qual frequência deve verificar a conexão com a Internet. A unidade "
+"padrão é segundos, mas você pode usar o sufixo 'm' para minutos, 'h' para "
+"horas ou 'd' para dias"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"No modo periódico, é definido o período para se reiniciar. No modo Internet, "
+"é definido o maior período de tempo sem acesso à Internet até que uma "
+"reiniciação é realizada. A unidade padrão é segundos, mas você pode usar o "
+"sufixo 'm' para minutos, 'h' para horas ou 'd' para dias."
+
+msgid "Operating mode"
+msgstr "Modo de Operação"
+
+msgid "Period"
+msgstr "Período"
+
+msgid "Ping host"
+msgstr "Pingar Máquina"
+
+msgid "Ping period"
+msgstr "Período de ping"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat permite que se configure um período para reiniciar e/ou quando a "
+"conexão com à Internet foi perdida por um ser período de tempo."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"Ao se reiniciar o sistema, watchcat acionará uma reiniciação suave. Ao se "
+"inserir um valor diferente de zero aqui, será acionado uma reiniciação "
+"forçada se a reiniciação suave falhar. Insira um número de segundos para "
+"habilitar, use 0 para desabilitar."
diff --git a/trunk/package/luci/po/pt_BR/wol.po b/trunk/package/luci/po/pt_BR/wol.po
new file mode 100644
index 00000000..6a21a855
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/wol.po
@@ -0,0 +1,56 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2011-10-11 20:31+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Broadcast em todas as interfaces"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Escolha o computador para acordar ou entre com um endereço MAC"
+
+msgid "Host to wake up"
+msgstr "Computador para acordar"
+
+msgid "Network interface to use"
+msgstr "Interfaces de rede para usar"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Algumas vezes, somente uma das ferramentas funciona. Se uma delas falhar, "
+"tente a outra"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Especifica a interface para onde os pacotes de WoL serão enviados"
+
+msgid "Starting WoL utility:"
+msgstr "Iniciando utilitário WoL:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Wake on LAN é um mecanismo para acordar/ligar remotamente computadores na "
+"rede local."
+
+msgid "Wake up host"
+msgstr "Acorda um computador"
+
+msgid "WoL program"
+msgstr "Programa WoL"
diff --git a/trunk/package/luci/po/pt_BR/wshaper.po b/trunk/package/luci/po/pt_BR/wshaper.po
new file mode 100644
index 00000000..f973ebb5
--- /dev/null
+++ b/trunk/package/luci/po/pt_BR/wshaper.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-18 19:32+0200\n"
+"PO-Revision-Date: 2011-10-18 19:39+0200\n"
+"Last-Translator: Luiz Angelo <luizluca@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Downlink"
+msgstr "Velocidade para baixar (downlink)"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Taxa de transferência para baixar em kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Equipamento ou Rede na notação CIDR."
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "Low priority destination ports"
+msgstr "Portas de destino de baixa prioridade"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Equipamentos de baixa prioridade (Destino)"
+
+msgid "Low priority hosts (Source)"
+msgstr "Equipamentos de baixa prioridade (Origem)"
+
+msgid "Low priority source ports"
+msgstr "Portas de origem de baixa prioridade"
+
+msgid "Uplink"
+msgstr "Velocidade para subir (uplink)"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Taxa de transferência para subir em kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Configuração do Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper usa o controle de tráfego para garantir baixa latência para "
+"tráfego interativo mesmo quando sua conexão com a internet está extremamente "
+"saturada."
diff --git a/trunk/package/luci/po/ro/ahcp.po b/trunk/package/luci/po/ro/ahcp.po
new file mode 100644
index 00000000..2882b31f
--- /dev/null
+++ b/trunk/package/luci/po/ro/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 19:14+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Server AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP este un protocol de autoconfigurare pentru IPv6 si IPv4 menit sa "
+"inlocuie \"router discovery\" si DHCP in retele unde este dificil de "
+"configurat un server pentru fiecare domeniu de broadcast pe fiecare "
+"legatura, de exemplu pentru retele mobile ad-hoc."
+
+msgid "Active AHCP Leases"
+msgstr "Conexiuni active AHCP"
+
+msgid "Address"
+msgstr "Adresă"
+
+msgid "Advanced Settings"
+msgstr "Setări avansate"
+
+msgid "Age"
+msgstr "Vârstă"
+
+msgid "Announced DNS servers"
+msgstr "Servere DNS anuntate"
+
+msgid "Announced NTP servers"
+msgstr "Servere NTP anuntate"
+
+msgid "Announced prefixes"
+msgstr "Prefixe anuntate"
+
+msgid "Collecting data..."
+msgstr "Colectare date.."
+
+msgid "Forwarder"
+msgstr "Forwarder"
+
+msgid "General Setup"
+msgstr "Configurare generala"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 si IPv6"
+
+msgid "IPv4 only"
+msgstr "Doar IPv4 "
+
+msgid "IPv6 only"
+msgstr "Doar IPv6 "
+
+msgid "Lease directory"
+msgstr "Director de conexiuni"
+
+msgid "Lease validity time"
+msgstr "Timpul pentru conexiuni valide"
+
+msgid "Log file"
+msgstr "Fisier log"
+
+msgid "Multicast address"
+msgstr "Adresa multicast"
+
+msgid "Operation mode"
+msgstr "Modul de operare"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Familia de protocol"
+
+msgid "Served interfaces"
+msgstr "Interfetele servite"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Specifica serverele de NTP IPv4 si IPv6 anuntate"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Specifica serverele de DNS IPv4 si IPv6 anuntate"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Specifica prefixele IPv4 si IPv6 anuntate in format CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "Serviciul AHCP nu ruleaza"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Serviciul AHCP nu ruleaza cu ID %s."
+
+msgid "There are no active leases."
+msgstr "Nu exista conexiuni active."
+
+msgid "Unique ID file"
+msgstr "ID de fisier unic"
diff --git a/trunk/package/luci/po/ro/asterisk.po b/trunk/package/luci/po/ro/asterisk.po
new file mode 100644
index 00000000..e2713700
--- /dev/null
+++ b/trunk/package/luci/po/ro/asterisk.po
@@ -0,0 +1,54 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 00:35+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Optiunile generale Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Director AGI"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Dezactiveaza cateva avertizari"
+
+#~ msgid "High Priority"
+#~ msgstr "Prioritate inalta"
+
+#~ msgid "Log directory"
+#~ msgstr "Director de loguri"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Incarcarea maxima de cand se refuza apeluri noi"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Dezactiveaza culorile in consola"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Ruleaza sub grupul"
+
+#~ msgid "The User to run as"
+#~ msgstr "Ruleaza sub utilizatorul"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fusul orar"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Permite transferul"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Goleste variabilele globale"
+
+#~ msgid "Connection to use"
+#~ msgstr "Conexiunea pentru folosire"
diff --git a/trunk/package/luci/po/ro/base.po b/trunk/package/luci/po/ro/base.po
new file mode 100644
index 00000000..f5adee95
--- /dev/null
+++ b/trunk/package/luci/po/ro/base.po
@@ -0,0 +1,3124 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-01 23:12+0200\n"
+"Last-Translator: xcentric <webcctvservice@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d fereastra minute, %d interval secunde)"
+
+msgid "(%s available)"
+msgstr "(%s disponibil)"
+
+msgid "(empty)"
+msgstr "(gol)"
+
+msgid "(no interfaces attached)"
+msgstr "(nici o interfata atasata)"
+
+msgid "-- Additional Field --"
+msgstr "-- Camp suplimentar --"
+
+msgid "-- Please choose --"
+msgstr "-- Te rog sa alegi --"
+
+msgid "-- custom --"
+msgstr "-- particularizat --"
+
+msgid "1 Minute Load:"
+msgstr "Incarcarea in ultimul minut"
+
+msgid "15 Minute Load:"
+msgstr "Incarcarea in ultimele 15 minute"
+
+msgid "5 Minute Load:"
+msgstr "Incarcarea in ultimele 5 minute"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr>port de apelare"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> port server"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Domain Name System\">DNS</abbr> serverul va interoga in "
+"vederea procesarii fisierului"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "Adresa <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Poarta Acces "
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "Masca de retea <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Addresa retea (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Poarta Acces"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configurare"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Nume"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Addresa"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> marime pachet"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">Max.</abbr> interogari simultane"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Suport AR"
+
+msgid "ARP retry threshold"
+msgstr "ARP prag reincercare"
+
+msgid "ATM Bridges"
+msgstr "Punti ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM Indentificator Canal Virtual (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM Indentificator Cale Virtual(VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"Puntile ATM expune reteaua intergrata în conexiunile AAL5 ca interfețe "
+"virtuale de rețea Linux care pot fi utilizate în asociere cu DHCP sau PPP "
+"pentru a forma în rețeaua furnizorului."
+
+msgid "ATM device number"
+msgstr "ATM numar echipament"
+
+msgid "Access Concentrator"
+msgstr "Concentrator de Access "
+
+msgid "Access Point"
+msgstr "Punct de Acces"
+
+msgid "Action"
+msgstr "Actiune"
+
+msgid "Actions"
+msgstr "Actiune"
+
+msgid "Activate this network"
+msgstr "Activeaza aceasta retea"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Rute active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Rute active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+msgid "Active Connections"
+msgstr "Conexiuni active"
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Adauga"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Adauga un sufix local numelor servite din fisierele de tip hosts"
+
+msgid "Add new interface..."
+msgstr "Adauga interfata noua.."
+
+msgid "Additional Hosts files"
+msgstr "Fisiere de tip hosts aditionale"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "Address to access local relay bridge"
+msgstr "Adresa de acces punte locala repetor"
+
+msgid "Administration"
+msgstr "Administrare"
+
+msgid "Advanced Settings"
+msgstr "Setari avansate"
+
+msgid "Alert"
+msgstr "Alerta"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Permite autentificarea prin parola a <abbr title=\"Secure Shell\">SSH</abbr> "
+
+msgid "Allow all except listed"
+msgstr "Permite toate cu exceptia celor listate"
+
+msgid "Allow listed only"
+msgstr "Permite doar cele listate"
+
+msgid "Allow localhost"
+msgstr "Permite localhost"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr "Permite statiilor externe sa se conecteze la porturile SSH locale"
+
+msgid "Allow root logins with password"
+msgstr "Permite autentificarea contului root cu parola"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Permite contului <em>root</em> sa se autentifice cu parola"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Permite raspuns upstream in plaja 127.0.0.0/8, e.g. pentru serviciile RBL"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Intotdeauna foloseste canalul de 40MHz chiar daca canalul secundar da rateu. "
+"Folosirea acestei optiuni nu este compatibila cu IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+"Daca lasati aceasta optiune neselectata va fi creata o retea aditionala"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Antena 1"
+
+msgid "Antenna 2"
+msgstr "Antena 2"
+
+msgid "Antenna Configuration"
+msgstr "Configurarea Antenei"
+
+msgid "Any zone"
+msgstr "Orice Zona"
+
+msgid "Apply"
+msgstr "Aplica"
+
+msgid "Applying changes"
+msgstr "Se aplica modificarile"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Inregistreaza interfetele"
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Statiile asociate"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s Controler Fara Fir"
+
+msgid "Authentication"
+msgstr "Autentificare"
+
+msgid "Authoritative"
+msgstr "Autoritare"
+
+msgid "Authorization Required"
+msgstr "Necesita Autorizare"
+
+msgid "Auto Refresh"
+msgstr "Reimprospatare automata"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Disponibil"
+
+msgid "Available packages"
+msgstr "Pachete disponibile"
+
+msgid "Average:"
+msgstr "Medie:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Inapoi"
+
+msgid "Back to Overview"
+msgstr "Inapoi la sumar"
+
+msgid "Back to configuration"
+msgstr "Inapoi la Configurare"
+
+msgid "Back to overview"
+msgstr "Inapoi la vedere generala"
+
+msgid "Back to scan results"
+msgstr "Inapoi la rezultatele scanarii"
+
+msgid "Background Scan"
+msgstr "Scanare in fundal"
+
+msgid "Backup / Flash Firmware"
+msgstr "Salveaza / Scrie Firmware"
+
+msgid "Backup / Restore"
+msgstr "Salveaza / Restaureaza"
+
+msgid "Backup file list"
+msgstr "Salveaza lista fisiere"
+
+msgid "Bad address specified!"
+msgstr "Adresa specificata gresit !"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Bogus NX Domain Override"
+msgstr "Bogus NX Domain Override"
+
+msgid "Bridge"
+msgstr "Punte"
+
+msgid "Bridge interfaces"
+msgstr "Leaga interfetele"
+
+msgid "Bridge unit number"
+msgstr "Numarul unitatii in punte"
+
+msgid "Bring up on boot"
+msgstr "Activeaza la pornire"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s Controller Fara Fir"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 Controller Fara Fir"
+
+msgid "Buffered"
+msgstr "Incarcat"
+
+msgid "Buttons"
+msgstr "Butoane"
+
+msgid "CPU"
+msgstr "Procesor"
+
+msgid "CPU usage (%)"
+msgstr "Utilizarea procesorului (%)"
+
+msgid "Cached"
+msgstr "Asimilat"
+
+msgid "Cancel"
+msgstr "Anuleaza"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Lant"
+
+msgid "Changes"
+msgstr "Modificari"
+
+msgid "Changes applied."
+msgstr "Modificari aplicate."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Schimba parola administratorului pentru accesarea dispozitivului"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check"
+msgstr "Verificare"
+
+msgid "Checksum"
+msgstr "Suma de verificare"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Alege zona paravanului care doresti sa o aloci acestei interfete. Selecteaza "
+"<em>nespecificat</em> pentru a sterge interfata sau golire <em>creaza</em> "
+"camp ce defineste o zona noua asociata interfetei."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr "Colectez datele.."
+
+msgid "Command"
+msgstr "Comanda"
+
+msgid "Common Configuration"
+msgstr "Configurarea obisnuita"
+
+msgid "Compression"
+msgstr "Comprimare"
+
+msgid "Configuration"
+msgstr "Configurare"
+
+msgid "Configuration applied."
+msgstr "Configurarea aplicata."
+
+msgid "Configuration files will be kept."
+msgstr "Fisierele de configurare vor fi pastrate."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr "Confirmare"
+
+msgid "Connect"
+msgstr "Conectare"
+
+msgid "Connected"
+msgstr "Conectat"
+
+msgid "Connection Limit"
+msgstr "Limita de conexiune"
+
+msgid "Connections"
+msgstr "Conexiuni"
+
+msgid "Country"
+msgstr "Tara"
+
+msgid "Country Code"
+msgstr "Codul de tara"
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr ""
+
+msgid "Create Interface"
+msgstr "Creaza interfata"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr "Critic"
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+
+msgid "DHCP Leases"
+msgstr "Conexiuni DHCP"
+
+msgid "DHCP Server"
+msgstr "Server DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP si DNS"
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr "Optiuni DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr "Stare implicita"
+
+msgid "Define a name for this network."
+msgstr "Definiti un nume pentru aceasta retea."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr "Sterge"
+
+msgid "Delete this interface"
+msgstr "Sterge aceasta interfata"
+
+msgid "Delete this network"
+msgstr "Sterge aceasta retea"
+
+msgid "Description"
+msgstr "Descriere"
+
+msgid "Design"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destinatie"
+
+msgid "Device"
+msgstr "Dispozitiv"
+
+msgid "Device Configuration"
+msgstr "Configurarea dispozitivului"
+
+msgid "Diagnostics"
+msgstr "Diagnosticuri"
+
+msgid "Directory"
+msgstr "Director"
+
+msgid "Disable"
+msgstr "Dezactiveaza"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Dezactiveaza <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+"pentru aceasta interfata."
+
+msgid "Disable DNS setup"
+msgstr "Dezactiveaza configuratia DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr ""
+
+msgid "Disabled"
+msgstr "Dezactivat"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr "Optimizarea distantei"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Distanta catre cel mai departat membru din retea in metri."
+
+msgid "Diversity"
+msgstr "Diversitate"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr ""
+
+msgid "Domain required"
+msgstr "Domeniul necesar"
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+
+msgid "Download and install package"
+msgstr "Descarca si instaleaza pachetul"
+
+msgid "Download backup"
+msgstr "Descarca backup"
+
+msgid "Dropbear Instance"
+msgstr "Instanta dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr ""
+
+msgid "Edit"
+msgstr "Editeaza"
+
+msgid "Edit this interface"
+msgstr "Editeaza aceasta interfata"
+
+msgid "Edit this network"
+msgstr "Editeaza aceasta retea"
+
+msgid "Emergency"
+msgstr "Urgenta"
+
+msgid "Enable"
+msgstr "Activeaza"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Activeaza <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr "Activeaza serverul TFTP"
+
+msgid "Enable VLAN functionality"
+msgstr "Activeaza VLAN-urile"
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr "Activeaza/Dezactiveaza"
+
+msgid "Enabled"
+msgstr "Activat"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr "Modul de incapsulare"
+
+msgid "Encryption"
+msgstr "Criptare"
+
+msgid "Erasing..."
+msgstr "Stergere..."
+
+msgid "Error"
+msgstr "Eroare"
+
+msgid "Ethernet Adapter"
+msgstr "Adaptor de retea ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Switch-ul ethernet"
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr "Expira"
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Server de log-uri extern"
+
+msgid "External system log server port"
+msgstr "Portul serverului de log-uri extern"
+
+msgid "Fast Frames"
+msgstr ""
+
+msgid "File"
+msgstr "Fisier"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr "Sistem de fisiere"
+
+msgid "Filter"
+msgstr "Filtreaza"
+
+msgid "Filter private"
+msgstr "Filtreaza privatele"
+
+msgid "Filter useless"
+msgstr "Filtreaza nefolositele"
+
+msgid "Find and join network"
+msgstr "Gaseste si alatura in retea"
+
+msgid "Find package"
+msgstr "Gaseste pachet"
+
+msgid "Finish"
+msgstr "Termina"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr "Setarile firewall-ului"
+
+msgid "Firewall Status"
+msgstr "Status la firewall"
+
+msgid "Firmware Version"
+msgstr "Versiunea de firmware"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Portul sursa pentru intrebarile DNS catre exterior"
+
+msgid "Flags"
+msgstr ""
+
+msgid "Flash Firmware"
+msgstr "Rescrie firmware"
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr "Forteaza"
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr "Forteaza CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+"Forteaza facilitatea DHCP in aceasta retea chiar daca alt server DHCP exista."
+
+msgid "Force TKIP"
+msgstr "Forteaza TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Forteaza TKIP si CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr ""
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr "Liber"
+
+msgid "Free space"
+msgstr "Spatiu liber"
+
+msgid "Frequency Hopping"
+msgstr ""
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr "Doar GPRS"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Gateway ports"
+msgstr "Porturile gateway"
+
+msgid "General Settings"
+msgstr "Setari principale"
+
+msgid "General Setup"
+msgstr "Configurare generala"
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "Confirmarea parolei nu se potriveste cu prima, parola neschimbata !"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr ""
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Aici poti configura aspectele de baza ale dispozitivului cum ar fi numele "
+"sau fusul orar."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Ascunde <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Intrari de tip host"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Numele de host"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr "Nume de host"
+
+msgid "IP address"
+msgstr "Adresa IP"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Firewall IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Statusul IPv4 pe WAN"
+
+msgid "IPv4 address"
+msgstr "Adresa IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 si IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr "Doar IPv4"
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr "Adresa IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Firewall IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Statusul IPv6 pe WAN"
+
+msgid "IPv6 address"
+msgstr "Adresa IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr "Doar IPv6"
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr "Identitate"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr ""
+
+msgid "Ignore resolve file"
+msgstr ""
+
+msgid "Image"
+msgstr "Imagine"
+
+msgid "In"
+msgstr ""
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr "Intrare:"
+
+msgid "Info"
+msgstr "Informatii"
+
+msgid "Initscript"
+msgstr "Script de initializare"
+
+msgid "Initscripts"
+msgstr "Scripturi de initializare"
+
+msgid "Install"
+msgstr "Instalati"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Instalati pachetul %q"
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr "Pachete instalate"
+
+msgid "Interface"
+msgstr "Interfata"
+
+msgid "Interface Configuration"
+msgstr "Configurarea interfetei"
+
+msgid "Interface Overview"
+msgstr "Prezentare interfata"
+
+msgid "Interface is reconnecting..."
+msgstr "Interfata se reconecteaza.."
+
+msgid "Interface is shutting down..."
+msgstr "Interfata se opreste.."
+
+msgid "Interface not present or not connected yet."
+msgstr "Interfata nu e prezenta sau nu este conectata inca."
+
+msgid "Interface reconnected"
+msgstr "Interfata reconectata"
+
+msgid "Interface shut down"
+msgstr "Interfata oprita"
+
+msgid "Interfaces"
+msgstr "Interfete"
+
+msgid "Internal Server Error"
+msgstr "Eroare interna de server"
+
+msgid "Invalid"
+msgstr "Invalid"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Utilizator si/sau parola invalide! Incearcati din nou."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Se pare ca ai incercat sa rescrii o imagine care nu are loc in memoria "
+"flash, verifica fisierul din nou!"
+
+msgid "Java Script required!"
+msgstr "Ai nevoie de Java Script !"
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr "Pastrati setarile"
+
+msgid "Kernel Log"
+msgstr "Log-ul kernelului"
+
+msgid "Kernel Version"
+msgstr "Versiunea de kernel"
+
+msgid "Key"
+msgstr ""
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr "Opreste"
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr "Eticheta"
+
+msgid "Language"
+msgstr "Limba"
+
+msgid "Language and Style"
+msgstr "Limba si stilul interfetei"
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr ""
+
+msgid "Leasetime"
+msgstr ""
+
+msgid "Leasetime remaining"
+msgstr ""
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr "Legenda:"
+
+msgid "Limit"
+msgstr "Limita"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr ""
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr "Incarcarea"
+
+msgid "Load Average"
+msgstr "Incarcarea medie"
+
+msgid "Loading"
+msgstr "Incarcare"
+
+msgid "Local IPv4 address"
+msgstr "Adresa IPv4 locala"
+
+msgid "Local IPv6 address"
+msgstr "Adresa IPv6 locala"
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr "Ora locala"
+
+msgid "Local domain"
+msgstr "Domeniu local"
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr "Server local"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr ""
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr "Autentificare"
+
+msgid "Logout"
+msgstr "Iesire"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr ""
+
+msgid "MAC-Filter"
+msgstr ""
+
+msgid "MAC-List"
+msgstr ""
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr "Rata maxima"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Numarul maxim de intrebari DNS simultane"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr "Memorie"
+
+msgid "Memory usage (%)"
+msgstr "Utilizarea memoriei (%)"
+
+msgid "Metric"
+msgstr "Metrica"
+
+msgid "Minimum Rate"
+msgstr "Rata minima"
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr "Mod"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr ""
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr ""
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr ""
+
+msgid "Mount Points"
+msgstr ""
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr "Rata de multicast"
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr ""
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr "Nume"
+
+msgid "Name of the new interface"
+msgstr "Numele interfetei noi"
+
+msgid "Name of the new network"
+msgstr "Numele interfetei noi"
+
+msgid "Navigation"
+msgstr "Navigare"
+
+msgid "Netmask"
+msgstr "Netmask"
+
+msgid "Network"
+msgstr "Retea"
+
+msgid "Network Utilities"
+msgstr "Utilitare de retea"
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr "Mai departe »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Nici un server DHCP configurat pentru aceasta interfata"
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr "Nici un fisier gasit"
+
+msgid "No information available"
+msgstr "Nici o informatie disponibila"
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr "Nici o retea configurata pe acest dispozitiv"
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr "Nici o parola setata !"
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr "Zgomot"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Zgomot:"
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Not Found"
+msgstr "Nu a fost gasit"
+
+msgid "Not associated"
+msgstr "Nu este asociat."
+
+msgid "Not connected"
+msgstr "Nu este conectat"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Nota: fisierele de configurare vor fi sterse."
+
+msgid "Notice"
+msgstr "Notificare"
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Configuratia-OPKG"
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr "Unul sau mai multe campuri contin valori invalide !"
+
+msgid "One or more required fields have no value!"
+msgstr "Unul sau mai multe campuri nu contin valori !"
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr "Optiunea schimbata"
+
+msgid "Option removed"
+msgstr "Optiunea eliminata"
+
+msgid "Options"
+msgstr "Optiuni"
+
+msgid "Other:"
+msgstr "Altele:"
+
+msgid "Out"
+msgstr "Iesire"
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Prezentare generala"
+
+msgid "Owner"
+msgstr "Proprietar"
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr "Incapsulare PPPoA"
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr "Pachetul libiwinfo este necesar !"
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr "Numele pachetului"
+
+msgid "Packets"
+msgstr "Pachete"
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr "Parola"
+
+msgid "Password authentication"
+msgstr "Autentificarea cu parola"
+
+msgid "Password of Private Key"
+msgstr "Parola cheii private"
+
+msgid "Password successfully changed!"
+msgstr "Parola schimbata cu succes !"
+
+msgid "Path to CA-Certificate"
+msgstr "Calea catre certificatul CA"
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr "Calea catre cheia privata"
+
+msgid "Path to executable which handles the button event"
+msgstr "Calea catre executabilul care se ocupa de evenimentul butonului"
+
+msgid "Peak:"
+msgstr "Maxim:"
+
+msgid "Perform reboot"
+msgstr "Restarteaza"
+
+msgid "Perform reset"
+msgstr "Reseteaza"
+
+msgid "Phy Rate:"
+msgstr "Rata phy:"
+
+msgid "Physical Settings"
+msgstr "Setarile fizice"
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr "Packete."
+
+msgid "Please enter your username and password."
+msgstr "Introdu utilizatorul si parola."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Asteapta: dispozitivul se restarteaza.."
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Port %d"
+msgstr "Port %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr "Stare port:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr ""
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr "Continua"
+
+msgid "Processes"
+msgstr "Procese"
+
+msgid "Prot."
+msgstr ""
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Protocol family"
+msgstr "Familia de protocol"
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr ""
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Calitate"
+
+msgid "RTS/CTS Threshold"
+msgstr ""
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Citeste fisierul <code>/etc/ethers</code> pentru configurarea serverului "
+"<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr "Conexiuni in timp real"
+
+msgid "Realtime Graphs"
+msgstr "Grafice in timp real"
+
+msgid "Realtime Load"
+msgstr "Incarcarea in timp real"
+
+msgid "Realtime Traffic"
+msgstr "Traficul in timp real"
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr "Rebooteaza"
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr "Rebooteaza sistemul de operare al dispozitivului tau"
+
+msgid "Receive"
+msgstr ""
+
+msgid "Receiver Antenna"
+msgstr "Antena receptorului"
+
+msgid "Reconnect this interface"
+msgstr "Reconecteaza aceasta interfata"
+
+msgid "Reconnecting interface"
+msgstr "Interfata se reconecteaza chiar acum"
+
+msgid "References"
+msgstr "Referinte"
+
+msgid "Regulatory Domain"
+msgstr "Domeniu regulatoriu"
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr "Elimina"
+
+msgid "Repeat scan"
+msgstr "Repeta scanarea"
+
+msgid "Replace entry"
+msgstr "Inlocuieste intrarea"
+
+msgid "Replace wireless configuration"
+msgstr "Inlocuieste configuratia wireless"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Reset Counters"
+msgstr "Reseteaza counterii"
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr "Fisierele de rezolvare si hosturi DNS"
+
+msgid "Resolve file"
+msgstr "Fisierul de rezolvare"
+
+msgid "Restart"
+msgstr "Restart"
+
+msgid "Restart Firewall"
+msgstr "Restarteaza firewallul"
+
+msgid "Restore backup"
+msgstr "Reface backup-ul"
+
+msgid "Reveal/hide password"
+msgstr "Arata / ascunde parola"
+
+msgid "Revert"
+msgstr ""
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Parola routerului"
+
+msgid "Routes"
+msgstr "Rute"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+
+msgid "Rule #"
+msgstr "Regula #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr "Acces SSH"
+
+msgid "SSH-Keys"
+msgstr "Cheile SSH"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Salveaza"
+
+msgid "Save & Apply"
+msgstr "Salveaza si aplica"
+
+msgid "Save &#38; Apply"
+msgstr "Salveaza &#38; Aplica"
+
+msgid "Scan"
+msgstr "Scan"
+
+msgid "Scheduled Tasks"
+msgstr "Operatiuni programate"
+
+msgid "Section added"
+msgstr "Sectiune adaugata"
+
+msgid "Section removed"
+msgstr "Sectiune eliminata"
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr ""
+
+msgid "Separate WDS"
+msgstr ""
+
+msgid "Server Settings"
+msgstr "Setarile serverului"
+
+msgid "Service Name"
+msgstr "Nume serviciu"
+
+msgid "Service Type"
+msgstr "Tip de serviciu"
+
+msgid "Services"
+msgstr "Servicii"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurare sincronizare timp"
+
+msgid "Setup DHCP Server"
+msgstr "Seteaza serverul DHCP"
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr "Opreste aceasta interfata"
+
+msgid "Shutdown this network"
+msgstr "Opreste aceasta retea"
+
+msgid "Signal"
+msgstr "Semnal"
+
+msgid "Signal:"
+msgstr "Semnal:"
+
+msgid "Size"
+msgstr "Marime"
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr ""
+
+msgid "Skip to navigation"
+msgstr ""
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr "Software"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr "Sursa"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr "Pornire"
+
+msgid "Static IPv4 Routes"
+msgstr "Rute statice IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Rute statice IPv6"
+
+msgid "Static Leases"
+msgstr ""
+
+msgid "Static Routes"
+msgstr "Rute statice"
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Stop"
+msgstr "Stop"
+
+msgid "Strict order"
+msgstr ""
+
+msgid "Submit"
+msgstr "Trimite"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr ""
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr "Sistem"
+
+msgid "System Log"
+msgstr "Log de sistem"
+
+msgid "System Properties"
+msgstr "Proprietati sistem"
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr "Setarile TFTP"
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr "Tabel"
+
+msgid "Target"
+msgstr "Tinta"
+
+msgid "Terminate"
+msgstr "Termina"
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr ""
+
+msgid "The following rules are currently active on this system."
+msgstr ""
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr "Nu exista modificari in asteptare de aplicat !"
+
+msgid "There are no pending changes to revert!"
+msgstr "Nu exista modificari in asteptare de anulat !"
+
+msgid "There are no pending changes!"
+msgstr "Nu exista modificari in asteptare !"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Nu exista o parola pe acest router. Configureaza o parola la contul root "
+"pentru a proteja interfata web si porni SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr "Fusul orar"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr "Total disponibil"
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr "Trafic"
+
+msgid "Transfer"
+msgstr "Transfer"
+
+msgid "Transmission Rate"
+msgstr "Rata de transmitere"
+
+msgid "Transmit"
+msgstr ""
+
+msgid "Transmit Power"
+msgstr "Puterea de transmitere"
+
+msgid "Transmitter Antenna"
+msgstr "Antena de transmitere"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr "Interfata de tunel"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Mod turbo"
+
+msgid "Tx-Power"
+msgstr "Puterea TX"
+
+msgid "Type"
+msgstr "Tip"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Doar UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr "Dispozitiv USB"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr "Necunoscut"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Eroare necunoscuta, parola neschimbata !"
+
+msgid "Unmanaged"
+msgstr "Neadministrate"
+
+msgid "Unsaved Changes"
+msgstr "Modificari nesalvate"
+
+msgid "Unsupported protocol type."
+msgstr "Tipul de protocol neacceptat."
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr "Fisier incarcat"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Foloseste <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Foloseste codurile de tara ISO/IEC 3166 alpha2."
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr "Foloseste ca sistem de fisiere primar"
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr "Folosit"
+
+msgid "Used Key Slot"
+msgstr "Slot de cheie folosit"
+
+msgid "Username"
+msgstr "Utilizator"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Interfata VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANuri pe %q"
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr "Versiune"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Sistem deschis WEP"
+
+msgid "WEP Shared Key"
+msgstr "Sistem de cheie impartasita WEP"
+
+msgid "WEP passphrase"
+msgstr "Parola WEP"
+
+msgid "WMM Mode"
+msgstr "Mod WMM"
+
+msgid "WPA passphrase"
+msgstr "Parola WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"Criptarea WPA necesita wpa_supplicant (pentru modul client) sau hostapd "
+"(pentru modul AP sau ad-hoc) instalate."
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr "Avertizare"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "Atentie: exista modificari nesalvate care vor fi pierdute la restart !"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless Adapter"
+msgstr "Adaptorul wireless"
+
+msgid "Wireless Network"
+msgstr "Retea wireless"
+
+msgid "Wireless Overview"
+msgstr "Sumarul wireless"
+
+msgid "Wireless Security"
+msgstr "Securitate wireless"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Wireless-ul este dezactivat sau ne-asociat"
+
+msgid "Wireless is restarting..."
+msgstr "Wireless-ul se restarteaza.."
+
+msgid "Wireless network is disabled"
+msgstr "Reteaua wireless este dezactivata"
+
+msgid "Wireless network is enabled"
+msgstr "Reteaua wireless este activata"
+
+msgid "Wireless restarted"
+msgstr "Wireless-ul restartat"
+
+msgid "Wireless shut down"
+msgstr "Wireless-ul oprit"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Scrie cererile DNS primite in syslog"
+
+msgid "XR Support"
+msgstr "Suport XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr "oricare"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr ""
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr "dezactiveaza"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "expirat"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr "ajutor"
+
+msgid "hidden"
+msgstr "ascuns"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "daca tinta este o retea"
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+
+msgid "no"
+msgstr "nu"
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "rutat"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "etichetat"
+
+msgid "unknown"
+msgstr "necunoscut"
+
+msgid "unlimited"
+msgstr "nelimitat"
+
+msgid "unspecified"
+msgstr "nespecificat"
+
+msgid "unspecified -or- create:"
+msgstr ""
+
+msgid "untagged"
+msgstr "neetichetat"
+
+msgid "yes"
+msgstr "da"
+
+msgid "« Back"
+msgstr "« Inapoi"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz 2 canale de mai jos"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz 2 canale de mai sus"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Accepta anunturile routerului"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Anunta IPv6 in retea"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "ID-ul retelei anuntate"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Plaja permisa este de la 1 la 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Capabilitati HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Mod HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Modelul routerului"
+
+#~ msgid "Router Name"
+#~ msgstr "Numele routerului"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Asteptam dupa router.."
+
+#~ msgid "Active Leases"
+#~ msgstr "Conexiuni dhcp active"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Configurare / Aplica"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Configurare / Schimbari"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Configurare / Anuleaza schimbarile"
+
+#~ msgid "Create Network"
+#~ msgstr "Creaza retea"
+
+#~ msgid "Networks"
+#~ msgstr "Retele"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Retele wireless in apropiere"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "Adresa <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "Aliasuri IP"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Setarea IPv6"
+
+#~ msgid "Detected Files"
+#~ msgstr "Fisiere detectate"
+
+#~ msgid "Detected files"
+#~ msgstr "Fisiere detectate"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Fisiere de pastrat cand se rescrie firmware-ul"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Aici poti configura setarile si functionalitatea interfetei web <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "<abbr title=\"User Interface\">Interfata</abbr> web"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Optiuni aditionale pentru pppd"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Deconectare automata"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Configureaza serverul local de DNS sa foloseasca serverele de domeniu "
+#~ "anuntate la conexiunea PPP"
+
+#~ msgid "Connect script"
+#~ msgstr "Script de conectare"
+
+#~ msgid "Default"
+#~ msgstr "Implicit"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Script pentru deconectare"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Editeaza lista de pachete si destinatiile de instalare"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "Activeaza 4 mii de VLAN-uri"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Activeaza IPv6 pe legatura PPP"
+
+#~ msgid "Firmware image"
+#~ msgstr "Imaginea de firmware"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Aici poti face backup si restore la configuratia routerului si daca e "
+#~ "posibil chiar resetarea routerului la modul implicit."
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Pastreaza fisierele de configurare"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid "Kernel"
+#~ msgstr "Kernel"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "PPPD va inlocui ruta default cu cea oferita de interfata PPP dupa "
+#~ "conectarea cu succes"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "PPPD va rula acest script dupa stabilirea conexiunii PPP"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "PPPD va rula acest script inainte sa inchida conexiunea PPP"
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr "Numarul de teste de conexiune esuate pentru a reconecta"
+
+#~ msgid "Override Gateway"
+#~ msgstr "Suprascrie gateway"
+
+#~ msgid "PIN code"
+#~ msgstr "Codul PIN"
+
+#~ msgid "PPP Settings"
+#~ msgstr "Setari PPP"
+
+#~ msgid "Package lists"
+#~ msgstr "Lista de pachete"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Continua anuland toate modificarile facute si resetand la default?"
+
+#~ msgid "Processor"
+#~ msgstr "Procesor"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Portul radiusului"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Serverul radius"
+
+#~ msgid "Replace default route"
+#~ msgstr "Inlocuieste ruta default"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Reseteaza routerul la default"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr ""
+#~ "Numarul de secunde de asteptat ca modemul sa devine pregatit inainte de "
+#~ "conectare"
+
+#~ msgid "Send Router Solicitiations"
+#~ msgstr "Trimite solicitari de Router"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "Adresa IPv4 a serverului"
+
+#~ msgid "Service type"
+#~ msgstr "Tipul de serviciu"
+
+#~ msgid "Settings"
+#~ msgstr "Setari"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "Setarile de tunel"
+
+#~ msgid "Update package lists"
+#~ msgstr "Updateaza lista de pachete"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Uploadeaza o imagine libreCMC pentru rescrierea firmware-ului."
+
+#~ msgid "Upload image"
+#~ msgstr "Uploadeaza firmware"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Foloseste DNS-urile primite pe conexiune"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid "back"
+#~ msgstr "inapoi"
+
+#~ msgid "static"
+#~ msgstr "static"
diff --git a/trunk/package/luci/po/ro/commands.po b/trunk/package/luci/po/ro/commands.po
new file mode 100644
index 00000000..05c4574b
--- /dev/null
+++ b/trunk/package/luci/po/ro/commands.po
@@ -0,0 +1,99 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 18:45+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "O scurta descriere textuala a comenzii configurate"
+
+msgid "Access command with"
+msgstr "Acces la comanda cu"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Permite executarea comenzii si descarcarea rezultatului fara o autentificare "
+"anterioara"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "Permite utilizatorului sa adauge parametrii in linia de comanda"
+
+msgid "Arguments:"
+msgstr "Parametrii:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Datele binare nu sunt afisate, descarcale in schimb"
+
+msgid "Code:"
+msgstr "Cod:"
+
+msgid "Collecting data..."
+msgstr "Colectare date..."
+
+msgid "Command"
+msgstr "Comandă"
+
+msgid "Command failed"
+msgstr "Comandă eşuată"
+
+msgid "Command line to execute"
+msgstr "Linie de comanda pentru a executa"
+
+msgid "Command successful"
+msgstr "Comanda reusita"
+
+msgid "Command:"
+msgstr "Comanda:"
+
+msgid "Configure"
+msgstr "Configureaza"
+
+msgid "Custom Commands"
+msgstr "Comenzi particulare"
+
+msgid "Custom arguments"
+msgstr "Argumenta particulare"
+
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgid "Description"
+msgstr "Descriere"
+
+msgid "Download"
+msgstr "Descarca"
+
+msgid "Failed to execute command!"
+msgstr "S-a esuat executarea comenzii!!"
+
+msgid "Link"
+msgstr "Link"
+
+msgid "Loading"
+msgstr "Se incarca"
+
+msgid "Public access"
+msgstr "Access public"
+
+msgid "Run"
+msgstr "Ruleaza"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Aceasta pagina permite configurarea de comenzi personale ce pot fi usor "
+"apelate din interfata grafica"
+
+msgid "Waiting for command to complete..."
+msgstr "Astept finalizarea comenzii..."
diff --git a/trunk/package/luci/po/ro/coovachilli.po b/trunk/package/luci/po/ro/coovachilli.po
new file mode 100644
index 00000000..8f458bb8
--- /dev/null
+++ b/trunk/package/luci/po/ro/coovachilli.po
@@ -0,0 +1,27 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 19:15+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Configurare reţea"
+
+msgid "RADIUS configuration"
+msgstr "Configurare RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Autentificare UAM şi MAC"
diff --git a/trunk/package/luci/po/ro/ddns.po b/trunk/package/luci/po/ro/ddns.po
new file mode 100644
index 00000000..535b21ed
--- /dev/null
+++ b/trunk/package/luci/po/ro/ddns.po
@@ -0,0 +1,92 @@
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-09-25 19:11+0200\n"
+"Last-Translator: Mihai <WyRwSyK@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Verifica pentru adresa IP schimbata la fiecare"
+
+msgid "Check-time unit"
+msgstr "Unitatea de verificare timp"
+
+msgid "Custom update-URL"
+msgstr "Adresa particularizata de actualizare"
+
+msgid "Dynamic DNS"
+msgstr "DNS dinamic"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"DNS-ul dinamic permite accesarea routerului printr-un nume dns fix legat de "
+"adresa dinamic IP."
+
+msgid "Enable"
+msgstr "Activeaza"
+
+msgid "Force update every"
+msgstr "Forteaza actualizarea la fiecare"
+
+msgid "Force-time unit"
+msgstr "Unitatea de timp la fortare actualizare"
+
+msgid "Hostname"
+msgstr "Nume host"
+
+msgid "Interface"
+msgstr "Interfata"
+
+msgid "Network"
+msgstr "Retea"
+
+msgid "Password"
+msgstr "Parola"
+
+msgid "Service"
+msgstr "Serviciu"
+
+msgid "Source of IP address"
+msgstr "Sursa adresei IP"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Utilizator"
+
+msgid "custom"
+msgstr "particularizat"
+
+# Hours
+msgid "h"
+msgstr "ore"
+
+msgid "interface"
+msgstr "interfata"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "minut(e)"
+
+msgid "network"
+msgstr "retea"
+
+#~ msgid "Event interface"
+#~ msgstr "Interfata eveniment"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "Pe care interfata trebuie sa porneasca scriptul ddns"
diff --git a/trunk/package/luci/po/ro/diag_core.po b/trunk/package/luci/po/ro/diag_core.po
new file mode 100644
index 00000000..604841eb
--- /dev/null
+++ b/trunk/package/luci/po/ro/diag_core.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-09 14:24+0200\n"
+"Last-Translator: lex404 <alex.qwq@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Configurează diagnozele"
+
+# diagnostic/ diagnostice; suna oricum prea medical. Tehnic se foloseste diagnoza, din cate stiu.
+msgid "Diagnostics"
+msgstr "Diagnoze"
+
+# .
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Diagnozele disponibile sub acest meniu depind de ce module aveți instalate "
+"pe device-ul dumneavoastră."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Intrările din acest meniu permit utilizarea testelor de diagnoză în sistem "
+"pentru a vă ajuta la rezolvarea problemelor."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Cu acest meniu poți configura diagnoza în rețea, cum ar fi scanarea unor "
+"dispozitive din rețea sau teste ping."
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d_diag"
diff --git a/trunk/package/luci/po/ro/diag_devinfo.po b/trunk/package/luci/po/ro/diag_devinfo.po
new file mode 100644
index 00000000..eefbd5e1
--- /dev/null
+++ b/trunk/package/luci/po/ro/diag_devinfo.po
@@ -0,0 +1,210 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-09 14:27+0200\n"
+"Last-Translator: lex404 <alex.qwq@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "Acțiuni"
+
+msgid "Add"
+msgstr "Adauga"
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr "Configureaza scanarea telefonului"
+
+msgid "Configure"
+msgstr "Configureaza"
+
+msgid "Configure Scans"
+msgstr "Configurează scanări"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "Sterge"
+
+msgid "Device Scan Config"
+msgstr "Configureaza scanarea dispozitivului"
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr "Dispozitive descoperite pentru"
+
+msgid "Devices on Network"
+msgstr "Dispozitive in retea"
+
+msgid "Edit"
+msgstr "Editeaza"
+
+msgid "Enable"
+msgstr "Activeaza"
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Adresa IP"
+
+msgid "Interface"
+msgstr "Interfata"
+
+msgid "Invalid"
+msgstr "Invalid"
+
+msgid "Link to Device"
+msgstr "Legatura spre dispozitiv"
+
+msgid "MAC Address"
+msgstr "Adresa MAC"
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Milisecunde de asteptare intre cereri (100 implicit)"
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr "Nume"
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr "Nici un device SIP"
+
+msgid "No devices detected"
+msgstr "Nici un dispozitiv detectat"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Numarul de trimiteri cereri (1 implicit)"
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr "Informatii despre telefon"
+
+msgid "Phone Scan"
+msgstr "Scanare telefon"
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr "Telefoane"
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr "Numarul de repetitii"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr "Informatii despre dispozitivul SIP"
+
+msgid "SIP Device Scan"
+msgstr "Scanare dispozitiv SIP"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Configurarea scanarii dispozitivului SIP"
+
+msgid "SIP Devices on Network"
+msgstr "Dispozitive SIP in retea"
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr "Pauza dintre cereri"
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Timpul de asteptare pentru raspunsuri in secunde (10 implicit)"
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr "verifica alte retele"
diff --git a/trunk/package/luci/po/ro/ffwizard.po b/trunk/package/luci/po/ro/ffwizard.po
new file mode 100644
index 00000000..8becd022
--- /dev/null
+++ b/trunk/package/luci/po/ro/ffwizard.po
@@ -0,0 +1,165 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-29 19:18+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr "Configurare reţea"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP va aloca automat adrese ip la clienti"
+
+msgid "DNS Server"
+msgstr "Server DNS"
+
+msgid "Enable DHCP"
+msgstr "Activeaza DHCP"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr "Adresa IP"
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr "Limiteaza viteza de download"
+
+msgid "Limit upload bandwidth"
+msgstr "Limiteaza viteza de upload"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr "Parola"
+
+msgid "Password confirmation"
+msgstr "Confirmare parolă"
+
+msgid "Password successfully changed"
+msgstr "Parolă schimbată cu succes"
+
+msgid "Protect LAN"
+msgstr "Protejeaza reteaua locala LAN"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Bifeaza aici pentru a configura interfetele de retea."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Selecteaza aici pentru a permite altora sa-ti foloseasca legatura ta de "
+"Internet."
+
+msgid "Share your internet connection"
+msgstr "Partajeaza cu altii conexiunea ta de Internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr "Eroare necunoscută"
+
+msgid "Username"
+msgstr "Utilizator"
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr "Configureaza aceasta interfata"
+
+msgid "recommended"
+msgstr "recomandat"
+
+msgid "Basic settings"
+msgstr "Setari de baza"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Setările de bază sunt incomplete. Mergeţi la"
+
+msgid "Error"
+msgstr "Eroare"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/ro/firewall.po b/trunk/package/luci/po/ro/firewall.po
new file mode 100644
index 00000000..391b949d
--- /dev/null
+++ b/trunk/package/luci/po/ro/firewall.po
@@ -0,0 +1,503 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-29 19:33+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s în %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s cu %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s în %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Intrare fără nume)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Regulă fără nume)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT fără nume)"
+
+msgid "-- Please choose --"
+msgstr "-- Alege --"
+
+msgid "-- custom --"
+msgstr "-- personalizat --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr "Acţiune"
+
+msgid "Add"
+msgstr "Adaugă"
+
+msgid "Add and edit..."
+msgstr "Adaugă şi editează..."
+
+msgid "Advanced Settings"
+msgstr "Setări avansate"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Permite trecerea din <em>zonele sursa</em>."
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Permite trecerea catre <em>zonele sursa</em>."
+
+msgid "Any"
+msgstr "Oricare"
+
+msgid "Covered networks"
+msgstr "Retele acoperite"
+
+msgid "Custom Rules"
+msgstr "Reguli suplimentare"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr "Destinaţie adresă IP"
+
+msgid "Destination address"
+msgstr "Destinaţie adresă"
+
+msgid "Destination port"
+msgstr "Portul destinatie"
+
+msgid "Destination zone"
+msgstr "Zona destinatie"
+
+msgid "Do not rewrite"
+msgstr "Nu rescrie"
+
+msgid "Drop invalid packets"
+msgstr "Descarcă pachetele invalide"
+
+msgid "Enable"
+msgstr "Activează"
+
+msgid "Enable NAT Loopback"
+msgstr "Activează loopback NAT"
+
+msgid "Enable SYN-flood protection"
+msgstr "Activează protecţia SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr "Activeaza log in aceasta zona"
+
+msgid "External IP address"
+msgstr "Adresă IP externă"
+
+msgid "External port"
+msgstr "Port extern"
+
+msgid "External zone"
+msgstr "Zonă externă"
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr "Firewall - Reguli particularizate"
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr "Setari zona la firewall"
+
+msgid "Force connection tracking"
+msgstr "Forteaza urmarirea conexiunilor"
+
+msgid "Forward"
+msgstr "Forward"
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Setari generale"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 şi IPv6"
+
+msgid "IPv4 only"
+msgstr "doar IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "doar IPv6"
+
+msgid "Input"
+msgstr "Intrare"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Forwardare intre-zone"
+
+msgid "Internal IP address"
+msgstr "Adresa IP interna"
+
+msgid "Internal port"
+msgstr "Port intern"
+
+msgid "Internal zone"
+msgstr "Zonă internă"
+
+msgid "Limit log messages"
+msgstr "Limitează mesaje în log"
+
+msgid "MSS clamping"
+msgstr "Ajustare MSS"
+
+msgid "Masquerading"
+msgstr "Translatare"
+
+msgid "Match"
+msgstr "Potrivire"
+
+msgid "Match ICMP type"
+msgstr "Potriveste pe tipul de ICMP"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr "Nume"
+
+msgid "New SNAT rule"
+msgstr "Regulă nouă SNAT"
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr "Altele..."
+
+msgid "Output"
+msgstr "Ieşire"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr "Sursă adresă IP"
+
+msgid "Source MAC address"
+msgstr "Sursă adresă MAC"
+
+msgid "Source NAT"
+msgstr "Sursă NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr "Adresa sursa"
+
+msgid "Source port"
+msgstr "Port sursa"
+
+msgid "Source zone"
+msgstr "Zona sursa"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr "Zona %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zone"
+
+msgid "accept"
+msgstr "accept"
+
+msgid "any"
+msgstr "oricare"
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Destinatie"
+
+#~ msgid "Family"
+#~ msgstr "Familia proto"
+
+#~ msgid "Source"
+#~ msgstr "Sursa"
+
+#~ msgid "Via"
+#~ msgstr "Prin"
+
+#~ msgid "(optional)"
+#~ msgstr "(optional)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "Adresa destinatie intentionata"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Port intern (optional)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Optiuni avansate"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Reguli avansate"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Regulile avansate iti permit particularizarea firewall-ului dupa nevoi. "
+#~ "Numai conexiunile noi vor fi luate in calcul. Pachetele care apartin unor "
+#~ "conexiuni deja stabilite trec deja prin firewall."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Reguli suplimentare (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Dispozitiv"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Pentru DNAT, leaga traficul venit redirectat catre destinatia IP. Pentru "
+#~ "SNAT rescrie adresa sursa ca fiind adresa IP."
+
+#~ msgid "Overview"
+#~ msgstr "Sumar"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Forwardare catre port"
+
+#~ msgid "Redirection type"
+#~ msgstr "Tipul de redirectare"
+
+#~ msgid "Redirections"
+#~ msgstr "Redirectari"
+
+#~ msgid "Rules"
+#~ msgstr "Reguli"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirectarea traficului"
diff --git a/trunk/package/luci/po/ro/freifunk-policyrouting.po b/trunk/package/luci/po/ro/freifunk-policyrouting.po
new file mode 100644
index 00000000..3386101b
--- /dev/null
+++ b/trunk/package/luci/po/ro/freifunk-policyrouting.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 19:28+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr "Zone de firewall"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/ro/freifunk.po b/trunk/package/luci/po/ro/freifunk.po
new file mode 100644
index 00000000..408abd8d
--- /dev/null
+++ b/trunk/package/luci/po/ro/freifunk.po
@@ -0,0 +1,395 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-29 19:53+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr "Setări de bază"
+
+msgid "Basic settings"
+msgstr "Setări de bază"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Setările de bază sunt incomplete. Mergi la"
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr "Comunitate"
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr "Coordonate"
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr "Activează IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "Eroare"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr "Du-te la"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfaţă"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr "Păstrează configuraţia"
+
+msgid "Latitude"
+msgstr "Latitudine"
+
+msgid "Legend"
+msgstr "Legendă"
+
+msgid "Load"
+msgstr "Încarcă"
+
+msgid "Local Time"
+msgstr "Oră locală"
+
+msgid "Location"
+msgstr "Locaţie"
+
+msgid "Longitude"
+msgstr "Longitudine"
+
+msgid "Map"
+msgstr "Hartă"
+
+msgid "Map Error"
+msgstr "Eroare hartă"
+
+msgid "Memory"
+msgstr "Memorie"
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr "Mod"
+
+msgid "Network"
+msgstr "Reţea"
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr "Poreclă"
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr "Portocaliu"
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr "Putere"
+
+msgid "Processor"
+msgstr "Procesor"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr "Nume real"
+
+msgid "Red"
+msgstr "Roşu"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr "Arată pe hartă"
+
+msgid "Signal"
+msgstr "Semnal"
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr "Statistici"
+
+msgid "Status"
+msgstr "Stare"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr "Firmware-ul instalat este cea mai recentă versiune."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr "Galben"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr "şi completaţi toate câmpurile"
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr "ex."
+
+msgid "free"
+msgstr "liber"
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr "folosit"
+
+msgid "wireless settings"
+msgstr "setări wireless"
diff --git a/trunk/package/luci/po/ro/hd_idle.po b/trunk/package/luci/po/ro/hd_idle.po
new file mode 100644
index 00000000..d619f0a9
--- /dev/null
+++ b/trunk/package/luci/po/ro/hd_idle.po
@@ -0,0 +1,53 @@
+# Generated from applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2013-09-25 19:12+0200\n"
+"Last-Translator: Mihai <WyRwSyK@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disc"
+
+msgid "Enable"
+msgstr "Activeaza"
+
+msgid "Enable debug"
+msgstr "Activeaza informatii suplimentare de tip \"debug\""
+
+msgid "Idle-time"
+msgstr "Timp de inactivitate"
+
+msgid "Idle-time unit"
+msgstr "Unitatea de timp pentru masurarea inactivitatii"
+
+msgid "Settings"
+msgstr "Setari"
+
+# Hours
+msgid "h"
+msgstr "ore"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle este un utilitar pentru a oprit din rotatie hard disc-urile externe "
+"dupa o anumita perioada de inactivitate."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "minute"
diff --git a/trunk/package/luci/po/ro/meshwizard.po b/trunk/package/luci/po/ro/meshwizard.po
new file mode 100644
index 00000000..9f1c4665
--- /dev/null
+++ b/trunk/package/luci/po/ro/meshwizard.po
@@ -0,0 +1,126 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-29 19:55+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Bifeaza aici sa-ti protejezi reteaua locala LAN de alte noduri sau clienti"
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr "Configureaza aceasta interfata"
+
+msgid "DHCP IP range"
+msgstr "Plaja de adrese IP DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP va aloca automat adrese IP la clienti"
+
+msgid "Enable DHCP"
+msgstr "Activeaza DHCP"
+
+msgid "Enable RA"
+msgstr "Activează RA"
+
+msgid "Enabled"
+msgstr "Activat"
+
+msgid "General Settings"
+msgstr "Setări generale"
+
+msgid "IPv6 Settings"
+msgstr "Setări IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfete"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr "Protejeaza reteaua locala LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Selecteaza aici ca sa permiti si altora sa-ti foloseasca si ei conexiunea ta "
+"de Internet."
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr "Partajeaza cu altii conexiunea ta de Internet"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr "recomandat"
diff --git a/trunk/package/luci/po/ro/minidlna.po b/trunk/package/luci/po/ro/minidlna.po
new file mode 100644
index 00000000..cba5fe6a
--- /dev/null
+++ b/trunk/package/luci/po/ro/minidlna.po
@@ -0,0 +1,168 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-09 13:35+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Setări avansate"
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr "Răsfoire director"
+
+msgid "Collecting data..."
+msgstr "Colectare date..."
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr "Activare TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Activare inotify:"
+
+msgid "Enable:"
+msgstr "Activare:"
+
+msgid "Friendly name:"
+msgstr "Nume prieten:"
+
+msgid "General Settings"
+msgstr "Setări generale"
+
+msgid "Interfaces:"
+msgstr "Interfeţe"
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr "Directoare media"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr "Muzică"
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr "Notificare interval în secunde."
+
+msgid "Notify interval:"
+msgstr "Notificare interval:"
+
+msgid "Pictures"
+msgstr "Fotografii"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port pentru HTTP (descrieri, SOAP, transfer media) trafic."
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "Presentation URL:"
+msgstr "URL de prezentare:"
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr "Video"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "Stare miniDLNA"
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/mmc_over_gpio.po b/trunk/package/luci/po/ro/mmc_over_gpio.po
new file mode 100644
index 00000000..e465f0a0
--- /dev/null
+++ b/trunk/package/luci/po/ro/mmc_over_gpio.po
@@ -0,0 +1,42 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 19:22+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin"
+
+msgid "CS_pin"
+msgstr "CS_pin"
+
+msgid "DI_pin"
+msgstr "DI_pin"
+
+msgid "DO_pin"
+msgstr "DO_pin"
+
+msgid "Enable"
+msgstr "Activare"
+
+msgid "MMC/SD driver configuration"
+msgstr "Configurare driver MMC/SD"
+
+msgid "Mode"
+msgstr "Mod"
+
+msgid "Name"
+msgstr "Nume"
+
+msgid "Settings"
+msgstr "Setări"
diff --git a/trunk/package/luci/po/ro/multiwan.po b/trunk/package/luci/po/ro/multiwan.po
new file mode 100644
index 00000000..cd519445
--- /dev/null
+++ b/trunk/package/luci/po/ro/multiwan.po
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-09 13:26+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr "Colectare date..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr "Server(e) DNS"
+
+msgid "Default Route"
+msgstr "Ruta default"
+
+msgid "Destination Address"
+msgstr "Adresă destinaţie"
+
+msgid "Disable"
+msgstr "Dezactivează"
+
+msgid "Enable"
+msgstr "Activează"
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Porturi"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Recovering"
+msgstr "Recuperare"
+
+msgid "Source Address"
+msgstr "Adresa sursei"
+
+msgid "Unknown"
+msgstr "Necunoscut"
+
+msgid "WAN Interfaces"
+msgstr "Interfeţe WAN"
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr "toate"
diff --git a/trunk/package/luci/po/ro/ntpc.po b/trunk/package/luci/po/ro/ntpc.po
new file mode 100644
index 00000000..893419f2
--- /dev/null
+++ b/trunk/package/luci/po/ro/ntpc.po
@@ -0,0 +1,56 @@
+# Generated from applications/luci-ntpc/luasrc/model/cbi/ntpc/*.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-12-01 16:08+0200\n"
+"Last-Translator: cgherman <cgherman@mandrivausers.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Ajustarea ceasului"
+
+msgid "Count of time measurements"
+msgstr "Masuratori de timp"
+
+msgid "Current system time"
+msgstr "Timpul curent de sistem"
+
+msgid "General"
+msgstr "General"
+
+msgid "Hostname"
+msgstr "Numele de host"
+
+msgid "Offset frequency"
+msgstr "Frecventa de offset"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Sincronizeaza timpul sistemului"
+
+msgid "Time Server"
+msgstr "Server de timp"
+
+msgid "Time Servers"
+msgstr "Serverele de timp"
+
+msgid "Time Synchronisation"
+msgstr "Sincronizarea de timp"
+
+msgid "Update interval (in seconds)"
+msgstr "Intervalul de actualizare (in secunde)"
+
+msgid "empty = infinite"
+msgstr "gol = infinit"
diff --git a/trunk/package/luci/po/ro/olsr.po b/trunk/package/luci/po/ro/olsr.po
new file mode 100644
index 00000000..257fab37
--- /dev/null
+++ b/trunk/package/luci/po/ro/olsr.po
@@ -0,0 +1,691 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 19:40+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr "Setări avansate"
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configuraţie"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr "Activare"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr "Activează această interfaţă"
+
+msgid "Enabled"
+msgstr "Activat"
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr "Setări generale"
+
+msgid "General settings"
+msgstr "Setări generale"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr "Verde"
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr "Ascunde IPv4"
+
+msgid "Hide IPv6"
+msgstr "Ascunde IPv6"
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Nume domeniu"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr "Adrese IP"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfaţă"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfeţe"
+
+msgid "Interfaces Defaults"
+msgstr "Interfeţe implicite"
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr "Algoritm LQ"
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr "Nivel LQ"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr "Legendă"
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr "Vecini"
+
+msgid "Neighbour IP"
+msgstr "IP vecin"
+
+msgid "Neighbours"
+msgstr "Vecini"
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr "Pluginuri"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr "Arată IPv4"
+
+msgid "Show IPv6"
+msgstr "Arată IPv6"
+
+msgid "Signal Noise Ratio in dB"
+msgstr "Raport zgomot semnal în dB"
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr "Stare"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Versiune"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr "Greutate"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr "Galben"
+
+msgid "no"
+msgstr "nu"
+
+msgid "yes"
+msgstr "da"
diff --git a/trunk/package/luci/po/ro/openvpn.po b/trunk/package/luci/po/ro/openvpn.po
new file mode 100644
index 00000000..9c3be89a
--- /dev/null
+++ b/trunk/package/luci/po/ro/openvpn.po
@@ -0,0 +1,548 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/p2pblock.po b/trunk/package/luci/po/ro/p2pblock.po
new file mode 100644
index 00000000..2f7d74e7
--- /dev/null
+++ b/trunk/package/luci/po/ro/p2pblock.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 17:09+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Block Time"
+msgstr "Durata de blocare"
+
+msgid "Enable P2P-Block"
+msgstr "Activeaza blocarea P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Protocoale Layer7"
+
+msgid "P2P-Block"
+msgstr "Blocare P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"Blocarea P2P este un mecanism de blocare a diferitelor protocoale pentru "
+"clienti necunoscuti."
+
+msgid "Portrange"
+msgstr "Gama de porturi"
+
+msgid "Whitelisted IPs"
+msgstr "Adrese IP de incredere"
+
+msgid "seconds"
+msgstr "secunde"
diff --git a/trunk/package/luci/po/ro/p910nd.po b/trunk/package/luci/po/ro/p910nd.po
new file mode 100644
index 00000000..7cad5c06
--- /dev/null
+++ b/trunk/package/luci/po/ro/p910nd.po
@@ -0,0 +1,47 @@
+#  p910nd.pot
+#  generated from ./applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-29 20:02+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr ""
+
+msgid "Device"
+msgstr "Dispozitiv"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfaţă"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Setări"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr "activează"
+
+msgid "p910nd - Printer server"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/pbx-voicemail.po b/trunk/package/luci/po/ro/pbx-voicemail.po
new file mode 100644
index 00000000..42b66f62
--- /dev/null
+++ b/trunk/package/luci/po/ro/pbx-voicemail.po
@@ -0,0 +1,89 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/ro/pbx.po b/trunk/package/luci/po/ro/pbx.po
new file mode 100644
index 00000000..49e8dacc
--- /dev/null
+++ b/trunk/package/luci/po/ro/pbx.po
@@ -0,0 +1,488 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 18:50+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Setări avansate"
+
+msgid "Available"
+msgstr "Disponibil"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr "Nu deranjaţi"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "Domeniu/Adresă IP/Domeniu dinamic"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Activat"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Nume complet"
+
+msgid "General Settings"
+msgstr "Setări generale"
+
+msgid "Google Accounts"
+msgstr "Conturi Google"
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr "Parolă"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr "Setări QoS"
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/ro/polipo.po b/trunk/package/luci/po/ro/polipo.po
new file mode 100644
index 00000000..2c2710a1
--- /dev/null
+++ b/trunk/package/luci/po/ro/polipo.po
@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 18:42+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Setări avansate"
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/qos.po b/trunk/package/luci/po/ro/qos.po
new file mode 100644
index 00000000..239c1f85
--- /dev/null
+++ b/trunk/package/luci/po/ro/qos.po
@@ -0,0 +1,97 @@
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2013-09-25 19:25+0200\n"
+"Last-Translator: Mihai <WyRwSyK@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfete"
+
+msgid "Number of bytes"
+msgstr "Numarul de bytes"
+
+msgid "Ports"
+msgstr "Porturi"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Quality of Service"
+
+msgid "Service"
+msgstr "Serviciu"
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr "toate"
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr "expres"
+
+msgid "low"
+msgstr "scazuta"
+
+msgid "normal"
+msgstr "normala"
+
+msgid "priority"
+msgstr "ridicata"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Conexiune internet"
diff --git a/trunk/package/luci/po/ro/radvd.po b/trunk/package/luci/po/ro/radvd.po
new file mode 100644
index 00000000..77e3d9ee
--- /dev/null
+++ b/trunk/package/luci/po/ro/radvd.po
@@ -0,0 +1,384 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 16:12+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "6to4 interface"
+msgstr "Interfata 6la4"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "Addresses"
+msgstr "Adrese"
+
+msgid "Advanced"
+msgstr "Avansat"
+
+msgid "Advertise Home Agent flag"
+msgstr "Anunta semaforul \"Home Agent\""
+
+msgid "Advertise router address"
+msgstr "Anunta adresa routerului"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Sufixe anuntate de domeniu"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Server RDNSS IPv6 anuntat. Daca e lasat gol, atunci adresa IPv6 a interfetei "
+"este folosita"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Prefixe IPv6 anuntate"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Prefixe IPv6 anuntate. Daca e neconfigurat atunci prefixul de pe interfata "
+"curenta este folosit"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Anunta capabilitatea de \"Home Agent\" IPv6 mobil (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "Anunta capacitatea de inregistrare \"Mobile Router\""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr "Anunta preferinta routerului implicit"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr "Anunta"
+
+msgid "Autonomous"
+msgstr "Autonom"
+
+msgid "Clients"
+msgstr "Clienti"
+
+msgid "Configuration flag"
+msgstr "Semafor de configurare"
+
+msgid "Current hop limit"
+msgstr "Limita hop-ului curent"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Configurarea DNSSL"
+
+msgid "Default lifetime"
+msgstr "Durata implicita"
+
+msgid "Default preference"
+msgstr "Preferinta implicita"
+
+msgid "Enable"
+msgstr "Activeaza"
+
+msgid "Enable advertisements"
+msgstr "Activeaza anunturile"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Activeaza anunturile si solicitarile routerului"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr "Informatia despre \"Home Agent\""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr "Preferinta \"Home Agent\""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr "Interfata"
+
+msgid "Interface Configuration"
+msgstr "Configurarea interfetei"
+
+msgid "Interface required"
+msgstr "Interfata necesara"
+
+msgid "Interfaces"
+msgstr "Interfete"
+
+msgid "Lifetime"
+msgstr "Durata de viata"
+
+msgid "Link MTU"
+msgstr "MTU pe legatura"
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr "Interval maxim"
+
+msgid "Maximum advertisement interval"
+msgstr "Intervalul maxim de anuntare"
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr "IPv6 mobil"
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr "Multicast"
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr "Preferinta"
+
+msgid "Preferred lifetime"
+msgstr "Durata de viata preferata"
+
+msgid "Prefix"
+msgstr "Prefix"
+
+msgid "Prefix Configuration"
+msgstr "Configurarea prefixului"
+
+msgid "Prefixes"
+msgstr "Prefixe"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr "Configurarea rutelor"
+
+msgid "Routes"
+msgstr "Rute"
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr "Sufix"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr "Doar unicast"
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr "nu"
+
+msgid "yes"
+msgstr "da"
+
+#~ msgid "Advertised IPv6 prefix"
+#~ msgstr "Prefixul IPv6 anuntat"
+
+#~ msgid ""
+#~ "Advertised IPv6 prefix. If empty, the current interface prefix is used"
+#~ msgstr ""
+#~ "Prefixul IPv6 anuntat. Daca e lasat gol atunci prefixul de pe interfata "
+#~ "curenta este folosit"
diff --git a/trunk/package/luci/po/ro/rrdtool.po b/trunk/package/luci/po/ro/rrdtool.po
new file mode 100644
index 00000000..98787591
--- /dev/null
+++ b/trunk/package/luci/po/ro/rrdtool.po
@@ -0,0 +1,360 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-29 17:25+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Nivel zgomot"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Wireless - Calitate semnal"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Calitate semnal"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/samba.po b/trunk/package/luci/po/ro/samba.po
new file mode 100644
index 00000000..4bc34155
--- /dev/null
+++ b/trunk/package/luci/po/ro/samba.po
@@ -0,0 +1,82 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 17:16+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Permite oaspeti"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Permite utilizatorii de sistem sa acceseze directoarele lor peste "
+"partajarile de retea"
+
+msgid "Allowed users"
+msgstr "Utilizatori acceptati"
+
+msgid "Create mask"
+msgstr "Creaza masca"
+
+msgid "Description"
+msgstr "Descriere"
+
+msgid "Directory mask"
+msgstr "Masca director"
+
+msgid "Edit Template"
+msgstr "Editeaza sablon"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Editeaza sablonul care e folosit pentru generarea configuratiei samba."
+
+msgid "General Settings"
+msgstr "Setari generale"
+
+msgid "Hostname"
+msgstr "Numele de host"
+
+msgid "Mask for new directories"
+msgstr "Masca pentru directoarele noi"
+
+msgid "Mask for new files"
+msgstr "Masca pentru fisierele noi"
+
+msgid "Name"
+msgstr "Nume"
+
+msgid "Network Shares"
+msgstr "Partajari pe retea"
+
+msgid "Path"
+msgstr "Cale"
+
+msgid "Read-only"
+msgstr "Doar citire"
+
+msgid "Share home-directories"
+msgstr "Partajeaza directoarele proprii"
+
+msgid "Shared Directories"
+msgstr "Directoare partajate"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Acesta este continutul fisierului '/etc/samba/smb.conf.template' din care se "
+"genereaza configuratia samba. Valorile dintre liniuta verticala ('|') n-ar "
+"trebui schimbate, ele iau valorile direct din tab-ul de \"Setari generale\"."
+
+msgid "Workgroup"
+msgstr "Workgroup"
diff --git a/trunk/package/luci/po/ro/splash.po b/trunk/package/luci/po/ro/splash.po
new file mode 100644
index 00000000..615be16b
--- /dev/null
+++ b/trunk/package/luci/po/ro/splash.po
@@ -0,0 +1,292 @@
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/statistics.po b/trunk/package/luci/po/ro/statistics.po
new file mode 100644
index 00000000..ff5d5642
--- /dev/null
+++ b/trunk/package/luci/po/ro/statistics.po
@@ -0,0 +1,604 @@
+#  statistics.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/statistics.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 17:27+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr "Directorul de baza"
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr "Configurarea pluginului CPU"
+
+msgid "CSV Output"
+msgstr "Afisarea CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Configurarea pluginului CVS"
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Setarile Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd e un serviciu mic pentru colectarea de date din diferite surse prin "
+"diferite pluginuri. In aceasta pagina poti schimba setarile generale pentru "
+"Collectd."
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr "Intervalul de colectare date"
+
+msgid "Datasets definition file"
+msgstr "Fisierul de definitii dataseturi"
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr "Directorul pentru pluginurile collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Directorul pentru sub-configuratii"
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr "Utilizarea spatiului pe disc"
+
+msgid "Disk Usage"
+msgstr "Utilizarea discului"
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr "Grafice"
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Numele de host"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Interfete"
+
+msgid "Interrupts"
+msgstr "Intreruperi"
+
+msgid "Interval for pings"
+msgstr "Interval pentru ping"
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr "Legatura de retea"
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr "Retea"
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr "Pluginuri de retea"
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr "Numarul de threaduri pentru colectarea datelor"
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr "Pluginuri de iesire"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr "Procese"
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Procesor"
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Secunde"
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr "Incarcarea de sistem"
+
+msgid "System plugins"
+msgstr "Pluginuri de sistem"
+
+msgid "TCP Connections"
+msgstr "Conexiuni TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+"Pluginul pentru CPU colecteaza statistici de baza despre utilizarea "
+"procesorului."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Incearca sa rezolvi numele de domeniu complet"
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr "Fisierul pentru PID folosit"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/tinyproxy.po b/trunk/package/luci/po/ro/tinyproxy.po
new file mode 100644
index 00000000..799fecbc
--- /dev/null
+++ b/trunk/package/luci/po/ro/tinyproxy.po
@@ -0,0 +1,256 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/transmission.po b/trunk/package/luci/po/ro/transmission.po
new file mode 100644
index 00000000..8e0fc7dc
--- /dev/null
+++ b/trunk/package/luci/po/ro/transmission.po
@@ -0,0 +1,296 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-25 19:17+0200\n"
+"PO-Revision-Date: 2014-06-28 19:26+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Viteză de download alternativă"
+
+msgid "Alternative speed enabled"
+msgstr "Viteză alternativă activată"
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr "Viteza de upload alternativa"
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr "Setari latime de banda"
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr "Activat"
+
+msgid "Encryption"
+msgstr "Criptare"
+
+msgid "Error"
+msgstr "Eroare"
+
+msgid "Fast"
+msgstr "Rapid"
+
+msgid "Files and Locations"
+msgstr "Fişiere şi Locaţii"
+
+msgid "Forced"
+msgstr "Forţat"
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr "Setari globale"
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr "Informatii"
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr "Preferat"
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/upnp.po b/trunk/package/luci/po/ro/upnp.po
new file mode 100644
index 00000000..84f51583
--- /dev/null
+++ b/trunk/package/luci/po/ro/upnp.po
@@ -0,0 +1,152 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-25 19:15+0200\n"
+"Last-Translator: Mihai <WyRwSyK@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"ACL-urile specifica porturile externe care pot fi redirectate si spre ce "
+"adrese si porturi interne"
+
+msgid "Action"
+msgstr "Actiune"
+
+msgid "Active UPnP Redirects"
+msgstr "Redirecturi active UPnP"
+
+msgid "Advanced Settings"
+msgstr "Setari avansate"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Permite adaugarea forward-urilor doar catre adresele ip solicitante"
+
+msgid "Announced model number"
+msgstr "Numar de model anuntat"
+
+msgid "Announced serial number"
+msgstr "Numar serial anuntat"
+
+msgid "Clean rules interval"
+msgstr "Intervalul de curatare reguli"
+
+msgid "Clean rules threshold"
+msgstr "Limita de curatare reguli"
+
+msgid "Client Address"
+msgstr "Adresa client"
+
+msgid "Client Port"
+msgstr "Port client"
+
+msgid "Collecting data..."
+msgstr "Colecteaza date.."
+
+msgid "Comment"
+msgstr "Comentariu"
+
+msgid "Delete Redirect"
+msgstr "Sterge redirect"
+
+msgid "Device UUID"
+msgstr "UUID al dispozitivului"
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Activeaza functionalitatea NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Activeaza functionalitatea UPnP"
+
+msgid "Enable additional logging"
+msgstr "Activeaza log-area aditionala"
+
+msgid "Enable secure mode"
+msgstr "Activeaza modul securizat"
+
+msgid "External Port"
+msgstr "Port extern"
+
+msgid "External ports"
+msgstr "Porturi externe"
+
+msgid "General Settings"
+msgstr "Setari generale"
+
+msgid "Internal addresses"
+msgstr "Adrese interne"
+
+msgid "Internal ports"
+msgstr "Porturi interne"
+
+msgid "MiniUPnP ACLs"
+msgstr "Liste de acces mini UPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Setari mini UPnP"
+
+msgid "Notify interval"
+msgstr "Interval de notificare"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Presentation URL"
+msgstr "Adresa de prezentare"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Pune informatii utile suplimentare in log-ul de sistem"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Raporteaza timpul de functionare de sistem in loc de serviciu"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Porneste UPnP si serviciul NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Nu exista redirecturi active."
+
+msgid "UPNP"
+msgstr "UPNP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPNP permite clientulor din reteaua locala sa configureze automat routerul."
+
+msgid "UPnP lease file"
+msgstr "Fisierul de conexiuni UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Valorea in KOcteti/s , doar informational"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPNP permite clientulor din reteaua locala sa configureze automat routerul."
+
+#~ msgid "enable"
+#~ msgstr "activeaza"
diff --git a/trunk/package/luci/po/ro/ushare.po b/trunk/package/luci/po/ro/ushare.po
new file mode 100644
index 00000000..3c997545
--- /dev/null
+++ b/trunk/package/luci/po/ro/ushare.po
@@ -0,0 +1,51 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-29 20:03+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Conţinut directoare"
+
+msgid "Disable telnet console"
+msgstr "Dezactiveaza consola telnet"
+
+msgid "Disable webinterface"
+msgstr "Dezactiveaza interfata web"
+
+msgid "Enable"
+msgstr "Activează"
+
+msgid "Interface"
+msgstr "Interfaţă"
+
+msgid "Options"
+msgstr "Optiuni"
+
+msgid "Servername"
+msgstr "Numele serverului"
+
+msgid "Settings"
+msgstr "Setari"
+
+msgid "Username"
+msgstr "Utilizator"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/ro/uvc_streamer.po b/trunk/package/luci/po/ro/uvc_streamer.po
new file mode 100644
index 00000000..d6f43c2b
--- /dev/null
+++ b/trunk/package/luci/po/ro/uvc_streamer.po
@@ -0,0 +1,44 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 16:52+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Frame pe secunda"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Rezolutie"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Setari"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Emisie webcam"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Configureaza-ti webcamul compatibil Linux-UC. Pointeaza browserul catre <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a> de exemplu"
diff --git a/trunk/package/luci/po/ro/vnstat.po b/trunk/package/luci/po/ro/vnstat.po
new file mode 100644
index 00000000..093182bd
--- /dev/null
+++ b/trunk/package/luci/po/ro/vnstat.po
@@ -0,0 +1,69 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 16:01+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Configuration"
+msgstr "Configurare"
+
+msgid "Daily traffic"
+msgstr "Trafic zilnic"
+
+msgid "Graphs"
+msgstr "Grafice"
+
+msgid "Hourly traffic"
+msgstr "Trafic la fiecare ora"
+
+msgid "Monitor selected interfaces"
+msgstr "Monitorizeaza interfetele selectate"
+
+msgid "Monthly traffic"
+msgstr "Trafic lunar"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Nu a fost setata nici o baza de date. La configurarea VnStat se poate activa "
+"monitoriza pentru una sau mai multe interfete."
+
+msgid "Restart VnStat"
+msgstr "Restarteaza VnStat"
+
+msgid "Summary display"
+msgstr "Afiseaza sumarul"
+
+msgid "Top 10 display"
+msgstr "Afiseaza top 10"
+
+msgid "Update »"
+msgstr "Updateaza »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Graficele VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Monitorul de trafic VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"Vnstat este un monitor de retea ce pastreaza detalii legate de traficul pe "
+"interfetele selectate."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "Serviciul VnStat a fost restartat."
diff --git a/trunk/package/luci/po/ro/voice_core.po b/trunk/package/luci/po/ro/voice_core.po
new file mode 100644
index 00000000..1776a51f
--- /dev/null
+++ b/trunk/package/luci/po/ro/voice_core.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-25 19:14+0200\n"
+"Last-Translator: Mihai <WyRwSyK@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefoane"
+
+msgid "Voice"
+msgstr "Voce"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/ro/voice_diag.po b/trunk/package/luci/po/ro/voice_diag.po
new file mode 100644
index 00000000..e6ee6820
--- /dev/null
+++ b/trunk/package/luci/po/ro/voice_diag.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-10-07 16:50+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Diagnostics"
+msgstr "Diagnosticuri"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Diagnosticurile disponibile pe dispozitivul tau depind de modulele instalate."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"In acest menu sunt optiuni care-ti permit sa configurezi si sa testezi "
+"diferite operatiuni de voce pe sistemul tau. Acestea sunt denumite "
+"diagnostice."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/ro/watchcat.po b/trunk/package/luci/po/ro/watchcat.po
new file mode 100644
index 00000000..cda0911b
--- /dev/null
+++ b/trunk/package/luci/po/ro/watchcat.po
@@ -0,0 +1,57 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-06-28 19:23+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr "Perioadă"
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/ro/wol.po b/trunk/package/luci/po/ro/wol.po
new file mode 100644
index 00000000..154a3f9f
--- /dev/null
+++ b/trunk/package/luci/po/ro/wol.po
@@ -0,0 +1,57 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2011-10-07 16:47+0200\n"
+"Last-Translator: Daniel <daniel.petre@pitesti.rcs-rds.ro>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Broadcast pe toate interfetele"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Alege statie pentru \"trezire\" sau introdu o adresa MAC de folosit"
+
+msgid "Host to wake up"
+msgstr "Statie pentru \"trezire\""
+
+msgid "Network interface to use"
+msgstr "Interfata de retea pentru utilizare"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Uneori doar una dintre metode functioneaza. Daca se intampla, incearc-o pe "
+"cealalta"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Specifica interfata prin care pachetele WoL sunt trimise"
+
+msgid "Starting WoL utility:"
+msgstr "Pornire utilitar WoL:"
+
+msgid "Wake on LAN"
+msgstr "Activarea pe LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Activarea pe LAN e un mecanism pentru a porni de la distanta computere de pe "
+"retea."
+
+msgid "Wake up host"
+msgstr "Statie de \"trezire\""
+
+msgid "WoL program"
+msgstr "Program WoL"
diff --git a/trunk/package/luci/po/ro/wshaper.po b/trunk/package/luci/po/ro/wshaper.po
new file mode 100644
index 00000000..d2569f6d
--- /dev/null
+++ b/trunk/package/luci/po/ro/wshaper.po
@@ -0,0 +1,56 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-28 18:45+0200\n"
+"PO-Revision-Date: 2014-06-28 18:46+0200\n"
+"Last-Translator: xxvirusxx <condor20_05@yahoo.it>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/ru/ahcp.po b/trunk/package/luci/po/ru/ahcp.po
new file mode 100644
index 00000000..f08cb708
--- /dev/null
+++ b/trunk/package/luci/po/ru/ahcp.po
@@ -0,0 +1,120 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: ahcp\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2013-09-05 15:29+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+# Ad-Hoc Configuration Protocol - протокол автоматической конфигурации IPv6 и сетей IPv6/IPv4 двойного стека
+msgid "AHCP Server"
+msgstr "AHCP-сервер"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP - это протокол автоматической конфигурации сетей IPv6 и IPv6/IPv4, "
+"разработанный для использования вместо DHCP и протоколов обнаружения "
+"маршрутизаторов в сетях, где сложно или невозможно настроить сервер внутри "
+"каждой широковещательной зоны канального уровня, например, в мобильных ad-"
+"hoc сетях."
+
+msgid "Active AHCP Leases"
+msgstr "Активные арендованные AHCP-адреса"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Advanced Settings"
+msgstr "Дополнительные настройки"
+
+msgid "Age"
+msgstr "Возраст"
+
+msgid "Announced DNS servers"
+msgstr "Анонсируемые DNS-серверы"
+
+msgid "Announced NTP servers"
+msgstr "Анонсируемые NTP-серверы"
+
+msgid "Announced prefixes"
+msgstr "Анонсируемые префиксы"
+
+msgid "Collecting data..."
+msgstr "Сбор данных..."
+
+#, fuzzy
+msgid "Forwarder"
+msgstr "Перенаправление запросов"
+
+msgid "General Setup"
+msgstr "Общие настройки"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 и IPv6"
+
+msgid "IPv4 only"
+msgstr "Только IPv4"
+
+msgid "IPv6 only"
+msgstr "Только IPv6"
+
+msgid "Lease directory"
+msgstr "Директория арендованных адресов"
+
+msgid "Lease validity time"
+msgstr "Срок действия аренды"
+
+msgid "Log file"
+msgstr "Файл журнала"
+
+msgid "Multicast address"
+msgstr "Групповой адрес"
+
+msgid "Operation mode"
+msgstr "Режим работы"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Protocol family"
+msgstr "Протокол"
+
+msgid "Served interfaces"
+msgstr "Используемые интерфейсы"
+
+msgid "Server"
+msgstr "Сервер"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Определяет IPv4 и IPv6 NTP-серверы"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Определяет IPv4 и IPv6 DNS-серверы"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Определяет IPv4- и IPv6-префиксы сети в нотации CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "Служба AHCP не запущена."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Служба AHCP запущена с ID %s."
+
+msgid "There are no active leases."
+msgstr "Нет активных арендованных адресов."
+
+msgid "Unique ID file"
+msgstr "Файл уникального идентификатора"
diff --git a/trunk/package/luci/po/ru/asterisk.po b/trunk/package/luci/po/ru/asterisk.po
new file mode 100644
index 00000000..acedb82e
--- /dev/null
+++ b/trunk/package/luci/po/ru/asterisk.po
@@ -0,0 +1,515 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-04-02 15:02+0200\n"
+"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Общие настройки Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "Каталог AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Кэшировать звуковые файлы во время записи"
+
+#~ msgid "Debug Level"
+#~ msgstr "Уровень отладки"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Отключить некоторые предупреждения"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Сохранять дамп ядра при фатальной ошибке"
+
+#~ msgid "High Priority"
+#~ msgstr "Высокий приоритет"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Включить шифрование"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Использовать внутренние тайминги"
+
+#~ msgid "Log directory"
+#~ msgstr "Каталог файлов журнала"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Максимальное разрешённое количество вызовов"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Максимальная нагрузка для запрета приёма новых вызовов"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Выключить цвета консоли"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Каталог кэша звуковых файлов"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Группа, от имени которой запускать"
+
+#~ msgid "The User to run as"
+#~ msgstr "Пользователь, от имени которого запускать"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Добавлять имя системы к уникальному идентификатору (UID)"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Передавать тишину в формате SLINEAR при записи канала"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Раздел правил набора"
+
+#~ msgid "include"
+#~ msgstr "включить"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Раcширение правила набора"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Общие настройки правил набора"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Разрешить перевод"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Очистить глобальные переменные"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Правила набора для конференции"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Время правил набора"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Правила набора для голосовой почты"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Зоны для правил набора"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Префикс (0) для добавления/удаления к/из международных номеров"
+
+#~ msgid "localzone"
+#~ msgstr "местная зона"
+
+#~ msgid "Connection to use"
+#~ msgstr "Использовать соединение"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Назначения функцилнальных клавиш"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "Клавиша для разрыва соединения"
+
+#~ msgid "Key to Park call"
+#~ msgstr "Клавиша для \"парковки\" вызова "
+
+#~ msgid "Parking Feature"
+#~ msgstr "Функция \"Парковка\""
+
+#~ msgid "One touch record key"
+#~ msgstr "Клавиша записи в одно касание"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Аудио файл, проигрываемый \"припаркованному\""
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr "Максимальное время (мс) между нажатиями для активации функции"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Метод поиска слота для парковки"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Играть тон вежливости для"
+
+#~ msgid "Enable Parking"
+#~ msgstr "Разрешить \"Парковку\""
+
+#~ msgid "Extension to dial to park"
+#~ msgstr "Расширение набора для \"парковки\""
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Время \"Парковки\" (секунды)"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "Диапазон расширений для \"парковки\" вызова"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Перезагрузить конфигурацию оборудования"
+
+#~ msgid "Reboot Method"
+#~ msgstr "Метод перезагрузки"
+
+#~ msgid "Parameter"
+#~ msgstr "Параметр"
+
+#~ msgid "Option type"
+#~ msgstr "Тип параметра"
+
+#~ msgid "User name"
+#~ msgstr "Имя пользователя"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Общие параметры IAX"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Разрешить кодеки"
+
+#~ msgid "Static"
+#~ msgstr "Статический"
+
+#~ msgid "Write Protect"
+#~ msgstr "Защита от записи"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Конференция Meetme"
+
+#~ msgid "Admin PIN"
+#~ msgstr "PIN администратора"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "PIN совещания"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Общие параметры конференции Meetme"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Количество используемых 20 мс буферов"
+
+#~ msgid "Modules"
+#~ msgstr "Модули"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Приложение сбора сигналов тревоги"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Приложение аутентификации"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "Убедитесь что Asterisk не сохраняет CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Проверить канал на доступность"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Слашать на любом канале"
+
+#~ msgid "Database access functions"
+#~ msgstr "Функции доступа базы данных"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Приложение набора"
+
+#~ msgid "DISA (Direct Inward System Access) Application"
+#~ msgstr ""
+#~ "Приложение доступа к добавочной линии путем прямого установления "
+#~ "входящего соединения (DISA)"
+
+#~ msgid "Dump channel variables Application"
+#~ msgstr "Приложение сбора переменных канала"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Приложение эха"
+
+#~ msgid "Executes applications"
+#~ msgstr "Выполняет приложение"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "Интерфейс внешнего IVR приложения"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Операции управления группой"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Приложение передачи изображений"
+
+#~ msgid "Look up Caller*ID name/number from black"
+#~ msgstr "Искать имя CallerID в \"черном\" списке"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr "Искать имя CallerID в локальной базе"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Макрос расширения"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Простое математическое приложение"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "Приложение MD5"
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Записать вызов и микшировать аудио во время записи"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Приложение для воспроизведения"
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Требовать номер телефона, который необходимо ввести"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "Постановка вызовов на ожидание"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Приложение чтения переменных"
+
+#~ msgid "Read in a file"
+#~ msgstr "Читать в файл"
+
+#~ msgid "Trivial Record Application"
+#~ msgstr "Приложения для записи"
+
+#~ msgid "Send DTMF digits Application"
+#~ msgstr "Приложение отправки DTMF"
+
+#~ msgid "Send Text Applications"
+#~ msgstr "Приложения отправки текста"
+
+#~ msgid "Set CallerID Application"
+#~ msgstr "Приложение установки CallerID"
+
+#~ msgid "Set RDNIS Number"
+#~ msgstr "Установить номер RDNIS"
+
+#~ msgid "Set ISDN Transfer Capability"
+#~ msgstr "Установить возможности передачи ISDN "
+
+#~ msgid "SMS/PSTN handler"
+#~ msgstr "Обработчик SMS/PSTN"
+
+#~ msgid "Hangs up the requested channel"
+#~ msgstr "Отсоединяет запрошенный канал"
+
+#~ msgid "Stack Routines"
+#~ msgstr "Функции стека"
+
+#~ msgid "Generic System() application"
+#~ msgstr "Приложение System()"
+
+#~ msgid "Playback with Talk Detection"
+#~ msgstr "Воспроизведение с обнаружением разговора"
+
+#~ msgid "Interface Test Application"
+#~ msgstr "Приложение для тестирования интерфейса"
+
+#~ msgid "Transfer"
+#~ msgstr "Пересылка"
+
+#~ msgid "TXTCIDName"
+#~ msgstr "Имя TXTCID"
+
+#~ msgid "Send URL Applications"
+#~ msgstr "Приложения отсылки URL"
+
+#~ msgid "Custom User Event Application"
+#~ msgstr "Приложение пользовательских событий"
+
+#~ msgid "Send verbose output"
+#~ msgstr "Отправлять подробный вывод"
+
+#~ msgid "Voicemail"
+#~ msgstr "Голосовая почта"
+
+#~ msgid "While Loops and Conditional Execution"
+#~ msgstr "Циклы while и условное выполнение"
+
+#~ msgid "Asterisk Call Manager CDR Backend"
+#~ msgstr "Бэкенд CDR менеджера вызовов Asterisk"
+
+#~ msgid "MySQL CDR Backend"
+#~ msgstr "Бэкенд MySQL CDR"
+
+#~ msgid "PostgreSQL CDR Backend"
+#~ msgstr "Бэкенд PostgreSQL CDR"
+
+#~ msgid "SQLite CDR Backend"
+#~ msgstr "Бэкенд SQLite CDR"
+
+#~ msgid "Local Proxy Channel"
+#~ msgstr "Локальный прокси-канал"
+
+#~ msgid "Session Initiation Protocol (SIP)"
+#~ msgstr "Session Initiation Protocol - протокол установления сеанса (SIP)"
+
+#~ msgid "Adaptive Differential PCM Coder/Decoder"
+#~ msgstr "Адаптивный дифференциальный PCM кодер/декодер"
+
+#~ msgid "A-law Coder/Decoder"
+#~ msgstr "A-law кодер/декодер"
+
+#~ msgid "A-law and Mulaw direct Coder/Decoder"
+#~ msgstr "A-law и Mu-law прямой кодер/декодер"
+
+#~ msgid "ITU G.726-32kbps G726 Transcoder"
+#~ msgstr "ITU G.726-32кбит/с G726 транскодер"
+
+#~ msgid "GSM/PCM16 (signed linear) Codec Translation"
+#~ msgstr "Транслятор кодека GSM/PCM16 (знаковый линейный)"
+
+#~ msgid "Speex/PCM16 (signed linear) Codec Translator"
+#~ msgstr "Транслятор кодека Speex/PCM16 (знаковый линейный)"
+
+#~ msgid "Mu-law Coder/Decoder"
+#~ msgstr "Mu-law кодер/декодер"
+
+#~ msgid "Sun Microsystems AU format (signed linear)"
+#~ msgstr "Формат Sun Microsystems AU (знаковый линейный)"
+
+#~ msgid "Raw G.726 (16/24/32/40kbps) data"
+#~ msgstr "Необработанные данные G.726 (16/24/32/40кбит/с)"
+
+#~ msgid "Raw G729 data"
+#~ msgstr "Необработанные данные G729"
+
+#~ msgid "Raw GSM data"
+#~ msgstr "Необработанные данные GSM"
+
+#~ msgid "Raw h263 data"
+#~ msgstr "Необработанные данные h263"
+
+#~ msgid "JPEG (Joint Picture Experts Group) Image"
+#~ msgstr "Изображение JPEG (Joint Picture Experts Group) "
+
+#~ msgid "Dialogic VOX (ADPCM) File Format"
+#~ msgstr "Формат Dialogic VOX (ADPCM)"
+
+#~ msgid "Microsoft WAV format (8000hz Signed Line"
+#~ msgstr "Формат Microsoft WAV (800Гц, линейный знаковый)"
+
+#~ msgid "Microsoft WAV format (Proprietary GSM)"
+#~ msgstr "Формат Microsoft WAV (проприетарный GSM)"
+
+#~ msgid "Caller ID related dialplan functions"
+#~ msgstr "Функции правил набора Caller ID"
+
+#~ msgid "ENUM Functions"
+#~ msgstr "Функции ENUM"
+
+#~ msgid "URI encoding / decoding functions"
+#~ msgstr "Функции кодирования/декодирования URI"
+
+#~ msgid "Asterisk Extension Language Compiler"
+#~ msgstr "Компилятор языка расширений Asterisk"
+
+#~ msgid "Text Extension Configuration"
+#~ msgstr "Настройка текстового расширения"
+
+#~ msgid "Wil Cal U (Auto Dialer)"
+#~ msgstr "Позвоню тебе (Wil Cal U, автодозвонщик)"
+
+#~ msgid "MySQL Config Resource"
+#~ msgstr "Ресурс конфигурации MySQL"
+
+#~ msgid "ODBC Config Resource"
+#~ msgstr "Ресурс конфигурации ODBC"
+
+#~ msgid "PGSQL Module"
+#~ msgstr "PGSQL модуль"
+
+#~ msgid "Cryptographic Digital Signatures"
+#~ msgstr "Цифровые подписи"
+
+#~ msgid "Call Parking Resource"
+#~ msgstr "Ресурс \"парковки\""
+
+#~ msgid "Indications Configuration"
+#~ msgstr "Конфигурация индикаций"
+
+#~ msgid "Call Monitoring Resource"
+#~ msgstr "Ресурс мониторинга вызова"
+
+#~ msgid "ODBC Resource"
+#~ msgstr "Ресурс ODBC"
+
+#~ msgid "SMDI Module"
+#~ msgstr "Модуль SMDI"
+
+#~ msgid "SNMP Module"
+#~ msgstr "Модуль SNMP"
+
+#~ msgid "Music On Hold"
+#~ msgstr "Музыка при ожидании"
+
+#~ msgid "Application"
+#~ msgstr "Приложение"
+
+#~ msgid "Directory of Music"
+#~ msgstr "Директория музыки"
+
+#~ msgid "Random Play"
+#~ msgstr "Воспроизведение в случайном порядке"
+
+#~ msgid "DTMF mode"
+#~ msgstr "DTMF режим"
+
+#~ msgid "From user (required by many SIP providers)"
+#~ msgstr "From user (от пользователя, требуется многими SIP-провайдерами)"
+
+#~ msgid "Allow Insecure for"
+#~ msgstr "Разрешить небезопасные для"
+
+#~ msgid "Mailbox for MWI"
+#~ msgstr "Почтовый ящик для MWI"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "NAT между телефоном и Asterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "Проверять метки в заголовках"
+
+#~ msgid "Register connection"
+#~ msgstr "Зарегистрировать соединение"
+
+#~ msgid "Client Type"
+#~ msgstr "Тип клиента"
+
+#~ msgid "Username"
+#~ msgstr "Имя пользователя"
+
+#~ msgid "Section sipgeneral"
+#~ msgstr "Общие SIP"
+
+#~ msgid "SIP realm"
+#~ msgstr "SIP realm"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "Общие настройки голосовой почты"
+
+#~ msgid "From Email address of server"
+#~ msgstr "От адреса эл. почты сервера"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "Ящики голосовой почты"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "Письмо содержит вложение"
+
+#~ msgid "Email"
+#~ msgstr "Эл. почта"
+
+#~ msgid "Display Name"
+#~ msgstr "Отображаемое имя"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "zone"
+#~ msgstr "зона"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Настройки голосовой зоны"
+
+#~ msgid "Message Format"
+#~ msgstr "Формат сообщения"
diff --git a/trunk/package/luci/po/ru/base.po b/trunk/package/luci/po/ru/base.po
new file mode 100644
index 00000000..cf320003
--- /dev/null
+++ b/trunk/package/luci/po/ru/base.po
@@ -0,0 +1,4080 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: base\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2014-01-31 21:08+0200\n"
+"Last-Translator: Moon_dark <lenayxa@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d минутное окно, %d секундный интервал)"
+
+msgid "(%s available)"
+msgstr "(%s доступно)"
+
+msgid "(empty)"
+msgstr "(пусто)"
+
+msgid "(no interfaces attached)"
+msgstr "(нет связанных интерфейсов)"
+
+msgid "-- Additional Field --"
+msgstr "-- Дополнительное поле --"
+
+msgid "-- Please choose --"
+msgstr "-- Пожалуйста, выберите --"
+
+msgid "-- custom --"
+msgstr "-- пользовательский --"
+
+msgid "1 Minute Load:"
+msgstr "Загрузка за 1 минуту:"
+
+msgid "15 Minute Load:"
+msgstr "Загрузка за 15 минут:"
+
+msgid "5 Minute Load:"
+msgstr "Загрузка за 5 минут:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Базовый идентификатор обслуживания\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "Порт запроса <abbr title=\"Система доменных имён\">DNS</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "Порт <abbr title=\"Система доменных имён\">DNS</abbr>-сервера"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Система доменных имён\">DNS</abbr> серверы будут опрошены в "
+"порядке, определенном в resolvfile файле"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Расширенный идентификатор обслуживания\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-адрес"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-адрес шлюза"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "Маска сети <abbr title=\"Интернет протокол версии 4\">IPv4</abbr>"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-адрес или сеть (CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-адрес шлюза"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "Настройка <abbr title=\"Светодиод\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Название <abbr title=\"Светодиод\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Управление доступом к носителю\">MAC</abbr>-адрес"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"максимальное\">Макс.</abbr> кол-во аренд <abbr title="
+"\"Протокол динамической конфигурации узла\">DHCP</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"максимальный\">Макс.</abbr> размер пакета <abbr title="
+"\"Extension Mechanisms for Domain Name System\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+"<abbr title=\"максимальное\">Макс.</abbr> кол-во одновременных запросов"
+
+# Парный шифр используется для одноадресной передачи, а групповой - для широковещательной и мультикаста
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Парный: %s / Групповой: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "Поддержка AR"
+
+msgid "ARP retry threshold"
+msgstr "Порог повтора ARP"
+
+msgid "ATM Bridges"
+msgstr "Мосты ATM"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "Идентификатор виртуального канала ATM (VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "Идентификатор виртуального пути ATM (VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"ATM-мосты выставляют инкапсулированный Ethernet в соединениях AAL5 в "
+"качестве виртуальных сетевых интерфейсов Linux, которые могут быть "
+"использованы в сочетании с DHCP или PPP для подключения к сети провайдера."
+
+msgid "ATM device number"
+msgstr "Номер устройства ATM"
+
+msgid "Access Concentrator"
+msgstr "Концентратор доступа"
+
+msgid "Access Point"
+msgstr "Точка доступа"
+
+msgid "Action"
+msgstr "Действие"
+
+msgid "Actions"
+msgstr "Действия"
+
+msgid "Activate this network"
+msgstr "Активировать эту сеть"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Активные маршруты <abbr title=\"Интернет протокол версии 4\">IPv4</abbr>"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Активные маршруты <abbr title=\"Интернет протокол версии 6\">IPv6</abbr>"
+
+msgid "Active Connections"
+msgstr "Активные соединения"
+
+msgid "Active DHCP Leases"
+msgstr "Активные аренды DHCP"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Активные аренды DHCPv6"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Добавить"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+"Добавить суффикс локального домена к именам, полученным из файлов hosts"
+
+msgid "Add new interface..."
+msgstr "Добавить новый интерфейс..."
+
+msgid "Additional Hosts files"
+msgstr "Дополнительные файлы hosts"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Address to access local relay bridge"
+msgstr "Адрес для доступа к локальному мосту-ретранслятору"
+
+msgid "Administration"
+msgstr "Управление"
+
+msgid "Advanced Settings"
+msgstr "Расширенные настройки"
+
+msgid "Alert"
+msgstr "Тревожная ситуация"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Разрешить <abbr title=\"Secure Shell\">SSH</abbr>-аутентификацию с помощью "
+"пароля"
+
+msgid "Allow all except listed"
+msgstr "Разрешить все, кроме перечисленных"
+
+msgid "Allow listed only"
+msgstr "Разрешить только перечисленные"
+
+msgid "Allow localhost"
+msgstr "Разрешить локальный хост"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Разрешить удалённым хостам подключаться к локальным перенаправленным портам "
+"SSH"
+
+msgid "Allow root logins with password"
+msgstr "Разрешить пользователю root вход с помощью пароля"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+"Разрешить пользователю <em>root</em> входить в систему с помощью пароля"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr "Разрешить ответы в диапазоне 127.0.0.0/8, например, для RBL-сервисов"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Всегда использовать ширину каналов 40 МГц, даже если каналы перекрываются. "
+"Использование этой опции не совместимо со стандартом IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Если вы не выберите эту опцию, то будет создана дополнительная сеть."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Антенна 1"
+
+msgid "Antenna 2"
+msgstr "Антенна 2"
+
+msgid "Antenna Configuration"
+msgstr "Конфигурация антенн"
+
+msgid "Any zone"
+msgstr "Любая зона"
+
+msgid "Apply"
+msgstr "Принять"
+
+msgid "Applying changes"
+msgstr "Применение изменений"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Назначить интерфейсы..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Подключенные клиенты"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Беспроводной 802.11%s контроллер Atheros"
+
+msgid "Authentication"
+msgstr "Аутентификация"
+
+msgid "Authoritative"
+msgstr "Авторитетный"
+
+msgid "Authorization Required"
+msgstr "Требуется авторизация"
+
+msgid "Auto Refresh"
+msgstr "Автообновление"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Доступно"
+
+msgid "Available packages"
+msgstr "Доступные пакеты"
+
+msgid "Average:"
+msgstr "Средняя:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Назад"
+
+msgid "Back to Overview"
+msgstr "Назад к обзору"
+
+msgid "Back to configuration"
+msgstr "Назад к настройке"
+
+msgid "Back to overview"
+msgstr "Назад к обзору"
+
+msgid "Back to scan results"
+msgstr "Назад к результатам сканирования"
+
+msgid "Background Scan"
+msgstr "Фоновое сканирование"
+
+msgid "Backup / Flash Firmware"
+msgstr "Резервная копия / прошивка"
+
+msgid "Backup / Restore"
+msgstr "Резервное копирование / Восстановление"
+
+msgid "Backup file list"
+msgstr "Список файлов для резервного копирования"
+
+msgid "Bad address specified!"
+msgstr "Указан неправильный адрес!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Ниже приводится определённый список файлов для резервного копирования. Он "
+"состоит из изменённых конфигурационных файлов, отмеченных opkg, необходимых "
+"базовых файлов, а также шаблонов резервного копирования, определённых "
+"пользователем."
+
+msgid "Bitrate"
+msgstr "Скорость"
+
+msgid "Bogus NX Domain Override"
+msgstr "Переопределение поддельного NX-домена"
+
+msgid "Bridge"
+msgstr "Мост"
+
+msgid "Bridge interfaces"
+msgstr "Объединить в мост"
+
+msgid "Bridge unit number"
+msgstr "Номер моста"
+
+msgid "Bring up on boot"
+msgstr "Запустить при загрузке"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Беспроводной 802.11%s контроллер Broadcom"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Беспроводной 802.11 контроллер Broadcom BCM%04x"
+
+msgid "Buffered"
+msgstr "Буферизировано"
+
+msgid "Buttons"
+msgstr "Кнопки"
+
+msgid "CPU"
+msgstr "ЦП"
+
+msgid "CPU usage (%)"
+msgstr "Загрузка ЦП (%)"
+
+msgid "Cached"
+msgstr "Кэшировано"
+
+msgid "Cancel"
+msgstr "Отменить"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Цепочка"
+
+msgid "Changes"
+msgstr "Изменения"
+
+msgid "Changes applied."
+msgstr "Изменения приняты."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Изменить пароль администратора для доступа к устройству"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Check"
+msgstr "Проверить"
+
+msgid "Checksum"
+msgstr "Контрольная сумма"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Укажите зону, которую вы хотите прикрепить к этому интерфейсу. Выберите "
+"<em>не определено</em>, чтобы удалить этот интерфейс из зоны, или заполните "
+"поле <em>создать</em>, чтобы определить новую зону и прикрепить к ней этот "
+"интерфейс."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Выберите сеть (сети), которые вы хотите прикрепить к этому беспроводному "
+"интерфейсу, или заполните поле <em>создать</em>, чтобы определить новую сеть."
+
+msgid "Cipher"
+msgstr "Шифрование"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Нажмите \"Создать архив\", чтобы загрузить tar-архив текущих "
+"конфигурационных файлов. Для сброса настроек прошивки к исходному состоянию "
+"нажмите \"Выполнить сброс\" (возможно только для squashfs-образов)."
+
+msgid "Client"
+msgstr "Клиент"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "ID клиента при DHCP-запросе"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Завершать неактивное соединение после заданного интервала (сек.), "
+"используйте значение 0 для удержания неактивного соединения"
+
+msgid "Close list..."
+msgstr "Закрыть список..."
+
+msgid "Collecting data..."
+msgstr "Сбор информации..."
+
+msgid "Command"
+msgstr "Команда"
+
+msgid "Common Configuration"
+msgstr "Общая конфигурация"
+
+msgid "Compression"
+msgstr "Сжатие"
+
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgid "Configuration applied."
+msgstr "Конфигурация применена."
+
+msgid "Configuration files will be kept."
+msgstr "Конфигурационные файлы будут сохранены."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+"Использовать эту точку монтирования в качестве overlay-хранилища для block-"
+"extroot"
+
+msgid "Confirmation"
+msgstr "Подтверждение пароля"
+
+msgid "Connect"
+msgstr "Соединить"
+
+msgid "Connected"
+msgstr "Подключен"
+
+msgid "Connection Limit"
+msgstr "Ограничение соединений"
+
+msgid "Connections"
+msgstr "Соединения"
+
+msgid "Country"
+msgstr "Страна"
+
+msgid "Country Code"
+msgstr "Код страны"
+
+msgid "Cover the following interface"
+msgstr "Включить следующий интерфейс"
+
+msgid "Cover the following interfaces"
+msgstr "Включить следующие интерфейсы"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Создать / назначить зону сетевого экрана"
+
+msgid "Create Interface"
+msgstr "Создать интерфейс"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Создать мост над несколькими интерфейсами"
+
+msgid "Critical"
+msgstr "Критическая ситуация"
+
+msgid "Cron Log Level"
+msgstr "Уровень вывода Cron"
+
+msgid "Custom Interface"
+msgstr "Пользовательский интерфейс"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Настройка поведения <abbr title=\"Светодиод\">LED</abbr> если это возможно."
+
+msgid "DHCP Leases"
+msgstr "Аренды DHCP"
+
+msgid "DHCP Server"
+msgstr "DHCP-сервер"
+
+msgid "DHCP and DNS"
+msgstr "DHCP и DNS"
+
+msgid "DHCP client"
+msgstr "DHCP-клиент"
+
+msgid "DHCP-Options"
+msgstr "DHCP-Настройки"
+
+msgid "DHCPv6 Leases"
+msgstr "Аренды DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Перенаправление запросов DNS"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Отладка"
+
+msgid "Default %d"
+msgstr "По умолчанию %d"
+
+msgid "Default gateway"
+msgstr "Шлюз по умолчанию"
+
+msgid "Default state"
+msgstr "Начальное состояние"
+
+msgid "Define a name for this network."
+msgstr "Укажите имя этой сети."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Определить дополнительные опции DHCP, например, "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\", чтобы известить клиентов о DNS-"
+"серверах."
+
+msgid "Delete"
+msgstr "Удалить"
+
+msgid "Delete this interface"
+msgstr "Удалить этот интерфейс"
+
+msgid "Delete this network"
+msgstr "Удалить эту сеть"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid "Design"
+msgstr "Тема"
+
+msgid "Destination"
+msgstr "Назначение"
+
+msgid "Device"
+msgstr "Устройство"
+
+msgid "Device Configuration"
+msgstr "Конфигурация устройства"
+
+msgid "Diagnostics"
+msgstr "Диагностика"
+
+msgid "Directory"
+msgstr "Директория"
+
+msgid "Disable"
+msgstr "Отключить"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Отключить <abbr title=\"Протокол динамической конфигурации узла\">DHCP</"
+"abbr> для этого интерфейса."
+
+msgid "Disable DNS setup"
+msgstr "Отключить настройку DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Отключить таймер HW-Beacon"
+
+msgid "Disabled"
+msgstr "Отключено"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Отбрасывать ответы RFC1918"
+
+msgid "Displaying only packages containing"
+msgstr "Показываются только пакеты, содержащие"
+
+msgid "Distance Optimization"
+msgstr "Оптимизация расстояния"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Расстояние до самого удалённого сетевого узла в метрах."
+
+msgid "Diversity"
+msgstr "Разновидность антенн"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq содержит в себе <abbr title=\"Протокол динамической конфигурации узла"
+"\">DHCP</abbr>-сервер и <abbr title=\"Служба доменных имён\">DNS</abbr>-"
+"прокси для сетевых экранов <abbr title=\"Преобразование сетевых адресов"
+"\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "Не кешировать отрицательные ответы, в т.ч. для несуществующих доменов"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Не перенаправлять запросы, которые не могут быть обработаны публичными DNS-"
+"серверами"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Не перенаправлять обратные DNS-запросы для локальных сетей"
+
+msgid "Do not send probe responses"
+msgstr "Не посылать тестовые ответы"
+
+msgid "Domain required"
+msgstr "Требуется домен"
+
+msgid "Domain whitelist"
+msgstr "Белый список доменов"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Не перенаправлять <abbr title=\"Служба доменных имён\">DNS</abbr>-запросы "
+"без <abbr title=\"Служба доменных имён\">DNS</abbr>-имени"
+
+msgid "Download and install package"
+msgstr "Загрузить и установить пакет"
+
+msgid "Download backup"
+msgstr "Загрузить резервную копию"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear - это <abbr title=\"Secure Shell\">SSH</abbr>-сервер со встроенным "
+"<abbr title=\"Secure Copy\">SCP</abbr>"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Динамический <abbr title=\"Протокол динамической конфигурации узла\">DHCP</"
+"abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "Динамический туннель"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Динамически выделять DHCP-адреса клиентам. Если выключено, то будут "
+"обслужены только клиенты с постоянно арендованными адресами."
+
+msgid "EAP-Method"
+msgstr "Метод EAP"
+
+# "Редактировать" длинно и не влазит по ширине в кнопку - текст наезжает на иконку
+#, fuzzy
+msgid "Edit"
+msgstr "Редактировать"
+
+#, fuzzy
+msgid "Edit this interface"
+msgstr "Редактировать этот интерфейс"
+
+msgid "Edit this network"
+msgstr "Редактировать эту сеть"
+
+msgid "Emergency"
+msgstr "Чрезвычайная ситуация"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Включить <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Включить динамическое обновление оконечной точки HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Включить IPv6-согласование на PPP-соединении"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Пропускать Jumbo-кадры"
+
+msgid "Enable NTP client"
+msgstr "Включить NTP-клиент"
+
+msgid "Enable TFTP server"
+msgstr "Включить TFTP-сервер"
+
+msgid "Enable VLAN functionality"
+msgstr "Включить поддержку VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Включить изучение и устаревание (learning/aging)"
+
+msgid "Enable this mount"
+msgstr "Включить эту точку монтирования"
+
+msgid "Enable this swap"
+msgstr "Включить этот раздел подкачки"
+
+msgid "Enable/Disable"
+msgstr "Включить/выключить"
+
+msgid "Enabled"
+msgstr "Включено"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Включает Spanning Tree Protocol на этом мосту"
+
+msgid "Encapsulation mode"
+msgstr "Режим инкапсуляции"
+
+msgid "Encryption"
+msgstr "Шифрование"
+
+msgid "Erasing..."
+msgstr "Стирание..."
+
+msgid "Error"
+msgstr "Ошибка"
+
+msgid "Ethernet Adapter"
+msgstr "Ethernet-адаптер"
+
+msgid "Ethernet Switch"
+msgstr "Ethernet-коммутатор"
+
+msgid "Expand hosts"
+msgstr "Расширять имена узлов"
+
+msgid "Expires"
+msgstr "Истекает"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+"Время, через которое истекает аренда адреса, минимум 2 минуты (<code>2m</"
+"code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Сервер системного журнала"
+
+msgid "External system log server port"
+msgstr "Порт сервера системного журнала"
+
+msgid "Fast Frames"
+msgstr "Быстрые кадры"
+
+msgid "File"
+msgstr "Файл"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "Имя загрузочного образа, извещаемого клиентам"
+
+msgid "Filesystem"
+msgstr "Файловая система"
+
+msgid "Filter"
+msgstr "Фильтр"
+
+msgid "Filter private"
+msgstr "Фильтровать частные"
+
+msgid "Filter useless"
+msgstr "Фильтровать бесполезные"
+
+msgid "Find and join network"
+msgstr "Найти и присоединиться к сети"
+
+msgid "Find package"
+msgstr "Найти пакет"
+
+msgid "Finish"
+msgstr "Завершить"
+
+msgid "Firewall"
+msgstr "Межсетевой экран"
+
+msgid "Firewall Settings"
+msgstr "Настройки межсетевого экрана"
+
+msgid "Firewall Status"
+msgstr "Статус межсетевого экрана"
+
+msgid "Firmware Version"
+msgstr "Версия прошивки"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Фиксированный порт для исходящих DNS-запросов"
+
+msgid "Flags"
+msgstr "Флаги"
+
+msgid "Flash Firmware"
+msgstr "Установить прошивку"
+
+msgid "Flash image..."
+msgstr "Установить..."
+
+msgid "Flash new firmware image"
+msgstr "Установить новый образ прошивки"
+
+msgid "Flash operations"
+msgstr "Операции с прошивкой"
+
+msgid "Flashing..."
+msgstr "Прошивка..."
+
+# Force DHCP on the network
+msgid "Force"
+msgstr "Принудительно"
+
+msgid "Force 40MHz mode"
+msgstr "Принудительно установить режим 40 МГц ширины канала"
+
+msgid "Force CCMP (AES)"
+msgstr "Требовать CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Использовать DHCP в этой сети, даже если найден другой сервер."
+
+msgid "Force TKIP"
+msgstr "Требовать TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "TKIP или CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Перенаправлять трафик DHCP"
+
+msgid "Forward broadcast traffic"
+msgstr "Перенаправлять широковещательный траффик"
+
+msgid "Forwarding mode"
+msgstr "Режим перенаправления"
+
+msgid "Fragmentation Threshold"
+msgstr "Порог фрагментации"
+
+msgid "Frame Bursting"
+msgstr "Пакетная передача кадров"
+
+msgid "Free"
+msgstr "Свободно"
+
+msgid "Free space"
+msgstr "Свободное место"
+
+msgid "Frequency Hopping"
+msgstr "Скачкообразная перестройка частоты"
+
+msgid "GHz"
+msgstr "ГГц"
+
+msgid "GPRS only"
+msgstr "Только GPRS"
+
+msgid "Gateway"
+msgstr "Шлюз"
+
+msgid "Gateway ports"
+msgstr "Порты шлюза"
+
+msgid "General Settings"
+msgstr "Основные настройки"
+
+msgid "General Setup"
+msgstr "Основные настройки"
+
+msgid "Generate archive"
+msgstr "Создать архив"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Беспроводной 802.11%s контроллер"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "Введённые пароли не совпадают, пароль не изменён!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Перейти к настройке пароля..."
+
+msgid "Go to relevant configuration page"
+msgstr "Перейти к странице конфигурации"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Пароль HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Обработчик"
+
+# Вообще, SIGHUP означает, что "пользователь отключился от терминала". Но чаще всего сигнал используется для перезапуска, так что переведу именно так.
+msgid "Hang Up"
+msgstr "Перезапустить"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Здесь вы можете настроить основные параметры вашего устройства такие как имя "
+"хоста или часовой пояс."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Здесь вы можете добавить открытые SSH ключи (один ключ на строку) для SSH "
+"аутентификации."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Беспроводной 802.11b контроллер Hermes"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Скрыть <abbr title=\"Расширенный идентификатор сети\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Записи хостов"
+
+msgid "Host expiry timeout"
+msgstr "Таймаут хоста"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "<abbr title=\"Адрес интернет протокола\">IP</abbr>-адрес или сеть"
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Имя хоста в DHCP-запросах"
+
+msgid "Hostnames"
+msgstr "Имена хостов"
+
+msgid "IP address"
+msgstr "IP-адрес"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Межсетевой экран IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Статус IPv4 WAN"
+
+msgid "IPv4 address"
+msgstr "IPv4-адрес"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 и IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Широковещательный IPv4-адрес"
+
+msgid "IPv4 gateway"
+msgstr "IPv4-адрес шлюза"
+
+msgid "IPv4 netmask"
+msgstr "Маска сети IPv4"
+
+msgid "IPv4 only"
+msgstr "Только IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Длина префикса IPv4"
+
+msgid "IPv4-Address"
+msgstr "IPv4-адрес"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Межсетевой экран IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Статус IPv6 WAN"
+
+msgid "IPv6 address"
+msgstr "IPv6-адрес"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6-адрес шлюза"
+
+msgid "IPv6 only"
+msgstr "Только IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Префикс IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Длина префикса IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-адрес"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6 в IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6 через IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6 через IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Идентификация EAP"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Если выбрано, монтировать устройство, используя его UUID, вместо "
+"фиксированного файла устройства"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Если выбрано, монтировать устройство, используя название его раздела, вместо "
+"фиксированного файла устройства"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Если не выбрано, то маршрут по умолчанию не настраивается"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Если не выбрано, то извещаемые адреса DNS-серверов игнорируются"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Если физической памяти не достаточно, то неиспользуемые данные могут быть "
+"временно перемещены в раздел подкачки, что в свою очередь приведет к "
+"увеличению объёму свободной <abbr title=\"Random Access Memory\">RAM</abbr>. "
+"Однако, перемещение в файл - это достаточно долгий процесс, так как "
+"устройство, на котором располагается раздел подкачки, работает гораздо "
+"медленнее, чем <abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Игнорировать файлы hosts"
+
+msgid "Ignore interface"
+msgstr "Игнорировать интерфейс"
+
+msgid "Ignore resolve file"
+msgstr "Игнорировать файл resolv"
+
+msgid "Image"
+msgstr "Образ"
+
+msgid "In"
+msgstr "В"
+
+msgid "Inactivity timeout"
+msgstr "Таймаут бездействия"
+
+msgid "Inbound:"
+msgstr "Входящий:"
+
+msgid "Info"
+msgstr "Информация"
+
+msgid "Initscript"
+msgstr "Скрипт инициализации"
+
+msgid "Initscripts"
+msgstr "Скрипты инциализации"
+
+msgid "Install"
+msgstr "Установить"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Установить пакет %q"
+
+msgid "Install protocol extensions..."
+msgstr "Установить расширения протокола..."
+
+msgid "Installed packages"
+msgstr "Установленные пакеты"
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid "Interface Configuration"
+msgstr "Конфигурация интерфейса"
+
+msgid "Interface Overview"
+msgstr "Обзор интерфейса"
+
+msgid "Interface is reconnecting..."
+msgstr "Интерфейс переподключается..."
+
+msgid "Interface is shutting down..."
+msgstr "Интерфейс отключается..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Интерфейс не существует или пока не подключен."
+
+msgid "Interface reconnected"
+msgstr "Интерфейс переподключен"
+
+msgid "Interface shut down"
+msgstr "Интерфейс отключен"
+
+msgid "Interfaces"
+msgstr "Интерфейсы"
+
+msgid "Internal Server Error"
+msgstr "Внутренняя ошибка сервера"
+
+msgid "Invalid"
+msgstr "Введённое значение не верно"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+"Указан неверный VLAN ID! Доступны только идентификаторы в диапазоне от %d до "
+"%d."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "Указан неверный VLAN ID! Доступны только уникальные ID"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Неверный логин и/или пароль! Пожалуйста попробуйте снова."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Вы пытаетесь обновить прошивку файлом, который не помещается в память "
+"устройства! Пожалуйста, проверьте файл образа."
+
+msgid "Java Script required!"
+msgstr "Требуется Java Script!"
+
+msgid "Join Network"
+msgstr "Подключение к сети"
+
+msgid "Join Network: Settings"
+msgstr "Подключение к сети: настройки"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Подключение к сети: сканирование"
+
+msgid "Keep settings"
+msgstr "Сохранить настройки"
+
+msgid "Kernel Log"
+msgstr "Журнал ядра"
+
+msgid "Kernel Version"
+msgstr "Версия ядра"
+
+msgid "Key"
+msgstr "Ключ"
+
+msgid "Key #%d"
+msgstr "Ключ №%d"
+
+msgid "Kill"
+msgstr "Принудительно завершить"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP-сервер"
+
+msgid "LCP echo failure threshold"
+msgstr "Порог ошибок эхо-запросов LCP"
+
+msgid "LCP echo interval"
+msgstr "Интервал эхо-запросов LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Метка"
+
+msgid "Language"
+msgstr "Язык"
+
+msgid "Language and Style"
+msgstr "Язык и тема"
+
+msgid "Lease validity time"
+msgstr "Срок действия аренды"
+
+msgid "Leasefile"
+msgstr "Файл аренд"
+
+msgid "Leasetime"
+msgstr "Время аренды"
+
+msgid "Leasetime remaining"
+msgstr "Оставшееся время аренды"
+
+msgid "Leave empty to autodetect"
+msgstr "Оставьте поле пустым для автоопределения"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Оставьте пустым для использования текущего адреса WAN"
+
+msgid "Legend:"
+msgstr "Легенда:"
+
+msgid "Limit"
+msgstr "Предел"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Подключение"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Список <abbr title=\"Domain Name System\">DNS</abbr>-серверов для "
+"перенаправления запросов"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Список доменов, для которых разрешены ответы RFC1918"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Список хостов, поставляющих поддельные результаты домена NX"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr "Слушать только на данном интерфейсе или, если не определено, на всех"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Порт для входящих DNS-запросов"
+
+msgid "Load"
+msgstr "Загрузка"
+
+msgid "Load Average"
+msgstr "Средняя загрузка"
+
+msgid "Loading"
+msgstr "Загрузка"
+
+msgid "Local IPv4 address"
+msgstr "Локальный IPv4-адрес"
+
+msgid "Local IPv6 address"
+msgstr "Локальный IPv6-адрес"
+
+msgid "Local Startup"
+msgstr "Локальная загрузка"
+
+msgid "Local Time"
+msgstr "Местное время"
+
+msgid "Local domain"
+msgstr "Локальный домен"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Определение локального домена. Имена в этом домене никогда не запрашиваются "
+"у DNS-сервера, а разрешаются на основе данных DHCP и файлов hosts"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Суффикс локального домена, который будет добавлен к DHCP-именам и записям из "
+"файлов hosts"
+
+msgid "Local server"
+msgstr "Локальный сервер"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Локализировать имя хоста в зависимости от запрашиваемой подсети, если "
+"доступно несколько IP-адресов."
+
+msgid "Localise queries"
+msgstr "Локализовывать запросы"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Привязка к каналу %d, используемому %s"
+
+msgid "Log output level"
+msgstr "Уровень вывода"
+
+msgid "Log queries"
+msgstr "Записывать запросы в журнал"
+
+msgid "Logging"
+msgstr "Журналирование"
+
+msgid "Login"
+msgstr "Войти"
+
+msgid "Logout"
+msgstr "Выйти"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "Минимальный адрес аренды."
+
+msgid "MAC-Address"
+msgstr "MAC-адрес"
+
+msgid "MAC-Address Filter"
+msgstr "Фильтр MAC-адресов"
+
+msgid "MAC-Filter"
+msgstr "MAC-фильтр"
+
+msgid "MAC-List"
+msgstr "Список MAC"
+
+msgid "MB/s"
+msgstr "МБ/с"
+
+msgid "MHz"
+msgstr "МГц"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Максимальная скорость"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Максимальное количество активных арендованных DHCP-адресов"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Максимально допустимое количество одновременных DNS-запросов"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Максимально допустимый размер UDP пакетов-EDNS.0"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Максимальное время ожидания готовности модема (секунды)"
+
+msgid "Maximum hold time"
+msgstr "Максимальное время удержания"
+
+msgid "Maximum number of leased addresses."
+msgstr "Максимальное количество арендованных адресов."
+
+msgid "Mbit/s"
+msgstr "Мбит/с"
+
+msgid "Memory"
+msgstr "Память"
+
+msgid "Memory usage (%)"
+msgstr "Использование памяти (%)"
+
+msgid "Metric"
+msgstr "Метрика"
+
+msgid "Minimum Rate"
+msgstr "Минимальная скорость"
+
+msgid "Minimum hold time"
+msgstr "Минимальное время удержания"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Отсутствует расширение протокола %q"
+
+msgid "Mode"
+msgstr "Режим"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Модем"
+
+msgid "Modem init timeout"
+msgstr "Таймаут инициализации модема"
+
+# 802.11 monitor mode
+msgid "Monitor"
+msgstr "Монитор"
+
+msgid "Mount Entry"
+msgstr "Точка монтирования"
+
+msgid "Mount Point"
+msgstr "Точка монтирования"
+
+msgid "Mount Points"
+msgstr "Точки монтирования"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Точки монтирования - Запись"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Точки монтирования - Запись подкачки"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Точки монтирования определяют, куда в файловой системе будет прикреплено "
+"запоминающее устройство"
+
+msgid "Mount options"
+msgstr "Опции монтирования"
+
+msgid "Mount point"
+msgstr "Точка монтирования"
+
+msgid "Mounted file systems"
+msgstr "Смонтированные файловые системы"
+
+msgid "Move down"
+msgstr "Переместить вниз"
+
+msgid "Move up"
+msgstr "Переместить вверх"
+
+msgid "Multicast Rate"
+msgstr "Скорость групповой передачи"
+
+msgid "Multicast address"
+msgstr "Адрес групповой передачи"
+
+msgid "NAS ID"
+msgstr "Идентификатор NAS"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Список NTP-серверов"
+
+msgid "Name"
+msgstr "Имя"
+
+msgid "Name of the new interface"
+msgstr "Имя нового интерфейса"
+
+msgid "Name of the new network"
+msgstr "Имя новой сети"
+
+msgid "Navigation"
+msgstr "Навигация"
+
+msgid "Netmask"
+msgstr "Маска сети"
+
+msgid "Network"
+msgstr "Сеть"
+
+msgid "Network Utilities"
+msgstr "Сетевые утилиты"
+
+msgid "Network boot image"
+msgstr "Образ системы для сетевой загрузки"
+
+msgid "Network without interfaces."
+msgstr "Сеть без интерфейсов."
+
+msgid "Next »"
+msgstr "Следующий »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "DHCP-сервер не настроен для этого интерфейса"
+
+msgid "No chains in this table"
+msgstr "Нет цепочек в этой таблице"
+
+msgid "No files found"
+msgstr "Файлы не найдены"
+
+msgid "No information available"
+msgstr "Нет доступной информации"
+
+msgid "No negative cache"
+msgstr "Отключить кэш отрицательных ответов"
+
+msgid "No network configured on this device"
+msgstr "Не настроена сеть на устройстве"
+
+msgid "No network name specified"
+msgstr "Не задано имя сети"
+
+msgid "No package lists available"
+msgstr "Список пакетов не доступен"
+
+msgid "No password set!"
+msgstr "Пароль не установлен!"
+
+msgid "No rules in this chain"
+msgstr "Нет правил в данной цепочке"
+
+msgid "No zone assigned"
+msgstr "Зона не присвоена"
+
+msgid "Noise"
+msgstr "Шум"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Шум:"
+
+msgid "None"
+msgstr "Нет"
+
+msgid "Normal"
+msgstr "Нормально"
+
+msgid "Not Found"
+msgstr "Не найдено"
+
+msgid "Not associated"
+msgstr "Не связанный"
+
+msgid "Not connected"
+msgstr "Не подключено"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Примечание: конфигурационные файлы будут стёрты."
+
+msgid "Notice"
+msgstr "Заметка"
+
+msgid "Nslookup"
+msgstr "DNS-запрос"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Настройка OPKG"
+
+msgid "Off-State Delay"
+msgstr "Задержка выключенного состояния"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"На этой странице вы можете настроить сетевые интерфейсы. Вы можете "
+"объединить несколько интерфейсов в мост, выбрав опцию \"Объединить в мост\" "
+"и введя список интерфейсов, разделенных пробелами. Вы также можете "
+"использовать <abbr title=\"Виртуальные локальные сети\">VLAN</abbr>-"
+"обозначения вида <samp>ИНТЕРФЕЙС.НОМЕРVLAN</samp> (<abbr title=\"например"
+"\">напр.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Задержка включенного состояния"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Должен быть указан либо MAC-адрес, либо имя хоста!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Одно или несколько полей содержат недопустимые значения!"
+
+msgid "One or more required fields have no value!"
+msgstr "Одно или несколько обязательных полей не заполнены!"
+
+msgid "Open list..."
+msgstr "Открыть список..."
+
+msgid "Option changed"
+msgstr "Опция изменена"
+
+msgid "Option removed"
+msgstr "Опция удалена"
+
+msgid "Options"
+msgstr "Опции"
+
+msgid "Other:"
+msgstr "Другие:"
+
+msgid "Out"
+msgstr "Вне"
+
+msgid "Outbound:"
+msgstr "Исходящий:"
+
+msgid "Outdoor Channels"
+msgstr "Внешние каналы"
+
+msgid "Override MAC address"
+msgstr "Назначить MAC-адрес"
+
+msgid "Override MTU"
+msgstr "Назначить MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Назначить шлюз в ответах DHCP"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Переопределите сетевую маску, отправленную клиентам. Обычно это вычислено от "
+"подсети, которая подана."
+
+msgid "Override the table used for internal routes"
+msgstr "Назначить таблицу внутренних маршрутов"
+
+msgid "Overview"
+msgstr "Обзор"
+
+msgid "Owner"
+msgstr "Владелец"
+
+msgid "PAP/CHAP password"
+msgstr "Пароль PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Имя пользователя PAP/CHAP"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Инкапсуляция PPPoA"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPTP"
+
+msgid "Package libiwinfo required!"
+msgstr "Требуется пакет libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Список пакетов обновлялся более 24 часов назад"
+
+msgid "Package name"
+msgstr "Имя пакета"
+
+msgid "Packets"
+msgstr "Пакеты"
+
+msgid "Part of zone %q"
+msgstr "Часть зоны %q"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Password authentication"
+msgstr "Аутентификация с помощью пароля"
+
+msgid "Password of Private Key"
+msgstr "Пароль или закрытый ключ"
+
+msgid "Password successfully changed!"
+msgstr "Пароль успешно изменён!"
+
+msgid "Path to CA-Certificate"
+msgstr "Путь к центру сертификации"
+
+msgid "Path to Client-Certificate"
+msgstr "Путь к клиентскому сертификату"
+
+msgid "Path to Private Key"
+msgstr "Путь к личному ключу"
+
+msgid "Path to executable which handles the button event"
+msgstr "Путь к программе, обрабатывающей нажатие кнопки"
+
+msgid "Peak:"
+msgstr "Пиковая:"
+
+msgid "Perform reboot"
+msgstr "Выполнить перезагрузку"
+
+msgid "Perform reset"
+msgstr "Выполнить сброс"
+
+msgid "Phy Rate:"
+msgstr "Скорость:"
+
+msgid "Physical Settings"
+msgstr "Настройки канала"
+
+msgid "Ping"
+msgstr "Эхо-запрос"
+
+msgid "Pkts."
+msgstr "Пакетов."
+
+msgid "Please enter your username and password."
+msgstr "Пожалуйста, введите логин и пароль."
+
+msgid "Please wait: Device rebooting..."
+msgstr "Пожалуйста подождите: устройство перезагружается..."
+
+msgid "Policy"
+msgstr "Политика"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Port %d"
+msgstr "Порт %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Порт %d нетегирован в нескольких VLANах!"
+
+msgid "Port status:"
+msgstr "Состояние порта:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Предполагать, что узел недоступен после указанного количества ошибок "
+"получения эхо-пакета LCP, введите 0 для игнорирования ошибок"
+
+msgid "Prevents client-to-client communication"
+msgstr "Не позволяет клиентам обмениваться друг с другом информацией"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Беспроводной 802.11b контроллер Prism2/2.5/3"
+
+msgid "Proceed"
+msgstr "Продолжить"
+
+msgid "Processes"
+msgstr "Процессы"
+
+msgid "Prot."
+msgstr "Прот."
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Protocol family"
+msgstr "Семейство протоколов"
+
+msgid "Protocol of the new interface"
+msgstr "Протокол нового интерфейса"
+
+msgid "Protocol support is not installed"
+msgstr "Поддержка протокола не установлена"
+
+msgid "Provide NTP server"
+msgstr "Включить NTP-сервер"
+
+msgid "Provide new network"
+msgstr "Предоставлять новую сеть"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Псевдо Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Качество"
+
+msgid "RTS/CTS Threshold"
+msgstr "Порог RTS/CTS"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr "Скорость приёма"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "Беспроводной 802.11%s контроллер RaLink"
+
+msgid "Radius-Accounting-Port"
+msgstr "Порт Radius-Accounting"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Секрет Radius-Accounting"
+
+msgid "Radius-Accounting-Server"
+msgstr "Сервер Radius-Accounting"
+
+msgid "Radius-Authentication-Port"
+msgstr "Порт Radius-Authentication"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Секрет Radius-Authentication"
+
+msgid "Radius-Authentication-Server"
+msgstr "Сервер Radius-Authentication"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Читать <code>/etc/ethers</code> для настройки <abbr title=\"Протокол "
+"динамической конфигурации узла\">DHCP</abbr>-сервера"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Действительно удалить этот интерфейс? Удаление не может быть отменено!\\nВы "
+"можете потерять доступ к этому устройству, если вы подключены через этот "
+"интерфейс."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Действительно удалить эту беспроводную сеть? Удаление не может быть отменено!"
+"\\nВы можете потерять доступ к этому устройству, если вы подключены через "
+"эту сеть."
+
+msgid "Really reset all changes?"
+msgstr "Действительно сбросить все изменения?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Действительно выключить сеть?\\nВы можете потерять доступ к этому "
+"устройству, если вы подключены через этот интерфейс."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Действительно отключить интерфейс \"%s\" ?\\nВы можете потерять доступ к "
+"этому устройству, если вы подключены через этот интерфейс."
+
+msgid "Really switch protocol?"
+msgstr "Вы действительно хотите изменить протокол?"
+
+msgid "Realtime Connections"
+msgstr "Соединения в реальном времени"
+
+msgid "Realtime Graphs"
+msgstr "Графики в реальном времени"
+
+msgid "Realtime Load"
+msgstr "Загрузка в реальном времени"
+
+msgid "Realtime Traffic"
+msgstr "Трафик в реальном времени"
+
+msgid "Realtime Wireless"
+msgstr "Беспроводная сеть в реальном времени"
+
+msgid "Rebind protection"
+msgstr "Защита от DNS Rebinding"
+
+msgid "Reboot"
+msgstr "Перезагрузка"
+
+msgid "Rebooting..."
+msgstr "Перезагрузка..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Перезагрузить операционную систему вашего устройства"
+
+msgid "Receive"
+msgstr "Приём"
+
+msgid "Receiver Antenna"
+msgstr "Приёмная антенна"
+
+msgid "Reconnect this interface"
+msgstr "Переподключить этот интерфейс"
+
+msgid "Reconnecting interface"
+msgstr "Интерфейс переподключается"
+
+# References to firewall chains
+msgid "References"
+msgstr "Ссылки"
+
+msgid "Regulatory Domain"
+msgstr "Нормативная зона"
+
+msgid "Relay"
+msgstr "Ретранслятор"
+
+msgid "Relay Bridge"
+msgstr "Мост-ретранслятор"
+
+msgid "Relay between networks"
+msgstr "Ретранслятор между сетями"
+
+msgid "Relay bridge"
+msgstr "Мост-ретранслятор"
+
+msgid "Remote IPv4 address"
+msgstr "Удалённый IPv4-адрес"
+
+msgid "Remove"
+msgstr "Удалить"
+
+msgid "Repeat scan"
+msgstr "Повторить сканирование"
+
+msgid "Replace entry"
+msgstr "Заменить запись"
+
+msgid "Replace wireless configuration"
+msgstr "Заменить беспроводную конфигурацию"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Требуется для некоторых интернет-провайдеров"
+
+msgid "Reset"
+msgstr "Сбросить"
+
+msgid "Reset Counters"
+msgstr "Сбросить счётчики"
+
+msgid "Reset to defaults"
+msgstr "Сбросить на значения по умолчанию"
+
+msgid "Resolv and Hosts Files"
+msgstr "Файлы resolv и hosts"
+
+msgid "Resolve file"
+msgstr "Файл resolv"
+
+msgid "Restart"
+msgstr "Перезапустить"
+
+msgid "Restart Firewall"
+msgstr "Перезапустить межсетевой экран"
+
+msgid "Restore backup"
+msgstr "Восстановить резервную копию"
+
+msgid "Reveal/hide password"
+msgstr "Показать/скрыть пароль"
+
+msgid "Revert"
+msgstr "Вернуть"
+
+msgid "Root"
+msgstr "Корень"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Корневая директория для TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Пароль маршрутизатора"
+
+msgid "Routes"
+msgstr "Маршруты"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Маршрутизация служит для определения через какой интерфейс и шлюз можно "
+"достичть определённого хоста или сети."
+
+msgid "Rule #"
+msgstr "Правило №"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Проверять файловую систему перед монтированием устройства"
+
+msgid "Run filesystem check"
+msgstr "Проверять файловую систему"
+
+msgid "SSH Access"
+msgstr "Доступ по SSH"
+
+msgid "SSH-Keys"
+msgstr "SSH-ключи"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Сохранить"
+
+msgid "Save & Apply"
+msgstr "Сохранить и применить"
+
+msgid "Save &#38; Apply"
+msgstr "Сохранить и применить"
+
+msgid "Scan"
+msgstr "Сканировать"
+
+msgid "Scheduled Tasks"
+msgstr "Запланированные задания"
+
+msgid "Section added"
+msgstr "Секция добавлена"
+
+msgid "Section removed"
+msgstr "Секция удалена"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Для подробной информации обратитесь к справке по \"mount\" (man mount)"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Отправлять эхо-пакеты LCP с указанным интервалом (секунды), эффективно "
+"только в сочетании с порогом ошибок"
+
+msgid "Separate Clients"
+msgstr "Разделять клиентов"
+
+msgid "Separate WDS"
+msgstr "Отдельный WDS"
+
+msgid "Server Settings"
+msgstr "Настройки сервера"
+
+msgid "Service Name"
+msgstr "Имя службы"
+
+msgid "Service Type"
+msgstr "Тип службы"
+
+msgid "Services"
+msgstr "Сервисы"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Настроить синхронизацию времени"
+
+msgid "Setup DHCP Server"
+msgstr "Настроить сервер DHCP"
+
+msgid "Show current backup file list"
+msgstr "Показать текущий список файлов резервной копии"
+
+msgid "Shutdown this interface"
+msgstr "Выключить этот интерфейс"
+
+msgid "Shutdown this network"
+msgstr "Выключить эту сеть"
+
+msgid "Signal"
+msgstr "Сигнал"
+
+msgid "Signal:"
+msgstr "Сигнал:"
+
+msgid "Size"
+msgstr "Размер"
+
+msgid "Skip"
+msgstr "Пропустить"
+
+msgid "Skip to content"
+msgstr "Перейти к содержимому"
+
+msgid "Skip to navigation"
+msgstr "Перейти к навигации"
+
+msgid "Slot time"
+msgstr "Время слота"
+
+msgid "Software"
+msgstr "Программное обеспечение"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Некоторые значения полей недопустимы, невозможно сохранить информацию!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "Извините, запрошенный объект не был найден."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "Извините, сервер столкнулся с неожиданной ошибкой."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"К сожалению, автоматическое обновление не поддерживается, новая прошивка "
+"должна быть установлена вручную. Обратитесь к вики libreCMC для получения "
+"конкретных инструкций для вашего устройства."
+
+msgid "Sort"
+msgstr "Сортировка"
+
+msgid "Source"
+msgstr "Источник"
+
+msgid "Specifies the button state to handle"
+msgstr "Состояние кнопки, которое необходимо обработать"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Директория, к которой присоединено устройство"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Порт данного процесса <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Максимальное количество неудачных запросов ARP, после которого узлы "
+"считаются отключенными"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Максимальное количество секунд, после которого узлы считаются отключенными"
+
+msgid "Specify the secret encryption key here."
+msgstr "Укажите закрытый ключ."
+
+msgid "Start"
+msgstr "Запустить"
+
+msgid "Start priority"
+msgstr "Приоритет"
+
+msgid "Startup"
+msgstr "Загрузка"
+
+msgid "Static IPv4 Routes"
+msgstr "Статические маршруты IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Статические маршруты IPv6"
+
+msgid "Static Leases"
+msgstr "Постоянные аренды"
+
+msgid "Static Routes"
+msgstr "Статические маршруты"
+
+msgid "Static WDS"
+msgstr "Статический WDS"
+
+msgid "Static address"
+msgstr "Статический адрес"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Постоянная аренда используется для присвоения фиксированных IP-адресов и "
+"имён DHCP-клиентам. Постоянная аренда также необходима для статических "
+"интерфейсов, в которых обслуживаются только клиенты с присвоенными адресами."
+
+msgid "Status"
+msgstr "Статус"
+
+msgid "Stop"
+msgstr "Остановить"
+
+msgid "Strict order"
+msgstr "Строгий порядок"
+
+msgid "Submit"
+msgstr "Применить"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Раздел подкачки"
+
+msgid "Switch"
+msgstr "Коммутатор"
+
+msgid "Switch %q"
+msgstr "Коммутатор %q"
+
+msgid "Switch %q (%s)"
+msgstr "Коммутатор %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Изменить протокол"
+
+msgid "Sync with browser"
+msgstr "Синхронизировать с браузером"
+
+msgid "Synchronizing..."
+msgstr "Синхронизация..."
+
+msgid "System"
+msgstr "Система"
+
+msgid "System Log"
+msgstr "Системный журнал"
+
+msgid "System Properties"
+msgstr "Свойства системы"
+
+msgid "System log buffer size"
+msgstr "Размер системного журнала"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Настройки TFTP"
+
+msgid "TFTP server root"
+msgstr "Корень TFTP-сервера"
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr "Скорость передачи"
+
+msgid "Table"
+msgstr "Таблица"
+
+msgid "Target"
+msgstr "Цель"
+
+msgid "Terminate"
+msgstr "Завершить"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"Раздел <em>Конфигурация устройства</em> содержит физические настройки "
+"беспроводного оборудования, такие как канал, мощность передатчика или выбор "
+"антенны, которые являются общими для всех определённых беспроводных сетей "
+"(если оборудование поддерживает несколько SSID). Настройки отдельных сетей, "
+"такие как шифрование или режим работы, сгруппированы в разделе "
+"<em>Конфигурация интерфейса</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Пакет <em>libiwinfo-lua</em> не установлен. Для включения настроек "
+"беспроводных сетей, вам необходимо установить этот компонент!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"Назначенный провайдеру префикс IPv6, обычно заканчивается на <code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Допустимые символы: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> и "
+"<code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"Устройство или раздел (<abbr title=\"например\">напр.</abbr> <code>/dev/"
+"sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Формат файловой системы (<abbr title=\"например\">напр.</abbr> <samp><abbr "
+"title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Образ загружен. Пожалуйста, сравните размер файла и контрольную сумму, чтобы "
+"удостовериться в целостности данных.<br /> Нажмите \"Продолжить\", чтобы "
+"начать процедуру обновления прошивки."
+
+msgid "The following changes have been committed"
+msgstr "Данные изменения были применены"
+
+msgid "The following changes have been reverted"
+msgstr "Данные изменения были отвергнуты"
+
+msgid "The following rules are currently active on this system."
+msgstr "На данном устройстве активны следующие правила."
+
+msgid "The given network name is not unique"
+msgstr "Заданное имя сети не является уникальным"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Оборудование не поддерживает несколько SSID, и, если вы продолжите, "
+"существующая конфигурация будет заменена."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+"Длина префикса IPv4 в битах, оставшееся будет использоваться в IPv6-адресах."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Длина префикса IPv6 в битах"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Сетевые порты этого устройства могут быть объединены в несколько <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>ов, в которых компьютеры могут "
+"связываться напрямую между собой. <abbr title=\"Virtual Local Area Network"
+"\">VLAN</abbr>ы часто используются для разделения нескольких сетевых "
+"сегментов. Обычно по умолчанию используется один восходящий порт для "
+"подключения к высшей рангом сети, например к интернету или к другим портам "
+"локальной сети."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Для выбранного протокола необходимо задать устройство"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"Идёт удаление раздела конфигурации с последующей перезагрузкой сиситемы."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Система обновляется.<br /> НЕ ОТКЛЮЧАЙТЕ ПИТАНИЕ УСТРОЙСТВА!<br /> Подождите "
+"несколько минут перед тем, как попытаетесь заново соединиться. В зависимости "
+"от ваших настроек, возможно вам понадобится обновить адрес вашего "
+"компьютера, чтобы снова получить доступ к устройству."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Загруженный файл образа не поддерживается. Пожалуйста, проверьте, что вы "
+"загрузили правильный образ для вашей платформы."
+
+msgid "There are no active leases."
+msgstr "Нет активных арендованных адресов."
+
+msgid "There are no pending changes to apply!"
+msgstr "Нет изменений, которые можно применить!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Нет изменений, которые можно отменить!"
+
+msgid "There are no pending changes!"
+msgstr "Нет изменений, которые можно применить!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Устройство не назначено. Пожалуйста, назначьте сетевое устройство во вкладке "
+"\"Настройки канала\""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Пароль пользователя root не установлен. Пожалуйста, установите пароль, чтобы "
+"защитить веб-интерфейс и включить SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "IPv4-адрес ретранслятора"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Это список шаблонов для соответствия файлов и директорий для сохранения при "
+"использовании sysupgrade. Изменённые файлы в /etc/config и некоторые другие "
+"конфигурации автоматически сохраняются."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Это содержимое /etc/rc.local. Вы можете добавить свои команды (перед 'exit "
+"0'), чтобы выполнить их в конце загрузки."
+
+# Maybe it usually ends with ::2?
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Это локальный адрес, назначенный туннельным брокером, обычно заканчивается "
+"на <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Это единственный <abbr title=\"Протокол динамической конфигурации узла"
+"\">DHCP</abbr>-сервер в локальной сети"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Это таблица cron (crontab), в которой вы можете определить запланированные "
+"задания."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr "Это адрес ближайшей точки присутствия туннельного брокера"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr "Данный список содержит работающие процессы и их статус."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "Данная страница позволяет настроить обработку кнопок"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Данная страница содержит обзор всех активных на данный момент сетевых "
+"соединений."
+
+msgid "This section contains no values yet"
+msgstr "Эта секция пока не содержит значений"
+
+msgid "Time Synchronization"
+msgstr "Синхронизация времени"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Синхронизация времени ещё не настроена."
+
+msgid "Timezone"
+msgstr "Часовой пояс"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Чтобы восстановить файлы конфигурации, вы можете загрузить ранее созданный "
+"архив здесь."
+
+msgid "Total Available"
+msgstr "Всего доступно"
+
+msgid "Traceroute"
+msgstr "Трассировка"
+
+msgid "Traffic"
+msgstr "Трафик"
+
+msgid "Transfer"
+msgstr "Передача"
+
+msgid "Transmission Rate"
+msgstr "Скорость передачи"
+
+msgid "Transmit"
+msgstr "Передача"
+
+msgid "Transmit Power"
+msgstr "Мощность передатчика"
+
+msgid "Transmitter Antenna"
+msgstr "Передающая антенна"
+
+msgid "Trigger"
+msgstr "Триггер"
+
+msgid "Trigger Mode"
+msgstr "Режим срабатывания"
+
+msgid "Tunnel ID"
+msgstr "Идентификатор туннеля"
+
+msgid "Tunnel Interface"
+msgstr "Интерфейс туннеля"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Турбо-режим"
+
+msgid "Tx-Power"
+msgstr "Мощность передатчика"
+
+msgid "Type"
+msgstr "Тип"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Только UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB-устройство"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Невозможно обработать запрос для"
+
+msgid "Unknown"
+msgstr "Неизвестно"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Неизвестная ошибка, пароль не был изменен!"
+
+msgid "Unmanaged"
+msgstr "Неуправляемый"
+
+msgid "Unsaved Changes"
+msgstr "Непринятые изменения"
+
+msgid "Unsupported protocol type."
+msgstr "Неподдерживаемый тип протокола."
+
+msgid "Update lists"
+msgstr "Обновить списки"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Загрузите sysupgrade-совместимый образ, чтобы заменить текущую прошивку. "
+"Установите флажок \"Сохранить настройки\", чтобы сохранить текущую "
+"конфигурацию (требуется совместимый с libreCMC образ прошивки)."
+
+msgid "Upload archive..."
+msgstr "Загрузить архив..."
+
+msgid "Uploaded File"
+msgstr "Загруженный файл"
+
+msgid "Uptime"
+msgstr "Время работы"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Использовать <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Использовать шлюз DHCP"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Использовать объявляемые узлом DNS-серверы"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Использовать коды стран ISO/IEC 3166 alpha2."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Использовать MTU на интерфейсе туннеля"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Использовать TTL на интерфейсе туннеля"
+
+msgid "Use as root filesystem"
+msgstr "Использовать в качестве корневой файловой системы"
+
+msgid "Use broadcast flag"
+msgstr "Использовать широковещательный флаг"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Использовать собственные DNS-серверы"
+
+msgid "Use default gateway"
+msgstr "Использовать шлюз по умолчанию"
+
+msgid "Use gateway metric"
+msgstr "Использовать метрику шлюза"
+
+msgid "Use routing table"
+msgstr "Использовать таблицу маршрутизации"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Нажмите кнопку <em>Добавить</em>, чтобы добавить новую запись аренды. "
+"<em>MAC-адрес</em> идентифицирует хост, <em>IPv4-адрес</em> указывает "
+"фиксированный адрес, а <em>Имя хоста</em> присваивается в качестве "
+"символьного имени для запрашивающего хоста."
+
+msgid "Used"
+msgstr "Использовано"
+
+msgid "Used Key Slot"
+msgstr "Используемый слот ключа"
+
+msgid "Username"
+msgstr "Имя пользователя"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "Интерфейс VLAN"
+
+msgid "VLANs on %q"
+msgstr "VLANы на %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLANы на %q (%s)"
+
+msgid "VPN Server"
+msgstr "Сервер VPN"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+"Класс производителя (Vendor class), который отправлять при DHCP-запросах"
+
+msgid "Verify"
+msgstr "Проверить"
+
+msgid "Version"
+msgstr "Версия"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Открытая система WEP"
+
+msgid "WEP Shared Key"
+msgstr "Общий ключ WEP"
+
+msgid "WEP passphrase"
+msgstr "Пароль WEP"
+
+msgid "WMM Mode"
+msgstr "Режим WMM"
+
+msgid "WPA passphrase"
+msgstr "Пароль WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"Необходимо установить wpa_supplicant (режим клиента) или hostapd (режим "
+"точки доступа или ad-hoc) для поддержки шифрования WPA."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Ожидание применения изменений..."
+
+msgid "Waiting for command to complete..."
+msgstr "Ожидание завершения выполнения команды..."
+
+msgid "Warning"
+msgstr "Внимание"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+"Внимание: есть несохранённые изменения, которые потеряются после "
+"перезагрузки!"
+
+msgid "Wifi"
+msgstr "Wi-Fi"
+
+msgid "Wireless"
+msgstr "Wi-Fi"
+
+msgid "Wireless Adapter"
+msgstr "Беспроводной адаптер"
+
+msgid "Wireless Network"
+msgstr "Беспроводная сеть"
+
+msgid "Wireless Overview"
+msgstr "Обзор беспроводных сетей"
+
+msgid "Wireless Security"
+msgstr "Безопасность беспроводной сети"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Беспроводная сеть отключена или не связана "
+
+msgid "Wireless is restarting..."
+msgstr "Беспроводная сеть перезапускается..."
+
+msgid "Wireless network is disabled"
+msgstr "Беспроводная сеть отключена"
+
+msgid "Wireless network is enabled"
+msgstr "Беспроводная сеть включена"
+
+msgid "Wireless restarted"
+msgstr "Беспроводная сеть перезапущена"
+
+msgid "Wireless shut down"
+msgstr "Выключение беспроводной сети"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Записывать полученные DNS-запросы в системный журнал"
+
+msgid "XR Support"
+msgstr "Поддержка XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Здесь вы можете включить или выключить установленные скрипты инициализации. "
+"Изменения вступят в силу после перезагрузки устройства.<br /"
+"><strong>Внимание: если вы выключите один из основных скриптов инициализации "
+"(например \"network\"), ваше устройство может оказаться недоступным!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Вам необходимо включить Java Script в вашем браузере для корректной работы "
+"LuCI."
+
+msgid "any"
+msgstr "любой"
+
+msgid "auto"
+msgstr "авто"
+
+#, fuzzy
+msgid "automatic"
+msgstr "статический"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "соед. мостом"
+
+msgid "create:"
+msgstr "создать:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "создаёт мост для выбранных сетевых интерфейсов"
+
+msgid "dB"
+msgstr "дБ"
+
+msgid "dBm"
+msgstr "дБм"
+
+msgid "disable"
+msgstr "выключено"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "истекло"
+
+# убил бы
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"файл, где хранятся арендованные <abbr title=\"Протокол динамической "
+"конфигурации узла\">DHCP</abbr>-адреса"
+
+msgid "forward"
+msgstr "перенаправить"
+
+msgid "full-duplex"
+msgstr "полный дуплекс"
+
+msgid "half-duplex"
+msgstr "полудуплекс"
+
+msgid "help"
+msgstr "помощь"
+
+msgid "hidden"
+msgstr "скрытый"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "если сеть"
+
+msgid "input"
+msgstr "ввод"
+
+msgid "kB"
+msgstr "кБ"
+
+msgid "kB/s"
+msgstr "кБ/с"
+
+msgid "kbit/s"
+msgstr "кбит/с"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "локальный <abbr title=\"Служба доменных имён\">DNS</abbr>-файл"
+
+msgid "no"
+msgstr "нет"
+
+msgid "no link"
+msgstr "нет соединения"
+
+msgid "none"
+msgstr "ничего"
+
+msgid "off"
+msgstr "выключено"
+
+msgid "on"
+msgstr "включено"
+
+msgid "open"
+msgstr "открытая"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "маршрутизируемый"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "с тегом"
+
+msgid "unknown"
+msgstr "неизвестный"
+
+msgid "unlimited"
+msgstr "неограниченный"
+
+msgid "unspecified"
+msgstr "не определено"
+
+msgid "unspecified -or- create:"
+msgstr "не определено -или- создать:"
+
+msgid "untagged"
+msgstr "без тега"
+
+msgid "yes"
+msgstr "да"
+
+msgid "« Back"
+msgstr "« Назад"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "Идентификатор пользователя HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Это 32-байтный шестнадцатиричный идентификатор пользователя, не имя входа"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "Второй 40МГц канал сверху"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "Второй 40МГц канал снизу"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Принимать извещения маршрутизатора"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Извещать об IPv6 в сети"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Идентификатор сети"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Допустимый диапазон от 1 до 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "Возможности HT"
+
+#~ msgid "HT mode"
+#~ msgstr "Режим HT"
+
+#~ msgid "Router Model"
+#~ msgstr "Модель маршрутизатора"
+
+#~ msgid "Router Name"
+#~ msgstr "Название маршрутизатора"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Отправлять извещения маршрутизатора"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "Анонсируемое предпочитаемое время жизни префикса (сек.)"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Анонсируемое действительное время жизни префикса (сек.)"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Использовать предпочитаемое время жизни"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Использовать действительное время жизни"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Ожидание маршрутизатора..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Включить встроенный NTP-сервер"
+
+#~ msgid "Active Leases"
+#~ msgstr "Активные аренды"
+
+#~ msgid "Open"
+#~ msgstr "Открыть"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Скорость передачи в битах"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Конфигурация / Применить"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Конфигурация / Изменения"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Конфигурация / Обратить изменения"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "MAC Адрес"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Зашифрованно\">Шифрование</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr ""
+#~ "<abbr title=\"Беспроводная локальная сеть\">WLAN</abbr>-Сканирование"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Укажите сеть, которую вы хотите прикрепить к этому беспроводному "
+#~ "интерфейсу. Выберите <em>не определено</em> чтобы не прикреплять сеть или "
+#~ "заполните поле <em>создать</em> чтобы определить новую сеть."
+
+#~ msgid "Create Network"
+#~ msgstr "Создать сеть"
+
+#~ msgid "Link"
+#~ msgstr "Соединение"
+
+#~ msgid "Networks"
+#~ msgstr "Сети"
+
+#~ msgid "Power"
+#~ msgstr "Мощность"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Обзор существующих Wi-Fi сетей"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Беcклассовая адресация\">CIDR</abbr>-Обозначение: адрес/"
+#~ "префикс"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Служба Доменных Имён\">DNS</abbr>-Сервер"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr ""
+#~ "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-Широковещательный"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-Адрес"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "IP псевдонимы"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Установки IPv6"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Заметка: Если здесь вы выберете интерфейс, который является частью другой "
+#~ "сети, то он будет перемещен в эту сеть."
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Вы действительно хотите удалить этот интерфейс? Удаление невозможно "
+#~ "отменить!\\nВы можете потерять доступ к этому маршрутизатору, если ваш "
+#~ "компьютер подключен через этот интерфейс."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Вы действительно хотите удалить эту беспроводную сеть? Удаление "
+#~ "невозможно отменить!\\nВы можете потерять доступ к этому маршрутизатору, "
+#~ "если ваш компьютер подключен через этот интерфейс."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Вы действительно хотите выключить интерфейс \"%s\" ?\\nВы можете потерять "
+#~ "доступ к этому маршрутизатору, если ваш компьютер подключен через этот "
+#~ "интерфейс."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Вы действительно хотите выключить сеть?\\nВы можете поторять соединения с "
+#~ "данным маршрутизатором при использовании этого интерфейса."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Сетевые порты на вашем маршрутизаторе могут быть объединены в несколько "
+#~ "<abbr title=\"Виртуальные локальные сети\">VLAN</abbr>&#32;ов, в которых "
+#~ "компьютеры могут напрямую общаться друг с другом. <abbr title="
+#~ "\"Виртуальные локальные сети\">VLAN</abbr>&#32;ы часто используются для "
+#~ "разделения сети на разные сегменты. Обычно один исходящий порт "
+#~ "используется для соединения с другой сетью, такой например, как интернет, "
+#~ "а остальные порты используются для локальной сети."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Включить буферизацию"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6 через IPv4"
+
+#~ msgid "Custom Files"
+#~ msgstr "Пользовательские файлы"
+
+#~ msgid "Custom files"
+#~ msgstr "Пользовательские файлы"
+
+#~ msgid "Detected Files"
+#~ msgstr "Найденные файлы"
+
+#~ msgid "Detected files"
+#~ msgstr "Найденные файлы"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Файлы которые необходимо сохранить при обновлении прошивки"
+
+#~ msgid "General"
+#~ msgstr "Основные"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Здесь вы можете изменить настройки и функциональность <abbr title=\"Lua "
+#~ "Конфигурационный Интерфейс\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Запуск команд"
+
+#~ msgid ""
+#~ "The following files are detected by the system and will be kept "
+#~ "automatically during sysupgrade"
+#~ msgstr ""
+#~ "Эти файлы были найдены системой и будут автоматически сохранены во время "
+#~ "обновления прошивки"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Эти команды будут запущенны автоматически когда данная <abbr title="
+#~ "\"Единый Конфигурационный Интерфейс\">UCI</abbr> конфигурация добавлена и "
+#~ "изменения будут приняты."
+
+#~ msgid ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+#~ msgstr ""
+#~ "Это список дополнительных файлов и директорий (допустимо использование "
+#~ "регулярных выражений) которые будут сохранены во время обновления прошивки"
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"Интерфейс пользователя\">UI</abbr>"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "<abbr title=\"Туннельный протокол типа точка-точка\">PPTP</abbr>-Сервер"
+
+#~ msgid "AHCP Settings"
+#~ msgstr "AHCP Настройки"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "Количество ARP попыток"
+
+#~ msgid "ATM Settings"
+#~ msgstr "Настройки ATM"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Точка доступа (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Дополнительные настройки pppd"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "Разрешен диапазон от 1 до FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Автоматическое разъединение"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Резервная копия"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Настроить локальный DNS сервер таким образом, чтобы он использовал DNS "
+#~ "серверы полученные от PPP пира"
+
+#~ msgid "Connect script"
+#~ msgstr "Скрипт подключения"
+
+#~ msgid "Create backup"
+#~ msgstr "Создать резервную копию"
+
+#~ msgid "Default"
+#~ msgstr "По умолчанию"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Скрипт разъединения"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Изменить список пакетов и путей установки"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "Включить 4K VLANы"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Активировать IPv6 в PPP соединении"
+
+#~ msgid "Firmware image"
+#~ msgstr "Прошивка"
+
+#~ msgid "Forward DHCP"
+#~ msgstr "Перенаправлять DHCP"
+
+#~ msgid "Forward broadcasts"
+#~ msgstr "Перенаправлять широковещательные сообщения"
+
+#~ msgid "HE.net Tunnel ID"
+#~ msgstr "ID Туннеля HE.net"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Здесь вы можете сделать резервную копию и восстановить конфигурацию "
+#~ "вашего маршрутизатора, если это возможно, или установить настройки по "
+#~ "умолчанию."
+
+#~ msgid "Installation targets"
+#~ msgstr "Путь установки"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Сохранить конфигурационные файлы"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Keep-Alive"
+
+#~ msgid "Kernel"
+#~ msgstr "Ядро"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Позволить pppd после успешного соединения изменить маршрут по умолчанию "
+#~ "для использования PPP интерфейса"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "Позволить pppd запустить скрипт после установления PPP соединения"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Позволить pppd запустить скрипт до установления PPP соединения"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Удостоверьтесь, что вы ввели корректный пин код, иначе вы можете "
+#~ "заблокировать вашу сим карту!"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "Большинство из них сетевые серверы, которые выполняют определённые задачи "
+#~ "для ваших устройств или сетей наподобие shell-доступа, web-страниц таких "
+#~ "как <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, выполняют "
+#~ "mesh-маршрутизацию, отправляют письма , ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr ""
+#~ "Количество неудачных соединений для инициализации переподсоединения к "
+#~ "серверу"
+
+#~ msgid "Override Gateway"
+#~ msgstr "Переопределение шлюза"
+
+#~ msgid "PIN code"
+#~ msgstr "PIN код"
+
+#~ msgid "PPP Settings"
+#~ msgstr "Настройки PPP"
+
+#~ msgid "Package lists"
+#~ msgstr "Список пакетов"
+
+#~ msgid "Port PVIDs on %q"
+#~ msgstr "PVIDы порта на %q"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr ""
+#~ "Перейти к возврашению всех настроек и установить настройки по умолчанию?"
+
+#~ msgid "Processor"
+#~ msgstr "Процессор"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radius-Порт"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radius-Сервер"
+
+#~ msgid "Replace default route"
+#~ msgstr "Заменить маршрут по умолчанию"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Сбросить маршрутизатор к настройкам по умолчанию"
+
+#~ msgid "Routing table ID"
+#~ msgstr "ID таблицы маршрутизации"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr "Таймаут в секундах перед попыткой соединения"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "IPv4-Адрес сервера"
+
+#~ msgid "Service type"
+#~ msgstr "Тип службы"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "Сервисы и демоны выполняют определённые задачи на вашем устройстве."
+
+#~ msgid "Settings"
+#~ msgstr "Настройки"
+
+#~ msgid "Setup wait time"
+#~ msgstr "Установить время ожидания"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Извините. libreCMC не поддерживает обновление прошивки на данном "
+#~ "устройстве.<br /> Вам необходимо вручную обновить прошивку."
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Укажите дополнительные аргументы pppd"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Файл устройства вашего модема, например /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr ""
+#~ "Время (в сек.) после которого неиспользованное соединение будет закрыто"
+
+#~ msgid "Time Server (rdate)"
+#~ msgstr "Серверы синхронизации времени (rdate)"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "Настройки туннелирования"
+
+#~ msgid "Update package lists"
+#~ msgstr "Обновить список пакетов"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Загрузите образ libreCMC чтобы обновить прошивку устройства."
+
+#~ msgid "Upload image"
+#~ msgstr "Загрузить образ"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Использовать DNS пиров"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid ""
+#~ "You can specify multiple DNS servers here, press enter to add a new "
+#~ "entry. Servers entered here will override automatically assigned ones."
+#~ msgstr ""
+#~ "Вы можете указать несколько DNS серверов, нажмите Enter чтобы добавить "
+#~ "новую запись. Введенные серверы переопределят адреса, назначенные "
+#~ "автоматически."
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Вам необходимо установить \"comgt\" для поддержки UMTS/GPRS, \"ppp-mod-"
+#~ "pppoe\" для PPPoE, \"ppp-mod-pppoa\" для PPPoA и \"pptp\" для PPtP"
+
+#~ msgid "back"
+#~ msgstr "назад"
+
+#~ msgid "buffered"
+#~ msgstr "буфферизовано"
+
+#~ msgid "cached"
+#~ msgstr "кэшировано"
+
+#~ msgid "free"
+#~ msgstr "свободно"
+
+#~ msgid "static"
+#~ msgstr "статический"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> это свободное "
+#~ "Lua програмное обеспечение включая <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Вебфреймворк и веб интерфейс встраиваемый в устройства. "
+#~ "<abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> "
+#~ "распространяется под лицензией Apache-License."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Ключи"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Простой HTTP/1.1 веб-сервер для LuCI, реализованный на \"Си\" и \"Lua\""
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Маленький веб-сервер, служащий для предоставления <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "О программе"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "Активные IP соединения"
+
+#~ msgid "Addresses"
+#~ msgstr "Адреса"
+
+#~ msgid "Admin Password"
+#~ msgstr "Пароль администратора"
+
+#~ msgid "Alias"
+#~ msgstr "Псевдоним"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Аутентификационная область"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Порт моста"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr ""
+#~ "Изменение пароля системного администратора (Пользователь <code>root</"
+#~ "code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Клиент + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Файл конфигурации"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Таймаут подключения"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Помогавшие в разработке"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "Присвоенный DHCP"
+
+#~ msgid "Document root"
+#~ msgstr "Корневая папка"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Включить Keep-Alive"
+
+#~ msgid "Enable device"
+#~ msgstr "Включить устройство"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Ethernet Мост"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "Здесь вы можете указать публичный <abbr title=\"Secure Shell\">SSH</abbr>-"
+#~ "Ключ (один на строку) для <abbr title=\"Secure Shell\">SSH</abbr> "
+#~ "публичной-ключевой аутентификации."
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "IP Конфигурация"
+
+#~ msgid "Interface Status"
+#~ msgstr "Статус интерфейса"
+
+#~ msgid "Lead Development"
+#~ msgstr "Ведущие разработчики"
+
+#~ msgid "No address configured on this interface."
+#~ msgstr "На этом интерфейсе не сконфигурирован адрес."
+
+#~ msgid "Not configured"
+#~ msgstr "Не настроенный"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Пароль успешно изменён"
+
+#~ msgid "Plugin path"
+#~ msgstr "Путь к плагину"
+
+#~ msgid "Ports"
+#~ msgstr "Порты"
+
+#~ msgid "Primary"
+#~ msgstr "Первичный"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Домашняя страница проекта"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Псевдо Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Благодаря"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr "Что будет показано при авторизации на защищённых страницах."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Неизвестная ошибка"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "по умолчанию <code>/etc/httpd.conf</code>"
+
+#~ msgid "Enable this switch"
+#~ msgstr "Включить этот сетевой коммутатор"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "Код ошибки OPKG %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Список пакетов обновлён"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "Сбросить коммутатор во время настройки"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Заменить установленные пакеты"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "А так же ядра или сервисов, системный журнал может быть так же просмотрен "
+#~ "здесь для того что бы получить полный обзор текущего состояния системы."
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Здесь вы можете найти информацию о текущей статистики системы вроде "
+#~ "частоты процессора, использования памяти или сетевого интерфейса."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> свободный, "
+#~ "гибкий и дружелюбный графический интерфейс для настройки libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "А теперь повеселитесь со своим роутером!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Так же мы всегда желаем улучшить этот интерфейс, мы всегда обратим "
+#~ "внимание на ваши вопросы и предложения."
+
+#~ msgid "Hello!"
+#~ msgstr "Добро пожаловать."
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Внимание: В <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> "
+#~ "изменения принимаются после нажатия  - Принять."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "С помощью этих страниц вы можете изменить основные настройки вашего "
+#~ "роутера."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "Команда <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr>"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Это зона управления <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</"
+#~ "abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Пользовательский интерфейс"
+
+#~ msgid "enable"
+#~ msgstr "включено"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr " (дополнительно)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "<abbr title=\"Служба доменных имён\">DNS</abbr>-Port"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "<abbr title=\"Служба доменных имён\">DNS</abbr>-Сервер будет обращаться к "
+#~ "resolvfile"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Протокол динамической "
+#~ "конфигурации узла\">DHCP</abbr>-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> paket size"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Расширенный механизм "
+#~ "службы доменных имён\">EDNS0</abbr> размер пакета"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "AP-Isolation"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Добавить Wifi сеть в физическую сеть"
+
+#~ msgid "Aliases"
+#~ msgstr "Ссылка"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#~ msgid "Devices"
+#~ msgstr "Устройства"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "не форвардить реверсные-днс запросы для локальной сети"
+
+#~ msgid "Errors"
+#~ msgstr "Ошибок"
+
+#~ msgid "Essentials"
+#~ msgstr "Essentials"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Expand Hosts"
+
+#~ msgid "First leased address"
+#~ msgstr "Первый арендованный адрес"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Адрес устройства"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Здесь вы можете настроить установленные Wi-Fi устройства."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Ignore <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Незаыисимая (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Интернет соединение"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Присоединиться (Client)"
+
+#~ msgid "Leases"
+#~ msgstr "Leases"
+
+#~ msgid "Local Domain"
+#~ msgstr "Локальный домен"
+
+#~ msgid "Local Network"
+#~ msgstr "Локальная сеть"
+
+#~ msgid "Local Server"
+#~ msgstr "Локальный сервер"
+
+#, fuzzy
+#~ msgid "Network Boot Image"
+#~ msgstr "<abbr title=\"Служба доменных имён\">DNS</abbr>-Port"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Название сети (<abbr title=\"Расширенный идентификатор сети\">ESSID</"
+#~ "abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Количество арендованных адресов"
+
+#~ msgid "Path"
+#~ msgstr "Путь"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Принять изменения"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Не позволяет клиентам обмениваться друг с другом информацией"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Обеспечивает (AP)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Resolvfile"
+
+#, fuzzy
+#~ msgid "TFTP-Server Root"
+#~ msgstr "<abbr title=\"Служба доменных имён\">DNS</abbr>-Port"
+
+#~ msgid "TX / RX"
+#~ msgstr "Перед. / Получ."
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Данные изменения были приняты"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "После перепрошивки <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</"
+#~ "abbr> эти файлы будут добавлены в обновлённую систему ."
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "С помощью <abbr title=\"Протокол динамической конфигурации узла\">DHCP</"
+#~ "abbr> члены сетей могут автоматически получить такие настройки как (<abbr "
+#~ "title=\"Интернет протокол\">IP</abbr>-Адрес, сетевую маску, <abbr title="
+#~ "\"Служба доменных имён\">DNS</abbr>-имя, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Вы можете настраивать различные wifi сети на одном устройстве. Помните "
+#~ "что есть определённые програмные и аппаратные ограничения. Нормально вы "
+#~ "можете использовать например 1 Ad-Hoc или до 3 Точек и симулированных 1 "
+#~ "Клиента."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr "Ошибок"
+
+#~ msgid "additional hostfile"
+#~ msgstr "дополнительный hostfile"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "Добавлять доменные имена в хосты"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "автоматически переподсоединятся"
+
+#~ msgid "concurrent queries"
+#~ msgstr "concurrent queries"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "отключить <abbr title=\"Протокол динамической конфигурации узла\">DHCP</"
+#~ "abbr> для данного интерфейса"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "отсоединиться когда простой для"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "Don&#39;t cache unknown"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "фильтровать ненужные <abbr title=\"Служба доменных имён\">DNS</abbr>-"
+#~ "запросы Windows-систем"
+
+#~ msgid "installed"
+#~ msgstr "установленные"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "локализировать имя хоста относящегося к данной подсети"
+
+#~ msgid "not installed"
+#~ msgstr "не установленно"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "Запрещать кешировать негативные <abbr title=\"Служба доменных имён\">DNS</"
+#~ "abbr>-ответы"
+
+#~ msgid "query port"
+#~ msgstr "порт запросов"
+
+#~ msgid "transmitted / received"
+#~ msgstr "передано / получено"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "Локальная сеть"
+
+#~ msgid "all"
+#~ msgstr "Все"
+
+#~ msgid "Code"
+#~ msgstr "Код"
+
+#~ msgid "Distance"
+#~ msgstr "Расстояние"
+
+#~ msgid "Legend"
+#~ msgstr "Надпись"
+
+#~ msgid "Library"
+#~ msgstr "Библиотека"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "смотрите &#39;%s&#39; руководство"
+
+#~ msgid "Package Manager"
+#~ msgstr "Менеджер пакетов"
+
+#~ msgid "Service"
+#~ msgstr "Сервис"
+
+#~ msgid "Statistics"
+#~ msgstr "Статистика"
+
+#~ msgid "zone"
+#~ msgstr "Зона"
diff --git a/trunk/package/luci/po/ru/commands.po b/trunk/package/luci/po/ru/commands.po
new file mode 100644
index 00000000..6197231c
--- /dev/null
+++ b/trunk/package/luci/po/ru/commands.po
@@ -0,0 +1,102 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-15 16:48+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "Короткое текстовое описание команды"
+
+msgid "Access command with"
+msgstr "Доступ к команде через"
+
+#, fuzzy
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+"Разрешить выполнение команды и загрузку ее вывода без предварительной "
+"аутентификации"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+"Разрешить пользователям использовать дополнительные аргументы командной "
+"строки"
+
+msgid "Arguments:"
+msgstr "Аргументы:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "Двоичные данные не отображаются, вместо этого - выгружаются"
+
+msgid "Code:"
+msgstr "Код:"
+
+msgid "Collecting data..."
+msgstr "Сбор данных..."
+
+msgid "Command"
+msgstr "Команда"
+
+msgid "Command failed"
+msgstr "Команда не выполнена"
+
+msgid "Command line to execute"
+msgstr "Командная строка для выполнения"
+
+msgid "Command successful"
+msgstr "Команда выполнена"
+
+msgid "Command:"
+msgstr "Команда:"
+
+msgid "Configure"
+msgstr "Настроить"
+
+msgid "Custom Commands"
+msgstr "Пользовательские команды"
+
+msgid "Custom arguments"
+msgstr "Пользовательские аргументы"
+
+msgid "Dashboard"
+msgstr "Информационная панель"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid "Download"
+msgstr "Скачать"
+
+msgid "Failed to execute command!"
+msgstr "Ошибка выполнения команды!"
+
+msgid "Link"
+msgstr "Ссылка"
+
+msgid "Loading"
+msgstr "Загрузка"
+
+msgid "Public access"
+msgstr "Публичный доступ"
+
+msgid "Run"
+msgstr "Запуск"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Эта страница предоставляет возможность настраивать пользовательские "
+"консольные команды, которые могут быть легко вызваны из веб-интерфейса"
+
+msgid "Waiting for command to complete..."
+msgstr "Ожидание завершения команды..."
diff --git a/trunk/package/luci/po/ru/coovachilli.po b/trunk/package/luci/po/ru/coovachilli.po
new file mode 100644
index 00000000..379ff7ea
--- /dev/null
+++ b/trunk/package/luci/po/ru/coovachilli.po
@@ -0,0 +1,560 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: coovachilli\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 11:29+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Конфигурация сети"
+
+msgid "RADIUS configuration"
+msgstr "Конфигурация RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Аутентификация с помощью UAM и MAC"
+
+#~ msgid "General configuration"
+#~ msgstr "Общие настройки"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Общие настройки CoovaChilli"
+
+#~ msgid "Command socket"
+#~ msgstr "Сокет команд"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "UNIX сокет для связи с chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Интервал обновления конфигурации"
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Считывание файла конфигурации и запуск DNS поиска раз в указанный "
+#~ "интервал. Достигается тот же эффект что и при отсылке HUP сигнала. "
+#~ "Значение интервала выражено в секундах. В случае указания нулевого "
+#~ "значения интервала, данная функция становится неактивной."
+
+#~ msgid "Pid file"
+#~ msgstr "Pid файл"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr "Имя файла, который будет содержать идентификатор процесса (PID)"
+
+#~ msgid "State directory"
+#~ msgstr "Директория состояния"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "TUN/TAP конфигурация"
+
+#~ msgid "Network down script"
+#~ msgstr "Скрипт выключения сети"
+
+#~ msgid "Network up script"
+#~ msgstr "Скрипт включения сети"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Первичный DNS сервер"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Вторичный DNS сервер"
+
+#~ msgid "Domain name"
+#~ msgstr "Доменное имя"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr "Используется, чтобы сообщить клиенту имя домена при DNS поисках"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Диапазон динамических IP адресов"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Определяет диапазон динамических IP адресов"
+
+#~ msgid "IP down script"
+#~ msgstr "Скрипт сброса IP-адреса"
+
+#~ msgid "IP up script"
+#~ msgstr "Скрипт установки IP-адреса"
+
+#~ msgid ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+#~ msgstr "Скрипт, выполняемый после включения сетевого интерфейса TUN/TAP"
+
+#~ msgid "Uplink subnet"
+#~ msgstr "Подсеть uplink'а"
+
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr "Сетевой адрес uplink-интерфейса (в нотации CIDR)"
+
+#~ msgid "Static IP address pool"
+#~ msgstr "Диапазон статических IP адресов"
+
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Определяет диапазон статических IP адресов"
+
+#~ msgid "TUN/TAP device"
+#~ msgstr "TUN/TAP устройство"
+
+#~ msgid "The specific device to use for the TUN/TAP interface"
+#~ msgstr "Устройство для TUN/TAP интерфейса"
+
+#~ msgid "TX queue length"
+#~ msgstr "Длина очереди TX"
+
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr "Длина TX очереди TUN/TAP интерфейса"
+
+#~ msgid "Use TAP device"
+#~ msgstr "Использовать устройство TAP"
+
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Использовать интерфейс TAP вместо TUN"
+
+#~ msgid "DHCP configuration"
+#~ msgstr "Настройки DHCP"
+
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Установите параметры DHCP для подключения клиентов"
+
+#~ msgid "DHCP end number"
+#~ msgstr "Конечное значение DHCP"
+
+#~ msgid "DHCP interface"
+#~ msgstr "DHCP интерфейс"
+
+#~ msgid "Ethernet interface to listen to for the downlink interface"
+#~ msgstr "Ethernet интерфейс для прослушивания downlink-интерфеса"
+
+#~ msgid "Listen MAC address"
+#~ msgstr "Прослушиваемые MAC адреса"
+
+#~ msgid "DHCP start number"
+#~ msgstr "Начальное значение DHCP"
+
+#~ msgid "Where to start assigning IP addresses (default 10)"
+#~ msgstr "Начать присвоения IP-адресов с (по умолчанию 10)"
+
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Включить IEEE 802.1x"
+
+#~ msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
+#~ msgstr "Включить IEEE 802.1x аутентификацию и обработку запросов EAP"
+
+#~ msgid "Leasetime"
+#~ msgstr "Время аренды"
+
+#~ msgid "Use a DHCP lease of seconds (default 600)"
+#~ msgstr "Использовать DHCP аренду заданное время (секунды, 600 по умолчанию)"
+
+#~ msgid "Allow session update through RADIUS"
+#~ msgstr "Разрешить обновление сессии через RADIUS"
+
+#~ msgid ""
+#~ "Allow updating of session parameters with RADIUS attributes sent in "
+#~ "Accounting-Response"
+#~ msgstr ""
+#~ "Разрешить обновление параметров сессии используя RADIUS атрибуты "
+#~ "посланные через Accounting-Response"
+
+#~ msgid "Admin password"
+#~ msgstr "Пароль администратора"
+
+#~ msgid ""
+#~ "Password to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Пароль администратора для аутентификации пользователя и применения "
+#~ "настроек chilli с созданием \"системной\" сессии устройства"
+
+#~ msgid "Admin user"
+#~ msgstr "Администратор"
+
+#~ msgid ""
+#~ "User-name to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Имя администратора для аутентификации пользователя и применения настроек "
+#~ "chilli с созданием \"системной\" сессии устройства"
+
+#~ msgid "Do not check disconnection requests"
+#~ msgstr "Не проверять запросы на разъединение"
+
+#~ msgid "Do not check the source IP address of radius disconnect requests"
+#~ msgstr "Не проверять IP-адрес запросов разъединения radius"
+
+#~ msgid "RADIUS disconnect port"
+#~ msgstr "Порт разъединения RADIUS"
+
+#~ msgid "UDP port to listen to for accepting radius disconnect requests"
+#~ msgstr "UDP порт для запросов разъединения RADIUS"
+
+#~ msgid "NAS IP"
+#~ msgstr "IP-адрес NAS"
+
+#~ msgid "Value to use in RADIUS NAS-IP-Address attribute"
+#~ msgstr "Значение RADIUS NAS-IP-Address атрибута"
+
+#~ msgid "NAS MAC"
+#~ msgstr "MAC адрес NAS"
+
+#~ msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
+#~ msgstr "Значение MAC адреса RADIUS Called-Station-ID атрибута"
+
+#~ msgid "Allow OpenID authentication"
+#~ msgstr "Разрешить OpenID аутентификацию"
+
+#~ msgid ""
+#~ "Allows OpenID authentication by sending ChilliSpot-Config=allow-"
+#~ "openidauth in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Разрешает аутентификацию OpenID, посылая ChilliSpot-Config=allow-"
+#~ "openidauth в запросах доступа RADIUS."
+
+#~ msgid "RADIUS accounting port"
+#~ msgstr "Порт RADIUS Accounting"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius accounting requests (default 1813)"
+#~ msgstr "Порт UDP для запросов RADIUS Accounting (1813 по умолчанию)"
+
+#~ msgid "RADIUS authentication port"
+#~ msgstr "Порт аутентификации RADIUS"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius authentication requests (default "
+#~ "1812)"
+#~ msgstr "UDP порт для запросов аутентификации radius (1812 по умолчанию)"
+
+#~ msgid "RADIUS listen address"
+#~ msgstr "Слушающий адрес RADIUS"
+
+#~ msgid "Local interface IP address to use for the radius interface"
+#~ msgstr "IP адрес локального интерфейса для интерфейса radius"
+
+#~ msgid "RADIUS location ID"
+#~ msgstr "Идентификатор расположения RADIUS"
+
+#~ msgid "WISPr Location ID"
+#~ msgstr "Идентификатор расположения WISPr"
+
+#~ msgid "RADIUS location name"
+#~ msgstr "Имя расположения RADIUS"
+
+#~ msgid "WISPr Location Name"
+#~ msgstr "Имя расположения WISPr"
+
+#~ msgid "NAS ID"
+#~ msgstr "Идентификатор NAS"
+
+#~ msgid "Network access server identifier"
+#~ msgstr "Идентификатор сервера доступа к сети (NAS)"
+
+#~ msgid "Option radiusnasip"
+#~ msgstr "Опция radiusnasip"
+
+#~ msgid "NAS port type"
+#~ msgstr "Тип порта NAS"
+
+#~ msgid ""
+#~ "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
+#~ msgstr "Значение аттрибута NAS-Port-Type. По умолчанию 19 (IEEE-802.11)"
+
+#~ msgid "Send RADIUS VSA"
+#~ msgstr "Отсылать RADIUS VSA"
+
+#~ msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
+#~ msgstr "Отсылать ChilliSpot-OriginalURL RADIUS VSA в запросах доступа"
+
+#~ msgid "RADIUS secret"
+#~ msgstr "Секрет RADIUS"
+
+#~ msgid "Radius shared secret for both servers"
+#~ msgstr "Общий секрет RADIUS для обоих серверов"
+
+#~ msgid "RADIUS server 1"
+#~ msgstr "RADIUS сервер 1"
+
+#~ msgid "The IP address of radius server 1"
+#~ msgstr "IP адрес RADIUS сервера 1"
+
+#~ msgid "RADIUS server 2"
+#~ msgstr "RADIUS сервер 2"
+
+#~ msgid "The IP address of radius server 2"
+#~ msgstr "IP адрес RADIUS сервера 2"
+
+#~ msgid "Swap octets"
+#~ msgstr "Переставлять октеты"
+
+#~ msgid ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+#~ msgstr "Менять местами значения \"входной октет\" и \"выходной октет\""
+
+#~ msgid "Allow WPA guests"
+#~ msgstr "Разрешить гостевой WPA вход"
+
+#~ msgid ""
+#~ "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+#~ "guests in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Разрешает гстевую WPA аутентификацию, отсылая ChilliSpot-Config=allow-wpa-"
+#~ "guests в запросах доступа RADIUS"
+
+#~ msgid "Proxy client"
+#~ msgstr "Клиент прокси"
+
+#~ msgid ""
+#~ "IP address from which radius requests are accepted. If omitted the server "
+#~ "will not accept radius requests"
+#~ msgstr ""
+#~ "IP адрес с которого запросы radius принимаются. Если не указан, то сервер "
+#~ "не будет принимать запросы radius"
+
+#~ msgid "Local interface IP address to use for accepting radius requests"
+#~ msgstr "IP адрес локального интерфейса для приема запросов radius"
+
+#~ msgid "Proxy port"
+#~ msgstr "Порт прокси"
+
+#~ msgid "UDP Port to listen to for accepting radius requests"
+#~ msgstr "Порт UDP для запросов RADIUS"
+
+#~ msgid "Proxy secret"
+#~ msgstr "Секрет прокси"
+
+#~ msgid "Radius shared secret for clients"
+#~ msgstr "Общий RADIUS секрет для клиентов"
+
+#~ msgid "UAM configuration"
+#~ msgstr "Конфигурация UAM"
+
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Настройки UAM"
+
+#~ msgid "Use Chilli XML"
+#~ msgstr "Использовать Chilli XML"
+
+#~ msgid "Return the so-called Chilli XML along with WISPr XML"
+#~ msgstr "Возвращать так называемый Chilli XML вместе с WISPr XML"
+
+#~ msgid "Default idle timeout"
+#~ msgstr "Таймаут ожидания по умолчанию"
+
+#~ msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Таймаут ожидания по умолчанию если не установлен RADIUS'ом (0 по "
+#~ "умолчанию)"
+
+#~ msgid "Default session timeout"
+#~ msgstr "Таймаут сессии (значение по умолчанию)"
+
+#~ msgid ""
+#~ "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Таймаут сессии по умолчанию если не установлено RADIUS'ом (0 по умолчанию)"
+
+#~ msgid "Inspect DNS traffic"
+#~ msgstr "Инспектировать траффик DNS"
+
+#~ msgid ""
+#~ "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
+#~ "records to prevent dns tunnels (experimental)"
+#~ msgstr ""
+#~ "Проверять DNS пакеты и отбрасывать ответы без A, CNAME, SOA, или MX "
+#~ "записей для предотвращения DNS туннелей (экспериментальная ф-ция)."
+
+#~ msgid "Local users file"
+#~ msgstr "Локальный файл пользователей"
+
+#~ msgid ""
+#~ "A colon seperated file containing usernames and passwords of locally "
+#~ "authenticated users"
+#~ msgstr ""
+#~ "Файл, содержащий логины и пароли локально авторизованных пользователей "
+#~ "(записи разделены двоеточием)"
+
+#~ msgid "Location name"
+#~ msgstr "Имя расположения"
+
+#~ msgid "Human readable location name used in JSON interface"
+#~ msgstr "Имя расположения, используемой в интерфейсе JSON"
+
+#~ msgid "Do not redirect to UAM server"
+#~ msgstr "Не перенаправлять на сервер UAM"
+
+#~ msgid ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+#~ msgstr ""
+#~ "Не возвращаться на UAM сервер при удачном входе, перенаправить на "
+#~ "исходный URL"
+
+#~ msgid "Do not do WISPr"
+#~ msgstr "Не выполнять WISPr"
+
+#~ msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
+#~ msgstr "Не выполнять WISPr XML, предполагая выполнение в бэкенд'е"
+
+#~ msgid "Post auth proxy"
+#~ msgstr "Прокси пост-аутентификации"
+
+#~ msgid ""
+#~ "Used with postauthproxyport to define a post authentication HTTP proxy "
+#~ "server"
+#~ msgstr ""
+#~ "Используется с портом прокси пост-аутентификации для определения HTTP "
+#~ "прокси-сервера аутентификации"
+
+#~ msgid "Post auth proxy port"
+#~ msgstr "Порт прокси пост-аутентификации"
+
+#~ msgid ""
+#~ "Used with postauthproxy to define a post authentication HTTP proxy server"
+#~ msgstr ""
+#~ "Ипользуется с прокси пост-аутентификации для определения HTTP прокси-"
+#~ "сервера пост-аутентификации"
+
+#~ msgid "Allowed resources"
+#~ msgstr "Разрешенные ресурсы"
+
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr ""
+#~ "Список ресурсов к которым клиент может получить доступ без "
+#~ "предварительной аутентификации"
+
+#~ msgid "Allow any DNS server"
+#~ msgstr "Разрешить любой DNS сервер"
+
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr "Разрешить любой DNS сервер для клиентов не прошедших аутентификацию"
+
+#~ msgid "Allow any IP address"
+#~ msgstr "Разрешить любой IP-адрес"
+
+#~ msgid ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+#~ msgstr ""
+#~ "Разрешить клиентам использовать любые настройки IP за счет \"спуфинга\" "
+#~ "ARP (экспериментальная ф-ция)"
+
+#~ msgid "Allowed domains"
+#~ msgstr "Разрешенные домены"
+
+#~ msgid "UAM homepage"
+#~ msgstr "Домашняя страница UAM"
+
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr ""
+#~ "URL домашней страницы для перенаправления пользователей не прошедших "
+#~ "аутентификацию"
+
+#~ msgid "UAM static content port"
+#~ msgstr "Порт UAM статического контента"
+
+#~ msgid "UAM listening address"
+#~ msgstr "Слашающий адрес UAM"
+
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr "IP адрес для приема аутентификации клиентов"
+
+#~ msgid "UAM logout IP"
+#~ msgstr "IP-адрес выхода UAM"
+
+#~ msgid "UAM listening port"
+#~ msgstr "Слушающий порт UAM"
+
+#~ msgid "UAM secret"
+#~ msgstr "Секрет UAM"
+
+#~ msgid "Shared secret between uamserver and chilli"
+#~ msgstr "Общий секрет для сервера UAM и Chilli"
+
+#~ msgid "UAM server"
+#~ msgstr "Сервер UAM"
+
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr "URL или веб-сервер для аутентификации клиентов"
+
+#~ msgid "UAM user interface"
+#~ msgstr "Интерфейс пользователя UAM"
+
+#~ msgid "Use status file"
+#~ msgstr "Использовать статус-файл"
+
+#~ msgid "WISPr login url"
+#~ msgstr "URL входа WISPr"
+
+#~ msgid "Specific URL to be given in WISPr XML LoginURL"
+#~ msgstr "Особый URL в WISPr XML LoginURL"
+
+#~ msgid "CGI program"
+#~ msgstr "Программа GCI"
+
+#~ msgid "Web content directory"
+#~ msgstr "Директория Web-контента"
+
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr "Директория куда будет помещен встроенный Web-контент"
+
+#~ msgid "MAC configuration"
+#~ msgstr "Настройка MAC"
+
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Настройка аутентификации по MAC адресу"
+
+#~ msgid "Allowed MAC addresses"
+#~ msgstr "Разрешенные MAC адреса"
+
+#~ msgid "List of MAC addresses for which MAC authentication will be performed"
+#~ msgstr "Список MAC адресов для которых будет производиться аутентификация"
+
+#~ msgid "Authenticate locally allowed MACs"
+#~ msgstr "Аутентифицировать локально разрешенные MAC адреса"
+
+#~ msgid "Authenticate allowed MAC addresses without the use of RADIUS"
+#~ msgstr "Аутентифицировать разрешенные MAC адреса без использования RADIUS"
+
+#~ msgid "Enable MAC authentification"
+#~ msgstr "Разрешить MAC аутентификацию"
+
+#~ msgid "Try to authenticate all users based on their mac address alone"
+#~ msgstr ""
+#~ "Пробовать аутентификацию всех пользователей только на основе их MAC "
+#~ "адресов"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "Password used when performing MAC authentication"
+#~ msgstr "Пароль для MAC аутентификации"
+
+#~ msgid "Suffix"
+#~ msgstr "Суффикс"
+
+#~ msgid ""
+#~ "Suffix to add to the MAC address in order to form the User-Name, which is "
+#~ "sent to the radius server"
+#~ msgstr ""
+#~ "Суффикс, добавляемый в MAC адрес, для формирования имени пользователя, "
+#~ "которое посылается radius серверу"
diff --git a/trunk/package/luci/po/ru/ddns.po b/trunk/package/luci/po/ru/ddns.po
new file mode 100644
index 00000000..eda11d81
--- /dev/null
+++ b/trunk/package/luci/po/ru/ddns.po
@@ -0,0 +1,92 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: ddns\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2012-11-01 21:54+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Check for changed IP every"
+msgstr "Проверять, изменился ли IP адрес каждые"
+
+msgid "Check-time unit"
+msgstr "Единица измерения проверки"
+
+msgid "Custom update-URL"
+msgstr "Пользовательский URL обновления"
+
+msgid "Dynamic DNS"
+msgstr "Динамический DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Динамический DNS позволяет вашему маршрутизатору иметь постоянное доменное "
+"имя при динамическом IP-адресе."
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Force update every"
+msgstr "Принудительно обновлять каждые"
+
+msgid "Force-time unit"
+msgstr "Единица измерения обновления"
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid "Network"
+msgstr "Сеть"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Service"
+msgstr "Сервис"
+
+msgid "Source of IP address"
+msgstr "Источник IP-адреса"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Имя пользователя"
+
+msgid "custom"
+msgstr "пользовательский"
+
+# Hours
+msgid "h"
+msgstr "ч"
+
+msgid "interface"
+msgstr "интерфейс"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "мин"
+
+msgid "network"
+msgstr "сеть"
+
+#~ msgid "Event interface"
+#~ msgstr "Интерфейс события"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr ""
+#~ "При включении какого интерфейса должен запускаться процесс скрипта DDNS."
diff --git a/trunk/package/luci/po/ru/diag_core.po b/trunk/package/luci/po/ru/diag_core.po
new file mode 100644
index 00000000..1abaa8c6
--- /dev/null
+++ b/trunk/package/luci/po/ru/diag_core.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: diag_core\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 11:44+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Configure Diagnostics"
+msgstr "Настройки диагностики"
+
+msgid "Diagnostics"
+msgstr "Диагностика"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Доступные в данном меню виды диагностики зависят от установленных на вашем "
+"устройстве модулей. "
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Записи в меню позволять вам выполнить диагностику системы, чтобы помочь в "
+"обнаружении проблем."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Используя это меню, вы можете настроить диагностику сети, например, "
+"сканирование сетевых устройств или ping-тест."
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d_diag"
diff --git a/trunk/package/luci/po/ru/diag_devinfo.po b/trunk/package/luci/po/ru/diag_devinfo.po
new file mode 100644
index 00000000..7531dde4
--- /dev/null
+++ b/trunk/package/luci/po/ru/diag_devinfo.po
@@ -0,0 +1,223 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: diag_devinfo\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2014-01-31 21:07+0200\n"
+"Last-Translator: Moon_dark <lenayxa@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Actions"
+msgstr "Действия"
+
+msgid "Add"
+msgstr "Добавить"
+
+msgid "Beginning of MAC address range"
+msgstr "Начало диапазона MAC-адресов"
+
+msgid "Config Phone Scan"
+msgstr "Настроить сканирование телефонов"
+
+msgid "Configure"
+msgstr "Настроить"
+
+msgid "Configure Scans"
+msgstr "Настроить сканирование"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+"Настроить сканирование устройств в указанных сетях. Уменьшение таймаута, "
+"количества повторов и/или паузы между запросами может ускорить сканирование, "
+"но также вызвать проблемы поиска некоторых устройств."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"Настроить сканирование поддерживаемых SIP-устройств в указанных сетях. "
+"Уменьшение таймаута, количества повторов и/или паузы между запросами может "
+"ускорить сканирование, но также вызвать проблемы поиска некоторых устройств."
+
+msgid "Delete"
+msgstr "Удалить"
+
+msgid "Device Scan Config"
+msgstr "Конфигурация сканирования устройства"
+
+msgid "Device Type"
+msgstr "Тип устройства"
+
+msgid "Devices discovered for"
+msgstr "Устройства, найденные в"
+
+msgid "Devices on Network"
+msgstr "Устройства в сети"
+
+msgid "Edit"
+msgstr "Редактировать"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "End of MAC address range"
+msgstr "Конец диапазона MAC адресов"
+
+msgid "Go to relevant configuration page"
+msgstr "Перейти на соответствующую страницу конфигурации"
+
+msgid "IP Address"
+msgstr "IP-адрес"
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid "Invalid"
+msgstr "Неверный"
+
+msgid "Link to Device"
+msgstr "Соединение с устройством"
+
+msgid "MAC Address"
+msgstr "MAC-адрес"
+
+#, fuzzy
+msgid "MAC Device Info Overrides"
+msgstr "Переопределение информации о MAC-устройстве"
+
+msgid "MAC Device Override"
+msgstr "Задать MAC-адрес устройства"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+"Диапазон MAC-адресов и информация для переопределения системной базы данных "
+"и базы данных IEEE"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "Время бездействия между запросами (мс, 100 по умолчанию)"
+
+msgid "Model"
+msgstr "Модель"
+
+msgid "Name"
+msgstr "Имя"
+
+msgid "Network Device Scan"
+msgstr "Сканирование сетевых устройств"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Конфигурация сканирования сетевых устройств"
+
+msgid "Networks to scan for devices"
+msgstr "Сети, в которых производить сканирование устройств"
+
+msgid "Networks to scan for supported devices"
+msgstr "Сети, в которых производить сканирование поддерживаемых устройств"
+
+msgid "No SIP devices"
+msgstr "SIP-устройства отсутствуют"
+
+msgid "No devices detected"
+msgstr "Устройства не обнаружены"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "Количество запросов (1 по умолчанию)"
+
+msgid "OUI Owner"
+msgstr "Владелец OUI"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+"Переопределить значения, полученные из скрипта \"MAC to Device\" (mac-to-"
+"devinfo), для заданного диапазона MAC-адресов"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "Произвести сканирование (это может занять несколько минут)"
+
+msgid "Phone Information"
+msgstr "Информация о телефоне"
+
+msgid "Phone Scan"
+msgstr "Сканировать телефоны"
+
+msgid "Phone Scanning Configuration"
+msgstr "Конфигурация сканирования телефонов"
+
+msgid "Phones"
+msgstr "Телефоны"
+
+msgid "Ports"
+msgstr "Порты"
+
+msgid "Raw"
+msgstr "Необработанные (сырые) данные"
+
+msgid "Repeat Count"
+msgstr "Количество повторов"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "Повторить сканирование (это может занять несколько минут)"
+
+msgid "SIP Device Information"
+msgstr "Информация о SIP-устройстве"
+
+msgid "SIP Device Scan"
+msgstr "Сканировать SIP-устройства"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "Конфигурация сканирования SIP-устройств"
+
+msgid "SIP Devices on Network"
+msgstr "SIP-устройства в сети"
+
+msgid "SIP devices discovered for"
+msgstr "SIP-устройства, найденные в"
+
+msgid "Scan for devices on specified networks."
+msgstr "Сканировать устройства в заданных сетях."
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "Сканировать поддерживаемые SIP-устройства в заданных сетях."
+
+msgid "Scanning Configuration"
+msgstr "Конфигурация сканирования"
+
+msgid "Scans for devices on specified networks."
+msgstr "Сканирует устройства в заданных сетях."
+
+msgid "Sleep Between Requests"
+msgstr "Пауза между запросами"
+
+msgid "Subnet"
+msgstr "Подсеть"
+
+msgid "This section contains no values yet"
+msgstr "Эта секция пока не содержит значений."
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Время ожидания ответов (сек, 10 по умолчанию)"
+
+msgid "Timeout"
+msgstr "Таймаут"
+
+msgid "Use Configuration"
+msgstr "Использовать конфигурацию"
+
+msgid "Vendor"
+msgstr "Производитель"
+
+msgid "check other networks"
+msgstr "проверить другие сети"
diff --git a/trunk/package/luci/po/ru/ffwizard.po b/trunk/package/luci/po/ru/ffwizard.po
new file mode 100644
index 00000000..afc10b96
--- /dev/null
+++ b/trunk/package/luci/po/ru/ffwizard.po
@@ -0,0 +1,183 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: ffwizard\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 17:17+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Разрешить передачу анонимной статистики с этого узла"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Выберите это для зашиты вашей локальной сети от других узлов и клиентов"
+
+msgid "Configure network"
+msgstr "Конфигурировать сеть"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Соединять ваш узел с другими узлами туннелем через интернет."
+
+msgid "DHCP IP range"
+msgstr "Диапазон IP-адресов DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP автоматически назначит IP-адреса клиентам"
+
+msgid "DNS Server"
+msgstr "Сервер DNS"
+
+msgid "Enable DHCP"
+msgstr "Разрешить DHCP"
+
+msgid "Gateway"
+msgstr "Шлюз"
+
+msgid "Heartbeat"
+msgstr "Состояние"
+
+msgid "IP address"
+msgstr "IP-адрес"
+
+msgid "L2gvpn tunnel"
+msgstr "L2gvpn туннель"
+
+msgid "Limit download bandwidth"
+msgstr "Ограничить пропускную способность загрузки"
+
+msgid "Limit upload bandwidth"
+msgstr "Ограничить пропускную способность передачи"
+
+msgid "Mesh IP address"
+msgstr "IP-адрес ячейки"
+
+msgid "Mesh IPv6 Address"
+msgstr "IPv6-адрес ячейки"
+
+msgid "Netmask"
+msgstr "Маска сети"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Password confirmation"
+msgstr "Подтверждение пароля"
+
+msgid "Password successfully changed"
+msgstr "Пароль успешно изменён"
+
+msgid "Protect LAN"
+msgstr "Защитить LAN"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Настроить сетевые интерфейсы"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Разрешить другим пользователям использовать ваше соединение для доступа в "
+"интернет."
+
+msgid "Share your internet connection"
+msgstr "Разрешить другим использовать ваше интернет-соединение"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Диапазон IP-адресов клиентов (например, 10.1.2.1/28). Если данный диапазон "
+"находится внутри диапазона вашей ячеистой сети, то он будет анонсирован как "
+"HNA. Любой другой диапазон будет использовать NAT. Если значение не задано, "
+"то будут использоваться настройки из профиля сообщества."
+
+# TYPO: auomatically -> automatically
+# ipv6 -> IPv6
+msgid "The ipv6 address is calculated auomatically."
+msgstr "IPv6-адрес рассчитывается автоматически."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Протокол доступа в интернет."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Уникальный адрес в ячейке (например, 10.1.1.1). Адрес должен быть "
+"зарегистрирован в вашем местном сообществе."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Установка нового виртуального беспроводного интерфейса в режим \"Точка "
+"доступа\"."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Этот помощник поможет вам в настройке маршрутизатора для Freifunk-сети или "
+"другой аналогичной беспроводного сети."
+
+msgid "Unknown Error"
+msgstr "Неизвестная ошибка"
+
+msgid "Username"
+msgstr "Имя пользователя"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Виртуальная точка доступа (VAP)"
+
+msgid "Wizard"
+msgstr "Помощник"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+"Ваше устройство и соседние узлы должны использовать один и тот же канал."
+
+msgid "dhcp"
+msgstr "DHCP"
+
+msgid "kbit/s"
+msgstr "кбит/с"
+
+msgid "static"
+msgstr "статический"
+
+msgid "Configure this interface."
+msgstr "Настроить интерфейс."
+
+msgid "recommended"
+msgstr "рекомендуемый"
+
+msgid "Basic settings"
+msgstr "Главные настройки"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Ошибка в главных настройках. Пожалуйста, перейдите в"
+
+msgid "Error"
+msgstr "Ошибка"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+"Вы не можете использовать помощника, так как некоторые необходимые значения "
+"отсутствуют."
+
+msgid "and fill out all required fields."
+msgstr "и заполните все требуемые поля."
diff --git a/trunk/package/luci/po/ru/firewall.po b/trunk/package/luci/po/ru/firewall.po
new file mode 100644
index 00000000..aa5c5a85
--- /dev/null
+++ b/trunk/package/luci/po/ru/firewall.po
@@ -0,0 +1,679 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: firewall\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2013-09-05 16:02+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "%s in %s"
+msgstr "%s в %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s с %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s в %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Запись без имени)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Правило без имени)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT без имени)"
+
+msgid "-- Please choose --"
+msgstr "-- Пожалуйста, выберите --"
+
+msgid "-- custom --"
+msgstr "-- пользовательский --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> пакетов за <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> пакетов за <var>%s</var>, подряд <var>%d</var> пакетов"
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> с пределом в %s"
+
+msgid "Action"
+msgstr "Действие"
+
+msgid "Add"
+msgstr "Добавить"
+
+msgid "Add and edit..."
+msgstr "Добавить и редактировать..."
+
+msgid "Advanced Settings"
+msgstr "Расширенные настройки"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Разрешить перенаправление из <em>зон-источников</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Разрешить перенаправление в <em>зоны назначения</em>:"
+
+msgid "Any"
+msgstr "Любой"
+
+msgid "Covered networks"
+msgstr "Использовать сети"
+
+msgid "Custom Rules"
+msgstr "Пользовательские правила"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Пользовательские правила позволяют выполнять произвольные команды iptables, "
+"которые так или иначе не покрываются данным фреймворком межсетевого экрана. "
+"Команды выполняются при каждом перезапуске межсетевого экрана, сразу после "
+"того, как загружен набор правил по умолчанию."
+
+msgid "Destination IP address"
+msgstr "IP-адрес назначения"
+
+msgid "Destination address"
+msgstr "Адрес назначения"
+
+msgid "Destination port"
+msgstr "Порт назначения"
+
+msgid "Destination zone"
+msgstr "Зона назначения"
+
+msgid "Do not rewrite"
+msgstr "Не перезаписывать"
+
+msgid "Drop invalid packets"
+msgstr "Не пропускать некорректные пакеты"
+
+msgid "Enable"
+msgstr "Включить"
+
+#, fuzzy
+msgid "Enable NAT Loopback"
+msgstr "Включить NAT Loopback"
+
+msgid "Enable SYN-flood protection"
+msgstr "Включить защиту от SYN-flood атак"
+
+msgid "Enable logging on this zone"
+msgstr "Включить журналирование в этой зоне"
+
+msgid "External IP address"
+msgstr "Внешний IP-адрес"
+
+msgid "External port"
+msgstr "Внешний порт"
+
+msgid "External zone"
+msgstr "Внешняя зона"
+
+msgid "Extra arguments"
+msgstr "Дополнительные аргументы"
+
+msgid "Firewall"
+msgstr "Межсетевой экран"
+
+msgid "Firewall - Custom Rules"
+msgstr "Межсетевой экран - Пользовательские правила"
+
+msgid "Firewall - Port Forwards"
+msgstr "Межсетевой экран - Перенаправление портов"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Межсетевой экран - Правила для трафика"
+
+msgid "Firewall - Zone Settings"
+msgstr "Межсетевой экран - Настройка зон"
+
+msgid "Force connection tracking"
+msgstr "Включить отслеживание соединений"
+
+msgid "Forward"
+msgstr "Перенаправление"
+
+msgid "Forward to"
+msgstr "Перенаправлять в"
+
+msgid "From %s in %s"
+msgstr "Из %s в %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Из %s в %s с источником %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Из %s в %s с источниками %s и %s"
+
+msgid "General Settings"
+msgstr "Общие настройки"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 и IPv6"
+
+msgid "IPv4 only"
+msgstr "Только IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Только IPv6"
+
+msgid "Input"
+msgstr "Входящий"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Перенаправление между зонами"
+
+msgid "Internal IP address"
+msgstr "Внутренний IP-адрес"
+
+msgid "Internal port"
+msgstr "Внутренний порт"
+
+msgid "Internal zone"
+msgstr "Внутренняя зона"
+
+msgid "Limit log messages"
+msgstr "Ограничить журнал сообщений"
+
+msgid "MSS clamping"
+msgstr "Ограничение MSS"
+
+msgid "Masquerading"
+msgstr "Маскарадинг"
+
+#, fuzzy
+msgid "Match"
+msgstr "Выбирать"
+
+msgid "Match ICMP type"
+msgstr "Соответствовать ICMP типу"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Перенаправить соответствующий трафик на определённый порт или диапазон "
+"портов. "
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Выбирать входящий трафик, направленный на порт или диапазон портов данного "
+"хоста"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Выбирать входящий трафик, исходящий из порта или диапазона портов "
+"клиентского хоста."
+
+msgid "Name"
+msgstr "Имя"
+
+msgid "New SNAT rule"
+msgstr "Новое правило SNAT"
+
+msgid "New forward rule"
+msgstr "Новое правило перенаправления"
+
+msgid "New input rule"
+msgstr "Новое правило для входящего трафика"
+
+msgid "New port forward"
+msgstr "Новое перенаправление порта"
+
+msgid "New source NAT"
+msgstr "Новый SNAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Выбирать только входящий трафик, направленный на указанный IP-адрес."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Выбирать только входящий трафик от этих MAC-адресов."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+"Выбирать только входящий трафик от этого IP-адреса или диапазона адресов."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Выбирать только входящий трафик, исходящий из указанного порта или диапазона "
+"портов клиентского хоста"
+
+msgid "Open ports on router"
+msgstr "Открыть порты на маршрутизаторе"
+
+msgid "Other..."
+msgstr "Другое..."
+
+msgid "Output"
+msgstr "Исходящий"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+"Передаёт дополнительные аргументы iptables. Используйте с осторожностью!"
+
+msgid "Port Forwards"
+msgstr "Перенаправления портов"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"Перенаправленные портов позволяет удалённым компьютерам из Интернета "
+"соединяться с компьютером или службой внутри частной локальной сети."
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr "Перенаправить входящий трафик на указанный порт хоста внутренней сети"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Перенаправить входящий трафик на указанный хост внутренней сети"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
+
+msgid "Restrict to address family"
+msgstr "Использовать только семейство протоколов"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Перенаправлять соответствующий трафик к указанному адресу."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Перенаправлять соответствующий трафик к указанному порту источника. Может "
+"быть пустым в случае, если необходимо перенаправить только IP-адрес."
+
+msgid "Rewrite to source %s"
+msgstr "Перенаправлять к источнику %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "Перенаправлять к источнику %s, %s"
+
+msgid "SNAT IP address"
+msgstr "IP-адрес SNAT"
+
+msgid "SNAT port"
+msgstr "Порт SNAT"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# msgid "Traffic Redirection"
+# msgstr ""
+# msgid ""
+# "Traffic redirection allows you to change the destination address of "
+# "forwarded packets."
+# msgstr ""
+# msgid "Overview"
+# msgstr ""
+# msgid "Name"
+# msgstr ""
+# msgid "Source zone"
+# msgstr ""
+# msgid "Source MAC-address"
+# msgstr ""
+# msgid "Source port"
+# msgstr ""
+# msgid "Protocol"
+# msgstr ""
+msgid "Source IP address"
+msgstr "IP-адрес источника"
+
+msgid "Source MAC address"
+msgstr "MAC-адрес источника"
+
+msgid "Source NAT"
+msgstr "SNAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"SNAT - это особая форма маскарадинга (masquerading), позволяющая "
+"осуществлять детальный контроль над IP-адресом источника для исходящего "
+"трафика, например, перенаправление нескольких WAN-адресов во внутреннюю "
+"подсеть."
+
+msgid "Source address"
+msgstr "Адрес источника"
+
+msgid "Source port"
+msgstr "Порт источника"
+
+msgid "Source zone"
+msgstr "Зона-источник"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr "Межсетевой экран создает зоны в вашей сети для контроля трафика."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Данные настройки управляют перенаправлением между этой (%s) и другими "
+"зонами. Трафиком <em>зон-получателей</em> является трафик <strong>исходящий "
+"из %q</strong>. Трафиком <em>зон-источников</em> является трафик "
+"<strong>направленый в %q</strong>. Перенаправление является "
+"<em>однонаправленным</em>, то есть перанаправление из lan в wan <em>не</em> "
+"допускает перенаправление трафика из wan в lan."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"На этой странице можно изменить расширенные настройки перенаправления "
+"портов. В большинстве случаев нет необходимости изменять эти параметры."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"На этой странице можно изменить расширенные настройки правил для трафика. В "
+"большинстве случаев нет необходимости изменять эти параметры."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Данная секция позволяет изменять общие настройки %q. Опции <em>входящий</em> "
+"и <em>исходящий</em> устанавливают политику по умолчанию для входящего и "
+"исходящего трафика. Опция <em>перенаправление</em> позволяет установить "
+"политику для трафика, который перенаправляется через несколько сетей в зоне. "
+"Пункт <em>использовать сети</em> позволяет указать, какие сети являются "
+"частью данной зоны."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "К %s, порту %s на <var>этом устройстве</var>"
+
+msgid "To %s in %s"
+msgstr "К %s в %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "К %s на <var>этом устройстве</var>"
+
+msgid "To %s, %s in %s"
+msgstr "К %s, %s в %s"
+
+msgid "To source IP"
+msgstr "К IP-адресу источника"
+
+msgid "To source port"
+msgstr "К порту источника"
+
+msgid "Traffic Rules"
+msgstr "Правила для трафика"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Правила для трафика определяют политику прохождения пакетов между разными "
+"зонами, например, запрет трафика между некоторыми хостами или открытие WAN-"
+"портов маршрутизатора."
+
+msgid "Via %s"
+msgstr "Через %s"
+
+msgid "Via %s at %s"
+msgstr "Через %s, порт %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Вы можете указать несколько, выбрав \"-- пользовательский --\" и перечислив "
+"через пробел названия протоколов."
+
+msgid "Zone %q"
+msgstr "Зона %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Зона ⇒ Перенаправления"
+
+msgid "Zones"
+msgstr "Зоны"
+
+msgid "accept"
+msgstr "принимать"
+
+msgid "any"
+msgstr "любой"
+
+msgid "any host"
+msgstr "любого хоста"
+
+msgid "any router IP"
+msgstr "любой IP-адрес маршрутизатора"
+
+msgid "any zone"
+msgstr "любой зоны"
+
+msgid "don't track"
+msgstr "не отслеживать"
+
+msgid "drop"
+msgstr "не обрабатывать"
+
+msgid "reject"
+msgstr "отвергать"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Назначение"
+
+#~ msgid "Family"
+#~ msgstr "Семейство"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Источник"
+
+#~ msgid "To %s"
+#~ msgstr "к %s"
+
+#~ msgid "To %s at %s"
+#~ msgstr "к %s на %s"
+
+#~ msgid "Via"
+#~ msgstr "Через"
+
+#~ msgid "Accept forward"
+#~ msgstr "Принимать перенаправление"
+
+#~ msgid "Accept input"
+#~ msgstr "Принимать входящие"
+
+#~ msgid "Disable"
+#~ msgstr "Отключить"
+
+#~ msgid "Discard forward"
+#~ msgstr "Отвергать перенаправление"
+
+#~ msgid "Discard input"
+#~ msgstr "Выбрасывать входящие пакеты"
+
+#~ msgid "Do not track forward"
+#~ msgstr "Не отслеживать перенаправление"
+
+#~ msgid "Do not track input"
+#~ msgstr "Не отслеживать входные пакеты"
+
+#~ msgid "IP"
+#~ msgstr "IP-адрес"
+
+#~ msgid "IP range"
+#~ msgstr "Диапазон IP-адресов"
+
+#~ msgid "IPs"
+#~ msgstr "IP-адреса"
+
+#~ msgid "MAC"
+#~ msgstr "MAC-адрес"
+
+#~ msgid "MACs"
+#~ msgstr "MAC-адреса"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Отвергать перенаправление"
+
+#~ msgid "Refuse input"
+#~ msgstr "Отвергать входящий трафик"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Правило выключено"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Правило включено"
+
+#~ msgid "day"
+#~ msgstr "день"
+
+#~ msgid "hour"
+#~ msgstr "час"
+
+#~ msgid "minute"
+#~ msgstr "мин"
+
+#~ msgid "not"
+#~ msgstr "не"
+
+#~ msgid "port"
+#~ msgstr "порт"
+
+#~ msgid "ports"
+#~ msgstr "порты"
+
+#~ msgid "second"
+#~ msgstr "сек"
+
+#~ msgid "type"
+#~ msgstr "тип"
+
+#~ msgid "types"
+#~ msgstr "типы"
+
+#~ msgid "(optional)"
+#~ msgstr "(необязательно)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "Адрес назначения"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Внутренний порт (необязательно)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Расширенные опции"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Расширенные правила"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Расширенные правила позволяют настроить сетевой экран в соответствии с "
+#~ "вашими потребностями. Только новые соединения будут обработаны. Пакеты, "
+#~ "принадлежащие уже существующим соединениям, будут автоматически пропущены "
+#~ "через сетевой экран."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Пользовательские правила (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Устройство"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Для DNAT соответствующий трафик перенаправляется на введенный адрес "
+#~ "назначения. Для SNAT подменяется адрес источника на введенный."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Выбирать исходящий трафик отправленный с порта или диапазона портов "
+#~ "внешнего хоста"
+
+#~ msgid "Overview"
+#~ msgstr "Назад к обзору"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Перенаправление портов"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Перенаправление портов позволяет открыть доступ к внутренним службам из "
+#~ "внешней сети."
+
+#~ msgid "Redirection type"
+#~ msgstr "Тип перенаправления"
+
+#~ msgid "Redirections"
+#~ msgstr "Перенаправления"
+
+#~ msgid "Rules"
+#~ msgstr "Правила"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Перенаправление трафика"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Перенаправление трафика позволяет изменить адрес получателя для "
+#~ "проходящих пакетов."
diff --git a/trunk/package/luci/po/ru/freifunk-policyrouting.po b/trunk/package/luci/po/ru/freifunk-policyrouting.po
new file mode 100644
index 00000000..a4ba704f
--- /dev/null
+++ b/trunk/package/luci/po/ru/freifunk-policyrouting.po
@@ -0,0 +1,70 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: freifunk-policyrouting\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-25 12:26+0200\n"
+"PO-Revision-Date: 2012-08-15 15:27+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Весь трафик от интерфейсов, принадлежащих этим зонам, будет послан через "
+"шлюз в ячеистой сети."
+
+msgid "Enable Policy Routing"
+msgstr "Разрешить политику маршрутизации"
+
+#, fuzzy
+msgid "Fallback to mesh"
+msgstr "Откат к ячеистой сети"
+
+msgid "Firewall zones"
+msgstr "Зоны межсетевого экрана"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"Трафик, принадлежащий выбранным зонам межсетевого экрана, маршрутизируется "
+"через ваше интернет-соединение, если маршрут по умолчанию не был получен из "
+"ячеистой сети. Если вас это не устраивает, то выберите эту опцию и данный "
+"трафик будет заблокирован."
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+"Если ваш шлюз не доступен, откатиться к использованию шлюза ячеистой сети по "
+"умолчанию."
+
+msgid "Policy Routing"
+msgstr "Политика маршрутизации"
+
+msgid "Strict Filtering"
+msgstr "Строгая фильтрация"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"На этих страницах Вы можете настроить политику маршрутизации для "
+"определённых зон межсетевого экрана. Это может быть полезно, если вы хотите "
+"использовать интернет-соединения только для себя. Ваш трафик в этом случае "
+"будет использовать только ваше интернет-соединение, в то время как трафик "
+"ячеистой сети будет использовать другой шлюз."
diff --git a/trunk/package/luci/po/ru/freifunk.po b/trunk/package/luci/po/ru/freifunk.po
new file mode 100644
index 00000000..0943a3b4
--- /dev/null
+++ b/trunk/package/luci/po/ru/freifunk.po
@@ -0,0 +1,451 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: freifunk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-09-06 09:41+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "Плохой (ETX > 10)"
+
+msgid "Basic Settings"
+msgstr "Базовые настройки"
+
+msgid "Basic settings"
+msgstr "Базовые настройки"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Базовые настройки не верны. Пожалуйста, перейдите в"
+
+msgid "Basic system settings"
+msgstr "Основные настройки системы"
+
+msgid "Bitrate"
+msgstr "Скорость"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+"Проверить наличие новой версии прошивки и выполнить автоматическое "
+"обновление."
+
+msgid "Client network size"
+msgstr "Размер клиентской сети"
+
+msgid "Community"
+msgstr "Сообщество"
+
+msgid "Community profile"
+msgstr "Профиль сообщества"
+
+msgid "Community settings"
+msgstr "Настройки сообщества"
+
+msgid "Confirm Upgrade"
+msgstr "Подтвердить обновление"
+
+msgid "Contact"
+msgstr "Контактная информация"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "Контактная информация не верна. Пожалуйста, перейдите в"
+
+msgid "Coordinates"
+msgstr "Координаты"
+
+msgid "Country code"
+msgstr "Код страны"
+
+msgid "Default routes"
+msgstr "Маршруты по умолчанию"
+
+msgid "Disable default content"
+msgstr "Запретить контент по умолчанию"
+
+msgid "Diversity is enabled for device"
+msgstr "Неопределенность пути включена"
+
+msgid "E-Mail"
+msgstr "Эл. почта"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "Редактировать главную страницу"
+
+msgid "Enable IPv6"
+msgstr "Включить IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr "Ошибка"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "Найдите свои координаты с помощью OpenStreetMap"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Обзор Freifunk"
+
+msgid "Freifunk Remote Update"
+msgstr "Удалённое обновление Freifunk"
+
+msgid "Gateway"
+msgstr "Шлюз"
+
+msgid "Go to"
+msgstr "Перейти"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "Хороший (2 < ETX < 4)"
+
+#, fuzzy
+msgid "Green"
+msgstr "Зелёный"
+
+msgid "Hello and welcome in the network of"
+msgstr "Здравствуйте и добро пожаловать в сеть"
+
+msgid "Hide OpenStreetMap"
+msgstr "Скрыть OpenStreetMap"
+
+msgid "Homepage"
+msgstr "Домашняя страница"
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+#, fuzzy
+msgid "IPv6 Config"
+msgstr "Конфигурация IPv6"
+
+msgid "IPv6 Prefix"
+msgstr "Префикс IPv6"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "Сеть IPv6 в CIDR-нотации"
+
+msgid "If selected then the default content element is not shown."
+msgstr "Если выбрано, содержимое по умолчанию не будет показано."
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Если вы заинтересованы в нашем проекте, свяжитесь с местным сообществом"
+
+msgid "Index Page"
+msgstr "Главная страница"
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Доступ в интернет зависит от технических и организационных условий и может "
+"быть не доступен для вас."
+
+# It - access point
+msgid "It is operated by"
+msgstr "Она управляется"
+
+msgid "Keep configuration"
+msgstr "Сохранить конфигурацию"
+
+msgid "Latitude"
+msgstr "Широта"
+
+msgid "Legend"
+msgstr "Надпись"
+
+msgid "Load"
+msgstr "Загрузка"
+
+msgid "Local Time"
+msgstr "Местное время"
+
+msgid "Location"
+msgstr "Местоположение"
+
+msgid "Longitude"
+msgstr "Долгота"
+
+msgid "Map"
+msgstr "Карта"
+
+msgid "Map Error"
+msgstr "Ошибка карты"
+
+msgid "Memory"
+msgstr "Память"
+
+msgid "Mesh prefix"
+msgstr "Префикс ячейки"
+
+msgid "Metric"
+msgstr "Метрика"
+
+msgid "Mode"
+msgstr "Режим"
+
+msgid "Network"
+msgstr "Сеть"
+
+msgid "Network for client DHCP addresses"
+msgstr "Сеть для клиентских DHCP-адресов"
+
+msgid "Nickname"
+msgstr "Псевдоним"
+
+msgid "No default routes known."
+msgstr "Маршруты по умолчанию не известны."
+
+msgid "Notice"
+msgstr "Внимание"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "Оператор"
+
+#, fuzzy
+msgid "Orange"
+msgstr "Оранжевый"
+
+msgid "Overview"
+msgstr "Обзор"
+
+msgid "Package libiwinfo required!"
+msgstr "Требуется libiwinfo!"
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "Please fill in your contact details below."
+msgstr "Пожалуйста, введите вашу контактную информацию."
+
+msgid "Please set your contact information"
+msgstr "Пожалуйста, введите вашу контактную информацию"
+
+msgid "Power"
+msgstr "Питание"
+
+msgid "Processor"
+msgstr "Процессор"
+
+msgid "Profile"
+msgstr "Профиль"
+
+msgid "Profile (Expert)"
+msgstr "Профиль (эксперт)"
+
+msgid "Realname"
+msgstr "Имя"
+
+#, fuzzy
+msgid "Red"
+msgstr "Красный"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+"Укажите ваше местоположение на карте с помощью щелчка мыши. Карта будет "
+"показана только если вы подключены к интернету."
+
+msgid "Show OpenStreetMap"
+msgstr "Показать карту OpenStreetMap"
+
+msgid "Show on map"
+msgstr "Показать на карте"
+
+msgid "Signal"
+msgstr "Сигнал"
+
+msgid "Splash"
+msgstr "Splash-экран"
+
+msgid "Start Upgrade"
+msgstr "Начать обновление"
+
+msgid "Statistics"
+msgstr "Статистика"
+
+msgid "Status"
+msgstr "Статус"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr "Система"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Пакет <em>libiwinfo-lua</em> не установлен. Для включения настроек "
+"беспроводных сетей, вам необходимо установить этот компонент!"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"Сервис OLSRd не сконфигурирован на получение данных о местоположении из сети."
+"<br /> Пожалуйста, удостоверьтесь, что модуль пространства имён настроен "
+"правильно и что опция <em>latlon_file</em> включена."
+
+msgid "The installed firmware is the most recent version."
+msgstr "Установлена прошивка самой последней версии."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"Это базовые настройки вашего сообщества. Они определяют стандартные "
+"настройки для мастера установки и НЕ влияют на конечную конфигурацию "
+"маршрутизатора."
+
+msgid "These are the settings of your local community."
+msgstr "Это настройки для вашего сообщества."
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+"Эти страницы помогут настроить ваш маршрутизатор для Freifunk или подобной "
+"беспроводной сети."
+
+msgid "This is the access point"
+msgstr "Это - точка доступа"
+
+msgid "Update Settings"
+msgstr "Настройки обновления"
+
+msgid "Update available!"
+msgstr "Доступно обновление!"
+
+msgid "Uptime"
+msgstr "Время работы"
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr "Проверять загруженные образы"
+
+msgid "Very good (ETX < 2)"
+msgstr "Очень хороший (ETX < 2)"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+"Мы - это сообщество, цель которого создать бесплатную, независимую и "
+"открытую беспроводную ячеистую сеть."
+
+msgid "Wireless Overview"
+msgstr "Обзор беспроводных сетей"
+
+#, fuzzy
+msgid "Yellow"
+msgstr "Жёлтый"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"У вас есть возможность установить дополнительное содержимое публичной "
+"страницы, вставив соответствующий XHTML-код в форму.<br /> Заголовки должны "
+"быть заключены между &lt;h2&gt; и &lt;/h2&gt;."
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "Вы можете найти дополнительную информацию о Freifunk по адресу"
+
+msgid "You can manually edit the selected community profile here."
+msgstr "Здесь вы можете редактировать выбранный профиль сообщества."
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+"Необходимо выбрать профиль перед его редактированием. Чтобы выбрать профиль, "
+"перейдите в"
+
+msgid "and fill out all required fields."
+msgstr "и заполните все необходимые поля."
+
+msgid "buffered"
+msgstr "буферизировано"
+
+msgid "cached"
+msgstr "кэшировано"
+
+msgid "e.g."
+msgstr "напр."
+
+msgid "free"
+msgstr "свободно"
+
+msgid "to disable it."
+msgstr "чтобы выключить."
+
+msgid "used"
+msgstr "использовано"
+
+msgid "wireless settings"
+msgstr "настройки беспроводной сети"
+
+#~ msgid ""
+#~ "No services can be shown, because olsrd is not running or the olsrd-"
+#~ "nameservice Plugin is not loaded."
+#~ msgstr ""
+#~ "Сервис не может быть показан, так как oslrd не запущен или модуль olsrd-"
+#~ "nameservice не загружен."
+
+#~ msgid "Services"
+#~ msgstr "Службы"
+
+#~ msgid "Source"
+#~ msgstr "Источник"
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Пакет <em>libiwinfo-lua</em> не установлен. Вам необходимо установить "
+#~ "этот компонент для настройки беспроводной сети!"
+
+#~ msgid "Url"
+#~ msgstr "Url"
diff --git a/trunk/package/luci/po/ru/hd_idle.po b/trunk/package/luci/po/ru/hd_idle.po
new file mode 100644
index 00000000..51f1f6cd
--- /dev/null
+++ b/trunk/package/luci/po/ru/hd_idle.po
@@ -0,0 +1,52 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: hd_idle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-08-15 11:24+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Disk"
+msgstr "Диск"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Enable debug"
+msgstr "Включить отладку"
+
+msgid "Idle-time"
+msgstr "Время бездействия"
+
+msgid "Idle-time unit"
+msgstr "Единицы времени бездействия"
+
+msgid "Settings"
+msgstr "Настройки"
+
+# Hours
+msgid "h"
+msgstr "ч"
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"Утилита hd-idle позволяет замедлять внешние диски после определённого "
+"времени бездействия."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "мин"
diff --git a/trunk/package/luci/po/ru/meshwizard.po b/trunk/package/luci/po/ru/meshwizard.po
new file mode 100644
index 00000000..876ac36d
--- /dev/null
+++ b/trunk/package/luci/po/ru/meshwizard.po
@@ -0,0 +1,150 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: meshwizard\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-20 09:47+0200\n"
+"PO-Revision-Date: 2013-09-06 09:43+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#, fuzzy
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "Активировать или деактивировать глобальную конфигурацию IPv6."
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Включите эту опцию, чтобы защитить локальную сеть от других узлов или "
+"клиентов"
+
+msgid "Cleanup config"
+msgstr "Очистить конфигурацию"
+
+msgid "Configure this interface"
+msgstr "Настроить этот интерфейс"
+
+msgid "DHCP IP range"
+msgstr "Диапазон IP-адресов DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP автоматически назначит IP-адреса клиентам"
+
+msgid "Enable DHCP"
+msgstr "Включить DHCP"
+
+msgid "Enable RA"
+msgstr "Разрешить ICMPv6-ответ \"Router Advertisement\""
+
+msgid "Enabled"
+msgstr "Включен"
+
+msgid "General Settings"
+msgstr "Общие настройки"
+
+msgid "IPv6 Settings"
+msgstr "Настройки IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+"Если эта опция включена, то конфигурация очищается перед установкой новых "
+"настроек."
+
+msgid "Interfaces"
+msgstr "Интерфейсы"
+
+msgid "Mesh IP address"
+msgstr "IP-адрес ячейки"
+
+msgid "Mesh IPv6 address"
+msgstr "IPv6-адрес в mesh-сети"
+
+# предлагаю использовать именно термин "mesh-сеть", т.к. русский аналог этого понятия слишком длинный (сеть с ячеистой топологиейб ячеистая сеть)
+msgid "Mesh Wizard"
+msgstr "Мастер настройки ячеистой сети"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+"Примечание: эта опция установит данный интерфейс в режим работы с mesh-"
+"сетями, т.е. добавит его в зону ''freifunk' (\"free wireless radio\") и "
+"включит протокол OLSR."
+
+msgid "Protect LAN"
+msgstr "Защита LAN"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Включите эту опцию, чтобы позволить другим клиентам использовать ваше "
+"подключение к интернету."
+
+msgid "Send router advertisements on this device."
+msgstr "Посылать ICMPv6 сообщения \"Router Advertisement\" на это устройство"
+
+msgid "Share your internet connection"
+msgstr "Сделать интернет-подключение общедоступным"
+
+# HNA - Home Network Announcement
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"Диапазон IP-адресов для использования клиентами сети (например 10.1.2.1/28). "
+"Если указанный диапазон находится внутри вашей сети, тогда он будет объявлен "
+"как HNA. Любой другой диапазон будет использовать NAT. В случае пустого "
+"значение будут использоваться стандартные настройки."
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr "Заданный IP-адрес не находится внутри ячеистой сети"
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+"Это уникальный адрес в ячеистой сети (например 10.1.1.1), который должен "
+"быть зарегистрирован в вашем местном сообществе."
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+"Будет произведена настройка новой виртуальной беспроводной сети в режиме "
+"точки доступа."
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+"Данный мастер поможет настроить ваш маршрутизатор для сети Freifunk или "
+"другой подобной беспроводной сети."
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Виртуальная точка доступа (VAP)"
+
+msgid "Wizard"
+msgstr "Мастер установки"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+"Ваше устройство и соседние узлы должны использовать один и тот же канал."
+
+msgid "recommended"
+msgstr "рекомендуется"
diff --git a/trunk/package/luci/po/ru/minidlna.po b/trunk/package/luci/po/ru/minidlna.po
new file mode 100644
index 00000000..539e8ca0
--- /dev/null
+++ b/trunk/package/luci/po/ru/minidlna.po
@@ -0,0 +1,191 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: minidlna\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2013-11-13 18:43+0200\n"
+"Last-Translator: Роман <x.wserfer@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Advanced Settings"
+msgstr "Расширенные настройки"
+
+msgid "Album art names:"
+msgstr "Имена обложек альбома:"
+
+msgid "Announced model number:"
+msgstr "Номер модели:"
+
+msgid "Announced serial number:"
+msgstr "Серийный номер:"
+
+msgid "Browse directory"
+msgstr "Обзор директории"
+
+msgid "Collecting data..."
+msgstr "Сбор данных..."
+
+msgid "Database directory:"
+msgstr "Папка базы данных:"
+
+msgid "Enable TIVO:"
+msgstr "Включить TIVO:"
+
+msgid "Enable inotify:"
+msgstr "Включить inotify:"
+
+msgid "Enable:"
+msgstr "Включить:"
+
+msgid "Friendly name:"
+msgstr "Понятное имя:"
+
+msgid "General Settings"
+msgstr "Общие настройки"
+
+msgid "Interfaces:"
+msgstr "Интерфейсы:"
+
+msgid "Log directory:"
+msgstr "Папка журнала:"
+
+msgid "Media directories:"
+msgstr "Папки медиа:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+"MiniDLNA - это серверное программное обеспечение, имеющее цель обеспечения "
+"полной совместимости с клиентами DLNA/UPnP-AV."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Номер модели который, miniDLNA будет сообщать клиентам в своём XML-описании."
+
+msgid "Music"
+msgstr "Музыка"
+
+msgid "Network interfaces to serve."
+msgstr "Обслуживаемые сетевые интерфейсы."
+
+msgid "Notify interval in seconds."
+msgstr "Интервал уведомления (секунды)."
+
+msgid "Notify interval:"
+msgstr "Интервал уведомления:"
+
+msgid "Pictures"
+msgstr "Картинки"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Порт для HTTP-трафика (описания, SOAP, передача мультимедиа)"
+
+msgid "Port:"
+msgstr "Порт:"
+
+msgid "Presentation URL:"
+msgstr "URL представления:"
+
+msgid "Root container:"
+msgstr "Корневой контейнер:"
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+"Серийный номер, который miniDLNA будет сообщать клиентам в своём XML-"
+"описании."
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "Изменение имени отображения для клиентов."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+"Папка, в которой miniDLNA будет хранить свою базу данных и кэш обложек "
+"альбомов."
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr "Папка, в которой miniDLNA будет хранить свой файл журнала."
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+"Включение наблюдения inotify для автоматического обнаружения новых файлов."
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+"Установите для включения поддержки потокового воспроизведения файлов .jpg и ."
+"mp3 для TiVo с поддержкой HMO."
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"Установите для строгого соответствия стандартам DLNA. Это разрешит "
+"уменьшение размера слишком больших JPEG-изображений на стороне сервера, что "
+"может повредить производительности (по крайней мере) DLNA-продуктов Sony."
+
+#, fuzzy
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"Директории, которые необходимо сканировать. Если вы хотите установить "
+"ограничение на определённый тип содержимого в директории, вы можете написать "
+"тип ('A' для аудио, 'V' для видео, 'P' для изображений) перед путём к "
+"директории, за которым следует запятая (напр. media_dir=A,/mnt/media/Music). "
+"Может быть указано несколько директорий."
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "Укажите путь к сокету MiniSSDPd."
+
+msgid "Standard container"
+msgstr "Стандартный контейнер"
+
+msgid "Strict to DLNA standard:"
+msgstr "Строгий стандарт DLNA:"
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+"Сервис miniDLNA запущен, обслуживает %d аудио-, %d видео- и %d файлов с "
+"изображениями."
+
+msgid "The miniDLNA service is not running."
+msgstr "Сервис miniDLNA не запущен."
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr "Это список файлов, среди которых необходимо искать обложки альбомов."
+
+msgid "Video"
+msgstr "Видео"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "Статус miniDLNA"
+
+msgid "miniSSDP socket:"
+msgstr "Сокет miniSSDP:"
diff --git a/trunk/package/luci/po/ru/mmc_over_gpio.po b/trunk/package/luci/po/ru/mmc_over_gpio.po
new file mode 100644
index 00000000..dcc2e93d
--- /dev/null
+++ b/trunk/package/luci/po/ru/mmc_over_gpio.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: mmc_over_gpio\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 11:23+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "CLK_pin"
+msgstr "Вывод CLK"
+
+msgid "CS_pin"
+msgstr "Вывод CS"
+
+msgid "DI_pin"
+msgstr "Вывод DI"
+
+msgid "DO_pin"
+msgstr "Вывод DO"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "MMC/SD driver configuration"
+msgstr "Конфигурация драйвера MMC/SD"
+
+msgid "Mode"
+msgstr "Режим"
+
+msgid "Name"
+msgstr "Имя"
+
+msgid "Settings"
+msgstr "Настройки"
diff --git a/trunk/package/luci/po/ru/multiwan.po b/trunk/package/luci/po/ru/multiwan.po
new file mode 100644
index 00000000..c12d9204
--- /dev/null
+++ b/trunk/package/luci/po/ru/multiwan.po
@@ -0,0 +1,127 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: multiwan\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 14:05+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "Количество попыток перед обработкой отказа WAN"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "Количество попыток перед восстановлением WAN"
+
+msgid "Auto"
+msgstr "Автоматически"
+
+msgid "Collecting data..."
+msgstr "Сбор данных..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+"Укажите правила для направления исходящего трафика через заданные восходящие "
+"каналы WAN."
+
+msgid "DNS Server(s)"
+msgstr "DNS-сервер(ы)"
+
+msgid "Default Route"
+msgstr "Маршрут по умолчанию"
+
+msgid "Destination Address"
+msgstr "Адрес назначения"
+
+msgid "Disable"
+msgstr "Отключить"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Failing"
+msgstr "Отказ"
+
+msgid "Failover Traffic Destination"
+msgstr "Назначение трафика при обработке отказа"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "ICMP-хост(ы) для контроля состояния"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "Тайм-аут контроля состояния по ICMP"
+
+msgid "Health Monitor Interval"
+msgstr "Интервал контроля состояния"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+"Контроль состояния определяет и исправляет изменения сети и неисправные "
+"соединения."
+
+msgid "KO"
+msgstr "Не работает"
+
+msgid "Load Balancer Distribution"
+msgstr "Распределение балансировки нагрузки"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "Балансировка нагрузки (совместимость)"
+
+msgid "Load Balancer(Performance)"
+msgstr "Балансировка нагрузки (производительность)"
+
+msgid "Multi-WAN"
+msgstr "Мульти-WAN"
+
+msgid "Multi-WAN Status"
+msgstr "Состояние мульти-WAN"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "Правила для мульти-WAN трафика"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+"Мульти-WAN позволяет использовать несколько портов восходящего канала для "
+"балансировки нагрузки и отказоустойчивости."
+
+msgid "None"
+msgstr "Ни один из"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "Порты"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Recovering"
+msgstr "Восстановление"
+
+msgid "Source Address"
+msgstr "Адрес отправителя"
+
+msgid "Unknown"
+msgstr "Неизвестно"
+
+msgid "WAN Interfaces"
+msgstr "WAN-интерфейсы"
+
+msgid "WAN Uplink"
+msgstr "Восходящий канал WAN"
+
+msgid "all"
+msgstr "все"
diff --git a/trunk/package/luci/po/ru/ntpc.po b/trunk/package/luci/po/ru/ntpc.po
new file mode 100644
index 00000000..229b6101
--- /dev/null
+++ b/trunk/package/luci/po/ru/ntpc.po
@@ -0,0 +1,55 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: ntpc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-08-15 11:41+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Clock Adjustment"
+msgstr "Корректировка часов"
+
+msgid "Count of time measurements"
+msgstr "Количество измерений времени"
+
+msgid "Current system time"
+msgstr "Текущее время"
+
+msgid "General"
+msgstr "Общие"
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid "Offset frequency"
+msgstr "Смещение частоты"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Synchronizes the system time"
+msgstr "Синхронизирует системное время"
+
+msgid "Time Server"
+msgstr "Сервер времени"
+
+msgid "Time Servers"
+msgstr "Серверы времени"
+
+msgid "Time Synchronisation"
+msgstr "Синхронизация времени"
+
+msgid "Update interval (in seconds)"
+msgstr "Интервал обновления (в секундах)"
+
+msgid "empty = infinite"
+msgstr "пусто = бесконечно"
diff --git a/trunk/package/luci/po/ru/olsr.po b/trunk/package/luci/po/ru/olsr.po
new file mode 100644
index 00000000..51267e08
--- /dev/null
+++ b/trunk/package/luci/po/ru/olsr.po
@@ -0,0 +1,812 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: olsr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-09-06 09:58+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Active MID announcements"
+msgstr "Активные объявления MID"
+
+msgid "Active OLSR nodes"
+msgstr "Активные OLSR-узлы"
+
+msgid "Active host net announcements"
+msgstr "Активные объявления хост-сети (HNA)"
+
+msgid "Advanced Settings"
+msgstr "Расширенные настройки"
+
+msgid "Allow gateways with NAT"
+msgstr "Разрешить шлюзы с NAT"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "Разрешить выбор исходящего IPv4-шлюза с NAT"
+
+msgid "Announce uplink"
+msgstr "Объявлять восходящий канал"
+
+msgid "Announced network"
+msgstr "Объявленная сеть"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+"Оба значения должны быть в десятичном представлении с разделительными "
+"точками."
+
+msgid "Broadcast address"
+msgstr "Широковещательный адрес"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "Показать"
+
+msgid "Downlink"
+msgstr "Нисходящий канал"
+
+msgid "Download Config"
+msgstr "Загрузить конфигурацию"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"Включить SmartGateway. Если выключено, все остальные параметры SmartGateway "
+"игнорируются. По умолчанию \"нет\"."
+
+msgid "Enable this interface."
+msgstr "Использовать этот интерфейс."
+
+msgid "Enabled"
+msgstr "Включено"
+
+msgid "Expected retransmission count"
+msgstr "Ожидаемое количество повторных передач"
+
+msgid "FIB metric"
+msgstr "Метрика FIB"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+"Метрика FIB управляет значением метрики хост-маршрутов, которые "
+"устанавливает OLSRd. При \"flat\" значение метрики всегда равно 2. Это "
+"предпочтительное значение, помогающее ядру Linux очищать устаревшие "
+"маршруты. При \"correct\" используется счётчик прыжков в качестве значения "
+"метрики. \"approx\" также испозьзует счётчик прыжков, но его обновление "
+"происходит только при изменении следующего прыжка. По умолчанию используется "
+"\"flat\"."
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr "Механизм рыбьего глаза для TC. По умолчанию \"включено\""
+
+msgid "Gateway"
+msgstr "Шлюз"
+
+msgid "General Settings"
+msgstr "Общие настройки"
+
+msgid "General settings"
+msgstr "Общие настройки"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "Объявления HNA"
+
+msgid "HNA interval"
+msgstr "HNA интервал"
+
+msgid "HNA validity time"
+msgstr "Время действия HNA"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Объявления HNA"
+
+msgid "Hello"
+msgstr "Приветственное сообщение"
+
+msgid "Hello interval"
+msgstr "Интервал приветственных сообщений"
+
+msgid "Hello validity time"
+msgstr "Время действия приветственного сообщения"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "Прыжки"
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+"Хосты в маршрутизируемой сети OLSR могут извещать о подключении к внешним "
+"сетям с помощью сообщений HNA."
+
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Хосты в маршрутизируемой сети OLSR могут извещать о подключении к внешним "
+"сетям с помощью сообщений HNA."
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+"Гистерезис для автоопределения канала (только для метрики кол-ва прыжков). "
+"Гистерезис увеличивает надёжность канала, но вносит задержку в регистрацию "
+"соседних устройств. По умолчанию \"да\""
+
+msgid "IP Addresses"
+msgstr "IP-адреса"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+"Версия IP, которая будет использована. Если выбрано 6and4, olsrd будет "
+"запущен для каждой версии."
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "Широковещательный IPv4"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+"Широковещательный IPv4-адрес для исходящих OLSR-пакетов, например, "
+"255.255.255.255. Адрес по умолчанию \"0.0.0.0\" ведёт к использованию "
+"широковещательного IP-адреса интерфейса."
+
+msgid "IPv4 source"
+msgstr "IPv4-источник"
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+"IPv4-адрес отправителя для исходящих OLSR-пакетов. Адрес по умолчанию "
+"\"0.0.0.0\" включает использование IP-адреса интерфейса."
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 multicast"
+msgstr "Групповой IPv6"
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr "Групповой IPv6-адрес. По умолчанию \"FF02::6D\"."
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+"IPv6-сеть должна быть указана в полной нотации, префикс должен быть в "
+"нотации CIDR."
+
+msgid "IPv6 source"
+msgstr "IPv6-источник"
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+"Префикс источника IPv6. OLSRd выберет один из IP-адресов интерфейса, "
+"соответствующий данному префиксу. По умолчанию \"0::/0\" включает "
+"использование нелокального IP-адреса интерфейса."
+
+msgid "IPv6-Prefix of the uplink"
+msgstr "IPv6-префикс восходящего канала"
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+"Если маршрут к текущему шлюзу должен быть изменён, значение ETX данного "
+"шлюза умножается на указанное число перед сравнением с новым значением. "
+"Значение данного параметра может быть в пределах от 0.1 до 1.0, но при "
+"изменении должно быть ближе к 1.0.<br /><b>ВНИМАНИЕ:</b>Не используйте "
+"данный параметр вместе с метрикой etx_ffeth!<br />По умолчанию \"1.0\"."
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+"Использует ли данный узел NAT для подключения к интернету. По умолчанию \"да"
+"\"."
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+"Режим интерфейса используется для предотвращения ненужных перенаправлений на "
+"коммутируемых Ethernet-интерфейсах. Возможные значения режима: \"mesh\" и "
+"\"ether\". По умолчанию \"mesh\"."
+
+msgid "Interfaces"
+msgstr "Интерфейсы"
+
+msgid "Interfaces Defaults"
+msgstr "Значения по умолчанию для интерфейсов"
+
+msgid "Internet protocol"
+msgstr "Интернет-протокол"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+"Интервал опроса сетвых интерфейсов на наличие изменений в конфигурации "
+"(сек.). По умолчанию, \"2.5\"."
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "Известные OLSR-маршруты"
+
+msgid "LQ"
+msgstr "LQ"
+
+msgid "LQ aging"
+msgstr "Старение LQ"
+
+msgid "LQ algorithm"
+msgstr "Алгоритм LQ"
+
+#, fuzzy
+msgid "LQ fisheye"
+msgstr "Рыбий глаз LQ"
+
+msgid "LQ level"
+msgstr "Уровень LQ"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "Последний прыжок"
+
+msgid "Legend"
+msgstr "Легенда"
+
+msgid "Library"
+msgstr "Библиотека"
+
+msgid "Link Quality Settings"
+msgstr "Настройки качества соединения (LQ)"
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+"Коэффициент старения LQ (только для уровня LQ, равного 2). Параметр "
+"подстройки для etx_float и etx_fpm. Чем меньше значение, тем меньше "
+"изменения значения ETX. Диапазон допустимых значений от 0.01 до 1.0."
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+"Алгоритм LQ (только для уровня LQ, равного 2).<br /><b>etx_float</b>: ETX с "
+"плавающей точкой и экспоненциальным старением<br /><b>etx_fpm</b> : тоже что "
+"и etx_float, но с целочисленной арифметикой<br /><b>etx_ff</b> : ETX "
+"freifunk, использует весь трафик OLSR для расчета ETX<br /><b>etx_ffeth</b>: "
+"несовместимый вариант etx_ff, разрешающий Ethernet-соединения с ETX 0.1.<br /"
+">По умолчанию \"etx_ff\""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+"Переключатель уровня LQ между маршрутизацией по кол-во прыжков и ETX.<br /"
+"><b>0</b> = не использовать LQ<br /><b>2</b> = использовать LQ для выбора "
+"MPR и маршрутизации<br />По умолчанию \"2\""
+
+msgid "LinkQuality Multiplicator"
+msgstr "Множитель LQ"
+
+msgid "Links per node (average)"
+msgstr "Кол-во соединений на узел (среднее)"
+
+msgid "Links total"
+msgstr "Общее кол-во соединений"
+
+msgid "Local interface IP"
+msgstr "IP-адрес локального интерфейса"
+
+msgid "MID"
+msgstr "MID"
+
+msgid "MID interval"
+msgstr "Интервал MID"
+
+msgid "MID validity time"
+msgstr "Время действия MID"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Main IP"
+msgstr "Основной IP-адрес"
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr "Метрика"
+
+msgid "Mode"
+msgstr "Режим"
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Умножить маршруты на указанный коэффициент в пределах от 0.01 до 1. Данный "
+"коэффициент используется только в случае, если LQ уровень > 0. Примеры:<br /"
+">уменьшить LQ для 192.168.0.1 на половину: 192.168.0.1 0.5<br />уменьшить LQ "
+"для всех узлов на данном интерфейсе на 20%: default 0.8"
+
+msgid "NAT threshold"
+msgstr "Порог NAT"
+
+msgid "NLQ"
+msgstr "NLQ"
+
+msgid "Neighbors"
+msgstr "Соседние узлы"
+
+msgid "Neighbour IP"
+msgstr "Соседние IP-адреса"
+
+msgid "Neighbours"
+msgstr "Соседние узлы"
+
+msgid "Netmask"
+msgstr "Маска сети"
+
+msgid "Network"
+msgstr "Сеть"
+
+msgid "Network address"
+msgstr "Сетевой адрес"
+
+msgid "Nic changes poll interval"
+msgstr "Интервал опроса изменений NIC"
+
+msgid "Nodes"
+msgstr "Узлы"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "OLSR - Display Options"
+msgstr "OLSR - Настройки отображения"
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - HNA-объявления"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA-объявления"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Модули"
+
+msgid "OLSR Daemon"
+msgstr "Сервис OLSR"
+
+msgid "OLSR Daemon - Interface"
+msgstr "Сервис OLSR - Интерфейс"
+
+msgid "OLSR connections"
+msgstr "OLSR-соединения"
+
+msgid "OLSR gateway"
+msgstr "OLSR-шлюз"
+
+msgid "OLSR node"
+msgstr "OLSR-узел"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr "Обзор"
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Обзор текущих активных OLSR-объявлений HNA"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Обзор установленных OLSR-соединений"
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Обзор текущих известных OLSR-узлов"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Обзор известных маршрутов к OLSR-узлам"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr "Обзор интерфейсов с запущенным OLSR"
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Обзор известных мульти-интерфейсных извещений"
+
+# Может таки "умные" шлюзы? Или вообще SmartGW...
+#, fuzzy
+msgid "Overview of smart gateways in this network"
+msgstr "Обзор смарт-шлюзов в сети"
+
+msgid "Plugin configuration"
+msgstr "Настройки модулей"
+
+msgid "Plugins"
+msgstr "Модули"
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr "Периодичность опроса OLSR-сокетов в секундах. 0.05 по умолчанию."
+
+msgid "Pollrate"
+msgstr "Частота опроса"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Prefix"
+msgstr "Префикс"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr "Разрешать имена"
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+"Разрешать имена хостов на страницах состояния. Не используйте данную "
+"функцию, если у вас публичный IP-адрес и нестабильный DNS. В противном "
+"случае загрузка страниц состояния может происходить очень медленно."
+
+msgid "Routes"
+msgstr "Маршруты"
+
+msgid "Secondary OLSR interfaces"
+msgstr "Вторичные OLSR-интерфейсы"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+"Устанавливает основной IP-адрес маршрутизатора. Данный адрес НИКОГДА не "
+"будет изменяться во время работы olsrd. По умолчанию 0.0.0.0 (используется "
+"IP-адрес первого сетевого интерфейса)."
+
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Устанавливает основной IP-адрес маршрутизатора. Данный адрес НИКОГДА не "
+"будет изменяться во время работы olsrd. По умолчанию 0.0.0.0 (используется "
+"IP-адрес первого сетевого интерфейса)."
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr "SmartGW"
+
+msgid "SmartGW announcements"
+msgstr "Объявления SmartGW"
+
+msgid "SmartGateway is not configured on this system."
+msgstr "SmartGW не сконфигурирован на этой системе."
+
+msgid "Source address"
+msgstr "Адрес источника"
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+"Устанавливает скорость восходящего канала (кбит/с). Первый параметр "
+"указывает на прямое, а второй на обратное направление. По умолчанию \"128 "
+"1024\"."
+
+msgid "Speed of the uplink"
+msgstr "Скорость восходящего канала"
+
+msgid "State"
+msgstr "Состояние"
+
+msgid "Status"
+msgstr "Статус"
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr "Достигнутая скорость приема посылок от соседних узлов"
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr "Достигнутая скорость передачи посылок к соседним узлам"
+
+msgid "TC"
+msgstr "TC"
+
+msgid "TC interval"
+msgstr "Интервал TC"
+
+msgid "TC validity time"
+msgstr "Время действия TC"
+
+msgid "TOS value"
+msgstr "Значение ToS"
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+"Сервис OLSRd реализует поддержку протокола OLSR (Optimized Link State "
+"Routing) и тем самым обеспечивает ячеистую маршрутизацию для любого сетевого "
+"оборудования. OLSRd может работать на любом Wi-Fi-адаптере или устройстве "
+"Ethernet с поддержкой режима ad-hoc. Более подробную информацию можно найти "
+"на <a href='http://www.olsr.org'>olsr.org</a>."
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+"Фиксированное значение готовности. Если не задано, то будет рассчитываться "
+"динамически на основе состояния батареи/питания. По умолчанию \"3\"."
+
+msgid "The interface OLSRd should serve."
+msgstr "Интерфейс, обслуживаемый OLSRd."
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+"Порт, используемый для OLSR. Рекомендуется использовать присвоенный IANA "
+"порт 698. Допустимо любое значение в диапазоне от 1 до 65535."
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+"Может быть использовано для оповещения клиентов об IPv6-префиксе восходящего "
+"канала. Это может позволить клиентам изменять свой локальный IPv6-адрес для "
+"использования IPv6-шлюза без какой-либо трансляции адресов. Максимальная "
+"длина префикса - 64 бита. По умолчанию \"::/0\" (без префикса)."
+
+msgid "Timing and Validity"
+msgstr "Время и сроки действия"
+
+msgid "Topology"
+msgstr "Топология"
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+"Значение поля ToS IP -аголовка управляющего трафика. По умолчанию \"16\"."
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Не удалось подключиться к сервису OLSR!"
+
+msgid "Uplink"
+msgstr "Восходящий канал"
+
+msgid "Uplink uses NAT"
+msgstr "Восходящий канал использует NAT"
+
+msgid "Use hysteresis"
+msgstr "Использовать гистерезис"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr "Версия"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr "WLAN"
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+"Внимание: kmod-ipip не установлен. Без kmod-ipip SmartGateway не будет "
+"работать, пожалуйста, установите этот пакет."
+
+msgid "Weight"
+msgstr "Вес"
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+"При использовании нескольких соединений между хостами, вес служит для выбора "
+"используемого интерфейса. Обычно, вес рассчитывается автоматически olsrd на "
+"основе характеристик интерфейса, но данное поле позволяет установить вес "
+"вручную. Olsrd выберет соединения с наименьшим значением веса.<br /"
+"><b>Замечание: вес интерфейса используется только в случае установки поля "
+"\"Уровень LQ\" в 0. Для любых других значений поля \"Уровень LQ\", "
+"используется значение поля ETX."
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+"Какой вид восходящего канала экпортируется другим узлам ячеистой сети. "
+"Определение восходящего канала происходит при наличии в локальном HNA "
+"0.0.0.0/0, ::ffff:0:0/96 или 2000::/3. Значение по умолчанию: \"оба\"."
+
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Какой вид восходящего канала экпортируется другим узлам ячеистой сети. "
+"Определение восходящего канала происходит при наличии в локальном HNA "
+"0.0.0.0/0, ::ffff:0:0/96 или 2000::/3. Значение по умолчанию: \"оба\"."
+
+msgid "Willingness"
+msgstr "Готовность"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "Устройство"
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Удостоверьтесь, что OLSRd работает, модуль \"txtinfo\" загружен, настроен "
+#~ "на порт 2006 и принимает соединения от \"127.0.0.1\"."
diff --git a/trunk/package/luci/po/ru/openvpn.po b/trunk/package/luci/po/ru/openvpn.po
new file mode 100644
index 00000000..4bae5a29
--- /dev/null
+++ b/trunk/package/luci/po/ru/openvpn.po
@@ -0,0 +1,575 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: openvpn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-09-06 10:01+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p' или 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Принимать опции, отправленные с сервера"
+
+msgid "Add"
+msgstr "Добавить"
+
+msgid "Add route after establishing connection"
+msgstr "Добавить маршрут после установки соединения"
+
+msgid "Additional authentication over TLS"
+msgstr "Дополнительная аутентификация через TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Разрешить общение клиентов друг с другом"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Разрешить несколько клиентов с одним сертификатом"
+
+msgid "Allow only one session"
+msgstr "Разрешить только одну сессию"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Позволить удалённому хосту изменять IP-адрес или порт"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Разрешённое максимальное количество подключенных клиентов"
+
+msgid "Allowed maximum of internal"
+msgstr "Разрешённое максимальное количество внутренних"
+
+msgid "Allowed maximum of new connections"
+msgstr "Разрешённое максимальное количество новых соединений"
+
+msgid "Append log to file"
+msgstr "Дописать журнал в файл"
+
+msgid "Authenticate using username/password"
+msgstr "Аутентификация с использованием имени пользователя и пароля"
+
+msgid "Automatically redirect default route"
+msgstr "Автоматически перенаправлять маршруты по умолчанию"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr "Список настроенных процессов OpenVPN и их текущее состояние"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "Команда/скрипт, запускаем(ая/ый) перед закрытием TUN/TAP"
+
+msgid "Certificate authority"
+msgstr "Центр сертификации"
+
+msgid "Change process priority"
+msgstr "Изменить приоритет процесса"
+
+msgid "Change to directory before initialization"
+msgstr "Перейти в указанную директорию перед инициализацией"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Проверить сертификат пира в CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Выполнить chroot на указанную директорию после инициализации"
+
+msgid "Client is disabled"
+msgstr "Клиент выключен"
+
+msgid "Configuration category"
+msgstr "Категория конфигурации"
+
+msgid "Configure client mode"
+msgstr "Настроить режим клиента"
+
+msgid "Configure server bridge"
+msgstr "Настроить мост"
+
+msgid "Configure server mode"
+msgstr "Настроить режим сервера"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Соединяться используя Socks5-прокси"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "Подключиться к удалённому хосту через HTTP-прокси"
+
+msgid "Connection retry interval"
+msgstr "Интервал между попытками подключения"
+
+msgid "Cryptography"
+msgstr "Криптография"
+
+msgid "Daemonize after initialization"
+msgstr "Перейти в режим демона после инициализации"
+
+msgid "Delay n seconds after connection"
+msgstr "Задержка n секунд после подключения"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+"Использовать задержку перед открытием устройства tun и выполнением скрипта"
+
+msgid "Diffie Hellman parameters"
+msgstr "Параметры алгоритма DH"
+
+msgid "Directory for custom client config files"
+msgstr "Директория пользовательских файлов конфигурации клиентов"
+
+msgid "Disable Paging"
+msgstr "Выключить пейджинг"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Выключить вектор инициализации шифра"
+
+msgid "Disable options consistency check"
+msgstr "Выключить проверку целостности опций"
+
+msgid "Disable replay protection"
+msgstr "Отключить проверку повторов"
+
+msgid "Do not bind to local address and port"
+msgstr "Не выполнять привязку к локальному адресу и порту"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Не выполнять ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "Не добавлять маршруты автоматически"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "Не кешировать пароли --askpass или --auth-user-pass"
+
+#, fuzzy
+msgid "Don't inherit global push options"
+msgstr "Не наследовать глобальные параметры push"
+
+msgid "Don't log timestamps"
+msgstr "Не записывать отметки времени в журнал"
+
+msgid "Don't re-read key on restart"
+msgstr "Не считывать заново ключ при перезапуске"
+
+msgid "Don't require client certificate"
+msgstr "Не требовать сертификат у клиента"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Не использовать адаптивное сжатие LZO"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Не извещать об ошибках ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Выводить параметры в журнал"
+
+msgid "Empirically measure MTU"
+msgstr "Эмпирически измерять MTU"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Включить поддержку аппаратного шифрования OpenSSL"
+
+msgid "Enable Path MTU discovery"
+msgstr "Включить обнаружение пути MTU (PMTUD)"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Включить шифрование с постоянным ключом (не TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Включить TLS в режиме клиента"
+
+msgid "Enable TLS and assume server role"
+msgstr "Включить TLS в режиме сервера"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Включить внутреннюю фрагментацию дейтаграмм"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Включить интерфейс управления на <em>IP</em> <em>порту</em>"
+
+msgid "Enabled"
+msgstr "Включено"
+
+msgid "Encryption cipher for packets"
+msgstr "Шифрование для пакетов"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Выполнить shell-команду после добавления маршрутов"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Выполнить shell-команду при изменении IP-адреса удалённого хоста"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+"Выполняется в режиме сервера при появлении новых клиентских соединений, если "
+"к клиенту ещё нет доверия"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+"Выполняется в режиме сервера, когда адрес/маршрут IPv4 или MAC-адрес "
+"добавлен в таблицу маршрутизации OpenVPN"
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Выйти при ошибке согласования TLS"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Получить пароль PEM от управляющей консоли перед уходом в фон"
+
+msgid "HMAC authentication for packets"
+msgstr "HMAC-аутентификация для пакетов"
+
+msgid "Handling of authentication failures"
+msgstr "Обработка ошибок аутентификации"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+"Вспомогательная директива для упрощения выражений --ping и --ping-restart в "
+"конфигурациях серверного режима"
+
+msgid "If hostname resolve fails, retry"
+msgstr "Пытаться заново подключиться при ошибке определения имени хоста"
+
+msgid "Instance \"%s\""
+msgstr "Процесс \"%s\""
+
+msgid "Invalid"
+msgstr "Неверный"
+
+msgid "Keep local IP address on restart"
+msgstr "Не изменять локальный IP-адрес при перезапуске"
+
+msgid "Keep remote IP address on restart"
+msgstr "Не изменять удалённый IP-адрес при перезапуске"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Не закрывать устройство tun/tap при перезапуске"
+
+# Может "Окно перехода ключей", надо смотреть контекст
+#, fuzzy
+msgid "Key transition window"
+msgstr "Окно передачи ключей"
+
+msgid "Limit repeated log messages"
+msgstr "Ограничить повторяющиеся сообщения журнала"
+
+msgid "Local certificate"
+msgstr "Локальный сертификат"
+
+msgid "Local host name or ip address"
+msgstr "Имя локального хоста или IP-адрес"
+
+msgid "Local private key"
+msgstr "Локальный секретный ключ"
+
+msgid "Major mode"
+msgstr "Основной режим"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Включить поддержку IPv6 для устройства tun"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Максимальное количество исходящих TCP-пакетов в очереди"
+
+msgid "Networking"
+msgstr "Сеть"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Количество выделенных широковещательных буферов"
+
+msgid "Number of lines for log file history"
+msgstr "Количество строк в файле журнала"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Принимать соединения только от данного имени X509"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+"Обрабатывать таймаут ping-запросов только в случае, когда существует "
+"необходимый маршрут"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "Процессы OpenVPN"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Оптимизировать запись TUN/TAP/UDP"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Выводить сообщения в системный журнал и не переходить в фоновый режим"
+
+msgid "Overview"
+msgstr "Обзор"
+
+msgid "PKCS#12 file containing keys"
+msgstr "Файл с ключами PKCS#12"
+
+msgid "Pass environment variables to script"
+msgstr "Передавать переменные окружения скрипту"
+
+msgid "Persist replay-protection state"
+msgstr "Сохранять состояние защищённого ответа"
+
+#, fuzzy
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Сохранять/не сохранять пул ifconfig"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Выполнять ping каждые n секунд, используя порт TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr "Уровень безопасности для внешних программ и скриптов"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Proxy timeout in seconds"
+msgstr "Таймаут прокси (сек.)"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Передавать опцию ifconfig удалённой стороне"
+
+msgid "Push options to peer"
+msgstr "Передавать опции пиру"
+
+msgid "Query management channel for private key"
+msgstr "Запросить канал управления для закрытого ключа"
+
+msgid "Randomly choose remote server"
+msgstr "Случайно выбирать удалённый сервер"
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+"Разорвать соединение, если пользовательская конфигурация клиента отсутствует"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Обрабатывать сигнал SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Имя удалённого хоста или IP-адрес"
+
+msgid "Remote ping timeout"
+msgstr "Таймаут удалённых ping-запросов"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Пересогласовать ключ канала данных после кол-ва байт"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Пересогласовать ключ канала данных после кол-ва пакетов"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Пересогласовать ключ канала данных после кол-ва секунд"
+
+#, fuzzy
+msgid "Replay protection sliding window size"
+msgstr "Размер скользящего окна защиты от повторов"
+
+msgid "Require explicit designation on certificate"
+msgstr "Требовать явного указания в сертификате"
+
+msgid "Require explicit key usage on certificate"
+msgstr "Требовать явного использования ключа в сертификате"
+
+msgid "Restart after remote ping timeout"
+msgstr "Начать заново после таймаута ping-запроса"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Таймаут повторной отправки канала управления TLS"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Постоянно пытаться заново подключиться при ошибке HTTP-прокси"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Постоянно пытаться заново подключиться при ошибке Socks-прокси"
+
+msgid "Route subnet to client"
+msgstr "Перенаправить подсеть клиенту"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Запустить как inetd- или xinetd-сервер"
+
+msgid "Run script cmd on client connection"
+msgstr "Выполнить скрипт при подключении клиента"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Выполнить скрипт при отключении клиента"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Запускать up/down скрипты для всех перезапусков"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Послать уведомление пиру при разъединении"
+
+msgid "Service"
+msgstr "Служба"
+
+msgid "Set GID to group"
+msgstr "Установить GID группе"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Установить TCP/UDP MTU"
+
+msgid "Set UID to user"
+msgstr "Установить UID пользователю"
+
+#, fuzzy
+msgid "Set aside a pool of subnets"
+msgstr "Установить пул подсетей"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Установить расширенные настройки HTTP-прокси"
+
+msgid "Set output verbosity"
+msgstr "Установить уровень вывода"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Установить размер реальной и виртуальной хеш-таблиц"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Установить размер буфера приёма TCP/UDP"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Установить размер буфера передачи TCP/UDP"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Установить размер очереди передачи tun/tap"
+
+msgid "Set tun/tap adapter parameters"
+msgstr "Установить параметры адаптера tun/tap"
+
+msgid "Set tun/tap device MTU"
+msgstr "Установить MTU для tun/tap устройства"
+
+msgid "Set tun/tap device overhead"
+msgstr "Установить накладные расходы tun/tap устройства"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Установить верхнюю границу для TCP MSS"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Шейпинг пропускной способности пира"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Выполнить shell-команду после открытия устройства tun"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Выполнить shell-команду после закрытия устройства tun"
+
+msgid "Shell command to verify X509 name"
+msgstr "Shell-команда для проверки имени X509"
+
+msgid "Silence the output of replay warnings"
+msgstr "Заглушить вывод предупреждений повторов"
+
+msgid "Size of cipher key"
+msgstr "Размер ключа шифрования"
+
+msgid "Specify a default gateway for routes"
+msgstr "Установить шлюз по умолчанию для маршрутов"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Запустить OpenVPN в спящем режиме"
+
+msgid "Start/Stop"
+msgstr "Старт/Стоп"
+
+msgid "Started"
+msgstr "Запущено"
+
+msgid "Status file format version"
+msgstr "Версия формата статусного файла"
+
+msgid "Switch to advanced configuration »"
+msgstr "Перейти к расширенным настройкам »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Номер локального и удалённого TCP/UDP порта"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Номер локального TCP/UDP порта (1194 по умолчанию)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Номер удалённого TCP/UDP порта (1194 по умолчанию)"
+
+msgid "TLS cipher"
+msgstr "Шифр TLS"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "Пропуск ToS (только для IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Временная директория для файла возрата подключения клиента"
+
+msgid "Timeframe for key exchange"
+msgstr "Временное окно для обмена ключами"
+
+msgid "Type of used device"
+msgstr "Тип используемого устройства"
+
+msgid "Use fast LZO compression"
+msgstr "Использовать быстрое сжатие LZO"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Использовать адреса вместо подсетей /30"
+
+msgid "Use protocol"
+msgstr "Использовать протокол"
+
+msgid "Use tun/tap device node"
+msgstr "Использовать файл устройства tun/tap"
+
+msgid "Use username as common name"
+msgstr "Использовать имя пользователя как общее имя"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "Записать журнал в файл"
+
+msgid "Write process ID to file"
+msgstr "Записать ID процесса в файл"
+
+msgid "Write status to file every n seconds"
+msgstr "Записывать статус в файл каждые n секунд"
+
+msgid "no"
+msgstr "нет"
+
+msgid "tun/tap device"
+msgstr "устройство tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr "таймаут простоя tun/tap"
+
+msgid "yes (%i)"
+msgstr "да (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« Перейти к основным настройкам"
+
+#~ msgid "openvpn_%s"
+#~ msgstr "openvpn_%s"
+
+#~ msgid "openvpn_%s_desc"
+#~ msgstr "openvpn_%s_описание"
diff --git a/trunk/package/luci/po/ru/p2pblock.po b/trunk/package/luci/po/ru/p2pblock.po
new file mode 100644
index 00000000..f6a27401
--- /dev/null
+++ b/trunk/package/luci/po/ru/p2pblock.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: p2pblock\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-01 12:02+0200\n"
+"PO-Revision-Date: 2013-11-13 18:46+0200\n"
+"Last-Translator: Роман <x.wserfer@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Block Time"
+msgstr "Время блокировки"
+
+msgid "Enable P2P-Block"
+msgstr "Включить блокировку P2P"
+
+#, fuzzy
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Протоколы 7-го уровня"
+
+msgid "P2P-Block"
+msgstr "Блокировка P2P"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"Блокировка P2P позволяет запретить P2P-протоколы для клиентов вне белого "
+"списка."
+
+msgid "Portrange"
+msgstr "Диапазон портов"
+
+msgid "Whitelisted IPs"
+msgstr "Белый список IP"
+
+msgid "seconds"
+msgstr "секунды"
diff --git a/trunk/package/luci/po/ru/p910nd.po b/trunk/package/luci/po/ru/p910nd.po
new file mode 100644
index 00000000..923b22e0
--- /dev/null
+++ b/trunk/package/luci/po/ru/p910nd.po
@@ -0,0 +1,57 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: p910nd\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 11:42+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Bidirectional mode"
+msgstr "Двунаправленный режим"
+
+msgid "Device"
+msgstr "Устройство"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Для начала вам необходимо установить пакеты для поддержки USB (kmod-usb-"
+"printer) или параллельного порта (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Settings"
+msgstr "Настройки"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "Прослушиваемый TCP-порт."
+
+msgid "enable"
+msgstr "включить"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - сервер печати"
+
+#~ msgid "port_help"
+#~ msgstr "Помощь по портам"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr ""
+#~ "p910nd прослушивает порт 910+N. То есть 9100 - номер первого принтера."
diff --git a/trunk/package/luci/po/ru/pbx-voicemail.po b/trunk/package/luci/po/ru/pbx-voicemail.po
new file mode 100644
index 00000000..ae49c6dd
--- /dev/null
+++ b/trunk/package/luci/po/ru/pbx-voicemail.po
@@ -0,0 +1,174 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: pbx-voicemail\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 17:42+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "Адрес эл. почты для получения голосовой почты"
+
+msgid "Enable Voicemail"
+msgstr "Включить голосовую почту"
+
+msgid "Global Voicemail Setup"
+msgstr "Глобальные настройки голосовой почты"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"Здесь Вы можете настроить голосовую почту АТС. Так как данная система "
+"является встраиваемой и предназначена для таких устройств как, например, "
+"маршрутизаторы, локальное хранилище голосовой почты отсутствует. Голосовая "
+"почта пересылается через электронную почту. Следовательно, вам нужно указать "
+"сервер исходящей почты (SMTP) и перечислить адреса, на которые будет "
+"пересылаться голосовая почта."
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"Чтобы отсылать электронную почту с записями голосовой почты, вам необходимо "
+"указать SMTP-сервер. Вы можете использовать SMTP-сервер вашего интернет-"
+"провайдера или любой другой, например, SMTP-сервер Google или Yahoo."
+
+msgid "Last Sent Voicemail Log"
+msgstr "Запись журнала последнего отправленного сообщения голосовой почты"
+
+msgid "Local Storage Directory"
+msgstr "Локальная директория хранения"
+
+msgid "No"
+msgstr "Нет"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "Сервер исходящей почты (SMTP)"
+
+msgid "SMTP Password"
+msgstr "Пароль SMTP"
+
+msgid "SMTP Port Number"
+msgstr "Номер порта SMTP"
+
+msgid "SMTP Server Authentication"
+msgstr "Аутентификация SMTP-сервера"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "Имя SMTP-сервера или IP-адрес"
+
+msgid "SMTP User Name"
+msgstr "Имя пользователя SMTP"
+
+msgid "Secure Connection Using TLS"
+msgstr "Защищенное соединение с использованием TLS"
+
+msgid "Voicemail Setup"
+msgstr "Настройка голосовой почты"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+"При включении голосовой почты, у вас будет возможность указать адреса "
+"электронной почты, на которые будут отправляться записи голосовой почты. Вы "
+"также должны указать SMTP-сервер ниже."
+
+msgid "Yes"
+msgstr "Да"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"Вы также можете сохранять копии сообщений голосовой почты локально на "
+"устройстве с запущенной АТС. Указанный здесь путь будет создан в случае его "
+"отсутствия. Учитывайте, что пространство для хранения сообщений голосовой "
+"почты может быть ограничено вашим устройством."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
+"Ваш настоящий пароль SMTP здесь не показан. Он будет изменён только тогда, "
+"когда вы измените значение в этом поле."
+
+#~ msgid "Directory to save voicemail into"
+#~ msgstr "Директория для сохранения голосовой почты"
+
+#~ msgid "Email addresses to forward to"
+#~ msgstr "Адрес эл. почты для перенаправления"
+
+#~ msgid "Enabled"
+#~ msgstr "Включено"
+
+#~ msgid ""
+#~ "Here you can configure a global voicemail for this PBX. Since this system "
+#~ "is intended to run on embedded systems like routers, there is no local "
+#~ "storage of voicemail - it must be sent out by email. Therefore you need "
+#~ "to configure an outgoing mail (SMTP) server (for example the SMTP server "
+#~ "your ISP provides, or GMail), and provide a list of addresses the "
+#~ "voicemail will be sent to."
+#~ msgstr ""
+#~ "Здесь Вы можете настроить голосовую почту АТС. Так как данная система "
+#~ "является встраиваемой и предназначена для таких устройств как, например, "
+#~ "маршрутизаторы, локальное хранилище голосовой почты отсутствует. "
+#~ "Голосовая почта пересылается через электронную почту. Следовательно, Вам "
+#~ "нужно указать сервер (SMTP) исходящей почты и перечислить адреса на "
+#~ "которые будет пересылаться голосовая почта."
+
+#~ msgid ""
+#~ "In order for this PBX to send emails containing voicemail recordings, you "
+#~ "need to set up an SMTP server here. Your ISP usually provides an SMTP "
+#~ "server for that purpose. You can also set up a GMail, Yahoo, or other 3rd "
+#~ "party SMTP server."
+#~ msgstr ""
+#~ "Чтобы отсылать электронную почту с записями голосовой почты, Вам "
+#~ "необходимо указать SMTP сервер. Вы можете использовать SMTP сервер вашего "
+#~ "интернет провайдера или любой другой, например, SMTP сервер GMail или "
+#~ "Yahoo."
+
+#~ msgid "SMTP port number"
+#~ msgstr "Номер порта SMTP"
+
+#~ msgid "SMTP server authentication"
+#~ msgstr "Аутентификация SMTP сервера"
+
+#~ msgid "SMTP server hostname or IP"
+#~ msgstr "Имя SMTP сервера или IP адрес"
+
+#~ msgid "SMTP user name"
+#~ msgstr "Имя пользователя SMTP"
+
+#~ msgid "Timeout before sending callers to voicemail"
+#~ msgstr "Таймаут перед перенаправлением звонящих на голосовую почту"
+
+#~ msgid "Use TLS (secure connection)"
+#~ msgstr "Использовать TLS (защищенное соединение)"
+
+#~ msgid ""
+#~ "When you enable voicemail, you will have the opportunity to specify email "
+#~ "addresses which receive the message. You must also set up an SMTP server "
+#~ "below."
+#~ msgstr ""
+#~ "При включении голосовой почты, у Вас будет возможность указать адреса "
+#~ "электронной почты на которые будут отправляться записи голосовой почты. "
+#~ "Вы также должны указать SMTP сервер ниже."
diff --git a/trunk/package/luci/po/ru/pbx.po b/trunk/package/luci/po/ru/pbx.po
new file mode 100644
index 00000000..e85c947e
--- /dev/null
+++ b/trunk/package/luci/po/ru/pbx.po
@@ -0,0 +1,525 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-06 10:28+0200\n"
+"Last-Translator: datasheet <michael.gritsaenko@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Расширенные установки"
+
+msgid "Available"
+msgstr "Доступен"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+"Старайтесь не использовать ничего, кроме алфавитно-цифровых символов, "
+"пробелов, запятых и точек."
+
+msgid "Away"
+msgstr "Отошел"
+
+msgid "Blacklisted Numbers"
+msgstr "Номера в \"черном\" списке"
+
+msgid "Call Routing"
+msgstr "Маршрутизация вызовов"
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr "Номера сквозных вызовов"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Вставьте большие списки номеров здесь"
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr "Не беспокоить"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Динамический список запрещенных номеров"
+
+msgid "Email"
+msgstr "Эл. почта"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Разрешить входящие вызовы (регистрация через SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Разрешить входящие звонки (см. ниже Статус)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Разрешить исходящие вызовы"
+
+msgid "Enabled"
+msgstr "Включено"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"Введите телефонные номера, звонки с которых вы хотите автоматически "
+"отклонять. Вы, вероятно, не должны вводить код страны и ведущие нули, но, "
+"чтобы удостовериться в этом, пожалуйста проверьте, что звонки из "
+"нежелательной зоны успешно блокируются."
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"Введите этот IP (или IP порт) в установках Сервера/Регистратора SIP "
+"устройств, который вы будете использовать ТОЛЬКО локально и никогда удаленно."
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"Введите это имя_хоста (или имя_хоста:порт) в установках Сервера/Регистратора "
+"тех SIP-устройств, которые вы будете использовать удаленно (локально они "
+"также будут работать)."
+
+msgid "External SIP Port"
+msgstr "Внешний порт SIP"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Полное имя"
+
+msgid "General Settings"
+msgstr "Общие установки"
+
+msgid "Google Accounts"
+msgstr "Учетные записи Google"
+
+msgid "Google Talk Status"
+msgstr "Статус Google Talk"
+
+msgid "Google Talk Status Message"
+msgstr "Сообщение статуса Google Talk"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Учетные записи Google Voice/Talk"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "Входящие вызовы"
+
+msgid "Insert QoS Rules"
+msgstr "Вставить правила QoS"
+
+msgid "Makes Outgoing Calls"
+msgstr "Совершает исходящие вызовы"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr "Нет"
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr "Outbound прокси сервер"
+
+msgid "Outgoing Calls"
+msgstr "Исходящие вызовы"
+
+msgid "PBX Main Page"
+msgstr "Главная страница АТС"
+
+#, fuzzy
+msgid "PBX Service Status"
+msgstr "Состояние службы АТС"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr "Настройки порта устройств SIP"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "Провайдеры исходящих вызовов"
+
+msgid "QoS Settings"
+msgstr "Установки QoS"
+
+msgid "RTP Port Range End"
+msgstr "Конец диапазона портов RTP"
+
+msgid "RTP Port Range Start"
+msgstr "Начало диапазоно портов RTP"
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr "Принимает входящие вызовы"
+
+msgid "Remote Usage"
+msgstr "Удаленное использование"
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr "Учетные записи SIP"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "Учетные записи SIP устройства/программного телефона"
+
+msgid "SIP Provider Accounts"
+msgstr "Учетные записи SIP провайдера"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "SIP Realm (нужен для некоторых провайдеров)"
+
+msgid "SIP Server/Registrar"
+msgstr "SIP Сервер/Регистратор"
+
+msgid "SIP Server/Registrar Port"
+msgstr "Порт SIP Сервера/Регистратора"
+
+msgid "Server Setting"
+msgstr "Настройки сервера"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "Установки сервера для локальных SIP устройств"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "Настройки сервера для удаленных SIP устройств"
+
+msgid "Service Status"
+msgstr "Состояние сервиса"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr "Черный список номеров (пробел между номерами для разделения)"
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+"Укажите отдельные номера. Нажмите enter, чтобы добавить больше номеров."
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+"Использовать эту учетную запись для исходящих вызовов в соответстии с "
+"наcтройками секции \"Маршрутизация вызовов\"."
+
+msgid "Use this account to make outgoing calls."
+msgstr "Использовать эту учетную запись для исходящих вызовов"
+
+msgid "User Accounts"
+msgstr "Учетные записи пользователя"
+
+msgid "User Agent String"
+msgstr "Строка агента пользователя"
+
+msgid "User Name"
+msgstr "Имя пользователя"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "Да"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr "Здесь Вы можете указать имя для отображения вместо ID звонящего."
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+#~ msgid ""
+#~ "Designate numbers that are allowed to call through this system and which "
+#~ "user's privileges it will have."
+#~ msgstr ""
+#~ "Указать телефонные номера, которым разрешено осуществлять звонки через эту "
+#~ "систему, а также какими они будут обладать пользовательскими привилегиями."
+
+#~ msgid "Account Status"
+#~ msgstr "Статус учетной записи"
+
+#~ msgid "Account Status Message"
+#~ msgstr "Статус сообщение учетной записи"
+
+#~ msgid "Domain Name/Dynamic Domain Name"
+#~ msgstr "Имя домена/Динамическое имя домена"
+
+#~ msgid "Enable Incoming Calls (See Status, Message below)"
+#~ msgstr "Разрешить входящие вызовы (см. статус, сообщение ниже)"
+
+#~ msgid "Service Control and Connection Status"
+#~ msgstr "Управление сервисом и статус соединения"
diff --git a/trunk/package/luci/po/ru/polipo.po b/trunk/package/luci/po/ru/polipo.po
new file mode 100644
index 00000000..f1d49688
--- /dev/null
+++ b/trunk/package/luci/po/ru/polipo.po
@@ -0,0 +1,237 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: polipo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 17:51+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Advanced Settings"
+msgstr "Расширенные настройки"
+
+msgid "Allowed clients"
+msgstr "Разрешённые клиенты"
+
+msgid "Always use system DNS resolver"
+msgstr "Всегда использовать системный DNS-клиент"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Поддерживается базовая HTTP-аутентификация. Введите имя пользователя и "
+"пароль в формате имя:пароль."
+
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgid "DNS and Query Settings"
+msgstr "Настройки DNS"
+
+msgid "DNS server address"
+msgstr "Адрес DNS-сервера"
+
+msgid "Delete cache files time"
+msgstr "Время удаления кэш-файлов"
+
+msgid "Disk cache location"
+msgstr "Местоположение кэша"
+
+msgid "Do not query IPv6"
+msgstr "Не запрашивать IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+"Включите, если вы хотите, чтобы кэш (прокси) был общим для нескольких "
+"пользователей."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Размер первого PMM-сегмента (в байтах)"
+
+msgid "General Settings"
+msgstr "Общие настройки"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Количество RAM, отведенное для кеша."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Размер кэша в RAM (в байтах)"
+
+msgid "Listen address"
+msgstr "Адрес для входящих соединений"
+
+msgid "Listen port"
+msgstr "Порт для входящих соединений"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Директория, где Polipo хранит кэш-файлы. Рекомендуется использовать внешнее "
+"хранилище, так как размер кэша может увеличиваться. Оставьте пустым, чтобы "
+"отключить хранение кэша на диске."
+
+msgid "Log file location"
+msgstr "Местоположение файла журнала"
+
+msgid "Log to syslog"
+msgstr "Записывать сообщения в системный журнал"
+
+msgid "Logging and RAM"
+msgstr "Журналирование и RAM"
+
+msgid "Never use system DNS resolver"
+msgstr "Не использовать системный DNS-клиент"
+
+msgid "On-Disk Cache"
+msgstr "Кэширование на диске"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Размер PMM-сегментов (в байтах)"
+
+msgid "Parent Proxy"
+msgstr "Родительский прокси"
+
+msgid "Parent proxy address"
+msgstr "Адрес родительского прокси"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Адрес родительского прокси (в формате хост:порт), на который Polipo будет "
+"перенаправлять запросы."
+
+msgid "Parent proxy authentication"
+msgstr "Аутентификация родительского прокси"
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr "Состояние Polipo"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo - небольшой веб-прокси, использующий кэширование."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Poor Man's Multiplexing"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Poor Man's Multiplexing (PMM) - это техника, которая позволяет запрашивать "
+"данные из нескольких источников. Таким образом, время отклика по HTTP-"
+"протоколу сокращается. ПРИМЕЧАНИЕ: некоторые сайты могут не работать с "
+"включенным PMM."
+
+msgid "Port on which Polipo will listen"
+msgstr "Порт, на котором Polipo будет ожидать входящие соединения"
+
+msgid "Proxy"
+msgstr "Прокси"
+
+msgid "Query DNS by hostname"
+msgstr "Запрашивать DNS, используя имя хоста"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+"Запрашивать DNS напрямую, использовать системный клиент в случае ошибки"
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+"Запрашивать DNS напрямую, использовать системный клиент для неизвестных "
+"хостов"
+
+msgid "Query DNS for IPv6"
+msgstr "Запрашивать DNS для IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "Запрашивать IPv4 и IPv6, предпочитать IPv4"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "Запрашивать IPv4 и IPv6, предпочитать IPv6"
+
+msgid "Query only IPv6"
+msgstr "Запрашивать только IPv6"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Установите адрес DNS-сервера для Polipo в случае, если он отличается от "
+"системного."
+
+msgid "Shared cache"
+msgstr "Общий кэш"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Размер первого PMM сегмента. Если не указано, то размер первого сегмента "
+"будет равен двум обычным."
+
+msgid "Size to which cached files should be truncated"
+msgstr "Размер, до которого будут сокращены файлы кэша"
+
+msgid "Status"
+msgstr "Состояние"
+
+msgid "Syslog facility"
+msgstr "Системный журнал"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"Интерфейс, на котором Polipo будет ожидать входящие соединения. Чтобы "
+"ожидать на всех интерфейсах, используйте 0.0.0.0 или :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr "Интервал, после которого файлы кэша будут удалены"
+
+msgid "Time after which cached files will be truncated"
+msgstr "Интервал, после которого файлы кэша будут сокращены"
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr "Чтобы включить PMM, размер PMM сегмента должен быть установлен."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Сократить размер файлов кэша (в байтах)"
+
+msgid "Truncate cache files time"
+msgstr "Время сокращения файлов кэша"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Рекомендуется использовать внешнее хранилище, так как журнал часто "
+"обновляется и может значительно увеличиваться в размере."
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+"Если адрес для входящих соединений установлен в 0.0.0.0 или :: (IPv6), вам "
+"необходимо перечислить клиентов, которым разрешено подключаться. В таком "
+"случае формат - это IP-адрес или адрес подсети (192.168.1.123, "
+"192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+
+msgid "enable"
+msgstr "включить"
diff --git a/trunk/package/luci/po/ru/qos.po b/trunk/package/luci/po/ru/qos.po
new file mode 100644
index 00000000..6c363924
--- /dev/null
+++ b/trunk/package/luci/po/ru/qos.po
@@ -0,0 +1,104 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: qos\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2012-08-15 12:02+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Calculate overhead"
+msgstr "Подсчитывать накладные расходы"
+
+msgid "Classification Rules"
+msgstr "Правила классификации"
+
+msgid "Classification group"
+msgstr "Классификация"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Хост назначения"
+
+msgid "Download speed (kbit/s)"
+msgstr "Скорость загрузки (кбит/с)"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Half-duplex"
+msgstr "Полудуплекс"
+
+msgid "Interfaces"
+msgstr "Интерфейсы"
+
+msgid "Number of bytes"
+msgstr "Количество байт"
+
+msgid "Ports"
+msgstr "Порты"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Качество обслуживания (QoS)"
+
+msgid "Service"
+msgstr "Служба"
+
+msgid "Source host"
+msgstr "Хост источника"
+
+msgid "Target"
+msgstr "Цель"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Скорость отдачи (кбит/с)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Используя <abbr title=\"Quality of Service\">QoS</abbr>, вы можете "
+"приоритезаровать сетевой трафик по адресам, портам и сервисам."
+
+msgid "all"
+msgstr "все"
+
+msgid "default"
+msgstr "по умолчанию"
+
+msgid "express"
+msgstr "экспресс"
+
+msgid "low"
+msgstr "низкий"
+
+msgid "normal"
+msgstr "обычный"
+
+msgid "priority"
+msgstr "приоритетный"
+
+#~ msgid "Downlink"
+#~ msgstr "Нисходящий канал"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Интернет-соединение"
+
+#~ msgid "Uplink"
+#~ msgstr "Восходящий канал"
diff --git a/trunk/package/luci/po/ru/radvd.po b/trunk/package/luci/po/ru/radvd.po
new file mode 100644
index 00000000..37cc9428
--- /dev/null
+++ b/trunk/package/luci/po/ru/radvd.po
@@ -0,0 +1,473 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: radvd\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-16 11:37+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "6to4 interface"
+msgstr "Интерфейс 6to4"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Addresses"
+msgstr "Адреса"
+
+msgid "Advanced"
+msgstr "Расширенные"
+
+msgid "Advertise Home Agent flag"
+msgstr "Извещать индикатор домашнего агента"
+
+msgid "Advertise router address"
+msgstr "Извещать адрес маршрутизатора"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Извещаемые суффиксы домена"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Извещаемый IPv6 RDNSS. Если значение не задано, то будет использован текущий "
+"IPv6-адрес интерфейса."
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Извещаемые IPv6-префиксы"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Извещаемые IPv6-префиксы. Если значение не задано, то будет использован "
+"текущий префикс интерфейса."
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Извещает возможности домашнего агента мобильного IPv6 (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+"Извещает возможности регистрации мобильного маршрутизатора (NEMO Basic)"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Извещает предполагаемое время доступа к соседним узлам (мс). При значении 0 "
+"извещение не происходит."
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Извещает значение числа переходов по умолчанию для исходящих одноадресных "
+"пакетов. При значении 0 извещение не происходит."
+
+msgid "Advertises the default router preference"
+msgstr "Извещает параметры предпочтения маршрутизатора по умолчанию"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+"Извещает указанный максимальный размер пакета (MTU) в сообщении RA. 0 "
+"выключает данную функцию"
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+"Извещает период (сек.), в течение которого адреса, созданные из префикса с "
+"помощью SLAAC, остаются предпочтительными."
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+"Извещает период (сек.), в течение которого префикс является действительным "
+"для определения включения соединения."
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+"Извещает период действия (сек.) маршрутизатора по умолчанию. 0 указывает на "
+"то, что узел не является маршрутизатором по умолчанию."
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+"Извещает период (сек.) предоставления служб домашнего агента мобильного IPv6"
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+"Извещает время ожидания (мс) между сообщениями Neighbor Solicitation, если "
+"RA включен. 0 отключает передачу извещений"
+
+msgid "Advertising"
+msgstr "Извещение"
+
+msgid "Autonomous"
+msgstr "Автономный"
+
+msgid "Clients"
+msgstr "Клиенты"
+
+msgid "Configuration flag"
+msgstr "Конфигурационный флаг"
+
+msgid "Current hop limit"
+msgstr "Текущее ограничение кол-ва прыжков"
+
+msgid "DNSSL"
+msgstr "DNSSL"
+
+msgid "DNSSL Configuration"
+msgstr "Конфигурация DNSSL"
+
+msgid "Default lifetime"
+msgstr "Срок действия по умолчанию"
+
+msgid "Default preference"
+msgstr "Приоритет по умолчанию"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Enable advertisements"
+msgstr "Включить извещения"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "Включает извещения и запросы маршрутизатора"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr "Включает дополнительный протокол автоконфигурации (RFC2462)"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr "Включает автоконфигурацию дополнительной информации (RFC2462)"
+
+msgid "General"
+msgstr "Общие"
+
+msgid "Home Agent information"
+msgstr "Информация о домашнем агенте"
+
+msgid "Home Agent lifetime"
+msgstr "Срок действия домашнего агента"
+
+msgid "Home Agent preference"
+msgstr "Приоритет домашнего агента"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "Включить информацию о домашнем агенте в сообщения RA"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr "Включить интервал извещения мобильного IPv6 в сообщения RA"
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr "Включает адрес канального уровня исходящего интерфейса в сообщения RA"
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+"Указывает, что адрес интерфейса отправляется вместо префикса сети, как это "
+"требуется в мобильном IPv6"
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+"Указывает, что соединение не является широковещательным, и блокирует отсылку "
+"незапрошенных извещений"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+"Указывае, что данный префикс может быть использован для автономной настройки "
+"адреса (RFC4862)"
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+"Указывает, что данный префикс может быть использован для определения "
+"включения соединения (RFC4861)"
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid "Interface Configuration"
+msgstr "Конфигурация интерфейса"
+
+msgid "Interface required"
+msgstr "Требуется интерфейс"
+
+msgid "Interfaces"
+msgstr "Интерфейсы"
+
+msgid "Lifetime"
+msgstr "Срок действия"
+
+msgid "Link MTU"
+msgstr "Максимальный размер пакета (MTU)"
+
+msgid "Managed flag"
+msgstr "Управляемый флаг"
+
+msgid "Max. interval"
+msgstr "Макс. интервал"
+
+msgid "Maximum advertisement interval"
+msgstr "Максимальный интервал извещения"
+
+msgid "Minimum advertisement delay"
+msgstr "Минимальная задержка извещения"
+
+msgid "Minimum advertisement interval"
+msgstr "Минимальный интервал извещения"
+
+msgid "Mobile IPv6"
+msgstr "Мобильный IPv6"
+
+msgid "Mobile IPv6 interval option"
+msgstr "Параметры интервала мобильного IPv6"
+
+msgid "Mobile IPv6 router registration"
+msgstr "Регистрация мобильного IPv6 маршрутизатора"
+
+msgid "Multicast"
+msgstr "Групповая рассылка"
+
+#, fuzzy
+msgid "On-link"
+msgstr "Соединение"
+
+msgid "On-link determination"
+msgstr "Определение включения соединения"
+
+msgid "Preference"
+msgstr "Приоритет"
+
+msgid "Preferred lifetime"
+msgstr "Предпочитаемый срок действия"
+
+msgid "Prefix"
+msgstr "Префикс"
+
+msgid "Prefix Configuration"
+msgstr "Конфигурация префикса"
+
+msgid "Prefixes"
+msgstr "Префиксы"
+
+msgid "RDNSS"
+msgstr "RDNSS"
+
+msgid "RDNSS Configuration"
+msgstr "Конфигурация RDNSS"
+
+msgid "Radvd"
+msgstr "Radvd"
+
+msgid "Radvd - DNSSL"
+msgstr "Radvd - DNSSL"
+
+msgid "Radvd - Interface %q"
+msgstr "Radvd - Интерфейс %q"
+
+msgid "Radvd - Prefix"
+msgstr "Radvd - Префикс"
+
+msgid "Radvd - RDNSS"
+msgstr "Radvd - RDNSS"
+
+msgid "Radvd - Route"
+msgstr "Radvd - Маршрут"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+"Radvd - это служба извещений маршрутизатора для IPv6. Она слушает запросы "
+"(Router Solicitations) и отсылает извещения (Router Advertisements), как "
+"описано в RFC 4861."
+
+msgid "Reachable time"
+msgstr "Период доступности"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+"Связываться только с указанными клиентами. Оставьте пустым, чтобы "
+"использовать групповую рассылку"
+
+msgid "Retransmit timer"
+msgstr "Таймер ретрансляции"
+
+msgid "Route Configuration"
+msgstr "Настройка маршрута"
+
+msgid "Routes"
+msgstr "Маршруты"
+
+msgid "Source link-layer address"
+msgstr "Адрес источника (канальный уровень)"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+"Устанавливает имя логического интерфейса для получения префикса 6to4. "
+"Публичный IPv4-адрес интерфейса комбинитуется с 2002::/3 и значением префикса"
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr "Указывает период жизни, связанный с маршрутом (сек.)"
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+"Устанавливает имя логического интерфейса, которому принадлежит данная секция"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+"Указывает максимальную длительность использования записей DNSSL для "
+"разрешения имён."
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+"Указывает максимальную длительность использования записей RDNSS для "
+"разрешения имён."
+
+msgid "Specifies the preference associated with the default router"
+msgstr "Указывает приоритет, связанный с маршрутизатором по умолчанию"
+
+msgid "Suffix"
+msgstr "Суффикс"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Максимальный интервал времени между отсылкой групповых незапрашиваемых "
+"извещений маршрутизатора (сек.)"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+"Минимальный интервал времени между отсылкой групповых извещений "
+"маршрутизатора с интерфейса (сек.)"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+"Минимальный интервал времени между отсылкой групповых незапрашиваемых "
+"извещений маршрутизатора (сек.)"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr "Предпочтение домашнего агента, отсылающего данное извещение RA"
+
+msgid "Timing"
+msgstr "Интервалы"
+
+msgid "Unicast only"
+msgstr "Только одноадресная передача"
+
+msgid "Valid lifetime"
+msgstr "Срок действия"
+
+msgid "Validity time"
+msgstr "Период действия"
+
+msgid "default"
+msgstr "по умолчанию"
+
+msgid "high"
+msgstr "высокий"
+
+msgid "low"
+msgstr "низкий"
+
+msgid "medium"
+msgstr "средний"
+
+msgid "no"
+msgstr "нет"
+
+msgid "yes"
+msgstr "да"
+
+#~ msgid "Advertised IPv6 prefix"
+#~ msgstr "Извещаемый IPv6 префикс"
+
+#~ msgid ""
+#~ "Advertised IPv6 prefix. If empty, the current interface prefix is used"
+#~ msgstr ""
+#~ "Извещаемый IPv6 префикс. Если значение не задано, то будет использован "
+#~ "текущий префикс интерфейса."
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that addresses generated from "
+#~ "the prefix via stateless address autoconfiguration remain preferred. Use "
+#~ "0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Извещает время в секундах, в течение которого адреса сгенерированные "
+#~ "автоматически из префикса остаются предпочтительными. 0 устанавливает "
+#~ "неограниченное время."
+
+#~ msgid ""
+#~ "Advertises the length of time in seconds that the prefix is valid for the "
+#~ "purpose of on-link determination. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Извещает время в секундах, в течение которого используется префикс для "
+#~ "определения включения соединения. 0 устанавливает неограниченное время."
+
+#~ msgid ""
+#~ "Indicates whether that RDNSS continues to be available to hosts even if "
+#~ "they moved to a different subnet"
+#~ msgstr ""
+#~ "Указывает остается ли RDNSS доступным для хостов даже в случае их "
+#~ "перемещения в другую подсеть"
+
+#~ msgid ""
+#~ "Specifies the lifetime associated with the route in seconds. Use 0 to "
+#~ "specify an infinite lifetime"
+#~ msgstr ""
+#~ "Устанавливает срок действия, связанный с маршрутом (секунды). Используйте "
+#~ "0 для установки бесконечного срока действия."
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the DNSSL entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Устанавливает максимальный срок действия DNSSL элементов для разрешения "
+#~ "имен.Используйте 0 для установки бесконечного срока действия"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the RDNSS entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr ""
+#~ "Устанавливает максимальный срок действия DNSSL элементов для разрешения "
+#~ "имен.Используйте 0 для установки бесконечного срока действия"
diff --git a/trunk/package/luci/po/ru/rrdtool.po b/trunk/package/luci/po/ru/rrdtool.po
new file mode 100644
index 00000000..a63a8508
--- /dev/null
+++ b/trunk/package/luci/po/ru/rrdtool.po
@@ -0,0 +1,360 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-03-26 15:36+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "%H: Беспроводная связь - отношение сигнал/шум"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "дБм"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "Уровень шума"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "Мощность сигнала"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "%H: Беспроводная связь - качество сигнала"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "n"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "Качество сигнала"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "%H: Сквозное время ICMP"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "мс"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "%H: Межсетевой экран - обработанные пакеты"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "пакет/c"
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr "\"%di\""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr "%H: Netlink - передача на %pi"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "байт/c"
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr "Байт (%ds)"
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr "%H: Netlink - пакеты на %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "пакет/c"
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr "Обработано (%ds)"
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr "Исключено (%ds)"
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr "Ошибок (%ds)"
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr "%H: Netlink - групповые пакеты на %pi"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "пакет/с"
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr "Пакеты"
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr "%H: Netlink - коллизии на %pi"
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr "коллиз/сек"
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr "Коллизии"
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr "%H: Netlink - Ошибки на %pi"
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr "ошибок/c"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr "%H: Процессы"
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr "Процессов/с"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr "%H: Процесс %pi - время ЦП"
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr "Jiffies"
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr "система"
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr "пользователь"
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr "%H: Процесс %pi - потоков и процессов"
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr "Количество"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr "%H: Процесс %pi - ошибки страниц"
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr "Ошибки страниц"
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr "ошибки страниц"
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr "%H: Процесс %pi - размер виртуальной памяти"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Байт"
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr "виртуальная память"
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr "%H: Использование ЦП #%pi"
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr "%"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr "%H: Передача на %di"
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "байт/c"
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr "%H: Пакетов на %di"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "пакетов/c"
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr "%H: TCP соединений на порт %pi "
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr "соединений/с"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr "%H: Использование дискового пространства на %di"
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Байт"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr "%H: прерывания"
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr "запросов/с"
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr "IRQ %di"
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr "%H: Загрузка системы"
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr "Загрузка"
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr "1 мин."
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr "5 мин."
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr "15 мин."
diff --git a/trunk/package/luci/po/ru/samba.po b/trunk/package/luci/po/ru/samba.po
new file mode 100644
index 00000000..82906e36
--- /dev/null
+++ b/trunk/package/luci/po/ru/samba.po
@@ -0,0 +1,85 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: samba\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 13:48+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Allow guests"
+msgstr "Разрешить гостевой вход"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Разрешить пользователям получать доступ к их домашним директориям через сеть"
+
+msgid "Allowed users"
+msgstr "Разрешённые пользователи"
+
+msgid "Create mask"
+msgstr "Создать маску"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid "Directory mask"
+msgstr "Маска директории"
+
+msgid "Edit Template"
+msgstr "Редактировать шаблон"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "Редактировать шаблон, используемый для генерации конфигурации samba."
+
+msgid "General Settings"
+msgstr "Общие настройки"
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid "Mask for new directories"
+msgstr "Маска для новых директорий"
+
+msgid "Mask for new files"
+msgstr "Маска для новых файлов"
+
+msgid "Name"
+msgstr "Имя"
+
+msgid "Network Shares"
+msgstr "Сетевые ресурсы"
+
+msgid "Path"
+msgstr "Путь"
+
+msgid "Read-only"
+msgstr "Только для чтения"
+
+msgid "Share home-directories"
+msgstr "Совместно использовать домашние директории"
+
+msgid "Shared Directories"
+msgstr "Совместно используемые директории"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Это содержимое файла '/etc/samba/smb.conf.template', из которого "
+"генерируется конфигурация samba. Значения, заключённые в символы \"|\", не "
+"должны быть изменены. Они будут автоматически заменены на значения из "
+"вкладки 'Общие настройки'."
+
+msgid "Workgroup"
+msgstr "Рабочая группа"
diff --git a/trunk/package/luci/po/ru/splash.po b/trunk/package/luci/po/ru/splash.po
new file mode 100644
index 00000000..3f470dba
--- /dev/null
+++ b/trunk/package/luci/po/ru/splash.po
@@ -0,0 +1,362 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: splash\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-26 15:10+0200\n"
+"PO-Revision-Date: 2013-11-13 18:52+0200\n"
+"Last-Translator: Роман <x.wserfer@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Accept"
+msgstr "Принять"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+"Доступ к интернету возможен благодаря некоторым активистам данного проекта, "
+"которые делают общедоступным своё личное подключение к интернету. Эти "
+"немногие подключения разделяются среди всех пользователей. Это означает, что "
+"доступная пропускная способность ограничена и поэтому мы просим вас не "
+"делать следующего:"
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr "Активные клиенты"
+
+msgid "Allowed hosts/subnets"
+msgstr "Разрешённые хосты/подсети"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"Ограничение полосы для клиентов активируется только при указанных лимитах "
+"нисходящего и восходящего каналов. Значение 0 полностью отключает "
+"ограничение. Клиенты из \"белого\" списка не имеют ограничений."
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+"Станьте активным участником данного сообщества и окажите содействие, "
+"запустив свой узел сети"
+
+msgid "Blacklist"
+msgstr "Чёрный список"
+
+msgid "Blocked"
+msgstr "Заблокирован"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr "Разрешённое время"
+
+msgid "Client-Splash"
+msgstr "Client-Splash"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+"Client-Splash - это система аутентификации точек доступа для беспроводных "
+"ячеистых сетей."
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+"Скорость нисходящего канала для клиентов ограничена этим значением (КБ/c)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+"Клиенты, принявшие приглашение splash-экрана, могут использовать сеть данное "
+"количество часов."
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+"Скорость восходящего канала для клиентов ограничена этим значением (КБ/c)"
+
+msgid "Contact"
+msgstr "Связаться"
+
+msgid "Decline"
+msgstr "Отклонить"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "Пожертвовать деньги на поддержку этого проекта."
+
+msgid "Download limit"
+msgstr "Лимит загрузки"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr "Политика добровольного использования"
+
+msgid "Firewall zone"
+msgstr "Зона межсетевого экрана"
+
+msgid "General"
+msgstr "Общие"
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid "IP Address"
+msgstr "IP-адрес"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+"Если вы используете собственное оборудование Wi-Fi, используйте каналы, "
+"отличающиеся от наших."
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "Если вы используете эту сеть регулярно, мы просим вашей поддержки:"
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr "Перехватывать клиентский трафик на этом интерфейсе"
+
+msgid "Interfaces"
+msgstr "Интерфейсы"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Интерфейсы, используемые для Splash."
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+"КБ/с (загрузка/отдача). Данное ограничение может быть снято при активном "
+"участии в этом проекте."
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr "Юридически запрещенный контент"
+
+msgid "MAC Address"
+msgstr "MAC-адрес"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "MAC-адреса из этого списка заблокированы."
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+"MAC-адреса клиентов из \"белого\" списка. Данные клиенты не имеют "
+"ограничений пропускной способности."
+
+msgid "Netmask"
+msgstr "Маска сети"
+
+msgid "Network"
+msgstr "Сеть"
+
+msgid "No clients connected"
+msgstr "Клиенты не подключены"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+"Пожалуйста, обратите внимание, что мы не интернет-провайдер, а "
+"экспериментальная сеть сообщества."
+
+msgid "Policy"
+msgstr "Политика"
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr "Безопасный"
+
+msgid "Save"
+msgstr "Сохранить"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr "Правила Splash интегрированы в зону этого межсетевого экрана"
+
+msgid "Splashtext"
+msgstr "Текст splash-экрана"
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr "Оставшееся время"
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+"Чтобы узнать причину, по которой вас заблокировали, или снова получить "
+"доступ, свяжитесь с владельцем данной точки доступа:"
+
+msgid "Traffic in/out"
+msgstr "Трафик вх/исх"
+
+msgid "Upload limit"
+msgstr "Лимит отдачи"
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr "Добро пожаловать"
+
+msgid "Whitelist"
+msgstr "\"Белый\" список"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr "Теперь вы подключены к бесплатной беспроводной ячеистой сети"
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+"Здесь вы можете указать свой текст, который будет отображаться клиентам.<br /"
+">Возможно использовать следующие маркеры: ###COMMUNITY###, "
+"###COMMUNITY_URL###, ###CONTACTURL###, ###LEASETIME###, ###LIMIT### and "
+"###ACCEPT###."
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+"Доступ к этой сети был заблокирован, скорее всего, потому, что вы сделали "
+"что-то, что наши правила явно запрещают."
+
+msgid "Your bandwidth is limited to"
+msgstr "Ваша полоса пропускания ограничена значением"
+
+msgid "blacklisted"
+msgstr "в \"чёрном\" списке"
+
+msgid "expired"
+msgstr "истёк"
+
+msgid "optional when using host addresses"
+msgstr "опционально при использовании хост-адресов"
+
+msgid "perform any kind of illegal activities"
+msgstr "выполнять любые незаконные действия"
+
+msgid "splashed"
+msgstr "уже в splash"
+
+msgid "temporarily blocked"
+msgstr "временно заблокирован"
+
+msgid "unknown"
+msgstr "неизвестный"
+
+msgid "use filesharing applications on this network"
+msgstr "использование файлообменных приложений в этой сети"
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr "тратить пропускную способность на ненужные загрузки или потоки"
+
+msgid "whitelisted"
+msgstr "в \"белом\" списке"
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr ""
+#~ "Перечисленные хосты и сети не получают приглашения splash-экрана, т.е. они "
+#~ "всегда разрешены."
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "Принимая эти правила, вы можете использовать данную сеть для"
+
+#~ msgid "Edit Splash text"
+#~ msgstr "Редактировать текст splash-экрана"
+
+#~ msgid "hour(s). After this time you need to accept these rules again."
+#~ msgstr ""
+#~ "час(ы). После указанного времени Вы должны вновь принять эти правила."
+
+# Здесь наверняка нужно склонить в другом падеже, надо смотреть по контексту
+#~ msgid "the owner of this access point."
+#~ msgstr "с владельцем этой точки доступа."
diff --git a/trunk/package/luci/po/ru/statistics.po b/trunk/package/luci/po/ru/statistics.po
new file mode 100644
index 00000000..5fc15f67
--- /dev/null
+++ b/trunk/package/luci/po/ru/statistics.po
@@ -0,0 +1,696 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: statistics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2013-12-05 17:11+0200\n"
+"Last-Translator: Dmitri <4glitch@gmail.com>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Action (target)"
+msgstr "Действие (цель)"
+
+msgid "Add command for reading values"
+msgstr "Добавить команду для чтения значений"
+
+msgid "Add matching rule"
+msgstr "Добавить правило выборки"
+
+msgid "Add multiple hosts separated by space."
+msgstr "Добавить несколько хостов, разделённых пробелом"
+
+msgid "Add notification command"
+msgstr "Добавить команду уведомления"
+
+msgid "Base Directory"
+msgstr "Базовая директория"
+
+msgid "Basic monitoring"
+msgstr "Базовая статистика"
+
+msgid "CPU Plugin Configuration"
+msgstr "Конфигурация модуля CPU"
+
+msgid "CSV Output"
+msgstr "Вывод в CSV"
+
+msgid "CSV Plugin Configuration"
+msgstr "Конфигурация модуля CSV"
+
+msgid "Cache collected data for"
+msgstr "Кэшировать собранную статистику в течение"
+
+msgid "Cache flush interval"
+msgstr "Интервал сброса кэша"
+
+msgid "Chain"
+msgstr "Цепочка"
+
+msgid "CollectLinks"
+msgstr "Сбор информации о соединениях (CollectLinks)"
+
+msgid "CollectRoutes"
+msgstr "Сбор информации о маршрутах (CollectRoutes)"
+
+msgid "CollectTopology"
+msgstr "Сбор информации о топологии (CollectTopology)"
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Настройки Collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd - это сервис для сбора данных с разных модулей. На этой странице вы "
+"можете изменить настройки Сollectd."
+
+msgid "Conntrack"
+msgstr "Отслеживание подключения (Conntrack)"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Настройка плагина Conntrack"
+
+msgid "DF Plugin Configuration"
+msgstr "Конфигурация модуля DF"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Конфигурация модуля DNS"
+
+msgid "Data collection interval"
+msgstr "Интервал сбора данных"
+
+msgid "Datasets definition file"
+msgstr "Файл с определением набора данных"
+
+msgid "Destination ip range"
+msgstr "Диапазон IP-адресов назначения"
+
+msgid "Directory for collectd plugins"
+msgstr "Директория с модулями collectd"
+
+msgid "Directory for sub-configurations"
+msgstr "Директория конфигураций"
+
+msgid "Disk Plugin Configuration"
+msgstr "Конфигурация модуля Disk"
+
+msgid "Disk Space Usage"
+msgstr "Использование диска"
+
+msgid "Disk Usage"
+msgstr "Использование диска"
+
+msgid "Display Host »"
+msgstr "Показать узел »"
+
+msgid "Display timespan »"
+msgstr "Показать за промежуток »"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Конфигурация модуля E-Mail"
+
+msgid "Email"
+msgstr "E-mail"
+
+msgid "Enable this plugin"
+msgstr "Включить этот модуль"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Конфигурация модуля Exec"
+
+#, fuzzy
+msgid "Filter class monitoring"
+msgstr "Мониторинг классов фильтров"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Сбросить кэш после"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "Перенаправление между локальным адресом и адресом сервера"
+
+msgid "Graphs"
+msgstr "Графики"
+
+msgid "Group"
+msgstr "Группа"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Здесь вы можете определить внешние команды, которые будут выполнены для "
+"чтения определённых значений. Значения будут считаны со стандартного вывода."
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Здесь вы можете определить внешние команды, которые будут выполнены, когда "
+"значения достигнут определённого порога. Значения будут переданы на "
+"стандартный ввод вызванным программам."
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Здесь вы можете указать различные критерии, по которым будут выбраны правила "
+"для сбора статистики."
+
+msgid "Host"
+msgstr "Хост"
+
+msgid "Hostname"
+msgstr "Имя хоста"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr "IP-адрес или имя хоста, с которых получать текстовый вывод"
+
+msgid "IRQ Plugin Configuration"
+msgstr "Конфигурация модуля IRQ"
+
+msgid "Ignore source addresses"
+msgstr "Игнорировать адреса-источники"
+
+msgid "Incoming interface"
+msgstr "Входящий интерфейс"
+
+msgid "Interface Plugin Configuration"
+msgstr "Конфигурация модуля Interface"
+
+msgid "Interfaces"
+msgstr "Интерфейсы"
+
+msgid "Interrupts"
+msgstr "Прерывания"
+
+msgid "Interval for pings"
+msgstr "Интервал для ping-запросов"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Конфигурация модуля Iptables"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+"Оставьте невыбранным для автоматического определения интерфейсов для "
+"мониторинга."
+
+msgid "Listen host"
+msgstr "Хост"
+
+msgid "Listen port"
+msgstr "Порт"
+
+msgid "Listener interfaces"
+msgstr "Использовать интерфейсы"
+
+msgid "Load Plugin Configuration"
+msgstr "Конфигурация модуля Load"
+
+msgid "Maximum allowed connections"
+msgstr "Максимальное число соединений"
+
+msgid "Memory"
+msgstr "Память"
+
+msgid "Memory Plugin Configuration"
+msgstr "Конфигурация модуля Memory"
+
+msgid "Monitor all except specified"
+msgstr "Собирать статистику со всех, кроме указанных"
+
+msgid "Monitor all local listen ports"
+msgstr "Собирать статистику со всех портов, ожидающих соединения"
+
+msgid "Monitor devices"
+msgstr "Собирать статистику с устройств"
+
+msgid "Monitor disks and partitions"
+msgstr "Собирать статистику с дисков и разделов"
+
+msgid "Monitor filesystem types"
+msgstr "Собирать статистику с файловых систем"
+
+msgid "Monitor hosts"
+msgstr "Собирать статистику с хостов"
+
+msgid "Monitor interfaces"
+msgstr "Собирать статистику с интерфейсов"
+
+msgid "Monitor interrupts"
+msgstr "Собирать статистику по прерываниям"
+
+msgid "Monitor local ports"
+msgstr "Собирать статистику с локальных портов"
+
+msgid "Monitor mount points"
+msgstr "Собирать статистику с точек монтирования"
+
+msgid "Monitor processes"
+msgstr "Собирать статистику с процессов"
+
+msgid "Monitor remote ports"
+msgstr "Собирать статистику с удалённых портов"
+
+msgid "Name of the rule"
+msgstr "Название правила"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Конфигурация модуля Netlink"
+
+msgid "Network"
+msgstr "Network"
+
+msgid "Network Plugin Configuration"
+msgstr "Конфигурация модуля Network"
+
+msgid "Network plugins"
+msgstr "Сетевые модули"
+
+msgid "Network protocol"
+msgstr "Сетевой протокол"
+
+msgid "Number of threads for data collection"
+msgstr "Количество потоков сбора данных"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "Настройка плагина OLSRd"
+
+msgid "Only create average RRAs"
+msgstr "Создавать только средние RRA"
+
+msgid "Options"
+msgstr "Опции"
+
+msgid "Outgoing interface"
+msgstr "Исходящий интерфейс"
+
+msgid "Output plugins"
+msgstr "Модули вывода"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Конфигурация модуля Ping"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Processes"
+msgstr "Процессы"
+
+msgid "Processes Plugin Configuration"
+msgstr "Конфигурация модуля Processes"
+
+msgid "Processes to monitor separated by space"
+msgstr "Процессы для мониторинга (разделённые пробелом)"
+
+msgid "Processor"
+msgstr "Processor"
+
+msgid "Qdisc monitoring"
+msgstr "Мониторинг Qdisc"
+
+#, fuzzy
+msgid "RRD XFiles Factor"
+msgstr "Фактор XFiles RRD"
+
+#, fuzzy
+msgid "RRD heart beat interval"
+msgstr "Интервал heartbeat RRD"
+
+msgid "RRD step interval"
+msgstr "Интервал шага RRD"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Конфигурация модуля RRDTool"
+
+msgid "Rows per RRA"
+msgstr "Количество строк в RRA"
+
+msgid "Script"
+msgstr "Скрипт"
+
+msgid "Seconds"
+msgstr "Секунды"
+
+msgid "Server host"
+msgstr "Хост сервера"
+
+msgid "Server port"
+msgstr "Порт сервера"
+
+msgid "Shaping class monitoring"
+msgstr "Мониторинг классов шейпинга"
+
+msgid "Socket file"
+msgstr "Файл сокета"
+
+msgid "Socket group"
+msgstr "Группа сокета"
+
+msgid "Socket permissions"
+msgstr "Права доступа сокета"
+
+msgid "Source ip range"
+msgstr "Диапазон IP-адресов источника"
+
+msgid "Specifies what information to collect about links."
+msgstr "Указывает, какую информацию собирать о соединениях."
+
+msgid "Specifies what information to collect about routes."
+msgstr "Указывает, какую информацию собирать о маршрутах."
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "Указывает, какую информацию собирать о глобальной топологии."
+
+msgid "Statistics"
+msgstr "Статистика"
+
+msgid "Storage directory"
+msgstr "Директория с данными"
+
+msgid "Storage directory for the csv files"
+msgstr "Директория для CSV-файлов"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Хранить данные в виде коэффициентов вместо абсолютных значений"
+
+msgid "Stored timespans"
+msgstr "Сохранённые промежутки времени"
+
+msgid "System Load"
+msgstr "Загрузка системы"
+
+msgid "System plugins"
+msgstr "Системные модули"
+
+msgid "TCP Connections"
+msgstr "TCPConns"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Конфигурация модуля TCPConns"
+
+msgid "TTL for network packets"
+msgstr "TTL для сетевых пакетов"
+
+msgid "TTL for ping packets"
+msgstr "TTL для ping-пакетов"
+
+msgid "Table"
+msgstr "Таблица"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+"Модуль OLSRd считывает информацию о узловых сетях с модуля txtinfo OLSRd."
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+"Модуль Conntrack собирает статистику о количестве отслеживаемых соединений."
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "Модуль CPU собирает статистику по использованию процессора."
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"Модуль CSV позволяет сохранить статистику в формате CSV для последующей "
+"обработки."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"Модуль DF собирает статистику о доступном пространстве на различных "
+"устройствах, точках монтирования или файловых системах."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"Модуль Disk собирает подробную статистику для выбранных разделов или дисков."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+"Модуль DNS собирает подробную статистику о DNS-трафике на выбранных "
+"интерфейсах."
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"Модуль E-mail создает Unix-сокет, который может быть использован для "
+"передачи статистики эл. почты работающему сервису collectd. В основном, этот "
+"модуль предназначен для использования вместе с Mail::SpamAssasin::Plugin::"
+"Collectd."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"Модуль Exec выполняет внешнюю команду в случае, когда определённые значения "
+"достигают заданного порога."
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr "Модуль Interface собирает статистику на выбранных сетевых интерфейсах."
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"Модуль Iptables собирает статистику с определённых правил межсетевого экрана."
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"Модуль IRQ собирает статистику по выбранным прерываниям. Если ни одно "
+"прерывание не выбрано, сбор статистики будет проводиться по всем прерываниям."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+"Модуль Iwinfo собирает статистику о беспроводном сигнале, шуме и качестве."
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "Модуль Load собирает статистику о загрузке системы."
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "Модуль Memory собирает статистику об использовании памяти."
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"Модуль Netlink собирает расширенную статистику с выбранных интерфейсов."
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"Модуль Network предоставляет возможность сетевого обмена данными между "
+"разными сервисами collectd. Collectd может работать в режиме сервера или "
+"клиента. В режиме клиента, локальная статистика передается collectd-серверу, "
+"в режиме сервера collectd собирает статистику с удалённых хостов."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"Модуль Ping посылает ICMP-запросы выбранным хостам и измеряет время отклика."
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"Модуль Processes собирает статистику для выбранных процессов об "
+"использовании ЦП, ошибках обращения к страницам памяти, использовании памяти."
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"Модуль Rrdtool сохраняет статистику в формате rrd для последующего "
+"построения диаграмм.<br /><br /><strong>Внимание: установка неверных "
+"параметров может привезти к высокому потреблению памяти во временной "
+"директории. Это, в свою очередь, может привести к отказу устройства!</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Данная статистика основана на программе <a href=\"http://collectd.org/index."
+"shtml\">Collectd</a> и использует <a href=\"http://oss.oetiker.ch/rrdtool/"
+"\">RRD Tool</a> для построения диаграмм."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"Модуль TCPConns собирает информацию об открытых TCP-соединениях на выбранных "
+"портах."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"Модуль UnixSock создает Unix-сокет, который может быть использован для "
+"получения статистики от работающего сервиса collectd."
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Эта секция определяет интерфейсы, на которых collectd будет обрабатывать "
+"входящие соединения."
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+"Эта секция определяет серверы, на которые будет передаваться локальная "
+"статистика."
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Пытаться определять имя хоста"
+
+msgid "UPS"
+msgstr "ИБП"
+
+msgid "UPS Plugin Configuration"
+msgstr "Настройка плагина ИБП"
+
+#, fuzzy
+msgid "UPS name in NUT ups@host format"
+msgstr "Имя ИБП в ups@host NUT-формате"
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Конфигурация модуля UnixSock"
+
+msgid "Used PID file"
+msgstr "Используемый PID-файл"
+
+msgid "User"
+msgstr "Пользователь"
+
+msgid "Verbose monitoring"
+msgstr "Расширенная статистика"
+
+msgid "Wireless"
+msgstr "Wireless"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "Конфигурация модуля Iwinfo"
+
+msgid "e.g. br-ff"
+msgstr "напр. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "напр. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "напр. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "не более 16 символов"
+
+msgid "reduces rrd size"
+msgstr "уменьшает размер rrd"
+
+#, fuzzy
+msgid "seconds; multiple separated by space"
+msgstr "секунды; разделяются пробелом"
+
+msgid "server interfaces"
+msgstr "интерфейсы сервера"
+
+#~ msgid "Installed network plugins:"
+#~ msgstr "Установленные сетевые модули:"
+
+#~ msgid "Installed output plugins:"
+#~ msgstr "Установленные модули вывода:"
+
+#~ msgid ""
+#~ "Network plugins are used to collect information about open tcp "
+#~ "connections, interface traffic, iptables rules etc."
+#~ msgstr ""
+#~ "Сетевые модули используются для сбора информации об открытых "
+#~ "TCP-соединениях, трафике, правилах iptables и т.п."
+
+#~ msgid ""
+#~ "Output plugins provide different possibilities to store collected data. "
+#~ "It is possible to enable multiple plugin at one, for example to store "
+#~ "collected data in rrd databases and to transmit the data over the network "
+#~ "to other collectd instances."
+#~ msgstr ""
+#~ "Модули вывода обеспечивают различные варианты сохранения собранных данных. "
+#~ "Можно включить несколько модулей, например, чтобы сохранить собранные данные "
+#~ "в базе данных RRD и передать их по сети другим инстанциям collectd."
+
+#~ msgid ""
+#~ "System plugins collecting values about system state and ressource usage "
+#~ "on the device.:"
+#~ msgstr ""
+#~ "Системные модули, собирающие данные о состоянии системы и использовании "
+#~ "ресурсов устройства:"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr "Модуль Wireless собирает статистику о силе, шуме и качестве сигнала."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Конфигурация модуля Wireless"
diff --git a/trunk/package/luci/po/ru/tinyproxy.po b/trunk/package/luci/po/ru/tinyproxy.po
new file mode 100644
index 00000000..f9a3c23d
--- /dev/null
+++ b/trunk/package/luci/po/ru/tinyproxy.po
@@ -0,0 +1,294 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: tinyproxy\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 20:24+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"<em>Через прокси</em> перенаправляет запросы на заданные узлы через "
+"указанный прокси, <em>Отклонять доступ</em> отключает использование прокси "
+"для всех узлов"
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+"Добавляет HTTP-заголовок \"X-Tinyproxy\" с IP-адресом клиента ко всем "
+"перенаправленным запросам"
+
+msgid "Allowed clients"
+msgstr "Разрешённые клиенты"
+
+msgid "Allowed connect ports"
+msgstr "Разрешённые порты подключения"
+
+msgid "Bind address"
+msgstr "Адрес привязки"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"Разрешить использование расширенных регулярных выражений для фильтрации. По "
+"умолчанию, используются базовые POSIX-выражения"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+"По умолчанию, строки фильтрации регистро-независимы. Включите эту опцию, "
+"чтобы сделать сравнение регистро-зависимым"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+"По умолчанию, фильтрация выполняется на основе имени домена. Включите эту "
+"опцию, чтобы фильтровать при помощи URL"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"По умолчанию, фильтрация работает в режиме чёрного списка. Включите эту "
+"опцию, чтобы разрешить только опредёленные URL или доменные имена"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+"Может быть IP-адресом, диапазоном, именем домена или \".\" для любого хоста "
+"без домена"
+
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgid "Connection timeout"
+msgstr "Таймаут соединения"
+
+msgid "Default deny"
+msgstr "Запретить по умолчанию"
+
+msgid "Enable Tinyproxy server"
+msgstr "Включить сервер Tinyproxy"
+
+msgid "Error page"
+msgstr "Страница ошибки"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "Ошибка получения статистики по URL:"
+
+msgid "Filter by RegExp"
+msgstr "Фильтровать при помощи регулярных выражений"
+
+msgid "Filter by URLs"
+msgstr "Фильтровать по URL"
+
+msgid "Filter case-sensitive"
+msgstr "Фильтровать с учётом регистра"
+
+msgid "Filter file"
+msgstr "Файл фильтрации"
+
+msgid "Filtering and ACLs"
+msgstr "Фильтрация и ACL"
+
+msgid "General settings"
+msgstr "Общие настройки"
+
+msgid "Group"
+msgstr "Группа"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr "HTML-шаблон для статистики хостов"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "HTML-шаблон для вывода ошибок HTTP"
+
+msgid "Header whitelist"
+msgstr "Белый список заголовков"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+"Список или диапазон IP-адресов, которым разрешено использовать прокси-сервер"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+"Список разрешённых портов для метода CONNECT. Значение \"0\" разрешает все "
+"порты"
+
+msgid "Listen address"
+msgstr "Адрес"
+
+msgid "Listen port"
+msgstr "Порт"
+
+msgid "Log file"
+msgstr "Файл журналирования"
+
+msgid "Log file to use for dumping messages"
+msgstr "Файл для записи сообщений"
+
+msgid "Log level"
+msgstr "Уровень журналирования"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "Уровень подробности журналирования процесса Tinyproxy"
+
+msgid "Max. clients"
+msgstr "Макс. кол-во клиентов"
+
+msgid "Max. requests per server"
+msgstr "Макс. кол-во запросов на сервер"
+
+msgid "Max. spare servers"
+msgstr "Макс. кол-во серверов ожидания"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "Максимально допустимое количество одновременно подключенных клиентов"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+"Максимально допустимое количество запросов на процесс. Если превышено, "
+"процесс будет перезапущен. Ноль отключает данное ограничение."
+
+msgid "Maximum number of prepared idle processes"
+msgstr "Максимальное количество готовых к обработке процессов"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+"Максимальное количество секунд, в течение которых неактивное соединение "
+"остаётся открытым"
+
+msgid "Min. spare servers"
+msgstr "Мин. кол-во серверов ожидания"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "Минимальное количество готовых к обработке процессов"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr "Количество готовых к обработке процессов при старте Tinyproxy"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr "Файл с URL или доменами для фильтрации. Одна запись на строку"
+
+msgid "Policy"
+msgstr "Политика"
+
+msgid "Privacy settings"
+msgstr "Настройки конфиденциальности"
+
+msgid "Reject access"
+msgstr "Отклонять доступ"
+
+msgid "Server Settings"
+msgstr "Настройки сервера"
+
+msgid "Server limits"
+msgstr "Ограничения сервера"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+"Определяет HTTP-заголовки, которым разрешено проходить через прокси. "
+"Оставьте пустым, чтобы не фильтровать заголовки"
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "Определяет порт HTTP, на котором Tinyproxy ожидает запросы"
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+"Определяет имя хоста Tinyproxy, которое будет использовано в HTTP-заголовке "
+"Via"
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+"Определяет адрес, к которому привязывается Tinyproxy для отправки исходящих "
+"запросов"
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr "Определяет адрес, на котором Tinyproxy ожидает запросы"
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr "Определяет имя группы, в которой работает Tinyproxy"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+"Определяет прокси восходящего канала для доступа к хосту в формате "
+"<code>адрес:порт</code>"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr "Определяет пользователя, от имени которого работает Tinyproxy"
+
+msgid "Start spare servers"
+msgstr "Запустить указанное количество готовых к обработке процессов"
+
+msgid "Statistics page"
+msgstr "Страница статистики"
+
+msgid "Status"
+msgstr "Состояние"
+
+msgid "Target host"
+msgstr "Хост назначения"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Состояние Tinyproxy"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy - быстрый HTTP(S)-прокси, не использующий кэш"
+
+msgid "Upstream Proxies"
+msgstr "Прокси для исходящего трафика"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+"Прокси для исходящего трафика при обращении к определённым IP-адресам или "
+"доменам."
+
+msgid "Use syslog"
+msgstr "Использовать системный журнал"
+
+msgid "User"
+msgstr "Пользователь"
+
+msgid "Via hostname"
+msgstr "Имя хоста Via"
+
+msgid "Via proxy"
+msgstr "Через прокси"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr "Записывать сообщения журнала в системный журнал вместо файла"
+
+msgid "X-Tinyproxy header"
+msgstr "Заголовок X-Tinyproxy"
diff --git a/trunk/package/luci/po/ru/transmission.po b/trunk/package/luci/po/ru/transmission.po
new file mode 100644
index 00000000..fac9510a
--- /dev/null
+++ b/trunk/package/luci/po/ru/transmission.po
@@ -0,0 +1,306 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: transmission\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 17:35+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Alternative download speed"
+msgstr "Альтернативная скорость загрузки"
+
+msgid "Alternative speed enabled"
+msgstr "Альтернативная скорость включена"
+
+msgid "Alternative speed time begin"
+msgstr "Время начала альтернативной скорости"
+
+msgid "Alternative speed time day"
+msgstr "День альтернативной скорости"
+
+msgid "Alternative speed time end"
+msgstr "Время окончания альтернативной скорости"
+
+msgid "Alternative speed timing enabled"
+msgstr "Расписание альтернативной скорости включено"
+
+msgid "Alternative upload speed"
+msgstr "Альтернативная скорость отдачи"
+
+msgid "Automatically start added torrents"
+msgstr "Автоматически запускать добавленные торренты"
+
+msgid "Bandwidth settings"
+msgstr "Настройки скорости"
+
+msgid "Binding address IPv4"
+msgstr "Привязанный адрес IPv4"
+
+msgid "Binding address IPv6"
+msgstr "Привязанный адрес IPv6"
+
+msgid "Block list enabled"
+msgstr "Список блокировок включен"
+
+msgid "Blocklist URL"
+msgstr "URL списка блокировок"
+
+msgid "Blocklists"
+msgstr "Списки блокировок"
+
+msgid "Cache size in MB"
+msgstr "Размер кэша (МБ)"
+
+msgid "Config file directory"
+msgstr "Папка файла конфигурации"
+
+msgid "DHT enabled"
+msgstr "DHT включен"
+
+msgid "Debug"
+msgstr "Отладка"
+
+msgid "Download directory"
+msgstr "Папка для загрузок"
+
+msgid "Download queue enabled"
+msgstr "Очередь загрузок включена"
+
+msgid "Download queue size"
+msgstr "Размер очереди загрузок"
+
+msgid "Enable watch directory"
+msgstr "Включить папку поиска"
+
+msgid "Enabled"
+msgstr "Включено"
+
+msgid "Encryption"
+msgstr "Шифрование"
+
+msgid "Error"
+msgstr "Ошибка"
+
+msgid "Fast"
+msgstr "Быстрый"
+
+msgid "Files and Locations"
+msgstr "Файлы и пути"
+
+msgid "Forced"
+msgstr "Принудительно"
+
+msgid "Full"
+msgstr "Полный"
+
+msgid "Global peer limit"
+msgstr "Глобальный лимит пиров"
+
+msgid "Global settings"
+msgstr "Общие настройки"
+
+msgid "Idle seeding limit"
+msgstr "Ограничение времени сидирования"
+
+msgid "Idle seeding limit enabled"
+msgstr "Ограничение времени сидирования включено"
+
+msgid "Incomplete directory"
+msgstr "Папка для не полностью загруженых файлов"
+
+msgid "Incomplete directory enabled"
+msgstr "Папка для не полностью загруженых файлов включена"
+
+msgid "Info"
+msgstr "Информация"
+
+msgid "LPD enabled"
+msgstr "LPD включено"
+
+#, fuzzy
+msgid "Lazy bitfield enabled"
+msgstr "Lazy bitfield включен"
+
+msgid "Message level"
+msgstr "Уровень сообщений"
+
+msgid "Miscellaneous"
+msgstr "Прочее"
+
+msgid "None"
+msgstr "Отсутствует"
+
+#, fuzzy
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"Номер/битовое поле. Начните с 0, затем для каждого дня, в который вы хотите "
+"включить планировщик, добавьте значение. Для воскресенья - 1, понедельника - "
+"2, вторника - 4, среды - 8, четверга - 16, пятницы - 32, субботы - 64."
+
+msgid "Off"
+msgstr "Выключено"
+
+msgid "Open Web Interface"
+msgstr "Открыть веб-интерфейс"
+
+msgid "PEX enabled"
+msgstr "PEX включен"
+
+msgid "Peer Port settings"
+msgstr "Настройки порта пира"
+
+msgid "Peer congestion algorithm"
+msgstr "Алгоритм перегрузки пиров"
+
+msgid "Peer limit per torrent"
+msgstr "Ограничение пиров на торрент"
+
+msgid "Peer port"
+msgstr "Порт пира"
+
+msgid "Peer port random high"
+msgstr "Наибольший случайный порт пира"
+
+msgid "Peer port random low"
+msgstr "Наименьший случайный порт пира"
+
+msgid "Peer port random on start"
+msgstr "Случайный порт пира при запуске"
+
+msgid "Peer settings"
+msgstr "Настройки пира"
+
+msgid "Peer socket tos"
+msgstr "Значение ToS сокета пира"
+
+msgid "Port forwarding enabled"
+msgstr "Перенаправление портов включено"
+
+msgid "Preferred"
+msgstr "Предпочитаемо"
+
+msgid "Prefetch enabled"
+msgstr "Предвыборка включена"
+
+#, fuzzy
+msgid "Queue stalled enabled"
+msgstr "Приостановка очереди включена"
+
+#, fuzzy
+msgid "Queue stalled minutes"
+msgstr "Приостановка очереди (мин.)"
+
+msgid "Queueing"
+msgstr "Обслуживание"
+
+msgid "RPC URL"
+msgstr "URL RPC"
+
+msgid "RPC authentication required"
+msgstr "Аутентификация RPC"
+
+msgid "RPC bind address"
+msgstr "RPC-адрес"
+
+msgid "RPC enabled"
+msgstr "RPC включен"
+
+msgid "RPC password"
+msgstr "Пароль RPC"
+
+msgid "RPC port"
+msgstr "Порт RPC"
+
+msgid "RPC settings"
+msgstr "Настройки RPC"
+
+msgid "RPC username"
+msgstr "Имя пользователя RPC"
+
+msgid "RPC whitelist"
+msgstr "\"Белый\" список RPC"
+
+msgid "RPC whitelist enabled"
+msgstr "\"Белый\" список RPC включен"
+
+msgid "Ratio limit"
+msgstr "Коэффициент отдачи"
+
+msgid "Ratio limit enabled"
+msgstr "Коэффициент отдачи включен"
+
+msgid "Rename partial files"
+msgstr "Переименовывать незавершённые файлы"
+
+msgid "Run daemon as user"
+msgstr "Запустить демон от пользователя"
+
+msgid "Scheduling"
+msgstr "Планирование"
+
+msgid "Scrape paused torrents enabled"
+msgstr "Производить scrape-запросы у приостановленных торрентов"
+
+msgid "Script torrent done enabled"
+msgstr "Запуск скрипта после загрузки торрента включён"
+
+msgid "Script torrent done filename"
+msgstr "Скрипт завершения загрузки"
+
+msgid "Seed queue enabled"
+msgstr "Очередь сидов включена"
+
+msgid "Seed queue size"
+msgstr "Размер очереди сидирования"
+
+msgid "Speed limit down"
+msgstr "Лимит скорости загрузки"
+
+msgid "Speed limit down enabled"
+msgstr "Лимит скорости загрузки включен"
+
+msgid "Speed limit up"
+msgstr "Лимит скорости отдачи"
+
+msgid "Speed limit up enabled"
+msgstr "Лимит скорости отдачи включен"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+"Transmission - простой bittorrent-клиент. Здесь Вы можете настроить "
+"параметры."
+
+msgid "Trash original torrent files"
+msgstr "Удалить торрент-файлы"
+
+msgid "Upload slots per torrent"
+msgstr "Кол-во слотов отдачи на торрент"
+
+msgid "Watch directory"
+msgstr "Папка поиска"
+
+msgid "in minutes from midnight"
+msgstr "в минутах от полуночи"
+
+msgid "preallocation"
+msgstr "предраспределение"
+
+msgid "uTP enabled"
+msgstr "uTP включен"
diff --git a/trunk/package/luci/po/ru/upnp.po b/trunk/package/luci/po/ru/upnp.po
new file mode 100644
index 00000000..626672bd
--- /dev/null
+++ b/trunk/package/luci/po/ru/upnp.po
@@ -0,0 +1,158 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: upnp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 15:20+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Список доступа определяет, какие внешние порты могут быть перенаправлены на "
+"внутренние адреса и порты"
+
+msgid "Action"
+msgstr "Действие"
+
+msgid "Active UPnP Redirects"
+msgstr "Активные UPnP-переадресации"
+
+msgid "Advanced Settings"
+msgstr "Расширенные настройки"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "Разрешить перенаправление только для запрашивающих IP-адресов"
+
+msgid "Announced model number"
+msgstr "Номер модели"
+
+msgid "Announced serial number"
+msgstr "Серийный номер"
+
+msgid "Clean rules interval"
+msgstr "Интервал очистки правил"
+
+msgid "Clean rules threshold"
+msgstr "Порог очистки правил"
+
+msgid "Client Address"
+msgstr "Адрес клиента"
+
+msgid "Client Port"
+msgstr "Порт клиента"
+
+msgid "Collecting data..."
+msgstr "Сбор данных..."
+
+msgid "Comment"
+msgstr "Комментарий"
+
+msgid "Delete Redirect"
+msgstr "Удалить переадресацию"
+
+msgid "Device UUID"
+msgstr "UUID устройства"
+
+msgid "Downlink"
+msgstr "Нисходящий канал"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Включить NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Включить UPnP"
+
+msgid "Enable additional logging"
+msgstr "Включить дополнительное журналирование"
+
+msgid "Enable secure mode"
+msgstr "Использовать защищённый режим"
+
+msgid "External Port"
+msgstr "Внешний порт"
+
+msgid "External ports"
+msgstr "Внешние порты"
+
+msgid "General Settings"
+msgstr "Общие настройки"
+
+msgid "Internal addresses"
+msgstr "Внутренние адреса"
+
+msgid "Internal ports"
+msgstr "Внутренние порты"
+
+msgid "MiniUPnP ACLs"
+msgstr "Список доступа MiniUPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Настройки MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Интервал уведомления"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Presentation URL"
+msgstr "URL представления"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Добавлять дополнительную отладочную информацию в системный журнал"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Сообщать время работы системы вместо сервиса"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Запустить службы UPnP и NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Активные переадресации отсутствуют."
+
+msgid "UPNP"
+msgstr "UPnP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP позволяет клиентам в локальной сети автоматически настраивать "
+"маршрутизатор."
+
+msgid "UPnP lease file"
+msgstr "Файл аренды UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Восходящий канал"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Значение в КБ/с, только для информации"
+
+# Used in upnpmini.lua, which is marked broken, thus can be removed
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP позволяет клиентам в локальной сети автоматически настраивать "
+#~ "маршрутизатор."
+
+#~ msgid "enable"
+#~ msgstr "включить"
diff --git a/trunk/package/luci/po/ru/ushare.po b/trunk/package/luci/po/ru/ushare.po
new file mode 100644
index 00000000..ac08e946
--- /dev/null
+++ b/trunk/package/luci/po/ru/ushare.po
@@ -0,0 +1,54 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: ushare\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-08-15 11:29+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Content directories"
+msgstr "Директории с содержимым"
+
+msgid "Disable telnet console"
+msgstr "Выключить telnet-консоль"
+
+msgid "Disable webinterface"
+msgstr "Выключить веб-интерфейс"
+
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid "Options"
+msgstr "Опции"
+
+msgid "Servername"
+msgstr "Имя сервера"
+
+msgid "Settings"
+msgstr "Настройки"
+
+msgid "Username"
+msgstr "Имя пользователя"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare - это UPnP (TM) A/V DLNA медиа-сервер, который предоставляет "
+"мультимедийным устройствам информацию о доступных медиа-файлах."
diff --git a/trunk/package/luci/po/ru/uvc_streamer.po b/trunk/package/luci/po/ru/uvc_streamer.po
new file mode 100644
index 00000000..c9e859c6
--- /dev/null
+++ b/trunk/package/luci/po/ru/uvc_streamer.po
@@ -0,0 +1,46 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: uvc_streamer\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 11:46+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Количество кадров в секунду"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Разрешение"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Настройки"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Потоковое вещание с веб-камеры"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Настройте вашу Linux-UVC-совместимую веб-камеру. Перейдите на страницу <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/ru/vnstat.po b/trunk/package/luci/po/ru/vnstat.po
new file mode 100644
index 00000000..5254ca1e
--- /dev/null
+++ b/trunk/package/luci/po/ru/vnstat.po
@@ -0,0 +1,71 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: vnstat\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 11:48+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgid "Daily traffic"
+msgstr "Трафик за день"
+
+msgid "Graphs"
+msgstr "Графики"
+
+msgid "Hourly traffic"
+msgstr "Трафик за час"
+
+msgid "Monitor selected interfaces"
+msgstr "Собирать статистику на выбранных интерфейсах"
+
+msgid "Monthly traffic"
+msgstr "Трафик за месяц"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"База данных не настроена. Перейдите в конфигурацию и укажите интерфейсы для "
+"сбора статистики."
+
+msgid "Restart VnStat"
+msgstr "Перезапустить VnStat"
+
+msgid "Summary display"
+msgstr "Сводная статистика"
+
+msgid "Top 10 display"
+msgstr "Последние 10"
+
+msgid "Update »"
+msgstr "Обновить »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Графики VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Монитор трафика VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat - монитор сетевого трафика для Linux, собирающий статистику по "
+"выбранным интерфейсам."
+
+#~ msgid "The VnStat service has been restarted."
+#~ msgstr "VnStat сервис перезапущен."
diff --git a/trunk/package/luci/po/ru/voice_core.po b/trunk/package/luci/po/ru/voice_core.po
new file mode 100644
index 00000000..b6631dfc
--- /dev/null
+++ b/trunk/package/luci/po/ru/voice_core.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: voice_core\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 11:23+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Phones"
+msgstr "Телефоны"
+
+msgid "Voice"
+msgstr "Голос"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/ru/voice_diag.po b/trunk/package/luci/po/ru/voice_diag.po
new file mode 100644
index 00000000..5c98de01
--- /dev/null
+++ b/trunk/package/luci/po/ru/voice_diag.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: voice_diag\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2012-08-15 11:22+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Diagnostics"
+msgstr "Диагностика"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr "Доступные виды диагностики зависят от установленных модулей."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"В данном меню содержатся опции, которые позволяют вам протестировать "
+"голосовые службы вашей системы. Это известно как \"диагностика\"."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/ru/watchcat.po b/trunk/package/luci/po/ru/watchcat.po
new file mode 100644
index 00000000..83b95e20
--- /dev/null
+++ b/trunk/package/luci/po/ru/watchcat.po
@@ -0,0 +1,74 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: watchcat\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Forced reboot delay"
+msgstr "Задержка принудительной перезагрузки"
+
+msgid "Host address to ping"
+msgstr "Адрес хоста для опроса"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"Как часто проверять интернет-соединение. По умолчанию значение в секундах, "
+"вы можете использовать суффикс 'm' для указания минут, 'h' - часов, 'd' - "
+"дней"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"В периодическом режиме, данная настройка определяет период перезагрузки. В "
+"интернет-режиме, данная настройка определяет максимальный период времени без "
+"доступа в интернет, после которого устройство перезагружается. По умолчанию "
+"значение в секундах, вы можете использовать суффикс 'm' для указания минут, "
+"'h' - часов, 'd' - дней"
+
+msgid "Operating mode"
+msgstr "Режим работы"
+
+msgid "Period"
+msgstr "Период"
+
+msgid "Ping host"
+msgstr "Хост опроса"
+
+msgid "Ping period"
+msgstr "Период опроса"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat позволяет настроить периодическую перезагрузку устройства и/или "
+"перезагрузку при потере интернет-соединения на определённое время."
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"При необходимости перезагрузке системы, watchcat вызовет программную "
+"перезагрузку. При установке ненулевого значения, будет выполнена отложенная "
+"аппаратная перезагрузка при неудачной программной. Установите количество "
+"секунд для отложенной аппаратной перезагрузки или значение 0 для программной."
diff --git a/trunk/package/luci/po/ru/wol.po b/trunk/package/luci/po/ru/wol.po
new file mode 100644
index 00000000..9a843660
--- /dev/null
+++ b/trunk/package/luci/po/ru/wol.po
@@ -0,0 +1,59 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: wol\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2012-08-15 12:07+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Использовать широковещательную передачу на все интерфейсы"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "Выберите хост, который необходимо разбудить, или введите его MAC-адрес"
+
+msgid "Host to wake up"
+msgstr "Хост, который необходимо разбудить"
+
+msgid "Network interface to use"
+msgstr "Используемый сетевой интерфейс"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Иногда только одна из двух утилит работает. В случае ошибки, попробуйте "
+"использовать другую"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Определяет интерфейс, по которому будут посланы пакеты WoL"
+
+msgid "Starting WoL utility:"
+msgstr "Запуск WoL утилиты:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Пробуждение по LAN (Wake on LAN, WoL) - технология, позволяющая удалённо "
+"«разбудить» (включить) компьютер посредством отправки через локальную сеть "
+"специальным образом сформированного пакета данных."
+
+msgid "Wake up host"
+msgstr "Разбудить хост"
+
+msgid "WoL program"
+msgstr "Программа WoL"
diff --git a/trunk/package/luci/po/ru/wshaper.po b/trunk/package/luci/po/ru/wshaper.po
new file mode 100644
index 00000000..1984aacb
--- /dev/null
+++ b/trunk/package/luci/po/ru/wshaper.po
@@ -0,0 +1,61 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCI: wsharper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-26 15:09+0200\n"
+"PO-Revision-Date: 2012-08-15 11:53+0300\n"
+"Last-Translator: Roman A. aka BasicXP <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian <x12ozmouse@ya.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Downlink"
+msgstr "Нисходящий канал"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Ширина полосы пропускания прямого канала (кбит/с)"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Хост или сеть в нотации CIDR."
+
+msgid "Interface"
+msgstr "Интерфейс"
+
+msgid "Low priority destination ports"
+msgstr "Низкоприоритетные порты назначения"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Низкоприоритетные хосты назначения"
+
+msgid "Low priority hosts (Source)"
+msgstr "Низкоприоритетные хосты источника"
+
+msgid "Low priority source ports"
+msgstr "Низкоприоритетные порты источника"
+
+msgid "Uplink"
+msgstr "Восходящий канал"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Пропускная способность обратного канала (кбит/c)"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Установки Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper использует формирование трафика для обеспечения низких задержек "
+"интерактивного трафика даже в случае высокой загруженности интернет-"
+"соединения."
diff --git a/trunk/package/luci/po/sk/ahcp.po b/trunk/package/luci/po/sk/ahcp.po
new file mode 100644
index 00000000..b6184903
--- /dev/null
+++ b/trunk/package/luci/po/sk/ahcp.po
@@ -0,0 +1,106 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "AHCP Server"
+msgstr ""
+
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+
+msgid "Active AHCP Leases"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Age"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Announced NTP servers"
+msgstr ""
+
+msgid "Announced prefixes"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Forwarder"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Lease directory"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "Operation mode"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Served interfaces"
+msgstr ""
+
+msgid "Server"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+
+msgid "The AHCP Service is not running."
+msgstr ""
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "Unique ID file"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/asterisk.po b/trunk/package/luci/po/sk/asterisk.po
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/package/luci/po/sk/base.po b/trunk/package/luci/po/sk/base.po
new file mode 100644
index 00000000..59a9ab9c
--- /dev/null
+++ b/trunk/package/luci/po/sk/base.po
@@ -0,0 +1,2863 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr ""
+
+msgid "(%s available)"
+msgstr ""
+
+msgid "(empty)"
+msgstr ""
+
+msgid "(no interfaces attached)"
+msgstr ""
+
+msgid "-- Additional Field --"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "1 Minute Load:"
+msgstr ""
+
+msgid "15 Minute Load:"
+msgstr ""
+
+msgid "5 Minute Load:"
+msgstr ""
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr ""
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+
+msgid "AR Support"
+msgstr ""
+
+msgid "ARP retry threshold"
+msgstr ""
+
+msgid "ATM Bridges"
+msgstr ""
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr ""
+
+msgid "Access Concentrator"
+msgstr ""
+
+msgid "Access Point"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Activate this network"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+
+msgid "Active Connections"
+msgstr ""
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr ""
+
+msgid "Additional Hosts files"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Alert"
+msgstr ""
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+
+msgid "Allow all except listed"
+msgstr ""
+
+msgid "Allow listed only"
+msgstr ""
+
+msgid "Allow localhost"
+msgstr ""
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr ""
+
+msgid "Antenna 2"
+msgstr ""
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr ""
+
+msgid "Apply"
+msgstr ""
+
+msgid "Applying changes"
+msgstr ""
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr ""
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr ""
+
+msgid "Authoritative"
+msgstr ""
+
+msgid "Authorization Required"
+msgstr ""
+
+msgid "Auto Refresh"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid "Available packages"
+msgstr ""
+
+msgid "Average:"
+msgstr ""
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to Overview"
+msgstr ""
+
+msgid "Back to configuration"
+msgstr ""
+
+msgid "Back to overview"
+msgstr ""
+
+msgid "Back to scan results"
+msgstr ""
+
+msgid "Background Scan"
+msgstr ""
+
+msgid "Backup / Flash Firmware"
+msgstr ""
+
+msgid "Backup / Restore"
+msgstr ""
+
+msgid "Backup file list"
+msgstr ""
+
+msgid "Bad address specified!"
+msgstr ""
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr ""
+
+msgid "Bridge interfaces"
+msgstr ""
+
+msgid "Bridge unit number"
+msgstr ""
+
+msgid "Bring up on boot"
+msgstr ""
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr ""
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Changes applied."
+msgstr ""
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check"
+msgstr ""
+
+msgid "Checksum"
+msgstr ""
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Common Configuration"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Configuration applied."
+msgstr ""
+
+msgid "Configuration files will be kept."
+msgstr ""
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Connected"
+msgstr ""
+
+msgid "Connection Limit"
+msgstr ""
+
+msgid "Connections"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Country Code"
+msgstr ""
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr ""
+
+msgid "Create Interface"
+msgstr ""
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+
+msgid "DHCP Leases"
+msgstr ""
+
+msgid "DHCP Server"
+msgstr ""
+
+msgid "DHCP and DNS"
+msgstr ""
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr ""
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr ""
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete this interface"
+msgstr ""
+
+msgid "Delete this network"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Device Configuration"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr ""
+
+msgid "Distance to farthest network member in meters."
+msgstr ""
+
+msgid "Diversity"
+msgstr ""
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr ""
+
+msgid "Domain required"
+msgstr ""
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+
+msgid "Download and install package"
+msgstr ""
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr ""
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Ethernet Adapter"
+msgstr ""
+
+msgid "Ethernet Switch"
+msgstr ""
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Filter private"
+msgstr ""
+
+msgid "Filter useless"
+msgstr ""
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall Settings"
+msgstr ""
+
+msgid "Firewall Status"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr ""
+
+msgid "Flash Firmware"
+msgstr ""
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr ""
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr ""
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr ""
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr ""
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "Host entries"
+msgstr ""
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr ""
+
+msgid "Ignore resolve file"
+msgstr ""
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr ""
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr ""
+
+msgid "Initscripts"
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr ""
+
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr ""
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr ""
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr ""
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr ""
+
+msgid "Leasetime"
+msgstr ""
+
+msgid "Leasetime remaining"
+msgstr ""
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr ""
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr ""
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr ""
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr ""
+
+msgid "MAC-Filter"
+msgstr ""
+
+msgid "MAC-List"
+msgstr ""
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr ""
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory usage (%)"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Minimum Rate"
+msgstr ""
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr ""
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr ""
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr ""
+
+msgid "Mount Points"
+msgstr ""
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr ""
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr ""
+
+msgid "Navigation"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr ""
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "OPKG-Configuration"
+msgstr ""
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Owner"
+msgstr ""
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr ""
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr ""
+
+msgid "Packets"
+msgstr ""
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password authentication"
+msgstr ""
+
+msgid "Password of Private Key"
+msgstr ""
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr ""
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr ""
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr ""
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr ""
+
+msgid "Please wait: Device rebooting..."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr ""
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Prot."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr ""
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr ""
+
+msgid "RX"
+msgstr ""
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr ""
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr ""
+
+msgid "Receive"
+msgstr ""
+
+msgid "Receiver Antenna"
+msgstr ""
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr ""
+
+msgid "Regulatory Domain"
+msgstr ""
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr ""
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Reset Counters"
+msgstr ""
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr ""
+
+msgid "Restore backup"
+msgstr ""
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr ""
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & Apply"
+msgstr ""
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr ""
+
+msgid "Scheduled Tasks"
+msgstr ""
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr ""
+
+msgid "Separate WDS"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr ""
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr ""
+
+msgid "Skip to navigation"
+msgstr ""
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr ""
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr ""
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr ""
+
+msgid "Static IPv6 Routes"
+msgstr ""
+
+msgid "Static Leases"
+msgstr ""
+
+msgid "Static Routes"
+msgstr ""
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr ""
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Terminate"
+msgstr ""
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr ""
+
+msgid "The following rules are currently active on this system."
+msgstr ""
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr ""
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
+msgid "Transmission Rate"
+msgstr ""
+
+msgid "Transmit"
+msgstr ""
+
+msgid "Transmit Power"
+msgstr ""
+
+msgid "Transmitter Antenna"
+msgstr ""
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr ""
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr ""
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr ""
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr ""
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "WDS"
+msgstr ""
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+
+msgid "Wifi"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr ""
+
+msgid "Wireless Network"
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Wireless Security"
+msgstr ""
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr ""
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr ""
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr ""
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr ""
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr ""
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr ""
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr ""
+
+msgid "unspecified"
+msgstr ""
+
+msgid "unspecified -or- create:"
+msgstr ""
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "« Back"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/commands.po b/trunk/package/luci/po/sk/commands.po
new file mode 100644
index 00000000..4133dfb2
--- /dev/null
+++ b/trunk/package/luci/po/sk/commands.po
@@ -0,0 +1,91 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/coovachilli.po b/trunk/package/luci/po/sk/coovachilli.po
new file mode 100644
index 00000000..bb5b1b9f
--- /dev/null
+++ b/trunk/package/luci/po/sk/coovachilli.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "CoovaChilli"
+msgstr ""
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/ddns.po b/trunk/package/luci/po/sk/ddns.po
new file mode 100644
index 00000000..a3e29c63
--- /dev/null
+++ b/trunk/package/luci/po/sk/ddns.po
@@ -0,0 +1,74 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Check for changed IP every"
+msgstr ""
+
+msgid "Check-time unit"
+msgstr ""
+
+msgid "Custom update-URL"
+msgstr ""
+
+msgid "Dynamic DNS"
+msgstr ""
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Force update every"
+msgstr ""
+
+msgid "Force-time unit"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source of IP address"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "custom"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "interface"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "network"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/diag_core.po b/trunk/package/luci/po/sk/diag_core.po
new file mode 100644
index 00000000..389516fd
--- /dev/null
+++ b/trunk/package/luci/po/sk/diag_core.po
@@ -0,0 +1,30 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/diag_devinfo.po b/trunk/package/luci/po/sk/diag_devinfo.po
new file mode 100644
index 00000000..0d62204c
--- /dev/null
+++ b/trunk/package/luci/po/sk/diag_devinfo.po
@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr ""
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/ffwizard.po b/trunk/package/luci/po/sk/ffwizard.po
new file mode 100644
index 00000000..96ff0d2f
--- /dev/null
+++ b/trunk/package/luci/po/sk/ffwizard.po
@@ -0,0 +1,159 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/firewall.po b/trunk/package/luci/po/sk/firewall.po
new file mode 100644
index 00000000..32cd193f
--- /dev/null
+++ b/trunk/package/luci/po/sk/firewall.po
@@ -0,0 +1,432 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr ""
+
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr ""
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
+msgstr ""
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/freifunk-policyrouting.po b/trunk/package/luci/po/sk/freifunk-policyrouting.po
new file mode 100644
index 00000000..b1a78103
--- /dev/null
+++ b/trunk/package/luci/po/sk/freifunk-policyrouting.po
@@ -0,0 +1,49 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/freifunk.po b/trunk/package/luci/po/sk/freifunk.po
new file mode 100644
index 00000000..343f0220
--- /dev/null
+++ b/trunk/package/luci/po/sk/freifunk.po
@@ -0,0 +1,391 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/hd_idle.po b/trunk/package/luci/po/sk/hd_idle.po
new file mode 100644
index 00000000..6c3a3529
--- /dev/null
+++ b/trunk/package/luci/po/sk/hd_idle.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Disk"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable debug"
+msgstr ""
+
+msgid "Idle-time"
+msgstr ""
+
+msgid "Idle-time unit"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+
+msgid "min"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/meshwizard.po b/trunk/package/luci/po/sk/meshwizard.po
new file mode 100644
index 00000000..c86708ad
--- /dev/null
+++ b/trunk/package/luci/po/sk/meshwizard.po
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/minidlna.po b/trunk/package/luci/po/sk/minidlna.po
new file mode 100644
index 00000000..19c3e536
--- /dev/null
+++ b/trunk/package/luci/po/sk/minidlna.po
@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/mmc_over_gpio.po b/trunk/package/luci/po/sk/mmc_over_gpio.po
new file mode 100644
index 00000000..587ee42b
--- /dev/null
+++ b/trunk/package/luci/po/sk/mmc_over_gpio.po
@@ -0,0 +1,36 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/multiwan.po b/trunk/package/luci/po/sk/multiwan.po
new file mode 100644
index 00000000..b113eac3
--- /dev/null
+++ b/trunk/package/luci/po/sk/multiwan.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/ntpc.po b/trunk/package/luci/po/sk/ntpc.po
new file mode 100644
index 00000000..d3f8fb87
--- /dev/null
+++ b/trunk/package/luci/po/sk/ntpc.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Clock Adjustment"
+msgstr ""
+
+msgid "Count of time measurements"
+msgstr ""
+
+msgid "Current system time"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Offset frequency"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Synchronizes the system time"
+msgstr ""
+
+msgid "Time Server"
+msgstr ""
+
+msgid "Time Servers"
+msgstr ""
+
+msgid "Time Synchronisation"
+msgstr ""
+
+msgid "Update interval (in seconds)"
+msgstr ""
+
+msgid "empty = infinite"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/olsr.po b/trunk/package/luci/po/sk/olsr.po
new file mode 100644
index 00000000..fdd37e3a
--- /dev/null
+++ b/trunk/package/luci/po/sk/olsr.po
@@ -0,0 +1,687 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/openvpn.po b/trunk/package/luci/po/sk/openvpn.po
new file mode 100644
index 00000000..f8755342
--- /dev/null
+++ b/trunk/package/luci/po/sk/openvpn.po
@@ -0,0 +1,546 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/p2pblock.po b/trunk/package/luci/po/sk/p2pblock.po
new file mode 100644
index 00000000..1881b3ce
--- /dev/null
+++ b/trunk/package/luci/po/sk/p2pblock.po
@@ -0,0 +1,38 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr ""
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/p910nd.po b/trunk/package/luci/po/sk/p910nd.po
new file mode 100644
index 00000000..5282dd72
--- /dev/null
+++ b/trunk/package/luci/po/sk/p910nd.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Bidirectional mode"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+msgid "p910nd - Printer server"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/pbx-voicemail.po b/trunk/package/luci/po/sk/pbx-voicemail.po
new file mode 100644
index 00000000..c3a5c5ff
--- /dev/null
+++ b/trunk/package/luci/po/sk/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/pbx.po b/trunk/package/luci/po/sk/pbx.po
new file mode 100644
index 00000000..7b6d4a5c
--- /dev/null
+++ b/trunk/package/luci/po/sk/pbx.po
@@ -0,0 +1,484 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/polipo.po b/trunk/package/luci/po/sk/polipo.po
new file mode 100644
index 00000000..e003c175
--- /dev/null
+++ b/trunk/package/luci/po/sk/polipo.po
@@ -0,0 +1,202 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/qos.po b/trunk/package/luci/po/sk/qos.po
new file mode 100644
index 00000000..102e5a94
--- /dev/null
+++ b/trunk/package/luci/po/sk/qos.po
@@ -0,0 +1,86 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "priority"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/radvd.po b/trunk/package/luci/po/sk/radvd.po
new file mode 100644
index 00000000..9bd26fa3
--- /dev/null
+++ b/trunk/package/luci/po/sk/radvd.po
@@ -0,0 +1,367 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/rrdtool.po b/trunk/package/luci/po/sk/rrdtool.po
new file mode 100644
index 00000000..fd3781f5
--- /dev/null
+++ b/trunk/package/luci/po/sk/rrdtool.po
@@ -0,0 +1,356 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=ASCII\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/samba.po b/trunk/package/luci/po/sk/samba.po
new file mode 100644
index 00000000..66ec9e03
--- /dev/null
+++ b/trunk/package/luci/po/sk/samba.po
@@ -0,0 +1,73 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/splash.po b/trunk/package/luci/po/sk/splash.po
new file mode 100644
index 00000000..e9dd448e
--- /dev/null
+++ b/trunk/package/luci/po/sk/splash.po
@@ -0,0 +1,303 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/statistics.po b/trunk/package/luci/po/sk/statistics.po
new file mode 100644
index 00000000..d941336e
--- /dev/null
+++ b/trunk/package/luci/po/sk/statistics.po
@@ -0,0 +1,593 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/tinyproxy.po b/trunk/package/luci/po/sk/tinyproxy.po
new file mode 100644
index 00000000..128c71d4
--- /dev/null
+++ b/trunk/package/luci/po/sk/tinyproxy.po
@@ -0,0 +1,255 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/transmission.po b/trunk/package/luci/po/sk/transmission.po
new file mode 100644
index 00000000..4b4c3afd
--- /dev/null
+++ b/trunk/package/luci/po/sk/transmission.po
@@ -0,0 +1,290 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/upnp.po b/trunk/package/luci/po/sk/upnp.po
new file mode 100644
index 00000000..57631638
--- /dev/null
+++ b/trunk/package/luci/po/sk/upnp.po
@@ -0,0 +1,136 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/ushare.po b/trunk/package/luci/po/sk/ushare.po
new file mode 100644
index 00000000..4c9022b6
--- /dev/null
+++ b/trunk/package/luci/po/sk/ushare.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Content directories"
+msgstr ""
+
+msgid "Disable telnet console"
+msgstr ""
+
+msgid "Disable webinterface"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Servername"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/uvc_streamer.po b/trunk/package/luci/po/sk/uvc_streamer.po
new file mode 100644
index 00000000..b251f29f
--- /dev/null
+++ b/trunk/package/luci/po/sk/uvc_streamer.po
@@ -0,0 +1,38 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr ""
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr ""
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr ""
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr ""
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/vnstat.po b/trunk/package/luci/po/sk/vnstat.po
new file mode 100644
index 00000000..5926ecfe
--- /dev/null
+++ b/trunk/package/luci/po/sk/vnstat.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/voice_core.po b/trunk/package/luci/po/sk/voice_core.po
new file mode 100644
index 00000000..9c30581d
--- /dev/null
+++ b/trunk/package/luci/po/sk/voice_core.po
@@ -0,0 +1,15 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Phones"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/voice_diag.po b/trunk/package/luci/po/sk/voice_diag.po
new file mode 100644
index 00000000..874e11fc
--- /dev/null
+++ b/trunk/package/luci/po/sk/voice_diag.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/sk/watchcat.po b/trunk/package/luci/po/sk/watchcat.po
new file mode 100644
index 00000000..2ff7de99
--- /dev/null
+++ b/trunk/package/luci/po/sk/watchcat.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/wol.po b/trunk/package/luci/po/sk/wol.po
new file mode 100644
index 00000000..eea59ebc
--- /dev/null
+++ b/trunk/package/luci/po/sk/wol.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/sk/wshaper.po b/trunk/package/luci/po/sk/wshaper.po
new file mode 100644
index 00000000..4e03aa8f
--- /dev/null
+++ b/trunk/package/luci/po/sk/wshaper.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/ahcp.po b/trunk/package/luci/po/sv/ahcp.po
new file mode 100644
index 00000000..b5f0b7d6
--- /dev/null
+++ b/trunk/package/luci/po/sv/ahcp.po
@@ -0,0 +1,109 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-27 22:52+0200\n"
+"Last-Translator: Umeaboy <kristoffer.grundstrom1983@gmail.com>\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "AHCP-server"
+
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+
+msgid "Active AHCP Leases"
+msgstr ""
+
+msgid "Address"
+msgstr "Adress"
+
+msgid "Advanced Settings"
+msgstr "Avancerade inställningar"
+
+msgid "Age"
+msgstr "Ålder"
+
+msgid "Announced DNS servers"
+msgstr "Aviserade DNS-servrar"
+
+msgid "Announced NTP servers"
+msgstr "Aviserade NTP-servrar"
+
+msgid "Announced prefixes"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr "Samlar in data..."
+
+msgid "Forwarder"
+msgstr ""
+
+msgid "General Setup"
+msgstr "Allmän inställning"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 och IPv6"
+
+msgid "IPv4 only"
+msgstr "Endast IPv4"
+
+msgid "IPv6 only"
+msgstr "Endast IPv6"
+
+msgid "Lease directory"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Log file"
+msgstr "Logg-fil"
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "Operation mode"
+msgstr "Driftsläge"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Protokoll-familj"
+
+msgid "Served interfaces"
+msgstr ""
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Specificerar de aviserade IPv4 och IPv6 NTP-servrarna"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Specificerar de aviserade IPv4 och IPv6 namn-servrarna"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+
+msgid "The AHCP Service is not running."
+msgstr "AHCP-tjänsten körs inte."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "Unique ID file"
+msgstr "Unik ID-fil"
diff --git a/trunk/package/luci/po/sv/asterisk.po b/trunk/package/luci/po/sv/asterisk.po
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/package/luci/po/sv/base.po b/trunk/package/luci/po/sv/base.po
new file mode 100644
index 00000000..ebccd656
--- /dev/null
+++ b/trunk/package/luci/po/sv/base.po
@@ -0,0 +1,2875 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-28 09:22+0200\n"
+"Last-Translator: EricJ <ericj@acc.umu.se>\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr ""
+
+msgid "(%s available)"
+msgstr "(%s tillgängligt)"
+
+msgid "(empty)"
+msgstr "(tomt)"
+
+msgid "(no interfaces attached)"
+msgstr "(inga gränssnitt har bifogats)"
+
+msgid "-- Additional Field --"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr "-- anpassad --"
+
+msgid "1 Minute Load:"
+msgstr "Belastning senaste minuten:"
+
+msgid "15 Minute Load:"
+msgstr "Belastning senaste 15 minutrarna:"
+
+msgid "5 Minute Load:"
+msgstr "Belastning senaste 5 minutrarna:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr>server-port"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-adress"
+
+# I don't think "Gateway" is commonly translated.
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-nätmask"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-adress eller nätverk "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Lysdiod\">LED</abbr>-konfiguration"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr ""
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+
+msgid "AR Support"
+msgstr ""
+
+msgid "ARP retry threshold"
+msgstr ""
+
+msgid "ATM Bridges"
+msgstr ""
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr ""
+
+msgid "Access Concentrator"
+msgstr ""
+
+msgid "Access Point"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Activate this network"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+
+msgid "Active Connections"
+msgstr ""
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr ""
+
+msgid "Additional Hosts files"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Alert"
+msgstr ""
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+
+msgid "Allow all except listed"
+msgstr ""
+
+msgid "Allow listed only"
+msgstr ""
+
+msgid "Allow localhost"
+msgstr ""
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr ""
+
+msgid "Antenna 2"
+msgstr ""
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr ""
+
+msgid "Apply"
+msgstr ""
+
+msgid "Applying changes"
+msgstr ""
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr ""
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr ""
+
+msgid "Authoritative"
+msgstr ""
+
+msgid "Authorization Required"
+msgstr ""
+
+msgid "Auto Refresh"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid "Available packages"
+msgstr ""
+
+msgid "Average:"
+msgstr ""
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to Overview"
+msgstr ""
+
+msgid "Back to configuration"
+msgstr ""
+
+msgid "Back to overview"
+msgstr ""
+
+msgid "Back to scan results"
+msgstr ""
+
+msgid "Background Scan"
+msgstr ""
+
+msgid "Backup / Flash Firmware"
+msgstr ""
+
+msgid "Backup / Restore"
+msgstr ""
+
+msgid "Backup file list"
+msgstr ""
+
+msgid "Bad address specified!"
+msgstr ""
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr ""
+
+msgid "Bridge interfaces"
+msgstr ""
+
+msgid "Bridge unit number"
+msgstr ""
+
+msgid "Bring up on boot"
+msgstr ""
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr ""
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Changes applied."
+msgstr ""
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check"
+msgstr ""
+
+msgid "Checksum"
+msgstr ""
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Common Configuration"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Configuration applied."
+msgstr ""
+
+msgid "Configuration files will be kept."
+msgstr ""
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Connected"
+msgstr ""
+
+msgid "Connection Limit"
+msgstr ""
+
+msgid "Connections"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Country Code"
+msgstr ""
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr ""
+
+msgid "Create Interface"
+msgstr ""
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+
+msgid "DHCP Leases"
+msgstr ""
+
+msgid "DHCP Server"
+msgstr ""
+
+msgid "DHCP and DNS"
+msgstr ""
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr ""
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr ""
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete this interface"
+msgstr ""
+
+msgid "Delete this network"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Device Configuration"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr ""
+
+msgid "Distance to farthest network member in meters."
+msgstr ""
+
+msgid "Diversity"
+msgstr ""
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr ""
+
+msgid "Domain required"
+msgstr ""
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+
+msgid "Download and install package"
+msgstr ""
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr ""
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Ethernet Adapter"
+msgstr ""
+
+msgid "Ethernet Switch"
+msgstr ""
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Filter private"
+msgstr ""
+
+msgid "Filter useless"
+msgstr ""
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall Settings"
+msgstr ""
+
+msgid "Firewall Status"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr ""
+
+msgid "Flash Firmware"
+msgstr ""
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr ""
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr ""
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr ""
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr ""
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "Host entries"
+msgstr ""
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr ""
+
+msgid "Ignore resolve file"
+msgstr ""
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr ""
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr ""
+
+msgid "Initscripts"
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr ""
+
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr ""
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr ""
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr ""
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr ""
+
+msgid "Leasetime"
+msgstr ""
+
+msgid "Leasetime remaining"
+msgstr ""
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr ""
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr ""
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr ""
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr ""
+
+msgid "MAC-Filter"
+msgstr ""
+
+msgid "MAC-List"
+msgstr ""
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr ""
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory usage (%)"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Minimum Rate"
+msgstr ""
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr ""
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr ""
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr ""
+
+msgid "Mount Points"
+msgstr ""
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr ""
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr ""
+
+msgid "Navigation"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr ""
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "OPKG-Configuration"
+msgstr ""
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Owner"
+msgstr ""
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr ""
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr ""
+
+msgid "Packets"
+msgstr ""
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password authentication"
+msgstr ""
+
+msgid "Password of Private Key"
+msgstr ""
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr ""
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr ""
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr ""
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr ""
+
+msgid "Please wait: Device rebooting..."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr ""
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Prot."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr ""
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr ""
+
+msgid "RX"
+msgstr ""
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr ""
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr ""
+
+msgid "Receive"
+msgstr ""
+
+msgid "Receiver Antenna"
+msgstr ""
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr ""
+
+msgid "Regulatory Domain"
+msgstr ""
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr ""
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Reset Counters"
+msgstr ""
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr ""
+
+msgid "Restore backup"
+msgstr ""
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr ""
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & Apply"
+msgstr ""
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr ""
+
+msgid "Scheduled Tasks"
+msgstr ""
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr ""
+
+msgid "Separate WDS"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr ""
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr ""
+
+msgid "Skip to navigation"
+msgstr ""
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr ""
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr ""
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr ""
+
+msgid "Static IPv6 Routes"
+msgstr ""
+
+msgid "Static Leases"
+msgstr ""
+
+msgid "Static Routes"
+msgstr ""
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr ""
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Terminate"
+msgstr ""
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr ""
+
+msgid "The following rules are currently active on this system."
+msgstr ""
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr ""
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
+msgid "Transmission Rate"
+msgstr ""
+
+msgid "Transmit"
+msgstr ""
+
+msgid "Transmit Power"
+msgstr ""
+
+msgid "Transmitter Antenna"
+msgstr ""
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr ""
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr ""
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr ""
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr ""
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "WDS"
+msgstr ""
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+
+msgid "Wifi"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr ""
+
+msgid "Wireless Network"
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Wireless Security"
+msgstr ""
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr ""
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr ""
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr ""
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr ""
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr ""
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr ""
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr ""
+
+msgid "unspecified"
+msgstr ""
+
+msgid "unspecified -or- create:"
+msgstr ""
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "« Back"
+msgstr ""
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz andra kanalen ovanför"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz andra kanalen nedanför"
diff --git a/trunk/package/luci/po/sv/commands.po b/trunk/package/luci/po/sv/commands.po
new file mode 100644
index 00000000..9fbe0afe
--- /dev/null
+++ b/trunk/package/luci/po/sv/commands.po
@@ -0,0 +1,92 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/coovachilli.po b/trunk/package/luci/po/sv/coovachilli.po
new file mode 100644
index 00000000..8695ce5a
--- /dev/null
+++ b/trunk/package/luci/po/sv/coovachilli.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-28 06:16+0200\n"
+"Last-Translator: Umeaboy <kristoffer.grundstrom1983@gmail.com>\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChili"
+
+msgid "Network Configuration"
+msgstr "Nätverkskonfiguration"
+
+msgid "RADIUS configuration"
+msgstr "RADIUS-konfiguration"
+
+msgid "UAM and MAC Authentication"
+msgstr "UAM och MAC-autensiering"
diff --git a/trunk/package/luci/po/sv/ddns.po b/trunk/package/luci/po/sv/ddns.po
new file mode 100644
index 00000000..0c6e46f6
--- /dev/null
+++ b/trunk/package/luci/po/sv/ddns.po
@@ -0,0 +1,75 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Check for changed IP every"
+msgstr ""
+
+msgid "Check-time unit"
+msgstr ""
+
+msgid "Custom update-URL"
+msgstr ""
+
+msgid "Dynamic DNS"
+msgstr ""
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Force update every"
+msgstr ""
+
+msgid "Force-time unit"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source of IP address"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "custom"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "interface"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "network"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/diag_core.po b/trunk/package/luci/po/sv/diag_core.po
new file mode 100644
index 00000000..dd0a81a6
--- /dev/null
+++ b/trunk/package/luci/po/sv/diag_core.po
@@ -0,0 +1,31 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/diag_devinfo.po b/trunk/package/luci/po/sv/diag_devinfo.po
new file mode 100644
index 00000000..cf74fbc7
--- /dev/null
+++ b/trunk/package/luci/po/sv/diag_devinfo.po
@@ -0,0 +1,207 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr ""
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/ffwizard.po b/trunk/package/luci/po/sv/ffwizard.po
new file mode 100644
index 00000000..61a2324e
--- /dev/null
+++ b/trunk/package/luci/po/sv/ffwizard.po
@@ -0,0 +1,166 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-28 02:56+0200\n"
+"Last-Translator: Umeaboy <kristoffer.grundstrom1983@gmail.com>\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "Tillåt att överföra anonym statistik om denna nod"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+"Bocka för det här för att skydda ditt LAN från andra noder eller klienter"
+
+msgid "Configure network"
+msgstr "Konfigurera nätverk"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "Anslut din nod med andra noder med en tunnel via internet."
+
+msgid "DHCP IP range"
+msgstr "IP-avstånd för DHCP"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP kommer automatiskt tilldela IP-adresser till klienter"
+
+msgid "DNS Server"
+msgstr "DNS-server"
+
+msgid "Enable DHCP"
+msgstr "Aktivera DNS-servern"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Heartbeat"
+msgstr "Hjärtslag"
+
+msgid "IP address"
+msgstr "IP-adress"
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr "Begränsa bandbredd för nerladdning"
+
+msgid "Limit upload bandwidth"
+msgstr "Begränsa bandbredd för uppladdning"
+
+msgid "Mesh IP address"
+msgstr "Maskera IP-adress"
+
+msgid "Mesh IPv6 Address"
+msgstr "Maskera IPv6-adress"
+
+msgid "Netmask"
+msgstr "Nätmask"
+
+msgid "Password"
+msgstr "Lösenord"
+
+msgid "Password confirmation"
+msgstr "Bekräftelse av lösenord"
+
+msgid "Password successfully changed"
+msgstr "Ändring av lösenordet lyckades"
+
+msgid "Protect LAN"
+msgstr "Skydda LAN"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "Markera den här kryssrutan för att konfigurera dina nätverksgränssnitt."
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Välj det här för att tillåta andra att använda din anslutning för att få "
+"tillgång till internet."
+
+msgid "Share your internet connection"
+msgstr "Dela din internet-anslutning"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+#, fuzzy
+msgid "The ipv6 address is calculated auomatically."
+msgstr "IPv6-adressen beräknas automatiskt."
+
+msgid "The protocol to use for internet connectivity."
+msgstr "Protokollet som ska användas för anslutbarhet till internet."
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr "Okänt fel"
+
+msgid "Username"
+msgstr "Användarnamn"
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr "Guide"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Din enhet och grannarnas noder måste använda samma kanal."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "statisk"
+
+msgid "Configure this interface."
+msgstr "Konfigurera det här gränssnittet"
+
+msgid "recommended"
+msgstr "rekommenderas"
+
+msgid "Basic settings"
+msgstr "Standardinställningar"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Standardinställningarna är inte kompletta. Vänligen gå till"
+
+msgid "Error"
+msgstr "Fel"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr "Du kan inte använda guiden för att några värden som behövs saknas."
+
+msgid "and fill out all required fields."
+msgstr "och fyll i alla fält som behövs."
diff --git a/trunk/package/luci/po/sv/firewall.po b/trunk/package/luci/po/sv/firewall.po
new file mode 100644
index 00000000..f3e7fd94
--- /dev/null
+++ b/trunk/package/luci/po/sv/firewall.po
@@ -0,0 +1,433 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr ""
+
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr ""
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
+msgstr ""
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/freifunk-policyrouting.po b/trunk/package/luci/po/sv/freifunk-policyrouting.po
new file mode 100644
index 00000000..1310afa9
--- /dev/null
+++ b/trunk/package/luci/po/sv/freifunk-policyrouting.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/freifunk.po b/trunk/package/luci/po/sv/freifunk.po
new file mode 100644
index 00000000..cf42fa15
--- /dev/null
+++ b/trunk/package/luci/po/sv/freifunk.po
@@ -0,0 +1,392 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/hd_idle.po b/trunk/package/luci/po/sv/hd_idle.po
new file mode 100644
index 00000000..bac2024e
--- /dev/null
+++ b/trunk/package/luci/po/sv/hd_idle.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Disk"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable debug"
+msgstr ""
+
+msgid "Idle-time"
+msgstr ""
+
+msgid "Idle-time unit"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+
+msgid "min"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/meshwizard.po b/trunk/package/luci/po/sv/meshwizard.po
new file mode 100644
index 00000000..b898024e
--- /dev/null
+++ b/trunk/package/luci/po/sv/meshwizard.po
@@ -0,0 +1,120 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/minidlna.po b/trunk/package/luci/po/sv/minidlna.po
new file mode 100644
index 00000000..51a3f3a6
--- /dev/null
+++ b/trunk/package/luci/po/sv/minidlna.po
@@ -0,0 +1,165 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/mmc_over_gpio.po b/trunk/package/luci/po/sv/mmc_over_gpio.po
new file mode 100644
index 00000000..d6e5ace1
--- /dev/null
+++ b/trunk/package/luci/po/sv/mmc_over_gpio.po
@@ -0,0 +1,37 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/multiwan.po b/trunk/package/luci/po/sv/multiwan.po
new file mode 100644
index 00000000..fae4c580
--- /dev/null
+++ b/trunk/package/luci/po/sv/multiwan.po
@@ -0,0 +1,116 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/ntpc.po b/trunk/package/luci/po/sv/ntpc.po
new file mode 100644
index 00000000..00715e65
--- /dev/null
+++ b/trunk/package/luci/po/sv/ntpc.po
@@ -0,0 +1,49 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Clock Adjustment"
+msgstr ""
+
+msgid "Count of time measurements"
+msgstr ""
+
+msgid "Current system time"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Offset frequency"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Synchronizes the system time"
+msgstr ""
+
+msgid "Time Server"
+msgstr ""
+
+msgid "Time Servers"
+msgstr ""
+
+msgid "Time Synchronisation"
+msgstr ""
+
+msgid "Update interval (in seconds)"
+msgstr ""
+
+msgid "empty = infinite"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/olsr.po b/trunk/package/luci/po/sv/olsr.po
new file mode 100644
index 00000000..9af47a40
--- /dev/null
+++ b/trunk/package/luci/po/sv/olsr.po
@@ -0,0 +1,688 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/openvpn.po b/trunk/package/luci/po/sv/openvpn.po
new file mode 100644
index 00000000..9188488f
--- /dev/null
+++ b/trunk/package/luci/po/sv/openvpn.po
@@ -0,0 +1,547 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/p2pblock.po b/trunk/package/luci/po/sv/p2pblock.po
new file mode 100644
index 00000000..de6e66a8
--- /dev/null
+++ b/trunk/package/luci/po/sv/p2pblock.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr ""
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/p910nd.po b/trunk/package/luci/po/sv/p910nd.po
new file mode 100644
index 00000000..98febee6
--- /dev/null
+++ b/trunk/package/luci/po/sv/p910nd.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Bidirectional mode"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+msgid "p910nd - Printer server"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/pbx-voicemail.po b/trunk/package/luci/po/sv/pbx-voicemail.po
new file mode 100644
index 00000000..ea62b395
--- /dev/null
+++ b/trunk/package/luci/po/sv/pbx-voicemail.po
@@ -0,0 +1,89 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/pbx.po b/trunk/package/luci/po/sv/pbx.po
new file mode 100644
index 00000000..400289b6
--- /dev/null
+++ b/trunk/package/luci/po/sv/pbx.po
@@ -0,0 +1,506 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-28 06:11+0200\n"
+"Last-Translator: Umeaboy <kristoffer.grundstrom1983@gmail.com>\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Avancerade inställningar"
+
+msgid "Available"
+msgstr "Tillgänglig"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+"Undvik att använda allt förutom alfa-numeriska karaktärer, mellanslag, komma-"
+"tecken och punkt."
+
+msgid "Away"
+msgstr "Borta"
+
+msgid "Blacklisted Numbers"
+msgstr "Svartlistade nummer"
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "Kopiera och klistra in ett stort antal nummer här."
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr "Ringer upp nummer som inte passar någon annanstans"
+
+msgid "Do Not Disturb"
+msgstr "Stör ej"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "Domän/IP-adress/Dynamisk domän"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Dynamisk lista över svartlistade nummer"
+
+msgid "Email"
+msgstr "E-post"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Aktivera inkommande samtal (Registrera via SIP)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Aktivera inkommande samtal (se status nedanför)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Aktivera utgående samtal"
+
+msgid "Enabled"
+msgstr "Aktiverat"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"Ange telefonnummer som du vill neka samtal från automatiskt. Du borde "
+"förmodligen utesluta landskoden och eventuella inledande nollor, men "
+"experimentera gärna för att vara säker på att du lyckas blockera nummer från "
+"ditt önskade område."
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"Ange den här IP:n (eller IP:port) i Server/Registrar-inställningarna för SIP-"
+"enheter som du endast kommer att använda LOKALT och aldrig från en "
+"fjärrstyrd anslutning."
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"Ange det här värdnamnet (eller värdnamn:port) under Server/Registrar "
+"inställningen för SIP-enheten som du kommer att använda från en fjärrstyrd "
+"plats (de kommer att fungera lokalt också)."
+
+msgid "External SIP Port"
+msgstr "Extern SIP-port"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Fullständigt namn"
+
+msgid "General Settings"
+msgstr "Allmänna inställningar"
+
+msgid "Google Accounts"
+msgstr "Google-konton"
+
+msgid "Google Talk Status"
+msgstr "Status för Google Talk"
+
+msgid "Google Talk Status Message"
+msgstr "Statusmeddelande för Google Talk"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Google Voice/Talk-konton"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "Inkommande samtal"
+
+msgid "Insert QoS Rules"
+msgstr "För in QoS-regler"
+
+msgid "Makes Outgoing Calls"
+msgstr "Gör utgående samtal"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr "NOTERA: Det finns inga lokala användarkonton konfigurerade."
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+"NOTERA: Det finns inga lokala användar-konton aktiverade för utgående samtal."
+
+msgid "No"
+msgstr "Nej"
+
+msgid "Number of Seconds to Ring"
+msgstr "Antal sekunder att ringa"
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr "Utgående samtal"
+
+msgid "PBX Main Page"
+msgstr "Huvudsida för PBX"
+
+msgid "PBX Service Status"
+msgstr "Status för PBX-tjänsten"
+
+msgid "PIN"
+msgstr "PIN-kod"
+
+msgid "Password"
+msgstr "Lösenord"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr "Port-inställning för SIP-enheter"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr "QoS-inställningar"
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr "Tar emot inkommande samtal"
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr "Ringer användare som är aktiverade för inkommande samtal"
+
+msgid "SIP Accounts"
+msgstr "SIP-konton"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "SIP-enhet/Softphone-konton"
+
+msgid "SIP Provider Accounts"
+msgstr "SIP-operatörskonton"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "SIP-sfär (behövs av vissa operatörer)"
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr "Server-inställning"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "Server-inställning för lokala SIP-enheter"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "Server-inställning för fjärrstyrda SIP-enheter"
+
+msgid "Service Status"
+msgstr "Status för tjänst"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+"Specificera nummer individuellt här. Tryck på enter-knappen för att lägga "
+"till fler nummer."
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+"Det här valet borde vara inställt på \"Ja\" om du har ett DID (riktigt "
+"telefonnummer) associerat med det här SIP-kontot eller om du vill ta emot "
+"SIP uri-samtal via den här operatören."
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr "Använd det här kontot för att göra utgående samtal."
+
+msgid "User Accounts"
+msgstr "Användar-konton"
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr "Användarnamn"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr "Använder operatörer för utgående samtal"
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+"Du kan specifiera ett riktigt namn som visas i samband med nummret här."
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/polipo.po b/trunk/package/luci/po/sv/polipo.po
new file mode 100644
index 00000000..7b64c7ad
--- /dev/null
+++ b/trunk/package/luci/po/sv/polipo.po
@@ -0,0 +1,203 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/qos.po b/trunk/package/luci/po/sv/qos.po
new file mode 100644
index 00000000..44f8a351
--- /dev/null
+++ b/trunk/package/luci/po/sv/qos.po
@@ -0,0 +1,87 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "priority"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/radvd.po b/trunk/package/luci/po/sv/radvd.po
new file mode 100644
index 00000000..46a3bf96
--- /dev/null
+++ b/trunk/package/luci/po/sv/radvd.po
@@ -0,0 +1,368 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/rrdtool.po b/trunk/package/luci/po/sv/rrdtool.po
new file mode 100644
index 00000000..580c9f35
--- /dev/null
+++ b/trunk/package/luci/po/sv/rrdtool.po
@@ -0,0 +1,357 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=ASCII\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/samba.po b/trunk/package/luci/po/sv/samba.po
new file mode 100644
index 00000000..b19b6e3c
--- /dev/null
+++ b/trunk/package/luci/po/sv/samba.po
@@ -0,0 +1,74 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/splash.po b/trunk/package/luci/po/sv/splash.po
new file mode 100644
index 00000000..cd573b21
--- /dev/null
+++ b/trunk/package/luci/po/sv/splash.po
@@ -0,0 +1,303 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/statistics.po b/trunk/package/luci/po/sv/statistics.po
new file mode 100644
index 00000000..fba752fd
--- /dev/null
+++ b/trunk/package/luci/po/sv/statistics.po
@@ -0,0 +1,594 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/tinyproxy.po b/trunk/package/luci/po/sv/tinyproxy.po
new file mode 100644
index 00000000..f706056c
--- /dev/null
+++ b/trunk/package/luci/po/sv/tinyproxy.po
@@ -0,0 +1,256 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/transmission.po b/trunk/package/luci/po/sv/transmission.po
new file mode 100644
index 00000000..e276ebf5
--- /dev/null
+++ b/trunk/package/luci/po/sv/transmission.po
@@ -0,0 +1,291 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/upnp.po b/trunk/package/luci/po/sv/upnp.po
new file mode 100644
index 00000000..11c20c14
--- /dev/null
+++ b/trunk/package/luci/po/sv/upnp.po
@@ -0,0 +1,137 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/ushare.po b/trunk/package/luci/po/sv/ushare.po
new file mode 100644
index 00000000..50fc9d6d
--- /dev/null
+++ b/trunk/package/luci/po/sv/ushare.po
@@ -0,0 +1,46 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Content directories"
+msgstr ""
+
+msgid "Disable telnet console"
+msgstr ""
+
+msgid "Disable webinterface"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Servername"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/uvc_streamer.po b/trunk/package/luci/po/sv/uvc_streamer.po
new file mode 100644
index 00000000..f4bd4a01
--- /dev/null
+++ b/trunk/package/luci/po/sv/uvc_streamer.po
@@ -0,0 +1,39 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr ""
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr ""
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr ""
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr ""
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/vnstat.po b/trunk/package/luci/po/sv/vnstat.po
new file mode 100644
index 00000000..113c4d27
--- /dev/null
+++ b/trunk/package/luci/po/sv/vnstat.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/voice_core.po b/trunk/package/luci/po/sv/voice_core.po
new file mode 100644
index 00000000..803726a3
--- /dev/null
+++ b/trunk/package/luci/po/sv/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-04-28 06:14+0200\n"
+"Last-Translator: Umeaboy <kristoffer.grundstrom1983@gmail.com>\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefoner"
+
+msgid "Voice"
+msgstr "Röst"
diff --git a/trunk/package/luci/po/sv/voice_diag.po b/trunk/package/luci/po/sv/voice_diag.po
new file mode 100644
index 00000000..5caf949e
--- /dev/null
+++ b/trunk/package/luci/po/sv/voice_diag.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/sv/watchcat.po b/trunk/package/luci/po/sv/watchcat.po
new file mode 100644
index 00000000..dd2365a4
--- /dev/null
+++ b/trunk/package/luci/po/sv/watchcat.po
@@ -0,0 +1,54 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/wol.po b/trunk/package/luci/po/sv/wol.po
new file mode 100644
index 00000000..44b59958
--- /dev/null
+++ b/trunk/package/luci/po/sv/wol.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/sv/wshaper.po b/trunk/package/luci/po/sv/wshaper.po
new file mode 100644
index 00000000..b85651a6
--- /dev/null
+++ b/trunk/package/luci/po/sv/wshaper.po
@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/ahcp.pot b/trunk/package/luci/po/templates/ahcp.pot
new file mode 100644
index 00000000..ea6bb425
--- /dev/null
+++ b/trunk/package/luci/po/templates/ahcp.pot
@@ -0,0 +1,99 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "AHCP Server"
+msgstr ""
+
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+
+msgid "Active AHCP Leases"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Age"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Announced NTP servers"
+msgstr ""
+
+msgid "Announced prefixes"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Forwarder"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Lease directory"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "Operation mode"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Served interfaces"
+msgstr ""
+
+msgid "Server"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+
+msgid "The AHCP Service is not running."
+msgstr ""
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "Unique ID file"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/asterisk.pot b/trunk/package/luci/po/templates/asterisk.pot
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/package/luci/po/templates/base.pot b/trunk/package/luci/po/templates/base.pot
new file mode 100644
index 00000000..641990f6
--- /dev/null
+++ b/trunk/package/luci/po/templates/base.pot
@@ -0,0 +1,2856 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "(%d minute window, %d second interval)"
+msgstr ""
+
+msgid "(%s available)"
+msgstr ""
+
+msgid "(empty)"
+msgstr ""
+
+msgid "(no interfaces attached)"
+msgstr ""
+
+msgid "-- Additional Field --"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "1 Minute Load:"
+msgstr ""
+
+msgid "15 Minute Load:"
+msgstr ""
+
+msgid "5 Minute Load:"
+msgstr ""
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr ""
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+
+msgid "AR Support"
+msgstr ""
+
+msgid "ARP retry threshold"
+msgstr ""
+
+msgid "ATM Bridges"
+msgstr ""
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr ""
+
+msgid "Access Concentrator"
+msgstr ""
+
+msgid "Access Point"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Activate this network"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+
+msgid "Active Connections"
+msgstr ""
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr ""
+
+msgid "Additional Hosts files"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Alert"
+msgstr ""
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+
+msgid "Allow all except listed"
+msgstr ""
+
+msgid "Allow listed only"
+msgstr ""
+
+msgid "Allow localhost"
+msgstr ""
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr ""
+
+msgid "Antenna 2"
+msgstr ""
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr ""
+
+msgid "Apply"
+msgstr ""
+
+msgid "Applying changes"
+msgstr ""
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr ""
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr ""
+
+msgid "Authoritative"
+msgstr ""
+
+msgid "Authorization Required"
+msgstr ""
+
+msgid "Auto Refresh"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid "Available packages"
+msgstr ""
+
+msgid "Average:"
+msgstr ""
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to Overview"
+msgstr ""
+
+msgid "Back to configuration"
+msgstr ""
+
+msgid "Back to overview"
+msgstr ""
+
+msgid "Back to scan results"
+msgstr ""
+
+msgid "Background Scan"
+msgstr ""
+
+msgid "Backup / Flash Firmware"
+msgstr ""
+
+msgid "Backup / Restore"
+msgstr ""
+
+msgid "Backup file list"
+msgstr ""
+
+msgid "Bad address specified!"
+msgstr ""
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr ""
+
+msgid "Bridge interfaces"
+msgstr ""
+
+msgid "Bridge unit number"
+msgstr ""
+
+msgid "Bring up on boot"
+msgstr ""
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr ""
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Changes applied."
+msgstr ""
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check"
+msgstr ""
+
+msgid "Checksum"
+msgstr ""
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Common Configuration"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Configuration applied."
+msgstr ""
+
+msgid "Configuration files will be kept."
+msgstr ""
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Connected"
+msgstr ""
+
+msgid "Connection Limit"
+msgstr ""
+
+msgid "Connections"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Country Code"
+msgstr ""
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr ""
+
+msgid "Create Interface"
+msgstr ""
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+
+msgid "DHCP Leases"
+msgstr ""
+
+msgid "DHCP Server"
+msgstr ""
+
+msgid "DHCP and DNS"
+msgstr ""
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr ""
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr ""
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete this interface"
+msgstr ""
+
+msgid "Delete this network"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Device Configuration"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr ""
+
+msgid "Distance to farthest network member in meters."
+msgstr ""
+
+msgid "Diversity"
+msgstr ""
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr ""
+
+msgid "Domain required"
+msgstr ""
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+
+msgid "Download and install package"
+msgstr ""
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr ""
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Ethernet Adapter"
+msgstr ""
+
+msgid "Ethernet Switch"
+msgstr ""
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Filter private"
+msgstr ""
+
+msgid "Filter useless"
+msgstr ""
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall Settings"
+msgstr ""
+
+msgid "Firewall Status"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr ""
+
+msgid "Flash Firmware"
+msgstr ""
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr ""
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr ""
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr ""
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr ""
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "Host entries"
+msgstr ""
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr ""
+
+msgid "Ignore resolve file"
+msgstr ""
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr ""
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr ""
+
+msgid "Initscripts"
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr ""
+
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr ""
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr ""
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr ""
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr ""
+
+msgid "Leasetime"
+msgstr ""
+
+msgid "Leasetime remaining"
+msgstr ""
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr ""
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr ""
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr ""
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr ""
+
+msgid "MAC-Filter"
+msgstr ""
+
+msgid "MAC-List"
+msgstr ""
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr ""
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory usage (%)"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Minimum Rate"
+msgstr ""
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr ""
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr ""
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr ""
+
+msgid "Mount Points"
+msgstr ""
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr ""
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr ""
+
+msgid "Navigation"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr ""
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "OPKG-Configuration"
+msgstr ""
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Owner"
+msgstr ""
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr ""
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr ""
+
+msgid "Packets"
+msgstr ""
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password authentication"
+msgstr ""
+
+msgid "Password of Private Key"
+msgstr ""
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr ""
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr ""
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr ""
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr ""
+
+msgid "Please wait: Device rebooting..."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr ""
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Prot."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr ""
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr ""
+
+msgid "RX"
+msgstr ""
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr ""
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr ""
+
+msgid "Receive"
+msgstr ""
+
+msgid "Receiver Antenna"
+msgstr ""
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr ""
+
+msgid "Regulatory Domain"
+msgstr ""
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr ""
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Reset Counters"
+msgstr ""
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr ""
+
+msgid "Restore backup"
+msgstr ""
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr ""
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & Apply"
+msgstr ""
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr ""
+
+msgid "Scheduled Tasks"
+msgstr ""
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr ""
+
+msgid "Separate WDS"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr ""
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr ""
+
+msgid "Skip to navigation"
+msgstr ""
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr ""
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr ""
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr ""
+
+msgid "Static IPv6 Routes"
+msgstr ""
+
+msgid "Static Leases"
+msgstr ""
+
+msgid "Static Routes"
+msgstr ""
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr ""
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Terminate"
+msgstr ""
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr ""
+
+msgid "The following rules are currently active on this system."
+msgstr ""
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr ""
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
+msgid "Transmission Rate"
+msgstr ""
+
+msgid "Transmit"
+msgstr ""
+
+msgid "Transmit Power"
+msgstr ""
+
+msgid "Transmitter Antenna"
+msgstr ""
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr ""
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr ""
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr ""
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr ""
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "WDS"
+msgstr ""
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+
+msgid "Wifi"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr ""
+
+msgid "Wireless Network"
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Wireless Security"
+msgstr ""
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr ""
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr ""
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr ""
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr ""
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr ""
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr ""
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr ""
+
+msgid "unspecified"
+msgstr ""
+
+msgid "unspecified -or- create:"
+msgstr ""
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "« Back"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/commands.pot b/trunk/package/luci/po/templates/commands.pot
new file mode 100644
index 00000000..5d2ffae6
--- /dev/null
+++ b/trunk/package/luci/po/templates/commands.pot
@@ -0,0 +1,84 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/coovachilli.pot b/trunk/package/luci/po/templates/coovachilli.pot
new file mode 100644
index 00000000..c1a2bed3
--- /dev/null
+++ b/trunk/package/luci/po/templates/coovachilli.pot
@@ -0,0 +1,14 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "CoovaChilli"
+msgstr ""
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/ddns.pot b/trunk/package/luci/po/templates/ddns.pot
new file mode 100644
index 00000000..fc09dc22
--- /dev/null
+++ b/trunk/package/luci/po/templates/ddns.pot
@@ -0,0 +1,515 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "&"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid ""
+"Below a list of configuration tips for your system to run Dynamic DNS "
+"updates without limitations"
+msgstr ""
+
+msgid ""
+"Below is a list of configured DDNS configurations and their current state."
+"<br />If you want to send updates for IPv4 and IPv6 you need to define two "
+"separate Configurations i.e. 'myddns_ipv4' and 'myddns_ipv6'"
+msgstr ""
+
+msgid "Build"
+msgstr ""
+
+msgid ""
+"BusyBox's nslookup and Wget do not support to specify the IP version to use "
+"for communication with DDNS Provider."
+msgstr ""
+
+msgid ""
+"BusyBox's nslookup does not support to specify to use TCP instead of default "
+"UDP when requesting DNS server"
+msgstr ""
+
+msgid "Check Interval"
+msgstr ""
+
+msgid "Check for changed IP every"
+msgstr ""
+
+msgid "Check-time unit"
+msgstr ""
+
+msgid "Config error"
+msgstr ""
+
+msgid "Configure here the details for selected Dynamic DNS service"
+msgstr ""
+
+msgid ""
+"Currently DDNS updates are not started at boot or on interface events.<br /"
+">This is the default if you run DDNS scripts by yourself (i.e. via cron with "
+"force_interval set to '0')"
+msgstr ""
+
+msgid ""
+"Currently DDNS updates are not started at boot or on interface events.<br /"
+">You can start/stop each configuration here. It will run until next reboot."
+msgstr ""
+
+msgid "Custom update script to be used for updating your DDNS Provider."
+msgstr ""
+
+msgid "Custom update-URL"
+msgstr ""
+
+msgid "Custom update-script"
+msgstr ""
+
+msgid "DDNS Autostart disabled"
+msgstr ""
+
+msgid "DDNS Service provider"
+msgstr ""
+
+msgid "DNS requests via TCP not supported"
+msgstr ""
+
+msgid "DNS-Server"
+msgstr ""
+
+msgid "Defines the Web page to read systems IPv4-Address from"
+msgstr ""
+
+msgid "Defines the Web page to read systems IPv6-Address from"
+msgstr ""
+
+msgid "Defines the interface to read systems IP-Address from"
+msgstr ""
+
+msgid "Defines the network to read systems IPv4-Address from"
+msgstr ""
+
+msgid "Defines the network to read systems IPv6-Address from"
+msgstr ""
+
+msgid ""
+"Defines the source to read systems IPv4-Address from, that will be send to "
+"the DDNS provider"
+msgstr ""
+
+msgid ""
+"Defines the source to read systems IPv6-Address from, that will be send to "
+"the DDNS provider"
+msgstr ""
+
+msgid "Defines which IP address 'IPv4/IPv6' is send to the DDNS provider"
+msgstr ""
+
+msgid "Details for"
+msgstr ""
+
+msgid "Dynamic DNS"
+msgstr ""
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+
+msgid "Enable secure communication with DDNS provider"
+msgstr ""
+
+msgid "Error Retry Counter"
+msgstr ""
+
+msgid "Error Retry Interval"
+msgstr ""
+
+msgid "Event Network"
+msgstr ""
+
+msgid "Event interface"
+msgstr ""
+
+msgid "File not found"
+msgstr ""
+
+msgid "File not found or empty"
+msgstr ""
+
+msgid ""
+"Follow this link<br />You will find more hints to optimize your system to "
+"run DDNS scripts with all options"
+msgstr ""
+
+msgid "Force IP Version"
+msgstr ""
+
+msgid "Force IP Version not supported"
+msgstr ""
+
+msgid "Force Interval"
+msgstr ""
+
+msgid "Force TCP on DNS"
+msgstr ""
+
+msgid "Force update every"
+msgstr ""
+
+msgid "Force-time unit"
+msgstr ""
+
+msgid "Forced IP Version don't matched"
+msgstr ""
+
+msgid "Format"
+msgstr ""
+
+msgid "Format: IP or FQDN"
+msgstr ""
+
+msgid "HTTPS not supported"
+msgstr ""
+
+msgid "Hints"
+msgstr ""
+
+msgid "Hostname/Domain"
+msgstr ""
+
+msgid "IP address source"
+msgstr ""
+
+msgid "IP address version"
+msgstr ""
+
+msgid "IPv6 address must be given in square brackets"
+msgstr ""
+
+msgid ""
+"IPv6 is currently not (fully) supported by this system<br />Please follow "
+"the instructions on libreCMC's homepage to enable IPv6 support<br />or update "
+"your system to the latest libreCMC Release"
+msgstr ""
+
+msgid "IPv6 not supported"
+msgstr ""
+
+msgid ""
+"If this service section is disabled it could not be started.<br />Neither "
+"from LuCI interface nor from console"
+msgstr ""
+
+msgid ""
+"In some versions cURL/libcurl in libreCMC is compiled without proxy support."
+msgstr ""
+
+msgid ""
+"Interval to check for changed IP<br />Values below 5 minutes == 300 seconds "
+"are not supported"
+msgstr ""
+
+msgid ""
+"Interval to force updates send to DDNS Provider<br />Setting this parameter "
+"to 0 will force the script to only run once<br />Values lower 'Check "
+"Interval' except '0' are not supported"
+msgstr ""
+
+msgid "Last Update"
+msgstr ""
+
+msgid "Log File Viewer"
+msgstr ""
+
+msgid "Log to file"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid ""
+"Neither GNU Wget with SSL nor cURL installed to support updates via HTTPS "
+"protocol."
+msgstr ""
+
+msgid "Network on which the ddns-updater scripts will be started"
+msgstr ""
+
+msgid "Never"
+msgstr ""
+
+msgid "Next Update"
+msgstr ""
+
+msgid "No data"
+msgstr ""
+
+msgid "No logging"
+msgstr ""
+
+msgid "OPTIONAL: Force the usage of pure IPv4/IPv6 only communication."
+msgstr ""
+
+msgid "OPTIONAL: Force the use of TCP instead of default UDP on DNS requests."
+msgstr ""
+
+msgid "OPTIONAL: Proxy-Server for detection and updates."
+msgstr ""
+
+msgid "OPTIONAL: Use non-default DNS-Server to detect 'Registered IP'."
+msgstr ""
+
+msgid "Old version of ddns-scripts installed"
+msgstr ""
+
+msgid "On Error the script will retry the failed action after given time"
+msgstr ""
+
+msgid "On Error the script will stop execution after given number of retrys"
+msgstr ""
+
+msgid "PROXY-Server"
+msgstr ""
+
+msgid "PROXY-Server not supported"
+msgstr ""
+
+msgid "Please [Save & Apply] your changes first"
+msgstr ""
+
+msgid "Please press [Read] button"
+msgstr ""
+
+msgid "Please update to the current version!"
+msgstr ""
+
+msgid "Process ID"
+msgstr ""
+
+msgid "Read / Reread log file"
+msgstr ""
+
+msgid "Registered IP"
+msgstr ""
+
+msgid "Replaces [DOMAIN] in Update-URL"
+msgstr ""
+
+msgid "Replaces [PASSWORD] in Update-URL"
+msgstr ""
+
+msgid "Replaces [USERNAME] in Update-URL"
+msgstr ""
+
+msgid "Run once"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Show more"
+msgstr ""
+
+msgid "Software update required"
+msgstr ""
+
+msgid "Source of IP address"
+msgstr ""
+
+msgid "Start / Stop"
+msgstr ""
+
+msgid "Stopped"
+msgstr ""
+
+msgid ""
+"The currently installed 'ddns-scripts' package did not support all available "
+"settings."
+msgstr ""
+
+msgid "There is no service configured."
+msgstr ""
+
+msgid "Timer Settings"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "URL to detect"
+msgstr ""
+
+msgid "Unknown error"
+msgstr ""
+
+msgid ""
+"Update URL to be used for updating your DDNS Provider.<br />Follow "
+"instructions you will find on their WEB page."
+msgstr ""
+
+msgid "Update error"
+msgstr ""
+
+msgid "Use HTTP Secure"
+msgstr ""
+
+msgid "User defined script to read systems IP-Address"
+msgstr ""
+
+msgid "Version Information"
+msgstr ""
+
+msgid ""
+"Writes detailed messages to log file. File will be truncated automatically."
+msgstr ""
+
+msgid ""
+"Writes log messages to syslog. Critical Errors will always be written to "
+"syslog."
+msgstr ""
+
+msgid "You should install BIND host package for DNS requests."
+msgstr ""
+
+msgid "You should install GNU Wget with SSL (prefered) or cURL package."
+msgstr ""
+
+msgid "You should install GNU Wget with SSL or replace libcurl."
+msgstr ""
+
+msgid "cURL is installed, but libcurl was compiled without proxy support."
+msgstr ""
+
+msgid "cURL without Proxy Support"
+msgstr ""
+
+msgid "can not detect local IP. Please select a different Source combination"
+msgstr ""
+
+msgid "can not resolve host:"
+msgstr ""
+
+msgid "config error"
+msgstr ""
+
+msgid "custom"
+msgstr ""
+
+msgid "days"
+msgstr ""
+
+msgid "directory or path/file"
+msgstr ""
+
+msgid "either url or script could be set"
+msgstr ""
+
+msgid "enable here"
+msgstr ""
+
+msgid "file or directory not found or not 'IGNORE'"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "install update here"
+msgstr ""
+
+msgid "installed"
+msgstr ""
+
+msgid "interface"
+msgstr ""
+
+msgid "invalid - Sample"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "minimum value '0'"
+msgstr ""
+
+msgid "minimum value '1'"
+msgstr ""
+
+msgid "minimum value 5 minutes == 300 seconds"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+msgid "missing / required"
+msgstr ""
+
+msgid "must be greater or equal 'Check Interval'"
+msgstr ""
+
+msgid "must start with 'http://'"
+msgstr ""
+
+msgid "nc (netcat) can not connect"
+msgstr ""
+
+msgid "network"
+msgstr ""
+
+msgid "never"
+msgstr ""
+
+msgid "no data"
+msgstr ""
+
+msgid "not found or not executable - Sample: '/path/to/script.sh'"
+msgstr ""
+
+msgid "nslookup can not resolve host"
+msgstr ""
+
+msgid "or"
+msgstr ""
+
+msgid "or greater"
+msgstr ""
+
+msgid "please disable"
+msgstr ""
+
+msgid "please remove entry"
+msgstr ""
+
+msgid "please select 'IPv4' address version"
+msgstr ""
+
+msgid "please select 'IPv4' address version in"
+msgstr ""
+
+msgid "proxy port missing"
+msgstr ""
+
+msgid "required"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
+
+msgid "to run HTTPS without verification of server certificates (insecure)"
+msgstr ""
+
+msgid "unknown error"
+msgstr ""
+
+msgid "unspecific error"
+msgstr ""
+
+msgid "use hostname, FQDN, IPv4- or IPv6-Address"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/diag_core.pot b/trunk/package/luci/po/templates/diag_core.pot
new file mode 100644
index 00000000..1b34f838
--- /dev/null
+++ b/trunk/package/luci/po/templates/diag_core.pot
@@ -0,0 +1,23 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/diag_devinfo.pot b/trunk/package/luci/po/templates/diag_devinfo.pot
new file mode 100644
index 00000000..350466c0
--- /dev/null
+++ b/trunk/package/luci/po/templates/diag_devinfo.pot
@@ -0,0 +1,199 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr ""
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/ffwizard.pot b/trunk/package/luci/po/templates/ffwizard.pot
new file mode 100644
index 00000000..3da2ddf6
--- /dev/null
+++ b/trunk/package/luci/po/templates/ffwizard.pot
@@ -0,0 +1,150 @@
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
diff --git a/trunk/package/luci/po/templates/firewall.pot b/trunk/package/luci/po/templates/firewall.pot
new file mode 100644
index 00000000..402aa697
--- /dev/null
+++ b/trunk/package/luci/po/templates/firewall.pot
@@ -0,0 +1,425 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr ""
+
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr ""
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
+msgstr ""
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/freifunk-policyrouting.pot b/trunk/package/luci/po/templates/freifunk-policyrouting.pot
new file mode 100644
index 00000000..b4c35c17
--- /dev/null
+++ b/trunk/package/luci/po/templates/freifunk-policyrouting.pot
@@ -0,0 +1,42 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/freifunk.pot b/trunk/package/luci/po/templates/freifunk.pot
new file mode 100644
index 00000000..0b1cddf7
--- /dev/null
+++ b/trunk/package/luci/po/templates/freifunk.pot
@@ -0,0 +1,384 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/hd_idle.pot b/trunk/package/luci/po/templates/hd_idle.pot
new file mode 100644
index 00000000..2bf38f1b
--- /dev/null
+++ b/trunk/package/luci/po/templates/hd_idle.pot
@@ -0,0 +1,34 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Disk"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable debug"
+msgstr ""
+
+msgid "Idle-time"
+msgstr ""
+
+msgid "Idle-time unit"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "hd-idle"
+msgstr ""
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+
+msgid "min"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/meshwizard.pot b/trunk/package/luci/po/templates/meshwizard.pot
new file mode 100644
index 00000000..9dfdec50
--- /dev/null
+++ b/trunk/package/luci/po/templates/meshwizard.pot
@@ -0,0 +1,112 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/minidlna.pot b/trunk/package/luci/po/templates/minidlna.pot
new file mode 100644
index 00000000..2b35d1e7
--- /dev/null
+++ b/trunk/package/luci/po/templates/minidlna.pot
@@ -0,0 +1,157 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/mmc_over_gpio.pot b/trunk/package/luci/po/templates/mmc_over_gpio.pot
new file mode 100644
index 00000000..1cc8de33
--- /dev/null
+++ b/trunk/package/luci/po/templates/mmc_over_gpio.pot
@@ -0,0 +1,29 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/multiwan.pot b/trunk/package/luci/po/templates/multiwan.pot
new file mode 100644
index 00000000..954eed11
--- /dev/null
+++ b/trunk/package/luci/po/templates/multiwan.pot
@@ -0,0 +1,108 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/ntpc.pot b/trunk/package/luci/po/templates/ntpc.pot
new file mode 100644
index 00000000..1ed4c40e
--- /dev/null
+++ b/trunk/package/luci/po/templates/ntpc.pot
@@ -0,0 +1,41 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Clock Adjustment"
+msgstr ""
+
+msgid "Count of time measurements"
+msgstr ""
+
+msgid "Current system time"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Offset frequency"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Synchronizes the system time"
+msgstr ""
+
+msgid "Time Server"
+msgstr ""
+
+msgid "Time Servers"
+msgstr ""
+
+msgid "Time Synchronisation"
+msgstr ""
+
+msgid "Update interval (in seconds)"
+msgstr ""
+
+msgid "empty = infinite"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/olsr.pot b/trunk/package/luci/po/templates/olsr.pot
new file mode 100644
index 00000000..6bd63c2a
--- /dev/null
+++ b/trunk/package/luci/po/templates/olsr.pot
@@ -0,0 +1,680 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/openvpn.pot b/trunk/package/luci/po/templates/openvpn.pot
new file mode 100644
index 00000000..001747e2
--- /dev/null
+++ b/trunk/package/luci/po/templates/openvpn.pot
@@ -0,0 +1,539 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/p2pblock.pot b/trunk/package/luci/po/templates/p2pblock.pot
new file mode 100644
index 00000000..6fa5da11
--- /dev/null
+++ b/trunk/package/luci/po/templates/p2pblock.pot
@@ -0,0 +1,31 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Block Time"
+msgstr ""
+
+msgid "Enable P2P-Block"
+msgstr ""
+
+msgid "IP-P2P"
+msgstr ""
+
+msgid "Layer7-Protocols"
+msgstr ""
+
+msgid "P2P-Block"
+msgstr ""
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+
+msgid "Portrange"
+msgstr ""
+
+msgid "Whitelisted IPs"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/p910nd.pot b/trunk/package/luci/po/templates/p910nd.pot
new file mode 100644
index 00000000..3674fdb2
--- /dev/null
+++ b/trunk/package/luci/po/templates/p910nd.pot
@@ -0,0 +1,34 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Bidirectional mode"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+msgid "p910nd - Printer server"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/pbx-voicemail.pot b/trunk/package/luci/po/templates/pbx-voicemail.pot
new file mode 100644
index 00000000..35cdca33
--- /dev/null
+++ b/trunk/package/luci/po/templates/pbx-voicemail.pot
@@ -0,0 +1,81 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/pbx.pot b/trunk/package/luci/po/templates/pbx.pot
new file mode 100644
index 00000000..86dd2eb7
--- /dev/null
+++ b/trunk/package/luci/po/templates/pbx.pot
@@ -0,0 +1,477 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/polipo.pot b/trunk/package/luci/po/templates/polipo.pot
new file mode 100644
index 00000000..beb0bdb7
--- /dev/null
+++ b/trunk/package/luci/po/templates/polipo.pot
@@ -0,0 +1,195 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/qos.pot b/trunk/package/luci/po/templates/qos.pot
new file mode 100644
index 00000000..26ea8f79
--- /dev/null
+++ b/trunk/package/luci/po/templates/qos.pot
@@ -0,0 +1,79 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "priority"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/radvd.pot b/trunk/package/luci/po/templates/radvd.pot
new file mode 100644
index 00000000..ff9eb547
--- /dev/null
+++ b/trunk/package/luci/po/templates/radvd.pot
@@ -0,0 +1,360 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/rrdtool.pot b/trunk/package/luci/po/templates/rrdtool.pot
new file mode 100644
index 00000000..0a105ecd
--- /dev/null
+++ b/trunk/package/luci/po/templates/rrdtool.pot
@@ -0,0 +1,349 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr "Content-Type: text/plain; charset=ISO-8859-1"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/samba.pot b/trunk/package/luci/po/templates/samba.pot
new file mode 100644
index 00000000..d91400b0
--- /dev/null
+++ b/trunk/package/luci/po/templates/samba.pot
@@ -0,0 +1,66 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/splash.pot b/trunk/package/luci/po/templates/splash.pot
new file mode 100644
index 00000000..f29b7369
--- /dev/null
+++ b/trunk/package/luci/po/templates/splash.pot
@@ -0,0 +1,295 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/statistics.pot b/trunk/package/luci/po/templates/statistics.pot
new file mode 100644
index 00000000..5f2e9dd2
--- /dev/null
+++ b/trunk/package/luci/po/templates/statistics.pot
@@ -0,0 +1,586 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/tinyproxy.pot b/trunk/package/luci/po/templates/tinyproxy.pot
new file mode 100644
index 00000000..712fad92
--- /dev/null
+++ b/trunk/package/luci/po/templates/tinyproxy.pot
@@ -0,0 +1,248 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/transmission.pot b/trunk/package/luci/po/templates/transmission.pot
new file mode 100644
index 00000000..5892abca
--- /dev/null
+++ b/trunk/package/luci/po/templates/transmission.pot
@@ -0,0 +1,283 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/upnp.pot b/trunk/package/luci/po/templates/upnp.pot
new file mode 100644
index 00000000..86aaee34
--- /dev/null
+++ b/trunk/package/luci/po/templates/upnp.pot
@@ -0,0 +1,129 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/ushare.pot b/trunk/package/luci/po/templates/ushare.pot
new file mode 100644
index 00000000..7e4dbc15
--- /dev/null
+++ b/trunk/package/luci/po/templates/ushare.pot
@@ -0,0 +1,38 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Content directories"
+msgstr ""
+
+msgid "Disable telnet console"
+msgstr ""
+
+msgid "Disable webinterface"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Servername"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/uvc_streamer.pot b/trunk/package/luci/po/templates/uvc_streamer.pot
new file mode 100644
index 00000000..08980eb6
--- /dev/null
+++ b/trunk/package/luci/po/templates/uvc_streamer.pot
@@ -0,0 +1,29 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr ""
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr ""
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr ""
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr ""
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid "Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/vnstat.pot b/trunk/package/luci/po/templates/vnstat.pot
new file mode 100644
index 00000000..4dccf05c
--- /dev/null
+++ b/trunk/package/luci/po/templates/vnstat.pot
@@ -0,0 +1,51 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/voice_core.pot b/trunk/package/luci/po/templates/voice_core.pot
new file mode 100644
index 00000000..64c93eba
--- /dev/null
+++ b/trunk/package/luci/po/templates/voice_core.pot
@@ -0,0 +1,8 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Phones"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/voice_diag.pot b/trunk/package/luci/po/templates/voice_diag.pot
new file mode 100644
index 00000000..ba28b453
--- /dev/null
+++ b/trunk/package/luci/po/templates/voice_diag.pot
@@ -0,0 +1,15 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/templates/watchcat.pot b/trunk/package/luci/po/templates/watchcat.pot
new file mode 100644
index 00000000..490ec5c5
--- /dev/null
+++ b/trunk/package/luci/po/templates/watchcat.pot
@@ -0,0 +1,46 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/wol.pot b/trunk/package/luci/po/templates/wol.pot
new file mode 100644
index 00000000..1305c538
--- /dev/null
+++ b/trunk/package/luci/po/templates/wol.pot
@@ -0,0 +1,37 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/templates/wshaper.pot b/trunk/package/luci/po/templates/wshaper.pot
new file mode 100644
index 00000000..42de011b
--- /dev/null
+++ b/trunk/package/luci/po/templates/wshaper.pot
@@ -0,0 +1,43 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/ahcp.po b/trunk/package/luci/po/tr/ahcp.po
new file mode 100644
index 00000000..ca330718
--- /dev/null
+++ b/trunk/package/luci/po/tr/ahcp.po
@@ -0,0 +1,113 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-11-25 14:51+0200\n"
+"Last-Translator: qbilay <qbilay@mynet.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "AHCP Sunucusu"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP bir IPv6 ve IPv4/IPv6 çift ağ için otomatik yapılandırma protokolüdür. "
+"Yönlendirici Bildirimleri ve DHCP sunucuları geçici olarak yerine dağıtılmış "
+"ağlar için tasarlanmıştır."
+
+msgid "Active AHCP Leases"
+msgstr "Aktif ACHP  Kiralamaları"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "Advanced Settings"
+msgstr "Gelişmiş Ayarlar"
+
+msgid "Age"
+msgstr "Yaş"
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Announced NTP servers"
+msgstr ""
+
+msgid "Announced prefixes"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr "Veriler toplanıyor..."
+
+msgid "Forwarder"
+msgstr ""
+
+msgid "General Setup"
+msgstr "Genel Ayarlar"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 ve IPv6"
+
+msgid "IPv4 only"
+msgstr "Sadece IPv4"
+
+msgid "IPv6 only"
+msgstr "Sadece IPv6"
+
+msgid "Lease directory"
+msgstr "Kiralama Dizini"
+
+msgid "Lease validity time"
+msgstr "Kiralama Geçerlilik Süresi"
+
+msgid "Log file"
+msgstr "Kayıt Dosyası"
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "Operation mode"
+msgstr "Çalışma Modu"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol family"
+msgstr "Protokol Ailesi"
+
+msgid "Served interfaces"
+msgstr "Sunucu Arayüzleri"
+
+msgid "Server"
+msgstr "Sunucu"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr ""
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+
+msgid "The AHCP Service is not running."
+msgstr " AHCP Hizmeti Çalışmıyor"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr " AHCP Hizmeti ID %ile çalışıyor"
+
+msgid "There are no active leases."
+msgstr "Aktif Kiralama Yok"
+
+msgid "Unique ID file"
+msgstr "Benzersiz ID Dosyası"
diff --git a/trunk/package/luci/po/tr/asterisk.po b/trunk/package/luci/po/tr/asterisk.po
new file mode 100644
index 00000000..c8b4e58c
--- /dev/null
+++ b/trunk/package/luci/po/tr/asterisk.po
@@ -0,0 +1,12 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/trunk/package/luci/po/tr/base.po b/trunk/package/luci/po/tr/base.po
new file mode 100644
index 00000000..46f32d13
--- /dev/null
+++ b/trunk/package/luci/po/tr/base.po
@@ -0,0 +1,2902 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-11-25 14:47+0200\n"
+"Last-Translator: qbilay <qbilay@mynet.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d dakika gösteriliyor, %d saniye aralıklı)"
+
+msgid "(%s available)"
+msgstr "(%s uygun)"
+
+msgid "(empty)"
+msgstr "(boş)"
+
+msgid "(no interfaces attached)"
+msgstr "(arayüz eklenmedi)"
+
+msgid "-- Additional Field --"
+msgstr "-- Ek Alan--"
+
+msgid "-- Please choose --"
+msgstr "-- Lütfen seçiniz --"
+
+msgid "-- custom --"
+msgstr "-- özel --"
+
+msgid "1 Minute Load:"
+msgstr "1 Dakikalık Yük:"
+
+msgid "15 Minute Load:"
+msgstr "15 Dakikalık Yük:"
+
+msgid "5 Minute Load:"
+msgstr "5 Dakikalık Yük:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\\\"Temel Servis Ayar Tanımlayıcısı\\\"> BSSID </ abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Alan Adı Sistemi\">DNS</abbr> port sorgula"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Alan Adı Sistemi\">DNS</abbr> sunucu port"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Adres"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Netmask"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protokolü Sürüm 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protokolü Sürüm 6\">IPv6</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Ayarları"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Adı"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Adresi"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"maximal\">Maks.</abbr> <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr> leases"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">Maks.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> paket boyutu"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">Maks.</abbr> eşzamanlı sorgu"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "AR Desteği"
+
+msgid "ARP retry threshold"
+msgstr "ARP yenileme aralığı"
+
+msgid "ATM Bridges"
+msgstr "ATM Köprüleri"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr ""
+
+msgid "Access Concentrator"
+msgstr ""
+
+msgid "Access Point"
+msgstr "Erişim Noktası"
+
+msgid "Action"
+msgstr "Eylem"
+
+msgid "Actions"
+msgstr "Eylemler"
+
+msgid "Activate this network"
+msgstr "Bu ağı etkinleştir"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr ""
+"Aktif <abbr title=\"İnternet Protokolü Sürüm 4\">IPv4</abbr>-Yönlendiriciler"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr ""
+"Aktif <abbr title=\"İnternet Protokolü Sürüm 4\">IPv6</abbr>-Yönlendiriciler"
+
+msgid "Active Connections"
+msgstr "Aktif Bağlantılar"
+
+msgid "Active DHCP Leases"
+msgstr "Aktif DHCP Kiraları"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Aktif DHCPv6 Kiraları"
+
+msgid "Ad-Hoc"
+msgstr ""
+
+msgid "Add"
+msgstr "Ekle"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr "Yeni arabirim ekle..."
+
+msgid "Additional Hosts files"
+msgstr ""
+
+msgid "Address"
+msgstr "Adresler"
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr "Gelişmiş Ayarlar"
+
+msgid "Alert"
+msgstr "Uyarı"
+
+# "Secure Shell" için ne kullanılabilinir bir fikrim yok.
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"<abbr title=\"Secure Shell\">SSH</abbr> parola kimlik doğrulamasına izin ver"
+
+msgid "Allow all except listed"
+msgstr "Listelenenlerin haricindekilere izin ver"
+
+msgid "Allow listed only"
+msgstr "Yanlızca listelenenlere izin ver"
+
+msgid "Allow localhost"
+msgstr ""
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "1. Anten"
+
+msgid "Antenna 2"
+msgstr "2. Anten"
+
+msgid "Antenna Configuration"
+msgstr "Anten Yapılandırması"
+
+msgid "Any zone"
+msgstr ""
+
+msgid "Apply"
+msgstr "Uygula"
+
+msgid "Applying changes"
+msgstr "Değişiklikleri uygula"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Arabirim ata..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr ""
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s Kablosuz Denetleyicisi"
+
+msgid "Authentication"
+msgstr "Kimlik doğrulama"
+
+msgid "Authoritative"
+msgstr "Yetkilendirme"
+
+msgid "Authorization Required"
+msgstr "Yetkilendirme Gerekli"
+
+msgid "Auto Refresh"
+msgstr "Otomatik Yenileme"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Kullanılabilir"
+
+msgid "Available packages"
+msgstr "Kullanılabilir Paketler"
+
+msgid "Average:"
+msgstr "Ortalama:"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Back"
+msgstr "Geri"
+
+msgid "Back to Overview"
+msgstr "Genel Bakışa dön"
+
+msgid "Back to configuration"
+msgstr "Yapılandırmaya dön"
+
+msgid "Back to overview"
+msgstr "Genel Bakışa dön"
+
+msgid "Back to scan results"
+msgstr "Tarama sonuçlarına dön"
+
+msgid "Background Scan"
+msgstr "Arka Planda Tarama"
+
+msgid "Backup / Flash Firmware"
+msgstr ""
+
+msgid "Backup / Restore"
+msgstr "Yedekleme / Geri Yükleme"
+
+msgid "Backup file list"
+msgstr ""
+
+msgid "Bad address specified!"
+msgstr ""
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr ""
+
+msgid "Bridge interfaces"
+msgstr ""
+
+msgid "Bridge unit number"
+msgstr ""
+
+msgid "Bring up on boot"
+msgstr ""
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr ""
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Changes applied."
+msgstr ""
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check"
+msgstr ""
+
+msgid "Checksum"
+msgstr ""
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Common Configuration"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Configuration applied."
+msgstr ""
+
+msgid "Configuration files will be kept."
+msgstr ""
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+msgid "Connected"
+msgstr ""
+
+msgid "Connection Limit"
+msgstr ""
+
+msgid "Connections"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Country Code"
+msgstr ""
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr ""
+
+msgid "Create Interface"
+msgstr ""
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+
+msgid "DHCP Leases"
+msgstr ""
+
+msgid "DHCP Server"
+msgstr ""
+
+msgid "DHCP and DNS"
+msgstr ""
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr ""
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr ""
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete this interface"
+msgstr ""
+
+msgid "Delete this network"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Destination"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Device Configuration"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr ""
+
+msgid "Distance to farthest network member in meters."
+msgstr ""
+
+msgid "Diversity"
+msgstr ""
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr ""
+
+msgid "Domain required"
+msgstr ""
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+
+msgid "Download and install package"
+msgstr ""
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr ""
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Ethernet Adapter"
+msgstr ""
+
+msgid "Ethernet Switch"
+msgstr ""
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Filter private"
+msgstr ""
+
+msgid "Filter useless"
+msgstr ""
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall Settings"
+msgstr ""
+
+msgid "Firewall Status"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr ""
+
+msgid "Flash Firmware"
+msgstr ""
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr ""
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr ""
+
+msgid "Frame Bursting"
+msgstr ""
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr ""
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr ""
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+
+msgid "Host entries"
+msgstr ""
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr ""
+
+msgid "Ignore resolve file"
+msgstr ""
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr ""
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr ""
+
+msgid "Initscripts"
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr ""
+
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr ""
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr ""
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr ""
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr ""
+
+msgid "Leasetime"
+msgstr ""
+
+msgid "Leasetime remaining"
+msgstr ""
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr ""
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr ""
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr ""
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr ""
+
+msgid "MAC-Filter"
+msgstr ""
+
+msgid "MAC-List"
+msgstr ""
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr ""
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr ""
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory usage (%)"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Minimum Rate"
+msgstr ""
+
+msgid "Minimum hold time"
+msgstr ""
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr ""
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr ""
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr ""
+
+msgid "Mount Points"
+msgstr ""
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr ""
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr ""
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr ""
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr ""
+
+msgid "Navigation"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr ""
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr ""
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr ""
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "OPKG-Configuration"
+msgstr ""
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr ""
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr ""
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Owner"
+msgstr ""
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr ""
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr ""
+
+msgid "Packets"
+msgstr ""
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password authentication"
+msgstr ""
+
+msgid "Password of Private Key"
+msgstr ""
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr ""
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr ""
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr ""
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr ""
+
+msgid "Please wait: Device rebooting..."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr ""
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Prot."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr ""
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr ""
+
+msgid "RX"
+msgstr ""
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr ""
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr ""
+
+msgid "Receive"
+msgstr ""
+
+msgid "Receiver Antenna"
+msgstr ""
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr ""
+
+msgid "Regulatory Domain"
+msgstr ""
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr ""
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Reset Counters"
+msgstr ""
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr ""
+
+msgid "Restore backup"
+msgstr ""
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr ""
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & Apply"
+msgstr ""
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr ""
+
+msgid "Scheduled Tasks"
+msgstr ""
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr ""
+
+msgid "Separate WDS"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr ""
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr ""
+
+msgid "Skip to navigation"
+msgstr ""
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr ""
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr ""
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Start priority"
+msgstr ""
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr ""
+
+msgid "Static IPv6 Routes"
+msgstr ""
+
+msgid "Static Leases"
+msgstr ""
+
+msgid "Static Routes"
+msgstr ""
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr ""
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Terminate"
+msgstr ""
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr ""
+
+msgid "The following rules are currently active on this system."
+msgstr ""
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr ""
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
+msgid "Transmission Rate"
+msgstr ""
+
+msgid "Transmit"
+msgstr ""
+
+msgid "Transmit Power"
+msgstr ""
+
+msgid "Transmitter Antenna"
+msgstr ""
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr ""
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr ""
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr ""
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr ""
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "WDS"
+msgstr ""
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr ""
+
+msgid "Wifi"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr ""
+
+msgid "Wireless Network"
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Wireless Security"
+msgstr ""
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr ""
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"LuCI'nin düzgün çalışması için tarayıcınızda Java Scripti "
+"etkinleştirmelisiniz."
+
+msgid "any"
+msgstr "herhangi"
+
+msgid "auto"
+msgstr "otomatik"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr "köprülü"
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr ""
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr "etkin değil"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "sona ermiş"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+
+msgid "forward"
+msgstr "ileri"
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr "yardım"
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "eğer hedef ağsa"
+
+msgid "input"
+msgstr "giriş"
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "yerel <abbr title=\"Domain Name System\">DNS</abbr> dosyası"
+
+msgid "no"
+msgstr "hayır"
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr "hiçbiri"
+
+msgid "off"
+msgstr "kapalı"
+
+msgid "on"
+msgstr "açık"
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "yönlendirildi"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "etiketlendi"
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr "sınırsız"
+
+msgid "unspecified"
+msgstr "tanımsız"
+
+msgid "unspecified -or- create:"
+msgstr "tanımsız -veya- oluşturun:"
+
+msgid "untagged"
+msgstr "etiketsiz"
+
+msgid "yes"
+msgstr "evet"
+
+msgid "« Back"
+msgstr "« Geri"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz 2. kanal üzerinde"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz 2. kanal altında"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Şifrelenmiş\">Şifreli</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Tara"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Not: adres/önek"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Broadcast"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protokolü Sürüm 6\">IPv6</abbr>-Address"
diff --git a/trunk/package/luci/po/tr/commands.po b/trunk/package/luci/po/tr/commands.po
new file mode 100644
index 00000000..41322740
--- /dev/null
+++ b/trunk/package/luci/po/tr/commands.po
@@ -0,0 +1,91 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/coovachilli.po b/trunk/package/luci/po/tr/coovachilli.po
new file mode 100644
index 00000000..b70a8403
--- /dev/null
+++ b/trunk/package/luci/po/tr/coovachilli.po
@@ -0,0 +1,26 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 23:09+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Network Yapılandırması"
+
+msgid "RADIUS configuration"
+msgstr "Radius Yapılandırması"
+
+msgid "UAM and MAC Authentication"
+msgstr "UAM ve MAC Kimlik Doğrulaması"
diff --git a/trunk/package/luci/po/tr/ddns.po b/trunk/package/luci/po/tr/ddns.po
new file mode 100644
index 00000000..0d0e97ee
--- /dev/null
+++ b/trunk/package/luci/po/tr/ddns.po
@@ -0,0 +1,84 @@
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-11-25 14:27+0200\n"
+"Last-Translator: qbilay <qbilay@mynet.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr ""
+
+msgid "Check-time unit"
+msgstr ""
+
+msgid "Custom update-URL"
+msgstr ""
+
+msgid "Dynamic DNS"
+msgstr ""
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Force update every"
+msgstr ""
+
+msgid "Force-time unit"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Interface"
+msgstr "Arabirim"
+
+msgid "Network"
+msgstr "Ağ"
+
+msgid "Password"
+msgstr "Parola"
+
+msgid "Service"
+msgstr "Servis"
+
+msgid "Source of IP address"
+msgstr "Ip adresi kaynağı"
+
+msgid "URL"
+msgstr ""
+
+msgid "Username"
+msgstr "Kullanıcı adı"
+
+msgid "custom"
+msgstr ""
+
+# Hours
+msgid "h"
+msgstr ""
+
+# "arayüz" olarakta kullanılabilir.
+msgid "interface"
+msgstr "arabirim"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr ""
+
+msgid "network"
+msgstr "ağ"
diff --git a/trunk/package/luci/po/tr/diag_core.po b/trunk/package/luci/po/tr/diag_core.po
new file mode 100644
index 00000000..d0b62110
--- /dev/null
+++ b/trunk/package/luci/po/tr/diag_core.po
@@ -0,0 +1,30 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/diag_devinfo.po b/trunk/package/luci/po/tr/diag_devinfo.po
new file mode 100644
index 00000000..32516758
--- /dev/null
+++ b/trunk/package/luci/po/tr/diag_devinfo.po
@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/ffwizard.po b/trunk/package/luci/po/tr/ffwizard.po
new file mode 100644
index 00000000..d46f2615
--- /dev/null
+++ b/trunk/package/luci/po/tr/ffwizard.po
@@ -0,0 +1,159 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/firewall.po b/trunk/package/luci/po/tr/firewall.po
new file mode 100644
index 00000000..60a2190f
--- /dev/null
+++ b/trunk/package/luci/po/tr/firewall.po
@@ -0,0 +1,432 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr ""
+
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+msgid "Source IP address"
+msgstr ""
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
+msgstr ""
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/freifunk-policyrouting.po b/trunk/package/luci/po/tr/freifunk-policyrouting.po
new file mode 100644
index 00000000..af1616fa
--- /dev/null
+++ b/trunk/package/luci/po/tr/freifunk-policyrouting.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/freifunk.po b/trunk/package/luci/po/tr/freifunk.po
new file mode 100644
index 00000000..f485e01b
--- /dev/null
+++ b/trunk/package/luci/po/tr/freifunk.po
@@ -0,0 +1,392 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/hd_idle.po b/trunk/package/luci/po/tr/hd_idle.po
new file mode 100644
index 00000000..d4fdabde
--- /dev/null
+++ b/trunk/package/luci/po/tr/hd_idle.po
@@ -0,0 +1,52 @@
+# Generated from applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-10-11 23:15+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Disk"
+
+msgid "Enable"
+msgstr "Kullanıma Aç"
+
+msgid "Enable debug"
+msgstr "Hata Ayıklama"
+
+msgid "Idle-time"
+msgstr "Bekleme Zamanı"
+
+msgid "Idle-time unit"
+msgstr "bekleme zamanı birimi"
+
+msgid "Settings"
+msgstr "Ayarlar"
+
+# Hours
+msgid "h"
+msgstr "s"
+
+msgid "hd-idle"
+msgstr "Harddisk-Park"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"Harddisk-Park belirli bir zaman sonra diskleri beklemeye alan bir yardımcı "
+"programdır"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "d"
diff --git a/trunk/package/luci/po/tr/meshwizard.po b/trunk/package/luci/po/tr/meshwizard.po
new file mode 100644
index 00000000..92cabd48
--- /dev/null
+++ b/trunk/package/luci/po/tr/meshwizard.po
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/minidlna.po b/trunk/package/luci/po/tr/minidlna.po
new file mode 100644
index 00000000..070d64c4
--- /dev/null
+++ b/trunk/package/luci/po/tr/minidlna.po
@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/mmc_over_gpio.po b/trunk/package/luci/po/tr/mmc_over_gpio.po
new file mode 100644
index 00000000..349b8fc2
--- /dev/null
+++ b/trunk/package/luci/po/tr/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 23:19+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_ayağı"
+
+msgid "CS_pin"
+msgstr "CS_ayağı"
+
+msgid "DI_pin"
+msgstr "DI_ayağı"
+
+msgid "DO_pin"
+msgstr "DO_ayağı"
+
+msgid "Enable"
+msgstr "Etkinleştir"
+
+msgid "MMC/SD driver configuration"
+msgstr "MMC/SD Sürücü Yapılandırması"
+
+msgid "Mode"
+msgstr "Mod"
+
+msgid "Name"
+msgstr "isim"
+
+msgid "Settings"
+msgstr "Ayarlar"
diff --git a/trunk/package/luci/po/tr/multiwan.po b/trunk/package/luci/po/tr/multiwan.po
new file mode 100644
index 00000000..e9d6ece5
--- /dev/null
+++ b/trunk/package/luci/po/tr/multiwan.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/ntpc.po b/trunk/package/luci/po/tr/ntpc.po
new file mode 100644
index 00000000..657b2e8b
--- /dev/null
+++ b/trunk/package/luci/po/tr/ntpc.po
@@ -0,0 +1,55 @@
+# Generated from applications/luci-ntpc/luasrc/model/cbi/ntpc/*.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-10-11 22:20+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "Saat Ayarı"
+
+msgid "Count of time measurements"
+msgstr "Zaman Ölçüm Sayacı"
+
+msgid "Current system time"
+msgstr "Mevcut Sistem Saati"
+
+msgid "General"
+msgstr "Genel"
+
+msgid "Hostname"
+msgstr "Sunucu Adı"
+
+msgid "Offset frequency"
+msgstr "Denge Frekansı"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Synchronizes the system time"
+msgstr "Sistem Saati Senkronizasyonu"
+
+msgid "Time Server"
+msgstr "Zaman Sunucusu"
+
+msgid "Time Servers"
+msgstr "Zaman Sunucuları"
+
+msgid "Time Synchronisation"
+msgstr "Saat Senkronizasyonu"
+
+msgid "Update interval (in seconds)"
+msgstr "Güncelleme Aralığı (Saniye)"
+
+msgid "empty = infinite"
+msgstr "Boş = Sonsuz"
diff --git a/trunk/package/luci/po/tr/olsr.po b/trunk/package/luci/po/tr/olsr.po
new file mode 100644
index 00000000..18641896
--- /dev/null
+++ b/trunk/package/luci/po/tr/olsr.po
@@ -0,0 +1,687 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/openvpn.po b/trunk/package/luci/po/tr/openvpn.po
new file mode 100644
index 00000000..c57805bd
--- /dev/null
+++ b/trunk/package/luci/po/tr/openvpn.po
@@ -0,0 +1,546 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/p2pblock.po b/trunk/package/luci/po/tr/p2pblock.po
new file mode 100644
index 00000000..7c670d8e
--- /dev/null
+++ b/trunk/package/luci/po/tr/p2pblock.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 22:45+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "Engel Zamanı"
+
+msgid "Enable P2P-Block"
+msgstr "P2P-Bloğu'nu Aç"
+
+msgid "IP-P2P"
+msgstr "iP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Layer7 - Protokolleri"
+
+msgid "P2P-Block"
+msgstr "P2P-Bloğu"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"P2P-Bloğu bir engel (greylist) mekanizmasıdır. izin verilenler listesinde "
+"(Beyaz Liste) olmayan istemciler için p2p protokolünü engeller."
+
+msgid "Portrange"
+msgstr "Portrange"
+
+msgid "Whitelisted IPs"
+msgstr "Beyaz Liste iPleri"
+
+msgid "seconds"
+msgstr "saniye"
diff --git a/trunk/package/luci/po/tr/p910nd.po b/trunk/package/luci/po/tr/p910nd.po
new file mode 100644
index 00000000..ed69a011
--- /dev/null
+++ b/trunk/package/luci/po/tr/p910nd.po
@@ -0,0 +1,46 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 23:24+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Çift Yönlü Mod"
+
+msgid "Device"
+msgstr "Aygıt"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"USB (kmod-usb-yazıcı) veya paralel port (kmod-lp) kullanabilmek için destek "
+"paketi yüklemeniz gerekebilir."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Settings"
+msgstr "Ayarlar"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "Dinlemedeki TCP portları"
+
+msgid "enable"
+msgstr "Etkinleştir"
+
+msgid "p910nd - Printer server"
+msgstr "P910nd_Yazıcı Sunucusu"
diff --git a/trunk/package/luci/po/tr/pbx-voicemail.po b/trunk/package/luci/po/tr/pbx-voicemail.po
new file mode 100644
index 00000000..19e26bff
--- /dev/null
+++ b/trunk/package/luci/po/tr/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/pbx.po b/trunk/package/luci/po/tr/pbx.po
new file mode 100644
index 00000000..59af3e87
--- /dev/null
+++ b/trunk/package/luci/po/tr/pbx.po
@@ -0,0 +1,484 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/polipo.po b/trunk/package/luci/po/tr/polipo.po
new file mode 100644
index 00000000..25982ec1
--- /dev/null
+++ b/trunk/package/luci/po/tr/polipo.po
@@ -0,0 +1,202 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/qos.po b/trunk/package/luci/po/tr/qos.po
new file mode 100644
index 00000000..74647be1
--- /dev/null
+++ b/trunk/package/luci/po/tr/qos.po
@@ -0,0 +1,91 @@
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2010-03-25 22:10+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Calculate overhead"
+msgstr ""
+
+msgid "Classification Rules"
+msgstr ""
+
+msgid "Classification group"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Half-duplex"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Source host"
+msgstr ""
+
+msgid "Target"
+msgstr ""
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "normal"
+msgstr ""
+
+msgid "priority"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/radvd.po b/trunk/package/luci/po/tr/radvd.po
new file mode 100644
index 00000000..8b8ed8f8
--- /dev/null
+++ b/trunk/package/luci/po/tr/radvd.po
@@ -0,0 +1,367 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/rrdtool.po b/trunk/package/luci/po/tr/rrdtool.po
new file mode 100644
index 00000000..cb2187b4
--- /dev/null
+++ b/trunk/package/luci/po/tr/rrdtool.po
@@ -0,0 +1,356 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/samba.po b/trunk/package/luci/po/tr/samba.po
new file mode 100644
index 00000000..fda2f6e2
--- /dev/null
+++ b/trunk/package/luci/po/tr/samba.po
@@ -0,0 +1,73 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Allow guests"
+msgstr ""
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+
+msgid "Allowed users"
+msgstr ""
+
+msgid "Create mask"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Directory mask"
+msgstr ""
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Mask for new directories"
+msgstr ""
+
+msgid "Mask for new files"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr ""
+
+msgid "Path"
+msgstr ""
+
+msgid "Read-only"
+msgstr ""
+
+msgid "Share home-directories"
+msgstr ""
+
+msgid "Shared Directories"
+msgstr ""
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/splash.po b/trunk/package/luci/po/tr/splash.po
new file mode 100644
index 00000000..03fa7b3b
--- /dev/null
+++ b/trunk/package/luci/po/tr/splash.po
@@ -0,0 +1,303 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/statistics.po b/trunk/package/luci/po/tr/statistics.po
new file mode 100644
index 00000000..d963dd89
--- /dev/null
+++ b/trunk/package/luci/po/tr/statistics.po
@@ -0,0 +1,594 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/tinyproxy.po b/trunk/package/luci/po/tr/tinyproxy.po
new file mode 100644
index 00000000..a7af49df
--- /dev/null
+++ b/trunk/package/luci/po/tr/tinyproxy.po
@@ -0,0 +1,255 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/transmission.po b/trunk/package/luci/po/tr/transmission.po
new file mode 100644
index 00000000..5a4df014
--- /dev/null
+++ b/trunk/package/luci/po/tr/transmission.po
@@ -0,0 +1,290 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/upnp.po b/trunk/package/luci/po/tr/upnp.po
new file mode 100644
index 00000000..bf0e59a5
--- /dev/null
+++ b/trunk/package/luci/po/tr/upnp.po
@@ -0,0 +1,136 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/ushare.po b/trunk/package/luci/po/tr/ushare.po
new file mode 100644
index 00000000..c905c57a
--- /dev/null
+++ b/trunk/package/luci/po/tr/ushare.po
@@ -0,0 +1,50 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 22:33+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "İçerik Dizinleri"
+
+msgid "Disable telnet console"
+msgstr "Telnet Konsolunu Kapatma"
+
+msgid "Disable webinterface"
+msgstr "Web Arayüzünü Kapatma"
+
+msgid "Enable"
+msgstr "Aktif Hale Getir"
+
+msgid "Interface"
+msgstr "Arayüz"
+
+msgid "Options"
+msgstr "Seçenekler"
+
+msgid "Servername"
+msgstr "Sunucuadı"
+
+msgid "Settings"
+msgstr "Ayarlar"
+
+msgid "Username"
+msgstr "Kullanıcıadı"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/uvc_streamer.po b/trunk/package/luci/po/tr/uvc_streamer.po
new file mode 100644
index 00000000..54ec5d06
--- /dev/null
+++ b/trunk/package/luci/po/tr/uvc_streamer.po
@@ -0,0 +1,45 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 22:30+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Saniyedeki Kare Sayısı"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Çözünürlük"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Ayarlar"
+
+# akışı yayın olarak çevirdim
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Webcam Yayını"
+
+# Linux-UVC uyumlu web kameranızı yapılandırın.örneği internet tarayıcınıza  <a href="http://%s:%i/">http://%s:%i/</a> yazın.
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Linux-UVC uyumlu web kameranızı yapılandırın.örneği internet tarayıcınıza  "
+"<a href=\"http://%s:%i/\">http://%s:%i/</a> yazın."
diff --git a/trunk/package/luci/po/tr/vnstat.po b/trunk/package/luci/po/tr/vnstat.po
new file mode 100644
index 00000000..5e001c93
--- /dev/null
+++ b/trunk/package/luci/po/tr/vnstat.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/voice_core.po b/trunk/package/luci/po/tr/voice_core.po
new file mode 100644
index 00000000..642538e2
--- /dev/null
+++ b/trunk/package/luci/po/tr/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-10-11 22:25+0200\n"
+"Last-Translator: vincenzo <tayfun_ozturk@hotmail.com>\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Telefonlar"
+
+msgid "Voice"
+msgstr "Ses"
diff --git a/trunk/package/luci/po/tr/voice_diag.po b/trunk/package/luci/po/tr/voice_diag.po
new file mode 100644
index 00000000..715f4118
--- /dev/null
+++ b/trunk/package/luci/po/tr/voice_diag.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/tr/watchcat.po b/trunk/package/luci/po/tr/watchcat.po
new file mode 100644
index 00000000..633e7fb7
--- /dev/null
+++ b/trunk/package/luci/po/tr/watchcat.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/wol.po b/trunk/package/luci/po/tr/wol.po
new file mode 100644
index 00000000..9be6934c
--- /dev/null
+++ b/trunk/package/luci/po/tr/wol.po
@@ -0,0 +1,49 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2010-04-19 00:29+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/tr/wshaper.po b/trunk/package/luci/po/tr/wshaper.po
new file mode 100644
index 00000000..7c0acb06
--- /dev/null
+++ b/trunk/package/luci/po/tr/wshaper.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/uk/ahcp.po b/trunk/package/luci/po/uk/ahcp.po
new file mode 100644
index 00000000..76490198
--- /dev/null
+++ b/trunk/package/luci/po/uk/ahcp.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-28 21:17+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "Сервер AHCP"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP є протоколом автоматичної конфігурації мереж IPv6 та IPv6/IPv4, що "
+"разраблений для використання замість DHCP. Наприклад, він використовується у "
+"стільникових ad-hoc мережах."
+
+msgid "Active AHCP Leases"
+msgstr "Активні оренди AHCP"
+
+msgid "Address"
+msgstr "Адреса"
+
+msgid "Advanced Settings"
+msgstr "Додаткові параметри"
+
+msgid "Age"
+msgstr "Вік"
+
+msgid "Announced DNS servers"
+msgstr "Оголошені DNS-сервери"
+
+msgid "Announced NTP servers"
+msgstr "Оголошені NTP-сервери"
+
+msgid "Announced prefixes"
+msgstr "Оголошені префікси"
+
+msgid "Collecting data..."
+msgstr "Збирання даних..."
+
+msgid "Forwarder"
+msgstr "Спрямовувач"
+
+msgid "General Setup"
+msgstr "Загальні параметри"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 та IPv6"
+
+msgid "IPv4 only"
+msgstr "Тільки IPv4"
+
+msgid "IPv6 only"
+msgstr "Тільки IPv6"
+
+msgid "Lease directory"
+msgstr "Каталог оренд"
+
+msgid "Lease validity time"
+msgstr "Термін дії оренди"
+
+msgid "Log file"
+msgstr "Файл журналу"
+
+msgid "Multicast address"
+msgstr "Групова адреса"
+
+msgid "Operation mode"
+msgstr "Режим роботи"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Protocol family"
+msgstr "Протокол"
+
+msgid "Served interfaces"
+msgstr "Інтерфейси, які обслуговуються"
+
+msgid "Server"
+msgstr "Сервер"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Дозволяє вказати оголошувані IPv4 та IPv6 NTP-сервери"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Дозволяє вказати оголошувані IPv4 та IPv6 DNS-сервери"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr ""
+"Дозволяє вказати оголошувані IPv4 та IPv6 префікси мережі в нотації CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "Сервіс AHCP не запущено"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Сервіс AHCP запущено з ID %s."
+
+msgid "There are no active leases."
+msgstr "Активних оренд немає."
+
+msgid "Unique ID file"
+msgstr "Файл унікальних ідентифікаторів"
diff --git a/trunk/package/luci/po/uk/asterisk.po b/trunk/package/luci/po/uk/asterisk.po
new file mode 100644
index 00000000..d6dd63e9
--- /dev/null
+++ b/trunk/package/luci/po/uk/asterisk.po
@@ -0,0 +1,79 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-21 14:22+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Головні налаштування Asterisk"
+
+#~ msgid "AGI directory"
+#~ msgstr "AGI тека "
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Кешувати файли записів поки йде запис"
+
+#~ msgid "Debug Level"
+#~ msgstr "Рівень налагоджування"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Вимкнути деякі попередження"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Зберегти дамп ядра в разі фатальної помилки"
+
+#~ msgid "High Priority"
+#~ msgstr "Високий пріоритет"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Ініціалізувати шифрування"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Використовувати внутрішні таймінги"
+
+#~ msgid "Log directory"
+#~ msgstr "Тека з журналом"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Максимальна кількість дозволених дзвінків"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Максимальне навантаження, при якому зупиняти прийом дзвінків"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Вимкнути кольори в консолі"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Тека з кешованими звуковими файлами"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Запустити з правами Групи"
+
+#~ msgid "The User to run as"
+#~ msgstr "Запустити з правами Користувача"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Тека з голосовою поштою"
+
+#, fuzzy
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Префікс Uniquid з назвою системи "
+
+#~ msgid "Time Zone"
+#~ msgstr "Часовий пояс"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Дозволити переадресацію"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Видалити глобальні змінні"
diff --git a/trunk/package/luci/po/uk/base.po b/trunk/package/luci/po/uk/base.po
new file mode 100644
index 00000000..ac1dd1b0
--- /dev/null
+++ b/trunk/package/luci/po/uk/base.po
@@ -0,0 +1,3299 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-12-05 19:07+0200\n"
+"Last-Translator: Dmitri <4glitch@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d-хвилинне вікно, %d-секундний інтервал)"
+
+msgid "(%s available)"
+msgstr "(%s доступно)"
+
+msgid "(empty)"
+msgstr "(пусто)"
+
+msgid "(no interfaces attached)"
+msgstr "(нема приєднаних інтерфейсів)"
+
+msgid "-- Additional Field --"
+msgstr "-- Додаткові поля --"
+
+msgid "-- Please choose --"
+msgstr "-- Виберіть --"
+
+msgid "-- custom --"
+msgstr "-- нетипово --"
+
+msgid "1 Minute Load:"
+msgstr "Навантаження за 1 хвилину:"
+
+msgid "15 Minute Load:"
+msgstr "Навантаження за 15 хвилин:"
+
+msgid "5 Minute Load:"
+msgstr "Навантаження за 5 хвилин:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr ""
+"<abbr title=\"Basic Service Set Identifier — ідентифікатор основної служби "
+"послуг\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+"Порт <abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
+"запиту"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+"Порт <abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
+"сервера"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+"<abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
+"сервери будуть опитані у порядку, визначеному файлом resolvfile"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"<abbr title=\"Extended Service Set Identifier — ідентифікатор розширеної "
+"служби послуг\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-адреса"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-шлюз"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-маска"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Інтернет-протокол версії 6\">IPv6</abbr>-адреса або мережа "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Інтернет-протокол версії 6\">IPv6</abbr>-шлюз"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr ""
+"Настроювання <abbr title=\"Light Emitting Diode — світлодіод\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Назва <abbr title=\"Light Emitting Diode — світлодіод\">LED</abbr>"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr ""
+"<abbr title=\"Media Access Control — управління доступом до носія\">MAC</"
+"abbr>-адреса"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"Максимум\">Max.</abbr> оренд <abbr title=\"Dynamic Host "
+"Configuration Protocol — протокол динамічної конфігурації вузла\">DHCP</abbr>"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"Максимум\">Max.</abbr> розмір пакета <abbr title=\"Extension "
+"Mechanisms for Domain Name System — Механізми розширень для доменної системи "
+"імен\">EDNS0</abbr>"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"Максимум\">Max.</abbr> одночасних запитів"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Парний: %s / Груповий: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+"<abbr title=\"Access Point Name — символічна назва точки доступу\">APN</abbr>"
+
+msgid "AR Support"
+msgstr "Підтримка AR"
+
+msgid "ARP retry threshold"
+msgstr "Поріг повтору ARP"
+
+msgid "ATM Bridges"
+msgstr "ATM-мости"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+"Ідентифікатор віртуального каналу ATM (<abbr title=\"Virtual Channel "
+"Identifier\">VCI</abbr>)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+"Ідентифікатор віртуального шляху ATM (<abbr title=\"Virtual Path Identifier"
+"\">VPI</abbr>)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"ATM-мости виставляють інкапсульований Ethernet у з'єднаннях AAL5 як "
+"віртуальні мережеві інтерфейси Linux, котрі можуть використовуватися в "
+"поєднанні з DHCP або PPP для підключення до мережі провайдера."
+
+msgid "ATM device number"
+msgstr "Номер ATM-пристрою"
+
+msgid "Access Concentrator"
+msgstr "Концентратор доступу"
+
+msgid "Access Point"
+msgstr "Точка доступу"
+
+msgid "Action"
+msgstr "Дія"
+
+msgid "Actions"
+msgstr "Дії"
+
+msgid "Activate this network"
+msgstr "Активувати цю мережу"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-маршрути"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv6</abbr>-маршрути"
+
+msgid "Active Connections"
+msgstr "Активні підключення"
+
+msgid "Active DHCP Leases"
+msgstr "Активні оренди DHCP"
+
+msgid "Active DHCPv6 Leases"
+msgstr "Активні оренди DHCPv6"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Додати"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "Додавати суфікс локального домену до імен, отриманих із файлів hosts"
+
+msgid "Add new interface..."
+msgstr "Додати новий інтерфейс..."
+
+msgid "Additional Hosts files"
+msgstr "Додаткові файли hosts"
+
+msgid "Address"
+msgstr "Адреса"
+
+msgid "Address to access local relay bridge"
+msgstr "Адреса для доступу до мосту локального ретранслятора"
+
+msgid "Administration"
+msgstr "Адміністрування"
+
+msgid "Advanced Settings"
+msgstr "Додаткові параметри"
+
+msgid "Alert"
+msgstr "Тривога"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr ""
+"Дозволити <abbr title=\"Secure Shell — безпечна оболонка\">SSH</abbr>-"
+"перевірку пароля"
+
+msgid "Allow all except listed"
+msgstr "Дозволити всі, крім зазначених"
+
+msgid "Allow listed only"
+msgstr "Дозволити тільки зазначені"
+
+msgid "Allow localhost"
+msgstr "Дозволити локальний вузол"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+"Дозволити віддаленим вузлам підключення до локальних SSH-спрямованих портів"
+
+msgid "Allow root logins with password"
+msgstr "Дозволити root-вхід із паролем"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "Дозволити користувачеві <em>root</em> вхід у систему з паролем"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+"Дозволити відповіді від клієнта на сервер у діапазоні 127.0.0.0/8, "
+"наприклад, для RBL-послуг"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+"Завжди використовувати канали 40MHz, навіть якщо вторинний канал "
+"перекривається. Використання цієї опції не відповідає стандарту IEEE "
+"802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "Якщо ви залишите це невибраним, буде створена додаткова мережа."
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "Антена 1"
+
+msgid "Antenna 2"
+msgstr "Антена 2"
+
+msgid "Antenna Configuration"
+msgstr "Конфигурація антени"
+
+msgid "Any zone"
+msgstr "Будь-яка зона"
+
+msgid "Apply"
+msgstr "Застосувати"
+
+msgid "Applying changes"
+msgstr "Застосування змін"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "Призначення інтерфейсів..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "Приєднані станції"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Бездротовий 802.11%s контролер Atheros"
+
+msgid "Authentication"
+msgstr "Автентифікація"
+
+msgid "Authoritative"
+msgstr "Надійний"
+
+msgid "Authorization Required"
+msgstr "Потрібна авторизація"
+
+msgid "Auto Refresh"
+msgstr "Автоматичне оновлення"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Доступно"
+
+msgid "Available packages"
+msgstr "Доступні пакети"
+
+msgid "Average:"
+msgstr "Середнє значення:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "Назад"
+
+msgid "Back to Overview"
+msgstr "Повернутися до переліку"
+
+msgid "Back to configuration"
+msgstr "Повернутися до конфігурації"
+
+msgid "Back to overview"
+msgstr "Повернутися до переліку"
+
+msgid "Back to scan results"
+msgstr "Повернутися до результатів сканування"
+
+msgid "Background Scan"
+msgstr "Сканування у фоновому режимі"
+
+msgid "Backup / Flash Firmware"
+msgstr "Резервне копіювання / Оновлення прошивки"
+
+msgid "Backup / Restore"
+msgstr "Резервне копіювання/відновлення"
+
+msgid "Backup file list"
+msgstr "Список файлів резервних копій"
+
+msgid "Bad address specified!"
+msgstr "Вказана неправильна адреса!"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"Нижче наведено визначений список файлів для резервного копіювання. Він "
+"складається із позначених opkg змінених файлів конфігурації, невідокремних "
+"базових файлів, та файлів за користувацькими шаблонами резервного копіювання."
+
+msgid "Bitrate"
+msgstr "Швидкість передачі даних"
+
+msgid "Bogus NX Domain Override"
+msgstr "Відкидати підробки NX-домену"
+
+msgid "Bridge"
+msgstr "Міст"
+
+msgid "Bridge interfaces"
+msgstr "Об'єднати інтерфейси в міст"
+
+msgid "Bridge unit number"
+msgstr "Номер моста"
+
+msgid "Bring up on boot"
+msgstr "Піднімати при завантаженні"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Бездротовий 802.11%s контролер Broadcom"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Бездротовий 802.11 контролер Broadcom BCM%04x"
+
+msgid "Buffered"
+msgstr "Буферизовано"
+
+msgid "Buttons"
+msgstr "Кнопки"
+
+msgid "CPU"
+msgstr "ЦП"
+
+msgid "CPU usage (%)"
+msgstr "Завантаження ЦП, %"
+
+msgid "Cached"
+msgstr "Кешовано"
+
+msgid "Cancel"
+msgstr "Скасувати"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "Ланцюжок"
+
+msgid "Changes"
+msgstr "Зміни"
+
+msgid "Changes applied."
+msgstr "Зміни застосовано."
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "Зміна пароля адміністратора для доступу до пристрою"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Check"
+msgstr "Перевірити"
+
+msgid "Checksum"
+msgstr "Контрольна сума"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"Оберіть зону брандмауера, яку ви хочете призначити на цей інтерфейс. "
+"Виберіть <em>не визначено</em>, щоб видалити інтерфейс з відповідних зон, "
+"або заповніть поле <em>створити</em>, щоб визначити нову зону і прикріпити "
+"до неї інтерфейс."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"Оберіть мережі, які ви хочете прикріпити до цього бездротового інтерфейсу "
+"або заповніть поле <em>створити</em>, щоб визначити нову мережу."
+
+msgid "Cipher"
+msgstr "Шифр"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"Натисніть кнопку \"Створити архів\", щоб завантажити tar-архів поточних "
+"файлів конфігурації. Для відновлення прошивки до її початкового стану, "
+"натисніть кнопку \"Відновити\" (можливе тільки з образами SquashFS)."
+
+msgid "Client"
+msgstr "Клієнт"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "Ідентифікатор клієнта для відправки при запиті DHCP"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+"Закривати неактивні з'єднання після певного інтервалу часу (секунди). Для "
+"утримання неактивних з'єднань використовуйте 0"
+
+msgid "Close list..."
+msgstr "Згорнути список..."
+
+msgid "Collecting data..."
+msgstr "Збирання даних..."
+
+msgid "Command"
+msgstr "Команда"
+
+msgid "Common Configuration"
+msgstr "Загальна конфігурація"
+
+msgid "Compression"
+msgstr "Стиснення"
+
+msgid "Configuration"
+msgstr "Конфігурація"
+
+msgid "Configuration applied."
+msgstr "Конфігурація застосована."
+
+msgid "Configuration files will be kept."
+msgstr "Конфігураційні файли будуть збережені."
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr "Настроїти це монтування, як оверлейне сховище для block-extroot"
+
+msgid "Confirmation"
+msgstr "Підтвердження"
+
+msgid "Connect"
+msgstr "Підключити"
+
+msgid "Connected"
+msgstr "Підключений"
+
+msgid "Connection Limit"
+msgstr "Гранична кількість підключень"
+
+msgid "Connections"
+msgstr "Підключення"
+
+msgid "Country"
+msgstr "Країна"
+
+msgid "Country Code"
+msgstr "Код країни"
+
+msgid "Cover the following interface"
+msgstr "Покривати наступний інтерфейс"
+
+msgid "Cover the following interfaces"
+msgstr "Покривати наступні інтерфейси"
+
+msgid "Create / Assign firewall-zone"
+msgstr "Створити / Визначити зону брандмауера"
+
+msgid "Create Interface"
+msgstr "Створити інтерфейс"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "Створити міст через кілька інтерфейсів"
+
+msgid "Critical"
+msgstr "Критичний"
+
+msgid "Cron Log Level"
+msgstr "Рівень виведення інформації Cron"
+
+msgid "Custom Interface"
+msgstr "Інтерфейс користувача"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Настроювання поведінки <abbr title=\"Light Emitting Diode — світлодіод"
+"\">LED</abbr>, якщо це можливо."
+
+msgid "DHCP Leases"
+msgstr "Оренди DHCP"
+
+msgid "DHCP Server"
+msgstr "Сервер DHCP"
+
+msgid "DHCP and DNS"
+msgstr "DHCP та DNS"
+
+msgid "DHCP client"
+msgstr "Клієнт DHCP"
+
+msgid "DHCP-Options"
+msgstr "Параметри DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr "Оренди DHCPv6"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "Спрямовування DNS-запитів"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID"
+
+msgid "Debug"
+msgstr "Зневаджування"
+
+msgid "Default %d"
+msgstr "Типово %d"
+
+msgid "Default gateway"
+msgstr "Типовий шлюз"
+
+msgid "Default state"
+msgstr "Типовий стан"
+
+msgid "Define a name for this network."
+msgstr "Визначення імені для цієї мережі."
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"Визначення додаткових опцій DHCP, наприклад "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\", щоб оголошувати різні DNS-"
+"сервери для клієнтів."
+
+msgid "Delete"
+msgstr "Видалити"
+
+msgid "Delete this interface"
+msgstr "Видалити цей інтерфейс"
+
+msgid "Delete this network"
+msgstr "Видалити цю мережу"
+
+msgid "Description"
+msgstr "Опис"
+
+msgid "Design"
+msgstr "Стиль (тема)"
+
+msgid "Destination"
+msgstr "Призначення"
+
+msgid "Device"
+msgstr "Пристрій"
+
+msgid "Device Configuration"
+msgstr "Конфігурація пристрою"
+
+msgid "Diagnostics"
+msgstr "Діагностика"
+
+msgid "Directory"
+msgstr "Каталог"
+
+msgid "Disable"
+msgstr "Вимкнути"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"Вимкнути <abbr title=\"Dynamic Host Configuration Protocol — протокол "
+"динамічної конфігурації вузла\">DHCP</abbr> для цього інтерфейсу."
+
+msgid "Disable DNS setup"
+msgstr "Вимкнути настроювання DNS"
+
+msgid "Disable HW-Beacon timer"
+msgstr "Вимкнути таймер HW-Beacon"
+
+msgid "Disabled"
+msgstr "Вимкнено"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "Відкидати RFC1918-відповіді від клієнта на сервер"
+
+msgid "Displaying only packages containing"
+msgstr "Показані тільки непорожні пакети"
+
+msgid "Distance Optimization"
+msgstr "Оптимізація за відстанню"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Відстань до найвіддаленішого вузла мережі в метрах."
+
+msgid "Diversity"
+msgstr "Різновидність"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq являє собою комбінований <abbr title=\"Dynamic Host Configuration "
+"Protocol — протокол динамічної конфігурації вузла\">DHCP</abbr>-сервер і "
+"<abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
+"транспортер для брандмауерів <abbr title=\"Network Address Translation — "
+"перетворення (трансляція) мережевих адрес\">NAT</abbr>"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "Не кешувати негативні відповіді, наприклад, за неіснуючих доменів"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+"Не спрямовувати запити, які не можуть бути оброблені публічними серверами "
+"імен"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "Не спрямовувати зворотний перегляд для локальних мереж"
+
+msgid "Do not send probe responses"
+msgstr "Не надсилати відповіді на зондування"
+
+msgid "Domain required"
+msgstr "Потрібен домен"
+
+msgid "Domain whitelist"
+msgstr "\"Білий список\" доменів"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Не пересилати <abbr title=\"Domain Name System — система доменних імен"
+"\">DNS</abbr>-запити без <abbr title=\"Domain Name System — система доменних "
+"імен\">DNS</abbr>-імені"
+
+msgid "Download and install package"
+msgstr "Завантажити та інсталювати пакети"
+
+msgid "Download backup"
+msgstr "Завантажити резервну копію"
+
+msgid "Dropbear Instance"
+msgstr "Реалізація Dropbear"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear — це <abbr title=\"Secure Shell — безпечна оболонка\">SSH</abbr>-"
+"сервер із вбудованим <abbr title=\"Secure Copy\">SCP</abbr>"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Динамічний <abbr title=\"Dynamic Host Configuration Protocol — протокол "
+"динамічної конфігурації вузла\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "Динамічний тунель"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+"Динамічне виділення DHCP-адрес для клієнтів. Якщо вимкнути, будуть "
+"обслуговуватися тільки клієнти, які мають статичні оренди."
+
+msgid "EAP-Method"
+msgstr "EAP-Метод"
+
+msgid "Edit"
+msgstr "Редагувати"
+
+msgid "Edit this interface"
+msgstr "Редагувати цей інтерфейс"
+
+msgid "Edit this network"
+msgstr "Редагувати цю мережу"
+
+msgid "Emergency"
+msgstr "Аварійний"
+
+msgid "Enable"
+msgstr "Увімкнути"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Увімкнути <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "Увімкнути динамічне оновлення кінцевої точки HE.net"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "Увімкнути узгодження IPv6 для PPP-з'єднань"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "Пропускати Jumbo-фрейми"
+
+msgid "Enable NTP client"
+msgstr "Увімкнути NTP-клієнт"
+
+msgid "Enable TFTP server"
+msgstr "Увімкнути TFTP-сервер"
+
+msgid "Enable VLAN functionality"
+msgstr "Увімкнути підтримку VLAN"
+
+msgid "Enable learning and aging"
+msgstr "Увімкнути learning та aging"
+
+msgid "Enable this mount"
+msgstr "Увімкнути це монтування"
+
+msgid "Enable this swap"
+msgstr "Увімкнути це довантаження"
+
+msgid "Enable/Disable"
+msgstr "Увімкнено/Вимкнено"
+
+msgid "Enabled"
+msgstr "Увімкнено"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr ""
+"Увімкнути <abbr title=\"Spanning Tree Protocol\">STP</abbr> на цьому мосту"
+
+msgid "Encapsulation mode"
+msgstr "Режим інкапсуляції"
+
+msgid "Encryption"
+msgstr "Шифрування"
+
+msgid "Erasing..."
+msgstr "Видалення..."
+
+msgid "Error"
+msgstr "Помилка"
+
+msgid "Ethernet Adapter"
+msgstr "Адаптер Ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Ethernet-комутатор"
+
+msgid "Expand hosts"
+msgstr "Розширення вузлів"
+
+msgid "Expires"
+msgstr "Дійсний ще"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr "Термін оренди адрес, мінімум 2 хвилини (<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "Зовнішній сервер системного журналу"
+
+msgid "External system log server port"
+msgstr "Порт зовнішнього сервера системного журналу"
+
+msgid "Fast Frames"
+msgstr "Швидкі фрейми"
+
+msgid "File"
+msgstr "Файл"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "І'мя завантажувального образу, що оголошується клієнтам"
+
+msgid "Filesystem"
+msgstr "Файлова система"
+
+msgid "Filter"
+msgstr "Фільтр"
+
+msgid "Filter private"
+msgstr "Фільтрувати приватні"
+
+msgid "Filter useless"
+msgstr "Фільтрувати непридатні"
+
+msgid "Find and join network"
+msgstr "Знайти мережу й приєднатися"
+
+msgid "Find package"
+msgstr "Знайти пакет"
+
+msgid "Finish"
+msgstr "Готово"
+
+msgid "Firewall"
+msgstr "Брандмауер"
+
+msgid "Firewall Settings"
+msgstr "Настройки брандмауера"
+
+msgid "Firewall Status"
+msgstr "Статус брандмауера"
+
+msgid "Firmware Version"
+msgstr "Версія прошивки"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "Фіксований порт для вихідних DNS-запитів"
+
+msgid "Flags"
+msgstr "Позначки"
+
+msgid "Flash Firmware"
+msgstr "Заливаємо прошивку"
+
+msgid "Flash image..."
+msgstr "Відвантажити образ..."
+
+msgid "Flash new firmware image"
+msgstr "Залити новий образ прошивки"
+
+msgid "Flash operations"
+msgstr "Операції заливання"
+
+msgid "Flashing..."
+msgstr "Заливаємо..."
+
+msgid "Force"
+msgstr "Примусово"
+
+msgid "Force 40MHz mode"
+msgstr "Примусово режим 40MHz"
+
+msgid "Force CCMP (AES)"
+msgstr "Примусово CCMP (AES)"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "Примусово DHCP у цій мережі, навіть якщо виявлено інший сервер."
+
+msgid "Force TKIP"
+msgstr "Примусово TKIP"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "Примусово TKIP та CCMP (AES)"
+
+msgid "Forward DHCP traffic"
+msgstr "Спрямовувати DHCP-трафік"
+
+msgid "Forward broadcast traffic"
+msgstr "Спрямовувати широкомовний трафік"
+
+msgid "Forwarding mode"
+msgstr "Режим спрямовування"
+
+msgid "Fragmentation Threshold"
+msgstr "Поріг фрагментації"
+
+msgid "Frame Bursting"
+msgstr "Frame Bursting"
+
+msgid "Free"
+msgstr "Вільно"
+
+msgid "Free space"
+msgstr "Вільне місце"
+
+msgid "Frequency Hopping"
+msgstr "Frequency Hopping"
+
+msgid "GHz"
+msgstr "ГГц"
+
+msgid "GPRS only"
+msgstr "Тільки GPRS"
+
+msgid "Gateway"
+msgstr "Шлюз"
+
+msgid "Gateway ports"
+msgstr "Порти шлюзу"
+
+msgid "General Settings"
+msgstr "Загальні настройки"
+
+msgid "General Setup"
+msgstr "Загальні настройки"
+
+msgid "Generate archive"
+msgstr "Cтворити архів"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Бездротовий 802.11%s контролер"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "Оскільки пароль і підтвердження не співпадають, то пароль не змінено!"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "Перейти до конфігурації пароля..."
+
+msgid "Go to relevant configuration page"
+msgstr "Перейти до відповідної сторінки конфігурації"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "Пароль HE.net"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "Обробник"
+
+msgid "Hang Up"
+msgstr "Призупинити"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Тут ви можете настроїти основні параметри вигляду вашого пристрою, такі як "
+"назва (ім’я) вузла або часовий пояс."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+"Тут ви можете вставити відкриті SSH-ключі (по одному на рядок) для SSH з "
+"відкритим ключем автентифікації."
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Бездротовий 802.11b контролер Hermes"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr ""
+"Приховати <abbr title=\"Extended Service Set Identifier — ідентифікатор "
+"розширеної служби послуг\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Записи вузлів"
+
+msgid "Host expiry timeout"
+msgstr "Тайм-аут вузла"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "<abbr title=\"Internet Protocol Address\">IP</abbr> вузла або мережа"
+
+msgid "Hostname"
+msgstr "Назва (ім'я) вузла"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "Ім'я вузла для надсилання при запиті DHCP"
+
+msgid "Hostnames"
+msgstr "Імена вузлів"
+
+msgid "IP address"
+msgstr "IP-адреса"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "Брандмауер IPv4"
+
+msgid "IPv4 WAN Status"
+msgstr "Статус IPv4 WAN"
+
+msgid "IPv4 address"
+msgstr "Адреса IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 та IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "Широкомовний IPv4"
+
+msgid "IPv4 gateway"
+msgstr "Шлюз IPv4"
+
+msgid "IPv4 netmask"
+msgstr "Маска мережі IPv4"
+
+msgid "IPv4 only"
+msgstr "Тільки IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "Довжина префікса IPv4"
+
+msgid "IPv4-Address"
+msgstr "IPv4-адреса"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "Брандмауер IPv6"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "Статус IPv6 WAN"
+
+msgid "IPv6 address"
+msgstr "Адреса IPv6"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "Шлюз IPv6"
+
+msgid "IPv6 only"
+msgstr "Тільки IPv6"
+
+msgid "IPv6 prefix"
+msgstr "Префікс IPv6"
+
+msgid "IPv6 prefix length"
+msgstr "Довжина префікса IPv6"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-адреса"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6 у IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6 через IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6 через IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "Ідентичність"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+"Якщо обрано, монтувати пристрій за його UUID замість фіксованого вузла "
+"пристрою"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+"Якщо обрано, монтувати пристрій за назвою його розділу замість фіксованого "
+"вузла пристрою"
+
+msgid "If unchecked, no default route is configured"
+msgstr "Якщо не позначено, типовий маршрут не настроєно"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "Якщо не позначено, оголошувані адреси DNS-серверів ігноруються"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Якщо фізичної пам'яті недостатньо, невикористовувані дані можуть тимчасово "
+"витіснятися на своп-пристрій, у результаті чого збільшується кількість "
+"корисної оперативної пам'яті (<abbr title=\"Random Access Memory\">RAM</"
+"abbr>). Майте на увазі, що свопінг даних є дуже повільним процесом, оскільки "
+"своп-пристрої не можуть бути доступні з такою високою швидкістю, як <abbr "
+"title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr "Ігнорувати файли hosts"
+
+msgid "Ignore interface"
+msgstr "Ігнорувати интерфейс"
+
+msgid "Ignore resolve file"
+msgstr "Ігнорувати файли resolv"
+
+msgid "Image"
+msgstr "Образ"
+
+msgid "In"
+msgstr "Вх."
+
+msgid "Inactivity timeout"
+msgstr "Тайм-аут бездіяльності"
+
+msgid "Inbound:"
+msgstr "Вхідний:"
+
+msgid "Info"
+msgstr "Інформація"
+
+msgid "Initscript"
+msgstr "Скрипт ініціалізації"
+
+msgid "Initscripts"
+msgstr "Скрипти ініціалізації"
+
+msgid "Install"
+msgstr "Інсталювати"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "Інсталяція пакета %q"
+
+msgid "Install protocol extensions..."
+msgstr "Інсталяція розширень протоколу..."
+
+msgid "Installed packages"
+msgstr "Інстальовані пакети"
+
+msgid "Interface"
+msgstr "Інтерфейс"
+
+msgid "Interface Configuration"
+msgstr "Конфігурація інтерфейсу"
+
+msgid "Interface Overview"
+msgstr "Огляд інтерфейсів"
+
+msgid "Interface is reconnecting..."
+msgstr "Перепідключення інтерфейсу..."
+
+msgid "Interface is shutting down..."
+msgstr "Інтерфейс завершує роботу..."
+
+msgid "Interface not present or not connected yet."
+msgstr "Інтерфейс відсутній або ще не підключений."
+
+msgid "Interface reconnected"
+msgstr "Інтерфейс перепідключено"
+
+msgid "Interface shut down"
+msgstr "Інтерфейс завершив роботу"
+
+msgid "Interfaces"
+msgstr "Інтерфейси"
+
+msgid "Internal Server Error"
+msgstr "Внутрішня помилка сервера"
+
+msgid "Invalid"
+msgstr "Неприпустимо"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+"Задано невірний VLAN ID! Доступні тільки ідентифікатори в межах між %d і %d."
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "Задано невірний VLAN ID! Доступні тільки унікальні ідентифікатори."
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Неприпустиме ім’я користувача та/або пароль! Спробуйте ще раз."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Схоже, що ви намагаєтеся залити образ, який не вміщається у флеш-пам'ять! "
+"Перевірте файл образу!"
+
+msgid "Java Script required!"
+msgstr "Потрібен Java Script!"
+
+msgid "Join Network"
+msgstr "Підключення до мережі"
+
+msgid "Join Network: Settings"
+msgstr "Підключення до мережі: Настройки"
+
+msgid "Join Network: Wireless Scan"
+msgstr "Підключення до мережі: Сканування бездротових мереж"
+
+msgid "Keep settings"
+msgstr "Зберегти настройки"
+
+msgid "Kernel Log"
+msgstr "Журнал ядра"
+
+msgid "Kernel Version"
+msgstr "Версія ядра"
+
+msgid "Key"
+msgstr "Ключ"
+
+msgid "Key #%d"
+msgstr "Ключ #%d"
+
+msgid "Kill"
+msgstr "Знищити"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "Сервер L2TP"
+
+msgid "LCP echo failure threshold"
+msgstr "Поріг помилок ехо-запитів LCP"
+
+msgid "LCP echo interval"
+msgstr "Інтервал ехо-запитів LCP"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "Мітка"
+
+msgid "Language"
+msgstr "Мова"
+
+msgid "Language and Style"
+msgstr "Мова та стиль"
+
+msgid "Lease validity time"
+msgstr "Час чинності оренди"
+
+msgid "Leasefile"
+msgstr "Файл оренд"
+
+msgid "Leasetime"
+msgstr "Час оренди"
+
+msgid "Leasetime remaining"
+msgstr "Час оренди, що лишився"
+
+msgid "Leave empty to autodetect"
+msgstr "Залиште поле порожнім для автовизначення"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "Залиште порожнім, щоб використовувати поточну адресу WAN"
+
+msgid "Legend:"
+msgstr "Легенда:"
+
+msgid "Limit"
+msgstr "Межа"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Зв'язок встановлено"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+"Список <abbr title=\"Domain Name System\">DNS</abbr>-серверів, до яких "
+"пересилати запити"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "Список доменів, для яких дозволені RFC1918-відповіді"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "Список доменів, які підтримують результати підробки NX-доменів"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+"Прослуховувати тільки на цьому інтерфейсі, або на всіх (якщо <em>не "
+"визначено</em>)"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "Порт прослуховування для вхідних DNS-запитів"
+
+msgid "Load"
+msgstr "Навантаження"
+
+msgid "Load Average"
+msgstr "Середнє навантаження"
+
+msgid "Loading"
+msgstr "Завантаження"
+
+msgid "Local IPv4 address"
+msgstr "Локальна адреса IPv4"
+
+msgid "Local IPv6 address"
+msgstr "Локальна адреса IPv6"
+
+msgid "Local Startup"
+msgstr "Локальний запуск"
+
+msgid "Local Time"
+msgstr "Місцевий час"
+
+msgid "Local domain"
+msgstr "Локальний домен"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+"Специфікація локальних доменів. Імена, зіставлені цьому домену, ніколи не "
+"спрямовуються і виділяються тільки через DHCP або файли hosts"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+"Суфікс локального домену додається до DHCP-імен вузлів та записів з файлу "
+"hosts"
+
+msgid "Local server"
+msgstr "Локальний сервер"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+"Локалізувати ім'я хоста залежно від запитуючої підмережі, якщо доступні "
+"кілька IP-адрес"
+
+msgid "Localise queries"
+msgstr "Локалізувати запити"
+
+msgid "Locked to channel %d used by %s"
+msgstr "Замкнено на канал %d, використовуваний %s"
+
+msgid "Log output level"
+msgstr "Рівень виведення інформаціі до журналу"
+
+msgid "Log queries"
+msgstr "Журнал запитів"
+
+msgid "Logging"
+msgstr "Журналювання"
+
+msgid "Login"
+msgstr "Увійти"
+
+msgid "Logout"
+msgstr "Вийти"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "Найнижча орендована адреса"
+
+msgid "MAC-Address"
+msgstr "MAC-адреса"
+
+msgid "MAC-Address Filter"
+msgstr "Фільтр MAC-адрес"
+
+msgid "MAC-Filter"
+msgstr "MAC-фільтр"
+
+msgid "MAC-List"
+msgstr "MAC-список"
+
+msgid "MB/s"
+msgstr "MБ/с"
+
+msgid "MHz"
+msgstr "МГц"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "Максимальна швидкість"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "Максимально допустима кількість активних оренд DHCP"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "Максимально допустима кількість одночасних DNS-запитів"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "Максимально допустимий розмір UDP-пакетів EDNS.0"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "Максимальний час очікування готовності модему (секунд)"
+
+msgid "Maximum hold time"
+msgstr "Максимальний час утримування"
+
+msgid "Maximum number of leased addresses."
+msgstr "Максимальна кількість орендованих адрес."
+
+msgid "Mbit/s"
+msgstr "Мбіт/с"
+
+msgid "Memory"
+msgstr "Пам'ять"
+
+msgid "Memory usage (%)"
+msgstr "Використання пам'яті, %"
+
+msgid "Metric"
+msgstr "Метрика"
+
+msgid "Minimum Rate"
+msgstr "Мінімальна швидкість"
+
+msgid "Minimum hold time"
+msgstr "Мінімальний час утримування"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "Відсутні розширення для протоколу %q"
+
+msgid "Mode"
+msgstr "Режим"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Модем"
+
+msgid "Modem init timeout"
+msgstr "Тайм-аут ініціалізації модему"
+
+msgid "Monitor"
+msgstr "Монітор"
+
+msgid "Mount Entry"
+msgstr "Вхід монтування"
+
+msgid "Mount Point"
+msgstr "Точка монтування"
+
+msgid "Mount Points"
+msgstr "Точки монтування"
+
+msgid "Mount Points - Mount Entry"
+msgstr "Точки монтування - Записи монтування"
+
+msgid "Mount Points - Swap Entry"
+msgstr "Точки монтування - Вхід довантаження"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Точки монтування визначають, до якої точки пристрою пам'яті буде прикріплена "
+"файлова система"
+
+msgid "Mount options"
+msgstr "Опції монтування"
+
+msgid "Mount point"
+msgstr "Точка монтування"
+
+msgid "Mounted file systems"
+msgstr "Змонтовані файлові системи"
+
+msgid "Move down"
+msgstr "Вниз"
+
+msgid "Move up"
+msgstr "Вгору"
+
+msgid "Multicast Rate"
+msgstr "Швидкість багатоадресного потоку"
+
+msgid "Multicast address"
+msgstr "Адреса багатоадресного потоку"
+
+msgid "NAS ID"
+msgstr "Ідентифікатор NAS"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "Кандидати для синхронізації NTP-сервера"
+
+msgid "Name"
+msgstr "Ім'я"
+
+msgid "Name of the new interface"
+msgstr "Ім'я нового інтерфейсу"
+
+msgid "Name of the new network"
+msgstr "Назва (ім'я) нової мережі"
+
+msgid "Navigation"
+msgstr "Навігація"
+
+msgid "Netmask"
+msgstr "Маска мережі"
+
+msgid "Network"
+msgstr "Мережа"
+
+msgid "Network Utilities"
+msgstr "Мережеві утиліти"
+
+msgid "Network boot image"
+msgstr "Образ для мережевого завантаження"
+
+msgid "Network without interfaces."
+msgstr "Мережа без інтерфейсів."
+
+msgid "Next »"
+msgstr "Наступний »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "Немає DHCP-сервера, настроєного для цього інтерфейсу"
+
+msgid "No chains in this table"
+msgstr "У цій таблиці нема ланцюжків"
+
+msgid "No files found"
+msgstr "Файли не знайдено"
+
+msgid "No information available"
+msgstr "Інформація відсутня"
+
+msgid "No negative cache"
+msgstr "Ніяких негативних кешувань"
+
+msgid "No network configured on this device"
+msgstr "На цьому пристрої нема настроєної мережі"
+
+msgid "No network name specified"
+msgstr "Ім'я мережі не визначене"
+
+msgid "No package lists available"
+msgstr "Немає доступних списків пакетів"
+
+msgid "No password set!"
+msgstr "Пароль не встановлено!"
+
+msgid "No rules in this chain"
+msgstr "У цьму ланцюжку нема правил"
+
+msgid "No zone assigned"
+msgstr "Зона не призначена"
+
+msgid "Noise"
+msgstr "Шум"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "Шум:"
+
+msgid "None"
+msgstr "Жоден"
+
+msgid "Normal"
+msgstr "Нормальний"
+
+msgid "Not Found"
+msgstr "Не знайдено"
+
+msgid "Not associated"
+msgstr "Не пов'язаний"
+
+msgid "Not connected"
+msgstr "Не підключено"
+
+msgid "Note: Configuration files will be erased."
+msgstr "Примітка: конфігураційні файли будуть видалені."
+
+msgid "Notice"
+msgstr "Попередження"
+
+msgid "Nslookup"
+msgstr "DNS-запит"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "Конфігурація OPKG"
+
+msgid "Off-State Delay"
+msgstr "Затримка Off-State"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"На цій сторінці ви можете настроїти мережеві інтерфейси. Ви можете "
+"об'єднатиати кілька інтерфейсів мостом, відзначивши поле \"Об'єднати "
+"інтерфейси в міст\" та ввівши імена кількох мережевих інтерфейсів, розділені "
+"пробілами. Також ви можете використовувати <abbr title=\"Virtual Local Area "
+"Network — віртуальна локальна комп'ютерна мережа\">VLAN</abbr>-позначення "
+"<samp>ІНТЕРФЕЙС.НОМЕР_VLAN</samp> (наприклад, <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "Затримка On-State"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "Має бути вказане одне з двох - ім'я вузла або МАС-адреса!"
+
+msgid "One or more fields contain invalid values!"
+msgstr "Одне або декілька полів містять неприпустимі значення!"
+
+msgid "One or more required fields have no value!"
+msgstr "Одне або декілька обов'язкових полів не мають значень!"
+
+msgid "Open list..."
+msgstr "Відкрити список..."
+
+msgid "Option changed"
+msgstr "Опція змінена"
+
+msgid "Option removed"
+msgstr "Опція видалена"
+
+msgid "Options"
+msgstr "Опції"
+
+msgid "Other:"
+msgstr "Інше:"
+
+msgid "Out"
+msgstr "Вих."
+
+msgid "Outbound:"
+msgstr "Вихідний:"
+
+msgid "Outdoor Channels"
+msgstr "Зовнішні канали"
+
+msgid "Override MAC address"
+msgstr "Перевизначити MAC-адресу"
+
+msgid "Override MTU"
+msgstr "Перевизначити MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "Перевизначення шлюзу у відповідях DHCP"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+"Перевизначення мережевої маски, яка надсилається клієнтам. Зазвичай вона "
+"обчислюється від підмережі, що обслуговується."
+
+msgid "Override the table used for internal routes"
+msgstr ""
+"Перевизначення таблиці, що використовужться для внутрішніх спрямовувань"
+
+msgid "Overview"
+msgstr "Огляд"
+
+msgid "Owner"
+msgstr "Власник"
+
+msgid "PAP/CHAP password"
+msgstr "Пароль PAP/CHAP"
+
+msgid "PAP/CHAP username"
+msgstr "Ім'я користувача PAP/CHAP"
+
+msgid "PID"
+msgstr "<abbr title=\"Process Identifier — Ідентифікатор процесу\">PID</abbr>"
+
+msgid "PIN"
+msgstr ""
+"<abbr title=\"Personal Identification Number — Персональний ідентифікаційний "
+"номер\">>PIN</abbr>"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "Інкапсуляція PPPoA"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "Потрібен пакет libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "Перелік пакетів створений більше ніж 24 години тому"
+
+msgid "Package name"
+msgstr "Назва пакета"
+
+msgid "Packets"
+msgstr "Пакети"
+
+msgid "Part of zone %q"
+msgstr "Частина зони %q"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Password authentication"
+msgstr "Автентифікація за паролем"
+
+msgid "Password of Private Key"
+msgstr "Пароль закритого ключа"
+
+msgid "Password successfully changed!"
+msgstr "Пароль успішно змінено!"
+
+msgid "Path to CA-Certificate"
+msgstr "Шлях до центру сертифікції"
+
+msgid "Path to Client-Certificate"
+msgstr "Шлях до сертифікату клієнта"
+
+msgid "Path to Private Key"
+msgstr "Шлях до закритого ключа"
+
+msgid "Path to executable which handles the button event"
+msgstr "Шлях до програми, яка обробляє натискання кнопки"
+
+msgid "Peak:"
+msgstr "Пік:"
+
+msgid "Perform reboot"
+msgstr "Виконати перезавантаження"
+
+msgid "Perform reset"
+msgstr "Відновити"
+
+msgid "Phy Rate:"
+msgstr "Фізична швидкість:"
+
+msgid "Physical Settings"
+msgstr "Фізичні параметри"
+
+msgid "Ping"
+msgstr "Ехо-запит"
+
+msgid "Pkts."
+msgstr "пакетів"
+
+msgid "Please enter your username and password."
+msgstr "Введіть ім'я користувача і пароль"
+
+msgid "Please wait: Device rebooting..."
+msgstr "Зачекайте. Пристрій перезавантажується..."
+
+msgid "Policy"
+msgstr "Політика"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Port %d"
+msgstr "Порт %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "Порт %d нетегований у кількох VLAN-ах!"
+
+msgid "Port status:"
+msgstr "Статус порту:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+"Вважати вузол недоступним після визначеної кількості невдач отримання ехо-"
+"пакета LCP, використовуйте 0, щоб ігнорувати невдачі"
+
+msgid "Prevents client-to-client communication"
+msgstr "Запобігає зв'язкам клієнт-клієнт"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Бездротовий 802.11b контролер Prism2/2.5/3"
+
+msgid "Proceed"
+msgstr "Продовжити"
+
+msgid "Processes"
+msgstr "Процеси"
+
+msgid "Prot."
+msgstr "Прот."
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Protocol family"
+msgstr "Сімейство протоколів"
+
+msgid "Protocol of the new interface"
+msgstr "Протокол нового інтерфейсу"
+
+msgid "Protocol support is not installed"
+msgstr "Підтримка протоколу не інстальована"
+
+msgid "Provide NTP server"
+msgstr "Забезпечувати NTP-сервер"
+
+msgid "Provide new network"
+msgstr "Постачити нову мережу"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Псевдо Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "Якість"
+
+msgid "RTS/CTS Threshold"
+msgstr "Поріг RTS/CTS"
+
+msgid "RX"
+msgstr "Одержано"
+
+msgid "RX Rate"
+msgstr "Швидкість приймання"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "Бездротовий 802.11%s контролер RaLink"
+
+msgid "Radius-Accounting-Port"
+msgstr "Порт Radius-Accounting"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Секрет Radius-Accounting"
+
+msgid "Radius-Accounting-Server"
+msgstr "Сервер Radius-Accounting"
+
+msgid "Radius-Authentication-Port"
+msgstr "Порт Radius-Authentication"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Секрет Radius-Authentication"
+
+msgid "Radius-Authentication-Server"
+msgstr "Сервер Radius-Authentication"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Читати <code>/etc/ethers</code> для настроювання <abbr title=\"Dynamic Host "
+"Configuration Protocol — Протокол динамічної конфігурації вузла\">DHCP</"
+"abbr>-сервера"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"Дійсно видалити цей інтерфейс? Скасувати видалення неможливо!\n"
+"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цей "
+"інтерфейс."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"Дійсно видалити цю бездротову мережу? Скасувати видалення неможливо!\n"
+"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цю "
+"мережу."
+
+msgid "Really reset all changes?"
+msgstr "Дійсно скинути всі зміни?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Дійсно вимкнути мережу?\n"
+"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цю "
+"мережу."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"Дійсно вимкнути інтерфейс \"%s\"?\n"
+"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цей "
+"інтерфейс."
+
+msgid "Really switch protocol?"
+msgstr "Дійсно змінити протокол?"
+
+msgid "Realtime Connections"
+msgstr "Підключення у реальному часі"
+
+msgid "Realtime Graphs"
+msgstr "Графіки у реальному часі"
+
+msgid "Realtime Load"
+msgstr "Навантаження у реальному часі"
+
+msgid "Realtime Traffic"
+msgstr "Трафік у реальному часі"
+
+msgid "Realtime Wireless"
+msgstr "Бездротові мережі у реальному часі"
+
+msgid "Rebind protection"
+msgstr "Захист від переприв'язки"
+
+msgid "Reboot"
+msgstr "Перезавантаження"
+
+msgid "Rebooting..."
+msgstr "Перезавантаження..."
+
+msgid "Reboots the operating system of your device"
+msgstr "Перезавантажити операційну систему вашого пристрою"
+
+msgid "Receive"
+msgstr "Прийом"
+
+msgid "Receiver Antenna"
+msgstr "Антена приймача"
+
+msgid "Reconnect this interface"
+msgstr "Перепідключити цей інтерфейс"
+
+msgid "Reconnecting interface"
+msgstr "Перепідключення інтерфейсу"
+
+msgid "References"
+msgstr "Посилання"
+
+msgid "Regulatory Domain"
+msgstr "Регулятивний домен"
+
+msgid "Relay"
+msgstr "Ретранслятор"
+
+msgid "Relay Bridge"
+msgstr "Міст-ретранслятор"
+
+msgid "Relay between networks"
+msgstr "Міжмережевий ретранслятор"
+
+msgid "Relay bridge"
+msgstr "Міст-ретранслятор"
+
+msgid "Remote IPv4 address"
+msgstr "Віддалена адреса IPv4"
+
+msgid "Remove"
+msgstr "Видалити"
+
+msgid "Repeat scan"
+msgstr "Повторити сканування"
+
+msgid "Replace entry"
+msgstr "Замінити запис"
+
+msgid "Replace wireless configuration"
+msgstr "Замінити конфігурацію бездротової мережі"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "Потрібно для деяких провайдерів, наприклад, Charter із DOCSIS 3"
+
+msgid "Reset"
+msgstr "Скинути"
+
+msgid "Reset Counters"
+msgstr "Скинути лічильники"
+
+msgid "Reset to defaults"
+msgstr "Відновити початковий стан"
+
+msgid "Resolv and Hosts Files"
+msgstr "Файли resolv і hosts"
+
+msgid "Resolve file"
+msgstr "Файл resolv"
+
+msgid "Restart"
+msgstr "Перезавантажити"
+
+msgid "Restart Firewall"
+msgstr "Перезавантажити брандмауер"
+
+msgid "Restore backup"
+msgstr "Відновити з резервної копії"
+
+msgid "Reveal/hide password"
+msgstr "Показати/приховати пароль"
+
+msgid "Revert"
+msgstr "Скасувати зміни"
+
+msgid "Root"
+msgstr "Корінь"
+
+msgid "Root directory for files served via TFTP"
+msgstr "Кореневий каталог для файлів TFTP"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "Пароль маршрутизатора"
+
+msgid "Routes"
+msgstr "Маршрути"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Маршрути визначають через який інтерфейс і шлюз можна досягнути певного "
+"вузла або мережі."
+
+msgid "Rule #"
+msgstr "Правило #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "Виконати перевірку файлової системи перед монтуванням пристрою"
+
+msgid "Run filesystem check"
+msgstr "Виконати перевірку файлової системи"
+
+msgid "SSH Access"
+msgstr "SSH-доступ"
+
+msgid "SSH-Keys"
+msgstr "SSH-ключі"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Save & Apply"
+msgstr "Зберегти і застосувати"
+
+msgid "Save &#38; Apply"
+msgstr "Зберегти і застосувати"
+
+msgid "Scan"
+msgstr "Сканувати"
+
+msgid "Scheduled Tasks"
+msgstr "Заплановані завдання"
+
+msgid "Section added"
+msgstr "Секція додана"
+
+msgid "Section removed"
+msgstr "Секція видалена"
+
+msgid "See \"mount\" manpage for details"
+msgstr "Подробиці див. на сторінці керівництва \"mount\""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+"Надсилати ехо-пакети LCP зі вказаним інтервалом (секунди), ефективно тільки "
+"в поєднанні з порогом помилок"
+
+msgid "Separate Clients"
+msgstr "Розділяти клієнтів"
+
+msgid "Separate WDS"
+msgstr "Розділяти WDS"
+
+msgid "Server Settings"
+msgstr "Настройки сервера"
+
+msgid "Service Name"
+msgstr "Назва (ім'я) сервісу"
+
+msgid "Service Type"
+msgstr "Тип сервісу"
+
+msgid "Services"
+msgstr "Сервіси"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Настройки синхронізації часу"
+
+msgid "Setup DHCP Server"
+msgstr "Настройки DHCP-сервера"
+
+msgid "Show current backup file list"
+msgstr "Показати поточний список файлів резервного копіювання"
+
+msgid "Shutdown this interface"
+msgstr "Вимкнути цей інтерфейс"
+
+msgid "Shutdown this network"
+msgstr "Вимкнути цю мережу"
+
+msgid "Signal"
+msgstr "Сигнал"
+
+msgid "Signal:"
+msgstr "Сигнал:"
+
+msgid "Size"
+msgstr "Розмір"
+
+msgid "Skip"
+msgstr "Пропустити"
+
+msgid "Skip to content"
+msgstr "Перейти до вмісту"
+
+msgid "Skip to navigation"
+msgstr "Перейти до навігації"
+
+msgid "Slot time"
+msgstr "Час слота"
+
+msgid "Software"
+msgstr "Програмне забезпечення"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "Деякі поля є неприпустимими, неможливо зберегти значення!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "На жаль, об'єкт, який ви просили, не знайдено."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "На жаль, на сервері сталася неочікувана помилка."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"На жаль, автоматичне оновлення системи не підтримується. Новий образ "
+"прошивки повинен бути залитий вручну. Зверніться до libreCMC Wiki за "
+"інструкцією з інсталяції для конкретного пристрою."
+
+msgid "Sort"
+msgstr "Сортування"
+
+msgid "Source"
+msgstr "Джерело"
+
+msgid "Specifies the button state to handle"
+msgstr "Визначає стан кнопки для обробки"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "Визначає каталог, до якого приєднаний пристрій"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "Визначає порт прослуховування цієї реалізації <em>Dropbear</em>"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+"Визначає максимальну кількість невдалих ARP-запитів до вузлів, після якого "
+"вважається, що вузли \"мертві\""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+"Визначає максимальний час (секунди), після якого вважається, що вузли "
+"\"мертві\""
+
+msgid "Specify the secret encryption key here."
+msgstr "Вкажіть тут секретний ключ шифрування."
+
+msgid "Start"
+msgstr "Запустити"
+
+msgid "Start priority"
+msgstr "Стартовий пріоритет"
+
+msgid "Startup"
+msgstr "Запуск"
+
+msgid "Static IPv4 Routes"
+msgstr "Статичні маршрути IPv4"
+
+msgid "Static IPv6 Routes"
+msgstr "Статичні маршрути IPv6"
+
+msgid "Static Leases"
+msgstr "Статичні оренди"
+
+msgid "Static Routes"
+msgstr "Статичні маршрути"
+
+msgid "Static WDS"
+msgstr "Статичний WDS"
+
+msgid "Static address"
+msgstr "Статичні адреси"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"Статичні оренди використовуються для призначення фіксованих IP-адрес і "
+"символічних імен вузлів DHCP-клієнтам. Вони також необхідні для статичних "
+"конфігурацій інтерфейсів, коли обслуговуються тільки вузли з відповідною "
+"орендою."
+
+msgid "Status"
+msgstr "Статус"
+
+msgid "Stop"
+msgstr "Зупинити"
+
+msgid "Strict order"
+msgstr "Строгий порядок"
+
+msgid "Submit"
+msgstr "Надіслати"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Вхід довантаження"
+
+msgid "Switch"
+msgstr "Комутатор"
+
+msgid "Switch %q"
+msgstr "Комутатор %q"
+
+msgid "Switch %q (%s)"
+msgstr "Комутатор %q (%s)"
+
+msgid "Switch protocol"
+msgstr "Протокол комутатора"
+
+msgid "Sync with browser"
+msgstr "Синхронізувати з браузером"
+
+msgid "Synchronizing..."
+msgstr "Синхронізація..."
+
+msgid "System"
+msgstr "Система"
+
+msgid "System Log"
+msgstr "Системний журнал"
+
+msgid "System Properties"
+msgstr "Властивості системи"
+
+msgid "System log buffer size"
+msgstr "Розмір буфера системного журналу"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "Настройки TFTP"
+
+msgid "TFTP server root"
+msgstr "Корінь TFTP-сервера"
+
+msgid "TX"
+msgstr "Передано"
+
+msgid "TX Rate"
+msgstr "Швидкість передавання"
+
+msgid "Table"
+msgstr "Таблиця"
+
+msgid "Target"
+msgstr "Мета"
+
+msgid "Terminate"
+msgstr "Завершити"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"Розділ <em>Конфігурація пристрою</em> охоплює фізичні параметри радіо-"
+"апаратних засобів, такі, як канал, потужність передавача або вибір антени, "
+"які є спільними для всіх визначених бездротових мереж (якщо радіо-апаратні "
+"засоби здатні підтримувати кілька SSID). Параметри окремих мереж, такі, як "
+"шифрування або режим роботи, згруповані в розділі <em>Конфігурація "
+"інтерфейсу</em>."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"Пакет <em>libiwinfo-lua</em> не інстальований. Щоб мати можливість "
+"настроювати безпровідні мережі, слід інсталювати цей компонент!"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+"Призначений провайдеру IPv6-префікс, зазвичай закінчується на <code>::</code>"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"Дозволені символи: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> та "
+"<code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr "Файл пристрою пам'яті або розділу (наприклад, <code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Файлова система, яка використовуватиметься для форматування пам'яті "
+"(наприклад, <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"Образ завантажено. Нижче наведено контрольну суму і розмір файлу. Порівняйте "
+"їх з вихідним файлом для забезпечення цілісності даних.<br /> Натисніть "
+"\"Продовжити\", щоб розпочати процедуру оновлення прошивки."
+
+msgid "The following changes have been committed"
+msgstr "Нижче наведені зміни були застосовані"
+
+msgid "The following changes have been reverted"
+msgstr "Нижче наведені зміни були скасовані"
+
+msgid "The following rules are currently active on this system."
+msgstr "У даний час у цій системі активні такі правила."
+
+msgid "The given network name is not unique"
+msgstr "Задане мережеве ім'я не є унікальним"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+"Обладнання не підтримує мульти-SSID і, якщо ви продовжите, існуюча "
+"конфігурація буде замінена."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr "Довжина IPv4-префікса в бітах, решта використовується в IPv6-адресах."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "Довжина IPv6-префікса в бітах"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"Мережеві порти вашого пристрою можуть бути об'єднані у декілька <abbr title="
+"\"Virtual Local Area Network — віртуальна локальна комп'ютерна мережа"
+"\">VLAN</abbr>, у яких комп'ютери можуть напряму спілкуватися один з одним. "
+"<abbr title=\"Virtual Local Area Network — віртуальна локальна комп'ютерна "
+"мережа\">VLAN</abbr> часто використовуються для розділення мережі на окремі "
+"сегменти. Зазвичай один виcхідний порт використовується для з'єднання з "
+"більшою мережею, такою наприклад, як Інтернет, а інші порти — для локальної "
+"мережі."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "Обраний протокол потребує призначених пристроїв"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+"Зараз система видаляє розділ конфігурації і коли закінчить, "
+"перезавантажиться."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Система перепрошивається.<br /> <strong>НЕ ВИМИКАЙТЕ ЖИВЛЕННЯ ПРИСТРОЮ!</"
+"strong><br /> Зачекайте кілька хвилин перед тим, як пробувати знову "
+"з'єднатися. Залежно від ваших настройок, можливо, вам треба буде оновити "
+"адресу вашого комп'ютера, щоб знову отримати доступ до пристрою."
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Завантажений файл образу не містить підтримуваний формат. Переконайтеся, що "
+"ви вибираєте універсальний формат образу для вашої платформи."
+
+msgid "There are no active leases."
+msgstr "Активних оренд немає."
+
+msgid "There are no pending changes to apply!"
+msgstr "Немає жодних змін до застосування!"
+
+msgid "There are no pending changes to revert!"
+msgstr "Немає жодних змін до скасування!"
+
+msgid "There are no pending changes!"
+msgstr "Немає жодних очікуючих змін!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+"Немає жодного призначеного пристрою. Призначте мережевий пристрій у вкладці "
+"\"Фізичні параметри\"."
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+"Цей маршрутизатор не має пароля. Встановіть пароль, шоб захистити веб-"
+"інтерфейс і увімкнути SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "Це IPv4-адреса ретранслятора"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"Це список шаблонів для відбору файлів і каталогів, які мають увійти до "
+"резервної копії. Змінені файли у <code>/etc/config/</code> та деякі інші "
+"зберігаються автоматично."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"Це вміст файлу <code>/etc/rc.local</code>. Вставте тут ваші власні команди "
+"(перед 'exit 0'), щоб виконати їх у кінці процесу завантаження."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+"Це локальна адреса кінцевої точки, присвоєна тунельним брокером, зазвичай "
+"закінчується на <code>:2</code>"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Тільки для <abbr title=\"Dynamic Host Configuration Protocol — протокол "
+"динамічної конфігурації вузла\">DHCP</abbr> у локальній мережі"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr ""
+"Це системна таблиця Cron (crontab), у якій можна визначити заплановані "
+"завдання."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+"Зазвичай, це адреса найближчої точки присутності, що управляється тунелним "
+"брокером"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"У цьому списку наведені працюючі на даний момент системні процеси та їх "
+"статус."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "Ця сторінка дозволяє настроїти нетипові дії кнопки"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "Ця сторінка надає огляд поточних активних мережних підключень."
+
+msgid "This section contains no values yet"
+msgstr "Ця секція поки що не містить значень"
+
+msgid "Time Synchronization"
+msgstr "Синхронізація часу"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "Синхронізація часу не настроєна."
+
+msgid "Timezone"
+msgstr "Часовий пояс"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+"Щоб відновити файли конфігурації, ви можете відвантажити раніше створений "
+"архів резервної копії."
+
+msgid "Total Available"
+msgstr "Усього доступно"
+
+msgid "Traceroute"
+msgstr "Трасування"
+
+msgid "Traffic"
+msgstr "Трафік"
+
+msgid "Transfer"
+msgstr "Передано"
+
+msgid "Transmission Rate"
+msgstr "Швидкість передавання"
+
+msgid "Transmit"
+msgstr "Передача"
+
+msgid "Transmit Power"
+msgstr "Потужність передавача"
+
+msgid "Transmitter Antenna"
+msgstr "Антена передавача"
+
+msgid "Trigger"
+msgstr "Тригер"
+
+msgid "Trigger Mode"
+msgstr "Режим запуску"
+
+msgid "Tunnel ID"
+msgstr "Ідентифікатор тунелю"
+
+msgid "Tunnel Interface"
+msgstr "Інтерфейс тунелю"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Режим Turbo"
+
+msgid "Tx-Power"
+msgstr "Потужність передавача"
+
+msgid "Type"
+msgstr "Тип"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "Тільки UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB-пристрій"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "Не вдалося опрацювати запит"
+
+msgid "Unknown"
+msgstr "Невідомо"
+
+msgid "Unknown Error, password not changed!"
+msgstr "Невідома помилка, пароль не змінився!"
+
+msgid "Unmanaged"
+msgstr "Некерований"
+
+msgid "Unsaved Changes"
+msgstr "Незбережені зміни"
+
+msgid "Unsupported protocol type."
+msgstr "Непідтримуваний тип протоколу."
+
+msgid "Update lists"
+msgstr "Оновити списки..."
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"Відвантажити sysupgrade-сумісний образ, щоб замінити поточну прошивку. Для "
+"збереження поточної конфігурації встановіть прапорець \"Зберегти настройки"
+"\" (потрібен libreCMC-сумісний образ прошивки)."
+
+msgid "Upload archive..."
+msgstr "Відвантажити архів..."
+
+msgid "Uploaded File"
+msgstr "Відвантажений файл"
+
+msgid "Uptime"
+msgstr "Час безперервної роботи"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Використовувати <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "Використовувати DHCP-шлюз"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "Використовувати DNS-сервери, оголошувані вузлом"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "Використовуйте коди країн згідно ISO/IEC 3166 alpha2."
+
+msgid "Use MTU on tunnel interface"
+msgstr "Використовувати на тунельному інтерфейсі MTU"
+
+msgid "Use TTL on tunnel interface"
+msgstr "Використовувати на тунельному інтерфейсі TTL"
+
+msgid "Use as root filesystem"
+msgstr "Використовувати як кореневу файлову систему"
+
+msgid "Use broadcast flag"
+msgstr "Використовувати прапорець широкомовності"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "Використовувати особливі DNS-сервери"
+
+msgid "Use default gateway"
+msgstr "Використовувати типовий шлюз"
+
+msgid "Use gateway metric"
+msgstr "Використовувати метрику шлюзу"
+
+msgid "Use routing table"
+msgstr "Використовувати таблицю маршрутизації"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"Використовуйте кнопку <em>Додати</em>, щоб додати новий запис оренди. "
+"<em>MAC-адреса</em> ідентифікує вузол, <em>IPv4-адреса</em> визначає "
+"фіксовану адресу, яка буде використовуватися, а <em>Назва (ім'я) вузла</em> "
+"призначає символічне ім'я вузла."
+
+msgid "Used"
+msgstr "Використано"
+
+msgid "Used Key Slot"
+msgstr "Використовується слот ключа"
+
+msgid "Username"
+msgstr "Ім'я користувача"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "VLAN-інтерфейс"
+
+msgid "VLANs on %q"
+msgstr "VLAN на %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLAN на %q (%s)"
+
+msgid "VPN Server"
+msgstr "VPN-сервер"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "Клас постачальника для відправки при запиті DHCP"
+
+msgid "Verify"
+msgstr "Перевірте"
+
+msgid "Version"
+msgstr "Версія"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "Відкрита система WEP"
+
+msgid "WEP Shared Key"
+msgstr "Спільний ключ WEP"
+
+msgid "WEP passphrase"
+msgstr "Парольна фраза WEP"
+
+msgid "WMM Mode"
+msgstr "Режим WMM"
+
+msgid "WPA passphrase"
+msgstr "Парольна фраза WPA"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA-шифрування потребує інсталяції <em>wpa_supplicant</em> (для режиму "
+"клієнта) або <em>hostapd</em> (для Точки доступу та режиму ad-hoc)."
+
+msgid "Waiting for changes to be applied..."
+msgstr "Очікуємо, доки зміни наберуть чинності..."
+
+msgid "Waiting for command to complete..."
+msgstr "Очікуємо завершення виконання команди..."
+
+msgid "Warning"
+msgstr "Застереження"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "Увага: Є незбережені зміни, які будуть втрачені при перезавантаженні!"
+
+msgid "Wifi"
+msgstr "Wi-Fi"
+
+msgid "Wireless"
+msgstr "Бездротові мережі"
+
+msgid "Wireless Adapter"
+msgstr "Бездротовий адаптер"
+
+msgid "Wireless Network"
+msgstr "Бездротова мережа"
+
+msgid "Wireless Overview"
+msgstr "Огляд бездротових мереж"
+
+msgid "Wireless Security"
+msgstr "Безпека бездротової мережі"
+
+msgid "Wireless is disabled or not associated"
+msgstr "Бездротову мережу вимкнено або не пов'язано"
+
+msgid "Wireless is restarting..."
+msgstr "Бездротова мережа перезапускається..."
+
+msgid "Wireless network is disabled"
+msgstr "Бездротова мережа вимкнена"
+
+msgid "Wireless network is enabled"
+msgstr "Бездротова мережа ввімкнена"
+
+msgid "Wireless restarted"
+msgstr "Бездротова мережа перезапущена"
+
+msgid "Wireless shut down"
+msgstr "Бездротова мережа припинила роботу"
+
+msgid "Write received DNS requests to syslog"
+msgstr "Записувати отримані DNS-запити до системного журналу"
+
+msgid "XR Support"
+msgstr "Підтримка XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Тут ви можете увімкнути або вимкнути інстальовані скрипти ініціалізації. "
+"Зміни набудуть чинності після перезавантаження пристрою.<br /><strong>Увага: "
+"Якщо ви вимкнете основний скрипт ініціалізації (наприклад \"network\"), "
+"пристрій може стати недоступним!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+"Ви повинні увімкнути Java Script у вашому браузері, або LuCI не буде "
+"працювати належним чином."
+
+msgid "any"
+msgstr "будь-який"
+
+msgid "auto"
+msgstr "авто"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "зв'язано"
+
+msgid "create:"
+msgstr "створити:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "Створити міст через вказаний інтерфейс(и)"
+
+msgid "dB"
+msgstr "дБ"
+
+msgid "dBm"
+msgstr "дБм"
+
+msgid "disable"
+msgstr "вимкнено"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "минув"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"Файл, де зберігаються видані <abbr title=\"Dynamic Host Configuration "
+"Protocol — протокол динамічної конфігурації вузла\">DHCP</abbr>-оренди"
+
+msgid "forward"
+msgstr "переслати"
+
+msgid "full-duplex"
+msgstr "повний дуплекс"
+
+msgid "half-duplex"
+msgstr "напівдуплекс"
+
+msgid "help"
+msgstr "довідка"
+
+msgid "hidden"
+msgstr "прихований"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "якщо мета — мережа"
+
+msgid "input"
+msgstr "вхід"
+
+msgid "kB"
+msgstr "КБ"
+
+msgid "kB/s"
+msgstr "КБ/с"
+
+msgid "kbit/s"
+msgstr "Кбіт/с"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr ""
+"Локальний <abbr title=\"Domain Name System — система доменних імен\">DNS</"
+"abbr>-файл"
+
+msgid "no"
+msgstr "ні"
+
+msgid "no link"
+msgstr "нема з'єднання"
+
+msgid "none"
+msgstr "нема нічого"
+
+msgid "off"
+msgstr "вимкнено"
+
+msgid "on"
+msgstr "увімкнено"
+
+msgid "open"
+msgstr "відкрита"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "спрямовано"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "з позначкою"
+
+msgid "unknown"
+msgstr "невідомий"
+
+msgid "unlimited"
+msgstr "необмежений"
+
+msgid "unspecified"
+msgstr "не визначено"
+
+msgid "unspecified -or- create:"
+msgstr "не визначено -або- створити"
+
+msgid "untagged"
+msgstr "без позначки"
+
+msgid "yes"
+msgstr "так"
+
+msgid "« Back"
+msgstr "« Назад"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "Ідентифікатор користувача HE.net"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr ""
+#~ "Це 32-байтний шістнадцятковий закодований ідентифікатор користувача, не "
+#~ "ім'я для входу"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz (2-й канал вище)"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz (2-й канал нижче)"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "Отримувати оголошення маршрутизатора"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "Оголошувати IPv6 у мережі"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "Оголошуваний ідентифікатор мережі"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "Допустимий діапазон — від 1 до 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT-можливості"
+
+#~ msgid "HT mode"
+#~ msgstr "HT-режим"
+
+#~ msgid "Router Model"
+#~ msgstr "Модель маршрутизатора"
+
+#~ msgid "Router Name"
+#~ msgstr "Назва (ім'я) маршрутизатора"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "Надсилати клопотання маршрутизатора"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "Визначає час життя оголошеного рекомендованого префіксу в секундах"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "Визначає час життя оголошеного чинного префіксу в секундах"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "Використовувати час життя рекомендованого"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "Використовувати час життя чинного"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "Очікування маршрутизатора..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "Увімкнути вбудований NTP-сервер"
+
+#~ msgid "Active Leases"
+#~ msgstr "Активні оренди"
+
+#~ msgid "Open"
+#~ msgstr "Відкрити"
+
+#~ msgid "Bit Rate"
+#~ msgstr "Швидкість передачі даних"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "Конфігурація / Застосування змін"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "Конфігурація / Зміни"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "Конфігурація / Скасування змін"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "MAC-адреса"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Зашифровано\">Зашифр.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr ""
+#~ "<abbr title=\"Wireless Local Area Network — бездротова локальна мережа"
+#~ "\">WLAN</abbr>-сканування"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "Оберіть мережу, яку ви хочете прикріпити до цього бездротового "
+#~ "інтерфейсу. Виберіть <em>не визначено</em>, щоб не прикріпляти ніякої "
+#~ "мережі, або заповніть поле <em>створити</em>, щоб визначити нову мережу."
+
+#~ msgid "Create Network"
+#~ msgstr "Створити мережу"
+
+#~ msgid "Link"
+#~ msgstr "З'єднання"
+
+#~ msgid "Networks"
+#~ msgstr "Мережі"
+
+#~ msgid "Power"
+#~ msgstr "Потужність"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Wi-Fi мережі у вашому оточенні"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing — безкласова міждоменна "
+#~ "маршрутизація\">CIDR</abbr>-запис: адреса/префікс "
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr ""
+#~ "<abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
+#~ "сервер"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-широкомовний"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Інтернет-протокол версії 6\">IPv6</abbr>-адреса"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "IP-псевдоніми"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "Настройки IPv6"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Примітка: Якщо ви тут оберете інтерфейс, який є частиною іншої мережі, "
+#~ "він буде переміщений до цієї мережі."
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Дійсно видалити цей інтерфейс? Скасувати видалення неможливо!\\nВи можете "
+#~ "втратити доступ до цього маршрутизатора, якщо ваш комп'ютер підключений "
+#~ "через цей інтерфейс."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Дійсно видалити цю бездротову мережу? Скасувати видалення неможливо!\\nВи "
+#~ "можете втратити доступ до цього маршрутизатора, якщо ваш комп'ютер "
+#~ "підключений через цю мережу."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Дійсно вимкнути інтерфейс \"%s\"?\\nВи можете втратити доступ до цього "
+#~ "маршрутизатора, якщо ваш комп'ютер підключений через цей інтерфейс."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Дійсно вимкнути мережу?\\nВи можете втратити доступ до цього "
+#~ "маршрутизатора, якщо ваш комп'ютер підключений через цей інтерфейс."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Мережеві порти вашого маршрутизатора можуть бути об'єднані у декілька "
+#~ "<abbr title=\"Virtual Local Area Network — віртуальна локальна "
+#~ "комп'ютерна мережа\">VLAN</abbr>, у яких комп'ютери можуть напряму "
+#~ "спілкуватися один з одним. <abbr title=\"Virtual Local Area Network — "
+#~ "віртуальна локальна комп'ютерна мережа\">VLAN</abbr> часто "
+#~ "використовуються для розділення мережі на окремі сегменти. Зазвичай один "
+#~ "вихідний порт використовується для з'єднання з більшою мережею, такою "
+#~ "наприклад, як Інтернет, а інші порти — для локальної мережі."
+
+#~ msgid "Enable buffering"
+#~ msgstr "Увімкнути буферизацію"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6 через IPv4"
diff --git a/trunk/package/luci/po/uk/commands.po b/trunk/package/luci/po/uk/commands.po
new file mode 100644
index 00000000..74a19f37
--- /dev/null
+++ b/trunk/package/luci/po/uk/commands.po
@@ -0,0 +1,103 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-14 12:14+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#, fuzzy
+msgid "A short textual description of the configured command"
+msgstr "Короткий опис команд налаштування"
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+#, fuzzy
+msgid "Arguments:"
+msgstr "Аргументи:"
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr "Код:"
+
+msgid "Collecting data..."
+msgstr "Збирання даних..."
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr "Команда не виконана"
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr "Конфігурація"
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+#, fuzzy
+msgid "Dashboard"
+msgstr "Панель керування"
+
+msgid "Description"
+msgstr "Опис"
+
+msgid "Download"
+msgstr "Завантажити"
+
+#, fuzzy
+msgid "Failed to execute command!"
+msgstr "Помилка під час запуску команди!"
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr "Триває завантаження"
+
+msgid "Public access"
+msgstr "Відкритий доступ"
+
+msgid "Run"
+msgstr "Запустити"
+
+#, fuzzy
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+"Ця сторінка дозволяє налаштувати користувацькі команди оболонки, яка може "
+"бути легко запущена з веб-інтерфейсу."
+
+#, fuzzy
+msgid "Waiting for command to complete..."
+msgstr "Очікування завершення команди..."
diff --git a/trunk/package/luci/po/uk/coovachilli.po b/trunk/package/luci/po/uk/coovachilli.po
new file mode 100644
index 00000000..07ffc556
--- /dev/null
+++ b/trunk/package/luci/po/uk/coovachilli.po
@@ -0,0 +1,27 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-12-29 13:00+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr "Конфігурація мережі"
+
+msgid "RADIUS configuration"
+msgstr "Конфігурація RADIUS"
+
+msgid "UAM and MAC Authentication"
+msgstr "Автентифікація через UAM і MAC"
diff --git a/trunk/package/luci/po/uk/ddns.po b/trunk/package/luci/po/uk/ddns.po
new file mode 100644
index 00000000..ba94cdff
--- /dev/null
+++ b/trunk/package/luci/po/uk/ddns.po
@@ -0,0 +1,92 @@
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2012-12-29 12:47+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "Перевіряти, чи змінилася IP-адреса кожні"
+
+msgid "Check-time unit"
+msgstr "Одиниця часу перевірки"
+
+msgid "Custom update-URL"
+msgstr "Користувацький URL оновлення"
+
+msgid "Dynamic DNS"
+msgstr "Динамічний DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Динамічний DNS дозволяє вашому маршрутизатору бути доступним за фіксованим "
+"доменним ім'ям, маючи динамічну IP-адресу."
+
+msgid "Enable"
+msgstr "Увімкнути"
+
+msgid "Force update every"
+msgstr "Примусово оновлювати кожні"
+
+msgid "Force-time unit"
+msgstr "Одиниця часу оновлення"
+
+msgid "Hostname"
+msgstr "Ім'я вузла"
+
+msgid "Interface"
+msgstr "Інтерфейс"
+
+msgid "Network"
+msgstr "Мережа"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Service"
+msgstr "Сервіс"
+
+msgid "Source of IP address"
+msgstr "Джерело IP-адреси"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "Ім'я користувача"
+
+msgid "custom"
+msgstr "користувацький"
+
+# Hours
+msgid "h"
+msgstr "г"
+
+msgid "interface"
+msgstr "інтерфейс"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "хв"
+
+msgid "network"
+msgstr "мережа"
+
+#~ msgid "Event interface"
+#~ msgstr "Інтерфейс події"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "При вмиканні якого інтерфейсу має запускатися процес скрипта DDNS."
diff --git a/trunk/package/luci/po/uk/diag_core.po b/trunk/package/luci/po/uk/diag_core.po
new file mode 100644
index 00000000..eae98867
--- /dev/null
+++ b/trunk/package/luci/po/uk/diag_core.po
@@ -0,0 +1,40 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-26 17:55+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "Конфігурування діагностики"
+
+msgid "Diagnostics"
+msgstr "Діагностика"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+"Доступні в цьому меню види діагностики залежать від того, які модулі "
+"інстальовані на вашому пристроі."
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+"Пункти меню дозволяють виконувати діагностичні тести на вашій системі, щоб "
+"допомогти при усуненні неполадок."
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
+"Використовуючи це меню, ви можете сконфігурувати діагностику мережі, "
+"наприклад, сканування мережевих пристроїв та пінг-тести."
diff --git a/trunk/package/luci/po/uk/diag_devinfo.po b/trunk/package/luci/po/uk/diag_devinfo.po
new file mode 100644
index 00000000..03f49eb0
--- /dev/null
+++ b/trunk/package/luci/po/uk/diag_devinfo.po
@@ -0,0 +1,219 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-13 15:23+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr "Додати"
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr "Конфігурація"
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr "Вилучити"
+
+msgid "Device Scan Config"
+msgstr "Конфігурація пристрою сканування"
+
+msgid "Device Type"
+msgstr "Тип пристрою"
+
+msgid "Devices discovered for"
+msgstr "Виявленні пристрої на"
+
+msgid "Devices on Network"
+msgstr "Пристрої в мережі"
+
+msgid "Edit"
+msgstr "Редагувати"
+
+msgid "Enable"
+msgstr "Активувати"
+
+msgid "End of MAC address range"
+msgstr ""
+
+#, fuzzy
+msgid "Go to relevant configuration page"
+msgstr "Перейти до відповідної сторінки конфігурації"
+
+msgid "IP Address"
+msgstr "IP-адреса"
+
+msgid "Interface"
+msgstr "Інтерфейс"
+
+msgid "Invalid"
+msgstr "Несправність"
+
+msgid "Link to Device"
+msgstr "Посилання на пристрій"
+
+msgid "MAC Address"
+msgstr "MAC-адреса"
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr "Модель"
+
+msgid "Name"
+msgstr "Назва"
+
+msgid "Network Device Scan"
+msgstr "Сканування мережевих пристроїв"
+
+msgid "Network Device Scanning Configuration"
+msgstr "Мережевий Пристрій Конфігурація Сканування"
+
+#, fuzzy
+msgid "Networks to scan for devices"
+msgstr "Мережі для сканування пристроїв"
+
+#, fuzzy
+msgid "Networks to scan for supported devices"
+msgstr "Мережі для пошуку підтримуваних пристроїв"
+
+msgid "No SIP devices"
+msgstr "Немає SIP пристроїв"
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr "Конфігурація Сканування"
+
+#, fuzzy
+msgid "Scans for devices on specified networks."
+msgstr "Сканування пристроїв у вказаних мережах."
+
+#, fuzzy
+msgid "Sleep Between Requests"
+msgstr "Сон між запитами"
+
+#, fuzzy
+msgid "Subnet"
+msgstr "Підмережі"
+
+#, fuzzy
+msgid "This section contains no values yet"
+msgstr "Цей розділ ще не містить значень"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "Час очікування відповіді в секундах (типово 10)"
+
+#, fuzzy
+msgid "Timeout"
+msgstr "Затримка"
+
+#, fuzzy
+msgid "Use Configuration"
+msgstr "Використання конфігурації"
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr "перевірити інші мережі"
diff --git a/trunk/package/luci/po/uk/ffwizard.po b/trunk/package/luci/po/uk/ffwizard.po
new file mode 100644
index 00000000..c5455efe
--- /dev/null
+++ b/trunk/package/luci/po/uk/ffwizard.po
@@ -0,0 +1,163 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-26 18:16+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr "Настроювання мережі"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Password confirmation"
+msgstr "Підтвердження пароля"
+
+msgid "Password successfully changed"
+msgstr "Пароль успішно змінено"
+
+msgid "Protect LAN"
+msgstr "Захистити LAN"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr "Невідома помилка"
+
+msgid "Username"
+msgstr "Ім'я користувача"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "Віртуальна точка доступу (VAP)"
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "Ваш пристрій і сусідні вузли мають використовувати один і той же канал."
+
+msgid "dhcp"
+msgstr "DHCP"
+
+msgid "kbit/s"
+msgstr "Кбіт/с"
+
+msgid "static"
+msgstr "статична"
+
+msgid "Configure this interface."
+msgstr "Сконфігурувати цей інтерфейс."
+
+msgid "recommended"
+msgstr "рекомендовано"
+
+msgid "Basic settings"
+msgstr "Основні параметри"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "Основні параметри є неповними. Перейдіть до"
+
+msgid "Error"
+msgstr "Помилка"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/uk/firewall.po b/trunk/package/luci/po/uk/firewall.po
new file mode 100644
index 00000000..37053065
--- /dev/null
+++ b/trunk/package/luci/po/uk/firewall.po
@@ -0,0 +1,619 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-12-29 12:53+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s у %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s із %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s у %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(Запис без імені)"
+
+msgid "(Unnamed Rule)"
+msgstr "(Правило без імені)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT без імені)"
+
+msgid "-- Please choose --"
+msgstr "-- Виберіть --"
+
+msgid "-- custom --"
+msgstr "-- додатково --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> пакетів за <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> пакетів за <var>%s</var>, підряд <var>%d</var> пакетів"
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> з лімітом %s"
+
+msgid "Action"
+msgstr "Дія"
+
+msgid "Add"
+msgstr "Додати"
+
+msgid "Add and edit..."
+msgstr "Додати та редагувати..."
+
+msgid "Advanced Settings"
+msgstr "Розширені настройки"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "Дозволити спрямовування від <em>зон-джерел</em>:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "Дозволити спрямовування до <em>зон призначення</em>:"
+
+msgid "Any"
+msgstr "Будь-який"
+
+msgid "Covered networks"
+msgstr "Покриті мережі"
+
+msgid "Custom Rules"
+msgstr "Настроювані правила"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"Настроювані правила дозволяють виконувати довільні команди <em>iptables</"
+"em>, які в іншому випадку не охоплені в межах брандмауера. Команди "
+"виконуються після кожного перезавантаження брандмауера, відразу після "
+"завантаження типового набору правил."
+
+msgid "Destination IP address"
+msgstr "IP-адреса призначення"
+
+msgid "Destination address"
+msgstr "Адреса призначення"
+
+msgid "Destination port"
+msgstr "Порт призначення"
+
+msgid "Destination zone"
+msgstr "Зона призначення"
+
+msgid "Do not rewrite"
+msgstr "Не перезаписувати"
+
+msgid "Drop invalid packets"
+msgstr "Відкидати помилкові пакети"
+
+msgid "Enable"
+msgstr "Увімкнути"
+
+msgid "Enable NAT Loopback"
+msgstr "Увімкнути NAT Loopback"
+
+msgid "Enable SYN-flood protection"
+msgstr "Увімкнути захист від SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr "Увімкнути реєстрування у цій зоні"
+
+msgid "External IP address"
+msgstr "Зовнішня IP-адреса"
+
+msgid "External port"
+msgstr "Зовнішній порт"
+
+msgid "External zone"
+msgstr "Зовнішня зона"
+
+msgid "Extra arguments"
+msgstr "Додаткові аргументи"
+
+msgid "Firewall"
+msgstr "Брандмауер"
+
+msgid "Firewall - Custom Rules"
+msgstr "Брандмауер — Настроювані правила"
+
+msgid "Firewall - Port Forwards"
+msgstr "Брандмауер — Спрямовування портів"
+
+msgid "Firewall - Traffic Rules"
+msgstr "Брандмауер — Правила трафіка"
+
+msgid "Firewall - Zone Settings"
+msgstr "Брандмауер — Параметри зон"
+
+msgid "Force connection tracking"
+msgstr "Увімкнути відстеження з'єднань"
+
+msgid "Forward"
+msgstr "Спрямовування"
+
+msgid "Forward to"
+msgstr "спрямовування до"
+
+msgid "From %s in %s"
+msgstr "%s у %s"
+
+msgid "From %s in %s with source %s"
+msgstr "%s у %s з вихідним %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "%s у %s з вихідним %s та %s"
+
+msgid "General Settings"
+msgstr "Загальні настройки"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 та IPv6"
+
+msgid "IPv4 only"
+msgstr "Лише IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "Лише IPv6"
+
+msgid "Input"
+msgstr "Вхідний"
+
+msgid "Inter-Zone Forwarding"
+msgstr "Спрямовування крізь зони"
+
+msgid "Internal IP address"
+msgstr "Внутрішня IP-адреса"
+
+msgid "Internal port"
+msgstr "Внутрішній порт"
+
+msgid "Internal zone"
+msgstr "Внутрішня зона"
+
+msgid "Limit log messages"
+msgstr "Обмеження повідомлень журналу"
+
+msgid "MSS clamping"
+msgstr "Затискання MSS"
+
+msgid "Masquerading"
+msgstr "Підміна"
+
+msgid "Match"
+msgstr "Зіставляти"
+
+msgid "Match ICMP type"
+msgstr "Зіставляти ICMP типу"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Зіставляти трафік, що спрямовується на заданий порт призначення або діапазон "
+"портів."
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Зіставляти вхідний трафік, спрямований на заданий порт призначення або "
+"діапазон портів цього вузла."
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Зіставляти вхідний трафік, що виникає на заданому порту джерела або "
+"діапазоні портів вузла клієнта."
+
+msgid "Name"
+msgstr "Ім'я"
+
+msgid "New SNAT rule"
+msgstr "Нове правило SNAT"
+
+msgid "New forward rule"
+msgstr "Нове правило спрямовування"
+
+msgid "New input rule"
+msgstr "Нове вхідне правило"
+
+msgid "New port forward"
+msgstr "Нове спрямовування порту"
+
+msgid "New source NAT"
+msgstr "Новий NAT джерела"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "Зіставляти тільки вхідний трафік, спрямований на задану IP-адресу."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "Зіставляти тільки вхідний трафік від цих MAC-адрес."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "Зіставляти тільки вхідний трафік від цього IP чи діапазону."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+"Зіставляти тільки вхідний трафік, що виникає на заданому порту джерела або "
+"діапазоні портів вузла клієнта."
+
+msgid "Open ports on router"
+msgstr "Відкрити порти на роутері"
+
+msgid "Other..."
+msgstr "Інше..."
+
+msgid "Output"
+msgstr "Вихідний"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+"Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
+
+msgid "Port Forwards"
+msgstr "Спрямовування портів"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+"Спрямовування портів дозволяє віддаленим комп'ютерам з Інтернету "
+"підключатися до певного комп'ютера або служби у приватній мережі."
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Переспрямувати відповідний вхідний трафік на заданий порт внутрішнього вузла"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "Обмежити підміну заданими підмережами призначення"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "Обмежити підміну заданими вихідними підмережами"
+
+msgid "Restrict to address family"
+msgstr "Обмежити сімейство протоколів"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "Переписувати зіставлений трафік на вказану адресу."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Переписувати зіставлений трафік на вказаний порт джерела. Може залишатися "
+"порожнім, щоб переписувати тільки IP-адресу."
+
+msgid "Rewrite to source %s"
+msgstr "перезапис на вихідний %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "перезапис на вихідний %s, %s"
+
+msgid "SNAT IP address"
+msgstr "IP-адреса SNAT"
+
+msgid "SNAT port"
+msgstr "Порт SNAT"
+
+msgid "Source IP address"
+msgstr "IP-адреса джерела"
+
+msgid "Source MAC address"
+msgstr "MAC-адреса джерела"
+
+msgid "Source NAT"
+msgstr "NAT джерела"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"NAT джерела є специфічною формою маскування, яка дозволяє мати детальний "
+"контроль над IP джерела, що використовуються для вихідного трафіку, "
+"наприклад, для зіставлення кількох WAN-адрес внутрішнім підмережам."
+
+msgid "Source address"
+msgstr "Адреса джерела"
+
+msgid "Source port"
+msgstr "Порт джерела"
+
+msgid "Source zone"
+msgstr "Зона-джерело"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
+"потоком мережевого трафіку."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"Опції, наведені нижче, управляють політиками спрямовування між цією (%s) та "
+"іншими зонами. <em>Зони призначення</em> покриваються трафіком, що "
+"<strong>виходить з %q</strong>. <em>Зони-джерела</em> покриваються трафіком "
+"з інших зон, <strong>спрямованим на %q</strong>. Правила спрямування є "
+"<em>односпрямованим</em>, тобто, спрямування від LAN до WAN <em>не</em> "
+"означає, що є також дозвіл спрямовувати від WAN в LAN."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"На цій сторінці можна змінити додаткові властивості елемента спрямовування "
+"портів. У більшості випадків змінювати ці параметри немає необхідності."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"На цій сторінці можна змінити додаткові властивості елемента правил трафіка, "
+"таких як відповідні параметри джерела та вузлів призначення."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"Цей розділ визначає загальні властивості %q. Параметри <em>вхідний</em> і "
+"<em>вихідний</em> задають типову політику для трафіку на вході й виході з "
+"цієї зони, а параметр \"спрямовування\" описує політику спрямовування "
+"трафіку між різними мережами в межах зони. Пункт <em>вкриті мережі</em> "
+"визначає, які доступні мережі є членами цієї зони."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "%s на %s <var>цього пристрою</var>"
+
+msgid "To %s in %s"
+msgstr "%s у %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "%s на <var>цього пристрою</var>"
+
+msgid "To %s, %s in %s"
+msgstr "%s, %s у %s"
+
+msgid "To source IP"
+msgstr "До IP джерела"
+
+msgid "To source port"
+msgstr "До порту джерела"
+
+msgid "Traffic Rules"
+msgstr "Правила трафіка"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"Правила трафіка визначають політику для пакетів, що пересилаються між "
+"різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
+"порти WAN на маршрутизаторі."
+
+msgid "Via %s"
+msgstr "Через %s"
+
+msgid "Via %s at %s"
+msgstr "Через %s на %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Ви можете вказати кілька протоколів, вибравши \"-- додатково --\", а потім "
+"увівши їх, розділяючи пробілами."
+
+msgid "Zone %q"
+msgstr "Зона %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "Зона ⇒ Спрямовування"
+
+msgid "Zones"
+msgstr "Зони"
+
+msgid "accept"
+msgstr "приймати"
+
+msgid "any"
+msgstr "будь-який"
+
+msgid "any host"
+msgstr "будь-який вузол"
+
+msgid "any router IP"
+msgstr "будь-який IP роутера"
+
+msgid "any zone"
+msgstr "будь-якій зоні"
+
+msgid "don't track"
+msgstr "не відстеж."
+
+msgid "drop"
+msgstr "опускати"
+
+msgid "reject"
+msgstr "відкидати"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Призначення"
+
+#~ msgid "Family"
+#~ msgstr "Сімейство"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "спрямовування до %s у %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "спрямовування до %s, %s у %s"
+
+#~ msgid "SNAT"
+#~ msgstr "SNAT"
+
+#~ msgid "Source"
+#~ msgstr "Джерело"
+
+#~ msgid "To %s"
+#~ msgstr "%s"
+
+#~ msgid "To %s at %s"
+#~ msgstr "%s через %s"
+
+#~ msgid "Via"
+#~ msgstr "Через"
+
+#~ msgid "Accept forward"
+#~ msgstr "Приймати спрямовування"
+
+#~ msgid "Accept input"
+#~ msgstr "Приймати вхідні"
+
+#~ msgid "Disable"
+#~ msgstr "Вимкнути"
+
+#~ msgid "Discard forward"
+#~ msgstr "Скасувати спрямовування"
+
+#~ msgid "Discard input"
+#~ msgstr "Скасувати введення"
+
+#~ msgid "Do not track forward"
+#~ msgstr "Не відстежувати спрямовування"
+
+#~ msgid "Do not track input"
+#~ msgstr "Не відстежувати введення"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "діапазон IP"
+
+#~ msgid "IPs"
+#~ msgstr "IP"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MACs"
+#~ msgstr "MAC"
+
+#~ msgid "Refuse forward"
+#~ msgstr "Відкидати спрямовування"
+
+#~ msgid "Refuse input"
+#~ msgstr "Відкидати вхідні дані"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Правило вимкнене"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Правило ввімкнене"
+
+#~ msgid "day"
+#~ msgstr "день"
+
+#~ msgid "hour"
+#~ msgstr "годину"
+
+#~ msgid "minute"
+#~ msgstr "хвилину"
+
+#~ msgid "not"
+#~ msgstr "не"
+
+#~ msgid "port"
+#~ msgstr "порт"
+
+#~ msgid "ports"
+#~ msgstr "порти"
+
+#~ msgid "second"
+#~ msgstr "секунду"
+
+#~ msgid "type"
+#~ msgstr "типом"
+
+#~ msgid "types"
+#~ msgstr "типами"
+
+#~ msgid "(optional)"
+#~ msgstr "(необов'язково)"
+
+#~ msgid "Intended destination address"
+#~ msgstr "Адреса призначення"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Внутрішній порт (необов'язково)"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Додаткові параметри"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Розширені правила"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Розширені правила дозволяють налаштувати брандмауер для ваших потреб. "
+#~ "Лише нові з'єднання будуть узгоджені. Пакети, що належать вже відкриті "
+#~ "з'єднання автоматично пропускаються брандмауером."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Користувацькі правила (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Пристрій"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Для DNAT узгоджує вхідний трафік, спрямований до відповідної IP адреси "
+#~ "призначення. Для SNAT заміняє адресу джерела на дану адресу"
diff --git a/trunk/package/luci/po/uk/freifunk-policyrouting.po b/trunk/package/luci/po/uk/freifunk-policyrouting.po
new file mode 100644
index 00000000..e4cc687e
--- /dev/null
+++ b/trunk/package/luci/po/uk/freifunk-policyrouting.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-13 16:14+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#, fuzzy
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+"Весь трафік з інтерфейсів, прив'язаних до цих зон буде відправлений через "
+"шлюз в комірчасті мережі."
+
+#, fuzzy
+msgid "Enable Policy Routing"
+msgstr "Активувати політику маршрутизації"
+
+msgid "Fallback to mesh"
+msgstr ""
+
+#, fuzzy
+msgid "Firewall zones"
+msgstr "Зона фаєрволу"
+
+#, fuzzy
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"Якщо маршрут типово не буде отриманий з сітки мережі, то трафік, який "
+"належить до вибраної зони фаєрволу прямує через ваше інтернет-з'єднання в "
+"якості запасного варіанту. Якщо ви не хочете цього, а замість цього, що "
+"блокувати трафік, то ви повинні вибрати цю опцію."
+
+#, fuzzy
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+"Якщо ваш шлюз недоступний, то відбувається повернення до основного шлюзу "
+"сітки."
+
+msgid "Policy Routing"
+msgstr "Політика маршрутизації"
+
+msgid "Strict Filtering"
+msgstr "Жорстка фільтрація"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"Ці сторінки можна використовувати для налаштування політики маршрутизації "
+"для певних зон фаєрволу. Це корисно, якщо вам потрібно використовувати своє "
+"власне інтернет-з'єднання для себе, і ви не хочете ділитися ним з іншими "
+"людьми (ось чому воно також називатися 'Его режим '). Ваш власний трафік "
+"потім відправлений через ваше інтернет-з'єднання в той час як трафік, "
+"витікаючий із мережі буде використовувати інший шлюз у мережі."
diff --git a/trunk/package/luci/po/uk/freifunk.po b/trunk/package/luci/po/uk/freifunk.po
new file mode 100644
index 00000000..5abfa11c
--- /dev/null
+++ b/trunk/package/luci/po/uk/freifunk.po
@@ -0,0 +1,393 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/hd_idle.po b/trunk/package/luci/po/uk/hd_idle.po
new file mode 100644
index 00000000..e84f770f
--- /dev/null
+++ b/trunk/package/luci/po/uk/hd_idle.po
@@ -0,0 +1,52 @@
+# Generated from applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2013-08-13 15:59+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "Диск"
+
+msgid "Enable"
+msgstr "Активувати"
+
+msgid "Enable debug"
+msgstr "Активувати налагодження"
+
+msgid "Idle-time"
+msgstr "Час простою"
+
+msgid "Idle-time unit"
+msgstr ""
+
+msgid "Settings"
+msgstr "Налаштування"
+
+# Hours
+msgid "h"
+msgstr ""
+
+#, fuzzy
+msgid "hd-idle"
+msgstr "HD-простій"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "хв"
diff --git a/trunk/package/luci/po/uk/meshwizard.po b/trunk/package/luci/po/uk/meshwizard.po
new file mode 100644
index 00000000..9a317b7e
--- /dev/null
+++ b/trunk/package/luci/po/uk/meshwizard.po
@@ -0,0 +1,126 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-21 15:47+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr "DHCP IP-діапазон"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP автоматично призначить IP-адреси клієнтам"
+
+msgid "Enable DHCP"
+msgstr "Активувати DHCP"
+
+msgid "Enable RA"
+msgstr "Активувати RA"
+
+msgid "Enabled"
+msgstr "Активувати"
+
+msgid "General Settings"
+msgstr "Загальні налаштування"
+
+msgid "IPv6 Settings"
+msgstr "Налаштування IPv6"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Інтерфейси"
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr "Захист локальної мережі"
+
+#, fuzzy
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+"Оберіть це, щоб дозволити іншим використовувати з'єднання для доступу в "
+"Інтернет."
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/minidlna.po b/trunk/package/luci/po/uk/minidlna.po
new file mode 100644
index 00000000..7df732fb
--- /dev/null
+++ b/trunk/package/luci/po/uk/minidlna.po
@@ -0,0 +1,165 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/mmc_over_gpio.po b/trunk/package/luci/po/uk/mmc_over_gpio.po
new file mode 100644
index 00000000..e9b37f2b
--- /dev/null
+++ b/trunk/package/luci/po/uk/mmc_over_gpio.po
@@ -0,0 +1,42 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-12-29 13:06+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "Вивід ВCLK"
+
+msgid "CS_pin"
+msgstr "Вивід CS"
+
+msgid "DI_pin"
+msgstr "Вивід DI"
+
+msgid "DO_pin"
+msgstr "Вивід DO"
+
+msgid "Enable"
+msgstr "Увімкнути"
+
+msgid "MMC/SD driver configuration"
+msgstr "Конфігурація драйвера MMC/SD"
+
+msgid "Mode"
+msgstr "Режим"
+
+msgid "Name"
+msgstr "Ім'я"
+
+msgid "Settings"
+msgstr "Настройки"
diff --git a/trunk/package/luci/po/uk/multiwan.po b/trunk/package/luci/po/uk/multiwan.po
new file mode 100644
index 00000000..922b402c
--- /dev/null
+++ b/trunk/package/luci/po/uk/multiwan.po
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-21 15:52+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr "Автоматично"
+
+msgid "Collecting data..."
+msgstr "Збір даних..."
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr "DNS-сервер(и)"
+
+msgid "Default Route"
+msgstr "Типовий маршрут"
+
+msgid "Destination Address"
+msgstr "Адреса призначення"
+
+msgid "Disable"
+msgstr "Вимкнути"
+
+msgid "Enable"
+msgstr "Активувати"
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/ntpc.po b/trunk/package/luci/po/uk/ntpc.po
new file mode 100644
index 00000000..451f783f
--- /dev/null
+++ b/trunk/package/luci/po/uk/ntpc.po
@@ -0,0 +1,56 @@
+# Generated from applications/luci-ntpc/luasrc/model/cbi/ntpc/*.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-03-18 20:32+0200\n"
+"Last-Translator: YuriPet <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Clock Adjustment"
+msgstr "Коригування годинника"
+
+msgid "Count of time measurements"
+msgstr "Кількість вимірювань часу"
+
+msgid "Current system time"
+msgstr "Поточний системний час"
+
+msgid "General"
+msgstr "Загальне"
+
+msgid "Hostname"
+msgstr "Назва (ім'я) вузла"
+
+msgid "Offset frequency"
+msgstr "Зсув частоти"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Synchronizes the system time"
+msgstr "Синхронізація системного часу"
+
+msgid "Time Server"
+msgstr "Сервер часу"
+
+msgid "Time Servers"
+msgstr "Сервери часу"
+
+msgid "Time Synchronisation"
+msgstr "Синхронізація часу"
+
+msgid "Update interval (in seconds)"
+msgstr "Інтервал оновлення (в секундах)"
+
+msgid "empty = infinite"
+msgstr "пусто = нескінченно"
diff --git a/trunk/package/luci/po/uk/olsr.po b/trunk/package/luci/po/uk/olsr.po
new file mode 100644
index 00000000..d35fe317
--- /dev/null
+++ b/trunk/package/luci/po/uk/olsr.po
@@ -0,0 +1,688 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr ""
+
+msgid "FIB metric"
+msgstr ""
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+msgid "HNA6 Announcements"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/openvpn.po b/trunk/package/luci/po/uk/openvpn.po
new file mode 100644
index 00000000..129c5968
--- /dev/null
+++ b/trunk/package/luci/po/uk/openvpn.po
@@ -0,0 +1,550 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2011-11-30 09:14+0200\n"
+"Last-Translator: Pavel <pavel.gumenyuk@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr "Дозволити обмін трафіком між клієнтами"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Дозволити декілька клієнтів з однаковим сертифікатом"
+
+msgid "Allow only one session"
+msgstr "Дозволити лише одну сесію"
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/p2pblock.po b/trunk/package/luci/po/uk/p2pblock.po
new file mode 100644
index 00000000..3e7dff9f
--- /dev/null
+++ b/trunk/package/luci/po/uk/p2pblock.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-13 16:04+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "Загальний час"
+
+msgid "Enable P2P-Block"
+msgstr "Активувати блокування P2P"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Протокол Layer7"
+
+msgid "P2P-Block"
+msgstr "P2P блоковано"
+
+#, fuzzy
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"P2P-блокування являє собою механізм сірих списків для блокування різних "
+"рівний-однотипних протоколів для НЕ-білого списку клієнтів."
+
+msgid "Portrange"
+msgstr "Діапазон портів"
+
+msgid "Whitelisted IPs"
+msgstr "Білий список IP-адрес"
+
+msgid "seconds"
+msgstr "секунд"
diff --git a/trunk/package/luci/po/uk/p910nd.po b/trunk/package/luci/po/uk/p910nd.po
new file mode 100644
index 00000000..237054d2
--- /dev/null
+++ b/trunk/package/luci/po/uk/p910nd.po
@@ -0,0 +1,47 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-26 18:35+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "Двонаправлений режим"
+
+msgid "Device"
+msgstr "Пристрій"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Спочатку вам слід інсталювати пакети для підтримки USB (kmod-usb-printer) "
+"або паралельного порту (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Settings"
+msgstr "Параметри"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "Порт TCP, що прослуховується"
+
+msgid "enable"
+msgstr "Увімкнути"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - сервер друку"
diff --git a/trunk/package/luci/po/uk/pbx-voicemail.po b/trunk/package/luci/po/uk/pbx-voicemail.po
new file mode 100644
index 00000000..56541837
--- /dev/null
+++ b/trunk/package/luci/po/uk/pbx-voicemail.po
@@ -0,0 +1,89 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/uk/pbx.po b/trunk/package/luci/po/uk/pbx.po
new file mode 100644
index 00000000..d65a7844
--- /dev/null
+++ b/trunk/package/luci/po/uk/pbx.po
@@ -0,0 +1,501 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-13 15:47+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Розширені налаштування"
+
+msgid "Available"
+msgstr "Доступний"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+"Намагайтеся не використовувати нічого, крім алфавітно-цифрових символів, "
+"пропусків, ком і крапок."
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr "Маршрутизація Викликів"
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr "Виклик через номери"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+#, fuzzy
+msgid "Do Not Disturb"
+msgstr "Не турбувати"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+#, fuzzy
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "Динамічний список небажаних дзвінків"
+
+msgid "Email"
+msgstr "Електронна скринька"
+
+#, fuzzy
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "Активувати вхідні дзвінки (зареєструватися через SIP)"
+
+#, fuzzy
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "Активувати вхідні дзвінки (Встановити низький статус)"
+
+msgid "Enable Outgoing Calls"
+msgstr "Активувати вихідні виклики"
+
+msgid "Enabled"
+msgstr "Активувати"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"Введіть цей IP (або IP:порт) Сервера/Реєстратор налаштування SIP пристрою ви "
+"будете використовувати тільки локально й ніколи з віддаленого місця."
+
+#, fuzzy
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"Введіть це хост ім'я (або ім'я хоста:порт) сервер/Реєстратор налаштування "
+"SIP пристрою ви будете використовувати з віддаленого місця розташування "
+"(воно також буде працювати локально)."
+
+msgid "External SIP Port"
+msgstr "Зовнішній порт SIP"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "Повне Ім'я"
+
+msgid "General Settings"
+msgstr "Загальні Налаштування"
+
+msgid "Google Accounts"
+msgstr "Облікові записи Google"
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr "Ні"
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr "Облікові записи користувачів"
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr "Ім'я користувача"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "Так"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/uk/polipo.po b/trunk/package/luci/po/uk/polipo.po
new file mode 100644
index 00000000..9b1b637b
--- /dev/null
+++ b/trunk/package/luci/po/uk/polipo.po
@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-09-21 15:36+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "Додаткові налаштування"
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+
+msgid "Configuration"
+msgstr "Конфігурація"
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr ""
+
+msgid "Delete cache files time"
+msgstr ""
+
+msgid "Disk cache location"
+msgstr ""
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr ""
+
+msgid "First PMM segment size (in bytes)"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+
+msgid "Log file location"
+msgstr ""
+
+msgid "Log to syslog"
+msgstr ""
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr ""
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/qos.po b/trunk/package/luci/po/uk/qos.po
new file mode 100644
index 00000000..d48100b1
--- /dev/null
+++ b/trunk/package/luci/po/uk/qos.po
@@ -0,0 +1,110 @@
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2013-08-13 15:27+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "Розраховувати додаткові витрати"
+
+msgid "Classification Rules"
+msgstr "Правила класифікації"
+
+msgid "Classification group"
+msgstr "Класифікаційна група"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "Вузол призначення"
+
+msgid "Download speed (kbit/s)"
+msgstr "Швидкість завантаження (Кбіт/с)"
+
+msgid "Enable"
+msgstr "Увімкнути"
+
+msgid "Half-duplex"
+msgstr "Напівдуплекс"
+
+msgid "Interfaces"
+msgstr "Інтерфейси"
+
+msgid "Number of bytes"
+msgstr "Кількість байт"
+
+msgid "Ports"
+msgstr "Порти"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "Якість обслуговування (QoS)"
+
+msgid "Service"
+msgstr "Сервіс"
+
+msgid "Source host"
+msgstr "Вихідний вузол"
+
+msgid "Target"
+msgstr "Мета"
+
+msgid "Upload speed (kbit/s)"
+msgstr "Швидкість відвантаження (Кбіт/с)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Використовуючи фунцію <abbr title=\"Quality of Service — Якість "
+"обслуговування)\">QoS</abbr> можна визначити пріоритети мережевого трафіку "
+"для певних адрес, портів або сервісів."
+
+msgid "all"
+msgstr "усі"
+
+msgid "default"
+msgstr "типова"
+
+msgid "express"
+msgstr "експрес"
+
+msgid "low"
+msgstr "низький"
+
+msgid "normal"
+msgstr "звичайний"
+
+msgid "priority"
+msgstr "пріоритетний"
+
+#~ msgid "Downlink"
+#~ msgstr "Низхідний канал"
+
+#~ msgid "Internet Connection"
+#~ msgstr "З'єднання з інтернетом"
+
+#~ msgid "Uplink"
+#~ msgstr "Висхідний канал"
+
+#, fuzzy
+#~ msgid "allf"
+#~ msgstr "додаткова функція"
diff --git a/trunk/package/luci/po/uk/radvd.po b/trunk/package/luci/po/uk/radvd.po
new file mode 100644
index 00000000..648035db
--- /dev/null
+++ b/trunk/package/luci/po/uk/radvd.po
@@ -0,0 +1,381 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-26 19:17+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "6to4 interface"
+msgstr "Інтерфейс 6to4"
+
+msgid "Address"
+msgstr "Адреса"
+
+msgid "Addresses"
+msgstr "Адреси"
+
+msgid "Advanced"
+msgstr "Додатково"
+
+msgid "Advertise Home Agent flag"
+msgstr "Оголошувати позначку Home Agent"
+
+msgid "Advertise router address"
+msgstr "Оголошувати адресу роутера"
+
+msgid "Advertised Domain Suffixes"
+msgstr "Оголошувані суфікси домену"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+"Оголошуваний IPv6 RDNSS. Якщо не задано, використовується поточна "
+"IPv6-адреса інтерфейсу."
+
+msgid "Advertised IPv6 prefixes"
+msgstr "Оголошувані IPv6-префікси"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+"Оголошувані IPv6-префікси. Якщо не задано, використовується поточний префікс "
+"інтерфейсу"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "Оголошує можливості Home Agent мобільного IPv6 (RFC3775)"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "Оголошує можливості реєстрації мобільного маршрутизатора (NEMO Basic)"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+"Оголошує передбачуваний час досяжності (у мілісекундах) сусідніх вузлів. "
+"Значення 0 відключає оголошення."
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+"Оголошує типове значення лічильника HOP-ів для вихідних unicast-пакетів. "
+"Значення 0 відключає оголошення."
+
+msgid "Advertises the default router preference"
+msgstr "Оголошує типові настройки маршрутизатора"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+"Оголошує певний максимальний розмір пакета (якщо він вказаний). Значення 0 "
+"відключає оголошення."
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr "Оголошення"
+
+msgid "Autonomous"
+msgstr "Автономний"
+
+msgid "Clients"
+msgstr "Клієнти"
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/rrdtool.po b/trunk/package/luci/po/uk/rrdtool.po
new file mode 100644
index 00000000..5a535f19
--- /dev/null
+++ b/trunk/package/luci/po/uk/rrdtool.po
@@ -0,0 +1,357 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/samba.po b/trunk/package/luci/po/uk/samba.po
new file mode 100644
index 00000000..6f2a9209
--- /dev/null
+++ b/trunk/package/luci/po/uk/samba.po
@@ -0,0 +1,84 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-03-18 20:35+0200\n"
+"Last-Translator: YuriPet <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Allow guests"
+msgstr "Дозволити гостьовий вхід"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Дозволити користувачам системи досягати своїх домашніх каталогів через "
+"загальні мережеві ресурси"
+
+msgid "Allowed users"
+msgstr "Дозволені користувачі"
+
+msgid "Create mask"
+msgstr "Створити маску"
+
+msgid "Description"
+msgstr "Опис"
+
+msgid "Directory mask"
+msgstr "Маска каталогу"
+
+msgid "Edit Template"
+msgstr "Редагувати шаблон"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+"Редагувати шаблон, який використовується для створення конфігурації samba."
+
+msgid "General Settings"
+msgstr "Загальні настройки"
+
+msgid "Hostname"
+msgstr "Назва (ім'я) вузла"
+
+msgid "Mask for new directories"
+msgstr "Маска для нових каталогів"
+
+msgid "Mask for new files"
+msgstr "Маска для нових файлів"
+
+msgid "Name"
+msgstr "Ім'я"
+
+msgid "Network Shares"
+msgstr "Загальні мережеві ресурси"
+
+msgid "Path"
+msgstr "Шлях"
+
+msgid "Read-only"
+msgstr "Тільки читання"
+
+msgid "Share home-directories"
+msgstr "Спільно використовувати домашні каталоги"
+
+msgid "Shared Directories"
+msgstr "Загальні каталоги"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"Це вміст файлу '/etc/samba/smb.conf.template', з якого буде генеруватися "
+"ваша конфігурація samba. Значення, укладені в символи \"вертикальна риска"
+"\" (\"|\") не повинні змінюватися. Вони отримують свої значення з вкладки "
+"\"Загальні налаштування\"."
+
+msgid "Workgroup"
+msgstr "Робоча група"
diff --git a/trunk/package/luci/po/uk/splash.po b/trunk/package/luci/po/uk/splash.po
new file mode 100644
index 00000000..2364c63d
--- /dev/null
+++ b/trunk/package/luci/po/uk/splash.po
@@ -0,0 +1,304 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/statistics.po b/trunk/package/luci/po/uk/statistics.po
new file mode 100644
index 00000000..daa4af2d
--- /dev/null
+++ b/trunk/package/luci/po/uk/statistics.po
@@ -0,0 +1,599 @@
+#  statistics.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/statistics.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-03-12 23:50+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Інтерфейси"
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr "Мережа"
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr "Мережевий протокол"
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr "Користувач"
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/tinyproxy.po b/trunk/package/luci/po/uk/tinyproxy.po
new file mode 100644
index 00000000..2e268ba7
--- /dev/null
+++ b/trunk/package/luci/po/uk/tinyproxy.po
@@ -0,0 +1,256 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/transmission.po b/trunk/package/luci/po/uk/transmission.po
new file mode 100644
index 00000000..17369344
--- /dev/null
+++ b/trunk/package/luci/po/uk/transmission.po
@@ -0,0 +1,296 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-13 16:16+0200\n"
+"PO-Revision-Date: 2013-08-13 16:17+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "Альтернативна швидкість завантаження"
+
+msgid "Alternative speed enabled"
+msgstr "Альтернативна швидкість увімкнути"
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/upnp.po b/trunk/package/luci/po/uk/upnp.po
new file mode 100644
index 00000000..7646109c
--- /dev/null
+++ b/trunk/package/luci/po/uk/upnp.po
@@ -0,0 +1,155 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-26 19:26+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+"Список кнтролю доступу визначає, які зовнішні порти можуть бути "
+"переспрямовані на які внутрішні адреси й порти"
+
+msgid "Action"
+msgstr "Дія"
+
+msgid "Active UPnP Redirects"
+msgstr "Активні переспрямування UPnP"
+
+msgid "Advanced Settings"
+msgstr "Додаткові параметри"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+"Дозволити додавання переспрямування тільки для IP-адрес, що надсилають запити"
+
+msgid "Announced model number"
+msgstr "Оголошуваний номер моделі"
+
+msgid "Announced serial number"
+msgstr "Оголошуваний серійний номер"
+
+msgid "Clean rules interval"
+msgstr "Інтервал очищення правил"
+
+msgid "Clean rules threshold"
+msgstr "Поріг очищення правил"
+
+msgid "Client Address"
+msgstr "Адреса клієнта"
+
+msgid "Client Port"
+msgstr "Порт клієнта"
+
+msgid "Collecting data..."
+msgstr "Збирання даних..."
+
+msgid "Comment"
+msgstr "Коментар"
+
+msgid "Delete Redirect"
+msgstr "Видалити переспрямування"
+
+msgid "Device UUID"
+msgstr "UUID пристрою"
+
+msgid "Downlink"
+msgstr "Низхідний канал"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "Увімкнути функцію NAT-PMP"
+
+msgid "Enable UPnP functionality"
+msgstr "Увімкнути функцію UPnP"
+
+msgid "Enable additional logging"
+msgstr "Увімкнути додаткове журналювання"
+
+msgid "Enable secure mode"
+msgstr "Увімкнути захищений режим"
+
+msgid "External Port"
+msgstr "Зовнішній порт"
+
+msgid "External ports"
+msgstr "Зовнішні порти"
+
+msgid "General Settings"
+msgstr "Загальні настройки"
+
+msgid "Internal addresses"
+msgstr "Внутрішні адреси"
+
+msgid "Internal ports"
+msgstr "Внутрішні порти"
+
+msgid "MiniUPnP ACLs"
+msgstr "Список контролю доступу MiniUPnP"
+
+msgid "MiniUPnP settings"
+msgstr "Настройки MiniUPnP"
+
+msgid "Notify interval"
+msgstr "Інтервал сповіщення"
+
+msgid "Port"
+msgstr "Порт"
+
+msgid "Presentation URL"
+msgstr "URL представляння"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "Включати додаткові відомості для налагодження до системного журналу"
+
+msgid "Report system instead of daemon uptime"
+msgstr "Повідомляти час безвідмовної роботи системи, а не сервісу"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "Запускати служби UPnP та NAT-PMP"
+
+msgid "There are no active redirects."
+msgstr "Немає активних переспрямувань"
+
+msgid "UPNP"
+msgstr "UPnP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPnP надає клієнтам у локальній мережі змогу автоматично настроювати "
+"маршрутизатор."
+
+msgid "UPnP lease file"
+msgstr "Файл оренд UPnP"
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Висхідний канал"
+
+msgid "Value in KByte/s, informational only"
+msgstr "Значення (КБ/с) тільки для інформації"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPnP надає клієнтам у локальній мережі змогу автоматично настроювати "
+#~ "маршрутизатор."
+
+#~ msgid "enable"
+#~ msgstr "Увімкнути"
diff --git a/trunk/package/luci/po/uk/ushare.po b/trunk/package/luci/po/uk/ushare.po
new file mode 100644
index 00000000..d79f8967
--- /dev/null
+++ b/trunk/package/luci/po/uk/ushare.po
@@ -0,0 +1,53 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-26 18:43+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "Каталоги даних"
+
+msgid "Disable telnet console"
+msgstr "Вимкнути консоль Telnet"
+
+msgid "Disable webinterface"
+msgstr "Вимкнути веб-інтерфейс"
+
+msgid "Enable"
+msgstr "Увімкнути"
+
+msgid "Interface"
+msgstr "Інтерфейс"
+
+msgid "Options"
+msgstr "Опції"
+
+msgid "Servername"
+msgstr "Ім'я сервера"
+
+msgid "Settings"
+msgstr "Настройки"
+
+msgid "Username"
+msgstr "Ім'я користувача"
+
+msgid "uShare"
+msgstr "uShare"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare є UPnP (TM) A/V DLNA медіа-сервером, який надає UPnP медіа-пристроям "
+"інформацію про наявні мультимедійні файли."
diff --git a/trunk/package/luci/po/uk/uvc_streamer.po b/trunk/package/luci/po/uk/uvc_streamer.po
new file mode 100644
index 00000000..8ec79807
--- /dev/null
+++ b/trunk/package/luci/po/uk/uvc_streamer.po
@@ -0,0 +1,44 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-05-26 18:54+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "Кадрів на секунду"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "Роздільна здатність"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "Настройки"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Транслювання з веб-камери"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"Настройте вашу Linux-UVC сумісну веб-камеру. Введіть у вашому браузері, "
+"наприклад, <a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/uk/vnstat.po b/trunk/package/luci/po/uk/vnstat.po
new file mode 100644
index 00000000..5f9d2578
--- /dev/null
+++ b/trunk/package/luci/po/uk/vnstat.po
@@ -0,0 +1,67 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-13 15:33+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configuration"
+msgstr "Конфігурація"
+
+msgid "Daily traffic"
+msgstr "Список щоденного трафіку"
+
+msgid "Graphs"
+msgstr "Графіки"
+
+msgid "Hourly traffic"
+msgstr "Список погодинного трафіку"
+
+msgid "Monitor selected interfaces"
+msgstr "Моніторинг обраних інтерфейсів"
+
+msgid "Monthly traffic"
+msgstr "Список щомісячного трафіку"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+"Не була створена база даних. Перейдіть до вкладки конфігурації VnStat та "
+"увімкніть моніторинг для одного або декількох інтерфейсів."
+
+msgid "Restart VnStat"
+msgstr "Перезапуск VnStat"
+
+#, fuzzy
+msgid "Summary display"
+msgstr "Загальна таблиця"
+
+msgid "Top 10 display"
+msgstr "Список Топ-10"
+
+msgid "Update »"
+msgstr "Оновлення »"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "Графіки VnStat"
+
+msgid "VnStat Traffic Monitor"
+msgstr "Моніторінг трафіку VnStat"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
+"VnStat - монітор мережного трафіку для Linux, який веде журнал мережевого "
+"трафіку для обраного інтерфейсу або декількох інтерфейсів."
diff --git a/trunk/package/luci/po/uk/voice_core.po b/trunk/package/luci/po/uk/voice_core.po
new file mode 100644
index 00000000..4886d729
--- /dev/null
+++ b/trunk/package/luci/po/uk/voice_core.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-12-29 12:56+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "Телефони"
+
+msgid "Voice"
+msgstr "Голос"
+
+#~ msgid "l_v_adminphones"
+#~ msgstr "l_v_adminphones"
diff --git a/trunk/package/luci/po/uk/voice_diag.po b/trunk/package/luci/po/uk/voice_diag.po
new file mode 100644
index 00000000..60c55ba6
--- /dev/null
+++ b/trunk/package/luci/po/uk/voice_diag.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-28 22:05+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Diagnostics"
+msgstr "Діагностика"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+"Доступність засобів діагностики визначається модулями, які ви встановили."
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
+"Це меню містить опції, які дають вам змогу сконфігурувати й виконати "
+"тестування голосових функцій вашої системи. Інша їх назва - засоби "
+"діагностики."
+
+#~ msgid "l_v_d_admindiag"
+#~ msgstr "l_v_d_admindiag"
diff --git a/trunk/package/luci/po/uk/watchcat.po b/trunk/package/luci/po/uk/watchcat.po
new file mode 100644
index 00000000..a7c2dd8c
--- /dev/null
+++ b/trunk/package/luci/po/uk/watchcat.po
@@ -0,0 +1,61 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-13 16:53+0200\n"
+"Last-Translator: zubr_139 <zubr139@ukr.net>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#, fuzzy
+msgid "Forced reboot delay"
+msgstr "Затримка примусового перезавантаження"
+
+msgid "Host address to ping"
+msgstr "Адреса сервера для перевірки зв'язку"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr "Режим роботи"
+
+msgid "Period"
+msgstr "Період"
+
+msgid "Ping host"
+msgstr "Пінг вузла"
+
+msgid "Ping period"
+msgstr "Період пінгів"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat дозволяє налаштувати періодичні перезавантаження і/або коли "
+"підключення до інтернету було втрачено протягом певного періоду часу."
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/uk/wol.po b/trunk/package/luci/po/uk/wol.po
new file mode 100644
index 00000000..c09d144b
--- /dev/null
+++ b/trunk/package/luci/po/uk/wol.po
@@ -0,0 +1,59 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2013-05-26 19:00+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "Широкомовна трансляція на всіх інтерфейсах"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+"Виберіть комп'ютер, який необхідно розбудити або введіть користувацьку MAC-"
+"адресу"
+
+msgid "Host to wake up"
+msgstr "Комп'ютер, який необхідно розбудити"
+
+msgid "Network interface to use"
+msgstr "Використовувати мережевий інтерфейс"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+"Іноді працює тільки одна з цих двох утиліт. Якщо одна з них не працює, "
+"спробуйте іншу."
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "Визначає інтерфейс, яким буде надіслано пакет WoL"
+
+msgid "Starting WoL utility:"
+msgstr "Запуск утиліти WoL:"
+
+msgid "Wake on LAN"
+msgstr "Wake on LAN"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+"Пробудження через LAN (Wake on LAN) є технологією, що дає змогу віддалено "
+"\"будити\" (вмикати) комп'ютери у локальній мережі."
+
+msgid "Wake up host"
+msgstr "Розбудити комп'ютер"
+
+msgid "WoL program"
+msgstr "Программа WoL"
diff --git a/trunk/package/luci/po/uk/wshaper.po b/trunk/package/luci/po/uk/wshaper.po
new file mode 100644
index 00000000..94d20df9
--- /dev/null
+++ b/trunk/package/luci/po/uk/wshaper.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-04-28 21:54+0200\n"
+"Last-Translator: Yurii <yuripet@gmail.com>\n"
+"Language-Team: none\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr "Прямий канал"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "Ширина смуги пропускання прямого каналу (кбіт/с)"
+
+msgid "Host or Network in CIDR notation."
+msgstr "Вузол або мережа в нотації CIDR."
+
+msgid "Interface"
+msgstr "Інтерфейс"
+
+msgid "Low priority destination ports"
+msgstr "Низькопріоритетні порти призначення"
+
+msgid "Low priority hosts (Destination)"
+msgstr "Низькопріоритетні вузли призначення"
+
+msgid "Low priority hosts (Source)"
+msgstr "Низькопріоритетні вузли джерела"
+
+msgid "Low priority source ports"
+msgstr "Низькопріоритетні порти джерела"
+
+msgid "Uplink"
+msgstr "Зворотній канал"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "Ширина смуги пропускання зворотного каналу (кбіт/c)"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Налаштування Wondershaper"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper використовує формування трафіку для забезпечення низької "
+"затримки інтерактивного трафіку, навіть якщо ваше з'єднання з інтернетом "
+"дуже насичене."
diff --git a/trunk/package/luci/po/vi/ahcp.po b/trunk/package/luci/po/vi/ahcp.po
new file mode 100644
index 00000000..1041add8
--- /dev/null
+++ b/trunk/package/luci/po/vi/ahcp.po
@@ -0,0 +1,114 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-12-05 04:46+0200\n"
+"Last-Translator: Thành <tienthanh.dqc@gmail.com>\n"
+"Language-Team: none\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "AHCP Server"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP là một giao thức tự động cấu hình cho IPv6 và mạng IPv6/IPv4 dual-stack "
+"thiết kế để được sử dụng trong địa điểm phát hiện router và DHCP trên mạng, "
+"nơi rất khó hoặc không thể cấu hình một máy chủ trong tất cả các lĩnh vực "
+"phát sóng liên kết lớp, ví dụ như mạng Ad-hoc."
+
+msgid "Active AHCP Leases"
+msgstr "Kích hoạt thuê AHCP"
+
+msgid "Address"
+msgstr "Địa chỉ"
+
+msgid "Advanced Settings"
+msgstr "Thiết lập nâng cao"
+
+msgid "Age"
+msgstr "Thời gian thuê"
+
+msgid "Announced DNS servers"
+msgstr "Quảng bá máy chủ DNS"
+
+msgid "Announced NTP servers"
+msgstr "Quảng bá máy chủ NTP"
+
+msgid "Announced prefixes"
+msgstr "Quảng bá tiền tố"
+
+msgid "Collecting data..."
+msgstr "Đang kết xuất dữ liệu..."
+
+msgid "Forwarder"
+msgstr "Chuyển tiếp"
+
+msgid "General Setup"
+msgstr "Thiết lập chung"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 và IPv6"
+
+msgid "IPv4 only"
+msgstr "Chỉ IPv4"
+
+msgid "IPv6 only"
+msgstr "Chỉ IPv6"
+
+msgid "Lease directory"
+msgstr "Thư mục cho thuê"
+
+msgid "Lease validity time"
+msgstr "Thời gian cho thuê"
+
+msgid "Log file"
+msgstr "Tệp nhật ký"
+
+msgid "Multicast address"
+msgstr "Đa địa chỉ"
+
+msgid "Operation mode"
+msgstr "Chế độ hoạt động"
+
+msgid "Port"
+msgstr "Cổng"
+
+msgid "Protocol family"
+msgstr "Giao thức"
+
+msgid "Served interfaces"
+msgstr "Giao diện phục vụ"
+
+msgid "Server"
+msgstr "Máy chủ"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "Quy định cụ thể máy chủ IPv4, IPv6 và NTP"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "Quy định cụ thể tên máy chủ IPv4, IPv6 và NTP"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "Định rõ công bố IPv4 và IPv6 mạng tiền tố trong ký hiệu CIDR"
+
+msgid "The AHCP Service is not running."
+msgstr "Dịch vụ AHCP khộng hoạt động."
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "Dịch vụ AHCP đang hoạt động với ID %s."
+
+msgid "There are no active leases."
+msgstr "Hiện không có người thuê"
+
+msgid "Unique ID file"
+msgstr "Tệp Unique ID"
diff --git a/trunk/package/luci/po/vi/asterisk.po b/trunk/package/luci/po/vi/asterisk.po
new file mode 100644
index 00000000..d1cc6b25
--- /dev/null
+++ b/trunk/package/luci/po/vi/asterisk.po
@@ -0,0 +1,680 @@
+#  asterisk.pot
+#  generated from ./applications/luci-asterisk/luasrc/i18n/asterisk.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-16 08:36+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Asterisk những tùy chọn căn bản"
+
+#~ msgid "AGI directory"
+#~ msgstr "Thư mục AGI"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "Cache ghi lại tập tin âm thanh trong suốt qua trình recording"
+
+#~ msgid "Debug Level"
+#~ msgstr "Debug Level"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "Vô hiệu hóa một số cảnh báo"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "Dump core on crash"
+
+#~ msgid "High Priority"
+#~ msgstr "High Priority"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "Initialise Crypto"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "Sử dụng thời gian nội bộ"
+
+#~ msgid "Log directory"
+#~ msgstr "Thư mục log"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "Số lượng cuộc gọi tối đa cho phép"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "Mức độ tải tối đa để ngừng thu nhận cuộc gọi mới"
+
+#~ msgid "Disable console colors"
+#~ msgstr "Vô hiệu hóa bản điều khiển màu sắc"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "Thư mục sound files cache"
+
+#~ msgid "The Group to run as"
+#~ msgstr "Nhóm vận hành như"
+
+#~ msgid "The User to run as"
+#~ msgstr "Người sử dụng vận hành như"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "Thư mục Voicemail Spool "
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "Tiền tố UniquID với tên hệ thống"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "Xây dựng đừng dẫn transcode via SLINEAR, không trực tiếp"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "Truyền SLINEAR silence trong khi recording một channel"
+
+#~ msgid "Verbose Level"
+#~ msgstr "Verbose Level"
+
+#~ msgid "Section dialplan"
+#~ msgstr "Section dialplan"
+
+#~ msgid "include"
+#~ msgstr "bao gồm"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "Dialplan Extension"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "Dialplan tùy chọn tổng quát"
+
+#~ msgid "Allow transfer"
+#~ msgstr "Cho phép chuyển đổi"
+
+#~ msgid "Clear global vars"
+#~ msgstr "Xóa global vars"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "Dialplan Goto"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "Dialplan Conference"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "Dialplan Time"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "Dialplan Voicemail"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "Dial Zones cho Dialplan"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "Tiền tố để thêm vào matching dialplans"
+
+#~ msgid "Match International prefix"
+#~ msgstr "Match tiền tố quốc tê"
+
+#~ msgid "Prefix (0) to add/remove to/from international numbers"
+#~ msgstr "Tiền tố để thêm vào/ bỏ ra/ từ số gọi quốc tế"
+
+#~ msgid "localzone"
+#~ msgstr "vùng địa phương"
+
+#~ msgid "Match plan"
+#~ msgstr "Match plan"
+
+#~ msgid "Connection to use"
+#~ msgstr "Kết nối sử dụng"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "Bản đồ phím tính năng"
+
+#~ msgid "Attended transfer key"
+#~ msgstr "Attended transfer key"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "phím chuyển đổi ẩn"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "phím để vô hiệu hóa cuộc gọi"
+
+#~ msgid "Key to Park call"
+#~ msgstr "phím để định vị cuộc gọi"
+
+#~ msgid "Parking Feature"
+#~ msgstr "Tính năng định vị"
+
+#~ msgid "ADSI Park"
+#~ msgstr "định vị ADSI"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "Attended transfer timeout (sec)"
+
+#~ msgid "One touch record key"
+#~ msgstr "Phím thu chạm một lần"
+
+#~ msgid "Name of call context for parking"
+#~ msgstr "Tên của call context cho parking"
+
+#~ msgid "Sound file to play to parked caller"
+#~ msgstr "Tập tin âm thanh để play to parked caller"
+
+#~ msgid "Max time (ms) between digits for feature activation"
+#~ msgstr "Thời gian tối đa (ms) giữa các digits cho feature activation"
+
+#~ msgid "Method to Find Parking slot"
+#~ msgstr "Phương pháp tìm điểm định vị"
+
+#~ msgid "parkedmusicclass"
+#~ msgstr "parkedmusicclass"
+
+#~ msgid "Play courtesy tone to"
+#~ msgstr "Play courtesy tone để"
+
+#~ msgid "Enable Parking"
+#~ msgstr "cho phép định vị"
+
+#~ msgid "Extension to dial to park"
+#~ msgstr "nhanh số để gọi để định vị"
+
+#~ msgid "Parking time (secs)"
+#~ msgstr "Thời gian định vị"
+
+#~ msgid "Range of extensions for call parking"
+#~ msgstr "Vùng của đuôi mở rộng cho call parking"
+
+#~ msgid "Pickup extension"
+#~ msgstr "Pickup extension"
+
+#~ msgid "Seconds to wait bewteen digits when transferring"
+#~ msgstr "Thời gian chờ giữa những chữ số khi chuyển đổi"
+
+#~ msgid "sound when attended transfer is complete"
+#~ msgstr "âm thanh khi chuyển đổi hoàn tất"
+
+#~ msgid "Sound when attended transfer fails"
+#~ msgstr "âm thanh khi chuyển đổi không thành công"
+
+#~ msgid "Reload Hardware Config"
+#~ msgstr "Tải lại cấu hình phần cứng"
+
+#~ msgid "Reboot Method"
+#~ msgstr "phương pháp khởi động lại"
+
+#~ msgid "Parameter"
+#~ msgstr "Tham số"
+
+#~ msgid "Option type"
+#~ msgstr "Lựa chọn"
+
+#~ msgid "User name"
+#~ msgstr "Tên người dùng"
+
+#~ msgid "IAX General Options"
+#~ msgstr "Những lựa chọn tổng quát IAX"
+
+#~ msgid "Allow Codecs"
+#~ msgstr "Cho phép Codecs"
+
+#~ msgid "Static"
+#~ msgstr "TÄ©nh"
+
+#~ msgid "Write Protect"
+#~ msgstr "Viết bảo vệ"
+
+#~ msgid "Meetme Conference"
+#~ msgstr "Gặp mặt thảo luận"
+
+#~ msgid "Admin PIN"
+#~ msgstr "PIN quản trị"
+
+#~ msgid "Meeting PIN"
+#~ msgstr "PIN cuộc gặp"
+
+#~ msgid "Meetme Conference General Options"
+#~ msgstr "Lựu chọn chung về thảo luận trực tiếp"
+
+#~ msgid "Number of 20ms audio buffers to be used"
+#~ msgstr "Số của 20ms audio buffers để được dùng"
+
+#~ msgid "Modules"
+#~ msgstr "Modules"
+
+#~ msgid "Alarm Receiver Application"
+#~ msgstr "Ứng dụng nhận báo thức"
+
+#~ msgid "Authentication Application"
+#~ msgstr "Ứng dụng xác thực"
+
+#~ msgid "Make sure asterisk doesnt save CDR"
+#~ msgstr "Bảo đảm asterisk không lưu CDR"
+
+#~ msgid "Check if channel is available"
+#~ msgstr "Kiểm tra xem nếu kênh đã có sẵn"
+
+#~ msgid "Listen in on any channel"
+#~ msgstr "Nghe trên bất kỳ kênh nào"
+
+#~ msgid "Control Playback Application"
+#~ msgstr "Điều khiển ứng dụng phát lại"
+
+#~ msgid "Cuts up variables"
+#~ msgstr "Cuts up variables"
+
+#~ msgid "Database access functions"
+#~ msgstr "Chức năng truy cập cơ sở dữ liệu"
+
+#~ msgid "Dialing Application"
+#~ msgstr "Ứng dụng quay số"
+
+#~ msgid "Virtual Dictation Machine Application"
+#~ msgstr "Ứng dụng virtual Dictation Machine "
+
+#~ msgid "Directed Call Pickup Support"
+#~ msgstr "Directed hỗ trợ call pickup"
+
+#~ msgid "Extension Directory"
+#~ msgstr "Danh bạ nhánh số"
+
+#~ msgid "DISA (Direct Inward System Access) Application"
+#~ msgstr "Ứng dụng DISA (Direct Inward System Access) "
+
+#~ msgid "Dump channel variables Application"
+#~ msgstr "Dump channel variables Application"
+
+#~ msgid "Simple Echo Application"
+#~ msgstr "Ứng dụng Echo đơn giản"
+
+#~ msgid "ENUM Lookup"
+#~ msgstr "ENUM tra cứu"
+
+#~ msgid "Reevaluates strings"
+#~ msgstr "Đánh giá lại strings"
+
+#~ msgid "Executes applications"
+#~ msgstr "thực thi ứng dụng"
+
+#~ msgid "External IVR application interface"
+#~ msgstr "Ứng dụng giao diện bên ngoài IVR"
+
+#~ msgid "Fork The CDR into 2 seperate entities"
+#~ msgstr "Fork The CDR into 2 nhân riêng biệt"
+
+#~ msgid "Get ADSI CPE ID"
+#~ msgstr "Lấy ADSI CPE ID"
+
+#~ msgid "Group Management Routines"
+#~ msgstr "Group Management Routines"
+
+#~ msgid "Encode and Stream via icecast and ices"
+#~ msgstr "Encode và Stream via icecast và ices"
+
+#~ msgid "Image Transmission Application"
+#~ msgstr "Ứng dụng truyền hình ảnh"
+
+#~ msgid "Look up Caller*ID name/number from black"
+#~ msgstr "Tra cứu tên/số của người gọi"
+
+#~ msgid "Look up CallerID Name from local databas"
+#~ msgstr "Tra cứu tên người gọi từ cơ sở dữ liệu địa phương"
+
+#~ msgid "Extension Macros"
+#~ msgstr "Nhánh số Macro"
+
+#~ msgid "A simple math Application"
+#~ msgstr "Ứng dụng tính toán đơn giản"
+
+#~ msgid "MD5 checksum Application"
+#~ msgstr "Ứng dụng MD5 checksum "
+
+#~ msgid "Digital Milliwatt (mu-law) Test Application"
+#~ msgstr "Ứng dụng kiểm tra Digital Milliwatt (mu-law) "
+
+#~ msgid "Record a call and mix the audio during the recording"
+#~ msgstr "Thu âm cuộc gọi và phối âm trong khi thu"
+
+#~ msgid "Call Parking and Announce Application"
+#~ msgstr "Định vị cuộc gọi và ứng dụng thông báo"
+
+#~ msgid "Trivial Playback Application"
+#~ msgstr "Ứng dụng trivial Playback "
+
+#~ msgid "Require phone number to be entered"
+#~ msgstr "Yêu cầu nhập số điện thoại"
+
+#~ msgid "True Call Queueing"
+#~ msgstr "True Call Queueing"
+
+#~ msgid "Random goto"
+#~ msgstr "Random goto"
+
+#~ msgid "Read Variable Application"
+#~ msgstr "Ứng dụng đọc variable "
+
+#~ msgid "Read in a file"
+#~ msgstr "Đọc trong một tập tin"
+
+#~ msgid "Realtime Data Lookup/Rewrite"
+#~ msgstr "Tra cứu dữ liệu đúng lúc/ Viết lại"
+
+#~ msgid "Trivial Record Application"
+#~ msgstr "Ứng dụng trivial record"
+
+#~ msgid "Say time"
+#~ msgstr "Nói thời gian"
+
+#~ msgid "Send DTMF digits Application"
+#~ msgstr "Ứng dụng gửi những chữ số DTMF"
+
+#~ msgid "Send Text Applications"
+#~ msgstr "Gửi ứng dụng tin nhắn"
+
+#~ msgid "Set CallerID Application"
+#~ msgstr "Ứng dụng cài đặt định dạng cuộc gọi"
+
+#~ msgid "CDR user field apps"
+#~ msgstr "CDR user field apps"
+
+#~ msgid "load => .so ; Set CallerID Name"
+#~ msgstr "load =&amp;gt; .so ; Đặt tên CallerID "
+
+#~ msgid "load => .so ; Set CallerID Number"
+#~ msgstr "load =&amp;gt; .so ; Đặt số CallerID "
+
+#~ msgid "Set RDNIS Number"
+#~ msgstr "Cài đặt số RDNIS"
+
+#~ msgid "Set ISDN Transfer Capability"
+#~ msgstr "Cài đặt công suất truyền tải ISDN"
+
+#~ msgid "SMS/PSTN handler"
+#~ msgstr "SMS/PSTN handler"
+
+#~ msgid "Hangs up the requested channel"
+#~ msgstr "Bãi bỏ kênh yêu cầu"
+
+#~ msgid "Stack Routines"
+#~ msgstr "Ngăn xếp Routines"
+
+#~ msgid "Generic System() application"
+#~ msgstr "Ứng dụng Genetic System"
+
+#~ msgid "Playback with Talk Detection"
+#~ msgstr "Playback với bộ phát hiện tiếng nói"
+
+#~ msgid "Interface Test Application"
+#~ msgstr "Ứng dụng kiểm tra giao diện"
+
+#~ msgid "Transfer"
+#~ msgstr "truyền tải"
+
+#~ msgid "TXTCIDName"
+#~ msgstr "TXTCIDName"
+
+#~ msgid "Send URL Applications"
+#~ msgstr "Gửi những ứng dụng URL"
+
+#~ msgid "Custom User Event Application"
+#~ msgstr "Ứng dụng Custom User Event "
+
+#~ msgid "Send verbose output"
+#~ msgstr "Gá»­i verbose output"
+
+#~ msgid "Voicemail"
+#~ msgstr "Thư thoại"
+
+#~ msgid "Waits until first ring after time"
+#~ msgstr "Đợi tới tiếng ring đầu tiên sau khi"
+
+#~ msgid "Wait For Silence Application"
+#~ msgstr "Đợi ứng dụng im lặng"
+
+#~ msgid "While Loops and Conditional Execution"
+#~ msgstr "Trong khi Loops và Conditional Execution"
+
+#~ msgid "Comma Separated Values CDR Backend"
+#~ msgstr "Comma Separated Values CDR Backend"
+
+#~ msgid "Customizable Comma Separated Values CDR Backend"
+#~ msgstr "Tùy chỉnh Comma Separated Values CDR Backend"
+
+#~ msgid "Asterisk Call Manager CDR Backend"
+#~ msgstr "Asterisk Call Manager CDR Backend"
+
+#~ msgid "MySQL CDR Backend"
+#~ msgstr "MySQL CDR Backend"
+
+#~ msgid "PostgreSQL CDR Backend"
+#~ msgstr "PostgreSQL CDR Backend"
+
+#~ msgid "SQLite CDR Backend"
+#~ msgstr "SQLite CDR Backend"
+
+#~ msgid "Agent Proxy Channel"
+#~ msgstr "Agent Proxy Channel"
+
+#~ msgid "Option chan_iax2"
+#~ msgstr "Tùy chọn chan_iax2"
+
+#~ msgid "Local Proxy Channel"
+#~ msgstr "Local Proxy Channel"
+
+#~ msgid "Session Initiation Protocol (SIP)"
+#~ msgstr "Session Initiation Protocol (SIP)"
+
+#~ msgid "Adaptive Differential PCM Coder/Decoder"
+#~ msgstr "Adaptive Differential PCM Coder/Decoder"
+
+#~ msgid "A-law Coder/Decoder"
+#~ msgstr "A-law Coder/Decoder"
+
+#~ msgid "A-law and Mulaw direct Coder/Decoder"
+#~ msgstr "A-law and Mulaw direct Coder/Decoder"
+
+#~ msgid "ITU G.726-32kbps G726 Transcoder"
+#~ msgstr "ITU G.726-32kbps G726 Transcoder"
+
+#~ msgid "GSM/PCM16 (signed linear) Codec Translation"
+#~ msgstr "GSM/PCM16 (signed linear) Codec Translation"
+
+#~ msgid "Speex/PCM16 (signed linear) Codec Translator"
+#~ msgstr "Speex/PCM16 (signed linear) Codec Translator"
+
+#~ msgid "Mu-law Coder/Decoder"
+#~ msgstr "Mu-law Coder/Decoder"
+
+#~ msgid "Sun Microsystems AU format (signed linear)"
+#~ msgstr "Sun Microsystems AU format (signed linear)"
+
+#~ msgid "G.723.1 Simple Timestamp File Format"
+#~ msgstr "G.723.1 Simple Timestamp File Format"
+
+#~ msgid "Raw G.726 (16/24/32/40kbps) data"
+#~ msgstr "Raw G.726 (16/24/32/40kbps) data"
+
+#~ msgid "Raw G729 data"
+#~ msgstr "Raw G729 data"
+
+#~ msgid "Raw GSM data"
+#~ msgstr "Raw GSM data"
+
+#~ msgid "Raw h263 data"
+#~ msgstr "Raw h263 data"
+
+#~ msgid "JPEG (Joint Picture Experts Group) Image"
+#~ msgstr "JPEG (Joint Picture Experts Group) Image"
+
+#~ msgid "Raw uLaw 8khz Audio support (PCM)"
+#~ msgstr "Raw uLaw 8khz Audio support (PCM)"
+
+#~ msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
+#~ msgstr "load =&amp;gt; .so ; Raw aLaw 8khz PCM Audio support"
+
+#~ msgid "Raw Signed Linear Audio support (SLN)"
+#~ msgstr "Raw Signed Linear Audio support (SLN)"
+
+#~ msgid "Dialogic VOX (ADPCM) File Format"
+#~ msgstr "Dialogic VOX (ADPCM) File Format"
+
+#~ msgid "Microsoft WAV format (8000hz Signed Line"
+#~ msgstr "Microsoft WAV format (8000hz Signed Line"
+
+#~ msgid "Microsoft WAV format (Proprietary GSM)"
+#~ msgstr "Microsoft WAV format (Proprietary GSM)"
+
+#~ msgid "Caller ID related dialplan functions"
+#~ msgstr "Caller ID liên quan đến chức năng dialplan "
+
+#~ msgid "ENUM Functions"
+#~ msgstr "chức năng ENUM"
+
+#~ msgid "URI encoding / decoding functions"
+#~ msgstr "Chức năng URI encoding / decoding "
+
+#~ msgid "Asterisk Extension Language Compiler"
+#~ msgstr "Asterisk Extension Language Compiler"
+
+#~ msgid "Text Extension Configuration"
+#~ msgstr "Cấu hình Text Extension "
+
+#~ msgid "load => .so ; Builtin dialplan functions"
+#~ msgstr "load =&amp;gt; .so ; chức năng Builtin dialplan "
+
+#~ msgid "Loopback Switch"
+#~ msgstr "Loopback Switch"
+
+#~ msgid "Realtime Switch"
+#~ msgstr "Realtime Switch"
+
+#~ msgid "Outgoing Spool Support"
+#~ msgstr "Hỗ trợ outgoing spool"
+
+#~ msgid "Wil Cal U (Auto Dialer)"
+#~ msgstr "Wil Cal U (Auto Dialer)"
+
+#~ msgid "MySQL Config Resource"
+#~ msgstr "MySQL Config Resource"
+
+#~ msgid "ODBC Config Resource"
+#~ msgstr "ODBC Config Resource"
+
+#~ msgid "PGSQL Module"
+#~ msgstr "PGSQL Module"
+
+#~ msgid "Cryptographic Digital Signatures"
+#~ msgstr "Cryptographic Digital Signatures"
+
+#~ msgid "Call Parking Resource"
+#~ msgstr "Call Parking Resource"
+
+#~ msgid "Indications Configuration"
+#~ msgstr "Cấu hình indications"
+
+#~ msgid "Call Monitoring Resource"
+#~ msgstr "Call Monitoring Resource"
+
+#~ msgid "Music On Hold Resource"
+#~ msgstr "Music On Hold Resource"
+
+#~ msgid "ODBC Resource"
+#~ msgstr "ODBC Resource"
+
+#~ msgid "SMDI Module"
+#~ msgstr "SMDI Module"
+
+#~ msgid "SNMP Module"
+#~ msgstr "SNMP Module"
+
+#~ msgid "Music On Hold"
+#~ msgstr "Music On Hold"
+
+#~ msgid "Application"
+#~ msgstr "Ứng dụng"
+
+#~ msgid "Directory of Music"
+#~ msgstr "Thư mục music"
+
+#~ msgid "Option mode"
+#~ msgstr "Chế độ tùy chọn"
+
+#~ msgid "Random Play"
+#~ msgstr "Random Play"
+
+#~ msgid "DTMF mode"
+#~ msgstr "chế độ DTMF"
+
+#~ msgid "Primary domain identity for From: headers"
+#~ msgstr "Nhận dạng primary domain cho From: headers"
+
+#~ msgid "From user (required by many SIP providers)"
+#~ msgstr "Từ user (yêu cầu bởi nhiều nhà cung cấp SIP)"
+
+#~ msgid "Ring on incoming dialplan contexts"
+#~ msgstr "Ring on incoming dialplan contexts"
+
+#~ msgid "Allow Insecure for"
+#~ msgstr "Cho phép không an toàn cho"
+
+#~ msgid "Mailbox for MWI"
+#~ msgstr "Hộp thư cho MWI"
+
+#~ msgid "NAT between phone and Asterisk"
+#~ msgstr "NAT giữa điện thoại và Asterisk"
+
+#~ msgid "Check tags in headers"
+#~ msgstr "Kiểm tra tags trong headers"
+
+#~ msgid "Reply Timeout (ms) for down connection"
+#~ msgstr "Trả lời Timeout (ms) cho down kết nối"
+
+#~ msgid "Register connection"
+#~ msgstr "Đăng ký kết nối"
+
+#~ msgid "Dial own extension for mailbox"
+#~ msgstr "Gọi nhánh số cho hộp thư"
+
+#~ msgid "Client Type"
+#~ msgstr "Loại Client"
+
+#~ msgid "Username"
+#~ msgstr "Username"
+
+#~ msgid "Section sipgeneral"
+#~ msgstr "Section sipgeneral"
+
+#~ msgid "Allow codecs"
+#~ msgstr "Cho phép Codecs"
+
+#~ msgid "SIP realm"
+#~ msgstr "SIP realm"
+
+#~ msgid "Voicemail general options"
+#~ msgstr "Thư thoại tùy chọn tổng quát"
+
+#~ msgid "From Email address of server"
+#~ msgstr "Từ địa chỉ email của server"
+
+#~ msgid "Voice Mail boxes"
+#~ msgstr "Hộp thư thoại"
+
+#~ msgid "Email contains attachment"
+#~ msgstr "Email bao gồm attachment"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Display Name"
+#~ msgstr "Tên display"
+
+#~ msgid "Password"
+#~ msgstr "Mật khẩu"
+
+#~ msgid "zone"
+#~ msgstr "zone"
+
+#~ msgid "Voice Zone settings"
+#~ msgstr "Cài đặt voice zone"
+
+#~ msgid "Message Format"
+#~ msgstr "Message Format"
diff --git a/trunk/package/luci/po/vi/base.po b/trunk/package/luci/po/vi/base.po
new file mode 100644
index 00000000..37528cb4
--- /dev/null
+++ b/trunk/package/luci/po/vi/base.po
@@ -0,0 +1,3691 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-14 12:23+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr ""
+
+#, fuzzy
+msgid "(%s available)"
+msgstr "(%s available)"
+
+msgid "(empty)"
+msgstr ""
+
+msgid "(no interfaces attached)"
+msgstr ""
+
+msgid "-- Additional Field --"
+msgstr "---Mục bổ sung---"
+
+msgid "-- Please choose --"
+msgstr "--Hãy chọn--"
+
+msgid "-- custom --"
+msgstr "--tùy chỉnh--"
+
+msgid "1 Minute Load:"
+msgstr ""
+
+msgid "15 Minute Load:"
+msgstr ""
+
+msgid "5 Minute Load:"
+msgstr ""
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Dịch vụ căn bản đặt Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr ""
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr ""
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Mở rộng dịch vụ đặt Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr ""
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr ""
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr ""
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr ""
+
+msgid "AR Support"
+msgstr "Hỗ trợ AR"
+
+msgid "ARP retry threshold"
+msgstr ""
+
+msgid "ATM Bridges"
+msgstr ""
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr ""
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr ""
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+
+msgid "ATM device number"
+msgstr ""
+
+msgid "Access Concentrator"
+msgstr ""
+
+msgid "Access Point"
+msgstr "Điểm truy cập"
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Actions"
+msgstr "Hành động"
+
+msgid "Activate this network"
+msgstr ""
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+
+msgid "Active Connections"
+msgstr "kết nối đang hoạt động"
+
+msgid "Active DHCP Leases"
+msgstr ""
+
+msgid "Active DHCPv6 Leases"
+msgstr ""
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "Thêm vào"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr ""
+
+msgid "Add new interface..."
+msgstr ""
+
+msgid "Additional Hosts files"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Address to access local relay bridge"
+msgstr ""
+
+msgid "Administration"
+msgstr "Quản trị"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Alert"
+msgstr ""
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "Cho phép <abbr title=\"Secure Shell\">SSH</abbr> xác thực mật mã"
+
+msgid "Allow all except listed"
+msgstr "Cho phép tất cả trừ danh sách liệt kê"
+
+msgid "Allow listed only"
+msgstr "Chỉ cho phép danh sách liệt kê"
+
+msgid "Allow localhost"
+msgstr ""
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr ""
+
+msgid "Allow root logins with password"
+msgstr ""
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr ""
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr ""
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr ""
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr ""
+
+msgid "Antenna 2"
+msgstr ""
+
+msgid "Antenna Configuration"
+msgstr ""
+
+msgid "Any zone"
+msgstr ""
+
+msgid "Apply"
+msgstr "Áp dụng"
+
+msgid "Applying changes"
+msgstr "Tiến hành thay đổi"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr ""
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr ""
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Authentication"
+msgstr "Xác thực"
+
+msgid "Authoritative"
+msgstr "Authoritative"
+
+msgid "Authorization Required"
+msgstr "Yêu cầu ủy quyền"
+
+msgid "Auto Refresh"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "Sẵn có"
+
+msgid "Available packages"
+msgstr ""
+
+msgid "Average:"
+msgstr ""
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Back"
+msgstr ""
+
+msgid "Back to Overview"
+msgstr ""
+
+msgid "Back to configuration"
+msgstr ""
+
+msgid "Back to overview"
+msgstr ""
+
+msgid "Back to scan results"
+msgstr ""
+
+msgid "Background Scan"
+msgstr "Background Scan"
+
+msgid "Backup / Flash Firmware"
+msgstr ""
+
+msgid "Backup / Restore"
+msgstr "Backup/ Restore"
+
+msgid "Backup file list"
+msgstr ""
+
+msgid "Bad address specified!"
+msgstr ""
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Bogus NX Domain Override"
+msgstr ""
+
+msgid "Bridge"
+msgstr ""
+
+msgid "Bridge interfaces"
+msgstr "Giao diện cầu nối"
+
+msgid "Bridge unit number"
+msgstr ""
+
+msgid "Bring up on boot"
+msgstr ""
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr ""
+
+msgid "Buffered"
+msgstr ""
+
+msgid "Buttons"
+msgstr ""
+
+msgid "CPU"
+msgstr ""
+
+msgid "CPU usage (%)"
+msgstr "CPU usage (%)"
+
+msgid "Cached"
+msgstr ""
+
+msgid "Cancel"
+msgstr "Bỏ qua"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "chuỗi"
+
+msgid "Changes"
+msgstr "Thay đổi"
+
+msgid "Changes applied."
+msgstr "Thay đổi đã áp dụng"
+
+msgid "Changes the administrator password for accessing the device"
+msgstr ""
+
+msgid "Channel"
+msgstr "Kênh"
+
+msgid "Check"
+msgstr ""
+
+msgid "Checksum"
+msgstr "Checksum"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr "Giao diện này chưa thuộc về bất kỳ firewall zone nào."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+
+msgid "Client"
+msgstr "Client"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr ""
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr ""
+
+msgid "Close list..."
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr "Lệnh"
+
+msgid "Common Configuration"
+msgstr ""
+
+msgid "Compression"
+msgstr "Sức nén"
+
+msgid "Configuration"
+msgstr "Cấu hình"
+
+msgid "Configuration applied."
+msgstr ""
+
+msgid "Configuration files will be kept."
+msgstr ""
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr ""
+
+msgid "Confirmation"
+msgstr "Xác nhận"
+
+msgid "Connect"
+msgstr ""
+
+msgid "Connected"
+msgstr ""
+
+msgid "Connection Limit"
+msgstr "Giới hạn kết nối"
+
+msgid "Connections"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Country Code"
+msgstr "Mã quốc gia"
+
+msgid "Cover the following interface"
+msgstr ""
+
+msgid "Cover the following interfaces"
+msgstr ""
+
+msgid "Create / Assign firewall-zone"
+msgstr "Tạo/ gán firewall-zone"
+
+msgid "Create Interface"
+msgstr ""
+
+msgid "Create a bridge over multiple interfaces"
+msgstr ""
+
+msgid "Critical"
+msgstr ""
+
+msgid "Cron Log Level"
+msgstr ""
+
+msgid "Custom Interface"
+msgstr ""
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"Tùy chỉnh chế độ của thiết bị <abbr title=\"Light Emitting Diode\">LED</"
+"abbr>s nếu có thể."
+
+msgid "DHCP Leases"
+msgstr ""
+
+msgid "DHCP Server"
+msgstr ""
+
+msgid "DHCP and DNS"
+msgstr ""
+
+msgid "DHCP client"
+msgstr ""
+
+msgid "DHCP-Options"
+msgstr "Tùy chọn DHCP"
+
+msgid "DHCPv6 Leases"
+msgstr ""
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS forwardings"
+msgstr ""
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Default %d"
+msgstr ""
+
+msgid "Default gateway"
+msgstr ""
+
+msgid "Default state"
+msgstr ""
+
+msgid "Define a name for this network."
+msgstr ""
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+
+msgid "Delete"
+msgstr "Xóa"
+
+msgid "Delete this interface"
+msgstr ""
+
+msgid "Delete this network"
+msgstr ""
+
+msgid "Description"
+msgstr "Mô tả"
+
+msgid "Design"
+msgstr "Thiết kế"
+
+msgid "Destination"
+msgstr "Điểm đến"
+
+msgid "Device"
+msgstr "Công cụ"
+
+msgid "Device Configuration"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+
+msgid "Disable DNS setup"
+msgstr ""
+
+msgid "Disable HW-Beacon timer"
+msgstr "Vô hiệu hóa bộ chỉnh giờ HW-Beacon"
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Discard upstream RFC1918 responses"
+msgstr ""
+
+msgid "Displaying only packages containing"
+msgstr ""
+
+msgid "Distance Optimization"
+msgstr "Khoảng cách tối ưu"
+
+msgid "Distance to farthest network member in meters."
+msgstr "Khoảng cách tới thành viên xa nhất trong mạng lưới tính bằng mét"
+
+msgid "Diversity"
+msgstr "Tính đa dạng"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+"Dnsmasq là một phối hợp  <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr ""
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr ""
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr ""
+
+msgid "Do not send probe responses"
+msgstr "Không gửi nhắc hồi đáp"
+
+msgid "Domain required"
+msgstr "Domain yêu cầu"
+
+msgid "Domain whitelist"
+msgstr ""
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"Don&amp;#39;t chuyển tiếp <abbr title=\"Hệ thống tên miền\">DNS</abbr>-Yêu "
+"cầu không cần <abbr title=\"Hệ thống tên miền\">DNS</abbr>-Tên"
+
+msgid "Download and install package"
+msgstr "Tải và cài đặt gói"
+
+msgid "Download backup"
+msgstr ""
+
+msgid "Dropbear Instance"
+msgstr ""
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear cung cấp <abbr title=\"Secure Shell\">SSH</abbr> mạng lưới shell "
+"truy cập và một <abbr title=\"Secure Copy\">SCP</abbr> server tích hợp"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr ""
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr ""
+
+msgid "EAP-Method"
+msgstr "EAP-Method"
+
+msgid "Edit"
+msgstr "Chỉnh sửa"
+
+msgid "Edit this interface"
+msgstr ""
+
+msgid "Edit this network"
+msgstr ""
+
+msgid "Emergency"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "Kích hoạt <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr ""
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr ""
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr ""
+
+msgid "Enable NTP client"
+msgstr ""
+
+msgid "Enable TFTP server"
+msgstr ""
+
+msgid "Enable VLAN functionality"
+msgstr ""
+
+msgid "Enable learning and aging"
+msgstr ""
+
+msgid "Enable this mount"
+msgstr ""
+
+msgid "Enable this swap"
+msgstr ""
+
+msgid "Enable/Disable"
+msgstr "Cho kích hoạt/ Vô hiệu hóa"
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "Kích hoạt Spanning Tree Protocol trên cầu nối này"
+
+msgid "Encapsulation mode"
+msgstr ""
+
+msgid "Encryption"
+msgstr "Encryption"
+
+msgid "Erasing..."
+msgstr ""
+
+msgid "Error"
+msgstr "Lỗi"
+
+msgid "Ethernet Adapter"
+msgstr "Bộ tương hợp ethernet"
+
+msgid "Ethernet Switch"
+msgstr "Bộ chuyển đảo ethernet"
+
+msgid "Expand hosts"
+msgstr ""
+
+msgid "Expires"
+msgstr ""
+
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr ""
+
+msgid "External system log server port"
+msgstr ""
+
+msgid "Fast Frames"
+msgstr "Khung nhanh"
+
+msgid "File"
+msgstr ""
+
+msgid "Filename of the boot image advertised to clients"
+msgstr ""
+
+msgid "Filesystem"
+msgstr "Tập tin hệ thống"
+
+msgid "Filter"
+msgstr "Lọc"
+
+msgid "Filter private"
+msgstr "Filter private"
+
+msgid "Filter useless"
+msgstr "Lọc không hữu dụng"
+
+msgid "Find and join network"
+msgstr ""
+
+msgid "Find package"
+msgstr "Tìm gói"
+
+msgid "Finish"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall Settings"
+msgstr ""
+
+msgid "Firewall Status"
+msgstr ""
+
+msgid "Firmware Version"
+msgstr ""
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr ""
+
+msgid "Flags"
+msgstr "Cờ"
+
+msgid "Flash Firmware"
+msgstr "Phần cứng flash"
+
+msgid "Flash image..."
+msgstr ""
+
+msgid "Flash new firmware image"
+msgstr ""
+
+msgid "Flash operations"
+msgstr ""
+
+msgid "Flashing..."
+msgstr ""
+
+msgid "Force"
+msgstr "Force"
+
+msgid "Force 40MHz mode"
+msgstr ""
+
+msgid "Force CCMP (AES)"
+msgstr ""
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr ""
+
+msgid "Force TKIP"
+msgstr ""
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr ""
+
+msgid "Forward DHCP traffic"
+msgstr ""
+
+msgid "Forward broadcast traffic"
+msgstr ""
+
+msgid "Forwarding mode"
+msgstr ""
+
+msgid "Fragmentation Threshold"
+msgstr "Ngưỡng cửa Phân đoạn"
+
+msgid "Frame Bursting"
+msgstr "Khung nổ"
+
+msgid "Free"
+msgstr ""
+
+msgid "Free space"
+msgstr ""
+
+msgid "Frequency Hopping"
+msgstr "Tần số Hopping"
+
+msgid "GHz"
+msgstr ""
+
+msgid "GPRS only"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Gateway ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General Setup"
+msgstr ""
+
+msgid "Generate archive"
+msgstr ""
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr ""
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr "Đi tới trang cấu hình thích hợp"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr ""
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr ""
+
+msgid "Hang Up"
+msgstr "Hang Up"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr ""
+"Ở đây bạn có thể cấu hình những đặc tính cơ bản của thiết bị như tên máy chủ "
+"hoặc múi giờ."
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr ""
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "Giấu <abbr title=\"Chế độ mở rộng đặt Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "Host entries"
+
+msgid "Host expiry timeout"
+msgstr ""
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+
+msgid "Hostname"
+msgstr "Tên host"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr ""
+
+msgid "Hostnames"
+msgstr "Tên host"
+
+msgid "IP address"
+msgstr "Địa chỉ IP"
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 Firewall"
+msgstr ""
+
+msgid "IPv4 WAN Status"
+msgstr ""
+
+msgid "IPv4 address"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid "IPv4 gateway"
+msgstr ""
+
+msgid "IPv4 netmask"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv4 prefix length"
+msgstr ""
+
+msgid "IPv4-Address"
+msgstr ""
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr ""
+
+msgid "IPv6 address"
+msgstr ""
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "IPv6 prefix"
+msgstr ""
+
+msgid "IPv6 prefix length"
+msgstr ""
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr ""
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr ""
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr ""
+
+msgid "Identity"
+msgstr "Nhận dạng"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr ""
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr ""
+
+msgid "If unchecked, no default route is configured"
+msgstr ""
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr ""
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"Nếu bộ nhớ vật lý không đủ dữ liệu không dùng có thể được swap tạm thời đến "
+"một thiết bị swap để tạo ra nhiều khoảng trống hơn trong <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Hãy nhận biết rằng swapping dữ liệu là "
+"một quá trình rất chậm vì một thiết bị swap không thể được truy cập với  "
+"datarates cao hơn của <abbr title=\"Random Access Memory\">RAM</abbr>."
+
+msgid "Ignore Hosts files"
+msgstr ""
+
+msgid "Ignore interface"
+msgstr "Lờ đi giao diện"
+
+msgid "Ignore resolve file"
+msgstr "Lờ đi tập tin resolve"
+
+msgid "Image"
+msgstr ""
+
+msgid "In"
+msgstr "Trong"
+
+msgid "Inactivity timeout"
+msgstr ""
+
+msgid "Inbound:"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Initscript"
+msgstr "Initscript"
+
+msgid "Initscripts"
+msgstr "Initscripts"
+
+msgid "Install"
+msgstr "Cài đặt "
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr ""
+
+msgid "Install protocol extensions..."
+msgstr ""
+
+msgid "Installed packages"
+msgstr ""
+
+msgid "Interface"
+msgstr "Giao diện "
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface Overview"
+msgstr ""
+
+msgid "Interface is reconnecting..."
+msgstr ""
+
+msgid "Interface is shutting down..."
+msgstr ""
+
+msgid "Interface not present or not connected yet."
+msgstr ""
+
+msgid "Interface reconnected"
+msgstr ""
+
+msgid "Interface shut down"
+msgstr ""
+
+msgid "Interfaces"
+msgstr "Giao diện "
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Invalid"
+msgstr "Giá trị nhập vào không hợp lí"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr ""
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr ""
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "Tên và mật mã không đúng. Xin thử lại "
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr ""
+"Dường như bạn cố gắng flash một hình ảnh không phù hợp với bộ nhớ flash, xin "
+"vui lòng xác minh các tập tin hình ảnh!"
+
+msgid "Java Script required!"
+msgstr ""
+
+msgid "Join Network"
+msgstr ""
+
+msgid "Join Network: Settings"
+msgstr ""
+
+msgid "Join Network: Wireless Scan"
+msgstr ""
+
+msgid "Keep settings"
+msgstr ""
+
+msgid "Kernel Log"
+msgstr "Kernel Log"
+
+msgid "Kernel Version"
+msgstr ""
+
+msgid "Key"
+msgstr "Phím "
+
+msgid "Key #%d"
+msgstr ""
+
+msgid "Kill"
+msgstr "Kill"
+
+msgid "L2TP"
+msgstr ""
+
+msgid "L2TP Server"
+msgstr ""
+
+msgid "LCP echo failure threshold"
+msgstr ""
+
+msgid "LCP echo interval"
+msgstr ""
+
+msgid "LLC"
+msgstr ""
+
+msgid "Label"
+msgstr ""
+
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+msgid "Language and Style"
+msgstr ""
+
+msgid "Lease validity time"
+msgstr ""
+
+msgid "Leasefile"
+msgstr "Leasefile"
+
+msgid "Leasetime"
+msgstr "Leasetime"
+
+msgid "Leasetime remaining"
+msgstr "Leasetime còn lại"
+
+msgid "Leave empty to autodetect"
+msgstr ""
+
+msgid "Leave empty to use the current WAN address"
+msgstr ""
+
+msgid "Legend:"
+msgstr ""
+
+msgid "Limit"
+msgstr "Giới hạn "
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "Link On"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr ""
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr ""
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr ""
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr ""
+
+msgid "Listening port for inbound DNS queries"
+msgstr ""
+
+msgid "Load"
+msgstr "Tải "
+
+msgid "Load Average"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Local IPv4 address"
+msgstr ""
+
+msgid "Local IPv6 address"
+msgstr ""
+
+msgid "Local Startup"
+msgstr ""
+
+msgid "Local Time"
+msgstr "Giờ địa phương"
+
+msgid "Local domain"
+msgstr ""
+
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr ""
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr ""
+
+msgid "Local server"
+msgstr ""
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr ""
+
+msgid "Localise queries"
+msgstr "Tra vấn địa phương"
+
+msgid "Locked to channel %d used by %s"
+msgstr ""
+
+msgid "Log output level"
+msgstr ""
+
+msgid "Log queries"
+msgstr "Bản ghi tra vấn"
+
+msgid "Logging"
+msgstr ""
+
+msgid "Login"
+msgstr "Đăng nhập "
+
+msgid "Logout"
+msgstr "Thoát ra"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr ""
+
+msgid "MAC-Address"
+msgstr ""
+
+msgid "MAC-Address Filter"
+msgstr "Lọc địa chỉ MAC"
+
+msgid "MAC-Filter"
+msgstr "Lọc MAC"
+
+msgid "MAC-List"
+msgstr "Danh sách MAC"
+
+msgid "MB/s"
+msgstr ""
+
+msgid "MHz"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Maximum Rate"
+msgstr "Mức cao nhất"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr ""
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr ""
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr ""
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr ""
+
+msgid "Maximum hold time"
+msgstr "Mức cao nhất"
+
+msgid "Maximum number of leased addresses."
+msgstr ""
+
+msgid "Mbit/s"
+msgstr ""
+
+msgid "Memory"
+msgstr "Bộ nhớ"
+
+msgid "Memory usage (%)"
+msgstr "Memory usage (%)"
+
+msgid "Metric"
+msgstr "Metric"
+
+msgid "Minimum Rate"
+msgstr "Mức thấp nhất"
+
+msgid "Minimum hold time"
+msgstr "Mức thấp nhất"
+
+msgid "Missing protocol extension for proto %q"
+msgstr ""
+
+msgid "Mode"
+msgstr "Chế độ"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "Thiết bị modem"
+
+msgid "Modem init timeout"
+msgstr ""
+
+msgid "Monitor"
+msgstr "Monitor"
+
+msgid "Mount Entry"
+msgstr ""
+
+msgid "Mount Point"
+msgstr "Lắp điểm"
+
+msgid "Mount Points"
+msgstr "Lắp điểm"
+
+msgid "Mount Points - Mount Entry"
+msgstr ""
+
+msgid "Mount Points - Swap Entry"
+msgstr ""
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr ""
+"Số điểm lắp xác định tại một điểm mà ở đó bộ nhớ sẽ được gắn vào hệ thống "
+"tập tin"
+
+msgid "Mount options"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
+msgid "Mounted file systems"
+msgstr "Lắp tập tin hệ thống"
+
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
+msgid "Multicast Rate"
+msgstr "Multicast Rate"
+
+msgid "Multicast address"
+msgstr ""
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr ""
+
+msgid "Name"
+msgstr "Tên"
+
+msgid "Name of the new interface"
+msgstr ""
+
+msgid "Name of the new network"
+msgstr ""
+
+msgid "Navigation"
+msgstr "Sự điều hướng"
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr "mạng lưới "
+
+msgid "Network Utilities"
+msgstr ""
+
+msgid "Network boot image"
+msgstr ""
+
+msgid "Network without interfaces."
+msgstr ""
+
+msgid "Next »"
+msgstr ""
+
+msgid "No DHCP Server configured for this interface"
+msgstr ""
+
+msgid "No chains in this table"
+msgstr "Không có chuỗi trong bảng này"
+
+msgid "No files found"
+msgstr ""
+
+msgid "No information available"
+msgstr ""
+
+msgid "No negative cache"
+msgstr ""
+
+msgid "No network configured on this device"
+msgstr ""
+
+msgid "No network name specified"
+msgstr ""
+
+msgid "No package lists available"
+msgstr ""
+
+msgid "No password set!"
+msgstr ""
+
+msgid "No rules in this chain"
+msgstr "Không có quy luật trong chuỗi này"
+
+msgid "No zone assigned"
+msgstr ""
+
+msgid "Noise"
+msgstr ""
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "Not Found"
+msgstr ""
+
+msgid "Not associated"
+msgstr ""
+
+msgid "Not connected"
+msgstr ""
+
+msgid "Note: Configuration files will be erased."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Nslookup"
+msgstr ""
+
+msgid "OK"
+msgstr "OK "
+
+msgid "OPKG-Configuration"
+msgstr "Cấu hình OPKG-"
+
+msgid "Off-State Delay"
+msgstr ""
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"Trên trang này bạn có thể định cấu hình giao diện network. Bạn có thể bắt "
+"cầu nhiều giao diện bằng cách đánh dấu &amp;quot;bridge interfaces&amp;quot; "
+"field và nhập tên vào của nhiều giao diện network phân tách bởi những khoảng "
+"trống. Bạn có thể cũng dùng <abbr title=\"Virtual Local Area Network\">VLAN</"
+"abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e."
+"g.</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr ""
+
+msgid "One of hostname or mac address must be specified!"
+msgstr ""
+
+msgid "One or more fields contain invalid values!"
+msgstr ""
+
+msgid "One or more required fields have no value!"
+msgstr ""
+
+msgid "Open list..."
+msgstr ""
+
+msgid "Option changed"
+msgstr ""
+
+msgid "Option removed"
+msgstr ""
+
+msgid "Options"
+msgstr "Lựa chọn "
+
+msgid "Other:"
+msgstr ""
+
+msgid "Out"
+msgstr "Ra khỏi"
+
+msgid "Outbound:"
+msgstr ""
+
+msgid "Outdoor Channels"
+msgstr "Kênh ngoại mạng"
+
+msgid "Override MAC address"
+msgstr ""
+
+msgid "Override MTU"
+msgstr ""
+
+msgid "Override the gateway in DHCP responses"
+msgstr ""
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr ""
+
+msgid "Override the table used for internal routes"
+msgstr ""
+
+msgid "Overview"
+msgstr "Nhìn chung"
+
+msgid "Owner"
+msgstr "Owner"
+
+msgid "PAP/CHAP password"
+msgstr ""
+
+msgid "PAP/CHAP username"
+msgstr ""
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr ""
+
+msgid "PPP"
+msgstr ""
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA Encapsulation"
+
+msgid "PPPoATM"
+msgstr ""
+
+msgid "PPPoE"
+msgstr ""
+
+msgid "PPtP"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Package lists are older than 24 hours"
+msgstr ""
+
+msgid "Package name"
+msgstr "Tên gói"
+
+msgid "Packets"
+msgstr "Gói tin"
+
+msgid "Part of zone %q"
+msgstr ""
+
+msgid "Password"
+msgstr "Mật mã"
+
+msgid "Password authentication"
+msgstr "Xác thực mật mã"
+
+msgid "Password of Private Key"
+msgstr "Mật mã của private key"
+
+msgid "Password successfully changed!"
+msgstr ""
+
+msgid "Path to CA-Certificate"
+msgstr "Đường dẫn tới CA-Certificate"
+
+msgid "Path to Client-Certificate"
+msgstr ""
+
+msgid "Path to Private Key"
+msgstr "Đường dẫn tới private key"
+
+msgid "Path to executable which handles the button event"
+msgstr ""
+
+msgid "Peak:"
+msgstr ""
+
+msgid "Perform reboot"
+msgstr "Tiến hành reboot"
+
+msgid "Perform reset"
+msgstr ""
+
+msgid "Phy Rate:"
+msgstr ""
+
+msgid "Physical Settings"
+msgstr "Cài đặt căn bản"
+
+msgid "Ping"
+msgstr ""
+
+msgid "Pkts."
+msgstr ""
+
+msgid "Please enter your username and password."
+msgstr "Nhập tên và mật mã"
+
+msgid "Please wait: Device rebooting..."
+msgstr "Xin chờ: Công cụ đang reboot"
+
+msgid "Policy"
+msgstr "Chính sách"
+
+msgid "Port"
+msgstr "Cá»­a "
+
+msgid "Port %d"
+msgstr ""
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr ""
+
+msgid "Port status:"
+msgstr ""
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr ""
+
+msgid "Prevents client-to-client communication"
+msgstr "Ngăn chặn giao tiếp giữa client-và-client"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr ""
+
+msgid "Proceed"
+msgstr "Proceed"
+
+msgid "Processes"
+msgstr "Processes"
+
+msgid "Prot."
+msgstr "Prot."
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Protocol family"
+msgstr ""
+
+msgid "Protocol of the new interface"
+msgstr ""
+
+msgid "Protocol support is not installed"
+msgstr ""
+
+msgid "Provide NTP server"
+msgstr ""
+
+msgid "Provide new network"
+msgstr ""
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "Pseudo Ad-Hoc (ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr ""
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS Threshold"
+
+msgid "RX"
+msgstr "RX"
+
+msgid "RX Rate"
+msgstr ""
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr ""
+
+msgid "Radius-Accounting-Port"
+msgstr ""
+
+msgid "Radius-Accounting-Secret"
+msgstr ""
+
+msgid "Radius-Accounting-Server"
+msgstr ""
+
+msgid "Radius-Authentication-Port"
+msgstr ""
+
+msgid "Radius-Authentication-Secret"
+msgstr ""
+
+msgid "Radius-Authentication-Server"
+msgstr ""
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"Đọc <code>/etc/ethers</code> để định cấu hình <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+
+msgid "Really reset all changes?"
+msgstr ""
+
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+
+msgid "Really switch protocol?"
+msgstr ""
+
+msgid "Realtime Connections"
+msgstr ""
+
+msgid "Realtime Graphs"
+msgstr ""
+
+msgid "Realtime Load"
+msgstr ""
+
+msgid "Realtime Traffic"
+msgstr ""
+
+msgid "Realtime Wireless"
+msgstr ""
+
+msgid "Rebind protection"
+msgstr ""
+
+msgid "Reboot"
+msgstr "Reboot"
+
+msgid "Rebooting..."
+msgstr ""
+
+msgid "Reboots the operating system of your device"
+msgstr "Reboots hệ điều hành của công cụ"
+
+msgid "Receive"
+msgstr "Receive"
+
+msgid "Receiver Antenna"
+msgstr "Máy thu Antenna"
+
+msgid "Reconnect this interface"
+msgstr ""
+
+msgid "Reconnecting interface"
+msgstr ""
+
+msgid "References"
+msgstr "Tham chiếu"
+
+msgid "Regulatory Domain"
+msgstr "Miền điều chỉnh"
+
+msgid "Relay"
+msgstr ""
+
+msgid "Relay Bridge"
+msgstr ""
+
+msgid "Relay between networks"
+msgstr ""
+
+msgid "Relay bridge"
+msgstr ""
+
+msgid "Remote IPv4 address"
+msgstr ""
+
+msgid "Remove"
+msgstr "Loại bỏ"
+
+msgid "Repeat scan"
+msgstr ""
+
+msgid "Replace entry"
+msgstr "thay đổi nội dung"
+
+msgid "Replace wireless configuration"
+msgstr ""
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr ""
+
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Reset Counters"
+msgstr "Reset bộ đếm"
+
+msgid "Reset to defaults"
+msgstr ""
+
+msgid "Resolv and Hosts Files"
+msgstr ""
+
+msgid "Resolve file"
+msgstr ""
+
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Firewall"
+msgstr "Khởi động lại Firewall"
+
+msgid "Restore backup"
+msgstr "Phục hồi backup"
+
+msgid "Reveal/hide password"
+msgstr ""
+
+msgid "Revert"
+msgstr "Revert"
+
+msgid "Root"
+msgstr ""
+
+msgid "Root directory for files served via TFTP"
+msgstr ""
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr ""
+
+msgid "Routes"
+msgstr "Routes"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr ""
+"Routes chỉ định trên giao diện và cổng một host nhất định hay network được "
+"tiếp cận."
+
+msgid "Rule #"
+msgstr ""
+
+msgid "Run a filesystem check before mounting the device"
+msgstr ""
+
+msgid "Run filesystem check"
+msgstr ""
+
+msgid "SSH Access"
+msgstr ""
+
+msgid "SSH-Keys"
+msgstr ""
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "LÆ°u"
+
+msgid "Save & Apply"
+msgstr "Lưu & áp dụng "
+
+msgid "Save &#38; Apply"
+msgstr ""
+
+msgid "Scan"
+msgstr "Scan"
+
+msgid "Scheduled Tasks"
+msgstr "Scheduled Tasks"
+
+msgid "Section added"
+msgstr ""
+
+msgid "Section removed"
+msgstr ""
+
+msgid "See \"mount\" manpage for details"
+msgstr ""
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr ""
+
+msgid "Separate Clients"
+msgstr "Cô lập đối tượng"
+
+msgid "Separate WDS"
+msgstr "Phân tách WDS"
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Service Name"
+msgstr ""
+
+msgid "Service Type"
+msgstr ""
+
+msgid "Services"
+msgstr "Dịch vụ "
+
+msgid "Set up Time Synchronization"
+msgstr ""
+
+msgid "Setup DHCP Server"
+msgstr ""
+
+msgid "Show current backup file list"
+msgstr ""
+
+msgid "Shutdown this interface"
+msgstr ""
+
+msgid "Shutdown this network"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Signal:"
+msgstr ""
+
+msgid "Size"
+msgstr "Dung lượng "
+
+msgid "Skip"
+msgstr ""
+
+msgid "Skip to content"
+msgstr "Nhảy tới nội dung"
+
+msgid "Skip to navigation"
+msgstr "Chuyển đến mục định hướng"
+
+msgid "Slot time"
+msgstr ""
+
+msgid "Software"
+msgstr "Phần mềm"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr ""
+
+msgid "Sorry, the object you requested was not found."
+msgstr ""
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr ""
+
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "Source"
+msgstr "Nguồn"
+
+msgid "Specifies the button state to handle"
+msgstr ""
+
+msgid "Specifies the directory the device is attached to"
+msgstr ""
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr ""
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
+msgstr ""
+
+msgid "Start"
+msgstr "Bắt đầu "
+
+msgid "Start priority"
+msgstr "Bắt đầu ưu tiên"
+
+msgid "Startup"
+msgstr ""
+
+msgid "Static IPv4 Routes"
+msgstr "Static IPv4 Routes"
+
+msgid "Static IPv6 Routes"
+msgstr "Static IPv6 Routes"
+
+msgid "Static Leases"
+msgstr "Thống kê leases"
+
+msgid "Static Routes"
+msgstr "Static Routes"
+
+msgid "Static WDS"
+msgstr ""
+
+msgid "Static address"
+msgstr ""
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+
+msgid "Status"
+msgstr "Tình trạng"
+
+msgid "Stop"
+msgstr ""
+
+msgid "Strict order"
+msgstr "Yêu cầu nghiêm ngặt"
+
+msgid "Submit"
+msgstr "Trình "
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr ""
+
+msgid "Switch"
+msgstr "chuyển đổi"
+
+msgid "Switch %q"
+msgstr ""
+
+msgid "Switch %q (%s)"
+msgstr ""
+
+msgid "Switch protocol"
+msgstr ""
+
+msgid "Sync with browser"
+msgstr ""
+
+msgid "Synchronizing..."
+msgstr ""
+
+msgid "System"
+msgstr "Hệ thống"
+
+msgid "System Log"
+msgstr "System Log"
+
+msgid "System Properties"
+msgstr ""
+
+msgid "System log buffer size"
+msgstr ""
+
+msgid "TCP:"
+msgstr ""
+
+msgid "TFTP Settings"
+msgstr ""
+
+msgid "TFTP server root"
+msgstr ""
+
+msgid "TX"
+msgstr "TX"
+
+msgid "TX Rate"
+msgstr ""
+
+msgid "Table"
+msgstr "Bảng"
+
+msgid "Target"
+msgstr "Đích"
+
+msgid "Terminate"
+msgstr "Terminate"
+
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr ""
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"Tập tin công cụ của bộ nhớ hoặc phân vùng (<abbr title=\"Ví dụ\">e.g.</abbr> "
+"<code>/dev/sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"Filesystem mà được dùng để format memory (<abbr title=\"for example\">e.g.</"
+"abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+
+msgid "The following changes have been committed"
+msgstr ""
+
+msgid "The following changes have been reverted"
+msgstr "Những thay đối sau đây đã được để trở về tình trạng cũ. "
+
+msgid "The following rules are currently active on this system."
+msgstr ""
+
+msgid "The given network name is not unique"
+msgstr ""
+
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr ""
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr ""
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr ""
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+
+msgid "The selected protocol needs a device assigned"
+msgstr ""
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"Hệ thống bây giờ đang flashing.<br /> DO NOT POWER OFF THE DEVICE!<br /> Chờ "
+"một vài phút cho tới khi kết nối lại. Có thể cần phải làm mới địa chỉ của "
+"máy tính để tiếp cận thiết bị một lần nữa, phụ thuộc vào cài đặt của bạn. "
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"Tập tin đang tải hình ảnh không bao gồm một hổ trợ format. Bảo đảm rằng bạn "
+"chọn một image format tổng quát cho platform."
+
+msgid "There are no active leases."
+msgstr ""
+
+msgid "There are no pending changes to apply!"
+msgstr ""
+
+msgid "There are no pending changes to revert!"
+msgstr ""
+
+msgid "There are no pending changes!"
+msgstr ""
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr ""
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr ""
+
+msgid "This IPv4 address of the relay"
+msgstr ""
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr ""
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"Đây là <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> duy "
+"nhất trong mạng địa phương. "
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "Đây là system crontab mà scheduled tasks có thể bị định nghĩa."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr ""
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr ""
+"List này đưa ra một tầm nhìn tổng quát về xử lý hệ thống đang chạy và tình "
+"trạng của chúng."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr ""
+
+msgid "This page gives an overview over currently active network connections."
+msgstr ""
+"Trang này cung cấp một tổng quan về đang hoạt động kết nối mạng hiện tại."
+
+msgid "This section contains no values yet"
+msgstr "Phần này chưa có giá trị nào"
+
+msgid "Time Synchronization"
+msgstr ""
+
+msgid "Time Synchronization is not configured yet."
+msgstr ""
+
+msgid "Timezone"
+msgstr "Múi giờ "
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr ""
+
+msgid "Total Available"
+msgstr ""
+
+msgid "Traceroute"
+msgstr ""
+
+msgid "Traffic"
+msgstr ""
+
+msgid "Transfer"
+msgstr "Chuyển giao"
+
+msgid "Transmission Rate"
+msgstr "Truyền tải rate"
+
+msgid "Transmit"
+msgstr "Transmit"
+
+msgid "Transmit Power"
+msgstr "Truyền tải năng lượng"
+
+msgid "Transmitter Antenna"
+msgstr "Máy phát Antenna"
+
+msgid "Trigger"
+msgstr ""
+
+msgid "Trigger Mode"
+msgstr ""
+
+msgid "Tunnel ID"
+msgstr ""
+
+msgid "Tunnel Interface"
+msgstr ""
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Turbo Mode"
+
+msgid "Tx-Power"
+msgstr ""
+
+msgid "Type"
+msgstr "Loại "
+
+msgid "UDP:"
+msgstr ""
+
+msgid "UMTS only"
+msgstr ""
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr ""
+
+msgid "USB Device"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Unable to dispatch"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Unknown Error, password not changed!"
+msgstr ""
+
+msgid "Unmanaged"
+msgstr ""
+
+msgid "Unsaved Changes"
+msgstr "Thay đổi không lưu"
+
+msgid "Unsupported protocol type."
+msgstr ""
+
+msgid "Update lists"
+msgstr ""
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+
+msgid "Upload archive..."
+msgstr ""
+
+msgid "Uploaded File"
+msgstr "Tập tin đã tải lên"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "Dùng <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr ""
+
+msgid "Use DNS servers advertised by peer"
+msgstr ""
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr ""
+
+msgid "Use MTU on tunnel interface"
+msgstr ""
+
+msgid "Use TTL on tunnel interface"
+msgstr ""
+
+msgid "Use as root filesystem"
+msgstr ""
+
+msgid "Use broadcast flag"
+msgstr ""
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr ""
+
+msgid "Use default gateway"
+msgstr ""
+
+msgid "Use gateway metric"
+msgstr ""
+
+msgid "Use routing table"
+msgstr ""
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+
+msgid "Used"
+msgstr "Đã sử dụng"
+
+msgid "Used Key Slot"
+msgstr ""
+
+msgid "Username"
+msgstr "Tên người dùng "
+
+msgid "VC-Mux"
+msgstr ""
+
+msgid "VLAN Interface"
+msgstr ""
+
+msgid "VLANs on %q"
+msgstr ""
+
+msgid "VLANs on %q (%s)"
+msgstr ""
+
+msgid "VPN Server"
+msgstr ""
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr ""
+
+msgid "Verify"
+msgstr ""
+
+msgid "Version"
+msgstr "Phiên bản"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr ""
+
+msgid "WEP Shared Key"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WMM Mode"
+msgstr "WMM Mode"
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "Cảnh báo: Các thay đổi chưa lưu sẽ bị mất trong khi khởi động lại!"
+
+msgid "Wifi"
+msgstr "Wifi"
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless Adapter"
+msgstr "Bộ tương hợp không dây"
+
+msgid "Wireless Network"
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Wireless Security"
+msgstr ""
+
+msgid "Wireless is disabled or not associated"
+msgstr ""
+
+msgid "Wireless is restarting..."
+msgstr ""
+
+msgid "Wireless network is disabled"
+msgstr ""
+
+msgid "Wireless network is enabled"
+msgstr ""
+
+msgid "Wireless restarted"
+msgstr ""
+
+msgid "Wireless shut down"
+msgstr ""
+
+msgid "Write received DNS requests to syslog"
+msgstr ""
+
+msgid "XR Support"
+msgstr "Hỗ trợ XR"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"Bạn có thể bật hoặc tắt cài đặt init script tại đây. Thay đổi này sẽ được áp "
+"dụng sau khi một thiết bị khởi động lại.<br /><strong>Cảnh báo: Nếu bạn vô "
+"hiệu hoá init script thiết yếu như &amp;quot;network&amp;quot;, công cụ của "
+"bạn chó thể trở nên không truy cập được</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "auto"
+msgstr "tự động"
+
+#, fuzzy
+msgid "automatic"
+msgstr "thống kê"
+
+msgid "baseT"
+msgstr ""
+
+msgid "bridged"
+msgstr ""
+
+msgid "create:"
+msgstr ""
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "tạo một cầu nối trên một giao diện được chỉ định"
+
+msgid "dB"
+msgstr ""
+
+msgid "dBm"
+msgstr ""
+
+msgid "disable"
+msgstr "Vô hiệu hóa"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"Tập tin được cho <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases sẽ được lưu trữ"
+
+msgid "forward"
+msgstr ""
+
+msgid "full-duplex"
+msgstr ""
+
+msgid "half-duplex"
+msgstr ""
+
+msgid "help"
+msgstr ""
+
+msgid "hidden"
+msgstr ""
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "Nếu mục tiêu là một network"
+
+msgid "input"
+msgstr ""
+
+msgid "kB"
+msgstr ""
+
+msgid "kB/s"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "Tập tin <abbr title=\"Domain Name System\">DNS</abbr> địa phương"
+
+msgid "no"
+msgstr ""
+
+msgid "no link"
+msgstr ""
+
+msgid "none"
+msgstr "không "
+
+msgid "off"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "open"
+msgstr ""
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr ""
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "unlimited"
+msgstr ""
+
+msgid "unspecified"
+msgstr ""
+
+msgid "unspecified -or- create:"
+msgstr ""
+
+msgid "untagged"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "« Back"
+msgstr ""
+
+#~ msgid "Active Leases"
+#~ msgstr "Leases hoạt động"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Mã hóa\">Encr.</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "<abbr title=\"Mạng lưới không dây địa phương\">WLAN</abbr>-Scan"
+
+#~ msgid "Create Network"
+#~ msgstr "Tạo network"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Networks"
+#~ msgstr "mạng lưới"
+
+#~ msgid "Power"
+#~ msgstr "Power"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "Mạng lưới wifi ở môi trường xung quanh bạn"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Hệ thông tên miền\">DNS</abbr>-Máy chủ"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "Cổng network trên bộ định tuyến có thể phối hợp với nhiều <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s làm máy tính tự giao tiếp "
+#~ "trực tiếp với nhau. <abbr title=\"Virtual Local Area Network\">VLAN</"
+#~ "abbr>s thường được dùng để phân tách những phân đoạn network khác nhau. "
+#~ "Thông thường có một cổng Uplink mặc định cho một kết nối vào mạng lớn hơn "
+#~ "như Internet và các cổng khác cho một mạng lưới địa phương."
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "Tập tin được lưu giữ khi truyền tới một phần cứng mới"
+
+#~ msgid "General"
+#~ msgstr "Tổng quát"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Ở đây bạn có thể tùy chỉnh các cài đặt và các chức năng của <abbr title="
+#~ "\"Cấu hình giao diện Lua\">LuCI</abbr>."
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Đăng _ cam kết hành động"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "Những lệnh này sẽ được thực hiện tự động khi một <abbr title=\"Cấu hình "
+#~ "giao diện thống nhất \">UCI</abbr> được cam kết cho phép các thay đổi "
+#~ "được áp dụng ngay lập tức. "
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "Điểm truy cập (APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "Tùy chọn pppd bổ sung"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "Tự động ngừng kết nối"
+
+#~ msgid "Backup Archive"
+#~ msgstr "Backup Archive"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr ""
+#~ "Định cấu hình DNS server địa phương để dùng tên servers adverticed bởi "
+#~ "PPP peer"
+
+#~ msgid "Connect script"
+#~ msgstr "Kết nối script"
+
+#~ msgid "Create backup"
+#~ msgstr "Tạo backup"
+
+#~ msgid "Disconnect script"
+#~ msgstr "Ngừng script"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "Chỉnh sửa danh sách gói và mục tiêu cài đặt"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "Kích hoạt IPv6 on PPP link"
+
+#~ msgid "Firmware image"
+#~ msgstr "HÌnh ảnh firmware"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr ""
+#~ "Ở đây bạn có thể backup và khôi phục lại cấu hình bộ định tuyến và- nếu "
+#~ "có thể - reset bộ định tuyến ở cài đặt mặc định."
+
+#~ msgid "Installation targets"
+#~ msgstr "Mục tiêu cài đặt"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "Giữ tập tin cấu hình"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "Giữ-alive"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr ""
+#~ "Để pppd thay thế route mặc định hiện tại để dùng giao diện PPP sau khi "
+#~ "kết nối thành công"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "Để pppd chạy script này sau khi thành lập PPP link"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "Để pppd chạy trên script trước khi phá vỡ PPP link"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr ""
+#~ "Bảo đảm rằng bạn cung cấp pin code chính xác ở đây hoặc sim card của bạn "
+#~ "sẽ bị khóa"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "Đa số các mạng server mà cung cấp một service nhất định cho công cụ của "
+#~ "bạn hoặc mạng như shell access, phục vụ các trang web như <abbr title="
+#~ "\"Giao diện cấu hình Lua\">LuCI</abbr>, làm lưới định tuyến, gửi e-"
+#~ "mail, ..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr "Kiểm tra số lượng kết nối không thành công để tự động kết nối lại. "
+
+#~ msgid "PIN code"
+#~ msgstr "PIN code"
+
+#~ msgid "PPP Settings"
+#~ msgstr "Cài đặt "
+
+#~ msgid "Package lists"
+#~ msgstr "Danh sách đóng gói"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "Tiến trình này sẽ chuyển mọi thiết lập về firmware mặc định"
+
+#~ msgid "Processor"
+#~ msgstr "Bộ xử lý"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radius-Port"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radius-Server"
+
+#~ msgid "Replace default route"
+#~ msgstr "Thay thế route mặc định"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "Đặt lại bộ định tuyến ở chế độ mặc định"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr "Giây để chờ cho modem trở nên sẵn sàng trước khi kết nối"
+
+#~ msgid "Service type"
+#~ msgstr "Service type"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr ""
+#~ "Services và daemons tiến hành nhưng công đoạn nhất định trên công cụ của "
+#~ "bạn"
+
+#~ msgid "Settings"
+#~ msgstr "Cài đặt "
+
+#~ msgid "Setup wait time"
+#~ msgstr "Cài đặt thời gian chờ"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr ""
+#~ "Xin lỗi. libreCMC không hỗ trợ nâng cấp hệ thống trên platform này. <br /> "
+#~ "Bạn cần tự flash thiết bị của bạn. "
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "Chỉ định những dòng lệnh tranh cãi cho pppd ở đây"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "Thiết bị node của modem, e.g. /dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "Thời gian (giây) sau khi một kết nối không sử dụng sẽ bị đóng"
+
+#~ msgid "Update package lists"
+#~ msgstr "Cập nhật danh sách gói"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "Tải một tập tin hình ảnh libreCMC để reflash thiết bị."
+
+#~ msgid "Upload image"
+#~ msgstr "Tải hình ảnh"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "Dùng peer DNS"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "Bạn cần cài đặt &amp;quot;comgt&amp;quot; for UMTS/GPRS, &amp;quot;ppp-"
+#~ "mod-pppoe&amp;quot; for PPPoE, &amp;quot;ppp-mod-pppoa&amp;quot; for "
+#~ "PPPoA or &amp;quot;pptp&amp;quot; for PPtP support"
+
+#~ msgid "back"
+#~ msgstr "quay lại"
+
+#~ msgid "buffered"
+#~ msgstr "buffered"
+
+#~ msgid "cached"
+#~ msgstr "cached"
+
+#~ msgid "free"
+#~ msgstr "free"
+
+#~ msgid "static"
+#~ msgstr "thống kê"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Cấu hình giao diện Lua \">LuCI</abbr> là một tập hợp của "
+#~ "phần mềm Lua bao gồm <abbr title=\"Model-View-Controller\">MVC</abbr>-"
+#~ "Công cụ Web và giao diện Web cho thiết bị nhúng. <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr> được lưu hành dưới giấy phép Apache."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "<abbr title=\"Vỏ bảo mậtl\">SSH</abbr>-Phím"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr ""
+#~ "Một lightưeight HTTP/1.1 webserver viết bằng C và Lúa được thiết kế để "
+#~ "phục vụ LuCI"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Một webserver nhỏ  có thể dùng để phục vụ <abbr title=\"Giao diện cấu "
+#~ "hình Lua\">LuCI</abbr>."
+
+#~ msgid "About"
+#~ msgstr "Về"
+
+#~ msgid "Addresses"
+#~ msgstr "Địa chỉ"
+
+#~ msgid "Admin Password"
+#~ msgstr "Mật khẩu quản lí"
+
+#~ msgid "Alias"
+#~ msgstr "Bí danh"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "Realm xác định"
+
+#~ msgid "Bridge Port"
+#~ msgstr "Cổng cầu nối"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr "Thay đổi mật mã của quản lí hệ thống (User <code>root</code>)"
+
+#~ msgid "Client + WDS"
+#~ msgstr "Đối tượng + WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "Tập tin cấu hình"
+
+#~ msgid "Connection timeout"
+#~ msgstr "Kết nối dừng"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "Phát triển viên"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "Gán DHCP"
+
+#~ msgid "Document root"
+#~ msgstr "Gốc tài liệu "
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "Kích hoạt Keep-Alive"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "Cầu nối ethernet"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "ở đây bạn có thể dán công khai <abbr title=\"Secure Shell\"> SSH</abbr>-"
+#~ "Keys (mỗi cái một dòng) for <abbr title=\"Secure Shell\">SSH</abbr> xác "
+#~ "thực khóa công khai"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "Cấu hình IP"
+
+#~ msgid "Interface Status"
+#~ msgstr "Tình trạng giao diện"
+
+#~ msgid "Lead Development"
+#~ msgstr "Dẫn đầu phát triển"
+
+#~ msgid "Master"
+#~ msgstr "Chủ"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Chủ + WDS"
+
+#~ msgid "Not configured"
+#~ msgstr "Không định cấu hình"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "Mật mã đã thay đổi thành công"
+
+#~ msgid "Plugin path"
+#~ msgstr "Đường dẫn Plugin"
+
+#~ msgid "Ports"
+#~ msgstr "Cá»­a"
+
+#~ msgid "Primary"
+#~ msgstr "Chính"
+
+#~ msgid "Project Homepage"
+#~ msgstr "Trang chủ dự án"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "Pseudo Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "Cám ơn"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr ""
+#~ "Realm đó sẽ được hiển thị tại dấu nhắc xác thực cho các trang web được "
+#~ "bảo vệ."
+
+#~ msgid "Unknown Error"
+#~ msgstr "Không hiểu lỗi"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "Mặc định tới <code>/etc/httpd.conf</code>"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Danh sách gói đã được cập nhật"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "nâng cấp gói cài đặt"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr ""
+#~ "Kernel hoặc service logfiles cũng có thể được view ở đây để lấy tầm nhìn "
+#~ "tổng quát của hình trạng hiện tại. "
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "Ở đây bạn có thể tìm thấy thông tin về tình trạng của hệ thống hiện hành  "
+#~ "như là <abbr title=\"Bộ điều khiển trung tâm\">CPU</abbr> đồng hồ tần số, "
+#~ "bộ nhớ hoặc mạng lưới dữ liệu giao diện."
+
+#~ msgid "Search file..."
+#~ msgstr "Tìm tập tin..."
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Cấu hình giao diện Lua \">LuCI</abbr> thì miễn phí, đa "
+#~ "dạng , và đồ họa thân thiện với sử dụng cho các cấu hình libreCMC Kamikaze."
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "Và bây giờ hãy bắt đầu chơi với bộ định tuyến của bạn!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr ""
+#~ "Vì chúng tôi luôn muốn cải thiện giao diện này, chúng tôi hy vọng  nhận "
+#~ "được đóng góp và ý kiến của các bạn. "
+
+#~ msgid "Hello!"
+#~ msgstr "Xin chào"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "Ghi chú: Trong <abbr title=\"Cấu hình giao diện Lua \">LuCI</abbr> những "
+#~ "thay đổi phải được xác nhận bằng cách nhấn vào Changes - Save &amp; Áp "
+#~ "dụng trước khi được áp dụng."
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr ""
+#~ "Ở những trang kế tiếp, bạn có thể thay đổi những cài đặt quan trong của "
+#~ "bộ định tuyến."
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "Nhóm <abbr title=\"Cấu hình giao diện Lua\">LuCI</abbr> "
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "Đây là vùng quản trị của <abbr title=\"Cấu hình giao diện Lua\">LuCI</"
+#~ "abbr>."
+
+#~ msgid "User Interface"
+#~ msgstr "Giao diện người sử dụng"
+
+#~ msgid "enable"
+#~ msgstr "Kích hoạt"
+
+#, fuzzy
+#~ msgid "(optional)"
+#~ msgstr ""
+#~ "<span class=\"translation-space\"> </span>\n"
+#~ "(tùy ý)"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Cổng"
+
+#~ msgid ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in "
+#~ "the order of the resolvfile"
+#~ msgstr ""
+#~ "<abbr title=\"Domain Name System\">DNS</abbr>-Server sẽ bị tra vấn theo "
+#~ "thứ tự của tập tin resolv. "
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+#~ msgstr ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host "
+#~ "Configuration Protocol\">DHCP</abbr>-Leases"
+
+#~ msgid ""
+#~ "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms "
+#~ "for Domain Name System\">EDNS0</abbr> packet size"
+#~ msgstr ""
+#~ "<abbr title=\"tối đal\">max.</abbr> <abbr title=\"Mở rộng cơ chế cho hệ "
+#~ "thống tên miền\">EDNS0</abbr> dung lượng gói tin"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "AP-Isolation"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "Thêm mạng Wifi vào màng vật lý"
+
+#~ msgid "Aliases"
+#~ msgstr "Aliases"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "Clamp Segment Size"
+
+#, fuzzy
+#~ msgid "Create Or Attach Network"
+#~ msgstr "Tạo network"
+
+#~ msgid "Devices"
+#~ msgstr "Những công cụ"
+
+#~ msgid "Don't forward reverse lookups for local networks"
+#~ msgstr "Don&amp;#39;t chuyển tiếp lookups đảo ngược cho các mạng địa phương"
+
+#~ msgid "Enable TFTP-Server"
+#~ msgstr "Kích hoạt TFTP-Server"
+
+#~ msgid "Errors"
+#~ msgstr "Lỗi"
+
+#~ msgid "Essentials"
+#~ msgstr "Essentials"
+
+#~ msgid "Expand Hosts"
+#~ msgstr "Mở rộng Hosts"
+
+#~ msgid "First leased address"
+#~ msgstr "Địa chỉ lease đầu tiên"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr ""
+#~ "Chỉnh sửa vấn đề với những website không tiếp cận được, trình form hoặc "
+#~ "những hình thức bất ngờ cho một vài ISP."
+
+#~ msgid "Hardware Address"
+#~ msgstr "Địa chỉ phần cứng"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "Ở đây bạn có thể định cấu hình của công cụ wifi được cài đặt."
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "Lờ đi <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "Độc lập (Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Kết nối Internet"
+
+#~ msgid "Join (Client)"
+#~ msgstr "Tham gia (client)"
+
+#~ msgid "Leases"
+#~ msgstr "Leases"
+
+#~ msgid "Local Domain"
+#~ msgstr "Domain địa phương"
+
+#~ msgid "Local Network"
+#~ msgstr "Network địa phương"
+
+#~ msgid "Local Server"
+#~ msgstr "Server địa phương"
+
+#~ msgid "Network Boot Image"
+#~ msgstr "Hình ảnh khởi động mạng lưới"
+
+#~ msgid ""
+#~ "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</"
+#~ "abbr>)"
+#~ msgstr ""
+#~ "Tên mạng (<abbr title=\"Mở rộng dịch vụ đặt Identifier\">ESSID</abbr>)"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "Số của địa chỉ lease"
+
+#~ msgid "Path"
+#~ msgstr "Đường dẫn"
+
+#~ msgid "Perform Actions"
+#~ msgstr "Trình bày hành động"
+
+#~ msgid "Prevents Client to Client communication"
+#~ msgstr "Ngăn chặn giao tiếp giữa client-và-client"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "Cung cấp (Điểm truy cập)"
+
+#~ msgid "Resolvfile"
+#~ msgstr "Tập tin Resolv"
+
+#~ msgid "TFTP-Server Root"
+#~ msgstr "Gốc TFTP-Server "
+
+#~ msgid "TX / RX"
+#~ msgstr "TX / RX"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "Những thay đổi sau đây đã được tiến hành"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "Khi truyền đến phần cứng với  <abbr title=\"Cấu hình giao diện Lua "
+#~ "\">LuCI</abbr> Những tập tin này sẽ được bổ sung vào cài đặt phần cứng "
+#~ "mới."
+
+#, fuzzy
+#~ msgid "Wireless Scan"
+#~ msgstr "Mạng không dây"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "Với <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> thành "
+#~ "viên network có thể tự động nhận cài đặt mạng (<abbr title=\"Internet "
+#~ "Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System"
+#~ "\">DNS</abbr>-server, ...)."
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "Bạn có thể chạy nhiều mạng wifi với một công cụ. Hãy chú ý rằng một số "
+#~ "phần cứng và driverspecific bị hạn chế. Thông thường, bạn có thể vận hành "
+#~ "1 Ad-Hoc hay tối đa là 3-chế độ master và 1-chế độ client mạng lưới cùng "
+#~ "một lúc."
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr ""
+#~ "Bạn cần cài đặt &amp;quot;ppp-mod-pppoe&amp;quot; for PPPoE or &amp;quot;"
+#~ "pptp&amp;quot; cho hỗ trợ PPtP "
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "additional hostfile"
+#~ msgstr "Tập tin host bổ sung"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "Thêm tên miền vào hostentries trong tập tin resolv "
+
+#~ msgid "automatically reconnect"
+#~ msgstr "Tự động kết nối lại"
+
+#~ msgid "concurrent queries"
+#~ msgstr "Đồng truy vấn"
+
+#~ msgid ""
+#~ "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "for this interface"
+#~ msgstr ""
+#~ "Vô hiệu hóa <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+#~ "abbr> cho giao diện này"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "Ngừng kết nối khi idle cho"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "don&amp;#39;t cache unknown"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "lọc không hữu dụng <abbr title=\"Hệ thống tên miền\">DNS</abbr>-các tra "
+#~ "vấn của hệ thống Windows"
+
+#~ msgid "installed"
+#~ msgstr "Đã cài đặt "
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "Địa phương hóa các hostname phụ thuộc vào subnet"
+
+#~ msgid "not installed"
+#~ msgstr "không cài đặt "
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr ""
+#~ "Ngăn ngừa tiêu cực trong bộ nhớ đệm <abbr title=\"Hệ thống tên miền"
+#~ "\">DNS</abbr>-trả lời"
+
+#~ msgid "query port"
+#~ msgstr "cổng truy vấn"
+
+#~ msgid "transmitted / received"
+#~ msgstr "Đã truyền/ đã nhận"
+
+#, fuzzy
+#~ msgid "Join network"
+#~ msgstr "contained networks"
+
+#~ msgid "all"
+#~ msgstr "tất cả"
+
+#~ msgid "Code"
+#~ msgstr "Mã"
+
+#~ msgid "Distance"
+#~ msgstr "Khoảng cách "
+
+#~ msgid "Legend"
+#~ msgstr "Legend"
+
+#~ msgid "Library"
+#~ msgstr "thư viện "
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "xem &amp;#39;%s&amp;#39; trang chính"
+
+#~ msgid "Package Manager"
+#~ msgstr "Quản lí gói"
+
+#~ msgid "Service"
+#~ msgstr "Dịch vụ "
+
+#~ msgid "Statistics"
+#~ msgstr "Thống kê"
+
+#~ msgid "zone"
+#~ msgstr "Zone"
diff --git a/trunk/package/luci/po/vi/commands.po b/trunk/package/luci/po/vi/commands.po
new file mode 100644
index 00000000..41322740
--- /dev/null
+++ b/trunk/package/luci/po/vi/commands.po
@@ -0,0 +1,91 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "A short textual description of the configured command"
+msgstr ""
+
+msgid "Access command with"
+msgstr ""
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr ""
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr ""
+
+msgid "Arguments:"
+msgstr ""
+
+msgid "Binary data not displayed, download instead."
+msgstr ""
+
+msgid "Code:"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Command failed"
+msgstr ""
+
+msgid "Command line to execute"
+msgstr ""
+
+msgid "Command successful"
+msgstr ""
+
+msgid "Command:"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Custom Commands"
+msgstr ""
+
+msgid "Custom arguments"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "Failed to execute command!"
+msgstr ""
+
+msgid "Link"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Public access"
+msgstr ""
+
+msgid "Run"
+msgstr ""
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/coovachilli.po b/trunk/package/luci/po/vi/coovachilli.po
new file mode 100644
index 00000000..66abf0dc
--- /dev/null
+++ b/trunk/package/luci/po/vi/coovachilli.po
@@ -0,0 +1,607 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-16 07:05+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli"
+
+msgid "Network Configuration"
+msgstr ""
+
+msgid "RADIUS configuration"
+msgstr ""
+
+msgid "UAM and MAC Authentication"
+msgstr ""
+
+#~ msgid "General configuration"
+#~ msgstr "Cấu hình tổng quát"
+
+#~ msgid "General CoovaChilli settings"
+#~ msgstr "Các cài đặt CoovaChilli tổng quát"
+
+#~ msgid "Command socket"
+#~ msgstr "Command socket"
+
+#~ msgid "UNIX socket used for communication with chilli_query"
+#~ msgstr "UNIX socket dùng để giao tiếp với chilli_query"
+
+#~ msgid "Config refresh interval"
+#~ msgstr "Config refresh interval"
+
+#~ msgid ""
+#~ "Re-read configuration file and do DNS lookups every interval seconds. "
+#~ "This has the same effect as sending the HUP signal. If interval is 0 "
+#~ "(zero) this feature is disabled. "
+#~ msgstr ""
+#~ "Đọc lại tập tin cấu hình và tra cưứ DNS mỗi giây. Cái này có ảnh hưởng "
+#~ "giống như đang gửi một tín hiệu HUP. Nếu  interval là 0, tính năng này sẽ "
+#~ "bị vô hiệu hóa. <span class=\"translation-space\"> </span> "
+
+#~ msgid "Pid file"
+#~ msgstr "Tập tin Pid"
+
+#~ msgid "Filename to put the process id"
+#~ msgstr "Tên tập tin để đặt làm ID xử lý"
+
+#~ msgid "State directory"
+#~ msgstr "Dạnh bạ vùng"
+
+#~ msgid "Directory of non-volatile data"
+#~ msgstr "Thư mục của những dữ liệu cố định"
+
+#~ msgid "TUN/TAP configuration"
+#~ msgstr "Cấu hình TUN/TAP"
+
+#~ msgid "Network/Tun configuration"
+#~ msgstr "Mạng lưới/ Cấu hình TUN"
+
+#~ msgid "Network down script"
+#~ msgstr "Network down script"
+
+#~ msgid ""
+#~ "Script executed after a session has moved from authorized state to "
+#~ "unauthorized"
+#~ msgstr ""
+#~ "Script đã thực hiện sau khi một section đã di chuyển từ nơi có thẩm quyền "
+#~ "đến nơi không"
+
+#~ msgid "Network up script"
+#~ msgstr "Network up script"
+
+#~ msgid "Script executed after the tun network interface has been brought up"
+#~ msgstr "Script thi hành sau khi giao diện mạng tun được đưa lên"
+
+#~ msgid "Primary DNS Server"
+#~ msgstr "Primary DNS Server"
+
+#~ msgid "Secondary DNS Server"
+#~ msgstr "Secondary DNS Server"
+
+#~ msgid "Domain name"
+#~ msgstr "Tên miền"
+
+#~ msgid ""
+#~ "Is used to inform the client about the domain name to use for DNS lookups"
+#~ msgstr ""
+#~ "Được sử dụng để thông báo cho khách hàng về tên miền để dùng cho các tra "
+#~ "cứu DNS"
+
+#~ msgid "Dynamic IP address pool"
+#~ msgstr "Dynamic IP address pool"
+
+#~ msgid "Specifies a pool of dynamic IP addresses"
+#~ msgstr "Chỉ định một pool of dynamic IP addresses"
+
+#~ msgid "IP down script"
+#~ msgstr "IP down script"
+
+#~ msgid "Script executed after the tun network interface has been taken down"
+#~ msgstr "Script thực hiện sau khi giao diện mạng tun bị lấy xuống"
+
+#~ msgid "IP up script"
+#~ msgstr "IP up script"
+
+#~ msgid ""
+#~ "Script executed after the TUN/TAP network interface has been brought up"
+#~ msgstr "Script thực hiện sau khi giao diện mạng TUN/TAP đã được đưa lên"
+
+#~ msgid "Uplink subnet"
+#~ msgstr "Uplink subnet"
+
+#~ msgid "Network address of the uplink interface (CIDR notation)"
+#~ msgstr "Địa chỉ mạng của giao diện uplink (CIDR chú thích)"
+
+#~ msgid "Static IP address pool"
+#~ msgstr "Static IP address pool"
+
+#~ msgid "Specifies a pool of static IP addresses"
+#~ msgstr "Chỉ định một pool of static IP addresses"
+
+#~ msgid "TUN/TAP device"
+#~ msgstr "TUN/TAP device"
+
+#~ msgid "The specific device to use for the TUN/TAP interface"
+#~ msgstr "Thiết bị cụ thể để dùng cho giao diện TUN/TAP"
+
+#~ msgid "TX queue length"
+#~ msgstr "Độ dài của TX queue"
+
+#~ msgid "The TX queue length to set on the TUN/TAP interface"
+#~ msgstr "Độ dài TX queue để đặt trên giao diện TUN/TAP "
+
+#~ msgid "Use TAP device"
+#~ msgstr "Dùng dụng cụ TAP"
+
+#~ msgid "Use the TAP interface instead of TUN"
+#~ msgstr "Dùng giao diện TAP thay cho TUN"
+
+#~ msgid "DHCP configuration"
+#~ msgstr "Cấu hình DHCP"
+
+#~ msgid "Set DHCP options for connecting clients"
+#~ msgstr "Đặt lựa chọn DHCP cho đối tượng kết nối"
+
+#~ msgid "DHCP end number"
+#~ msgstr "Số cuối DHCP"
+
+#~ msgid "Where to stop assigning IP addresses (default 254)"
+#~ msgstr "Chỗ để stop những gán IP (mặc định 254)"
+
+#~ msgid "DHCP interface"
+#~ msgstr "Giao diện DHCP"
+
+#~ msgid "Ethernet interface to listen to for the downlink interface"
+#~ msgstr "Giao diện Ethernet để listen cho những giao diện downlink "
+
+#~ msgid "Listen MAC address"
+#~ msgstr "Nghe địa chỉ MAC"
+
+#~ msgid ""
+#~ "MAC address to listen to. If not specified the MAC address of the "
+#~ "interface will be used"
+#~ msgstr ""
+#~ "Địa chỉ MAC để  nghe. Nếu địa chỉ MAC chỉ định của giao diện sẽ được sử "
+#~ "dụng "
+
+#~ msgid "DHCP start number"
+#~ msgstr "Số DHCP bắt đầu "
+
+#~ msgid "Where to start assigning IP addresses (default 10)"
+#~ msgstr "Chỗ để bắt đầu gán địa chỉ IP (mặc định 10)"
+
+#~ msgid "Enable IEEE 802.1x"
+#~ msgstr "Kích hoạt IEEE 802.1x"
+
+#~ msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
+#~ msgstr "Kích hoạt quá trình xác thực IEEE 802.1x và lắng nghe yêu cầu EAP"
+
+#~ msgid "Leasetime"
+#~ msgstr "Leasetime"
+
+#~ msgid "Use a DHCP lease of seconds (default 600)"
+#~ msgstr "Dùng một DHCP lease ở giây (600)"
+
+#~ msgid "Allow session update through RADIUS"
+#~ msgstr "Cho phép phiên cập nhật thông qua RADIUS"
+
+#~ msgid ""
+#~ "Allow updating of session parameters with RADIUS attributes sent in "
+#~ "Accounting-Response"
+#~ msgstr ""
+#~ "Cho phép phiên cập nhật tham số phiên với RADIUS được gửi trong "
+#~ "Accounting-Response"
+
+#~ msgid "Admin password"
+#~ msgstr "Mật mã quản trị "
+
+#~ msgid ""
+#~ "Password to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "Mật mã dùng để xác thực chế độ quản trị để pick up cấu hình chilli và "
+#~ "thành lập một công cụ &amp;quot;system&amp;quot; session"
+
+#~ msgid "Admin user"
+#~ msgstr "Người quản trị "
+
+#~ msgid ""
+#~ "User-name to use for Administrative-User authentication in order to pick "
+#~ "up chilli configurations and establish a device \"system\" session"
+#~ msgstr ""
+#~ "User name dùng để xác thực chế độ quản trị để pick up cấu hình chilli và "
+#~ "thành lập một công cụ &amp;quot;system&amp;quot; session"
+
+#~ msgid "Do not check disconnection requests"
+#~ msgstr "Không kiểm tra yêu cầu ngừng kết nối"
+
+#~ msgid "Do not check the source IP address of radius disconnect requests"
+#~ msgstr ""
+#~ "Không tên kiểm tra nguồn địa chỉ IP trong bán kính yêu cầu ngừng kết nối"
+
+#~ msgid "RADIUS disconnect port"
+#~ msgstr "Cửa ngừng kết nối RADIUS"
+
+#~ msgid "UDP port to listen to for accepting radius disconnect requests"
+#~ msgstr "Cửa UDP để nghe khi chấp nhận một yêu cầu ngừng kết nối"
+
+#~ msgid "NAS IP"
+#~ msgstr "NAS IP "
+
+#~ msgid "Value to use in RADIUS NAS-IP-Address attribute"
+#~ msgstr "Giá trị để dùng trong RADIUS NAS-IP-Address attribute"
+
+#~ msgid "NAS MAC"
+#~ msgstr "NAS MAC"
+
+#~ msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
+#~ msgstr ""
+#~ "Giá trị địa chỉ MAC để dùng trong RADIUS Called-Station-ID attribute"
+
+#~ msgid "Allow OpenID authentication"
+#~ msgstr "Cho phép xác thực OpenID "
+
+#~ msgid ""
+#~ "Allows OpenID authentication by sending ChilliSpot-Config=allow-"
+#~ "openidauth in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Cho phép xác thực OpenID bằng cách gửi ChilliSpot-Config=allow-openidauth "
+#~ "in RADIUS Access-Requests"
+
+#~ msgid "RADIUS accounting port"
+#~ msgstr "Cổng RADIUS accounting"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius accounting requests (default 1813)"
+#~ msgstr "Số của cổng UDP dùng cho yêu cầu radius accounting (mặcđịnh 1813)"
+
+#~ msgid "RADIUS authentication port"
+#~ msgstr "Cổng xác thực RADIUS"
+
+#~ msgid ""
+#~ "The UDP port number to use for radius authentication requests (default "
+#~ "1812)"
+#~ msgstr "Số của cổng UDP để yêu cầu xác thực radius (default 1812)"
+
+#~ msgid "Option radiuscalled"
+#~ msgstr "Tùy chọn radiuscalled"
+
+#~ msgid "RADIUS listen address"
+#~ msgstr "Địa chỉ nghe RADIUS"
+
+#~ msgid "Local interface IP address to use for the radius interface"
+#~ msgstr "Địa chỉ IP giao diện địa phương để dùng cho giao diện radius"
+
+#~ msgid "RADIUS location ID"
+#~ msgstr "RADIUS vị tri ID"
+
+#~ msgid "WISPr Location ID"
+#~ msgstr "WISPr vị trí ID"
+
+#~ msgid "RADIUS location name"
+#~ msgstr "Tên vị trí RADIUS"
+
+#~ msgid "WISPr Location Name"
+#~ msgstr "Tên vị trí WISPr"
+
+#~ msgid "NAS ID"
+#~ msgstr "NAS ID"
+
+#~ msgid "Network access server identifier"
+#~ msgstr "Network truy cập server identifier"
+
+#~ msgid "Option radiusnasip"
+#~ msgstr "Lựa chọn radiusnasip"
+
+#~ msgid "NAS port type"
+#~ msgstr "Loại cổng NAS"
+
+#~ msgid ""
+#~ "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
+#~ msgstr ""
+#~ "Giá trị của NAS-Port-Type attribute. Mặc định tới 19 (Wireless-"
+#~ "IEEE-802.11)"
+
+#~ msgid "Send RADIUS VSA"
+#~ msgstr "Gá»­i RADIUS VSA"
+
+#~ msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
+#~ msgstr "Gửi ChilliSpot-OriginalURL RADIUS VSA trong yêu cầu truy cập"
+
+#~ msgid "RADIUS secret"
+#~ msgstr "RADIUS bí mật"
+
+#~ msgid "Radius shared secret for both servers"
+#~ msgstr "Radius chia sẻ bí mật cho cả 2 servers"
+
+#~ msgid "RADIUS server 1"
+#~ msgstr "RADIUS server 1"
+
+#~ msgid "The IP address of radius server 1"
+#~ msgstr "Địa chỉ IP của radius server 1"
+
+#~ msgid "RADIUS server 2"
+#~ msgstr "RADIUS server 2"
+
+#~ msgid "The IP address of radius server 2"
+#~ msgstr "Địa chỉ IP của radius server 2"
+
+#~ msgid "Swap octets"
+#~ msgstr "Swap octets"
+
+#~ msgid ""
+#~ "Swap the meaning of \"input octets\" and \"output octets\" as it related "
+#~ "to RADIUS attribtues"
+#~ msgstr ""
+#~ "Hoán ý nghĩa của &amp;quot;input octets&amp;quot; và &amp;quot;output "
+#~ "octets&amp;quot; khi nó liên quan tới RADIUS attribtues"
+
+#~ msgid "Allow WPA guests"
+#~ msgstr "Cho phép WPA guests"
+
+#~ msgid ""
+#~ "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+#~ "guests in RADIUS Access-Requests"
+#~ msgstr ""
+#~ "Cho phép xác thực WPA Guest bằng cách gửi ChilliSpot-Config=allow-wpa-"
+#~ "guests trong RADIUS yêu cầu truy cập"
+
+#~ msgid "Proxy client"
+#~ msgstr "Proxy client"
+
+#~ msgid ""
+#~ "IP address from which radius requests are accepted. If omitted the server "
+#~ "will not accept radius requests"
+#~ msgstr ""
+#~ "Địa chỉ IP mà yêu cầu radius được chấp nhận. Nếu bỏ qua server sẽ không "
+#~ "chấp nhận yêu cầu radius."
+
+#~ msgid "Proxy listen address"
+#~ msgstr "Proxy listen address"
+
+#~ msgid "Local interface IP address to use for accepting radius requests"
+#~ msgstr "Địa chỉ giao diện IP  địa phương dùng để chấp nhận yêu cầu radius"
+
+#~ msgid "Proxy port"
+#~ msgstr "Proxy port"
+
+#~ msgid "UDP Port to listen to for accepting radius requests"
+#~ msgstr "Cổng UDP để listen để chấp nhận yêu cầu radius"
+
+#~ msgid "Proxy secret"
+#~ msgstr "Proxy bí mật"
+
+#~ msgid "Radius shared secret for clients"
+#~ msgstr "Radius chia sẻ bí mật cho các client"
+
+#~ msgid "UAM configuration"
+#~ msgstr "Cấu hình UAM"
+
+#~ msgid "Unified Configuration Method settings"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#~ msgid "Use Chilli XML"
+#~ msgstr "Dùng Chilli XML"
+
+#~ msgid "Return the so-called Chilli XML along with WISPr XML"
+#~ msgstr "Trở về cái gọi là Chilli XML cùng với WISPr XML"
+
+#~ msgid "Default idle timeout"
+#~ msgstr "Mặc định idle timeout"
+
+#~ msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr "Mặc định idle timeout trừ khi đặt bởi RADIUS (mặc định tới 0)"
+
+#~ msgid "Default interim interval"
+#~ msgstr "Mặc định interim interval"
+
+#~ msgid ""
+#~ "Default interim-interval for RADIUS accounting unless otherwise set by "
+#~ "RADIUS (defaults to 0)"
+#~ msgstr ""
+#~ "Mặc định interim-interval cho RADIUS accounting trừ khi đặt bởi RADIUS "
+#~ "(defaults tới 0)"
+
+#~ msgid "Default session timeout"
+#~ msgstr "Mặc định session timeout"
+
+#~ msgid ""
+#~ "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
+#~ msgstr "Mặc định session timeout trừ khi đặt bởi RADIUS (mặc định tới 0)"
+
+#~ msgid "Inspect DNS traffic"
+#~ msgstr "Kiểm tra lưu thông DNS"
+
+#, fuzzy
+#~ msgid "Do not redirect to UAM server"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Do not return to UAM server on login success, just redirect to original "
+#~ "URL"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Do not do WISPr"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "List of resources the client can access without first authenticating"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Allow any DNS server"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Allow any DNS server for unauthenticated clients"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Allow any IP address"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allow clients to use any IP settings they wish by spoofing ARP "
+#~ "(experimental)"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Allowed domains"
+#~ msgstr "Tên miền"
+
+#, fuzzy
+#~ msgid ""
+#~ "Defines a list of domain names to automatically add to the walled garden"
+#~ msgstr ""
+#~ "Được sử dụng để thông báo cho khách hàng về tên miền để dùng cho các tra "
+#~ "cứu DNS"
+
+#, fuzzy
+#~ msgid "UAM homepage"
+#~ msgstr "Tên miền"
+
+#, fuzzy
+#~ msgid "URL of homepage to redirect unauthenticated users to"
+#~ msgstr ""
+#~ "Được sử dụng để thông báo cho khách hàng về tên miền để dùng cho các tra "
+#~ "cứu DNS"
+
+#, fuzzy
+#~ msgid "UAM static content port"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "TCP port to bind to for only serving embedded content"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "UAM listening address"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "IP address to listen to for authentication of clients"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "UAM logout IP"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use this IP address to instantly logout a client accessing it (defaults "
+#~ "to 1.1.1.1)"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "UAM listening port"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "TCP port to bind to for authenticating clients (default 3990)"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "UAM secret"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Shared secret between uamserver and chilli"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "UAM server"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "URL of web server to use for authenticating clients"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "UAM user interface"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid ""
+#~ "An init.d style program to handle local content on the uamuiport web "
+#~ "server"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "CGI program"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Executable to run as a CGI type program (like haserl) for URLs with "
+#~ "extention .chi"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Web content directory"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "Directory where embedded local web content is placed"
+#~ msgstr "Thống nhất cấu hình phương pháp cài đặt"
+
+#, fuzzy
+#~ msgid "MAC configuration"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Configure MAC authentication"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Allowed MAC addresses"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "List of MAC addresses for which MAC authentication will be performed"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Authenticate allowed MAC addresses without the use of RADIUS"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Enable MAC authentification"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Try to authenticate all users based on their mac address alone"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Password used when performing MAC authentication"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "Suffix"
+#~ msgstr "Cấu hình RADIUS"
+
+#, fuzzy
+#~ msgid "coovachilli_macauth_macsuffix_desc"
+#~ msgstr "Cấu hình RADIUS"
diff --git a/trunk/package/luci/po/vi/ddns.po b/trunk/package/luci/po/vi/ddns.po
new file mode 100644
index 00000000..d8fa832a
--- /dev/null
+++ b/trunk/package/luci/po/vi/ddns.po
@@ -0,0 +1,89 @@
+#  ddns.pot
+#  generated from ./applications/luci-ddns/luasrc/i18n/ddns.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2009-08-12 18:06+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Check for changed IP every"
+msgstr "Kiểm tra mỗi thay đổi IP"
+
+#, fuzzy
+msgid "Check-time unit"
+msgstr "Đơn vị kiểm tra thời gian"
+
+#, fuzzy
+msgid "Custom update-URL"
+msgstr "Tùy chỉnh cập nhật - URL"
+
+msgid "Dynamic DNS"
+msgstr "Dynamic DNS"
+
+#, fuzzy
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"Dynamic DNS cho phép bộ định tuyến có thể được đạt đến với một hostname cố "
+"định, trong khi có một địa chỉ AP thay đổi năng động."
+
+msgid "Enable"
+msgstr ""
+
+msgid "Force update every"
+msgstr "Buộc cập nhật mỗi"
+
+#, fuzzy
+msgid "Force-time unit"
+msgstr "Force-đơn vị thời gian"
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+#, fuzzy
+msgid "Source of IP address"
+msgstr "Nguồn của địa chỉ IP"
+
+msgid "URL"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "custom"
+msgstr ""
+
+# Hours
+msgid "h"
+msgstr ""
+
+msgid "interface"
+msgstr ""
+
+# Minutes (not minimum)
+msgid "min"
+msgstr ""
+
+msgid "network"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/diag_core.po b/trunk/package/luci/po/vi/diag_core.po
new file mode 100644
index 00000000..d0b62110
--- /dev/null
+++ b/trunk/package/luci/po/vi/diag_core.po
@@ -0,0 +1,30 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Configure Diagnostics"
+msgstr ""
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr ""
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr ""
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/diag_devinfo.po b/trunk/package/luci/po/vi/diag_devinfo.po
new file mode 100644
index 00000000..32516758
--- /dev/null
+++ b/trunk/package/luci/po/vi/diag_devinfo.po
@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Beginning of MAC address range"
+msgstr ""
+
+msgid "Config Phone Scan"
+msgstr ""
+
+msgid "Configure"
+msgstr ""
+
+msgid "Configure Scans"
+msgstr ""
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr ""
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Device Scan Config"
+msgstr ""
+
+msgid "Device Type"
+msgstr ""
+
+msgid "Devices discovered for"
+msgstr "Devices discovered for"
+
+msgid "Devices on Network"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "End of MAC address range"
+msgstr ""
+
+msgid "Go to relevant configuration page"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Link to Device"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC Device Info Overrides"
+msgstr ""
+
+msgid "MAC Device Override"
+msgstr ""
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr ""
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr ""
+
+msgid "Model"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Device Scan"
+msgstr ""
+
+msgid "Network Device Scanning Configuration"
+msgstr ""
+
+msgid "Networks to scan for devices"
+msgstr ""
+
+msgid "Networks to scan for supported devices"
+msgstr ""
+
+msgid "No SIP devices"
+msgstr ""
+
+msgid "No devices detected"
+msgstr ""
+
+msgid "Number of times to send requests (default 1)"
+msgstr ""
+
+msgid "OUI Owner"
+msgstr ""
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr ""
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "Phone Information"
+msgstr ""
+
+msgid "Phone Scan"
+msgstr ""
+
+msgid "Phone Scanning Configuration"
+msgstr ""
+
+msgid "Phones"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Repeat Count"
+msgstr ""
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr ""
+
+msgid "SIP Device Information"
+msgstr ""
+
+msgid "SIP Device Scan"
+msgstr ""
+
+msgid "SIP Device Scanning Configuration"
+msgstr ""
+
+msgid "SIP Devices on Network"
+msgstr ""
+
+msgid "SIP devices discovered for"
+msgstr ""
+
+msgid "Scan for devices on specified networks."
+msgstr ""
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr ""
+
+msgid "Scanning Configuration"
+msgstr ""
+
+msgid "Scans for devices on specified networks."
+msgstr ""
+
+msgid "Sleep Between Requests"
+msgstr ""
+
+msgid "Subnet"
+msgstr ""
+
+msgid "This section contains no values yet"
+msgstr ""
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr ""
+
+msgid "Timeout"
+msgstr ""
+
+msgid "Use Configuration"
+msgstr ""
+
+msgid "Vendor"
+msgstr ""
+
+msgid "check other networks"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/ffwizard.po b/trunk/package/luci/po/vi/ffwizard.po
new file mode 100644
index 00000000..408745d2
--- /dev/null
+++ b/trunk/package/luci/po/vi/ffwizard.po
@@ -0,0 +1,159 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Configure network"
+msgstr ""
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "DNS Server"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Heartbeat"
+msgstr ""
+
+msgid "IP address"
+msgstr ""
+
+msgid "L2gvpn tunnel"
+msgstr ""
+
+msgid "Limit download bandwidth"
+msgstr ""
+
+msgid "Limit upload bandwidth"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 Address"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Password successfully changed"
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr ""
+
+msgid "The protocol to use for internet connectivity."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "dhcp"
+msgstr ""
+
+msgid "kbit/s"
+msgstr ""
+
+msgid "static"
+msgstr ""
+
+msgid "Configure this interface."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/firewall.po b/trunk/package/luci/po/vi/firewall.po
new file mode 100644
index 00000000..645aa882
--- /dev/null
+++ b/trunk/package/luci/po/vi/firewall.po
@@ -0,0 +1,565 @@
+#  luci-fw.pot
+#  generated from ./applications/luci-fw/luasrc/i18n/luci-fw.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2009-08-16 14:02+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "%s in %s"
+msgstr ""
+
+msgid "%s%s with %s"
+msgstr ""
+
+msgid "%s, %s in %s"
+msgstr ""
+
+msgid "(Unnamed Entry)"
+msgstr ""
+
+msgid "(Unnamed Rule)"
+msgstr ""
+
+msgid "(Unnamed SNAT)"
+msgstr ""
+
+msgid "-- Please choose --"
+msgstr ""
+
+msgid "-- custom --"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Action"
+msgstr "Action"
+
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+
+msgid "Destination IP address"
+msgstr ""
+
+msgid "Destination address"
+msgstr "Địa chỉ điểm đến"
+
+msgid "Destination port"
+msgstr "Cổng điểm đến"
+
+#, fuzzy
+msgid "Destination zone"
+msgstr "Điểm đến"
+
+msgid "Do not rewrite"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Bỏ qua nhưng gói không hợp lý"
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+#, fuzzy
+msgid "Enable SYN-flood protection"
+msgstr "SYN-flood bảo vệ "
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External IP address"
+msgstr ""
+
+msgid "External port"
+msgstr "External port"
+
+msgid "External zone"
+msgstr ""
+
+msgid "Extra arguments"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Custom Rules"
+msgstr ""
+
+msgid "Firewall - Port Forwards"
+msgstr ""
+
+msgid "Firewall - Traffic Rules"
+msgstr ""
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
+msgid "Force connection tracking"
+msgstr ""
+
+msgid "Forward"
+msgstr ""
+
+msgid "Forward to"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Input"
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#, fuzzy
+msgid "Internal IP address"
+msgstr "Internal address"
+
+#, fuzzy
+msgid "Internal port"
+msgstr "External port"
+
+msgid "Internal zone"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "MSS Clamping"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "New SNAT rule"
+msgstr ""
+
+msgid "New forward rule"
+msgstr ""
+
+msgid "New input rule"
+msgstr ""
+
+msgid "New port forward"
+msgstr ""
+
+msgid "New source NAT"
+msgstr ""
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr ""
+
+msgid "Only match incoming traffic from these MACs."
+msgstr ""
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr ""
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr ""
+
+msgid "Open ports on router"
+msgstr ""
+
+msgid "Other..."
+msgstr ""
+
+msgid "Output"
+msgstr "Output"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr ""
+
+msgid "Port Forwards"
+msgstr ""
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+msgid "SNAT IP address"
+msgstr ""
+
+msgid "SNAT port"
+msgstr ""
+
+#, fuzzy
+msgid "Source IP address"
+msgstr "Đỉa chỉ MAC nguồn"
+
+msgid "Source MAC address"
+msgstr ""
+
+msgid "Source NAT"
+msgstr ""
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Đỉa chỉ MAC nguồn"
+
+msgid "Source port"
+msgstr "Cổng nguồn"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Cổng nguồn"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
+"thông của mạng."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
+msgstr ""
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+
+msgid "Via %s"
+msgstr ""
+
+msgid "Via %s at %s"
+msgstr ""
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "chấp nhận"
+
+msgid "any"
+msgstr ""
+
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "don't track"
+msgstr ""
+
+msgid "drop"
+msgstr "drop"
+
+msgid "reject"
+msgstr "Không chấp nhận"
+
+msgid "traffic"
+msgstr ""
+
+#~ msgid "Destination"
+#~ msgstr "Điểm đến"
+
+#~ msgid "Source"
+#~ msgstr "Nguồn"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "Internal port (tùy chọn)"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Luật cấp cao"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Luật cấp cao để bạn tùy chỉnh firewall mà bạn cần. Chỉ những kết nối mới "
+#~ "sẽ được làm cho phù hợp. Các gói thuộc đã mở các kết nối sẽ tự động cho "
+#~ "phép vượt qua firewall."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Cổng chuyển tiếp"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Cổng chuyển tiếp cho phép cung cấp những dịch vụ mạng trong vùng tới một "
+#~ "ngoại mạng. "
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Sự chuyển hướng lưu thông"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Sự chuyển hướng lưu thông cho phép bạn thay đổi địa chỉ điểm đến của gói "
+#~ "chuyển tiếp. "
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Networks"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Điều khiển lưu thông"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Lưu thông Zone- to - Zone"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Tại đây bạn có thể xác định được mạng lưới giao thông được phép lưu lượng "
+#~ "qua network zone. Chỉ có kết nối mới sẽ là phù hợp. Các gói thuộc kết nối "
+#~ "đã mở được tự động được cho phép để vượt qua firewall. Nếu bạn gặp vấn đề "
+#~ "kết nối thử kích hoạt MSS Clamping hoặc vô hiệu hóa nó vì lý do thực thi."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Điểm đến"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Địa chỉ IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Đỉa chỉ MAC nguồn"
+
+#~ msgid "Custom forwarding"
+#~ msgstr "Tùy chỉnh chuyển tiếp"
+
+#~ msgid "Input Zone"
+#~ msgstr "Input Zone"
+
+#~ msgid "Output Zone"
+#~ msgstr "Output Zone"
+
+#~ msgid "External Zone"
+#~ msgstr "External Zone"
+
+#~ msgid "Source MAC"
+#~ msgstr "Nguồn MAC"
+
+#~ msgid "Defaults"
+#~ msgstr "Mặc định"
+
+#~ msgid ""
+#~ "These are the default settings that are used if no other rules match."
+#~ msgstr ""
+#~ "Có những cài đặt mặc định được dùng nếu những cái luật khác không phù hợp"
+
+#~ msgid ""
+#~ "Zones part the network interfaces into certain isolated areas to separate "
+#~ "network traffic. One or more networks can belong to a zone. The MASQ-flag "
+#~ "enables NAT masquerading for all outgoing traffic on this zone."
+#~ msgstr ""
+#~ "Phân vùng các phần giao diện mạng vào những khu vực cô lập nhất định để "
+#~ "phân chia mạng lưới lưu thông. Một hoặc nhiều mạng lưới có thể thuộc vào "
+#~ "một khu. Các MASQ-flag kích hoạt NAT masquerading cho tất cả các lưu "
+#~ "lượng giao thông trên khu vực này."
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
+
+#~ msgid "contained networks"
+#~ msgstr "contained networks"
diff --git a/trunk/package/luci/po/vi/freifunk-policyrouting.po b/trunk/package/luci/po/vi/freifunk-policyrouting.po
new file mode 100644
index 00000000..3c9a17e0
--- /dev/null
+++ b/trunk/package/luci/po/vi/freifunk-policyrouting.po
@@ -0,0 +1,39 @@
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/freifunk.po b/trunk/package/luci/po/vi/freifunk.po
new file mode 100644
index 00000000..8076d61b
--- /dev/null
+++ b/trunk/package/luci/po/vi/freifunk.po
@@ -0,0 +1,398 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-15 11:56+0200\n"
+"Last-Translator: Stefan Pirwitz <i18n@freifunk-bno.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr "Kiểm tra  các phiên bản phần cứng mới và thực hiện tự động cập nhật."
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr "Tọa độ"
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr "E-mail"
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr "Freifunk cập nhật từ xa"
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr "Xin chào và chào mừng gia nhập mạng lưới của"
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+"Nếu bạn quan tâm đến đề án của chúng tôi, hãy liên hệ cộng đồng địa phương"
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"Truy cập Internet phù thuộc vào kỹ thật và điều kiện tổ chức và có thể hoạt "
+"động hoặc không hoạt động cho bạn"
+
+msgid "It is operated by"
+msgstr "Nó hoạt động bởi "
+
+msgid "Keep configuration"
+msgstr "Giữ cấu hình"
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr "Địa chỉ"
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr "Bộ nhớ"
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr "Tên"
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr "Chú ý"
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr "Điện thoại"
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr "Tên thật "
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr "Bắt đầu cập nhật "
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr "Phần cứng được cài đặt là phiên bản mới nhất."
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr "Đây là điểm truy cập "
+
+msgid "Update Settings"
+msgstr "Cập nhật cài đặt"
+
+msgid "Update available!"
+msgstr "Cập nhật sẵn có!"
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr "Xác minh hình ảnh đã tải"
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr "Chúng tôi là phát triển mạng lưới nguồn mở không dây đầu tiên"
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "Bạn có thể tìm thấy thông tin về Freifunk toàn cầu tại "
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/hd_idle.po b/trunk/package/luci/po/vi/hd_idle.po
new file mode 100644
index 00000000..8d8821ab
--- /dev/null
+++ b/trunk/package/luci/po/vi/hd_idle.po
@@ -0,0 +1,53 @@
+#  hd_idle.pot
+#  generated from ./applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2009-08-12 17:50+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Disk"
+msgstr "Ổ đĩa"
+
+#, fuzzy
+msgid "Enable"
+msgstr "Kích hoạt debug"
+
+msgid "Enable debug"
+msgstr "Kích hoạt debug"
+
+#, fuzzy
+msgid "Idle-time"
+msgstr "Thời gian Idle"
+
+#, fuzzy
+msgid "Idle-time unit"
+msgstr "Đơn vị thời gian Idle"
+
+msgid "Settings"
+msgstr "Sắp đặt"
+
+# Hours
+msgid "h"
+msgstr ""
+
+msgid "hd-idle"
+msgstr "hd-idle"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr ""
+"hd-idle là một chương trình tiện ích để quay các đĩa ngoài sau một khoảng "
+"thời gian idle."
+
+# Minutes (not minimum)
+msgid "min"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/meshwizard.po b/trunk/package/luci/po/vi/meshwizard.po
new file mode 100644
index 00000000..a67c71f5
--- /dev/null
+++ b/trunk/package/luci/po/vi/meshwizard.po
@@ -0,0 +1,109 @@
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/minidlna.po b/trunk/package/luci/po/vi/minidlna.po
new file mode 100644
index 00000000..070d64c4
--- /dev/null
+++ b/trunk/package/luci/po/vi/minidlna.po
@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Album art names:"
+msgstr ""
+
+msgid "Announced model number:"
+msgstr ""
+
+msgid "Announced serial number:"
+msgstr ""
+
+msgid "Browse directory"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Database directory:"
+msgstr ""
+
+msgid "Enable TIVO:"
+msgstr ""
+
+msgid "Enable inotify:"
+msgstr ""
+
+msgid "Enable:"
+msgstr ""
+
+msgid "Friendly name:"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Interfaces:"
+msgstr ""
+
+msgid "Log directory:"
+msgstr ""
+
+msgid "Media directories:"
+msgstr ""
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr ""
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/mmc_over_gpio.po b/trunk/package/luci/po/vi/mmc_over_gpio.po
new file mode 100644
index 00000000..febcbc08
--- /dev/null
+++ b/trunk/package/luci/po/vi/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+#  mmc_over_gpio.pot
+#  generated from ./applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-13 03:43+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "CLK_pin"
+msgstr ""
+
+msgid "CS_pin"
+msgstr ""
+
+msgid "DI_pin"
+msgstr ""
+
+msgid "DO_pin"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "MMC/SD driver configuration"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Settings"
+msgstr "Sắp đặt"
diff --git a/trunk/package/luci/po/vi/multiwan.po b/trunk/package/luci/po/vi/multiwan.po
new file mode 100644
index 00000000..e9d6ece5
--- /dev/null
+++ b/trunk/package/luci/po/vi/multiwan.po
@@ -0,0 +1,115 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr ""
+
+msgid "Attempts Before WAN Recovery"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr ""
+
+msgid "DNS Server(s)"
+msgstr ""
+
+msgid "Default Route"
+msgstr ""
+
+msgid "Destination Address"
+msgstr ""
+
+msgid "Disable"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Failing"
+msgstr ""
+
+msgid "Failover Traffic Destination"
+msgstr ""
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr ""
+
+msgid "Health Monitor ICMP Timeout"
+msgstr ""
+
+msgid "Health Monitor Interval"
+msgstr ""
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr ""
+
+msgid "KO"
+msgstr ""
+
+msgid "Load Balancer Distribution"
+msgstr ""
+
+msgid "Load Balancer(Compatibility)"
+msgstr ""
+
+msgid "Load Balancer(Performance)"
+msgstr ""
+
+msgid "Multi-WAN"
+msgstr ""
+
+msgid "Multi-WAN Status"
+msgstr ""
+
+msgid "Multi-WAN Traffic Rules"
+msgstr ""
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Recovering"
+msgstr ""
+
+msgid "Source Address"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "WAN Interfaces"
+msgstr ""
+
+msgid "WAN Uplink"
+msgstr ""
+
+msgid "all"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/ntpc.po b/trunk/package/luci/po/vi/ntpc.po
new file mode 100644
index 00000000..4de0971c
--- /dev/null
+++ b/trunk/package/luci/po/vi/ntpc.po
@@ -0,0 +1,57 @@
+#  ntpc.pot
+#  generated from ./applications/luci-ntpc/luasrc/i18n/ntpc.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2009-08-13 03:46+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Clock Adjustment"
+msgstr "Điều chỉnh đồng hồ"
+
+#, fuzzy
+msgid "Count of time measurements"
+msgstr "Đếm thời gian"
+
+msgid "Current system time"
+msgstr "Thời gian hiện tại của hệ thống"
+
+msgid "General"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+#, fuzzy
+msgid "Offset frequency"
+msgstr "tần số offset "
+
+msgid "Port"
+msgstr ""
+
+msgid "Synchronizes the system time"
+msgstr "Đồng bộ hóa giờ hệ thống"
+
+msgid "Time Server"
+msgstr ""
+
+#, fuzzy
+msgid "Time Servers"
+msgstr "Giờ server"
+
+msgid "Time Synchronisation"
+msgstr "Thời gian đồng bộ hóa"
+
+#, fuzzy
+msgid "Update interval (in seconds)"
+msgstr "Cập nhật Interval (giây)"
+
+msgid "empty = infinite"
+msgstr "Rỗng = Vô tận"
diff --git a/trunk/package/luci/po/vi/olsr.po b/trunk/package/luci/po/vi/olsr.po
new file mode 100644
index 00000000..698e5288
--- /dev/null
+++ b/trunk/package/luci/po/vi/olsr.po
@@ -0,0 +1,703 @@
+#  olsr.pot
+#  generated from ./applications/luci-olsr/luasrc/i18n/olsr.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-16 12:39+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Active MID announcements"
+msgstr "Thông báo của các MID đang hoạt động"
+
+msgid "Active OLSR nodes"
+msgstr "Những OLSR nodes đang hoạt động"
+
+msgid "Active host net announcements"
+msgstr "Thông báo của mạng host đang hoạt động"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow gateways with NAT"
+msgstr ""
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr ""
+
+msgid "Announce uplink"
+msgstr ""
+
+msgid "Announced network"
+msgstr "Mạng lưới thông báo"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr ""
+
+msgid "Broadcast address"
+msgstr ""
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Download Config"
+msgstr ""
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+
+msgid "Enable this interface."
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Expected retransmission count"
+msgstr "Expected retransmission count"
+
+msgid "FIB metric"
+msgstr "FIB metric"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "General settings"
+msgstr "Cài đặt tổng quát"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr "Khoảng HNA"
+
+msgid "HNA validity time"
+msgstr "Thời gian hợp lệ hóa HNA "
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "OLSR - HNA - Thông báo"
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr "Vùng xin chào"
+
+msgid "Hello validity time"
+msgstr "Thời gian hợp lệ hóa lời chào"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4 broadcast"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr "Internet protocol"
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr "Tuyến OLRS đã biết"
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr "LQ aging"
+
+msgid "LQ algorithm"
+msgstr "LQ algorithm"
+
+msgid "LQ fisheye"
+msgstr "LQ fisheye"
+
+msgid "LQ level"
+msgstr "LQ level"
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr "Hop cuối "
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr "Thư viện "
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr "Giao diện địa phương IP"
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr "Khoảng MID"
+
+msgid "MID validity time"
+msgstr "Thời gian hợp lệ hóa MID"
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr "Lận cận IP"
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr "Netmask"
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr "OLSR - HNA - Thông báo"
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA - Thông báo"
+
+msgid "OLSR - Plugins"
+msgstr "OLSR - Plugins"
+
+msgid "OLSR Daemon"
+msgstr "OLSR Daemon"
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr "Kết nối OLSR"
+
+msgid "OLSR gateway"
+msgstr "Cổng OLSR"
+
+msgid "OLSR node"
+msgstr "OLSR node"
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr "Tổng quát về các thông báo của mạng host đang hoạt động"
+
+msgid "Overview of currently established OLSR connections"
+msgstr "Tổng quát về kết nối OLSR hiện tại "
+
+msgid "Overview of currently known OLSR nodes"
+msgstr "Tổng quát của các OLSR nodes đã biết hiện tại"
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr "Tổng quát của các tuyến đã biết hiện tại tới những OLSR nodes khác"
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr "Tổng quát về thông báo của nhiều giao diện đã biết"
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr "Cấu hình Plugin"
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr "Pollrate"
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr "Tiền tố"
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr "Giao diện OLSR thứ nhì"
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr "Khoảng TC"
+
+msgid "TC validity time"
+msgstr "Thời gian hợp lệ hóa TC"
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr "Không thể kết nối với OLSR daemon!"
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr "Dùng hysteresis"
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr "Sẵn sàng"
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid ""
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ msgstr ""
+#~ "Bảo đảm là OLSRd đang vận hành, the &amp;quot;txtinfo&amp;quot; plugin "
+#~ "được tải, định cấu hình trên cổng 2006 và chấp nhận kết nối từ &amp;"
+#~ "quot;127.0.0.1&amp;quot;."
diff --git a/trunk/package/luci/po/vi/openvpn.po b/trunk/package/luci/po/vi/openvpn.po
new file mode 100644
index 00000000..da4e4f23
--- /dev/null
+++ b/trunk/package/luci/po/vi/openvpn.po
@@ -0,0 +1,552 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-16 12:27+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', or 'subnet'"
+
+msgid "Accept options pushed from server"
+msgstr "Chấp nhận tùy chọn được đảy từ server"
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr "Thêm tuyến sau khi kết nối thành lập"
+
+msgid "Additional authentication over TLS"
+msgstr "Xác thực bổ xung trên TLS"
+
+msgid "Allow client-to-client traffic"
+msgstr "Cho phép lưu thông đối tượng - đến - đối tượng"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "Cho phép nhiều đối tượng với cùng một chứng chỉ"
+
+msgid "Allow only one session"
+msgstr "Chỉ cho phép một session"
+
+msgid "Allow remote to change its IP or port"
+msgstr "Cho phép đối tượng ngoài vùng thay đổi IP hoặc cổng"
+
+msgid "Allowed maximum of connected clients"
+msgstr "Cho phép tối đa đối tượng kết nối mới là"
+
+msgid "Allowed maximum of internal"
+msgstr "Internal tối đa được cho phép"
+
+msgid "Allowed maximum of new connections"
+msgstr "Cho phép tối đa kết nối mới là"
+
+msgid "Append log to file"
+msgstr "Nối thêm log lên tập tin"
+
+msgid "Authenticate using username/password"
+msgstr "Xác thực username/password đang sử dụng"
+
+msgid "Automatically redirect default route"
+msgstr "Tự động chuyển hướng tuyến mặc định"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+"Dưới đây là một list của OpenVPN instances đã được cấu hình và tình trạng "
+"hiện tại"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "Call down cmd/script trước khi TUN/TAP đóng"
+
+msgid "Certificate authority"
+msgstr "Giấy chứng nhận ủy quyền"
+
+msgid "Change process priority"
+msgstr "Thay đổi quy trình ưu tiên"
+
+msgid "Change to directory before initialization"
+msgstr "Chuyển qua thư mục trước khi khởi tạo"
+
+msgid "Check peer certificate against a CRL"
+msgstr "Kiểm tra chứng chỉ đối tác với một CRL"
+
+msgid "Chroot to directory after initialization"
+msgstr "Chroot vào thư mục sau khi khởi tạo"
+
+msgid "Client is disabled"
+msgstr "Đối tượng bị vô hiệu hóa"
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr "Định cấu hình chế độ đối tượng "
+
+msgid "Configure server bridge"
+msgstr "Định cấu hình cầu nối server"
+
+msgid "Configure server mode"
+msgstr "Định cấu hình chế độ server"
+
+msgid "Connect through Socks5 proxy"
+msgstr "Kết nối qua Socks5 proxy"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr "Khoảng thử kết nối"
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr "Daemonize sau khi khởi tạo"
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "Trì hoãn tun/tap mở và up script execution"
+
+msgid "Diffie Hellman parameters"
+msgstr "Tham số Diffie Hellman "
+
+msgid "Directory for custom client config files"
+msgstr "Dạnh mục cho các tập tin config đối tương tùy chỉnh"
+
+msgid "Disable Paging"
+msgstr "Vô hiệu hóa Paging"
+
+msgid "Disable cipher initialisation vector"
+msgstr "Vô hiệu hóa cipher initialisation vector"
+
+msgid "Disable options consistency check"
+msgstr "Vô hiệu hóa tùy chọn kiểm tra nhất quán"
+
+msgid "Disable replay protection"
+msgstr "Vô hiệu hóa replay protection"
+
+msgid "Do not bind to local address and port"
+msgstr "Đừng đóng kết địa chỉ địa phương và cổng"
+
+msgid "Don't actually execute ifconfig"
+msgstr "Đừng thực sự thực hiện ifconfig"
+
+msgid "Don't add routes automatically"
+msgstr "Đừng tự động thêm vào đường dẫn"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "Don't cache --askpass or --auth-user-pass passwords"
+
+msgid "Don't inherit global push options"
+msgstr "Đừng thừa hưởng tùy chọn đẩy toàn cầu"
+
+msgid "Don't log timestamps"
+msgstr "Đừng log timestamps"
+
+msgid "Don't re-read key on restart"
+msgstr "Đừng đọc lại key ở chế độ khởi động "
+
+msgid "Don't require client certificate"
+msgstr "Đừng yêu câu  chứng chỉ đối tượng"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "Đừng dùng bộ nén lzo thích ứng"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "Đừng cảnh báo về sự không nhất quán của ifconfig"
+
+msgid "Echo parameters to log"
+msgstr "Báo tham số lên log"
+
+msgid "Empirically measure MTU"
+msgstr "Đo MTU"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "Kích hoạt OpenSSL hardware crypto engines"
+
+msgid "Enable Path MTU discovery"
+msgstr "Kích hoạt khám phá đường dẫn MTU"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "Kích hoạt chế độ mã hóa khóa tĩnh (non-TLS)"
+
+msgid "Enable TLS and assume client role"
+msgstr "Kích hoạt TLS và giả định vải trò của client"
+
+msgid "Enable TLS and assume server role"
+msgstr "Kích hoạt TLS và giả định vải trò của server"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "Kích hoạt internal datagram fragmentation"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "Kích hoạt giao diện điều hành trên <em>IP</em> <em>cổng</em>"
+
+msgid "Enabled"
+msgstr "Kích hoạt "
+
+msgid "Encryption cipher for packets"
+msgstr "Encryption cipher cho các gói"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "Thực hiện shell cmd sau khi tuyến đã thêm vào"
+
+msgid "Execute shell command on remote ip change"
+msgstr "Thực hiện lệnh shell trên ip thay đổi từ xa"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr "Exit trên TLS khi thương lượng thất bại"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "Lấy mật mã PEM từ điều khiển tty trước khi chúng ta daemonize"
+
+msgid "HMAC authentication for packets"
+msgstr "Sự xác thực HMAC cho gói"
+
+msgid "Handling of authentication failures"
+msgstr "Xử lý những sai soát khi xác thực "
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr "Nếu hostname resolve thất bại, thử lại"
+
+msgid "Instance \"%s\""
+msgstr "Instance \"%s\""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr "Giữ địa chỉ IP ở chế độ khởi động"
+
+msgid "Keep remote IP address on restart"
+msgstr "Giữ remote địa chỉ IP ở chế độ khởi động"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "Giữ công cụ tun/tap mở khi khởi động lại  "
+
+msgid "Key transition window"
+msgstr "Key transition window"
+
+msgid "Limit repeated log messages"
+msgstr "Giới hạn lập log tin nhắn"
+
+msgid "Local certificate"
+msgstr "Chứng chỉ địa phương"
+
+msgid "Local host name or ip address"
+msgstr "Tên host địa phương và địa chỉ IP"
+
+msgid "Local private key"
+msgstr "Phím bảo mật địa phương"
+
+msgid "Major mode"
+msgstr "Chế độ chính"
+
+msgid "Make tun device IPv6 capable"
+msgstr "Làm cho tun công cụ IPv6 có khả năng"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "Số lượng tối đa của queued TCP output packets"
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr "Số lượng phân bổ phát sóng buffers"
+
+msgid "Number of lines for log file history"
+msgstr "Số dòng cho tập tin log history"
+
+msgid "Only accept connections from given X509 name"
+msgstr "Chỉ chấp nhận kết nối từ những tên X509 cho sẵn"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "Chỉ xử lý ping timouts nếu tuyến tồn tại"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN instances"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "Tối ưu hóa TUN/TAP/UDP writes"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "Output tới syslog và đừng daemonize"
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr "PKCS # 12 tập tin có chứa key"
+
+msgid "Pass environment variables to script"
+msgstr "Bỏ qua yếu tố môi trường tới script"
+
+msgid "Persist replay-protection state"
+msgstr "Tiếp tục tình trạng replay-protection"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "Persist/unpersist ifconfig-pool"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "Ping remote mỗi n giây trên cổng TCP/UDP"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr "Cổng"
+
+msgid "Protocol"
+msgstr "Protocol"
+
+msgid "Proxy timeout in seconds"
+msgstr "Proxy timeout in seconds"
+
+msgid "Push an ifconfig option to remote"
+msgstr "Đảy một tùy chọn ifconfig tới remote"
+
+msgid "Push options to peer"
+msgstr "Đẩy lựa chọn cho đối tác"
+
+msgid "Query management channel for private key"
+msgstr "Tra vấn kênh điều hành cho phím bảo mật "
+
+msgid "Randomly choose remote server"
+msgstr "Ngẫu nhiên chọn server ngoài vùng"
+
+msgid "Refuse connection if no custom client config"
+msgstr "Từ chối kết nối nêu không có config đối tượng tùy chỉnh"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "Remap tín hiệu SIGUSR1"
+
+msgid "Remote host name or ip address"
+msgstr "Tên host ngoài vùng và địa chỉ IP"
+
+msgid "Remote ping timeout"
+msgstr "PING timeout từ xa"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "Thương lượng lại data chan. key sau bytes"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "Thương lượng lại data chan. key sau packets"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "Thương lượng lại data chan. key sau seconds"
+
+msgid "Replay protection sliding window size"
+msgstr "Replay chế độ bảo vệ kích thước window trượt"
+
+msgid "Require explicit designation on certificate"
+msgstr "Yêu cầu rõ ràng về giấy chứng nhận "
+
+msgid "Require explicit key usage on certificate"
+msgstr "Yêu cầu key dùng rõ rãng trên chứng nhận"
+
+msgid "Restart after remote ping timeout"
+msgstr "Khởi động lại sau khi remote ping timeout"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "Retransmit timeout trên kênh kiểm soát TLS"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "Thử lại trên HTTP proxy lỗi"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "Thử lại trên Socks proxy lỗi"
+
+msgid "Route subnet to client"
+msgstr "Tuyến subnet tới khách hàng"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "Chạy như inetd hoặc xinetd server"
+
+msgid "Run script cmd on client connection"
+msgstr "Chạy script cmd trên đối tượng kết nối"
+
+msgid "Run script cmd on client disconnection"
+msgstr "Chạy script cmd trên đối tượng không kết nối"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "Chạy up/down scripts cho tất cả khởi động"
+
+msgid "Send notification to peer on disconnect"
+msgstr "Gửi thông báo cho bạn bè về ngắt kết nối"
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr "Cài đặt GID tới nhóm"
+
+msgid "Set TCP/UDP MTU"
+msgstr "Cài đặt TCP/UDP MTU"
+
+msgid "Set UID to user"
+msgstr "Cài đặt UID tới người dùng"
+
+msgid "Set aside a pool of subnets"
+msgstr "Để sang một bên một pool của subnets"
+
+msgid "Set extended HTTP proxy options"
+msgstr "Thiết lập các tùy chọn mở rộng HTTP proxy"
+
+msgid "Set output verbosity"
+msgstr "Đặt output verbosity"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "Đặt dung lượng của bảng address hash thực và ảo"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "Đặt TCP/UDP nhận dung lượng buffer"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "Đặt TCP/UDP gửi dung lượng buffer"
+
+msgid "Set tun/tap TX queue length"
+msgstr "Đặt tun/tap độ dài queue"
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr "Đặt công cụ tun/tap MTU"
+
+msgid "Set tun/tap device overhead"
+msgstr "Đặt thiết bị tun/tap overhead"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "Đặt upper bound trên TCP MSS"
+
+msgid "Shaping for peer bandwidth"
+msgstr "Shaping cho peer bandwidth"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "Shell cmd để thực thi sau khi thiết bị tun mở"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "Shell cmd để chạy sau khi thiết bị tun đóng"
+
+msgid "Shell command to verify X509 name"
+msgstr "Shell command để hợp thức hóa tên X509 "
+
+msgid "Silence the output of replay warnings"
+msgstr "Silence the output của các cảnh báo reply"
+
+msgid "Size of cipher key"
+msgstr "Dung lượng của cipher key"
+
+msgid "Specify a default gateway for routes"
+msgstr "Chỉ định một cổng mặc định cho tuyến"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "Bắt đầu OpenVPN trong một hibernating state"
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr "Bắt đầu"
+
+msgid "Status file format version"
+msgstr "Tình trạng tập tin phiên bản format"
+
+msgid "Switch to advanced configuration »"
+msgstr "Chuyển sang cấu hình cấp cao"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "Cổng TCP/UDP # cho cả địa phương và ngoài vùng"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "Cổng TCP/UDP # cho địa phương (default=1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "Cổng TCP/UDP # cho ngoài vùng (default=1194)"
+
+msgid "TLS cipher"
+msgstr "TLS cipher"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "TOS passthrough (chỉ áp dụng cho IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "Danh mục tạm thời cho tập tin client-connect return"
+
+msgid "Timeframe for key exchange"
+msgstr "Timeframe cho trao đổi key"
+
+msgid "Type of used device"
+msgstr "Loại công cụ sử dụng"
+
+msgid "Use fast LZO compression"
+msgstr "Dùng LZO nén nhanh"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "Nên dùng địa chỉ cá nhân hơn là /30 subnets"
+
+msgid "Use protocol"
+msgstr "Dùng protocol"
+
+msgid "Use tun/tap device node"
+msgstr "Dùng chế độ công cụ tun/tap"
+
+msgid "Use username as common name"
+msgstr "Dùng tên đăng nhập như tên thông thường"
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr "Viết log lên tập tin"
+
+msgid "Write process ID to file"
+msgstr "Viết xử lý ID lên tập tin"
+
+msgid "Write status to file every n seconds"
+msgstr "Viết tình trạng tới tập tin mỗi n giây"
+
+msgid "no"
+msgstr "không"
+
+msgid "tun/tap device"
+msgstr "Công cụ tun/tap"
+
+msgid "tun/tap inactivity timeout"
+msgstr "tun/tap timeout không có hành động"
+
+msgid "yes (%i)"
+msgstr "Có (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "Chuyển sang cấu hình căn bản"
diff --git a/trunk/package/luci/po/vi/p2pblock.po b/trunk/package/luci/po/vi/p2pblock.po
new file mode 100644
index 00000000..4bad0904
--- /dev/null
+++ b/trunk/package/luci/po/vi/p2pblock.po
@@ -0,0 +1,42 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Block Time"
+msgstr "Thời gian Block"
+
+msgid "Enable P2P-Block"
+msgstr "Kích hoạt P2P-Block"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "Layer7-protocols"
+
+msgid "P2P-Block"
+msgstr "P2P-Block"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr ""
+"P2P-Block là một cơ chế greylisting để chặn các peer-to-peer "
+"protocols cho khách hàng không nằm trên whitelisted."
+
+msgid "Portrange"
+msgstr "Portrange"
+
+msgid "Whitelisted IPs"
+msgstr "Whitelisted IPs"
+
+msgid "seconds"
+msgstr "giây"
diff --git a/trunk/package/luci/po/vi/p910nd.po b/trunk/package/luci/po/vi/p910nd.po
new file mode 100644
index 00000000..10035b86
--- /dev/null
+++ b/trunk/package/luci/po/vi/p910nd.po
@@ -0,0 +1,52 @@
+#  p910nd.pot
+#  generated from ./applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-13 04:03+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Bidirectional mode"
+msgstr "Chế độ 2 chiều"
+
+msgid "Device"
+msgstr ""
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"Trước tiên, bạn cần phải cài đặt các gói để hỗ trợ cho cổng USB (kmod-usb-"
+"in), hoặc cổng song song (kmod-lp)."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - Máy in chủ"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd tiếp thu ở cổng 910+N. E.g. 9100 cho máy in đầu tiên."
diff --git a/trunk/package/luci/po/vi/pbx-voicemail.po b/trunk/package/luci/po/vi/pbx-voicemail.po
new file mode 100644
index 00000000..19e26bff
--- /dev/null
+++ b/trunk/package/luci/po/vi/pbx-voicemail.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr ""
+
+msgid "Enable Voicemail"
+msgstr ""
+
+msgid "Global Voicemail Setup"
+msgstr ""
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+
+msgid "Last Sent Voicemail Log"
+msgstr ""
+
+msgid "Local Storage Directory"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr ""
+
+msgid "SMTP Password"
+msgstr ""
+
+msgid "SMTP Port Number"
+msgstr ""
+
+msgid "SMTP Server Authentication"
+msgstr ""
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr ""
+
+msgid "SMTP User Name"
+msgstr ""
+
+msgid "Secure Connection Using TLS"
+msgstr ""
+
+msgid "Voicemail Setup"
+msgstr ""
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/pbx.po b/trunk/package/luci/po/vi/pbx.po
new file mode 100644
index 00000000..59af3e87
--- /dev/null
+++ b/trunk/package/luci/po/vi/pbx.po
@@ -0,0 +1,484 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Blacklisted Numbers"
+msgstr ""
+
+msgid "Call Routing"
+msgstr ""
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr ""
+
+msgid "Copy-paste large lists of numbers here."
+msgstr ""
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr ""
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr ""
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr ""
+
+msgid "Enable Outgoing Calls"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr ""
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Google Accounts"
+msgstr ""
+
+msgid "Google Talk Status"
+msgstr ""
+
+msgid "Google Talk Status Message"
+msgstr ""
+
+msgid "Google Voice/Talk Accounts"
+msgstr ""
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr ""
+
+msgid "Insert QoS Rules"
+msgstr ""
+
+msgid "Makes Outgoing Calls"
+msgstr ""
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr ""
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr ""
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Number of Seconds to Ring"
+msgstr ""
+
+msgid "Outbound Proxy"
+msgstr ""
+
+msgid "Outgoing Calls"
+msgstr ""
+
+msgid "PBX Main Page"
+msgstr ""
+
+msgid "PBX Service Status"
+msgstr ""
+
+msgid "PIN"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr ""
+
+msgid "Providers Used for Outgoing Calls"
+msgstr ""
+
+msgid "QoS Settings"
+msgstr ""
+
+msgid "RTP Port Range End"
+msgstr ""
+
+msgid "RTP Port Range Start"
+msgstr ""
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr ""
+
+msgid "Remote Usage"
+msgstr ""
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr ""
+
+msgid "SIP Device/Softphone Accounts"
+msgstr ""
+
+msgid "SIP Provider Accounts"
+msgstr ""
+
+msgid "SIP Realm (needed by some providers)"
+msgstr ""
+
+msgid "SIP Server/Registrar"
+msgstr ""
+
+msgid "SIP Server/Registrar Port"
+msgstr ""
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/polipo.po b/trunk/package/luci/po/vi/polipo.po
new file mode 100644
index 00000000..0765db32
--- /dev/null
+++ b/trunk/package/luci/po/vi/polipo.po
@@ -0,0 +1,290 @@
+#  polipo.pot
+#  generated from ./applications/luci-polipo/luasrc/i18n/polipo.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-13 07:49+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr "Đối tượng cho phép"
+
+msgid "Always use system DNS resolver"
+msgstr ""
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr ""
+"Sự chứng thực HTTP Cơ bản được hỗ trợ. Cung cấp tên người dùng và mật khẩu "
+"trong tên người dùng: mật khẩu định dạng"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "DNS and Query Settings"
+msgstr ""
+
+msgid "DNS server address"
+msgstr "Địa chỉ tên miền máy chủ"
+
+msgid "Delete cache files time"
+msgstr "Xóa tập tin cạc khi"
+
+msgid "Disk cache location"
+msgstr "Vị trí cạc đĩa"
+
+msgid "Do not query IPv6"
+msgstr ""
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "Kích hoạt nếu cạc được chia rẻ bởi nhiều người dùng."
+
+msgid "First PMM segment size (in bytes)"
+msgstr "Dung lượng phân đoạn PMM đầu tiên (in bytes)"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Bao nhiêu RAM Polipo nên dùng cho cạc."
+
+msgid "In RAM cache size (in bytes)"
+msgstr "Trong RAM dung lượng cạc (tính theo bytes)"
+
+msgid "Listen address"
+msgstr "Địa chỉ nge"
+
+msgid "Listen port"
+msgstr "Cổng nghe"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr ""
+"Vị trị mà polipo sẽ định các tập tin thường xuyên. Sử dụng thiết bị nhớ "
+"ngoài được khuyến khích, bởi vì cạc có thể lớn lên đáng kể. Để lại nó trống "
+"để vô hiệu hóa Trên cạc trên đĩa."
+
+msgid "Log file location"
+msgstr "Vị trí tập tin sổ ghi"
+
+msgid "Log to syslog"
+msgstr "Log to syslog"
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr ""
+
+msgid "On-Disk Cache"
+msgstr "Cạc trên ổ đĩa"
+
+msgid "PMM segments size (in bytes)"
+msgstr "Dung lượng phân đoạn PMM (in bytes)"
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr "Địa chỉ parent proxy "
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+"Địa chỉ parent proxy (in host:port format), cái mà Polipo sẽ chuyển yêu cầu "
+"tới."
+
+msgid "Parent proxy authentication"
+msgstr "Xác thực parent proxy "
+
+msgid "Polipo"
+msgstr "Polipo"
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo là một web proxy nhỏ và nhanh caching."
+
+msgid "Poor Man's Multiplexing"
+msgstr "Poor Man&amp;#39;s Multiplexing"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+"Poor Man&amp;#39;s Multiplexing (PMM) là một kỹ thuật kích thích "
+"multiplexing bằng cách yêu cầu trường hợp trong nhiều phân đoạn. Nó cố gắng "
+"hạ thấp sự trễ nãi do các điểm yếu HTTP protocol gây ra. Chú ý: một số trang "
+"web có thể không hoạt động với PMM bật."
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr "Tra vấn DNS bằng hostname"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr "Tra vấn DNS cho IPv6"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+"Cài đặt địa chỉ tên miền máy chủ để sử dụng, nếu bạn muốn Polipo dùng tên "
+"miền khác với hệ thông chính. "
+
+msgid "Shared cache"
+msgstr "Cạc trên ổ đĩa"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+"Dung lượng của phân đoạn PMM đầu tiên. Nếu không định nghĩa sẽ mặc định dung "
+"lượng của phân đoạn PMM gấp 2 lần"
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr "Syslog facility"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+"Giao diện mà Polipo sẽ nghe. Để nghe trên tất cả các giao diện dùng 0.0.0.0 "
+"hoặc :: (IPv6)"
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr "Bỏ bớt những tập tin cạc với dung lượng  (bytes)"
+
+msgid "Truncate cache files time"
+msgstr "Cắt bỏ tập tin cạc khi"
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+"Nên dùng bộ nhớ ngoài bởi vì tập tin sổ ghi được viết rất nhiều lần và có "
+"thể phát tán rất mạnh. "
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "To enable polipo on-disk cache cleaning (highly recommended), you should "
+#~ "add a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+#~ "polipo_purge script. For example to perform disk cache cleanup every day "
+#~ "at 6:00 in the morning you should add the following line in Scheduled "
+#~ "Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
+#~ msgstr ""
+#~ "Để kích hoạt tính năng làm sạch trên cạc đĩa polipo (rất khuyến khích), "
+#~ "bạn nên thêm vào một công việc cron trong những công tác đã schedule, nó "
+#~ "sẽ thực hiện / usr / sbin / polipo_purge script. Ví dụ: để thực hiện các "
+#~ "đĩa bộ nhớ cache mỗi ngày vào lúc 6:00 sáng, bạn nên thêm dòng sau trong "
+#~ "Scheduled công việc &amp;quot;0 6 * * * /usr/sbin/polipo_purge&amp;quot; "
+#~ "(không có dấu ngoặc kép)."
+
+#~ msgid ""
+#~ "Size to which cached files should be truncated. (default value: 1048576)"
+#~ msgstr "Dung lượng mà những tập tin cạc bị cắt bỏ. (Giá trị: 1048576)"
+
+#~ msgid ""
+#~ "Time after which cached files will be truncated. (default value: 4d12h)"
+#~ msgstr "Thời gian khi tập tin cạc sẽ bị cắt bỏ (Giá trị: 4d12h)"
+
+#~ msgid "Time after which cached files will be deleted. (default value: 32d)"
+#~ msgstr "Thời gian khi tập tin cạc sẽ bị xóa. (Giá trị: 32d)"
+
+#~ msgid "General"
+#~ msgstr "Tổng quát"
+
+#~ msgid ""
+#~ "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+#~ "that are allowed to connect. The format is IP address or network address "
+#~ "(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+#~ msgstr ""
+#~ "Khi nghe địa chỉ được đặt ở 0.0.0.0 hoặc :: (IPv6), bạn phải liệt kê "
+#~ "những đối tượng được phép kết nối. Định dạng là địa chỉ IP hoặc địa chỉ "
+#~ "mạng (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
+
+#~ msgid ""
+#~ "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily "
+#~ "= Query both, prefer IPv6; true = Query only IPv6"
+#~ msgstr ""
+#~ "False = Đừng truy vấn IPv6; reluctantly = Truy vấn cả hai, IPv4 được "
+#~ "chuộng hơn; happily = truy vấn cả hai, IPv6 chuộng hơn; true = chỉ truy "
+#~ "vấn IPv6"
+
+#~ msgid ""
+#~ "false = Never use system DNS resolver; reluctantly = Query DNS directly, "
+#~ "if DNS server is unavailable fail to system DNS resolver; happily = Query "
+#~ "DNS directly, if host could not be found fallback to system DNS resolver; "
+#~ "true = Always use system DNS resolver"
+#~ msgstr ""
+#~ "false = Đừng bao giờ dùng bộ phân tích hệ thống DNS; reluctantly = Truy "
+#~ "vấn DNS trực tiếp, nếu DNS server không có sẵn trong bộ phân tích hệ "
+#~ "thống DNS; happily = truy vấn DNS trực tiếp, nếu host bị đẩy lùi so với "
+#~ "bộ phân tích hệ thống DNS; true = Luân luân dùng bộ phân tích hệ thống DNS"
+
+#~ msgid "Port on which Polipo will listen. (default value: 8123)"
+#~ msgstr "Cổng mà Polipo sẽ nghe. (giá trị: 8123)"
+
+#~ msgid "polipo_pmm_pmmsize_desc"
+#~ msgstr ""
+#~ "Để kích hoạt PMM, dung lượng phân đoạn PMM phải được đặt những giá trị "
+#~ "dÆ°Æ¡ng."
diff --git a/trunk/package/luci/po/vi/qos.po b/trunk/package/luci/po/vi/qos.po
new file mode 100644
index 00000000..82492727
--- /dev/null
+++ b/trunk/package/luci/po/vi/qos.po
@@ -0,0 +1,122 @@
+#  qos.pot
+#  generated from ./applications/luci-qos/luasrc/i18n/qos.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2009-08-13 03:56+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#, fuzzy
+msgid "Calculate overhead"
+msgstr "Tính toán tổng quát"
+
+#, fuzzy
+msgid "Classification Rules"
+msgstr "Phân loại"
+
+#, fuzzy
+msgid "Classification group"
+msgstr "Phân loại"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr ""
+
+msgid "Download speed (kbit/s)"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+#, fuzzy
+msgid "Half-duplex"
+msgstr "Half-Duplex"
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Number of bytes"
+msgstr ""
+
+#, fuzzy
+msgid "Ports"
+msgstr "Ưu tiên"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "QoS"
+msgstr ""
+
+msgid "Quality of Service"
+msgstr "Chất lượng dịch vụ "
+
+msgid "Service"
+msgstr ""
+
+#, fuzzy
+msgid "Source host"
+msgstr "Địa chỉ nguồn"
+
+#, fuzzy
+msgid "Target"
+msgstr "Địa chỉ mục tiêu"
+
+msgid "Upload speed (kbit/s)"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"Với QoS, bạn có thể ưu tiên cho mạng lưới giao thông được chọn bởi địa chỉ, "
+"cổng hay dịch vụ."
+
+msgid "all"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "express"
+msgstr "cấp tốc"
+
+msgid "low"
+msgstr "thấp"
+
+msgid "normal"
+msgstr "bình thường"
+
+msgid "priority"
+msgstr "ưu tiên"
+
+#~ msgid "Downlink"
+#~ msgstr "Downlink"
+
+#~ msgid "Uplink"
+#~ msgstr "Uplink"
+
+#~ msgid "Prioritization"
+#~ msgstr "Quá trình ưu tiên"
+
+#~ msgid "source network / source host"
+#~ msgstr "nguồn mạng/ nguồn host"
+
+#~ msgid "target network / target host"
+#~ msgstr "Mục tiêu mạng/ mục tiêu host"
+
+#~ msgid "portrange"
+#~ msgstr "portrange"
+
+#~ msgid "Bytes sent"
+#~ msgstr "Bytes đã gửi"
diff --git a/trunk/package/luci/po/vi/radvd.po b/trunk/package/luci/po/vi/radvd.po
new file mode 100644
index 00000000..8e0fb01a
--- /dev/null
+++ b/trunk/package/luci/po/vi/radvd.po
@@ -0,0 +1,368 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-21 04:06+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/rrdtool.po b/trunk/package/luci/po/vi/rrdtool.po
new file mode 100644
index 00000000..ca94cf8d
--- /dev/null
+++ b/trunk/package/luci/po/vi/rrdtool.po
@@ -0,0 +1,524 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-13 14:45+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
+
+#~ msgid "%H: Wireless - Signal Noise Ratio"
+#~ msgstr "%H: Wireless - Signal Noise Ratio"
+
+#~ msgid "dBm"
+#~ msgstr "dBm"
+
+#~ msgid "Noise Level"
+#~ msgstr "Noise Level"
+
+#~ msgid "Signal Strength"
+#~ msgstr "Độ mạnh của tín hiệu"
+
+#~ msgid "%H: Wireless - Signal Quality"
+#~ msgstr "%H: Wireless -Chất lượng tín hiệu"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "Signal Quality"
+#~ msgstr "Chất lượng tín hiệu "
+
+#~ msgid "%H: ICMP Roundtrip Times"
+#~ msgstr "%H: ICMP thời gian đi một vòng"
+
+#~ msgid "ms"
+#~ msgstr "ms"
+
+#~ msgid "%H: Firewall - Processed Packets"
+#~ msgstr "%H: Firewall - Gói đã xử lý"
+
+#~ msgid "Chain \"%di\""
+#~ msgstr "Chuỗi \"%di\""
+
+#~ msgid "%H: Netlink - Transfer on %pi"
+#~ msgstr "%H: Netlink - chuyển về %pi"
+
+#~ msgid "Bytes (%ds)"
+#~ msgstr "Bytes (%ds)"
+
+#~ msgid "%H: Netlink - Packets on %pi"
+#~ msgstr "%H: Netlink - Đóng gói trên %pi"
+
+#~ msgid "Processed (%ds)"
+#~ msgstr "Đã xử lý (%ds)"
+
+#~ msgid "Dropped (%ds)"
+#~ msgstr ""
+#~ "Dropped<span class=\"translation-space\"> </span>\n"
+#~ "<span class=\"translation-space\"> </span>\n"
+#~ "<span class=\"translation-space\"> </span>\n"
+#~ "(%ds)"
+
+#~ msgid "Errors (%ds)"
+#~ msgstr ""
+#~ "Lỗi<span class=\"translation-space\"> </span>\n"
+#~ "<span class=\"translation-space\"> </span>\n"
+#~ "<span class=\"translation-space\"> </span>\n"
+#~ "<span class=\"translation-space\"> </span>\n"
+#~ "(%ds)"
+
+#~ msgid "%H: Netlink - Multicast on %pi"
+#~ msgstr "%H: Netlink - Multicast on %pi"
+
+#~ msgid "Packets"
+#~ msgstr "Gói"
+
+#~ msgid "%H: Netlink - Collisions on %pi"
+#~ msgstr "%H: Netlink - Collisions on %pi"
+
+#~ msgid "Collisions/s"
+#~ msgstr "Collisions/s"
+
+#~ msgid "Collisions"
+#~ msgstr "Collisions"
+
+#~ msgid "%H: Netlink - Errors on %pi"
+#~ msgstr "%H: Netlink - lỗi trên %pi"
+
+#~ msgid "Errors/s"
+#~ msgstr "Lỗi"
+
+#~ msgid "%H: Processes"
+#~ msgstr "%H: Quá trình"
+
+#~ msgid "Processes/s"
+#~ msgstr "Quy trình"
+
+#~ msgid "%H: Process %pi - used cpu time"
+#~ msgstr "%H: Quá trình %pi - thời gian cpu đã sử dụng"
+
+#~ msgid "Jiffies"
+#~ msgstr "Jiffies"
+
+#~ msgid "System"
+#~ msgstr "Hệ thống"
+
+#~ msgid "user"
+#~ msgstr "Người dùng"
+
+#~ msgid "%H: Process %pi - threads and processes"
+#~ msgstr "%H: quá trình %pi - các luồng và quá trình"
+
+#~ msgid "Count"
+#~ msgstr "Đếm"
+
+#~ msgid "%H: Process %pi - page faults"
+#~ msgstr "%H: quá trình %pi - lỗi trang"
+
+#~ msgid "Pagefaults"
+#~ msgstr "Pagefaults"
+
+#~ msgid "page faults"
+#~ msgstr "page faults"
+
+#~ msgid "%H: Process %pi - virtual memory size"
+#~ msgstr "%H: quá trình %pi - dung lượng bộ nhớ ảo "
+
+#~ msgid "virtual memory"
+#~ msgstr "Bộ nhớ ảo"
+
+#~ msgid "%H: Usage on Processor #%pi"
+#~ msgstr "%H: sử dụng trên bộ xử lý #%pi"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "%H: Transfer on %di"
+#~ msgstr "%H: Chuyển tải trên %di"
+
+#~ msgid "%H: Packets on %di"
+#~ msgstr "%H: Gói trên %di"
+
+#~ msgid "%H: TCP-Connections to Port %pi"
+#~ msgstr "%H: TCP-kết nối tới cổng %pi"
+
+#~ msgid "Connections/s"
+#~ msgstr "Kết nối"
+
+#~ msgid "%H: Disk Space Usage on %di"
+#~ msgstr "%H: sử dụng không gian trên đĩa ở %di"
+
+#~ msgid "%H: Interrupts"
+#~ msgstr "%H: Cắt ngang"
+
+#~ msgid "Issues/s"
+#~ msgstr "Vấn đề"
+
+#~ msgid "IRQ %di"
+#~ msgstr "IRQ %di"
+
+#~ msgid "%H: System Load"
+#~ msgstr "%H: Tải hệ thống"
+
+#~ msgid "Load"
+#~ msgstr "Tải"
+
+#~ msgid "1 min"
+#~ msgstr "1 phút"
+
+#~ msgid "5 min"
+#~ msgstr "5 phút"
+
+#~ msgid "15 min"
+#~ msgstr "15 phút"
diff --git a/trunk/package/luci/po/vi/samba.po b/trunk/package/luci/po/vi/samba.po
new file mode 100644
index 00000000..4e5638da
--- /dev/null
+++ b/trunk/package/luci/po/vi/samba.po
@@ -0,0 +1,96 @@
+#  samba.pot
+#  generated from ./applications/luci-samba/luasrc/i18n/samba.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-13 03:54+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#, fuzzy
+msgid "Allow guests"
+msgstr "Cho phép khách"
+
+#, fuzzy
+msgid "Allow system users to reach their home directories via network shares"
+msgstr ""
+"Những người sử dụng hệ thống có thể tiếp cận những thư mục tại nhà thông qua "
+"mạng lưới chia sẻ trực tuyến."
+
+#, fuzzy
+msgid "Allowed users"
+msgstr "Người sử dụng được cho phép"
+
+#, fuzzy
+msgid "Create mask"
+msgstr "Tạo Mask"
+
+msgid "Description"
+msgstr "Mô tả"
+
+#, fuzzy
+msgid "Directory mask"
+msgstr "Thư mục Mask"
+
+msgid "Edit Template"
+msgstr ""
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Hostname"
+msgstr "tên máy chủ"
+
+msgid "Mask for new directories"
+msgstr "Mask cho thư mục mới"
+
+msgid "Mask for new files"
+msgstr "Mask cho tập tin mới"
+
+msgid "Name"
+msgstr ""
+
+msgid "Network Shares"
+msgstr "Mạng chia sẻ"
+
+msgid "Path"
+msgstr ""
+
+#, fuzzy
+msgid "Read-only"
+msgstr "Chỉ đọc "
+
+msgid "Share home-directories"
+msgstr "Chia sẻ danh bạ chính"
+
+msgid "Shared Directories"
+msgstr "Thư mục chia sẻ"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+
+msgid "Workgroup"
+msgstr "Nhóm làm việc "
+
+#~ msgid "Shared Directory"
+#~ msgstr "Đã chia sẻ thư mục"
+
+#~ msgid "Physical Path"
+#~ msgstr "Đường dẫn vật lý"
+
+#~ msgid "optional"
+#~ msgstr "Tùy thích"
diff --git a/trunk/package/luci/po/vi/splash.po b/trunk/package/luci/po/vi/splash.po
new file mode 100644
index 00000000..615be16b
--- /dev/null
+++ b/trunk/package/luci/po/vi/splash.po
@@ -0,0 +1,292 @@
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/statistics.po b/trunk/package/luci/po/vi/statistics.po
new file mode 100644
index 00000000..c853c8a3
--- /dev/null
+++ b/trunk/package/luci/po/vi/statistics.po
@@ -0,0 +1,665 @@
+#  statistics.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/statistics.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-16 05:50+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Action (target)"
+msgstr "Action (target)"
+
+msgid "Add command for reading values"
+msgstr "Thêm lệnh cho giá trị đang đọc"
+
+msgid "Add matching rule"
+msgstr "Thêm matching rule"
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr "Thêm lệnh thông báo"
+
+msgid "Base Directory"
+msgstr "Thư mục Cơ sở"
+
+msgid "Basic monitoring"
+msgstr "Monitoring căn bản"
+
+msgid "CPU Plugin Configuration"
+msgstr "Cấu hình Plugin CPU"
+
+msgid "CSV Output"
+msgstr "CSV Output"
+
+msgid "CSV Plugin Configuration"
+msgstr "Cấu hình CSV plugin"
+
+msgid "Cache collected data for"
+msgstr "Cache collected data cho"
+
+msgid "Cache flush interval"
+msgstr "Cache flush interval"
+
+msgid "Chain"
+msgstr "Chain"
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Những cài đặt collectd"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+"Collectd là một daemon nhỏ để thu thập dữ liệu từ nhiều nguồn thông qua các "
+"plugins khác nhau. Trên trang này, bạn có thể thay đổi cài đặt tổng quát cho "
+"cai collectd daemon. "
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr "Cấu hình DF plugin"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "Cấu hình DNS plugin"
+
+msgid "Data collection interval"
+msgstr "Khoảng thu thập dữ liệu"
+
+msgid "Datasets definition file"
+msgstr "Tập tin định nghĩa cơ sở dữ liệu"
+
+msgid "Destination ip range"
+msgstr "Điểm đến ip range"
+
+msgid "Directory for collectd plugins"
+msgstr "Danh mục cho collectd plugins"
+
+msgid "Directory for sub-configurations"
+msgstr "Danh mục cho sub-configurations"
+
+msgid "Disk Plugin Configuration"
+msgstr "Cấu hình disk plugin"
+
+msgid "Disk Space Usage"
+msgstr "Khoảng trống trên đĩa"
+
+msgid "Disk Usage"
+msgstr "Disk Usage"
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr "Display timespan"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "Cấu hình e-mail plugin"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Enable this plugin"
+msgstr "Kích hoạt plugin này"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Cấu hình Exec Plugin"
+
+msgid "Filter class monitoring"
+msgstr "Filter class monitoring"
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Flush cache after"
+msgstr "Flush cache sau khi"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "chuyển tiếp giữa listen và địa chỉ server"
+
+msgid "Graphs"
+msgstr "Graphs"
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+"Ở đây bạn có thể định nghĩa các lệnh bên ngoài mà sẽ khởi động bằng collectd "
+"để đọc những giá trị nhất định. Những giá trị sẽ được đọc từ stdout"
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+"Ở đây bạn có thể định nghĩa các lệnh  bên ngoài cái mà bắt đầu bằng collectd "
+"khi những giá trị threshold nhất định được tiếp cận. Những giá trị dẫn tới "
+"invokation sẽ được feed tới một chương trình gọi là stdin"
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+"Ở đây bạn có thể định nghĩa những tiêu chuẩn khác nhau để monitor iptables "
+"rules được chọn."
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr "Tên host"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr "Cấu hình IRQ Plugin "
+
+msgid "Ignore source addresses"
+msgstr "Lờ đi những địa chỉ nguồn"
+
+msgid "Incoming interface"
+msgstr "Giao diện đang tới"
+
+msgid "Interface Plugin Configuration"
+msgstr "Cấu hình giao diện plugin"
+
+msgid "Interfaces"
+msgstr "Giao diện"
+
+msgid "Interrupts"
+msgstr "Cắt ngang"
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr "cấu hình Iptables Plugin "
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr "Listen host"
+
+msgid "Listen port"
+msgstr "Listen port"
+
+msgid "Listener interfaces"
+msgstr "Giao diện listener"
+
+msgid "Load Plugin Configuration"
+msgstr "Tải cấu hình plugin"
+
+msgid "Maximum allowed connections"
+msgstr "Tối đã kết nối cho phép"
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr "Monitor tất cả local listen port"
+
+msgid "Monitor devices"
+msgstr "Monitor devices"
+
+msgid "Monitor disks and partitions"
+msgstr "Kiểm soát đĩa và phân vùng"
+
+msgid "Monitor filesystem types"
+msgstr "Kiểm soát loại filesystem"
+
+msgid "Monitor hosts"
+msgstr "Monitor hosts"
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr "Monitor interrupts"
+
+msgid "Monitor local ports"
+msgstr "Monitor cổng địa phương"
+
+msgid "Monitor mount points"
+msgstr "Monitor mount points"
+
+msgid "Monitor processes"
+msgstr "Monitor processes"
+
+msgid "Monitor remote ports"
+msgstr "Monitor remote ports"
+
+msgid "Name of the rule"
+msgstr "Tên của rule"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Cấu hình Netlink Plugin "
+
+msgid "Network"
+msgstr "Network"
+
+msgid "Network Plugin Configuration"
+msgstr "Cấu hình network plugin"
+
+msgid "Network plugins"
+msgstr "Network plugins"
+
+msgid "Network protocol"
+msgstr "Network protocol"
+
+msgid "Number of threads for data collection"
+msgstr "Số lượng các chủ đề để thu thập dữ liệu"
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr "Chỉ tạo trung bình RRAs"
+
+msgid "Options"
+msgstr "Tùy chọn"
+
+msgid "Outgoing interface"
+msgstr "Giao diện ra ngoài"
+
+msgid "Output plugins"
+msgstr "Output plugins"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Cấu hình Ping plugin"
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr "Quá trình xử lý"
+
+msgid "Processes Plugin Configuration"
+msgstr "Cấu hình processes plugin"
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr "Bộ xử lý"
+
+msgid "Qdisc monitoring"
+msgstr "Qdisc monitoring"
+
+msgid "RRD XFiles Factor"
+msgstr "Yếu tố RRD XFiles"
+
+msgid "RRD heart beat interval"
+msgstr "RRD heart beat interval"
+
+msgid "RRD step interval"
+msgstr "RRD step interval"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "Cấu hình RRDTool Plugin "
+
+msgid "Rows per RRA"
+msgstr "Rows per RRA"
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr "Giây"
+
+msgid "Server host"
+msgstr "Server host"
+
+msgid "Server port"
+msgstr "Server port"
+
+msgid "Shaping class monitoring"
+msgstr "Shaping class monitoring"
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr "Nguồn ip range"
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr "Thư mục lưu trữ"
+
+msgid "Storage directory for the csv files"
+msgstr "Thư mục lưu trữ cho nhưng tập tin csv"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "Những giá trị dữ liệu lưu trữ như một tỉ lệ thay vì giá trị tuyệt đối"
+
+msgid "Stored timespans"
+msgstr "LÆ°u timspans"
+
+msgid "System Load"
+msgstr "System Load"
+
+msgid "System plugins"
+msgstr "System plugins"
+
+msgid "TCP Connections"
+msgstr "Kết nối TCP"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "Cấu hình TCPConns Plugin "
+
+msgid "TTL for network packets"
+msgstr "TTL cho gói mạng"
+
+msgid "TTL for ping packets"
+msgstr "TTl cho gói ping"
+
+msgid "Table"
+msgstr "Table"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "CPU plugin thu thập số liệu thống kê cơ bản về sử dụng bộ việc xử lý"
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+"CSV plugin stores thu thập dữ liệu trong tập tin định dạng csv để tiến hành "
+"xử lý bằng các chương trình bên ngoài."
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+"df plugin thu thập số liệu thông kế về khoảng trống trên đĩa trên những "
+"thiết bị khác,  mount points hoặc những loại filesystem."
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+"Disk plugin thu thập số liệu thống kê chi tiết về cách sử dụng cho những "
+"phân vùng lựa chọn hoặc toàn bộ đĩa."
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+" dns plugin thu thập những thông kê chi tiết về dns liên quan đến lưu thông "
+"trên những giao diện được chọn. "
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"Email plugin tạo ra một unix socket mà có thể dùng để truyền thông kê e-mail "
+"tới một collectd daemon đang chạy. Cái plugin này chủ yếu được dùng với "
+"Mail::SpamAssasin::Plugin::Collectd nhưng cũng có thể dùng trong những cách  "
+"khác."
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+"Exec plugin bắt đầu những lệnh bên ngoài để đọc những giá trị từ hoặc tới "
+"những quá trình xử lý thông báo bên ngoài khi giá trị của một threshold nhất "
+"định được tiếp cận "
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+"Giao diện plugin thu thập những thống kê lưu thông trên những giao diện được "
+"chọn"
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+"iptables plugin sẽ monitor những cái firewall rules được chọn và thu thập "
+"thông tin về bytes xử lý và gói trên rule. "
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+"irq plugin sẽ monitor tỉ lệ vấn đề trên giây cho những interrupt được chọn. "
+"Nếu không có interrupt được chọn thi tất cả các interrupt sẽ được monitor. "
+"for each selected interrupt. If no interrupt is selected then all interrupts "
+"are monitored."
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "Plugin tải thu thập thông kê về tổng quát system load"
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+"Netlink plugin thu thập những thông tin mở rộng như qdisc-, class- and "
+"filter-statistics cho những giao diện được chọn"
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"Network plugin cung cấp network dựa trên giao tiếp giữa những collectd "
+"instances khác nhau. Collectd có thể vận hành trên cả 2 chế độ client và "
+"server. Trong kiểu chế độ client tập hợp ngày tháng địa phương được chuyển "
+"tới một collectd server instance, trong chế độ server, instance địa phương "
+"nhận dữ liệu từ những host khác."
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+"ping plugin sẽ gửi icmp echo trả lời tới những host được chọn và đo thời "
+"gian vận hành qua lại cho từng host"
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+"Processes plugin thu thập thông tin như cpu time, page faults và memory "
+"usage của từng processes được chọn. "
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"The rrdtool plugin lưu những dữ liệu thu thập trong rrd database files, cơ "
+"sở của biểu đồ.<br /><br /><strong> Cảnh báo: Đặt sai giá trị sẽ tiêu hao bộ "
+"nhớ rất nhiều trong một thư mục tạm thời. Điều này có thể làm thiết bị không "
+"sử dụng được</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"Gói thống kê dựa trên <a href=\"http://collectd.org/index.shtml\">Collectd</"
+"a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> vẽ lại "
+"sơ đồ hình ảnh từ dữ liệu thu thập ."
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+"Tcpconns plugin thu thập thông tin về open tcp kết nối trên những cổng được "
+"chọn."
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+"Unixsock plugin tạo một unix socket mà có thể dùng để đọc dữ liệu thu thập "
+"từ một collectd instance đang vận hành. "
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+"Section này định nghĩa trên giao diện collectd sẽ đợi những kết nối đang tới"
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr "Section này định nghĩa servers thu thập dữ liệu địa phương để gửi đi"
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "Thử tra cứu những tên host đủ điều kiện"
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Cấu hình Unixsock Plugin "
+
+msgid "Used PID file"
+msgstr "Tập tin PID đã sử dụng"
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr "Verbose monitoring"
+
+msgid "Wireless"
+msgstr "Mạng không dây"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr "e.g. br-ff"
+
+msgid "e.g. br-lan"
+msgstr "e.g. br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "e.g. reject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "max. 16 chars"
+
+msgid "reduces rrd size"
+msgstr "Giảm rrd size"
+
+msgid "seconds; multiple separated by space"
+msgstr "giây; nhiều phân tách bởi khoảng trống"
+
+msgid "server interfaces"
+msgstr "giao diện server"
+
+#~ msgid ""
+#~ "The wireless plugin collects statistics about wireless signal strength, "
+#~ "noise and quality."
+#~ msgstr ""
+#~ "Cấu hình wireless plugin thu thập thống kê về độ mạnh của tín hiệu wireless, "
+#~ "noise và chất lượng."
+
+#~ msgid "Wireless Plugin Configuration"
+#~ msgstr "Cấu hình Wireless Plugin "
diff --git a/trunk/package/luci/po/vi/tinyproxy.po b/trunk/package/luci/po/vi/tinyproxy.po
new file mode 100644
index 00000000..6c825f53
--- /dev/null
+++ b/trunk/package/luci/po/vi/tinyproxy.po
@@ -0,0 +1,332 @@
+#  tinyproxy.pot
+#  generated from ./applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:58+0200\n"
+"PO-Revision-Date: 2009-08-13 03:36+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr "Log level"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr "Tối đa spare servers"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr "Tối thiểu spare servers"
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr "Từ chối truy cập "
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr "Host mục tiêu"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy là một proxy nhỏ và nhanh không-cạc HTTP(S)"
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr "Via proxy"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
+
+#~ msgid "Allow access from"
+#~ msgstr "Cho phép truy cập từ"
+
+#~ msgid "Allowed headers for anonymous proxy"
+#~ msgstr "Cho phép headers cho anonymous proxy"
+
+#~ msgid "Bind outgoing traffic to address"
+#~ msgstr "Blind lưu lượng truy cập ngoài vào địa chỉ"
+
+#~ msgid "Ports allowed for CONNECT method"
+#~ msgstr "Cổng cho phép phương pháp CONNECT"
+
+#~ msgid "0 = disabled, empty = all"
+#~ msgstr "0=vô hiệu hóa, rỗng = tất cả"
+
+#~ msgid "Error document"
+#~ msgstr "Tài liệu lỗi"
+
+#~ msgid "Filter list"
+#~ msgstr "Lọc list"
+
+#~ msgid "Case sensitive filters"
+#~ msgstr "Lọc phím nhạy cảm"
+
+#~ msgid "Filter list is a whitelist"
+#~ msgstr "Lọc list là một whitelist"
+
+#~ msgid "Extended regular expression filters"
+#~ msgstr "Mở rộng các bộ lọc thường xuyên biểu"
+
+#~ msgid "Filter URLs instead of domains"
+#~ msgstr "Lọc URLs thay domain"
+
+#~ msgid "Listen on address"
+#~ msgstr "Nghe trên địa chỉ"
+
+#~ msgid "Logfile"
+#~ msgstr "Logfile"
+
+#~ msgid "Maximum number of clients"
+#~ msgstr "Tối đa số lượng khách hàng"
+
+#~ msgid "Maximum requests per thread"
+#~ msgstr "Tối đa yêu cầu trên thread"
+
+#~ msgid "Spare servers to start with"
+#~ msgstr "Spare servers bắt đầu với"
+
+#~ msgid "Statistic document"
+#~ msgstr "Tài liệu thống kê"
+
+#~ msgid "Write to syslog"
+#~ msgstr "viết tới syslog"
+
+#~ msgid "Connection Timeout"
+#~ msgstr "Kết nối hết hiệu lực"
+
+#~ msgid "Value of Via-Header"
+#~ msgstr "Giá trị của Via-Header"
+
+#~ msgid "Include client IP"
+#~ msgstr "Bao gồm IP của khách hàng"
+
+#~ msgid "Upstream Control"
+#~ msgstr "Điều khiển Upstream "
+
+#~ msgid "Type"
+#~ msgstr "Loại "
+
+#~ msgid "Upstream Proxy"
+#~ msgstr "Upstream Proxy"
diff --git a/trunk/package/luci/po/vi/transmission.po b/trunk/package/luci/po/vi/transmission.po
new file mode 100644
index 00000000..3125fc27
--- /dev/null
+++ b/trunk/package/luci/po/vi/transmission.po
@@ -0,0 +1,280 @@
+msgid "Alternative download speed"
+msgstr ""
+
+msgid "Alternative speed enabled"
+msgstr ""
+
+msgid "Alternative speed time begin"
+msgstr ""
+
+msgid "Alternative speed time day"
+msgstr ""
+
+msgid "Alternative speed time end"
+msgstr ""
+
+msgid "Alternative speed timing enabled"
+msgstr ""
+
+msgid "Alternative upload speed"
+msgstr ""
+
+msgid "Automatically start added torrents"
+msgstr ""
+
+msgid "Bandwidth settings"
+msgstr ""
+
+msgid "Binding address IPv4"
+msgstr ""
+
+msgid "Binding address IPv6"
+msgstr ""
+
+msgid "Block list enabled"
+msgstr ""
+
+msgid "Blocklist URL"
+msgstr ""
+
+msgid "Blocklists"
+msgstr ""
+
+msgid "Cache size in MB"
+msgstr ""
+
+msgid "Config file directory"
+msgstr ""
+
+msgid "DHT enabled"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Download directory"
+msgstr ""
+
+msgid "Download queue enabled"
+msgstr ""
+
+msgid "Download queue size"
+msgstr ""
+
+msgid "Enable watch directory"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Fast"
+msgstr ""
+
+msgid "Files and Locations"
+msgstr ""
+
+msgid "Forced"
+msgstr ""
+
+msgid "Full"
+msgstr ""
+
+msgid "Global peer limit"
+msgstr ""
+
+msgid "Global settings"
+msgstr ""
+
+msgid "Idle seeding limit"
+msgstr ""
+
+msgid "Idle seeding limit enabled"
+msgstr ""
+
+msgid "Incomplete directory"
+msgstr ""
+
+msgid "Incomplete directory enabled"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "LPD enabled"
+msgstr ""
+
+msgid "Lazy bitfield enabled"
+msgstr ""
+
+msgid "Message level"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
+msgid "Open Web Interface"
+msgstr ""
+
+msgid "PEX enabled"
+msgstr ""
+
+msgid "Peer Port settings"
+msgstr ""
+
+msgid "Peer congestion algorithm"
+msgstr ""
+
+msgid "Peer limit per torrent"
+msgstr ""
+
+msgid "Peer port"
+msgstr ""
+
+msgid "Peer port random high"
+msgstr ""
+
+msgid "Peer port random low"
+msgstr ""
+
+msgid "Peer port random on start"
+msgstr ""
+
+msgid "Peer settings"
+msgstr ""
+
+msgid "Peer socket tos"
+msgstr ""
+
+msgid "Port forwarding enabled"
+msgstr ""
+
+msgid "Preferred"
+msgstr ""
+
+msgid "Prefetch enabled"
+msgstr ""
+
+msgid "Queue stalled enabled"
+msgstr ""
+
+msgid "Queue stalled minutes"
+msgstr ""
+
+msgid "Queueing"
+msgstr ""
+
+msgid "RPC URL"
+msgstr ""
+
+msgid "RPC authentication required"
+msgstr ""
+
+msgid "RPC bind address"
+msgstr ""
+
+msgid "RPC enabled"
+msgstr ""
+
+msgid "RPC password"
+msgstr ""
+
+msgid "RPC port"
+msgstr ""
+
+msgid "RPC settings"
+msgstr ""
+
+msgid "RPC username"
+msgstr ""
+
+msgid "RPC whitelist"
+msgstr ""
+
+msgid "RPC whitelist enabled"
+msgstr ""
+
+msgid "Ratio limit"
+msgstr ""
+
+msgid "Ratio limit enabled"
+msgstr ""
+
+msgid "Rename partial files"
+msgstr ""
+
+msgid "Run daemon as user"
+msgstr ""
+
+msgid "Scheduling"
+msgstr ""
+
+msgid "Scrape paused torrents enabled"
+msgstr ""
+
+msgid "Script torrent done enabled"
+msgstr ""
+
+msgid "Script torrent done filename"
+msgstr ""
+
+msgid "Seed queue enabled"
+msgstr ""
+
+msgid "Seed queue size"
+msgstr ""
+
+msgid "Speed limit down"
+msgstr ""
+
+msgid "Speed limit down enabled"
+msgstr ""
+
+msgid "Speed limit up"
+msgstr ""
+
+msgid "Speed limit up enabled"
+msgstr ""
+
+msgid "Transmission"
+msgstr ""
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr ""
+
+msgid "Trash original torrent files"
+msgstr ""
+
+msgid "Upload slots per torrent"
+msgstr ""
+
+msgid "Watch directory"
+msgstr ""
+
+msgid "in minutes from midnight"
+msgstr ""
+
+msgid "preallocation"
+msgstr ""
+
+msgid "uTP enabled"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/upnp.po b/trunk/package/luci/po/vi/upnp.po
new file mode 100644
index 00000000..7c7ea9d5
--- /dev/null
+++ b/trunk/package/luci/po/vi/upnp.po
@@ -0,0 +1,158 @@
+#  upnp.pot
+#  generated from ./applications/luci-upnp/luasrc/i18n/upnp.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-13 04:00+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr ""
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr ""
+
+msgid "Announced model number"
+msgstr ""
+
+msgid "Announced serial number"
+msgstr ""
+
+msgid "Clean rules interval"
+msgstr ""
+
+msgid "Clean rules threshold"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Device UUID"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP functionality"
+msgstr ""
+
+msgid "Enable UPnP functionality"
+msgstr ""
+
+msgid "Enable additional logging"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Kích hoạt chế độ an toàn"
+
+msgid "External Port"
+msgstr ""
+
+msgid "External ports"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "Internal addresses"
+msgstr ""
+
+msgid "Internal ports"
+msgstr ""
+
+msgid "MiniUPnP ACLs"
+msgstr ""
+
+msgid "MiniUPnP settings"
+msgstr ""
+
+msgid "Notify interval"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Presentation URL"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Puts extra debugging information into the system log"
+msgstr ""
+
+msgid "Report system instead of daemon uptime"
+msgstr ""
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid "UPNP"
+msgstr ""
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "UPnP lease file"
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
+msgid "Uplink"
+msgstr "Uplink"
+
+msgid "Value in KByte/s, informational only"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr ""
+#~ "UPNP cho phép đối tượng trong mạng địa phương tự động định dạng bộ định "
+#~ "tuyến"
+
+#~ msgid "Log output"
+#~ msgstr "Log output"
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "Chỉ nên kích hoạt UPNP khi thật cần thiết vì nó có thể gây nguy hiểm cho "
+#~ "mạng lưới"
diff --git a/trunk/package/luci/po/vi/ushare.po b/trunk/package/luci/po/vi/ushare.po
new file mode 100644
index 00000000..20e5df71
--- /dev/null
+++ b/trunk/package/luci/po/vi/ushare.po
@@ -0,0 +1,50 @@
+#  ushare.pot
+#  generated from ./applications/luci-ushare/luasrc/i18n/ushare.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 06:59+0200\n"
+"PO-Revision-Date: 2009-08-13 04:01+0200\n"
+"Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgid "Content directories"
+msgstr "Danh bạ nội dung "
+
+msgid "Disable telnet console"
+msgstr "Vô hiệu hóa khiển telnet"
+
+msgid "Disable webinterface"
+msgstr "Vô hiệu hóa giao diện web"
+
+msgid "Enable"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Options"
+msgstr "Lựa chọn "
+
+msgid "Servername"
+msgstr "tên máy chủ"
+
+msgid "Settings"
+msgstr "Cài đặt"
+
+msgid "Username"
+msgstr ""
+
+msgid "uShare"
+msgstr ""
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/uvc_streamer.po b/trunk/package/luci/po/vi/uvc_streamer.po
new file mode 100644
index 00000000..c38d3235
--- /dev/null
+++ b/trunk/package/luci/po/vi/uvc_streamer.po
@@ -0,0 +1,38 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr ""
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr ""
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr ""
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr ""
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/vnstat.po b/trunk/package/luci/po/vi/vnstat.po
new file mode 100644
index 00000000..9e837ad9
--- /dev/null
+++ b/trunk/package/luci/po/vi/vnstat.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-11-16 20:55+0100\n"
+"Last-Translator:  <xm@subsignal.org>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Daily traffic"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Hourly traffic"
+msgstr ""
+
+msgid "Monitor selected interfaces"
+msgstr ""
+
+msgid "Monthly traffic"
+msgstr ""
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr ""
+
+msgid "Restart VnStat"
+msgstr ""
+
+msgid "Summary display"
+msgstr ""
+
+msgid "Top 10 display"
+msgstr ""
+
+msgid "Update »"
+msgstr ""
+
+msgid "VnStat"
+msgstr ""
+
+msgid "VnStat Graphs"
+msgstr ""
+
+msgid "VnStat Traffic Monitor"
+msgstr ""
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/voice_core.po b/trunk/package/luci/po/vi/voice_core.po
new file mode 100644
index 00000000..3e45434c
--- /dev/null
+++ b/trunk/package/luci/po/vi/voice_core.po
@@ -0,0 +1,15 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Phones"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/voice_diag.po b/trunk/package/luci/po/vi/voice_diag.po
new file mode 100644
index 00000000..715f4118
--- /dev/null
+++ b/trunk/package/luci/po/vi/voice_diag.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Diagnostics"
+msgstr ""
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr ""
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr ""
diff --git a/trunk/package/luci/po/vi/watchcat.po b/trunk/package/luci/po/vi/watchcat.po
new file mode 100644
index 00000000..633e7fb7
--- /dev/null
+++ b/trunk/package/luci/po/vi/watchcat.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host address to ping"
+msgstr ""
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+
+msgid "Operating mode"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Ping host"
+msgstr ""
+
+msgid "Ping period"
+msgstr ""
+
+msgid "Watchcat"
+msgstr ""
+
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/wol.po b/trunk/package/luci/po/vi/wol.po
new file mode 100644
index 00000000..9be6934c
--- /dev/null
+++ b/trunk/package/luci/po/vi/wol.po
@@ -0,0 +1,49 @@
+# Generated from applications/luci-wol/luasrc/model/cbi/wol.lua
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2010-04-19 00:29+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Broadcast on all interfaces"
+msgstr ""
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr ""
+
+msgid "Host to wake up"
+msgstr ""
+
+msgid "Network interface to use"
+msgstr ""
+
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr ""
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr ""
+
+msgid "Starting WoL utility:"
+msgstr ""
+
+msgid "Wake on LAN"
+msgstr ""
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr ""
+
+msgid "Wake up host"
+msgstr ""
+
+msgid "WoL program"
+msgstr ""
diff --git a/trunk/package/luci/po/vi/wshaper.po b/trunk/package/luci/po/vi/wshaper.po
new file mode 100644
index 00000000..d646e764
--- /dev/null
+++ b/trunk/package/luci/po/vi/wshaper.po
@@ -0,0 +1,40 @@
+msgid "Downlink"
+msgstr ""
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Host or Network in CIDR notation."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Low priority destination ports"
+msgstr ""
+
+msgid "Low priority hosts (Destination)"
+msgstr ""
+
+msgid "Low priority hosts (Source)"
+msgstr ""
+
+msgid "Low priority source ports"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr ""
+
+msgid "Wondershaper"
+msgstr ""
+
+msgid "Wondershaper settings"
+msgstr ""
+
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
diff --git a/trunk/package/luci/po/zh_CN/ahcp.po b/trunk/package/luci/po/zh_CN/ahcp.po
new file mode 100644
index 00000000..295bbe7f
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/ahcp.po
@@ -0,0 +1,113 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-09 03:31+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "AHCP 服务器"
+
+#, fuzzy
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+"AHCP是一个自动配置IPv6和IPv6/IPv4双栈网络的协议，用于在网络上进行路由探测和地"
+"址分配。因为在某些网络上为每个链路层广播域均配置服务器是非常困难的，例如移动"
+"ad-hoc网络。"
+
+msgid "Active AHCP Leases"
+msgstr "活动的AHCP租约"
+
+msgid "Address"
+msgstr "地址"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Age"
+msgstr "有效期"
+
+msgid "Announced DNS servers"
+msgstr "公布DNS服务器"
+
+msgid "Announced NTP servers"
+msgstr "公布NTP服务器"
+
+msgid "Announced prefixes"
+msgstr "公布地址前缀"
+
+msgid "Collecting data..."
+msgstr "数据收集中..."
+
+msgid "Forwarder"
+msgstr "转发器"
+
+msgid "General Setup"
+msgstr "通用设置"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4和IPv6"
+
+msgid "IPv4 only"
+msgstr "仅IPv4"
+
+msgid "IPv6 only"
+msgstr "仅IPv6"
+
+msgid "Lease directory"
+msgstr "租赁目录"
+
+msgid "Lease validity time"
+msgstr "租约有效期"
+
+msgid "Log file"
+msgstr "日志文件"
+
+msgid "Multicast address"
+msgstr "多播地址"
+
+msgid "Operation mode"
+msgstr "工作模式"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Protocol family"
+msgstr "协议簇"
+
+msgid "Served interfaces"
+msgstr "服务接口"
+
+msgid "Server"
+msgstr "服务器"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "指定IPv4与IPv6 时间服务器"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "指定IPv4与IPv6 域名服务器"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "指定IPv4与IPv6网络地址前缀(CIDR表示法)"
+
+msgid "The AHCP Service is not running."
+msgstr "AHCP服务没有运行。"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "AHCP服务程序进程ID %s"
+
+msgid "There are no active leases."
+msgstr "没有活跃租约。"
+
+msgid "Unique ID file"
+msgstr "UID文件"
diff --git a/trunk/package/luci/po/zh_CN/asterisk.po b/trunk/package/luci/po/zh_CN/asterisk.po
new file mode 100644
index 00000000..9ef2f1f5
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/asterisk.po
@@ -0,0 +1,171 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-04-02 19:34+0200\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
+
+#~ msgid "Asterisk General Options"
+#~ msgstr "Asterisk 基本选项"
+
+# test
+#~ msgid "AGI directory"
+#~ msgstr "AGI 目录"
+
+#~ msgid "Cache recorded sound files during recording"
+#~ msgstr "录音时缓存录音文件"
+
+#~ msgid "Debug Level"
+#~ msgstr "调试级别"
+
+#~ msgid "Disable some warnings"
+#~ msgstr "屏蔽部分警告"
+
+#~ msgid "Dump core on crash"
+#~ msgstr "系统崩溃时记录错误信息"
+
+#~ msgid "High Priority"
+#~ msgstr "高优先级"
+
+#~ msgid "Initialise Crypto"
+#~ msgstr "初始化加密"
+
+#~ msgid "Use Internal Timing"
+#~ msgstr "使用内部计时器"
+
+#~ msgid "Log directory"
+#~ msgstr "日志目录"
+
+#~ msgid "Maximum number of calls allowed"
+#~ msgstr "最大允许呼叫数"
+
+#~ msgid "Maximum load to stop accepting new calls"
+#~ msgstr "允许接受新呼叫的最大负载"
+
+#~ msgid "Disable console colors"
+#~ msgstr "禁用控制台色彩"
+
+#~ msgid "Sound files Cache directory"
+#~ msgstr "音效文件缓存目录"
+
+#~ msgid "The Group to run as"
+#~ msgstr "以此“组”权限运行"
+
+#~ msgid "The User to run as"
+#~ msgstr "以此“用户”身份运行"
+
+#~ msgid "Voicemail Spool directory"
+#~ msgstr "语音邮件缓存目录"
+
+#~ msgid "Prefix UniquID with system name"
+#~ msgstr "UniquID前加系统名做前缀"
+
+#~ msgid "Build transcode paths via SLINEAR, not directly"
+#~ msgstr "由SLINEAR间接建立转码路径"
+
+#~ msgid "Transmit SLINEAR silence while recording a channel"
+#~ msgstr "对频道录音时传送SLINEAR静默"
+
+#~ msgid "Verbose Level"
+#~ msgstr "详细级别"
+
+#~ msgid "Time Zone"
+#~ msgstr "时区"
+
+#~ msgid "Section dialplan"
+#~ msgstr "段内拨号计划"
+
+#~ msgid "include"
+#~ msgstr "包含"
+
+#~ msgid "Dialplan Extension"
+#~ msgstr "拨号计划 扩展"
+
+#~ msgid "Dialplan General Options"
+#~ msgstr "拨号计划 基本参数"
+
+#~ msgid "Allow transfer"
+#~ msgstr "允许 呼叫转移"
+
+#~ msgid "Clear global vars"
+#~ msgstr "清除全局变量"
+
+#~ msgid "Dialplan Goto"
+#~ msgstr "拨号计划至"
+
+#~ msgid "Dialplan Conference"
+#~ msgstr "会议拨号计划"
+
+#~ msgid "Dialplan Time"
+#~ msgstr "时间拨号计划"
+
+#~ msgid "Dialplan Voicemail"
+#~ msgstr "语音信箱拨号计划"
+
+#~ msgid "Dial Zones for Dialplan"
+#~ msgstr "适用拨号计划的拨号区域"
+
+#~ msgid "Prefix to add matching dialplans"
+#~ msgstr "用于匹配拨号计划的前缀"
+
+#~ msgid "Match International prefix"
+#~ msgstr "匹配的国际前缀"
+
+#~ msgid "localzone"
+#~ msgstr "本地区域"
+
+#~ msgid "Match plan"
+#~ msgstr "匹配计划"
+
+#~ msgid "Connection to use"
+#~ msgstr "使用连接"
+
+#~ msgid "Feature Key maps"
+#~ msgstr "特殊键映射"
+
+#~ msgid "Attended transfer key"
+#~ msgstr "加入传输键"
+
+#~ msgid "Blind transfer key"
+#~ msgstr "屏蔽传输键"
+
+#~ msgid "Key to Disconnect call"
+#~ msgstr "结束呼叫键"
+
+#~ msgid "Key to Park call"
+#~ msgstr "呼叫驻留键"
+
+#~ msgid "Parking Feature"
+#~ msgstr "驻留特性"
+
+#~ msgid "ADSI Park"
+#~ msgstr "ADSI驻留"
+
+#~ msgid "Attended transfer timeout (sec)"
+#~ msgstr "加入传输超时（秒）"
+
+#~ msgid "One touch record key"
+#~ msgstr "一键录制"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Display Name"
+#~ msgstr "显示名字"
+
+#~ msgid "Password"
+#~ msgstr "密码"
+
+#~ msgid "zone"
+#~ msgstr "区"
+
+#~ msgid "Message Format"
+#~ msgstr "消息格式"
diff --git a/trunk/package/luci/po/zh_CN/base.po b/trunk/package/luci/po/zh_CN/base.po
new file mode 100644
index 00000000..c7008fa9
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/base.po
@@ -0,0 +1,3903 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-21 23:08+0200\n"
+"PO-Revision-Date: 2014-06-13 14:53+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: QQ Group:75543259\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d分钟信息，%d秒刷新)"
+
+msgid "(%s available)"
+msgstr "(%s 可用)"
+
+msgid "(empty)"
+msgstr "(空)"
+
+msgid "(no interfaces attached)"
+msgstr "(未连接接口)"
+
+msgid "-- Additional Field --"
+msgstr "-- 更多选项 --"
+
+msgid "-- Please choose --"
+msgstr "-- 请选择 --"
+
+msgid "-- custom --"
+msgstr "-- 自定义 --"
+
+msgid "1 Minute Load:"
+msgstr "1分钟负载:"
+
+msgid "15 Minute Load:"
+msgstr "15分钟负载:"
+
+msgid "5 Minute Load:"
+msgstr "5分钟负载:"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 查询端口"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 服务器端口"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr "将会按照指定的顺序查询<abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-地址"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-网关"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-子网掩码"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-地址或超网() (<abbr "
+"title=\"无类别域间路由\">CIDR</abbr>)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-网关"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-后缀（十六进制）"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>配置"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>名称"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-地址"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"最大<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>分配数量"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr "最大<abbr title=\"DNS扩展名\">EDNS0</abbr>数据包大小"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">最大</abbr>并发查询数"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr "ADSL"
+
+msgid "ADSL Status"
+msgstr "ADSL状态"
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "AR支持"
+
+msgid "ARP retry threshold"
+msgstr "ARP重试阈值"
+
+msgid "ATM Bridges"
+msgstr "ATM桥接"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM虚拟通道标识(VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM虚拟路径标识(VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"ATM桥是以AAL5协议封装以太网的虚拟Linux网桥，用于协同DHCP或PPP来拨号连接到网络"
+"运营商。"
+
+msgid "ATM device number"
+msgstr "ATM设备号码"
+
+msgid "Access Concentrator"
+msgstr "接入集中器"
+
+msgid "Access Point"
+msgstr "接入点AP"
+
+msgid "Action"
+msgstr "动作"
+
+msgid "Actions"
+msgstr "动作"
+
+msgid "Activate this network"
+msgstr "激活此网络"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "活动的<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-链路"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "活动的<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-链路"
+
+msgid "Active Connections"
+msgstr "活动连接"
+
+msgid "Active DHCP Leases"
+msgstr "已分配的DHCP租约"
+
+msgid "Active DHCPv6 Leases"
+msgstr "已分配的DHCPv6租约"
+
+msgid "Ad-Hoc"
+msgstr "点对点Ad-Hoc"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "添加本地域名后缀到HOSTS文件中的域名"
+
+msgid "Add new interface..."
+msgstr "添加新接口..."
+
+msgid "Additional Hosts files"
+msgstr "额外的HOSTS文件"
+
+msgid "Address"
+msgstr "地址"
+
+msgid "Address to access local relay bridge"
+msgstr "接入本地中继桥的地址"
+
+msgid "Administration"
+msgstr "管理权"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Alert"
+msgstr "警戒"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "允许<abbr title=\"Secure Shell\">SSH</abbr>密码验证"
+
+msgid "Allow all except listed"
+msgstr "仅允许列表外"
+
+msgid "Allow listed only"
+msgstr "仅允许列表内"
+
+msgid "Allow localhost"
+msgstr "允许本机"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr "允许远程主机连接到本地SSH转发端口"
+
+msgid "Allow root logins with password"
+msgstr "root权限登录"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "允许<em>root</em>用户凭密码登录"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr "允许127.0.0.0/8回环范围内的上行响应，例如：RBL服务"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr "强制启用40MHz频宽并忽略辅助信道重叠。此选项不兼容IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "取消选中将会另外创建一个新网络，而不会覆盖当前网络设置"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "天线 1"
+
+msgid "Antenna 2"
+msgstr "天线 2"
+
+msgid "Antenna Configuration"
+msgstr "天线配置"
+
+msgid "Any zone"
+msgstr "任意区域"
+
+msgid "Apply"
+msgstr "应用"
+
+msgid "Applying changes"
+msgstr "正在应用更改"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "分配接口..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "已连接站点"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Qualcomm/Atheros 802.11%s 无线网卡"
+
+msgid "Authentication"
+msgstr "认证"
+
+msgid "Authoritative"
+msgstr "授权的唯一DHCP服务器"
+
+msgid "Authorization Required"
+msgstr "需要授权"
+
+msgid "Auto Refresh"
+msgstr "自动刷新"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "可用"
+
+msgid "Available packages"
+msgstr "可用软件包"
+
+msgid "Average:"
+msgstr "平均:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "返回"
+
+msgid "Back to Overview"
+msgstr "返回至概况"
+
+msgid "Back to configuration"
+msgstr "返回至配置"
+
+msgid "Back to overview"
+msgstr "返回至概况"
+
+msgid "Back to scan results"
+msgstr "返回至扫描结果"
+
+msgid "Background Scan"
+msgstr "后台搜索"
+
+msgid "Backup / Flash Firmware"
+msgstr "备份/升级"
+
+msgid "Backup / Restore"
+msgstr "备份/恢复"
+
+msgid "Backup file list"
+msgstr "文件备份列表"
+
+msgid "Bad address specified!"
+msgstr "指定了错误的地址！"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"下面是待备份的文件清单。包含了更改的配置文件、必要的基础文件和用户自定义的需"
+"备份文件。"
+
+msgid "Bitrate"
+msgstr "传输速率"
+
+msgid "Bogus NX Domain Override"
+msgstr "忽略虚假空域名解析"
+
+msgid "Bridge"
+msgstr "桥接"
+
+msgid "Bridge interfaces"
+msgstr "桥接接口"
+
+msgid "Bridge unit number"
+msgstr "桥接号"
+
+msgid "Bring up on boot"
+msgstr "开机自动运行"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s 无线网卡"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 无线网卡"
+
+msgid "Buffered"
+msgstr "已缓冲"
+
+msgid "Buttons"
+msgstr "按键"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "CPU使用率(%)"
+
+msgid "Cached"
+msgstr "已缓存"
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "链"
+
+msgid "Changes"
+msgstr "修改数"
+
+msgid "Changes applied."
+msgstr "更改已应用"
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "修改访问设备的管理员密码"
+
+msgid "Channel"
+msgstr "信道"
+
+msgid "Check"
+msgstr "检查"
+
+msgid "Checksum"
+msgstr "校验值"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr "此接口的防火墙区域。填写<em>创建</em>栏可新建防火墙区域。"
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr "选择指派到此无线接口的网络。填写<em>创建</em>栏可新建网络。"
+
+msgid "Cipher"
+msgstr "算法"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr "备份/恢复当前系统配置文件或重置libreCMC(仅squashfs固件有效)。"
+
+msgid "Client"
+msgstr "客户端Client"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "请求DHCP时发送的客户ID"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr "定时关闭非活动链接(秒)，0为持续连接"
+
+msgid "Close list..."
+msgstr "关闭列表..."
+
+msgid "Collecting data..."
+msgstr "正在收集数据..."
+
+msgid "Command"
+msgstr "进程命令"
+
+msgid "Common Configuration"
+msgstr "一般设置"
+
+msgid "Compression"
+msgstr "压缩"
+
+msgid "Configuration"
+msgstr "配置"
+
+msgid "Configuration applied."
+msgstr "配置已应用"
+
+msgid "Configuration files will be kept."
+msgstr "配置文件将被保留。"
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr "设置挂载为extroot"
+
+msgid "Confirmation"
+msgstr "确认密码"
+
+msgid "Connect"
+msgstr "连接"
+
+msgid "Connected"
+msgstr "已连接"
+
+msgid "Connection Limit"
+msgstr "连接数限制"
+
+msgid "Connections"
+msgstr "链接"
+
+msgid "Country"
+msgstr "国家"
+
+msgid "Country Code"
+msgstr "国家代码"
+
+msgid "Cover the following interface"
+msgstr "包括以下接口"
+
+msgid "Cover the following interfaces"
+msgstr "包括以下接口"
+
+msgid "Create / Assign firewall-zone"
+msgstr "创建/分配 防火墙区域"
+
+msgid "Create Interface"
+msgstr "创建新接口"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "在多个接口上创建桥接"
+
+msgid "Critical"
+msgstr "致命错误"
+
+msgid "Cron Log Level"
+msgstr "Cron日志级别"
+
+msgid "Custom Interface"
+msgstr "自定义接口"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr "自定义<abbr title=\"Light Emitting Diode\">LED</abbr>的活动状态。"
+
+msgid "DHCP Leases"
+msgstr "DHCP分配"
+
+msgid "DHCP Server"
+msgstr "DHCP服务器"
+
+msgid "DHCP and DNS"
+msgstr "DHCP/DNS"
+
+msgid "DHCP client"
+msgstr "DHCP客户端"
+
+msgid "DHCP-Options"
+msgstr "DHCP-选项"
+
+msgid "DHCPv6 Leases"
+msgstr "DHCPv6分配"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS forwardings"
+msgstr "DNS转发"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DUID（DHCP唯一标识符）"
+
+msgid "Debug"
+msgstr "调试"
+
+msgid "Default %d"
+msgstr "默认%d"
+
+msgid "Default gateway"
+msgstr "默认网关"
+
+msgid "Default state"
+msgstr "默认状态"
+
+msgid "Define a name for this network."
+msgstr "为网络定义名称"
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"设置DHCP的附加选项，例如设定\"<code>6,192.168.2.1,192.168.2.2</code>\"表示通"
+"告不同的DNS服务器给客户端。"
+
+msgid "Delete"
+msgstr "删除"
+
+msgid "Delete this interface"
+msgstr "删除此接口"
+
+msgid "Delete this network"
+msgstr "删除此网络"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Design"
+msgstr "主题"
+
+msgid "Destination"
+msgstr "目标地址"
+
+msgid "Device"
+msgstr "设备"
+
+msgid "Device Configuration"
+msgstr "设备配置"
+
+msgid "Diagnostics"
+msgstr "网络诊断"
+
+msgid "Directory"
+msgstr "目录"
+
+msgid "Disable"
+msgstr "禁用"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+"禁用本接口的<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>。"
+
+msgid "Disable DNS setup"
+msgstr "停用DNS设定"
+
+msgid "Disable HW-Beacon timer"
+msgstr "停用 HW-Beacon 计时器"
+
+msgid "Disabled"
+msgstr "禁用"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "丢弃RFC1918上行响应数据"
+
+msgid "Displaying only packages containing"
+msgstr "只显示有内容的软件包"
+
+msgid "Distance Optimization"
+msgstr "距离优化"
+
+msgid "Distance to farthest network member in meters."
+msgstr "最远客户端的距离(米)。"
+
+msgid "Diversity"
+msgstr "分集"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr "Dnsmasq为NAT防火墙提供了一个集成的DHCP服务器和DNS转发器"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "不缓存无用的回应, 比如：不存在的域。"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr "不转发公共域名服务器无法回应的请求"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "不转发反向查询本地网络的Lookups命令"
+
+msgid "Do not send probe responses"
+msgstr "不回送探测响应"
+
+msgid "Domain required"
+msgstr "忽略空域名解析"
+
+msgid "Domain whitelist"
+msgstr "域名白名单"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr "不转发没有DNS名称的解析请求"
+
+msgid "Download and install package"
+msgstr "下载并安装软件包"
+
+msgid "Download backup"
+msgstr "下载备份"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear设置"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear提供了集成的<abbr title=\"Secure Copy\">SCP</abbr>服务器和基于<abbr "
+"title=\"Secure Shell\">SSH</abbr>的shell访问"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr "动态<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "动态隧道"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr "动态分配DHCP地址。如果禁用，则只能为静态租用表中的客户端提供网络服务。"
+
+msgid "EAP-Method"
+msgstr "EAP-Method"
+
+msgid "Edit"
+msgstr "修改"
+
+msgid "Edit this interface"
+msgstr "修改此接口"
+
+msgid "Edit this network"
+msgstr "修改此网络"
+
+msgid "Emergency"
+msgstr "紧急"
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "开启<abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "启用HE.net动态终端更新"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "在PPP链路上启用IPv6协商"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "启用巨型帧透传"
+
+msgid "Enable NTP client"
+msgstr "启用NTP客户端"
+
+msgid "Enable TFTP server"
+msgstr "启用TFTP服务器"
+
+msgid "Enable VLAN functionality"
+msgstr "启用VLAN"
+
+msgid "Enable learning and aging"
+msgstr "启用智能交换学习"
+
+msgid "Enable this mount"
+msgstr "启用挂载点"
+
+msgid "Enable this swap"
+msgstr "启用交换区"
+
+msgid "Enable/Disable"
+msgstr "启用/禁用"
+
+msgid "Enabled"
+msgstr "启用"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "在此桥接上启用生成协议树"
+
+msgid "Encapsulation mode"
+msgstr "封装模式"
+
+msgid "Encryption"
+msgstr "加密"
+
+msgid "Erasing..."
+msgstr "擦除中..."
+
+msgid "Error"
+msgstr "错误"
+
+msgid "Ethernet Adapter"
+msgstr "以太网适配器"
+
+msgid "Ethernet Switch"
+msgstr "以太网交换机"
+
+msgid "Expand hosts"
+msgstr "扩展HOSTS文件中的主机后缀"
+
+msgid "Expires"
+msgstr "到期时间"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr "地址租期，最小2分钟(<code>2m</code>)。"
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "远程log服务器"
+
+msgid "External system log server port"
+msgstr "远程log服务器端口"
+
+msgid "Fast Frames"
+msgstr "快速帧"
+
+msgid "File"
+msgstr "文件"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "向客户端通告的启动镜像文件名"
+
+msgid "Filesystem"
+msgstr "文件系统"
+
+msgid "Filter"
+msgstr "过滤器"
+
+msgid "Filter private"
+msgstr "过滤本地包"
+
+msgid "Filter useless"
+msgstr "过滤无用包"
+
+msgid "Find and join network"
+msgstr "搜索并加入网络"
+
+msgid "Find package"
+msgstr "查找软件包"
+
+msgid "Finish"
+msgstr "完成"
+
+msgid "Firewall"
+msgstr "防火墙"
+
+msgid "Firewall Settings"
+msgstr "防火墙设置"
+
+msgid "Firewall Status"
+msgstr "防火墙状态"
+
+msgid "Firmware Version"
+msgstr "固件版本"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "指定的DNS查询源端口"
+
+msgid "Flags"
+msgstr "标识"
+
+msgid "Flash Firmware"
+msgstr "刷新固件"
+
+msgid "Flash image..."
+msgstr "刷写固件..."
+
+msgid "Flash new firmware image"
+msgstr "刷写新的固件"
+
+msgid "Flash operations"
+msgstr "刷新操作"
+
+msgid "Flashing..."
+msgstr "刷写中..."
+
+msgid "Force"
+msgstr "强制开启DHCP"
+
+msgid "Force 40MHz mode"
+msgstr "强制40MHz频宽"
+
+msgid "Force CCMP (AES)"
+msgstr "强制使用CCMP(AES)加密"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "强制开启DHCP。"
+
+msgid "Force TKIP"
+msgstr "强制使用TKIP加密"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "TKIP和CCMP(AES)混合加密"
+
+msgid "Forward DHCP traffic"
+msgstr "转发DHCP数据包"
+
+msgid "Forward broadcast traffic"
+msgstr "转发广播数据包"
+
+msgid "Forwarding mode"
+msgstr "转发模式"
+
+msgid "Fragmentation Threshold"
+msgstr "分片阈值"
+
+msgid "Frame Bursting"
+msgstr "帧突发"
+
+msgid "Free"
+msgstr "空闲数"
+
+msgid "Free space"
+msgstr "空闲空间"
+
+msgid "Frequency Hopping"
+msgstr "跳频"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "仅GPRS"
+
+msgid "Gateway"
+msgstr "网关"
+
+msgid "Gateway ports"
+msgstr "网关端口"
+
+msgid "General Settings"
+msgstr "基本设置"
+
+msgid "General Setup"
+msgstr "基本设置"
+
+msgid "Generate archive"
+msgstr "生成备份"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "Generic 802.11%s 无线网卡"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "由于密码验证不匹配，密码没有更改！"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "跳转到密码配置页..."
+
+msgid "Go to relevant configuration page"
+msgstr "跳转到相关的配置页面"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr "HE.net密码"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "处理程序"
+
+msgid "Hang Up"
+msgstr "挂起"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr "配置路由器的部分基础信息。"
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr "SSH公共密钥认证(每行一个密钥)。"
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b 无线网卡"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "隐藏<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "主机目录"
+
+msgid "Host expiry timeout"
+msgstr "主机到期超时"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "主机IP或网络"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "请求DHCP时发送的主机名"
+
+msgid "Hostnames"
+msgstr "主机名"
+
+msgid "IP address"
+msgstr "IP地址"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4防火墙"
+
+msgid "IPv4 WAN Status"
+msgstr "IPv4 WAN状态"
+
+msgid "IPv4 address"
+msgstr "IPv4地址"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4和IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4广播"
+
+msgid "IPv4 gateway"
+msgstr "IPv4网关"
+
+msgid "IPv4 netmask"
+msgstr "IPv4子网掩码"
+
+msgid "IPv4 only"
+msgstr "仅IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "IPv4地址前缀长度"
+
+msgid "IPv4-Address"
+msgstr "IPv4-地址"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6防火墙"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "IPv6 WAN状态"
+
+msgid "IPv6 address"
+msgstr "IPv6地址"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6网关"
+
+msgid "IPv6 only"
+msgstr "仅IPv6"
+
+msgid "IPv6 prefix"
+msgstr "IPv6地址前缀"
+
+msgid "IPv6 prefix length"
+msgstr "IPv6地址前缀长度"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-地址"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6-in-IPv4 (RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6-over-IPv4 (6rd)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6-over-IPv4 (6to4)"
+
+msgid "Identity"
+msgstr "鉴权"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr "用UUID来挂载设备"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr "用卷标来挂载设备"
+
+msgid "If unchecked, no default route is configured"
+msgstr "留空则不配置默认路由"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "留空则忽略所通告的DNS服务器地址"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr "如果物理内存不足，闲置数据可自动移到交换区暂存，以提高可用内存。"
+
+msgid "Ignore Hosts files"
+msgstr "忽略HOSTS文件"
+
+msgid "Ignore interface"
+msgstr "关闭DHCP"
+
+msgid "Ignore resolve file"
+msgstr "忽略解析文件"
+
+msgid "Image"
+msgstr "固件文件"
+
+msgid "In"
+msgstr "入口"
+
+msgid "Inactivity timeout"
+msgstr "活动超时"
+
+msgid "Inbound:"
+msgstr "入站:"
+
+msgid "Info"
+msgstr "信息"
+
+msgid "Initscript"
+msgstr "启动脚本"
+
+msgid "Initscripts"
+msgstr "启动脚本"
+
+msgid "Install"
+msgstr "安装"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "安装软件包%q"
+
+msgid "Install protocol extensions..."
+msgstr "安装扩展协议..."
+
+msgid "Installed packages"
+msgstr "已安装软件包"
+
+msgid "Interface"
+msgstr "接口"
+
+msgid "Interface Configuration"
+msgstr "接口配置"
+
+msgid "Interface Overview"
+msgstr "接口总览"
+
+msgid "Interface is reconnecting..."
+msgstr "正在重新连接接口..."
+
+msgid "Interface is shutting down..."
+msgstr "正在关闭接口..."
+
+msgid "Interface not present or not connected yet."
+msgstr "接口不存在或未连接"
+
+msgid "Interface reconnected"
+msgstr "接口已重新连接"
+
+msgid "Interface shut down"
+msgstr "接口已关闭"
+
+msgid "Interfaces"
+msgstr "接口"
+
+msgid "Internal Server Error"
+msgstr "内部服务器错误"
+
+msgid "Invalid"
+msgstr "无效"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "无效的VLAN ID! 只有 %d 和 %d 之间的ID有效。"
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "无效的VLAN ID! 只允许唯一的ID。"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "无效的用户名和/或密码! 请重试。"
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr "将要刷新的固件与本路由器不兼容，请重新验证固件文件。"
+
+msgid "Java Script required!"
+msgstr "需要Java Script！"
+
+msgid "Join Network"
+msgstr "加入网络"
+
+msgid "Join Network: Settings"
+msgstr "加入网络:设置"
+
+msgid "Join Network: Wireless Scan"
+msgstr "加入网络:搜索无线"
+
+msgid "Keep settings"
+msgstr "保留配置"
+
+msgid "Kernel Log"
+msgstr "内核日志"
+
+msgid "Kernel Version"
+msgstr "内核版本"
+
+msgid "Key"
+msgstr "密码"
+
+msgid "Key #%d"
+msgstr "密码 #%d"
+
+msgid "Kill"
+msgstr "强制关闭"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP服务器"
+
+msgid "LCP echo failure threshold"
+msgstr "LCP响应故障阈值"
+
+msgid "LCP echo interval"
+msgstr "LCP响应间隔"
+
+msgid "LLC"
+msgstr "LLC"
+
+msgid "Label"
+msgstr "卷标"
+
+msgid "Language"
+msgstr "语言"
+
+msgid "Language and Style"
+msgstr "语言和界面"
+
+msgid "Lease validity time"
+msgstr "有效租期"
+
+msgid "Leasefile"
+msgstr "租约文件"
+
+msgid "Leasetime"
+msgstr "租用时间"
+
+msgid "Leasetime remaining"
+msgstr "剩余租期"
+
+msgid "Leave empty to autodetect"
+msgstr "留空则自动探测"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "留空则使用当前WAN地址"
+
+msgid "Legend:"
+msgstr "图例："
+
+msgid "Limit"
+msgstr "客户数"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "活动链接"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr "将指定的域名DNS解析转发到指定的DNS服务器（按照示例填写）"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "允许RFC1918响应的域名列表"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "允许虚假空域名响应的服务器列表"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr "监听指定的接口；未指定则监听全部"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "入站DNS查询端口"
+
+msgid "Load"
+msgstr "负载"
+
+msgid "Load Average"
+msgstr "平均负载"
+
+msgid "Loading"
+msgstr "加载中"
+
+msgid "Local IPv4 address"
+msgstr "本地IPv4地址"
+
+msgid "Local IPv6 address"
+msgstr "本地IPv6地址"
+
+msgid "Local Startup"
+msgstr "本地启动脚本"
+
+msgid "Local Time"
+msgstr "本地时间"
+
+msgid "Local domain"
+msgstr "本地域名"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr "本地域名规则。从不转发和处理只源自DHCP或HOSTS文件的本地域名数据"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr "本地域名后缀将添加到DHCP和HOSTS文件条目"
+
+msgid "Local server"
+msgstr "本地服务器"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr "如果有多个IP可用，则根据请求来源的子网来本地化主机名"
+
+msgid "Localise queries"
+msgstr "本地化查询"
+
+msgid "Locked to channel %d used by %s"
+msgstr "信道已锁定为:%d ；源于:%s "
+
+msgid "Log output level"
+msgstr "日志记录等级"
+
+msgid "Log queries"
+msgstr "日志查询"
+
+msgid "Logging"
+msgstr "日志"
+
+msgid "Login"
+msgstr "登录"
+
+msgid "Logout"
+msgstr "退出"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "网络地址的起始分配基址。"
+
+msgid "MAC-Address"
+msgstr "MAC-地址"
+
+msgid "MAC-Address Filter"
+msgstr "MAC-地址过滤"
+
+msgid "MAC-Filter"
+msgstr "MAC-过滤"
+
+msgid "MAC-List"
+msgstr "MAC-列表"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "MTU"
+
+msgid "Maximum Rate"
+msgstr "最高速率"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "允许的最大DHCP租用数"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "允许的最大并发DNS查询数"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "允许的最大EDNS.0 UDP报文大小"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "调制解调器就绪的最大等待时间(秒)"
+
+msgid "Maximum hold time"
+msgstr "最大持续时间"
+
+msgid "Maximum number of leased addresses."
+msgstr "最大地址分配数量。"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "内存"
+
+msgid "Memory usage (%)"
+msgstr "内存使用率(%)"
+
+msgid "Metric"
+msgstr "跃点数"
+
+msgid "Minimum Rate"
+msgstr "最低速率"
+
+msgid "Minimum hold time"
+msgstr "最低持续时间"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "缺少协议%q的协议扩展"
+
+msgid "Mode"
+msgstr "模式"
+
+msgid "Model"
+msgstr "主机型号"
+
+msgid "Modem device"
+msgstr "调制解调器节点"
+
+msgid "Modem init timeout"
+msgstr "调制解调器初始化超时"
+
+msgid "Monitor"
+msgstr "监听Monitor"
+
+msgid "Mount Entry"
+msgstr "挂载项目"
+
+msgid "Mount Point"
+msgstr "挂载点"
+
+msgid "Mount Points"
+msgstr "挂载点"
+
+msgid "Mount Points - Mount Entry"
+msgstr "挂载点-存储区"
+
+msgid "Mount Points - Swap Entry"
+msgstr "挂载点-交换区"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr "配置存储设备挂载到文件系统中的位置和参数。"
+
+msgid "Mount options"
+msgstr "挂载选项"
+
+msgid "Mount point"
+msgstr "挂载点"
+
+msgid "Mounted file systems"
+msgstr "已挂载的文件系统"
+
+msgid "Move down"
+msgstr "下移"
+
+msgid "Move up"
+msgstr "上移"
+
+msgid "Multicast Rate"
+msgstr "多播速率"
+
+msgid "Multicast address"
+msgstr "多播地址"
+
+msgid "NAS ID"
+msgstr "NAS ID"
+
+msgid "NDP-Proxy"
+msgstr "NDP-代理"
+
+msgid "NTP server candidates"
+msgstr "候选NTP服务器"
+
+msgid "Name"
+msgstr "名称"
+
+msgid "Name of the new interface"
+msgstr "新接口的名称"
+
+msgid "Name of the new network"
+msgstr "新网络的名称"
+
+msgid "Navigation"
+msgstr "导航"
+
+msgid "Netmask"
+msgstr "子网掩码"
+
+msgid "Network"
+msgstr "网络"
+
+msgid "Network Utilities"
+msgstr "网络工具"
+
+msgid "Network boot image"
+msgstr "网络启动镜像"
+
+msgid "Network without interfaces."
+msgstr "无接口的网络。"
+
+msgid "Next »"
+msgstr "下一步 »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "本接口未配置DHCP服务器"
+
+msgid "No chains in this table"
+msgstr "本表中没有链"
+
+msgid "No files found"
+msgstr "未找到文件"
+
+msgid "No information available"
+msgstr "无可用信息"
+
+msgid "No negative cache"
+msgstr "禁用无效信息缓存"
+
+msgid "No network configured on this device"
+msgstr "本设备未配置网络"
+
+msgid "No network name specified"
+msgstr "未指定网络名"
+
+msgid "No package lists available"
+msgstr "无可用软件列表"
+
+msgid "No password set!"
+msgstr "未设置密码！"
+
+msgid "No rules in this chain"
+msgstr "本链没有规则"
+
+msgid "No zone assigned"
+msgstr "未指定区域"
+
+msgid "Noise"
+msgstr "噪声"
+
+msgid "Noise Margin"
+msgstr "噪声容限"
+
+msgid "Noise:"
+msgstr "噪声:"
+
+msgid "None"
+msgstr "无"
+
+msgid "Normal"
+msgstr "正常"
+
+msgid "Not Found"
+msgstr "未找到"
+
+msgid "Not associated"
+msgstr "未关联"
+
+msgid "Not connected"
+msgstr "未连接"
+
+msgid "Note: Configuration files will be erased."
+msgstr "注意：配置文件将被删除。"
+
+msgid "Notice"
+msgstr "注意"
+
+msgid "Nslookup"
+msgstr "Nslookup"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "OPKG-Configuration"
+msgstr "OPKG-配置"
+
+msgid "Off-State Delay"
+msgstr "关闭时间"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr "配置网络接口信息。"
+
+msgid "On-State Delay"
+msgstr "通电时间"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "请指定主机名或MAC地址！"
+
+msgid "One or more fields contain invalid values!"
+msgstr "一个或多个选项值有误！"
+
+msgid "One or more required fields have no value!"
+msgstr "一个或多个必选项值为空！"
+
+msgid "Open list..."
+msgstr "打开列表..."
+
+msgid "Option changed"
+msgstr "修改的选项"
+
+msgid "Option removed"
+msgstr "移除的选项"
+
+msgid "Options"
+msgstr "选项"
+
+msgid "Other:"
+msgstr "其余:"
+
+msgid "Out"
+msgstr "出口"
+
+msgid "Outbound:"
+msgstr "出站:"
+
+msgid "Outdoor Channels"
+msgstr "户外频道"
+
+msgid "Override MAC address"
+msgstr "克隆MAC地址"
+
+msgid "Override MTU"
+msgstr "设置MTU"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "更新网关"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr "更新子网掩码。"
+
+msgid "Override the table used for internal routes"
+msgstr "更新内部路由表"
+
+msgid "Overview"
+msgstr "总览"
+
+msgid "Owner"
+msgstr "用户名"
+
+msgid "PAP/CHAP password"
+msgstr "PAP/CHAP密码"
+
+msgid "PAP/CHAP username"
+msgstr "PAP/CHAP用户名"
+
+msgid "PID"
+msgstr "PID"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "PPP"
+msgstr "PPP"
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA封包"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP"
+
+msgid "Package libiwinfo required!"
+msgstr "需要libiwinfo软件包！"
+
+msgid "Package lists are older than 24 hours"
+msgstr "软件包列表已超过24小时未更新"
+
+msgid "Package name"
+msgstr "软件包名称"
+
+msgid "Packets"
+msgstr "数据包"
+
+msgid "Part of zone %q"
+msgstr "区域 %q"
+
+msgid "Password"
+msgstr "密码"
+
+msgid "Password authentication"
+msgstr "密码验证"
+
+msgid "Password of Private Key"
+msgstr "私有密钥"
+
+msgid "Password successfully changed!"
+msgstr "密码修改成功！"
+
+msgid "Path to CA-Certificate"
+msgstr "CA证书路径"
+
+msgid "Path to Client-Certificate"
+msgstr "客户端证书路径"
+
+msgid "Path to Private Key"
+msgstr "私钥路径"
+
+msgid "Path to executable which handles the button event"
+msgstr "处理按键动作的可执行文件路径"
+
+msgid "Peak:"
+msgstr "峰值:"
+
+msgid "Perform reboot"
+msgstr "执行重启"
+
+msgid "Perform reset"
+msgstr "执行复位"
+
+msgid "Phy Rate:"
+msgstr "物理速率:"
+
+msgid "Physical Settings"
+msgstr "物理设置"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "数据包"
+
+msgid "Please enter your username and password."
+msgstr "请输入用户名和密码。"
+
+msgid "Please wait: Device rebooting..."
+msgstr "请稍等：设备重启中..."
+
+msgid "Policy"
+msgstr "策略"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Port %d"
+msgstr "端口 %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "端口 %d 在多个VLAN中均未关联！"
+
+msgid "Port status:"
+msgstr "端口状态："
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr "在指定数量的LCP响应故障后假定链路已断开，0为忽略故障"
+
+msgid "Prevents client-to-client communication"
+msgstr "禁止客户端间通信"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b 无线网卡"
+
+msgid "Proceed"
+msgstr "执行"
+
+msgid "Processes"
+msgstr "系统进程"
+
+msgid "Prot."
+msgstr "协议"
+
+msgid "Protocol"
+msgstr "协议"
+
+msgid "Protocol family"
+msgstr "协议族"
+
+msgid "Protocol of the new interface"
+msgstr "新接口的协议"
+
+msgid "Protocol support is not installed"
+msgstr "未安装协议支持"
+
+msgid "Provide NTP server"
+msgstr "NTP服务器"
+
+msgid "Provide new network"
+msgstr "添加新网络"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "伪装Ad-Hoc(ahdemo)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "质量"
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS阈值"
+
+msgid "RX"
+msgstr "接收"
+
+msgid "RX Rate"
+msgstr "接收速率"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "MediaTek/RaLink 802.11%s 无线网卡"
+
+msgid "Radius-Accounting-Port"
+msgstr "Radius 计费端口"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Radius 计费密钥"
+
+msgid "Radius-Accounting-Server"
+msgstr "Radius 计费服务器"
+
+msgid "Radius-Authentication-Port"
+msgstr "Radius 认证端口"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Radius 认证密钥"
+
+msgid "Radius-Authentication-Server"
+msgstr "Radius 认证服务器"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+"根据<code>/etc/ethers</code>来配置<abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr>-服务器"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"确定要删除此接口？删除操作无法撤销！\\\n"
+"删除此接口，可能导致无法再访问路由器！"
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"确定要删除此无线网络？删除操作无法撤销！\\\n"
+"删除此无线网络，可能导致无法再访问路由器！"
+
+msgid "Really reset all changes?"
+msgstr "确定要放弃所有更改？"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"确定要关闭此网络？\\\n"
+"关闭此网络，可能导致无法再访问路由器！"
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"确定要关闭接口\"%s\" ？\\\n"
+"删除此网络，可能导致无法再访问路由器！"
+
+msgid "Really switch protocol?"
+msgstr "确定要切换协议？"
+
+msgid "Realtime Connections"
+msgstr "实时连接"
+
+msgid "Realtime Graphs"
+msgstr "实时信息"
+
+msgid "Realtime Load"
+msgstr "实时负载"
+
+msgid "Realtime Traffic"
+msgstr "实时流量"
+
+msgid "Realtime Wireless"
+msgstr "实时无线"
+
+msgid "Rebind protection"
+msgstr "重绑定保护"
+
+msgid "Reboot"
+msgstr "重启"
+
+msgid "Rebooting..."
+msgstr "重启中..."
+
+msgid "Reboots the operating system of your device"
+msgstr "重启libreCMC"
+
+msgid "Receive"
+msgstr "接收"
+
+msgid "Receiver Antenna"
+msgstr "接收天线"
+
+msgid "Reconnect this interface"
+msgstr "重连此接口"
+
+msgid "Reconnecting interface"
+msgstr "重连接口中..."
+
+msgid "References"
+msgstr "引用"
+
+msgid "Regulatory Domain"
+msgstr "无线网络国家区域"
+
+msgid "Relay"
+msgstr "中继"
+
+msgid "Relay Bridge"
+msgstr "中继桥"
+
+msgid "Relay between networks"
+msgstr "网络间中继"
+
+msgid "Relay bridge"
+msgstr "中继桥"
+
+msgid "Remote IPv4 address"
+msgstr "远程IPv4地址"
+
+msgid "Remove"
+msgstr "移除"
+
+msgid "Repeat scan"
+msgstr "重新扫描"
+
+msgid "Replace entry"
+msgstr "重置条目"
+
+msgid "Replace wireless configuration"
+msgstr "重置无线配置"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "某些ISP需要，例如:同轴线网络DOCSIS 3"
+
+msgid "Reset"
+msgstr "复位"
+
+msgid "Reset Counters"
+msgstr "复位计数器"
+
+msgid "Reset to defaults"
+msgstr "恢复到出厂设置"
+
+msgid "Resolv and Hosts Files"
+msgstr "HOSTS和解析文件"
+
+msgid "Resolve file"
+msgstr "解析文件"
+
+msgid "Restart"
+msgstr "重启"
+
+msgid "Restart Firewall"
+msgstr "重启防火墙"
+
+msgid "Restore backup"
+msgstr "恢复配置"
+
+msgid "Reveal/hide password"
+msgstr "显示/隐藏 密码"
+
+msgid "Revert"
+msgstr "放弃"
+
+msgid "Root"
+msgstr "Root"
+
+msgid "Root directory for files served via TFTP"
+msgstr "TFTP服务器的根目录"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "主机密码"
+
+msgid "Routes"
+msgstr "路由表"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr "路由表描述了数据包的可达路径。"
+
+msgid "Rule #"
+msgstr "规则 #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "挂载设备前运行文件系统检查"
+
+msgid "Run filesystem check"
+msgstr "文件系统检查"
+
+msgid "SSH Access"
+msgstr "SSH访问"
+
+msgid "SSH-Keys"
+msgstr "SSH-密钥"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Save & Apply"
+msgstr "保存&应用"
+
+msgid "Save &#38; Apply"
+msgstr "保存&#38;应用"
+
+msgid "Scan"
+msgstr "搜索"
+
+msgid "Scheduled Tasks"
+msgstr "计划任务"
+
+msgid "Section added"
+msgstr "添加的区域"
+
+msgid "Section removed"
+msgstr "移除的区域"
+
+msgid "See \"mount\" manpage for details"
+msgstr "详参\"mount\"联机帮助"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr "定时发送LCP响应(秒)，仅在结合了故障阈值时有效"
+
+msgid "Separate Clients"
+msgstr "隔离客户端"
+
+msgid "Separate WDS"
+msgstr "隔离WDS"
+
+msgid "Server Settings"
+msgstr "服务器设置"
+
+msgid "Service Name"
+msgstr "服务名"
+
+msgid "Service Type"
+msgstr "服务类型"
+
+msgid "Services"
+msgstr "服务"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "设置时间同步"
+
+msgid "Setup DHCP Server"
+msgstr "配置DHCP服务器"
+
+msgid "Show current backup file list"
+msgstr "显示当前文件备份列表"
+
+msgid "Shutdown this interface"
+msgstr "关闭此接口"
+
+msgid "Shutdown this network"
+msgstr "关闭此网络"
+
+msgid "Signal"
+msgstr "信号"
+
+msgid "Signal:"
+msgstr "信号:"
+
+msgid "Size"
+msgstr "大小"
+
+msgid "Skip"
+msgstr "跳过"
+
+msgid "Skip to content"
+msgstr "跳到内容"
+
+msgid "Skip to navigation"
+msgstr "跳转到导航"
+
+msgid "Slot time"
+msgstr "时隙"
+
+msgid "Software"
+msgstr "软件包"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "一些项目的值无效，无法保存！"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "对不起，请求的目标未找到。"
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "对不起，服务器遇到未知错误。"
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"抱歉，当前系统不支持sysupgrade升级，需手动刷新固件。请参考libreCMC Wiki中此设"
+"备特定的安装向导。"
+
+msgid "Sort"
+msgstr "排序"
+
+msgid "Source"
+msgstr "源地址"
+
+msgid "Specifies the button state to handle"
+msgstr "指定要处理的按键状态"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "指定设备的挂载目录"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "指定<em>Dropbear</em>的监听端口"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr "指定假设主机已丢失的最大失败ARP请求数"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr "指定假设主机已丢失的最大时间(秒)"
+
+msgid "Specify the secret encryption key here."
+msgstr "在此指定密钥。"
+
+# 关联了 启动项 和 接口>LAN>DHCP服务器>网址分配基址
+msgid "Start"
+msgstr "开始"
+
+msgid "Start priority"
+msgstr "启动优先级"
+
+msgid "Startup"
+msgstr "启动项"
+
+msgid "Static IPv4 Routes"
+msgstr "静态IPv4路由"
+
+msgid "Static IPv6 Routes"
+msgstr "静态IPv6路由"
+
+msgid "Static Leases"
+msgstr "静态地址分配"
+
+msgid "Static Routes"
+msgstr "静态路由"
+
+msgid "Static WDS"
+msgstr "静态WDS"
+
+msgid "Static address"
+msgstr "静态地址"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"静态租约用于给DHCP客户端分配固定的IP地址和主机标识。只有指定的主机才能连接，"
+"并且接口须为非动态配置。"
+
+msgid "Status"
+msgstr "状态"
+
+msgid "Stop"
+msgstr "关闭"
+
+msgid "Strict order"
+msgstr "严谨查序"
+
+msgid "Submit"
+msgstr "提交"
+
+msgid "Swap"
+msgstr "交换区"
+
+msgid "Swap Entry"
+msgstr "交换项目"
+
+msgid "Switch"
+msgstr "交换机"
+
+msgid "Switch %q"
+msgstr "交换机 %q"
+
+msgid "Switch %q (%s)"
+msgstr "交换机%q (%s)"
+
+msgid "Switch protocol"
+msgstr "切换协议"
+
+msgid "Sync with browser"
+msgstr "同步浏览器时间"
+
+msgid "Synchronizing..."
+msgstr "同步中..."
+
+msgid "System"
+msgstr "系统"
+
+msgid "System Log"
+msgstr "系统日志"
+
+msgid "System Properties"
+msgstr "系统属性"
+
+msgid "System log buffer size"
+msgstr "系统日志缓冲区大小"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "TFTP设置"
+
+msgid "TFTP server root"
+msgstr "TFTP服务器根目录"
+
+msgid "TX"
+msgstr "发送"
+
+msgid "TX Rate"
+msgstr "发送速率"
+
+msgid "Table"
+msgstr "表"
+
+msgid "Target"
+msgstr "对象"
+
+msgid "Terminate"
+msgstr "关闭"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"<em>设备配置</em>区域可配置无线的硬件参数，比如信道、发射功率或发射天线(如果"
+"此无线模块硬件支持多SSID，则全部SSID共用此设备配置)。<em>接口配置</em>区域则"
+"可配置此网络的工作模式和加密等。"
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr "软件包<em>libiwinfo-lua</em>未安装。必需安装此组件以配置无线！"
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr "运营商特定的IPv6前缀，通常以<code>::</code>为结尾"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"合法字符：<code>A-Z</code>, <code>a-z</code>, <code>0-9</code> 和 <code>_</"
+"code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"存储器或分区的设备节点，(<abbr title=\"for example\">例如</abbr> <code>/dev/"
+"sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"用于格式化存储器的文件系统，(<abbr title=\"for example\">例如</abbr> "
+"<samp><abbr title=\"Third Extended Filesystem\">ext4</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr "固件已上传，请注意核对文件大小和校验值！<br />刷新过程切勿断电！"
+
+msgid "The following changes have been committed"
+msgstr "以下更改已提交"
+
+msgid "The following changes have been reverted"
+msgstr "以下更改已放弃"
+
+msgid "The following rules are currently active on this system."
+msgstr "系统中的活跃连接。"
+
+msgid "The given network name is not unique"
+msgstr "给定的网络名重复"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr "本机的硬件不支持多SSID，继续进行将会覆盖现有配置。"
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr "bit格式的IPv4前缀长度, 其余的用在IPv6地址."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "bit格式的IPv6前缀长度"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"本设备可以划分为多个<abbr title=\"Virtual Local Area Network\">VLAN</abbr>，"
+"并支持电脑间的直接通讯。<abbr title=\"Virtual Local Area Network\">VLAN</"
+"abbr>也常用于分割不同网段。默认通常是一条上行端口连接ISP，其余端口为本地子"
+"网。"
+
+msgid "The selected protocol needs a device assigned"
+msgstr "所选的协议需要分配设备"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr "系统正在删除配置分区，完成后会自动重启。"
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"正在刷新系统...<br />切勿关闭电源! DO NOT POWER OFF THE DEVICE!<br />稍等数分"
+"钟即可重新连接到路由。可能需要更改计算机的IP地址以重新连接。"
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr "不支持所上传的文件格式。请确认选择的文件无误。"
+
+msgid "There are no active leases."
+msgstr "没有已分配的租约。"
+
+msgid "There are no pending changes to apply!"
+msgstr "没有待生效的更改！"
+
+msgid "There are no pending changes to revert!"
+msgstr "没有可放弃的更改！"
+
+msgid "There are no pending changes!"
+msgstr "没有待生效的更改！"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr "尚未分配设备，请在\"物理设置\"选项卡中选择网络设备"
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr "尚未设置密码。请为root用户设置密码以保护主机并开启SSH。"
+
+msgid "This IPv4 address of the relay"
+msgstr "中继的IPv4地址"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"系统升级时要保存的配置文件和目录的清单。目录/etc/config/内修改过的文件以及部"
+"分其他配置会被自动保存。"
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr "启动脚本插入到'exit 0'之前即可随系统启动运行。"
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr "隧道代理分配的本地终端地址，通常以<code>:2</code>结尾"
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"这是内网中唯一的<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>服务器"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "自定义系统crontab中的计划任务。"
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr "这通常是隧道代理所管理的最近的PoP的地址"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr "系统中正在运行的进程和其状态信息。"
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "自定义按键动作。"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "活跃的网络连接概况。"
+
+msgid "This section contains no values yet"
+msgstr "尚无任何配置"
+
+msgid "Time Synchronization"
+msgstr "时间同步"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "尚未配置时间同步"
+
+msgid "Timezone"
+msgstr "时区"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr "上传备份存档以恢复配置。"
+
+msgid "Total Available"
+msgstr "可用数"
+
+msgid "Traceroute"
+msgstr "Traceroute"
+
+msgid "Traffic"
+msgstr "流量"
+
+msgid "Transfer"
+msgstr "传输"
+
+msgid "Transmission Rate"
+msgstr "传送速率"
+
+msgid "Transmit"
+msgstr "传送"
+
+msgid "Transmit Power"
+msgstr "无线电功率"
+
+msgid "Transmitter Antenna"
+msgstr "传送天线"
+
+msgid "Trigger"
+msgstr "触发"
+
+msgid "Trigger Mode"
+msgstr "触发模式"
+
+msgid "Tunnel ID"
+msgstr "隧道ID"
+
+msgid "Tunnel Interface"
+msgstr "隧道接口"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "Turbo模式"
+
+msgid "Tx-Power"
+msgstr "传输功率"
+
+msgid "Type"
+msgstr "类型"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "仅UMTS(WCDMA)"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB设备"
+
+msgid "UUID"
+msgstr "UUID"
+
+msgid "Unable to dispatch"
+msgstr "无法调度"
+
+msgid "Unknown"
+msgstr "未知"
+
+msgid "Unknown Error, password not changed!"
+msgstr "未知错误，密码未更改！"
+
+msgid "Unmanaged"
+msgstr "不配置协议"
+
+msgid "Unsaved Changes"
+msgstr "未保存的配置"
+
+msgid "Unsupported protocol type."
+msgstr "不支持的协议类型"
+
+msgid "Update lists"
+msgstr "刷新列表"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr "上传兼容的sysupgrade固件以刷新当前系统。"
+
+msgid "Upload archive..."
+msgstr "上传备份..."
+
+msgid "Uploaded File"
+msgstr "上传的文件"
+
+msgid "Uptime"
+msgstr "运行时间"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "使用<code>/etc/ethers</code>配置"
+
+msgid "Use DHCP gateway"
+msgstr "使用DHCP网关"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "使用端局通告的DNS服务器"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "参考ISO/IEC 3166 alpha2国家代码。"
+
+msgid "Use MTU on tunnel interface"
+msgstr "隧道接口的MTU"
+
+msgid "Use TTL on tunnel interface"
+msgstr "隧道接口的TTL"
+
+msgid "Use as root filesystem"
+msgstr "设置为根文件系统"
+
+msgid "Use broadcast flag"
+msgstr "使用广播标签"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "使用自定义的DNS服务器"
+
+msgid "Use default gateway"
+msgstr "使用默认网关"
+
+msgid "Use gateway metric"
+msgstr "使用网关跃点"
+
+msgid "Use routing table"
+msgstr "使用路由表"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"使用<em>添加</em>来增加新的租约条目。使用<em>MAC-地址</em>鉴别主机，<em>IPv4-"
+"地址</em>分配地址，<em>主机名</em>分配标识。"
+
+msgid "Used"
+msgstr "已用"
+
+msgid "Used Key Slot"
+msgstr "启用密码组"
+
+msgid "Username"
+msgstr "用户名"
+
+msgid "VC-Mux"
+msgstr "VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "VLAN接口"
+
+msgid "VLANs on %q"
+msgstr "%q上的VLAN"
+
+msgid "VLANs on %q (%s)"
+msgstr "%q (%s)上的VLAN"
+
+msgid "VPN Server"
+msgstr "VPN服务器"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "请求DHCP时发送的Vendor Class"
+
+msgid "Verify"
+msgstr "验证"
+
+msgid "Version"
+msgstr "版本"
+
+msgid "WDS"
+msgstr "WDS"
+
+msgid "WEP Open System"
+msgstr "WEP开放认证"
+
+msgid "WEP Shared Key"
+msgstr "WEP共享密钥"
+
+msgid "WEP passphrase"
+msgstr "WEP密钥"
+
+msgid "WMM Mode"
+msgstr "WMM多媒体加速"
+
+msgid "WPA passphrase"
+msgstr "WPA密钥"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA加密需要安装wpa_supplicant(客户端模式)或安装hostapd(接入点AP、点对点ad-hoc"
+"模式)。"
+
+msgid "Waiting for changes to be applied..."
+msgstr "正在应用更改..."
+
+msgid "Waiting for command to complete..."
+msgstr "正在执行命令..."
+
+msgid "Warning"
+msgstr "警告"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "警告: 有尚未保存的更改，重启将丢失!"
+
+msgid "Wifi"
+msgstr "无线"
+
+msgid "Wireless"
+msgstr "无线"
+
+msgid "Wireless Adapter"
+msgstr "无线适配器"
+
+msgid "Wireless Network"
+msgstr "无线网络"
+
+msgid "Wireless Overview"
+msgstr "无线概况"
+
+msgid "Wireless Security"
+msgstr "无线安全"
+
+msgid "Wireless is disabled or not associated"
+msgstr "未开启或未关联无线"
+
+msgid "Wireless is restarting..."
+msgstr "重启无线中..."
+
+msgid "Wireless network is disabled"
+msgstr "无线已禁用"
+
+msgid "Wireless network is enabled"
+msgstr "无线网络开关"
+
+msgid "Wireless restarted"
+msgstr "无线已重启"
+
+msgid "Wireless shut down"
+msgstr "无线已关闭"
+
+msgid "Write received DNS requests to syslog"
+msgstr "将收到的DNS请求写入系统日志"
+
+msgid "XR Support"
+msgstr "XR支持"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"启用或禁用已安装的启动脚本。更改在设备重启后生效。<br /><strong>警告：如果禁"
+"用了必要的启动脚本，比如\"network\"，可能会导致设备无法访问！</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr "LUCI的正常运行需要开启浏览器的Java Script支持。"
+
+msgid "any"
+msgstr "任意"
+
+msgid "auto"
+msgstr "自动"
+
+msgid "automatic"
+msgstr "自动"
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "桥接的"
+
+msgid "create:"
+msgstr "创建:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "为指定接口创建桥接"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "禁用"
+
+msgid "disabled"
+msgstr "已禁用"
+
+msgid "expired"
+msgstr "过期时间"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"存放<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>租约的文件"
+
+msgid "forward"
+msgstr "转发"
+
+msgid "full-duplex"
+msgstr "全双工"
+
+msgid "half-duplex"
+msgstr "半双工"
+
+msgid "help"
+msgstr "帮助"
+
+msgid "hidden"
+msgstr "隐藏"
+
+msgid "hybrid mode"
+msgstr "混合模式"
+
+msgid "if target is a network"
+msgstr "如果对象是一个网络"
+
+msgid "input"
+msgstr "输入"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "本地<abbr title=\"Domain Name System\">DNS</abbr>解析文件"
+
+msgid "no"
+msgstr "no"
+
+msgid "no link"
+msgstr "未连接"
+
+msgid "none"
+msgstr "无"
+
+msgid "off"
+msgstr "关"
+
+msgid "on"
+msgstr "开"
+
+msgid "open"
+msgstr "开放式"
+
+msgid "relay mode"
+msgstr "中继模式"
+
+msgid "routed"
+msgstr "已路由"
+
+msgid "server mode"
+msgstr "服务器模式"
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "关联"
+
+msgid "unknown"
+msgstr "未知"
+
+msgid "unlimited"
+msgstr "无限制"
+
+msgid "unspecified"
+msgstr "未指定"
+
+msgid "unspecified -or- create:"
+msgstr "未指定 // 创建:"
+
+msgid "untagged"
+msgstr "不关联"
+
+msgid "yes"
+msgstr "是"
+
+msgid "« Back"
+msgstr "« 后退"
+
+#~ msgid "Ad-hoc mode"
+#~ msgstr "Ad-hoc模式"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "HE.net用户ID"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr "这是32 byte hex编码的用户ID，不是登录名"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz HT40+ (仅1-7频道可用）"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz HT40- (仅5-13频道可用）"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "接收路由通告"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "在网络上通告IPv6"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "通告的网络ID"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "允许的范围：1 到 65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT功能"
+
+#~ msgid "HT mode"
+#~ msgstr "HT模式"
+
+#~ msgid "Router Model"
+#~ msgstr "主机型号"
+
+#~ msgid "Router Name"
+#~ msgstr "系统名称"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "发送路由请求"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "指定通告的首选前缀生存时间(秒)"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "指定通告的有效前缀生存时间(秒)"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "使用首选生存时间"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "使用有效生存时间"
+
+#~ msgid "Waiting for router..."
+#~ msgstr "等待路由器..."
+
+#~ msgid "Enable builtin NTP server"
+#~ msgstr "开启内置NTP服务器"
+
+#~ msgid "Active Leases"
+#~ msgstr "活动的租约"
+
+#~ msgid "Open"
+#~ msgstr "打开"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Bit Rate"
+#~ msgstr "比特率"
+
+#~ msgid "Configuration / Apply"
+#~ msgstr "设置 /应用"
+
+#~ msgid "Configuration / Changes"
+#~ msgstr "设置 / 修改"
+
+#~ msgid "Configuration / Revert"
+#~ msgstr "设置 / 重置"
+
+#~ msgid "MAC"
+#~ msgstr "MAC"
+
+#~ msgid "MAC Address"
+#~ msgstr "MAC地址"
+
+#~ msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
+#~ msgstr "<abbr title=\"Encrypted\">加密</abbr>"
+
+#~ msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
+#~ msgstr "搜索<abbr title=\"Wireless Local Area Network\">WLAN</abbr>"
+
+#~ msgid ""
+#~ "Choose the network you want to attach to this wireless interface. Select "
+#~ "<em>unspecified</em> to not attach any network or fill out the "
+#~ "<em>create</em> field to define a new network."
+#~ msgstr ""
+#~ "请选择你需要链接到无线网络接口的网络. 如果不链接到任何网络请选择 <em>未指"
+#~ "定</em>,如果需要创建新网络请点<em>创建</em>."
+
+#~ msgid "Create Network"
+#~ msgstr "创建一个网络"
+
+#~ msgid "Link"
+#~ msgstr "链接"
+
+#~ msgid "Networks"
+#~ msgstr "网络"
+
+#~ msgid "Power"
+#~ msgstr "Power"
+
+#~ msgid "Wifi networks in your local environment"
+#~ msgstr "扫描到的无线热点"
+
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-服务器"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-广播"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-地址"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "IP-Aliases"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "IPv6 设置"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "注意：当你选择一个已经存在与一个网络中的接口时，它将会被移除那个网络。"
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Really delete this interface? The deletion cannot be undone!\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "interface."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "network."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Really shutdown interface \"%s\" ?\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "interface."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Really shutdown network ?\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "interface."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "segments. Often there is by default one Uplink port for a connection to "
+#~ "the next greater network like the internet and other ports for a local "
+#~ "network."
+#~ msgstr ""
+#~ "本设备可以划分为多个<abbr title=\"Virtual Local Area Network\">VLAN</"
+#~ "abbr>，并支持电脑间的直接通讯；<abbr title=\"Virtual Local Area Network"
+#~ "\">VLAN</abbr>也常用于分割不同网段；默认通常是一条上传端口连接ISP，其余端"
+#~ "口为本地子网。"
+
+#~ msgid "Enable buffering"
+#~ msgstr "开启缓冲"
+
+#~ msgid "IPv6-over-IPv4"
+#~ msgstr "IPv6-over-IPv4"
+
+#~ msgid "Custom Files"
+#~ msgstr "自定义文件"
+
+#~ msgid "Custom files"
+#~ msgstr "自定义文件"
+
+#~ msgid "Detected Files"
+#~ msgstr "查询到的文件"
+
+#~ msgid "Detected files"
+#~ msgstr "查询到的文件"
+
+#~ msgid "Files to be kept when flashing a new firmware"
+#~ msgstr "更新固件时被保存的文件"
+
+#~ msgid "General"
+#~ msgstr "基本信息"
+
+#~ msgid ""
+#~ "Here you can customize the settings and the functionality of <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "这里可以自定义<abbr title=\"Lua Configuration Interface\">LuCI</abbr>的组"
+#~ "件和功能。"
+
+#~ msgid "Post-commit actions"
+#~ msgstr "Post-commit操作"
+
+#~ msgid ""
+#~ "The following files are detected by the system and will be kept "
+#~ "automatically during sysupgrade"
+#~ msgstr "更新固件时要保存的文件"
+
+#~ msgid ""
+#~ "These commands will be executed automatically when a given <abbr title="
+#~ "\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+#~ "allowing changes to be applied instantly."
+#~ msgstr ""
+#~ "当<abbr title=\"Unified Configuration Interface\">UCI</abbr>配置提交并生效"
+#~ "后，这些命令将被自动执行。"
+
+#~ msgid ""
+#~ "This is a list of shell glob patterns for matching files and directories "
+#~ "to include during sysupgrade"
+#~ msgstr "系统升级时要保存的配置文件以及目录的串列清单"
+
+#~ msgid "Web <abbr title=\"User Interface\">UI</abbr>"
+#~ msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
+
+#~ msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
+#~ msgstr ""
+#~ "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-服务器"
+
+#~ msgid "AHCP Settings"
+#~ msgstr "AHCP设置"
+
+#~ msgid "ARP ping retries"
+#~ msgstr "重试ARP ping"
+
+#~ msgid "ATM Settings"
+#~ msgstr "ATM设置"
+
+#~ msgid "Accept Router Advertisements"
+#~ msgstr "接收路由公告"
+
+#~ msgid "Access point (APN)"
+#~ msgstr "接入点(APN)"
+
+#~ msgid "Additional pppd options"
+#~ msgstr "附加pppd选项"
+
+#~ msgid "Allowed range is 1 to FFFF"
+#~ msgstr "允许范围：1 ~ FFFF"
+
+#~ msgid "Automatic Disconnect"
+#~ msgstr "自动断开"
+
+#~ msgid "Backup Archive"
+#~ msgstr "备份的存档"
+
+#~ msgid ""
+#~ "Configure the local DNS server to use the name servers adverticed by the "
+#~ "PPP peer"
+#~ msgstr "本地DNS服务器使用PPP端局提供的域名服务器"
+
+#~ msgid "Connect script"
+#~ msgstr "连接脚本"
+
+#~ msgid "Create backup"
+#~ msgstr "创建备份"
+
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#~ msgid "Disconnect script"
+#~ msgstr "断开脚本"
+
+#~ msgid "Edit package lists and installation targets"
+#~ msgstr "修改软件包的同步源和安装地址"
+
+#~ msgid "Enable 4K VLANs"
+#~ msgstr "开启4K VLAN"
+
+#~ msgid "Enable IPv6 on PPP link"
+#~ msgstr "在PPP链路上启用IPv6"
+
+#~ msgid "Firmware image"
+#~ msgstr "固件文件"
+
+#~ msgid "Forward DHCP"
+#~ msgstr "转发DHCP"
+
+#~ msgid "Forward broadcasts"
+#~ msgstr "转发广播"
+
+#~ msgid "HE.net Tunnel ID"
+#~ msgstr "HE.net隧道ID"
+
+#~ msgid ""
+#~ "Here you can backup and restore your router configuration and - if "
+#~ "possible - reset the router to the default settings."
+#~ msgstr "这里可以备份和恢复路由器的配置，也可以恢复到系统出厂设置。"
+
+#~ msgid "Installation targets"
+#~ msgstr "安装位置"
+
+#~ msgid "Keep configuration files"
+#~ msgstr "保留配置文件"
+
+#~ msgid "Keep-Alive"
+#~ msgstr "保持活动"
+
+#~ msgid "Kernel"
+#~ msgstr "内核"
+
+#~ msgid ""
+#~ "Let pppd replace the current default route to use the PPP interface after "
+#~ "successful connect"
+#~ msgstr "PPP连接成功后替换当前默认路由为pppd"
+
+#~ msgid "Let pppd run this script after establishing the PPP link"
+#~ msgstr "PPP连接建立后运行此脚本"
+
+#~ msgid "Let pppd run this script before tearing down the PPP link"
+#~ msgstr "PPP连接断开前运行此脚本"
+
+#~ msgid ""
+#~ "Make sure that you provide the correct pin code here or you might lock "
+#~ "your sim card!"
+#~ msgstr "请确认pin码正确，并且没有锁定sim卡！"
+
+#~ msgid ""
+#~ "Most of them are network servers, that offer a certain service for your "
+#~ "device or network like shell access, serving webpages like <abbr title="
+#~ "\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending "
+#~ "e-mails, ..."
+#~ msgstr ""
+#~ "这些大部分是为设备或网络提供特定服务的，比如shell访问，<abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr> App，网间漫游，发送E-mail等..."
+
+#~ msgid "Number of failed connection tests to initiate automatic reconnect"
+#~ msgstr "启动自动重连的失败连接次数"
+
+#~ msgid "Override Gateway"
+#~ msgstr "更新网关"
+
+#~ msgid "PIN code"
+#~ msgstr "PIN码"
+
+#~ msgid "PPP Settings"
+#~ msgstr "PPP设置"
+
+#~ msgid "Package lists"
+#~ msgstr "软件同步源"
+
+#~ msgid ""
+#~ "Port <abbr title=\"Primary VLAN IDs\">PVIDs</abbr> specify the default "
+#~ "VLAN ID added to received untagged frames."
+#~ msgstr ""
+#~ "端口的<abbr title=\"Primary VLAN IDs\">PVID</abbr>指定了添加到所接收的未标"
+#~ "记桢的默认VLAN ID。"
+
+#~ msgid "Port PVIDs on %q"
+#~ msgstr "分配%q的端口PVID"
+
+#~ msgid "Proceed reverting all settings and resetting to firmware defaults?"
+#~ msgstr "放弃所有配置并将路由复位到默认状态？"
+
+#~ msgid "Processor"
+#~ msgstr "处理器"
+
+#~ msgid "Radius-Port"
+#~ msgstr "Radius-端口"
+
+#~ msgid "Radius-Server"
+#~ msgstr "Radius-服务器"
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might loose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "真的要关闭此网络？\n"
+#~ "如果正由此网络管理路由，可能导致无法再管理路由器！"
+
+#~ msgid "Relay Settings"
+#~ msgstr "中继设置"
+
+#~ msgid "Replace default route"
+#~ msgstr "重置默认路由"
+
+#~ msgid "Reset router to defaults"
+#~ msgstr "恢复出厂设置"
+
+#~ msgid "Routing table ID"
+#~ msgstr "路由表ID"
+
+#~ msgid ""
+#~ "Seconds to wait for the modem to become ready before attempting to connect"
+#~ msgstr "Modem尝试连接的就绪准备时间"
+
+#~ msgid "Send Router Solicitiations"
+#~ msgstr "发送路由探测"
+
+#~ msgid "Server IPv4-Address"
+#~ msgstr "服务器IPv4-地址"
+
+#~ msgid "Service type"
+#~ msgstr "服务类型"
+
+#~ msgid "Services and daemons perform certain tasks on your device."
+#~ msgstr "路由器上运行的部分任务和服务。"
+
+#~ msgid "Settings"
+#~ msgstr "设置"
+
+#~ msgid "Setup wait time"
+#~ msgstr "设置缓冲时间"
+
+#~ msgid ""
+#~ "Sorry. libreCMC does not support a system upgrade on this platform.<br /> "
+#~ "You need to manually flash your device."
+#~ msgstr "抱歉，libreCMC不支持本平台的系统升级。<br />请手动刷新设备。"
+
+#~ msgid "Specify additional command line arguments for pppd here"
+#~ msgstr "指定附加命令行参数到pppd"
+
+#~ msgid "TTL"
+#~ msgstr "TTL"
+
+#~ msgid "The device node of your modem, e.g. /dev/ttyUSB0"
+#~ msgstr "modem的设备节点。例如/dev/ttyUSB0"
+
+#~ msgid "Time (in seconds) after which an unused connection will be closed"
+#~ msgstr "自动关闭空闲连接的延迟时间(秒)"
+
+#~ msgid "Time Server (rdate)"
+#~ msgstr "校时服务器(rdate)"
+
+#~ msgid "Tunnel Settings"
+#~ msgstr "隧道设置"
+
+#~ msgid "Update package lists"
+#~ msgstr "更新软件列表"
+
+#~ msgid "Upload an libreCMC image file to reflash the device."
+#~ msgstr "上传libreCMC固件以刷新设备。"
+
+#~ msgid "Upload image"
+#~ msgstr "上传固件"
+
+#~ msgid "Use peer DNS"
+#~ msgstr "使用对等DNS"
+
+#~ msgid "VLAN %d"
+#~ msgstr "VLAN %d"
+
+#~ msgid ""
+#~ "You can specify multiple DNS servers here, press enter to add a new "
+#~ "entry. Servers entered here will override automatically assigned ones."
+#~ msgstr "这里可以指定多路DNS服务器。输入后会自动覆盖已分配的条目。"
+
+#~ msgid ""
+#~ "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+#~ "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
+#~ msgstr ""
+#~ "UMTS/GPRS功能需安装\"comgt\",PPPoE需安装\"ppp-mod-pppoe\",PPPoA需安装"
+#~ "\"ppp-mod-pppoa\",PPtP需安装\"pptp\"。"
+
+#~ msgid "back"
+#~ msgstr "后退"
+
+#~ msgid "buffered"
+#~ msgstr "已缓冲"
+
+#~ msgid "cached"
+#~ msgstr "已缓存"
+
+#~ msgid "free"
+#~ msgstr "空闲"
+
+#~ msgid "static"
+#~ msgstr "静态"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection "
+#~ "of free Lua software including an <abbr title=\"Model-View-Controller"
+#~ "\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr "
+#~ "title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
+#~ "Apache-License."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>是一款嵌入式设备使"
+#~ "用的免费Lua软件，包含web框架和web界面。<abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>遵循Apache-License."
+
+#~ msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
+#~ msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-密钥"
+
+#~ msgid ""
+#~ "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve "
+#~ "LuCI"
+#~ msgstr "一个用C语言和Lua实现的服务于LuCI的轻量级 HTTP/1.1 web服务器。"
+
+#~ msgid ""
+#~ "A small webserver which can be used to serve <abbr title=\"Lua "
+#~ "Configuration Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "一个用于<abbr title=\"Lua Configuration Interface\">LuCI</abbr>的小型web服"
+#~ "务器。"
+
+#~ msgid "About"
+#~ msgstr "关于"
+
+#~ msgid "Active IP Connections"
+#~ msgstr "活动IP连接"
+
+#~ msgid "Addresses"
+#~ msgstr "地址"
+
+#~ msgid "Admin Password"
+#~ msgstr "管理密码"
+
+#~ msgid "Alias"
+#~ msgstr "别名"
+
+#~ msgid "Authentication Realm"
+#~ msgstr "验证范围"
+
+#~ msgid "Bridge Port"
+#~ msgstr "桥接端口"
+
+#~ msgid ""
+#~ "Change the password of the system administrator (User <code>root</code>)"
+#~ msgstr "修改管理员密码"
+
+#~ msgid "Client + WDS"
+#~ msgstr "客户端+WDS"
+
+#~ msgid "Configuration file"
+#~ msgstr "配置文件"
+
+#~ msgid "Connection timeout"
+#~ msgstr "连接超时"
+
+#~ msgid "Contributing Developers"
+#~ msgstr "特别致谢"
+
+#~ msgid "DHCP assigned"
+#~ msgstr "DHCP有效分配"
+
+#~ msgid "Document root"
+#~ msgstr "根文档"
+
+#~ msgid "Enable Keep-Alive"
+#~ msgstr "开启保持活动"
+
+#~ msgid "Enable device"
+#~ msgstr "开启设备"
+
+#~ msgid "Ethernet Bridge"
+#~ msgstr "以太网桥"
+
+#~ msgid ""
+#~ "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys "
+#~ "(one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+#~ "authentication."
+#~ msgstr ""
+#~ "这里可以粘贴公用<abbr title=\"Secure Shell\">SSH</abbr>密钥以用于<abbr "
+#~ "title=\"Secure Shell\">SSH</abbr>公共密钥认证(每行一个密钥)。"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "IP Configuration"
+#~ msgstr "IP设置"
+
+#~ msgid "Interface Status"
+#~ msgstr "接口状态"
+
+#~ msgid "Lead Development"
+#~ msgstr "开发向导"
+
+#~ msgid "Master"
+#~ msgstr "Master"
+
+#~ msgid "Master + WDS"
+#~ msgstr "Master + WDS"
+
+#~ msgid "No address configured on this interface."
+#~ msgstr "本接口未设置地址"
+
+#~ msgid "Not configured"
+#~ msgstr "未设置"
+
+#~ msgid "Password successfully changed"
+#~ msgstr "密码已修改"
+
+#~ msgid "Plugin path"
+#~ msgstr "插件路径"
+
+#~ msgid "Ports"
+#~ msgstr "端口"
+
+#~ msgid "Primary"
+#~ msgstr "主要的"
+
+#~ msgid "Project Homepage"
+#~ msgstr "项目主页"
+
+#~ msgid "Pseudo Ad-Hoc"
+#~ msgstr "伪装Ad-Hoc"
+
+#~ msgid "STP"
+#~ msgstr "STP"
+
+#~ msgid "Thanks To"
+#~ msgstr "感谢"
+
+#~ msgid ""
+#~ "The realm which will be displayed at the authentication prompt for "
+#~ "protected pages."
+#~ msgstr "在有提示验证保护的网页时显示验证范围。"
+
+#~ msgid "Unknown Error"
+#~ msgstr "未知错误"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "defaults to <code>/etc/httpd.conf</code>"
+#~ msgstr "默认为<code>/etc/httpd.conf</code>"
+
+#~ msgid "Enable this switch"
+#~ msgstr "开启交换机"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG 出错代码 %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "更新软件包列表"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "设置时复位交换机"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "升级已安装软件"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-端口"
+
+#~ msgid ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, "
+#~ "flexible, and user friendly graphical interface for configuring libreCMC "
+#~ "Kamikaze."
+#~ msgstr ""
+#~ "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>是一个免费的，灵活"
+#~ "的，可视化的用户界面，可用来配置libreCMC。"
+
+#~ msgid "AP-Isolation"
+#~ msgstr "AP隔离"
+
+#~ msgid "Active IPv4-Routes"
+#~ msgstr "活动的IPv4链路"
+
+#~ msgid "adds domain names to hostentries in the resolv file"
+#~ msgstr "添加域名条目到主机解析文件"
+
+#~ msgid "Add the Wifi network to physical network"
+#~ msgstr "添加无线网络到物理网络"
+
+#~ msgid ""
+#~ "Also kernel or service logfiles can be viewed here to get an overview "
+#~ "over their current state."
+#~ msgstr "这里显示了系统日志，可以了解系统当前的运行状态。"
+
+#~ msgid "And now have fun with your router!"
+#~ msgstr "现在开始体验路由带来的乐趣吧!"
+
+#~ msgid ""
+#~ "As we always want to improve this interface we are looking forward to "
+#~ "your feedback and suggestions."
+#~ msgstr "我们一直在努力提升界面效果，并期待着您的意见与建议。"
+
+#~ msgid "Attach to existing network"
+#~ msgstr "连接现有网络"
+
+#~ msgid "Clamp Segment Size"
+#~ msgstr "固定段大小"
+
+#~ msgid "Configuration applied"
+#~ msgstr "设置已应用"
+
+#~ msgid "Create Or Attach Network"
+#~ msgstr "创建/连接 网络"
+
+#~ msgid "Devices"
+#~ msgstr "设备"
+
+#~ msgid "enable"
+#~ msgstr "启用"
+
+#~ msgid "Errors"
+#~ msgstr "错误"
+
+#~ msgid "Essentials"
+#~ msgstr "概要"
+
+#~ msgid ""
+#~ "Fixes problems with unreachable websites, submitting forms or other "
+#~ "unexpected behaviour for some ISPs."
+#~ msgstr "修复某些ISP的不可达网站或其他未知错误"
+
+#~ msgid ""
+#~ "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+#~ "Windows-systems"
+#~ msgstr ""
+#~ "过滤无用的<abbr title=\"Domain Name System\">DNS</abbr>Windows-systems查询"
+
+#~ msgid "Hardware Address"
+#~ msgstr "硬件地址"
+
+#~ msgid "Hello!"
+#~ msgstr "Hello!"
+
+#~ msgid "Here you can configure installed wifi devices."
+#~ msgstr "这里可以配置已安装的无线设备。"
+
+#~ msgid ""
+#~ "Here you can find information about the current system status like <abbr "
+#~ "title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory "
+#~ "usage or network interface data."
+#~ msgstr ""
+#~ "这里可以查看系统当前的状态信息，比如<abbr title=\"Central Processing Unit"
+#~ "\">CPU</abbr>频率、内存使用率或网络链接数据。"
+
+#~ msgid ""
+#~ "If the interface is attached to an existing network it will be "
+#~ "<em>bridged</em> to the existing interfaces and is covered by the "
+#~ "firewall zone of the choosen network.<br />Uncheck the attach option to "
+#~ "define a new standalone network for this interface."
+#~ msgstr ""
+#~ "如果连接在已有网络，那么它会被<em>桥接</em>到现有接口，并且被所选的防火墙"
+#~ "区域覆盖。取消附加选项可以重定义此接口为新的独立网络。"
+
+#~ msgid "Ignore <code>/etc/hosts</code>"
+#~ msgstr "忽略 <code>/etc/hosts</code>"
+
+#~ msgid "Independent (Ad-Hoc)"
+#~ msgstr "独立(点对点Ad-Hoc)"
+
+#~ msgid "Internet Connection"
+#~ msgstr "网络连接"
+
+#~ msgid "Join (Client)"
+#~ msgstr "加入(客户端)"
+
+#~ msgid "Leases"
+#~ msgstr "租约"
+
+#~ msgid "localises the hostname depending on its subnet"
+#~ msgstr "根据子网本地化主机名"
+
+#~ msgid "LuCI Components"
+#~ msgstr "LuCI 组件"
+
+#~ msgid ""
+#~ "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
+#~ "changes have to be confirmed by clicking Changes - Save &amp; Apply "
+#~ "before being applied."
+#~ msgstr ""
+#~ "注意：在<abbr title=\"Lua Configuration Interface\">LuCI</abbr>中，点击 保"
+#~ "存&amp;应用 后设置才会生效。"
+
+#~ msgid ""
+#~ "On the following pages you can adjust all important settings of your "
+#~ "router."
+#~ msgstr "本页可以设置路由器的重要参数。"
+
+#~ msgid "Perform Actions"
+#~ msgstr "执行操作"
+
+#~ msgid ""
+#~ "prevents caching of negative <abbr title=\"Domain Name System\">DNS</"
+#~ "abbr>-replies"
+#~ msgstr "阻止缓存无效的<abbr title=\"Domain Name System\">DNS</abbr>应答"
+
+#~ msgid "Prevents client to client communication"
+#~ msgstr "禁止客户端间的通信"
+
+#~ msgid "Provide (Access Point)"
+#~ msgstr "添加(接入点)"
+
+#~ msgid "Search file..."
+#~ msgstr "查找文件..."
+
+#~ msgid "Server"
+#~ msgstr "服务器"
+
+#~ msgid "TX / RX"
+#~ msgstr "发送 / 接收"
+
+#~ msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
+#~ msgstr "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>开发团队"
+
+#~ msgid "The following changes have been comitted"
+#~ msgstr "以下更改已提交"
+
+#~ msgid "The following changes have been applied"
+#~ msgstr "以下更改已生效"
+
+#~ msgid ""
+#~ "This is the administration area of <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr>."
+#~ msgstr ""
+#~ "这是<abbr title=\"Lua Configuration Interface\">LuCI</abbr>的管理页面。"
+
+#~ msgid "transmitted / received"
+#~ msgstr "已传输 / 已接收"
+
+#~ msgid ""
+#~ "When flashing a new firmware with <abbr title=\"Lua Configuration "
+#~ "Interface\">LuCI</abbr> these files will be added to the new firmware "
+#~ "installation."
+#~ msgstr ""
+#~ "当刷写带<abbr title=\"Lua Configuration Interface\">LuCI</abbr>的新固件"
+#~ "时，这些文件将被加入到新的固件中。"
+
+#~ msgid ""
+#~ "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
+#~ "network members can automatically receive their network settings (<abbr "
+#~ "title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title="
+#~ "\"Domain Name System\">DNS</abbr>-server, ...)."
+#~ msgstr ""
+#~ "用户可以通过<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+#~ "abbr>自动接收网络的(<abbr title=\"Internet Protocol\">IP</abbr>地址，子网"
+#~ "掩码，<abbr title=\"Domain Name System\">DNS</abbr>服务器, ...)等配置信"
+#~ "息。"
+
+#~ msgid "Wireless Scan"
+#~ msgstr "搜索无线"
+
+#~ msgid ""
+#~ "You are about to join the wireless network <em><strong>%s</strong></em>. "
+#~ "In order to complete the process, you need to provide some additional "
+#~ "details."
+#~ msgstr ""
+#~ "即将加入无线网络<em><strong>%s</strong></em>，这需要填写一些额外信息。"
+
+#~ msgid ""
+#~ "You can run several wifi networks with one device. Be aware that there "
+#~ "are certain hardware and driverspecific restrictions. Normally you can "
+#~ "operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network "
+#~ "simultaneously."
+#~ msgstr ""
+#~ "一台设备可以用虚拟方式同时运行几个无线网络。但注意会有硬件或软件限制。通常"
+#~ "可以运行一个点对点无线网络，或同时运行三个Master模式和一个客户端模式的无线"
+#~ "网络。"
+
+#~ msgid ""
+#~ "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP "
+#~ "support"
+#~ msgstr "需要安装\"ppp-mod-pppoe\"以支持PPPoe，\"pptp\"以支持PPtP"
+
+#~ msgid ""
+#~ "You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
+#~ msgstr "需要安装<a href='%s'><em>wpa-supplicant</em></a>以支持WPA加密!"
+
+#~ msgid ""
+#~ "You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> "
+#~ "to use WPA!"
+#~ msgstr ""
+#~ "需要安装<a href='%s'>Broadcom<em>nas</em> supplicant</a>以支持WPA加密!"
+
+#~ msgid "User Interface"
+#~ msgstr "用户界面"
+
+#~ msgid "(hidden)"
+#~ msgstr "(隐藏)"
+
+#~ msgid "(optional)"
+#~ msgstr "(任意)"
+
+#~ msgid "Aliases"
+#~ msgstr "别名"
+
+#~ msgid "First leased address"
+#~ msgstr "起始分配地址"
+
+#~ msgid "Local Network"
+#~ msgstr "本地网络"
+
+#~ msgid "Number of leased addresses"
+#~ msgstr "地址租用数"
+
+#~ msgid "Path"
+#~ msgstr "路径"
+
+#~ msgid "Resolvfile"
+#~ msgstr "解析文件"
+
+#~ msgid "Zone"
+#~ msgstr "区域"
+
+#~ msgid "additional hostfile"
+#~ msgstr "附加的主机文件"
+
+#~ msgid "automatically reconnect"
+#~ msgstr "自动重连"
+
+#~ msgid "concurrent queries"
+#~ msgstr "并发查询"
+
+#~ msgid "disconnect when idle for"
+#~ msgstr "空闲自动断开"
+
+#~ msgid "don't cache unknown"
+#~ msgstr "不缓存未知数据"
+
+#~ msgid "installed"
+#~ msgstr "已安装"
+
+#~ msgid "manual"
+#~ msgstr "手册"
+
+#~ msgid "not installed"
+#~ msgstr "未安装"
+
+#~ msgid "query port"
+#~ msgstr "查询端口"
+
+#~ msgid "all"
+#~ msgstr "全部"
+
+#~ msgid "Code"
+#~ msgstr "代码"
+
+#~ msgid "Distance"
+#~ msgstr "距离"
+
+#~ msgid "Legend"
+#~ msgstr "图例"
+
+#~ msgid "Library"
+#~ msgstr "Library"
+
+#~ msgid "see '%s' manpage"
+#~ msgstr "详参 &#39;%s&#39; 联机帮助"
+
+#~ msgid "Package Manager"
+#~ msgstr "软件包管理"
+
+#~ msgid "Service"
+#~ msgstr "服务"
+
+#~ msgid "Statistics"
+#~ msgstr "统计信息"
diff --git a/trunk/package/luci/po/zh_CN/commands.po b/trunk/package/luci/po/zh_CN/commands.po
new file mode 100644
index 00000000..8b2b032b
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/commands.po
@@ -0,0 +1,94 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-08 15:47+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "简短描述命令用途"
+
+msgid "Access command with"
+msgstr "访问命令"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr "允许在不认证的前提下执行命令，并获取其输出。"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "允许用户提供额外的命令行参数"
+
+msgid "Arguments:"
+msgstr "参数："
+
+msgid "Binary data not displayed, download instead."
+msgstr "不显示二进制数据，使用下载方式替代。"
+
+msgid "Code:"
+msgstr "代码："
+
+msgid "Collecting data..."
+msgstr "收集数据："
+
+msgid "Command"
+msgstr "命令"
+
+msgid "Command failed"
+msgstr "执行命令失败"
+
+msgid "Command line to execute"
+msgstr "执行命令行"
+
+msgid "Command successful"
+msgstr "执行命令成功"
+
+msgid "Command:"
+msgstr "命令："
+
+msgid "Configure"
+msgstr "配置"
+
+msgid "Custom Commands"
+msgstr "自定义命令"
+
+msgid "Custom arguments"
+msgstr "自定义参数"
+
+msgid "Dashboard"
+msgstr "看板"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Download"
+msgstr "下载"
+
+msgid "Failed to execute command!"
+msgstr "执行命令失败！"
+
+msgid "Link"
+msgstr "连接"
+
+msgid "Loading"
+msgstr "加载中"
+
+msgid "Public access"
+msgstr "公共访问"
+
+msgid "Run"
+msgstr "运行"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr "此页面允许您配置自定义Shell命令，并可以从Web界面调用shell命令。"
+
+msgid "Waiting for command to complete..."
+msgstr "等待命令执行完成... ..."
diff --git a/trunk/package/luci/po/zh_CN/coovachilli.po b/trunk/package/luci/po/zh_CN/coovachilli.po
new file mode 100644
index 00000000..7ab00329
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/coovachilli.po
@@ -0,0 +1,26 @@
+#  coovachilli.pot
+#  generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-05 14:32+0200\n"
+"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli 网页认证"
+
+msgid "Network Configuration"
+msgstr "网络配置"
+
+msgid "RADIUS configuration"
+msgstr "RADIUS配置"
+
+msgid "UAM and MAC Authentication"
+msgstr "UAM和MAC认证"
diff --git a/trunk/package/luci/po/zh_CN/ddns.po b/trunk/package/luci/po/zh_CN/ddns.po
new file mode 100644
index 00000000..ad4cbadd
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/ddns.po
@@ -0,0 +1,88 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: 2013-10-08 15:59+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: QQ Group 75543259\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "检查IP变动的时间间隔"
+
+msgid "Check-time unit"
+msgstr "时间单位"
+
+msgid "Custom update-URL"
+msgstr "更新的URL"
+
+msgid "Dynamic DNS"
+msgstr "动态DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"动态DNS允许为主机配置一个固定的可访问域名， 但该域名对应的IP可以是动态的."
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Force update every"
+msgstr "强制更新间隔"
+
+msgid "Force-time unit"
+msgstr "强制更新的时间单位"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "Interface"
+msgstr "接口"
+
+msgid "Network"
+msgstr "网络"
+
+msgid "Password"
+msgstr "密码"
+
+msgid "Service"
+msgstr "服务提供商"
+
+msgid "Source of IP address"
+msgstr "IP地址来源"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "用户名"
+
+msgid "custom"
+msgstr "自定义"
+
+# Hours
+msgid "h"
+msgstr "时"
+
+msgid "interface"
+msgstr "接口"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "分"
+
+msgid "network"
+msgstr "网络"
+
+#~ msgid "Event interface"
+#~ msgstr "事件触发接口"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "在哪个接口启动DDNS脚本进程。"
diff --git a/trunk/package/luci/po/zh_CN/diag_core.po b/trunk/package/luci/po/zh_CN/diag_core.po
new file mode 100644
index 00000000..e857d3d8
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/diag_core.po
@@ -0,0 +1,36 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-05 14:39+0200\n"
+"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "配置诊断"
+
+msgid "Diagnostics"
+msgstr "诊断"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr "可用的诊断依赖于设备上已经安装的诊断模块"
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr "下面的条目可以诊断测试系统，为排除故障提供信息"
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr "在这里可以配置网络诊断，例如：扫描网络设备，进行ping测试等。"
+
+#~ msgid "l_d_diag"
+#~ msgstr "l_d诊断"
diff --git a/trunk/package/luci/po/zh_CN/diag_devinfo.po b/trunk/package/luci/po/zh_CN/diag_devinfo.po
new file mode 100644
index 00000000..fe4d2415
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/diag_devinfo.po
@@ -0,0 +1,210 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-10 05:33+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "动作"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "Beginning of MAC address range"
+msgstr "MAC起始地址"
+
+msgid "Config Phone Scan"
+msgstr "配置话机识别参数"
+
+msgid "Configure"
+msgstr "配置"
+
+msgid "Configure Scans"
+msgstr "识别参数配置"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr "配置识别指定网络上设备的过程参数。减小'​​超时时长'，'重复次数'，和/或“休眠请求”可加快识别过程，但也可能因此导致识别一些设备会失败。"
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"配置识别指定网络上SIP设备的过程参数。降低'​​超时时长'，'重复次数'，和/或“休眠请求”可加快识别过程，但也可能因此导致识别一些设备会失败。"
+
+msgid "Delete"
+msgstr "删除"
+
+msgid "Device Scan Config"
+msgstr "设备识别参数配置"
+
+msgid "Device Type"
+msgstr "设备类型"
+
+msgid "Devices discovered for"
+msgstr "对发现​​的设备"
+
+msgid "Devices on Network"
+msgstr "网络上的设备"
+
+msgid "Edit"
+msgstr "编辑"
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "End of MAC address range"
+msgstr "MAC地址段结束"
+
+msgid "Go to relevant configuration page"
+msgstr "相关配置页面"
+
+msgid "IP Address"
+msgstr "IP地址"
+
+msgid "Interface"
+msgstr "接口"
+
+msgid "Invalid"
+msgstr "不合法"
+
+msgid "Link to Device"
+msgstr "连接到设备"
+
+msgid "MAC Address"
+msgstr "MAC地址"
+
+msgid "MAC Device Info Overrides"
+msgstr "覆盖MAC设备信息"
+
+msgid "MAC Device Override"
+msgstr "覆盖MAC设备"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr "MAC范围和使用信息覆盖系统和IEEE数据库"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "两次请求间睡眠毫秒数（默认为100）"
+
+msgid "Model"
+msgstr "型号"
+
+msgid "Name"
+msgstr "名字"
+
+msgid "Network Device Scan"
+msgstr "识别网络设备"
+
+msgid "Network Device Scanning Configuration"
+msgstr "网络设备识别参数"
+
+msgid "Networks to scan for devices"
+msgstr "网络识别设备"
+
+msgid "Networks to scan for supported devices"
+msgstr "网络识别支持的设备"
+
+msgid "No SIP devices"
+msgstr "无SIP设备"
+
+msgid "No devices detected"
+msgstr "没有识别到设备"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "发送请求次数（默认为1）"
+
+msgid "OUI Owner"
+msgstr "OUI所有者"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr "返回指定MAC地址范围内覆盖MAC设备信息脚本(mac-to-devinfo)的信息。"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "执行识别过程（这可能需要几分钟）"
+
+msgid "Phone Information"
+msgstr "话机信息"
+
+msgid "Phone Scan"
+msgstr "识别话机"
+
+msgid "Phone Scanning Configuration"
+msgstr "话机识别过程参数"
+
+msgid "Phones"
+msgstr "话机"
+
+msgid "Ports"
+msgstr "端口"
+
+msgid "Raw"
+msgstr "原始数据"
+
+msgid "Repeat Count"
+msgstr "重复次数"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "重复识别（这可能需要几分钟）"
+
+msgid "SIP Device Information"
+msgstr "SIP设备信息"
+
+msgid "SIP Device Scan"
+msgstr "SIP设备识别"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "SIP设备识别过程参数配置"
+
+msgid "SIP Devices on Network"
+msgstr "在线的SIP设备"
+
+msgid "SIP devices discovered for"
+msgstr "发掘SIP设备"
+
+msgid "Scan for devices on specified networks."
+msgstr "在指定网络上识别设备"
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "在指定网络上识别SIP设备"
+
+msgid "Scanning Configuration"
+msgstr "识别过程配置"
+
+msgid "Scans for devices on specified networks."
+msgstr "识别指定网络上的设备"
+
+msgid "Sleep Between Requests"
+msgstr "请求间等待间隙"
+
+msgid "Subnet"
+msgstr "子网"
+
+msgid "This section contains no values yet"
+msgstr "这部分任然不包含的值"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "等待响应秒数（默认10）"
+
+msgid "Timeout"
+msgstr "超时"
+
+msgid "Use Configuration"
+msgstr "使用配置"
+
+msgid "Vendor"
+msgstr "厂商"
+
+msgid "check other networks"
+msgstr "检查其他网络"
diff --git a/trunk/package/luci/po/zh_CN/ffwizard.po b/trunk/package/luci/po/zh_CN/ffwizard.po
new file mode 100644
index 00000000..c704013b
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/ffwizard.po
@@ -0,0 +1,166 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-01-02 13:09+0200\n"
+"Last-Translator: Jonir <peterpuyi@live.cn>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "允许传输这个节点的匿名统计资料"
+
+msgid "Channel"
+msgstr "通道"
+
+# “访问”是擅自加的，以使语句通顺。
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "勾选此项，以阻止其他节点或客户端的访问"
+
+msgid "Configure network"
+msgstr "配置网络"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "从internet上其他节点通过隧道连接到你的节点"
+
+msgid "DHCP IP range"
+msgstr "DHCP IP地址区间"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP自动分配IP地址给客户端"
+
+msgid "DNS Server"
+msgstr "DNS服务"
+
+msgid "Enable DHCP"
+msgstr "启动DHCP"
+
+msgid "Gateway"
+msgstr "网关"
+
+msgid "Heartbeat"
+msgstr "心跳"
+
+msgid "IP address"
+msgstr "IP地址"
+
+msgid "L2gvpn tunnel"
+msgstr "L2gvpn 隧道"
+
+msgid "Limit download bandwidth"
+msgstr "限制下载带宽"
+
+msgid "Limit upload bandwidth"
+msgstr "限制上传带宽"
+
+msgid "Mesh IP address"
+msgstr "Mesh IP地址"
+
+msgid "Mesh IPv6 Address"
+msgstr "Mesh IPv6地址"
+
+msgid "Netmask"
+msgstr "网络掩码"
+
+msgid "Password"
+msgstr "密码"
+
+msgid "Password confirmation"
+msgstr "密码确认"
+
+msgid "Password successfully changed"
+msgstr "密码修改成功"
+
+msgid "Protect LAN"
+msgstr "局域网保护"
+
+msgid "Protocol"
+msgstr "协议"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "选取此勾选框以配置你的网络接口"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr "选择这个选项以允许他人通过你的连接来接入互联网"
+
+msgid "Share your internet connection"
+msgstr "共享你的互联网连接"
+
+# 抛砖引玉，求修正。
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr "客户端从IP地址区间中分配地址。如果这个区间是网格网区间的子区间，他将被声明为HNA。其他子区间则使用NAT。如果它置空，默认将采用社区档案。"
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "自动计算IPv6地址"
+
+msgid "The protocol to use for internet connectivity."
+msgstr "用于互联网连接的协议"
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr "这是网格中的唯一地址，必须注册到你的本地社区。"
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr "在AP模式下，这将新建一个虚拟无线接口"
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr "本向导将帮你针对Freifunk或者其他类似的无线社区网络来配置你的路由器"
+
+msgid "Unknown Error"
+msgstr "未知错误"
+
+msgid "Username"
+msgstr "用户名"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "虚拟接入点(VAP)"
+
+msgid "Wizard"
+msgstr "向导"
+
+# neighbouring nodes不知道怎么翻译最好，请指教
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "你的设备必须与邻接节点使用相同的信道。"
+
+# 术语，不译
+msgid "dhcp"
+msgstr "DHCP"
+
+msgid "kbit/s"
+msgstr "千比特/秒"
+
+msgid "static"
+msgstr "静态"
+
+msgid "Configure this interface."
+msgstr "配置此接口"
+
+msgid "recommended"
+msgstr "建议"
+
+msgid "Basic settings"
+msgstr "基本设置"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "基本不完整，请到"
+
+msgid "Error"
+msgstr "错误"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr "你无法使用向导，因为缺失一些必要参数"
+
+msgid "and fill out all required fields."
+msgstr "填写所有要求的字段"
diff --git a/trunk/package/luci/po/zh_CN/firewall.po b/trunk/package/luci/po/zh_CN/firewall.po
new file mode 100644
index 00000000..03c1b003
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/firewall.po
@@ -0,0 +1,589 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-30 17:00+0200\n"
+"PO-Revision-Date: 2014-06-14 18:05+0200\n"
+"Last-Translator: jame-he <755085131@qq.com>\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s 位于 %s"
+
+msgid "%s%s with %s"
+msgstr "%s%s 和 %s"
+
+msgid "%s, %s in %s"
+msgstr "%s, %s 位于 %s"
+
+msgid "(Unnamed Entry)"
+msgstr "(未命名条目)"
+
+msgid "(Unnamed Rule)"
+msgstr "(未命名规则)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(未命名SNAT)"
+
+msgid "-- Please choose --"
+msgstr "-- 请选择 --"
+
+msgid "-- custom --"
+msgstr "-- 自定义 --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> 包.每 <var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> 包. 每 <var>%s</var>, 突发 <var>%d</var> 包."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> 并且限制到 %s"
+
+msgid "Action"
+msgstr "动作"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "Add and edit..."
+msgstr "添加并编辑..."
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "允许从<em>源区域</em>转发"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "允许转发到<em>目标区域</em>"
+
+msgid "Any"
+msgstr "任何"
+
+msgid "Covered networks"
+msgstr "覆盖网络"
+
+msgid "Custom Rules"
+msgstr "自定义规则"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"自定义规则允许运行一些防火墙没有包含的功能。这些命令将在每次重启防火墙时，在"
+"默认的规则运行后立即执行。"
+
+msgid "Destination IP address"
+msgstr "目标IP地址"
+
+msgid "Destination address"
+msgstr "目标地址"
+
+msgid "Destination port"
+msgstr "目标端口"
+
+msgid "Destination zone"
+msgstr "目标区域"
+
+msgid "Do not rewrite"
+msgstr "不填写=（所有端口）"
+
+msgid "Drop invalid packets"
+msgstr "丢弃无效数据包"
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Enable NAT Loopback"
+msgstr "启用NAT环回"
+
+msgid "Enable SYN-flood protection"
+msgstr "启用SYN-flood防御"
+
+msgid "Enable logging on this zone"
+msgstr "在此区域允许进入"
+
+msgid "External IP address"
+msgstr "外部IP地址"
+
+msgid "External port"
+msgstr "外部端口"
+
+msgid "External zone"
+msgstr "外部区域"
+
+msgid "Extra arguments"
+msgstr "附加参数"
+
+msgid "Firewall"
+msgstr "防火墙"
+
+msgid "Firewall - Custom Rules"
+msgstr "防火墙 - 自定义规则"
+
+msgid "Firewall - Port Forwards"
+msgstr "防火墙 - 端口转发"
+
+msgid "Firewall - Traffic Rules"
+msgstr "防火墙 - 通信规则"
+
+msgid "Firewall - Zone Settings"
+msgstr "防火墙-区域设置"
+
+msgid "Force connection tracking"
+msgstr "强制连接追踪"
+
+msgid "Forward"
+msgstr "转发"
+
+msgid "Forward to"
+msgstr "转发到"
+
+msgid "From %s in %s"
+msgstr "来自 %s 位于 %s"
+
+msgid "From %s in %s with source %s"
+msgstr "来自 %s 位于 %s 带源 %s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "来自 %s 位于 %s 带源 %s 并且 %s"
+
+msgid "General Settings"
+msgstr "基本设置"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 和 IPv6"
+
+msgid "IPv4 only"
+msgstr "仅IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "仅IPv6"
+
+msgid "Input"
+msgstr "入站数据"
+
+msgid "Inter-Zone Forwarding"
+msgstr "端口触发"
+
+msgid "Internal IP address"
+msgstr "内部IP地址"
+
+msgid "Internal port"
+msgstr "内部端口"
+
+msgid "Internal zone"
+msgstr "内部区域"
+
+msgid "Limit log messages"
+msgstr "限制日志信息"
+
+msgid "MSS clamping"
+msgstr "MSS钳制"
+
+msgid "Masquerading"
+msgstr "IP动态伪装"
+
+msgid "Match"
+msgstr "匹配规则"
+
+msgid "Match ICMP type"
+msgstr "匹配ICMP类型"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "需要匹配转发流量到的目标端口或端口范围"
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr "需要匹配入站流量到的目标端口或端口范围"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr "需要匹配入站流量的源端口或端口范围"
+
+msgid "Name"
+msgstr "名字"
+
+msgid "New SNAT rule"
+msgstr "新建SNAT规则"
+
+msgid "New forward rule"
+msgstr "新建转发规则"
+
+msgid "New input rule"
+msgstr "新建进入规则"
+
+msgid "New port forward"
+msgstr "新建端口转发"
+
+msgid "New source NAT"
+msgstr "新建Source NAT"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "需要匹配入站流量的源IP"
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "需要匹配入站流量的源MACs（可以为多个）"
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "需要匹配入站流量的源IP或IP范围"
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr "需要匹配入站流量的源端口或端口范围"
+
+msgid "Open ports on router"
+msgstr "打开路由器端口"
+
+msgid "Other..."
+msgstr "其它..."
+
+msgid "Output"
+msgstr "出站数据"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "传递到iptables的额外参数。小心使用！"
+
+msgid "Port Forwards"
+msgstr "端口转发"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr "端口转发允许来自Internet的计算机访问私有局域网内的计算机或服务"
+
+msgid "Protocol"
+msgstr "协议"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr "重定向匹配的入站流量到内部主机的端口"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "重定向匹配的入站流量到的内部主机"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "要限制IP动态伪装的目标子网"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "要限制IP动态伪装的源子网"
+
+msgid "Restrict to address family"
+msgstr "限制地址"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "将匹配流量的源地址改写成指定地址"
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr "将匹配流量的源端口改写成指定端口。也可以留空，只改写IP地址。"
+
+msgid "Rewrite to source %s"
+msgstr "源地址改写成 %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "源地址改写成 %s, %s"
+
+msgid "SNAT IP address"
+msgstr "SNAT IP地址"
+
+msgid "SNAT port"
+msgstr "SNAT 端口"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Traffic Redirection"
+# msgstr ""
+#
+# msgid ""
+# "Traffic redirection allows you to change the destination address of "
+# "forwarded packets."
+# msgstr ""
+#
+# msgid "Overview"
+# msgstr ""
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Source zone"
+# msgstr ""
+#
+# msgid "Source MAC-address"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+msgid "Source IP address"
+msgstr "源IP地址"
+
+msgid "Source MAC address"
+msgstr "源MAC地址"
+
+msgid "Source NAT"
+msgstr "Source NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Source NAT是一种特殊形式的封包伪装，它允许精细的控制传出流量的源IP，例如，将"
+"多个WAN地址映射到内部子网。"
+
+msgid "Source address"
+msgstr "源地址"
+
+msgid "Source port"
+msgstr "源端口"
+
+msgid "Source zone"
+msgstr "源区域"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr "防火墙把网络接口分为不同的区域进行管理"
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"以下选项可以控制区域(%s)和其它区域间的转发规则。 <em>目标区域</em>接收"
+"<strong>从%q</strong>转发的流量。<em>源区域</em>匹配从<strong>目标为%q</"
+"strong>的区域的需转发流量。以下规则<em>无法转发</em>,例如：转发lan流量到wan，"
+"但是<em>不允许</em>从wan转发到lan。"
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr "本页面可以更改端口转发的高级设置。大多数情况下，不需要更改这些设置。"
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr "本页面可以更改通信规则的高级设置，比如：需匹配的源主机和目标主机。"
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"本节定义 %q 的通用属性， <em>入站数据</em> 和 <em>出站数据</em>规则用于设置数"
+"据包“进”和“出”路由器（某个接口）默认的转发原则，<em>转发</em>规则用于特定（一"
+"个或多个）区域的不同子网之间的数据包转发。<em>覆盖网络</em>选择从属于这个区域"
+"的网络。"
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "到 %s at %s 位于<var>本设备</var>"
+
+msgid "To %s in %s"
+msgstr "到 %s 位于 %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "到 %s 位于<var>本设备</var>"
+
+msgid "To %s, %s in %s"
+msgstr "到 %s, %s 位于 %s"
+
+msgid "To source IP"
+msgstr "到源IP"
+
+msgid "To source port"
+msgstr "到源端口"
+
+msgid "Traffic Rules"
+msgstr "通信规则"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"通信规则定义了不同区域间的流量传送，例如：拒绝一些主机之间的通信、打开到WAN的"
+"端口。"
+
+msgid "Via %s"
+msgstr "通过 %s"
+
+msgid "Via %s at %s"
+msgstr "通过 %s at %s"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr "你也可以选择“--自定义--”来定义多个协议，在多个协议间需加空格。"
+
+msgid "Zone %q"
+msgstr "区域 %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "区域 ⇒ 转发"
+
+msgid "Zones"
+msgstr "区域"
+
+msgid "accept"
+msgstr "接受"
+
+msgid "any"
+msgstr "所有"
+
+msgid "any host"
+msgstr "所有主机"
+
+msgid "any router IP"
+msgstr "所有路由地址"
+
+msgid "any zone"
+msgstr "所有区域"
+
+msgid "don't track"
+msgstr "无动作"
+
+msgid "drop"
+msgstr "丢弃"
+
+msgid "reject"
+msgstr "拒绝"
+
+msgid "traffic"
+msgstr "交通"
+
+#~ msgid "Destination"
+#~ msgstr "目标"
+
+#~ msgid "Family"
+#~ msgstr "地址集合"
+
+#~ msgid "Forward to %s in %s"
+#~ msgstr "转发到 %s 位于 %s"
+
+#~ msgid "Forward to %s, %s in %s"
+#~ msgstr "转发到 %s, %s 位于 %s"
+
+#~ msgid "Source"
+#~ msgstr "源"
+
+#~ msgid "Via"
+#~ msgstr "通过"
+
+#~ msgid "Disable"
+#~ msgstr "禁用"
+
+#~ msgid "Do not track forward"
+#~ msgstr "不要追踪转发"
+
+#~ msgid "Do not track input"
+#~ msgstr "不要追踪进入"
+
+#~ msgid "IP"
+#~ msgstr "IP"
+
+#~ msgid "IP range"
+#~ msgstr "IP范围"
+
+#~ msgid "(optional)"
+#~ msgstr "（可选）"
+
+#~ msgid "Intended destination address"
+#~ msgstr "目标地址"
+
+#~ msgid "Internal port (optional)"
+#~ msgstr "内部端口（可选）"
+
+#~ msgid "Advanced Options"
+#~ msgstr "高级选项"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "高级规则"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "高级规则允许按需定制防火墙。此规则只限制新建立的连接，对于已建立链路的数据"
+#~ "包会自动允许通过。"
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "自定义规则(/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "设备"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "DNAT：将目标地址转换为指定的IP地址；SNAT：将源地址转换为指定的IP地址。"
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr "在客户端上，比较输入通道与给定的源端口是否一致。"
+
+#~ msgid "Overview"
+#~ msgstr "概览"
+
+#~ msgid "Port forwarding"
+#~ msgstr "端口转发"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr "端口转发-允许外部网络访问内部网络"
+
+#~ msgid "Redirection type"
+#~ msgstr "重定向类型"
+
+#~ msgid "Redirections"
+#~ msgstr "重定向"
+
+#~ msgid "Rules"
+#~ msgstr "规则"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "流量重定向"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr "流量重定向允许你修改数据包转发地址"
+
+#~ msgid "Zone"
+#~ msgstr "区"
+
+#~ msgid "MASQ"
+#~ msgstr "MASQ"
diff --git a/trunk/package/luci/po/zh_CN/freifunk-policyrouting.po b/trunk/package/luci/po/zh_CN/freifunk-policyrouting.po
new file mode 100644
index 00000000..ff0aabc3
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/freifunk-policyrouting.po
@@ -0,0 +1,57 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-09 03:50+0200\n"
+"PO-Revision-Date: 2013-10-09 04:04+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr "所有流量属于这个mesh网络区域的数据流都将通过网关来发送。"
+
+msgid "Enable Policy Routing"
+msgstr "启用策略路由"
+
+msgid "Fallback to mesh"
+msgstr "mesh后备"
+
+msgid "Firewall zones"
+msgstr "防火墙区域"
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+"如果没有缺省的mesh网络路由，则使用属于防火墙区域内的Internet连接作为备用路由。如果你不想要这个，而是阻止该流量，那么你应该选择此选项。"
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr "如果您自己的网关不可用，则退回到mesh默认网关。"
+
+msgid "Policy Routing"
+msgstr "策略路由"
+
+msgid "Strict Filtering"
+msgstr "严格过滤"
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
+"这些页面用于某些防火墙区域设置策略路由。这是非常有用的，如果你需要自己使用自己的互联网连接，但你不想把它分享给其他人（这就是为什么它也被称为“自我模式'"
+"）。你自己的流量，通过你的互联网连接发送，而mesh中的数据包将使用mesh中另外的网关。"
diff --git a/trunk/package/luci/po/zh_CN/freifunk.po b/trunk/package/luci/po/zh_CN/freifunk.po
new file mode 100644
index 00000000..213058d2
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/freifunk.po
@@ -0,0 +1,403 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-06-22 14:33+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Bad (ETX > 10)"
+msgstr "错误（ETX>10）"
+
+msgid "Basic Settings"
+msgstr "基础设置"
+
+msgid "Basic settings"
+msgstr "基础设置"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "基础设置不完整，请转到"
+
+msgid "Basic system settings"
+msgstr "基础系统设置"
+
+msgid "Bitrate"
+msgstr "速率"
+
+msgid "Channel"
+msgstr "频道"
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr "检查新的固件版本并自动升级。"
+
+msgid "Client network size"
+msgstr "客户端网络容量"
+
+msgid "Community"
+msgstr "群组"
+
+msgid "Community profile"
+msgstr "群组配置文件"
+
+msgid "Community settings"
+msgstr "群组设置"
+
+msgid "Confirm Upgrade"
+msgstr "确认升级"
+
+msgid "Contact"
+msgstr "联系人"
+
+msgid "Contact information is incomplete. Please go to"
+msgstr "联系人信息不全。请继续填写"
+
+msgid "Coordinates"
+msgstr "位置"
+
+msgid "Country code"
+msgstr "国家代码"
+
+msgid "Default routes"
+msgstr "缺省路由"
+
+msgid "Disable default content"
+msgstr "禁用默认内容"
+
+msgid "Diversity is enabled for device"
+msgstr "启用多重设备"
+
+msgid "E-Mail"
+msgstr "电子邮件"
+
+msgid "ESSID"
+msgstr "ESSID"
+
+msgid "Edit index page"
+msgstr "编辑索引页"
+
+msgid "Enable IPv6"
+msgstr "启用IPv6"
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr "启用一个虚拟接入点（如果可以的话）"
+
+msgid "Error"
+msgstr "错误"
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr "使用OpenStreetMap查找位置坐标"
+
+msgid "Freifunk"
+msgstr "Freifunk"
+
+msgid "Freifunk Overview"
+msgstr "Freifunk简介"
+
+msgid "Freifunk Remote Update"
+msgstr "Freifunk远程更新"
+
+msgid "Gateway"
+msgstr "网关"
+
+msgid "Go to"
+msgstr "去"
+
+msgid "Good (2 < ETX < 4)"
+msgstr "好（2<ETX<4）"
+
+msgid "Green"
+msgstr "绿色"
+
+msgid "Hello and welcome in the network of"
+msgstr "您好，欢迎加入网络"
+
+msgid "Hide OpenStreetMap"
+msgstr "隐藏OpenStreetMap"
+
+msgid "Homepage"
+msgstr "主页"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "IPv6 Config"
+msgstr "IPv6设置"
+
+msgid "IPv6 Prefix"
+msgstr "IPv6前缀"
+
+msgid "IPv6 network in CIDR notation."
+msgstr "CIDR表示法的IPv6网络。"
+
+msgid "If selected then the default content element is not shown."
+msgstr "如果选中，那么默认内容元素将不显示。"
+
+msgid "If you are interested in our project then contact the local community"
+msgstr "如果你对我们的项目感兴趣，请联系当地的社区"
+
+msgid "Index Page"
+msgstr "索引页"
+
+msgid "Interface"
+msgstr "接口"
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+"访问因特网取决于技术和机构的前提，可能会、也可能不会像你设想的那样运作。"
+
+msgid "It is operated by"
+msgstr "它是由"
+
+msgid "Keep configuration"
+msgstr "保留配置"
+
+msgid "Latitude"
+msgstr "纬度"
+
+msgid "Legend"
+msgstr "铭文"
+
+msgid "Load"
+msgstr "加载"
+
+msgid "Local Time"
+msgstr "本地时间"
+
+msgid "Location"
+msgstr "所在位置"
+
+msgid "Longitude"
+msgstr "经度"
+
+msgid "Map"
+msgstr "地图定位"
+
+msgid "Map Error"
+msgstr "定位出错"
+
+msgid "Memory"
+msgstr "内存"
+
+msgid "Mesh prefix"
+msgstr "Mesh前缀"
+
+msgid "Metric"
+msgstr "度量单位"
+
+msgid "Mode"
+msgstr "模式"
+
+msgid "Network"
+msgstr "网络"
+
+msgid "Network for client DHCP addresses"
+msgstr "客户端DHCP地址"
+
+msgid "Nickname"
+msgstr "昵称"
+
+msgid "No default routes known."
+msgstr "没有缺省路由"
+
+msgid "Notice"
+msgstr "注意"
+
+msgid "OLSR"
+msgstr "OLSR"
+
+msgid "Operator"
+msgstr "操作者"
+
+msgid "Orange"
+msgstr "橙色"
+
+msgid "Overview"
+msgstr "概要"
+
+msgid "Package libiwinfo required!"
+msgstr "需要libiwinfo包！"
+
+msgid "Phone"
+msgstr "电话"
+
+msgid "Please fill in your contact details below."
+msgstr "请填写下列联系信息"
+
+msgid "Please set your contact information"
+msgstr "请提供联系信息"
+
+msgid "Power"
+msgstr "电源"
+
+msgid "Processor"
+msgstr "处理器"
+
+msgid "Profile"
+msgstr "概要"
+
+msgid "Profile (Expert)"
+msgstr "概要（专家）"
+
+msgid "Realname"
+msgstr "真实姓名"
+
+msgid "Red"
+msgstr "红色"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr "在地图上用鼠标点出您的位置。需要连接到互联网地图。"
+
+msgid "Show OpenStreetMap"
+msgstr "显示OpenStreetMap"
+
+msgid "Show on map"
+msgstr "地图上显示"
+
+msgid "Signal"
+msgstr "信号"
+
+msgid "Splash"
+msgstr "公示"
+
+msgid "Start Upgrade"
+msgstr "开始升级"
+
+msgid "Statistics"
+msgstr "统计"
+
+msgid "Status"
+msgstr "状态"
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr "一直可用（4<ETX<10）"
+
+msgid "System"
+msgstr "系统"
+
+msgid "TX"
+msgstr "TX"
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr "<em> libiwinfo </ em>包没有安装。进行无线配置您必须安装此组件！"
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+"没有配置OLSRd从网络获取位置数据。<br />请确保正确配置域名服务插件，且<em> "
+"latlon_file </ em>选项被启用。"
+
+msgid "The installed firmware is the most recent version."
+msgstr "所安装固件为最新版本。"
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+"这些基本设置为您本地的无线社区。这些设置定义为向导默认值并不会影响路由器的实"
+"际配置。"
+
+msgid "These are the settings of your local community."
+msgstr "当地社区设置。"
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr "这些页面将帮助你设置路由器Freifunk或类似的无线社区网络。"
+
+msgid "This is the access point"
+msgstr "AP"
+
+msgid "Update Settings"
+msgstr "升级设置"
+
+msgid "Update available!"
+msgstr "可用更新！"
+
+msgid "Uptime"
+msgstr "正常运行时间"
+
+msgid "VAP"
+msgstr "VAP"
+
+msgid "Verify downloaded images"
+msgstr "校验下载的镜像包"
+
+msgid "Very good (ETX < 2)"
+msgstr "非常好（ETX<2）"
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr "我们倡议建立一个自由，独立和开放的无线mesh网络。"
+
+msgid "Wireless Overview"
+msgstr "无线概要"
+
+msgid "Yellow"
+msgstr "黄色"
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+"可以显示更多的内容，对公众的索引页下面的表格中插入有效的XHTML。<br />标题应放"
+"在&lt;H2&gt;和&lt;/ H2&gt;中"
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr "你可以找到更多有关全球Freifunk活动的信息"
+
+msgid "You can manually edit the selected community profile here."
+msgstr "您可以在这里手动编辑所选社区配置文件。"
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr "编辑它之前，你需要选择一个配置文件。选择配置文件"
+
+msgid "and fill out all required fields."
+msgstr "填写所有必填字段。"
+
+msgid "buffered"
+msgstr "已缓存"
+
+msgid "cached"
+msgstr "已暂存"
+
+msgid "e.g."
+msgstr "例如："
+
+msgid "free"
+msgstr "空闲"
+
+msgid "to disable it."
+msgstr "禁用它。"
+
+msgid "used"
+msgstr "占用"
+
+msgid "wireless settings"
+msgstr "无线设置"
diff --git a/trunk/package/luci/po/zh_CN/hd_idle.po b/trunk/package/luci/po/zh_CN/hd_idle.po
new file mode 100644
index 00000000..cb3dccd3
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/hd_idle.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 10:33+0200\n"
+"PO-Revision-Date: 2012-09-03 17:57+0200\n"
+"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
+"Language-Team: QQ Group:75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "硬盘"
+
+msgid "Enable"
+msgstr "开启"
+
+msgid "Enable debug"
+msgstr "开启调试"
+
+msgid "Idle-time"
+msgstr "空闲时间"
+
+msgid "Idle-time unit"
+msgstr "空闲时间单位"
+
+msgid "Settings"
+msgstr "设置"
+
+# Hours
+msgid "h"
+msgstr "小时"
+
+msgid "hd-idle"
+msgstr "硬盘休眠"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr "硬盘休眠是一个让硬盘在空闲一段时间后休眠的工具"
+
+# Minutes (not minimum)
+msgid "min"
+msgstr "分钟"
diff --git a/trunk/package/luci/po/zh_CN/meshwizard.po b/trunk/package/luci/po/zh_CN/meshwizard.po
new file mode 100644
index 00000000..d5d0707f
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/meshwizard.po
@@ -0,0 +1,126 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-24 18:01+0200\n"
+"PO-Revision-Date: 2014-03-25 04:25+0200\n"
+"Last-Translator: hewenhao <hewenhao2008@sina.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr "启用或停用全球IPv6设置"
+
+msgid "Channel"
+msgstr "频道"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "选择此项，隔离其他节点或客户端的攻击来保护你的局域网"
+
+msgid "Cleanup config"
+msgstr "清空配置"
+
+msgid "Configure this interface"
+msgstr "配置当前界面"
+
+msgid "DHCP IP range"
+msgstr "DHCP IP 范围"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP将自动给客户端分配IP地址"
+
+msgid "Enable DHCP"
+msgstr "启动DHCP"
+
+msgid "Enable RA"
+msgstr "启用RA"
+
+msgid "Enabled"
+msgstr "启用"
+
+msgid "General Settings"
+msgstr "总体设置"
+
+msgid "IPv6 Settings"
+msgstr "IPv6设置"
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr "如果此项被选中，在设置新选项之前，配置将被清空。"
+
+msgid "Interfaces"
+msgstr "界面"
+
+msgid "Mesh IP address"
+msgstr "Mesh IP 地址"
+
+msgid "Mesh IPv6 address"
+msgstr "Mesh IPv6地址"
+
+msgid "Mesh Wizard"
+msgstr "Mesh 导引"
+
+#, fuzzy
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr "注意：这将为mesh操作建立一个接口，如:增加到‘freifunk’区域并使能olsr"
+
+msgid "Protect LAN"
+msgstr "保护LAN口"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr "选择这项来允许其它程序用你这个连接来接入因特网"
+
+#, fuzzy
+msgid "Send router advertisements on this device."
+msgstr "在这个设备上发送路由广播"
+
+msgid "Share your internet connection"
+msgstr "分享你的Internet连接"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr "这将会在接入点模式设置一个新的虚拟无线网络接口"
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr "虚拟接入点"
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr "推荐"
diff --git a/trunk/package/luci/po/zh_CN/minidlna.po b/trunk/package/luci/po/zh_CN/minidlna.po
new file mode 100644
index 00000000..99897568
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/minidlna.po
@@ -0,0 +1,172 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-07 16:21+0200\n"
+"Last-Translator: qiuchengxuan <qiuchengxuan@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Album art names:"
+msgstr "专辑封面名称："
+
+msgid "Announced model number:"
+msgstr "通告型号："
+
+msgid "Announced serial number:"
+msgstr "通告编号："
+
+msgid "Browse directory"
+msgstr "浏览目录"
+
+msgid "Collecting data..."
+msgstr "收集数据..."
+
+msgid "Database directory:"
+msgstr "数据库目录："
+
+msgid "Enable TIVO:"
+msgstr "启用TIVO："
+
+msgid "Enable inotify:"
+msgstr "启用inotify："
+
+msgid "Enable:"
+msgstr "启用："
+
+msgid "Friendly name:"
+msgstr "友好名称："
+
+msgid "General Settings"
+msgstr "基本设置"
+
+msgid "Interfaces:"
+msgstr "接口："
+
+msgid "Log directory:"
+msgstr "日志目录："
+
+msgid "Media directories:"
+msgstr "媒体目录："
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr "MiniDLNA是目标为完全兼容DLNA / UPnP-AV客户端的服务器软件。"
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr "miniDLNA守护程序将在其XML描述中向客户端通告型号。"
+
+msgid "Music"
+msgstr "音乐"
+
+msgid "Network interfaces to serve."
+msgstr "服务的网络接口。"
+
+msgid "Notify interval in seconds."
+msgstr "通知的时间间隔，以秒为单位。"
+
+msgid "Notify interval:"
+msgstr "通知的时间间隔："
+
+msgid "Pictures"
+msgstr "图片"
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+
+msgid "Port:"
+msgstr "端口："
+
+msgid "Presentation URL:"
+msgstr "服务网址"
+
+msgid "Root container:"
+msgstr "根目录："
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr "miniDLNA守护程序将在其XML描述中向客户端通告编号。"
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr "设置自定义名称。"
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr "设置miniDLNA缓存目录"
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr "设置miniDLNA日志目录"
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr "设定启用inotify监控，自动发现新的文件。"
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr "为HMO TiVo启用JPG和MP3流媒体支持。"
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+"设定严格遵守DLNA标准。这将允许服务器端降小大尺寸JPEG图像，在（至少）索尼DLNA"
+"的产品这可能会降低JPEG服务性能。"
+
+# 如果写成media_dir=A,/mnt/media/Music，uci会报错。实际上应该是A,/mnt/media/Music，这样生成的minidlna.conf刚好是media_dir=A,/mnt/media/Music
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+"设置要扫描的目录。如果你想限制特定内容类型的目录，你可以在前面加上类型（用于音频'A'，'V'视频，'P'图片），其次是用逗号分隔的目录（如A,/mnt"
+"/媒体/音乐）。可以指定多个目录。"
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr "指定MiniSSDPd socket的路径。"
+
+msgid "Standard container"
+msgstr "基本目录"
+
+msgid "Strict to DLNA standard:"
+msgstr "严格的DLNA标准："
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr "miniDLNA服务已启用，提供 %d 音频, %d 视频 和 %d 图片."
+
+msgid "The miniDLNA service is not running."
+msgstr "miniDLNA服务未启用"
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr "这是一个文件名列表，为搜索专辑封面。"
+
+msgid "Video"
+msgstr "视频"
+
+msgid "miniDLNA"
+msgstr "miniDLNA"
+
+msgid "miniDLNA Status"
+msgstr "miniDLNA 状态"
+
+msgid "miniSSDP socket:"
+msgstr "miniSSDP socket："
diff --git a/trunk/package/luci/po/zh_CN/mmc_over_gpio.po b/trunk/package/luci/po/zh_CN/mmc_over_gpio.po
new file mode 100644
index 00000000..27dcefda
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/mmc_over_gpio.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2013-10-08 15:25+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK针脚"
+
+msgid "CS_pin"
+msgstr "CS针脚"
+
+msgid "DI_pin"
+msgstr "DI针脚"
+
+msgid "DO_pin"
+msgstr "DO针脚"
+
+msgid "Enable"
+msgstr "允许"
+
+msgid "MMC/SD driver configuration"
+msgstr "MMC/SD驱动配置"
+
+msgid "Mode"
+msgstr "模式"
+
+msgid "Name"
+msgstr "名称"
+
+msgid "Settings"
+msgstr "设置"
diff --git a/trunk/package/luci/po/zh_CN/multiwan.po b/trunk/package/luci/po/zh_CN/multiwan.po
new file mode 100644
index 00000000..dfb49587
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/multiwan.po
@@ -0,0 +1,118 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-08 16:16+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "WAN故障转移之前尝试"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "WAN故障恢复之前尝试"
+
+msgid "Auto"
+msgstr "自动"
+
+msgid "Collecting data..."
+msgstr "正在收集数据…"
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr "配置规则引导出站流量通过指定的WAN上行链路。"
+
+msgid "DNS Server(s)"
+msgstr "DNS服务器"
+
+msgid "Default Route"
+msgstr "缺省路由"
+
+msgid "Destination Address"
+msgstr "目的地址"
+
+msgid "Disable"
+msgstr "禁用"
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Failing"
+msgstr "失败"
+
+msgid "Failover Traffic Destination"
+msgstr "故障转移目的地"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "健康状况监测ICMP主机"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "健康状况监测ICMP主机超时"
+
+msgid "Health Monitor Interval"
+msgstr "健康状况监测间隔"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr "健康监视器，检测和修正网络变更和失败的连接。"
+
+msgid "KO"
+msgstr "好"
+
+msgid "Load Balancer Distribution"
+msgstr "负载均衡分布"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "负载平衡器（兼容）"
+
+msgid "Load Balancer(Performance)"
+msgstr "负载平衡器（性能）"
+
+msgid "Multi-WAN"
+msgstr "多WAN"
+
+msgid "Multi-WAN Status"
+msgstr "多WAN状态"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "多WAN流量规则"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr "多WAN允许使用多条上行链路的负载均衡和故障转移。"
+
+msgid "None"
+msgstr "空"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "端口"
+
+msgid "Protocol"
+msgstr "协议"
+
+msgid "Recovering"
+msgstr "恢复"
+
+msgid "Source Address"
+msgstr "源地址"
+
+msgid "Unknown"
+msgstr "未知"
+
+msgid "WAN Interfaces"
+msgstr "WAN接口"
+
+msgid "WAN Uplink"
+msgstr "WAN上联"
+
+msgid "all"
+msgstr "所有"
diff --git a/trunk/package/luci/po/zh_CN/ntpc.po b/trunk/package/luci/po/zh_CN/ntpc.po
new file mode 100644
index 00000000..0821c3f4
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/ntpc.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCi Chinese Translation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-14 13:24+0200\n"
+"PO-Revision-Date: 2012-11-15 21:39+0200\n"
+"Last-Translator: Rui <shenrui01@gmail.com>\n"
+"Language-Team: QQ Group 75543259\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "时钟校对"
+
+msgid "Count of time measurements"
+msgstr "单位时间数"
+
+msgid "Current system time"
+msgstr "当前系统时间"
+
+msgid "General"
+msgstr "基本设置"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "Offset frequency"
+msgstr "偏移量"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Synchronizes the system time"
+msgstr "同步系统时间"
+
+msgid "Time Server"
+msgstr "时间服务器"
+
+msgid "Time Servers"
+msgstr "时间服务器"
+
+msgid "Time Synchronisation"
+msgstr "时间同步"
+
+msgid "Update interval (in seconds)"
+msgstr "更新间隔(秒)"
+
+msgid "empty = infinite"
+msgstr "空值为无限长度"
diff --git a/trunk/package/luci/po/zh_CN/olsr.po b/trunk/package/luci/po/zh_CN/olsr.po
new file mode 100644
index 00000000..37264f58
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/olsr.po
@@ -0,0 +1,696 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-10 20:26+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr ""
+
+msgid "Active OLSR nodes"
+msgstr ""
+
+msgid "Active host net announcements"
+msgstr ""
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Allow gateways with NAT"
+msgstr "允许网关使用NAT"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "允许选定的IPv4通过网关NAT"
+
+msgid "Announce uplink"
+msgstr "广告上行"
+
+msgid "Announced network"
+msgstr "广告网络"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr "两个值必须使用点分十进制表示法。"
+
+msgid "Broadcast address"
+msgstr "广播地址"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "配置"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "显示"
+
+msgid "Downlink"
+msgstr "断线"
+
+msgid "Download Config"
+msgstr "下载配置"
+
+msgid "ETX"
+msgstr "ETX"
+
+msgid "Enable"
+msgstr "允许"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"启用SmartGateway。如果禁用，则SmartGateway其他所有参数将忽略。缺省值：“禁用”"
+
+msgid "Enable this interface."
+msgstr "启用这个端口"
+
+msgid "Enabled"
+msgstr "启用"
+
+msgid "Expected retransmission count"
+msgstr "预期重发数"
+
+msgid "FIB metric"
+msgstr "FIB度量"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr "网关"
+
+msgid "General Settings"
+msgstr "通用设置"
+
+msgid "General settings"
+msgstr "通用设置"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr "HNA"
+
+msgid "HNA Announcements"
+msgstr "HNA公告"
+
+msgid "HNA interval"
+msgstr "HNA间隙"
+
+msgid "HNA validity time"
+msgstr "HNA有效时长"
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "HNA公告"
+
+msgid "Hello"
+msgstr "Hello"
+
+msgid "Hello interval"
+msgstr "Hello间隙"
+
+msgid "Hello validity time"
+msgstr "Hello有效时长"
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr "Hna4"
+
+msgid "Hna6"
+msgstr "Hna6"
+
+msgid "Hops"
+msgstr "è·³"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr "IP地址"
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 broadcast"
+msgstr "IPv4广播地址"
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "HNA公告"
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "设备"
diff --git a/trunk/package/luci/po/zh_CN/openvpn.po b/trunk/package/luci/po/zh_CN/openvpn.po
new file mode 100644
index 00000000..7f22a97c
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/openvpn.po
@@ -0,0 +1,551 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: 2013-10-10 06:09+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s"
+msgstr "%s"
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr "'net30', 'p2p', 或 '子网'"
+
+msgid "Accept options pushed from server"
+msgstr "接受从服务器发送过来的选项"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "Add route after establishing connection"
+msgstr "建立连接后添加路由"
+
+msgid "Additional authentication over TLS"
+msgstr "TLS以外的验证"
+
+msgid "Allow client-to-client traffic"
+msgstr "允许客户端到客户端的通信"
+
+msgid "Allow multiple clients with same certificate"
+msgstr "允许多用户共用同一证书"
+
+msgid "Allow only one session"
+msgstr "只允许一个会话"
+
+msgid "Allow remote to change its IP or port"
+msgstr "允许远程修改ip和端口"
+
+msgid "Allowed maximum of connected clients"
+msgstr "允许最大已连接客户端数"
+
+msgid "Allowed maximum of internal"
+msgstr "允许最大内部连接"
+
+msgid "Allowed maximum of new connections"
+msgstr "允许最大新建连接数"
+
+msgid "Append log to file"
+msgstr "添加日志至文件"
+
+msgid "Authenticate using username/password"
+msgstr "以用户名/密码的方式进行验证"
+
+msgid "Automatically redirect default route"
+msgstr "自动重定向至默认路由"
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr "Openvpn已配置实例及其当前状态列表"
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr "TUN/TAP关闭前关闭命令行及脚本"
+
+msgid "Certificate authority"
+msgstr "认证授权"
+
+msgid "Change process priority"
+msgstr "改变进程优先级"
+
+msgid "Change to directory before initialization"
+msgstr "初始化前改变根目录"
+
+msgid "Check peer certificate against a CRL"
+msgstr "验证客户端证书以确保其是否过期"
+
+msgid "Chroot to directory after initialization"
+msgstr "初始化后改变根目录"
+
+msgid "Client is disabled"
+msgstr "客户端已被禁止"
+
+msgid "Configuration category"
+msgstr "配置分类"
+
+msgid "Configure client mode"
+msgstr "配置客户端模式"
+
+msgid "Configure server bridge"
+msgstr "配置服务器桥接"
+
+msgid "Configure server mode"
+msgstr "配置服务器模式"
+
+msgid "Connect through Socks5 proxy"
+msgstr "通过Sock5代理连接"
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr "通过HTTP代理连接到远程主机"
+
+msgid "Connection retry interval"
+msgstr "连接重试时间间隔"
+
+msgid "Cryptography"
+msgstr "加密"
+
+msgid "Daemonize after initialization"
+msgstr "初始化后进入后台运行"
+
+msgid "Delay n seconds after connection"
+msgstr "连接后延迟时间(秒)"
+
+msgid "Delay tun/tap open and up script execution"
+msgstr "延迟tun/tap的打开并加速脚本执行"
+
+msgid "Diffie Hellman parameters"
+msgstr "Diffie–Hellman/DH密钥交换 参数"
+
+msgid "Directory for custom client config files"
+msgstr "自定义客户端配置文件的目录"
+
+msgid "Disable Paging"
+msgstr "禁止分页"
+
+msgid "Disable cipher initialisation vector"
+msgstr "关闭加密的初始化向量"
+
+msgid "Disable options consistency check"
+msgstr "禁止选项一致性检查"
+
+msgid "Disable replay protection"
+msgstr "关闭重播保护"
+
+msgid "Do not bind to local address and port"
+msgstr "不绑定本地地址和端口"
+
+msgid "Don't actually execute ifconfig"
+msgstr "不实际执行ifconfig命令"
+
+msgid "Don't add routes automatically"
+msgstr "不自动添加路由"
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr "不缓存--askpass 或--auth-user-pass passwords"
+
+msgid "Don't inherit global push options"
+msgstr "不继承全局主动发送选项"
+
+msgid "Don't log timestamps"
+msgstr "不记录时间戳"
+
+msgid "Don't re-read key on restart"
+msgstr "服务重启时不重读密钥值"
+
+msgid "Don't require client certificate"
+msgstr "不需要客户的证书"
+
+msgid "Don't use adaptive lzo compression"
+msgstr "不用自适应的lzo压缩"
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr "ifconfig不一致时不警告"
+
+msgid "Echo parameters to log"
+msgstr "把参数写入日志"
+
+msgid "Empirically measure MTU"
+msgstr "以历史值估算MTU值"
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr "打开OpenSSL硬件加密引擎"
+
+msgid "Enable Path MTU discovery"
+msgstr "启用路径MTU发现"
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr "允许静态密钥加密模式"
+
+msgid "Enable TLS and assume client role"
+msgstr "允许TLS并伪装为客户端"
+
+msgid "Enable TLS and assume server role"
+msgstr "允许TLS并伪装为服务器"
+
+msgid "Enable internal datagram fragmentation"
+msgstr "允许内部数据报分片"
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr "在<em>IP</em> <em>port</em>上启用可管理接口"
+
+msgid "Enabled"
+msgstr "启用"
+
+msgid "Encryption cipher for packets"
+msgstr "加密数据包"
+
+msgid "Execute shell cmd after routes are added"
+msgstr "添加路由后执行shell命令"
+
+msgid "Execute shell command on remote ip change"
+msgstr "当远程ip改变时执行shell命令"
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr "在服务器模式下执行新的客户端连接，当客户端仍然是不可信"
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr "服务器模式下，将每个IPv4地址/路由或MAC地址添加到OpenVPN的内部路由表中。"
+
+msgid "Exit on TLS negotiation failure"
+msgstr "TLS验证失败后退出"
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr "后台运行前从控制的tty中获取PEM密码"
+
+msgid "HMAC authentication for packets"
+msgstr "利用HMAC水印算法校验数据包"
+
+msgid "Handling of authentication failures"
+msgstr "处理验证失败"
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr "在服务配置模式下Helper简明的执行--ping和--ping-restart"
+
+msgid "If hostname resolve fails, retry"
+msgstr "如果主机名解析错误，重试"
+
+msgid "Instance \"%s\""
+msgstr "实例 \"%s\""
+
+msgid "Invalid"
+msgstr "无效"
+
+msgid "Keep local IP address on restart"
+msgstr "服务重启时保持本地IP地址"
+
+msgid "Keep remote IP address on restart"
+msgstr "服务重启时保持远程IP地址"
+
+msgid "Keep tun/tap device open on restart"
+msgstr "服务重启时自动打开 tun/tap 设备"
+
+msgid "Key transition window"
+msgstr "密钥传输滑动窗口"
+
+msgid "Limit repeated log messages"
+msgstr "限制重复性的日志消息"
+
+msgid "Local certificate"
+msgstr "本地证书"
+
+msgid "Local host name or ip address"
+msgstr "本地主机名或ip地址"
+
+msgid "Local private key"
+msgstr "本地私人密钥"
+
+msgid "Major mode"
+msgstr "主要模式"
+
+msgid "Make tun device IPv6 capable"
+msgstr "使 tun 设备兼容IPv6"
+
+msgid "Maximum number of queued TCP output packets"
+msgstr "TCP队列中输出包的最大数量"
+
+msgid "Networking"
+msgstr "网络"
+
+msgid "Number of allocated broadcast buffers"
+msgstr "已分配的广播缓冲区数量"
+
+msgid "Number of lines for log file history"
+msgstr "历史日志文件的行数"
+
+msgid "Only accept connections from given X509 name"
+msgstr "只接收已给定的X509名称的连接"
+
+msgid "Only process ping timeouts if routes exist"
+msgstr "当且仅当路由存在时处理ping超时"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "OpenVPN instances"
+msgstr "OpenVPN 实例"
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr "优化 TUN/TAP/UDP 写入"
+
+msgid "Output to syslog and do not daemonize"
+msgstr "显式输出到syslog"
+
+msgid "Overview"
+msgstr "概览"
+
+msgid "PKCS#12 file containing keys"
+msgstr "PKCS#12文件包含的密钥"
+
+msgid "Pass environment variables to script"
+msgstr "传递环境变量至脚本"
+
+msgid "Persist replay-protection state"
+msgstr "保存重播保护的状态"
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr "持久/非持久ifconfig池"
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr "每n秒ping一次远程 TCP/UDP 端口"
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr "外部程序和脚本超出了策略允许的使用范围"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Protocol"
+msgstr "协议"
+
+msgid "Proxy timeout in seconds"
+msgstr "代理超时，单位秒"
+
+msgid "Push an ifconfig option to remote"
+msgstr "主动向远程发送ifconfig选项"
+
+msgid "Push options to peer"
+msgstr "主动向端点发送选项"
+
+msgid "Query management channel for private key"
+msgstr "为私人密钥查询管理通道"
+
+msgid "Randomly choose remote server"
+msgstr "随机选择远程服务器"
+
+msgid "Refuse connection if no custom client config"
+msgstr "拒接没有自定义客户端配置的连接"
+
+msgid "Remap SIGUSR1 signals"
+msgstr "重映射SIGUSR1信号"
+
+msgid "Remote host name or ip address"
+msgstr "远程主机名或ip地址"
+
+msgid "Remote ping timeout"
+msgstr "远程ping超时"
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr "传输若干字节后重新验证数据通道密钥"
+
+msgid "Renegotiate data chan. key after packets"
+msgstr "传输若干数据包后重新验证数据通道密钥"
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr "传输若干秒后重新验证数据通道密钥"
+
+msgid "Replay protection sliding window size"
+msgstr "重播保护的滑动窗口大小"
+
+msgid "Require explicit designation on certificate"
+msgstr "证书需要显式指定"
+
+msgid "Require explicit key usage on certificate"
+msgstr "证书需要明确的密钥"
+
+msgid "Restart after remote ping timeout"
+msgstr "远程ping超时后重启"
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr "TLS控制通道超时后重新发送"
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr "无限重试直至代理正确"
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr "无限重试直至Socks代理正确"
+
+msgid "Route subnet to client"
+msgstr "路由子网至客户端"
+
+msgid "Run as an inetd or xinetd server"
+msgstr "以inetd或xinetd服务器的方式运行"
+
+msgid "Run script cmd on client connection"
+msgstr "当客户端连接时在命令行下允许脚本"
+
+msgid "Run script cmd on client disconnection"
+msgstr "当客户端断开时在命令行下允许脚本"
+
+msgid "Run up/down scripts for all restarts"
+msgstr "每次重启都执行启动/关闭脚本"
+
+msgid "Send notification to peer on disconnect"
+msgstr "断开连接时向客户端发送通知"
+
+msgid "Service"
+msgstr "服务"
+
+msgid "Set GID to group"
+msgstr "为群组设置GID值"
+
+msgid "Set TCP/UDP MTU"
+msgstr "设置TCP/UDP的MTU值"
+
+msgid "Set UID to user"
+msgstr "为用户设置UID值"
+
+msgid "Set aside a pool of subnets"
+msgstr "设置为拒绝子网线程池模式"
+
+msgid "Set extended HTTP proxy options"
+msgstr "设置HTTP扩展代理选项"
+
+msgid "Set output verbosity"
+msgstr "设置输出冗余级别"
+
+msgid "Set size of real and virtual address hash tables"
+msgstr "设置实际和虚拟地址的哈希表大小"
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr "设置TCP/UDP接收缓冲区大小"
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr "设置TCP/UDP发送缓冲区大小"
+
+msgid "Set tun/tap TX queue length"
+msgstr "设置tun/tap发送队列长度"
+
+msgid "Set tun/tap adapter parameters"
+msgstr "设置tun/ tap适配器参数"
+
+msgid "Set tun/tap device MTU"
+msgstr "设置tun/tap设备的MTU值"
+
+msgid "Set tun/tap device overhead"
+msgstr "设置tun/tap设备的开销"
+
+msgid "Set upper bound on TCP MSS"
+msgstr "设置TCP MSS的上限"
+
+msgid "Shaping for peer bandwidth"
+msgstr "改变结点带宽"
+
+msgid "Shell cmd to execute after tun device open"
+msgstr "tun设备打开后运行shell命令行"
+
+msgid "Shell cmd to run after tun device close"
+msgstr "tun设备关闭后运行shell命令行e"
+
+msgid "Shell command to verify X509 name"
+msgstr "运行shell命令以验证X509名称"
+
+msgid "Silence the output of replay warnings"
+msgstr "以静音的方式发出重播警告"
+
+msgid "Size of cipher key"
+msgstr "密钥大小"
+
+msgid "Specify a default gateway for routes"
+msgstr "指定路由默认网关"
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr "以休眠的状态打开OpenVPN"
+
+msgid "Start/Stop"
+msgstr "启动/停止"
+
+msgid "Started"
+msgstr "已运行的"
+
+msgid "Status file format version"
+msgstr "显式文件格式版本的状态"
+
+msgid "Switch to advanced configuration »"
+msgstr "高级配置 »"
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr "TCP/UDP 端口 # 同时针对本地和远程"
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr "TCP/UDP 端口 # 本地 (默认 1194)"
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr "TCP/UDP 端口 # 远程 (默认 1194)"
+
+msgid "TLS cipher"
+msgstr "TLS加密"
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr "TOS 穿透 (仅限IPv4)"
+
+msgid "Temporary directory for client-connect return file"
+msgstr "客户端连接返回文件的临时目录"
+
+msgid "Timeframe for key exchange"
+msgstr "密钥交换时间表"
+
+msgid "Type of used device"
+msgstr "使用设备类型"
+
+msgid "Use fast LZO compression"
+msgstr "使用快速LZO压缩"
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr "利用个人地址代替/30 子网"
+
+msgid "Use protocol"
+msgstr "采用协议"
+
+msgid "Use tun/tap device node"
+msgstr "使用 tun/tap 设备节点"
+
+msgid "Use username as common name"
+msgstr "把用户名作为通用名称"
+
+msgid "VPN"
+msgstr "VPN"
+
+msgid "Write log to file"
+msgstr "保存日志至文件"
+
+msgid "Write process ID to file"
+msgstr "记录进程ID至文件"
+
+msgid "Write status to file every n seconds"
+msgstr "每n秒后写状态值至文件"
+
+msgid "no"
+msgstr "否"
+
+msgid "tun/tap device"
+msgstr "tun/tap 设备"
+
+msgid "tun/tap inactivity timeout"
+msgstr "tun/tap 休眠超时"
+
+msgid "yes (%i)"
+msgstr "是 (%i)"
+
+msgid "« Switch to basic configuration"
+msgstr "« 基本配置"
diff --git a/trunk/package/luci/po/zh_CN/p2pblock.po b/trunk/package/luci/po/zh_CN/p2pblock.po
new file mode 100644
index 00000000..66725be6
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/p2pblock.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-17 19:11+0200\n"
+"PO-Revision-Date: 2013-10-08 15:22+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "封锁时间"
+
+msgid "Enable P2P-Block"
+msgstr "启动P2P封锁"
+
+msgid "IP-P2P"
+msgstr "IP-P2P"
+
+msgid "Layer7-Protocols"
+msgstr "第7层协议"
+
+msgid "P2P-Block"
+msgstr "P2P封锁"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr "P2P封锁使用灰名单机制，以阻止非白名单客户的各种P2P协议。"
+
+msgid "Portrange"
+msgstr "端口范围"
+
+msgid "Whitelisted IPs"
+msgstr "白名单IP地址"
+
+msgid "seconds"
+msgstr "秒"
diff --git a/trunk/package/luci/po/zh_CN/p910nd.po b/trunk/package/luci/po/zh_CN/p910nd.po
new file mode 100644
index 00000000..c14e2e7c
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/p910nd.po
@@ -0,0 +1,49 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: 2014-06-22 14:36+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "双向模式"
+
+msgid "Device"
+msgstr "设备"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr "必须安装支持USB打印机的驱动(kmod-usb-printer)或者并口驱动(kmod-lp)"
+
+msgid "Interface"
+msgstr "接口"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Settings"
+msgstr "设置"
+
+msgid "Specifies the interface to listen on."
+msgstr "指定监听端口"
+
+msgid "TCP listener port."
+msgstr "TCP监听端口"
+
+msgid "enable"
+msgstr "启用"
+
+msgid "p910nd - Printer server"
+msgstr "打印服务器"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd 的监听端口是910+N，举例：9100用于监听第一台打印机"
diff --git a/trunk/package/luci/po/zh_CN/pbx-voicemail.po b/trunk/package/luci/po/zh_CN/pbx-voicemail.po
new file mode 100644
index 00000000..0be8258a
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/pbx-voicemail.po
@@ -0,0 +1,97 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-08 18:42+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "接收语音邮箱的电子邮箱地址"
+
+msgid "Enable Voicemail"
+msgstr "启用语音邮箱"
+
+msgid "Global Voicemail Setup"
+msgstr "全局语音邮箱设置"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"在这里，你可以为PBX配置一个全球性的语音邮件。由于这个系统运行在嵌入式系统中，如路由器，没有本地存储语音邮件 - 它必须通过电子邮件发送出去。因此，你"
+"需要配置一个外发邮件（SMTP）服务器（例如您的ISP，谷歌或雅虎的SMTP服务器），并提供接收记录语音信箱的地址的列表。"
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"为了这个PBX发送包含语音信箱录音的电子邮件，你需要在这里设置一个SMTP服务器。您的ISP通常会提供一个SMTP服务器。您也可以设立一个第三方的SMT"
+"P服务器，像谷歌或雅虎。"
+
+msgid "Last Sent Voicemail Log"
+msgstr "最后发送的语音信箱日志"
+
+msgid "Local Storage Directory"
+msgstr "本地存储目录"
+
+msgid "No"
+msgstr "不"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "电子邮件发送服务器（SMTP）"
+
+msgid "SMTP Password"
+msgstr "SMTP登录密码"
+
+msgid "SMTP Port Number"
+msgstr "SMTP端口"
+
+msgid "SMTP Server Authentication"
+msgstr "SMTP服务器认证"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "SMTP服务器主机名或IP地址"
+
+msgid "SMTP User Name"
+msgstr "SMTP用户名"
+
+msgid "Secure Connection Using TLS"
+msgstr "使用TLS安全连接"
+
+msgid "Voicemail Setup"
+msgstr "语音邮箱设置"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr "当你启用了语音信箱，你将要指定接收记录语音信箱的电子邮件地址。您还必须设置下面的SMTP服务器"
+
+msgid "Yes"
+msgstr "是"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"您也可以保留您的PBX语音信箱留言的副本在你运行的设备上。此处指定的路径当不存在时，将被创建。谨防嵌入式设备上有限的存取空间，如路由器，所以此选项只有你"
+"当知道处理时才可使用。"
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr "为了保护您真正的SMTP密码不显示。该选项需要更改。"
diff --git a/trunk/package/luci/po/zh_CN/pbx.po b/trunk/package/luci/po/zh_CN/pbx.po
new file mode 100644
index 00000000..8ac03e1a
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/pbx.po
@@ -0,0 +1,495 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-15 16:11+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Available"
+msgstr "可用"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr "避免使用除字母，数字，空格，逗号和句号外的其他字符。"
+
+msgid "Away"
+msgstr "外"
+
+msgid "Blacklisted Numbers"
+msgstr "黑名单"
+
+msgid "Call Routing"
+msgstr "呼叫路由"
+
+msgid "Call-back Numbers"
+msgstr "回调数"
+
+msgid "Call-back Provider"
+msgstr "回呼提供者"
+
+msgid "Call-through Numbers"
+msgstr "通过数字呼叫"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "复制粘贴数字大名单。"
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr "其他地方无法匹配拨号号码"
+
+msgid "Do Not Disturb"
+msgstr "请勿打扰"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "域名/ IP地址/动态域名"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "动态黑名单号码列表"
+
+msgid "Email"
+msgstr "电子邮件"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "允许电话呼入（SIP注册者）"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "允许电话呼入（下面设置状态）"
+
+msgid "Enable Outgoing Calls"
+msgstr "允许电话外呼"
+
+msgid "Enabled"
+msgstr "允许"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"输入你想自动屏蔽的电话号码。你应该忽略国家代码和任何前导零,但请测试来确保你成"
+"功屏蔽了想要屏蔽的号码。"
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"在SIP设备注册服务器中输入IP(或IP:端口)，仅在本地使用，不可以在远程使用。"
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+
+msgid "External SIP Port"
+msgstr "外部SIP端口"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "全名"
+
+msgid "General Settings"
+msgstr "通用设置"
+
+msgid "Google Accounts"
+msgstr "google账号"
+
+msgid "Google Talk Status"
+msgstr "google Talk状态"
+
+msgid "Google Talk Status Message"
+msgstr "google Talk状态消息"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Google Voice/Talk账号"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "呼入电话"
+
+msgid "Insert QoS Rules"
+msgstr "插入QoS规则"
+
+msgid "Makes Outgoing Calls"
+msgstr "安排外呼列表"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr "注意:没有google或SIP提供者账户配置。"
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr "注意:没有google或SIP提供者账户允许呼入电话。"
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr "注意:没有google或SIP提供者账户允许外呼电话。"
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr "注意:没有本地用户设置。"
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr "注意:没有本地用户允许外呼电话。"
+
+msgid "No"
+msgstr "不"
+
+msgid "Number of Seconds to Ring"
+msgstr "多少秒振铃"
+
+msgid "Outbound Proxy"
+msgstr "外呼代理"
+
+msgid "Outgoing Calls"
+msgstr "外呼电话"
+
+msgid "PBX Main Page"
+msgstr "PBX主页"
+
+msgid "PBX Service Status"
+msgstr "PBX服务状态"
+
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Password"
+msgstr "密码"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr "SIP设备端口设置"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "用于外呼电话的提供者"
+
+msgid "QoS Settings"
+msgstr "QoS设置"
+
+msgid "RTP Port Range End"
+msgstr "RTP结束端口"
+
+msgid "RTP Port Range Start"
+msgstr "RTP起始端口"
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr "收到呼入电话"
+
+msgid "Remote Usage"
+msgstr "远程使用"
+
+msgid "Rings users enabled for incoming calls"
+msgstr ""
+
+msgid "SIP Accounts"
+msgstr "SIP账号"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "SIP 设备/软电话账号"
+
+msgid "SIP Provider Accounts"
+msgstr "SIP提供者账户"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "SIP Realm(一些供应商需要）"
+
+msgid "SIP Server/Registrar"
+msgstr "SIP注册服务器"
+
+msgid "SIP Server/Registrar Port"
+msgstr "SIP注册服务器端口"
+
+msgid "Server Setting"
+msgstr ""
+
+msgid "Server Setting for Local SIP Devices"
+msgstr ""
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr ""
+
+msgid "Service Status"
+msgstr ""
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr ""
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr ""
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr ""
+
+msgid "User Accounts"
+msgstr ""
+
+msgid "User Agent String"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr ""
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr ""
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+#~ msgid ""
+#~ "Designate numbers that are allowed to call through this system and which "
+#~ "user's privileges it will have."
+#~ msgstr "设定号码作为用户拥有使用交换机呼叫的权限。"
diff --git a/trunk/package/luci/po/zh_CN/polipo.po b/trunk/package/luci/po/zh_CN/polipo.po
new file mode 100644
index 00000000..7dcbe234
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/polipo.po
@@ -0,0 +1,205 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-09 03:47+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Allowed clients"
+msgstr "允许的客户端"
+
+msgid "Always use system DNS resolver"
+msgstr "始终使用系统DNS解析"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr "支持HTTP基本身份验证。提供用户名和密码格式为：用户名:密码。"
+
+msgid "Configuration"
+msgstr "配置"
+
+msgid "DNS and Query Settings"
+msgstr "DNS查询设置"
+
+msgid "DNS server address"
+msgstr "DNS地址"
+
+msgid "Delete cache files time"
+msgstr "清除缓存文件周期"
+
+msgid "Disk cache location"
+msgstr "磁盘缓存位置"
+
+msgid "Do not query IPv6"
+msgstr "不能查询IPv6"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "允许多用户共享缓存（代理）。"
+
+msgid "First PMM segment size (in bytes)"
+msgstr "第一的PMM段的大小（字节为单位）"
+
+msgid "General Settings"
+msgstr "通用设置"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr ""
+
+msgid "In RAM cache size (in bytes)"
+msgstr ""
+
+msgid "Listen address"
+msgstr "监听地址"
+
+msgid "Listen port"
+msgstr "监听端口"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr "polipo将永久缓存文件。建议使用外部存储设备，因为缓存会一直增长。留空表示禁用磁盘缓存。"
+
+msgid "Log file location"
+msgstr "日志存放位置"
+
+msgid "Log to syslog"
+msgstr "吐日志到syslog"
+
+msgid "Logging and RAM"
+msgstr ""
+
+msgid "Never use system DNS resolver"
+msgstr "从不使用系统DNS解析"
+
+msgid "On-Disk Cache"
+msgstr "磁盘缓存"
+
+msgid "PMM segments size (in bytes)"
+msgstr ""
+
+msgid "Parent Proxy"
+msgstr ""
+
+msgid "Parent proxy address"
+msgstr ""
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr ""
+
+msgid "Parent proxy authentication"
+msgstr ""
+
+msgid "Polipo"
+msgstr ""
+
+msgid "Polipo Status"
+msgstr ""
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr ""
+
+msgid "Poor Man's Multiplexing"
+msgstr ""
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Query DNS by hostname"
+msgstr ""
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr ""
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr ""
+
+msgid "Query DNS for IPv6"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr ""
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr ""
+
+msgid "Query only IPv6"
+msgstr ""
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr ""
+
+msgid "Shared cache"
+msgstr ""
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr ""
+
+msgid "Size to which cached files should be truncated"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Syslog facility"
+msgstr ""
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr ""
+
+msgid "Time after which cached files will be deleted"
+msgstr ""
+
+msgid "Time after which cached files will be truncated"
+msgstr ""
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr ""
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_CN/qos.po b/trunk/package/luci/po/zh_CN/qos.po
new file mode 100644
index 00000000..92ff7d08
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/qos.po
@@ -0,0 +1,106 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: LuCi Chinese Translation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\n"
+"PO-Revision-Date: 2014-06-22 14:33+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: QQ Group 75543259\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "计算开销"
+
+msgid "Classification Rules"
+msgstr "分类规则"
+
+msgid "Classification group"
+msgstr "分类组"
+
+msgid "Comment"
+msgstr "注解"
+
+msgid "Destination host"
+msgstr "目的主机"
+
+msgid "Download speed (kbit/s)"
+msgstr "下载速度 (kbit/s)"
+
+msgid "Enable"
+msgstr "开启"
+
+msgid "Half-duplex"
+msgstr "半双工"
+
+msgid "Interfaces"
+msgstr "接口"
+
+msgid "Number of bytes"
+msgstr "字节数"
+
+msgid "Ports"
+msgstr "端口"
+
+msgid "Protocol"
+msgstr "协议"
+
+msgid "QoS"
+msgstr "QoS"
+
+msgid "Quality of Service"
+msgstr "QOS服务"
+
+msgid "Service"
+msgstr "服务"
+
+msgid "Source host"
+msgstr "源主机"
+
+msgid "Target"
+msgstr "目标"
+
+msgid "Upload speed (kbit/s)"
+msgstr "上传速度 (kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr "根据网络地址、端口或服务，给流量数据包排序。"
+
+msgid "all"
+msgstr "全部"
+
+msgid "default"
+msgstr "默认"
+
+msgid "express"
+msgstr "高"
+
+msgid "low"
+msgstr "低"
+
+msgid "normal"
+msgstr "普通"
+
+msgid "priority"
+msgstr "最高"
+
+#~ msgid "Downlink"
+#~ msgstr "下行"
+
+#~ msgid "Internet Connection"
+#~ msgstr "Internet连接"
+
+#~ msgid "Uplink"
+#~ msgstr "上行"
+
+#~ msgid "allf"
+#~ msgstr "全部"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "Qos连接字节数"
diff --git a/trunk/package/luci/po/zh_CN/radvd.po b/trunk/package/luci/po/zh_CN/radvd.po
new file mode 100644
index 00000000..f3dae7fb
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/radvd.po
@@ -0,0 +1,391 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2014-07-13 16:23+0200\n"
+"Last-Translator: qiuchengxuan <qiuchengxuan@gmail.com>\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "6to4 interface"
+msgstr "IPv6到IPv4的接口"
+
+msgid "Address"
+msgstr "地址"
+
+msgid "Addresses"
+msgstr "地址"
+
+msgid "Advanced"
+msgstr "进阶选项"
+
+msgid "Advertise Home Agent flag"
+msgstr "广播本地中继标识"
+
+msgid "Advertise router address"
+msgstr "广播路由地址"
+
+msgid "Advertised Domain Suffixes"
+msgstr "区域广播后缀"
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr "IPv6 Recursive DNS服务器(RDNSS)地址。若为空，则为当前IPv6地址"
+
+msgid "Advertised IPv6 prefixes"
+msgstr "IPV6广播前缀群"
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr "IPv6广播前缀群。如果为空，将使用当前接口的前缀"
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr "广播移动IPv6本地代理功能（RFC3775"
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr "广播移动路由器注册功能（NEMO基本）"
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr "路由器公告报文中宣告估算的邻居可达时间（毫秒）。0代表禁用可达性宣告。"
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr "路由器公告报文中广播外发单播数据包的缺省跳数值。 0禁用广播跳数"
+
+msgid "Advertises the default router preference"
+msgstr "发布缺省路由设置"
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr "路由器公告报文中宣告链路MTU。0代表禁用MTU宣告"
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr "声明默认路由器的生存时间（单位为秒）。0代表结点没有默认路由"
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr "自治的"
+
+msgid "Clients"
+msgstr "客户端"
+
+msgid "Configuration flag"
+msgstr "设置标识"
+
+msgid "Current hop limit"
+msgstr "当前跳数限制"
+
+msgid "DNSSL"
+msgstr "DNS搜索列表"
+
+msgid "DNSSL Configuration"
+msgstr "DNS搜索列表设置"
+
+msgid "Default lifetime"
+msgstr "默认生存时限"
+
+msgid "Default preference"
+msgstr "默认优先级"
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Enable advertisements"
+msgstr "启用广播"
+
+msgid "Enables router advertisements and solicitations"
+msgstr "激活路由广播和请求"
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr "使能附加的基于状态管理的自动配置协议（RFC2462）"
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr "启用自动配置，不包括地址信息(RFC2462)"
+
+msgid "General"
+msgstr "概况"
+
+msgid "Home Agent information"
+msgstr "本地中继信息"
+
+msgid "Home Agent lifetime"
+msgstr "本地中继有效期"
+
+msgid "Home Agent preference"
+msgstr "本地中继优先权"
+
+msgid "Include Home Agent Information in the RA"
+msgstr "路由器公告报文中包含本地中继信息"
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr "路由器公告报文中包含移动IPV6广播间隔设置"
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr "路由器公告报文中包含出接口的链路层地址"
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr "表明使用接口的地址发送而非网络前缀，移动IPv6需要"
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr "表明潜在的链路并不具有广播能力，避免主动触发的宣告报文发出"
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr "表明此前缀能够用于匿名地址配置（RFC4862）"
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr "表明此前缀能够用于on-link决定（RFC481）"
+
+msgid "Interface"
+msgstr "接口"
+
+msgid "Interface Configuration"
+msgstr "接口设置"
+
+msgid "Interface required"
+msgstr "接口必要项"
+
+msgid "Interfaces"
+msgstr "接口"
+
+msgid "Lifetime"
+msgstr "有效期"
+
+msgid "Link MTU"
+msgstr "连接MTU"
+
+msgid "Managed flag"
+msgstr "M标识"
+
+msgid "Max. interval"
+msgstr "最大间隔"
+
+msgid "Maximum advertisement interval"
+msgstr "最大广播间隔"
+
+msgid "Minimum advertisement delay"
+msgstr "最小广播延时"
+
+msgid "Minimum advertisement interval"
+msgstr "最小广播间隔"
+
+msgid "Mobile IPv6"
+msgstr "移动IPV6"
+
+msgid "Mobile IPv6 interval option"
+msgstr "移动IPV6间隔选项"
+
+msgid "Mobile IPv6 router registration"
+msgstr "移动IPV6路由注册"
+
+msgid "Multicast"
+msgstr "组播传输"
+
+msgid "On-link"
+msgstr "已连接的"
+
+msgid "On-link determination"
+msgstr "已连接的目标"
+
+msgid "Preference"
+msgstr "优先权"
+
+msgid "Preferred lifetime"
+msgstr "期望的生存时间"
+
+msgid "Prefix"
+msgstr "前缀"
+
+msgid "Prefix Configuration"
+msgstr "前缀设置"
+
+msgid "Prefixes"
+msgstr "前缀群"
+
+msgid "RDNSS"
+msgstr "邻居发现服务器"
+
+msgid "RDNSS Configuration"
+msgstr "邻居发现服务器设置"
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr "RADVD－DNS搜索列表"
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr "RADVD－前缀"
+
+msgid "Radvd - RDNSS"
+msgstr "RADVD－邻居发现服务器"
+
+msgid "Radvd - Route"
+msgstr "RADVD－路由"
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr "RADVD是一个IPV6路由公告软件，按照RFC4861监听路由请求和发送路由公告。"
+
+msgid "Reachable time"
+msgstr "可达延时"
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr "限制特定会话，留空则使用组播"
+
+msgid "Retransmit timer"
+msgstr "中继转发计时器"
+
+msgid "Route Configuration"
+msgstr "路由设置"
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr "源链路层地址"
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr "设定路由关联的生存时间，单位为秒"
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr "说明这个物理接口连接到哪个网络"
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr "设定DNSSL表项名称解析的最长时间间隔"
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr "设定RDNSS表项名称解析的最长时间间隔"
+
+msgid "Specifies the preference associated with the default router"
+msgstr "设定关联的默认路由的配置"
+
+msgid "Suffix"
+msgstr "后缀"
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr "允许接口发送组播路由宣告报文的最大时间间隔，单位为秒"
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr "允许接口发送组播路由宣告报文的最小时间间隔，单位为秒"
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr "允许接口发送主动触发组播路由宣告报文的最小时间间隔，单位为秒"
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr "单播"
+
+msgid "Valid lifetime"
+msgstr "有效的生存时间"
+
+msgid "Validity time"
+msgstr "有效期"
+
+msgid "default"
+msgstr "默认"
+
+msgid "high"
+msgstr "高"
+
+msgid "low"
+msgstr "低"
+
+msgid "medium"
+msgstr "中等"
+
+msgid "no"
+msgstr "否"
+
+msgid "yes"
+msgstr "是"
+
+#~ msgid "Advertised IPv6 prefix"
+#~ msgstr "IPV6广播前缀"
+
+#~ msgid ""
+#~ "Advertised IPv6 prefix. If empty, the current interface prefix is used"
+#~ msgstr "IPV6广播前缀。若为空，则当前接口前缀已被使用。"
+
+#~ msgid "Open"
+#~ msgstr "打开"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the DNSSL entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr "指定DNSSL解析域名的最长时间，0则为无限长"
+
+#~ msgid ""
+#~ "Specifies the maximum duration how long the RDNSS entries are used for "
+#~ "name resolution. Use 0 to specify an infinite lifetime"
+#~ msgstr "指定RDNSS解析域名的最长时间，0则为无限长"
diff --git a/trunk/package/luci/po/zh_CN/rrdtool.po b/trunk/package/luci/po/zh_CN/rrdtool.po
new file mode 100644
index 00000000..4e6ee4b4
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/rrdtool.po
@@ -0,0 +1,359 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-07-23 02:08+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr "无线信号噪音"
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr "信噪比"
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr "信号噪音"
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr "信号强度"
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr "无线信号质量"
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr "无线信号质量"
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr "信号质量"
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr "ping"
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr "响应"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "ping"
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr "iptables包"
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_CN/samba.po b/trunk/package/luci/po/zh_CN/samba.po
new file mode 100644
index 00000000..4ff671b8
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/samba.po
@@ -0,0 +1,83 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-06-21 18:31+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "允许匿名用户"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "允许系统用户通过网络共享访问他们的主目录"
+
+msgid "Allowed users"
+msgstr "允许用户"
+
+msgid "Create mask"
+msgstr "创建权限"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Directory mask"
+msgstr "目录权限"
+
+msgid "Edit Template"
+msgstr "编辑模板"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "编辑用来生成samba设置的模板"
+
+msgid "General Settings"
+msgstr "基本设置"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "Mask for new directories"
+msgstr "新目录权限"
+
+msgid "Mask for new files"
+msgstr "新文件权限"
+
+msgid "Name"
+msgstr "共享名"
+
+msgid "Network Shares"
+msgstr "网络共享"
+
+msgid "Path"
+msgstr "目录"
+
+msgid "Read-only"
+msgstr "只读"
+
+msgid "Share home-directories"
+msgstr "共享主目录"
+
+msgid "Shared Directories"
+msgstr "共享目录"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr ""
+"创建samba设置的 \"/etc/samba/smb.conf.template\" 文件的内容。被通道符|包围的"
+"值可在基本设置中进行配置"
+
+msgid "Workgroup"
+msgstr "工作组"
+
+#~ msgid "Physical Path"
+#~ msgstr "物理路径"
diff --git a/trunk/package/luci/po/zh_CN/splash.po b/trunk/package/luci/po/zh_CN/splash.po
new file mode 100644
index 00000000..439b774e
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/splash.po
@@ -0,0 +1,321 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-28 08:58+0200\n"
+"PO-Revision-Date: 2014-07-23 02:07+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Accept"
+msgstr "接收"
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr "活动的客户端"
+
+msgid "Allowed hosts/subnets"
+msgstr "允许的 主机/掩码"
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+"只有当 上传和下载的限制都设置的时候对客户端的带宽限制才会生效。在这里使用0 可"
+"以完全禁用此限制。白名单客户端不受限制。"
+
+# Something wwrong?
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr "成为这个社区的一个活跃成员并且运营你自己的节点以帮助别人。"
+
+msgid "Blacklist"
+msgstr "黑名单"
+
+msgid "Blocked"
+msgstr "锁定"
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr "清理时间"
+
+msgid "Client-Splash"
+msgstr "客户端弹窗"
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr "Client-Splash是无线MESH网络的一个热点认证系统"
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr "客户端下载速度限制为此值(kbyte/s)"
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr "已接受Splash的客户端允许使用这个网络N小时"
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr "客户端上传速度限制为此值(kbyte/s)"
+
+msgid "Contact"
+msgstr "联系"
+
+msgid "Decline"
+msgstr "下降"
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr "捐助我们一些钱以帮助我们维护这个项目。"
+
+msgid "Download limit"
+msgstr "下载限制"
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr "防火墙区域"
+
+msgid "General"
+msgstr "概述"
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "IP Address"
+msgstr "IP地址"
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr "如果你操作你自有的wifi设备，使用与我们不同的频道"
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr "如果你经常使用这个网络，我们需要你的支持"
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr "在这个接口上拦截客户端通信流量"
+
+msgid "Interfaces"
+msgstr "接口"
+
+msgid "Interfaces that are used for Splash."
+msgstr "Splash使用的接口"
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr "法律禁止行为"
+
+msgid "Legally Prohibited content"
+msgstr "法律禁止内容"
+
+msgid "MAC Address"
+msgstr "MAC地址"
+
+msgid "MAC addresses in this list are blocked."
+msgstr "在本列表中的MAC地址将被阻挡"
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr "白名单中的MAC地址，可不用接受splash，同时没有带宽限制。"
+
+msgid "Netmask"
+msgstr "网络掩码"
+
+msgid "Network"
+msgstr "网络"
+
+msgid "No clients connected"
+msgstr "无客户端连接"
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr "我们不是ISP（互联网运行商），仅仅只是一个实验性的社区网络。"
+
+msgid "Policy"
+msgstr "策略"
+
+msgid "Redirect target"
+msgstr "重定向目标"
+
+msgid "Safety"
+msgstr "安全"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr "流量 入/出"
+
+msgid "Upload limit"
+msgstr "上传限制"
+
+msgid "Usage Agreement"
+msgstr "使用协议"
+
+msgid "Welcome"
+msgstr "欢迎"
+
+msgid "Whitelist"
+msgstr "白名单"
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr "你的带宽限制为"
+
+msgid "blacklisted"
+msgstr "黑名单"
+
+msgid "expired"
+msgstr "过期"
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
+
+#~ msgid ""
+#~ "Hosts and Networks that are listed here are excluded from splashing, i.e. "
+#~ "they are always allowed."
+#~ msgstr "列在这里的主机和网络都排除在Splashing之外，例如:一直被允许访问。"
+
+#~ msgid "By accepting these rules you can use this network for"
+#~ msgstr "接受这些条款以便使用这个网络"
+
+#~ msgid "Edit Splash text"
+#~ msgstr "编辑Splash文本"
diff --git a/trunk/package/luci/po/zh_CN/statistics.po b/trunk/package/luci/po/zh_CN/statistics.po
new file mode 100644
index 00000000..797c591b
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/statistics.po
@@ -0,0 +1,609 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2014-06-13 15:04+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Action (target)"
+msgstr "动作（目标）"
+
+msgid "Add command for reading values"
+msgstr "添加命令读取数据"
+
+msgid "Add matching rule"
+msgstr "新增匹配规则"
+
+msgid "Add multiple hosts separated by space."
+msgstr "使用空格分隔多个主机"
+
+msgid "Add notification command"
+msgstr "新增通知命令"
+
+msgid "Base Directory"
+msgstr "基本目录"
+
+msgid "Basic monitoring"
+msgstr "基本监控"
+
+msgid "CPU Plugin Configuration"
+msgstr "CPU插件配置"
+
+msgid "CSV Output"
+msgstr "CSV输出"
+
+msgid "CSV Plugin Configuration"
+msgstr "CSV插件配置"
+
+msgid "Cache collected data for"
+msgstr "收集缓存数据"
+
+msgid "Cache flush interval"
+msgstr "缓存清空间隙"
+
+msgid "Chain"
+msgstr "链"
+
+msgid "CollectLinks"
+msgstr "收集链接"
+
+msgid "CollectRoutes"
+msgstr "收集路由"
+
+msgid "CollectTopology"
+msgstr "收集拓扑"
+
+msgid "Collectd"
+msgstr "Collectd"
+
+msgid "Collectd Settings"
+msgstr "Collectd设置"
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr "Collectd是一个通过不同插件用于收集各种源数据的小型守护程序。在此页面中，您可以更改Collectd守护进程常规设置。"
+
+msgid "Conntrack"
+msgstr "Conntrack"
+
+msgid "Conntrack Plugin Configuration"
+msgstr "Conntrack插件设置"
+
+msgid "DF Plugin Configuration"
+msgstr "DF插件设置"
+
+msgid "DNS"
+msgstr "DNS"
+
+msgid "DNS Plugin Configuration"
+msgstr "DNS插件设置"
+
+msgid "Data collection interval"
+msgstr "数据收集间隙"
+
+msgid "Datasets definition file"
+msgstr "数据集定义文件"
+
+msgid "Destination ip range"
+msgstr "目标IP区间"
+
+msgid "Directory for collectd plugins"
+msgstr "Collectd插件目录"
+
+msgid "Directory for sub-configurations"
+msgstr "子配置目录"
+
+msgid "Disk Plugin Configuration"
+msgstr "Disk插件配置"
+
+msgid "Disk Space Usage"
+msgstr "磁盘空间使用情况"
+
+msgid "Disk Usage"
+msgstr "磁盘使用情况"
+
+msgid "Display Host »"
+msgstr "显示主机"
+
+msgid "Display timespan »"
+msgstr "显示时间段"
+
+msgid "E-Mail Plugin Configuration"
+msgstr "E-Mail插件配置"
+
+msgid "Email"
+msgstr "电子邮件"
+
+msgid "Enable this plugin"
+msgstr "启用该插件"
+
+msgid "Exec"
+msgstr "Exec"
+
+msgid "Exec Plugin Configuration"
+msgstr "Exec插件配置"
+
+msgid "Filter class monitoring"
+msgstr "Filter类监测"
+
+msgid "Firewall"
+msgstr "防火墙"
+
+msgid "Flush cache after"
+msgstr "清空缓存后"
+
+msgid "Forwarding between listen and server addresses"
+msgstr "转发监听服务器和应用服务器之间数据"
+
+msgid "Graphs"
+msgstr "图表"
+
+msgid "Group"
+msgstr "组"
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr "在这里，你可以定义外部命令，Collectd将启动命令来获取某些值，将获取的值从标准输出端口输出。"
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr "在这里，你可以定义外部命令，当Collectd达到一定阈值时，将启动命令。阀值将会作为命令的标准输入。"
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr "在这里，你可以定义各种监控iptables规则临界值。"
+
+msgid "Host"
+msgstr "主机"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr "获取txtinfo输出的IP地址或主机名"
+
+msgid "IRQ Plugin Configuration"
+msgstr "IRQ插件配置"
+
+msgid "Ignore source addresses"
+msgstr "忽略源地址"
+
+msgid "Incoming interface"
+msgstr "入接口"
+
+msgid "Interface Plugin Configuration"
+msgstr "Interface插件配置"
+
+msgid "Interfaces"
+msgstr "Interfaces"
+
+msgid "Interrupts"
+msgstr "中断"
+
+msgid "Interval for pings"
+msgstr "ping间隙"
+
+msgid "Iptables Plugin Configuration"
+msgstr "Iptables插件配置"
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr "自动保留对未选中接口的监控。"
+
+msgid "Listen host"
+msgstr "监听主机"
+
+msgid "Listen port"
+msgstr "监听端口"
+
+msgid "Listener interfaces"
+msgstr "监听接口"
+
+msgid "Load Plugin Configuration"
+msgstr "Load插件配置"
+
+msgid "Maximum allowed connections"
+msgstr "最大允许连接数"
+
+msgid "Memory"
+msgstr "内存"
+
+msgid "Memory Plugin Configuration"
+msgstr "内存插件配置"
+
+msgid "Monitor all except specified"
+msgstr "监测所有（除特别注明外）"
+
+msgid "Monitor all local listen ports"
+msgstr "监测所有本地监听端口"
+
+msgid "Monitor devices"
+msgstr "监测设备"
+
+msgid "Monitor disks and partitions"
+msgstr "监测磁盘和分区"
+
+msgid "Monitor filesystem types"
+msgstr "监测文件系统类型"
+
+msgid "Monitor hosts"
+msgstr "监测主机"
+
+msgid "Monitor interfaces"
+msgstr "监测接口"
+
+msgid "Monitor interrupts"
+msgstr "监测中断"
+
+msgid "Monitor local ports"
+msgstr "监测本地端口"
+
+msgid "Monitor mount points"
+msgstr "监测挂载点"
+
+msgid "Monitor processes"
+msgstr "监测进程"
+
+msgid "Monitor remote ports"
+msgstr "监测远程端口"
+
+msgid "Name of the rule"
+msgstr "规则名"
+
+msgid "Netlink"
+msgstr "Netlink"
+
+msgid "Netlink Plugin Configuration"
+msgstr "Netlink插件配置"
+
+msgid "Network"
+msgstr "Network"
+
+msgid "Network Plugin Configuration"
+msgstr "Network插件配置"
+
+msgid "Network plugins"
+msgstr "Network插件"
+
+msgid "Network protocol"
+msgstr "Network协议"
+
+msgid "Number of threads for data collection"
+msgstr "收集程序使用线程数"
+
+msgid "OLSRd"
+msgstr "OLSRd"
+
+msgid "OLSRd Plugin Configuration"
+msgstr "OLSRd插件配置"
+
+msgid "Only create average RRAs"
+msgstr "仅创建平均RRAs"
+
+msgid "Options"
+msgstr "选项"
+
+msgid "Outgoing interface"
+msgstr "出接口"
+
+msgid "Output plugins"
+msgstr "Output插件"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping Plugin Configuration"
+msgstr "Ping插件配置"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Processes"
+msgstr "进程"
+
+msgid "Processes Plugin Configuration"
+msgstr "进程插件配置"
+
+msgid "Processes to monitor separated by space"
+msgstr "过程监控，用空格隔开"
+
+msgid "Processor"
+msgstr "处理器"
+
+msgid "Qdisc monitoring"
+msgstr "Qdisc监测"
+
+msgid "RRD XFiles Factor"
+msgstr "RRD XFiles因子"
+
+msgid "RRD heart beat interval"
+msgstr "RRD心跳间隙"
+
+msgid "RRD step interval"
+msgstr "RRD区间间隙"
+
+msgid "RRDTool"
+msgstr "RRDTool"
+
+msgid "RRDTool Plugin Configuration"
+msgstr "RRDTool插件配置"
+
+msgid "Rows per RRA"
+msgstr "行/RRA"
+
+msgid "Script"
+msgstr "脚本"
+
+msgid "Seconds"
+msgstr "秒"
+
+msgid "Server host"
+msgstr "服务器主机"
+
+msgid "Server port"
+msgstr "服务器端口"
+
+msgid "Shaping class monitoring"
+msgstr "整形类监控"
+
+msgid "Socket file"
+msgstr "套接字文件"
+
+msgid "Socket group"
+msgstr "套接字组"
+
+msgid "Socket permissions"
+msgstr "套接字权限"
+
+msgid "Source ip range"
+msgstr "源IP区间"
+
+msgid "Specifies what information to collect about links."
+msgstr "收集指定链接相关信息。"
+
+msgid "Specifies what information to collect about routes."
+msgstr "收集指定路由相关信息。"
+
+msgid "Specifies what information to collect about the global topology."
+msgstr "收集指定拓扑相关信息。"
+
+msgid "Statistics"
+msgstr "统计"
+
+msgid "Storage directory"
+msgstr "存储目录"
+
+msgid "Storage directory for the csv files"
+msgstr "csv存储目录"
+
+msgid "Store data values as rates instead of absolute values"
+msgstr "存储数据值变化量而不是绝对值"
+
+msgid "Stored timespans"
+msgstr "存储时间跨度"
+
+msgid "System Load"
+msgstr "系统加载"
+
+msgid "System plugins"
+msgstr "系统插件"
+
+msgid "TCP Connections"
+msgstr "TCP连接数"
+
+msgid "TCPConns Plugin Configuration"
+msgstr "TCPConns插件配置"
+
+msgid "TTL for network packets"
+msgstr "网络包TTL"
+
+msgid "TTL for ping packets"
+msgstr "ping包TTL"
+
+msgid "Table"
+msgstr "表"
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr "NUT插件读取UPS信息。"
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr "OLSRd插件通过txtinfo获取meshed网络信息。"
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr "conntrack插件获取连接数信息。"
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr "cpu插件获取处理器相关信息。"
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr "csv插件用于存储数据，以方便其他程序处理数据。"
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr "df插件收集磁盘空间使用情况，挂载点及文件系统相关信息。"
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr "disk插件收集磁盘分区使用情况及相关信息。"
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr "dns插件收集dns数据流相关信息。"
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+"邮件插件创建一个unix套接字用于为Collectd守护进程发送统计信息到电子邮件系统。这个插件主要目的是结合使用Mail::SpamAssasin::"
+"Pulgin::Collectd，但可以用在其他方面。"
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr "exec插件，用于当某些监控值已到达阈值时，启动外部命令读值或通知外部程序。"
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr "Interface插件，用于收集选定接口的数据包的统计信息。"
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr "iptables插件，将监测选定防火墙规则和收集关于每个规则处理的数据包信息。"
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr "irq插件，用于监控选定中断的每秒钟产生的中断数。如果没有中断被选中，则表示对所有中断进行监测。"
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr "iwinfo插件，收集无线信号强度、噪声和质量的统计信息。"
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr "load插件，收集常规系统加载统计信息。"
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr "memory插件，收集关于内存使用情况的统计信息。"
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr "netlink插件，收集为选定接口qdisc-、class-和filter- 的扩展数据。"
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+"network插件,提供了基于网络的不同Collectd实例。Collectd可以工作在客户端和服务器两个模式。在客户端模式下收集本地信息，然后转移到一"
+"个Collectd服务器实例中,在服务器模式将从其他主机收集信息。"
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr "ping插件，将发送icmp echo replies到选定主机来测量每台主机的响应时间。"
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr "processes插件，收集选定进程的cpu时间、页面错误和内存使用信息。"
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+"rrdtool插件，将收集数据以图表的形式储存在RRD数据库文件中。<br /><br "
+"/><strong>警告：错误的参数设置，将导致非常高的临时内存消耗。这可能会使设备无法使用！</strong>"
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+"统计软件包是基于<a href=\"http://collectd.org/index.shtml\">Collectd</a>，并使用<a "
+"href=\"http://oss.oetiker.ch/rrdtool/\">RRD工具</a>来渲染图表，用于收集数据。"
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr "tcpconns插件，收集选定端口TCP连接信息。"
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr "unixsock插件，创建一个unix套接字可用于读取Collectd实例的收集信息。"
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr "定义Collectd将监听哪个接口来传入连接收集数据。"
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr "定义本地收集数据被发送到哪台Collected服务器。"
+
+msgid "Try to lookup fully qualified hostname"
+msgstr "尝试解析主机全域名"
+
+msgid "UPS"
+msgstr "UPS"
+
+msgid "UPS Plugin Configuration"
+msgstr "UPS插件配置"
+
+msgid "UPS name in NUT ups@host format"
+msgstr "UPS名使用NUT（Network UPS Tools）格式：ups@host"
+
+msgid "UnixSock"
+msgstr "UnixSock"
+
+msgid "Unixsock Plugin Configuration"
+msgstr "Unixsock插件配置"
+
+msgid "Used PID file"
+msgstr "正在使用的PID文件"
+
+msgid "User"
+msgstr "用户"
+
+msgid "Verbose monitoring"
+msgstr "详细监测"
+
+msgid "Wireless"
+msgstr "无线"
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr "无线iwinfo插件配置"
+
+msgid "e.g. br-ff"
+msgstr "例如：br-ff"
+
+msgid "e.g. br-lan"
+msgstr "例如：br-lan"
+
+msgid "e.g. reject-with tcp-reset"
+msgstr "例如：eject-with tcp-reset"
+
+msgid "max. 16 chars"
+msgstr "最长16个字符"
+
+msgid "reduces rrd size"
+msgstr "减少rrd大小"
+
+msgid "seconds; multiple separated by space"
+msgstr "秒数；多个使用空格分隔"
+
+msgid "server interfaces"
+msgstr "服务器接口"
+
+#~ msgid "group name"
+#~ msgstr "群名称"
diff --git a/trunk/package/luci/po/zh_CN/tinyproxy.po b/trunk/package/luci/po/zh_CN/tinyproxy.po
new file mode 100644
index 00000000..828e952e
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/tinyproxy.po
@@ -0,0 +1,262 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-10 19:43+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+"<em>通过代理</em>允许给定的对象经过指定的上行代理的路由请求。<em>拒绝代理</"
+"em> 禁用对象的任何上行代理。"
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr "转发请求时增加了一个客户机IP地址和“X-Tinyproxy“HTTP头"
+
+msgid "Allowed clients"
+msgstr "授权客户端"
+
+msgid "Allowed connect ports"
+msgstr "允许的连接端口"
+
+msgid "Bind address"
+msgstr "绑定地址"
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+"默认情况下，使用基本的POSIX表达式作为滤规则。启用这个以使用正规表达式代替之。"
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr "默认情况下，过滤规则是不区分大小写的。启用它则转为区分大小写。"
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr "默认情况下，过滤器只匹配域名。启用它以匹配URL。"
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+"默认情况下，过滤规则将以黑名单形式匹配。启用它将仅允许过滤规则里的URL或域名。"
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr "可以是IP地址或者范围，也可以是域名或者以\".\"代表任意主机"
+
+msgid "Configuration"
+msgstr "配置"
+
+msgid "Connection timeout"
+msgstr "连接超时时间"
+
+msgid "Default deny"
+msgstr "默认拒绝"
+
+msgid "Enable Tinyproxy server"
+msgstr "启用Tinyproxy"
+
+msgid "Error page"
+msgstr "错误页面"
+
+msgid "Failed to retrieve statistics from url:"
+msgstr "从url未能检索统计信息"
+
+msgid "Filter by RegExp"
+msgstr "正则表达式过滤器"
+
+msgid "Filter by URLs"
+msgstr "基于URL的过滤器"
+
+msgid "Filter case-sensitive"
+msgstr "过滤器大小写敏感"
+
+msgid "Filter file"
+msgstr "过滤器文件"
+
+msgid "Filtering and ACLs"
+msgstr "过滤规则和访问控制列表"
+
+msgid "General settings"
+msgstr "基本设置"
+
+msgid "Group"
+msgstr "运行组"
+
+msgid "HTML template file to serve for stat host requests"
+msgstr "为统计主机HTML模板文件"
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr "HTTP出错页面HTML模板"
+
+msgid "Header whitelist"
+msgstr "头白名单"
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr "允许访问代理服务器的IP或IP段列表"
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr "允许CONNECT方法连接的端口列表,0代表所有端口。"
+
+msgid "Listen address"
+msgstr "服务地址"
+
+msgid "Listen port"
+msgstr "服务端口"
+
+msgid "Log file"
+msgstr "日志文件"
+
+msgid "Log file to use for dumping messages"
+msgstr "用于消息转储的日志文件"
+
+msgid "Log level"
+msgstr "记录等级"
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr "冗长的Tinyproxy过程日志"
+
+msgid "Max. clients"
+msgstr "最大客户端数"
+
+msgid "Max. requests per server"
+msgstr "单进程最大请求数"
+
+msgid "Max. spare servers"
+msgstr "最多备用服务器"
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr "允许同时连接的最大客户端数量"
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr "单个进程允许的最多请求数，超过这个值，进程将重启。0表示不限制。"
+
+msgid "Maximum number of prepared idle processes"
+msgstr "备用进程数的最大值"
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr "活动连接保持打开的最长秒数"
+
+msgid "Min. spare servers"
+msgstr "最少备用服务器"
+
+msgid "Minimum number of prepared idle processes"
+msgstr "备用进程数的最小值"
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr "启动Tinyproxy时开启的进程数"
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr "用于过滤器的文本，包含URL或者域名，每行一条。"
+
+msgid "Policy"
+msgstr "策略"
+
+msgid "Privacy settings"
+msgstr "策略设置"
+
+msgid "Reject access"
+msgstr "拒绝访问"
+
+msgid "Server Settings"
+msgstr "服务器设置"
+
+msgid "Server limits"
+msgstr "服务器限制"
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr "指定HTTP报头名称可直通的,其它将被丢弃。保留空，禁用头过滤"
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr "Tinyproxy正在侦听请求的指定HTTP端口"
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr "通过HTTP头使用指定Tinyproxy主机名"
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr "指定服务器向外转发请求时所使用的地址"
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr "指定服务器接收代理请求所使用的地址"
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr "指定Tinyproxy进程所属组"
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr "指定上级代理. 格式 <code>IP地址:端口</code>"
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr "指定Tinyproxy进程所属用户"
+
+msgid "Start spare servers"
+msgstr "启动备用服务器"
+
+msgid "Statistics page"
+msgstr "统计页面"
+
+msgid "Status"
+msgstr "状态"
+
+msgid "Target host"
+msgstr "目标主机"
+
+msgid "Tinyproxy"
+msgstr "Tinyproxy"
+
+msgid "Tinyproxy Status"
+msgstr "Tinyproxy状态"
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr "Tinyproxy是一个轻量级无缓存机制的高速HTTP(S)代理服务器"
+
+msgid "Upstream Proxies"
+msgstr "上级代理"
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr "当访问特定IP地址或域名时，使用外出代理规则定义的代理服务器。"
+
+msgid "Use syslog"
+msgstr "使用系统日志服务"
+
+msgid "User"
+msgstr "运行用户"
+
+msgid "Via hostname"
+msgstr "通过主机名"
+
+msgid "Via proxy"
+msgstr "通过代理"
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr "将日志写入系统日志以代替指定的日志文件"
+
+msgid "X-Tinyproxy header"
+msgstr "X-Tinyproxy头"
diff --git a/trunk/package/luci/po/zh_CN/transmission.po b/trunk/package/luci/po/zh_CN/transmission.po
new file mode 100644
index 00000000..9dd34915
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/transmission.po
@@ -0,0 +1,295 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-08 14:06+0200\n"
+"PO-Revision-Date: 2014-06-15 04:57+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "临时下载限速"
+
+msgid "Alternative speed enabled"
+msgstr "启用临时限速"
+
+msgid "Alternative speed time begin"
+msgstr "计划限速始于"
+
+msgid "Alternative speed time day"
+msgstr "计划限速日期"
+
+msgid "Alternative speed time end"
+msgstr "计划限速止于"
+
+msgid "Alternative speed timing enabled"
+msgstr "启用计划限速"
+
+msgid "Alternative upload speed"
+msgstr "临时上传速度"
+
+msgid "Automatically start added torrents"
+msgstr "种子自动下载"
+
+msgid "Bandwidth settings"
+msgstr "带宽配置"
+
+msgid "Binding address IPv4"
+msgstr "绑定IPv4地址"
+
+msgid "Binding address IPv6"
+msgstr "绑定IPv6地址"
+
+msgid "Block list enabled"
+msgstr "启用阻止列表"
+
+msgid "Blocklist URL"
+msgstr "URL阻止清单"
+
+msgid "Blocklists"
+msgstr "阻止清单"
+
+msgid "Cache size in MB"
+msgstr "缓存大小（MB）"
+
+msgid "Config file directory"
+msgstr "配置文件的目录"
+
+msgid "DHT enabled"
+msgstr "启用DHT"
+
+msgid "Debug"
+msgstr "调试"
+
+msgid "Download directory"
+msgstr "下载目录"
+
+msgid "Download queue enabled"
+msgstr "启用下载队列"
+
+msgid "Download queue size"
+msgstr "下载队列大小"
+
+msgid "Enable watch directory"
+msgstr "启用种子轮询目录"
+
+msgid "Enabled"
+msgstr "启用"
+
+msgid "Encryption"
+msgstr "加密"
+
+msgid "Error"
+msgstr "错误"
+
+msgid "Fast"
+msgstr "快速"
+
+msgid "Files and Locations"
+msgstr "文件和位置"
+
+msgid "Forced"
+msgstr "强制"
+
+msgid "Full"
+msgstr "全分配"
+
+msgid "Global peer limit"
+msgstr "全局Peer限制"
+
+msgid "Global settings"
+msgstr "全局设置"
+
+msgid "Idle seeding limit"
+msgstr "空闲做种限时"
+
+msgid "Idle seeding limit enabled"
+msgstr "启用空闲做种时间"
+
+msgid "Incomplete directory"
+msgstr "未完成目录"
+
+msgid "Incomplete directory enabled"
+msgstr "启用未完成目录"
+
+msgid "Info"
+msgstr "信息"
+
+msgid "LPD enabled"
+msgstr "启用LPD"
+
+msgid "Lazy bitfield enabled"
+msgstr "启用位段延迟"
+
+msgid "Message level"
+msgstr "消息级别"
+
+msgid "Miscellaneous"
+msgstr "其他参数"
+
+msgid "None"
+msgstr "空"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr "生效日期是对应日期的算术加和值。对应关系：周日-1、周一-2、周二-4、周三-8、周四-16、周五-32、周六-64。"
+
+msgid "Off"
+msgstr "关闭"
+
+msgid "Open Web Interface"
+msgstr "Web管理界面"
+
+msgid "PEX enabled"
+msgstr "启用PEX"
+
+msgid "Peer Port settings"
+msgstr "Peer端口设置"
+
+msgid "Peer congestion algorithm"
+msgstr "Peer拥塞算法"
+
+msgid "Peer limit per torrent"
+msgstr "每个种子Peer限制数"
+
+msgid "Peer port"
+msgstr "Peer端口"
+
+msgid "Peer port random high"
+msgstr "Peer随机端口最大值"
+
+msgid "Peer port random low"
+msgstr "Peer随机端口最小值"
+
+msgid "Peer port random on start"
+msgstr "Peer端口随机"
+
+msgid "Peer settings"
+msgstr "Peer设置"
+
+msgid "Peer socket tos"
+msgstr "Peer套接字tos值"
+
+msgid "Port forwarding enabled"
+msgstr "启用端口转发"
+
+msgid "Preferred"
+msgstr "优先"
+
+msgid "Prefetch enabled"
+msgstr "启用预取缓存"
+
+msgid "Queue stalled enabled"
+msgstr "启用队列暂停"
+
+msgid "Queue stalled minutes"
+msgstr "队列暂停分钟"
+
+msgid "Queueing"
+msgstr "队列"
+
+msgid "RPC URL"
+msgstr "RPC URL"
+
+msgid "RPC authentication required"
+msgstr "PRC授权验证"
+
+msgid "RPC bind address"
+msgstr "RPC绑定地址"
+
+msgid "RPC enabled"
+msgstr "启用PRC"
+
+msgid "RPC password"
+msgstr "RPC密码"
+
+msgid "RPC port"
+msgstr "RPC端口"
+
+msgid "RPC settings"
+msgstr "RPC配置"
+
+msgid "RPC username"
+msgstr "RPC用户名"
+
+msgid "RPC whitelist"
+msgstr "RPC白名单"
+
+msgid "RPC whitelist enabled"
+msgstr "启用RPC白名单"
+
+msgid "Ratio limit"
+msgstr "分享率限值"
+
+msgid "Ratio limit enabled"
+msgstr "启用分享率限制"
+
+msgid "Rename partial files"
+msgstr "重命名未完成文件"
+
+msgid "Run daemon as user"
+msgstr "用户组"
+
+msgid "Scheduling"
+msgstr "计划任务"
+
+msgid "Scrape paused torrents enabled"
+msgstr "忽略暂停的种子"
+
+msgid "Script torrent done enabled"
+msgstr "种子完成时运行脚本"
+
+msgid "Script torrent done filename"
+msgstr "脚本文件名"
+
+msgid "Seed queue enabled"
+msgstr "启用做种队列"
+
+msgid "Seed queue size"
+msgstr "做种队列大小"
+
+msgid "Speed limit down"
+msgstr "下载限速"
+
+msgid "Speed limit down enabled"
+msgstr "启用下载限速"
+
+msgid "Speed limit up"
+msgstr "上传限速"
+
+msgid "Speed limit up enabled"
+msgstr "启用上传限速"
+
+msgid "Transmission"
+msgstr "Transmission"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr "Transmission是个简单易用的BT/PT客户端。"
+
+msgid "Trash original torrent files"
+msgstr "删除种子源文件"
+
+msgid "Upload slots per torrent"
+msgstr "每个种子上传连接数"
+
+msgid "Watch directory"
+msgstr "轮询种子目录"
+
+msgid "in minutes from midnight"
+msgstr "从晚上00:00起的分钟数，限速到临时速度"
+
+msgid "preallocation"
+msgstr "磁盘预分配策略"
+
+msgid "uTP enabled"
+msgstr "启用uTP"
diff --git a/trunk/package/luci/po/zh_CN/upnp.po b/trunk/package/luci/po/zh_CN/upnp.po
new file mode 100644
index 00000000..1749b9e7
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/upnp.po
@@ -0,0 +1,149 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2012-09-03 18:02+0200\n"
+"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr "指定外部端口的ACL可能会被重定向至某些内部地址及端口"
+
+msgid "Action"
+msgstr "动作"
+
+msgid "Active UPnP Redirects"
+msgstr "活动的UPnP重定向"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "允许添加只转发给请求的IP地址(当启用时，UPnP的客户可以只转发到其IP)"
+
+msgid "Announced model number"
+msgstr "公布的型号"
+
+msgid "Announced serial number"
+msgstr "公布的序列号"
+
+msgid "Clean rules interval"
+msgstr "定时自动清除无效规则"
+
+msgid "Clean rules threshold"
+msgstr "启动时清除端口转发"
+
+msgid "Client Address"
+msgstr "客户端地址"
+
+msgid "Client Port"
+msgstr "客户端端口"
+
+msgid "Collecting data..."
+msgstr "正在收集数据"
+
+msgid "Comment"
+msgstr "备注"
+
+msgid "Delete Redirect"
+msgstr "删除转发规则"
+
+msgid "Device UUID"
+msgstr "设备UUID"
+
+msgid "Downlink"
+msgstr "下行速率"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "启用NAT-PMP功能"
+
+msgid "Enable UPnP functionality"
+msgstr "启用UPnP功能"
+
+msgid "Enable additional logging"
+msgstr "启用额外的日志记录"
+
+msgid "Enable secure mode"
+msgstr "启用安全模式"
+
+msgid "External Port"
+msgstr "外部端口"
+
+msgid "External ports"
+msgstr "外部端口"
+
+msgid "General Settings"
+msgstr "一般设置"
+
+msgid "Internal addresses"
+msgstr "内部地址"
+
+msgid "Internal ports"
+msgstr "内部端口"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP的ACL"
+
+msgid "MiniUPnP settings"
+msgstr "MiniUPnP设置"
+
+msgid "Notify interval"
+msgstr "警报间隔"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Presentation URL"
+msgstr "显示URL"
+
+msgid "Protocol"
+msgstr "协议"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "提取额外的调试信息至系统日志"
+
+msgid "Report system instead of daemon uptime"
+msgstr "用系统运行时间代替进程运行时间"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "启动UPnP与NAT-PMP服务"
+
+msgid "There are no active redirects."
+msgstr "没有活动的重定向"
+
+msgid "UPNP"
+msgstr "UPNP"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr "UPnP允许局域网内客户端自动设置路由上的端口转发。"
+
+msgid "UPnP lease file"
+msgstr "UPnP租约文件"
+
+msgid "Universal Plug & Play"
+msgstr "通用即插即用(UPnP)"
+
+msgid "Uplink"
+msgstr "上行速率"
+
+msgid "Value in KByte/s, informational only"
+msgstr "值为KByte/s，仅供参考"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr "UPnP允许局域网内客户端自动设置路由上的端口转发。"
+
+#~ msgid "enable"
+#~ msgstr "启用"
diff --git a/trunk/package/luci/po/zh_CN/ushare.po b/trunk/package/luci/po/zh_CN/ushare.po
new file mode 100644
index 00000000..f426526e
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/ushare.po
@@ -0,0 +1,52 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
+"PO-Revision-Date: 2012-09-18 16:26+0200\n"
+"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
+"Language-Team: QQ Group 75543259\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "目录"
+
+msgid "Disable telnet console"
+msgstr "关闭telnet管理"
+
+msgid "Disable webinterface"
+msgstr "关闭界面管理"
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Interface"
+msgstr "网络接口"
+
+msgid "Options"
+msgstr "选项"
+
+msgid "Servername"
+msgstr "服务器名"
+
+msgid "Settings"
+msgstr "设置"
+
+msgid "Username"
+msgstr "用户名"
+
+msgid "uShare"
+msgstr "UPNP流媒体服务"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr ""
+"uShare是一个UPnP(TM) A/V和DLNA媒体服务器。可以将多媒体文件共享到支持UPnP的设"
+"备上。"
diff --git a/trunk/package/luci/po/zh_CN/uvc_streamer.po b/trunk/package/luci/po/zh_CN/uvc_streamer.po
new file mode 100644
index 00000000..f6745ad9
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/uvc_streamer.po
@@ -0,0 +1,41 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-10 05:44+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "FPS"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "分辨率"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "设置"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "网络相机流"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr "配置兼容的网络相机。用浏览器访问<a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/trunk/package/luci/po/zh_CN/vnstat.po b/trunk/package/luci/po/zh_CN/vnstat.po
new file mode 100644
index 00000000..68e4905f
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/vnstat.po
@@ -0,0 +1,61 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-08 14:05+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: German\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configuration"
+msgstr "配置"
+
+msgid "Daily traffic"
+msgstr "流量日报"
+
+msgid "Graphs"
+msgstr "图表"
+
+msgid "Hourly traffic"
+msgstr "流量时报"
+
+msgid "Monitor selected interfaces"
+msgstr "监控选择的接口"
+
+msgid "Monthly traffic"
+msgstr "流量月报"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr "没有创建统计数据。 去VnStat配置，并启动监控一个或多个接口。"
+
+msgid "Restart VnStat"
+msgstr "重置VnStat"
+
+msgid "Summary display"
+msgstr "摘要显示"
+
+msgid "Top 10 display"
+msgstr "显示前10"
+
+msgid "Update »"
+msgstr "更新"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "VnStat图表"
+
+msgid "VnStat Traffic Monitor"
+msgstr "VNStat流量监控"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr "vnstat是一个网络流量监控器，用于Linux保留所选接口的网络流量日志。"
diff --git a/trunk/package/luci/po/zh_CN/voice_core.po b/trunk/package/luci/po/zh_CN/voice_core.po
new file mode 100644
index 00000000..09788894
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-08 13:41+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "话机"
+
+msgid "Voice"
+msgstr "语音"
diff --git a/trunk/package/luci/po/zh_CN/voice_diag.po b/trunk/package/luci/po/zh_CN/voice_diag.po
new file mode 100644
index 00000000..4bad894e
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/voice_diag.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-10-08 13:50+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Diagnostics"
+msgstr "检测"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr "检测您已在设备上安装的模块。"
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr "菜单下的选项，允许您配置和执行语音相关的测试。这些动作称为检测。"
diff --git a/trunk/package/luci/po/zh_CN/watchcat.po b/trunk/package/luci/po/zh_CN/watchcat.po
new file mode 100644
index 00000000..991fc48a
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/watchcat.po
@@ -0,0 +1,65 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2012-09-24 18:18+0200\n"
+"Last-Translator: shanliren <shanliren.net@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "强制重启延时"
+
+msgid "Host address to ping"
+msgstr "ping主机地址"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"检测网络连接的频率。默认单位为秒，你可以使用'm'作为后缀表示分钟，‘h’表示小"
+"时‘d’表示天。"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"在周期模式，此处定义了重启的周期。在联网模式，这个表示没有网络连接情况下到执"
+"行重启的最长时间间隔。默认单位为秒，你可以使用'm'作为后缀表示分钟，‘h’表示小"
+"时‘d’表示天。"
+
+msgid "Operating mode"
+msgstr "操作模式"
+
+msgid "Period"
+msgstr "周期"
+
+msgid "Ping host"
+msgstr "ping主机"
+
+msgid "Ping period"
+msgstr "ping周期"
+
+msgid "Watchcat"
+msgstr "WatchCat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr "WatchCat允许设置周期性的重启 和/或者 当网络连接断开达规定时间。"
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"当重启系统的时候WatchCat将会触发一个软重启，在这里输入一个非0的值，如果软重启"
+"失败将会触发一个延迟的硬重启。输入秒数启用，输入0禁止功能。"
diff --git a/trunk/package/luci/po/zh_CN/wol.po b/trunk/package/luci/po/zh_CN/wol.po
new file mode 100644
index 00000000..6d9cc722
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/wol.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2012-06-21 17:52+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "向所有接口广播"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "选择要唤醒的主机或者输入自定义mac地址"
+
+msgid "Host to wake up"
+msgstr "选择要唤醒的主机"
+
+msgid "Network interface to use"
+msgstr "选择使用的网络接口"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr "有时只有一个工具生效。如果其中一个失效，请尝试另一个"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "限定网络唤醒数据包将被发送到的接口"
+
+msgid "Starting WoL utility:"
+msgstr "正在启动网络唤醒工具"
+
+msgid "Wake on LAN"
+msgstr "网络唤醒"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr "网络唤醒提供了从远程启动本地网络内计算机的机制。"
+
+msgid "Wake up host"
+msgstr "唤醒主机"
+
+msgid "WoL program"
+msgstr "网络唤醒程序"
diff --git a/trunk/package/luci/po/zh_CN/wshaper.po b/trunk/package/luci/po/zh_CN/wshaper.po
new file mode 100644
index 00000000..a35ccd02
--- /dev/null
+++ b/trunk/package/luci/po/zh_CN/wshaper.po
@@ -0,0 +1,58 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-03 08:25+0200\n"
+"PO-Revision-Date: 2013-10-10 20:15+0200\n"
+"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr "下载链接"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "下载带宽kbit/s"
+
+msgid "Host or Network in CIDR notation."
+msgstr "主机或网络的CIDR标记。"
+
+msgid "Interface"
+msgstr "端口"
+
+msgid "Low priority destination ports"
+msgstr "低优先级目标端口"
+
+msgid "Low priority hosts (Destination)"
+msgstr "低优先级目标主机"
+
+msgid "Low priority hosts (Source)"
+msgstr "低优先级源主机"
+
+msgid "Low priority source ports"
+msgstr "低优先级源端口"
+
+msgid "Uplink"
+msgstr "上联"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "上行带宽kbit/s"
+
+msgid "Wondershaper"
+msgstr "Wondershaper"
+
+msgid "Wondershaper settings"
+msgstr "Wondershaper设置"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper通过流量匹配,确保低延时的交互数据包，甚至当你的互联网连接是高度饱"
+"和。"
diff --git a/trunk/package/luci/po/zh_TW/ahcp.po b/trunk/package/luci/po/zh_TW/ahcp.po
new file mode 100644
index 00000000..dc7f6c5a
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/ahcp.po
@@ -0,0 +1,109 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-10 12:30+0200\n"
+"Last-Translator: mp607 <mickey60711@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "AHCP Server"
+msgstr "AHCP伺服器"
+
+msgid ""
+"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
+"networks designed to be used in place of router discovery or DHCP on "
+"networks where it is difficult or impossible to configure a server within "
+"every link-layer broadcast domain, for example mobile ad-hoc networks."
+msgstr ""
+
+msgid "Active AHCP Leases"
+msgstr ""
+
+msgid "Address"
+msgstr "位置"
+
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+msgid "Age"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr "匿名的DNS伺服器"
+
+msgid "Announced NTP servers"
+msgstr "匿名的NTP伺服器"
+
+msgid "Announced prefixes"
+msgstr "匿名的前綴"
+
+msgid "Collecting data..."
+msgstr "收集資料"
+
+msgid "Forwarder"
+msgstr ""
+
+msgid "General Setup"
+msgstr "一般設定"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 和 IPv6"
+
+msgid "IPv4 only"
+msgstr "只有IPv4"
+
+msgid "IPv6 only"
+msgstr "只有IPv6"
+
+msgid "Lease directory"
+msgstr "租用目錄"
+
+msgid "Lease validity time"
+msgstr "租用有效時間"
+
+msgid "Log file"
+msgstr "記錄檔"
+
+msgid "Multicast address"
+msgstr "多點廣播位置"
+
+msgid "Operation mode"
+msgstr "操作模式"
+
+msgid "Port"
+msgstr "通訊埠"
+
+msgid "Protocol family"
+msgstr "協定群組"
+
+msgid "Served interfaces"
+msgstr "提供服務的界面"
+
+msgid "Server"
+msgstr "伺服器"
+
+msgid "Specifies the announced IPv4 and IPv6 NTP servers"
+msgstr "特別的匿名IPv4 與 IPv6 NTP 伺服器"
+
+msgid "Specifies the announced IPv4 and IPv6 name servers"
+msgstr "特別的匿名IPv4 與 IPv6 名稱伺服器"
+
+msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
+msgstr "特別的匿名IPv4 與 IPv6 網路CIDR前綴"
+
+msgid "The AHCP Service is not running."
+msgstr "AHCP服務沒有運作"
+
+msgid "The AHCP Service is running with ID %s."
+msgstr "AHCP服務運作中 ID為 %s"
+
+msgid "There are no active leases."
+msgstr "沒有使用中的租用"
+
+msgid "Unique ID file"
+msgstr "獨立的ID檔案"
diff --git a/trunk/package/luci/po/zh_TW/asterisk.po b/trunk/package/luci/po/zh_TW/asterisk.po
new file mode 100644
index 00000000..c7eef9d1
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/asterisk.po
@@ -0,0 +1,13 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-06 23:52+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
diff --git a/trunk/package/luci/po/zh_TW/base.po b/trunk/package/luci/po/zh_TW/base.po
new file mode 100644
index 00000000..969c6c7d
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/base.po
@@ -0,0 +1,3013 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-21 10:34+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "(%d minute window, %d second interval)"
+msgstr "(%d 分鐘訊息, %d 秒更新)"
+
+msgid "(%s available)"
+msgstr "(%s 可用)"
+
+msgid "(empty)"
+msgstr "(空白)"
+
+msgid "(no interfaces attached)"
+msgstr "(未連接界面)"
+
+msgid "-- Additional Field --"
+msgstr "-- 更多選項 --"
+
+msgid "-- Please choose --"
+msgstr "-- 請選擇 --"
+
+msgid "-- custom --"
+msgstr "-- 自訂 --"
+
+msgid "1 Minute Load:"
+msgstr "1分鐘負載"
+
+msgid "15 Minute Load:"
+msgstr "15分鐘負載"
+
+msgid "5 Minute Load:"
+msgstr "5分鐘負載"
+
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 查詢通訊埠"
+
+msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
+msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 伺服器通訊埠"
+
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
+"order of the resolvfile"
+msgstr "將會按照指定的順序查詢<abbr title=\"Domain Name System\">DNS</abbr>"
+
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-位置"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-閘道"
+
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
+msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-遮罩"
+
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
+msgstr ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-位置或網路(CIDR)"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
+msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-閘道"
+
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 名稱"
+
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
+msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-位置"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> leases"
+msgstr ""
+"<abbr title=\"maximal\">最大</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> 分配數量"
+
+msgid ""
+"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> packet size"
+msgstr ""
+"<abbr title=\"maximal\">最大</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> 封包大小"
+
+msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
+msgstr "<abbr title=\"maximal\">最大</abbr>並發查詢數"
+
+msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
+
+msgid "ADSL"
+msgstr ""
+
+msgid "ADSL Status"
+msgstr ""
+
+msgid "APN"
+msgstr "APN"
+
+msgid "AR Support"
+msgstr "AR支援"
+
+msgid "ARP retry threshold"
+msgstr "ARP重試門檻"
+
+msgid "ATM Bridges"
+msgstr "ATM橋接"
+
+msgid "ATM Virtual Channel Identifier (VCI)"
+msgstr "ATM虛擬通道識別(VCI)"
+
+msgid "ATM Virtual Path Identifier (VPI)"
+msgstr "ATM虛擬路徑識別(VPI)"
+
+msgid ""
+"ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
+"Linux network interfaces which can be used in conjunction with DHCP or PPP "
+"to dial into the provider network."
+msgstr ""
+"ATM橋接是以AAL5協定封裝乙太網路如同虛擬Linux網路界面卡，用於連接DHCP或PPP來撥"
+"號連接到網際網路。"
+
+msgid "ATM device number"
+msgstr "ATM裝置號碼"
+
+msgid "Access Concentrator"
+msgstr "接入集線器"
+
+msgid "Access Point"
+msgstr "存取點 (AP)"
+
+msgid "Action"
+msgstr "動作"
+
+msgid "Actions"
+msgstr "動作"
+
+msgid "Activate this network"
+msgstr "啟用此網路"
+
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+msgstr "啟用 <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-路由"
+
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+msgstr "啟用 <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-路由"
+
+msgid "Active Connections"
+msgstr "啟用連線"
+
+msgid "Active DHCP Leases"
+msgstr "已分配的DHCP租用"
+
+msgid "Active DHCPv6 Leases"
+msgstr "已分配的DHCPv6租用"
+
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+msgid "Add"
+msgstr "增加"
+
+msgid "Add local domain suffix to names served from hosts files"
+msgstr "添加本地網域微碼到HOSTS檔案"
+
+msgid "Add new interface..."
+msgstr "增加新界面"
+
+msgid "Additional Hosts files"
+msgstr "額外的HOST檔案"
+
+msgid "Address"
+msgstr "位置"
+
+msgid "Address to access local relay bridge"
+msgstr "存取本地中繼橋接位置"
+
+msgid "Administration"
+msgstr "管理"
+
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+msgid "Alert"
+msgstr "警示"
+
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
+msgstr "允許 <abbr title=\"Secure Shell\">SSH</abbr> 密碼驗證"
+
+msgid "Allow all except listed"
+msgstr "僅允許列表外"
+
+msgid "Allow listed only"
+msgstr "僅允許列表內"
+
+msgid "Allow localhost"
+msgstr "允許本機"
+
+msgid "Allow remote hosts to connect to local SSH forwarded ports"
+msgstr "允許遠端主機連接到本機SSH轉送通訊埠"
+
+msgid "Allow root logins with password"
+msgstr "允許root登入"
+
+msgid "Allow the <em>root</em> user to login with password"
+msgstr "允許 <em>root</em> 使用者登入"
+
+msgid ""
+"Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
+msgstr "允許127.0.0.0/8範圍內的上游回應，例如：RBL服務"
+
+msgid "Always announce default router"
+msgstr ""
+
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr "強制啟用40MHz頻寬並忽略輔助通道重疊。此選項不相容於IEEE 802.11n-2009!"
+
+msgid "An additional network will be created if you leave this unchecked."
+msgstr "取消選取將會另外建立一個新網路，而不會覆蓋目前的網路設定"
+
+msgid "Announce as default router even if no public prefix is available."
+msgstr ""
+
+msgid "Announced DNS domains"
+msgstr ""
+
+msgid "Announced DNS servers"
+msgstr ""
+
+msgid "Antenna 1"
+msgstr "天線 1"
+
+msgid "Antenna 2"
+msgstr "天線 2"
+
+msgid "Antenna Configuration"
+msgstr "天線設定"
+
+msgid "Any zone"
+msgstr "任意區域"
+
+msgid "Apply"
+msgstr "套用"
+
+msgid "Applying changes"
+msgstr "正在套用變更"
+
+msgid ""
+"Assign a part of given length of every public IPv6-prefix to this interface"
+msgstr ""
+
+msgid "Assign interfaces..."
+msgstr "分配界面..."
+
+msgid ""
+"Assign prefix parts using this hexadecimal subprefix ID for this interface."
+msgstr ""
+
+msgid "Associated Stations"
+msgstr "已連接站點"
+
+msgid "Atheros 802.11%s Wireless Controller"
+msgstr "Atheros 802.11%s 無線控制器"
+
+msgid "Authentication"
+msgstr "認證"
+
+msgid "Authoritative"
+msgstr "授權"
+
+msgid "Authorization Required"
+msgstr "需要授權"
+
+msgid "Auto Refresh"
+msgstr "自動更新"
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Automatic Homenet (HNCP)"
+msgstr ""
+
+msgid "Available"
+msgstr "可用"
+
+msgid "Available packages"
+msgstr "可用軟體包"
+
+msgid "Average:"
+msgstr "平均:"
+
+msgid "BSSID"
+msgstr "BSSID"
+
+msgid "Back"
+msgstr "返回"
+
+msgid "Back to Overview"
+msgstr "返回至總覽"
+
+msgid "Back to configuration"
+msgstr "返回至設定"
+
+msgid "Back to overview"
+msgstr "返回至總覽"
+
+msgid "Back to scan results"
+msgstr "返回至掃描結果"
+
+msgid "Background Scan"
+msgstr "背景搜尋"
+
+msgid "Backup / Flash Firmware"
+msgstr "備份/升級韌體"
+
+msgid "Backup / Restore"
+msgstr "備份/還原"
+
+msgid "Backup file list"
+msgstr "備份檔列表"
+
+msgid "Bad address specified!"
+msgstr "指定了錯誤的位置！"
+
+msgid "Band"
+msgstr ""
+
+msgid ""
+"Below is the determined list of files to backup. It consists of changed "
+"configuration files marked by opkg, essential base files and the user "
+"defined backup patterns."
+msgstr ""
+"下面是待備份的檔案清單。包含了更改的設定檔案、必要的基本檔案和使用者自訂的備"
+"份檔案"
+
+msgid "Bitrate"
+msgstr "傳輸速率"
+
+msgid "Bogus NX Domain Override"
+msgstr "忽略NX網域解析"
+
+msgid "Bridge"
+msgstr "橋接"
+
+msgid "Bridge interfaces"
+msgstr "橋接介面"
+
+msgid "Bridge unit number"
+msgstr "橋接單位號碼"
+
+msgid "Bring up on boot"
+msgstr "開機自動執行"
+
+msgid "Broadcom 802.11%s Wireless Controller"
+msgstr "Broadcom 802.11%s 無線控制器"
+
+msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+msgstr "Broadcom BCM%04x 802.11 無線控制器"
+
+msgid "Buffered"
+msgstr "已緩衝"
+
+msgid "Buttons"
+msgstr "按鈕"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "CPU usage (%)"
+msgstr "CPU 使用率 (%)"
+
+msgid "Cached"
+msgstr "已快取"
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "Category"
+msgstr ""
+
+msgid "Chain"
+msgstr "鏈"
+
+msgid "Changes"
+msgstr "待修改"
+
+msgid "Changes applied."
+msgstr "修改已套用"
+
+msgid "Changes the administrator password for accessing the device"
+msgstr "修改管理員密碼"
+
+msgid "Channel"
+msgstr "頻道"
+
+msgid "Check"
+msgstr "檢查"
+
+msgid "Checksum"
+msgstr "效驗碼"
+
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
+msgstr ""
+"選擇你要指定給這介面的防火牆區. 撿選<em>unspecified</em>以便從指定區域除這個"
+"介面或者填寫<em>create</em>欄以便定義附加這個介面到一個新的區域上."
+
+msgid ""
+"Choose the network(s) you want to attach to this wireless interface or fill "
+"out the <em>create</em> field to define a new network."
+msgstr ""
+"選擇你要附加到無線網路介面的多個網路或者填寫<em>create</em> 以便定義一個新的"
+"網路."
+
+msgid "Cipher"
+msgstr "暗號"
+
+msgid ""
+"Click \"Generate archive\" to download a tar archive of the current "
+"configuration files. To reset the firmware to its initial state, click "
+"\"Perform reset\" (only possible with squashfs images)."
+msgstr ""
+"按下\"壓縮檔製作\"就能下載目前設定檔的tar格式的壓縮. 要重置回復出廠值,按下"
+"\"執行還原\"(可能只對squashfs影像檔有效)"
+
+msgid "Client"
+msgstr "用戶端"
+
+msgid "Client ID to send when requesting DHCP"
+msgstr "當要求DHCP時要傳送的用戶識別碼ID"
+
+msgid ""
+"Close inactive connection after the given amount of seconds, use 0 to "
+"persist connection"
+msgstr "幾秒後關閉閒置的連線, 打0代表永遠連線"
+
+msgid "Close list..."
+msgstr "關閉清單中..."
+
+msgid "Collecting data..."
+msgstr "收集資料中..."
+
+msgid "Command"
+msgstr "指令"
+
+msgid "Common Configuration"
+msgstr "一般設定"
+
+msgid "Compression"
+msgstr "壓縮"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "Configuration applied."
+msgstr "啟用設定"
+
+msgid "Configuration files will be kept."
+msgstr "設定檔將被存檔"
+
+msgid "Configures this mount as overlay storage for block-extroot"
+msgstr "要採用block-extroot功能,設定這個掛載點當作覆蓋儲存"
+
+msgid "Confirmation"
+msgstr "再確認"
+
+msgid "Connect"
+msgstr "連線"
+
+msgid "Connected"
+msgstr "已連線"
+
+msgid "Connection Limit"
+msgstr "連線限制"
+
+msgid "Connections"
+msgstr "連線數"
+
+msgid "Country"
+msgstr "國別"
+
+msgid "Country Code"
+msgstr "國別碼"
+
+msgid "Cover the following interface"
+msgstr "覆蓋下列介面"
+
+msgid "Cover the following interfaces"
+msgstr "覆蓋下列這些介面"
+
+msgid "Create / Assign firewall-zone"
+msgstr "建立/指定防火牆作用區"
+
+msgid "Create Interface"
+msgstr "建立介面"
+
+msgid "Create a bridge over multiple interfaces"
+msgstr "在多個介面上建立橋接"
+
+msgid "Critical"
+msgstr "緊急"
+
+msgid "Cron Log Level"
+msgstr "Cron的日誌級別"
+
+msgid "Custom Interface"
+msgstr "自訂介面"
+
+msgid "Custom delegated IPv6-prefix"
+msgstr ""
+
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
+msgstr ""
+"如果可以的話,自定這個設備的動作 <abbr title=\"Light Emitting Diode\">LED</"
+"abbr>s ."
+
+msgid "DHCP Leases"
+msgstr "DHCP的釋放週期"
+
+msgid "DHCP Server"
+msgstr "DHCP伺服器"
+
+msgid "DHCP and DNS"
+msgstr "DHCP 和 DNS"
+
+msgid "DHCP client"
+msgstr "DHCP用戶端"
+
+msgid "DHCP-Options"
+msgstr "DHCP選項"
+
+msgid "DHCPv6 Leases"
+msgstr "DHCPv6版釋放時間週期"
+
+msgid "DHCPv6 client"
+msgstr ""
+
+msgid "DHCPv6-Mode"
+msgstr ""
+
+msgid "DHCPv6-Service"
+msgstr ""
+
+msgid "DNS"
+msgstr "網域名稱伺服器"
+
+msgid "DNS forwardings"
+msgstr "DNS封包轉發"
+
+msgid "DNS-Label / FQDN"
+msgstr ""
+
+msgid "DS-Lite AFTR address"
+msgstr ""
+
+msgid "DUID"
+msgstr "DHCP獨立式別碼DUID "
+
+msgid "Debug"
+msgstr "除錯"
+
+msgid "Default %d"
+msgstr "預設 %d"
+
+msgid "Default gateway"
+msgstr "預設匝道器"
+
+msgid "Default state"
+msgstr "預設狀態"
+
+msgid "Define a name for this network."
+msgstr "自訂這個網路名稱"
+
+msgid ""
+"Define additional DHCP options, for example "
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
+"servers to clients."
+msgstr ""
+"定義額外的DHCP選項,例如\"<code>6,192.168.2.1,192.168.2.2</code>\"將會通告不同"
+"的DNS伺服器到客戶端."
+
+msgid "Delete"
+msgstr "刪除"
+
+msgid "Delete this interface"
+msgstr "刪除這個介面"
+
+msgid "Delete this network"
+msgstr "刪除這個網路"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Design"
+msgstr "設計規劃"
+
+msgid "Destination"
+msgstr "目的地"
+
+msgid "Device"
+msgstr "設備"
+
+msgid "Device Configuration"
+msgstr "設定設備"
+
+msgid "Diagnostics"
+msgstr "診斷"
+
+msgid "Directory"
+msgstr "目錄"
+
+msgid "Disable"
+msgstr "關閉"
+
+msgid ""
+"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface."
+msgstr ""
+" 對這介面關閉 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Disable DNS setup"
+msgstr "關閉DNS設置"
+
+msgid "Disable HW-Beacon timer"
+msgstr "關閉硬體燈號計時器"
+
+msgid "Disabled"
+msgstr "關閉"
+
+msgid "Discard upstream RFC1918 responses"
+msgstr "丟棄上游RFC1918 虛擬IP網路的回應"
+
+msgid "Displaying only packages containing"
+msgstr "僅顯示內含的軟體"
+
+msgid "Distance Optimization"
+msgstr "最佳化距離"
+
+msgid "Distance to farthest network member in meters."
+msgstr "到最遠的網路距離以米表示."
+
+msgid "Diversity"
+msgstr "差異"
+
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
+msgstr ""
+" Dnsmasq 是組合<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-伺服器 和 <abbr title=\"Domain Name System\">DNS</abbr>-轉發給 <abbr "
+"title=\"Network Address Translation\">NAT</abbr> 防火牆用"
+
+msgid "Do not cache negative replies, e.g. for not existing domains"
+msgstr "不快取拒絕的回應,例如.不存在的網域"
+
+msgid "Do not forward requests that cannot be answered by public name servers"
+msgstr "對不被公用名稱伺服器回應的請求不轉發"
+
+msgid "Do not forward reverse lookups for local networks"
+msgstr "對本地網域不轉發反解析鎖定"
+
+msgid "Do not send probe responses"
+msgstr "不傳送探測回應"
+
+msgid "Domain required"
+msgstr "網域必要的"
+
+msgid "Domain whitelist"
+msgstr "網域白名單"
+
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
+msgstr ""
+"若沒 <abbr title=\"Domain Name System\">DNS</abbr>-名稱的話,不要轉發 <abbr "
+"title=\"Domain Name System\">DNS</abbr>-請求"
+
+msgid "Download and install package"
+msgstr "下載並安裝軟體包"
+
+msgid "Download backup"
+msgstr "下載備份檔"
+
+msgid "Dropbear Instance"
+msgstr "Dropbear SSH例子"
+
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
+msgstr ""
+"Dropbear 提供 <abbr title=\"Secure Shell\">SSH</abbr> 網路shell命令存取和一個"
+"整合的 <abbr title=\"Secure Copy\">SCP</abbr> 伺服器"
+
+msgid "Dual-Stack Lite (RFC6333)"
+msgstr ""
+
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr "動態 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+
+msgid "Dynamic tunnel"
+msgstr "動態隧道"
+
+msgid ""
+"Dynamically allocate DHCP addresses for clients. If disabled, only clients "
+"having static leases will be served."
+msgstr "幫用戶端動態發配DHCP位址. 假如關閉的話,僅有有靜態位址的用戶端能被服務"
+
+msgid "EAP-Method"
+msgstr "EAP協定驗證方式"
+
+msgid "Edit"
+msgstr "編輯"
+
+msgid "Edit this interface"
+msgstr "修改這個介面"
+
+msgid "Edit this network"
+msgstr "修改這個網路"
+
+msgid "Emergency"
+msgstr "緊急"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "啟用 <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+
+msgid "Enable HE.net dynamic endpoint update"
+msgstr "啟用HE.net服務代管動態更新"
+
+msgid "Enable IPv6 negotiation on the PPP link"
+msgstr "啟用PPP連結上的IPv6交涉"
+
+msgid "Enable Jumbo Frame passthrough"
+msgstr "啟用超大訊框透穿"
+
+msgid "Enable NTP client"
+msgstr "起用NTP用戶功能"
+
+msgid "Enable TFTP server"
+msgstr "啟用TFTP伺服器"
+
+msgid "Enable VLAN functionality"
+msgstr "啟用VLAN功能"
+
+msgid "Enable learning and aging"
+msgstr "啟用智慧學習功能"
+
+msgid "Enable this mount"
+msgstr "啟用掛載點"
+
+msgid "Enable this swap"
+msgstr "啟用swap功能"
+
+msgid "Enable/Disable"
+msgstr "啟用/關閉"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid "Enables the Spanning Tree Protocol on this bridge"
+msgstr "在橋接器上啟用802.1d Spanning Tree協定"
+
+msgid "Encapsulation mode"
+msgstr "封裝模式"
+
+msgid "Encryption"
+msgstr "加密"
+
+msgid "Erasing..."
+msgstr "刪除中..."
+
+msgid "Error"
+msgstr "錯誤"
+
+msgid "Ethernet Adapter"
+msgstr "乙太網路卡"
+
+msgid "Ethernet Switch"
+msgstr "乙太交換器"
+
+msgid "Expand hosts"
+msgstr "延伸主機"
+
+msgid "Expires"
+msgstr "過期"
+
+#, fuzzy
+msgid ""
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
+msgstr "釋放位址的過期週期,最少兩分鐘 (<code>2m</code>)."
+
+msgid "External"
+msgstr ""
+
+msgid "External system log server"
+msgstr "外部系統日誌伺服器"
+
+msgid "External system log server port"
+msgstr "外部系統日誌伺服器埠號"
+
+msgid "Fast Frames"
+msgstr "快速迅框群"
+
+msgid "File"
+msgstr "檔案"
+
+msgid "Filename of the boot image advertised to clients"
+msgstr "開機影像檔通知給用戶端"
+
+msgid "Filesystem"
+msgstr "檔案系統"
+
+msgid "Filter"
+msgstr "過濾器"
+
+msgid "Filter private"
+msgstr "私人過濾器"
+
+msgid "Filter useless"
+msgstr "無用過濾器"
+
+msgid "Find and join network"
+msgstr "搜尋並加入網路"
+
+msgid "Find package"
+msgstr "搜尋軟體包"
+
+msgid "Finish"
+msgstr "完成"
+
+msgid "Firewall"
+msgstr "防火牆"
+
+msgid "Firewall Settings"
+msgstr "防火牆設定"
+
+msgid "Firewall Status"
+msgstr "防火牆狀況"
+
+msgid "Firmware Version"
+msgstr "防火牆版本"
+
+msgid "Fixed source port for outbound DNS queries"
+msgstr "外發DNS請求的固定埠號"
+
+msgid "Flags"
+msgstr "旗標"
+
+msgid "Flash Firmware"
+msgstr "韌體更新"
+
+msgid "Flash image..."
+msgstr "更新映像檔中..."
+
+msgid "Flash new firmware image"
+msgstr "更新新版韌體映像檔"
+
+msgid "Flash operations"
+msgstr "執行更新"
+
+msgid "Flashing..."
+msgstr "更新中..."
+
+msgid "Force"
+msgstr "強制"
+
+msgid "Force 40MHz mode"
+msgstr "強制40MHz模式"
+
+msgid "Force CCMP (AES)"
+msgstr "強制CCMP (AES)加密"
+
+msgid "Force DHCP on this network even if another server is detected."
+msgstr "在網路上即使偵測到其它伺服器也強制採用DHCP的設定"
+
+msgid "Force TKIP"
+msgstr "強制TKIP加密"
+
+msgid "Force TKIP and CCMP (AES)"
+msgstr "強制TKIP+CCMP (AES)加密"
+
+msgid "Forward DHCP traffic"
+msgstr "轉發DHCP流量"
+
+msgid "Forward broadcast traffic"
+msgstr "轉發廣播流量"
+
+msgid "Forwarding mode"
+msgstr "轉發模式"
+
+msgid "Fragmentation Threshold"
+msgstr "分片閥值"
+
+msgid "Frame Bursting"
+msgstr "訊框爆速"
+
+msgid "Free"
+msgstr "空閒"
+
+msgid "Free space"
+msgstr "剩餘空間"
+
+msgid "Frequency Hopping"
+msgstr "跳頻"
+
+msgid "GHz"
+msgstr "GHz"
+
+msgid "GPRS only"
+msgstr "僅用GPRS"
+
+msgid "Gateway"
+msgstr "匝道器"
+
+msgid "Gateway ports"
+msgstr "匝道器埠號"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "General Setup"
+msgstr "一般設置"
+
+msgid "Generate archive"
+msgstr "製作壓縮檔"
+
+msgid "Generic 802.11%s Wireless Controller"
+msgstr "通用 802.11%s 無線控制器"
+
+msgid "Given password confirmation did not match, password not changed!"
+msgstr "鍵入的密碼不吻合,密碼將不變更"
+
+msgid "Global network options"
+msgstr ""
+
+msgid "Go to password configuration..."
+msgstr "到密碼設定頁"
+
+msgid "Go to relevant configuration page"
+msgstr "到相應設定頁"
+
+msgid "Guest"
+msgstr ""
+
+msgid "HE.net password"
+msgstr " HE.net密碼"
+
+msgid "HE.net username"
+msgstr ""
+
+msgid "HT mode (802.11n)"
+msgstr ""
+
+msgid "Handler"
+msgstr "多執行緒"
+
+msgid "Hang Up"
+msgstr "斷線"
+
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
+msgstr "在這設置基本樣貌類似像主機名稱或者時區..等"
+
+msgid ""
+"Here you can paste public SSH-Keys (one per line) for SSH public-key "
+"authentication."
+msgstr "在這裡貼上公用SSH-Keys (每行一個)以便驗證"
+
+msgid "Hermes 802.11b Wireless Controller"
+msgstr "Hermes 802.11b 無線網路控制器"
+
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+msgstr "隱藏 <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
+
+msgid "Host entries"
+msgstr "主機項目"
+
+msgid "Host expiry timeout"
+msgstr "過期主機"
+
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
+msgstr "主機-<abbr title=\"Internet Protocol Address\">IP</abbr> 或網路"
+
+msgid "Hostname"
+msgstr "主機名稱"
+
+msgid "Hostname to send when requesting DHCP"
+msgstr "當請求DHCP服務時傳送的主機名稱"
+
+msgid "Hostnames"
+msgstr "主機名稱"
+
+msgid "IP address"
+msgstr "IP位址"
+
+msgid "IPv4"
+msgstr "IPv4版"
+
+msgid "IPv4 Firewall"
+msgstr "IPv4防火牆"
+
+msgid "IPv4 WAN Status"
+msgstr "IPv4寬頻連線狀態"
+
+msgid "IPv4 address"
+msgstr "IPv4位址"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4和IPv6"
+
+msgid "IPv4 assignment length"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr "IPv4廣播"
+
+msgid "IPv4 gateway"
+msgstr "IPv4匝道器"
+
+msgid "IPv4 netmask"
+msgstr "IPv4網路遮罩"
+
+msgid "IPv4 only"
+msgstr "僅用IPv4"
+
+msgid "IPv4 prefix length"
+msgstr "IPv4前綴長度"
+
+msgid "IPv4-Address"
+msgstr "IPv4-位址"
+
+msgid "IPv6"
+msgstr "IPv6版"
+
+msgid "IPv6 Firewall"
+msgstr "IPv6防火牆"
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid "IPv6 ULA-Prefix"
+msgstr ""
+
+msgid "IPv6 WAN Status"
+msgstr "IPv6寬頻連線狀態"
+
+msgid "IPv6 address"
+msgstr "IPv6位址"
+
+msgid "IPv6 assignment hint"
+msgstr ""
+
+msgid "IPv6 assignment length"
+msgstr ""
+
+msgid "IPv6 gateway"
+msgstr "IPv6匝道器"
+
+msgid "IPv6 only"
+msgstr "僅用IPv6"
+
+msgid "IPv6 prefix"
+msgstr "IPv6字首"
+
+msgid "IPv6 prefix length"
+msgstr "IPv6字首長度"
+
+msgid "IPv6 routed prefix"
+msgstr ""
+
+msgid "IPv6-Address"
+msgstr "IPv6-位址"
+
+msgid "IPv6-in-IPv4 (RFC4213)"
+msgstr "IPv6包覆在IPv4內(RFC4213)"
+
+msgid "IPv6-over-IPv4 (6rd)"
+msgstr "IPv6凌駕IPv4外(第6版)"
+
+msgid "IPv6-over-IPv4 (6to4)"
+msgstr "IPv6凌駕IPv4外(6轉4)"
+
+msgid "Identity"
+msgstr "特性"
+
+msgid ""
+"If specified, mount the device by its UUID instead of a fixed device node"
+msgstr "假若指定的話, 掛載設備的UUID獨立設備識別碼取代固定的設備節點"
+
+msgid ""
+"If specified, mount the device by the partition label instead of a fixed "
+"device node"
+msgstr "假若指定的話, 掛載設備的分割標籤取代固定的設備節點"
+
+msgid "If unchecked, no default route is configured"
+msgstr "如果沒打勾點選, 將不會設置預設路由"
+
+msgid "If unchecked, the advertised DNS server addresses are ignored"
+msgstr "如果沒打勾點選, 公告的DNS伺服器位址將被忽視"
+
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+msgstr ""
+"如果你的物理內存不足時,未使用的數據可以是暫時交換到導致更高的交換設備量的可用"
+"<abbr title=\"Random Access Memory\">RAM</abbr>內.請注意，交換數據是一個非常"
+"緩慢的過程,作為交換裝置不能用高數據速率訪問該<abbr title=\"Random Access "
+"Memory\">RAM</縮寫>"
+
+msgid "Ignore Hosts files"
+msgstr "被忽視的主機檔案"
+
+msgid "Ignore interface"
+msgstr "被忽視的介面"
+
+msgid "Ignore resolve file"
+msgstr "被忽視的解析檔"
+
+msgid "Image"
+msgstr "映像檔"
+
+msgid "In"
+msgstr "輸入"
+
+msgid "Inactivity timeout"
+msgstr "閒置過期"
+
+msgid "Inbound:"
+msgstr "輸入"
+
+msgid "Info"
+msgstr "訊息"
+
+msgid "Initscript"
+msgstr "初始化腳本"
+
+msgid "Initscripts"
+msgstr "初始化腳本"
+
+msgid "Install"
+msgstr "安裝"
+
+msgid "Install iputils-traceroute6 for IPv6 traceroute"
+msgstr ""
+
+msgid "Install package %q"
+msgstr "安裝軟體包 %q"
+
+msgid "Install protocol extensions..."
+msgstr "安裝延伸協定中..."
+
+msgid "Installed packages"
+msgstr "安裝軟體包"
+
+msgid "Interface"
+msgstr "介面"
+
+msgid "Interface Configuration"
+msgstr "介面設定"
+
+msgid "Interface Overview"
+msgstr "介面預覽"
+
+msgid "Interface is reconnecting..."
+msgstr "介面重連"
+
+msgid "Interface is shutting down..."
+msgstr "介面正在關閉中..."
+
+msgid "Interface not present or not connected yet."
+msgstr "介面尚未出線或者還沒連上"
+
+msgid "Interface reconnected"
+msgstr "介面已重連"
+
+msgid "Interface shut down"
+msgstr "介面關閉"
+
+msgid "Interfaces"
+msgstr "介面"
+
+msgid "Internal Server Error"
+msgstr "內部伺服器發生錯誤"
+
+msgid "Invalid"
+msgstr "無效"
+
+msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
+msgstr "輸入的VLAN ID無效僅有介於 %d 和 %d的被允許"
+
+msgid "Invalid VLAN ID given! Only unique IDs are allowed"
+msgstr "打入的是不正確的VLAN ID!僅有獨一無二的IDs被允許"
+
+msgid "Invalid username and/or password! Please try again."
+msgstr "不正確的用戶名稱和/或者密碼!請再試一次."
+
+#, fuzzy
+msgid ""
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
+msgstr "它顯示你正嘗試更新不適用於這個flash記憶體的映像檔,請檢查確認這個映像檔"
+
+msgid "Java Script required!"
+msgstr "需要Java腳本"
+
+msgid "Join Network"
+msgstr "加入網路"
+
+msgid "Join Network: Settings"
+msgstr "加入網路的設定"
+
+msgid "Join Network: Wireless Scan"
+msgstr "加入網路:無線網路掃描"
+
+msgid "Keep settings"
+msgstr "保持設定值"
+
+msgid "Kernel Log"
+msgstr "核心日誌"
+
+msgid "Kernel Version"
+msgstr "核心版本"
+
+msgid "Key"
+msgstr "鑰匙"
+
+msgid "Key #%d"
+msgstr "鑰匙  #%d"
+
+msgid "Kill"
+msgstr "刪除"
+
+msgid "L2TP"
+msgstr "L2TP"
+
+msgid "L2TP Server"
+msgstr "L2TP伺服器"
+
+msgid "LCP echo failure threshold"
+msgstr "LCP協定呼叫失敗次數門檻"
+
+msgid "LCP echo interval"
+msgstr "LCP協定呼叫間隔"
+
+msgid "LLC"
+msgstr "LLC邏輯鏈結控制層"
+
+msgid "Label"
+msgstr "標籤"
+
+msgid "Language"
+msgstr "語言"
+
+msgid "Language and Style"
+msgstr "語言和風格"
+
+msgid "Lease validity time"
+msgstr "租賃有效時間"
+
+msgid "Leasefile"
+msgstr "租賃檔案"
+
+msgid "Leasetime"
+msgstr "租賃時間"
+
+msgid "Leasetime remaining"
+msgstr "租賃保留時間"
+
+msgid "Leave empty to autodetect"
+msgstr "保持空白以便自動偵測"
+
+msgid "Leave empty to use the current WAN address"
+msgstr "保持空白以便採用現今的寬頻位址"
+
+msgid "Legend:"
+msgstr "圖例:"
+
+msgid "Limit"
+msgstr "限制"
+
+msgid "Line Attenuation"
+msgstr ""
+
+msgid "Line Speed"
+msgstr ""
+
+msgid "Line State"
+msgstr ""
+
+msgid "Link On"
+msgstr "鏈接"
+
+msgid ""
+"List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
+"requests to"
+msgstr "列出 <abbr title=\"Domain Name System\">DNS</abbr> 伺服器以便轉發請求"
+
+msgid "List of domains to allow RFC1918 responses for"
+msgstr "列出允許RFC1918文件虛擬IP回應的網域"
+
+msgid "List of hosts that supply bogus NX domain results"
+msgstr "列出供應偽裝NX網域成果的主機群"
+
+msgid "Listen only on the given interface or, if unspecified, on all"
+msgstr "只許在給予的介面上聆聽, 如果未指定, 全都允許"
+
+msgid "Listening port for inbound DNS queries"
+msgstr "進入的DNS請求聆聽埠"
+
+msgid "Load"
+msgstr "掛載"
+
+msgid "Load Average"
+msgstr "平均掛載"
+
+msgid "Loading"
+msgstr "掛載中"
+
+msgid "Local IPv4 address"
+msgstr "本地IPv4位址"
+
+msgid "Local IPv6 address"
+msgstr "本地IPv6位址"
+
+msgid "Local Startup"
+msgstr "本地啟動"
+
+msgid "Local Time"
+msgstr "本地時區"
+
+msgid "Local domain"
+msgstr "本地網域"
+
+#, fuzzy
+msgid ""
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
+msgstr "本地網域格式. 僅限符合從未從DHCP或hosts檔轉發和解析的網域"
+
+msgid "Local domain suffix appended to DHCP names and hosts file entries"
+msgstr "本地網域後綴附加倒DHCP名稱和hosts檔項目"
+
+msgid "Local server"
+msgstr "本地伺服器"
+
+msgid ""
+"Localise hostname depending on the requesting subnet if multiple IPs are "
+"available"
+msgstr "若有多個IP可用, 本地化主機名稱端看請求的子網路而言."
+
+msgid "Localise queries"
+msgstr "本地化網路請求"
+
+msgid "Locked to channel %d used by %s"
+msgstr "鎖定通道 由 %s 使用的 %d "
+
+msgid "Log output level"
+msgstr "日誌輸出層級"
+
+msgid "Log queries"
+msgstr "日誌查詢"
+
+msgid "Logging"
+msgstr "日誌紀錄中"
+
+msgid "Login"
+msgstr "登入"
+
+msgid "Logout"
+msgstr "登出"
+
+msgid "Lowest leased address as offset from the network address."
+msgstr "最低的釋放位址從這網路位址的偏移計算"
+
+msgid "MAC-Address"
+msgstr "MAC-位址"
+
+msgid "MAC-Address Filter"
+msgstr "MAC-位址過濾"
+
+msgid "MAC-Filter"
+msgstr "MAC-過濾"
+
+msgid "MAC-List"
+msgstr "MAC-清單"
+
+msgid "MB/s"
+msgstr "MB/s"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "MTU"
+msgstr "最大傳輸單位MTU"
+
+msgid "Maximum Rate"
+msgstr "最快速度"
+
+msgid "Maximum allowed number of active DHCP leases"
+msgstr "允許啟用DHCP釋放的最大數量"
+
+msgid "Maximum allowed number of concurrent DNS queries"
+msgstr "允許同時齊發的DNS請求的最大數量"
+
+msgid "Maximum allowed size of EDNS.0 UDP packets"
+msgstr "允許EDNS.0 協定的UDP封包最大數量"
+
+msgid "Maximum amount of seconds to wait for the modem to become ready"
+msgstr "等待數據機待命的最大秒數"
+
+msgid "Maximum hold time"
+msgstr "可持有最長時間"
+
+msgid "Maximum number of leased addresses."
+msgstr "釋放出的位址群最大數量"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "Memory"
+msgstr "記憶體"
+
+msgid "Memory usage (%)"
+msgstr "記憶體使用 (%)"
+
+msgid "Metric"
+msgstr "公測單位"
+
+msgid "Minimum Rate"
+msgstr "最低速度"
+
+msgid "Minimum hold time"
+msgstr "可持有的最低時間"
+
+msgid "Missing protocol extension for proto %q"
+msgstr "協定  %q 漏失的延伸協定"
+
+msgid "Mode"
+msgstr "模式"
+
+msgid "Model"
+msgstr ""
+
+msgid "Modem device"
+msgstr "數據機設備"
+
+msgid "Modem init timeout"
+msgstr "數據機初始化終結時間"
+
+msgid "Monitor"
+msgstr "監視"
+
+msgid "Mount Entry"
+msgstr "掛載項目"
+
+msgid "Mount Point"
+msgstr "掛載點"
+
+msgid "Mount Points"
+msgstr "掛載各點"
+
+msgid "Mount Points - Mount Entry"
+msgstr "掛載各點 - 掛載項目"
+
+msgid "Mount Points - Swap Entry"
+msgstr "掛載各點 - 交換項目"
+
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
+msgstr "掛載各點定義所指定到記憶體設備將會被附載到檔案系統上"
+
+msgid "Mount options"
+msgstr "掛載選項"
+
+msgid "Mount point"
+msgstr "掛載點"
+
+msgid "Mounted file systems"
+msgstr "已掛載檔案系統"
+
+msgid "Move down"
+msgstr "往下移"
+
+msgid "Move up"
+msgstr "往上移"
+
+msgid "Multicast Rate"
+msgstr "多點群播速度"
+
+msgid "Multicast address"
+msgstr "多點群播位址"
+
+msgid "NAS ID"
+msgstr " 網路附存伺服器ID"
+
+msgid "NDP-Proxy"
+msgstr ""
+
+msgid "NTP server candidates"
+msgstr "NTP伺服器備選"
+
+msgid "Name"
+msgstr "名稱"
+
+msgid "Name of the new interface"
+msgstr "新介面的名稱"
+
+msgid "Name of the new network"
+msgstr "新網路的名稱"
+
+msgid "Navigation"
+msgstr "導覽"
+
+msgid "Netmask"
+msgstr "網路遮罩"
+
+msgid "Network"
+msgstr "網路"
+
+msgid "Network Utilities"
+msgstr "網路多項工具"
+
+msgid "Network boot image"
+msgstr "網路開機映像檔"
+
+msgid "Network without interfaces."
+msgstr "尚無任何介面的網路."
+
+msgid "Next »"
+msgstr "下一個 »"
+
+msgid "No DHCP Server configured for this interface"
+msgstr "在這個介面尚無DHCP伺服器"
+
+msgid "No chains in this table"
+msgstr "尚未綁在這個表格中"
+
+msgid "No files found"
+msgstr "尚未發現任何檔案"
+
+msgid "No information available"
+msgstr "尚無可運用資訊"
+
+msgid "No negative cache"
+msgstr "尚無拒絕的快取"
+
+msgid "No network configured on this device"
+msgstr "尚無網路設定在這個介面上"
+
+msgid "No network name specified"
+msgstr "尚未指定網路名稱"
+
+msgid "No package lists available"
+msgstr "尚無列出的軟體包可運用"
+
+msgid "No password set!"
+msgstr "尚未設定密碼!"
+
+msgid "No rules in this chain"
+msgstr "尚無規則在這個鏈接上"
+
+msgid "No zone assigned"
+msgstr "尚未指定區碼"
+
+msgid "Noise"
+msgstr "噪音比"
+
+msgid "Noise Margin"
+msgstr ""
+
+msgid "Noise:"
+msgstr "噪音比:"
+
+msgid "None"
+msgstr "無"
+
+msgid "Normal"
+msgstr "正常"
+
+msgid "Not Found"
+msgstr "尚未發現"
+
+msgid "Not associated"
+msgstr "尚未關聯"
+
+msgid "Not connected"
+msgstr "尚未連線"
+
+msgid "Note: Configuration files will be erased."
+msgstr "注意:設定檔將被刪除."
+
+msgid "Notice"
+msgstr "通知"
+
+msgid "Nslookup"
+msgstr "DNS偵錯Nslookup"
+
+msgid "OK"
+msgstr "行"
+
+msgid "OPKG-Configuration"
+msgstr "OPKG-設定值"
+
+msgid "Off-State Delay"
+msgstr "關閉狀態延遲"
+
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
+msgstr ""
+"在這個頁面你可以設定網路介面. 只要點下這個\"介面群橋接\"而且打入數個以空格分"
+"開網路介面的名稱就可以橋接數個介面群. 你也可以使用<abbr title=\"Virtual "
+"Local Area Network\">VLAN</abbr> 符號<samp>INTERFACE.VLANNR</samp> (<abbr "
+"title=\"for example\">例.如</abbr>: <samp>eth0.1</samp>)."
+
+msgid "On-State Delay"
+msgstr "啟用狀態延遲"
+
+msgid "One of hostname or mac address must be specified!"
+msgstr "主機名稱或mac位址任選一個被指定"
+
+msgid "One or more fields contain invalid values!"
+msgstr "有一個以上的欄位包含失效數值!"
+
+msgid "One or more required fields have no value!"
+msgstr "有一個以上的欄位缺乏任何數值!"
+
+msgid "Open list..."
+msgstr "開啟清單..."
+
+msgid "Option changed"
+msgstr "選項已變更"
+
+msgid "Option removed"
+msgstr "選項已移除"
+
+msgid "Options"
+msgstr "選項"
+
+msgid "Other:"
+msgstr "其它:"
+
+msgid "Out"
+msgstr "出"
+
+msgid "Outbound:"
+msgstr "外連:"
+
+msgid "Outdoor Channels"
+msgstr "室外通道"
+
+msgid "Override MAC address"
+msgstr "覆蓋MAC位址"
+
+msgid "Override MTU"
+msgstr "覆蓋MTU數值"
+
+msgid "Override the gateway in DHCP responses"
+msgstr "在DHCP回應中覆蓋匝道器"
+
+msgid ""
+"Override the netmask sent to clients. Normally it is calculated from the "
+"subnet that is served."
+msgstr "覆蓋傳送到客戶端的網路遮罩. 正常來說它會計算來自魚已存子網路."
+
+msgid "Override the table used for internal routes"
+msgstr "覆蓋之前內部使用的路由表"
+
+msgid "Overview"
+msgstr "預覽"
+
+msgid "Owner"
+msgstr "持有者"
+
+msgid "PAP/CHAP password"
+msgstr "PAP/CHAP驗證密碼"
+
+msgid "PAP/CHAP username"
+msgstr "PAP/CHAP驗證用戶名"
+
+msgid "PID"
+msgstr "PID碼"
+
+msgid "PIN"
+msgstr "PIN碼"
+
+msgid "PPP"
+msgstr "PPP協定"
+
+msgid "PPPoA Encapsulation"
+msgstr "PPPoA配置"
+
+msgid "PPPoATM"
+msgstr "PPPoATM"
+
+msgid "PPPoE"
+msgstr "PPPoE"
+
+msgid "PPtP"
+msgstr "PPtP點對點VPN虛擬私人隧道協定"
+
+msgid "Package libiwinfo required!"
+msgstr "軟體包必需有libiwinfo!"
+
+msgid "Package lists are older than 24 hours"
+msgstr "軟體包列表過期24小時"
+
+msgid "Package name"
+msgstr "軟體包名稱"
+
+msgid "Packets"
+msgstr "封包"
+
+msgid "Part of zone %q"
+msgstr "區域 %q 的部分 "
+
+msgid "Password"
+msgstr "密碼"
+
+msgid "Password authentication"
+msgstr "密碼驗證"
+
+msgid "Password of Private Key"
+msgstr "私人金鑰密碼"
+
+msgid "Password successfully changed!"
+msgstr "密碼已變更成功!"
+
+msgid "Path to CA-Certificate"
+msgstr "CA-證書的路徑"
+
+msgid "Path to Client-Certificate"
+msgstr "用戶端-證書的路徑"
+
+msgid "Path to Private Key"
+msgstr "私人金鑰的路徑"
+
+msgid "Path to executable which handles the button event"
+msgstr "處理按鍵效果可執行檔路徑"
+
+msgid "Peak:"
+msgstr "峰值:"
+
+msgid "Perform reboot"
+msgstr "執行重開"
+
+msgid "Perform reset"
+msgstr "執行重置"
+
+msgid "Phy Rate:"
+msgstr "傳輸率:"
+
+msgid "Physical Settings"
+msgstr "實體設置"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Pkts."
+msgstr "封包數."
+
+msgid "Please enter your username and password."
+msgstr "請輸入你的用戶名稱和密碼"
+
+msgid "Please wait: Device rebooting..."
+msgstr "請稍等:設備正重開中..."
+
+msgid "Policy"
+msgstr "策略"
+
+msgid "Port"
+msgstr "埠"
+
+msgid "Port %d"
+msgstr "埠 %d"
+
+msgid "Port %d is untagged in multiple VLANs!"
+msgstr "埠 %d 尚未標記在多個VLANs中!"
+
+msgid "Port status:"
+msgstr "埠狀態:"
+
+msgid ""
+"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
+"ignore failures"
+msgstr "假若在給于多次的 LCP 呼叫失敗後終點將死, 使用0忽略失敗"
+
+msgid "Prevents client-to-client communication"
+msgstr "防止用戶端對用戶端的通訊"
+
+msgid "Prism2/2.5/3 802.11b Wireless Controller"
+msgstr "Prism2/2.5/3 802.11b 無線控制器"
+
+msgid "Proceed"
+msgstr "前進"
+
+msgid "Processes"
+msgstr "執行緒"
+
+msgid "Prot."
+msgstr "協定."
+
+msgid "Protocol"
+msgstr "協定"
+
+msgid "Protocol family"
+msgstr "協定家族"
+
+msgid "Protocol of the new interface"
+msgstr "新介面的協定家族"
+
+msgid "Protocol support is not installed"
+msgstr "支援的協定尚未安裝"
+
+msgid "Provide NTP server"
+msgstr "提供NTP伺服器"
+
+msgid "Provide new network"
+msgstr "提供新網路"
+
+msgid "Pseudo Ad-Hoc (ahdemo)"
+msgstr "偽裝Ad-Hoc (ahdemo模式)"
+
+msgid "Public prefix routed to this device for distribution to clients."
+msgstr ""
+
+msgid "Quality"
+msgstr "品質"
+
+msgid "RTS/CTS Threshold"
+msgstr "RTS/CTS門檻"
+
+msgid "RX"
+msgstr "接收"
+
+msgid "RX Rate"
+msgstr "接收速率"
+
+msgid "RaLink 802.11%s Wireless Controller"
+msgstr "RaLink 802.11%s 無線控制器"
+
+msgid "Radius-Accounting-Port"
+msgstr "Radius-驗証帳號-埠"
+
+msgid "Radius-Accounting-Secret"
+msgstr "Radius-合法帳號-密碼"
+
+msgid "Radius-Accounting-Server"
+msgstr "Radius-合法帳號-伺服器"
+
+msgid "Radius-Authentication-Port"
+msgstr "Radius-驗証-埠"
+
+msgid "Radius-Authentication-Secret"
+msgstr "Radius-驗証-密碼"
+
+msgid "Radius-Authentication-Server"
+msgstr "Radius-驗証-伺服器"
+
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
+msgstr ""
+" 讀取<code>/etc/ethers</code> 以便設置<abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-伺服器"
+
+msgid ""
+"Really delete this interface? The deletion cannot be undone!\\nYou might "
+"lose access to this device if you are connected via this interface."
+msgstr ""
+"真的要刪除這介面?無法復元刪除!\n"
+"假如你要透過這個介面連線你可能會無法存取這個設備."
+
+msgid ""
+"Really delete this wireless network? The deletion cannot be undone!\\nYou "
+"might lose access to this device if you are connected via this network."
+msgstr ""
+"真的要刪除這個無線網路?無法復元的刪除!\n"
+"假如你是透過這個網路連線你可能會無法存取這個設備."
+
+msgid "Really reset all changes?"
+msgstr "確定要重置回復原廠?"
+
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"真的要刪除這個網路 ?\n"
+"假如你是透過這個介面連線你可能會無法存取這個設備."
+
+msgid ""
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
+msgstr ""
+"真的要關閉這個介面 \"%s\" ?!\n"
+"假如你要透過這個介面連線你可能會無法存取這個設備."
+
+msgid "Really switch protocol?"
+msgstr "確定要更換協定?"
+
+msgid "Realtime Connections"
+msgstr "即時連線"
+
+msgid "Realtime Graphs"
+msgstr "即時圖表"
+
+msgid "Realtime Load"
+msgstr "即時負載"
+
+msgid "Realtime Traffic"
+msgstr "即時流量"
+
+msgid "Realtime Wireless"
+msgstr "即時無線網路"
+
+msgid "Rebind protection"
+msgstr "重新綁護"
+
+msgid "Reboot"
+msgstr "重開機"
+
+msgid "Rebooting..."
+msgstr "重開中..."
+
+msgid "Reboots the operating system of your device"
+msgstr "重啟你設備的作業系統"
+
+msgid "Receive"
+msgstr "接收"
+
+msgid "Receiver Antenna"
+msgstr "接收天線"
+
+msgid "Reconnect this interface"
+msgstr "重新連接這個介面"
+
+msgid "Reconnecting interface"
+msgstr "重連這個介面中"
+
+msgid "References"
+msgstr "引用"
+
+msgid "Regulatory Domain"
+msgstr "監管網域"
+
+msgid "Relay"
+msgstr "延遲"
+
+msgid "Relay Bridge"
+msgstr "橋接延遲"
+
+msgid "Relay between networks"
+msgstr "網路間的延遲"
+
+msgid "Relay bridge"
+msgstr "橋接延遲"
+
+msgid "Remote IPv4 address"
+msgstr "遠端IPv4位址"
+
+msgid "Remove"
+msgstr "移除"
+
+msgid "Repeat scan"
+msgstr "再次掃描"
+
+msgid "Replace entry"
+msgstr "替代項目"
+
+msgid "Replace wireless configuration"
+msgstr "替代性無線設定"
+
+msgid "Request IPv6-address"
+msgstr ""
+
+msgid "Request IPv6-prefix of length"
+msgstr ""
+
+msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
+msgstr "對特定的ISP需要,例如.DOCSIS 3 加速有線電視寬頻網路"
+
+msgid "Reset"
+msgstr "重置"
+
+msgid "Reset Counters"
+msgstr "重置計數器"
+
+msgid "Reset to defaults"
+msgstr "回復預設值"
+
+msgid "Resolv and Hosts Files"
+msgstr "解析和Hosts檔案"
+
+msgid "Resolve file"
+msgstr "解析檔"
+
+msgid "Restart"
+msgstr "重啟"
+
+msgid "Restart Firewall"
+msgstr "重啟防火牆"
+
+msgid "Restore backup"
+msgstr "還原之前備份設定"
+
+msgid "Reveal/hide password"
+msgstr "明示/隱藏 密碼"
+
+msgid "Revert"
+msgstr "回溯"
+
+msgid "Root"
+msgstr "æ ¹"
+
+msgid "Root directory for files served via TFTP"
+msgstr "透過TFTP存取根目錄檔案"
+
+msgid "Router Advertisement-Service"
+msgstr ""
+
+msgid "Router Password"
+msgstr "路由器密碼"
+
+msgid "Routes"
+msgstr "路由"
+
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
+msgstr "路由器指定介面導出到特定主機或者能夠到達的網路."
+
+msgid "Rule #"
+msgstr "規則 #"
+
+msgid "Run a filesystem check before mounting the device"
+msgstr "掛載這個設備前先跑系統檢查"
+
+msgid "Run filesystem check"
+msgstr "執行系統檢查"
+
+msgid "SSH Access"
+msgstr "SSH存取"
+
+msgid "SSH-Keys"
+msgstr "SSH-金鑰"
+
+msgid "SSID"
+msgstr "基地台服務設定識別碼SSID"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Save & Apply"
+msgstr "保存並啟用"
+
+msgid "Save &#38; Apply"
+msgstr "保存 &#38; 啟用"
+
+msgid "Scan"
+msgstr "掃描"
+
+msgid "Scheduled Tasks"
+msgstr "排程任務"
+
+msgid "Section added"
+msgstr "新增的區段"
+
+msgid "Section removed"
+msgstr "區段移除"
+
+msgid "See \"mount\" manpage for details"
+msgstr "查看\"mount\"主頁獲取進階資訊"
+
+msgid ""
+"Send LCP echo requests at the given interval in seconds, only effective in "
+"conjunction with failure threshold"
+msgstr "傳送LCP呼叫請求在這個給予的秒數間隔內, 僅影響關聯到失敗門檻"
+
+msgid "Separate Clients"
+msgstr "分隔用戶端"
+
+msgid "Separate WDS"
+msgstr "分隔WDS中繼"
+
+msgid "Server Settings"
+msgstr "伺服器設定值"
+
+msgid "Service Name"
+msgstr "服務名稱"
+
+msgid "Service Type"
+msgstr "服務型態"
+
+msgid "Services"
+msgstr "各服務"
+
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "安裝校時同步"
+
+msgid "Setup DHCP Server"
+msgstr "安裝DHCP伺服器"
+
+msgid "Show current backup file list"
+msgstr "顯示現今的備份檔清單"
+
+msgid "Shutdown this interface"
+msgstr "關閉這個介面"
+
+msgid "Shutdown this network"
+msgstr "關閉這個網路"
+
+msgid "Signal"
+msgstr "信號"
+
+msgid "Signal:"
+msgstr "信號:"
+
+msgid "Size"
+msgstr "大小"
+
+msgid "Skip"
+msgstr "跳過"
+
+msgid "Skip to content"
+msgstr "跳到內容"
+
+msgid "Skip to navigation"
+msgstr "跳到導覽"
+
+msgid "Slot time"
+msgstr "插槽時間"
+
+msgid "Software"
+msgstr "軟體"
+
+msgid "Some fields are invalid, cannot save values!"
+msgstr "有些欄位失效, 無法儲存數值!"
+
+msgid "Sorry, the object you requested was not found."
+msgstr "抱歉, 你請求的這物件尚無發現."
+
+msgid "Sorry, the server encountered an unexpected error."
+msgstr "抱歉, 伺服器遭遇非預期的錯誤."
+
+#, fuzzy
+msgid ""
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
+"flashed manually. Please refer to the libreCMC wiki for device specific "
+"install instructions."
+msgstr ""
+"抱歉, 沒有sysupgrade支援出現, 新版韌體映像檔必須手動更新. 請回歸libreCMC wiki"
+"找尋特定設備安裝指引."
+
+msgid "Sort"
+msgstr "分類"
+
+msgid "Source"
+msgstr "來源"
+
+msgid "Specifies the button state to handle"
+msgstr "指定這個按鈕狀態以便操作"
+
+msgid "Specifies the directory the device is attached to"
+msgstr "指定這個設備被附掛到那個目錄"
+
+msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+msgstr "指定這個 <em>Dropbear</em>真實聆聽埠"
+
+msgid ""
+"Specifies the maximum amount of failed ARP requests until hosts are presumed "
+"to be dead"
+msgstr "指定失敗ARP可請求的最大數量直到駭客主機死亡為止"
+
+msgid ""
+"Specifies the maximum amount of seconds after which hosts are presumed to be "
+"dead"
+msgstr "指定可請求的最大秒數直到駭客主機死亡為止"
+
+msgid "Specify the secret encryption key here."
+msgstr "指定加密金鑰在此."
+
+msgid "Start"
+msgstr "啟用"
+
+msgid "Start priority"
+msgstr "啟用優先權順序"
+
+msgid "Startup"
+msgstr "啟動"
+
+msgid "Static IPv4 Routes"
+msgstr "靜態IPv4路由"
+
+msgid "Static IPv6 Routes"
+msgstr "靜態IPv6路由"
+
+msgid "Static Leases"
+msgstr "靜態租約"
+
+msgid "Static Routes"
+msgstr "靜態路由"
+
+msgid "Static WDS"
+msgstr "靜態WDS"
+
+msgid "Static address"
+msgstr "靜態位址"
+
+msgid ""
+"Static leases are used to assign fixed IP addresses and symbolic hostnames "
+"to DHCP clients. They are also required for non-dynamic interface "
+"configurations where only hosts with a corresponding lease are served."
+msgstr ""
+"靜態租約是用來指定固定的IP位址和表示的主機名稱給予DHCP用戶端. 它們也需要非動"
+"態介面設定值以便獲取相應租約的主機服務."
+
+msgid "Status"
+msgstr "狀態"
+
+msgid "Stop"
+msgstr "停止"
+
+msgid "Strict order"
+msgstr "嚴謹順序"
+
+msgid "Submit"
+msgstr "提交"
+
+msgid "Swap"
+msgstr ""
+
+msgid "Swap Entry"
+msgstr "Swap交換頁項目"
+
+msgid "Switch"
+msgstr "交換器"
+
+msgid "Switch %q"
+msgstr "交換器 %q"
+
+msgid "Switch %q (%s)"
+msgstr "交換器 %q (%s)"
+
+msgid "Switch protocol"
+msgstr "交換器協定"
+
+msgid "Sync with browser"
+msgstr "同步瀏覽器"
+
+msgid "Synchronizing..."
+msgstr "同步中..."
+
+msgid "System"
+msgstr "系統"
+
+msgid "System Log"
+msgstr "系統日誌"
+
+msgid "System Properties"
+msgstr "系統屬性"
+
+msgid "System log buffer size"
+msgstr "系統日誌緩衝大小"
+
+msgid "TCP:"
+msgstr "TCP:"
+
+msgid "TFTP Settings"
+msgstr "TFTP設定"
+
+msgid "TFTP server root"
+msgstr "TFTP 伺服器根"
+
+msgid "TX"
+msgstr "傳送"
+
+msgid "TX Rate"
+msgstr "傳送速度"
+
+msgid "Table"
+msgstr "表格"
+
+msgid "Target"
+msgstr "目標"
+
+msgid "Terminate"
+msgstr "中斷"
+
+#, fuzzy
+msgid ""
+"The <em>Device Configuration</em> section covers physical settings of the "
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
+msgstr ""
+"這個<em>Device Configuration</em>欄位會覆蓋無線射頻硬體的物理設定值,如通道、"
+"傳送功率或者天線分享道所有定義的無線網路(假如這個無線射頻硬體是多工-SSID能力"
+"的). 每個網路設定像加密或操作模式是被分群在<em>Interface Configuration</em>"
+"中."
+
+msgid ""
+"The <em>libiwinfo-lua</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+"這 <em>libiwinfo-lua</em> 軟體包尚未安裝. 你必須安裝這個元件以便無線網路設定"
+"有作用."
+
+msgid ""
+"The HE.net endpoint update configuration changed, you must now use the plain "
+"username instead of the user ID!"
+msgstr ""
+
+msgid ""
+"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
+msgstr "指定到這供應商的IPv6字首, 通常用 <code>::</code>結尾"
+
+msgid ""
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
+msgstr ""
+"所允許的字元是: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> and "
+"<code>_</code>"
+
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
+msgstr ""
+"記憶體的設備檔或者分割區 (<abbr title=\"for example\">e.g.</abbr> <code>/dev/"
+"sda1</code>)"
+
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
+msgstr ""
+"這檔案系統適用來格式化記憶體(<abbr title=\"for example\">例.如.</abbr> "
+"<samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
+
+msgid ""
+"The flash image was uploaded. Below is the checksum and file size listed, "
+"compare them with the original file to ensure data integrity.<br /> Click "
+"\"Proceed\" below to start the flash procedure."
+msgstr ""
+"要刷的映像檔已上傳.下面是這個校驗碼和檔案大小詳列, 用原始檔比對它門以確保資料"
+"完整性.<br />按下面的\"繼續\"便可以開啟更新流程."
+
+msgid "The following changes have been committed"
+msgstr "接下來的修改已經被承諾"
+
+msgid "The following changes have been reverted"
+msgstr "接下來的修改已經被回復"
+
+msgid "The following rules are currently active on this system."
+msgstr "以下的規則現正作用在系統中."
+
+msgid "The given network name is not unique"
+msgstr "輸入的網路名稱非獨一"
+
+#, fuzzy
+msgid ""
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
+msgstr "如果你繼續的話.這硬體並非多SSID工能並且已存的設定將會被覆蓋."
+
+msgid ""
+"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
+"addresses."
+msgstr "這IPv4開頭以位元計的長度, 剩餘部分將會延用在IPv6位址中."
+
+msgid "The length of the IPv6 prefix in bits"
+msgstr "這IPv6開頭以位元計的長度"
+
+msgid ""
+"The network ports on this device can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
+msgstr ""
+"這設備的網路埠可以被組合到數個 <abbr title=\"Virtual Local Area Network"
+"\">VLAN</abbr>群, 以便在內的電腦可以直接跟別人互通. <abbr title=\"Virtual "
+"Local Area Network\">VLAN</abbr>群經常用來分割網路區段. 預設經常會有一個上傳"
+"埠來連接到下一個大型網路類似Intenet而其它埠則用來本地區網使用."
+
+msgid "The selected protocol needs a device assigned"
+msgstr "選到的協定需要指定到設備上"
+
+msgid ""
+"The system is erasing the configuration partition now and will reboot itself "
+"when finished."
+msgstr "系統正在刪除設定分割並且當完成時將自行重開."
+
+#, fuzzy
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"系統現正刷機中.<br /> 請勿關閉設備!<br />  等待數分鐘直到你重新在連線. 可能需"
+"要更新你電腦的位址以便再連設備, 端看你的設定. "
+
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
+msgstr ""
+"以上傳的映像檔不包含支援格式. 請確認你選擇的是針對你的平台採用的通用映像檔."
+
+msgid "There are no active leases."
+msgstr "租賃尚未啟動."
+
+msgid "There are no pending changes to apply!"
+msgstr "尚無聽候的修改被採用"
+
+msgid "There are no pending changes to revert!"
+msgstr "尚無聽候的修改被復元!"
+
+msgid "There are no pending changes!"
+msgstr "無聽候的修改!"
+
+msgid ""
+"There is no device assigned yet, please attach a network device in the "
+"\"Physical Settings\" tab"
+msgstr "尚未指定設備, 請接上一個網路設備在這\"實體設置\"標籤內"
+
+msgid ""
+"There is no password set on this router. Please configure a root password to "
+"protect the web interface and enable SSH."
+msgstr "路由器尚未設密碼. 請設定root密碼以便保護web介面及啟用SSH."
+
+msgid "This IPv4 address of the relay"
+msgstr "IPv4位址的轉驛"
+
+msgid ""
+"This is a list of shell glob patterns for matching files and directories to "
+"include during sysupgrade. Modified files in /etc/config/ and certain other "
+"configurations are automatically preserved."
+msgstr ""
+"這是shell通用模式清單用來在系統更新時匹配包括的檔案和目錄. 在/etc/config/ 修"
+"改檔案和特定其它設定檔將會被自動保留."
+
+msgid ""
+"This is either the \"Update Key\" configured for the tunnel or the account "
+"password if no update key has been configured"
+msgstr ""
+
+msgid ""
+"This is the content of /etc/rc.local. Insert your own commands here (in "
+"front of 'exit 0') to execute them at the end of the boot process."
+msgstr ""
+"這是 /etc/rc.local 內容. 在這插入自己的指令 (在 'exit 0' 前面)以便在開機流程"
+"結尾執行它們."
+
+msgid ""
+"This is the local endpoint address assigned by the tunnel broker, it usually "
+"ends with <code>:2</code>"
+msgstr "這是由通道代理人指定的本地終端位址, 通常用 <code>:2</code>結尾."
+
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
+msgstr ""
+"在本地網路中 這是唯一的 <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>"
+
+msgid "This is the plain username for logging into the account"
+msgstr ""
+
+msgid ""
+"This is the prefix routed to you by the tunnel broker for use by clients"
+msgstr ""
+
+msgid "This is the system crontab in which scheduled tasks can be defined."
+msgstr "這是系統預設的例行性工作排程."
+
+msgid ""
+"This is usually the address of the nearest PoP operated by the tunnel broker"
+msgstr "這是由通道代理人操作的近端PoP通用位址"
+
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
+msgstr "這清單提供目前正在執行的系統的執行緒和狀態的預覽."
+
+msgid "This page allows the configuration of custom button actions"
+msgstr "這一頁允許客製化按鍵動作的設定"
+
+msgid "This page gives an overview over currently active network connections."
+msgstr "這一頁提供目前正在活動中網路連線的預覽."
+
+msgid "This section contains no values yet"
+msgstr "這部分尚未有任何數值."
+
+msgid "Time Synchronization"
+msgstr "校時同步"
+
+msgid "Time Synchronization is not configured yet."
+msgstr "校時同步尚未設定."
+
+msgid "Timezone"
+msgstr "時區"
+
+msgid ""
+"To restore configuration files, you can upload a previously generated backup "
+"archive here."
+msgstr "要復元設定檔, 可以上傳之前製作的備份壓縮檔放這."
+
+msgid "Total Available"
+msgstr "全部可用"
+
+msgid "Traceroute"
+msgstr "路由追蹤"
+
+msgid "Traffic"
+msgstr "流量"
+
+msgid "Transfer"
+msgstr "傳輸"
+
+msgid "Transmission Rate"
+msgstr "傳輸速率"
+
+msgid "Transmit"
+msgstr "射頻"
+
+msgid "Transmit Power"
+msgstr "射頻功率"
+
+msgid "Transmitter Antenna"
+msgstr "射頻天線"
+
+msgid "Trigger"
+msgstr "觸發"
+
+msgid "Trigger Mode"
+msgstr "觸發模式"
+
+msgid "Tunnel ID"
+msgstr "通道ID"
+
+msgid "Tunnel Interface"
+msgstr "通道介面"
+
+msgid "Tunnel Link"
+msgstr ""
+
+msgid "Turbo Mode"
+msgstr "渦輪爆衝模式"
+
+msgid "Tx-Power"
+msgstr "傳送-功率"
+
+msgid "Type"
+msgstr "型態"
+
+msgid "UDP:"
+msgstr "UDP:"
+
+msgid "UMTS only"
+msgstr "只用3G UMTS"
+
+msgid "UMTS/GPRS/EV-DO"
+msgstr "UMTS/GPRS/EV-DO"
+
+msgid "USB Device"
+msgstr "USB設備"
+
+msgid "UUID"
+msgstr "設備通用唯一識別碼UUID"
+
+msgid "Unable to dispatch"
+msgstr "無法發送"
+
+msgid "Unknown"
+msgstr "未知"
+
+msgid "Unknown Error, password not changed!"
+msgstr "未知錯誤, 密碼尚未改變!"
+
+msgid "Unmanaged"
+msgstr "非託管"
+
+msgid "Unsaved Changes"
+msgstr "尚未存檔的修改"
+
+msgid "Unsupported protocol type."
+msgstr "不支援的協定型態"
+
+msgid "Update lists"
+msgstr "上傳清單"
+
+msgid ""
+"Upload a sysupgrade-compatible image here to replace the running firmware. "
+"Check \"Keep settings\" to retain the current configuration (requires an "
+"libreCMC compatible firmware image)."
+msgstr ""
+"上傳一個sysupgrade-相容的映像檔在這以便替代正執行中的韌體. 勾選\"保持設定\"以"
+"保留目前設定值(必須要是libreCMC相容性韌體映像檔)."
+
+msgid "Upload archive..."
+msgstr "上傳壓縮檔..."
+
+msgid "Uploaded File"
+msgstr "檔案已上傳"
+
+msgid "Uptime"
+msgstr "上傳花費時間"
+
+msgid "Use <code>/etc/ethers</code>"
+msgstr "採用 <code>/etc/ethers</code>"
+
+msgid "Use DHCP gateway"
+msgstr "使用DHCP的匝道器"
+
+msgid "Use DNS servers advertised by peer"
+msgstr "使用終端發布的DNS伺服器"
+
+msgid "Use ISO/IEC 3166 alpha2 country codes."
+msgstr "使用Use ISO/IEC 3166 alpha2 國碼."
+
+msgid "Use MTU on tunnel interface"
+msgstr "在通道介面上使用的MTU數值"
+
+msgid "Use TTL on tunnel interface"
+msgstr "在通道介面上使用的TTL存活時間"
+
+msgid "Use as root filesystem"
+msgstr "當作root檔案系統"
+
+msgid "Use broadcast flag"
+msgstr "當作廣播旗標"
+
+msgid "Use builtin IPv6-management"
+msgstr ""
+
+msgid "Use custom DNS servers"
+msgstr "使用自定的DNS伺服器"
+
+msgid "Use default gateway"
+msgstr "使用預設匝道器"
+
+msgid "Use gateway metric"
+msgstr "使用匝道器公測數"
+
+msgid "Use routing table"
+msgstr "使用路由表"
+
+msgid ""
+"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
+"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"requesting host."
+msgstr ""
+"使用 <em>Add</em> 鍵以便新增一個租賃的項目. 這個 <em>MAC-Address</em> 標誌這"
+"個主機, the <em>IPv4-Address</em> 指定固定位址以便使用,<em>Hostname</em> 備指"
+"定當作象徵名稱到請求的主機上."
+
+msgid "Used"
+msgstr "已使用"
+
+msgid "Used Key Slot"
+msgstr "已使用的關鍵插槽"
+
+msgid "Username"
+msgstr "用戶名稱"
+
+msgid "VC-Mux"
+msgstr "虛擬電路多工器VC-Mux"
+
+msgid "VLAN Interface"
+msgstr "VLAN介面"
+
+msgid "VLANs on %q"
+msgstr "VLAN 在 %q"
+
+msgid "VLANs on %q (%s)"
+msgstr "VLAN 在 %q (%s)"
+
+msgid "VPN Server"
+msgstr "VPN伺服器"
+
+msgid "Vendor Class to send when requesting DHCP"
+msgstr "當請求DHCP封包時要傳送的製造商類別碼"
+
+msgid "Verify"
+msgstr "確認"
+
+msgid "Version"
+msgstr "版本"
+
+msgid "WDS"
+msgstr "無線分散系統WDS"
+
+msgid "WEP Open System"
+msgstr "WEP 開放系統"
+
+msgid "WEP Shared Key"
+msgstr "WEP 共享金鑰"
+
+msgid "WEP passphrase"
+msgstr "WEP通關密碼"
+
+msgid "WMM Mode"
+msgstr "無線多媒體機制"
+
+msgid "WPA passphrase"
+msgstr "WPA 密碼"
+
+msgid ""
+"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
+"and ad-hoc mode) to be installed."
+msgstr ""
+"WPA-加密需要 wpa_supplican(終端模式)或者hostapd熱點(對AP或者是 ad-hoc模式)已"
+"被安裝."
+
+msgid "Waiting for changes to be applied..."
+msgstr "等待修改被啟用..."
+
+msgid "Waiting for command to complete..."
+msgstr "等待完整性指令..."
+
+msgid "Warning"
+msgstr "警告"
+
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
+msgstr "警告:重開機後某些未存檔的修改將會漏失!"
+
+msgid "Wifi"
+msgstr "WIFI無線"
+
+msgid "Wireless"
+msgstr "無線網路"
+
+msgid "Wireless Adapter"
+msgstr "無線網卡"
+
+msgid "Wireless Network"
+msgstr "無線網路"
+
+msgid "Wireless Overview"
+msgstr "無線預覽"
+
+msgid "Wireless Security"
+msgstr "無線安全"
+
+msgid "Wireless is disabled or not associated"
+msgstr "無線被關閉或者尚未關聯"
+
+msgid "Wireless is restarting..."
+msgstr "無線重啟中..."
+
+msgid "Wireless network is disabled"
+msgstr "無線網路已經被關閉"
+
+msgid "Wireless network is enabled"
+msgstr "無線網路已啟用"
+
+msgid "Wireless restarted"
+msgstr "無線網路已重啟"
+
+msgid "Wireless shut down"
+msgstr "無線網路關閉"
+
+msgid "Write received DNS requests to syslog"
+msgstr "寫入已接收的DNS請求到系統日誌中"
+
+msgid "XR Support"
+msgstr "支援XR無線陣列"
+
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccessible!</strong>"
+msgstr ""
+"你可以開啟或關閉初始化指令在這. 修改將會在設備重開後被啟用. <br /><strong>警"
+"告: 假如你關閉必要的初始化腳本像\"網路\", 你的設備將可能無法存取!</strong>"
+
+msgid ""
+"You must enable Java Script in your browser or LuCI will not work properly."
+msgstr "在瀏覽器你必須啟用Java Script否則LuCI無法正常運作."
+
+msgid "any"
+msgstr "任意"
+
+msgid "auto"
+msgstr "自動"
+
+msgid "automatic"
+msgstr ""
+
+msgid "baseT"
+msgstr "baseT"
+
+msgid "bridged"
+msgstr "已橋接"
+
+msgid "create:"
+msgstr "建立:"
+
+msgid "creates a bridge over specified interface(s)"
+msgstr "在指定的介面群上建立橋接"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "dBm"
+msgstr "dBm"
+
+msgid "disable"
+msgstr "關閉"
+
+msgid "disabled"
+msgstr ""
+
+msgid "expired"
+msgstr "過期"
+
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
+msgstr ""
+"當給予<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-租賃將"
+"會被存檔"
+
+msgid "forward"
+msgstr "轉發"
+
+msgid "full-duplex"
+msgstr "全雙工"
+
+msgid "half-duplex"
+msgstr "半雙工"
+
+msgid "help"
+msgstr "幫助"
+
+msgid "hidden"
+msgstr "隱藏"
+
+msgid "hybrid mode"
+msgstr ""
+
+msgid "if target is a network"
+msgstr "假如目標是某個網路"
+
+msgid "input"
+msgstr "輸入"
+
+msgid "kB"
+msgstr "kB"
+
+msgid "kB/s"
+msgstr "kB/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
+msgstr "本地<abbr title=\"Domain Name System\">DNS</abbr> 檔案"
+
+msgid "no"
+msgstr "無"
+
+msgid "no link"
+msgstr "無連線"
+
+msgid "none"
+msgstr "無"
+
+msgid "off"
+msgstr "關閉"
+
+msgid "on"
+msgstr "開啟"
+
+msgid "open"
+msgstr "打開"
+
+msgid "relay mode"
+msgstr ""
+
+msgid "routed"
+msgstr "路由"
+
+msgid "server mode"
+msgstr ""
+
+msgid "stateful-only"
+msgstr ""
+
+msgid "stateless"
+msgstr ""
+
+msgid "stateless + stateful"
+msgstr ""
+
+msgid "tagged"
+msgstr "標籤"
+
+msgid "unknown"
+msgstr "未知"
+
+msgid "unlimited"
+msgstr "無限"
+
+msgid "unspecified"
+msgstr "尚未指定"
+
+msgid "unspecified -or- create:"
+msgstr "尚未指定 - 或 -建立:"
+
+msgid "untagged"
+msgstr "尚未標籤"
+
+msgid "yes"
+msgstr "是的"
+
+msgid "« Back"
+msgstr "« 倒退"
+
+#~ msgid "HE.net user ID"
+#~ msgstr "HE.net用戶識別碼ID"
+
+#~ msgid "This is the 32 byte hex encoded user ID, not the login name"
+#~ msgstr "這是32字元16進制用戶ID編碼,並非登入名稱"
+
+#~ msgid "40MHz 2nd channel above"
+#~ msgstr "40MHz的上述第二通道"
+
+#~ msgid "40MHz 2nd channel below"
+#~ msgstr "40MHz的下述第二通道"
+
+#~ msgid "Accept router advertisements"
+#~ msgstr "接收路由器通告"
+
+#~ msgid "Advertise IPv6 on network"
+#~ msgstr "在網路上通知IPv6"
+
+#~ msgid "Advertised network ID"
+#~ msgstr "通知網路ID"
+
+#~ msgid "Allowed range is 1 to 65535"
+#~ msgstr "允許範圍為1到65535"
+
+#~ msgid "HT capabilities"
+#~ msgstr "HT頻寬能力"
+
+#~ msgid "HT mode"
+#~ msgstr "HT頻寬模式"
+
+#~ msgid "Router Model"
+#~ msgstr "路由器型號Model"
+
+#~ msgid "Router Name"
+#~ msgstr "路由器名稱"
+
+#~ msgid "Send router solicitations"
+#~ msgstr "傳送路由器邀請封包"
+
+#~ msgid "Specifies the advertised preferred prefix lifetime in seconds"
+#~ msgstr "指定這個公告較愛字首的生命週期以秒表示"
+
+#~ msgid "Specifies the advertised valid prefix lifetime in seconds"
+#~ msgstr "指定這個公告有效字首的生命週期以秒表示"
+
+#~ msgid "Use preferred lifetime"
+#~ msgstr "使用首選的生命週期"
+
+#~ msgid "Use valid lifetime"
+#~ msgstr "使用正確的生命週期"
diff --git a/trunk/package/luci/po/zh_TW/commands.po b/trunk/package/luci/po/zh_TW/commands.po
new file mode 100644
index 00000000..4377ead4
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/commands.po
@@ -0,0 +1,94 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-18 19:59+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "A short textual description of the configured command"
+msgstr "以短文描述設定指令"
+
+msgid "Access command with"
+msgstr "存取指令"
+
+msgid ""
+"Allow executing the command and downloading its output without prior "
+"authentication"
+msgstr "允許執行這指令及下載它的輸出無須事先驗證"
+
+msgid "Allow the user to provide additional command line arguments"
+msgstr "允許用戶提供額外的指令行參數"
+
+msgid "Arguments:"
+msgstr "參數:"
+
+msgid "Binary data not displayed, download instead."
+msgstr "二進進資料未顯示, 以下載替代."
+
+msgid "Code:"
+msgstr "碼:"
+
+msgid "Collecting data..."
+msgstr "收集資料中..."
+
+msgid "Command"
+msgstr "指令"
+
+msgid "Command failed"
+msgstr "命令失敗"
+
+msgid "Command line to execute"
+msgstr "要執行的指令行"
+
+msgid "Command successful"
+msgstr "命令成功"
+
+msgid "Command:"
+msgstr "命令:"
+
+msgid "Configure"
+msgstr "設定"
+
+msgid "Custom Commands"
+msgstr "自訂指令集"
+
+msgid "Custom arguments"
+msgstr "自訂參數集"
+
+msgid "Dashboard"
+msgstr "儀表板"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Download"
+msgstr "下載"
+
+msgid "Failed to execute command!"
+msgstr "執行指令失敗!"
+
+msgid "Link"
+msgstr "連結"
+
+msgid "Loading"
+msgstr "掛載"
+
+msgid "Public access"
+msgstr "公用存取"
+
+msgid "Run"
+msgstr "執行"
+
+msgid ""
+"This page allows you to configure custom shell commands which can be easily "
+"invoked from the web interface."
+msgstr "只要可以從web介輕易調用, 這頁面允許你自定shell指令."
+
+msgid "Waiting for command to complete..."
+msgstr "等待完整命令中..."
diff --git a/trunk/package/luci/po/zh_TW/coovachilli.po b/trunk/package/luci/po/zh_TW/coovachilli.po
new file mode 100644
index 00000000..aad8a4d7
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/coovachilli.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-18 19:49+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CoovaChilli"
+msgstr "CoovaChilli服務"
+
+msgid "Network Configuration"
+msgstr "網路設定"
+
+msgid "RADIUS configuration"
+msgstr "RADIUS設定"
+
+msgid "UAM and MAC Authentication"
+msgstr "微軟UAM模組和MAC位指驗證"
diff --git a/trunk/package/luci/po/zh_TW/ddns.po b/trunk/package/luci/po/zh_TW/ddns.po
new file mode 100644
index 00000000..96037c69
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/ddns.po
@@ -0,0 +1,84 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-07 15:53+0200\n"
+"Last-Translator: Ethan <ethan42411@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Check for changed IP every"
+msgstr "檢查IP變動的時間間隔"
+
+msgid "Check-time unit"
+msgstr "時間單位"
+
+msgid "Custom update-URL"
+msgstr "自訂更新的URL"
+
+msgid "Dynamic DNS"
+msgstr "動態DNS"
+
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP address."
+msgstr ""
+"動態DNS允許為主機配置一個固定的網域名稱，但該網路名稱卻是對應到動態的IP位置"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "Force update every"
+msgstr "強制更新間隔"
+
+msgid "Force-time unit"
+msgstr "強制更新的時間單位"
+
+msgid "Hostname"
+msgstr "主機名稱"
+
+msgid "Interface"
+msgstr "界面"
+
+msgid "Network"
+msgstr "網路"
+
+msgid "Password"
+msgstr "密碼"
+
+msgid "Service"
+msgstr "服務提供者"
+
+msgid "Source of IP address"
+msgstr "IP位置來源"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Username"
+msgstr "使用者名稱"
+
+msgid "custom"
+msgstr "自訂"
+
+msgid "h"
+msgstr "小時"
+
+msgid "interface"
+msgstr "界面"
+
+msgid "min"
+msgstr "分鐘"
+
+msgid "network"
+msgstr "網路"
+
+#~ msgid "Event interface"
+#~ msgstr "事件界面"
+
+#~ msgid "On which interface up should start the ddns script process."
+#~ msgstr "介面應該啟用動態DNS指令程序"
diff --git a/trunk/package/luci/po/zh_TW/diag_core.po b/trunk/package/luci/po/zh_TW/diag_core.po
new file mode 100644
index 00000000..3cb31699
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/diag_core.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 12:47+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configure Diagnostics"
+msgstr "診斷設定"
+
+msgid "Diagnostics"
+msgstr "診斷"
+
+msgid ""
+"The diagnostics available under this menu depend on what modules you have "
+"installed on your device."
+msgstr "這選單下的診斷機制可運用性, 端看你設備上已安裝的模組而定"
+
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
+msgstr "選單內的項目允許你在系統內執行診斷測試以便解決疑難雜症"
+
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
+msgstr "採用這選項可以讓你設定網路診斷, 例如網路設備掃描跟ping的測試."
diff --git a/trunk/package/luci/po/zh_TW/diag_devinfo.po b/trunk/package/luci/po/zh_TW/diag_devinfo.po
new file mode 100644
index 00000000..fe14f68d
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/diag_devinfo.po
@@ -0,0 +1,210 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 14:54+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Actions"
+msgstr "操作"
+
+msgid "Add"
+msgstr "新增"
+
+msgid "Beginning of MAC address range"
+msgstr "MAC位址起始範圍"
+
+msgid "Config Phone Scan"
+msgstr "設定電話掃描"
+
+msgid "Configure"
+msgstr "設置"
+
+msgid "Configure Scans"
+msgstr "掃描設置"
+
+msgid ""
+"Configure scanning for devices on specified networks. Decreasing 'Timeout', "
+"'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
+"may fail to find some devices."
+msgstr "針對特定網路的掃描設定值. 增加\"超時\",\"重複數量,\"並且/或者\"傳到睡著者\"可以加速掃描, 但也有可能將要去搜尋某些設備時會失敗."
+
+msgid ""
+"Configure scanning for supported SIP devices on specified networks. "
+"Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
+"speed up scans, but also may fail to find some devices."
+msgstr ""
+"對指定的網路上已支援的SIP設備設定掃描,減少\"超時\",\"重複數量,\"並且/或者\"傳到睡著者\"可以加速描, 但也有可能將要去搜尋某些設備時會失敗."
+
+msgid "Delete"
+msgstr "刪除"
+
+msgid "Device Scan Config"
+msgstr "設備掃描設定"
+
+msgid "Device Type"
+msgstr "設備型態"
+
+msgid "Devices discovered for"
+msgstr "已發現的設備為"
+
+msgid "Devices on Network"
+msgstr "網路中的設備"
+
+msgid "Edit"
+msgstr "編輯"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "End of MAC address range"
+msgstr "MAC位址的結束範圍"
+
+msgid "Go to relevant configuration page"
+msgstr "到相應的設定頁面"
+
+msgid "IP Address"
+msgstr "IP位址"
+
+msgid "Interface"
+msgstr "介面"
+
+msgid "Invalid"
+msgstr "無效"
+
+msgid "Link to Device"
+msgstr "連結到設備上"
+
+msgid "MAC Address"
+msgstr "MAC位址"
+
+msgid "MAC Device Info Overrides"
+msgstr "MAC設備資訊覆寫"
+
+msgid "MAC Device Override"
+msgstr "MAC設備覆寫"
+
+msgid "MAC range and information used to override system and IEEE databases"
+msgstr "MAC範圍及資訊用來覆寫系統和IEEE資料庫"
+
+msgid "Milliseconds to sleep between requests (default 100)"
+msgstr "要求多久(毫)秒後進入睡眠"
+
+msgid "Model"
+msgstr "型號"
+
+msgid "Name"
+msgstr "名稱"
+
+msgid "Network Device Scan"
+msgstr "網路設備掃描"
+
+msgid "Network Device Scanning Configuration"
+msgstr "網路設備掃描設定值"
+
+msgid "Networks to scan for devices"
+msgstr "要掃描的網路設備"
+
+msgid "Networks to scan for supported devices"
+msgstr "要掃描的已支援網路設備"
+
+msgid "No SIP devices"
+msgstr "無任何SIP設備"
+
+msgid "No devices detected"
+msgstr "偵測不到設備"
+
+msgid "Number of times to send requests (default 1)"
+msgstr "傳送要求的次數(預設1)"
+
+msgid "OUI Owner"
+msgstr "OUI擁有者"
+
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
+msgstr "針對指定範圍的MAC位址,由設備資訊腳本回傳的MAC位址資訊進行覆蓋"
+
+msgid "Perform Scans (this can take a few minutes)"
+msgstr "掃描操作(可能會花費數分鐘)"
+
+msgid "Phone Information"
+msgstr "電話資訊"
+
+msgid "Phone Scan"
+msgstr "電話掃描"
+
+msgid "Phone Scanning Configuration"
+msgstr "電話掃描設定值"
+
+msgid "Phones"
+msgstr "電話"
+
+msgid "Ports"
+msgstr "埠"
+
+msgid "Raw"
+msgstr "原生RAW"
+
+msgid "Repeat Count"
+msgstr "重複次數"
+
+msgid "Repeat Scans (this can take a few minutes)"
+msgstr "重複掃描(可能花費數分鐘)"
+
+msgid "SIP Device Information"
+msgstr "SIP設備資訊"
+
+msgid "SIP Device Scan"
+msgstr "SIP設備掃描"
+
+msgid "SIP Device Scanning Configuration"
+msgstr "SIP設備掃描設定值"
+
+msgid "SIP Devices on Network"
+msgstr "網路中的SIP設備"
+
+msgid "SIP devices discovered for"
+msgstr "已發現的SIP設備"
+
+msgid "Scan for devices on specified networks."
+msgstr "針對特定網路掃描設備"
+
+msgid "Scan for supported SIP devices on specified networks."
+msgstr "針對特定網路掃描有支援的SIP設備"
+
+msgid "Scanning Configuration"
+msgstr "掃描設定值"
+
+msgid "Scans for devices on specified networks."
+msgstr "針對特定網路掃描設備"
+
+msgid "Sleep Between Requests"
+msgstr "請求之間的睡眠"
+
+msgid "Subnet"
+msgstr "子網路"
+
+msgid "This section contains no values yet"
+msgstr "這個部分尚無任何數值"
+
+msgid "Time to wait for responses in seconds (default 10)"
+msgstr "秒計等待回應時間(預設10)"
+
+msgid "Timeout"
+msgstr "超時"
+
+msgid "Use Configuration"
+msgstr "使用設定值"
+
+msgid "Vendor"
+msgstr "供應製造商"
+
+msgid "check other networks"
+msgstr "檢查它網"
diff --git a/trunk/package/luci/po/zh_TW/ffwizard.po b/trunk/package/luci/po/zh_TW/ffwizard.po
new file mode 100644
index 00000000..a009601d
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/ffwizard.po
@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 22:37+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow to transfer anonymous statistics about this node"
+msgstr "允許匿名傳輸關於這個結點的狀況"
+
+msgid "Channel"
+msgstr "頻道"
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr "檢查這個以便保護來自其它結點或用戶端的區域網路"
+
+msgid "Configure network"
+msgstr "網路設定"
+
+msgid "Connect your node with other nodes with a tunnel via the internet."
+msgstr "透過公眾網路用通道連結你的結點到另一個結點"
+
+msgid "DHCP IP range"
+msgstr "DHCP IP分配範圍"
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr "DHCP將會自動指定ip位址給客戶端"
+
+msgid "DNS Server"
+msgstr "DNS伺服器"
+
+msgid "Enable DHCP"
+msgstr "啟用DHCP"
+
+msgid "Gateway"
+msgstr "匝道器"
+
+msgid "Heartbeat"
+msgstr "心跳"
+
+msgid "IP address"
+msgstr "IP位址"
+
+msgid "L2gvpn tunnel"
+msgstr "L2gvpn通道"
+
+msgid "Limit download bandwidth"
+msgstr "限制下載頻寬"
+
+msgid "Limit upload bandwidth"
+msgstr "限制上傳頻寬"
+
+msgid "Mesh IP address"
+msgstr "Mesh任意網基站IP位址"
+
+msgid "Mesh IPv6 Address"
+msgstr "Mesh任意網基站IPv6位址"
+
+msgid "Netmask"
+msgstr "子網路遮罩"
+
+msgid "Password"
+msgstr "密碼"
+
+msgid "Password confirmation"
+msgstr "密碼再確認"
+
+msgid "Password successfully changed"
+msgstr "密碼變更成功"
+
+msgid "Protect LAN"
+msgstr "受保護的網路"
+
+msgid "Protocol"
+msgstr "協定"
+
+msgid "Select this checkbox to configure your network interfaces."
+msgstr "勾選檢查框以便設定你的網路介面"
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr "選到這個以便允許其他人可使用你的連線去存取Internet公眾網路"
+
+msgid "Share your internet connection"
+msgstr "分享你的Internet公眾網路連線"
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+"這個IP的範圍從某個客戶端被指定的IP位址開始(e.g 10.1.2.1/28).假若這是在一個網狀網絡範圍中的某個範圍,然後他將會被公告當HNA. "
+"任何其他範圍者將使用NAT.假如留空白,那群預設設定值將會被使用"
+
+msgid "The ipv6 address is calculated auomatically."
+msgstr "ipv6位只會被自動計算出"
+
+msgid "The protocol to use for internet connectivity."
+msgstr "這個協定是用在Intenet網路連線用"
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr "這是獨一無二的位址在網路中 (e.g 10.1.1.1) 並且已經備註冊到你本地社群中"
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr "這將會設定一個新的虛擬無線網路介面在AP模式"
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr "這個精靈將會引導你去設置你的路由器給Freifunk或者其他類似的無線社群網組"
+
+msgid "Unknown Error"
+msgstr "未知錯誤"
+
+msgid "Username"
+msgstr "使用者名稱"
+
+msgid "Virtual Access Point (VAP)"
+msgstr "虛擬AP存取點(VAP)"
+
+msgid "Wizard"
+msgstr "精靈"
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr "你的設備和網路芳鄰結點必須使用相同的通道."
+
+msgid "dhcp"
+msgstr "dhcp"
+
+msgid "kbit/s"
+msgstr "kbit/s"
+
+msgid "static"
+msgstr "靜態"
+
+msgid "Configure this interface."
+msgstr "設定這個介面"
+
+msgid "recommended"
+msgstr "建議值"
+
+msgid "Basic settings"
+msgstr "基本設定"
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr "基本設定值不完全. 請過去設好"
+
+msgid "Error"
+msgstr "錯誤"
+
+msgid "You can not use the wizard because some necessary values are missing."
+msgstr "你將無法使用這個精靈因為某些必要的數值已經遺失."
+
+msgid "and fill out all required fields."
+msgstr "並且填滿所有必須的欄位"
diff --git a/trunk/package/luci/po/zh_TW/firewall.po b/trunk/package/luci/po/zh_TW/firewall.po
new file mode 100644
index 00000000..6ff2df70
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/firewall.po
@@ -0,0 +1,449 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-21 12:45+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "%s in %s"
+msgstr "%s 在 %s 之中"
+
+msgid "%s%s with %s"
+msgstr "%s%s 同 %s"
+
+msgid "%s, %s in %s"
+msgstr " %s, %s 在 %s 之中"
+
+msgid "(Unnamed Entry)"
+msgstr "(未命名的項目)"
+
+msgid "(Unnamed Rule)"
+msgstr "(未命名的規則)"
+
+msgid "(Unnamed SNAT)"
+msgstr "(未命名的來源NAT)"
+
+msgid "-- Please choose --"
+msgstr "-- 請選擇 --"
+
+msgid "-- custom --"
+msgstr "-- 自訂 --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> 封包數. 每<var>%s</var>"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr "<var>%d</var> 封包數. 每<var>%s</var>, 爆量 <var>%d</var> 封包數."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> 且限制到 %s"
+
+msgid "Action"
+msgstr "動作"
+
+msgid "Add"
+msgstr "新增"
+
+msgid "Add and edit..."
+msgstr "新增並編輯..."
+
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+msgid "Allow forward from <em>source zones</em>:"
+msgstr "允許從<em>source zones</em>轉發:"
+
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr "允許從 <em>destination zones</em>轉發:"
+
+msgid "Any"
+msgstr "任意"
+
+msgid "Covered networks"
+msgstr "已覆蓋的網路"
+
+msgid "Custom Rules"
+msgstr "自訂的規則群"
+
+msgid ""
+"Custom rules allow you to execute arbritary iptables commands which are not "
+"otherwise covered by the firewall framework. The commands are executed after "
+"each firewall restart, right after the default ruleset has been loaded."
+msgstr ""
+"自定義規則允許你執行這是不以其他方式涉及的防火牆框架arbritary的iptables命令。"
+"該命令是每個防火牆重啟後執行，默認規則集已經加載之後。"
+
+msgid "Destination IP address"
+msgstr "目標IP位址"
+
+msgid "Destination address"
+msgstr "目標位址"
+
+msgid "Destination port"
+msgstr "目地埠"
+
+msgid "Destination zone"
+msgstr "目標區"
+
+msgid "Do not rewrite"
+msgstr "不要改寫"
+
+msgid "Drop invalid packets"
+msgstr "丟棄不正確的封包群"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "Enable NAT Loopback"
+msgstr "啓用NAT回傳"
+
+msgid "Enable SYN-flood protection"
+msgstr "啟用SYN-flood攻擊的保護"
+
+msgid "Enable logging on this zone"
+msgstr "啟用日誌記錄這區"
+
+msgid "External IP address"
+msgstr "外部IP位址"
+
+msgid "External port"
+msgstr "外部埠"
+
+msgid "External zone"
+msgstr "外部區域"
+
+msgid "Extra arguments"
+msgstr "額外參數"
+
+msgid "Firewall"
+msgstr "防火牆"
+
+msgid "Firewall - Custom Rules"
+msgstr "防火牆-自訂規則"
+
+msgid "Firewall - Port Forwards"
+msgstr "防火牆-埠轉發"
+
+msgid "Firewall - Traffic Rules"
+msgstr "防火牆-流量規則"
+
+msgid "Firewall - Zone Settings"
+msgstr "防火牆-區域設定"
+
+msgid "Force connection tracking"
+msgstr "強制連線追蹤"
+
+msgid "Forward"
+msgstr "轉發"
+
+msgid "Forward to"
+msgstr "轉發到"
+
+msgid "From %s in %s"
+msgstr "從％s在％s"
+
+msgid "From %s in %s with source %s"
+msgstr "從％s在％s與來源％"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "從％s在％s與來源％s和％s"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "IPv4 and IPv6"
+msgstr "IPv4 和 IPv6"
+
+msgid "IPv4 only"
+msgstr "僅有IPv4"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "IPv6 only"
+msgstr "僅有IPv6"
+
+msgid "Input"
+msgstr "輸入"
+
+msgid "Inter-Zone Forwarding"
+msgstr "內部-區轉發"
+
+msgid "Internal IP address"
+msgstr "內部的IP位址"
+
+msgid "Internal port"
+msgstr "內部的埠號"
+
+msgid "Internal zone"
+msgstr "內部區"
+
+msgid "Limit log messages"
+msgstr "限制日誌訊息數"
+
+msgid "MSS clamping"
+msgstr "MSS調節"
+
+msgid "Masquerading"
+msgstr "偽裝"
+
+msgid "Match"
+msgstr "匹配"
+
+msgid "Match ICMP type"
+msgstr "匹配的ICMP型態"
+
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "匹配已轉發的流量到給定的目標埠或者範圍埠"
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr "匹配輸入的流量到主機上給定的目標埠或者範圍埠"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr "從給定的來源埠或範圍埠在客戶端主機上的匹配傳入流量始發。"
+
+msgid "Name"
+msgstr "名稱"
+
+msgid "New SNAT rule"
+msgstr "新的來源NAT規則"
+
+msgid "New forward rule"
+msgstr "新轉發規則"
+
+msgid "New input rule"
+msgstr "新輸入規則"
+
+msgid "New port forward"
+msgstr "新轉發埠"
+
+msgid "New source NAT"
+msgstr "新來源埠"
+
+msgid "Only match incoming traffic directed at the given IP address."
+msgstr "僅匹配傳入流量予給定的IP地址."
+
+msgid "Only match incoming traffic from these MACs."
+msgstr "僅匹配從這些MAC群的傳入流量."
+
+msgid "Only match incoming traffic from this IP or range."
+msgstr "僅匹配從這個IP或範圍IP給傳入流量."
+
+msgid ""
+"Only match incoming traffic originating from the given source port or port "
+"range on the client host"
+msgstr "僅匹配從給定的來源埠或範圍埠的客戶端主機上給傳入流量."
+
+msgid "Open ports on router"
+msgstr "開啟路由器上的埠號群"
+
+msgid "Other..."
+msgstr "其它..."
+
+msgid "Output"
+msgstr "輸出"
+
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "通行額外的參數到 iptables上. 使用要小心!"
+
+msgid "Port Forwards"
+msgstr "埠轉遞"
+
+msgid ""
+"Port forwarding allows remote computers on the Internet to connect to a "
+"specific computer or service within the private LAN."
+msgstr "埠轉發允許遠端網際網路上的電腦來連接到在私人區網內指定的電腦或服務."
+
+msgid "Protocol"
+msgstr "協定"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr "重導向已匹配傳入流量到內部主機上的指定埠"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "重導向已匹配傳入流量到內部主機上"
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr "限制偽裝到已給予的目標子網路"
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr "限制偽裝到已給予的來源子網路"
+
+msgid "Restrict to address family"
+msgstr "限制的位址群"
+
+msgid "Rewrite matched traffic to the given address."
+msgstr "改寫已匹配的流量到給定的位址."
+
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr "改寫已匹配的流量到給定的來源埠. 或許可以保留空白到唯一改寫的IP位址."
+
+msgid "Rewrite to source %s"
+msgstr "改寫到來源 %s"
+
+msgid "Rewrite to source %s, %s"
+msgstr "改寫到來源 %s, %s"
+
+msgid "SNAT IP address"
+msgstr "來源NAT IP 位址"
+
+msgid "SNAT port"
+msgstr "來源NAT IP 埠"
+
+msgid "Source IP address"
+msgstr "來源 IP 位址"
+
+msgid "Source MAC address"
+msgstr "來源 MAC硬體位址"
+
+msgid "Source NAT"
+msgstr "來源NAT"
+
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"來源NAT是偽裝的一種特殊形式,它允許對輸出流量的來源IP進行精細控制, 例如要對映"
+"到多個WAN位址到內部子網路群上."
+
+msgid "Source address"
+msgstr "來源位址"
+
+msgid "Source port"
+msgstr "來源埠"
+
+msgid "Source zone"
+msgstr "來源區"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr "防火牆對你的網路建立區域以便控制網路流向."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+"下列的選項控制這區域(%s)和其它區轉發策略.<em>目地區</em> 覆蓋<strong>從 %q 起"
+"源的 </strong>已轉發的流量.<em>來源區</em>匹配從其它區域<strong>針對 %q</"
+"strong>的轉發流量.轉發規則是<em>單向的</em>."
+
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"這頁面允許你修改這個轉發埠項目的進階選項. 在大多數情況下,不需要修改這些設定."
+
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr "這頁面允許改變進階流量規則項目的進階設置, 例如匹配的來源和目標主機."
+
+#, fuzzy
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are members of this zone."
+msgstr ""
+"本節定義 %q 的通用屬性.在<em>輸入</em>和<em>輸出</em>選項設置交通進出的默認策"
+"略,而在<em>轉發</em>的選項描述在這區域內不同網路的轉發流量.<em>已覆蓋的網路群"
+"</em>指定特定區域成員可以是被運用的網路."
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "到％s在上的<var>此設備</ var>的％s的"
+
+msgid "To %s in %s"
+msgstr "到％s在％s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "到％s上的<var>此設備</ var>的"
+
+msgid "To %s, %s in %s"
+msgstr "到％s，％s的％s中"
+
+msgid "To source IP"
+msgstr "來源IP"
+
+msgid "To source port"
+msgstr "來源埠"
+
+msgid "Traffic Rules"
+msgstr "流量規則"
+
+msgid ""
+"Traffic rules define policies for packets traveling between different zones, "
+"for example to reject traffic between certain hosts or to open WAN ports on "
+"the router."
+msgstr ""
+"流量規則定義在不同區域之間竄行封包的策略,例如要拒絕特定主機群的流量或者要打開"
+"路由器上WAN埠。"
+
+msgid "Via %s"
+msgstr "通過％s的"
+
+msgid "Via %s at %s"
+msgstr "通過％s在％s的"
+
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr "你可以以選擇\"-- 自訂 --\"並且打入由空格分開的協定來做多重指定."
+
+msgid "Zone %q"
+msgstr "區域 %q"
+
+msgid "Zone ⇒ Forwardings"
+msgstr "區域 ⇒ 轉發進行"
+
+msgid "Zones"
+msgstr "領域"
+
+msgid "accept"
+msgstr "接受"
+
+msgid "any"
+msgstr "任意"
+
+msgid "any host"
+msgstr "任意埠"
+
+msgid "any router IP"
+msgstr "任意路由器IP"
+
+msgid "any zone"
+msgstr "任意區"
+
+msgid "don't track"
+msgstr "不要追蹤"
+
+msgid "drop"
+msgstr "丟棄"
+
+msgid "reject"
+msgstr "拒絕"
+
+msgid "traffic"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/freifunk-policyrouting.po b/trunk/package/luci/po/zh_TW/freifunk-policyrouting.po
new file mode 100644
index 00000000..58efa74c
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/freifunk-policyrouting.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+"All traffic from interfaces belonging to these zones will be sent via a "
+"gateway in the mesh network."
+msgstr ""
+
+msgid "Enable Policy Routing"
+msgstr ""
+
+msgid "Fallback to mesh"
+msgstr ""
+
+msgid "Firewall zones"
+msgstr ""
+
+msgid ""
+"If no default route is received from the mesh network then traffic which "
+"belongs to the selected firewall zones is routed via your internet "
+"connection as a fallback. If you do not want this and instead block that "
+"traffic then you should select this option."
+msgstr ""
+
+msgid ""
+"If your own gateway is not available then fallback to the mesh default "
+"gateway."
+msgstr ""
+
+msgid "Policy Routing"
+msgstr ""
+
+msgid "Strict Filtering"
+msgstr ""
+
+msgid ""
+"These pages can be used to setup policy routing for certain firewall zones. "
+"This is useful if you need to use your own internet connection for yourself "
+"but you don't want to share it with others (thats why it can also be called "
+"'Ego Mode'). Your own traffic is then sent via your internet connection "
+"while traffic originating from the mesh will use another gateway in the mesh."
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/freifunk.po b/trunk/package/luci/po/zh_TW/freifunk.po
new file mode 100644
index 00000000..51432e2e
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/freifunk.po
@@ -0,0 +1,390 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "BSSID"
+msgstr ""
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Basic Settings"
+msgstr ""
+
+msgid "Basic settings"
+msgstr ""
+
+msgid "Basic settings are incomplete. Please go to"
+msgstr ""
+
+msgid "Basic system settings"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check for new firmware versions and perform automatic updates."
+msgstr ""
+
+msgid "Client network size"
+msgstr ""
+
+msgid "Community"
+msgstr ""
+
+msgid "Community profile"
+msgstr ""
+
+msgid "Community settings"
+msgstr ""
+
+msgid "Confirm Upgrade"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Contact information is incomplete. Please go to"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Country code"
+msgstr ""
+
+msgid "Default routes"
+msgstr ""
+
+msgid "Disable default content"
+msgstr ""
+
+msgid "Diversity is enabled for device"
+msgstr ""
+
+msgid "E-Mail"
+msgstr ""
+
+msgid "ESSID"
+msgstr ""
+
+msgid "Edit index page"
+msgstr ""
+
+msgid "Enable IPv6"
+msgstr ""
+
+msgid "Enable a virtual access point (VAP) by default if possible."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Find your coordinates with OpenStreetMap"
+msgstr ""
+
+msgid "Freifunk"
+msgstr ""
+
+msgid "Freifunk Overview"
+msgstr ""
+
+msgid "Freifunk Remote Update"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Go to"
+msgstr ""
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "Hello and welcome in the network of"
+msgstr ""
+
+msgid "Hide OpenStreetMap"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
+msgid "If selected then the default content element is not shown."
+msgstr ""
+
+msgid "If you are interested in our project then contact the local community"
+msgstr ""
+
+msgid "Index Page"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
+msgstr ""
+
+msgid "It is operated by"
+msgstr ""
+
+msgid "Keep configuration"
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Map"
+msgstr ""
+
+msgid "Map Error"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Mesh prefix"
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network for client DHCP addresses"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "No default routes known."
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Package libiwinfo required!"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Please fill in your contact details below."
+msgstr ""
+
+msgid "Please set your contact information"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Profile (Expert)"
+msgstr ""
+
+msgid "Realname"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "SSID"
+msgstr ""
+
+msgid ""
+"Select your location with a mouse click on the map. The map will only show "
+"up if you are connected to the Internet."
+msgstr ""
+
+msgid "Show OpenStreetMap"
+msgstr ""
+
+msgid "Show on map"
+msgstr ""
+
+msgid "Signal"
+msgstr ""
+
+msgid "Splash"
+msgstr ""
+
+msgid "Start Upgrade"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "TX"
+msgstr ""
+
+msgid ""
+"The <em>libiwinfo</em> package is not installed. You must install this "
+"component for working wireless configuration!"
+msgstr ""
+
+msgid ""
+"The OLSRd service is not configured to capture position data from the "
+"network.<br /> Please make sure that the nameservice plugin is properly "
+"configured and that the <em>latlon_file</em> option is enabled."
+msgstr ""
+
+msgid "The installed firmware is the most recent version."
+msgstr ""
+
+msgid ""
+"These are the basic settings for your local wireless community. These "
+"settings define the default values for the wizard and DO NOT affect the "
+"actual configuration of the router."
+msgstr ""
+
+msgid "These are the settings of your local community."
+msgstr ""
+
+msgid ""
+"These pages will assist you in setting up your router for Freifunk or "
+"similar wireless community networks."
+msgstr ""
+
+msgid "This is the access point"
+msgstr ""
+
+msgid "Update Settings"
+msgstr ""
+
+msgid "Update available!"
+msgstr ""
+
+msgid "Uptime"
+msgstr ""
+
+msgid "VAP"
+msgstr ""
+
+msgid "Verify downloaded images"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
+msgstr ""
+
+msgid "Wireless Overview"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid ""
+"You can display additional content on the public index page by inserting "
+"valid XHTML in the form below.<br />Headlines should be enclosed between &lt;"
+"h2&gt; and &lt;/h2&gt;."
+msgstr ""
+
+msgid ""
+"You can find further information about the global Freifunk initiative at"
+msgstr ""
+
+msgid "You can manually edit the selected community profile here."
+msgstr ""
+
+msgid ""
+"You need to select a profile before you can edit it. To select a profile go "
+"to"
+msgstr ""
+
+msgid "and fill out all required fields."
+msgstr ""
+
+msgid "buffered"
+msgstr ""
+
+msgid "cached"
+msgstr ""
+
+msgid "e.g."
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "to disable it."
+msgstr ""
+
+msgid "used"
+msgstr ""
+
+msgid "wireless settings"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/hd_idle.po b/trunk/package/luci/po/zh_TW/hd_idle.po
new file mode 100644
index 00000000..4355315c
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/hd_idle.po
@@ -0,0 +1,44 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-07 15:47+0200\n"
+"Last-Translator: Ethan <ethan42411@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Disk"
+msgstr "磁碟"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "Enable debug"
+msgstr "啟用偵錯模式"
+
+msgid "Idle-time"
+msgstr "休眠時間"
+
+msgid "Idle-time unit"
+msgstr "休眠時間單位"
+
+msgid "Settings"
+msgstr "設定"
+
+msgid "h"
+msgstr "小時"
+
+msgid "hd-idle"
+msgstr "硬碟休眠"
+
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
+msgstr "硬碟休眠是控制當硬碟閒置一段時間後進入休眠模式的工具"
+
+msgid "min"
+msgstr "分鐘"
diff --git a/trunk/package/luci/po/zh_TW/meshwizard.po b/trunk/package/luci/po/zh_TW/meshwizard.po
new file mode 100644
index 00000000..a4d29e8c
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/meshwizard.po
@@ -0,0 +1,118 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Check this to protect your LAN from other nodes or clients"
+msgstr ""
+
+msgid "Cleanup config"
+msgstr ""
+
+msgid "Configure this interface"
+msgstr ""
+
+msgid "DHCP IP range"
+msgstr ""
+
+msgid "DHCP will automatically assign ip addresses to clients"
+msgstr ""
+
+msgid "Enable DHCP"
+msgstr ""
+
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv6 Settings"
+msgstr ""
+
+msgid ""
+"If this is selected then config is cleaned before setting new config options."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Mesh IP address"
+msgstr ""
+
+msgid "Mesh IPv6 address"
+msgstr ""
+
+msgid "Mesh Wizard"
+msgstr ""
+
+msgid ""
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
+msgstr ""
+
+msgid "Protect LAN"
+msgstr ""
+
+msgid ""
+"Select this to allow others to use your connection to access the internet."
+msgstr ""
+
+msgid "Send router advertisements on this device."
+msgstr ""
+
+msgid "Share your internet connection"
+msgstr ""
+
+msgid ""
+"The IP range from which clients are assigned ip addresses (e.g. "
+"10.1.2.1/28). If this is a range inside your mesh network range, then it "
+"will be announced as HNA. Any other range will use NAT. If left empty then "
+"the defaults from the community profile will be used."
+msgstr ""
+
+msgid "The given IP address is not inside the mesh network range"
+msgstr ""
+
+msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
+"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
+"registered at your local community."
+msgstr ""
+
+msgid "This will setup a new virtual wireless interface in Access Point mode."
+msgstr ""
+
+msgid ""
+"This wizard will assist you in setting up your router for Freifunk or "
+"another similar wireless community network."
+msgstr ""
+
+msgid "Virtual Access Point (VAP)"
+msgstr ""
+
+msgid "Wizard"
+msgstr ""
+
+msgid "Your device and neighbouring nodes have to use the same channel."
+msgstr ""
+
+msgid "recommended"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/minidlna.po b/trunk/package/luci/po/zh_TW/minidlna.po
new file mode 100644
index 00000000..1af32809
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/minidlna.po
@@ -0,0 +1,167 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 13:15+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "進階設定值"
+
+msgid "Album art names:"
+msgstr "專輯名稱"
+
+msgid "Announced model number:"
+msgstr "已宣告型號數量"
+
+msgid "Announced serial number:"
+msgstr "已宣告序號數量"
+
+msgid "Browse directory"
+msgstr "瀏覽目錄"
+
+msgid "Collecting data..."
+msgstr "收集資料進行中..."
+
+msgid "Database directory:"
+msgstr "資料庫目錄所在:"
+
+msgid "Enable TIVO:"
+msgstr "啟用TIVO代錄"
+
+msgid "Enable inotify:"
+msgstr "啟用檔案事件監控"
+
+msgid "Enable:"
+msgstr "啟用:"
+
+msgid "Friendly name:"
+msgstr "友善名稱"
+
+msgid "General Settings"
+msgstr "一般設定值"
+
+msgid "Interfaces:"
+msgstr "介面"
+
+msgid "Log directory:"
+msgstr "Log紀錄放置區"
+
+msgid "Media directories:"
+msgstr "媒體目錄區:"
+
+msgid ""
+"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
+"UPnP-AV clients."
+msgstr "MiniDLNA是一個伺服器軟體針對能完全兼容DLNA/UPnP-AV用戶端."
+
+msgid ""
+"Model number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Network interfaces to serve."
+msgstr ""
+
+msgid "Notify interval in seconds."
+msgstr ""
+
+msgid "Notify interval:"
+msgstr ""
+
+msgid "Pictures"
+msgstr ""
+
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr ""
+
+msgid "Port:"
+msgstr ""
+
+msgid "Presentation URL:"
+msgstr ""
+
+msgid "Root container:"
+msgstr ""
+
+msgid ""
+"Serial number the miniDLNA daemon will report to clients in its XML "
+"description."
+msgstr ""
+
+msgid ""
+"Set this if you want to customize the name that shows up on your clients."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its database and album art cache."
+msgstr ""
+
+msgid ""
+"Set this if you would like to specify the directory where you want MiniDLNA "
+"to store its log file."
+msgstr ""
+
+msgid ""
+"Set this to enable inotify monitoring to automatically discover new files."
+msgstr ""
+
+msgid ""
+"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
+"supporting HMO."
+msgstr ""
+
+msgid ""
+"Set this to strictly adhere to DLNA standards. This will allow server-side "
+"downscaling of very large JPEG images, which may hurt JPEG serving "
+"performance on (at least) Sony DLNA products."
+msgstr ""
+
+msgid ""
+"Set this to the directory you want scanned. If you want to restrict the "
+"directory to a specific content type, you can prepend the type ('A' for "
+"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
+"(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
+msgstr ""
+
+msgid "Specify the path to the MiniSSDPd socket."
+msgstr ""
+
+msgid "Standard container"
+msgstr ""
+
+msgid "Strict to DLNA standard:"
+msgstr ""
+
+msgid ""
+"The miniDLNA service is active, serving %d audio, %d video and %d image "
+"files."
+msgstr ""
+
+msgid "The miniDLNA service is not running."
+msgstr ""
+
+msgid "This is a list of file names to check for when searching for album art."
+msgstr ""
+
+msgid "Video"
+msgstr ""
+
+msgid "miniDLNA"
+msgstr ""
+
+msgid "miniDLNA Status"
+msgstr ""
+
+msgid "miniSSDP socket:"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/mmc_over_gpio.po b/trunk/package/luci/po/zh_TW/mmc_over_gpio.po
new file mode 100644
index 00000000..fe12e665
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/mmc_over_gpio.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-21 12:48+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "CLK_pin"
+msgstr "CLK_pin腳"
+
+msgid "CS_pin"
+msgstr "CS_pin腳"
+
+msgid "DI_pin"
+msgstr "DI_pin腳"
+
+msgid "DO_pin"
+msgstr "DO_pin腳"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "MMC/SD driver configuration"
+msgstr "MMC/SD記憶卡驅動程式設定"
+
+msgid "Mode"
+msgstr "模式"
+
+msgid "Name"
+msgstr "名稱"
+
+msgid "Settings"
+msgstr "設定值"
diff --git a/trunk/package/luci/po/zh_TW/multiwan.po b/trunk/package/luci/po/zh_TW/multiwan.po
new file mode 100644
index 00000000..9bfbb8f8
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/multiwan.po
@@ -0,0 +1,118 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 18:42+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Attempts Before WAN Failover"
+msgstr "寬頻失敗前嘗試"
+
+msgid "Attempts Before WAN Recovery"
+msgstr "寬頻復原前嘗試"
+
+msgid "Auto"
+msgstr "自動"
+
+msgid "Collecting data..."
+msgstr "收集資料中"
+
+msgid ""
+"Configure rules for directing outbound traffic through specified WAN Uplinks."
+msgstr "透過指定的寬頻上傳重導輸出流量的規則設定"
+
+msgid "DNS Server(s)"
+msgstr "DNS伺服器"
+
+msgid "Default Route"
+msgstr "預設路由器"
+
+msgid "Destination Address"
+msgstr "目標位址"
+
+msgid "Disable"
+msgstr "關閉"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "Failing"
+msgstr "失敗"
+
+msgid "Failover Traffic Destination"
+msgstr "故障備援流量目的地"
+
+msgid "Health Monitor ICMP Host(s)"
+msgstr "健診ICMP的主機群"
+
+msgid "Health Monitor ICMP Timeout"
+msgstr "健診ICMP超時"
+
+msgid "Health Monitor Interval"
+msgstr "健診間隔"
+
+msgid ""
+"Health Monitor detects and corrects network changes and failed connections."
+msgstr "健診偵測並校正網路改變及失敗的連線"
+
+msgid "KO"
+msgstr "KO"
+
+msgid "Load Balancer Distribution"
+msgstr "分散式負載平衡"
+
+msgid "Load Balancer(Compatibility)"
+msgstr "(取相容性)負載平衡"
+
+msgid "Load Balancer(Performance)"
+msgstr "(取最大效能)負載平衡"
+
+msgid "Multi-WAN"
+msgstr "多元寬頻"
+
+msgid "Multi-WAN Status"
+msgstr "多元寬頻狀態"
+
+msgid "Multi-WAN Traffic Rules"
+msgstr "多元寬頻流量規則"
+
+msgid ""
+"Multi-WAN allows for the use of multiple uplinks for load balancing and "
+"failover."
+msgstr "允許多元寬頻使用多重上傳平衡負載和備援"
+
+msgid "None"
+msgstr "無"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Ports"
+msgstr "埠號"
+
+msgid "Protocol"
+msgstr "協定"
+
+msgid "Recovering"
+msgstr "復原中"
+
+msgid "Source Address"
+msgstr "來源位址"
+
+msgid "Unknown"
+msgstr "未知"
+
+msgid "WAN Interfaces"
+msgstr "寬頻介面"
+
+msgid "WAN Uplink"
+msgstr "寬頻上傳"
+
+msgid "all"
+msgstr "全部"
diff --git a/trunk/package/luci/po/zh_TW/ntpc.po b/trunk/package/luci/po/zh_TW/ntpc.po
new file mode 100644
index 00000000..a8986711
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/ntpc.po
@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 18:43+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Clock Adjustment"
+msgstr "校時修正"
+
+msgid "Count of time measurements"
+msgstr "時間計量次數"
+
+msgid "Current system time"
+msgstr "目前系統時間"
+
+msgid "General"
+msgstr "一般"
+
+msgid "Hostname"
+msgstr "主機名稱"
+
+msgid "Offset frequency"
+msgstr "偏移頻道"
+
+msgid "Port"
+msgstr "埠號"
+
+msgid "Synchronizes the system time"
+msgstr "同步這個系統時間"
+
+msgid "Time Server"
+msgstr "校時伺服器"
+
+msgid "Time Servers"
+msgstr "校時伺服器"
+
+msgid "Time Synchronisation"
+msgstr "校時同步"
+
+msgid "Update interval (in seconds)"
+msgstr "更新間隔(秒)"
+
+msgid "empty = infinite"
+msgstr "留白=不限制"
diff --git a/trunk/package/luci/po/zh_TW/olsr.po b/trunk/package/luci/po/zh_TW/olsr.po
new file mode 100644
index 00000000..797874d8
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/olsr.po
@@ -0,0 +1,700 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-15 07:15+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Active MID announcements"
+msgstr "啟用Mesh網狀網路ID公告"
+
+msgid "Active OLSR nodes"
+msgstr "啟用OLSR路由協議節點"
+
+msgid "Active host net announcements"
+msgstr "啟用主機網路公告"
+
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+msgid "Allow gateways with NAT"
+msgstr "允許帶NAT的匝道器"
+
+msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
+msgstr "允許帶NAT的匝道器選擇輸出ipv4封包"
+
+msgid "Announce uplink"
+msgstr "公告上傳"
+
+msgid "Announced network"
+msgstr "公告網路"
+
+msgid "Bad (ETX > 10)"
+msgstr ""
+
+msgid "Bad (SNR < 5)"
+msgstr ""
+
+msgid "Both values must use the dotted decimal notation."
+msgstr "這兩個值都必須採用點分十進位制格式"
+
+msgid "Broadcast address"
+msgstr "廣播位址"
+
+msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
+msgstr ""
+
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid ""
+"Could not get any data. Make sure the jsoninfo plugin is installed and "
+"allows connections from localhost."
+msgstr ""
+
+msgid "Display"
+msgstr "顯示"
+
+msgid "Downlink"
+msgstr "下行"
+
+msgid "Download Config"
+msgstr "下載設置"
+
+msgid "ETX"
+msgstr ""
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid ""
+"Enable SmartGateway. If it is disabled, then all other SmartGateway "
+"parameters are ignored. Default is \"no\"."
+msgstr ""
+"啟用機動式匝道器. 假如它失效, 其它所有機動式匝道器參數將被忽視. 預設值是\"no"
+"\""
+
+msgid "Enable this interface."
+msgstr "啟用這個介面"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid "Expected retransmission count"
+msgstr "預計重傳次數"
+
+msgid "FIB metric"
+msgstr "FIB指標"
+
+msgid ""
+"FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
+"means that the metric value is always 2. This is the preferred value because "
+"it helps the linux kernel routing to clean up older routes. \"correct\" uses "
+"the hopcount as the metric value. \"approx\" use the hopcount as the metric "
+"value too, but does only update the hopcount if the nexthop changes too. "
+"Default is \"flat\"."
+msgstr ""
+"FIBMetric控制OLSR主機路由的公用路由計量設定.  \"flat\" 代表是公用計量數永遠是"
+"2. 這是較受歡迎的數值, 因為它會協助linux核心路由清除舊的路由表. \"correct\"使"
+"用跳躍數當作公用路由計量. \"approx\"也使用跳躍數當作公用路由計量, 但只作用在"
+"跳躍數也更新時. 預設值是\"flat\"."
+
+msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
+msgstr ""
+
+msgid "Gateway"
+msgstr "匝道器"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "General settings"
+msgstr "一般設定"
+
+msgid "Good (2 < ETX < 4)"
+msgstr ""
+
+msgid "Good (30 > SNR > 20)"
+msgstr ""
+
+msgid "Green"
+msgstr ""
+
+msgid "HNA"
+msgstr ""
+
+msgid "HNA Announcements"
+msgstr ""
+
+msgid "HNA interval"
+msgstr ""
+
+msgid "HNA validity time"
+msgstr ""
+
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "啟用Mesh網狀網路ID公告"
+
+msgid "Hello"
+msgstr ""
+
+msgid "Hello interval"
+msgstr ""
+
+msgid "Hello validity time"
+msgstr ""
+
+msgid "Hide IPv4"
+msgstr ""
+
+msgid "Hide IPv6"
+msgstr ""
+
+msgid "Hna4"
+msgstr ""
+
+msgid "Hna6"
+msgstr ""
+
+msgid "Hops"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA messages."
+msgstr ""
+
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
+"Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
+"robustness to the link sensing but delays neighbor registration. Defaults is "
+"\"yes\""
+msgstr ""
+
+msgid "IP Addresses"
+msgstr ""
+
+msgid ""
+"IP-version to use. If 6and4 is selected then one olsrd instance is started "
+"for each protocol."
+msgstr ""
+
+msgid "IPv4"
+msgstr ""
+
+msgid "IPv4 broadcast"
+msgstr ""
+
+msgid ""
+"IPv4 broadcast address for outgoing OLSR packets. One useful example would "
+"be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
+"interface broadcast IP."
+msgstr ""
+
+msgid "IPv4 source"
+msgstr ""
+
+msgid ""
+"IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
+"triggers usage of the interface IP."
+msgstr ""
+
+msgid "IPv6"
+msgstr ""
+
+msgid "IPv6 multicast"
+msgstr ""
+
+msgid ""
+"IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
+"multicast."
+msgstr ""
+
+msgid ""
+"IPv6 network must be given in full notation, prefix must be in CIDR notation."
+msgstr ""
+
+msgid "IPv6 source"
+msgstr ""
+
+msgid ""
+"IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
+"the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
+"of a not-linklocal interface IP."
+msgstr ""
+
+msgid "IPv6-Prefix of the uplink"
+msgstr ""
+
+msgid ""
+"If the route to the current gateway is to be changed, the ETX value of this "
+"gateway is multiplied with this value before it is compared to the new one. "
+"The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 "
+"if changed.<br /><b>WARNING:</b> This parameter should not be used together "
+"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
+msgstr ""
+
+msgid ""
+"If this Node uses NAT for connections to the internet. Default is \"yes\"."
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid ""
+"Interface Mode is used to prevent unnecessary packet forwarding on switched "
+"ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
+"\"mesh\"."
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces Defaults"
+msgstr ""
+
+msgid "Internet protocol"
+msgstr ""
+
+msgid ""
+"Interval to poll network interfaces for configuration changes (in seconds). "
+"Default is \"2.5\"."
+msgstr ""
+
+msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
+msgstr ""
+
+msgid ""
+"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
+"and 1.0 here."
+msgstr ""
+
+msgid "Known OLSR routes"
+msgstr ""
+
+msgid "LQ"
+msgstr ""
+
+msgid "LQ aging"
+msgstr ""
+
+msgid "LQ algorithm"
+msgstr ""
+
+msgid "LQ fisheye"
+msgstr ""
+
+msgid "LQ level"
+msgstr ""
+
+msgid ""
+"LQMult requires two values (IP address or 'default' and multiplicator) "
+"seperated by space."
+msgstr ""
+
+msgid "Last hop"
+msgstr ""
+
+msgid "Legend"
+msgstr ""
+
+msgid "Library"
+msgstr ""
+
+msgid "Link Quality Settings"
+msgstr ""
+
+msgid ""
+"Link quality aging factor (only for lq level 2). Tuning parameter for "
+"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
+"(allowed values are between 0.01 and 1.0)"
+msgstr ""
+
+msgid ""
+"Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+"floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx variant which use all OLSR traffic (instead of only hellos) for ETX "
+"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
+"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+msgstr ""
+
+msgid ""
+"Link quality level switch between hopcount and cost-based (mostly ETX) "
+"routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
+"quality for MPR selection and routing<br />Default is \"2\""
+msgstr ""
+
+msgid "LinkQuality Multiplicator"
+msgstr ""
+
+msgid "Links per node (average)"
+msgstr ""
+
+msgid "Links total"
+msgstr ""
+
+msgid "Local interface IP"
+msgstr ""
+
+msgid "MID"
+msgstr ""
+
+msgid "MID interval"
+msgstr ""
+
+msgid "MID validity time"
+msgstr ""
+
+msgid "MTU"
+msgstr ""
+
+msgid "Main IP"
+msgstr ""
+
+msgid ""
+"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
+"configured on port 9090 and accepts connections from \"127.0.0.1\"."
+msgstr ""
+
+msgid "Metric"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
+"nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
+msgid "NAT threshold"
+msgstr ""
+
+msgid "NLQ"
+msgstr ""
+
+msgid "Neighbors"
+msgstr ""
+
+msgid "Neighbour IP"
+msgstr ""
+
+msgid "Neighbours"
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network address"
+msgstr ""
+
+msgid "Nic changes poll interval"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
+msgid "OLSR - HNA-Announcements"
+msgstr ""
+
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
+msgid "OLSR - Plugins"
+msgstr ""
+
+msgid "OLSR Daemon"
+msgstr ""
+
+msgid "OLSR Daemon - Interface"
+msgstr ""
+
+msgid "OLSR connections"
+msgstr ""
+
+msgid "OLSR gateway"
+msgstr ""
+
+msgid "OLSR node"
+msgstr ""
+
+msgid "Orange"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "Overview of currently active OLSR host net announcements"
+msgstr ""
+
+msgid "Overview of currently established OLSR connections"
+msgstr ""
+
+msgid "Overview of currently known OLSR nodes"
+msgstr ""
+
+msgid "Overview of currently known routes to other OLSR nodes"
+msgstr ""
+
+msgid "Overview of interfaces where OLSR is running"
+msgstr ""
+
+msgid "Overview of known multiple interface announcements"
+msgstr ""
+
+msgid "Overview of smart gateways in this network"
+msgstr ""
+
+msgid "Plugin configuration"
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
+msgstr ""
+
+msgid "Pollrate"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Red"
+msgstr ""
+
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Secondary OLSR interfaces"
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is 0.0.0.0, which triggers usage of the "
+"IP of the first interface."
+msgstr ""
+
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
+msgid "Show IPv4"
+msgstr ""
+
+msgid "Show IPv6"
+msgstr ""
+
+msgid "Signal Noise Ratio in dB"
+msgstr ""
+
+msgid "SmartGW"
+msgstr ""
+
+msgid "SmartGW announcements"
+msgstr ""
+
+msgid "SmartGateway is not configured on this system."
+msgstr ""
+
+msgid "Source address"
+msgstr ""
+
+msgid ""
+"Specifies the speed of the uplink in kilobits/s. First parameter is "
+"upstream, second parameter is downstream. Default is \"128 1024\"."
+msgstr ""
+
+msgid "Speed of the uplink"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Still usable (20 > SNR > 5)"
+msgstr ""
+
+msgid "Still usable (4 < ETX < 10)"
+msgstr ""
+
+msgid "Success rate of packages received from the neighbour"
+msgstr ""
+
+msgid "Success rate of packages sent to the neighbour"
+msgstr ""
+
+msgid "TC"
+msgstr ""
+
+msgid "TC interval"
+msgstr ""
+
+msgid "TC validity time"
+msgstr ""
+
+msgid "TOS value"
+msgstr ""
+
+msgid ""
+"The OLSR daemon is an implementation of the Optimized Link State Routing "
+"protocol. As such it allows mesh routing for any network equipment. It runs "
+"on any wifi card that supports ad-hoc mode and of course on any ethernet "
+"device. Visit <a href='http://www.olsr.org'>olsrd.org</a> for help and "
+"documentation."
+msgstr ""
+
+msgid ""
+"The fixed willingness to use. If not set willingness will be calculated "
+"dynamically based on battery/power status. Default is \"3\"."
+msgstr ""
+
+msgid "The interface OLSRd should serve."
+msgstr ""
+
+msgid ""
+"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
+"It can have a value between 1 and 65535."
+msgstr ""
+
+msgid ""
+"This can be used to signal the external IPv6 prefix of the uplink to the "
+"clients. This might allow a client to change it's local IPv6 address to use "
+"the IPv6 gateway without any kind of address translation. The maximum prefix "
+"length is 64 bits. Default is \"::/0\" (no prefix)."
+msgstr ""
+
+msgid "Timing and Validity"
+msgstr ""
+
+msgid "Topology"
+msgstr ""
+
+msgid ""
+"Type of service value for the IP header of control traffic. Default is "
+"\"16\"."
+msgstr ""
+
+msgid "Unable to connect to the OLSR daemon!"
+msgstr ""
+
+msgid "Uplink"
+msgstr ""
+
+msgid "Uplink uses NAT"
+msgstr ""
+
+msgid "Use hysteresis"
+msgstr ""
+
+msgid "Validity Time"
+msgstr ""
+
+msgid "Version"
+msgstr ""
+
+msgid "Very good (ETX < 2)"
+msgstr ""
+
+msgid "Very good (SNR > 30)"
+msgstr ""
+
+msgid "WLAN"
+msgstr ""
+
+msgid ""
+"Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
+"work, please install it."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
+msgid ""
+"When multiple links exist between hosts the weight of interface is used to "
+"determine the link to use. Normally the weight is automatically calculated "
+"by olsrd based on the characteristics of the interface, but here you can "
+"specify a fixed value. Olsrd will choose links with the lowest value.<br /"
+"><b>Note:</b> Interface weight is used only when LinkQualityLevel is set to "
+"0. For any other value of LinkQualityLevel, the interface ETX value is used "
+"instead."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. "
+"Default setting is \"both\"."
+msgstr ""
+
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
+msgid "Willingness"
+msgstr ""
+
+msgid "Yellow"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+#~ msgid "Device"
+#~ msgstr "設備"
diff --git a/trunk/package/luci/po/zh_TW/openvpn.po b/trunk/package/luci/po/zh_TW/openvpn.po
new file mode 100644
index 00000000..bddb9c7a
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/openvpn.po
@@ -0,0 +1,545 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "%s"
+msgstr ""
+
+msgid "'net30', 'p2p', or 'subnet'"
+msgstr ""
+
+msgid "Accept options pushed from server"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Add route after establishing connection"
+msgstr ""
+
+msgid "Additional authentication over TLS"
+msgstr ""
+
+msgid "Allow client-to-client traffic"
+msgstr ""
+
+msgid "Allow multiple clients with same certificate"
+msgstr ""
+
+msgid "Allow only one session"
+msgstr ""
+
+msgid "Allow remote to change its IP or port"
+msgstr ""
+
+msgid "Allowed maximum of connected clients"
+msgstr ""
+
+msgid "Allowed maximum of internal"
+msgstr ""
+
+msgid "Allowed maximum of new connections"
+msgstr ""
+
+msgid "Append log to file"
+msgstr ""
+
+msgid "Authenticate using username/password"
+msgstr ""
+
+msgid "Automatically redirect default route"
+msgstr ""
+
+msgid "Below is a list of configured OpenVPN instances and their current state"
+msgstr ""
+
+msgid "Call down cmd/script before TUN/TAP close"
+msgstr ""
+
+msgid "Certificate authority"
+msgstr ""
+
+msgid "Change process priority"
+msgstr ""
+
+msgid "Change to directory before initialization"
+msgstr ""
+
+msgid "Check peer certificate against a CRL"
+msgstr ""
+
+msgid "Chroot to directory after initialization"
+msgstr ""
+
+msgid "Client is disabled"
+msgstr ""
+
+msgid "Configuration category"
+msgstr ""
+
+msgid "Configure client mode"
+msgstr ""
+
+msgid "Configure server bridge"
+msgstr ""
+
+msgid "Configure server mode"
+msgstr ""
+
+msgid "Connect through Socks5 proxy"
+msgstr ""
+
+msgid "Connect to remote host through an HTTP proxy"
+msgstr ""
+
+msgid "Connection retry interval"
+msgstr ""
+
+msgid "Cryptography"
+msgstr ""
+
+msgid "Daemonize after initialization"
+msgstr ""
+
+msgid "Delay n seconds after connection"
+msgstr ""
+
+msgid "Delay tun/tap open and up script execution"
+msgstr ""
+
+msgid "Diffie Hellman parameters"
+msgstr ""
+
+msgid "Directory for custom client config files"
+msgstr ""
+
+msgid "Disable Paging"
+msgstr ""
+
+msgid "Disable cipher initialisation vector"
+msgstr ""
+
+msgid "Disable options consistency check"
+msgstr ""
+
+msgid "Disable replay protection"
+msgstr ""
+
+msgid "Do not bind to local address and port"
+msgstr ""
+
+msgid "Don't actually execute ifconfig"
+msgstr ""
+
+msgid "Don't add routes automatically"
+msgstr ""
+
+msgid "Don't cache --askpass or --auth-user-pass passwords"
+msgstr ""
+
+msgid "Don't inherit global push options"
+msgstr ""
+
+msgid "Don't log timestamps"
+msgstr ""
+
+msgid "Don't re-read key on restart"
+msgstr ""
+
+msgid "Don't require client certificate"
+msgstr ""
+
+msgid "Don't use adaptive lzo compression"
+msgstr ""
+
+msgid "Don't warn on ifconfig inconsistencies"
+msgstr ""
+
+msgid "Echo parameters to log"
+msgstr ""
+
+msgid "Empirically measure MTU"
+msgstr ""
+
+msgid "Enable OpenSSL hardware crypto engines"
+msgstr ""
+
+msgid "Enable Path MTU discovery"
+msgstr ""
+
+msgid "Enable Static Key encryption mode (non-TLS)"
+msgstr ""
+
+msgid "Enable TLS and assume client role"
+msgstr ""
+
+msgid "Enable TLS and assume server role"
+msgstr ""
+
+msgid "Enable internal datagram fragmentation"
+msgstr ""
+
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
+msgid "Encryption cipher for packets"
+msgstr ""
+
+msgid "Execute shell cmd after routes are added"
+msgstr ""
+
+msgid "Execute shell command on remote ip change"
+msgstr ""
+
+msgid ""
+"Executed in server mode on new client connections, when the client is still "
+"untrusted"
+msgstr ""
+
+msgid ""
+"Executed in server mode whenever an IPv4 address/route or MAC address is "
+"added to OpenVPN's internal routing table"
+msgstr ""
+
+msgid "Exit on TLS negotiation failure"
+msgstr ""
+
+msgid "Get PEM password from controlling tty before we daemonize"
+msgstr ""
+
+msgid "HMAC authentication for packets"
+msgstr ""
+
+msgid "Handling of authentication failures"
+msgstr ""
+
+msgid ""
+"Helper directive to simplify the expression of --ping and --ping-restart in "
+"server mode configurations"
+msgstr ""
+
+msgid "If hostname resolve fails, retry"
+msgstr ""
+
+msgid "Instance \"%s\""
+msgstr ""
+
+msgid "Invalid"
+msgstr ""
+
+msgid "Keep local IP address on restart"
+msgstr ""
+
+msgid "Keep remote IP address on restart"
+msgstr ""
+
+msgid "Keep tun/tap device open on restart"
+msgstr ""
+
+msgid "Key transition window"
+msgstr ""
+
+msgid "Limit repeated log messages"
+msgstr ""
+
+msgid "Local certificate"
+msgstr ""
+
+msgid "Local host name or ip address"
+msgstr ""
+
+msgid "Local private key"
+msgstr ""
+
+msgid "Major mode"
+msgstr ""
+
+msgid "Make tun device IPv6 capable"
+msgstr ""
+
+msgid "Maximum number of queued TCP output packets"
+msgstr ""
+
+msgid "Networking"
+msgstr ""
+
+msgid "Number of allocated broadcast buffers"
+msgstr ""
+
+msgid "Number of lines for log file history"
+msgstr ""
+
+msgid "Only accept connections from given X509 name"
+msgstr ""
+
+msgid "Only process ping timeouts if routes exist"
+msgstr ""
+
+msgid "OpenVPN"
+msgstr ""
+
+msgid "OpenVPN instances"
+msgstr ""
+
+msgid "Optimize TUN/TAP/UDP writes"
+msgstr ""
+
+msgid "Output to syslog and do not daemonize"
+msgstr ""
+
+msgid "Overview"
+msgstr ""
+
+msgid "PKCS#12 file containing keys"
+msgstr ""
+
+msgid "Pass environment variables to script"
+msgstr ""
+
+msgid "Persist replay-protection state"
+msgstr ""
+
+msgid "Persist/unpersist ifconfig-pool"
+msgstr ""
+
+msgid "Ping remote every n seconds over TCP/UDP port"
+msgstr ""
+
+msgid "Policy level over usage of external programs and scripts"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Proxy timeout in seconds"
+msgstr ""
+
+msgid "Push an ifconfig option to remote"
+msgstr ""
+
+msgid "Push options to peer"
+msgstr ""
+
+msgid "Query management channel for private key"
+msgstr ""
+
+msgid "Randomly choose remote server"
+msgstr ""
+
+msgid "Refuse connection if no custom client config"
+msgstr ""
+
+msgid "Remap SIGUSR1 signals"
+msgstr ""
+
+msgid "Remote host name or ip address"
+msgstr ""
+
+msgid "Remote ping timeout"
+msgstr ""
+
+msgid "Renegotiate data chan. key after bytes"
+msgstr ""
+
+msgid "Renegotiate data chan. key after packets"
+msgstr ""
+
+msgid "Renegotiate data chan. key after seconds"
+msgstr ""
+
+msgid "Replay protection sliding window size"
+msgstr ""
+
+msgid "Require explicit designation on certificate"
+msgstr ""
+
+msgid "Require explicit key usage on certificate"
+msgstr ""
+
+msgid "Restart after remote ping timeout"
+msgstr ""
+
+msgid "Retransmit timeout on TLS control channel"
+msgstr ""
+
+msgid "Retry indefinitely on HTTP proxy errors"
+msgstr ""
+
+msgid "Retry indefinitely on Socks proxy errors"
+msgstr ""
+
+msgid "Route subnet to client"
+msgstr ""
+
+msgid "Run as an inetd or xinetd server"
+msgstr ""
+
+msgid "Run script cmd on client connection"
+msgstr ""
+
+msgid "Run script cmd on client disconnection"
+msgstr ""
+
+msgid "Run up/down scripts for all restarts"
+msgstr ""
+
+msgid "Send notification to peer on disconnect"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Set GID to group"
+msgstr ""
+
+msgid "Set TCP/UDP MTU"
+msgstr ""
+
+msgid "Set UID to user"
+msgstr ""
+
+msgid "Set aside a pool of subnets"
+msgstr ""
+
+msgid "Set extended HTTP proxy options"
+msgstr ""
+
+msgid "Set output verbosity"
+msgstr ""
+
+msgid "Set size of real and virtual address hash tables"
+msgstr ""
+
+msgid "Set the TCP/UDP receive buffer size"
+msgstr ""
+
+msgid "Set the TCP/UDP send buffer size"
+msgstr ""
+
+msgid "Set tun/tap TX queue length"
+msgstr ""
+
+msgid "Set tun/tap adapter parameters"
+msgstr ""
+
+msgid "Set tun/tap device MTU"
+msgstr ""
+
+msgid "Set tun/tap device overhead"
+msgstr ""
+
+msgid "Set upper bound on TCP MSS"
+msgstr ""
+
+msgid "Shaping for peer bandwidth"
+msgstr ""
+
+msgid "Shell cmd to execute after tun device open"
+msgstr ""
+
+msgid "Shell cmd to run after tun device close"
+msgstr ""
+
+msgid "Shell command to verify X509 name"
+msgstr ""
+
+msgid "Silence the output of replay warnings"
+msgstr ""
+
+msgid "Size of cipher key"
+msgstr ""
+
+msgid "Specify a default gateway for routes"
+msgstr ""
+
+msgid "Start OpenVPN in a hibernating state"
+msgstr ""
+
+msgid "Start/Stop"
+msgstr ""
+
+msgid "Started"
+msgstr ""
+
+msgid "Status file format version"
+msgstr ""
+
+msgid "Switch to advanced configuration »"
+msgstr ""
+
+msgid "TCP/UDP port # for both local and remote"
+msgstr ""
+
+msgid "TCP/UDP port # for local (default=1194)"
+msgstr ""
+
+msgid "TCP/UDP port # for remote (default=1194)"
+msgstr ""
+
+msgid "TLS cipher"
+msgstr ""
+
+msgid "TOS passthrough (applies to IPv4 only)"
+msgstr ""
+
+msgid "Temporary directory for client-connect return file"
+msgstr ""
+
+msgid "Timeframe for key exchange"
+msgstr ""
+
+msgid "Type of used device"
+msgstr ""
+
+msgid "Use fast LZO compression"
+msgstr ""
+
+msgid "Use individual addresses rather than /30 subnets"
+msgstr ""
+
+msgid "Use protocol"
+msgstr ""
+
+msgid "Use tun/tap device node"
+msgstr ""
+
+msgid "Use username as common name"
+msgstr ""
+
+msgid "VPN"
+msgstr ""
+
+msgid "Write log to file"
+msgstr ""
+
+msgid "Write process ID to file"
+msgstr ""
+
+msgid "Write status to file every n seconds"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "tun/tap device"
+msgstr ""
+
+msgid "tun/tap inactivity timeout"
+msgstr ""
+
+msgid "yes (%i)"
+msgstr ""
+
+msgid "« Switch to basic configuration"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/p2pblock.po b/trunk/package/luci/po/zh_TW/p2pblock.po
new file mode 100644
index 00000000..f542f779
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/p2pblock.po
@@ -0,0 +1,41 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 11:09+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Block Time"
+msgstr "阻斷時間"
+
+msgid "Enable P2P-Block"
+msgstr "啓用P2P禁斷"
+
+msgid "IP-P2P"
+msgstr "IP點對點協定"
+
+msgid "Layer7-Protocols"
+msgstr "第七層協定"
+
+msgid "P2P-Block"
+msgstr "P2P禁斷"
+
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
+msgstr "P2P-Block是一個灰名單機制, 針對不在白名單清單裡面的用戶, 阻斷各種類的P2P點對點協定."
+
+msgid "Portrange"
+msgstr "範圍埠"
+
+msgid "Whitelisted IPs"
+msgstr "白名單列表IP"
+
+msgid "seconds"
+msgstr "秒數"
diff --git a/trunk/package/luci/po/zh_TW/p910nd.po b/trunk/package/luci/po/zh_TW/p910nd.po
new file mode 100644
index 00000000..7d6c0804
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/p910nd.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-18 20:03+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Bidirectional mode"
+msgstr "雙向模式"
+
+msgid "Device"
+msgstr "設備"
+
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
+msgstr ""
+"首先你必須安裝軟體包以便獲得USB (kmod-usb-printer)或串列埠(kmod-lp)的支援."
+
+msgid "Interface"
+msgstr ""
+
+msgid "Port"
+msgstr "埠"
+
+msgid "Settings"
+msgstr "設定值"
+
+msgid "Specifies the interface to listen on."
+msgstr ""
+
+msgid "TCP listener port."
+msgstr "聆聽TCP埠"
+
+msgid "enable"
+msgstr "啟用"
+
+msgid "p910nd - Printer server"
+msgstr "p910nd - 印表機伺服器"
diff --git a/trunk/package/luci/po/zh_TW/pbx-voicemail.po b/trunk/package/luci/po/zh_TW/pbx-voicemail.po
new file mode 100644
index 00000000..14de6298
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/pbx-voicemail.po
@@ -0,0 +1,98 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 18:41+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Email Addresses that Receive Voicemail"
+msgstr "接收語音郵件的信箱位址"
+
+msgid "Enable Voicemail"
+msgstr "啟用語音郵件功能"
+
+msgid "Global Voicemail Setup"
+msgstr "語音郵件通用設定"
+
+msgid ""
+"Here you can configure a global voicemail for this PBX. Since this system is "
+"intended to run on embedded systems like routers, there is no local storage "
+"of voicemail - it must be sent out by email. Therefore you need to configure "
+"an outgoing mail (SMTP) server (for example your ISP's, Google's, or Yahoo's "
+"SMTP server), and provide a list of addresses that receive recorded "
+"voicemail."
+msgstr ""
+"在這裡可以幫PBX總機設定通用語音郵件. 因為這個系統想要像路由器一般跑在嵌入式系統, 這裡並無本地語言郵件的儲存空間 - 它必須由郵件來傳送. "
+"因此你需要設定一個(SMTP)外寄郵件伺服器(例如你的ISP, Google, 或者Yahoo外寄郵件伺服器), "
+"並且提供一個位址清單可以接收錄音檔的語音郵件."
+
+msgid ""
+"In order for this PBX to send emails containing voicemail recordings, you "
+"need to set up an SMTP server here. Your ISP usually provides an SMTP server "
+"for that purpose. You can also set up a third party SMTP server such as the "
+"one provided by Google or Yahoo."
+msgstr ""
+"為了幫PBX總機傳送附帶語音郵件錄音檔, 你必須設定一個(SMTP)外寄郵件伺服器.通常你的ISP會提供一個SMTP外寄郵件伺服器讓客戶寄信,.你也可以"
+"設定第三方SMTP外寄郵件伺服器類似Google或Yahoo提供的也行."
+
+msgid "Last Sent Voicemail Log"
+msgstr "上一次傳送語音郵件的記錄"
+
+msgid "Local Storage Directory"
+msgstr "本地端儲存目錄"
+
+msgid "No"
+msgstr "No"
+
+msgid "Outgoing mail (SMTP) Server"
+msgstr "外寄郵件(SMTP)伺服器"
+
+msgid "SMTP Password"
+msgstr "外寄郵件(SMTP)伺服器傳送密碼"
+
+msgid "SMTP Port Number"
+msgstr "外寄郵件(SMTP)伺服器服務埠號"
+
+msgid "SMTP Server Authentication"
+msgstr "外寄郵件(SMTP)伺服器驗證"
+
+msgid "SMTP Server Hostname or IP Address"
+msgstr "外寄郵件(SMTP)伺服器主機名稱或者IP位址"
+
+msgid "SMTP User Name"
+msgstr "外寄郵件(SMTP)伺服器登入使用者名稱"
+
+msgid "Secure Connection Using TLS"
+msgstr "採用TLS加密協議安全連線"
+
+msgid "Voicemail Setup"
+msgstr "設定語音郵件"
+
+msgid ""
+"When you enable voicemail, you will have the opportunity to specify email "
+"addresses that receive recorded voicemail. You must also set up an SMTP "
+"server below."
+msgstr "當你啟用語音郵件功能, 擬將有機會指定特定可接收錄音檔的語音郵件的郵件位址. 你也必須在下面設定外寄郵件(SMTP)伺服器."
+
+msgid "Yes"
+msgstr "Yes"
+
+msgid ""
+"You can also retain copies of voicemail messages on the device running your "
+"PBX. The path specified here will be created if it doesn't exist. Beware of "
+"limited space on embedded devices like routers, and enable this option only "
+"if you know what you are doing."
+msgstr ""
+"你也可以保留語音郵件訊息的複本在PBX總機的設備上. 這裡所指定的路徑如果它不存在時將會被建立. 為預防像路由器的嵌入式設備有限的空間限制, "
+"如果你確定這個用途請啟用這個選項."
+
+msgid ""
+"Your real SMTP password is not shown for your protection. It will be changed "
+"only when you change the value in this box."
+msgstr "為了保護你的SMTP密碼將不會顯示. 只有當你改變盒子中的值時它將會被變更"
diff --git a/trunk/package/luci/po/zh_TW/pbx.po b/trunk/package/luci/po/zh_TW/pbx.po
new file mode 100644
index 00000000..aa05be77
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/pbx.po
@@ -0,0 +1,507 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-16 13:59+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+msgid "Available"
+msgstr "可運用"
+
+msgid ""
+"Avoid using anything but alpha-numeric characters, space, comma, and period."
+msgstr "除了字母數字字符，空格，逗號和句號其它一概不用."
+
+msgid "Away"
+msgstr "離線"
+
+msgid "Blacklisted Numbers"
+msgstr "列入黑名單號碼"
+
+msgid "Call Routing"
+msgstr "路由呼叫"
+
+msgid "Call-back Numbers"
+msgstr ""
+
+msgid "Call-back Provider"
+msgstr ""
+
+msgid "Call-through Numbers"
+msgstr "通話接通號碼"
+
+msgid "Copy-paste large lists of numbers here."
+msgstr "號碼大型清單複製貼上此地"
+
+msgid ""
+"Designate numbers that are allowed to call through this system and which "
+"user's privileges they will have."
+msgstr ""
+
+msgid ""
+"Designate numbers to whom the system will hang up and call back, which "
+"provider will be used to call them, and which user's privileges will be "
+"granted to them."
+msgstr ""
+
+msgid "Dials numbers unmatched elsewhere"
+msgstr "撥號它處號碼不符"
+
+msgid "Do Not Disturb"
+msgstr "勿擾中"
+
+msgid "Domain/IP Address/Dynamic Domain"
+msgstr "網域/IP位址/動態網域"
+
+msgid "Dynamic List of Blacklisted Numbers"
+msgstr "黑名單動態列表"
+
+msgid "Email"
+msgstr "郵件信箱"
+
+msgid "Enable Incoming Calls (Register via SIP)"
+msgstr "啟用來話呼叫(透過SIP註冊)"
+
+msgid "Enable Incoming Calls (set Status below)"
+msgstr "啟用來話呼叫(在下面設定狀態)"
+
+msgid "Enable Outgoing Calls"
+msgstr "啟用外撥"
+
+msgid "Enabled"
+msgstr "已啟用"
+
+msgid ""
+"Enter a VoIP provider to use for call-back in the format username@some.host."
+"name, as listed in \"Outgoing Calls\" above. It's easiest to copy and paste "
+"the providers from above. Invalid entries, including providers not enabled "
+"for outgoing calls, will be rejected silently."
+msgstr ""
+
+msgid ""
+"Enter phone numbers that you want to decline calls from automatically. You "
+"should probably omit the country code and any leading zeroes, but please "
+"experiment to make sure you are blocking numbers from your desired area "
+"successfully."
+msgstr ""
+"打入你允許自動通話的號碼. 你或許可以忽略國碼和0字開頭, 但僅供實驗以確保期望區"
+"的號碼被阻斷成功."
+
+msgid ""
+"Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices "
+"you will use ONLY locally and never from a remote location."
+msgstr ""
+"要設定SIP設備在Server/Registrar內打入IP(或IP:埠號)你僅能本地端使用絕不要打入"
+"遠端位置"
+
+msgid ""
+"Enter this hostname (or hostname:port) in the Server/Registrar setting of "
+"SIP devices you will use from a remote location (they will work locally too)."
+msgstr ""
+"要設定SIP設備從遠端使用(在本地端也一樣能執行),在Server/Registrar內打入主機名"
+"稱(或主機名稱:埠號)"
+
+msgid "External SIP Port"
+msgstr "外部SIP埠號"
+
+msgid ""
+"For each provider enabled for incoming calls, here you can restrict which "
+"users to ring on incoming calls. If the list is empty, the system will "
+"indicate that all users enabled for incoming calls will ring. Invalid "
+"usernames will be rejected silently. Also, entering a username here "
+"overrides the user's setting to not receive incoming calls. This way, you "
+"can make certain users ring only for specific providers. Entries can be made "
+"in a space-separated list, and/or one per line by hitting enter after every "
+"one."
+msgstr ""
+
+msgid ""
+"For each user enabled for outgoing calls you can restrict what providers the "
+"user can use for outgoing calls. By default all users can use all providers. "
+"To show up in the list below the user should be allowed to make outgoing "
+"calls in the \"User Accounts\" page. Enter VoIP providers in the format "
+"username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest "
+"to copy and paste the providers from above. Invalid entries, including "
+"providers not enabled for outgoing calls, will be rejected silently. Entries "
+"can be made in a space-separated list, and/or one per line by hitting enter "
+"after every one."
+msgstr ""
+
+msgid "Full Name"
+msgstr "全名"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "Google Accounts"
+msgstr "Google帳戶"
+
+msgid "Google Talk Status"
+msgstr "Google Talk狀態"
+
+msgid "Google Talk Status Message"
+msgstr "Google Talk訊息狀態"
+
+msgid "Google Voice/Talk Accounts"
+msgstr "Google 語音/簡訊帳戶"
+
+msgid "Hang-up Delay"
+msgstr ""
+
+msgid ""
+"Here you must configure at least one SIP account, that you will use to "
+"register with this service. Use this account either in an Analog Telephony "
+"Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid "
+"on your smartphone, or Ekiga, Linphone, or X-Lite on your computer. By "
+"default, all SIP accounts will ring simultaneously if a call is made to one "
+"of your VoIP provider accounts or GV numbers."
+msgstr ""
+
+msgid ""
+"How long to wait before hanging up. If the provider you use to dial "
+"automatically forwards to voicemail, you can set this value to a delay that "
+"will allow you to hang up before your call gets forwarded and you get billed "
+"for it."
+msgstr ""
+
+msgid ""
+"If setting Server/Registrar to %s or %s does not work for you, try setting "
+"it to %s or %s and entering this port number in a separate field that "
+"specifies the Server/Registrar port number. Beware that some devices have a "
+"confusing setting that sets the port where SIP requests originate from on "
+"the SIP device itself (the bind port). The port specified on this page is "
+"NOT this bind port but the port this service listens on."
+msgstr ""
+
+msgid ""
+"If you experience jittery or high latency audio during heavy downloads, you "
+"may want to enable QoS. QoS prioritizes traffic to and from your network for "
+"specified ports and IP addresses, resulting in better latency and throughput "
+"for sound in our case. If enabled below, a QoS rule for this service will be "
+"configured by the PBX automatically, but you must visit the QoS "
+"configuration page (Network->QoS) to configure other critical QoS settings "
+"like Download and Upload speed."
+msgstr ""
+
+msgid ""
+"If you have more than one account that can make outgoing calls, you should "
+"enter a list of phone numbers and/or prefixes in the following fields for "
+"each provider listed. Invalid prefixes are removed silently, and only 0-9, "
+"X, Z, N, #, *, and + are valid characters. The letter X matches 0-9, Z "
+"matches 1-9, and N matches 2-9. For example to make calls to Germany through "
+"a provider, you can enter 49. To make calls to North America, you can enter "
+"1NXXNXXXXXX. If one of your providers can make \"local\" calls to an area "
+"code like New York's 646, you can enter 646NXXXXXX for that provider. You "
+"should leave one account with an empty list to make calls with it by "
+"default, if no other provider's prefixes match. The system will "
+"automatically replace an empty list with a message that the provider dials "
+"all numbers not matched by another provider's prefixes. Be as specific as "
+"possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international "
+"dial codes are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a "
+"space-separated list, and/or one per line by hitting enter after every one."
+msgstr ""
+
+msgid "Incoming Calls"
+msgstr "來電呼叫"
+
+msgid "Insert QoS Rules"
+msgstr "插入QoS規則"
+
+msgid "Makes Outgoing Calls"
+msgstr "開啟外撥"
+
+msgid "NOTE: There are no Google or SIP provider accounts configured."
+msgstr "注意:尚缺Google或者SIP提供者帳戶被設置"
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for incoming "
+"calls."
+msgstr "注意:尚缺Google或者SIP供應商帳戶被啟用才能接收來電呼叫"
+
+msgid ""
+"NOTE: There are no Google or SIP provider accounts enabled for outgoing "
+"calls."
+msgstr "注意:尚缺Google或者SIP供應商帳戶被啟用才能外撥."
+
+msgid "NOTE: There are no local user accounts configured."
+msgstr "注意:尚未設置本地端帳戶"
+
+msgid "NOTE: There are no local user accounts enabled for outgoing calls."
+msgstr "注意:啟用本地端帳戶才能外撥"
+
+msgid "No"
+msgstr "不"
+
+msgid "Number of Seconds to Ring"
+msgstr "響鈴秒數"
+
+msgid "Outbound Proxy"
+msgstr "外連代理"
+
+msgid "Outgoing Calls"
+msgstr "去電外撥"
+
+msgid "PBX Main Page"
+msgstr "PBX總機主頁"
+
+msgid "PBX Service Status"
+msgstr "PBX服務狀態"
+
+msgid "PIN"
+msgstr "PIN碼"
+
+msgid "Password"
+msgstr "密碼"
+
+msgid ""
+"Pick a random port number between 6500 and 9500 for the service to listen "
+"on. Do not pick the standard 5060, because it is often subject to brute-"
+"force attacks. When finished, (1) click \"Save and Apply\", and (2) look in "
+"the \"SIP Device/Softphone Accounts\" section for updated Server and Port "
+"settings for your SIP Devices/Softphones."
+msgstr ""
+
+msgid "Port Setting for SIP Devices"
+msgstr "SIP設備的埠號設置"
+
+msgid "Providers Used for Outgoing Calls"
+msgstr "已採用的外撥供應商"
+
+msgid "QoS Settings"
+msgstr "QoS語音品質設置"
+
+msgid "RTP Port Range End"
+msgstr "RTP協定埠域結束"
+
+msgid "RTP Port Range Start"
+msgstr "RTP協定埠域啟始"
+
+msgid ""
+"RTP traffic carries actual voice packets. This is the start of the port "
+"range that will be used for setting up RTP communication. It's usually OK to "
+"leave this at the default value."
+msgstr ""
+
+msgid "Receives Incoming Calls"
+msgstr "接受來電呼叫"
+
+msgid "Remote Usage"
+msgstr "遠端啟用"
+
+msgid "Rings users enabled for incoming calls"
+msgstr "來電呼叫時震鈴通知使用者"
+
+msgid "SIP Accounts"
+msgstr "SIP帳戶"
+
+msgid "SIP Device/Softphone Accounts"
+msgstr "SIP設備/軟體式手機帳戶"
+
+msgid "SIP Provider Accounts"
+msgstr "SIP供應商帳戶"
+
+msgid "SIP Realm (needed by some providers)"
+msgstr "SIP領域(某些供應商需用到)"
+
+msgid "SIP Server/Registrar"
+msgstr "SIP伺服器/登記處"
+
+msgid "SIP Server/Registrar Port"
+msgstr "SIP伺服器/登記埠"
+
+msgid "Server Setting"
+msgstr "伺服器設置"
+
+msgid "Server Setting for Local SIP Devices"
+msgstr "本地SIP設備的伺服器設置"
+
+msgid "Server Setting for Remote SIP Devices"
+msgstr "遠端SIP設備的伺服器設置"
+
+msgid "Service Status"
+msgstr "服務狀態"
+
+msgid ""
+"Set the number of seconds to ring users upon incoming calls before hanging "
+"up or going to voicemail, if the voicemail is installed and enabled."
+msgstr ""
+
+msgid "Space-Separated List of Blacklisted Numbers"
+msgstr "以空格分隔的黑名單號碼列表"
+
+msgid "Specify numbers individually here. Press enter to add more numbers."
+msgstr "在此指定獨立號碼. 按enter 可新增更多號碼"
+
+msgid ""
+"Specify numbers individually here. Press enter to add more numbers. You will "
+"have to experiment with what country and area codes you need to add to the "
+"number."
+msgstr ""
+
+msgid ""
+"The number(s) specified above will be able to dial out with this user's "
+"providers. Invalid usernames, including users not enabled for outgoing "
+"calls, are dropped silently. Please verify that the entry was accepted."
+msgstr ""
+
+msgid ""
+"This configuration page allows you to configure a phone system (PBX) service "
+"which permits making phone calls through multiple Google and SIP (like "
+"Sipgate, SipSorcery, and Betamax) accounts and sharing them among many SIP "
+"devices. Note that Google accounts, SIP accounts, and local user accounts "
+"are configured in the \"Google Accounts\", \"SIP Accounts\", and \"User "
+"Accounts\" sub-sections. You must add at least one User Account to this PBX, "
+"and then configure a SIP device or softphone to use the account, in order to "
+"make and receive calls with your Google/SIP accounts. Configuring multiple "
+"users will allow you to make free calls between all users, and share the "
+"configured Google and SIP accounts. If you have more than one Google and SIP "
+"accounts set up, you should probably configure how calls to and from them "
+"are routed in the \"Call Routing\" page. If you're interested in using your "
+"own PBX from anywhere in the world, then visit the \"Remote Usage\" section "
+"in the \"Advanced Settings\" page."
+msgstr ""
+
+msgid ""
+"This is the name that the VoIP server will use to identify itself when "
+"registering to VoIP (SIP) providers. Some providers require this to a "
+"specific string matching a hardware SIP device."
+msgstr ""
+
+msgid ""
+"This is where you indicate which Google/SIP accounts are used to call what "
+"country/area codes, which users can use what SIP/Google accounts, how "
+"incoming calls are routed, what numbers can get into this PBX with a "
+"password, and what numbers are blacklisted."
+msgstr ""
+
+msgid ""
+"This is where you set up your Google (Talk and Voice) Accounts, in order to "
+"start using them for dialing and receiving calls (voice chat and real phone "
+"calls). Please make at least one voice call using the Google Talk plugin "
+"installable through the GMail interface, and then log out from your account "
+"everywhere. Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This is where you set up your SIP (VoIP) accounts ts like Sipgate, "
+"SipSorcery, the popular Betamax providers, and any other providers with SIP "
+"settings in order to start using them for dialing and receiving calls (SIP "
+"uri and real phone calls). Click \"Add\" to add as many accounts as you wish."
+msgstr ""
+
+msgid ""
+"This option should be set to \"Yes\" if you have a DID (real telephone "
+"number) associated with this SIP account or want to receive SIP uri calls "
+"through this provider."
+msgstr ""
+
+msgid ""
+"This section contains settings that do not need to be changed under normal "
+"circumstances. In addition, here you can configure your system for use with "
+"remote SIP devices, and resolve call quality issues by enabling the "
+"insertion of QoS rules."
+msgstr ""
+
+msgid ""
+"Use (four to five digit) numeric user name if you are connecting normal "
+"telephones with ATAs to this system (so they can dial user names)."
+msgstr ""
+
+msgid ""
+"Use this account to make outgoing calls as configured in the \"Call Routing"
+"\" section."
+msgstr ""
+
+msgid "Use this account to make outgoing calls."
+msgstr "使用這個帳號外撥."
+
+msgid "User Accounts"
+msgstr "使用者帳號"
+
+msgid "User Agent String"
+msgstr "用戶代理字串"
+
+msgid "User Name"
+msgstr "用戶名稱"
+
+msgid "Uses providers enabled for outgoing calls"
+msgstr "採用供應商啟用以便外撥"
+
+msgid ""
+"When somebody starts voice chat with your GTalk account or calls the GVoice, "
+"number (if you have Google Voice), the call will be forwarded to any users "
+"that are online (registered using a SIP device or softphone) and permitted "
+"to receive the call. If you have Google Voice, you must go to your GVoice "
+"settings and forward calls to Google chat in order to actually receive calls "
+"made to your GVoice number. If you have trouble receiving calls from GVoice, "
+"experiment with the Call Screening option in your GVoice Settings. Finally, "
+"make sure no other client is online with this account (browser in gmail, "
+"mobile/desktop Google Talk App) as it may interfere."
+msgstr ""
+
+msgid ""
+"When your password is saved, it disappears from this field and is not "
+"displayed for your protection. The previously saved password will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+
+msgid "Yes"
+msgstr "是"
+
+msgid ""
+"You can enter your domain name, external IP address, or dynamic domain name "
+"here. The best thing to input is a static IP address. If your IP address is "
+"dynamic and it changes, your configuration will become invalid. Hence, it's "
+"recommended to set up Dynamic DNS in this case. and enter your Dynamic DNS "
+"hostname here. You can configure Dynamic DNS with the luci-app-ddns package."
+msgstr ""
+
+msgid "You can specify a real name to show up in the Caller ID here."
+msgstr "你可以在此指定一個真實名稱以便顯示在來電ID"
+
+msgid ""
+"You can use your SIP devices/softphones with this system from a remote "
+"location as well, as long as your Internet Service Provider gives you a "
+"public IP. You will be able to call other local users for free (e.g. other "
+"Analog Telephone Adapters (ATAs)) and use your VoIP providers to make calls "
+"as if you were local to the PBX. After configuring this tab, go back to "
+"where users are configured and see the new Server and Port setting you need "
+"to configure the remote SIP devices with. Please note that if this PBX is "
+"not running on your router/gateway, you will need to configure port "
+"forwarding (NAT) on your router/gateway. Please forward the ports below (SIP "
+"port and RTP range) to the IP address of the device running this PBX."
+msgstr ""
+"不管多遠,只要能取得ISP提供的公眾合法IP,依然可以使用這個系統的SIP設備/PC電話表"
+"現一樣的好.你將能夠免費呼叫其他本地端用戶(e.g 其它類比電話機(ATAs)和使用你的"
+"VoIP供應商講電話就像你在使用本地的PBX總機電話一樣.在設定這個標籤後, 需回到用"
+"戶設定並且查看新的伺服器和埠設定以便能設定遠端SIP設備.請注意假如PBX總機若不在"
+"你的路由器/GW上執行,你將必須在你的路由器/GW上設定埠轉發(NAT).在PBX主機上請轉"
+"發下列(SIP埠+RTP所採用的範圍埠)埠號址定到跑PBX服務設備上的IP位址."
+
+msgid ""
+"Your PIN disappears when saved for your protection. It will be changed only "
+"when you enter a value different from the saved one. Leaving the PIN empty "
+"is possible, but please beware of the security implications."
+msgstr ""
+"當存檔時為保護起見你的PIN碼將不會顯示. 除非你打入不同於原始存檔的值它才會變"
+"更. 也可以把PIN碼保留空白, 但要提防會有安全的隱憂."
+
+msgid ""
+"Your password disappears when saved for your protection. It will be changed "
+"only when you enter a value different from the saved one."
+msgstr ""
+"當存檔時為保護起見你的密碼將不會顯示. 除非你打入不同於原始存檔的值它才會變更."
+
+#~ msgid ""
+#~ "Designate numbers that are allowed to call through this system and which "
+#~ "user's privileges it will have."
+#~ msgstr "依據系統和戶用的權限允許通話的指定號碼"
diff --git a/trunk/package/luci/po/zh_TW/polipo.po b/trunk/package/luci/po/zh_TW/polipo.po
new file mode 100644
index 00000000..5058897b
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/polipo.po
@@ -0,0 +1,205 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-21 13:13+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+msgid "Allowed clients"
+msgstr "允許的客戶端"
+
+msgid "Always use system DNS resolver"
+msgstr "總是採用系統使用的DNS解析"
+
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
+msgstr "基本的HTTP驗證支援. 提供使用者名稱和密碼以username:password格式"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "DNS and Query Settings"
+msgstr "DNS及查詢設定值"
+
+msgid "DNS server address"
+msgstr "DNS伺服器位址"
+
+msgid "Delete cache files time"
+msgstr "刪除快取檔的時間"
+
+msgid "Disk cache location"
+msgstr "磁碟快取放置的位置"
+
+msgid "Do not query IPv6"
+msgstr "不使用IPv6查詢"
+
+msgid "Enable if cache (proxy) is shared by multiple users."
+msgstr "假若快取(Proxy)被多個使用者分享使用就啓用"
+
+msgid "First PMM segment size (in bytes)"
+msgstr "第一個PMM段的大小(以bytes方式表示)"
+
+msgid "General Settings"
+msgstr "基本設定"
+
+msgid "How much RAM should Polipo use for its cache."
+msgstr "Polipo拿來當快取的記憶體量是多大?"
+
+msgid "In RAM cache size (in bytes)"
+msgstr "記憶體快取大小(以bytes方式表示)"
+
+msgid "Listen address"
+msgstr "聆聽位址"
+
+msgid "Listen port"
+msgstr "聆聽埠號"
+
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
+msgstr "Polipo位置將永久快取文件。建議使用外部的存儲設備，因為快取會顯著增長。保留空白以便關閉磁碟快取."
+
+msgid "Log file location"
+msgstr "紀錄檔位置"
+
+msgid "Log to syslog"
+msgstr "記錄到系統記錄syslog中"
+
+msgid "Logging and RAM"
+msgstr "記錄和記憶體"
+
+msgid "Never use system DNS resolver"
+msgstr "從不使用系統DNS解析"
+
+msgid "On-Disk Cache"
+msgstr "磁碟上的快取"
+
+msgid "PMM segments size (in bytes)"
+msgstr "PMM段大小(以bytes表示)"
+
+msgid "Parent Proxy"
+msgstr "上層Proxy"
+
+msgid "Parent proxy address"
+msgstr "上層Proxy位址"
+
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
+msgstr "Polipo應該重導這個要求所到的上層Proxy(以 主機:埠號 格式表示)."
+
+msgid "Parent proxy authentication"
+msgstr "上層Proxy位址驗證"
+
+msgid "Polipo"
+msgstr "Polipo本地代理伺服器"
+
+msgid "Polipo Status"
+msgstr "Polipo狀況"
+
+msgid "Polipo is a small and fast caching web proxy."
+msgstr "Polipo是一個小型且快速的快取網頁代理"
+
+msgid "Poor Man's Multiplexing"
+msgstr "窮人的多工器Poor Man's Multiplexing"
+
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
+msgstr ""
+
+msgid "Port on which Polipo will listen"
+msgstr " Polipo聆聽的埠號"
+
+msgid "Proxy"
+msgstr "代理伺服器"
+
+msgid "Query DNS by hostname"
+msgstr "以主機名稱查詢DNS"
+
+msgid "Query DNS directly, fallback to system resolver"
+msgstr "直接查詢DNS, 回傳給系統解析"
+
+msgid "Query DNS directly, for unknown hosts fall back to system resolver"
+msgstr "直接查詢DNS, 對莫名的主機回傳給系統解析"
+
+msgid "Query DNS for IPv6"
+msgstr "幫IPv6查詢DNS"
+
+msgid "Query IPv4 and IPv6, prefer IPv4"
+msgstr "查詢IPv4和IPv6,IPv4優先"
+
+msgid "Query IPv4 and IPv6, prefer IPv6"
+msgstr "查詢IPv4和IPv6 ,IPv6優先"
+
+msgid "Query only IPv6"
+msgstr "只查詢IPv6"
+
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
+msgstr "設定DNS伺服器位址以便使用, 假如你要Polipo代理人使用不同的DNS伺服器而非主機系統."
+
+msgid "Shared cache"
+msgstr "分享的快取"
+
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
+msgstr "第一個PMM區段的大小, 假若沒定義 ,預設兩次PMM區段的大小."
+
+msgid "Size to which cached files should be truncated"
+msgstr "快取檔被截斷的大小"
+
+msgid "Status"
+msgstr "狀態"
+
+msgid "Syslog facility"
+msgstr "日誌設施"
+
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
+msgstr "Polipo將會聆聽的介面. 要聆聽所有介面使用0.0.0.0 或 :: (IPv6)."
+
+msgid "Time after which cached files will be deleted"
+msgstr "快取將會被刪除的留存時間"
+
+msgid "Time after which cached files will be truncated"
+msgstr "快取將會被斷頭的留存時間"
+
+msgid "To enable PMM, PMM segment size must be set to some positive value."
+msgstr "要啟用PMM, PMM區段大小必須設定些積極的數值."
+
+msgid "Truncate cache files size (in bytes)"
+msgstr ""
+
+msgid "Truncate cache files time"
+msgstr ""
+
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
+msgstr ""
+
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))"
+msgstr ""
+
+msgid "enable"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/qos.po b/trunk/package/luci/po/zh_TW/qos.po
new file mode 100644
index 00000000..5cc338bb
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/qos.po
@@ -0,0 +1,106 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-21 10:36+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Calculate overhead"
+msgstr "流量計算"
+
+msgid "Classification Rules"
+msgstr "分類規則"
+
+msgid "Classification group"
+msgstr "分組"
+
+msgid "Comment"
+msgstr ""
+
+msgid "Destination host"
+msgstr "目的主機"
+
+msgid "Download speed (kbit/s)"
+msgstr "下載速度(kbit/s)"
+
+msgid "Enable"
+msgstr "啓用"
+
+msgid "Half-duplex"
+msgstr "半雙工"
+
+msgid "Interfaces"
+msgstr "界面"
+
+msgid "Number of bytes"
+msgstr "位元數"
+
+msgid "Ports"
+msgstr "埠號"
+
+msgid "Protocol"
+msgstr "協定"
+
+msgid "QoS"
+msgstr "先進先出頻寬管理"
+
+msgid "Quality of Service"
+msgstr "連線品質服務"
+
+msgid "Service"
+msgstr "服務"
+
+msgid "Source host"
+msgstr "來源主機"
+
+msgid "Target"
+msgstr "目的地"
+
+msgid "Upload speed (kbit/s)"
+msgstr "上傳速度(kbit/s)"
+
+msgid ""
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+"有了 <abbr title=\"Quality of Service\">QoS</abbr> 你可以用位址、埠號或者服務"
+"來排優先權."
+
+msgid "all"
+msgstr "通用優先權"
+
+msgid "default"
+msgstr "預設值"
+
+msgid "express"
+msgstr "高優先權"
+
+msgid "low"
+msgstr "低優先權"
+
+msgid "normal"
+msgstr "一般優先權"
+
+msgid "priority"
+msgstr "優先權"
+
+#~ msgid "Downlink"
+#~ msgstr "下載"
+
+#~ msgid "Internet Connection"
+#~ msgstr "網際網路連線"
+
+#~ msgid "Uplink"
+#~ msgstr "上傳"
+
+#~ msgid "allf"
+#~ msgstr "獨一無二"
+
+#~ msgid "qos_connbytes"
+#~ msgstr "QoS連線位元數"
diff --git a/trunk/package/luci/po/zh_TW/radvd.po b/trunk/package/luci/po/zh_TW/radvd.po
new file mode 100644
index 00000000..aed76c52
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/radvd.po
@@ -0,0 +1,366 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "6to4 interface"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Addresses"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Advertise Home Agent flag"
+msgstr ""
+
+msgid "Advertise router address"
+msgstr ""
+
+msgid "Advertised Domain Suffixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface "
+"is used"
+msgstr ""
+
+msgid "Advertised IPv6 prefixes"
+msgstr ""
+
+msgid ""
+"Advertised IPv6 prefixes. If empty, the current interface prefix is used"
+msgstr ""
+
+msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
+msgstr ""
+
+msgid "Advertises Mobile Router registration capability (NEMO Basic)"
+msgstr ""
+
+msgid ""
+"Advertises assumed reachability time in milliseconds of neighbours in the RA "
+"if specified. 0 disables reachability advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the default Hop Count value for outgoing unicast packets in the "
+"RA. 0 disables hopcount advertisements"
+msgstr ""
+
+msgid "Advertises the default router preference"
+msgstr ""
+
+msgid ""
+"Advertises the given link MTU in the RA if specified. 0 disables MTU "
+"advertisements"
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that addresses generated from the "
+"prefix via stateless address autoconfiguration remain preferred."
+msgstr ""
+
+msgid ""
+"Advertises the length of time in seconds that the prefix is valid for the "
+"purpose of on-link determination."
+msgstr ""
+
+msgid ""
+"Advertises the lifetime of the default router in seconds. 0 indicates that "
+"the node is no default router"
+msgstr ""
+
+msgid ""
+"Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
+"services"
+msgstr ""
+
+msgid ""
+"Advertises wait time in milliseconds between Neighbor Solicitation messages "
+"in the RA if specified. 0 disables retransmit advertisements"
+msgstr ""
+
+msgid "Advertising"
+msgstr ""
+
+msgid "Autonomous"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Configuration flag"
+msgstr ""
+
+msgid "Current hop limit"
+msgstr ""
+
+msgid "DNSSL"
+msgstr ""
+
+msgid "DNSSL Configuration"
+msgstr ""
+
+msgid "Default lifetime"
+msgstr ""
+
+msgid "Default preference"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable advertisements"
+msgstr ""
+
+msgid "Enables router advertisements and solicitations"
+msgstr ""
+
+msgid ""
+"Enables the additional stateful administered autoconfiguration protocol "
+"(RFC2462)"
+msgstr ""
+
+msgid ""
+"Enables the autoconfiguration of additional, non address information "
+"(RFC2462)"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Home Agent information"
+msgstr ""
+
+msgid "Home Agent lifetime"
+msgstr ""
+
+msgid "Home Agent preference"
+msgstr ""
+
+msgid "Include Home Agent Information in the RA"
+msgstr ""
+
+msgid "Include Mobile IPv6 Advertisement Interval option to RA"
+msgstr ""
+
+msgid "Includes the link-layer address of the outgoing interface in the RA"
+msgstr ""
+
+msgid ""
+"Indicates that the address of interface is sent instead of network prefix, "
+"as is required by Mobile IPv6"
+msgstr ""
+
+msgid ""
+"Indicates that the underlying link is not broadcast capable, prevents "
+"unsolicited advertisements from being sent"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for autonomous address configuration "
+"(RFC4862)"
+msgstr ""
+
+msgid ""
+"Indicates that this prefix can be used for on-link determination (RFC4861)"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "Interface Configuration"
+msgstr ""
+
+msgid "Interface required"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Lifetime"
+msgstr ""
+
+msgid "Link MTU"
+msgstr ""
+
+msgid "Managed flag"
+msgstr ""
+
+msgid "Max. interval"
+msgstr ""
+
+msgid "Maximum advertisement interval"
+msgstr ""
+
+msgid "Minimum advertisement delay"
+msgstr ""
+
+msgid "Minimum advertisement interval"
+msgstr ""
+
+msgid "Mobile IPv6"
+msgstr ""
+
+msgid "Mobile IPv6 interval option"
+msgstr ""
+
+msgid "Mobile IPv6 router registration"
+msgstr ""
+
+msgid "Multicast"
+msgstr ""
+
+msgid "On-link"
+msgstr ""
+
+msgid "On-link determination"
+msgstr ""
+
+msgid "Preference"
+msgstr ""
+
+msgid "Preferred lifetime"
+msgstr ""
+
+msgid "Prefix"
+msgstr ""
+
+msgid "Prefix Configuration"
+msgstr ""
+
+msgid "Prefixes"
+msgstr ""
+
+msgid "RDNSS"
+msgstr ""
+
+msgid "RDNSS Configuration"
+msgstr ""
+
+msgid "Radvd"
+msgstr ""
+
+msgid "Radvd - DNSSL"
+msgstr ""
+
+msgid "Radvd - Interface %q"
+msgstr ""
+
+msgid "Radvd - Prefix"
+msgstr ""
+
+msgid "Radvd - RDNSS"
+msgstr ""
+
+msgid "Radvd - Route"
+msgstr ""
+
+msgid ""
+"Radvd is a router advertisement daemon for IPv6. It listens to router "
+"solicitations and sends router advertisements as described in RFC 4861."
+msgstr ""
+
+msgid "Reachable time"
+msgstr ""
+
+msgid ""
+"Restrict communication to specified clients, leave empty to use multicast"
+msgstr ""
+
+msgid "Retransmit timer"
+msgstr ""
+
+msgid "Route Configuration"
+msgstr ""
+
+msgid "Routes"
+msgstr ""
+
+msgid "Source link-layer address"
+msgstr ""
+
+msgid ""
+"Specifies a logical interface name to derive a 6to4 prefix from. The "
+"interfaces public IPv4 address is combined with 2002::/3 and the value of "
+"the prefix option"
+msgstr ""
+
+msgid "Specifies the lifetime associated with the route in seconds."
+msgstr ""
+
+msgid "Specifies the logical interface name this section belongs to"
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the DNSSL entries are used for name "
+"resolution."
+msgstr ""
+
+msgid ""
+"Specifies the maximum duration how long the RDNSS entries are used for name "
+"resolution."
+msgstr ""
+
+msgid "Specifies the preference associated with the default router"
+msgstr ""
+
+msgid "Suffix"
+msgstr ""
+
+msgid ""
+"The maximum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending multicast router advertisements "
+"from the interface, in seconds"
+msgstr ""
+
+msgid ""
+"The minimum time allowed between sending unsolicited multicast router "
+"advertisements from the interface, in seconds"
+msgstr ""
+
+msgid "The preference for the Home Agent sending this RA"
+msgstr ""
+
+msgid "Timing"
+msgstr ""
+
+msgid "Unicast only"
+msgstr ""
+
+msgid "Valid lifetime"
+msgstr ""
+
+msgid "Validity time"
+msgstr ""
+
+msgid "default"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "yes"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/rrdtool.po b/trunk/package/luci/po/zh_TW/rrdtool.po
new file mode 100644
index 00000000..9245260b
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/rrdtool.po
@@ -0,0 +1,355 @@
+#  rrdtool.pot
+#  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=ASCII\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. %H: Wireless - Signal Noise Ratio
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
+msgid "stat_dg_title_wireless__signal_noise"
+msgstr ""
+
+#. dBm
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
+msgid "stat_dg_label_wireless__signal_noise"
+msgstr ""
+
+#. Noise Level
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
+msgid "stat_ds_signal_noise"
+msgstr ""
+
+#. Signal Strength
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
+msgid "stat_ds_signal_power"
+msgstr ""
+
+#. %H: Wireless - Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
+msgid "stat_dg_title_wireless__signal_quality"
+msgstr ""
+
+#. n
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
+msgid "stat_dg_label_wireless__signal_quality"
+msgstr ""
+
+#. Signal Quality
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
+msgid "stat_ds_signal_quality"
+msgstr ""
+
+#. %H: ICMP Roundtrip Times
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
+msgid "stat_dg_title_ping"
+msgstr ""
+
+#. ms
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr ""
+
+#. %H: Firewall - Processed Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr ""
+
+#. Chain \"%di\"
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
+msgid "stat_ds_ipt_packets"
+msgstr ""
+
+#. %H: Netlink - Transfer on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr ""
+
+#. Bytes (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
+msgid "stat_ds_if_octets"
+msgstr ""
+
+#. %H: Netlink - Packets on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr ""
+
+#. Processed (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
+msgid "stat_ds_if_packets"
+msgstr ""
+
+#. Dropped   (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
+msgid "stat_ds_if_dropped"
+msgstr ""
+
+#. Errors    (%ds)
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
+msgid "stat_ds_if_errors"
+msgstr ""
+
+#. %H: Netlink - Multicast on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr ""
+
+#. Packets
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
+msgid "stat_ds_if_multicast"
+msgstr ""
+
+#. %H: Netlink - Collisions on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
+msgid "stat_dg_title_netlink__if_collisions"
+msgstr ""
+
+#. Collisions/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
+msgid "stat_dg_label_netlink__if_collisions"
+msgstr ""
+
+#. Collisions
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
+msgid "stat_ds_if_collisions"
+msgstr ""
+
+#. %H: Netlink - Errors on %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
+msgid "stat_dg_title_netlink__if_tx_errors"
+msgstr ""
+
+#. Errors/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr ""
+
+#. %H: Processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
+msgid "stat_dg_title_processes"
+msgstr ""
+
+#. Processes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr ""
+
+#. %H: Process %pi - used cpu time
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
+msgid "stat_dg_title_processes__ps_cputime"
+msgstr ""
+
+#. Jiffies
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
+msgid "stat_dg_label_processes__ps_cputime"
+msgstr ""
+
+#. system
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
+msgid "stat_ds_ps_cputime__syst"
+msgstr ""
+
+#. user
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
+msgid "stat_ds_ps_cputime__user"
+msgstr ""
+
+#. %H: Process %pi - threads and processes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
+msgid "stat_dg_title_processes__ps_count"
+msgstr ""
+
+#. Count
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr ""
+
+#. %H: Process %pi - page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
+msgid "stat_dg_title_processes__ps_pagefaults"
+msgstr ""
+
+#. Pagefaults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
+msgid "stat_dg_label_processes__ps_pagefaults"
+msgstr ""
+
+#. page faults
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
+msgid "stat_ds_ps_pagefaults"
+msgstr ""
+
+#. %H: Process %pi - virtual memory size
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr ""
+
+#. virtual memory
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
+msgid "stat_ds_ps_rss"
+msgstr ""
+
+#. %H: Usage on Processor #%pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
+msgid "stat_dg_title_cpu"
+msgstr ""
+
+#. %
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr ""
+
+#. %H: Transfer on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr ""
+
+#. %H: Packets on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr ""
+
+#. %H: TCP-Connections to Port %pi
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
+msgid "stat_dg_title_tcpconns"
+msgstr ""
+
+#. Connections/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr ""
+
+#. %H: Disk Space Usage on %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr ""
+
+#. %H: Interrupts
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
+msgid "stat_dg_title_irq"
+msgstr ""
+
+#. Issues/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
+msgid "stat_dg_label_irq"
+msgstr ""
+
+#. IRQ %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
+msgid "stat_ds_irq"
+msgstr ""
+
+#. %H: System Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
+msgid "stat_dg_title_load"
+msgstr ""
+
+#. Load
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
+msgid "stat_dg_label_load"
+msgstr ""
+
+#. 1 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
+msgid "stat_ds_load__shortterm"
+msgstr ""
+
+#. 5 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
+msgid "stat_ds_load__midterm"
+msgstr ""
+
+#. 15 min
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
+msgid "stat_ds_load__longterm"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/samba.po b/trunk/package/luci/po/zh_TW/samba.po
new file mode 100644
index 00000000..6ec99ee2
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/samba.po
@@ -0,0 +1,76 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-07 15:43+0200\n"
+"Last-Translator: Ethan <ethan42411@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Allow guests"
+msgstr "允許匿名使用者"
+
+msgid "Allow system users to reach their home directories via network shares"
+msgstr "允許系統使用者透過網路分享家目錄"
+
+msgid "Allowed users"
+msgstr "允許使用者"
+
+msgid "Create mask"
+msgstr "建立權限"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Directory mask"
+msgstr "目錄權限"
+
+msgid "Edit Template"
+msgstr "編輯樣版"
+
+msgid "Edit the template that is used for generating the samba configuration."
+msgstr "編輯用來產生Samba設定的樣板"
+
+msgid "General Settings"
+msgstr "基本設定"
+
+msgid "Hostname"
+msgstr "主機名稱"
+
+msgid "Mask for new directories"
+msgstr "新目錄權限"
+
+msgid "Mask for new files"
+msgstr "新檔案權限"
+
+msgid "Name"
+msgstr "共用名稱"
+
+msgid "Network Shares"
+msgstr "網路分享"
+
+msgid "Path"
+msgstr "路徑"
+
+msgid "Read-only"
+msgstr "唯讀"
+
+msgid "Share home-directories"
+msgstr "分享家目錄"
+
+msgid "Shared Directories"
+msgstr "分享目錄"
+
+msgid ""
+"This is the content of the file '/etc/samba/smb.conf.template' from which "
+"your samba configuration will be generated. Values enclosed by pipe symbols "
+"('|') should not be changed. They get their values from the 'General "
+"Settings' tab."
+msgstr "建立Samba設定的 \"/etc/samba/smb.conf.template\" 檔案內容。被('|')包圍的值可以在基本設定中進行設定"
+
+msgid "Workgroup"
+msgstr "工作群組"
diff --git a/trunk/package/luci/po/zh_TW/splash.po b/trunk/package/luci/po/zh_TW/splash.po
new file mode 100644
index 00000000..1125abfe
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/splash.po
@@ -0,0 +1,302 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Accept"
+msgstr ""
+
+msgid ""
+"Access to the internet might be possible nevertheless, because some "
+"activists of this project share their private internet connections. These "
+"few connections are shared between all users. That means available bandwidth "
+"is limited and because of this we ask you not to do any of the following:"
+msgstr ""
+
+msgid ""
+"Access to the network is not guaranteed. It can be interrupted at any time "
+"without notice for any reason, for certain devices, and/or may be blocked "
+"for certain users."
+msgstr ""
+
+msgid "Active Clients"
+msgstr ""
+
+msgid "Allowed hosts/subnets"
+msgstr ""
+
+msgid ""
+"As an alternative to editing the complete splash text you can also just "
+"include some custom text in the default splash page by entering it here."
+msgstr ""
+
+msgid ""
+"Bandwidth limit for clients is only activated when both up- and download "
+"limit are set. Use a value of 0 here to completely disable this limitation. "
+"Whitelisted clients are not limited."
+msgstr ""
+
+msgid ""
+"Become an active member of this community and help by operating your own node"
+msgstr ""
+
+msgid "Blacklist"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid ""
+"By accepting these rules you can use this network for %s hour(s). After this "
+"time you need to accept these rules again."
+msgstr ""
+
+msgid "Clearance time"
+msgstr ""
+
+msgid "Client-Splash"
+msgstr ""
+
+msgid ""
+"Client-Splash is a hotspot authentification system for wireless mesh "
+"networks."
+msgstr ""
+
+msgid ""
+"Clients are redirected to this page after they have accepted the splash. If "
+"this is left empty they are redirected to the page they had requested."
+msgstr ""
+
+msgid "Clients download speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid ""
+"Clients that have accepted the splash are allowed to use the network for "
+"that many hours."
+msgstr ""
+
+msgid "Clients upload speed is limited to this value (kbyte/s)"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Decline"
+msgstr ""
+
+msgid ""
+"Destination hosts and networks that are excluded from splashing, i.e. they "
+"are always allowed."
+msgstr ""
+
+msgid "Donate some money to help us keep this project alive."
+msgstr ""
+
+msgid "Download limit"
+msgstr ""
+
+msgid "Edit the complete splash text"
+msgstr ""
+
+msgid "Fair Use Policy"
+msgstr ""
+
+msgid "Firewall zone"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Get in %s with the operator of this access point."
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid ""
+"If you operate your own wifi equipment use channels different from ours."
+msgstr ""
+
+msgid "If you use this network on a regular basis we ask for your support:"
+msgstr ""
+
+msgid "Include your own text in the default splash"
+msgstr ""
+
+msgid "Intercept client traffic on this Interface"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interfaces that are used for Splash."
+msgstr ""
+
+msgid ""
+"KB/s (Download/Upload). You may be able to remove this limit by actively "
+"contributing to this project."
+msgstr ""
+
+msgid "Legally Prohibited Activities"
+msgstr ""
+
+msgid "Legally Prohibited content"
+msgstr ""
+
+msgid "MAC Address"
+msgstr ""
+
+msgid "MAC addresses in this list are blocked."
+msgstr ""
+
+msgid ""
+"MAC addresses of whitelisted clients. These do not need to accept the splash "
+"and are not bandwidth limited."
+msgstr ""
+
+msgid "Netmask"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "No clients connected"
+msgstr ""
+
+msgid ""
+"Please note that we are not an internet service provider but an experimental "
+"community network."
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Redirect target"
+msgstr ""
+
+msgid "Safety"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Splash rules are integrated in this firewall zone"
+msgstr ""
+
+msgid "Splashtext"
+msgstr ""
+
+msgid ""
+"The network, like the Internet, is unencrypted and open. Each participant is "
+"responsible for the safety of their own connections and devices."
+msgstr ""
+
+msgid ""
+"The open and free wireless network of volunteers (\"Operators\") provides "
+"the necessary equipment and Internet connections (\"Infrastructure\") at "
+"their own expense."
+msgstr ""
+
+msgid ""
+"The operator claims no liability for loss of data, unauthorized access/"
+"damage to devices, or financial losses that participants may suffer from the "
+"use of the network."
+msgstr ""
+
+msgid ""
+"The participant agrees to not perform any action and refrain from acts which "
+"may violate the law or infringe upon the rights of third parties."
+msgstr ""
+
+msgid ""
+"The participant agrees to not transfer content over the network which "
+"violates the law."
+msgstr ""
+
+msgid ""
+"The participant agrees to not use the network in any way which will harm the "
+"infrastructure, the network itself, its operators or other participants."
+msgstr ""
+
+msgid ""
+"These Terms of Use govern the use of the network by its participants' "
+"computer, PDA, or similar device (\"Devices\") within the network."
+msgstr ""
+
+msgid "Time remaining"
+msgstr ""
+
+msgid ""
+"To ask for the reason why you have been blocked or ask for access again you "
+"can try to contact the owner of this access point:"
+msgstr ""
+
+msgid "Traffic in/out"
+msgstr ""
+
+msgid "Upload limit"
+msgstr ""
+
+msgid "Usage Agreement"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Whitelist"
+msgstr ""
+
+msgid "You are now connected to the free wireless mesh network"
+msgstr ""
+
+msgid ""
+"You can enter your own text that is displayed to clients here.<br />It is "
+"possible to use the following markers: ###COMMUNITY###, ###COMMUNITY_URL###, "
+"###CONTACTURL###, ###LEASETIME###, ###LIMIT### and ###ACCEPT###."
+msgstr ""
+
+msgid ""
+"Your access to this network has been blocked, most likely because you did "
+"something that our rules explicitly forbid."
+msgstr ""
+
+msgid "Your bandwidth is limited to"
+msgstr ""
+
+msgid "blacklisted"
+msgstr ""
+
+msgid "expired"
+msgstr ""
+
+msgid "optional when using host addresses"
+msgstr ""
+
+msgid "perform any kind of illegal activities"
+msgstr ""
+
+msgid "splashed"
+msgstr ""
+
+msgid "temporarily blocked"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "use filesharing applications on this network"
+msgstr ""
+
+msgid "waste bandwidth with unneccesary downloads or streams"
+msgstr ""
+
+msgid "whitelisted"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/statistics.po b/trunk/package/luci/po/zh_TW/statistics.po
new file mode 100644
index 00000000..7f4e7e47
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/statistics.po
@@ -0,0 +1,592 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Action (target)"
+msgstr ""
+
+msgid "Add command for reading values"
+msgstr ""
+
+msgid "Add matching rule"
+msgstr ""
+
+msgid "Add multiple hosts separated by space."
+msgstr ""
+
+msgid "Add notification command"
+msgstr ""
+
+msgid "Base Directory"
+msgstr ""
+
+msgid "Basic monitoring"
+msgstr ""
+
+msgid "CPU Plugin Configuration"
+msgstr ""
+
+msgid "CSV Output"
+msgstr ""
+
+msgid "CSV Plugin Configuration"
+msgstr ""
+
+msgid "Cache collected data for"
+msgstr ""
+
+msgid "Cache flush interval"
+msgstr ""
+
+msgid "Chain"
+msgstr ""
+
+msgid "CollectLinks"
+msgstr ""
+
+msgid "CollectRoutes"
+msgstr ""
+
+msgid "CollectTopology"
+msgstr ""
+
+msgid "Collectd"
+msgstr ""
+
+msgid "Collectd Settings"
+msgstr ""
+
+msgid ""
+"Collectd is a small daemon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
+msgstr ""
+
+msgid "Conntrack"
+msgstr ""
+
+msgid "Conntrack Plugin Configuration"
+msgstr ""
+
+msgid "DF Plugin Configuration"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS Plugin Configuration"
+msgstr ""
+
+msgid "Data collection interval"
+msgstr ""
+
+msgid "Datasets definition file"
+msgstr ""
+
+msgid "Destination ip range"
+msgstr ""
+
+msgid "Directory for collectd plugins"
+msgstr ""
+
+msgid "Directory for sub-configurations"
+msgstr ""
+
+msgid "Disk Plugin Configuration"
+msgstr ""
+
+msgid "Disk Space Usage"
+msgstr ""
+
+msgid "Disk Usage"
+msgstr ""
+
+msgid "Display Host »"
+msgstr ""
+
+msgid "Display timespan »"
+msgstr ""
+
+msgid "E-Mail Plugin Configuration"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Enable this plugin"
+msgstr ""
+
+msgid "Exec"
+msgstr ""
+
+msgid "Exec Plugin Configuration"
+msgstr ""
+
+msgid "Filter class monitoring"
+msgstr ""
+
+msgid "Firewall"
+msgstr ""
+
+msgid "Flush cache after"
+msgstr ""
+
+msgid "Forwarding between listen and server addresses"
+msgstr ""
+
+msgid "Graphs"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
+msgstr ""
+
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
+msgstr ""
+
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "IP or hostname where to get the txtinfo output from"
+msgstr ""
+
+msgid "IRQ Plugin Configuration"
+msgstr ""
+
+msgid "Ignore source addresses"
+msgstr ""
+
+msgid "Incoming interface"
+msgstr ""
+
+msgid "Interface Plugin Configuration"
+msgstr ""
+
+msgid "Interfaces"
+msgstr ""
+
+msgid "Interrupts"
+msgstr ""
+
+msgid "Interval for pings"
+msgstr ""
+
+msgid "Iptables Plugin Configuration"
+msgstr ""
+
+msgid "Leave unselected to automatically determine interfaces to monitor."
+msgstr ""
+
+msgid "Listen host"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Listener interfaces"
+msgstr ""
+
+msgid "Load Plugin Configuration"
+msgstr ""
+
+msgid "Maximum allowed connections"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
+msgid "Memory Plugin Configuration"
+msgstr ""
+
+msgid "Monitor all except specified"
+msgstr ""
+
+msgid "Monitor all local listen ports"
+msgstr ""
+
+msgid "Monitor devices"
+msgstr ""
+
+msgid "Monitor disks and partitions"
+msgstr ""
+
+msgid "Monitor filesystem types"
+msgstr ""
+
+msgid "Monitor hosts"
+msgstr ""
+
+msgid "Monitor interfaces"
+msgstr ""
+
+msgid "Monitor interrupts"
+msgstr ""
+
+msgid "Monitor local ports"
+msgstr ""
+
+msgid "Monitor mount points"
+msgstr ""
+
+msgid "Monitor processes"
+msgstr ""
+
+msgid "Monitor remote ports"
+msgstr ""
+
+msgid "Name of the rule"
+msgstr ""
+
+msgid "Netlink"
+msgstr ""
+
+msgid "Netlink Plugin Configuration"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Network Plugin Configuration"
+msgstr ""
+
+msgid "Network plugins"
+msgstr ""
+
+msgid "Network protocol"
+msgstr ""
+
+msgid "Number of threads for data collection"
+msgstr ""
+
+msgid "OLSRd"
+msgstr ""
+
+msgid "OLSRd Plugin Configuration"
+msgstr ""
+
+msgid "Only create average RRAs"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Outgoing interface"
+msgstr ""
+
+msgid "Output plugins"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping Plugin Configuration"
+msgstr ""
+
+msgid "Port"
+msgstr ""
+
+msgid "Processes"
+msgstr ""
+
+msgid "Processes Plugin Configuration"
+msgstr ""
+
+msgid "Processes to monitor separated by space"
+msgstr ""
+
+msgid "Processor"
+msgstr ""
+
+msgid "Qdisc monitoring"
+msgstr ""
+
+msgid "RRD XFiles Factor"
+msgstr ""
+
+msgid "RRD heart beat interval"
+msgstr ""
+
+msgid "RRD step interval"
+msgstr ""
+
+msgid "RRDTool"
+msgstr ""
+
+msgid "RRDTool Plugin Configuration"
+msgstr ""
+
+msgid "Rows per RRA"
+msgstr ""
+
+msgid "Script"
+msgstr ""
+
+msgid "Seconds"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Shaping class monitoring"
+msgstr ""
+
+msgid "Socket file"
+msgstr ""
+
+msgid "Socket group"
+msgstr ""
+
+msgid "Socket permissions"
+msgstr ""
+
+msgid "Source ip range"
+msgstr ""
+
+msgid "Specifies what information to collect about links."
+msgstr ""
+
+msgid "Specifies what information to collect about routes."
+msgstr ""
+
+msgid "Specifies what information to collect about the global topology."
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Storage directory"
+msgstr ""
+
+msgid "Storage directory for the csv files"
+msgstr ""
+
+msgid "Store data values as rates instead of absolute values"
+msgstr ""
+
+msgid "Stored timespans"
+msgstr ""
+
+msgid "System Load"
+msgstr ""
+
+msgid "System plugins"
+msgstr ""
+
+msgid "TCP Connections"
+msgstr ""
+
+msgid "TCPConns Plugin Configuration"
+msgstr ""
+
+msgid "TTL for network packets"
+msgstr ""
+
+msgid "TTL for ping packets"
+msgstr ""
+
+msgid "Table"
+msgstr ""
+
+msgid "The NUT plugin reads information about Uninterruptible Power Supplies."
+msgstr ""
+
+msgid ""
+"The OLSRd plugin reads information about meshed networks from the txtinfo "
+"plugin of OLSRd."
+msgstr ""
+
+msgid ""
+"The conntrack plugin collects statistics about the number of tracked "
+"connections."
+msgstr ""
+
+msgid "The cpu plugin collects basic statistics about the processor usage."
+msgstr ""
+
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
+msgstr ""
+
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
+msgstr ""
+
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
+msgstr ""
+
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
+msgstr ""
+
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
+msgstr ""
+
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
+msgstr ""
+
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
+msgstr ""
+
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
+msgstr ""
+
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
+msgstr ""
+
+msgid ""
+"The iwinfo plugin collects statistics about wireless signal strength, noise "
+"and quality."
+msgstr ""
+
+msgid "The load plugin collects statistics about the general system load."
+msgstr ""
+
+msgid "The memory plugin collects statistics about the memory usage."
+msgstr ""
+
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
+msgstr ""
+
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
+msgstr ""
+
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
+msgstr ""
+
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
+msgstr ""
+
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
+msgstr ""
+
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
+msgstr ""
+
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
+msgstr ""
+
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
+msgstr ""
+
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
+msgstr ""
+
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
+msgstr ""
+
+msgid "Try to lookup fully qualified hostname"
+msgstr ""
+
+msgid "UPS"
+msgstr ""
+
+msgid "UPS Plugin Configuration"
+msgstr ""
+
+msgid "UPS name in NUT ups@host format"
+msgstr ""
+
+msgid "UnixSock"
+msgstr ""
+
+msgid "Unixsock Plugin Configuration"
+msgstr ""
+
+msgid "Used PID file"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Verbose monitoring"
+msgstr ""
+
+msgid "Wireless"
+msgstr ""
+
+msgid "Wireless iwinfo Plugin Configuration"
+msgstr ""
+
+msgid "e.g. br-ff"
+msgstr ""
+
+msgid "e.g. br-lan"
+msgstr ""
+
+msgid "e.g. reject-with tcp-reset"
+msgstr ""
+
+msgid "max. 16 chars"
+msgstr ""
+
+msgid "reduces rrd size"
+msgstr ""
+
+msgid "seconds; multiple separated by space"
+msgstr ""
+
+msgid "server interfaces"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/tinyproxy.po b/trunk/package/luci/po/zh_TW/tinyproxy.po
new file mode 100644
index 00000000..849fcdef
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/tinyproxy.po
@@ -0,0 +1,254 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid ""
+"<em>Via proxy</em> routes requests to the given target via the specifed "
+"upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
+"target"
+msgstr ""
+
+msgid ""
+"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"requests"
+msgstr ""
+
+msgid "Allowed clients"
+msgstr ""
+
+msgid "Allowed connect ports"
+msgstr ""
+
+msgid "Bind address"
+msgstr ""
+
+msgid ""
+"By default, basic POSIX expressions are used for filtering. Enable this to "
+"activate extended regular expressions"
+msgstr ""
+
+msgid ""
+"By default, filter strings are treated as case-insensitive. Enable this to "
+"make the matching case-sensitive"
+msgstr ""
+
+msgid ""
+"By default, filtering is done based on domain names. Enable this to match "
+"against URLs instead"
+msgstr ""
+
+msgid ""
+"By default, the filter rules act as blacklist. Enable this option to only "
+"allow matched URLs or domain names"
+msgstr ""
+
+msgid ""
+"Can be either an IP address or range, a domain name or \".\" for any host "
+"without domain"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Connection timeout"
+msgstr ""
+
+msgid "Default deny"
+msgstr ""
+
+msgid "Enable Tinyproxy server"
+msgstr ""
+
+msgid "Error page"
+msgstr ""
+
+msgid "Failed to retrieve statistics from url:"
+msgstr ""
+
+msgid "Filter by RegExp"
+msgstr ""
+
+msgid "Filter by URLs"
+msgstr ""
+
+msgid "Filter case-sensitive"
+msgstr ""
+
+msgid "Filter file"
+msgstr ""
+
+msgid "Filtering and ACLs"
+msgstr ""
+
+msgid "General settings"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "HTML template file to serve for stat host requests"
+msgstr ""
+
+msgid "HTML template file to serve when HTTP errors occur"
+msgstr ""
+
+msgid "Header whitelist"
+msgstr ""
+
+msgid ""
+"List of IP addresses or ranges which are allowed to use the proxy server"
+msgstr ""
+
+msgid ""
+"List of allowed ports for the CONNECT method. A single value \"0\" allows "
+"all ports"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Log file"
+msgstr ""
+
+msgid "Log file to use for dumping messages"
+msgstr ""
+
+msgid "Log level"
+msgstr ""
+
+msgid "Logging verbosity of the Tinyproxy process"
+msgstr ""
+
+msgid "Max. clients"
+msgstr ""
+
+msgid "Max. requests per server"
+msgstr ""
+
+msgid "Max. spare servers"
+msgstr ""
+
+msgid "Maximum allowed number of concurrently connected clients"
+msgstr ""
+
+msgid ""
+"Maximum allowed number of requests per process. If it is exeeded, the "
+"process is restarted. Zero means unlimited."
+msgstr ""
+
+msgid "Maximum number of prepared idle processes"
+msgstr ""
+
+msgid "Maximum number of seconds an inactive connection is held open"
+msgstr ""
+
+msgid "Min. spare servers"
+msgstr ""
+
+msgid "Minimum number of prepared idle processes"
+msgstr ""
+
+msgid "Number of idle processes to start when launching Tinyproxy"
+msgstr ""
+
+msgid "Plaintext file with URLs or domains to filter. One entry per line"
+msgstr ""
+
+msgid "Policy"
+msgstr ""
+
+msgid "Privacy settings"
+msgstr ""
+
+msgid "Reject access"
+msgstr ""
+
+msgid "Server Settings"
+msgstr ""
+
+msgid "Server limits"
+msgstr ""
+
+msgid ""
+"Specifies HTTP header names which are allowed to pass-through, all others "
+"are discarded. Leave empty to disable header filtering"
+msgstr ""
+
+msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
+msgstr ""
+
+msgid ""
+"Specifies the address Tinyproxy binds to for outbound forwarded requests"
+msgstr ""
+
+msgid "Specifies the addresses Tinyproxy is listening on for requests"
+msgstr ""
+
+msgid "Specifies the group name the Tinyproxy process is running as"
+msgstr ""
+
+msgid ""
+"Specifies the upstream proxy to use for accessing the target host. Format is "
+"<code>address:port</code>"
+msgstr ""
+
+msgid "Specifies the user name the Tinyproxy process is running as"
+msgstr ""
+
+msgid "Start spare servers"
+msgstr ""
+
+msgid "Statistics page"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Target host"
+msgstr ""
+
+msgid "Tinyproxy"
+msgstr ""
+
+msgid "Tinyproxy Status"
+msgstr ""
+
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+msgstr ""
+
+msgid "Upstream Proxies"
+msgstr ""
+
+msgid ""
+"Upstream proxy rules define proxy servers to use when accessing certain IP "
+"addresses or domains."
+msgstr ""
+
+msgid "Use syslog"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Via hostname"
+msgstr ""
+
+msgid "Via proxy"
+msgstr ""
+
+msgid "Writes log messages to syslog instead of a log file"
+msgstr ""
+
+msgid "X-Tinyproxy header"
+msgstr ""
diff --git a/trunk/package/luci/po/zh_TW/transmission.po b/trunk/package/luci/po/zh_TW/transmission.po
new file mode 100644
index 00000000..78da18dd
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/transmission.po
@@ -0,0 +1,295 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-16 23:11+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Alternative download speed"
+msgstr "P2P代抓下載速度"
+
+msgid "Alternative speed enabled"
+msgstr "P2P代抓速度啟用"
+
+msgid "Alternative speed time begin"
+msgstr "P2P代抓起始時間"
+
+msgid "Alternative speed time day"
+msgstr "P2P代抓起每日時間"
+
+msgid "Alternative speed time end"
+msgstr "P2P代抓結束時間"
+
+msgid "Alternative speed timing enabled"
+msgstr "P2P代抓週期機制啟用"
+
+msgid "Alternative upload speed"
+msgstr "P2P代抓上傳速度"
+
+msgid "Automatically start added torrents"
+msgstr "當增加種子後自動開始下載"
+
+msgid "Bandwidth settings"
+msgstr "流量設定"
+
+msgid "Binding address IPv4"
+msgstr "綁定的IPv4位置"
+
+msgid "Binding address IPv6"
+msgstr "綁定的IPv6位置"
+
+msgid "Block list enabled"
+msgstr "啟用封鎖列表"
+
+msgid "Blocklist URL"
+msgstr "封鎖URL"
+
+msgid "Blocklists"
+msgstr "封鎖列表"
+
+msgid "Cache size in MB"
+msgstr "快取大小(MB)"
+
+msgid "Config file directory"
+msgstr "設定檔目錄"
+
+msgid "DHT enabled"
+msgstr "DHT啟用"
+
+msgid "Debug"
+msgstr "偵錯"
+
+msgid "Download directory"
+msgstr "下載目錄"
+
+msgid "Download queue enabled"
+msgstr "啟用下載隊列"
+
+msgid "Download queue size"
+msgstr "下載隊列大小"
+
+msgid "Enable watch directory"
+msgstr "啟用觀看目錄"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid "Encryption"
+msgstr "加密"
+
+msgid "Error"
+msgstr "錯誤"
+
+msgid "Fast"
+msgstr "快速"
+
+msgid "Files and Locations"
+msgstr "檔案和位置"
+
+msgid "Forced"
+msgstr "強制"
+
+msgid "Full"
+msgstr "全速"
+
+msgid "Global peer limit"
+msgstr "一般連接限制"
+
+msgid "Global settings"
+msgstr "一般設定"
+
+msgid "Idle seeding limit"
+msgstr "閒置作種限制"
+
+msgid "Idle seeding limit enabled"
+msgstr "閒置作種限制機制啟用"
+
+msgid "Incomplete directory"
+msgstr "不完整的目錄路徑"
+
+msgid "Incomplete directory enabled"
+msgstr "不完整的目錄置放區機制啟用"
+
+msgid "Info"
+msgstr "資訊"
+
+msgid "LPD enabled"
+msgstr "LPD啟用"
+
+msgid "Lazy bitfield enabled"
+msgstr "防ISP懶散悠閒抓法啟用"
+
+msgid "Message level"
+msgstr "訊息等級"
+
+msgid "Miscellaneous"
+msgstr "雜項"
+
+msgid "None"
+msgstr "None"
+
+msgid ""
+"Number/bitfield. Start with 0, then for each day you want the scheduler "
+"enabled, add a value. For Sunday - 1, Monday - 2, Tuesday - 4, Wednesday - "
+"8, Thursday - 16, Friday - 32, Saturday - 64"
+msgstr ""
+"數字/欄位. 由0開始,每日你若要啟用排程,就加上新數值. 星期日 -1, 星期一 -2, 星期二 -4, 星期三 -8, 星期四-16, "
+"星期五-32星期六 -64"
+
+msgid "Off"
+msgstr "關閉"
+
+msgid "Open Web Interface"
+msgstr "開啟Web介面"
+
+msgid "PEX enabled"
+msgstr "啟用PEX"
+
+msgid "Peer Port settings"
+msgstr "P2P節點埠號設定"
+
+msgid "Peer congestion algorithm"
+msgstr "P2P節點堵塞演算法"
+
+msgid "Peer limit per torrent"
+msgstr "P2P節點每個種子的限制"
+
+msgid "Peer port"
+msgstr "P2P節點埠號"
+
+msgid "Peer port random high"
+msgstr "P2P節點較高隨機埠號"
+
+msgid "Peer port random low"
+msgstr "P2P節點較低隨機埠號"
+
+msgid "Peer port random on start"
+msgstr "一開始就啟用P2P節點隨機埠"
+
+msgid "Peer settings"
+msgstr "埠號設定"
+
+msgid "Peer socket tos"
+msgstr "P2P節點優先IP插槽"
+
+msgid "Port forwarding enabled"
+msgstr "埠轉發啟用"
+
+msgid "Preferred"
+msgstr "首選"
+
+msgid "Prefetch enabled"
+msgstr "預選啟用"
+
+msgid "Queue stalled enabled"
+msgstr "隊列停滯啟用"
+
+msgid "Queue stalled minutes"
+msgstr "隊列停滯分鐘"
+
+msgid "Queueing"
+msgstr "排隊中"
+
+msgid "RPC URL"
+msgstr "遠端調用網址"
+
+msgid "RPC authentication required"
+msgstr "遠端調用需要驗證"
+
+msgid "RPC bind address"
+msgstr "遠端調用綁定位址"
+
+msgid "RPC enabled"
+msgstr "遠端調用功能啟用"
+
+msgid "RPC password"
+msgstr "遠端調用密碼"
+
+msgid "RPC port"
+msgstr "遠端調用埠號"
+
+msgid "RPC settings"
+msgstr "遠端調用設定"
+
+msgid "RPC username"
+msgstr "遠端調用用戶名稱"
+
+msgid "RPC whitelist"
+msgstr "遠端調用白名單"
+
+msgid "RPC whitelist enabled"
+msgstr "啟用遠端調用白名單"
+
+msgid "Ratio limit"
+msgstr "比率限制"
+
+msgid "Ratio limit enabled"
+msgstr "啟用比率限制"
+
+msgid "Rename partial files"
+msgstr "不完整檔案更名"
+
+msgid "Run daemon as user"
+msgstr "像用戶使用一樣常駐"
+
+msgid "Scheduling"
+msgstr "排程"
+
+msgid "Scrape paused torrents enabled"
+msgstr "下載暫停開始做種"
+
+msgid "Script torrent done enabled"
+msgstr "作種腳本啟用"
+
+msgid "Script torrent done filename"
+msgstr "作種腳本檔名"
+
+msgid "Seed queue enabled"
+msgstr "啟用作種隊列"
+
+msgid "Seed queue size"
+msgstr "作種隊列大小"
+
+msgid "Speed limit down"
+msgstr "下載速度限制"
+
+msgid "Speed limit down enabled"
+msgstr "啟用下載速度限制"
+
+msgid "Speed limit up"
+msgstr "上傳速度限制"
+
+msgid "Speed limit up enabled"
+msgstr "啟用上傳速度限制"
+
+msgid "Transmission"
+msgstr "傳輸任務"
+
+msgid ""
+"Transmission daemon is a simple bittorrent client, here you can configure "
+"the settings."
+msgstr "傳輸任務常駐是一個簡單的bittorrent用戶端程式, 這裡你可以配置設定"
+
+msgid "Trash original torrent files"
+msgstr "丟棄來源種子檔"
+
+msgid "Upload slots per torrent"
+msgstr "每個種子的上傳插槽數"
+
+msgid "Watch directory"
+msgstr "監看目錄"
+
+msgid "in minutes from midnight"
+msgstr "從午夜算起用分表示"
+
+msgid "preallocation"
+msgstr "預先分配"
+
+msgid "uTP enabled"
+msgstr "啟用uTP"
diff --git a/trunk/package/luci/po/zh_TW/upnp.po b/trunk/package/luci/po/zh_TW/upnp.po
new file mode 100644
index 00000000..356801b0
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/upnp.po
@@ -0,0 +1,147 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 11:40+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr "ACL存取控制清單, 就是指定某些外部埠可以從導到內部位址和埠號"
+
+msgid "Action"
+msgstr "啓用"
+
+msgid "Active UPnP Redirects"
+msgstr "啓用UPnP從導"
+
+msgid "Advanced Settings"
+msgstr "進階設定"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "只允許請求的IP位址新增從導機制"
+
+msgid "Announced model number"
+msgstr "已宣告模組號碼"
+
+msgid "Announced serial number"
+msgstr "已宣告序號"
+
+msgid "Clean rules interval"
+msgstr "清除規則間隔"
+
+msgid "Clean rules threshold"
+msgstr "清除規則門檻"
+
+msgid "Client Address"
+msgstr "用戶端位址"
+
+msgid "Client Port"
+msgstr "用戶端埠號"
+
+msgid "Collecting data..."
+msgstr "收集數據中..."
+
+msgid "Comment"
+msgstr "評論"
+
+msgid "Delete Redirect"
+msgstr "刪除從導"
+
+msgid "Device UUID"
+msgstr "設備UUID獨立識別碼"
+
+msgid "Downlink"
+msgstr "下載"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "啓用蘋果NAT-PMP傳輸埠對應通訊協定功能"
+
+msgid "Enable UPnP functionality"
+msgstr "啓用UPnP通用序列埠功能"
+
+msgid "Enable additional logging"
+msgstr "啓用額外記錄"
+
+msgid "Enable secure mode"
+msgstr "啓用安全模式"
+
+msgid "External Port"
+msgstr "外部埠號"
+
+msgid "External ports"
+msgstr "外部埠號範圍"
+
+msgid "General Settings"
+msgstr "一般設定"
+
+msgid "Internal addresses"
+msgstr "內部位址"
+
+msgid "Internal ports"
+msgstr "內部埠號"
+
+msgid "MiniUPnP ACLs"
+msgstr "小型UPnP存取控制清單"
+
+msgid "MiniUPnP settings"
+msgstr "小型UPnP存取控制清單設定"
+
+msgid "Notify interval"
+msgstr "提醒間隔"
+
+msgid "Port"
+msgstr "埠號"
+
+msgid "Presentation URL"
+msgstr "介紹URL連結"
+
+msgid "Protocol"
+msgstr "協議"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "把額外的除錯資訊放入系統log計錄中"
+
+msgid "Report system instead of daemon uptime"
+msgstr "報表系統取代常駐更新時間"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "啓用UPnP跟NAT-PMP服務"
+
+msgid "There are no active redirects."
+msgstr "目前無作用中的從導"
+
+msgid "UPNP"
+msgstr "UPNP通用序列埠協定"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr "開放本地用戶端自動設定路由器UPNP機制"
+
+msgid "UPnP lease file"
+msgstr "UPnP租賃文件"
+
+msgid "Universal Plug & Play"
+msgstr "通用序列埠隨插隨用"
+
+msgid "Uplink"
+msgstr "上傳"
+
+msgid "Value in KByte/s, informational only"
+msgstr "僅採用 KByte/s值單位表示"
+
+#~ msgid ""
+#~ "UPNP allows clients in the local network to automatically configure the "
+#~ "router."
+#~ msgstr "開放本地用戶端自動設定路由器UPNP機制"
+
+#~ msgid "enable"
+#~ msgstr "啓用"
diff --git a/trunk/package/luci/po/zh_TW/ushare.po b/trunk/package/luci/po/zh_TW/ushare.po
new file mode 100644
index 00000000..eba6677a
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/ushare.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2013-08-10 12:32+0200\n"
+"Last-Translator: mp607 <mickey60711@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Content directories"
+msgstr "目錄"
+
+msgid "Disable telnet console"
+msgstr "關閉telnet管理"
+
+msgid "Disable webinterface"
+msgstr "關閉網路介面管理"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "Interface"
+msgstr "網路介面"
+
+msgid "Options"
+msgstr "選項"
+
+msgid "Servername"
+msgstr "伺服器名稱"
+
+msgid "Settings"
+msgstr "設定"
+
+msgid "Username"
+msgstr "使用者名稱"
+
+msgid "uShare"
+msgstr "UPnP多媒體服務"
+
+msgid ""
+"uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
+"component that provides UPnP media devices with information on available "
+"multimedia files."
+msgstr "uShare是一個UPnP (TM) A/V & DLNA多媒體伺服器。可以將多媒體檔案共用分享到支援UPnP的裝置上"
diff --git a/trunk/package/luci/po/zh_TW/uvc_streamer.po b/trunk/package/luci/po/zh_TW/uvc_streamer.po
new file mode 100644
index 00000000..93473efa
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/uvc_streamer.po
@@ -0,0 +1,42 @@
+#  uvc_streamer.pot
+#  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-21 10:42+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+#. Frames per second
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
+msgid "Frames per second"
+msgstr "每秒顯示幀數"
+
+#. Resolution
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
+msgid "Resolution"
+msgstr "解析度"
+
+#. Settings
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
+msgid "Settings"
+msgstr "設定值"
+
+#. Webcam streaming
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
+msgid "Webcam streaming"
+msgstr "Webcam 網路攝影機串流"
+
+#. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
+#: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:5
+msgid ""
+"Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
+"href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"設定你的Linux-UVC相容的網路攝影機.將瀏覽器指向例如<a href=\"http://%s:%i/\">http://％S：％I /</ A> "
diff --git a/trunk/package/luci/po/zh_TW/vnstat.po b/trunk/package/luci/po/zh_TW/vnstat.po
new file mode 100644
index 00000000..261747aa
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/vnstat.po
@@ -0,0 +1,61 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 10:52+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "Daily traffic"
+msgstr "每日流量"
+
+msgid "Graphs"
+msgstr "圖表"
+
+msgid "Hourly traffic"
+msgstr "每小時流量"
+
+msgid "Monitor selected interfaces"
+msgstr "監控選到的介面"
+
+msgid "Monthly traffic"
+msgstr "每月流量"
+
+msgid ""
+"No database has been set up yet. Go to the VnStat configuration and enable "
+"monitoring for one or more interfaces."
+msgstr "尚無任何資料庫被設定. 進入VnStat針對某一個或多個介面設定並啟用監視."
+
+msgid "Restart VnStat"
+msgstr "從新啟動 VnStat"
+
+msgid "Summary display"
+msgstr "顯示概要"
+
+msgid "Top 10 display"
+msgstr "顯示前10名"
+
+msgid "Update »"
+msgstr "更新"
+
+msgid "VnStat"
+msgstr "VnStat"
+
+msgid "VnStat Graphs"
+msgstr "VnStat圖表"
+
+msgid "VnStat Traffic Monitor"
+msgstr "VnStat流量監視"
+
+msgid ""
+"VnStat is a network traffic monitor for Linux that keeps a log of network "
+"traffic for the selected interface(s)."
+msgstr " VnStat是一個針對Linux上的網路流量監視可達到保存特定介面的流量紀錄"
diff --git a/trunk/package/luci/po/zh_TW/voice_core.po b/trunk/package/luci/po/zh_TW/voice_core.po
new file mode 100644
index 00000000..e1bbf7a9
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/voice_core.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 10:41+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Phones"
+msgstr "電話"
+
+msgid "Voice"
+msgstr "語音"
diff --git a/trunk/package/luci/po/zh_TW/voice_diag.po b/trunk/package/luci/po/zh_TW/voice_diag.po
new file mode 100644
index 00000000..5207a8b2
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/voice_diag.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 10:45+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Diagnostics"
+msgstr "診斷"
+
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
+msgstr "能否診斷你的設備端看你已安裝的模組"
+
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
+msgstr "選單下有選項讓你能夠設定並執行測試你系統上的語音操作. 這些都是已知的診斷方法"
diff --git a/trunk/package/luci/po/zh_TW/watchcat.po b/trunk/package/luci/po/zh_TW/watchcat.po
new file mode 100644
index 00000000..b4e52bbf
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/watchcat.po
@@ -0,0 +1,66 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 12:00+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Forced reboot delay"
+msgstr "強制重啟延遲"
+
+msgid "Host address to ping"
+msgstr "要Ping的主機位址"
+
+msgid ""
+"How often to check internet connection. Default unit is seconds, you can you "
+"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
+msgstr ""
+"多久檢查一次網際網路連線. 預設單位值是秒, 可以採用單位後綴表示, \"m\"表示分"
+"鐘, \"h\"表示小時, \"d\"代表天數"
+
+msgid ""
+"In periodic mode, it defines the reboot period. In internet mode, it defines "
+"the longest period of time without internet access before a reboot is "
+"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
+"for hours or 'd' for days"
+msgstr ""
+"Watchcat的定期模式,它將定義重開週期. 在網際網路模式,它將定義在重開被訂製若無"
+"Internet存取時採用較長時間週期  .預設單位為秒數,可以採用單位後綴表示, \"m\"表"
+"示分鐘, \"h\"表示小時, \"d\"代表天數"
+
+msgid "Operating mode"
+msgstr "操作模式"
+
+msgid "Period"
+msgstr "週期"
+
+msgid "Ping host"
+msgstr "Ping主機"
+
+msgid "Ping period"
+msgstr "Ping週期"
+
+msgid "Watchcat"
+msgstr "Watchcat"
+
+#, fuzzy
+msgid ""
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat允許定期重啓並且/或者當網際網路連線斷掉時經過某段時間週期後重啓"
+
+#, fuzzy
+msgid ""
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
+"fails. Enter a number of seconds to enable, use 0 to disable"
+msgstr ""
+"重開系統時watchcat將會觸發軟重開, 如果軟重開失敗, 打入0以外的數字,將會觸發硬"
+"重開延遲 . 打入秒數來啟用這功能,用0表示功能關閉"
diff --git a/trunk/package/luci/po/zh_TW/wol.po b/trunk/package/luci/po/zh_TW/wol.po
new file mode 100644
index 00000000..ee290ec2
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/wol.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 10:25+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Broadcast on all interfaces"
+msgstr "廣播到所有介面"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "叫醒訂選的主機或者打入特定的MAC位址以便使用"
+
+msgid "Host to wake up"
+msgstr "要喚醒主機清單"
+
+msgid "Network interface to use"
+msgstr "使用的網路介面"
+
+#, fuzzy
+msgid ""
+"Sometimes only one of the two tools works. If one fails, try the other one"
+msgstr "某些時候全部工具裡面只有一個發生作用,試試另外一個"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "指定WoL喚醒封包將傳到哪個介面"
+
+msgid "Starting WoL utility:"
+msgstr "啟用喚醒工具:"
+
+msgid "Wake on LAN"
+msgstr "LAN區網喚醒"
+
+msgid ""
+"Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr "Wol就是在本地網路中針對遠端開機電腦喚醒的機制"
+
+msgid "Wake up host"
+msgstr "喚醒主機"
+
+msgid "WoL program"
+msgstr "Wol喚醒程式"
diff --git a/trunk/package/luci/po/zh_TW/wshaper.po b/trunk/package/luci/po/zh_TW/wshaper.po
new file mode 100644
index 00000000..18148259
--- /dev/null
+++ b/trunk/package/luci/po/zh_TW/wshaper.po
@@ -0,0 +1,56 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2014-05-14 12:40+0200\n"
+"Last-Translator: omnistack <omnistack@gmail.com>\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.6\n"
+
+msgid "Downlink"
+msgstr "下載"
+
+msgid "Downstream bandwidth in kbit/s"
+msgstr "以 kbit/s表示的下載頻寬"
+
+msgid "Host or Network in CIDR notation."
+msgstr "CIDR無類別域間路由中的主機或網路"
+
+msgid "Interface"
+msgstr "介面"
+
+msgid "Low priority destination ports"
+msgstr "低優先權目地埠號"
+
+msgid "Low priority hosts (Destination)"
+msgstr "低優先權主機(目的地)"
+
+msgid "Low priority hosts (Source)"
+msgstr "低優先權主機(來源)"
+
+msgid "Low priority source ports"
+msgstr "低優先權來源埠號"
+
+msgid "Uplink"
+msgstr "上傳"
+
+msgid "Upstream bandwidth in kbit/s"
+msgstr "以kbit/s表示的上傳頻寬"
+
+msgid "Wondershaper"
+msgstr "Wondershaper頻寬管理"
+
+msgid "Wondershaper settings"
+msgstr "Wondershaper設定值"
+
+#, fuzzy
+msgid ""
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"既使你的網路連線達到高飽和, Wondershaper採用流量銳化塑形以針對未知的流量保證"
+"低延遲"
diff --git a/trunk/package/luci/protocols/3g/Makefile b/trunk/package/luci/protocols/3g/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/protocols/3g/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua b/trunk/package/luci/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
new file mode 100644
index 00000000..9c1a7628
--- /dev/null
+++ b/trunk/package/luci/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
@@ -0,0 +1,153 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local device, apn, service, pincode, username, password
+local ipv6, maxwait, defaultroute, metric, peerdns, dns,
+      keepalive_failure, keepalive_interval, demand
+
+
+device = section:taboption("general", Value, "device", translate("Modem device"))
+device.rmempty = false
+
+local device_suggestions = nixio.fs.glob("/dev/tty[A-Z]*")
+	or nixio.fs.glob("/dev/tts/*")
+
+if device_suggestions then
+	local node
+	for node in device_suggestions do
+		device:value(node)
+	end
+end
+
+
+service = section:taboption("general", Value, "service", translate("Service Type"))
+service:value("", translate("-- Please choose --"))
+service:value("umts", "UMTS/GPRS")
+service:value("umts_only", translate("UMTS only"))
+service:value("gprs_only", translate("GPRS only"))
+service:value("evdo", "CDMA/EV-DO")
+
+
+apn = section:taboption("general", Value, "apn", translate("APN"))
+
+
+pincode = section:taboption("general", Value, "pincode", translate("PIN"))
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+
+if luci.model.network:has_ipv6() then
+
+	ipv6 = section:taboption("advanced", Flag, "ipv6",
+		translate("Enable IPv6 negotiation on the PPP link"))
+
+	ipv6.default = ipv6.disabled
+
+end
+
+
+maxwait = section:taboption("advanced", Value, "maxwait",
+	translate("Modem init timeout"),
+	translate("Maximum amount of seconds to wait for the modem to become ready"))
+
+maxwait.placeholder = "20"
+maxwait.datatype    = "min(1)"
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
+	translate("LCP echo failure threshold"),
+	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
+
+function keepalive_failure.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
+	end
+end
+
+function keepalive_failure.write() end
+function keepalive_failure.remove() end
+
+keepalive_failure.placeholder = "0"
+keepalive_failure.datatype    = "uinteger"
+
+
+keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
+	translate("LCP echo interval"),
+	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
+
+function keepalive_interval.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^%d+[ ,]+(%d+)"))
+	end
+end
+
+function keepalive_interval.write(self, section, value)
+	local f = tonumber(keepalive_failure:formvalue(section)) or 0
+	local i = tonumber(value) or 5
+	if i < 1 then i = 1 end
+	if f > 0 then
+		m:set(section, "keepalive", "%d %d" %{ f, i })
+	else
+		m:del(section, "keepalive")
+	end
+end
+
+keepalive_interval.remove      = keepalive_interval.write
+keepalive_interval.placeholder = "5"
+keepalive_interval.datatype    = "min(1)"
+
+
+demand = section:taboption("advanced", Value, "demand",
+	translate("Inactivity timeout"),
+	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
+
+demand.placeholder = "0"
+demand.datatype    = "uinteger"
diff --git a/trunk/package/luci/protocols/ipv6/Makefile b/trunk/package/luci/protocols/ipv6/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
new file mode 100644
index 00000000..9b668cdd
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
@@ -0,0 +1,111 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local ipaddr, peeraddr, ip6addr, tunnelid, username, password
+local defaultroute, metric, ttl, mtu
+
+
+ipaddr = s:taboption("general", Value, "ipaddr",
+	translate("Local IPv4 address"),
+	translate("Leave empty to use the current WAN address"))
+
+ipaddr.datatype = "ip4addr"
+
+
+peeraddr = s:taboption("general", Value, "peeraddr",
+	translate("Remote IPv4 address"),
+	translate("This is usually the address of the nearest PoP operated by the tunnel broker"))
+
+peeraddr.rmempty  = false
+peeraddr.datatype = "ip4addr"
+
+
+ip6addr = s:taboption("general", Value, "ip6addr",
+	translate("Local IPv6 address"),
+	translate("This is the local endpoint address assigned by the tunnel broker, it usually ends with <code>:2</code>"))
+
+ip6addr.datatype = "ip6addr"
+
+
+local ip6prefix = s:taboption("general", Value, "ip6prefix",
+	translate("IPv6 routed prefix"),
+	translate("This is the prefix routed to you by the tunnel broker for use by clients"))
+
+ip6prefix.datatype = "ip6addr"
+
+
+local update = section:taboption("general", Flag, "_update",
+	translate("Dynamic tunnel"),
+	translate("Enable HE.net dynamic endpoint update"))
+
+update.enabled  = "1"
+update.disabled = "0"
+
+function update.write() end
+function update.remove() end
+function update.cfgvalue(self, section)
+	return (tonumber(m:get(section, "tunnelid")) ~= nil)
+		and self.enabled or self.disabled
+end
+
+
+tunnelid = section:taboption("general", Value, "tunnelid", translate("Tunnel ID"))
+tunnelid.datatype = "uinteger"
+tunnelid:depends("_update", update.enabled)
+
+
+username = section:taboption("general", Value, "username",
+	translate("HE.net username"),
+	translate("This is the plain username for logging into the account"))
+
+username:depends("_update", update.enabled)
+username.validate = function(self, val, sid)
+	if type(val) == "string" and #val == 32 and val:match("^[a-fA-F0-9]+$") then
+		return nil, translate("The HE.net endpoint update configuration changed, you must now use the plain username instead of the user ID!")
+	end
+	return val
+end
+
+
+password = section:taboption("general", Value, "password",
+	translate("HE.net password"),
+	translate("This is either the \"Update Key\" configured for the tunnel or the account password if no update key has been configured"))
+
+password.password = true
+password:depends("_update", update.enabled)
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
+ttl.placeholder = "64"
+ttl.datatype    = "range(1,255)"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
+mtu.placeholder = "1280"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
new file mode 100644
index 00000000..3835561d
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
@@ -0,0 +1,81 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local ipaddr, peeraddr, ip6addr, tunnelid, username, password
+local defaultroute, metric, ttl, mtu
+
+
+ipaddr = s:taboption("general", Value, "ipaddr",
+	translate("Local IPv4 address"),
+	translate("Leave empty to use the current WAN address"))
+
+ipaddr.datatype = "ip4addr"
+
+
+peeraddr = s:taboption("general", Value, "peeraddr",
+	translate("Remote IPv4 address"),
+	translate("This IPv4 address of the relay"))
+
+peeraddr.rmempty  = false
+peeraddr.datatype = "ip4addr"
+
+
+ip6addr = s:taboption("general", Value, "ip6prefix",
+	translate("IPv6 prefix"),
+	translate("The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"))
+
+ip6addr.rmempty  = false
+ip6addr.datatype = "ip6addr"
+
+
+ip6prefixlen = s:taboption("general", Value, "ip6prefixlen",
+	translate("IPv6 prefix length"),
+	translate("The length of the IPv6 prefix in bits"))
+
+ip6prefixlen.placeholder = "16"
+ip6prefixlen.datatype    = "range(0,128)"
+
+
+ip6prefixlen = s:taboption("general", Value, "ip4prefixlen",
+	translate("IPv4 prefix length"),
+	translate("The length of the IPv4 prefix in bits, the remainder is used in the IPv6 addresses."))
+
+ip6prefixlen.placeholder = "0"
+ip6prefixlen.datatype    = "range(0,32)"
+
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
+ttl.placeholder = "64"
+ttl.datatype    = "range(1,255)"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
+mtu.placeholder = "1280"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
new file mode 100644
index 00000000..c0cb95b2
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
@@ -0,0 +1,46 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local ipaddr, defaultroute, metric, ttl, mtu
+
+
+ipaddr = section:taboption("general", Value, "ipaddr",
+	translate("Local IPv4 address"),
+	translate("Leave empty to use the current WAN address"))
+
+ipaddr.datatype = "ip4addr"
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
+ttl.placeholder = "64"
+ttl.datatype    = "range(1,255)"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
+mtu.placeholder = "1280"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
new file mode 100644
index 00000000..51f17878
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
@@ -0,0 +1,67 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2013 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+
+local o = section:taboption("general", ListValue, "reqaddress",
+	translate("Request IPv6-address"))
+o:value("try")
+o:value("force")
+o:value("none", "disabled")
+o.default = "try"
+
+
+o = section:taboption("general", Value, "reqprefix",
+	translate("Request IPv6-prefix of length"))
+o:value("auto", translate("automatic"))
+o:value("no", translate("disabled"))
+o:value("48")
+o:value("52")
+o:value("56")
+o:value("60")
+o:value("64")
+o.default = "auto"
+
+
+o = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+o.default = o.enabled
+
+
+o = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+o.default = o.enabled
+
+
+o = section:taboption("advanced", Value, "ip6prefix",
+	translate("Custom delegated IPv6-prefix"))
+o.dataype = "ip6addr"
+
+
+o = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+o:depends("peerdns", "")
+o.datatype = "list(ip6addr)"
+o.cast     = "string"
+
+
+o = section:taboption("advanced", Value, "clientid",
+	translate("Client ID to send when requesting DHCP"))
+
+luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
+
+o = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+o.placeholder = "1500"
+o.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
new file mode 100644
index 00000000..2d9e258c
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
@@ -0,0 +1,62 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2013 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local peeraddr, ip6addr
+local tunlink, defaultroute, metric, ttl, mtu
+
+
+
+
+peeraddr = section:taboption("general", Value, "peeraddr",
+	translate("DS-Lite AFTR address"))
+
+peeraddr.rmempty  = false
+peeraddr.datatype = "ip6addr"
+
+ip6addr = section:taboption("general", Value, "ip6addr",
+	translate("Local IPv6 address"),
+	translate("Leave empty to use the current WAN address"))
+
+ip6addr.datatype = "ip6addr"
+
+
+tunlink = section:taboption("advanced", DynamicList, "tunlink", translate("Tunnel Link"))
+tunlink.template = "cbi/network_netlist"
+tunlink.nocreate = true
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
+ttl.placeholder = "64"
+ttl.datatype    = "range(1,255)"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
+mtu.placeholder = "1280"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
new file mode 100644
index 00000000..0cf8c010
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
@@ -0,0 +1,43 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2013 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local mode = section:taboption("general", ListValue, "mode", translate("Category"))
+mode:value("auto", translate("Automatic"))
+mode:value("external", translate("External"))
+mode:value("guest", translate("Guest"))
+mode:value("adhoc", translate("Ad-Hoc"))
+mode.default = "auto"
+
+
+
+local plen = section:taboption("advanced", Value, "ip6assign", translate("IPv6 assignment length"),
+	translate("Assign a part of given length of every public IPv6-prefix to this interface"))
+plen.datatype = "max(128)"
+plen.default = "64"
+
+section:taboption("advanced", Value, "link_id", translate("IPv6 assignment hint"),
+	translate("Assign prefix parts using this hexadecimal subprefix ID for this interface."))
+
+plen = section:taboption("advanced", Value, "ip4assign", translate("IPv4 assignment length"))
+plen.datatype = "max(32)"
+plen.default = "24"
+
+local o = section:taboption("advanced", Value, "dnsname", translate("DNS-Label / FQDN"))
+o.default = map.name
+
+luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
+
+o = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+o.placeholder = "1500"
+o.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_4x6.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_4x6.lua
new file mode 100644
index 00000000..91adfa94
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_4x6.lua
@@ -0,0 +1,65 @@
+--[[
+LuCI - Network model - 6to4, 6in4 & 6rd protocol extensions
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2013 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local netmod = luci.model.network
+
+local _, p
+for _, p in ipairs({"dslite"}) do
+
+	local proto = netmod:register_protocol(p)
+
+	function proto.get_i18n(self)
+		if p == "dslite" then
+			return luci.i18n.translate("Dual-Stack Lite (RFC6333)")
+		end
+	end
+
+	function proto.ifname(self)
+		return p .. "-" .. self.sid
+	end
+
+	function proto.opkg_package(self)
+		if p == "dslite" then
+			return "ds-lite"
+		end
+	end
+
+	function proto.is_installed(self)
+		return nixio.fs.access("/lib/netifd/proto/" .. p .. ".sh")
+	end
+
+	function proto.is_floating(self)
+		return true
+	end
+
+	function proto.is_virtual(self)
+		return true
+	end
+
+	function proto.get_interfaces(self)
+		return nil
+	end
+
+	function proto.contains_interface(self, ifname)
+		return (netmod:ifnameof(ifc) == self:ifname())
+	end
+
+	netmod:register_pattern_virtual("^%s-%%w" % p)
+end
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_6x4.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_6x4.lua
new file mode 100644
index 00000000..b800b0b5
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_6x4.lua
@@ -0,0 +1,66 @@
+--[[
+LuCI - Network model - 6to4, 6in4 & 6rd protocol extensions
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local netmod = luci.model.network
+
+local _, p
+for _, p in ipairs({"6in4", "6to4", "6rd"}) do
+
+	local proto = netmod:register_protocol(p)
+
+	function proto.get_i18n(self)
+		if p == "6in4" then
+			return luci.i18n.translate("IPv6-in-IPv4 (RFC4213)")
+		elseif p == "6to4" then
+			return luci.i18n.translate("IPv6-over-IPv4 (6to4)")
+		elseif p == "6rd" then
+			return luci.i18n.translate("IPv6-over-IPv4 (6rd)")
+		end
+	end
+
+	function proto.ifname(self)
+		return p .. "-" .. self.sid
+	end
+
+	function proto.opkg_package(self)
+		return p
+	end
+
+	function proto.is_installed(self)
+		return nixio.fs.access("/lib/netifd/proto/" .. p .. ".sh")
+	end
+
+	function proto.is_floating(self)
+		return true
+	end
+
+	function proto.is_virtual(self)
+		return true
+	end
+
+	function proto.get_interfaces(self)
+		return nil
+	end
+
+	function proto.contains_interface(self, ifname)
+		return (netmod:ifnameof(ifc) == self:ifname())
+	end
+
+	netmod:register_pattern_virtual("^%s-%%w" % p)
+end
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
new file mode 100644
index 00000000..59463d18
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
@@ -0,0 +1,32 @@
+--[[
+LuCI - Network model - dhcpv6 protocol extension
+
+Copyright 2013 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local proto = luci.model.network:register_protocol("dhcpv6")
+
+function proto.get_i18n(self)
+	return luci.i18n.translate("DHCPv6 client")
+end
+
+function proto.is_installed(self)
+	return nixio.fs.access("/lib/netifd/proto/dhcpv6.sh")
+end
+
+function proto.opkg_package(self)
+	return "odhcp6c"
+end
diff --git a/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_hnet.lua b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_hnet.lua
new file mode 100644
index 00000000..d3e094f2
--- /dev/null
+++ b/trunk/package/luci/protocols/ipv6/luasrc/model/network/proto_hnet.lua
@@ -0,0 +1,32 @@
+--[[
+LuCI - Network model - homenet protocol extension
+
+Copyright 2014 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local proto = luci.model.network:register_protocol("hnet")
+
+function proto.get_i18n(self)
+	return luci.i18n.translate("Automatic Homenet (HNCP)")
+end
+
+function proto.is_installed(self)
+	return nixio.fs.access("/lib/netifd/proto/hnet.sh")
+end
+
+function proto.opkg_package(self)
+	return "hnetd"
+end
diff --git a/trunk/package/luci/protocols/openconnect/Makefile b/trunk/package/luci/protocols/openconnect/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/protocols/openconnect/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua b/trunk/package/luci/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
new file mode 100644
index 00000000..2e2eacee
--- /dev/null
+++ b/trunk/package/luci/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
@@ -0,0 +1,78 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2014 Nikos Mavrogiannopoulos <nmav@gnutls.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local server, username, password, cert, ca
+local oc_cert_file, oc_key_file, oc_ca_file
+
+local ifc = net:get_interface():name()
+
+oc_cert_file = "/etc/openconnect/user-cert-" .. ifc .. ".pem"
+oc_key_file = "/etc/openconnect/user-key-" .. ifc .. ".pem"
+oc_ca_file = "/etc/openconnect/ca-" .. ifc .. ".pem"
+
+server = section:taboption("general", Value, "server", translate("VPN Server"))
+server.datatype = "host"
+
+port = section:taboption("general", Value, "port", translate("VPN Server port"))
+port.placeholder = "443"
+port.datatype    = "port"
+
+section:taboption("general", Value, "serverhash", translate("VPN Server's certificate SHA1 hash"))
+
+section:taboption("general", Value, "authgroup", translate("AuthGroup"))
+
+username = section:taboption("general", Value, "username", translate("Username"))
+password = section:taboption("general", Value, "password", translate("Password"))
+password.password = true
+
+
+cert = section:taboption("advanced", Value, "usercert", translate("User certificate (PEM encoded)"))
+cert.template = "cbi/tvalue"
+cert.rows = 10
+
+function cert.cfgvalue(self, section)
+	return nixio.fs.readfile(oc_cert_file)
+end
+
+function cert.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	nixio.fs.writefile(oc_cert_file, value)
+end
+
+cert = section:taboption("advanced", Value, "userkey", translate("User key (PEM encoded)"))
+cert.template = "cbi/tvalue"
+cert.rows = 10
+
+function cert.cfgvalue(self, section)
+	return nixio.fs.readfile(oc_key_file)
+end
+
+function cert.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	nixio.fs.writefile(oc_key_file, value)
+end
+
+
+ca = section:taboption("advanced", Value, "ca", translate("CA certificate; if empty it will be saved after the first connection."))
+ca.template = "cbi/tvalue"
+ca.rows = 10
+
+function ca.cfgvalue(self, section)
+	return nixio.fs.readfile(oc_ca_file)
+end
+
+function ca.write(self, section, value)
+	value = value:gsub("\r\n?", "\n")
+	nixio.fs.writefile(oc_ca_file, value)
+end
diff --git a/trunk/package/luci/protocols/openconnect/luasrc/model/network/proto_openconnect.lua b/trunk/package/luci/protocols/openconnect/luasrc/model/network/proto_openconnect.lua
new file mode 100644
index 00000000..26744cde
--- /dev/null
+++ b/trunk/package/luci/protocols/openconnect/luasrc/model/network/proto_openconnect.lua
@@ -0,0 +1,61 @@
+--[[
+LuCI - Network model - openconnect protocol extension
+
+Copyright 2012 David Woodhouse
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local netmod = luci.model.network
+local interface = luci.model.network.interface
+local proto = netmod:register_protocol("openconnect")
+
+function proto.get_i18n(self)
+	return luci.i18n.translate("OpenConnect (CISCO AnyConnect)")
+end
+
+function proto.ifname(self)
+	return "vpn-" .. self.sid
+end
+
+function proto.get_interface(self)
+	return interface(self:ifname(), self)
+end
+
+function proto.opkg_package(self)
+	return "openconnect"
+end
+
+function proto.is_installed(self)
+	return nixio.fs.access("/lib/netifd/proto/openconnect.sh")
+end
+
+function proto.is_floating(self)
+	return true
+end
+
+function proto.is_virtual(self)
+	return true
+end
+
+function proto.get_interfaces(self)
+	return nil
+end
+
+function proto.contains_interface(self, ifc)
+	 return (netmod:ifnameof(ifc) == self:ifname())
+
+end
+
+netmod:register_pattern_virtual("^vpn-%w")
diff --git a/trunk/package/luci/protocols/ppp/Makefile b/trunk/package/luci/protocols/ppp/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/protocols/ppp/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
new file mode 100644
index 00000000..c1dd56e1
--- /dev/null
+++ b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
@@ -0,0 +1,69 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local server, username, password
+local ipv6, defaultroute, metric, peerdns, dns, mtu
+
+
+server = section:taboption("general", Value, "server", translate("L2TP Server"))
+server.datatype = "host"
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+if luci.model.network:has_ipv6() then
+
+	ipv6 = section:taboption("advanced", Flag, "ipv6",
+		translate("Enable IPv6 negotiation on the PPP link"))
+
+	ipv6.default = ipv6.disabled
+
+end
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
new file mode 100644
index 00000000..659e733a
--- /dev/null
+++ b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
@@ -0,0 +1,136 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local device, username, password
+local ipv6, defaultroute, metric, peerdns, dns,
+	  keepalive_failure, keepalive_interval, demand, mtu
+
+
+device = section:taboption("general", Value, "device", translate("Modem device"))
+device.rmempty = false
+
+local device_suggestions = nixio.fs.glob("/dev/tty*S*")
+	or nixio.fs.glob("/dev/tts/*")
+
+if device_suggestions then
+	local node
+	for node in device_suggestions do
+		device:value(node)
+	end
+end
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+
+if luci.model.network:has_ipv6() then
+
+	ipv6 = section:taboption("advanced", Flag, "ipv6",
+		translate("Enable IPv6 negotiation on the PPP link"))
+
+	ipv6.default = ipv6.disabled
+
+end
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
+	translate("LCP echo failure threshold"),
+	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
+
+function keepalive_failure.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
+	end
+end
+
+function keepalive_failure.write() end
+function keepalive_failure.remove() end
+
+keepalive_failure.placeholder = "0"
+keepalive_failure.datatype    = "uinteger"
+
+
+keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
+	translate("LCP echo interval"),
+	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
+
+function keepalive_interval.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^%d+[ ,]+(%d+)"))
+	end
+end
+
+function keepalive_interval.write(self, section, value)
+	local f = tonumber(keepalive_failure:formvalue(section)) or 0
+	local i = tonumber(value) or 5
+	if i < 1 then i = 1 end
+	if f > 0 then
+		m:set(section, "keepalive", "%d %d" %{ f, i })
+	else
+		m:del(section, "keepalive")
+	end
+end
+
+keepalive_interval.remove      = keepalive_interval.write
+keepalive_interval.placeholder = "5"
+keepalive_interval.datatype    = "min(1)"
+
+
+demand = section:taboption("advanced", Value, "demand",
+	translate("Inactivity timeout"),
+	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
+
+demand.placeholder = "0"
+demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
new file mode 100644
index 00000000..c32e2828
--- /dev/null
+++ b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
@@ -0,0 +1,142 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local encaps, atmdev, vci, vpi, username, password
+local ipv6, defaultroute, metric, peerdns, dns,
+      keepalive_failure, keepalive_interval, demand, mtu
+
+
+encaps = section:taboption("general", ListValue, "encaps", translate("PPPoA Encapsulation"))
+encaps:value("vc", "VC-Mux")
+encaps:value("llc", "LLC")
+
+
+atmdev = section:taboption("general", Value, "atmdev", translate("ATM device number"))
+atmdev.default  = "0"
+atmdev.datatype = "uinteger"
+
+
+vci = section:taboption("general", Value, "vci", translate("ATM Virtual Channel Identifier (VCI)"))
+vci.default  = "35"
+vci.datatype = "uinteger"
+
+
+vpi = section:taboption("general", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)"))
+vpi.default  = "8"
+vpi.datatype = "uinteger"
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+
+if luci.model.network:has_ipv6() then
+
+	ipv6 = section:taboption("advanced", Flag, "ipv6",
+		translate("Enable IPv6 negotiation on the PPP link"))
+
+	ipv6.default = ipv6.disabled
+
+end
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
+	translate("LCP echo failure threshold"),
+	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
+
+function keepalive_failure.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
+	end
+end
+
+function keepalive_failure.write() end
+function keepalive_failure.remove() end
+
+keepalive_failure.placeholder = "0"
+keepalive_failure.datatype    = "uinteger"
+
+
+keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
+	translate("LCP echo interval"),
+	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
+
+function keepalive_interval.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^%d+[ ,]+(%d+)"))
+	end
+end
+
+function keepalive_interval.write(self, section, value)
+	local f = tonumber(keepalive_failure:formvalue(section)) or 0
+	local i = tonumber(value) or 5
+	if i < 1 then i = 1 end
+	if f > 0 then
+		m:set(section, "keepalive", "%d %d" %{ f, i })
+	else
+		m:del(section, "keepalive")
+	end
+end
+
+keepalive_interval.remove      = keepalive_interval.write
+keepalive_interval.placeholder = "5"
+keepalive_interval.datatype    = "min(1)"
+
+
+demand = section:taboption("advanced", Value, "demand",
+	translate("Inactivity timeout"),
+	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
+
+demand.placeholder = "0"
+demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
new file mode 100644
index 00000000..ec258a52
--- /dev/null
+++ b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
@@ -0,0 +1,136 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local username, password, ac, service
+local ipv6, defaultroute, metric, peerdns, dns,
+      keepalive_failure, keepalive_interval, demand, mtu
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+
+ac = section:taboption("general", Value, "ac",
+	translate("Access Concentrator"),
+	translate("Leave empty to autodetect"))
+
+ac.placeholder = translate("auto")
+
+
+service = section:taboption("general", Value, "service",
+	translate("Service Name"),
+	translate("Leave empty to autodetect"))
+
+service.placeholder = translate("auto")
+
+
+if luci.model.network:has_ipv6() then
+
+	ipv6 = section:taboption("advanced", Flag, "ipv6",
+		translate("Enable IPv6 negotiation on the PPP link"))
+
+	ipv6.default = ipv6.disabled
+
+end
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
+	translate("LCP echo failure threshold"),
+	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
+
+function keepalive_failure.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
+	end
+end
+
+function keepalive_failure.write() end
+function keepalive_failure.remove() end
+
+keepalive_failure.placeholder = "0"
+keepalive_failure.datatype    = "uinteger"
+
+
+keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
+	translate("LCP echo interval"),
+	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
+
+function keepalive_interval.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^%d+[ ,]+(%d+)"))
+	end
+end
+
+function keepalive_interval.write(self, section, value)
+	local f = tonumber(keepalive_failure:formvalue(section)) or 0
+	local i = tonumber(value) or 5
+	if i < 1 then i = 1 end
+	if f > 0 then
+		m:set(section, "keepalive", "%d %d" %{ f, i })
+	else
+		m:del(section, "keepalive")
+	end
+end
+
+keepalive_interval.remove      = keepalive_interval.write
+keepalive_interval.placeholder = "5"
+keepalive_interval.datatype    = "min(1)"
+
+
+demand = section:taboption("advanced", Value, "demand",
+	translate("Inactivity timeout"),
+	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
+
+demand.placeholder = "0"
+demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
new file mode 100644
index 00000000..ea9858e7
--- /dev/null
+++ b/trunk/package/luci/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
@@ -0,0 +1,116 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local server, username, password
+local defaultroute, metric, peerdns, dns,
+	keepalive_failure, keepalive_interval, demand, mtu
+
+
+server = section:taboption("general", Value, "server", translate("VPN Server"))
+server.datatype = "host"
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
+	translate("LCP echo failure threshold"),
+	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
+
+function keepalive_failure.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
+	end
+end
+
+function keepalive_failure.write() end
+function keepalive_failure.remove() end
+
+keepalive_failure.placeholder = "0"
+keepalive_failure.datatype    = "uinteger"
+
+
+keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
+	translate("LCP echo interval"),
+	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
+
+function keepalive_interval.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^%d+[ ,]+(%d+)"))
+	end
+end
+
+function keepalive_interval.write(self, section, value)
+	local f = tonumber(keepalive_failure:formvalue(section)) or 0
+	local i = tonumber(value) or 5
+	if i < 1 then i = 1 end
+	if f > 0 then
+		m:set(section, "keepalive", "%d %d" %{ f, i })
+	else
+		m:del(section, "keepalive")
+	end
+end
+
+keepalive_interval.remove      = keepalive_interval.write
+keepalive_interval.placeholder = "5"
+keepalive_interval.datatype    = "min(1)"
+
+
+demand = section:taboption("advanced", Value, "demand",
+	translate("Inactivity timeout"),
+	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
+
+demand.placeholder = "0"
+demand.datatype    = "uinteger"
+
+
+mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
+mtu.placeholder = "1500"
+mtu.datatype    = "max(9200)"
diff --git a/trunk/package/luci/protocols/ppp/luasrc/model/network/proto_ppp.lua b/trunk/package/luci/protocols/ppp/luasrc/model/network/proto_ppp.lua
new file mode 100644
index 00000000..dfd545f3
--- /dev/null
+++ b/trunk/package/luci/protocols/ppp/luasrc/model/network/proto_ppp.lua
@@ -0,0 +1,104 @@
+--[[
+LuCI - Network model - 3G, PPP, PPtP, PPPoE and PPPoA protocol extension
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local netmod = luci.model.network
+
+local _, p
+for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g", "l2tp"}) do
+
+	local proto = netmod:register_protocol(p)
+
+	function proto.get_i18n(self)
+		if p == "ppp" then
+			return luci.i18n.translate("PPP")
+		elseif p == "pptp" then
+			return luci.i18n.translate("PPtP")
+		elseif p == "3g" then
+			return luci.i18n.translate("UMTS/GPRS/EV-DO")
+		elseif p == "pppoe" then
+			return luci.i18n.translate("PPPoE")
+		elseif p == "pppoa" then
+			return luci.i18n.translate("PPPoATM")
+		elseif p == "l2tp" then
+			return luci.i18n.translate("L2TP")
+		end
+	end
+
+	function proto.ifname(self)
+		return p .. "-" .. self.sid
+	end
+
+	function proto.opkg_package(self)
+		if p == "ppp" then
+			return p
+		elseif p == "3g" then
+			return "comgt"
+		elseif p == "pptp" then
+			return "ppp-mod-pptp"
+		elseif p == "pppoe" then
+			return "ppp-mod-pppoe"
+		elseif p == "pppoa" then
+			return "ppp-mod-pppoa"
+		elseif p == "l2tp" then
+			return "xl2tpd"
+		end
+	end
+
+	function proto.is_installed(self)
+		if p == "pppoa" then
+			return (nixio.fs.glob("/usr/lib/pppd/*/pppoatm.so")() ~= nil)
+		elseif p == "pppoe" then
+			return (nixio.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() ~= nil)
+		elseif p == "pptp" then
+			return (nixio.fs.glob("/usr/lib/pppd/*/pptp.so")() ~= nil)
+		elseif p == "3g" then
+			return nixio.fs.access("/lib/netifd/proto/3g.sh")
+		elseif p == "l2tp" then
+			return nixio.fs.access("/lib/netifd/proto/l2tp.sh")
+		else
+			return nixio.fs.access("/lib/netifd/proto/ppp.sh")
+		end
+	end
+
+	function proto.is_floating(self)
+		return (p ~= "pppoe")
+	end
+
+	function proto.is_virtual(self)
+		return true
+	end
+
+	function proto.get_interfaces(self)
+		if self:is_floating() then
+			return nil
+		else
+			return netmod.protocol.get_interfaces(self)
+		end
+	end
+
+	function proto.contains_interface(self, ifc)
+		if self:is_floating() then
+			return (netmod:ifnameof(ifc) == self:ifname())
+		else
+			return netmod.protocol.contains_interface(self, ifc)
+		end
+	end
+
+	netmod:register_pattern_virtual("^%s-%%w" % p)
+end
diff --git a/trunk/package/luci/protocols/relay/Makefile b/trunk/package/luci/protocols/relay/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/protocols/relay/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua b/trunk/package/luci/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua
new file mode 100644
index 00000000..017bb9bf
--- /dev/null
+++ b/trunk/package/luci/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua
@@ -0,0 +1,77 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local ipaddr, network
+local forward_bcast, forward_dhcp, gateway, expiry, retry, table
+
+
+ipaddr = section:taboption("general", Value, "ipaddr",
+	translate("Local IPv4 address"),
+	translate("Address to access local relay bridge"))
+
+ipaddr.datatype = "ip4addr"
+
+
+network = s:taboption("general", DynamicList, "network", translate("Relay between networks"))
+network.widget = "checkbox"
+network.exclude = arg[1]
+network.template = "cbi/network_netlist"
+network.nocreate = true
+network.nobridges = true
+network.novirtual = true
+network:depends("proto", "relay")
+
+
+forward_bcast = section:taboption("advanced", Flag, "forward_bcast",
+	translate("Forward broadcast traffic"))
+
+forward_bcast.default = forward_bcast.enabled
+
+
+forward_dhcp = section:taboption("advanced", Flag, "forward_dhcp",
+	translate("Forward DHCP traffic"))
+
+forward_dhcp.default = forward_dhcp.enabled
+
+
+gateway = section:taboption("advanced", Value, "gateway",
+	translate("Use DHCP gateway"),
+	translate("Override the gateway in DHCP responses"))
+
+gateway.datatype = "ip4addr"
+gateway:depends("forward_dhcp", forward_dhcp.enabled)
+
+
+expiry = section:taboption("advanced", Value, "expiry",
+	translate("Host expiry timeout"),
+	translate("Specifies the maximum amount of seconds after which hosts are presumed to be dead"))
+
+expiry.placeholder = "30"
+expiry.datatype    = "min(1)"
+
+
+retry = section:taboption("advanced", Value, "retry",
+	translate("ARP retry threshold"),
+	translate("Specifies the maximum amount of failed ARP requests until hosts are presumed to be dead"))
+
+retry.placeholder = "5"
+retry.datatype    = "min(1)"
+
+
+table = section:taboption("advanced", Value, "table",
+	translate("Use routing table"),
+	translate("Override the table used for internal routes"))
+
+table.placeholder = "16800"
+table.datatype    = "range(0,65535)"
diff --git a/trunk/package/luci/protocols/relay/luasrc/model/network/proto_relay.lua b/trunk/package/luci/protocols/relay/luasrc/model/network/proto_relay.lua
new file mode 100644
index 00000000..42bd1f84
--- /dev/null
+++ b/trunk/package/luci/protocols/relay/luasrc/model/network/proto_relay.lua
@@ -0,0 +1,165 @@
+--[[
+LuCI - Network model - relay protocol extension
+
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local netmod = luci.model.network
+local device = luci.util.class(netmod.interface)
+
+netmod:register_pattern_virtual("^relay-%w")
+
+local proto = netmod:register_protocol("relay")
+
+function proto.get_i18n(self)
+	return luci.i18n.translate("Relay bridge")
+end
+
+function proto.ifname(self)
+	return "relay-" .. self.sid
+end
+
+function proto.opkg_package(self)
+	return "relayd"
+end
+
+function proto.is_installed(self)
+	return nixio.fs.access("/etc/init.d/relayd")
+end
+
+function proto.is_floating(self)
+	return true
+end
+
+function proto.is_virtual(self)
+	return true
+end
+
+function proto.get_interface(self)
+	return device(self.sid, self)
+end
+
+function proto.get_interfaces(self)
+	if not self.ifaces then
+		local ifs = { }
+		local _, net, dev
+
+		for net in luci.util.imatch(self:_get("network")) do
+			net = netmod:get_network(net)
+			if net then
+				dev = net:get_interface()
+				if dev then
+					ifs[dev:name()] = dev
+				end
+			end
+		end
+
+		for dev in luci.util.imatch(self:_get("ifname")) do
+			dev = netmod:get_interface(dev)
+			if dev then
+				ifs[dev:name()] = dev
+			end
+		end
+
+		self.ifaces = { }
+
+		for _, dev in luci.util.kspairs(ifs) do
+			self.ifaces[#self.ifaces+1] = dev
+		end
+	end
+
+	return self.ifaces
+end
+
+function proto.uptime(self)
+	local net
+	local upt = 0
+	for net in luci.util.imatch(self:_get("network")) do
+		net = netmod:get_network(net)
+		if net then
+			upt = math.max(upt, net:uptime())
+		end
+	end
+	return upt
+end
+
+
+function device.__init__(self, ifname, network)
+	self.ifname  = ifname
+	self.network = network
+end
+
+function device.type(self)
+	return "tunnel"
+end
+
+function device.is_up(self)
+	if self.network then
+		local _, dev
+		for _, dev in ipairs(self.network:get_interfaces()) do
+			if not dev:is_up() then
+				return false
+			end
+		end
+		return true
+	end
+	return false
+end
+
+function device._stat(self, what)
+	local v = 0
+	if self.network then
+		local _, dev
+		for _, dev in ipairs(self.network:get_interfaces()) do
+			v = v + dev[what](dev)
+		end
+	end
+	return v
+end
+
+function device.rx_bytes(self) return self:_stat("rx_bytes") end
+function device.tx_bytes(self) return self:_stat("tx_bytes") end
+function device.rx_packets(self) return self:_stat("rx_packets") end
+function device.tx_packets(self) return self:_stat("tx_packets") end
+
+function device.mac(self)
+	if self.network then
+		local _, dev
+		for _, dev in ipairs(self.network:get_interfaces()) do
+			return dev:mac()
+		end
+	end
+end
+
+function device.ipaddrs(self)
+	local addrs = { }
+	if self.network then
+		addrs[1] = luci.ip.IPv4(self.network:_get("ipaddr"))
+	end
+	return addrs
+end
+
+function device.ip6addrs(self)
+	return { }
+end
+
+function device.shortname(self)
+	return "%s %q" % { luci.i18n.translate("Relay"), self.ifname }
+end
+
+function device.get_type_i18n(self)
+	return luci.i18n.translate("Relay Bridge")
+end
diff --git a/trunk/package/luci/themes/bootstrap/Makefile b/trunk/package/luci/themes/bootstrap/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css b/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css
new file mode 100644
index 00000000..9b5ee3a8
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -0,0 +1,1946 @@
+/*!
+ * LuCI Bootstrap Theme
+ * Copyright 2012 Nut & Bolt
+ * By David Menting <david@nut-bolt.nl>
+ * Based on Bootstrap v1.4.0
+ *
+ * Copyright 2011 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+/* Reset.less
+ * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
+ * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
+html {
+	margin: 0;
+	padding: 0;
+}
+
+body {
+	margin: 0;
+	padding: 5px;
+}
+
+h1, h2, h3, h4, h5, h6, p, pre, a, abbr, acronym, code, del, em, img, q, s,
+small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset,
+form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-weight: normal;
+	font-style: normal;
+	font-size: 100%;
+	line-height: 1;
+	font-family: inherit;
+}
+
+abbr[title], acronym[title] {
+	border-bottom: 1px dotted;
+	cursor: help;
+}
+
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+
+ol, ul {
+	list-style: none;
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+	content: "";
+}
+
+html {
+	overflow-y: scroll;
+	font-size: 100%;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
+}
+
+a:focus {
+	outline: thin dotted;
+}
+
+a:hover, a:active {
+	outline: 0;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+	display: block;
+}
+
+sub, sup {
+	font-size: 75%;
+	line-height: 0;
+	position: relative;
+	vertical-align: baseline;
+}
+
+sup {
+	top: -0.5em;
+}
+
+sub {
+	bottom: -0.25em;
+}
+
+img {
+	border: 0;
+	-ms-interpolation-mode: bicubic;
+}
+
+button,
+input,
+select,
+option,
+textarea {
+	font-size: 100%;
+	margin: 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	vertical-align: baseline;
+	*vertical-align: middle;
+}
+
+button, input {
+	line-height: normal;
+	*overflow: visible;
+}
+
+button::-moz-focus-inner, input::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+	cursor: pointer;
+	-webkit-appearance: button;
+}
+
+input[type="search"] {
+	-webkit-appearance: textfield;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+}
+
+input[type="search"]::-webkit-search-decoration {
+	-webkit-appearance: none;
+}
+
+textarea {
+	overflow: auto;
+	vertical-align: top;
+}
+
+/*
+ * Scaffolding
+ * Basic and global styles for generating a grid system, structural layout, and page templates
+ * ------------------------------------------------------------------------------------------- */
+body {
+	background-color: #ffffff;
+	margin: 0;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	color: #404040;
+	padding-top: 58px;
+}
+
+.container {
+	width: 100%;
+	max-width: 940px;
+	margin-left: auto;
+	margin-right: auto;
+	zoom: 1;
+}
+
+.container:before, .container:after {
+	display: table;
+	content: "";
+	zoom: 1;
+}
+
+.container:after {
+	clear: both;
+}
+
+a {
+	color: #0069d6;
+	text-decoration: none;
+	line-height: inherit;
+	font-weight: inherit;
+}
+
+a:hover {
+	color: #00438a;
+	text-decoration: underline;
+}
+
+.pull-right {
+	float: right;
+}
+
+.pull-left {
+	float: left;
+}
+
+/* Typography.less
+ * Headings, body text, lists, code, and more for a versatile and durable typography system
+ * ---------------------------------------------------------------------------------------- */
+p,
+.cbi-map-descr,
+.cbi-section-descr {
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	margin-bottom: 9px;
+}
+
+p small {
+	font-size: 11px;
+	color: #bfbfbf;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-weight: bold;
+	color: #404040;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+	color: #bfbfbf;
+}
+
+h1 {
+	margin-bottom: 18px;
+	font-size: 30px;
+	line-height: 36px;
+}
+
+h1 small {
+	font-size: 18px;
+}
+
+h2 {
+	font-size: 24px;
+	line-height: 36px;
+}
+
+h2 small {
+	font-size: 14px;
+}
+
+h3,
+h4,
+h5,
+h6 {
+	line-height: 36px;
+}
+
+h3 {
+	font-size: 18px;
+}
+
+h3 small {
+	font-size: 14px;
+}
+
+h4 {
+	font-size: 16px;
+}
+
+h4 small {
+	font-size: 12px;
+}
+
+h5 {
+	font-size: 14px;
+}
+
+h6 {
+	font-size: 13px;
+	color: #bfbfbf;
+	text-transform: uppercase;
+}
+
+ul, ol {
+	margin: 0 0 18px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+	margin-bottom: 0;
+}
+
+ul {
+	list-style: disc;
+}
+
+ol {
+	list-style: decimal;
+}
+
+li {
+	line-height: 18px;
+	color: #808080;
+}
+
+ul.unstyled {
+	list-style: none;
+	margin-left: 0;
+}
+
+dl {
+	margin-bottom: 18px;
+}
+
+dl dt, dl dd {
+	line-height: 18px;
+}
+
+dl dt {
+	font-weight: bold;
+}
+
+dl dd {
+	margin-left: 9px;
+}
+
+hr {
+	margin: 20px 0 19px;
+	border: 0;
+	border-bottom: 1px solid #eee;
+}
+
+strong {
+	font-style: inherit;
+	font-weight: bold;
+}
+
+em {
+	font-style: italic;
+	font-weight: inherit;
+	line-height: inherit;
+}
+
+small { font-size: 0.9em }
+
+address {
+	display: block;
+	line-height: 18px;
+	margin-bottom: 18px;
+}
+
+code, pre {
+	padding: 0 3px 2px;
+	font-family: Monaco, Andale Mono, Courier New, monospace;
+	font-size: 12px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+
+code {
+	background-color: #fee9cc;
+	color: rgba(0, 0, 0, 0.75);
+	padding: 1px 3px;
+}
+
+pre {
+	background-color: #f5f5f5;
+	display: block;
+	padding: 8.5px;
+	margin: 0 0 18px;
+	line-height: 18px;
+	font-size: 12px;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, 0.15);
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	white-space: pre;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+/* Forms.less
+ * Base styles for various input types, form layouts, and states
+ * ------------------------------------------------------------- */
+form {
+	margin-bottom: 18px;
+}
+
+fieldset {
+	margin-bottom: 9px;
+	padding-top: 9px;
+}
+
+fieldset legend {
+	display: block;
+	font-size: 19.5px;
+	line-height: 1;
+	color: #404040;
+	padding-top: 20px;
+	*padding: 0 0 5px 0px;
+	/* IE6-7 */
+
+	*line-height: 1.5;
+	/* IE6-7 */
+
+}
+
+form .clearfix,
+form .cbi-value {
+	margin-bottom: 18px;
+	zoom: 1;
+	overflow: hidden;
+}
+
+form .clearfix:before, form .clearfix:after,
+form .cbi-value:before, form .cbi-value:after  {
+	display: table;
+	content: "";
+	zoom: 1;
+}
+
+form .clearfix:after
+form .cbi-value:after {
+	clear: both;
+}
+
+label,
+input,
+select,
+textarea {
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: normal;
+}
+
+form .input,
+form .cbi-value-field {
+	margin-left: 200px;
+}
+
+form .cbi-value label.cbi-value-title {
+	padding-top: 6px;
+	font-size: 13px;
+	line-height: 18px;
+	float: left;
+	width: 180px;
+	text-align: right;
+	color: #404040;
+}
+
+input[type=checkbox], input[type=radio] {
+	cursor: pointer;
+}
+
+input,
+textarea,
+select,
+.uneditable-input {
+	display: inline-block;
+	width: 210px;
+	height: 30px;
+	padding: 4px;
+	font-size: 13px;
+	line-height: 18px;
+	color: #808080;
+	border: 1px solid #ccc;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+
+select {
+	padding: initial;
+}
+
+input[type=checkbox], input[type=radio] {
+	width: auto;
+	height: auto;
+	padding: 0;
+	margin: 3px 0;
+	*margin-top: 0;
+	/* IE6-7 */
+
+	line-height: normal;
+	border: none;
+}
+
+input[type=file] {
+	background-color: #ffffff;
+	padding: initial;
+	border: initial;
+	line-height: initial;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+	width: auto !important;
+}
+
+input[type=button], input[type=reset], input[type=submit] {
+	width: auto;
+	height: auto;
+}
+
+select, input[type=file] {
+	*height: auto;
+	*margin-top: 4px;
+	/* For IE7, add top margin to align select with labels */
+}
+
+select[multiple] {
+	height: inherit;
+	background-color: #ffffff;
+}
+
+textarea {
+	height: auto;
+}
+
+.uneditable-input {
+	background-color: #ffffff;
+	display: block;
+	border-color: #eee;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+	-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+	cursor: not-allowed;
+}
+
+::-moz-placeholder {
+	color: #bfbfbf;
+}
+
+::-webkit-input-placeholder {
+	color: #bfbfbf;
+}
+
+input, textarea {
+	-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+	-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+	-ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+	-o-transition: border linear 0.2s, box-shadow linear 0.2s;
+	transition: border linear 0.2s, box-shadow linear 0.2s;
+	-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+input:focus, textarea:focus {
+	outline: 0;
+	border-color: rgba(82, 168, 236, 0.8);
+	-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+	-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+	outline: 1px dotted #666;
+}
+
+form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline {
+	color: #b94a48;
+}
+
+form .clearfix.error input, form .clearfix.error textarea {
+	color: #b94a48;
+	border-color: #ee5f5b;
+}
+
+form .clearfix.error input:focus, form .clearfix.error textarea:focus {
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+
+form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on {
+	color: #b94a48;
+	background-color: #fce6e6;
+	border-color: #b94a48;
+}
+
+form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline {
+	color: #c09853;
+}
+
+form .clearfix.warning input, form .clearfix.warning textarea {
+	color: #c09853;
+	border-color: #ccae64;
+}
+
+form .clearfix.warning input:focus, form .clearfix.warning textarea:focus {
+	border-color: #be9a3f;
+	-webkit-box-shadow: 0 0 6px #e5d6b1;
+	-moz-box-shadow: 0 0 6px #e5d6b1;
+	box-shadow: 0 0 6px #e5d6b1;
+}
+
+form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on {
+	color: #c09853;
+	background-color: #d2b877;
+	border-color: #c09853;
+}
+
+form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline {
+	color: #468847;
+}
+
+form .clearfix.success input, form .clearfix.success textarea {
+	color: #468847;
+	border-color: #57a957;
+}
+
+form .clearfix.success input:focus, form .clearfix.success textarea:focus {
+	border-color: #458845;
+	-webkit-box-shadow: 0 0 6px #9acc9a;
+	-moz-box-shadow: 0 0 6px #9acc9a;
+	box-shadow: 0 0 6px #9acc9a;
+}
+
+form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on {
+	color: #468847;
+	background-color: #bcddbc;
+	border-color: #468847;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+	background-color: #f5f5f5;
+	border-color: #ddd;
+}
+
+.actions,
+.cbi-page-actions {
+	background: #f5f5f5;
+	margin-bottom: 18px;
+	padding: 17px 20px 18px 150px;
+	border-top: 1px solid #ddd;
+	-webkit-border-radius: 0 0 3px 3px;
+	-moz-border-radius: 0 0 3px 3px;
+	border-radius: 0 0 3px 3px;
+	text-align: right;
+}
+
+.actions .secondary-action,
+.cbi-page-actions .secondary-action{
+	float: right;
+}
+
+.actions .secondary-action a,
+.cbi-page-actions .secondary-action a {
+	line-height: 30px;
+}
+
+.actions .secondary-action a:hover,
+.cbi-page-actions .secondary-action a:hover {
+	text-decoration: underline;
+}
+
+.help-inline, .help-block {
+	font-size: 13px;
+	line-height: 18px;
+	color: #bfbfbf;
+}
+
+.help-inline {
+	padding-left: 5px;
+	*position: relative;
+	/* IE6-7 */
+
+	*top: -5px;
+	/* IE6-7 */
+
+}
+
+.help-block {
+	display: block;
+	max-width: 600px;
+}
+
+/*
+ * Tables.less
+ * Tables for, you guessed it, tabular data
+ * ---------------------------------------- */
+table {
+	width: 100%;
+	margin-bottom: 18px;
+	padding: 0;
+	font-size: 13px;
+	border-collapse: collapse;
+}
+
+table th, table td {
+	padding: 10px 10px 9px;
+	line-height: 18px;
+	text-align: left;
+}
+
+table th {
+	padding-top: 9px;
+	font-weight: bold;
+	vertical-align: middle;
+}
+
+table td {
+	vertical-align: top;
+	border-top: 1px solid #ddd;
+}
+
+table tbody th {
+	border-top: 1px solid #ddd;
+	vertical-align: top;
+}
+
+/* Patterns.less
+ * Repeatable UI elements outside the base styles provided from the scaffolding
+ * ---------------------------------------------------------------------------- */
+header {
+	height: 40px;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 10000;
+	overflow: visible;
+	color: #BFBFBF;
+}
+
+header a {
+	color: #bfbfbf;
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+header h3 a:hover, header .brand:hover, header ul .active > a {
+	background-color: #333;
+	background-color: rgba(255, 255, 255, 0.05);
+	color: #ffffff;
+	text-decoration: none;
+}
+
+header h3 {
+	position: relative;
+}
+
+header h3 a, header .brand {
+	float: left;
+	display: block;
+	padding: 8px 20px 12px;
+	margin-left: -20px;
+	color: #ffffff;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 1;
+}
+
+header p {
+	margin: 0;
+	line-height: 40px;
+}
+
+header .fill {
+	background-color: #222;
+	background-color: #222222;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+	background-image: -moz-linear-gradient(top, #333333, #222222);
+	background-image: -ms-linear-gradient(top, #333333, #222222);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+	background-image: -webkit-linear-gradient(top, #333333, #222222);
+	background-image: -o-linear-gradient(top, #333333, #222222);
+	background-image: linear-gradient(top, #333333, #222222);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+	padding: 0 5px;
+}
+
+header div > ul, .nav {
+	display: block;
+	float: left;
+	margin: 0 10px 0 0;
+	position: relative;
+	left: 0;
+}
+
+header div > ul > li, .nav > li {
+	display: block;
+	float: left;
+}
+
+header div > ul a, .nav a {
+	display: block;
+	float: none;
+	padding: 10px 10px 11px;
+	line-height: 19px;
+	text-decoration: none;
+}
+
+header div > ul a:hover, .nav a:hover {
+	color: #ffffff;
+	text-decoration: none;
+}
+
+header div > ul .active > a, .nav .active > a {
+	background-color: #222;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+
+header div > ul.secondary-nav, .nav.secondary-nav {
+	float: right;
+	margin-left: 10px;
+	margin-right: 0;
+}
+
+header div > ul.secondary-nav .menu-dropdown,
+.nav.secondary-nav .menu-dropdown,
+header div > ul.secondary-nav .dropdown-menu,
+.nav.secondary-nav .dropdown-menu {
+	right: 0;
+	border: 0;
+}
+
+header div > ul a.menu:hover,
+.nav a.menu:hover,
+header div > ul li.open .menu,
+.nav li.open .menu,
+header div > ul .dropdown-toggle:hover,
+.nav .dropdown-toggle:hover,
+header div > ul .dropdown.open .dropdown-toggle,
+.nav .dropdown.open .dropdown-toggle {
+	background: #444;
+	background: rgba(255, 255, 255, 0.05);
+}
+
+header div > ul .menu-dropdown,
+.nav .menu-dropdown,
+header div > ul .dropdown-menu,
+.nav .dropdown-menu {
+	background-color: #333;
+}
+
+header div > ul .menu-dropdown a.menu,
+.nav .menu-dropdown a.menu,
+header div > ul .dropdown-menu a.menu,
+.nav .dropdown-menu a.menu,
+header div > ul .menu-dropdown .dropdown-toggle,
+.nav .menu-dropdown .dropdown-toggle,
+header div > ul .dropdown-menu .dropdown-toggle,
+.nav .dropdown-menu .dropdown-toggle {
+	color: #ffffff;
+}
+
+header div > ul .menu-dropdown a.menu.open,
+.nav .menu-dropdown a.menu.open,
+header div > ul .dropdown-menu a.menu.open,
+.nav .dropdown-menu a.menu.open,
+header div > ul .menu-dropdown .dropdown-toggle.open,
+.nav .menu-dropdown .dropdown-toggle.open,
+header div > ul .dropdown-menu .dropdown-toggle.open,
+.nav .dropdown-menu .dropdown-toggle.open {
+	background: #444;
+	background: rgba(255, 255, 255, 0.05);
+}
+
+header div > ul .menu-dropdown li a,
+.nav .menu-dropdown li a,
+header div > ul .dropdown-menu li a,
+.nav .dropdown-menu li a {
+	color: #999;
+	text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
+}
+
+header div > ul .menu-dropdown li a:hover,
+.nav .menu-dropdown li a:hover,
+header div > ul .dropdown-menu li a:hover,
+.nav .dropdown-menu li a:hover {
+	background-color: #191919;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));
+	background-image: -moz-linear-gradient(top, #292929, #191919);
+	background-image: -ms-linear-gradient(top, #292929, #191919);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));
+	background-image: -webkit-linear-gradient(top, #292929, #191919);
+	background-image: -o-linear-gradient(top, #292929, #191919);
+	background-image: linear-gradient(top, #292929, #191919);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);
+	color: #ffffff;
+}
+
+header div > ul .menu-dropdown .active a,
+.nav .menu-dropdown .active a,
+header div > ul .dropdown-menu .active a,
+.nav .dropdown-menu .active a {
+	color: #ffffff;
+}
+
+header div > ul .menu-dropdown .divider,
+.nav .menu-dropdown .divider,
+header div > ul .dropdown-menu .divider,
+.nav .dropdown-menu .divider {
+	background-color: #222;
+	border-color: #444;
+}
+
+header ul .menu-dropdown li a, header ul .dropdown-menu li a {
+	padding: 4px 15px;
+}
+
+li.menu, .dropdown {
+	position: relative;
+}
+
+a.menu:after, .dropdown-toggle:after {
+	width: 0;
+	height: 0;
+	display: inline-block;
+	content: "&darr;";
+	text-indent: -99999px;
+	vertical-align: top;
+	margin-top: 8px;
+	margin-left: 4px;
+	border-left: 4px solid transparent;
+	border-right: 4px solid transparent;
+	border-top: 4px solid #ffffff;
+	filter: alpha(opacity=50);
+	-khtml-opacity: 0.5;
+	-moz-opacity: 0.5;
+	opacity: 0.5;
+}
+
+.menu-dropdown, .dropdown-menu {
+	background-color: #ffffff;
+	float: left;
+	position: absolute;
+	top: 40px;
+	left: -9999px;
+	z-index: 900;
+	min-width: 160px;
+	max-width: 220px;
+	_width: 160px;
+	margin-left: 0;
+	margin-right: 0;
+	padding: 6px 0;
+	zoom: 1;
+	border-color: #999;
+	border-color: rgba(0, 0, 0, 0.2);
+	border-style: solid;
+	border-width: 0 1px 1px;
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+	-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+	box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+}
+
+.menu-dropdown li, .dropdown-menu li {
+	float: none;
+	display: block;
+	background-color: none;
+}
+
+.menu-dropdown .divider, .dropdown-menu .divider {
+	height: 1px;
+	margin: 5px 0;
+	overflow: hidden;
+	background-color: #eee;
+	border-bottom: 1px solid #ffffff;
+}
+
+header .dropdown-menu a, .dropdown-menu a {
+	display: block;
+	padding: 4px 15px;
+	clear: both;
+	font-weight: normal;
+	line-height: 18px;
+	color: #808080;
+	text-shadow: 0 1px 0 #ffffff;
+}
+
+header .dropdown-menu a:hover,
+.dropdown-menu a:hover,
+header .dropdown-menu a.hover,
+.dropdown-menu a.hover {
+	background-color: #dddddd;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));
+	background-image: -moz-linear-gradient(top, #eeeeee, #dddddd);
+	background-image: -ms-linear-gradient(top, #eeeeee, #dddddd);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));
+	background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd);
+	background-image: -o-linear-gradient(top, #eeeeee, #dddddd);
+	background-image: linear-gradient(top, #eeeeee, #dddddd);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);
+	color: #404040;
+	text-decoration: none;
+	-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+	-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+}
+
+.open .menu,
+.dropdown.open .menu,
+.open .dropdown-toggle,
+.dropdown.open .dropdown-toggle {
+	color: #ffffff;
+	background: #ccc;
+	background: rgba(0, 0, 0, 0.3);
+}
+
+.open .menu-dropdown,
+.dropdown.open .menu-dropdown,
+.open .dropdown-menu,
+.dropdown.open .dropdown-menu {
+	left: 0;
+}
+
+.dropdown:hover ul.dropdown-menu {
+	left: 0;
+}
+
+.dropdown-menu .dropdown-menu {
+	  position: absolute;
+	  left: 159px;
+}
+
+.dropdown-menu li {
+	  position: relative;
+}
+
+.tabs, .cbi-tabmenu {
+	margin: 0 0 18px;
+	padding: 0;
+	list-style: none;
+	zoom: 1;
+}
+
+.tabs:before,
+.cbi-tabmenu:before,
+.tabs:after,
+.cbi-tabmenu:after {
+	display: table;
+	content: "";
+	zoom: 1;
+}
+
+.tabs:after, .cbi-tabmenu:after {
+	clear: both;
+}
+
+.tabs > li, .cbi-tabmenu > li {
+	float: left;
+}
+
+.tabs > li > a, .cbi-tabmenu > li > a {
+	display: block;
+}
+
+.tabs,
+.cbi-tabmenu {
+	border-color: #ddd;
+	border-style: solid;
+	border-width: 0 0 1px;
+}
+
+.tabs > li,
+.cbi-tabmenu > li {
+	position: relative;
+	margin-bottom: -1px;
+}
+
+.tabs > li > a,
+.cbi-tabmenu > li > a {
+	padding: 0 15px;
+	margin-right: 2px;
+	line-height: 34px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+
+.tabs > li > a:hover,
+.cbi-tabmenu > li > a:hover {
+	text-decoration: none;
+	background-color: #eee;
+	border-color: #eee #eee #ddd;
+}
+
+.tabs .active > a, .tabs .active > a:hover,
+.cbi-tabmenu .active > a, .cbi-tabmenu .active > a:hover,
+.cbi-tab > a:link, .cbi-tab > a:hover {
+	color: #808080;
+	background-color: #ffffff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent;
+	cursor: default;
+}
+
+.tabs .menu-dropdown, .tabs .dropdown-menu,
+.cbi-tabmenu .menu-dropdown, .cbi-tabmenu .dropdown-menu {
+	top: 35px;
+	border-width: 1px;
+	-webkit-border-radius: 0 6px 6px 6px;
+	-moz-border-radius: 0 6px 6px 6px;
+	border-radius: 0 6px 6px 6px;
+}
+
+.tabs a.menu:after, .tabs .dropdown-toggle:after,
+.cbi-tabmenu a.menu:after, .cbi-tabmenu .dropdown-toggle:after {
+	border-top-color: #999;
+	margin-top: 15px;
+	margin-left: 5px;
+}
+
+.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle,
+.cbi-tabmenu li.open.menu .menu, .cbi-tabmenu .open.dropdown .dropdown-toggle {
+	border-color: #999;
+}
+
+.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after,
+.cbi-tabmenu li.open a.menu:after, .cbi-tabmenu .dropdown.open .dropdown-toggle:after {
+	border-top-color: #555;
+}
+
+.tab-content > .tab-pane,
+.tab-content > div {
+	display: none;
+}
+
+.tab-content > .active {
+	display: block;
+}
+
+.breadcrumb {
+	padding: 7px 14px;
+	margin: 0 0 18px;
+	background-color: #f5f5f5;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
+	background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
+	background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: linear-gradient(top, #ffffff, #f5f5f5);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+	border: 1px solid #ddd;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: inset 0 1px 0 #ffffff;
+	-moz-box-shadow: inset 0 1px 0 #ffffff;
+	box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.breadcrumb li {
+	display: inline;
+	text-shadow: 0 1px 0 #ffffff;
+}
+
+.breadcrumb .divider {
+	padding: 0 5px;
+	color: #bfbfbf;
+}
+
+.breadcrumb .active a {
+	color: #404040;
+}
+
+footer {
+	margin-top: 17px;
+	padding-top: 17px;
+	border-top: 1px solid #eee;
+}
+
+.btn.danger,
+.alert-message.danger,
+.btn.danger:hover,
+.alert-message.danger:hover,
+.btn.error,
+.alert-message.error,
+.btn.error:hover,
+.alert-message.error:hover,
+.btn.success,
+.alert-message.success,
+.btn.success:hover,
+.alert-message.success:hover,
+.btn.info,
+.alert-message.info,
+.btn.info:hover,
+.alert-message.info:hover {
+	color: #ffffff;
+}
+
+.btn .close, .alert-message .close {
+	font-family: Arial, sans-serif;
+	line-height: 18px;
+}
+
+.btn.danger,
+.alert-message.danger,
+.btn.error,
+.alert-message.error {
+	background-color: #c43c35;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+	background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+	background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+	background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+	background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+	background-image: linear-gradient(top, #ee5f5b, #c43c35);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	border-color: #c43c35 #c43c35 #882a25;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.btn.success, .alert-message.success {
+	background-color: #57a957;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
+	background-image: -moz-linear-gradient(top, #62c462, #57a957);
+	background-image: -ms-linear-gradient(top, #62c462, #57a957);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
+	background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+	background-image: -o-linear-gradient(top, #62c462, #57a957);
+	background-image: linear-gradient(top, #62c462, #57a957);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	border-color: #57a957 #57a957 #3d773d;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.btn.info, .alert-message.info {
+	background-color: #339bb9;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
+	background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+	background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
+	background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+	background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+	background-image: linear-gradient(top, #5bc0de, #339bb9);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	border-color: #339bb9 #339bb9 #22697d;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.btn,
+.cbi-button {
+	cursor: pointer;
+	display: inline-block;
+	background-color: #e6e6e6;
+	background-repeat: no-repeat;
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+	padding: 5px 14px 6px;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	color: #333;
+	font-size: 13px;
+	line-height: normal;
+	border: 1px solid #ccc;
+	border-bottom-color: #bbb;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover,
+.cbi-button:hover {
+	color: #333;
+	text-decoration: none;
+}
+
+.btn:focus,
+.cbi-button:focus {
+	outline: 1px dotted #666;
+}
+
+.btn.primary,
+.cbi-page-actions .cbi-button-apply,
+.cbi-page-actions .cbi-button-save,
+.cbi-page-actions .cbi-button-reset {
+	color: #ffffff;
+	padding: 5px 14px 6px;
+	background-color: #0064cd;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+	background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+	background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+	background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+	background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+	background-image: linear-gradient(top, #049cdb, #0064cd);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	border-color: #0064cd #0064cd #003f81;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.cbi-input-invalid,
+.cbi-value-error input {
+	color: #FF0000;
+	border-color: #FF0000;
+}
+
+.cbi-button-up,
+.cbi-input-up {
+	background-position: center center;
+	background-image: url('../resources/cbi/up.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/up.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/up.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/up.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/up.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/up.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-down,
+.cbi-input-down {
+	background-position: center center;
+	background-image: url('../resources/cbi/down.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/down.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/down.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/down.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/down.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/down.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-find,
+.cbi-input-find {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/find.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/find.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/find.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/find.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/find.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/find.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-add,
+.cbi-input-add {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/add.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/add.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/add.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/add.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/add.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/add.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-apply,
+.cbi-input-apply {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/apply.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/apply.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/apply.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/apply.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/apply.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/apply.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-reset,
+.cbi-input-reset {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/reset.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/reset.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reset.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reset.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reset.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reset.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-edit,
+.cbi-input-edit {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/edit.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/edit.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/edit.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/edit.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/edit.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/edit.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-remove,
+.cbi-input-remove {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/remove.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/remove.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/remove.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/remove.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/remove.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/remove.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-reload,
+.cbi-input-reload {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/reload.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/reload.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reload.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reload.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reload.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/reload.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-link,
+.cbi-input-link {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/link.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/link.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/link.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/link.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/link.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/link.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.cbi-button-download,
+.cbi-input-download {
+	background-position: 6px center, left top;
+	padding-left: 28px;
+	background-image: url('../resources/cbi/download.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: url('../resources/cbi/download.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/download.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/download.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/download.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: url('../resources/cbi/download.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+}
+
+.btn.active, .btn:active {
+	-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled {
+	cursor: default;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	filter: alpha(opacity=65);
+	-khtml-opacity: 0.65;
+	-moz-opacity: 0.65;
+	opacity: 0.65;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+
+.btn[disabled] {
+	cursor: default;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	filter: alpha(opacity=65);
+	-khtml-opacity: 0.65;
+	-moz-opacity: 0.65;
+	opacity: 0.65;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+
+.btn.large {
+	font-size: 15px;
+	line-height: normal;
+	padding: 9px 14px 9px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+
+.btn.small {
+	padding: 7px 9px 7px;
+	font-size: 11px;
+}
+
+/* Button icons for specific pages */
+.Startup .cbi-section-table input.cbi-input-apply,
+.Startup .cbi-section-table input.cbi-button-apply {
+	  background-image: url("../resources/cbi/apply.gif");
+	  background-position: 7px 4px;
+	  padding: 3px 9px 3px 27px;
+}
+
+.Processes .cbi-section-table input.cbi-input-reload,
+.Startup .cbi-section-table input.cbi-input-reload {
+	  background-image: url("../resources/cbi/reload.gif");
+	  background-position: 7px 4px;
+	  padding: 3px 9px 3px 27px;
+}
+
+.Processes .cbi-section-table input.cbi-input-remove,
+.Processes .cbi-section-table div.cbi-section-remove input,
+.Startup .cbi-section-table input.cbi-input-remove,
+.Startup .cbi-section-table div.cbi-section-remove input  {
+	  background-image: url("../resources/cbi/remove.gif");
+	  background-position: 7px 4px;
+	  padding: 3px 9px 3px 27px;
+}
+
+.Processes .cbi-section-table input.cbi-input-reset,
+.Processes .cbi-section-table input.cbi-button-reset,
+.Startup .cbi-section-table input.cbi-input-reset,
+.Startup .cbi-section-table input.cbi-button-reset  {
+	  background-image: url("../resources/cbi/reset.gif");
+	  background-position: 7px 4px;
+	  padding: 3px 9px 3px 27px;
+}
+
+.Startup .cbi-section-table input.cbi-input-save,
+.Startup .cbi-section-table input.cbi-button-save {
+	  background-image: url("../resources/cbi/save.gif");
+	  background-position: 7px 4px;
+	  padding: 3px 9px 3px 27px;
+}
+
+:root .alert-message, :root .btn {
+	border-radius: 0 0;
+}
+
+button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+
+.close {
+	float: right;
+	color: #000000;
+	font-size: 20px;
+	font-weight: bold;
+	line-height: 13.5px;
+	text-shadow: 0 1px 0 #ffffff;
+	filter: alpha(opacity=25);
+	-khtml-opacity: 0.25;
+	-moz-opacity: 0.25;
+	opacity: 0.25;
+}
+
+.close:hover {
+	color: #000000;
+	text-decoration: none;
+	filter: alpha(opacity=40);
+	-khtml-opacity: 0.4;
+	-moz-opacity: 0.4;
+	opacity: 0.4;
+}
+
+.alert-message {
+	position: relative;
+	padding: 7px 15px;
+	margin-bottom: 18px;
+	color: #404040;
+	background-color: #eedc94;
+	background-repeat: repeat-x;
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+	background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+	background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+	background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+	background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+	background-image: linear-gradient(top, #fceec1, #eedc94);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	border-color: #eedc94 #eedc94 #e4c652;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+	border-width: 1px;
+	border-style: solid;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.alert-message .close {
+	margin-top: 1px;
+	*margin-top: 0;
+}
+
+.alert-message a {
+	font-weight: bold;
+	color: #404040;
+}
+
+.alert-message.danger p a,
+.alert-message.error p a,
+.alert-message.success p a,
+.alert-message.info p a {
+	color: #ffffff;
+}
+
+.alert-message h5 {
+	line-height: 18px;
+}
+
+.alert-message p {
+	margin-bottom: 0;
+}
+
+.alert-message div {
+	margin-top: 5px;
+	margin-bottom: 2px;
+	line-height: 28px;
+}
+
+.alert-message .btn {
+	-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+	-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+	box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.label {
+	padding: 1px 3px 2px;
+	font-size: 9.75px;
+	font-weight: bold;
+	color: #ffffff !important;
+	text-transform: uppercase;
+	white-space: nowrap;
+	background-color: #bfbfbf;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	text-shadow: none;
+}
+
+a.label:link,
+a.label:visited {
+	color: #ffffff;
+}
+
+a.label:hover {
+	text-decoration: none;
+}
+
+.label.important {
+	background-color: #c43c35;
+}
+
+.label.warning {
+	background-color: #f89406;
+}
+
+.label.success {
+	background-color: #46a546;
+}
+
+.label.notice {
+	background-color: #62cffc;
+}
+
+/* LuCI specific items */
+.hidden { display: none }
+
+#memtotal > div,
+#memfree > div,
+#memcache > div,
+#membuff > div,
+#conns > div  {
+	  border: 1px solid #CCCCCC;
+	  border-radius: 3px 3px 3px 3px;
+	  color: #808080;
+	  display: inline-block;
+	  font-size: 13px;
+	  height: 22 dpx;
+	  line-height: 18px;
+}
+
+#xhr_poll_status {
+	  cursor: pointer;
+}
+
+form.inline { display: inline }
+
+header .pull-right { padding-top: 8px; }
+
+#modemenu li:last-child span.divider { display: none }
+
+#syslog {  width: 100%; }
+
+.cbi-section-table tbody tr:nth-child(odd) td, .cbi-section-table tbody tr:nth-child(odd) th {
+	background-color: #f9f9f9;
+}
+
+.cbi-section-table tbody tr:hover td, .cbi-section-table tbody tr:hover th  {
+	background-color: #f5f5f5;
+}
+
+.cbi-section-table tr.cbi-section-table-descr th {
+	font-weight: normal;
+}
+
+.left { text-align: left !important; }
+
+.right { text-align: right !important; }
+
+.cbi-value-field { line-height: 1.5em; }
+
+.cbi-value-field input[type=checkbox],
+.cbi-value-field input[type=radio] {
+	margin-top: 8px;
+	margin-right: 6px;
+}
+
+table table td,
+.cbi-value-field table td {
+	border: none;
+}
+
+table.cbi-section-table input,
+table.cbi-section-table textarea,
+table.cbi-section-table select {
+	width: auto;
+}
+
+table.cbi-section-table td.cbi-section-table-cell {
+	white-space: nowrap;
+	text-align: right;
+}
+
+table.cbi-section-table td.cbi-section-table-cell select {
+	width: inherit;
+}
+
+.cbi-value-description { display: inline; }
+
+.cbi-value-description img { vertical-align: middle; }
+
+.cbi-section-error {
+	border: 1px solid #FF0000;
+	border-radius: 3px;
+	background-color: #FCE6E6;
+	padding: 5px;
+}
+
+.cbi-section-error ul { margin: 0 0 0 20px; }
+
+.cbi-section-error ul li {
+	color: #FF0000;
+	font-weight: bold;
+}
+
+.ifacebox {
+	background-color: #FFFFFF;
+	border: 1px solid #CCCCCC;
+	margin: 0 10px;
+	text-align: center;
+	white-space: nowrap;
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.ifacebox .ifacebox-head {
+	border-bottom: 1px solid #CCCCCC;
+	padding: 2px;
+}
+
+.ifacebox .ifacebox-body {
+	padding: 6px;
+}
+
+.ifacebadge {
+	display: inline-block;
+	white-space: nowrap;
+	background-color: #FFFFFF;
+	border: 1px solid #CCCCCC;
+	padding: 2px;
+	margin-left: 2px;
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.ifacebadge-active {
+	border-color: #000000;
+	font-weight: bold;
+}
+
+.zonebadge {
+	padding: 2px;
+	border-radius: 4px;
+	display: inline-block;
+	white-space: nowrap;
+	color: #666666;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	cursor: pointer;
+}
+
+.zonebadge > em,
+.zonebadge > strong {
+	margin: 5px;
+	display: inline-block;
+}
+
+.zonebadge input {
+	width: 6em;
+}
+
+.zonebadge-empty {
+	border: 1px dashed #AAAAAA;
+	color: #AAAAAA;
+	font-style: italic;
+	font-size: smaller;
+}
+
+div.cbi-value var,
+td.cbi-value-field var {
+	font-style: italic;
+	color: #0069D6;
+}
+
+.uci-change-list {
+	font-family: monospace;
+}
+
+.uci-change-list ins,
+.uci-change-legend-label ins {
+	text-decoration: none;
+	border: 1px solid #00FF00;
+	background-color: #CCFFCC;
+	display: block;
+	padding: 2px;
+}
+
+.uci-change-list del,
+.uci-change-legend-label del {
+	text-decoration: none;
+	border: 1px solid #FF0000;
+	background-color: #FFCCCC;
+	display: block;
+	font-style: normal;
+	padding: 2px;
+}
+
+.uci-change-list var,
+.uci-change-legend-label var {
+	text-decoration: none;
+	border: 1px solid #CCCCCC;
+	background-color: #EEEEEE;
+	display: block;
+	font-style: normal;
+	padding: 2px;
+}
+
+.uci-change-list var ins,
+.uci-change-list var del {
+	/*display: inline;*/
+	border: none;
+	white-space: pre;
+	font-style: normal;
+	padding: 0px;
+}
+
+.uci-change-legend {
+	padding: 5px;
+}
+
+.uci-change-legend-label {
+	width: 150px;
+	float: left;
+}
+
+.uci-change-legend-label>ins,
+.uci-change-legend-label>del,
+.uci-change-legend-label>var {
+	float: left;
+	margin-right: 4px;
+	width: 10px;
+	height: 10px;
+	display: block;
+}
+
+.uci-change-legend-label var ins,
+.uci-change-legend-label var del {
+	line-height: 6px;
+	border: none;
+}
diff --git a/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/favicon.ico b/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..77a138ba0c53da3f891857646887710d4b472fdd
GIT binary patch
literal 1150
zcmZQzU<5(|0R}M0U}0bo1F|%L7$l?s#Ef7P$N<U_1L9+2I99J%{vR0w#UhB&i>wD5
zyD&e$2Aer)Damoz)Z-BQhHeH9btry7R<n4){BD>T$l_@13qXDgni$+neEMN>FdArv
z0lGQBFs%lPtwI-v>Tv?n|DhPfW<Xbmiw{x@1TeiY8l>M1mmXwsh<2>{OOVxp*g!w@
zqKiTG6Xkx8S{(YJ#vmwkbwIoQ(e*=B!~Bd+gY5bTGY4TZ#0^ONRX{enUXU0V0QLV(
zPE1sV@sVhl9&mgiiG!HP;ejTF!iAZEi$+n5hl8yD3NCej>=_t7@G~$xU}j)Az{tSR
l0L0A?85r0SfW?IY1cTV^K(P)%28J8b3=GeoL-c_30szk#m9qc<

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js b/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js
new file mode 100644
index 00000000..1ec510f2
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js
@@ -0,0 +1,3 @@
+// HTML5 Shiv v3 | @jon_neal @afarkas @rem | MIT/GPL2 Licensed
+// Uncompressed source: https://github.com/aFarkas/html5shiv
+(function(a,b){function f(a){var c,d,e,f;b.documentMode>7?(c=b.createElement("font"),c.setAttribute("data-html5shiv",a.nodeName.toLowerCase())):c=b.createElement("shiv:"+a.nodeName);while(a.firstChild)c.appendChild(a.childNodes[0]);for(d=a.attributes,e=d.length,f=0;f<e;++f)d[f].specified&&c.setAttribute(d[f].nodeName,d[f].nodeValue);c.style.cssText=a.style.cssText,a.parentNode.replaceChild(c,a),c.originalElement=a}function g(a){var b=a.originalElement;while(a.childNodes.length)b.appendChild(a.childNodes[0]);a.parentNode.replaceChild(b,a)}function h(a,b){b=b||"all";var c=-1,d=[],e=a.length,f,g;while(++c<e){f=a[c],g=f.media||b;if(f.disabled||!/print|all/.test(g))continue;d.push(h(f.imports,g),f.cssText)}return d.join("")}function i(c){var d=new RegExp("(^|[\\s,{}])("+a.html5.elements.join("|")+")","gi"),e=c.split("{"),f=e.length,g=-1;while(++g<f)e[g]=e[g].split("}"),b.documentMode>7?e[g][e[g].length-1]=e[g][e[g].length-1].replace(d,'$1font[data-html5shiv="$2"]'):e[g][e[g].length-1]=e[g][e[g].length-1].replace(d,"$1shiv\\:$2"),e[g]=e[g].join("}");return e.join("{")}var c=function(a){return a.innerHTML="<x-element></x-element>",a.childNodes.length===1}(b.createElement("a")),d=function(a,b,c){return b.appendChild(a),(c=(c?c(a):a.currentStyle).display)&&b.removeChild(a)&&c==="block"}(b.createElement("nav"),b.documentElement,a.getComputedStyle),e={elements:"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video".split(" "),shivDocument:function(a){a=a||b;if(a.documentShived)return;a.documentShived=!0;var f=a.createElement,g=a.createDocumentFragment,h=a.getElementsByTagName("head")[0],i=function(a){f(a)};c||(e.elements.join(" ").replace(/\w+/g,i),a.createElement=function(a){var b=f(a);return b.canHaveChildren&&e.shivDocument(b.document),b},a.createDocumentFragment=function(){return e.shivDocument(g())});if(!d&&h){var j=f("div");j.innerHTML=["x<style>","article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}","audio{display:none}","canvas,video{display:inline-block;*display:inline;*zoom:1}","[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}","mark{background:#FF0;color:#000}","</style>"].join(""),h.insertBefore(j.lastChild,h.firstChild)}return a}};e.shivDocument(b),a.html5=e;if(c||!a.attachEvent)return;a.attachEvent("onbeforeprint",function(){if(a.html5.supportsXElement||!b.namespaces)return;b.namespaces.shiv||b.namespaces.add("shiv");var c=-1,d=new RegExp("^("+a.html5.elements.join("|")+")$","i"),e=b.getElementsByTagName("*"),g=e.length,j,k=i(h(function(a,b){var c=[],d=a.length;while(d)c.unshift(a[--d]);d=b.length;while(d)c.unshift(b[--d]);c.sort(function(a,b){return a.sourceIndex-b.sourceIndex}),d=c.length;while(d)c[--d]=c[d].styleSheet;return c}(b.getElementsByTagName("style"),b.getElementsByTagName("link"))));while(++c<g)j=e[c],d.test(j.nodeName)&&f(j);b.appendChild(b._shivedStyleSheet=b.createElement("style")).styleSheet.cssText=k}),a.attachEvent("onafterprint",function(){if(a.html5.supportsXElement||!b.namespaces)return;var c=-1,d=b.getElementsByTagName("*"),e=d.length,f;while(++c<e)f=d[c],f.originalElement&&g(f);b._shivedStyleSheet&&b._shivedStyleSheet.parentNode.removeChild(b._shivedStyleSheet)})})(this,document)
\ No newline at end of file
diff --git a/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css b/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css
new file mode 100644
index 00000000..e9d9b61a
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css
@@ -0,0 +1,3 @@
+header h3 a, header .brand {
+	display:none !important;
+}
diff --git a/trunk/package/luci/themes/bootstrap/ipkg/postinst b/trunk/package/luci/themes/bootstrap/ipkg/postinst
new file mode 100755
index 00000000..8a2dd18d
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-theme-bootstrap ) &&	rm -f /etc/uci-defaults/luci-theme-bootstrap
+}
diff --git a/trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm b/trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm
new file mode 100644
index 00000000..09b497a1
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm
@@ -0,0 +1,41 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2012 David Menting <david@nut-bolt.nl>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+<%
+	local disp = require "luci.dispatcher"
+
+	local request  = disp.context.path
+
+	local category = request[1]
+
+	local tree = disp.node()
+
+	local categories = disp.node_childs(tree)
+%>
+   <footer><a href="http://luci.subsignal.org/">Powered by <%= luci.__appname__ .. " (" .. luci.__version__ .. ")" %></a>
+
+    <%=luci.version.distversion%>
+
+    <% if #categories > 1 then %>
+     <ul class="breadcrumb pull-right" id="modemenu">
+	    <% for i, r in ipairs(categories) do %>
+		    <li<% if request[1] == r then %> class="active"<%end%>><a href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a> <span class="divider">|</span></li>
+	    <% end %>
+     </ul>
+    <% end %>
+   </footer>
+   </div>
+  </div>
+ </body>
+</html>
+
diff --git a/trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm b/trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
new file mode 100644
index 00000000..12818cbc
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -0,0 +1,209 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2012 David Menting <david@nut-bolt.nl>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+-%>
+<%
+	local sys  = require "luci.sys"
+	local http = require "luci.http"
+	local disp = require "luci.dispatcher"
+
+	local hostname = sys.hostname()
+
+	local request  = disp.context.path
+	local request2 = disp.context.request
+
+	local category = request[1]
+	local cattree  = category and disp.node(category)
+
+	local leaf = request2[#request2]
+
+	local tree = disp.node()
+	local node = disp.context.dispatched
+
+	local categories = disp.node_childs(tree)
+
+	local c = tree
+	local i, r
+
+	-- tag all nodes leading to this page
+	for i, r in ipairs(request) do
+		if c.nodes and c.nodes[r] then
+			c = c.nodes[r]
+			c._menu_selected = true
+		end
+	end
+    
+    -- send as HTML5
+	http.prepare_content("text/html")
+
+	local function nodeurl(prefix, name, query)
+		local url = controller .. prefix .. name .. "/"
+		if query then
+			url = url .. http.build_querystring(query)
+		end
+		return pcdata(url)
+	end
+
+	local function subtree(prefix, node, level)
+		if not level then
+			level = 1
+		end
+
+		local childs = disp.node_childs(node)
+		if #childs > 0 then
+        
+            if level > 2 then
+%>
+	<ul class="tabs">
+		<%  
+            end
+
+			local selected_node
+			local selected_name
+			local i, v
+
+			for i, v in ipairs(childs) do
+				local nnode = node.nodes[v]
+				if nnode._menu_selected then
+					selected_node = nnode
+					selected_name = v
+				end
+                if level > 2 then
+		%>
+			<li class="tabmenu-item-<%=v%><%- if nnode._menu_selected or (node.leaf and v == leaf) then %> active<% end %>">
+			    <a href="<%=nodeurl(prefix, v, nnode.query)%>"><%=striptags(translate(nnode.title))%></a>
+			</li>
+		<%      end
+			end
+            
+            if level > 2 then
+		%>
+	</ul>
+<%          end
+
+			if selected_node then
+				subtree(prefix .. selected_name .. "/", selected_node, level + 1)
+			end
+		end
+	end
+-%>
+<!DOCTYPE html>
+<html lang="<%=luci.i18n.context.lang%>">
+ <head>
+  <meta charset="utf-8">
+  <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
+  <!--[if lt IE 9]><script src="<%=media%>/html5.js"></script><![endif]-->
+  <meta name="viewport" content="initial-scale=1.0">
+  <link rel="stylesheet" href="<%=media%>/cascade.css">
+  <link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css" type="text/css" />
+  <link rel="shortcut icon" href="<%=media%>/favicon.ico">
+  <% if node and node.css then %><link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
+  <% end -%>
+  <% if css then %><style title="text/css">
+  <%-= css %>
+  </style>
+  <% end -%>
+  <script src="<%=resource%>/xhr.js"></script>
+ </head>
+
+ <body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %>">
+  <header>
+   <div class="fill">
+    <div class="container">
+     <a class="brand" href="#"><%=hostname%></a>
+     <ul class="nav">
+	 <%-
+		local function submenu(prefix, node)
+			local childs = disp.node_childs(node)
+			if #childs > 0 then
+	 %>
+	 <ul class="dropdown-menu">
+			<%-
+				for i, r in ipairs(childs) do
+					local nnode = node.nodes[r]
+					local href  = controller .. prefix .. r ..
+						(nnode.query and http.build_querystring(nnode.query) or "")
+			%>
+	  <li><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a></li>
+			<%-
+				end
+			%>
+	</ul>
+	<%-
+			end
+		end
+
+		childs = disp.node_childs(cattree)
+
+		if #childs > 0 then
+			for i, r in ipairs(childs) do
+				local nnode = cattree.nodes[r]
+				local href  = controller .. "/" .. category .. "/" .. r ..
+					(nnode.query and http.build_querystring(k.query) or "")
+                local grandchildren = disp.node_childs(nnode)
+                
+                if #grandchildren > 0 then
+	%>
+        <li class="dropdown">
+            <a class="menu" href="#"><%=pcdata(striptags(translate(nnode.title)))%></a>
+            <%- submenu("/" .. category .. "/" .. r .. "/", nnode) %>
+        </li>
+	<%          else %>
+         <li>
+	        <a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a>
+        </li> 
+    <%
+                end
+			end
+		end
+	%>
+	</ul>
+
+	<%
+        -- calculate the number of unsaved changes
+		if tree.nodes[category] and tree.nodes[category].ucidata then
+			local ucichanges = 0
+
+			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
+				for k, l in pairs(j) do
+					for m, n in pairs(l) do
+						ucichanges = ucichanges + 1;
+					end
+				end
+			end
+	%>
+	<div class="pull-right">
+	<% if ucichanges > 0 then %>
+	  <a class="label notice" href="<%=controller%>/<%=category%>/uci/changes"><%:Unsaved Changes%>: <%=ucichanges%></a>
+	<% end %>
+      <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
+       <span class="label success" id="xhr_poll_status_on"><%:Auto Refresh%> <%:on%></span>
+       <span class="label" id="xhr_poll_status_off" style="display:none"><%:Auto Refresh%> <%:off%></span>
+      </span>
+     </div>
+	<% end %>
+    </div>
+   </div>
+  </header>
+
+<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
+<div class="container">
+	<div class="alert-message warning">
+		<h4><%:No password set!%></h4>
+		<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%><br>
+        <a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a>
+	</div>
+</div>
+<%- end -%>
+
+<div id="maincontent" class="container">
+<% if category then subtree("/" .. category .. "/", cattree) end %>
diff --git a/trunk/package/luci/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap b/trunk/package/luci/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
new file mode 100755
index 00000000..ddefd3b0
--- /dev/null
+++ b/trunk/package/luci/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.themes.Bootstrap=/luci-static/bootstrap
+	commit luci
+EOF
+exit 0
diff --git a/trunk/package/luci/themes/freifunk-bno/Makefile b/trunk/package/luci/themes/freifunk-bno/Makefile
new file mode 100644
index 00000000..81a96f6a
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-bno/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
new file mode 100644
index 00000000..4f89b2d3
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
@@ -0,0 +1,872 @@
+* {
+	margin: 0;
+	padding: 0;
+}
+
+body {
+	background-color: #ffffff;
+	color: #ffffff;
+	font-family: Verdana, Arial, sans-serif;
+	font-size: 100%;
+	line-height: 100%;
+	background-image: url(images/main-back.png);
+	background-repeat: repeat-x;
+	background-position: left bottom;
+	}
+#all {
+        margin: 0px;
+	padding: 0px;
+        min-height: 800px;
+}
+
+code {
+	font-family: monospace;
+	white-space: pre;
+}
+
+a:link, a:visited {
+	color:#000000;
+	font-weight:bold;
+	text-decoration:none;
+	}
+a:hover {
+	color:#333333;
+	font-weight:bold;
+	}
+
+/* Custom*/
+ #wrapper
+{
+	width: 95%;
+	color: #333333;
+	margin-left: auto;
+	margin-right: auto;
+/*	background-image: url(images/corner-left.gif); 	*/
+/*	background-repeat: no-repeat;			*/
+/*	background-position: left bottom;		*/
+	background-color: #FffdF4;
+	min-width: 710px;
+   min-height: 710px;
+}
+#main {
+  clear: both;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  color: #333333;
+/*  background-image: url(images/corner-right.gif);	*/
+/*  background-repeat: no-repeat;			*/
+/*  background-position: right bottom;			*/
+   min-height: 710px;
+}
+
+div#maincontent ul {
+	margin-left: 2em;
+}
+
+.warning {
+	color: red !important;
+	font-weight: bold;
+}
+
+.clear {
+	clear: both;
+	height: 1px;
+}
+
+.hidden {
+	display: none;
+}
+
+.error {
+	color: #ff0000;
+}
+
+#header
+{
+ padding: 0px;
+ height: 100px;
+}
+#headerleft
+{
+ height: 100px;
+ background-color: #FFFfff;
+ background-image: url(images/header-left.gif);
+ background-repeat: no-repeat;
+ background-position: left top;
+}
+#headerright
+{
+ height: 100px;
+ background-color: #FFfffF;
+
+ margin-left: 5px;
+ background-image: url(images/header-right.gif);
+ background-repeat: no-repeat;
+ background-position: right top;
+}
+
+#headerback
+{
+ margin-right: 5px;
+ height: 100px;
+ background-color: #FFfffF;
+ background-image: url(images/header-back.gif);
+ background-repeat: repeat-x;
+ background-position: left top;
+}
+#schriftzug {
+ font-size : 1.5em;
+ text-align:left;
+ margin-bottom: 7px;
+ margin-top: 7px;
+ float:left;
+ width: 450px;
+}
+
+#schriftzug a:hover{
+ background-color:transparent;
+}
+#logo{
+ margin-top: 5px;
+ float:right;
+ width: 115px;
+}
+
+.pathbar {
+	display: none;
+}
+
+.menubar {
+	width: 100%;
+	min-height: 1.8em;
+	background: #ffffff;
+	color: #000000;
+	border-top:0.4em solid #DC0067;
+}
+
+.mainmenu {
+	float: left;
+	width: auto;
+	min-height: 1.8em;
+	background: #ffffff;
+	color: #000000;
+}
+.modemenu li {
+	border-top:0.3em solid #DC0067;
+	margin-left:  0.3em;
+	margin-top:  -0.3em;
+}
+.mainmenu div {
+	float: left;
+	border-top:0.3em solid #DC0067;
+	margin-right:  0.3em;
+	margin-top:  -0.3em;
+}
+.mainmenu div.preactive {
+	border-top: 0.3em solid #FFCB05;
+	margin-top:  -0.2em;
+}
+
+.mainmenu li {
+	white-space: nowrap;
+}
+
+.mainmenu div ul {
+	display: none;
+	position: absolute;
+	background: #ffffff;
+	color: #000000;
+	border-width: 0 1px 1px 1px;
+	border-style: solid;
+	border-color: #444444;
+	list-style-type: none;
+}
+
+.mainmenu ul li:hover > ul,
+.mainmenu div:hover > ul {
+	display: block;
+}
+
+.mainmenu ul li > ul {
+	left: 100%;
+	margin-top: -1.8em;
+	border-width: 1px;
+}
+
+.modemenu a,
+.mainmenu a {
+	display: block;
+	padding: 0.2em;
+	color: #000000;
+	text-decoration: none;
+	font-size: 70%;
+	font-weight: bold;
+}
+
+
+.modemenu .active a {
+	color: #000000;
+	font-weight: bold;
+	border-top:0.3em solid #FFCB05;
+	margin-top:  -0.2em;
+}
+.mainmenu .active a{
+	color: #000000;
+	font-weight: bold;
+	border-top:0.2em solid #FFCB05;
+}
+.mainmenu li > span:active {
+	background-color: #FFE990;
+}
+
+.mainmenu li:hover > span > a,
+.mainmenu div:hover > a {
+color: #ffffff;
+background-color: #FFCB05;
+}
+
+
+.modemenu a:focus,
+.mainmenu a:focus {
+	color: #000000;
+}
+
+.mainmenu a:hover,
+.modemenu a:hover {
+color: #ffffff;
+background-color: #FFCB05;
+}
+
+.mainmenu div.preactive > a {
+	color: #DC0067;
+	font-weight: bold;
+}
+.mainmenu div.preactive > a:hover,
+.mainmenu div.preactive > a:focus {
+	color: #ffffff;
+	font-weight: bold;
+}
+
+.modemenu ul {
+	width: auto;
+	background: #000000;
+	color: #ffffff;
+	list-style-type: none;
+}
+
+.modemenu li {
+	float: right;
+
+}
+
+#maincontent {
+	clear: both;
+	width: 98%;
+	margin: 0 auto;
+	padding: 0.5em;
+	background: #FFF4BE;
+	color: #000000;
+	font-size: 80%;
+	border-top:1px solid #D2A800;
+}
+
+#maincontent h2 {
+	margin: 0.25em 0 0.5em 0;
+	font-size: 150%;
+	font-weight: normal;
+}
+
+#maincontent h3 {
+	margin: 0.5em 0;
+	font-size: 120%;
+	font-weight: normal;
+	text-decoration: underline;
+}
+
+#maincontent p {
+	margin-bottom: 1em;
+}
+
+.cbi-section {
+	margin-bottom: 0.5em;
+	padding: 0.5em 1em;
+	border: 1px dotted #D2A800;
+	background-color: #FFE990;
+}
+
+.cbi-section legend {
+	font-size: 110%;
+	font-weight: bold;
+	height: 1em;
+	padding: 0 0.25em;
+	color: #555555;
+}
+
+.cbi-section h2 {
+	margin: 0em 0 0.5em -0.5em !important;
+}
+
+.cbi-section h3 {
+	height:	1.5em;
+	font-size: 90%;
+	color: #555555;
+}
+
+.cbi-section-descr {
+	margin-bottom: 0.5em;
+	font-size: 95%;
+}
+
+.cbi-title-ref {
+	color: inherit;
+	text-decoration: none;
+	padding-right: 18px;
+	background: url('../resources/cbi/link.gif') no-repeat scroll right center;
+	background-color: inherit;
+}
+
+input[type=submit],
+input[type=reset],
+input[type=image],
+label {
+	cursor: pointer;
+}
+
+select,
+input,
+textarea {
+	background: #FffdF4;
+	color: #000000;
+	border-width: 1px;
+	border-color: #000000;
+}
+
+input[type=image] {
+	border: none;
+}
+
+
+input:focus,
+input:hover,
+select:focus,
+select:hover,
+textarea:focus,
+textarea:hover {
+	background-color: #FFF4BE;
+}
+
+select,
+input[type=text],
+input[type=password] {
+	width: 20em;
+}
+
+td select,
+td input[type=text],
+td input[type=password] {
+	width: 99%;
+}
+
+img.cbi-image-button {
+	cursor: pointer;
+	margin: 0 2px;
+	vertical-align: middle;
+}
+
+input.cbi-input-user {
+	background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+}
+
+input.cbi-input-password {
+	background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+}
+
+input.cbi-input-find {
+	background: url('../resources/cbi/find.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+}
+
+input.cbi-input-reload {
+	background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+}
+
+input.cbi-input-add,
+input.cbi-button-add {
+	background: url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-input-fieldadd,
+input.cbi-button-fieldadd {
+	background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-input-reset,
+input.cbi-button-reset {
+	background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-input-save,
+input.cbi-button-save {
+	background: url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-input-apply,
+input.cbi-button-apply {
+	background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-input-remove,
+div.cbi-section-remove input {
+	background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-button-up {
+	background-image: url('../resources/cbi/up.gif');
+	padding-left: 11px;
+	padding-right: 1px;
+}
+
+input.cbi-button-down {
+	background-image: url('../resources/cbi/down.gif');
+	padding-left: 11px;
+	padding-right: 1px;
+}
+
+input.cbi-button-edit {
+	background-image: url('../resources/cbi/edit.gif');
+	color: #000000;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-button-reload {
+	background-image: url('../resources/cbi/reload.gif');
+	color: #000000;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-button-reset {
+	background-image: url('../resources/cbi/reset.gif');
+	color: #000000;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-button-remove {
+	background-image: url('../resources/cbi/remove.gif');
+	color: #000000;
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+.cbi-input-invalid {
+	background-image: url('../resources/cbi/reset.gif');
+	background-repeat: no-repeat;
+	background-position: right;
+	color: #FF0000 !important;
+	border-color: #FF0000;
+}
+
+div.cbi-section-remove input {
+	border-bottom: none;
+}
+
+textarea {
+	margin-left: -1px;
+	margin-bottom: 0.5em;
+}
+
+form > div > input[type=submit],
+form > div > input[type=reset] {
+	float: right;
+	margin-left: 0.5em;
+}
+
+table.smalltext {
+background-color: #FFCB05;
+	border-top: 1px solid #666666;
+	border-right: 1px solid #666666;
+	border-bottom: 1px solid #666666;
+	font-size: 90%;
+	width: 80%;
+	margin-left: auto;
+	margin-right: auto;
+	border-collapse: collapse;
+}
+
+table.smalltext tr:hover td {
+background-color: #FFE990;
+}
+
+table.smalltext tr th {
+	padding: 0 0.25em;
+	border-left: 1px solid #666666;
+	text-align: left;
+}
+
+table.smalltext tr td {
+	padding: 0 0.25em;
+	border-top: 1px solid #666666;
+	border-left: 1px solid #666666;
+}
+
+.cbi-rowstyle-1 {
+	background-color: #FFF4BE;
+}
+
+.cbi-rowstyle-2 {
+}
+
+table.cbi-section-table .cbi-section-table-cell {
+	padding: 3px;
+	white-space: nowrap;
+}
+
+div.cbi-value {
+	clear: left;
+	vertical-align: middle;
+	padding-left: 0.25em;
+	border-bottom: 1px dotted #FFCB05;
+}
+
+div.cbi-value:hover {
+	background: #FFF4BE;
+}
+
+div.cbi-value:last-child {
+	border: none;
+}
+
+.cbi-value-title {
+	float: left;
+	width: 40%;
+}
+
+div.cbi-value-field {
+	width: 58%;
+	margin: 0.25em 0 0.25em 40%;
+}
+
+div.cbi-value-description {
+	font-size: 90%;
+}
+
+div.cbi-value-field > div.cbi-value-description {
+	display: none;
+}
+
+div.cbi-value:hover div.cbi-value-field > div.cbi-value-description {
+	display: block;
+	color: #ffffff;
+	background-color: #FFCB05;
+}
+
+option:active,
+option:before,
+option:after,
+option:focus,
+option:hover {
+	color: #ffffff;
+	background-color: #EEBA00;
+	background: url(images/bgoption.png);
+}
+
+div.cbi-section-create {
+	clear: left;
+	white-space: nowrap;
+}
+
+div.cbi-map-descr {
+	margin-bottom: 1em;
+}
+
+div.cbi-optionals {
+	margin: 0.5em 0;
+	padding: 0 0.25em;
+}
+
+div.cbi-section-remove {
+	float: right;
+}
+
+.cbi-section-node {
+	clear: both;
+	border: 1px dotted #FFCB05;
+	padding-bottom: 0;
+}
+
+.cbi-section-node div.cbi-section-table-row {
+	margin: 0.25em;
+}
+
+table.cbi-section-table {
+	width: 100%;
+	font-size: 95%;
+}
+
+table.cbi-section-table th,
+table.cbi-section-table td {
+	text-align: center;
+}
+
+tr.cbi-section-table-descr th {
+	font-weight: normal;
+	font-size: 90%;
+}
+
+td.cbi-section-table-optionals {
+	text-align: left !important;
+	padding-top: 1em;
+}
+
+.cbi-value-helpicon img {
+	vertical-align: bottom;
+}
+
+div.cbi-error {
+	font-size: 95%;
+	font-weight: bold;
+	color: #FF0000;
+}
+
+td.cbi-value-error {
+	border-color: red !important;
+}
+
+.cbi-value-error input,
+.cbi-value-error select {
+	color: red !important;
+	background-color: #FFCCCC;
+}
+
+.cbi-section-error {
+	color: red;
+	font-size: 95%;
+	border: 1px dotted red;
+	margin: 3px;
+	padding: 3px;
+}
+
+ul.cbi-apply {
+	font-size: 90%;
+}
+
+ul.cbi-tabmenu {
+	padding: 3px 0;
+	margin-left: 0 !important;
+	margin-bottom: -1px;
+	list-style-type: none;
+}
+
+ul.cbi-tabmenu li.cbi-tab,
+ul.cbi-tabmenu li.cbi-tab-disabled {
+	display: inline;
+	margin: 0;
+}
+
+ul.cbi-tabmenu li.cbi-tab a,
+ul.cbi-tabmenu li.cbi-tab-disabled a {
+	text-decoration: none;
+	padding: 3px 7px;
+	margin-right: 3px;
+	border: 1px outset #000;
+	border-bottom: none;
+	background-color: #eee;
+	color: #bbb;
+}
+
+ul.cbi-tabmenu li.cbi-tab-highlighted a {
+	color: #000;
+	background-color: #FFEEAA;
+}
+
+ul.cbi-tabmenu li a:hover {
+	color: #000;
+}
+
+ul.cbi-tabmenu li.cbi-tab a {
+	position: relative;
+	top: 1px;
+	padding-top: 4px;
+	color: #000;
+	background-color: #fff;
+}
+
+div.cbi-tab-descr {
+	background-image: url(/luci-static/resources/cbi/help.gif);
+	background-position: 0.25em 50%;
+	background-repeat: no-repeat;
+	border-bottom: 1px solid #ccc;
+	margin: 0.25em 0.25em 2em;
+	padding: 0.5em 0.5em 0.5em 2em;
+}
+
+
+.left {
+	text-align: left !important;
+}
+
+.right {
+	text-align: right !important;
+}
+
+.luci {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	text-align: right;
+}
+
+.luci a {
+	color: #666666;
+	text-decoration: none;
+	font-size: 70%;
+}
+
+.inline {
+	display: inline;
+}
+
+.error500 {
+	white-space: normal;
+	border: 1px dotted #FF0000;
+	background-color: #FFFFFF;
+	padding: 0.5em;
+}
+
+/* obligatory IE6 Voodoo Code */
+* html body {
+	padding-left: 50% !important;
+}
+
+* html div#header {
+	margin-left: -100% !important;
+}
+
+* html div.menubar {
+	margin-left: -100% !important;
+	width: 200% !important;
+}
+
+* html div#maincontent {
+	margin-left: -80% !important;
+	width: 160% !important;
+}
+
+* html div.mainmenu div.hover ul,
+* html div.mainmenu div li.hover ul,
+* html div.mainmenu div li li.hover ul,
+* html div.mainmenu div li li li.hover ul,
+* html div.mainmenu div li li li li.hover ul {
+	display: block !important;
+	margin-left: 3em;
+}
+
+* html div.mainmenu div.hover ul {
+	margin-left: 0;
+}
+
+* html div.mainmenu .hover ul ul,
+* html div.mainmenu .hover ul ul ul,
+* html div.mainmenu .hover ul ul ul ul,
+* html div.mainmenu .hover ul ul ul ul ul {
+	display: none !important;
+}
+
+* html div.mainmenu li {
+	height: 1em !important;
+	width: 10em !important;
+}
+
+* html .mainmenu {
+	height: 1.8em;
+}
+
+* html div.cbi-value-description {
+	margin-left: 40%;
+}
+
+
+.ifacebox {
+	background-color: #FFFFFF;
+	border: 1px solid #CCCCCC;
+	margin: 0 10px;
+	text-align: center;
+	white-space: nowrap;
+}
+
+.ifacebox .ifacebox-head {
+	border-bottom: 1px solid #CCCCCC;
+	padding: 2px;
+}
+
+.ifacebox .ifacebox-body {
+	padding: 2px;
+}
+
+
+.ifacebadge {
+	background-color: #FFFFFF;
+	border: 1px solid #CCCCCC;
+	padding: 2px;
+	margin-left: 2px;
+	display: inline-block;
+}
+
+.ifacebadge-active {
+	border-color: #000000;
+	font-weight: bold;
+}
+
+
+.zonebadge {
+	padding: 2px;
+	display: inline-block;
+	white-space: nowrap;
+	cursor: pointer;
+}
+
+.zonebadge em,
+.zonebadge strong {
+	margin: 3px;
+	display: inline-block;
+}
+
+.zonebadge input {
+	width: 6em;
+	height: 1.5em;
+}
+
+.zonebadge-empty {
+	border: 1px dashed #AAAAAA;
+	color: #AAAAAA;
+	font-style: italic;
+	font-size: smaller;
+}
diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fd1e2f34787b200eb425e42fb98c75b039163e2
GIT binary patch
literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaOClDyqr82*Fc
zg1yTp14TFsJR*yMv=#_6DqH@!17xt5c>21s-{2Gz=HriQFMb9T;`MZK4B@z*T(N!D
bLwg3cy-YKE&k4N(N-%i3`njxgN@xNAizFlF

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7247cfac5fe279cf3e12c965f53483196bfb0e2f
GIT binary patch
literal 5310
zcmeHJd2AGA6n}uYe@I#)M*vMg2#O-0f)-FIh+q(ng4H&}NJygr4G0#oh0<*)Edo`b
z6iWb+044>R6hb106t=XbT-CN%OS^OJebMf2ce|avW_;6GrrVuqHT-FIc4qVDeQ$o>
zo8P+zU=aQ$OaS~J17#xtMgzbUyif)6@e=fpc7y`lUuE9%751GY^f^H10)yvPp!bY7
zXmXv8h8g|T!Iw-MfY=O_1TJpzEs)haT+x<~CX-iu8-XkYW(P3adrp*5$OM8nge6Q%
zga7Co7U^~X!P?}fD!Zc%vVeO1V`|z;Ds?(NH=P-`k4c$KEto_sG1w)uf+uttKq7CF
zMp0-z-}Ma;89<1ur)}PaT3gm`TlO^l?LF@OqYT@D&I9UJzN`6+_pH}fY;+epI|~jt
za)4Y1T769)$K+eoAMX4L+O`1o>j+ax*t1>dYV8V0X2%v-aS8o&>3Ws-J^rU=wWbUw
z8ovHd;jlIMGl7JI#Hlq730V}*u5ut(815K-cSGPnvUwzB^oDvP5@Qp6n_b(U^{PHv
zBg)qcUEcvI#}`+RSUiQg$SWM0Wj?;hDn~%gXDtpg6jWTgSLVgE%mhkt6_uK<?h;Gq
zE+M-p42Q=W5-m%nm<}hI{SU${&nMng@LV*r*05PXV1A0X@_(KVLq_Y`1bQ1V7^x#k
zk&Ip6Q$d*0X{!yqu3rwTTD#tUkxWg~H}bvljoIbgJlp%PQ0RjiXoSU8eCtg>;*M*_
z(KBXh19ar2q8~J}LC`QzNy48D+@awjF|>;53@UiSySev96B|YeuYj-!ekRS1<&P!#
zK@z=gnK2qxlmlT7E@<H@Eo>p3czc=TI9_i5#iz!(sWiR<!XkL_WFyuc;xB)es>@Pn
zSxNO~sHA$4r7f;dOPdsuq%PC>;bg&KgcZTDWnp`nl13WJeR6-`5((G(IxlX4%HK)3
zJyYRZI+ZMV*lERni1-PcNar=b+#W6w{o>=2?C3bp!d~rGAh9uGK8yJIKrbCb+OD%Q
zb4+U{mVD9wtMssHoq|0;NxjQb%bM=6Efrn33-+|lK+buMXs=W7f1kmP2@}gdl5>GL
zY4s}N7n$6W-gKAs+In)bQOEHL`GA(6G~0y~s-&T+=frSd&|;-aAkjhyLC`>U+;Fq^
zJPQ7chLs(@7w($iA_bS}m+Q@VD+7oqE*^K^2`k_PdA`v4FFm$lowFwOL4U}o=Uv<~
zX!{a~qjM}sezYa84Z$I8`FvZnGDfc5?W)@|kPjzPY*0ZJ0ge6Vb7<wTHUS*>1En)e
z*e(iydUJRi|3FYG9yow%cJ_-OXbCPFOKcg6Gp<j6bF>6jLmQ68(s9Ou>W-ZLS<?RI
zt1eWianYIObLlmsg;s#gExJGB>Zug_&3%!iTHI)D>L<|pTK0N@GXAc?I#nr!b&3Ur
z{l9G4Ks=Z7-WBP3wkdYdxOBm)Z3_4sQjCkIl0QD|2{=X->6Mh{-m#C(AU}GXIK9Ni
zTYJNS4O64;kjzk^e8F7CIlJBZ6X>y_;b$1~+-X*5^3qd{$2~Y?am=lMl3w^0^_ZF{
znrN)q;xwQ1@jQQPtKk3N6<xU#^{R6Eh{HqqgmL4wht`4?!I47=N>RY3gmWBYgfjy9
z%u>-SC(-Xtr{J*mfY-C;2MgRJ_n&BAHJHeFzEA)8<7bb(S)sDzyI^!M0WgPg7fiN%
z;iSLsVU?;7DmUC7Mprii;Woy`NRFnc!Re1fABzIV98MzKt8kd$t-U!ie35M=WZ*ne
zM2=D73@uNy;|KZPXN2i#x*ehSMv=SWm?z}#jeg97;w`U9<i#sN?Pn5_-MNtLdV02+
z&CX5^h14_sA$4AU&y`#?#FeN~F|wZvHQmp-5-k>Xyv4$)s|=i4lgFv^gzGM+9>UGb
xQE>^Gst_zl41wwwZqP!WAC%7Xx^(4+t>|f78D}8QK%9X%191l84E$dh_y^c+g?9h|

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
new file mode 100644
index 0000000000000000000000000000000000000000..21fe02b1e9af89e64fea086b438e20e68b391927
GIT binary patch
literal 127
zcmZ?wbhEHbWMxQU*v!E2|NsA=KYzY?^XA5l8~@KR?A^O}&YU?-O-*@ud5MXM3>ZN1
zCku-R!+!=HkPOHS1{R$OCp=g0wRnAY_x}WqzLd;)8LQUic&i!oocWx1+ijk>jr||{
P#sCQoF-DIR76xkomfbH1

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a3258ccb6d2f6809c591cdcf5694b6d9557c0feb
GIT binary patch
literal 293
zcmZ?wbhEHbWMxQUxXQrr|Ns9#fByXb{rlIiUq65T{Qmv>=g*%%eE9JG{rh+C-o1JA
z=EaK_PoF-0`0(M~yLWHiym{lsjk9OZ{y)QT^ytweM~)mgaA51!ty{KiS+Qcp!i5Vb
zO`0@u;>7m$_J)Rr($dnBl9G&!3<g>P#h)xJA`Jf-bU>DX{KUZK<j`5*p(E9QVoA}-
z9IN>kR+M<Hjaq+WP1)(ULE4h%*i8;*Sj{`3y7{4lhL}$qW2cW+hwI^w8WMc$T#U_(
LEDY`KjttfS#CC2e

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..93d0291a215d3ebc76f5b18cec9acef029a7e390
GIT binary patch
literal 365
zcmV-z0h0blNk%w1VFdtW0M!5h|NsB}{r&v>{QLX+`uh6$`T6(v_x1Jl^z`)e^YifV
z@b2#J?Ck96>FMa`=;h_*<KyH0<bL7d;o#ul-QC^U+1c3G*wN9^&d$!w&CUPJ0L8_{
z#KgqG!NI`5z`eb_yu7@(x3{&mwY0Rfu&}VMuCA)8s;H=_q@<*wp`o9jpPikZoSdAQ
znVFQ7l#-H?k&%&%jEsqiiHC=Wg@uKJf`Wj6fPQ{{dU|?wb#-)fba8QUZf<U9XlP_)
zWMN@pA^8LZ6afDKEC2ui00jVK000Jxz=&Wd&?Jrq4Fu9yXfhYeL_-R7FdEm&1k&7O
zt&)a^i=i~W9ZjYA@oKF0JMM<d?REP6uE+25e1U+2e}#UBeTjmGiiC)ZkB*Iukdu*=
zl9ig7oS2@Mpq8SWpQD|jq=-K~Ix{IeIW{jRH8U_NBP=N=A{-wc8yObE6cP>$$O;Js
L%*+7K&p`k?3O3Jl

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ff00d6ddb8051a28a4430977069e240b8a0a741b
GIT binary patch
literal 2415
zcmV-#36S<jNk%w1VNd{40OkMyGcz;R*4F>b0Nep)b8~ai%d_rlGwy@6rKP3+{O{;o
zo#i!6_3zgI;A{G_5K~iA;xB`YjEw1Cb^p;I^|#de(Z98|wciw6`PS$E_}%fH#M{%b
z;wMz|i6mxbX6tIE_2r~{dwciy_xk9b{qXjgnVIKLfZr8#zP`TUCw}vmbojoV?B>ko
z=H^ODO7HLQqm4TM+Dz+OJM^s1_s8D<&l>r(Gymw4>S2}t|Nq6s#pz5!@|&RM-^Ty+
z%lqK%%*@Q>Jd523Vy>>PT3TA~i@Dyl8TOw&goK3UL2&0tS?q9x>R3?x;?bFznc*Q<
z-QC^o;HhS2X3og8?R&87W?SiHqu?KT=1i3T)in0L%tAs!@}kH3^xFUKt^ebD|M}(T
zKuG-N@a%J}{`dO-@w@SVDgD3-@0^tGd28^LzupdJ_Lv?2{rBT4U--`A?sszg;MLp#
zXzgb;`SaQIueJ8Q*xd+g<wK9{Xj1>{p5!rC|J+yo<gwu+ZR0V7A^8La6aWGMEC2ui
z08ju@000O7fC7SpgoTEOgA4&ELnTNA9xg5(1V|-AC;<$JoSmMZoD3ErlBK4nrXd!a
zpslW*EJFmSw6&!KLoBbmt_8EG9w8A37C=xhFHk@h2oWKXs00PP)Q3H!r?@RS+}+;a
zIW4lNAwAXAED_m5FW~O)IWOa;5xVECbO;ah+wT~5Tu8tJ*Fs&X2MFlg^TYz0Bmz*}
zk)iP6%7BY@a**)`!3u?UP<~1BU~i$J4f{p{aYus6iHk4?aLMtbo1Kd(1_E*TV1vm*
zC`=7`r{-l$m_>5D={Dvfm4V!bm_qSW5Q2j%!C^>o^ynBcTEMi)VQ~NrsN8_0bb-KR
z7bK<sJoNiU!e~q(Lc)YObHqoT7y>GUx!?z!m>KR`I7HIrTn4z3LWqE;;pm(*3-)07
zfLH^!8E$r*x$!N?fHCewU~_>aL$#}tBA{)0L5PeeI4ErFcA(qDHwnHZNRYz{Ow{fS
zvZXeqlx(y)Bsf@r1%o@};Ji#gbJTP4Qd4&INJ(Hf)C_&9e0*mG-iiwxV%|CH?$-lz
ztr$Qf(heMn59TG{#aQr=pa48SB*DQGF`Xa~I4=+}5-Xl$uv$d!P%*$CHTf_Bfe0R0
zpb68(gxxn#loEn#o>)){3h#(<$3-Wo@kJSEy&)nzVkohLd^Ncflq42-(uIUBlz<@r
z9x&~Ygn97Tu_HWha1cgJQ+`u|Bt$gEiBv8;FxfzM{PDyS?V&Y8mhX(QzydJ^362OU
z4G~J6(B)u59%4YJ0h=r_!A49;y#wY06cz#-5o1Et#us_!Pz0dv6!GH#ci@58J0c+2
zmLUwJWI>)~_>d<UDx?7hbU!Eo#|#e+<YJhK3bN%SktP5lJbKhXNDX>Ghhv`5lu!sA
zFXov*4NxVJ1tM7xH_!wb<T<1Z3Jua6t^<v60t9$0VS{z>0LDoSP<>G?v66&0h(SsY
zqyS8Kt>=y&p9Bk!59>mAYXpO2fMftrF?rDi3oP}Hxt*X3PaMRN@PnN11i&T#ix!88
zmT4C)umid7`05F>G0Gsr9amt{8&oL;U{!2rVF6PZ9c1KA8?Ef>%^PN1IshJM8T2VM
zI-vCdObE~P&a<9m0nZGz!9=MyI*cR$3#Bv)PZ9LWu(CT1eA2+yGF)&RS|XIf0uT>D
z$3;vRm;etLA|q16s_&R^B}{5S_scSpAOW2ia=>K99DTl1Mkm9vB!d|-fjkgo%t#XN
z#xN~lfOqfsV1yxAm<kUUVZez~p0^@!>rl`g5Yrw!43wf5N3g+00|P>pgbXI;38o{G
zzz7`%Fj>(A-tQ2x(!2vu{Eh|-2oV!~Xbt&@Bn0P)M|Ip};l(>Tc)*SS!IHnDgaa}C
z5oyK*AUPLWP?j;aJ6rSv!9~==140@x*$iC^T*_Lcz|jUhB(56>5F9s*;=gxz!BkwB
z5f%oRwo_<rfZWi60j#ha5p1DRatPt3-q8Tj<$wlPC?8ZR=mPg)&>LJ>gBd!Yv=AVm
z8)ATo(&%!48}MOQQ2HO2ev!QwYUm<3APoS$LA;Cf?He@kgAAVX!f&t-GQz{4>n`#K
zG9*9`Mks(79(0q76sj9wh(QM~GQuk6z<R5zA_<sug2d?n24zse8cd*uBMv|T6rex?
zGN6Y9+<<GCQkWZm2b;^ia17L|Uk;M6fHN3?0~gqV4D!N+8r%T?Z)7OT6=L<m)XhqP
zZbYEqnmB+9)J6sdxWE&Hph#}KZ2)JiBIVfT0s^G68y=htBD(^UuXW=CwXEXbq9DLu
zBH@NP;21Hv_)AWyO#npuWs15%1+Gl<BF?L34yrbZm$~3MZhSxyxq$&SjG=Ha3BnlE
za6oZ#Lui7?7;E~2!6Ag;9Y5%fJ>AhVLFfTV5!ixUDEPs5P~a$39B4N(Mg$fK0AAzV
zLKe|NfKk0;m=~GaFaJe|ZHX@jopK~R0`P!=7$+t{kf=AH;VwapAX(fXf=3790t~%F
znisi(Ou2EbYz^X8Cq?NN)(MUhpz|FwItnT6Su8_<KvdoTXu%fv`HdHBA&B1yXjklI
z&sibr5Q}OQ+uq@Ujk@EZU5ThTJ0*!v8Da!@>P7^f$_*V50WE%nsYDM|D?%JfYY)gu
zHzWy_`*r0GV67sZBw;5`i~vcFYykiiYYDW7m6-WU<*mBZBAjvqfCSJ%36eSxHGI>U
zZoF2JJfVjReFF%>h%7i{Hq8lYQ$-f-1PJ!S)d7+rs>HlQJuw)e3ArK)<k2lu;QHEB
z+6O<b*w#6#_|k7)LAnD`PEB6{o9zxzM&E=<8}p<byY4~{ka2-zBGr`iUL>ZGQcWpZ
zbB+<jccGp|u6<z(55?@)OZO;mVxdBYKiKyu>vf0BT1w&Gg<Q)8tYgoEk8+11NEb}O
ztI8ly5*NjG;|B)Y@KH{n0M4a_Cq5DJAfn)qUSfy~co49PkMgyUn1UoSF2o4*!4EQM
zpe#F<4;4025K|z;s6i$K2$b`XA+&%3V{ojBA@G48$U`KtDM^$M5rx&<!pbCggB@m|
zfg(`h0}9xl6{w&F3Xnh?V2%uS$J_~D&>|SaD8@08v5aOsgBH@@^DCk-4_i3;%wksb
hD?l)cN7F(Tg_SflMzDxRJOUb&ummPFG3G!306PKJT{Qpz

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
new file mode 100644
index 0000000000000000000000000000000000000000..34aca44e01c12fa9f63dcce8d5c6fa529133f7b2
GIT binary patch
literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq*#ibJVQ8upoSx*1IXtr@Q5sC
zU|@R#!i;jI7N$T!$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@~q33VOOY
zhFJ7oo#<V3M1jX;wjT5IlPinv#3-;czHyAK;Neqv<Eh%66EZ2vrnce998M076oH^U
zW+DQUmR9sO%u`wv=ytwp(=VRLb6J=7yjDEbv`DwYFtfI7XF_nz>US1*U2@MYIb&nx
z7j1L=e0@Pc&DB5mntZq4Js@<ziGh#7h|$CFhulA>bC&FSr-N*r-~Y8NIoEjYmfrKd
z_U%)X*5(#16DjY_@(guPnRKW$R-Q*OXZOm757+u=rXG_xAIFiH?Dg`X#N*4s47dFx
zIgcJzzxUer|Ln$^J%4Y0d1lb2aKO$)b$h#;a7e>W&pfX<rG7W*4}OPgX13WdojLi+
vNO@D$viTFQ>gvBM|I7I5XnXu`k$nvB_Im$2>s^}-3_%7@S3j3^P6<r_EDWJs

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif b/trunk/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
new file mode 100644
index 0000000000000000000000000000000000000000..82607d533f359f49b1b3a08c85bcdfe41cd9e5d8
GIT binary patch
literal 3606
zcmd7Pi9gf-1Hke3hBlJT75S#-oFpV7N6m6<6gnj3D?cGuIU@`+yW|?Vb0s-*jVV$_
zm)k<F$dR+$mE)`W{Jy{c;`jUuUXRDioM@(Z>OUSZOE3oj^sirQ(63eK*9x>V0d0SV
zHhIv`UTA|0Z8Srx)zE4cw3G`i<wHw(&>{<3OkADgLbH+392uJSg{FNbCMKW>M`+>(
zG~on|*+65~&<GA1IWyePg$6aDj~czby-*(p>N^beqI$cUp<Xo91-M*pb93_=7pyje
z$y!iVRW-o|y+wdm1oHCo@-xYKnUT$zfSUzaELL?qsEPw*GC49bGM^0cA^|G^`1trF
z`UA2Xh;#$K*MN^bu(q~#IuCA~0~d^e4GvhJ0k{+3j26(;)KphNYbpad8Gw-i=zr}4
z|0m>j_yr^Y7O4HN=YLNC0wQB6(NwH9gUQsO#l<Hivf_`%q-ZB;q%w~tW#{Bl)H50C
zc~6RpOG?YipH@({&1^2!)^RK<pJR16O_!35tzI_iG*seRYjJNoySjUN^Nib?p7Dxa
z^v7vj?B~20eDc1nV{&$Gej!eMynZohxGm0NscvE=VY+o@>(}o;MLWZ`ySm8SYW%l_
zZnpWF3C?j>#v;4TC$}|f-@Z-Ny0cUG`zSBdLIPV+JIM6TKnX0mz|4_`AN^XxrVFw9
z&9cVYYi)IN#BU6$Qe9+Ha<v}(bm)+<#k;88D=Q&#+~i_gshIAOx^g=L-Xokw<w)^j
zh{f5mo%M=|7-Q&uV6<gAV{hZVsSUlUY4c<y%WSm+&VtFY&&cVxD7YST+${L}^sJ@b
zezttb-zI5G_juQPjMbv(-<$;!<;YKP$Jx5dL&h3rh>?N%photgRBFz2p^BDLq4Wnr
z0gw2NG9DOmus#fPCkfjqIi)NtB!c%)_-8-;Lw&GU@8Y84XUh(G{Mk0^3;63H_2c7L
ztO9y$jjH6M*{D!e@Aq5K<cMx=c%7ax(_!;~3X-%^ik<L@rWQ*?aU_cJFdjtMB)x|)
z+)b9S@;kIoF8MWv)Nk1KH}xk?Pas0%We~;H-p~E!@k2cfd83(`wgmdVLv@ceRX6by
zdLJ6Dc0)8pEAfx<Hf%N@8i&ynNxi%R@+2&HCB1@21NmrZ$4$I&w3?H>+c8roqSD^(
z8fGD`rHe7;bw%dDY;J|-RU}Ebv|9OC2iN>le(ewRj2ZP_8;=qsH2p|xTqP8rJ1`dG
zlF`5Ye!jS5n@Gq`_UAmLVAcNP=^tOzhAhRN%Tm;u7(<sv7@gx&ENP06SM^7y-JiK*
zDO~Wi`e_GorabB0sC)%$Px*};olVbU*k-dA1=Tmiyq3yF>V%f_x;td@>O<e@_3Rxt
z3|W2=@AAUkU@S{V<JemvfA44Qg9gI2E&2w<<y$>$7psiEy{oN{H)HP<{lU*yyqbKc
zumZ7X_IRte6c#D*-~D}DZR543Yf}aHm;3{tGReb%HJKo<Y5lpZ^>=EeLZX_+Q?^x?
z7JEu{Z*BWxf%j^IKvi*RsMoCU*Phw>uFj6#(T5d}k4qVyc&GDezOsK6Ur{r_u{pnK
zqXAiJzcD+jeRSyAD1(1kI5vDE<xXSBoVFX^?HZn^uHhzE`+dddeSsR@!5@YjORn_2
zDqKE4=<Q<^I5eYF`TR987?JjcrXTlnROou;$+=F+q6SWE?fCQ9M+jLzqm=YNYGZvJ
zFaP0G9Q_p<!@6NwJ*hPj(J=K@;Ms0}_UnHPXf=@0u6bd<|4cgJ@vH1BohLL5+6Q-q
zLZP+fe#e(B<g@8U8#BwJzjI$QR@+N$KQ>>yY==U5uT#Igx_xbFZD6-R;>?fkD*Fty
zz>y7I^=Xgpd&M^ohuG+F|B|%vKpb@FC>*M9&p}1YDh_-~NH-8Ft)v`m%%4BhQd=AI
zgftM~G>cg<Uj8_ZR55-e@Nnqqd^gWW-7;^-#r?&fq_xOXkM?VgK7I|A*pOuEvKD?I
zPV>=y@dqE|6ZAJ8DBoF#IWRM^CtC025yP?o{2S*fixQM1`Ki8R*IUGCE=n_~fQECq
zEYp3}VCV03zi&4cG%f-%UPcV;$3^YS!0m<2$-@}@TtP)NQSfO2Uy_;&VvlJ1`Lt*#
znek&rP%9t64qgO8JfOd{@LE3MLZYjo!l9aUQ{zDjE7Q<Lr~tH@oB1cFHo2(FaocUO
z_)_R&g@TyOPP{&l%rJC;ue7};bNUjE9y;@FZQ&HmcxiQ9*AsgWQ0!GuQeE1LnkWyV
zt;vaGgo>M1;z+x=no~C2`__@q_H7=H-)Sa4zMLtpF87Y`354aC8hf~({;LO{y{*_9
zo0imruRM|0+Vup<f1%ep=pz5N;mnb3K@j=saTfLqzi?wsy0RRfpYWTj_**sUw>48j
zMRMRKFfv7D=`w=f)%mEZYP$$wvcz0cN&8_8EJ3FK@uM-EqJR@z+~s0v4umNsp4l?e
zj+l;jRG2vAdg>KU{(`iDX^VtEx_!T*1^Qq<mtPqN6OowaJJ{yscz!KPn3tMB!F&}o
z$scOE52|QJEr^+{sQA;ALON+qP+ygaa(Ak{dyFb5)Cm*Km}HCFD9N2RuoKAunOP>s
z0D5wuSfrI5kb}E*qcci~d#TD{Hs8)Dsd`pLrReO#QgapC&e~1+3a@w<A-4}yM26Ob
zeVWEj3if1zI<ApoTfxt?7(fu7iL#Crf@|eOV;3^Wl)wcF829lRK4b9%?>(RQ{<|~(
zL7D5a%aL-}4>v7XprWU8faN>Y&17*k@Xh}fY>X?4Z<&!>fn?$h+6bYThQ@4D<XQ+=
zqDz3@t~*Ks*+gebaCYEREdSaOpid7jlLw28cp2hv$B#{Fe?W|B2R=osQe2bl3mODF
z&*ZN2H^6i4`%_bL%)o29LnZ38ce^Zf@y${lTTXD2DaFT4&iTb<6fe%6b;fbJ3)kgt
zJ6MbJbkq0p*ot9ew(}wIJr=)2r<o4y8ht!+oJC>5>>ZR9ZWbfS@aw1pd^u)pczx=e
zAoD8_7MAYZQB>vUjm`R5i8m(&a`${DQ8t|?UoBl;hU-sGxXh(D%_=Rz3uTDtKujOq
z5QhlbCn&8lHN+J;sX&rlatc_L(8aap7ei!zb0Ny`+dV;YRP=49XKzGxkk+D3xMk0y
zEoVOe`N?@CdwXS>`$?%}UBm_5en3TT+%REAJEoD?;@rsk^m{fUq>HI_T_>fCa}=&m
zylClZ$0;L$k|AL);4L;ZE9qT2`&&|P99XLEj2d0_^~1Om<xNb<NMYX&(R0@(B#O7%
zO+!~TEJ<AKA#BCpvcxEH!wf{#j-Yb2?^*UpM%j3w=ZNLHUW926e3%>f<(Nn6r``0?
z@P=2r@z#hRO{|kB*A|WYtK`*RU(0Vl=P8u_cx3I+XSQ`eO%6vfCXBPbSI+mF%G^z{
zeu;LybJz3kY2S)3P05b)r?_5fK~N<hIpfNF&6WPjO;%;_?ANj2GjfO5kDd*G6Ev^;
zS>Y5Qm5s3Mt>*><A_y;pa_5B8Ng=n?9c90Tt;hKYT|kjx{{&@h1XzU_^~MdT-Z<Tv
znP~VC)ed^YUal6PiY|mfAx|U2*Gik$k^ZNmR>k0(H8(8U@_Y!+9Sw!g-<N%g%v+qi
zu02O@BCqd61O(~JuQ@?GhSscYf*6MHp?TP582fj>^`Bk8`D-+u|IWL>tl;n*s%OIh
z37|u>>h8vaNZxz^4U3dqb6XR*dJ7S}TO3ZEkDNr1r{<CT+d-}Ak?nQP9zmpK#s$%m
z08ATs!_F~U6aF*Uf=q+LW!=So7l)M&hKcbms}3QR+#>=`lG>k9mga+3wkS{Dhlfdp
zr|2Lt7^gpl(FO!Dqv61R=)iG-hSH>%5F)nSDDw>JEG_B+G89WDp`_1Qwb74ndzQ`n
z(uZKGCHG9zX-YM;gYI;gUSymNb<aHt(*4|49a*i7s@{eaV}?pxW!#jqP-GF+>lq}1
zXvB8poD@@AkLj}DZ#L}l&c);Yb1HF|Nn2xjT_v1wXBY>=g`~YQGGZ`WQKzLt8n$Ej
zr0)xq#0Cd5ziWpVZ&U9q_@Wn>n$nRpsaRD8t)75>C{4*xq308VGwhhRm=tZjSk?mR
z{c|th5-84Ek3q%81nW^S!1_Z;Op*(bL4!y1Fk4P+kRE*)NgBOJ9lMtpq8CLgv``Et
zD6rznrHK;0a3LPC=pI1^2h%OO_SdA_rF0@f({5QM{;(TE7YX?DgF!VI9FE<&8nH{b
z|6R&amdBz=06q`G7grWF{~F9UPQ*M;?yV~p`2C!X*SBZTGm=);!jm}(a<)E~2uLb2
z4xxusRI-pBhADz%rTVDtIiy)g3U)2AyD$)ogL@8BpG&3SV??eg14$f`qic0uC)r{#
z)~zkEbvq`;{Tv3DO0NUAu@5{?-K20+879E-2oi%%W0)f!r&+p=pqdZ?RC5mOwjENz
z1}3=X0A~R)Cw~er!~98R95*wqjzr)j<5Z9di%11P%{`Jun9Y=~20|G?1Y=R!PGUJl
zmz?y%@WOIWW%>mHLCnKwB2p2T`R8sX8o=Xl@cdHi*qv<Nft<cmIRo}NgCRL)Qb=I%
EUux)k(*OVf

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-bno/ipkg/postinst b/trunk/package/luci/themes/freifunk-bno/ipkg/postinst
new file mode 100755
index 00000000..5972881a
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-bno/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-theme-freifunk-bno ) &&	rm -f /etc/uci-defaults/luci-theme-freifunk-bno
+}
diff --git a/trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm b/trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
new file mode 100644
index 00000000..21d1ca68
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
@@ -0,0 +1,29 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+		<br class="clear" />
+	</div>
+</div></div>
+</div>
+
+<div class="luci separator black whitetext bold"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " (" .. luci.__version__ .. ")" %></a></div>
+</div><!-- end main --><div align="center" style="padding-top:5px "></div>
+<br>
+</div><!-- end wrapper -->
+
+</center>
+</div>
+
+</body>
+</html>
diff --git a/trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
new file mode 100644
index 00000000..5099d186
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
@@ -0,0 +1,215 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%
+require("luci.sys")
+local load1, load5, load15 = luci.sys.loadavg()
+local request  = require("luci.dispatcher").context.path
+local category = request[1]
+local tree     = luci.dispatcher.node()
+local cattree  = category and luci.dispatcher.node(category)
+local node     = luci.dispatcher.context.dispatched
+local hostname = luci.sys.hostname()
+
+local c = tree
+for i,r in ipairs(request) do
+	if c.nodes and c.nodes[r] then
+		c = c.nodes[r]
+		c._menu_selected = true
+	end
+end
+
+require("luci.http").prepare_content("text/html")
+
+-%>
+
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
+	<% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %>
+	<% if css then %><style title="text/css">
+	<%-= css %>
+	</style>
+	<% end -%>
+	<link rel="shortcut icon" href="<%=media%>/images/favicon.ico" />
+	<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
+	<meta http-equiv="content-script-type" content="text/javascript" />
+	<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
+	<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
+
+	<!--[if lt IE 7]>
+		<script type="text/javascript">
+			function setup_hover() {
+				function ie_hover(e) {
+					e.onmouseover = function() { this.className = "hover" }
+					e.onmouseout  = function() { this.className = null    }
+				}
+
+				var lis  = document.getElementById("mainmenu").getElementsByTagName("LI");
+				var divs = document.getElementById("mainmenu").getElementsByTagName("DIV");
+
+				for( var i = 0; i < lis.length;  i++ ) ie_hover( lis[i]  );
+				for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] );
+			}
+		</script>
+	<![endif]-->
+</head>
+<body onload="window.setup_hover && setup_hover()">
+<div id="all">
+<center>
+
+<div id="wrapper">
+<%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
+	<div class="warning">
+		<strong><%:No password set!%></strong><br />
+		<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
+	</div>
+<%- end -%>
+<div id="main">
+
+
+<div id="header">
+	<div id="headerleft">
+		<div id="headerright">
+			<div id="headerback">
+	<div id="schriftzug"><img src="<%=media%>/images/schriftzug.gif" alt="Freifunk Nordost ueberschrift" name="Freifunk_nordost_ueberschrift" border="0"> </div>
+	<div id="logo"><img src="<%=media%>/images/logo.gif" alt="Freifunk Nordost logo" name="Freifunk_nordost" border="0"></a></div>
+	<div class="clear"></div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="pathbar separator black whitetext bold">
+<%:Path%>: <%
+local c = tree
+local url = controller
+for k,v in pairs(request) do
+	if c.nodes and c.nodes[v] then
+		c = c.nodes[v]
+		url = url .. "/" .. v
+	%><a href="<%=url%>"><%=pcdata(striptags(translate(c.title) or v))%></a> <% if k ~= #request then %>&#187; <% end
+	end
+end
+%>
+</div>
+
+<div class="menubar">
+	<div id="mainmenu" class="mainmenu">
+<%-
+local function submenu(prefix, node)
+	if not node.nodes or node.hidden then
+		return false
+	end
+	local index = {}
+	local count = 0
+	for k, n in pairs(node.nodes) do
+		if n.title and n.target then
+			table.insert(index, {name=k, order=n.order or 100})
+			count = count + 1
+		end
+	end
+
+	table.sort(index, function(a, b) return a.order < b.order end)
+
+	if count > 0 then
+%>
+	<ul>
+	<%- for j, v in pairs(index) do
+		if not v.hidden and #v.name > 0 then
+			local nnode = node.nodes[v.name]
+			local href = controller .. prefix .. v.name
+			href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
+		%>
+		<li>
+			<span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a></span>
+			<%- submenu(prefix .. v.name .. "/", nnode) %>
+		</li>
+		<%- end %>
+	<%- end %>
+	</ul>
+<%-
+	end
+end
+
+if cattree and cattree.nodes then
+	local index = {}
+	for k, node in pairs(cattree.nodes) do
+		table.insert(index, {name=k, order=node.order or 100})
+	end
+
+	table.sort(index, function(a, b) return a.order < b.order end)
+
+	for i, k in ipairs(index) do
+		node = cattree.nodes[k.name]
+		if not node.hidden and node.title and node.target then
+			local href = controller.."/"..category.."/"..k.name
+			href = (k.query) and href .. luci.http.build_querystring(k.query) or href %>
+			<div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(node.title)))%></a>
+				<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
+			</div>
+<%		end
+	end
+end
+%>
+	</div>
+	<div class="modemenu">
+		<ul><%
+			for k,node in pairs(tree.nodes) do
+				if node.title and not node.hidden then %>
+					<li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(translate(node.title)))%></a></li>
+<%				end
+			end%>
+		</ul>
+	</div>
+
+	<%
+		if tree.nodes[category] and tree.nodes[category].ucidata then
+			local ucic = 0
+
+			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
+				for k, l in pairs(j) do
+					for m, n in pairs(l) do
+						ucic = ucic + 1;
+					end
+				end
+			end
+	%>
+	<div class="mainmenu" style="float:right; margin-right:2em">
+		<div>
+			<% if ucic > 0 then %>
+			<a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:Unsaved Changes%>: <%=ucic%></a>
+			<% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
+			<% else %>
+			<a href="#"><%:Changes%>: 0</a>
+			<% end %>
+		</div>
+	</div>
+	<% end %>
+
+	<br class="clear" />
+</div>
+
+<div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
+<noscript>
+	<div class="errorbox">
+		<strong><%:Java Script required!%></strong><br />
+		<%:You must enable Java Script in your browser or LuCI will not work properly.%>
+	</div>
+</noscript>
+<% end %>
diff --git a/trunk/package/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno b/trunk/package/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
new file mode 100755
index 00000000..e5fb8a12
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.themes.Freifunk_BNO=/luci-static/freifunk-bno
+        commit luci
+EOF
+	
diff --git a/trunk/package/luci/themes/freifunk-generic/Makefile b/trunk/package/luci/themes/freifunk-generic/Makefile
new file mode 100644
index 00000000..f7fac774
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..822527ead873a1e8e33f55fb22df23314a8a8ddb
GIT binary patch
literal 354
zcmb7;J8l9o5QhKRhrL)R*uwI{l4y|-#EU@U23SH`B~%m?9DuV>=SV4Xh&-CqT*BC-
zNko+yY4q!#Zyx^Le?xBD=N3eSr;zYp*nnj@%QMDu#yKm56r$4+`mWcNr5+4QZA|qr
zt*g=G-k9-XJefT<^JZ8tS4+E^+Q!Bu#5os*=nK)em8tB%!@oim$pMs-LZT>D<lj)n
zR|&s^k|H#;{OblHxaNiiC6QLQ^e4J0g-fZz8t0d=zyZpI!W<+Bw8QW!kh>^i=j5_0
RhvV_b31jVEYGkPW#|2ttEi3>4

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
new file mode 100644
index 00000000..ed97427c
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
@@ -0,0 +1,1072 @@
+@charset "utf-8";
+
+@media all {
+
+html {
+	min-height: 100%;
+	height: auto;
+}
+
+body {
+	color: #ccc;
+	background:#e5eef5 url(bg.jpg) repeat-x top left;
+	font-family: Verdana, Arial, sans-serif;
+	font-size: 100%;
+	line-height: 100%;
+	padding-bottom: 1.5em;
+}
+
+html, body {
+	height: 99%;
+}
+
+* {
+	margin: 0;
+	padding: 0;
+}
+
+abbr,
+acronym {
+	font-style: normal;
+	font-variant: normal;
+}
+
+abbr[title],
+acronym[title] {
+	border-bottom: 1px dotted;
+	cursor: help;
+}
+
+a:link abbr[title],
+a:visited abbr[title],
+a:link acronym[title],
+a:visited acronym[title] {
+	cursor: pointer;
+}
+
+code {
+	font-family: monospace;
+	white-space: pre;
+}
+
+#maincontent ul {
+	margin-left: 2em;
+}
+
+.warning {
+	color: red;
+	background-color: white;
+	font-weight: bold;
+	text-decoration: blink;
+}
+
+.clear {
+	clear: both;
+}
+
+a img {
+	border: 0;
+}
+
+.skiplink,
+.navigation,
+.hidden {
+	position: absolute;
+	left: -1000px;
+	top: -1000px;
+	width: 0px;
+	height: 0px;
+	overflow: hidden;
+	display: inline;
+}
+
+.error {
+	color: #f00;
+	background-color: white;
+}
+
+.errorbox {
+	border: 1px solid #F00;
+	background-color: #FCC;
+	padding: 5px;
+}
+
+
+.ifacebox {
+	background-color: #FFFFFF;
+	border: 1px solid #CCCCCC;
+	margin: 0 10px;
+	text-align: center;
+	white-space: nowrap;
+}
+
+.ifacebox .ifacebox-head {
+	border-bottom: 1px solid #CCCCCC;
+	padding: 2px;
+}
+
+.ifacebox .ifacebox-body {
+	padding: 2px;
+}
+
+
+.ifacebadge {
+	background-color: #FFFFFF;
+	border: 1px solid #CCCCCC;
+	padding: 2px;
+	margin-left: 2px;
+	display: inline-block;
+}
+
+.ifacebadge-active {
+	border-color: #000000;
+	font-weight: bold;
+}
+
+
+.zonebadge {
+	padding: 2px;
+	display: inline-block;
+	white-space: nowrap;
+	cursor: pointer;
+}
+
+.zonebadge em,
+.zonebadge strong {
+	margin: 3px;
+	display: inline-block;
+}
+
+.zonebadge input {
+	width: 6em;
+	height: 1.5em;
+}
+
+.zonebadge-empty {
+	border: 1px dashed #AAAAAA;
+	color: #AAAAAA;
+	font-style: italic;
+	font-size: smaller;
+}
+
+
+#header {
+	height: auto;
+	background: #FFF url(header.jpg) repeat-x left bottom;
+	color: #ccc;
+	font-weight: bold;
+	text-align:right;
+}
+
+.header_left img {
+	padding: 10px 10px 0px 10px;
+	margin-bottom: 10px;
+}
+
+.header_banner {
+	overflow:hidden;
+	padding-bottom: 6px;
+	text-align:left;
+}
+
+.header_banner img{
+	padding: 0px;
+}
+
+.header_left{
+	text-align:left;
+	max-width: 50%;
+	float:left;
+}
+
+.header_left a{
+	color: #dc0067;
+	font: bold 36px Helvetica;
+	text-decoration: none;
+}
+
+#header h1,
+.header_right {
+	max-width: 45%;
+	text-align: right;
+	font-size: 70%;
+	font-weight: normal;
+	line-height: 160%;
+	float:right;
+	padding: 10px 10px 0 0;
+}
+
+ul.dropdowns {
+	float: left;
+	margin: 0;
+	padding: 0;
+	width: auto;
+	list-style: none;
+}
+
+html>body ul.dropdowns {
+	position: relative;
+}
+
+ul.dropdowns li,
+ul.dropdowns ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+ul.dropdowns li {
+	float: left;
+	position: relative;
+	white-space: nowrap;
+}
+
+ul.dropdowns li ul {
+	position: absolute;
+	z-index: 1000;
+	top: auto;
+	min-width: 10em;
+}
+
+ul.dropdowns li li {
+	float: none;
+	position: relative;
+}
+
+ul.dropdowns li a {
+	display: block;
+}
+
+ul.dropdowns ul li ul {
+	top: 0;
+}
+
+ul.dropdowns li ul,
+ul.dropdowns li.over ul ul,
+ul.dropdowns li.focus ul ul,
+ul.dropdowns li:hover ul ul,
+ul.dropdowns li.over ul ul ul,
+ul.dropdowns li.focus ul ul ul,
+ul.dropdowns li:hover ul ul ul,
+ul.dropdowns li.over ul ul ul ul,
+ul.dropdowns li.focus ul ul ul ul,
+ul.dropdowns li:hover ul ul ul ul {
+	left: -3000px;
+}
+
+ul.dropdowns li.over ul,
+ul.dropdowns li.focus ul,
+ul.dropdowns li:hover ul {
+	left: 0;
+}
+
+ul.dropdowns ul li.over ul,
+ul.dropdowns ul li.focus ul,
+ul.dropdowns ul li:hover ul,
+ul.dropdowns ul ul li.over ul,
+ul.dropdowns ul ul li.focus ul,
+ul.dropdowns ul ul li:hover ul,
+ul.dropdowns ul ul ul li.over ul,
+ul.dropdowns ul ul ul li.focus ul,
+ul.dropdowns ul ul ul li:hover ul {
+	left: 100%;
+}
+
+#xhr_poll_status {
+	cursor: pointer;
+}
+
+#xhr_poll_status #xhr_poll_status_off {
+	font-weight: bold;
+	color: #FF0000;
+}
+
+#xhr_poll_status #xhr_poll_status_on {
+	font-weight: bold;
+	color: #00FF00;
+}
+
+#menubar {
+	position: relative;
+	width: 100%;
+	background: #FFF;
+	color: #004a9c;
+	border-bottom: 1px dotted #5A5A5A;
+}
+#menubar .warning {
+	color: red;
+	background-color: #FFF;
+}
+
+#menubar ul.dropdowns {
+	min-height: 1.8em;
+	background: #FFF;
+	color: #004a9c;
+}
+
+#menubar ul.dropdowns li ul {
+	background: #FFF;
+	color: #004a9c;
+	border-width: 0 1px 1px 1px;
+	border-style: dotted;
+	border-color: #5a5a5a;
+}
+
+#menubar ul.dropdowns ul li ul {
+	border-width: 1px;
+}
+
+html #menubar a:link,
+html #menubar a:visited {
+	position: relative;
+	display: block;
+	padding: 0.5em;
+	background: #FFF;
+	color: #004a9c;
+	text-decoration: none;
+	font-size: 80%;
+	font-weight: normal;
+}
+
+html #menubar a:link:hover,
+html #menubar a:visited:hover,
+html #menubar a:link:active,
+html #menubar a:visited:active,
+#menubar a:link:focus,
+#menubar a:visited:focus {
+	background: #F2F2F2;
+	color: #e60076;
+}
+
+html #menubar a:link.active,
+html #menubar a:visited.active,
+html #menubar a:link.preactive,
+html #menubar a:visited.preactive {
+	background: #FFF;
+	color: #e60076;
+}
+
+html #menubar a:link.warning,
+html #menubar a:visited.warning {
+	background: #FFF;
+	color: red;
+	font-weight: bold;
+	text-decoration: blink;
+}
+
+#menubar ul.dropdowns li.over>a,
+#menubar ul.dropdowns li.focus>a,
+#menubar ul.dropdowns li:hover>a {
+}
+
+.lang_de #submenu_mini_system { min-width: 13.3em; }
+* html .lang_de #submenu_mini_system { width: 13.3em; }
+
+.lang_pt-br #submenu_mini_network { min-width: 14em; }
+* html .lang_pt-br #submenu_mini_network { width: 14em; }
+
+.lang_pt-br #submenu_mini_system { min-width: 11.5em; }
+* html .lang_pt-br #submenu_mini_system { width: 11.5em; }
+
+.lang_ru #submenu_mini_system { min-width: 18em; }
+* html .lang_ru #submenu_mini_system { width: 18em; }
+
+.lang_pt-br #submenu_admin_index { min-width: 11em; }
+* html .lang_pt-br #submenu_admin_index { width: 11em; }
+
+.lang_ru #submenu_admin_index { min-width: 15.5em; }
+* html .lang_ru #submenu_admin_index { width: 15.5em; }
+
+.lang_ru #submenu_admin_status { min-width: 10.5em; }
+* html .lang_ru #submenu_admin_status { width: 10.5em; }
+
+.lang_de #submenu_admin_system { min-width: 13.3em; }
+* html .lang_de #submenu_admin_system { width: 13.3em; }
+
+.lang_fr #submenu_admin_system { min-width: 14.5em; }
+* html .lang_fr #submenu_admin_system { width: 14.5em; }
+
+.lang_pt-br #submenu_admin_system { min-width: 11.5em; }
+* html .lang_pt-br #submenu_admin_system { width: 11.5em; }
+
+.lang_ru #submenu_admin_system { min-width: 18em; }
+* html .lang_ru #submenu_admin_system { width: 18em; }
+
+#submenu_admin_services_chillispot { min-width: 15.5em; }
+* html #submenu_admin_services_chillispot { width: 15.5em; }
+
+#submenu_admin_services_coovachilli { min-width: 15em; }
+* html #submenu_admin_services_coovachilli { width: 15em; }
+
+.lang_ru #submenu_admin_network_routes { min-width: 15.3em; }
+* html .lang_ru #submenu_admin_network_routes { width: 15.3em; }
+
+#submenu_admin_network_firewall { min-width: 14em; }
+* html #submenu_admin_network_firewall { width: 14em; }
+
+.lang_de #submenu_admin_network_firewall { min-width: 16.5em; }
+* html .lang_de #submenu_admin_network_firewall { width: 16.5em; }
+
+.lang_pt-br #submenu_admin_network_firewall { min-width: 15em; }
+* html .lang_pt-br #submenu_admin_network_firewall { width: 15em; }
+
+#modemenu {
+/*	width: auto;*/
+	background: #000;
+	color: #fff;
+	list-style: none;
+	margin-right: 1px;
+}
+
+#modemenu li {
+	float: right;
+	list-style: none;
+}
+
+#savemenu {
+	float: right;
+	margin-right: 2em;
+}
+
+.lang_de #submenu_admin_uci {
+	width: 12em;
+}
+
+.lang_ru #submenu_admin_uci {
+	width: 11.5em;
+}
+
+textarea#syslog {
+	width: 98%;
+	min-height: 500px;
+	border: 3px solid #ccc;
+	padding: 5px;
+	font-family: monospace;
+}
+
+
+#maincontent {
+	clear: both;
+	width: 90%;
+	margin: 0 auto;
+	padding: 0.5em;
+	color: #000;
+	font-size: 80%;
+}
+
+#maincontent h2 {
+	font:normal bold 150% "Trebuchet MS", Verdana, sans-serif;
+	margin: 0.25em 0 0.7em 0;
+	border-bottom: 1px solid;
+	padding: 10px 0 4px 0;
+	color: #404040;
+}
+
+#maincontent h3 {
+	margin: 0.5em 0 1.1em 0;
+	font:italic bold 125% "Trebuchet MS", Verdana, sans-serif;
+	color: #404040;
+}
+
+#maincontent p {
+	margin-bottom: 1em;
+}
+
+.cbi-section {
+	margin-bottom: 0.5em;
+	padding: 0.5em 1em;
+	border: 1px dotted #555;
+	background-color: #fff;
+	color: #000;
+}
+
+.cbi-section legend {
+	font-size: 110%;
+	font-weight: bold;
+	height: 1em;
+	padding: 0.5em 0.25em;
+	background-color: transparent;
+	color: #404040 ;
+}
+
+.cbi-section h2 {
+	margin: 0em 0 0.5em -0.5em !important;
+}
+
+.cbi-section h3 {
+	text-decoration: none !important;
+	font-weight: bold !important;
+	color: #555 !important;
+	margin: 0.25em !important;
+	font-size: 100% !important;
+}
+
+.cbi-section-descr {
+	margin-bottom: 0.5em;
+	font-size: 95%;
+}
+
+.cbi-title-ref {
+	color: inherit;
+	text-decoration: none;
+	padding-right: 18px;
+	background: url('../resources/cbi/link.gif') no-repeat scroll right center;
+	background-color: inherit;
+}
+
+ul.cbi-apply {
+	font-size: 90%;
+}
+
+ul.cbi-tabmenu {
+	padding: 3px 0;
+	margin-left: 0 !important;
+	margin-bottom: -1px;
+	list-style-type: none;
+}
+
+ul.cbi-tabmenu li.cbi-tab,
+ul.cbi-tabmenu li.cbi-tab-disabled {
+	display: inline;
+	margin: 0;
+}
+
+ul.cbi-tabmenu li.cbi-tab a,
+ul.cbi-tabmenu li.cbi-tab-disabled a {
+	text-decoration: none;
+	padding: 3px 7px;
+	margin-right: 3px;
+	border: 1px dotted #bbb;
+	border-bottom: none;
+	background-color: #eee;
+	color: #bbb;
+}
+
+ul.cbi-tabmenu li.cbi-tab-highlighted a {
+	color: #000;
+	background-color: #FFEEAA;
+}
+
+ul.cbi-tabmenu li a:hover {
+	color: #000;
+}
+
+ul.cbi-tabmenu li.cbi-tab a {
+	position: relative;
+	top: 1px;
+	padding-top: 4px;
+	color: #000;
+	background-color: #fff;
+}
+
+div.cbi-tab-descr {
+	background-image: url(/luci-static/resources/cbi/help.gif);
+	background-position: 0.25em 50%;
+	background-repeat: no-repeat;
+	border-bottom: 1px solid #ccc;
+	margin: 0.25em 0.25em 2em;
+	padding: 0.5em 0.5em 0.5em 2em;
+}
+
+input[type=submit],
+input[type=reset],
+input[type=image],
+input[type=button] {
+	cursor: pointer;
+}
+
+select,
+input,
+textarea {
+	background: #fff;
+	color: #000;
+	border: 1px solid #cccccc;
+}
+
+input[type=image] {
+	border: none;
+}
+
+input:focus,
+input:hover,
+select:focus,
+select:hover,
+textarea:focus,
+textarea:hover {
+	background-color: #fff;
+	color: #000;
+}
+
+select,
+input[type=text],
+input[type=password] {
+	width: 20em;
+}
+
+td select,
+td input[type=text],
+td input[type=password] {
+	width: 99%;
+}
+
+img.cbi-image-button {
+	cursor: pointer;
+	margin: 0 2px;
+	vertical-align: middle;
+}
+
+input.cbi-input-user {
+	background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	text-indent: 17px;
+}
+
+input.cbi-input-password {
+	background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	text-indent: 17px;
+}
+
+input.cbi-input-find,
+input.cbi-button-find {
+	background: url('../resources/cbi/find.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding-left: 17px;
+	border: none;
+}
+
+input.cbi-input-reload {
+	background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding-left: 17px;
+}
+
+input.cbi-button{
+	margin-top: 1.3em;
+}
+
+input.cbi-input-add,
+input.cbi-button-add {
+	background: url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+	border: 1px solid #FFF;
+}
+
+input.cbi-input-fieldadd,
+input.cbi-button-fieldadd {
+	background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+}
+
+input.cbi-input-reset,
+input.cbi-button-reset {
+	background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+}
+
+
+}
+
+input.cbi-input-save,
+input.cbi-button-save {
+	background: url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+}
+
+input.cbi-input-apply,
+input.cbi-button-apply {
+	background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+}
+
+input.cbi-input-link,
+input.cbi-button-link {
+	background: url('../resources/cbi/link.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+	border: none;
+}
+
+input.cbi-input-download,
+input.cbi-button-download {
+	background: url('../resources/cbi/download.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+	border: none;
+}
+
+input.cbi-input-remove,
+div.cbi-section-remove input {
+	background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	color: #000;
+	padding: 0 1px 0 17px;
+	border: 1px solid #fff;
+}
+
+input.cbi-button-up {
+	background-image: url('../resources/cbi/up.gif');
+	padding: 0 1px 0 11px;
+}
+
+input.cbi-button-down {
+	background-image: url('../resources/cbi/down.gif');
+	padding: 0 1px 0 11px;
+}
+
+input.cbi-button-edit {
+	background: url('../resources/cbi/edit.gif') no-repeat scroll 1px center;
+	color: #000000;
+	padding: 0 1px 0 17px;
+}
+
+input.cbi-button-reload {
+	background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center;
+	color: #000000;
+	padding: 0 1px 0 17px;
+}
+
+input.cbi-button-remove {
+	background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	color: #000000;
+	padding: 0 1px 0 17px;
+}
+
+.cbi-input-invalid {
+	background-image: url('../resources/cbi/reset.gif');
+	background-repeat: no-repeat;
+	background-position: right;
+	color: #FF0000 !important;
+	border-color: #FF0000;
+}
+
+div.cbi-section-remove input {
+	border-bottom: none;
+}
+
+textarea {
+	margin-left: -1px;
+	margin-bottom: 0.5em;
+}
+
+form > div > input[type=submit],
+form > div > input[type=reset] {
+	float: right;
+	margin-left: 0.5em;
+}
+
+table td,
+table th {
+	color: #000;
+}
+
+table.smalltext {
+	background: #f5f5f5;
+	color: #000;
+	border: 1px solid #666;
+	font-size: 90%;
+	width: 80%;
+	margin-left: auto;
+	margin-right: auto;
+	border-collapse: collapse;
+}
+
+table.smalltext tr:hover td {
+	background-color: #bbddee;
+	color: #000;
+}
+
+table.smalltext tr th {
+	padding: 0 0.25em;
+	border-left: 1px dotted #666;
+	text-align: left;
+}
+
+table.smalltext tr td {
+	padding: 0.2em;
+	border-top: 1px dotted #666;
+	border-left: 1px dotted #666;
+}
+
+table.cbi-section-table .cbi-rowstyle-1 {
+	background-color: #f1f6fa;
+	color: #000;
+}
+
+table.cbi-section-table .cbi-rowstyle-1:hover,
+table.cbi-section-table .cbi-rowstyle-2:hover {
+	background-color: #b2c8d4;
+	color: #000000;
+}
+
+table.cbi-section-table .cbi-section-table-cell {
+	padding: 3px;
+	white-space: nowrap;
+}
+
+.cbi-section .cbi-rowstyle-1 h3 {
+	background-color: #f1f6fa;
+	color: #555;
+}
+
+.cbi-rowstyle-2 {
+	color: #000;
+}
+
+div.cbi-value {
+	clear: left;
+	vertical-align: middle;
+	padding-left: 0.25em;
+	border-bottom: 1px dotted #bbb;
+}
+
+div.cbi-value:hover {
+	background: #f8f8f8;
+	color: #000;
+}
+
+.cbi-value-title {
+	float: left;
+	width: 40%;
+	line-height: 1.8em;
+}
+
+div.cbi-value-field {
+	width: 58%;
+	margin-left: 40%;
+	padding: 0.25em 0;
+}
+
+div.cbi-value-description {
+	font-size: 90%;
+	display: inline;
+}
+
+div.cbi-section-create {
+	clear: left;
+	white-space: nowrap;
+	vertical-align: top;
+}
+
+div.cbi-tblsection-create {
+	border-bottom: 1px dotted #bbb;
+}
+
+div.cbi-section-create .cbi-button {
+	margin: 0.25em;
+}
+
+input.cbi-section-create-name {
+	margin-right: -0.25em;
+	border: 1px solid #999;
+}
+
+div.cbi-map-descr {
+	margin-bottom: 1em;
+}
+
+div.cbi-optionals {
+	padding: 0.25em;
+	border-bottom: 1px dotted #bbb;
+}
+
+div.cbi-section-remove {
+	float: right;
+}
+
+.cbi-section-node {
+	clear: both;
+	border: 1px dotted #bbb;
+	border-bottom: none;
+	padding-bottom: 0;
+}
+
+.cbi-section-node table div {
+	padding-bottom: 0;
+	border-bottom: none;
+}
+
+.cbi-section-node div.cbi-section-table-row {
+	margin: 0.25em;
+}
+
+table.cbi-section-table {
+	width: 100%;
+	font-size: 95%;
+}
+
+table.cbi-section-table th,
+table.cbi-section-table td {
+	text-align: center;
+}
+
+tr.cbi-section-table-descr th {
+	font-weight: bold;
+	font-size: 90%;
+}
+
+td.cbi-section-table-optionals {
+	text-align: left !important;
+	padding-top: 1em;
+}
+
+.cbi-value-helpicon img {
+	vertical-align: bottom;
+}
+
+div.cbi-error {
+	font-size: 95%;
+	font-weight: bold;
+	color: #f00;
+	background-color: #fff;
+}
+
+td.cbi-value-error {
+	border-color: red;
+}
+
+.cbi-value-error input,
+.cbi-value-error select {
+	color: red;
+	background-color: #fcc;
+}
+
+.cbi-section-error {
+	color: red;
+	background-color: white;
+	font-size: 95%;
+	border: 1px dotted red;
+	margin: 3px;
+	padding: 3px;
+}
+
+.left {
+	text-align: left !important;
+}
+
+.right {
+	text-align: right !important;
+}
+
+.footer, .push {
+	height: 2em;
+}
+
+.footer {
+	width: 99%;
+	padding: 0.3em;
+}
+
+
+.wrapper {
+	min-height: 100%;
+	height: auto !important;
+	height: 100%;
+	margin: 0 auto -2em;
+}
+
+.luci a:link,
+.luci a:visited,
+.exectime {
+	color: #666;
+	text-decoration: none;
+	font-size: 70%;
+}
+
+.inline {
+	display: inline;
+}
+
+.error500 {
+	white-space: normal;
+	border: 1px dotted #f00;
+	background-color: #fff;
+	color: #000;
+	padding: 0.5em;
+}
+
+.uci-change-list {
+        font-family: monospace;
+}
+
+.uci-change-list ins,
+.uci-change-legend-label ins {
+        text-decoration: none;
+        border: 1px solid #00FF00;
+        background-color: #CCFFCC;
+        display: block;
+        padding: 2px;
+}
+
+.uci-change-list del,
+.uci-change-legend-label del {
+        text-decoration: none;
+        border: 1px solid #FF0000;
+        background-color: #FFCCCC;
+        display: block;
+        font-style: normal;
+        padding: 2px;
+}
+
+.uci-change-list var,
+.uci-change-legend-label var {
+        text-decoration: none;
+        border: 1px solid #CCCCCC;
+        background-color: #EEEEEE;
+        display: block;
+        font-style: normal;
+        padding: 2px;
+}
+
+.uci-change-list var ins,
+.uci-change-list var del {
+        /*display: inline;*/
+        border: none;
+        white-space: pre;
+        font-style: normal;
+        padding: 0px;
+}
+
+.uci-change-legend {
+        padding: 5px;
+}
+
+.uci-change-legend-label {
+        width: 150px;
+        float: left;
+        font-size: 80%;
+}
+
+.uci-change-legend-label>ins,
+.uci-change-legend-label>del,
+.uci-change-legend-label>var {
+        float: left;
+        margin-right: 4px;
+        width: 10px;
+        height: 10px;
+        display: block;
+}
+
+.uci-change-legend-label var ins,
+.uci-change-legend-label var del {
+        line-height: 6px;
+        border: none;
+}
+
+}
diff --git a/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2fde5a21254674636804e41c7e655640ed869184
GIT binary patch
literal 316
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=TnT3UgnH5N|va+(V^Kh^O0Y5i4CyyY%
zkdPq1prEjrjJU9fl&GMfgrbC$tgO7eys)^Eijtg)jGVk2$Ph-LR(3XaJ`N5(IT1k-
zIg-Ku0}O&33`q=(%#4BzOoEKef{g!<Fo-iSGB7is05*0GpoFXdBTy+TvJ4|LyP!y5
z*py2^X%V0Y(EvzP5L5IP0}nGJ&_ZTG2788^2~bU3pWO?7s+49_uxvNp)BOJ?0M?-_
AqW}N^

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
new file mode 100644
index 00000000..67ed9fb8
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
@@ -0,0 +1,20 @@
+div.cbi-value-field {
+	margin-left: 0 !important;
+}
+
+.cbi-section legend {
+	background-color: #ffffff;
+	color: #555555;
+}
+
+table.cbi-section-table td .cbi-input-text,
+table.cbi-section-table td .cbi-input-select {
+	width: 95% !important;
+}
+
+.cbi-input-user,
+.cbi-input-password {
+	text-indent: 0 !important;
+	padding-left: 1.5em !important;
+	width: 18.5em !important;
+}
diff --git a/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ea06ce77f44ba6a310b338f7b2532c5958830937
GIT binary patch
literal 4722
zcmb7IXEYo@yIvNn?pkb!E_#ic=%NP^S-mHS8mj~$IuYFxy{;C$ZFC|bSW7mdlV}k{
zU%f>C<o@~o+;i@^&zv*o%)Ily&&)IJ%v}GtUI0*QYiMZz2nYxO4{s9SdIq2hAO;c<
z5dn#BGGbz45)dUR=mro93NlJ4goXwRfkJ6-G1Jr1F~Xow1`Y;B78W)(Hd^{STz6Qx
zm|59a{{<nqaRrfpz@(&LRyrsh>;D_qT>vO401iL^37`N%C;<>kaNP@F1^@^Nfj7PV
zFGxV7gha#yz#FS7HGq(S5J*BuLJB0J_}Ap7L_`cAfr4l_#FXK*o}_fJJ2qjQ;u0#h
z;qMA>y)4pCPWiyaEvaf?==G-l%g8?p0ssN=KSBPBoA@LkAOY!(^#K$>03^H-hlG@f
z1o%G`fEx}dF^3oljWXQEGwfX<E!`b){SP1*r;2Uzml28Z-@CWyxn9=q8N4aFo(50?
z32w#%gaVWRZGP18q#8t=gwQb3u83zUq8tqWdxfxIQ+MQqvT*m35lmP}@RQIe+6cay
z_<-w&2-*M#XOHE{kX|FK`>1jl_iP{jypr9JMWN6*DiOnZ4VVe>1)J$&aF4nb6Wxe1
z-*l#RR$O)%>M1%*8+%oH>mY4DiYXpShO4}}nzi!|&fID56D$_pVxn;3j(0RMzY-Z5
ze0@RCSi*`H@3WyAf&+Jgb9enUysU!)-mp22N%RV>9Uw>R5$4@f7WlTQ=&~BH$%TwE
zTQgywQuw|lCkf_uhz1snXu2>jr9%0ujTz!#V6S3rO$7Z^g|gV@+|r_ECU3u8-1^@p
z_=m*e)jrBp@cad@^-|$Ziwml}a=pr#qq4XhS%k8OFn<uW_mPk03}bLnPj}~XkNJ~$
zi}Q((h2I|cf2E_)U$W3~FGPK=_YTiS-AgvJTq`ed(drIuL+eD+53wV~d}*J_R(dw!
z3+I~SGLs|21a6Hd|MjMONak#s2ShW^ZgzQ3DUWB2pfzi&e178d%evO%lPyM}zH&*+
zG6bu2f)CAT?ItPf+{!u;ESC=T4usib4B~{V(Yg~8B_Z7%AQm5HP2O*ot{79ytM)qT
zwDBKL8Z_!;?7y$_Aj=dnA~V;3Sf2N$Lg_Cao3@mXa#tqyr9#f2;zc3R!R&TnbBk^j
zw2V9*?M0f8uI}Aq%j!xw)pVIY*6<kfb7Ty<>Ko0;FTLvgEdTMfNN`Kk`o`)(&PB~~
zqubRl^IK)#+Ft$4!k6K7Da{{(LQGQ8?l=yGFl^B*RffO2(Ot;<tl`ecJ={U_<PM@O
z4UC|$GtL<-wH$1a2{h85S3swf+Z?3<1NxV$5!mKj0*`@cxjK_-Hdg_Dd%8??3-3it
zvl?4;h+!ETUpBcM&^_%os(sAAJcr^P&(`Esy@Rw%oV4yZ{r$3+RYb}_&Y%IlIDF;@
zI4pP`%+Y@pb!dE*?N|9s>$gubKb^R2o>3TMI0POkNbO}gb*t6%?Flxn_n8VNQy|?I
z0MyreL`t~sV2QVN=8F8qZM3K+E846-pkL`9zD5q*6%zf_gVDZEQU$pE;F;2Gs(qf-
zRv`@!HO6uKjzL175QoP6M*E!OFKy%8LHc?hC7)jdS|NE+*>5j-n`5-Bo)>>TmhHJ?
zn9sQ2Yj)d6uZ>9%pv*hZ9vU>U6D6vlJTGv9o>AhWRje;*o*QU~qTWN_;RKQPHfwWf
z<*r#TtDH?*DUnjK(_ucgKC?n^sy^mZ1qbad4{>c1eQLyTS5>&tK1N_xqvX#B@N8?P
zTMf_iT(U2N=1?cH&O@*Hij}tSY=P$8-270CfH`dFh~q@lpzx7PU=gc`5^bmQiH7-X
zdLW0!zY~JYK+N35Y4fRs=^e$<1kD-)UgB0Y#U-#cI~)9r6*R|7L2?Qc)HED0+eqX6
zA<Gtez!q`&dtQPZbeQ>-PQn0=XSyqpEr(pICT*uWW_;i7&6^U;E}Ihdq~rXpGZQpU
zdrFDC@+2#0{!97xxc3@ue$gxUfM(-zoK$i~MHBV-%~mTzc(bK7u|6s;l^L(c`guN)
z3yO$!DV^vOPkDL*nSC8zMtRSWxX`y%-yA<dPd*S~c(`V*DenzjkWLvU=tVIc66%Jp
zQ_|>h+QwU9)tYqeYX+H`ewNDIX=!16!H=NzEjC;~M!wz-QvXxTDs8>%rn{&Ay*d$c
zE-T@?my&2F1HtUDzTukDqcq%oFRJlQEmWY0kGvQSOs6i)U6sy|o=v-1KA4Bct5(A2
zuD&Jl8T`h4Mb`5S(Dlm&y&)RWI8otq`vn9m6`2xvZ)a$^S_&nQqv3?RO|r=?0k`<=
z($4sn3Dsz4)nDwrerJ>O*qu^zI2>q@DME3#JV3zNMT}2*{xy}y)T@<k_I(*}2B!|K
zpj~)*F(Lh6Ny6j!4T!Bb7BoalmAe3OdGZ1o=8vpxuOeXs*3$iC*n7oveE0st2}fiV
zhH0)EJzM>AiTh#LZ>P(b3Et;ovJJH;1FRrKRP2W=rq<ZsAFC|I$}aVJvwb^BX~7)k
ze`wdP(DGvPuWyT8U97p8B733F)q6{sa(Wx{S2LqAyD==72x-3`r!=*03_|?;vmsM5
zlc@2tCYDmk+HxyDEx86#x)X}low5+h!|p!aPAOr?nK}I<g>^EgwGqV9FAur<;m@-x
zNx{iOjAG0{Q3g8&dwI|+Gsdy;umb_HcM7LX?@KDYV7e^B%9i{krSc_ZQyIaID`NRN
z%|3p?9BYC=7U=o6&$*XNWzaei`fP{W%)>hvk8RDXs948HwQQ+$9tabaDzGcw2|dWX
z7sGkq`5P3Y+*T6N)ZHtfkl8uX{L52f7rMfKdjP-5wHcFs4S=)-k!j)=;^&sAuL0pr
zGRX0az&#7KeFpAy99^nc*p8~C5x86ZZ<VCu67F3O&+^QX=>!YBwBUKDB^jy53iGf~
zzytmqe#_~DjPh-9HI8g`K{&N+bg7EI+C^=(qN!^AJ-F#xzLN652eVWVQ7=#jwXqEH
z2v*C|JF;OJ5HqtF%utS39K*c9v<|tLILY`ZD88s623F>IrKqS!)cEuSf3E5Q`@T;N
z*XyUW9hSG1$~hWyi(+c)TkV2~5SUw2Ld|*Rr-{~8ebI0OVFd+qE*B;A^eKvY5B>XG
zv*AY|RXFMyqpV!-pDcj}DJs{Yy8&)`j@#|2u+)j+#>V=XC->Ibq1gPVVsS7MZk^~}
z`;y=T<)(uv&c4}hdm(WZ{7>T8rzPG@k2}74LwoFtXzo7<bSVP$y9E2CDK6mkA)t-^
zoZkNPU}IwVE9TmBE1a#U&(ZKSxQiy_na9;rkD3-2Qa7l=73}o~#?OJ;ZE|Mrr_BZV
zfpepGxwW-}KpUo4uENvA!Z87ohc%3DwDZ>2fc1rzyOX5bJ};ge3E$eXkpx<+<%I<5
zzlwTZ+~;EP<W$FX#yN=W{#50vW^{Yn+pw0l_Q&b-DOSX=dXtJZ%LGvGDfsU|$(N;k
z>LVeUKI>-mhTpQx-tX??d*kUn>yAvHls@wxW8E$62}i3Fcv)8La0Wxl!*(8B=*Zu6
z38i2W*_823o30T5$~+^j^3;wvfv9ys`+$3swGslUkqZ@Ow|6=u-8YRf^&qP-#0<<-
z039j0fonW*URFUHS7WGt3IEY8?E9+Emmu{G3CD_TeAWBHgS^LE6e;auVQbz%9<MMy
zAth}#p3_i)zy+E=#G@a*ru_SIMZo@C+C61E*hkCa?7b_;g&dumU}hNBfGIG>X`jGp
zm4d5EGDG0yC?|_O(T2gIBHN!o@d1ce*2eu88mMjO!5)3t#Gd`Fk!_gu=m>CMUiKRB
zG~2qc3}&Q7kj)pjJE`mIgO3HXXb3vG@;tz;Sp_^zH!+aVwzUb0Y2lu~0=I^I8w;+v
z27I#$!C9(a0|b@ME>lgW&=<V86RWL{Dw8i<M<#H$!ZngwWd&;2R`lNWh1F*=|4?A6
zSn==_;T7Bicmk87>MCGfAW;_K6~mxhFTx+kR#^w}Wjz(0V#xVwZ+EIBb&@xyK;5!M
z=@zMvLsZMvnFvtLV(Ovr;0K58Vc)z}2VY|9Gd?rMrN&<_;wiA&cYo&BKQHyb&m{73
zQ7|w^`br&BkSTkQ0@XoM*sO#S$70PqgAiQc2e#aC1`pi0wU{(pFqJ|bM^y0I&y)6I
zi9)6kCTMUxPTjBg=SQGU&XTVmPc?`7T>vl%8%j__-+DyOahTCRx{_PaV&Tf8lUL@i
zZp7G#&aW+QV<cf!1N-d|<<x#ytPP+|Xn|CVesvuX-;#%{1+?)+jr?*-ZF6Za7IvUl
zwQXmi(891MC5)P~we~!iYXqgYdP>^Q4^LPfV;z_45}Le=@n$%EDO~w@$Y|EFk4IpQ
zt=TrZ;}uixj+wd#cm70?*L$redayGw)?`*@Zv-iEPKP^llcBtAuC2s&x4R(VMNa7+
z>z<>M%ZXcu`d_Wx4zKQdjZH4M_DF-uB>y+#c45rq71A=L*gN!uRs6%ca@xr{)NXPy
zrEhR_jGe`^ibamv*tXE!Tj;F;9rgHceUV8Jqp@gpm*xhe$wWe8A&0#12>4u^lU%L^
z`YZj&STm3#sFBy=CC;#0Wg{ziFbf5Y+0s7pag<hBGSEsbBHpN6Ia6{H*yC$of6uJ2
zD(j8}&T%b1p_-o%W>zwWo>YP#P@dfFJqTe}7|Z(p#e}L8Pv+HZhy3N_c+cWB|0BQ{
zHfdMfd8P<C*Te~4O!TnaXwpsY0>d8J=l`vnD)@7T`V<>{7~GFf-dFM8vdGYhBacOE
zGW4OA9Z!{IFU-)>&iCii<L*swIoYORNAepSbT_}9T!iXdOIOxg4^B?EXF6{i7oa9u
zWYRMw+^WB7B&%Qxe16wykpJ=}M?`9>-P{M|Nb$AOE2ez~8EGF-ucfDjng5<vU;)fK
zeghWorOG##P6nDps-IWOCT5OPdr+I3khjb5Kc7u$gcdTB$}3w1a^L^==z<x}qz~T7
zkg#+!V~lm_U(jRR)Oj3QA{4P%bizf`CrSp#hO*mi>Hl#Qeq-O9)SNE;fu1BKg>0gy
zPPxEyN>|xZHw}?}no^{r{*}|WzOJ49)u<_bz1aF+J@B;6%Li<k6AzbW*mPrBhsb6#
zGKY_mL7Lg=`}3YZ5ku?MW|b|x<DDIci^_V8DdSjn|Da$2(YbF)E+Q3DnTj%?1_MAY
z_};vtFvk`DyV}%lmX#S6Ld-RQ+CLg0-#>SW&b?yGjy-am?}6OE2K+q#H7K}3c~JjR
zKD=l>q~^QSZr<9G?@=nHjCcXX<FZAPPv{TKQOfprHN)+iR9`YgP|D_epQQMra6eUN
z^rz?Th8`o(94*skUD|vM4ch*G2`8<W!+<|s?`q|+6c+ig*ImtzQ$Va~*kHZr-7RK0
zAAOVJV=QmW_}I#~8QtIGJc;TmOYw+NEszEaeVGI{bV+jR*t{~wstKP}TU6xpW#Bur
zKR9=Y^|l~YWR>K<380zV5h~H`nirO;pLRPhG%w|*ObHush~G^D=Vp4_yp1w7U3<^}
zftD^f++hdXzaiVW0g0AZeoEZFf(sd$-S286W^;F{&<j|!%Sx(Cay<C5l}C=>NTqe8
zJI`Z<3>Hq|+3$wLis)0Pp7M&xXL~|6M#>KyaxR*_w93>eR!0O(2mw!r2C7!MSrMNu
zS$rPd4vx5VDld^RYTdGD7Ya!;J+=wQyJeM-Iq^#*l$v;XG-&S6X80z_gnvx8u!j}>
zf>C{b$6v8H<wNJi8^eX-O6g7MMe(xIXtlwcVB+Kb&(o%O&$pSQh|(Ha68}&x>>J^<
zCpY8vq`b5Fz2>GiT2R>+9?jY-f?#M<Ya|1Z5q}J6-x=Oew4##;KJ*y$9{p%8l0Fl!
z<Qv#X!}g9iqzcTWKUVo!KZs-aq2l~~(ZdgHh5MFJG@|6T_pv%3+w{?o#%lo1QgHJ2
zpjHUd<Hgfawyz=22Qn_1yo4XcPJP6*|AN2)&dZmQMwj1dHqsLaW2?{9ik~&fyLoOt
zQ!-dC%|p3X@huO2jV0$a@qk~=7!~(Jelw>mOKm@9`fQ?P^Z;{QOpOuw$<jU)@m%gN
R>hKb&{rUg?$LPHN`5&dNoc;g+

literal 0
HcmV?d00001

diff --git a/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
new file mode 100644
index 00000000..37d77b4f
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
@@ -0,0 +1,59 @@
+#header{
+	padding-left:0px !important;
+	padding-bottom:24px;
+}
+
+.header_left{
+	max-width: 100%;
+}
+
+#mainlogo {
+	max-width: 90%;
+}
+
+#content {
+	margin-left:0px !important; 
+}
+
+#maincontent{
+	font-size:1.2em;
+	line-height:1.5em;
+}
+
+input[type=submit],
+.cbi-button,
+.cbi-button-reset,
+.cbi-button-save{
+	display:inline !important;
+	float:none !important;
+	padding:10px 30px !important;
+	margin: 10px 10px 10px 0 !important;
+}
+
+.cbi-input-text,
+.cbi-input-select,
+.cbi-input-user,
+.cbi-input-password{
+	display:block !important;
+	margin: 0 !important;
+	padding:0 !important;
+}
+
+.cbi-value-field{
+	margin:0 !important;
+	margin-bottom: 1em !important;
+	width:100%  !important;	
+}
+
+.cbi-section legend{
+	white-space:normal !important;
+}
+
+.cbi-value-title{
+	font-weight:bold;
+	float:none !important;
+}
+
+img {
+	max-width:100%;
+}
diff --git a/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
new file mode 100644
index 00000000..660cd8df
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
@@ -0,0 +1,3 @@
+.header_right {
+	display:none;
+}
diff --git a/trunk/package/luci/themes/freifunk-generic/ipkg/postinst b/trunk/package/luci/themes/freifunk-generic/ipkg/postinst
new file mode 100644
index 00000000..76edf362
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/ipkg/postinst
@@ -0,0 +1,3 @@
+[ -n "${IPKG_INSTROOT}" ] || {
+        ( . /etc/uci-defaults/luci-theme-freifunk-generic ) && rm -f /etc/uci-defaults/luci-theme-freifunk-generic
+}
diff --git a/trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm b/trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
new file mode 100644
index 00000000..e9df8cda
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
@@ -0,0 +1,31 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+-%>
+<% local xtime
+if exectime then
+	xtime = (string.format("%.2fs", os.clock() - exectime)) 
+end %>
+
+</div>
+<div class="clear"></div>
+<div class="push"></div>
+</div>
+
+<div class="footer">
+<p class="luci"><a href="http://luci.subsignal.org">Powered by <%= luci.__appname__ .. " (" .. luci.__version__ .. ")" %></a></p>
+<% if xtime then %>
+<p class="exectime">Script execution time: <%=xtime%></p>
+<% end %>
+</div>
+
+</body>
+</html>
+
diff --git a/trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
new file mode 100644
index 00000000..e8b1c062
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -0,0 +1,226 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+-%>
+
+<%
+	local fs   = require "luci.fs"
+	local sys  = require "luci.sys"
+	local http = require "luci.http"
+	local disp = require "luci.dispatcher"
+
+	local hostname = sys.hostname()
+	local load1, load5, load15 = sys.loadavg()
+
+	local request  = disp.context.path
+	local category = request[1]
+	local cattree  = category and disp.node(category)
+
+	local tree = disp.node()
+	local node = disp.context.dispatched
+
+	local categories = disp.node_childs(tree)
+
+	local c = tree
+	local i, r
+
+	-- tag all nodes leading to this page
+	for i, r in ipairs(request) do
+		if c.nodes and c.nodes[r] then
+			c = c.nodes[r]
+			c._menu_selected = true
+		end
+	end
+
+	local uci  = require "luci.model.uci".cursor()
+	local ff = uci:get("freifunk", "community", "name") or ""
+	local co = "profile_" .. ff
+	local community = uci:get_first(co, "community", "name") or "Freifunk"
+	local hp = uci:get_first(co, "community", "homepage") or "http://www.freifunk.net"
+	local logo = "/luci-static/freifunk-generic/logo.jpg"
+	local banner = false
+	local show_comm = true
+
+	local lo = fs.glob("/www/luci-static/resources/custom_logo.*")
+	if lo[1] then
+		logo = string.gsub(lo[1], "/www", "")
+	end
+
+	local lon = fs.glob("/www/luci-static/resources/custom_logo_only.*")
+	if lon[1] then
+		logo = string.gsub(lon[1], "/www", "")
+		show_comm = false
+	end
+
+	local hea = fs.glob("/www/luci-static/resources/custom_header.*")
+	if hea[1] then
+		logo = string.gsub(hea[1], "/www", "")
+		show_comm = false
+		banner = true
+	end
+-%>
+
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%=luci.i18n.context.lang%>" lang="<%=luci.i18n.context.lang%>">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
+<link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css" type="text/css" />
+<link rel="stylesheet" media="only screen and (max-width: 854px)" href="<%=media%>/smallscreen.css" type="text/css" />
+<link rel="stylesheet" media="handheld" href="<%=media%>/mobile.css" type="text/css" />
+<!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie7.css" /><![endif]-->
+<% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
+<% end -%>
+<% if css then %><style title="text/css">
+<%= css %>
+</style>
+<% end -%>
+<meta name="viewport" content="initial-scale=1.0" />
+<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
+
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(tostring(node.title)) or '')) %> - LuCI</title>
+</head>
+
+<body class="lang_<%=luci.i18n.context.lang%>">
+
+<div class="wrapper">
+
+<!--[if lt IE 7]>
+<div class="warning"><div style="background-color: #cccccc;padding: 2px 10px 2px 10px">
+<%: Your Internet Explorer is too old to display this page correctly. Please upgrade it to at least version 7 or use another browser like Firefox, Opera or Safari.%>
+</div></div>
+<![endif]-->
+
+<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
+	<div class="warning">
+		<strong><%:No password set!%></strong><br />
+		<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
+	</div>
+<%- end -%>
+
+<p class="skiplink">
+<span id="skiplink1"><a href="#navigation"><%:skiplink1 Skip to navigation%></a></span>
+<span id="skiplink2"><a href="#content"><%:skiplink2 Skip to content%></a></span>
+</p>
+
+<div id="header">
+	<%if banner then%>
+		<div class="header_banner">
+			<a href="<%=hp%>"><img src="<%=logo%>" alt="Header" /></a>
+		</div>
+	<%else%>
+		<div class="header_left">
+			<a href="<%=hp%>"><img src="<%=logo%>" id="mainlogo" alt="Logo" /></a>
+			<%if show_comm then%>
+				<a href="<%=hp%>"><%=community%></a>
+				<br/>
+			<%end%>
+		</div>
+		<div class="header_right">
+			<%=luci.version.distversion%><br />
+			<%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%><br />
+			<%:Hostname%>: <%=hostname%><br />
+			<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
+				<%:Auto Refresh%>:
+				<span id="xhr_poll_status_on"><%:on%></span>
+				<span id="xhr_poll_status_off" style="display:none"><%:off%></span>
+			</span>
+		</div>
+		<div class="clear"></div>
+
+	<%end%>
+</div>
+
+<%-
+	local function submenu(prefix, node)
+		local childs = disp.node_childs(node)
+		if #childs > 0 then
+%>
+	<ul id="submenu_<%=string.gsub(string.gsub(prefix, "/", "_"), "^_(.-)_$", "%1")%>">
+		<%-
+			for i, r in ipairs(childs) do
+				local nnode = node.nodes[r]
+				local href  = controller .. prefix .. r .. "/" ..
+					(nnode.query and http.build_querystring(nnode.query) or "")
+		%>
+			<li>
+				<a<%=ifattr(nnode._menu_selected, "class", "active")%> href="<%=luci.util.pcdata(href)%>"><%=translate(nnode.title)%></a>
+				<%- submenu(prefix .. r .. "/", nnode) %>
+			</li>
+		<%-
+			end
+		%>
+	</ul>
+<%
+		end
+	end
+%>
+
+<div id="menubar">
+<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<ul id="mainmenu" class="dropdowns">
+	<%
+		local childs = disp.node_childs(cattree)
+		if #childs > 0 then
+			for i, r in ipairs(childs) do
+				local nnode = cattree.nodes[r]
+				local href  = controller .. "/" .. category .. "/" .. r ..
+					(nnode.query and http.build_querystring(k.query) or "")
+	%>
+		<li>
+			<a<%=ifattr(nnode._menu_selected, "class", "preactive")%> href="<%=href%>"><%=translate(nnode.title)%></a>
+			<%- submenu("/" .. category .. "/" .. r .. "/", nnode) %>
+		</li>
+	<%
+			end
+		end
+	%>
+	<li></li>
+</ul>
+
+<% if #categories > 1 then %>
+	<ul id="modemenu">
+	<% for i, r in ipairs(categories) do %>
+		<li><a<%=ifattr(request[1] == r, "class", "active")%> href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a></li>
+	<% end %>
+	</ul>
+<% end %>
+
+<%
+if tree.nodes[category] and tree.nodes[category].ucidata then
+	local ucic = 0
+	for i, j in pairs(require("luci.model.uci").cursor():changes()) do
+		for k, l in pairs(j) do
+			for m, n in pairs(l) do
+				ucic = ucic + 1;
+			end
+		end
+	end
+-%>
+	<div id="savemenu">
+		<% if ucic > 0 then %>
+			<a class="warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=http.urlencode(http.formvalue("redir") or REQUEST_URI)%>"><%:Unsaved Changes%>: <%=ucic%></a>
+		<% end -%>
+	</div>
+<% end %>
+
+<div class="clear"></div>
+</div>
+<div id="maincontent">
+<% if category ~= "freifunk" and category ~= "splash" then %>
+<noscript>
+	<div class="errorbox">
+		<strong><%:Java Script required!%></strong><br />
+		<%:You must enable Java Script in your browser or LuCI will not work properly.%>
+	</div>
+</noscript>
+<% end %>
diff --git a/trunk/package/luci/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic b/trunk/package/luci/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
new file mode 100644
index 00000000..131f54e2
--- /dev/null
+++ b/trunk/package/luci/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
@@ -0,0 +1,4 @@
+uci batch <<-EOF
+        set luci.themes.Freifunk_Generic=/luci-static/freifunk-generic
+        commit luci
+EOF
diff --git a/trunk/package/network/config/firewall/Makefile b/trunk/package/network/config/firewall/Makefile
new file mode 100644
index 00000000..f0414bd9
--- /dev/null
+++ b/trunk/package/network/config/firewall/Makefile
@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=firewall
+PKG_VERSION:=2014-09-19
+PKG_RELEASE:=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/firewall3.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=50e97c52e75bdfd325cf20d43b32d294ff84d92f
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=ISC
+
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/firewall
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=libreCMC C Firewall
+  DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables +kmod-ipt-core +kmod-ipt-nat
+endef
+
+define Package/firewall/description
+ This package provides a config-compatible C implementation of the UCI firewall.
+endef
+
+define Package/firewall/conffiles
+/etc/config/firewall
+/etc/firewall.user
+endef
+
+define Build/Configure
+	$(foreach file,$(wildcard $(STAGING_DIR)/usr/lib/iptables/libext*.a),$(CP) $(file) $(PKG_BUILD_DIR)/$(notdir $(file));)
+	$(call Build/Configure/Default)
+endef
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+CMAKE_OPTIONS += $(if $(CONFIG_IPV6),,-DDISABLE_IPV6=1)
+
+define Package/firewall/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/firewall3 $(1)/sbin/fw3
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files/firewall.hotplug $(1)/etc/hotplug.d/iface/20-firewall
+	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall
+	$(INSTALL_DIR) $(1)/etc/
+	$(INSTALL_DATA) ./files/firewall.user $(1)/etc/firewall.user
+endef
+
+$(eval $(call BuildPackage,firewall))
diff --git a/trunk/package/network/config/firewall/files/firewall.config b/trunk/package/network/config/firewall/files/firewall.config
new file mode 100644
index 00000000..d149e779
--- /dev/null
+++ b/trunk/package/network/config/firewall/files/firewall.config
@@ -0,0 +1,177 @@
+config defaults
+	option syn_flood	1
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		REJECT
+# Uncomment this line to disable ipv6 rules
+#	option disable_ipv6	1
+
+config zone
+	option name		lan
+	list   network		'lan'
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		ACCEPT
+
+config zone
+	option name		wan
+	list   network		'wan'
+	list   network		'wan6'
+	option input		REJECT
+	option output		ACCEPT
+	option forward		REJECT
+	option masq		1
+	option mtu_fix		1
+
+config forwarding
+	option src		lan
+	option dest		wan
+
+# We need to accept udp packets on port 68,
+# see https://dev.openwrt.org/ticket/4108
+config rule
+	option name		Allow-DHCP-Renew
+	option src		wan
+	option proto		udp
+	option dest_port	68
+	option target		ACCEPT
+	option family		ipv4
+
+# Allow IPv4 ping
+config rule
+	option name		Allow-Ping
+	option src		wan
+	option proto		icmp
+	option icmp_type	echo-request
+	option family		ipv4
+	option target		ACCEPT
+
+# Allow DHCPv6 replies
+# see https://dev.openwrt.org/ticket/10381
+config rule
+	option name		Allow-DHCPv6
+	option src		wan
+	option proto		udp
+	option src_ip		fe80::/10
+	option src_port		547
+	option dest_ip		fe80::/10
+	option dest_port	546
+	option family		ipv6
+	option target		ACCEPT
+
+# Allow essential incoming IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Input
+	option src		wan
+	option proto	icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	list icmp_type		router-solicitation
+	list icmp_type		neighbour-solicitation
+	list icmp_type		router-advertisement
+	list icmp_type		neighbour-advertisement
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+
+# Allow essential forwarded IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Forward
+	option src		wan
+	option dest		*
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+
+# include a file with users custom iptables rules
+config include
+	option path /etc/firewall.user
+
+
+### EXAMPLE CONFIG SECTIONS
+# do not allow a specific ip to access wan
+#config rule
+#	option src		lan
+#	option src_ip	192.168.45.2
+#	option dest		wan
+#	option proto	tcp
+#	option target	REJECT
+
+# block a specific mac on wan
+#config rule
+#	option dest		wan
+#	option src_mac	00:11:22:33:44:66
+#	option target	REJECT
+
+# block incoming ICMP traffic on a zone
+#config rule
+#	option src		lan
+#	option proto	ICMP
+#	option target	DROP
+
+# port redirect port coming in on wan to lan
+#config redirect
+#	option src			wan
+#	option src_dport	80
+#	option dest			lan
+#	option dest_ip		192.168.16.235
+#	option dest_port	80
+#	option proto		tcp
+
+# port redirect of remapped ssh port (22001) on wan
+#config redirect
+#	option src		wan
+#	option src_dport	22001
+#	option dest		lan
+#	option dest_port	22
+#	option proto		tcp
+
+# allow IPsec/ESP and ISAKMP passthrough
+#config rule
+#	option src		wan
+#	option dest		lan
+#	option protocol		esp
+#	option target		ACCEPT
+
+#config rule
+#	option src		wan
+#	option dest		lan
+#	option src_port		500
+#	option dest_port	500
+#	option proto		udp
+#	option target		ACCEPT
+
+### FULL CONFIG SECTIONS
+#config rule
+#	option src		lan
+#	option src_ip	192.168.45.2
+#	option src_mac	00:11:22:33:44:55
+#	option src_port	80
+#	option dest		wan
+#	option dest_ip	194.25.2.129
+#	option dest_port	120
+#	option proto	tcp
+#	option target	REJECT
+
+#config redirect
+#	option src		lan
+#	option src_ip	192.168.45.2
+#	option src_mac	00:11:22:33:44:55
+#	option src_port		1024
+#	option src_dport	80
+#	option dest_ip	194.25.2.129
+#	option dest_port	120
+#	option proto	tcp
diff --git a/trunk/package/network/config/firewall/files/firewall.hotplug b/trunk/package/network/config/firewall/files/firewall.hotplug
new file mode 100644
index 00000000..f1eab001
--- /dev/null
+++ b/trunk/package/network/config/firewall/files/firewall.hotplug
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
+[ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" -a -z "$IFUPDATE_DATA" ] && exit 0
+
+/etc/init.d/firewall enabled || exit 0
+
+fw3 -q network "$INTERFACE" >/dev/null || exit 0
+
+logger -t firewall "Reloading firewall due to $ACTION of $INTERFACE ($DEVICE)"
+fw3 -q reload
diff --git a/trunk/package/network/config/firewall/files/firewall.init b/trunk/package/network/config/firewall/files/firewall.init
new file mode 100755
index 00000000..ee3ed1a2
--- /dev/null
+++ b/trunk/package/network/config/firewall/files/firewall.init
@@ -0,0 +1,61 @@
+#!/bin/sh /etc/rc.common
+
+START=19
+USE_PROCD=1
+QUIET=""
+
+validate_firewall_redirect()
+{
+	uci_validate_section firewall redirect "${1}" \
+		'proto:or(uinteger, string)' \
+		'src:string' \
+		'src_ip:cidr' \
+		'src_dport:or(port, portrange)' \
+		'dest:string' \
+		'dest_ip:cidr' \
+		'dest_port:or(port, portrange)' \
+		'target:or("SNAT", "DNAT")'
+}
+
+validate_firewall_rule()
+{
+	uci_validate_section firewall rule "${1}" \
+		'proto:or(uinteger, string)' \
+		'src:string' \
+		'dest:string' \
+		'src_port:or(port, portrange)' \
+		'dest_port:or(port, portrange)' \
+		'target:string'
+}
+
+service_triggers() {
+	procd_add_reload_trigger firewall	
+
+	procd_open_validate
+	validate_firewall_redirect
+	validate_firewall_rule
+	procd_close_validate
+}
+
+restart() {
+	fw3 restart
+}
+
+start_service() {
+	fw3 ${QUIET} start
+}
+
+stop_service() {
+	fw3 flush
+}
+
+reload_service() {
+	fw3 reload
+}
+
+boot() {
+	# Be silent on boot, firewall might be started by hotplug already,
+	# so don't complain in syslog.
+	QUIET=-q
+	start
+}
diff --git a/trunk/package/network/config/firewall/files/firewall.user b/trunk/package/network/config/firewall/files/firewall.user
new file mode 100644
index 00000000..6f799063
--- /dev/null
+++ b/trunk/package/network/config/firewall/files/firewall.user
@@ -0,0 +1,7 @@
+# This file is interpreted as shell script.
+# Put your custom iptables rules here, they will
+# be executed with each firewall (re-)start.
+
+# Internal uci firewall chains are flushed and recreated on reload, so
+# put custom rules into the root chains e.g. INPUT or FORWARD or into the
+# special user chains, e.g. input_wan_rule or postrouting_lan_rule.
diff --git a/trunk/package/network/config/gre/Makefile b/trunk/package/network/config/gre/Makefile
new file mode 100644
index 00000000..217c2769
--- /dev/null
+++ b/trunk/package/network/config/gre/Makefile
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gre
+PKG_VERSION:=1
+PKG_RELEASE:=3
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/gre/Default
+  SECTION:=net
+  CATEGORY:=Network
+  MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
+endef
+
+define Package/gre
+$(call Package/gre/Default)
+  TITLE:=Generic Routing Encapsulation config support
+endef
+
+define Package/gre/description
+ Generic Routing Encapsulation config support (IPv4 and IPv6) in /etc/config/network.
+endef
+
+define Package/grev4
+$(call Package/gre/Default)
+  TITLE:=Generic Routing Encapsulation (IPv4) config support
+  DEPENDS:=@(PACKAGE_gre) +kmod-gre
+endef
+
+define Package/grev4/description
+ Generic Routing Encapsulation config support (IPv4) in /etc/config/network.
+endef
+
+define Package/grev6
+$(call Package/gre/Default)
+  TITLE:=Generic Routing Encapsulation (IPv6) config support
+  DEPENDS:=@(PACKAGE_gre) +kmod-ipv6 +kmod-ip6-gre
+endef
+
+define Package/grev6/description
+ Generic Routing Encapsulation config support (IPv6) in /etc/config/network.
+endef
+
+define Build/Compile
+endef
+
+define Build/Configure
+endef
+
+define Package/gre/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/gre.sh $(1)/lib/netifd/proto/gre.sh
+endef
+
+$(eval $(call BuildPackage,gre))
+$(eval $(call BuildPackage,grev4))
+$(eval $(call BuildPackage,grev6))
diff --git a/trunk/package/network/config/gre/files/gre.sh b/trunk/package/network/config/gre/files/gre.sh
new file mode 100755
index 00000000..4483a087
--- /dev/null
+++ b/trunk/package/network/config/gre/files/gre.sh
@@ -0,0 +1,237 @@
+#!/bin/sh
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+gre_generic_setup() {
+	local cfg="$1"
+	local mode="$2"
+	local local="$3"
+	local remote="$4"
+	local link="$5"
+	local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
+	json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
+
+	[ -z "$zone" ] && zone="wan"
+
+	proto_init_update "$link" 1
+
+	proto_add_tunnel
+	json_add_string mode "$mode"
+	json_add_int mtu "${mtu:-1280}"
+	[ -n "$df" ] && json_add_boolean df "$df"
+	json_add_int ttl "${ttl:-64}"
+	[ -n "$tos" ] && json_add_string tos "$tos"
+	json_add_string local "$local"
+	json_add_string remote "$remote"
+	[ -n "$tunlink" ] && json_add_string link "$tunlink"
+	json_add_string info "${ikey:-0},${okey:-0},${icsum:-0},${ocsum:-0},${iseqno:-0},${oseqno:-0}"
+	proto_close_tunnel
+
+	proto_add_data
+	[ -n "$zone" ] && json_add_string zone "$zone"
+	proto_close_data
+
+	proto_send_update "$cfg"
+}
+
+gre_setup() {
+	local cfg="$1"
+	local mode="$2"
+
+	local ipaddr peeraddr
+	json_get_vars df ipaddr peeraddr tunlink
+
+	[ -z "$peeraddr" ] && {
+		proto_notify_error "$cfg" "MISSING_ADDRESS"
+		proto_block_restart "$cfg"
+		exit
+	}
+
+	( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
+
+	[ -z "$ipaddr" ] && {
+		local wanif="$tunlink"
+		if [ -z $wanif ] && ! network_find_wan wanif; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			exit
+		fi
+
+		if ! network_get_ipaddr ipaddr "$wanif"; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			exit
+		fi
+	}
+
+	[ -z "$df" ] && df="1"
+
+	gre_generic_setup $cfg $mode $ipaddr $peeraddr "gre-$cfg"
+}
+
+proto_gre_setup() {
+	local cfg="$1"
+
+	gre_setup $cfg "greip"
+}
+
+proto_gretap_setup() {
+	local cfg="$1"
+
+	local network
+	json_get_vars network
+
+	gre_setup $cfg "gretapip"
+
+	json_init
+	json_add_string name "gre-$cfg"
+	json_add_boolean link-ext 0
+	json_close_object
+
+	for i in $network; do
+		ubus call network.interface."$i" add_device "$(json_dump)"
+	done
+}
+
+grev6_setup() {
+	local cfg="$1"
+	local mode="$2"
+
+	local ip6addr peer6addr weakif
+	json_get_vars ip6addr peer6addr tunlink weakif
+
+	[ -z "$peer6addr" ] && {
+		proto_notify_error "$cfg" "MISSING_ADDRESS"
+		proto_block_restart "$cfg"
+		exit
+	}
+
+	( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" )
+
+	[ -z "$ip6addr" ] && {
+		local wanif="$tunlink"
+		if [ -z $wanif ] && ! network_find_wan6 wanif; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			exit
+		fi
+
+		if ! network_get_ipaddr6 ip6addr "$wanif"; then
+			[ -z "$weakif" ] && weakif="lan"
+			if ! network_get_ipaddr6 ip6addr "$weakif"; then
+				proto_notify_error "$cfg" "NO_WAN_LINK"
+				exit
+			fi
+		fi
+	}
+
+	gre_generic_setup $cfg $mode $ip6addr $peer6addr "grev6-$cfg"
+}
+
+proto_grev6_setup() {
+	local cfg="$1"
+
+	grev6_setup $cfg "greip6"
+}
+
+proto_grev6tap_setup() {
+	local cfg="$1"
+
+	local network
+	json_get_vars network
+
+	grev6_setup $cfg "gretapip6"
+
+	json_init
+	json_add_string name "grev6-$cfg"
+	json_add_boolean link-ext 0
+	json_close_object
+
+	for i in $network; do
+		ubus call network.interface."$i" add_device "$(json_dump)"
+	done
+}
+
+gretap_generic_teardown() {
+	local network
+	json_get_vars network
+
+	json_init
+	json_add_string name "$1"
+	json_add_boolean link-ext 0
+	json_close_object
+
+	for i in $network; do
+		ubus call network.interface."$i" remove_device "$(json_dump)"
+	done
+}
+
+proto_gre_teardown() {
+	local cfg="$1"
+}
+
+proto_gretap_teardown() {
+	local cfg="$1"
+
+	gretap_generic_teardown "gre-$cfg"
+}
+
+proto_grev6_teardown() {
+	local cfg="$1"
+}
+
+proto_grev6tap_teardown() {
+	local cfg="$1"
+
+	gretap_generic_teardown "grev6-$cfg"
+}
+
+gre_generic_init_config() {
+	no_device=1
+	available=1
+
+	proto_config_add_int "mtu"
+	proto_config_add_int "ttl"
+	proto_config_add_string "tos"
+	proto_config_add_string "tunlink"
+	proto_config_add_string "zone"
+	proto_config_add_int "ikey"
+	proto_config_add_int "okey"
+	proto_config_add_boolean "icsum"
+	proto_config_add_boolean "ocsum"
+	proto_config_add_boolean "iseqno"
+	proto_config_add_boolean "oseqno"
+}
+
+proto_gre_init_config() {
+	gre_generic_init_config
+	proto_config_add_string "ipaddr"
+	proto_config_add_string "peeraddr"
+	proto_config_add_boolean "df"
+}
+
+proto_gretap_init_config() {
+	proto_gre_init_config
+	proto_config_add_string "network"
+}
+
+proto_grev6_init_config() {
+	gre_generic_init_config
+	proto_config_add_string "ip6addr"
+	proto_config_add_string "peer6addr"
+	proto_config_add_string "weakif"
+}
+
+proto_grev6tap_init_config() {
+	proto_grev6_init_config
+	proto_config_add_string "network"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	[ -f /lib/modules/$(uname -r)/gre.ko ] && add_protocol gre
+	[ -f /lib/modules/$(uname -r)/gre.ko ] && add_protocol gretap
+	[ -f /lib/modules/$(uname -r)/ip6_gre.ko ] && add_protocol grev6
+	[ -f /lib/modules/$(uname -r)/ip6_gre.ko ] && add_protocol grev6tap
+}
diff --git a/trunk/package/network/config/ipip/Makefile b/trunk/package/network/config/ipip/Makefile
new file mode 100644
index 00000000..5aa722d2
--- /dev/null
+++ b/trunk/package/network/config/ipip/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ipip
+PKG_VERSION:=1
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ipip
+  SECTION:=net
+  CATEGORY:=Network
+  MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
+  TITLE:=IP in IP Tunnel config support
+  DEPENDS:= +kmod-ipip
+endef
+
+define Package/ipip/description
+ IP in IP Tunnel config support in /etc/config/network.
+endef
+
+define Build/Compile
+endef
+
+define Build/Configure
+endef
+
+define Package/ipip/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/ipip.sh $(1)/lib/netifd/proto/ipip.sh
+endef
+
+$(eval $(call BuildPackage,ipip))
diff --git a/trunk/package/network/config/ipip/files/ipip.sh b/trunk/package/network/config/ipip/files/ipip.sh
new file mode 100755
index 00000000..51c503f8
--- /dev/null
+++ b/trunk/package/network/config/ipip/files/ipip.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_ipip_setup() {
+	local cfg="$1"
+
+	local df ipaddr peeraddr tunlink ttl tos zone mtu
+	json_get_vars df ipaddr peeraddr tunlink ttl tos zone mtu
+
+	[ -z "$peeraddr" ] && {
+		proto_notify_error "$cfg" "MISSING_ADDRESS"
+		proto_block_restart "$cfg"
+		return
+	}
+
+	( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
+
+	[ -z "$ipaddr" ] && {
+		local wanif="$tunlink"
+		if [ -z $wanif ] && ! network_find_wan wanif; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			return
+		fi
+
+		if ! network_get_ipaddr ipaddr "$wanif"; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			return
+		fi
+	}
+
+	[ -z "$zone" ] && zone="wan"
+
+	proto_init_update "ipip-$cfg" 1
+
+	proto_add_tunnel
+	json_add_string mode "ipip"
+	json_add_int mtu "${mtu:-1280}"
+	json_add_int ttl "${ttl:-64}"
+	[ -n "$tos" ] && json_add_string tos "$tos"
+	json_add_string local "$ipaddr"
+	json_add_string remote "$peeraddr"
+	[ -n "$tunlink" ] && json_add_string link "$tunlink"
+	json_add_boolean df "${df:-1}"
+
+	proto_close_tunnel
+
+	proto_add_data
+	[ -n "$zone" ] && json_add_string zone "$zone"
+	proto_close_data
+
+	proto_send_update "$cfg"
+}
+
+proto_ipip_teardown() {
+	local cfg="$1"
+}
+
+proto_ipip_init_config() {
+	no_device=1
+	available=1
+
+	proto_config_add_int "mtu"
+	proto_config_add_int "ttl"
+	proto_config_add_string "tos"
+	proto_config_add_string "tunlink"
+	proto_config_add_string "zone"
+	proto_config_add_string "ipaddr"
+	proto_config_add_string "peeraddr"
+	proto_config_add_boolean "df"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol ipip
+}
diff --git a/trunk/package/network/config/ltq-adsl-app/Makefile b/trunk/package/network/config/ltq-adsl-app/Makefile
new file mode 100644
index 00000000..96701197
--- /dev/null
+++ b/trunk/package/network/config/ltq-adsl-app/Makefile
@@ -0,0 +1,84 @@
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=dsl_cpe_control_danube
+PKG_VERSION:=3.24.4.4
+PKG_RELEASE:=2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/
+PKG_MD5SUM:=ee315306626b68794d3d3636dabfe161
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_LICENSE:=BSD-3-Clause
+
+PKG_FIXUP:=autoreconf
+
+PKG_CONFIG_DEPENDS:=\
+	CONFIG_LTQ_DSL_ENABLE_SOAP \
+	CONFIG_LTQ_DSL_ENABLE_DSL_EVENT_POLLING
+
+PKG_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-adsl-danube TARGET_lantiq_ase:kmod-ltq-adsl-ase
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ltq-adsl-app
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Lantiq DSL userland tool
+  URL:=http://www.lantiq.com/
+  DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_ase) +libpthread
+  MENU:=1
+endef
+
+define Package/ltq-adsl-app/description
+	Infineon DSL CPE API for Amazon SE, Danube and Vinax.
+endef
+
+LTQ_DSL_MAX_DEVICE=1
+LTQ_DSL_LINES_PER_DEVICE=1
+LTQ_DSL_CHANNELS_PER_LINE=1
+
+CONFIGURE_ARGS += \
+	--with-max-device="$(LTQ_DSL_MAX_DEVICE)" \
+	--with-lines-per-device="$(LTQ_DSL_LINES_PER_DEVICE)" \
+	--with-channels-per-line="$(LTQ_DSL_CHANNELS_PER_LINE)" \
+	--enable-danube \
+	--enable-driver-include="-I$(STAGING_DIR)/usr/include/adsl/" \
+	--enable-debug-prints \
+	--enable-add-appl-cflags="-DMAX_CLI_PIPES=2" \
+	--enable-cli-support \
+	--enable-cmv-scripts \
+	--enable-debug-tool-interface \
+	--enable-adsl-led \
+	--enable-dsl-ceoc \
+	--enable-script-notification \
+	--enable-dsl-pm \
+	--enable-dsl-pm-total \
+	--enable-dsl-pm-history \
+	--enable-dsl-pm-showtime \
+	--enable-dsl-pm-channel-counters \
+	--enable-dsl-pm-datapath-counters \
+	--enable-dsl-pm-line-counters \
+	--enable-dsl-pm-channel-thresholds \
+	--enable-dsl-pm-datapath-thresholds \
+	--enable-dsl-pm-line-thresholds \
+	--enable-dsl-pm-optional-parameters
+
+TARGET_CFLAGS += -I$(LINUX_DIR)/include
+
+define Package/ltq-adsl-app/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/
+
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dsl_cpe_control $(1)/sbin
+endef
+
+$(eval $(call BuildPackage,ltq-adsl-app))
diff --git a/trunk/package/network/config/ltq-adsl-app/files/dsl_control b/trunk/package/network/config/ltq-adsl-app/files/dsl_control
new file mode 100644
index 00000000..cece347b
--- /dev/null
+++ b/trunk/package/network/config/ltq-adsl-app/files/dsl_control
@@ -0,0 +1,59 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2012 OpenWrt.org
+
+START=99
+
+EXTRA_COMMANDS="status lucistat"
+EXTRA_HELP="	status  Get DSL status information
+	lucistat  Get status information if lua friendly format"
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
+
+annex_b=10_00_10_00_00_04_00_00
+annex_bdmt=10_00_00_00_00_00_00_00
+annex_b2=00_00_10_00_00_00_00_00
+annex_b2p=00_00_00_00_00_04_00_00
+annex_a=04_01_04_00_00_01_00_00
+annex_at1=01_00_00_00_00_00_00_00
+annex_alite=00_01_00_00_00_00_00_00
+annex_admt=04_00_00_00_00_00_00_00
+annex_a2=00_00_04_00_00_00_00_00
+annex_a2p=00_00_00_00_00_01_00_00
+annex_l=00_00_00_00_04_00_00_00
+annex_m=00_00_00_00_40_00_04_00
+annex_m2=00_00_00_00_40_00_00_00
+annex_m2p=00_00_00_00_00_00_04_00
+
+start() {
+	local annex
+	local firmware
+	local xtu
+	config_load network
+	config_get annex dsl annex
+	config_get firmware dsl firmware
+
+	eval "xtu=\"\${annex_$annex}\""
+
+	[ -z "${firmware}" ] &&
+		firmware=/lib/firmware/adsl.bin
+	[ -f "${firmware}" ] || {
+		echo failed to find $firmware
+		return 1
+	}
+
+	service_start /sbin/dsl_cpe_control -i${xtu} \
+			-n /sbin/dsl_notify.sh \
+			-f ${firmware}
+}
+
+stop() {
+	DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
+	DSL_INTERFACE_STATUS="DOWN" \
+		/sbin/dsl_notify.sh
+
+	service_stop /sbin/dsl_cpe_control
+}
+
diff --git a/trunk/package/network/config/ltq-adsl-app/patches/010-eglibc_compile_fix.patch b/trunk/package/network/config/ltq-adsl-app/patches/010-eglibc_compile_fix.patch
new file mode 100644
index 00000000..268f868e
--- /dev/null
+++ b/trunk/package/network/config/ltq-adsl-app/patches/010-eglibc_compile_fix.patch
@@ -0,0 +1,23 @@
+--- a/configure.in
++++ b/configure.in
+@@ -29,6 +29,8 @@ AC_C_VOLATILE
+ #AC_FUNC_STRTOD
+ #AC_CHECK_FUNCS([ftime gethostbyname gettimeofday localtime_r memset select socket strchr strerror strstr strtoull])
+ 
++AC_SEARCH_LIBS([clock_gettime],[rt])
++
+ #
+ # save the configure arguments
+ #
+--- a/src/dsl_cpe_linux.h
++++ b/src/dsl_cpe_linux.h
+@@ -45,7 +45,8 @@
+ #include <arpa/inet.h>
+ #include <sys/socket.h>          /* socket */
+ #include <sys/sem.h>             /* semget */
+-#include <semaphore.h>           /* sem_t */ 
++#include <semaphore.h>           /* sem_t */
++#include <limits.h>
+ 
+ #ifdef DSL_DEBUG_TOOL_INTERFACE
+ #include <sys/socket.h>
diff --git a/trunk/package/network/config/ltq-vdsl-app/Makefile b/trunk/package/network/config/ltq-vdsl-app/Makefile
new file mode 100644
index 00000000..be86275d
--- /dev/null
+++ b/trunk/package/network/config/ltq-vdsl-app/Makefile
@@ -0,0 +1,77 @@
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ltq-vdsl-app
+PKG_VERSION:=4.11.4
+PKG_RELEASE:=1
+PKG_BASE_NAME:=dsl_cpe_control_vrx
+PKG_SOURCE:=$(PKG_BASE_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=e9152ced26a91fbeefa4f34badb97484
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION)
+PKG_LICENSE:=BSD-2-Clause
+
+PKG_BUILD_DEPENDS:=kmod-ltq-vdsl-vr9
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ltq-vdsl-app
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Lantiq VDSL userland tool
+  URL:=http://www.lantiq.com/
+  DEPENDS:=@TARGET_lantiq_xrx200 +libpthread
+endef
+
+define Package/ltq-vdsl-app/description
+  Userland tool needed to control Lantiq VDSL CPE
+endef
+
+CONFIGURE_ARGS += \
+	--with-max-device="1" \
+	--with-lines-per-device="1" \
+	--with-channels-per-line="1" \
+	--enable-vrx \
+	--enable-driver-include="-I$(STAGING_DIR)/usr/include/drv_vdsl_cpe_api" \
+	--enable-device-driver-include="-I$(STAGING_DIR)/usr/include/vdsl/" \
+	--enable-add-appl-cflags="-DMAX_CLI_PIPES=2" \
+	--enable-ifxos \
+	--enable-ifxos-include="-I$(STAGING_DIR)/usr/include/ifxos" \
+	--enable-ifxos-library="-I$(STAGING_DIR)/usr/lib" \
+	--enable-dsl-ceoc \
+	--enable-dsl-pm-total \
+	--enable-dsl-pm-showtime \
+	--enable-dsl-pm-line-counters \
+	--enable-dsl-pm-line-failure-counters \
+	--enable-dsl-pm-datapath-counters \
+	--enable-dsl-pm-datapath-failure-counters \
+	--enable-deprecated \
+	--disable-soap-support \
+	--enable-dsl-bonding=no \
+	--disable-dti
+
+ifeq ($(CONFIG_IFX_CLI),y)
+CONFIGURE_ARGS += \
+	--enable-cli-support
+endif
+
+CONFIGURE_ARGS += --enable-model=full
+#CONFIGURE_ARGS += --enable-model=lite
+#CONFIGURE_ARGS += --enable-model=footprint
+#CONFIGURE_ARGS += --enable-model=typical
+#CONFIGURE_ARGS += --enable-model=debug
+
+define Package/ltq-vdsl-app/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/
+
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dsl_cpe_control $(1)/sbin/vdsl_cpe_control
+endef
+
+$(eval $(call BuildPackage,ltq-vdsl-app))
diff --git a/trunk/package/network/config/ltq-vdsl-app/files/dsl_control b/trunk/package/network/config/ltq-vdsl-app/files/dsl_control
new file mode 100644
index 00000000..bededb26
--- /dev/null
+++ b/trunk/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -0,0 +1,197 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2012 OpenWrt.org
+
+# needs to start before the atm layer which starts at 50
+START=48
+
+EXTRA_COMMANDS="status lucistat"
+EXTRA_HELP="	status  Get DSL status information
+	lucistat  Get status information if lua friendly format"
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
+XDSL_CTRL=vdsl_cpe_control
+
+# G.992.1 Annex A
+# G.992.2 Annex A
+# G.992.3 Annex A
+# G.992.4 Annex A
+# G.992.5 Annex A
+# G.993.2 Annex A/B/C
+xtse_adsl_a="04 01 04 01 00 01 00 00"
+
+# G.992.1 Annex B
+# G.992.3 Annex B
+# G.992.5 Annex B
+# G.993.2 Annex A/B/C
+xtse_adsl_b="10 00 10 00 00 04 00 00"
+
+# G.992.1 Annex B
+# G.992.3 Annex B
+# G.992.3 Annex J
+# G.992.5 Annex B
+# G.992.5 Annex J
+# G.993.2 Annex A/B/C
+xtse_adsl_j="10 00 10 40 00 04 01 00"
+
+xtse_vdsl="00 00 00 00 00 00 00 07"
+
+xdsl_scr() {
+	val=`echo $2 | sed "s/ / 0x/g"`
+	echo "[WaitForConfiguration]={
+#G997XTUSEC_g997xtusecs 0x$val
+}
+
+[WaitForLinkActivate]={
+}
+
+[WaitForRestart]={
+}
+
+[Common]={
+}" > /tmp/$1.scr
+}
+
+# A43
+tone_adsl_a="0x142"
+tone_vdsl_a="0x142"
+
+# A43 + V43
+tone_adsl_av="0x142"
+tone_vdsl_av="0x146"
+
+# B43
+tone_adsl_b="0x1"
+tone_vdsl_b="0x1"
+
+# B43 + V43
+tone_adsl_bv="0x1"
+tone_vdsl_bv="0x5"
+
+lowlevel_cfg() {
+	echo "# VRX Low Level Configuration File
+#
+# Parameters must be separated by tabs or spaces.
+# Empty lines and comments will be ignored.
+#
+
+# nFilter
+#
+# NA     = -1
+# OFF    = 0
+# ISDN   = 1
+# POTS   = 2
+# POTS_2 = 3
+# POTS_3 = 4
+#
+#  (dec)
+    -1
+
+# nHsToneGroupMode nHsToneGroup_A       nHsToneGroup_V    nHsToneGroup_AV
+#
+# NA     = -1      NA         = -1      see               see
+# AUTO   = 0       VDSL2_B43  = 0x0001  nHsToneGroup_A    nHsToneGroup_A
+# MANUAL = 1       VDSL2_A43  = 0x0002
+#                  VDSL2_V43  = 0x0004
+#                  VDSL1_V43P = 0x0008
+#                  VDSL1_V43I = 0x0010
+#                  ADSL1_C43  = 0x0020
+#                  ADSL2_J43  = 0x0040
+#                  ADSL2_B43C = 0x0080
+#                  ADSL2_A43C = 0x0100
+#
+#  (dec)           (hex)                (hex)             (hex)
+     1             $1			$2		 0x0
+
+#   nBaseAddr     nIrqNum
+#
+#     (hex)        (dec)
+    0x1e116000      63
+
+# nUtopiaPhyAdr   nUtopiaBusWidth      nPosPhyParity
+#                 default(16b) = 0     NA   = -1
+#                 8-bit        = 1     ODD  = 0
+#                 16-bit       = 2
+#
+#
+#    (hex)            (dec)                (dec)
+      0xFF              0                    0
+
+# bNtrEnable
+#
+#  (dec)
+    0" > /tmp/lowlevel.cfg
+}
+
+start() {
+	local annex
+	local firmware
+	local tone
+	local tone_adsl
+	local tone_vdsl
+	local xtse
+	local xtse_adsl
+	local mode
+
+	config_load network
+	config_get tone dsl tone
+	config_get annex dsl annex
+	config_get firmware dsl firmware
+	config_get xfer_mode dsl xfer_mode
+
+	[ -z "${xfer_mode}" ] && xfer_mode=ptm
+
+	case "${xfer_mode}" in
+	atm)
+		insmod ltq_atm_vr9
+		mode=1
+		;;
+	*)
+		insmod ltq_ptm_vr9
+		mode=2
+		;;
+	esac
+
+	eval "xtse_adsl=\"\${xtse_adsl_$annex}\""
+	if [ "${xtse_adsl}" ]; then
+		xtse=$xtse_adsl
+	else
+		xtse_adsl=$xtse_adsl_a
+		xtse=$xtse_vdsl
+	fi
+
+	eval "tone_adsl=\"\${tone_adsl_$tone}\""
+	[ -z "${tone_adsl}" ] && tone_adsl=$tone_adsl_av
+
+	eval "tone_vdsl=\"\${tone_vdsl_$tone}\""
+	[ -z "${tone_vdsl}" ] && tone_vdsl=$tone_vdsl_av
+		
+	[ -z "${firmware}" ] && firmware=/lib/firmware/vdsl.bin
+	[ -f "${firmware}" ] || {
+		echo failed to find $firmware
+		return 1
+	}
+
+	xdsl_scr adsl "${xtse_adsl}"
+	xdsl_scr vdsl "${xtse_vdsl}"
+	lowlevel_cfg "${tone_adsl}" "${tone_vdsl}"
+
+	service_start /sbin/vdsl_cpe_control \
+			-i `echo $xtse | sed "s/ /_/g"` \
+			-n /sbin/dsl_notify.sh \
+			-f ${firmware} \
+			-a /tmp/adsl.scr \
+			-A /tmp/vdsl.scr \
+			-l /tmp/lowlevel.cfg \
+			-M ${mode}
+}
+
+stop() {
+	DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
+	DSL_INTERFACE_STATUS="DOWN" \
+		/sbin/dsl_notify.sh
+
+	service_stop /sbin/vdsl_cpe_control
+}
diff --git a/trunk/package/network/config/ltq-vdsl-app/patches/100-compat.patch b/trunk/package/network/config/ltq-vdsl-app/patches/100-compat.patch
new file mode 100644
index 00000000..da562324
--- /dev/null
+++ b/trunk/package/network/config/ltq-vdsl-app/patches/100-compat.patch
@@ -0,0 +1,26 @@
+Index: dsl_cpe_control-4.11.4/src/dsl_cpe_init_cfg.c
+===================================================================
+--- dsl_cpe_control-4.11.4.orig/src/dsl_cpe_init_cfg.c	2011-10-26 00:35:26.000000000 +0200
++++ dsl_cpe_control-4.11.4/src/dsl_cpe_init_cfg.c	2012-11-28 15:53:10.857692092 +0100
+@@ -43,7 +43,7 @@
+    {
+    DSL_CPE_LL_CFG_SET(-1, -1, DSL_DEV_HS_TONE_GROUP_VDSL2_B43, \
+       DSL_DEV_HS_TONE_GROUP_VDSL2_B43, DSL_DEV_HS_TONE_GROUP_VDSL2_B43, \
+-      0x1E116000, 0x37, -1),
++      0x1E116000, 0x3f, -1),
+ #endif
+ 
+ #if defined(INCLUDE_DSL_CPE_API_VINAX)
+Index: dsl_cpe_control-4.11.4/src/dsl_cpe_control.c
+===================================================================
+--- dsl_cpe_control-4.11.4.orig/src/dsl_cpe_control.c	2012-01-13 15:15:34.000000000 +0100
++++ dsl_cpe_control-4.11.4/src/dsl_cpe_control.c	2012-11-28 15:53:23.465692408 +0100
+@@ -6432,7 +6432,7 @@
+    for (nDevice = 0; nDevice < DSL_CPE_MAX_DEVICE_NUMBER; nDevice++)
+    {
+ #if defined(INCLUDE_DSL_CPE_API_VINAX) || defined(INCLUDE_DSL_CPE_API_VRX)
+-      sprintf (device, "%s/%d", DSL_CPE_DEVICE_NAME, nDevice);
++      sprintf (device, "%s%d", DSL_CPE_DEVICE_NAME, nDevice);
+ #else
+       sprintf (device, "%s", DSL_CPE_DEVICE_NAME);
+ #endif /* defined(INCLUDE_DSL_CPE_API_VINAX) || defined(INCLUDE_DSL_CPE_API_VRX)*/
diff --git a/trunk/package/network/config/netifd/Makefile b/trunk/package/network/config/netifd/Makefile
new file mode 100644
index 00000000..43a51207
--- /dev/null
+++ b/trunk/package/network/config/netifd/Makefile
@@ -0,0 +1,46 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=netifd
+PKG_VERSION:=2014-12-08
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=19c53807d9dc62782d03c5564630ed1bcb953cd8
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+# PKG_MIRROR_MD5SUM:=
+# CMAKE_INSTALL:=1
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/netifd
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox
+  TITLE:=libreCMC Network Interface Configuration Daemon
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(STAGING_DIR)/usr/include
+
+CMAKE_OPTIONS += \
+	-DLIBNL_LIBS=-lnl-tiny \
+	-DDEBUG=1
+
+define Package/netifd/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/
+	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/
+endef
+
+$(eval $(call BuildPackage,netifd))
diff --git a/trunk/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate b/trunk/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
new file mode 100644
index 00000000..023025cd
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
@@ -0,0 +1,7 @@
+[ ifup = "$ACTION" ] && {
+	uci_toggle_state network "$INTERFACE" up 1
+	[ -n "$DEVICE" ] && {
+		uci_toggle_state network "$INTERFACE" device "$(uci -q get network.$INTERFACE.ifname)"
+		uci_toggle_state network "$INTERFACE" ifname "$DEVICE"
+	}
+}
diff --git a/trunk/package/network/config/netifd/files/etc/init.d/network b/trunk/package/network/config/netifd/files/etc/init.d/network
new file mode 100755
index 00000000..fbba9ecb
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/etc/init.d/network
@@ -0,0 +1,152 @@
+#!/bin/sh /etc/rc.common
+
+START=20
+STOP=90
+
+USE_PROCD=1
+
+init_switch() {
+	setup_switch() { return 0; }
+
+	include /lib/network
+	setup_switch
+}
+
+start_service() {
+	init_switch
+
+	procd_open_instance
+	procd_set_param command /sbin/netifd
+	procd_set_param respawn
+	procd_set_param watch network.interface
+	[ -e /proc/sys/kernel/core_pattern ] && {
+		procd_set_param limits core="unlimited"
+		echo '/tmp/%e.%p.%s.%t.core' > /proc/sys/kernel/core_pattern
+	}
+	procd_close_instance
+}
+
+reload_service() {
+	init_switch
+	ubus call network reload
+	/sbin/wifi reload_legacy
+}
+
+stop() {
+	/sbin/wifi down
+	procd_kill network ''
+}
+
+service_running() {
+	ubus -t 30 wait_for network.interface
+	/sbin/wifi reload_legacy
+}
+
+validate_atm_bridge_section()
+{
+	uci_validate_section network "atm-bridge" "${1}" \
+		'unit:uinteger:0' \
+		'vci:range(32, 65535):35' \
+		'vpi:range(0, 255):8' \
+		'atmdev:uinteger:0' \
+		'encaps:or("llc", "vc"):llc' \
+		'payload:or("bridged", "routed"):bridged'
+}
+
+validate_route_section()
+{
+	uci_validate_section network route "${1}" \
+		'interface:string' \
+		'target:cidr4' \
+		'netmask:netmask4' \
+		'gateway:ip4addr' \
+		'metric:uinteger' \
+		'mtu:uinteger' \
+		'table:or(range(0,65535),string)'
+}
+
+validate_route6_section()
+{
+	uci_validate_section network route6 "${1}" \
+		'interface:string' \
+		'target:cidr6' \
+		'gateway:ip6addr' \
+		'metric:uinteger' \
+		'mtu:uinteger' \
+		'table:or(range(0,65535),string)'
+}
+
+validate_rule_section()
+{
+	uci_validate_section network rule "${1}" \
+		'in:string' \
+		'out:string' \
+		'src:cidr4' \
+		'dest:cidr4' \
+		'tos:range(0,31)' \
+		'mark:string' \
+		'invert:bool' \
+		'lookup:or(range(0,65535),string)' \
+		'goto:range(0,65535)' \
+		'action:or("prohibit", "unreachable", "blackhole", "throw")'
+}
+
+validate_rule6_section()
+{
+	uci_validate_section network rule6 "${1}" \
+		'in:string' \
+		'out:string' \
+		'src:cidr6' \
+		'dest:cidr6' \
+		'tos:range(0,31)' \
+		'mark:string' \
+		'invert:bool' \
+		'lookup:or(range(0,65535),string)' \
+		'goto:range(0,65535)' \
+		'action:or("prohibit", "unreachable", "blackhole", "throw")'
+}
+
+validate_switch_section()
+{
+	uci_validate_section network switch "${1}" \
+		'name:string' \
+		'enable:bool' \
+		'enable_vlan:bool' \
+		'reset:bool'
+}
+
+validate_switch_vlan()
+{
+	uci_validate_section network switch_vlan "${1}" \
+		'device:string' \
+		'vlan:uinteger' \
+		'ports:list(ports)'
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger network wireless
+
+	procd_open_validate
+	validate_atm_bridge_section
+	validate_route_section
+	validate_route6_section
+	validate_rule_section
+	validate_rule6_section
+	validate_switch_section
+	validate_switch_vlan
+	procd_close_validate
+}
+
+restart() {
+	ifdown -a
+	sleep 1
+	trap '' TERM
+	stop "$@"
+	start "$@"
+}
+
+shutdown() {
+	ifdown -a
+	stop
+}
diff --git a/trunk/package/network/config/netifd/files/lib/netifd/dhcp.script b/trunk/package/network/config/netifd/files/lib/netifd/dhcp.script
new file mode 100755
index 00000000..17e22af7
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -0,0 +1,98 @@
+#!/bin/sh
+[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
+
+. /lib/functions.sh
+. /lib/netifd/netifd-proto.sh
+
+set_classless_routes() {
+	local max=128
+	local type
+	while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
+		proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2"
+		max=$(($max-1))
+		shift 2
+	done
+}
+
+setup_interface () {
+	proto_init_update "*" 1
+	proto_add_ipv4_address "$ip" "${subnet:-255.255.255.0}"
+	# TODO: apply $broadcast
+
+	for i in $router; do
+		proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
+	done
+
+	# CIDR STATIC ROUTES (rfc3442)
+	[ -n "$staticroutes" ] && set_classless_routes $staticroutes
+	[ -n "$msstaticroutes" ] && set_classless_routes $msstaticroutes
+
+	for dns in $dns; do
+		proto_add_dns_server "$dns"
+	done
+	for domain in $domain; do
+		proto_add_dns_search "$domain"
+	done
+
+	proto_add_data
+	[ -n "$ZONE" ] && json_add_string zone "$ZONE"
+	proto_close_data
+
+	proto_send_update "$INTERFACE"
+
+
+	if [ "$IFACE6RD" != 0 -a -n "$ip6rd" ]; then
+		local v4mask="${ip6rd%% *}"
+		ip6rd="${ip6rd#* }"
+		local ip6rdprefixlen="${ip6rd%% *}"
+		ip6rd="${ip6rd#* }"
+		local ip6rdprefix="${ip6rd%% *}"
+		ip6rd="${ip6rd#* }"
+		local ip6rdbr="${ip6rd%% *}"
+
+		[ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE)
+		[ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6rd
+
+		json_init
+		json_add_string name "$IFACE6RD"
+		json_add_string ifname "@$INTERFACE"
+		json_add_string proto "6rd"
+		json_add_string peeraddr "$ip6rdbr"
+		json_add_int ip4prefixlen "$v4mask"
+		json_add_string ip6prefix "$ip6rdprefix"
+		json_add_int ip6prefixlen "$ip6rdprefixlen"
+		json_add_string tunlink "$INTERFACE"
+		[ -n "$IFACE6RD_DELEGATE" ] && json_add_boolean delegate "$IFACE6RD_DELEGATE"
+		[ -n "$ZONE6RD" ] || ZONE6RD=$ZONE
+		[ -n "$ZONE6RD" ] && json_add_string zone "$ZONE6RD"
+		[ -n "$MTU6RD" ] && json_add_string mtu "$MTU6RD"
+		json_close_object
+
+		ubus call network add_dynamic "$(json_dump)"
+	fi
+
+	# TODO
+	# [ -n "$ntpsrv" ] && 	change_state network "$ifc" lease_ntpsrv "$ntpsrv"
+	# [ -n "$timesvr" ] && 	change_state network "$ifc" lease_timesrv "$timesvr"
+	# [ -n "$hostname" ] &&	change_state network "$ifc" lease_hostname "$hostname"
+	# [ -n "$timezone" ] && 	change_state network "$ifc" lease_timezone "$timezone"
+}
+
+deconfig_interface() {
+	proto_init_update "*" 0
+	proto_send_update "$INTERFACE"
+}
+
+case "$1" in
+	deconfig)
+		deconfig_interface
+	;;
+	renew|bound)
+		setup_interface
+	;;
+esac
+
+# user rules
+[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
+
+exit 0
diff --git a/trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
new file mode 100755
index 00000000..d4c483d6
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
+
+proto_dhcp_init_config() {
+	renew_handler=1
+
+	proto_config_add_string 'ipaddr:ipaddr'
+	proto_config_add_string 'hostname:hostname'
+	proto_config_add_string clientid
+	proto_config_add_string vendorid
+	proto_config_add_boolean 'broadcast:bool'
+	proto_config_add_string 'reqopts:list(string)'
+	proto_config_add_string iface6rd
+	proto_config_add_string sendopts
+	proto_config_add_boolean delegate
+	proto_config_add_string zone6rd
+	proto_config_add_string zone
+	proto_config_add_string mtu6rd
+}
+
+proto_dhcp_setup() {
+	local config="$1"
+	local iface="$2"
+
+	local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd
+	json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd
+
+	local opt dhcpopts
+	for opt in $reqopts; do
+		append dhcpopts "-O $opt"
+	done
+
+	for opt in $sendopts; do
+		append dhcpopts "-x $opt"
+	done
+
+	[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
+	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
+	[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
+	[ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
+	[ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
+	[ -n "$zone" ] && proto_export "ZONE=$zone"
+	[ -n "$mtu6rd" ] && proto_export "MTU6RD=$mtu6rd"
+	[ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
+
+	proto_export "INTERFACE=$config"
+	proto_run_command "$config" udhcpc \
+		-p /var/run/udhcpc-$iface.pid \
+		-s /lib/netifd/dhcp.script \
+		-f -t 0 -i "$iface" \
+		${ipaddr:+-r $ipaddr} \
+		${hostname:+-H $hostname} \
+		${vendorid:+-V $vendorid} \
+		$clientid $broadcast $dhcpopts
+}
+
+proto_dhcp_renew() {
+	local interface="$1"
+	# SIGUSR1 forces udhcpc to renew its lease
+	local sigusr1="$(kill -l SIGUSR1)"
+	[ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1
+}
+
+proto_dhcp_teardown() {
+	local interface="$1"
+	proto_kill_command "$interface"
+}
+
+add_protocol dhcp
diff --git a/trunk/package/network/config/netifd/files/lib/network/config.sh b/trunk/package/network/config/netifd/files/lib/network/config.sh
new file mode 100755
index 00000000..9128971d
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/lib/network/config.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+# Copyright (C) 2011 OpenWrt.org
+
+. /usr/share/libubox/jshn.sh
+
+find_config() {
+	local device="$1"
+	local ifdev ifl3dev ifobj
+	for ifobj in `ubus list network.interface.\*`; do
+		interface="${ifobj##network.interface.}"
+		(
+			json_load "$(ifstatus $interface)"
+			json_get_var ifdev device
+			json_get_var ifl3dev l3_device
+			if [[ "$device" = "$ifdev" ]] || [[ "$device" = "$ifl3dev" ]]; then
+				echo "$interface"
+				exit 0
+			else
+				exit 1
+			fi
+		) && return
+	done
+}
+
+unbridge() {
+	return
+}
+
+ubus_call() {
+	json_init
+	local _data="$(ubus -S call "$1" "$2")"
+	[ -z "$_data" ] && return 1
+	json_load "$_data"
+	return 0
+}
+
+
+fixup_interface() {
+	local config="$1"
+	local ifname type device l3dev
+
+	config_get type "$config" type
+	config_get ifname "$config" ifname
+	config_get device "$config" device "$ifname"
+	[ "bridge" = "$type" ] && ifname="br-$config"
+	config_set "$config" device "$ifname"
+	ubus_call "network.interface.$config" status || return 0
+	json_get_var l3dev l3_device
+	[ -n "$l3dev" ] && ifname="$l3dev"
+	json_init
+	config_set "$config" ifname "$ifname"
+	config_set "$config" device "$device"
+}
+
+scan_interfaces() {
+	config_load network
+	config_foreach fixup_interface interface
+}
+
+prepare_interface_bridge() {
+	local config="$1"
+
+	[ -n "$config" ] || return 0
+	ubus call network.interface."$config" prepare
+}
+
+setup_interface() {
+	local iface="$1"
+	local config="$2"
+
+	[ -n "$config" ] || return 0
+	ubus call network.interface."$config" add_device "{ \"name\": \"$iface\" }"
+}
+
+do_sysctl() {
+	[ -n "$2" ] && \
+		sysctl -n -e -w "$1=$2" >/dev/null || \
+		sysctl -n -e "$1"
+}
diff --git a/trunk/package/network/config/netifd/files/sbin/devstatus b/trunk/package/network/config/netifd/files/sbin/devstatus
new file mode 100755
index 00000000..3c35b26a
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/sbin/devstatus
@@ -0,0 +1,12 @@
+#!/bin/sh
+. /usr/share/libubox/jshn.sh
+DEVICE="$1"
+
+[ -n "$DEVICE" ] || {
+	echo "Usage: $0 <device>"
+	exit 1
+}
+
+json_init
+json_add_string name "$DEVICE"
+ubus call network.device status "$(json_dump)"
diff --git a/trunk/package/network/config/netifd/files/sbin/ifdown b/trunk/package/network/config/netifd/files/sbin/ifdown
new file mode 100755
index 00000000..af3aaa84
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/sbin/ifdown
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+ifup_all=
+setup_wifi=
+
+if_call() {
+	local interface="$1"
+	for mode in $modes; do
+		ubus call network.interface $mode "{ \"interface\" : \"$interface\" }"
+	done
+}
+
+case "$0" in
+	*ifdown) modes=down;;
+	*ifup)
+		modes="down up"
+		setup_wifi=1
+	;;
+	*) echo "Invalid command: $0";;
+esac
+
+while :; do
+	case "$1" in
+		-a)
+			ifup_all=1
+			shift
+		;;
+		-w)
+			setup_wifi=
+			shift
+		;;
+		*)
+			break
+		;;
+	esac
+done
+
+[ "$modes" = "down up" ] && ubus call network reload
+if [ -n "$ifup_all" ]; then
+	for interface in `ubus -S list 'network.interface.*'`; do
+		if_call "${interface##network.interface.}"
+	done
+	[ -n "$setup_wifi" ] && /sbin/wifi up
+	exit
+else
+	ubus -S list "network.interface.$1" > /dev/null || {
+		echo "Interface $1 not found"
+		exit
+	}
+	if_call "$1"
+fi
+
+if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then
+	. /lib/functions.sh
+
+	find_related_radios() {
+		local wdev wnet
+		config_get wdev "$1" device
+		config_get wnet "$1" network
+
+		if [ -n "$wdev" ]; then
+			for wnet in $wnet; do
+				if [ "$wnet" = "$network" ]; then
+					append radio_devs "$wdev" "$N"
+				fi
+			done
+		fi
+	}
+
+	local radio_devs
+	local network="$1"
+	config_load wireless
+	config_foreach find_related_radios wifi-iface
+
+	local dev
+	for dev in $(echo "$radio_devs" | sort -u); do
+		/sbin/wifi up "$dev"
+	done
+fi
diff --git a/trunk/package/network/config/netifd/files/sbin/ifstatus b/trunk/package/network/config/netifd/files/sbin/ifstatus
new file mode 100755
index 00000000..8a951e6e
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/sbin/ifstatus
@@ -0,0 +1,13 @@
+#!/bin/sh
+INTERFACE="$1"
+
+[ -n "$INTERFACE" ] || {
+	echo "Usage: $0 <interface>"
+	exit 1
+}
+
+ubus -S list "network.interface.$INTERFACE" >/dev/null || {
+	echo "Interface $INTERFACE not found"
+	exit 1
+}
+ubus call network.interface status "{ \"interface\" : \"$INTERFACE\" }"
diff --git a/trunk/package/network/config/netifd/files/sbin/ifup b/trunk/package/network/config/netifd/files/sbin/ifup
new file mode 100755
index 00000000..af3aaa84
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/sbin/ifup
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+ifup_all=
+setup_wifi=
+
+if_call() {
+	local interface="$1"
+	for mode in $modes; do
+		ubus call network.interface $mode "{ \"interface\" : \"$interface\" }"
+	done
+}
+
+case "$0" in
+	*ifdown) modes=down;;
+	*ifup)
+		modes="down up"
+		setup_wifi=1
+	;;
+	*) echo "Invalid command: $0";;
+esac
+
+while :; do
+	case "$1" in
+		-a)
+			ifup_all=1
+			shift
+		;;
+		-w)
+			setup_wifi=
+			shift
+		;;
+		*)
+			break
+		;;
+	esac
+done
+
+[ "$modes" = "down up" ] && ubus call network reload
+if [ -n "$ifup_all" ]; then
+	for interface in `ubus -S list 'network.interface.*'`; do
+		if_call "${interface##network.interface.}"
+	done
+	[ -n "$setup_wifi" ] && /sbin/wifi up
+	exit
+else
+	ubus -S list "network.interface.$1" > /dev/null || {
+		echo "Interface $1 not found"
+		exit
+	}
+	if_call "$1"
+fi
+
+if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then
+	. /lib/functions.sh
+
+	find_related_radios() {
+		local wdev wnet
+		config_get wdev "$1" device
+		config_get wnet "$1" network
+
+		if [ -n "$wdev" ]; then
+			for wnet in $wnet; do
+				if [ "$wnet" = "$network" ]; then
+					append radio_devs "$wdev" "$N"
+				fi
+			done
+		fi
+	}
+
+	local radio_devs
+	local network="$1"
+	config_load wireless
+	config_foreach find_related_radios wifi-iface
+
+	local dev
+	for dev in $(echo "$radio_devs" | sort -u); do
+		/sbin/wifi up "$dev"
+	done
+fi
diff --git a/trunk/package/network/config/netifd/files/usr/share/udhcpc/default.script b/trunk/package/network/config/netifd/files/usr/share/udhcpc/default.script
new file mode 100755
index 00000000..ac765a63
--- /dev/null
+++ b/trunk/package/network/config/netifd/files/usr/share/udhcpc/default.script
@@ -0,0 +1,57 @@
+#!/bin/sh
+[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
+
+set_classless_routes() {
+	local max=128
+	local type
+	while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
+		[ ${1##*/} -eq 32 ] && type=host || type=net
+		echo "udhcpc: adding route for $type $1 via $2"
+		route add -$type "$1" gw "$2" dev "$interface"
+		max=$(($max-1))
+		shift 2
+	done
+}
+
+setup_interface() {
+	echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}"
+	ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}
+
+	[ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "255.255.255.255" ] && {
+		echo "udhcpc: setting default routers: $router"
+
+		local valid_gw=""
+		for i in $router ; do
+			route add default gw $i dev $interface
+			valid_gw="${valid_gw:+$valid_gw|}$i"
+		done
+		
+		eval $(route -n | awk '
+			/^0.0.0.0\W{9}('$valid_gw')\W/ {next}
+			/^0.0.0.0/ {print "route del -net "$1" gw "$2";"}
+		')
+	}
+
+	# CIDR STATIC ROUTES (rfc3442)
+	[ -n "$staticroutes" ] && set_classless_routes $staticroutes
+	[ -n "$msstaticroutes" ] && set_classless_routes $msstaticroutes
+}
+
+
+applied=
+case "$1" in
+	deconfig)
+		ifconfig "$interface" 0.0.0.0
+	;;
+	renew)
+		setup_interface update
+	;;
+	bound)
+		setup_interface ifup
+	;;
+esac
+
+# user rules
+[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
+
+exit 0
diff --git a/trunk/package/network/config/netifd/patches/001-musl_af_inet_include.patch b/trunk/package/network/config/netifd/patches/001-musl_af_inet_include.patch
new file mode 100644
index 00000000..510ee056
--- /dev/null
+++ b/trunk/package/network/config/netifd/patches/001-musl_af_inet_include.patch
@@ -0,0 +1,11 @@
+diff -urN netifd-2012-10-29/utils.c netifd-2012-10-29.new/utils.c
+--- netifd-2012-10-29/utils.c	2012-11-23 17:15:39.000000000 +0100
++++ netifd-2012-10-29.new/utils.c	2012-11-23 17:16:53.409244361 +0100
+@@ -17,6 +17,7 @@
+ 
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ 
+ void
+ __vlist_simple_init(struct vlist_simple_tree *tree, int offset)
diff --git a/trunk/package/network/config/qos-scripts/Makefile b/trunk/package/network/config/qos-scripts/Makefile
new file mode 100644
index 00000000..a6690a16
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/Makefile
@@ -0,0 +1,52 @@
+# 
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qos-scripts
+PKG_VERSION:=1.2.1
+PKG_RELEASE:=6
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/qos-scripts
+  SECTION:=utils
+  CATEGORY:=Base system
+  DEPENDS:=+tc +kmod-sched-core +kmod-sched-connmark +kmod-ifb +iptables +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra
+  TITLE:=QoS scripts
+  PKGARCH:=all
+endef
+
+define Package/qos-scripts/description
+ A set of scripts that abstract QoS configuration into a simple 
+ configuration file supporting stanzas that specify any number of QoS 
+ entries.
+endef
+
+define Package/qos-scripts/conffiles
+/etc/config/qos
+endef
+
+define Build/Prepare
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/qos-scripts/install
+	$(INSTALL_DIR) $(1)
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,qos-scripts))
diff --git a/trunk/package/network/config/qos-scripts/files/etc/config/qos b/trunk/package/network/config/qos-scripts/files/etc/config/qos
new file mode 100644
index 00000000..b8b3b91e
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/etc/config/qos
@@ -0,0 +1,68 @@
+# QoS configuration for libreCMC
+
+# INTERFACES:
+config interface wan
+	option classgroup  "Default"
+	option enabled      0
+	option upload       128
+	option download     1024
+
+# RULES:
+config classify
+	option target       "Priority"
+	option ports        "22,53"
+	option comment      "ssh, dns"
+config classify
+	option target       "Normal"
+	option proto        "tcp"
+	option ports        "20,21,25,80,110,443,993,995"
+	option comment      "ftp, smtp, http(s), imap"
+config classify
+	option target       "Express"
+	option ports        "5190"
+	option comment      "AOL, iChat, ICQ"
+config default
+	option target       "Express"
+	option proto        "udp"
+	option pktsize      "-500"
+config reclassify
+	option target       "Priority"
+	option proto        "icmp"
+config default
+	option target       "Bulk"
+	option portrange    "1024-65535"
+
+
+# Don't change the stuff below unless you
+# really know what it means :)
+
+config classgroup "Default"
+	option classes      "Priority Express Normal Bulk"
+	option default      "Normal"
+
+
+config class "Priority"
+	option packetsize  400
+	option avgrate     10
+	option priority    20
+config class "Priority_down"
+	option packetsize  1000
+	option avgrate     10
+
+
+config class "Express"
+	option packetsize  1000
+	option avgrate     50
+	option priority    10
+
+config class "Normal"
+	option packetsize  1500
+	option packetdelay 100
+	option avgrate     10
+	option priority    5
+config class "Normal_down"
+	option avgrate     20
+
+config class "Bulk"
+	option avgrate     1
+	option packetdelay 200
diff --git a/trunk/package/network/config/qos-scripts/files/etc/hotplug.d/iface/10-qos b/trunk/package/network/config/qos-scripts/files/etc/hotplug.d/iface/10-qos
new file mode 100755
index 00000000..0ced29ac
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/etc/hotplug.d/iface/10-qos
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ "$ACTION" = ifup ] && /etc/init.d/qos enabled && /usr/lib/qos/generate.sh interface "$INTERFACE" | sh
diff --git a/trunk/package/network/config/qos-scripts/files/etc/init.d/qos b/trunk/package/network/config/qos-scripts/files/etc/init.d/qos
new file mode 100755
index 00000000..712d906f
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/etc/init.d/qos
@@ -0,0 +1,28 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=50
+USE_PROCD=1
+
+validate_qos_section()
+{
+	uci_validate_section qos interface "${1}" \
+		'enabled:bool' \
+		'upload:uinteger' \
+		'download:uinteger'
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "qos"
+	procd_add_validation validate_qos_section
+	qos-start
+}
+
+start_service() {
+	qos-start
+}
+
+reload_service() {
+	qos-start
+}
diff --git a/trunk/package/network/config/qos-scripts/files/usr/bin/qos-start b/trunk/package/network/config/qos-scripts/files/usr/bin/qos-start
new file mode 100755
index 00000000..261ffb42
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/usr/bin/qos-start
@@ -0,0 +1,4 @@
+#!/bin/sh
+qos-stop 
+/usr/lib/qos/generate.sh all | sh
+
diff --git a/trunk/package/network/config/qos-scripts/files/usr/bin/qos-stat b/trunk/package/network/config/qos-scripts/files/usr/bin/qos-stat
new file mode 100755
index 00000000..cbbf8e8d
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/usr/bin/qos-stat
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Copyright (C) 2011 OpenWrt.org
+
+. /lib/functions.sh
+
+include /lib/network
+
+get_ifname() {
+	local interface="$1"
+	local cfgt
+
+	scan_interfaces
+	config_get cfgt "$interface" TYPE
+	[ "$cfgt" = "interface" ] && config_get "$interface" ifname
+}
+
+config_cb() {
+	config_get TYPE "$CONFIG_SECTION" TYPE
+	[ "interface" = "$TYPE" ] && {
+		config_get device "$CONFIG_SECTION" ifname
+		[ -z "$device" ] && device="$(get_ifname ${CONFIG_SECTION})"
+		config_set "$CONFIG_SECTION" device "$device"
+	}
+}
+
+config_load qos
+
+print_comments() {
+	echo ''
+	echo '# Interface: '"$1"
+	echo '# Direction: '"$2"
+	echo '# Stats:     '"$3"
+	echo ''
+}	
+
+get_device() {
+	( config_load network; scan_interfaces; config_get "$1" ifname )
+}
+
+interface_stats() {
+	local interface="$1"
+	local device
+
+	device="$(get_device "$interface")"
+	[ -z "$device" ] && config_get device "$interface" device
+	config_get_bool enabled "$interface" enabled 1
+	[ -z "$device" -o 1 -ne "$enabled" ] && {
+		return 1
+	}
+	config_get_bool halfduplex "$interface" halfduplex 0
+
+	if [ 1 -ne "$halfduplex" ]; then
+		unset halfduplex
+		print_comments "$interface" "Egress" "Start"
+		tc -s class show dev "$device"
+		print_comments "$interface" "Egress" "End"
+		id="root"
+	else
+		id=""
+	fi
+
+	print_comments "$interface" "Ingress${halfduplex:+/Egress}" "Start"
+	tc -s class show dev "$(tc filter show dev $device $id | grep mirred | sed -e 's,.*\(ifb.*\)).*,\1,')"
+	print_comments "$interface" "Ingress${halfduplex:+/Egress}" "End"
+}
+
+[ -z "$1" ] && config_foreach interface_stats interface || interface_stats "$1"
diff --git a/trunk/package/network/config/qos-scripts/files/usr/bin/qos-stop b/trunk/package/network/config/qos-scripts/files/usr/bin/qos-stop
new file mode 100755
index 00000000..7f654d85
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/usr/bin/qos-stop
@@ -0,0 +1,6 @@
+#!/bin/sh
+for iface in $(tc qdisc show | grep -E '(hfsc|ingress)' | awk '{print $5}'); do
+	tc qdisc del dev "$iface" ingress 2>&- >&-
+	tc qdisc del dev "$iface" root 2>&- >&-
+done
+/usr/lib/qos/generate.sh firewall stop | sh
diff --git a/trunk/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh b/trunk/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
new file mode 100755
index 00000000..ccc4e6f5
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
@@ -0,0 +1,504 @@
+#!/bin/sh
+[ -e /lib/functions.sh ] && . /lib/functions.sh || . ./functions.sh
+[ -x /sbin/modprobe ] && {
+	insmod="modprobe"
+	rmmod="$insmod -r"
+} || {
+	insmod="insmod"
+	rmmod="rmmod"
+}
+
+add_insmod() {
+	eval "export isset=\${insmod_$1}"
+	case "$isset" in
+		1) ;;
+		*) {
+			[ "$2" ] && append INSMOD "$rmmod $1 >&- 2>&-" "$N"
+			append INSMOD "$insmod $* >&- 2>&-" "$N"; export insmod_$1=1
+		};;
+	esac
+}
+
+[ -e /etc/config/network ] && {
+	# only try to parse network config on librecmc
+
+	find_ifname() {(
+		reset_cb
+		include /lib/network
+		scan_interfaces
+		config_get "$1" ifname
+	)}
+} || {
+	find_ifname() {
+		echo "Interface not found."
+		exit 1
+	}
+}
+
+parse_matching_rule() {
+	local var="$1"
+	local section="$2"
+	local options="$3"
+	local prefix="$4"
+	local suffix="$5"
+	local proto="$6"
+	local mport=""
+	local ports=""
+
+	append "$var" "$prefix" "$N"
+	for option in $options; do
+		case "$option" in
+			proto) config_get value "$section" proto; proto="${proto:-$value}";;
+		esac
+	done
+	config_get type "$section" TYPE
+	case "$type" in
+		classify) unset pkt; append "$var" "-m mark --mark 0/0x0f";;
+		default) pkt=1; append "$var" "-m mark --mark 0/0xf0";;
+		reclassify) pkt=1;;
+	esac
+	append "$var" "${proto:+-p $proto}"
+	for option in $options; do
+		config_get value "$section" "$option"
+		
+		case "$pkt:$option" in
+			*:srchost)
+				append "$var" "-s $value"
+			;;
+			*:dsthost)
+				append "$var" "-d $value"
+			;;
+			*:layer7)
+				add_insmod ipt_layer7
+				add_insmod xt_layer7
+				append "$var" "-m layer7 --l7proto $value${pkt:+ --l7pkt}"
+			;;
+			*:ports|*:srcports|*:dstports)
+				value="$(echo "$value" | sed -e 's,-,:,g')"
+				lproto=${lproto:-tcp}
+				case "$proto" in
+					""|tcp|udp) append "$var" "-m ${proto:-tcp -p tcp} -m multiport";;
+					*) unset "$var"; return 0;;
+				esac
+				case "$option" in
+					ports)
+						config_set "$section" srcports ""
+						config_set "$section" dstports ""
+						config_set "$section" portrange ""
+						append "$var" "--ports $value"
+					;;
+					srcports)
+						config_set "$section" ports ""
+						config_set "$section" dstports ""
+						config_set "$section" portrange ""
+						append "$var" "--sports $value"
+					;;
+					dstports)
+						config_set "$section" ports ""
+						config_set "$section" srcports ""
+						config_set "$section" portrange ""
+						append "$var" "--dports $value"
+					;;
+				esac
+				ports=1
+			;;
+			*:portrange)
+				config_set "$section" ports ""
+				config_set "$section" srcports ""
+				config_set "$section" dstports ""
+				value="$(echo "$value" | sed -e 's,-,:,g')"
+				case "$proto" in
+					""|tcp|udp) append "$var" "-m ${proto:-tcp -p tcp} --sport $value --dport $value";;
+					*) unset "$var"; return 0;;
+				esac
+				ports=1
+			;;
+			*:connbytes)
+				value="$(echo "$value" | sed -e 's,-,:,g')"
+				add_insmod xt_connbytes
+				append "$var" "-m connbytes --connbytes $value --connbytes-dir both --connbytes-mode bytes"
+			;;
+			*:comment)
+				add_insmod xt_comment
+				append "$var" "-m comment --comment '$value'"
+			;;
+			*:tos)
+                                add_insmod xt_dscp
+                                case "$value" in
+                                        !*) append "$var" "-m tos ! --tos $value";;
+                                        *) append "$var" "-m tos --tos $value"
+                                esac
+                        ;;
+			*:dscp)
+                                add_insmod xt_dscp
+				dscp_option="--dscp"
+                                [ -z "${value%%[EBCA]*}" ] && dscp_option="--dscp-class"
+				case "$value" in
+                                       	!*) append "$var" "-m dscp ! $dscp_option $value";;
+                                       	*) append "$var" "-m dscp $dscp_option $value"
+                                esac
+                        ;;
+			*:direction)
+				value="$(echo "$value" | sed -e 's,-,:,g')"
+				if [ "$value" = "out" ]; then
+					append "$var" "-o $device"
+				elif [ "$value" = "in" ]; then
+					append "$var" "-i $device"
+				fi
+			;;
+			1:pktsize)
+				value="$(echo "$value" | sed -e 's,-,:,g')"
+				add_insmod xt_length
+				append "$var" "-m length --length $value"
+			;;
+			1:limit)
+				add_insmod xt_limit
+				append "$var" "-m limit --limit $value"
+			;;
+			1:tcpflags)
+				case "$proto" in
+					tcp) append "$var" "-m tcp --tcp-flags ALL $value";;
+					*) unset $var; return 0;;
+				esac
+			;;
+			1:mark)
+				config_get class "${value##!}" classnr
+				[ -z "$class" ] && continue;
+				case "$value" in
+					!*) append "$var" "-m mark ! --mark $class/0x0f";;
+					*) append "$var" "-m mark --mark $class/0x0f";;
+				esac
+			;;
+			1:TOS)
+				add_insmod xt_DSCP
+				config_get TOS "$rule" 'TOS'
+				suffix="-j TOS --set-tos "${TOS:-"Normal-Service"}
+			;;
+			1:DSCP)
+				add_insmod xt_DSCP
+				config_get DSCP "$rule" 'DSCP'
+				[ -z "${DSCP%%[EBCA]*}" ] && set_value="--set-dscp-class $DSCP" \
+				|| set_value="--set-dscp $DSCP"
+				suffix="-j DSCP $set_value"
+			;;
+		esac
+	done
+	append "$var" "$suffix"
+	case "$ports:$proto" in
+		1:)	parse_matching_rule "$var" "$section" "$options" "$prefix" "$suffix" "udp";;
+	esac
+}
+
+config_cb() {
+	option_cb() {
+		return 0
+	}
+
+	# Section start
+	case "$1" in
+		interface)
+			config_set "$2" "classgroup" "Default"
+			config_set "$2" "upload" "128"
+		;;
+		classify|default|reclassify)
+			option_cb() {
+				append options "$1"
+			}
+		;;
+	esac
+
+    # Section end
+	config_get TYPE "$CONFIG_SECTION" TYPE
+	case "$TYPE" in
+		interface)
+			config_get_bool enabled "$CONFIG_SECTION" enabled 1
+			[ 1 -eq "$enabled" ] || return 0
+			config_get classgroup "$CONFIG_SECTION" classgroup
+			config_set "$CONFIG_SECTION" ifbdev "$C"
+			C=$(($C+1))
+			append INTERFACES "$CONFIG_SECTION"
+			config_set "$classgroup" enabled 1
+			config_get device "$CONFIG_SECTION" device
+			[ -z "$device" ] && {
+				device="$(find_ifname ${CONFIG_SECTION})"
+				config_set "$CONFIG_SECTION" device "${device:-eth0}"
+			}
+		;;
+		classgroup) append CG "$CONFIG_SECTION";;
+		classify|default|reclassify)
+			case "$TYPE" in
+				classify) var="ctrules";;
+				*) var="rules";;
+			esac
+			config_get target "$CONFIG_SECTION" target
+			config_set "$CONFIG_SECTION" options "$options"
+			append "$var" "$CONFIG_SECTION"
+			unset options
+		;;
+	esac
+}
+
+
+enum_classes() {
+	local c="0"
+	config_get classes "$1" classes
+	config_get default "$1" default
+	for class in $classes; do
+		c="$(($c + 1))"
+		config_set "${class}" classnr $c
+		case "$class" in
+			$default) class_default=$c;;
+		esac
+	done
+	class_default="${class_default:-$c}"
+}
+
+cls_var() {
+	local varname="$1"
+	local class="$2"
+	local name="$3"
+	local type="$4"
+	local default="$5"
+	local tmp tmp1 tmp2
+	config_get tmp1 "$class" "$name"
+	config_get tmp2 "${class}_${type}" "$name"
+	tmp="${tmp2:-$tmp1}"
+	tmp="${tmp:-$tmp2}"
+	export ${varname}="${tmp:-$default}"
+}
+
+tcrules() {
+	_dir=/usr/lib/qos
+	[ -e $_dir/tcrules.awk ] || _dir=.
+	echo "$cstr" | awk \
+		-v device="$dev" \
+		-v linespeed="$rate" \
+		-v direction="$dir" \
+		-f $_dir/tcrules.awk
+}
+
+start_interface() {
+	local iface="$1"
+	local num_ifb="$2"
+	config_get device "$iface" device
+	config_get_bool enabled "$iface" enabled 1
+	[ -z "$device" -o 1 -ne "$enabled" ] && {
+		return 1 
+	}
+	config_get upload "$iface" upload
+	config_get_bool halfduplex "$iface" halfduplex
+	config_get download "$iface" download
+	config_get classgroup "$iface" classgroup
+	config_get_bool overhead "$iface" overhead 0
+	
+	download="${download:-${halfduplex:+$upload}}"
+	enum_classes "$classgroup"
+	for dir in ${halfduplex:-up} ${download:+down}; do
+		case "$dir" in
+			up)
+				[ "$overhead" = 1 ] && upload=$(($upload * 98 / 100 - (15 * 128 / $upload)))
+				dev="$device"
+				rate="$upload"
+				dl_mode=""
+				prefix="cls"
+			;;
+			down)
+				[ "$(ls -d /proc/sys/net/ipv4/conf/ifb* 2>&- | wc -l)" -ne "$num_ifb" ] && add_insmod ifb numifbs="$num_ifb"
+				config_get ifbdev "$iface" ifbdev
+				[ "$overhead" = 1 ] && download=$(($download * 98 / 100 - (80 * 1024 / $download)))
+				dev="ifb$ifbdev"
+				rate="$download"
+				dl_mode=1
+				prefix="d_cls"
+			;;
+			*) continue;;
+		esac
+		cstr=
+		for class in $classes; do
+			cls_var pktsize "$class" packetsize $dir 1500
+			cls_var pktdelay "$class" packetdelay $dir 0
+			cls_var maxrate "$class" limitrate $dir 100
+			cls_var prio "$class" priority $dir 1
+			cls_var avgrate "$class" avgrate $dir 0
+			cls_var qdisc "$class" qdisc $dir ""
+			cls_var filter "$class" filter $dir ""
+			config_get classnr "$class" classnr
+			append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate:$qdisc:$filter" "$N"
+		done
+		append ${prefix}q "$(tcrules)" "$N"
+		export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
+tc qdisc del dev $dev root >&- 2>&-
+tc qdisc add dev $dev root handle 1: hfsc default ${class_default}0
+tc class add dev $dev parent 1: classid 1:1 hfsc sc rate ${rate}kbit ul rate ${rate}kbit"
+	done
+	[ -n "$download" ] && {
+		add_insmod cls_u32
+		add_insmod em_u32
+		add_insmod act_connmark
+		add_insmod act_mirred
+		add_insmod sch_ingress
+	}
+	if [ -n "$halfduplex" ]; then
+		export dev_up="tc qdisc del dev $device root >&- 2>&-
+tc qdisc add dev $device root handle 1: hfsc
+tc filter add dev $device parent 1: protocol ip prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb$ifbdev"
+	elif [ -n "$download" ]; then
+		append dev_${dir} "tc qdisc del dev $device ingress >&- 2>&-
+tc qdisc add dev $device ingress
+tc filter add dev $device parent ffff: protocol ip prio 1 u32 match u32 0 0 flowid 1:1 action connmark action mirred egress redirect dev ifb$ifbdev" "$N"
+	fi
+	add_insmod cls_fw
+	add_insmod sch_hfsc
+	add_insmod sch_fq_codel
+
+	cat <<EOF
+${INSMOD:+$INSMOD$N}${dev_up:+$dev_up
+$clsq
+}${ifbdev:+$dev_down
+$d_clsq
+$d_clsl
+$d_clsf
+}
+EOF
+	unset INSMOD clsq clsf clsl d_clsq d_clsl d_clsf dev_up dev_down
+}
+
+start_interfaces() {
+	local C="$1"
+	for iface in $INTERFACES; do
+		start_interface "$iface" "$C"
+	done
+}
+
+add_rules() {
+	local var="$1"
+	local rules="$2"
+	local prefix="$3"
+	
+	for rule in $rules; do
+		unset iptrule
+		config_get target "$rule" target
+		config_get target "$target" classnr
+		config_get options "$rule" options
+
+		## If we want to override the TOS field, let's clear the DSCP field first.
+		[ ! -z "$(echo $options | grep 'TOS')" ] && {
+			s_options=${options%%TOS}
+			add_insmod xt_DSCP
+			parse_matching_rule iptrule "$rule" "$s_options" "$prefix" "-j DSCP --set-dscp 0"
+			append "$var" "$iptrule" "$N"
+			unset iptrule
+		}
+
+		target=$(($target | ($target << 4)))
+		parse_matching_rule iptrule "$rule" "$options" "$prefix" "-j MARK --set-mark $target/0xff"
+		append "$var" "$iptrule" "$N"
+	done
+}
+
+start_cg() {
+	local cg="$1"
+	local iptrules
+	local pktrules
+	local sizerules
+	enum_classes "$cg"
+	add_rules iptrules "$ctrules" "iptables -t mangle -A qos_${cg}_ct"
+	config_get classes "$cg" classes
+	for class in $classes; do
+		config_get mark "$class" classnr
+		config_get maxsize "$class" maxsize
+		[ -z "$maxsize" -o -z "$mark" ] || {
+			add_insmod xt_length
+			append pktrules "iptables -t mangle -A qos_${cg} -m mark --mark $mark/0x0f -m length --length $maxsize: -j MARK --set-mark 0/0xff" "$N"
+		}
+	done
+	add_rules pktrules "$rules" "iptables -t mangle -A qos_${cg}"
+	for iface in $INTERFACES; do
+		config_get classgroup "$iface" classgroup
+		config_get device "$iface" device
+		config_get ifbdev "$iface" ifbdev
+		config_get upload "$iface" upload
+		config_get download "$iface" download
+		config_get halfduplex "$iface" halfduplex
+		download="${download:-${halfduplex:+$upload}}"
+		append up "iptables -t mangle -A OUTPUT -o $device -j qos_${cg}" "$N"
+		append up "iptables -t mangle -A FORWARD -o $device -j qos_${cg}" "$N"
+	done
+	cat <<EOF
+$INSMOD
+iptables -t mangle -N qos_${cg} >&- 2>&-
+iptables -t mangle -N qos_${cg}_ct >&- 2>&-
+${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg}_ct -j CONNMARK --save-mark --mask 0xff}
+iptables -t mangle -A qos_${cg} -j CONNMARK --restore-mark --mask 0x0f
+iptables -t mangle -A qos_${cg} -m mark --mark 0/0x0f -j qos_${cg}_ct
+$pktrules
+${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg} -j CONNMARK --save-mark --mask 0xf0}
+$up$N${down:+${down}$N}
+EOF
+	unset INSMOD
+}
+
+start_firewall() {
+	add_insmod xt_multiport
+	add_insmod xt_CONNMARK
+	stop_firewall
+	for group in $CG; do
+		start_cg $group
+	done
+}
+
+stop_firewall() {
+	# Builds up a list of iptables commands to flush the qos_* chains,
+	# remove rules referring to them, then delete them
+
+	# Print rules in the mangle table, like iptables-save
+	iptables -t mangle -S |
+		# Find rules for the qos_* chains
+		grep '^-N qos_\|-j qos_' |
+		# Exclude rules in qos_* chains (inter-qos_* refs)
+		grep -v '^-A qos_' |
+		# Replace -N with -X and hold, with -F and print
+		# Replace -A with -D
+		# Print held lines at the end (note leading newline)
+		sed -e '/^-N/{s/^-N/-X/;H;s/^-X/-F/}' \
+			-e 's/^-A/-D/' \
+			-e '${p;g}' |
+		# Make into proper iptables calls
+		# Note:  awkward in previous call due to hold space usage
+		sed -n -e 's/^./iptables -t mangle &/p'
+}
+
+C="0"
+INTERFACES=""
+[ -e ./qos.conf ] && {
+	. ./qos.conf
+	config_cb
+} || config_load qos
+
+C="0"
+for iface in $INTERFACES; do
+	export C="$(($C + 1))"
+done
+
+case "$1" in
+	all)
+		start_interfaces "$C"
+		start_firewall
+	;;
+	interface)
+		start_interface "$2" "$C"
+	;;
+	interfaces)
+		start_interfaces
+	;;
+	firewall)
+		case "$2" in
+			stop)
+				stop_firewall
+			;;
+			start|"")
+				start_firewall
+			;;
+		esac
+	;;
+esac
diff --git a/trunk/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk b/trunk/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
new file mode 100644
index 00000000..12f94a67
--- /dev/null
+++ b/trunk/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
@@ -0,0 +1,106 @@
+BEGIN {
+	dmax=100
+	if (!(linespeed > 0)) linespeed = 128
+	FS=":"
+	n = 0
+}
+
+($1 != "") {
+	n++
+	class[n] = $1
+	prio[n] = $2
+	avgrate[n] = ($3 * linespeed / 100)
+	pktsize[n] = $4
+	delay[n] = $5
+	maxrate[n] = ($6 * linespeed / 100)
+	qdisc[n] = $7
+	filter[n] = $8
+}
+
+END {
+	allocated = 0
+	maxdelay = 0
+
+	for (i = 1; i <= n; i++) {
+		# set defaults
+		if (!(pktsize[i] > 0)) pktsize[i] = 1500
+		if (!(prio[i] > 0)) prio[i] = 1
+
+		allocated += avgrate[i]
+		sum_prio += prio[i]
+		if ((avgrate[i] > 0) && !(delay[i] > 0)) {
+			sum_rtprio += prio[i]
+		}
+	}
+
+	# allocation of m1 in rt classes:
+	# sum(d * m1) must not exceed dmax * (linespeed - allocated)
+	dmax = 0
+	for (i = 1; i <= n; i++) {
+		if (avgrate[i] > 0) {
+			rtm2[i] = avgrate[i]
+			if (delay[i] > 0) {
+				d[i] = delay[i]
+			} else {
+				d[i] = 2 * pktsize[i] * 1000 / (linespeed * 1024)
+				if (d[i] > dmax) dmax = d[i]
+			}
+		}
+	}
+
+	ds_avail = dmax * (linespeed - allocated)
+	for (i = 1; i <= n; i++) {
+		lsm1[i] = 0
+		rtm1[i] = 0
+		lsm2[i] = linespeed * prio[i] / sum_prio
+		if ((avgrate[i] > 0) && (d[i] > 0)) {
+			if (!(delay[i] > 0)) {
+				ds = ds_avail * prio[i] / sum_rtprio
+				ds_avail -= ds
+				rtm1[i] = rtm2[i] + ds/d[i]
+			}
+			lsm1[i] = rtm1[i]
+		}
+		else {
+			d[i] = 0
+		}
+	}
+
+	# main qdisc
+	for (i = 1; i <= n; i++) {
+		printf "tc class add dev "device" parent 1:1 classid 1:"class[i]"0 hfsc"
+		if (rtm1[i] > 0) {
+			printf " rt m1 " int(rtm1[i]) "kbit d " int(d[i] * 1000) "us m2 " int(rtm2[i])"kbit"
+		}
+		printf " ls m1 " int(lsm1[i]) "kbit d " int(d[i] * 1000) "us m2 " int(lsm2[i]) "kbit"
+		print " ul rate " int(maxrate[i]) "kbit"
+	}
+
+	# leaf qdisc
+	avpkt = 1200
+	for (i = 1; i <= n; i++) {
+		print "tc qdisc add dev "device" parent 1:"class[i]"0 handle "class[i]"00: fq_codel limit 800 quantum 300 noecn"
+	}
+
+	# filter rule
+	for (i = 1; i <= n; i++) {
+		filter_cmd = "tc filter add dev "device" parent 1: prio %d protocol ip handle %s fw flowid 1:%d0\n";
+		if (direction == "up") {
+			filter_1 = sprintf("0x%x0/0xf0", class[i])
+			filter_2 = sprintf("0x0%x/0x0f", class[i])
+		} else {
+			filter_1 = sprintf("0x0%x/0x0f", class[i])
+			filter_2 = sprintf("0x%x0/0xf0", class[i])
+		}
+
+		printf filter_cmd, class[i] * 2, filter_1, class[i]
+		printf filter_cmd, class[i] * 2 + 1, filter_2, class[i]
+
+		filterc=1
+		if (filter[i] != "") {
+			print " tc filter add dev "device" parent "class[i]"00: handle "filterc"0 "filter[i]
+			filterc=filterc+1
+		}
+	}
+}
+
diff --git a/trunk/package/network/config/soloscli/Makefile b/trunk/package/network/config/soloscli/Makefile
new file mode 100644
index 00000000..12bc15ea
--- /dev/null
+++ b/trunk/package/network/config/soloscli/Makefile
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=soloscli
+PKG_VERSION:=1.04
+PKG_RELEASE:=1
+
+PKG_SOURCE:=solos-pci-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/openadsl
+PKG_MD5SUM:=c398866de3c059b14eb953c89d698124
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/solos-pci-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/soloscli
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Configuration utility for Solos ADSL2+ modems
+  DEPENDS:=+kmod-solos-pci
+  URL:=http://sourceforge.net/projects/openadsl
+endef
+
+define Package/soloscli/description
+  This package contains the soloscli utility
+  for interrogating Traverse Technologies' Solos ADSL2+ modems.
+endef
+
+define Package/soloscli/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/soloscli/soloscli $(1)/usr/bin/
+	$(INSTALL_BIN) ./files/solos-log-stats $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/atm
+	$(INSTALL_DATA) ./files/etc/hotplug.d/atm/15-solos-init $(1)/etc/hotplug.d/atm/
+endef
+
+$(eval $(call BuildPackage,soloscli))
diff --git a/trunk/package/network/config/soloscli/files/etc/hotplug.d/atm/15-solos-init b/trunk/package/network/config/soloscli/files/etc/hotplug.d/atm/15-solos-init
new file mode 100644
index 00000000..36d13ea5
--- /dev/null
+++ b/trunk/package/network/config/soloscli/files/etc/hotplug.d/atm/15-solos-init
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+dialog() {
+	local tag="$(echo "$1" | cut -d= -f1)"
+	local value="$(echo "$1" | cut -d= -f2-)"
+	local response
+	
+	response="$(soloscli -s "$port" "$tag" "$value")"
+	[ $? -ne 0 ] && {
+		logger "soloscli($port): $tag '$value' returns $response"
+	}
+}
+
+if [ "$ACTION" = "add" ]; then
+	include /lib/network
+	scan_interfaces
+
+	case $DEVICENAME in
+	solos-pci[0-3])
+		port="${DEVICENAME#solos-pci}"
+		device="solos${port}"
+
+		config_list_foreach wan "$device" dialog
+		;;
+	esac
+fi
diff --git a/trunk/package/network/config/soloscli/files/etc/uci-default/solos b/trunk/package/network/config/soloscli/files/etc/uci-default/solos
new file mode 100644
index 00000000..7f69da62
--- /dev/null
+++ b/trunk/package/network/config/soloscli/files/etc/uci-default/solos
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+uci batch <<__EOF__
+
+delete network.wan.solos0
+
+add_list network.wan.solos0="ActivateLine=Abort"
+add_list network.wan.solos0="Retrain=EnableAll"
+add_list network.wan.solos0="DetectNoise=Enable"
+add_list network.wan.solos0="BisMCapability=Disable"
+add_list network.wan.solos0="BisACapability=Disable"
+add_list network.wan.solos0="ActivateLine=Start"
+
+commit network
+__EOF__
diff --git a/trunk/package/network/config/soloscli/files/solos-log-stats b/trunk/package/network/config/soloscli/files/solos-log-stats
new file mode 100644
index 00000000..2b75ee30
--- /dev/null
+++ b/trunk/package/network/config/soloscli/files/solos-log-stats
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cd /sys/class/atm/ || exit 1
+
+for PORT in solos-pci* ; do
+
+    RXRATE=`cat $PORT/parameters/RxBitRate`
+    TXRATE=`cat $PORT/parameters/TxBitRate`
+    RXSNR=`cat $PORT/parameters/LocalSNRMargin | sed "s/ dB//"`
+    TXSNR=`cat $PORT/parameters/RemoteSNRMargin | sed "s/ dB//"`
+    RXERR=`cat $PORT/parameters/RSUnCorrectedErrorsDn`
+    TXERR=`cat $PORT/parameters/RSUnCorrectedErrorsUp`
+    RXFEC=`cat $PORT/parameters/RSCorrectedErrorsDn`
+    TXFEC=`cat $PORT/parameters/RSCorrectedErrorsUp`
+
+    echo "$RXRATE $RXSNR $RXERR $RXFEC / $TXRATE $TXSNR $TXERR $TXFEC" |
+       logger -t $PORT
+done
+
diff --git a/trunk/package/network/config/soloscli/patches/001-no-driver.patch b/trunk/package/network/config/soloscli/patches/001-no-driver.patch
new file mode 100644
index 00000000..95588aa0
--- /dev/null
+++ b/trunk/package/network/config/soloscli/patches/001-no-driver.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ else
+ KDIR	?= /lib/modules/$(shell uname -r)/build
+ PWD	:= $(shell pwd)
+ 
+-all: soloscli driver
++all: soloscli
+ 
+ soloscli: soloscli/soloscli
+ 
diff --git a/trunk/package/network/config/soloscli/patches/002-cflags.patch b/trunk/package/network/config/soloscli/patches/002-cflags.patch
new file mode 100644
index 00000000..a7d6a860
--- /dev/null
+++ b/trunk/package/network/config/soloscli/patches/002-cflags.patch
@@ -0,0 +1,12 @@
+--- a/soloscli/Makefile
++++ b/soloscli/Makefile
+@@ -4,9 +4,6 @@
+ # Last Mod: 2009-06-16
+ #
+ 
+-CC=gcc
+-CFLAGS=-Wall
+-
+ soloscli: soloscli.c soloscli.h
+ 
+ clean:
diff --git a/trunk/package/network/config/swconfig/Makefile b/trunk/package/network/config/swconfig/Makefile
new file mode 100644
index 00000000..7d0f30e7
--- /dev/null
+++ b/trunk/package/network/config/swconfig/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2008-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=swconfig
+PKG_RELEASE:=10
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/swconfig
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+libuci +libnl-tiny
+  TITLE:=Switch configuration utility
+endef
+
+TARGET_CPPFLAGS := \
+	-D_GNU_SOURCE \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(PKG_BUILD_DIR) \
+	$(TARGET_CPPFLAGS) \
+	-I$(LINUX_DIR)/user_headers/include
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		LIBS="$(TARGET_LDFLAGS) -lnl-tiny -lm -luci"
+endef
+
+define Package/swconfig/install
+	$(INSTALL_DIR) $(1)/sbin $(1)/lib/network
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/sbin/swconfig
+	$(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/
+endef
+
+$(eval $(call BuildPackage,swconfig))
diff --git a/trunk/package/network/config/swconfig/files/switch.sh b/trunk/package/network/config/swconfig/files/switch.sh
new file mode 100644
index 00000000..ba6924d9
--- /dev/null
+++ b/trunk/package/network/config/swconfig/files/switch.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Copyright (C) 2009 OpenWrt.org
+
+setup_switch_dev() {
+	local name
+	config_get name "$1" name
+	name="${name:-$1}"
+	[ -d "/sys/class/net/$name" ] && ifconfig "$name" up
+	swconfig dev "$name" load network
+}
+
+setup_switch() {
+	config_load network
+	config_foreach setup_switch_dev switch
+}
diff --git a/trunk/package/network/config/swconfig/src/Makefile b/trunk/package/network/config/swconfig/src/Makefile
new file mode 100644
index 00000000..0d56f431
--- /dev/null
+++ b/trunk/package/network/config/swconfig/src/Makefile
@@ -0,0 +1,12 @@
+ifndef CFLAGS
+CFLAGS = -O2 -g -I ../src
+endif
+LIBS=-lnl -lnl-genl
+
+all: swconfig
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $^
+
+swconfig: cli.o swlib.o uci.o
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
diff --git a/trunk/package/network/config/swconfig/src/cli.c b/trunk/package/network/config/swconfig/src/cli.c
new file mode 100644
index 00000000..d4720867
--- /dev/null
+++ b/trunk/package/network/config/swconfig/src/cli.c
@@ -0,0 +1,354 @@
+/*
+ * swconfig.c: Switch configuration utility
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010 Martin Mares <mj@ucw.cz>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundatio.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <stdint.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <uci.h>
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+#include <linux/genetlink.h>
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#include <linux/switch.h>
+#include "swlib.h"
+
+enum {
+	CMD_NONE,
+	CMD_GET,
+	CMD_SET,
+	CMD_LOAD,
+	CMD_HELP,
+	CMD_SHOW,
+	CMD_PORTMAP,
+};
+
+static void
+print_attrs(const struct switch_attr *attr)
+{
+	int i = 0;
+	while (attr) {
+		const char *type;
+		switch(attr->type) {
+			case SWITCH_TYPE_INT:
+				type = "int";
+				break;
+			case SWITCH_TYPE_STRING:
+				type = "string";
+				break;
+			case SWITCH_TYPE_PORTS:
+				type = "ports";
+				break;
+			case SWITCH_TYPE_NOVAL:
+				type = "none";
+				break;
+			default:
+				type = "unknown";
+				break;
+		}
+		printf("\tAttribute %d (%s): %s (%s)\n", ++i, type, attr->name, attr->description);
+		attr = attr->next;
+	}
+}
+
+static void
+list_attributes(struct switch_dev *dev)
+{
+	printf("%s: %s(%s), ports: %d (cpu @ %d), vlans: %d\n", dev->dev_name, dev->alias, dev->name, dev->ports, dev->cpu_port, dev->vlans);
+	printf("     --switch\n");
+	print_attrs(dev->ops);
+	printf("     --vlan\n");
+	print_attrs(dev->vlan_ops);
+	printf("     --port\n");
+	print_attrs(dev->port_ops);
+}
+
+static void
+print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
+{
+	int i;
+
+	switch (attr->type) {
+	case SWITCH_TYPE_INT:
+		printf("%d", val->value.i);
+		break;
+	case SWITCH_TYPE_STRING:
+		printf("%s", val->value.s);
+		break;
+	case SWITCH_TYPE_PORTS:
+		for(i = 0; i < val->len; i++) {
+			printf("%d%s ",
+				val->value.ports[i].id,
+				(val->value.ports[i].flags &
+				 SWLIB_PORT_FLAG_TAGGED) ? "t" : "");
+		}
+		break;
+	default:
+		printf("?unknown-type?");
+	}
+}
+
+static void
+show_attrs(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
+{
+	while (attr) {
+		if (attr->type != SWITCH_TYPE_NOVAL) {
+			printf("\t%s: ", attr->name);
+			if (swlib_get_attr(dev, attr, val) < 0)
+				printf("???");
+			else
+				print_attr_val(attr, val);
+			putchar('\n');
+		}
+		attr = attr->next;
+	}
+}
+
+static void
+show_global(struct switch_dev *dev)
+{
+	struct switch_val val;
+
+	printf("Global attributes:\n");
+	show_attrs(dev, dev->ops, &val);
+}
+
+static void
+show_port(struct switch_dev *dev, int port)
+{
+	struct switch_val val;
+
+	printf("Port %d:\n", port);
+	val.port_vlan = port;
+	show_attrs(dev, dev->port_ops, &val);
+}
+
+static void
+show_vlan(struct switch_dev *dev, int vlan, bool all)
+{
+	struct switch_val val;
+	struct switch_attr *attr;
+
+	val.port_vlan = vlan;
+
+	if (all) {
+		attr = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_VLAN, "ports");
+		if (swlib_get_attr(dev, attr, &val) < 0)
+			return;
+
+		if (!val.len)
+			return;
+	}
+
+	printf("VLAN %d:\n", vlan);
+	show_attrs(dev, dev->vlan_ops, &val);
+}
+
+static void
+print_usage(void)
+{
+	printf("swconfig list\n");
+	printf("swconfig dev <dev> [port <port>|vlan <vlan>] (help|set <key> <value>|get <key>|load <config>|show)\n");
+	exit(1);
+}
+
+static void
+swconfig_load_uci(struct switch_dev *dev, const char *name)
+{
+	struct uci_context *ctx;
+	struct uci_package *p = NULL;
+	int ret = -1;
+
+	ctx = uci_alloc_context();
+	if (!ctx)
+		return;
+
+	uci_load(ctx, name, &p);
+	if (!p) {
+		uci_perror(ctx, "Failed to load config file: ");
+		goto out;
+	}
+
+	ret = swlib_apply_from_uci(dev, p);
+	if (ret < 0)
+		fprintf(stderr, "Failed to apply configuration for switch '%s'\n", dev->dev_name);
+
+out:
+	uci_free_context(ctx);
+	exit(ret);
+}
+
+int main(int argc, char **argv)
+{
+	int retval = 0;
+	struct switch_dev *dev;
+	struct switch_attr *a;
+	struct switch_val val;
+	int i;
+
+	int cmd = CMD_NONE;
+	char *cdev = NULL;
+	int cport = -1;
+	int cvlan = -1;
+	char *ckey = NULL;
+	char *cvalue = NULL;
+	char *csegment = NULL;
+
+	if((argc == 2) && !strcmp(argv[1], "list")) {
+		swlib_list();
+		return 0;
+	}
+
+	if(argc < 4)
+		print_usage();
+
+	if(strcmp(argv[1], "dev"))
+		print_usage();
+
+	cdev = argv[2];
+
+	for(i = 3; i < argc; i++)
+	{
+		char *arg = argv[i];
+		if (cmd != CMD_NONE) {
+			print_usage();
+		} else if (!strcmp(arg, "port") && i+1 < argc) {
+			cport = atoi(argv[++i]);
+		} else if (!strcmp(arg, "vlan") && i+1 < argc) {
+			cvlan = atoi(argv[++i]);
+		} else if (!strcmp(arg, "help")) {
+			cmd = CMD_HELP;
+		} else if (!strcmp(arg, "set") && i+1 < argc) {
+			cmd = CMD_SET;
+			ckey = argv[++i];
+			if (i+1 < argc)
+				cvalue = argv[++i];
+		} else if (!strcmp(arg, "get") && i+1 < argc) {
+			cmd = CMD_GET;
+			ckey = argv[++i];
+		} else if (!strcmp(arg, "load") && i+1 < argc) {
+			if ((cport >= 0) || (cvlan >= 0))
+				print_usage();
+			cmd = CMD_LOAD;
+			ckey = argv[++i];
+		} else if (!strcmp(arg, "portmap")) {
+			if (i + 1 < argc)
+				csegment = argv[++i];
+			cmd = CMD_PORTMAP;
+		} else if (!strcmp(arg, "show")) {
+			cmd = CMD_SHOW;
+		} else {
+			print_usage();
+		}
+	}
+
+	if (cmd == CMD_NONE)
+		print_usage();
+	if (cport > -1 && cvlan > -1)
+		print_usage();
+
+	dev = swlib_connect(cdev);
+	if (!dev) {
+		fprintf(stderr, "Failed to connect to the switch. Use the \"list\" command to see which switches are available.\n");
+		return 1;
+	}
+
+	swlib_scan(dev);
+
+	if (cmd == CMD_GET || cmd == CMD_SET) {
+		if(cport > -1)
+			a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_PORT, ckey);
+		else if(cvlan > -1)
+			a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_VLAN, ckey);
+		else
+			a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_GLOBAL, ckey);
+
+		if(!a)
+		{
+			fprintf(stderr, "Unknown attribute \"%s\"\n", ckey);
+			retval = -1;
+			goto out;
+		}
+	}
+
+	switch(cmd)
+	{
+	case CMD_SET:
+		if ((a->type != SWITCH_TYPE_NOVAL) &&
+				(cvalue == NULL))
+			print_usage();
+
+		if(cvlan > -1)
+			cport = cvlan;
+
+		if(swlib_set_attr_string(dev, a, cport, cvalue) < 0)
+		{
+			fprintf(stderr, "failed\n");
+			retval = -1;
+			goto out;
+		}
+		break;
+	case CMD_GET:
+		if(cvlan > -1)
+			val.port_vlan = cvlan;
+		if(cport > -1)
+			val.port_vlan = cport;
+		if(swlib_get_attr(dev, a, &val) < 0)
+		{
+			fprintf(stderr, "failed\n");
+			retval = -1;
+			goto out;
+		}
+		print_attr_val(a, &val);
+		putchar('\n');
+		break;
+	case CMD_LOAD:
+		swconfig_load_uci(dev, ckey);
+		break;
+	case CMD_HELP:
+		list_attributes(dev);
+		break;
+	case CMD_PORTMAP:
+		swlib_print_portmap(dev, csegment);
+		break;
+	case CMD_SHOW:
+		if (cport >= 0 || cvlan >= 0) {
+			if (cport >= 0)
+				show_port(dev, cport);
+			else
+				show_vlan(dev, cvlan, false);
+		} else {
+			show_global(dev);
+			for (i=0; i < dev->ports; i++)
+				show_port(dev, i);
+			for (i=0; i < dev->vlans; i++)
+				show_vlan(dev, i, true);
+		}
+		break;
+	}
+
+out:
+	swlib_free_all(dev);
+	return retval;
+}
diff --git a/trunk/package/network/config/swconfig/src/swlib.c b/trunk/package/network/config/swconfig/src/swlib.c
new file mode 100644
index 00000000..12225025
--- /dev/null
+++ b/trunk/package/network/config/swconfig/src/swlib.c
@@ -0,0 +1,780 @@
+/*
+ * swlib.c: Switch configuration API (user space part)
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <stdint.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <linux/switch.h>
+#include "swlib.h"
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
+
+//#define DEBUG 1
+#ifdef DEBUG
+#define DPRINTF(fmt, ...) fprintf(stderr, "%s(%d): " fmt, __func__, __LINE__, ##__VA_ARGS__)
+#else
+#define DPRINTF(fmt, ...) do {} while (0)
+#endif
+
+static struct nl_sock *handle;
+static struct nl_cache *cache;
+static struct genl_family *family;
+static struct nlattr *tb[SWITCH_ATTR_MAX + 1];
+static int refcount = 0;
+
+static struct nla_policy port_policy[SWITCH_ATTR_MAX] = {
+	[SWITCH_PORT_ID] = { .type = NLA_U32 },
+	[SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
+};
+
+static struct nla_policy portmap_policy[SWITCH_PORTMAP_MAX] = {
+	[SWITCH_PORTMAP_SEGMENT] = { .type = NLA_STRING },
+	[SWITCH_PORTMAP_VIRT] = { .type = NLA_U32 },
+};
+
+static inline void *
+swlib_alloc(size_t size)
+{
+	void *ptr;
+
+	ptr = malloc(size);
+	if (!ptr)
+		goto done;
+	memset(ptr, 0, size);
+
+done:
+	return ptr;
+}
+
+static int
+wait_handler(struct nl_msg *msg, void *arg)
+{
+	int *finished = arg;
+
+	*finished = 1;
+	return NL_STOP;
+}
+
+/* helper function for performing netlink requests */
+static int
+swlib_call(int cmd, int (*call)(struct nl_msg *, void *),
+		int (*data)(struct nl_msg *, void *), void *arg)
+{
+	struct nl_msg *msg;
+	struct nl_cb *cb = NULL;
+	int finished;
+	int flags = 0;
+	int err;
+
+	msg = nlmsg_alloc();
+	if (!msg) {
+		fprintf(stderr, "Out of memory!\n");
+		exit(1);
+	}
+
+	if (!data)
+		flags |= NLM_F_DUMP;
+
+	genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, genl_family_get_id(family), 0, flags, cmd, 0);
+	if (data) {
+		if (data(msg, arg) < 0)
+			goto nla_put_failure;
+	}
+
+	cb = nl_cb_alloc(NL_CB_CUSTOM);
+	if (!cb) {
+		fprintf(stderr, "nl_cb_alloc failed.\n");
+		exit(1);
+	}
+
+	err = nl_send_auto_complete(handle, msg);
+	if (err < 0) {
+		fprintf(stderr, "nl_send_auto_complete failed: %d\n", err);
+		goto out;
+	}
+
+	finished = 0;
+
+	if (call)
+		nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, call, arg);
+
+	if (data)
+		nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, wait_handler, &finished);
+	else
+		nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, wait_handler, &finished);
+
+	err = nl_recvmsgs(handle, cb);
+	if (err < 0) {
+		goto out;
+	}
+
+	if (!finished)
+		err = nl_wait_for_ack(handle);
+
+out:
+	if (cb)
+		nl_cb_put(cb);
+nla_put_failure:
+	nlmsg_free(msg);
+	return err;
+}
+
+static int
+send_attr(struct nl_msg *msg, void *arg)
+{
+	struct switch_val *val = arg;
+	struct switch_attr *attr = val->attr;
+
+	NLA_PUT_U32(msg, SWITCH_ATTR_ID, attr->dev->id);
+	NLA_PUT_U32(msg, SWITCH_ATTR_OP_ID, attr->id);
+	switch(attr->atype) {
+	case SWLIB_ATTR_GROUP_PORT:
+		NLA_PUT_U32(msg, SWITCH_ATTR_OP_PORT, val->port_vlan);
+		break;
+	case SWLIB_ATTR_GROUP_VLAN:
+		NLA_PUT_U32(msg, SWITCH_ATTR_OP_VLAN, val->port_vlan);
+		break;
+	default:
+		break;
+	}
+
+	return 0;
+
+nla_put_failure:
+	return -1;
+}
+
+static int
+store_port_val(struct nl_msg *msg, struct nlattr *nla, struct switch_val *val)
+{
+	struct nlattr *p;
+	int ports = val->attr->dev->ports;
+	int err = 0;
+	int remaining;
+
+	if (!val->value.ports)
+		val->value.ports = malloc(sizeof(struct switch_port) * ports);
+
+	nla_for_each_nested(p, nla, remaining) {
+		struct nlattr *tb[SWITCH_PORT_ATTR_MAX+1];
+		struct switch_port *port;
+
+		if (val->len >= ports)
+			break;
+
+		err = nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, p, port_policy);
+		if (err < 0)
+			goto out;
+
+		if (!tb[SWITCH_PORT_ID])
+			continue;
+
+		port = &val->value.ports[val->len];
+		port->id = nla_get_u32(tb[SWITCH_PORT_ID]);
+		port->flags = 0;
+		if (tb[SWITCH_PORT_FLAG_TAGGED])
+			port->flags |= SWLIB_PORT_FLAG_TAGGED;
+
+		val->len++;
+	}
+
+out:
+	return err;
+}
+
+static int
+store_val(struct nl_msg *msg, void *arg)
+{
+	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+	struct switch_val *val = arg;
+
+	if (!val)
+		goto error;
+
+	if (nla_parse(tb, SWITCH_ATTR_MAX - 1, genlmsg_attrdata(gnlh, 0),
+			genlmsg_attrlen(gnlh, 0), NULL) < 0) {
+		goto error;
+	}
+
+	if (tb[SWITCH_ATTR_OP_VALUE_INT])
+		val->value.i = nla_get_u32(tb[SWITCH_ATTR_OP_VALUE_INT]);
+	else if (tb[SWITCH_ATTR_OP_VALUE_STR])
+		val->value.s = strdup(nla_get_string(tb[SWITCH_ATTR_OP_VALUE_STR]));
+	else if (tb[SWITCH_ATTR_OP_VALUE_PORTS])
+		val->err = store_port_val(msg, tb[SWITCH_ATTR_OP_VALUE_PORTS], val);
+
+	val->err = 0;
+	return 0;
+
+error:
+	return NL_SKIP;
+}
+
+int
+swlib_get_attr(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
+{
+	int cmd;
+	int err;
+
+	switch(attr->atype) {
+	case SWLIB_ATTR_GROUP_GLOBAL:
+		cmd = SWITCH_CMD_GET_GLOBAL;
+		break;
+	case SWLIB_ATTR_GROUP_PORT:
+		cmd = SWITCH_CMD_GET_PORT;
+		break;
+	case SWLIB_ATTR_GROUP_VLAN:
+		cmd = SWITCH_CMD_GET_VLAN;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	memset(&val->value, 0, sizeof(val->value));
+	val->len = 0;
+	val->attr = attr;
+	val->err = -EINVAL;
+	err = swlib_call(cmd, store_val, send_attr, val);
+	if (!err)
+		err = val->err;
+
+	return err;
+}
+
+static int
+send_attr_ports(struct nl_msg *msg, struct switch_val *val)
+{
+	struct nlattr *n;
+	int i;
+
+	/* TODO implement multipart? */
+	if (val->len == 0)
+		goto done;
+	n = nla_nest_start(msg, SWITCH_ATTR_OP_VALUE_PORTS);
+	if (!n)
+		goto nla_put_failure;
+	for (i = 0; i < val->len; i++) {
+		struct switch_port *port = &val->value.ports[i];
+		struct nlattr *np;
+
+		np = nla_nest_start(msg, SWITCH_ATTR_PORT);
+		if (!np)
+			goto nla_put_failure;
+
+		NLA_PUT_U32(msg, SWITCH_PORT_ID, port->id);
+		if (port->flags & SWLIB_PORT_FLAG_TAGGED)
+			NLA_PUT_FLAG(msg, SWITCH_PORT_FLAG_TAGGED);
+
+		nla_nest_end(msg, np);
+	}
+	nla_nest_end(msg, n);
+done:
+	return 0;
+
+nla_put_failure:
+	return -1;
+}
+
+static int
+send_attr_val(struct nl_msg *msg, void *arg)
+{
+	struct switch_val *val = arg;
+	struct switch_attr *attr = val->attr;
+
+	if (send_attr(msg, arg))
+		goto nla_put_failure;
+
+	switch(attr->type) {
+	case SWITCH_TYPE_NOVAL:
+		break;
+	case SWITCH_TYPE_INT:
+		NLA_PUT_U32(msg, SWITCH_ATTR_OP_VALUE_INT, val->value.i);
+		break;
+	case SWITCH_TYPE_STRING:
+		if (!val->value.s)
+			goto nla_put_failure;
+		NLA_PUT_STRING(msg, SWITCH_ATTR_OP_VALUE_STR, val->value.s);
+		break;
+	case SWITCH_TYPE_PORTS:
+		if (send_attr_ports(msg, val) < 0)
+			goto nla_put_failure;
+		break;
+	default:
+		goto nla_put_failure;
+	}
+	return 0;
+
+nla_put_failure:
+	return -1;
+}
+
+int
+swlib_set_attr(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
+{
+	int cmd;
+
+	switch(attr->atype) {
+	case SWLIB_ATTR_GROUP_GLOBAL:
+		cmd = SWITCH_CMD_SET_GLOBAL;
+		break;
+	case SWLIB_ATTR_GROUP_PORT:
+		cmd = SWITCH_CMD_SET_PORT;
+		break;
+	case SWLIB_ATTR_GROUP_VLAN:
+		cmd = SWITCH_CMD_SET_VLAN;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	val->attr = attr;
+	return swlib_call(cmd, NULL, send_attr_val, val);
+}
+
+int swlib_set_attr_string(struct switch_dev *dev, struct switch_attr *a, int port_vlan, const char *str)
+{
+	struct switch_port *ports;
+	struct switch_val val;
+	char *ptr;
+
+	memset(&val, 0, sizeof(val));
+	val.port_vlan = port_vlan;
+	switch(a->type) {
+	case SWITCH_TYPE_INT:
+		val.value.i = atoi(str);
+		break;
+	case SWITCH_TYPE_STRING:
+		val.value.s = str;
+		break;
+	case SWITCH_TYPE_PORTS:
+		ports = alloca(sizeof(struct switch_port) * dev->ports);
+		memset(ports, 0, sizeof(struct switch_port) * dev->ports);
+		val.len = 0;
+		ptr = (char *)str;
+		while(ptr && *ptr)
+		{
+			while(*ptr && isspace(*ptr))
+				ptr++;
+
+			if (!*ptr)
+				break;
+
+			if (!isdigit(*ptr))
+				return -1;
+
+			if (val.len >= dev->ports)
+				return -1;
+
+			ports[val.len].flags = 0;
+			ports[val.len].id = strtoul(ptr, &ptr, 10);
+			while(*ptr && !isspace(*ptr)) {
+				if (*ptr == 't')
+					ports[val.len].flags |= SWLIB_PORT_FLAG_TAGGED;
+				else
+					return -1;
+
+				ptr++;
+			}
+			if (*ptr)
+				ptr++;
+			val.len++;
+		}
+		val.value.ports = ports;
+		break;
+	case SWITCH_TYPE_NOVAL:
+		if (str && !strcmp(str, "0"))
+			return 0;
+
+		break;
+	default:
+		return -1;
+	}
+	return swlib_set_attr(dev, a, &val);
+}
+
+
+struct attrlist_arg {
+	int id;
+	int atype;
+	struct switch_dev *dev;
+	struct switch_attr *prev;
+	struct switch_attr **head;
+};
+
+static int
+add_id(struct nl_msg *msg, void *arg)
+{
+	struct attrlist_arg *l = arg;
+
+	NLA_PUT_U32(msg, SWITCH_ATTR_ID, l->id);
+
+	return 0;
+nla_put_failure:
+	return -1;
+}
+
+static int
+add_attr(struct nl_msg *msg, void *ptr)
+{
+	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+	struct attrlist_arg *arg = ptr;
+	struct switch_attr *new;
+
+	if (nla_parse(tb, SWITCH_ATTR_MAX - 1, genlmsg_attrdata(gnlh, 0),
+			genlmsg_attrlen(gnlh, 0), NULL) < 0)
+		goto done;
+
+	new = swlib_alloc(sizeof(struct switch_attr));
+	if (!new)
+		goto done;
+
+	new->dev = arg->dev;
+	new->atype = arg->atype;
+	if (arg->prev) {
+		arg->prev->next = new;
+	} else {
+		arg->prev = *arg->head;
+	}
+	*arg->head = new;
+	arg->head = &new->next;
+
+	if (tb[SWITCH_ATTR_OP_ID])
+		new->id = nla_get_u32(tb[SWITCH_ATTR_OP_ID]);
+	if (tb[SWITCH_ATTR_OP_TYPE])
+		new->type = nla_get_u32(tb[SWITCH_ATTR_OP_TYPE]);
+	if (tb[SWITCH_ATTR_OP_NAME])
+		new->name = strdup(nla_get_string(tb[SWITCH_ATTR_OP_NAME]));
+	if (tb[SWITCH_ATTR_OP_DESCRIPTION])
+		new->description = strdup(nla_get_string(tb[SWITCH_ATTR_OP_DESCRIPTION]));
+
+done:
+	return NL_SKIP;
+}
+
+int
+swlib_scan(struct switch_dev *dev)
+{
+	struct attrlist_arg arg;
+
+	if (dev->ops || dev->port_ops || dev->vlan_ops)
+		return 0;
+
+	arg.atype = SWLIB_ATTR_GROUP_GLOBAL;
+	arg.dev = dev;
+	arg.id = dev->id;
+	arg.prev = NULL;
+	arg.head = &dev->ops;
+	swlib_call(SWITCH_CMD_LIST_GLOBAL, add_attr, add_id, &arg);
+
+	arg.atype = SWLIB_ATTR_GROUP_PORT;
+	arg.prev = NULL;
+	arg.head = &dev->port_ops;
+	swlib_call(SWITCH_CMD_LIST_PORT, add_attr, add_id, &arg);
+
+	arg.atype = SWLIB_ATTR_GROUP_VLAN;
+	arg.prev = NULL;
+	arg.head = &dev->vlan_ops;
+	swlib_call(SWITCH_CMD_LIST_VLAN, add_attr, add_id, &arg);
+
+	return 0;
+}
+
+struct switch_attr *swlib_lookup_attr(struct switch_dev *dev,
+		enum swlib_attr_group atype, const char *name)
+{
+	struct switch_attr *head;
+
+	if (!name || !dev)
+		return NULL;
+
+	switch(atype) {
+	case SWLIB_ATTR_GROUP_GLOBAL:
+		head = dev->ops;
+		break;
+	case SWLIB_ATTR_GROUP_PORT:
+		head = dev->port_ops;
+		break;
+	case SWLIB_ATTR_GROUP_VLAN:
+		head = dev->vlan_ops;
+		break;
+	}
+	while(head) {
+		if (!strcmp(name, head->name))
+			return head;
+		head = head->next;
+	}
+
+	return NULL;
+}
+
+static void
+swlib_priv_free(void)
+{
+	if (cache)
+		nl_cache_free(cache);
+	if (handle)
+		nl_socket_free(handle);
+	handle = NULL;
+	cache = NULL;
+}
+
+static int
+swlib_priv_init(void)
+{
+	int ret;
+
+	handle = nl_socket_alloc();
+	if (!handle) {
+		DPRINTF("Failed to create handle\n");
+		goto err;
+	}
+
+	if (genl_connect(handle)) {
+		DPRINTF("Failed to connect to generic netlink\n");
+		goto err;
+	}
+
+	ret = genl_ctrl_alloc_cache(handle, &cache);
+	if (ret < 0) {
+		DPRINTF("Failed to allocate netlink cache\n");
+		goto err;
+	}
+
+	family = genl_ctrl_search_by_name(cache, "switch");
+	if (!family) {
+		DPRINTF("Switch API not present\n");
+		goto err;
+	}
+	return 0;
+
+err:
+	swlib_priv_free();
+	return -EINVAL;
+}
+
+struct swlib_scan_arg {
+	const char *name;
+	struct switch_dev *head;
+	struct switch_dev *ptr;
+};
+
+static int
+add_port_map(struct switch_dev *dev, struct nlattr *nla)
+{
+	struct nlattr *p;
+	int err = 0, idx = 0;
+	int remaining;
+
+	dev->maps = malloc(sizeof(struct switch_portmap) * dev->ports);
+	if (!dev->maps)
+		return -1;
+	memset(dev->maps, 0, sizeof(struct switch_portmap) * dev->ports);
+
+	nla_for_each_nested(p, nla, remaining) {
+		struct nlattr *tb[SWITCH_PORTMAP_MAX+1];
+
+		if (idx >= dev->ports)
+			continue;
+
+		err = nla_parse_nested(tb, SWITCH_PORTMAP_MAX, p, portmap_policy);
+		if (err < 0)
+			continue;
+
+
+		if (tb[SWITCH_PORTMAP_SEGMENT] && tb[SWITCH_PORTMAP_VIRT]) {
+			dev->maps[idx].segment = strdup(nla_get_string(tb[SWITCH_PORTMAP_SEGMENT]));
+			dev->maps[idx].virt = nla_get_u32(tb[SWITCH_PORTMAP_VIRT]);
+		}
+		idx++;
+	}
+
+out:
+	return err;
+}
+
+
+static int
+add_switch(struct nl_msg *msg, void *arg)
+{
+	struct swlib_scan_arg *sa = arg;
+	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+	struct switch_dev *dev;
+	const char *name;
+	const char *alias;
+
+	if (nla_parse(tb, SWITCH_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
+		goto done;
+
+	if (!tb[SWITCH_ATTR_DEV_NAME])
+		goto done;
+
+	name = nla_get_string(tb[SWITCH_ATTR_DEV_NAME]);
+	alias = nla_get_string(tb[SWITCH_ATTR_ALIAS]);
+
+	if (sa->name && (strcmp(name, sa->name) != 0) && (strcmp(alias, sa->name) != 0))
+		goto done;
+
+	dev = swlib_alloc(sizeof(struct switch_dev));
+	if (!dev)
+		goto done;
+
+	strncpy(dev->dev_name, name, IFNAMSIZ - 1);
+	dev->alias = strdup(alias);
+	if (tb[SWITCH_ATTR_ID])
+		dev->id = nla_get_u32(tb[SWITCH_ATTR_ID]);
+	if (tb[SWITCH_ATTR_NAME])
+		dev->name = strdup(nla_get_string(tb[SWITCH_ATTR_NAME]));
+	if (tb[SWITCH_ATTR_PORTS])
+		dev->ports = nla_get_u32(tb[SWITCH_ATTR_PORTS]);
+	if (tb[SWITCH_ATTR_VLANS])
+		dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
+	if (tb[SWITCH_ATTR_CPU_PORT])
+		dev->cpu_port = nla_get_u32(tb[SWITCH_ATTR_CPU_PORT]);
+	if (tb[SWITCH_ATTR_PORTMAP])
+		add_port_map(dev, tb[SWITCH_ATTR_PORTMAP]);
+
+	if (!sa->head) {
+		sa->head = dev;
+		sa->ptr = dev;
+	} else {
+		sa->ptr->next = dev;
+		sa->ptr = dev;
+	}
+
+	refcount++;
+done:
+	return NL_SKIP;
+}
+
+static int
+list_switch(struct nl_msg *msg, void *arg)
+{
+	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+
+	if (nla_parse(tb, SWITCH_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
+		goto done;
+
+	if (!tb[SWITCH_ATTR_DEV_NAME] || !tb[SWITCH_ATTR_NAME])
+		goto done;
+
+	printf("Found: %s - %s\n", nla_get_string(tb[SWITCH_ATTR_DEV_NAME]),
+		nla_get_string(tb[SWITCH_ATTR_ALIAS]));
+
+done:
+	return NL_SKIP;
+}
+
+void
+swlib_list(void)
+{
+	if (swlib_priv_init() < 0)
+		return;
+	swlib_call(SWITCH_CMD_GET_SWITCH, list_switch, NULL, NULL);
+	swlib_priv_free();
+}
+
+void
+swlib_print_portmap(struct switch_dev *dev, char *segment)
+{
+	int i;
+
+	if (segment) {
+		if (!strcmp(segment, "cpu")) {
+			printf("%d ", dev->cpu_port);
+		} else if (!strcmp(segment, "disabled")) {
+			for (i = 0; i < dev->ports; i++)
+				if (!dev->maps[i].segment)
+					printf("%d ", i);
+		} else for (i = 0; i < dev->ports; i++) {
+			if (dev->maps[i].segment && !strcmp(dev->maps[i].segment, segment))
+				printf("%d ", i);
+		}
+	} else {
+		printf("%s - %s\n", dev->dev_name, dev->name);
+		for (i = 0; i < dev->ports; i++)
+			if (i == dev->cpu_port)
+				printf("port%d:\tcpu\n", i);
+			else if (dev->maps[i].segment)
+				printf("port%d:\t%s.%d\n", i, dev->maps[i].segment, dev->maps[i].virt);
+			else
+				printf("port%d:\tdisabled\n", i);
+	}
+}
+
+struct switch_dev *
+swlib_connect(const char *name)
+{
+	struct swlib_scan_arg arg;
+
+	if (!refcount) {
+		if (swlib_priv_init() < 0)
+			return NULL;
+	};
+
+	arg.head = NULL;
+	arg.ptr = NULL;
+	arg.name = name;
+	swlib_call(SWITCH_CMD_GET_SWITCH, add_switch, NULL, &arg);
+
+	if (!refcount)
+		swlib_priv_free();
+
+	return arg.head;
+}
+
+static void
+swlib_free_attributes(struct switch_attr **head)
+{
+	struct switch_attr *a = *head;
+	struct switch_attr *next;
+
+	while (a) {
+		next = a->next;
+		free(a);
+		a = next;
+	}
+	*head = NULL;
+}
+
+void
+swlib_free(struct switch_dev *dev)
+{
+	swlib_free_attributes(&dev->ops);
+	swlib_free_attributes(&dev->port_ops);
+	swlib_free_attributes(&dev->vlan_ops);
+	free(dev);
+
+	if (--refcount == 0)
+		swlib_priv_free();
+}
+
+void
+swlib_free_all(struct switch_dev *dev)
+{
+	struct switch_dev *p;
+
+	while (dev) {
+		p = dev->next;
+		swlib_free(dev);
+		dev = p;
+	}
+}
diff --git a/trunk/package/network/config/swconfig/src/swlib.h b/trunk/package/network/config/swconfig/src/swlib.h
new file mode 100644
index 00000000..016f74b4
--- /dev/null
+++ b/trunk/package/network/config/swconfig/src/swlib.h
@@ -0,0 +1,252 @@
+/*
+ * swlib.h: Switch configuration API (user space part)
+ *
+ * Copyright (C) 2008-2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ *
+
+Usage of the library functions:
+
+  The main datastructure for a switch is the struct switch_device
+  To get started, you first need to use switch_connect() to probe
+  for switches and allocate an instance of this struct.
+
+  There are two possible usage modes:
+    dev = switch_connect("eth0");
+      - this call will look for a switch registered for the linux device
+  	  "eth0" and only allocate a switch_device for this particular switch.
+
+    dev = switch_connect(NULL)
+      - this will return one switch_device struct for each available
+  	  switch. The switch_device structs are chained with by ->next pointer
+
+  Then to query a switch for all available attributes, use:
+    swlib_scan(dev);
+
+  All allocated datastructures for the switch_device struct can be freed with
+    swlib_free(dev);
+  or
+    swlib_free_all(dev);
+
+  The latter traverses a whole chain of switch_device structs and frees them all
+
+  Switch attributes (struct switch_attr) are divided into three groups:
+    dev->ops:
+      - global settings
+    dev->port_ops:
+      - per-port settings
+    dev->vlan_ops:
+      - per-vlan settings
+
+  switch_lookup_attr() is a small helper function to locate attributes
+  by name.
+
+  switch_set_attr() and switch_get_attr() can alter or request the values
+  of attributes.
+
+Usage of the switch_attr struct:
+
+  ->atype: attribute group, one of:
+    - SWLIB_ATTR_GROUP_GLOBAL
+    - SWLIB_ATTR_GROUP_VLAN
+    - SWLIB_ATTR_GROUP_PORT
+
+  ->id: identifier for the attribute
+
+  ->type: data type, one of:
+    - SWITCH_TYPE_INT
+    - SWITCH_TYPE_STRING
+    - SWITCH_TYPE_PORT
+
+  ->name: short name of the attribute
+  ->description: longer description
+  ->next: pointer to the next attribute of the current group
+
+
+Usage of the switch_val struct:
+
+  When setting attributes, following members of the struct switch_val need
+  to be set up:
+
+    ->len (for attr->type == SWITCH_TYPE_PORT)
+    ->port_vlan:
+      - port number (for attr->atype == SWLIB_ATTR_GROUP_PORT), or:
+      - vlan number (for attr->atype == SWLIB_ATTR_GROUP_VLAN)
+    ->value.i (for attr->type == SWITCH_TYPE_INT)
+    ->value.s (for attr->type == SWITCH_TYPE_STRING)
+      - owned by the caller, not stored in the library internally
+    ->value.ports (for attr->type == SWITCH_TYPE_PORT)
+      - must point to an array of at lest val->len * sizeof(struct switch_port)
+
+  When getting string attributes, val->value.s must be freed by the caller
+  When getting port list attributes, an internal static buffer is used,
+  which changes from call to call.
+
+ */
+
+#ifndef __SWLIB_H
+#define __SWLIB_H
+
+enum swlib_attr_group {
+	SWLIB_ATTR_GROUP_GLOBAL,
+	SWLIB_ATTR_GROUP_VLAN,
+	SWLIB_ATTR_GROUP_PORT,
+};
+
+enum swlib_port_flags {
+	SWLIB_PORT_FLAG_TAGGED = (1 << 0),
+};
+
+
+struct switch_dev;
+struct switch_attr;
+struct switch_port;
+struct switch_port_map;
+struct switch_val;
+struct uci_package;
+
+struct switch_dev {
+	int id;
+	char dev_name[IFNAMSIZ];
+	const char *name;
+	const char *alias;
+	int ports;
+	int vlans;
+	int cpu_port;
+	struct switch_attr *ops;
+	struct switch_attr *port_ops;
+	struct switch_attr *vlan_ops;
+	struct switch_portmap *maps;
+	struct switch_dev *next;
+	void *priv;
+};
+
+struct switch_val {
+	struct switch_attr *attr;
+	int len;
+	int err;
+	int port_vlan;
+	union {
+		const char *s;
+		int i;
+		struct switch_port *ports;
+	} value;
+};
+
+struct switch_attr {
+	struct switch_dev *dev;
+	int atype;
+	int id;
+	int type;
+	const char *name;
+	const char *description;
+	struct switch_attr *next;
+};
+
+struct switch_port {
+	unsigned int id;
+	unsigned int flags;
+};
+
+struct switch_portmap {
+	unsigned int virt;
+	const char *segment;
+};
+
+/**
+ * swlib_list: list all switches
+ */
+void swlib_list(void);
+
+/**
+ * swlib_print_portmap: get portmap
+ * @dev: switch device struct
+ */
+void swlib_print_portmap(struct switch_dev *dev, char *segment);
+
+/**
+ * swlib_connect: connect to the switch through netlink
+ * @name: name of the ethernet interface,
+ *
+ * if name is NULL, it connect and builds a chain of all switches
+ */
+struct switch_dev *swlib_connect(const char *name);
+
+/**
+ * swlib_free: free all dynamically allocated data for the switch connection
+ * @dev: switch device struct
+ *
+ * all members of a switch device chain (generated by swlib_connect(NULL))
+ * must be freed individually
+ */
+void swlib_free(struct switch_dev *dev);
+
+/**
+ * swlib_free_all: run swlib_free on all devices in the chain
+ * @dev: switch device struct
+ */
+void swlib_free_all(struct switch_dev *dev);
+
+/**
+ * swlib_scan: probe the switch driver for available commands/attributes
+ * @dev: switch device struct
+ */
+int swlib_scan(struct switch_dev *dev);
+
+/**
+ * swlib_lookup_attr: look up a switch attribute
+ * @dev: switch device struct
+ * @type: global, port or vlan
+ * @name: name of the attribute
+ */
+struct switch_attr *swlib_lookup_attr(struct switch_dev *dev,
+		enum swlib_attr_group atype, const char *name);
+
+/**
+ * swlib_set_attr: set the value for an attribute
+ * @dev: switch device struct
+ * @attr: switch attribute struct
+ * @val: attribute value pointer
+ * returns 0 on success
+ */
+int swlib_set_attr(struct switch_dev *dev, struct switch_attr *attr,
+		struct switch_val *val);
+
+/**
+ * swlib_set_attr_string: set the value for an attribute with type conversion
+ * @dev: switch device struct
+ * @attr: switch attribute struct
+ * @port_vlan: port or vlan (if applicable)
+ * @str: string value
+ * returns 0 on success
+ */
+int swlib_set_attr_string(struct switch_dev *dev, struct switch_attr *attr,
+		int port_vlan, const char *str);
+
+/**
+ * swlib_get_attr: get the value for an attribute
+ * @dev: switch device struct
+ * @attr: switch attribute struct
+ * @val: attribute value pointer
+ * returns 0 on success
+ * for string attributes, the result string must be freed by the caller
+ */
+int swlib_get_attr(struct switch_dev *dev, struct switch_attr *attr,
+		struct switch_val *val);
+
+/**
+ * swlib_apply_from_uci: set up the switch from a uci configuration
+ * @dev: switch device struct
+ * @p: uci package which contains the desired global config
+ */
+int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p);
+
+#endif
diff --git a/trunk/package/network/config/swconfig/src/uci.c b/trunk/package/network/config/swconfig/src/uci.c
new file mode 100644
index 00000000..bbeeb031
--- /dev/null
+++ b/trunk/package/network/config/swconfig/src/uci.c
@@ -0,0 +1,246 @@
+/*
+ * uci.c: UCI binding for the switch configuration utility
+ *
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundatio.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <stdint.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <uci.h>
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+#include <linux/genetlink.h>
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#include <linux/switch.h>
+#include "swlib.h"
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#endif
+
+struct swlib_setting {
+	struct switch_attr *attr;
+	const char *name;
+	int port_vlan;
+	const char *val;
+	struct swlib_setting *next;
+};
+
+struct swlib_setting early_settings[] = {
+	{ .name = "reset", .val = "1" },
+	{ .name = "enable_vlan", .val = "1" },
+};
+
+static struct swlib_setting *settings;
+static struct swlib_setting **head;
+
+static bool swlib_match_name(struct switch_dev *dev, const char *name)
+{
+	return (strcmp(name, dev->dev_name) == 0 ||
+		strcmp(name, dev->alias) == 0);
+}
+
+static int
+swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_section *s)
+{
+	struct swlib_setting *setting;
+	struct switch_attr *attr;
+	struct uci_element *e;
+	struct uci_option *o;
+
+	uci_foreach_element(&s->options, e) {
+		o = uci_to_option(e);
+
+		if (o->type != UCI_TYPE_STRING)
+			continue;
+
+		if (!strcmp(e->name, "device"))
+			continue;
+
+		/* map early settings */
+		if (type == SWLIB_ATTR_GROUP_GLOBAL) {
+			int i;
+
+			for (i = 0; i < ARRAY_SIZE(early_settings); i++) {
+				if (strcmp(e->name, early_settings[i].name) != 0)
+					continue;
+
+				early_settings[i].val = o->v.string;
+				goto skip;
+			}
+		}
+
+		attr = swlib_lookup_attr(dev, type, e->name);
+		if (!attr)
+			continue;
+
+		setting = malloc(sizeof(struct swlib_setting));
+		memset(setting, 0, sizeof(struct swlib_setting));
+		setting->attr = attr;
+		setting->port_vlan = port_vlan;
+		setting->val = o->v.string;
+		*head = setting;
+		head = &setting->next;
+skip:
+		continue;
+	}
+}
+
+int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p)
+{
+	struct switch_attr *attr;
+	struct uci_element *e;
+	struct uci_section *s;
+	struct uci_option *o;
+	struct uci_ptr ptr;
+	struct switch_val val;
+	int i;
+
+	settings = NULL;
+	head = &settings;
+
+	uci_foreach_element(&p->sections, e) {
+		struct uci_element *n;
+
+		s = uci_to_section(e);
+
+		if (strcmp(s->type, "switch") != 0)
+			continue;
+
+		uci_foreach_element(&s->options, n) {
+			struct uci_option *o = uci_to_option(n);
+
+			if (strcmp(n->name, "name") != 0)
+				continue;
+
+			if (o->type != UCI_TYPE_STRING)
+				continue;
+
+			if (swlib_match_name(dev, o->v.string))
+				goto found;
+
+			break;
+		}
+
+		if (!swlib_match_name(dev, e->name))
+			continue;
+
+		goto found;
+	}
+
+	/* not found */
+	return -1;
+
+found:
+	/* look up available early options, which need to be taken care
+	 * of in the correct order */
+	for (i = 0; i < ARRAY_SIZE(early_settings); i++) {
+		early_settings[i].attr = swlib_lookup_attr(dev,
+			SWLIB_ATTR_GROUP_GLOBAL, early_settings[i].name);
+	}
+	swlib_map_settings(dev, SWLIB_ATTR_GROUP_GLOBAL, 0, s);
+
+	/* look for port or vlan sections */
+	uci_foreach_element(&p->sections, e) {
+		struct uci_element *os;
+		s = uci_to_section(e);
+
+		if (!strcmp(s->type, "switch_port")) {
+			char *devn, *port, *port_err = NULL;
+			int port_n;
+
+			uci_foreach_element(&s->options, os) {
+				o = uci_to_option(os);
+				if (o->type != UCI_TYPE_STRING)
+					continue;
+
+				if (!strcmp(os->name, "device")) {
+					devn = o->v.string;
+					if (!swlib_match_name(dev, devn))
+						devn = NULL;
+				} else if (!strcmp(os->name, "port")) {
+					port = o->v.string;
+				}
+			}
+			if (!devn || !port || !port[0])
+				continue;
+
+			port_n = strtoul(port, &port_err, 0);
+			if (port_err && port_err[0])
+				continue;
+
+			swlib_map_settings(dev, SWLIB_ATTR_GROUP_PORT, port_n, s);
+		} else if (!strcmp(s->type, "switch_vlan")) {
+			char *devn, *vlan, *vlan_err = NULL;
+			int vlan_n;
+
+			uci_foreach_element(&s->options, os) {
+				o = uci_to_option(os);
+				if (o->type != UCI_TYPE_STRING)
+					continue;
+
+				if (!strcmp(os->name, "device")) {
+					devn = o->v.string;
+					if (!swlib_match_name(dev, devn))
+						devn = NULL;
+				} else if (!strcmp(os->name, "vlan")) {
+					vlan = o->v.string;
+				}
+			}
+			if (!devn || !vlan || !vlan[0])
+				continue;
+
+			vlan_n = strtoul(vlan, &vlan_err, 0);
+			if (vlan_err && vlan_err[0])
+				continue;
+
+			swlib_map_settings(dev, SWLIB_ATTR_GROUP_VLAN, vlan_n, s);
+		}
+	}
+
+	for (i = 0; i < ARRAY_SIZE(early_settings); i++) {
+		struct swlib_setting *st = &early_settings[i];
+		if (!st->attr || !st->val)
+			continue;
+		swlib_set_attr_string(dev, st->attr, st->port_vlan, st->val);
+
+	}
+
+	while (settings) {
+		struct swlib_setting *st = settings;
+
+		swlib_set_attr_string(dev, st->attr, st->port_vlan, st->val);
+		st = st->next;
+		free(settings);
+		settings = st;
+	}
+
+	/* Apply the config */
+	attr = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_GLOBAL, "apply");
+	if (!attr)
+		return 0;
+
+	memset(&val, 0, sizeof(val));
+	swlib_set_attr(dev, attr, &val);
+
+	return 0;
+}
diff --git a/trunk/package/network/ipv6/6in4/Makefile b/trunk/package/network/ipv6/6in4/Makefile
new file mode 100644
index 00000000..aeb187cb
--- /dev/null
+++ b/trunk/package/network/ipv6/6in4/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2010-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=6in4
+PKG_VERSION:=18
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/6in4
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-ipv6 +kmod-sit
+  TITLE:=IPv6-in-IPv4 configuration support
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  PKGARCH:=all
+endef
+
+define Package/6in4/description
+Provides support for 6in4 tunnels in /etc/config/network.
+Refer to http://wiki.openwrt.org/doc/uci/network for
+configuration details.
+endef
+
+define Build/Compile
+endef
+
+define Build/Configure
+endef
+
+define Package/6in4/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/6in4.sh $(1)/lib/netifd/proto/6in4.sh
+endef
+
+$(eval $(call BuildPackage,6in4))
diff --git a/trunk/package/network/ipv6/6in4/files/6in4.sh b/trunk/package/network/ipv6/6in4/files/6in4.sh
new file mode 100755
index 00000000..f639a5de
--- /dev/null
+++ b/trunk/package/network/ipv6/6in4/files/6in4.sh
@@ -0,0 +1,134 @@
+#!/bin/sh
+# 6in4.sh - IPv6-in-IPv4 tunnel backend
+# Copyright (c) 2010-2014 OpenWrt.org
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_6in4_setup() {
+	local cfg="$1"
+	local iface="$2"
+	local link="6in4-$cfg"
+
+	local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
+	json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
+
+	[ -z "$peeraddr" ] && {
+		proto_notify_error "$cfg" "MISSING_ADDRESS"
+		proto_block_restart "$cfg"
+		return
+	}
+
+	( proto_add_host_dependency "$cfg" 0.0.0.0 )
+
+	[ -z "$ipaddr" ] && {
+		local wanif
+		if ! network_find_wan wanif || ! network_get_ipaddr ipaddr "$wanif"; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			return
+		fi
+	}
+
+	proto_init_update "$link" 1
+
+	local source=""
+	[ "$sourcerouting" != "0" ] && source="::/128"
+	proto_add_ipv6_route "::" 0 "" "" "" "$source"
+
+	[ -n "$ip6addr" ] && {
+		local local6="${ip6addr%%/*}"
+		local mask6="${ip6addr##*/}"
+		[[ "$local6" = "$mask6" ]] && mask6=
+		proto_add_ipv6_address "$local6" "$mask6"
+		[ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
+	}
+
+	[ -n "$ip6prefix" ] && {
+		proto_add_ipv6_prefix "$ip6prefix"
+		[ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
+	}
+
+	proto_add_tunnel
+	json_add_string mode sit
+	json_add_int mtu "${mtu:-1280}"
+	json_add_int ttl "${ttl:-64}"
+	[ -n "$tos" ] && json_add_string tos "$tos"
+	json_add_string local "$ipaddr"
+	json_add_string remote "$peeraddr"
+	proto_close_tunnel
+
+	proto_send_update "$cfg"
+
+	[ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && {
+		[ -n "$updatekey" ] && password="$updatekey"
+
+		local http="http"
+		local urlget="wget"
+		local urlget_opts="-qO/dev/stdout"
+		local ca_path="${SSL_CERT_DIR-/etc/ssl/certs}"
+
+		if [ -n "$(which curl)" ]; then
+			urlget="curl"
+			urlget_opts="-s -S"
+			if curl -V | grep "Protocols:" | grep -qF "https"; then
+				http="https"
+				urlget_opts="$urlget_opts --capath $ca_path"
+			fi
+		fi
+		if [ "$http" = "http" ] &&
+			wget --version 2>&1 | grep -qF "+https"; then
+			urlget="wget"
+			urlget_opts="-qO/dev/stdout --ca-directory=$ca_path"
+			http="https"
+		fi
+		[ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && {
+			if [ "$urlget" = "curl" ]; then
+				urlget_opts="$urlget_opts -k"
+			else
+				urlget_opts="$urlget_opts --no-check-certificate"
+			fi
+		}
+
+		local url="$http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid"
+		local try=0
+		local max=3
+
+		while [ $((++try)) -le $max ]; do
+			( exec $urlget $urlget_opts "$url" | logger -t "$link" ) &
+			local pid=$!
+			( sleep 20; kill $pid 2>/dev/null ) &
+			wait $pid && break
+			sleep 20;
+		done
+	}
+}
+
+proto_6in4_teardown() {
+	local cfg="$1"
+}
+
+proto_6in4_init_config() {
+	no_device=1
+	available=1
+
+	proto_config_add_string "ipaddr"
+	proto_config_add_string "ip6addr"
+	proto_config_add_string "ip6prefix"
+	proto_config_add_string "peeraddr"
+	proto_config_add_string "tunnelid"
+	proto_config_add_string "username"
+	proto_config_add_string "password"
+	proto_config_add_string "updatekey"
+	proto_config_add_int "mtu"
+	proto_config_add_int "ttl"
+	proto_config_add_string "tos"
+	proto_config_add_boolean "sourcerouting"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol 6in4
+}
diff --git a/trunk/package/network/ipv6/6rd/Makefile b/trunk/package/network/ipv6/6rd/Makefile
new file mode 100644
index 00000000..82195c8c
--- /dev/null
+++ b/trunk/package/network/ipv6/6rd/Makefile
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=6rd
+PKG_VERSION:=7
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/6rd
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-ipv6 +kmod-sit
+  TITLE:=6rd configuration support
+  MAINTAINER:=Stéphan Kochen <stephan@kochen.nl>
+  PKGARCH:=all
+endef
+
+define Package/6rd/description
+Provides support for 6rd tunnels in /etc/config/network.
+Refer to http://wiki.openwrt.org/doc/uci/network for
+configuration details.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+endef
+
+define Package/6rd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/6rdcalc $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/6rd.sh $(1)/lib/netifd/proto/6rd.sh
+endef
+
+$(eval $(call BuildPackage,6rd))
diff --git a/trunk/package/network/ipv6/6rd/files/6rd.sh b/trunk/package/network/ipv6/6rd/files/6rd.sh
new file mode 100644
index 00000000..042d9855
--- /dev/null
+++ b/trunk/package/network/ipv6/6rd/files/6rd.sh
@@ -0,0 +1,108 @@
+#!/bin/sh
+# 6rd.sh - IPv6-in-IPv4 tunnel backend
+# Copyright (c) 2010-2012 OpenWrt.org
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_6rd_setup() {
+	local cfg="$1"
+	local iface="$2"
+	local link="6rd-$cfg"
+
+	local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
+	json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
+
+	[ -z "$ip6prefix" -o -z "$peeraddr" ] && {
+		proto_notify_error "$cfg" "MISSING_ADDRESS"
+		proto_block_restart "$cfg"
+		return
+	}
+
+	( proto_add_host_dependency "$cfg" 0.0.0.0 )
+
+	[ -z "$ipaddr" ] && {
+		local wanif="$tunlink"
+		if [ -z $wanif ] && ! network_find_wan wanif; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			return
+		fi
+
+		if ! network_get_ipaddr ipaddr "$wanif"; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			return
+		fi
+	}
+
+	# Determine the relay prefix.
+	local ip4prefixlen="${ip4prefixlen:-0}"
+	local ip4prefix=$(ipcalc.sh "$ipaddr/$ip4prefixlen" | grep NETWORK)
+	ip4prefix="${ip4prefix#NETWORK=}"
+
+	# Determine our IPv6 address.
+	local ip6subnet=$(6rdcalc "$ip6prefix/$ip6prefixlen" "$ipaddr/$ip4prefixlen")
+	local ip6addr="${ip6subnet%%::*}::1"
+
+	# Determine the IPv6 prefix
+	local ip6lanprefix="$ip6subnet/$(($ip6prefixlen + 32 - $ip4prefixlen))"
+
+	proto_init_update "$link" 1
+	proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
+	proto_add_ipv6_prefix "$ip6lanprefix"
+
+	if [ "$sourcerouting" != "0" ]; then
+		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "::/128"
+		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
+		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"
+	else
+		proto_add_ipv6_route "::" 0 "::$peeraddr" 4096
+	fi
+
+	proto_add_tunnel
+	json_add_string mode sit
+	json_add_int mtu "${mtu:-1280}"
+	json_add_boolean df "${df:-1}"
+	json_add_int ttl "${ttl:-64}"
+	[ -n "$tos" ] && json_add_string tos "$tos"
+	json_add_string local "$ipaddr"
+	json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen"
+	json_add_string 6rd-relay-prefix "$ip4prefix/$ip4prefixlen"
+	[ -n "$tunlink" ] && json_add_string link "$tunlink"
+	proto_close_tunnel
+
+	proto_add_data
+	[ -n "$zone" ] && json_add_string zone "$zone"
+	proto_close_data
+
+	proto_send_update "$cfg"
+}
+
+proto_6rd_teardown() {
+	local cfg="$1"
+}
+
+proto_6rd_init_config() {
+	no_device=1
+	available=1
+
+	proto_config_add_int "mtu"
+	proto_config_add_boolean "df"
+	proto_config_add_int "ttl"
+	proto_config_add_string "tos"
+	proto_config_add_string "ipaddr"
+	proto_config_add_string "peeraddr"
+	proto_config_add_string "ip6prefix"
+	proto_config_add_string "ip6prefixlen"
+	proto_config_add_string "ip4prefixlen"
+	proto_config_add_string "tunlink"
+	proto_config_add_boolean "sourcerouting"
+	proto_config_add_string "zone"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol 6rd
+}
diff --git a/trunk/package/network/ipv6/6rd/src/6rdcalc.c b/trunk/package/network/ipv6/6rd/src/6rdcalc.c
new file mode 100644
index 00000000..87bc3970
--- /dev/null
+++ b/trunk/package/network/ipv6/6rd/src/6rdcalc.c
@@ -0,0 +1,126 @@
+/*
+ * Utility used to calculate the 6rd subnet.
+ *
+ * Copyright 2012, Stéphan Kochen <stephan@kochen.nl>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/errno.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#define INET_PREFIXSTRLEN (INET_ADDRSTRLEN+3)
+#define INET6_PREFIXSTRLEN (INET6_ADDRSTRLEN+4)
+
+static void print_usage()
+{
+	fprintf(stderr, "Usage: 6rdcalc <v6 prefix>/<mask> <v4 address>/<mask>\n");
+	exit(1);
+}
+
+static void print_error()
+{
+	fprintf(stderr, "%s", strerror(errno));
+	exit(1);
+}
+
+static void parse_str(int af, char *str, void *addr, unsigned long *mask)
+{
+	int ret;
+	char *slash;
+
+	/* Split the address at the slash. */
+	if ((slash = strchr(str, '/')) == NULL)
+		print_usage();
+	*slash = '\0';
+
+	/* Parse the address. */
+	if ((ret = inet_pton(af, str, addr)) != 1) {
+		if (ret == 0)
+			print_usage();
+		else
+			print_error();
+	}
+
+	/* Parse the mask. */
+	*mask = strtoul(slash+1, NULL, 10);
+	if ((af == AF_INET  && *mask >  32) ||
+		(af == AF_INET6 && *mask > 128))
+		print_usage();
+}
+
+int main(int argc, const char **argv)
+{
+	char v6str[INET6_PREFIXSTRLEN], v4str[INET_PREFIXSTRLEN];
+	struct in6_addr v6;
+	struct in_addr v4;
+	unsigned long v6it, v4it, mask;
+	unsigned char *byte4, *byte6;
+	unsigned char bit4, bit6;
+
+	/* Check parameters. */
+	if (argc != 3)
+		print_usage();
+
+	/* Parse the v6 address. */
+	strncpy(v6str, argv[1], INET6_PREFIXSTRLEN);
+	v6str[INET6_PREFIXSTRLEN-1] = '\0';
+	parse_str(AF_INET6, v6str, &v6, &v6it);
+
+	/* Parse the v4 address */
+	strncpy(v4str, argv[2], INET_PREFIXSTRLEN);
+	v6str[INET_PREFIXSTRLEN-1] = '\0';
+	parse_str(AF_INET, v4str, &v4, &v4it);
+
+	/* Check if the combined mask is within bounds. */
+	mask = (32 - v4it) + v6it;
+	if (mask > 128)
+		print_usage();
+
+	/* Combine the addresses. */
+	while (v4it < 32) {
+		byte6 = (unsigned char *)(&v6.s6_addr) + (v6it >> 3);
+		byte4 = (unsigned char *)(&v4.s_addr)  + (v4it >> 3);
+		bit6 = 128 >> (v6it & 0x07);
+		bit4 = 128 >> (v4it & 0x07);
+
+		if (*byte4 & bit4)
+			*byte6 |= bit6;
+		else
+			*byte6 &= ~bit6;
+
+		v4it++; v6it++;
+	}
+
+	/* Clear remaining bits. */
+	while (v6it < 128) {
+		byte6 = (unsigned char *)(&v6.s6_addr) + (v6it >> 3);
+		bit6 = 128 >> (v6it & 0x07);
+
+		*byte6 &= ~bit6;
+
+		v6it++;
+	}
+
+	/* Print the subnet prefix. */
+	if (inet_ntop(AF_INET6, &v6, v6str, sizeof(v6str)) == NULL)
+		print_error();
+	printf("%s/%lu\n", v6str, mask);
+	return 0;
+}
diff --git a/trunk/package/network/ipv6/6rd/src/Makefile b/trunk/package/network/ipv6/6rd/src/Makefile
new file mode 100644
index 00000000..2881d435
--- /dev/null
+++ b/trunk/package/network/ipv6/6rd/src/Makefile
@@ -0,0 +1,7 @@
+all: 6rdcalc
+
+6rdcalc: 6rdcalc.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+clean:
+	rm -f 6rdcalc
diff --git a/trunk/package/network/ipv6/6to4/Makefile b/trunk/package/network/ipv6/6to4/Makefile
new file mode 100644
index 00000000..6be2cc57
--- /dev/null
+++ b/trunk/package/network/ipv6/6to4/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=6to4
+PKG_VERSION:=12
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/6to4
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-ipv6 +kmod-sit
+  TITLE:=IPv6-to-IPv4 configuration support
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  PKGARCH:=all
+endef
+
+define Package/6to4/description
+Provides support for 6to4 tunnels in /etc/config/network.
+Refer to http://wiki.openwrt.org/doc/uci/network for
+configuration details.
+endef
+
+define Build/Compile
+endef
+
+define Build/Configure
+endef
+
+define Package/6to4/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/6to4.sh $(1)/lib/netifd/proto/6to4.sh
+endef
+
+$(eval $(call BuildPackage,6to4))
diff --git a/trunk/package/network/ipv6/6to4/files/6to4.sh b/trunk/package/network/ipv6/6to4/files/6to4.sh
new file mode 100755
index 00000000..ce1de53e
--- /dev/null
+++ b/trunk/package/network/ipv6/6to4/files/6to4.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+# 6to4.sh - IPv6-in-IPv4 tunnel backend
+# Copyright (c) 2010-2012 OpenWrt.org
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+find_6to4_prefix() {
+	local ip4="$1"
+	local oIFS="$IFS"; IFS="."; set -- $ip4; IFS="$oIFS"
+
+	printf "2002:%02x%02x:%02x%02x\n" $1 $2 $3 $4
+}
+
+test_6to4_rfc1918()
+{
+	local oIFS="$IFS"; IFS="."; set -- $1; IFS="$oIFS"
+	[ $1 -eq  10 ] && return 0
+	[ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0
+	[ $1 -eq 172 ] && [ $2 -ge  16 ] && [ $2 -le  31 ] && return 0
+
+	# RFC 6598
+	[ $1 -eq 100 ] && [ $2 -ge  64 ] && [ $2 -le 127 ] && return 0
+
+	return 1
+}
+
+proto_6to4_setup() {
+	local cfg="$1"
+	local iface="$2"
+	local link="6to4-$cfg"
+
+	local mtu ttl tos ipaddr sourcerouting
+	json_get_vars mtu ttl tos ipaddr sourcerouting
+
+	( proto_add_host_dependency "$cfg" 0.0.0.0 )
+
+	local wanif
+	if ! network_find_wan wanif; then
+		proto_notify_error "$cfg" "NO_WAN_LINK"
+		return
+	fi
+
+	[ -z "$ipaddr" ] && {
+		if ! network_get_ipaddr ipaddr "$wanif"; then
+			proto_notify_error "$cfg" "NO_WAN_ADDRESS"
+			return
+		fi
+	}
+
+	test_6to4_rfc1918 "$ipaddr" && {
+		proto_notify_error "$cfg" "INVALID_LOCAL_ADDRESS"
+		return
+	}
+
+	# find our local prefix
+	local prefix6=$(find_6to4_prefix "$ipaddr")
+	local local6="$prefix6::1"
+
+	proto_init_update "$link" 1
+	proto_add_ipv6_address "$local6" 16
+	proto_add_ipv6_prefix "$prefix6::/48"
+
+	if [ "$sourcerouting" != "0" ]; then
+		proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "::/128"
+		proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
+		proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
+	else
+		proto_add_ipv6_route "::" 0 "::192.88.99.1"
+	fi
+
+	proto_add_tunnel
+	json_add_string mode sit
+	json_add_int mtu "${mtu:-1280}"
+	json_add_int ttl "${ttl:-64}"
+	[ -n "$tos" ] && json_add_string tos "$tos"
+	json_add_string local "$ipaddr"
+	proto_close_tunnel
+
+	proto_send_update "$cfg"
+}
+
+proto_6to4_teardown() {
+	local cfg="$1"
+}
+
+proto_6to4_init_config() {
+	no_device=1
+	available=1
+
+	proto_config_add_string "ipaddr"
+	proto_config_add_int "mtu"
+	proto_config_add_int "ttl"
+	proto_config_add_string "tos"
+	proto_config_add_boolean "sourcerouting"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol 6to4
+}
diff --git a/trunk/package/network/ipv6/ds-lite/Makefile b/trunk/package/network/ipv6/ds-lite/Makefile
new file mode 100644
index 00000000..4a3d1b38
--- /dev/null
+++ b/trunk/package/network/ipv6/ds-lite/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ds-lite
+PKG_VERSION:=4
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ds-lite
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel
+  TITLE:=Dual-Stack Lite (DS-Lite) configuration support
+  MAINTAINER:=Steven Barth <steven@midlink.org>
+  PKGARCH:=all
+endef
+
+define Package/ds-lite/description
+Provides support for Dual-Stack Lite in /etc/config/network.
+Refer to http://wiki.openwrt.org/doc/uci/network for
+configuration details.
+endef
+
+define Build/Compile
+endef
+
+define Build/Configure
+endef
+
+define Package/ds-lite/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/dslite.sh $(1)/lib/netifd/proto/dslite.sh
+endef
+
+$(eval $(call BuildPackage,ds-lite))
diff --git a/trunk/package/network/ipv6/ds-lite/files/dslite.sh b/trunk/package/network/ipv6/ds-lite/files/dslite.sh
new file mode 100755
index 00000000..a526c91d
--- /dev/null
+++ b/trunk/package/network/ipv6/ds-lite/files/dslite.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+# dslite.sh - IPv4-in-IPv6 tunnel backend
+# Copyright (c) 2013 OpenWrt.org
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_dslite_setup() {
+	local cfg="$1"
+	local iface="$2"
+	local link="dslite-$cfg"
+
+	local mtu ttl peeraddr ip6addr tunlink zone weakif
+	json_get_vars mtu ttl peeraddr ip6addr tunlink zone weakif
+
+	[ -z "$peeraddr" ] && {
+		proto_notify_error "$cfg" "MISSING_ADDRESS"
+		proto_block_restart "$cfg"
+		return
+	}
+
+	( proto_add_host_dependency "$cfg" "::" "$tunlink" )
+
+	[ -z "$ip6addr" ] && {
+		local wanif="$tunlink"
+		if [ -z "$wanif" ] && ! network_find_wan6 wanif; then
+			proto_notify_error "$cfg" "NO_WAN_LINK"
+			return
+		fi
+
+		if ! network_get_ipaddr6 ip6addr "$wanif"; then
+			[ -z "$weakif" ] && weakif="lan"
+			if ! network_get_ipaddr6 ip6addr "$weakif"; then
+				proto_notify_error "$cfg" "NO_WAN_LINK"
+				return
+			fi
+		fi
+	}
+
+	proto_init_update "$link" 1
+	proto_add_ipv4_route "0.0.0.0" 0
+	proto_add_ipv4_address "192.0.0.2" "" "" "192.0.0.1"
+
+	proto_add_tunnel
+	json_add_string mode ipip6
+	json_add_int mtu "${mtu:-1280}"
+	json_add_int ttl "${ttl:-64}"
+	json_add_string local "$ip6addr"
+	json_add_string remote "$peeraddr"
+	[ -n "$tunlink" ] && json_add_string link "$tunlink"
+	proto_close_tunnel
+
+	proto_add_data
+	[ -n "$zone" ] && json_add_string zone "$zone"
+
+	json_add_array firewall
+	  json_add_object ""
+	    json_add_string type nat
+	    json_add_string target ACCEPT
+	  json_close_object
+	json_close_array
+	proto_close_data
+
+	proto_send_update "$cfg"
+}
+
+proto_dslite_teardown() {
+	local cfg="$1"
+}
+
+proto_dslite_init_config() {
+	no_device=1             
+	available=1
+
+	proto_config_add_string "ip6addr"
+	proto_config_add_string "peeraddr"
+	proto_config_add_string "tunlink"
+	proto_config_add_int "mtu"
+	proto_config_add_int "ttl"
+	proto_config_add_string "zone"
+	proto_config_add_string "weakif"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+        add_protocol dslite
+}
diff --git a/trunk/package/network/ipv6/map/Makefile b/trunk/package/network/ipv6/map/Makefile
new file mode 100644
index 00000000..382fe0a8
--- /dev/null
+++ b/trunk/package/network/ipv6/map/Makefile
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=map
+PKG_VERSION:=2
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/map
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel +libubox +libubus +iptables-mod-conntrack-extra
+  TITLE:=MAP-E and Lightweight 4over6 configuration support
+  MAINTAINER:=Steven Barth <steven@midlink.org>
+endef
+
+define Package/map/description
+ Provides support for MAP-E (draft-ietf-softwire-map) and
+ Lightweight 4over6 (draft-ietf-softwire-lw4over6) in /etc/config/network.
+ Refer to http://wiki.openwrt.org/doc/uci/network for
+ configuration details.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/map/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/map.sh $(1)/lib/netifd/proto/map.sh
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mapcalc $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,map))
diff --git a/trunk/package/network/ipv6/map/files/map.sh b/trunk/package/network/ipv6/map/files/map.sh
new file mode 100755
index 00000000..83de4cc4
--- /dev/null
+++ b/trunk/package/network/ipv6/map/files/map.sh
@@ -0,0 +1,215 @@
+#!/bin/sh
+# map.sh - IPv4-in-IPv6 tunnel backend
+#
+# Author: Steven Barth <cyrus@openwrt.org>
+# Copyright (c) 2014 cisco Systems, Inc.
+#
+# This program is free software; you can redistribute 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 that 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.
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_map_setup() {
+	local cfg="$1"
+	local iface="$2"
+	local link="map-$cfg"
+
+	# uncomment for legacy MAP0 mode
+	#export LEGACY=1
+
+	local type mtu ttl tunlink zone
+	local rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset
+	json_get_vars type mtu ttl tunlink zone
+	json_get_vars rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset
+
+	[ -z "$zone" ] && zone="wan"
+	[ -z "$type" ] && type="map-e"
+	[ -z "$ip4prefixlen" ] && ip4prefixlen=32
+
+	( proto_add_host_dependency "$cfg" "::" "$tunlink" )
+
+	if [ -z "$rule" ]; then
+		rule="type=$type,ipv6prefix=$ip6prefix,prefix6len=$ip6prefixlen,ipv4prefix=$ipaddr,prefix4len=$ip4prefixlen"
+		[ -n "$psid" ] && rule="$rule,psid=$psid"
+		[ -n "$psidlen" ] && rule="$rule,psidlen=$psidlen"
+		[ -n "$offset" ] && rule="$rule,offset=$offset"
+		[ -n "$ealen" ] && rule="$rule,ealen=$ealen"
+		if [ "$type" = "map-t" ]; then
+			rule="$rule,dmr=$peeraddr"
+		else
+			rule="$rule,br=$peeraddr"
+		fi
+	fi
+
+	RULE_DATA=$(mapcalc ${tunlink:-\*} $rule)
+	if [ "$?" != 0 ]; then
+		proto_notify_error "$cfg" "INVALID_MAP_RULE"
+		proto_block_restart "$cfg"
+		return
+	fi
+
+	eval $RULE_DATA
+	
+	if [ -z "$RULE_BMR" ]; then
+		proto_notify_error "$cfg" "NO_MATCHING_PD"
+		proto_block_restart "$cfg"
+		return
+	fi
+
+	k=$RULE_BMR
+	if [ "$type" = "lw4o6" -o "$type" = "map-e" ]; then
+		proto_init_update "$link" 1
+		proto_add_ipv4_address $(eval "echo \$RULE_${k}_IPV4ADDR") "" "" ""
+	
+		proto_add_tunnel
+		json_add_string mode ipip6
+		json_add_int mtu "${mtu:-1280}"
+		json_add_int ttl "${ttl:-64}"
+		json_add_string local $(eval "echo \$RULE_${k}_IPV6ADDR")
+		json_add_string remote $(eval "echo \$RULE_${k}_BR")
+		json_add_string link $(eval "echo \$RULE_${k}_PD6IFACE")
+
+		if [ "$type" = "map-e" ]; then
+			json_add_array "fmrs"
+				for i in $(seq $RULE_COUNT); do
+					[ "$(eval "echo \$RULE_${i}_FMR")" != 1 ] && continue
+					fmr="$(eval "echo \$RULE_${i}_IPV6PREFIX")/$(eval "echo \$RULE_${i}_PREFIX6LEN")"
+					fmr="$fmr,$(eval "echo \$RULE_${i}_IPV4PREFIX")/$(eval "echo \$RULE_${i}_PREFIX4LEN")"
+					fmr="$fmr,$(eval "echo \$RULE_${i}_EALEN"),$(eval "echo \$RULE_${i}_OFFSET")"
+					json_add_string "" "$fmr"
+				done
+			json_close_array
+		fi
+
+		proto_close_tunnel
+	elif [ "$type" = "map-t" -a -f "/proc/net/nat46/control" ]; then
+		proto_init_update "$link" 1
+		local style="MAP"
+		[ "$LEGACY" = 1 ] && style="MAP0"
+
+		echo add $link > /proc/net/nat46/control
+		local cfgstr="local.style $style local.v4 $(eval "echo \$RULE_${k}_IPV4PREFIX")/$(eval "echo \$RULE_${k}_PREFIX4LEN")"
+		cfgstr="$cfgstr local.v6 $(eval "echo \$RULE_${k}_IPV6PREFIX")/$(eval "echo \$RULE_${k}_PREFIX6LEN")"
+		cfgstr="$cfgstr local.ea-len $(eval "echo \$RULE_${k}_EALEN") local.psid-offset $(eval "echo \$RULE_${k}_OFFSET")"
+		cfgstr="$cfgstr remote.v4 0.0.0.0/0 remote.v6 $(eval "echo \$RULE_${k}_DMR") remote.style RFC6052 remote.ea-len 0 remote.psid-offset 0"
+		echo config $link $cfgstr > /proc/net/nat46/control
+
+		for i in $(seq $RULE_COUNT); do
+			[ "$(eval "echo \$RULE_${i}_FMR")" != 1 ] && continue
+			local cfgstr="remote.style $style remote.v4 $(eval "echo \$RULE_${i}_IPV4PREFIX")/$(eval "echo \$RULE_${i}_PREFIX4LEN")"
+			cfgstr="$cfgstr remote.v6 $(eval "echo \$RULE_${i}_IPV6PREFIX")/$(eval "echo \$RULE_${i}_PREFIX6LEN")"
+			cfgstr="$cfgstr remote.ea-len $(eval "echo \$RULE_${i}_EALEN") remote.psid-offset $(eval "echo \$RULE_${i}_OFFSET")"
+			echo insert $link $cfgstr > /proc/net/nat46/control
+		done
+	else
+		proto_notify_error "$cfg" "UNSUPPORTED_TYPE"
+		proto_block_restart "$cfg"
+	fi
+
+	proto_add_ipv4_route "0.0.0.0" 0
+	proto_add_data
+	[ "$zone" != "-" ] && json_add_string zone "$zone"
+
+	json_add_array firewall
+	  if [ -z "$(eval "echo \$RULE_${k}_PORTSETS")" ]; then
+	    json_add_object ""
+	      json_add_string type nat
+	      json_add_string target SNAT
+	      json_add_string family inet
+	      json_add_string snat_ip $(eval "echo \$RULE_${k}_IPV4ADDR")
+	    json_close_object
+	  else
+	    for portset in $(eval "echo \$RULE_${k}_PORTSETS"); do
+              for proto in icmp tcp udp; do
+	        json_add_object ""
+	          json_add_string type nat
+	          json_add_string target SNAT
+	          json_add_string family inet
+	          json_add_string proto "$proto"
+                  json_add_boolean connlimit_ports 1
+                  json_add_string snat_ip $(eval "echo \$RULE_${k}_IPV4ADDR")
+                  json_add_string snat_port "$portset"
+	        json_close_object
+              done
+	    done
+	  fi
+	  if [ "$type" = "map-t" ]; then
+	  	json_add_object ""
+	  		json_add_string type rule
+	  		json_add_string family inet6
+	  		json_add_string proto all
+	  		json_add_string direction in
+			json_add_string dest "$zone"
+			json_add_string src "$zone"
+	  		json_add_string src_ip $(eval "echo \$RULE_${k}_IPV6ADDR")
+	  		json_add_string target ACCEPT
+	  	json_close_object
+	  	json_add_object ""
+	  		json_add_string type rule
+	  		json_add_string family inet6
+	  		json_add_string proto all
+	  		json_add_string direction out
+			json_add_string dest "$zone"
+			json_add_string src "$zone"
+	  		json_add_string dest_ip $(eval "echo \$RULE_${k}_IPV6ADDR")
+	  		json_add_string target ACCEPT
+	  	json_close_object
+		proto_add_ipv6_route $(eval "echo \$RULE_${k}_IPV6ADDR") 128
+	  fi
+	json_close_array
+	proto_close_data
+
+	proto_send_update "$cfg"
+
+	if [ "$type" = "lw4o6" -o "$type" = "map-e" ]; then
+		json_init
+		json_add_string name "${cfg}_local"
+		json_add_string ifname "@$(eval "echo \$RULE_${k}_PD6IFACE")"
+		json_add_string proto "static"
+		json_add_array ip6addr
+		json_add_string "" "$(eval "echo \$RULE_${k}_IPV6ADDR")"
+		json_close_array
+		json_close_object
+		ubus call network add_dynamic "$(json_dump)"
+	fi
+}
+
+proto_map_teardown() {
+	local cfg="$1"
+	ifdown "${cfg}_local"
+}
+
+proto_map_init_config() {
+	no_device=1             
+	available=1
+
+	proto_config_add_string "rule"
+	proto_config_add_string "ipaddr"
+	proto_config_add_int "ip4prefixlen"
+	proto_config_add_string "ip6prefix"
+	proto_config_add_int "ip6prefixlen"
+	proto_config_add_string "peeraddr"
+	proto_config_add_int "psidlen"
+	proto_config_add_int "psid"
+	proto_config_add_int "offset"
+
+	proto_config_add_string "tunlink"
+	proto_config_add_int "mtu"
+	proto_config_add_int "ttl"
+	proto_config_add_string "zone"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+        add_protocol map
+}
diff --git a/trunk/package/network/ipv6/map/src/CMakeLists.txt b/trunk/package/network/ipv6/map/src/CMakeLists.txt
new file mode 100644
index 00000000..2cbeb2c2
--- /dev/null
+++ b/trunk/package/network/ipv6/map/src/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 2.8.1)
+
+project(mapcalc C)
+
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=c99")
+
+add_definitions(-D_GNU_SOURCE -Wall -Wno-gnu -Wextra)
+
+add_executable(mapcalc mapcalc.c)
+target_link_libraries(mapcalc ubus ubox)
+
+install(TARGETS mapcalc DESTINATION sbin/)
+
+
+# Packaging rules
+set(CPACK_PACKAGE_VERSION "1")
+set(CPACK_PACKAGE_CONTACT "Steven Barth <steven@midlink.org>")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "hnetd")
+set(CPACK_GENERATOR "DEB;RPM;STGZ")
+set(CPACK_STRIP_FILES true)
+
+SET(CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
+set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}")
+
+include(CPack)
diff --git a/trunk/package/network/ipv6/map/src/mapcalc.c b/trunk/package/network/ipv6/map/src/mapcalc.c
new file mode 100644
index 00000000..afce6d24
--- /dev/null
+++ b/trunk/package/network/ipv6/map/src/mapcalc.c
@@ -0,0 +1,370 @@
+/*
+ * mapcalc - MAP parameter calculation
+ *
+ * Author: Steven Barth <cyrus@openwrt.org>
+ * Copyright (c) 2014 cisco Systems, Inc.
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <libubus.h>
+#include <libubox/utils.h>
+
+
+struct blob_attr *dump = NULL;
+
+enum {
+	DUMP_ATTR_INTERFACE,
+	DUMP_ATTR_MAX
+};
+
+static const struct blobmsg_policy dump_attrs[DUMP_ATTR_MAX] = {
+	[DUMP_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_ARRAY },
+};
+
+
+enum {
+	IFACE_ATTR_INTERFACE,
+	IFACE_ATTR_PREFIX,
+	IFACE_ATTR_MAX,
+};
+
+static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
+	[IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_PREFIX] = { .name = "ipv6-prefix", .type = BLOBMSG_TYPE_ARRAY },
+};
+
+
+enum {
+	PREFIX_ATTR_ADDRESS,
+	PREFIX_ATTR_MASK,
+	PREFIX_ATTR_MAX,
+};
+
+static const struct blobmsg_policy prefix_attrs[PREFIX_ATTR_MAX] = {
+	[PREFIX_ATTR_ADDRESS] = { .name = "address", .type = BLOBMSG_TYPE_STRING },
+	[PREFIX_ATTR_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_INT32 },
+};
+
+static int bmemcmp(const void *av, const void *bv, size_t bits)
+{
+	const uint8_t *a = av, *b = bv;
+	size_t bytes = bits / 8;
+	bits %= 8;
+
+	int res = memcmp(a, b, bytes);
+	if (res == 0 && bits > 0)
+		res = (a[bytes] >> (8 - bits)) - (b[bytes] >> (8 - bits));
+
+	return res;
+}
+
+static void bmemcpy(void *av, const void *bv, size_t bits)
+{
+	uint8_t *a = av;
+	const uint8_t *b = bv;
+
+	size_t bytes = bits / 8;
+	bits %= 8;
+	memcpy(a, b, bytes);
+
+	if (bits > 0) {
+		uint8_t mask = (1 << (8 - bits)) - 1;
+		a[bytes] = (a[bytes] & mask) | ((~mask) & b[bytes]);
+	}
+}
+
+static void bmemcpys64(void *av, const void *bv, size_t frombits, size_t nbits)
+{
+	uint64_t buf = 0;
+	const uint8_t *b = bv;
+	size_t frombyte = frombits / 8, tobyte = (frombits + nbits) / 8;
+
+	memcpy(&buf, &b[frombyte], tobyte - frombyte + 1);
+	buf = cpu_to_be64(be64_to_cpu(buf) << (frombits % 8));
+
+	bmemcpy(av, &buf, nbits);
+}
+
+static void handle_dump(struct ubus_request *req __attribute__((unused)),
+		int type __attribute__((unused)), struct blob_attr *msg)
+{
+	struct blob_attr *tb[DUMP_ATTR_INTERFACE];
+	blobmsg_parse(dump_attrs, DUMP_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+	if (!tb[DUMP_ATTR_INTERFACE])
+		return;
+
+	dump = blob_memdup(tb[DUMP_ATTR_INTERFACE]);
+}
+
+enum {
+	OPT_TYPE,
+	OPT_FMR,
+	OPT_EALEN,
+	OPT_PREFIX4LEN,
+	OPT_PREFIX6LEN,
+	OPT_IPV6PREFIX,
+	OPT_IPV4PREFIX,
+	OPT_OFFSET,
+	OPT_PSIDLEN,
+	OPT_PSID,
+	OPT_BR,
+	OPT_DMR,
+	OPT_MAX
+};
+
+static char *const token[] = {
+	[OPT_TYPE] = "type",
+	[OPT_FMR] = "fmr",
+	[OPT_EALEN] = "ealen",
+	[OPT_PREFIX4LEN] = "prefix4len",
+	[OPT_PREFIX6LEN] = "prefix6len",
+	[OPT_IPV6PREFIX] = "ipv6prefix",
+	[OPT_IPV4PREFIX] = "ipv4prefix",
+	[OPT_OFFSET] = "offset",
+	[OPT_PSIDLEN] = "psidlen",
+	[OPT_PSID] = "psid",
+	[OPT_BR] = "br",
+	[OPT_DMR] = "dmr",
+	[OPT_MAX] = NULL
+};
+
+
+int main(int argc, char *argv[])
+{
+	int status = 0;
+	const char *iface = argv[1];
+
+	const char *legacy_env = getenv("LEGACY");
+	bool legacy = legacy_env && atoi(legacy_env);
+
+
+	if (argc < 3) {
+		fprintf(stderr, "Usage: %s <interface|*> <rule1> [rule2] [...]\n", argv[0]);
+		return 1;
+	}
+
+	uint32_t network_interface;
+	struct ubus_context *ubus = ubus_connect(NULL);
+	if (ubus) {
+		ubus_lookup_id(ubus, "network.interface", &network_interface);
+		ubus_invoke(ubus, network_interface, "dump", NULL, handle_dump, NULL, 5000);
+	}
+
+	int rulecnt = 0;
+	for (int i = 2; i < argc; ++i) {
+		bool lw4o6 = false;
+		bool fmr = false;
+		int ealen = -1;
+		int addr4len = 32;
+		int prefix4len = 32;
+		int prefix6len = -1;
+		int pdlen = -1;
+		struct in_addr ipv4prefix = {INADDR_ANY};
+		struct in_addr ipv4addr = {INADDR_ANY};
+		struct in6_addr ipv6addr = IN6ADDR_ANY_INIT;
+		struct in6_addr ipv6prefix = IN6ADDR_ANY_INIT;
+		struct in6_addr pd = IN6ADDR_ANY_INIT;
+		int offset = -1;
+		int psidlen = -1;
+		int psid = -1;
+		uint16_t psid16 = 0;
+		const char *dmr = NULL;
+		const char *br = NULL;
+
+		for (char *rule = strdup(argv[i]); *rule; ) {
+			char *value;
+			int intval;
+			int idx = getsubopt(&rule, token, &value);
+			errno = 0;
+
+			if (idx == OPT_TYPE) {
+				lw4o6 = (value && !strcmp(value, "lw4o6"));
+			} else if (idx == OPT_FMR) {
+				fmr = true;
+			} else if (idx == OPT_EALEN && (intval = strtoul(value, NULL, 0)) <= 48 && !errno) {
+				ealen = intval;
+			} else if (idx == OPT_PREFIX4LEN && (intval = strtoul(value, NULL, 0)) <= 32 && !errno) {
+				prefix4len = intval;
+			} else if (idx == OPT_PREFIX6LEN && (intval = strtoul(value, NULL, 0)) <= 112 && !errno) {
+				prefix6len = intval;
+			} else if (idx == OPT_IPV4PREFIX && inet_pton(AF_INET, value, &ipv4prefix) == 1) {
+				// dummy
+			} else if (idx == OPT_IPV6PREFIX && inet_pton(AF_INET6, value, &ipv6prefix) == 1) {
+				// dummy
+			} else if (idx == OPT_OFFSET && (intval = strtoul(value, NULL, 0)) <= 16 && !errno) {
+				offset = intval;
+			} else if (idx == OPT_PSIDLEN && (intval = strtoul(value, NULL, 0)) <= 16 && !errno) {
+				psidlen = intval;
+			} else if (idx == OPT_PSID && (intval = strtoul(value, NULL, 0)) <= 65535 && !errno) {
+				psid = intval;
+			} else if (idx == OPT_DMR) {
+				dmr = value;
+			} else if (idx == OPT_BR) {
+				br = value;
+			} else {
+				if (idx == -1 || idx >= OPT_MAX)
+					fprintf(stderr, "Skipped invalid option: %s\n", value);
+				else
+					fprintf(stderr, "Skipped invalid value %s for option %s\n",
+							value, token[idx]);
+			}
+		}
+
+		if (offset < 0)
+			offset = (lw4o6) ? 0 : (legacy) ? 4 : 6;
+
+		// Find PD
+		struct blob_attr *c, *cur;
+		unsigned rem;
+		blobmsg_for_each_attr(c, dump, rem) {
+			struct blob_attr *tb[IFACE_ATTR_MAX];
+			blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
+
+			if (!tb[IFACE_ATTR_INTERFACE] || (strcmp(argv[1], "*") && strcmp(argv[1],
+					blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]))))
+				continue;
+
+			if ((cur = tb[IFACE_ATTR_PREFIX])) {
+				if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
+					continue;
+
+				struct blob_attr *d;
+				unsigned drem;
+				blobmsg_for_each_attr(d, cur, drem) {
+					struct blob_attr *ptb[PREFIX_ATTR_MAX];
+					blobmsg_parse(prefix_attrs, PREFIX_ATTR_MAX, ptb,
+							blobmsg_data(d), blobmsg_data_len(d));
+
+					if (!ptb[PREFIX_ATTR_ADDRESS] || !ptb[PREFIX_ATTR_MASK])
+						continue;
+
+					struct in6_addr prefix = IN6ADDR_ANY_INIT;
+					int mask = blobmsg_get_u32(ptb[PREFIX_ATTR_MASK]);
+					inet_pton(AF_INET6, blobmsg_get_string(ptb[PREFIX_ATTR_ADDRESS]), &prefix);
+
+					if (mask >= prefix6len && !bmemcmp(&prefix, &ipv6prefix, prefix6len)) {
+						pd = prefix;
+						pdlen = mask;
+						iface = blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]);
+						break;
+					}
+				}
+
+				if (pdlen >= 0)
+					break;
+			}
+		}
+
+		if (ealen < 0 && pdlen >= 0)
+			ealen = pdlen - prefix6len;
+
+		if (psidlen < 0)
+			psidlen = ealen - (32 - prefix4len);
+
+		if (psid < 0 && psidlen <= 16 && psidlen >= 0 && pdlen >= 0 && ealen >= psidlen) {
+			bmemcpys64(&psid16, &pd, prefix6len + ealen - psidlen, psidlen);
+			psid = be16_to_cpu(psid16);
+		}
+
+		psid16 = cpu_to_be16(psid >> (16 - psidlen));
+
+		if ((pdlen >= 0 || ealen == psidlen) && ealen >= psidlen) {
+			bmemcpys64(&ipv4addr, &pd, prefix6len, ealen - psidlen);
+			ipv4addr.s_addr = htonl(ntohl(ipv4addr.s_addr) >> prefix4len);
+			bmemcpy(&ipv4addr, &ipv4prefix, prefix4len);
+
+			if (prefix4len + ealen < 32)
+				addr4len = prefix4len + ealen;
+		}
+
+		if (prefix4len < 0 || prefix6len < 0 || ealen < 0 || ealen < psidlen) {
+			fprintf(stderr, "Skipping invalid or incomplete rule: %s\n", argv[i]);
+			status = 1;
+			continue;
+		}
+
+		if (pdlen < 0 && !fmr) {
+			fprintf(stderr, "Skipping non-FMR without matching PD: %s\n", argv[i]);
+			status = 1;
+			continue;
+		} else if (pdlen >= 0) {
+			size_t v4offset = (legacy) ? 9 : 10;
+			memcpy(&ipv6addr.s6_addr[v4offset], &ipv4addr, 4);
+			memcpy(&ipv6addr.s6_addr[v4offset + 4], &psid16, 2);
+			bmemcpy(&ipv6addr, &pd, pdlen);
+		}
+
+		++rulecnt;
+		char ipv4addrbuf[INET_ADDRSTRLEN];
+		char ipv4prefixbuf[INET_ADDRSTRLEN];
+		char ipv6prefixbuf[INET6_ADDRSTRLEN];
+		char ipv6addrbuf[INET6_ADDRSTRLEN];
+		char pdbuf[INET6_ADDRSTRLEN];
+
+		inet_ntop(AF_INET, &ipv4addr, ipv4addrbuf, sizeof(ipv4addrbuf));
+		inet_ntop(AF_INET, &ipv4prefix, ipv4prefixbuf, sizeof(ipv4prefixbuf));
+		inet_ntop(AF_INET6, &ipv6prefix, ipv6prefixbuf, sizeof(ipv6prefixbuf));
+		inet_ntop(AF_INET6, &ipv6addr, ipv6addrbuf, sizeof(ipv6addrbuf));
+		inet_ntop(AF_INET6, &pd, pdbuf, sizeof(pdbuf));
+
+		printf("RULE_%d_FMR=%d\n", rulecnt, fmr);
+		printf("RULE_%d_EALEN=%d\n", rulecnt, ealen);
+		printf("RULE_%d_PSIDLEN=%d\n", rulecnt, psidlen);
+		printf("RULE_%d_OFFSET=%d\n", rulecnt, offset);
+		printf("RULE_%d_PREFIX4LEN=%d\n", rulecnt, prefix4len);
+		printf("RULE_%d_PREFIX6LEN=%d\n", rulecnt, prefix6len);
+		printf("RULE_%d_IPV4PREFIX=%s\n", rulecnt, ipv4prefixbuf);
+		printf("RULE_%d_IPV6PREFIX=%s\n", rulecnt, ipv6prefixbuf);
+
+		if (pdlen >= 0) {
+			printf("RULE_%d_IPV6PD=%s\n", rulecnt, pdbuf);
+			printf("RULE_%d_PD6LEN=%d\n", rulecnt, pdlen);
+			printf("RULE_%d_PD6IFACE=%s\n", rulecnt, iface);
+			printf("RULE_%d_IPV6ADDR=%s\n", rulecnt, ipv6addrbuf);
+			printf("RULE_BMR=%d\n", rulecnt);
+		}
+
+		if (ipv4addr.s_addr) {
+			printf("RULE_%d_IPV4ADDR=%s\n", rulecnt, ipv4addrbuf);
+			printf("RULE_%d_ADDR4LEN=%d\n", rulecnt, addr4len);
+		}
+
+
+		if (psidlen > 0 && psid >= 0) {
+			printf("RULE_%d_PORTSETS='", rulecnt);
+			for (int k = (offset) ? 1 : 0; k < (1 << offset); ++k) {
+				int start = (k << (16 - offset)) | (psid >> offset);
+				int end = start + (1 << (16 - offset - psidlen)) - 1;
+
+				if (start == 0)
+					start = 1;
+
+				if (start <= end)
+					printf("%d-%d ", start, end);
+			}
+			printf("'\n");
+		}
+
+		if (dmr)
+			printf("RULE_%d_DMR=%s\n", rulecnt, dmr);
+
+		if (br)
+			printf("RULE_%d_BR=%s\n", rulecnt, br);
+	}
+
+	printf("RULE_COUNT=%d\n", rulecnt);
+	return status;
+}
diff --git a/trunk/package/network/ipv6/odhcp6c/Makefile b/trunk/package/network/ipv6/odhcp6c/Makefile
new file mode 100644
index 00000000..adcd36c4
--- /dev/null
+++ b/trunk/package/network/ipv6/odhcp6c/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=odhcp6c
+PKG_VERSION:=2014-11-28
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/sbyx/odhcp6c.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=518cdfc1dbf5c61859f6faaf678e0bbed82755a6
+PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_prefix_class),0)
+  CMAKE_OPTIONS += -DEXT_PREFIX_CLASS=$(CONFIG_PACKAGE_odhcp6c_ext_prefix_class)
+endif
+
+ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_cer_id),0)
+  CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcp6c_ext_cer_id)
+endif
+
+define Package/odhcp6c
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Embedded DHCPv6-client for libreCMC
+  DEPENDS:=+kmod-ipv6
+endef
+
+define Package/odhcp6c/config
+  config PACKAGE_odhcp6c_ext_prefix_class
+    int "Prefix Class Extension ID (0 = disabled)"
+    depends on PACKAGE_odhcp6c
+    default 0
+
+  config PACKAGE_odhcp6c_ext_cer_id
+    int "CER-ID Extension ID (0 = disabled)"
+    depends on PACKAGE_odhcp6c
+    default 0
+endef
+
+define Package/odhcp6c/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/odhcp6c $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/dhcpv6.sh $(1)/lib/netifd/proto/dhcpv6.sh
+	$(INSTALL_BIN) ./files/dhcpv6.script $(1)/lib/netifd/
+endef
+
+$(eval $(call BuildPackage,odhcp6c))
diff --git a/trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script b/trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script
new file mode 100755
index 00000000..1acad199
--- /dev/null
+++ b/trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -0,0 +1,172 @@
+#!/bin/sh
+[ -z "$2" ] && echo "Error: should be run by odhcpc6c" && exit 1
+. /lib/functions.sh
+. /lib/netifd/netifd-proto.sh
+
+setup_interface () {
+	local device="$1"
+	proto_init_update "*" 1
+
+	# Merge RA-DNS
+	for radns in $RA_DNS; do
+		local duplicate=0
+		for dns in $RDNSS; do
+			[ "$radns" = "$dns" ] && duplicate=1
+		done
+		[ "$duplicate" = 0 ] && RDNSS="$RDNSS $radns"
+	done
+
+	for dns in $RDNSS; do
+		proto_add_dns_server "$dns"
+	done
+
+	for domain in $DOMAINS; do
+		proto_add_dns_search "$domain"
+	done
+
+	for prefix in $PREFIXES; do
+		proto_add_ipv6_prefix "$prefix"
+                local entry="${prefix#*/}"
+                entry="${entry#*,}"
+                entry="${entry#*,}"
+                local valid="${entry%%,*}"
+
+		if [ -z "$RA_ADDRESSES" -a -z "$RA_ROUTES" -a \
+				-z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then
+			RA_ROUTES="::/0,$SERVER,$valid,4096"
+		fi
+	done
+
+	[ -n "$USERPREFIX" ] && proto_add_ipv6_prefix "$USERPREFIX"
+
+	# Merge addresses
+	for entry in $RA_ADDRESSES; do
+		local duplicate=0
+		local addr="${entry%%/*}"
+		for dentry in $ADDRESSES; do
+			local daddr="${dentry%%/*}"
+			[ "$addr" = "$daddr" ] && duplicate=1
+		done
+		[ "$duplicate" = "0" ] && ADDRESSES="$ADDRESSES $entry"
+	done
+
+	for entry in $ADDRESSES; do
+		local addr="${entry%%/*}"
+		entry="${entry#*/}"
+		local mask="${entry%%,*}"
+		entry="${entry#*,}"
+		local preferred="${entry%%,*}"
+		entry="${entry#*,}"
+		local valid="${entry%%,*}"
+
+		proto_add_ipv6_address "$addr" "$mask" "$preferred" "$valid" 1
+
+                if [ -z "$RA_ADDRESSES" -a -z "$RA_ROUTES" -a \
+                                -z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then
+                        RA_ROUTES="::/0,$SERVER,$valid,4096"
+                fi
+	done
+
+	for entry in $RA_ROUTES; do
+		local addr="${entry%%/*}"
+		entry="${entry#*/}"
+		local mask="${entry%%,*}"
+		entry="${entry#*,}"
+		local gw="${entry%%,*}"
+		entry="${entry#*,}"
+		local valid="${entry%%,*}"
+		entry="${entry#*,}"
+		local metric="${entry%%,*}"
+
+		if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then
+			proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid"
+		else
+			proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
+			for prefix in $PREFIXES $ADDRESSES; do
+				local paddr="${prefix%%,*}"
+				proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr"
+			done
+		fi
+	done
+
+	proto_add_data
+	[ -n "$CER" ] && json_add_string cer "$CER"
+	[ -n "$PASSTHRU" ] && json_add_string passthru "$PASSTHRU"
+	[ -n "$ZONE" ] && json_add_string zone "$ZONE"
+	proto_close_data
+
+	proto_send_update "$INTERFACE"
+
+	MAPTYPE=""
+	MAPRULE=""
+
+	if [ -n "$MAPE" -a -f /lib/netifd/proto/map.sh ]; then
+		MAPTYPE="map-e"
+		MAPRULE="$MAPE"
+	elif [ -n "$MAPT" -a -f /lib/netifd/proto/map.sh -a -f /proc/net/nat46/control ]; then
+		MAPTYPE="map-t"
+		MAPRULE="$MAPT"
+	elif [ -n "$LW4O6" -a -f /lib/netifd/proto/map.sh ]; then
+		MAPTYPE="lw4o6"
+		MAPRULE="$LW4O6"
+	fi
+
+	[ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE)
+
+	if [ "$IFACE_MAP" != 0 -a -n "$MAPTYPE" -a -n "$MAPRULE" ]; then
+		[ -z "$IFACE_MAP" -o "$IFACE_MAP" = 1 ] && IFACE_MAP=${INTERFACE}_map
+		json_init
+		json_add_string name "$IFACE_MAP"
+		json_add_string ifname "@$INTERFACE"
+		json_add_string proto map
+		json_add_string type "$MAPTYPE"
+		json_add_string rule "$MAPRULE"
+		json_add_string tunlink "$INTERFACE"
+		[ -n "$ZONE_MAP" ] || ZONE_MAP=$ZONE
+		[ -n "$ZONE_MAP" ] && json_add_string zone "$ZONE_MAP"
+		[ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE"
+		json_close_object
+		ubus call network add_dynamic "$(json_dump)"
+	elif [ -n "$AFTR_IP" -a "$IFACE_DSLITE" != 0 -a -f /lib/netifd/proto/dslite.sh ]; then
+		[ -z "$IFACE_DSLITE" -o "$IFACE_DSLITE" = 1 ] && IFACE_DSLITE=${INTERFACE}_dslite
+		json_init
+		json_add_string name "$IFACE_DSLITE"
+		json_add_string ifname "@$INTERFACE"
+		json_add_string proto "dslite"
+		json_add_string peeraddr "$AFTR_IP"
+		json_add_string tunlink "$INTERFACE"
+		[ -n "$ZONE_DSLITE" ] || ZONE_DSLITE=$ZONE
+		[ -n "$ZONE_DSLITE" ] && json_add_string zone "$ZONE_DSLITE"
+		[ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE"
+		json_close_object
+		ubus call network add_dynamic "$(json_dump)"
+	fi
+
+	# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN
+}
+
+teardown_interface() {
+	proto_init_update "*" 0
+	proto_send_update "$INTERFACE"
+}
+
+case "$2" in
+	bound)
+		teardown_interface "$1"
+		setup_interface "$1"
+	;;
+	informed|updated|rebound)
+		setup_interface "$1"
+	;;
+	ra-updated)
+		[ -n "$ADDRESSES$RA_ADDRESSES$PREFIXES$USERPREFIX" ] && setup_interface "$1"
+	;;
+	started|stopped|unbound)
+		teardown_interface "$1"
+	;;
+esac
+
+# user rules
+[ -f /etc/odhcp6c.user ] && . /etc/odhcp6c.user
+
+exit 0
diff --git a/trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh
new file mode 100755
index 00000000..5914abe0
--- /dev/null
+++ b/trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
+
+proto_dhcpv6_init_config() {
+	renew_handler=1
+
+	proto_config_add_string 'reqaddress:or("try","force","none")'
+	proto_config_add_string 'reqprefix:or("auto","no",range(0, 64))'
+	proto_config_add_string clientid
+	proto_config_add_string 'reqopts:list(uinteger)'
+	proto_config_add_string 'noslaaconly:bool'
+	proto_config_add_string 'forceprefix:bool'
+	proto_config_add_string 'norelease:bool'
+	proto_config_add_string 'ip6prefix:ip6addr'
+	proto_config_add_string iface_dslite
+	proto_config_add_string zone_dslite
+	proto_config_add_string iface_map
+	proto_config_add_string zone_map
+	proto_config_add_string zone
+	proto_config_add_string 'ifaceid:ip6addr'
+	proto_config_add_string 'sourcerouting:bool'
+	proto_config_add_string "userclass"
+	proto_config_add_string "vendorclass"
+	proto_config_add_boolean delegate
+	proto_config_add_int "soltimeout"
+	proto_config_add_boolean fakeroutes
+}
+
+proto_dhcpv6_setup() {
+	local config="$1"
+	local iface="$2"
+
+	local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout fakeroutes
+	json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout fakeroutes
+
+
+	# Configure
+	local opts=""
+	[ -n "$reqaddress" ] && append opts "-N$reqaddress"
+
+	[ -z "$reqprefix" -o "$reqprefix" = "auto" ] && reqprefix=0
+	[ "$reqprefix" != "no" ] && append opts "-P$reqprefix"
+
+	[ -n "$clientid" ] && append opts "-c$clientid"
+
+	[ "$noslaaconly" = "1" ] && append opts "-S"
+
+	[ "$forceprefix" = "1" ] && append opts "-F"
+
+	[ "$norelease" = "1" ] && append opts "-k"
+
+	[ -n "$ifaceid" ] && append opts "-i$ifaceid"
+
+	[ -n "$vendorclass" ] && append opts "-V$vendorclass"
+
+	[ -n "$userclass" ] && append opts "-u$userclass"
+
+	for opt in $reqopts; do
+		append opts "-r$opt"
+	done
+
+	append opts "-t${soltimeout:-120}"
+
+	[ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
+	[ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
+	[ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map"
+	[ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
+	[ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
+	[ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
+	[ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"
+	[ -n "$zone_map" ] && proto_export "ZONE_MAP=$zone_map"
+	[ -n "$zone" ] && proto_export "ZONE=$zone"
+	[ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
+
+	proto_export "INTERFACE=$config"
+	proto_run_command "$config" odhcp6c \
+		-s /lib/netifd/dhcpv6.script \
+		$opts $iface
+}
+
+proto_dhcpv6_renew() {
+	local interface="$1"
+	# SIGUSR1 forces odhcp6c to renew its lease
+	local sigusr1="$(kill -l SIGUSR1)"
+	[ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1
+}
+
+proto_dhcpv6_teardown() {
+	local interface="$1"
+	proto_kill_command "$interface"
+}
+
+add_protocol dhcpv6
+
diff --git a/trunk/package/network/ipv6/thc-ipv6/Makefile b/trunk/package/network/ipv6/thc-ipv6/Makefile
new file mode 100644
index 00000000..4c75f186
--- /dev/null
+++ b/trunk/package/network/ipv6/thc-ipv6/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=thc-ipv6
+PKG_VERSION:=2.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-3.0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://freeworld.thc.org/releases/
+PKG_MD5SUM:=5c9be9ad38ac15c368bb5140d031c051
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+THC_APPLETS := \
+	address6 alive6 covert_send6 covert_send6d denial6 detect-new-ip6     \
+	detect_sniffer6 dnsdict6 dnsrevenum6 dos-new-ip6                      \
+	dump_router6 exploit6 fake_advertise6 fake_dhcps6 fake_dns6d          \
+	fake_dnsupdate6 fake_mipv6 fake_mld26 fake_mld6 fake_mldrouter6       \
+	fake_router26 fake_router6 fake_solicitate6 flood_advertise6          \
+	flood_dhcpc6 flood_mld26 flood_mld6 flood_mldrouter6 flood_router26   \
+	flood_router6 flood_solicitate6 fragmentation6 fuzz_ip6               \
+	implementation6 implementation6d inverse_lookup6 kill_router6         \
+	ndpexhaust6 node_query6 parasite6 passive_discovery6 randicmp6        \
+	redir6 rsmurf6 sendpees6 sendpeesmp6 smurf6 thcping6 toobig6 trace6
+
+THC_DEPENDS_dnsdict6 := +libpthread
+THC_DEPENDS_thcping6 := +librt
+
+define BuildTool
+  define Package/thc-ipv6-$(subst _,-,$(1))
+    TITLE:=THC-IPv6 $(1) utility
+    SECTION:=net
+    CATEGORY:=Network
+    DEPENDS:=+libpcap $(THC_DEPENDS_$(1))
+    URL:=http://freeworld.thc.org/
+    SUBMENU:=THC-IPv6 attack and analyzing toolkit
+  endef
+
+  define Package/thc-ipv6-$(subst _,-,$(1))/description
+    This package contains the $(1) utility of the THC-IPv6 toolkit.
+  endef
+
+  define Package/thc-ipv6-$(subst _,-,$(1))/install
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(1) $$(1)/usr/sbin/$(1)
+  endef
+
+  $$(eval $$(call BuildPackage,thc-ipv6-$(subst _,-,$(1))))
+endef
+
+$(foreach a,$(THC_APPLETS),$(eval $(call BuildTool,$(a))))
diff --git a/trunk/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch b/trunk/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch
new file mode 100644
index 00000000..5f87bcd3
--- /dev/null
+++ b/trunk/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ CC=gcc
+ #CFLAGS?=-Wall -ggdb
+ CFLAGS?=-O2
+-LDFLAGS+=-lpcap -lssl -lcrypto
++LDFLAGS+=-lpcap
+ PROGRAMS=parasite6 dos-new-ip6 detect-new-ip6 fake_router6 fake_advertise6 fake_solicitate6 fake_mld6 fake_mld26 fake_mldrouter6 flood_mldrouter6 fake_mipv6 redir6 smurf6 alive6 toobig6 rsmurf6 implementation6 implementation6d sendpees6 sendpeesmp6 randicmp6 fuzz_ip6 flood_mld6 flood_mld26 flood_router6 flood_router26 flood_advertise6 flood_solicitate6 trace6 exploit6 denial6 fake_dhcps6 flood_dhcpc6 fake_dns6d fragmentation6 kill_router6 fake_dnsupdate6 ndpexhaust6 detect_sniffer6 dump_router6 fake_router26 passive_discovery6 dnsrevenum6 inverse_lookup6 node_query6 address6 thcping6 covert_send6 covert_send6d
+ LIBS=thc-ipv6-lib.o
+ 
diff --git a/trunk/package/network/services/authsae/Makefile b/trunk/package/network/services/authsae/Makefile
new file mode 100644
index 00000000..29550214
--- /dev/null
+++ b/trunk/package/network/services/authsae/Makefile
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2007-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=authsae
+PKG_VERSION:=2014-06-09
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://github.com/cozybit/authsae.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=8531ab158910a525d4bcbb3ad02c08342f6987f2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_BUILD_PARALLEL:=1
+CMAKE_INSTALL:=1
+
+CMAKE_OPTIONS += -DSYSCONF_INSTALL_DIR=/etc
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=BSD-4-Clause
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/authsae
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=80211s mesh security
+  DEPENDS:=+libopenssl +libconfig +libnl-tiny +@OPENSSL_WITH_EC
+endef
+
+TARGET_CFLAGS += -D_GNU_SOURCE
+
+define Package/authsae/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/lib/wifi
+	$(INSTALL_DATA) ./files/lib/wifi/authsae.sh $(1)/lib/wifi/
+endef
+
+$(eval $(call BuildPackage,authsae))
diff --git a/trunk/package/network/services/authsae/files/lib/wifi/authsae.sh b/trunk/package/network/services/authsae/files/lib/wifi/authsae.sh
new file mode 100644
index 00000000..d8c5598e
--- /dev/null
+++ b/trunk/package/network/services/authsae/files/lib/wifi/authsae.sh
@@ -0,0 +1,57 @@
+authsae_start_interface() {
+	local mcast_rate
+	local mesh_htmode
+	local mesh_band
+	local authsae_conf_file="/var/run/authsae-$ifname.cfg"
+	local ret=1
+
+	json_get_vars mcast_rate
+	set_default mcast_rate "12"
+
+	case "$htmode" in
+		HT20|HT40+|HT40-) mesh_htmode="$htmode";;
+		*) mesh_htmode="none";;
+	esac
+
+	case "$hwmode" in
+		*g*) mesh_band=11g;;
+		*a*) mesh_band=11a;;
+	esac
+
+	cat > "$authsae_conf_file" <<EOF
+authsae:
+{
+ sae:
+  {
+    debug = 0;
+    password = "$key";
+    group = [19, 26, 21, 25, 20];
+    blacklist = 5;
+    thresh = 5;
+    lifetime = 3600;
+  };
+ meshd:
+  {
+    meshid = "$mesh_id";
+    interface = "$ifname";
+    passive = 0;
+    debug = 0;
+    mediaopt = 1;
+    band = "$mesh_band";
+    channel = $channel;
+    htmode = "$mesh_htmode";
+    mcast-rate = $mcast_rate;
+  };
+};
+EOF
+
+	/usr/bin/meshd-nl80211 -i "$ifname" -s "$mesh_id" -c "$authsae_conf_file" </dev/null >/dev/null 2>/dev/null &
+	authsae_pid="$!"
+	ret="$?"
+
+	echo $authsae_pid > /var/run/authsae-$ifname.pid
+	wireless_add_process "$authsae_pid" "/usr/bin/meshd-nl80211" 1
+
+	[ "$ret" != 0 ] && wireless_setup_vif_failed AUTHSAE_FAILED
+	return $ret
+}
diff --git a/trunk/package/network/services/authsae/patches/100-musl_fix.patch b/trunk/package/network/services/authsae/patches/100-musl_fix.patch
new file mode 100644
index 00000000..4aae4296
--- /dev/null
+++ b/trunk/package/network/services/authsae/patches/100-musl_fix.patch
@@ -0,0 +1,10 @@
+--- a/linux/mon.c
++++ b/linux/mon.c
+@@ -44,7 +44,6 @@
+ #include <signal.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+-#include <sys/sysctl.h>
+ #include <sys/queue.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
diff --git a/trunk/package/network/services/cjdns/Makefile b/trunk/package/network/services/cjdns/Makefile
new file mode 100644
index 00000000..4feacae8
--- /dev/null
+++ b/trunk/package/network/services/cjdns/Makefile
@@ -0,0 +1,104 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cjdns
+PKG_VERSION:=0.12
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=f176d2c0271d764412bd13c7adf7ea475fa25e0f
+PKG_LICENSE:=GPL-3.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/cjdns
+	SECTION:=net
+	CATEGORY:=Network
+	SUBMENU:=Routing and Redirection
+	TITLE:=Encrypted near-zero-conf mesh routing protocol
+	URL:=https://github.com/cjdelisle/cjdns
+	MAINTAINER:=Lars Gierth <larsg@systemli.org>
+	DEPENDS:=+kmod-tun +kmod-ipv6 \
+		+libnl-tiny +libpthread +librt +SSP_SUPPORT:libssp \
+		+lua-bencode +dkjson +luasocket +lua-sha2
+endef
+
+define Package/cjdns/description
+	Cjdns implements an encrypted IPv6 network using public-key cryptography \
+	for address allocation and a distributed hash table for routing. \
+	This provides near-zero-configuration networking, and prevents many \
+	of the security and scalability issues that plague existing networks.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	CROSS="true" \
+	CC="$(TARGET_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	SYSTEM="linux" \
+	TARGET_ARCH="$(CONFIG_ARCH)" \
+	UCLIBC=1 \
+	SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
+	Seccomp_NO=1 \
+	$(PKG_BUILD_DIR)/do
+endef
+
+define Package/cjdns/install
+	$(INSTALL_DIR) \
+		$(1)/usr/sbin \
+		$(1)/usr/bin \
+		$(1)/etc/config \
+		$(1)/etc/init.d \
+		$(1)/etc/uci-defaults \
+		$(1)/usr/lib/lua/cjdns
+
+	$(INSTALL_BIN) \
+		./files/cjdrouteconf \
+		$(1)/usr/bin
+
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/cjdroute \
+		$(1)/usr/sbin
+
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/publictoip6 \
+		$(1)/usr/bin
+
+	# TODO: enable once cjdns cross-compiles the testsuite
+	# $(INSTALL_BIN) \
+	# 	$(PKG_BUILD_DIR)/testcjdroute \
+	# 	$(1)/usr/bin
+
+	$(INSTALL_BIN) \
+		./files/cjdns.init \
+		$(1)/etc/init.d/cjdns
+
+	$(INSTALL_BIN) \
+		./files/cjdns.defaults \
+		$(1)/etc/uci-defaults/cjdns
+
+	$(CP) \
+		$(PKG_BUILD_DIR)/contrib/lua/cjdns/* \
+		$(1)/usr/lib/lua/cjdns
+
+	$(CP) \
+		./lua/cjdns/* \
+		$(1)/usr/lib/lua/cjdns
+endef
+
+define Package/cjdns/postinst
+#!/bin/sh
+if [ -z $${IPKG_INSTROOT} ] ; then
+	( . /etc/uci-defaults/cjdns ) && rm -f /etc/uci-defaults/cjdns
+	# TODO: we should have an 'Enable' button instead
+	/etc/init.d/cjdns enabled || /etc/init.d/cjdns enable
+	exit 0
+fi
+endef
+
+$(eval $(call BuildPackage,cjdns))
diff --git a/trunk/package/network/services/cjdns/files/cjdns.defaults b/trunk/package/network/services/cjdns/files/cjdns.defaults
new file mode 100644
index 00000000..c35c7664
--- /dev/null
+++ b/trunk/package/network/services/cjdns/files/cjdns.defaults
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# if there is an existing config, our work is already done
+uci get cjdns.cjdns.ipv6 >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+
+  # register commit handler
+  uci -q batch <<-EOF >/dev/null
+    delete ucitrack.@cjdns[-1]
+    add ucitrack cjdns
+    set ucitrack.@cjdns[-1].init=cjdns
+    commit ucitrack
+EOF
+
+  # generate configuration
+  touch /etc/config/cjdns
+  cjdroute --genconf | cjdroute --cleanconf | cjdrouteconf set
+
+  # enable auto-peering on ethernet
+  section=$(uci add cjdns eth_interface)
+  uci set cjdns.$section.beacon=2
+  uci show network.lan | grep type=bridge >/dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    # most routers will set up an ethernet bridge for the lan
+    uci set cjdns.$section.bind=br-lan
+  else
+    # docker containers don't have permission to create bridges by default,
+    # so we bind to the underlying interface instead (likely eth0)
+    ifname=$(uci get network.lan.ifname)
+    uci set cjdns.$section.bind=$ifname
+  fi
+
+  uci commit cjdns
+
+fi
+
+exit 0
diff --git a/trunk/package/network/services/cjdns/files/cjdns.init b/trunk/package/network/services/cjdns/files/cjdns.init
new file mode 100755
index 00000000..c68ae69a
--- /dev/null
+++ b/trunk/package/network/services/cjdns/files/cjdns.init
@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+START=90
+STOP=85
+
+USE_PROCD=1
+
+start_service()
+{
+	[ -f /etc/uci-defaults/cjdns ] && ( . /etc/uci-defaults/cjdns )
+
+	procd_open_instance
+	procd_set_param respawn
+	procd_set_param command /bin/ash -c "cjdrouteconf get | tee /tmp/etc/cjdroute.conf | cjdroute"
+	procd_close_instance
+}
+
+stop_service()
+{
+	killall cjdroute
+}
+
+reload_service()
+{
+	# cat /tmp/etc/cjdroute.conf | cjdrouteconf reload
+	restart
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger cjdns
+}
diff --git a/trunk/package/network/services/cjdns/files/cjdrouteconf b/trunk/package/network/services/cjdns/files/cjdrouteconf
new file mode 100755
index 00000000..ea53831e
--- /dev/null
+++ b/trunk/package/network/services/cjdns/files/cjdrouteconf
@@ -0,0 +1,49 @@
+#!/usr/bin/env lua
+
+dkjson = require("dkjson")
+cjdns = require("cjdns")
+require("cjdns/uci")
+require("cjdns/reload")
+
+function help()
+  print("JSON interface to /etc/config/cjdns\n\nExamples: \
+    cjdrouteconf get > /tmp/etc/cjdroute.conf \
+    cat /tmp/etc/cjdroute.conf | cjdrouteconf set \
+    uci changes \
+    cjdrouteconf get | cjdroute")
+end
+
+if arg[1] == "get" then
+  local json = dkjson.encode(cjdns.uci.get(), { indent = true })
+  print(json)
+elseif arg[1] == "set" then
+  local json = io.stdin:read("*a")
+  local obj, pos, err = dkjson.decode(json, 1, nil)
+
+  if obj then
+    cjdns.uci.set(obj)
+  else
+    print("dkjson: " .. err .. " (try cjdroute --cleanconf)")
+    os.exit(1)
+  end
+elseif arg[1] == "reload" then
+  local oldjson = io.stdin:read("*a")
+  local oldconfig, pos, err = dkjson.decode(oldjson, 1, nil)
+
+  if err then
+    io.stderr:write("dkjson: " .. err .. "\n")
+    os.exit(1)
+  end
+
+  local admin = cjdns.uci.makeInterface()
+
+  local res, err = cjdns.reload(admin, admin.config, oldconfig)
+  print(dkjson.encode(res, { indent = true }))
+
+  if err then
+    io.stderr:write("reload: " .. err .. "\n")
+    os.exit(1)
+  end
+else
+  help()
+end
diff --git a/trunk/package/network/services/cjdns/lua/cjdns/reload.lua b/trunk/package/network/services/cjdns/lua/cjdns/reload.lua
new file mode 100644
index 00000000..883fcc46
--- /dev/null
+++ b/trunk/package/network/services/cjdns/lua/cjdns/reload.lua
@@ -0,0 +1,80 @@
+common = require("cjdns/common")
+
+-- we can reload for
+--   password added/removed
+--   iptunnel_outgoing added/removed
+--   iptunnel_allowed added/removed
+-- we could reload (find out how to get interfaceNumber)
+--   udp_peer added/removed
+--   eth_peer added/removed
+--   eth_interface beacon changed
+--   udp_interface added
+--   eth_interface added
+-- we can't reload for
+--   udp_interface removed
+--   eth_interface removed
+--   tun_device changed
+--   inactivity_seconds changed
+function common.reload(admin, config, oldconfig)
+    local response = { added = {}, removed = {} }
+
+    local expected = config.authorizedPasswords
+
+    local res, err = admin:auth({ q = "AuthorizedPasswords_list" })
+    if err then return response, err end
+    local actual = res.users
+
+    -- for i, v in ipairs(expected) do
+    --     for j, p in pairs(v) do print("expected", i, j, p) end
+    -- end
+    -- for i, v in ipairs(actual) do print("actual", i, v) end
+
+    -- make sure expected passwords are present
+    for _, password in ipairs(expected) do
+        local found = nil
+        for _, user in ipairs(actual) do
+            if user == password.user then
+                found = 1
+                break
+            end
+        end
+
+        if not found then
+            local res, err = admin:auth({
+                q = "AuthorizedPasswords_add",
+                password = password.password,
+                user = password.user
+            })
+            if err then return response, err end
+            table.insert(response.added, password.user)
+        end
+    end
+
+    -- make sure outdated passwords are not present
+    -- TODO: password.password changes are not detected
+    for _, user in ipairs(actual) do
+        local found = nil
+        if user == "Local Peers" then
+            found = 1
+        else
+            for _, password in ipairs(expected) do
+                if user == password.user then
+                    found = 1
+                    break
+                end
+            end
+        end
+
+        if not found then
+            local res, err = admin:auth({
+                q = "AuthorizedPasswords_remove",
+                user = user
+            })
+            if err then return response, err end
+            -- TODO: InterfaceController_disconnectPeer(publicKey)
+            table.insert(response.removed, user)
+        end
+    end
+
+    return response, nil
+end
diff --git a/trunk/package/network/services/cjdns/lua/cjdns/uci.lua b/trunk/package/network/services/cjdns/lua/cjdns/uci.lua
new file mode 100644
index 00000000..d3bca7c7
--- /dev/null
+++ b/trunk/package/network/services/cjdns/lua/cjdns/uci.lua
@@ -0,0 +1,266 @@
+common = require("cjdns/common")
+uci    = require("uci")
+
+UCI = {}
+common.uci = UCI
+
+--- Return the configuration defaults as a table suitable for JSON output
+--
+-- Mostly taken from cjdroute --genconf, except for noBackground, which is
+-- supposed to simplify the init.d script.
+-- @return table with configuration defaults
+function UCI.defaults()
+  return {
+    noBackground = 1,
+    security = { { exemptAngel = 1, setuser = "nobody" } },
+    router = {
+        ipTunnel = { outgoingConnections = {}, allowedConnections = {} },
+        interface = { type = "TUNInterface" }
+    },
+    interfaces = { UDPInterface = {}, ETHInterface = {} },
+    authorizedPasswords = {}
+  }
+end
+
+--- Return the cjdns configuration as a table suitable for JSON output
+--
+-- Iterates over cjdns, eth_interface, udp_interface, eth_peer, udp_peer,
+-- and password sections. Doesn't include IPTunnel related options yet.
+-- @return table with cjdns configuration
+function UCI.get()
+  local obj = UCI.defaults()
+
+  local cursor = uci.cursor()
+
+  local config = cursor:get_all("cjdns", "cjdns")
+  if not config then return obj end
+
+  obj.ipv6 = config.ipv6
+  obj.publicKey = config.public_key
+  obj.privateKey = config.private_key
+  obj.admin = {
+    bind = config.admin_address .. ":" .. config.admin_port,
+    password = config.admin_password }
+
+  obj.resetAfterInactivitySeconds = config.inactivity_seconds
+
+  if config.tun_device and string.len(config.tun_device) > 0 then
+    obj.router.interface.tunDevice = config.tun_device
+  end
+
+  cursor:foreach("cjdns", "iptunnel_outgoing", function(outgoing)
+    table.insert(obj.router.ipTunnel.outgoingConnections, outgoing.public_key)
+  end)
+
+  cursor:foreach("cjdns", "iptunnel_allowed", function(allowed)
+    entry = { publicKey = allowed.public_key }
+    if allowed.ipv4 then
+      entry["ip4Address"] = allowed.ipv4
+    end
+    if allowed.ipv6 then
+      entry["ip6Address"] = allowed.ipv6
+    end
+    table.insert(obj.router.ipTunnel.allowedConnections, entry)
+  end)
+
+  cursor:foreach("cjdns", "eth_interface", function(eth_interface)
+    table.insert(obj.interfaces.ETHInterface, {
+      bind = eth_interface.bind,
+      beacon = tonumber(eth_interface.beacon),
+      connectTo = {}
+    })
+  end)
+
+  cursor:foreach("cjdns", "udp_interface", function(udp_interface)
+    table.insert(obj.interfaces.UDPInterface, {
+      bind = udp_interface.address .. ":" .. udp_interface.port,
+      connectTo = {}
+    })
+  end)
+
+  cursor:foreach("cjdns", "eth_peer", function(eth_peer)
+    if not eth_peer.address == "" then
+      local i = tonumber(eth_peer.interface)
+      obj.interfaces.ETHInterface[i].connectTo[eth_peer.address] = {
+        publicKey = eth_peer.public_key,
+        password = eth_peer.password
+      }
+    end
+  end)
+
+  cursor:foreach("cjdns", "udp_peer", function(udp_peer)
+    local bind = udp_peer.address .. ":" .. udp_peer.port
+    local i = tonumber(udp_peer.interface)
+    obj.interfaces.UDPInterface[i].connectTo[bind] = {
+      publicKey = udp_peer.public_key,
+      password = udp_peer.password
+    }
+  end)
+
+  cursor:foreach("cjdns", "password", function(password)
+    table.insert(obj.authorizedPasswords, {
+      password = password.password,
+      user = password.user,
+      contact = password.contact
+    })
+  end)
+
+  return obj
+end
+
+--- Parse and save updated configuration from JSON input
+--
+-- Transforms general settings, ETHInterface, UDPInterface, connectTo, and
+-- authorizedPasswords fields into UCI sections, and replaces the UCI config's
+-- contents with them.
+-- @param table JSON input
+-- @return Boolean whether saving succeeded
+function UCI.set(obj)
+  local cursor = uci.cursor()
+
+  for i, section in pairs(cursor:get_all("cjdns")) do
+    cursor:delete("cjdns", section[".name"])
+  end
+
+  local admin_address, admin_port = string.match(obj.admin.bind, "^(.*):(.*)$")
+  UCI.cursor_section(cursor, "cjdns", "cjdns", "cjdns", {
+    ipv6 = obj.ipv6,
+    public_key = obj.publicKey,
+    private_key = obj.privateKey,
+    admin_password = obj.admin.password,
+    admin_address = admin_address,
+    admin_port = admin_port,
+    inactivity_seconds = obj.resetAfterInactivitySeconds,
+  })
+
+  if obj.router.interface.tunDevice then
+    UCI.cursor_section(cursor, "cjdns", "cjdns", "cjdns", {
+      tun_device = tostring(obj.router.interface.tunDevice)
+    })
+  end
+
+  if obj.router.ipTunnel.outgoingConnections then
+    for i,public_key in pairs(obj.router.ipTunnel.outgoingConnections) do
+      UCI.cursor_section(cursor, "cjdns", "iptunnel_outgoing", nil, {
+        public_key = public_key
+      })
+    end
+  end
+
+  if obj.router.ipTunnel.allowedConnections then
+    for i,allowed in pairs(obj.router.ipTunnel.allowedConnections) do
+      entry = { public_key = allowed.publicKey }
+      if allowed.ip4Address then
+        entry["ipv4"] = allowed.ip4Address
+      end
+      if allowed.ip6Address then
+        entry["ipv6"] = allowed.ip6Address
+      end
+
+      UCI.cursor_section(cursor, "cjdns", "iptunnel_allowed", nil, entry)
+    end
+  end
+
+  if obj.interfaces.ETHInterface then
+    for i,interface in pairs(obj.interfaces.ETHInterface) do
+      UCI.cursor_section(cursor, "cjdns", "eth_interface", nil, {
+        bind = interface.bind,
+        beacon = tostring(interface.beacon)
+      })
+
+      if interface.connectTo then
+        for peer_address,peer in pairs(interface.connectTo) do
+          UCI.cursor_section(cursor, "cjdns", "eth_peer", nil, {
+            interface = i,
+            address = peer_address,
+            public_key = peer.publicKey,
+            password = peer.password
+          })
+        end
+      end
+    end
+  end
+
+  if obj.interfaces.UDPInterface then
+    for i,interface in pairs(obj.interfaces.UDPInterface) do
+      local address, port = string.match(interface.bind, "^(.*):(.*)$")
+      UCI.cursor_section(cursor, "cjdns", "udp_interface", nil, {
+        address = address,
+        port = port
+      })
+
+      if interface.connectTo then
+        for peer_bind,peer in pairs(interface.connectTo) do
+          local peer_address, peer_port = string.match(peer_bind, "^(.*):(.*)$")
+          UCI.cursor_section(cursor, "cjdns", "udp_peer", nil, {
+            interface = i,
+            address = peer_address,
+            port = peer_port,
+            public_key = peer.publicKey,
+            password = peer.password
+          })
+        end
+      end
+    end
+  end
+
+  if obj.authorizedPasswords then
+    for i,password in pairs(obj.authorizedPasswords) do
+      local user = password.user
+      if not user or string.len(user) == 0 then
+        user = "user-" .. UCI.random_string(6)
+      end
+
+      UCI.cursor_section(cursor, "cjdns", "password", nil, {
+        password = password.password,
+        user = user,
+        contact = password.contact
+      })
+    end
+  end
+
+  return cursor:save("cjdns")
+end
+
+--- Simple backport of Cursor:section from luci.model.uci
+--
+-- Backport reason: we don't wanna depend on LuCI.
+-- @param Cursor the UCI cursor to operate on
+-- @param string name of the config
+-- @param string type of the section
+-- @param string name of the section (optional)
+-- @param table config values
+function UCI.cursor_section(cursor, config, type, section, values)
+  if section then
+    cursor:set(config, section, type)
+  else
+    section = cursor:add("cjdns", type)
+  end
+
+  for k,v in pairs(values) do
+    cursor:set(config, section, k, v)
+  end
+end
+
+function UCI.makeInterface()
+  local cursor = uci.cursor()
+
+  local config = cursor:get_all("cjdns", "cjdns")
+  if not config then return nil end
+
+  return common.AdminInterface.new({
+    host = config.admin_address,
+    port = config.admin_port,
+    password = config.admin_password,
+    config = UCI.get(),
+    timeout = 2
+  })
+end
+
+function UCI.random_string(length)
+  -- tr -cd 'A-Za-z0-9' < /dev/urandom
+  local urandom = io.popen("tr -cd 'A-Za-z0-9' 2> /dev/null < /dev/urandom", "r")
+  local string = urandom:read(length)
+  urandom:close()
+  return string
+end
diff --git a/trunk/package/network/services/cjdns/patches/001-libuv.patch b/trunk/package/network/services/cjdns/patches/001-libuv.patch
new file mode 100644
index 00000000..752df54c
--- /dev/null
+++ b/trunk/package/network/services/cjdns/patches/001-libuv.patch
@@ -0,0 +1,18 @@
+From: Lars Gierth <larsg@systemli.org>
+Date: Sun, 10 Aug 2014 20:44:23 +0200
+
+    Disable GYP parallelism
+
+    Fixes mysterious build errors on a 2.6.32 VM.
+
+index 0f870d1..929cf6d 100644
+--- a/node_build/make.js
++++ b/node_build/make.js
+@@ -279,7 +279,7 @@ Builder.configure({
+             var cwd = process.cwd();
+             process.chdir(dependencyDir + '/libuv/');
+
+-            var args = ['./gyp_uv.py'];
++            var args = ['./gyp_uv.py', '--no-parallel'];
+             var env = process.env;
+             env.CC = builder.config.gcc;
diff --git a/trunk/package/network/services/dnsmasq/Makefile b/trunk/package/network/services/dnsmasq/Makefile
new file mode 100644
index 00000000..a5302255
--- /dev/null
+++ b/trunk/package/network/services/dnsmasq/Makefile
@@ -0,0 +1,123 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dnsmasq
+PKG_VERSION:=2.72
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+PKG_MD5SUM:=cf82f81cf09ad3d47612985012240483
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dnsmasq/Default
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=DNS and DHCP server
+  URL:=http://www.thekelleys.org.uk/dnsmasq/
+endef
+
+define Package/dnsmasq
+$(call Package/dnsmasq/Default)
+  VARIANT:=nodhcpv6
+endef
+
+define Package/dnsmasq-dhcpv6
+$(call Package/dnsmasq/Default)
+  TITLE += (with DHCPv6 support)
+  DEPENDS:=@IPV6 +kmod-ipv6
+  VARIANT:=dhcpv6
+endef
+
+define Package/dnsmasq-full
+$(call Package/dnsmasq/Default)
+  TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPSET)
+  DEPENDS:=@IPV6 +kmod-ipv6 +libnettle
+  VARIANT:=full
+endef
+
+define Package/dnsmasq/description
+  It is intended to provide coupled DNS and DHCP service to a LAN.
+endef
+
+define Package/dnsmasq-dhcpv6/description
+$(call Package/dnsmasq/description)
+
+This is a variant with DHCPv6 support
+endef
+
+define Package/dnsmasq-full/description
+$(call Package/dnsmasq/description)
+
+This is a variant with DHCPv6, DNSSEC, Authroitative DNS and IPSET support
+endef
+
+define Package/dnsmasq/conffiles
+/etc/config/dhcp
+/etc/dnsmasq.conf
+endef
+
+Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
+Package/dnsmasq-full/conffiles = $(Package/dnsmasq/conffiles)
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+COPTS = $(if $(CONFIG_IPV6),,-DNO_IPV6)
+
+ifeq ($(BUILD_VARIANT),nodhcpv6)
+	COPTS += -DNO_DHCP6
+endif
+
+ifeq ($(BUILD_VARIANT),full)
+	COPTS += -DHAVE_DNSSEC
+	COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,)
+else
+	COPTS += -DNO_AUTH -DNO_IPSET
+endif
+
+MAKE_FLAGS := \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	COPTS="$(COPTS)" \
+	PREFIX="/usr"
+
+define Package/dnsmasq/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp
+	$(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files/dnsmasq.hotplug $(1)/etc/hotplug.d/iface/25-dnsmasq
+endef
+
+Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)
+
+define Package/dnsmasq-full/install
+$(call Package/dnsmasq/install,$(1))
+	$(INSTALL_DIR) $(1)/usr/share/dnsmasq
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/trust-anchors.conf $(1)/usr/share/dnsmasq
+endef
+
+$(eval $(call BuildPackage,dnsmasq))
+$(eval $(call BuildPackage,dnsmasq-dhcpv6))
+$(eval $(call BuildPackage,dnsmasq-full))
diff --git a/trunk/package/network/services/dnsmasq/files/dhcp.conf b/trunk/package/network/services/dnsmasq/files/dhcp.conf
new file mode 100644
index 00000000..660b06ad
--- /dev/null
+++ b/trunk/package/network/services/dnsmasq/files/dhcp.conf
@@ -0,0 +1,31 @@
+config dnsmasq
+	option domainneeded	1
+	option boguspriv	1
+	option filterwin2k	0  # enable for dial on demand
+	option localise_queries	1
+	option rebind_protection 1  # disable if upstream must serve RFC1918 addresses
+	option rebind_localhost 1  # enable for RBL checking and similar services
+	#list rebind_domain example.lan  # whitelist RFC1918 responses for domains
+	option local	'/lan/'
+	option domain	'lan'
+	option expandhosts	1
+	option nonegcache	0
+	option authoritative	1
+	option readethers	1
+	option leasefile	'/tmp/dhcp.leases'
+	option resolvfile	'/tmp/resolv.conf.auto'
+	#list server		'/mycompany.local/1.2.3.4'
+	#option nonwildcard	1
+	#list interface		br-lan
+	#list notinterface	lo
+	#list bogusnxdomain     '64.94.110.11'
+
+config dhcp lan
+	option interface	lan
+	option start 	100
+	option limit	150
+	option leasetime	12h
+
+config dhcp wan
+	option interface	wan
+	option ignore	1
diff --git a/trunk/package/network/services/dnsmasq/files/dnsmasq.conf b/trunk/package/network/services/dnsmasq/files/dnsmasq.conf
new file mode 100644
index 00000000..bf5816be
--- /dev/null
+++ b/trunk/package/network/services/dnsmasq/files/dnsmasq.conf
@@ -0,0 +1,37 @@
+# Change the following lines if you want dnsmasq to serve SRV
+# records.
+# You may add multiple srv-host lines.
+# The fields are <name>,<target>,<port>,<priority>,<weight>
+
+# A SRV record sending LDAP for the example.com domain to
+# ldapserver.example.com port 289
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389
+
+# Two SRV records for LDAP, each with different priorities
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2
+
+# A SRV record indicating that there is no LDAP server for the domain
+# example.com
+#srv-host=_ldap._tcp.example.com
+
+# The following line shows how to make dnsmasq serve an arbitrary PTR
+# record. This is useful for DNS-SD.
+# The fields are <name>,<target>
+#ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services"
+
+# Change the following lines to enable dnsmasq to serve TXT records.
+# These are used for things like SPF and zeroconf.
+# The fields are <name>,<text>,<text>...
+
+#Example SPF.
+#txt-record=example.com,"v=spf1 a -all"
+
+#Example zeroconf
+#txt-record=_http._tcp.example.com,name=value,paper=A4
+
+# Provide an alias for a "local" DNS name. Note that this _only_ works
+# for targets which are names from DHCP or /etc/hosts. Give host
+# "bert" another name, bertrand
+# The fields are <cname>,<target>
+#cname=bertand,bert
diff --git a/trunk/package/network/services/dnsmasq/files/dnsmasq.hotplug b/trunk/package/network/services/dnsmasq/files/dnsmasq.hotplug
new file mode 100644
index 00000000..ca5d10c2
--- /dev/null
+++ b/trunk/package/network/services/dnsmasq/files/dnsmasq.hotplug
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ "$ACTION" = ifup ] || exit 0
+
+/etc/init.d/dnsmasq enabled && /etc/init.d/dnsmasq start
diff --git a/trunk/package/network/services/dnsmasq/files/dnsmasq.init b/trunk/package/network/services/dnsmasq/files/dnsmasq.init
new file mode 100644
index 00000000..9be352a0
--- /dev/null
+++ b/trunk/package/network/services/dnsmasq/files/dnsmasq.init
@@ -0,0 +1,612 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2007-2012 OpenWrt.org
+
+START=60
+
+USE_PROCD=1
+PROG=/usr/sbin/dnsmasq
+
+DNS_SERVERS=""
+DOMAIN=""
+
+ADD_LOCAL_DOMAIN=1
+ADD_LOCAL_HOSTNAME=1
+
+CONFIGFILE="/var/etc/dnsmasq.conf"
+HOSTFILE="/tmp/hosts/dhcp"
+TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
+
+xappend() {
+	local value="$1"
+
+	echo "${value#--}" >> $CONFIGFILE
+}
+
+dhcp_calc() {
+	local ip="$1"
+	local res=0
+
+	while [ -n "$ip" ]; do
+		part="${ip%%.*}"
+		res="$(($res * 256))"
+		res="$(($res + $part))"
+		[ "${ip%.*}" != "$ip" ] && ip="${ip#*.}" || ip=
+	done
+	echo "$res"
+}
+
+dhcp_check() {
+	local ifname="$1"
+	local stamp="/var/run/dnsmasq.$ifname.dhcp"
+	local rv=0
+
+	[ -s "$stamp" ] && return $(cat "$stamp")
+
+	udhcpc -n -q -s /bin/true -t 1 -i "$ifname" >&- && rv=1 || rv=0
+
+	[ $rv -eq 1 ] && \
+		logger -t dnsmasq \
+			"found already running DHCP-server on interface '$ifname'" \
+			"refusing to start, use 'option force 1' to override"
+
+	echo $rv > "$stamp"
+	return $rv
+}
+
+log_once() {
+	pidof dnsmasq >/dev/null || \
+		logger -t dnsmasq "$@"
+}
+
+append_bool() {
+	local section="$1"
+	local option="$2"
+	local value="$3"
+	local _loctmp
+	config_get_bool _loctmp "$section" "$option" 0
+	[ $_loctmp -gt 0 ] && xappend "$value"
+}
+
+append_parm() {
+	local section="$1"
+	local option="$2"
+	local switch="$3"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	[ -z "$_loctmp" ] && return 0
+	xappend "$switch=$_loctmp"
+}
+
+append_server() {
+	xappend "--server=$1"
+}
+
+append_address() {
+	xappend "--address=$1"
+}
+
+append_interface() {
+	local ifname=$(uci_get_state network "$1" ifname "$1")
+	xappend "--interface=$ifname"
+}
+
+append_notinterface() {
+	local ifname=$(uci_get_state network "$1" ifname "$1")
+	xappend "--except-interface=$ifname"
+}
+
+append_addnhosts() {
+	xappend "--addn-hosts=$1"
+}
+
+append_bogusnxdomain() {
+	xappend "--bogus-nxdomain=$1"
+}
+
+dnsmasq() {
+	local cfg="$1"
+	append_bool "$cfg" authoritative "--dhcp-authoritative"
+	append_bool "$cfg" nodaemon "--no-daemon"
+	append_bool "$cfg" domainneeded "--domain-needed"
+	append_bool "$cfg" filterwin2k "--filterwin2k"
+	append_bool "$cfg" nohosts "--no-hosts"
+	append_bool "$cfg" nonegcache "--no-negcache"
+	append_bool "$cfg" strictorder "--strict-order"
+	append_bool "$cfg" logqueries "--log-queries"
+	append_bool "$cfg" noresolv "--no-resolv"
+	append_bool "$cfg" localise_queries "--localise-queries"
+	append_bool "$cfg" readethers "--read-ethers"
+	append_bool "$cfg" dbus "--enable-dbus"
+	append_bool "$cfg" boguspriv "--bogus-priv"
+	append_bool "$cfg" expandhosts "--expand-hosts"
+	append_bool "$cfg" enable_tftp "--enable-tftp"
+	append_bool "$cfg" nonwildcard "--bind-interfaces"
+	append_bool "$cfg" fqdn "--dhcp-fqdn"
+	append_bool "$cfg" proxydnssec "--proxy-dnssec"
+
+	append_parm "$cfg" dhcpscript "--dhcp-script"
+	append_parm "$cfg" cachesize "--cache-size"
+	append_parm "$cfg" dnsforwardmax "--dns-forward-max"
+	append_parm "$cfg" port "--port"
+	append_parm "$cfg" ednspacket_max "--edns-packet-max"
+	append_parm "$cfg" dhcpleasemax "--dhcp-lease-max"
+	append_parm "$cfg" "queryport" "--query-port"
+	append_parm "$cfg" "domain" "--domain"
+	append_parm "$cfg" "local" "--server"
+	config_list_foreach "$cfg" "server" append_server
+	config_list_foreach "$cfg" "address" append_address
+	config_list_foreach "$cfg" "interface" append_interface
+	config_list_foreach "$cfg" "notinterface" append_notinterface
+	config_list_foreach "$cfg" "addnhosts" append_addnhosts
+	config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
+	append_parm "$cfg" "leasefile" "--dhcp-leasefile"
+	append_parm "$cfg" "resolvfile" "--resolv-file"
+	append_parm "$cfg" "tftp_root" "--tftp-root"
+	append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
+	append_parm "$cfg" "local_ttl" "--local-ttl"
+
+	config_get DOMAIN "$cfg" domain
+
+	config_get_bool ADD_LOCAL_DOMAIN "$cfg" add_local_domain 1
+	config_get_bool ADD_LOCAL_HOSTNAME "$cfg" add_local_hostname 1
+
+	config_get_bool readethers "$cfg" readethers
+	[ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
+
+	config_get leasefile $cfg leasefile
+	[ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
+	config_get_bool cachelocal "$cfg" cachelocal 1
+
+	config_get hostsfile "$cfg" dhcphostsfile
+	[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
+
+	mkdir -p /tmp/hosts /tmp/dnsmasq.d
+	xappend "--addn-hosts=/tmp/hosts"
+	xappend "--conf-dir=/tmp/dnsmasq.d"
+
+	local rebind
+	config_get_bool rebind "$cfg" rebind_protection 1
+	[ $rebind -gt 0 ] && {
+		log_once \
+			"DNS rebinding protection is active," \
+			"will discard upstream RFC1918 responses!"
+		xappend "--stop-dns-rebind"
+
+		local rebind_localhost
+		config_get_bool rebind_localhost "$cfg" rebind_localhost 0
+		[ $rebind_localhost -gt 0 ] && {
+			log_once "Allowing 127.0.0.0/8 responses"
+			xappend "--rebind-localhost-ok"
+		}
+
+		append_rebind_domain() {
+			log_once "Allowing RFC1918 responses for domain $1"
+			xappend "--rebind-domain-ok=$1"
+		}
+
+		config_list_foreach "$cfg" rebind_domain append_rebind_domain
+	}
+
+	config_get_bool dnssec "$cfg" dnssec 0
+	[ "$dnssec" -gt 0 ] && {
+		xappend "--conf-file=$TRUSTANCHORSFILE"
+		xappend "--dnssec"
+		append_bool "$cfg" dnsseccheckunsigned "--dnssec-check-unsigned"
+	}
+
+	dhcp_option_add "$cfg" "" 0
+
+	xappend "--dhcp-broadcast=tag:needs-broadcast"
+
+	echo >> $CONFIGFILE
+}
+
+dhcp_subscrid_add() {
+	local cfg="$1"
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] || return 0
+
+	config_get subscriberid "$cfg" subscriberid
+	[ -n "$subscriberid" ] || return 0
+
+	xappend "--dhcp-subscrid=$networkid,$subscriberid"
+
+	config_get_bool force "$cfg" force 0
+
+	dhcp_option_add "$cfg" "$networkid" "$force"
+}
+
+dhcp_remoteid_add() {
+	local cfg="$1"
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] || return 0
+
+	config_get remoteid "$cfg" remoteid
+	[ -n "$remoteid" ] || return 0
+
+	xappend "--dhcp-remoteid=$networkid,$remoteid"
+
+	config_get_bool force "$cfg" force 0
+
+	dhcp_option_add "$cfg" "$networkid" "$force"
+}
+
+dhcp_circuitid_add() {
+	local cfg="$1"
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] || return 0
+
+	config_get circuitid "$cfg" circuitid
+	[ -n "$circuitid" ] || return 0
+
+	xappend "--dhcp-circuitid=$networkid,$circuitid"
+
+	config_get_bool force "$cfg" force 0
+
+	dhcp_option_add "$cfg" "$networkid" "$force"
+}
+
+dhcp_userclass_add() {
+	local cfg="$1"
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] || return 0
+
+	config_get userclass "$cfg" userclass
+	[ -n "$userclass" ] || return 0
+
+	xappend "--dhcp-userclass=$networkid,$userclass"
+
+	config_get_bool force "$cfg" force 0
+
+	dhcp_option_add "$cfg" "$networkid" "$force"
+}
+
+dhcp_vendorclass_add() {
+	local cfg="$1"
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] || return 0
+
+	config_get vendorclass "$cfg" vendorclass
+	[ -n "$vendorclass" ] || return 0
+
+	xappend "--dhcp-vendorclass=$networkid,$vendorclass"
+
+	config_get_bool force "$cfg" force 0
+
+	dhcp_option_add "$cfg" "$networkid" "$force"
+}
+
+dhcp_host_add() {
+	local cfg="$1"
+
+	config_get_bool force "$cfg" force 0
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid" "$force"
+
+	config_get name "$cfg" name
+	config_get ip "$cfg" ip
+	[ -n "$ip" -o -n "$name" ] || return 0
+
+	config_get_bool dns "$cfg" dns 0
+	[ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && {
+		echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE
+	}
+
+	config_get mac "$cfg" mac
+	if [ -n "$mac" ]; then
+		# --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
+		macs=""
+		for m in $mac; do append macs "$m" ","; done
+	else
+		# --dhcp-host=lap,192.168.0.199
+		[ -n "$name" ] || return 0
+		macs="$name"
+		name=""
+	fi
+
+	config_get tag "$cfg" tag
+
+	config_get_bool broadcast "$cfg" broadcast 0
+	[ "$broadcast" = "0" ] && broadcast=
+
+	xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${broadcast:+,set:needs-broadcast}${tag:+,set:$tag}${ip:+,$ip}${name:+,$name}"
+}
+
+dhcp_tag_add() {
+	local cfg="$1"
+
+	tag="$cfg"
+
+	[ -n "$tag" ] || return 0
+
+	config_get_bool force "$cfg" force 0
+	[ "$force" = "0" ] && force=
+
+	config_get option "$cfg" dhcp_option
+	for o in $option; do
+		xappend "--dhcp-option${force:+-force}=tag:$tag,$o"
+	done
+}
+
+dhcp_mac_add() {
+	local cfg="$1"
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] || return 0
+
+	config_get mac "$cfg" mac
+	[ -n "$mac" ] || return 0
+
+	xappend "--dhcp-mac=$networkid,$mac"
+
+	dhcp_option_add "$cfg" "$networkid"
+}
+
+dhcp_boot_add() {
+	local cfg="$1"
+
+	config_get networkid "$cfg" networkid
+
+	config_get filename "$cfg" filename
+	[ -n "$filename" ] || return 0
+
+	config_get servername "$cfg" servername
+	[ -n "$servername" ] || return 0
+
+	config_get serveraddress "$cfg" serveraddress
+	[ -n "$serveraddress" ] || return 0
+
+	xappend "--dhcp-boot=${networkid:+net:$networkid,}$filename,$servername,$serveraddress"
+
+	config_get_bool force "$cfg" force 0
+
+	dhcp_option_add "$cfg" "$networkid" "$force"
+}
+
+
+dhcp_add() {
+	local cfg="$1"
+	config_get net "$cfg" interface
+	[ -n "$net" ] || return 0
+
+	config_get dhcpv4 "$cfg" dhcpv4
+	[ "$dhcpv4" != "disabled" ] || return 0
+
+	config_get networkid "$cfg" networkid
+	[ -n "$networkid" ] || networkid="$net"
+
+	network_get_subnet subnet "$net" || return 0
+	network_get_device ifname "$net" || return 0
+	network_get_protocol proto "$net" || return 0
+
+	[ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && {
+		DNS_SERVERS="$DNS_SERVERS $dnsserver"
+	}
+
+	append_bool "$cfg" ignore "--no-dhcp-interface=$ifname" && return 0
+
+	# Do not support non-static interfaces for now
+	[ static = "$proto" ] || return 0
+
+	# Override interface netmask with dhcp config if applicable
+	config_get netmask "$cfg" netmask "${subnet##*/}"
+
+	#check for an already active dhcp server on the interface, unless 'force' is set
+	config_get_bool force "$cfg" force 0
+	[ $force -gt 0 ] || dhcp_check "$ifname" || return 0
+
+	config_get start "$cfg" start
+	config_get limit "$cfg" limit
+	config_get leasetime "$cfg" leasetime
+	config_get options "$cfg" options
+	config_get_bool dynamicdhcp "$cfg" dynamicdhcp 1
+
+	leasetime="${leasetime:-12h}"
+	start="$(dhcp_calc "${start:-100}")"
+	limit="${limit:-150}"
+	[ "$limit" -gt 0 ] && limit=$((limit-1))
+	eval "$(ipcalc.sh "${subnet%%/*}" $netmask $start $limit)"
+	if [ "$dynamicdhcp" = "0" ]; then END="static"; fi
+	xappend "--dhcp-range=$networkid,$START,$END,$NETMASK,$leasetime${options:+ $options}"
+
+	dhcp_option_add "$cfg" "$networkid"
+}
+
+dhcp_option_add() {
+	local cfg="$1"
+	local networkid="$2"
+	local force="$3"
+
+	[ "$force" = "0" ] && force=
+
+	config_get dhcp_option "$cfg" dhcp_option
+	for o in $dhcp_option; do
+		xappend "--dhcp-option${force:+-force}=${networkid:+$networkid,}$o"
+	done
+
+}
+
+dhcp_domain_add() {
+	local cfg="$1"
+	local ip name names record
+
+	config_get names "$cfg" name "$2"
+	[ -n "$names" ] || return 0
+
+	config_get ip "$cfg" ip "$3"
+	[ -n "$ip" ] || return 0
+
+	for name in $names; do
+		record="${record:+$record }$name"
+	done
+
+	echo "$ip $record" >> $HOSTFILE
+}
+
+dhcp_srv_add() {
+	local cfg="$1"
+
+	config_get srv "$cfg" srv
+	[ -n "$srv" ] || return 0
+
+	config_get target "$cfg" target
+	[ -n "$target" ] || return 0
+
+	config_get port "$cfg" port
+	[ -n "$port" ] || return 0
+
+	config_get class "$cfg" class
+	config_get weight "$cfg" weight
+
+	local service="$srv,$target,$port${class:+,$class${weight:+,$weight}}"
+
+	xappend "--srv-host=$service"
+}
+
+dhcp_mx_add() {
+	local cfg="$1"
+	local domain relay pref
+
+	config_get domain "$cfg" domain
+	[ -n "$domain" ] || return 0
+
+	config_get relay "$cfg" relay
+	[ -n "$relay" ] || return 0
+
+	config_get pref "$cfg" pref 0
+
+	local service="$domain,$relay,$pref"
+
+	xappend "--mx-host=$service"
+}
+
+dhcp_cname_add() {
+	local cfg="$1"
+	local cname target
+
+	config_get cname "$cfg" cname
+	[ -n "$cname" ] || return 0
+
+	config_get target "$cfg" target
+	[ -n "$target" ] || return 0
+
+	xappend "--cname=${cname},${target}"
+}
+
+dhcp_hostrecord_add() {
+	local cfg="$1"
+	local names addresses record val
+
+	config_get names "$cfg" name "$2"
+	if [ -z "$names" ]; then
+		return 0
+	fi
+
+	config_get addresses "$cfg" ip "$3"
+	if [ -z "$addresses" ]; then
+		return 0
+	fi
+
+	for val in $names $addresses; do
+		record="${record:+$record,}$val"
+	done
+
+	xappend "--host-record=$record"
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "dhcp"
+}
+
+boot() {
+	# Will be launched through hotplug
+	return 0
+}
+
+start_service() {
+	include /lib/functions
+
+	config_load dhcp
+
+	procd_open_instance
+	procd_set_param command $PROG -C $CONFIGFILE -k
+	procd_set_param file $CONFIGFILE
+	procd_set_param respawn
+	procd_close_instance
+
+	# before we can call xappend
+	mkdir -p $(dirname $CONFIGFILE)
+
+	echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE
+	echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE
+
+	# if we did this last, we could override auto-generated config
+	[ -f /etc/dnsmasq.conf ] && {
+		xappend "--conf-file=/etc/dnsmasq.conf"
+	}
+
+	args=""
+	config_foreach dnsmasq dnsmasq
+	config_foreach dhcp_host_add host
+	echo >> $CONFIGFILE
+	config_foreach dhcp_boot_add boot
+	config_foreach dhcp_mac_add mac
+	config_foreach dhcp_tag_add tag
+	config_foreach dhcp_vendorclass_add vendorclass
+	config_foreach dhcp_userclass_add userclass
+	config_foreach dhcp_circuitid_add circuitid
+	config_foreach dhcp_remoteid_add remoteid
+	config_foreach dhcp_subscrid_add subscrid
+	config_foreach dhcp_domain_add domain
+	config_foreach dhcp_hostrecord_add hostrecord
+
+	# add own hostname
+	local lanaddr
+	[ $ADD_LOCAL_HOSTNAME -eq 1 ] && network_get_ipaddr lanaddr "lan" && {
+		local hostname="$(uci_get system @system[0] hostname libreCMC)"
+		dhcp_domain_add "" "$hostname" "$lanaddr"
+	}
+
+	echo >> $CONFIGFILE
+	config_foreach dhcp_srv_add srvhost
+	config_foreach dhcp_mx_add mxhost
+	echo >> $CONFIGFILE
+
+	config_get odhcpd_is_active odhcpd maindhcp
+	if [ "$odhcpd_is_active" != "1" ]; then
+		config_foreach dhcp_add dhcp
+	fi
+
+	echo >> $CONFIGFILE
+	config_foreach dhcp_cname_add cname
+	echo >> $CONFIGFILE
+
+	rm -f /tmp/resolv.conf
+	[ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
+		echo "search $DOMAIN" >> /tmp/resolv.conf
+	}
+	DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
+	for DNS_SERVER in $DNS_SERVERS ; do
+		echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
+	done
+}
+
+reload_service() {
+	rc_procd start_service "$@"
+	return 0
+}
+
+stop_service() {
+	[ -f /tmp/resolv.conf ] && {
+		rm -f /tmp/resolv.conf
+		ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+	}
+	rm -f /var/run/dnsmasq.*.dhcp
+}
diff --git a/trunk/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/trunk/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
new file mode 100644
index 00000000..a502a60a
--- /dev/null
+++ b/trunk/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
@@ -0,0 +1,47 @@
+--- a/src/dhcp.c
++++ b/src/dhcp.c
+@@ -146,7 +146,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+   struct iovec iov;
+   ssize_t sz; 
+   int iface_index = 0, unicast_dest = 0, is_inform = 0;
+-  struct in_addr iface_addr;
++  struct in_addr iface_addr, *addrp = NULL;
+   struct iface_param parm;
+ #ifdef HAVE_LINUX_NETWORK
+   struct arpreq arp_req;
+@@ -272,11 +272,9 @@ void dhcp_packet(time_t now, int pxe_fd)
+     {
+       ifr.ifr_addr.sa_family = AF_INET;
+       if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
+-	iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
+-      else
+ 	{
+-	  my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
+-	  return;
++	  addrp = &iface_addr;
++	  iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
+ 	}
+       
+       for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
+@@ -295,7 +293,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+       parm.relay_local.s_addr = 0;
+       parm.ind = iface_index;
+       
+-      if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name, NULL))
++      if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name, NULL))
+ 	{
+ 	  /* If we failed to match the primary address of the interface, see if we've got a --listen-address
+ 	     for a secondary */
+@@ -315,6 +313,12 @@ void dhcp_packet(time_t now, int pxe_fd)
+ 	  complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm);
+ 	}    
+       
++      if (!addrp)
++        {
++          my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
++          return;
++        }
++
+       if (!iface_enumerate(AF_INET, &parm, complete_context))
+ 	return;
+ 
diff --git a/trunk/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch b/trunk/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch
new file mode 100644
index 00000000..61b09d5b
--- /dev/null
+++ b/trunk/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch
@@ -0,0 +1,110 @@
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -22,7 +22,6 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <sys/utsname.h>
+ #include <arpa/inet.h>
+ #include <linux/version.h>
+ #include <linux/netlink.h>
+@@ -72,7 +71,7 @@ struct my_nfgenmsg {
+ 
+ #define NL_ALIGN(len) (((len)+3) & ~(3))
+ static const struct sockaddr_nl snl = { .nl_family = AF_NETLINK };
+-static int ipset_sock, old_kernel;
++static int ipset_sock;
+ static char *buffer;
+ 
+ static inline void add_attr(struct nlmsghdr *nlh, uint16_t type, size_t len, const void *data)
+@@ -87,25 +86,7 @@ static inline void add_attr(struct nlmsg
+ 
+ void ipset_init(void)
+ {
+-  struct utsname utsname;
+-  int version;
+-  char *split;
+-  
+-  if (uname(&utsname) < 0)
+-    die(_("failed to find kernel version: %s"), NULL, EC_MISC);
+-  
+-  split = strtok(utsname.release, ".");
+-  version = (split ? atoi(split) : 0);
+-  split = strtok(NULL, ".");
+-  version = version * 256 + (split ? atoi(split) : 0);
+-  split = strtok(NULL, ".");
+-  version = version * 256 + (split ? atoi(split) : 0);
+-  old_kernel = (version < KERNEL_VERSION(2,6,32));
+-  
+-  if (old_kernel && (ipset_sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) != -1)
+-    return;
+-  
+-  if (!old_kernel && 
++  if ( 
+       (buffer = safe_malloc(BUFF_SZ)) &&
+       (ipset_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER)) != -1 &&
+       (bind(ipset_sock, (struct sockaddr *)&snl, sizeof(snl)) != -1))
+@@ -168,62 +149,16 @@ static int new_add_to_ipset(const char *
+ }
+ 
+ 
+-static int old_add_to_ipset(const char *setname, const struct all_addr *ipaddr, int remove)
+-{
+-  socklen_t size;
+-  struct ip_set_req_adt_get {
+-    unsigned op;
+-    unsigned version;
+-    union {
+-      char name[IPSET_MAXNAMELEN];
+-      uint16_t index;
+-    } set;
+-    char typename[IPSET_MAXNAMELEN];
+-  } req_adt_get;
+-  struct ip_set_req_adt {
+-    unsigned op;
+-    uint16_t index;
+-    uint32_t ip;
+-  } req_adt;
+-  
+-  if (strlen(setname) >= sizeof(req_adt_get.set.name)) 
+-    {
+-      errno = ENAMETOOLONG;
+-      return -1;
+-    }
+-  
+-  req_adt_get.op = 0x10;
+-  req_adt_get.version = 3;
+-  strcpy(req_adt_get.set.name, setname);
+-  size = sizeof(req_adt_get);
+-  if (getsockopt(ipset_sock, SOL_IP, 83, &req_adt_get, &size) < 0)
+-    return -1;
+-  req_adt.op = remove ? 0x102 : 0x101;
+-  req_adt.index = req_adt_get.set.index;
+-  req_adt.ip = ntohl(ipaddr->addr.addr4.s_addr);
+-  if (setsockopt(ipset_sock, SOL_IP, 83, &req_adt, sizeof(req_adt)) < 0)
+-    return -1;
+-  
+-  return 0;
+-}
+-
+-
+-
+ int add_to_ipset(const char *setname, const struct all_addr *ipaddr, int flags, int remove)
+ {
+   int af = AF_INET;
+ 
+ #ifdef HAVE_IPV6
+   if (flags & F_IPV6)
+-    {
+       af = AF_INET6;
+-      /* old method only supports IPv4 */
+-      if (old_kernel)
+-	return -1;
+-    }
+ #endif
+   
+-  return old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove);
++  return new_add_to_ipset(setname, ipaddr, af, remove);
+ }
+ 
+ #endif
diff --git a/trunk/package/network/services/dropbear/Config.in b/trunk/package/network/services/dropbear/Config.in
new file mode 100644
index 00000000..e2a76103
--- /dev/null
+++ b/trunk/package/network/services/dropbear/Config.in
@@ -0,0 +1,27 @@
+menu "Configuration"
+	depends on PACKAGE_dropbear
+
+config DROPBEAR_ECC
+	bool "Elliptic curve cryptography (ECC)"
+	default n
+	help
+		Enables elliptic curve cryptography (ECC) support in key exchange and public key
+		authentication.
+
+		Key exchange algorithms:
+		  ecdh-sha2-nistp256
+		  ecdh-sha2-nistp384
+		  ecdh-sha2-nistp521
+		  curve25519-sha256@libssh.org
+
+		Public key algorithms:
+		  ecdsa-sha2-nistp256
+		  ecdsa-sha2-nistp384
+		  ecdsa-sha2-nistp521
+
+		Does not generate ECC host keys by default (ECC key exchange will not be used,
+		only ECC public key auth).
+
+		Increases binary size by about 36 kB (MIPS).
+
+endmenu
diff --git a/trunk/package/network/services/dropbear/Makefile b/trunk/package/network/services/dropbear/Makefile
new file mode 100644
index 00000000..12a836be
--- /dev/null
+++ b/trunk/package/network/services/dropbear/Makefile
@@ -0,0 +1,130 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dropbear
+PKG_VERSION:=2014.65
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://matt.ucc.asn.au/dropbear/releases/ \
+	https://dropbear.nl/mirror/releases/
+PKG_MD5SUM:=1918604238817385a156840fa2c39490
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
+
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+PKG_CONFIG_DEPENDS:=CONFIG_DROPBEAR_ECC
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dropbear/Default
+  URL:=http://matt.ucc.asn.au/dropbear/
+endef
+
+define Package/dropbear/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/dropbear
+  $(call Package/dropbear/Default)
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Small SSH2 client/server
+endef
+
+define Package/dropbear/description
+ A small SSH2 server/client designed for small memory environments.
+endef
+
+define Package/dropbear/conffiles
+/etc/dropbear/dropbear_rsa_host_key
+/etc/dropbear/dropbear_dss_host_key 
+/etc/config/dropbear 
+endef
+
+define Package/dropbearconvert
+  $(call Package/dropbear/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Utility for converting SSH keys
+endef
+
+CONFIGURE_ARGS += \
+	--disable-pam \
+	--enable-openpty \
+	--enable-syslog \
+	$(if $(CONFIG_SHADOW_PASSWORDS),,--disable-shadow) \
+	--disable-lastlog \
+	--disable-utmp \
+	--disable-utmpx \
+	--disable-wtmp \
+	--disable-wtmpx \
+	--disable-loginfunc \
+	--disable-pututline \
+	--disable-pututxline \
+	--disable-zlib \
+	--enable-bundled-libtom
+
+TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+define Build/Configure
+	$(Build/Configure/Default)
+
+	# Enforce that all replacements are made, otherwise options.h has changed
+	# format and this logic is broken.
+	for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH DROPBEAR_CURVE25519; do \
+	  awk 'BEGIN { rc = 1 } \
+	       /'$$$$OPTION'/ { $$$$0 = "$(if $(CONFIG_DROPBEAR_ECC),,// )#define '$$$$OPTION'"; rc = 0 } \
+	       { print } \
+	       END { exit(rc) }' $(PKG_BUILD_DIR)/options.h \
+	       >$(PKG_BUILD_DIR)/options.h.new && \
+	  mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h || exit 1; \
+	done
+endef
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		PROGRAMS="dropbear dbclient dropbearkey scp" \
+		MULTI=1 SCPPROGRESS=1
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		PROGRAMS="dropbearconvert"
+endef
+
+define Package/dropbear/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(LN) ../sbin/dropbear $(1)/usr/bin/scp
+	$(LN) ../sbin/dropbear $(1)/usr/bin/ssh
+	$(LN) ../sbin/dropbear $(1)/usr/bin/dbclient
+	$(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/dropbear.config $(1)/etc/config/dropbear
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
+	$(INSTALL_DIR) $(1)/usr/lib/opkg/info
+	$(INSTALL_DIR) $(1)/etc/dropbear
+	touch $(1)/etc/dropbear/dropbear_rsa_host_key
+	touch $(1)/etc/dropbear/dropbear_dss_host_key
+endef
+
+define Package/dropbearconvert/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearconvert $(1)/usr/bin/dropbearconvert
+endef
+
+$(eval $(call BuildPackage,dropbear))
+$(eval $(call BuildPackage,dropbearconvert))
diff --git a/trunk/package/network/services/dropbear/files/dropbear.config b/trunk/package/network/services/dropbear/files/dropbear.config
new file mode 100644
index 00000000..2139ba0b
--- /dev/null
+++ b/trunk/package/network/services/dropbear/files/dropbear.config
@@ -0,0 +1,5 @@
+config dropbear
+	option PasswordAuth 'on'
+	option RootPasswordAuth 'on'
+	option Port         '22'
+#	option BannerFile   '/etc/banner'
diff --git a/trunk/package/network/services/dropbear/files/dropbear.init b/trunk/package/network/services/dropbear/files/dropbear.init
new file mode 100755
index 00000000..6de01427
--- /dev/null
+++ b/trunk/package/network/services/dropbear/files/dropbear.init
@@ -0,0 +1,180 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006 Carlos Sobrinho
+
+START=50
+STOP=50
+
+USE_PROCD=1
+PROG=/usr/sbin/dropbear
+NAME=dropbear
+PIDCOUNT=0
+EXTRA_COMMANDS="killclients"
+EXTRA_HELP="	killclients Kill ${NAME} processes except servers and yourself"
+
+append_ports()
+{
+	local ipaddrs="$1"
+	local port="$2"
+
+	[ -z "$ipaddrs" ] && {
+		procd_append_param command -p "$port"
+		return
+	}
+
+	for addr in $ipaddrs; do
+		procd_append_param command -p "$addr:$port"
+	done
+}
+
+validate_section_dropbear()
+{
+	uci_validate_section dropbear dropbear "${1}" \
+		'PasswordAuth:bool:1' \
+		'enable:bool:1' \
+		'Interface:string' \
+		'GatewayPorts:bool:0' \
+		'RootPasswordAuth:bool:1' \
+		'RootLogin:bool:1' \
+		'rsakeyfile:file' \
+		'dsskeyfile:file' \
+		'BannerFile:file' \
+		'Port:list(port):22' \
+		'SSHKeepAlive:uinteger:300' \
+		'IdleTimeout:uinteger:0' \
+		'mdns:uinteger:1'
+}
+
+dropbear_instance()
+{
+	local PasswordAuth enable Interface GatewayPorts \
+		RootPasswordAuth RootLogin rsakeyfile \
+		dsskeyfile BannerFile Port SSHKeepAlive IdleTimeout \
+		mdns ipaddrs
+
+	validate_section_dropbear "${1}" || {
+		echo "validation failed"
+		return 1
+	}
+
+	[ -n "${Interface}" ] && {
+		network_get_ipaddrs_all ipaddrs "${Interface}" || {
+			echo "interface ${Interface} has no physdev or physdev has no suitable ip"
+			return 1
+		}
+	}
+
+	[ "${enable}" = "0" ] && return 1
+	PIDCOUNT="$(( ${PIDCOUNT} + 1))"
+	local pid_file="/var/run/${NAME}.${PIDCOUNT}.pid"
+
+	procd_open_instance
+	procd_set_param command "$PROG" -F -P "$pid_file"
+	[ "${PasswordAuth}" -eq 0 ] && procd_append_param command -s
+	[ "${GatewayPorts}" -eq 1 ] && procd_append_param command -a
+	[ "${RootPasswordAuth}" -eq 0 ] && procd_append_param command -g
+	[ "${RootLogin}" -eq 0 ] && procd_append_param command -w
+	[ -n "${rsakeyfile}" ] && procd_append_param command -r "${rsakeyfile}"
+	[ -n "${dsskeyfile}" ] && procd_append_param command -d "${dsskeyfile}"
+	[ -n "${BannerFile}" ] && procd_append_param command -b "${BannerFile}"
+	append_ports "${ipaddrs}" "${Port}"
+	[ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}"
+	[ "${SSHKeepAlive}" -ne 0 ] && procd_append_param command -K "${SSHKeepAlive}"
+	[ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port" "daemon=dropbear"
+	procd_close_instance
+}
+
+keygen()
+{
+	for keytype in rsa dss; do
+		# check for keys
+		key=dropbear/dropbear_${keytype}_host_key
+		[ -f /tmp/$key -o -s /etc/$key ] || {
+			# generate missing keys
+			mkdir -p /tmp/dropbear
+			[ -x /usr/bin/dropbearkey ] && {
+				/usr/bin/dropbearkey -t $keytype -f /tmp/$key 2>&- >&- && exec /etc/rc.common "$initscript" start
+			} &
+		exit 0
+		}
+	done
+
+	lock /tmp/.switch2jffs
+	mkdir -p /etc/dropbear
+	mv /tmp/dropbear/dropbear_* /etc/dropbear/
+	lock -u /tmp/.switch2jffs
+	chown root /etc/dropbear
+	chmod 0700 /etc/dropbear
+}
+
+start_service()
+{
+	[ -s /etc/dropbear/dropbear_rsa_host_key -a \
+	  -s /etc/dropbear/dropbear_dss_host_key ] || keygen
+
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+
+	config_load "${NAME}"
+	config_foreach dropbear_instance dropbear
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "dropbear"
+	procd_add_validation validate_section_dropbear
+}
+
+killclients()
+{
+	local ignore=''
+	local server
+	local pid
+
+	# if this script is run from inside a client session, then ignore that session
+	pid="$$"
+	while [ "${pid}" -ne 0 ]
+	 do
+		# get parent process id
+		pid=`cut -d ' ' -f 4 "/proc/${pid}/stat"`
+		[ "${pid}" -eq 0 ] && break
+
+		# check if client connection
+		grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" && {
+			append ignore "${pid}"
+			break
+		}
+	done
+
+	# get all server pids that should be ignored
+	for server in `cat /var/run/${NAME}.*.pid`
+	 do
+		append ignore "${server}"
+	done
+
+	# get all running pids and kill client connections
+	local skip
+	for pid in `pidof "${NAME}"`
+	 do
+		# check if correct program, otherwise process next pid
+		grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" || {
+			continue
+		}
+
+		# check if pid should be ignored (servers, ourself)
+		skip=0
+		for server in ${ignore}
+		 do
+			if [ "${pid}" = "${server}" ]
+			 then
+				skip=1
+				break
+			fi
+		done
+		[ "${skip}" -ne 0 ] && continue
+
+		# kill process
+		echo "${initscript}: Killing ${pid}..."
+		kill -KILL ${pid}
+	done
+}
diff --git a/trunk/package/network/services/dropbear/patches/001-dont_send_SSH_MSG_IMPLEMENTED.patch b/trunk/package/network/services/dropbear/patches/001-dont_send_SSH_MSG_IMPLEMENTED.patch
new file mode 100644
index 00000000..fe222f5c
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/001-dont_send_SSH_MSG_IMPLEMENTED.patch
@@ -0,0 +1,58 @@
+
+# HG changeset patch
+# User Matt Johnston <matt@ucc.asn.au>
+# Date 1407937727 -28800
+# Node ID f7f6c15b0ec30b0def69c9ccbb3dc4eb97374abc
+# Parent  02821319ab1f1208b7ab5de4af82a562c386d40d
+Don't send SSH_MSG_UNIMPLEMENTED for keepalive responses
+
+diff -r 02821319ab1f -r f7f6c15b0ec3 cli-session.c
+--- a/cli-session.c	Fri Aug 08 21:53:47 2014 +0800
++++ b/cli-session.c	Wed Aug 13 21:48:47 2014 +0800
+@@ -73,6 +73,8 @@
+ #ifdef  ENABLE_CLI_REMOTETCPFWD
+ 	{SSH_MSG_REQUEST_SUCCESS, cli_recv_msg_request_success}, /* client */
+ 	{SSH_MSG_REQUEST_FAILURE, cli_recv_msg_request_failure}, /* client */
++#else
++	{SSH_MSG_REQUEST_FAILURE, ignore_recv_msg_request_failure}, /* for keepalive */
+ #endif
+ 	{0, 0} /* End */
+ };
+diff -r 02821319ab1f -r f7f6c15b0ec3 common-session.c
+--- a/common-session.c	Fri Aug 08 21:53:47 2014 +0800
++++ b/common-session.c	Wed Aug 13 21:48:47 2014 +0800
+@@ -394,6 +394,11 @@
+ 	return pos+1;
+ }
+ 
++void ignore_recv_msg_request_failure() {
++	// Do nothing
++	TRACE(("Ignored msg_request_failure"))
++}
++
+ static void send_msg_keepalive() {
+ 	CHECKCLEARTOWRITE();
+ 	time_t old_time_idle = ses.last_packet_time_idle;
+diff -r 02821319ab1f -r f7f6c15b0ec3 session.h
+--- a/session.h	Fri Aug 08 21:53:47 2014 +0800
++++ b/session.h	Wed Aug 13 21:48:47 2014 +0800
+@@ -47,6 +47,7 @@
+ void session_cleanup();
+ void send_session_identification();
+ void send_msg_ignore();
++void ignore_recv_msg_request_failure();
+ 
+ void update_channel_prio();
+ 
+diff -r 02821319ab1f -r f7f6c15b0ec3 svr-session.c
+--- a/svr-session.c	Fri Aug 08 21:53:47 2014 +0800
++++ b/svr-session.c	Wed Aug 13 21:48:47 2014 +0800
+@@ -58,6 +58,7 @@
+ 	{SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open},
+ 	{SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof},
+ 	{SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close},
++	{SSH_MSG_REQUEST_FAILURE, ignore_recv_msg_request_failure}, /* for keepalive */
+ #ifdef USING_LISTENERS
+ 	{SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation},
+ 	{SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure},
+
diff --git a/trunk/package/network/services/dropbear/patches/002-match_keepalive_to_OpenSSH.patch b/trunk/package/network/services/dropbear/patches/002-match_keepalive_to_OpenSSH.patch
new file mode 100644
index 00000000..b8cb2d06
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/002-match_keepalive_to_OpenSSH.patch
@@ -0,0 +1,333 @@
+
+# HG changeset patch
+# User Matt Johnston <matt@ucc.asn.au>
+# Date 1408460936 -28800
+# Node ID 0bb16232e7c4162daa43e8618521cf453847ac16
+# Parent  939944f0fca9b2dcdf8470bb24efcc37a3843e8b
+Make keepalive handling more robust, this should now match what OpenSSH does
+
+diff -r 939944f0fca9 -r 0bb16232e7c4 LICENSE
+--- a/LICENSE	Wed Aug 13 22:07:43 2014 +0800
++++ b/LICENSE	Tue Aug 19 23:08:56 2014 +0800
+@@ -8,7 +8,7 @@
+ Portions of the client-mode work are (c) 2004 Mihnea Stoenescu, under the
+ same license:
+ 
+-Copyright (c) 2002-2013 Matt Johnston
++Copyright (c) 2002-2014 Matt Johnston
+ Portions copyright (c) 2004 Mihnea Stoenescu
+ All rights reserved.
+ 
+diff -r 939944f0fca9 -r 0bb16232e7c4 auth.h
+--- a/auth.h	Wed Aug 13 22:07:43 2014 +0800
++++ b/auth.h	Tue Aug 19 23:08:56 2014 +0800
+@@ -106,7 +106,7 @@
+ 								valid */
+ 	unsigned int failcount; /* Number of (failed) authentication attempts.*/
+ 	unsigned authdone : 1; /* 0 if we haven't authed, 1 if we have. Applies for
+-							  client and server (though has differing [obvious]
++							  client and server (though has differing 
+ 							  meanings). */
+ 	unsigned perm_warn : 1; /* Server only, set if bad permissions on 
+ 							   ~/.ssh/authorized_keys have already been
+diff -r 939944f0fca9 -r 0bb16232e7c4 channel.h
+--- a/channel.h	Wed Aug 13 22:07:43 2014 +0800
++++ b/channel.h	Tue Aug 19 23:08:56 2014 +0800
+@@ -105,6 +105,9 @@
+ void setchannelfds(fd_set *readfd, fd_set *writefd);
+ void channelio(fd_set *readfd, fd_set *writefd);
+ struct Channel* getchannel();
++/* Returns an arbitrary channel that is in a ready state - not
++being initialised and no EOF in either direction. NULL if none. */
++struct Channel* get_any_ready_channel();
+ 
+ void recv_msg_channel_open();
+ void recv_msg_channel_request();
+@@ -128,8 +131,10 @@
+ void recv_msg_channel_open_confirmation();
+ void recv_msg_channel_open_failure();
+ #endif
++void start_send_channel_request(struct Channel *channel, unsigned char *type);
+ 
+ void send_msg_request_success();
+ void send_msg_request_failure();
+ 
++
+ #endif /* _CHANNEL_H_ */
+diff -r 939944f0fca9 -r 0bb16232e7c4 chansession.h
+--- a/chansession.h	Wed Aug 13 22:07:43 2014 +0800
++++ b/chansession.h	Tue Aug 19 23:08:56 2014 +0800
+@@ -89,7 +89,6 @@
+ #ifdef ENABLE_CLI_NETCAT
+ void cli_send_netcat_request();
+ #endif
+-void cli_start_send_channel_request(struct Channel *channel, unsigned char *type);
+ 
+ void svr_chansessinitialise();
+ extern const struct ChanType svrchansess;
+diff -r 939944f0fca9 -r 0bb16232e7c4 cli-agentfwd.c
+--- a/cli-agentfwd.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/cli-agentfwd.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -234,7 +234,7 @@
+ 		return;
+ 	}
+ 	
+-	cli_start_send_channel_request(channel, "auth-agent-req@openssh.com");
++	start_send_channel_request(channel, "auth-agent-req@openssh.com");
+ 	/* Don't want replies */
+ 	buf_putbyte(ses.writepayload, 0);
+ 	encrypt_packet();
+diff -r 939944f0fca9 -r 0bb16232e7c4 cli-chansession.c
+--- a/cli-chansession.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/cli-chansession.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -92,17 +92,6 @@
+ 	}
+ }
+ 
+-void cli_start_send_channel_request(struct Channel *channel, 
+-		unsigned char *type) {
+-
+-	CHECKCLEARTOWRITE();
+-	buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST);
+-	buf_putint(ses.writepayload, channel->remotechan);
+-
+-	buf_putstring(ses.writepayload, type, strlen(type));
+-
+-}
+-
+ /* Taken from OpenSSH's sshtty.c:
+  * RCSID("OpenBSD: sshtty.c,v 1.5 2003/09/19 17:43:35 markus Exp "); */
+ static void cli_tty_setup() {
+@@ -287,7 +276,7 @@
+ 
+ 	TRACE(("enter send_chansess_pty_req"))
+ 
+-	cli_start_send_channel_request(channel, "pty-req");
++	start_send_channel_request(channel, "pty-req");
+ 
+ 	/* Don't want replies */
+ 	buf_putbyte(ses.writepayload, 0);
+@@ -330,7 +319,7 @@
+ 		reqtype = "shell";
+ 	}
+ 
+-	cli_start_send_channel_request(channel, reqtype);
++	start_send_channel_request(channel, reqtype);
+ 
+ 	/* XXX TODO */
+ 	buf_putbyte(ses.writepayload, 0); /* Don't want replies */
+diff -r 939944f0fca9 -r 0bb16232e7c4 cli-session.c
+--- a/cli-session.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/cli-session.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -70,11 +70,15 @@
+ 	{SSH_MSG_USERAUTH_BANNER, recv_msg_userauth_banner}, /* client */
+ 	{SSH_MSG_USERAUTH_SPECIFIC_60, recv_msg_userauth_specific_60}, /* client */
+ 	{SSH_MSG_GLOBAL_REQUEST, recv_msg_global_request_cli},
++	{SSH_MSG_CHANNEL_SUCCESS, ignore_recv_response},
++	{SSH_MSG_CHANNEL_FAILURE, ignore_recv_response},
+ #ifdef  ENABLE_CLI_REMOTETCPFWD
+ 	{SSH_MSG_REQUEST_SUCCESS, cli_recv_msg_request_success}, /* client */
+ 	{SSH_MSG_REQUEST_FAILURE, cli_recv_msg_request_failure}, /* client */
+ #else
+-	{SSH_MSG_REQUEST_FAILURE, ignore_recv_msg_request_failure}, /* for keepalive */
++	/* For keepalive */
++	{SSH_MSG_REQUEST_SUCCESS, ignore_recv_response},
++	{SSH_MSG_REQUEST_FAILURE, ignore_recv_response},
+ #endif
+ 	{0, 0} /* End */
+ };
+diff -r 939944f0fca9 -r 0bb16232e7c4 common-channel.c
+--- a/common-channel.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/common-channel.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -627,7 +627,12 @@
+ 			&& !channel->close_handler_done) {
+ 		channel->type->reqhandler(channel);
+ 	} else {
+-		send_msg_channel_failure(channel);
++		int wantreply;
++		buf_eatstring(ses.payload);
++		wantreply = buf_getbool(ses.payload);
++		if (wantreply) {
++			send_msg_channel_failure(channel);
++		}
+ 	}
+ 
+ 	TRACE(("leave recv_msg_channel_request"))
+@@ -1134,3 +1139,30 @@
+ 	buf_putbyte(ses.writepayload, SSH_MSG_REQUEST_FAILURE);
+ 	encrypt_packet();
+ }
++
++struct Channel* get_any_ready_channel() {
++	if (ses.chancount == 0) {
++		return NULL;
++	}
++	size_t i;
++	for (i = 0; i < ses.chansize; i++) {
++		struct Channel *chan = ses.channels[i];
++		if (chan
++				&& !(chan->sent_eof || chan->recv_eof)
++				&& !(chan->await_open || chan->initconn)) {
++			return chan;
++		}
++	}
++	return NULL;
++}
++
++void start_send_channel_request(struct Channel *channel, 
++		unsigned char *type) {
++
++	CHECKCLEARTOWRITE();
++	buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST);
++	buf_putint(ses.writepayload, channel->remotechan);
++
++	buf_putstring(ses.writepayload, type, strlen(type));
++
++}
+diff -r 939944f0fca9 -r 0bb16232e7c4 common-session.c
+--- a/common-session.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/common-session.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -394,19 +394,30 @@
+ 	return pos+1;
+ }
+ 
+-void ignore_recv_msg_request_failure() {
++void ignore_recv_response() {
+ 	// Do nothing
+-	TRACE(("Ignored msg_request_failure"))
++	TRACE(("Ignored msg_request_response"))
+ }
+ 
+ static void send_msg_keepalive() {
+ 	CHECKCLEARTOWRITE();
+ 	time_t old_time_idle = ses.last_packet_time_idle;
+-	/* Try to force a response from the other end. Some peers will
+-	reply with SSH_MSG_REQUEST_FAILURE, some will reply with SSH_MSG_UNIMPLEMENTED */
+-	buf_putbyte(ses.writepayload, SSH_MSG_GLOBAL_REQUEST);
+-	/* A short string */
+-	buf_putstring(ses.writepayload, "k@dropbear.nl", 0);
++
++	struct Channel *chan = get_any_ready_channel();
++
++	if (chan) {
++		/* Channel requests are preferable, more implementations
++		handle them than SSH_MSG_GLOBAL_REQUEST */
++		TRACE(("keepalive channel request %d", chan->index))
++		start_send_channel_request(chan, DROPBEAR_KEEPALIVE_STRING);
++	} else {
++		TRACE(("keepalive global request"))
++		/* Some peers will reply with SSH_MSG_REQUEST_FAILURE, 
++		some will reply with SSH_MSG_UNIMPLEMENTED, some will exit. */
++		buf_putbyte(ses.writepayload, SSH_MSG_GLOBAL_REQUEST); 
++		buf_putstring(ses.writepayload, DROPBEAR_KEEPALIVE_STRING,
++			strlen(DROPBEAR_KEEPALIVE_STRING));
++	}
+ 	buf_putbyte(ses.writepayload, 1); /* want_reply */
+ 	encrypt_packet();
+ 
+@@ -435,7 +446,10 @@
+ 		send_msg_kexinit();
+ 	}
+ 	
+-	if (opts.keepalive_secs > 0) {
++	if (opts.keepalive_secs > 0 && ses.authstate.authdone) {
++		/* Avoid sending keepalives prior to auth - those are
++		not valid pre-auth packet types */
++
+ 		/* Send keepalives if we've been idle */
+ 		if (now - ses.last_packet_time_any_sent >= opts.keepalive_secs) {
+ 			send_msg_keepalive();
+diff -r 939944f0fca9 -r 0bb16232e7c4 session.h
+--- a/session.h	Wed Aug 13 22:07:43 2014 +0800
++++ b/session.h	Tue Aug 19 23:08:56 2014 +0800
+@@ -47,7 +47,7 @@
+ void session_cleanup();
+ void send_session_identification();
+ void send_msg_ignore();
+-void ignore_recv_msg_request_failure();
++void ignore_recv_response();
+ 
+ void update_channel_prio();
+ 
+diff -r 939944f0fca9 -r 0bb16232e7c4 svr-chansession.c
+--- a/svr-chansession.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/svr-chansession.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -53,6 +53,7 @@
+ static void closechansess(struct Channel *channel);
+ static int newchansess(struct Channel *channel);
+ static void chansessionrequest(struct Channel *channel);
++static int sesscheckclose(struct Channel *channel);
+ 
+ static void send_exitsignalstatus(struct Channel *channel);
+ static void send_msg_chansess_exitstatus(struct Channel * channel,
+@@ -61,6 +62,14 @@
+ 		struct ChanSess * chansess);
+ static void get_termmodes(struct ChanSess *chansess);
+ 
++const struct ChanType svrchansess = {
++	0, /* sepfds */
++	"session", /* name */
++	newchansess, /* inithandler */
++	sesscheckclose, /* checkclosehandler */
++	chansessionrequest, /* reqhandler */
++	closechansess, /* closehandler */
++};
+ 
+ /* required to clear environment */
+ extern char** environ;
+@@ -968,16 +977,6 @@
+ 	dropbear_exit("Child failed");
+ }
+ 
+-const struct ChanType svrchansess = {
+-	0, /* sepfds */
+-	"session", /* name */
+-	newchansess, /* inithandler */
+-	sesscheckclose, /* checkclosehandler */
+-	chansessionrequest, /* reqhandler */
+-	closechansess, /* closehandler */
+-};
+-
+-
+ /* Set up the general chansession environment, in particular child-exit
+  * handling */
+ void svr_chansessinitialise() {
+diff -r 939944f0fca9 -r 0bb16232e7c4 svr-main.c
+--- a/svr-main.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/svr-main.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -409,7 +409,7 @@
+ 	size_t sockpos = 0;
+ 	int nsock;
+ 
+-	TRACE(("listensockets: %d to try\n", svr_opts.portcount))
++	TRACE(("listensockets: %d to try", svr_opts.portcount))
+ 
+ 	for (i = 0; i < svr_opts.portcount; i++) {
+ 
+diff -r 939944f0fca9 -r 0bb16232e7c4 svr-session.c
+--- a/svr-session.c	Wed Aug 13 22:07:43 2014 +0800
++++ b/svr-session.c	Tue Aug 19 23:08:56 2014 +0800
+@@ -58,7 +58,10 @@
+ 	{SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open},
+ 	{SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof},
+ 	{SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close},
+-	{SSH_MSG_REQUEST_FAILURE, ignore_recv_msg_request_failure}, /* for keepalive */
++	{SSH_MSG_CHANNEL_SUCCESS, ignore_recv_response},
++	{SSH_MSG_CHANNEL_FAILURE, ignore_recv_response},
++	{SSH_MSG_REQUEST_FAILURE, ignore_recv_response}, /* for keepalive */
++	{SSH_MSG_REQUEST_SUCCESS, ignore_recv_response}, /* client */
+ #ifdef USING_LISTENERS
+ 	{SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation},
+ 	{SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure},
+diff -r 939944f0fca9 -r 0bb16232e7c4 sysoptions.h
+--- a/sysoptions.h	Wed Aug 13 22:07:43 2014 +0800
++++ b/sysoptions.h	Tue Aug 19 23:08:56 2014 +0800
+@@ -257,4 +257,7 @@
+ #define DROPBEAR_LISTEN_BACKLOG MAX_CHANNELS
+ #endif
+ 
++/* Use this string since some implementations might special-case it */
++#define DROPBEAR_KEEPALIVE_STRING "keepalive@openssh.com"
++
+ /* no include guard for this file */
+
diff --git a/trunk/package/network/services/dropbear/patches/100-pubkey_path.patch b/trunk/package/network/services/dropbear/patches/100-pubkey_path.patch
new file mode 100644
index 00000000..456874b7
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/100-pubkey_path.patch
@@ -0,0 +1,91 @@
+--- a/svr-authpubkey.c
++++ b/svr-authpubkey.c
+@@ -208,17 +208,21 @@ static int checkpubkey(unsigned char* al
+ 		goto out;
+ 	}
+ 
+-	/* we don't need to check pw and pw_dir for validity, since
+-	 * its been done in checkpubkeyperms. */
+-	len = strlen(ses.authstate.pw_dir);
+-	/* allocate max required pathname storage,
+-	 * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
+-	filename = m_malloc(len + 22);
+-	snprintf(filename, len + 22, "%s/.ssh/authorized_keys", 
+-				ses.authstate.pw_dir);
+-
+-	/* open the file */
+-	authfile = fopen(filename, "r");
++	if (ses.authstate.pw_uid != 0) {
++		/* we don't need to check pw and pw_dir for validity, since
++		 * its been done in checkpubkeyperms. */
++		len = strlen(ses.authstate.pw_dir);
++		/* allocate max required pathname storage,
++		 * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
++		filename = m_malloc(len + 22);
++		snprintf(filename, len + 22, "%s/.ssh/authorized_keys", 
++		         ses.authstate.pw_dir);
++
++		/* open the file */
++		authfile = fopen(filename, "r");
++	} else {
++		authfile = fopen("/etc/dropbear/authorized_keys","r");
++	}
+ 	if (authfile == NULL) {
+ 		goto out;
+ 	}
+@@ -371,26 +375,35 @@ static int checkpubkeyperms() {
+ 		goto out;
+ 	}
+ 
+-	/* allocate max required pathname storage,
+-	 * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
+-	filename = m_malloc(len + 22);
+-	strncpy(filename, ses.authstate.pw_dir, len+1);
+-
+-	/* check ~ */
+-	if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
+-		goto out;
+-	}
+-
+-	/* check ~/.ssh */
+-	strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */
+-	if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
+-		goto out;
+-	}
+-
+-	/* now check ~/.ssh/authorized_keys */
+-	strncat(filename, "/authorized_keys", 16);
+-	if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
+-		goto out;
++	if (ses.authstate.pw_uid == 0) {
++		if (checkfileperm("/etc/dropbear") != DROPBEAR_SUCCESS) {
++			goto out;
++		}
++		if (checkfileperm("/etc/dropbear/authorized_keys") != DROPBEAR_SUCCESS) {
++			goto out;
++		}
++	} else {
++		/* allocate max required pathname storage,
++		 * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
++		filename = m_malloc(len + 22);
++		strncpy(filename, ses.authstate.pw_dir, len+1);
++
++		/* check ~ */
++		if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
++			goto out;
++		}
++
++		/* check ~/.ssh */
++		strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */
++		if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
++			goto out;
++		}
++
++		/* now check ~/.ssh/authorized_keys */
++		strncat(filename, "/authorized_keys", 16);
++		if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
++			goto out;
++		}
+ 	}
+ 
+ 	/* file looks ok, return success */
diff --git a/trunk/package/network/services/dropbear/patches/110-change_user.patch b/trunk/package/network/services/dropbear/patches/110-change_user.patch
new file mode 100644
index 00000000..44bfe14c
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/110-change_user.patch
@@ -0,0 +1,18 @@
+--- a/svr-chansession.c
++++ b/svr-chansession.c
+@@ -902,12 +902,12 @@ static void execchild(void *user_data) {
+ 	/* We can only change uid/gid as root ... */
+ 	if (getuid() == 0) {
+ 
+-		if ((setgid(ses.authstate.pw_gid) < 0) ||
++		if ((ses.authstate.pw_gid != 0) && ((setgid(ses.authstate.pw_gid) < 0) ||
+ 			(initgroups(ses.authstate.pw_name, 
+-						ses.authstate.pw_gid) < 0)) {
++						ses.authstate.pw_gid) < 0))) {
+ 			dropbear_exit("Error changing user group");
+ 		}
+-		if (setuid(ses.authstate.pw_uid) < 0) {
++		if ((ses.authstate.pw_uid != 0) && (setuid(ses.authstate.pw_uid) < 0)) {
+ 			dropbear_exit("Error changing user");
+ 		}
+ 	} else {
diff --git a/trunk/package/network/services/dropbear/patches/120-openwrt_options.patch b/trunk/package/network/services/dropbear/patches/120-openwrt_options.patch
new file mode 100644
index 00000000..1b5c5cb1
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/120-openwrt_options.patch
@@ -0,0 +1,58 @@
+--- a/options.h
++++ b/options.h
+@@ -41,7 +41,7 @@
+  * Both of these flags can be defined at once, don't compile without at least
+  * one of them. */
+ #define NON_INETD_MODE
+-#define INETD_MODE
++/*#define INETD_MODE*/
+ 
+ /* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is
+  * perhaps 20% slower for pubkey operations (it is probably worth experimenting
+@@ -81,7 +81,7 @@ much traffic. */
+ 
+ /* Enable "Netcat mode" option. This will forward standard input/output
+  * to a remote TCP-forwarded connection */
+-#define ENABLE_CLI_NETCAT
++/*#define ENABLE_CLI_NETCAT*/
+ 
+ /* Whether to support "-c" and "-m" flags to choose ciphers/MACs at runtime */
+ #define ENABLE_USER_ALGO_LIST
+@@ -95,8 +95,8 @@ much traffic. */
+ #define DROPBEAR_AES256
+ /* Compiling in Blowfish will add ~6kB to runtime heap memory usage */
+ /*#define DROPBEAR_BLOWFISH*/
+-#define DROPBEAR_TWOFISH256
+-#define DROPBEAR_TWOFISH128
++/*#define DROPBEAR_TWOFISH256
++#define DROPBEAR_TWOFISH128*/
+ 
+ /* Enable "Counter Mode" for ciphers. This is more secure than normal
+  * CBC mode against certain attacks. This adds around 1kB to binary 
+@@ -122,7 +122,7 @@ much traffic. */
+  * If you disable MD5, Dropbear will fall back to SHA1 fingerprints,
+  * which are not the standard form. */
+ #define DROPBEAR_SHA1_HMAC
+-#define DROPBEAR_SHA1_96_HMAC
++/*#define DROPBEAR_SHA1_96_HMAC*/
+ /*#define DROPBEAR_SHA2_256_HMAC*/
+ /*#define DROPBEAR_SHA2_512_HMAC*/
+ #define DROPBEAR_MD5_HMAC
+@@ -175,7 +175,7 @@ much traffic. */
+ 
+ /* Whether to print the message of the day (MOTD). This doesn't add much code
+  * size */
+-#define DO_MOTD
++/*#define DO_MOTD*/
+ 
+ /* The MOTD file path */
+ #ifndef MOTD_FILENAME
+@@ -213,7 +213,7 @@ much traffic. */
+  * note that it will be provided for all "hidden" client-interactive
+  * style prompts - if you want something more sophisticated, use 
+  * SSH_ASKPASS instead. Comment out this var to remove this functionality.*/
+-#define DROPBEAR_PASSWORD_ENV "DROPBEAR_PASSWORD"
++/*#define DROPBEAR_PASSWORD_ENV "DROPBEAR_PASSWORD"*/
+ 
+ /* Define this (as well as ENABLE_CLI_PASSWORD_AUTH) to allow the use of
+  * a helper program for the ssh client. The helper program should be
diff --git a/trunk/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/trunk/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
new file mode 100644
index 00000000..0a5e8ba9
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
@@ -0,0 +1,21 @@
+--- a/cli-runopts.c
++++ b/cli-runopts.c
+@@ -312,6 +312,10 @@ void cli_getopts(int argc, char ** argv)
+ 					debug_trace = 1;
+ 					break;
+ #endif
++				case 'o':
++					next = &dummy;
++				case 'x':
++					break;
+ 				case 'F':
+ 				case 'e':
+ #ifndef ENABLE_USER_ALGO_LIST
+@@ -329,7 +333,6 @@ void cli_getopts(int argc, char ** argv)
+ 					print_version();
+ 					exit(EXIT_SUCCESS);
+ 					break;
+-				case 'o':
+ 				case 'b':
+ 					next = &dummy;
+ 				default:
diff --git a/trunk/package/network/services/dropbear/patches/140-disable_assert.patch b/trunk/package/network/services/dropbear/patches/140-disable_assert.patch
new file mode 100644
index 00000000..0717228e
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/140-disable_assert.patch
@@ -0,0 +1,15 @@
+--- a/dbutil.h
++++ b/dbutil.h
+@@ -101,7 +101,11 @@ int m_str_to_uint(const char* str, unsig
+ #define DEF_MP_INT(X) mp_int X = {0, 0, 0, NULL}
+ 
+ /* Dropbear assertion */
+-#define dropbear_assert(X) do { if (!(X)) { fail_assert(#X, __FILE__, __LINE__); } } while (0)
++#ifndef DROPBEAR_ASSERT_ENABLED
++#define DROPBEAR_ASSERT_ENABLED 0
++#endif
++
++#define dropbear_assert(X) do { if (DROPBEAR_ASSERT_ENABLED && !(X)) { fail_assert(#X, __FILE__, __LINE__); } } while (0)
+ 
+ /* Returns 0 if a and b have the same contents */
+ int constant_time_memcmp(const void* a, const void *b, size_t n);
diff --git a/trunk/package/network/services/dropbear/patches/150-dbconvert_standalone.patch b/trunk/package/network/services/dropbear/patches/150-dbconvert_standalone.patch
new file mode 100644
index 00000000..367dc2c6
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/150-dbconvert_standalone.patch
@@ -0,0 +1,14 @@
+--- a/options.h
++++ b/options.h
+@@ -5,6 +5,11 @@
+ #ifndef _OPTIONS_H_
+ #define _OPTIONS_H_
+ 
++#if !defined(DROPBEAR_CLIENT) && !defined(DROPBEAR_SERVER)
++#define DROPBEAR_SERVER
++#define DROPBEAR_CLIENT
++#endif
++
+ /* Define compile-time options below - the "#ifndef DROPBEAR_XXX .... #endif"
+  * parts are to allow for commandline -DDROPBEAR_XXX options etc. */
+ 
diff --git a/trunk/package/network/services/dropbear/patches/500-set-default-path.patch b/trunk/package/network/services/dropbear/patches/500-set-default-path.patch
new file mode 100644
index 00000000..f4cbdeea
--- /dev/null
+++ b/trunk/package/network/services/dropbear/patches/500-set-default-path.patch
@@ -0,0 +1,11 @@
+--- a/options.h
++++ b/options.h
+@@ -323,7 +323,7 @@ be overridden at runtime with -I. 0 disa
+ #define DEFAULT_IDLE_TIMEOUT 0
+ 
+ /* The default path. This will often get replaced by the shell */
+-#define DEFAULT_PATH "/usr/bin:/bin"
++#define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin"
+ 
+ /* Some other defines (that mostly should be left alone) are defined
+  * in sysoptions.h */
diff --git a/trunk/package/network/services/ead/Makefile b/trunk/package/network/services/ead/Makefile
new file mode 100644
index 00000000..c7432533
--- /dev/null
+++ b/trunk/package/network/services/ead/Makefile
@@ -0,0 +1,57 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ead
+PKG_RELEASE:=1
+
+PKG_BUILD_DEPENDS:=libpcap
+PKG_BUILD_DIR:=$(BUILD_DIR)/ead
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/ead
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Emergency Access Daemon
+  URL:=http://bridge.sourceforge.net/
+endef
+
+define Package/ead/description
+  Provides remote access to your device even if IP and firewall
+  configuration settings are defunct
+endef
+
+CONFIGURE_PATH = tinysrp
+
+TARGET_CFLAGS += \
+	-I$(PKG_BUILD_DIR) \
+	-I$(PKG_BUILD_DIR)/tinysrp \
+	$(TARGET_CPPFLAGS)
+
+MAKE_FLAGS += \
+	CONFIGURE_ARGS="$(CONFIGURE_ARGS)" \
+	LIBS_EADCLIENT="$(PKG_BUILD_DIR)/tinysrp/libtinysrp.a" \
+	LIBS_EAD="$(PKG_BUILD_DIR)/tinysrp/libtinysrp.a $(STAGING_DIR)/usr/lib/libpcap.a" \
+	CFLAGS="$(TARGET_CFLAGS)"
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/ead/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ead $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ead))
diff --git a/trunk/package/network/services/ead/src/Makefile b/trunk/package/network/services/ead/src/Makefile
new file mode 100644
index 00000000..faef3b79
--- /dev/null
+++ b/trunk/package/network/services/ead/src/Makefile
@@ -0,0 +1,33 @@
+CC       = gcc
+CPPFLAGS = -I. -Itinysrp
+CFLAGS   = -Os -Wall
+LDFLAGS	 =
+LIBS_EADCLIENT = tinysrp/libtinysrp.a
+LIBS_EAD = tinysrp/libtinysrp.a -lpcap
+CONFIGURE_ARGS =
+
+all: ead ead-client
+
+obj = ead-crypt.o
+
+tinysrp/Makefile:
+	cd tinysrp; ./configure $(CONFIGURE_ARGS)
+
+tinysrp/libtinysrp.a: tinysrp/Makefile
+	-$(MAKE) -C tinysrp CFLAGS="$(CFLAGS)"
+
+%.o: %.c $(wildcard *.h) tinysrp/libtinysrp.a
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+ead.o: filter.c
+ead-crypt.o: aes.c sha1.c
+
+ead: ead.o $(obj) tinysrp/libtinysrp.a
+	$(CC) -o $@ $< $(obj) $(LDFLAGS) $(LIBS_EAD)
+
+ead-client: ead-client.o $(obj)
+	$(CC) -o $@ $< $(obj) $(LDFLAGS) $(LIBS_EADCLIENT)
+
+clean:
+	rm -f *.o ead ead-client
+	if [ -f tinysrp/Makefile ]; then $(MAKE) -C tinysrp distclean; fi
diff --git a/trunk/package/network/services/ead/src/aes.c b/trunk/package/network/services/ead/src/aes.c
new file mode 100644
index 00000000..6f9db345
--- /dev/null
+++ b/trunk/package/network/services/ead/src/aes.c
@@ -0,0 +1,1061 @@
+/*
+ * AES (Rijndael) cipher
+ *
+ * Modifications to public domain implementation:
+ * - support only 128-bit keys
+ * - cleanup
+ * - use C pre-processor to make it easier to change S table access
+ * - added option (AES_SMALL_TABLES) for reducing code size by about 8 kB at
+ *   cost of reduced throughput (quite small difference on Pentium 4,
+ *   10-25% when using -O1 or -O2 optimization)
+ *
+ * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+
+/*
+ * rijndael-alg-fst.c
+ *
+ * @version 3.0 (December 2000)
+ *
+ * Optimised ANSI C code for the Rijndael cipher (now AES)
+ *
+ * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
+ * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
+ * @author Paulo Barreto <paulo.barreto@terra.com.br>
+ *
+ * This code is hereby placed in the public domain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* #define FULL_UNROLL */
+#define AES_SMALL_TABLES
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+
+/*
+Te0[x] = S [x].[02, 01, 01, 03];
+Te1[x] = S [x].[03, 02, 01, 01];
+Te2[x] = S [x].[01, 03, 02, 01];
+Te3[x] = S [x].[01, 01, 03, 02];
+Te4[x] = S [x].[01, 01, 01, 01];
+
+Td0[x] = Si[x].[0e, 09, 0d, 0b];
+Td1[x] = Si[x].[0b, 0e, 09, 0d];
+Td2[x] = Si[x].[0d, 0b, 0e, 09];
+Td3[x] = Si[x].[09, 0d, 0b, 0e];
+Td4[x] = Si[x].[01, 01, 01, 01];
+*/
+
+static const u32 Te0[256] = {
+    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
+    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
+    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
+    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
+    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
+    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
+    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
+    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
+    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
+    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
+    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
+    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
+    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
+    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
+    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
+    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
+    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
+    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
+    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
+    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
+    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
+    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
+    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
+    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
+    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
+    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
+    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
+    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
+    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
+    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
+    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
+    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
+    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
+    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
+    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
+    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
+    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
+    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
+    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
+    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
+    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
+    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
+    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
+    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
+    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
+    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
+    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
+    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
+    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
+    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
+    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
+    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
+    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
+    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
+    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
+    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
+    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
+    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
+    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
+    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
+    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
+    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
+    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
+    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
+};
+#ifndef AES_SMALL_TABLES
+static const u32 Te1[256] = {
+    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
+    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
+    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
+    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
+    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
+    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
+    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
+    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
+    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
+    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
+    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
+    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
+    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
+    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
+    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
+    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
+    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
+    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
+    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
+    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
+    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
+    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
+    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
+    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
+    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
+    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
+    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
+    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
+    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
+    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
+    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
+    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
+    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
+    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
+    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
+    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
+    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
+    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
+    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
+    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
+    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
+    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
+    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
+    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
+    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
+    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
+    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
+    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
+    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
+    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
+    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
+    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
+    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
+    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
+    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
+    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
+    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
+    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
+    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
+    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
+    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
+    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
+    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
+    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
+};
+static const u32 Te2[256] = {
+    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
+    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
+    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
+    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
+    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
+    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
+    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
+    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
+    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
+    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
+    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
+    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
+    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
+    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
+    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
+    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
+    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
+    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
+    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
+    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
+    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
+    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
+    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
+    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
+    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
+    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
+    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
+    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
+    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
+    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
+    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
+    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
+    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
+    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
+    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
+    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
+    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
+    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
+    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
+    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
+    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
+    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
+    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
+    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
+    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
+    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
+    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
+    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
+    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
+    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
+    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
+    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
+    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
+    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
+    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
+    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
+    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
+    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
+    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
+    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
+    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
+    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
+    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
+    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
+};
+static const u32 Te3[256] = {
+
+    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
+    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
+    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
+    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
+    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
+    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
+    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
+    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
+    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
+    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
+    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
+    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
+    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
+    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
+    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
+    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
+    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
+    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
+    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
+    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
+    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
+    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
+    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
+    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
+    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
+    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
+    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
+    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
+    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
+    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
+    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
+    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
+    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
+    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
+    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
+    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
+    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
+    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
+    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
+    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
+    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
+    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
+    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
+    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
+    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
+    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
+    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
+    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
+    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
+    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
+    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
+    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
+    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
+    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
+    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
+    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
+    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
+    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
+    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
+    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
+    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
+    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
+    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
+    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
+};
+static const u32 Te4[256] = {
+    0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
+    0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
+    0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
+    0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
+    0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
+    0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
+    0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
+    0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
+    0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
+    0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
+    0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
+    0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
+    0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
+    0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
+    0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
+    0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
+    0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
+    0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
+    0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
+    0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
+    0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
+    0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
+    0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
+    0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
+    0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
+    0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
+    0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
+    0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
+    0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
+    0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
+    0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
+    0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
+    0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
+    0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
+    0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
+    0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
+    0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
+    0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
+    0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
+    0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
+    0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
+    0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
+    0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
+    0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
+    0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
+    0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
+    0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
+    0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
+    0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
+    0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
+    0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
+    0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
+    0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
+    0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
+    0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
+    0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
+    0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
+    0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
+    0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
+    0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
+    0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
+    0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
+    0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
+    0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
+};
+#endif /* AES_SMALL_TABLES */
+static const u32 Td0[256] = {
+    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
+    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
+    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
+    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
+    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
+    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
+    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
+    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
+    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
+    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
+    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
+    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
+    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
+    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
+    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
+    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
+    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
+    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
+    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
+    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
+    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
+    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
+    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
+    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
+    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
+    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
+    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
+    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
+    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
+    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
+    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
+    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
+    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
+    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
+    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
+    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
+    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
+    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
+    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
+    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
+    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
+    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
+    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
+    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
+    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
+    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
+    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
+    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
+    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
+    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
+    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
+    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
+    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
+    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
+    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
+    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
+    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
+    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
+    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
+    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
+    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
+    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
+    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
+    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
+};
+#ifndef AES_SMALL_TABLES
+static const u32 Td1[256] = {
+    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
+    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
+    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
+    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
+    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
+    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
+    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
+    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
+    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
+    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
+    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
+    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
+    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
+    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
+    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
+    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
+    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
+    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
+    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
+    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
+    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
+    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
+    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
+    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
+    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
+    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
+    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
+    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
+    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
+    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
+    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
+    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
+    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
+    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
+    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
+    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
+    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
+    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
+    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
+    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
+    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
+    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
+    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
+    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
+    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
+    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
+    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
+    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
+    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
+    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
+    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
+    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
+    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
+    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
+    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
+    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
+    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
+    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
+    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
+    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
+    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
+    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
+    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
+    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
+};
+static const u32 Td2[256] = {
+    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
+    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
+    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
+    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
+    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
+    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
+    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
+    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
+    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
+    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
+    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
+    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
+    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
+    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
+    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
+    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
+    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
+    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
+    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
+    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
+
+    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
+    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
+    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
+    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
+    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
+    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
+    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
+    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
+    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
+    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
+    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
+    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
+    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
+    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
+    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
+    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
+    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
+    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
+    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
+    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
+    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
+    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
+    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
+    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
+    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
+    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
+    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
+    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
+    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
+    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
+    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
+    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
+    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
+    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
+    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
+    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
+    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
+    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
+    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
+    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
+    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
+    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
+    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
+    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
+};
+static const u32 Td3[256] = {
+    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
+    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
+    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
+    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
+    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
+    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
+    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
+    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
+    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
+    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
+    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
+    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
+    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
+    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
+    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
+    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
+    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
+    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
+    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
+    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
+    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
+    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
+    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
+    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
+    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
+    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
+    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
+    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
+    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
+    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
+    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
+    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
+    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
+    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
+    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
+    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
+    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
+    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
+    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
+    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
+    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
+    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
+    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
+    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
+    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
+    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
+    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
+    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
+    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
+    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
+    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
+    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
+    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
+    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
+    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
+    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
+    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
+    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
+    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
+    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
+    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
+    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
+    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
+    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
+};
+static const u32 Td4[256] = {
+    0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
+    0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
+    0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
+    0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
+    0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
+    0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
+    0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
+    0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
+    0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
+    0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
+    0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
+    0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
+    0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
+    0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
+    0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
+    0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
+    0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
+    0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
+    0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
+    0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
+    0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
+    0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
+    0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
+    0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
+    0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
+    0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
+    0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
+    0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
+    0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
+    0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
+    0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
+    0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
+    0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
+    0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
+    0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
+    0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
+    0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
+    0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
+    0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
+    0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
+    0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
+    0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
+    0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
+    0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
+    0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
+    0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
+    0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
+    0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
+    0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
+    0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
+    0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
+    0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
+    0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
+    0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
+    0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
+    0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
+    0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
+    0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
+    0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
+    0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
+    0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
+    0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
+    0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
+    0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
+};
+static const u32 rcon[] = {
+	0x01000000, 0x02000000, 0x04000000, 0x08000000,
+	0x10000000, 0x20000000, 0x40000000, 0x80000000,
+	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+};
+#else /* AES_SMALL_TABLES */
+static const u8 Td4s[256] = {
+    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
+    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
+    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
+    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
+    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
+    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
+    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
+    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
+    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
+    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
+    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
+    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
+    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
+    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
+    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
+    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
+    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
+    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
+    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
+    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
+    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
+    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
+    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
+    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
+    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
+    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
+    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
+    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
+    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
+    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
+    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
+    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
+};
+static const u8 rcons[] = {
+	0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36
+	/* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+};
+#endif /* AES_SMALL_TABLES */
+
+
+#ifndef AES_SMALL_TABLES
+
+#define RCON(i) rcon[(i)]
+
+#define TE0(i) Te0[((i) >> 24) & 0xff]
+#define TE1(i) Te1[((i) >> 16) & 0xff]
+#define TE2(i) Te2[((i) >> 8) & 0xff]
+#define TE3(i) Te3[(i) & 0xff]
+#define TE41(i) (Te4[((i) >> 24) & 0xff] & 0xff000000)
+#define TE42(i) (Te4[((i) >> 16) & 0xff] & 0x00ff0000)
+#define TE43(i) (Te4[((i) >> 8) & 0xff] & 0x0000ff00)
+#define TE44(i) (Te4[(i) & 0xff] & 0x000000ff)
+#define TE421(i) (Te4[((i) >> 16) & 0xff] & 0xff000000)
+#define TE432(i) (Te4[((i) >> 8) & 0xff] & 0x00ff0000)
+#define TE443(i) (Te4[(i) & 0xff] & 0x0000ff00)
+#define TE414(i) (Te4[((i) >> 24) & 0xff] & 0x000000ff)
+#define TE4(i) (Te4[(i)] & 0x000000ff)
+
+#define TD0(i) Td0[((i) >> 24) & 0xff]
+#define TD1(i) Td1[((i) >> 16) & 0xff]
+#define TD2(i) Td2[((i) >> 8) & 0xff]
+#define TD3(i) Td3[(i) & 0xff]
+#define TD41(i) (Td4[((i) >> 24) & 0xff] & 0xff000000)
+#define TD42(i) (Td4[((i) >> 16) & 0xff] & 0x00ff0000)
+#define TD43(i) (Td4[((i) >> 8) & 0xff] & 0x0000ff00)
+#define TD44(i) (Td4[(i) & 0xff] & 0x000000ff)
+#define TD0_(i) Td0[(i) & 0xff]
+#define TD1_(i) Td1[(i) & 0xff]
+#define TD2_(i) Td2[(i) & 0xff]
+#define TD3_(i) Td3[(i) & 0xff]
+
+#else /* AES_SMALL_TABLES */
+
+#define RCON(i) (rcons[(i)] << 24)
+
+static inline u32 rotr(u32 val, int bits)
+{
+	return (val >> bits) | (val << (32 - bits));
+}
+
+#define TE0(i) Te0[((i) >> 24) & 0xff]
+#define TE1(i) rotr(Te0[((i) >> 16) & 0xff], 8)
+#define TE2(i) rotr(Te0[((i) >> 8) & 0xff], 16)
+#define TE3(i) rotr(Te0[(i) & 0xff], 24)
+#define TE41(i) ((Te0[((i) >> 24) & 0xff] << 8) & 0xff000000)
+#define TE42(i) (Te0[((i) >> 16) & 0xff] & 0x00ff0000)
+#define TE43(i) (Te0[((i) >> 8) & 0xff] & 0x0000ff00)
+#define TE44(i) ((Te0[(i) & 0xff] >> 8) & 0x000000ff)
+#define TE421(i) ((Te0[((i) >> 16) & 0xff] << 8) & 0xff000000)
+#define TE432(i) (Te0[((i) >> 8) & 0xff] & 0x00ff0000)
+#define TE443(i) (Te0[(i) & 0xff] & 0x0000ff00)
+#define TE414(i) ((Te0[((i) >> 24) & 0xff] >> 8) & 0x000000ff)
+#define TE4(i) ((Te0[(i)] >> 8) & 0x000000ff)
+
+#define TD0(i) Td0[((i) >> 24) & 0xff]
+#define TD1(i) rotr(Td0[((i) >> 16) & 0xff], 8)
+#define TD2(i) rotr(Td0[((i) >> 8) & 0xff], 16)
+#define TD3(i) rotr(Td0[(i) & 0xff], 24)
+#define TD41(i) (Td4s[((i) >> 24) & 0xff] << 24)
+#define TD42(i) (Td4s[((i) >> 16) & 0xff] << 16)
+#define TD43(i) (Td4s[((i) >> 8) & 0xff] << 8)
+#define TD44(i) (Td4s[(i) & 0xff])
+#define TD0_(i) Td0[(i) & 0xff]
+#define TD1_(i) rotr(Td0[(i) & 0xff], 8)
+#define TD2_(i) rotr(Td0[(i) & 0xff], 16)
+#define TD3_(i) rotr(Td0[(i) & 0xff], 24)
+
+#endif /* AES_SMALL_TABLES */
+
+#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
+
+#ifdef _MSC_VER
+#define GETU32(p) SWAP(*((u32 *)(p)))
+#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
+#else
+#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ \
+((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
+#define PUTU32(ct, st) { \
+(ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); \
+(ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
+#endif
+
+/**
+ * Expand the cipher key into the encryption key schedule.
+ *
+ * @return	the number of rounds for the given cipher key size.
+ */
+static void rijndaelKeySetupEnc(u32 rk[/*44*/], const u8 cipherKey[])
+{
+	int i;
+	u32 temp;
+
+	rk[0] = GETU32(cipherKey     );
+	rk[1] = GETU32(cipherKey +  4);
+	rk[2] = GETU32(cipherKey +  8);
+	rk[3] = GETU32(cipherKey + 12);
+	for (i = 0; i < 10; i++) {
+		temp  = rk[3];
+		rk[4] = rk[0] ^
+			TE421(temp) ^ TE432(temp) ^ TE443(temp) ^ TE414(temp) ^
+			RCON(i);
+		rk[5] = rk[1] ^ rk[4];
+		rk[6] = rk[2] ^ rk[5];
+		rk[7] = rk[3] ^ rk[6];
+		rk += 4;
+	}
+}
+
+#ifndef CONFIG_NO_AES_DECRYPT
+/**
+ * Expand the cipher key into the decryption key schedule.
+ *
+ * @return	the number of rounds for the given cipher key size.
+ */
+static void rijndaelKeySetupDec(u32 rk[/*44*/], const u8 cipherKey[])
+{
+	int Nr = 10, i, j;
+	u32 temp;
+
+	/* expand the cipher key: */
+	rijndaelKeySetupEnc(rk, cipherKey);
+	/* invert the order of the round keys: */
+	for (i = 0, j = 4*Nr; i < j; i += 4, j -= 4) {
+		temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
+		temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
+		temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
+		temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+	}
+	/* apply the inverse MixColumn transform to all round keys but the
+	 * first and the last: */
+	for (i = 1; i < Nr; i++) {
+		rk += 4;
+		for (j = 0; j < 4; j++) {
+			rk[j] = TD0_(TE4((rk[j] >> 24)       )) ^
+				TD1_(TE4((rk[j] >> 16) & 0xff)) ^
+				TD2_(TE4((rk[j] >>  8) & 0xff)) ^
+				TD3_(TE4((rk[j]      ) & 0xff));
+		}
+	}
+}
+#endif /* CONFIG_NO_AES_DECRYPT */
+
+#ifndef CONFIG_NO_AES_ENCRYPT
+static void rijndaelEncrypt(const u32 rk[/*44*/], const u8 pt[16], u8 ct[16])
+{
+	u32 s0, s1, s2, s3, t0, t1, t2, t3;
+	const int Nr = 10;
+#ifndef FULL_UNROLL
+	int r;
+#endif /* ?FULL_UNROLL */
+
+	/*
+	 * map byte array block to cipher state
+	 * and add initial round key:
+	 */
+	s0 = GETU32(pt     ) ^ rk[0];
+	s1 = GETU32(pt +  4) ^ rk[1];
+	s2 = GETU32(pt +  8) ^ rk[2];
+	s3 = GETU32(pt + 12) ^ rk[3];
+
+#define ROUND(i,d,s) \
+d##0 = TE0(s##0) ^ TE1(s##1) ^ TE2(s##2) ^ TE3(s##3) ^ rk[4 * i]; \
+d##1 = TE0(s##1) ^ TE1(s##2) ^ TE2(s##3) ^ TE3(s##0) ^ rk[4 * i + 1]; \
+d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \
+d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]
+
+#ifdef FULL_UNROLL
+
+	ROUND(1,t,s);
+	ROUND(2,s,t);
+	ROUND(3,t,s);
+	ROUND(4,s,t);
+	ROUND(5,t,s);
+	ROUND(6,s,t);
+	ROUND(7,t,s);
+	ROUND(8,s,t);
+	ROUND(9,t,s);
+
+	rk += Nr << 2;
+
+#else  /* !FULL_UNROLL */
+
+	/* Nr - 1 full rounds: */
+	r = Nr >> 1;
+	for (;;) {
+		ROUND(1,t,s);
+		rk += 8;
+		if (--r == 0)
+			break;
+		ROUND(0,s,t);
+	}
+
+#endif /* ?FULL_UNROLL */
+
+#undef ROUND
+
+	/*
+	 * apply last round and
+	 * map cipher state to byte array block:
+	 */
+	s0 = TE41(t0) ^ TE42(t1) ^ TE43(t2) ^ TE44(t3) ^ rk[0];
+	PUTU32(ct     , s0);
+	s1 = TE41(t1) ^ TE42(t2) ^ TE43(t3) ^ TE44(t0) ^ rk[1];
+	PUTU32(ct +  4, s1);
+	s2 = TE41(t2) ^ TE42(t3) ^ TE43(t0) ^ TE44(t1) ^ rk[2];
+	PUTU32(ct +  8, s2);
+	s3 = TE41(t3) ^ TE42(t0) ^ TE43(t1) ^ TE44(t2) ^ rk[3];
+	PUTU32(ct + 12, s3);
+}
+#endif /* CONFIG_NO_AES_ENCRYPT */
+
+static void rijndaelDecrypt(const u32 rk[/*44*/], const u8 ct[16], u8 pt[16])
+{
+	u32 s0, s1, s2, s3, t0, t1, t2, t3;
+	const int Nr = 10;
+#ifndef FULL_UNROLL
+	int r;
+#endif /* ?FULL_UNROLL */
+
+	/*
+	 * map byte array block to cipher state
+	 * and add initial round key:
+	 */
+	s0 = GETU32(ct     ) ^ rk[0];
+	s1 = GETU32(ct +  4) ^ rk[1];
+	s2 = GETU32(ct +  8) ^ rk[2];
+	s3 = GETU32(ct + 12) ^ rk[3];
+
+#define ROUND(i,d,s) \
+d##0 = TD0(s##0) ^ TD1(s##3) ^ TD2(s##2) ^ TD3(s##1) ^ rk[4 * i]; \
+d##1 = TD0(s##1) ^ TD1(s##0) ^ TD2(s##3) ^ TD3(s##2) ^ rk[4 * i + 1]; \
+d##2 = TD0(s##2) ^ TD1(s##1) ^ TD2(s##0) ^ TD3(s##3) ^ rk[4 * i + 2]; \
+d##3 = TD0(s##3) ^ TD1(s##2) ^ TD2(s##1) ^ TD3(s##0) ^ rk[4 * i + 3]
+
+#ifdef FULL_UNROLL
+
+	ROUND(1,t,s);
+	ROUND(2,s,t);
+	ROUND(3,t,s);
+	ROUND(4,s,t);
+	ROUND(5,t,s);
+	ROUND(6,s,t);
+	ROUND(7,t,s);
+	ROUND(8,s,t);
+	ROUND(9,t,s);
+
+	rk += Nr << 2;
+
+#else  /* !FULL_UNROLL */
+
+	/* Nr - 1 full rounds: */
+	r = Nr >> 1;
+	for (;;) {
+		ROUND(1,t,s);
+		rk += 8;
+		if (--r == 0)
+			break;
+		ROUND(0,s,t);
+	}
+
+#endif /* ?FULL_UNROLL */
+
+#undef ROUND
+
+	/*
+	 * apply last round and
+	 * map cipher state to byte array block:
+	 */
+	s0 = TD41(t0) ^ TD42(t3) ^ TD43(t2) ^ TD44(t1) ^ rk[0];
+	PUTU32(pt     , s0);
+	s1 = TD41(t1) ^ TD42(t0) ^ TD43(t3) ^ TD44(t2) ^ rk[1];
+	PUTU32(pt +  4, s1);
+	s2 = TD41(t2) ^ TD42(t1) ^ TD43(t0) ^ TD44(t3) ^ rk[2];
+	PUTU32(pt +  8, s2);
+	s3 = TD41(t3) ^ TD42(t2) ^ TD43(t1) ^ TD44(t0) ^ rk[3];
+	PUTU32(pt + 12, s3);
+}
+
+#define AES_PRIV_SIZE 44
diff --git a/trunk/package/network/services/ead/src/ead-client.c b/trunk/package/network/services/ead/src/ead-client.c
new file mode 100644
index 00000000..6d7e07dd
--- /dev/null
+++ b/trunk/package/network/services/ead/src/ead-client.c
@@ -0,0 +1,433 @@
+/*
+ * Client for the Emergency Access Daemon
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <t_pwd.h>
+#include <t_read.h>
+#include <t_sha.h>
+#include <t_defines.h>
+#include <t_client.h>
+#include "ead.h"
+#include "ead-crypt.h"
+
+#include "pw_encrypt_md5.c"
+
+#define EAD_TIMEOUT	400
+#define EAD_TIMEOUT_LONG 2000
+
+static char msgbuf[1500];
+static struct ead_msg *msg = (struct ead_msg *) msgbuf;
+static uint16_t nid = 0xffff;
+struct sockaddr_in local, remote;
+static int s = 0;
+static int sockflags;
+static struct in_addr serverip = {
+	.s_addr = 0x01010101 /* dummy */
+};
+
+static unsigned char *skey = NULL;
+static unsigned char bbuf[MAXPARAMLEN];
+static unsigned char saltbuf[MAXSALTLEN];
+static char *username = NULL;
+static char password[MAXPARAMLEN] = "";
+static char pw_md5[MD5_OUT_BUFSIZE];
+static char pw_salt[MAXSALTLEN];
+
+static struct t_client *tc = NULL;
+static struct t_num salt = { .data = saltbuf };
+static struct t_num *A, B;
+static struct t_preconf *tcp;
+static int auth_type = EAD_AUTH_DEFAULT;
+static int timeout = EAD_TIMEOUT;
+static uint16_t sid = 0;
+
+static void
+set_nonblock(int enable)
+{
+	if (enable == !!(sockflags & O_NONBLOCK))
+		return;
+
+	sockflags ^= O_NONBLOCK;
+	fcntl(s, F_SETFL, sockflags);
+}
+
+static int
+send_packet(int type, bool (*handler)(void), unsigned int max)
+{
+	struct timeval tv;
+	fd_set fds;
+	int nfds;
+	int len;
+	int res = 0;
+
+	type = htonl(type);
+	memcpy(&msg->ip, &serverip.s_addr, sizeof(msg->ip));
+	set_nonblock(0);
+	sendto(s, msgbuf, sizeof(struct ead_msg) + ntohl(msg->len), 0, (struct sockaddr *) &remote, sizeof(remote));
+	set_nonblock(1);
+
+	tv.tv_sec = timeout / 1000;
+	tv.tv_usec = (timeout % 1000) * 1000;
+
+	FD_ZERO(&fds);
+	do {
+		FD_SET(s, &fds);
+		nfds = select(s + 1, &fds, NULL, NULL, &tv);
+
+		if (nfds <= 0)
+			break;
+
+		if (!FD_ISSET(s, &fds))
+			break;
+
+		len = read(s, msgbuf, sizeof(msgbuf));
+		if (len < 0)
+			break;
+
+		if (len < sizeof(struct ead_msg))
+			continue;
+
+		if (len < sizeof(struct ead_msg) + ntohl(msg->len))
+			continue;
+
+		if (msg->magic != htonl(EAD_MAGIC))
+			continue;
+
+		if ((nid != 0xffff) && (ntohs(msg->nid) != nid))
+			continue;
+
+		if (msg->type != type)
+			continue;
+
+		if (handler())
+			res++;
+
+		if ((max > 0) && (res >= max))
+			break;
+	} while (1);
+
+	return res;
+}
+
+static void
+prepare_password(void)
+{
+	switch(auth_type) {
+	case EAD_AUTH_DEFAULT:
+		break;
+	case EAD_AUTH_MD5:
+		md5_crypt(pw_md5, (unsigned char *) password, (unsigned char *) pw_salt);
+		strncpy(password, pw_md5, sizeof(password));
+		break;
+	}
+}
+
+static bool
+handle_pong(void)
+{
+	struct ead_msg_pong *pong = EAD_DATA(msg, pong);
+	int len = ntohl(msg->len) - sizeof(struct ead_msg_pong);
+
+	if (len <= 0)
+		return false;
+
+	pong->name[len] = 0;
+	auth_type = ntohs(pong->auth_type);
+	if (nid == 0xffff)
+		printf("%04x: %s\n", ntohs(msg->nid), pong->name);
+	sid = msg->sid;
+	return true;
+}
+
+static bool
+handle_prime(void)
+{
+	struct ead_msg_salt *sb = EAD_DATA(msg, salt);
+
+	salt.len = sb->len;
+	memcpy(salt.data, sb->salt, salt.len);
+
+	if (auth_type == EAD_AUTH_MD5) {
+		memcpy(pw_salt, sb->ext_salt, MAXSALTLEN);
+		pw_salt[MAXSALTLEN - 1] = 0;
+	}
+
+	tcp = t_getpreparam(sb->prime);
+	tc = t_clientopen(username, &tcp->modulus, &tcp->generator, &salt);
+	if (!tc) {
+		fprintf(stderr, "Client open failed\n");
+		return false;
+	}
+
+	return true;
+}
+
+static bool
+handle_b(void)
+{
+	struct ead_msg_number *num = EAD_DATA(msg, number);
+	int len = ntohl(msg->len) - sizeof(struct ead_msg_number);
+
+	B.data = bbuf;
+	B.len = len;
+	memcpy(bbuf, num->data, len);
+	return true;
+}
+
+static bool
+handle_none(void)
+{
+	return true;
+}
+
+static bool
+handle_done_auth(void)
+{
+	struct ead_msg_auth *auth = EAD_DATA(msg, auth);
+	if (t_clientverify(tc, auth->data) != 0) {
+		fprintf(stderr, "Client auth verify failed\n");
+		return false;
+	}
+	return true;
+}
+
+static bool
+handle_cmd_data(void)
+{
+	struct ead_msg_cmd_data *cmd = EAD_ENC_DATA(msg, cmd_data);
+	int datalen = ead_decrypt_message(msg) - sizeof(struct ead_msg_cmd_data);
+
+	if (datalen < 0)
+		return false;
+
+	if (datalen > 0) {
+		write(1, cmd->data, datalen);
+	}
+
+	return !!cmd->done;
+}
+static int
+send_ping(void)
+{
+	msg->type = htonl(EAD_TYPE_PING);
+	msg->len = 0;
+	return send_packet(EAD_TYPE_PONG, handle_pong, (nid == 0xffff ? 0 : 1));
+}
+
+static int
+send_username(void)
+{
+	msg->type = htonl(EAD_TYPE_SET_USERNAME);
+	msg->len = htonl(sizeof(struct ead_msg_user));
+	strcpy(EAD_DATA(msg, user)->username, username);
+	return send_packet(EAD_TYPE_ACK_USERNAME, handle_none, 1);
+}
+
+static int
+get_prime(void)
+{
+	msg->type = htonl(EAD_TYPE_GET_PRIME);
+	msg->len = 0;
+	return send_packet(EAD_TYPE_PRIME, handle_prime, 1);
+}
+
+static int
+send_a(void)
+{
+	struct ead_msg_number *num = EAD_DATA(msg, number);
+	A = t_clientgenexp(tc);
+	msg->type = htonl(EAD_TYPE_SEND_A);
+	msg->len = htonl(sizeof(struct ead_msg_number) + A->len);
+	memcpy(num->data, A->data, A->len);
+	return send_packet(EAD_TYPE_SEND_B, handle_b, 1);
+}
+
+static int
+send_auth(void)
+{
+	struct ead_msg_auth *auth = EAD_DATA(msg, auth);
+
+	prepare_password();
+	t_clientpasswd(tc, password);
+	skey = t_clientgetkey(tc, &B);
+	if (!skey)
+		return 0;
+
+	ead_set_key(skey);
+	msg->type = htonl(EAD_TYPE_SEND_AUTH);
+	msg->len = htonl(sizeof(struct ead_msg_auth));
+	memcpy(auth->data, t_clientresponse(tc), sizeof(auth->data));
+	return send_packet(EAD_TYPE_DONE_AUTH, handle_done_auth, 1);
+}
+
+static int
+send_command(const char *command)
+{
+	struct ead_msg_cmd *cmd = EAD_ENC_DATA(msg, cmd);
+
+	msg->type = htonl(EAD_TYPE_SEND_CMD);
+	cmd->type = htons(EAD_CMD_NORMAL);
+	cmd->timeout = htons(10);
+	strncpy((char *)cmd->data, command, 1024);
+	ead_encrypt_message(msg, sizeof(struct ead_msg_cmd) + strlen(command) + 1);
+	return send_packet(EAD_TYPE_RESULT_CMD, handle_cmd_data, 1);
+}
+
+
+static int
+usage(const char *prog)
+{
+	fprintf(stderr, "Usage: %s [-s <addr>] [-b <addr>] <node> <username>[:<password>] <command>\n"
+		"\n"
+		"\t-s <addr>:  Set the server's source address to <addr>\n"
+		"\t-b <addr>:  Set the broadcast address to <addr>\n"
+		"\t<node>:     Node ID (4 digits hex)\n"
+		"\t<username>: Username to authenticate with\n"
+		"\n"
+		"\tPassing no arguments shows a list of active nodes on the network\n"
+		"\n", prog);
+	return -1;
+}
+
+
+int main(int argc, char **argv)
+{
+	int val = 1;
+	char *st = NULL;
+	const char *command = NULL;
+	const char *prog = argv[0];
+	int ch;
+
+	msg->magic = htonl(EAD_MAGIC);
+	msg->sid = 0;
+
+	memset(&local, 0, sizeof(local));
+	memset(&remote, 0, sizeof(remote));
+
+	remote.sin_family = AF_INET;
+	remote.sin_addr.s_addr = 0xffffffff;
+	remote.sin_port = htons(EAD_PORT);
+
+	local.sin_family = AF_INET;
+	local.sin_addr.s_addr = INADDR_ANY;
+	local.sin_port = 0;
+
+	while ((ch = getopt(argc, argv, "b:s:h")) != -1) {
+		switch(ch) {
+		case 's':
+			inet_aton(optarg, &serverip);
+			break;
+		case 'b':
+			inet_aton(optarg, &remote.sin_addr);
+			break;
+		case 'h':
+			return usage(prog);
+		}
+	}
+	argv += optind;
+	argc -= optind;
+
+	switch(argc) {
+	case 3:
+		command = argv[2];
+		/* fall through */
+	case 2:
+		username = argv[1];
+		st = strchr(username, ':');
+		if (st) {
+			*st = 0;
+			st++;
+			strncpy(password, st, sizeof(password));
+			password[sizeof(password) - 1] = 0;
+			/* hide command line password */
+			memset(st, 0, strlen(st));
+		}
+		/* fall through */
+	case 1:
+		nid = strtoul(argv[0], &st, 16);
+		if (st && st[0] != 0)
+			return usage(prog);
+		/* fall through */
+	case 0:
+		break;
+	default:
+		return usage(prog);
+	}
+
+	msg->nid = htons(nid);
+	s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	if (s < 0) {
+		perror("socket");
+		return -1;
+	}
+
+	setsockopt(s, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val));
+
+	if (bind(s, (struct sockaddr *)&local, sizeof(local)) < 0) {
+		perror("bind");
+		return -1;
+	}
+	sockflags = fcntl(s, F_GETFL);
+
+	if (!send_ping()) {
+		fprintf(stderr, "No devices found\n");
+		return 1;
+	}
+
+	if (nid == 0xffff)
+		return 0;
+
+	if (!username || !password[0])
+		return 0;
+
+	if (!send_username()) {
+		fprintf(stderr, "Device did not accept user name\n");
+		return 1;
+	}
+	timeout = EAD_TIMEOUT_LONG;
+	if (!get_prime()) {
+		fprintf(stderr, "Failed to get user password info\n");
+		return 1;
+	}
+	if (!send_a()) {
+		fprintf(stderr, "Failed to send local authentication data\n");
+		return 1;
+	}
+	if (!send_auth()) {
+		fprintf(stderr, "Authentication failed\n");
+		return 1;
+	}
+	if (!command) {
+		fprintf(stderr, "Authentication succesful\n");
+		return 0;
+	}
+	if (!send_command(command)) {
+		fprintf(stderr, "Command failed\n");
+		return 1;
+	}
+
+	return 0;
+}
diff --git a/trunk/package/network/services/ead/src/ead-crypt.c b/trunk/package/network/services/ead/src/ead-crypt.c
new file mode 100644
index 00000000..03721721
--- /dev/null
+++ b/trunk/package/network/services/ead/src/ead-crypt.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include "ead.h"
+
+#include "sha1.c"
+#include "aes.c"
+
+#if EAD_DEBUGLEVEL >= 1
+#define DEBUG(n, format, ...) do { \
+	if (EAD_DEBUGLEVEL >= n) \
+		fprintf(stderr, format, ##__VA_ARGS__); \
+} while (0);
+
+#else
+#define DEBUG(n, format, ...) do {} while(0)
+#endif
+
+
+static uint32_t aes_enc_ctx[AES_PRIV_SIZE];
+static uint32_t aes_dec_ctx[AES_PRIV_SIZE];
+static uint32_t ead_rx_iv;
+static uint32_t ead_tx_iv;
+static uint32_t ivofs_vec;
+static unsigned int ivofs_idx = 0;
+static uint32_t W[80]; /* work space for sha1 */
+
+#define EAD_ENC_PAD	64
+
+void
+ead_set_key(unsigned char *skey)
+{
+	uint32_t *ivp = (uint32_t *)skey;
+
+	memset(aes_enc_ctx, 0, sizeof(aes_enc_ctx));
+	memset(aes_dec_ctx, 0, sizeof(aes_dec_ctx));
+
+	/* first 32 bytes of skey are used as aes key for
+	 * encryption and decryption */
+	rijndaelKeySetupEnc(aes_enc_ctx, skey);
+	rijndaelKeySetupDec(aes_dec_ctx, skey);
+
+	/* the following bytes are used as initialization vector for messages
+	 * (highest byte cleared to avoid overflow) */
+	ivp += 8;
+	ead_rx_iv = ntohl(*ivp) & 0x00ffffff;
+	ead_tx_iv = ead_rx_iv;
+
+	/* the last bytes are used to feed the random iv increment */
+	ivp++;
+	ivofs_vec = *ivp;
+}
+
+
+static bool
+ead_check_rx_iv(uint32_t iv)
+{
+	if (iv <= ead_rx_iv)
+		return false;
+
+	if (iv > ead_rx_iv + EAD_MAX_IV_INCR)
+		return false;
+
+	ead_rx_iv = iv;
+	return true;
+}
+
+
+static uint32_t
+ead_get_tx_iv(void)
+{
+	unsigned int ofs;
+
+	ofs = 1 + ((ivofs_vec >> 2 * ivofs_idx) & 0x3);
+	ivofs_idx = (ivofs_idx + 1) % 16;
+	ead_tx_iv += ofs;
+
+	return ead_tx_iv;
+}
+
+static void
+ead_hash_message(struct ead_msg_encrypted *enc, uint32_t *hash, int len)
+{
+	unsigned char *data = (unsigned char *) enc;
+
+	/* hash the packet with the stored hash part initialized to zero */
+	sha_init(hash);
+	memset(enc->hash, 0, sizeof(enc->hash));
+	while (len > 0) {
+		sha_transform(hash, data, W);
+		len -= 64;
+		data += 64;
+	}
+}
+
+void
+ead_encrypt_message(struct ead_msg *msg, unsigned int len)
+{
+	struct ead_msg_encrypted *enc = EAD_DATA(msg, enc);
+	unsigned char *data = (unsigned char *) enc;
+	uint32_t hash[5];
+	int enclen, i;
+
+	len += sizeof(struct ead_msg_encrypted);
+	enc->pad = (EAD_ENC_PAD - (len % EAD_ENC_PAD)) % EAD_ENC_PAD;
+	enclen = len + enc->pad;
+	msg->len = htonl(enclen);
+	enc->iv = htonl(ead_get_tx_iv());
+
+	ead_hash_message(enc, hash, enclen);
+	for (i = 0; i < 5; i++)
+		enc->hash[i] = htonl(hash[i]);
+	DEBUG(2, "SHA1 generate (0x%08x), len=%d\n", enc->hash[0], enclen);
+
+	while (enclen > 0) {
+		rijndaelEncrypt(aes_enc_ctx, data, data);
+		data += 16;
+		enclen -= 16;
+	}
+}
+
+int
+ead_decrypt_message(struct ead_msg *msg)
+{
+	struct ead_msg_encrypted *enc = EAD_DATA(msg, enc);
+	unsigned char *data = (unsigned char *) enc;
+	uint32_t hash_old[5], hash_new[5];
+	int len = ntohl(msg->len);
+	int i, enclen = len;
+
+	if (!len || (len % EAD_ENC_PAD > 0))
+		return 0;
+
+	while (len > 0) {
+		rijndaelDecrypt(aes_dec_ctx, data, data);
+		data += 16;
+		len -= 16;
+	}
+
+	data = (unsigned char *) enc;
+
+	if (enc->pad >= EAD_ENC_PAD) {
+		DEBUG(2, "Invalid padding length\n");
+		return 0;
+	}
+
+	if (!ead_check_rx_iv(ntohl(enc->iv))) {
+		DEBUG(2, "RX IV mismatch (0x%08x <> 0x%08x)\n", ead_rx_iv, ntohl(enc->iv));
+		return 0;
+	}
+
+	for (i = 0; i < 5; i++)
+		hash_old[i] = ntohl(enc->hash[i]);
+	ead_hash_message(enc, hash_new, enclen);
+	if (memcmp(hash_old, hash_new, sizeof(hash_old)) != 0) {
+		DEBUG(2, "SHA1 mismatch (0x%08x != 0x%08x), len=%d\n", hash_old[0], hash_new[0], enclen);
+		return 0;
+	}
+
+	enclen -= enc->pad + sizeof(struct ead_msg_encrypted);
+	return enclen;
+}
diff --git a/trunk/package/network/services/ead/src/ead-crypt.h b/trunk/package/network/services/ead/src/ead-crypt.h
new file mode 100644
index 00000000..831ec8a2
--- /dev/null
+++ b/trunk/package/network/services/ead/src/ead-crypt.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#ifndef __EAD_CRYPT_H
+#define __EAD_CRYPT_H
+
+extern void ead_set_key(unsigned char *skey);
+extern void ead_encrypt_message(struct ead_msg *msg, unsigned int len);
+extern int ead_decrypt_message(struct ead_msg *msg);
+
+#endif
diff --git a/trunk/package/network/services/ead/src/ead-pcap.h b/trunk/package/network/services/ead/src/ead-pcap.h
new file mode 100644
index 00000000..0652ab48
--- /dev/null
+++ b/trunk/package/network/services/ead/src/ead-pcap.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2001-2003, Adam Dunkels.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This file was part of the uIP TCP/IP stack.
+ *
+ */
+#ifndef __EAD_PCAP_H
+#define __EAD_PCAP_H
+
+#include <net/ethernet.h>
+#include <stdint.h>
+#include "ead.h"
+
+typedef uint8_t u8_t;
+typedef uint16_t u16_t;
+
+/* The UDP and IP headers. */
+struct ead_packet {
+  struct ether_header eh;
+  /* IP header. */
+  u8_t vhl,
+    tos,
+    len[2],
+    ipid[2],
+    ipoffset[2],
+    ttl,
+    proto;
+  u16_t ipchksum;
+  u16_t srcipaddr[2],
+    destipaddr[2];
+
+  /* UDP header. */
+  u16_t srcport,
+    destport;
+  u16_t udplen;
+  u16_t udpchksum;
+
+  struct ead_msg msg;
+} __attribute__((packed));
+
+#define UIP_PROTO_UDP  17
+#define UIP_IPH_LEN    20    /* Size of IP header */
+#define UIP_UDPH_LEN   8    /* Size of UDP header */
+#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + UIP_IPH_LEN)
+
+#endif
diff --git a/trunk/package/network/services/ead/src/ead.c b/trunk/package/network/services/ead/src/ead.c
new file mode 100644
index 00000000..d1847c1b
--- /dev/null
+++ b/trunk/package/network/services/ead/src/ead.c
@@ -0,0 +1,991 @@
+/*
+ * Emergency Access Daemon
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/select.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <pcap.h>
+#include <pcap-bpf.h>
+#include <t_pwd.h>
+#include <t_read.h>
+#include <t_sha.h>
+#include <t_defines.h>
+#include <t_server.h>
+
+#include "list.h"
+#include "ead.h"
+#include "ead-pcap.h"
+#include "ead-crypt.h"
+
+#include "filter.c"
+
+#ifdef linux
+#include "libbridge_init.c"
+#endif
+
+#ifdef linux
+#include <linux/if_packet.h>
+#endif
+
+#define PASSWD_FILE	"/etc/passwd"
+
+#ifndef DEFAULT_IFNAME
+#define DEFAULT_IFNAME "eth0"
+#endif
+
+#ifndef DEFAULT_DEVNAME
+#define DEFAULT_DEVNAME "Unknown"
+#endif
+
+#define PCAP_MRU		1600
+#define PCAP_TIMEOUT	200
+
+#if EAD_DEBUGLEVEL >= 1
+#define DEBUG(n, format, ...) do { \
+	if (EAD_DEBUGLEVEL >= n) \
+		fprintf(stderr, format, ##__VA_ARGS__); \
+} while (0);
+
+#else
+#define DEBUG(n, format, ...) do {} while(0)
+#endif
+
+struct ead_instance {
+	struct list_head list;
+	char ifname[16];
+	int pid;
+	char id;
+#ifdef linux
+	char bridge[16];
+	bool br_check;
+#endif
+};
+
+static char ethmac[6] = "\x00\x13\x37\x00\x00\x00"; /* last 3 bytes will be randomized */
+static pcap_t *pcap_fp = NULL;
+static pcap_t *pcap_fp_rx = NULL;
+static char pktbuf_b[PCAP_MRU];
+static struct ead_packet *pktbuf = (struct ead_packet *)pktbuf_b;
+static u16_t nid = 0xffff; /* node id */
+static char username[32] = "";
+static int state = EAD_TYPE_SET_USERNAME;
+static const char *passwd_file = PASSWD_FILE;
+static const char password[MAXPARAMLEN];
+static bool child_pending = false;
+
+static unsigned char abuf[MAXPARAMLEN + 1];
+static unsigned char pwbuf[MAXPARAMLEN];
+static unsigned char saltbuf[MAXSALTLEN];
+static unsigned char pw_saltbuf[MAXSALTLEN];
+static struct list_head instances;
+static const char *dev_name = DEFAULT_DEVNAME;
+static bool nonfork = false;
+static struct ead_instance *instance = NULL;
+
+static struct t_pwent tpe = {
+	.name = username,
+	.index = 1,
+	.password.data = pwbuf,
+	.password.len = 0,
+	.salt.data = saltbuf,
+	.salt.len = 0,
+};
+struct t_confent *tce = NULL;
+static struct t_server *ts = NULL;
+static struct t_num A, *B = NULL;
+unsigned char *skey;
+
+static void
+set_recv_type(pcap_t *p, bool rx)
+{
+#ifdef PACKET_RECV_TYPE
+	struct sockaddr_ll sll;
+	struct ifreq ifr;
+	int mask;
+	int fd;
+
+	fd = pcap_get_selectable_fd(p);
+	if (fd < 0)
+		return;
+
+	if (rx)
+		mask = 1 << PACKET_BROADCAST;
+	else
+		mask = 0;
+
+	setsockopt(fd, SOL_PACKET, PACKET_RECV_TYPE, &mask, sizeof(mask));
+#endif
+}
+
+
+static pcap_t *
+ead_open_pcap(const char *ifname, char *errbuf, bool rx)
+{
+	pcap_t *p;
+
+	p = pcap_create(ifname, errbuf);
+	if (p == NULL)
+		goto out;
+
+	pcap_set_snaplen(p, PCAP_MRU);
+	pcap_set_promisc(p, rx);
+	pcap_set_timeout(p, PCAP_TIMEOUT);
+#ifdef HAS_PROTO_EXTENSION
+	pcap_set_protocol(p, (rx ? htons(ETH_P_IP) : 0));
+#endif
+	pcap_set_buffer_size(p, (rx ? 10 : 1) * PCAP_MRU);
+	pcap_activate(p);
+	set_recv_type(p, rx);
+out:
+	return p;
+}
+
+static void
+get_random_bytes(void *ptr, int len)
+{
+	int fd;
+
+	fd = open("/dev/urandom", O_RDONLY);
+	if (fd < 0) {
+		perror("open");
+		exit(1);
+	}
+	read(fd, ptr, len);
+	close(fd);
+}
+
+static bool
+prepare_password(void)
+{
+	static char lbuf[1024];
+	unsigned char dig[SHA_DIGESTSIZE];
+	BigInteger x, v, n, g;
+	SHA1_CTX ctxt;
+	int ulen = strlen(username);
+	FILE *f;
+
+	lbuf[sizeof(lbuf) - 1] = 0;
+
+	f = fopen(passwd_file, "r");
+	if (!f)
+		return false;
+
+	while (fgets(lbuf, sizeof(lbuf) - 1, f) != NULL) {
+		char *str, *s2;
+
+		if (strncmp(lbuf, username, ulen) != 0)
+			continue;
+
+		if (lbuf[ulen] != ':')
+			continue;
+
+		str = &lbuf[ulen + 1];
+
+		if (strncmp(str, "$1$", 3) != 0)
+			continue;
+
+		s2 = strchr(str + 3, '$');
+		if (!s2)
+			continue;
+
+		if (s2 - str >= MAXSALTLEN)
+			continue;
+
+		strncpy((char *) pw_saltbuf, str, s2 - str);
+		pw_saltbuf[s2 - str] = 0;
+
+		s2 = strchr(s2, ':');
+		if (!s2)
+			continue;
+
+		*s2 = 0;
+		if (s2 - str >= MAXPARAMLEN)
+			continue;
+
+		strncpy((char *)password, str, MAXPARAMLEN);
+		fclose(f);
+		goto hash_password;
+	}
+
+	/* not found */
+	fclose(f);
+	return false;
+
+hash_password:
+	tce = gettcid(tpe.index);
+	do {
+		t_random(tpe.password.data, SALTLEN);
+	} while (memcmp(saltbuf, (char *)dig, sizeof(saltbuf)) == 0);
+	if (saltbuf[0] == 0)
+		saltbuf[0] = 0xff;
+
+	n = BigIntegerFromBytes(tce->modulus.data, tce->modulus.len);
+	g = BigIntegerFromBytes(tce->generator.data, tce->generator.len);
+	v = BigIntegerFromInt(0);
+
+	SHA1Init(&ctxt);
+	SHA1Update(&ctxt, (unsigned char *) username, strlen(username));
+	SHA1Update(&ctxt, (unsigned char *) ":", 1);
+	SHA1Update(&ctxt, (unsigned char *) password, strlen(password));
+	SHA1Final(dig, &ctxt);
+
+	SHA1Init(&ctxt);
+	SHA1Update(&ctxt, saltbuf, tpe.salt.len);
+	SHA1Update(&ctxt, dig, sizeof(dig));
+	SHA1Final(dig, &ctxt);
+
+	/* x = H(s, H(u, ':', p)) */
+	x = BigIntegerFromBytes(dig, sizeof(dig));
+
+	BigIntegerModExp(v, g, x, n);
+	tpe.password.len = BigIntegerToBytes(v, (unsigned char *)pwbuf);
+
+	BigIntegerFree(v);
+	BigIntegerFree(x);
+	BigIntegerFree(g);
+	BigIntegerFree(n);
+	return true;
+}
+
+static u16_t
+chksum(u16_t sum, const u8_t *data, u16_t len)
+{
+	u16_t t;
+	const u8_t *dataptr;
+	const u8_t *last_byte;
+
+	dataptr = data;
+	last_byte = data + len - 1;
+
+	while(dataptr < last_byte) {	/* At least two more bytes */
+		t = (dataptr[0] << 8) + dataptr[1];
+		sum += t;
+		if(sum < t) {
+			sum++;		/* carry */
+		}
+		dataptr += 2;
+	}
+
+	if(dataptr == last_byte) {
+		t = (dataptr[0] << 8) + 0;
+		sum += t;
+		if(sum < t) {
+			sum++;		/* carry */
+		}
+	}
+
+	/* Return sum in host byte order. */
+	return sum;
+}
+
+static void
+ead_send_packet_clone(struct ead_packet *pkt)
+{
+	u16_t len, sum;
+
+	memcpy(pktbuf, pkt, offsetof(struct ead_packet, msg));
+	memcpy(pktbuf->eh.ether_shost, ethmac, 6);
+	memcpy(pktbuf->eh.ether_dhost, pkt->eh.ether_shost, 6);
+
+	/* ip header */
+	len = sizeof(struct ead_packet) - sizeof(struct ether_header) + ntohl(pktbuf->msg.len);
+	pktbuf->len[0] = len >> 8;
+	pktbuf->len[1] = len & 0xff;
+	memcpy(pktbuf->srcipaddr, &pkt->msg.ip, 4);
+	memcpy(pktbuf->destipaddr, pkt->srcipaddr, 4);
+
+	/* ip checksum */
+	pktbuf->ipchksum = 0;
+	sum = chksum(0, (void *) &pktbuf->vhl, UIP_IPH_LEN);
+	if (sum == 0)
+		sum = 0xffff;
+	pktbuf->ipchksum = htons(~sum);
+
+	/* udp header */
+	pktbuf->srcport = pkt->destport;
+	pktbuf->destport = pkt->srcport;
+
+	/* udp checksum */
+	len -= UIP_IPH_LEN;
+	pktbuf->udplen = htons(len);
+	pktbuf->udpchksum = 0;
+	sum = len + UIP_PROTO_UDP;
+	sum = chksum(sum, (void *) &pktbuf->srcipaddr[0], 8); /* src, dest ip */
+	sum = chksum(sum, (void *) &pktbuf->srcport, len);
+	if (sum == 0)
+		sum = 0xffff;
+	pktbuf->udpchksum = htons(~sum);
+	pcap_sendpacket(pcap_fp, (void *) pktbuf, sizeof(struct ead_packet) + ntohl(pktbuf->msg.len));
+}
+
+static void
+set_state(int nstate)
+{
+	if (state == nstate)
+		return;
+
+	if (nstate < state) {
+		if ((nstate < EAD_TYPE_GET_PRIME) &&
+			(state >= EAD_TYPE_GET_PRIME)) {
+			t_serverclose(ts);
+			ts = NULL;
+		}
+		goto done;
+	}
+
+	switch(state) {
+	case EAD_TYPE_SET_USERNAME:
+		if (!prepare_password())
+			goto error;
+		ts = t_serveropenraw(&tpe, tce);
+		if (!ts)
+			goto error;
+		break;
+	case EAD_TYPE_GET_PRIME:
+		B = t_servergenexp(ts);
+		break;
+	case EAD_TYPE_SEND_A:
+		skey = t_servergetkey(ts, &A);
+		if (!skey)
+			goto error;
+
+		ead_set_key(skey);
+		break;
+	}
+done:
+	state = nstate;
+error:
+	return;
+}
+
+static bool
+handle_ping(struct ead_packet *pkt, int len, int *nstate)
+{
+	struct ead_msg *msg = &pktbuf->msg;
+	struct ead_msg_pong *pong = EAD_DATA(msg, pong);
+	int slen;
+
+	slen = strlen(dev_name);
+	if (slen > 1024)
+		slen = 1024;
+
+	msg->len = htonl(sizeof(struct ead_msg_pong) + slen);
+	strncpy(pong->name, dev_name, slen);
+	pong->name[slen] = 0;
+	pong->auth_type = htons(EAD_AUTH_MD5);
+
+	return true;
+}
+
+static bool
+handle_set_username(struct ead_packet *pkt, int len, int *nstate)
+{
+	struct ead_msg *msg = &pkt->msg;
+	struct ead_msg_user *user = EAD_DATA(msg, user);
+
+	set_state(EAD_TYPE_SET_USERNAME); /* clear old state */
+	strncpy(username, user->username, sizeof(username));
+	username[sizeof(username) - 1] = 0;
+
+	msg = &pktbuf->msg;
+	msg->len = 0;
+
+	*nstate = EAD_TYPE_GET_PRIME;
+	return true;
+}
+
+static bool
+handle_get_prime(struct ead_packet *pkt, int len, int *nstate)
+{
+	struct ead_msg *msg = &pktbuf->msg;
+	struct ead_msg_salt *salt = EAD_DATA(msg, salt);
+
+	msg->len = htonl(sizeof(struct ead_msg_salt));
+	salt->prime = tce->index - 1;
+	salt->len = ts->s.len;
+	memcpy(salt->salt, ts->s.data, ts->s.len);
+	memcpy(salt->ext_salt, pw_saltbuf, MAXSALTLEN);
+
+	*nstate = EAD_TYPE_SEND_A;
+	return true;
+}
+
+static bool
+handle_send_a(struct ead_packet *pkt, int len, int *nstate)
+{
+	struct ead_msg *msg = &pkt->msg;
+	struct ead_msg_number *number = EAD_DATA(msg, number);
+	len = ntohl(msg->len) - sizeof(struct ead_msg_number);
+
+	if (len > MAXPARAMLEN + 1)
+		return false;
+
+	A.len = len;
+	A.data = abuf;
+	memcpy(A.data, number->data, len);
+
+	msg = &pktbuf->msg;
+	number = EAD_DATA(msg, number);
+	msg->len = htonl(sizeof(struct ead_msg_number) + B->len);
+	memcpy(number->data, B->data, B->len);
+
+	*nstate = EAD_TYPE_SEND_AUTH;
+	return true;
+}
+
+static bool
+handle_send_auth(struct ead_packet *pkt, int len, int *nstate)
+{
+	struct ead_msg *msg = &pkt->msg;
+	struct ead_msg_auth *auth = EAD_DATA(msg, auth);
+
+	if (t_serververify(ts, auth->data) != 0) {
+		DEBUG(2, "Client authentication failed\n");
+		*nstate = EAD_TYPE_SET_USERNAME;
+		return false;
+	}
+
+	msg = &pktbuf->msg;
+	auth = EAD_DATA(msg, auth);
+	msg->len = htonl(sizeof(struct ead_msg_auth));
+
+	DEBUG(2, "Client authentication successful\n");
+	memcpy(auth->data, t_serverresponse(ts), sizeof(auth->data));
+
+	*nstate = EAD_TYPE_SEND_CMD;
+	return true;
+}
+
+static bool
+handle_send_cmd(struct ead_packet *pkt, int len, int *nstate)
+{
+	struct ead_msg *msg = &pkt->msg;
+	struct ead_msg_cmd *cmd = EAD_ENC_DATA(msg, cmd);
+	struct ead_msg_cmd_data *cmddata;
+	struct timeval tv, to, tn;
+	int pfd[2], fd;
+	fd_set fds;
+	pid_t pid;
+	bool stream = false;
+	int timeout;
+	int type;
+	int datalen;
+
+	datalen = ead_decrypt_message(msg) - sizeof(struct ead_msg_cmd);
+	if (datalen <= 0)
+		return false;
+
+	type = ntohs(cmd->type);
+	timeout = ntohs(cmd->timeout);
+
+	FD_ZERO(&fds);
+	cmd->data[datalen] = 0;
+	switch(type) {
+	case EAD_CMD_NORMAL:
+		if (pipe(pfd) < 0)
+			return false;
+
+		fcntl(pfd[0], F_SETFL, O_NONBLOCK | fcntl(pfd[0], F_GETFL));
+		child_pending = true;
+		pid = fork();
+		if (pid == 0) {
+			close(pfd[0]);
+			fd = open("/dev/null", O_RDWR);
+			if (fd > 0) {
+				dup2(fd, 0);
+				dup2(pfd[1], 1);
+				dup2(pfd[1], 2);
+			}
+			system((char *)cmd->data);
+			exit(0);
+		} else if (pid > 0) {
+			close(pfd[1]);
+			if (!timeout)
+				timeout = EAD_CMD_TIMEOUT;
+
+			stream = true;
+			break;
+		}
+		return false;
+	case EAD_CMD_BACKGROUND:
+		pid = fork();
+		if (pid == 0) {
+			/* close stdin, stdout, stderr, replace with fd to /dev/null */
+			fd = open("/dev/null", O_RDWR);
+			if (fd > 0) {
+				dup2(fd, 0);
+				dup2(fd, 1);
+				dup2(fd, 2);
+			}
+			system((char *)cmd->data);
+			exit(0);
+		} else if (pid > 0) {
+			break;
+		}
+		return false;
+	default:
+		return false;
+	}
+
+	msg = &pktbuf->msg;
+	cmddata = EAD_ENC_DATA(msg, cmd_data);
+
+	if (stream) {
+		int nfds, bytes;
+
+		/* send keepalive packets every 200 ms so that the client doesn't timeout */
+		gettimeofday(&to, NULL);
+		memcpy(&tn, &to, sizeof(tn));
+		tv.tv_usec = PCAP_TIMEOUT * 1000;
+		tv.tv_sec = 0;
+		do {
+			cmddata->done = 0;
+			FD_SET(pfd[0], &fds);
+			nfds = select(pfd[0] + 1, &fds, NULL, NULL, &tv);
+			bytes = 0;
+			if (nfds > 0) {
+				bytes = read(pfd[0], cmddata->data, 1024);
+				if (bytes < 0)
+					bytes = 0;
+			}
+			if (!bytes && !child_pending)
+				break;
+			DEBUG(3, "Sending %d bytes of console data, type=%d, timeout=%d\n", bytes, ntohl(msg->type), timeout);
+			ead_encrypt_message(msg, sizeof(struct ead_msg_cmd_data) + bytes);
+			ead_send_packet_clone(pkt);
+			gettimeofday(&tn, NULL);
+		} while (tn.tv_sec < to.tv_sec + timeout);
+		if (child_pending) {
+			kill(pid, SIGKILL);
+			return false;
+		}
+	}
+	cmddata->done = 1;
+	ead_encrypt_message(msg, sizeof(struct ead_msg_cmd_data));
+
+	return true;
+}
+
+
+
+static void
+parse_message(struct ead_packet *pkt, int len)
+{
+	bool (*handler)(struct ead_packet *pkt, int len, int *nstate);
+	int min_len = sizeof(struct ead_packet);
+	int nstate = state;
+	int type = ntohl(pkt->msg.type);
+
+	if ((type >= EAD_TYPE_GET_PRIME) &&
+		(state != type))
+		return;
+
+	if ((type != EAD_TYPE_PING) &&
+		((ntohs(pkt->msg.sid) & EAD_INSTANCE_MASK) >>
+		 EAD_INSTANCE_SHIFT) != instance->id)
+		return;
+
+	switch(type) {
+	case EAD_TYPE_PING:
+		handler = handle_ping;
+		break;
+	case EAD_TYPE_SET_USERNAME:
+		handler = handle_set_username;
+		min_len += sizeof(struct ead_msg_user);
+		break;
+	case EAD_TYPE_GET_PRIME:
+		handler = handle_get_prime;
+		break;
+	case EAD_TYPE_SEND_A:
+		handler = handle_send_a;
+		min_len += sizeof(struct ead_msg_number);
+		break;
+	case EAD_TYPE_SEND_AUTH:
+		handler = handle_send_auth;
+		min_len += sizeof(struct ead_msg_auth);
+		break;
+	case EAD_TYPE_SEND_CMD:
+		handler = handle_send_cmd;
+		min_len += sizeof(struct ead_msg_cmd) + sizeof(struct ead_msg_encrypted);
+		break;
+	default:
+		return;
+	}
+
+	if (len < min_len) {
+		DEBUG(2, "discarding packet: message too small\n");
+		return;
+	}
+
+	pktbuf->msg.magic = htonl(EAD_MAGIC);
+	pktbuf->msg.type = htonl(type + 1);
+	pktbuf->msg.nid = htons(nid);
+	pktbuf->msg.sid = pkt->msg.sid;
+	pktbuf->msg.len = 0;
+
+	if (handler(pkt, len, &nstate)) {
+		DEBUG(2, "sending response to packet type %d: %d\n", type + 1, ntohl(pktbuf->msg.len));
+		/* format response packet */
+		ead_send_packet_clone(pkt);
+	}
+	set_state(nstate);
+}
+
+static void
+handle_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *bytes)
+{
+	struct ead_packet *pkt = (struct ead_packet *) bytes;
+
+	if (h->len < sizeof(struct ead_packet))
+		return;
+
+	if (pkt->eh.ether_type != htons(ETHERTYPE_IP))
+		return;
+
+	if (memcmp(pkt->eh.ether_dhost, "\xff\xff\xff\xff\xff\xff", 6) != 0)
+		return;
+
+	if (pkt->proto != UIP_PROTO_UDP)
+		return;
+
+	if (pkt->destport != htons(EAD_PORT))
+		return;
+
+	if (pkt->msg.magic != htonl(EAD_MAGIC))
+		return;
+
+	if (h->len < sizeof(struct ead_packet) + ntohl(pkt->msg.len))
+		return;
+
+	if ((pkt->msg.nid != 0xffff) &&
+		(pkt->msg.nid != htons(nid)))
+		return;
+
+	parse_message(pkt, h->len);
+}
+
+static void
+ead_pcap_reopen(bool first)
+{
+	static char errbuf[PCAP_ERRBUF_SIZE] = "";
+
+	if (pcap_fp_rx && (pcap_fp_rx != pcap_fp))
+		pcap_close(pcap_fp_rx);
+
+	if (pcap_fp)
+		pcap_close(pcap_fp);
+
+	pcap_fp_rx = NULL;
+	do {
+#ifdef linux
+		if (instance->bridge[0]) {
+			pcap_fp_rx = ead_open_pcap(instance->bridge, errbuf, 1);
+			pcap_fp = ead_open_pcap(instance->ifname, errbuf, 0);
+		} else
+#endif
+		{
+			pcap_fp = ead_open_pcap(instance->ifname, errbuf, 1);
+		}
+
+		if (!pcap_fp_rx)
+			pcap_fp_rx = pcap_fp;
+		if (first && !pcap_fp) {
+			DEBUG(1, "WARNING: unable to open interface '%s'\n", instance->ifname);
+			first = false;
+		}
+		if (!pcap_fp)
+			sleep(1);
+	} while (!pcap_fp);
+	pcap_setfilter(pcap_fp_rx, &pktfilter);
+}
+
+
+static void
+ead_pktloop(void)
+{
+	while (1) {
+		if (pcap_dispatch(pcap_fp_rx, 1, handle_packet, NULL) < 0) {
+			ead_pcap_reopen(false);
+			continue;
+		}
+	}
+}
+
+
+static int
+usage(const char *prog)
+{
+	fprintf(stderr, "Usage: %s [<options>]\n"
+		"Options:\n"
+		"\t-B             Run in background mode\n"
+		"\t-d <device>    Set the device to listen on\n"
+		"\t-D <name>      Set the name of the device visible to clients\n"
+		"\t-p <file>      Set the password file for authenticating\n"
+		"\t-P <file>      Write a pidfile\n"
+		"\n", prog);
+	return -1;
+}
+
+static void
+server_handle_sigchld(int sig)
+{
+	struct ead_instance *in;
+	struct list_head *p;
+	int pid = 0;
+	wait(&pid);
+
+	list_for_each(p, &instances) {
+		in = list_entry(p, struct ead_instance, list);
+		if (pid != in->pid)
+			continue;
+
+		in->pid = 0;
+		break;
+	}
+}
+
+static void
+instance_handle_sigchld(int sig)
+{
+	int pid = 0;
+	wait(&pid);
+	child_pending = false;
+}
+
+static void
+start_server(struct ead_instance *i)
+{
+	if (!nonfork) {
+		i->pid = fork();
+		if (i->pid != 0) {
+			if (i->pid < 0)
+				i->pid = 0;
+			return;
+		}
+	}
+
+	instance = i;
+	signal(SIGCHLD, instance_handle_sigchld);
+	ead_pcap_reopen(true);
+	ead_pktloop();
+	pcap_close(pcap_fp);
+	if (pcap_fp_rx != pcap_fp)
+		pcap_close(pcap_fp_rx);
+
+	exit(0);
+}
+
+
+static void
+start_servers(bool restart)
+{
+	struct ead_instance *in;
+	struct list_head *p;
+
+	list_for_each(p, &instances) {
+		in = list_entry(p, struct ead_instance, list);
+		if (in->pid > 0)
+			continue;
+
+		sleep(1);
+		start_server(in);
+	}
+}
+
+static void
+stop_server(struct ead_instance *in, bool do_free)
+{
+	if (in->pid > 0)
+		kill(in->pid, SIGKILL);
+	in->pid = 0;
+	if (do_free) {
+		list_del(&in->list);
+		free(in);
+	}
+}
+
+static void
+server_handle_sigint(int sig)
+{
+	struct ead_instance *in;
+	struct list_head *p, *tmp;
+
+	list_for_each_safe(p, tmp, &instances) {
+		in = list_entry(p, struct ead_instance, list);
+		stop_server(in, true);
+	}
+	exit(1);
+}
+
+#ifdef linux
+static int
+check_bridge_port(const char *br, const char *port, void *arg)
+{
+	struct ead_instance *in;
+	struct list_head *p;
+
+	list_for_each(p, &instances) {
+		in = list_entry(p, struct ead_instance, list);
+
+		if (strcmp(in->ifname, port) != 0)
+			continue;
+
+		in->br_check = true;
+		if (strcmp(in->bridge, br) == 0)
+			break;
+
+		strncpy(in->bridge, br, sizeof(in->bridge));
+		DEBUG(2, "assigning port %s to bridge %s\n", in->ifname, in->bridge);
+		stop_server(in, false);
+	}
+	return 0;
+}
+
+static int
+check_bridge(const char *name, void *arg)
+{
+	br_foreach_port(name, check_bridge_port, arg);
+	return 0;
+}
+#endif
+
+static void
+check_all_interfaces(void)
+{
+#ifdef linux
+	struct ead_instance *in;
+	struct list_head *p;
+
+	br_foreach_bridge(check_bridge, NULL);
+
+	/* look for interfaces that are no longer part of a bridge */
+	list_for_each(p, &instances) {
+		in = list_entry(p, struct ead_instance, list);
+
+		if (in->br_check) {
+			in->br_check = false;
+		} else if (in->bridge[0]) {
+			DEBUG(2, "removing port %s from bridge %s\n", in->ifname, in->bridge);
+			in->bridge[0] = 0;
+			stop_server(in, false);
+		}
+	}
+#endif
+}
+
+
+int main(int argc, char **argv)
+{
+	struct ead_instance *in;
+	struct timeval tv;
+	const char *pidfile = NULL;
+	bool background = false;
+	int n_iface = 0;
+	int fd, ch;
+
+	if (argc == 1)
+		return usage(argv[0]);
+
+	INIT_LIST_HEAD(&instances);
+	while ((ch = getopt(argc, argv, "Bd:D:fhp:P:")) != -1) {
+		switch(ch) {
+		case 'B':
+			background = true;
+			break;
+		case 'f':
+			nonfork = true;
+			break;
+		case 'h':
+			return usage(argv[0]);
+		case 'd':
+			in = malloc(sizeof(struct ead_instance));
+			memset(in, 0, sizeof(struct ead_instance));
+			INIT_LIST_HEAD(&in->list);
+			strncpy(in->ifname, optarg, sizeof(in->ifname) - 1);
+			list_add(&in->list, &instances);
+			in->id = n_iface++;
+			break;
+		case 'D':
+			dev_name = optarg;
+			break;
+		case 'p':
+			passwd_file = optarg;
+			break;
+		case 'P':
+			pidfile = optarg;
+			break;
+		}
+	}
+	signal(SIGCHLD, server_handle_sigchld);
+	signal(SIGINT, server_handle_sigint);
+	signal(SIGTERM, server_handle_sigint);
+	signal(SIGKILL, server_handle_sigint);
+
+	if (!n_iface) {
+		fprintf(stderr, "Error: ead needs at least one interface\n");
+		return -1;
+	}
+
+	if (background) {
+		if (fork() > 0)
+			exit(0);
+
+		fd = open("/dev/null", O_RDWR);
+		dup2(fd, 0);
+		dup2(fd, 1);
+		dup2(fd, 2);
+	}
+
+	if (pidfile) {
+		char pid[8];
+		int len;
+
+		unlink(pidfile);
+		fd = open(pidfile, O_CREAT|O_WRONLY|O_EXCL, 0644);
+		if (fd > 0) {
+			len = sprintf(pid, "%d\n", getpid());
+			write(fd, pid, len);
+			close(fd);
+		}
+	}
+
+	/* randomize the mac address */
+	get_random_bytes(ethmac + 3, 3);
+	nid = *(((u16_t *) ethmac) + 2);
+
+	start_servers(false);
+#ifdef linux
+	br_init();
+#endif
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
+	while (1) {
+		check_all_interfaces();
+		start_servers(true);
+		sleep(1);
+	}
+#ifdef linux
+	br_shutdown();
+#endif
+
+	return 0;
+}
diff --git a/trunk/package/network/services/ead/src/ead.h b/trunk/package/network/services/ead/src/ead.h
new file mode 100644
index 00000000..54505ce2
--- /dev/null
+++ b/trunk/package/network/services/ead/src/ead.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#ifndef __EAD_H
+#define __EAD_H
+
+#define EAD_DEBUGLEVEL	1
+
+#include <stdint.h>
+#include <stddef.h>
+
+#ifndef MAXSALTLEN
+#define MAXSALTLEN 32
+#endif
+
+#define EAD_PORT	56026UL
+#define EAD_MAGIC	3671771902UL
+#define EAD_CMD_TIMEOUT	10
+
+#define EAD_MAX_IV_INCR	128
+
+/* request/response types */
+/* response id == request id + 1 */
+enum ead_type {
+	EAD_TYPE_PING,
+	EAD_TYPE_PONG,
+
+	EAD_TYPE_SET_USERNAME,
+	EAD_TYPE_ACK_USERNAME,
+
+	EAD_TYPE_GET_PRIME,
+	EAD_TYPE_PRIME,
+
+	EAD_TYPE_SEND_A,
+	EAD_TYPE_SEND_B,
+
+	EAD_TYPE_SEND_AUTH,
+	EAD_TYPE_DONE_AUTH,
+
+	EAD_TYPE_SEND_CMD,
+	EAD_TYPE_RESULT_CMD,
+
+	EAD_TYPE_LAST
+};
+
+enum ead_auth_type {
+	EAD_AUTH_DEFAULT,
+	EAD_AUTH_MD5
+};
+
+enum ead_cmd_type {
+	EAD_CMD_NORMAL,
+	EAD_CMD_BACKGROUND,
+	EAD_CMD_LAST
+};
+
+struct ead_msg_pong {
+	uint16_t auth_type;
+	char name[];
+} __attribute__((packed));
+
+struct ead_msg_number {
+	uint8_t id;
+	unsigned char data[];
+} __attribute__((packed));
+
+struct ead_msg_salt {
+	uint8_t prime;
+	uint8_t len;
+	unsigned char salt[MAXSALTLEN];
+	unsigned char ext_salt[MAXSALTLEN];
+} __attribute__((packed));
+
+struct ead_msg_user {
+	char username[32];
+} __attribute__((packed));
+
+struct ead_msg_auth {
+	unsigned char data[20];
+} __attribute__((packed));
+
+struct ead_msg_cmd {
+	uint8_t type;
+	uint16_t timeout;
+	unsigned char data[];
+} __attribute__((packed));
+
+struct ead_msg_cmd_data {
+	uint8_t done;
+	unsigned char data[];
+} __attribute__((packed));
+
+struct ead_msg_encrypted {
+	uint32_t hash[5];
+	uint32_t iv;
+	uint8_t pad;
+	union {
+		struct ead_msg_cmd cmd;
+		struct ead_msg_cmd_data cmd_data;
+	} data[];
+} __attribute__((packed));
+
+
+#define EAD_DATA(_msg, _type) (&((_msg)->data[0]._type))
+#define EAD_ENC_DATA(_msg, _type) (&((_msg)->data[0].enc.data[0]._type))
+
+/* for ead_msg::sid */
+#define EAD_INSTANCE_MASK	0xf000
+#define EAD_INSTANCE_SHIFT	12
+
+struct ead_msg {
+	uint32_t magic;
+	uint32_t len;
+	uint32_t type;
+	uint16_t nid; /* node id */
+	uint16_t sid; /* session id */
+	uint32_t ip; /* source ip for responses from the server */
+	union {
+		struct ead_msg_pong pong;
+		struct ead_msg_user user;
+		struct ead_msg_number number;
+		struct ead_msg_auth auth;
+		struct ead_msg_salt salt;
+		struct ead_msg_encrypted enc;
+	} data[];
+} __attribute__((packed));
+
+
+#endif
diff --git a/trunk/package/network/services/ead/src/filter.c b/trunk/package/network/services/ead/src/filter.c
new file mode 100644
index 00000000..0759dc33
--- /dev/null
+++ b/trunk/package/network/services/ead/src/filter.c
@@ -0,0 +1,25 @@
+/* precompiled expression: udp and dst port 56026 */
+
+static struct bpf_insn pktfilter_insns[] = {
+	{ .code = 0x0028, .jt = 0x00, .jf = 0x00, .k = 0x0000000c },
+	{ .code = 0x0015, .jt = 0x00, .jf = 0x04, .k = 0x000086dd },
+	{ .code = 0x0030, .jt = 0x00, .jf = 0x00, .k = 0x00000014 },
+	{ .code = 0x0015, .jt = 0x00, .jf = 0x0b, .k = 0x00000011 },
+	{ .code = 0x0028, .jt = 0x00, .jf = 0x00, .k = 0x00000038 },
+	{ .code = 0x0015, .jt = 0x08, .jf = 0x09, .k = 0x0000dada },
+	{ .code = 0x0015, .jt = 0x00, .jf = 0x08, .k = 0x00000800 },
+	{ .code = 0x0030, .jt = 0x00, .jf = 0x00, .k = 0x00000017 },
+	{ .code = 0x0015, .jt = 0x00, .jf = 0x06, .k = 0x00000011 },
+	{ .code = 0x0028, .jt = 0x00, .jf = 0x00, .k = 0x00000014 },
+	{ .code = 0x0045, .jt = 0x04, .jf = 0x00, .k = 0x00001fff },
+	{ .code = 0x00b1, .jt = 0x00, .jf = 0x00, .k = 0x0000000e },
+	{ .code = 0x0048, .jt = 0x00, .jf = 0x00, .k = 0x00000010 },
+	{ .code = 0x0015, .jt = 0x00, .jf = 0x01, .k = 0x0000dada },
+	{ .code = 0x0006, .jt = 0x00, .jf = 0x00, .k = 0x000005dc },
+	{ .code = 0x0006, .jt = 0x00, .jf = 0x00, .k = 0x00000000 },
+};
+
+static struct bpf_program pktfilter = {
+	.bf_len = 16,
+	.bf_insns = pktfilter_insns,
+};
diff --git a/trunk/package/network/services/ead/src/libbridge.h b/trunk/package/network/services/ead/src/libbridge.h
new file mode 100644
index 00000000..13c8c64c
--- /dev/null
+++ b/trunk/package/network/services/ead/src/libbridge.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2000 Lennert Buytenhek
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _LIBBRIDGE_H
+#define _LIBBRIDGE_H
+
+#include <sys/socket.h>
+#include <linux/if.h>
+#include <linux/in6.h>
+#include <linux/if_bridge.h>
+
+/* defined in net/if.h but that conflicts with linux/if.h... */
+extern unsigned int if_nametoindex (const char *__ifname);
+extern char *if_indextoname (unsigned int __ifindex, char *__ifname);
+
+struct bridge_id
+{
+	unsigned char prio[2];
+	unsigned char addr[6];
+};
+
+struct bridge_info
+{
+	struct bridge_id designated_root;
+	struct bridge_id bridge_id;
+	unsigned root_path_cost;
+	struct timeval max_age;
+	struct timeval hello_time;
+	struct timeval forward_delay;
+	struct timeval bridge_max_age;
+	struct timeval bridge_hello_time;
+	struct timeval bridge_forward_delay;
+	u_int16_t root_port;
+	unsigned char stp_enabled;
+	unsigned char topology_change;
+	unsigned char topology_change_detected;
+	struct timeval ageing_time;
+	struct timeval hello_timer_value;
+	struct timeval tcn_timer_value;
+	struct timeval topology_change_timer_value;
+	struct timeval gc_timer_value;
+};
+
+struct fdb_entry
+{
+	u_int8_t mac_addr[6];
+	u_int16_t port_no;
+	unsigned char is_local;
+	struct timeval ageing_timer_value;
+};
+
+struct port_info
+{
+	unsigned port_no;
+	struct bridge_id designated_root;
+	struct bridge_id designated_bridge;
+	u_int16_t port_id;
+	u_int16_t designated_port;
+	u_int8_t priority;
+	unsigned char top_change_ack;
+	unsigned char config_pending;
+	unsigned char state;
+	unsigned path_cost;
+	unsigned designated_cost;
+	struct timeval message_age_timer_value;
+	struct timeval forward_delay_timer_value;
+	struct timeval hold_timer_value;
+};
+
+#endif
diff --git a/trunk/package/network/services/ead/src/libbridge_init.c b/trunk/package/network/services/ead/src/libbridge_init.c
new file mode 100644
index 00000000..36d0eb9b
--- /dev/null
+++ b/trunk/package/network/services/ead/src/libbridge_init.c
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2000 Lennert Buytenhek
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "libbridge.h"
+#include "libbridge_private.h"
+
+int br_socket_fd = -1;
+
+static int br_init(void)
+{
+	if ((br_socket_fd = socket(AF_LOCAL, SOCK_STREAM, 0)) < 0)
+		return errno;
+	return 0;
+}
+
+static void br_shutdown(void)
+{
+	close(br_socket_fd);
+	br_socket_fd = -1;
+}
+
+/* If /sys/class/net/XXX/bridge exists then it must be a bridge */
+static int isbridge(const struct dirent *entry)
+{
+	char path[SYSFS_PATH_MAX];
+	struct stat st;
+
+	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name);
+	return stat(path, &st) == 0 && S_ISDIR(st.st_mode);
+}
+
+/*
+ * New interface uses sysfs to find bridges
+ */
+static int new_foreach_bridge(int (*iterator)(const char *name, void *),
+			      void *arg)
+{
+	struct dirent **namelist;
+	int i, count = 0;
+
+	count = scandir(SYSFS_CLASS_NET, &namelist, isbridge, alphasort);
+	if (count < 0)
+		return -1;
+
+	for (i = 0; i < count; i++) {
+		if (iterator(namelist[i]->d_name, arg))
+			break;
+	}
+
+	for (i = 0; i < count; i++)
+		free(namelist[i]);
+	free(namelist);
+
+	return count;
+}
+
+/*
+ * Old interface uses ioctl
+ */
+static int old_foreach_bridge(int (*iterator)(const char *, void *), 
+			      void *iarg)
+{
+	int i, ret=0, num;
+	char ifname[IFNAMSIZ];
+	int ifindices[MAX_BRIDGES];
+	unsigned long args[3] = { BRCTL_GET_BRIDGES, 
+				 (unsigned long)ifindices, MAX_BRIDGES };
+
+	num = ioctl(br_socket_fd, SIOCGIFBR, args);
+	if (num < 0) {
+		dprintf("Get bridge indices failed: %s\n",
+			strerror(errno));
+		return -errno;
+	}
+
+	for (i = 0; i < num; i++) {
+		if (!if_indextoname(ifindices[i], ifname)) {
+			dprintf("get find name for ifindex %d\n",
+				ifindices[i]);
+			return -errno;
+		}
+
+		++ret;
+		if(iterator(ifname, iarg)) 
+			break;
+	}
+
+	return ret;
+
+}
+
+/*
+ * Go over all bridges and call iterator function.
+ * if iterator returns non-zero then stop.
+ */
+static int br_foreach_bridge(int (*iterator)(const char *, void *), 
+		     void *arg)
+{
+	int ret;
+
+	ret = new_foreach_bridge(iterator, arg);
+	if (ret <= 0)
+		ret = old_foreach_bridge(iterator, arg);
+
+	return ret;
+}
+
+/* 
+ * Only used if sysfs is not available.
+ */
+static int old_foreach_port(const char *brname,
+			    int (*iterator)(const char *br, const char *port, 
+					    void *arg),
+			    void *arg)
+{
+	int i, err, count;
+	struct ifreq ifr;
+	char ifname[IFNAMSIZ];
+	int ifindices[MAX_PORTS];
+	unsigned long args[4] = { BRCTL_GET_PORT_LIST,
+				  (unsigned long)ifindices, MAX_PORTS, 0 };
+
+	memset(ifindices, 0, sizeof(ifindices));
+	strncpy(ifr.ifr_name, brname, IFNAMSIZ);
+	ifr.ifr_data = (char *) &args;
+
+	err = ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr);
+	if (err < 0) {
+		dprintf("list ports for bridge:'%s' failed: %s\n",
+			brname, strerror(errno));
+		return -errno;
+	}
+
+	count = 0;
+	for (i = 0; i < MAX_PORTS; i++) {
+		if (!ifindices[i])
+			continue;
+
+		if (!if_indextoname(ifindices[i], ifname)) {
+			dprintf("can't find name for ifindex:%d\n",
+				ifindices[i]);
+			continue;
+		}
+
+		++count;
+		if (iterator(brname, ifname, arg))
+			break;
+	}
+
+	return count;
+}
+
+/*
+ * Iterate over all ports in bridge (using sysfs).
+ */
+static int br_foreach_port(const char *brname,
+		    int (*iterator)(const char *br, const char *port, void *arg),
+		    void *arg)
+{
+	int i, count;
+	struct dirent **namelist;
+	char path[SYSFS_PATH_MAX];
+
+	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brif", brname);
+	count = scandir(path, &namelist, 0, alphasort);
+	if (count < 0)
+		return old_foreach_port(brname, iterator, arg);
+
+	for (i = 0; i < count; i++) {
+		if (namelist[i]->d_name[0] == '.'
+		    && (namelist[i]->d_name[1] == '\0'
+			|| (namelist[i]->d_name[1] == '.'
+			    && namelist[i]->d_name[2] == '\0')))
+			continue;
+
+		if (iterator(brname, namelist[i]->d_name, arg))
+			break;
+	}
+	for (i = 0; i < count; i++)
+		free(namelist[i]);
+	free(namelist);
+
+	return count;
+}
diff --git a/trunk/package/network/services/ead/src/libbridge_private.h b/trunk/package/network/services/ead/src/libbridge_private.h
new file mode 100644
index 00000000..38fd60ed
--- /dev/null
+++ b/trunk/package/network/services/ead/src/libbridge_private.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2000 Lennert Buytenhek
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _LIBBRIDGE_PRIVATE_H
+#define _LIBBRIDGE_PRIVATE_H
+
+#include <linux/sockios.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <linux/if_bridge.h>
+
+#define MAX_BRIDGES	1024
+#define MAX_PORTS	1024
+
+#define SYSFS_CLASS_NET "/sys/class/net/"
+#define SYSFS_PATH_MAX	256
+
+#define dprintf(fmt,arg...)
+
+#endif
diff --git a/trunk/package/network/services/ead/src/list.h b/trunk/package/network/services/ead/src/list.h
new file mode 100644
index 00000000..ac429c86
--- /dev/null
+++ b/trunk/package/network/services/ead/src/list.h
@@ -0,0 +1,602 @@
+/* GPL v2, adapted from the Linux kernel */
+#ifndef _LINUX_LIST_H
+#define _LINUX_LIST_H
+
+#include <stddef.h>
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:	the pointer to the member.
+ * @type:	the type of the container struct this is embedded in.
+ * @member:	the name of the member within the struct.
+ *
+ */
+#ifndef container_of
+#define container_of(ptr, type, member) (			\
+	(type *)( (char *)ptr - offsetof(type,member) ))
+#endif
+
+
+/*
+ * Simple doubly linked list implementation.
+ *
+ * Some of the internal functions ("__xxx") are useful when
+ * manipulating whole lists rather than single entries, as
+ * sometimes we already know the next/prev entries and we can
+ * generate better code by using them directly rather than
+ * using the generic single-entry routines.
+ */
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+static inline void INIT_LIST_HEAD(struct list_head *list)
+{
+	list->next = list;
+	list->prev = list;
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
+}
+
+/**
+ * list_add - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+static inline void list_add(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head, head->next);
+}
+
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head->prev, head);
+}
+
+
+/*
+ * Delete a list entry by making the prev/next entries
+ * point to each other.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_del(struct list_head * prev, struct list_head * next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+/**
+ * list_del - deletes entry from list.
+ * @entry: the element to delete from the list.
+ * Note: list_empty() on entry does not return true after this, the entry is
+ * in an undefined state.
+ */
+static inline void list_del(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	entry->next = NULL;
+	entry->prev = NULL;
+}
+
+/**
+ * list_replace - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * If @old was empty, it will be overwritten.
+ */
+static inline void list_replace(struct list_head *old,
+				struct list_head *new)
+{
+	new->next = old->next;
+	new->next->prev = new;
+	new->prev = old->prev;
+	new->prev->next = new;
+}
+
+static inline void list_replace_init(struct list_head *old,
+					struct list_head *new)
+{
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
+}
+
+/**
+ * list_del_init - deletes entry from list and reinitialize it.
+ * @entry: the element to delete from the list.
+ */
+static inline void list_del_init(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	INIT_LIST_HEAD(entry);
+}
+
+/**
+ * list_move - delete from one list and add as another's head
+ * @list: the entry to move
+ * @head: the head that will precede our entry
+ */
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+	__list_del(list->prev, list->next);
+	list_add(list, head);
+}
+
+/**
+ * list_move_tail - delete from one list and add as another's tail
+ * @list: the entry to move
+ * @head: the head that will follow our entry
+ */
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
+{
+	__list_del(list->prev, list->next);
+	list_add_tail(list, head);
+}
+
+/**
+ * list_is_last - tests whether @list is the last entry in list @head
+ * @list: the entry to test
+ * @head: the head of the list
+ */
+static inline int list_is_last(const struct list_head *list,
+				const struct list_head *head)
+{
+	return list->next == head;
+}
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+static inline int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+/**
+ * list_empty_careful - tests whether a list is empty and not being modified
+ * @head: the list to test
+ *
+ * Description:
+ * tests whether a list is empty _and_ checks that no other CPU might be
+ * in the process of modifying either member (next or prev)
+ *
+ * NOTE: using list_empty_careful() without synchronization
+ * can only be safe if the only activity that can happen
+ * to the list entry is list_del_init(). Eg. it cannot be used
+ * if another CPU could re-list_add() it.
+ */
+static inline int list_empty_careful(const struct list_head *head)
+{
+	struct list_head *next = head->next;
+	return (next == head) && (next == head->prev);
+}
+
+static inline void __list_splice(struct list_head *list,
+				 struct list_head *head)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+	struct list_head *at = head->next;
+
+	first->prev = head;
+	head->next = first;
+
+	last->next = at;
+	at->prev = last;
+}
+
+/**
+ * list_splice - join two lists
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice(struct list_head *list, struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head);
+}
+
+/**
+ * list_splice_init - join two lists and reinitialise the emptied list.
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * The list at @list is reinitialised
+ */
+static inline void list_splice_init(struct list_head *list,
+				    struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+/**
+ * list_first_entry - get the first element from a list
+ * @ptr:	the list head to take the element from.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Note, that list is expected to be not empty.
+ */
+#define list_first_entry(ptr, type, member) \
+	list_entry((ptr)->next, type, member)
+
+/**
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); \
+        	pos = pos->next)
+
+/**
+ * __list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ *
+ * This variant differs from list_for_each() in that it's the
+ * simplest possible list iteration code, no prefetching is done.
+ * Use this for code that knows the list to be very short (empty
+ * or 1 entry) most of the time.
+ */
+#define __list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev(pos, head) \
+	for (pos = (head)->prev; pos != (head); \
+        	pos = pos->prev)
+
+/**
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_safe(pos, n, head) \
+	for (pos = (head)->next, n = pos->next; pos != (head); \
+		pos = n, n = pos->next)
+
+/**
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev_safe(pos, n, head) \
+	for (pos = (head)->prev, n = pos->prev; \
+	     pos != (head); \
+	     pos = n, n = pos->prev)
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
+	     &pos->member != (head); 	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
+	     &pos->member != (head); 	\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
+ * @pos:	the type * to use as a start point
+ * @head:	the head of the list
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
+ */
+#define list_prepare_entry(pos, head, member) \
+	((pos) ? : list_entry(head, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue - continue iteration over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Continue to iterate over list of given type, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
+	     &pos->member != (head);	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Start to iterate over list of given type backwards, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_reverse(pos, head, member)		\
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
+	     &pos->member != (head);	\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_from - iterate over list of given type from the current point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing from current position.
+ */
+#define list_for_each_entry_from(pos, head, member) 			\
+	for (; &pos->member != (head);	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		n = list_entry(pos->member.next, typeof(*pos), member);	\
+	     &pos->member != (head); 					\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_continue
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing after current point,
+ * safe against removal of list entry.
+ */
+#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
+		n = list_entry(pos->member.next, typeof(*pos), member);		\
+	     &pos->member != (head);						\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_from
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type from current point, safe against
+ * removal of list entry.
+ */
+#define list_for_each_entry_safe_from(pos, n, head, member) 			\
+	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
+	     &pos->member != (head);						\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_reverse
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate backwards over list of given type, safe against removal
+ * of list entry.
+ */
+#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
+	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
+		n = list_entry(pos->member.prev, typeof(*pos), member);	\
+	     &pos->member != (head); 					\
+	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
+
+/*
+ * Double linked lists with a single pointer list head.
+ * Mostly useful for hash tables where the two pointer list head is
+ * too wasteful.
+ * You lose the ability to access the tail in O(1).
+ */
+
+struct hlist_head {
+	struct hlist_node *first;
+};
+
+struct hlist_node {
+	struct hlist_node *next, **pprev;
+};
+
+#define HLIST_HEAD_INIT { .first = NULL }
+#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+static inline void INIT_HLIST_NODE(struct hlist_node *h)
+{
+	h->next = NULL;
+	h->pprev = NULL;
+}
+
+static inline int hlist_unhashed(const struct hlist_node *h)
+{
+	return !h->pprev;
+}
+
+static inline int hlist_empty(const struct hlist_head *h)
+{
+	return !h->first;
+}
+
+static inline void __hlist_del(struct hlist_node *n)
+{
+	struct hlist_node *next = n->next;
+	struct hlist_node **pprev = n->pprev;
+	*pprev = next;
+	if (next)
+		next->pprev = pprev;
+}
+
+static inline void hlist_del(struct hlist_node *n)
+{
+	__hlist_del(n);
+	n->next = NULL;
+	n->pprev = NULL;
+}
+
+static inline void hlist_del_init(struct hlist_node *n)
+{
+	if (!hlist_unhashed(n)) {
+		__hlist_del(n);
+		INIT_HLIST_NODE(n);
+	}
+}
+
+
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
+{
+	struct hlist_node *first = h->first;
+	n->next = first;
+	if (first)
+		first->pprev = &n->next;
+	h->first = n;
+	n->pprev = &h->first;
+}
+
+
+/* next must be != NULL */
+static inline void hlist_add_before(struct hlist_node *n,
+					struct hlist_node *next)
+{
+	n->pprev = next->pprev;
+	n->next = next;
+	next->pprev = &n->next;
+	*(n->pprev) = n;
+}
+
+static inline void hlist_add_after(struct hlist_node *n,
+					struct hlist_node *next)
+{
+	next->next = n->next;
+	n->next = next;
+	next->pprev = &n->next;
+
+	if(next->next)
+		next->next->pprev  = &next->next;
+}
+
+#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
+
+#define hlist_for_each(pos, head) \
+	for (pos = (head)->first; pos; pos = pos->next)
+
+#define hlist_for_each_safe(pos, n, head) \
+	for (pos = (head)->first; pos; pos = n)
+
+/**
+ * hlist_for_each_entry	- iterate over list of given type
+ * @tpos:	the type * to use as a loop cursor.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry(tpos, pos, head, member)			 \
+	for (pos = (head)->first; pos &&				 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = pos->next)
+
+/**
+ * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
+ * @tpos:	the type * to use as a loop cursor.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_continue(tpos, pos, member)		\
+	for (pos = (pos)->next; pos &&					\
+	     ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;});   \
+	     pos = pos->next)
+
+/**
+ * hlist_for_each_entry_from - iterate over a hlist continuing from current point
+ * @tpos:	the type * to use as a loop cursor.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_from(tpos, pos, member)			 \
+	for (; pos &&			 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = pos->next)
+
+/**
+ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @tpos:	the type * to use as a loop cursor.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @n:		another &struct hlist_node to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
+	for (pos = (head)->first;					 \
+	     pos && ({ n = pos->next; 1; }) && 				 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = n)
+
+#endif
diff --git a/trunk/package/network/services/ead/src/passwd b/trunk/package/network/services/ead/src/passwd
new file mode 100644
index 00000000..eee7a894
--- /dev/null
+++ b/trunk/package/network/services/ead/src/passwd
@@ -0,0 +1,3 @@
+root:$1$MCGAgYw.$Ip1GcyeUliId3wzVcKR/e/:0:0:root:/root:/bin/ash
+nobody:*:65534:65534:nobody:/var:/bin/false
+daemon:*:65534:65534:daemon:/var:/bin/false
diff --git a/trunk/package/network/services/ead/src/pfc.c b/trunk/package/network/services/ead/src/pfc.c
new file mode 100644
index 00000000..402e37f3
--- /dev/null
+++ b/trunk/package/network/services/ead/src/pfc.c
@@ -0,0 +1,54 @@
+/*
+ * Small pcap precompiler
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <string.h>
+#include <stdlib.h>
+#include <pcap.h>
+
+int main (int argc, char ** argv)
+{
+	struct bpf_program filter;
+	pcap_t *pc;
+	int i;
+
+	if (argc != 2)
+	{
+		printf ("Usage: %s <expression>\n", argv[0]);
+		return 1;
+	}
+
+	pc = pcap_open_dead(DLT_EN10MB, 1500);
+	if (pcap_compile(pc, &filter, argv[1], 1, 0) != 0) {
+		printf("error in active-filter expression: %s\n", pcap_geterr(pc));
+		return 1;
+	}
+
+	printf("/* precompiled expression: %s */\n\n"
+		"static struct bpf_insn pktfilter_insns[] = {\n",
+		argv[1]);
+
+	for (i = 0; i < filter.bf_len; i++) {
+		struct bpf_insn *in = &filter.bf_insns[i];
+		printf("\t{ .code = 0x%04x, .jt = 0x%02x, .jf = 0x%02x, .k = 0x%08x },\n", in->code, in->jt, in->jf, in->k);
+	}
+	printf("};\n\n"
+		"static struct bpf_program pktfilter = {\n"
+		"\t.bf_len = %d,\n"
+		"\t.bf_insns = pktfilter_insns,\n"
+		"};\n", filter.bf_len);
+	return 0;
+
+}
diff --git a/trunk/package/network/services/ead/src/pw_encrypt_md5.c b/trunk/package/network/services/ead/src/pw_encrypt_md5.c
new file mode 100644
index 00000000..bc9f249f
--- /dev/null
+++ b/trunk/package/network/services/ead/src/pw_encrypt_md5.c
@@ -0,0 +1,646 @@
+/*
+ * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD5 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ *
+ * $FreeBSD: src/lib/libmd/md5c.c,v 1.9.2.1 1999/08/29 14:57:12 peter Exp $
+ *
+ * This code is the same as the code published by RSA Inc.  It has been
+ * edited for clarity and style only.
+ *
+ * ----------------------------------------------------------------------------
+ * The md5_crypt() function was taken from freeBSD's libcrypt and contains
+ * this license:
+ *    "THE BEER-WARE LICENSE" (Revision 42):
+ *     <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+ *     can do whatever you want with this stuff. If we meet some day, and you think
+ *     this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+ *
+ * $FreeBSD: src/lib/libcrypt/crypt.c,v 1.7.2.1 1999/08/29 14:56:33 peter Exp $
+ *
+ * ----------------------------------------------------------------------------
+ * On April 19th, 2001 md5_crypt() was modified to make it reentrant
+ * by Erik Andersen <andersen@uclibc.org>
+ *
+ *
+ * June 28, 2001             Manuel Novoa III
+ *
+ * "Un-inlined" code using loops and static const tables in order to
+ * reduce generated code size (on i386 from approx 4k to approx 2.5k).
+ *
+ * June 29, 2001             Manuel Novoa III
+ *
+ * Completely removed static PADDING array.
+ *
+ * Reintroduced the loop unrolling in MD5_Transform and added the
+ * MD5_SIZE_OVER_SPEED option for configurability.  Define below as:
+ *       0    fully unrolled loops
+ *       1    partially unrolled (4 ops per loop)
+ *       2    no unrolling -- introduces the need to swap 4 variables (slow)
+ *       3    no unrolling and all 4 loops merged into one with switch
+ *               in each loop (glacial)
+ * On i386, sizes are roughly (-Os -fno-builtin):
+ *     0: 3k     1: 2.5k     2: 2.2k     3: 2k
+ *
+ *
+ * Since SuSv3 does not require crypt_r, modified again August 7, 2002
+ * by Erik Andersen to remove reentrance stuff...
+ */
+
+static const uint8_t ascii64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+/*
+ * Valid values are  1 (fastest/largest) to 3 (smallest/slowest).
+ */
+#define MD5_SIZE_OVER_SPEED 3
+
+/**********************************************************************/
+
+/* MD5 context. */
+struct MD5Context {
+	uint32_t state[4];	/* state (ABCD) */
+	uint32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
+	unsigned char buffer[64];	/* input buffer */
+};
+
+static void __md5_Init(struct MD5Context *);
+static void __md5_Update(struct MD5Context *, const unsigned char *, unsigned int);
+static void __md5_Pad(struct MD5Context *);
+static void __md5_Final(unsigned char [16], struct MD5Context *);
+static void __md5_Transform(uint32_t [4], const unsigned char [64]);
+
+
+#define MD5_MAGIC_STR "$1$"
+#define MD5_MAGIC_LEN (sizeof(MD5_MAGIC_STR) - 1)
+static const unsigned char __md5__magic[] = MD5_MAGIC_STR;
+
+
+#ifdef i386
+#define __md5_Encode memcpy
+#define __md5_Decode memcpy
+#else /* i386 */
+
+/*
+ * __md5_Encodes input (uint32_t) into output (unsigned char). Assumes len is
+ * a multiple of 4.
+ */
+static void
+__md5_Encode(unsigned char *output, uint32_t *input, unsigned int len)
+{
+	unsigned int i, j;
+
+	for (i = 0, j = 0; j < len; i++, j += 4) {
+		output[j] = input[i];
+		output[j+1] = (input[i] >> 8);
+		output[j+2] = (input[i] >> 16);
+		output[j+3] = (input[i] >> 24);
+	}
+}
+
+/*
+ * __md5_Decodes input (unsigned char) into output (uint32_t). Assumes len is
+ * a multiple of 4.
+ */
+static void
+__md5_Decode(uint32_t *output, const unsigned char *input, unsigned int len)
+{
+	unsigned int i, j;
+
+	for (i = 0, j = 0; j < len; i++, j += 4)
+		output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) |
+		    (((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24);
+}
+#endif /* i386 */
+
+/* F, G, H and I are basic MD5 functions. */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+
+/* ROTATE_LEFT rotates x left n bits. */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/*
+ * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+ * Rotation is separate from addition to prevent recomputation.
+ */
+#define FF(a, b, c, d, x, s, ac) { \
+	(a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+	(a) = ROTATE_LEFT((a), (s)); \
+	(a) += (b); \
+	}
+#define GG(a, b, c, d, x, s, ac) { \
+	(a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+	(a) = ROTATE_LEFT((a), (s)); \
+	(a) += (b); \
+	}
+#define HH(a, b, c, d, x, s, ac) { \
+	(a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+	(a) = ROTATE_LEFT((a), (s)); \
+	(a) += (b); \
+	}
+#define II(a, b, c, d, x, s, ac) { \
+	(a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \
+	(a) = ROTATE_LEFT((a), (s)); \
+	(a) += (b); \
+	}
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context. */
+static void __md5_Init(struct MD5Context *context)
+{
+	context->count[0] = context->count[1] = 0;
+
+	/* Load magic initialization constants.  */
+	context->state[0] = 0x67452301;
+	context->state[1] = 0xefcdab89;
+	context->state[2] = 0x98badcfe;
+	context->state[3] = 0x10325476;
+}
+
+/*
+ * MD5 block update operation. Continues an MD5 message-digest
+ * operation, processing another message block, and updating the
+ * context.
+ */
+static void __md5_Update(struct MD5Context *context, const unsigned char *input, unsigned int inputLen)
+{
+	unsigned int i, idx, partLen;
+
+	/* Compute number of bytes mod 64 */
+	idx = (context->count[0] >> 3) & 0x3F;
+
+	/* Update number of bits */
+	context->count[0] += (inputLen << 3);
+	if (context->count[0] < (inputLen << 3))
+		context->count[1]++;
+	context->count[1] += (inputLen >> 29);
+
+	partLen = 64 - idx;
+
+	/* Transform as many times as possible. */
+	if (inputLen >= partLen) {
+		memcpy(&context->buffer[idx], input, partLen);
+		__md5_Transform(context->state, context->buffer);
+
+		for (i = partLen; i + 63 < inputLen; i += 64)
+			__md5_Transform(context->state, &input[i]);
+
+		idx = 0;
+	} else
+		i = 0;
+
+	/* Buffer remaining input */
+	memcpy(&context->buffer[idx], &input[i], inputLen - i);
+}
+
+/*
+ * MD5 padding. Adds padding followed by original length.
+ */
+static void __md5_Pad(struct MD5Context *context)
+{
+	unsigned char bits[8];
+	unsigned int idx, padLen;
+	unsigned char PADDING[64];
+
+	memset(PADDING, 0, sizeof(PADDING));
+	PADDING[0] = 0x80;
+
+	/* Save number of bits */
+	__md5_Encode(bits, context->count, 8);
+
+	/* Pad out to 56 mod 64. */
+	idx = (context->count[0] >> 3) & 0x3f;
+	padLen = (idx < 56) ? (56 - idx) : (120 - idx);
+	__md5_Update(context, PADDING, padLen);
+
+	/* Append length (before padding) */
+	__md5_Update(context, bits, 8);
+}
+
+/*
+ * MD5 finalization. Ends an MD5 message-digest operation, writing the
+ * the message digest and zeroizing the context.
+ */
+static void __md5_Final(unsigned char digest[16], struct MD5Context *context)
+{
+	/* Do padding. */
+	__md5_Pad(context);
+
+	/* Store state in digest */
+	__md5_Encode(digest, context->state, 16);
+
+	/* Zeroize sensitive information. */
+	memset(context, 0, sizeof(*context));
+}
+
+/* MD5 basic transformation. Transforms state based on block. */
+static void __md5_Transform(uint32_t state[4], const unsigned char block[64])
+{
+	uint32_t a, b, c, d, x[16];
+#if MD5_SIZE_OVER_SPEED > 1
+	uint32_t temp;
+	const unsigned char *ps;
+
+	static const unsigned char S[] = {
+		7, 12, 17, 22,
+		5, 9, 14, 20,
+		4, 11, 16, 23,
+		6, 10, 15, 21
+	};
+#endif /* MD5_SIZE_OVER_SPEED > 1 */
+
+#if MD5_SIZE_OVER_SPEED > 0
+	const uint32_t *pc;
+	const unsigned char *pp;
+	int i;
+
+	static const uint32_t C[] = {
+								/* round 1 */
+		0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+		0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+		0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+		0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+								/* round 2 */
+		0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+		0xd62f105d, 0x2441453,  0xd8a1e681, 0xe7d3fbc8,
+		0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+		0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+								/* round 3 */
+		0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+		0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+		0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05,
+		0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+								/* round 4 */
+		0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+		0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+		0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+		0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
+	};
+
+	static const unsigned char P[] = {
+		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */
+		1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */
+		5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */
+		0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9  /* 4 */
+	};
+
+#endif /* MD5_SIZE_OVER_SPEED > 0 */
+
+	__md5_Decode(x, block, 64);
+
+	a = state[0]; b = state[1]; c = state[2]; d = state[3];
+
+#if MD5_SIZE_OVER_SPEED > 2
+	pc = C; pp = P; ps = S - 4;
+
+	for (i = 0; i < 64; i++) {
+		if ((i & 0x0f) == 0) ps += 4;
+		temp = a;
+		switch (i>>4) {
+			case 0:
+				temp += F(b, c, d);
+				break;
+			case 1:
+				temp += G(b, c, d);
+				break;
+			case 2:
+				temp += H(b, c, d);
+				break;
+			case 3:
+				temp += I(b, c, d);
+				break;
+		}
+		temp += x[*pp++] + *pc++;
+		temp = ROTATE_LEFT(temp, ps[i & 3]);
+		temp += b;
+		a = d; d = c; c = b; b = temp;
+	}
+#elif MD5_SIZE_OVER_SPEED > 1
+	pc = C; pp = P; ps = S;
+
+	/* Round 1 */
+	for (i = 0; i < 16; i++) {
+		FF(a, b, c, d, x[*pp], ps[i & 0x3], *pc); pp++; pc++;
+		temp = d; d = c; c = b; b = a; a = temp;
+	}
+
+	/* Round 2 */
+	ps += 4;
+	for (; i < 32; i++) {
+		GG(a, b, c, d, x[*pp], ps[i & 0x3], *pc); pp++; pc++;
+		temp = d; d = c; c = b; b = a; a = temp;
+	}
+	/* Round 3 */
+	ps += 4;
+	for (; i < 48; i++) {
+		HH(a, b, c, d, x[*pp], ps[i & 0x3], *pc); pp++; pc++;
+		temp = d; d = c; c = b; b = a; a = temp;
+	}
+
+	/* Round 4 */
+	ps += 4;
+	for (; i < 64; i++) {
+		II(a, b, c, d, x[*pp], ps[i & 0x3], *pc); pp++; pc++;
+		temp = d; d = c; c = b; b = a; a = temp;
+	}
+#elif MD5_SIZE_OVER_SPEED > 0
+	pc = C; pp = P;
+
+	/* Round 1 */
+	for (i = 0; i < 4; i++) {
+		FF(a, b, c, d, x[*pp],  7, *pc); pp++; pc++;
+		FF(d, a, b, c, x[*pp], 12, *pc); pp++; pc++;
+		FF(c, d, a, b, x[*pp], 17, *pc); pp++; pc++;
+		FF(b, c, d, a, x[*pp], 22, *pc); pp++; pc++;
+	}
+
+	/* Round 2 */
+	for (i = 0; i < 4; i++) {
+		GG(a, b, c, d, x[*pp],  5, *pc); pp++; pc++;
+		GG(d, a, b, c, x[*pp],  9, *pc); pp++; pc++;
+		GG(c, d, a, b, x[*pp], 14, *pc); pp++; pc++;
+		GG(b, c, d, a, x[*pp], 20, *pc); pp++; pc++;
+	}
+	/* Round 3 */
+	for (i = 0; i < 4; i++) {
+		HH(a, b, c, d, x[*pp],  4, *pc); pp++; pc++;
+		HH(d, a, b, c, x[*pp], 11, *pc); pp++; pc++;
+		HH(c, d, a, b, x[*pp], 16, *pc); pp++; pc++;
+		HH(b, c, d, a, x[*pp], 23, *pc); pp++; pc++;
+	}
+
+	/* Round 4 */
+	for (i = 0; i < 4; i++) {
+		II(a, b, c, d, x[*pp],  6, *pc); pp++; pc++;
+		II(d, a, b, c, x[*pp], 10, *pc); pp++; pc++;
+		II(c, d, a, b, x[*pp], 15, *pc); pp++; pc++;
+		II(b, c, d, a, x[*pp], 21, *pc); pp++; pc++;
+	}
+#else
+	/* Round 1 */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+	FF(a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+	FF(d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+	FF(c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+	FF(b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+	FF(a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+	FF(d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+	FF(c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+	FF(b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+	FF(a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+	FF(d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+	FF(c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+	FF(b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+	FF(a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+	FF(d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+	FF(c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+	FF(b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+	/* Round 2 */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+	GG(a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+	GG(d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+	GG(c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+	GG(b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+	GG(a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+	GG(d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+	GG(c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+	GG(b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+	GG(a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+	GG(d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+	GG(c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+	GG(b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+	GG(a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+	GG(d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+	GG(c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+	GG(b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+	/* Round 3 */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+	HH(a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+	HH(d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+	HH(c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+	HH(b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+	HH(a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+	HH(d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+	HH(c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+	HH(b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+	HH(a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+	HH(d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+	HH(c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+	HH(b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+	HH(a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+	HH(d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+	HH(c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+	HH(b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+	/* Round 4 */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+	II(a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+	II(d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+	II(c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+	II(b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+	II(a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+	II(d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+	II(c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+	II(b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+	II(a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+	II(d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+	II(c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+	II(b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+	II(a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+	II(d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+	II(c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+	II(b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+#endif
+
+	state[0] += a;
+	state[1] += b;
+	state[2] += c;
+	state[3] += d;
+
+	/* Zeroize sensitive information. */
+	memset(x, 0, sizeof(x));
+}
+
+
+static char*
+__md5_to64(char *s, unsigned v, int n)
+{
+	while (--n >= 0) {
+		*s++ = ascii64[v & 0x3f];
+		v >>= 6;
+	}
+	return s;
+}
+
+/*
+ * UNIX password
+ *
+ * Use MD5 for what it is best at...
+ */
+#define MD5_OUT_BUFSIZE 36
+static char *
+md5_crypt(char passwd[MD5_OUT_BUFSIZE], const unsigned char *pw, const unsigned char *salt)
+{
+	const unsigned char *sp, *ep;
+	char *p;
+	unsigned char final[17];	/* final[16] exists only to aid in looping */
+	int sl, pl, i, pw_len;
+	struct MD5Context ctx, ctx1;
+
+	/* Refine the Salt first */
+	sp = salt;
+
+	sp += MD5_MAGIC_LEN;
+
+	/* It stops at the first '$', max 8 chars */
+	for (ep = sp; *ep && *ep != '$' && ep < (sp+8); ep++)
+		continue;
+
+	/* get the length of the true salt */
+	sl = ep - sp;
+
+	__md5_Init(&ctx);
+
+	/* The password first, since that is what is most unknown */
+	pw_len = strlen((char*)pw);
+	__md5_Update(&ctx, pw, pw_len);
+
+	/* Then our magic string */
+	__md5_Update(&ctx, __md5__magic, MD5_MAGIC_LEN);
+
+	/* Then the raw salt */
+	__md5_Update(&ctx, sp, sl);
+
+	/* Then just as many characters of the MD5(pw, salt, pw) */
+	__md5_Init(&ctx1);
+	__md5_Update(&ctx1, pw, pw_len);
+	__md5_Update(&ctx1, sp, sl);
+	__md5_Update(&ctx1, pw, pw_len);
+	__md5_Final(final, &ctx1);
+	for (pl = pw_len; pl > 0; pl -= 16)
+		__md5_Update(&ctx, final, pl > 16 ? 16 : pl);
+
+	/* Don't leave anything around in vm they could use. */
+//TODO: the above comment seems to be wrong. final is used later.
+	memset(final, 0, sizeof(final));
+
+	/* Then something really weird... */
+	for (i = pw_len; i; i >>= 1) {
+		__md5_Update(&ctx, ((i & 1) ? final : (const unsigned char *) pw), 1);
+	}
+
+	/* Now make the output string */
+	passwd[0] = '$';
+	passwd[1] = '1';
+	passwd[2] = '$';
+	strncpy(passwd + 3, (char*)sp, sl);
+	passwd[sl + 3] = '$';
+
+	__md5_Final(final, &ctx);
+
+	/*
+	 * and now, just to make sure things don't run too fast
+	 * On a 60 Mhz Pentium this takes 34 msec, so you would
+	 * need 30 seconds to build a 1000 entry dictionary...
+	 */
+	for (i = 0; i < 1000; i++) {
+		__md5_Init(&ctx1);
+		if (i & 1)
+			__md5_Update(&ctx1, pw, pw_len);
+		else
+			__md5_Update(&ctx1, final, 16);
+
+		if (i % 3)
+			__md5_Update(&ctx1, sp, sl);
+
+		if (i % 7)
+			__md5_Update(&ctx1, pw, pw_len);
+
+		if (i & 1)
+			__md5_Update(&ctx1, final, 16);
+		else
+			__md5_Update(&ctx1, pw, pw_len);
+		__md5_Final(final, &ctx1);
+	}
+
+	p = passwd + sl + 4; /* 12 bytes max (sl is up to 8 bytes) */
+
+	/* Add 5*4+2 = 22 bytes of hash, + NUL byte. */
+	final[16] = final[5];
+	for (i = 0; i < 5; i++) {
+		unsigned l = (final[i] << 16) | (final[i+6] << 8) | final[i+12];
+		p = __md5_to64(p, l, 4);
+	}
+	p = __md5_to64(p, final[11], 2);
+	*p = '\0';
+
+	/* Don't leave anything around in vm they could use. */
+	memset(final, 0, sizeof(final));
+
+	return passwd;
+}
+
+#undef MD5_SIZE_OVER_SPEED
+#undef MD5_MAGIC_STR
+#undef MD5_MAGIC_LEN
+#undef __md5_Encode
+#undef __md5_Decode
+#undef F
+#undef G
+#undef H
+#undef I
+#undef ROTATE_LEFT
+#undef FF
+#undef GG
+#undef HH
+#undef II
+#undef S11
+#undef S12
+#undef S13
+#undef S14
+#undef S21
+#undef S22
+#undef S23
+#undef S24
+#undef S31
+#undef S32
+#undef S33
+#undef S34
+#undef S41
+#undef S42
+#undef S43
+#undef S44
diff --git a/trunk/package/network/services/ead/src/sha1.c b/trunk/package/network/services/ead/src/sha1.c
new file mode 100644
index 00000000..3683a7da
--- /dev/null
+++ b/trunk/package/network/services/ead/src/sha1.c
@@ -0,0 +1,104 @@
+/*
+ * SHA transform algorithm, originally taken from code written by
+ * Peter Gutmann, and placed in the public domain.
+ */
+
+static  uint32_t
+rol32(uint32_t word, int shift)
+{
+	return (word << shift) | (word >> (32 - shift));
+}
+
+/* The SHA f()-functions.  */
+
+#define f1(x,y,z)   (z ^ (x & (y ^ z)))		/* x ? y : z */
+#define f2(x,y,z)   (x ^ y ^ z)			/* XOR */
+#define f3(x,y,z)   ((x & y) + (z & (x ^ y)))	/* majority */
+
+/* The SHA Mysterious Constants */
+
+#define K1  0x5A827999L			/* Rounds  0-19: sqrt(2) * 2^30 */
+#define K2  0x6ED9EBA1L			/* Rounds 20-39: sqrt(3) * 2^30 */
+#define K3  0x8F1BBCDCL			/* Rounds 40-59: sqrt(5) * 2^30 */
+#define K4  0xCA62C1D6L			/* Rounds 60-79: sqrt(10) * 2^30 */
+
+/**
+ * sha_transform - single block SHA1 transform
+ *
+ * @digest: 160 bit digest to update
+ * @data:   512 bits of data to hash
+ * @W:      80 words of workspace (see note)
+ *
+ * This function generates a SHA1 digest for a single 512-bit block.
+ * Be warned, it does not handle padding and message digest, do not
+ * confuse it with the full FIPS 180-1 digest algorithm for variable
+ * length messages.
+ *
+ * Note: If the hash is security sensitive, the caller should be sure
+ * to clear the workspace. This is left to the caller to avoid
+ * unnecessary clears between chained hashing operations.
+ */
+static void sha_transform(uint32_t *digest, const unsigned char *in, uint32_t *W)
+{
+	uint32_t a, b, c, d, e, t, i;
+
+	for (i = 0; i < 16; i++) {
+		int ofs = 4 * i;
+
+		/* word load/store may be unaligned here, so use bytes instead */
+		W[i] =
+			(in[ofs+0] << 24) |
+			(in[ofs+1] << 16) |
+			(in[ofs+2] << 8) |
+			 in[ofs+3];
+	}
+
+	for (i = 0; i < 64; i++)
+		W[i+16] = rol32(W[i+13] ^ W[i+8] ^ W[i+2] ^ W[i], 1);
+
+	a = digest[0];
+	b = digest[1];
+	c = digest[2];
+	d = digest[3];
+	e = digest[4];
+
+	for (i = 0; i < 20; i++) {
+		t = f1(b, c, d) + K1 + rol32(a, 5) + e + W[i];
+		e = d; d = c; c = rol32(b, 30); b = a; a = t;
+	}
+
+	for (; i < 40; i ++) {
+		t = f2(b, c, d) + K2 + rol32(a, 5) + e + W[i];
+		e = d; d = c; c = rol32(b, 30); b = a; a = t;
+	}
+
+	for (; i < 60; i ++) {
+		t = f3(b, c, d) + K3 + rol32(a, 5) + e + W[i];
+		e = d; d = c; c = rol32(b, 30); b = a; a = t;
+	}
+
+	for (; i < 80; i ++) {
+		t = f2(b, c, d) + K4 + rol32(a, 5) + e + W[i];
+		e = d; d = c; c = rol32(b, 30); b = a; a = t;
+	}
+
+	digest[0] += a;
+	digest[1] += b;
+	digest[2] += c;
+	digest[3] += d;
+	digest[4] += e;
+}
+
+/**
+ * sha_init - initialize the vectors for a SHA1 digest
+ * @buf: vector to initialize
+ */
+static void sha_init(uint32_t *buf)
+{
+	buf[0] = 0x67452301;
+	buf[1] = 0xefcdab89;
+	buf[2] = 0x98badcfe;
+	buf[3] = 0x10325476;
+	buf[4] = 0xc3d2e1f0;
+}
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/Makefile.am b/trunk/package/network/services/ead/src/tinysrp/Makefile.am
new file mode 100644
index 00000000..a8f899fe
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/Makefile.am
@@ -0,0 +1,28 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+noinst_HEADERS = t_client.h t_pwd.h t_server.h t_sha.h \
+  bn.h bn_lcl.h bn_prime.h t_defines.h t_read.h
+
+include_HEADERS = tinysrp.h
+
+lib_LIBRARIES = libtinysrp.a
+
+CFLAGS = -O2 @signed@
+
+libtinysrp_a_SOURCES = \
+  tinysrp.c t_client.c t_getconf.c t_conv.c t_getpass.c t_sha.c t_math.c \
+  t_misc.c t_pw.c t_read.c t_server.c t_truerand.c \
+  bn_add.c bn_ctx.c bn_div.c bn_exp.c bn_mul.c bn_word.c bn_asm.c bn_lib.c \
+  bn_shift.c bn_sqr.c
+
+noinst_PROGRAMS = srvtest clitest
+srvtest_SOURCES = srvtest.c
+clitest_SOURCES = clitest.c
+
+bin_PROGRAMS = tconf tphrase
+tconf_SOURCES = tconf.c t_conf.c
+tphrase_SOURCES = tphrase.c
+
+LDADD = libtinysrp.a
+
+EXTRA_DIST = tpasswd Notes
diff --git a/trunk/package/network/services/ead/src/tinysrp/Makefile.in b/trunk/package/network/services/ead/src/tinysrp/Makefile.in
new file mode 100644
index 00000000..4701cd52
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/Makefile.in
@@ -0,0 +1,477 @@
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+CC = @CC@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+signed = @signed@
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+noinst_HEADERS = t_client.h t_pwd.h t_server.h t_sha.h   bn.h bn_lcl.h bn_prime.h t_defines.h t_read.h
+
+
+include_HEADERS = tinysrp.h
+
+lib_LIBRARIES = libtinysrp.a
+
+CFLAGS = -O2 @signed@
+
+libtinysrp_a_SOURCES =    tinysrp.c t_client.c t_getconf.c t_conv.c t_getpass.c t_sha.c t_math.c   t_misc.c t_pw.c t_read.c t_server.c t_truerand.c   bn_add.c bn_ctx.c bn_div.c bn_exp.c bn_mul.c bn_word.c bn_asm.c bn_lib.c   bn_shift.c bn_sqr.c
+
+
+noinst_PROGRAMS = srvtest clitest
+srvtest_SOURCES = srvtest.c
+clitest_SOURCES = clitest.c
+
+bin_PROGRAMS = tconf tphrase
+tconf_SOURCES = tconf.c t_conf.c
+tphrase_SOURCES = tphrase.c
+
+LDADD = libtinysrp.a
+
+EXTRA_DIST = tpasswd Notes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(lib_LIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+libtinysrp_a_LIBADD = 
+libtinysrp_a_OBJECTS =  tinysrp.o t_client.o t_getconf.o t_conv.o \
+t_getpass.o t_sha.o t_math.o t_misc.o t_pw.o t_read.o t_server.o \
+t_truerand.o bn_add.o bn_ctx.o bn_div.o bn_exp.o bn_mul.o bn_word.o \
+bn_asm.o bn_lib.o bn_shift.o bn_sqr.o
+AR = ar
+PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
+
+tconf_OBJECTS =  tconf.o t_conf.o
+tconf_LDADD = $(LDADD)
+tconf_DEPENDENCIES =  libtinysrp.a
+tconf_LDFLAGS = 
+tphrase_OBJECTS =  tphrase.o
+tphrase_LDADD = $(LDADD)
+tphrase_DEPENDENCIES =  libtinysrp.a
+tphrase_LDFLAGS = 
+srvtest_OBJECTS =  srvtest.o
+srvtest_LDADD = $(LDADD)
+srvtest_DEPENDENCIES =  libtinysrp.a
+srvtest_LDFLAGS = 
+clitest_OBJECTS =  clitest.o
+clitest_LDADD = $(LDADD)
+clitest_DEPENDENCIES =  libtinysrp.a
+clitest_LDFLAGS = 
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(include_HEADERS) $(noinst_HEADERS)
+
+DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in acconfig.h \
+acinclude.m4 aclocal.m4 config.h.in configure configure.in install-sh \
+missing mkinstalldirs
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+SOURCES = $(libtinysrp_a_SOURCES) $(tconf_SOURCES) $(tphrase_SOURCES) $(srvtest_SOURCES) $(clitest_SOURCES)
+OBJECTS = $(libtinysrp_a_OBJECTS) $(tconf_OBJECTS) $(tphrase_OBJECTS) $(srvtest_OBJECTS) $(clitest_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4):  configure.in  acinclude.m4
+	cd $(srcdir) && $(ACLOCAL)
+
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+config.h: stamp-h
+	@if test ! -f $@; then \
+		rm -f stamp-h; \
+		$(MAKE) stamp-h; \
+	else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
+	else :; fi
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f config.h
+
+maintainer-clean-hdr:
+
+mostlyclean-libLIBRARIES:
+
+clean-libLIBRARIES:
+	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+
+distclean-libLIBRARIES:
+
+maintainer-clean-libLIBRARIES:
+
+install-libLIBRARIES: $(lib_LIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+	@$(POST_INSTALL)
+	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(libdir)/$$p; \
+	done
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libtinysrp.a: $(libtinysrp_a_OBJECTS) $(libtinysrp_a_DEPENDENCIES)
+	-rm -f libtinysrp.a
+	$(AR) cru libtinysrp.a $(libtinysrp_a_OBJECTS) $(libtinysrp_a_LIBADD)
+	$(RANLIB) libtinysrp.a
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	done
+
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
+tconf: $(tconf_OBJECTS) $(tconf_DEPENDENCIES)
+	@rm -f tconf
+	$(LINK) $(tconf_LDFLAGS) $(tconf_OBJECTS) $(tconf_LDADD) $(LIBS)
+
+tphrase: $(tphrase_OBJECTS) $(tphrase_DEPENDENCIES)
+	@rm -f tphrase
+	$(LINK) $(tphrase_LDFLAGS) $(tphrase_OBJECTS) $(tphrase_LDADD) $(LIBS)
+
+srvtest: $(srvtest_OBJECTS) $(srvtest_DEPENDENCIES)
+	@rm -f srvtest
+	$(LINK) $(srvtest_LDFLAGS) $(srvtest_OBJECTS) $(srvtest_LDADD) $(LIBS)
+
+clitest: $(clitest_OBJECTS) $(clitest_DEPENDENCIES)
+	@rm -f clitest
+	$(LINK) $(clitest_LDFLAGS) $(clitest_OBJECTS) $(clitest_LDADD) $(LIBS)
+
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
+	done
+
+uninstall-includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	list='$(include_HEADERS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(includedir)/$$p; \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+all-recursive-am: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+install-exec-am: install-libLIBRARIES install-binPROGRAMS
+install-exec: install-exec-am
+
+install-data-am: install-includeHEADERS
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-libLIBRARIES uninstall-binPROGRAMS \
+		uninstall-includeHEADERS
+uninstall: uninstall-am
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs:
+	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+		$(DESTDIR)$(includedir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
+		mostlyclean-compile mostlyclean-binPROGRAMS \
+		mostlyclean-noinstPROGRAMS mostlyclean-tags \
+		mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-hdr clean-libLIBRARIES clean-compile clean-binPROGRAMS \
+		clean-noinstPROGRAMS clean-tags clean-generic \
+		mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
+		distclean-binPROGRAMS distclean-noinstPROGRAMS \
+		distclean-tags distclean-generic clean-am
+
+distclean: distclean-am
+	-rm -f config.status
+
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
+		maintainer-clean-compile maintainer-clean-binPROGRAMS \
+		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+	-rm -f config.status
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+mostlyclean-libLIBRARIES distclean-libLIBRARIES clean-libLIBRARIES \
+maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
+install-libLIBRARIES mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile mostlyclean-binPROGRAMS \
+distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \
+uninstall-binPROGRAMS install-binPROGRAMS mostlyclean-noinstPROGRAMS \
+distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \
+install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
+maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck all-recursive-am install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/trunk/package/network/services/ead/src/tinysrp/Notes b/trunk/package/network/services/ead/src/tinysrp/Notes
new file mode 100644
index 00000000..a8620aa7
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/Notes
@@ -0,0 +1,110 @@
+t_* stuff is from the srp 1.7.1 dist
+bn_* stuff is from openssl 0.9.6
+
+(The 7 in libtinysrp's version number reflects the srp version.)
+
+Licensing and copyright for srp and openssl are as indicated in the relevant
+source files.  Everything else here is GPL, including the tinysrp protocol.
+
+Changelog since initial release:
+
+0.7.4   more robust terminal modes in t_getpass
+	a potential buffer overflow in tinysrp
+0.7.5   uninitialized pointer bug in tconf
+
+Changes from the base srp and openssl distributions:
+
+I've removed everything that's not needed for client/server operations, and
+all the bn_* stuff that's only used for prime generation has been moved to
+t_conf.c, which isn't part of the library anymore.  Also, all the routines
+used for passphrase file maintenance have been moved to tphrase.c.
+
+The library has been optimized (a bit) for space instead of speed.  Since
+authentication is usually only done once, this isn't a big problem.  Modern
+CPUs are plenty fast for this task, and even 100 MHz CPUs are fine.  If you
+really need the speed, get the regular distributions.
+
+Note that if the server sends the client a prime that the client doesn't
+know about, the client MUST test for primality.  Since this is pretty
+expensive, and takes 30 seconds on a 100 MHz machine, and uses lots of code,
+I've removed that ability from the client.  So only KNOWN primes can be
+used.  You can still generate new ones with tconf, but you have to install
+them in the table of known primes (pre_params) in t_getconf.c that's common
+to the client and server, and recompile.  The configuration file is gone.
+
+The default prime (the last entry in the table) is 1024 bits; there are
+others with more bits but they will be correspondingly slower.
+
+The default tpasswd file (which is an ascii file that may be editted with a
+regular text editor) contains two users: moo (passphrase "glub glub") and
+"new user" (passphrase "this is a test").  Passphrases may be added or
+changed with tphrase; you can also change the user's prime.  To delete a
+user, edit the tpasswd file and remove that line.  The tpasswd file's
+default name is DEFAULT_PASSWD in t_pwd.h.  Note that you can't change a
+user's username by editting the file: the username is encoded in the
+verifier.  If you change a username you must set a new passphrase with
+tphrase.
+
+Here is an example session, using the supplied srvtest and clitest.  First,
+start both programs in different windows, and enter the user names.  Normally,
+the client would send the username to the server.  Server lines are marked
+with S>, client lines with C>.
+
+S> % srvtest
+S> Enter username: moo
+S> index (to client): 5
+S> salt (to client): 19AI0Hc9jEkdFc
+
+C> % clitest
+C> Enter username: moo
+C> Enter index (from server): 5
+C> Enter salt (from server): 19AI0Hc9jEkdFc
+
+The server reports the index and salt values used for that user.  They
+are sent over the network to the client.  (Simulate this by cutting and
+pasting from one window to the other.)
+
+C> A (to server): 5wCDXRxLIv/zLazYfKupV/OY3BlhTZuJ71wVgI0HcL1kSJEpkMuWF.xEz/BV2wlJl7vk5Eoz9KMS1ccnaatsVP5D6CBm7UA.yVB59EQFN0dNBirvX29NAFdtdMsMppo5tHRy987XjJWrWSLpeibq6emr.gP8nYyX75GQqSiMY1j
+C> Enter password:
+
+S> Enter A (from client): 5wCDXRxLIv/zLazYfKupV/OY3BlhTZuJ71wVgI0HcL1kSJEpkMuWF.xEz/BV2wlJl7vk5Eoz9KMS1ccnaatsVP5D6CBm7UA.yVB59EQFN0dNBirvX29NAFdtdMsMppo5tHRy987XjJWrWSLpeibq6emr.gP8nYyX75GQqSiMY1j
+
+Now the client calculates A and sends it to the server, and while the
+server is munching on that, the client gets the password from the user.
+
+S> B (to client): 9dcCpulxQAbaDXI0NHWY6B.QH6B9fsoXs/x/5SCNBNJm/6H6bYfbVrwNmdquhLZjYMvpcgGc2mBYqL77RNfw1kVQo17//GfsByECBIjRnrAn02ffX9Y/llJcfscAQiii0hyZhJf9PT5wE7pC7WUjIgSqckIZ0JLNDbSr7fJcrgw
+S> Session key: ebbcf3a45c968defdcfff6e144ad8d4f5412167c9716e79cbf7cacfe18257947ad46fa5d6418a1fd
+
+The server now calculates B and sends it to the client.  The session key
+is not sent -- it is a shared secret that can be used for encryption.
+
+C> Enter B (from server): 9dcCpulxQAbaDXI0NHWY6B.QH6B9fsoXs/x/5SCNBNJm/6H6bYfbVrwNmdquhLZjYMvpcgGc2mBYqL77RNfw1kVQo17//GfsByECBIjRnrAn02ffX9Y/llJcfscAQiii0hyZhJf9PT5wE7pC7WUjIgSqckIZ0JLNDbSr7fJcrgw
+C> Session key: ebbcf3a45c968defdcfff6e144ad8d4f5412167c9716e79cbf7cacfe18257947ad46fa5d6418a1fd
+C> Response (to server): b9ea99094a176c4be28eb469982066cc7146d180
+
+The client uses the B value to calculate its own copy of the shared secret
+session key, and sends a response to the server proving that it does know
+the correct key.
+
+S> Enter response (from client): b9ea99094a176c4be28eb469982066cc7146d180
+S> Authentication successful.
+S> Response (to client): cd46c839ccad2d0c76f3ca1905ae8ceda8d1c1dc
+
+The server authenticates the client.  (You're in!)
+
+C> Enter server response: cd46c839ccad2d0c76f3ca1905ae8ceda8d1c1dc
+C> Server authentication successful.
+
+The client authenticates the server (prevents server spoofing in the case
+where the session key isn't used to encrypt the channel -- a spoofed server
+might just respond with random values and _pretend_ to authenticate the
+client; but the spoofed server won't know the session key and this check
+catches that).
+
+Final note:
+
+Remember that many breaches of security involve buggy software, such as
+servers susceptible to buffer overflow exploits that totally bypass any
+passphrase, secure or not.  If an attacker roots your client, or the server,
+no form of authentication will work.  Consider MAC-based schemes if this
+worries you.
diff --git a/trunk/package/network/services/ead/src/tinysrp/acconfig.h b/trunk/package/network/services/ead/src/tinysrp/acconfig.h
new file mode 100644
index 00000000..b74aed08
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/acconfig.h
@@ -0,0 +1,9 @@
+#undef SHA1HANDSOFF
+
+#undef POSIX_TERMIOS
+
+#undef POSIX_SIGTYPE
+
+#undef VERSION
+
+#undef volatile
diff --git a/trunk/package/network/services/ead/src/tinysrp/acinclude.m4 b/trunk/package/network/services/ead/src/tinysrp/acinclude.m4
new file mode 100644
index 00000000..e0d0d04d
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/acinclude.m4
@@ -0,0 +1,27 @@
+dnl
+dnl check for signal type
+dnl
+dnl AC_RETSIGTYPE isn't quite right, but almost.
+dnl
+define(TYPE_SIGNAL,[
+AC_MSG_CHECKING([POSIX signal handlers])
+AC_CACHE_VAL(cv_has_posix_signals,
+[AC_TRY_COMPILE(
+[#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+#undef signal
+#endif
+extern void (*signal ()) ();], [],
+cv_has_posix_signals=yes, cv_has_posix_signals=no)])
+AC_MSG_RESULT($cv_has_posix_signals)
+if test $cv_has_posix_signals = yes; then
+   AC_DEFINE(RETSIGTYPE, void, [Return type is void])
+   AC_DEFINE(POSIX_SIGTYPE, [], [Have POSIX signals])
+else
+  if test $ac_cv_type_signal = void; then
+     AC_DEFINE(RETSIGTYPE, void, [Return type is void])
+  else
+     AC_DEFINE(RETSIGTYPE, int, [Return type is int])
+  fi
+fi])dnl
diff --git a/trunk/package/network/services/ead/src/tinysrp/aclocal.m4 b/trunk/package/network/services/ead/src/tinysrp/aclocal.m4
new file mode 100644
index 00000000..703fce4b
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/aclocal.m4
@@ -0,0 +1,157 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4a
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl
+dnl check for signal type
+dnl
+dnl AC_RETSIGTYPE isn't quite right, but almost.
+dnl
+define(TYPE_SIGNAL,[
+AC_MSG_CHECKING([POSIX signal handlers])
+AC_CACHE_VAL(cv_has_posix_signals,
+[AC_TRY_COMPILE(
+[#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+#undef signal
+#endif
+extern void (*signal ()) ();], [],
+cv_has_posix_signals=yes, cv_has_posix_signals=no)])
+AC_MSG_RESULT($cv_has_posix_signals)
+if test $cv_has_posix_signals = yes; then
+   AC_DEFINE(RETSIGTYPE, void, [Return type is void])
+   AC_DEFINE(POSIX_SIGTYPE, [], [Have POSIX signals])
+else
+  if test $ac_cv_type_signal = void; then
+     AC_DEFINE(RETSIGTYPE, void, [Return type is void])
+  else
+     AC_DEFINE(RETSIGTYPE, int, [Return type is int])
+  fi
+fi])dnl
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated.  We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+<<am_indx=1
+for am_file in <<$1>>; do
+  case " <<$>>CONFIG_HEADERS " in
+  *" <<$>>am_file "*<<)>>
+    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+    ;;
+  esac
+  am_indx=`expr "<<$>>am_indx" + 1`
+done<<>>dnl>>)
+changequote([,]))])
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "[$]*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "[$]2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+   $1=$2
+   AC_MSG_RESULT(found)
+else
+   $1="$3/missing $2"
+   AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn.h b/trunk/package/network/services/ead/src/tinysrp/bn.h
new file mode 100644
index 00000000..0144dd96
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn.h
@@ -0,0 +1,471 @@
+/* crypto/bn/bn.h */
+/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef HEADER_BN_H
+#define HEADER_BN_H
+
+#include <stdio.h> /* FILE */
+#include "config.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifdef VMS
+#undef BN_LLONG /* experimental, so far... */
+#endif
+
+#undef BN_MUL_COMBA
+#undef BN_SQR_COMBA
+#undef BN_RECURSION
+#undef RECP_MUL_MOD
+#undef MONT_MUL_MOD
+
+#if defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG == 8
+# if SIZEOF_LONG == 4
+#  define THIRTY_TWO_BIT
+# else
+#  define SIXTY_FOUR_BIT_LONG
+# endif
+#else
+# if SIZEOF_LONG == 4
+#  define THIRTY_TWO_BIT
+# endif
+#endif
+
+#undef BN_LLONG
+
+/* assuming long is 64bit - this is the DEC Alpha
+ * unsigned long long is only 64 bits :-(, don't define
+ * BN_LLONG for the DEC Alpha */
+#ifdef SIXTY_FOUR_BIT_LONG
+#define BN_ULLONG       unsigned long long
+#define BN_ULONG        unsigned long
+#define BN_LONG         long
+#define BN_BITS         128
+#define BN_BYTES        8
+#define BN_BITS2        64
+#define BN_BITS4        32
+#define BN_MASK         (0xffffffffffffffffffffffffffffffffLL)
+#define BN_MASK2        (0xffffffffffffffffL)
+#define BN_MASK2l       (0xffffffffL)
+#define BN_MASK2h       (0xffffffff00000000L)
+#define BN_MASK2h1      (0xffffffff80000000L)
+#define BN_TBIT         (0x8000000000000000L)
+#define BN_DEC_CONV     (10000000000000000000UL)
+#define BN_DEC_FMT1     "%lu"
+#define BN_DEC_FMT2     "%019lu"
+#define BN_DEC_NUM      19
+#endif
+
+/* This is where the long long data type is 64 bits, but long is 32.
+ * For machines where there are 64bit registers, this is the mode to use.
+ * IRIX, on R4000 and above should use this mode, along with the relevant
+ * assembler code :-).  Do NOT define BN_LLONG.
+ */
+#ifdef SIXTY_FOUR_BIT
+#undef BN_LLONG
+#undef BN_ULLONG
+#define BN_ULONG        unsigned long long
+#define BN_LONG         long long
+#define BN_BITS         128
+#define BN_BYTES        8
+#define BN_BITS2        64
+#define BN_BITS4        32
+#define BN_MASK2        (0xffffffffffffffffLL)
+#define BN_MASK2l       (0xffffffffL)
+#define BN_MASK2h       (0xffffffff00000000LL)
+#define BN_MASK2h1      (0xffffffff80000000LL)
+#define BN_TBIT         (0x8000000000000000LL)
+#define BN_DEC_CONV     (10000000000000000000LL)
+#define BN_DEC_FMT1     "%llu"
+#define BN_DEC_FMT2     "%019llu"
+#define BN_DEC_NUM      19
+#endif
+
+#ifdef THIRTY_TWO_BIT
+#if defined(WIN32) && !defined(__GNUC__)
+#define BN_ULLONG       unsigned _int64
+#else
+#define BN_ULLONG       unsigned long long
+#endif
+#define BN_ULONG        unsigned long
+#define BN_LONG         long
+#define BN_BITS         64
+#define BN_BYTES        4
+#define BN_BITS2        32
+#define BN_BITS4        16
+#ifdef WIN32
+/* VC++ doesn't like the LL suffix */
+#define BN_MASK         (0xffffffffffffffffL)
+#else
+#define BN_MASK         (0xffffffffffffffffLL)
+#endif
+#define BN_MASK2        (0xffffffffL)
+#define BN_MASK2l       (0xffff)
+#define BN_MASK2h1      (0xffff8000L)
+#define BN_MASK2h       (0xffff0000L)
+#define BN_TBIT         (0x80000000L)
+#define BN_DEC_CONV     (1000000000L)
+#define BN_DEC_FMT1     "%lu"
+#define BN_DEC_FMT2     "%09lu"
+#define BN_DEC_NUM      9
+#endif
+
+#ifdef SIXTEEN_BIT
+#ifndef BN_DIV2W
+#define BN_DIV2W
+#endif
+#define BN_ULLONG       unsigned long
+#define BN_ULONG        unsigned short
+#define BN_LONG         short
+#define BN_BITS         32
+#define BN_BYTES        2
+#define BN_BITS2        16
+#define BN_BITS4        8
+#define BN_MASK         (0xffffffff)
+#define BN_MASK2        (0xffff)
+#define BN_MASK2l       (0xff)
+#define BN_MASK2h1      (0xff80)
+#define BN_MASK2h       (0xff00)
+#define BN_TBIT         (0x8000)
+#define BN_DEC_CONV     (100000)
+#define BN_DEC_FMT1     "%u"
+#define BN_DEC_FMT2     "%05u"
+#define BN_DEC_NUM      5
+#endif
+
+#ifdef EIGHT_BIT
+#ifndef BN_DIV2W
+#define BN_DIV2W
+#endif
+#define BN_ULLONG       unsigned short
+#define BN_ULONG        unsigned char
+#define BN_LONG         char
+#define BN_BITS         16
+#define BN_BYTES        1
+#define BN_BITS2        8
+#define BN_BITS4        4
+#define BN_MASK         (0xffff)
+#define BN_MASK2        (0xff)
+#define BN_MASK2l       (0xf)
+#define BN_MASK2h1      (0xf8)
+#define BN_MASK2h       (0xf0)
+#define BN_TBIT         (0x80)
+#define BN_DEC_CONV     (100)
+#define BN_DEC_FMT1     "%u"
+#define BN_DEC_FMT2     "%02u"
+#define BN_DEC_NUM      2
+#endif
+
+#define BN_DEFAULT_BITS 1280
+
+#ifdef BIGNUM
+#undef BIGNUM
+#endif
+
+#define BN_FLG_MALLOCED         0x01
+#define BN_FLG_STATIC_DATA      0x02
+#define BN_FLG_FREE             0x8000  /* used for debuging */
+#define BN_set_flags(b,n)       ((b)->flags|=(n))
+#define BN_get_flags(b,n)       ((b)->flags&(n))
+
+typedef struct bignum_st
+	{
+	BN_ULONG *d;    /* Pointer to an array of 'BN_BITS2' bit chunks. */
+	int top;        /* Index of last used d +1. */
+	/* The next are internal book keeping for bn_expand. */
+	int dmax;       /* Size of the d array. */
+	int neg;        /* one if the number is negative */
+	int flags;
+	} BIGNUM;
+
+/* Used for temp variables */
+#define BN_CTX_NUM      12
+#define BN_CTX_NUM_POS  12
+typedef struct bignum_ctx
+	{
+	int tos;
+	BIGNUM bn[BN_CTX_NUM];
+	int flags;
+	int depth;
+	int pos[BN_CTX_NUM_POS];
+	int too_many;
+	} BN_CTX;
+
+/* Used for montgomery multiplication */
+typedef struct bn_mont_ctx_st
+	{
+	int ri;        /* number of bits in R */
+	BIGNUM RR;     /* used to convert to montgomery form */
+	BIGNUM N;      /* The modulus */
+	BIGNUM Ni;     /* R*(1/R mod N) - N*Ni = 1
+			* (Ni is only stored for bignum algorithm) */
+	BN_ULONG n0;   /* least significant word of Ni */
+	int flags;
+	} BN_MONT_CTX;
+
+/* Used for reciprocal division/mod functions
+ * It cannot be shared between threads
+ */
+typedef struct bn_recp_ctx_st
+	{
+	BIGNUM N;       /* the divisor */
+	BIGNUM Nr;      /* the reciprocal */
+	int num_bits;
+	int shift;
+	int flags;
+	} BN_RECP_CTX;
+
+#define BN_to_montgomery(r,a,mont,ctx)  BN_mod_mul_montgomery(\
+	r,a,&((mont)->RR),(mont),ctx)
+
+#define BN_prime_checks 0 /* default: select number of iterations
+			     based on the size of the number */
+
+/* number of Miller-Rabin iterations for an error rate  of less than 2^-80
+ * for random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook
+ * of Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996];
+ * original paper: Damgaard, Landrock, Pomerance: Average case error estimates
+ * for the strong probable prime test. -- Math. Comp. 61 (1993) 177-194) */
+#define BN_prime_checks_for_size(b) ((b) >= 1300 ?  2 : \
+				(b) >=  850 ?  3 : \
+				(b) >=  650 ?  4 : \
+				(b) >=  550 ?  5 : \
+				(b) >=  450 ?  6 : \
+				(b) >=  400 ?  7 : \
+				(b) >=  350 ?  8 : \
+				(b) >=  300 ?  9 : \
+				(b) >=  250 ? 12 : \
+				(b) >=  200 ? 15 : \
+				(b) >=  150 ? 18 : \
+				/* b >= 100 */ 27)
+
+#define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
+#define BN_is_word(a,w) (((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w)))
+#define BN_is_zero(a)   (((a)->top == 0) || BN_is_word(a,0))
+#define BN_is_one(a)    (BN_is_word((a),1))
+#define BN_is_odd(a)    (((a)->top > 0) && ((a)->d[0] & 1))
+#define BN_one(a)       (BN_set_word((a),1))
+#define BN_zero(a)      (BN_set_word((a),0))
+
+BIGNUM *BN_value_one(void);
+char *  BN_options(void);
+BN_CTX *BN_CTX_new(void);
+void    BN_CTX_init(BN_CTX *c);
+void    BN_CTX_free(BN_CTX *c);
+void    BN_CTX_start(BN_CTX *ctx);
+BIGNUM *BN_CTX_get(BN_CTX *ctx);
+void    BN_CTX_end(BN_CTX *ctx);
+int     BN_rand(BIGNUM *rnd, int bits, int top,int bottom);
+int     BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom);
+int     BN_num_bits(const BIGNUM *a);
+int     BN_num_bits_word(BN_ULONG);
+BIGNUM *BN_new(void);
+void    BN_init(BIGNUM *);
+void    BN_clear_free(BIGNUM *a);
+BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b);
+BIGNUM *BN_bin2bn(const unsigned char *s,int len,BIGNUM *ret);
+int     BN_bn2bin(const BIGNUM *a, unsigned char *to);
+int     BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
+int     BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
+int     BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
+int     BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
+int     BN_mod(BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
+int     BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
+	       BN_CTX *ctx);
+int     BN_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BN_CTX *ctx);
+int     BN_sqr(BIGNUM *r, BIGNUM *a,BN_CTX *ctx);
+BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w);
+BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w);
+int     BN_mul_word(BIGNUM *a, BN_ULONG w);
+int     BN_add_word(BIGNUM *a, BN_ULONG w);
+int     BN_sub_word(BIGNUM *a, BN_ULONG w);
+int     BN_set_word(BIGNUM *a, BN_ULONG w);
+BN_ULONG BN_get_word(BIGNUM *a);
+int     BN_cmp(const BIGNUM *a, const BIGNUM *b);
+void    BN_free(BIGNUM *a);
+int     BN_is_bit_set(const BIGNUM *a, int n);
+int     BN_lshift(BIGNUM *r, const BIGNUM *a, int n);
+int     BN_lshift1(BIGNUM *r, BIGNUM *a);
+int     BN_exp(BIGNUM *r, BIGNUM *a, BIGNUM *p,BN_CTX *ctx);
+int     BN_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+		   const BIGNUM *m,BN_CTX *ctx);
+int     BN_mod_exp_mont(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+			const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+int     BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
+			const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+int     BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+	const BIGNUM *m,BN_CTX *ctx);
+int     BN_mask_bits(BIGNUM *a,int n);
+int     BN_mod_mul(BIGNUM *ret, BIGNUM *a, BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
+int     BN_reciprocal(BIGNUM *r, BIGNUM *m, int len, BN_CTX *ctx);
+int     BN_rshift(BIGNUM *r, BIGNUM *a, int n);
+int     BN_rshift1(BIGNUM *r, BIGNUM *a);
+void    BN_clear(BIGNUM *a);
+BIGNUM *BN_dup(const BIGNUM *a);
+int     BN_ucmp(const BIGNUM *a, const BIGNUM *b);
+int     BN_set_bit(BIGNUM *a, int n);
+int     BN_clear_bit(BIGNUM *a, int n);
+int     BN_gcd(BIGNUM *r,BIGNUM *in_a,BIGNUM *in_b,BN_CTX *ctx);
+BIGNUM *BN_mod_inverse(BIGNUM *ret,BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
+BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,BIGNUM *add,
+		BIGNUM *rem,void (*callback)(int,int,void *),void *cb_arg);
+int     BN_is_prime(const BIGNUM *p,int nchecks,
+		void (*callback)(int,int,void *),
+		BN_CTX *ctx,void *cb_arg);
+int     BN_is_prime_fasttest(const BIGNUM *p,int nchecks,
+		void (*callback)(int,int,void *),BN_CTX *ctx,void *cb_arg,
+		int do_trial_division);
+
+BN_MONT_CTX *BN_MONT_CTX_new(void );
+void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
+int BN_mod_mul_montgomery(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_MONT_CTX *mont,
+			  BN_CTX *ctx);
+int BN_from_montgomery(BIGNUM *r,BIGNUM *a,BN_MONT_CTX *mont,BN_CTX *ctx);
+void BN_MONT_CTX_free(BN_MONT_CTX *mont);
+int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *modulus,BN_CTX *ctx);
+BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to,BN_MONT_CTX *from);
+
+void BN_set_params(int mul,int high,int low,int mont);
+int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */
+
+void    BN_RECP_CTX_init(BN_RECP_CTX *recp);
+BN_RECP_CTX *BN_RECP_CTX_new(void);
+void    BN_RECP_CTX_free(BN_RECP_CTX *recp);
+int     BN_RECP_CTX_set(BN_RECP_CTX *recp,const BIGNUM *rdiv,BN_CTX *ctx);
+int     BN_mod_mul_reciprocal(BIGNUM *r, BIGNUM *x, BIGNUM *y,
+		BN_RECP_CTX *recp,BN_CTX *ctx);
+int     BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+			const BIGNUM *m, BN_CTX *ctx);
+int     BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m,
+		BN_RECP_CTX *recp, BN_CTX *ctx);
+
+/* library internal functions */
+
+#define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->dmax)?\
+	(a):bn_expand2((a),(bits)/BN_BITS2+1))
+#define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words)))
+BIGNUM *bn_expand2(BIGNUM *a, int words);
+
+#define bn_fix_top(a) \
+	{ \
+	BN_ULONG *ftl; \
+	if ((a)->top > 0) \
+		{ \
+		for (ftl= &((a)->d[(a)->top-1]); (a)->top > 0; (a)->top--) \
+		if (*(ftl--)) break; \
+		} \
+	}
+
+BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);
+BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);
+void     bn_sqr_words(BN_ULONG *rp, BN_ULONG *ap, int num);
+BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);
+BN_ULONG bn_add_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);
+BN_ULONG bn_sub_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);
+
+#ifdef BN_DEBUG
+  void bn_dump1(FILE *o, const char *a, BN_ULONG *b,int n);
+# define bn_print(a) {fprintf(stderr, #a "="); BN_print_fp(stderr,a); \
+   fprintf(stderr,"\n");}
+# define bn_dump(a,n) bn_dump1(stderr,#a,a,n);
+#else
+# define bn_print(a)
+# define bn_dump(a,b)
+#endif
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
+/* Error codes for the BN functions. */
+
+/* Function codes. */
+#define BN_F_BN_CTX_GET                                  116
+#define BN_F_BN_CTX_NEW                                  106
+#define BN_F_BN_DIV                                      107
+#define BN_F_BN_EXPAND2                                  108
+#define BN_F_BN_MOD_EXP2_MONT                            118
+#define BN_F_BN_MOD_EXP_MONT                             109
+#define BN_F_BN_MOD_EXP_MONT_WORD                        117
+#define BN_F_BN_MOD_INVERSE                              110
+#define BN_F_BN_MOD_MUL_RECIPROCAL                       111
+#define BN_F_BN_MPI2BN                                   112
+#define BN_F_BN_NEW                                      113
+#define BN_F_BN_RAND                                     114
+#define BN_F_BN_USUB                                     115
+
+/* Reason codes. */
+#define BN_R_ARG2_LT_ARG3                                100
+#define BN_R_BAD_RECIPROCAL                              101
+#define BN_R_CALLED_WITH_EVEN_MODULUS                    102
+#define BN_R_DIV_BY_ZERO                                 103
+#define BN_R_ENCODING_ERROR                              104
+#define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA                105
+#define BN_R_INVALID_LENGTH                              106
+#define BN_R_NOT_INITIALIZED                             107
+#define BN_R_NO_INVERSE                                  108
+#define BN_R_TOO_MANY_TEMPORARY_VARIABLES                109
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_add.c b/trunk/package/network/services/ead/src/tinysrp/bn_add.c
new file mode 100644
index 00000000..aae4f2b9
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_add.c
@@ -0,0 +1,305 @@
+/* crypto/bn/bn_add.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "bn_lcl.h"
+
+/* r can == a or b */
+int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
+	{
+	const BIGNUM *tmp;
+
+	bn_check_top(a);
+	bn_check_top(b);
+
+	/*  a +  b      a+b
+	 *  a + -b      a-b
+	 * -a +  b      b-a
+	 * -a + -b      -(a+b)
+	 */
+	if (a->neg ^ b->neg)
+		{
+		/* only one is negative */
+		if (a->neg)
+			{ tmp=a; a=b; b=tmp; }
+
+		/* we are now a - b */
+
+		if (BN_ucmp(a,b) < 0)
+			{
+			if (!BN_usub(r,b,a)) return(0);
+			r->neg=1;
+			}
+		else
+			{
+			if (!BN_usub(r,a,b)) return(0);
+			r->neg=0;
+			}
+		return(1);
+		}
+
+	if (a->neg) /* both are neg */
+		r->neg=1;
+	else
+		r->neg=0;
+
+	if (!BN_uadd(r,a,b)) return(0);
+	return(1);
+	}
+
+/* unsigned add of b to a, r must be large enough */
+int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
+	{
+	register int i;
+	int max,min;
+	BN_ULONG *ap,*bp,*rp,carry,t1;
+	const BIGNUM *tmp;
+
+	bn_check_top(a);
+	bn_check_top(b);
+
+	if (a->top < b->top)
+		{ tmp=a; a=b; b=tmp; }
+	max=a->top;
+	min=b->top;
+
+	if (bn_wexpand(r,max+1) == NULL)
+		return(0);
+
+	r->top=max;
+
+
+	ap=a->d;
+	bp=b->d;
+	rp=r->d;
+	carry=0;
+
+	carry=bn_add_words(rp,ap,bp,min);
+	rp+=min;
+	ap+=min;
+	bp+=min;
+	i=min;
+
+	if (carry)
+		{
+		while (i < max)
+			{
+			i++;
+			t1= *(ap++);
+			if ((*(rp++)=(t1+1)&BN_MASK2) >= t1)
+				{
+				carry=0;
+				break;
+				}
+			}
+		if ((i >= max) && carry)
+			{
+			*(rp++)=1;
+			r->top++;
+			}
+		}
+	if (rp != ap)
+		{
+		for (; i<max; i++)
+			*(rp++)= *(ap++);
+		}
+	/* memcpy(rp,ap,sizeof(*ap)*(max-i));*/
+	return(1);
+	}
+
+/* unsigned subtraction of b from a, a must be larger than b. */
+int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
+	{
+	int max,min;
+	register BN_ULONG t1,t2,*ap,*bp,*rp;
+	int i,carry;
+#if defined(IRIX_CC_BUG) && !defined(LINT)
+	int dummy;
+#endif
+
+	bn_check_top(a);
+	bn_check_top(b);
+
+	if (a->top < b->top) /* hmm... should not be happening */
+		{
+		return(0);
+		}
+
+	max=a->top;
+	min=b->top;
+	if (bn_wexpand(r,max) == NULL) return(0);
+
+	ap=a->d;
+	bp=b->d;
+	rp=r->d;
+
+#if 1
+	carry=0;
+	for (i=0; i<min; i++)
+		{
+		t1= *(ap++);
+		t2= *(bp++);
+		if (carry)
+			{
+			carry=(t1 <= t2);
+			t1=(t1-t2-1)&BN_MASK2;
+			}
+		else
+			{
+			carry=(t1 < t2);
+			t1=(t1-t2)&BN_MASK2;
+			}
+#if defined(IRIX_CC_BUG) && !defined(LINT)
+		dummy=t1;
+#endif
+		*(rp++)=t1&BN_MASK2;
+		}
+#else
+	carry=bn_sub_words(rp,ap,bp,min);
+	ap+=min;
+	bp+=min;
+	rp+=min;
+	i=min;
+#endif
+	if (carry) /* subtracted */
+		{
+		while (i < max)
+			{
+			i++;
+			t1= *(ap++);
+			t2=(t1-1)&BN_MASK2;
+			*(rp++)=t2;
+			if (t1 > t2) break;
+			}
+		}
+#if 0
+	memcpy(rp,ap,sizeof(*rp)*(max-i));
+#else
+	if (rp != ap)
+		{
+		for (;;)
+			{
+			if (i++ >= max) break;
+			rp[0]=ap[0];
+			if (i++ >= max) break;
+			rp[1]=ap[1];
+			if (i++ >= max) break;
+			rp[2]=ap[2];
+			if (i++ >= max) break;
+			rp[3]=ap[3];
+			rp+=4;
+			ap+=4;
+			}
+		}
+#endif
+
+	r->top=max;
+	bn_fix_top(r);
+	return(1);
+	}
+
+int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
+	{
+	int max;
+	int add=0,neg=0;
+	const BIGNUM *tmp;
+
+	bn_check_top(a);
+	bn_check_top(b);
+
+	/*  a -  b      a-b
+	 *  a - -b      a+b
+	 * -a -  b      -(a+b)
+	 * -a - -b      b-a
+	 */
+	if (a->neg)
+		{
+		if (b->neg)
+			{ tmp=a; a=b; b=tmp; }
+		else
+			{ add=1; neg=1; }
+		}
+	else
+		{
+		if (b->neg) { add=1; neg=0; }
+		}
+
+	if (add)
+		{
+		if (!BN_uadd(r,a,b)) return(0);
+		r->neg=neg;
+		return(1);
+		}
+
+	/* We are actually doing a - b :-) */
+
+	max=(a->top > b->top)?a->top:b->top;
+	if (bn_wexpand(r,max) == NULL) return(0);
+	if (BN_ucmp(a,b) < 0)
+		{
+		if (!BN_usub(r,b,a)) return(0);
+		r->neg=1;
+		}
+	else
+		{
+		if (!BN_usub(r,a,b)) return(0);
+		r->neg=0;
+		}
+	return(1);
+	}
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_asm.c b/trunk/package/network/services/ead/src/tinysrp/bn_asm.c
new file mode 100644
index 00000000..b24c9af7
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_asm.c
@@ -0,0 +1,382 @@
+/* crypto/bn/bn_asm.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef BN_DEBUG
+# undef NDEBUG /* avoid conflicting definitions */
+# define NDEBUG
+#endif
+
+#include <stdio.h>
+#include <assert.h>
+#include "bn_lcl.h"
+
+#if defined(BN_LLONG) || defined(BN_UMULT_HIGH)
+
+BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
+	{
+	BN_ULONG c1=0;
+
+	assert(num >= 0);
+	if (num <= 0) return(c1);
+
+	while (num&~3)
+		{
+		mul_add(rp[0],ap[0],w,c1);
+		mul_add(rp[1],ap[1],w,c1);
+		mul_add(rp[2],ap[2],w,c1);
+		mul_add(rp[3],ap[3],w,c1);
+		ap+=4; rp+=4; num-=4;
+		}
+	if (num)
+		{
+		mul_add(rp[0],ap[0],w,c1); if (--num==0) return c1;
+		mul_add(rp[1],ap[1],w,c1); if (--num==0) return c1;
+		mul_add(rp[2],ap[2],w,c1); return c1;
+		}
+
+	return(c1);
+	}
+
+BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
+	{
+	BN_ULONG c1=0;
+
+	assert(num >= 0);
+	if (num <= 0) return(c1);
+
+	while (num&~3)
+		{
+		mul(rp[0],ap[0],w,c1);
+		mul(rp[1],ap[1],w,c1);
+		mul(rp[2],ap[2],w,c1);
+		mul(rp[3],ap[3],w,c1);
+		ap+=4; rp+=4; num-=4;
+		}
+	if (num)
+		{
+		mul(rp[0],ap[0],w,c1); if (--num == 0) return c1;
+		mul(rp[1],ap[1],w,c1); if (--num == 0) return c1;
+		mul(rp[2],ap[2],w,c1);
+		}
+	return(c1);
+	}
+
+void bn_sqr_words(BN_ULONG *r, BN_ULONG *a, int n)
+	{
+	assert(n >= 0);
+	if (n <= 0) return;
+	while (n&~3)
+		{
+		sqr(r[0],r[1],a[0]);
+		sqr(r[2],r[3],a[1]);
+		sqr(r[4],r[5],a[2]);
+		sqr(r[6],r[7],a[3]);
+		a+=4; r+=8; n-=4;
+		}
+	if (n)
+		{
+		sqr(r[0],r[1],a[0]); if (--n == 0) return;
+		sqr(r[2],r[3],a[1]); if (--n == 0) return;
+		sqr(r[4],r[5],a[2]);
+		}
+	}
+
+#else /* !(defined(BN_LLONG) || defined(BN_UMULT_HIGH)) */
+
+BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
+	{
+	BN_ULONG c=0;
+	BN_ULONG bl,bh;
+
+	assert(num >= 0);
+	if (num <= 0) return((BN_ULONG)0);
+
+	bl=LBITS(w);
+	bh=HBITS(w);
+
+	for (;;)
+		{
+		mul_add(rp[0],ap[0],bl,bh,c);
+		if (--num == 0) break;
+		mul_add(rp[1],ap[1],bl,bh,c);
+		if (--num == 0) break;
+		mul_add(rp[2],ap[2],bl,bh,c);
+		if (--num == 0) break;
+		mul_add(rp[3],ap[3],bl,bh,c);
+		if (--num == 0) break;
+		ap+=4;
+		rp+=4;
+		}
+	return(c);
+	}
+
+BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
+	{
+	BN_ULONG carry=0;
+	BN_ULONG bl,bh;
+
+	assert(num >= 0);
+	if (num <= 0) return((BN_ULONG)0);
+
+	bl=LBITS(w);
+	bh=HBITS(w);
+
+	for (;;)
+		{
+		mul(rp[0],ap[0],bl,bh,carry);
+		if (--num == 0) break;
+		mul(rp[1],ap[1],bl,bh,carry);
+		if (--num == 0) break;
+		mul(rp[2],ap[2],bl,bh,carry);
+		if (--num == 0) break;
+		mul(rp[3],ap[3],bl,bh,carry);
+		if (--num == 0) break;
+		ap+=4;
+		rp+=4;
+		}
+	return(carry);
+	}
+
+void bn_sqr_words(BN_ULONG *r, BN_ULONG *a, int n)
+	{
+	assert(n >= 0);
+	if (n <= 0) return;
+	for (;;)
+		{
+		sqr64(r[0],r[1],a[0]);
+		if (--n == 0) break;
+
+		sqr64(r[2],r[3],a[1]);
+		if (--n == 0) break;
+
+		sqr64(r[4],r[5],a[2]);
+		if (--n == 0) break;
+
+		sqr64(r[6],r[7],a[3]);
+		if (--n == 0) break;
+
+		a+=4;
+		r+=8;
+		}
+	}
+
+#endif /* !(defined(BN_LLONG) || defined(BN_UMULT_HIGH)) */
+
+#if defined(BN_LLONG) && defined(BN_DIV2W)
+
+BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
+	{
+	return((BN_ULONG)(((((BN_ULLONG)h)<<BN_BITS2)|l)/(BN_ULLONG)d));
+	}
+
+#else
+
+/* Divide h,l by d and return the result. */
+/* I need to test this some more :-( */
+BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
+	{
+	BN_ULONG dh,dl,q,ret=0,th,tl,t;
+	int i,count=2;
+
+	if (d == 0) return(BN_MASK2);
+
+	i=BN_num_bits_word(d);
+	assert((i == BN_BITS2) || (h > (BN_ULONG)1<<i));
+
+	i=BN_BITS2-i;
+	if (h >= d) h-=d;
+
+	if (i)
+		{
+		d<<=i;
+		h=(h<<i)|(l>>(BN_BITS2-i));
+		l<<=i;
+		}
+	dh=(d&BN_MASK2h)>>BN_BITS4;
+	dl=(d&BN_MASK2l);
+	for (;;)
+		{
+		if ((h>>BN_BITS4) == dh)
+			q=BN_MASK2l;
+		else
+			q=h/dh;
+
+		th=q*dh;
+		tl=dl*q;
+		for (;;)
+			{
+			t=h-th;
+			if ((t&BN_MASK2h) ||
+				((tl) <= (
+					(t<<BN_BITS4)|
+					((l&BN_MASK2h)>>BN_BITS4))))
+				break;
+			q--;
+			th-=dh;
+			tl-=dl;
+			}
+		t=(tl>>BN_BITS4);
+		tl=(tl<<BN_BITS4)&BN_MASK2h;
+		th+=t;
+
+		if (l < tl) th++;
+		l-=tl;
+		if (h < th)
+			{
+			h+=d;
+			q--;
+			}
+		h-=th;
+
+		if (--count == 0) break;
+
+		ret=q<<BN_BITS4;
+		h=((h<<BN_BITS4)|(l>>BN_BITS4))&BN_MASK2;
+		l=(l&BN_MASK2l)<<BN_BITS4;
+		}
+	ret|=q;
+	return(ret);
+	}
+#endif /* !defined(BN_LLONG) && defined(BN_DIV2W) */
+
+#ifdef BN_LLONG
+BN_ULONG bn_add_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
+	{
+	BN_ULLONG ll=0;
+
+	assert(n >= 0);
+	if (n <= 0) return((BN_ULONG)0);
+
+	for (;;)
+		{
+		ll+=(BN_ULLONG)a[0]+b[0];
+		r[0]=(BN_ULONG)ll&BN_MASK2;
+		ll>>=BN_BITS2;
+		if (--n <= 0) break;
+
+		ll+=(BN_ULLONG)a[1]+b[1];
+		r[1]=(BN_ULONG)ll&BN_MASK2;
+		ll>>=BN_BITS2;
+		if (--n <= 0) break;
+
+		ll+=(BN_ULLONG)a[2]+b[2];
+		r[2]=(BN_ULONG)ll&BN_MASK2;
+		ll>>=BN_BITS2;
+		if (--n <= 0) break;
+
+		ll+=(BN_ULLONG)a[3]+b[3];
+		r[3]=(BN_ULONG)ll&BN_MASK2;
+		ll>>=BN_BITS2;
+		if (--n <= 0) break;
+
+		a+=4;
+		b+=4;
+		r+=4;
+		}
+	return((BN_ULONG)ll);
+	}
+#else /* !BN_LLONG */
+BN_ULONG bn_add_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
+	{
+	BN_ULONG c,l,t;
+
+	assert(n >= 0);
+	if (n <= 0) return((BN_ULONG)0);
+
+	c=0;
+	for (;;)
+		{
+		t=a[0];
+		t=(t+c)&BN_MASK2;
+		c=(t < c);
+		l=(t+b[0])&BN_MASK2;
+		c+=(l < t);
+		r[0]=l;
+		if (--n <= 0) break;
+
+		t=a[1];
+		t=(t+c)&BN_MASK2;
+		c=(t < c);
+		l=(t+b[1])&BN_MASK2;
+		c+=(l < t);
+		r[1]=l;
+		if (--n <= 0) break;
+
+		t=a[2];
+		t=(t+c)&BN_MASK2;
+		c=(t < c);
+		l=(t+b[2])&BN_MASK2;
+		c+=(l < t);
+		r[2]=l;
+		if (--n <= 0) break;
+
+		t=a[3];
+		t=(t+c)&BN_MASK2;
+		c=(t < c);
+		l=(t+b[3])&BN_MASK2;
+		c+=(l < t);
+		r[3]=l;
+		if (--n <= 0) break;
+
+		a+=4;
+		b+=4;
+		r+=4;
+		}
+	return((BN_ULONG)c);
+	}
+#endif /* !BN_LLONG */
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_ctx.c b/trunk/package/network/services/ead/src/tinysrp/bn_ctx.c
new file mode 100644
index 00000000..20a6605a
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_ctx.c
@@ -0,0 +1,142 @@
+/* crypto/bn/bn_ctx.c */
+/* Written by Ulf Moeller for the OpenSSL project. */
+/* ====================================================================
+ * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef BN_CTX_DEBUG
+# undef NDEBUG /* avoid conflicting definitions */
+# define NDEBUG
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <bn.h>
+
+
+BN_CTX *BN_CTX_new(void)
+	{
+	BN_CTX *ret;
+
+	ret=(BN_CTX *)malloc(sizeof(BN_CTX));
+	if (ret == NULL)
+		{
+		return(NULL);
+		}
+
+	BN_CTX_init(ret);
+	ret->flags=BN_FLG_MALLOCED;
+	return(ret);
+	}
+
+void BN_CTX_init(BN_CTX *ctx)
+	{
+	int i;
+	ctx->tos = 0;
+	ctx->flags = 0;
+	ctx->depth = 0;
+	ctx->too_many = 0;
+	for (i = 0; i < BN_CTX_NUM; i++)
+		BN_init(&(ctx->bn[i]));
+	}
+
+void BN_CTX_free(BN_CTX *ctx)
+	{
+	int i;
+
+	if (ctx == NULL) return;
+	assert(ctx->depth == 0);
+
+	for (i=0; i < BN_CTX_NUM; i++)
+		BN_clear_free(&(ctx->bn[i]));
+	if (ctx->flags & BN_FLG_MALLOCED)
+		free(ctx);
+	}
+
+void BN_CTX_start(BN_CTX *ctx)
+	{
+	if (ctx->depth < BN_CTX_NUM_POS)
+		ctx->pos[ctx->depth] = ctx->tos;
+	ctx->depth++;
+	}
+
+BIGNUM *BN_CTX_get(BN_CTX *ctx)
+	{
+	if (ctx->depth > BN_CTX_NUM_POS || ctx->tos >= BN_CTX_NUM)
+		{
+		if (!ctx->too_many)
+			{
+			/* disable error code until BN_CTX_end is called: */
+			ctx->too_many = 1;
+			}
+		return NULL;
+		}
+	return (&(ctx->bn[ctx->tos++]));
+	}
+
+void BN_CTX_end(BN_CTX *ctx)
+	{
+	if (ctx == NULL) return;
+	assert(ctx->depth > 0);
+	if (ctx->depth == 0)
+		/* should never happen, but we can tolerate it if not in
+		 * debug mode (could be a 'goto err' in the calling function
+		 * before BN_CTX_start was reached) */
+		BN_CTX_start(ctx);
+
+	ctx->too_many = 0;
+	ctx->depth--;
+	if (ctx->depth < BN_CTX_NUM_POS)
+		ctx->tos = ctx->pos[ctx->depth];
+	}
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_div.c b/trunk/package/network/services/ead/src/tinysrp/bn_div.c
new file mode 100644
index 00000000..fd21913d
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_div.c
@@ -0,0 +1,378 @@
+/* crypto/bn/bn_div.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "bn_lcl.h"
+
+#define NO_ASM
+
+/* The old slow way */
+#if 0
+int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
+	   BN_CTX *ctx)
+	{
+	int i,nm,nd;
+	int ret = 0;
+	BIGNUM *D;
+
+	bn_check_top(m);
+	bn_check_top(d);
+	if (BN_is_zero(d))
+		{
+		return(0);
+		}
+
+	if (BN_ucmp(m,d) < 0)
+		{
+		if (rem != NULL)
+			{ if (BN_copy(rem,m) == NULL) return(0); }
+		if (dv != NULL) BN_zero(dv);
+		return(1);
+		}
+
+	BN_CTX_start(ctx);
+	D = BN_CTX_get(ctx);
+	if (dv == NULL) dv = BN_CTX_get(ctx);
+	if (rem == NULL) rem = BN_CTX_get(ctx);
+	if (D == NULL || dv == NULL || rem == NULL)
+		goto end;
+
+	nd=BN_num_bits(d);
+	nm=BN_num_bits(m);
+	if (BN_copy(D,d) == NULL) goto end;
+	if (BN_copy(rem,m) == NULL) goto end;
+
+	/* The next 2 are needed so we can do a dv->d[0]|=1 later
+	 * since BN_lshift1 will only work once there is a value :-) */
+	BN_zero(dv);
+	bn_wexpand(dv,1);
+	dv->top=1;
+
+	if (!BN_lshift(D,D,nm-nd)) goto end;
+	for (i=nm-nd; i>=0; i--)
+		{
+		if (!BN_lshift1(dv,dv)) goto end;
+		if (BN_ucmp(rem,D) >= 0)
+			{
+			dv->d[0]|=1;
+			if (!BN_usub(rem,rem,D)) goto end;
+			}
+/* CAN IMPROVE (and have now :=) */
+		if (!BN_rshift1(D,D)) goto end;
+		}
+	rem->neg=BN_is_zero(rem)?0:m->neg;
+	dv->neg=m->neg^d->neg;
+	ret = 1;
+ end:
+	BN_CTX_end(ctx);
+	return(ret);
+	}
+
+#else
+
+#if !defined(NO_ASM) && !defined(NO_INLINE_ASM) && !defined(PEDANTIC) && !defined(BN_DIV3W)
+# if defined(__GNUC__) && __GNUC__>=2
+#  if defined(__i386)
+   /*
+    * There were two reasons for implementing this template:
+    * - GNU C generates a call to a function (__udivdi3 to be exact)
+    *   in reply to ((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0 (I fail to
+    *   understand why...);
+    * - divl doesn't only calculate quotient, but also leaves
+    *   remainder in %edx which we can definitely use here:-)
+    *
+    *                                   <appro@fy.chalmers.se>
+    */
+#  define bn_div_words(n0,n1,d0)                \
+	({  asm volatile (                      \
+		"divl   %4"                     \
+		: "=a"(q), "=d"(rem)            \
+		: "a"(n1), "d"(n0), "g"(d0)     \
+		: "cc");                        \
+	    q;                                  \
+	})
+#  define REMAINDER_IS_ALREADY_CALCULATED
+#  endif /* __<cpu> */
+# endif /* __GNUC__ */
+#endif /* NO_ASM */
+
+int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
+	   BN_CTX *ctx)
+	{
+	int norm_shift,i,j,loop;
+	BIGNUM *tmp,wnum,*snum,*sdiv,*res;
+	BN_ULONG *resp,*wnump;
+	BN_ULONG d0,d1;
+	int num_n,div_n;
+
+	bn_check_top(num);
+	bn_check_top(divisor);
+
+	if (BN_is_zero(divisor))
+		{
+		return(0);
+		}
+
+	if (BN_ucmp(num,divisor) < 0)
+		{
+		if (rm != NULL)
+			{ if (BN_copy(rm,num) == NULL) return(0); }
+		if (dv != NULL) BN_zero(dv);
+		return(1);
+		}
+
+	BN_CTX_start(ctx);
+	tmp=BN_CTX_get(ctx);
+	tmp->neg=0;
+	snum=BN_CTX_get(ctx);
+	sdiv=BN_CTX_get(ctx);
+	if (dv == NULL)
+		res=BN_CTX_get(ctx);
+	else    res=dv;
+	if (res == NULL) goto err;
+
+	/* First we normalise the numbers */
+	norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2);
+	BN_lshift(sdiv,divisor,norm_shift);
+	sdiv->neg=0;
+	norm_shift+=BN_BITS2;
+	BN_lshift(snum,num,norm_shift);
+	snum->neg=0;
+	div_n=sdiv->top;
+	num_n=snum->top;
+	loop=num_n-div_n;
+
+	/* Lets setup a 'window' into snum
+	 * This is the part that corresponds to the current
+	 * 'area' being divided */
+	BN_init(&wnum);
+	wnum.d=  &(snum->d[loop]);
+	wnum.top= div_n;
+	wnum.dmax= snum->dmax+1; /* a bit of a lie */
+
+	/* Get the top 2 words of sdiv */
+	/* i=sdiv->top; */
+	d0=sdiv->d[div_n-1];
+	d1=(div_n == 1)?0:sdiv->d[div_n-2];
+
+	/* pointer to the 'top' of snum */
+	wnump= &(snum->d[num_n-1]);
+
+	/* Setup to 'res' */
+	res->neg= (num->neg^divisor->neg);
+	if (!bn_wexpand(res,(loop+1))) goto err;
+	res->top=loop;
+	resp= &(res->d[loop-1]);
+
+	/* space for temp */
+	if (!bn_wexpand(tmp,(div_n+1))) goto err;
+
+	if (BN_ucmp(&wnum,sdiv) >= 0)
+		{
+		if (!BN_usub(&wnum,&wnum,sdiv)) goto err;
+		*resp=1;
+		res->d[res->top-1]=1;
+		}
+	else
+		res->top--;
+	resp--;
+
+	for (i=0; i<loop-1; i++)
+		{
+		BN_ULONG q,l0;
+#ifdef BN_DIV3W
+		q=bn_div_3_words(wnump,d1,d0);
+#else
+		BN_ULONG n0,n1,rem=0;
+
+		n0=wnump[0];
+		n1=wnump[-1];
+		if (n0 == d0)
+			q=BN_MASK2;
+		else                    /* n0 < d0 */
+			{
+#ifdef BN_LLONG
+			BN_ULLONG t2;
+
+#if defined(BN_LLONG) && defined(BN_DIV2W) && !defined(bn_div_words)
+			q=(BN_ULONG)(((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0);
+#else
+			q=bn_div_words(n0,n1,d0);
+#endif
+
+#ifndef REMAINDER_IS_ALREADY_CALCULATED
+			/*
+			 * rem doesn't have to be BN_ULLONG. The least we
+			 * know it's less that d0, isn't it?
+			 */
+			rem=(n1-q*d0)&BN_MASK2;
+#endif
+			t2=(BN_ULLONG)d1*q;
+
+			for (;;)
+				{
+				if (t2 <= ((((BN_ULLONG)rem)<<BN_BITS2)|wnump[-2]))
+					break;
+				q--;
+				rem += d0;
+				if (rem < d0) break; /* don't let rem overflow */
+				t2 -= d1;
+				}
+#else /* !BN_LLONG */
+			BN_ULONG t2l,t2h,ql,qh;
+
+			q=bn_div_words(n0,n1,d0);
+#ifndef REMAINDER_IS_ALREADY_CALCULATED
+			rem=(n1-q*d0)&BN_MASK2;
+#endif
+
+#ifdef BN_UMULT_HIGH
+			t2l = d1 * q;
+			t2h = BN_UMULT_HIGH(d1,q);
+#else
+			t2l=LBITS(d1); t2h=HBITS(d1);
+			ql =LBITS(q);  qh =HBITS(q);
+			mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */
+#endif
+
+			for (;;)
+				{
+				if ((t2h < rem) ||
+					((t2h == rem) && (t2l <= wnump[-2])))
+					break;
+				q--;
+				rem += d0;
+				if (rem < d0) break; /* don't let rem overflow */
+				if (t2l < d1) t2h--; t2l -= d1;
+				}
+#endif /* !BN_LLONG */
+			}
+#endif /* !BN_DIV3W */
+
+		l0=bn_mul_words(tmp->d,sdiv->d,div_n,q);
+		wnum.d--; wnum.top++;
+		tmp->d[div_n]=l0;
+		for (j=div_n+1; j>0; j--)
+			if (tmp->d[j-1]) break;
+		tmp->top=j;
+
+		j=wnum.top;
+		BN_sub(&wnum,&wnum,tmp);
+
+		snum->top=snum->top+wnum.top-j;
+
+		if (wnum.neg)
+			{
+			q--;
+			j=wnum.top;
+			BN_add(&wnum,&wnum,sdiv);
+			snum->top+=wnum.top-j;
+			}
+		*(resp--)=q;
+		wnump--;
+		}
+	if (rm != NULL)
+		{
+		BN_rshift(rm,snum,norm_shift);
+		rm->neg=num->neg;
+		}
+	BN_CTX_end(ctx);
+	return(1);
+err:
+	BN_CTX_end(ctx);
+	return(0);
+	}
+
+#endif
+
+/* rem != m */
+int BN_mod(BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
+	{
+#if 0 /* The old slow way */
+	int i,nm,nd;
+	BIGNUM *dv;
+
+	if (BN_ucmp(m,d) < 0)
+		return((BN_copy(rem,m) == NULL)?0:1);
+
+	BN_CTX_start(ctx);
+	dv=BN_CTX_get(ctx);
+
+	if (!BN_copy(rem,m)) goto err;
+
+	nm=BN_num_bits(rem);
+	nd=BN_num_bits(d);
+	if (!BN_lshift(dv,d,nm-nd)) goto err;
+	for (i=nm-nd; i>=0; i--)
+		{
+		if (BN_cmp(rem,dv) >= 0)
+			{
+			if (!BN_sub(rem,rem,dv)) goto err;
+			}
+		if (!BN_rshift1(dv,dv)) goto err;
+		}
+	BN_CTX_end(ctx);
+	return(1);
+ err:
+	BN_CTX_end(ctx);
+	return(0);
+#else
+	return(BN_div(NULL,rem,m,d,ctx));
+#endif
+	}
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_exp.c b/trunk/package/network/services/ead/src/tinysrp/bn_exp.c
new file mode 100644
index 00000000..09afb79f
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_exp.c
@@ -0,0 +1,395 @@
+/* crypto/bn/bn_exp.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#include <stdio.h>
+#include "bn_lcl.h"
+
+#define TABLE_SIZE      32
+
+/* slow but works */
+int BN_mod_mul(BIGNUM *ret, BIGNUM *a, BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
+	{
+	BIGNUM *t;
+	int r=0;
+
+	bn_check_top(a);
+	bn_check_top(b);
+	bn_check_top(m);
+
+	BN_CTX_start(ctx);
+	if ((t = BN_CTX_get(ctx)) == NULL) goto err;
+	if (a == b)
+		{ if (!BN_sqr(t,a,ctx)) goto err; }
+	else
+		{ if (!BN_mul(t,a,b,ctx)) goto err; }
+	if (!BN_mod(ret,t,m,ctx)) goto err;
+	r=1;
+err:
+	BN_CTX_end(ctx);
+	return(r);
+	}
+
+int BN_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
+	       BN_CTX *ctx)
+	{
+	int ret;
+
+	bn_check_top(a);
+	bn_check_top(p);
+	bn_check_top(m);
+
+#ifdef MONT_MUL_MOD
+	/* I have finally been able to take out this pre-condition of
+	 * the top bit being set.  It was caused by an error in BN_div
+	 * with negatives.  There was also another problem when for a^b%m
+	 * a >= m.  eay 07-May-97 */
+/*      if ((m->d[m->top-1]&BN_TBIT) && BN_is_odd(m)) */
+
+	if (BN_is_odd(m))
+		{
+		if (a->top == 1)
+			{
+			BN_ULONG A = a->d[0];
+			ret=BN_mod_exp_mont_word(r,A,p,m,ctx,NULL);
+			}
+		else
+			ret=BN_mod_exp_mont(r,a,p,m,ctx,NULL);
+		}
+	else
+#endif
+#ifdef RECP_MUL_MOD
+		{ ret=BN_mod_exp_recp(r,a,p,m,ctx); }
+#else
+		{ ret=BN_mod_exp_simple(r,a,p,m,ctx); }
+#endif
+
+	return(ret);
+	}
+
+
+#ifdef RECP_MUL_MOD
+int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+		    const BIGNUM *m, BN_CTX *ctx)
+	{
+	int i,j,bits,ret=0,wstart,wend,window,wvalue;
+	int start=1,ts=0;
+	BIGNUM *aa;
+	BIGNUM val[TABLE_SIZE];
+	BN_RECP_CTX recp;
+
+	bits=BN_num_bits(p);
+
+	if (bits == 0)
+		{
+		BN_one(r);
+		return(1);
+		}
+
+	BN_CTX_start(ctx);
+	if ((aa = BN_CTX_get(ctx)) == NULL) goto err;
+
+	BN_RECP_CTX_init(&recp);
+	if (BN_RECP_CTX_set(&recp,m,ctx) <= 0) goto err;
+
+	BN_init(&(val[0]));
+	ts=1;
+
+	if (!BN_mod(&(val[0]),a,m,ctx)) goto err;               /* 1 */
+
+	window = BN_window_bits_for_exponent_size(bits);
+	if (window > 1)
+		{
+		if (!BN_mod_mul_reciprocal(aa,&(val[0]),&(val[0]),&recp,ctx))
+			goto err;                               /* 2 */
+		j=1<<(window-1);
+		for (i=1; i<j; i++)
+			{
+			BN_init(&val[i]);
+			if (!BN_mod_mul_reciprocal(&(val[i]),&(val[i-1]),aa,&recp,ctx))
+				goto err;
+			}
+		ts=i;
+		}
+
+	start=1;        /* This is used to avoid multiplication etc
+			 * when there is only the value '1' in the
+			 * buffer. */
+	wvalue=0;       /* The 'value' of the window */
+	wstart=bits-1;  /* The top bit of the window */
+	wend=0;         /* The bottom bit of the window */
+
+	if (!BN_one(r)) goto err;
+
+	for (;;)
+		{
+		if (BN_is_bit_set(p,wstart) == 0)
+			{
+			if (!start)
+				if (!BN_mod_mul_reciprocal(r,r,r,&recp,ctx))
+				goto err;
+			if (wstart == 0) break;
+			wstart--;
+			continue;
+			}
+		/* We now have wstart on a 'set' bit, we now need to work out
+		 * how bit a window to do.  To do this we need to scan
+		 * forward until the last set bit before the end of the
+		 * window */
+		j=wstart;
+		wvalue=1;
+		wend=0;
+		for (i=1; i<window; i++)
+			{
+			if (wstart-i < 0) break;
+			if (BN_is_bit_set(p,wstart-i))
+				{
+				wvalue<<=(i-wend);
+				wvalue|=1;
+				wend=i;
+				}
+			}
+
+		/* wend is the size of the current window */
+		j=wend+1;
+		/* add the 'bytes above' */
+		if (!start)
+			for (i=0; i<j; i++)
+				{
+				if (!BN_mod_mul_reciprocal(r,r,r,&recp,ctx))
+					goto err;
+				}
+
+		/* wvalue will be an odd number < 2^window */
+		if (!BN_mod_mul_reciprocal(r,r,&(val[wvalue>>1]),&recp,ctx))
+			goto err;
+
+		/* move the 'window' down further */
+		wstart-=wend+1;
+		wvalue=0;
+		start=0;
+		if (wstart < 0) break;
+		}
+	ret=1;
+err:
+	BN_CTX_end(ctx);
+	for (i=0; i<ts; i++)
+		BN_clear_free(&(val[i]));
+	BN_RECP_CTX_free(&recp);
+	return(ret);
+	}
+#else
+
+/* The old fallback, simple version :-) */
+int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+	     const BIGNUM *m, BN_CTX *ctx)
+	{
+	int i,j,bits,ret=0,wstart,wend,window,wvalue,ts=0;
+	int start=1;
+	BIGNUM *d;
+	BIGNUM val[TABLE_SIZE];
+
+	bits=BN_num_bits(p);
+
+	if (bits == 0)
+		{
+		BN_one(r);
+		return(1);
+		}
+
+	BN_CTX_start(ctx);
+	if ((d = BN_CTX_get(ctx)) == NULL) goto err;
+
+	BN_init(&(val[0]));
+	ts=1;
+	if (!BN_mod(&(val[0]),a,m,ctx)) goto err;               /* 1 */
+
+	window = BN_window_bits_for_exponent_size(bits);
+	if (window > 1)
+		{
+		if (!BN_mod_mul(d,&(val[0]),&(val[0]),m,ctx))
+			goto err;                               /* 2 */
+		j=1<<(window-1);
+		for (i=1; i<j; i++)
+			{
+			BN_init(&(val[i]));
+			if (!BN_mod_mul(&(val[i]),&(val[i-1]),d,m,ctx))
+				goto err;
+			}
+		ts=i;
+		}
+
+	start=1;        /* This is used to avoid multiplication etc
+			 * when there is only the value '1' in the
+			 * buffer. */
+	wvalue=0;       /* The 'value' of the window */
+	wstart=bits-1;  /* The top bit of the window */
+	wend=0;         /* The bottom bit of the window */
+
+	if (!BN_one(r)) goto err;
+
+	for (;;)
+		{
+		if (BN_is_bit_set(p,wstart) == 0)
+			{
+			if (!start)
+				if (!BN_mod_mul(r,r,r,m,ctx))
+				goto err;
+			if (wstart == 0) break;
+			wstart--;
+			continue;
+			}
+		/* We now have wstart on a 'set' bit, we now need to work out
+		 * how bit a window to do.  To do this we need to scan
+		 * forward until the last set bit before the end of the
+		 * window */
+		j=wstart;
+		wvalue=1;
+		wend=0;
+		for (i=1; i<window; i++)
+			{
+			if (wstart-i < 0) break;
+			if (BN_is_bit_set(p,wstart-i))
+				{
+				wvalue<<=(i-wend);
+				wvalue|=1;
+				wend=i;
+				}
+			}
+
+		/* wend is the size of the current window */
+		j=wend+1;
+		/* add the 'bytes above' */
+		if (!start)
+			for (i=0; i<j; i++)
+				{
+				if (!BN_mod_mul(r,r,r,m,ctx))
+					goto err;
+				}
+
+		/* wvalue will be an odd number < 2^window */
+		if (!BN_mod_mul(r,r,&(val[wvalue>>1]),m,ctx))
+			goto err;
+
+		/* move the 'window' down further */
+		wstart-=wend+1;
+		wvalue=0;
+		start=0;
+		if (wstart < 0) break;
+		}
+	ret=1;
+err:
+	BN_CTX_end(ctx);
+	for (i=0; i<ts; i++)
+		BN_clear_free(&(val[i]));
+	return(ret);
+	}
+#endif
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_lcl.h b/trunk/package/network/services/ead/src/tinysrp/bn_lcl.h
new file mode 100644
index 00000000..129ad658
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_lcl.h
@@ -0,0 +1,419 @@
+/* crypto/bn/bn_lcl.h */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_BN_LCL_H
+#define HEADER_BN_LCL_H
+
+#include <bn.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * BN_window_bits_for_exponent_size -- macro for sliding window mod_exp functions
+ *
+ *
+ * For window size 'w' (w >= 2) and a random 'b' bits exponent,
+ * the number of multiplications is a constant plus on average
+ *
+ *    2^(w-1) + (b-w)/(w+1);
+ *
+ * here  2^(w-1)  is for precomputing the table (we actually need
+ * entries only for windows that have the lowest bit set), and
+ * (b-w)/(w+1)  is an approximation for the expected number of
+ * w-bit windows, not counting the first one.
+ *
+ * Thus we should use
+ *
+ *    w >= 6  if        b > 671
+ *     w = 5  if  671 > b > 239
+ *     w = 4  if  239 > b >  79
+ *     w = 3  if   79 > b >  23
+ *    w <= 2  if   23 > b
+ *
+ * (with draws in between).  Very small exponents are often selected
+ * with low Hamming weight, so we use  w = 1  for b <= 23.
+ */
+#if 1
+#define BN_window_bits_for_exponent_size(b) \
+		((b) > 671 ? 6 : \
+		 (b) > 239 ? 5 : \
+		 (b) >  79 ? 4 : \
+		 (b) >  23 ? 3 : 1)
+#else
+/* Old SSLeay/OpenSSL table.
+ * Maximum window size was 5, so this table differs for b==1024;
+ * but it coincides for other interesting values (b==160, b==512).
+ */
+#define BN_window_bits_for_exponent_size(b) \
+		((b) > 255 ? 5 : \
+		 (b) > 127 ? 4 : \
+		 (b) >  17 ? 3 : 1)
+#endif
+
+
+
+/* Pentium pro 16,16,16,32,64 */
+/* Alpha       16,16,16,16.64 */
+#define BN_MULL_SIZE_NORMAL                     (16) /* 32 */
+#define BN_MUL_RECURSIVE_SIZE_NORMAL            (16) /* 32 less than */
+#define BN_SQR_RECURSIVE_SIZE_NORMAL            (16) /* 32 */
+#define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL        (32) /* 32 */
+#define BN_MONT_CTX_SET_SIZE_WORD               (64) /* 32 */
+
+#if !defined(NO_ASM) && !defined(NO_INLINE_ASM) && !defined(PEDANTIC)
+/*
+ * BN_UMULT_HIGH section.
+ *
+ * No, I'm not trying to overwhelm you when stating that the
+ * product of N-bit numbers is 2*N bits wide:-) No, I don't expect
+ * you to be impressed when I say that if the compiler doesn't
+ * support 2*N integer type, then you have to replace every N*N
+ * multiplication with 4 (N/2)*(N/2) accompanied by some shifts
+ * and additions which unavoidably results in severe performance
+ * penalties. Of course provided that the hardware is capable of
+ * producing 2*N result... That's when you normally start
+ * considering assembler implementation. However! It should be
+ * pointed out that some CPUs (most notably Alpha, PowerPC and
+ * upcoming IA-64 family:-) provide *separate* instruction
+ * calculating the upper half of the product placing the result
+ * into a general purpose register. Now *if* the compiler supports
+ * inline assembler, then it's not impossible to implement the
+ * "bignum" routines (and have the compiler optimize 'em)
+ * exhibiting "native" performance in C. That's what BN_UMULT_HIGH
+ * macro is about:-)
+ *
+ *                                      <appro@fy.chalmers.se>
+ */
+# if defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
+#  if defined(__DECC)
+#   include <c_asm.h>
+#   define BN_UMULT_HIGH(a,b)   (BN_ULONG)asm("umulh %a0,%a1,%v0",(a),(b))
+#  elif defined(__GNUC__)
+#   define BN_UMULT_HIGH(a,b)   ({      \
+	register BN_ULONG ret;          \
+	asm ("umulh     %1,%2,%0"       \
+	     : "=r"(ret)                \
+	     : "r"(a), "r"(b));         \
+	ret;                    })
+#  endif        /* compiler */
+# elif defined(_ARCH_PPC) && defined(__64BIT__) && defined(SIXTY_FOUR_BIT_LONG)
+#  if defined(__GNUC__)
+#   define BN_UMULT_HIGH(a,b)   ({      \
+	register BN_ULONG ret;          \
+	asm ("mulhdu    %0,%1,%2"       \
+	     : "=r"(ret)                \
+	     : "r"(a), "r"(b));         \
+	ret;                    })
+#  endif        /* compiler */
+# endif         /* cpu */
+#endif          /* NO_ASM */
+
+/*************************************************************
+ * Using the long long type
+ */
+#define Lw(t)    (((BN_ULONG)(t))&BN_MASK2)
+#define Hw(t)    (((BN_ULONG)((t)>>BN_BITS2))&BN_MASK2)
+
+/* This is used for internal error checking and is not normally used */
+#ifdef BN_DEBUG
+# include <assert.h>
+# define bn_check_top(a) assert ((a)->top >= 0 && (a)->top <= (a)->dmax);
+#else
+# define bn_check_top(a)
+#endif
+
+/* This macro is to add extra stuff for development checking */
+#ifdef BN_DEBUG
+#define bn_set_max(r) ((r)->max=(r)->top,BN_set_flags((r),BN_FLG_STATIC_DATA))
+#else
+#define bn_set_max(r)
+#endif
+
+/* These macros are used to 'take' a section of a bignum for read only use */
+#define bn_set_low(r,a,n) \
+	{ \
+	(r)->top=((a)->top > (n))?(n):(a)->top; \
+	(r)->d=(a)->d; \
+	(r)->neg=(a)->neg; \
+	(r)->flags|=BN_FLG_STATIC_DATA; \
+	bn_set_max(r); \
+	}
+
+#define bn_set_high(r,a,n) \
+	{ \
+	if ((a)->top > (n)) \
+		{ \
+		(r)->top=(a)->top-n; \
+		(r)->d= &((a)->d[n]); \
+		} \
+	else \
+		(r)->top=0; \
+	(r)->neg=(a)->neg; \
+	(r)->flags|=BN_FLG_STATIC_DATA; \
+	bn_set_max(r); \
+	}
+
+#ifdef BN_LLONG
+#define mul_add(r,a,w,c) { \
+	BN_ULLONG t; \
+	t=(BN_ULLONG)w * (a) + (r) + (c); \
+	(r)= Lw(t); \
+	(c)= Hw(t); \
+	}
+
+#define mul(r,a,w,c) { \
+	BN_ULLONG t; \
+	t=(BN_ULLONG)w * (a) + (c); \
+	(r)= Lw(t); \
+	(c)= Hw(t); \
+	}
+
+#define sqr(r0,r1,a) { \
+	BN_ULLONG t; \
+	t=(BN_ULLONG)(a)*(a); \
+	(r0)=Lw(t); \
+	(r1)=Hw(t); \
+	}
+
+#elif defined(BN_UMULT_HIGH)
+#define mul_add(r,a,w,c) {              \
+	BN_ULONG high,low,ret,tmp=(a);  \
+	ret =  (r);                     \
+	high=  BN_UMULT_HIGH(w,tmp);    \
+	ret += (c);                     \
+	low =  (w) * tmp;               \
+	(c) =  (ret<(c))?1:0;           \
+	(c) += high;                    \
+	ret += low;                     \
+	(c) += (ret<low)?1:0;           \
+	(r) =  ret;                     \
+	}
+
+#define mul(r,a,w,c)    {               \
+	BN_ULONG high,low,ret,ta=(a);   \
+	low =  (w) * ta;                \
+	high=  BN_UMULT_HIGH(w,ta);     \
+	ret =  low + (c);               \
+	(c) =  high;                    \
+	(c) += (ret<low)?1:0;           \
+	(r) =  ret;                     \
+	}
+
+#define sqr(r0,r1,a)    {               \
+	BN_ULONG tmp=(a);               \
+	(r0) = tmp * tmp;               \
+	(r1) = BN_UMULT_HIGH(tmp,tmp);  \
+	}
+
+#else
+/*************************************************************
+ * No long long type
+ */
+
+#define LBITS(a)        ((a)&BN_MASK2l)
+#define HBITS(a)        (((a)>>BN_BITS4)&BN_MASK2l)
+#define L2HBITS(a)      ((BN_ULONG)((a)&BN_MASK2l)<<BN_BITS4)
+
+#define LLBITS(a)       ((a)&BN_MASKl)
+#define LHBITS(a)       (((a)>>BN_BITS2)&BN_MASKl)
+#define LL2HBITS(a)     ((BN_ULLONG)((a)&BN_MASKl)<<BN_BITS2)
+
+#define mul64(l,h,bl,bh) \
+	{ \
+	BN_ULONG m,m1,lt,ht; \
+ \
+	lt=l; \
+	ht=h; \
+	m =(bh)*(lt); \
+	lt=(bl)*(lt); \
+	m1=(bl)*(ht); \
+	ht =(bh)*(ht); \
+	m=(m+m1)&BN_MASK2; if (m < m1) ht+=L2HBITS(1L); \
+	ht+=HBITS(m); \
+	m1=L2HBITS(m); \
+	lt=(lt+m1)&BN_MASK2; if (lt < m1) ht++; \
+	(l)=lt; \
+	(h)=ht; \
+	}
+
+#define sqr64(lo,ho,in) \
+	{ \
+	BN_ULONG l,h,m; \
+ \
+	h=(in); \
+	l=LBITS(h); \
+	h=HBITS(h); \
+	m =(l)*(h); \
+	l*=l; \
+	h*=h; \
+	h+=(m&BN_MASK2h1)>>(BN_BITS4-1); \
+	m =(m&BN_MASK2l)<<(BN_BITS4+1); \
+	l=(l+m)&BN_MASK2; if (l < m) h++; \
+	(lo)=l; \
+	(ho)=h; \
+	}
+
+#define mul_add(r,a,bl,bh,c) { \
+	BN_ULONG l,h; \
+ \
+	h= (a); \
+	l=LBITS(h); \
+	h=HBITS(h); \
+	mul64(l,h,(bl),(bh)); \
+ \
+	/* non-multiply part */ \
+	l=(l+(c))&BN_MASK2; if (l < (c)) h++; \
+	(c)=(r); \
+	l=(l+(c))&BN_MASK2; if (l < (c)) h++; \
+	(c)=h&BN_MASK2; \
+	(r)=l; \
+	}
+
+#define mul(r,a,bl,bh,c) { \
+	BN_ULONG l,h; \
+ \
+	h= (a); \
+	l=LBITS(h); \
+	h=HBITS(h); \
+	mul64(l,h,(bl),(bh)); \
+ \
+	/* non-multiply part */ \
+	l+=(c); if ((l&BN_MASK2) < (c)) h++; \
+	(c)=h&BN_MASK2; \
+	(r)=l&BN_MASK2; \
+	}
+#endif /* !BN_LLONG */
+
+void bn_mul_normal(BN_ULONG *r,BN_ULONG *a,int na,BN_ULONG *b,int nb);
+void bn_mul_comba8(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b);
+void bn_mul_comba4(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b);
+void bn_sqr_normal(BN_ULONG *r, BN_ULONG *a, int n, BN_ULONG *tmp);
+void bn_sqr_comba8(BN_ULONG *r,BN_ULONG *a);
+void bn_sqr_comba4(BN_ULONG *r,BN_ULONG *a);
+int bn_cmp_words(BN_ULONG *a,BN_ULONG *b,int n);
+void bn_mul_recursive(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,int n2,BN_ULONG *t);
+void bn_mul_part_recursive(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,
+	int tn, int n,BN_ULONG *t);
+void bn_sqr_recursive(BN_ULONG *r,BN_ULONG *a, int n2, BN_ULONG *t);
+void bn_mul_low_normal(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b, int n);
+void bn_mul_low_recursive(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,int n2,
+	BN_ULONG *t);
+void bn_mul_high(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,BN_ULONG *l,int n2,
+	BN_ULONG *t);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_lib.c b/trunk/package/network/services/ead/src/tinysrp/bn_lib.c
new file mode 100644
index 00000000..cfa0d756
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_lib.c
@@ -0,0 +1,576 @@
+/* crypto/bn/bn_lib.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef BN_DEBUG
+# undef NDEBUG /* avoid conflicting definitions */
+# define NDEBUG
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "bn_lcl.h"
+
+const char *BN_version="Big Number";
+
+/* For a 32 bit machine
+ * 2 -   4 ==  128
+ * 3 -   8 ==  256
+ * 4 -  16 ==  512
+ * 5 -  32 == 1024
+ * 6 -  64 == 2048
+ * 7 - 128 == 4096
+ * 8 - 256 == 8192
+ */
+static int bn_limit_bits=0;
+static int bn_limit_num=8;        /* (1<<bn_limit_bits) */
+static int bn_limit_bits_low=0;
+static int bn_limit_num_low=8;    /* (1<<bn_limit_bits_low) */
+static int bn_limit_bits_high=0;
+static int bn_limit_num_high=8;   /* (1<<bn_limit_bits_high) */
+static int bn_limit_bits_mont=0;
+static int bn_limit_num_mont=8;   /* (1<<bn_limit_bits_mont) */
+
+int BN_num_bits_word(BN_ULONG l)
+	{
+	static const char bits[256]={
+		0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,
+		5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+		6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+		6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+		7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+		7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+		7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+		7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+		};
+
+#if defined(SIXTY_FOUR_BIT_LONG)
+	if (l & 0xffffffff00000000L)
+		{
+		if (l & 0xffff000000000000L)
+			{
+			if (l & 0xff00000000000000L)
+				{
+				return(bits[(int)(l>>56)]+56);
+				}
+			else    return(bits[(int)(l>>48)]+48);
+			}
+		else
+			{
+			if (l & 0x0000ff0000000000L)
+				{
+				return(bits[(int)(l>>40)]+40);
+				}
+			else    return(bits[(int)(l>>32)]+32);
+			}
+		}
+	else
+#else
+#ifdef SIXTY_FOUR_BIT
+	if (l & 0xffffffff00000000LL)
+		{
+		if (l & 0xffff000000000000LL)
+			{
+			if (l & 0xff00000000000000LL)
+				{
+				return(bits[(int)(l>>56)]+56);
+				}
+			else    return(bits[(int)(l>>48)]+48);
+			}
+		else
+			{
+			if (l & 0x0000ff0000000000LL)
+				{
+				return(bits[(int)(l>>40)]+40);
+				}
+			else    return(bits[(int)(l>>32)]+32);
+			}
+		}
+	else
+#endif
+#endif
+		{
+#if defined(THIRTY_TWO_BIT) || defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+		if (l & 0xffff0000L)
+			{
+			if (l & 0xff000000L)
+				return(bits[(int)(l>>24L)]+24);
+			else    return(bits[(int)(l>>16L)]+16);
+			}
+		else
+#endif
+			{
+#if defined(SIXTEEN_BIT) || defined(THIRTY_TWO_BIT) || defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+			if (l & 0xff00L)
+				return(bits[(int)(l>>8)]+8);
+			else
+#endif
+				return(bits[(int)(l   )]  );
+			}
+		}
+	}
+
+int BN_num_bits(const BIGNUM *a)
+	{
+	BN_ULONG l;
+	int i;
+
+	bn_check_top(a);
+
+	if (a->top == 0) return(0);
+	l=a->d[a->top-1];
+	assert(l != 0);
+	i=(a->top-1)*BN_BITS2;
+	return(i+BN_num_bits_word(l));
+	}
+
+void BN_clear_free(BIGNUM *a)
+	{
+	int i;
+
+	if (a == NULL) return;
+	if (a->d != NULL)
+		{
+		memset(a->d,0,a->dmax*sizeof(a->d[0]));
+		if (!(BN_get_flags(a,BN_FLG_STATIC_DATA)))
+			free(a->d);
+		}
+	i=BN_get_flags(a,BN_FLG_MALLOCED);
+	memset(a,0,sizeof(BIGNUM));
+	if (i)
+		free(a);
+	}
+
+void BN_free(BIGNUM *a)
+	{
+	if (a == NULL) return;
+	if ((a->d != NULL) && !(BN_get_flags(a,BN_FLG_STATIC_DATA)))
+		free(a->d);
+	a->flags|=BN_FLG_FREE; /* REMOVE? */
+	if (a->flags & BN_FLG_MALLOCED)
+		free(a);
+	}
+
+void BN_init(BIGNUM *a)
+	{
+	memset(a,0,sizeof(BIGNUM));
+	}
+
+BIGNUM *BN_new(void)
+	{
+	BIGNUM *ret;
+
+	if ((ret=(BIGNUM *)malloc(sizeof(BIGNUM))) == NULL)
+		{
+		return(NULL);
+		}
+	ret->flags=BN_FLG_MALLOCED;
+	ret->top=0;
+	ret->neg=0;
+	ret->dmax=0;
+	ret->d=NULL;
+	return(ret);
+	}
+
+/* This is an internal function that should not be used in applications.
+ * It ensures that 'b' has enough room for a 'words' word number number.
+ * It is mostly used by the various BIGNUM routines. If there is an error,
+ * NULL is returned. If not, 'b' is returned. */
+
+BIGNUM *bn_expand2(BIGNUM *b, int words)
+	{
+	BN_ULONG *A,*a;
+	const BN_ULONG *B;
+	int i;
+
+	bn_check_top(b);
+
+	if (words > b->dmax)
+		{
+		bn_check_top(b);
+		if (BN_get_flags(b,BN_FLG_STATIC_DATA))
+			{
+			return(NULL);
+			}
+		a=A=(BN_ULONG *)malloc(sizeof(BN_ULONG)*(words+1));
+		if (A == NULL)
+			{
+			return(NULL);
+			}
+#if 1
+		B=b->d;
+		/* Check if the previous number needs to be copied */
+		if (B != NULL)
+			{
+#if 0
+			/* This lot is an unrolled loop to copy b->top
+			 * BN_ULONGs from B to A
+			 */
+/*
+ * I have nothing against unrolling but it's usually done for
+ * several reasons, namely:
+ * - minimize percentage of decision making code, i.e. branches;
+ * - avoid cache trashing;
+ * - make it possible to schedule loads earlier;
+ * Now let's examine the code below. The cornerstone of C is
+ * "programmer is always right" and that's what we love it for:-)
+ * For this very reason C compilers have to be paranoid when it
+ * comes to data aliasing and assume the worst. Yeah, but what
+ * does it mean in real life? This means that loop body below will
+ * be compiled to sequence of loads immediately followed by stores
+ * as compiler assumes the worst, something in A==B+1 style. As a
+ * result CPU pipeline is going to starve for incoming data. Secondly
+ * if A and B happen to share same cache line such code is going to
+ * cause severe cache trashing. Both factors have severe impact on
+ * performance of modern CPUs and this is the reason why this
+ * particular piece of code is #ifdefed away and replaced by more
+ * "friendly" version found in #else section below. This comment
+ * also applies to BN_copy function.
+ *
+ *                                      <appro@fy.chalmers.se>
+ */
+			for (i=b->top&(~7); i>0; i-=8)
+				{
+				A[0]=B[0]; A[1]=B[1]; A[2]=B[2]; A[3]=B[3];
+				A[4]=B[4]; A[5]=B[5]; A[6]=B[6]; A[7]=B[7];
+				A+=8;
+				B+=8;
+				}
+			switch (b->top&7)
+				{
+			case 7:
+				A[6]=B[6];
+			case 6:
+				A[5]=B[5];
+			case 5:
+				A[4]=B[4];
+			case 4:
+				A[3]=B[3];
+			case 3:
+				A[2]=B[2];
+			case 2:
+				A[1]=B[1];
+			case 1:
+				A[0]=B[0];
+			case 0:
+				/* I need the 'case 0' entry for utrix cc.
+				 * If the optimizer is turned on, it does the
+				 * switch table by doing
+				 * a=top&7
+				 * a--;
+				 * goto jump_table[a];
+				 * If top is 0, this makes us jump to 0xffffffc
+				 * which is rather bad :-(.
+				 * eric 23-Apr-1998
+				 */
+				;
+				}
+#else
+			for (i=b->top>>2; i>0; i--,A+=4,B+=4)
+				{
+				/*
+				 * The fact that the loop is unrolled
+				 * 4-wise is a tribute to Intel. It's
+				 * the one that doesn't have enough
+				 * registers to accomodate more data.
+				 * I'd unroll it 8-wise otherwise:-)
+				 *
+				 *              <appro@fy.chalmers.se>
+				 */
+				BN_ULONG a0,a1,a2,a3;
+				a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3];
+				A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3;
+				}
+			switch (b->top&3)
+				{
+				case 3: A[2]=B[2];
+				case 2: A[1]=B[1];
+				case 1: A[0]=B[0];
+				case 0: ; /* ultrix cc workaround, see above */
+				}
+#endif
+			free(b->d);
+			}
+
+		b->d=a;
+		b->dmax=words;
+
+		/* Now need to zero any data between b->top and b->max */
+
+		A= &(b->d[b->top]);
+		for (i=(b->dmax - b->top)>>3; i>0; i--,A+=8)
+			{
+			A[0]=0; A[1]=0; A[2]=0; A[3]=0;
+			A[4]=0; A[5]=0; A[6]=0; A[7]=0;
+			}
+		for (i=(b->dmax - b->top)&7; i>0; i--,A++)
+			A[0]=0;
+#else
+			memset(A,0,sizeof(BN_ULONG)*(words+1));
+			memcpy(A,b->d,sizeof(b->d[0])*b->top);
+			b->d=a;
+			b->max=words;
+#endif
+
+/*              memset(&(p[b->max]),0,((words+1)-b->max)*sizeof(BN_ULONG)); */
+/*      { int i; for (i=b->max; i<words+1; i++) p[i]=i;} */
+
+		}
+	return(b);
+	}
+
+BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b)
+	{
+	int i;
+	BN_ULONG *A;
+	const BN_ULONG *B;
+
+	bn_check_top(b);
+
+	if (a == b) return(a);
+	if (bn_wexpand(a,b->top) == NULL) return(NULL);
+
+#if 1
+	A=a->d;
+	B=b->d;
+	for (i=b->top>>2; i>0; i--,A+=4,B+=4)
+		{
+		BN_ULONG a0,a1,a2,a3;
+		a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3];
+		A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3;
+		}
+	switch (b->top&3)
+		{
+		case 3: A[2]=B[2];
+		case 2: A[1]=B[1];
+		case 1: A[0]=B[0];
+		case 0: ; /* ultrix cc workaround, see comments in bn_expand2 */
+		}
+#else
+	memcpy(a->d,b->d,sizeof(b->d[0])*b->top);
+#endif
+
+/*      memset(&(a->d[b->top]),0,sizeof(a->d[0])*(a->max-b->top));*/
+	a->top=b->top;
+	if ((a->top == 0) && (a->d != NULL))
+		a->d[0]=0;
+	a->neg=b->neg;
+	return(a);
+	}
+
+int BN_set_word(BIGNUM *a, BN_ULONG w)
+	{
+	int i,n;
+	if (bn_expand(a,sizeof(BN_ULONG)*8) == NULL) return(0);
+
+	n=sizeof(BN_ULONG)/BN_BYTES;
+	a->neg=0;
+	a->top=0;
+	a->d[0]=(BN_ULONG)w&BN_MASK2;
+	if (a->d[0] != 0) a->top=1;
+	for (i=1; i<n; i++)
+		{
+		/* the following is done instead of
+		 * w>>=BN_BITS2 so compilers don't complain
+		 * on builds where sizeof(long) == BN_TYPES */
+#ifndef SIXTY_FOUR_BIT /* the data item > unsigned long */
+		w>>=BN_BITS4;
+		w>>=BN_BITS4;
+#else
+		w=0;
+#endif
+		a->d[i]=(BN_ULONG)w&BN_MASK2;
+		if (a->d[i] != 0) a->top=i+1;
+		}
+	return(1);
+	}
+
+/* ignore negative */
+BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret)
+	{
+	unsigned int i,m;
+	unsigned int n;
+	BN_ULONG l;
+
+	if (ret == NULL) ret=BN_new();
+	if (ret == NULL) return(NULL);
+	l=0;
+	n=len;
+	if (n == 0)
+		{
+		ret->top=0;
+		return(ret);
+		}
+	if (bn_expand(ret,(int)(n+2)*8) == NULL)
+		return(NULL);
+	i=((n-1)/BN_BYTES)+1;
+	m=((n-1)%(BN_BYTES));
+	ret->top=i;
+	while (n-- > 0)
+		{
+		l=(l<<8L)| *(s++);
+		if (m-- == 0)
+			{
+			ret->d[--i]=l;
+			l=0;
+			m=BN_BYTES-1;
+			}
+		}
+	/* need to call this due to clear byte at top if avoiding
+	 * having the top bit set (-ve number) */
+	bn_fix_top(ret);
+	return(ret);
+	}
+
+/* ignore negative */
+int BN_bn2bin(const BIGNUM *a, unsigned char *to)
+	{
+	int n,i;
+	BN_ULONG l;
+
+	n=i=BN_num_bytes(a);
+	while (i-- > 0)
+		{
+		l=a->d[i/BN_BYTES];
+		*(to++)=(unsigned char)(l>>(8*(i%BN_BYTES)))&0xff;
+		}
+	return(n);
+	}
+
+int BN_ucmp(const BIGNUM *a, const BIGNUM *b)
+	{
+	int i;
+	BN_ULONG t1,t2,*ap,*bp;
+
+	bn_check_top(a);
+	bn_check_top(b);
+
+	i=a->top-b->top;
+	if (i != 0) return(i);
+	ap=a->d;
+	bp=b->d;
+	for (i=a->top-1; i>=0; i--)
+		{
+		t1= ap[i];
+		t2= bp[i];
+		if (t1 != t2)
+			return(t1 > t2?1:-1);
+		}
+	return(0);
+	}
+
+int BN_cmp(const BIGNUM *a, const BIGNUM *b)
+	{
+	int i;
+	int gt,lt;
+	BN_ULONG t1,t2;
+
+	if ((a == NULL) || (b == NULL))
+		{
+		if (a != NULL)
+			return(-1);
+		else if (b != NULL)
+			return(1);
+		else
+			return(0);
+		}
+
+	bn_check_top(a);
+	bn_check_top(b);
+
+	if (a->neg != b->neg)
+		{
+		if (a->neg)
+			return(-1);
+		else    return(1);
+		}
+	if (a->neg == 0)
+		{ gt=1; lt= -1; }
+	else    { gt= -1; lt=1; }
+
+	if (a->top > b->top) return(gt);
+	if (a->top < b->top) return(lt);
+	for (i=a->top-1; i>=0; i--)
+		{
+		t1=a->d[i];
+		t2=b->d[i];
+		if (t1 > t2) return(gt);
+		if (t1 < t2) return(lt);
+		}
+	return(0);
+	}
+
+int BN_is_bit_set(const BIGNUM *a, int n)
+	{
+	int i,j;
+
+	if (n < 0) return(0);
+	i=n/BN_BITS2;
+	j=n%BN_BITS2;
+	if (a->top <= i) return(0);
+	return((a->d[i]&(((BN_ULONG)1)<<j))?1:0);
+	}
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_mul.c b/trunk/package/network/services/ead/src/tinysrp/bn_mul.c
new file mode 100644
index 00000000..92330e5e
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_mul.c
@@ -0,0 +1,172 @@
+/* crypto/bn/bn_mul.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "bn_lcl.h"
+
+int BN_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
+	{
+	int top,al,bl;
+	BIGNUM *rr;
+	int ret = 0;
+#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
+	int i;
+#endif
+
+#ifdef BN_COUNT
+	printf("BN_mul %d * %d\n",a->top,b->top);
+#endif
+
+	bn_check_top(a);
+	bn_check_top(b);
+	bn_check_top(r);
+
+	al=a->top;
+	bl=b->top;
+
+	if ((al == 0) || (bl == 0))
+		{
+		BN_zero(r);
+		return(1);
+		}
+	top=al+bl;
+
+	BN_CTX_start(ctx);
+	if ((r == a) || (r == b))
+		{
+		if ((rr = BN_CTX_get(ctx)) == NULL) goto err;
+		}
+	else
+		rr = r;
+	rr->neg=a->neg^b->neg;
+
+#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
+	i = al-bl;
+#endif
+#ifdef BN_MUL_COMBA
+	if (i == 0)
+		{
+# if 0
+		if (al == 4)
+			{
+			if (bn_wexpand(rr,8) == NULL) goto err;
+			rr->top=8;
+			bn_mul_comba4(rr->d,a->d,b->d);
+			goto end;
+			}
+# endif
+		if (al == 8)
+			{
+			if (bn_wexpand(rr,16) == NULL) goto err;
+			rr->top=16;
+			bn_mul_comba8(rr->d,a->d,b->d);
+			goto end;
+			}
+		}
+#endif /* BN_MUL_COMBA */
+	if (bn_wexpand(rr,top) == NULL) goto err;
+	rr->top=top;
+	bn_mul_normal(rr->d,a->d,al,b->d,bl);
+
+#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
+end:
+#endif
+	bn_fix_top(rr);
+	if (r != rr) BN_copy(r,rr);
+	ret=1;
+err:
+	BN_CTX_end(ctx);
+	return(ret);
+	}
+
+void bn_mul_normal(BN_ULONG *r, BN_ULONG *a, int na, BN_ULONG *b, int nb)
+	{
+	BN_ULONG *rr;
+
+#ifdef BN_COUNT
+	printf(" bn_mul_normal %d * %d\n",na,nb);
+#endif
+
+	if (na < nb)
+		{
+		int itmp;
+		BN_ULONG *ltmp;
+
+		itmp=na; na=nb; nb=itmp;
+		ltmp=a;   a=b;   b=ltmp;
+
+		}
+	rr= &(r[na]);
+	rr[0]=bn_mul_words(r,a,na,b[0]);
+
+	for (;;)
+		{
+		if (--nb <= 0) return;
+		rr[1]=bn_mul_add_words(&(r[1]),a,na,b[1]);
+		if (--nb <= 0) return;
+		rr[2]=bn_mul_add_words(&(r[2]),a,na,b[2]);
+		if (--nb <= 0) return;
+		rr[3]=bn_mul_add_words(&(r[3]),a,na,b[3]);
+		if (--nb <= 0) return;
+		rr[4]=bn_mul_add_words(&(r[4]),a,na,b[4]);
+		rr+=4;
+		r+=4;
+		b+=4;
+		}
+	}
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_prime.h b/trunk/package/network/services/ead/src/tinysrp/bn_prime.h
new file mode 100644
index 00000000..b7cf9a9b
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_prime.h
@@ -0,0 +1,325 @@
+/* Auto generated by bn_prime.pl */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef EIGHT_BIT
+#define NUMPRIMES 2048
+#else
+#define NUMPRIMES 54
+#endif
+static const unsigned int primes[NUMPRIMES]=
+	{
+	   2,   3,   5,   7,  11,  13,  17,  19,
+	  23,  29,  31,  37,  41,  43,  47,  53,
+	  59,  61,  67,  71,  73,  79,  83,  89,
+	  97, 101, 103, 107, 109, 113, 127, 131,
+	 137, 139, 149, 151, 157, 163, 167, 173,
+	 179, 181, 191, 193, 197, 199, 211, 223,
+	 227, 229, 233, 239, 241, 251,
+#ifndef EIGHT_BIT
+	 257, 263,
+	 269, 271, 277, 281, 283, 293, 307, 311,
+	 313, 317, 331, 337, 347, 349, 353, 359,
+	 367, 373, 379, 383, 389, 397, 401, 409,
+	 419, 421, 431, 433, 439, 443, 449, 457,
+	 461, 463, 467, 479, 487, 491, 499, 503,
+	 509, 521, 523, 541, 547, 557, 563, 569,
+	 571, 577, 587, 593, 599, 601, 607, 613,
+	 617, 619, 631, 641, 643, 647, 653, 659,
+	 661, 673, 677, 683, 691, 701, 709, 719,
+	 727, 733, 739, 743, 751, 757, 761, 769,
+	 773, 787, 797, 809, 811, 821, 823, 827,
+	 829, 839, 853, 857, 859, 863, 877, 881,
+	 883, 887, 907, 911, 919, 929, 937, 941,
+	 947, 953, 967, 971, 977, 983, 991, 997,
+	1009,1013,1019,1021,1031,1033,1039,1049,
+	1051,1061,1063,1069,1087,1091,1093,1097,
+	1103,1109,1117,1123,1129,1151,1153,1163,
+	1171,1181,1187,1193,1201,1213,1217,1223,
+	1229,1231,1237,1249,1259,1277,1279,1283,
+	1289,1291,1297,1301,1303,1307,1319,1321,
+	1327,1361,1367,1373,1381,1399,1409,1423,
+	1427,1429,1433,1439,1447,1451,1453,1459,
+	1471,1481,1483,1487,1489,1493,1499,1511,
+	1523,1531,1543,1549,1553,1559,1567,1571,
+	1579,1583,1597,1601,1607,1609,1613,1619,
+	1621,1627,1637,1657,1663,1667,1669,1693,
+	1697,1699,1709,1721,1723,1733,1741,1747,
+	1753,1759,1777,1783,1787,1789,1801,1811,
+	1823,1831,1847,1861,1867,1871,1873,1877,
+	1879,1889,1901,1907,1913,1931,1933,1949,
+	1951,1973,1979,1987,1993,1997,1999,2003,
+	2011,2017,2027,2029,2039,2053,2063,2069,
+	2081,2083,2087,2089,2099,2111,2113,2129,
+	2131,2137,2141,2143,2153,2161,2179,2203,
+	2207,2213,2221,2237,2239,2243,2251,2267,
+	2269,2273,2281,2287,2293,2297,2309,2311,
+	2333,2339,2341,2347,2351,2357,2371,2377,
+	2381,2383,2389,2393,2399,2411,2417,2423,
+	2437,2441,2447,2459,2467,2473,2477,2503,
+	2521,2531,2539,2543,2549,2551,2557,2579,
+	2591,2593,2609,2617,2621,2633,2647,2657,
+	2659,2663,2671,2677,2683,2687,2689,2693,
+	2699,2707,2711,2713,2719,2729,2731,2741,
+	2749,2753,2767,2777,2789,2791,2797,2801,
+	2803,2819,2833,2837,2843,2851,2857,2861,
+	2879,2887,2897,2903,2909,2917,2927,2939,
+	2953,2957,2963,2969,2971,2999,3001,3011,
+	3019,3023,3037,3041,3049,3061,3067,3079,
+	3083,3089,3109,3119,3121,3137,3163,3167,
+	3169,3181,3187,3191,3203,3209,3217,3221,
+	3229,3251,3253,3257,3259,3271,3299,3301,
+	3307,3313,3319,3323,3329,3331,3343,3347,
+	3359,3361,3371,3373,3389,3391,3407,3413,
+	3433,3449,3457,3461,3463,3467,3469,3491,
+	3499,3511,3517,3527,3529,3533,3539,3541,
+	3547,3557,3559,3571,3581,3583,3593,3607,
+	3613,3617,3623,3631,3637,3643,3659,3671,
+	3673,3677,3691,3697,3701,3709,3719,3727,
+	3733,3739,3761,3767,3769,3779,3793,3797,
+	3803,3821,3823,3833,3847,3851,3853,3863,
+	3877,3881,3889,3907,3911,3917,3919,3923,
+	3929,3931,3943,3947,3967,3989,4001,4003,
+	4007,4013,4019,4021,4027,4049,4051,4057,
+	4073,4079,4091,4093,4099,4111,4127,4129,
+	4133,4139,4153,4157,4159,4177,4201,4211,
+	4217,4219,4229,4231,4241,4243,4253,4259,
+	4261,4271,4273,4283,4289,4297,4327,4337,
+	4339,4349,4357,4363,4373,4391,4397,4409,
+	4421,4423,4441,4447,4451,4457,4463,4481,
+	4483,4493,4507,4513,4517,4519,4523,4547,
+	4549,4561,4567,4583,4591,4597,4603,4621,
+	4637,4639,4643,4649,4651,4657,4663,4673,
+	4679,4691,4703,4721,4723,4729,4733,4751,
+	4759,4783,4787,4789,4793,4799,4801,4813,
+	4817,4831,4861,4871,4877,4889,4903,4909,
+	4919,4931,4933,4937,4943,4951,4957,4967,
+	4969,4973,4987,4993,4999,5003,5009,5011,
+	5021,5023,5039,5051,5059,5077,5081,5087,
+	5099,5101,5107,5113,5119,5147,5153,5167,
+	5171,5179,5189,5197,5209,5227,5231,5233,
+	5237,5261,5273,5279,5281,5297,5303,5309,
+	5323,5333,5347,5351,5381,5387,5393,5399,
+	5407,5413,5417,5419,5431,5437,5441,5443,
+	5449,5471,5477,5479,5483,5501,5503,5507,
+	5519,5521,5527,5531,5557,5563,5569,5573,
+	5581,5591,5623,5639,5641,5647,5651,5653,
+	5657,5659,5669,5683,5689,5693,5701,5711,
+	5717,5737,5741,5743,5749,5779,5783,5791,
+	5801,5807,5813,5821,5827,5839,5843,5849,
+	5851,5857,5861,5867,5869,5879,5881,5897,
+	5903,5923,5927,5939,5953,5981,5987,6007,
+	6011,6029,6037,6043,6047,6053,6067,6073,
+	6079,6089,6091,6101,6113,6121,6131,6133,
+	6143,6151,6163,6173,6197,6199,6203,6211,
+	6217,6221,6229,6247,6257,6263,6269,6271,
+	6277,6287,6299,6301,6311,6317,6323,6329,
+	6337,6343,6353,6359,6361,6367,6373,6379,
+	6389,6397,6421,6427,6449,6451,6469,6473,
+	6481,6491,6521,6529,6547,6551,6553,6563,
+	6569,6571,6577,6581,6599,6607,6619,6637,
+	6653,6659,6661,6673,6679,6689,6691,6701,
+	6703,6709,6719,6733,6737,6761,6763,6779,
+	6781,6791,6793,6803,6823,6827,6829,6833,
+	6841,6857,6863,6869,6871,6883,6899,6907,
+	6911,6917,6947,6949,6959,6961,6967,6971,
+	6977,6983,6991,6997,7001,7013,7019,7027,
+	7039,7043,7057,7069,7079,7103,7109,7121,
+	7127,7129,7151,7159,7177,7187,7193,7207,
+	7211,7213,7219,7229,7237,7243,7247,7253,
+	7283,7297,7307,7309,7321,7331,7333,7349,
+	7351,7369,7393,7411,7417,7433,7451,7457,
+	7459,7477,7481,7487,7489,7499,7507,7517,
+	7523,7529,7537,7541,7547,7549,7559,7561,
+	7573,7577,7583,7589,7591,7603,7607,7621,
+	7639,7643,7649,7669,7673,7681,7687,7691,
+	7699,7703,7717,7723,7727,7741,7753,7757,
+	7759,7789,7793,7817,7823,7829,7841,7853,
+	7867,7873,7877,7879,7883,7901,7907,7919,
+	7927,7933,7937,7949,7951,7963,7993,8009,
+	8011,8017,8039,8053,8059,8069,8081,8087,
+	8089,8093,8101,8111,8117,8123,8147,8161,
+	8167,8171,8179,8191,8209,8219,8221,8231,
+	8233,8237,8243,8263,8269,8273,8287,8291,
+	8293,8297,8311,8317,8329,8353,8363,8369,
+	8377,8387,8389,8419,8423,8429,8431,8443,
+	8447,8461,8467,8501,8513,8521,8527,8537,
+	8539,8543,8563,8573,8581,8597,8599,8609,
+	8623,8627,8629,8641,8647,8663,8669,8677,
+	8681,8689,8693,8699,8707,8713,8719,8731,
+	8737,8741,8747,8753,8761,8779,8783,8803,
+	8807,8819,8821,8831,8837,8839,8849,8861,
+	8863,8867,8887,8893,8923,8929,8933,8941,
+	8951,8963,8969,8971,8999,9001,9007,9011,
+	9013,9029,9041,9043,9049,9059,9067,9091,
+	9103,9109,9127,9133,9137,9151,9157,9161,
+	9173,9181,9187,9199,9203,9209,9221,9227,
+	9239,9241,9257,9277,9281,9283,9293,9311,
+	9319,9323,9337,9341,9343,9349,9371,9377,
+	9391,9397,9403,9413,9419,9421,9431,9433,
+	9437,9439,9461,9463,9467,9473,9479,9491,
+	9497,9511,9521,9533,9539,9547,9551,9587,
+	9601,9613,9619,9623,9629,9631,9643,9649,
+	9661,9677,9679,9689,9697,9719,9721,9733,
+	9739,9743,9749,9767,9769,9781,9787,9791,
+	9803,9811,9817,9829,9833,9839,9851,9857,
+	9859,9871,9883,9887,9901,9907,9923,9929,
+	9931,9941,9949,9967,9973,10007,10009,10037,
+	10039,10061,10067,10069,10079,10091,10093,10099,
+	10103,10111,10133,10139,10141,10151,10159,10163,
+	10169,10177,10181,10193,10211,10223,10243,10247,
+	10253,10259,10267,10271,10273,10289,10301,10303,
+	10313,10321,10331,10333,10337,10343,10357,10369,
+	10391,10399,10427,10429,10433,10453,10457,10459,
+	10463,10477,10487,10499,10501,10513,10529,10531,
+	10559,10567,10589,10597,10601,10607,10613,10627,
+	10631,10639,10651,10657,10663,10667,10687,10691,
+	10709,10711,10723,10729,10733,10739,10753,10771,
+	10781,10789,10799,10831,10837,10847,10853,10859,
+	10861,10867,10883,10889,10891,10903,10909,10937,
+	10939,10949,10957,10973,10979,10987,10993,11003,
+	11027,11047,11057,11059,11069,11071,11083,11087,
+	11093,11113,11117,11119,11131,11149,11159,11161,
+	11171,11173,11177,11197,11213,11239,11243,11251,
+	11257,11261,11273,11279,11287,11299,11311,11317,
+	11321,11329,11351,11353,11369,11383,11393,11399,
+	11411,11423,11437,11443,11447,11467,11471,11483,
+	11489,11491,11497,11503,11519,11527,11549,11551,
+	11579,11587,11593,11597,11617,11621,11633,11657,
+	11677,11681,11689,11699,11701,11717,11719,11731,
+	11743,11777,11779,11783,11789,11801,11807,11813,
+	11821,11827,11831,11833,11839,11863,11867,11887,
+	11897,11903,11909,11923,11927,11933,11939,11941,
+	11953,11959,11969,11971,11981,11987,12007,12011,
+	12037,12041,12043,12049,12071,12073,12097,12101,
+	12107,12109,12113,12119,12143,12149,12157,12161,
+	12163,12197,12203,12211,12227,12239,12241,12251,
+	12253,12263,12269,12277,12281,12289,12301,12323,
+	12329,12343,12347,12373,12377,12379,12391,12401,
+	12409,12413,12421,12433,12437,12451,12457,12473,
+	12479,12487,12491,12497,12503,12511,12517,12527,
+	12539,12541,12547,12553,12569,12577,12583,12589,
+	12601,12611,12613,12619,12637,12641,12647,12653,
+	12659,12671,12689,12697,12703,12713,12721,12739,
+	12743,12757,12763,12781,12791,12799,12809,12821,
+	12823,12829,12841,12853,12889,12893,12899,12907,
+	12911,12917,12919,12923,12941,12953,12959,12967,
+	12973,12979,12983,13001,13003,13007,13009,13033,
+	13037,13043,13049,13063,13093,13099,13103,13109,
+	13121,13127,13147,13151,13159,13163,13171,13177,
+	13183,13187,13217,13219,13229,13241,13249,13259,
+	13267,13291,13297,13309,13313,13327,13331,13337,
+	13339,13367,13381,13397,13399,13411,13417,13421,
+	13441,13451,13457,13463,13469,13477,13487,13499,
+	13513,13523,13537,13553,13567,13577,13591,13597,
+	13613,13619,13627,13633,13649,13669,13679,13681,
+	13687,13691,13693,13697,13709,13711,13721,13723,
+	13729,13751,13757,13759,13763,13781,13789,13799,
+	13807,13829,13831,13841,13859,13873,13877,13879,
+	13883,13901,13903,13907,13913,13921,13931,13933,
+	13963,13967,13997,13999,14009,14011,14029,14033,
+	14051,14057,14071,14081,14083,14087,14107,14143,
+	14149,14153,14159,14173,14177,14197,14207,14221,
+	14243,14249,14251,14281,14293,14303,14321,14323,
+	14327,14341,14347,14369,14387,14389,14401,14407,
+	14411,14419,14423,14431,14437,14447,14449,14461,
+	14479,14489,14503,14519,14533,14537,14543,14549,
+	14551,14557,14561,14563,14591,14593,14621,14627,
+	14629,14633,14639,14653,14657,14669,14683,14699,
+	14713,14717,14723,14731,14737,14741,14747,14753,
+	14759,14767,14771,14779,14783,14797,14813,14821,
+	14827,14831,14843,14851,14867,14869,14879,14887,
+	14891,14897,14923,14929,14939,14947,14951,14957,
+	14969,14983,15013,15017,15031,15053,15061,15073,
+	15077,15083,15091,15101,15107,15121,15131,15137,
+	15139,15149,15161,15173,15187,15193,15199,15217,
+	15227,15233,15241,15259,15263,15269,15271,15277,
+	15287,15289,15299,15307,15313,15319,15329,15331,
+	15349,15359,15361,15373,15377,15383,15391,15401,
+	15413,15427,15439,15443,15451,15461,15467,15473,
+	15493,15497,15511,15527,15541,15551,15559,15569,
+	15581,15583,15601,15607,15619,15629,15641,15643,
+	15647,15649,15661,15667,15671,15679,15683,15727,
+	15731,15733,15737,15739,15749,15761,15767,15773,
+	15787,15791,15797,15803,15809,15817,15823,15859,
+	15877,15881,15887,15889,15901,15907,15913,15919,
+	15923,15937,15959,15971,15973,15991,16001,16007,
+	16033,16057,16061,16063,16067,16069,16073,16087,
+	16091,16097,16103,16111,16127,16139,16141,16183,
+	16187,16189,16193,16217,16223,16229,16231,16249,
+	16253,16267,16273,16301,16319,16333,16339,16349,
+	16361,16363,16369,16381,16411,16417,16421,16427,
+	16433,16447,16451,16453,16477,16481,16487,16493,
+	16519,16529,16547,16553,16561,16567,16573,16603,
+	16607,16619,16631,16633,16649,16651,16657,16661,
+	16673,16691,16693,16699,16703,16729,16741,16747,
+	16759,16763,16787,16811,16823,16829,16831,16843,
+	16871,16879,16883,16889,16901,16903,16921,16927,
+	16931,16937,16943,16963,16979,16981,16987,16993,
+	17011,17021,17027,17029,17033,17041,17047,17053,
+	17077,17093,17099,17107,17117,17123,17137,17159,
+	17167,17183,17189,17191,17203,17207,17209,17231,
+	17239,17257,17291,17293,17299,17317,17321,17327,
+	17333,17341,17351,17359,17377,17383,17387,17389,
+	17393,17401,17417,17419,17431,17443,17449,17467,
+	17471,17477,17483,17489,17491,17497,17509,17519,
+	17539,17551,17569,17573,17579,17581,17597,17599,
+	17609,17623,17627,17657,17659,17669,17681,17683,
+	17707,17713,17729,17737,17747,17749,17761,17783,
+	17789,17791,17807,17827,17837,17839,17851,17863,
+#endif
+	};
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_shift.c b/trunk/package/network/services/ead/src/tinysrp/bn_shift.c
new file mode 100644
index 00000000..f403720e
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_shift.c
@@ -0,0 +1,139 @@
+/* crypto/bn/bn_shift.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "bn_lcl.h"
+
+int BN_lshift(BIGNUM *r, const BIGNUM *a, int n)
+	{
+	int i,nw,lb,rb;
+	BN_ULONG *t,*f;
+	BN_ULONG l;
+
+	r->neg=a->neg;
+	if (bn_wexpand(r,a->top+(n/BN_BITS2)+1) == NULL) return(0);
+	nw=n/BN_BITS2;
+	lb=n%BN_BITS2;
+	rb=BN_BITS2-lb;
+	f=a->d;
+	t=r->d;
+	t[a->top+nw]=0;
+	if (lb == 0)
+		for (i=a->top-1; i>=0; i--)
+			t[nw+i]=f[i];
+	else
+		for (i=a->top-1; i>=0; i--)
+			{
+			l=f[i];
+			t[nw+i+1]|=(l>>rb)&BN_MASK2;
+			t[nw+i]=(l<<lb)&BN_MASK2;
+			}
+	memset(t,0,nw*sizeof(t[0]));
+/*      for (i=0; i<nw; i++)
+		t[i]=0;*/
+	r->top=a->top+nw+1;
+	bn_fix_top(r);
+	return(1);
+	}
+
+int BN_rshift(BIGNUM *r, BIGNUM *a, int n)
+	{
+	int i,j,nw,lb,rb;
+	BN_ULONG *t,*f;
+	BN_ULONG l,tmp;
+
+	nw=n/BN_BITS2;
+	rb=n%BN_BITS2;
+	lb=BN_BITS2-rb;
+	if (nw > a->top || a->top == 0)
+		{
+		BN_zero(r);
+		return(1);
+		}
+	if (r != a)
+		{
+		r->neg=a->neg;
+		if (bn_wexpand(r,a->top-nw+1) == NULL) return(0);
+		}
+
+	f= &(a->d[nw]);
+	t=r->d;
+	j=a->top-nw;
+	r->top=j;
+
+	if (rb == 0)
+		{
+		for (i=j+1; i > 0; i--)
+			*(t++)= *(f++);
+		}
+	else
+		{
+		l= *(f++);
+		for (i=1; i<j; i++)
+			{
+			tmp =(l>>rb)&BN_MASK2;
+			l= *(f++);
+			*(t++) =(tmp|(l<<lb))&BN_MASK2;
+			}
+		*(t++) =(l>>rb)&BN_MASK2;
+		}
+	*t=0;
+	bn_fix_top(r);
+	return(1);
+	}
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_sqr.c b/trunk/package/network/services/ead/src/tinysrp/bn_sqr.c
new file mode 100644
index 00000000..2d3db70e
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_sqr.c
@@ -0,0 +1,160 @@
+/* crypto/bn/bn_sqr.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "bn_lcl.h"
+
+/* r must not be a */
+/* I've just gone over this and it is now %20 faster on x86 - eay - 27 Jun 96 */
+int BN_sqr(BIGNUM *r, BIGNUM *a, BN_CTX *ctx)
+	{
+	int max,al;
+	int ret = 0;
+	BIGNUM *tmp,*rr;
+
+#ifdef BN_COUNT
+printf("BN_sqr %d * %d\n",a->top,a->top);
+#endif
+	bn_check_top(a);
+
+	al=a->top;
+	if (al <= 0)
+		{
+		r->top=0;
+		return(1);
+		}
+
+	BN_CTX_start(ctx);
+	rr=(a != r) ? r : BN_CTX_get(ctx);
+	tmp=BN_CTX_get(ctx);
+	if (tmp == NULL) goto err;
+
+	max=(al+al);
+	if (bn_wexpand(rr,max+1) == NULL) goto err;
+
+	r->neg=0;
+	if (al == 4)
+		{
+#ifndef BN_SQR_COMBA
+		BN_ULONG t[8];
+		bn_sqr_normal(rr->d,a->d,4,t);
+#else
+		bn_sqr_comba4(rr->d,a->d);
+#endif
+		}
+	else if (al == 8)
+		{
+#ifndef BN_SQR_COMBA
+		BN_ULONG t[16];
+		bn_sqr_normal(rr->d,a->d,8,t);
+#else
+		bn_sqr_comba8(rr->d,a->d);
+#endif
+		}
+	else
+		{
+		if (bn_wexpand(tmp,max) == NULL) goto err;
+		bn_sqr_normal(rr->d,a->d,al,tmp->d);
+		}
+
+	rr->top=max;
+	if ((max > 0) && (rr->d[max-1] == 0)) rr->top--;
+	if (rr != r) BN_copy(r,rr);
+	ret = 1;
+ err:
+	BN_CTX_end(ctx);
+	return(ret);
+	}
+
+/* tmp must have 2*n words */
+void bn_sqr_normal(BN_ULONG *r, BN_ULONG *a, int n, BN_ULONG *tmp)
+	{
+	int i,j,max;
+	BN_ULONG *ap,*rp;
+
+	max=n*2;
+	ap=a;
+	rp=r;
+	rp[0]=rp[max-1]=0;
+	rp++;
+	j=n;
+
+	if (--j > 0)
+		{
+		ap++;
+		rp[j]=bn_mul_words(rp,ap,j,ap[-1]);
+		rp+=2;
+		}
+
+	for (i=n-2; i>0; i--)
+		{
+		j--;
+		ap++;
+		rp[j]=bn_mul_add_words(rp,ap,j,ap[-1]);
+		rp+=2;
+		}
+
+	bn_add_words(r,r,r,max);
+
+	/* There will not be a carry */
+
+	bn_sqr_words(tmp,a,n);
+
+	bn_add_words(r,r,tmp,max);
+	}
diff --git a/trunk/package/network/services/ead/src/tinysrp/bn_word.c b/trunk/package/network/services/ead/src/tinysrp/bn_word.c
new file mode 100644
index 00000000..7820e08a
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/bn_word.c
@@ -0,0 +1,130 @@
+/* crypto/bn/bn_word.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "bn_lcl.h"
+
+int BN_add_word(BIGNUM *a, BN_ULONG w)
+	{
+	BN_ULONG l;
+	int i;
+
+	if (a->neg)
+		{
+		a->neg=0;
+		i=BN_sub_word(a,w);
+		if (!BN_is_zero(a))
+			a->neg=!(a->neg);
+		return(i);
+		}
+	w&=BN_MASK2;
+	if (bn_wexpand(a,a->top+1) == NULL) return(0);
+	i=0;
+	for (;;)
+		{
+		l=(a->d[i]+(BN_ULONG)w)&BN_MASK2;
+		a->d[i]=l;
+		if (w > l)
+			w=1;
+		else
+			break;
+		i++;
+		}
+	if (i >= a->top)
+		a->top++;
+	return(1);
+	}
+
+int BN_sub_word(BIGNUM *a, BN_ULONG w)
+	{
+	int i;
+
+	if (BN_is_zero(a) || a->neg)
+		{
+		a->neg=0;
+		i=BN_add_word(a,w);
+		a->neg=1;
+		return(i);
+		}
+
+	w&=BN_MASK2;
+	if ((a->top == 1) && (a->d[0] < w))
+		{
+		a->d[0]=w-a->d[0];
+		a->neg=1;
+		return(1);
+		}
+	i=0;
+	for (;;)
+		{
+		if (a->d[i] >= w)
+			{
+			a->d[i]-=w;
+			break;
+			}
+		else
+			{
+			a->d[i]=(a->d[i]-w)&BN_MASK2;
+			i++;
+			w=1;
+			}
+		}
+	if ((a->d[i] == 0) && (i == (a->top-1)))
+		a->top--;
+	return(1);
+	}
diff --git a/trunk/package/network/services/ead/src/tinysrp/clitest.c b/trunk/package/network/services/ead/src/tinysrp/clitest.c
new file mode 100644
index 00000000..338f41ff
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/clitest.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+#include "t_defines.h"
+#include "t_pwd.h"
+#include "t_client.h"
+
+int
+main()
+{
+  int index;
+  struct t_client * tc;
+  struct t_preconf *tcp;
+  struct t_num s;
+  struct t_num B;
+  char username[MAXUSERLEN];
+  char hexbuf[MAXHEXPARAMLEN];
+  char buf1[MAXPARAMLEN], buf2[MAXPARAMLEN], buf3[MAXSALTLEN];
+  unsigned char cbuf[20];
+  struct t_num * A;
+  unsigned char * skey;
+  char pass[128];
+
+  printf("Enter username: ");
+  fgets(username, sizeof(username), stdin);
+  username[strlen(username) - 1] = '\0';
+  printf("Enter index (from server): ");
+  fgets(hexbuf, sizeof(hexbuf), stdin);
+  index = atoi(hexbuf);
+  tcp = t_getpreparam(index - 1);
+  printf("Enter salt (from server): ");
+  fgets(hexbuf, sizeof(hexbuf), stdin);
+  s.data = buf3;
+  s.len = t_fromb64(s.data, hexbuf);
+
+  tc = t_clientopen(username, &tcp->modulus, &tcp->generator, &s);
+  if (tc == 0) {
+    printf("invalid n, g\n");
+    exit(1);
+  }
+
+  A = t_clientgenexp(tc);
+  printf("A (to server): %s\n", t_tob64(hexbuf, A->data, A->len));
+
+  t_getpass(pass, 128, "Enter password:");
+  t_clientpasswd(tc, pass);
+
+  printf("Enter B (from server): ");
+  fgets(hexbuf, sizeof(hexbuf), stdin);
+  B.data = buf1;
+  B.len = t_fromb64(B.data, hexbuf);
+
+  skey = t_clientgetkey(tc, &B);
+  printf("Session key: %s\n", t_tohex(hexbuf, skey, 40));
+  printf("Response (to server): %s\n",
+    t_tohex(hexbuf, t_clientresponse(tc), RESPONSE_LEN));
+
+  printf("Enter server response: ");
+  fgets(hexbuf, sizeof(hexbuf), stdin);
+  hexbuf[strlen(hexbuf) - 1] = '\0';
+  t_fromhex(cbuf, hexbuf);
+
+  if (t_clientverify(tc, cbuf) == 0)
+    printf("Server authentication successful.\n");
+  else
+    printf("Server authentication failed.\n");
+
+  t_clientclose(tc);
+
+  return 0;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/config.h.in b/trunk/package/network/services/ead/src/tinysrp/config.h.in
new file mode 100644
index 00000000..a4b50c71
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/config.h.in
@@ -0,0 +1,79 @@
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if type char is unsigned and you are not using gcc.  */
+#ifndef __CHAR_UNSIGNED__
+#undef __CHAR_UNSIGNED__
+#endif
+
+/* Define to empty if the keyword does not work.  */
+#undef const
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#undef TIME_WITH_SYS_TIME
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+#undef SHA1HANDSOFF
+
+#undef POSIX_TERMIOS
+
+#undef POSIX_SIGTYPE
+
+#undef volatile
+
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
+
+/* The number of bytes in a long.  */
+#undef SIZEOF_LONG
+
+/* The number of bytes in a long long.  */
+#undef SIZEOF_LONG_LONG
+
+/* The number of bytes in a short.  */
+#undef SIZEOF_SHORT
+
+/* Define if you have the memcpy function.  */
+#undef HAVE_MEMCPY
+
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
+
+/* Define if you have the strchr function.  */
+#undef HAVE_STRCHR
+
+/* Define if you have the <sgtty.h> header file.  */
+#undef HAVE_SGTTY_H
+
+/* Define if you have the <sys/ioctl.h> header file.  */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <termio.h> header file.  */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <termios.h> header file.  */
+#undef HAVE_TERMIOS_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/configure b/trunk/package/network/services/ead/src/tinysrp/configure
new file mode 100755
index 00000000..6ee76bf4
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/configure
@@ -0,0 +1,2421 @@
+#! /bin/sh
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.13"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=t_pwd.h
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:559: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+echo "configure:612: checking whether build environment is sane" >&5
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "$*" != "X $srcdir/configure conftestfile" \
+      && test "$*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" 1>&2; exit 1; }
+   fi
+
+   test "$2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   { echo "configure: error: newly created file is older than distributed files!
+Check your system clock" 1>&2; exit 1; }
+fi
+rm -f conftest*
+echo "$ac_t""yes" 1>&6
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:669: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+
+PACKAGE=libtinysrp
+
+VERSION=0.7.5
+
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+
+
+missing_dir=`cd $ac_aux_dir && pwd`
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:716: checking for working aclocal" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
+   echo "$ac_t""found" 1>&6
+else
+   ACLOCAL="$missing_dir/missing aclocal"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+echo "configure:729: checking for working autoconf" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
+   AUTOCONF=autoconf
+   echo "$ac_t""found" 1>&6
+else
+   AUTOCONF="$missing_dir/missing autoconf"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:742: checking for working automake" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
+   echo "$ac_t""found" 1>&6
+else
+   AUTOMAKE="$missing_dir/missing automake"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+echo "configure:755: checking for working autoheader" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
+   AUTOHEADER=autoheader
+   echo "$ac_t""found" 1>&6
+else
+   AUTOHEADER="$missing_dir/missing autoheader"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+echo "configure:768: checking for working makeinfo" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+   MAKEINFO=makeinfo
+   echo "$ac_t""found" 1>&6
+else
+   MAKEINFO="$missing_dir/missing makeinfo"
+   echo "$ac_t""missing" 1>&6
+fi
+
+
+
+test "$CFLAGS" = "" && CFLAGS="-O2"
+
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:788: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:818: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:869: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:901: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 912 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ac_cv_prog_cc_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:943: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:948: checking whether we are using GNU C" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:976: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:1019: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:1072: checking whether ln -s works" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"
+else
+  ac_cv_prog_LN_S=ln
+fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1095: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:1144: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 1159 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 1176 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 1193 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:1224: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1229 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  ac_cv_header_stdc=yes
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 1254 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 1272 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1293 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:1304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+
+for ac_hdr in sgtty.h sys/ioctl.h sys/time.h termio.h termios.h unistd.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1331: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1336 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:1370: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1375 "configure"
+#include "confdefs.h"
+
+int main() {
+
+/* Ultrix mips cc rejects this.  */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this.  */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this.  */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+   It does not let you subtract one const X* pointer from another in an arm
+   of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this.  */
+  char *t;
+  char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_const=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
+EOF
+
+fi
+
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:1445: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat > conftest.$ac_ext <<EOF
+#line 1452 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:1459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
+esac
+
+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+echo "configure:1485: checking whether time.h and sys/time.h may both be included" >&5
+if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1490 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+int main() {
+struct tm *tp;
+; return 0; }
+EOF
+if { (eval echo configure:1499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_time=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_time=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_time" 1>&6
+if test $ac_cv_header_time = yes; then
+  cat >> confdefs.h <<\EOF
+#define TIME_WITH_SYS_TIME 1
+EOF
+
+fi
+
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:1520: checking whether byte ordering is bigendian" >&5
+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat > conftest.$ac_ext <<EOF
+#line 1527 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat > conftest.$ac_ext <<EOF
+#line 1542 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:1553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_bigendian=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_bigendian=no
+fi
+rm -f conftest*
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+if test $ac_cv_c_bigendian = unknown; then
+if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1573 "configure"
+#include "confdefs.h"
+main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
+EOF
+if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_bigendian=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
+if test $ac_cv_c_bigendian = yes; then
+  cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
+
+fi
+
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:1610: checking size of short" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1618 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_short=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:1649: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1657 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:1688: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1696 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:1727: checking size of long long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1735 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
+
+
+cat > conftest.$ac_ext <<EOF
+#line 1766 "configure"
+#include "confdefs.h"
+
+int main() {
+volatile int i;
+; return 0; }
+EOF
+if { (eval echo configure:1773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define volatile 
+EOF
+
+fi
+rm -f conftest*
+echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
+echo "configure:1786: checking whether char is unsigned" >&5
+if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$GCC" = yes; then
+  # GCC predefines this symbol on systems where it applies.
+cat > conftest.$ac_ext <<EOF
+#line 1793 "configure"
+#include "confdefs.h"
+#ifdef __CHAR_UNSIGNED__
+  yes
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_c_char_unsigned=yes
+else
+  rm -rf conftest*
+  ac_cv_c_char_unsigned=no
+fi
+rm -f conftest*
+
+else
+if test "$cross_compiling" = yes; then
+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1815 "configure"
+#include "confdefs.h"
+/* volatile prevents gcc2 from optimizing the test away on sparcs.  */
+#if !defined(__STDC__) || __STDC__ != 1
+#define volatile
+#endif
+main() {
+  volatile char c = 255; exit(c < 0);
+}
+EOF
+if { (eval echo configure:1825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_char_unsigned=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_char_unsigned=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_c_char_unsigned" 1>&6
+if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
+  cat >> confdefs.h <<\EOF
+#define __CHAR_UNSIGNED__ 1
+EOF
+
+fi
+
+
+if test "$ac_cv_c_char_unsigned" = "yes"; then
+  signed=-signed
+fi
+
+
+for ac_func in sigaction strchr memcpy
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1857: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1862 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+echo $ac_n "checking POSIX signal handlers""... $ac_c" 1>&6
+echo "configure:1911: checking POSIX signal handlers" >&5
+if eval "test \"`echo '$''{'ac_cv_has_posix_signals'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1916 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+#undef signal
+#endif
+extern void (*signal ()) ();
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_has_posix_signals=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_has_posix_signals=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_has_posix_signals" 1>&6
+if test $ac_cv_has_posix_signals = yes; then
+   cat >> confdefs.h <<\EOF
+#define RETSIGTYPE void
+EOF
+ cat >> confdefs.h <<\EOF
+#define POSIX_SIGTYPE 1
+EOF
+
+else
+  if test $ac_cv_type_signal = void; then
+     cat >> confdefs.h <<\EOF
+#define RETSIGTYPE void
+EOF
+
+  else
+     cat >> confdefs.h <<\EOF
+#define RETSIGTYPE int
+EOF
+
+  fi
+fi
+ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for termios.h""... $ac_c" 1>&6
+echo "configure:1964: checking for termios.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1969 "configure"
+#include "confdefs.h"
+#include <termios.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for cfsetispeed""... $ac_c" 1>&6
+echo "configure:1991: checking for cfsetispeed" >&5
+if eval "test \"`echo '$''{'ac_cv_func_cfsetispeed'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1996 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char cfsetispeed(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char cfsetispeed();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_cfsetispeed) || defined (__stub___cfsetispeed)
+choke me
+#else
+cfsetispeed();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_cfsetispeed=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_cfsetispeed=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'cfsetispeed`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define POSIX_TERMIOS 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+
+cat >> confdefs.h <<\EOF
+#define SHA1HANDSOFF 1
+EOF
+
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+DEFS=-DHAVE_CONFIG_H
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
+
+trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@PACKAGE@%$PACKAGE%g
+s%@VERSION@%$VERSION%g
+s%@ACLOCAL@%$ACLOCAL%g
+s%@AUTOCONF@%$AUTOCONF%g
+s%@AUTOMAKE@%$AUTOMAKE%g
+s%@AUTOHEADER@%$AUTOHEADER%g
+s%@MAKEINFO@%$MAKEINFO%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@CC@%$CC%g
+s%@LN_S@%$LN_S%g
+s%@RANLIB@%$RANLIB%g
+s%@CPP@%$CPP%g
+s%@signed@%$signed%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
+ac_dC='\3'
+ac_dD='%g'
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uB='\([ 	]\)%\1#\2define\3'
+ac_uC=' '
+ac_uD='\4%g'
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_eB='$%\1#\2define\3'
+ac_eC=' '
+ac_eD='%g'
+
+if test "${CONFIG_HEADERS+set}" != set; then
+EOF
+cat >> $CONFIG_STATUS <<EOF
+  CONFIG_HEADERS="config.h"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+fi
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  echo creating $ac_file
+
+  rm -f conftest.frag conftest.in conftest.out
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
+
+EOF
+
+# Transform confdefs.h into a sed script conftest.vals that substitutes
+# the proper values into config.h.in to produce config.h.  And first:
+# Protect against being on the right side of a sed subst in config.status.
+# Protect against being in an unquoted here document in config.status.
+rm -f conftest.vals
+cat > conftest.hdr <<\EOF
+s/[\\&%]/\\&/g
+s%[\\$`]%\\&%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%ac_d%ac_u%gp
+s%ac_u%ac_e%gp
+EOF
+sed -n -f conftest.hdr confdefs.h > conftest.vals
+rm -f conftest.hdr
+
+# This sed command replaces #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+cat >> conftest.vals <<\EOF
+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+EOF
+
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.
+
+rm -f conftest.tail
+while :
+do
+  ac_lines=`grep -c . conftest.vals`
+  # grep -c gives empty output for an empty file on some AIX systems.
+  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
+  # Write a limited-size here document to conftest.frag.
+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+  echo 'CEOF
+  sed -f conftest.frag conftest.in > conftest.out
+  rm -f conftest.in
+  mv conftest.out conftest.in
+' >> $CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  rm -f conftest.vals
+  mv conftest.tail conftest.vals
+done
+rm -f conftest.vals
+
+cat >> $CONFIG_STATUS <<\EOF
+  rm -f conftest.frag conftest.h
+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
+  cat conftest.in >> conftest.h
+  rm -f conftest.in
+  if cmp -s $ac_file conftest.h 2>/dev/null; then
+    echo "$ac_file is unchanged"
+    rm -f conftest.h
+  else
+    # Remove last slash and all that follows it.  Not all systems have dirname.
+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+      # The file is in a subdirectory.
+      test ! -d "$ac_dir" && mkdir "$ac_dir"
+    fi
+    rm -f $ac_file
+    mv conftest.h $ac_file
+  fi
+fi; done
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/configure.in b/trunk/package/network/services/ead/src/tinysrp/configure.in
new file mode 100644
index 00000000..627d15a8
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/configure.in
@@ -0,0 +1,52 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(t_pwd.h)
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(libtinysrp, 0.7.5)
+
+test "$CFLAGS" = "" && CFLAGS="-O2"
+
+dnl Checks for programs.
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_RANLIB
+AC_ARG_PROGRAM
+
+dnl Checks for header files.
+
+AC_HEADER_STDC
+AC_CHECK_HEADERS(sgtty.h sys/ioctl.h sys/time.h termio.h termios.h unistd.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+
+AC_C_CONST
+AC_C_INLINE
+AC_HEADER_TIME
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_TRY_COMPILE(, [volatile int i;], , AC_DEFINE(volatile, ))
+AC_C_CHAR_UNSIGNED
+
+AC_SUBST(signed)dnl
+if test "$ac_cv_c_char_unsigned" = "yes"; then
+  signed=-signed
+fi
+
+dnl Checks for library functions.
+
+AC_CHECK_FUNCS(sigaction strchr memcpy)
+TYPE_SIGNAL
+AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
+
+dnl User options
+
+dnl Some defines for now.
+
+AC_DEFINE(SHA1HANDSOFF)
+
+AC_OUTPUT(Makefile)
diff --git a/trunk/package/network/services/ead/src/tinysrp/install-sh b/trunk/package/network/services/ead/src/tinysrp/install-sh
new file mode 100755
index 00000000..e8436696
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/install-sh
@@ -0,0 +1,250 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
diff --git a/trunk/package/network/services/ead/src/tinysrp/missing b/trunk/package/network/services/ead/src/tinysrp/missing
new file mode 100755
index 00000000..a6abd069
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/missing
@@ -0,0 +1,134 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that 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.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        touch file \`y.tab.c'
+  makeinfo     touch the output file
+  yacc         touch file \`y.tab.c'"
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing - GNU libit 0.0"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`configure.in'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`configure.in'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`configure.in'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    touch config.h.in
+    ;;
+
+  automake)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print \
+      | sed 's/^\(.*\).am$/touch \1.in/' \
+      | sh
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    touch y.tab.c
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequirements for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/trunk/package/network/services/ead/src/tinysrp/mkinstalldirs b/trunk/package/network/services/ead/src/tinysrp/mkinstalldirs
new file mode 100755
index 00000000..3bc18360
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/mkinstalldirs
@@ -0,0 +1,39 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp" 1>&2
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
diff --git a/trunk/package/network/services/ead/src/tinysrp/srvtest.c b/trunk/package/network/services/ead/src/tinysrp/srvtest.c
new file mode 100644
index 00000000..e09d501a
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/srvtest.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+#include "t_defines.h"
+#include "t_pwd.h"
+#include "t_server.h"
+
+int
+main(argc, argv)
+     int argc;
+     char * argv[];
+{
+  struct t_server * ts;
+  struct t_pw * tpw;
+  struct t_conf * tcnf;
+  struct t_num * B;
+  char username[MAXUSERLEN];
+  char hexbuf[MAXHEXPARAMLEN];
+  char buf[MAXPARAMLEN];
+  struct t_num A;
+  unsigned char * skey;
+  unsigned char cbuf[20];
+  FILE * fp;
+  FILE * fp2;
+  char confname[256];
+
+  printf("Enter username: ");
+  fgets(username, sizeof(username), stdin);
+  username[strlen(username) - 1] = '\0';
+  ts = t_serveropen(username);
+
+  if(ts == NULL) {
+    fprintf(stderr, "User %s not found\n", username);
+    exit(1);
+  }
+
+#if 0
+  printf("n: %s\n", t_tob64(hexbuf, ts->n.data, ts->n.len));
+  printf("g: %s\n", t_tob64(hexbuf, ts->g.data, ts->g.len));
+#endif
+  printf("index (to client): %d\n", ts->index);
+  printf("salt (to client): %s\n", t_tob64(hexbuf, ts->s.data, ts->s.len));
+
+  B = t_servergenexp(ts);
+  printf("Enter A (from client): ");
+  fgets(hexbuf, sizeof(hexbuf), stdin);
+  A.data = buf;
+  A.len = t_fromb64(A.data, hexbuf);
+
+  printf("B (to client): %s\n", t_tob64(hexbuf, B->data, B->len));
+
+  skey = t_servergetkey(ts, &A);
+  printf("Session key: %s\n", t_tohex(hexbuf, skey, 40));
+
+  /* printf("[Expected response: %s]\n", t_tohex(hexbuf, cbuf, 16)); */
+
+  printf("Enter response (from client): ");
+  fgets(hexbuf, sizeof(hexbuf), stdin);
+  hexbuf[strlen(hexbuf) - 1] = '\0';
+  t_fromhex(cbuf, hexbuf);
+
+  if(t_serververify(ts, cbuf) == 0) {
+    printf("Authentication successful.\n");
+    printf("Response (to client): %s\n",
+      t_tohex(hexbuf, t_serverresponse(ts), RESPONSE_LEN));
+  } else
+    printf("Authentication failed.\n");
+
+  t_serverclose(ts);
+
+  return 0;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/stamp-h.in b/trunk/package/network/services/ead/src/tinysrp/stamp-h.in
new file mode 100644
index 00000000..9788f702
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/stamp-h.in
@@ -0,0 +1 @@
+timestamp
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_client.c b/trunk/package/network/services/ead/src/tinysrp/t_client.c
new file mode 100644
index 00000000..692215a3
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_client.c
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+#include "t_defines.h"
+#include "t_pwd.h"
+#include "t_client.h"
+#include "t_sha.h"
+
+_TYPE( struct t_client * )
+t_clientopen(u, n, g, s)
+     const char * u;
+     struct t_num * n;
+     struct t_num * g;
+     struct t_num * s;
+{
+  struct t_client * tc;
+  unsigned char buf1[SHA_DIGESTSIZE], buf2[SHA_DIGESTSIZE];
+  SHA1_CTX ctxt;
+  int i, validated;
+  struct t_preconf * tpc;
+
+  validated = 0;
+  if(n->len < MIN_MOD_BYTES)
+    return 0;
+  for(i = 0; i < t_getprecount(); ++i) {
+    tpc = t_getpreparam(i);
+    if(tpc->modulus.len == n->len && tpc->generator.len == g->len &&
+       memcmp(tpc->modulus.data, n->data, n->len) == 0 &&
+       memcmp(tpc->generator.data, g->data, g->len) == 0) {
+      validated = 1;    /* Match found, done */
+      break;
+    }
+  }
+
+  if(validated == 0)
+    return 0;
+
+  if((tc = malloc(sizeof(struct t_client))) == 0)
+    return 0;
+
+  strncpy(tc->username, u, MAXUSERLEN);
+
+  SHA1Init(&tc->hash);
+
+  tc->n.len = n->len;
+  tc->n.data = tc->nbuf;
+  memcpy(tc->n.data, n->data, tc->n.len);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, tc->n.data, tc->n.len);
+  SHA1Final(buf1, &ctxt);
+
+  tc->g.len = g->len;
+  tc->g.data = tc->gbuf;
+  memcpy(tc->g.data, g->data, tc->g.len);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, tc->g.data, tc->g.len);
+  SHA1Final(buf2, &ctxt);
+
+  for(i = 0; i < sizeof(buf1); ++i)
+    buf1[i] ^= buf2[i];
+
+  SHA1Update(&tc->hash, buf1, sizeof(buf1));
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, tc->username, strlen(tc->username));
+  SHA1Final(buf1, &ctxt);
+
+  SHA1Update(&tc->hash, buf1, sizeof(buf1));
+
+  tc->s.len = s->len;
+  tc->s.data = tc->sbuf;
+  memcpy(tc->s.data, s->data, tc->s.len);
+
+  SHA1Update(&tc->hash, tc->s.data, tc->s.len);
+
+  tc->a.data = tc->abuf;
+  tc->A.data = tc->Abuf;
+  tc->p.data = tc->pbuf;
+  tc->v.data = tc->vbuf;
+
+  SHA1Init(&tc->ckhash);
+
+  return tc;
+}
+
+_TYPE( struct t_num * )
+t_clientgenexp(tc)
+     struct t_client * tc;
+{
+  BigInteger a, A, n, g;
+
+  if(tc->n.len < ALEN)
+    tc->a.len = tc->n.len;
+  else
+    tc->a.len = ALEN;
+
+  t_random(tc->a.data, tc->a.len);
+  a = BigIntegerFromBytes(tc->a.data, tc->a.len);
+  n = BigIntegerFromBytes(tc->n.data, tc->n.len);
+  g = BigIntegerFromBytes(tc->g.data, tc->g.len);
+  A = BigIntegerFromInt(0);
+  BigIntegerModExp(A, g, a, n);
+  tc->A.len = BigIntegerToBytes(A, tc->A.data);
+
+  BigIntegerFree(A);
+  BigIntegerFree(a);
+  BigIntegerFree(g);
+  BigIntegerFree(n);
+
+  SHA1Update(&tc->hash, tc->A.data, tc->A.len);
+  SHA1Update(&tc->ckhash, tc->A.data, tc->A.len);
+
+  return &tc->A;
+}
+
+_TYPE( void )
+t_clientpasswd(tc, password)
+     struct t_client * tc;
+     char * password;
+{
+  BigInteger n, g, p, v;
+  SHA1_CTX ctxt;
+  unsigned char dig[SHA_DIGESTSIZE];
+
+  n = BigIntegerFromBytes(tc->n.data, tc->n.len);
+  g = BigIntegerFromBytes(tc->g.data, tc->g.len);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, tc->username, strlen(tc->username));
+  SHA1Update(&ctxt, ":", 1);
+  SHA1Update(&ctxt, password, strlen(password));
+  SHA1Final(dig, &ctxt);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, tc->s.data, tc->s.len);
+  SHA1Update(&ctxt, dig, sizeof(dig));
+  SHA1Final(dig, &ctxt);
+
+  p = BigIntegerFromBytes(dig, sizeof(dig));
+
+  v = BigIntegerFromInt(0);
+  BigIntegerModExp(v, g, p, n);
+
+  tc->p.len = BigIntegerToBytes(p, tc->p.data);
+  BigIntegerFree(p);
+
+  tc->v.len = BigIntegerToBytes(v, tc->v.data);
+  BigIntegerFree(v);
+}
+
+_TYPE( unsigned char * )
+t_clientgetkey(tc, serverval)
+     struct t_client * tc;
+     struct t_num * serverval;
+{
+  BigInteger n, B, v, p, a, sum, S;
+  unsigned char sbuf[MAXPARAMLEN];
+  unsigned char dig[SHA_DIGESTSIZE];
+  unsigned slen;
+  unsigned int u;
+  SHA1_CTX ctxt;
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, serverval->data, serverval->len);
+  SHA1Final(dig, &ctxt);
+  u = (dig[0] << 24) | (dig[1] << 16) | (dig[2] << 8) | dig[3];
+  if(u == 0)
+    return NULL;
+
+  SHA1Update(&tc->hash, serverval->data, serverval->len);
+
+  B = BigIntegerFromBytes(serverval->data, serverval->len);
+  n = BigIntegerFromBytes(tc->n.data, tc->n.len);
+
+  if(BigIntegerCmp(B, n) >= 0 || BigIntegerCmpInt(B, 0) == 0) {
+    BigIntegerFree(B);
+    BigIntegerFree(n);
+    return NULL;
+  }
+  v = BigIntegerFromBytes(tc->v.data, tc->v.len);
+  if(BigIntegerCmp(B, v) < 0)
+    BigIntegerAdd(B, B, n);
+  BigIntegerSub(B, B, v);
+  BigIntegerFree(v);
+
+  a = BigIntegerFromBytes(tc->a.data, tc->a.len);
+  p = BigIntegerFromBytes(tc->p.data, tc->p.len);
+
+  sum = BigIntegerFromInt(0);
+  BigIntegerMulInt(sum, p, u);
+  BigIntegerAdd(sum, sum, a);
+
+  BigIntegerFree(p);
+  BigIntegerFree(a);
+
+  S = BigIntegerFromInt(0);
+  BigIntegerModExp(S, B, sum, n);
+  slen = BigIntegerToBytes(S, sbuf);
+
+  BigIntegerFree(S);
+  BigIntegerFree(sum);
+  BigIntegerFree(B);
+  BigIntegerFree(n);
+
+  t_sessionkey(tc->session_key, sbuf, slen);
+  memset(sbuf, 0, slen);
+
+  SHA1Update(&tc->hash, tc->session_key, sizeof(tc->session_key));
+
+  SHA1Final(tc->session_response, &tc->hash);
+  SHA1Update(&tc->ckhash, tc->session_response, sizeof(tc->session_response));
+  SHA1Update(&tc->ckhash, tc->session_key, sizeof(tc->session_key));
+
+  return tc->session_key;
+}
+
+_TYPE( int )
+t_clientverify(tc, resp)
+    struct t_client * tc;
+    unsigned char * resp;
+{
+  unsigned char expected[SHA_DIGESTSIZE];
+
+  SHA1Final(expected, &tc->ckhash);
+  return memcmp(expected, resp, sizeof(expected));
+}
+
+_TYPE( unsigned char * )
+t_clientresponse(tc)
+    struct t_client * tc;
+{
+  return tc->session_response;
+}
+
+_TYPE( void )
+t_clientclose(tc)
+     struct t_client * tc;
+{
+  memset(tc->abuf, 0, sizeof(tc->abuf));
+  memset(tc->pbuf, 0, sizeof(tc->pbuf));
+  memset(tc->vbuf, 0, sizeof(tc->vbuf));
+  memset(tc->session_key, 0, sizeof(tc->session_key));
+  free(tc);
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_client.h b/trunk/package/network/services/ead/src/tinysrp/t_client.h
new file mode 100644
index 00000000..42922aff
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_client.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#ifndef T_CLIENT_H
+#define T_CLIENT_H
+
+#include "t_sha.h"
+
+#if     !defined(P)
+#ifdef  __STDC__
+#define P(x)    x
+#else
+#define P(x)    ()
+#endif
+#endif
+
+/*      For building dynamic link libraries under windows, windows NT
+ *      using MSVC1.5 or MSVC2.0
+ */
+
+#ifndef _DLLDECL
+#define _DLLDECL
+
+#ifdef MSVC15   /* MSVC1.5 support for 16 bit apps */
+#define _MSVC15EXPORT _export
+#define _MSVC20EXPORT
+#define _DLLAPI _export _pascal
+#define _TYPE(a) a _MSVC15EXPORT
+#define DLLEXPORT 1
+
+#elif MSVC20
+#define _MSVC15EXPORT
+#define _MSVC20EXPORT _declspec(dllexport)
+#define _DLLAPI
+#define _TYPE(a) _MSVC20EXPORT a
+#define DLLEXPORT 1
+
+#else                   /* Default, non-dll.  Use this for Unix or DOS */
+#define _MSVC15DEXPORT
+#define _MSVC20EXPORT
+#define _DLLAPI
+#define _TYPE(a) a
+#endif
+#endif
+
+#define ALEN 32
+#define MIN_MOD_BYTES 64        /* 512 bits */
+
+struct t_client {
+  struct t_num n;
+  struct t_num g;
+  struct t_num s;
+
+  struct t_num a;
+  struct t_num A;
+
+  struct t_num p;
+  struct t_num v;
+
+  SHA1_CTX hash, ckhash;
+
+  char username[MAXUSERLEN];
+  unsigned char session_key[SESSION_KEY_LEN];
+  unsigned char session_response[RESPONSE_LEN];
+
+  unsigned char nbuf[MAXPARAMLEN], gbuf[MAXPARAMLEN], sbuf[MAXSALTLEN];
+  unsigned char pbuf[MAXPARAMLEN], vbuf[MAXPARAMLEN];
+  unsigned char abuf[ALEN], Abuf[MAXPARAMLEN];
+};
+
+/*
+ * SRP client-side negotiation
+ *
+ * This code negotiates the client side of an SRP exchange.
+ * "t_clientopen" accepts a username, and N, g, and s parameters,
+ *   which are usually sent by the server in the first round.
+ *   The client should then call...
+ * "t_clientgenexp" will generate a random 256-bit exponent and
+ *   raise g to that power, returning the result.  This result
+ *   should be sent to the server as w(p).
+ * "t_clientpasswd" accepts the user's password, which should be
+ *   entered locally and updates the client's state.
+ * "t_clientgetkey" accepts the exponential y(p), which should
+ *   be sent by the server in the next round and computes the
+ *   256-bit session key.  This data should be saved before the
+ *   session is closed.
+ * "t_clientresponse" computes the session key proof as SHA(y(p), K).
+ * "t_clientclose" closes the session and frees its memory.
+ *
+ * Note that authentication is not performed per se; it is up
+ * to either/both sides of the protocol to now verify securely
+ * that their session keys agree in order to establish authenticity.
+ * One possible way is through "oracle hashing"; one side sends
+ * r, the other replies with H(r,K), where H() is a hash function.
+ *
+ * t_clientresponse and t_clientverify now implement a version of
+ * the session-key verification described above.
+ */
+_TYPE( struct t_client * )
+  t_clientopen P((const char *, struct t_num *, struct t_num *,
+		  struct t_num *));
+_TYPE( struct t_num * ) t_clientgenexp P((struct t_client *));
+_TYPE( void ) t_clientpasswd P((struct t_client *, char *));
+_TYPE( unsigned char * )
+  t_clientgetkey P((struct t_client *, struct t_num *));
+_TYPE( int ) t_clientverify P((struct t_client *, unsigned char *));
+_TYPE( unsigned char * ) t_clientresponse P((struct t_client *));
+_TYPE( void ) t_clientclose P((struct t_client *));
+
+#endif
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_conf.c b/trunk/package/network/services/ead/src/tinysrp/t_conf.c
new file mode 100644
index 00000000..fbe6f410
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_conf.c
@@ -0,0 +1,1080 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+
+#include "t_defines.h"
+#include "t_pwd.h"
+#include "t_read.h"
+#include "bn.h"
+#include "bn_lcl.h"
+#include "bn_prime.h"
+
+#define TABLE_SIZE      32
+
+static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1,
+	const BIGNUM *a1_odd, int k, BN_CTX *ctx, BN_MONT_CTX *mont);
+
+/*
+ * This is the safe prime generation logic.
+ * To generate a safe prime p (where p = 2q+1 and q is prime), we start
+ * with a random odd q that is one bit shorter than the desired length
+ * of p.  We use a simple 30-element sieve to filter the values of q
+ * and consider only those that are 11, 23, or 29 (mod 30).  (If q were
+ * anything else, either q or p would be divisible by 2, 3, or 5).
+ * For the values of q that are left, we apply the following tests in
+ * this order:
+ *
+ *   trial divide q
+ *   let p = 2q + 1
+ *   trial divide p
+ *   apply Fermat test to q (2^q == 2 (mod q))
+ *   apply Fermat test to p (2^p == 2 (mod p))
+ *   apply real probablistic primality test to q
+ *   apply real probablistic primality test to p
+ *
+ * A number that passes all these tests is considered a safe prime for
+ * our purposes.  The tests are ordered this way for efficiency; the
+ * slower tests are run rarely if ever at all.
+ */
+
+static int
+trialdiv(x)
+     const BigInteger x;
+{
+  static int primes[] = {               /* All odd primes < 256 */
+      3,   5,   7,  11,  13,  17,  19,  23,  29,
+     31,  37,  41,  43,  47,  53,  59,  61,  67,
+     71,  73,  79,  83,  89,  97, 101, 103,
+    107, 109, 113, 127, 131, 137, 139, 149, 151,
+    157, 163, 167, 173, 179, 181, 191, 193, 197,
+    199, 211, 223, 227, 229, 233, 239, 241, 251
+  };
+  static int nprimes = sizeof(primes) / sizeof(int);
+  int i;
+
+  for(i = 0; i < nprimes; ++i) {
+    if(BigIntegerModInt(x, primes[i]) == 0)
+      return primes[i];
+  }
+  return 1;
+}
+
+/* x + sieve30[x%30] == 11, 23, or 29 (mod 30) */
+
+static int sieve30[] =
+{  11, 10,  9,  8,  7,  6,  5,  4,  3,  2,
+    1, 12, 11, 10,  9,  8,  7,  6,  5,  4,
+    3,  2,  1,  6,  5,  4,  3,  2,  1, 12
+};
+
+/* Find a Sophie-Germain prime between "lo" and "hi".  NOTE: this is not
+   a "safe prime", but the smaller prime.  Take 2q+1 to get the safe prime. */
+
+static void
+sophie_germain(q, lo, hi)
+     BigInteger q;              /* assumed initialized */
+     const BigInteger lo;
+     const BigInteger hi;
+{
+  BigInteger m, p, r;
+  char parambuf[MAXPARAMLEN];
+  int foundprime = 0;
+  int i, mod30;
+
+  m = BigIntegerFromInt(0);
+  BigIntegerSub(m, hi, lo);
+  i = (BigIntegerBitLen(m) + 7) / 8;
+  t_random(parambuf, i);
+  r = BigIntegerFromBytes(parambuf, i);
+  BigIntegerMod(r, r, m);
+
+  BigIntegerAdd(q, r, lo);
+  if(BigIntegerModInt(q, 2) == 0)
+    BigIntegerAddInt(q, q, 1);          /* make q odd */
+
+  mod30 = BigIntegerModInt(q, 30);      /* mod30 = q % 30 */
+
+  BigIntegerFree(m);
+  m = BigIntegerFromInt(2);                     /* m = 2 */
+  p = BigIntegerFromInt(0);
+
+  while(BigIntegerCmp(q, hi) < 0) {
+    if(trialdiv(q) < 2) {
+      BigIntegerMulInt(p, q, 2);                        /* p = 2 * q */
+      BigIntegerAddInt(p, p, 1);                /* p += 1 */
+      if(trialdiv(p) < 2) {
+	BigIntegerModExp(r, m, q, q);           /* r = 2^q % q */
+	if(BigIntegerCmpInt(r, 2) == 0) {       /* if(r == 2) */
+	  BigIntegerModExp(r, m, p, p);         /* r = 2^p % p */
+	  if(BigIntegerCmpInt(r, 2) == 0) {     /* if(r == 2) */
+	    if(BigIntegerCheckPrime(q) && BigIntegerCheckPrime(p)) {
+	      ++foundprime;
+	      break;
+	    }
+	  }
+	}
+      }
+    }
+
+    i = sieve30[mod30];
+    BigIntegerAddInt(q, q, i);          /* q += i */
+    mod30 = (mod30 + i) % 30;
+  }
+
+  /* should wrap around on failure */
+  if(!foundprime) {
+    fprintf(stderr, "Prime generation failed!\n");
+    exit(1);
+  }
+
+  BigIntegerFree(r);
+  BigIntegerFree(m);
+  BigIntegerFree(p);
+}
+
+_TYPE( struct t_confent * )
+t_makeconfent(tc, nsize)
+     struct t_conf * tc;
+     int nsize;
+{
+  BigInteger n, g, q, t, u;
+
+  t = BigIntegerFromInt(0);
+  u = BigIntegerFromInt(1);             /* u = 1 */
+  BigIntegerLShift(t, u, nsize - 2);    /* t = 2^(nsize-2) */
+  BigIntegerMulInt(u, t, 2);            /* u = 2^(nsize-1) */
+
+  q = BigIntegerFromInt(0);
+  sophie_germain(q, t, u);
+
+  n = BigIntegerFromInt(0);
+  BigIntegerMulInt(n, q, 2);
+  BigIntegerAddInt(n, n, 1);
+
+  /* Look for a generator mod n */
+  g = BigIntegerFromInt(2);
+  while(1) {
+    BigIntegerModExp(t, g, q, n);               /* t = g^q % n */
+    if(BigIntegerCmpInt(t, 1) == 0)             /* if(t == 1) */
+      BigIntegerAddInt(g, g, 1);                /* ++g */
+    else
+      break;
+  }
+  BigIntegerFree(t);
+  BigIntegerFree(u);
+  BigIntegerFree(q);
+
+  tc->tcbuf.modulus.data = tc->modbuf;
+  tc->tcbuf.modulus.len = BigIntegerToBytes(n, tc->tcbuf.modulus.data);
+  BigIntegerFree(n);
+
+  tc->tcbuf.generator.data = tc->genbuf;
+  tc->tcbuf.generator.len = BigIntegerToBytes(g, tc->tcbuf.generator.data);
+  BigIntegerFree(g);
+
+  tc->tcbuf.index = 1;
+  return &tc->tcbuf;
+}
+
+_TYPE( struct t_confent * )
+t_makeconfent_c(tc, nsize)
+     struct t_conf * tc;
+     int nsize;
+{
+  BigInteger g, n, p, q, j, k, t, u;
+  int psize, qsize;
+
+  psize = nsize / 2;
+  qsize = nsize - psize;
+
+  t = BigIntegerFromInt(1);             /* t = 1 */
+  u = BigIntegerFromInt(0);
+  BigIntegerLShift(u, t, psize - 3);    /* u = t*2^(psize-3) = 2^(psize-3) */
+  BigIntegerMulInt(t, u, 3);                    /* t = 3*u = 1.5*2^(psize-2) */
+  BigIntegerAdd(u, u, t);                       /* u += t [u = 2^(psize-1)] */
+  j = BigIntegerFromInt(0);
+  sophie_germain(j, t, u);
+
+  k = BigIntegerFromInt(0);
+  if(qsize != psize) {
+    BigIntegerFree(t);
+    t = BigIntegerFromInt(1);           /* t = 1 */
+    BigIntegerLShift(u, t, qsize - 3);  /* u = t*2^(qsize-3) = 2^(qsize-3) */
+    BigIntegerMulInt(t, u, 3);          /* t = 3*u = 1.5*2^(qsize-2) */
+    BigIntegerAdd(u, u, t);             /* u += t [u = 2^(qsize-1)] */
+  }
+  sophie_germain(k, t, u);
+
+  p = BigIntegerFromInt(0);
+  BigIntegerMulInt(p, j, 2);            /* p = 2 * j */
+  BigIntegerAddInt(p, p, 1);            /* p += 1 */
+
+  q = BigIntegerFromInt(0);
+  BigIntegerMulInt(q, k, 2);            /* q = 2 * k */
+  BigIntegerAddInt(q, q, 1);            /* q += 1 */
+
+  n = BigIntegerFromInt(0);
+  BigIntegerMul(n, p, q);               /* n = p * q */
+  BigIntegerMul(u, j, k);               /* u = j * k */
+
+  BigIntegerFree(p);
+  BigIntegerFree(q);
+  BigIntegerFree(j);
+  BigIntegerFree(k);
+
+  g = BigIntegerFromInt(2);             /* g = 2 */
+
+  /* Look for a generator mod n */
+  while(1) {
+    BigIntegerModExp(t, g, u, n);       /* t = g^u % n */
+    if(BigIntegerCmpInt(t, 1) == 0)
+      BigIntegerAddInt(g, g, 1);        /* ++g */
+    else
+      break;
+  }
+
+  BigIntegerFree(u);
+  BigIntegerFree(t);
+
+  tc->tcbuf.modulus.data = tc->modbuf;
+  tc->tcbuf.modulus.len = BigIntegerToBytes(n, tc->tcbuf.modulus.data);
+  BigIntegerFree(n);
+
+  tc->tcbuf.generator.data = tc->genbuf;
+  tc->tcbuf.generator.len = BigIntegerToBytes(g, tc->tcbuf.generator.data);
+  BigIntegerFree(g);
+
+  tc->tcbuf.index = 1;
+  return &tc->tcbuf;
+}
+
+_TYPE( struct t_confent * )
+t_newconfent(tc)
+    struct t_conf * tc;
+{
+  tc->tcbuf.index = 0;
+  tc->tcbuf.modulus.data = tc->modbuf;
+  tc->tcbuf.modulus.len = 0;
+  tc->tcbuf.generator.data = tc->genbuf;
+  tc->tcbuf.generator.len = 0;
+  return &tc->tcbuf;
+}
+
+_TYPE( void )
+t_putconfent(ent, fp)
+     const struct t_confent * ent;
+     FILE * fp;
+{
+  char strbuf[MAXB64PARAMLEN];
+
+  fprintf(fp, "%d:%s:", ent->index,
+	  t_tob64(strbuf, ent->modulus.data, ent->modulus.len));
+  fprintf(fp, "%s\n",
+	  t_tob64(strbuf, ent->generator.data, ent->generator.len));
+}
+
+int
+BigIntegerBitLen(b)
+     BigInteger b;
+{
+  return BN_num_bits(b);
+}
+
+int
+BigIntegerCheckPrime(n)
+     BigInteger n;
+{
+  BN_CTX * ctx = BN_CTX_new();
+  int rv = BN_is_prime(n, 25, NULL, ctx, NULL);
+  BN_CTX_free(ctx);
+  return rv;
+}
+
+unsigned int
+BigIntegerModInt(d, m)
+     BigInteger d;
+     unsigned int m;
+{
+  return BN_mod_word(d, m);
+}
+
+void
+BigIntegerMod(result, d, m)
+     BigInteger result, d, m;
+{
+  BN_CTX * ctx = BN_CTX_new();
+  BN_mod(result, d, m, ctx);
+  BN_CTX_free(ctx);
+}
+
+void
+BigIntegerMul(result, m1, m2)
+     BigInteger result, m1, m2;
+{
+  BN_CTX * ctx = BN_CTX_new();
+  BN_mul(result, m1, m2, ctx);
+  BN_CTX_free(ctx);
+}
+
+void
+BigIntegerLShift(result, x, bits)
+     BigInteger result, x;
+     unsigned int bits;
+{
+  BN_lshift(result, x, bits);
+}
+
+int BN_is_prime(const BIGNUM *a, int checks, void (*callback)(int,int,void *),
+	BN_CTX *ctx_passed, void *cb_arg)
+	{
+	return BN_is_prime_fasttest(a, checks, callback, ctx_passed, cb_arg, 0);
+	}
+
+int BN_is_prime_fasttest(const BIGNUM *a, int checks,
+		void (*callback)(int,int,void *),
+		BN_CTX *ctx_passed, void *cb_arg,
+		int do_trial_division)
+	{
+	int i, j, ret = -1;
+	int k;
+	BN_CTX *ctx = NULL;
+	BIGNUM *A1, *A1_odd, *check; /* taken from ctx */
+	BN_MONT_CTX *mont = NULL;
+	const BIGNUM *A = NULL;
+
+	if (checks == BN_prime_checks)
+		checks = BN_prime_checks_for_size(BN_num_bits(a));
+
+	/* first look for small factors */
+	if (!BN_is_odd(a))
+		return(0);
+	if (do_trial_division)
+		{
+		for (i = 1; i < NUMPRIMES; i++)
+			if (BN_mod_word(a, primes[i]) == 0)
+				return 0;
+		if (callback != NULL) callback(1, -1, cb_arg);
+		}
+
+	if (ctx_passed != NULL)
+		ctx = ctx_passed;
+	else
+		if ((ctx=BN_CTX_new()) == NULL)
+			goto err;
+	BN_CTX_start(ctx);
+
+	/* A := abs(a) */
+	if (a->neg)
+		{
+		BIGNUM *t;
+		if ((t = BN_CTX_get(ctx)) == NULL) goto err;
+		BN_copy(t, a);
+		t->neg = 0;
+		A = t;
+		}
+	else
+		A = a;
+	A1 = BN_CTX_get(ctx);
+	A1_odd = BN_CTX_get(ctx);
+	check = BN_CTX_get(ctx);
+	if (check == NULL) goto err;
+
+	/* compute A1 := A - 1 */
+	if (!BN_copy(A1, A))
+		goto err;
+	if (!BN_sub_word(A1, 1))
+		goto err;
+	if (BN_is_zero(A1))
+		{
+		ret = 0;
+		goto err;
+		}
+
+	/* write  A1  as  A1_odd * 2^k */
+	k = 1;
+	while (!BN_is_bit_set(A1, k))
+		k++;
+	if (!BN_rshift(A1_odd, A1, k))
+		goto err;
+
+	/* Montgomery setup for computations mod A */
+	mont = BN_MONT_CTX_new();
+	if (mont == NULL)
+		goto err;
+	if (!BN_MONT_CTX_set(mont, A, ctx))
+		goto err;
+
+	for (i = 0; i < checks; i++)
+		{
+		if (!BN_pseudo_rand(check, BN_num_bits(A1), 0, 0))
+			goto err;
+		if (BN_cmp(check, A1) >= 0)
+			if (!BN_sub(check, check, A1))
+				goto err;
+		if (!BN_add_word(check, 1))
+			goto err;
+		/* now 1 <= check < A */
+
+		j = witness(check, A, A1, A1_odd, k, ctx, mont);
+		if (j == -1) goto err;
+		if (j)
+			{
+			ret=0;
+			goto err;
+			}
+		if (callback != NULL) callback(1,i,cb_arg);
+		}
+	ret=1;
+err:
+	if (ctx != NULL)
+		{
+		BN_CTX_end(ctx);
+		if (ctx_passed == NULL)
+			BN_CTX_free(ctx);
+		}
+	if (mont != NULL)
+		BN_MONT_CTX_free(mont);
+
+	return(ret);
+	}
+
+static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1,
+	const BIGNUM *a1_odd, int k, BN_CTX *ctx, BN_MONT_CTX *mont)
+	{
+	if (!BN_mod_exp_mont(w, w, a1_odd, a, ctx, mont)) /* w := w^a1_odd mod a */
+		return -1;
+	if (BN_is_one(w))
+		return 0; /* probably prime */
+	if (BN_cmp(w, a1) == 0)
+		return 0; /* w == -1 (mod a),  'a' is probably prime */
+	while (--k)
+		{
+		if (!BN_mod_mul(w, w, w, a, ctx)) /* w := w^2 mod a */
+			return -1;
+		if (BN_is_one(w))
+			return 1; /* 'a' is composite, otherwise a previous 'w' would
+				   * have been == -1 (mod 'a') */
+		if (BN_cmp(w, a1) == 0)
+			return 0; /* w == -1 (mod a), 'a' is probably prime */
+		}
+	/* If we get here, 'w' is the (a-1)/2-th power of the original 'w',
+	 * and it is neither -1 nor +1 -- so 'a' cannot be prime */
+	return 1;
+	}
+
+int BN_mod_exp_mont(BIGNUM *rr, BIGNUM *a, const BIGNUM *p,
+		    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
+	{
+	int i,j,bits,ret=0,wstart,wend,window,wvalue;
+	int start=1,ts=0;
+	BIGNUM *d,*r;
+	BIGNUM *aa;
+	BIGNUM val[TABLE_SIZE];
+	BN_MONT_CTX *mont=NULL;
+
+	bn_check_top(a);
+	bn_check_top(p);
+	bn_check_top(m);
+
+	if (!(m->d[0] & 1))
+		{
+		return(0);
+		}
+	bits=BN_num_bits(p);
+	if (bits == 0)
+		{
+		BN_one(rr);
+		return(1);
+		}
+	BN_CTX_start(ctx);
+	d = BN_CTX_get(ctx);
+	r = BN_CTX_get(ctx);
+	if (d == NULL || r == NULL) goto err;
+
+	/* If this is not done, things will break in the montgomery
+	 * part */
+
+	if (in_mont != NULL)
+		mont=in_mont;
+	else
+		{
+		if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
+		if (!BN_MONT_CTX_set(mont,m,ctx)) goto err;
+		}
+
+	BN_init(&val[0]);
+	ts=1;
+	if (BN_ucmp(a,m) >= 0)
+		{
+		if (!BN_mod(&(val[0]),a,m,ctx))
+			goto err;
+		aa= &(val[0]);
+		}
+	else
+		aa=a;
+	if (!BN_to_montgomery(&(val[0]),aa,mont,ctx)) goto err; /* 1 */
+
+	window = BN_window_bits_for_exponent_size(bits);
+	if (window > 1)
+		{
+		if (!BN_mod_mul_montgomery(d,&(val[0]),&(val[0]),mont,ctx)) goto err; /* 2 */
+		j=1<<(window-1);
+		for (i=1; i<j; i++)
+			{
+			BN_init(&(val[i]));
+			if (!BN_mod_mul_montgomery(&(val[i]),&(val[i-1]),d,mont,ctx))
+				goto err;
+			}
+		ts=i;
+		}
+
+	start=1;        /* This is used to avoid multiplication etc
+			 * when there is only the value '1' in the
+			 * buffer. */
+	wvalue=0;       /* The 'value' of the window */
+	wstart=bits-1;  /* The top bit of the window */
+	wend=0;         /* The bottom bit of the window */
+
+	if (!BN_to_montgomery(r,BN_value_one(),mont,ctx)) goto err;
+	for (;;)
+		{
+		if (BN_is_bit_set(p,wstart) == 0)
+			{
+			if (!start)
+				{
+				if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
+				goto err;
+				}
+			if (wstart == 0) break;
+			wstart--;
+			continue;
+			}
+		/* We now have wstart on a 'set' bit, we now need to work out
+		 * how bit a window to do.  To do this we need to scan
+		 * forward until the last set bit before the end of the
+		 * window */
+		j=wstart;
+		wvalue=1;
+		wend=0;
+		for (i=1; i<window; i++)
+			{
+			if (wstart-i < 0) break;
+			if (BN_is_bit_set(p,wstart-i))
+				{
+				wvalue<<=(i-wend);
+				wvalue|=1;
+				wend=i;
+				}
+			}
+
+		/* wend is the size of the current window */
+		j=wend+1;
+		/* add the 'bytes above' */
+		if (!start)
+			for (i=0; i<j; i++)
+				{
+				if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
+					goto err;
+				}
+
+		/* wvalue will be an odd number < 2^window */
+		if (!BN_mod_mul_montgomery(r,r,&(val[wvalue>>1]),mont,ctx))
+			goto err;
+
+		/* move the 'window' down further */
+		wstart-=wend+1;
+		wvalue=0;
+		start=0;
+		if (wstart < 0) break;
+		}
+	if (!BN_from_montgomery(rr,r,mont,ctx)) goto err;
+	ret=1;
+err:
+	if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
+	BN_CTX_end(ctx);
+	for (i=0; i<ts; i++)
+		BN_clear_free(&(val[i]));
+	return(ret);
+	}
+
+BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w)
+	{
+#ifndef BN_LLONG
+	BN_ULONG ret=0;
+#else
+	BN_ULLONG ret=0;
+#endif
+	int i;
+
+	w&=BN_MASK2;
+	for (i=a->top-1; i>=0; i--)
+		{
+#ifndef BN_LLONG
+		ret=((ret<<BN_BITS4)|((a->d[i]>>BN_BITS4)&BN_MASK2l))%w;
+		ret=((ret<<BN_BITS4)|(a->d[i]&BN_MASK2l))%w;
+#else
+		ret=(BN_ULLONG)(((ret<<(BN_ULLONG)BN_BITS2)|a->d[i])%
+			(BN_ULLONG)w);
+#endif
+		}
+	return((BN_ULONG)ret);
+	}
+
+static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
+	{
+	unsigned char *buf=NULL;
+	int ret=0,bit,bytes,mask;
+
+	if (bits == 0)
+		{
+		BN_zero(rnd);
+		return 1;
+		}
+
+	bytes=(bits+7)/8;
+	bit=(bits-1)%8;
+	mask=0xff<<bit;
+
+	buf=(unsigned char *)malloc(bytes);
+	if (buf == NULL)
+		{
+		goto err;
+		}
+
+	/* make a random number and set the top and bottom bits */
+	/* this ignores the pseudorand flag */
+
+	t_random(buf, bytes);
+
+	if (top)
+		{
+		if (bit == 0)
+			{
+			buf[0]=1;
+			buf[1]|=0x80;
+			}
+		else
+			{
+			buf[0]|=(3<<(bit-1));
+			buf[0]&= ~(mask<<1);
+			}
+		}
+	else
+		{
+		buf[0]|=(1<<bit);
+		buf[0]&= ~(mask<<1);
+		}
+	if (bottom) /* set bottom bits to whatever odd is */
+		buf[bytes-1]|=1;
+	if (!BN_bin2bn(buf,bytes,rnd)) goto err;
+	ret=1;
+err:
+	if (buf != NULL)
+		{
+		memset(buf,0,bytes);
+		free(buf);
+		}
+	return(ret);
+	}
+
+/* BN_pseudo_rand is the same as BN_rand, now. */
+
+int     BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom)
+	{
+	return bnrand(1, rnd, bits, top, bottom);
+	}
+
+#define MONT_WORD /* use the faster word-based algorithm */
+
+int BN_mod_mul_montgomery(BIGNUM *r, BIGNUM *a, BIGNUM *b,
+			  BN_MONT_CTX *mont, BN_CTX *ctx)
+	{
+	BIGNUM *tmp,*tmp2;
+	int ret=0;
+
+	BN_CTX_start(ctx);
+	tmp = BN_CTX_get(ctx);
+	tmp2 = BN_CTX_get(ctx);
+	if (tmp == NULL || tmp2 == NULL) goto err;
+
+	bn_check_top(tmp);
+	bn_check_top(tmp2);
+
+	if (a == b)
+		{
+		if (!BN_sqr(tmp,a,ctx)) goto err;
+		}
+	else
+		{
+		if (!BN_mul(tmp,a,b,ctx)) goto err;
+		}
+	/* reduce from aRR to aR */
+	if (!BN_from_montgomery(r,tmp,mont,ctx)) goto err;
+	ret=1;
+err:
+	BN_CTX_end(ctx);
+	return(ret);
+	}
+
+int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont,
+	     BN_CTX *ctx)
+	{
+	int retn=0;
+
+#ifdef MONT_WORD
+	BIGNUM *n,*r;
+	BN_ULONG *ap,*np,*rp,n0,v,*nrp;
+	int al,nl,max,i,x,ri;
+
+	BN_CTX_start(ctx);
+	if ((r = BN_CTX_get(ctx)) == NULL) goto err;
+
+	if (!BN_copy(r,a)) goto err;
+	n= &(mont->N);
+
+	ap=a->d;
+	/* mont->ri is the size of mont->N in bits (rounded up
+	   to the word size) */
+	al=ri=mont->ri/BN_BITS2;
+
+	nl=n->top;
+	if ((al == 0) || (nl == 0)) { r->top=0; return(1); }
+
+	max=(nl+al+1); /* allow for overflow (no?) XXX */
+	if (bn_wexpand(r,max) == NULL) goto err;
+	if (bn_wexpand(ret,max) == NULL) goto err;
+
+	r->neg=a->neg^n->neg;
+	np=n->d;
+	rp=r->d;
+	nrp= &(r->d[nl]);
+
+	/* clear the top words of T */
+#if 1
+	for (i=r->top; i<max; i++) /* memset? XXX */
+		r->d[i]=0;
+#else
+	memset(&(r->d[r->top]),0,(max-r->top)*sizeof(BN_ULONG));
+#endif
+
+	r->top=max;
+	n0=mont->n0;
+
+#ifdef BN_COUNT
+	printf("word BN_from_montgomery %d * %d\n",nl,nl);
+#endif
+	for (i=0; i<nl; i++)
+		{
+#ifdef __TANDEM
+		{
+		   long long t1;
+		   long long t2;
+		   long long t3;
+		   t1 = rp[0] * (n0 & 0177777);
+		   t2 = 037777600000l;
+		   t2 = n0 & t2;
+		   t3 = rp[0] & 0177777;
+		   t2 = (t3 * t2) & BN_MASK2;
+		   t1 = t1 + t2;
+		   v=bn_mul_add_words(rp,np,nl,(BN_ULONG) t1);
+		}
+#else
+		v=bn_mul_add_words(rp,np,nl,(rp[0]*n0)&BN_MASK2);
+#endif
+		nrp++;
+		rp++;
+		if (((nrp[-1]+=v)&BN_MASK2) >= v)
+			continue;
+		else
+			{
+			if (((++nrp[0])&BN_MASK2) != 0) continue;
+			if (((++nrp[1])&BN_MASK2) != 0) continue;
+			for (x=2; (((++nrp[x])&BN_MASK2) == 0); x++) ;
+			}
+		}
+	bn_fix_top(r);
+
+	/* mont->ri will be a multiple of the word size */
+#if 0
+	BN_rshift(ret,r,mont->ri);
+#else
+	ret->neg = r->neg;
+	x=ri;
+	rp=ret->d;
+	ap= &(r->d[x]);
+	if (r->top < x)
+		al=0;
+	else
+		al=r->top-x;
+	ret->top=al;
+	al-=4;
+	for (i=0; i<al; i+=4)
+		{
+		BN_ULONG t1,t2,t3,t4;
+
+		t1=ap[i+0];
+		t2=ap[i+1];
+		t3=ap[i+2];
+		t4=ap[i+3];
+		rp[i+0]=t1;
+		rp[i+1]=t2;
+		rp[i+2]=t3;
+		rp[i+3]=t4;
+		}
+	al+=4;
+	for (; i<al; i++)
+		rp[i]=ap[i];
+#endif
+#else /* !MONT_WORD */
+	BIGNUM *t1,*t2;
+
+	BN_CTX_start(ctx);
+	t1 = BN_CTX_get(ctx);
+	t2 = BN_CTX_get(ctx);
+	if (t1 == NULL || t2 == NULL) goto err;
+
+	if (!BN_copy(t1,a)) goto err;
+	BN_mask_bits(t1,mont->ri);
+
+	if (!BN_mul(t2,t1,&mont->Ni,ctx)) goto err;
+	BN_mask_bits(t2,mont->ri);
+
+	if (!BN_mul(t1,t2,&mont->N,ctx)) goto err;
+	if (!BN_add(t2,a,t1)) goto err;
+	BN_rshift(ret,t2,mont->ri);
+#endif /* MONT_WORD */
+
+	if (BN_ucmp(ret, &(mont->N)) >= 0)
+		{
+		BN_usub(ret,ret,&(mont->N));
+		}
+	retn=1;
+ err:
+	BN_CTX_end(ctx);
+	return(retn);
+	}
+
+void BN_MONT_CTX_init(BN_MONT_CTX *ctx)
+	{
+	ctx->ri=0;
+	BN_init(&(ctx->RR));
+	BN_init(&(ctx->N));
+	BN_init(&(ctx->Ni));
+	ctx->flags=0;
+	}
+
+BN_MONT_CTX *BN_MONT_CTX_new(void)
+	{
+	BN_MONT_CTX *ret;
+
+	if ((ret=(BN_MONT_CTX *)malloc(sizeof(BN_MONT_CTX))) == NULL)
+		return(NULL);
+
+	BN_MONT_CTX_init(ret);
+	ret->flags=BN_FLG_MALLOCED;
+	return(ret);
+	}
+
+void BN_MONT_CTX_free(BN_MONT_CTX *mont)
+	{
+	if(mont == NULL)
+	    return;
+
+	BN_free(&(mont->RR));
+	BN_free(&(mont->N));
+	BN_free(&(mont->Ni));
+	if (mont->flags & BN_FLG_MALLOCED)
+		free(mont);
+	}
+
+int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
+	{
+	BIGNUM Ri,*R;
+
+	BN_init(&Ri);
+	R= &(mont->RR);                                 /* grab RR as a temp */
+	BN_copy(&(mont->N),mod);                        /* Set N */
+
+#ifdef MONT_WORD
+		{
+		BIGNUM tmod;
+		BN_ULONG buf[2];
+
+		mont->ri=(BN_num_bits(mod)+(BN_BITS2-1))/BN_BITS2*BN_BITS2;
+		BN_zero(R);
+		BN_set_bit(R,BN_BITS2);                 /* R */
+
+		buf[0]=mod->d[0]; /* tmod = N mod word size */
+		buf[1]=0;
+		tmod.d=buf;
+		tmod.top=1;
+		tmod.dmax=2;
+		tmod.neg=mod->neg;
+							/* Ri = R^-1 mod N*/
+		if ((BN_mod_inverse(&Ri,R,&tmod,ctx)) == NULL)
+			goto err;
+		BN_lshift(&Ri,&Ri,BN_BITS2);            /* R*Ri */
+		if (!BN_is_zero(&Ri))
+			BN_sub_word(&Ri,1);
+		else /* if N mod word size == 1 */
+			BN_set_word(&Ri,BN_MASK2);  /* Ri-- (mod word size) */
+		BN_div(&Ri,NULL,&Ri,&tmod,ctx); /* Ni = (R*Ri-1)/N,
+						 * keep only least significant word: */
+		mont->n0=Ri.d[0];
+		BN_free(&Ri);
+		}
+#else /* !MONT_WORD */
+		{ /* bignum version */
+		mont->ri=BN_num_bits(mod);
+		BN_zero(R);
+		BN_set_bit(R,mont->ri);                 /* R = 2^ri */
+							/* Ri = R^-1 mod N*/
+		if ((BN_mod_inverse(&Ri,R,mod,ctx)) == NULL)
+			goto err;
+		BN_lshift(&Ri,&Ri,mont->ri);            /* R*Ri */
+		BN_sub_word(&Ri,1);
+							/* Ni = (R*Ri-1) / N */
+		BN_div(&(mont->Ni),NULL,&Ri,mod,ctx);
+		BN_free(&Ri);
+		}
+#endif
+
+	/* setup RR for conversions */
+	BN_zero(&(mont->RR));
+	BN_set_bit(&(mont->RR),mont->ri*2);
+	BN_mod(&(mont->RR),&(mont->RR),&(mont->N),ctx);
+
+	return(1);
+err:
+	return(0);
+	}
+
+BIGNUM *BN_value_one(void)
+	{
+	static BN_ULONG data_one=1L;
+	static BIGNUM const_one={&data_one,1,1,0};
+
+	return(&const_one);
+	}
+
+/* solves ax == 1 (mod n) */
+BIGNUM *BN_mod_inverse(BIGNUM *in, BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
+	{
+	BIGNUM *A,*B,*X,*Y,*M,*D,*R=NULL;
+	BIGNUM *T,*ret=NULL;
+	int sign;
+
+	bn_check_top(a);
+	bn_check_top(n);
+
+	BN_CTX_start(ctx);
+	A = BN_CTX_get(ctx);
+	B = BN_CTX_get(ctx);
+	X = BN_CTX_get(ctx);
+	D = BN_CTX_get(ctx);
+	M = BN_CTX_get(ctx);
+	Y = BN_CTX_get(ctx);
+	if (Y == NULL) goto err;
+
+	if (in == NULL)
+		R=BN_new();
+	else
+		R=in;
+	if (R == NULL) goto err;
+
+	BN_zero(X);
+	BN_one(Y);
+	if (BN_copy(A,a) == NULL) goto err;
+	if (BN_copy(B,n) == NULL) goto err;
+	sign=1;
+
+	while (!BN_is_zero(B))
+		{
+		if (!BN_div(D,M,A,B,ctx)) goto err;
+		T=A;
+		A=B;
+		B=M;
+		/* T has a struct, M does not */
+
+		if (!BN_mul(T,D,X,ctx)) goto err;
+		if (!BN_add(T,T,Y)) goto err;
+		M=Y;
+		Y=X;
+		X=T;
+		sign= -sign;
+		}
+	if (sign < 0)
+		{
+		if (!BN_sub(Y,n,Y)) goto err;
+		}
+
+	if (BN_is_one(A))
+		{ if (!BN_mod(R,Y,n,ctx)) goto err; }
+	else
+		{
+		goto err;
+		}
+	ret=R;
+err:
+	if ((ret == NULL) && (in == NULL)) BN_free(R);
+	BN_CTX_end(ctx);
+	return(ret);
+	}
+
+int BN_set_bit(BIGNUM *a, int n)
+	{
+	int i,j,k;
+
+	i=n/BN_BITS2;
+	j=n%BN_BITS2;
+	if (a->top <= i)
+		{
+		if (bn_wexpand(a,i+1) == NULL) return(0);
+		for(k=a->top; k<i+1; k++)
+			a->d[k]=0;
+		a->top=i+1;
+		}
+
+	a->d[i]|=(((BN_ULONG)1)<<j);
+	return(1);
+	}
+
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_conv.c b/trunk/package/network/services/ead/src/tinysrp/t_conv.c
new file mode 100644
index 00000000..3be6d85b
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_conv.c
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+/*#define _POSIX_SOURCE*/
+#include <stdio.h>
+#include "t_defines.h"
+
+static int
+hexDigitToInt(c)
+     char c;
+{
+  if(c >= '0' && c <= '9')
+    return c - '0';
+  else if(c >= 'a' && c <= 'f')
+    return c - 'a' + 10;
+  else if(c >= 'A' && c <= 'F')
+    return c - 'A' + 10;
+  else
+    return 0;
+}
+
+/*
+ * Convert a hex string to a string of bytes; return size of dst
+ */
+_TYPE( int )
+t_fromhex(dst, src)
+     register char *dst, *src;
+{
+  register char *chp = dst;
+  register unsigned size = strlen(src);
+
+  /* FIXME: handle whitespace and non-hex digits by setting size and src
+     appropriately. */
+
+  if(size % 2 == 1) {
+    *chp++ = hexDigitToInt(*src++);
+    --size;
+  }
+  while(size > 0) {
+    *chp++ = (hexDigitToInt(*src) << 4) | hexDigitToInt(*(src + 1));
+    src += 2;
+    size -= 2;
+  }
+  return chp - dst;
+}
+
+/*
+ * Convert a string of bytes to their hex representation
+ */
+_TYPE( char * )
+t_tohex(dst, src, size)
+     register char *dst, *src;
+     register unsigned size;
+{
+   int notleading = 0;
+
+   register char *chp = dst;
+   if (size != 0) do {
+      if(notleading || *src != '\0') {
+	notleading = 1;
+	sprintf(chp, "%.2x", * (unsigned char *) src);
+	chp += 2;
+      }
+      ++src;
+   } while (--size != 0);
+   return dst;
+}
+
+static char b64table[] =
+  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./";
+
+/*
+ * Convert a base64 string into raw byte array representation.
+ */
+_TYPE( int )
+t_fromb64(dst, src)
+     register char *dst, *src;
+{
+  unsigned char *a;
+  char *loc;
+  int i, j;
+  unsigned int size;
+
+  while(*src && (*src == ' ' || *src == '\t' || *src == '\n'))
+      ++src;
+  size = strlen(src);
+
+  a = malloc((size + 1) * sizeof(unsigned char));
+  if(a == (unsigned char *) 0)
+    return -1;
+
+  i = 0;
+  while(i < size) {
+    loc = strchr(b64table, src[i]);
+    if(loc == (char *) 0)
+      break;
+    else
+      a[i] = loc - b64table;
+    ++i;
+  }
+  size = i;
+
+  i = size - 1;
+  j = size;
+  while(1) {
+    a[j] = a[i];
+    if(--i < 0)
+      break;
+    a[j] |= (a[i] & 3) << 6;
+    --j;
+    a[j] = (unsigned char) ((a[i] & 0x3c) >> 2);
+    if(--i < 0)
+      break;
+    a[j] |= (a[i] & 0xf) << 4;
+    --j;
+    a[j] = (unsigned char) ((a[i] & 0x30) >> 4);
+    if(--i < 0)
+      break;
+    a[j] |= (a[i] << 2);
+
+    a[--j] = 0;
+    if(--i < 0)
+      break;
+  }
+
+  while(j <= size && a[j] == 0)
+    ++j;
+
+  memcpy(dst, a + j, size - j + 1);
+  free(a);
+  return size - j + 1;
+}
+
+/*
+ * Convert a raw byte string into a null-terminated base64 ASCII string.
+ */
+_TYPE( char * )
+t_tob64(dst, src, size)
+     register char *dst, *src;
+     register unsigned size;
+{
+  int c, pos = size % 3;
+  unsigned char b0 = 0, b1 = 0, b2 = 0, notleading = 0;
+  char *olddst = dst;
+
+  switch(pos) {
+  case 1:
+    b2 = src[0];
+    break;
+  case 2:
+    b1 = src[0];
+    b2 = src[1];
+    break;
+  }
+
+  while(1) {
+    c = (b0 & 0xfc) >> 2;
+    if(notleading || c != 0) {
+      *dst++ = b64table[c];
+      notleading = 1;
+    }
+    c = ((b0 & 3) << 4) | ((b1 & 0xf0) >> 4);
+    if(notleading || c != 0) {
+      *dst++ = b64table[c];
+      notleading = 1;
+    }
+    c = ((b1 & 0xf) << 2) | ((b2 & 0xc0) >> 6);
+    if(notleading || c != 0) {
+      *dst++ = b64table[c];
+      notleading = 1;
+    }
+    c = b2 & 0x3f;
+    if(notleading || c != 0) {
+      *dst++ = b64table[c];
+      notleading = 1;
+    }
+    if(pos >= size)
+      break;
+    else {
+      b0 = src[pos++];
+      b1 = src[pos++];
+      b2 = src[pos++];
+    }
+  }
+
+  *dst++ = '\0';
+  return olddst;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_defines.h b/trunk/package/network/services/ead/src/tinysrp/t_defines.h
new file mode 100644
index 00000000..4128093f
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_defines.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#ifndef T_DEFINES_H
+#define T_DEFINES_H
+
+#ifndef P
+#if defined(__STDC__) || defined(__cplusplus)
+#define P(x) x
+#else
+#define P(x) ()
+#endif
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifndef _DLLDECL
+#define _DLLDECL
+
+#ifdef MSVC15   /* MSVC1.5 support for 16 bit apps */
+#define _MSVC15EXPORT _export
+#define _MSVC20EXPORT
+#define _DLLAPI _export _pascal
+#define _TYPE(a) a _MSVC15EXPORT
+#define DLLEXPORT 1
+
+#elif MSVC20
+#define _MSVC15EXPORT
+#define _MSVC20EXPORT _declspec(dllexport)
+#define _DLLAPI
+#define _TYPE(a) _MSVC20EXPORT a
+#define DLLEXPORT 1
+
+#else                   /* Default, non-dll.  Use this for Unix or DOS */
+#define _MSVC15DEXPORT
+#define _MSVC20EXPORT
+#define _DLLAPI
+#define _TYPE(a) a
+#endif
+#endif
+
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <string.h>
+#else /* not STDC_HEADERS */
+#ifndef HAVE_STRCHR
+#define strchr index
+#define strrchr rindex
+#endif
+char *strchr(), *strrchr(), *strtok();
+#ifndef HAVE_MEMCPY
+#define memcpy(d, s, n) bcopy((s), (d), (n))
+#endif
+#endif /* not STDC_HEADERS */
+
+#include <sys/types.h>
+
+#if TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else  /* not TIME_WITH_SYS_TIME */
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif /* not TIME_WITH_SYS_TIME */
+
+#if HAVE_TERMIOS_H
+#include <termios.h>
+#define STTY(fd, termio) tcsetattr(fd, TCSANOW, termio)
+#define GTTY(fd, termio) tcgetattr(fd, termio)
+#define TERMIO struct termios
+#define USE_TERMIOS
+#elif HAVE_TERMIO_H
+#include <sys/ioctl.h>
+#include <termio.h>
+#define STTY(fd, termio) ioctl(fd, TCSETA, termio)
+#define GTTY(fd, termio) ioctl(fd, TCGETA, termio)
+#define TEMRIO struct termio
+#define USE_TERMIO
+#elif HAVE_SGTTY_H
+#include <sgtty.h>
+#define STTY(fd, termio) stty(fd, termio)
+#define GTTY(fd, termio) gtty(fd, termio)
+#define TERMIO struct sgttyb
+#define USE_SGTTY
+#endif
+
+#ifdef USE_FTIME
+#include <sys/timeb.h>
+#endif
+
+#ifndef MATH_PRIV
+typedef void * BigInteger;
+#endif
+
+_TYPE( BigInteger ) BigIntegerFromInt P((unsigned int number));
+_TYPE( BigInteger ) BigIntegerFromBytes P((unsigned char * bytes, int length));
+_TYPE( int ) BigIntegerToBytes P((BigInteger src, unsigned char * dest));
+_TYPE( int ) BigIntegerBitLen P((BigInteger b));
+_TYPE( int ) BigIntegerCmp P((BigInteger c1, BigInteger c2));
+_TYPE( int ) BigIntegerCmpInt P((BigInteger c1, unsigned int c2));
+_TYPE( void ) BigIntegerLShift P((BigInteger result, BigInteger x,
+				unsigned int bits));
+_TYPE( void ) BigIntegerAdd P((BigInteger result, BigInteger a1, BigInteger a2));
+_TYPE( void ) BigIntegerAddInt P((BigInteger result,
+				BigInteger a1, unsigned int a2));
+_TYPE( void ) BigIntegerSub P((BigInteger result, BigInteger s1, BigInteger s2));
+_TYPE( void ) BigIntegerSubInt P((BigInteger result,
+				BigInteger s1, unsigned int s2));
+/* For BigIntegerMul{,Int}: result != m1, m2 */
+_TYPE( void ) BigIntegerMul P((BigInteger result, BigInteger m1, BigInteger m2));
+_TYPE( void ) BigIntegerMulInt P((BigInteger result,
+				BigInteger m1, unsigned int m2));
+_TYPE( void ) BigIntegerDivInt P((BigInteger result,
+				BigInteger d, unsigned int m));
+_TYPE( void ) BigIntegerMod P((BigInteger result, BigInteger d, BigInteger m));
+_TYPE( unsigned int ) BigIntegerModInt P((BigInteger d, unsigned int m));
+_TYPE( void ) BigIntegerModMul P((BigInteger result,
+				BigInteger m1, BigInteger m2, BigInteger m));
+_TYPE( void ) BigIntegerModExp P((BigInteger result, BigInteger base,
+				BigInteger expt, BigInteger modulus));
+_TYPE( void ) BigIntegerModExpInt P((BigInteger result, BigInteger base,
+				   unsigned int expt, BigInteger modulus));
+_TYPE( int ) BigIntegerCheckPrime P((BigInteger n));
+_TYPE( void ) BigIntegerFree P((BigInteger b));
+
+#endif
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_getconf.c b/trunk/package/network/services/ead/src/tinysrp/t_getconf.c
new file mode 100644
index 00000000..db6de617
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_getconf.c
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+
+#include "t_defines.h"
+#include "t_pwd.h"
+#include "t_read.h"
+
+/* Master builtin parameter storage object.  The default that tphrase
+uses is the last one. */
+
+static struct pre_struct {
+  struct t_preconf preconf;
+  int state;    /* 0 == uninitialized/first time */
+  unsigned char modbuf[MAXPARAMLEN];
+  unsigned char genbuf[MAXPARAMLEN];
+} pre_params[] = {
+  { { "2iQzj1CagQc/5ctbuJYLWlhtAsPHc7xWVyCPAKFRLWKADpASkqe9djWPFWTNTdeJtL8nAhImCn3Sr/IAdQ1FrGw0WvQUstPx3FO9KNcXOwisOQ1VlL.gheAHYfbYyBaxXL.NcJx9TUwgWDT0hRzFzqSrdGGTN3FgSTA1v4QnHtEygNj3eZ.u0MThqWUaDiP87nqha7XnT66bkTCkQ8.7T8L4KZjIImrNrUftedTTBi.WCi.zlrBxDuOM0da0JbUkQlXqvp0yvJAPpC11nxmmZOAbQOywZGmu9nhZNuwTlxjfIro0FOdthaDTuZRL9VL7MRPUDo/DQEyW.d4H.UIlzp",
+      "2",
+      NULL }, 0 },
+  { { "dUyyhxav9tgnyIg65wHxkzkb7VIPh4o0lkwfOKiPp4rVJrzLRYVBtb76gKlaO7ef5LYGEw3G.4E0jbMxcYBetDy2YdpiP/3GWJInoBbvYHIRO9uBuxgsFKTKWu7RnR7yTau/IrFTdQ4LY/q.AvoCzMxV0PKvD9Odso/LFIItn8PbTov3VMn/ZEH2SqhtpBUkWtmcIkEflhX/YY/fkBKfBbe27/zUaKUUZEUYZ2H2nlCL60.JIPeZJSzsu/xHDVcx",
+      "2",
+      NULL }, 0 },
+  { { "3NUKQ2Re4P5BEK0TLg2dX3gETNNNECPoe92h4OVMaDn3Xo/0QdjgG/EvM.hiVV1BdIGklSI14HA38Mpe5k04juR5/EXMU0r1WtsLhNXwKBlf2zEfoOh0zVmDvqInpU695f29Iy7sNW3U5RIogcs740oUp2Kdv5wuITwnIx84cnO.e467/IV1lPnvMCr0pd1dgS0a.RV5eBJr03Q65Xy61R",
+      "2",
+      NULL }, 0 },
+  { { "F//////////oG/QeY5emZJ4ncABWDmSqIa2JWYAPynq0Wk.fZiJco9HIWXvZZG4tU.L6RFDEaCRC2iARV9V53TFuJLjRL72HUI5jNPYNdx6z4n2wQOtxMiB/rosz0QtxUuuQ/jQYP.bhfya4NnB7.P9A6PHxEPJWV//////////",
+      "5",
+      "oakley prime 2" }, 0 },
+  { { "Ewl2hcjiutMd3Fu2lgFnUXWSc67TVyy2vwYCKoS9MLsrdJVT9RgWTCuEqWJrfB6uE3LsE9GkOlaZabS7M29sj5TnzUqOLJMjiwEzArfiLr9WbMRANlF68N5AVLcPWvNx6Zjl3m5Scp0BzJBz9TkgfhzKJZ.WtP3Mv/67I/0wmRZ",
+      "2",
+      NULL }, 0 },
+};
+
+_TYPE( int )
+t_getprecount()
+{
+  return (sizeof(pre_params) / sizeof(struct pre_struct));
+}
+
+static struct t_confent sysconf;
+
+/* id is index origin 1 */
+
+_TYPE( struct t_confent * )
+gettcid
+(id)
+     int id;
+{
+	struct t_preconf *tcp;
+
+	if (id <= 0 || id > t_getprecount()) {
+		return NULL;
+	}
+	tcp = t_getpreparam(id - 1);
+	sysconf.index = id;
+	sysconf.modulus = tcp->modulus;
+	sysconf.generator = tcp->generator;
+
+	return &sysconf;
+}
+
+_TYPE( struct t_preconf * )
+t_getpreparam(idx)
+     int idx;
+{
+  if(pre_params[idx].state == 0) {
+    /* Wire up storage */
+    pre_params[idx].preconf.modulus.data = pre_params[idx].modbuf;
+    pre_params[idx].preconf.generator.data = pre_params[idx].genbuf;
+
+    /* Convert from b64 to t_num */
+    pre_params[idx].preconf.modulus.len = t_fromb64(pre_params[idx].preconf.modulus.data, pre_params[idx].preconf.mod_b64);
+    pre_params[idx].preconf.generator.len = t_fromb64(pre_params[idx].preconf.generator.data, pre_params[idx].preconf.gen_b64);
+
+    pre_params[idx].state = 1;
+  }
+  return &(pre_params[idx].preconf);
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_getpass.c b/trunk/package/network/services/ead/src/tinysrp/t_getpass.c
new file mode 100644
index 00000000..6ae7fca4
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_getpass.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright 1990 - 1995, Julianne Frances Haugh
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Julianne F. Haugh nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "t_defines.h"
+#ifdef _WIN32
+#include <windows.h>
+#include <io.h>
+#endif /* _WIN32 */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#include <signal.h>
+#include <stdio.h>
+
+static  int     sig_caught;
+#ifdef HAVE_SIGACTION
+static  struct  sigaction sigact;
+#endif
+
+/*ARGSUSED*/
+static RETSIGTYPE
+sig_catch (sig)
+int     sig;
+{
+	sig_caught = 1;
+}
+
+_TYPE( int )
+t_getpass (buf, maxlen, prompt)
+	char *buf;
+	unsigned maxlen;
+	const char *prompt;
+{
+	char    *cp;
+#ifdef _WIN32
+    HANDLE handle = (HANDLE) _get_osfhandle(_fileno(stdin));
+    DWORD  mode;
+
+    GetConsoleMode( handle, &mode );
+    SetConsoleMode( handle, mode & ~ENABLE_ECHO_INPUT );
+
+    if(fputs(prompt, stdout) == EOF ||
+	fgets(buf, maxlen, stdin) == NULL) {
+	SetConsoleMode(handle,mode);
+	return -1;
+    }
+    cp = buf + strlen(buf) - 1;
+    if ( *cp == 0x0a )
+	*cp = '\0';
+    printf("\n");
+    SetConsoleMode(handle,mode);
+#else
+	FILE    *fp;
+	int     tty_opened = 0;
+
+#ifdef HAVE_SIGACTION
+	struct  sigaction old_sigact;
+#else
+	RETSIGTYPE      (*old_signal)();
+#endif
+	TERMIO  new_modes;
+	TERMIO  old_modes;
+
+	/*
+	 * set a flag so the SIGINT signal can be re-sent if it
+	 * is caught
+	 */
+
+	sig_caught = 0;
+
+	/*
+	 * if /dev/tty can't be opened, getpass() needs to read
+	 * from stdin instead.
+	 */
+
+	if ((fp = fopen ("/dev/tty", "r")) == 0) {
+		fp = stdin;
+		setbuf (fp, (char *) 0);
+	} else {
+		tty_opened = 1;
+	}
+
+	/*
+	 * the current tty modes must be saved so they can be
+	 * restored later on.  echo will be turned off, except
+	 * for the newline character (BSD has to punt on this)
+	 */
+
+	if (GTTY (fileno (fp), &new_modes))
+		return -1;
+
+	old_modes = new_modes;
+
+#ifdef HAVE_SIGACTION
+	sigact.sa_handler = sig_catch;
+	(void) sigaction (SIGINT, &sigact, &old_sigact);
+#else
+	old_signal = signal (SIGINT, sig_catch);
+#endif
+
+#ifdef USE_SGTTY
+	new_modes.sg_flags &= ~ECHO;
+#else
+	new_modes.c_iflag &= ~IGNCR;
+	new_modes.c_iflag |= ICRNL;
+	new_modes.c_oflag |= OPOST|ONLCR;
+	new_modes.c_lflag &= ~(ECHO|ECHOE|ECHOK);
+	new_modes.c_lflag |= ICANON|ECHONL;
+#endif
+
+	if (STTY (fileno (fp), &new_modes))
+		goto out;
+
+	/*
+	 * the prompt is output, and the response read without
+	 * echoing.  the trailing newline must be removed.  if
+	 * the fgets() returns an error, a NULL pointer is
+	 * returned.
+	 */
+
+	if (fputs (prompt, stdout) == EOF)
+		goto out;
+
+	(void) fflush (stdout);
+
+	if (fgets (buf, maxlen, fp) == buf) {
+		if ((cp = strchr (buf, '\n')))
+			*cp = '\0';
+		else
+			buf[maxlen - 1] = '\0';
+
+#ifdef USE_SGTTY
+		putc ('\n', stdout);
+#endif
+	}
+	else buf[0] = '\0';
+out:
+	/*
+	 * the old SIGINT handler is restored after the tty
+	 * modes.  then /dev/tty is closed if it was opened in
+	 * the beginning.  finally, if a signal was caught it
+	 * is sent to this process for normal processing.
+	 */
+
+	if (STTY (fileno (fp), &old_modes))
+	{ memset (buf, 0, maxlen); return -1; }
+
+#ifdef HAVE_SIGACTION
+	(void) sigaction (SIGINT, &old_sigact, NULL);
+#else
+	(void) signal (SIGINT, old_signal);
+#endif
+
+	if (tty_opened)
+		(void) fclose (fp);
+
+	if (sig_caught) {
+		kill (getpid (), SIGINT);
+		memset (buf, 0, maxlen);
+		return -1;
+	}
+#endif
+
+	return 0;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_math.c b/trunk/package/network/services/ead/src/tinysrp/t_math.c
new file mode 100644
index 00000000..20161a01
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_math.c
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#include "config.h"
+
+#include "bn.h"
+typedef BIGNUM * BigInteger;
+#define MATH_PRIV
+
+#include "t_defines.h"
+#include "t_pwd.h"
+
+/* Math library interface stubs */
+
+BigInteger
+BigIntegerFromInt(n)
+     unsigned int n;
+{
+  BIGNUM * a = BN_new();
+  BN_set_word(a, n);
+  return a;
+}
+
+BigInteger
+BigIntegerFromBytes(bytes, length)
+     unsigned char * bytes;
+     int length;
+{
+  BIGNUM * a = BN_new();
+  BN_bin2bn(bytes, length, a);
+  return a;
+}
+
+int
+BigIntegerToBytes(src, dest)
+     BigInteger src;
+     unsigned char * dest;
+{
+  return BN_bn2bin(src, dest);
+}
+
+int
+BigIntegerCmp(c1, c2)
+     BigInteger c1, c2;
+{
+  return BN_cmp(c1, c2);
+}
+
+int
+BigIntegerCmpInt(c1, c2)
+     BigInteger c1;
+     unsigned int c2;
+{
+  BIGNUM * a = BN_new();
+  int rv;
+  BN_set_word(a, c2);
+  rv = BN_cmp(c1, a);
+  BN_free(a);
+  return rv;
+}
+
+void
+BigIntegerAdd(result, a1, a2)
+     BigInteger result, a1, a2;
+{
+  BN_add(result, a1, a2);
+}
+
+void
+BigIntegerAddInt(result, a1, a2)
+     BigInteger result, a1;
+     unsigned int a2;
+{
+  BIGNUM * a = BN_new();
+  BN_set_word(a, a2);
+  BN_add(result, a1, a);
+  BN_free(a);
+}
+
+void
+BigIntegerSub(result, s1, s2)
+     BigInteger result, s1, s2;
+{
+  BN_sub(result, s1, s2);
+}
+
+void
+BigIntegerMulInt(result, m1, m2)
+     BigInteger result, m1;
+     unsigned int m2;
+{
+  BN_CTX * ctx = BN_CTX_new();
+  BIGNUM * m = BN_new();
+  BN_set_word(m, m2);
+  BN_mul(result, m1, m, ctx);
+  BN_CTX_free(ctx);
+}
+
+void
+BigIntegerModMul(r, m1, m2, modulus)
+     BigInteger r, m1, m2, modulus;
+{
+  BN_CTX * ctx = BN_CTX_new();
+  BN_mod_mul(r, m1, m2, modulus, ctx);
+  BN_CTX_free(ctx);
+}
+
+void
+BigIntegerModExp(r, b, e, m)
+     BigInteger r, b, e, m;
+{
+  BN_CTX * ctx = BN_CTX_new();
+  BN_mod_exp(r, b, e, m, ctx);
+  BN_CTX_free(ctx);
+}
+
+void
+BigIntegerModExpInt(r, b, e, m)
+     BigInteger r, b;
+     unsigned int e;
+     BigInteger m;
+{
+  BN_CTX * ctx = BN_CTX_new();
+  BIGNUM * p = BN_new();
+  BN_set_word(p, e);
+  BN_mod_exp(r, b, p, m, ctx);
+  BN_free(p);
+  BN_CTX_free(ctx);
+}
+
+void
+BigIntegerFree(b)
+     BigInteger b;
+{
+  BN_free(b);
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_misc.c b/trunk/package/network/services/ead/src/tinysrp/t_misc.c
new file mode 100644
index 00000000..a23986f9
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_misc.c
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include "t_defines.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "t_sha.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+static unsigned char randpool[SHA_DIGESTSIZE], randout[SHA_DIGESTSIZE];
+static unsigned long randcnt = 0;
+static unsigned int outpos = 0;
+SHA1_CTX randctxt;
+
+/*
+ * t_envhash - Generate a 160-bit SHA hash of the environment
+ *
+ * This routine performs an SHA hash of all the "name=value" pairs
+ * in the environment concatenated together and dumps them in the
+ * output.  While it is true that anyone on the system can see
+ * your environment, someone not on the system will have a very
+ * difficult time guessing it, especially since some systems play
+ * tricks with variable ordering and sometimes define quirky
+ * environment variables like $WINDOWID or $_.
+ */
+extern char ** environ;
+
+static void
+t_envhash(out)
+     unsigned char * out;
+{
+  char ** ptr;
+  char ebuf[256];
+  SHA1_CTX ctxt;
+
+  SHA1Init(&ctxt);
+  for(ptr = environ; *ptr; ++ptr) {
+    strncpy(ebuf, *ptr, 255);
+    ebuf[255] = '\0';
+    SHA1Update(&ctxt, ebuf, strlen(ebuf));
+  }
+  SHA1Final(out, &ctxt);
+}
+
+/*
+ * t_fshash - Generate a 160-bit SHA hash from the file system
+ *
+ * This routine climbs up the directory tree from the current
+ * directory, running stat() on each directory until it hits the
+ * root directory.  This information is sensitive to the last
+ * access/modification times of all the directories above you,
+ * so someone who lists one of those directories injects some
+ * entropy into the system.  Obviously, this hash is very sensitive
+ * to your current directory when the program is run.
+ *
+ * For good measure, it also performs an fstat on the standard input,
+ * usually your tty, throws that into the buffer, creates a file in
+ * /tmp (the inode is unpredictable on a busy system), and runs stat()
+ * on that before deleting it.
+ *
+ * The entire buffer is run once through SHA to obtain the final result.
+ */
+static void
+t_fshash(out)
+     unsigned char * out;
+{
+  char dotpath[128];
+  struct stat st;
+  SHA1_CTX ctxt;
+  int i, pinode;
+  dev_t pdev;
+
+  SHA1Init(&ctxt);
+  if(stat(".", &st) >= 0) {
+    SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+    pinode = st.st_ino;
+    pdev = st.st_dev;
+    strcpy(dotpath, "..");
+    for(i = 0; i < 40; ++i) {
+      if(stat(dotpath, &st) < 0)
+	break;
+      if(st.st_ino == pinode && st.st_dev == pdev)
+	break;
+      SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+      pinode = st.st_ino;
+      pdev = st.st_dev;
+      strcat(dotpath, "/..");
+    }
+  }
+
+  if(fstat(0, &st) >= 0)
+    SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+
+  sprintf(dotpath, "/tmp/rnd.%d", getpid());
+  if(creat(dotpath, 0600) >= 0 && stat(dotpath, &st) >= 0)
+    SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+  unlink(dotpath);
+
+  SHA1Final(out, &ctxt);
+}
+
+/*
+ * Generate a high-entropy seed for the strong random number generator.
+ * This uses a wide variety of quickly gathered and somewhat unpredictable
+ * system information.  The 'preseed' structure is assembled from:
+ *
+ *   The system time in seconds
+ *   The system time in microseconds
+ *   The current process ID
+ *   The parent process ID
+ *   A hash of the user's environment
+ *   A hash gathered from the file system
+ *   Input from a random device, if available
+ *   Timings of system interrupts
+ *
+ * The entire structure (60 bytes on most systems) is fed to SHA to produce
+ * a 160-bit seed for the strong random number generator.  It is believed
+ * that in the worst case (on a quiet system with no random device versus
+ * an attacker who has access to the system already), the seed contains at
+ * least about 80 bits of entropy.  Versus an attacker who does not have
+ * access to the system, the entropy should be slightly over 128 bits.
+ */
+static char initialized = 0;
+
+static struct {
+  unsigned int trand1;
+  time_t sec;
+  time_t usec;
+  short pid;
+  short ppid;
+  unsigned char envh[SHA_DIGESTSIZE];
+  unsigned char fsh[SHA_DIGESTSIZE];
+  unsigned char devrand[20];
+  unsigned int trand2;
+} preseed;
+
+unsigned long raw_truerand();
+
+void
+t_initrand()
+{
+  SHA1_CTX ctxt;
+#ifdef USE_FTIME
+  struct timeb t;
+#else
+  struct timeval t;
+#endif
+  int i, r=0;
+
+  if(initialized)
+    return;
+
+  initialized = 1;
+
+  i = open("/dev/urandom", O_RDONLY);
+  if(i > 0) {
+    r += read(i, preseed.devrand, sizeof(preseed.devrand));
+    close(i);
+  }
+
+  /* Resort to truerand only if desperate for some Real entropy */
+  if(r == 0)
+    preseed.trand1 = raw_truerand();
+
+#ifdef USE_FTIME
+  ftime(&t);
+#else
+  gettimeofday(&t, NULL);
+#endif
+
+#ifdef USE_FTIME
+  preseed.sec = t.time;
+  preseed.usec = t.millitm;
+#else
+  preseed.sec = t.tv_sec;
+  preseed.usec = t.tv_usec;
+#endif
+  preseed.pid = getpid();
+  preseed.ppid = getppid();
+  t_envhash(preseed.envh);
+  t_fshash(preseed.fsh);
+
+  if(r == 0)
+    preseed.trand2 = raw_truerand();
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, (unsigned char *) &preseed, sizeof(preseed));
+  SHA1Final(randpool, &ctxt);
+  outpos = 0;
+  memset((unsigned char *) &preseed, 0, sizeof(preseed));
+  memset((unsigned char *) &ctxt, 0, sizeof(ctxt));
+}
+
+#define NUM_RANDOMS 12
+
+/*
+ * The strong random number generator.  This uses a 160-bit seed
+ * and uses SHA-1 in a feedback configuration to generate successive
+ * outputs.  If S[0] is set to the initial seed, then:
+ *
+ *         S[i+1] = SHA-1(i || S[i])
+ *         A[i] = SHA-1(S[i])
+ *
+ * where the A[i] are the output blocks starting with i=0.
+ * Each cycle generates 20 bytes of new output.
+ */
+_TYPE( void )
+t_random(data, size)
+     unsigned char * data;
+     unsigned size;
+{
+  if(!initialized)
+    t_initrand();
+
+  if(size <= 0)         /* t_random(NULL, 0) forces seed initialization */
+    return;
+
+  while(size > outpos) {
+    if(outpos > 0) {
+      memcpy(data, randout + (sizeof(randout) - outpos), outpos);
+      data += outpos;
+      size -= outpos;
+    }
+
+    /* Recycle */
+    SHA1Init(&randctxt);
+    SHA1Update(&randctxt, randpool, sizeof(randpool));
+    SHA1Final(randout, &randctxt);
+    SHA1Init(&randctxt);
+    SHA1Update(&randctxt, (unsigned char *) &randcnt, sizeof(randcnt));
+    SHA1Update(&randctxt, randpool, sizeof(randpool));
+    SHA1Final(randpool, &randctxt);
+    ++randcnt;
+    outpos = sizeof(randout);
+  }
+
+  if(size > 0) {
+    memcpy(data, randout + (sizeof(randout) - outpos), size);
+    outpos -= size;
+  }
+}
+
+/*
+ * The interleaved session-key hash.  This separates the even and the odd
+ * bytes of the input (ignoring the first byte if the input length is odd),
+ * hashes them separately, and re-interleaves the two outputs to form a
+ * single 320-bit value.
+ */
+_TYPE( unsigned char * )
+t_sessionkey(key, sk, sklen)
+     unsigned char * key;
+     unsigned char * sk;
+     unsigned sklen;
+{
+  unsigned i, klen;
+  unsigned char * hbuf;
+  unsigned char hout[SHA_DIGESTSIZE];
+  SHA1_CTX ctxt;
+
+  while(sklen > 0 && *sk == 0) {        /* Skip leading 0's */
+    --sklen;
+    ++sk;
+  }
+
+  klen = sklen / 2;
+  if((hbuf = malloc(klen * sizeof(char))) == 0)
+    return 0;
+
+  for(i = 0; i < klen; ++i)
+    hbuf[i] = sk[sklen - 2 * i - 1];
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, hbuf, klen);
+  SHA1Final(hout, &ctxt);
+  for(i = 0; i < sizeof(hout); ++i)
+    key[2 * i] = hout[i];
+
+  for(i = 0; i < klen; ++i)
+    hbuf[i] = sk[sklen - 2 * i - 2];
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, hbuf, klen);
+  SHA1Final(hout, &ctxt);
+  for(i = 0; i < sizeof(hout); ++i)
+    key[2 * i + 1] = hout[i];
+
+  memset(hout, 0, sizeof(hout));
+  memset(hbuf, 0, klen);
+  free(hbuf);
+  return key;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_pw.c b/trunk/package/network/services/ead/src/tinysrp/t_pw.c
new file mode 100644
index 00000000..18e929bb
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_pw.c
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 1997-2000  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include "t_defines.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef USE_HOMEDIR
+#include <pwd.h>
+#endif
+#ifdef WIN32
+#include <io.h>
+#endif
+
+#include "t_pwd.h"
+#include "t_read.h"
+#include "t_sha.h"
+#include "t_server.h"
+
+static struct t_pw * syspw = NULL;
+static struct t_passwd tpass;
+
+_TYPE( struct t_server * )
+t_serveropen(username)
+     const char * username;
+{
+  struct t_passwd * p;
+  p = gettpnam(username);
+  if(p == NULL) {
+    return NULL;
+  } else {
+    return t_serveropenraw(&p->tp, &p->tc);
+  }
+}
+
+
+/* t_openpw(NULL) is deprecated - use settpent()/gettpnam() instead */
+
+_TYPE( struct t_pw * )
+t_openpw(fp)
+     FILE * fp;
+{
+  struct t_pw * tpw;
+  char close_flag = 0;
+
+  if(fp == NULL) { /* Deprecated */
+    if((fp = fopen(DEFAULT_PASSWD, "r")) == NULL)
+      return NULL;
+    close_flag = 1;
+  }
+  else
+    close_flag = 0;
+
+  if((tpw = malloc(sizeof(struct t_pw))) == NULL)
+    return NULL;
+  tpw->instream = fp;
+  tpw->close_on_exit = close_flag;
+  tpw->state = FILE_ONLY;
+
+  return tpw;
+}
+
+_TYPE( struct t_pw * )
+t_openpwbyname(pwname)
+     const char * pwname;
+{
+  FILE * fp;
+  struct t_pw * t;
+
+  if(pwname == NULL)            /* Deprecated */
+    return t_openpw(NULL);
+
+  if((fp = fopen(pwname, "r")) == NULL)
+    return NULL;
+
+  t = t_openpw(fp);
+  t->close_on_exit = 1;
+  return t;
+}
+
+_TYPE( void )
+t_closepw(tpw)
+     struct t_pw * tpw;
+{
+  if(tpw->close_on_exit)
+    fclose(tpw->instream);
+  free(tpw);
+}
+
+_TYPE( void )
+t_rewindpw(tpw)
+     struct t_pw * tpw;
+{
+#ifdef ENABLE_YP
+  if(tpw->state == IN_NIS)
+    tpw->state = FILE_NIS;
+#endif
+  rewind(tpw->instream);
+}
+
+#ifdef ENABLE_YP
+static void
+savepwent(tpw, pwent)
+     struct t_pw * tpw;
+     struct t_pwent *pwent;
+{
+  tpw->pebuf.name = tpw->userbuf;
+  tpw->pebuf.password.data = tpw->pwbuf;
+  tpw->pebuf.salt.data = tpw->saltbuf;
+  strcpy(tpw->pebuf.name, pwent->name);
+  tpw->pebuf.password.len = pwent->password.len;
+  memcpy(tpw->pebuf.password.data, pwent->password.data, pwent->password.len);
+  tpw->pebuf.salt.len = pwent->salt.len;
+  memcpy(tpw->pebuf.salt.data, pwent->salt.data, pwent->salt.len);
+  tpw->pebuf.index = pwent->index;
+}
+#endif /* ENABLE_YP */
+
+_TYPE( struct t_pwent * )
+t_getpwbyname(tpw, user)
+     struct t_pw * tpw;
+     const char * user;
+{
+  char indexbuf[16];
+  char passbuf[MAXB64PARAMLEN];
+  char saltstr[MAXB64SALTLEN];
+  char username[MAXUSERLEN];
+#ifdef ENABLE_YP
+  struct t_passwd * nisent;
+#endif
+
+  t_rewindpw(tpw);
+
+  while(t_nextfield(tpw->instream, username, MAXUSERLEN) > 0) {
+#ifdef ENABLE_YP
+    if(tpw->state == FILE_NIS && *username == '+') {
+      if(strlen(username) == 1 || strcmp(user, username+1) == 0) {
+	nisent = _yp_gettpnam(user);    /* Entry is +username or + */
+	if(nisent != NULL) {
+	  savepwent(tpw, &nisent->tp);
+	  return &tpw->pebuf;
+	}
+      }
+    }
+#endif
+    if(strcmp(user, username) == 0)
+      if(t_nextfield(tpw->instream, passbuf, MAXB64PARAMLEN) > 0 &&
+	 (tpw->pebuf.password.len = t_fromb64(tpw->pwbuf, passbuf)) > 0 &&
+	 t_nextfield(tpw->instream, saltstr, MAXB64SALTLEN) > 0 &&
+	 (tpw->pebuf.salt.len = t_fromb64(tpw->saltbuf, saltstr)) > 0 &&
+	 t_nextfield(tpw->instream, indexbuf, 16) > 0 &&
+	 (tpw->pebuf.index = atoi(indexbuf)) > 0) {
+	strcpy(tpw->userbuf, username);
+	tpw->pebuf.name = tpw->userbuf;
+	tpw->pebuf.password.data = tpw->pwbuf;
+	tpw->pebuf.salt.data = tpw->saltbuf;
+	t_nextline(tpw->instream);
+	return &tpw->pebuf;
+      }
+    if(t_nextline(tpw->instream) < 0)
+      return NULL;
+  }
+  return NULL;
+}
+
+/* System password file accessors */
+
+static int
+pwinit()
+{
+  if(syspw == NULL) {
+    if((syspw = t_openpwbyname(DEFAULT_PASSWD)) == NULL)
+      return -1;
+    syspw->state = FILE_NIS;
+  }
+  return 0;
+}
+
+static void
+pwsetup(out, tpwd, tcnf)
+     struct t_passwd * out;
+     struct t_pwent * tpwd;
+     struct t_confent * tcnf;
+{
+  out->tp.name = tpwd->name;
+  out->tp.password.len = tpwd->password.len;
+  out->tp.password.data = tpwd->password.data;
+  out->tp.salt.len = tpwd->salt.len;
+  out->tp.salt.data = tpwd->salt.data;
+  out->tp.index = tpwd->index;
+
+  out->tc.index = tcnf->index;
+  out->tc.modulus.len = tcnf->modulus.len;
+  out->tc.modulus.data = tcnf->modulus.data;
+  out->tc.generator.len = tcnf->generator.len;
+  out->tc.generator.data = tcnf->generator.data;
+}
+
+_TYPE( struct t_passwd * )
+gettpnam
+(user)
+     const char * user;
+{
+  struct t_pwent * tpptr;
+  struct t_confent * tcptr;
+
+  if(pwinit() < 0)
+    return NULL;
+  tpptr = t_getpwbyname(syspw, user);
+  if(tpptr == NULL)
+    return NULL;
+  tcptr =
+    gettcid
+    (tpptr->index);
+  if(tcptr == NULL)
+    return NULL;
+  pwsetup(&tpass, tpptr, tcptr);
+  return &tpass;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_pwd.h b/trunk/package/network/services/ead/src/tinysrp/t_pwd.h
new file mode 100644
index 00000000..73697bef
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_pwd.h
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#ifndef T_PWD_H
+#define T_PWD_H
+
+#ifndef P
+#if defined (__STDC__) || defined (__cplusplus)
+#define P(x) x
+#else
+#define P(x) ()
+#endif
+#endif
+
+/*      For building dynamic link libraries under windows, windows NT
+ *      using MSVC1.5 or MSVC2.0
+ */
+
+#ifndef _DLLDECL
+#define _DLLDECL
+
+#ifdef MSVC15   /* MSVC1.5 support for 16 bit apps */
+#define _MSVC15EXPORT _export
+#define _MSVC20EXPORT
+#define _DLLAPI _export _pascal
+#define _TYPE(a) a _MSVC15EXPORT
+#define DLLEXPORT 1
+
+#elif MSVC20
+#define _MSVC15EXPORT
+#define _MSVC20EXPORT _declspec(dllexport)
+#define _DLLAPI
+#define _TYPE(a) _MSVC20EXPORT a
+#define DLLEXPORT 1
+
+#else                   /* Default, non-dll.  Use this for Unix or DOS */
+#define _MSVC15DEXPORT
+#define _MSVC20EXPORT
+#define _DLLAPI
+#define _TYPE(a) a
+#endif
+#endif
+
+#define MAXPARAMBITS    2048
+#define MAXPARAMLEN     ((MAXPARAMBITS + 7) / 8)
+#define MAXB64PARAMLEN  ((MAXPARAMBITS + 5) / 6 + 1)
+#define MAXHEXPARAMLEN  ((MAXPARAMBITS + 3) / 4 + 1)
+#define MAXOCTPARAMLEN  ((MAXPARAMBITS + 2) / 3 + 1)
+
+#define MAXUSERLEN      32
+#define MAXSALTLEN      32
+#define MAXB64SALTLEN   44      /* 256 bits in b64 + null */
+#define SALTLEN         10      /* Normally 80 bits */
+
+#define RESPONSE_LEN    20      /* 160-bit proof hashes */
+#define SESSION_KEY_LEN (2 * RESPONSE_LEN)      /* 320-bit session key */
+
+#define DEFAULT_PASSWD  "tpasswd"
+
+struct t_num {  /* Standard byte-oriented integer representation */
+  int len;
+  unsigned char * data;
+};
+
+struct t_preconf {      /* Structure returned by t_getpreparam() */
+  char * mod_b64;
+  char * gen_b64;
+  char * comment;
+
+  struct t_num modulus;
+  struct t_num generator;
+};
+
+/*
+ * The built-in (known good) parameters access routines
+ *
+ * "t_getprecount" returns the number of precompiled parameter sets.
+ * "t_getpreparam" returns the indicated parameter set.
+ * Memory is statically allocated - callers need not perform any memory mgmt.
+ */
+_TYPE( int ) t_getprecount();
+_TYPE( struct t_preconf * ) t_getpreparam P((int));
+
+struct t_confent {      /* One configuration file entry (index, N, g) */
+  int index;
+  struct t_num modulus;
+  struct t_num generator;
+};
+
+struct t_conf {         /* An open configuration file */
+  FILE * instream;
+  char close_on_exit;
+  unsigned char modbuf[MAXPARAMLEN];
+  unsigned char genbuf[MAXPARAMLEN];
+  struct t_confent tcbuf;
+};
+
+/*
+ * The configuration file routines are designed along the lines of the
+ * "getpw" functions in the standard C library.
+ *
+ * "t_openconf" accepts a stdio stream and interprets it as a config file.
+ * "t_openconfbyname" accepts a filename and does the same thing.
+ * "t_closeconf" closes the config file.
+ * "t_getconfent" fetches the next sequential configuration entry.
+ * "t_getconfbyindex" fetches the configuration entry whose index
+ *   matches the one supplied, or NULL if one can't be found.
+ * "t_getconflast" fetches the last configuration entry in the file.
+ * "t_makeconfent" generates a set of configuration entry parameters
+ *   randomly.
+ * "t_newconfent" returns an empty configuration entry.
+ * "t_cmpconfent" compares two configuration entries a la strcmp.
+ * "t_checkconfent" verifies that a set of configuration parameters
+ *   are suitable.  N must be prime and should be a safe prime.
+ * "t_putconfent" writes a configuration entry to a stream.
+ */
+_TYPE( struct t_conf * ) t_openconf P((FILE *));
+_TYPE( struct t_conf * ) t_openconfbyname P((const char *));
+_TYPE( void ) t_closeconf P((struct t_conf *));
+_TYPE( void ) t_rewindconf P((struct t_conf *));
+_TYPE( struct t_confent * ) t_getconfent P((struct t_conf *));
+_TYPE( struct t_confent * ) t_getconfbyindex P((struct t_conf *, int));
+_TYPE( struct t_confent * ) t_getconflast P((struct t_conf *));
+_TYPE( struct t_confent * ) t_makeconfent P((struct t_conf *, int));
+_TYPE( struct t_confent * ) t_makeconfent_c P((struct t_conf *, int));
+_TYPE( struct t_confent * ) t_newconfent P((struct t_conf *));
+_TYPE( int ) t_cmpconfent P((const struct t_confent *, const struct t_confent *));
+_TYPE( int ) t_checkconfent P((const struct t_confent *));
+_TYPE( void ) t_putconfent P((const struct t_confent *, FILE *));
+
+/* libc-style system conf file access */
+_TYPE( struct t_confent *) gettcent();
+_TYPE( struct t_confent *) gettcid P((int));
+_TYPE( void ) settcent();
+_TYPE( void ) endtcent();
+
+#ifdef ENABLE_NSW
+extern struct t_confent * _gettcent();
+extern struct t_confent * _gettcid P((int));
+extern void _settcent();
+extern void _endtcent();
+#endif
+
+/* A hack to support '+'-style entries in the passwd file */
+
+typedef enum fstate {
+  FILE_ONLY,    /* Ordinary file, don't consult NIS ever */
+  FILE_NIS,     /* Currently accessing file, use NIS if encountered */
+  IN_NIS,       /* Currently in a '+' entry; use NIS for getXXent */
+} FILE_STATE;
+
+struct t_pwent {        /* A single password file entry */
+  char * name;
+  struct t_num password;
+  struct t_num salt;
+  int index;
+};
+
+struct t_pw {           /* An open password file */
+  FILE * instream;
+  char close_on_exit;
+  FILE_STATE state;
+  char userbuf[MAXUSERLEN];
+  unsigned char pwbuf[MAXPARAMLEN];
+  unsigned char saltbuf[SALTLEN];
+  struct t_pwent pebuf;
+};
+
+/*
+ * The password manipulation routines are patterned after the getpw*
+ * standard C library function calls.
+ *
+ * "t_openpw" reads a stream as if it were a password file.
+ * "t_openpwbyname" opens the named file as a password file.
+ * "t_closepw" closes an open password file.
+ * "t_rewindpw" starts the internal file pointer from the beginning
+ *   of the password file.
+ * "t_getpwent" retrieves the next sequential password entry.
+ * "t_getpwbyname" looks up the password entry corresponding to the
+ *   specified user.
+ * "t_makepwent" constructs a password entry from a username, password,
+ *   numeric salt, and configuration entry.
+ * "t_putpwent" writes a password entry to a stream.
+ */
+_TYPE( struct t_pw * ) t_openpw P((FILE *));
+_TYPE( struct t_pw * ) t_openpwbyname P((const char *));
+_TYPE( void ) t_closepw P((struct t_pw *));
+_TYPE( void ) t_rewindpw P((struct t_pw *));
+_TYPE( struct t_pwent * ) t_getpwent P((struct t_pw *));
+_TYPE( struct t_pwent * ) t_getpwbyname P((struct t_pw *, const char *));
+_TYPE( struct t_pwent * ) t_makepwent P((struct t_pw *, const char *,
+					 const char *, const struct t_num *,
+					 const struct t_confent *));
+_TYPE( void ) t_putpwent P((const struct t_pwent *, FILE *));
+
+struct t_passwd {
+  struct t_pwent tp;
+  struct t_confent tc;
+};
+
+/* libc-style system password file access */
+_TYPE( struct t_passwd * ) gettpent();
+_TYPE( struct t_passwd * ) gettpnam P((const char *));
+_TYPE( void ) settpent();
+_TYPE( void ) endtpent();
+
+#ifdef ENABLE_NSW
+extern struct t_passwd * _gettpent();
+extern struct t_passwd * _gettpnam P((const char *));
+extern void _settpent();
+extern void _endtpent();
+#endif
+
+/*
+ * Utility functions
+ *
+ * "t_verifypw" accepts a username and password, and checks against the
+ *   system password file to see if the password for that user is correct.
+ *   Returns > 0 if it is correct, 0 if not, and -1 if some error occurred
+ *   (i.e. the user doesn't exist on the system).  This is intended ONLY
+ *   for local authentication; for remote authentication, look at the
+ *   t_client and t_server source.  (That's the whole point of SRP!)
+ * "t_changepw" modifies the specified file, substituting the given password
+ *   entry for the one already in the file.  If no matching entry is found,
+ *   the new entry is simply appended to the file.
+ * "t_deletepw" removes the specified user from the specified file.
+ */
+_TYPE( int ) t_verifypw P((const char *, const char *));
+_TYPE( int ) t_changepw P((const char *, const struct t_pwent *));
+_TYPE( int ) t_deletepw P((const char *, const char *));
+
+/* Conversion utilities */
+
+/*
+ * All these calls accept output as the first parameter.  In the case of
+ * t_tohex and t_tob64, the last argument is the length of the byte-string
+ * input.
+ */
+_TYPE( char * t_tohex ) P((char *, char *, unsigned));
+_TYPE( int ) t_fromhex P((char *, char *));
+_TYPE( char * ) t_tob64 P((char *, char *, unsigned));
+_TYPE( int ) t_fromb64 P((char *, char *));
+
+/* Miscellaneous utilities */
+
+/*
+ * "t_random" is a cryptographic random number generator, which is seeded
+ *   from various high-entropy sources and uses a one-way hash function
+ *   in a feedback configuration.
+ * "t_sessionkey" is the interleaved hash used to generate session keys
+ *   from a large integer.
+ * "t_getpass" reads a password from the terminal without echoing.
+ */
+_TYPE( void ) t_random P((unsigned char *, unsigned));
+_TYPE( void ) t_stronginitrand();
+_TYPE( unsigned char * )
+  t_sessionkey P((unsigned char *, unsigned char *, unsigned));
+_TYPE( int ) t_getpass P((char *, unsigned, const char *));
+
+/*
+ * Return value of t_checkprime:
+ *   < 0 : not prime
+ *   = 0 : prime, but not safe
+ *   > 0 : safe
+ */
+#define NUM_NOTPRIME    -1
+#define NUM_NOTSAFE     0
+#define NUM_SAFE        1
+
+_TYPE( int ) t_checkprime P((const struct t_num *));
+
+#endif
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_read.c b/trunk/package/network/services/ead/src/tinysrp/t_read.c
new file mode 100644
index 00000000..087b7d55
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_read.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+#include "config.h"
+
+#define FSEPARATOR	':'
+
+int
+t_nextfield(fp, s, max)
+FILE * fp;
+char * s;
+unsigned max;
+{
+  int c, count = 0;
+
+  while((c = getc(fp)) != EOF) {
+    if(c == '\n') {
+      ungetc(c, fp);
+      break;
+    }
+    else if(c == FSEPARATOR)
+      break;
+    if(count < max - 1) {
+      *s++ = c;
+      ++count;
+    }
+  }
+  *s++ = '\0';
+  return count;
+}
+
+int
+t_nextline(fp)
+FILE * fp;
+{
+  int c;
+
+  while((c = getc(fp)) != '\n')
+    if(c == EOF)
+      return -1;
+  return 0;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_read.h b/trunk/package/network/services/ead/src/tinysrp/t_read.h
new file mode 100644
index 00000000..e621f793
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_read.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#ifndef _T_READ_H_
+#define _T_READ_H_
+
+#if     !defined(P)
+#ifdef  __STDC__
+#define P(x)    x
+#else
+#define P(x)    ()
+#endif
+#endif
+
+extern int t_nextfield P((FILE *, char *, unsigned));
+extern int t_nextline P((FILE *));
+#endif
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_server.c b/trunk/package/network/services/ead/src/tinysrp/t_server.c
new file mode 100644
index 00000000..6ab501bc
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_server.c
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <stdio.h>
+#include "t_defines.h"
+#include "t_pwd.h"
+#include "t_server.h"
+
+_TYPE( struct t_server * )
+t_serveropenraw(ent, tce)
+     struct t_pwent * ent;
+     struct t_confent * tce;
+{
+  struct t_server * ts;
+  unsigned char buf1[SHA_DIGESTSIZE], buf2[SHA_DIGESTSIZE];
+  SHA1_CTX ctxt;
+  int i;
+
+  if((ts = malloc(sizeof(struct t_server))) == 0)
+    return 0;
+
+  SHA1Init(&ts->ckhash);
+
+  ts->index = ent->index;
+  ts->n.len = tce->modulus.len;
+  ts->n.data = ts->nbuf;
+  memcpy(ts->n.data, tce->modulus.data, ts->n.len);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, ts->n.data, ts->n.len);
+  SHA1Final(buf1, &ctxt);
+
+  ts->g.len = tce->generator.len;
+  ts->g.data = ts->gbuf;
+  memcpy(ts->g.data, tce->generator.data, ts->g.len);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, ts->g.data, ts->g.len);
+  SHA1Final(buf2, &ctxt);
+
+  for(i = 0; i < sizeof(buf1); ++i)
+    buf1[i] ^= buf2[i];
+
+  SHA1Update(&ts->ckhash, buf1, sizeof(buf1));
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, ent->name, strlen(ent->name));
+  SHA1Final(buf1, &ctxt);
+
+  SHA1Update(&ts->ckhash, buf1, sizeof(buf1));
+
+  ts->v.len = ent->password.len;
+  ts->v.data = ts->vbuf;
+  memcpy(ts->v.data, ent->password.data, ts->v.len);
+
+  ts->s.len = ent->salt.len;
+  ts->s.data = ts->saltbuf;
+  memcpy(ts->s.data, ent->salt.data, ts->s.len);
+
+  SHA1Update(&ts->ckhash, ts->s.data, ts->s.len);
+
+  ts->b.data = ts->bbuf;
+  ts->B.data = ts->Bbuf;
+
+  SHA1Init(&ts->hash);
+  SHA1Init(&ts->oldhash);
+  SHA1Init(&ts->oldckhash);
+
+  return ts;
+}
+
+_TYPE( struct t_num * )
+t_servergenexp(ts)
+     struct t_server * ts;
+{
+  BigInteger b, B, v, n, g;
+
+  if(ts->n.len < BLEN)
+    ts->b.len = ts->n.len;
+  else
+    ts->b.len = BLEN;
+
+  t_random(ts->b.data, ts->b.len);
+  b = BigIntegerFromBytes(ts->b.data, ts->b.len);
+  n = BigIntegerFromBytes(ts->n.data, ts->n.len);
+  g = BigIntegerFromBytes(ts->g.data, ts->g.len);
+  B = BigIntegerFromInt(0);
+  BigIntegerModExp(B, g, b, n);
+
+  v = BigIntegerFromBytes(ts->v.data, ts->v.len);
+  BigIntegerAdd(B, B, v);
+  if(BigIntegerCmp(B, n) > 0)
+    BigIntegerSub(B, B, n);
+
+  ts->B.len = BigIntegerToBytes(B, ts->B.data);
+
+  BigIntegerFree(v);
+  BigIntegerFree(B);
+  BigIntegerFree(b);
+  BigIntegerFree(g);
+  BigIntegerFree(n);
+
+  SHA1Update(&ts->oldckhash, ts->B.data, ts->B.len);
+
+  return &ts->B;
+}
+
+_TYPE( unsigned char * )
+t_servergetkey(ts, clientval)
+     struct t_server * ts;
+     struct t_num * clientval;
+{
+  BigInteger n, v, A, b, prod, res, S;
+  SHA1_CTX ctxt;
+  unsigned char sbuf[MAXPARAMLEN];
+  unsigned char dig[SHA_DIGESTSIZE];
+  unsigned slen;
+  unsigned int u;
+
+  SHA1Update(&ts->ckhash, clientval->data, clientval->len);
+  SHA1Update(&ts->ckhash, ts->B.data, ts->B.len);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, ts->B.data, ts->B.len);
+  SHA1Final(dig, &ctxt);
+  u = (dig[0] << 24) | (dig[1] << 16) | (dig[2] << 8) | dig[3];
+
+  SHA1Update(&ts->oldhash, clientval->data, clientval->len);
+  SHA1Update(&ts->hash, clientval->data, clientval->len);
+
+  n = BigIntegerFromBytes(ts->n.data, ts->n.len);
+  b = BigIntegerFromBytes(ts->b.data, ts->b.len);
+  v = BigIntegerFromBytes(ts->v.data, ts->v.len);
+  A = BigIntegerFromBytes(clientval->data, clientval->len);
+
+  prod = BigIntegerFromInt(0);
+  BigIntegerModExpInt(prod, v, u, n);
+  res = BigIntegerFromInt(0);
+  BigIntegerModMul(res, prod, A, n);
+
+  BigIntegerFree(A);
+  BigIntegerFree(v);
+  BigIntegerFree(prod);
+
+  if(BigIntegerCmpInt(res, 1) <= 0) {   /* Check for Av^u == 1 (mod n) */
+    BigIntegerFree(res);
+    BigIntegerFree(b);
+    BigIntegerFree(n);
+    return NULL;
+  }
+
+  S = BigIntegerFromInt(0);
+
+  BigIntegerAddInt(S, res, 1);
+  if(BigIntegerCmp(S, n) == 0) {        /* Check for Av^u == -1 (mod n) */
+    BigIntegerFree(res);
+    BigIntegerFree(b);
+    BigIntegerFree(n);
+    BigIntegerFree(S);
+    return NULL;
+  }
+
+  BigIntegerModExp(S, res, b, n);
+  slen = BigIntegerToBytes(S, sbuf);
+
+  BigIntegerFree(S);
+  BigIntegerFree(res);
+  BigIntegerFree(b);
+  BigIntegerFree(n);
+
+  t_sessionkey(ts->session_key, sbuf, slen);
+  memset(sbuf, 0, slen);
+
+  SHA1Update(&ts->oldhash, ts->session_key, sizeof(ts->session_key));
+  SHA1Update(&ts->oldckhash, ts->session_key, sizeof(ts->session_key));
+  SHA1Update(&ts->ckhash, ts->session_key, sizeof(ts->session_key));
+
+  return ts->session_key;
+}
+
+_TYPE( int )
+t_serververify(ts, resp)
+    struct t_server * ts;
+    unsigned char * resp;
+{
+  unsigned char expected[SHA_DIGESTSIZE];
+  int i;
+
+  SHA1Final(expected, &ts->oldckhash);
+  i = memcmp(expected, resp, sizeof(expected));
+  if(i == 0) {
+    SHA1Final(ts->session_response, &ts->oldhash);
+    return 0;
+  }
+  SHA1Final(expected, &ts->ckhash);
+  i = memcmp(expected, resp, sizeof(expected));
+  if(i == 0) {
+    SHA1Update(&ts->hash, expected, sizeof(expected));
+    SHA1Update(&ts->hash, ts->session_key, sizeof(ts->session_key));
+    SHA1Final(ts->session_response, &ts->hash);
+  }
+  return i;
+}
+
+_TYPE( unsigned char * )
+t_serverresponse(ts)
+    struct t_server * ts;
+{
+  return ts->session_response;
+}
+
+_TYPE( void )
+t_serverclose(ts)
+     struct t_server * ts;
+{
+  memset(ts->bbuf, 0, sizeof(ts->bbuf));
+  memset(ts->vbuf, 0, sizeof(ts->vbuf));
+  memset(ts->saltbuf, 0, sizeof(ts->saltbuf));
+  memset(ts->session_key, 0, sizeof(ts->session_key));
+  free(ts);
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_server.h b/trunk/package/network/services/ead/src/tinysrp/t_server.h
new file mode 100644
index 00000000..20970ffe
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_server.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 1997-1999  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#ifndef T_SERVER_H
+#define T_SERVER_H
+
+#include "t_sha.h"
+
+#if     !defined(P)
+#ifdef  __STDC__
+#define P(x)    x
+#else
+#define P(x)    ()
+#endif
+#endif
+
+#ifndef _DLLDECL
+#define _DLLDECL
+
+#ifdef MSVC15   /* MSVC1.5 support for 16 bit apps */
+#define _MSVC15EXPORT _export
+#define _MSVC20EXPORT
+#define _DLLAPI _export _pascal
+#define _TYPE(a) a _MSVC15EXPORT
+#define DLLEXPORT 1
+
+#elif MSVC20
+#define _MSVC15EXPORT
+#define _MSVC20EXPORT _declspec(dllexport)
+#define _DLLAPI
+#define _TYPE(a) _MSVC20EXPORT a
+#define DLLEXPORT 1
+
+#else                   /* Default, non-dll.  Use this for Unix or DOS */
+#define _MSVC15DEXPORT
+#define _MSVC20EXPORT
+#define _DLLAPI
+#define _TYPE(a) a
+#endif
+#endif
+
+#define BLEN 32
+
+struct t_server {
+  int index;
+  struct t_num n;
+  struct t_num g;
+  struct t_num v;
+  struct t_num s;
+
+  struct t_num b;
+  struct t_num B;
+
+  SHA1_CTX oldhash, hash, oldckhash, ckhash;
+
+  unsigned char session_key[SESSION_KEY_LEN];
+  unsigned char session_response[RESPONSE_LEN];
+
+  unsigned char nbuf[MAXPARAMLEN], gbuf[MAXPARAMLEN], vbuf[MAXPARAMLEN];
+  unsigned char saltbuf[MAXSALTLEN], bbuf[BLEN], Bbuf[MAXPARAMLEN];
+};
+
+/*
+ * SRP server-side negotiation
+ *
+ * This code negotiates the server side of an SRP exchange.
+ * "t_serveropen" accepts a username (sent by the client), a pointer
+ *   to an open password file, and a pointer to an open configuration
+ *   file.  The server should then call...
+ * "t_servergenexp" will generate a random 256-bit exponent and
+ *   raise g (from the configuration file) to that power, returning
+ *   the result.  This result should be sent to the client as y(p).
+ * "t_servergetkey" accepts the exponential w(p), which should be
+ *   sent by the client, and computes the 256-bit session key.
+ *   This data should be saved before the session is closed.
+ * "t_serverresponse" computes the session key proof as SHA(w(p), K).
+ * "t_serverclose" closes the session and frees its memory.
+ *
+ * Note that authentication is not performed per se; it is up
+ * to either/both sides of the protocol to now verify securely
+ * that their session keys agree in order to establish authenticity.
+ * One possible way is through "oracle hashing"; one side sends
+ * r, the other replies with H(r,K), where H() is a hash function.
+ *
+ * t_serverresponse and t_serververify now implement a version of
+ * the session-key verification described above.
+ */
+_TYPE( struct t_server * )
+  t_serveropen P((const char *));
+_TYPE( struct t_server * )
+  t_serveropenfromfiles P((const char *, struct t_pw *, struct t_conf *));
+_TYPE( struct t_server * )
+  t_serveropenraw P((struct t_pwent *, struct t_confent *));
+_TYPE( struct t_num * ) t_servergenexp P((struct t_server *));
+_TYPE( unsigned char * ) t_servergetkey P((struct t_server *, struct t_num *));
+_TYPE( int ) t_serververify P((struct t_server *, unsigned char *));
+_TYPE( unsigned char * ) t_serverresponse P((struct t_server *));
+_TYPE( void ) t_serverclose P((struct t_server *));
+
+#endif
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_sha.c b/trunk/package/network/services/ead/src/tinysrp/t_sha.c
new file mode 100644
index 00000000..cc41d648
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_sha.c
@@ -0,0 +1,166 @@
+#include "t_defines.h"
+#include "t_sha.h"
+
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define WORDS_BIGENDIAN * This should be #define'd if true. */
+/* #define SHA1HANDSOFF * Copies data before messing with it. */
+
+#include <stdio.h>
+#include <string.h>
+
+static void SHA1Transform(uint32 state[5], const unsigned char buffer[64]);
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#ifndef WORDS_BIGENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#else
+#define blk0(i) block->l[i]
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+
+static void SHA1Transform(uint32 state[5], const unsigned char buffer[64])
+{
+uint32 a, b, c, d, e;
+typedef union {
+    unsigned char c[64];
+    uint32 l[16];
+} CHAR64LONG16;
+CHAR64LONG16* block;
+#ifdef SHA1HANDSOFF
+static unsigned char workspace[64];
+    block = (CHAR64LONG16*)workspace;
+    memcpy(block, buffer, 64);
+#else
+    block = (CHAR64LONG16*)buffer;
+#endif
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+}
+
+
+/* SHA1Init - Initialize new context */
+
+void SHA1Init(SHA1_CTX* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+
+void SHA1Update(SHA1_CTX* context, const unsigned char* data, unsigned int len)
+{
+unsigned int i, j;
+
+    j = (context->count[0] >> 3) & 63;
+    if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+    context->count[1] += (len >> 29);
+    if ((j + len) > 63) {
+	memcpy(&context->buffer[j], data, (i = 64-j));
+	SHA1Transform(context->state, context->buffer);
+	for ( ; i + 63 < len; i += 64) {
+	    SHA1Transform(context->state, &data[i]);
+	}
+	j = 0;
+    }
+    else i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/* Add padding and return the message digest. */
+
+void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
+{
+uint32 i, j;
+unsigned char finalcount[8];
+
+    for (i = 0; i < 8; i++) {
+	finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+	 >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+    SHA1Update(context, (unsigned char *)"\200", 1);
+    while ((context->count[0] & 504) != 448) {
+	SHA1Update(context, (unsigned char *)"\0", 1);
+    }
+    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
+    for (i = 0; i < 20; i++) {
+	digest[i] = (unsigned char)
+	 ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+    /* Wipe variables */
+    i = j = 0;
+    memset(context->buffer, 0, 64);
+    memset(context->state, 0, 20);
+    memset(context->count, 0, 8);
+    memset(&finalcount, 0, 8);
+#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite its own static vars */
+    SHA1Transform(context->state, context->buffer);
+#endif
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_sha.h b/trunk/package/network/services/ead/src/tinysrp/t_sha.h
new file mode 100644
index 00000000..d10115e7
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_sha.h
@@ -0,0 +1,26 @@
+#ifndef T_SHA_H
+#define T_SHA_H
+
+#if     !defined(P)
+#ifdef  __STDC__
+#define P(x)    x
+#else
+#define P(x)    ()
+#endif
+#endif
+
+#define SHA_DIGESTSIZE 20
+
+typedef unsigned int uint32;
+
+typedef struct {
+    uint32 state[5];
+    uint32 count[2];
+    unsigned char buffer[64];
+} SHA1_CTX;
+
+void SHA1Init P((SHA1_CTX* context));
+void SHA1Update P((SHA1_CTX* context, const unsigned char* data, unsigned int len));
+void SHA1Final P((unsigned char digest[20], SHA1_CTX* context));
+
+#endif /* T_SHA_H */
diff --git a/trunk/package/network/services/ead/src/tinysrp/t_truerand.c b/trunk/package/network/services/ead/src/tinysrp/t_truerand.c
new file mode 100644
index 00000000..fa0d6ce6
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/t_truerand.c
@@ -0,0 +1,151 @@
+/*
+ *      Physically random numbers (very nearly uniform)
+ *      D. P. Mitchell
+ *      Modified by Matt Blaze 7/95
+ */
+/*
+ * The authors of this software are Don Mitchell and Matt Blaze.
+ *              Copyright (c) 1995 by AT&T.
+ * Permission to use, copy, and modify this software without fee
+ * is hereby granted, provided that this entire notice is included in
+ * all copies of any software which is or includes a copy or
+ * modification of this software and in all copies of the supporting
+ * documentation for such software.
+ *
+ * This software may be subject to United States export controls.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ */
+
+/*
+ * WARNING: depending on the particular platform, raw_truerand()
+ * output may be biased or correlated.  In general, you can expect
+ * about 16 bits of "pseudo-entropy" out of each 32 bit word returned
+ * by truerand(), but it may not be uniformly diffused.  You should
+ * raw_therefore run the output through some post-whitening function
+ * (like MD5 or DES or whatever) before using it to generate key
+ * material.  (RSAREF's random package does this for you when you feed
+ * raw_truerand() bits to the seed input function.)
+ *
+ * The application interface, for 8, 16, and 32 bit properly "whitened"
+ * random numbers, can be found in trand8(), trand16(), and trand32().
+ * Use those instead of calling raw_truerand() directly.
+ *
+ * The basic idea here is that between clock "skew" and various
+ * hard-to-predict OS event arrivals, counting a tight loop will yield
+ * a little (maybe a third of a bit or so) of "good" randomness per
+ * interval clock tick.  This seems to work well even on unloaded
+ * machines.  If there is a human operator at the machine, you should
+ * augment truerand with other measure, like keyboard event timing.
+ * On server machines (e.g., when you need to generate a
+ * Diffie-Hellman secret) truerand alone may be good enough.
+ *
+ * Test these assumptions on your own platform before fielding a
+ * system based on this software or these techniques.
+ *
+ * This software seems to work well (at 10 or so bits per
+ * raw_truerand() call) on a Sun Sparc-20 under SunOS 4.1.3 and on a
+ * P100 under BSDI 2.0.  You're on your own elsewhere.
+ *
+ */
+
+#include "t_defines.h"
+
+#include <signal.h>
+#include <setjmp.h>
+#include <sys/time.h>
+#include <math.h>
+#include <stdio.h>
+
+#ifdef OLD_TRUERAND
+static jmp_buf env;
+#endif
+static unsigned volatile count
+#ifndef OLD_TRUERAND
+  , done = 0
+#endif
+;
+
+static unsigned ocount;
+static unsigned buffer;
+
+static void
+tick()
+{
+	struct itimerval it, oit;
+
+	it.it_interval.tv_sec = 0;
+	it.it_interval.tv_usec = 0;
+	it.it_value.tv_sec = 0;
+	it.it_value.tv_usec = 16665;
+	if (setitimer(ITIMER_REAL, &it, &oit) < 0)
+		perror("tick");
+}
+
+static void
+interrupt()
+{
+	if (count) {
+#ifdef OLD_TRUERAND
+		longjmp(env, 1);
+#else
+		++done;
+		return;
+#endif
+	}
+
+	(void) signal(SIGALRM, interrupt);
+	tick();
+}
+
+static unsigned long
+roulette()
+{
+#ifdef OLD_TRUERAND
+	if (setjmp(env)) {
+		count ^= (count>>3) ^ (count>>6) ^ ocount;
+		count &= 0x7;
+		ocount=count;
+		buffer = (buffer<<3) ^ count;
+		return buffer;
+	}
+#else
+	done = 0;
+#endif
+	(void) signal(SIGALRM, interrupt);
+	count = 0;
+	tick();
+#ifdef OLD_TRUERAND
+	for (;;)
+#else
+	while(done == 0)
+#endif
+		count++;        /* about 1 MHz on VAX 11/780 */
+#ifndef OLD_TRUERAND
+	count ^= (count>>3) ^ (count>>6) ^ ocount;
+	count &= 0x7;
+	ocount=count;
+	buffer = (buffer<<3) ^ count;
+	return buffer;
+#endif
+}
+
+unsigned long
+raw_truerand()
+{
+	count=0;
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	(void) roulette();
+	return roulette();
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/tconf.c b/trunk/package/network/services/ead/src/tinysrp/tconf.c
new file mode 100644
index 00000000..ad77f4cc
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/tconf.c
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 1997-2000  The Stanford SRP Authentication Project
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL STANFORD BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * In addition, the following conditions apply:
+ *
+ * 1. Any software that incorporates the SRP authentication technology
+ *    must display the following acknowlegment:
+ *    "This product uses the 'Secure Remote Password' cryptographic
+ *     authentication system developed by Tom Wu (tjw@CS.Stanford.EDU)."
+ *
+ * 2. Any software that incorporates all or part of the SRP distribution
+ *    itself must also display the following acknowledgment:
+ *    "This product includes software developed by Tom Wu and Eugene
+ *     Jhong for the SRP Distribution (http://srp.stanford.edu/srp/)."
+ *
+ * 3. Redistributions in source or binary form must retain an intact copy
+ *    of this copyright notice and list of conditions.
+ */
+
+#include <unistd.h>     /* close getlogin */
+#include <stdlib.h>     /* atexit exit */
+#include <stdio.h>
+#include <string.h>
+
+#include "t_pwd.h"
+
+#define MIN_BASIS_BITS 512
+#define BASIS_BITS 2048
+
+extern int  optind;
+extern char *optarg;
+
+extern int errno;
+
+char *progName;
+
+int  debug   = 0;
+int  verbose = 0;
+int  composite = 0;
+
+int main(argc, argv)
+     int argc;
+     char *argv[];
+{
+  char *chp;
+  char *configFile = NULL;
+  char cbuf[256];
+  char b64buf[MAXB64PARAMLEN];
+  int c, ch, i, lastidx, keylen, yesno, fsize, status, nparams;
+  FILE *efp;
+
+  struct t_preconf * tpc;
+  struct t_conf tcs;
+  struct t_conf * tc = &tcs;
+  struct t_confent * tcent;
+
+  progName = *argv;
+  if ((chp = strrchr(progName, '/')) != (char *) 0) progName = chp + 1;
+
+  while ((ch = getopt(argc, argv, "dv2c:")) != EOF)
+    switch(ch) {
+    case 'c':
+      configFile = optarg;
+      break;
+    case 'v':
+      verbose++;
+      break;
+    case 'd':
+      debug++;
+      break;
+    case '2':
+      composite++;
+      break;
+    default:
+      fprintf(stderr, "usage: %s [-dv2] [-c configfile]\n", progName);
+      exit(1);
+    }
+
+  argc -= optind;
+  argv += optind;
+
+  lastidx = 0;
+  keylen = 0;
+
+  tcent = t_newconfent(tc);
+
+  printf("\nThis program will generate a set of parameters for the EPS\n");
+  printf("password file.  The size of these parameters, measured in bits,\n");
+  printf("determines the level of security offered by SRP, and is related\n");
+  printf("to the security of similarly-sized RSA or Diffie-Hellman keys.\n");
+  printf("Choosing a predefined field is generally preferable to generating\n");
+  printf("a new field because clients can avoid costly parameter verification.\n");
+  printf("Either way, the values generated by this program are public and\n");
+  printf("can even shared between systems.\n");
+
+  printf("\nEnter the new field size, in bits.  Suggested sizes:\n\n");
+  printf(" 512 (fast, minimally secure)\n");
+  printf(" 768 (moderate security)\n");
+  printf("1024 (most popular default)\n");
+  printf("1536 (additional security, possibly slow)\n");
+  printf("2048 (maximum supported security level)\n");
+  printf("\nField size (%d to %d): ", MIN_BASIS_BITS, BASIS_BITS);
+
+  fgets(cbuf, sizeof(cbuf), stdin);
+  fsize = atoi(cbuf);
+  if(fsize < MIN_BASIS_BITS || fsize > BASIS_BITS) {
+    fprintf(stderr, "%s: field size must be between %d and %d\n",
+	    progName, MIN_BASIS_BITS, BASIS_BITS);
+    exit(1);
+  }
+
+  if(fsize <= keylen)
+    fprintf(stderr, "Warning: new field size is not larger than old field size\n");
+
+  printf("\nInitializing random number generator...");
+  fflush(stdout);
+  t_initrand();
+
+  if(composite)
+    printf("done.\n\nGenerating a %d-bit composite with safe prime factors.  This may take a while.\n", fsize);
+  else
+    printf("done.\n\nGenerating a %d-bit safe prime.  This may take a while.\n", fsize);
+
+  while((tcent = (composite ? t_makeconfent_c(tc, fsize) :
+			      t_makeconfent(tc, fsize))) == NULL)
+    printf("Parameter generation failed, retrying...\n");
+  tcent->index = lastidx + 1;
+
+  printf("\nParameters successfully generated.\n");
+  printf("N = [%s]\n", t_tob64(b64buf,
+			       tcent->modulus.data, tcent->modulus.len));
+  printf("g = [%s]\n", t_tob64(b64buf,
+			       tcent->generator.data, tcent->generator.len));
+  printf("\nYou must update the pre_params array in t_getconf.c\n");
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/tinysrp.c b/trunk/package/network/services/ead/src/tinysrp/tinysrp.c
new file mode 100644
index 00000000..fc010554
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/tinysrp.c
@@ -0,0 +1,235 @@
+/* This bit implements a simple API for using the SRP library over sockets. */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include "t_defines.h"
+#include "t_pwd.h"
+#include "t_server.h"
+#include "t_client.h"
+#include "tinysrp.h"
+
+#ifndef MSG_WAITALL
+#ifdef linux
+#define MSG_WAITALL 0x100       /* somehow not defined on my box */
+#endif
+#endif
+
+/* This is called by the client with a connected socket, username, and
+passphrase.  pass can be NULL in which case the user is queried. */
+
+int tsrp_client_authenticate(int s, char *user, char *pass, TSRP_SESSION *tsrp)
+{
+	int i, index;
+	unsigned char username[MAXUSERLEN + 1], sbuf[MAXSALTLEN];
+	unsigned char msgbuf[MAXPARAMLEN + 1], bbuf[MAXPARAMLEN];
+	unsigned char passbuf[128], *skey;
+	struct t_client *tc;
+	struct t_preconf *tcp;          /* @@@ should go away */
+	struct t_num salt, *A, B;
+
+	/* Send the username. */
+
+	i = strlen(user);
+	if (i > MAXUSERLEN) {
+		i = MAXUSERLEN;
+	}
+	msgbuf[0] = i;
+	memcpy(msgbuf + 1, user, i);
+	if (send(s, msgbuf, i + 1, 0) < 0) {
+		return 0;
+	}
+	memcpy(username, user, i);
+	username[i] = '\0';
+
+	/* Get the prime index and salt. */
+
+	i = recv(s, msgbuf, 2, MSG_WAITALL);
+	if (i <= 0) {
+		return 0;
+	}
+	index = msgbuf[0];
+	if (index <= 0 || index > t_getprecount()) {
+		return 0;
+	}
+	tcp = t_getpreparam(index - 1);
+	salt.len = msgbuf[1];
+	if (salt.len > MAXSALTLEN) {
+		return 0;
+	}
+	salt.data = sbuf;
+	i = recv(s, sbuf, salt.len, MSG_WAITALL);
+	if (i <= 0) {
+		return 0;
+	}
+
+	/* @@@ t_clientopen() needs a variant that takes the index */
+
+	tc = t_clientopen(username, &tcp->modulus, &tcp->generator, &salt);
+	if (tc == NULL) {
+		return 0;
+	}
+
+	/* Calculate A and send it to the server. */
+
+	A = t_clientgenexp(tc);
+	msgbuf[0] = A->len - 1;         /* len is max 256 */
+	memcpy(msgbuf + 1, A->data, A->len);
+	if (send(s, msgbuf, A->len + 1, 0) < 0) {
+		return 0;
+	}
+
+	/* Ask the user for the passphrase. */
+
+	if (pass == NULL) {
+		t_getpass(passbuf, sizeof(passbuf), "Enter password:");
+		pass = passbuf;
+	}
+	t_clientpasswd(tc, pass);
+
+	/* Get B from the server. */
+
+	i = recv(s, msgbuf, 1, 0);
+	if (i <= 0) {
+		return 0;
+	}
+	B.len = msgbuf[0] + 1;
+	B.data = bbuf;
+	i = recv(s, bbuf, B.len, MSG_WAITALL);
+	if (i <= 0) {
+		return 0;
+	}
+
+	/* Compute the session key. */
+
+	skey = t_clientgetkey(tc, &B);
+	if (skey == NULL) {
+		return 0;
+	}
+
+	/* Send the response. */
+
+	if (send(s, t_clientresponse(tc), RESPONSE_LEN, 0) < 0) {
+		return 0;
+	}
+
+	/* Get the server's response. */
+
+	i = recv(s, msgbuf, RESPONSE_LEN, MSG_WAITALL);
+	if (i <= 0) {
+		return 0;
+	}
+	if (t_clientverify(tc, msgbuf) != 0) {
+		return 0;
+	}
+
+	/* All done.  Now copy the key and clean up. */
+
+	if (tsrp) {
+		memcpy(tsrp->username, username, strlen(username) + 1);
+		memcpy(tsrp->key, skey, SESSION_KEY_LEN);
+	}
+	t_clientclose(tc);
+
+	return 1;
+}
+
+/* This is called by the server with a connected socket. */
+
+int tsrp_server_authenticate(int s, TSRP_SESSION *tsrp)
+{
+	int i, j;
+	unsigned char username[MAXUSERLEN], *skey;
+	unsigned char msgbuf[MAXPARAMLEN + 1], abuf[MAXPARAMLEN];
+	struct t_server *ts;
+	struct t_num A, *B;
+
+	/* Get the username. */
+
+	i = recv(s, msgbuf, 1, 0);
+	if (i <= 0) {
+		return 0;
+	}
+	j = msgbuf[0];
+	i = recv(s, username, j, MSG_WAITALL);
+	if (i <= 0) {
+		return 0;
+	}
+	username[j] = '\0';
+
+	ts = t_serveropen(username);
+	if (ts == NULL) {
+		return 0;
+	}
+
+	/* Send the prime index and the salt. */
+
+	msgbuf[0] = ts->index;                  /* max 256 primes... */
+	i = ts->s.len;
+	msgbuf[1] = i;
+	memcpy(msgbuf + 2, ts->s.data, i);
+	if (send(s, msgbuf, i + 2, 0) < 0) {
+		return 0;
+	}
+
+	/* Calculate B while we're waiting. */
+
+	B = t_servergenexp(ts);
+
+	/* Get A from the client. */
+
+	i = recv(s, msgbuf, 1, 0);
+	if (i <= 0) {
+		return 0;
+	}
+	A.len = msgbuf[0] + 1;
+	A.data = abuf;
+	i = recv(s, abuf, A.len, MSG_WAITALL);
+	if (i <= 0) {
+		return 0;
+	}
+
+	/* Now send B. */
+
+	msgbuf[0] = B->len - 1;
+	memcpy(msgbuf + 1, B->data, B->len);
+	if (send(s, msgbuf, B->len + 1, 0) < 0) {
+		return 0;
+	}
+
+	/* Calculate the session key while we're waiting. */
+
+	skey = t_servergetkey(ts, &A);
+	if (skey == NULL) {
+		return 0;
+	}
+
+	/* Get the response from the client. */
+
+	i = recv(s, msgbuf, RESPONSE_LEN, MSG_WAITALL);
+	if (i <= 0) {
+		return 0;
+	}
+	if (t_serververify(ts, msgbuf) != 0) {
+		return 0;
+	}
+
+	/* Client authenticated.  Now authenticate ourselves to the client. */
+
+	if (send(s, t_serverresponse(ts), RESPONSE_LEN, 0) < 0) {
+		return 0;
+	}
+
+	/* Copy the key and clean up. */
+
+	if (tsrp) {
+		memcpy(tsrp->username, username, strlen(username) + 1);
+		memcpy(tsrp->key, skey, SESSION_KEY_LEN);
+	}
+	t_serverclose(ts);
+
+	return 1;
+}
diff --git a/trunk/package/network/services/ead/src/tinysrp/tinysrp.h b/trunk/package/network/services/ead/src/tinysrp/tinysrp.h
new file mode 100644
index 00000000..4420a196
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/tinysrp.h
@@ -0,0 +1,18 @@
+/* Simple API for the tinysrp library. */
+
+#ifndef T_PWD_H
+#define MAXUSERLEN      32
+#define SESSION_KEY_LEN 40      /* 320-bit session key */
+#endif
+
+typedef struct {
+	char username[MAXUSERLEN + 1];
+	unsigned char key[SESSION_KEY_LEN];
+} TSRP_SESSION;
+
+/* These functions are passed a connected socket, and return true for a
+successful authentication.  If tsrp is not NULL, the username and key
+fields are filled in. */
+
+extern int tsrp_server_authenticate(int s, TSRP_SESSION *tsrp);
+extern int tsrp_client_authenticate(int s, char *user, char *pass, TSRP_SESSION *tsrp);
diff --git a/trunk/package/network/services/ead/src/tinysrp/tpasswd b/trunk/package/network/services/ead/src/tinysrp/tpasswd
new file mode 100644
index 00000000..2ac7e2a1
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/tpasswd
@@ -0,0 +1,2 @@
+moo:A9lHvOGAMJvw1m3vcDsQRUFovh6/QUmLDKqwhv.drKQzbE9nS7HrOZLUPx2MmS6ewwybN8RHqpWqnUJRCMFT14FMbYXR7kYNUUQNx43A7F.xrVOU7tlFq5NjoK9sfFtp6PMdbIOP5wzWmipiNFlCOu4sjlSZb.o7C1chLzTKU.0:19AI0Hc9jEkdFc:5
+new user:1FsanML2fbTOEsa072bLjyRD1LEqoRD2GwElfN0VmHeR.FAg5A.2.G5bTjIHmMmHL60kgoAHJZhRrgopalYmujlyAuQoKiHJb98SHm1oJaQ9nl/DrZCvfyw5LpVMqg.CupdiWz6OtmOz8fwC96ItExFnNDt6SmsVDIOn4HqXG6C0lLaqEvcqlN3gFDlJXyP2yldM.LJ1TkHTHmA3DjRkmWEUL3mWEgzkEHyPcRB3Jd5ncDT7jaNbJTTLRoOtgRsaqE7OXuPADoK8MGBcUquYBRrGwyU4Y/wW4gLc3QmV793zxkk.P3.dxkLSjro/Kk94D7kC6fx3K9tadLJyzd94rr:3v/KRlxT0.oYF1:1
diff --git a/trunk/package/network/services/ead/src/tinysrp/tphrase.c b/trunk/package/network/services/ead/src/tinysrp/tphrase.c
new file mode 100644
index 00000000..0ab1e085
--- /dev/null
+++ b/trunk/package/network/services/ead/src/tinysrp/tphrase.c
@@ -0,0 +1,354 @@
+/* Add passphrases to the tpasswd file.  Use the last entry in the config
+file by default or a particular one specified by index. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "config.h"
+#include "t_pwd.h"
+#include "t_read.h"
+#include "t_sha.h"
+#include "t_defines.h"
+
+char *Progname;
+char Usage[] = "usage: %s [-n configindex] [-p passfile] user\n";
+#define USAGE() fprintf(stderr, Usage, Progname)
+
+void doit(char *);
+
+int Configindex = -1;
+char *Passfile = DEFAULT_PASSWD;
+
+int main(int argc, char **argv)
+{
+	int c;
+
+	Progname = *argv;
+
+	/* Parse option arguments. */
+
+	while ((c = getopt(argc, argv, "n:p:")) != EOF) {
+		switch (c) {
+
+		case 'n':
+			Configindex = atoi(optarg);
+			break;
+
+		case 'p':
+			Passfile = optarg;
+			break;
+
+		default:
+			USAGE();
+			exit(1);
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 1) {
+		USAGE();
+		exit(1);
+	}
+	doit(argv[0]);
+
+	return 0;
+}
+
+void doit(char *name)
+{
+	char passphrase[128], passphrase1[128];
+	FILE *f;
+	struct t_confent *tcent;
+	struct t_pw eps_passwd;
+
+	/* Get the config entry. */
+
+	if (Configindex <= 0) {
+		Configindex = t_getprecount();
+	}
+	tcent = gettcid(Configindex);
+	if (tcent == NULL) {
+		fprintf(stderr, "Invalid configuration file entry.\n");
+		exit(1);
+	}
+
+	/* Ask for the passphrase twice. */
+
+	printf("Setting passphrase for %s\n", name);
+
+	if (t_getpass(passphrase, sizeof(passphrase), "Enter passphrase: ") < 0) {
+		exit(1);
+	}
+	if (t_getpass(passphrase1, sizeof(passphrase1), "Verify: ") < 0) {
+		exit(1);
+	}
+	if (strcmp(passphrase, passphrase1) != 0) {
+		fprintf(stderr, "mismatch\n");
+		exit(1);
+	}
+
+	/* Create the passphrase verifier. */
+
+	t_makepwent(&eps_passwd, name, passphrase, NULL, tcent);
+
+	/* Don't need these anymore. */
+
+	memset(passphrase, 0, sizeof(passphrase));
+	memset(passphrase1, 0, sizeof(passphrase1));
+
+	/* See if the passphrase file is there; create it if not. */
+
+	if ((f = fopen(Passfile, "r+")) == NULL) {
+		creat(Passfile, 0400);
+	} else {
+		fclose(f);
+	}
+
+	/* Change the passphrase. */
+
+	if (t_changepw(Passfile, &eps_passwd.pebuf) < 0) {
+		fprintf(stderr, "Error changing passphrase\n");
+		exit(1);
+	}
+}
+
+/* TODO: Implement a more general method to handle delete/change */
+
+_TYPE( int )
+t_changepw(pwname, diff)
+     const char * pwname;
+     const struct t_pwent * diff;
+{
+  char * bakfile;
+  char * bakfile2;
+  struct stat st;
+  FILE * passfp;
+  FILE * bakfp;
+
+  if(pwname == NULL)
+    pwname = DEFAULT_PASSWD;
+
+  if((passfp = fopen(pwname, "rb")) == NULL || fstat(fileno(passfp), &st) < 0)
+    return -1;
+
+  if((bakfile = malloc(strlen(pwname) + 5)) == NULL) {
+    fclose(passfp);
+    return -1;
+  }
+  else if((bakfile2 = malloc(strlen(pwname) + 5)) == NULL) {
+    fclose(passfp);
+    free(bakfile);
+    return -1;
+  }
+
+  sprintf(bakfile, "%s.bak", pwname);
+  sprintf(bakfile2, "%s.sav", pwname);
+
+  if((bakfp = fopen(bakfile2, "wb")) == NULL &&
+     (unlink(bakfile2) < 0 || (bakfp = fopen(bakfile2, "wb")) == NULL)) {
+    fclose(passfp);
+    free(bakfile);
+    free(bakfile2);
+    return -1;
+  }
+
+#ifdef NO_FCHMOD
+  chmod(bakfile2, st.st_mode & 0777);
+#else
+  fchmod(fileno(bakfp), st.st_mode & 0777);
+#endif
+
+  t_pwcopy(bakfp, passfp, diff);
+
+  fclose(bakfp);
+  fclose(passfp);
+
+#ifdef USE_RENAME
+  unlink(bakfile);
+  if(rename(pwname, bakfile) < 0) {
+    free(bakfile);
+    free(bakfile2);
+    return -1;
+  }
+  if(rename(bakfile2, pwname) < 0) {
+    free(bakfile);
+    free(bakfile2);
+    return -1;
+  }
+#else
+  unlink(bakfile);
+  link(pwname, bakfile);
+  unlink(pwname);
+  link(bakfile2, pwname);
+  unlink(bakfile2);
+#endif
+  free(bakfile);
+  free(bakfile2);
+
+  return 0;
+}
+
+_TYPE( struct t_pwent * )
+t_makepwent(tpw, user, pass, salt, confent)
+     struct t_pw * tpw;
+     const char * user;
+     const char * pass;
+     const struct t_num * salt;
+     const struct t_confent * confent;
+{
+  BigInteger x, v, n, g;
+  unsigned char dig[SHA_DIGESTSIZE];
+  SHA1_CTX ctxt;
+
+  tpw->pebuf.name = tpw->userbuf;
+  tpw->pebuf.password.data = tpw->pwbuf;
+  tpw->pebuf.salt.data = tpw->saltbuf;
+
+  strncpy(tpw->pebuf.name, user, MAXUSERLEN);
+  tpw->pebuf.index = confent->index;
+
+  if(salt) {
+    tpw->pebuf.salt.len = salt->len;
+    memcpy(tpw->pebuf.salt.data, salt->data, salt->len);
+  }
+  else {
+    memset(dig, 0, SALTLEN);            /* salt is 80 bits */
+    tpw->pebuf.salt.len = SALTLEN;
+    do {
+      t_random(tpw->pebuf.salt.data, SALTLEN);
+    } while(memcmp(tpw->pebuf.salt.data, dig, SALTLEN) == 0);
+    if(tpw->pebuf.salt.data[0] == 0)
+      tpw->pebuf.salt.data[0] = 0xff;
+  }
+
+  n = BigIntegerFromBytes(confent->modulus.data, confent->modulus.len);
+  g = BigIntegerFromBytes(confent->generator.data, confent->generator.len);
+  v = BigIntegerFromInt(0);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, user, strlen(user));
+  SHA1Update(&ctxt, ":", 1);
+  SHA1Update(&ctxt, pass, strlen(pass));
+  SHA1Final(dig, &ctxt);
+
+  SHA1Init(&ctxt);
+  SHA1Update(&ctxt, tpw->pebuf.salt.data, tpw->pebuf.salt.len);
+  SHA1Update(&ctxt, dig, sizeof(dig));
+  SHA1Final(dig, &ctxt);
+
+  /* x = H(s, H(u, ':', p)) */
+  x = BigIntegerFromBytes(dig, sizeof(dig));
+
+  BigIntegerModExp(v, g, x, n);
+  tpw->pebuf.password.len = BigIntegerToBytes(v, tpw->pebuf.password.data);
+
+  BigIntegerFree(v);
+  BigIntegerFree(x);
+  BigIntegerFree(g);
+  BigIntegerFree(n);
+
+  return &tpw->pebuf;
+}
+
+int
+t_pwcopy(pwdest, pwsrc, diff)
+     FILE * pwdest;
+     FILE * pwsrc;
+     struct t_pwent * diff;
+{
+  struct t_pw * src;
+  struct t_pwent * ent;
+
+  if((src = t_openpw(pwsrc)) == NULL)
+    return -1;
+
+  while((ent = t_getpwent(src)) != NULL)
+    if(diff && strcmp(diff->name, ent->name) == 0) {
+      t_putpwent(diff, pwdest);
+      diff = NULL;
+    }
+    else
+      t_putpwent(ent, pwdest);
+
+  if(diff)
+    t_putpwent(diff, pwdest);
+
+  return 0;
+}
+
+_TYPE( struct t_pwent * )
+t_getpwent(tpw)
+     struct t_pw * tpw;
+{
+  char indexbuf[16];
+  char passbuf[MAXB64PARAMLEN];
+  char saltstr[MAXB64SALTLEN];
+
+#ifdef ENABLE_YP
+  struct t_passwd * nisent;
+  /* FIXME: should tell caller to get conf entry from NIS also */
+
+  if(tpw->state == IN_NIS) {
+    nisent = _yp_gettpent();
+    if(nisent != NULL) {
+      savepwent(tpw, &nisent->tp);
+      return &tpw->pebuf;
+    }
+    tpw->state = FILE_NIS;
+  }
+#endif
+
+  while(1) {
+    if(t_nextfield(tpw->instream, tpw->userbuf, MAXUSERLEN) > 0) {
+#ifdef ENABLE_YP
+      if(tpw->state == FILE_NIS && *tpw->userbuf == '+') {
+	t_nextline(tpw->instream);
+	if(strlen(tpw->userbuf) > 1) {  /* +name:... */
+	  nisent = _yp_gettpnam(tpw->userbuf + 1);
+	  if(nisent != NULL) {
+	    savepwent(tpw, nisent);
+	    return &tpw->pebuf;
+	  }
+	}
+	else {  /* +:... */
+	  tpw->state = IN_NIS;
+	  _yp_settpent();
+	  return t_getpwent(tpw);
+	}
+      }
+#endif
+      if(t_nextfield(tpw->instream, passbuf, MAXB64PARAMLEN) > 0 &&
+	 (tpw->pebuf.password.len = t_fromb64(tpw->pwbuf, passbuf)) > 0 &&
+	 t_nextfield(tpw->instream, saltstr, MAXB64SALTLEN) > 0 &&
+	 (tpw->pebuf.salt.len = t_fromb64(tpw->saltbuf, saltstr)) > 0 &&
+	 t_nextfield(tpw->instream, indexbuf, 16) > 0 &&
+	 (tpw->pebuf.index = atoi(indexbuf)) > 0) {
+	tpw->pebuf.name = tpw->userbuf;
+	tpw->pebuf.password.data = tpw->pwbuf;
+	tpw->pebuf.salt.data = tpw->saltbuf;
+	t_nextline(tpw->instream);
+	return &tpw->pebuf;
+      }
+    }
+    if(t_nextline(tpw->instream) < 0)
+      return NULL;
+  }
+}
+
+_TYPE( void )
+t_putpwent(ent, fp)
+     const struct t_pwent * ent;
+     FILE * fp;
+{
+  char strbuf[MAXB64PARAMLEN];
+  char saltbuf[MAXB64SALTLEN];
+
+  fprintf(fp, "%s:%s:%s:%d\n", ent->name,
+	  t_tob64(strbuf, ent->password.data, ent->password.len),
+	  t_tob64(saltbuf, ent->salt.data, ent->salt.len), ent->index);
+}
+
diff --git a/trunk/package/network/services/hostapd/Config.in b/trunk/package/network/services/hostapd/Config.in
new file mode 100644
index 00000000..b39be38f
--- /dev/null
+++ b/trunk/package/network/services/hostapd/Config.in
@@ -0,0 +1,47 @@
+# wpa_supplicant config
+config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
+	bool "Disable timestamp check"
+	depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
+	default n
+	help
+	  This disables the timestamp check for certificates in wpa_supplicant
+	  Useful for devices without RTC that cannot reliably get the real date/time
+
+choice
+	prompt "Choose TLS provider"
+	default WPA_SUPPLICANT_INTERNAL
+	depends on PACKAGE_wpa-supplicant || PACKAGE_wpad
+
+config WPA_SUPPLICANT_INTERNAL
+	bool "internal"
+
+config WPA_SUPPLICANT_OPENSSL
+	bool "openssl"
+	select PACKAGE_libopenssl
+
+endchoice
+
+config WPA_RFKILL_SUPPORT
+	bool "Add rfkill support"
+	depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
+	default n
+
+config WPA_MSG_MIN_PRIORITY
+	int "Minimum debug message priority"
+	default 3
+	help
+	  Useful values are:
+	    0 = all messages
+		1 = raw message dumps
+		2 = most debugging messages
+		3 = info messages
+		4 = warnings
+		5 = errors
+
+config DRIVER_WEXT_SUPPORT
+	bool
+	default n
+
+config DRIVER_11N_SUPPORT
+	bool
+	default n
diff --git a/trunk/package/network/services/hostapd/Makefile b/trunk/package/network/services/hostapd/Makefile
new file mode 100644
index 00000000..19d536ec
--- /dev/null
+++ b/trunk/package/network/services/hostapd/Makefile
@@ -0,0 +1,414 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hostapd
+PKG_VERSION:=2014-10-25
+PKG_RELEASE:=1
+PKG_REV:=01e2231fdc4fbec61fbc382238e3606a1d2826e4
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=git
+# PKG_MIRROR_MD5SUM:=4e7c1f97edd7514535056fce54ae053a
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=BSD-3-Clause
+
+PKG_BUILD_PARALLEL:=1
+
+PKG_BUILD_DEPENDS:= \
+	PACKAGE_kmod-madwifi:madwifi \
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \
+	CONFIG_PACKAGE_kmod-ath9k \
+	CONFIG_PACKAGE_kmod-cfg80211 \
+	CONFIG_PACKAGE_kmod-madwifi \
+	CONFIG_PACKAGE_hostapd \
+	CONFIG_PACKAGE_hostapd-mini \
+	CONFIG_PACKAGE_kmod-hostap \
+	CONFIG_WPA_RFKILL_SUPPORT \
+	CONFIG_DRIVER_WEXT_SUPPORT \
+	CONFIG_DRIVER_11N_SUPPORT
+
+LOCAL_TYPE=$(strip \
+		$(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \
+		$(if $(findstring supplicant,$(BUILD_VARIANT)),supplicant, \
+		hostapd \
+	)))
+LOCAL_VARIANT=$(patsubst wpad-%,%,$(patsubst supplicant-%,%,$(BUILD_VARIANT)))
+
+ifeq ($(LOCAL_TYPE),supplicant)
+  ifeq ($(LOCAL_VARIANT),full)
+    PKG_CONFIG_DEPENDS += \
+		CONFIG_WPA_SUPPLICANT_INTERNAL \
+		CONFIG_WPA_SUPPLICANT_OPENSSL
+  endif
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY)
+
+ifneq ($(CONFIG_DRIVER_11N_SUPPORT),)
+  HOSTAPD_IEEE80211N:=y
+endif
+
+DRIVER_MAKEOPTS= \
+	CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-cfg80211) \
+	CONFIG_DRIVER_MADWIFI=$(CONFIG_PACKAGE_kmod-madwifi) \
+	CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
+	CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \
+	CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k) \
+	CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \
+
+ifneq ($(LOCAL_TYPE),hostapd)
+  ifdef CONFIG_WPA_SUPPLICANT_OPENSSL
+    ifeq ($(LOCAL_VARIANT),full)
+      DRIVER_MAKEOPTS += CONFIG_TLS=openssl
+      TARGET_LDFLAGS += -lcrypto -lssl
+    endif
+  endif
+  ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
+    TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK
+  endif
+  ifdef CONFIG_WPA_RFKILL_SUPPORT)
+    DRIVER_MAKEOPTS += NEED_RFKILL=y
+  endif
+  DRIVER_MAKEOPTS += \
+	CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
+endif
+
+ifdef CONFIG_USE_EGLIBC
+  TARGET_LDFLAGS += -lrt
+  TARGET_LDFLAGS_C += -lrt
+endif
+
+DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny @(!TARGET_avr32||BROKEN)
+
+define Package/hostapd/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator
+  URL:=http://hostap.epitest.fi/
+  DEPENDS:=$(DRV_DEPENDS) +libubus
+endef
+
+define Package/hostapd
+$(call Package/hostapd/Default)
+  TITLE+= (full)
+  VARIANT:=full
+  CONFLICTS:=wpad wpad-mini
+endef
+
+define Package/hostapd/description
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
+ Authenticator.
+endef
+
+define Package/hostapd-mini
+$(call Package/hostapd/Default)
+  TITLE+= (WPA-PSK only)
+  VARIANT:=mini
+  CONFLICTS:=wpad wpad-mini
+endef
+
+define Package/hostapd-mini/description
+ This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only).
+endef
+
+define Package/hostapd-utils
+  $(call Package/hostapd/Default)
+  TITLE+= (utils)
+  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini||PACKAGE_wpad||PACKAGE_wpad-mini
+endef
+
+define Package/hostapd-utils/description
+ This package contains a command line utility to control the
+ IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
+endef
+
+define Package/wpad/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator/Supplicant
+  URL:=http://hostap.epitest.fi/
+endef
+
+define Package/wpad
+$(call Package/wpad/Default)
+  TITLE+= (full)
+  DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl +libubus
+  VARIANT:=wpad-full
+endef
+
+define Package/wpad/description
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
+ Authenticator and Supplicant
+endef
+
+define Package/wpad-mini
+$(call Package/wpad/Default)
+  TITLE+= (WPA-PSK only)
+  DEPENDS:=$(DRV_DEPENDS) +libubus
+  VARIANT:=wpad-mini
+endef
+
+define Package/wpad-mini/description
+ This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (WPA-PSK only).
+endef
+
+define Package/wpa-supplicant
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=WPA Supplicant
+  URL:=http://hostap.epitest.fi/wpa_supplicant/
+  DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
+  CONFLICTS:=wpad wpad-mini
+  VARIANT:=supplicant-full
+endef
+
+define Package/wpa-supplicant/Description
+  WPA Supplicant
+endef
+
+define Package/wpa-supplicant/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/wpa-supplicant-p2p
+  $(Package/wpa-supplicant)
+  TITLE:=WPA Supplicant (with Wi-Fi P2P support)
+  DEPENDS:=$(DRV_DEPENDS)
+  CONFLICTS:=wpad wpad-mini
+  VARIANT:=supplicant-p2p
+endef
+
+define Package/wpa-supplicant-p2p/Description
+  WPA Supplicant (with Wi-Fi P2P support)
+endef
+
+define Package/wpa-supplicant-mini
+  $(Package/wpa-supplicant)
+  TITLE:=WPA Supplicant (minimal version)
+  DEPENDS:=$(DRV_DEPENDS)
+  CONFLICTS:=wpad wpad-mini
+  VARIANT:=supplicant-mini
+endef
+
+define Package/wpa-supplicant-mini/Description
+  WPA Supplicant (minimal version)
+endef
+
+define Package/wpa-cli
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=@PACKAGE_wpa-supplicant||PACKAGE_wpa-supplicant-p2p||PACKAGE_wpad-mini||PACKAGE_wpad
+  TITLE:=WPA Supplicant command line interface
+endef
+
+define Package/wpa-cli/Description
+  WPA Supplicant control utility
+endef
+
+define Package/hostapd-common
+  TITLE:=hostapd/wpa_supplicant common support files
+  SECTION:=net
+  CATEGORY:=Network
+endef
+
+define Package/hostapd-common-old
+  TITLE:=hostapd/wpa_supplicant common support files (legacy drivers)
+  SECTION:=net
+  CATEGORY:=Network
+endef
+
+define Package/eapol-test
+  TITLE:=802.1x authentication test utility
+  SECTION:=net
+  CATEGORY:=Network
+  VARIANT:=supplicant-full
+  DEPENDS:=$(DRV_DEPENDS)
+endef
+
+
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+  define Build/Configure/rebuild
+	$(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.a | $(XARGS) rm -f
+	rm -f $(PKG_BUILD_DIR)/hostapd/hostapd
+	rm -f $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant
+	rm -f $(PKG_BUILD_DIR)/.config_*
+	touch $(subst .configured_,.config_,$(STAMP_CONFIGURED))
+  endef
+endif
+
+define Build/Configure
+	$(Build/Configure/rebuild)
+	$(if $(wildcard ./files/hostapd-$(LOCAL_VARIANT).config), \
+		$(CP) ./files/hostapd-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \
+	)
+	$(CP) ./files/wpa_supplicant-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config
+endef
+
+TARGET_CPPFLAGS := \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(PKG_BUILD_DIR)/src/crypto \
+	$(TARGET_CPPFLAGS) \
+	-I$(CURDIR)/madwifi \
+	-DCONFIG_LIBNL20 \
+	-D_GNU_SOURCE \
+	$(if $(CONFIG_WPA_MSG_MIN_PRIORITY),-DCONFIG_MSG_MIN_PRIORITY=$(CONFIG_WPA_MSG_MIN_PRIORITY))
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+ifeq ($(findstring supplicant,$(BUILD_VARIANT)),)
+  TARGET_LDFLAGS += -lubox -lubus
+endif
+
+ifdef CONFIG_PACKAGE_kmod-cfg80211
+  TARGET_LDFLAGS += -lm -lnl-tiny
+endif
+
+define Build/RunMake
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(DRIVER_MAKEOPTS) \
+		LIBS="$(TARGET_LDFLAGS)" \
+		LIBS_c="$(TARGET_LDFLAGS_C)" \
+		BCHECK= \
+		$(2)
+endef
+
+define Build/Compile/wpad
+	echo ` \
+		$(call Build/RunMake,hostapd,-s MULTICALL=1 dump_cflags); \
+		$(call Build/RunMake,wpa_supplicant,-s MULTICALL=1 dump_cflags) | \
+		sed -e 's,-n ,,g' -e 's,$(TARGET_CFLAGS),,' \
+	` > $(PKG_BUILD_DIR)/.cflags
+	+$(call Build/RunMake,hostapd, \
+		CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
+		MULTICALL=1 \
+		hostapd_cli hostapd_multi.a \
+	)
+	+$(call Build/RunMake,wpa_supplicant, \
+		CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
+		MULTICALL=1 \
+		wpa_cli wpa_supplicant_multi.a \
+	)
+	$(TARGET_CC) -o $(PKG_BUILD_DIR)/wpad \
+		$(TARGET_CFLAGS) \
+		./files/multicall.c \
+		$(PKG_BUILD_DIR)/hostapd/hostapd_multi.a \
+		$(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant_multi.a \
+		$(TARGET_LDFLAGS)
+endef
+
+define Build/Compile/hostapd
+	$(call Build/RunMake,hostapd, \
+		hostapd hostapd_cli \
+	)
+endef
+
+define Build/Compile/supplicant
+	$(call Build/RunMake,wpa_supplicant, \
+		wpa_cli wpa_supplicant \
+	)
+endef
+
+define Build/Compile/supplicant-full
+	$(call Build/RunMake,wpa_supplicant, \
+		eapol_test \
+	)
+endef
+
+define Build/Compile
+	$(Build/Compile/$(LOCAL_TYPE))
+	$(Build/Compile/$(BUILD_VARIANT))
+endef
+
+define Install/hostapd
+	$(INSTALL_DIR) $(1)/usr/sbin
+endef
+
+define Install/supplicant
+	$(INSTALL_DIR) $(1)/usr/sbin
+endef
+
+define Package/hostapd-common/install
+	$(INSTALL_DIR) $(1)/lib/netifd
+	$(INSTALL_DATA) ./files/netifd.sh $(1)/lib/netifd/hostapd.sh
+endef
+
+define Package/hostapd-common-old/install
+	$(INSTALL_DIR) $(1)/lib/wifi
+	$(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh
+	$(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh
+endef
+
+define Package/hostapd/install
+	$(call Install/hostapd,$(1))
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
+endef
+Package/hostapd-mini/install = $(Package/hostapd/install)
+
+ifneq ($(LOCAL_TYPE),supplicant)
+  define Package/hostapd-utils/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/rc.button
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps
+  endef
+endif
+
+define Package/wpad/install
+	$(call Install/hostapd,$(1))
+	$(call Install/supplicant,$(1))
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpad $(1)/usr/sbin/
+	$(LN) wpad $(1)/usr/sbin/hostapd
+	$(LN) wpad $(1)/usr/sbin/wpa_supplicant
+endef
+Package/wpad-mini/install = $(Package/wpad/install)
+
+define Package/wpa-supplicant/install
+	$(call Install/supplicant,$(1))
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant $(1)/usr/sbin/
+endef
+Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-p2p/install = $(Package/wpa-supplicant/install)
+
+ifneq ($(LOCAL_TYPE),hostapd)
+  define Package/wpa-cli/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli $(1)/usr/sbin/
+  endef
+endif
+
+ifeq ($(BUILD_VARIANT),supplicant-full)
+  define Package/eapol-test/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/
+  endef
+endif
+
+$(eval $(call BuildPackage,hostapd))
+$(eval $(call BuildPackage,hostapd-mini))
+$(eval $(call BuildPackage,wpad))
+$(eval $(call BuildPackage,wpad-mini))
+$(eval $(call BuildPackage,wpa-supplicant))
+$(eval $(call BuildPackage,wpa-supplicant-mini))
+$(eval $(call BuildPackage,wpa-supplicant-p2p))
+$(eval $(call BuildPackage,wpa-cli))
+$(eval $(call BuildPackage,hostapd-utils))
+$(eval $(call BuildPackage,hostapd-common))
+$(eval $(call BuildPackage,hostapd-common-old))
+$(eval $(call BuildPackage,eapol-test))
diff --git a/trunk/package/network/services/hostapd/files/hostapd-full.config b/trunk/package/network/services/hostapd/files/hostapd-full.config
new file mode 100644
index 00000000..e021cd00
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/hostapd-full.config
@@ -0,0 +1,172 @@
+# Example hostapd build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for wired authenticator
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for madwifi driver
+CONFIG_DRIVER_MADWIFI=y
+#CFLAGS += -I../../madwifi # change to the madwifi source directory
+
+# Driver interface for Prism54 driver
+#CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for drivers using the nl80211 kernel interface
+CONFIG_DRIVER_NL80211=y
+# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
+# shipped with your distribution yet. If that is the case, you need to build
+# newer libnl version and point the hostapd build to use it.
+#LIBNL=/usr/src/libnl
+#CFLAGS += -I$(LIBNL)/include
+#LIBS += -L$(LIBNL)/lib
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# Driver interface for no driver (e.g., RADIUS server only)
+#CONFIG_DRIVER_NONE=y
+
+# IEEE 802.11F/IAPP
+CONFIG_IAPP=y
+
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
+# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
+CONFIG_PEERKEY=y
+
+# IEEE 802.11w (management frame protection)
+# This version is an experimental implementation based on IEEE 802.11w/D1.0
+# draft and is subject to change since the standard has not yet been finalized.
+# Driver support is also needed for IEEE 802.11w.
+#CONFIG_IEEE80211W=y
+
+# Integrated EAP server
+CONFIG_EAP=y
+
+# EAP-MD5 for the integrated EAP server
+CONFIG_EAP_MD5=y
+
+# EAP-TLS for the integrated EAP server
+CONFIG_EAP_TLS=y
+
+# EAP-MSCHAPv2 for the integrated EAP server
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-PEAP for the integrated EAP server
+CONFIG_EAP_PEAP=y
+
+# EAP-GTC for the integrated EAP server
+CONFIG_EAP_GTC=y
+
+# EAP-TTLS for the integrated EAP server
+CONFIG_EAP_TTLS=y
+
+# EAP-SIM for the integrated EAP server
+#CONFIG_EAP_SIM=y
+
+# EAP-AKA for the integrated EAP server
+#CONFIG_EAP_AKA=y
+
+# EAP-AKA' for the integrated EAP server
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
+# EAP-PAX for the integrated EAP server
+#CONFIG_EAP_PAX=y
+
+# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-SAKE for the integrated EAP server
+#CONFIG_EAP_SAKE=y
+
+# EAP-GPSK for the integrated EAP server
+#CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+#CONFIG_EAP_GPSK_SHA256=y
+
+# EAP-FAST for the integrated EAP server
+# Note: Default OpenSSL package does not include support for all the
+# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
+# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch)
+# to add the needed functions.
+#CONFIG_EAP_FAST=y
+
+# Wi-Fi Protected Setup (WPS)
+CONFIG_WPS=y
+CONFIG_WPS2=y
+# Enable UPnP support for external WPS Registrars
+#CONFIG_WPS_UPNP=y
+
+# EAP-IKEv2
+#CONFIG_EAP_IKEV2=y
+
+# Trusted Network Connect (EAP-TNC)
+#CONFIG_EAP_TNC=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# RADIUS authentication server. This provides access to the integrated EAP
+# server from external hosts using RADIUS.
+#CONFIG_RADIUS_SERVER=y
+
+# Build IPv6 support for RADIUS operations
+CONFIG_IPV6=y
+
+# IEEE Std 802.11r-2008 (Fast BSS Transition)
+CONFIG_IEEE80211R=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
+#CONFIG_DRIVER_RADIUS_ACL=y
+
+# IEEE 802.11n (High Throughput) support
+CONFIG_IEEE80211N=y
+
+# IEEE 802.11ac (Very High Throughput) support
+CONFIG_IEEE80211AC=y
+
+# Remove debugging code that is printing out debug messages to stdout.
+# This can be used to reduce the size of the hostapd considerably if debugging
+# code is not needed.
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove support for RADIUS accounting
+#CONFIG_NO_ACCOUNTING=y
+
+# Remove support for RADIUS
+#CONFIG_NO_RADIUS=y
+
+# Remove support for VLANs
+#CONFIG_NO_VLAN=y
+
+CONFIG_TLS=internal
+CONFIG_INTERNAL_LIBTOMMATH=y
+CONFIG_INTERNAL_AES=y
+NEED_AES_DEC=y
+
+CONFIG_NO_RANDOM_POOL=y
+CONFIG_NO_DUMP_STATE=y
+
+CONFIG_WPS=y
+CONFIG_FULL_DYNAMIC_VLAN=y
+
+CONFIG_ACS=y
+
+CONFIG_UBUS=y
diff --git a/trunk/package/network/services/hostapd/files/hostapd-mini.config b/trunk/package/network/services/hostapd/files/hostapd-mini.config
new file mode 100644
index 00000000..36757099
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/hostapd-mini.config
@@ -0,0 +1,165 @@
+# Example hostapd build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for wired authenticator
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for madwifi driver
+CONFIG_DRIVER_MADWIFI=y
+#CFLAGS += -I../../madwifi # change to the madwifi source directory
+
+# Driver interface for Prism54 driver
+#CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for drivers using the nl80211 kernel interface
+CONFIG_DRIVER_NL80211=y
+# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
+# shipped with your distribution yet. If that is the case, you need to build
+# newer libnl version and point the hostapd build to use it.
+#LIBNL=/usr/src/libnl
+#CFLAGS += -I$(LIBNL)/include
+#LIBS += -L$(LIBNL)/lib
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# Driver interface for no driver (e.g., RADIUS server only)
+#CONFIG_DRIVER_NONE=y
+
+# IEEE 802.11F/IAPP
+# CONFIG_IAPP=y
+
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
+# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
+CONFIG_PEERKEY=y
+
+# IEEE 802.11w (management frame protection)
+# This version is an experimental implementation based on IEEE 802.11w/D1.0
+# draft and is subject to change since the standard has not yet been finalized.
+# Driver support is also needed for IEEE 802.11w.
+#CONFIG_IEEE80211W=y
+
+# Integrated EAP server
+#CONFIG_EAP=y
+
+# EAP-MD5 for the integrated EAP server
+#CONFIG_EAP_MD5=y
+
+# EAP-TLS for the integrated EAP server
+#CONFIG_EAP_TLS=y
+
+# EAP-MSCHAPv2 for the integrated EAP server
+#CONFIG_EAP_MSCHAPV2=y
+
+# EAP-PEAP for the integrated EAP server
+#CONFIG_EAP_PEAP=y
+
+# EAP-GTC for the integrated EAP server
+#CONFIG_EAP_GTC=y
+
+# EAP-TTLS for the integrated EAP server
+#CONFIG_EAP_TTLS=y
+
+# EAP-SIM for the integrated EAP server
+#CONFIG_EAP_SIM=y
+
+# EAP-AKA for the integrated EAP server
+#CONFIG_EAP_AKA=y
+
+# EAP-AKA' for the integrated EAP server
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
+# EAP-PAX for the integrated EAP server
+#CONFIG_EAP_PAX=y
+
+# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-SAKE for the integrated EAP server
+#CONFIG_EAP_SAKE=y
+
+# EAP-GPSK for the integrated EAP server
+#CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+#CONFIG_EAP_GPSK_SHA256=y
+
+# EAP-FAST for the integrated EAP server
+# Note: Default OpenSSL package does not include support for all the
+# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
+# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch)
+# to add the needed functions.
+#CONFIG_EAP_FAST=y
+
+# Wi-Fi Protected Setup (WPS)
+#CONFIG_WPS=y
+# Enable UPnP support for external WPS Registrars
+#CONFIG_WPS_UPNP=y
+
+# EAP-IKEv2
+#CONFIG_EAP_IKEV2=y
+
+# Trusted Network Connect (EAP-TNC)
+#CONFIG_EAP_TNC=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+#CONFIG_PKCS12=y
+
+# RADIUS authentication server. This provides access to the integrated EAP
+# server from external hosts using RADIUS.
+#CONFIG_RADIUS_SERVER=y
+
+# Build IPv6 support for RADIUS operations
+#CONFIG_IPV6=y
+
+# IEEE Std 802.11r-2008 (Fast BSS Transition)
+#CONFIG_IEEE80211R=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
+#CONFIG_DRIVER_RADIUS_ACL=y
+
+# IEEE 802.11n (High Throughput) support
+CONFIG_IEEE80211N=y
+
+# IEEE 802.11ac (Very High Throughput) support
+CONFIG_IEEE80211AC=y
+
+# Remove debugging code that is printing out debug messages to stdout.
+# This can be used to reduce the size of the hostapd considerably if debugging
+# code is not needed.
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove support for RADIUS accounting
+CONFIG_NO_ACCOUNTING=y
+
+# Remove support for RADIUS
+CONFIG_NO_RADIUS=y
+
+# Remove support for VLANs
+#CONFIG_NO_VLAN=y
+
+CONFIG_TLS=internal
+
+CONFIG_NO_RANDOM_POOL=y
+CONFIG_NO_DUMP_STATE=y
+
+CONFIG_ACS=y
+
+CONFIG_UBUS=y
diff --git a/trunk/package/network/services/hostapd/files/hostapd.sh b/trunk/package/network/services/hostapd/files/hostapd.sh
new file mode 100644
index 00000000..b938ffe4
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/hostapd.sh
@@ -0,0 +1,359 @@
+hostapd_set_bss_options() {
+	local var="$1"
+	local vif="$2"
+	local enc wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wps_possible
+
+	config_get enc "$vif" encryption "none"
+	config_get wep_rekey        "$vif" wep_rekey        # 300
+	config_get wpa_group_rekey  "$vif" wpa_group_rekey  # 300
+	config_get wpa_pair_rekey   "$vif" wpa_pair_rekey   # 300
+	config_get wpa_master_rekey "$vif" wpa_master_rekey # 640
+	config_get_bool ap_isolate "$vif" isolate 0
+	config_get_bool disassoc_low_ack "$vif" disassoc_low_ack 1
+	config_get max_num_sta "$vif" max_num_sta 0
+	config_get max_inactivity "$vif" max_inactivity 0
+	config_get_bool preamble "$vif" short_preamble 1
+
+	config_get device "$vif" device
+	config_get hwmode "$device" hwmode
+	config_get phy "$device" phy
+
+	append "$var" "ctrl_interface=/var/run/hostapd-$phy" "$N"
+
+	if [ "$ap_isolate" -gt 0 ]; then
+		append "$var" "ap_isolate=$ap_isolate" "$N"
+	fi
+	if [ "$max_num_sta" -gt 0 ]; then
+		append "$var" "max_num_sta=$max_num_sta" "$N"
+	fi
+	if [ "$max_inactivity" -gt 0 ]; then
+		append "$var" "ap_max_inactivity=$max_inactivity" "$N"
+	fi
+	append "$var" "disassoc_low_ack=$disassoc_low_ack" "$N"
+	if [ "$preamble" -gt 0 ]; then
+		append "$var" "preamble=$preamble" "$N"
+	fi
+
+	# Examples:
+	# psk-mixed/tkip 	=> WPA1+2 PSK, TKIP
+	# wpa-psk2/tkip+aes	=> WPA2 PSK, CCMP+TKIP
+	# wpa2/tkip+aes 	=> WPA2 RADIUS, CCMP+TKIP
+	# ...
+
+	# TODO: move this parsing function somewhere generic, so that
+	# later it can be reused by drivers that don't use hostapd
+
+	# crypto defaults: WPA2 vs WPA1
+	case "$enc" in
+		wpa2*|*psk2*)
+			wpa=2
+			crypto="CCMP"
+		;;
+		*mixed*)
+			wpa=3
+			crypto="CCMP TKIP"
+		;;
+		*)
+			wpa=1
+			crypto="TKIP"
+		;;
+	esac
+
+	# explicit override for crypto setting
+	case "$enc" in
+		*tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";;
+		*aes|*ccmp) crypto="CCMP";;
+		*tkip) crypto="TKIP";;
+	esac
+
+	# enforce CCMP for 11ng and 11na
+	case "$hwmode:$crypto" in
+		*ng:TKIP|*na:TKIP) crypto="CCMP TKIP";;
+	esac
+
+	# use crypto/auth settings for building the hostapd config
+	case "$enc" in
+		none)
+			wps_possible=1
+			wpa=0
+			crypto=
+			# Here we make the assumption that if we're in open mode
+			# with WPS enabled, we got to be in unconfigured state.
+			wps_not_configured=1
+		;;
+		*psk*)
+			config_get psk "$vif" key
+			if [ ${#psk} -eq 64 ]; then
+				append "$var" "wpa_psk=$psk" "$N"
+			else
+				append "$var" "wpa_passphrase=$psk" "$N"
+			fi
+			wps_possible=1
+			[ -n "$wpa_group_rekey"  ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
+			[ -n "$wpa_pair_rekey"   ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey"    "$N"
+			[ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
+		;;
+		*wpa*|*8021x*)
+			# required fields? formats?
+			# hostapd is particular, maybe a default configuration for failures
+			config_get auth_server "$vif" auth_server
+			[ -z "$auth_server" ] && config_get auth_server "$vif" server
+			append "$var" "auth_server_addr=$auth_server" "$N"
+			config_get auth_port "$vif" auth_port
+			[ -z "$auth_port" ] && config_get auth_port "$vif" port
+			auth_port=${auth_port:-1812}
+			append "$var" "auth_server_port=$auth_port" "$N"
+			config_get auth_secret "$vif" auth_secret
+			[ -z "$auth_secret" ] && config_get auth_secret "$vif" key
+			append "$var" "auth_server_shared_secret=$auth_secret" "$N"
+			# You don't really want to enable this unless you are doing
+			# some corner case testing or are using libreCMC as a work around
+			# for some systematic issues.
+			config_get_bool auth_cache "$vif" auth_cache 0
+			config_get rsn_preauth "$vif" rsn_preauth
+			[ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "disable_pmksa_caching=1" "$N"
+			[ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "okc=0" "$N"
+			config_get acct_server "$vif" acct_server
+			[ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N"
+			config_get acct_port "$vif" acct_port
+			[ -n "$acct_port" ] && acct_port=${acct_port:-1813}
+			[ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N"
+			config_get acct_secret "$vif" acct_secret
+			[ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N"
+			config_get eap_reauth_period "$vif" eap_reauth_period
+			[ -n "$eap_reauth_period" ] && append "$var" "eap_reauth_period=$eap_reauth_period" "$N"
+			config_get dae_client "$vif" dae_client
+			config_get dae_secret "$vif" dae_secret
+			[ -n "$dae_client" -a -n "$dae_secret" ] && {
+				config_get dae_port  "$vif" dae_port
+				append "$var" "radius_das_port=${dae_port:-3799}" "$N"
+				append "$var" "radius_das_client=$dae_client $dae_secret" "$N"
+			}
+			config_get nasid "$vif" nasid
+			config_get ownip "$vif" ownip
+			append "$var" "nas_identifier=$nasid" "$N"
+			append "$var" "own_ip_addr=$ownip" "$N"
+			append "$var" "eapol_key_index_workaround=1" "$N"
+			append "$var" "ieee8021x=1" "$N"
+			append "$var" "wpa_key_mgmt=WPA-EAP" "$N"
+			[ -n "$wpa_group_rekey"  ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
+			[ -n "$wpa_pair_rekey"   ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey"    "$N"
+			[ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
+		;;
+		*wep*)
+			config_get key "$vif" key
+			key="${key:-1}"
+			case "$key" in
+				[1234])
+					for idx in 1 2 3 4; do
+						local zidx
+						zidx=$(($idx - 1))
+						config_get ckey "$vif" "key${idx}"
+						[ -n "$ckey" ] && \
+							append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N"
+					done
+					append "$var" "wep_default_key=$((key - 1))"  "$N"
+				;;
+				*)
+					append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N"
+					append "$var" "wep_default_key=0" "$N"
+					[ -n "$wep_rekey" ] && append "$var" "wep_rekey_period=$wep_rekey" "$N"
+				;;
+			esac
+			case "$enc" in
+				*shared*)
+					auth_algs=2
+				;;
+				*mixed*)
+					auth_algs=3
+				;;
+			esac
+			wpa=0
+			crypto=
+		;;
+		*)
+			wpa=0
+			crypto=
+		;;
+	esac
+	append "$var" "auth_algs=${auth_algs:-1}" "$N"
+	append "$var" "wpa=$wpa" "$N"
+	[ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N"
+	[ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
+
+	config_get ssid "$vif" ssid
+	config_get bridge "$vif" bridge
+	config_get ieee80211d "$vif" ieee80211d
+	config_get iapp_interface "$vif" iapp_interface
+
+	config_get_bool wps_pbc "$vif" wps_pushbutton 0
+	config_get_bool wps_label "$vif" wps_label 0
+
+	config_get config_methods "$vif" wps_config
+	[ "$wps_pbc" -gt 0 ] && append config_methods push_button
+
+	[ -n "$wps_possible" -a -n "$config_methods" ] && {
+		config_get device_type "$vif" wps_device_type "6-0050F204-1"
+		config_get device_name "$vif" wps_device_name "libreCMC AP"
+		config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
+		config_get wps_pin "$vif" wps_pin
+
+		config_get_bool ext_registrar "$vif" ext_registrar 0
+		[ "$ext_registrar" -gt 0 -a -n "$bridge" ] && append "$var" "upnp_iface=$bridge" "$N"
+
+		append "$var" "eap_server=1" "$N"
+		[ -n "$wps_pin" ] && append "$var" "ap_pin=$wps_pin" "$N"
+		append "$var" "wps_state=${wps_not_configured:-2}" "$N"
+		append "$var" "ap_setup_locked=0" "$N"
+		append "$var" "device_type=$device_type" "$N"
+		append "$var" "device_name=$device_name" "$N"
+		append "$var" "manufacturer=$manufacturer" "$N"
+		append "$var" "config_methods=$config_methods" "$N"
+	}
+
+	append "$var" "ssid=$ssid" "$N"
+	[ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
+	[ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
+	[ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N"
+
+	if [ "$wpa" -ge "2" ]
+	then
+		# RSN -> allow preauthentication. You have two
+		# options, rsn_preauth for production or rsn_preauth_testing
+		# for validation / testing.
+		if [ -n "$bridge" -a "$rsn_preauth" = 1 ]
+		then
+			append "$var" "rsn_preauth=1" "$N"
+			append "$var" "rsn_preauth_interfaces=$bridge" "$N"
+			append "$var" "okc=1" "$N"
+		else
+			# RSN preauthentication testings hould disable
+			# Opportunistic Key Caching (okc) as otherwise the PMKSA
+			# entry for a test could come from the Opportunistic Key Caching
+			config_get rsn_preauth_testing "$vif" rsn_preauth_testing
+			if [ -n "$bridge" -a "$rsn_preauth_testing" = 1 ]
+			then
+				append "$var" "rsn_preauth=1" "$N"
+				append "$var" "rsn_preauth_interfaces=$bridge" "$N"
+				append "$var" "okc=0" "$N"
+			fi
+		fi
+
+		# RSN -> allow management frame protection
+		config_get ieee80211w "$vif" ieee80211w
+		case "$ieee80211w" in
+			[012])
+				append "$var" "ieee80211w=$ieee80211w" "$N"
+				[ "$ieee80211w" -gt "0" ] && {
+					config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout
+					config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout
+					[ -n "$ieee80211w_max_timeout" ] && \
+						append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
+					[ -n "$ieee80211w_retry_timeout" ] && \
+						append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
+				}
+			;;
+		esac
+	fi
+
+	config_get macfile "$vif" macfile
+	config_get maclist "$vif" maclist
+	if [ -z "$macfile" ]
+	then
+		# if no macfile has been specified, fallback to the default name
+		# and truncate file to avoid aggregating entries over time
+		macfile="/var/run/hostapd-$ifname.maclist"
+		echo "" > "$macfile"
+	else
+		if [ -n "$maclist" ]
+		then
+			# to avoid to overwrite the original file, make a copy
+			# before appending the entries specified by the maclist
+			# option
+			cp $macfile $macfile.maclist
+			macfile=$macfile.maclist
+		fi
+	fi
+
+	if [ -n "$maclist" ]
+	then
+		for mac in $maclist; do
+			echo "$mac" >> $macfile
+		done
+	fi
+
+	config_get macfilter "$vif" macfilter
+	case "$macfilter" in
+		allow)
+			append "$var" "macaddr_acl=1" "$N"
+			append "$var" "accept_mac_file=$macfile" "$N"
+			;;
+		deny)
+			append "$var" "macaddr_acl=0" "$N"
+			append "$var" "deny_mac_file=$macfile" "$N"
+			;;
+	esac
+}
+
+hostapd_set_log_options() {
+	local var="$1"
+	local cfg="$2"
+	local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme
+
+	config_get log_level "$cfg" log_level 2
+
+	config_get_bool log_80211  "$cfg" log_80211  1
+	config_get_bool log_8021x  "$cfg" log_8021x  1
+	config_get_bool log_radius "$cfg" log_radius 1
+	config_get_bool log_wpa    "$cfg" log_wpa    1
+	config_get_bool log_driver "$cfg" log_driver 1
+	config_get_bool log_iapp   "$cfg" log_iapp   1
+	config_get_bool log_mlme   "$cfg" log_mlme   1
+
+	local log_mask=$((       \
+		($log_80211  << 0) | \
+		($log_8021x  << 1) | \
+		($log_radius << 2) | \
+		($log_wpa    << 3) | \
+		($log_driver << 4) | \
+		($log_iapp   << 5) | \
+		($log_mlme   << 6)   \
+	))
+
+	append "$var" "logger_syslog=$log_mask" "$N"
+	append "$var" "logger_syslog_level=$log_level" "$N"
+	append "$var" "logger_stdout=$log_mask" "$N"
+	append "$var" "logger_stdout_level=$log_level" "$N"
+}
+
+hostapd_setup_vif() {
+	local vif="$1"
+	local driver="$2"
+	local ifname device channel hwmode
+
+	hostapd_cfg=
+
+	config_get ifname "$vif" ifname
+	config_get device "$vif" device
+	config_get channel "$device" channel
+	config_get hwmode "$device" hwmode
+
+	hostapd_set_log_options hostapd_cfg "$device"
+	hostapd_set_bss_options hostapd_cfg "$vif"
+
+	case "$hwmode" in
+		*bg|*gdt|*gst|*fh) hwmode=g;;
+		*adt|*ast) hwmode=a;;
+	esac
+	[ "$channel" = auto ] && channel=
+	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
+	cat > /var/run/hostapd-$ifname.conf <<EOF
+driver=$driver
+interface=$ifname
+${hwmode:+hw_mode=${hwmode#11}}
+${channel:+channel=$channel}
+$hostapd_cfg
+EOF
+	hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
+}
+
diff --git a/trunk/package/network/services/hostapd/files/multicall.c b/trunk/package/network/services/hostapd/files/multicall.c
new file mode 100644
index 00000000..c8e814bb
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/multicall.c
@@ -0,0 +1,28 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+
+extern int hostapd_main(int argc, char **argv);
+extern int wpa_supplicant_main(int argc, char **argv);
+
+int main(int argc, char **argv)
+{
+	bool restart = false;
+	const char *prog = argv[0];
+
+restart:
+	if (strstr(argv[0], "hostapd"))
+		return hostapd_main(argc, argv);
+	else if (strstr(argv[0], "wpa_supplicant"))
+		return wpa_supplicant_main(argc, argv);
+
+	if (!restart && argc > 1) {
+		argv++;
+		argc--;
+		restart = true;
+		goto restart;
+	}
+
+	fprintf(stderr, "Invalid command.\nUsage: %s wpa_supplicant|hostapd [<arguments>]\n", prog);
+	return 255;
+}
diff --git a/trunk/package/network/services/hostapd/files/netifd.sh b/trunk/package/network/services/hostapd/files/netifd.sh
new file mode 100644
index 00000000..202675d3
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/netifd.sh
@@ -0,0 +1,624 @@
+hostapd_add_rate() {
+	local var="$1"
+	local val="$(($2 / 1000))"
+	local sub="$((($2 / 100) % 10))"
+	append $var "$val" ","
+	[ $sub -gt 0 ] && append $var "."
+}
+
+hostapd_add_basic_rate() {
+	local var="$1"
+	local val="$(($2 / 100))"
+	append $var "$val" " "
+}
+
+hostapd_append_wep_key() {
+	local var="$1"
+
+	wep_keyidx=0
+	set_default key 1
+	case "$key" in
+		[1234])
+			for idx in 1 2 3 4; do
+				local zidx
+				zidx=$(($idx - 1))
+				json_get_var ckey "key${idx}"
+				[ -n "$ckey" ] && \
+					append $var "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N$T"
+			done
+			wep_keyidx=$((key - 1))
+		;;
+		*)
+			append $var "wep_key0=$(prepare_key_wep "$key")" "$N$T"
+		;;
+	esac
+}
+
+hostapd_add_log_config() {
+	config_add_boolean \
+		log_80211 \
+		log_8021x \
+		log_radius \
+		log_wpa \
+		log_driver \
+		log_iapp \
+		log_mlme
+
+	config_add_int log_level
+}
+
+hostapd_common_add_device_config() {
+	config_add_array basic_rate
+
+	config_add_string country
+	config_add_boolean country_ie doth
+	config_add_string require_mode
+
+	hostapd_add_log_config
+}
+
+hostapd_prepare_device_config() {
+	local config="$1"
+	local driver="$2"
+
+	local base="${config%%.conf}"
+	local base_cfg=
+
+	json_get_vars country country_ie beacon_int doth require_mode
+
+	hostapd_set_log_options base_cfg
+
+	set_default country_ie 1
+	set_default doth 1
+
+	[ -n "$country" ] && {
+		append base_cfg "country_code=$country" "$N"
+
+		[ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N"
+		[ "$hwmode" = "a" -a "$doth" -gt 0 ] && append base_cfg "ieee80211h=1" "$N"
+	}
+	[ -n "$hwmode" ] && append base_cfg "hw_mode=$hwmode" "$N"
+
+	local brlist= br
+	json_get_values basic_rate_list basic_rate
+	for br in $basic_rate_list; do
+		hostapd_add_basic_rate brlist "$br"
+	done
+	case "$require_mode" in
+		g) brlist="60 120 240" ;;
+		n) append base_cfg "require_ht=1" "$N";;
+		ac) append base_cfg "require_vht=1" "$N";;
+	esac
+	[ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
+	[ -n "$beacon_int" ] && append base_cfg "beacon_int=$beacon_int" "$N"
+
+	cat > "$config" <<EOF
+driver=$driver
+$base_cfg
+EOF
+}
+
+hostapd_common_add_bss_config() {
+	config_add_string 'bssid:macaddr' 'ssid:string'
+	config_add_boolean wds wmm hidden
+
+	config_add_int maxassoc max_inactivity
+	config_add_boolean disassoc_low_ack isolate short_preamble
+
+	config_add_int \
+		wep_rekey eap_reauth_period \
+		wpa_group_rekey wpa_pair_rekey wpa_master_rekey
+
+	config_add_boolean rsn_preauth auth_cache
+	config_add_int ieee80211w
+
+	config_add_string 'auth_server:host' 'server:host'
+	config_add_string auth_secret
+	config_add_int 'auth_port:port' 'port:port'
+
+	config_add_string acct_server
+	config_add_string acct_secret
+	config_add_int acct_port
+
+	config_add_string dae_client
+	config_add_string dae_secret
+	config_add_int dae_port
+
+	config_add_string nasid
+	config_add_string ownip
+	config_add_string iapp_interface
+	config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd
+
+	config_add_int dynamic_vlan vlan_naming
+	config_add_string vlan_tagged_interface vlan_bridge
+
+	config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
+
+	config_add_string wpa_psk_file
+
+	config_add_boolean wps_pushbutton wps_label ext_registrar wps_pbc_in_m1
+	config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
+
+	config_add_int ieee80211w_max_timeout ieee80211w_retry_timeout
+
+	config_add_string macfilter 'macfile:file'
+	config_add_array 'maclist:list(macaddr)'
+
+	config_add_int mcast_rate
+	config_add_array basic_rate
+}
+
+hostapd_set_bss_options() {
+	local var="$1"
+	local phy="$2"
+	local vif="$3"
+
+	wireless_vif_parse_encryption
+
+	local bss_conf
+	local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey
+
+	json_get_vars \
+		wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \
+		maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
+		wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
+		wps_device_type wps_device_name wps_manufacturer wps_pin \
+		macfilter ssid wmm hidden short_preamble rsn_preauth \
+		iapp_interface
+
+	set_default isolate 0
+	set_default maxassoc 0
+	set_default max_inactivity 0
+	set_default short_preamble 1
+	set_default disassoc_low_ack 1
+	set_default hidden 0
+	set_default wmm 1
+
+	append bss_conf "ctrl_interface=/var/run/hostapd"
+	if [ "$isolate" -gt 0 ]; then
+		append bss_conf "ap_isolate=$isolate" "$N"
+	fi
+	if [ "$maxassoc" -gt 0 ]; then
+		append bss_conf "max_num_sta=$maxassoc" "$N"
+	fi
+	if [ "$max_inactivity" -gt 0 ]; then
+		append bss_conf "ap_max_inactivity=$max_inactivity" "$N"
+	fi
+
+	append bss_conf "disassoc_low_ack=$disassoc_low_ack" "$N"
+	append bss_conf "preamble=$short_preamble" "$N"
+	append bss_conf "wmm_enabled=$wmm" "$N"
+	append bss_conf "ignore_broadcast_ssid=$hidden" "$N"
+
+	[ "$wpa" -gt 0 ] && {
+		[ -n "$wpa_group_rekey"  ] && append bss_conf "wpa_group_rekey=$wpa_group_rekey" "$N"
+		[ -n "$wpa_pair_rekey"   ] && append bss_conf "wpa_ptk_rekey=$wpa_pair_rekey"    "$N"
+		[ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
+	}
+
+	case "$auth_type" in
+		none)
+			wps_possible=1
+			# Here we make the assumption that if we're in open mode
+			# with WPS enabled, we got to be in unconfigured state.
+			wps_not_configured=1
+		;;
+		psk)
+			json_get_vars key wpa_psk_file
+			if [ ${#key} -lt 8 ]; then
+				wireless_setup_vif_failed INVALID_WPA_PSK
+				return 1
+			elif [ ${#key} -eq 64 ]; then
+				append bss_conf "wpa_psk=$key" "$N"
+			else
+				append bss_conf "wpa_passphrase=$key" "$N"
+			fi
+			[ -n "$wpa_psk_file" ] && {
+				[ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
+				append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
+			}
+			wps_possible=1
+		;;
+		eap)
+			json_get_vars \
+				auth_server auth_secret auth_port \
+				acct_server acct_secret acct_port \
+				dae_client dae_secret dae_port \
+				nasid ownip \
+				eap_reauth_period dynamic_vlan \
+				vlan_naming vlan_tagged_interface \
+				vlan_bridge
+
+			# legacy compatibility
+			[ -n "$auth_server" ] || json_get_var auth_server server
+			[ -n "$auth_port" ] || json_get_var auth_port port
+			[ -n "$auth_secret" ] || json_get_var auth_secret key
+
+			set_default auth_port 1812
+			set_default acct_port 1813
+			set_default dae_port 3799
+
+			set_default vlan_naming 1
+
+			append bss_conf "auth_server_addr=$auth_server" "$N"
+			append bss_conf "auth_server_port=$auth_port" "$N"
+			append bss_conf "auth_server_shared_secret=$auth_secret" "$N"
+
+			[ -n "$acct_server" ] && {
+				append bss_conf "acct_server_addr=$acct_server" "$N"
+				append bss_conf "acct_server_port=$acct_port" "$N"
+				[ -n "$acct_secret" ] && \
+					append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
+			}
+
+			[ -n "$eap_reauth_period" ] && append bss_conf "eap_reauth_period=$eap_reauth_period" "$N"
+
+			[ -n "$dae_client" -a -n "$dae_secret" ] && {
+				append bss_conf "radius_das_port=$dae_port" "$N"
+				append bss_conf "radius_das_client=$dae_client $dae_secret" "$N"
+			}
+
+			append bss_conf "nas_identifier=$nasid" "$N"
+			[ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
+			append bss_conf "eapol_key_index_workaround=1" "$N"
+			append bss_conf "ieee8021x=1" "$N"
+			append bss_conf "wpa_key_mgmt=WPA-EAP" "$N"
+
+			[ -n "$dynamic_vlan" ] && {
+				append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
+				append bss_conf "vlan_naming=$vlan_naming" "$N"
+				[ -n "$vlan_bridge" ] && \
+					append bss_conf "vlan_bridge=$vlan_bridge" "$N"
+				[ -n "$vlan_tagged_interface" ] && \
+					append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
+			}
+		;;
+		wep)
+			local wep_keyidx=0
+			json_get_vars key
+			hostapd_append_wep_key bss_conf
+			append bss_conf "wep_default_key=$wep_keyidx" "$N"
+			[ -n "$wep_rekey" ] && append bss_conf "wep_rekey_period=$wep_rekey" "$N"
+		;;
+	esac
+
+	local auth_algs=$((($auth_mode_shared << 1) | $auth_mode_open))
+	append bss_conf "auth_algs=${auth_algs:-1}" "$N"
+	append bss_conf "wpa=$wpa" "$N"
+	[ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
+
+	set_default wps_pushbutton 0
+	set_default wps_label 0
+	set_default wps_pbc_in_m1 0
+
+	config_methods=
+	[ "$wps_pushbutton" -gt 0 ] && append config_methods push_button
+	[ "$wps_label" -gt 0 ] && append config_methods label
+
+	[ -n "$wps_possible" -a -n "$config_methods" ] && {
+		set_default ext_registrar 0
+		set_default wps_device_type "6-0050F204-1"
+		set_default wps_device_name "libreCMC AP"
+		set_default wps_manufacturer "openwrt.org"
+
+		wps_state=2
+		[ -n "$wps_configured" ] && wps_state=1
+
+		[ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N"
+
+		append bss_conf "eap_server=1" "$N"
+		[ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N"
+		append bss_conf "wps_state=$wps_state" "$N"
+		append bss_conf "ap_setup_locked=0" "$N"
+		append bss_conf "device_type=$wps_device_type" "$N"
+		append bss_conf "device_name=$wps_device_name" "$N"
+		append bss_conf "manufacturer=$wps_manufacturer" "$N"
+		append bss_conf "config_methods=$config_methods" "$N"
+		[ "$wps_pbc_in_m1" -gt 0 ] && append bss_conf "pbc_in_m1=$wps_pbc_in_m1" "$N"
+	}
+
+	append bss_conf "ssid=$ssid" "$N"
+	[ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
+	[ -n "$iapp_interface" ] && {
+		iapp_interface="$(uci_get_state network "$iapp_interface" ifname "$iapp_interface")"
+		[ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N"
+	}
+
+	if [ "$wpa" -ge "2" ]; then
+		if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
+			set_default auth_cache 1
+			append bss_conf "rsn_preauth=1" "$N"
+			append bss_conf "rsn_preauth_interfaces=$network_bridge" "$N"
+		else
+			set_default auth_cache 0
+		fi
+
+		append bss_conf "okc=$auth_cache" "$N"
+		[ "$auth_cache" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
+
+		# RSN -> allow management frame protection
+		json_get_var ieee80211w ieee80211w
+		case "$ieee80211w" in
+			[012])
+				json_get_vars ieee80211w_max_timeout ieee80211w_retry_timeout
+				append bss_conf "ieee80211w=$ieee80211w" "$N"
+				[ "$ieee80211w" -gt "0" ] && {
+					[ -n "$ieee80211w_max_timeout" ] && \
+						append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
+					[ -n "$ieee80211w_retry_timeout" ] && \
+						append bss_conf "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
+				}
+			;;
+		esac
+	fi
+
+	_macfile="/var/run/hostapd-$ifname.maclist"
+	case "$macfilter" in
+		allow)
+			append bss_conf "macaddr_acl=1" "$N"
+			append bss_conf "accept_mac_file=$_macfile" "$N"
+		;;
+		deny)
+			append bss_conf "macaddr_acl=0" "$N"
+			append bss_conf "deny_mac_file=$_macfile" "$N"
+		;;
+		*)
+			_macfile=""
+		;;
+	esac
+
+	[ -n "$_macfile" ] && {
+		json_get_vars macfile
+		json_get_values maclist maclist
+
+		rm -f "$_macfile"
+		(
+			for mac in $maclist; do
+				echo "$mac"
+			done
+			[ -n "$macfile" -a -f "$macfile" ] && cat "$macfile"
+		) > "$_macfile"
+	}
+
+	append "$var" "$bss_conf" "$N"
+	return 0
+}
+
+hostapd_set_log_options() {
+	local var="$1"
+
+	local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme
+	json_get_vars log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme
+
+	set_default log_level 2
+	set_default log_80211  1
+	set_default log_8021x  1
+	set_default log_radius 1
+	set_default log_wpa    1
+	set_default log_driver 1
+	set_default log_iapp   1
+	set_default log_mlme   1
+
+	local log_mask=$(( \
+		($log_80211  << 0) | \
+		($log_8021x  << 1) | \
+		($log_radius << 2) | \
+		($log_wpa    << 3) | \
+		($log_driver << 4) | \
+		($log_iapp   << 5) | \
+		($log_mlme   << 6)   \
+	))
+
+	append "$var" "logger_syslog=$log_mask" "$N"
+	append "$var" "logger_syslog_level=$log_level" "$N"
+	append "$var" "logger_stdout=$log_mask" "$N"
+	append "$var" "logger_stdout_level=$log_level" "$N"
+
+	return 0
+}
+
+_wpa_supplicant_common() {
+	local ifname="$1"
+
+	_rpath="/var/run/wpa_supplicant"
+	_config="${_rpath}-$ifname.conf"
+}
+
+wpa_supplicant_teardown_interface() {
+	_wpa_supplicant_common "$1"
+	rm -rf "$_rpath/$1" "$_config"
+}
+
+wpa_supplicant_prepare_interface() {
+	local ifname="$1"
+	_w_driver="$2"
+
+	_wpa_supplicant_common "$1"
+
+	json_get_vars mode wds
+
+	[ -n "$network_bridge" ] && {
+		fail=
+		case "$mode" in
+			adhoc)
+				fail=1
+			;;
+			sta)
+				[ "$wds" = 1 ] || fail=1
+			;;
+		esac
+
+		[ -n "$fail" ] && {
+			wireless_setup_vif_failed BRIDGE_NOT_ALLOWED
+			return 1
+		}
+	}
+
+	local ap_scan=
+
+	_w_mode="$mode"
+	_w_modestr=
+
+	[[ "$mode" = adhoc ]] && {
+		ap_scan="ap_scan=2"
+
+		_w_modestr="mode=1"
+	}
+
+	wpa_supplicant_teardown_interface "$ifname"
+	cat > "$_config" <<EOF
+$ap_scan
+EOF
+	return 0
+}
+
+wpa_supplicant_add_network() {
+	local ifname="$1"
+
+	_wpa_supplicant_common "$1"
+	wireless_vif_parse_encryption
+
+	json_get_vars \
+		ssid bssid key \
+		basic_rate mcast_rate \
+		ieee80211w
+
+	local key_mgmt='NONE'
+	local enc_str=
+	local network_data=
+	local T="	"
+
+	local wpa_key_mgmt="WPA-PSK"
+	local scan_ssid="1"
+	local freq
+
+	[[ "$_w_mode" = "adhoc" ]] && {
+		append network_data "mode=1" "$N$T"
+		[ -n "$channel" ] && {
+			freq="$(get_freq "$phy" "$channel")"
+			append network_data "fixed_freq=1" "$N$T"
+			append network_data "frequency=$freq" "$N$T"
+		}
+
+		scan_ssid=0
+
+		[ "$_w_driver" = "nl80211" ] ||	wpa_key_mgmt="WPA-NONE"
+	}
+
+	[[ "$_w_mode" = adhoc ]] && append network_data "$_w_modestr" "$N$T"
+
+	case "$auth_type" in
+		none) ;;
+		wep)
+			local wep_keyidx=0
+			hostapd_append_wep_key network_data
+			append network_data "wep_tx_keyidx=$wep_keyidx" "$N$T"
+		;;
+		psk)
+			local passphrase
+
+			key_mgmt="$wpa_key_mgmt"
+			if [ ${#key} -eq 64 ]; then
+				passphrase="psk=${key}"
+			else
+				passphrase="psk=\"${key}\""
+			fi
+			append network_data "$passphrase" "$N$T"
+		;;
+		eap)
+			key_mgmt='WPA-EAP'
+
+			json_get_vars eap_type identity ca_cert
+			[ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"
+			[ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T"
+			case "$eap_type" in
+				tls)
+					json_get_vars client_cert priv_key priv_key_pwd
+					append network_data "client_cert=\"$client_cert\"" "$N$T"
+					append network_data "private_key=\"$priv_key\"" "$N$T"
+					append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T"
+				;;
+				peap|ttls)
+					json_get_vars auth password
+					set_default auth MSCHAPV2
+					append network_data "phase2=\"$auth\"" "$N$T"
+					append network_data "password=\"$password\"" "$N$T"
+				;;
+			esac
+			append network_data "eap=$(echo $eap_type | tr 'a-z' 'A-Z')" "$N$T"
+		;;
+	esac
+
+	case "$wpa" in
+		1)
+			append network_data "proto=WPA" "$N$T"
+		;;
+		2)
+			append network_data "proto=RSN" "$N$T"
+		;;
+	esac
+
+	case "$ieee80211w" in
+		[012])
+			[ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
+		;;
+	esac
+
+	local beacon_int brates mrate
+	[ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
+	[ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
+
+
+	[ -n "$basic_rate" ] && {
+		local br rate_list=
+		for br in $basic_rate; do
+			hostapd_add_rate rate_list "$br"
+		done
+		[ -n "$rate_list" ] && append network_data "rates=$rate_list" "$N$T"
+	}
+
+	[ -n "$mcast_rate" ] && {
+		local mc_rate=
+		hostapd_add_rate mc_rate "$mcast_rate"
+		append network_data "mcast_rate=$mc_rate" "$N$T"
+	}
+
+	local ht_str
+	[ -n "$ht" ] && append network_data "htmode=$ht" "$N$T"
+
+	cat >> "$_config" <<EOF
+network={
+	scan_ssid=$scan_ssid
+	ssid="$ssid"
+	key_mgmt=$key_mgmt
+	$network_data
+}
+EOF
+	return 0
+}
+
+wpa_supplicant_run() {
+	local ifname="$1"; shift
+
+	_wpa_supplicant_common "$ifname"
+
+	/usr/sbin/wpa_supplicant -B \
+		${network_bridge:+-b $network_bridge} \
+		-P "/var/run/wpa_supplicant-${ifname}.pid" \
+		-D ${_w_driver:-wext} \
+		-i "$ifname" \
+		-c "$_config" \
+		-C "$_rpath" \
+		"$@"
+
+	ret="$?"
+	wireless_add_process "$(cat "/var/run/wpa_supplicant-${ifname}.pid")" /usr/sbin/wpa_supplicant 1
+
+	[ "$ret" != 0 ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
+
+	return $ret
+}
+
+hostapd_common_cleanup() {
+	killall hostapd wpa_supplicant meshd-nl80211
+}
diff --git a/trunk/package/network/services/hostapd/files/wpa_supplicant-full.config b/trunk/package/network/services/hostapd/files/wpa_supplicant-full.config
new file mode 100644
index 00000000..57b5cfa2
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/wpa_supplicant-full.config
@@ -0,0 +1,409 @@
+# Example wpa_supplicant build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cases, these lines should use += in order not
+# to override previous values of the variables.
+
+
+# Uncomment following two lines and fix the paths if you have installed OpenSSL
+# or GnuTLS in non-default location
+#CFLAGS += -I/usr/local/openssl/include
+#LIBS += -L/usr/local/openssl/lib
+
+# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
+# the kerberos files are not in the default include path. Following line can be
+# used to fix build issues on such systems (krb5.h not found).
+#CFLAGS += -I/usr/include/kerberos
+
+# Example configuration for various cross-compilation platforms
+
+#### sveasoft (e.g., for Linksys WRT54G) ######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
+#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
+###############################################################################
+
+#### librecmc (e.g., for Linksys WRT54G) #######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
+#	-I../WRT54GS/release/src/include
+#LIBS = -lssl
+###############################################################################
+
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for Agere driver
+#CONFIG_DRIVER_HERMES=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
+#CFLAGS += -I../../include/wireless
+
+# Driver interface for madwifi driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_MADWIFI=y
+# Set include directory to the madwifi source tree
+#CFLAGS += -I../../madwifi
+
+# Driver interface for ndiswrapper
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_NDISWRAPPER=y
+
+# Driver interface for Atmel driver
+# CONFIG_DRIVER_ATMEL=y
+
+# Driver interface for old Broadcom driver
+# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
+# Linux wireless extensions and does not need (or even work) with the old
+# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
+#CONFIG_DRIVER_BROADCOM=y
+# Example path for wlioctl.h; change to match your configuration
+#CFLAGS += -I/opt/WRT54GS/release/src/include
+
+# Driver interface for Intel ipw2100/2200 driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_IPW=y
+
+# Driver interface for Ralink driver
+#CONFIG_DRIVER_RALINK=y
+
+# Driver interface for generic Linux wireless extensions
+CONFIG_DRIVER_WEXT=y
+
+# Driver interface for Linux drivers using the nl80211 kernel interface
+CONFIG_DRIVER_NL80211=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+#LIBS_p += -L/usr/local/lib
+#LIBS_c += -L/usr/local/lib
+
+# Driver interface for Windows NDIS
+#CONFIG_DRIVER_NDIS=y
+#CFLAGS += -I/usr/include/w32api/ddk
+#LIBS += -L/usr/local/lib
+# For native build using mingw
+#CONFIG_NATIVE_WINDOWS=y
+# Additional directories for cross-compilation on Linux host for mingw target
+#CFLAGS += -I/opt/mingw/mingw32/include/ddk
+#LIBS += -L/opt/mingw/mingw32/lib
+#CC=mingw32-gcc
+# By default, driver_ndis uses WinPcap for low-level operations. This can be
+# replaced with the following option which replaces WinPcap calls with NDISUIO.
+# However, this requires that WZC is disabled (net stop wzcsvc) before starting
+# wpa_supplicant.
+# CONFIG_USE_NDISUIO=y
+
+# Driver interface for development testing
+#CONFIG_DRIVER_TEST=y
+
+# Include client MLME (management frame processing) for test driver
+# This can be used to test MLME operations in hostapd with the test interface.
+# space.
+#CONFIG_CLIENT_MLME=y
+
+# Driver interface for wired Ethernet drivers
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for the Broadcom RoboSwitch family
+#CONFIG_DRIVER_ROBOSWITCH=y
+
+# Driver interface for no driver (e.g., WPS ER only)
+#CONFIG_DRIVER_NONE=y
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
+# included)
+CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5
+CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+CONFIG_EAP_TTLS=y
+
+# EAP-FAST
+# Note: Default OpenSSL package does not include support for all the
+# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
+# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
+# to add the needed functions.
+#CONFIG_EAP_FAST=y
+
+# EAP-GTC
+CONFIG_EAP_GTC=y
+
+# EAP-OTP
+CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+#CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-PAX
+#CONFIG_EAP_PAX=y
+
+# LEAP
+CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+#CONFIG_EAP_AKA=y
+
+# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
+# Enable USIM simulator (Milenage) for EAP-AKA
+#CONFIG_USIM_SIMULATOR=y
+
+# EAP-SAKE
+#CONFIG_EAP_SAKE=y
+
+# EAP-GPSK
+#CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+#CONFIG_EAP_GPSK_SHA256=y
+
+# EAP-TNC and related Trusted Network Connect support (experimental)
+#CONFIG_EAP_TNC=y
+
+# Wi-Fi Protected Setup (WPS)
+CONFIG_WPS=y
+
+# EAP-IKEv2
+#CONFIG_EAP_IKEV2=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
+# engine.
+CONFIG_SMARTCARD=y
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
+#CONFIG_PCSC=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
+
+# Select control interface backend for external programs, e.g, wpa_cli:
+# unix = UNIX domain sockets (default for Linux/*BSD)
+# udp = UDP sockets using localhost (127.0.0.1)
+# named_pipe = Windows Named Pipe (default for Windows)
+# y = use default (backwards compatibility)
+# If this option is commented out, control interface is not included in the
+# build.
+CONFIG_CTRL_IFACE=y
+
+# Include support for GNU Readline and History Libraries in wpa_cli.
+# When building a wpa_cli binary for distribution, please note that these
+# libraries are licensed under GPL and as such, BSD license may not apply for
+# the resulting binary.
+#CONFIG_READLINE=y
+
+# Remove debugging code that is printing out debug message to stdout.
+# This can be used to reduce the size of the wpa_supplicant considerably
+# if debugging code is not needed. The size reduction can be around 35%
+# (e.g., 90 kB).
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
+# 35-50 kB in code size.
+#CONFIG_NO_WPA=y
+
+# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
+# save about 1 kB in code size when building only WPA-Personal (no EAP support)
+# or 6 kB if building for WPA-Enterprise.
+#CONFIG_NO_WPA2=y
+
+# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
+# This option can be used to reduce code size by removing support for
+# converting ASCII passphrases into PSK. If this functionality is removed, the
+# PSK can only be configured as the 64-octet hexstring (e.g., from
+# wpa_passphrase). This saves about 0.5 kB in code size.
+#CONFIG_NO_WPA_PASSPHRASE=y
+
+# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
+# This can be used if ap_scan=1 mode is never enabled.
+#CONFIG_NO_SCAN_PROCESSING=y
+
+# Select configuration backend:
+# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
+#	path is given on command line, not here; this option is just used to
+#	select the backend that allows configuration files to be used)
+# winreg = Windows registry (see win_example.reg for an example)
+CONFIG_BACKEND=file
+
+# Remove configuration write functionality (i.e., to allow the configuration
+# file to be updated based on runtime configuration changes). The runtime
+# configuration can still be changed, the changes are just not going to be
+# persistent over restarts. This option can be used to reduce code size by
+# about 3.5 kB.
+#CONFIG_NO_CONFIG_WRITE=y
+
+# Remove support for configuration blobs to reduce code size by about 1.5 kB.
+#CONFIG_NO_CONFIG_BLOBS=y
+
+# Select program entry point implementation:
+# main = UNIX/POSIX like main() function (default)
+# main_winsvc = Windows service (read parameters from registry)
+# main_none = Very basic example (development use only)
+#CONFIG_MAIN=main
+
+# Select wrapper for operatins system and C library specific functions
+# unix = UNIX/POSIX like systems (default)
+# win32 = Windows systems
+# none = Empty template
+#CONFIG_OS=unix
+
+# Select event loop implementation
+# eloop = select() loop (default)
+# eloop_win = Windows events and WaitForMultipleObject() loop
+# eloop_none = Empty template
+#CONFIG_ELOOP=eloop
+
+# Select layer 2 packet implementation
+# linux = Linux packet socket (default)
+# pcap = libpcap/libdnet/WinPcap
+# freebsd = FreeBSD libpcap
+# winpcap = WinPcap with receive thread
+# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
+# none = Empty template
+#CONFIG_L2_PACKET=linux
+
+# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
+CONFIG_PEERKEY=y
+
+# IEEE 802.11w (management frame protection)
+# This version is an experimental implementation based on IEEE 802.11w/D1.0
+# draft and is subject to change since the standard has not yet been finalized.
+# Driver support is also needed for IEEE 802.11w.
+CONFIG_IEEE80211W=y
+
+# Select TLS implementation
+# openssl = OpenSSL (default)
+# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
+# internal = Internal TLSv1 implementation (experimental)
+# none = Empty template
+CONFIG_TLS=internal
+
+# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
+# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
+# even though the core GnuTLS library is released under LGPL, this extra
+# library uses GPL and as such, the terms of GPL apply to the combination
+# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
+# apply for distribution of the resulting binary.
+#CONFIG_GNUTLS_EXTRA=y
+
+# If CONFIG_TLS=internal is used, additional library and include paths are
+# needed for LibTomMath. Alternatively, an integrated, minimal version of
+# LibTomMath can be used. See beginning of libtommath.c for details on benefits
+# and drawbacks of this option.
+CONFIG_INTERNAL_LIBTOMMATH=y
+#ifndef CONFIG_INTERNAL_LIBTOMMATH
+#LTM_PATH=/usr/src/libtommath-0.39
+#CFLAGS += -I$(LTM_PATH)
+#LIBS += -L$(LTM_PATH)
+#LIBS_p += -L$(LTM_PATH)
+#endif
+# At the cost of about 4 kB of additional binary size, the internal LibTomMath
+# can be configured to include faster routines for exptmod, sqr, and div to
+# speed up DH and RSA calculation considerably
+CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+
+# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
+# This is only for Windows builds and requires WMI-related header files and
+# WbemUuid.Lib from Platform SDK even when building with MinGW.
+#CONFIG_NDIS_EVENTS_INTEGRATED=y
+#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
+
+# Add support for old DBus control interface
+# (fi.epitest.hostap.WPASupplicant)
+#CONFIG_CTRL_IFACE_DBUS=y
+
+# Add support for new DBus control interface
+# (fi.w1.hostap.wpa_supplicant1)
+#CONFIG_CTRL_IFACE_DBUS_NEW=y
+
+# Add introspection support for new DBus control interface
+#CONFIG_CTRL_IFACE_DBUS_INTRO=y
+
+# Add support for loading EAP methods dynamically as shared libraries.
+# When this option is enabled, each EAP method can be either included
+# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
+# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
+# be loaded in the beginning of the wpa_supplicant configuration file
+# (see load_dynamic_eap parameter in the example file) before being used in
+# the network blocks.
+#
+# Note that some shared parts of EAP methods are included in the main program
+# and in order to be able to use dynamic EAP methods using these parts, the
+# main program must have been build with the EAP method enabled (=y or =dyn).
+# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
+# unless at least one of them was included in the main build to force inclusion
+# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
+# in the main build to be able to load these methods dynamically.
+#
+# Please also note that using dynamic libraries will increase the total binary
+# size. Thus, it may not be the best option for targets that have limited
+# amount of memory/flash.
+#CONFIG_DYNAMIC_EAP_METHODS=y
+
+# IEEE Std 802.11r-2008 (Fast BSS Transition)
+#CONFIG_IEEE80211R=y
+
+# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
+#CONFIG_DEBUG_FILE=y
+
+# Enable privilege separation (see README 'Privilege separation' for details)
+#CONFIG_PRIVSEP=y
+
+# Enable mitigation against certain attacks against TKIP by delaying Michael
+# MIC error reports by a random amount of time between 0 and 60 seconds
+#CONFIG_DELAYED_MIC_ERROR_REPORT=y
+
+# Enable tracing code for developer debugging
+# This tracks use of memory allocations and other registrations and reports
+# incorrect use with a backtrace of call (or allocation) location.
+#CONFIG_WPA_TRACE=y
+# For BSD, comment out these.
+#LIBS += -lexecinfo
+#LIBS_p += -lexecinfo
+#LIBS_c += -lexecinfo
+
+# Use libbfd to get more details for developer debugging
+# This enables use of libbfd to get more detailed symbols for the backtraces
+# generated by CONFIG_WPA_TRACE=y.
+#CONFIG_WPA_TRACE_BFD=y
+# For BSD, comment out these.
+#LIBS += -lbfd -liberty -lz
+#LIBS_p += -lbfd -liberty -lz
+#LIBS_c += -lbfd -liberty -lz
+
+CONFIG_NO_RANDOM_POOL=y
+NEED_80211_COMMON=y
+
+CONFIG_IBSS_RSN=y
diff --git a/trunk/package/network/services/hostapd/files/wpa_supplicant-mini.config b/trunk/package/network/services/hostapd/files/wpa_supplicant-mini.config
new file mode 100644
index 00000000..859124f5
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/wpa_supplicant-mini.config
@@ -0,0 +1,407 @@
+# Example wpa_supplicant build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cases, these lines should use += in order not
+# to override previous values of the variables.
+
+
+# Uncomment following two lines and fix the paths if you have installed OpenSSL
+# or GnuTLS in non-default location
+#CFLAGS += -I/usr/local/openssl/include
+#LIBS += -L/usr/local/openssl/lib
+
+# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
+# the kerberos files are not in the default include path. Following line can be
+# used to fix build issues on such systems (krb5.h not found).
+#CFLAGS += -I/usr/include/kerberos
+
+# Example configuration for various cross-compilation platforms
+
+#### sveasoft (e.g., for Linksys WRT54G) ######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
+#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
+###############################################################################
+
+#### librecmc (e.g., for Linksys WRT54G) #######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
+#	-I../WRT54GS/release/src/include
+#LIBS = -lssl
+###############################################################################
+
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for Agere driver
+#CONFIG_DRIVER_HERMES=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
+#CFLAGS += -I../../include/wireless
+
+# Driver interface for madwifi driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_MADWIFI=y
+# Set include directory to the madwifi source tree
+#CFLAGS += -I../../madwifi
+
+# Driver interface for ndiswrapper
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_NDISWRAPPER=y
+
+# Driver interface for Atmel driver
+# CONFIG_DRIVER_ATMEL=y
+
+# Driver interface for old Broadcom driver
+# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
+# Linux wireless extensions and does not need (or even work) with the old
+# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
+#CONFIG_DRIVER_BROADCOM=y
+# Example path for wlioctl.h; change to match your configuration
+#CFLAGS += -I/opt/WRT54GS/release/src/include
+
+# Driver interface for Intel ipw2100/2200 driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_IPW=y
+
+# Driver interface for Ralink driver
+#CONFIG_DRIVER_RALINK=y
+
+# Driver interface for generic Linux wireless extensions
+CONFIG_DRIVER_WEXT=y
+
+# Driver interface for Linux drivers using the nl80211 kernel interface
+CONFIG_DRIVER_NL80211=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+#LIBS_p += -L/usr/local/lib
+#LIBS_c += -L/usr/local/lib
+
+# Driver interface for Windows NDIS
+#CONFIG_DRIVER_NDIS=y
+#CFLAGS += -I/usr/include/w32api/ddk
+#LIBS += -L/usr/local/lib
+# For native build using mingw
+#CONFIG_NATIVE_WINDOWS=y
+# Additional directories for cross-compilation on Linux host for mingw target
+#CFLAGS += -I/opt/mingw/mingw32/include/ddk
+#LIBS += -L/opt/mingw/mingw32/lib
+#CC=mingw32-gcc
+# By default, driver_ndis uses WinPcap for low-level operations. This can be
+# replaced with the following option which replaces WinPcap calls with NDISUIO.
+# However, this requires that WZC is disabled (net stop wzcsvc) before starting
+# wpa_supplicant.
+# CONFIG_USE_NDISUIO=y
+
+# Driver interface for development testing
+#CONFIG_DRIVER_TEST=y
+
+# Include client MLME (management frame processing) for test driver
+# This can be used to test MLME operations in hostapd with the test interface.
+# space.
+#CONFIG_CLIENT_MLME=y
+
+# Driver interface for wired Ethernet drivers
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for the Broadcom RoboSwitch family
+#CONFIG_DRIVER_ROBOSWITCH=y
+
+# Driver interface for no driver (e.g., WPS ER only)
+#CONFIG_DRIVER_NONE=y
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
+# included)
+# CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5
+# CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2
+# CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+# CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+# CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+# CONFIG_EAP_TTLS=y
+
+# EAP-FAST
+# Note: Default OpenSSL package does not include support for all the
+# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
+# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
+# to add the needed functions.
+#CONFIG_EAP_FAST=y
+
+# EAP-GTC
+# CONFIG_EAP_GTC=y
+
+# EAP-OTP
+# CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+#CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-PAX
+#CONFIG_EAP_PAX=y
+
+# LEAP
+# CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+#CONFIG_EAP_AKA=y
+
+# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
+# Enable USIM simulator (Milenage) for EAP-AKA
+#CONFIG_USIM_SIMULATOR=y
+
+# EAP-SAKE
+#CONFIG_EAP_SAKE=y
+
+# EAP-GPSK
+#CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+#CONFIG_EAP_GPSK_SHA256=y
+
+# EAP-TNC and related Trusted Network Connect support (experimental)
+#CONFIG_EAP_TNC=y
+
+# Wi-Fi Protected Setup (WPS)
+#CONFIG_WPS=y
+
+# EAP-IKEv2
+#CONFIG_EAP_IKEV2=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+# CONFIG_PKCS12=y
+
+# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
+# engine.
+# CONFIG_SMARTCARD=y
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
+#CONFIG_PCSC=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
+
+# Select control interface backend for external programs, e.g, wpa_cli:
+# unix = UNIX domain sockets (default for Linux/*BSD)
+# udp = UDP sockets using localhost (127.0.0.1)
+# named_pipe = Windows Named Pipe (default for Windows)
+# y = use default (backwards compatibility)
+# If this option is commented out, control interface is not included in the
+# build.
+CONFIG_CTRL_IFACE=y
+
+# Include support for GNU Readline and History Libraries in wpa_cli.
+# When building a wpa_cli binary for distribution, please note that these
+# libraries are licensed under GPL and as such, BSD license may not apply for
+# the resulting binary.
+#CONFIG_READLINE=y
+
+# Remove debugging code that is printing out debug message to stdout.
+# This can be used to reduce the size of the wpa_supplicant considerably
+# if debugging code is not needed. The size reduction can be around 35%
+# (e.g., 90 kB).
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
+# 35-50 kB in code size.
+#CONFIG_NO_WPA=y
+
+# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
+# save about 1 kB in code size when building only WPA-Personal (no EAP support)
+# or 6 kB if building for WPA-Enterprise.
+#CONFIG_NO_WPA2=y
+
+# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
+# This option can be used to reduce code size by removing support for
+# converting ASCII passphrases into PSK. If this functionality is removed, the
+# PSK can only be configured as the 64-octet hexstring (e.g., from
+# wpa_passphrase). This saves about 0.5 kB in code size.
+#CONFIG_NO_WPA_PASSPHRASE=y
+
+# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
+# This can be used if ap_scan=1 mode is never enabled.
+#CONFIG_NO_SCAN_PROCESSING=y
+
+# Select configuration backend:
+# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
+#	path is given on command line, not here; this option is just used to
+#	select the backend that allows configuration files to be used)
+# winreg = Windows registry (see win_example.reg for an example)
+CONFIG_BACKEND=file
+
+# Remove configuration write functionality (i.e., to allow the configuration
+# file to be updated based on runtime configuration changes). The runtime
+# configuration can still be changed, the changes are just not going to be
+# persistent over restarts. This option can be used to reduce code size by
+# about 3.5 kB.
+#CONFIG_NO_CONFIG_WRITE=y
+
+# Remove support for configuration blobs to reduce code size by about 1.5 kB.
+#CONFIG_NO_CONFIG_BLOBS=y
+
+# Select program entry point implementation:
+# main = UNIX/POSIX like main() function (default)
+# main_winsvc = Windows service (read parameters from registry)
+# main_none = Very basic example (development use only)
+#CONFIG_MAIN=main
+
+# Select wrapper for operatins system and C library specific functions
+# unix = UNIX/POSIX like systems (default)
+# win32 = Windows systems
+# none = Empty template
+#CONFIG_OS=unix
+
+# Select event loop implementation
+# eloop = select() loop (default)
+# eloop_win = Windows events and WaitForMultipleObject() loop
+# eloop_none = Empty template
+#CONFIG_ELOOP=eloop
+
+# Select layer 2 packet implementation
+# linux = Linux packet socket (default)
+# pcap = libpcap/libdnet/WinPcap
+# freebsd = FreeBSD libpcap
+# winpcap = WinPcap with receive thread
+# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
+# none = Empty template
+#CONFIG_L2_PACKET=linux
+
+# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
+# CONFIG_PEERKEY=y
+
+# IEEE 802.11w (management frame protection)
+# This version is an experimental implementation based on IEEE 802.11w/D1.0
+# draft and is subject to change since the standard has not yet been finalized.
+# Driver support is also needed for IEEE 802.11w.
+#CONFIG_IEEE80211W=y
+
+# Select TLS implementation
+# openssl = OpenSSL (default)
+# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
+# internal = Internal TLSv1 implementation (experimental)
+# none = Empty template
+CONFIG_TLS=internal
+
+# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
+# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
+# even though the core GnuTLS library is released under LGPL, this extra
+# library uses GPL and as such, the terms of GPL apply to the combination
+# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
+# apply for distribution of the resulting binary.
+#CONFIG_GNUTLS_EXTRA=y
+
+# If CONFIG_TLS=internal is used, additional library and include paths are
+# needed for LibTomMath. Alternatively, an integrated, minimal version of
+# LibTomMath can be used. See beginning of libtommath.c for details on benefits
+# and drawbacks of this option.
+#CONFIG_INTERNAL_LIBTOMMATH=y
+#ifndef CONFIG_INTERNAL_LIBTOMMATH
+#LTM_PATH=/usr/src/libtommath-0.39
+#CFLAGS += -I$(LTM_PATH)
+#LIBS += -L$(LTM_PATH)
+#LIBS_p += -L$(LTM_PATH)
+#endif
+# At the cost of about 4 kB of additional binary size, the internal LibTomMath
+# can be configured to include faster routines for exptmod, sqr, and div to
+# speed up DH and RSA calculation considerably
+#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+
+# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
+# This is only for Windows builds and requires WMI-related header files and
+# WbemUuid.Lib from Platform SDK even when building with MinGW.
+#CONFIG_NDIS_EVENTS_INTEGRATED=y
+#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
+
+# Add support for old DBus control interface
+# (fi.epitest.hostap.WPASupplicant)
+#CONFIG_CTRL_IFACE_DBUS=y
+
+# Add support for new DBus control interface
+# (fi.w1.hostap.wpa_supplicant1)
+#CONFIG_CTRL_IFACE_DBUS_NEW=y
+
+# Add introspection support for new DBus control interface
+#CONFIG_CTRL_IFACE_DBUS_INTRO=y
+
+# Add support for loading EAP methods dynamically as shared libraries.
+# When this option is enabled, each EAP method can be either included
+# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
+# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
+# be loaded in the beginning of the wpa_supplicant configuration file
+# (see load_dynamic_eap parameter in the example file) before being used in
+# the network blocks.
+#
+# Note that some shared parts of EAP methods are included in the main program
+# and in order to be able to use dynamic EAP methods using these parts, the
+# main program must have been build with the EAP method enabled (=y or =dyn).
+# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
+# unless at least one of them was included in the main build to force inclusion
+# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
+# in the main build to be able to load these methods dynamically.
+#
+# Please also note that using dynamic libraries will increase the total binary
+# size. Thus, it may not be the best option for targets that have limited
+# amount of memory/flash.
+#CONFIG_DYNAMIC_EAP_METHODS=y
+
+# IEEE Std 802.11r-2008 (Fast BSS Transition)
+#CONFIG_IEEE80211R=y
+
+# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
+#CONFIG_DEBUG_FILE=y
+
+# Enable privilege separation (see README 'Privilege separation' for details)
+#CONFIG_PRIVSEP=y
+
+# Enable mitigation against certain attacks against TKIP by delaying Michael
+# MIC error reports by a random amount of time between 0 and 60 seconds
+#CONFIG_DELAYED_MIC_ERROR_REPORT=y
+
+# Enable tracing code for developer debugging
+# This tracks use of memory allocations and other registrations and reports
+# incorrect use with a backtrace of call (or allocation) location.
+#CONFIG_WPA_TRACE=y
+# For BSD, comment out these.
+#LIBS += -lexecinfo
+#LIBS_p += -lexecinfo
+#LIBS_c += -lexecinfo
+
+# Use libbfd to get more details for developer debugging
+# This enables use of libbfd to get more detailed symbols for the backtraces
+# generated by CONFIG_WPA_TRACE=y.
+#CONFIG_WPA_TRACE_BFD=y
+# For BSD, comment out these.
+#LIBS += -lbfd -liberty -lz
+#LIBS_p += -lbfd -liberty -lz
+#LIBS_c += -lbfd -liberty -lz
+
+CONFIG_NO_RANDOM_POOL=y
+NEED_80211_COMMON=y
diff --git a/trunk/package/network/services/hostapd/files/wpa_supplicant-p2p.config b/trunk/package/network/services/hostapd/files/wpa_supplicant-p2p.config
new file mode 100644
index 00000000..dc3fdb79
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/wpa_supplicant-p2p.config
@@ -0,0 +1,412 @@
+# Example wpa_supplicant build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cases, these lines should use += in order not
+# to override previous values of the variables.
+
+
+# Uncomment following two lines and fix the paths if you have installed OpenSSL
+# or GnuTLS in non-default location
+#CFLAGS += -I/usr/local/openssl/include
+#LIBS += -L/usr/local/openssl/lib
+
+# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
+# the kerberos files are not in the default include path. Following line can be
+# used to fix build issues on such systems (krb5.h not found).
+#CFLAGS += -I/usr/include/kerberos
+
+# Example configuration for various cross-compilation platforms
+
+#### sveasoft (e.g., for Linksys WRT54G) ######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
+#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
+###############################################################################
+
+#### librecmc (e.g., for Linksys WRT54G) #######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
+#	-I../WRT54GS/release/src/include
+#LIBS = -lssl
+###############################################################################
+
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for Agere driver
+#CONFIG_DRIVER_HERMES=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
+#CFLAGS += -I../../include/wireless
+
+# Driver interface for madwifi driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_MADWIFI=y
+# Set include directory to the madwifi source tree
+#CFLAGS += -I../../madwifi
+
+# Driver interface for ndiswrapper
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_NDISWRAPPER=y
+
+# Driver interface for Atmel driver
+# CONFIG_DRIVER_ATMEL=y
+
+# Driver interface for old Broadcom driver
+# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
+# Linux wireless extensions and does not need (or even work) with the old
+# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
+#CONFIG_DRIVER_BROADCOM=y
+# Example path for wlioctl.h; change to match your configuration
+#CFLAGS += -I/opt/WRT54GS/release/src/include
+
+# Driver interface for Intel ipw2100/2200 driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
+#CONFIG_DRIVER_IPW=y
+
+# Driver interface for Ralink driver
+#CONFIG_DRIVER_RALINK=y
+
+# Driver interface for generic Linux wireless extensions
+CONFIG_DRIVER_WEXT=y
+
+# Driver interface for Linux drivers using the nl80211 kernel interface
+CONFIG_DRIVER_NL80211=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+#LIBS_p += -L/usr/local/lib
+#LIBS_c += -L/usr/local/lib
+
+# Driver interface for Windows NDIS
+#CONFIG_DRIVER_NDIS=y
+#CFLAGS += -I/usr/include/w32api/ddk
+#LIBS += -L/usr/local/lib
+# For native build using mingw
+#CONFIG_NATIVE_WINDOWS=y
+# Additional directories for cross-compilation on Linux host for mingw target
+#CFLAGS += -I/opt/mingw/mingw32/include/ddk
+#LIBS += -L/opt/mingw/mingw32/lib
+#CC=mingw32-gcc
+# By default, driver_ndis uses WinPcap for low-level operations. This can be
+# replaced with the following option which replaces WinPcap calls with NDISUIO.
+# However, this requires that WZC is disabled (net stop wzcsvc) before starting
+# wpa_supplicant.
+# CONFIG_USE_NDISUIO=y
+
+# Driver interface for development testing
+#CONFIG_DRIVER_TEST=y
+
+# Include client MLME (management frame processing) for test driver
+# This can be used to test MLME operations in hostapd with the test interface.
+# space.
+#CONFIG_CLIENT_MLME=y
+
+# Driver interface for wired Ethernet drivers
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for the Broadcom RoboSwitch family
+#CONFIG_DRIVER_ROBOSWITCH=y
+
+# Driver interface for no driver (e.g., WPS ER only)
+#CONFIG_DRIVER_NONE=y
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
+# included)
+CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5
+CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+CONFIG_EAP_TTLS=y
+
+# EAP-FAST
+# Note: Default OpenSSL package does not include support for all the
+# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
+# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
+# to add the needed functions.
+#CONFIG_EAP_FAST=y
+
+# EAP-GTC
+CONFIG_EAP_GTC=y
+
+# EAP-OTP
+CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+#CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-PAX
+#CONFIG_EAP_PAX=y
+
+# LEAP
+CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+#CONFIG_EAP_AKA=y
+
+# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
+# Enable USIM simulator (Milenage) for EAP-AKA
+#CONFIG_USIM_SIMULATOR=y
+
+# EAP-SAKE
+#CONFIG_EAP_SAKE=y
+
+# EAP-GPSK
+#CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+#CONFIG_EAP_GPSK_SHA256=y
+
+# EAP-TNC and related Trusted Network Connect support (experimental)
+#CONFIG_EAP_TNC=y
+
+# Wi-Fi Protected Setup (WPS)
+CONFIG_WPS=y
+
+# EAP-IKEv2
+#CONFIG_EAP_IKEV2=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
+# engine.
+CONFIG_SMARTCARD=y
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
+#CONFIG_PCSC=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
+
+# Select control interface backend for external programs, e.g, wpa_cli:
+# unix = UNIX domain sockets (default for Linux/*BSD)
+# udp = UDP sockets using localhost (127.0.0.1)
+# named_pipe = Windows Named Pipe (default for Windows)
+# y = use default (backwards compatibility)
+# If this option is commented out, control interface is not included in the
+# build.
+CONFIG_CTRL_IFACE=y
+
+# Include support for GNU Readline and History Libraries in wpa_cli.
+# When building a wpa_cli binary for distribution, please note that these
+# libraries are licensed under GPL and as such, BSD license may not apply for
+# the resulting binary.
+#CONFIG_READLINE=y
+
+# Remove debugging code that is printing out debug message to stdout.
+# This can be used to reduce the size of the wpa_supplicant considerably
+# if debugging code is not needed. The size reduction can be around 35%
+# (e.g., 90 kB).
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
+# 35-50 kB in code size.
+#CONFIG_NO_WPA=y
+
+# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
+# save about 1 kB in code size when building only WPA-Personal (no EAP support)
+# or 6 kB if building for WPA-Enterprise.
+#CONFIG_NO_WPA2=y
+
+# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
+# This option can be used to reduce code size by removing support for
+# converting ASCII passphrases into PSK. If this functionality is removed, the
+# PSK can only be configured as the 64-octet hexstring (e.g., from
+# wpa_passphrase). This saves about 0.5 kB in code size.
+#CONFIG_NO_WPA_PASSPHRASE=y
+
+# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
+# This can be used if ap_scan=1 mode is never enabled.
+#CONFIG_NO_SCAN_PROCESSING=y
+
+# Select configuration backend:
+# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
+#	path is given on command line, not here; this option is just used to
+#	select the backend that allows configuration files to be used)
+# winreg = Windows registry (see win_example.reg for an example)
+CONFIG_BACKEND=file
+
+# Remove configuration write functionality (i.e., to allow the configuration
+# file to be updated based on runtime configuration changes). The runtime
+# configuration can still be changed, the changes are just not going to be
+# persistent over restarts. This option can be used to reduce code size by
+# about 3.5 kB.
+#CONFIG_NO_CONFIG_WRITE=y
+
+# Remove support for configuration blobs to reduce code size by about 1.5 kB.
+#CONFIG_NO_CONFIG_BLOBS=y
+
+# Select program entry point implementation:
+# main = UNIX/POSIX like main() function (default)
+# main_winsvc = Windows service (read parameters from registry)
+# main_none = Very basic example (development use only)
+#CONFIG_MAIN=main
+
+# Select wrapper for operatins system and C library specific functions
+# unix = UNIX/POSIX like systems (default)
+# win32 = Windows systems
+# none = Empty template
+#CONFIG_OS=unix
+
+# Select event loop implementation
+# eloop = select() loop (default)
+# eloop_win = Windows events and WaitForMultipleObject() loop
+# eloop_none = Empty template
+#CONFIG_ELOOP=eloop
+
+# Select layer 2 packet implementation
+# linux = Linux packet socket (default)
+# pcap = libpcap/libdnet/WinPcap
+# freebsd = FreeBSD libpcap
+# winpcap = WinPcap with receive thread
+# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
+# none = Empty template
+#CONFIG_L2_PACKET=linux
+
+# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
+CONFIG_PEERKEY=y
+
+# IEEE 802.11w (management frame protection)
+# This version is an experimental implementation based on IEEE 802.11w/D1.0
+# draft and is subject to change since the standard has not yet been finalized.
+# Driver support is also needed for IEEE 802.11w.
+CONFIG_IEEE80211W=y
+
+# Select TLS implementation
+# openssl = OpenSSL (default)
+# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
+# internal = Internal TLSv1 implementation (experimental)
+# none = Empty template
+CONFIG_TLS=internal
+
+# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
+# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
+# even though the core GnuTLS library is released under LGPL, this extra
+# library uses GPL and as such, the terms of GPL apply to the combination
+# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
+# apply for distribution of the resulting binary.
+#CONFIG_GNUTLS_EXTRA=y
+
+# If CONFIG_TLS=internal is used, additional library and include paths are
+# needed for LibTomMath. Alternatively, an integrated, minimal version of
+# LibTomMath can be used. See beginning of libtommath.c for details on benefits
+# and drawbacks of this option.
+CONFIG_INTERNAL_LIBTOMMATH=y
+#ifndef CONFIG_INTERNAL_LIBTOMMATH
+#LTM_PATH=/usr/src/libtommath-0.39
+#CFLAGS += -I$(LTM_PATH)
+#LIBS += -L$(LTM_PATH)
+#LIBS_p += -L$(LTM_PATH)
+#endif
+# At the cost of about 4 kB of additional binary size, the internal LibTomMath
+# can be configured to include faster routines for exptmod, sqr, and div to
+# speed up DH and RSA calculation considerably
+CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+
+# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
+# This is only for Windows builds and requires WMI-related header files and
+# WbemUuid.Lib from Platform SDK even when building with MinGW.
+#CONFIG_NDIS_EVENTS_INTEGRATED=y
+#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
+
+# Add support for old DBus control interface
+# (fi.epitest.hostap.WPASupplicant)
+#CONFIG_CTRL_IFACE_DBUS=y
+
+# Add support for new DBus control interface
+# (fi.w1.hostap.wpa_supplicant1)
+#CONFIG_CTRL_IFACE_DBUS_NEW=y
+
+# Add introspection support for new DBus control interface
+#CONFIG_CTRL_IFACE_DBUS_INTRO=y
+
+# Add support for loading EAP methods dynamically as shared libraries.
+# When this option is enabled, each EAP method can be either included
+# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
+# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
+# be loaded in the beginning of the wpa_supplicant configuration file
+# (see load_dynamic_eap parameter in the example file) before being used in
+# the network blocks.
+#
+# Note that some shared parts of EAP methods are included in the main program
+# and in order to be able to use dynamic EAP methods using these parts, the
+# main program must have been build with the EAP method enabled (=y or =dyn).
+# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
+# unless at least one of them was included in the main build to force inclusion
+# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
+# in the main build to be able to load these methods dynamically.
+#
+# Please also note that using dynamic libraries will increase the total binary
+# size. Thus, it may not be the best option for targets that have limited
+# amount of memory/flash.
+#CONFIG_DYNAMIC_EAP_METHODS=y
+
+# IEEE Std 802.11r-2008 (Fast BSS Transition)
+#CONFIG_IEEE80211R=y
+
+# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
+#CONFIG_DEBUG_FILE=y
+
+# Enable privilege separation (see README 'Privilege separation' for details)
+#CONFIG_PRIVSEP=y
+
+# Enable mitigation against certain attacks against TKIP by delaying Michael
+# MIC error reports by a random amount of time between 0 and 60 seconds
+#CONFIG_DELAYED_MIC_ERROR_REPORT=y
+
+# Enable tracing code for developer debugging
+# This tracks use of memory allocations and other registrations and reports
+# incorrect use with a backtrace of call (or allocation) location.
+#CONFIG_WPA_TRACE=y
+# For BSD, comment out these.
+#LIBS += -lexecinfo
+#LIBS_p += -lexecinfo
+#LIBS_c += -lexecinfo
+
+# Use libbfd to get more details for developer debugging
+# This enables use of libbfd to get more detailed symbols for the backtraces
+# generated by CONFIG_WPA_TRACE=y.
+#CONFIG_WPA_TRACE_BFD=y
+# For BSD, comment out these.
+#LIBS += -lbfd -liberty -lz
+#LIBS_p += -lbfd -liberty -lz
+#LIBS_c += -lbfd -liberty -lz
+
+CONFIG_NO_RANDOM_POOL=y
+NEED_80211_COMMON=y
+
+CONFIG_IBSS_RSN=y
+
+CONFIG_P2P=y
+CONFIG_AP=y
diff --git a/trunk/package/network/services/hostapd/files/wpa_supplicant.sh b/trunk/package/network/services/hostapd/files/wpa_supplicant.sh
new file mode 100644
index 00000000..b6784843
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/wpa_supplicant.sh
@@ -0,0 +1,194 @@
+wpa_supplicant_setup_vif() {
+	local vif="$1"
+	local driver="$2"
+	local key="$key"
+	local options="$3"
+	local freq=""
+	local ht="$5"
+	local ap_scan=""
+	local scan_ssid="1"
+	[ -n "$4" ] && freq="frequency=$4"
+
+	config_get enc "$vif" encryption
+	config_get key "$vif" key
+
+	local net_cfg bridge
+	config_get bridge "$vif" bridge
+	[ -z "$bridge" ] && {
+		net_cfg="$(find_net_config "$vif")"
+		[ -z "$net_cfg" ] || bridge="$(bridge_interface "$net_cfg")"
+		config_set "$vif" bridge "$bridge"
+	}
+
+	local mode ifname wds modestr=""
+	config_get mode "$vif" mode
+	config_get ifname "$vif" ifname
+	config_get_bool wds "$vif" wds 0
+	[ -z "$bridge" ] || [ "$mode" = ap ] || [ "$mode" = sta -a $wds -eq 1 ] || {
+		echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
+		return 1
+	}
+	[ "$mode" = "adhoc" ] && {
+		modestr="mode=1"
+		scan_ssid="0"
+		ap_scan="ap_scan=2"
+	}
+
+	key_mgmt='NONE'
+	case "$enc" in
+		*none*) ;;
+		*wep*)
+			config_get key "$vif" key
+			key="${key:-1}"
+			case "$key" in
+				[1234])
+					for idx in 1 2 3 4; do
+						local zidx
+						zidx=$(($idx - 1))
+						config_get ckey "$vif" "key${idx}"
+						[ -n "$ckey" ] && \
+							append "wep_key${zidx}" "wep_key${zidx}=$(prepare_key_wep "$ckey")"
+					done
+					wep_tx_keyidx="wep_tx_keyidx=$((key - 1))"
+				;;
+				*)
+					wep_key0="wep_key0=$(prepare_key_wep "$key")"
+					wep_tx_keyidx="wep_tx_keyidx=0"
+				;;
+			esac
+		;;
+		*psk*)
+			key_mgmt='WPA-PSK'
+			# if you want to use PSK with a non-nl80211 driver you
+			# have to use WPA-NONE and wext driver for wpa_s
+			[ "$mode" = "adhoc" -a "$driver" != "nl80211" ] && {
+				key_mgmt='WPA-NONE'
+				driver='wext'
+			}
+			if [ ${#key} -eq 64 ]; then
+				passphrase="psk=${key}"
+			else
+				passphrase="psk=\"${key}\""
+			fi
+			case "$enc" in
+				*psk2*)
+					proto='proto=RSN'
+					config_get ieee80211w "$vif" ieee80211w
+				;;
+				*psk*)
+					proto='proto=WPA'
+				;;
+			esac
+		;;
+		*wpa*|*8021x*)
+			proto='proto=WPA2'
+			key_mgmt='WPA-EAP'
+			config_get ieee80211w "$vif" ieee80211w
+			config_get ca_cert "$vif" ca_cert
+			config_get eap_type "$vif" eap_type
+			ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
+			case "$eap_type" in
+				tls)
+					pairwise='pairwise=CCMP'
+					group='group=CCMP'
+					config_get identity "$vif" identity
+					config_get client_cert "$vif" client_cert
+					config_get priv_key "$vif" priv_key
+					config_get priv_key_pwd "$vif" priv_key_pwd
+					identity="identity=\"$identity\""
+					client_cert="client_cert=\"$client_cert\""
+					priv_key="private_key=\"$priv_key\""
+					priv_key_pwd="private_key_passwd=\"$priv_key_pwd\""
+				;;
+				peap|ttls)
+					config_get auth "$vif" auth
+					config_get identity "$vif" identity
+					config_get password "$vif" password
+					phase2="phase2=\"auth=${auth:-MSCHAPV2}\""
+					identity="identity=\"$identity\""
+					password="${password:+password=\"$password\"}"
+				;;
+			esac
+			eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
+		;;
+	esac
+
+	case "$ieee80211w" in
+		[012])
+			ieee80211w="ieee80211w=$ieee80211w"
+		;;
+	esac
+
+	local fixed_freq bssid1 beacon_int brates mrate
+	config_get ifname "$vif" ifname
+	config_get bridge "$vif" bridge
+	config_get ssid "$vif" ssid
+	config_get bssid "$vif" bssid
+	bssid1=${bssid:+"bssid=$bssid"}
+	beacon_int=${beacon_int:+"beacon_int=$beacon_int"}
+
+	local br brval brsub brstr
+	[ -n "$basic_rate_list" ] && {
+		for br in $basic_rate_list; do
+			brval="$(($br / 1000))"
+			brsub="$((($br / 100) % 10))"
+			[ "$brsub" -gt 0 ] && brval="$brval.$brsub"
+			[ -n "$brstr" ] && brstr="$brstr,"
+			brstr="$brstr$brval"
+		done
+		brates=${basic_rate_list:+"rates=$brstr"}
+	}
+
+	local mcval=""
+	[ -n "$mcast_rate" ] && {
+		mcval="$(($mcast_rate / 1000))"
+		mcsub="$(( ($mcast_rate / 100) % 10 ))"
+		[ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
+		mrate=${mcast_rate:+"mcast_rate=$mcval"}
+	}
+
+	local ht_str
+	[ -n "$ht" ] && ht_str="htmode=$ht"
+
+	rm -rf /var/run/wpa_supplicant-$ifname
+	cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
+ctrl_interface=/var/run/wpa_supplicant-$ifname
+$ap_scan
+network={
+	$modestr
+	scan_ssid=$scan_ssid
+	ssid="$ssid"
+	$bssid1
+	key_mgmt=$key_mgmt
+	$proto
+	$freq
+	${fixed:+"fixed_freq=1"}
+	$beacon_int
+	$brates
+	$mrate
+	$ht_str
+	$ieee80211w
+	$passphrase
+	$pairwise
+	$group
+	$eap_type
+	$ca_cert
+	$client_cert
+	$priv_key
+	$priv_key_pwd
+	$phase2
+	$identity
+	$password
+	$wep_key0
+	$wep_key1
+	$wep_key2
+	$wep_key3
+	$wep_tx_keyidx
+}
+EOF
+	if [ -n "$proto" -o "$key_mgmt" = "NONE" ]; then
+		wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options
+	else
+		return 0
+	fi
+}
diff --git a/trunk/package/network/services/hostapd/files/wps-hotplug.sh b/trunk/package/network/services/hostapd/files/wps-hotplug.sh
new file mode 100644
index 00000000..058264a8
--- /dev/null
+++ b/trunk/package/network/services/hostapd/files/wps-hotplug.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$ACTION" = "pressed" -a "$BUTTON" = "wps" ]; then
+	for dir in /var/run/hostapd*; do
+		[ -d "$dir" ] || continue
+		hostapd_cli -p "$dir" wps_pbc
+	done
+fi
diff --git a/trunk/package/network/services/hostapd/madwifi/include/compat.h b/trunk/package/network/services/hostapd/madwifi/include/compat.h
new file mode 100644
index 00000000..09e63974
--- /dev/null
+++ b/trunk/package/network/services/hostapd/madwifi/include/compat.h
@@ -0,0 +1,209 @@
+/*-
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * $Id: compat.h 3310 2008-01-30 20:23:49Z mentor $
+ */
+#ifndef _ATH_COMPAT_H_
+#define _ATH_COMPAT_H_
+
+/* Compatibility with older Linux kernels */
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/time.h>
+#include <linux/netdevice.h>
+#endif
+
+#if !defined(__KERNEL__) || !defined (__bitwise)
+#define __le16 u_int16_t
+#define __le32 u_int32_t
+#define __le64 u_int64_t
+#define __be16 u_int16_t
+#define __be32 u_int32_t
+#define __be64 u_int64_t
+#define __force
+#endif
+
+#ifndef container_of
+#define container_of(ptr, type, member) ({				\
+	    const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+	    (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
+
+#ifndef list_for_each_entry_reverse
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
+	     prefetch(pos->member.prev), &pos->member != (head); 	\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+#endif
+
+#ifndef NETDEV_TX_OK
+#define NETDEV_TX_OK    0
+#define NETDEV_TX_BUSY  1
+#endif
+
+/*
+ * BSD/Linux compatibility shims.  These are used mainly to
+ * minimize differences when importing necesary BSD code.
+ */
+#define	NBBY	8			/* number of bits/byte */
+
+/* roundup() appears in Linux 2.6.18 */
+#include <linux/kernel.h>
+#ifndef roundup
+#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
+#endif
+
+#define	howmany(x, y)	(((x)+((y)-1))/(y))
+
+/* Bit map related macros. */
+#define	setbit(a,i)	((a)[(i)/NBBY] |= 1<<((i)%NBBY))
+#define	clrbit(a,i)	((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
+#define	isset(a,i)	((a)[(i)/NBBY] & (1<<((i)%NBBY)))
+#define	isclr(a,i)	(((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
+
+#ifndef __packed
+#define	__packed	__attribute__((__packed__))
+#endif
+
+#define	__offsetof(t,m)	offsetof(t,m)
+
+#ifndef ALIGNED_POINTER
+/*
+ * ALIGNED_POINTER is a boolean macro that checks whether an address
+ * is valid to fetch data elements of type t from on this architecture.
+ * This does not reflect the optimal alignment, just the possibility
+ * (within reasonable limits). 
+ *
+ */
+#define ALIGNED_POINTER(p,t)	1
+#endif
+
+#ifdef __KERNEL__
+#define	KASSERT(exp, msg) do {			\
+	if (unlikely(!(exp))) {			\
+		printk msg;			\
+		BUG();				\
+	}					\
+} while (0)
+#endif /* __KERNEL__ */
+
+/*
+ * NetBSD/FreeBSD defines for file version.
+ */
+#define	__FBSDID(_s)
+#define	__KERNEL_RCSID(_n,_s)
+
+/*
+ * Fixes for Linux API changes
+ */
+#ifdef __KERNEL__
+
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+#define AUTOCONF_INCLUDED 1
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
+#define ATH_REGISTER_SYSCTL_TABLE(t) register_sysctl_table(t, 1)
+#else
+#define ATH_REGISTER_SYSCTL_TABLE(t) register_sysctl_table(t)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
+#define __user
+#define __kernel
+#define __iomem
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+typedef int gfp_t;
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+static inline int timeval_compare(struct timeval *lhs, struct timeval *rhs)
+{
+	if (lhs->tv_sec < rhs->tv_sec)
+		return -1;
+	if (lhs->tv_sec > rhs->tv_sec)
+		return 1;
+	return lhs->tv_usec - rhs->tv_usec;
+}
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#define IRQF_SHARED SA_SHIRQ
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27)
+#define netdev_priv(_netdev) ((_netdev)->priv)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+#define skb_end_pointer(_skb) ((_skb)->end)
+#define skb_tail_pointer(_skb) ((_skb)->tail)
+#define skb_set_network_header(_skb, _offset) \
+	do { (_skb)->nh.raw = (_skb)->data + (_offset); } while(0)
+#define skb_reset_network_header(_skb) \
+	do { (_skb)->nh.raw = (_skb)->data; } while(0)
+#define skb_mac_header(_skb) ((_skb)->mac.raw)
+#define skb_reset_mac_header(_skb) \
+	do { (_skb)->mac.raw = (_skb)->data; } while(0)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+#define CTL_AUTO -2
+#define DEV_ATH 9
+#else
+#define CTL_AUTO CTL_UNNUMBERED
+#define DEV_ATH CTL_UNNUMBERED
+#endif
+
+/* __skb_append got a third parameter in 2.6.14 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+#define __skb_queue_after(_list, _old, _new)	__skb_append(_old, _new)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+#define __skb_queue_after(_list, _old, _new)	__skb_append(_old, _new, _list)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+#define CTLNAME(x)	.ctl_name	= x,
+#else
+#define CTLNAME(x)
+#endif
+
+#endif /* __KERNEL__ */
+
+#endif /* _ATH_COMPAT_H_ */
diff --git a/trunk/package/network/services/hostapd/madwifi/net80211/_ieee80211.h b/trunk/package/network/services/hostapd/madwifi/net80211/_ieee80211.h
new file mode 100644
index 00000000..2d2a06f2
--- /dev/null
+++ b/trunk/package/network/services/hostapd/madwifi/net80211/_ieee80211.h
@@ -0,0 +1,325 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: _ieee80211.h 3207 2008-01-18 21:25:05Z mtaylor $
+ */
+#ifndef _NET80211__IEEE80211_H_
+#define _NET80211__IEEE80211_H_
+
+enum ieee80211_phytype {
+	IEEE80211_T_DS,			/* direct sequence spread spectrum */
+	IEEE80211_T_FH,			/* frequency hopping */
+	IEEE80211_T_OFDM,		/* frequency division multiplexing */
+	IEEE80211_T_TURBO,		/* high rate OFDM, aka turbo mode */
+};
+#define	IEEE80211_T_CCK	IEEE80211_T_DS	/* more common nomenclature */
+
+/* XXX: not really a mode; there are really multiple PHYs */
+enum ieee80211_phymode {
+	IEEE80211_MODE_AUTO	= 0,	/* autoselect */
+	IEEE80211_MODE_11A	= 1,	/* 5GHz, OFDM */
+	IEEE80211_MODE_11B	= 2,	/* 2GHz, CCK */
+	IEEE80211_MODE_11G	= 3,	/* 2GHz, OFDM */
+	IEEE80211_MODE_FH	= 4,	/* 2GHz, GFSK */
+	IEEE80211_MODE_TURBO_A	= 5,	/* 5GHz, OFDM, 2x clock dynamic turbo */
+	IEEE80211_MODE_TURBO_G	= 6,	/* 2GHz, OFDM, 2x clock  dynamic turbo*/
+};
+#define	IEEE80211_MODE_MAX	(IEEE80211_MODE_TURBO_G+1)
+
+enum ieee80211_opmode {
+	IEEE80211_M_STA		= 1,	/* infrastructure station */
+	IEEE80211_M_IBSS 	= 0,	/* IBSS (adhoc) station */
+	IEEE80211_M_AHDEMO	= 3,	/* Old lucent compatible adhoc demo */
+	IEEE80211_M_HOSTAP	= 6,	/* Software Access Point */
+	IEEE80211_M_MONITOR	= 8,	/* Monitor mode */
+	IEEE80211_M_WDS		= 2	/* WDS link */
+};
+
+/*
+ * True if this mode will send beacon on a regular interval, like AP
+ * or IBSS
+ */
+#define IEEE80211_IS_MODE_BEACON(_opmode) \
+	((_opmode == IEEE80211_M_IBSS) || \
+	 (_opmode == IEEE80211_M_HOSTAP))
+
+/*
+ * True if this mode must behave like a DFS master, ie do Channel
+ * Check Availability and In Service Monitoring. We need to make sure
+ * that all modes cannot send data without being authorized. Such
+ * enforcement is not done in monitor mode however.
+ */
+
+#define IEEE80211_IS_MODE_DFS_MASTER(_opmode) \
+	((_opmode == IEEE80211_M_IBSS) || \
+	 (_opmode == IEEE80211_M_AHDEMO) || \
+	 (_opmode == IEEE80211_M_HOSTAP) || \
+	 (_opmode == IEEE80211_M_WDS))
+
+/*
+ * 802.11g protection mode.
+ */
+enum ieee80211_protmode {
+	IEEE80211_PROT_NONE	= 0,	/* no protection */
+	IEEE80211_PROT_CTSONLY	= 1,	/* CTS to self */
+	IEEE80211_PROT_RTSCTS	= 2,	/* RTS-CTS */
+};
+
+/*
+ * Authentication mode.
+ */
+enum ieee80211_authmode {
+	IEEE80211_AUTH_NONE	= 0,
+	IEEE80211_AUTH_OPEN	= 1,	/* open */
+	IEEE80211_AUTH_SHARED	= 2,	/* shared-key */
+	IEEE80211_AUTH_8021X	= 3,	/* 802.1x */
+	IEEE80211_AUTH_AUTO	= 4,	/* auto-select/accept */
+	/* NB: these are used only for ioctls */
+	IEEE80211_AUTH_WPA	= 5,	/* WPA/RSN w/ 802.1x/PSK */
+};
+
+/*
+ * Roaming mode is effectively who controls the operation
+ * of the 802.11 state machine when operating as a station.
+ * State transitions are controlled either by the driver
+ * (typically when management frames are processed by the
+ * hardware/firmware), the host (auto/normal operation of
+ * the 802.11 layer), or explicitly through ioctl requests
+ * when applications like wpa_supplicant want control.
+ */
+enum ieee80211_roamingmode {
+	IEEE80211_ROAMING_DEVICE= 0,	/* driver/hardware control */
+	IEEE80211_ROAMING_AUTO	= 1,	/* 802.11 layer control */
+	IEEE80211_ROAMING_MANUAL= 2,	/* application control */
+};
+
+/*
+ * Scanning mode controls station scanning work; this is
+ * used only when roaming mode permits the host to select
+ * the bss to join/channel to use.
+ */
+enum ieee80211_scanmode {
+	IEEE80211_SCAN_DEVICE	= 0,	/* driver/hardware control */
+	IEEE80211_SCAN_BEST	= 1,	/* 802.11 layer selects best */
+	IEEE80211_SCAN_FIRST	= 2,	/* take first suitable candidate */
+};
+
+enum ieee80211_scanflags {
+	IEEE80211_NOSCAN_DEFAULT = (1 << 0),
+	IEEE80211_NOSCAN_SET     = (1 << 1),
+};
+
+/*
+ * Channels are specified by frequency and attributes.
+ */
+struct ieee80211_channel {
+	u_int16_t ic_freq;	/* setting in MHz */
+	u_int16_t ic_flags;	/* see below */
+	u_int8_t ic_ieee;	/* IEEE channel number */
+	int8_t ic_maxregpower;	/* maximum regulatory tx power in dBm */
+	int8_t ic_maxpower;	/* maximum tx power in dBm */
+	int8_t ic_minpower;	/* minimum tx power in dBm */
+	u_int8_t ic_scanflags;
+	u_int8_t ic_idletime; /* phy idle time in % */
+};
+
+#define	IEEE80211_CHAN_MAX	255
+#define	IEEE80211_CHAN_BYTES	32	/* howmany(IEEE80211_CHAN_MAX, NBBY) */
+#define	IEEE80211_CHAN_ANY	0xffff	/* token for ``any channel'' */
+#define	IEEE80211_CHAN_ANYC 	((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
+
+#define	IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT	0
+#define IEEE80211_DEFAULT_CHANCHANGE_TBTT_COUNT	3
+
+#define	IEEE80211_RADAR_TEST_MUTE_CHAN	36	/* Move to channel 36 for mute test */
+
+/* bits 0-3 are for private use by drivers */
+/* channel attributes */
+#define	IEEE80211_CHAN_TURBO	0x0010	/* Turbo channel */
+#define	IEEE80211_CHAN_CCK	0x0020	/* CCK channel */
+#define	IEEE80211_CHAN_OFDM	0x0040	/* OFDM channel */
+#define	IEEE80211_CHAN_2GHZ	0x0080	/* 2 GHz spectrum channel. */
+#define	IEEE80211_CHAN_5GHZ	0x0100	/* 5 GHz spectrum channel */
+#define	IEEE80211_CHAN_PASSIVE	0x0200	/* Only passive scan allowed */
+#define	IEEE80211_CHAN_DYN	0x0400	/* Dynamic CCK-OFDM channel */
+#define	IEEE80211_CHAN_GFSK	0x0800	/* GFSK channel (FHSS PHY) */
+#define IEEE80211_CHAN_RADAR	0x1000	/* Radar found on channel */
+#define	IEEE80211_CHAN_STURBO	0x2000	/* 11a static turbo channel only */
+#define	IEEE80211_CHAN_HALF	0x4000	/* Half rate channel */
+#define	IEEE80211_CHAN_QUARTER	0x8000	/* Quarter rate channel */
+
+/*
+ * Useful combinations of channel characteristics.
+ */
+#define	IEEE80211_CHAN_FHSS \
+	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
+#define	IEEE80211_CHAN_A \
+	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM)
+#define	IEEE80211_CHAN_B \
+	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)
+#define	IEEE80211_CHAN_PUREG \
+	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM)
+#define	IEEE80211_CHAN_G \
+	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
+#define IEEE80211_CHAN_108A \
+	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
+#define	IEEE80211_CHAN_108G \
+	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
+#define	IEEE80211_CHAN_ST \
+	(IEEE80211_CHAN_108A | IEEE80211_CHAN_STURBO)
+
+#define	IEEE80211_CHAN_ALL \
+	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_GFSK | \
+	 IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN)
+#define	IEEE80211_CHAN_ALLTURBO \
+	(IEEE80211_CHAN_ALL | IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)
+
+#define	IEEE80211_IS_CHAN_FHSS(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS)
+#define	IEEE80211_IS_CHAN_A(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)
+#define	IEEE80211_IS_CHAN_B(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)
+#define	IEEE80211_IS_CHAN_PUREG(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG)
+#define	IEEE80211_IS_CHAN_G(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)
+#define	IEEE80211_IS_CHAN_ANYG(_c) \
+	(IEEE80211_IS_CHAN_PUREG(_c) || IEEE80211_IS_CHAN_G(_c))
+#define	IEEE80211_IS_CHAN_ST(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST)
+#define	IEEE80211_IS_CHAN_108A(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_108A) == IEEE80211_CHAN_108A)
+#define	IEEE80211_IS_CHAN_108G(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_108G) == IEEE80211_CHAN_108G)
+
+#define	IEEE80211_IS_CHAN_2GHZ(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_2GHZ) != 0)
+#define	IEEE80211_IS_CHAN_5GHZ(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_5GHZ) != 0)
+#define	IEEE80211_IS_CHAN_OFDM(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_OFDM) != 0)
+#define	IEEE80211_IS_CHAN_CCK(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_CCK) != 0)
+#define	IEEE80211_IS_CHAN_GFSK(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_GFSK) != 0)
+#define	IEEE80211_IS_CHAN_TURBO(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_TURBO) != 0)
+#define	IEEE80211_IS_CHAN_STURBO(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_STURBO) != 0)
+#define	IEEE80211_IS_CHAN_DTURBO(_c) \
+	(((_c)->ic_flags & \
+	(IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)) == IEEE80211_CHAN_TURBO)
+#define	IEEE80211_IS_CHAN_HALF(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_HALF) != 0)
+#define	IEEE80211_IS_CHAN_QUARTER(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_QUARTER) != 0)
+
+#define	IEEE80211_IS_CHAN_RADAR(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_RADAR) != 0)
+#define	IEEE80211_IS_CHAN_PASSIVE(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0)
+#define	IEEE80211_ARE_CHANS_SAME_MODE(_a, _b) \
+	(((_a)->ic_flags & IEEE80211_CHAN_ALLTURBO) == ((_b)->ic_flags & IEEE80211_CHAN_ALLTURBO))
+
+/* ni_chan encoding for FH phy */
+#define	IEEE80211_FH_CHANMOD		80
+#define	IEEE80211_FH_CHAN(set,pat)	(((set) - 1) * IEEE80211_FH_CHANMOD + (pat))
+#define	IEEE80211_FH_CHANSET(chan)	((chan) / IEEE80211_FH_CHANMOD + 1)
+#define	IEEE80211_FH_CHANPAT(chan)	((chan) % IEEE80211_FH_CHANMOD)
+
+/*
+ * Spectrum Management (IEEE 802.11h-2003)
+ */
+
+/* algorithm for (re)association based on supported channels
+ * (the one mentioned in 11.6.1 as out of scope of .11h) */
+enum ieee80211_sc_algorithm {
+	IEEE80211_SC_NONE,
+	/*
+	 * Do not disallow anyone from associating. When needed, channel will
+	 * be switched to the most suitable channel, no matter client stations
+	 * support it or not.
+	 */
+
+	IEEE80211_SC_LOOSE,
+	/*
+	 * Do not disallow anyone from associating. When needed, channel will
+	 * be switched to a suitable channel, which will be chosen taking
+	 * ni->ni_suppchans and ic->ic_sc_sldg under consideration.
+	 */
+
+	IEEE80211_SC_TIGHT,
+	/*
+	 * Allow to associate if there are at least ic->ic_mincom channels
+	 * common to the associating station and all of the already associated
+	 * stations. If the number of new common channels is less than
+	 * required, consider disassociating some other STAs. Such a
+	 * disassociation will be performed if (and only if) the association we
+	 * are currently considering would be then possible and the count of
+	 * the resultant set of common channels (ic_chan_nodes[i] ==
+	 * ic_cn_total) would increase by some amount. Whether the number of
+	 * the new channels that could be gained is enough to sacrifice a
+	 * number of STAs is determined by the ic->ic_slcg parameter.
+	 */
+
+	IEEE80211_SC_STRICT
+	/*
+	 * Basically the same behavior as IEEE80211_SC_TIGHT, except that if a
+	 * station does not specify Supported Channels, then it is denied to
+	 * associate.
+	 */
+};
+
+/*
+ * 802.11 rate set.
+ */
+#define	IEEE80211_RATE_SIZE	8		/* 802.11 standard */
+#define	IEEE80211_RATE_MAXSIZE	15		/* max rates we'll handle */
+#define	IEEE80211_SANITISE_RATESIZE(_rsz) \
+	((_rsz > IEEE80211_RATE_MAXSIZE) ? IEEE80211_RATE_MAXSIZE : _rsz)
+
+struct ieee80211_rateset {
+	u_int8_t rs_nrates;
+	u_int8_t rs_rates[IEEE80211_RATE_MAXSIZE];
+};
+
+struct ieee80211_roam {
+	int8_t rssi11a;		/* rssi thresh for 11a bss */
+	int8_t rssi11b;		/* for 11g sta in 11b bss */
+	int8_t rssi11bOnly;	/* for 11b sta */
+	u_int8_t pad1;
+	u_int8_t rate11a;	/* rate thresh for 11a bss */
+	u_int8_t rate11b;	/* for 11g sta in 11b bss */
+	u_int8_t rate11bOnly;	/* for 11b sta */
+	u_int8_t pad2;
+};
+#endif /* _NET80211__IEEE80211_H_ */
diff --git a/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211.h b/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211.h
new file mode 100644
index 00000000..a39d4b92
--- /dev/null
+++ b/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211.h
@@ -0,0 +1,997 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: ieee80211.h 3268 2008-01-26 20:48:11Z mtaylor $
+ */
+#ifndef _NET80211_IEEE80211_H_
+#define _NET80211_IEEE80211_H_
+
+/*
+ * 802.11 protocol definitions.
+ */
+
+#define	IEEE80211_ADDR_LEN		6		/* size of 802.11 address */
+/* is 802.11 address multicast/broadcast? */
+#define	IEEE80211_IS_MULTICAST(_a)	(*(_a) & 0x01)
+
+/* IEEE 802.11 PLCP header */
+struct ieee80211_plcp_hdr {
+	u_int16_t i_sfd;
+	u_int8_t i_signal;
+	u_int8_t i_service;
+	u_int16_t i_length;
+	u_int16_t i_crc;
+} __packed;
+
+#define IEEE80211_PLCP_SFD      0xF3A0
+#define IEEE80211_PLCP_SERVICE  0x00
+
+/*
+ * generic definitions for IEEE 802.11 frames
+ */
+struct ieee80211_frame {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_addr1[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr2[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr3[IEEE80211_ADDR_LEN];
+	u_int8_t i_seq[2];
+	/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
+	/* see below */
+} __packed;
+
+struct ieee80211_qosframe {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_addr1[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr2[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr3[IEEE80211_ADDR_LEN];
+	u_int8_t i_seq[2];
+	u_int8_t i_qos[2];
+	/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
+	/* see below */
+} __packed;
+
+struct ieee80211_qoscntl {
+	u_int8_t i_qos[2];
+};
+
+struct ieee80211_frame_addr4 {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_addr1[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr2[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr3[IEEE80211_ADDR_LEN];
+	u_int8_t i_seq[2];
+	u_int8_t i_addr4[IEEE80211_ADDR_LEN];
+} __packed;
+
+
+struct ieee80211_qosframe_addr4 {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_addr1[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr2[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr3[IEEE80211_ADDR_LEN];
+	u_int8_t i_seq[2];
+	u_int8_t i_addr4[IEEE80211_ADDR_LEN];
+	u_int8_t i_qos[2];
+} __packed;
+
+struct ieee80211_ctlframe_addr2 {
+	u_int8_t i_fc[2];
+	__le16 i_aidordur; /* AID or duration */
+	u_int8_t i_addr1[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr2[IEEE80211_ADDR_LEN];
+} __packed;
+
+#define	IEEE80211_FC0_VERSION_MASK		0x03
+#define	IEEE80211_FC0_VERSION_SHIFT		0
+#define	IEEE80211_FC0_VERSION_0			0x00
+#define	IEEE80211_FC0_TYPE_MASK			0x0c
+#define	IEEE80211_FC0_TYPE_SHIFT		2
+#define	IEEE80211_FC0_TYPE_MGT			0x00
+#define	IEEE80211_FC0_TYPE_CTL			0x04
+#define	IEEE80211_FC0_TYPE_DATA			0x08
+
+#define	IEEE80211_FC0_SUBTYPE_MASK		0xf0
+#define	IEEE80211_FC0_SUBTYPE_SHIFT		4
+/* for TYPE_MGT */
+#define	IEEE80211_FC0_SUBTYPE_ASSOC_REQ		0x00
+#define	IEEE80211_FC0_SUBTYPE_ASSOC_RESP	0x10
+#define	IEEE80211_FC0_SUBTYPE_REASSOC_REQ	0x20
+#define	IEEE80211_FC0_SUBTYPE_REASSOC_RESP	0x30
+#define	IEEE80211_FC0_SUBTYPE_PROBE_REQ		0x40
+#define	IEEE80211_FC0_SUBTYPE_PROBE_RESP	0x50
+#define	IEEE80211_FC0_SUBTYPE_BEACON		0x80
+#define	IEEE80211_FC0_SUBTYPE_ATIM		0x90
+#define	IEEE80211_FC0_SUBTYPE_DISASSOC		0xa0
+#define	IEEE80211_FC0_SUBTYPE_AUTH		0xb0
+#define	IEEE80211_FC0_SUBTYPE_DEAUTH		0xc0
+#define IEEE80211_FC0_SUBTYPE_ACTION		0xd0
+/* for TYPE_CTL */
+#define	IEEE80211_FC0_SUBTYPE_PS_POLL		0xa0
+#define	IEEE80211_FC0_SUBTYPE_RTS		0xb0
+#define	IEEE80211_FC0_SUBTYPE_CTS		0xc0
+#define	IEEE80211_FC0_SUBTYPE_ACK		0xd0
+#define	IEEE80211_FC0_SUBTYPE_CF_END		0xe0
+#define	IEEE80211_FC0_SUBTYPE_CF_END_ACK	0xf0
+/* for TYPE_DATA (bit combination) */
+#define	IEEE80211_FC0_SUBTYPE_DATA		0x00
+#define	IEEE80211_FC0_SUBTYPE_CF_ACK		0x10
+#define	IEEE80211_FC0_SUBTYPE_CF_POLL		0x20
+#define	IEEE80211_FC0_SUBTYPE_CF_ACPL		0x30
+#define	IEEE80211_FC0_SUBTYPE_NODATA		0x40
+#define	IEEE80211_FC0_SUBTYPE_CFACK		0x50
+#define	IEEE80211_FC0_SUBTYPE_CFPOLL		0x60
+#define	IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK	0x70
+#define	IEEE80211_FC0_SUBTYPE_QOS		0x80
+#define	IEEE80211_FC0_SUBTYPE_QOS_NULL		0xc0
+
+#define	IEEE80211_FC1_DIR_MASK			0x03
+#define	IEEE80211_FC1_DIR_NODS			0x00	/* STA->STA */
+#define	IEEE80211_FC1_DIR_TODS			0x01	/* STA->AP  */
+#define	IEEE80211_FC1_DIR_FROMDS		0x02	/* AP ->STA */
+#define	IEEE80211_FC1_DIR_DSTODS		0x03	/* AP ->AP  */
+
+#define	IEEE80211_FC1_MORE_FRAG			0x04
+#define	IEEE80211_FC1_RETRY			0x08
+#define	IEEE80211_FC1_PWR_MGT			0x10
+#define	IEEE80211_FC1_MORE_DATA			0x20
+#define	IEEE80211_FC1_PROT			0x40
+#define	IEEE80211_FC1_ORDER			0x80
+
+#define	IEEE80211_SEQ_FRAG_MASK			0x000f
+#define	IEEE80211_SEQ_FRAG_SHIFT		0
+#define	IEEE80211_SEQ_SEQ_MASK			0xfff0
+#define	IEEE80211_SEQ_SEQ_SHIFT			4
+
+#define	IEEE80211_NWID_LEN			32
+
+#define	IEEE80211_QOS_TXOP			0x00ff
+/* bit 8 is reserved */
+#define	IEEE80211_QOS_ACKPOLICY			0x60
+#define	IEEE80211_QOS_ACKPOLICY_S		5
+#define	IEEE80211_QOS_EOSP			0x10
+#define	IEEE80211_QOS_EOSP_S			4
+#define	IEEE80211_QOS_TID			0x0f
+
+#define IEEE80211_FRM_HAS_BODY(_wh)			\
+	(((_wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) !=	\
+			IEEE80211_FC0_TYPE_CTL)
+
+/*
+ * Country/Region Codes from MS WINNLS.H
+ * Numbering from ISO 3166
+ * XXX belongs elsewhere
+ */
+enum CountryCode {
+	CTRY_ALBANIA              = 8,       /* Albania */
+	CTRY_ALGERIA              = 12,      /* Algeria */
+	CTRY_ARGENTINA            = 32,      /* Argentina */
+	CTRY_ARMENIA              = 51,      /* Armenia */
+	CTRY_AUSTRALIA            = 36,      /* Australia */
+	CTRY_AUSTRIA              = 40,      /* Austria */
+	CTRY_AZERBAIJAN           = 31,      /* Azerbaijan */
+	CTRY_BAHRAIN              = 48,      /* Bahrain */
+	CTRY_BELARUS              = 112,     /* Belarus */
+	CTRY_BELGIUM              = 56,      /* Belgium */
+	CTRY_BELIZE               = 84,      /* Belize */
+	CTRY_BOLIVIA              = 68,      /* Bolivia */
+	CTRY_BRAZIL               = 76,      /* Brazil */
+	CTRY_BRUNEI_DARUSSALAM    = 96,      /* Brunei Darussalam */
+	CTRY_BULGARIA             = 100,     /* Bulgaria */
+	CTRY_CANADA               = 124,     /* Canada */
+	CTRY_CHILE                = 152,     /* Chile */
+	CTRY_CHINA                = 156,     /* People's Republic of China */
+	CTRY_COLOMBIA             = 170,     /* Colombia */
+	CTRY_COSTA_RICA           = 188,     /* Costa Rica */
+	CTRY_CROATIA              = 191,     /* Croatia */
+	CTRY_CYPRUS               = 196,
+	CTRY_CZECH                = 203,     /* Czech Republic */
+	CTRY_DENMARK              = 208,     /* Denmark */
+	CTRY_DOMINICAN_REPUBLIC   = 214,     /* Dominican Republic */
+	CTRY_ECUADOR              = 218,     /* Ecuador */
+	CTRY_EGYPT                = 818,     /* Egypt */
+	CTRY_EL_SALVADOR          = 222,     /* El Salvador */
+	CTRY_ESTONIA              = 233,     /* Estonia */
+	CTRY_FAEROE_ISLANDS       = 234,     /* Faeroe Islands */
+	CTRY_FINLAND              = 246,     /* Finland */
+	CTRY_FRANCE               = 250,     /* France */
+	CTRY_FRANCE2              = 255,     /* France2 */
+	CTRY_GEORGIA              = 268,     /* Georgia */
+	CTRY_GERMANY              = 276,     /* Germany */
+	CTRY_GREECE               = 300,     /* Greece */
+	CTRY_GUATEMALA            = 320,     /* Guatemala */
+	CTRY_HONDURAS             = 340,     /* Honduras */
+	CTRY_HONG_KONG            = 344,     /* Hong Kong S.A.R., P.R.C. */
+	CTRY_HUNGARY              = 348,     /* Hungary */
+	CTRY_ICELAND              = 352,     /* Iceland */
+	CTRY_INDIA                = 356,     /* India */
+	CTRY_INDONESIA            = 360,     /* Indonesia */
+	CTRY_IRAN                 = 364,     /* Iran */
+	CTRY_IRAQ                 = 368,     /* Iraq */
+	CTRY_IRELAND              = 372,     /* Ireland */
+	CTRY_ISRAEL               = 376,     /* Israel */
+	CTRY_ITALY                = 380,     /* Italy */
+	CTRY_JAMAICA              = 388,     /* Jamaica */
+	CTRY_JAPAN                = 392,     /* Japan */
+	CTRY_JAPAN1               = 393,     /* Japan (JP1) */
+	CTRY_JAPAN2               = 394,     /* Japan (JP0) */
+	CTRY_JAPAN3               = 395,     /* Japan (JP1-1) */
+	CTRY_JAPAN4               = 396,     /* Japan (JE1) */
+	CTRY_JAPAN5               = 397,     /* Japan (JE2) */
+	CTRY_JAPAN6               = 399,	 /* Japan (JP6) */
+	CTRY_JAPAN7               = 900,	 /* Japan */
+	CTRY_JAPAN8               = 901,	 /* Japan */
+	CTRY_JAPAN9               = 902,	 /* Japan */
+	CTRY_JAPAN10	      = 903,	 /* Japan */
+	CTRY_JAPAN11	      = 904,	 /* Japan */
+	CTRY_JAPAN12	      = 905,	 /* Japan */
+	CTRY_JAPAN13	      = 906,	 /* Japan */
+	CTRY_JAPAN14	      = 907,	 /* Japan */
+	CTRY_JAPAN15	      = 908,	 /* Japan */
+	CTRY_JAPAN16	      = 909,	 /* Japan */
+	CTRY_JAPAN17	      = 910,	 /* Japan */
+	CTRY_JAPAN18	      = 911,	 /* Japan */
+	CTRY_JAPAN19	      = 912,	 /* Japan */
+	CTRY_JAPAN20	      = 913,	 /* Japan */
+	CTRY_JAPAN21	      = 914,	 /* Japan */
+	CTRY_JAPAN22	      = 915,	 /* Japan */
+	CTRY_JAPAN23	      = 916,	 /* Japan */
+	CTRY_JAPAN24	      = 917,	 /* Japan */
+	CTRY_JAPAN25	      = 918,	 /* Japan */
+	CTRY_JAPAN26	      = 919,	 /* Japan */
+	CTRY_JAPAN27	      = 920,	 /* Japan */
+	CTRY_JAPAN28	      = 921,	 /* Japan */
+	CTRY_JAPAN29	      = 922,	 /* Japan */
+	CTRY_JAPAN30	      = 923,	 /* Japan */
+	CTRY_JAPAN31	      = 924,	 /* Japan */
+	CTRY_JAPAN32	      = 925,	 /* Japan */
+	CTRY_JAPAN33	      = 926,	 /* Japan */
+	CTRY_JAPAN34	      = 927,	 /* Japan */
+	CTRY_JAPAN35	      = 928,	 /* Japan */
+	CTRY_JAPAN36	      = 929,	 /* Japan */
+	CTRY_JAPAN37	      = 930,	 /* Japan */
+	CTRY_JAPAN38	      = 931,	 /* Japan */
+	CTRY_JAPAN39	      = 932,	 /* Japan */
+	CTRY_JAPAN40	      = 933,	 /* Japan */
+	CTRY_JAPAN41	      = 934,	 /* Japan */
+	CTRY_JAPAN42	      = 935,	 /* Japan */
+	CTRY_JAPAN43	      = 936,	 /* Japan */
+	CTRY_JAPAN44	      = 937,	 /* Japan */
+	CTRY_JAPAN45	      = 938,	 /* Japan */
+	CTRY_JAPAN46	      = 939,	 /* Japan */
+	CTRY_JAPAN47	      = 940,	 /* Japan */
+	CTRY_JAPAN48	      = 941,	 /* Japan */
+	CTRY_JORDAN               = 400,     /* Jordan */
+	CTRY_KAZAKHSTAN           = 398,     /* Kazakhstan */
+	CTRY_KENYA                = 404,     /* Kenya */
+	CTRY_KOREA_NORTH          = 408,     /* North Korea */
+	CTRY_KOREA_ROC            = 410,     /* South Korea */
+	CTRY_KOREA_ROC2           = 411,     /* South Korea */
+	CTRY_KUWAIT               = 414,     /* Kuwait */
+	CTRY_LATVIA               = 428,     /* Latvia */
+	CTRY_LEBANON              = 422,     /* Lebanon */
+	CTRY_LIBYA                = 434,     /* Libya */
+	CTRY_LIECHTENSTEIN        = 438,     /* Liechtenstein */
+	CTRY_LITHUANIA            = 440,     /* Lithuania */
+	CTRY_LUXEMBOURG           = 442,     /* Luxembourg */
+	CTRY_MACAU                = 446,     /* Macau */
+	CTRY_MACEDONIA            = 807,     /* the Former Yugoslav Republic of Macedonia */
+	CTRY_MALAYSIA             = 458,     /* Malaysia */
+	CTRY_MEXICO               = 484,     /* Mexico */
+	CTRY_MONACO               = 492,     /* Principality of Monaco */
+	CTRY_MOROCCO              = 504,     /* Morocco */
+	CTRY_NETHERLANDS          = 528,     /* Netherlands */
+	CTRY_NEW_ZEALAND          = 554,     /* New Zealand */
+	CTRY_NICARAGUA            = 558,     /* Nicaragua */
+	CTRY_NORWAY               = 578,     /* Norway */
+	CTRY_OMAN                 = 512,     /* Oman */
+	CTRY_PAKISTAN             = 586,     /* Islamic Republic of Pakistan */
+	CTRY_PANAMA               = 591,     /* Panama */
+	CTRY_PARAGUAY             = 600,     /* Paraguay */
+	CTRY_PERU                 = 604,     /* Peru */
+	CTRY_PHILIPPINES          = 608,     /* Republic of the Philippines */
+	CTRY_POLAND               = 616,     /* Poland */
+	CTRY_PORTUGAL             = 620,     /* Portugal */
+	CTRY_PUERTO_RICO          = 630,     /* Puerto Rico */
+	CTRY_QATAR                = 634,     /* Qatar */
+	CTRY_ROMANIA              = 642,     /* Romania */
+	CTRY_RUSSIA               = 643,     /* Russia */
+	CTRY_SAUDI_ARABIA         = 682,     /* Saudi Arabia */
+	CTRY_SINGAPORE            = 702,     /* Singapore */
+	CTRY_SLOVAKIA             = 703,     /* Slovak Republic */
+	CTRY_SLOVENIA             = 705,     /* Slovenia */
+	CTRY_SOUTH_AFRICA         = 710,     /* South Africa */
+	CTRY_SPAIN                = 724,     /* Spain */
+	CTRY_SWEDEN               = 752,     /* Sweden */
+	CTRY_SWITZERLAND          = 756,     /* Switzerland */
+	CTRY_SYRIA                = 760,     /* Syria */
+	CTRY_TAIWAN               = 158,     /* Taiwan */
+	CTRY_THAILAND             = 764,     /* Thailand */
+	CTRY_TRINIDAD_Y_TOBAGO    = 780,     /* Trinidad y Tobago */
+	CTRY_TUNISIA              = 788,     /* Tunisia */
+	CTRY_TURKEY               = 792,     /* Turkey */
+	CTRY_UAE                  = 784,     /* U.A.E. */
+	CTRY_UKRAINE              = 804,     /* Ukraine */
+	CTRY_UNITED_KINGDOM       = 826,     /* United Kingdom */
+	CTRY_UNITED_STATES        = 840,     /* United States */
+	CTRY_UNITED_STATES_FCC49  = 842,     /* United States (Public Safety)*/
+	CTRY_URUGUAY              = 858,     /* Uruguay */
+	CTRY_UZBEKISTAN           = 860,     /* Uzbekistan */
+	CTRY_VENEZUELA            = 862,     /* Venezuela */
+	CTRY_VIET_NAM             = 704,     /* Viet Nam */
+	CTRY_YEMEN                = 887,     /* Yemen */
+	CTRY_ZIMBABWE             = 716      /* Zimbabwe */
+};
+
+/* 
+ * Generic information element
+ */
+struct ieee80211_ie {
+	u_int8_t id;
+	u_int8_t len;
+	u_int8_t info[0];
+} __packed;
+
+/* 
+ * Country information element.
+ */
+#define IEEE80211_COUNTRY_MAX_TRIPLETS (83)
+struct ieee80211_ie_country {
+	u_int8_t country_id;
+	u_int8_t country_len;
+	u_int8_t country_str[3];
+	u_int8_t country_triplet[IEEE80211_COUNTRY_MAX_TRIPLETS * 3];
+} __packed;
+
+/*
+ * Power Constraint information element.
+ */
+struct ieee80211_ie_pwrcnstr {
+	u_int8_t pc_id;			/* IEEE80211_ELEMID_PWRCNSTR */
+	u_int8_t pc_len;		/* == 2 */
+	u_int8_t pc_lpc;		/* Local Power Constraint [dB] */
+} __packed;
+
+/*
+ * Power Capability information element.
+ */
+struct ieee80211_ie_pwrcap {
+	u_int8_t pc_id;			/* IEEE80211_ELEMID_PWRCAP */
+	u_int8_t pc_len;		/* == 2 */
+	int8_t pc_mintxpow;		/* Minimum Transmit Power Capability [dBm] */
+	int8_t pc_maxtxpow;		/* Maximum Transmit Power Capability [dBm] */
+} __packed;
+
+/*
+ * Supported Channels information element.
+ */
+#define IEEE80211_SUPPCHAN_MAX_PAIRS (127)
+struct ieee80211_ie_sc {
+	u_int8_t sc_id;			/* IEEE80211_ELEMID_SUPPCHAN */
+	u_int8_t sc_len;		/* == 2 * number of sc_subband elements */
+	struct {
+		u_int8_t sc_first;	/* First Channel Number */
+		u_int8_t sc_number;	/* Number of Channels */
+	} __packed sc_subband[IEEE80211_SUPPCHAN_MAX_PAIRS];
+} __packed;
+
+/*
+ * Channel Switch Announcement information element.
+ */
+struct ieee80211_ie_csa {
+	u_int8_t csa_id;	/* IEEE80211_ELEMID_CHANSWITCHANN */
+	u_int8_t csa_len;	/* == 3 */
+	u_int8_t csa_mode;	/* Channel Switch Mode: 1 == stop transmission until CS */
+	u_int8_t csa_chan;	/* New Channel Number */
+	u_int8_t csa_count;	/* TBTTs until Channel Switch happens */
+} __packed;
+
+/* minimal Channel Switch Count in the initial announcement */
+#define IEEE80211_CSA_PROTECTION_PERIOD 3
+
+/* maximum allowed deviance of measurement of intervals between CSA in Beacons */
+#define IEEE80211_CSA_SANITY_THRESHOLD 100
+
+
+/* does frame have QoS sequence control data */
+#define	IEEE80211_QOS_HAS_SEQ(wh) \
+	(((wh)->i_fc[0] & \
+	  (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
+	  (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
+
+#define WME_QOSINFO_COUNT	0x0f  /* Mask for Param Set Count field */
+/*
+ * WME/802.11e information element.
+ */
+struct ieee80211_ie_wme {
+	u_int8_t wme_id;		/* IEEE80211_ELEMID_VENDOR */
+	u_int8_t wme_len;	/* length in bytes */
+	u_int8_t wme_oui[3];	/* 0x00, 0x50, 0xf2 */
+	u_int8_t wme_type;	/* OUI type */
+	u_int8_t wme_subtype;	/* OUI subtype */
+	u_int8_t wme_version;	/* spec revision */
+	u_int8_t wme_info;	/* QoS info */
+} __packed;
+
+/*
+ * WME/802.11e Tspec Element
+ */
+struct ieee80211_wme_tspec {
+	u_int8_t ts_id;
+	u_int8_t ts_len;
+	u_int8_t ts_oui[3];
+	u_int8_t ts_oui_type;
+	u_int8_t ts_oui_subtype;
+	u_int8_t ts_version;
+	u_int8_t ts_tsinfo[3];
+	u_int8_t ts_nom_msdu[2];
+	u_int8_t ts_max_msdu[2];
+	u_int8_t ts_min_svc[4];
+	u_int8_t ts_max_svc[4];
+	u_int8_t ts_inactv_intv[4];
+	u_int8_t ts_susp_intv[4];
+	u_int8_t ts_start_svc[4];
+	u_int8_t ts_min_rate[4];
+	u_int8_t ts_mean_rate[4];
+	u_int8_t ts_max_burst[4];
+	u_int8_t ts_min_phy[4];
+	u_int8_t ts_peak_rate[4];
+	u_int8_t ts_delay[4];
+	u_int8_t ts_surplus[2];
+	u_int8_t ts_medium_time[2];
+} __packed;
+
+/*
+ * WME AC parameter field
+ */
+
+struct ieee80211_wme_acparams {
+	u_int8_t acp_aci_aifsn;
+	u_int8_t acp_logcwminmax;
+	u_int16_t acp_txop;
+} __packed;
+
+#define IEEE80211_WME_PARAM_LEN 24
+#define WME_NUM_AC		4	/* 4 AC categories */
+
+#define WME_PARAM_ACI		0x60	/* Mask for ACI field */
+#define WME_PARAM_ACI_S		5	/* Shift for ACI field */
+#define WME_PARAM_ACM		0x10	/* Mask for ACM bit */
+#define WME_PARAM_ACM_S		4	/* Shift for ACM bit */
+#define WME_PARAM_AIFSN		0x0f	/* Mask for aifsn field */
+#define WME_PARAM_AIFSN_S	0	/* Shift for aifsn field */
+#define WME_PARAM_LOGCWMIN	0x0f	/* Mask for CwMin field (in log) */
+#define WME_PARAM_LOGCWMIN_S	0	/* Shift for CwMin field */
+#define WME_PARAM_LOGCWMAX	0xf0	/* Mask for CwMax field (in log) */
+#define WME_PARAM_LOGCWMAX_S	4	/* Shift for CwMax field */
+
+#define WME_AC_TO_TID(_ac) (       \
+	((_ac) == WME_AC_VO) ? 6 : \
+	((_ac) == WME_AC_VI) ? 5 : \
+	((_ac) == WME_AC_BK) ? 1 : \
+	0)
+
+#define TID_TO_WME_AC(_tid) (      \
+	((_tid) < 1) ? WME_AC_BE : \
+	((_tid) < 3) ? WME_AC_BK : \
+	((_tid) < 6) ? WME_AC_VI : \
+	WME_AC_VO)
+
+/*
+ * WME Parameter Element
+ */
+
+struct ieee80211_wme_param {
+	u_int8_t param_id;
+	u_int8_t param_len;
+	u_int8_t param_oui[3];
+	u_int8_t param_oui_type;
+	u_int8_t param_oui_sybtype;
+	u_int8_t param_version;
+	u_int8_t param_qosInfo;
+	u_int8_t param_reserved;
+	struct ieee80211_wme_acparams	params_acParams[WME_NUM_AC];
+} __packed;
+
+/*
+ * WME U-APSD qos info field defines
+ */
+#define WME_CAPINFO_UAPSD_EN			0x00000080
+#define WME_CAPINFO_UAPSD_VO			0x00000001
+#define WME_CAPINFO_UAPSD_VI			0x00000002
+#define WME_CAPINFO_UAPSD_BK			0x00000004
+#define WME_CAPINFO_UAPSD_BE			0x00000008
+#define WME_CAPINFO_UAPSD_ACFLAGS_SHIFT		0
+#define WME_CAPINFO_UAPSD_ACFLAGS_MASK		0xF
+#define WME_CAPINFO_UAPSD_MAXSP_SHIFT		5
+#define WME_CAPINFO_UAPSD_MAXSP_MASK		0x3
+#define WME_CAPINFO_IE_OFFSET			8
+#define WME_UAPSD_MAXSP(_qosinfo)					\
+		(((_qosinfo) >> WME_CAPINFO_UAPSD_MAXSP_SHIFT) & 	\
+		 WME_CAPINFO_UAPSD_MAXSP_MASK)
+#define WME_UAPSD_AC_ENABLED(_ac, _qosinfo)				\
+		((1 << (3 - (_ac))) & (					\
+		 ((_qosinfo) >> WME_CAPINFO_UAPSD_ACFLAGS_SHIFT) &	\
+		 WME_CAPINFO_UAPSD_ACFLAGS_MASK))
+
+/*
+ * Atheros Advanced Capability information element.
+ */
+struct ieee80211_ie_athAdvCap {
+	u_int8_t athAdvCap_id;		/* IEEE80211_ELEMID_VENDOR */
+	u_int8_t athAdvCap_len;		/* length in bytes */
+	u_int8_t athAdvCap_oui[3];	/* 0x00, 0x03, 0x7f */
+	u_int8_t athAdvCap_type;	/* OUI type */
+	u_int8_t athAdvCap_subtype;	/* OUI subtype */
+	u_int8_t athAdvCap_version;	/* spec revision */
+	u_int8_t athAdvCap_capability;	/* Capability info */
+	u_int16_t athAdvCap_defKeyIndex;
+} __packed;
+
+/*
+ * Atheros XR information element.
+ */
+struct ieee80211_xr_param {
+	u_int8_t param_id;
+	u_int8_t param_len;
+	u_int8_t param_oui[3];
+	u_int8_t param_oui_type;
+	u_int8_t param_oui_sybtype;
+	u_int8_t param_version;
+	u_int8_t param_Info;
+	u_int8_t param_base_bssid[IEEE80211_ADDR_LEN];
+	u_int8_t param_xr_bssid[IEEE80211_ADDR_LEN];
+	u_int16_t param_xr_beacon_interval;
+	u_int8_t param_base_ath_capability;
+	u_int8_t param_xr_ath_capability;
+} __packed;
+
+/* Atheros capabilities */
+#define IEEE80211_ATHC_TURBOP	0x0001		/* Turbo Prime */
+#define IEEE80211_ATHC_COMP	0x0002		/* Compression */
+#define IEEE80211_ATHC_FF	0x0004		/* Fast Frames */
+#define IEEE80211_ATHC_XR	0x0008		/* Xtended Range support */
+#define IEEE80211_ATHC_AR	0x0010		/* Advanced Radar support */
+#define IEEE80211_ATHC_BURST	0x0020		/* Bursting - not negotiated */
+#define IEEE80211_ATHC_WME	0x0040		/* CWMin tuning */
+#define IEEE80211_ATHC_BOOST	0x0080		/* Boost */
+
+/*
+ * Management Notification Frame
+ */
+struct ieee80211_mnf {
+	u_int8_t mnf_category;
+	u_int8_t mnf_action;
+	u_int8_t mnf_dialog;
+	u_int8_t mnf_status;
+} __packed;
+#define	MNF_SETUP_REQ	0
+#define	MNF_SETUP_RESP	1
+#define	MNF_TEARDOWN	2
+
+/*
+ * Control frames.
+ */
+struct ieee80211_frame_min {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_addr1[IEEE80211_ADDR_LEN];
+	u_int8_t i_addr2[IEEE80211_ADDR_LEN];
+	/* FCS */
+} __packed;
+
+struct ieee80211_frame_rts {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_ra[IEEE80211_ADDR_LEN];
+	u_int8_t i_ta[IEEE80211_ADDR_LEN];
+	/* FCS */
+} __packed;
+
+struct ieee80211_frame_cts {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_ra[IEEE80211_ADDR_LEN];
+	/* FCS */
+} __packed;
+
+struct ieee80211_frame_ack {
+	u_int8_t i_fc[2];
+	__le16 i_dur;
+	u_int8_t i_ra[IEEE80211_ADDR_LEN];
+	/* FCS */
+} __packed;
+
+struct ieee80211_frame_pspoll {
+	u_int8_t i_fc[2];
+	u_int8_t i_aid[2];
+	u_int8_t i_bssid[IEEE80211_ADDR_LEN];
+	u_int8_t i_ta[IEEE80211_ADDR_LEN];
+	/* FCS */
+} __packed;
+
+struct ieee80211_frame_cfend {		/* NB: also CF-End+CF-Ack */
+	u_int8_t i_fc[2];
+	__le16 i_dur;	/* should be zero */
+	u_int8_t i_ra[IEEE80211_ADDR_LEN];
+	u_int8_t i_bssid[IEEE80211_ADDR_LEN];
+	/* FCS */
+} __packed;
+
+/*
+ * BEACON management packets
+ *
+ *	octet timestamp[8]
+ *	octet beacon interval[2]
+ *	octet capability information[2]
+ *	information element
+ *		octet elemid
+ *		octet length
+ *		octet information[length]
+ */
+
+typedef u_int8_t *ieee80211_mgt_beacon_t;
+
+#define	IEEE80211_BEACON_INTERVAL(beacon) \
+	((beacon)[8] | ((beacon)[9] << 8))
+#define	IEEE80211_BEACON_CAPABILITY(beacon) \
+	((beacon)[10] | ((beacon)[11] << 8))
+
+#define	IEEE80211_CAPINFO_ESS			0x0001
+#define	IEEE80211_CAPINFO_IBSS			0x0002
+#define	IEEE80211_CAPINFO_CF_POLLABLE		0x0004
+#define	IEEE80211_CAPINFO_CF_POLLREQ		0x0008
+#define	IEEE80211_CAPINFO_PRIVACY		0x0010
+#define	IEEE80211_CAPINFO_SHORT_PREAMBLE	0x0020
+#define	IEEE80211_CAPINFO_PBCC			0x0040
+#define	IEEE80211_CAPINFO_CHNL_AGILITY		0x0080
+/* bits 8-9 are reserved (8 now for spectrum management) */
+#define IEEE80211_CAPINFO_SPECTRUM_MGMT		0x0100
+#define	IEEE80211_CAPINFO_SHORT_SLOTTIME	0x0400
+#define	IEEE80211_CAPINFO_RSN			0x0800
+/* bit 12 is reserved */
+#define	IEEE80211_CAPINFO_DSSSOFDM		0x2000
+/* bits 14-15 are reserved */
+
+/*
+ * 802.11i/WPA information element (maximally sized).
+ */
+struct ieee80211_ie_wpa {
+	u_int8_t wpa_id;			/* IEEE80211_ELEMID_VENDOR */
+	u_int8_t wpa_len;		/* length in bytes */
+	u_int8_t wpa_oui[3];		/* 0x00, 0x50, 0xf2 */
+	u_int8_t wpa_type;		/* OUI type */
+	u_int16_t wpa_version;		/* spec revision */
+	u_int32_t wpa_mcipher[1];	/* multicast/group key cipher */
+	u_int16_t wpa_uciphercnt;	/* # pairwise key ciphers */
+	u_int32_t wpa_uciphers[8];	/* ciphers */
+	u_int16_t wpa_authselcnt;	/* authentication selector cnt*/
+	u_int32_t wpa_authsels[8];	/* selectors */
+	u_int16_t wpa_caps;		/* 802.11i capabilities */
+	u_int16_t wpa_pmkidcnt;		/* 802.11i pmkid count */
+	u_int16_t wpa_pmkids[8];	/* 802.11i pmkids */
+} __packed;
+
+/*
+ * Management information element payloads.
+ */
+
+enum {
+	IEEE80211_ELEMID_SSID		= 0,
+	IEEE80211_ELEMID_RATES		= 1,
+	IEEE80211_ELEMID_FHPARMS	= 2,
+	IEEE80211_ELEMID_DSPARMS	= 3,
+	IEEE80211_ELEMID_CFPARMS	= 4,
+	IEEE80211_ELEMID_TIM		= 5,
+	IEEE80211_ELEMID_IBSSPARMS	= 6,
+	IEEE80211_ELEMID_COUNTRY	= 7,
+	IEEE80211_ELEMID_HOPPATRNPARMS  = 8,
+	IEEE80211_ELEMID_HOPPATRNTABLE  = 9,
+	IEEE80211_ELEMID_REQINFO	= 10,
+	IEEE80211_ELEMID_QBSSLOAD       = 11,
+	IEEE80211_ELEMID_EDCAPARAM      = 12,
+	IEEE80211_ELEMID_TSPEC		= 13,
+	IEEE80211_ELEMID_TRAFCLASS      = 14,
+	IEEE80211_ELEMID_SCHEDULE       = 15,
+	IEEE80211_ELEMID_CHALLENGE	= 16,
+	/* 17-31 reserved for challenge text extension */
+	IEEE80211_ELEMID_PWRCNSTR	= 32,
+	IEEE80211_ELEMID_PWRCAP		= 33,
+	IEEE80211_ELEMID_TPCREQ		= 34,
+	IEEE80211_ELEMID_TPCREP		= 35,
+	IEEE80211_ELEMID_SUPPCHAN	= 36,
+	IEEE80211_ELEMID_CHANSWITCHANN	= 37,
+	IEEE80211_ELEMID_MEASREQ	= 38,
+	IEEE80211_ELEMID_MEASREP	= 39,
+	IEEE80211_ELEMID_QUIET		= 40,
+	IEEE80211_ELEMID_IBSSDFS	= 41,
+	IEEE80211_ELEMID_ERP		= 42,
+	IEEE80211_ELEMID_TSDELAY	= 43,
+	IEEE80211_ELEMID_TCLASSPROC     = 44,
+	IEEE80211_ELEMID_QOS		= 46,
+	IEEE80211_ELEMID_RSN		= 48,
+	/* 49 reserved */
+	IEEE80211_ELEMID_XRATES		= 50,
+	/* 128-129 proprietary elements used by Agere chipsets */
+	IEEE80211_ELEMID_AGERE1		= 128,
+	IEEE80211_ELEMID_AGERE2		= 129,
+	IEEE80211_ELEMID_TPC		= 150,
+	IEEE80211_ELEMID_CCKM		= 156,
+	IEEE80211_ELEMID_VENDOR		= 221,	/* vendor private */
+};
+
+#define IEEE80211_CHANSWITCHANN_BYTES 	5
+#define BITCTL_BUFD_MCAST       	1
+#define BITCTL_BUFD_UCAST_AID_MASK 	((u_int8_t)~(BITCTL_BUFD_MCAST))
+#define BITCTL_BUFD_UCAST_AID_SHIFT 	1
+
+struct ieee80211_tim_ie {
+	u_int8_t	tim_ie;			/* IEEE80211_ELEMID_TIM */
+	u_int8_t	tim_len;
+	u_int8_t	tim_count;		/* DTIM count */
+	u_int8_t	tim_period;		/* DTIM period */
+	u_int8_t	tim_bitctl;		/* bitmap control */
+	u_int8_t	tim_bitmap[1];		/* variable-length bitmap */
+} __packed;
+
+struct ieee80211_country_ie {
+	u_int8_t	ie;			/* IEEE80211_ELEMID_COUNTRY */
+	u_int8_t	len;
+	u_int8_t	cc[3];			/* ISO CC+(I)ndoor/(O)utdoor */
+	struct {
+		u_int8_t schan;			/* starting channel */
+		u_int8_t nchan;			/* number channels */
+		u_int8_t maxtxpwr;		/* tx power cap */
+	} __packed band[4];			/* up to 4 sub bands */
+} __packed;
+
+#define IEEE80211_CHALLENGE_LEN		128
+
+#define IEEE80211_SUPPCHAN_LEN		26
+
+#define	IEEE80211_RATE_BASIC		0x80
+#define	IEEE80211_RATE_VAL		0x7f
+
+/* EPR information element flags */
+#define	IEEE80211_ERP_NON_ERP_PRESENT	0x01
+#define	IEEE80211_ERP_USE_PROTECTION	0x02
+#define	IEEE80211_ERP_LONG_PREAMBLE	0x04
+
+/* Atheros private advanced capabilities info */
+#define	ATHEROS_CAP_TURBO_PRIME		0x01
+#define	ATHEROS_CAP_COMPRESSION		0x02
+#define	ATHEROS_CAP_FAST_FRAME		0x04
+/* bits 3-6 reserved */
+#define	ATHEROS_CAP_BOOST		0x80
+
+#define	ATH_OUI			0x7f0300		/* Atheros OUI */
+#define	ATH_OUI_TYPE		0x01
+#define	ATH_OUI_SUBTYPE		0x01
+#define	ATH_OUI_VERSION		0x00
+#define	ATH_OUI_TYPE_XR		0x03
+#define	ATH_OUI_SUBTYPE_XR	0x01
+#define	ATH_OUI_VER_XR		0x00
+
+#define	WPA_OUI			0xf25000
+#define	WPA_OUI_TYPE		0x01
+#define	WPA_VERSION		1		/* current supported version */
+
+#define	WPA_CSE_NULL		0x00
+#define	WPA_CSE_WEP40		0x01
+#define	WPA_CSE_TKIP		0x02
+#define	WPA_CSE_CCMP		0x04
+#define	WPA_CSE_WEP104		0x05
+
+#define	WPA_ASE_NONE		0x00
+#define	WPA_ASE_8021X_UNSPEC	0x01
+#define	WPA_ASE_8021X_PSK	0x02
+
+#define	RSN_OUI			0xac0f00
+#define	RSN_VERSION		1		/* current supported version */
+
+#define	RSN_CSE_NULL		0x00
+#define	RSN_CSE_WEP40		0x01
+#define	RSN_CSE_TKIP		0x02
+#define	RSN_CSE_WRAP		0x03
+#define	RSN_CSE_CCMP		0x04
+#define	RSN_CSE_WEP104		0x05
+
+#define	RSN_ASE_NONE		0x00
+#define	RSN_ASE_8021X_UNSPEC	0x01
+#define	RSN_ASE_8021X_PSK	0x02
+
+#define	RSN_CAP_PREAUTH		0x01
+
+#define	WME_OUI			0xf25000
+#define	WME_OUI_TYPE		0x02
+#define	WME_INFO_OUI_SUBTYPE	0x00
+#define	WME_PARAM_OUI_SUBTYPE	0x01
+#define	WME_VERSION		1
+
+/* WME stream classes */
+#define	WME_AC_BE	0		/* best effort */
+#define	WME_AC_BK	1		/* background */
+#define	WME_AC_VI	2		/* video */
+#define	WME_AC_VO	3		/* voice */
+
+/*
+ * AUTH management packets
+ *
+ *	octet algo[2]
+ *	octet seq[2]
+ *	octet status[2]
+ *	octet chal.id
+ *	octet chal.length
+ *	octet chal.text[253]
+ */
+
+typedef u_int8_t *ieee80211_mgt_auth_t;
+
+#define	IEEE80211_AUTH_ALGORITHM(auth) \
+	((auth)[0] | ((auth)[1] << 8))
+#define	IEEE80211_AUTH_TRANSACTION(auth) \
+	((auth)[2] | ((auth)[3] << 8))
+#define	IEEE80211_AUTH_STATUS(auth) \
+	((auth)[4] | ((auth)[5] << 8))
+
+#define	IEEE80211_AUTH_ALG_OPEN		0x0000
+#define	IEEE80211_AUTH_ALG_SHARED	0x0001
+#define	IEEE80211_AUTH_ALG_LEAP		0x0080
+
+enum {
+	IEEE80211_AUTH_OPEN_REQUEST		= 1,
+	IEEE80211_AUTH_OPEN_RESPONSE		= 2,
+};
+
+enum {
+	IEEE80211_AUTH_SHARED_REQUEST		= 1,
+	IEEE80211_AUTH_SHARED_CHALLENGE		= 2,
+	IEEE80211_AUTH_SHARED_RESPONSE		= 3,
+	IEEE80211_AUTH_SHARED_PASS		= 4,
+};
+
+/*
+ * Reason codes
+ *
+ * Unlisted codes are reserved
+ */
+
+enum {
+	IEEE80211_REASON_UNSPECIFIED		= 1,
+	IEEE80211_REASON_AUTH_EXPIRE		= 2,
+	IEEE80211_REASON_AUTH_LEAVE		= 3,
+	IEEE80211_REASON_ASSOC_EXPIRE		= 4,
+	IEEE80211_REASON_ASSOC_TOOMANY		= 5,
+	IEEE80211_REASON_NOT_AUTHED		= 6,
+	IEEE80211_REASON_NOT_ASSOCED		= 7,
+	IEEE80211_REASON_ASSOC_LEAVE		= 8,
+	IEEE80211_REASON_ASSOC_NOT_AUTHED	= 9,
+
+	IEEE80211_REASON_PWRCAP_UNACCEPTABLE	= 10,
+	IEEE80211_REASON_SUPPCHAN_UNACCEPTABLE	= 11,
+	IEEE80211_REASON_RSN_REQUIRED		= 11,
+	IEEE80211_REASON_RSN_INCONSISTENT	= 12,
+	IEEE80211_REASON_IE_INVALID		= 13,
+	IEEE80211_REASON_MIC_FAILURE		= 14,
+
+	IEEE80211_STATUS_SUCCESS		= 0,
+	IEEE80211_STATUS_UNSPECIFIED		= 1,
+	IEEE80211_STATUS_CAPINFO		= 10,
+	IEEE80211_STATUS_NOT_ASSOCED		= 11,
+	IEEE80211_STATUS_OTHER			= 12,
+	IEEE80211_STATUS_ALG			= 13,
+	IEEE80211_STATUS_SEQUENCE		= 14,
+	IEEE80211_STATUS_CHALLENGE		= 15,
+	IEEE80211_STATUS_TIMEOUT		= 16,
+	IEEE80211_STATUS_TOOMANY		= 17,
+	IEEE80211_STATUS_BASIC_RATE		= 18,
+	IEEE80211_STATUS_SP_REQUIRED		= 19,
+	IEEE80211_STATUS_PBCC_REQUIRED		= 20,
+	IEEE80211_STATUS_CA_REQUIRED		= 21,
+	IEEE80211_STATUS_SM_REQUIRED		= 22,
+	IEEE80211_STATUS_PWRCAP_UNACCEPTABLE	= 23,
+	IEEE80211_STATUS_SUPPCHAN_UNACCEPTABLE	= 24,
+	IEEE80211_STATUS_TOO_MANY_STATIONS	= 22,
+	IEEE80211_STATUS_RATES			= 23,
+	IEEE80211_STATUS_SHORTSLOT_REQUIRED	= 25,
+	IEEE80211_STATUS_DSSSOFDM_REQUIRED	= 26,
+};
+
+#define	IEEE80211_WEP_KEYLEN		5	/* 40bit */
+#define	IEEE80211_WEP_IVLEN		3	/* 24bit */
+#define	IEEE80211_WEP_KIDLEN		1	/* 1 octet */
+#define	IEEE80211_WEP_CRCLEN		4	/* CRC-32 */
+#define	IEEE80211_WEP_NKID		4	/* number of key ids */
+
+/*
+ * 802.11i defines an extended IV for use with non-WEP ciphers.
+ * When the EXTIV bit is set in the key id byte an additional
+ * 4 bytes immediately follow the IV for TKIP.  For CCMP the
+ * EXTIV bit is likewise set but the 8 bytes represent the
+ * CCMP header rather than IV+extended-IV.
+ */
+#define	IEEE80211_WEP_EXTIV		0x20
+#define	IEEE80211_WEP_EXTIVLEN		4	/* extended IV length */
+#define	IEEE80211_WEP_MICLEN		8	/* trailing MIC */
+
+#define	IEEE80211_CRC_LEN		4
+
+/*
+ * Maximum acceptable MTU is:
+ *	IEEE80211_MAX_LEN - WEP overhead - CRC -
+ *		QoS overhead - RSN/WPA overhead
+ * Min is arbitrarily chosen > IEEE80211_MIN_LEN.  The default
+ * mtu is Ethernet-compatible; it's set by ether_ifattach.
+ */
+#define	IEEE80211_MTU_MAX		2290
+#define	IEEE80211_MTU_MIN		32
+
+#define	IEEE80211_MAX_LEN		(2300 + IEEE80211_CRC_LEN + \
+	(IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN))
+#define	IEEE80211_ACK_LEN \
+	(sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN)
+#define	IEEE80211_MIN_LEN \
+	(sizeof(struct ieee80211_frame_min) + IEEE80211_CRC_LEN)
+
+/*
+ * The 802.11 spec says at most 2007 stations may be
+ * associated at once.  For most APs this is way more
+ * than is feasible so we use a default of 128.  This
+ * number may be overridden by the driver and/or by
+ * user configuration.
+ */
+#define	IEEE80211_AID_MAX		2007
+#define	IEEE80211_AID_DEF		128
+
+#define	IEEE80211_AID(b)	((b) &~ 0xc000)
+
+/* 
+ * RTS frame length parameters.  The default is specified in
+ * the 802.11 spec.  The max may be wrong for jumbo frames.
+ */
+#define	IEEE80211_RTS_DEFAULT		512
+#define	IEEE80211_RTS_MIN		1
+#define	IEEE80211_RTS_MAX		2346
+
+/* 
+ * Regulatory extension identifier for country IE.
+ */
+#define IEEE80211_REG_EXT_ID		201
+
+/*
+ * IEEE 802.11 timer synchronization function (TSF) timestamp length
+ */
+#define IEEE80211_TSF_LEN		8
+
+#endif /* _NET80211_IEEE80211_H_ */
diff --git a/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_crypto.h b/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_crypto.h
new file mode 100644
index 00000000..b34f359d
--- /dev/null
+++ b/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_crypto.h
@@ -0,0 +1,207 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: ieee80211_crypto.h 3068 2007-12-21 17:46:02Z mentor $
+ */
+#ifndef _NET80211_IEEE80211_CRYPTO_H_
+#define _NET80211_IEEE80211_CRYPTO_H_
+
+/*
+ * 802.11 protocol crypto-related definitions.
+ */
+#define	IEEE80211_KEYBUF_SIZE	16
+#define	IEEE80211_MICBUF_SIZE	(8 + 8)		/* space for both TX & RX keys */
+#define IEEE80211_TID_SIZE	17		/* total number of TIDs */
+
+/*
+ * Old WEP-style key.  Deprecated.
+ */
+struct ieee80211_wepkey {
+	u_int wk_len;				/* key length in bytes */
+	u_int8_t wk_key[IEEE80211_KEYBUF_SIZE];
+};
+
+struct ieee80211_cipher;
+
+/*
+ * Crypto key state.  There is sufficient room for all supported
+ * ciphers (see below).  The underlying ciphers are handled
+ * separately through loadable cipher modules that register with
+ * the generic crypto support.  A key has a reference to an instance
+ * of the cipher; any per-key state is hung off wk_private by the
+ * cipher when it is attached.  Ciphers are automatically called
+ * to detach and cleanup any such state when the key is deleted.
+ *
+ * The generic crypto support handles encap/decap of cipher-related
+ * frame contents for both hardware- and software-based implementations.
+ * A key requiring software crypto support is automatically flagged and
+ * the cipher is expected to honor this and do the necessary work.
+ * Ciphers such as TKIP may also support mixed hardware/software
+ * encrypt/decrypt and MIC processing.
+ */
+
+typedef u_int16_t ieee80211_keyix_t;
+
+/* XXX pack better? */
+/* XXX 48-bit rsc/tsc */
+struct ieee80211_key {
+	u_int8_t wk_keylen;		/* key length in bytes */
+	u_int8_t wk_flags;
+#define	IEEE80211_KEY_XMIT	0x01	/* key used for xmit */
+#define	IEEE80211_KEY_RECV	0x02	/* key used for recv */
+#define	IEEE80211_KEY_GROUP	0x04	/* key used for WPA group operation */
+#define	IEEE80211_KEY_SWCRYPT	0x10	/* host-based encrypt/decrypt */
+#define	IEEE80211_KEY_SWMIC	0x20	/* host-based enmic/demic */
+	ieee80211_keyix_t wk_keyix;	/* key index */
+	u_int8_t wk_key[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
+#define	wk_txmic	wk_key+IEEE80211_KEYBUF_SIZE+0	/* XXX can't () right */
+#define	wk_rxmic	wk_key+IEEE80211_KEYBUF_SIZE+8	/* XXX can't () right */
+	u_int64_t wk_keyrsc[IEEE80211_TID_SIZE];	/* key receive sequence counter */
+	u_int64_t wk_keytsc;		/* key transmit sequence counter */
+	const struct ieee80211_cipher *wk_cipher;
+	void *wk_private;		/* private cipher state */
+};
+#define	IEEE80211_KEY_COMMON 		/* common flags passed in by apps */\
+	(IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV | IEEE80211_KEY_GROUP)
+
+/*
+ * NB: these values are ordered carefully; there are lots of
+ * of implications in any reordering.  In particular beware
+ * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY.
+ */
+#define	IEEE80211_CIPHER_WEP		0
+#define	IEEE80211_CIPHER_TKIP		1
+#define	IEEE80211_CIPHER_AES_OCB	2
+#define	IEEE80211_CIPHER_AES_CCM	3
+#define	IEEE80211_CIPHER_CKIP		5
+#define	IEEE80211_CIPHER_NONE		6	/* pseudo value */
+
+#define	IEEE80211_CIPHER_MAX		(IEEE80211_CIPHER_NONE + 1)
+
+#define	IEEE80211_KEYIX_NONE	((ieee80211_keyix_t)-1)
+
+#if defined(__KERNEL__) || defined(_KERNEL)
+
+struct ieee80211com;
+struct ieee80211vap;
+struct ieee80211_node;
+struct sk_buff;
+
+void ieee80211_crypto_attach(struct ieee80211com *);
+void ieee80211_crypto_detach(struct ieee80211com *);
+void ieee80211_crypto_vattach(struct ieee80211vap *);
+void ieee80211_crypto_vdetach(struct ieee80211vap *);
+int ieee80211_crypto_newkey(struct ieee80211vap *, int, int,
+	struct ieee80211_key *);
+int ieee80211_crypto_delkey(struct ieee80211vap *, struct ieee80211_key *,
+	struct ieee80211_node *);
+int ieee80211_crypto_setkey(struct ieee80211vap *, struct ieee80211_key *,
+	const u_int8_t macaddr[IEEE80211_ADDR_LEN], struct ieee80211_node *);
+void ieee80211_crypto_delglobalkeys(struct ieee80211vap *);
+
+/*
+ * Template for a supported cipher.  Ciphers register with the
+ * crypto code and are typically loaded as separate modules
+ * (the null cipher is always present).
+ * XXX may need refcnts
+ */
+struct ieee80211_cipher {
+	const char *ic_name;		/* printable name */
+	u_int ic_cipher;		/* IEEE80211_CIPHER_* */
+	u_int ic_header;		/* size of privacy header (bytes) */
+	u_int ic_trailer;		/* size of privacy trailer (bytes) */
+	u_int ic_miclen;		/* size of mic trailer (bytes) */
+	void *(*ic_attach)(struct ieee80211vap *, struct ieee80211_key *);
+	void (*ic_detach)(struct ieee80211_key *);
+	int (*ic_setkey)(struct ieee80211_key *);
+	int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
+	int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
+	int (*ic_enmic)(struct ieee80211_key *, struct sk_buff *, int);
+	int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int, int);
+};
+extern const struct ieee80211_cipher ieee80211_cipher_none;
+
+void ieee80211_crypto_register(const struct ieee80211_cipher *);
+void ieee80211_crypto_unregister(const struct ieee80211_cipher *);
+int ieee80211_crypto_available(struct ieee80211vap*, u_int);
+
+struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211_node *,
+	struct sk_buff *);
+struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211_node *,
+	struct sk_buff *, int);
+
+/*
+ * Check and remove any MIC.
+ */
+static __inline int
+ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,
+	struct sk_buff *skb, int hdrlen, int force)
+{
+	const struct ieee80211_cipher *cip = k->wk_cipher;
+	return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen, force) : 1);
+}
+
+/*
+ * Add any MIC.
+ */
+static __inline int
+ieee80211_crypto_enmic(struct ieee80211vap *vap, struct ieee80211_key *k,
+	struct sk_buff *skb, int force)
+{
+	const struct ieee80211_cipher *cip = k->wk_cipher;
+	return (cip->ic_miclen > 0 ? cip->ic_enmic(k, skb, force) : 1);
+}
+
+/* 
+ * Reset key state to an unused state.  The crypto
+ * key allocation mechanism ensures other state (e.g.
+ * key data) is properly setup before a key is used.
+ */
+static __inline void
+ieee80211_crypto_resetkey(struct ieee80211vap *vap, struct ieee80211_key *k,
+	ieee80211_keyix_t ix)
+{
+	k->wk_cipher = &ieee80211_cipher_none;;
+	k->wk_private = k->wk_cipher->ic_attach(vap, k);
+	k->wk_keyix = ix;
+	k->wk_flags = IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV;
+}
+
+/*
+ * Crypto-related notification methods.
+ */
+void ieee80211_notify_replay_failure(struct ieee80211vap *,
+	const struct ieee80211_frame *, const struct ieee80211_key *,
+	u_int64_t rsc);
+void ieee80211_notify_michael_failure(struct ieee80211vap *,
+	const struct ieee80211_frame *, ieee80211_keyix_t keyix);
+#endif /* defined(__KERNEL__) || defined(_KERNEL) */
+#endif /* _NET80211_IEEE80211_CRYPTO_H_ */
diff --git a/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_ioctl.h b/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_ioctl.h
new file mode 100644
index 00000000..204303b6
--- /dev/null
+++ b/trunk/package/network/services/hostapd/madwifi/net80211/ieee80211_ioctl.h
@@ -0,0 +1,715 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: ieee80211_ioctl.h 3314 2008-01-30 23:50:16Z mtaylor $
+ */
+#ifndef _NET80211_IEEE80211_IOCTL_H_
+#define _NET80211_IEEE80211_IOCTL_H_
+
+/*
+ * IEEE 802.11 ioctls.
+ */
+#include <net80211/_ieee80211.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_crypto.h>
+
+/*
+ * Per/node (station) statistics available when operating as an AP.
+ */
+struct ieee80211_nodestats {
+	u_int32_t ns_rx_data;		/* rx data frames */
+	u_int32_t ns_rx_mgmt;		/* rx management frames */
+	u_int32_t ns_rx_ctrl;		/* rx control frames */
+	u_int32_t ns_rx_ucast;		/* rx unicast frames */
+	u_int32_t ns_rx_mcast;		/* rx multi/broadcast frames */
+	u_int64_t ns_rx_bytes;		/* rx data count (bytes) */
+	u_int64_t ns_rx_beacons;		/* rx beacon frames */
+	u_int32_t ns_rx_proberesp;	/* rx probe response frames */
+
+	u_int32_t ns_rx_dup;		/* rx discard because it's a dup */
+	u_int32_t ns_rx_noprivacy;	/* rx w/ wep but privacy off */
+	u_int32_t ns_rx_wepfail;		/* rx wep processing failed */
+	u_int32_t ns_rx_demicfail;	/* rx demic failed */
+	u_int32_t ns_rx_decap;		/* rx decapsulation failed */
+	u_int32_t ns_rx_defrag;		/* rx defragmentation failed */
+	u_int32_t ns_rx_disassoc;	/* rx disassociation */
+	u_int32_t ns_rx_deauth;		/* rx deauthentication */
+	u_int32_t ns_rx_decryptcrc;	/* rx decrypt failed on crc */
+	u_int32_t ns_rx_unauth;		/* rx on unauthorized port */
+	u_int32_t ns_rx_unencrypted;	/* rx unecrypted w/ privacy */
+
+	u_int32_t ns_tx_data;		/* tx data frames */
+	u_int32_t ns_tx_mgmt;		/* tx management frames */
+	u_int32_t ns_tx_ucast;		/* tx unicast frames */
+	u_int32_t ns_tx_mcast;		/* tx multi/broadcast frames */
+	u_int64_t ns_tx_bytes;		/* tx data count (bytes) */
+	u_int32_t ns_tx_probereq;	/* tx probe request frames */
+	u_int32_t ns_tx_uapsd;		/* tx on uapsd queue */
+
+	u_int32_t ns_tx_novlantag;	/* tx discard due to no tag */
+	u_int32_t ns_tx_vlanmismatch;	/* tx discard due to of bad tag */
+
+	u_int32_t ns_tx_eosplost;	/* uapsd EOSP retried out */
+
+	u_int32_t ns_ps_discard;		/* ps discard due to of age */
+
+	u_int32_t ns_uapsd_triggers;	/* uapsd triggers */
+
+	/* MIB-related state */
+	u_int32_t ns_tx_assoc;		/* [re]associations */
+	u_int32_t ns_tx_assoc_fail;	/* [re]association failures */
+	u_int32_t ns_tx_auth;		/* [re]authentications */
+	u_int32_t ns_tx_auth_fail;	/* [re]authentication failures*/
+	u_int32_t ns_tx_deauth;		/* deauthentications */
+	u_int32_t ns_tx_deauth_code;	/* last deauth reason */
+	u_int32_t ns_tx_disassoc;	/* disassociations */
+	u_int32_t ns_tx_disassoc_code;	/* last disassociation reason */
+	u_int32_t ns_psq_drops;		/* power save queue drops */
+};
+
+/*
+ * Summary statistics.
+ */
+struct ieee80211_stats {
+	u_int32_t is_rx_badversion;	/* rx frame with bad version */
+	u_int32_t is_rx_tooshort;	/* rx frame too short */
+	u_int32_t is_rx_wrongbss;	/* rx from wrong bssid */
+	u_int32_t is_rx_dup;		/* rx discard due to it's a dup */
+	u_int32_t is_rx_wrongdir;	/* rx w/ wrong direction */
+	u_int32_t is_rx_mcastecho;	/* rx discard due to of mcast echo */
+	u_int32_t is_rx_mcastdisabled;	/* rx discard due to of mcast disabled */
+	u_int32_t is_rx_notassoc;	/* rx discard due to sta !assoc */
+	u_int32_t is_rx_noprivacy;	/* rx w/ wep but privacy off */
+	u_int32_t is_rx_unencrypted;	/* rx w/o wep and privacy on */
+	u_int32_t is_rx_wepfail;		/* rx wep processing failed */
+	u_int32_t is_rx_decap;		/* rx decapsulation failed */
+	u_int32_t is_rx_mgtdiscard;	/* rx discard mgt frames */
+	u_int32_t is_rx_ctl;		/* rx discard ctrl frames */
+	u_int32_t is_rx_beacon;		/* rx beacon frames */
+	u_int32_t is_rx_rstoobig;	/* rx rate set truncated */
+	u_int32_t is_rx_elem_missing;	/* rx required element missing*/
+	u_int32_t is_rx_elem_toobig;	/* rx element too big */
+	u_int32_t is_rx_elem_toosmall;	/* rx element too small */
+	u_int32_t is_rx_elem_unknown;	/* rx element unknown */
+	u_int32_t is_rx_badchan;		/* rx frame w/ invalid chan */
+	u_int32_t is_rx_chanmismatch;	/* rx frame chan mismatch */
+	u_int32_t is_rx_nodealloc;	/* rx frame dropped */
+	u_int32_t is_rx_ssidmismatch;	/* rx frame ssid mismatch  */
+	u_int32_t is_rx_auth_unsupported;/* rx w/ unsupported auth alg */
+	u_int32_t is_rx_auth_fail;	/* rx sta auth failure */
+	u_int32_t is_rx_auth_countermeasures;/* rx auth discard due to CM */
+	u_int32_t is_rx_assoc_bss;	/* rx assoc from wrong bssid */
+	u_int32_t is_rx_assoc_notauth;	/* rx assoc w/o auth */
+	u_int32_t is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */
+	u_int32_t is_rx_assoc_norate;	/* rx assoc w/ no rate match */
+	u_int32_t is_rx_assoc_badwpaie;	/* rx assoc w/ bad WPA IE */
+	u_int32_t is_rx_assoc_badscie;	/* rx assoc w/ bad SC IE */
+	u_int32_t is_rx_deauth;		/* rx deauthentication */
+	u_int32_t is_rx_disassoc;	/* rx disassociation */
+	u_int32_t is_rx_badsubtype;	/* rx frame w/ unknown subtype*/
+	u_int32_t is_rx_nobuf;		/* rx failed for lack of buf */
+	u_int32_t is_rx_decryptcrc;	/* rx decrypt failed on crc */
+	u_int32_t is_rx_ahdemo_mgt;	/* rx discard ahdemo mgt frame*/
+	u_int32_t is_rx_bad_auth;	/* rx bad auth request */
+	u_int32_t is_rx_unauth;		/* rx on unauthorized port */
+	u_int32_t is_rx_badkeyid;	/* rx w/ incorrect keyid */
+	u_int32_t is_rx_ccmpreplay;	/* rx seq# violation (CCMP) */
+	u_int32_t is_rx_ccmpformat;	/* rx format bad (CCMP) */
+	u_int32_t is_rx_ccmpmic;		/* rx MIC check failed (CCMP) */
+	u_int32_t is_rx_tkipreplay;	/* rx seq# violation (TKIP) */
+	u_int32_t is_rx_tkipformat;	/* rx format bad (TKIP) */
+	u_int32_t is_rx_tkipmic;		/* rx MIC check failed (TKIP) */
+	u_int32_t is_rx_tkipicv;		/* rx ICV check failed (TKIP) */
+	u_int32_t is_rx_badcipher;	/* rx failed due to of key type */
+	u_int32_t is_rx_nocipherctx;	/* rx failed due to key !setup */
+	u_int32_t is_rx_acl;		/* rx discard due to of acl policy */
+	u_int32_t is_rx_ffcnt;		/* rx fast frames */
+	u_int32_t is_rx_badathtnl;   	/* driver key alloc failed */
+	u_int32_t is_tx_nobuf;		/* tx failed for lack of buf */
+	u_int32_t is_tx_nonode;		/* tx failed for no node */
+	u_int32_t is_tx_unknownmgt;	/* tx of unknown mgt frame */
+	u_int32_t is_tx_badcipher;	/* tx failed due to of key type */
+	u_int32_t is_tx_nodefkey;	/* tx failed due to no defkey */
+	u_int32_t is_tx_noheadroom;	/* tx failed due to no space */
+	u_int32_t is_tx_ffokcnt;		/* tx fast frames sent success */
+	u_int32_t is_tx_fferrcnt;	/* tx fast frames sent success */
+	u_int32_t is_scan_active;	/* active scans started */
+	u_int32_t is_scan_passive;	/* passive scans started */
+	u_int32_t is_node_timeout;	/* nodes timed out inactivity */
+	u_int32_t is_node_fdisassoc;	/* forced node disassociation */
+	u_int32_t is_crypto_nomem;	/* no memory for crypto ctx */
+	u_int32_t is_crypto_tkip;	/* tkip crypto done in s/w */
+	u_int32_t is_crypto_tkipenmic;	/* tkip en-MIC done in s/w */
+	u_int32_t is_crypto_tkipdemic;	/* tkip de-MIC done in s/w */
+	u_int32_t is_crypto_tkipcm;	/* tkip counter measures */
+	u_int32_t is_crypto_ccmp;	/* ccmp crypto done in s/w */
+	u_int32_t is_crypto_wep;		/* wep crypto done in s/w */
+	u_int32_t is_crypto_setkey_cipher;/* cipher rejected key */
+	u_int32_t is_crypto_setkey_nokey;/* no key index for setkey */
+	u_int32_t is_crypto_delkey;	/* driver key delete failed */
+	u_int32_t is_crypto_badcipher;	/* unknown cipher */
+	u_int32_t is_crypto_nocipher;	/* cipher not available */
+	u_int32_t is_crypto_attachfail;	/* cipher attach failed */
+	u_int32_t is_crypto_swfallback;	/* cipher fallback to s/w */
+	u_int32_t is_crypto_keyfail;	/* driver key alloc failed */
+	u_int32_t is_crypto_enmicfail;	/* en-MIC failed */
+	u_int32_t is_ibss_capmismatch;	/* merge failed-cap mismatch */
+	u_int32_t is_ibss_norate;	/* merge failed-rate mismatch */
+	u_int32_t is_ps_unassoc;		/* ps-poll for unassoc. sta */
+	u_int32_t is_ps_badaid;		/* ps-poll w/ incorrect aid */
+	u_int32_t is_ps_qempty;		/* ps-poll w/ nothing to send */
+};
+
+/*
+ * Max size of optional information elements.  We artificially
+ * constrain this; it's limited only by the max frame size (and
+ * the max parameter size of the wireless extensions).
+ */
+#define	IEEE80211_MAX_OPT_IE	256
+
+/*
+ * WPA/RSN get/set key request.  Specify the key/cipher
+ * type and whether the key is to be used for sending and/or
+ * receiving.  The key index should be set only when working
+ * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
+ * Otherwise a unicast/pairwise key is specified by the bssid
+ * (on a station) or mac address (on an ap).  They key length
+ * must include any MIC key data; otherwise it should be no
+ more than IEEE80211_KEYBUF_SIZE.
+ */
+struct ieee80211req_key {
+	u_int8_t ik_type;		/* key/cipher type */
+	u_int8_t ik_pad;
+	ieee80211_keyix_t ik_keyix;	/* key index */
+	u_int8_t ik_keylen;		/* key length in bytes */
+	u_int8_t ik_flags;
+/* NB: IEEE80211_KEY_XMIT and IEEE80211_KEY_RECV defined elsewhere */
+#define	IEEE80211_KEY_DEFAULT	0x80	/* default xmit key */
+	u_int8_t ik_macaddr[IEEE80211_ADDR_LEN];
+	u_int64_t ik_keyrsc;		/* key receive sequence counter */
+	u_int64_t ik_keytsc;		/* key transmit sequence counter */
+	u_int8_t ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
+};
+
+/*
+ * Delete a key either by index or address.  Set the index
+ * to IEEE80211_KEYIX_NONE when deleting a unicast key.
+ */
+struct ieee80211req_del_key {
+	/* NB: This is different to ieee80211_keyix_t, but this is OK as 
+	 * values are unique over the low order bits. */
+	u_int8_t idk_keyix;	/* key index */
+	u_int8_t idk_macaddr[IEEE80211_ADDR_LEN];
+};
+
+/*
+ * MLME state manipulation request.  IEEE80211_MLME_ASSOC
+ * only makes sense when operating as a station.  The other
+ * requests can be used when operating as a station or an
+ * ap (to effect a station).
+ */
+struct ieee80211req_mlme {
+	u_int8_t im_op;			/* operation to perform */
+#define	IEEE80211_MLME_ASSOC		1	/* associate station */
+#define	IEEE80211_MLME_DISASSOC		2	/* disassociate station */
+#define	IEEE80211_MLME_DEAUTH		3	/* deauthenticate station */
+#define	IEEE80211_MLME_AUTHORIZE	4	/* authorize station */
+#define	IEEE80211_MLME_UNAUTHORIZE	5	/* unauthorize station */
+#define IEEE80211_MLME_CLEAR_STATS	6	/* clear station statistic */
+	u_int8_t im_ssid_len;		/* length of optional ssid */
+	u_int16_t im_reason;		/* 802.11 reason code */
+	u_int8_t im_macaddr[IEEE80211_ADDR_LEN];
+	u_int8_t im_ssid[IEEE80211_NWID_LEN];
+};
+
+/* 
+ * MAC ACL operations.
+ */
+enum {
+	IEEE80211_MACCMD_POLICY_OPEN	= 0,	/* set policy: no ACLs */
+	IEEE80211_MACCMD_POLICY_ALLOW	= 1,	/* set policy: allow traffic */
+	IEEE80211_MACCMD_POLICY_DENY	= 2,	/* set policy: deny traffic */
+	IEEE80211_MACCMD_FLUSH		= 3,	/* flush ACL database */
+	IEEE80211_MACCMD_DETACH		= 4,	/* detach ACL policy */
+};
+
+/*
+ * Set the active channel list.  Note this list is
+ * intersected with the available channel list in
+ * calculating the set of channels actually used in
+ * scanning.
+ */
+struct ieee80211req_chanlist {
+	u_int8_t ic_channels[IEEE80211_CHAN_BYTES];
+};
+
+/*
+ * Get the active channel list info.
+ */
+struct ieee80211req_chaninfo {
+	u_int ic_nchans;
+	struct ieee80211_channel ic_chans[IEEE80211_CHAN_MAX];
+};
+
+/*
+ * Retrieve the WPA/RSN information element for an associated station.
+ */
+struct ieee80211req_wpaie {
+	u_int8_t	wpa_macaddr[IEEE80211_ADDR_LEN];
+	u_int8_t	wpa_ie[IEEE80211_MAX_OPT_IE];
+	u_int8_t	rsn_ie[IEEE80211_MAX_OPT_IE];
+};
+
+/*
+ * Retrieve per-node statistics.
+ */
+struct ieee80211req_sta_stats {
+	union {
+		/* NB: explicitly force 64-bit alignment */
+		u_int8_t macaddr[IEEE80211_ADDR_LEN];
+		u_int64_t pad;
+	} is_u;
+	struct ieee80211_nodestats is_stats;
+};
+
+/*
+ * Station information block; the mac address is used
+ * to retrieve other data like stats, unicast key, etc.
+ */
+struct ieee80211req_sta_info {
+	u_int16_t isi_len;		/* length (mult of 4) */
+	u_int16_t isi_freq;		/* MHz */
+	u_int16_t isi_flags;		/* channel flags */
+	u_int16_t isi_state;		/* state flags */
+	u_int8_t isi_authmode;		/* authentication algorithm */
+	u_int8_t isi_rssi;
+	int8_t isi_noise;
+	u_int16_t isi_capinfo;		/* capabilities */
+	u_int8_t isi_athflags;		/* Atheros capabilities */
+	u_int8_t isi_erp;		/* ERP element */
+	u_int8_t isi_macaddr[IEEE80211_ADDR_LEN];
+	u_int8_t isi_nrates;		/* negotiated rates */
+	u_int8_t isi_rates[IEEE80211_RATE_MAXSIZE];
+	u_int8_t isi_txrate;		/* index to isi_rates[] */
+	u_int16_t isi_ie_len;		/* IE length */
+	u_int16_t isi_associd;		/* assoc response */
+	u_int16_t isi_txpower;		/* current tx power */
+	u_int16_t isi_vlan;		/* vlan tag */
+	u_int16_t isi_txseqs[17];	/* seq to be transmitted */
+	u_int16_t isi_rxseqs[17];	/* seq previous for qos frames*/
+	u_int16_t isi_inact;		/* inactivity timer */
+	u_int8_t isi_uapsd;		/* UAPSD queues */
+	u_int8_t isi_opmode;		/* sta operating mode */
+
+	/* XXX frag state? */
+	/* variable length IE data */
+};
+
+enum {
+	IEEE80211_STA_OPMODE_NORMAL,
+	IEEE80211_STA_OPMODE_XR
+};
+
+/*
+ * Retrieve per-station information; to retrieve all
+ * specify a mac address of ff:ff:ff:ff:ff:ff.
+ */
+struct ieee80211req_sta_req {
+	union {
+		/* NB: explicitly force 64-bit alignment */
+		u_int8_t macaddr[IEEE80211_ADDR_LEN];
+		u_int64_t pad;
+	} is_u;
+	struct ieee80211req_sta_info info[1];	/* variable length */
+};
+
+/*
+ * Get/set per-station tx power cap.
+ */
+struct ieee80211req_sta_txpow {
+	u_int8_t	it_macaddr[IEEE80211_ADDR_LEN];
+	u_int8_t	it_txpow;
+};
+
+/*
+ * WME parameters are set and return using i_val and i_len.
+ * i_val holds the value itself.  i_len specifies the AC
+ * and, as appropriate, then high bit specifies whether the
+ * operation is to be applied to the BSS or ourself.
+ */
+#define	IEEE80211_WMEPARAM_SELF	0x0000		/* parameter applies to self */
+#define	IEEE80211_WMEPARAM_BSS	0x8000		/* parameter applies to BSS */
+#define	IEEE80211_WMEPARAM_VAL	0x7fff		/* parameter value */
+
+/*
+ * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
+ */
+struct ieee80211req_scan_result {
+	u_int16_t isr_len;		/* length (mult of 4) */
+	u_int16_t isr_freq;		/* MHz */
+	u_int16_t isr_flags;		/* channel flags */
+	u_int8_t isr_noise;
+	u_int8_t isr_rssi;
+	u_int8_t isr_intval;		/* beacon interval */
+	u_int16_t isr_capinfo;		/* capabilities */
+	u_int8_t isr_erp;		/* ERP element */
+	u_int8_t isr_bssid[IEEE80211_ADDR_LEN];
+	u_int8_t isr_nrates;
+	u_int8_t isr_rates[IEEE80211_RATE_MAXSIZE];
+	u_int8_t isr_ssid_len;		/* SSID length */
+	u_int8_t isr_ie_len;		/* IE length */
+	u_int8_t isr_pad[5];
+	/* variable length SSID followed by IE data */
+};
+
+#ifdef __FreeBSD__
+/*
+ * FreeBSD-style ioctls.
+ */
+/* the first member must be matched with struct ifreq */
+struct ieee80211req {
+	char i_name[IFNAMSIZ];	/* if_name, e.g. "wi0" */
+	u_int16_t i_type;	/* req type */
+	int16_t 	i_val;		/* Index or simple value */
+	int16_t 	i_len;		/* Index or simple value */
+	void *i_data;		/* Extra data */
+};
+#define	SIOCS80211		 _IOW('i', 234, struct ieee80211req)
+#define	SIOCG80211		_IOWR('i', 235, struct ieee80211req)
+#define	SIOCG80211STATS		_IOWR('i', 236, struct ifreq)
+#define	SIOC80211IFCREATE	_IOWR('i', 237, struct ifreq)
+#define	SIOC80211IFDESTROY	 _IOW('i', 238, struct ifreq)
+
+#define IEEE80211_IOC_SSID		1
+#define IEEE80211_IOC_NUMSSIDS		2
+#define IEEE80211_IOC_WEP		3
+#define 	IEEE80211_WEP_NOSUP		-1
+#define 	IEEE80211_WEP_OFF		0
+#define 	IEEE80211_WEP_ON		1
+#define 	IEEE80211_WEP_MIXED		2
+#define IEEE80211_IOC_WEPKEY		4
+#define IEEE80211_IOC_NUMWEPKEYS	5
+#define IEEE80211_IOC_WEPTXKEY		6
+#define IEEE80211_IOC_AUTHMODE		7
+#define IEEE80211_IOC_STATIONNAME	8
+#define IEEE80211_IOC_CHANNEL		9
+#define IEEE80211_IOC_POWERSAVE		10
+#define 	IEEE80211_POWERSAVE_NOSUP	-1
+#define 	IEEE80211_POWERSAVE_OFF		0
+#define 	IEEE80211_POWERSAVE_CAM		1
+#define 	IEEE80211_POWERSAVE_PSP		2
+#define 	IEEE80211_POWERSAVE_PSP_CAM	3
+#define 	IEEE80211_POWERSAVE_ON		IEEE80211_POWERSAVE_CAM
+#define IEEE80211_IOC_POWERSAVESLEEP	11
+#define	IEEE80211_IOC_RTSTHRESHOLD	12
+#define IEEE80211_IOC_PROTMODE		13
+#define 	IEEE80211_PROTMODE_OFF		0
+#define 	IEEE80211_PROTMODE_CTS		1
+#define 	IEEE80211_PROTMODE_RTSCTS	2
+#define	IEEE80211_IOC_TXPOWER		14	/* global tx power limit */
+#define	IEEE80211_IOC_BSSID		15
+#define	IEEE80211_IOC_ROAMING		16	/* roaming mode */
+#define	IEEE80211_IOC_PRIVACY		17	/* privacy invoked */
+#define	IEEE80211_IOC_DROPUNENCRYPTED	18	/* discard unencrypted frames */
+#define	IEEE80211_IOC_WPAKEY		19
+#define	IEEE80211_IOC_DELKEY		20
+#define	IEEE80211_IOC_MLME		21
+#define	IEEE80211_IOC_OPTIE		22	/* optional info. element */
+#define	IEEE80211_IOC_SCAN_REQ		23
+#define	IEEE80211_IOC_SCAN_RESULTS	24
+#define	IEEE80211_IOC_COUNTERMEASURES	25	/* WPA/TKIP countermeasures */
+#define	IEEE80211_IOC_WPA		26	/* WPA mode (0,1,2) */
+#define	IEEE80211_IOC_CHANLIST		27	/* channel list */
+#define	IEEE80211_IOC_WME		28	/* WME mode (on, off) */
+#define	IEEE80211_IOC_HIDESSID		29	/* hide SSID mode (on, off) */
+#define IEEE80211_IOC_APBRIDGE		30	/* AP inter-sta bridging */
+#define	IEEE80211_IOC_MCASTCIPHER	31	/* multicast/default cipher */
+#define	IEEE80211_IOC_MCASTKEYLEN	32	/* multicast key length */
+#define	IEEE80211_IOC_UCASTCIPHERS	33	/* unicast cipher suites */
+#define	IEEE80211_IOC_UCASTCIPHER	34	/* unicast cipher */
+#define	IEEE80211_IOC_UCASTKEYLEN	35	/* unicast key length */
+#define	IEEE80211_IOC_DRIVER_CAPS	36	/* driver capabilities */
+#define	IEEE80211_IOC_KEYMGTALGS	37	/* key management algorithms */
+#define	IEEE80211_IOC_RSNCAPS		38	/* RSN capabilities */
+#define	IEEE80211_IOC_WPAIE		39	/* WPA information element */
+#define	IEEE80211_IOC_STA_STATS		40	/* per-station statistics */
+#define	IEEE80211_IOC_MACCMD		41	/* MAC ACL operation */
+#define	IEEE80211_IOC_TXPOWMAX		43	/* max tx power for channel */
+#define	IEEE80211_IOC_STA_TXPOW		44	/* per-station tx power limit */
+#define	IEEE80211_IOC_STA_INFO		45	/* station/neighbor info */
+#define	IEEE80211_IOC_WME_CWMIN		46	/* WME: ECWmin */
+#define	IEEE80211_IOC_WME_CWMAX		47	/* WME: ECWmax */
+#define	IEEE80211_IOC_WME_AIFS		48	/* WME: AIFSN */
+#define	IEEE80211_IOC_WME_TXOPLIMIT	49	/* WME: txops limit */
+#define	IEEE80211_IOC_WME_ACM		50	/* WME: ACM (bss only) */
+#define	IEEE80211_IOC_WME_ACKPOLICY	51	/* WME: ACK policy (!bss only)*/
+#define	IEEE80211_IOC_DTIM_PERIOD	52	/* DTIM period (beacons) */
+#define	IEEE80211_IOC_BEACON_INTERVAL	53	/* beacon interval (ms) */
+#define	IEEE80211_IOC_ADDMAC		54	/* add sta to MAC ACL table */
+#define	IEEE80211_IOC_SETMAC		55	/* set interface wds mac addr */
+#define	IEEE80211_IOC_FF		56	/* ATH fast frames (on, off) */
+#define	IEEE80211_IOC_TURBOP		57	/* ATH turbo' (on, off) */
+#define	IEEE80211_IOC_APPIEBUF		58	/* IE in the management frame */
+#define	IEEE80211_IOC_FILTERFRAME	59	/* management frame filter */
+
+/*
+ * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
+ */
+struct ieee80211req_scan_result {
+	u_int16_t isr_len;		/* length (mult of 4) */
+	u_int16_t isr_freq;		/* MHz */
+	u_int16_t isr_flags;		/* channel flags */
+	u_int8_t isr_noise;
+	u_int8_t isr_rssi;
+	u_int8_t isr_intval;		/* beacon interval */
+	u_int16_t isr_capinfo;		/* capabilities */
+	u_int8_t isr_erp;		/* ERP element */
+	u_int8_t isr_bssid[IEEE80211_ADDR_LEN];
+	u_int8_t isr_nrates;
+	u_int8_t isr_rates[IEEE80211_RATE_MAXSIZE];
+	u_int8_t isr_ssid_len;		/* SSID length */
+	u_int8_t isr_ie_len;		/* IE length */
+	u_int8_t isr_pad[5];
+	/* variable length SSID followed by IE data */
+};
+
+#endif /* __FreeBSD__ */
+
+#ifdef __linux__
+/*
+ * Wireless Extensions API, private ioctl interfaces.
+ *
+ * NB: Even-numbered ioctl numbers have set semantics and are privileged!
+ *     (regardless of the incorrect comment in wireless.h!)
+ */
+#ifdef __KERNEL__
+#include <linux/if.h>
+#endif
+/* The maximum size of a iwpriv structure is IW_PRIV_SIZE_MASK, which was 
+ * exceeded for some time by chaninfo ioctl.  These macros change the size 
+ * encoding for anything larger than IW_PRIV_SIZE_MASK from bytes to 4-byte
+ * multiples so that the padded size fits under IW_PRIV_SIZE_MASK. */
+#define IW_PRIV_BLOB_LENGTH_ENCODING(_SIZE) \
+	(((_SIZE) == ((_SIZE) & IW_PRIV_SIZE_MASK)) ? \
+		(_SIZE) : \
+		(((_SIZE) / sizeof(uint32_t)) + \
+			(((_SIZE) == (((_SIZE) / sizeof(uint32_t)) * sizeof(int))) ? \
+				0 : 1)))
+#define IW_PRIV_BLOB_TYPE_ENCODING(_SIZE) \
+	(((_SIZE) == ((_SIZE) & IW_PRIV_SIZE_MASK)) ? \
+		(IW_PRIV_TYPE_BYTE | (_SIZE)) : \
+		(IW_PRIV_TYPE_INT  | IW_PRIV_BLOB_LENGTH_ENCODING((_SIZE))))
+
+#define	IEEE80211_IOCTL_SETPARAM	(SIOCIWFIRSTPRIV+0)
+#define	IEEE80211_IOCTL_GETPARAM	(SIOCIWFIRSTPRIV+1)
+#define	IEEE80211_IOCTL_SETMODE		(SIOCIWFIRSTPRIV+2)
+#define	IEEE80211_IOCTL_GETMODE		(SIOCIWFIRSTPRIV+3)
+#define	IEEE80211_IOCTL_SETWMMPARAMS	(SIOCIWFIRSTPRIV+4)
+#define	IEEE80211_IOCTL_GETWMMPARAMS	(SIOCIWFIRSTPRIV+5)
+#define	IEEE80211_IOCTL_SETCHANLIST	(SIOCIWFIRSTPRIV+6)
+#define	IEEE80211_IOCTL_GETCHANLIST	(SIOCIWFIRSTPRIV+7)
+#define	IEEE80211_IOCTL_CHANSWITCH	(SIOCIWFIRSTPRIV+8)
+#define	IEEE80211_IOCTL_GET_APPIEBUF	(SIOCIWFIRSTPRIV+9)
+#define	IEEE80211_IOCTL_SET_APPIEBUF	(SIOCIWFIRSTPRIV+10)
+#define	IEEE80211_IOCTL_READREG		(SIOCIWFIRSTPRIV+11)
+#define	IEEE80211_IOCTL_FILTERFRAME	(SIOCIWFIRSTPRIV+12)
+#define	IEEE80211_IOCTL_GETCHANINFO	(SIOCIWFIRSTPRIV+13)
+#define	IEEE80211_IOCTL_SETOPTIE	(SIOCIWFIRSTPRIV+14)
+#define	IEEE80211_IOCTL_GETOPTIE	(SIOCIWFIRSTPRIV+15)
+#define	IEEE80211_IOCTL_SETMLME		(SIOCIWFIRSTPRIV+16)
+#define	IEEE80211_IOCTL_RADAR		(SIOCIWFIRSTPRIV+17)
+#define	IEEE80211_IOCTL_SETKEY		(SIOCIWFIRSTPRIV+18)
+#define	IEEE80211_IOCTL_WRITEREG	(SIOCIWFIRSTPRIV+19)
+#define	IEEE80211_IOCTL_DELKEY		(SIOCIWFIRSTPRIV+20)
+#define	IEEE80211_IOCTL_HALMAP		(SIOCIWFIRSTPRIV+21)
+#define	IEEE80211_IOCTL_ADDMAC		(SIOCIWFIRSTPRIV+22)
+#define	IEEE80211_IOCTL_DELMAC		(SIOCIWFIRSTPRIV+24)
+#define	IEEE80211_IOCTL_WDSADDMAC	(SIOCIWFIRSTPRIV+25)
+#define	IEEE80211_IOCTL_WDSSETMAC	(SIOCIWFIRSTPRIV+26)
+#define	IEEE80211_IOCTL_KICKMAC		(SIOCIWFIRSTPRIV+30)
+#define	IEEE80211_IOCTL_SETSCANLIST	(SIOCIWFIRSTPRIV+31)
+
+enum {
+	IEEE80211_WMMPARAMS_CWMIN       = 1,
+	IEEE80211_WMMPARAMS_CWMAX       = 2,
+	IEEE80211_WMMPARAMS_AIFS       	= 3,
+	IEEE80211_WMMPARAMS_TXOPLIMIT	= 4,
+	IEEE80211_WMMPARAMS_ACM		= 5,
+	IEEE80211_WMMPARAMS_NOACKPOLICY	= 6,
+};
+enum {
+	IEEE80211_PARAM_TURBO			= 1,	/* turbo mode */
+	IEEE80211_PARAM_MODE			= 2,	/* phy mode (11a, 11b, etc.) */
+	IEEE80211_PARAM_AUTHMODE		= 3,	/* authentication mode */
+	IEEE80211_PARAM_PROTMODE		= 4,	/* 802.11g protection */
+	IEEE80211_PARAM_MCASTCIPHER		= 5,	/* multicast/default cipher */
+	IEEE80211_PARAM_MCASTKEYLEN		= 6,	/* multicast key length */
+	IEEE80211_PARAM_UCASTCIPHERS		= 7,	/* unicast cipher suites */
+	IEEE80211_PARAM_UCASTCIPHER		= 8,	/* unicast cipher */
+	IEEE80211_PARAM_UCASTKEYLEN		= 9,	/* unicast key length */
+	IEEE80211_PARAM_WPA			= 10,	/* WPA mode (0,1,2) */
+	IEEE80211_PARAM_ROAMING			= 12,	/* roaming mode */
+	IEEE80211_PARAM_PRIVACY			= 13,	/* privacy invoked */
+	IEEE80211_PARAM_COUNTERMEASURES		= 14,	/* WPA/TKIP countermeasures */
+	IEEE80211_PARAM_DROPUNENCRYPTED		= 15,	/* discard unencrypted frames */
+	IEEE80211_PARAM_DRIVER_CAPS		= 16,	/* driver capabilities */
+	IEEE80211_PARAM_MACCMD			= 17,	/* MAC ACL operation */
+	IEEE80211_PARAM_WMM			= 18,	/* WMM mode (on, off) */
+	IEEE80211_PARAM_HIDESSID		= 19,	/* hide SSID mode (on, off) */
+	IEEE80211_PARAM_APBRIDGE    		= 20,   /* AP inter-sta bridging */
+	IEEE80211_PARAM_KEYMGTALGS		= 21,	/* key management algorithms */
+	IEEE80211_PARAM_RSNCAPS			= 22,	/* RSN capabilities */
+	IEEE80211_PARAM_INACT			= 23,	/* station inactivity timeout */
+	IEEE80211_PARAM_INACT_AUTH		= 24,	/* station auth inact timeout */
+	IEEE80211_PARAM_INACT_INIT		= 25,	/* station init inact timeout */
+	IEEE80211_PARAM_ABOLT			= 26,	/* Atheros Adv. Capabilities */
+	IEEE80211_PARAM_INACT_TICK		= 27,	/* station inactivity timer tick (seconds) */
+	IEEE80211_PARAM_DTIM_PERIOD		= 28,	/* DTIM period (beacons) */
+	IEEE80211_PARAM_BEACON_INTERVAL		= 29,	/* beacon interval (ms) */
+	IEEE80211_PARAM_DOTH			= 30,	/* 11.h is on/off */
+	IEEE80211_PARAM_PWRTARGET		= 31,	/* Current Channel Pwr Constraint */
+	IEEE80211_PARAM_GENREASSOC		= 32,	/* Generate a reassociation request */
+	IEEE80211_PARAM_COMPRESSION		= 33,	/* compression */
+	IEEE80211_PARAM_FF			= 34,	/* fast frames support  */
+	IEEE80211_PARAM_XR			= 35,	/* XR support */
+	IEEE80211_PARAM_BURST			= 36,	/* burst mode */
+	IEEE80211_PARAM_PUREG			= 37,	/* pure 11g (no 11b stations) */
+	IEEE80211_PARAM_AR			= 38,	/* AR support */
+	IEEE80211_PARAM_WDS			= 39,	/* Enable 4 address processing */
+	IEEE80211_PARAM_BGSCAN			= 40,	/* bg scanning (on, off) */
+	IEEE80211_PARAM_BGSCAN_IDLE		= 41,	/* bg scan idle threshold */
+	IEEE80211_PARAM_BGSCAN_INTERVAL		= 42,	/* bg scan interval */
+	IEEE80211_PARAM_MCAST_RATE		= 43,	/* Multicast Tx Rate */
+	IEEE80211_PARAM_COVERAGE_CLASS		= 44,	/* coverage class */
+	IEEE80211_PARAM_COUNTRY_IE		= 45,	/* enable country IE */
+	IEEE80211_PARAM_SCANVALID		= 46,	/* scan cache valid threshold */
+	IEEE80211_PARAM_ROAM_RSSI_11A		= 47,	/* rssi threshold in 11a */
+	IEEE80211_PARAM_ROAM_RSSI_11B		= 48,	/* rssi threshold in 11b */
+	IEEE80211_PARAM_ROAM_RSSI_11G		= 49,	/* rssi threshold in 11g */
+	IEEE80211_PARAM_ROAM_RATE_11A		= 50,	/* tx rate threshold in 11a */
+	IEEE80211_PARAM_ROAM_RATE_11B		= 51,	/* tx rate threshold in 11b */
+	IEEE80211_PARAM_ROAM_RATE_11G		= 52,	/* tx rate threshold in 11g */
+	IEEE80211_PARAM_UAPSDINFO		= 53,	/* value for qos info field */
+	IEEE80211_PARAM_SLEEP			= 54,	/* force sleep/wake */
+	IEEE80211_PARAM_QOSNULL			= 55,	/* force sleep/wake */
+	IEEE80211_PARAM_PSPOLL			= 56,	/* force ps-poll generation (sta only) */
+	IEEE80211_PARAM_EOSPDROP		= 57,	/* force uapsd EOSP drop (ap only) */
+	IEEE80211_PARAM_MARKDFS			= 58,	/* mark a dfs interference channel when found */
+	IEEE80211_PARAM_REGCLASS		= 59,	/* enable regclass ids in country IE */
+	IEEE80211_PARAM_DROPUNENC_EAPOL		= 60,	/* drop unencrypted eapol frames */
+	IEEE80211_PARAM_SHPREAMBLE		= 61,	/* Short Preamble */
+	IEEE80211_PARAM_DUMPREGS		= 62,	/* Pretty printed dump of Atheros hardware registers */
+	IEEE80211_PARAM_DOTH_ALGORITHM		= 63,	/* spectrum management algorithm */
+	IEEE80211_PARAM_DOTH_MINCOM   		= 64,	/* minimum number of common channels */
+	IEEE80211_PARAM_DOTH_SLCG		= 65,	/* permil of Stations Lost per Channel Gained */
+	IEEE80211_PARAM_DOTH_SLDG		= 66,	/* permil of Stations Lost per rssi Db Gained */
+	IEEE80211_PARAM_TXCONT			= 67,	/* continuous transmit mode (boolean) */
+	IEEE80211_PARAM_TXCONT_RATE		= 68,	/* continuous transmit mode data rate (in mbit/sec) - will use closest match from current rate table */
+	IEEE80211_PARAM_TXCONT_POWER		= 69,	/* power level in units of 0.5dBm */
+	IEEE80211_PARAM_DFS_TESTMODE		= 70,	/* do not perform DFS actions (i.e. markng DFS and channel change on interference), just report them via debug. */
+	IEEE80211_PARAM_DFS_CACTIME		= 71,	/* how long do we wait for chan availability
+							   scans ?
+							   FCC requires 60s, so that is the default. */
+	IEEE80211_PARAM_DFS_EXCLPERIOD		= 72,	/* DFS no-occupancy limit - how long do we stay
+							   off a channel once radar is detected?
+							   FCC requires 30m, so that is the default. */
+	IEEE80211_PARAM_BEACON_MISS_THRESH	= 73,	/* Beacon miss threshold (in beacons) */
+	IEEE80211_PARAM_BEACON_MISS_THRESH_MS	= 74,	/* Beacon miss threshold (in ms) */
+	IEEE80211_PARAM_MAXRATE			= 75,	/* Maximum rate (by table index) */
+	IEEE80211_PARAM_MINRATE			= 76,	/* Minimum rate (by table index) */
+	IEEE80211_PARAM_PROTMODE_RSSI		= 77,	/* RSSI Threshold for enabling protection mode */
+	IEEE80211_PARAM_PROTMODE_TIMEOUT	= 78,	/* Timeout for expiring protection mode */
+	IEEE80211_PARAM_BGSCAN_THRESH		= 79,	/* bg scan rssi threshold */
+	IEEE80211_PARAM_RSSI_DIS_THR	= 80,	/* rssi threshold for disconnection */
+	IEEE80211_PARAM_RSSI_DIS_COUNT	= 81,	/* counter for rssi threshold */
+	IEEE80211_PARAM_WDS_SEP			= 82,	/* move wds stations into separate interfaces */
+	IEEE80211_PARAM_MAXASSOC		= 83,	/* maximum associated stations */
+	IEEE80211_PARAM_PROBEREQ		= 84,	/* enable handling of probe requests */
+	IEEE80211_PARAM_BEACON_TXP		= 85,	/* set beacon tx power */
+};
+
+#define	SIOCG80211STATS			(SIOCDEVPRIVATE+2)
+/* NB: require in+out parameters so cannot use wireless extensions, yech */
+#define	IEEE80211_IOCTL_GETKEY		(SIOCDEVPRIVATE+3)
+#define	IEEE80211_IOCTL_GETWPAIE	(SIOCDEVPRIVATE+4)
+#define	IEEE80211_IOCTL_STA_STATS	(SIOCDEVPRIVATE+5)
+#define	IEEE80211_IOCTL_STA_INFO	(SIOCDEVPRIVATE+6)
+#define	SIOC80211IFCREATE		(SIOCDEVPRIVATE+7)
+#define	SIOC80211IFDESTROY	 	(SIOCDEVPRIVATE+8)
+#define	IEEE80211_IOCTL_SCAN_RESULTS	(SIOCDEVPRIVATE+9)
+
+struct ieee80211_clone_params {
+	char icp_name[IFNAMSIZ];		/* device name */
+	u_int16_t icp_opmode;			/* operating mode */
+	u_int16_t icp_flags;			/* see below */
+#define	IEEE80211_CLONE_BSSID	0x0001		/* allocate unique mac/bssid */
+#define	IEEE80211_NO_STABEACONS	0x0002		/* Do not setup the station beacon timers */
+};
+
+/* APPIEBUF related definitions */
+
+/* Management frame type to which application IE is added */
+enum {
+	IEEE80211_APPIE_FRAME_BEACON		= 0,
+	IEEE80211_APPIE_FRAME_PROBE_REQ		= 1,
+	IEEE80211_APPIE_FRAME_PROBE_RESP	= 2,
+	IEEE80211_APPIE_FRAME_ASSOC_REQ		= 3,
+	IEEE80211_APPIE_FRAME_ASSOC_RESP	= 4,
+	IEEE80211_APPIE_NUM_OF_FRAME		= 5
+};
+
+struct ieee80211req_getset_appiebuf {
+	u_int32_t	app_frmtype;		/* management frame type for which buffer is added */
+	u_int32_t	app_buflen;		/* application-supplied buffer length */
+	u_int8_t	app_buf[0];		/* application-supplied IE(s) */
+};
+
+/* Flags ORed by application to set filter for receiving management frames */
+enum {
+	IEEE80211_FILTER_TYPE_BEACON		= 1<<0,
+	IEEE80211_FILTER_TYPE_PROBE_REQ		= 1<<1,
+	IEEE80211_FILTER_TYPE_PROBE_RESP	= 1<<2,
+	IEEE80211_FILTER_TYPE_ASSOC_REQ		= 1<<3,
+	IEEE80211_FILTER_TYPE_ASSOC_RESP	= 1<<4,
+	IEEE80211_FILTER_TYPE_AUTH		= 1<<5,
+	IEEE80211_FILTER_TYPE_DEAUTH		= 1<<6,
+	IEEE80211_FILTER_TYPE_DISASSOC		= 1<<7,
+	IEEE80211_FILTER_TYPE_ALL		= 0xFF	/* used to check the valid filter bits */
+};
+
+struct ieee80211req_set_filter {
+	u_int32_t app_filterype;		/* management frame filter type */
+};
+
+
+#endif /* __linux__ */
+
+#endif /* _NET80211_IEEE80211_IOCTL_H_ */
diff --git a/trunk/package/network/services/hostapd/patches/100-madwifi_key_fixes.patch b/trunk/package/network/services/hostapd/patches/100-madwifi_key_fixes.patch
new file mode 100644
index 00000000..a46943b4
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/100-madwifi_key_fixes.patch
@@ -0,0 +1,34 @@
+--- a/src/drivers/driver_madwifi.c
++++ b/src/drivers/driver_madwifi.c
+@@ -449,7 +449,9 @@ wpa_driver_madwifi_set_key(const char *i
+ 
+ 	memset(&wk, 0, sizeof(wk));
+ 	wk.ik_type = cipher;
+-	wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT;
++	wk.ik_flags = IEEE80211_KEY_RECV;
++	if (set_tx)
++		wk.ik_flags |= IEEE80211_KEY_XMIT;
+ 	if (addr == NULL || is_broadcast_ether_addr(addr)) {
+ 		memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
+ 		wk.ik_keyix = key_idx;
+@@ -461,6 +463,20 @@ wpa_driver_madwifi_set_key(const char *i
+ 	wk.ik_keylen = key_len;
+ 	memcpy(wk.ik_keydata, key, key_len);
+ 
++#ifdef WORDS_BIGENDIAN
++#define WPA_KEY_RSC_LEN 8
++	{
++		size_t i;
++		u8 tmp[WPA_KEY_RSC_LEN];
++		os_memset(tmp, 0, sizeof(tmp));
++		for (i = 0; i < seq_len; i++)
++			tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i];
++		os_memcpy(&wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN);
++	}
++#else /* WORDS_BIGENDIAN */
++	os_memcpy(&wk.ik_keyrsc, seq, seq_len);
++#endif /* WORDS_BIGENDIAN */
++
+ 	ret = set80211priv(drv, IEEE80211_IOCTL_SETKEY, &wk, sizeof(wk));
+ 	if (ret < 0) {
+ 		wpa_printf(MSG_DEBUG, "%s: Failed to set key (addr %s"
diff --git a/trunk/package/network/services/hostapd/patches/110-bool_fix.patch b/trunk/package/network/services/hostapd/patches/110-bool_fix.patch
new file mode 100644
index 00000000..9cab8abd
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/110-bool_fix.patch
@@ -0,0 +1,14 @@
+--- a/src/ap/ieee802_1x.c
++++ b/src/ap/ieee802_1x.c
+@@ -2232,9 +2232,9 @@ void ieee802_1x_notify_pre_auth(struct e
+ }
+ 
+ 
+-static const char * bool_txt(Boolean bool)
++static const char * bool_txt(Boolean bool_val)
+ {
+-	return bool ? "TRUE" : "FALSE";
++	return bool_val ? "TRUE" : "FALSE";
+ }
+ 
+ 
diff --git a/trunk/package/network/services/hostapd/patches/120-daemonize_fix.patch b/trunk/package/network/services/hostapd/patches/120-daemonize_fix.patch
new file mode 100644
index 00000000..54ace767
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/120-daemonize_fix.patch
@@ -0,0 +1,97 @@
+--- a/src/utils/os_unix.c
++++ b/src/utils/os_unix.c
+@@ -10,6 +10,7 @@
+ 
+ #include <time.h>
+ #include <sys/wait.h>
++#include <fcntl.h>
+ 
+ #ifdef ANDROID
+ #include <sys/capability.h>
+@@ -155,59 +156,46 @@ int os_gmtime(os_time_t t, struct os_tm 
+ 	return 0;
+ }
+ 
+-
+-#ifdef __APPLE__
+-#include <fcntl.h>
+-static int os_daemon(int nochdir, int noclose)
++int os_daemonize(const char *pid_file)
+ {
+-	int devnull;
++	int pid = 0, i, devnull;
+ 
+-	if (chdir("/") < 0)
+-		return -1;
++#if defined(__uClinux__) || defined(__sun__)
++	return -1;
++#else /* defined(__uClinux__) || defined(__sun__) */
+ 
+-	devnull = open("/dev/null", O_RDWR);
+-	if (devnull < 0)
++#ifndef __APPLE__
++	pid = fork();
++	if (pid < 0)
+ 		return -1;
++#endif
+ 
+-	if (dup2(devnull, STDIN_FILENO) < 0) {
+-		close(devnull);
+-		return -1;
++	if (pid > 0) {
++		if (pid_file) {
++			FILE *f = fopen(pid_file, "w");
++			if (f) {
++				fprintf(f, "%u\n", pid);
++				fclose(f);
++			}
++		}
++		_exit(0);
+ 	}
+ 
+-	if (dup2(devnull, STDOUT_FILENO) < 0) {
+-		close(devnull);
++	if (setsid() < 0)
+ 		return -1;
+-	}
+ 
+-	if (dup2(devnull, STDERR_FILENO) < 0) {
+-		close(devnull);
++	if (chdir("/") < 0)
+ 		return -1;
+-	}
+-
+-	return 0;
+-}
+-#else /* __APPLE__ */
+-#define os_daemon daemon
+-#endif /* __APPLE__ */
+ 
+-
+-int os_daemonize(const char *pid_file)
+-{
+-#if defined(__uClinux__) || defined(__sun__)
+-	return -1;
+-#else /* defined(__uClinux__) || defined(__sun__) */
+-	if (os_daemon(0, 0)) {
+-		perror("daemon");
++	devnull = open("/dev/null", O_RDWR);
++	if (devnull < 0)
+ 		return -1;
+-	}
+ 
+-	if (pid_file) {
+-		FILE *f = fopen(pid_file, "w");
+-		if (f) {
+-			fprintf(f, "%u\n", getpid());
+-			fclose(f);
+-		}
+-	}
++	for (i = 0; i <= STDERR_FILENO; i++)
++		dup2(devnull, i);
++
++	if (devnull > 2)
++		close(devnull);
+ 
+ 	return -0;
+ #endif /* defined(__uClinux__) || defined(__sun__) */
diff --git a/trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch b/trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch
new file mode 100644
index 00000000..3c19cb3c
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/130-no_eapol_fix.patch
@@ -0,0 +1,14 @@
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -247,9 +247,10 @@ void wpa_supplicant_cancel_auth_timeout(
+  */
+ void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
+ {
++	struct wpa_ssid *ssid = wpa_s->current_ssid;
++
+ #ifdef IEEE8021X_EAPOL
+ 	struct eapol_config eapol_conf;
+-	struct wpa_ssid *ssid = wpa_s->current_ssid;
+ 
+ #ifdef CONFIG_IBSS_RSN
+ 	if (ssid->mode == WPAS_MODE_IBSS &&
diff --git a/trunk/package/network/services/hostapd/patches/200-multicall.patch b/trunk/package/network/services/hostapd/patches/200-multicall.patch
new file mode 100644
index 00000000..23180b92
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/200-multicall.patch
@@ -0,0 +1,276 @@
+--- a/hostapd/Makefile
++++ b/hostapd/Makefile
+@@ -14,6 +14,7 @@ CFLAGS += -I$(abspath ../src/utils)
+ # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include
+ 
+ -include .config
++-include $(if $(MULTICALL), ../wpa_supplicant/.config)
+ 
+ ifdef CONFIG_TESTING_OPTIONS
+ CFLAGS += -DCONFIG_TESTING_OPTIONS
+@@ -224,10 +225,14 @@ ifdef CONFIG_IEEE80211AC
+ CFLAGS += -DCONFIG_IEEE80211AC
+ endif
+ 
++ifndef MULTICALL
++CFLAGS += -DNO_SUPPLICANT
++endif
++
+ include ../src/drivers/drivers.mak
+-OBJS += $(DRV_AP_OBJS)
+-CFLAGS += $(DRV_AP_CFLAGS)
+-LDFLAGS += $(DRV_AP_LDFLAGS)
++OBJS += $(sort $(DRV_AP_OBJS) $(if $(MULTICALL),$(DRV_WPA_OBJS)))
++CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS))
++LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS))
+ LIBS += $(DRV_AP_LIBS)
+ 
+ ifdef CONFIG_L2_PACKET
+@@ -914,6 +919,12 @@ install: all
+ 
+ BCHECK=../src/drivers/build.hostapd
+ 
++hostapd_multi.a: $(BCHECK) $(OBJS)
++	$(Q)$(CC) -c -o hostapd_multi.o -Dmain=hostapd_main $(CFLAGS) main.c
++	@$(E) "  CC " $<
++	@rm -f $@
++	@$(AR) cr $@ hostapd_multi.o $(OBJS)
++
+ hostapd: $(BCHECK) $(OBJS)
+ 	$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ 	@$(E) "  LD " $@
+@@ -952,6 +963,12 @@ HOBJS += ../src/crypto/aes-internal.o
+ HOBJS += ../src/crypto/aes-internal-enc.o
+ endif
+ 
++dump_cflags:
++	@echo -n $(CFLAGS) " "
++
++dump_ldflags:
++	@echo -n $(LDFLAGS) $(LIBS) $(EXTRALIBS) " "
++
+ nt_password_hash: $(NOBJS)
+ 	$(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n)
+ 	@$(E) "  LD " $@
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -14,6 +14,7 @@ CFLAGS += -I$(abspath ../src)
+ CFLAGS += -I$(abspath ../src/utils)
+ 
+ -include .config
++-include $(if $(MULTICALL),../hostapd/.config)
+ 
+ ifdef CONFIG_TESTING_OPTIONS
+ CFLAGS += -DCONFIG_TESTING_OPTIONS
+@@ -745,6 +746,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+ CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
+ LIBS += -ldl -rdynamic
+ endif
++else
++  ifdef MULTICALL
++    OBJS += ../src/eap_common/eap_common.o
++  endif
+ endif
+ 
+ ifdef CONFIG_MACSEC
+@@ -765,9 +770,11 @@ NEED_EAP_COMMON=y
+ NEED_RSN_AUTHENTICATOR=y
+ CFLAGS += -DCONFIG_AP
+ OBJS += ap.o
++ifndef MULTICALL
+ CFLAGS += -DCONFIG_NO_RADIUS
+ CFLAGS += -DCONFIG_NO_ACCOUNTING
+ CFLAGS += -DCONFIG_NO_VLAN
++endif
+ OBJS += ../src/ap/hostapd.o
+ OBJS += ../src/ap/wpa_auth_glue.o
+ OBJS += ../src/ap/utils.o
+@@ -830,10 +837,18 @@ endif
+ ifdef CONFIG_HS20
+ OBJS += ../src/ap/hs20.o
+ endif
++else
++  ifdef MULTICALL
++    OBJS += ../src/eap_server/eap_server.o
++    OBJS += ../src/eap_server/eap_server_identity.o
++    OBJS += ../src/eap_server/eap_server_methods.o
++  endif
+ endif
+ 
+ ifdef NEED_RSN_AUTHENTICATOR
++ifndef MULTICALL
+ CFLAGS += -DCONFIG_NO_RADIUS
++endif
+ NEED_AES_WRAP=y
+ OBJS += ../src/ap/wpa_auth.o
+ OBJS += ../src/ap/wpa_auth_ie.o
+@@ -1589,6 +1604,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+ 
+ $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
+ 
++wpa_supplicant_multi.a: .config $(BCHECK) $(OBJS) $(EXTRA_progs)
++	$(Q)$(CC) -c -o wpa_supplicant_multi.o -Dmain=wpa_supplicant_main $(CFLAGS) main.c
++	@$(E) "  CC " $<
++	@rm -f $@
++	@$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
++
+ wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
+ 	$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
+ 	@$(E) "  LD " $@
+@@ -1669,6 +1690,12 @@ endif
+ %@.service: %.service.arg.in
+ 	sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
+ 
++dump_cflags:
++	@echo -n $(CFLAGS) " "
++
++dump_ldflags:
++	@echo -n $(LDFLAGS) $(LIBS) $(EXTRALIBS) " "
++
+ wpa_supplicant.exe: wpa_supplicant
+ 	mv -f $< $@
+ wpa_cli.exe: wpa_cli
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -4294,8 +4294,8 @@ union wpa_event_data {
+  * Driver wrapper code should call this function whenever an event is received
+  * from the driver.
+  */
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+-			  union wpa_event_data *data);
++extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
++				    union wpa_event_data *data);
+ 
+ 
+ /*
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -989,8 +989,8 @@ static void hostapd_event_dfs_nop_finish
+ #endif /* NEED_AP_MLME */
+ 
+ 
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+-			  union wpa_event_data *data)
++void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
++		       union wpa_event_data *data)
+ {
+ 	struct hostapd_data *hapd = ctx;
+ #ifndef CONFIG_NO_STDOUT_DEBUG
+--- a/wpa_supplicant/wpa_priv.c
++++ b/wpa_supplicant/wpa_priv.c
+@@ -815,8 +815,8 @@ static void wpa_priv_send_ft_response(st
+ }
+ 
+ 
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+-			  union wpa_event_data *data)
++static void supplicant_event(void *ctx, enum wpa_event_type event,
++			     union wpa_event_data *data)
+ {
+ 	struct wpa_priv_interface *iface = ctx;
+ 
+@@ -956,6 +956,7 @@ int main(int argc, char *argv[])
+ 	if (os_program_init())
+ 		return -1;
+ 
++	wpa_supplicant_event = supplicant_event;
+ 	wpa_priv_fd_workaround();
+ 
+ 	for (;;) {
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -2924,8 +2924,8 @@ static void wpa_supplicant_event_assoc_a
+ }
+ 
+ 
+-void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
+-			  union wpa_event_data *data)
++void supplicant_event(void *ctx, enum wpa_event_type event,
++		      union wpa_event_data *data)
+ {
+ 	struct wpa_supplicant *wpa_s = ctx;
+ 
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -3980,6 +3980,9 @@ static void wpa_supplicant_deinit_iface(
+ 	os_free(wpa_s);
+ }
+ 
++extern void supplicant_event(void *ctx, enum wpa_event_type event,
++			     union wpa_event_data *data);
++
+ 
+ /**
+  * wpa_supplicant_add_iface - Add a new network interface
+@@ -4181,6 +4184,7 @@ struct wpa_global * wpa_supplicant_init(
+ 	wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
+ #endif /* CONFIG_NO_WPA_MSG */
+ 
++	wpa_supplicant_event = supplicant_event;
+ 	wpa_debug_open_file(params->wpa_debug_file_path);
+ 	if (params->wpa_debug_syslog)
+ 		wpa_debug_open_syslog();
+--- a/hostapd/main.c
++++ b/hostapd/main.c
+@@ -504,6 +504,9 @@ static int hostapd_get_ctrl_iface_group(
+ 	return 0;
+ }
+ 
++void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
++                       union wpa_event_data *data);
++
+ 
+ #ifdef CONFIG_WPS
+ static int gen_uuid(const char *txt_addr)
+@@ -555,6 +558,7 @@ int main(int argc, char *argv[])
+ 	interfaces.global_iface_name = NULL;
+ 	interfaces.global_ctrl_sock = -1;
+ 
++	wpa_supplicant_event = hostapd_wpa_event;
+ 	for (;;) {
+ 		c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:");
+ 		if (c < 0)
+--- a/src/drivers/drivers.c
++++ b/src/drivers/drivers.c
+@@ -10,6 +10,9 @@
+ #include "utils/common.h"
+ #include "driver.h"
+ 
++void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
++			     union wpa_event_data *data);
++
+ #ifdef CONFIG_DRIVER_WEXT
+ extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
+ #endif /* CONFIG_DRIVER_WEXT */
+--- a/wpa_supplicant/eapol_test.c
++++ b/wpa_supplicant/eapol_test.c
+@@ -28,8 +28,12 @@
+ #include "ctrl_iface.h"
+ #include "pcsc_funcs.h"
+ #include "wpas_glue.h"
++#include "drivers/driver.h"
+ 
+ 
++void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
++			     union wpa_event_data *data);
++
+ struct wpa_driver_ops *wpa_drivers[] = { NULL };
+ 
+ 
+@@ -1194,6 +1198,8 @@ static void usage(void)
+ 	       "option several times.\n");
+ }
+ 
++extern void supplicant_event(void *ctx, enum wpa_event_type event,
++			     union wpa_event_data *data);
+ 
+ int main(int argc, char *argv[])
+ {
+@@ -1212,6 +1218,7 @@ int main(int argc, char *argv[])
+ 	if (os_program_init())
+ 		return -1;
+ 
++	wpa_supplicant_event = supplicant_event;
+ 	hostapd_logger_register_cb(hostapd_logger_cb);
+ 
+ 	os_memset(&eapol_test, 0, sizeof(eapol_test));
diff --git a/trunk/package/network/services/hostapd/patches/300-noscan.patch b/trunk/package/network/services/hostapd/patches/300-noscan.patch
new file mode 100644
index 00000000..9910f89b
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/300-noscan.patch
@@ -0,0 +1,54 @@
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -2651,6 +2651,8 @@ static int hostapd_config_fill(struct ho
+ 		}
+ #endif /* CONFIG_IEEE80211W */
+ #ifdef CONFIG_IEEE80211N
++	} else if (os_strcmp(buf, "noscan") == 0) {
++		conf->noscan = atoi(pos);
+ 	} else if (os_strcmp(buf, "ieee80211n") == 0) {
+ 		conf->ieee80211n = atoi(pos);
+ 	} else if (os_strcmp(buf, "ht_capab") == 0) {
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -605,6 +605,7 @@ struct hostapd_config {
+ 
+ 	int ht_op_mode_fixed;
+ 	u16 ht_capab;
++	int noscan;
+ 	int ieee80211n;
+ 	int secondary_channel;
+ 	int require_ht;
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -690,7 +690,7 @@ static int ieee80211n_check_40mhz(struct
+ 	struct wpa_driver_scan_params params;
+ 	int ret;
+ 
+-	if (!iface->conf->secondary_channel)
++	if (!iface->conf->secondary_channel || iface->conf->noscan)
+ 		return 0; /* HT40 not used */
+ 
+ 	hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
+--- a/src/ap/ieee802_11_ht.c
++++ b/src/ap/ieee802_11_ht.c
+@@ -220,6 +220,9 @@ void hostapd_2040_coex_action(struct hos
+ 	if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
+ 		return;
+ 
++	if (iface->conf->noscan)
++		return;
++
+ 	if (len < IEEE80211_HDRLEN + 1)
+ 		return;
+ 	data++;
+@@ -317,6 +320,9 @@ void ht40_intolerant_add(struct hostapd_
+ 	if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
+ 		return;
+ 
++	if (iface->conf->noscan)
++		return;
++
+ 	wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
+ 		   " in Association Request", MAC2STR(sta->addr));
+ 
diff --git a/trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch b/trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch
new file mode 100644
index 00000000..878b61a6
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/310-rescan_immediately.patch
@@ -0,0 +1,11 @@
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -2914,7 +2914,7 @@ static struct wpa_supplicant * wpa_suppl
+ 	if (wpa_s == NULL)
+ 		return NULL;
+ 	wpa_s->scan_req = INITIAL_SCAN_REQ;
+-	wpa_s->scan_interval = 5;
++	wpa_s->scan_interval = 1;
+ 	wpa_s->new_connection = 1;
+ 	wpa_s->parent = wpa_s;
+ 	wpa_s->sched_scanning = 0;
diff --git a/trunk/package/network/services/hostapd/patches/320-optional_rfkill.patch b/trunk/package/network/services/hostapd/patches/320-optional_rfkill.patch
new file mode 100644
index 00000000..5cf80e52
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/320-optional_rfkill.patch
@@ -0,0 +1,61 @@
+--- a/src/drivers/drivers.mak
++++ b/src/drivers/drivers.mak
+@@ -30,7 +30,6 @@ NEED_SME=y
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-NEED_RFKILL=y
+ 
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+@@ -115,7 +114,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
+ CONFIG_WIRELESS_EXTENSION=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-NEED_RFKILL=y
+ endif
+ 
+ ifdef CONFIG_DRIVER_NDIS
+@@ -141,7 +139,6 @@ endif
+ ifdef CONFIG_WIRELESS_EXTENSION
+ DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
+ DRV_WPA_OBJS += ../src/drivers/driver_wext.o
+-NEED_RFKILL=y
+ endif
+ 
+ ifdef NEED_NETLINK
+@@ -154,6 +151,7 @@ endif
+ 
+ ifdef NEED_RFKILL
+ DRV_OBJS += ../src/drivers/rfkill.o
++DRV_WPA_CFLAGS += -DCONFIG_RFKILL
+ endif
+ 
+ ifdef CONFIG_VLAN_NETLINK
+--- a/src/drivers/rfkill.h
++++ b/src/drivers/rfkill.h
+@@ -18,8 +18,24 @@ struct rfkill_config {
+ 	void (*unblocked_cb)(void *ctx);
+ };
+ 
++#ifdef CONFIG_RFKILL
+ struct rfkill_data * rfkill_init(struct rfkill_config *cfg);
+ void rfkill_deinit(struct rfkill_data *rfkill);
+ int rfkill_is_blocked(struct rfkill_data *rfkill);
++#else
++static inline struct rfkill_data * rfkill_init(struct rfkill_config *cfg)
++{
++	return (void *) 1;
++}
++
++static inline void rfkill_deinit(struct rfkill_data *rfkill)
++{
++}
++
++static inline int rfkill_is_blocked(struct rfkill_data *rfkill)
++{
++	return 0;
++}
++#endif
+ 
+ #endif /* RFKILL_H */
diff --git a/trunk/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch b/trunk/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
new file mode 100644
index 00000000..097f5c83
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
@@ -0,0 +1,11 @@
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -7840,7 +7840,7 @@ static int nl80211_set_channel(struct i8
+ 	nl80211_cmd(drv, msg, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
+ 		    NL80211_CMD_SET_WIPHY);
+ 
+-	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
++	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
+ 	if (nl80211_put_freq_params(msg, freq) < 0)
+ 		goto nla_put_failure;
+ 
diff --git a/trunk/package/network/services/hostapd/patches/340-reload_freq_change.patch b/trunk/package/network/services/hostapd/patches/340-reload_freq_change.patch
new file mode 100644
index 00000000..72ff21cc
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/340-reload_freq_change.patch
@@ -0,0 +1,43 @@
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -71,6 +71,16 @@ static void hostapd_reload_bss(struct ho
+ #endif /* CONFIG_NO_RADIUS */
+ 
+ 	ssid = &hapd->conf->ssid;
++
++	hostapd_set_freq(hapd, hapd->iconf->hw_mode, hapd->iface->freq,
++			 hapd->iconf->channel,
++			 hapd->iconf->ieee80211n,
++			 hapd->iconf->ieee80211ac,
++			 hapd->iconf->secondary_channel,
++			 hapd->iconf->vht_oper_chwidth,
++			 hapd->iconf->vht_oper_centr_freq_seg0_idx,
++			 hapd->iconf->vht_oper_centr_freq_seg1_idx);
++
+ 	if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
+ 	    ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
+ 		/*
+@@ -171,20 +181,12 @@ int hostapd_reload_config(struct hostapd
+ 	oldconf = hapd->iconf;
+ 	iface->conf = newconf;
+ 
++	if (iface->conf->channel)
++		iface->freq = hostapd_hw_get_freq(hapd, iface->conf->channel);
++
+ 	for (j = 0; j < iface->num_bss; j++) {
+ 		hapd = iface->bss[j];
+ 		hapd->iconf = newconf;
+-		hapd->iconf->channel = oldconf->channel;
+-		hapd->iconf->secondary_channel = oldconf->secondary_channel;
+-		hapd->iconf->ieee80211n = oldconf->ieee80211n;
+-		hapd->iconf->ieee80211ac = oldconf->ieee80211ac;
+-		hapd->iconf->ht_capab = oldconf->ht_capab;
+-		hapd->iconf->vht_capab = oldconf->vht_capab;
+-		hapd->iconf->vht_oper_chwidth = oldconf->vht_oper_chwidth;
+-		hapd->iconf->vht_oper_centr_freq_seg0_idx =
+-			oldconf->vht_oper_centr_freq_seg0_idx;
+-		hapd->iconf->vht_oper_centr_freq_seg1_idx =
+-			oldconf->vht_oper_centr_freq_seg1_idx;
+ 		hapd->conf = newconf->bss[j];
+ 		hostapd_reload_bss(hapd);
+ 	}
diff --git a/trunk/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch b/trunk/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
new file mode 100644
index 00000000..46f0a253
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
@@ -0,0 +1,50 @@
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -5083,18 +5083,20 @@ wpa_driver_nl80211_finish_drv_init(struc
+ }
+ 
+ 
+-static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
++static int wpa_driver_nl80211_del_bss_beacon(struct i802_bss *bss)
+ {
++	struct wpa_driver_nl80211_data *drv = bss->drv;
+ 	struct nl_msg *msg;
+ 
+ 	msg = nlmsg_alloc();
+ 	if (!msg)
+ 		return -ENOMEM;
+ 
++	bss->beacon_set = 0;
+ 	wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)",
+-		   drv->ifindex);
++		   bss->ifindex);
+ 	nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_BEACON);
+-	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
++	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
+ 
+ 	return send_and_recv_msgs(drv, msg, NULL, NULL);
+  nla_put_failure:
+@@ -5102,6 +5104,15 @@ static int wpa_driver_nl80211_del_beacon
+ 	return -ENOBUFS;
+ }
+ 
++static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
++{
++	struct i802_bss *bss;
++
++	for (bss = drv->first_bss; bss; bss = bss->next)
++		wpa_driver_nl80211_del_bss_beacon(bss);
++
++	return 0;
++}
+ 
+ /**
+  * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface
+@@ -11147,7 +11158,6 @@ static int wpa_driver_nl80211_stop_ap(vo
+ 	if (!is_ap_interface(drv->nlmode))
+ 		return -1;
+ 	wpa_driver_nl80211_del_beacon(drv);
+-	bss->beacon_set = 0;
+ 	return 0;
+ }
+ 
diff --git a/trunk/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch b/trunk/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
new file mode 100644
index 00000000..f5557fd8
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
@@ -0,0 +1,98 @@
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -43,6 +43,7 @@
+ #include "wps/wps.h"
+ #include "config_file.h"
+ #include "ctrl_iface.h"
++#include "config_file.h"
+ 
+ 
+ struct wpa_ctrl_dst {
+@@ -53,6 +54,7 @@ struct wpa_ctrl_dst {
+ 	int errors;
+ };
+ 
++static char *reload_opts = NULL;
+ 
+ static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level,
+ 				    const char *buf, size_t len);
+@@ -162,6 +164,68 @@ static int hostapd_ctrl_iface_new_sta(st
+ 	return 0;
+ }
+ 
++static int hostapd_ctrl_iface_set_down(struct hostapd_data *hapd)
++{
++	if (hapd->driver->stop_ap)
++		hapd->driver->stop_ap(hapd->drv_priv);
++	return 0;
++}
++
++static char *get_option(char *opt, char *str)
++{
++	int len = strlen(str);
++
++	if (!strncmp(opt, str, len))
++		return opt + len;
++	else
++		return NULL;
++}
++
++static struct hostapd_config *hostapd_ctrl_iface_config_read(const char *fname)
++{
++	struct hostapd_config *conf;
++	char *opt, *val;
++
++	conf = hostapd_config_read(fname);
++	if (!conf)
++		return NULL;
++
++	for (opt = strtok(reload_opts, " ");
++	     opt;
++		 opt = strtok(NULL, " ")) {
++
++		if ((val = get_option(opt, "channel=")))
++			conf->channel = atoi(val);
++		else if ((val = get_option(opt, "ht_capab=")))
++			conf->ht_capab = atoi(val);
++		else if ((val = get_option(opt, "ht_capab_mask=")))
++			conf->ht_capab &= atoi(val);
++		else if ((val = get_option(opt, "sec_chan=")))
++			conf->secondary_channel = atoi(val);
++		else if ((val = get_option(opt, "hw_mode=")))
++			conf->hw_mode = atoi(val);
++		else if ((val = get_option(opt, "ieee80211n=")))
++			conf->ieee80211n = atoi(val);
++		else
++			break;
++	}
++
++	return conf;
++}
++
++static int hostapd_ctrl_iface_update(struct hostapd_data *hapd, char *txt)
++{
++	struct hostapd_config * (*config_read_cb)(const char *config_fname);
++	struct hostapd_iface *iface = hapd->iface;
++
++	config_read_cb = iface->interfaces->config_read_cb;
++	iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read;
++	reload_opts = txt;
++
++	hostapd_reload_config(iface);
++
++	iface->interfaces->config_read_cb = config_read_cb;
++}
+ 
+ #ifdef CONFIG_IEEE80211W
+ #ifdef NEED_AP_MLME
+@@ -1761,6 +1825,10 @@ static void hostapd_ctrl_iface_receive(i
+ 	} else if (os_strncmp(buf, "VENDOR ", 7) == 0) {
+ 		reply_len = hostapd_ctrl_iface_vendor(hapd, buf + 7, reply,
+ 						      reply_size);
++	} else if (os_strcmp(buf, "DOWN") == 0) {
++		hostapd_ctrl_iface_set_down(hapd);
++	} else if (os_strncmp(buf, "UPDATE ", 7) == 0) {
++		hostapd_ctrl_iface_update(hapd, buf + 7);
+ 
+ 	} else {
+ 		os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
diff --git a/trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch b/trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch
new file mode 100644
index 00000000..2f2c2d60
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/370-ap_sta_support.patch
@@ -0,0 +1,237 @@
+--- a/wpa_supplicant/wpa_supplicant_i.h
++++ b/wpa_supplicant/wpa_supplicant_i.h
+@@ -109,6 +109,11 @@ struct wpa_interface {
+ 	const char *ifname;
+ 
+ 	/**
++	 * hostapd_ctrl - path to hostapd control socket for notification
++	 */
++	const char *hostapd_ctrl;
++
++	/**
+ 	 * bridge_ifname - Optional bridge interface name
+ 	 *
+ 	 * If the driver interface (ifname) is included in a Linux bridge
+@@ -406,6 +411,8 @@ struct wpa_supplicant {
+ #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
+ 	char bridge_ifname[16];
+ 
++	struct wpa_ctrl *hostapd;
++
+ 	char *confname;
+ 	char *confanother;
+ 
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -13,6 +13,10 @@ PKG_CONFIG ?= pkg-config
+ CFLAGS += -I$(abspath ../src)
+ CFLAGS += -I$(abspath ../src/utils)
+ 
++ifdef MULTICALL
++CFLAGS += -DMULTICALL
++endif
++
+ -include .config
+ -include $(if $(MULTICALL),../hostapd/.config)
+ 
+@@ -82,6 +86,8 @@ OBJS_c = wpa_cli.o ../src/common/wpa_ctr
+ OBJS_c += ../src/utils/wpa_debug.o
+ OBJS_c += ../src/utils/common.o
+ 
++OBJS += ../src/common/wpa_ctrl.o
++
+ ifndef CONFIG_OS
+ ifdef CONFIG_NATIVE_WINDOWS
+ CONFIG_OS=win32
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -105,6 +105,55 @@ const char *wpa_supplicant_full_license5
+ "\n";
+ #endif /* CONFIG_NO_STDOUT_DEBUG */
+ 
++static int hostapd_stop(struct wpa_supplicant *wpa_s)
++{
++	const char *cmd = "DOWN";
++	char buf[256];
++	int len = sizeof(buf);
++
++	if (wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL) < 0) {
++		wpa_printf(MSG_ERROR, "\nFailed to stop hostapd AP interfaces\n");
++		return -1;
++	}
++	return 0;
++}
++
++static int hostapd_reload(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
++{
++	char *cmd = NULL;
++	char buf[256];
++	int len = sizeof(buf);
++	enum hostapd_hw_mode hw_mode;
++	u8 channel;
++	int sec_chan = 0;
++	int ret;
++
++	if (!bss)
++		return;
++
++	if (bss->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH) {
++		int sec = bss->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK;
++		if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE)
++			sec_chan = 1;
++		else if (sec ==  HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW)
++			sec_chan = -1;
++	}
++
++	hw_mode = ieee80211_freq_to_chan(bss->freq, &channel);
++	if (asprintf(&cmd, "UPDATE channel=%d sec_chan=%d hw_mode=%d ieee80211n=%d",
++		     channel, sec_chan, hw_mode, !!bss->ht_capab) < 0)
++		return -1;
++
++	ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL);
++	free(cmd);
++
++	if (ret < 0) {
++		wpa_printf(MSG_ERROR, "\nFailed to reload hostapd AP interfaces\n");
++		return -1;
++	}
++	return 0;
++}
++
+ /* Configure default/group WEP keys for static WEP */
+ int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
+ {
+@@ -731,8 +780,12 @@ void wpa_supplicant_set_state(struct wpa
+ 		wpas_p2p_completed(wpa_s);
+ 
+ 		sme_sched_obss_scan(wpa_s, 1);
++		if (wpa_s->hostapd)
++			hostapd_reload(wpa_s, wpa_s->current_bss);
+ 	} else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
+ 		   state == WPA_ASSOCIATED) {
++		if (wpa_s->hostapd)
++			hostapd_stop(wpa_s);
+ 		wpa_s->new_connection = 1;
+ 		wpa_drv_set_operstate(wpa_s, 0);
+ #ifndef IEEE8021X_EAPOL
+@@ -3753,6 +3806,20 @@ static int wpa_supplicant_init_iface(str
+ 			   sizeof(wpa_s->bridge_ifname));
+ 	}
+ 
++	if (iface->hostapd_ctrl) {
++		char *cmd = "DOWN";
++		char buf[256];
++		int len = sizeof(buf);
++
++		wpa_s->hostapd = wpa_ctrl_open(iface->hostapd_ctrl);
++		if (!wpa_s->hostapd) {
++			wpa_printf(MSG_ERROR, "\nFailed to connect to hostapd\n");
++			return -1;
++		}
++		if (hostapd_stop(wpa_s) < 0)
++			return -1;
++	}
++
+ 	/* RSNA Supplicant Key Management - INITIALIZE */
+ 	eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
+ 	eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
+@@ -3967,6 +4034,11 @@ static void wpa_supplicant_deinit_iface(
+ 	if (terminate)
+ 		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING);
+ 
++	if (wpa_s->hostapd) {
++		wpa_ctrl_close(wpa_s->hostapd);
++		wpa_s->hostapd = NULL;
++	}
++
+ 	if (wpa_s->ctrl_iface) {
+ 		wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface);
+ 		wpa_s->ctrl_iface = NULL;
+--- a/wpa_supplicant/bss.c
++++ b/wpa_supplicant/bss.c
+@@ -11,6 +11,7 @@
+ #include "utils/common.h"
+ #include "utils/eloop.h"
+ #include "common/ieee802_11_defs.h"
++#include "common/ieee802_11_common.h"
+ #include "drivers/driver.h"
+ #include "wpa_supplicant_i.h"
+ #include "config.h"
+@@ -247,6 +248,10 @@ static void calculate_update_time(const 
+ static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src,
+ 			     struct os_reltime *fetch_time)
+ {
++	struct ieee80211_ht_capabilities *capab;
++	struct ieee80211_ht_operation *oper;
++	struct ieee802_11_elems elems;
++
+ 	dst->flags = src->flags;
+ 	os_memcpy(dst->bssid, src->bssid, ETH_ALEN);
+ 	dst->freq = src->freq;
+@@ -257,6 +262,15 @@ static void wpa_bss_copy_res(struct wpa_
+ 	dst->level = src->level;
+ 	dst->tsf = src->tsf;
+ 
++	memset(&elems, 0, sizeof(elems));
++	ieee802_11_parse_elems((u8 *) (src + 1), src->ie_len, &elems, 0);
++	capab = (struct ieee80211_ht_capabilities *) elems.ht_capabilities;
++	oper = (struct ieee80211_ht_operation *) elems.ht_operation;
++	if (capab)
++		dst->ht_capab = le_to_host16(capab->ht_capabilities_info);
++	if (oper)
++		dst->ht_param = oper->ht_param;
++
+ 	calculate_update_time(fetch_time, src->age, &dst->last_update);
+ }
+ 
+--- a/wpa_supplicant/main.c
++++ b/wpa_supplicant/main.c
+@@ -33,7 +33,7 @@ static void usage(void)
+ 	       "vW] [-P<pid file>] "
+ 	       "[-g<global ctrl>] \\\n"
+ 	       "        [-G<group>] \\\n"
+-	       "        -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] "
++	       "        -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] [-H<hostapd path>] "
+ 	       "[-p<driver_param>] \\\n"
+ 	       "        [-b<br_ifname>] [-e<entropy file>]"
+ #ifdef CONFIG_DEBUG_FILE
+@@ -84,6 +84,7 @@ static void usage(void)
+ #endif /* CONFIG_DEBUG_LINUX_TRACING */
+ 	printf("  -t = include timestamp in debug messages\n"
+ 	       "  -h = show this help text\n"
++		   "  -H = connect to a hostapd instance to manage state changes\n"
+ 	       "  -L = show license (BSD)\n"
+ 	       "  -o = override driver parameter for new interfaces\n"
+ 	       "  -O = override ctrl_interface parameter for new interfaces\n"
+@@ -175,7 +176,7 @@ int main(int argc, char *argv[])
+ 
+ 	for (;;) {
+ 		c = getopt(argc, argv,
+-			   "b:Bc:C:D:de:f:g:G:hi:I:KLm:No:O:p:P:qsTtuvW");
++			   "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
+ 		if (c < 0)
+ 			break;
+ 		switch (c) {
+@@ -222,6 +223,9 @@ int main(int argc, char *argv[])
+ 			usage();
+ 			exitcode = 0;
+ 			goto out;
++		case 'H':
++			iface->hostapd_ctrl = optarg;
++			break;
+ 		case 'i':
+ 			iface->ifname = optarg;
+ 			break;
+--- a/wpa_supplicant/bss.h
++++ b/wpa_supplicant/bss.h
+@@ -70,6 +70,10 @@ struct wpa_bss {
+ 	u8 ssid[32];
+ 	/** Length of SSID */
+ 	size_t ssid_len;
++	/** HT caapbilities */
++	u16 ht_capab;
++	/* Five octets of HT Operation Information */
++	u8 ht_param;
+ 	/** Frequency of the channel in MHz (e.g., 2412 = channel 1) */
+ 	int freq;
+ 	/** Beacon interval in TUs (host byte order) */
diff --git a/trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch b/trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
new file mode 100644
index 00000000..ef4f961b
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
@@ -0,0 +1,183 @@
+--- a/hostapd/Makefile
++++ b/hostapd/Makefile
+@@ -164,6 +164,9 @@ endif
+ ifdef CONFIG_NO_CTRL_IFACE
+ CFLAGS += -DCONFIG_NO_CTRL_IFACE
+ else
++ifdef CONFIG_CTRL_IFACE_MIB
++CFLAGS += -DCONFIG_CTRL_IFACE_MIB
++endif
+ OBJS += ctrl_iface.o
+ OBJS += ../src/ap/ctrl_iface_ap.o
+ endif
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -1653,6 +1653,7 @@ static void hostapd_ctrl_iface_receive(i
+ 						      reply_size);
+ 	} else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
+ 		reply_len = hostapd_drv_status(hapd, reply, reply_size);
++#ifdef CONFIG_CTRL_IFACE_MIB
+ 	} else if (os_strcmp(buf, "MIB") == 0) {
+ 		reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
+ 		if (reply_len >= 0) {
+@@ -1694,6 +1695,7 @@ static void hostapd_ctrl_iface_receive(i
+ 	} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
+ 		reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
+ 							reply_size);
++#endif
+ 	} else if (os_strcmp(buf, "ATTACH") == 0) {
+ 		if (hostapd_ctrl_iface_attach(hapd, &from, fromlen))
+ 			reply_len = -1;
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -809,6 +809,9 @@ ifdef CONFIG_WNM
+ OBJS += ../src/ap/wnm_ap.o
+ endif
+ ifdef CONFIG_CTRL_IFACE
++ifdef CONFIG_CTRL_IFACE_MIB
++CFLAGS += -DCONFIG_CTRL_IFACE_MIB
++endif
+ OBJS += ../src/ap/ctrl_iface_ap.o
+ endif
+ 
+--- a/wpa_supplicant/ctrl_iface.c
++++ b/wpa_supplicant/ctrl_iface.c
+@@ -1628,7 +1628,7 @@ static int wpa_supplicant_ctrl_iface_sta
+ 			pos += ret;
+ 		}
+ 
+-#ifdef CONFIG_AP
++#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB)
+ 		if (wpa_s->ap_iface) {
+ 			pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
+ 							    end - pos,
+@@ -6720,6 +6720,7 @@ char * wpa_supplicant_ctrl_iface_process
+ 			reply_len = -1;
+ 	} else if (os_strncmp(buf, "NOTE ", 5) == 0) {
+ 		wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
++#ifdef CONFIG_CTRL_IFACE_MIB
+ 	} else if (os_strcmp(buf, "MIB") == 0) {
+ 		reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
+ 		if (reply_len >= 0) {
+@@ -6731,6 +6732,7 @@ char * wpa_supplicant_ctrl_iface_process
+ 			else
+ 				reply_len += res;
+ 		}
++#endif
+ 	} else if (os_strncmp(buf, "STATUS", 6) == 0) {
+ 		reply_len = wpa_supplicant_ctrl_iface_status(
+ 			wpa_s, buf + 6, reply, reply_size);
+@@ -7140,6 +7142,7 @@ char * wpa_supplicant_ctrl_iface_process
+ 		reply_len = wpa_supplicant_ctrl_iface_bss(
+ 			wpa_s, buf + 4, reply, reply_size);
+ #ifdef CONFIG_AP
++#ifdef CONFIG_CTRL_IFACE_MIB
+ 	} else if (os_strcmp(buf, "STA-FIRST") == 0) {
+ 		reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
+ 	} else if (os_strncmp(buf, "STA ", 4) == 0) {
+@@ -7148,12 +7151,15 @@ char * wpa_supplicant_ctrl_iface_process
+ 	} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
+ 		reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
+ 						   reply_size);
++#endif
++#ifdef CONFIG_CTRL_IFACE_MIB
+ 	} else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
+ 		if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
+ 			reply_len = -1;
+ 	} else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
+ 		if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
+ 			reply_len = -1;
++#endif
+ 	} else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
+ 		if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
+ 			reply_len = -1;
+--- a/src/ap/ctrl_iface_ap.c
++++ b/src/ap/ctrl_iface_ap.c
+@@ -21,6 +21,7 @@
+ #include "ctrl_iface_ap.h"
+ #include "ap_drv_ops.h"
+ 
++#ifdef CONFIG_CTRL_IFACE_MIB
+ 
+ static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
+ 				 struct sta_info *sta,
+@@ -214,6 +215,7 @@ int hostapd_ctrl_iface_sta_next(struct h
+ 	return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
+ }
+ 
++#endif
+ 
+ #ifdef CONFIG_P2P_MANAGER
+ static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
+@@ -527,3 +529,4 @@ int hostapd_parse_csa_settings(const cha
+ 
+ 	return 0;
+ }
++
+--- a/src/ap/ieee802_1x.c
++++ b/src/ap/ieee802_1x.c
+@@ -2237,6 +2237,7 @@ static const char * bool_txt(Boolean boo
+ 	return bool_val ? "TRUE" : "FALSE";
+ }
+ 
++#ifdef CONFIG_CTRL_IFACE_MIB
+ 
+ int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
+ {
+@@ -2404,6 +2405,7 @@ int ieee802_1x_get_mib_sta(struct hostap
+ 	return len;
+ }
+ 
++#endif
+ 
+ static void ieee802_1x_finished(struct hostapd_data *hapd,
+ 				struct sta_info *sta, int success,
+--- a/src/ap/wpa_auth.c
++++ b/src/ap/wpa_auth.c
+@@ -2835,6 +2835,7 @@ static const char * wpa_bool_txt(int boo
+ 	return bool ? "TRUE" : "FALSE";
+ }
+ 
++#ifdef CONFIG_CTRL_IFACE_MIB
+ 
+ #define RSN_SUITE "%02x-%02x-%02x-%d"
+ #define RSN_SUITE_ARG(s) \
+@@ -2979,7 +2980,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
+ 
+ 	return len;
+ }
+-
++#endif
+ 
+ void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
+ {
+--- a/src/rsn_supp/wpa.c
++++ b/src/rsn_supp/wpa.c
+@@ -1928,6 +1928,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
+ }
+ 
+ 
++#ifdef CONFIG_CTRL_IFACE_MIB
++
+ #define RSN_SUITE "%02x-%02x-%02x-%d"
+ #define RSN_SUITE_ARG(s) \
+ ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
+@@ -2011,6 +2013,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
+ 
+ 	return (int) len;
+ }
++#endif
+ #endif /* CONFIG_CTRL_IFACE */
+ 
+ 
+--- a/wpa_supplicant/ap.c
++++ b/wpa_supplicant/ap.c
+@@ -975,7 +975,7 @@ int wpas_ap_wps_nfc_report_handover(stru
+ #endif /* CONFIG_WPS */
+ 
+ 
+-#ifdef CONFIG_CTRL_IFACE
++#if defined(CONFIG_CTRL_IFACE) && defined(CONFIG_CTRL_IFACE_MIB)
+ 
+ int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
+ 			    char *buf, size_t buflen)
diff --git a/trunk/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch b/trunk/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
new file mode 100644
index 00000000..21f6ec02
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
@@ -0,0 +1,56 @@
+--- a/src/common/wpa_common.c
++++ b/src/common/wpa_common.c
+@@ -1026,6 +1026,31 @@ u32 wpa_akm_to_suite(int akm)
+ }
+ 
+ 
++static void wpa_fixup_wpa_ie_rsn(u8 *assoc_ie, const u8 *wpa_msg_ie,
++				 size_t rsn_ie_len)
++{
++	int pos, count;
++
++	pos = sizeof(struct rsn_ie_hdr) + RSN_SELECTOR_LEN;
++	if (rsn_ie_len < pos + 2)
++		return;
++
++	count = WPA_GET_LE16(wpa_msg_ie + pos);
++	pos += 2 + count * RSN_SELECTOR_LEN;
++	if (rsn_ie_len < pos + 2)
++		return;
++
++	count = WPA_GET_LE16(wpa_msg_ie + pos);
++	pos += 2 + count * RSN_SELECTOR_LEN;
++	if (rsn_ie_len < pos + 2)
++		return;
++
++	if (!assoc_ie[pos] && !assoc_ie[pos + 1] &&
++	    (wpa_msg_ie[pos] || wpa_msg_ie[pos + 1]))
++		memcpy(&assoc_ie[pos], &wpa_msg_ie[pos], 2);
++}
++
++
+ int wpa_compare_rsn_ie(int ft_initial_assoc,
+ 		       const u8 *ie1, size_t ie1len,
+ 		       const u8 *ie2, size_t ie2len)
+@@ -1033,8 +1058,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
+ 	if (ie1 == NULL || ie2 == NULL)
+ 		return -1;
+ 
+-	if (ie1len == ie2len && os_memcmp(ie1, ie2, ie1len) == 0)
+-		return 0; /* identical IEs */
++	if (ie1len == ie2len) {
++		u8 *ie_tmp;
++
++		if (os_memcmp(ie1, ie2, ie1len) == 0)
++			return 0; /* identical IEs */
++
++		ie_tmp = alloca(ie1len);
++		memcpy(ie_tmp, ie1, ie1len);
++		wpa_fixup_wpa_ie_rsn(ie_tmp, ie2, ie1len);
++
++		if (os_memcmp(ie_tmp, ie2, ie1len) == 0)
++			return 0; /* only mismatch in RSN capabilties */
++	}
+ 
+ #ifdef CONFIG_IEEE80211R
+ 	if (ft_initial_assoc) {
diff --git a/trunk/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch b/trunk/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
new file mode 100644
index 00000000..8dae52b2
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
@@ -0,0 +1,25 @@
+--- a/src/ap/wps_hostapd.c
++++ b/src/ap/wps_hostapd.c
+@@ -1051,11 +1051,9 @@ int hostapd_init_wps(struct hostapd_data
+ 
+ 		if (conf->rsn_pairwise & WPA_CIPHER_CCMP)
+ 			wps->encr_types |= WPS_ENCR_AES;
+-		if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
++		else if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
+ 			wps->encr_types |= WPS_ENCR_TKIP;
+-	}
+-
+-	if (conf->wpa & WPA_PROTO_WPA) {
++	} else if (conf->wpa & WPA_PROTO_WPA) {
+ 		if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK)
+ 			wps->auth_types |= WPS_AUTH_WPAPSK;
+ 		if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X)
+@@ -1063,7 +1061,7 @@ int hostapd_init_wps(struct hostapd_data
+ 
+ 		if (conf->wpa_pairwise & WPA_CIPHER_CCMP)
+ 			wps->encr_types |= WPS_ENCR_AES;
+-		if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
++		else if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
+ 			wps->encr_types |= WPS_ENCR_TKIP;
+ 	}
+ 
diff --git a/trunk/package/network/services/hostapd/patches/410-limit_debug_messages.patch b/trunk/package/network/services/hostapd/patches/410-limit_debug_messages.patch
new file mode 100644
index 00000000..4643140e
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/410-limit_debug_messages.patch
@@ -0,0 +1,214 @@
+--- a/src/utils/wpa_debug.c
++++ b/src/utils/wpa_debug.c
+@@ -201,7 +201,7 @@ void wpa_debug_close_linux_tracing(void)
+  *
+  * Note: New line '\n' is added to the end of the text when printing to stdout.
+  */
+-void wpa_printf(int level, const char *fmt, ...)
++void _wpa_printf(int level, const char *fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -248,8 +248,8 @@ void wpa_printf(int level, const char *f
+ }
+ 
+ 
+-static void _wpa_hexdump(int level, const char *title, const u8 *buf,
+-			 size_t len, int show)
++void _wpa_hexdump(int level, const char *title, const u8 *buf,
++		  size_t len, int show)
+ {
+ 	size_t i;
+ 
+@@ -375,20 +375,8 @@ static void _wpa_hexdump(int level, cons
+ #endif /* CONFIG_ANDROID_LOG */
+ }
+ 
+-void wpa_hexdump(int level, const char *title, const void *buf, size_t len)
+-{
+-	_wpa_hexdump(level, title, buf, len, 1);
+-}
+-
+-
+-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len)
+-{
+-	_wpa_hexdump(level, title, buf, len, wpa_debug_show_keys);
+-}
+-
+-
+-static void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
+-			       size_t len, int show)
++void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
++			size_t len, int show)
+ {
+ 	size_t i, llen;
+ 	const u8 *pos = buf;
+@@ -495,20 +483,6 @@ static void _wpa_hexdump_ascii(int level
+ }
+ 
+ 
+-void wpa_hexdump_ascii(int level, const char *title, const void *buf,
+-		       size_t len)
+-{
+-	_wpa_hexdump_ascii(level, title, buf, len, 1);
+-}
+-
+-
+-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
+-			   size_t len)
+-{
+-	_wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
+-}
+-
+-
+ #ifdef CONFIG_DEBUG_FILE
+ static char *last_path = NULL;
+ #endif /* CONFIG_DEBUG_FILE */
+@@ -594,7 +568,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
+ }
+ 
+ 
+-void wpa_msg(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg(void *ctx, int level, const char *fmt, ...)
+ {
+ 	va_list ap;
+ 	char *buf;
+@@ -632,7 +606,7 @@ void wpa_msg(void *ctx, int level, const
+ }
+ 
+ 
+-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+ {
+ 	va_list ap;
+ 	char *buf;
+--- a/src/utils/wpa_debug.h
++++ b/src/utils/wpa_debug.h
+@@ -47,6 +47,17 @@ int wpa_debug_open_file(const char *path
+ int wpa_debug_reopen_file(void);
+ void wpa_debug_close_file(void);
+ 
++/* internal */
++void _wpa_hexdump(int level, const char *title, const u8 *buf,
++		  size_t len, int show);
++void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
++			size_t len, int show);
++extern int wpa_debug_show_keys;
++
++#ifndef CONFIG_MSG_MIN_PRIORITY
++#define CONFIG_MSG_MIN_PRIORITY 0
++#endif
++
+ /**
+  * wpa_debug_printf_timestamp - Print timestamp for debug output
+  *
+@@ -67,9 +78,15 @@ void wpa_debug_print_timestamp(void);
+  *
+  * Note: New line '\n' is added to the end of the text when printing to stdout.
+  */
+-void wpa_printf(int level, const char *fmt, ...)
++void _wpa_printf(int level, const char *fmt, ...)
+ PRINTF_FORMAT(2, 3);
+ 
++#define wpa_printf(level, ...)						\
++	do {								\
++		if (level >= CONFIG_MSG_MIN_PRIORITY)			\
++			_wpa_printf(level, __VA_ARGS__);		\
++	} while(0)
++
+ /**
+  * wpa_hexdump - conditional hex dump
+  * @level: priority level (MSG_*) of the message
+@@ -81,7 +98,13 @@ PRINTF_FORMAT(2, 3);
+  * output may be directed to stdout, stderr, and/or syslog based on
+  * configuration. The contents of buf is printed out has hex dump.
+  */
+-void wpa_hexdump(int level, const char *title, const void *buf, size_t len);
++static inline void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len)
++{
++	if (level < CONFIG_MSG_MIN_PRIORITY)
++		return;
++
++	_wpa_hexdump(level, title, buf, len, 1);
++}
+ 
+ static inline void wpa_hexdump_buf(int level, const char *title,
+ 				   const struct wpabuf *buf)
+@@ -103,7 +126,13 @@ static inline void wpa_hexdump_buf(int l
+  * like wpa_hexdump(), but by default, does not include secret keys (passwords,
+  * etc.) in debug output.
+  */
+-void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len);
++static inline void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len)
++{
++	if (level < CONFIG_MSG_MIN_PRIORITY)
++		return;
++
++	_wpa_hexdump(level, title, buf, len, wpa_debug_show_keys);
++}
+ 
+ static inline void wpa_hexdump_buf_key(int level, const char *title,
+ 				       const struct wpabuf *buf)
+@@ -125,8 +154,14 @@ static inline void wpa_hexdump_buf_key(i
+  * the hex numbers and ASCII characters (for printable range) are shown. 16
+  * bytes per line will be shown.
+  */
+-void wpa_hexdump_ascii(int level, const char *title, const void *buf,
+-		       size_t len);
++static inline void wpa_hexdump_ascii(int level, const char *title,
++				     const u8 *buf, size_t len)
++{
++	if (level < CONFIG_MSG_MIN_PRIORITY)
++		return;
++
++	_wpa_hexdump_ascii(level, title, buf, len, 1);
++}
+ 
+ /**
+  * wpa_hexdump_ascii_key - conditional hex dump, hide keys
+@@ -142,8 +177,14 @@ void wpa_hexdump_ascii(int level, const 
+  * bytes per line will be shown. This works like wpa_hexdump_ascii(), but by
+  * default, does not include secret keys (passwords, etc.) in debug output.
+  */
+-void wpa_hexdump_ascii_key(int level, const char *title, const void *buf,
+-			   size_t len);
++static inline void wpa_hexdump_ascii_key(int level, const char *title,
++					 const u8 *buf, size_t len)
++{
++	if (level < CONFIG_MSG_MIN_PRIORITY)
++		return;
++
++	_wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
++}
+ 
+ /*
+  * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce
+@@ -179,7 +220,12 @@ void wpa_hexdump_ascii_key(int level, co
+  *
+  * Note: New line '\n' is added to the end of the text when printing to stdout.
+  */
+-void wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
++void _wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
++#define wpa_msg(ctx, level, ...)					\
++	do {								\
++		if (level >= CONFIG_MSG_MIN_PRIORITY)			\
++			_wpa_msg(ctx, level, __VA_ARGS__);		\
++	} while(0)
+ 
+ /**
+  * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
+@@ -193,8 +239,13 @@ void wpa_msg(void *ctx, int level, const
+  * attached ctrl_iface monitors. In other words, it can be used for frequent
+  * events that do not need to be sent to syslog.
+  */
+-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+ PRINTF_FORMAT(3, 4);
++#define wpa_msg_ctrl(ctx, level, ...)					\
++	do {								\
++		if (level >= CONFIG_MSG_MIN_PRIORITY)			\
++			_wpa_msg_ctrl(ctx, level, __VA_ARGS__);		\
++	} while(0)
+ 
+ /**
+  * wpa_msg_global - Global printf for ctrl_iface monitors
diff --git a/trunk/package/network/services/hostapd/patches/420-indicate-features.patch b/trunk/package/network/services/hostapd/patches/420-indicate-features.patch
new file mode 100644
index 00000000..b20947ee
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/420-indicate-features.patch
@@ -0,0 +1,82 @@
+--- a/hostapd/main.c
++++ b/hostapd/main.c
+@@ -15,6 +15,7 @@
+ #include "utils/common.h"
+ #include "utils/eloop.h"
+ #include "utils/uuid.h"
++#include "utils/build_features.h"
+ #include "crypto/random.h"
+ #include "crypto/tls.h"
+ #include "common/version.h"
+@@ -560,7 +561,7 @@ int main(int argc, char *argv[])
+ 
+ 	wpa_supplicant_event = hostapd_wpa_event;
+ 	for (;;) {
+-		c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:");
++		c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:g:G:v::");
+ 		if (c < 0)
+ 			break;
+ 		switch (c) {
+@@ -597,6 +598,8 @@ int main(int argc, char *argv[])
+ 			break;
+ #endif /* CONFIG_DEBUG_LINUX_TRACING */
+ 		case 'v':
++			if (optarg)
++				exit(!has_feature(optarg));
+ 			show_version();
+ 			exit(1);
+ 			break;
+--- a/wpa_supplicant/main.c
++++ b/wpa_supplicant/main.c
+@@ -12,6 +12,7 @@
+ #endif /* __linux__ */
+ 
+ #include "common.h"
++#include "build_features.h"
+ #include "wpa_supplicant_i.h"
+ #include "driver_i.h"
+ #include "p2p_supplicant.h"
+@@ -176,7 +177,7 @@ int main(int argc, char *argv[])
+ 
+ 	for (;;) {
+ 		c = getopt(argc, argv,
+-			   "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
++			   "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuv::W");
+ 		if (c < 0)
+ 			break;
+ 		switch (c) {
+@@ -279,8 +280,12 @@ int main(int argc, char *argv[])
+ 			break;
+ #endif /* CONFIG_DBUS */
+ 		case 'v':
+-			printf("%s\n", wpa_supplicant_version);
+-			exitcode = 0;
++			if (optarg) {
++				exitcode = !has_feature(optarg);
++			} else {
++				printf("%s\n", wpa_supplicant_version);
++				exitcode = 0;
++			}
+ 			goto out;
+ 		case 'W':
+ 			params.wait_for_monitor++;
+--- /dev/null
++++ b/src/utils/build_features.h
+@@ -0,0 +1,17 @@
++#ifndef BUILD_FEATURES_H
++#define BUILD_FEATURES_H
++
++static inline int has_feature(const char *feat)
++{
++#ifdef IEEE8021X_EAPOL
++	if (!strcmp(feat, "eap"))
++		return 1;
++#endif
++#ifdef IEEE80211N
++	if (!strcmp(feat, "11n"))
++		return 1;
++#endif
++	return 0;
++}
++
++#endif /* BUILD_FEATURES_H */
diff --git a/trunk/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch b/trunk/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
new file mode 100644
index 00000000..1cf3fee8
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
@@ -0,0 +1,50 @@
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -67,7 +67,6 @@ static const char *commands_help =
+ #ifdef CONFIG_IEEE80211W
+ "   sa_query <addr>      send SA Query to a station\n"
+ #endif /* CONFIG_IEEE80211W */
+-#ifdef CONFIG_WPS
+ "   wps_pin <uuid> <pin> [timeout] [addr]  add WPS Enrollee PIN\n"
+ "   wps_check_pin <PIN>  verify PIN checksum\n"
+ "   wps_pbc              indicate button pushed to initiate PBC\n"
+@@ -80,7 +79,6 @@ static const char *commands_help =
+ "   wps_ap_pin <cmd> [params..]  enable/disable AP PIN\n"
+ "   wps_config <SSID> <auth> <encr> <key>  configure AP\n"
+ "   wps_get_status       show current WPS status\n"
+-#endif /* CONFIG_WPS */
+ "   get_config           show current configuration\n"
+ "   help                 show this usage help\n"
+ "   interface [ifname]   show interfaces/select interface\n"
+@@ -353,7 +351,6 @@ static int hostapd_cli_cmd_sa_query(stru
+ #endif /* CONFIG_IEEE80211W */
+ 
+ 
+-#ifdef CONFIG_WPS
+ static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
+ 				   char *argv[])
+ {
+@@ -579,7 +576,6 @@ static int hostapd_cli_cmd_wps_config(st
+ 			 ssid_hex, argv[1]);
+ 	return wpa_ctrl_command(ctrl, buf);
+ }
+-#endif /* CONFIG_WPS */
+ 
+ 
+ static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
+@@ -993,7 +989,6 @@ static struct hostapd_cli_cmd hostapd_cl
+ #ifdef CONFIG_IEEE80211W
+ 	{ "sa_query", hostapd_cli_cmd_sa_query },
+ #endif /* CONFIG_IEEE80211W */
+-#ifdef CONFIG_WPS
+ 	{ "wps_pin", hostapd_cli_cmd_wps_pin },
+ 	{ "wps_check_pin", hostapd_cli_cmd_wps_check_pin },
+ 	{ "wps_pbc", hostapd_cli_cmd_wps_pbc },
+@@ -1007,7 +1002,6 @@ static struct hostapd_cli_cmd hostapd_cl
+ 	{ "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin },
+ 	{ "wps_config", hostapd_cli_cmd_wps_config },
+ 	{ "wps_get_status", hostapd_cli_cmd_wps_get_status },
+-#endif /* CONFIG_WPS */
+ 	{ "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent },
+ 	{ "ess_disassoc", hostapd_cli_cmd_ess_disassoc },
+ 	{ "get_config", hostapd_cli_cmd_get_config },
diff --git a/trunk/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch b/trunk/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
new file mode 100644
index 00000000..36b5a441
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
@@ -0,0 +1,13 @@
+--- a/wpa_supplicant/wpa_cli.c
++++ b/wpa_supplicant/wpa_cli.c
+@@ -26,6 +26,10 @@
+ #endif /* ANDROID */
+ 
+ 
++#ifndef CONFIG_P2P
++#define CONFIG_P2P
++#endif
++
+ static const char *wpa_cli_version =
+ "wpa_cli v" VERSION_STR "\n"
+ "Copyright (c) 2004-2014, Jouni Malinen <j@w1.fi> and contributors";
diff --git a/trunk/package/network/services/hostapd/patches/440-max_num_sta_probe.patch b/trunk/package/network/services/hostapd/patches/440-max_num_sta_probe.patch
new file mode 100644
index 00000000..059a2d35
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/440-max_num_sta_probe.patch
@@ -0,0 +1,13 @@
+--- a/src/ap/beacon.c
++++ b/src/ap/beacon.c
+@@ -614,6 +614,10 @@ void handle_probe_req(struct hostapd_dat
+ 		return;
+ 	}
+ 
++	if (!sta && hapd->num_sta >= hapd->conf->max_num_sta)
++		wpa_printf(MSG_MSGDUMP, "Probe Request from " MACSTR " ignored,"
++			   " too many connected stations.", MAC2STR(mgmt->sa));
++
+ #ifdef CONFIG_INTERWORKING
+ 	if (hapd->conf->interworking &&
+ 	    elems.interworking && elems.interworking_len >= 1) {
diff --git a/trunk/package/network/services/hostapd/patches/450-scan_wait.patch b/trunk/package/network/services/hostapd/patches/450-scan_wait.patch
new file mode 100644
index 00000000..629786d9
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/450-scan_wait.patch
@@ -0,0 +1,66 @@
+--- a/hostapd/main.c
++++ b/hostapd/main.c
+@@ -36,6 +36,8 @@ struct hapd_global {
+ };
+ 
+ static struct hapd_global global;
++static int daemonize = 0;
++static char *pid_file = NULL;
+ 
+ 
+ #ifndef CONFIG_NO_HOSTAPD_LOGGER
+@@ -142,6 +144,14 @@ static void hostapd_logger_cb(void *ctx,
+ }
+ #endif /* CONFIG_NO_HOSTAPD_LOGGER */
+ 
++static void hostapd_setup_complete_cb(void *ctx)
++{
++	if (daemonize && os_daemonize(pid_file)) {
++		perror("daemon");
++		return;
++	}
++	daemonize = 0;
++}
+ 
+ /**
+  * hostapd_driver_init - Preparate driver interface
+@@ -160,6 +170,8 @@ static int hostapd_driver_init(struct ho
+ 		return -1;
+ 	}
+ 
++	hapd->setup_complete_cb = hostapd_setup_complete_cb;
++
+ 	/* Initialize the driver interface */
+ 	if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5]))
+ 		b = NULL;
+@@ -374,8 +386,6 @@ static void hostapd_global_deinit(const 
+ #endif /* CONFIG_NATIVE_WINDOWS */
+ 
+ 	eap_server_unregister_methods();
+-
+-	os_daemonize_terminate(pid_file);
+ }
+ 
+ 
+@@ -401,11 +411,6 @@ static int hostapd_global_run(struct hap
+ 	}
+ #endif /* EAP_SERVER_TNC */
+ 
+-	if (daemonize && os_daemonize(pid_file)) {
+-		perror("daemon");
+-		return -1;
+-	}
+-
+ 	eloop_run();
+ 
+ 	return 0;
+@@ -535,8 +540,7 @@ int main(int argc, char *argv[])
+ 	struct hapd_interfaces interfaces;
+ 	int ret = 1;
+ 	size_t i, j;
+-	int c, debug = 0, daemonize = 0;
+-	char *pid_file = NULL;
++	int c, debug = 0;
+ 	const char *log_file = NULL;
+ 	const char *entropy_file = NULL;
+ 	char **bss_config = NULL, **tmp_bss;
diff --git a/trunk/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/trunk/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
new file mode 100644
index 00000000..2dad2738
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
@@ -0,0 +1,191 @@
+From 4bb69d15477e0f2b00e166845341dc933de47c58 Mon Sep 17 00:00:00 2001
+From: Antonio Quartulli <ordex@autistici.org>
+Date: Sun, 3 Jun 2012 18:22:56 +0200
+Subject: [PATCHv2 601/602] wpa_supplicant: add new config params to be used
+ with the ibss join command
+
+Signed-hostap: Antonio Quartulli <ordex@autistici.org>
+---
+ src/drivers/driver.h            |    6 +++
+ wpa_supplicant/config.c         |   96 +++++++++++++++++++++++++++++++++++++++
+ wpa_supplicant/config_ssid.h    |    6 +++
+ wpa_supplicant/wpa_supplicant.c |   23 +++++++---
+ 4 files changed, 124 insertions(+), 7 deletions(-)
+
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -19,6 +19,7 @@
+ 
+ #define WPA_SUPPLICANT_DRIVER_VERSION 4
+ 
++#include "drivers/nl80211_copy.h"
+ #include "common/defs.h"
+ #include "utils/list.h"
+ 
+@@ -442,6 +443,11 @@ struct wpa_driver_associate_params {
+ 	 * responsible for selecting with which BSS to associate. */
+ 	const u8 *bssid;
+ 
++	int beacon_interval;
++	int fixed_freq;
++	unsigned char rates[NL80211_MAX_SUPP_RATES];
++	int mcast_rate;
++
+ 	/**
+ 	 * bssid_hint - BSSID of a proposed AP
+ 	 *
+--- a/wpa_supplicant/config.c
++++ b/wpa_supplicant/config.c
+@@ -15,6 +15,7 @@
+ #include "rsn_supp/wpa.h"
+ #include "eap_peer/eap.h"
+ #include "p2p/p2p.h"
++#include "drivers/nl80211_copy.h"
+ #include "config.h"
+ 
+ 
+@@ -1576,6 +1577,97 @@ static char * wpa_config_write_psk_list(
+ 
+ #endif /* CONFIG_P2P */
+ 
++static int wpa_config_parse_mcast_rate(const struct parse_data *data,
++				       struct wpa_ssid *ssid, int line,
++				       const char *value)
++{
++	ssid->mcast_rate = (int)(strtod(value, NULL) * 10);
++
++	return 0;
++}
++
++#ifndef NO_CONFIG_WRITE
++static char * wpa_config_write_mcast_rate(const struct parse_data *data,
++					  struct wpa_ssid *ssid)
++{
++	char *value;
++	int res;
++
++	if (!ssid->mcast_rate == 0)
++		return NULL;
++
++	value = os_malloc(6); /* longest: 300.0 */
++	if (value == NULL)
++		return NULL;
++	res = os_snprintf(value, 5, "%.1f", (double)ssid->mcast_rate / 10);
++	if (res < 0) {
++		os_free(value);
++		return NULL;
++	}
++	return value;
++}
++#endif /* NO_CONFIG_WRITE */
++
++static int wpa_config_parse_rates(const struct parse_data *data,
++				  struct wpa_ssid *ssid, int line,
++				  const char *value)
++{
++	int i;
++	char *pos, *r, *sptr, *end;
++	double rate;
++
++	pos = (char *)value;
++	r = strtok_r(pos, ",", &sptr);
++	i = 0;
++	while (pos && i < NL80211_MAX_SUPP_RATES) {
++		rate = 0.0;
++		if (r)
++			rate = strtod(r, &end);
++		ssid->rates[i] = rate * 2;
++		if (*end != '\0' || rate * 2 != ssid->rates[i])
++			return 1;
++
++		i++;
++		r = strtok_r(NULL, ",", &sptr);
++	}
++
++	return 0;
++}
++
++#ifndef NO_CONFIG_WRITE
++static char * wpa_config_write_rates(const struct parse_data *data,
++				     struct wpa_ssid *ssid)
++{
++	char *value, *pos;
++	int res, i;
++
++	if (ssid->rates[0] <= 0)
++		return NULL;
++
++	value = os_malloc(6 * NL80211_MAX_SUPP_RATES + 1);
++	if (value == NULL)
++		return NULL;
++	pos = value;
++	for (i = 0; i < NL80211_MAX_SUPP_RATES - 1; i++) {
++		res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2);
++		if (res < 0) {
++			os_free(value);
++			return NULL;
++		}
++		pos += res;
++	}
++	res = os_snprintf(pos, 6, "%.1f",
++			  (double)ssid->rates[NL80211_MAX_SUPP_RATES - 1] / 2);
++	if (res < 0) {
++		os_free(value);
++		return NULL;
++	}
++
++	value[6 * NL80211_MAX_SUPP_RATES] = '\0';
++	return value;
++}
++#endif /* NO_CONFIG_WRITE */
++
+ /* Helper macros for network block parser */
+ 
+ #ifdef OFFSET
+@@ -1788,6 +1880,9 @@ static const struct parse_data ssid_fiel
+ 	{ INT(ap_max_inactivity) },
+ 	{ INT(dtim_period) },
+ 	{ INT(beacon_int) },
++	{ INT_RANGE(fixed_freq, 0, 1) },
++	{ FUNC(rates) },
++	{ FUNC(mcast_rate) },
+ #ifdef CONFIG_MACSEC
+ 	{ INT_RANGE(macsec_policy, 0, 1) },
+ #endif /* CONFIG_MACSEC */
+--- a/wpa_supplicant/config_ssid.h
++++ b/wpa_supplicant/config_ssid.h
+@@ -12,6 +12,7 @@
+ #include "common/defs.h"
+ #include "utils/list.h"
+ #include "eap_peer/eap_config.h"
++#include "drivers/nl80211_copy.h"
+ 
+ #define MAX_SSID_LEN 32
+ 
+@@ -640,6 +641,10 @@ struct wpa_ssid {
+ 	 */
+ 	void *parent_cred;
+ 
++	int fixed_freq;
++	unsigned char rates[NL80211_MAX_SUPP_RATES];
++	double mcast_rate;
++
+ #ifdef CONFIG_MACSEC
+ 	/**
+ 	 * macsec_policy - Determines the policy for MACsec secure session
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -1949,6 +1949,13 @@ static void wpas_start_assoc_cb(struct w
+ 			params.beacon_int = ssid->beacon_int;
+ 		else
+ 			params.beacon_int = wpa_s->conf->beacon_int;
++		params.fixed_freq = ssid->fixed_freq;
++		i = 0;
++		while (i < NL80211_MAX_SUPP_RATES) {
++			params.rates[i] = ssid->rates[i];
++			i++;
++		}
++		params.mcast_rate = ssid->mcast_rate;
+ 	}
+ 
+ 	params.wpa_ie = wpa_ie;
diff --git a/trunk/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch b/trunk/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
new file mode 100644
index 00000000..46a0ef16
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
@@ -0,0 +1,59 @@
+From ffc4445958a3ed4064f2e1bf73fa478a61c5cf7b Mon Sep 17 00:00:00 2001
+From: Antonio Quartulli <ordex@autistici.org>
+Date: Sun, 3 Jun 2012 18:42:25 +0200
+Subject: [PATCHv2 602/602] driver_nl80211: use new parameters during ibss join
+
+Signed-hostap: Antonio Quartulli <ordex@autistici.org>
+---
+ src/drivers/driver_nl80211.c |   33 ++++++++++++++++++++++++++++++++-
+ 1 file changed, 32 insertions(+), 1 deletion(-)
+
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -9023,7 +9023,7 @@ static int wpa_driver_nl80211_ibss(struc
+ 				   struct wpa_driver_associate_params *params)
+ {
+ 	struct nl_msg *msg;
+-	int ret = -1;
++	int ret = -1, i;
+ 	int count = 0;
+ 
+ 	wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex);
+@@ -9069,6 +9069,37 @@ retry:
+ 			    params->beacon_int);
+ 	}
+ 
++	if (params->fixed_freq) {
++		wpa_printf(MSG_DEBUG, "  * fixed_freq");
++		NLA_PUT_FLAG(msg, NL80211_ATTR_FREQ_FIXED);
++	}
++
++	if (params->beacon_interval > 0) {
++		wpa_printf(MSG_DEBUG, "  * beacon_interval=%d",
++			   params->beacon_interval);
++		NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL,
++			    params->beacon_interval);
++	}
++
++	if (params->rates[0] > 0) {
++		wpa_printf(MSG_DEBUG, "  * basic_rates:");
++		i = 0;
++		while (i < NL80211_MAX_SUPP_RATES &&
++		       params->rates[i] > 0) {
++			wpa_printf(MSG_DEBUG, "    %.1f",
++				   (double)params->rates[i] / 2);
++			i++;
++		}
++		NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, i,
++			params->rates);
++	}
++
++	if (params->mcast_rate > 0) {
++		wpa_printf(MSG_DEBUG, "  * mcast_rates=%.1f",
++			   (double)params->mcast_rate / 10);
++		NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
++	}
++
+ 	ret = nl80211_set_conn_keys(params, msg);
+ 	if (ret)
+ 		goto nla_put_failure;
diff --git a/trunk/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch b/trunk/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
new file mode 100644
index 00000000..543e2a61
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
@@ -0,0 +1,156 @@
+From b9329c5dfeed7d5c55d2117d8dfe326fc40c8fb1 Mon Sep 17 00:00:00 2001
+From: Antonio Quartulli <ordex@autistici.org>
+Date: Tue, 3 Jul 2012 00:36:24 +0200
+Subject: [PATCH] wpa_s: support htmode param
+
+possible values are HT20, HT40-, HT40+ and NOHT
+
+Signed-off-by: Antonio Quartulli <ordex@autistici.org>
+---
+ src/drivers/driver.h            |    2 ++
+ src/drivers/driver_nl80211.c    |   16 ++++++++++
+ wpa_supplicant/config.c         |   66 +++++++++++++++++++++++++++++++++++++++
+ wpa_supplicant/config_ssid.h    |    2 ++
+ wpa_supplicant/wpa_supplicant.c |    2 ++
+ 5 files changed, 88 insertions(+)
+
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -447,6 +447,8 @@ struct wpa_driver_associate_params {
+ 	int fixed_freq;
+ 	unsigned char rates[NL80211_MAX_SUPP_RATES];
+ 	int mcast_rate;
++	int ht_set;
++	unsigned int htmode;
+ 
+ 	/**
+ 	 * bssid_hint - BSSID of a proposed AP
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -9100,6 +9100,22 @@ retry:
+ 		NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
+ 	}
+ 
++	if (params->ht_set) {
++		switch(params->htmode) {
++			case NL80211_CHAN_HT20:
++				wpa_printf(MSG_DEBUG, "  * ht=HT20");
++				break;
++			case NL80211_CHAN_HT40PLUS:
++				wpa_printf(MSG_DEBUG, "  * ht=HT40+");
++				break;
++			case NL80211_CHAN_HT40MINUS:
++				wpa_printf(MSG_DEBUG, "  * ht=HT40-");
++				break;
++		}
++		NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
++			    params->htmode);
++	}
++
+ 	ret = nl80211_set_conn_keys(params, msg);
+ 	if (ret)
+ 		goto nla_put_failure;
+--- a/wpa_supplicant/config.c
++++ b/wpa_supplicant/config.c
+@@ -1608,6 +1608,71 @@ static char * wpa_config_write_mcast_rat
+ }
+ #endif /* NO_CONFIG_WRITE */
+ 
++static int wpa_config_parse_htmode(const struct parse_data *data,
++				   struct wpa_ssid *ssid, int line,
++				   const char *value)
++{
++	int i;
++	static const struct {
++		const char *name;
++		unsigned int val;
++	} htmap[] = {
++		{ .name = "HT20", .val = NL80211_CHAN_HT20, },
++		{ .name = "HT40+", .val = NL80211_CHAN_HT40PLUS, },
++		{ .name = "HT40-", .val = NL80211_CHAN_HT40MINUS, },
++		{ .name = "NOHT", .val = NL80211_CHAN_NO_HT, },
++	};
++	ssid->ht_set = 0;;
++	for (i = 0; i < 4; i++) {
++		if (strcasecmp(htmap[i].name, value) == 0) {
++			ssid->htmode = htmap[i].val;
++			ssid->ht_set = 1;
++			break;
++		}
++	}
++
++	return 0;
++}
++
++#ifndef NO_CONFIG_WRITE
++static char * wpa_config_write_htmode(const struct parse_data *data,
++				      struct wpa_ssid *ssid)
++{
++	char *value;
++	int res;
++
++	value = os_malloc(6); /* longest: HT40+ */
++	if (value == NULL)
++		return NULL;
++
++	switch(ssid->htmode) {
++		case NL80211_CHAN_HT20:
++			res = os_snprintf(value, 4, "HT20");
++			break;
++		case NL80211_CHAN_HT40PLUS:
++			res = os_snprintf(value, 5, "HT40+");
++			break;
++		case NL80211_CHAN_HT40MINUS:
++			res = os_snprintf(value, 5, "HT40-");
++			break;
++		case NL80211_CHAN_NO_HT:
++			res = os_snprintf(value, 4, "NOHT");
++			break;
++		default:
++			os_free(value);
++			return NULL;
++	}
++
++	if (res < 0) {
++		os_free(value);
++		return NULL;
++	}
++
++	return value;
++}
++#endif /* NO_CONFIG_WRITE */
++
++
+ static int wpa_config_parse_rates(const struct parse_data *data,
+ 				  struct wpa_ssid *ssid, int line,
+ 				  const char *value)
+@@ -1883,6 +1948,7 @@ static const struct parse_data ssid_fiel
+ 	{ INT_RANGE(fixed_freq, 0, 1) },
+ 	{ FUNC(rates) },
+ 	{ FUNC(mcast_rate) },
++	{ FUNC(htmode) },
+ #ifdef CONFIG_MACSEC
+ 	{ INT_RANGE(macsec_policy, 0, 1) },
+ #endif /* CONFIG_MACSEC */
+--- a/wpa_supplicant/config_ssid.h
++++ b/wpa_supplicant/config_ssid.h
+@@ -644,6 +644,8 @@ struct wpa_ssid {
+ 	int fixed_freq;
+ 	unsigned char rates[NL80211_MAX_SUPP_RATES];
+ 	double mcast_rate;
++	int ht_set;
++	unsigned int htmode;
+ 
+ #ifdef CONFIG_MACSEC
+ 	/**
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -1956,6 +1956,8 @@ static void wpas_start_assoc_cb(struct w
+ 			i++;
+ 		}
+ 		params.mcast_rate = ssid->mcast_rate;
++		params.ht_set = ssid->ht_set;
++		params.htmode = ssid->htmode;
+ 	}
+ 
+ 	params.wpa_ie = wpa_ie;
diff --git a/trunk/package/network/services/hostapd/patches/600-ubus_support.patch b/trunk/package/network/services/hostapd/patches/600-ubus_support.patch
new file mode 100644
index 00000000..fcaddbc4
--- /dev/null
+++ b/trunk/package/network/services/hostapd/patches/600-ubus_support.patch
@@ -0,0 +1,729 @@
+--- a/hostapd/Makefile
++++ b/hostapd/Makefile
+@@ -117,6 +117,11 @@ OBJS += ../src/common/wpa_common.o
+ 
+ OBJS += ../src/eapol_auth/eapol_auth_sm.o
+ 
++ifdef CONFIG_UBUS
++CFLAGS += -DUBUS_SUPPORT
++OBJS += ../src/ap/ubus.o
++LIBS += -lubox -lubus
++endif
+ 
+ ifdef CONFIG_CODE_COVERAGE
+ CFLAGS += -O0 -fprofile-arcs -ftest-coverage
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -12,6 +12,7 @@
+ #include "common/defs.h"
+ #include "ap_config.h"
+ #include "drivers/driver.h"
++#include "ubus.h"
+ 
+ struct wpa_ctrl_dst;
+ struct radius_server_data;
+@@ -102,6 +103,7 @@ struct hostapd_data {
+ 	struct hostapd_iface *iface;
+ 	struct hostapd_config *iconf;
+ 	struct hostapd_bss_config *conf;
++	struct hostapd_ubus_bss ubus;
+ 	int interface_added; /* virtual interface added for this BSS */
+ 	unsigned int started:1;
+ 
+@@ -275,6 +277,8 @@ struct hostapd_iface {
+ 	struct hostapd_config *conf;
+ 	char phy[16]; /* Name of the PHY (radio) */
+ 
++	struct hostapd_ubus_iface ubus;
++
+ 	enum hostapd_iface_state {
+ 		HAPD_IFACE_UNINITIALIZED,
+ 		HAPD_IFACE_DISABLED,
+--- /dev/null
++++ b/src/ap/ubus.c
+@@ -0,0 +1,408 @@
++/*
++ * hostapd / ubus support
++ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++
++#include "utils/includes.h"
++#include "utils/common.h"
++#include "utils/eloop.h"
++#include "common/ieee802_11_defs.h"
++#include "hostapd.h"
++#include "wps_hostapd.h"
++#include "sta_info.h"
++#include "ubus.h"
++
++static struct ubus_context *ctx;
++static struct blob_buf b;
++static int ctx_ref;
++
++struct ubus_banned_client {
++	struct avl_node avl;
++	u8 addr[ETH_ALEN];
++};
++
++static void ubus_receive(int sock, void *eloop_ctx, void *sock_ctx)
++{
++	struct ubus_context *ctx = eloop_ctx;
++	ubus_handle_event(ctx);
++}
++
++static void ubus_reconnect_timeout(void *eloop_data, void *user_ctx)
++{
++	if (ubus_reconnect(ctx, NULL)) {
++		eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
++		return;
++	}
++
++	eloop_register_read_sock(ctx->sock.fd, ubus_receive, ctx, NULL);
++}
++
++static void hostapd_ubus_connection_lost(struct ubus_context *ctx)
++{
++	eloop_unregister_read_sock(ctx->sock.fd);
++	eloop_register_timeout(1, 0, ubus_reconnect_timeout, ctx, NULL);
++}
++
++static bool hostapd_ubus_init(void)
++{
++	if (ctx)
++		return true;
++
++	ctx = ubus_connect(NULL);
++	if (!ctx)
++		return false;
++
++	ctx->connection_lost = hostapd_ubus_connection_lost;
++	eloop_register_read_sock(ctx->sock.fd, ubus_receive, ctx, NULL);
++	return true;
++}
++
++static void hostapd_ubus_ref_inc(void)
++{
++	ctx_ref++;
++}
++
++static void hostapd_ubus_ref_dec(void)
++{
++	ctx_ref--;
++	if (!ctx)
++		return;
++
++	if (ctx_ref)
++		return;
++
++	eloop_unregister_read_sock(ctx->sock.fd);
++	ubus_free(ctx);
++	ctx = NULL;
++}
++
++void hostapd_ubus_add_iface(struct hostapd_iface *iface)
++{
++	if (!hostapd_ubus_init())
++		return;
++}
++
++void hostapd_ubus_free_iface(struct hostapd_iface *iface)
++{
++	if (!ctx)
++		return;
++}
++
++static void
++hostapd_bss_del_ban(void *eloop_data, void *user_ctx)
++{
++	struct ubus_banned_client *ban = eloop_data;
++	struct hostapd_data *hapd = user_ctx;
++
++	avl_delete(&hapd->ubus.banned, &ban->avl);
++	free(ban);
++}
++
++static void
++hostapd_bss_ban_client(struct hostapd_data *hapd, u8 *addr, int time)
++{
++	struct ubus_banned_client *ban;
++
++	if (time < 0)
++		time = 0;
++
++	ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
++	if (!ban) {
++		if (!time)
++			return;
++
++		ban = os_zalloc(sizeof(*ban));
++		memcpy(ban->addr, addr, sizeof(ban->addr));
++		ban->avl.key = ban->addr;
++		avl_insert(&hapd->ubus.banned, &ban->avl);
++	} else {
++		eloop_cancel_timeout(hostapd_bss_del_ban, ban, hapd);
++		if (!time) {
++			hostapd_bss_del_ban(ban, hapd);
++			return;
++		}
++	}
++
++	eloop_register_timeout(0, time * 1000, hostapd_bss_del_ban, ban, hapd);
++}
++
++static int
++hostapd_bss_get_clients(struct ubus_context *ctx, struct ubus_object *obj,
++			struct ubus_request_data *req, const char *method,
++			struct blob_attr *msg)
++{
++	struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++	struct sta_info *sta;
++	void *list, *c;
++	char mac_buf[20];
++	static const struct {
++		const char *name;
++		uint32_t flag;
++	} sta_flags[] = {
++		{ "auth", WLAN_STA_AUTH },
++		{ "assoc", WLAN_STA_ASSOC },
++		{ "authorized", WLAN_STA_AUTHORIZED },
++		{ "preauth", WLAN_STA_PREAUTH },
++		{ "wds", WLAN_STA_WDS },
++		{ "wmm", WLAN_STA_WMM },
++		{ "ht", WLAN_STA_HT },
++		{ "vht", WLAN_STA_VHT },
++		{ "wps", WLAN_STA_WPS },
++		{ "mfp", WLAN_STA_MFP },
++	};
++
++	blob_buf_init(&b, 0);
++	blobmsg_add_u32(&b, "freq", hapd->iface->freq);
++	list = blobmsg_open_table(&b, "clients");
++	for (sta = hapd->sta_list; sta; sta = sta->next) {
++		int i;
++
++		sprintf(mac_buf, MACSTR, MAC2STR(sta->addr));
++		c = blobmsg_open_table(&b, mac_buf);
++		for (i = 0; i < ARRAY_SIZE(sta_flags); i++)
++			blobmsg_add_u8(&b, sta_flags[i].name,
++				       !!(sta->flags & sta_flags[i].flag));
++		blobmsg_add_u32(&b, "aid", sta->aid);
++		blobmsg_close_table(&b, c);
++	}
++	blobmsg_close_array(&b, list);
++	ubus_send_reply(ctx, req, b.head);
++
++	return 0;
++}
++
++enum {
++	DEL_CLIENT_ADDR,
++	DEL_CLIENT_REASON,
++	DEL_CLIENT_DEAUTH,
++	DEL_CLIENT_BAN_TIME,
++	__DEL_CLIENT_MAX
++};
++
++static const struct blobmsg_policy del_policy[__DEL_CLIENT_MAX] = {
++	[DEL_CLIENT_ADDR] = { "addr", BLOBMSG_TYPE_STRING },
++	[DEL_CLIENT_REASON] = { "reason", BLOBMSG_TYPE_INT32 },
++	[DEL_CLIENT_DEAUTH] = { "deauth", BLOBMSG_TYPE_INT8 },
++	[DEL_CLIENT_BAN_TIME] = { "ban_time", BLOBMSG_TYPE_INT32 },
++};
++
++static int
++hostapd_bss_del_client(struct ubus_context *ctx, struct ubus_object *obj,
++			struct ubus_request_data *req, const char *method,
++			struct blob_attr *msg)
++{
++	struct blob_attr *tb[__DEL_CLIENT_MAX];
++	struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++	struct sta_info *sta;
++	bool deauth = false;
++	int reason;
++	u8 addr[ETH_ALEN];
++
++	blobmsg_parse(del_policy, __DEL_CLIENT_MAX, tb, blob_data(msg), blob_len(msg));
++
++	if (!tb[DEL_CLIENT_ADDR])
++		return UBUS_STATUS_INVALID_ARGUMENT;
++
++	if (hwaddr_aton(blobmsg_data(tb[DEL_CLIENT_ADDR]), addr))
++		return UBUS_STATUS_INVALID_ARGUMENT;
++
++	if (tb[DEL_CLIENT_REASON])
++		reason = blobmsg_get_u32(tb[DEL_CLIENT_REASON]);
++
++	if (tb[DEL_CLIENT_DEAUTH])
++		deauth = blobmsg_get_bool(tb[DEL_CLIENT_DEAUTH]);
++
++	sta = ap_get_sta(hapd, addr);
++	if (sta) {
++		if (deauth) {
++			hostapd_drv_sta_deauth(hapd, addr, reason);
++			ap_sta_deauthenticate(hapd, sta, reason);
++		} else {
++			hostapd_drv_sta_disassoc(hapd, addr, reason);
++			ap_sta_disassociate(hapd, sta, reason);
++		}
++	}
++
++	if (tb[DEL_CLIENT_BAN_TIME])
++		hostapd_bss_ban_client(hapd, addr, blobmsg_get_u32(tb[DEL_CLIENT_BAN_TIME]));
++
++	return 0;
++}
++
++static void
++blobmsg_add_macaddr(struct blob_buf *buf, const char *name, const u8 *addr)
++{
++	char *s;
++
++	s = blobmsg_alloc_string_buffer(buf, name, 20);
++	sprintf(s, MACSTR, MAC2STR(addr));
++	blobmsg_add_string_buffer(buf);
++}
++
++static int
++hostapd_bss_list_bans(struct ubus_context *ctx, struct ubus_object *obj,
++		      struct ubus_request_data *req, const char *method,
++		      struct blob_attr *msg)
++{
++	struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++	struct ubus_banned_client *ban;
++	void *c;
++
++	blob_buf_init(&b, 0);
++	c = blobmsg_open_array(&b, "clients");
++	avl_for_each_element(&hapd->ubus.banned, ban, avl)
++		blobmsg_add_macaddr(&b, NULL, ban->addr);
++	blobmsg_close_array(&b, c);
++	ubus_send_reply(ctx, req, b.head);
++
++	return 0;
++}
++
++static int
++hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
++			struct ubus_request_data *req, const char *method,
++			struct blob_attr *msg)
++{
++	int rc;
++	struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++	rc = hostapd_wps_button_pushed(hapd, NULL);
++
++	if (rc != 0)
++		return UBUS_STATUS_NOT_SUPPORTED;
++
++	return 0;
++}
++
++static int
++hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
++			struct ubus_request_data *req, const char *method,
++			struct blob_attr *msg)
++{
++	int rc;
++	struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
++
++	rc = hostapd_wps_cancel(hapd);
++
++	if (rc != 0)
++		return UBUS_STATUS_NOT_SUPPORTED;
++
++	return 0;
++}
++
++static const struct ubus_method bss_methods[] = {
++	UBUS_METHOD_NOARG("get_clients", hostapd_bss_get_clients),
++	UBUS_METHOD("del_client", hostapd_bss_del_client, del_policy),
++	UBUS_METHOD_NOARG("list_bans", hostapd_bss_list_bans),
++	UBUS_METHOD_NOARG("wps_start", hostapd_bss_wps_start),
++	UBUS_METHOD_NOARG("wps_cancel", hostapd_bss_wps_cancel),
++};
++
++static struct ubus_object_type bss_object_type =
++	UBUS_OBJECT_TYPE("hostapd_bss", bss_methods);
++
++static int avl_compare_macaddr(const void *k1, const void *k2, void *ptr)
++{
++	return memcmp(k1, k2, ETH_ALEN);
++}
++
++void hostapd_ubus_add_bss(struct hostapd_data *hapd)
++{
++	struct ubus_object *obj = &hapd->ubus.obj;
++	char *name;
++	int ret;
++
++	if (!hostapd_ubus_init())
++		return;
++
++	if (asprintf(&name, "hostapd.%s", hapd->conf->iface) < 0)
++		return;
++
++	avl_init(&hapd->ubus.banned, avl_compare_macaddr, false, NULL);
++	obj->name = name;
++	obj->type = &bss_object_type;
++	obj->methods = bss_object_type.methods;
++	obj->n_methods = bss_object_type.n_methods;
++	ret = ubus_add_object(ctx, obj);
++	hostapd_ubus_ref_inc();
++}
++
++void hostapd_ubus_free_bss(struct hostapd_data *hapd)
++{
++	struct ubus_object *obj = &hapd->ubus.obj;
++	char *name = (char *) obj->name;
++
++	if (!ctx)
++		return;
++
++	if (obj->id) {
++		ubus_remove_object(ctx, obj);
++		hostapd_ubus_ref_dec();
++	}
++
++	free(name);
++}
++
++struct ubus_event_req {
++	struct ubus_notify_request nreq;
++	bool deny;
++};
++
++static void
++ubus_event_cb(struct ubus_notify_request *req, int idx, int ret)
++{
++	struct ubus_event_req *ureq = container_of(req, struct ubus_event_req, nreq);
++
++	if (ret)
++		ureq->deny = true;
++}
++
++int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
++{
++	struct ubus_banned_client *ban;
++	const char *types[HOSTAPD_UBUS_TYPE_MAX] = {
++		[HOSTAPD_UBUS_PROBE_REQ] = "probe",
++		[HOSTAPD_UBUS_AUTH_REQ] = "auth",
++		[HOSTAPD_UBUS_ASSOC_REQ] = "assoc",
++	};
++	const char *type = "mgmt";
++	struct ubus_event_req ureq = {};
++	const u8 *addr;
++
++	if (req->mgmt_frame)
++		addr = req->mgmt_frame->sa;
++	else
++		addr = req->addr;
++
++	ban = avl_find_element(&hapd->ubus.banned, addr, ban, avl);
++	if (ban)
++		return -2;
++
++	if (!hapd->ubus.obj.has_subscribers)
++		return 0;
++
++	if (req->type < ARRAY_SIZE(types))
++		type = types[req->type];
++
++	blob_buf_init(&b, 0);
++	blobmsg_add_macaddr(&b, "address", addr);
++	if (req->mgmt_frame)
++		blobmsg_add_macaddr(&b, "target", req->mgmt_frame->da);
++	if (req->frame_info)
++		blobmsg_add_u32(&b, "signal", req->frame_info->ssi_signal);
++	blobmsg_add_u32(&b, "freq", hapd->iface->freq);
++
++	if (ubus_notify_async(ctx, &hapd->ubus.obj, type, b.head, &ureq.nreq))
++		return 0;
++
++	ureq.nreq.status_cb = ubus_event_cb;
++	ubus_complete_request(ctx, &ureq.nreq.req, 100);
++
++	if (ureq.deny)
++		return -1;
++
++	return 0;
++}
+--- /dev/null
++++ b/src/ap/ubus.h
+@@ -0,0 +1,78 @@
++/*
++ * hostapd / ubus support
++ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
++ *
++ * This software may be distributed under the terms of the BSD license.
++ * See README for more details.
++ */
++#ifndef __HOSTAPD_UBUS_H
++#define __HOSTAPD_UBUS_H
++
++enum hostapd_ubus_event_type {
++	HOSTAPD_UBUS_PROBE_REQ,
++	HOSTAPD_UBUS_AUTH_REQ,
++	HOSTAPD_UBUS_ASSOC_REQ,
++	HOSTAPD_UBUS_TYPE_MAX
++};
++
++struct hostapd_ubus_request {
++	enum hostapd_ubus_event_type type;
++	const struct ieee80211_mgmt *mgmt_frame;
++	const struct hostapd_frame_info *frame_info;
++	const u8 *addr;
++};
++
++struct hostapd_iface;
++struct hostapd_data;
++
++#ifdef UBUS_SUPPORT
++
++#include <libubox/avl.h>
++#include <libubus.h>
++
++struct hostapd_ubus_iface {
++	struct ubus_object obj;
++};
++
++struct hostapd_ubus_bss {
++	struct ubus_object obj;
++	struct avl_tree banned;
++};
++
++void hostapd_ubus_add_iface(struct hostapd_iface *iface);
++void hostapd_ubus_free_iface(struct hostapd_iface *iface);
++void hostapd_ubus_add_bss(struct hostapd_data *hapd);
++void hostapd_ubus_free_bss(struct hostapd_data *hapd);
++
++int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req);
++
++#else
++
++struct hostapd_ubus_iface {};
++
++struct hostapd_ubus_bss {};
++
++static inline void hostapd_ubus_add_iface(struct hostapd_iface *iface)
++{
++}
++
++static inline void hostapd_ubus_free_iface(struct hostapd_iface *iface)
++{
++}
++
++static inline void hostapd_ubus_add_bss(struct hostapd_data *hapd)
++{
++}
++
++static inline void hostapd_ubus_free_bss(struct hostapd_data *hapd)
++{
++}
++
++static inline int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req)
++{
++	return 0;
++}
++
++#endif
++
++#endif
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -263,6 +263,7 @@ static void hostapd_free_hapd_data(struc
+ 	hapd->started = 0;
+ 
+ 	wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
++	hostapd_ubus_free_bss(hapd);
+ 	iapp_deinit(hapd->iapp);
+ 	hapd->iapp = NULL;
+ 	accounting_deinit(hapd);
+@@ -907,6 +908,8 @@ static int hostapd_setup_bss(struct host
+ 	if (hapd->driver && hapd->driver->set_operstate)
+ 		hapd->driver->set_operstate(hapd->drv_priv, 1);
+ 
++	hostapd_ubus_add_bss(hapd);
++
+ 	return 0;
+ }
+ 
+@@ -1192,6 +1195,7 @@ int hostapd_setup_interface_complete(str
+ 	if (err)
+ 		goto fail;
+ 
++	hostapd_ubus_add_iface(iface);
+ 	wpa_printf(MSG_DEBUG, "Completing interface initialization");
+ 	if (iface->conf->channel) {
+ #ifdef NEED_AP_MLME
+@@ -1322,6 +1326,7 @@ int hostapd_setup_interface_complete(str
+ 
+ fail:
+ 	wpa_printf(MSG_ERROR, "Interface initialization failed");
++	hostapd_ubus_free_iface(iface);
+ 	hostapd_set_state(iface, HAPD_IFACE_DISABLED);
+ 	wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
+ 	if (iface->interfaces && iface->interfaces->terminate_on_error)
+@@ -1648,6 +1653,7 @@ void hostapd_interface_deinit_free(struc
+ 		   (unsigned int) iface->conf->num_bss);
+ 	driver = iface->bss[0]->driver;
+ 	drv_priv = iface->bss[0]->drv_priv;
++	hostapd_ubus_free_iface(iface);
+ 	hostapd_interface_deinit(iface);
+ 	wpa_printf(MSG_DEBUG, "%s: driver=%p drv_priv=%p -> hapd_deinit",
+ 		   __func__, driver, drv_priv);
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -545,7 +545,8 @@ failed:
+ 
+ 
+ static void handle_auth(struct hostapd_data *hapd,
+-			const struct ieee80211_mgmt *mgmt, size_t len)
++			const struct ieee80211_mgmt *mgmt, size_t len,
++			struct hostapd_frame_info *fi)
+ {
+ 	u16 auth_alg, auth_transaction, status_code;
+ 	u16 resp = WLAN_STATUS_SUCCESS;
+@@ -560,6 +561,11 @@ static void handle_auth(struct hostapd_d
+ 	size_t resp_ies_len = 0;
+ 	char *identity = NULL;
+ 	char *radius_cui = NULL;
++	struct hostapd_ubus_request req = {
++		.type = HOSTAPD_UBUS_AUTH_REQ,
++		.mgmt_frame = mgmt,
++		.frame_info = fi,
++	};
+ 
+ 	if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
+ 		wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
+@@ -643,6 +649,14 @@ static void handle_auth(struct hostapd_d
+ 		resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+ 		goto fail;
+ 	}
++
++	if (hostapd_ubus_handle_event(hapd, &req)) {
++		wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n",
++		       MAC2STR(mgmt->sa));
++		resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
++		goto fail;
++	}
++
+ 	if (res == HOSTAPD_ACL_PENDING) {
+ 		wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
+ 			   " waiting for an external authentication",
+@@ -1289,13 +1303,18 @@ static void send_assoc_resp(struct hosta
+ 
+ static void handle_assoc(struct hostapd_data *hapd,
+ 			 const struct ieee80211_mgmt *mgmt, size_t len,
+-			 int reassoc)
++			 int reassoc, struct hostapd_frame_info *fi)
+ {
+ 	u16 capab_info, listen_interval;
+ 	u16 resp = WLAN_STATUS_SUCCESS;
+ 	const u8 *pos;
+ 	int left, i;
+ 	struct sta_info *sta;
++	struct hostapd_ubus_request req = {
++		.type = HOSTAPD_UBUS_ASSOC_REQ,
++		.mgmt_frame = mgmt,
++		.frame_info = fi,
++	};
+ 
+ 	if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
+ 				      sizeof(mgmt->u.assoc_req))) {
+@@ -1394,6 +1413,13 @@ static void handle_assoc(struct hostapd_
+ 		goto fail;
+ 	}
+ 
++	if (hostapd_ubus_handle_event(hapd, &req)) {
++		wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
++		       MAC2STR(mgmt->sa));
++		resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
++		goto fail;
++	}
++
+ 	sta->capability = capab_info;
+ 	sta->listen_interval = listen_interval;
+ 
+@@ -1785,7 +1811,7 @@ int ieee802_11_mgmt(struct hostapd_data 
+ 
+ 
+ 	if (stype == WLAN_FC_STYPE_PROBE_REQ) {
+-		handle_probe_req(hapd, mgmt, len, fi->ssi_signal);
++		handle_probe_req(hapd, mgmt, len, fi);
+ 		return 1;
+ 	}
+ 
+@@ -1800,17 +1826,17 @@ int ieee802_11_mgmt(struct hostapd_data 
+ 	switch (stype) {
+ 	case WLAN_FC_STYPE_AUTH:
+ 		wpa_printf(MSG_DEBUG, "mgmt::auth");
+-		handle_auth(hapd, mgmt, len);
++		handle_auth(hapd, mgmt, len, fi);
+ 		ret = 1;
+ 		break;
+ 	case WLAN_FC_STYPE_ASSOC_REQ:
+ 		wpa_printf(MSG_DEBUG, "mgmt::assoc_req");
+-		handle_assoc(hapd, mgmt, len, 0);
++		handle_assoc(hapd, mgmt, len, 0, fi);
+ 		ret = 1;
+ 		break;
+ 	case WLAN_FC_STYPE_REASSOC_REQ:
+ 		wpa_printf(MSG_DEBUG, "mgmt::reassoc_req");
+-		handle_assoc(hapd, mgmt, len, 1);
++		handle_assoc(hapd, mgmt, len, 1, fi);
+ 		ret = 1;
+ 		break;
+ 	case WLAN_FC_STYPE_DISASSOC:
+--- a/src/ap/beacon.c
++++ b/src/ap/beacon.c
+@@ -513,7 +513,7 @@ static enum ssid_match_result ssid_match
+ 
+ void handle_probe_req(struct hostapd_data *hapd,
+ 		      const struct ieee80211_mgmt *mgmt, size_t len,
+-		      int ssi_signal)
++		      struct hostapd_frame_info *fi)
+ {
+ 	u8 *resp;
+ 	struct ieee802_11_elems elems;
+@@ -521,8 +521,14 @@ void handle_probe_req(struct hostapd_dat
+ 	size_t ie_len;
+ 	struct sta_info *sta = NULL;
+ 	size_t i, resp_len;
++	int ssi_signal = fi->ssi_signal;
+ 	int noack;
+ 	enum ssid_match_result res;
++	struct hostapd_ubus_request req = {
++		.type = HOSTAPD_UBUS_PROBE_REQ,
++		.mgmt_frame = mgmt,
++		.frame_info = fi,
++	};
+ 
+ 	ie = mgmt->u.probe_req.variable;
+ 	if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req))
+@@ -660,6 +666,12 @@ void handle_probe_req(struct hostapd_dat
+ 	}
+ #endif /* CONFIG_P2P */
+ 
++	if (hostapd_ubus_handle_event(hapd, &req)) {
++		wpa_printf(MSG_DEBUG, "Probe request for " MACSTR " rejected by ubus handler.\n",
++		       MAC2STR(mgmt->sa));
++		return;
++	}
++
+ 	/* TODO: verify that supp_rates contains at least one matching rate
+ 	 * with AP configuration */
+ 
+--- a/src/ap/beacon.h
++++ b/src/ap/beacon.h
+@@ -14,7 +14,7 @@ struct ieee80211_mgmt;
+ 
+ void handle_probe_req(struct hostapd_data *hapd,
+ 		      const struct ieee80211_mgmt *mgmt, size_t len,
+-		      int ssi_signal);
++		      struct hostapd_frame_info *fi);
+ int ieee802_11_set_beacon(struct hostapd_data *hapd);
+ int ieee802_11_set_beacons(struct hostapd_iface *iface);
+ int ieee802_11_update_beacons(struct hostapd_iface *iface);
diff --git a/trunk/package/network/services/igmpproxy/Makefile b/trunk/package/network/services/igmpproxy/Makefile
new file mode 100644
index 00000000..33ed0140
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/Makefile
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=igmpproxy
+PKG_VERSION:=0.1
+PKG_RELEASE:=8
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/igmpproxy
+PKG_MD5SUM:=c56f41ec195bc1fe016369bf74efc5a1
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+PKG_FIXUP:=autoreconf
+PKG_LICENSE:=GPL-2.0+
+
+define Package/igmpproxy
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  DEPENDS:=+USE_EGLIBC:librt
+  TITLE:=Multicast Routing Daemon
+  URL:=http://sourceforge.net/projects/igmpproxy
+endef
+
+define Package/igmpproxy/description
+	IGMPproxy is a simple dynamic Multicast Routing Daemon using
+	only IGMP signalling (Internet Group Management Protocol).
+endef
+
+define Package/igmpproxy/conffiles
+/etc/config/igmpproxy
+endef
+
+TARGET_CFLAGS += -Dlog=igmpproxy_log
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/src \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+endef
+
+define Package/igmpproxy/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/igmpproxy.config $(1)/etc/config/igmpproxy
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/igmpproxy.init $(1)/etc/init.d/igmpproxy
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/igmpproxy $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,igmpproxy))
diff --git a/trunk/package/network/services/igmpproxy/files/igmpproxy.config b/trunk/package/network/services/igmpproxy/files/igmpproxy.config
new file mode 100644
index 00000000..ca625ac9
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/files/igmpproxy.config
@@ -0,0 +1,11 @@
+config igmpproxy
+	option quickleave 1
+
+config phyint
+	option network wan
+	option direction upstream
+	list altnet 192.168.1.0/24
+
+config phyint
+	option network lan
+	option direction downstream
diff --git a/trunk/package/network/services/igmpproxy/files/igmpproxy.init b/trunk/package/network/services/igmpproxy/files/igmpproxy.init
new file mode 100644
index 00000000..8c158147
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/files/igmpproxy.init
@@ -0,0 +1,134 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2010-2014 OpenWrt.org
+
+START=99
+USE_PROCD=1
+PROG=/usr/sbin/igmpproxy
+CONFIGFILE=/var/etc/igmpproxy.conf
+
+# igmpproxy supports both a debug mode and verbosity, which are very useful
+# when something isn't working.
+#
+# Debug mode will print everything to stdout instead of syslog. Generally
+# verbosity should NOT be set as it will quickly fill your syslog.
+#
+# Put any debug or verbosity options into IGMP_OPTS
+#
+# Examples:
+# OPTIONS="-d -v -v" - debug mode and very verbose, this will land in
+#                        stdout and not in syslog
+# OPTIONS="-v" - be verbose, this will write aditional information to syslog
+
+OPTIONS=""
+
+igmp_header() {
+	local quickleave
+	config_get_bool quickleave "$1" quickleave 0
+
+	mkdir -p /var/etc
+	rm -f /var/etc/igmpproxy.conf
+	[ $quickleave -gt 0 ] && echo "quickleave" >> /var/etc/igmpproxy.conf
+
+	[ -L /etc/igmpproxy.conf ] || ln -nsf /var/etc/igmpproxy.conf /etc/igmpproxy.conf
+}
+
+igmp_add_phyint() {
+        local network direction altnets device up
+
+        config_get network $1 network
+        config_get direction $1 direction
+        config_get altnets $1 altnet
+
+	json_load "$(ifstatus $network)"
+	json_get_var device l3_device
+	json_get_var up up
+
+	[ -n "$device" -a "$up" = "1" ] || {
+		procd_append_param error "$network is not up"
+		return;
+	}
+
+	echo -e "\nphyint $device $direction ratelimit 0 threshold 1" >> /var/etc/igmpproxy.conf
+
+	if [ -n "$altnets" ]; then
+		local altnet
+		for altnet in $altnets; do
+			echo -e "\taltnet $altnet" >> /var/etc/igmpproxy.conf
+		done
+	fi
+}
+
+igmp_add_network() {
+	local network
+
+	config_get network $1 network
+	procd_add_interface_trigger "interface.*" $network /etc/init.d/igmpproxy restart
+}
+
+igmp_add_firewall_routing() {
+	config_get network $1 network
+	config_get direction $1 direction
+
+	[[ "$direction" = "downstream" ]] || return 0
+
+	json_add_object ""
+	json_add_string type rule
+	json_add_string src "$upstream"
+	json_add_string dest "$network"
+	json_add_string family ipv4
+	json_add_string proto udp
+	json_add_string dest_ip "224.0.0.0/4"
+	json_add_string target ACCEPT
+	json_close_object
+}
+
+igmp_add_firewall_network() {
+	config_get network $1 network
+	config_get direction $1 direction
+
+	json_add_object ""
+	json_add_string type rule
+	json_add_string src "$network"
+	json_add_string proto igmp
+	json_add_string target ACCEPT
+	json_close_object
+
+	[[ "$direction" = "upstream" ]] && {
+		upstream="$network"
+		config_foreach igmp_add_firewall_routing phyint
+	}
+}
+
+service_triggers() {
+	procd_add_reload_trigger "igmpproxy"
+}
+
+start_service() {
+	config_load igmpproxy
+
+	procd_open_instance
+	config_foreach igmp_header igmpproxy
+	config_foreach igmp_add_phyint phyint
+	procd_set_param command $PROG
+	[ -n "$OPTIONS" ] && procd_append_param $OPTIONS
+	procd_append_param command $CONFIGFILE
+	procd_set_param file $CONFIGFILE
+	procd_set_param respawn
+	procd_open_trigger
+	config_foreach igmp_add_network phyint
+	procd_close_trigger
+
+	procd_open_data
+
+	json_add_array firewall
+	config_foreach igmp_add_firewall_network phyint
+	json_close_array
+
+	procd_close_data
+
+	procd_close_instance
+}
+
+service_started() {
+	procd_set_config_changed firewall
+}
diff --git a/trunk/package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch b/trunk/package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch
new file mode 100644
index 00000000..ffe1cf15
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch
@@ -0,0 +1,79 @@
+From fed8c3db10bc9d3a1e799a774924c00522595d0c Mon Sep 17 00:00:00 2001
+From: Evgeny Yurchenko <evg.yurch@rogers.com>
+Date: Mon, 4 Jan 2010 05:13:59 +0500
+Subject: [PATCH] Send IGMP packets with IP Router Alert option [RFC 2113] included in IP header
+
+---
+ src/igmp.c      |   17 ++++++++++++-----
+ src/igmpproxy.h |    1 +
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/src/igmp.c b/src/igmp.c
+index a0cd27d..b547688 100644
+--- a/src/igmp.c
++++ b/src/igmp.c
+@@ -67,7 +67,7 @@ void initIgmp() {
+      * - Checksum (let the kernel fill it in)
+      */
+     ip->ip_v   = IPVERSION;
+-    ip->ip_hl  = sizeof(struct ip) >> 2;
++    ip->ip_hl  = (sizeof(struct ip) + 4) >> 2; /* +4 for Router Alert option */
+     ip->ip_tos = 0xc0;      /* Internet Control */
+     ip->ip_ttl = MAXTTL;    /* applies to unicasts only */
+     ip->ip_p   = IPPROTO_IGMP;
+@@ -213,7 +213,7 @@ void buildIgmp(uint32_t src, uint32_t dst, int type, int code, uint32_t group, i
+     ip                      = (struct ip *)send_buf;
+     ip->ip_src.s_addr       = src;
+     ip->ip_dst.s_addr       = dst;
+-    ip_set_len(ip, MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen);
++    ip_set_len(ip, IP_HEADER_RAOPT_LEN + IGMP_MINLEN + datalen);
+ 
+     if (IN_MULTICAST(ntohl(dst))) {
+         ip->ip_ttl = curttl;
+@@ -221,13 +221,20 @@ void buildIgmp(uint32_t src, uint32_t dst, int type, int code, uint32_t group, i
+         ip->ip_ttl = MAXTTL;
+     }
+ 
+-    igmp                    = (struct igmp *)(send_buf + MIN_IP_HEADER_LEN);
++    /* Add Router Alert option */
++    ((u_char*)send_buf+MIN_IP_HEADER_LEN)[0] = IPOPT_RA;
++    ((u_char*)send_buf+MIN_IP_HEADER_LEN)[1] = 0x04;
++    ((u_char*)send_buf+MIN_IP_HEADER_LEN)[2] = 0x00;
++    ((u_char*)send_buf+MIN_IP_HEADER_LEN)[3] = 0x00;
++
++    igmp                    = (struct igmp *)(send_buf + IP_HEADER_RAOPT_LEN);
+     igmp->igmp_type         = type;
+     igmp->igmp_code         = code;
+     igmp->igmp_group.s_addr = group;
+     igmp->igmp_cksum        = 0;
+     igmp->igmp_cksum        = inetChksum((u_short *)igmp,
+-                                         IGMP_MINLEN + datalen);
++                                         IP_HEADER_RAOPT_LEN + datalen);
++
+ }
+ 
+ /* 
+@@ -257,7 +264,7 @@ void sendIgmp(uint32_t src, uint32_t dst, int type, int code, uint32_t group, in
+ #endif
+     sdst.sin_addr.s_addr = dst;
+     if (sendto(MRouterFD, send_buf,
+-               MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen, 0,
++               IP_HEADER_RAOPT_LEN + IGMP_MINLEN + datalen, 0,
+                (struct sockaddr *)&sdst, sizeof(sdst)) < 0) {
+         if (errno == ENETDOWN)
+             my_log(LOG_ERR, errno, "Sender VIF was down.");
+diff --git a/src/igmpproxy.h b/src/igmpproxy.h
+index 0de7791..4df8a79 100644
+--- a/src/igmpproxy.h
++++ b/src/igmpproxy.h
+@@ -64,6 +64,7 @@
+ #define MAX_IP_PACKET_LEN	576
+ #define MIN_IP_HEADER_LEN	20
+ #define MAX_IP_HEADER_LEN	60
++#define IP_HEADER_RAOPT_LEN	24
+ 
+ #define MAX_MC_VIFS    32     // !!! check this const in the specific includes
+ 
+-- 
+1.7.2.5
+
diff --git a/trunk/package/network/services/igmpproxy/patches/002-Change-default-interface-state-to-disabled-wrt-29458.patch b/trunk/package/network/services/igmpproxy/patches/002-Change-default-interface-state-to-disabled-wrt-29458.patch
new file mode 100644
index 00000000..d7550d79
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/patches/002-Change-default-interface-state-to-disabled-wrt-29458.patch
@@ -0,0 +1,43 @@
+From 85e240727305b156097ee7aa0f0c4473a136291f Mon Sep 17 00:00:00 2001
+From: Constantin Baranov <const@mimas.ru>
+Date: Tue, 23 Feb 2010 21:08:02 +0400
+Subject: [PATCH] Change default interface state to disabled (wrt #2945877)
+
+---
+ src/ifvc.c      |    2 +-
+ src/igmpproxy.c |    6 ++++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/ifvc.c b/src/ifvc.c
+index 545b3b4..9d7ee97 100644
+--- a/src/ifvc.c
++++ b/src/ifvc.c
+@@ -139,7 +139,7 @@ void buildIfVc() {
+             IfDescEp->allowednets->subnet_addr = subnet;
+ 
+             // Set the default params for the IF...
+-            IfDescEp->state         = IF_STATE_DOWNSTREAM;
++            IfDescEp->state         = IF_STATE_DISABLED;
+             IfDescEp->robustness    = DEFAULT_ROBUSTNESS;
+             IfDescEp->threshold     = DEFAULT_THRESHOLD;   /* ttl limit */
+             IfDescEp->ratelimit     = DEFAULT_RATELIMIT; 
+diff --git a/src/igmpproxy.c b/src/igmpproxy.c
+index 1ece15a..35000c7 100644
+--- a/src/igmpproxy.c
++++ b/src/igmpproxy.c
+@@ -186,8 +186,10 @@ int igmpProxyInit() {
+                     }
+                 }
+ 
+-                addVIF( Dp );
+-                vifcount++;
++                if (Dp->state != IF_STATE_DISABLED) {
++                    addVIF( Dp );
++                    vifcount++;
++                }
+             }
+         }
+ 
+-- 
+1.7.2.5
+
diff --git a/trunk/package/network/services/igmpproxy/patches/003-Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch b/trunk/package/network/services/igmpproxy/patches/003-Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch
new file mode 100644
index 00000000..90d4d5f2
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/patches/003-Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch
@@ -0,0 +1,164 @@
+From 65f777e7f66b55239d935c1cf81bb5abc0f6c89f Mon Sep 17 00:00:00 2001
+From: Grinch <grinch79@users.sourceforge.net>
+Date: Sun, 16 Aug 2009 19:58:26 +0500
+Subject: [PATCH] Restrict igmp reports for downstream interfaces (wrt #2833339)
+
+atm all igmp membership reports are forwarded to the upstream interface.
+Unfortunately some ISP Providers restrict some multicast groups (esp. those
+that are defined as local link groups and that are not supposed to be
+forwarded to the wan, i.e 224.0.0.0/24). Therefore there should be some
+kind of black oder whitelisting.
+As whitelisting can be accomplished quite easy I wrote a litte patch, which
+is attached to this request.
+---
+ doc/igmpproxy.conf.5.in |   19 +++++++++++++++++++
+ src/config.c            |   23 ++++++++++++++++++++++-
+ src/igmpproxy.h         |    1 +
+ src/request.c           |   20 ++++++++++++++++----
+ 4 files changed, 58 insertions(+), 5 deletions(-)
+
+diff --git a/doc/igmpproxy.conf.5.in b/doc/igmpproxy.conf.5.in
+index a4ea7d0..56efa22 100644
+--- a/doc/igmpproxy.conf.5.in
++++ b/doc/igmpproxy.conf.5.in
+@@ -116,6 +116,25 @@ This is especially useful for the upstream interface, since the source for multi
+ traffic is often from a remote location. Any number of altnet parameters can be specified.
+ .RE
+ 
++.B whitelist
++.I networkaddr
++.RS
++Defines a whitelist for multicast groups. The network address must be in the following
++format 'a.b.c.d/n'. If you want to allow one single group use a network mask of /32,
++i.e. 'a.b.c.d/32'. 
++
++By default all multicast groups are allowed on any downstream interface. If at least one
++whitelist entry is defined, all igmp membership reports for not explicitly whitelisted
++multicast groups will be ignored and therefore not be served by igmpproxy. This is especially
++useful, if your provider does only allow a predefined set of multicast groups. These whitelists
++are only obeyed by igmpproxy itself, they won't prevent any other igmp client running on the
++same machine as igmpproxy from requesting 'unallowed' multicast groups.
++
++You may specify as many whitelist entries as needed. Although you should keep it as simple as
++possible, as this list is parsed for every membership report and therefore this increases igmp
++response times. Often used or large groups should be defined first, as parsing ends as soon as
++a group matches an entry.
++.RE
+ 
+ .SH EXAMPLE
+ ## Enable quickleave
+diff --git a/src/config.c b/src/config.c
+index 5a96ce0..d72619f 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -46,6 +46,9 @@ struct vifconfig {
+ 
+     // Keep allowed nets for VIF.
+     struct SubnetList*  allowednets;
++
++    // Allowed Groups
++    struct SubnetList*  allowedgroups;
+     
+     // Next config in list...
+     struct vifconfig*   next;
+@@ -202,6 +205,8 @@ void configureVifs() {
+                     // Insert the configured nets...
+                     vifLast->next = confPtr->allowednets;
+ 
++		    Dp->allowedgroups = confPtr->allowedgroups;
++
+                     break;
+                 }
+             }
+@@ -215,7 +220,7 @@ void configureVifs() {
+ */
+ struct vifconfig *parsePhyintToken() {
+     struct vifconfig  *tmpPtr;
+-    struct SubnetList **anetPtr;
++    struct SubnetList **anetPtr, **agrpPtr;
+     char *token;
+     short parseError = 0;
+ 
+@@ -239,6 +244,7 @@ struct vifconfig *parsePhyintToken() {
+     tmpPtr->threshold = 1;
+     tmpPtr->state = IF_STATE_DOWNSTREAM;
+     tmpPtr->allowednets = NULL;
++    tmpPtr->allowedgroups = NULL;
+ 
+     // Make a copy of the token to store the IF name
+     tmpPtr->name = strdup( token );
+@@ -248,6 +254,7 @@ struct vifconfig *parsePhyintToken() {
+ 
+     // Set the altnet pointer to the allowednets pointer.
+     anetPtr = &tmpPtr->allowednets;
++    agrpPtr = &tmpPtr->allowedgroups; 
+ 
+     // Parse the rest of the config..
+     token = nextConfigToken();
+@@ -266,6 +273,20 @@ struct vifconfig *parsePhyintToken() {
+                 anetPtr = &(*anetPtr)->next;
+             }
+         }
++	else if(strcmp("whitelist", token)==0) {
++	    // Whitelist
++	    token = nextConfigToken();
++	    my_log(LOG_DEBUG, 0, "Config: IF: Got whitelist token %s.", token);
++	
++	    *agrpPtr = parseSubnetAddress(token);
++	    if(*agrpPtr == NULL) {
++		parseError = 1;
++		my_log(LOG_WARNING, 0, "Unable to parse subnet address.");
++		break;
++	    } else {
++		agrpPtr = &(*agrpPtr)->next;
++	    }
++	}
+         else if(strcmp("upstream", token)==0) {
+             // Upstream
+             my_log(LOG_DEBUG, 0, "Config: IF: Got upstream token.");
+diff --git a/src/igmpproxy.h b/src/igmpproxy.h
+index 4dabd1c..0de7791 100644
+--- a/src/igmpproxy.h
++++ b/src/igmpproxy.h
+@@ -145,6 +145,7 @@ struct IfDesc {
+     short               Flags;
+     short               state;
+     struct SubnetList*  allowednets;
++    struct SubnetList*  allowedgroups;
+     unsigned int        robustness;
+     unsigned char       threshold;   /* ttl limit */
+     unsigned int        ratelimit; 
+diff --git a/src/request.c b/src/request.c
+index e3589f6..89b91de 100644
+--- a/src/request.c
++++ b/src/request.c
+@@ -82,10 +82,22 @@ void acceptGroupReport(uint32_t src, uint32_t group, uint8_t type) {
+         my_log(LOG_DEBUG, 0, "Should insert group %s (from: %s) to route table. Vif Ix : %d",
+             inetFmt(group,s1), inetFmt(src,s2), sourceVif->index);
+ 
+-        // The membership report was OK... Insert it into the route table..
+-        insertRoute(group, sourceVif->index);
+-
+-
++	// If we don't have a whitelist we insertRoute and done
++	if(sourceVif->allowedgroups == NULL)
++	{
++	    insertRoute(group, sourceVif->index);
++	    return;
++	}
++	// Check if this Request is legit on this interface
++	struct SubnetList *sn;
++	for(sn = sourceVif->allowedgroups; sn != NULL; sn = sn->next)
++	    if((group & sn->subnet_mask) == sn->subnet_addr)
++	    {
++        	// The membership report was OK... Insert it into the route table..
++        	insertRoute(group, sourceVif->index);
++		return;
++	    }
++	my_log(LOG_INFO, 0, "The group address %s may not be requested from this interface. Ignoring.", inetFmt(group, s1));
+     } else {
+         // Log the state of the interface the report was recieved on.
+         my_log(LOG_INFO, 0, "Mebership report was recieved on %s. Ignoring.",
+-- 
+1.7.2.5
+
diff --git a/trunk/package/network/services/igmpproxy/patches/004-Restrict-igmp-reports-forwarding-to-upstream-interfa.patch b/trunk/package/network/services/igmpproxy/patches/004-Restrict-igmp-reports-forwarding-to-upstream-interfa.patch
new file mode 100644
index 00000000..a4caed72
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/patches/004-Restrict-igmp-reports-forwarding-to-upstream-interfa.patch
@@ -0,0 +1,62 @@
+From bcd7c648e86d97263c931de53a008c9629e7797e Mon Sep 17 00:00:00 2001
+From: Stefan Becker <stefan.becker@nokia.com>
+Date: Fri, 11 Dec 2009 21:08:57 +0200
+Subject: [PATCH] Restrict igmp reports forwarding to upstream interface
+
+Utilize the new "whitelist" keyword also on the upstream interface definition.
+If specified then only whitelisted multicast groups will be forwarded upstream.
+
+This can be used to avoid publishing private multicast groups to the world,
+e.g. SSDP from a UPnP server on the internal network.
+---
+ doc/igmpproxy.conf.5.in |    5 +++++
+ src/rttable.c           |   17 +++++++++++++++++
+ 2 files changed, 22 insertions(+), 0 deletions(-)
+
+diff --git a/doc/igmpproxy.conf.5.in b/doc/igmpproxy.conf.5.in
+index 56efa22..d916f05 100644
+--- a/doc/igmpproxy.conf.5.in
++++ b/doc/igmpproxy.conf.5.in
+@@ -134,6 +134,11 @@ You may specify as many whitelist entries as needed. Although you should keep it
+ possible, as this list is parsed for every membership report and therefore this increases igmp
+ response times. Often used or large groups should be defined first, as parsing ends as soon as
+ a group matches an entry.
++
++You may also specify whitelist entries for the upstream interface. Only igmp membership reports
++for explicitely whitelisted multicast groups will be sent out on the upstream interface. This
++is useful if you want to use multicast groups only between your downstream interfaces, like SSDP
++from a UPnP server.
+ .RE
+ 
+ .SH EXAMPLE
+diff --git a/src/rttable.c b/src/rttable.c
+index f0701a8..77dd791 100644
+--- a/src/rttable.c
++++ b/src/rttable.c
+@@ -117,6 +117,23 @@ void sendJoinLeaveUpstream(struct RouteTable* route, int join) {
+         my_log(LOG_ERR, 0 ,"FATAL: Unable to get Upstream IF.");
+     }
+ 
++    // Check if there is a white list for the upstram VIF
++    if (upstrIf->allowedgroups != NULL) {
++      uint32_t           group = route->group;
++        struct SubnetList* sn;
++
++        // Check if this Request is legit to be forwarded to upstream
++        for(sn = upstrIf->allowedgroups; sn != NULL; sn = sn->next)
++            if((group & sn->subnet_mask) == sn->subnet_addr)
++                // Forward is OK...
++                break;
++
++        if (sn == NULL) {
++	    my_log(LOG_INFO, 0, "The group address %s may not be forwarded upstream. Ignoring.", inetFmt(group, s1));
++            return;
++        }
++    }
++
+     // Send join or leave request...
+     if(join) {
+ 
+-- 
+1.7.2.5
+
diff --git a/trunk/package/network/services/igmpproxy/patches/010-missing_include.patch b/trunk/package/network/services/igmpproxy/patches/010-missing_include.patch
new file mode 100644
index 00000000..af0eab84
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/patches/010-missing_include.patch
@@ -0,0 +1,10 @@
+--- a/src/os-linux.h
++++ b/src/os-linux.h
+@@ -3,6 +3,7 @@
+ #include <linux/mroute.h>
+ #include <netinet/ip.h>
+ #include <netinet/igmp.h>
++#include <sys/types.h>
+ 
+ static inline u_short ip_data_len(const struct ip *ip)
+ {
diff --git a/trunk/package/network/services/igmpproxy/patches/100-use-monotic-clock-instead-of-time-of-day.patch b/trunk/package/network/services/igmpproxy/patches/100-use-monotic-clock-instead-of-time-of-day.patch
new file mode 100644
index 00000000..e75283c0
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/patches/100-use-monotic-clock-instead-of-time-of-day.patch
@@ -0,0 +1,120 @@
+From d0e66e0719ae8eb549f7cc220fdc66575d3db332 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 29 Mar 2012 17:01:11 +0200
+Subject: [PATCH 4/4] use monotic clock instead of time of day
+
+The time of day might chance e.g. by daylight savings time during the
+runtime, which causes timers to fire repeatedly for a long time.
+
+Contributed by T-Labs, Deutsche Telekom Innovation Laboratories
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ configure.ac    |    2 ++
+ src/igmpproxy.c |   26 +++++++++++++-------------
+ src/igmpproxy.h |    3 ++-
+ 3 files changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 85beb08..bd84eba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,8 @@ AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], [], [], [[
+ #include <netinet/in.h>
+ ]])
+ 
++AC_SEARCH_LIBS([clock_gettime],[rt])
++
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	doc/Makefile
+diff --git a/src/igmpproxy.c b/src/igmpproxy.c
+index 35000c7..3a9ccad 100644
+--- a/src/igmpproxy.c
++++ b/src/igmpproxy.c
+@@ -234,13 +234,13 @@ void igmpProxyRun() {
+     int     MaxFD, Rt, secs;
+     fd_set  ReadFDS;
+     socklen_t dummy = 0;
+-    struct  timeval  curtime, lasttime, difftime, tv; 
++    struct  timespec  curtime, lasttime, difftime, tv; 
+     // The timeout is a pointer in order to set it to NULL if nessecary.
+-    struct  timeval  *timeout = &tv;
++    struct  timespec  *timeout = &tv;
+ 
+     // Initialize timer vars
+-    difftime.tv_usec = 0;
+-    gettimeofday(&curtime, NULL);
++    difftime.tv_nsec = 0;
++    clock_gettime(CLOCK_MONOTONIC, &curtime);
+     lasttime = curtime;
+ 
+     // First thing we send a membership query in downstream VIF's...
+@@ -263,7 +263,7 @@ void igmpProxyRun() {
+         if(secs == -1) {
+             timeout = NULL;
+         } else {
+-            timeout->tv_usec = 0;
++            timeout->tv_nsec = 0;
+             timeout->tv_sec = secs;
+         }
+ 
+@@ -274,7 +274,7 @@ void igmpProxyRun() {
+         FD_SET( MRouterFD, &ReadFDS );
+ 
+         // wait for input
+-        Rt = select( MaxFD +1, &ReadFDS, NULL, NULL, timeout );
++        Rt = pselect( MaxFD +1, &ReadFDS, NULL, NULL, timeout, NULL );
+ 
+         // log and ignore failures
+         if( Rt < 0 ) {
+@@ -307,20 +307,20 @@ void igmpProxyRun() {
+              */
+             if (Rt == 0) {
+                 curtime.tv_sec = lasttime.tv_sec + secs;
+-                curtime.tv_usec = lasttime.tv_usec;
++                curtime.tv_nsec = lasttime.tv_nsec;
+                 Rt = -1; /* don't do this next time through the loop */
+             } else {
+-                gettimeofday(&curtime, NULL);
++                clock_gettime(CLOCK_MONOTONIC, &curtime);
+             }
+             difftime.tv_sec = curtime.tv_sec - lasttime.tv_sec;
+-            difftime.tv_usec += curtime.tv_usec - lasttime.tv_usec;
+-            while (difftime.tv_usec > 1000000) {
++            difftime.tv_nsec += curtime.tv_nsec - lasttime.tv_nsec;
++            while (difftime.tv_nsec > 1000000000) {
+                 difftime.tv_sec++;
+-                difftime.tv_usec -= 1000000;
++                difftime.tv_nsec -= 1000000000;
+             }
+-            if (difftime.tv_usec < 0) {
++            if (difftime.tv_nsec < 0) {
+                 difftime.tv_sec--;
+-                difftime.tv_usec += 1000000;
++                difftime.tv_nsec += 1000000000;
+             }
+             lasttime = curtime;
+             if (secs == 0 || difftime.tv_sec > 0)
+diff --git a/src/igmpproxy.h b/src/igmpproxy.h
+index 4df8a79..36a4f04 100644
+--- a/src/igmpproxy.h
++++ b/src/igmpproxy.h
+@@ -44,12 +44,13 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <stdbool.h>
++#include <time.h>
+ 
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
++#include <sys/select.h>
+ 
+ #include <net/if.h>
+ #include <netinet/in.h>
+-- 
+1.7.2.5
+
diff --git a/trunk/package/network/services/igmpproxy/patches/200-allow_wildcard_addr.patch b/trunk/package/network/services/igmpproxy/patches/200-allow_wildcard_addr.patch
new file mode 100644
index 00000000..0dd77200
--- /dev/null
+++ b/trunk/package/network/services/igmpproxy/patches/200-allow_wildcard_addr.patch
@@ -0,0 +1,24 @@
+--- a/src/config.c
++++ b/src/config.c
+@@ -357,15 +357,18 @@ struct SubnetList *parseSubnetAddress(ch
+     tmpStr = strtok(NULL, "/");
+     if(tmpStr != NULL) {
+         int bitcnt = atoi(tmpStr);
+-        if(bitcnt <= 0 || bitcnt > 32) {
++        if(bitcnt < 0 || bitcnt > 32) {
+             my_log(LOG_WARNING, 0, "The bits part of the address is invalid : %d.",tmpStr);
+             return NULL;
+         }
+ 
+-        mask <<= (32 - bitcnt);
++		if (bitcnt == 0)
++			mask = 0;
++		else
++	        mask <<= (32 - bitcnt);
+     }
+ 
+-    if(addr == -1 || addr == 0) {
++    if(addr == -1) {
+         my_log(LOG_WARNING, 0, "Unable to parse address token '%s'.", addrstr);
+         return NULL;
+     }
diff --git a/trunk/package/network/services/ipset-dns/Makefile b/trunk/package/network/services/ipset-dns/Makefile
new file mode 100644
index 00000000..37cf7c56
--- /dev/null
+++ b/trunk/package/network/services/ipset-dns/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ipset-dns
+PKG_VERSION:=2013-05-03
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://git.zx2c4.com/ipset-dns
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=6be3afd819a86136b51c5ae722ab48266187155b
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ipset-dns/Default
+endef
+
+define Package/ipset-dns
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=A lightweight DNS forwarder to populate ipsets
+  URL:=http://git.zx2c4.com/ipset-dns/about/
+  DEPENDS:=+libmnl
+endef
+
+define Package/ipset-dns/description
+ The ipset-dns daemon is a lightweight DNS forwarding server that adds all
+ resolved IPs to a given netfilter ipset. It is designed to be used in
+ conjunction with dnsmasq's upstream server directive.
+
+ Practical use cases include routing over a given gateway traffic for
+ particular web services or webpages that do not have a priori predictable
+ IP addresses and instead rely on dizzying arrays of DNS resolutions.
+endef
+
+define Package/ipset-dns/conffiles
+/etc/config/ipset-dns
+endef
+
+define Package/ipset-dns/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ipset-dns $(1)/usr/sbin/ipset-dns
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/ipset-dns.init $(1)/etc/init.d/ipset-dns
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/ipset-dns.config $(1)/etc/config/ipset-dns
+endef
+
+$(eval $(call BuildPackage,ipset-dns))
diff --git a/trunk/package/network/services/ipset-dns/files/ipset-dns.config b/trunk/package/network/services/ipset-dns/files/ipset-dns.config
new file mode 100644
index 00000000..0270366a
--- /dev/null
+++ b/trunk/package/network/services/ipset-dns/files/ipset-dns.config
@@ -0,0 +1,16 @@
+# declare an ipset-dns listener instance, multiple allowed
+config ipset-dns
+	# use given ipset for type A (IPv4) responses
+	option ipset 'domain-filter-ipv4'
+
+	# use given ipset for type AAAA (IPv6) responses
+	option ipset6 'domain-filter-ipv6'
+
+	# use given listening port
+	# defaults to 53000 + instance number
+	#option port  '53001'
+
+	# use given upstream DNS server,
+	# defaults to first entry in /tmp/resolv.conf.auto
+	#option dns   '8.8.8.8'
+
diff --git a/trunk/package/network/services/ipset-dns/files/ipset-dns.init b/trunk/package/network/services/ipset-dns/files/ipset-dns.init
new file mode 100755
index 00000000..0a76fcc4
--- /dev/null
+++ b/trunk/package/network/services/ipset-dns/files/ipset-dns.init
@@ -0,0 +1,57 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2013 OpenWrt.org
+
+START=61
+
+USE_PROCD=1
+
+find_nameserver() {
+	. /lib/functions/network.sh
+
+	local tmp
+	if network_find_wan tmp && network_get_dnsserver tmp "$tmp"; then
+		echo "${tmp%% *}"
+		return 0
+	fi
+
+	return 1
+}
+
+start_instance() {
+	local cfg="$1"
+	local ipset ipset6 port dns
+
+	config_get ipset "$cfg" ipset
+	config_get ipset6 "$cfg" ipset6
+	[ -n "$ipset$ipset6" ] || {
+		echo "No ipset specified for instance $cfg" >&2
+		return 1
+	}
+
+	config_get dns "$cfg" dns "$DEFNS"
+	[ -n "$dns" ] || {
+		echo "No DNS server specified for instance $cfg" >&2
+		return 1
+	}
+
+	config_get port "$cfg" port $((PORT++))
+
+	procd_open_instance
+	procd_set_param command /usr/sbin/ipset-dns "$ipset" "$ipset6" "$port" "$dns"
+	procd_set_param env NO_DAEMONIZE=1
+	procd_set_param respawn
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "ipset-dns"
+}
+
+start_service() {
+	PORT=53001
+	DEFNS="$(find_nameserver)"
+
+	config_load ipset-dns
+	config_foreach start_instance ipset-dns
+}
diff --git a/trunk/package/network/services/ipset-dns/patches/100-simultaneous-ipv4-ipv6.patch b/trunk/package/network/services/ipset-dns/patches/100-simultaneous-ipv4-ipv6.patch
new file mode 100644
index 00000000..19669a05
--- /dev/null
+++ b/trunk/package/network/services/ipset-dns/patches/100-simultaneous-ipv4-ipv6.patch
@@ -0,0 +1,57 @@
+--- a/ipset-dns.c
++++ b/ipset-dns.c
+@@ -307,19 +307,20 @@ int main(int argc, char *argv[]) 
+ 	struct timeval tv;
+ 	char msg[512];
+ 	char ip[INET6_ADDRSTRLEN];
+-	char *ipset;
++	char *ipset, *ipset6;
+ 	int listen_sock, upstream_sock;
+ 	int pos, i, size, af;
+ 	socklen_t len;
+ 	size_t received;
+ 	pid_t child;
+ 	
+-	if (argc != 4) {
+-		fprintf(stderr, "Usage: %s ipset port upstream\n", argv[0]);
++	if (argc != 5) {
++		fprintf(stderr, "Usage: %s ipv4-ipset ipv6-ipset port upstream\n", argv[0]);
+ 		return 1;
+ 	}
+ 
+ 	ipset = argv[1];
++	ipset6 = argv[2];
+ 
+ 	listen_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ 	if (listen_sock < 0) {
+@@ -329,7 +330,7 @@ int main(int argc, char *argv[]) 
+ 
+ 	memset(&listen_addr, 0, sizeof(listen_addr));
+ 	listen_addr.sin_family = AF_INET;
+-	listen_addr.sin_port = htons(atoi(argv[2]));
++	listen_addr.sin_port = htons(atoi(argv[3]));
+ 	listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ 	i = 1;
+ 	setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
+@@ -341,7 +342,7 @@ int main(int argc, char *argv[]) 
+ 	memset(&upstream_addr, 0, sizeof(upstream_addr));
+ 	upstream_addr.sin_family = AF_INET;
+ 	upstream_addr.sin_port = htons(53);
+-	inet_aton(argv[3], &upstream_addr.sin_addr);
++	inet_aton(argv[4], &upstream_addr.sin_addr);
+ 	
+ 	/* TODO: Put all of the below code in several forks all listening on the same sock. */
+ 
+@@ -434,8 +435,11 @@ int main(int argc, char *argv[]) 
+ 				continue;
+ 			}
+ 
++			if ((af == AF_INET && !*ipset) || (af == AF_INET6 && !*ipset6))
++				continue;
++
+ 			printf("%s: %s\n", answer.dotted, ip);
+-			if (add_to_ipset(ipset, answer.rdata, af) < 0)
++			if (add_to_ipset((af == AF_INET) ? ipset : ipset6, answer.rdata, af) < 0)
+ 				perror("add_to_ipset");
+ 		}
+ 		
diff --git a/trunk/package/network/services/lldpd/Config.in b/trunk/package/network/services/lldpd/Config.in
new file mode 100644
index 00000000..c7d47953
--- /dev/null
+++ b/trunk/package/network/services/lldpd/Config.in
@@ -0,0 +1,28 @@
+menu "Configuration"
+	depends on PACKAGE_lldpd
+
+config LLDPD_WITH_CDP
+	bool
+	default y
+	prompt "Enable support for the Cisco Discovery Protocol (CDP) version 1 and 2"
+
+config LLDPD_WITH_FDP
+	bool
+	default y
+	prompt "Enable support for the Foundry Discovery Protocol (FDP)"
+
+config LLDPD_WITH_EDP
+	bool
+	default y
+	prompt "Enable support for the Extreme Discovery Protocol (EDP)"
+
+config LLDPD_WITH_SONMP
+	bool
+	default y
+	prompt "Enable support for the SynOptics Network Management Protocol"
+
+config LLDPD_WITH_JSON
+	bool
+	prompt "Enable JSON output for the LLDP Command-Line Interface"
+	default n
+endmenu
diff --git a/trunk/package/network/services/lldpd/Makefile b/trunk/package/network/services/lldpd/Makefile
new file mode 100644
index 00000000..cffae63d
--- /dev/null
+++ b/trunk/package/network/services/lldpd/Makefile
@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2008-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lldpd
+PKG_VERSION:=0.7.10
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://media.luffy.cx/files/lldpd
+PKG_MD5SUM:=508f2e76703abf8420d9223aae3db548
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=ISC
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+TARGET_CFLAGS+=--std=c99
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lldpd
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=Link Layer Discovery Protocol daemon
+  URL:=https://github.com/vincentbernat/lldpd/wiki
+  DEPENDS:=+libevent2 +USE_EGLIBC:libbsd +LLDPD_WITH_JSON:libjson-c
+  USERID:=lldp=121:lldp=129
+  MENU:=1
+endef
+
+define Package/lldpd/config
+source "$(SOURCE)/Config.in"
+endef
+
+define Package/lldpd/description
+	LLDP (Link Layer Discovery Protocol) is an industry standard protocol designed
+	to supplant proprietary Link-Layer protocols such as
+	Extreme's EDP (Extreme Discovery Protocol) and
+	CDP (Cisco Discovery Protocol).
+	The goal of LLDP is to provide an inter-vendor compatible mechanism to deliver
+	Link-Layer notifications to adjacent network devices.
+endef
+
+define Package/lldpd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/lldpd.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/lldp{cli,ctl,d} $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblldpctl.so* $(1)/usr/lib/
+	$(INSTALL_BIN) ./files/lldpd.init $(1)/etc/init.d/lldpd
+	$(INSTALL_DATA) ./files/lldpd.config $(1)/etc/config/lldpd
+ifneq ($(CONFIG_LLDPD_WITH_CDP),y)
+	sed -i -e '/cdp/d' $(1)/etc/init.d/lldpd $(1)/etc/config/lldpd
+endif
+ifneq ($(CONFIG_LLDPD_WITH_FDP),y)
+	sed -i -e '/fdp/d' $(1)/etc/init.d/lldpd $(1)/etc/config/lldpd
+endif
+ifneq ($(CONFIG_LLDPD_WITH_EDP),y)
+	sed -i -e '/edp/d' $(1)/etc/init.d/lldpd $(1)/etc/config/lldpd
+endif
+ifneq ($(CONFIG_LLDPD_WITH_SONMP),y)
+	sed -i -e '/sonmp/d' $(1)/etc/init.d/lldpd $(1)/etc/config/lldpd
+endif
+endef
+
+define Package/lldpd/conffiles
+/etc/config/lldpd
+endef
+
+CONFIGURE_ARGS += \
+	--with-privsep-user=lldp \
+	--with-privsep-group=lldp \
+	--with-privsep-chroot=/var/run/lldp \
+	--with-readline=no \
+	--with-embedded-libevent=no \
+	$(if $(CONFIG_LLDPD_WITH_CDP),,--disable-cdp) \
+	$(if $(CONFIG_LLDPD_WITH_FDP),,--disable-fdp) \
+	$(if $(CONFIG_LLDPD_WITH_EDP),,--disable-edp) \
+	$(if $(CONFIG_LLDPD_WITH_SONMP),,--disable-sonmp) \
+	$(if $(CONFIG_LLDPD_WITH_JSON),--with-json=json-c)
+
+
+$(eval $(call BuildPackage,lldpd))
diff --git a/trunk/package/network/services/lldpd/files/lldpd.config b/trunk/package/network/services/lldpd/files/lldpd.config
new file mode 100644
index 00000000..380995d2
--- /dev/null
+++ b/trunk/package/network/services/lldpd/files/lldpd.config
@@ -0,0 +1,15 @@
+config lldpd config
+	option enable_cdp 1
+	option enable_fdp 1
+	option enable_sonmp 1
+	option enable_edp 1
+	
+	option lldp_class 4
+	option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4"
+
+	# if empty, the distribution description is sent
+	#option lldp_description "libreCMC System"
+
+	# interfaces to listen on
+	list interface "loopback"
+	list interface "lan"
diff --git a/trunk/package/network/services/lldpd/files/lldpd.init b/trunk/package/network/services/lldpd/files/lldpd.init
new file mode 100644
index 00000000..64a97bff
--- /dev/null
+++ b/trunk/package/network/services/lldpd/files/lldpd.init
@@ -0,0 +1,69 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2012 OpenWrt.org
+
+START=90
+
+SERVICE_USE_PID=1
+
+find_release_info()
+{
+	[ -s /etc/librecmc_release ] && . /etc/librecmc_release
+	[ -z "$DISTRIB_DESCRIPTION" ] && [ -s /etc/librecmc_version ] && \
+		DISTRIB_DESCRIPTION="$(cat /etc/librecmc_version)"
+
+	echo "${DISTRIB_DESCRIPTION:-Unknown libreCMC release} @ $(cat /proc/sys/kernel/hostname)"
+}
+
+start() {
+	. /lib/functions/network.sh
+
+	local enable_cdp
+	local enable_fdp
+	local enable_sonmp
+	local enable_edp
+	local lldp_class
+	local lldp_location
+	local lldp_description
+
+	config_load 'lldpd'
+	config_get_bool enable_cdp 'config' 'enable_cdp' 0
+	config_get_bool enable_fdp 'config' 'enable_fdp' 0
+	config_get_bool enable_sonmp 'config' 'enable_sonmp' 0
+	config_get_bool enable_edp 'config' 'enable_edp' 0
+	config_get lldp_class 'config' 'lldp_class'
+	config_get lldp_location 'config' 'lldp_location'
+	config_get lldp_description 'config' 'lldp_description' "$(find_release_info)"
+
+	local ifaces
+	config_get ifaces 'config' 'interface'
+
+	local iface
+	for iface in $ifaces; do
+		local ifname=""
+		if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then
+			append args "-I ${ifname:-$iface}"
+		fi
+	done
+
+	[ $enable_cdp -gt 0 ] && append args '-c'
+	[ $enable_fdp -gt 0 ] && append args '-f'
+	[ $enable_sonmp -gt 0 ] && append args '-s'
+	[ $enable_edp -gt 0 ] && append args '-e'
+
+	mkdir -p /var/run/lldp
+	chown lldp:lldp /var/run/lldp
+
+	service_start /usr/sbin/lldpd $args \
+		${lldp_class:+ -M $lldp_class} \
+		${lldp_description:+ -S "$lldp_description"}
+
+	[ -n "$lldp_location" ] && {
+		sleep 1
+		/usr/sbin/lldpctl -L "$lldp_location" > /dev/null 2>&1
+	}
+}
+
+stop() {
+	service_stop /usr/sbin/lldpd
+	rm -f /var/run/lldpd.socket /var/run/lldpd.pid
+}
diff --git a/trunk/package/network/services/lldpd/patches/002-no-stack-protector.patch b/trunk/package/network/services/lldpd/patches/002-no-stack-protector.patch
new file mode 100644
index 00000000..8a49d2d1
--- /dev/null
+++ b/trunk/package/network/services/lldpd/patches/002-no-stack-protector.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,7 +62,5 @@ AX_CFLAGS_GCC_OPTION([-Wformat])
+ AX_CFLAGS_GCC_OPTION([-Wformat-security])
+ AX_CFLAGS_GCC_OPTION([-Wcast-align])
+ AX_CFLAGS_GCC_OPTION([-Winline])
+-AX_CFLAGS_GCC_OPTION([-fstack-protector])
+-AX_CFLAGS_GCC_OPTION([-fstack-protector-strong])
+ AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer])
+ AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2])
+ AX_CFLAGS_GCC_OPTION([-Wno-unused-parameter])
diff --git a/trunk/package/network/services/mdns/Makefile b/trunk/package/network/services/mdns/Makefile
new file mode 100644
index 00000000..6caacda1
--- /dev/null
+++ b/trunk/package/network/services/mdns/Makefile
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mdns
+PKG_VERSION:=2014-11-03
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=git://git.openwrt.org/project/mdnsd.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=a5560f88bb2cddeef0ef11a12e7822b9c19a75a5
+
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_LICENSE:=LGPL-2.1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/mdns
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=libreCMC Multicast DNS Daemon
+  DEPENDS:=+libubox +libubus +libblobmsg-json
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+
+define Package/mdns/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdns $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/mdns.init $(1)/etc/init.d/mdns
+	$(INSTALL_BIN) ./files/mdns.config $(1)/etc/config/mdns
+endef
+
+$(eval $(call BuildPackage,mdns))
diff --git a/trunk/package/network/services/mdns/files/mdns.config b/trunk/package/network/services/mdns/files/mdns.config
new file mode 100644
index 00000000..d64ba676
--- /dev/null
+++ b/trunk/package/network/services/mdns/files/mdns.config
@@ -0,0 +1,2 @@
+config mdns
+	list network lan
diff --git a/trunk/package/network/services/mdns/files/mdns.init b/trunk/package/network/services/mdns/files/mdns.init
new file mode 100644
index 00000000..1bb764ee
--- /dev/null
+++ b/trunk/package/network/services/mdns/files/mdns.init
@@ -0,0 +1,52 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2014 OpenWrt.org
+
+. /lib/functions/network.sh
+
+START=80
+
+USE_PROCD=1
+PROG=/usr/sbin/mdns
+IFACES=""
+
+load_ifaces() {
+	local network="$(uci get mdns.@mdns[-1].network)"
+	for n in $network; do
+		local device
+		json_load "$(ifstatus $network)"
+		json_get_var device l3_device
+		echo -n "$device "
+	done
+}
+
+reload_service() {
+	json_init
+	json_add_array interfaces
+	for i in $(load_ifaces); do
+		json_add_string "" "$i"
+	done
+	json_close_array
+
+	ubus call mdns set_config "$(json_dump)"
+}
+
+start_service() {
+	local network="$(uci get mdns.@mdns[-1].network)"
+
+	procd_open_instance
+	procd_set_param command "$PROG"
+	procd_set_param respawn
+	procd_open_trigger
+	procd_add_config_trigger "config.change" "mdns" /etc/init.d/mdns reload
+	for n in $network; do
+		procd_add_interface_trigger "interface.*" $n /etc/init.d/mdns reload	
+	done
+	procd_add_raw_trigger "instance.update" 5000 "/bin/ubus" "call" "mdns" "reload"
+	procd_close_trigger
+	procd_close_instance
+}
+
+service_started() {
+	ubus wait_for -t 5 mdns
+	[ $? = 0 ] && reload_service
+}
diff --git a/trunk/package/network/services/odhcpd/Makefile b/trunk/package/network/services/odhcpd/Makefile
new file mode 100644
index 00000000..5e766ec6
--- /dev/null
+++ b/trunk/package/network/services/odhcpd/Makefile
@@ -0,0 +1,75 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=odhcpd
+PKG_VERSION:=2014-11-06
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=git://github.com/sbyx/odhcpd.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=3b628005e66e90770b2757a4a02c1dee25ccb883
+
+PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_OPTIONS += -DUBUS=1
+
+ifneq ($(CONFIG_PACKAGE_odhcpd_ext_prefix_class),0)
+  CMAKE_OPTIONS += -DEXT_PREFIX_CLASS=$(CONFIG_PACKAGE_odhcpd_ext_prefix_class)
+endif
+
+ifneq ($(CONFIG_PACKAGE_odhcpd_ext_cer_id),0)
+  CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcpd_ext_cer_id)
+endif
+
+
+define Package/odhcpd
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=libreCMC DHCP/DHCPv6(-PD)/RA Server & Relay
+  DEPENDS:=+libubox +libuci +libubus
+endef
+
+define Package/odhcpd/config
+  config PACKAGE_odhcpd_ext_prefix_class
+    int "Prefix Class Extension ID (0 = disabled)"
+    depends on PACKAGE_odhcpd
+    default 0
+  config PACKAGE_odhcpd_ext_cer_id
+    int "CER-ID Extension ID (0 = disabled)"
+    depends on PACKAGE_odhcpd
+    default 0
+endef
+
+define Package/odhcpd/description
+ odhcpd is a daemon for serving and relaying IP management protocols to
+ configure clients and downstream routers. It tries to follow the RFC 6204
+ requirements for IPv6 home routers.
+ 
+ odhcpd provides server services for DHCP, RA, stateless and stateful DHCPv6,
+ prefix delegation and can be used to relay RA, DHCPv6 and NDP between routed
+ (non-bridged) interfaces in case no delegated prefixes are available.
+endef
+
+define Package/odhcpd/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/odhcpd $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/odhcpd-update $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/odhcpd.init $(1)/etc/init.d/odhcpd
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/odhcpd.defaults $(1)/etc/uci-defaults
+endef
+
+$(eval $(call BuildPackage,odhcpd))
diff --git a/trunk/package/network/services/odhcpd/files/odhcpd-update b/trunk/package/network/services/odhcpd/files/odhcpd-update
new file mode 100755
index 00000000..e17cd0bf
--- /dev/null
+++ b/trunk/package/network/services/odhcpd/files/odhcpd-update
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Make dnsmasq reread hostfile
+
+pid=$(pidof dnsmasq)
+[ "$(readlink /proc/$pid/exe)" = "/usr/sbin/dnsmasq" ] && kill -SIGHUP $pid
diff --git a/trunk/package/network/services/odhcpd/files/odhcpd.defaults b/trunk/package/network/services/odhcpd/files/odhcpd.defaults
new file mode 100644
index 00000000..d079ec0f
--- /dev/null
+++ b/trunk/package/network/services/odhcpd/files/odhcpd.defaults
@@ -0,0 +1,13 @@
+#!/bin/sh
+uci -q get dhcp.odhcpd && exit 0
+touch /etc/config/dhcp
+
+uci batch <<EOF
+set dhcp.odhcpd=odhcpd
+set dhcp.odhcpd.maindhcp=0
+set dhcp.odhcpd.leasefile=/tmp/hosts/odhcpd
+set dhcp.odhcpd.leasetrigger=/usr/sbin/odhcpd-update
+set dhcp.lan.dhcpv6=server
+set dhcp.lan.ra=server
+commit dhcp
+EOF
diff --git a/trunk/package/network/services/odhcpd/files/odhcpd.init b/trunk/package/network/services/odhcpd/files/odhcpd.init
new file mode 100644
index 00000000..c8a31148
--- /dev/null
+++ b/trunk/package/network/services/odhcpd/files/odhcpd.init
@@ -0,0 +1,18 @@
+#!/bin/sh /etc/rc.common
+
+START=35
+STOP=85
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+	procd_set_param command /usr/sbin/odhcpd
+	procd_set_param respawn
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "dhcp"
+}
+
diff --git a/trunk/package/network/services/openvpn-easy-rsa/Makefile b/trunk/package/network/services/openvpn-easy-rsa/Makefile
new file mode 100644
index 00000000..487b61c8
--- /dev/null
+++ b/trunk/package/network/services/openvpn-easy-rsa/Makefile
@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2010-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=openvpn-easy-rsa
+
+PKG_REV:=ff5bfd1dd8e548cb24d302742af3894f893ef92f
+PKG_VERSION:=2013-01-30
+PKG_RELEASE=2
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa.git
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/openvpn-easy-rsa
+  TITLE:=Simple shell scripts to manage a Certificate Authority
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://openvpn.net
+  SUBMENU:=VPN
+  DEPENDS:=+openssl-util
+endef
+
+define Package/openvpn-easy-rsa/conffiles
+/etc/easy-rsa/keys/serial
+/etc/easy-rsa/keys/index.txt
+/etc/easy-rsa/vars
+endef
+
+define Build/Configure
+
+endef
+
+define Build/Compile
+
+endef
+
+define Package/openvpn-easy-rsa/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/easy-rsa
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/easy-rsa/2.0/openssl-1.0.0.cnf $(1)/etc/easy-rsa/openssl-1.0.0.cnf
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/easy-rsa/2.0/vars $(1)/etc/easy-rsa/vars
+	$(INSTALL_DIR) $(1)/etc/easy-rsa/keys
+	$(INSTALL_DATA) files/easy-rsa.index $(1)/etc/easy-rsa/keys/index.txt
+	$(INSTALL_DATA) files/easy-rsa.serial $(1)/etc/easy-rsa/keys/serial
+endef
+
+$(eval $(call BuildPackage,openvpn-easy-rsa))
diff --git a/trunk/package/network/services/openvpn-easy-rsa/files/easy-rsa.index b/trunk/package/network/services/openvpn-easy-rsa/files/easy-rsa.index
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/package/network/services/openvpn-easy-rsa/files/easy-rsa.serial b/trunk/package/network/services/openvpn-easy-rsa/files/easy-rsa.serial
new file mode 100644
index 00000000..8a0f05e1
--- /dev/null
+++ b/trunk/package/network/services/openvpn-easy-rsa/files/easy-rsa.serial
@@ -0,0 +1 @@
+01
diff --git a/trunk/package/network/services/openvpn-easy-rsa/patches/100-run-ootb.patch b/trunk/package/network/services/openvpn-easy-rsa/patches/100-run-ootb.patch
new file mode 100644
index 00000000..4c1b889e
--- /dev/null
+++ b/trunk/package/network/services/openvpn-easy-rsa/patches/100-run-ootb.patch
@@ -0,0 +1,152 @@
+--- a/easy-rsa/2.0/build-ca
++++ b/easy-rsa/2.0/build-ca
+@@ -5,4 +5,4 @@
+ #
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --initca $*
++"/usr/sbin/pkitool" --interact --initca $*
+--- a/easy-rsa/2.0/build-dh
++++ b/easy-rsa/2.0/build-dh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++. /etc/easy-rsa/vars
++
+ # Build Diffie-Hellman parameters for the server side
+ # of an SSL/TLS connection.
+ 
+--- a/easy-rsa/2.0/build-inter
++++ b/easy-rsa/2.0/build-inter
+@@ -4,4 +4,4 @@
+ # root certificate.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --inter $*
++"/usr/sbin/pkitool" --interact --inter $*
+--- a/easy-rsa/2.0/build-key
++++ b/easy-rsa/2.0/build-key
+@@ -4,4 +4,4 @@
+ # root certificate.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact $*
++"/usr/sbin/pkitool" --interact $*
+--- a/easy-rsa/2.0/build-key-pass
++++ b/easy-rsa/2.0/build-key-pass
+@@ -4,4 +4,4 @@
+ # with a password.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --pass $*
++"/usr/sbin/pkitool" --interact --pass $*
+--- a/easy-rsa/2.0/build-key-pkcs12
++++ b/easy-rsa/2.0/build-key-pkcs12
+@@ -5,4 +5,4 @@
+ # the CA certificate as well.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --pkcs12 $*
++"/usr/sbin/pkitool" --interact --pkcs12 $*
+--- a/easy-rsa/2.0/build-key-server
++++ b/easy-rsa/2.0/build-key-server
+@@ -7,4 +7,4 @@
+ # extension in the openssl.cnf file.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --server $*
++"/usr/sbin/pkitool" --interact --server $*
+--- a/easy-rsa/2.0/build-req
++++ b/easy-rsa/2.0/build-req
+@@ -4,4 +4,4 @@
+ # when your root certificate and key is not available locally.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --csr $*
++"/usr/sbin/pkitool" --interact --csr $*
+--- a/easy-rsa/2.0/build-req-pass
++++ b/easy-rsa/2.0/build-req-pass
+@@ -4,4 +4,4 @@
+ # with a password.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --csr --pass $*
++"/usr/sbin/pkitool" --interact --csr --pass $*
+--- a/easy-rsa/2.0/clean-all
++++ b/easy-rsa/2.0/clean-all
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++. /etc/easy-rsa/vars
++
+ # Initialize the $KEY_DIR directory.
+ # Note that this script does a
+ # rm -rf on $KEY_DIR so be careful!
+--- a/easy-rsa/2.0/inherit-inter
++++ b/easy-rsa/2.0/inherit-inter
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++. /etc/easy-rsa/vars
++
+ # Build a new PKI which is rooted on an intermediate certificate generated
+ # by ./build-inter or ./pkitool --inter from a parent PKI.  The new PKI should
+ # have independent vars settings, and must use a different KEY_DIR directory
+--- a/easy-rsa/2.0/list-crl
++++ b/easy-rsa/2.0/list-crl
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++. /etc/easy-rsa/vars
++
+ # list revoked certificates
+ 
+ CRL="${1:-crl.pem}"
+--- a/easy-rsa/2.0/pkitool
++++ b/easy-rsa/2.0/pkitool
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++. /etc/easy-rsa/vars
++
+ #  OpenVPN -- An application to securely tunnel IP networks
+ #             over a single TCP/UDP port, with support for SSL/TLS-based
+ #             session authentication and key exchange,
+--- a/easy-rsa/2.0/revoke-full
++++ b/easy-rsa/2.0/revoke-full
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++. /etc/easy-rsa/vars
++
+ # revoke a certificate, regenerate CRL,
+ # and verify revocation
+ 
+--- a/easy-rsa/2.0/sign-req
++++ b/easy-rsa/2.0/sign-req
+@@ -4,4 +4,4 @@
+ # with a local root certificate and key.
+ 
+ export EASY_RSA="${EASY_RSA:-.}"
+-"$EASY_RSA/pkitool" --interact --sign $*
++"/usr/sbin/pkitool" --interact --sign $*
+--- a/easy-rsa/2.0/vars
++++ b/easy-rsa/2.0/vars
+@@ -12,7 +12,7 @@
+ # This variable should point to
+ # the top level of the easy-rsa
+ # tree.
+-export EASY_RSA="`pwd`"
++export EASY_RSA="/etc/easy-rsa"
+ 
+ #
+ # This variable should point to
+@@ -26,7 +26,7 @@
+ # This variable should point to
+ # the openssl.cnf file included
+ # with easy-rsa.
+-export KEY_CONFIG=`$EASY_RSA/whichopensslcnf $EASY_RSA`
++export KEY_CONFIG=`/usr/sbin/whichopensslcnf $EASY_RSA`
+ 
+ # Edit this variable to point to
+ # your soon-to-be-created key
diff --git a/trunk/package/network/services/openvpn/Config-nossl.in b/trunk/package/network/services/openvpn/Config-nossl.in
new file mode 100644
index 00000000..3eaa2288
--- /dev/null
+++ b/trunk/package/network/services/openvpn/Config-nossl.in
@@ -0,0 +1,54 @@
+if PACKAGE_openvpn-nossl
+
+config OPENVPN_nossl_ENABLE_LZO
+	bool "Enable LZO compression support"
+	default y
+
+config OPENVPN_nossl_ENABLE_SERVER
+	bool "Enable server support (otherwise only client mode is support)"
+	default y
+
+config OPENVPN_nossl_ENABLE_MANAGEMENT
+	bool "Enable management server support"
+	default n
+
+config OPENVPN_nossl_ENABLE_HTTP
+	bool "Enable HTTP proxy support"
+	default y
+
+config OPENVPN_nossl_ENABLE_SOCKS
+	bool "Enable SOCKS proxy support"
+	default y
+
+config OPENVPN_nossl_ENABLE_FRAGMENT
+	bool "Enable internal fragmentation support (--fragment)"
+	default y
+
+config OPENVPN_nossl_ENABLE_MULTIHOME
+	bool "Enable multi-homed UDP server support (--multihome)"
+	default y
+
+config OPENVPN_nossl_ENABLE_PORT_SHARE
+	bool "Enable TCP server port-share support (--port-share)"
+	default y
+
+config OPENVPN_nossl_ENABLE_DEF_AUTH
+	bool "Enable deferred authentication"
+	default y
+
+config OPENVPN_nossl_ENABLE_PF
+	bool "Enable internal packet filter"
+	default y
+
+config OPENVPN_nossl_ENABLE_IPROUTE2
+	bool "Enable support for iproute2"
+	default n
+
+config OPENVPN_nossl_ENABLE_SMALL
+	bool "Enable size optimization"
+	default y
+	help
+	  enable smaller executable size (disable OCC, usage
+	  message, and verb 4 parm list)
+
+endif
diff --git a/trunk/package/network/services/openvpn/Config-openssl.in b/trunk/package/network/services/openvpn/Config-openssl.in
new file mode 100644
index 00000000..ac4c774b
--- /dev/null
+++ b/trunk/package/network/services/openvpn/Config-openssl.in
@@ -0,0 +1,66 @@
+if PACKAGE_openvpn-openssl
+
+config OPENVPN_openssl_ENABLE_LZO
+	bool "Enable LZO compression support"
+	default y
+
+config OPENVPN_openssl_ENABLE_X509_ALT_USERNAME
+	bool "Enable the --x509-username-field feature"
+	default n
+
+config OPENVPN_openssl_ENABLE_SERVER
+	bool "Enable server support (otherwise only client mode is support)"
+	default y
+
+#config OPENVPN_openssl_ENABLE_EUREPHIA
+#	bool "Enable support for the eurephia plug-in"
+#	default n
+
+config OPENVPN_openssl_ENABLE_MANAGEMENT
+	bool "Enable management server support"
+	default n
+
+#config OPENVPN_openssl_ENABLE_PKCS11
+#	bool "Enable pkcs11 support"
+#	default n
+
+config OPENVPN_openssl_ENABLE_HTTP
+	bool "Enable HTTP proxy support"
+	default y
+
+config OPENVPN_openssl_ENABLE_SOCKS
+	bool "Enable SOCKS proxy support"
+	default y
+
+config OPENVPN_openssl_ENABLE_FRAGMENT
+	bool "Enable internal fragmentation support (--fragment)"
+	default y
+
+config OPENVPN_openssl_ENABLE_MULTIHOME
+	bool "Enable multi-homed UDP server support (--multihome)"
+	default y
+
+config OPENVPN_openssl_ENABLE_PORT_SHARE
+	bool "Enable TCP server port-share support (--port-share)"
+	default y
+
+config OPENVPN_openssl_ENABLE_DEF_AUTH
+	bool "Enable deferred authentication"
+	default y
+
+config OPENVPN_openssl_ENABLE_PF
+	bool "Enable internal packet filter"
+	default y
+
+config OPENVPN_openssl_ENABLE_IPROUTE2
+	bool "Enable support for iproute2"
+	default n
+
+config OPENVPN_openssl_ENABLE_SMALL
+	bool "Enable size optimization"
+	default y
+	help
+	  enable smaller executable size (disable OCC, usage
+	  message, and verb 4 parm list)
+
+endif
diff --git a/trunk/package/network/services/openvpn/Config-polarssl.in b/trunk/package/network/services/openvpn/Config-polarssl.in
new file mode 100644
index 00000000..26692ce0
--- /dev/null
+++ b/trunk/package/network/services/openvpn/Config-polarssl.in
@@ -0,0 +1,66 @@
+if PACKAGE_openvpn-polarssl
+
+config OPENVPN_polarssl_ENABLE_LZO
+	bool "Enable LZO compression support"
+	default y
+
+config OPENVPN_polarssl_ENABLE_X509_ALT_USERNAME
+	bool "Enable the --x509-username-field feature"
+	default n
+
+config OPENVPN_polarssl_ENABLE_SERVER
+	bool "Enable server support (otherwise only client mode is support)"
+	default y
+
+#config OPENVPN_polarssl_ENABLE_EUREPHIA
+#	bool "Enable support for the eurephia plug-in"
+#	default n
+
+config OPENVPN_polarssl_ENABLE_MANAGEMENT
+	bool "Enable management server support"
+	default n
+
+#config OPENVPN_polarssl_ENABLE_PKCS11
+#	bool "Enable pkcs11 support"
+#	default n
+
+config OPENVPN_polarssl_ENABLE_HTTP
+	bool "Enable HTTP proxy support"
+	default y
+
+config OPENVPN_polarssl_ENABLE_SOCKS
+	bool "Enable SOCKS proxy support"
+	default y
+
+config OPENVPN_polarssl_ENABLE_FRAGMENT
+	bool "Enable internal fragmentation support (--fragment)"
+	default y
+
+config OPENVPN_polarssl_ENABLE_MULTIHOME
+	bool "Enable multi-homed UDP server support (--multihome)"
+	default y
+
+config OPENVPN_polarssl_ENABLE_PORT_SHARE
+	bool "Enable TCP server port-share support (--port-share)"
+	default y
+
+config OPENVPN_polarssl_ENABLE_DEF_AUTH
+	bool "Enable deferred authentication"
+	default y
+
+config OPENVPN_polarssl_ENABLE_PF
+	bool "Enable internal packet filter"
+	default y
+
+config OPENVPN_polarssl_ENABLE_IPROUTE2
+	bool "Enable support for iproute2"
+	default n
+
+config OPENVPN_polarssl_ENABLE_SMALL
+	bool "Enable size optimization"
+	default y
+	help
+	  enable smaller executable size (disable OCC, usage
+	  message, and verb 4 parm list)
+
+endif
diff --git a/trunk/package/network/services/openvpn/Makefile b/trunk/package/network/services/openvpn/Makefile
new file mode 100644
index 00000000..05303e92
--- /dev/null
+++ b/trunk/package/network/services/openvpn/Makefile
@@ -0,0 +1,125 @@
+#
+# Copyright (C) 2010-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=openvpn
+
+PKG_VERSION:=2.3.6
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=6ca03fe0fd093e0d01601abee808835c
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/openvpn/Default
+  TITLE:=Open source VPN solution using $(2)
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://openvpn.net
+  SUBMENU:=VPN
+  MENU:=1
+  DEPENDS:=+kmod-tun +OPENVPN_$(1)_ENABLE_LZO:liblzo +OPENVPN_$(1)_ENABLE_IPROUTE2:ip $(3)
+  VARIANT:=$(1)
+  MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
+endef
+
+Package/openvpn-openssl=$(call Package/openvpn/Default,openssl,OpenSSL,+libopenssl)
+Package/openvpn-polarssl=$(call Package/openvpn/Default,polarssl,PolarSSL,+libpolarssl)
+Package/openvpn-nossl=$(call Package/openvpn/Default,nossl,plaintext (no SSL))
+
+define Package/openvpn/config/Default
+	source "$(SOURCE)/Config-$(1).in"
+endef
+
+Package/openvpn-openssl/config=$(call Package/openvpn/config/Default,openssl)
+Package/openvpn-polarssl/config=$(call Package/openvpn/config/Default,polarssl)
+Package/openvpn-nossl/config=$(call Package/openvpn/config/Default,nossl)
+
+ifeq ($(BUILD_VARIANT),polarssl)
+CONFIG_OPENVPN_POLARSSL:=y
+endif
+ifeq ($(BUILD_VARIANT),openssl)
+CONFIG_OPENVPN_OPENSSL:=y
+endif
+ifeq ($(BUILD_VARIANT),nossl)
+CONFIG_OPENVPN_NOSSL:=y
+endif
+
+CONFIGURE_VARS += \
+	IFCONFIG=/sbin/ifconfig \
+	ROUTE=/sbin/route \
+	IPROUTE=/usr/sbin/ip \
+	NETSTAT=/sbin/netstat
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_SMALL),--enable-small) \
+		--disable-selinux \
+		--disable-systemd \
+		--disable-plugins \
+		--disable-debug \
+		--disable-eurephia \
+		--disable-pkcs11 \
+		--enable-password-save \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_LZO),--enable,--disable)-lzo \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_X509_ALT_USERNAME),enable,disable-x509-alt-username)-ssl \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_SERVER),--enable,--disable)-server \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_MANAGEMENT),--enable,--disable)-management \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_SOCKS),--enable,--disable)-socks \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_HTTP),--enable,--disable)-http \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_FRAGMENT),--enable,--disable)-fragment \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_MULTIHOME),--enable,--disable)-multihome \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_IPROUTE2),--enable,--disable)-iproute2 \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_DEF_AUTH),--enable,--disable)-def-auth \
+		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_PF),--enable,--disable)-pf \
+		$(if $(CONFIG_OPENVPN_NOSSL),--disable-ssl --disable-crypto,--enable-ssl --enable-crypto) \
+		$(if $(CONFIG_OPENVPN_OPENSSL),--with-crypto-library=openssl) \
+		$(if $(CONFIG_OPENVPN_POLARSSL),--with-crypto-library=polarssl) \
+	)
+endef
+
+define Package/openvpn-$(BUILD_VARIANT)/conffiles
+/etc/config/openvpn
+endef
+
+define Package/openvpn-$(BUILD_VARIANT)/install
+	$(INSTALL_DIR) \
+		$(1)/usr/sbin \
+		$(1)/etc/init.d \
+		$(1)/etc/config \
+		$(1)/etc/openvpn \
+		$(1)/lib/upgrade/keep.d
+
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/openvpn \
+		$(1)/usr/sbin/
+
+	$(INSTALL_BIN) \
+		files/openvpn.init \
+		$(1)/etc/init.d/openvpn
+
+	$(INSTALL_CONF) files/openvpn.config \
+		$(1)/etc/config/openvpn
+
+	$(INSTALL_DATA) \
+		files/openvpn.upgrade \
+		$(1)/lib/upgrade/keep.d/openvpn
+endef
+
+$(eval $(call BuildPackage,openvpn-openssl))
+$(eval $(call BuildPackage,openvpn-polarssl))
+$(eval $(call BuildPackage,openvpn-nossl))
diff --git a/trunk/package/network/services/openvpn/files/openvpn.config b/trunk/package/network/services/openvpn/files/openvpn.config
new file mode 100644
index 00000000..5cf0ba6b
--- /dev/null
+++ b/trunk/package/network/services/openvpn/files/openvpn.config
@@ -0,0 +1,398 @@
+package openvpn
+
+#################################################
+# Sample to include a custom config file.       #
+#################################################
+
+config openvpn custom_config
+
+	# Set to 1 to enable this instance:
+	option enabled 0
+
+	# Include OpenVPN configuration
+	option config /etc/openvpn/my-vpn.conf
+
+
+#################################################
+# Sample OpenVPN 2.0 uci config for             #
+# multi-client server.                          #
+#################################################
+
+config openvpn sample_server
+
+	# Set to 1 to enable this instance:
+	option enabled 0
+
+	# Which local IP address should OpenVPN
+	# listen on? (optional)
+#	option local 0.0.0.0
+
+	# Which TCP/UDP port should OpenVPN listen on?
+	# If you want to run multiple OpenVPN instances
+	# on the same machine, use a different port
+	# number for each one.  You will need to
+	# open up this port on your firewall.
+	option port 1194
+
+	# TCP or UDP server?
+#	option proto tcp
+	option proto udp
+
+	# "dev tun" will create a routed IP tunnel,
+	# "dev tap" will create an ethernet tunnel.
+	# Use "dev tap0" if you are ethernet bridging
+	# and have precreated a tap0 virtual interface
+	# and bridged it with your ethernet interface.
+	# If you want to control access policies
+	# over the VPN, you must create firewall
+	# rules for the the TUN/TAP interface.
+	# On non-Windows systems, you can give
+	# an explicit unit number, such as tun0.
+	# On Windows, use "dev-node" for this.
+	# On most systems, the VPN will not function
+	# unless you partially or fully disable
+	# the firewall for the TUN/TAP interface.
+#	option dev tap
+	option dev tun
+
+	# SSL/TLS root certificate (ca), certificate
+	# (cert), and private key (key).  Each client
+	# and the server must have their own cert and
+	# key file.  The server and all clients will
+	# use the same ca file.
+	#
+	# See the "easy-rsa" directory for a series
+	# of scripts for generating RSA certificates
+	# and private keys.  Remember to use
+	# a unique Common Name for the server
+	# and each of the client certificates.
+	#
+	# Any X509 key management system can be used.
+	# OpenVPN can also use a PKCS #12 formatted key file
+	# (see "pkcs12" directive in man page).
+	option ca /etc/openvpn/ca.crt
+	option cert /etc/openvpn/server.crt
+	# This file should be kept secret:
+	option key /etc/openvpn/server.key
+
+	# Diffie hellman parameters.
+	# Generate your own with:
+	#   openssl dhparam -out dh1024.pem 1024
+	# Substitute 2048 for 1024 if you are using
+	# 2048 bit keys.
+	option dh /etc/openvpn/dh1024.pem
+
+	# Configure server mode and supply a VPN subnet
+	# for OpenVPN to draw client addresses from.
+	# The server will take 10.8.0.1 for itself,
+	# the rest will be made available to clients.
+	# Each client will be able to reach the server
+	# on 10.8.0.1. Comment this line out if you are
+	# ethernet bridging. See the man page for more info.
+	option server "10.8.0.0 255.255.255.0"
+
+	# Maintain a record of client <-> virtual IP address
+	# associations in this file.  If OpenVPN goes down or
+	# is restarted, reconnecting clients can be assigned
+	# the same virtual IP address from the pool that was
+	# previously assigned.
+	option ifconfig_pool_persist /tmp/ipp.txt
+
+	# Configure server mode for ethernet bridging.
+	# You must first use your OS's bridging capability
+	# to bridge the TAP interface with the ethernet
+	# NIC interface.  Then you must manually set the
+	# IP/netmask on the bridge interface, here we
+	# assume 10.8.0.4/255.255.255.0.  Finally we
+	# must set aside an IP range in this subnet
+	# (start=10.8.0.50 end=10.8.0.100) to allocate
+	# to connecting clients.  Leave this line commented
+	# out unless you are ethernet bridging.
+#	option server_bridge "10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100"
+
+	# Push routes to the client to allow it
+	# to reach other private subnets behind
+	# the server.  Remember that these
+	# private subnets will also need
+	# to know to route the OpenVPN client
+	# address pool (10.8.0.0/255.255.255.0)
+	# back to the OpenVPN server.
+#	list push "route 192.168.10.0 255.255.255.0"
+#	list push "route 192.168.20.0 255.255.255.0"
+
+	# To assign specific IP addresses to specific
+	# clients or if a connecting client has a private
+	# subnet behind it that should also have VPN access,
+	# use the subdirectory "ccd" for client-specific
+	# configuration files (see man page for more info).
+
+	# EXAMPLE: Suppose the client
+	# having the certificate common name "Thelonious"
+	# also has a small subnet behind his connecting
+	# machine, such as 192.168.40.128/255.255.255.248.
+	# First, uncomment out these lines:
+#	option client_config_dir /etc/openvpn/ccd
+#	list route "192.168.40.128 255.255.255.248"
+	# Then create a file ccd/Thelonious with this line:
+	#   iroute 192.168.40.128 255.255.255.248
+	# This will allow Thelonious' private subnet to
+	# access the VPN.  This example will only work
+	# if you are routing, not bridging, i.e. you are
+	# using "dev tun" and "server" directives.
+
+	# EXAMPLE: Suppose you want to give
+	# Thelonious a fixed VPN IP address of 10.9.0.1.
+	# First uncomment out these lines:
+#	option client_config_dir /etc/openvpn/ccd
+#	list route "10.9.0.0 255.255.255.252"
+#	list route "192.168.100.0 255.255.255.0"
+	# Then add this line to ccd/Thelonious:
+	#   ifconfig-push "10.9.0.1 10.9.0.2"
+
+	# Suppose that you want to enable different
+	# firewall access policies for different groups
+	# of clients.  There are two methods:
+	# (1) Run multiple OpenVPN daemons, one for each
+	#     group, and firewall the TUN/TAP interface
+	#     for each group/daemon appropriately.
+	# (2) (Advanced) Create a script to dynamically
+	#     modify the firewall in response to access
+	#     from different clients.  See man
+	#     page for more info on learn-address script.
+#	option learn_address /etc/openvpn/script
+
+	# If enabled, this directive will configure
+	# all clients to redirect their default
+	# network gateway through the VPN, causing
+	# all IP traffic such as web browsing and
+	# and DNS lookups to go through the VPN
+	# (The OpenVPN server machine may need to NAT
+	# the TUN/TAP interface to the internet in
+	# order for this to work properly).
+	# CAVEAT: May break client's network config if
+	# client's local DHCP server packets get routed
+	# through the tunnel.  Solution: make sure
+	# client's local DHCP server is reachable via
+	# a more specific route than the default route
+	# of 0.0.0.0/0.0.0.0.
+#	list push "redirect-gateway"
+
+	# Certain Windows-specific network settings
+	# can be pushed to clients, such as DNS
+	# or WINS server addresses.  CAVEAT:
+	# http://openvpn.net/faq.html#dhcpcaveats
+#	list push "dhcp-option DNS 10.8.0.1"
+#	list push "dhcp-option WINS 10.8.0.1"
+
+	# Uncomment this directive to allow different
+	# clients to be able to "see" each other.
+	# By default, clients will only see the server.
+	# To force clients to only see the server, you
+	# will also need to appropriately firewall the
+	# server's TUN/TAP interface.
+#	option client_to_client 1
+
+	# Uncomment this directive if multiple clients
+	# might connect with the same certificate/key
+	# files or common names.  This is recommended
+	# only for testing purposes.  For production use,
+	# each client should have its own certificate/key
+	# pair.
+	#
+	# IF YOU HAVE NOT GENERATED INDIVIDUAL
+	# CERTIFICATE/KEY PAIRS FOR EACH CLIENT,
+	# EACH HAVING ITS OWN UNIQUE "COMMON NAME",
+	# UNCOMMENT THIS LINE OUT.
+#	option duplicate_cn 1
+
+	# The keepalive directive causes ping-like
+	# messages to be sent back and forth over
+	# the link so that each side knows when
+	# the other side has gone down.
+	# Ping every 10 seconds, assume that remote
+	# peer is down if no ping received during
+	# a 120 second time period.
+	option keepalive "10 120"
+
+	# For extra security beyond that provided
+	# by SSL/TLS, create an "HMAC firewall"
+	# to help block DoS attacks and UDP port flooding.
+	#
+	# Generate with:
+	#   openvpn --genkey --secret ta.key
+	#
+	# The server and each client must have
+	# a copy of this key.
+	# The second parameter should be '0'
+	# on the server and '1' on the clients.
+	# This file is secret:
+#	option tls_auth "/etc/openvpn/ta.key 0"
+
+	# Select a cryptographic cipher.
+	# This config item must be copied to
+	# the client config file as well.
+	# Blowfish (default):
+#	option cipher BF-CBC
+	# AES:
+#	option cipher AES-128-CBC
+	# Triple-DES:
+#	option cipher DES-EDE3-CBC
+
+	# Enable compression on the VPN link.
+	# If you enable it here, you must also
+	# enable it in the client config file.
+	option comp_lzo yes
+
+	# The maximum number of concurrently connected
+	# clients we want to allow.
+#	option max_clients 100
+
+	# The persist options will try to avoid
+	# accessing certain resources on restart
+	# that may no longer be accessible because
+	# of the privilege downgrade.
+	option persist_key 1
+	option persist_tun 1
+
+	# Output a short status file showing
+	# current connections, truncated
+	# and rewritten every minute.
+	option status /tmp/openvpn-status.log
+
+	# By default, log messages will go to the syslog (or
+	# on Windows, if running as a service, they will go to
+	# the "\Program Files\OpenVPN\log" directory).
+	# Use log or log-append to override this default.
+	# "log" will truncate the log file on OpenVPN startup,
+	# while "log-append" will append to it.  Use one
+	# or the other (but not both).
+#	option log         /tmp/openvpn.log
+#	option log_append  /tmp/openvpn.log
+
+	# Set the appropriate level of log
+	# file verbosity.
+	#
+	# 0 is silent, except for fatal errors
+	# 4 is reasonable for general usage
+	# 5 and 6 can help to debug connection problems
+	# 9 is extremely verbose
+	option verb 3
+
+	# Silence repeating messages.  At most 20
+	# sequential messages of the same message
+	# category will be output to the log.
+#	option mute 20
+
+
+##############################################
+# Sample client-side OpenVPN 2.0 uci config  #
+# for connecting to multi-client server.     #
+##############################################
+
+config openvpn sample_client
+
+	# Set to 1 to enable this instance:
+	option enabled 0
+
+	# Specify that we are a client and that we
+	# will be pulling certain config file directives
+	# from the server.
+	option client 1
+
+	# Use the same setting as you are using on
+	# the server.
+	# On most systems, the VPN will not function
+	# unless you partially or fully disable
+	# the firewall for the TUN/TAP interface.
+#	option dev tap
+	option dev tun
+
+	# Are we connecting to a TCP or
+	# UDP server?  Use the same setting as
+	# on the server.
+#	option proto tcp
+	option proto udp
+
+	# The hostname/IP and port of the server.
+	# You can have multiple remote entries
+	# to load balance between the servers.
+	list remote "my_server_1 1194"
+#	list remote "my_server_2 1194"
+
+	# Choose a random host from the remote
+	# list for load_balancing.  Otherwise
+	# try hosts in the order specified.
+#	option remote_random 1
+
+	# Keep trying indefinitely to resolve the
+	# host name of the OpenVPN server.  Very useful
+	# on machines which are not permanently connected
+	# to the internet such as laptops.
+	option resolv_retry infinite
+
+	# Most clients don't need to bind to
+	# a specific local port number.
+	option nobind 1
+
+	# Try to preserve some state across restarts.
+	option persist_key 1
+	option persist_tun 1
+
+	# If you are connecting through an
+	# HTTP proxy to reach the actual OpenVPN
+	# server, put the proxy server/IP and
+	# port number here.  See the man page
+	# if your proxy server requires
+	# authentication.
+	# retry on connection failures:
+#	option http_proxy_retry 1
+	# specify http proxy address and port:
+#	option http_proxy "192.168.1.100 8080"
+
+	# Wireless networks often produce a lot
+	# of duplicate packets.  Set this flag
+	# to silence duplicate packet warnings.
+#	option mute_replay_warnings 1
+
+	# SSL/TLS parms.
+	# See the server config file for more
+	# description.  It's best to use
+	# a separate .crt/.key file pair
+	# for each client.  A single ca
+	# file can be used for all clients.
+	option ca /etc/openvpn/ca.crt
+	option cert /etc/openvpn/client.crt
+	option key /etc/openvpn/client.key
+
+	# Verify server certificate by checking
+	# that the certicate has the nsCertType
+	# field set to "server".  This is an
+	# important precaution to protect against
+	# a potential attack discussed here:
+	#  http://openvpn.net/howto.html#mitm
+	#
+	# To use this feature, you will need to generate
+	# your server certificates with the nsCertType
+	# field set to "server".  The build_key_server
+	# script in the easy_rsa folder will do this.
+#	option ns_cert_type server
+
+	# If a tls_auth key is used on the server
+	# then every client must also have the key.
+#	option tls_auth "/etc/openvpn/ta.key 1"
+
+	# Select a cryptographic cipher.
+	# If the cipher option is used on the server
+	# then you must also specify it here.
+#	option cipher x
+
+	# Enable compression on the VPN link.
+	# Don't enable this unless it is also
+	# enabled in the server config file.
+	option comp_lzo yes
+
+	# Set log file verbosity.
+	option verb 3
+
+	# Silence repeating messages
+#	option mute 20
diff --git a/trunk/package/network/services/openvpn/files/openvpn.init b/trunk/package/network/services/openvpn/files/openvpn.init
new file mode 100644
index 00000000..9822f1e0
--- /dev/null
+++ b/trunk/package/network/services/openvpn/files/openvpn.init
@@ -0,0 +1,125 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2013 OpenWrt.org
+# Copyright (C) 2008 Jo-Philipp Wich
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+START=90
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/openvpn
+
+LIST_SEP="
+"
+
+append_param() {
+	local s="$1"
+	local v="$2"
+	case "$v" in
+		*_*_*_*) v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
+		*_*_*)   v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
+		*_*)     v=${v%%_*}-${v#*_} ;;
+	esac
+	echo -n "$v" >> "/var/etc/openvpn-$s.conf"
+	return 0
+}
+
+append_bools() {
+	local p; local v; local s="$1"; shift
+	for p in $*; do
+		config_get_bool v "$s" "$p"
+		[ "$v" = 1 ] && append_param "$s" "$p" && echo >> "/var/etc/openvpn-$s.conf"
+	done
+}
+
+append_params() {
+	local p; local v; local s="$1"; shift
+	for p in $*; do
+		config_get v "$s" "$p"
+		IFS="$LIST_SEP"
+		for v in $v; do
+			[ -n "$v" ] && append_param "$s" "$p" && echo " $v" >> "/var/etc/openvpn-$s.conf"
+		done
+		unset IFS
+	done
+}
+
+section_enabled() {
+	config_get_bool enable  "$1" 'enable'  0
+	config_get_bool enabled "$1" 'enabled' 0
+	[ $enable -gt 0 ] || [ $enabled -gt 0 ]
+}
+
+openvpn_add_instance() {
+	local name="$1"
+	local dir="$2"
+	local conf="$3"
+
+	procd_open_instance
+	procd_set_param command "$PROG"	\
+		--syslog "openvpn($name)" \
+		--cd "$dir" \
+		--config "$conf"
+	procd_set_param file "$dir/$conf"
+	procd_close_instance
+}
+
+start_instance() {
+	local s="$1"
+
+	section_enabled "$s" || return 1
+
+	config_get config "$s" config
+
+	[ ! -d "/var/run" ] && mkdir -p "/var/run"
+
+	if [ ! -z "$config" ]; then
+		openvpn_add_instance "$s" "$(dirname "$config")" "$(basename "$config")"
+		return
+	fi
+
+	[ ! -d "/var/etc" ] && mkdir -p "/var/etc"
+	[ -f "/var/etc/openvpn-$s.conf" ] && rm "/var/etc/openvpn-$s.conf"
+
+	# append flags
+	append_bools "$s" \
+		auth_nocache auth_retry auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
+		client_to_client comp_noadapt disable \
+		disable_occ down_pre duplicate_cn fast_io float http_proxy_retry \
+		ifconfig_noexec ifconfig_nowarn ifconfig_pool_linear management_forget_disconnect management_hold \
+		management_query_passwords management_signal mktun mlock mtu_test multihome mute_replay_warnings \
+		nobind no_iv no_name_remapping no_replay opt_verify passtos persist_key persist_local_ip \
+		persist_remote_ip persist_tun ping_timer_rem pull push_reset \
+		remote_random rmtun route_noexec route_nopull single_session socks_proxy_retry \
+		suppress_timestamps tcp_nodelay test_crypto tls_client tls_exit tls_server \
+		tun_ipv6 up_delay up_restart username_as_common_name
+
+	# append params
+	append_params "$s" \
+		cd askpass auth auth_user_pass auth_user_pass_verify bcast_buffers ca cert \
+		chroot cipher client_config_dir client_connect client_disconnect comp_lzo connect_freq \
+		connect_retry connect_timeout connect_retry_max crl_verify dev dev_node dev_type dh \
+		echo engine explicit_exit_notify fragment group hand_window hash_size \
+		http_proxy http_proxy_option http_proxy_timeout ifconfig ifconfig_pool \
+		ifconfig_pool_persist ifconfig_push inactive ipchange iroute keepalive \
+		key key_method keysize learn_address link_mtu lladdr local log log_append \
+		lport management management_log_cache max_clients \
+		max_routes_per_client mode mssfix mtu_disc mute nice ns_cert_type ping \
+		ping_exit ping_restart pkcs12 plugin port port_share prng proto rcvbuf \
+		redirect_gateway remap_usr1 remote remote_cert_eku remote_cert_ku remote_cert_tls \
+		reneg_bytes reneg_pkts reneg_sec \
+		replay_persist replay_window resolv_retry route route_delay route_gateway \
+		route_metric route_up rport script_security secret server server_bridge setenv shaper sndbuf \
+		socks_proxy status status_version syslog tcp_queue_limit tls_auth \
+		tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology tran_window \
+		tun_mtu tun_mtu_extra txqueuelen user verb down push up \
+		ifconfig_ipv6 route_ipv6 server_ipv6 ifconfig_ipv6_pool ifconfig_ipv6_push iroute_ipv6
+
+	openvpn_add_instance "$s" "/var/etc" "openvpn-$s.conf"
+}
+
+start_service() {
+	config_load 'openvpn'
+	config_foreach start_instance 'openvpn'
+}
diff --git a/trunk/package/network/services/openvpn/files/openvpn.upgrade b/trunk/package/network/services/openvpn/files/openvpn.upgrade
new file mode 100644
index 00000000..6ae49d22
--- /dev/null
+++ b/trunk/package/network/services/openvpn/files/openvpn.upgrade
@@ -0,0 +1 @@
+/etc/openvpn/
diff --git a/trunk/package/network/services/openvpn/patches/100-polarssl_compat.h b/trunk/package/network/services/openvpn/patches/100-polarssl_compat.h
new file mode 100644
index 00000000..4def9670
--- /dev/null
+++ b/trunk/package/network/services/openvpn/patches/100-polarssl_compat.h
@@ -0,0 +1,257 @@
+--- a/src/openvpn/ssl_polarssl.h
++++ b/src/openvpn/ssl_polarssl.h
+@@ -38,6 +38,8 @@
+ #include <polarssl/pkcs11.h>
+ #endif
+ 
++#include <polarssl/compat-1.2.h>
++
+ typedef struct _buffer_entry buffer_entry;
+ 
+ struct _buffer_entry {
+--- a/src/openvpn/ssl_polarssl.c
++++ b/src/openvpn/ssl_polarssl.c
+@@ -46,7 +46,7 @@
+ #include "manage.h"
+ #include "ssl_common.h"
+ 
+-#include <polarssl/sha2.h>
++#include <polarssl/sha256.h>
+ #include <polarssl/havege.h>
+ 
+ #include "ssl_verify_polarssl.h"
+@@ -212,13 +212,13 @@ tls_ctx_load_dh_params (struct tls_root_
+ {
+   if (!strcmp (dh_file, INLINE_FILE_TAG) && dh_inline)
+     {
+-      if (0 != x509parse_dhm(ctx->dhm_ctx, (const unsigned char *) dh_inline,
++      if (0 != dhm_parse_dhm(ctx->dhm_ctx, (const unsigned char *) dh_inline,
+ 	  strlen(dh_inline)))
+ 	msg (M_FATAL, "Cannot read inline DH parameters");
+   }
+ else
+   {
+-    if (0 != x509parse_dhmfile(ctx->dhm_ctx, dh_file))
++    if (0 != dhm_parse_dhmfile(ctx->dhm_ctx, dh_file))
+       msg (M_FATAL, "Cannot read DH parameters from file %s", dh_file);
+   }
+ 
+@@ -253,13 +253,13 @@ tls_ctx_load_cert_file (struct tls_root_
+ 
+   if (!strcmp (cert_file, INLINE_FILE_TAG) && cert_inline)
+     {
+-      if (0 != x509parse_crt(ctx->crt_chain,
++      if (0 != x509_crt_parse(ctx->crt_chain,
+ 	  (const unsigned char *) cert_inline, strlen(cert_inline)))
+         msg (M_FATAL, "Cannot load inline certificate file");
+     }
+   else
+     {
+-      if (0 != x509parse_crtfile(ctx->crt_chain, cert_file))
++      if (0 != x509_crt_parse_file(ctx->crt_chain, cert_file))
+ 	msg (M_FATAL, "Cannot load certificate file %s", cert_file);
+     }
+ }
+@@ -277,7 +277,7 @@ tls_ctx_load_priv_file (struct tls_root_
+       status = x509parse_key(ctx->priv_key,
+ 	  (const unsigned char *) priv_key_inline, strlen(priv_key_inline),
+ 	  NULL, 0);
+-      if (POLARSSL_ERR_X509_PASSWORD_REQUIRED == status)
++      if (POLARSSL_ERR_PK_PASSWORD_REQUIRED == status)
+ 	{
+ 	  char passbuf[512] = {0};
+ 	  pem_password_callback(passbuf, 512, 0, NULL);
+@@ -289,7 +289,7 @@ tls_ctx_load_priv_file (struct tls_root_
+   else
+     {
+       status = x509parse_keyfile(ctx->priv_key, priv_key_file, NULL);
+-      if (POLARSSL_ERR_X509_PASSWORD_REQUIRED == status)
++      if (POLARSSL_ERR_PK_PASSWORD_REQUIRED == status)
+ 	{
+ 	  char passbuf[512] = {0};
+ 	  pem_password_callback(passbuf, 512, 0, NULL);
+@@ -480,14 +480,14 @@ void tls_ctx_load_ca (struct tls_root_ct
+ 
+   if (ca_file && !strcmp (ca_file, INLINE_FILE_TAG) && ca_inline)
+     {
+-      if (0 != x509parse_crt(ctx->ca_chain, (const unsigned char *) ca_inline,
++      if (0 != x509_crt_parse(ctx->ca_chain, (const unsigned char *) ca_inline,
+ 	  strlen(ca_inline)))
+ 	msg (M_FATAL, "Cannot load inline CA certificates");
+     }
+   else
+     {
+       /* Load CA file for verifying peer supplied certificate */
+-      if (0 != x509parse_crtfile(ctx->ca_chain, ca_file))
++      if (0 != x509_crt_parse_file(ctx->ca_chain, ca_file))
+ 	msg (M_FATAL, "Cannot load CA certificate file %s", ca_file);
+     }
+ }
+@@ -501,14 +501,14 @@ tls_ctx_load_extra_certs (struct tls_roo
+ 
+   if (!strcmp (extra_certs_file, INLINE_FILE_TAG) && extra_certs_inline)
+     {
+-      if (0 != x509parse_crt(ctx->crt_chain,
++      if (0 != x509_crt_parse(ctx->crt_chain,
+ 	  (const unsigned char *) extra_certs_inline,
+ 	  strlen(extra_certs_inline)))
+         msg (M_FATAL, "Cannot load inline extra-certs file");
+     }
+   else
+     {
+-      if (0 != x509parse_crtfile(ctx->crt_chain, extra_certs_file))
++      if (0 != x509_crt_parse_file(ctx->crt_chain, extra_certs_file))
+ 	msg (M_FATAL, "Cannot load extra-certs file: %s", extra_certs_file);
+     }
+ }
+@@ -724,7 +724,7 @@ void key_state_ssl_init(struct key_state
+ 	   external_key_len );
+       else
+ #endif
+-	ssl_set_own_cert( ks_ssl->ctx, ssl_ctx->crt_chain, ssl_ctx->priv_key );
++	ssl_set_own_cert_rsa( ks_ssl->ctx, ssl_ctx->crt_chain, ssl_ctx->priv_key );
+ 
+       /* Initialise SSL verification */
+ #if P2MP_SERVER
+@@ -1068,7 +1068,7 @@ print_details (struct key_state_ssl * ks
+   cert = ssl_get_peer_cert(ks_ssl->ctx);
+   if (cert != NULL)
+     {
+-      openvpn_snprintf (s2, sizeof (s2), ", " counter_format " bit RSA", (counter_type) cert->rsa.len * 8);
++      openvpn_snprintf (s2, sizeof (s2), ", " counter_format " bit RSA", (counter_type) pk_rsa(cert->pk)->len * 8);
+     }
+ 
+   msg (D_HANDSHAKE, "%s%s", s1, s2);
+--- a/src/openvpn/crypto_polarssl.c
++++ b/src/openvpn/crypto_polarssl.c
+@@ -487,7 +487,12 @@ cipher_ctx_get_cipher_kt (const cipher_c
+ 
+ int cipher_ctx_reset (cipher_context_t *ctx, uint8_t *iv_buf)
+ {
+-  return 0 == cipher_reset(ctx, iv_buf);
++  int retval = cipher_reset(ctx);
++
++  if (0 == retval)
++    cipher_set_iv(ctx, iv_buf, ctx->cipher_info->iv_size);
++
++  return 0 == retval;
+ }
+ 
+ int cipher_ctx_update (cipher_context_t *ctx, uint8_t *dst, int *dst_len,
+--- a/src/openvpn/ssl_verify_polarssl.h
++++ b/src/openvpn/ssl_verify_polarssl.h
+@@ -34,6 +34,7 @@
+ #include "misc.h"
+ #include "manage.h"
+ #include <polarssl/x509.h>
++#include <polarssl/compat-1.2.h>
+ 
+ #ifndef __OPENVPN_X509_CERT_T_DECLARED
+ #define __OPENVPN_X509_CERT_T_DECLARED
+--- a/src/openvpn/ssl_verify_polarssl.c
++++ b/src/openvpn/ssl_verify_polarssl.c
+@@ -40,6 +40,7 @@
+ #include "ssl_verify.h"
+ #include <polarssl/error.h>
+ #include <polarssl/bignum.h>
++#include <polarssl/oid.h>
+ #include <polarssl/sha1.h>
+ 
+ #define MAX_SUBJECT_LENGTH 256
+@@ -102,7 +103,7 @@ x509_get_username (char *cn, int cn_len,
+   /* Find common name */
+   while( name != NULL )
+   {
+-      if( memcmp( name->oid.p, OID_CN, OID_SIZE(OID_CN) ) == 0)
++      if( memcmp( name->oid.p, OID_AT_CN, OID_SIZE(OID_AT_CN) ) == 0)
+ 	break;
+ 
+       name = name->next;
+@@ -224,60 +225,18 @@ x509_setenv (struct env_set *es, int cer
+   while( name != NULL )
+     {
+       char name_expand[64+8];
++      const char *shortname;
+ 
+-      if( name->oid.len == 2 && memcmp( name->oid.p, OID_X520, 2 ) == 0 )
++      if( 0 == oid_get_attr_short_name(&name->oid, &shortname) )
+ 	{
+-	  switch( name->oid.p[2] )
+-	    {
+-	    case X520_COMMON_NAME:
+-		openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_CN",
+-		    cert_depth); break;
+-
+-	    case X520_COUNTRY:
+-		openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_C",
+-		    cert_depth); break;
+-
+-	    case X520_LOCALITY:
+-		openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_L",
+-		    cert_depth); break;
+-
+-	    case X520_STATE:
+-		openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_ST",
+-		    cert_depth); break;
+-
+-	    case X520_ORGANIZATION:
+-		openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_O",
+-		    cert_depth); break;
+-
+-	    case X520_ORG_UNIT:
+-		openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_OU",
+-		    cert_depth); break;
+-
+-	    default:
+-		openvpn_snprintf (name_expand, sizeof(name_expand),
+-		    "X509_%d_0x%02X", cert_depth, name->oid.p[2]);
+-		break;
+-	    }
++	  openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_%s",
++	      cert_depth, shortname);
++	}
++      else
++	{
++	  openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_\?\?",
++	      cert_depth);
+ 	}
+-	else if( name->oid.len == 8 && memcmp( name->oid.p, OID_PKCS9, 8 ) == 0 )
+-	  {
+-	    switch( name->oid.p[8] )
+-	      {
+-		case PKCS9_EMAIL:
+-		  openvpn_snprintf (name_expand, sizeof(name_expand),
+-		      "X509_%d_emailAddress", cert_depth); break;
+-
+-		default:
+-		  openvpn_snprintf (name_expand, sizeof(name_expand),
+-		      "X509_%d_0x%02X", cert_depth, name->oid.p[8]);
+-		  break;
+-	      }
+-	  }
+-	else
+-	  {
+-	    openvpn_snprintf (name_expand, sizeof(name_expand), "X509_%d_\?\?",
+-		cert_depth);
+-	  }
+ 
+ 	for( i = 0; i < name->val.len; i++ )
+ 	{
+--- a/configure.ac
++++ b/configure.ac
+@@ -819,13 +819,13 @@ if test "${with_crypto_library}" = "pola
+ #include <polarssl/version.h>
+ 			]],
+ 			[[
+-#if POLARSSL_VERSION_NUMBER < 0x01020A00 || POLARSSL_VERSION_NUMBER >= 0x01030000
++#if POLARSSL_VERSION_NUMBER < 0x01030000
+ #error invalid version
+ #endif
+ 			]]
+ 		)],
+ 		[AC_MSG_RESULT([ok])],
+-		[AC_MSG_ERROR([PolarSSL 1.2.x required and must be 1.2.10 or later])]
++		[AC_MSG_ERROR([PolarSSL 1.3.x required])]
+ 	)
+ 
+ 	polarssl_with_pkcs11="no"
diff --git a/trunk/package/network/services/openvpn/patches/110-musl_compat.patch b/trunk/package/network/services/openvpn/patches/110-musl_compat.patch
new file mode 100644
index 00000000..566c17f0
--- /dev/null
+++ b/trunk/package/network/services/openvpn/patches/110-musl_compat.patch
@@ -0,0 +1,13 @@
+--- a/src/openvpn/syshead.h
++++ b/src/openvpn/syshead.h
+@@ -214,10 +214,6 @@
+ 
+ #ifdef TARGET_LINUX
+ 
+-#if defined(HAVE_NETINET_IF_ETHER_H)
+-#include <netinet/if_ether.h>
+-#endif
+-
+ #ifdef HAVE_LINUX_IF_TUN_H
+ #include <linux/if_tun.h>
+ #endif
diff --git a/trunk/package/network/services/ppp/Makefile b/trunk/package/network/services/ppp/Makefile
new file mode 100644
index 00000000..efb0a76f
--- /dev/null
+++ b/trunk/package/network/services/ppp/Makefile
@@ -0,0 +1,265 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ppp
+PKG_VERSION:=2.4.7
+PKG_RELEASE:=4
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
+PKG_MD5SUM:=78818f40e6d33a1d1de68a1551f6595a
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=BSD-4-Clause
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=libpcap
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ppp/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://ppp.samba.org/
+endef
+
+define Package/ppp
+$(call Package/ppp/Default)
+  DEPENDS:=+kmod-ppp
+  TITLE:=PPP daemon
+  VARIANT:=default
+endef
+
+define Package/ppp-multilink
+$(call Package/ppp/Default)
+  DEPENDS:=+kmod-ppp
+  TITLE:=PPP daemon (with multilink support)
+  VARIANT:=multilink
+endef
+
+define Package/ppp/description
+This package contains the PPP (Point-to-Point Protocol) daemon.
+endef
+
+define Package/ppp/conffiles
+/etc/ppp/chap-secrets
+/etc/ppp/filter
+/etc/ppp/ip-down
+/etc/ppp/ip-up
+/etc/ppp/ipv6-down
+/etc/ppp/ipv6-up
+/etc/ppp/options
+endef
+
+define Package/ppp-mod-pppoa
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +linux-atm +kmod-pppoa
+  TITLE:=PPPoA plugin
+endef
+
+define Package/ppp-mod-pppoa/description
+This package contains a PPPoA (PPP over ATM) plugin for ppp.
+endef
+
+define Package/ppp-mod-pppoe
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppoe
+  TITLE:=PPPoE plugin
+endef
+
+define Package/ppp-mod-pppoe/description
+This package contains a PPPoE (PPP over Ethernet) plugin for ppp.
+endef
+
+define Package/ppp-mod-radius
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+  TITLE:=RADIUS plugin
+endef
+
+define Package/ppp-mod-radius/description
+This package contains a RADIUS (Remote Authentication Dial-In User Service)
+plugin for ppp.
+endef
+
+define Package/ppp-mod-radius/conffiles
+/etc/ppp/radius.conf
+/etc/ppp/radius/
+endef
+
+define Package/ppp-mod-pppol2tp
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pppol2tp
+  TITLE:=PPPoL2TP plugin
+endef
+
+define Package/ppp-mod-pppol2tp/description
+This package contains a PPPoL2TP (PPP over L2TP) plugin for ppp.
+endef
+
+define Package/ppp-mod-pptp
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pptp +kmod-mppe +resolveip
+  TITLE:=PPtP plugin
+endef
+
+define Package/ppp-mod-pptp/description
+This package contains a PPtP plugin for ppp.
+endef
+
+define Package/chat
+$(call Package/ppp/Default)
+  TITLE:=Establish conversation with a modem
+endef
+
+define Package/chat/description
+This package contains an utility to establish conversation with other PPP servers
+(via a modem).
+endef
+
+define Package/pppdump
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+  TITLE:=Read PPP record file
+endef
+
+define Package/pppdump/description
+This package contains an utility to read PPP record file.
+endef
+
+define Package/pppstats
+$(call Package/ppp/Default)
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink)
+  TITLE:=Report PPP statistics
+endef
+
+define Package/pppstats/description
+This package contains an utility to report PPP statistics.
+endef
+
+
+define Build/Configure
+$(call Build/Configure/Default,, \
+	UNAME_S="Linux" \
+	UNAME_R="$(LINUX_VERSION)" \
+	UNAME_M="$(ARCH)" \
+)
+	mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
+	cp \
+		$(LINUX_DIR)/include/linux/compiler.h \
+		$(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \
+		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
+endef
+
+MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
+		PRECOMPILED_FILTER=1 \
+		STAGING_DIR="$(STAGING_DIR)"
+
+ifeq ($(BUILD_VARIANT),multilink)
+  MAKE_FLAGS += HAVE_MULTILINK=y
+else
+  MAKE_FLAGS += HAVE_MULTILINK=
+endif
+
+ifdef CONFIG_USE_MUSL
+  MAKE_FLAGS += USE_LIBUTIL=
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/include/pppd $(1)/usr/include/
+endef
+
+define Package/ppp/script_install
+endef
+
+define Package/ppp/install
+	$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_CONF) ./files/etc/ppp/chap-secrets $(1)/etc/ppp/
+	$(INSTALL_DATA) ./files/etc/ppp/filter $(1)/etc/ppp/
+	$(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/
+	$(LN) /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/ppp.sh $(1)/lib/netifd/proto/
+	$(INSTALL_BIN) ./files/lib/netifd/ppp-up $(1)/lib/netifd/
+	$(INSTALL_BIN) ./files/lib/netifd/ppp-down $(1)/lib/netifd/
+endef
+Package/ppp-multilink/install=$(Package/ppp/install)
+
+define Package/ppp-mod-pppoa/install
+	$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppoatm.so \
+		$(1)/usr/lib/pppd/$(PKG_VERSION)/
+endef
+
+define Package/ppp-mod-pppoe/install
+	$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \
+		$(1)/usr/lib/pppd/$(PKG_VERSION)/
+endef
+
+define Package/ppp-mod-radius/install
+	$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/radius.so \
+		$(1)/usr/lib/pppd/$(PKG_VERSION)/
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_DATA) ./files/etc/ppp/radius.conf $(1)/etc/ppp/
+	$(INSTALL_DIR) $(1)/etc/ppp/radius
+	$(INSTALL_DATA) ./files/etc/ppp/radius/dictionary* \
+		$(1)/etc/ppp/radius/
+	$(INSTALL_CONF) ./files/etc/ppp/radius/servers \
+		$(1)/etc/ppp/radius/
+endef
+
+define Package/ppp-mod-pppol2tp/install
+	$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pppol2tp.so \
+		$(1)/usr/lib/pppd/$(PKG_VERSION)/
+endef
+
+define Package/ppp-mod-pptp/install
+	$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/pppd/$(PKG_VERSION)/pptp.so \
+		$(1)/usr/lib/pppd/$(PKG_VERSION)/
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_DATA) ./files/etc/ppp/options.pptp $(1)/etc/ppp/
+endef
+
+define Package/chat/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/chat $(1)/usr/sbin/
+endef
+
+define Package/pppdump/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppdump $(1)/usr/sbin/
+endef
+
+define Package/pppstats/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/pppstats $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,ppp))
+$(eval $(call BuildPackage,ppp-multilink))
+$(eval $(call BuildPackage,ppp-mod-pppoa))
+$(eval $(call BuildPackage,ppp-mod-pppoe))
+$(eval $(call BuildPackage,ppp-mod-radius))
+$(eval $(call BuildPackage,ppp-mod-pppol2tp))
+$(eval $(call BuildPackage,ppp-mod-pptp))
+$(eval $(call BuildPackage,chat))
+$(eval $(call BuildPackage,pppdump))
+$(eval $(call BuildPackage,pppstats))
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/chap-secrets b/trunk/package/network/services/ppp/files/etc/ppp/chap-secrets
new file mode 100644
index 00000000..6ab76e49
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/chap-secrets
@@ -0,0 +1 @@
+#USERNAME  PROVIDER  PASSWORD  IPADDRESS
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/filter b/trunk/package/network/services/ppp/files/etc/ppp/filter
new file mode 100644
index 00000000..ec72a81a
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/filter
@@ -0,0 +1,23 @@
+#
+# Expression: outbound and not icmp[0] != 8 and not tcp[13] & 4 != 0
+#
+19
+48 0 0 0
+21 0 16 1
+40 0 0 2
+21 0 13 33
+48 0 0 13
+21 0 5 1
+40 0 0 10
+69 9 0 8191
+177 0 0 4
+80 0 0 4
+21 6 7 8
+21 0 5 6
+40 0 0 10
+69 3 0 8191
+177 0 0 4
+80 0 0 17
+69 1 0 4
+6 0 0 4
+6 0 0 0
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/options b/trunk/package/network/services/ppp/files/etc/ppp/options
new file mode 100644
index 00000000..6b93f7bd
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/options
@@ -0,0 +1,10 @@
+#debug
+logfile /dev/null
+noipdefault
+noaccomp
+nopcomp
+nocrtscts
+lock
+maxfail 0
+lcp-echo-failure 5
+lcp-echo-interval 1
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/options.pptp b/trunk/package/network/services/ppp/files/etc/ppp/options.pptp
new file mode 100644
index 00000000..46a3f481
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/options.pptp
@@ -0,0 +1,7 @@
+noipdefault
+noauth
+nobsdcomp
+nodeflate
+idle 0
+mppe required,no40,no56,stateless
+maxfail 0
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/radius.conf b/trunk/package/network/services/ppp/files/etc/ppp/radius.conf
new file mode 100644
index 00000000..0f24a8c7
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/radius.conf
@@ -0,0 +1,8 @@
+authserver localhost:1812
+acctserver localhost:1813
+dictionary /etc/ppp/radius/dictionary
+servers /etc/ppp/radius/servers
+mapfile /dev/null
+seqfile /tmp/radius.seq
+radius_timeout 5
+radius_retries 3
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary b/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary
new file mode 100644
index 00000000..706d1ce9
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary
@@ -0,0 +1,253 @@
+#
+# Updated 97/06/13 to livingston-radius-2.01 miquels@cistron.nl
+#
+#	This file contains dictionary translations for parsing
+#	requests and generating responses.  All transactions are
+#	composed of Attribute/Value Pairs.  The value of each attribute
+#	is specified as one of 4 data types.  Valid data types are:
+#
+#	string - 0-253 octets
+#	ipaddr - 4 octets in network byte order
+#	integer - 32 bit value in big endian order (high byte first)
+#	date - 32 bit value in big endian order - seconds since
+#					00:00:00 GMT,  Jan.  1,  1970
+#
+#	Enumerated values are stored in the user file with dictionary
+#	VALUE translations for easy administration.
+#
+#	Example:
+#
+#	ATTRIBUTE	  VALUE
+#	---------------   -----
+#	Framed-Protocol = PPP
+#	7		= 1	(integer encoding)
+#
+
+# The dictionary format now supports vendor-specific attributes.
+# Vendors are introduced like this:
+#
+#	VENDOR vendor_name vendor_number
+#
+# For example:
+#
+#	VENDOR RoaringPenguin 10055
+#
+# Vendor-specific attributes have a fifth field with the name of the
+# vendor.  For example:
+#
+#       ATTRIBUTE RP-Upstream-Speed-Limit 1 integer RoaringPenguin
+#
+# introduces a Roaring Penguin vendor-specific attribbute with name
+# RP-Upstream-Speed-Limit, number 1, type integer and vendor RoaringPenguin.
+
+#
+#	Following are the proper new names. Use these.
+#
+ATTRIBUTE	User-Name		1	string
+ATTRIBUTE	Password		2	string
+ATTRIBUTE	CHAP-Password		3	string
+ATTRIBUTE	NAS-IP-Address		4	ipaddr
+ATTRIBUTE	NAS-Port-Id		5	integer
+ATTRIBUTE	Service-Type		6	integer
+ATTRIBUTE	Framed-Protocol		7	integer
+ATTRIBUTE	Framed-IP-Address	8	ipaddr
+ATTRIBUTE	Framed-IP-Netmask	9	ipaddr
+ATTRIBUTE	Framed-Routing		10	integer
+ATTRIBUTE	Filter-Id		11	string
+ATTRIBUTE	Framed-MTU		12	integer
+ATTRIBUTE	Framed-Compression	13	integer
+ATTRIBUTE	Login-IP-Host		14	ipaddr
+ATTRIBUTE	Login-Service		15	integer
+ATTRIBUTE	Login-TCP-Port		16	integer
+ATTRIBUTE	Reply-Message		18	string
+ATTRIBUTE	Callback-Number		19	string
+ATTRIBUTE	Callback-Id		20	string
+ATTRIBUTE	Framed-Route		22	string
+ATTRIBUTE	Framed-IPX-Network	23	ipaddr
+ATTRIBUTE	State			24	string
+ATTRIBUTE	Class			25	string
+ATTRIBUTE	Session-Timeout		27	integer
+ATTRIBUTE	Idle-Timeout		28	integer
+ATTRIBUTE	Termination-Action	29	integer
+ATTRIBUTE	Called-Station-Id	30	string
+ATTRIBUTE	Calling-Station-Id	31	string
+ATTRIBUTE	NAS-Identifier		32	string
+ATTRIBUTE	Acct-Status-Type	40	integer
+ATTRIBUTE	Acct-Delay-Time		41	integer
+ATTRIBUTE	Acct-Input-Octets	42	integer
+ATTRIBUTE	Acct-Output-Octets	43	integer
+ATTRIBUTE	Acct-Session-Id		44	string
+ATTRIBUTE	Acct-Authentic		45	integer
+ATTRIBUTE	Acct-Session-Time	46	integer
+ATTRIBUTE	Acct-Input-Packets	47	integer
+ATTRIBUTE	Acct-Output-Packets	48	integer
+ATTRIBUTE	Acct-Terminate-Cause	49	integer
+ATTRIBUTE	Chap-Challenge		60	string
+ATTRIBUTE	NAS-Port-Type		61	integer
+ATTRIBUTE	Port-Limit		62	integer
+ATTRIBUTE	Connect-Info		77	string
+
+# RFC 2869
+ATTRIBUTE	Acct-Interim-Interval	85	integer
+
+#
+#	Experimental Non Protocol Attributes used by Cistron-Radiusd
+#
+ATTRIBUTE	Huntgroup-Name		221	string
+ATTRIBUTE	User-Category		1029	string
+ATTRIBUTE	Group-Name		1030	string
+ATTRIBUTE	Simultaneous-Use	1034	integer
+ATTRIBUTE	Strip-User-Name		1035	integer
+ATTRIBUTE	Fall-Through		1036	integer
+ATTRIBUTE	Add-Port-To-IP-Address	1037	integer
+ATTRIBUTE	Exec-Program		1038	string
+ATTRIBUTE	Exec-Program-Wait	1039	string
+ATTRIBUTE	Hint			1040	string
+
+#
+#	Non-Protocol Attributes
+#	These attributes are used internally by the server
+#
+ATTRIBUTE	Expiration		  21	date
+ATTRIBUTE	Auth-Type		1000	integer
+ATTRIBUTE	Menu			1001	string
+ATTRIBUTE	Termination-Menu	1002	string
+ATTRIBUTE	Prefix			1003	string
+ATTRIBUTE	Suffix			1004	string
+ATTRIBUTE	Group			1005	string
+ATTRIBUTE	Crypt-Password		1006	string
+ATTRIBUTE	Connect-Rate		1007	integer
+
+#
+#       Experimental, implementation specific attributes
+#
+# Limit session traffic
+ATTRIBUTE	Session-Octets-Limit	227	integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE	Octets-Direction	228	integer
+
+#
+#	Integer Translations
+#
+
+#	User Types
+
+VALUE		Service-Type		Login-User		1
+VALUE		Service-Type		Framed-User		2
+VALUE		Service-Type		Callback-Login-User	3
+VALUE		Service-Type		Callback-Framed-User	4
+VALUE		Service-Type		Outbound-User		5
+VALUE		Service-Type		Administrative-User	6
+VALUE		Service-Type		NAS-Prompt-User		7
+
+#	Framed Protocols
+
+VALUE		Framed-Protocol		PPP			1
+VALUE		Framed-Protocol		SLIP			2
+
+#	Framed Routing Values
+
+VALUE		Framed-Routing		None			0
+VALUE		Framed-Routing		Broadcast		1
+VALUE		Framed-Routing		Listen			2
+VALUE		Framed-Routing		Broadcast-Listen	3
+
+#	Framed Compression Types
+
+VALUE		Framed-Compression	None			0
+VALUE		Framed-Compression	Van-Jacobson-TCP-IP	1
+
+#	Login Services
+
+VALUE		Login-Service		Telnet			0
+VALUE		Login-Service		Rlogin			1
+VALUE		Login-Service		TCP-Clear		2
+VALUE		Login-Service		PortMaster		3
+
+#	Status Types
+
+VALUE		Acct-Status-Type	Start			1
+VALUE		Acct-Status-Type	Stop			2
+VALUE		Acct-Status-Type	Accounting-On		7
+VALUE		Acct-Status-Type	Accounting-Off		8
+
+#	Authentication Types
+
+VALUE		Acct-Authentic		RADIUS			1
+VALUE		Acct-Authentic		Local			2
+VALUE		Acct-Authentic		PowerLink128		100
+
+#	Termination Options
+
+VALUE		Termination-Action	Default			0
+VALUE		Termination-Action	RADIUS-Request		1
+
+#	NAS Port Types, available in 3.3.1 and later
+
+VALUE		NAS-Port-Type		Async			0
+VALUE		NAS-Port-Type		Sync			1
+VALUE		NAS-Port-Type		ISDN			2
+VALUE		NAS-Port-Type		ISDN-V120		3
+VALUE		NAS-Port-Type		ISDN-V110		4
+
+#	Acct Terminate Causes, available in 3.3.2 and later
+
+VALUE           Acct-Terminate-Cause    User-Request            1
+VALUE           Acct-Terminate-Cause    Lost-Carrier            2
+VALUE           Acct-Terminate-Cause    Lost-Service            3
+VALUE           Acct-Terminate-Cause    Idle-Timeout            4
+VALUE           Acct-Terminate-Cause    Session-Timeout         5
+VALUE           Acct-Terminate-Cause    Admin-Reset             6
+VALUE           Acct-Terminate-Cause    Admin-Reboot            7
+VALUE           Acct-Terminate-Cause    Port-Error              8
+VALUE           Acct-Terminate-Cause    NAS-Error               9
+VALUE           Acct-Terminate-Cause    NAS-Request             10
+VALUE           Acct-Terminate-Cause    NAS-Reboot              11
+VALUE           Acct-Terminate-Cause    Port-Unneeded           12
+VALUE           Acct-Terminate-Cause    Port-Preempted          13
+VALUE           Acct-Terminate-Cause    Port-Suspended          14
+VALUE           Acct-Terminate-Cause    Service-Unavailable     15
+VALUE           Acct-Terminate-Cause    Callback                16
+VALUE           Acct-Terminate-Cause    User-Error              17
+VALUE           Acct-Terminate-Cause    Host-Request            18
+
+#
+#	Non-Protocol Integer Translations
+#
+
+VALUE		Auth-Type		Local			0
+VALUE		Auth-Type		System			1
+VALUE		Auth-Type		SecurID			2
+VALUE		Auth-Type		Crypt-Local		3
+VALUE		Auth-Type		Reject			4
+
+#
+#	Cistron extensions
+#
+VALUE		Auth-Type		Pam			253
+VALUE		Auth-Type		None			254
+
+#
+#	Experimental Non-Protocol Integer Translations for Cistron-Radiusd
+#
+VALUE		Fall-Through		No			0
+VALUE		Fall-Through		Yes			1
+VALUE		Add-Port-To-IP-Address	No			0
+VALUE		Add-Port-To-IP-Address	Yes			1
+
+#
+#	Configuration Values
+#	uncomment these two lines to turn account expiration on
+#
+
+#VALUE		Server-Config		Password-Expiration	30
+#VALUE		Server-Config		Password-Warning	5
+
+#       Octets-Direction
+VALUE		Octets-Direction        Sum			0
+VALUE		Octets-Direction        Input			1
+VALUE		Octets-Direction        Output			2
+VALUE		Octets-Direction        MaxOveral		3
+VALUE		Octets-Direction        MaxSession		4
+
+INCLUDE /etc/ppp/radius/dictionary.microsoft
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.asnet b/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.asnet
new file mode 100644
index 00000000..337d1e14
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.asnet
@@ -0,0 +1,3 @@
+VENDOR		ASNET		50000
+ATTRIBUTE	Speed-Down		1	string	ASNET
+ATTRIBUTE	Speed-Up		2	string	ASNET
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.microsoft b/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.microsoft
new file mode 100644
index 00000000..2a6c20e5
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/radius/dictionary.microsoft
@@ -0,0 +1,80 @@
+#
+#	Microsoft's VSA's, from RFC 2548
+#
+#
+
+VENDOR		Microsoft	311	Microsoft
+
+ATTRIBUTE	MS-CHAP-Response	1	string	Microsoft
+ATTRIBUTE	MS-CHAP-Error		2	string	Microsoft
+ATTRIBUTE	MS-CHAP-CPW-1		3	string	Microsoft
+ATTRIBUTE	MS-CHAP-CPW-2		4	string	Microsoft
+ATTRIBUTE	MS-CHAP-LM-Enc-PW	5	string	Microsoft
+ATTRIBUTE	MS-CHAP-NT-Enc-PW	6	string	Microsoft
+ATTRIBUTE	MS-MPPE-Encryption-Policy 7	string	Microsoft
+# This is referred to as both singular and plural in the RFC.
+# Plural seems to make more sense.
+ATTRIBUTE	MS-MPPE-Encryption-Type 8	string	Microsoft
+ATTRIBUTE	MS-MPPE-Encryption-Types  8	string	Microsoft
+ATTRIBUTE	MS-RAS-Vendor		9	integer	Microsoft
+ATTRIBUTE	MS-CHAP-Domain		10	string	Microsoft
+ATTRIBUTE	MS-CHAP-Challenge	11	string	Microsoft
+ATTRIBUTE	MS-CHAP-MPPE-Keys	12	string	Microsoft
+ATTRIBUTE	MS-BAP-Usage		13	integer	Microsoft
+ATTRIBUTE	MS-Link-Utilization-Threshold 14 integer	Microsoft
+ATTRIBUTE	MS-Link-Drop-Time-Limit	15	integer	Microsoft
+ATTRIBUTE	MS-MPPE-Send-Key	16	string	Microsoft
+ATTRIBUTE	MS-MPPE-Recv-Key	17	string	Microsoft
+ATTRIBUTE	MS-RAS-Version		18	string	Microsoft
+ATTRIBUTE	MS-Old-ARAP-Password	19	string	Microsoft
+ATTRIBUTE	MS-New-ARAP-Password	20	string	Microsoft
+ATTRIBUTE	MS-ARAP-PW-Change-Reason 21	integer	Microsoft
+
+ATTRIBUTE	MS-Filter		22	string	Microsoft
+ATTRIBUTE	MS-Acct-Auth-Type	23	integer	Microsoft
+ATTRIBUTE	MS-Acct-EAP-Type	24	integer	Microsoft
+
+ATTRIBUTE	MS-CHAP2-Response	25	string	Microsoft
+ATTRIBUTE	MS-CHAP2-Success	26	string	Microsoft
+ATTRIBUTE	MS-CHAP2-CPW		27	string	Microsoft
+
+ATTRIBUTE	MS-Primary-DNS-Server	28	ipaddr	Microsoft
+ATTRIBUTE	MS-Secondary-DNS-Server	29	ipaddr	Microsoft
+ATTRIBUTE	MS-Primary-NBNS-Server	30	ipaddr	Microsoft
+ATTRIBUTE	MS-Secondary-NBNS-Server 31	ipaddr	Microsoft
+
+#ATTRIBUTE	MS-ARAP-Challenge	33	string	Microsoft
+
+
+#
+#	Integer Translations
+#
+
+#	MS-BAP-Usage Values
+
+VALUE		MS-BAP-Usage		Not-Allowed	0
+VALUE		MS-BAP-Usage		Allowed		1
+VALUE		MS-BAP-Usage		Required	2
+
+#	MS-ARAP-Password-Change-Reason Values
+
+VALUE	MS-ARAP-PW-Change-Reason	Just-Change-Password		1
+VALUE	MS-ARAP-PW-Change-Reason	Expired-Password		2
+VALUE	MS-ARAP-PW-Change-Reason	Admin-Requires-Password-Change	3
+VALUE	MS-ARAP-PW-Change-Reason	Password-Too-Short		4
+
+#	MS-Acct-Auth-Type Values
+
+VALUE		MS-Acct-Auth-Type	PAP		1
+VALUE		MS-Acct-Auth-Type	CHAP		2
+VALUE		MS-Acct-Auth-Type	MS-CHAP-1	3
+VALUE		MS-Acct-Auth-Type	MS-CHAP-2	4
+VALUE		MS-Acct-Auth-Type	EAP		5
+
+#	MS-Acct-EAP-Type Values
+
+VALUE		MS-Acct-EAP-Type	MD5		4
+VALUE		MS-Acct-EAP-Type	OTP		5
+VALUE		MS-Acct-EAP-Type	Generic-Token-Card	6
+VALUE		MS-Acct-EAP-Type	TLS		13
+
diff --git a/trunk/package/network/services/ppp/files/etc/ppp/radius/servers b/trunk/package/network/services/ppp/files/etc/ppp/radius/servers
new file mode 100644
index 00000000..0d4f0691
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/etc/ppp/radius/servers
@@ -0,0 +1,2 @@
+# SERVER SECRET
+localhost secret
diff --git a/trunk/package/network/services/ppp/files/lib/netifd/ppp-down b/trunk/package/network/services/ppp/files/lib/netifd/ppp-down
new file mode 100755
index 00000000..94cefc41
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/lib/netifd/ppp-down
@@ -0,0 +1,13 @@
+#!/bin/sh
+PPP_IPPARAM="$6"
+
+. /lib/netifd/netifd-proto.sh
+proto_init_update "$IFNAME" 0
+proto_send_update "$PPP_IPPARAM"
+
+[ -d /etc/ppp/ip-down.d ] && {
+	for SCRIPT in /etc/ppp/ip-down.d/*
+	do
+		[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
+	done
+}
diff --git a/trunk/package/network/services/ppp/files/lib/netifd/ppp-up b/trunk/package/network/services/ppp/files/lib/netifd/ppp-up
new file mode 100755
index 00000000..f9bfe623
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/lib/netifd/ppp-up
@@ -0,0 +1,30 @@
+#!/bin/sh
+PPP_IPPARAM="$6"
+
+. /lib/netifd/netifd-proto.sh
+proto_init_update "$IFNAME" 1 1
+proto_set_keep 1
+[ -n "$PPP_IPPARAM" ] && {
+	[ -n "$IPLOCAL" ] && proto_add_ipv4_address "$IPLOCAL" 32 "" "${IPREMOTE:-2.2.2.2}"
+	[ -n "$IPREMOTE" ] && proto_add_ipv4_route 0.0.0.0 0 "$IPREMOTE"
+	[ -n "$LLLOCAL" ] && proto_add_ipv6_address "$LLLOCAL" 128
+	[ -n "$DNS1" ] && proto_add_dns_server "$DNS1"
+	[ -n "$DNS2" -a "$DNS1" != "$DNS2" ] && proto_add_dns_server "$DNS2"
+}
+proto_send_update "$PPP_IPPARAM"
+
+[ -d /etc/ppp/ip-up.d ] && {
+	for SCRIPT in /etc/ppp/ip-up.d/*
+	do
+		[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
+	done
+}
+
+if [ -n "$AUTOIPV6" ]; then
+	json_init
+	json_add_string name "${PPP_IPPARAM}_dhcpv6"
+	json_add_string ifname "@$PPP_IPPARAM"
+	json_add_string proto "dhcpv6"
+	json_close_object
+	ubus call network add_dynamic "$(json_dump)"
+fi
diff --git a/trunk/package/network/services/ppp/files/ppp.sh b/trunk/package/network/services/ppp/files/ppp.sh
new file mode 100755
index 00000000..df404dda
--- /dev/null
+++ b/trunk/package/network/services/ppp/files/ppp.sh
@@ -0,0 +1,230 @@
+#!/bin/sh
+
+[ -x /usr/sbin/pppd ] || exit 0
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+ppp_generic_init_config() {
+	proto_config_add_string username
+	proto_config_add_string password
+	proto_config_add_string keepalive
+	proto_config_add_boolean keepalive_adaptive
+	proto_config_add_int demand
+	proto_config_add_string pppd_options
+	proto_config_add_string 'connect:file'
+	proto_config_add_string 'disconnect:file'
+	proto_config_add_string ipv6
+	proto_config_add_boolean authfail
+	proto_config_add_int mtu
+	proto_config_add_string pppname
+}
+
+ppp_generic_setup() {
+	local config="$1"; shift
+
+	json_get_vars ipv6 demand keepalive keepalive_adaptive username password pppd_options pppname
+	if [ "$ipv6" = 0 ]; then
+		ipv6=""
+	elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
+		ipv6=1
+		proto_export "AUTOIPV6=1"
+	fi
+
+	if [ "${demand:-0}" -gt 0 ]; then
+		demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
+	else
+		demand="persist"
+	fi
+	[ -n "$mtu" ] || json_get_var mtu mtu
+	[ -n "$pppname" ] || pppname="${proto:-ppp}-$config"
+
+	local lcp_failure="${keepalive%%[, ]*}"
+	local lcp_interval="${keepalive##*[, ]}"
+	local lcp_adaptive="lcp-echo-adaptive"
+	[ "${lcp_failure:-0}" -lt 1 ] && lcp_failure=""
+	[ "$lcp_interval" != "$keepalive" ] || lcp_interval=5
+	[ "${keepalive_adaptive:-1}" -lt 1 ] && lcp_adaptive=""
+	[ -n "$connect" ] || json_get_var connect connect
+	[ -n "$disconnect" ] || json_get_var disconnect disconnect
+
+	proto_run_command "$config" /usr/sbin/pppd \
+		nodetach ipparam "$config" \
+		ifname "$pppname" \
+		${lcp_failure:+lcp-echo-interval $lcp_interval lcp-echo-failure $lcp_failure $lcp_adaptive} \
+		${ipv6:++ipv6} \
+		nodefaultroute \
+		usepeerdns \
+		$demand maxfail 1 \
+		${username:+user "$username" password "$password"} \
+		${connect:+connect "$connect"} \
+		${disconnect:+disconnect "$disconnect"} \
+		ip-up-script /lib/netifd/ppp-up \
+		ipv6-up-script /lib/netifd/ppp-up \
+		ip-down-script /lib/netifd/ppp-down \
+		ipv6-down-script /lib/netifd/ppp-down \
+		${mtu:+mtu $mtu mru $mtu} \
+		"$@" $pppd_options
+}
+
+ppp_generic_teardown() {
+	local interface="$1"
+
+	case "$ERROR" in
+		11|19)
+			proto_notify_error "$interface" AUTH_FAILED
+			json_get_var authfail authfail
+			if [ "${authfail:-0}" -gt 0 ]; then
+				proto_block_restart "$interface"
+			fi
+		;;
+		2)
+			proto_notify_error "$interface" INVALID_OPTIONS
+			proto_block_restart "$interface"
+		;;
+	esac
+	proto_kill_command "$interface"
+}
+
+# PPP on serial device
+
+proto_ppp_init_config() {
+	proto_config_add_string "device"
+	ppp_generic_init_config
+	no_device=1
+	available=1
+}
+
+proto_ppp_setup() {
+	local config="$1"
+
+	json_get_var device device
+	ppp_generic_setup "$config" "$device"
+}
+
+proto_ppp_teardown() {
+	ppp_generic_teardown "$@"
+}
+
+proto_pppoe_init_config() {
+	ppp_generic_init_config
+	proto_config_add_string "ac"
+	proto_config_add_string "service"
+	proto_config_add_string host_uniq
+}
+
+proto_pppoe_setup() {
+	local config="$1"
+	local iface="$2"
+
+	for module in slhc ppp_generic pppox pppoe; do
+		/sbin/insmod $module 2>&- >&-
+	done
+
+	json_get_var mtu mtu
+	mtu="${mtu:-1492}"
+
+	json_get_var ac ac
+	json_get_var service service
+	json_get_var host_uniq host_uniq
+
+	ppp_generic_setup "$config" \
+		plugin rp-pppoe.so \
+		${ac:+rp_pppoe_ac "$ac"} \
+		${service:+rp_pppoe_service "$service"} \
+		"nic-$iface" \
+		${host_uniq:+host-uniq "$host_uniq"}
+}
+
+proto_pppoe_teardown() {
+	ppp_generic_teardown "$@"
+}
+
+proto_pppoa_init_config() {
+	ppp_generic_init_config
+	proto_config_add_int "atmdev"
+	proto_config_add_int "vci"
+	proto_config_add_int "vpi"
+	proto_config_add_string "encaps"
+	no_device=1
+	available=1
+}
+
+proto_pppoa_setup() {
+	local config="$1"
+	local iface="$2"
+
+	for module in slhc ppp_generic pppox pppoatm; do
+		/sbin/insmod $module 2>&- >&-
+	done
+
+	json_get_vars atmdev vci vpi encaps
+
+	case "$encaps" in
+		1|vc) encaps="vc-encaps" ;;
+		*) encaps="llc-encaps" ;;
+	esac
+
+	ppp_generic_setup "$config" \
+		plugin pppoatm.so \
+		${atmdev:+$atmdev.}${vpi:-8}.${vci:-35} \
+		${encaps}
+}
+
+proto_pppoa_teardown() {
+	ppp_generic_teardown "$@"
+}
+
+proto_pptp_init_config() {
+	ppp_generic_init_config
+	proto_config_add_string "server"
+	available=1
+	no_device=1
+}
+
+proto_pptp_setup() {
+	local config="$1"
+	local iface="$2"
+
+	local ip serv_addr server
+	json_get_var server server && {
+		for ip in $(resolveip -t 5 "$server"); do
+			( proto_add_host_dependency "$config" "$ip" )
+			serv_addr=1
+		done
+	}
+	[ -n "$serv_addr" ] || {
+		echo "Could not resolve server address"
+		sleep 5
+		proto_setup_failed "$config"
+		exit 1
+	}
+
+	local load
+	for module in slhc ppp_generic ppp_async ppp_mppe ip_gre gre pptp; do
+		grep -q "^$module " /proc/modules && continue
+		/sbin/insmod $module 2>&- >&-
+		load=1
+	done
+	[ "$load" = "1" ] && sleep 1
+
+	ppp_generic_setup "$config" \
+		plugin pptp.so \
+		pptp_server $server \
+		file /etc/ppp/options.pptp
+}
+
+proto_pptp_teardown() {
+	ppp_generic_teardown "$@"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol ppp
+	[ -f /usr/lib/pppd/*/rp-pppoe.so ] && add_protocol pppoe
+	[ -f /usr/lib/pppd/*/pppoatm.so ] && add_protocol pppoa
+	[ -f /usr/lib/pppd/*/pptp.so ] && add_protocol pptp
+}
+
diff --git a/trunk/package/network/services/ppp/patches/010-use_target_for_configure.patch b/trunk/package/network/services/ppp/patches/010-use_target_for_configure.patch
new file mode 100644
index 00000000..aff0df67
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/010-use_target_for_configure.patch
@@ -0,0 +1,24 @@
+configure: Allow overriding uname results
+
+In a cross compile setting it makes no sense to rely on the "uname" values
+reported by the build host system. This patch allows overriding the
+"uname -r", "uname -s" and "uname -m" results with the "UNAME_R", "UNAME_S"
+and "UNAME_M" environment variables.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/configure
++++ b/configure
+@@ -8,9 +8,9 @@ SYSCONF=/etc
+ #  if [ -d /NextApps ]; then
+ #    system="NeXTStep"
+ #  else
+-  system=`uname -s`
+-  release=`uname -r`
+-  arch=`uname -m`
++  system=${UNAME_S:-`uname -s`}
++  release=${UNAME_R:-`uname -r`}
++  arch=${UNAME_M:-`uname -m`}
+ #  fi
+ state="unknown"
+ 
diff --git a/trunk/package/network/services/ppp/patches/100-debian_ip-ip_option.patch b/trunk/package/network/services/ppp/patches/100-debian_ip-ip_option.patch
new file mode 100644
index 00000000..1017e0fe
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/100-debian_ip-ip_option.patch
@@ -0,0 +1,96 @@
+pppd: Allow specifying ip-up and ip-down scripts
+
+This patch implements the "ip-up-script" and "ip-down-script" options which
+allow to specify the path of the ip-up and ip-down scripts to call.
+
+These options default to _PATH_IPUP and _PATH_IPDOWN to retain the 
+existing behaviour.
+
+The patch originated from the Debian project.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/ipcp.c
++++ b/pppd/ipcp.c
+@@ -1958,7 +1958,7 @@ ipcp_up(f)
+      */
+     if (ipcp_script_state == s_down && ipcp_script_pid == 0) {
+ 	ipcp_script_state = s_up;
+-	ipcp_script(_PATH_IPUP, 0);
++	ipcp_script(path_ipup, 0);
+     }
+ }
+ 
+@@ -2008,7 +2008,7 @@ ipcp_down(f)
+     /* Execute the ip-down script */
+     if (ipcp_script_state == s_up && ipcp_script_pid == 0) {
+ 	ipcp_script_state = s_down;
+-	ipcp_script(_PATH_IPDOWN, 0);
++	ipcp_script(path_ipdown, 0);
+     }
+ }
+ 
+@@ -2062,13 +2062,13 @@ ipcp_script_done(arg)
+     case s_up:
+ 	if (ipcp_fsm[0].state != OPENED) {
+ 	    ipcp_script_state = s_down;
+-	    ipcp_script(_PATH_IPDOWN, 0);
++	    ipcp_script(path_ipdown, 0);
+ 	}
+ 	break;
+     case s_down:
+ 	if (ipcp_fsm[0].state == OPENED) {
+ 	    ipcp_script_state = s_up;
+-	    ipcp_script(_PATH_IPUP, 0);
++	    ipcp_script(path_ipup, 0);
+ 	}
+ 	break;
+     }
+--- a/pppd/main.c
++++ b/pppd/main.c
+@@ -316,6 +316,9 @@ main(argc, argv)
+     struct protent *protp;
+     char numbuf[16];
+ 
++    strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup));
++    strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown));
++
+     link_stats_valid = 0;
+     new_phase(PHASE_INITIALIZE);
+ 
+--- a/pppd/options.c
++++ b/pppd/options.c
+@@ -114,6 +114,8 @@ char	linkname[MAXPATHLEN];	/* logical na
+ bool	tune_kernel;		/* may alter kernel settings */
+ int	connect_delay = 1000;	/* wait this many ms after connect script */
+ int	req_unit = -1;		/* requested interface unit */
++char	path_ipup[MAXPATHLEN];	/* pathname of ip-up script */
++char	path_ipdown[MAXPATHLEN];/* pathname of ip-down script */
+ bool	multilink = 0;		/* Enable multilink operation */
+ char	*bundle_name = NULL;	/* bundle name for multilink */
+ bool	dump_options;		/* print out option values */
+@@ -299,6 +301,13 @@ option_t general_options[] = {
+       "Unset user environment variable",
+       OPT_A2PRINTER | OPT_NOPRINT, (void *)user_unsetprint },
+ 
++    { "ip-up-script", o_string, path_ipup,
++      "Set pathname of ip-up script",
++      OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
++    { "ip-down-script", o_string, path_ipdown,
++      "Set pathname of ip-down script",
++      OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
++
+ #ifdef HAVE_MULTILINK
+     { "multilink", o_bool, &multilink,
+       "Enable multilink operation", OPT_PRIO | 1 },
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -318,6 +318,8 @@ extern bool	tune_kernel;	/* May alter ke
+ extern int	connect_delay;	/* Time to delay after connect script */
+ extern int	max_data_rate;	/* max bytes/sec through charshunt */
+ extern int	req_unit;	/* interface unit number to use */
++extern char	path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
++extern char	path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
+ extern bool	multilink;	/* enable multilink operation */
+ extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
+ extern char	*bundle_name;	/* bundle name for multilink */
diff --git a/trunk/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch b/trunk/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
new file mode 100644
index 00000000..7c6765b9
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
@@ -0,0 +1,28 @@
+pppd: Close already open ppp descriptors
+
+When using the kernel PPPoE driver in conjunction with the "persist" option,
+the already open descriptor to /dev/ppp is not closed when the link is
+reestablished. This eventually leads to high CPU load because the stray 
+descriptors are always reported as ready by select().
+
+This patch closes the descriptor if it is already open when establishing a
+new connection. It originated from the Debian project.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -458,6 +458,13 @@ int generic_establish_ppp (int fd)
+     if (new_style_driver) {
+ 	int flags;
+ 
++        /* if a ppp_fd is already open, close it first */
++        if(ppp_fd > 0) {
++          close(ppp_fd);
++          remove_fd(ppp_fd);
++          ppp_fd = -1;
++        }
++
+ 	/* Open an instance of /dev/ppp and connect the channel to it */
+ 	if (ioctl(fd, PPPIOCGCHAN, &chindex) == -1) {
+ 	    error("Couldn't get channel number: %m");
diff --git a/trunk/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch b/trunk/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
new file mode 100644
index 00000000..c8a23edd
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
@@ -0,0 +1,23 @@
+pppd: Fix creation of linkpidfile
+
+When pppd is run without "nodetach" or with "updetach", the linkpidfile is
+never created. The call to create_linkpidfile() is protected by a check for
+linkpidfile[0] but this is only filled in when create_linkpidfile() is called.
+
+This patch changes to code to allways uncondiationally call
+create_linkpidfile(), it originated from the Debian project.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/main.c
++++ b/pppd/main.c
+@@ -773,8 +773,7 @@ detach()
+ 	/* update pid files if they have been written already */
+ 	if (pidfilename[0])
+ 	    create_pidfile(pid);
+-	if (linkpidfile[0])
+-	    create_linkpidfile(pid);
++	create_linkpidfile(pid);
+ 	exit(0);		/* parent dies */
+     }
+     setsid();
diff --git a/trunk/package/network/services/ppp/patches/105-debian_demand.patch b/trunk/package/network/services/ppp/patches/105-debian_demand.patch
new file mode 100644
index 00000000..2502d496
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/105-debian_demand.patch
@@ -0,0 +1,172 @@
+--- a/pppd/demand.c
++++ b/pppd/demand.c
+@@ -36,6 +36,8 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <netdb.h>
++#include <unistd.h>
++#include <syslog.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -43,6 +45,8 @@
+ #include <sys/resource.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #ifdef PPP_FILTER
+ #include <pcap-bpf.h>
+ #endif
+@@ -221,6 +225,14 @@ loop_chars(p, n)
+     int c, rv;
+ 
+     rv = 0;
++
++/* check for synchronous connection... */
++
++    if ( (p[0] == 0xFF) && (p[1] == 0x03) ) {
++        rv = loop_frame(p,n);
++        return rv;
++    }
++
+     for (; n > 0; --n) {
+ 	c = *p++;
+ 	if (c == PPP_FLAG) {
+@@ -299,17 +311,102 @@ loop_frame(frame, len)
+  * loopback, now that the real serial link is up.
+  */
+ void
+-demand_rexmit(proto)
++demand_rexmit(proto, newip)
+     int proto;
++    u_int32_t newip;
+ {
+     struct packet *pkt, *prev, *nextpkt;
++    unsigned short checksum;
++    unsigned short pkt_checksum = 0;
++    unsigned iphdr;
++    struct timeval tv;
++    char cv = 0;
++    char ipstr[16];
+ 
+     prev = NULL;
+     pkt = pend_q;
+     pend_q = NULL;
++    tv.tv_sec = 1;
++    tv.tv_usec = 0;
++    select(0,NULL,NULL,NULL,&tv);	/* Sleep for 1 Seconds */
+     for (; pkt != NULL; pkt = nextpkt) {
+ 	nextpkt = pkt->next;
+ 	if (PPP_PROTOCOL(pkt->data) == proto) {
++            if ( (proto == PPP_IP) && newip ) {
++		/* Get old checksum */
++
++		iphdr = (pkt->data[4] & 15) << 2;
++		checksum = *((unsigned short *) (pkt->data+14));
++                if (checksum == 0xFFFF) {
++                    checksum = 0;
++                }
++
++ 
++                if (pkt->data[13] == 17) {
++                    pkt_checksum =  *((unsigned short *) (pkt->data+10+iphdr));
++		    if (pkt_checksum) {
++                        cv = 1;
++                        if (pkt_checksum == 0xFFFF) {
++                            pkt_checksum = 0;
++                        }
++                    }
++                    else {
++                       cv = 0;
++                    }
++                }
++
++		if (pkt->data[13] == 6) {
++		    pkt_checksum = *((unsigned short *) (pkt->data+20+iphdr));
++		    cv = 1;
++                    if (pkt_checksum == 0xFFFF) {
++                        pkt_checksum = 0;
++                    }
++		}
++
++		/* Delete old Source-IP-Address */
++                checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF;
++                checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF;
++
++		pkt_checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF;
++		pkt_checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF;
++
++		/* Change Source-IP-Address */
++                * ((u_int32_t *) (pkt->data + 16)) = newip;
++
++		/* Add new Source-IP-Address */
++                checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF;
++                checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF;
++
++                pkt_checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF;
++                pkt_checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF;
++
++		/* Write new checksum */
++                if (!checksum) {
++                    checksum = 0xFFFF;
++                }
++                *((unsigned short *) (pkt->data+14)) = checksum;
++		if (pkt->data[13] == 6) {
++		    *((unsigned short *) (pkt->data+20+iphdr)) = pkt_checksum;
++		}
++		if (cv && (pkt->data[13] == 17) ) {
++		    *((unsigned short *) (pkt->data+10+iphdr)) = pkt_checksum;
++		}
++
++		/* Log Packet */
++		strcpy(ipstr,inet_ntoa(*( (struct in_addr *) (pkt->data+16))));
++		if (pkt->data[13] == 1) {
++		    syslog(LOG_INFO,"Open ICMP %s -> %s\n",
++			ipstr,
++			inet_ntoa(*( (struct in_addr *) (pkt->data+20))));
++		} else {
++		    syslog(LOG_INFO,"Open %s %s:%d -> %s:%d\n",
++			pkt->data[13] == 6 ? "TCP" : "UDP",
++			ipstr,
++			ntohs(*( (short *) (pkt->data+iphdr+4))),
++			inet_ntoa(*( (struct in_addr *) (pkt->data+20))),
++			ntohs(*( (short *) (pkt->data+iphdr+6))));
++                }
++            }
+ 	    output(0, pkt->data, pkt->length);
+ 	    free(pkt);
+ 	} else {
+--- a/pppd/ipcp.c
++++ b/pppd/ipcp.c
+@@ -1883,7 +1883,7 @@ ipcp_up(f)
+ 		    proxy_arp_set[f->unit] = 1;
+ 
+ 	}
+-	demand_rexmit(PPP_IP);
++	demand_rexmit(PPP_IP,go->ouraddr);
+ 	sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
+ 
+     } else {
+--- a/pppd/ipv6cp.c
++++ b/pppd/ipv6cp.c
+@@ -1232,7 +1232,7 @@ ipv6cp_up(f)
+ 	    }
+ 
+ 	}
+-	demand_rexmit(PPP_IPV6);
++	demand_rexmit(PPP_IPV6,0);
+ 	sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS);
+ 
+     } else {
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -585,7 +585,7 @@ void demand_conf __P((void));	/* config
+ void demand_block __P((void));	/* set all NPs to queue up packets */
+ void demand_unblock __P((void)); /* set all NPs to pass packets */
+ void demand_discard __P((void)); /* set all NPs to discard packets */
+-void demand_rexmit __P((int));	/* retransmit saved frames for an NP */
++void demand_rexmit __P((int, u_int32_t)); /* retransmit saved frames for an NP*/
+ int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
+ int  loop_frame __P((unsigned char *, int)); /* should we bring link up? */
+ 
diff --git a/trunk/package/network/services/ppp/patches/106-debian_stripMSdomain.patch b/trunk/package/network/services/ppp/patches/106-debian_stripMSdomain.patch
new file mode 100644
index 00000000..86af1ef4
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/106-debian_stripMSdomain.patch
@@ -0,0 +1,47 @@
+pppd: Implement option to strip domain part from MS CHAP response
+
+This patch implements a new boolean option "chapms-strip-domain" which
+strips the leading domain part of the username in a received MS Chap
+response.
+
+When the option is set, all leading chars up to and including the last
+backslash in the username are stripped. The option defaults to false.
+
+The patch originated from the Debian project.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/chap-new.c
++++ b/pppd/chap-new.c
+@@ -58,6 +58,7 @@ int (*chap_verify_hook)(char *name, char
+ int chap_timeout_time = 3;
+ int chap_max_transmits = 10;
+ int chap_rechallenge_time = 0;
++int chapms_strip_domain = 0;
+ 
+ /*
+  * Command-line options.
+@@ -69,6 +70,8 @@ static option_t chap_option_list[] = {
+ 	  "Set max #xmits for challenge", OPT_PRIO },
+ 	{ "chap-interval", o_int, &chap_rechallenge_time,
+ 	  "Set interval for rechallenge", OPT_PRIO },
++	{ "chapms-strip-domain", o_bool, &chapms_strip_domain,
++	  "Strip the domain prefix before the Username", 1 },
+ 	{ NULL }
+ };
+ 
+@@ -336,6 +339,14 @@ chap_handle_response(struct chap_server_
+ 			/* Null terminate and clean remote name. */
+ 			slprintf(rname, sizeof(rname), "%.*v", len, name);
+ 			name = rname;
++
++			/* strip the MS domain name */
++			if (chapms_strip_domain && strrchr(rname, '\\')) {
++				char tmp[MAXNAMELEN+1];
++
++				strcpy(tmp, strrchr(rname, '\\') + 1);
++				strcpy(rname, tmp);
++			}
+ 		}
+ 
+ 		if (chap_verify_hook)
diff --git a/trunk/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch b/trunk/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
new file mode 100644
index 00000000..eaad2cda
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
@@ -0,0 +1,25 @@
+pppoatm: Allow wildcard ATM devices
+
+When operating pppd's pppoatm plugin with an USB ADSL modem, e.g. an
+Alcatel Speedtouch, the ATM device number might change when the modem is
+reconnected to the USB port or when the host controller resets the USB
+device.
+
+This patch allows to specify the ATM device as wildcard which gives
+enough flexibility to cope with changing device names.
+
+The patch originated from the Debain project.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/plugins/pppoatm/pppoatm.c
++++ b/pppd/plugins/pppoatm/pppoatm.c
+@@ -75,7 +75,7 @@ static int setdevname_pppoatm(const char
+ 	//info("PPPoATM setdevname_pppoatm: '%s'", cp);
+ 	memset(&addr, 0, sizeof addr);
+ 	if (text2atm(cp, (struct sockaddr *) &addr, sizeof(addr),
+-	    T2A_PVC | T2A_NAME) < 0) {
++	    T2A_PVC | T2A_NAME | T2A_WILDCARD) < 0) {
+                if(doit)
+                    info("atm does not recognize: %s", cp);
+ 		return 0;
diff --git a/trunk/package/network/services/ppp/patches/110-debian_defaultroute.patch b/trunk/package/network/services/ppp/patches/110-debian_defaultroute.patch
new file mode 100644
index 00000000..e8659ea1
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/110-debian_defaultroute.patch
@@ -0,0 +1,313 @@
+pppd: Add "replacedefaultroute" and "noreplacedefaultroute" options
+
+This patch implements two new options, "replacedefaultroute" to replace any
+existing system default route when specified and "noreplacedefaultroute" to
+disable the "replacedefaultroute" option, which is useful in multi user
+environments where the administrator wants to allow users to dial pppd
+connections but not allow them to change the system default route.
+
+The patch originated from the Debian project.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/ipcp.c
++++ b/pppd/ipcp.c
+@@ -198,6 +198,14 @@ static option_t ipcp_option_list[] = {
+       "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
+       &ipcp_wantoptions[0].default_route },
+ 
++    { "replacedefaultroute", o_bool,
++				&ipcp_wantoptions[0].replace_default_route,
++      "Replace default route", 1
++    },
++    { "noreplacedefaultroute", o_bool,
++				&ipcp_allowoptions[0].replace_default_route,
++      "Never replace default route", OPT_A2COPY,
++				&ipcp_wantoptions[0].replace_default_route },
+     { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
+       "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
+     { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
+@@ -271,7 +279,7 @@ struct protent ipcp_protent = {
+     ip_active_pkt
+ };
+ 
+-static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t));
++static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool));
+ static void ipcp_script __P((char *, int));	/* Run an up/down script */
+ static void ipcp_script_done __P((void *));
+ 
+@@ -1761,7 +1769,8 @@ ip_demand_conf(u)
+     if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
+ 	return 0;
+     if (wo->default_route)
+-	if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr))
++	if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr,
++		wo->replace_default_route))
+ 	    default_route_set[u] = 1;
+     if (wo->proxy_arp)
+ 	if (sifproxyarp(u, wo->hisaddr))
+@@ -1849,7 +1858,8 @@ ipcp_up(f)
+      */
+     if (demand) {
+ 	if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
+-	    ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr);
++	    ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr,
++				      wo->replace_default_route);
+ 	    if (go->ouraddr != wo->ouraddr) {
+ 		warn("Local IP address changed to %I", go->ouraddr);
+ 		script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
+@@ -1874,7 +1884,8 @@ ipcp_up(f)
+ 
+ 	    /* assign a default route through the interface if required */
+ 	    if (ipcp_wantoptions[f->unit].default_route) 
+-		if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
++		if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
++			wo->replace_default_route))
+ 		    default_route_set[f->unit] = 1;
+ 
+ 	    /* Make a proxy ARP entry if requested. */
+@@ -1924,7 +1935,8 @@ ipcp_up(f)
+ 
+ 	/* assign a default route through the interface if required */
+ 	if (ipcp_wantoptions[f->unit].default_route) 
+-	    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
++	    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
++		    wo->replace_default_route))
+ 		default_route_set[f->unit] = 1;
+ 
+ 	/* Make a proxy ARP entry if requested. */
+@@ -2002,7 +2014,7 @@ ipcp_down(f)
+ 	sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
+ 	sifdown(f->unit);
+ 	ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
+-			 ipcp_hisoptions[f->unit].hisaddr);
++			 ipcp_hisoptions[f->unit].hisaddr, 0);
+     }
+ 
+     /* Execute the ip-down script */
+@@ -2018,16 +2030,25 @@ ipcp_down(f)
+  * proxy arp entries, etc.
+  */
+ static void
+-ipcp_clear_addrs(unit, ouraddr, hisaddr)
++ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute)
+     int unit;
+     u_int32_t ouraddr;  /* local address */
+     u_int32_t hisaddr;  /* remote address */
++    bool replacedefaultroute;
+ {
+     if (proxy_arp_set[unit]) {
+ 	cifproxyarp(unit, hisaddr);
+ 	proxy_arp_set[unit] = 0;
+     }
+-    if (default_route_set[unit]) {
++    /* If replacedefaultroute, sifdefaultroute will be called soon
++     * with replacedefaultroute set and that will overwrite the current
++     * default route. This is the case only when doing demand, otherwise
++     * during demand, this cifdefaultroute would restore the old default
++     * route which is not what we want in this case. In the non-demand
++     * case, we'll delete the default route and restore the old if there
++     * is one saved by an sifdefaultroute with replacedefaultroute.
++     */
++    if (!replacedefaultroute && default_route_set[unit]) {
+ 	cifdefaultroute(unit, ouraddr, hisaddr);
+ 	default_route_set[unit] = 0;
+     }
+--- a/pppd/ipcp.h
++++ b/pppd/ipcp.h
+@@ -70,6 +70,7 @@ typedef struct ipcp_options {
+     bool old_addrs;		/* Use old (IP-Addresses) option? */
+     bool req_addr;		/* Ask peer to send IP address? */
+     bool default_route;		/* Assign default route through interface? */
++    bool replace_default_route;	/* Replace default route through interface? */
+     bool proxy_arp;		/* Make proxy ARP entry for peer? */
+     bool neg_vj;		/* Van Jacobson Compression? */
+     bool old_vj;		/* use old (short) form of VJ option? */
+--- a/pppd/pppd.8
++++ b/pppd/pppd.8
+@@ -121,6 +121,11 @@ the gateway, when IPCP negotiation is su
+ This entry is removed when the PPP connection is broken.  This option
+ is privileged if the \fInodefaultroute\fR option has been specified.
+ .TP
++.B replacedefaultroute
++This option is a flag to the defaultroute option. If defaultroute is
++set and this flag is also set, pppd replaces an existing default route
++with the new default route.
++.TP
+ .B disconnect \fIscript
+ Execute the command specified by \fIscript\fR, by passing it to a
+ shell, after
+@@ -734,7 +739,12 @@ disable both forms of hardware flow cont
+ .TP
+ .B nodefaultroute
+ Disable the \fIdefaultroute\fR option.  The system administrator who
+-wishes to prevent users from creating default routes with pppd
++wishes to prevent users from adding a default route with pppd
++can do so by placing this option in the /etc/ppp/options file.
++.TP
++.B noreplacedefaultroute
++Disable the \fIreplacedefaultroute\fR option. The system administrator who
++wishes to prevent users from replacing a default route with pppd
+ can do so by placing this option in the /etc/ppp/options file.
+ .TP
+ .B nodeflate
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -667,7 +667,7 @@ int  sif6addr __P((int, eui64_t, eui64_t
+ int  cif6addr __P((int, eui64_t, eui64_t));
+ 				/* Remove an IPv6 address from i/f */
+ #endif
+-int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
++int  sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
+ 				/* Create default route through i/f */
+ int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
+ 				/* Delete default route through i/f */
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -207,6 +207,8 @@ static unsigned char inbuf[512]; /* buff
+ static int	if_is_up;	/* Interface has been marked up */
+ static int	if6_is_up;	/* Interface has been marked up for IPv6, to help differentiate */
+ static int	have_default_route;	/* Gateway for default route added */
++static struct	rtentry old_def_rt;	/* Old default route */
++static int	default_rt_repl_rest;	/* replace and restore old default rt */
+ static u_int32_t proxy_arp_addr;	/* Addr for proxy arp entry added */
+ static char proxy_arp_dev[16];		/* Device for proxy arp entry */
+ static u_int32_t our_old_addr;		/* for detecting address changes */
+@@ -1552,6 +1554,9 @@ static int read_route_table(struct rtent
+ 	p = NULL;
+     }
+ 
++    SET_SA_FAMILY (rt->rt_dst,     AF_INET);
++    SET_SA_FAMILY (rt->rt_gateway, AF_INET);
++
+     SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
+     SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
+     SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
+@@ -1621,20 +1626,51 @@ int have_route_to(u_int32_t addr)
+ /********************************************************************
+  *
+  * sifdefaultroute - assign a default route through the address given.
+- */
+-
+-int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
+-{
+-    struct rtentry rt;
+-
+-    if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
+-	if (rt.rt_flags & RTF_GATEWAY)
+-	    error("not replacing existing default route via %I",
+-		  SIN_ADDR(rt.rt_gateway));
+-	else
++ *
++ * If the global default_rt_repl_rest flag is set, then this function
++ * already replaced the original system defaultroute with some other
++ * route and it should just replace the current defaultroute with
++ * another one, without saving the current route. Use: demand mode,
++ * when pppd sets first a defaultroute it it's temporary ppp0 addresses
++ * and then changes the temporary addresses to the addresses for the real
++ * ppp connection when it has come up.
++ */
++
++int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace)
++{
++    struct rtentry rt, tmp_rt;
++    struct rtentry *del_rt = NULL;
++
++    if (default_rt_repl_rest) {
++	/* We have already reclaced the original defaultroute, if we
++	   are called again, we will delete the current default route
++	   and set the new default route in this function.
++	   - this is normally only the case the doing demand: */
++	if (defaultroute_exists(&tmp_rt))
++	    del_rt = &tmp_rt;
++    } else if (defaultroute_exists(&old_def_rt) &&
++	       strcmp(old_def_rt.rt_dev, ifname) != 0) {
++	/* We did not yet replace an existing default route, let's
++	   check if we should save and replace a default route: */
++	if (old_def_rt.rt_flags & RTF_GATEWAY) {
++	    if (!replace) {
++		error("not replacing existing default route via %I",
++		      SIN_ADDR(old_def_rt.rt_gateway));
++		return 0;
++	    } else {
++		/* we need to copy rt_dev because we need it permanent too: */
++		char *tmp_dev = malloc(strlen(old_def_rt.rt_dev) + 1);
++		strcpy(tmp_dev, old_def_rt.rt_dev);
++		old_def_rt.rt_dev = tmp_dev;
++
++		notice("replacing old default route to %s [%I]",
++			old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
++		default_rt_repl_rest = 1;
++		del_rt = &old_def_rt;
++	    }
++	} else
+ 	    error("not replacing existing default route through %s",
+-		  rt.rt_dev);
+-	return 0;
++		  old_def_rt.rt_dev);
+     }
+ 
+     memset (&rt, 0, sizeof (rt));
+@@ -1649,10 +1685,16 @@ int sifdefaultroute (int unit, u_int32_t
+ 
+     rt.rt_flags = RTF_UP;
+     if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) {
+-	if ( ! ok_error ( errno ))
++	if (!ok_error(errno))
+ 	    error("default route ioctl(SIOCADDRT): %m");
+ 	return 0;
+     }
++    if (default_rt_repl_rest && del_rt)
++        if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) {
++	    if (!ok_error(errno))
++	        error("del old default route ioctl(SIOCDELRT): %m");
++	    return 0;
++        }
+ 
+     have_default_route = 1;
+     return 1;
+@@ -1683,11 +1725,21 @@ int cifdefaultroute (int unit, u_int32_t
+     rt.rt_flags = RTF_UP;
+     if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) {
+ 	if (still_ppp()) {
+-	    if ( ! ok_error ( errno ))
++	    if (!ok_error(errno))
+ 		error("default route ioctl(SIOCDELRT): %m");
+ 	    return 0;
+ 	}
+     }
++    if (default_rt_repl_rest) {
++	notice("restoring old default route to %s [%I]",
++		old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
++        if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) {
++	    if (!ok_error(errno))
++	        error("restore default route ioctl(SIOCADDRT): %m");
++	    return 0;
++        }
++        default_rt_repl_rest = 0;
++    }
+ 
+     return 1;
+ }
+--- a/pppd/sys-solaris.c
++++ b/pppd/sys-solaris.c
+@@ -2039,12 +2039,18 @@ cifaddr(u, o, h)
+  * sifdefaultroute - assign a default route through the address given.
+  */
+ int
+-sifdefaultroute(u, l, g)
++sifdefaultroute(u, l, g, replace)
+     int u;
+     u_int32_t l, g;
++    bool replace;
+ {
+     struct rtentry rt;
+ 
++    if (replace) {
++	error("replacedefaultroute not supported on this platform");
++	return 0;
++    }
++
+ #if defined(__USLC__)
+     g = l;			/* use the local address as gateway */
+ #endif
diff --git a/trunk/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch b/trunk/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
new file mode 100644
index 00000000..0e57029d
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
@@ -0,0 +1,95 @@
+pppd: Allow specifying ipv6-up and ipv6-down scripts
+
+This patch implements the "ipv6-up-script" and "ipv6-down-script" options
+which allow to specify the path of the ipv6-up and ipv6-down scripts to call.
+
+These options default to _PATH_IPV6UP and _PATH_IPV6DOWN to retain the
+existing behaviour.
+
+The patch originated from the Debian project.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/main.c
++++ b/pppd/main.c
+@@ -318,6 +318,8 @@ main(argc, argv)
+ 
+     strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup));
+     strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown));
++    strlcpy(path_ipv6up, _PATH_IPV6UP, sizeof(path_ipv6up));
++    strlcpy(path_ipv6down, _PATH_IPV6DOWN, sizeof(path_ipv6down));
+ 
+     link_stats_valid = 0;
+     new_phase(PHASE_INITIALIZE);
+--- a/pppd/options.c
++++ b/pppd/options.c
+@@ -116,6 +116,8 @@ int	connect_delay = 1000;	/* wait this m
+ int	req_unit = -1;		/* requested interface unit */
+ char	path_ipup[MAXPATHLEN];	/* pathname of ip-up script */
+ char	path_ipdown[MAXPATHLEN];/* pathname of ip-down script */
++char	path_ipv6up[MAXPATHLEN];	/* pathname of ipv6-up script */
++char	path_ipv6down[MAXPATHLEN];/* pathname of ipv6-down script */
+ bool	multilink = 0;		/* Enable multilink operation */
+ char	*bundle_name = NULL;	/* bundle name for multilink */
+ bool	dump_options;		/* print out option values */
+@@ -308,6 +310,13 @@ option_t general_options[] = {
+       "Set pathname of ip-down script",
+       OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
+ 
++    { "ipv6-up-script", o_string, path_ipv6up,
++      "Set pathname of ipv6-up script",
++      OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
++    { "ipv6-down-script", o_string, path_ipv6down,
++      "Set pathname of ipv6-down script",
++      OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
++
+ #ifdef HAVE_MULTILINK
+     { "multilink", o_bool, &multilink,
+       "Enable multilink operation", OPT_PRIO | 1 },
+--- a/pppd/ipv6cp.c
++++ b/pppd/ipv6cp.c
+@@ -1269,7 +1269,7 @@ ipv6cp_up(f)
+      */
+     if (ipv6cp_script_state == s_down && ipv6cp_script_pid == 0) {
+ 	ipv6cp_script_state = s_up;
+-	ipv6cp_script(_PATH_IPV6UP);
++	ipv6cp_script(path_ipv6up);
+     }
+ }
+ 
+@@ -1321,7 +1321,7 @@ ipv6cp_down(f)
+     /* Execute the ipv6-down script */
+     if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) {
+ 	ipv6cp_script_state = s_down;
+-	ipv6cp_script(_PATH_IPV6DOWN);
++	ipv6cp_script(path_ipv6down);
+     }
+ }
+ 
+@@ -1364,13 +1364,13 @@ ipv6cp_script_done(arg)
+     case s_up:
+ 	if (ipv6cp_fsm[0].state != OPENED) {
+ 	    ipv6cp_script_state = s_down;
+-	    ipv6cp_script(_PATH_IPV6DOWN);
++	    ipv6cp_script(path_ipv6down);
+ 	}
+ 	break;
+     case s_down:
+ 	if (ipv6cp_fsm[0].state == OPENED) {
+ 	    ipv6cp_script_state = s_up;
+-	    ipv6cp_script(_PATH_IPV6UP);
++	    ipv6cp_script(path_ipv6up);
+ 	}
+ 	break;
+     }
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -320,6 +320,8 @@ extern int	max_data_rate;	/* max bytes/s
+ extern int	req_unit;	/* interface unit number to use */
+ extern char	path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
+ extern char	path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
++extern char	path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */
++extern char	path_ipv6down[MAXPATHLEN]; /* pathname of ipv6-down script */
+ extern bool	multilink;	/* enable multilink operation */
+ extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
+ extern char	*bundle_name;	/* bundle name for multilink */
diff --git a/trunk/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch b/trunk/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch
new file mode 100644
index 00000000..b7a62406
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/121-debian_adaptive_lcp_echo.patch
@@ -0,0 +1,56 @@
+--- a/pppd/lcp.c
++++ b/pppd/lcp.c
+@@ -73,6 +73,7 @@ static void lcp_delayed_up __P((void *))
+  */
+ int	lcp_echo_interval = 0; 	/* Interval between LCP echo-requests */
+ int	lcp_echo_fails = 0;	/* Tolerance to unanswered echo-requests */
++bool	lcp_echo_adaptive = 0;	/* request echo only if the link was idle */
+ bool	lax_recv = 0;		/* accept control chars in asyncmap */
+ bool	noendpoint = 0;		/* don't send/accept endpoint discriminator */
+ 
+@@ -151,6 +152,8 @@ static option_t lcp_option_list[] = {
+       OPT_PRIO },
+     { "lcp-echo-interval", o_int, &lcp_echo_interval,
+       "Set time in seconds between LCP echo requests", OPT_PRIO },
++    { "lcp-echo-adaptive", o_bool, &lcp_echo_adaptive,
++      "Suppress LCP echo requests if traffic was received", 1 },
+     { "lcp-restart", o_int, &lcp_fsm[0].timeouttime,
+       "Set time in seconds between LCP retransmissions", OPT_PRIO },
+     { "lcp-max-terminate", o_int, &lcp_fsm[0].maxtermtransmits,
+@@ -2331,6 +2334,22 @@ LcpSendEchoRequest (f)
+ 	}
+     }
+ 
++    /*
++     * If adaptive echos have been enabled, only send the echo request if
++     * no traffic was received since the last one.
++     */
++    if (lcp_echo_adaptive) {
++	static unsigned int last_pkts_in = 0;
++
++	update_link_stats(f->unit);
++	link_stats_valid = 0;
++
++	if (link_stats.pkts_in != last_pkts_in) {
++	    last_pkts_in = link_stats.pkts_in;
++	    return;
++	}
++    }
++
+     /*
+      * Make and send the echo request frame.
+      */
+--- a/pppd/pppd.8
++++ b/pppd/pppd.8
+@@ -563,6 +563,11 @@ to 1) if the \fIproxyarp\fR option is us
+ dynamic IP address option (i.e. set /proc/sys/net/ipv4/ip_dynaddr to
+ 1) in demand mode if the local address changes.
+ .TP
++.B lcp\-echo\-adaptive
++If this option is used with the \fIlcp\-echo\-failure\fR option then
++pppd will send LCP echo\-request frames only if no traffic was received
++from the peer since the last echo\-request was sent.
++.TP
+ .B lcp\-echo\-failure \fIn
+ If this option is given, pppd will presume the peer to be dead
+ if \fIn\fR LCP echo\-requests are sent without receiving a valid LCP
diff --git a/trunk/package/network/services/ppp/patches/130-no_cdefs_h.patch b/trunk/package/network/services/ppp/patches/130-no_cdefs_h.patch
new file mode 100644
index 00000000..caa892ec
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/130-no_cdefs_h.patch
@@ -0,0 +1,11 @@
+--- a/pppd/plugins/rp-pppoe/config.h
++++ b/pppd/plugins/rp-pppoe/config.h
+@@ -102,7 +102,7 @@
+ #define HAVE_NETPACKET_PACKET_H 1
+ 
+ /* Define if you have the <sys/cdefs.h> header file.  */
+-#define HAVE_SYS_CDEFS_H 1
++/* #undef HAVE_SYS_CDEFS_H */
+ 
+ /* Define if you have the <sys/dlpi.h> header file.  */
+ /* #undef HAVE_SYS_DLPI_H */
diff --git a/trunk/package/network/services/ppp/patches/131-missing_prototype_macro.patch b/trunk/package/network/services/ppp/patches/131-missing_prototype_macro.patch
new file mode 100644
index 00000000..868a08b6
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/131-missing_prototype_macro.patch
@@ -0,0 +1,23 @@
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -67,6 +67,9 @@
+ #define volatile
+ #endif
+ 
++#undef __P
++#define __P(args) args
++
+ #ifdef INET6
+ #include "eui64.h"
+ #endif
+--- a/pppd/magic.h
++++ b/pppd/magic.h
+@@ -42,6 +42,8 @@
+  * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
+  */
+ 
++#include "pppd.h"
++
+ void magic_init __P((void));	/* Initialize the magic number generator */
+ u_int32_t magic __P((void));	/* Returns the next magic number */
+ 
diff --git a/trunk/package/network/services/ppp/patches/132-fix_linux_includes.patch b/trunk/package/network/services/ppp/patches/132-fix_linux_includes.patch
new file mode 100644
index 00000000..696dad11
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/132-fix_linux_includes.patch
@@ -0,0 +1,40 @@
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -73,12 +73,12 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+ #include <sys/sysmacros.h>
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <syslog.h>
+@@ -102,22 +102,15 @@
+ #define MAX_ADDR_LEN 7
+ #endif
+ 
+-#if __GLIBC__ >= 2
+ #include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */
+ #include <net/if.h>
+ #include <net/if_arp.h>
+ #include <net/route.h>
+ #include <netinet/if_ether.h>
+-#else
+-#include <linux/types.h>
+-#include <linux/if.h>
+-#include <linux/if_arp.h>
+-#include <linux/route.h>
+-#include <linux/if_ether.h>
+-#endif
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
++#include <linux/sockios.h>
+ #include <linux/ppp_defs.h>
+ #include <linux/if_ppp.h>
+ 
diff --git a/trunk/package/network/services/ppp/patches/133-fix_sha1_include.patch b/trunk/package/network/services/ppp/patches/133-fix_sha1_include.patch
new file mode 100644
index 00000000..b5ccd085
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/133-fix_sha1_include.patch
@@ -0,0 +1,11 @@
+--- a/pppd/sha1.c
++++ b/pppd/sha1.c
+@@ -18,7 +18,7 @@
+ 
+ #include <string.h>
+ #include <netinet/in.h>	/* htonl() */
+-#include <net/ppp_defs.h>
++#include "pppd.h"
+ #include "sha1.h"
+ 
+ static void
diff --git a/trunk/package/network/services/ppp/patches/140-pppoe_compile_fix.patch b/trunk/package/network/services/ppp/patches/140-pppoe_compile_fix.patch
new file mode 100644
index 00000000..71f96ff9
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/140-pppoe_compile_fix.patch
@@ -0,0 +1,101 @@
+--- a/pppd/plugins/rp-pppoe/plugin.c
++++ b/pppd/plugins/rp-pppoe/plugin.c
+@@ -46,10 +46,10 @@ static char const RCSID[] =
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <signal.h>
+-#include <net/ethernet.h>
+ #include <net/if_arp.h>
+ #include <linux/ppp_defs.h>
+ #include <linux/if_pppox.h>
++#include <linux/if_ether.h>
+ 
+ #ifndef _ROOT_PATH
+ #define _ROOT_PATH ""
+--- a/pppd/plugins/rp-pppoe/pppoe.h
++++ b/pppd/plugins/rp-pppoe/pppoe.h
+@@ -86,17 +86,6 @@ typedef unsigned long UINT32_t;
+ 
+ #include <netinet/in.h>
+ 
+-#ifdef HAVE_NETINET_IF_ETHER_H
+-#include <sys/types.h>
+-
+-#ifdef HAVE_SYS_SOCKET_H
+-#include <sys/socket.h>
+-#endif
+-#ifndef HAVE_SYS_DLPI_H
+-#include <netinet/if_ether.h>
+-#endif
+-#endif
+-
+ 
+ 
+ /* Ethernet frame types according to RFC 2516 */
+--- a/pppd/plugins/rp-pppoe/if.c
++++ b/pppd/plugins/rp-pppoe/if.c
+@@ -31,7 +31,7 @@ static char const RCSID[] =
+ #endif
+ 
+ #ifdef HAVE_NET_ETHERNET_H
+-#include <net/ethernet.h>
++#include <linux/if_ether.h>
+ #endif
+ 
+ #ifdef HAVE_ASM_TYPES_H
+--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
++++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
+@@ -16,6 +16,7 @@
+ #include <string.h>
+ 
+ #include "pppoe.h"
++#include "pppd/pppd.h"
+ 
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+@@ -27,10 +28,6 @@
+ #include <linux/if_packet.h>
+ #endif
+ 
+-#ifdef HAVE_NET_ETHERNET_H
+-#include <net/ethernet.h>
+-#endif
+-
+ #ifdef HAVE_ASM_TYPES_H
+ #include <asm/types.h>
+ #endif
+@@ -717,6 +714,23 @@ char *xstrdup(const char *s)
+     return ret;
+ }
+ 
++void
++error(char *fmt, ...)
++{
++    va_list pvar;
++
++#if defined(__STDC__)
++    va_start(pvar, fmt);
++#else
++    char *fmt;
++    va_start(pvar);
++    fmt = va_arg(pvar, char *);
++#endif
++
++    fprintf(stderr, fmt, pvar);
++    va_end(pvar);
++}
++
+ void usage(void)
+ {
+     fprintf(stderr, "Usage: pppoe-discovery [options]\n");
+--- a/pppd/plugins/rp-pppoe/Makefile.linux
++++ b/pppd/plugins/rp-pppoe/Makefile.linux
+@@ -33,7 +33,7 @@ pppoe-discovery: pppoe-discovery.o debug
+ 	$(CC) -o pppoe-discovery pppoe-discovery.o debug.o
+ 
+ pppoe-discovery.o: pppoe-discovery.c
+-	$(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
++	$(CC) $(CFLAGS) -I../../.. -c -o pppoe-discovery.o pppoe-discovery.c
+ 
+ debug.o: debug.c
+ 	$(CC) $(CFLAGS) -c -o debug.o debug.c
diff --git a/trunk/package/network/services/ppp/patches/200-makefile.patch b/trunk/package/network/services/ppp/patches/200-makefile.patch
new file mode 100644
index 00000000..5f2eb336
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/200-makefile.patch
@@ -0,0 +1,49 @@
+pppd: tune Linux config defaults for libreCMC
+
+This patch adjusts a number defaults to properly match the libreCMC environment.
+It is not intended for upstream.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/Makefile.linux
++++ b/pppd/Makefile.linux
+@@ -48,7 +48,7 @@ MPPE=y
+ # Uncomment the next line to include support for PPP packet filtering.
+ # This requires that the libpcap library and headers be installed
+ # and that the kernel driver support PPP packet filtering.
+-FILTER=y
++#FILTER=y
+ 
+ # Uncomment the next line to enable multilink PPP (enabled by default)
+ # Linux distributions: Please leave multilink ENABLED in your builds
+@@ -58,7 +58,7 @@ HAVE_MULTILINK=y
+ # Uncomment the next line to enable the TDB database (enabled by default.)
+ # If you enable multilink, then TDB is automatically enabled also.
+ # Linux distributions: Please leave TDB ENABLED in your builds.
+-USE_TDB=y
++#USE_TDB=y
+ 
+ HAS_SHADOW=y
+ #USE_PAM=y
+@@ -80,7 +80,7 @@ MAXOCTETS=y
+ 
+ INCLUDE_DIRS= -I../include
+ 
+-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
++COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP
+ 
+ CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
+ 
+@@ -120,10 +120,10 @@ CFLAGS   += -DHAS_SHADOW
+ #LIBS     += -lshadow $(LIBS)
+ endif
+ 
+-ifneq ($(wildcard /usr/include/crypt.h),)
++#ifneq ($(wildcard /usr/include/crypt.h),)
+ CFLAGS  += -DHAVE_CRYPT_H=1
+ LIBS	+= -lcrypt
+-endif
++#endif
+ 
+ ifdef USE_LIBUTIL
+ CFLAGS	+= -DHAVE_LOGWTMP=1
diff --git a/trunk/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch b/trunk/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
new file mode 100644
index 00000000..0bc42d44
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
@@ -0,0 +1,1495 @@
+pppd: add support for MPPE and MPPC encryption and compression protocols
+
+This is a forward ported version of ppp-2.4.3-mppe-mppc-1.1.patch.gz found on
+http://mppe-mppc.alphacron.de/ .
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/include/linux/ppp-comp.h
++++ b/include/linux/ppp-comp.h
+@@ -36,7 +36,7 @@
+  */
+ 
+ /*
+- *  ==FILEVERSION 20020319==
++ *  ==FILEVERSION 20020715==
+  *
+  *  NOTE TO MAINTAINERS:
+  *     If you modify this file at all, please set the above date.
+@@ -201,6 +201,33 @@ struct compressor {
+ #define CI_MPPE			18	/* config option for MPPE */
+ #define CILEN_MPPE		6	/* length of config option */
+ 
++/* MPPE/MPPC definitions by J.D.*/
++#define MPPE_STATELESS          MPPE_H_BIT	/* configuration bit H */
++#define MPPE_40BIT              MPPE_L_BIT	/* configuration bit L */
++#define MPPE_56BIT              MPPE_M_BIT	/* configuration bit M */
++#define MPPE_128BIT             MPPE_S_BIT	/* configuration bit S */
++#define MPPE_MPPC               MPPE_C_BIT	/* configuration bit C */
++
++/*
++ * Definitions for Stac LZS.
++ */
++
++#define CI_LZS			17	/* config option for Stac LZS */
++#define CILEN_LZS		5	/* length of config option */
++
++#define LZS_OVHD		4	/* max. LZS overhead */
++#define LZS_HIST_LEN		2048	/* LZS history size */
++#define LZS_MAX_CCOUNT		0x0FFF	/* max. coherency counter value */
++
++#define LZS_MODE_NONE		0
++#define LZS_MODE_LCB		1
++#define LZS_MODE_CRC		2
++#define LZS_MODE_SEQ		3
++#define LZS_MODE_EXT		4
++
++#define LZS_EXT_BIT_FLUSHED	0x80	/* bit A */
++#define LZS_EXT_BIT_COMP	0x20	/* bit C */
++
+ /*
+  * Definitions for other, as yet unsupported, compression methods.
+  */
+--- a/include/net/ppp-comp.h
++++ b/include/net/ppp-comp.h
+@@ -168,6 +168,33 @@ struct compressor {
+ #define CI_MPPE			18	/* config option for MPPE */
+ #define CILEN_MPPE		6	/* length of config option */
+ 
++/* MPPE/MPPC definitions by J.D.*/
++#define MPPE_STATELESS          MPPE_H_BIT	/* configuration bit H */
++#define MPPE_40BIT              MPPE_L_BIT	/* configuration bit L */
++#define MPPE_56BIT              MPPE_M_BIT	/* configuration bit M */
++#define MPPE_128BIT             MPPE_S_BIT	/* configuration bit S */
++#define MPPE_MPPC               MPPE_C_BIT	/* configuration bit C */
++
++/*
++ * Definitions for Stac LZS.
++ */
++
++#define CI_LZS			17	/* config option for Stac LZS */
++#define CILEN_LZS		5	/* length of config option */
++
++#define LZS_OVHD		4	/* max. LZS overhead */
++#define LZS_HIST_LEN		2048	/* LZS history size */
++#define LZS_MAX_CCOUNT		0x0FFF	/* max. coherency counter value */
++
++#define LZS_MODE_NONE		0
++#define LZS_MODE_LCB		1
++#define LZS_MODE_CRC		2
++#define LZS_MODE_SEQ		3
++#define LZS_MODE_EXT		4
++
++#define LZS_EXT_BIT_FLUSHED	0x80	/* bit A */
++#define LZS_EXT_BIT_COMP	0x20	/* bit C */
++
+ /*
+  * Definitions for other, as yet unsupported, compression methods.
+  */
+--- a/pppd/ccp.c
++++ b/pppd/ccp.c
+@@ -62,12 +62,10 @@ static int setdeflate __P((char **));
+ static char bsd_value[8];
+ static char deflate_value[8];
+ 
+-/*
+- * Option variables.
+- */
+ #ifdef MPPE
+-bool refuse_mppe_stateful = 1;		/* Allow stateful mode? */
+-#endif
++static int setmppe(char **);
++static int setnomppe(void);
++#endif /* MPPE */
+ 
+ static option_t ccp_option_list[] = {
+     { "noccp", o_bool, &ccp_protent.enabled_flag,
+@@ -108,54 +106,36 @@ static option_t ccp_option_list[] = {
+       "don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
+       &ccp_allowoptions[0].predictor_1 },
+ 
++    { "lzs", o_bool, &ccp_wantoptions[0].lzs,
++      "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_PRIO },
++    { "+lzs", o_bool, &ccp_wantoptions[0].lzs,
++      "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_ALIAS | OPT_PRIO },
++    { "nolzs", o_bool, &ccp_wantoptions[0].lzs,
++      "don't allow Stac LZS", OPT_PRIOSUB | OPT_A2CLR,
++      &ccp_allowoptions[0].lzs },
++    { "-lzs", o_bool, &ccp_wantoptions[0].lzs,
++      "don't allow Stac LZS", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
++      &ccp_allowoptions[0].lzs },
++
+ #ifdef MPPE
+-    /* MPPE options are symmetrical ... we only set wantoptions here */
+-    { "require-mppe", o_bool, &ccp_wantoptions[0].mppe,
+-      "require MPPE encryption",
+-      OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 },
+-    { "+mppe", o_bool, &ccp_wantoptions[0].mppe,
+-      "require MPPE encryption",
+-      OPT_ALIAS | OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 },
+-    { "nomppe", o_bool, &ccp_wantoptions[0].mppe,
+-      "don't allow MPPE encryption", OPT_PRIO },
+-    { "-mppe", o_bool, &ccp_wantoptions[0].mppe,
+-      "don't allow MPPE encryption", OPT_ALIAS | OPT_PRIO },
+-
+-    /* We use ccp_allowoptions[0].mppe as a junk var ... it is reset later */
+-    { "require-mppe-40", o_bool, &ccp_allowoptions[0].mppe,
+-      "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40,
+-      &ccp_wantoptions[0].mppe },
+-    { "+mppe-40", o_bool, &ccp_allowoptions[0].mppe,
+-      "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40,
+-      &ccp_wantoptions[0].mppe },
+-    { "nomppe-40", o_bool, &ccp_allowoptions[0].mppe,
+-      "don't allow MPPE 40-bit encryption",
+-      OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, &ccp_wantoptions[0].mppe },
+-    { "-mppe-40", o_bool, &ccp_allowoptions[0].mppe,
+-      "don't allow MPPE 40-bit encryption",
+-      OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40,
+-      &ccp_wantoptions[0].mppe },
+-
+-    { "require-mppe-128", o_bool, &ccp_allowoptions[0].mppe,
+-      "require MPPE 128-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_128,
+-      &ccp_wantoptions[0].mppe },
+-    { "+mppe-128", o_bool, &ccp_allowoptions[0].mppe,
+-      "require MPPE 128-bit encryption",
+-      OPT_ALIAS | OPT_PRIO | OPT_A2OR | MPPE_OPT_128,
+-      &ccp_wantoptions[0].mppe },
+-    { "nomppe-128", o_bool, &ccp_allowoptions[0].mppe,
+-      "don't allow MPPE 128-bit encryption",
+-      OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, &ccp_wantoptions[0].mppe },
+-    { "-mppe-128", o_bool, &ccp_allowoptions[0].mppe,
+-      "don't allow MPPE 128-bit encryption",
+-      OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128,
+-      &ccp_wantoptions[0].mppe },
+-
+-    /* strange one; we always request stateless, but will we allow stateful? */
+-    { "mppe-stateful", o_bool, &refuse_mppe_stateful,
+-      "allow MPPE stateful mode", OPT_PRIO },
+-    { "nomppe-stateful", o_bool, &refuse_mppe_stateful,
+-      "disallow MPPE stateful mode", OPT_PRIO | 1 },
++    { "mppc", o_bool, &ccp_wantoptions[0].mppc,
++      "request MPPC compression", 1, &ccp_allowoptions[0].mppc },
++    { "+mppc", o_bool, &ccp_wantoptions[0].mppc,
++      "request MPPC compression", 1, &ccp_allowoptions[0].mppc, OPT_ALIAS },
++    { "nomppc", o_bool, &ccp_wantoptions[0].mppc,
++      "don't allow MPPC compression", OPT_PRIOSUB | OPT_A2CLR,
++      &ccp_allowoptions[0].mppc },
++    { "-mppc", o_bool, &ccp_wantoptions[0].mppc,
++      "don't allow MPPC compression", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
++      &ccp_allowoptions[0].mppc },
++    { "mppe", o_special, (void *)setmppe,
++      "request MPPE encryption" },
++    { "+mppe", o_special, (void *)setmppe,
++      "request MPPE encryption" },
++    { "nomppe", o_special_noarg, (void *)setnomppe,
++      "don't allow MPPE encryption" },
++    { "-mppe", o_special_noarg, (void *)setnomppe,
++      "don't allow MPPE encryption" },
+ #endif /* MPPE */
+ 
+     { NULL }
+@@ -241,7 +221,7 @@ static fsm_callbacks ccp_callbacks = {
+  */
+ #define ANY_COMPRESS(opt)	((opt).deflate || (opt).bsd_compress \
+ 				 || (opt).predictor_1 || (opt).predictor_2 \
+-				 || (opt).mppe)
++				 || (opt).lzs || (opt).mppc || (opt).mppe)
+ 
+ /*
+  * Local state (mainly for handling reset-reqs and reset-acks).
+@@ -344,6 +324,100 @@ setdeflate(argv)
+     return 1;
+ }
+ 
++#ifdef MPPE
++/*
++ * Functions called from config options
++ */
++/* 
++   MPPE suboptions:
++	required - require MPPE; disconnect if peer doesn't support it
++	stateless - use stateless mode
++	no40 - disable 40 bit keys
++	no56 - disable 56 bit keys
++	no128 - disable 128 bit keys
++*/
++int setmppe(char **argv)
++{
++    int i;
++    char *str, cmdbuf[16];
++
++    ccp_allowoptions[0].mppe = 1;
++    ccp_allowoptions[0].mppe_40 = 1;
++    ccp_allowoptions[0].mppe_56 = 1;
++    ccp_allowoptions[0].mppe_128 = 1;
++    ccp_allowoptions[0].mppe_stateless = 0;
++    ccp_wantoptions[0].mppe = 0;
++
++    str = *argv;
++
++    while (1) {
++	i = 0;
++	memset(cmdbuf, '\0', 16);
++	while ((i < 16) && (*str != ',') && (*str != '\0'))
++	    cmdbuf[i++] = *str++;
++	cmdbuf[i] = '\0';
++	if (!strncasecmp(cmdbuf, "no40", strlen("no40"))) {
++	    ccp_allowoptions[0].mppe_40 = 0;
++	    goto next_param;
++	} else if (!strncasecmp(cmdbuf, "no56", strlen("no56"))) {
++	    ccp_allowoptions[0].mppe_56 = 0;
++	    goto next_param;
++	} else if (!strncasecmp(cmdbuf, "no128", strlen("no128"))) {
++	    ccp_allowoptions[0].mppe_128 = 0;
++	    goto next_param;
++	} else if (!strncasecmp(cmdbuf, "stateless", strlen("stateless"))) {
++	    ccp_allowoptions[0].mppe_stateless = 1;
++	    goto next_param;
++	} else if (!strncasecmp(cmdbuf, "required", strlen("required"))) {
++	    ccp_wantoptions[0].mppe = 1;
++	    goto next_param;
++	} else {
++	    option_error("invalid parameter '%s' for mppe option", cmdbuf);
++	    return 0;
++	}
++
++    next_param:
++	if (*str == ',') {
++	    str++;
++	    continue;
++	}
++	if (*str == '\0') {
++	    if (!(ccp_allowoptions[0].mppe_40 || ccp_allowoptions[0].mppe_56 ||
++		  ccp_allowoptions[0].mppe_128)) {
++		if (ccp_wantoptions[0].mppe == 1) {
++		    option_error("You require MPPE but you have switched off "
++				 "all encryption key lengths.");
++		    return 0;
++		}
++		ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0;
++		ccp_wantoptions[0].mppe_stateless =
++		    ccp_allowoptions[0].mppe_stateless = 0;
++	    } else {
++		ccp_allowoptions[0].mppe = 1;
++		ccp_wantoptions[0].mppe_stateless =
++		    ccp_allowoptions[0].mppe_stateless;
++		if (ccp_wantoptions[0].mppe == 1) {
++		    ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40;
++		    ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56;
++		    ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128;
++		}
++	    }
++	    return 1;
++	}
++    }
++}
++
++int setnomppe(void)
++{
++    ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0;
++    ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40 = 0;
++    ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56 = 0;
++    ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128 = 0;
++    ccp_wantoptions[0].mppe_stateless = ccp_allowoptions[0].mppe_stateless = 0;
++    return 1;
++}
++#endif /* MPPE */
++
+ /*
+  * ccp_init - initialize CCP.
+  */
+@@ -378,6 +452,30 @@ ccp_init(unit)
+     ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS;
+ 
+     ccp_allowoptions[0].predictor_1 = 1;
++
++    ccp_wantoptions[0].lzs = 0; /* Stac LZS  - will be enabled in the future */
++    ccp_wantoptions[0].lzs_mode = LZS_MODE_SEQ;
++    ccp_wantoptions[0].lzs_hists = 1;
++    ccp_allowoptions[0].lzs = 0; /* Stac LZS  - will be enabled in the future */
++    ccp_allowoptions[0].lzs_mode = LZS_MODE_SEQ;
++    ccp_allowoptions[0].lzs_hists = 1;
++
++#ifdef MPPE
++    /* by default allow and request MPPC... */
++    ccp_wantoptions[0].mppc = ccp_allowoptions[0].mppc = 1;
++
++    /* ... and allow but don't request MPPE */
++    ccp_allowoptions[0].mppe = 1;
++    ccp_allowoptions[0].mppe_40 = 1;
++    ccp_allowoptions[0].mppe_56 = 1;
++    ccp_allowoptions[0].mppe_128 = 1;
++    ccp_allowoptions[0].mppe_stateless = 1;
++    ccp_wantoptions[0].mppe = 0;
++    ccp_wantoptions[0].mppe_40 = 0;
++    ccp_wantoptions[0].mppe_56 = 0;
++    ccp_wantoptions[0].mppe_128 = 0;
++    ccp_wantoptions[0].mppe_stateless = 0;
++#endif /* MPPE */
+ }
+ 
+ /*
+@@ -455,11 +553,11 @@ ccp_input(unit, p, len)
+     if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) {
+ 	notice("Compression disabled by peer.");
+ #ifdef MPPE
+-	if (ccp_gotoptions[unit].mppe) {
++	if (ccp_wantoptions[unit].mppe) {
+ 	    error("MPPE disabled, closing LCP");
+ 	    lcp_close(unit, "MPPE disabled by peer");
+ 	}
+-#endif
++#endif /* MPPE */
+     }
+ 
+     /*
+@@ -487,6 +585,15 @@ ccp_extcode(f, code, id, p, len)
+ 	    break;
+ 	/* send a reset-ack, which the transmitter will see and
+ 	   reset its compression state. */
++
++	/* In case of MPPE/MPPC or LZS we shouldn't send CCP_RESETACK,
++	   but we do it in order to reset compressor; CCP_RESETACK is
++	   then silently discarded. See functions ppp_send_frame and
++	   ppp_ccp_peek in ppp_generic.c (Linux only !!!). All the
++	   confusion is caused by the fact that CCP code is splited
++	   into two parts - one part is handled by pppd, the other one
++	   is handled by kernel. */
++
+ 	fsm_sdata(f, CCP_RESETACK, id, NULL, 0);
+ 	break;
+ 
+@@ -515,12 +622,11 @@ ccp_protrej(unit)
+     fsm_lowerdown(&ccp_fsm[unit]);
+ 
+ #ifdef MPPE
+-    if (ccp_gotoptions[unit].mppe) {
++    if (ccp_wantoptions[unit].mppe) {
+ 	error("MPPE required but peer negotiation failed");
+ 	lcp_close(unit, "MPPE required but peer negotiation failed");
+     }
+-#endif
+-
++#endif /* MPPE */
+ }
+ 
+ /*
+@@ -537,7 +643,7 @@ ccp_resetci(f)
+     all_rejected[f->unit] = 0;
+ 
+ #ifdef MPPE
+-    if (go->mppe) {
++    if (go->mppe || go->mppc) {
+ 	ccp_options *ao = &ccp_allowoptions[f->unit];
+ 	int auth_mschap_bits = auth_done[f->unit];
+ 	int numbits;
+@@ -551,80 +657,109 @@ ccp_resetci(f)
+ 	 * NB: If MPPE is required, all other compression opts are invalid.
+ 	 *     So, we return right away if we can't do it.
+ 	 */
++	if (ccp_wantoptions[f->unit].mppe) {
++	    /* Leave only the mschap auth bits set */
++	    auth_mschap_bits &= (CHAP_MS_WITHPEER  | CHAP_MS_PEER |
++				 CHAP_MS2_WITHPEER | CHAP_MS2_PEER);
++	    /* Count the mschap auths */
++	    auth_mschap_bits >>= CHAP_MS_SHIFT;
++	    numbits = 0;
++	    do {
++		numbits += auth_mschap_bits & 1;
++		auth_mschap_bits >>= 1;
++	    } while (auth_mschap_bits);
++	    if (numbits > 1) {
++		error("MPPE required, but auth done in both directions.");
++		lcp_close(f->unit, "MPPE required but not available");
++		return;
++	    }
++	    if (!numbits) {
++		error("MPPE required, but MS-CHAP[v2] auth not performed.");
++		lcp_close(f->unit, "MPPE required but not available");
++		return;
++	    }
+ 
+-	/* Leave only the mschap auth bits set */
+-	auth_mschap_bits &= (CHAP_MS_WITHPEER  | CHAP_MS_PEER |
+-			     CHAP_MS2_WITHPEER | CHAP_MS2_PEER);
+-	/* Count the mschap auths */
+-	auth_mschap_bits >>= CHAP_MS_SHIFT;
+-	numbits = 0;
+-	do {
+-	    numbits += auth_mschap_bits & 1;
+-	    auth_mschap_bits >>= 1;
+-	} while (auth_mschap_bits);
+-	if (numbits > 1) {
+-	    error("MPPE required, but auth done in both directions.");
+-	    lcp_close(f->unit, "MPPE required but not available");
+-	    return;
+-	}
+-	if (!numbits) {
+-	    error("MPPE required, but MS-CHAP[v2] auth not performed.");
+-	    lcp_close(f->unit, "MPPE required but not available");
+-	    return;
+-	}
+-
+-	/* A plugin (eg radius) may not have obtained key material. */
+-	if (!mppe_keys_set) {
+-	    error("MPPE required, but keys are not available.  "
+-		  "Possible plugin problem?");
+-	    lcp_close(f->unit, "MPPE required but not available");
+-	    return;
+-	}
+-
+-	/* LM auth not supported for MPPE */
+-	if (auth_done[f->unit] & (CHAP_MS_WITHPEER | CHAP_MS_PEER)) {
+-	    /* This might be noise */
+-	    if (go->mppe & MPPE_OPT_40) {
+-		notice("Disabling 40-bit MPPE; MS-CHAP LM not supported");
+-		go->mppe &= ~MPPE_OPT_40;
+-		ccp_wantoptions[f->unit].mppe &= ~MPPE_OPT_40;
++	    /* A plugin (eg radius) may not have obtained key material. */
++	    if (!mppe_keys_set) {
++		error("MPPE required, but keys are not available.  "
++		      "Possible plugin problem?");
++		lcp_close(f->unit, "MPPE required but not available");
++		return;
+ 	    }
+ 	}
+ 
+-	/* Last check: can we actually negotiate something? */
+-	if (!(go->mppe & (MPPE_OPT_40 | MPPE_OPT_128))) {
+-	    /* Could be misconfig, could be 40-bit disabled above. */
+-	    error("MPPE required, but both 40-bit and 128-bit disabled.");
+-	    lcp_close(f->unit, "MPPE required but not available");
+-	    return;
++	/*
++	 * Check whether the kernel knows about the various
++	 * compression methods we might request. Key material
++	 * unimportant here.
++	 */
++	if (go->mppc) {
++	    opt_buf[0] = CI_MPPE;
++	    opt_buf[1] = CILEN_MPPE;
++	    opt_buf[2] = 0;
++	    opt_buf[3] = 0;
++	    opt_buf[4] = 0;
++	    opt_buf[5] = MPPE_MPPC;
++	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 0) <= 0)
++		go->mppc = 0;
++	}
++	if (go->mppe_40) {
++	    opt_buf[0] = CI_MPPE;
++	    opt_buf[1] = CILEN_MPPE;
++	    opt_buf[2] = MPPE_STATELESS;
++	    opt_buf[3] = 0;
++	    opt_buf[4] = 0;
++	    opt_buf[5] = MPPE_40BIT;
++	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
++		go->mppe_40 = 0;
++	}
++	if (go->mppe_56) {
++	    opt_buf[0] = CI_MPPE;
++	    opt_buf[1] = CILEN_MPPE;
++	    opt_buf[2] = MPPE_STATELESS;
++	    opt_buf[3] = 0;
++	    opt_buf[4] = 0;
++	    opt_buf[5] = MPPE_56BIT;
++	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
++		go->mppe_56 = 0;
++	}
++	if (go->mppe_128) {
++	    opt_buf[0] = CI_MPPE;
++	    opt_buf[1] = CILEN_MPPE;
++	    opt_buf[2] = MPPE_STATELESS;
++	    opt_buf[3] = 0;
++	    opt_buf[4] = 0;
++	    opt_buf[5] = MPPE_128BIT;
++	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
++		go->mppe_128 = 0;
++	}
++	if (!go->mppe_40 && !go->mppe_56 && !go->mppe_128) {
++	    if (ccp_wantoptions[f->unit].mppe) {
++		error("MPPE required, but kernel has no support.");
++		lcp_close(f->unit, "MPPE required but not available");
++	    }
++	    go->mppe = go->mppe_stateless = 0;
++	} else {
++	    /* MPPE is not compatible with other compression types */
++	    if (ccp_wantoptions[f->unit].mppe) {
++		ao->bsd_compress = go->bsd_compress = 0;
++		ao->predictor_1  = go->predictor_1  = 0;
++		ao->predictor_2  = go->predictor_2  = 0;
++		ao->deflate	 = go->deflate	    = 0;
++		ao->lzs		 = go->lzs	    = 0;
++	    }
+ 	}
+-
+-	/* sync options */
+-	ao->mppe = go->mppe;
+-	/* MPPE is not compatible with other compression types */
+-	ao->bsd_compress = go->bsd_compress = 0;
+-	ao->predictor_1  = go->predictor_1  = 0;
+-	ao->predictor_2  = go->predictor_2  = 0;
+-	ao->deflate      = go->deflate      = 0;
+     }
+ #endif /* MPPE */
+-
+-    /*
+-     * Check whether the kernel knows about the various
+-     * compression methods we might request.
+-     */
+-#ifdef MPPE
+-    if (go->mppe) {
+-	opt_buf[0] = CI_MPPE;
+-	opt_buf[1] = CILEN_MPPE;
+-	MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
+-	/* Key material unimportant here. */
+-	if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) {
+-	    error("MPPE required, but kernel has no support.");
+-	    lcp_close(f->unit, "MPPE required but not available");
+-	}
++    if (go->lzs) {
++	opt_buf[0] = CI_LZS;
++	opt_buf[1] = CILEN_LZS;
++	opt_buf[2] = go->lzs_hists >> 8;
++	opt_buf[3] = go->lzs_hists & 0xff;
++	opt_buf[4] = LZS_MODE_SEQ;
++	if (ccp_test(f->unit, opt_buf, CILEN_LZS, 0) <= 0)
++	    go->lzs = 0;
+     }
+-#endif
+     if (go->bsd_compress) {
+ 	opt_buf[0] = CI_BSD_COMPRESS;
+ 	opt_buf[1] = CILEN_BSD_COMPRESS;
+@@ -679,7 +814,8 @@ ccp_cilen(f)
+ 	+ (go->deflate? CILEN_DEFLATE: 0)
+ 	+ (go->predictor_1? CILEN_PREDICTOR_1: 0)
+ 	+ (go->predictor_2? CILEN_PREDICTOR_2: 0)
+-	+ (go->mppe? CILEN_MPPE: 0);
++	+ (go->lzs? CILEN_LZS: 0)
++	+ ((go->mppe || go->mppc)? CILEN_MPPE: 0);
+ }
+ 
+ /*
+@@ -693,6 +829,8 @@ ccp_addci(f, p, lenp)
+ {
+     int res;
+     ccp_options *go = &ccp_gotoptions[f->unit];
++    ccp_options *ao = &ccp_allowoptions[f->unit];
++    ccp_options *wo = &ccp_wantoptions[f->unit];
+     u_char *p0 = p;
+ 
+     /*
+@@ -701,22 +839,43 @@ ccp_addci(f, p, lenp)
+      * in case it gets Acked.
+      */
+ #ifdef MPPE
+-    if (go->mppe) {
++    if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) {
+ 	u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
+ 
+-	p[0] = opt_buf[0] = CI_MPPE;
+-	p[1] = opt_buf[1] = CILEN_MPPE;
+-	MPPE_OPTS_TO_CI(go->mppe, &p[2]);
+-	MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
++	p[0] = CI_MPPE;
++	p[1] = CILEN_MPPE;
++	p[2] = (go->mppe_stateless ? MPPE_STATELESS : 0);
++	p[3] = 0;
++	p[4] = 0;
++	p[5] = (go->mppe_40 ? MPPE_40BIT : 0) | (go->mppe_56 ? MPPE_56BIT : 0) |
++	    (go->mppe_128 ? MPPE_128BIT : 0) | (go->mppc ? MPPE_MPPC : 0);
++
++	BCOPY(p, opt_buf, CILEN_MPPE);
+ 	BCOPY(mppe_recv_key, &opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN);
+ 	res = ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0);
+-	if (res > 0)
++	if (res > 0) {
+ 	    p += CILEN_MPPE;
+-	else
++	} else {
+ 	    /* This shouldn't happen, we've already tested it! */
+-	    lcp_close(f->unit, "MPPE required but not available in kernel");
++	    go->mppe = go->mppe_40 = go->mppe_56 = go->mppe_128 =
++		go->mppe_stateless = go->mppc = 0;
++	    if (ccp_wantoptions[f->unit].mppe)
++		lcp_close(f->unit, "MPPE required but not available in kernel");
++	}
++    }
++#endif /* MPPE */
++    if (go->lzs) {
++	p[0] = CI_LZS;
++	p[1] = CILEN_LZS;
++	p[2] = go->lzs_hists >> 8;
++	p[3] = go->lzs_hists & 0xff;
++	p[4] = LZS_MODE_SEQ;
++	res = ccp_test(f->unit, p, CILEN_LZS, 0);
++	if (res > 0) {
++	    p += CILEN_LZS;
++	} else
++	    go->lzs = 0;
+     }
+-#endif
+     if (go->deflate) {
+ 	p[0] = go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT;
+ 	p[1] = CILEN_DEFLATE;
+@@ -802,7 +961,7 @@ ccp_addci(f, p, lenp)
+ 
+ /*
+  * ccp_ackci - process a received configure-ack, and return
+- * 1 iff the packet was OK.
++ * 1 if the packet was OK.
+  */
+ static int
+ ccp_ackci(f, p, len)
+@@ -811,24 +970,44 @@ ccp_ackci(f, p, len)
+     int len;
+ {
+     ccp_options *go = &ccp_gotoptions[f->unit];
++    ccp_options *ao = &ccp_allowoptions[f->unit];
++    ccp_options *wo = &ccp_wantoptions[f->unit];
+     u_char *p0 = p;
+ 
+ #ifdef MPPE
+-    if (go->mppe) {
+-	u_char opt_buf[CILEN_MPPE];
+-
+-	opt_buf[0] = CI_MPPE;
+-	opt_buf[1] = CILEN_MPPE;
+-	MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
+-	if (len < CILEN_MPPE || memcmp(opt_buf, p, CILEN_MPPE))
++    if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) {
++	if (len < CILEN_MPPE
++	    || p[1] != CILEN_MPPE || p[0] != CI_MPPE
++	    || p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0)
++	    || p[3] != 0
++	    || p[4] != 0
++	    || (p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) |
++			 (go->mppc ? MPPE_MPPC : 0))
++		&& p[5] != ((go->mppe_56 ? MPPE_56BIT : 0) |
++			    (go->mppc ? MPPE_MPPC : 0))
++		&& p[5] != ((go->mppe_128 ? MPPE_128BIT : 0) |
++			    (go->mppc ? MPPE_MPPC : 0))))
+ 	    return 0;
++	if (go->mppe_40 || go->mppe_56 || go->mppe_128)
++	    go->mppe = 1;
+ 	p += CILEN_MPPE;
+ 	len -= CILEN_MPPE;
++	/* Cope with first/fast ack */
++	if (p == p0 && len == 0)
++	    return 1;
++    }
++#endif /* MPPE */
++    if (go->lzs) {
++	if (len < CILEN_LZS || p[0] != CI_LZS || p[1] != CILEN_LZS
++	    || p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff)
++	    || p[4] != LZS_MODE_SEQ)
++	    return 0;
++	p += CILEN_LZS;
++	len -= CILEN_LZS;
+ 	/* XXX Cope with first/fast ack */
+-	if (len == 0)
++	if (p == p0 && len == 0)
+ 	    return 1;
+     }
+-#endif
+     if (go->deflate) {
+ 	if (len < CILEN_DEFLATE
+ 	    || p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
+@@ -901,6 +1080,8 @@ ccp_nakci(f, p, len, treat_as_reject)
+     int treat_as_reject;
+ {
+     ccp_options *go = &ccp_gotoptions[f->unit];
++    ccp_options *ao = &ccp_allowoptions[f->unit];
++    ccp_options *wo = &ccp_wantoptions[f->unit];
+     ccp_options no;		/* options we've seen already */
+     ccp_options try;		/* options to ask for next time */
+ 
+@@ -908,28 +1089,100 @@ ccp_nakci(f, p, len, treat_as_reject)
+     try = *go;
+ 
+ #ifdef MPPE
+-    if (go->mppe && len >= CILEN_MPPE
+-	&& p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
+-	no.mppe = 1;
+-	/*
+-	 * Peer wants us to use a different strength or other setting.
+-	 * Fail if we aren't willing to use his suggestion.
+-	 */
+-	MPPE_CI_TO_OPTS(&p[2], try.mppe);
+-	if ((try.mppe & MPPE_OPT_STATEFUL) && refuse_mppe_stateful) {
+-	    error("Refusing MPPE stateful mode offered by peer");
+-	    try.mppe = 0;
+-	} else if (((go->mppe | MPPE_OPT_STATEFUL) & try.mppe) != try.mppe) {
+-	    /* Peer must have set options we didn't request (suggest) */
+-	    try.mppe = 0;
+-	}
++    if ((go->mppe || go->mppc || (!wo->mppe && ao->mppe)) &&
++	len >= CILEN_MPPE && p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
+ 
+-	if (!try.mppe) {
+-	    error("MPPE required but peer negotiation failed");
+-	    lcp_close(f->unit, "MPPE required but peer negotiation failed");
++	if (go->mppc) {
++	    no.mppc = 1;
++	    if (!(p[5] & MPPE_MPPC))
++		try.mppc = 0;
++	}
++
++	if (go->mppe)
++	    no.mppe = 1;
++	if (go->mppe_40)
++	    no.mppe_40 = 1;
++	if (go->mppe_56)
++	    no.mppe_56 = 1;
++	if (go->mppe_128)
++	    no.mppe_128 = 1;
++	if (go->mppe_stateless)
++	    no.mppe_stateless = 1;
++
++	if (ao->mppe_40) {
++	    if ((p[5] & MPPE_40BIT))
++		try.mppe_40 = 1;
++	    else
++		try.mppe_40 = (p[5] == 0) ? 1 : 0;
++	}
++	if (ao->mppe_56) {
++	    if ((p[5] & MPPE_56BIT))
++		try.mppe_56 = 1;
++	    else
++		try.mppe_56 = (p[5] == 0) ? 1 : 0;
++	}
++	if (ao->mppe_128) {
++	    if ((p[5] & MPPE_128BIT))
++		try.mppe_128 = 1;
++	    else
++		try.mppe_128 = (p[5] == 0) ? 1 : 0;
++	}
++
++	if (ao->mppe_stateless) {
++	    if ((p[2] & MPPE_STATELESS) || wo->mppe_stateless)
++		try.mppe_stateless = 1;
++	    else
++		try.mppe_stateless = 0;
++	}
++
++	if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) {
++	    try.mppe = try.mppe_stateless = 0;
++	    if (wo->mppe) {
++		/* we require encryption, but peer doesn't support it
++		   so we close connection */
++		wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
++		    wo->mppe_56 = wo->mppe_128 = 0;
++		lcp_close(f->unit, "MPPE required but cannot negotiate MPPE "
++			  "key length");
++	    }
++        }
++	if (wo->mppe && (wo->mppe_40 != try.mppe_40) &&
++	    (wo->mppe_56 != try.mppe_56) && (wo->mppe_128 != try.mppe_128)) {
++	    /* cannot negotiate key length */
++	    wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
++		wo->mppe_56 = wo->mppe_128 = 0;
++	    lcp_close(f->unit, "Cannot negotiate MPPE key length");
+ 	}
++	if (try.mppe_40 && try.mppe_56 && try.mppe_128)
++	    try.mppe_40 = try.mppe_56 = 0;
++	else
++	    if (try.mppe_56 && try.mppe_128)
++		try.mppe_56 = 0;
++	    else
++		if (try.mppe_40 && try.mppe_128)
++		    try.mppe_40 = 0;
++		else
++		    if (try.mppe_40 && try.mppe_56)
++			try.mppe_40 = 0;
++
++	p += CILEN_MPPE;
++	len -= CILEN_MPPE;
+     }
+ #endif /* MPPE */
++
++    if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) {
++	no.lzs = 1;
++	if (((p[2]<<8)|p[3]) > 1 || (p[4] != LZS_MODE_SEQ &&
++				     p[4] != LZS_MODE_EXT))
++	    try.lzs = 0;
++	else {
++	    try.lzs_mode = p[4];
++	    try.lzs_hists = (p[2] << 8) | p[3];
++	}
++	p += CILEN_LZS;
++	len -= CILEN_LZS;
++    }
++
+     if (go->deflate && len >= CILEN_DEFLATE
+ 	&& p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
+ 	&& p[1] == CILEN_DEFLATE) {
+@@ -1002,14 +1255,50 @@ ccp_rejci(f, p, len)
+ 	return -1;
+ 
+ #ifdef MPPE
+-    if (go->mppe && len >= CILEN_MPPE
++    if ((go->mppe || go->mppc) && len >= CILEN_MPPE
+ 	&& p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
+-	error("MPPE required but peer refused");
+-	lcp_close(f->unit, "MPPE required but peer refused");
++	ccp_options *wo = &ccp_wantoptions[f->unit];
++	if (p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) ||
++	    p[3] != 0 ||
++	    p[4] != 0 ||
++	    p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) |
++		     (go->mppe_56 ? MPPE_56BIT : 0) |
++		     (go->mppe_128 ? MPPE_128BIT : 0) |
++		     (go->mppc ? MPPE_MPPC : 0)))
++	    return 0;
++	if (go->mppc)
++	    try.mppc = 0;
++	if (go->mppe) {
++	    try.mppe = 0;
++	    if (go->mppe_40)
++		try.mppe_40 = 0;
++	    if (go->mppe_56)
++		try.mppe_56 = 0;
++	    if (go->mppe_128)
++		try.mppe_128 = 0;
++	    if (go->mppe_stateless)
++		try.mppe_stateless = 0;
++	    if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128)
++		try.mppe = try.mppe_stateless = 0;
++	    if (wo->mppe) { /* we want MPPE but cannot negotiate key length */
++		wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
++		    wo->mppe_56 = wo->mppe_128 = 0;
++		lcp_close(f->unit, "MPPE required but cannot negotiate MPPE "
++			  "key length");
++	    }
++	}
+ 	p += CILEN_MPPE;
+ 	len -= CILEN_MPPE;
+     }
+-#endif
++#endif /* MPPE */
++    if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) {
++	if (p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) 
++	    || p[4] != go->lzs_mode)
++	    return 0;
++	try.lzs = 0;
++	p += CILEN_LZS;
++	len -= CILEN_LZS;
++    }
+     if (go->deflate_correct && len >= CILEN_DEFLATE
+ 	&& p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) {
+ 	if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size)
+@@ -1073,14 +1362,15 @@ ccp_reqci(f, p, lenp, dont_nak)
+     int dont_nak;
+ {
+     int ret, newret, res;
+-    u_char *p0, *retp;
++    u_char *p0, *retp, p2, p5;
+     int len, clen, type, nb;
+     ccp_options *ho = &ccp_hisoptions[f->unit];
+     ccp_options *ao = &ccp_allowoptions[f->unit];
++    ccp_options *wo = &ccp_wantoptions[f->unit];
+ #ifdef MPPE
+-    bool rej_for_ci_mppe = 1;	/* Are we rejecting based on a bad/missing */
+-				/* CI_MPPE, or due to other options?       */
+-#endif
++    u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
++/*     int mtu; */
++#endif /* MPPE */
+ 
+     ret = CONFACK;
+     retp = p0 = p;
+@@ -1103,106 +1393,302 @@ ccp_reqci(f, p, lenp, dont_nak)
+ 	    switch (type) {
+ #ifdef MPPE
+ 	    case CI_MPPE:
+-		if (!ao->mppe || clen != CILEN_MPPE) {
++ 		if ((!ao->mppc && !ao->mppe) || clen != CILEN_MPPE) {
+ 		    newret = CONFREJ;
+ 		    break;
+ 		}
+-		MPPE_CI_TO_OPTS(&p[2], ho->mppe);
+-
+-		/* Nak if anything unsupported or unknown are set. */
+-		if (ho->mppe & MPPE_OPT_UNSUPPORTED) {
+-		    newret = CONFNAK;
+-		    ho->mppe &= ~MPPE_OPT_UNSUPPORTED;
+-		}
+-		if (ho->mppe & MPPE_OPT_UNKNOWN) {
++ 		p2 = p[2];
++ 		p5 = p[5];
++ 		/* not sure what they want, tell 'em what we got */
++ 		if (((p[2] & ~MPPE_STATELESS) != 0 || p[3] != 0 || p[4] != 0 ||
++ 		     (p[5] & ~(MPPE_40BIT | MPPE_56BIT | MPPE_128BIT |
++ 			       MPPE_MPPC)) != 0 || p[5] == 0) ||
++ 		    (p[2] == 0 && p[3] == 0 && p[4] == 0 &&  p[5] == 0)) {
+ 		    newret = CONFNAK;
+-		    ho->mppe &= ~MPPE_OPT_UNKNOWN;
+-		}
+-
+-		/* Check state opt */
+-		if (ho->mppe & MPPE_OPT_STATEFUL) {
+-		    /*
+-		     * We can Nak and request stateless, but it's a
+-		     * lot easier to just assume the peer will request
+-		     * it if he can do it; stateful mode is bad over
+-		     * the Internet -- which is where we expect MPPE.
+-		     */
+-		   if (refuse_mppe_stateful) {
+-			error("Refusing MPPE stateful mode offered by peer");
+-			newret = CONFREJ;
+-			break;
++ 		    p[2] = (wo->mppe_stateless ? MPPE_STATELESS : 0);
++		    p[3] = 0;
++ 		    p[4] = 0;
++ 		    p[5] = (wo->mppe_40 ? MPPE_40BIT : 0) |
++ 			(wo->mppe_56 ? MPPE_56BIT : 0) |
++ 			(wo->mppe_128 ? MPPE_128BIT : 0) |
++ 			(wo->mppc ? MPPE_MPPC : 0);
++ 		    break;
++  		}
++
++ 		if ((p[5] & MPPE_MPPC)) {
++ 		    if (ao->mppc) {
++ 			ho->mppc = 1;
++ 			BCOPY(p, opt_buf, CILEN_MPPE);
++ 			opt_buf[2] = opt_buf[3] = opt_buf[4] = 0;
++ 			opt_buf[5] = MPPE_MPPC;
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 1) <= 0) {
++ 			    ho->mppc = 0;
++ 			    p[5] &= ~MPPE_MPPC;
++ 			    newret = CONFNAK;
++ 			}
++ 		    } else {
++		      newret = CONFREJ;
++ 			if (wo->mppe || ao->mppe) {
++ 			    p[5] &= ~MPPE_MPPC;
++ 			    newret = CONFNAK;
++ 			}
+ 		    }
+ 		}
+-
+-		/* Find out which of {S,L} are set. */
+-		if ((ho->mppe & MPPE_OPT_128)
+-		     && (ho->mppe & MPPE_OPT_40)) {
+-		    /* Both are set, negotiate the strongest. */
+-		    newret = CONFNAK;
+-		    if (ao->mppe & MPPE_OPT_128)
+-			ho->mppe &= ~MPPE_OPT_40;
+-		    else if (ao->mppe & MPPE_OPT_40)
+-			ho->mppe &= ~MPPE_OPT_128;
+-		    else {
+-			newret = CONFREJ;
+-			break;
+-		    }
+-		} else if (ho->mppe & MPPE_OPT_128) {
+-		    if (!(ao->mppe & MPPE_OPT_128)) {
+-			newret = CONFREJ;
+-			break;
+-		    }
+-		} else if (ho->mppe & MPPE_OPT_40) {
+-		    if (!(ao->mppe & MPPE_OPT_40)) {
+-			newret = CONFREJ;
+-			break;
+-		    }
++ 		if (ao->mppe)
++ 		    ho->mppe = 1;
++ 
++ 		if ((p[2] & MPPE_STATELESS)) {
++ 		    if (ao->mppe_stateless) {
++ 			if (wo->mppe_stateless)
++ 			    ho->mppe_stateless = 1;
++ 			else {
++ 			    newret = CONFNAK;
++ 			    if (!dont_nak)
++ 				p[2] &= ~MPPE_STATELESS;
++ 			}
++ 		    } else {
++ 			newret = CONFNAK;
++ 			if (!dont_nak)
++ 			    p[2] &= ~MPPE_STATELESS;
++ 		    }
++ 		} else {
++ 		    if (wo->mppe_stateless && !dont_nak) {
++ 			wo->mppe_stateless = 0;
++ 			newret = CONFNAK;
++ 			p[2] |= MPPE_STATELESS;
++  		    }
++  		}
++  
++ 		if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT|MPPE_128BIT)) {
++  		    newret = CONFNAK;
++ 		    if (ao->mppe_128) {
++ 			ho->mppe_128 = 1;
++ 			p[5] &= ~(MPPE_40BIT|MPPE_56BIT);
++ 			BCOPY(p, opt_buf, CILEN_MPPE);
++ 			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
++ 			      MPPE_MAX_KEY_LEN);
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
++ 				     MPPE_MAX_KEY_LEN, 1) <= 0) {
++ 			    ho->mppe_128 = 0;
++ 			    p[5] |= (MPPE_40BIT|MPPE_56BIT);
++ 			    p[5] &= ~MPPE_128BIT;
++ 			    goto check_mppe_56_40;
++ 			}
++ 			goto check_mppe;
++  		    }
++ 		    p[5] &= ~MPPE_128BIT;
++ 		    goto check_mppe_56_40;
++ 		}
++ 		if ((p[5] & ~MPPE_MPPC) == (MPPE_56BIT|MPPE_128BIT)) {
++ 		    newret = CONFNAK;
++ 		    if (ao->mppe_128) {
++ 			ho->mppe_128 = 1;
++ 			p[5] &= ~MPPE_56BIT;
++ 			BCOPY(p, opt_buf, CILEN_MPPE);
++			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
++ 			      MPPE_MAX_KEY_LEN);
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
++ 				     MPPE_MAX_KEY_LEN, 1) <= 0) {
++ 			    ho->mppe_128 = 0;
++ 			    p[5] |= MPPE_56BIT;
++ 			    p[5] &= ~MPPE_128BIT;
++ 			    goto check_mppe_56;
++ 			}
++ 			goto check_mppe;
++  		    }
++ 		    p[5] &= ~MPPE_128BIT;
++ 		    goto check_mppe_56;
++ 		}
++ 		if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_128BIT)) {
++ 		    newret = CONFNAK;
++ 		    if (ao->mppe_128) {
++ 			ho->mppe_128 = 1;
++ 			p[5] &= ~MPPE_40BIT;
++ 			BCOPY(p, opt_buf, CILEN_MPPE);
++ 			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
++ 			      MPPE_MAX_KEY_LEN);
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
++ 				     MPPE_MAX_KEY_LEN, 1) <= 0) {
++ 			    ho->mppe_128 = 0;
++ 			    p[5] |= MPPE_40BIT;
++ 			    p[5] &= ~MPPE_128BIT;
++ 			    goto check_mppe_40;
++ 			}
++ 			goto check_mppe;
++ 		    }
++ 		    p[5] &= ~MPPE_128BIT;
++ 		    goto check_mppe_40;
++ 		}
++ 		if ((p[5] & ~MPPE_MPPC) == MPPE_128BIT) {
++ 		    if (ao->mppe_128) {
++ 			ho->mppe_128 = 1;
++ 			BCOPY(p, opt_buf, CILEN_MPPE);
++ 			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
++ 			      MPPE_MAX_KEY_LEN);
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
++ 				     MPPE_MAX_KEY_LEN, 1) <= 0) {
++ 			    ho->mppe_128 = 0;
++ 			    p[5] &= ~MPPE_128BIT;
++ 			    newret = CONFNAK;
++ 			}
++ 			goto check_mppe;
++ 		    }
++		    p[5] &= ~MPPE_128BIT;
++ 		    newret = CONFNAK;
++ 		    goto check_mppe;
++ 		}
++ 	    check_mppe_56_40:
++		if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT)) {
++ 		    newret = CONFNAK;
++ 		    if (ao->mppe_56) {
++ 			ho->mppe_56 = 1;
++ 			p[5] &= ~MPPE_40BIT;
++			BCOPY(p, opt_buf, CILEN_MPPE);
++ 			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
++ 			      MPPE_MAX_KEY_LEN);
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
++				     MPPE_MAX_KEY_LEN, 1) <= 0) {
++ 			    ho->mppe_56 = 0;
++ 			    p[5] |= MPPE_40BIT;
++ 			    p[5] &= ~MPPE_56BIT;
++			    newret = CONFNAK;
++ 			    goto check_mppe_40;
++ 			}
++			goto check_mppe;
++ 		    }
++		    p[5] &= ~MPPE_56BIT;
++ 		    goto check_mppe_40;
++ 		}
++ 	    check_mppe_56:
++		if ((p[5] & ~MPPE_MPPC) == MPPE_56BIT) {
++ 		    if (ao->mppe_56) {
++ 			ho->mppe_56 = 1;
++ 			BCOPY(p, opt_buf, CILEN_MPPE);
++ 			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
++			      MPPE_MAX_KEY_LEN);
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
++ 				     MPPE_MAX_KEY_LEN, 1) <= 0) {
++ 			    ho->mppe_56 = 0;
++ 			    p[5] &= ~MPPE_56BIT;
++			    newret = CONFNAK;
++ 			}
++			goto check_mppe;
++ 		    }
++ 		    p[5] &= ~MPPE_56BIT;
++ 		    newret = CONFNAK;
++		    goto check_mppe;
++ 		}
++ 	    check_mppe_40:
++		if ((p[5] & ~MPPE_MPPC) == MPPE_40BIT) {
++ 		    if (ao->mppe_40) {
++ 			ho->mppe_40 = 1;
++ 			BCOPY(p, opt_buf, CILEN_MPPE);
++			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
++ 			      MPPE_MAX_KEY_LEN);
++ 			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
++ 				     MPPE_MAX_KEY_LEN, 1) <= 0) {
++ 			    ho->mppe_40 = 0;
++			    p[5] &= ~MPPE_40BIT;
++ 			    newret = CONFNAK;
++ 			}
++ 			goto check_mppe;
++ 		    }
++ 		    p[5] &= ~MPPE_40BIT;
++ 		}
++ 
++ 	    check_mppe:
++ 		if (!ho->mppe_40 && !ho->mppe_56 && !ho->mppe_128) {
++ 		    if (wo->mppe_40 || wo->mppe_56 || wo->mppe_128) {
++ 			newret = CONFNAK;
++ 			p[2] |= (wo->mppe_stateless ? MPPE_STATELESS : 0);
++			p[5] |= (wo->mppe_40 ? MPPE_40BIT : 0) |
++ 			    (wo->mppe_56 ? MPPE_56BIT : 0) |
++ 			    (wo->mppe_128 ? MPPE_128BIT : 0) |
++ 			    (wo->mppc ? MPPE_MPPC : 0);
++ 		    } else {
++ 			ho->mppe = ho->mppe_stateless = 0;
++ 		    }
+ 		} else {
+-		    /* Neither are set. */
+-		    /* We cannot accept this.  */
+-		    newret = CONFNAK;
+-		    /* Give the peer our idea of what can be used,
+-		       so it can choose and confirm */
+-		    ho->mppe = ao->mppe;
+-		}
+-
+-		/* rebuild the opts */
+-		MPPE_OPTS_TO_CI(ho->mppe, &p[2]);
+-		if (newret == CONFACK) {
+-		    u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
+-		    int mtu;
+-
+-		    BCOPY(p, opt_buf, CILEN_MPPE);
+-		    BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
+-			  MPPE_MAX_KEY_LEN);
+-		    if (ccp_test(f->unit, opt_buf,
+-				 CILEN_MPPE + MPPE_MAX_KEY_LEN, 1) <= 0) {
+-			/* This shouldn't happen, we've already tested it! */
+-			error("MPPE required, but kernel has no support.");
+-			lcp_close(f->unit, "MPPE required but not available");
+-			newret = CONFREJ;
+-			break;
+-		    }
+-		    /*
+-		     * We need to decrease the interface MTU by MPPE_PAD
+-		     * because MPPE frames **grow**.  The kernel [must]
+-		     * allocate MPPE_PAD extra bytes in xmit buffers.
+-		     */
+-		    mtu = netif_get_mtu(f->unit);
+-		    if (mtu)
+-			netif_set_mtu(f->unit, mtu - MPPE_PAD);
+-		    else
+-			newret = CONFREJ;
+-		}
+-
+-		/*
+-		 * We have accepted MPPE or are willing to negotiate
+-		 * MPPE parameters.  A CONFREJ is due to subsequent
+-		 * (non-MPPE) processing.
+-		 */
+-		rej_for_ci_mppe = 0;
+-		break;
+-#endif /* MPPE */
++ 		    /* MPPE is not compatible with other compression types */
++ 		    if (wo->mppe) {
++ 			ao->bsd_compress = 0;
++ 			ao->predictor_1 = 0;
++ 			ao->predictor_2 = 0;
++			ao->deflate = 0;
++ 			ao->lzs = 0;
++ 		    }
++ 		}
++ 		if ((!ho->mppc || !ao->mppc) && !ho->mppe) {
++ 		    p[2] = p2;
++ 		    p[5] = p5;
++  		    newret = CONFREJ;
++  		    break;
++  		}
++  
++ 		/*
++ 		 * I have commented the code below because according to RFC1547
++ 		 * MTU is only information for higher level protocols about
++ 		 * "the maximum allowable length for a packet (q.v.) transmitted
++ 		 * over a point-to-point link without incurring network layer
++ 		 * fragmentation." Of course a PPP implementation should be able
++ 		 * to handle overhead added by MPPE - in our case apropriate code
++ 		 * is located in drivers/net/ppp_generic.c in the kernel sources.
++		 *
++ 		 * According to RFC1661:
++ 		 * - when negotiated MRU is less than 1500 octets, a PPP
++ 		 *   implementation must still be able to receive at least 1500
++ 		 *   octets,
++ 		 * - when PFC is negotiated, a PPP implementation is still
++ 		 *   required to receive frames with uncompressed protocol field.
++		 *
++ 		 * So why not to handle MPPE overhead without changing MTU value?
++ 		 * I am sure that RFC3078, unfortunately silently, assumes that.
++ 		 */
++ 
++ 		/*
++ 		 * We need to decrease the interface MTU by MPPE_PAD
++ 		 * because MPPE frames **grow**.  The kernel [must]
++ 		 * allocate MPPE_PAD extra bytes in xmit buffers.
++ 		 */
++ /*
++ 		mtu = netif_get_mtu(f->unit);
++ 		if (mtu) {
++ 		    netif_set_mtu(f->unit, mtu - MPPE_PAD);
++ 		} else {
++		    newret = CONFREJ;
++ 		    if (ccp_wantoptions[f->unit].mppe) {
++ 			error("Cannot adjust MTU needed by MPPE.");
++ 			lcp_close(f->unit, "Cannot adjust MTU needed by MPPE.");
++ 		    }
++ 		}
++ */
++ 		break;
++  #endif /* MPPE */
++ 
++	    case CI_LZS:
++ 		if (!ao->lzs || clen != CILEN_LZS) {
++ 		    newret = CONFREJ;
++ 		    break;
++ 		}
++ 
++ 		ho->lzs = 1;
++		ho->lzs_hists = (p[2] << 8) | p[3];
++ 		ho->lzs_mode = p[4];
++	if ((ho->lzs_hists != ao->lzs_hists) ||
++		    (ho->lzs_mode != ao->lzs_mode)) {
++ 		    newret = CONFNAK;
++ 		    if (!dont_nak) {
++ 			p[2] = ao->lzs_hists >> 8;
++ 			p[3] = ao->lzs_hists & 0xff;
++ 			p[4] = ao->lzs_mode;
++	    } else
++ 			break;
++ 		}
++ 
++ 		if (p == p0 && ccp_test(f->unit, p, CILEN_LZS, 1) <= 0) {
++ 		    newret = CONFREJ;
++ 		}
++ 		break;
+ 	    case CI_DEFLATE:
+ 	    case CI_DEFLATE_DRAFT:
+ 		if (!ao->deflate || clen != CILEN_DEFLATE
+@@ -1344,12 +1830,6 @@ ccp_reqci(f, p, lenp, dont_nak)
+ 	else
+ 	    *lenp = retp - p0;
+     }
+-#ifdef MPPE
+-    if (ret == CONFREJ && ao->mppe && rej_for_ci_mppe) {
+-	error("MPPE required but peer negotiation failed");
+-	lcp_close(f->unit, "MPPE required but peer negotiation failed");
+-    }
+-#endif
+     return ret;
+ }
+ 
+@@ -1371,24 +1851,35 @@ method_name(opt, opt2)
+ 	char *p = result;
+ 	char *q = result + sizeof(result); /* 1 past result */
+ 
+-	slprintf(p, q - p, "MPPE ");
+-	p += 5;
+-	if (opt->mppe & MPPE_OPT_128) {
+-	    slprintf(p, q - p, "128-bit ");
+-	    p += 8;
+-	}
+-	if (opt->mppe & MPPE_OPT_40) {
+-	    slprintf(p, q - p, "40-bit ");
+-	    p += 7;
+-	}
+-	if (opt->mppe & MPPE_OPT_STATEFUL)
+-	    slprintf(p, q - p, "stateful");
+-	else
+-	    slprintf(p, q - p, "stateless");
+-
++	if (opt->mppe) {
++	    if (opt->mppc) {
++		slprintf(p, q - p, "MPPC/MPPE ");
++		p += 10;
++	    } else {
++		slprintf(p, q - p, "MPPE ");
++		p += 5;
++	    }
++	    if (opt->mppe_128) {
++		slprintf(p, q - p, "128-bit ");
++		p += 8;
++	    } else if (opt->mppe_56) {
++		slprintf(p, q - p, "56-bit ");
++		p += 7;
++	    } else if (opt->mppe_40) {
++		slprintf(p, q - p, "40-bit ");
++		p += 7;
++	    }
++	    if (opt->mppe_stateless)
++		slprintf(p, q - p, "stateless");
++	    else
++		slprintf(p, q - p, "stateful");
++	} else if (opt->mppc)
++	    slprintf(p, q - p, "MPPC");
+ 	break;
+     }
+-#endif
++#endif /* MPPE */
++    case CI_LZS:
++	return "Stac LZS";
+     case CI_DEFLATE:
+     case CI_DEFLATE_DRAFT:
+ 	if (opt2 != NULL && opt2->deflate_size != opt->deflate_size)
+@@ -1444,12 +1935,12 @@ ccp_up(f)
+     } else if (ANY_COMPRESS(*ho))
+ 	notice("%s transmit compression enabled", method_name(ho, NULL));
+ #ifdef MPPE
+-    if (go->mppe) {
++    if (go->mppe || go->mppc) {
+ 	BZERO(mppe_recv_key, MPPE_MAX_KEY_LEN);
+ 	BZERO(mppe_send_key, MPPE_MAX_KEY_LEN);
+ 	continue_networks(f->unit);		/* Bring up IP et al */
+     }
+-#endif
++#endif /* MPPE */
+ }
+ 
+ /*
+@@ -1472,7 +1963,7 @@ ccp_down(f)
+ 	    lcp_close(f->unit, "MPPE disabled");
+ 	}
+     }
+-#endif
++#endif /* MPPE */
+ }
+ 
+ /*
+@@ -1532,24 +2023,28 @@ ccp_printpkt(p, plen, printer, arg)
+ #ifdef MPPE
+ 	    case CI_MPPE:
+ 		if (optlen >= CILEN_MPPE) {
+-		    u_char mppe_opts;
+-
+-		    MPPE_CI_TO_OPTS(&p[2], mppe_opts);
+-		    printer(arg, "mppe %s %s %s %s %s %s%s",
+-			    (p[2] & MPPE_H_BIT)? "+H": "-H",
+-			    (p[5] & MPPE_M_BIT)? "+M": "-M",
+-			    (p[5] & MPPE_S_BIT)? "+S": "-S",
+-			    (p[5] & MPPE_L_BIT)? "+L": "-L",
++		    printer(arg, "mppe %s %s %s %s %s %s",
++			    (p[2] & MPPE_STATELESS)? "+H": "-H",
++			    (p[5] & MPPE_56BIT)? "+M": "-M",
++			    (p[5] & MPPE_128BIT)? "+S": "-S",
++			    (p[5] & MPPE_40BIT)? "+L": "-L",
+ 			    (p[5] & MPPE_D_BIT)? "+D": "-D",
+-			    (p[5] & MPPE_C_BIT)? "+C": "-C",
+-			    (mppe_opts & MPPE_OPT_UNKNOWN)? " +U": "");
+-		    if (mppe_opts & MPPE_OPT_UNKNOWN)
++			    (p[5] & MPPE_MPPC)? "+C": "-C");
++		    if ((p[5] & ~(MPPE_56BIT | MPPE_128BIT | MPPE_40BIT |
++				  MPPE_D_BIT | MPPE_MPPC)) ||
++			(p[2] & ~MPPE_STATELESS))
+ 			printer(arg, " (%.2x %.2x %.2x %.2x)",
+ 				p[2], p[3], p[4], p[5]);
+ 		    p += CILEN_MPPE;
+ 		}
+ 		break;
+-#endif
++#endif /* MPPE */
++	    case CI_LZS:
++		if (optlen >= CILEN_LZS) {
++		    printer(arg, "lzs %.2x %.2x %.2x", p[2], p[3], p[4]);
++		    p += CILEN_LZS;
++		}
++		break;
+ 	    case CI_DEFLATE:
+ 	    case CI_DEFLATE_DRAFT:
+ 		if (optlen >= CILEN_DEFLATE) {
+@@ -1635,6 +2130,7 @@ ccp_datainput(unit, pkt, len)
+ 	    error("Lost compression sync: disabling compression");
+ 	    ccp_close(unit, "Lost compression sync");
+ #ifdef MPPE
++	    /* My module dosn't need this. J.D., 2003-07-06 */
+ 	    /*
+ 	     * If we were doing MPPE, we must also take the link down.
+ 	     */
+@@ -1642,9 +2138,18 @@ ccp_datainput(unit, pkt, len)
+ 		error("Too many MPPE errors, closing LCP");
+ 		lcp_close(unit, "Too many MPPE errors");
+ 	    }
+-#endif
++#endif /* MPPE */
+ 	} else {
+ 	    /*
++	     * When LZS or MPPE/MPPC is negotiated we just send CCP_RESETREQ
++	     * and don't wait for CCP_RESETACK
++	     */
++	    if ((ccp_gotoptions[f->unit].method == CI_LZS) ||
++		(ccp_gotoptions[f->unit].method == CI_MPPE)) {
++		fsm_sdata(f, CCP_RESETREQ, f->reqid = ++f->id, NULL, 0);
++		return;
++	    }
++	    /*
+ 	     * Send a reset-request to reset the peer's compressor.
+ 	     * We don't do that if we are still waiting for an
+ 	     * acknowledgement to a previous reset-request.
+--- a/pppd/ccp.h
++++ b/pppd/ccp.h
+@@ -37,9 +37,17 @@ typedef struct ccp_options {
+     bool predictor_2;		/* do Predictor-2? */
+     bool deflate_correct;	/* use correct code for deflate? */
+     bool deflate_draft;		/* use draft RFC code for deflate? */
++    bool lzs;			/* do Stac LZS? */
++    bool mppc;			/* do MPPC? */
+     bool mppe;			/* do MPPE? */
++    bool mppe_40;		/* allow 40 bit encryption? */
++    bool mppe_56;		/* allow 56 bit encryption? */
++    bool mppe_128;		/* allow 128 bit encryption? */
++    bool mppe_stateless;	/* allow stateless encryption */
+     u_short bsd_bits;		/* # bits/code for BSD Compress */
+     u_short deflate_size;	/* lg(window size) for Deflate */
++    u_short lzs_mode;		/* LZS check mode */
++    u_short lzs_hists;		/* number of LZS histories */
+     short method;		/* code for chosen compression method */
+ } ccp_options;
+ 
+--- a/pppd/chap_ms.c
++++ b/pppd/chap_ms.c
+@@ -963,13 +963,17 @@ set_mppe_enc_types(int policy, int types
+     /*
+      * Disable undesirable encryption types.  Note that we don't ENABLE
+      * any encryption types, to avoid overriding manual configuration.
++     *
++     * It seems that 56 bit keys are unsupported in MS-RADIUS (see RFC 2548)
+      */
+     switch(types) {
+ 	case MPPE_ENC_TYPES_RC4_40:
+-	    ccp_wantoptions[0].mppe &= ~MPPE_OPT_128;	/* disable 128-bit */
++	    ccp_wantoptions[0].mppe_128 = 0;	/* disable 128-bit */
++	    ccp_wantoptions[0].mppe_56 = 0;	/* disable 56-bit */
+ 	    break;
+ 	case MPPE_ENC_TYPES_RC4_128:
+-	    ccp_wantoptions[0].mppe &= ~MPPE_OPT_40;	/* disable 40-bit */
++	    ccp_wantoptions[0].mppe_56 = 0;	/* disable 56-bit */
++	    ccp_wantoptions[0].mppe_40 = 0;	/* disable 40-bit */
+ 	    break;
+ 	default:
+ 	    break;
diff --git a/trunk/package/network/services/ppp/patches/202-no_strip.patch b/trunk/package/network/services/ppp/patches/202-no_strip.patch
new file mode 100644
index 00000000..375f4490
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/202-no_strip.patch
@@ -0,0 +1,88 @@
+build: Do not strip binaries on install
+
+Strippign executables should be handled by the distro packaging, not by ppp
+itself. This patch removes the "-s" (strip) switch from all "install" commands
+in order to install unstripped binaries into the destination prefix.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/chat/Makefile.linux
++++ b/chat/Makefile.linux
+@@ -25,7 +25,7 @@ chat.o:	chat.c
+ 
+ install: chat
+ 	mkdir -p $(BINDIR) $(MANDIR)
+-	$(INSTALL) -s -c chat $(BINDIR)
++	$(INSTALL) -c chat $(BINDIR)
+ 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
+ 
+ clean:
+--- a/pppd/Makefile.linux
++++ b/pppd/Makefile.linux
+@@ -102,7 +102,7 @@ ifdef USE_SRP
+ CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
+ LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
+ TARGETS	+= srp-entry
+-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
++EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
+ MANPAGES += srp-entry.8
+ EXTRACLEAN += srp-entry.o
+ NEEDDES=y
+@@ -208,7 +208,7 @@ all: $(TARGETS)
+ install: pppd
+ 	mkdir -p $(BINDIR) $(MANDIR)
+ 	$(EXTRAINSTALL)
+-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
++	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
+ 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
+ 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
+ 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
+--- a/pppd/plugins/radius/Makefile.linux
++++ b/pppd/plugins/radius/Makefile.linux
+@@ -36,9 +36,9 @@ all: $(PLUGIN)
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(LIBDIR)
+-	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
+-	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
+-	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
++	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
++	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
++	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
+ 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
+ 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
+ 
+--- a/pppd/plugins/rp-pppoe/Makefile.linux
++++ b/pppd/plugins/rp-pppoe/Makefile.linux
+@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o c
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(LIBDIR)
+-	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
++	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
+ 	$(INSTALL) -d -m 755 $(BINDIR)
+-	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
++	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
+ 
+ clean:
+ 	rm -f *.o *.so pppoe-discovery
+--- a/pppdump/Makefile.linux
++++ b/pppdump/Makefile.linux
+@@ -17,5 +17,5 @@ clean:
+ 
+ install:
+ 	mkdir -p $(BINDIR) $(MANDIR)
+-	$(INSTALL) -s -c pppdump $(BINDIR)
++	$(INSTALL) -c pppdump $(BINDIR)
+ 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
+--- a/pppstats/Makefile.linux
++++ b/pppstats/Makefile.linux
+@@ -22,7 +22,7 @@ all: pppstats
+ 
+ install: pppstats
+ 	-mkdir -p $(MANDIR)
+-	$(INSTALL) -s -c pppstats $(BINDIR)
++	$(INSTALL) -c pppstats $(BINDIR)
+ 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
+ 
+ pppstats: $(PPPSTATSRCS)
diff --git a/trunk/package/network/services/ppp/patches/203-opt_flags.patch b/trunk/package/network/services/ppp/patches/203-opt_flags.patch
new file mode 100644
index 00000000..906d081c
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/203-opt_flags.patch
@@ -0,0 +1,32 @@
+build: Move optimization flags into a separate variable
+
+Isolate optimization related compiler flags from CFLAGS and move them into a
+separate COPTS variable so that it is easier to override optimizations from
+the environment.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/plugins/radius/Makefile.linux
++++ b/pppd/plugins/radius/Makefile.linux
+@@ -12,7 +12,8 @@ VERSION = $(shell awk -F '"' '/VERSION/
+ INSTALL	= install
+ 
+ PLUGIN=radius.so radattr.so radrealms.so
+-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
++COPTS = -O2
++CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
+ 
+ # Uncomment the next line to include support for Microsoft's
+ # MS-CHAP authentication protocol.
+--- a/pppdump/Makefile.linux
++++ b/pppdump/Makefile.linux
+@@ -2,7 +2,8 @@ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+ MANDIR = $(DESTDIR)/share/man/man8
+ 
+-CFLAGS= -O -I../include/net
++COPTS = -O
++CFLAGS= $(COPTS) -I../include/net
+ OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
+ 
+ INSTALL= install
diff --git a/trunk/package/network/services/ppp/patches/204-radius_config.patch b/trunk/package/network/services/ppp/patches/204-radius_config.patch
new file mode 100644
index 00000000..c97a5350
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/204-radius_config.patch
@@ -0,0 +1,72 @@
+--- a/pppd/plugins/radius/config.c
++++ b/pppd/plugins/radius/config.c
+@@ -369,31 +369,37 @@ static int test_config(char *filename)
+ 	}
+ #endif
+ 
++#if 0
+ 	if (rc_conf_int("login_tries") <= 0)
+ 	{
+ 		error("%s: login_tries <= 0 is illegal", filename);
+ 		return (-1);
+ 	}
++#endif
+ 	if (rc_conf_str("seqfile") == NULL)
+ 	{
+ 		error("%s: seqfile not specified", filename);
+ 		return (-1);
+ 	}
++#if 0
+ 	if (rc_conf_int("login_timeout") <= 0)
+ 	{
+ 		error("%s: login_timeout <= 0 is illegal", filename);
+ 		return (-1);
+ 	}
++#endif
+ 	if (rc_conf_str("mapfile") == NULL)
+ 	{
+ 		error("%s: mapfile not specified", filename);
+ 		return (-1);
+ 	}
++#if 0
+ 	if (rc_conf_str("nologin") == NULL)
+ 	{
+ 		error("%s: nologin not specified", filename);
+ 		return (-1);
+ 	}
++#endif
+ 
+ 	return 0;
+ }
+--- a/pppd/plugins/radius/options.h
++++ b/pppd/plugins/radius/options.h
+@@ -31,24 +31,21 @@ typedef struct _option {
+ static SERVER acctserver = {0};
+ static SERVER authserver = {0};
+ 
+-int default_tries = 4;
+-int default_timeout = 60;
+-
+ static OPTION config_options[] = {
+ /* internally used options */
+ {"config_file",		OT_STR, ST_UNDEF, NULL},
+ /* General options */
+ {"auth_order",	 	OT_AUO, ST_UNDEF, NULL},
+-{"login_tries",	 	OT_INT, ST_UNDEF, &default_tries},
+-{"login_timeout",	OT_INT, ST_UNDEF, &default_timeout},
+-{"nologin",		OT_STR, ST_UNDEF, "/etc/nologin"},
+-{"issue",		OT_STR, ST_UNDEF, "/etc/radiusclient/issue"},
++{"login_tries",	 	OT_INT, ST_UNDEF, NULL},
++{"login_timeout",	OT_INT, ST_UNDEF, NULL},
++{"nologin",		OT_STR, ST_UNDEF, NULL},
++{"issue",		OT_STR, ST_UNDEF, NULL},
+ /* RADIUS specific options */
+ {"authserver",		OT_SRV, ST_UNDEF, &authserver},
+ {"acctserver",		OT_SRV, ST_UNDEF, &acctserver},
+ {"servers",		OT_STR, ST_UNDEF, NULL},
+ {"dictionary",		OT_STR, ST_UNDEF, NULL},
+-{"login_radius",	OT_STR, ST_UNDEF, "/usr/sbin/login.radius"},
++{"login_radius",	OT_STR, ST_UNDEF, NULL},
+ {"seqfile",		OT_STR, ST_UNDEF, NULL},
+ {"mapfile",		OT_STR, ST_UNDEF, NULL},
+ {"default_realm",	OT_STR, ST_UNDEF, NULL},
diff --git a/trunk/package/network/services/ppp/patches/205-no_exponential_timeout.patch b/trunk/package/network/services/ppp/patches/205-no_exponential_timeout.patch
new file mode 100644
index 00000000..68aea12e
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/205-no_exponential_timeout.patch
@@ -0,0 +1,29 @@
+pppd: Don't use exponential timeout in discovery phase
+
+This patch removes the exponential timeout increase between PADO or PADS
+discovery attempts.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/plugins/rp-pppoe/discovery.c
++++ b/pppd/plugins/rp-pppoe/discovery.c
+@@ -644,7 +644,9 @@ discovery(PPPoEConnection *conn)
+ 	conn->discoveryState = STATE_SENT_PADI;
+ 	waitForPADO(conn, timeout);
+ 
++#if 0
+ 	timeout *= 2;
++#endif
+     } while (conn->discoveryState == STATE_SENT_PADI);
+ 
+     timeout = conn->discoveryTimeout;
+@@ -659,7 +661,9 @@ discovery(PPPoEConnection *conn)
+ 	sendPADR(conn);
+ 	conn->discoveryState = STATE_SENT_PADR;
+ 	waitForPADS(conn, timeout);
++#if 0
+ 	timeout *= 2;
++#endif
+     } while (conn->discoveryState == STATE_SENT_PADR);
+ 
+     if (!conn->seenMaxPayload) {
diff --git a/trunk/package/network/services/ppp/patches/206-compensate_time_change.patch b/trunk/package/network/services/ppp/patches/206-compensate_time_change.patch
new file mode 100644
index 00000000..fb6c6567
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/206-compensate_time_change.patch
@@ -0,0 +1,94 @@
+pppd: Watch out for time warps
+
+On many embedded systems there is no battery backed RTC and a proper system
+time only becomes available through NTP after establishing a connection.
+
+When the clock suddenly jumps forward, the internal accounting (connect time)
+is confused resulting in unreliable data.
+
+This patch implements periodic clock checking to look for time warps, if one
+is detected, the internal counters are adjusted accordingly.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/main.c
++++ b/pppd/main.c
+@@ -90,6 +90,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <sys/sysinfo.h>
+ 
+ #include "pppd.h"
+ #include "magic.h"
+@@ -228,6 +229,7 @@ static struct subprocess *children;
+ 
+ /* Prototypes for procedures local to this file. */
+ 
++static void check_time(void);
+ static void setup_signals __P((void));
+ static void create_pidfile __P((int pid));
+ static void create_linkpidfile __P((int pid));
+@@ -535,6 +537,7 @@ main(argc, argv)
+ 	    info("Starting link");
+ 	}
+ 
++	check_time();
+ 	gettimeofday(&start_time, NULL);
+ 	script_unsetenv("CONNECT_TIME");
+ 	script_unsetenv("BYTES_SENT");
+@@ -1267,6 +1270,36 @@ struct	callout {
+ 
+ static struct callout *callout = NULL;	/* Callout list */
+ static struct timeval timenow;		/* Current time */
++static long uptime_diff = 0;
++static int uptime_diff_set = 0;
++
++static void check_time(void)
++{
++	long new_diff;
++	struct timeval t;
++	struct sysinfo i;
++    struct callout *p;
++	
++	gettimeofday(&t, NULL);
++	sysinfo(&i);
++	new_diff = t.tv_sec - i.uptime;
++	
++	if (!uptime_diff_set) {
++		uptime_diff = new_diff;
++		uptime_diff_set = 1;
++		return;
++	}
++
++	if ((new_diff - 5 > uptime_diff) || (new_diff + 5 < uptime_diff)) {
++		/* system time has changed, update counters and timeouts */
++		info("System time change detected.");
++		start_time.tv_sec += new_diff - uptime_diff;
++		
++    	for (p = callout; p != NULL; p = p->c_next)
++			p->c_time.tv_sec += new_diff - uptime_diff;
++	}
++	uptime_diff = new_diff;
++}
+ 
+ /*
+  * timeout - Schedule a timeout.
+@@ -1337,6 +1370,8 @@ calltimeout()
+ {
+     struct callout *p;
+ 
++	check_time();
++	
+     while (callout != NULL) {
+ 	p = callout;
+ 
+@@ -1364,6 +1399,8 @@ timeleft(tvp)
+ {
+     if (callout == NULL)
+ 	return NULL;
++	
++	check_time();
+ 
+     gettimeofday(&timenow, NULL);
+     tvp->tv_sec = callout->c_time.tv_sec - timenow.tv_sec;
diff --git a/trunk/package/network/services/ppp/patches/207-lcp_mtu_max.patch b/trunk/package/network/services/ppp/patches/207-lcp_mtu_max.patch
new file mode 100644
index 00000000..240701b5
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/207-lcp_mtu_max.patch
@@ -0,0 +1,25 @@
+pppd: Cap MTU to the user configured value
+
+This patchs caps the calculated MTU value in lcp.c to the user specified "mru"
+option value. Without this patch pppd would advertise a different MTU value
+compared to what is set on the local interface in some cases.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/lcp.c
++++ b/pppd/lcp.c
+@@ -1917,12 +1917,12 @@ lcp_up(f)
+      * the interface MTU is set to the lowest of that, the
+      * MTU we want to use, and our link MRU.
+      */
+-    mtu = ho->neg_mru? ho->mru: PPP_MRU;
++    mtu = MIN(ho->neg_mru? ho->mru: PPP_MRU, ao->mru);
+     mru = go->neg_mru? MAX(wo->mru, go->mru): PPP_MRU;
+ #ifdef HAVE_MULTILINK
+     if (!(multilink && go->neg_mrru && ho->neg_mrru))
+ #endif /* HAVE_MULTILINK */
+-	netif_set_mtu(f->unit, MIN(MIN(mtu, mru), ao->mru));
++	netif_set_mtu(f->unit, MIN(mtu, mru));
+     ppp_send_config(f->unit, mtu,
+ 		    (ho->neg_asyncmap? ho->asyncmap: 0xffffffff),
+ 		    ho->neg_pcompression, ho->neg_accompression);
diff --git a/trunk/package/network/services/ppp/patches/208-fix_status_code.patch b/trunk/package/network/services/ppp/patches/208-fix_status_code.patch
new file mode 100644
index 00000000..25e2a10b
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/208-fix_status_code.patch
@@ -0,0 +1,24 @@
+pppd: Do not clobber exit codes on hangup
+
+When a modem hangup occurs, pppd unconditionally sets the exit status code
+to EXIT_HANGUP. This patch only sets EXIT_HANGUP if the exit status code is
+not already set to an error value.
+
+The motiviation of this patch is to allow applications which remote control
+pppd to react properly on errors, e.g. only redial (relaunch pppd) if there
+was a hangup, but not if the CHAP authentication failed.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/main.c
++++ b/pppd/main.c
+@@ -1048,7 +1048,8 @@ get_input()
+ 	}
+ 	notice("Modem hangup");
+ 	hungup = 1;
+-	status = EXIT_HANGUP;
++	if (status == EXIT_OK)
++		status = EXIT_HANGUP;
+ 	lcp_lowerdown(0);	/* serial link is no longer available */
+ 	link_terminated(0);
+ 	return;
diff --git a/trunk/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch b/trunk/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch
new file mode 100644
index 00000000..a0a30e41
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch
@@ -0,0 +1,20 @@
+build: Add required CFLAGS for libpcap
+
+This patch adds some flags to required to properly link libpcap within the
+libreCMC environment.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/Makefile.linux
++++ b/pppd/Makefile.linux
+@@ -178,8 +178,8 @@ endif
+ 
+ ifdef FILTER
+ ifneq ($(wildcard /usr/include/pcap-bpf.h),)
+-LIBS    += -lpcap
+-CFLAGS  += -DPPP_FILTER
++LIBS    += -lpcap -L$(STAGING_DIR)/usr/lib
++CFLAGS  += -DPPP_FILTER -I$(STAGING_DIR)/usr/include
+ endif
+ endif
+ 
diff --git a/trunk/package/network/services/ppp/patches/310-precompile_filter.patch b/trunk/package/network/services/ppp/patches/310-precompile_filter.patch
new file mode 100644
index 00000000..877ca6bd
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/310-precompile_filter.patch
@@ -0,0 +1,196 @@
+pppd: Implement support for precompiled pcap filters
+
+This patch implements support for precompiled pcap filters which is useful to
+support dial-on-demand on memory constrained embedded devices without having
+to link the full libpcap into pppd to generate the filters during runtime.
+
+Two new options are introduced; "precompiled-pass-filter" specifies a pre-
+compiled filter file containing rules to match packets which should be passed,
+"precompiled-active-filter" specifies a filter file containing rules to match
+packets which are treated as active.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/Makefile.linux
++++ b/pppd/Makefile.linux
+@@ -50,6 +50,9 @@ MPPE=y
+ # and that the kernel driver support PPP packet filtering.
+ #FILTER=y
+ 
++# Support for precompiled filters
++PRECOMPILED_FILTER=y
++
+ # Uncomment the next line to enable multilink PPP (enabled by default)
+ # Linux distributions: Please leave multilink ENABLED in your builds
+ # of pppd!
+@@ -183,6 +186,14 @@ CFLAGS  += -DPPP_FILTER -I$(STAGING_DIR)
+ endif
+ endif
+ 
++ifdef PRECOMPILED_FILTER
++PPPDSRCS += pcap_pcc.c
++HEADERS  += pcap_pcc.h
++PPPDOBJS += pcap_pcc.o
++LIBS	+= $(STAGING_DIR)/usr/lib/libpcap.a
++CFLAGS	+= -DPPP_FILTER -DPPP_PRECOMPILED_FILTER -I$(STAGING_DIR)/usr/include
++endif
++
+ ifdef HAVE_INET6
+      PPPDSRCS += ipv6cp.c eui64.c
+      HEADERS  += ipv6cp.h eui64.h
+--- a/pppd/options.c
++++ b/pppd/options.c
+@@ -57,6 +57,7 @@
+ 
+ #ifdef PPP_FILTER
+ #include <pcap.h>
++#include <pcap-bpf.h>
+ /*
+  * There have been 3 or 4 different names for this in libpcap CVS, but
+  * this seems to be what they have settled on...
+@@ -165,6 +166,13 @@ static int setlogfile __P((char **));
+ static int loadplugin __P((char **));
+ #endif
+ 
++#ifdef PPP_PRECOMPILED_FILTER
++#include "pcap_pcc.h"
++static int setprecompiledpassfilter __P((char **));
++static int setprecompiledactivefilter __P((char **));
++#undef PPP_FILTER
++#endif
++
+ #ifdef PPP_FILTER
+ static int setpassfilter __P((char **));
+ static int setactivefilter __P((char **));
+@@ -344,6 +352,14 @@ option_t general_options[] = {
+       "set filter for active pkts", OPT_PRIO },
+ #endif
+ 
++#ifdef PPP_PRECOMPILED_FILTER
++    { "precompiled-pass-filter", 1, setprecompiledpassfilter,
++      "set precompiled filter for packets to pass", OPT_PRIO },
++
++    { "precompiled-active-filter", 1, setprecompiledactivefilter,
++      "set precompiled filter for active pkts", OPT_PRIO },
++#endif
++
+ #ifdef MAXOCTETS
+     { "maxoctets", o_int, &maxoctets,
+       "Set connection traffic limit",
+@@ -1493,6 +1509,29 @@ callfile(argv)
+     return ok;
+ }
+ 
++#ifdef PPP_PRECOMPILED_FILTER
++/*
++ * setprecompiledpassfilter - Set the pass filter for packets using a
++ * precompiled expression
++ */
++static int
++setprecompiledpassfilter(argv)
++    char **argv;
++{
++    return pcap_pre_compiled (*argv, &pass_filter);
++}
++
++/*
++ * setactivefilter - Set the active filter for packets
++ */
++static int
++setprecompiledactivefilter(argv)
++    char **argv;
++{
++    return pcap_pre_compiled (*argv, &active_filter);
++}
++#endif
++
+ #ifdef PPP_FILTER
+ /*
+  * setpassfilter - Set the pass filter for packets
+--- /dev/null
++++ b/pppd/pcap_pcc.c
+@@ -0,0 +1,74 @@
++#include <pcap.h>
++#include <pcap-bpf.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++#include "pppd.h"
++
++int pcap_pre_compiled (char * fname, struct bpf_program *p)
++{
++    char buf[128];
++    int line = 0, size = 0, index=0, ret=1;
++    FILE *f = fopen (fname, "r");
++    if (!f)
++    {
++       option_error("error opening precompiled active-filter '%s': %s",
++                    fname, strerror (errno));
++       return 0;
++    }
++    while (fgets (buf, 127, f))
++    {
++       line++;
++       if (*buf == '#')
++           continue;
++       if (size)
++       {
++           /*
++             struct bpf_insn {
++             u_short   code;
++             u_char    jt;
++             u_char    jf;
++             bpf_int32 k;
++             }
++           */
++           struct bpf_insn * insn = & p->bf_insns[index];
++           unsigned code, jt, jf, k;
++           if (sscanf (buf, "%u %u %u %u", &code, &jt, &jf, &k) != 4)
++           {
++               goto err;
++           }
++           insn->code = code;
++           insn->jt = jt;
++           insn->jf = jf;
++           insn->k  = k;
++           index++;
++       }
++       else
++       {
++           if (sscanf (buf, "%u", &size) != 1)
++           {
++               goto err;
++           }
++           p->bf_len = size;
++           p->bf_insns = (struct bpf_insn *) 
++               malloc (size * sizeof (struct bpf_insn));
++       }
++    } 
++    if (size != index)
++    {
++       option_error("error in precompiled active-filter,"
++                    " expected %d expressions, got %dn",
++                    size, index);
++       ret = 0;
++    }
++    fclose(f);
++    return ret;
++
++err:
++  option_error("error in precompiled active-filter"
++              " expression line %s:%d (wrong size)\n", 
++              fname, line);
++  fclose (f);
++  return 0;
++}
+--- /dev/null
++++ b/pppd/pcap_pcc.h
+@@ -0,0 +1,7 @@
++#ifndef PCAP_PCC_H
++#define PCAP_PCC_H
++
++#include <pcap.h>
++
++int pcap_pre_compiled (char * fname, struct bpf_program *p);
++#endif /* PCAP_PCC_H */
diff --git a/trunk/package/network/services/ppp/patches/320-custom_iface_names.patch b/trunk/package/network/services/ppp/patches/320-custom_iface_names.patch
new file mode 100644
index 00000000..ccda0c67
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/320-custom_iface_names.patch
@@ -0,0 +1,135 @@
+pppd: Support arbitrary interface names
+
+This patch implements a new string option "ifname" which allows to specify
+fully custom PPP interface names on Linux. It does so by renaming the
+allocated pppX device immediately after it has been created to the requested
+interface name.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/main.c
++++ b/pppd/main.c
+@@ -745,8 +745,11 @@ void
+ set_ifunit(iskey)
+     int iskey;
+ {
+-    info("Using interface %s%d", PPP_DRV_NAME, ifunit);
+-    slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
++    if (use_ifname[0] == 0)
++	slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
++    else
++	slprintf(ifname, sizeof(ifname), "%s", use_ifname);
++    info("Using interface %s", ifname);
+     script_setenv("IFNAME", ifname, iskey);
+     if (iskey) {
+ 	create_pidfile(getpid());	/* write pid to file */
+--- a/pppd/options.c
++++ b/pppd/options.c
+@@ -112,6 +112,7 @@ int	log_to_fd = 1;		/* send log messages
+ bool	log_default = 1;	/* log_to_fd is default (stdout) */
+ int	maxfail = 10;		/* max # of unsuccessful connection attempts */
+ char	linkname[MAXPATHLEN];	/* logical name for link */
++char	use_ifname[IFNAMSIZ];	/* physical name for PPP link */
+ bool	tune_kernel;		/* may alter kernel settings */
+ int	connect_delay = 1000;	/* wait this many ms after connect script */
+ int	req_unit = -1;		/* requested interface unit */
+@@ -277,6 +278,9 @@ option_t general_options[] = {
+     { "linkname", o_string, linkname,
+       "Set logical name for link",
+       OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXPATHLEN },
++    { "ifname", o_string, use_ifname,
++      "Set physical name for PPP interface",
++      OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, IFNAMSIZ },
+ 
+     { "maxfail", o_int, &maxfail,
+       "Maximum number of unsuccessful connection attempts to allow",
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -74,6 +74,10 @@
+ #include "eui64.h"
+ #endif
+ 
++#ifndef IFNAMSIZ
++#define IFNAMSIZ	16
++#endif
++
+ /*
+  * Limits.
+  */
+@@ -317,6 +321,7 @@ extern char	*record_file;	/* File to rec
+ extern bool	sync_serial;	/* Device is synchronous serial device */
+ extern int	maxfail;	/* Max # of unsuccessful connection attempts */
+ extern char	linkname[MAXPATHLEN]; /* logical name for link */
++extern char	use_ifname[IFNAMSIZ]; /* physical name for PPP interface */
+ extern bool	tune_kernel;	/* May alter kernel settings as necessary */
+ extern int	connect_delay;	/* Time to delay after connect script */
+ extern int	max_data_rate;	/* max bytes/sec through charshunt */
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -161,6 +161,10 @@ struct in6_ifreq {
+ /* We can get an EIO error on an ioctl if the modem has hung up */
+ #define ok_error(num) ((num)==EIO)
+ 
++#if !defined(PPP_DRV_NAME)
++#define PPP_DRV_NAME	"ppp"
++#endif /* !defined(PPP_DRV_NAME) */
++
+ static int tty_disc = N_TTY;	/* The TTY discipline */
+ static int ppp_disc = N_PPP;	/* The PPP discpline */
+ static int initfdflags = -1;	/* Initial file descriptor flags for fd */
+@@ -620,7 +624,8 @@ void generic_disestablish_ppp(int dev_fd
+  */
+ static int make_ppp_unit()
+ {
+-	int x, flags;
++	struct ifreq ifr;
++	int x, flags, s;
+ 
+ 	if (ppp_dev_fd >= 0) {
+ 		dbglog("in make_ppp_unit, already had /dev/ppp open?");
+@@ -643,6 +648,30 @@ static int make_ppp_unit()
+ 	}
+ 	if (x < 0)
+ 		error("Couldn't create new ppp unit: %m");
++
++	if (use_ifname[0] != 0) {
++		s = socket(PF_INET, SOCK_DGRAM, 0);
++		if (s < 0)
++			s = socket(PF_PACKET, SOCK_DGRAM, 0);
++		if (s < 0)
++			s = socket(PF_INET6, SOCK_DGRAM, 0);
++		if (s < 0)
++			s = socket(PF_UNIX, SOCK_DGRAM, 0);
++		if (s >= 0) {
++			slprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s%d", PPP_DRV_NAME, ifunit);
++			slprintf(ifr.ifr_newname, sizeof(ifr.ifr_newname), "%s", use_ifname);
++			x = ioctl(s, SIOCSIFNAME, &ifr);
++			close(s);
++		} else {
++			x = s;
++		}
++		if (x < 0) {
++			error("Couldn't rename %s to %s", ifr.ifr_name, ifr.ifr_newname);
++			close(ppp_dev_fd);
++			ppp_dev_fd = -1;
++		}
++	}
++
+ 	return x;
+ }
+ 
+--- a/pppstats/pppstats.c
++++ b/pppstats/pppstats.c
+@@ -506,10 +506,12 @@ main(argc, argv)
+     if (argc > 0)
+ 	interface = argv[0];
+ 
++#if 0
+     if (sscanf(interface, PPP_DRV_NAME "%d", &unit) != 1) {
+ 	fprintf(stderr, "%s: invalid interface '%s' specified\n",
+ 		progname, interface);
+     }
++#endif
+ 
+ #ifndef STREAMS
+     {
diff --git a/trunk/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch b/trunk/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
new file mode 100644
index 00000000..bba5884f
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
@@ -0,0 +1,146 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Make mlppp support more generic interface naming other than pppX
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+ pppd/multilink.c |   55 +++++++++++++++++++++++++++++++++------------
+ pppd/sys-linux.c |   12 +++++++++
+ 2 files changed, 53 insertions(+), 14 deletions(-)
+--- a/pppd/multilink.c
++++ b/pppd/multilink.c
+@@ -56,7 +56,8 @@ static void iterate_bundle_links __P((vo
+ 
+ static int get_default_epdisc __P((struct epdisc *));
+ static int parse_num __P((char *str, const char *key, int *valp));
+-static int owns_unit __P((TDB_DATA pid, int unit));
++static int parse_str __P((char *str, const char *key, char *buf, int buflen));
++static int owns_link __P((TDB_DATA pid, char *ifname));
+ 
+ #define set_ip_epdisc(ep, addr) do {	\
+ 	ep->length = 4;			\
+@@ -197,35 +198,38 @@ mp_join_bundle()
+ 	key.dptr = bundle_id;
+ 	key.dsize = p - bundle_id;
+ 	pid = tdb_fetch(pppdb, key);
++
+ 	if (pid.dptr != NULL) {
++		char tmp[IFNAMSIZ];
++
+ 		/* bundle ID exists, see if the pppd record exists */
+ 		rec = tdb_fetch(pppdb, pid);
++
+ 		if (rec.dptr != NULL && rec.dsize > 0) {
+ 			/* make sure the string is null-terminated */
+ 			rec.dptr[rec.dsize-1] = 0;
+-			/* parse the interface number */
+-			parse_num(rec.dptr, "IFNAME=ppp", &unit);
++
+ 			/* check the pid value */
+ 			if (!parse_num(rec.dptr, "PPPD_PID=", &pppd_pid)
++			    || !parse_str(rec.dptr, "IFNAME=", tmp, sizeof(tmp))
++			    || !parse_num(rec.dptr, "IFUNIT=", &unit)
+ 			    || !process_exists(pppd_pid)
+-			    || !owns_unit(pid, unit))
++			    || !owns_link(pid, tmp))
+ 				unit = -1;
+ 			free(rec.dptr);
+ 		}
+ 		free(pid.dptr);
+-	}
+ 
+-	if (unit >= 0) {
+ 		/* attach to existing unit */
+-		if (bundle_attach(unit)) {
++		if (unit >= 0 && bundle_attach(unit)) {
+ 			set_ifunit(0);
+ 			script_setenv("BUNDLE", bundle_id + 7, 0);
+ 			make_bundle_links(1);
+ 			unlock_db();
+-			info("Link attached to %s", ifname);
++			info("Link attached to %s", tmp);
+ 			return 1;
++			/* attach failed because bundle doesn't exist */
+ 		}
+-		/* attach failed because bundle doesn't exist */
+ 	}
+ 
+ 	/* we have to make a new bundle */
+@@ -408,22 +412,45 @@ parse_num(str, key, valp)
+ 	return 0;
+ }
+ 
++static int
++parse_str(str, key, buf, buflen)
++     char *str;
++     const char *key;
++     char *buf;
++     int buflen;
++{
++	char *p, *endp;
++	int i;
++
++	p = strstr(str, key);
++	if (p) {
++		p += strlen(key);
++		while (--buflen && *p != 0 && *p != ';')
++			*(buf++) = *(p++);
++		*buf = 0;
++		return 1;
++	}
++	return 0;
++}
++
+ /*
+- * Check whether the pppd identified by `key' still owns ppp unit `unit'.
++ * Check whether the pppd identified by `key' still owns ppp link `ifname'.
+  */
+ static int
+-owns_unit(key, unit)
++owns_link(key, ifname)
+      TDB_DATA key;
+-     int unit;
++     char *ifname;
+ {
+-	char ifkey[32];
++	char ifkey[7 + IFNAMSIZ];
+ 	TDB_DATA kd, vd;
+ 	int ret = 0;
+ 
+-	slprintf(ifkey, sizeof(ifkey), "IFNAME=ppp%d", unit);
++	slprintf(ifkey, sizeof(ifkey), "IFNAME=%s", ifname);
++
+ 	kd.dptr = ifkey;
+ 	kd.dsize = strlen(ifkey);
+ 	vd = tdb_fetch(pppdb, kd);
++
+ 	if (vd.dptr != NULL) {
+ 		ret = vd.dsize == key.dsize
+ 			&& memcmp(vd.dptr, key.dptr, vd.dsize) == 0;
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -698,6 +698,16 @@ void cfg_bundle(int mrru, int mtru, int
+ 	add_fd(ppp_dev_fd);
+ }
+ 
++static void
++setenv_ifunit(void)
++{
++#ifdef USE_TDB
++	char tmp[11];
++	slprintf(tmp, sizeof(tmp), "%d", ifunit);
++	script_setenv("IFUNIT", tmp, 0);
++#endif
++}
++
+ /*
+  * make_new_bundle - create a new PPP unit (i.e. a bundle)
+  * and connect our channel to it.  This should only get called
+@@ -716,6 +726,8 @@ void make_new_bundle(int mrru, int mtru,
+ 
+ 	/* set the mrru and flags */
+ 	cfg_bundle(mrru, mtru, rssn, tssn);
++
++	setenv_ifunit();
+ }
+ 
+ /*
diff --git a/trunk/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch b/trunk/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch
new file mode 100644
index 00000000..f68b4665
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch
@@ -0,0 +1,22 @@
+pppd: Retain foreign default routes on Linux
+
+On Linux, when pppd attempts to delete its default route it does not fill
+the rt_dev field of the struct rtentry used to match the system default route.
+As a consequence, pppd happily deletes any default route even if it belongs
+to another interface.
+
+This patch makes pppd fill out the rt_dev field so that only own default
+routes are ever matched.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -1756,6 +1756,7 @@ int cifdefaultroute (int unit, u_int32_t
+ 	SIN_ADDR(rt.rt_genmask) = 0L;
+     }
+ 
++    rt.rt_dev = ifname;
+     rt.rt_flags = RTF_UP;
+     if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) {
+ 	if (still_ppp()) {
diff --git a/trunk/package/network/services/ppp/patches/340-populate_default_gateway.patch b/trunk/package/network/services/ppp/patches/340-populate_default_gateway.patch
new file mode 100644
index 00000000..a1451de3
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/340-populate_default_gateway.patch
@@ -0,0 +1,34 @@
+pppd: Fill in default gateway on Linux
+
+On Linux, when pppd creates the default route, it does not set the peer
+address as gateway, leading to a default route without gateway address.
+
+This behaviour breaks various downstream programs which attempt to infer
+the default gateway IP address from the system default route entry.
+
+This patch addresses the issue by filling in the peer address as gateway
+when generating the default route entry.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -1710,6 +1710,9 @@ int sifdefaultroute (int unit, u_int32_t
+     memset (&rt, 0, sizeof (rt));
+     SET_SA_FAMILY (rt.rt_dst, AF_INET);
+ 
++    SET_SA_FAMILY(rt.rt_gateway, AF_INET);
++    SIN_ADDR(rt.rt_gateway) = gateway;
++
+     rt.rt_dev = ifname;
+ 
+     if (kernel_version > KVERSION(2,1,0)) {
+@@ -1717,7 +1720,7 @@ int sifdefaultroute (int unit, u_int32_t
+ 	SIN_ADDR(rt.rt_genmask) = 0L;
+     }
+ 
+-    rt.rt_flags = RTF_UP;
++    rt.rt_flags = RTF_UP | RTF_GATEWAY;
+     if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) {
+ 	if (!ok_error(errno))
+ 	    error("default route ioctl(SIOCADDRT): %m");
diff --git a/trunk/package/network/services/ppp/patches/400-simplify_kernel_checks.patch b/trunk/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
new file mode 100644
index 00000000..11af6d8f
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
@@ -0,0 +1,154 @@
+pppd: Remove runtime kernel checks
+
+On embedded system distributions the required kernel features for pppd are
+more or less guaranteed to be present, so there is not much point in
+performing runtime checks, it just increases the binary size.
+
+This patch removes the runtime kernel feature checks.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -196,7 +196,7 @@ static int driver_is_old       = 0;
+ static int restore_term        = 0;	/* 1 => we've munged the terminal */
+ static struct termios inittermios;	/* Initial TTY termios */
+ 
+-int new_style_driver = 0;
++static const int new_style_driver = 1;
+ 
+ static char loop_name[20];
+ static unsigned char inbuf[512]; /* buffer for chars read from loopback */
+@@ -214,8 +214,8 @@ static int	looped;			/* 1 if using loop
+ static int	link_mtu;		/* mtu for the link (not bundle) */
+ 
+ static struct utsname utsname;	/* for the kernel version */
+-static int kernel_version;
+ #define KVERSION(j,n,p)	((j)*1000000 + (n)*1000 + (p))
++static const int kernel_version = KVERSION(2,6,37);
+ 
+ #define MAX_IFS		100
+ 
+@@ -1451,11 +1451,12 @@ int ccp_fatal_error (int unit)
+  *
+  * path_to_procfs - find the path to the proc file system mount point
+  */
+-static char proc_path[MAXPATHLEN];
+-static int proc_path_len;
++static char proc_path[MAXPATHLEN] = "/proc";
++static int proc_path_len = 5;
+ 
+ static char *path_to_procfs(const char *tail)
+ {
++#if 0
+     struct mntent *mntent;
+     FILE *fp;
+ 
+@@ -1477,6 +1478,7 @@ static char *path_to_procfs(const char *
+ 	    fclose (fp);
+ 	}
+     }
++#endif
+ 
+     strlcpy(proc_path + proc_path_len, tail,
+ 	    sizeof(proc_path) - proc_path_len);
+@@ -2129,15 +2131,19 @@ int ppp_available(void)
+     int    my_version, my_modification, my_patch;
+     int osmaj, osmin, ospatch;
+ 
++#if 0
+     /* get the kernel version now, since we are called before sys_init */
+     uname(&utsname);
+     osmaj = osmin = ospatch = 0;
+     sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch);
+     kernel_version = KVERSION(osmaj, osmin, ospatch);
++#endif
+ 
+     fd = open("/dev/ppp", O_RDWR);
+     if (fd >= 0) {
++#if 0
+ 	new_style_driver = 1;
++#endif
+ 
+ 	/* XXX should get from driver */
+ 	driver_version = 2;
+@@ -2197,6 +2203,7 @@ int ppp_available(void)
+ 
+     if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP))
+ 	ok = 0;
++	return ok;
+ 
+ /*
+  *  This is the PPP device. Validate the version of the driver at this
+@@ -2730,6 +2737,7 @@ get_pty(master_fdp, slave_fdp, slave_nam
+     }
+ #endif /* TIOCGPTN */
+ 
++#if 0
+     if (sfd < 0) {
+ 	/* the old way - scan through the pty name space */
+ 	for (i = 0; i < 64; ++i) {
+@@ -2748,6 +2756,7 @@ get_pty(master_fdp, slave_fdp, slave_nam
+ 	    }
+ 	}
+     }
++#endif
+ 
+     if (sfd < 0)
+ 	return 0;
+--- a/pppd/plugins/pppoatm/pppoatm.c
++++ b/pppd/plugins/pppoatm/pppoatm.c
+@@ -168,14 +168,6 @@ static void disconnect_pppoatm(void)
+ 
+ void plugin_init(void)
+ {
+-#if defined(__linux__)
+-	extern int new_style_driver;	/* From sys-linux.c */
+-	if (!ppp_available() && !new_style_driver)
+-		fatal("Kernel doesn't support ppp_generic - "
+-		    "needed for PPPoATM");
+-#else
+-	fatal("No PPPoATM support on this OS");
+-#endif
+ 	info("PPPoATM plugin_init");
+ 	add_options(pppoa_options);
+ }
+--- a/pppd/plugins/rp-pppoe/plugin.c
++++ b/pppd/plugins/rp-pppoe/plugin.c
+@@ -59,9 +59,6 @@ static char const RCSID[] =
+ 
+ char pppd_version[] = VERSION;
+ 
+-/* From sys-linux.c in pppd -- MUST FIX THIS! */
+-extern int new_style_driver;
+-
+ char *pppd_pppoe_service = NULL;
+ static char *acName = NULL;
+ static char *existingSession = NULL;
+@@ -371,10 +368,6 @@ PPPoEDevnameHook(char *cmd, char **argv,
+ void
+ plugin_init(void)
+ {
+-    if (!ppp_available() && !new_style_driver) {
+-	fatal("Linux kernel does not support PPPoE -- are you running 2.4.x?");
+-    }
+-
+     add_options(Options);
+ 
+     info("RP-PPPoE plugin version %s compiled against pppd %s",
+--- a/pppd/plugins/pppol2tp/pppol2tp.c
++++ b/pppd/plugins/pppol2tp/pppol2tp.c
+@@ -486,12 +486,7 @@ static void pppol2tp_cleanup(void)
+ 
+ void plugin_init(void)
+ {
+-#if defined(__linux__)
+-	extern int new_style_driver;	/* From sys-linux.c */
+-	if (!ppp_available() && !new_style_driver)
+-		fatal("Kernel doesn't support ppp_generic - "
+-		    "needed for PPPoL2TP");
+-#else
++#if !defined(__linux__)
+ 	fatal("No PPPoL2TP support on this OS");
+ #endif
+ 	add_options(pppol2tp_options);
diff --git a/trunk/package/network/services/ppp/patches/401-no_record_file.patch b/trunk/package/network/services/ppp/patches/401-no_record_file.patch
new file mode 100644
index 00000000..f3c13ec9
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/401-no_record_file.patch
@@ -0,0 +1,39 @@
+pppd: Remove the "record" option
+
+On many embedded systems there is not enough space to record PPP session
+information to the permanent storage, therfore remove this option.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/pppd.h
++++ b/pppd/pppd.h
+@@ -317,7 +317,6 @@ extern int	holdoff;	/* Dead time before
+ extern bool	holdoff_specified; /* true if user gave a holdoff value */
+ extern bool	notty;		/* Stdin/out is not a tty */
+ extern char	*pty_socket;	/* Socket to connect to pty */
+-extern char	*record_file;	/* File to record chars sent/received */
+ extern bool	sync_serial;	/* Device is synchronous serial device */
+ extern int	maxfail;	/* Max # of unsuccessful connection attempts */
+ extern char	linkname[MAXPATHLEN]; /* logical name for link */
+--- a/pppd/tty.c
++++ b/pppd/tty.c
+@@ -146,7 +146,7 @@ char	*disconnect_script = NULL; /* Scrip
+ char	*welcomer = NULL;	/* Script to run after phys link estab. */
+ char	*ptycommand = NULL;	/* Command to run on other side of pty */
+ bool	notty = 0;		/* Stdin/out is not a tty */
+-char	*record_file = NULL;	/* File to record chars sent/received */
++static  char	*const record_file = NULL;	/* File to record chars sent/received */
+ int	max_data_rate;		/* max bytes/sec through charshunt */
+ bool	sync_serial = 0;	/* Device is synchronous serial device */
+ char	*pty_socket = NULL;	/* Socket to connect to pty */
+@@ -202,8 +202,10 @@ option_t tty_options[] = {
+       "Send and receive over socket, arg is host:port",
+       OPT_PRIO | OPT_DEVNAM },
+ 
++#if 0
+     { "record", o_string, &record_file,
+       "Record characters sent/received to file", OPT_PRIO },
++#endif
+ 
+     { "crtscts", o_int, &crtscts,
+       "Set hardware (RTS/CTS) flow control",
diff --git a/trunk/package/network/services/ppp/patches/403-no_wtmp.patch b/trunk/package/network/services/ppp/patches/403-no_wtmp.patch
new file mode 100644
index 00000000..3c788945
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/403-no_wtmp.patch
@@ -0,0 +1,25 @@
+pppd: Disable wtmp support
+
+Many uClibc based environments lack wtmp and utmp support, therfore remove
+the code updating the wtmp information.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/sys-linux.c
++++ b/pppd/sys-linux.c
+@@ -2267,6 +2267,7 @@ int ppp_available(void)
+ 
+ void logwtmp (const char *line, const char *name, const char *host)
+ {
++#if 0
+     struct utmp ut, *utp;
+     pid_t  mypid = getpid();
+ #if __GLIBC__ < 2
+@@ -2332,6 +2333,7 @@ void logwtmp (const char *line, const ch
+ 	close (wtmp);
+     }
+ #endif
++#endif
+ }
+ #endif /* HAVE_LOGWTMP */
+ 
diff --git a/trunk/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch b/trunk/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch
new file mode 100644
index 00000000..edbca760
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch
@@ -0,0 +1,151 @@
+pppd: Remove historical protocol names
+
+Remove a number of historical protocol entries from pppd's builtin list, this
+reduced the binary size without loss of features.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/main.c
++++ b/pppd/main.c
+@@ -882,14 +882,17 @@ struct protocol_list {
+     const char	*name;
+ } protocol_list[] = {
+     { 0x21,	"IP" },
++#if 0
+     { 0x23,	"OSI Network Layer" },
+     { 0x25,	"Xerox NS IDP" },
+     { 0x27,	"DECnet Phase IV" },
+     { 0x29,	"Appletalk" },
+     { 0x2b,	"Novell IPX" },
++#endif
+     { 0x2d,	"VJ compressed TCP/IP" },
+     { 0x2f,	"VJ uncompressed TCP/IP" },
+     { 0x31,	"Bridging PDU" },
++#if 0
+     { 0x33,	"Stream Protocol ST-II" },
+     { 0x35,	"Banyan Vines" },
+     { 0x39,	"AppleTalk EDDP" },
+@@ -903,8 +906,11 @@ struct protocol_list {
+     { 0x49,	"Serial Data Transport Protocol (PPP-SDTP)" },
+     { 0x4b,	"SNA over 802.2" },
+     { 0x4d,	"SNA" },
++#endif
+     { 0x4f,	"IP6 Header Compression" },
++#if 0
+     { 0x51,	"KNX Bridging Data" },
++#endif
+     { 0x53,	"Encryption" },
+     { 0x55,	"Individual Link Encryption" },
+     { 0x57,	"IPv6" },
+@@ -915,12 +921,15 @@ struct protocol_list {
+     { 0x65,	"RTP IPHC Compressed non-TCP" },
+     { 0x67,	"RTP IPHC Compressed UDP 8" },
+     { 0x69,	"RTP IPHC Compressed RTP 8" },
++#if 0
+     { 0x6f,	"Stampede Bridging" },
+     { 0x73,	"MP+" },
+     { 0xc1,	"NTCITS IPI" },
++#endif
+     { 0xfb,	"single-link compression" },
+     { 0xfd,	"Compressed Datagram" },
+     { 0x0201,	"802.1d Hello Packets" },
++#if 0
+     { 0x0203,	"IBM Source Routing BPDU" },
+     { 0x0205,	"DEC LANBridge100 Spanning Tree" },
+     { 0x0207,	"Cisco Discovery Protocol" },
+@@ -932,15 +941,19 @@ struct protocol_list {
+     { 0x0231,	"Luxcom" },
+     { 0x0233,	"Sigma Network Systems" },
+     { 0x0235,	"Apple Client Server Protocol" },
++#endif
+     { 0x0281,	"MPLS Unicast" },
+     { 0x0283,	"MPLS Multicast" },
++#if 0
+     { 0x0285,	"IEEE p1284.4 standard - data packets" },
+     { 0x0287,	"ETSI TETRA Network Protocol Type 1" },
++#endif
+     { 0x0289,	"Multichannel Flow Treatment Protocol" },
+     { 0x2063,	"RTP IPHC Compressed TCP No Delta" },
+     { 0x2065,	"RTP IPHC Context State" },
+     { 0x2067,	"RTP IPHC Compressed UDP 16" },
+     { 0x2069,	"RTP IPHC Compressed RTP 16" },
++#if 0
+     { 0x4001,	"Cray Communications Control Protocol" },
+     { 0x4003,	"CDPD Mobile Network Registration Protocol" },
+     { 0x4005,	"Expand accelerator protocol" },
+@@ -951,8 +964,10 @@ struct protocol_list {
+     { 0x4023,	"RefTek Protocol" },
+     { 0x4025,	"Fibre Channel" },
+     { 0x4027,	"EMIT Protocols" },
++#endif
+     { 0x405b,	"Vendor-Specific Protocol (VSP)" },
+     { 0x8021,	"Internet Protocol Control Protocol" },
++#if 0
+     { 0x8023,	"OSI Network Layer Control Protocol" },
+     { 0x8025,	"Xerox NS IDP Control Protocol" },
+     { 0x8027,	"DECnet Phase IV Control Protocol" },
+@@ -961,7 +976,9 @@ struct protocol_list {
+     { 0x8031,	"Bridging NCP" },
+     { 0x8033,	"Stream Protocol Control Protocol" },
+     { 0x8035,	"Banyan Vines Control Protocol" },
++#endif
+     { 0x803d,	"Multi-Link Control Protocol" },
++#if 0
+     { 0x803f,	"NETBIOS Framing Control Protocol" },
+     { 0x8041,	"Cisco Systems Control Protocol" },
+     { 0x8043,	"Ascom Timeplex" },
+@@ -970,18 +987,24 @@ struct protocol_list {
+     { 0x8049,	"Serial Data Control Protocol (PPP-SDCP)" },
+     { 0x804b,	"SNA over 802.2 Control Protocol" },
+     { 0x804d,	"SNA Control Protocol" },
++#endif
+     { 0x804f,	"IP6 Header Compression Control Protocol" },
++#if 0
+     { 0x8051,	"KNX Bridging Control Protocol" },
++#endif
+     { 0x8053,	"Encryption Control Protocol" },
+     { 0x8055,	"Individual Link Encryption Control Protocol" },
+     { 0x8057,	"IPv6 Control Protocol" },
+     { 0x8059,	"PPP Muxing Control Protocol" },
+     { 0x805b,	"Vendor-Specific Network Control Protocol (VSNCP)" },
++#if 0
+     { 0x806f,	"Stampede Bridging Control Protocol" },
+     { 0x8073,	"MP+ Control Protocol" },
+     { 0x80c1,	"NTCITS IPI Control Protocol" },
++#endif
+     { 0x80fb,	"Single Link Compression Control Protocol" },
+     { 0x80fd,	"Compression Control Protocol" },
++#if 0
+     { 0x8207,	"Cisco Discovery Protocol Control" },
+     { 0x8209,	"Netcs Twin Routing" },
+     { 0x820b,	"STP - Control Protocol" },
+@@ -990,24 +1013,29 @@ struct protocol_list {
+     { 0x8281,	"MPLSCP" },
+     { 0x8285,	"IEEE p1284.4 standard - Protocol Control" },
+     { 0x8287,	"ETSI TETRA TNP1 Control Protocol" },
++#endif
+     { 0x8289,	"Multichannel Flow Treatment Protocol" },
+     { 0xc021,	"Link Control Protocol" },
+     { 0xc023,	"Password Authentication Protocol" },
+     { 0xc025,	"Link Quality Report" },
++#if 0
+     { 0xc027,	"Shiva Password Authentication Protocol" },
+     { 0xc029,	"CallBack Control Protocol (CBCP)" },
+     { 0xc02b,	"BACP Bandwidth Allocation Control Protocol" },
+     { 0xc02d,	"BAP" },
++#endif
+     { 0xc05b,	"Vendor-Specific Authentication Protocol (VSAP)" },
+     { 0xc081,	"Container Control Protocol" },
+     { 0xc223,	"Challenge Handshake Authentication Protocol" },
+     { 0xc225,	"RSA Authentication Protocol" },
+     { 0xc227,	"Extensible Authentication Protocol" },
++#if 0
+     { 0xc229,	"Mitsubishi Security Info Exch Ptcl (SIEP)" },
+     { 0xc26f,	"Stampede Bridging Authorization Protocol" },
+     { 0xc281,	"Proprietary Authentication Protocol" },
+     { 0xc283,	"Proprietary Authentication Protocol" },
+     { 0xc481,	"Proprietary Node ID Authentication Protocol" },
++#endif
+     { 0,	NULL },
+ };
+ 
diff --git a/trunk/package/network/services/ppp/patches/405-no_multilink_option.patch b/trunk/package/network/services/ppp/patches/405-no_multilink_option.patch
new file mode 100644
index 00000000..e8f99e57
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/405-no_multilink_option.patch
@@ -0,0 +1,28 @@
+pppd: Support "nomp" option even if multilink support is off
+
+This patch moves the "nomp" option entry outside of the defines protecting
+the multilink specific code. The motivation is to allow "nomp" even if pppd
+does not support multilink, so that controlling programs can unconditionally
+pass it to pppd regardless of the compile time features.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/pppd/options.c
++++ b/pppd/options.c
+@@ -336,13 +336,14 @@ option_t general_options[] = {
+       "Enable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 1 },
+     { "nomultilink", o_bool, &multilink,
+       "Disable multilink operation", OPT_PRIOSUB | 0 },
+-    { "nomp", o_bool, &multilink,
+-      "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
+ 
+     { "bundle", o_string, &bundle_name,
+       "Bundle name for multilink", OPT_PRIO },
+ #endif /* HAVE_MULTILINK */
+ 
++    { "nomp", o_bool, &multilink,
++      "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
++
+ #ifdef PLUGIN
+     { "plugin", o_special, (void *)loadplugin,
+       "Load a plug-in module into pppd", OPT_PRIV | OPT_A2LIST },
diff --git a/trunk/package/network/services/ppp/patches/500-add-pptp-plugin.patch b/trunk/package/network/services/ppp/patches/500-add-pptp-plugin.patch
new file mode 100644
index 00000000..d984e1b1
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/500-add-pptp-plugin.patch
@@ -0,0 +1,3065 @@
+--- a/configure
++++ b/configure
+@@ -195,7 +195,7 @@ if [ -d "$ksrc" ]; then
+     mkmkf $ksrc/Makedefs$compiletype Makedefs.com
+     for dir in pppd pppstats chat pppdump pppd/plugins pppd/plugins/rp-pppoe \
+ 	       pppd/plugins/radius pppd/plugins/pppoatm \
+-	       pppd/plugins/pppol2tp; do
++	       pppd/plugins/pppol2tp pppd/plugins/pptp ; do
+ 	mkmkf $dir/Makefile.$makext $dir/Makefile
+     done
+     if [ -f $ksrc/Makefile.$makext$archvariant ]; then
+--- a/pppd/plugins/Makefile.linux
++++ b/pppd/plugins/Makefile.linux
+@@ -9,7 +9,7 @@ BINDIR = $(DESTDIR)/sbin
+ MANDIR = $(DESTDIR)/share/man/man8
+ LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+ 
+-SUBDIRS := rp-pppoe pppoatm pppol2tp
++SUBDIRS := rp-pppoe pppoatm pppol2tp pptp
+ # Uncomment the next line to include the radius authentication plugin
+ SUBDIRS += radius
+ PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
+--- /dev/null
++++ b/pppd/plugins/pptp/Makefile.linux
+@@ -0,0 +1,31 @@
++#
++# This program may be distributed according to the terms of the GNU
++# General Public License, version 2 or (at your option) any later version.
++#
++# $Id: Makefile.linux,v 1.9 2012/05/04 21:48:00 dgolle Exp $
++#***********************************************************************
++
++DESTDIR = $(INSTROOT)@DESTDIR@
++LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
++
++PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
++
++INSTALL	= install
++
++COPTS=-O2 -g
++CFLAGS  = $(COPTS) -I. -I../.. -I../../../include -fPIC -DPPPD_VERSION=\"$(PPPDVERSION)\"
++all: pptp.so
++
++%.o: %.c
++	$(CC) $(CFLAGS) -c -o $@ $<
++
++pptp.so: dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o
++	$(CC) -o pptp.so -shared dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o
++
++install: all
++	$(INSTALL) -d -m 755 $(LIBDIR)
++	$(INSTALL) -c -m 4550 pptp.so $(LIBDIR)
++
++clean:
++	rm -f *.o *.so
++
+--- /dev/null
++++ b/pppd/plugins/pptp/dirutil.c
+@@ -0,0 +1,68 @@
++/* dirutil.c ... directory utilities.
++ *               C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: dirutil.c,v 1.2 2003/06/17 17:25:47 reink Exp $
++ */
++
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <unistd.h>
++#include <string.h>
++#include <stdlib.h>
++#include "dirutil.h"
++
++/* Returned malloc'ed string representing basename */
++char *basenamex(char *pathname)
++{
++    char *dup = strdup(pathname);
++    char *ptr = strrchr(stripslash(dup), '/');
++    if (ptr == NULL) return dup;
++    ptr = strdup(ptr+1);
++    free(dup);
++    return ptr;
++}
++
++/* Return malloc'ed string representing directory name (no trailing slash) */
++char *dirnamex(char *pathname)
++{
++    char *dup = strdup(pathname);
++    char *ptr = strrchr(stripslash(dup), '/');
++    if (ptr == NULL) { free(dup); return strdup("."); }
++    if (ptr == dup && dup[0] == '/') ptr++;
++    *ptr = '\0';
++    return dup;
++}
++
++/* In-place modify a string to remove trailing slashes.  Returns arg.
++ * stripslash("/") returns "/";
++ */
++char *stripslash(char *pathname) {
++    int len = strlen(pathname);
++    while (len > 1 && pathname[len - 1] == '/')
++        pathname[--len] = '\0';
++    return pathname;
++}
++
++/* ensure dirname exists, creating it if necessary. */
++int make_valid_path(char *dir, mode_t mode)
++{
++    struct stat st;
++    char *tmp = NULL, *path = stripslash(strdup(dir));
++    int retval;
++    if (stat(path, &st) == 0) { /* file exists */
++        if (S_ISDIR(st.st_mode)) { retval = 1; goto end; }
++        else { retval = 0; goto end; } /* not a directory.  Oops. */
++    }
++    /* Directory doesn't exist.  Let's make it. */
++    /*   Make parent first. */
++    if (!make_valid_path(tmp = dirnamex(path), mode)) { retval = 0; goto end; }
++    /*   Now make this 'un. */
++    if (mkdir(path, mode) < 0) { retval = 0; goto end; }
++    /* Success. */
++    retval = 1;
++
++end:
++    if (tmp != NULL) free(tmp);
++    if (path != NULL) free(path);
++    return retval;
++}
+--- /dev/null
++++ b/pppd/plugins/pptp/dirutil.h
+@@ -0,0 +1,14 @@
++/* dirutil.h ... directory utilities.
++ *               C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: dirutil.h,v 1.1.1.1 2000/12/23 08:19:51 scott Exp $
++ */
++
++/* Returned malloc'ed string representing basename */
++char *basenamex(char *pathname);
++/* Return malloc'ed string representing directory name (no trailing slash) */
++char *dirnamex(char *pathname);
++/* In-place modify a string to remove trailing slashes.  Returns arg. */
++char *stripslash(char *pathname);
++/* ensure dirname exists, creating it if necessary. */
++int make_valid_path(char *dirname, mode_t mode);
+--- /dev/null
++++ b/pppd/plugins/pptp/orckit_quirks.c
+@@ -0,0 +1,86 @@
++/* orckit_quirks.c ...... fix quirks in orckit adsl modems
++ *                        mulix <mulix@actcom.co.il>
++ *
++ * $Id: orckit_quirks.c,v 1.3 2002/03/01 01:23:36 quozl Exp $
++ */
++
++#include <string.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#include "pptp_msg.h"
++#include "pptp_options.h"
++#include "pptp_ctrl.h"
++#include "util.h"
++
++
++
++/* return 0 on success, non zero otherwise */
++int
++orckit_atur3_build_hook(struct pptp_out_call_rqst* packet)
++{
++    unsigned int name_length = 10;
++
++    struct pptp_out_call_rqst fixed_packet = {
++	PPTP_HEADER_CTRL(PPTP_OUT_CALL_RQST),
++	0, /* hton16(call->callid) */
++	0, /* hton16(call->sernum) */
++	hton32(PPTP_BPS_MIN), hton32(PPTP_BPS_MAX),
++	hton32(PPTP_BEARER_DIGITAL), hton32(PPTP_FRAME_ANY),
++	hton16(PPTP_WINDOW), 0, hton16(name_length), 0,
++	{'R','E','L','A','Y','_','P','P','P','1',0}, {0}
++    };
++
++    if (!packet)
++	return -1;
++
++    memcpy(packet, &fixed_packet, sizeof(*packet));
++
++    return 0;
++}
++
++/* return 0 on success, non zero otherwise */
++int
++orckit_atur3_set_link_hook(struct pptp_set_link_info* packet,
++			   int peer_call_id)
++{
++    struct pptp_set_link_info fixed_packet = {
++	PPTP_HEADER_CTRL(PPTP_SET_LINK_INFO),
++	hton16(peer_call_id),
++	0,
++	0xffffffff,
++	0xffffffff};
++
++    if (!packet)
++	return -1;
++
++    memcpy(packet, &fixed_packet, sizeof(*packet));
++    return 0;
++}
++
++/* return 0 on success, non 0 otherwise */
++int
++orckit_atur3_start_ctrl_conn_hook(struct pptp_start_ctrl_conn* packet)
++{
++    struct pptp_start_ctrl_conn fixed_packet = {
++	{0}, /* we'll set the header later */
++	hton16(PPTP_VERSION), 0, 0,
++	hton32(PPTP_FRAME_ASYNC), hton32(PPTP_BEARER_ANALOG),
++	hton16(0) /* max channels */,
++	hton16(0x6021),
++	{'R','E','L','A','Y','_','P','P','P','1',0}, /* hostname */
++	{'M','S',' ','W','i','n',' ','N','T',0} /* vendor */
++    };
++
++    if (!packet)
++	return -1;
++
++    /* grab the header from the original packet, since we dont
++       know if this is a request or a reply */
++    memcpy(&fixed_packet.header, &packet->header, sizeof(struct pptp_header));
++
++    /* and now overwrite the full packet, effectively preserving the header */
++    memcpy(packet, &fixed_packet, sizeof(*packet));
++    return 0;
++}
++
++
+--- /dev/null
++++ b/pppd/plugins/pptp/orckit_quirks.h
+@@ -0,0 +1,27 @@
++/* orckit_quirks.h ...... fix quirks in orckit adsl modems
++ *                        mulix <mulix@actcom.co.il>
++ *
++ * $Id: orckit_quirks.h,v 1.2 2001/11/23 03:42:51 quozl Exp $
++ */
++
++#ifndef INC_ORCKIT_QUIRKS_H_
++#define INC_ORCKIT_QUIRKS_H_
++
++#include "pptp_options.h"
++#include "pptp_ctrl.h"
++#include "pptp_msg.h"
++
++/* return 0 on success, non zero otherwise */
++int
++orckit_atur3_build_hook(struct pptp_out_call_rqst* packt);
++
++/* return 0 on success, non zero otherwise */
++int
++orckit_atur3_set_link_hook(struct pptp_set_link_info* packet,
++			   int peer_call_id);
++
++/* return 0 on success, non zero otherwise */
++int
++orckit_atur3_start_ctrl_conn_hook(struct pptp_start_ctrl_conn* packet);
++
++#endif /* INC_ORCKIT_QUIRKS_H_ */
+--- /dev/null
++++ b/pppd/plugins/pptp/pppd-pptp.8
+@@ -0,0 +1,68 @@
++.\" manual page [] for PPTP plugin for pppd 2.4
++.\" $Id: pppd-pptp.8,v 1.0 2007/10/17 13:27:17 kad Exp $
++.\" SH section heading
++.\" SS subsection heading
++.\" LP paragraph
++.\" IP indented paragraph
++.\" TP hanging label
++.TH PPPD-PPTP 8
++.SH NAME
++pptp.so \- PPTP VPN plugin for
++.BR pppd (8)
++.SH SYNOPSIS
++.B pppd
++[
++.I options
++]
++plugin pptp.so
++.SH DESCRIPTION
++.LP
++The PPTP plugin for pppd performs interaction with pptp kernel module
++and has built-in call manager (client part of PPTP).
++It pasees necessary paremeters from \fIoptions\fR into kernel module 
++to configure ppp-pptp channel. If it runs in client mode, then additionally 
++call manager starts up. PPTPD daemon automaticaly invokes this plugin
++in server mode and passes necessary options, so additional configuration
++is not needed.
++
++.SH OPTIONS for client mode
++The PPTP plugin introduces one additional pppd option:
++.TP
++.BI "pptp_server " server " (required)"
++Specifies ip address or hostname of pptp server.
++.TP
++.BI "pptp_window " packets " (optional)"
++The amount of sliding window size. 
++Set to 0 to turn off sliding window.
++    to 3-10 for low speed connections.
++    to >10 for hi speed connections.
++Default is 50
++.TP
++.BI "pptp_phone " phone " (optional)"
++The phone string that sended to pptp server.
++.SH USAGE
++Sample configuration file:
++.nf
++plugin "pptp.so"
++pptp_server 192.168.0.1
++pptp_window 100
++name myname
++remotename pptp
++noauth
++refuse-eap
++refuse-chap
++refuse-mschap
++nobsdcomp
++nodeflate
++novj
++novjccomp
++require-mppe-128
++lcp-echo-interval 20
++lcp-echo-failure  3
++.fi
++
++.SH SEE ALSO
++.BR pppd (8) "  " pptpd (8) "  " pptpd.conf (5)
++
++.SH AUTHOR
++xeb xeb@mail.ru
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp.c
+@@ -0,0 +1,323 @@
++/***************************************************************************
++ *   Copyright (C) 2006 by Kozlov D. <xeb@mail.ru>                         *
++ *   some cleanup done (C) 2012 by Daniel Golle <dgolle@allnet.de>         *
++ *                                                                         *
++ *   This program is free software; you can redistribute it and/or modify  *
++ *   it under the terms of the GNU General Public License as published by  *
++ *   the Free Software Foundation; either version 2 of the License, or     *
++ *   (at your option) any later version.                                   *
++ *                                                                         *
++ *   This program is distributed in the hope that 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.             *
++ ***************************************************************************/
++
++#define PPTP_VERSION "1.00"
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <sys/un.h>
++#include <netdb.h>
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <syslog.h>
++#include <unistd.h>
++#include <signal.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <sys/wait.h>
++#include <sys/ioctl.h>
++
++#include "pppd.h"
++#include "fsm.h"
++#include "lcp.h"
++#include "ipcp.h"
++#include "ccp.h"
++#include "pathnames.h"
++
++#include "pptp_callmgr.h"
++#include <net/if.h>
++#include <net/ethernet.h>
++#include <linux/if_pppox.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++
++
++
++extern char** environ;
++
++char pppd_version[] = PPPD_VERSION;
++extern int new_style_driver;
++
++
++char *pptp_server = NULL;
++char *pptp_client = NULL;
++char *pptp_phone = NULL;
++int pptp_window=50;
++int pptp_sock=-1;
++struct in_addr localbind = { INADDR_NONE };
++
++static int callmgr_sock;
++static int pptp_fd;
++int call_ID;
++
++static int open_callmgr(int call_id,struct in_addr inetaddr, char *phonenr,int window);
++static void launch_callmgr(int call_is,struct in_addr inetaddr, char *phonenr,int window);
++static int get_call_id(int sock, pid_t gre, pid_t pppd, u_int16_t *peer_call_id);
++
++static option_t Options[] =
++{
++    { "pptp_server", o_string, &pptp_server,
++      "PPTP Server" },
++    { "pptp_client", o_string, &pptp_client,
++      "PPTP Client" },
++    { "pptp_sock",o_int, &pptp_sock,
++      "PPTP socket" },
++    { "pptp_phone", o_string, &pptp_phone,
++      "PPTP Phone number" },
++    { "pptp_window",o_int, &pptp_window,
++      "PPTP window" },
++    { NULL }
++};
++
++static int pptp_connect(void);
++static void pptp_disconnect(void);
++
++struct channel pptp_channel = {
++    options: Options,
++    check_options: NULL,
++    connect: &pptp_connect,
++    disconnect: &pptp_disconnect,
++    establish_ppp: &generic_establish_ppp,
++    disestablish_ppp: &generic_disestablish_ppp,
++    close: NULL,
++    cleanup: NULL
++};
++
++static int pptp_start_server(void)
++{
++	pptp_fd=pptp_sock;
++	sprintf(ppp_devnam,"pptp (%s)",pptp_client);
++
++	return pptp_fd;
++}
++static int pptp_start_client(void)
++{
++	socklen_t len;
++	struct sockaddr_pppox src_addr,dst_addr;
++	struct hostent *hostinfo;
++
++	hostinfo=gethostbyname(pptp_server);
++  if (!hostinfo)
++	{
++		error("PPTP: Unknown host %s\n", pptp_server);
++		return -1;
++	}
++	dst_addr.sa_addr.pptp.sin_addr=*(struct in_addr*)hostinfo->h_addr;
++	{
++		int sock;
++		struct sockaddr_in addr;
++		len=sizeof(addr);
++		addr.sin_addr=dst_addr.sa_addr.pptp.sin_addr;
++		addr.sin_family=AF_INET;
++		addr.sin_port=htons(1700);
++		sock=socket(AF_INET,SOCK_DGRAM,0);
++		if (connect(sock,(struct sockaddr*)&addr,sizeof(addr)))
++		{
++			close(sock);
++			error("PPTP: connect failed (%s)\n",strerror(errno));
++			return -1;
++		}
++		getsockname(sock,(struct sockaddr*)&addr,&len);
++		src_addr.sa_addr.pptp.sin_addr=addr.sin_addr;
++		close(sock);
++	}
++
++	src_addr.sa_family=AF_PPPOX;
++	src_addr.sa_protocol=PX_PROTO_PPTP;
++	src_addr.sa_addr.pptp.call_id=0;
++
++	dst_addr.sa_family=AF_PPPOX;
++	dst_addr.sa_protocol=PX_PROTO_PPTP;
++	dst_addr.sa_addr.pptp.call_id=0;
++
++	pptp_fd=socket(AF_PPPOX,SOCK_STREAM,PX_PROTO_PPTP);
++	if (pptp_fd<0)
++	{
++		error("PPTP: failed to create PPTP socket (%s)\n",strerror(errno));
++		return -1;
++	}
++	if (bind(pptp_fd,(struct sockaddr*)&src_addr,sizeof(src_addr)))
++	{
++		close(pptp_fd);
++		error("PPTP: failed to bind PPTP socket (%s)\n",strerror(errno));
++		return -1;
++	}
++	len=sizeof(src_addr);
++	getsockname(pptp_fd,(struct sockaddr*)&src_addr,&len);
++	call_ID=src_addr.sa_addr.pptp.call_id;
++
++  do {
++        /*
++         * Open connection to call manager (Launch call manager if necessary.)
++         */
++        callmgr_sock = open_callmgr(src_addr.sa_addr.pptp.call_id,dst_addr.sa_addr.pptp.sin_addr, pptp_phone, pptp_window);
++	if (callmgr_sock<0)
++	{
++		close(pptp_fd);
++		return -1;
++        }
++        /* Exchange PIDs, get call ID */
++    } while (get_call_id(callmgr_sock, getpid(), getpid(), &dst_addr.sa_addr.pptp.call_id) < 0);
++
++	if (connect(pptp_fd,(struct sockaddr*)&dst_addr,sizeof(dst_addr)))
++	{
++		close(callmgr_sock);
++		close(pptp_fd);
++		error("PPTP: failed to connect PPTP socket (%s)\n",strerror(errno));
++		return -1;
++	}
++
++	sprintf(ppp_devnam,"pptp (%s)",pptp_server);
++
++	return pptp_fd;
++}
++static int pptp_connect(void)
++{
++	if ((!pptp_server && !pptp_client) || (pptp_server && pptp_client))
++	{
++		fatal("PPTP: unknown mode (you must specify pptp_server or pptp_client option)");
++		return -1;
++	}
++
++	if (pptp_server) return pptp_start_client();
++	return pptp_start_server();
++}
++
++static void pptp_disconnect(void)
++{
++	if (pptp_server) close(callmgr_sock);
++	close(pptp_fd);
++}
++
++static int open_callmgr(int call_id,struct in_addr inetaddr, char *phonenr,int window)
++{
++    /* Try to open unix domain socket to call manager. */
++    struct sockaddr_un where;
++    const int NUM_TRIES = 3;
++    int i, fd;
++    pid_t pid;
++    int status;
++    /* Open socket */
++    if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
++    {
++        fatal("Could not create unix domain socket: %s", strerror(errno));
++    }
++    /* Make address */
++    callmgr_name_unixsock(&where, inetaddr, localbind);
++    for (i = 0; i < NUM_TRIES; i++)
++    {
++        if (connect(fd, (struct sockaddr *) &where, sizeof(where)) < 0)
++        {
++            /* couldn't connect.  We'll have to launch this guy. */
++
++            unlink (where.sun_path);
++
++            /* fork and launch call manager process */
++            switch (pid = fork())
++            {
++                case -1: /* failure */
++                    fatal("fork() to launch call manager failed.");
++                case 0: /* child */
++                {
++                    /* close the pty and gre in the call manager */
++                    close(fd);
++                    close(pptp_fd);
++                    launch_callmgr(call_id,inetaddr,phonenr,window);
++                }
++                default: /* parent */
++                    waitpid(pid, &status, 0);
++                    if (status!= 0)
++		    {
++			close(fd);
++			error("Call manager exited with error %d", status);
++			return -1;
++		    }
++                    break;
++            }
++            sleep(1);
++        }
++        else return fd;
++    }
++    close(fd);
++    error("Could not launch call manager after %d tries.", i);
++    return -1;   /* make gcc happy */
++}
++
++/*** call the call manager main ***********************************************/
++static void launch_callmgr(int call_id,struct in_addr inetaddr, char *phonenr,int window)
++{
++    dbglog("pptp: call manager for %s\n", inet_ntoa(inetaddr));
++    dbglog("window size:\t%d\n",window);
++    if (phonenr) dbglog("phone number:\t'%s'\n",phonenr);
++    dbglog("call id:\t%d\n",call_id);
++    exit(callmgr_main(inetaddr, phonenr, window, call_id));
++}
++
++/*** exchange data with the call manager  *************************************/
++/* XXX need better error checking XXX */
++static int get_call_id(int sock, pid_t gre, pid_t pppd,
++		u_int16_t *peer_call_id)
++{
++    u_int16_t m_call_id, m_peer_call_id;
++    /* write pid's to socket */
++    /* don't bother with network byte order, because pid's are meaningless
++     * outside the local host.
++     */
++    int rc;
++    rc = write(sock, &gre, sizeof(gre));
++    if (rc != sizeof(gre))
++        return -1;
++    rc = write(sock, &pppd, sizeof(pppd));
++    if (rc != sizeof(pppd))
++        return -1;
++    rc = read(sock,  &m_call_id, sizeof(m_call_id));
++    if (rc != sizeof(m_call_id))
++        return -1;
++    rc = read(sock,  &m_peer_call_id, sizeof(m_peer_call_id));
++    if (rc != sizeof(m_peer_call_id))
++        return -1;
++    /*
++     * XXX FIXME ... DO ERROR CHECKING & TIME-OUTS XXX
++     * (Rhialto: I am assuming for now that timeouts are not relevant
++     * here, because the read and write calls would return -1 (fail) when
++     * the peer goes away during the process. We know it is (or was)
++     * running because the connect() call succeeded.)
++     * (James: on the other hand, if the route to the peer goes away, we
++     * wouldn't get told by read() or write() for quite some time.)
++     */
++    *peer_call_id = m_peer_call_id;
++    return 0;
++}
++
++void plugin_init(void)
++{
++    add_options(Options);
++
++    info("PPTP plugin version %s", PPTP_VERSION);
++
++    the_channel = &pptp_channel;
++    modem = 0;
++}
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_callmgr.c
+@@ -0,0 +1,381 @@
++/* pptp_callmgr.c ... Call manager for PPTP connections.
++ *                    Handles TCP port 1723 protocol.
++ *                    C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: pptp_callmgr.c,v 1.20 2005/03/31 07:42:39 quozl Exp $
++ */
++#include <signal.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <sys/un.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
++#include <assert.h>
++#include <setjmp.h>
++#include <stdio.h>
++#include <errno.h>
++#include "pptp_callmgr.h"
++#include "pptp_ctrl.h"
++#include "pptp_msg.h"
++#include "dirutil.h"
++#include "vector.h"
++#include "util.h"
++#include "pppd.h"
++
++extern struct in_addr localbind; /* from pptp.c */
++extern int call_ID;
++
++int open_inetsock(struct in_addr inetaddr);
++int open_unixsock(struct in_addr inetaddr);
++void close_inetsock(int fd, struct in_addr inetaddr);
++void close_unixsock(int fd, struct in_addr inetaddr);
++
++sigjmp_buf callmgr_env;
++
++void callmgr_sighandler(int sig) {
++    /* TODO: according to signal(2), siglongjmp() is unsafe used here */
++    siglongjmp (callmgr_env, 1);
++}
++
++void callmgr_do_nothing(int sig) {
++    /* do nothing signal handler */
++}
++
++struct local_callinfo {
++    int unix_sock;
++    pid_t pid[2];
++};
++
++struct local_conninfo {
++    VECTOR * call_list;
++    fd_set * call_set;
++};
++
++/* Call callback */
++void call_callback(PPTP_CONN *conn, PPTP_CALL *call, enum call_state state)
++{
++    struct local_callinfo *lci;
++    struct local_conninfo *conninfo;
++    u_int16_t call_id[2];
++    switch(state) {
++        case CALL_OPEN_DONE:
++            /* okey dokey.  This means that the call_id and peer_call_id are
++             * now valid, so lets send them on to our friends who requested
++             * this call.  */
++            lci = pptp_call_closure_get(conn, call); assert(lci != NULL);
++            pptp_call_get_ids(conn, call, &call_id[0], &call_id[1]);
++            write(lci->unix_sock, &call_id, sizeof(call_id));
++            /* Our duty to the fatherland is now complete. */
++            break;
++        case CALL_OPEN_FAIL:
++        case CALL_CLOSE_RQST:
++        case CALL_CLOSE_DONE:
++            /* don't need to do anything here, except make sure tables
++             * are sync'ed */
++            dbglog("Closing connection (call state)");
++            conninfo = pptp_conn_closure_get(conn);
++            lci = pptp_call_closure_get(conn, call);
++            assert(lci != NULL && conninfo != NULL);
++            if (vector_contains(conninfo->call_list, lci->unix_sock)) {
++                vector_remove(conninfo->call_list, lci->unix_sock);
++                close(lci->unix_sock);
++                FD_CLR(lci->unix_sock, conninfo->call_set);
++            }
++            break;
++        default:
++            dbglog("Unhandled call callback state [%d].", (int) state);
++            break;
++    }
++}
++
++/******************************************************************************
++ * NOTE ABOUT 'VOLATILE':
++ * several variables here get a volatile qualifier to silence warnings
++ * from older (before 3.0) gccs. if the longjmp stuff is removed,
++ * the volatile qualifiers should be removed as well.
++ *****************************************************************************/
++
++/*** Call Manager *************************************************************/
++int callmgr_main(struct in_addr inetaddr, char phonenr[], int window, int pcallid)
++{
++    int inet_sock, unix_sock;
++    fd_set call_set;
++    PPTP_CONN * conn;
++    VECTOR * call_list;
++    int max_fd = 0;
++    volatile int first = 1;
++    int retval;
++    int i;
++    if (pcallid>0) call_ID=pcallid;
++
++    /* Step 1: Open sockets. */
++    if ((inet_sock = open_inetsock(inetaddr)) < 0)
++        fatal("Could not open control connection to %s", inet_ntoa(inetaddr));
++    dbglog("control connection");
++    if ((unix_sock = open_unixsock(inetaddr)) < 0)
++        fatal("Could not open unix socket for %s", inet_ntoa(inetaddr));
++    /* Step 1b: FORK and return status to calling process. */
++    dbglog("unix_sock");
++
++    switch (fork()) {
++        case 0: /* child. stick around. */
++            break;
++        case -1: /* failure.  Fatal. */
++            fatal("Could not fork.");
++        default: /* Parent. Return status to caller. */
++            exit(0);
++    }
++    /* re-open stderr as /dev/null to release it */
++    file2fd("/dev/null", "wb", STDERR_FILENO);
++    /* Step 1c: Clean up unix socket on TERM */
++    if (sigsetjmp(callmgr_env, 1) != 0)
++        goto cleanup;
++    signal(SIGINT, callmgr_sighandler);
++    signal(SIGTERM, callmgr_sighandler);
++    signal(SIGPIPE, callmgr_do_nothing);
++    signal(SIGUSR1, callmgr_do_nothing); /* signal state change
++                                            wake up accept */
++    /* Step 2: Open control connection and register callback */
++    if ((conn = pptp_conn_open(inet_sock, 1, NULL/* callback */)) == NULL) {
++        close(unix_sock); close(inet_sock); fatal("Could not open connection.");
++    }
++    FD_ZERO(&call_set);
++    call_list = vector_create();
++    {
++        struct local_conninfo *conninfo = malloc(sizeof(*conninfo));
++        if (conninfo == NULL) {
++            close(unix_sock); close(inet_sock); fatal("No memory.");
++        }
++        conninfo->call_list = call_list;
++        conninfo->call_set  = &call_set;
++        pptp_conn_closure_put(conn, conninfo);
++    }
++    if (sigsetjmp(callmgr_env, 1) != 0) goto shutdown;
++    /* Step 3: Get FD_SETs */
++    max_fd = unix_sock;
++    do {
++        int rc;
++        fd_set read_set = call_set, write_set;
++        FD_ZERO (&write_set);
++        if (pptp_conn_established(conn)) {
++	  FD_SET (unix_sock, &read_set);
++	  if (unix_sock > max_fd) max_fd = unix_sock;
++	}
++        pptp_fd_set(conn, &read_set, &write_set, &max_fd);
++        for (; max_fd > 0 ; max_fd--) {
++            if (FD_ISSET (max_fd, &read_set) ||
++                    FD_ISSET (max_fd, &write_set))
++                break;
++        }
++        /* Step 4: Wait on INET or UNIX event */
++        if ((rc = select(max_fd + 1, &read_set, &write_set, NULL, NULL)) <0) {
++	  if (errno == EBADF) break;
++	  /* a signal or somesuch. */
++	  continue;
++	}
++        /* Step 5a: Handle INET events */
++        rc = pptp_dispatch(conn, &read_set, &write_set);
++	if (rc < 0)
++	    break;
++        /* Step 5b: Handle new connection to UNIX socket */
++        if (FD_ISSET(unix_sock, &read_set)) {
++            /* New call! */
++            struct sockaddr_un from;
++            int len = sizeof(from);
++            PPTP_CALL * call;
++            struct local_callinfo *lci;
++            int s;
++            /* Accept the socket */
++            FD_CLR (unix_sock, &read_set);
++            if ((s = accept(unix_sock, (struct sockaddr *) &from, &len)) < 0) {
++                warn("Socket not accepted: %s", strerror(errno));
++                goto skip_accept;
++            }
++            /* Allocate memory for local call information structure. */
++            if ((lci = malloc(sizeof(*lci))) == NULL) {
++                warn("Out of memory."); close(s); goto skip_accept;
++            }
++            lci->unix_sock = s;
++            /* Give the initiator time to write the PIDs while we open
++             * the call */
++            call = pptp_call_open(conn, call_ID,call_callback, phonenr,window);
++            /* Read and store the associated pids */
++            read(s, &lci->pid[0], sizeof(lci->pid[0]));
++            read(s, &lci->pid[1], sizeof(lci->pid[1]));
++            /* associate the local information with the call */
++            pptp_call_closure_put(conn, call, (void *) lci);
++            /* The rest is done on callback. */
++            /* Keep alive; wait for close */
++            retval = vector_insert(call_list, s, call); assert(retval);
++            if (s > max_fd) max_fd = s;
++            FD_SET(s, &call_set);
++            first = 0;
++        }
++skip_accept: /* Step 5c: Handle socket close */
++        for (i = 0; i < max_fd + 1; i++)
++            if (FD_ISSET(i, &read_set)) {
++                /* close it */
++                PPTP_CALL * call;
++                retval = vector_search(call_list, i, &call);
++                if (retval) {
++                    struct local_callinfo *lci =
++                        pptp_call_closure_get(conn, call);
++                    dbglog("Closing connection (unhandled)");
++                    free(lci);
++                    /* soft shutdown.  Callback will do hard shutdown later */
++                    pptp_call_close(conn, call);
++                    vector_remove(call_list, i);
++                }
++                FD_CLR(i, &call_set);
++                close(i);
++            }
++    } while (vector_size(call_list) > 0 || first);
++shutdown:
++    {
++        int rc;
++        fd_set read_set, write_set;
++        struct timeval tv;
++	signal(SIGINT, callmgr_do_nothing);
++	signal(SIGTERM, callmgr_do_nothing);
++        /* warn("Shutdown"); */
++        /* kill all open calls */
++        for (i = 0; i < vector_size(call_list); i++) {
++            PPTP_CALL *call = vector_get_Nth(call_list, i);
++            dbglog("Closing connection (shutdown)");
++            pptp_call_close(conn, call);
++        }
++        /* attempt to dispatch these messages */
++        FD_ZERO(&read_set);
++        FD_ZERO(&write_set);
++        pptp_fd_set(conn, &read_set, &write_set, &max_fd);
++	tv.tv_sec = 0;
++	tv.tv_usec = 0;
++	select(max_fd + 1, &read_set, &write_set, NULL, &tv);
++        rc = pptp_dispatch(conn, &read_set, &write_set);
++	if (rc > 0) {
++	  /* wait for a respond, a timeout because there might not be one */
++	  FD_ZERO(&read_set);
++	  FD_ZERO(&write_set);
++	  pptp_fd_set(conn, &read_set, &write_set, &max_fd);
++	  tv.tv_sec = 2;
++	  tv.tv_usec = 0;
++	  select(max_fd + 1, &read_set, &write_set, NULL, &tv);
++	  rc = pptp_dispatch(conn, &read_set, &write_set);
++	  if (rc > 0) {
++	    if (i > 0) sleep(2);
++	    /* no more open calls.  Close the connection. */
++	    pptp_conn_close(conn, PPTP_STOP_LOCAL_SHUTDOWN);
++	    /* wait for a respond, a timeout because there might not be one */
++	    FD_ZERO(&read_set);
++	    FD_ZERO(&write_set);
++	    pptp_fd_set(conn, &read_set, &write_set, &max_fd);
++	    tv.tv_sec = 2;
++	    tv.tv_usec = 0;
++	    select(max_fd + 1, &read_set, &write_set, NULL, &tv);
++	    pptp_dispatch(conn, &read_set, &write_set);
++	    if (rc > 0) sleep(2);
++	  }
++	}
++        /* with extreme prejudice */
++        pptp_conn_destroy(conn);
++        vector_destroy(call_list);
++    }
++cleanup:
++    signal(SIGINT, callmgr_do_nothing);
++    signal(SIGTERM, callmgr_do_nothing);
++    close_inetsock(inet_sock, inetaddr);
++    close_unixsock(unix_sock, inetaddr);
++    return 0;
++}
++
++/*** open_inetsock ************************************************************/
++int open_inetsock(struct in_addr inetaddr)
++{
++    struct sockaddr_in dest, src;
++    int s;
++    dest.sin_family = AF_INET;
++    dest.sin_port   = htons(PPTP_PORT);
++    dest.sin_addr   = inetaddr;
++    if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
++        warn("socket: %s", strerror(errno));
++        return s;
++    }
++    if (localbind.s_addr != INADDR_NONE) {
++        bzero(&src, sizeof(src));
++        src.sin_family = AF_INET;
++        src.sin_addr   = localbind;
++        if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) {
++            warn("bind: %s", strerror(errno));
++            close(s); return -1;
++        }
++    }
++    if (connect(s, (struct sockaddr *) &dest, sizeof(dest)) < 0) {
++        warn("connect: %s", strerror(errno));
++        close(s); return -1;
++    }
++    return s;
++}
++
++/*** open_unixsock ************************************************************/
++int open_unixsock(struct in_addr inetaddr)
++{
++    struct sockaddr_un where;
++    struct stat st;
++    char *dir;
++    int s;
++    if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
++        warn("socket: %s", strerror(errno));
++        return s;
++    }
++    callmgr_name_unixsock( &where, inetaddr, localbind);
++    if (stat(where.sun_path, &st) >= 0)
++    {
++        warn("Call manager for %s is already running.", inet_ntoa(inetaddr));
++        close(s); return -1;
++    }
++   /* Make sure path is valid. */
++    dir = dirnamex(where.sun_path);
++    if (!make_valid_path(dir, 0770))
++        fatal("Could not make path to %s: %s", where.sun_path, strerror(errno));
++    free(dir);
++    if (bind(s, (struct sockaddr *) &where, sizeof(where)) < 0) {
++        warn("bind: %s", strerror(errno));
++        close(s); return -1;
++    }
++    chmod(where.sun_path, 0777);
++    listen(s, 127);
++    return s;
++}
++
++/*** close_inetsock ***********************************************************/
++void close_inetsock(int fd, struct in_addr inetaddr)
++{
++    close(fd);
++}
++
++/*** close_unixsock ***********************************************************/
++void close_unixsock(int fd, struct in_addr inetaddr)
++{
++    struct sockaddr_un where;
++    close(fd);
++    callmgr_name_unixsock(&where, inetaddr, localbind);
++    unlink(where.sun_path);
++}
++
++/*** make a unix socket address ***********************************************/
++void callmgr_name_unixsock(struct sockaddr_un *where,
++			   struct in_addr inetaddr,
++			   struct in_addr localbind)
++{
++    char localaddr[16], remoteaddr[16];
++    where->sun_family = AF_UNIX;
++    strncpy(localaddr,  inet_ntoa(localbind), 16);
++    strncpy(remoteaddr, inet_ntoa(inetaddr),  16);
++    snprintf(where->sun_path, sizeof(where->sun_path),
++            PPTP_SOCKET_PREFIX "%s:%i", remoteaddr,call_ID);
++}
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_callmgr.h
+@@ -0,0 +1,17 @@
++/* pptp_callmgr.h ... Call manager for PPTP connections.
++ *                    Handles TCP port 1723 protocol.
++ *                    C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: pptp_callmgr.h,v 1.3 2003/02/17 00:22:17 quozl Exp $
++ */
++
++#define PPTP_SOCKET_PREFIX "/var/run/pptp/"
++
++int callmgr_main(struct in_addr inetaddr,
++		char phonenr[],
++		int window,
++		int pcallid);
++
++void callmgr_name_unixsock(struct sockaddr_un *where,
++			   struct in_addr inetaddr,
++			   struct in_addr localbind);
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_ctrl.c
+@@ -0,0 +1,1077 @@
++/* pptp_ctrl.c ... handle PPTP control connection.
++ *                 C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: pptp_ctrl.c,v 1.31 2005/03/31 07:42:39 quozl Exp $
++ */
++
++#include <errno.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <assert.h>
++#include <signal.h>
++#include <string.h>
++#include <ctype.h>
++#include <fcntl.h>
++#include "pptp_msg.h"
++#include "pptp_ctrl.h"
++#include "pptp_options.h"
++#include "vector.h"
++#include "util.h"
++#include "pptp_quirks.h"
++
++/* BECAUSE OF SIGNAL LIMITATIONS, EACH PROCESS CAN ONLY MANAGE ONE
++ * CONNECTION.  SO THIS 'PPTP_CONN' STRUCTURE IS A BIT MISLEADING.
++ * WE'LL KEEP CONNECTION-SPECIFIC INFORMATION IN THERE ANYWAY (AS
++ * OPPOSED TO USING GLOBAL VARIABLES), BUT BEWARE THAT THE ENTIRE
++ * UNIX SIGNAL-HANDLING SEMANTICS WOULD HAVE TO CHANGE (OR THE
++ * TIME-OUT CODE DRASTICALLY REWRITTEN) BEFORE YOU COULD DO A
++ * PPTP_CONN_OPEN MORE THAN ONCE PER PROCESS AND GET AWAY WITH IT.
++ */
++
++/* This structure contains connection-specific information that the
++ * signal handler needs to see.  Thus, it needs to be in a global
++ * variable.  If you end up using pthreads or something (why not
++ * just processes?), this would have to be placed in a thread-specific
++ * data area, using pthread_get|set_specific, etc., so I've
++ * conveniently encapsulated it for you.
++ * [linux threads will have to support thread-specific signals
++ *  before this would work at all, which, as of this writing
++ *  (linux-threads v0.6, linux kernel 2.1.72), it does not.]
++ */
++
++/* Globals */
++
++/* control the number of times echo packets will be logged */
++static int nlogecho = 10;
++
++static struct thread_specific {
++    struct sigaction old_sigaction; /* evil signals */
++    PPTP_CONN * conn;
++} global;
++
++#define INITIAL_BUFSIZE 512 /* initial i/o buffer size. */
++
++struct PPTP_CONN {
++    int inet_sock;
++    /* Connection States */
++    enum {
++        CONN_IDLE, CONN_WAIT_CTL_REPLY, CONN_WAIT_STOP_REPLY, CONN_ESTABLISHED
++    } conn_state; /* on startup: CONN_IDLE */
++    /* Keep-alive states */
++    enum {
++        KA_NONE, KA_OUTSTANDING
++    } ka_state;  /* on startup: KA_NONE */
++    /* Keep-alive ID; monotonically increasing (watch wrap-around!) */
++    u_int32_t ka_id; /* on startup: 1 */
++    /* Other properties. */
++    u_int16_t version;
++    u_int16_t firmware_rev;
++    u_int8_t  hostname[64], vendor[64];
++    /* XXX these are only PNS properties, currently XXX */
++    /* Call assignment information. */
++    u_int16_t call_serial_number;
++    VECTOR *call;
++    void * closure;
++    pptp_conn_cb callback;
++    /******* IO buffers ******/
++    char * read_buffer, *write_buffer;
++    size_t read_alloc,   write_alloc;
++    size_t read_size,    write_size;
++};
++
++struct PPTP_CALL {
++    /* Call properties */
++    enum {
++        PPTP_CALL_PAC, PPTP_CALL_PNS
++    } call_type;
++    union {
++        enum pptp_pac_state {
++            PAC_IDLE, PAC_WAIT_REPLY, PAC_ESTABLISHED, PAC_WAIT_CS_ANS
++        } pac;
++        enum pptp_pns_state {
++            PNS_IDLE, PNS_WAIT_REPLY, PNS_ESTABLISHED, PNS_WAIT_DISCONNECT
++        } pns;
++    } state;
++    u_int16_t call_id, peer_call_id;
++    u_int16_t sernum;
++    u_int32_t speed;
++    /* For user data: */
++    pptp_call_cb callback;
++    void * closure;
++};
++
++
++/* PPTP error codes: ----------------------------------------------*/
++
++/* (General Error Codes) */
++static const struct {
++    const char *name, *desc;
++} pptp_general_errors[] = {
++#define PPTP_GENERAL_ERROR_NONE                 0
++    { "(None)", "No general error" },
++#define PPTP_GENERAL_ERROR_NOT_CONNECTED        1
++    { "(Not-Connected)", "No control connection exists yet for this "
++        "PAC-PNS pair" },
++#define PPTP_GENERAL_ERROR_BAD_FORMAT           2
++    { "(Bad-Format)", "Length is wrong or Magic Cookie value is incorrect" },
++#define PPTP_GENERAL_ERROR_BAD_VALUE            3
++    { "(Bad-Value)", "One of the field values was out of range or "
++            "reserved field was non-zero" },
++#define PPTP_GENERAL_ERROR_NO_RESOURCE          4
++    { "(No-Resource)", "Insufficient resources to handle this command now" },
++#define PPTP_GENERAL_ERROR_BAD_CALLID           5
++    { "(Bad-Call ID)", "The Call ID is invalid in this context" },
++#define PPTP_GENERAL_ERROR_PAC_ERROR            6
++    { "(PAC-Error)", "A generic vendor-specific error occured in the PAC" }
++};
++
++#define  MAX_GENERAL_ERROR ( sizeof(pptp_general_errors) / \
++        sizeof(pptp_general_errors[0]) - 1)
++
++/* Outgoing Call Reply Result Codes */
++static const char *pptp_out_call_reply_result[] = {
++/* 0 */	"Unknown Result Code",
++/* 1 */	"Connected",
++/* 2 */	"General Error",
++/* 3 */	"No Carrier Detected",
++/* 4 */	"Busy Signal",
++/* 5 */	"No Dial Tone",
++/* 6 */	"Time Out",
++/* 7 */	"Not Accepted, Call is administratively prohibited" };
++
++#define MAX_OUT_CALL_REPLY_RESULT 7
++
++/* Call Disconnect Notify  Result Codes */
++static const char *pptp_call_disc_ntfy[] = {
++/* 0 */	"Unknown Result Code",
++/* 1 */	"Lost Carrier",
++/* 2 */	"General Error",
++/* 3 */	"Administrative Shutdown",
++/* 4 */	"(your) Request" };
++
++#define MAX_CALL_DISC_NTFY 4
++
++/* Call Disconnect Notify  Result Codes */
++static const char *pptp_start_ctrl_conn_rply[] = {
++/* 0 */	"Unknown Result Code",
++/* 1 */	"Successful Channel Establishment",
++/* 2 */	"General Error",
++/* 3 */	"Command Channel Already Exists",
++/* 4 */	"Requester is not Authorized" };
++
++#define MAX_START_CTRL_CONN_REPLY 4
++
++/* timing options */
++int idle_wait = PPTP_TIMEOUT;
++int max_echo_wait = PPTP_TIMEOUT;
++
++/* Local prototypes */
++static void pptp_reset_timer(void);
++static void pptp_handle_timer();
++/* Write/read as much as we can without blocking. */
++int pptp_write_some(PPTP_CONN * conn);
++int pptp_read_some(PPTP_CONN * conn);
++/* Make valid packets from read_buffer */
++int pptp_make_packet(PPTP_CONN * conn, void **buf, size_t *size);
++/* Add packet to write_buffer */
++int pptp_send_ctrl_packet(PPTP_CONN * conn, void * buffer, size_t size);
++/* Dispatch packets (general) */
++int pptp_dispatch_packet(PPTP_CONN * conn, void * buffer, size_t size);
++/* Dispatch packets (control messages) */
++int ctrlp_disp(PPTP_CONN * conn, void * buffer, size_t size);
++/* Set link info, for pptp servers that need it.
++   this is a noop, unless the user specified a quirk and
++   there's a set_link hook defined in the quirks table
++   for that quirk */
++void pptp_set_link(PPTP_CONN * conn, int peer_call_id);
++
++/*** log error information in control packets *********************************/
++static void ctrlp_error( int result, int error, int cause,
++        const char *result_text[], int max_result)
++{
++    if( cause >= 0)
++        warn("Result code is %d '%s'. Error code is %d, Cause code is %d",
++                result, result_text[result <= max_result ?  result : 0], error,
++                cause );
++    else
++        warn("Reply result code is %d '%s'. Error code is %d",
++                result, result_text[result <= max_result ?  result : 0], error);
++    if ((error > 0) && (error <= MAX_GENERAL_ERROR)){
++        if( result != PPTP_RESULT_GENERAL_ERROR )
++            warn("Result code is something else then \"general error\", "
++                    "so the following error is probably bogus.");
++        warn("Error is '%s', Error message: '%s'",
++                pptp_general_errors[error].name,
++                pptp_general_errors[error].desc);
++    }
++}
++
++static const char *ctrl_msg_types[] = {
++         "invalid control message type",
++/*         (Control Connection Management) */
++         "Start-Control-Connection-Request",            /* 1 */
++         "Start-Control-Connection-Reply",              /* 2 */
++         "Stop-Control-Connection-Request",             /* 3 */
++         "Stop-Control-Connection-Reply",               /* 4 */
++         "Echo-Request",                                /* 5 */
++         "Echo-Reply",                                  /* 6 */
++/*         (Call Management) */
++         "Outgoing-Call-Request",                       /* 7 */
++         "Outgoing-Call-Reply",                         /* 8 */
++         "Incoming-Call-Request",                       /* 9 */
++         "Incoming-Call-Reply",                        /* 10 */
++         "Incoming-Call-Connected",                    /* 11 */
++         "Call-Clear-Request",                         /* 12 */
++         "Call-Disconnect-Notify",                     /* 13 */
++/*         (Error Reporting) */
++         "WAN-Error-Notify",                           /* 14 */
++/*         (PPP Session Control) */
++         "Set-Link-Info"                              /* 15 */
++};
++#define MAX_CTRLMSG_TYPE 15
++
++/*** report a sent packet ****************************************************/
++static void ctrlp_rep( void * buffer, int size, int isbuff)
++{
++    struct pptp_header *packet = buffer;
++    unsigned int type;
++    if(size < sizeof(struct pptp_header)) return;
++    type = ntoh16(packet->ctrl_type);
++    /* FIXME: do not report sending echo requests as long as they are
++     * sent in a signal handler. This may dead lock as the syslog call
++     * is not reentrant */
++    if( type ==  PPTP_ECHO_RQST ) return;
++    /* don't keep reporting sending of echo's */
++    if( (type == PPTP_ECHO_RQST || type == PPTP_ECHO_RPLY) && nlogecho <= 0 ) return;
++    dbglog("%s control packet type is %d '%s'\n",isbuff ? "Buffered" : "Sent",
++            type, ctrl_msg_types[type <= MAX_CTRLMSG_TYPE ? type : 0]);
++
++}
++
++
++
++/* Open new pptp_connection.  Returns NULL on failure. */
++PPTP_CONN * pptp_conn_open(int inet_sock, int isclient, pptp_conn_cb callback)
++{
++    PPTP_CONN *conn;
++    /* Allocate structure */
++    if ((conn = malloc(sizeof(*conn))) == NULL) return NULL;
++    if ((conn->call = vector_create()) == NULL) { free(conn); return NULL; }
++    /* Initialize */
++    conn->inet_sock = inet_sock;
++    conn->conn_state = CONN_IDLE;
++    conn->ka_state  = KA_NONE;
++    conn->ka_id     = 1;
++    conn->call_serial_number = 0;
++    conn->callback  = callback;
++    /* Create I/O buffers */
++    conn->read_size = conn->write_size = 0;
++    conn->read_alloc = conn->write_alloc = INITIAL_BUFSIZE;
++    conn->read_buffer =
++        malloc(sizeof(*(conn->read_buffer)) * conn->read_alloc);
++    conn->write_buffer =
++        malloc(sizeof(*(conn->write_buffer)) * conn->write_alloc);
++    if (conn->read_buffer == NULL || conn->write_buffer == NULL) {
++        if (conn->read_buffer  != NULL) free(conn->read_buffer);
++        if (conn->write_buffer != NULL) free(conn->write_buffer);
++        vector_destroy(conn->call); free(conn); return NULL;
++    }
++    /* Make this socket non-blocking. */
++    fcntl(conn->inet_sock, F_SETFL, O_NONBLOCK);
++    /* Request connection from server, if this is a client */
++    if (isclient) {
++        struct pptp_start_ctrl_conn packet = {
++            PPTP_HEADER_CTRL(PPTP_START_CTRL_CONN_RQST),
++            hton16(PPTP_VERSION), 0, 0,
++            hton32(PPTP_FRAME_CAP), hton32(PPTP_BEARER_CAP),
++            hton16(PPTP_MAX_CHANNELS), hton16(PPTP_FIRMWARE_VERSION),
++            PPTP_HOSTNAME, PPTP_VENDOR
++        };
++        /* fix this packet, if necessary */
++        int idx, rc;
++        idx = get_quirk_index();
++        if (idx != -1 && pptp_fixups[idx].start_ctrl_conn) {
++            if ((rc = pptp_fixups[idx].start_ctrl_conn(&packet)))
++                warn("calling the start_ctrl_conn hook failed (%d)", rc);
++        }
++        if (pptp_send_ctrl_packet(conn, &packet, sizeof(packet)))
++            conn->conn_state = CONN_WAIT_CTL_REPLY;
++        else
++            return NULL; /* could not send initial start request. */
++    }
++    /* Set up interval/keep-alive timer */
++    /*   First, register handler for SIGALRM */
++    sigpipe_create();
++    sigpipe_assign(SIGALRM);
++    global.conn = conn;
++    /* Reset event timer */
++    pptp_reset_timer();
++    /* all done. */
++    return conn;
++}
++
++int pptp_conn_established(PPTP_CONN *conn) {
++  return (conn->conn_state == CONN_ESTABLISHED);
++}
++
++/* This currently *only* works for client call requests.
++ * We need to do something else to allocate calls for incoming requests.
++ */
++PPTP_CALL * pptp_call_open(PPTP_CONN * conn, int call_id,pptp_call_cb callback,
++        char *phonenr,int window)
++{
++    PPTP_CALL * call;
++    int idx, rc;
++    /* Send off the call request */
++    struct pptp_out_call_rqst packet = {
++        PPTP_HEADER_CTRL(PPTP_OUT_CALL_RQST),
++        0,0, /*call_id, sernum */
++        hton32(PPTP_BPS_MIN), hton32(PPTP_BPS_MAX),
++        hton32(PPTP_BEARER_CAP), hton32(PPTP_FRAME_CAP),
++        hton16(window), 0, 0, 0, {0}, {0}
++    };
++    assert(conn && conn->call);
++    assert(conn->conn_state == CONN_ESTABLISHED);
++    /* Assign call id */
++    if (!call_id && !vector_scan(conn->call, 0, PPTP_MAX_CHANNELS - 1, &call_id))
++        /* no more calls available! */
++        return NULL;
++    /* allocate structure. */
++    if ((call = malloc(sizeof(*call))) == NULL) return NULL;
++    /* Initialize call structure */
++    call->call_type = PPTP_CALL_PNS;
++    call->state.pns = PNS_IDLE;
++    call->call_id   = (u_int16_t) call_id;
++    call->sernum    = conn->call_serial_number++;
++    call->callback  = callback;
++    call->closure   = NULL;
++    packet.call_id = htons(call->call_id);
++    packet.call_sernum = htons(call->sernum);
++    /* if we have a quirk, build a new packet to fit it */
++    idx = get_quirk_index();
++    if (idx != -1 && pptp_fixups[idx].out_call_rqst_hook) {
++        if ((rc = pptp_fixups[idx].out_call_rqst_hook(&packet)))
++            warn("calling the out_call_rqst hook failed (%d)", rc);
++    }
++    /* fill in the phone number if it was specified */
++    if (phonenr) {
++        strncpy(packet.phone_num, phonenr, sizeof(packet.phone_num));
++        packet.phone_len = strlen(phonenr);
++        if( packet.phone_len > sizeof(packet.phone_num))
++            packet.phone_len = sizeof(packet.phone_num);
++        packet.phone_len = hton16 (packet.phone_len);
++    }
++    if (pptp_send_ctrl_packet(conn, &packet, sizeof(packet))) {
++        pptp_reset_timer();
++        call->state.pns = PNS_WAIT_REPLY;
++        /* and add it to the call vector */
++        vector_insert(conn->call, call_id, call);
++        return call;
++    } else { /* oops, unsuccessful. Deallocate. */
++        free(call);
++        return NULL;
++    }
++}
++
++/*** pptp_call_close **********************************************************/
++void pptp_call_close(PPTP_CONN * conn, PPTP_CALL * call)
++{
++    struct pptp_call_clear_rqst rqst = {
++        PPTP_HEADER_CTRL(PPTP_CALL_CLEAR_RQST), 0, 0
++    };
++    assert(conn && conn->call); assert(call);
++    assert(vector_contains(conn->call, call->call_id));
++    /* haven't thought about PAC yet */
++    assert(call->call_type == PPTP_CALL_PNS);
++    assert(call->state.pns != PNS_IDLE);
++    rqst.call_id = hton16(call->call_id);
++    /* don't check state against WAIT_DISCONNECT... allow multiple disconnect
++     * requests to be made.
++     */
++    pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst));
++    pptp_reset_timer();
++    call->state.pns = PNS_WAIT_DISCONNECT;
++    /* call structure will be freed when we have confirmation of disconnect. */
++}
++
++/*** hard close ***************************************************************/
++void pptp_call_destroy(PPTP_CONN *conn, PPTP_CALL *call)
++{
++    assert(conn && conn->call); assert(call);
++    assert(vector_contains(conn->call, call->call_id));
++    /* notify */
++    if (call->callback != NULL) call->callback(conn, call, CALL_CLOSE_DONE);
++    /* deallocate */
++    vector_remove(conn->call, call->call_id);
++    free(call);
++}
++
++/*** this is a soft close *****************************************************/
++void pptp_conn_close(PPTP_CONN * conn, u_int8_t close_reason)
++{
++    struct pptp_stop_ctrl_conn rqst = {
++        PPTP_HEADER_CTRL(PPTP_STOP_CTRL_CONN_RQST),
++        hton8(close_reason), 0, 0
++    };
++    int i;
++    assert(conn && conn->call);
++    /* avoid repeated close attempts */
++    if (conn->conn_state == CONN_IDLE || conn->conn_state == CONN_WAIT_STOP_REPLY)
++        return;
++    /* close open calls, if any */
++    for (i = 0; i < vector_size(conn->call); i++)
++        pptp_call_close(conn, vector_get_Nth(conn->call, i));
++    /* now close connection */
++    info("Closing PPTP connection");
++    pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst));
++    pptp_reset_timer(); /* wait 60 seconds for reply */
++    conn->conn_state = CONN_WAIT_STOP_REPLY;
++    return;
++}
++
++/*** this is a hard close *****************************************************/
++void pptp_conn_destroy(PPTP_CONN * conn)
++{
++    int i;
++    assert(conn != NULL); assert(conn->call != NULL);
++    /* destroy all open calls */
++    for (i = 0; i < vector_size(conn->call); i++)
++        pptp_call_destroy(conn, vector_get_Nth(conn->call, i));
++    /* notify */
++    if (conn->callback != NULL) conn->callback(conn, CONN_CLOSE_DONE);
++    sigpipe_close();
++    close(conn->inet_sock);
++    /* deallocate */
++    vector_destroy(conn->call);
++    free(conn);
++}
++
++/*** Deal with messages, in a non-blocking manner
++ * Add file descriptors used by pptp to fd_set.
++ */
++void pptp_fd_set(PPTP_CONN * conn, fd_set * read_set, fd_set * write_set,
++                 int * max_fd)
++{
++    assert(conn && conn->call);
++    /* Add fd to write_set if there are outstanding writes. */
++    if (conn->write_size > 0)
++        FD_SET(conn->inet_sock, write_set);
++    /* Always add fd to read_set. (always want something to read) */
++    FD_SET(conn->inet_sock, read_set);
++    if (*max_fd < conn->inet_sock) *max_fd = conn->inet_sock;
++    /* Add signal pipe file descriptor to set */
++    int sig_fd = sigpipe_fd();
++    FD_SET(sig_fd, read_set);
++    if (*max_fd < sig_fd) *max_fd = sig_fd;
++}
++
++/*** handle any pptp file descriptors set in fd_set, and clear them ***********/
++int pptp_dispatch(PPTP_CONN * conn, fd_set * read_set, fd_set * write_set)
++{
++    int r = 0;
++    assert(conn && conn->call);
++    /* Check for signals */
++    if (FD_ISSET(sigpipe_fd(), read_set)) {
++        if (sigpipe_read() == SIGALRM) pptp_handle_timer();
++	FD_CLR(sigpipe_fd(), read_set);
++    }
++    /* Check write_set could be set. */
++    if (FD_ISSET(conn->inet_sock, write_set)) {
++        FD_CLR(conn->inet_sock, write_set);
++        if (conn->write_size > 0)
++            r = pptp_write_some(conn);/* write as much as we can without blocking */
++    }
++    /* Check read_set */
++    if (r >= 0 && FD_ISSET(conn->inet_sock, read_set)) {
++        void *buffer; size_t size;
++        FD_CLR(conn->inet_sock, read_set);
++        r = pptp_read_some(conn); /* read as much as we can without blocking */
++	if (r < 0)
++	    return r;
++        /* make packets of the buffer, while we can. */
++        while (r >= 0 && pptp_make_packet(conn, &buffer, &size)) {
++            r = pptp_dispatch_packet(conn, buffer, size);
++            free(buffer);
++        }
++    }
++    /* That's all, folks.  Simple, eh? */
++    return r;
++}
++
++/*** Non-blocking write *******************************************************/
++int pptp_write_some(PPTP_CONN * conn) {
++    ssize_t retval;
++    assert(conn && conn->call);
++    retval = write(conn->inet_sock, conn->write_buffer, conn->write_size);
++    if (retval < 0) { /* error. */
++        if (errno == EAGAIN || errno == EINTR) {
++            return 0;
++        } else { /* a real error */
++            warn("write error: %s", strerror(errno));
++	    return -1;
++        }
++    }
++    assert(retval <= conn->write_size);
++    conn->write_size -= retval;
++    memmove(conn->write_buffer, conn->write_buffer + retval, conn->write_size);
++    ctrlp_rep(conn->write_buffer, retval, 0);
++    return 0;
++}
++
++/*** Non-blocking read ********************************************************/
++int pptp_read_some(PPTP_CONN * conn)
++{
++    ssize_t retval;
++    assert(conn && conn->call);
++    if (conn->read_size == conn->read_alloc) { /* need to alloc more memory */
++        char *new_buffer = realloc(conn->read_buffer,
++                sizeof(*(conn->read_buffer)) * conn->read_alloc * 2);
++        if (new_buffer == NULL) {
++            warn("Out of memory"); return -1;
++        }
++        conn->read_alloc *= 2;
++        conn->read_buffer = new_buffer;
++    }
++    retval = read(conn->inet_sock, conn->read_buffer + conn->read_size,
++            conn->read_alloc  - conn->read_size);
++    if (retval == 0) {
++        warn("read returned zero, peer has closed");
++        return -1;
++    }
++    if (retval < 0) {
++        if (errno == EINTR || errno == EAGAIN)
++	    return 0;
++        else { /* a real error */
++            warn("read error: %s", strerror(errno));
++            return -1;
++        }
++    }
++    conn->read_size += retval;
++    assert(conn->read_size <= conn->read_alloc);
++    return 0;
++}
++
++/*** Packet formation *********************************************************/
++int pptp_make_packet(PPTP_CONN * conn, void **buf, size_t *size)
++{
++    struct pptp_header *header;
++    size_t bad_bytes = 0;
++    assert(conn && conn->call); assert(buf != NULL); assert(size != NULL);
++    /* Give up unless there are at least sizeof(pptp_header) bytes */
++    while ((conn->read_size-bad_bytes) >= sizeof(struct pptp_header)) {
++        /* Throw out bytes until we have a valid header. */
++        header = (struct pptp_header *) (conn->read_buffer + bad_bytes);
++        if (ntoh32(header->magic) != PPTP_MAGIC) goto throwitout;
++        if (ntoh16(header->reserved0) != 0)
++            warn("reserved0 field is not zero! (0x%x) Cisco feature? \n",
++                    ntoh16(header->reserved0));
++        if (ntoh16(header->length) < sizeof(struct pptp_header)) goto throwitout;
++        if (ntoh16(header->length) > PPTP_CTRL_SIZE_MAX) goto throwitout;
++        /* well.  I guess it's good. Let's see if we've got it all. */
++        if (ntoh16(header->length) > (conn->read_size-bad_bytes))
++            /* nope.  Let's wait until we've got it, then. */
++            goto flushbadbytes;
++        /* One last check: */
++        if ((ntoh16(header->pptp_type) == PPTP_MESSAGE_CONTROL) &&
++                (ntoh16(header->length) !=
++                         PPTP_CTRL_SIZE(ntoh16(header->ctrl_type))))
++            goto throwitout;
++        /* well, I guess we've got it. */
++        *size = ntoh16(header->length);
++        *buf = malloc(*size);
++        if (*buf == NULL) { warn("Out of memory."); return 0; /* ack! */ }
++        memcpy(*buf, conn->read_buffer + bad_bytes, *size);
++        /* Delete this packet from the read_buffer. */
++        conn->read_size -= (bad_bytes + *size);
++        memmove(conn->read_buffer, conn->read_buffer + bad_bytes + *size,
++                conn->read_size);
++        if (bad_bytes > 0)
++            warn("%lu bad bytes thrown away.", (unsigned long) bad_bytes);
++        return 1;
++throwitout:
++        bad_bytes++;
++    }
++flushbadbytes:
++    /* no more packets.  Let's get rid of those bad bytes */
++    conn->read_size -= bad_bytes;
++    memmove(conn->read_buffer, conn->read_buffer + bad_bytes, conn->read_size);
++    if (bad_bytes > 0)
++        warn("%lu bad bytes thrown away.", (unsigned long) bad_bytes);
++    return 0;
++}
++
++/*** pptp_send_ctrl_packet ****************************************************/
++int pptp_send_ctrl_packet(PPTP_CONN * conn, void * buffer, size_t size)
++{
++    assert(conn && conn->call); assert(buffer);
++    if( conn->write_size > 0) pptp_write_some( conn);
++    if( conn->write_size == 0) {
++        ssize_t retval;
++        retval = write(conn->inet_sock, buffer, size);
++        if (retval < 0) { /* error. */
++            if (errno == EAGAIN || errno == EINTR) {
++                /* ignore */;
++                retval = 0;
++            } else { /* a real error */
++                warn("write error: %s", strerror(errno));
++                pptp_conn_destroy(conn); /* shut down fast. */
++                return 0;
++            }
++        }
++        ctrlp_rep( buffer, retval, 0);
++        size -= retval;
++        if( size <= 0) return 1;
++    }
++    /* Shove anything not written into the write buffer */
++    if (conn->write_size + size > conn->write_alloc) { /* need more memory */
++        char *new_buffer = realloc(conn->write_buffer,
++                sizeof(*(conn->write_buffer)) * conn->write_alloc * 2);
++        if (new_buffer == NULL) {
++            warn("Out of memory"); return 0;
++        }
++        conn->write_alloc *= 2;
++        conn->write_buffer = new_buffer;
++    }
++    memcpy(conn->write_buffer + conn->write_size, buffer, size);
++    conn->write_size += size;
++    ctrlp_rep( buffer,size,1);
++    return 1;
++}
++
++/*** Packet Dispatch **********************************************************/
++int pptp_dispatch_packet(PPTP_CONN * conn, void * buffer, size_t size)
++{
++    int r = 0;
++    struct pptp_header *header = (struct pptp_header *)buffer;
++    assert(conn && conn->call); assert(buffer);
++    assert(ntoh32(header->magic) == PPTP_MAGIC);
++    assert(ntoh16(header->length) == size);
++    switch (ntoh16(header->pptp_type)) {
++        case PPTP_MESSAGE_CONTROL:
++            r = ctrlp_disp(conn, buffer, size);
++            break;
++        case PPTP_MESSAGE_MANAGE:
++            /* MANAGEMENT messages aren't even part of the spec right now. */
++            dbglog("PPTP management message received, but not understood.");
++            break;
++        default:
++            dbglog("Unknown PPTP control message type received: %u",
++                    (unsigned int) ntoh16(header->pptp_type));
++            break;
++    }
++    return r;
++}
++
++/*** log echo request/replies *************************************************/
++static void logecho( int type)
++{
++    /* hack to stop flooding the log files (the most interesting part is right
++     * after the connection built-up) */
++    if( nlogecho > 0) {
++        dbglog("Echo Re%s received.", type == PPTP_ECHO_RQST ? "quest" :"ply");
++        if( --nlogecho == 0)
++            dbglog("no more Echo Reply/Request packets will be reported.");
++    }
++}
++
++/*** pptp_dispatch_ctrl_packet ************************************************/
++int ctrlp_disp(PPTP_CONN * conn, void * buffer, size_t size)
++{
++    struct pptp_header *header = (struct pptp_header *)buffer;
++    u_int8_t close_reason = PPTP_STOP_NONE;
++    assert(conn && conn->call); assert(buffer);
++    assert(ntoh32(header->magic) == PPTP_MAGIC);
++    assert(ntoh16(header->length) == size);
++    assert(ntoh16(header->pptp_type) == PPTP_MESSAGE_CONTROL);
++    if (size < PPTP_CTRL_SIZE(ntoh16(header->ctrl_type))) {
++        warn("Invalid packet received [type: %d; length: %d].",
++                (int) ntoh16(header->ctrl_type), (int) size);
++        return 0;
++    }
++    switch (ntoh16(header->ctrl_type)) {
++        /* ----------- STANDARD Start-Session MESSAGES ------------ */
++        case PPTP_START_CTRL_CONN_RQST:
++        {
++            struct pptp_start_ctrl_conn *packet =
++                (struct pptp_start_ctrl_conn *) buffer;
++            struct pptp_start_ctrl_conn reply = {
++                PPTP_HEADER_CTRL(PPTP_START_CTRL_CONN_RPLY),
++                hton16(PPTP_VERSION), 0, 0,
++                hton32(PPTP_FRAME_CAP), hton32(PPTP_BEARER_CAP),
++                hton16(PPTP_MAX_CHANNELS), hton16(PPTP_FIRMWARE_VERSION),
++                PPTP_HOSTNAME, PPTP_VENDOR };
++            int idx, rc;
++            dbglog("Received Start Control Connection Request");
++            /* fix this packet, if necessary */
++            idx = get_quirk_index();
++            if (idx != -1 && pptp_fixups[idx].start_ctrl_conn) {
++                if ((rc = pptp_fixups[idx].start_ctrl_conn(&reply)))
++                    warn("calling the start_ctrl_conn hook failed (%d)", rc);
++            }
++            if (conn->conn_state == CONN_IDLE) {
++                if (ntoh16(packet->version) < PPTP_VERSION) {
++                    /* Can't support this (earlier) PPTP_VERSION */
++                    reply.version = packet->version;
++                    /* protocol version not supported */
++                    reply.result_code = hton8(5);
++                    pptp_send_ctrl_packet(conn, &reply, sizeof(reply));
++                    pptp_reset_timer(); /* give sender a chance for a retry */
++                } else { /* same or greater version */
++                    if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) {
++                        conn->conn_state = CONN_ESTABLISHED;
++                        dbglog("server connection ESTABLISHED.");
++                        pptp_reset_timer();
++                    }
++                }
++            }
++            break;
++        }
++        case PPTP_START_CTRL_CONN_RPLY:
++        {
++            struct pptp_start_ctrl_conn *packet =
++                (struct pptp_start_ctrl_conn *) buffer;
++            dbglog("Received Start Control Connection Reply");
++            if (conn->conn_state == CONN_WAIT_CTL_REPLY) {
++                /* XXX handle collision XXX [see rfc] */
++                if (ntoh16(packet->version) != PPTP_VERSION) {
++                    if (conn->callback != NULL)
++                        conn->callback(conn, CONN_OPEN_FAIL);
++                    close_reason = PPTP_STOP_PROTOCOL;
++                    goto pptp_conn_close;
++                }
++                if (ntoh8(packet->result_code) != 1 &&
++                    /* J'ai change le if () afin que la connection ne se ferme
++                     * pas pour un "rien" :p adel@cybercable.fr -
++                     *
++                     * Don't close the connection if the result code is zero
++                     * (feature found in certain ADSL modems)
++                     */
++                        ntoh8(packet->result_code) != 0) {
++                    dbglog("Negative reply received to our Start Control "
++                            "Connection Request");
++                    ctrlp_error(packet->result_code, packet->error_code,
++                            -1, pptp_start_ctrl_conn_rply,
++                            MAX_START_CTRL_CONN_REPLY);
++                    if (conn->callback != NULL)
++                        conn->callback(conn, CONN_OPEN_FAIL);
++                    close_reason = PPTP_STOP_PROTOCOL;
++                    goto pptp_conn_close;
++                }
++                conn->conn_state = CONN_ESTABLISHED;
++                /* log session properties */
++                conn->version      = ntoh16(packet->version);
++                conn->firmware_rev = ntoh16(packet->firmware_rev);
++                memcpy(conn->hostname, packet->hostname, sizeof(conn->hostname));
++                memcpy(conn->vendor, packet->vendor, sizeof(conn->vendor));
++                pptp_reset_timer(); /* 60 seconds until keep-alive */
++                dbglog("Client connection established.");
++                if (conn->callback != NULL)
++                    conn->callback(conn, CONN_OPEN_DONE);
++            } /* else goto pptp_conn_close; */
++            break;
++        }
++            /* ----------- STANDARD Stop-Session MESSAGES ------------ */
++        case PPTP_STOP_CTRL_CONN_RQST:
++        {
++            /* conn_state should be CONN_ESTABLISHED, but it could be
++             * something else */
++            struct pptp_stop_ctrl_conn reply = {
++                PPTP_HEADER_CTRL(PPTP_STOP_CTRL_CONN_RPLY),
++                hton8(1), hton8(PPTP_GENERAL_ERROR_NONE), 0
++            };
++            dbglog("Received Stop Control Connection Request.");
++            if (conn->conn_state == CONN_IDLE) break;
++            if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) {
++                if (conn->callback != NULL)
++                    conn->callback(conn, CONN_CLOSE_RQST);
++                conn->conn_state = CONN_IDLE;
++		return -1;
++            }
++            break;
++        }
++        case PPTP_STOP_CTRL_CONN_RPLY:
++        {
++            dbglog("Received Stop Control Connection Reply.");
++            /* conn_state should be CONN_WAIT_STOP_REPLY, but it
++             * could be something else */
++            if (conn->conn_state == CONN_IDLE) break;
++            conn->conn_state = CONN_IDLE;
++	    return -1;
++        }
++            /* ----------- STANDARD Echo/Keepalive MESSAGES ------------ */
++        case PPTP_ECHO_RPLY:
++        {
++            struct pptp_echo_rply *packet =
++                (struct pptp_echo_rply *) buffer;
++            logecho( PPTP_ECHO_RPLY);
++            if ((conn->ka_state == KA_OUTSTANDING) &&
++                    (ntoh32(packet->identifier) == conn->ka_id)) {
++                conn->ka_id++;
++                conn->ka_state = KA_NONE;
++                pptp_reset_timer();
++            }
++            break;
++        }
++        case PPTP_ECHO_RQST:
++        {
++            struct pptp_echo_rqst *packet =
++                (struct pptp_echo_rqst *) buffer;
++            struct pptp_echo_rply reply = {
++                PPTP_HEADER_CTRL(PPTP_ECHO_RPLY),
++                packet->identifier, /* skip hton32(ntoh32(id)) */
++                hton8(1), hton8(PPTP_GENERAL_ERROR_NONE), 0
++            };
++            logecho( PPTP_ECHO_RQST);
++            pptp_send_ctrl_packet(conn, &reply, sizeof(reply));
++            pptp_reset_timer();
++            break;
++        }
++            /* ----------- OUTGOING CALL MESSAGES ------------ */
++        case PPTP_OUT_CALL_RQST:
++        {
++            struct pptp_out_call_rqst *packet =
++                (struct pptp_out_call_rqst *)buffer;
++            struct pptp_out_call_rply reply = {
++                PPTP_HEADER_CTRL(PPTP_OUT_CALL_RPLY),
++                0 /* callid */, packet->call_id, 1, PPTP_GENERAL_ERROR_NONE, 0,
++                hton32(PPTP_CONNECT_SPEED),
++                hton16(PPTP_WINDOW), hton16(PPTP_DELAY), 0
++            };
++            dbglog("Received Outgoing Call Request.");
++            /* XXX PAC: eventually this should make an outgoing call. XXX */
++            reply.result_code = hton8(7); /* outgoing calls verboten */
++            pptp_send_ctrl_packet(conn, &reply, sizeof(reply));
++            break;
++        }
++        case PPTP_OUT_CALL_RPLY:
++        {
++            struct pptp_out_call_rply *packet =
++                (struct pptp_out_call_rply *)buffer;
++            PPTP_CALL * call;
++            u_int16_t callid = ntoh16(packet->call_id_peer);
++            dbglog("Received Outgoing Call Reply.");
++            if (!vector_search(conn->call, (int) callid, &call)) {
++                dbglog("PPTP_OUT_CALL_RPLY received for non-existant call: "
++                        "peer call ID (us)  %d call ID (them) %d.",
++                        callid, ntoh16(packet->call_id));
++                break;
++            }
++            if (call->call_type != PPTP_CALL_PNS) {
++                dbglog("Ack!  How did this call_type get here?"); /* XXX? */
++                break;
++            }
++            if (call->state.pns != PNS_WAIT_REPLY) {
++                warn("Unexpected(?) Outgoing Call Reply will be ignored.");
++                break;
++            }
++            /* check for errors */
++            if (packet->result_code != 1) {
++                /* An error.  Log it verbosely. */
++                dbglog("Our outgoing call request [callid %d] has not been "
++                        "accepted.", (int) callid);
++                ctrlp_error(packet->result_code, packet->error_code,
++                        packet->cause_code, pptp_out_call_reply_result,
++                        MAX_OUT_CALL_REPLY_RESULT);
++                call->state.pns = PNS_IDLE;
++                if (call->callback != NULL)
++                    call->callback(conn, call, CALL_OPEN_FAIL);
++                pptp_call_destroy(conn, call);
++            } else {
++                /* connection established */
++                call->state.pns = PNS_ESTABLISHED;
++                call->peer_call_id = ntoh16(packet->call_id);
++                call->speed        = ntoh32(packet->speed);
++                pptp_reset_timer();
++                /* call pptp_set_link. unless the user specified a quirk
++                   and this quirk has a set_link hook, this is a noop */
++                pptp_set_link(conn, call->peer_call_id);
++                if (call->callback != NULL)
++                    call->callback(conn, call, CALL_OPEN_DONE);
++                dbglog("Outgoing call established (call ID %u, peer's "
++                        "call ID %u).\n", call->call_id, call->peer_call_id);
++            }
++            break;
++        }
++            /* ----------- INCOMING CALL MESSAGES ------------ */
++            /* XXX write me XXX */
++            /* ----------- CALL CONTROL MESSAGES ------------ */
++        case PPTP_CALL_CLEAR_RQST:
++        {
++            struct pptp_call_clear_rqst *packet =
++                (struct pptp_call_clear_rqst *)buffer;
++            struct pptp_call_clear_ntfy reply = {
++                PPTP_HEADER_CTRL(PPTP_CALL_CLEAR_NTFY), packet->call_id,
++                1, PPTP_GENERAL_ERROR_NONE, 0, 0, {0}
++            };
++            dbglog("Received Call Clear Request.");
++            if (vector_contains(conn->call, ntoh16(packet->call_id))) {
++                PPTP_CALL * call;
++                vector_search(conn->call, ntoh16(packet->call_id), &call);
++                if (call->callback != NULL)
++                    call->callback(conn, call, CALL_CLOSE_RQST);
++                pptp_send_ctrl_packet(conn, &reply, sizeof(reply));
++                pptp_call_destroy(conn, call);
++                dbglog("Call closed (RQST) (call id %d)", (int) call->call_id);
++            }
++            break;
++        }
++        case PPTP_CALL_CLEAR_NTFY:
++        {
++            struct pptp_call_clear_ntfy *packet =
++                (struct pptp_call_clear_ntfy *)buffer;
++            dbglog("Call disconnect notification received (call id %d)",
++                    ntoh16(packet->call_id));
++            if (vector_contains(conn->call, ntoh16(packet->call_id))) {
++                PPTP_CALL * call;
++                ctrlp_error(packet->result_code, packet->error_code,
++                        packet->cause_code, pptp_call_disc_ntfy,
++                        MAX_CALL_DISC_NTFY);
++                vector_search(conn->call, ntoh16(packet->call_id), &call);
++                pptp_call_destroy(conn, call);
++            }
++            /* XXX we could log call stats here XXX */
++            /* XXX not all servers send this XXX */
++            break;
++        }
++        case PPTP_SET_LINK_INFO:
++        {
++            /* I HAVE NO CLUE WHAT TO DO IF send_accm IS NOT 0! */
++            /* this is really dealt with in the HDLC deencapsulation, anyway. */
++            struct pptp_set_link_info *packet =
++                (struct pptp_set_link_info *)buffer;
++            /* log it. */
++            dbglog("PPTP_SET_LINK_INFO received from peer_callid %u",
++                    (unsigned int) ntoh16(packet->call_id_peer));
++            dbglog("  send_accm is %08lX, recv_accm is %08lX",
++                    (unsigned long) ntoh32(packet->send_accm),
++                    (unsigned long) ntoh32(packet->recv_accm));
++            if (!(ntoh32(packet->send_accm) == 0 &&
++                    ntoh32(packet->recv_accm) == 0))
++                warn("Non-zero Async Control Character Maps are not supported!");
++            break;
++        }
++        default:
++            dbglog("Unrecognized Packet %d received.",
++                    (int) ntoh16(((struct pptp_header *)buffer)->ctrl_type));
++            /* goto pptp_conn_close; */
++            break;
++    }
++    return 0;
++pptp_conn_close:
++    warn("pptp_conn_close(%d)", (int) close_reason);
++    pptp_conn_close(conn, close_reason);
++    return 0;
++}
++
++/*** pptp_set_link **************************************************************/
++void pptp_set_link(PPTP_CONN* conn, int peer_call_id)
++{
++    int idx, rc;
++    /* if we need to send a set_link packet because of buggy
++       hardware or pptp server, do it now */
++    if ((idx = get_quirk_index()) != -1 && pptp_fixups[idx].set_link_hook) {
++        struct pptp_set_link_info packet;
++        if ((rc = pptp_fixups[idx].set_link_hook(&packet, peer_call_id)))
++            warn("calling the set_link hook failed (%d)", rc);
++        if (pptp_send_ctrl_packet(conn, &packet, sizeof(packet))) {
++            pptp_reset_timer();
++        }
++    }
++}
++
++/*** Get info from call structure *********************************************/
++/* NOTE: The peer_call_id is undefined until we get a server response. */
++void pptp_call_get_ids(PPTP_CONN * conn, PPTP_CALL * call,
++		       u_int16_t * call_id, u_int16_t * peer_call_id)
++{
++    assert(conn != NULL); assert(call != NULL);
++    *call_id = call->call_id;
++    *peer_call_id = call->peer_call_id;
++}
++
++/*** pptp_call_closure_put ****************************************************/
++void   pptp_call_closure_put(PPTP_CONN * conn, PPTP_CALL * call, void *cl)
++{
++    assert(conn != NULL); assert(call != NULL);
++    call->closure = cl;
++}
++
++/*** pptp_call_closure_get ****************************************************/
++void * pptp_call_closure_get(PPTP_CONN * conn, PPTP_CALL * call)
++{
++    assert(conn != NULL); assert(call != NULL);
++    return call->closure;
++}
++
++/*** pptp_conn_closure_put ****************************************************/
++void   pptp_conn_closure_put(PPTP_CONN * conn, void *cl)
++{
++    assert(conn != NULL);
++    conn->closure = cl;
++}
++
++/*** pptp_conn_closure_get ****************************************************/
++void * pptp_conn_closure_get(PPTP_CONN * conn)
++{
++    assert(conn != NULL);
++    return conn->closure;
++}
++
++/*** Reset keep-alive timer ***************************************************/
++static void pptp_reset_timer(void)
++{
++    const struct itimerval tv = { {  0, 0 },   /* stop on time-out */
++        { idle_wait, 0 } };
++    if (idle_wait) setitimer(ITIMER_REAL, &tv, NULL);
++}
++
++
++/*** Handle keep-alive timer **************************************************/
++static void pptp_handle_timer()
++{
++    int i;
++    /* "Keep Alives and Timers, 1": check connection state */
++    if (global.conn->conn_state != CONN_ESTABLISHED) {
++        if (global.conn->conn_state == CONN_WAIT_STOP_REPLY)
++            /* hard close. */
++            pptp_conn_destroy(global.conn);
++        else /* soft close */
++            pptp_conn_close(global.conn, PPTP_STOP_NONE);
++    }
++    /* "Keep Alives and Timers, 2": check echo status */
++    if (global.conn->ka_state == KA_OUTSTANDING) {
++        /* no response to keep-alive */
++        info("closing control connection due to missing echo reply");
++	pptp_conn_close(global.conn, PPTP_STOP_NONE);
++    } else { /* ka_state == NONE */ /* send keep-alive */
++        struct pptp_echo_rqst rqst = {
++            PPTP_HEADER_CTRL(PPTP_ECHO_RQST), hton32(global.conn->ka_id) };
++        pptp_send_ctrl_packet(global.conn, &rqst, sizeof(rqst));
++        global.conn->ka_state = KA_OUTSTANDING;
++    }
++    /* check incoming/outgoing call states for !IDLE && !ESTABLISHED */
++    for (i = 0; i < vector_size(global.conn->call); i++) {
++        PPTP_CALL * call = vector_get_Nth(global.conn->call, i);
++        if (call->call_type == PPTP_CALL_PNS) {
++            if (call->state.pns == PNS_WAIT_REPLY) {
++                /* send close request */
++                pptp_call_close(global.conn, call);
++                assert(call->state.pns == PNS_WAIT_DISCONNECT);
++            } else if (call->state.pns == PNS_WAIT_DISCONNECT) {
++                /* hard-close the call */
++                pptp_call_destroy(global.conn, call);
++            }
++        } else if (call->call_type == PPTP_CALL_PAC) {
++            if (call->state.pac == PAC_WAIT_REPLY) {
++                /* XXX FIXME -- drop the PAC connection XXX */
++            } else if (call->state.pac == PAC_WAIT_CS_ANS) {
++                /* XXX FIXME -- drop the PAC connection XXX */
++            }
++        }
++    }
++    pptp_reset_timer();
++}
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_ctrl.h
+@@ -0,0 +1,57 @@
++/* pptp_ctrl.h ... handle PPTP control connection.
++ *                 C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: pptp_ctrl.h,v 1.5 2004/11/09 01:42:32 quozl Exp $
++ */
++
++#ifndef INC_PPTP_CTRL_H
++#define INC_PPTP_CTRL_H
++#include <sys/types.h>
++
++typedef struct PPTP_CONN PPTP_CONN;
++typedef struct PPTP_CALL PPTP_CALL;
++
++enum call_state { CALL_OPEN_RQST,  CALL_OPEN_DONE, CALL_OPEN_FAIL,
++		  CALL_CLOSE_RQST, CALL_CLOSE_DONE };
++enum conn_state { CONN_OPEN_RQST,  CONN_OPEN_DONE, CONN_OPEN_FAIL,
++		  CONN_CLOSE_RQST, CONN_CLOSE_DONE };
++
++typedef void (*pptp_call_cb)(PPTP_CONN*, PPTP_CALL*, enum call_state);
++typedef void (*pptp_conn_cb)(PPTP_CONN*, enum conn_state);
++
++/* if 'isclient' is true, then will send 'conn open' packet to other host.
++ * not necessary if this is being opened by a server process after
++ * receiving a conn_open packet from client.
++ */
++PPTP_CONN * pptp_conn_open(int inet_sock, int isclient,
++			   pptp_conn_cb callback);
++PPTP_CALL * pptp_call_open(PPTP_CONN * conn, int call_id,
++			   pptp_call_cb callback, char *phonenr,int window);
++int pptp_conn_established(PPTP_CONN * conn);
++/* soft close.  Will callback on completion. */
++void pptp_call_close(PPTP_CONN * conn, PPTP_CALL * call);
++/* hard close. */
++void pptp_call_destroy(PPTP_CONN *conn, PPTP_CALL *call);
++/* soft close.  Will callback on completion. */
++void pptp_conn_close(PPTP_CONN * conn, u_int8_t close_reason);
++/* hard close */
++void pptp_conn_destroy(PPTP_CONN * conn);
++
++/* Add file descriptors used by pptp to fd_set. */
++void pptp_fd_set(PPTP_CONN * conn, fd_set * read_set, fd_set * write_set, int *max_fd);
++/* handle any pptp file descriptors set in fd_set, and clear them */
++int pptp_dispatch(PPTP_CONN * conn, fd_set * read_set, fd_set * write_set);
++
++/* Get info about connection, call */
++void pptp_call_get_ids(PPTP_CONN * conn, PPTP_CALL * call,
++		       u_int16_t * call_id, u_int16_t * peer_call_id);
++/* Arbitrary user data about this call/connection.
++ * It is the caller's responsibility to free this data before calling
++ * pptp_call|conn_close()
++ */
++void * pptp_conn_closure_get(PPTP_CONN * conn);
++void   pptp_conn_closure_put(PPTP_CONN * conn, void *cl);
++void * pptp_call_closure_get(PPTP_CONN * conn, PPTP_CALL * call);
++void   pptp_call_closure_put(PPTP_CONN * conn, PPTP_CALL * call, void *cl);
++
++#endif /* INC_PPTP_CTRL_H */
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_msg.h
+@@ -0,0 +1,303 @@
++/*  pptp.h:  packet structures and magic constants for the PPTP protocol 
++ *           C. Scott Ananian <cananian@alumni.princeton.edu>            
++ *
++ * $Id: pptp_msg.h,v 1.3 2003/02/15 10:37:21 quozl Exp $
++ */
++
++#ifndef INC_PPTP_H
++#define INC_PPTP_H
++
++/* Grab definitions of int16, int32, etc. */
++#include <sys/types.h>
++/* define "portable" htons, etc. */
++#define hton8(x)  (x)
++#define ntoh8(x)  (x)
++#define hton16(x) htons(x)
++#define ntoh16(x) ntohs(x)
++#define hton32(x) htonl(x)
++#define ntoh32(x) ntohl(x)
++
++/* PPTP magic numbers: ----------------------------------------- */
++
++#define PPTP_MAGIC 0x1A2B3C4D /* Magic cookie for PPTP datagrams */
++#define PPTP_PORT  1723       /* PPTP TCP port number            */
++#define PPTP_PROTO 47         /* PPTP IP protocol number         */
++
++/* Control Connection Message Types: --------------------------- */
++
++#define PPTP_MESSAGE_CONTROL		1
++#define PPTP_MESSAGE_MANAGE		2
++
++/* Control Message Types: -------------------------------------- */
++
++/* (Control Connection Management) */
++#define PPTP_START_CTRL_CONN_RQST	1
++#define PPTP_START_CTRL_CONN_RPLY	2
++#define PPTP_STOP_CTRL_CONN_RQST	3
++#define PPTP_STOP_CTRL_CONN_RPLY	4
++#define PPTP_ECHO_RQST			5
++#define PPTP_ECHO_RPLY			6
++
++/* (Call Management) */
++#define PPTP_OUT_CALL_RQST		7
++#define PPTP_OUT_CALL_RPLY		8
++#define PPTP_IN_CALL_RQST		9
++#define PPTP_IN_CALL_RPLY		10
++#define PPTP_IN_CALL_CONNECT		11
++#define PPTP_CALL_CLEAR_RQST		12
++#define PPTP_CALL_CLEAR_NTFY		13
++
++/* (Error Reporting) */
++#define PPTP_WAN_ERR_NTFY		14
++
++/* (PPP Session Control) */
++#define PPTP_SET_LINK_INFO		15
++
++/* PPTP version information: --------------------------------------*/
++#define PPTP_VERSION_STRING	"1.00"
++#define PPTP_VERSION		0x100
++#define PPTP_FIRMWARE_STRING	"0.01"
++#define PPTP_FIRMWARE_VERSION	0x001
++
++/* PPTP capabilities: ---------------------------------------------*/
++
++/* (Framing capabilities for msg sender) */
++#define PPTP_FRAME_ASYNC	1
++#define PPTP_FRAME_SYNC		2
++#define PPTP_FRAME_ANY          3
++
++/* (Bearer capabilities for msg sender) */
++#define PPTP_BEARER_ANALOG	1
++#define PPTP_BEARER_DIGITAL 	2
++#define PPTP_BEARER_ANY		3
++
++#define PPTP_RESULT_GENERAL_ERROR 2
++
++/* (Reasons to close a connection) */
++#define PPTP_STOP_NONE		  1 /* no good reason                        */
++#define PPTP_STOP_PROTOCOL	  2 /* can't support peer's protocol version */
++#define PPTP_STOP_LOCAL_SHUTDOWN  3 /* requester is being shut down          */
++
++/* PPTP datagram structures (all data in network byte order): ----------*/
++
++struct pptp_header {
++  u_int16_t length;	  /* message length in octets, including header */
++  u_int16_t pptp_type;	  /* PPTP message type. 1 for control message.  */
++  u_int32_t magic;	  /* this should be PPTP_MAGIC.                 */
++  u_int16_t ctrl_type;	  /* Control message type (0-15)                */
++  u_int16_t reserved0;	  /* reserved.  MUST BE ZERO.                   */
++};
++
++struct pptp_start_ctrl_conn { /* for control message types 1 and 2 */
++  struct pptp_header header;
++
++  u_int16_t version;      /* PPTP protocol version.  = PPTP_VERSION     */
++  u_int8_t  result_code;  /* these two fields should be zero on rqst msg*/
++  u_int8_t  error_code;   /* 0 unless result_code==2 (General Error)    */
++  u_int32_t framing_cap;  /* Framing capabilities                       */
++  u_int32_t bearer_cap;   /* Bearer Capabilities                        */
++  u_int16_t max_channels; /* Maximum Channels (=0 for PNS, PAC ignores) */
++  u_int16_t firmware_rev; /* Firmware or Software Revision              */
++  u_int8_t  hostname[64]; /* Host Name (64 octets, zero terminated)     */
++  u_int8_t  vendor[64];   /* Vendor string (64 octets, zero term.)      */
++  /* MS says that end of hostname/vendor fields should be filled with   */
++  /* octets of value 0, but Win95 PPTP driver doesn't do this.          */
++};
++
++struct pptp_stop_ctrl_conn { /* for control message types 3 and 4 */
++  struct pptp_header header;
++
++  u_int8_t reason_result; /* reason for rqst, result for rply          */
++  u_int8_t error_code;	  /* MUST be 0, unless rply result==2 (general err)*/
++  u_int16_t reserved1;    /* MUST be 0                                */
++};
++
++struct pptp_echo_rqst { /* for control message type 5 */
++  struct pptp_header header;
++  u_int32_t identifier;   /* arbitrary value set by sender which is used */
++                          /* to match up reply and request               */
++};
++
++struct pptp_echo_rply { /* for control message type 6 */
++  struct pptp_header header;
++  u_int32_t identifier;	  /* should correspond to id of rqst             */
++  u_int8_t result_code;
++  u_int8_t error_code;    /* =0, unless result_code==2 (general error)   */
++  u_int16_t reserved1;    /* MUST BE ZERO                                */
++};
++
++struct pptp_out_call_rqst { /* for control message type 7 */
++  struct pptp_header header;
++  u_int16_t call_id;	  /* Call ID (unique id used to multiplex data)  */
++  u_int16_t call_sernum;  /* Call Serial Number (used for logging)       */
++  u_int32_t bps_min;      /* Minimum BPS (lowest acceptable line speed)  */
++  u_int32_t bps_max;	  /* Maximum BPS (highest acceptable line speed) */
++  u_int32_t bearer;	  /* Bearer type                                 */
++  u_int32_t framing;      /* Framing type                                */
++  u_int16_t recv_size;	  /* Recv. Window Size (no. of buffered packets) */
++  u_int16_t delay;	  /* Packet Processing Delay (in 1/10 sec)       */
++  u_int16_t phone_len;	  /* Phone Number Length (num. of valid digits)  */
++  u_int16_t reserved1;    /* MUST BE ZERO				 */
++  u_int8_t  phone_num[64]; /* Phone Number (64 octets, null term.)       */
++  u_int8_t subaddress[64]; /* Subaddress (64 octets, null term.)         */
++};
++
++struct pptp_out_call_rply { /* for control message type 8 */
++  struct pptp_header header;
++  u_int16_t call_id;      /* Call ID (used to multiplex data over tunnel)*/
++  u_int16_t call_id_peer; /* Peer's Call ID (call_id of pptp_out_call_rqst)*/
++  u_int8_t  result_code;  /* Result Code (1 is no errors)                */
++  u_int8_t  error_code;   /* Error Code (=0 unless result_code==2)       */
++  u_int16_t cause_code;   /* Cause Code (addt'l failure information)     */
++  u_int32_t speed;        /* Connect Speed (in BPS)                      */
++  u_int16_t recv_size;    /* Recv. Window Size (no. of buffered packets) */
++  u_int16_t delay;	  /* Packet Processing Delay (in 1/10 sec)       */
++  u_int32_t channel;      /* Physical Channel ID (for logging)           */
++};
++
++struct pptp_in_call_rqst { /* for control message type 9 */
++  struct pptp_header header;
++  u_int16_t call_id;	  /* Call ID (unique id used to multiplex data)  */
++  u_int16_t call_sernum;  /* Call Serial Number (used for logging)       */
++  u_int32_t bearer;	  /* Bearer type                                 */
++  u_int32_t channel;      /* Physical Channel ID (for logging)           */
++  u_int16_t dialed_len;   /* Dialed Number Length (# of valid digits)    */
++  u_int16_t dialing_len;  /* Dialing Number Length (# of valid digits)   */
++  u_int8_t dialed_num[64]; /* Dialed Number (64 octets, zero term.)      */
++  u_int8_t dialing_num[64]; /* Dialing Number (64 octets, zero term.)    */
++  u_int8_t subaddress[64];  /* Subaddress (64 octets, zero term.)        */
++};
++
++struct pptp_in_call_rply { /* for control message type 10 */
++  struct pptp_header header;
++  u_int16_t call_id;      /* Call ID (used to multiplex data over tunnel)*/
++  u_int16_t call_id_peer; /* Peer's Call ID (call_id of pptp_out_call_rqst)*/
++  u_int8_t  result_code;  /* Result Code (1 is no errors)                */
++  u_int8_t  error_code;   /* Error Code (=0 unless result_code==2)       */
++  u_int16_t recv_size;    /* Recv. Window Size (no. of buffered packets) */
++  u_int16_t delay;	  /* Packet Processing Delay (in 1/10 sec)       */
++  u_int16_t reserved1;    /* MUST BE ZERO                                */
++};
++
++struct pptp_in_call_connect { /* for control message type 11 */
++  struct pptp_header header;
++  u_int16_t call_id_peer; /* Peer's Call ID (call_id of pptp_out_call_rqst)*/
++  u_int16_t reserved1;    /* MUST BE ZERO                                */
++  u_int32_t speed;        /* Connect Speed (in BPS)                      */
++  u_int16_t recv_size;    /* Recv. Window Size (no. of buffered packets) */
++  u_int16_t delay;	  /* Packet Processing Delay (in 1/10 sec)       */
++  u_int32_t framing;      /* Framing type                                */
++};
++
++struct pptp_call_clear_rqst { /* for control message type 12 */
++  struct pptp_header header;
++  u_int16_t call_id;      /* Call ID (used to multiplex data over tunnel)*/
++  u_int16_t reserved1;    /* MUST BE ZERO                                */
++};
++
++struct pptp_call_clear_ntfy { /* for control message type 13 */
++  struct pptp_header header;
++  u_int16_t call_id;      /* Call ID (used to multiplex data over tunnel)*/
++  u_int8_t  result_code;  /* Result Code                                 */
++  u_int8_t  error_code;   /* Error Code (=0 unless result_code==2)       */
++  u_int16_t cause_code;   /* Cause Code (for ISDN, is Q.931 cause code)  */
++  u_int16_t reserved1;    /* MUST BE ZERO                                */
++  u_int8_t call_stats[128]; /* Call Statistics: 128 octets, ascii, 0-term */
++};
++
++struct pptp_wan_err_ntfy {    /* for control message type 14 */
++  struct pptp_header header;
++  u_int16_t call_id_peer; /* Peer's Call ID (call_id of pptp_out_call_rqst)*/
++  u_int16_t reserved1;    /* MUST BE ZERO                                */
++  u_int32_t crc_errors;   /* CRC errors 				 */
++  u_int32_t frame_errors; /* Framing errors 				 */
++  u_int32_t hard_errors;  /* Hardware overruns 				 */
++  u_int32_t buff_errors;  /* Buffer overruns				 */
++  u_int32_t time_errors;  /* Time-out errors				 */
++  u_int32_t align_errors; /* Alignment errors				 */
++};
++
++struct pptp_set_link_info {   /* for control message type 15 */
++  struct pptp_header header;
++  u_int16_t call_id_peer; /* Peer's Call ID (call_id of pptp_out_call_rqst) */
++  u_int16_t reserved1;    /* MUST BE ZERO                                   */
++  u_int32_t send_accm;    /* Send ACCM (for PPP packets; default 0xFFFFFFFF)*/
++  u_int32_t recv_accm;    /* Receive ACCM (for PPP pack.;default 0xFFFFFFFF)*/
++};
++
++/* helpful #defines: -------------------------------------------- */
++#define pptp_isvalid_ctrl(header, type, length) \
++ (!( ( ntoh16(((struct pptp_header *)header)->length)    < (length)  ) ||   \
++     ( ntoh16(((struct pptp_header *)header)->pptp_type) !=(type)    ) ||   \
++     ( ntoh32(((struct pptp_header *)header)->magic)     !=PPTP_MAGIC) ||   \
++     ( ntoh16(((struct pptp_header *)header)->ctrl_type) > PPTP_SET_LINK_INFO) || \
++     ( ntoh16(((struct pptp_header *)header)->reserved0) !=0         ) ))
++
++#define PPTP_HEADER_CTRL(type)  \
++{ hton16(PPTP_CTRL_SIZE(type)), \
++  hton16(PPTP_MESSAGE_CONTROL), \
++  hton32(PPTP_MAGIC),           \
++  hton16(type), 0 }             
++
++#define PPTP_CTRL_SIZE(type) ( \
++(type==PPTP_START_CTRL_CONN_RQST)?sizeof(struct pptp_start_ctrl_conn):	\
++(type==PPTP_START_CTRL_CONN_RPLY)?sizeof(struct pptp_start_ctrl_conn):	\
++(type==PPTP_STOP_CTRL_CONN_RQST )?sizeof(struct pptp_stop_ctrl_conn):	\
++(type==PPTP_STOP_CTRL_CONN_RPLY )?sizeof(struct pptp_stop_ctrl_conn):	\
++(type==PPTP_ECHO_RQST           )?sizeof(struct pptp_echo_rqst):	\
++(type==PPTP_ECHO_RPLY           )?sizeof(struct pptp_echo_rply):	\
++(type==PPTP_OUT_CALL_RQST       )?sizeof(struct pptp_out_call_rqst):	\
++(type==PPTP_OUT_CALL_RPLY       )?sizeof(struct pptp_out_call_rply):	\
++(type==PPTP_IN_CALL_RQST        )?sizeof(struct pptp_in_call_rqst):	\
++(type==PPTP_IN_CALL_RPLY        )?sizeof(struct pptp_in_call_rply):	\
++(type==PPTP_IN_CALL_CONNECT     )?sizeof(struct pptp_in_call_connect):	\
++(type==PPTP_CALL_CLEAR_RQST     )?sizeof(struct pptp_call_clear_rqst):	\
++(type==PPTP_CALL_CLEAR_NTFY     )?sizeof(struct pptp_call_clear_ntfy):	\
++(type==PPTP_WAN_ERR_NTFY        )?sizeof(struct pptp_wan_err_ntfy):	\
++(type==PPTP_SET_LINK_INFO       )?sizeof(struct pptp_set_link_info):	\
++0)
++#define max(a,b) (((a)>(b))?(a):(b))
++#define PPTP_CTRL_SIZE_MAX (			\
++max(sizeof(struct pptp_start_ctrl_conn),	\
++max(sizeof(struct pptp_echo_rqst),		\
++max(sizeof(struct pptp_echo_rply),		\
++max(sizeof(struct pptp_out_call_rqst),		\
++max(sizeof(struct pptp_out_call_rply),		\
++max(sizeof(struct pptp_in_call_rqst),		\
++max(sizeof(struct pptp_in_call_rply),		\
++max(sizeof(struct pptp_in_call_connect),	\
++max(sizeof(struct pptp_call_clear_rqst),	\
++max(sizeof(struct pptp_call_clear_ntfy),	\
++max(sizeof(struct pptp_wan_err_ntfy),		\
++max(sizeof(struct pptp_set_link_info), 0)))))))))))))
++
++
++/* gre header structure: -------------------------------------------- */
++
++#define PPTP_GRE_PROTO  0x880B
++#define PPTP_GRE_VER    0x1
++
++#define PPTP_GRE_FLAG_C	0x80
++#define PPTP_GRE_FLAG_R	0x40
++#define PPTP_GRE_FLAG_K	0x20
++#define PPTP_GRE_FLAG_S	0x10
++#define PPTP_GRE_FLAG_A	0x80
++
++#define PPTP_GRE_IS_C(f) ((f)&PPTP_GRE_FLAG_C)
++#define PPTP_GRE_IS_R(f) ((f)&PPTP_GRE_FLAG_R)
++#define PPTP_GRE_IS_K(f) ((f)&PPTP_GRE_FLAG_K)
++#define PPTP_GRE_IS_S(f) ((f)&PPTP_GRE_FLAG_S)
++#define PPTP_GRE_IS_A(f) ((f)&PPTP_GRE_FLAG_A)
++
++struct pptp_gre_header {
++  u_int8_t flags;		/* bitfield */
++  u_int8_t ver;			/* should be PPTP_GRE_VER (enhanced GRE) */
++  u_int16_t protocol;		/* should be PPTP_GRE_PROTO (ppp-encaps) */
++  u_int16_t payload_len;	/* size of ppp payload, not inc. gre header */
++  u_int16_t call_id;		/* peer's call_id for this session */
++  u_int32_t seq;		/* sequence number.  Present if S==1 */
++  u_int32_t ack;		/* seq number of highest packet recieved by */
++  				/*  sender in this session */
++};
++
++#endif /* INC_PPTP_H */
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_options.h
+@@ -0,0 +1,41 @@
++/* pptp_options.h ...... various constants used in the PPTP protocol.
++ *                       #define STANDARD to emulate NT 4.0 exactly.
++ *                       C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: pptp_options.h,v 1.3 2004/11/09 01:42:32 quozl Exp $
++ */
++
++#ifndef INC_PPTP_OPTIONS_H
++#define INC_PPTP_OPTIONS_H
++
++#undef  PPTP_FIRMWARE_STRING
++#undef  PPTP_FIRMWARE_VERSION
++#define PPTP_BUF_MAX 65536
++#define PPTP_TIMEOUT 60 /* seconds */
++extern int idle_wait;
++extern int max_echo_wait;
++#define PPTP_CONNECT_SPEED 1000000000
++#define PPTP_WINDOW 3
++#define PPTP_DELAY  0
++#define PPTP_BPS_MIN 2400
++#define PPTP_BPS_MAX 1000000000
++
++#ifndef STANDARD
++#define PPTP_MAX_CHANNELS 65535
++#define PPTP_FIRMWARE_STRING "0.01"
++#define PPTP_FIRMWARE_VERSION 0x001
++#define PPTP_HOSTNAME {'l','o','c','a','l',0}
++#define PPTP_VENDOR   {'c','a','n','a','n','i','a','n',0}
++#define PPTP_FRAME_CAP  PPTP_FRAME_ANY
++#define PPTP_BEARER_CAP PPTP_BEARER_ANY
++#else
++#define PPTP_MAX_CHANNELS 5
++#define PPTP_FIRMWARE_STRING "0.01"
++#define PPTP_FIRMWARE_VERSION 0
++#define PPTP_HOSTNAME {'l','o','c','a','l',0}
++#define PPTP_VENDOR   {'N','T',0}
++#define PPTP_FRAME_CAP  2
++#define PPTP_BEARER_CAP 1
++#endif
++
++#endif /* INC_PPTP_OPTIONS_H */
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_quirks.c
+@@ -0,0 +1,54 @@
++/* pptp_quirks.c ...... various options to fix quirks found in buggy adsl modems
++ *                      mulix <mulix@actcom.co.il>
++ *
++ * $Id: pptp_quirks.c,v 1.2 2001/11/23 03:42:51 quozl Exp $
++ */
++
++#include <string.h>
++#include "orckit_quirks.h"
++#include "pptp_quirks.h"
++
++static int quirk_index = -1;
++
++struct pptp_fixup pptp_fixups[] = {
++    {BEZEQ_ISRAEL, ORCKIT, ORCKIT_ATUR3,
++     orckit_atur3_build_hook,
++     orckit_atur3_start_ctrl_conn_hook,
++     orckit_atur3_set_link_hook}
++};
++
++static int fixups_sz = sizeof(pptp_fixups)/sizeof(pptp_fixups[0]);
++
++/* return 0 on success, non 0 otherwise */
++int set_quirk_index(int index)
++{
++    if (index >= 0 && index < fixups_sz) {
++	quirk_index = index;
++	return 0;
++    }
++
++    return -1;
++}
++
++int get_quirk_index()
++{
++    return quirk_index;
++}
++
++/* return the index for this isp in the quirks table, -1 if not found */
++int find_quirk(const char* isp_name)
++{
++    int i = 0;
++    if (isp_name) {
++	while (i < fixups_sz && pptp_fixups[i].isp) {
++	    if (!strcmp(pptp_fixups[i].isp, isp_name)) {
++		return i;
++	    }
++	    ++i;
++	}
++    }
++
++    return -1;
++}
++
++
+--- /dev/null
++++ b/pppd/plugins/pptp/pptp_quirks.h
+@@ -0,0 +1,59 @@
++/* pptp_quirks.h ...... various options to fix quirks found in buggy adsl modems
++ *                      mulix <mulix@actcom.co.il>
++ *
++ * $Id: pptp_quirks.h,v 1.1 2001/11/20 06:30:10 quozl Exp $
++ */
++
++#ifndef INC_PPTP_QUIRKS_H
++#define INC_PPTP_QUIRKS_H
++
++/* isp defs - correspond to slots in the fixups table */
++#define BEZEQ_ISRAEL "BEZEQ_ISRAEL"
++
++/* vendor defs */
++
++#define ORCKIT 1
++#define ALCATEL 2
++
++/* device defs */
++
++#define ORCKIT_ATUR2 1
++#define ORCKIT_ATUR3 2
++
++#include "pptp_msg.h"
++#include "pptp_ctrl.h"
++
++struct pptp_fixup {
++    const char* isp;    /* which isp? e.g. Bezeq in Israel */
++    int vendor; /* which vendor? e.g. Orckit */
++    int device; /* which device? e.g. Orckit Atur3 */
++
++    /* use this hook to build your own out call request packet */
++    int (*out_call_rqst_hook)(struct pptp_out_call_rqst* packet);
++
++    /* use this hook to build your own start control connection packet */
++    /* note that this hook is called from two different places, depending
++       on whether this is a request or reply */
++    int (*start_ctrl_conn)(struct pptp_start_ctrl_conn* packet);
++
++    /* use this hook if you need to send a 'set_link' packet once
++       the connection is established */
++    int (*set_link_hook)(struct pptp_set_link_info* packet,
++			 int peer_call_id);
++};
++
++extern struct pptp_fixup pptp_fixups[];
++
++/* find the index for this isp in the quirks table */
++/* return the index on success, -1 if not found */
++int find_quirk(const char* isp_name);
++
++/* set the global quirk index. return 0 on success, non 0 otherwise */
++int set_quirk_index(int index);
++
++/* get the global quirk index. return the index on success,
++   -1 if no quirk is defined */
++int get_quirk_index();
++
++
++#endif /* INC_PPTP_QUIRKS_H */
+--- /dev/null
++++ b/pppd/plugins/pptp/util.c
+@@ -0,0 +1,109 @@
++/* util.c ....... error message utilities.
++ *                C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: util.c,v 1.11 2005/08/22 00:49:48 quozl Exp $
++ */
++
++#include <stdio.h>
++#include <stdarg.h>
++#include <syslog.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include "util.h"
++
++#define MAKE_STRING(label) 				\
++va_list ap;						\
++char buf[256], string[256];				\
++va_start(ap, format);					\
++vsnprintf(buf, sizeof(buf), format, ap);		\
++snprintf(string, sizeof(string), "%s %s[%s:%s:%d]: %s",	\
++	 log_string, label, func, file, line, buf);	\
++va_end(ap)
++
++/*** connect a file to a file descriptor **************************************/
++int file2fd(const char *path, const char *mode, int fd)
++{
++    int ok = 0;
++    FILE *file = NULL;
++    file = fopen(path, mode);
++    if (file != NULL && dup2(fileno(file), fd) != -1)
++        ok = 1;
++    if (file) fclose(file);
++    return ok;
++}
++
++/* signal to pipe delivery implementation */
++#include <unistd.h>
++#include <fcntl.h>
++#include <signal.h>
++#include <string.h>
++
++/* pipe private to process */
++static int sigpipe[2];
++
++/* create a signal pipe, returns 0 for success, -1 with errno for failure */
++int sigpipe_create()
++{
++  int rc;
++  
++  rc = pipe(sigpipe);
++  if (rc < 0) return rc;
++  
++  fcntl(sigpipe[0], F_SETFD, FD_CLOEXEC);
++  fcntl(sigpipe[1], F_SETFD, FD_CLOEXEC);
++  
++#ifdef O_NONBLOCK
++#define FLAG_TO_SET O_NONBLOCK
++#else
++#ifdef SYSV
++#define FLAG_TO_SET O_NDELAY
++#else /* BSD */
++#define FLAG_TO_SET FNDELAY
++#endif
++#endif
++  
++  rc = fcntl(sigpipe[1], F_GETFL);
++  if (rc != -1)
++    rc = fcntl(sigpipe[1], F_SETFL, rc | FLAG_TO_SET);
++  if (rc < 0) return rc;
++  return 0;
++#undef FLAG_TO_SET
++}
++
++/* generic handler for signals, writes signal number to pipe */
++void sigpipe_handler(int signum)
++{
++  write(sigpipe[1], &signum, sizeof(signum));
++  signal(signum, sigpipe_handler);
++}
++
++/* assign a signal number to the pipe */
++void sigpipe_assign(int signum)
++{
++  struct sigaction sa;
++
++  memset(&sa, 0, sizeof(sa));
++  sa.sa_handler = sigpipe_handler;
++  sigaction(signum, &sa, NULL);
++}
++
++/* return the signal pipe read file descriptor for select(2) */
++int sigpipe_fd()
++{
++  return sigpipe[0];
++}
++
++/* read and return the pending signal from the pipe */
++int sigpipe_read()
++{
++  int signum;
++  read(sigpipe[0], &signum, sizeof(signum));
++  return signum;
++}
++
++void sigpipe_close()
++{
++  close(sigpipe[0]);
++  close(sigpipe[1]);
++}
++
+--- /dev/null
++++ b/pppd/plugins/pptp/util.h
+@@ -0,0 +1,31 @@
++/* util.h ....... error message utilities.
++ *                C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: util.h,v 1.6 2005/03/10 01:18:20 quozl Exp $
++ */
++
++#ifndef INC_UTIL_H
++#define INC_UTIL_H
++
++int file2fd(const char *path, const char *mode, int fd);
++
++/* signal to pipe delivery implementation */
++
++/* create a signal pipe, returns 0 for success, -1 with errno for failure */
++int sigpipe_create();
++
++/* generic handler for signals, writes signal number to pipe */
++void sigpipe_handler(int signum);
++
++/* assign a signal number to the pipe */
++void sigpipe_assign(int signum);
++
++/* return the signal pipe read file descriptor for select(2) */
++int sigpipe_fd();
++
++/* read and return the pending signal from the pipe */
++int sigpipe_read();
++
++void sigpipe_close();
++
++#endif /* INC_UTIL_H */
+--- /dev/null
++++ b/pppd/plugins/pptp/vector.c
+@@ -0,0 +1,209 @@
++/* vector.c ..... store a vector of PPTP_CALL information and search it
++ *                efficiently.
++ *                C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: vector.c,v 1.3 2003/06/17 10:12:55 reink Exp $
++ */
++
++#include <stdlib.h>
++#include <string.h>
++#include <assert.h>
++#include "pptp_ctrl.h"
++#include "vector.h"
++/* #define VECTOR_DEBUG */
++#ifndef TRUE
++#define TRUE 1
++#endif
++#ifndef FALSE
++#define FALSE 0
++#endif
++
++struct vector_item {
++    int key;
++    PPTP_CALL *call;
++};
++
++struct vector_struct {
++    struct vector_item *item;
++    int size;
++    int alloc;
++#ifdef VECTOR_DEBUG
++    int key_max;
++#endif
++};
++
++static struct vector_item *binary_search(VECTOR *v, int key);
++
++/*** vector_create ************************************************************/
++VECTOR *vector_create()
++{
++    const int INITIAL_SIZE = 4;
++
++    VECTOR *v = malloc(sizeof(*v));
++    if (v == NULL) return v;
++
++    v->size = 0;
++    v->alloc = INITIAL_SIZE;
++    v->item = malloc(sizeof(*(v->item)) * (v->alloc));
++#ifdef VECTOR_DEBUG
++    v->key_max = -1;
++#endif
++    if (v->item == NULL) { free(v); return NULL; }
++    else return v;
++}
++
++/*** vector_destroy ***********************************************************/
++void vector_destroy(VECTOR *v)
++{
++    free(v->item);
++#ifdef VECTOR_DEBUG
++    v->item = NULL;
++#endif
++    free(v);
++}
++
++/*** vector_size **************************************************************/
++int vector_size(VECTOR *v)
++{
++    assert(v != NULL);
++    return v->size;
++}
++
++/*** vector_insert*************************************************************
++ * nice thing about file descriptors is that we are assured by POSIX 
++ * that they are monotonically increasing.
++ */
++int vector_insert(VECTOR *v, int key, PPTP_CALL * call)
++{
++    int i;
++    assert(v != NULL && call != NULL);
++    assert(!vector_contains(v, key));
++#ifdef VECTOR_DEBUG
++    assert(v->key_max < key);
++#endif
++    if (!(v->size < v->alloc)) {
++        void *tmp = realloc(v->item, sizeof(*(v->item)) * 2 * v->alloc);
++        if (tmp != NULL) {
++            v->alloc *= 2;
++            v->item = tmp;
++        } else return FALSE; /* failed to alloc memory. */
++    }
++    assert(v->size < v->alloc);
++    /* for safety, we make this work in the general case;
++     * but this is optimized for adding call to the end of the vector.
++     */
++    for(i = v->size - 1; i >= 0; i--)
++        if (v->item[i].key < key)
++            break;
++    /* insert after item i */
++    memmove(&v->item[i + 2], &v->item[i + 1],
++            (v->size - i - 1) * sizeof(*(v->item)));
++    v->item[i + 1].key  = key;
++    v->item[i + 1].call = call;
++    v->size++;
++#ifdef VECTOR_DEBUG
++    if (v->key_max < key) /* ie, always. */
++        v->key_max = key;
++#endif
++    return TRUE;
++}
++
++/*** vector_remove ************************************************************/
++int  vector_remove(VECTOR *v, int key)
++{
++    struct vector_item *tmp;
++    assert(v != NULL);
++    if ((tmp =binary_search(v,key)) == NULL) return FALSE;
++    assert(tmp >= v->item && tmp < v->item + v->size);
++    memmove(tmp, tmp + 1, (v->size - (v->item - tmp) - 1) * sizeof(*(v->item)));
++    v->size--;
++    return TRUE;
++}
++
++/*** vector_search ************************************************************/
++int  vector_search(VECTOR *v, int key, PPTP_CALL **call)
++{
++    struct vector_item *tmp;
++    assert(v != NULL);
++    tmp = binary_search(v, key);
++    if (tmp ==NULL) return FALSE;
++    *call = tmp->call;
++    return TRUE;
++}
++
++/*** vector_contains **********************************************************/
++int  vector_contains(VECTOR *v, int key)
++{
++    assert(v != NULL);
++    return (binary_search(v, key) != NULL);
++}
++
++/*** vector_item **************************************************************/
++static struct vector_item *binary_search(VECTOR *v, int key)
++{
++    int l,r,x;
++    l = 0;
++    r = v->size - 1;
++    while (r >= l) {
++        x = (l + r)/2;
++        if (key <  v->item[x].key) r = x - 1; else l = x + 1;
++        if (key == v->item[x].key) return &(v->item[x]);
++    }
++    return NULL;
++}
++
++/*** vector_scan ***************************************************************
++ * Hmm.  Let's be fancy and use a binary search for the first
++ * unused key, taking advantage of the list is stored sorted; ie
++ * we can look at pointers and keys at two different locations, 
++ * and if (ptr1 - ptr2) = (key1 - key2) then all the slots
++ * between ptr1 and ptr2 are filled.  Note that ptr1-ptr2 should
++ * never be greater than key1-key2 (no duplicate keys!)... we
++ * check for this.
++ */
++int vector_scan(VECTOR *v, int lo, int hi, int *key)
++{
++    int l,r,x;
++    assert(v != NULL);
++    assert(key != NULL);
++    if ((v->size<1) || (lo < v->item[0].key)) { *key = lo; return TRUE; }
++    /* our array bounds */
++    l = 0;  r = v->size - 1;
++    while (r > l) {
++        /* check for a free spot right after l */
++        if (v->item[l].key + 1 < v->item[l + 1].key) { /* found it! */
++            *key = v->item[l].key + 1;
++            return TRUE;
++        }
++        /* no dice. Let's see if the free spot is before or after the midpoint */
++        x = (l + r)/2;
++        /* Okay, we have right (r), left (l) and the probe (x). */
++        assert(x - l <= v->item[x].key - v->item[l].key);
++        assert(r - x <= v->item[r].key - v->item[x].key);
++        if (x - l < v->item[x].key - v->item[l].key)
++            /* room between l and x */
++            r = x;
++        else /* no room between l and x */
++            if (r - x < v->item[r].key - v->item[x].key)
++                /* room between x and r */
++                l = x;
++            else /* no room between x and r, either */
++                break; /* game over, man. */
++    }
++    /* no room found in already allocated space.  Check to see if
++     * there's free space above allocated entries. */
++    if (v->item[v->size - 1].key < hi) {
++        *key = v->item[v->size - 1].key + 1;
++        return TRUE;
++    }
++    /* outta luck */
++    return FALSE;
++}
++
++/*** vector_get_Nth ***********************************************************/
++PPTP_CALL * vector_get_Nth(VECTOR *v, int n)
++{
++    assert(v != NULL);
++    assert(0 <= n && n < vector_size(v));
++    return v->item[n].call;
++}
+--- /dev/null
++++ b/pppd/plugins/pptp/vector.h
+@@ -0,0 +1,31 @@
++/* vector.h ..... store a vector of PPTP_CALL information and search it
++ *                efficiently.
++ *                C. Scott Ananian <cananian@alumni.princeton.edu>
++ *
++ * $Id: vector.h,v 1.1.1.1 2000/12/23 08:19:51 scott Exp $
++ */
++
++#ifndef INC_VECTOR_H
++#define INC_VECTOR_H
++
++#include "pptp_ctrl.h" /* for definition of PPTP_CALL */
++
++typedef struct vector_struct VECTOR;
++
++VECTOR *vector_create();
++void vector_destroy(VECTOR *v);
++
++int vector_size(VECTOR *v);
++
++/* vector_insert and vector_search return TRUE on success, FALSE on failure. */
++int  vector_insert(VECTOR *v, int key, PPTP_CALL * call);
++int  vector_remove(VECTOR *v, int key);
++int  vector_search(VECTOR *v, int key, PPTP_CALL ** call);
++/* vector_contains returns FALSE if not found, TRUE if found. */
++int  vector_contains(VECTOR *v, int key);
++/* find first unused key. Returns TRUE on success, FALSE if no. */
++int  vector_scan(VECTOR *v, int lo, int hi, int *key);
++/* get a specific PPTP_CALL ... useful only when iterating. */
++PPTP_CALL * vector_get_Nth(VECTOR *v, int n);
++
++#endif /* INC_VECTOR_H */
diff --git a/trunk/package/network/services/ppp/patches/510-pptp_compile_fix.patch b/trunk/package/network/services/ppp/patches/510-pptp_compile_fix.patch
new file mode 100644
index 00000000..04bb620e
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/510-pptp_compile_fix.patch
@@ -0,0 +1,11 @@
+--- a/pppd/plugins/pptp/pptp.c
++++ b/pppd/plugins/pptp/pptp.c
+@@ -48,7 +48,7 @@
+ 
+ #include "pptp_callmgr.h"
+ #include <net/if.h>
+-#include <net/ethernet.h>
++#include <linux/if_ether.h>
+ #include <linux/if_pppox.h>
+ 
+ #include <stdio.h>
diff --git a/trunk/package/network/services/ppp/patches/520-uniq.patch b/trunk/package/network/services/ppp/patches/520-uniq.patch
new file mode 100644
index 00000000..cbafe4cd
--- /dev/null
+++ b/trunk/package/network/services/ppp/patches/520-uniq.patch
@@ -0,0 +1,169 @@
+--- a/pppd/plugins/rp-pppoe/common.c
++++ b/pppd/plugins/rp-pppoe/common.c
+@@ -121,13 +121,13 @@ sendPADT(PPPoEConnection *conn, char con
+     /* If we're using Host-Uniq, copy it over */
+     if (conn->useHostUniq) {
+ 	PPPoETag hostUniq;
+-	pid_t pid = getpid();
++	int len = strlen(conn->useHostUniq);
+ 	hostUniq.type = htons(TAG_HOST_UNIQ);
+-	hostUniq.length = htons(sizeof(pid));
+-	memcpy(hostUniq.payload, &pid, sizeof(pid));
+-	memcpy(cursor, &hostUniq, sizeof(pid) + TAG_HDR_SIZE);
+-	cursor += sizeof(pid) + TAG_HDR_SIZE;
+-	plen += sizeof(pid) + TAG_HDR_SIZE;
++	hostUniq.length = htons(len);
++	memcpy(hostUniq.payload, conn->useHostUniq, len);
++	memcpy(cursor, &hostUniq, len + TAG_HDR_SIZE);
++	cursor += len + TAG_HDR_SIZE;
++	plen += len + TAG_HDR_SIZE;
+     }
+ 
+     /* Copy error message */
+--- a/pppd/plugins/rp-pppoe/discovery.c
++++ b/pppd/plugins/rp-pppoe/discovery.c
+@@ -104,7 +104,7 @@ parseForHostUniq(UINT16_t type, UINT16_t
+ static int
+ packetIsForMe(PPPoEConnection *conn, PPPoEPacket *packet)
+ {
+-    int forMe = 0;
++    char *uniq = conn->useHostUniq;
+ 
+     /* If packet is not directed to our MAC address, forget it */
+     if (memcmp(packet->ethHdr.h_dest, conn->myEth, ETH_ALEN)) return 0;
+@@ -112,8 +112,8 @@ packetIsForMe(PPPoEConnection *conn, PPP
+     /* If we're not using the Host-Unique tag, then accept the packet */
+     if (!conn->useHostUniq) return 1;
+ 
+-    parsePacket(packet, parseForHostUniq, &forMe);
+-    return forMe;
++    parsePacket(packet, parseForHostUniq, &uniq);
++    return uniq != 0;
+ }
+ 
+ /**********************************************************************
+@@ -303,14 +303,14 @@ sendPADI(PPPoEConnection *conn)
+     /* If we're using Host-Uniq, copy it over */
+     if (conn->useHostUniq) {
+ 	PPPoETag hostUniq;
+-	pid_t pid = getpid();
++	int len = strlen(conn->useHostUniq);
+ 	hostUniq.type = htons(TAG_HOST_UNIQ);
+-	hostUniq.length = htons(sizeof(pid));
+-	memcpy(hostUniq.payload, &pid, sizeof(pid));
+-	CHECK_ROOM(cursor, packet.payload, sizeof(pid) + TAG_HDR_SIZE);
+-	memcpy(cursor, &hostUniq, sizeof(pid) + TAG_HDR_SIZE);
+-	cursor += sizeof(pid) + TAG_HDR_SIZE;
+-	plen += sizeof(pid) + TAG_HDR_SIZE;
++	hostUniq.length = htons(len);
++	memcpy(hostUniq.payload, conn->useHostUniq, len);
++	CHECK_ROOM(cursor, packet.payload, len + TAG_HDR_SIZE);
++	memcpy(cursor, &hostUniq, len + TAG_HDR_SIZE);
++	cursor += len + TAG_HDR_SIZE;
++	plen += len + TAG_HDR_SIZE;
+     }
+ 
+     /* Add our maximum MTU/MRU */
+@@ -480,14 +480,14 @@ sendPADR(PPPoEConnection *conn)
+     /* If we're using Host-Uniq, copy it over */
+     if (conn->useHostUniq) {
+ 	PPPoETag hostUniq;
+-	pid_t pid = getpid();
++	int len = strlen(conn->useHostUniq);
+ 	hostUniq.type = htons(TAG_HOST_UNIQ);
+-	hostUniq.length = htons(sizeof(pid));
+-	memcpy(hostUniq.payload, &pid, sizeof(pid));
+-	CHECK_ROOM(cursor, packet.payload, sizeof(pid)+TAG_HDR_SIZE);
+-	memcpy(cursor, &hostUniq, sizeof(pid) + TAG_HDR_SIZE);
+-	cursor += sizeof(pid) + TAG_HDR_SIZE;
+-	plen += sizeof(pid) + TAG_HDR_SIZE;
++	hostUniq.length = htons(len);
++	memcpy(hostUniq.payload, conn->useHostUniq, len);
++	CHECK_ROOM(cursor, packet.payload, len+TAG_HDR_SIZE);
++	memcpy(cursor, &hostUniq, len + TAG_HDR_SIZE);
++	cursor += len + TAG_HDR_SIZE;
++	plen += len + TAG_HDR_SIZE;
+     }
+ 
+     /* Add our maximum MTU/MRU */
+--- a/pppd/plugins/rp-pppoe/plugin.c
++++ b/pppd/plugins/rp-pppoe/plugin.c
+@@ -65,6 +65,7 @@ static char *existingSession = NULL;
+ static int printACNames = 0;
+ static char *pppoe_reqd_mac = NULL;
+ unsigned char pppoe_reqd_mac_addr[6];
++static char *host_uniq = NULL;
+ 
+ static int PPPoEDevnameHook(char *cmd, char **argv, int doit);
+ static option_t Options[] = {
+@@ -82,6 +83,8 @@ static option_t Options[] = {
+       "Be verbose about discovered access concentrators"},
+     { "pppoe-mac", o_string, &pppoe_reqd_mac,
+       "Only connect to specified MAC address" },
++    { "host-uniq", o_string, &host_uniq,
++      "Specify custom Host-Uniq" },
+     { NULL }
+ };
+ int (*OldDevnameHook)(char *cmd, char **argv, int doit) = NULL;
+@@ -107,7 +110,7 @@ PPPOEInitDevice(void)
+     conn->ifName = devnam;
+     conn->discoverySocket = -1;
+     conn->sessionSocket = -1;
+-    conn->useHostUniq = 1;
++    conn->useHostUniq = NULL;
+     conn->printACNames = printACNames;
+     conn->discoveryTimeout = PADI_TIMEOUT;
+     return 1;
+@@ -163,6 +166,9 @@ PPPOEConnectDevice(void)
+     if (lcp_wantoptions[0].mru > ifr.ifr_mtu - TOTAL_OVERHEAD)
+ 	lcp_wantoptions[0].mru = ifr.ifr_mtu - TOTAL_OVERHEAD;
+ 
++    if(host_uniq)
++	conn->useHostUniq = host_uniq;
++
+     conn->acName = acName;
+     conn->serviceName = pppd_pppoe_service;
+     strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
+--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
++++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
+@@ -641,7 +641,7 @@ int main(int argc, char *argv[])
+ 
+     memset(conn, 0, sizeof(PPPoEConnection));
+ 
+-    while ((opt = getopt(argc, argv, "I:D:VUAS:C:h")) > 0) {
++    while ((opt = getopt(argc, argv, "I:D:VUW:AS:C:h")) > 0) {
+ 	switch(opt) {
+ 	case 'S':
+ 	    conn->serviceName = xstrdup(optarg);
+@@ -650,7 +650,19 @@ int main(int argc, char *argv[])
+ 	    conn->acName = xstrdup(optarg);
+ 	    break;
+ 	case 'U':
+-	    conn->useHostUniq = 1;
++	    if(conn->useHostUniq) {
++		fprintf(stderr, "-U and -W are mutually exclusive\n");
++		exit(EXIT_FAILURE);
++	    }
++	    conn->useHostUniq = malloc(12);
++	    snprintf(conn->useHostUniq, 12, "%d", getpid());
++	    break;
++	case 'W':
++	    if(conn->useHostUniq) {
++		fprintf(stderr, "-U and -W are mutually exclusive\n");
++		exit(EXIT_FAILURE);
++	    }
++	    conn->useHostUniq = xstrdup(optarg);
+ 	    break;
+ 	case 'D':
+ 	    conn->debugFile = fopen(optarg, "w");
+--- a/pppd/plugins/rp-pppoe/pppoe.h
++++ b/pppd/plugins/rp-pppoe/pppoe.h
+@@ -224,7 +224,7 @@ typedef struct PPPoEConnectionStruct {
+     char *serviceName;		/* Desired service name, if any */
+     char *acName;		/* Desired AC name, if any */
+     int synchronous;		/* Use synchronous PPP */
+-    int useHostUniq;		/* Use Host-Uniq tag */
++    char *useHostUniq;		/* Use Host-Uniq tag */
+     int printACNames;		/* Just print AC names */
+     FILE *debugFile;		/* Debug file for dumping packets */
+     int numPADOs;		/* Number of PADO packets received */
diff --git a/trunk/package/network/services/ppp/utils/pfc.c b/trunk/package/network/services/ppp/utils/pfc.c
new file mode 100644
index 00000000..7952c30c
--- /dev/null
+++ b/trunk/package/network/services/ppp/utils/pfc.c
@@ -0,0 +1,51 @@
+/* 
+ * Taken from fli4l 3.0
+ * Make sure you compile it against the same libpcap version used in libreCMC
+ */
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <string.h>
+
+#include <linux/types.h>
+#include <linux/ppp_defs.h>
+
+#include <pcap.h>
+#include <pcap-bpf.h>
+
+int main (int argc, char ** argv)
+{
+    pcap_t  *pc; /* Fake struct pcap so we can compile expr */
+    struct  bpf_program filter; /* Filter program for link-active pkts */
+    u_int32_t netmask=0;
+
+    int dflag = 3;
+    if (argc == 4)
+    {
+	if (!strcmp (argv[1], "-d"))
+	{
+	    dflag = atoi (argv[2]);
+	    argv += 2;
+	    argc -=2;
+	}
+    }
+    if (argc != 2)
+    {
+	printf ("usage; %s [ -d <debug_level> ] expression\n", argv[0]);
+	return 1;
+    }
+
+    pc = pcap_open_dead(DLT_PPP_PPPD, PPP_HDRLEN);
+    if (pcap_compile(pc, &filter, argv[1], 1, netmask) == 0)
+    {
+	printf ("#\n# Expression: %s\n#\n", argv[1]);
+	bpf_dump (&filter, dflag);
+	return 0;
+    }
+    else
+    {
+	printf("error in active-filter expression: %s\n", pcap_geterr(pc));
+    }
+    return 1;
+}
diff --git a/trunk/package/network/services/relayd/Makefile b/trunk/package/network/services/relayd/Makefile
new file mode 100644
index 00000000..8c5d3386
--- /dev/null
+++ b/trunk/package/network/services/relayd/Makefile
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2010-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=relayd
+PKG_VERSION:=2014-10-05
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=git://nbd.name/relayd.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=767c54d5957a2db0b847add771e8e890b82569c0
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/relayd
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=Transparent routing / relay daemon
+  DEPENDS:=+libubox
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+
+define Package/relayd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/relayd $(1)/usr/sbin/relayd
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files/relay.hotplug $(1)/etc/hotplug.d/iface/30-relay
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/relay.init $(1)/etc/init.d/relayd
+endef
+
+$(eval $(call BuildPackage,relayd))
diff --git a/trunk/package/network/services/relayd/files/relay.hotplug b/trunk/package/network/services/relayd/files/relay.hotplug
new file mode 100644
index 00000000..afffbfea
--- /dev/null
+++ b/trunk/package/network/services/relayd/files/relay.hotplug
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/relayd enabled && /etc/init.d/relayd start
diff --git a/trunk/package/network/services/relayd/files/relay.init b/trunk/package/network/services/relayd/files/relay.init
new file mode 100644
index 00000000..3635e9c4
--- /dev/null
+++ b/trunk/package/network/services/relayd/files/relay.init
@@ -0,0 +1,112 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2011-2012 OpenWrt.org
+
+START=80
+
+USE_PROCD=1
+PROG=/usr/sbin/relayd
+
+validate_proto_relayd()
+{
+	uci_validate_section network "interface" "${1}" \
+		'network:list(string)' \
+		'expiry:uinteger:30' \
+		'retry:uinteger:5' \
+		'table:range(0, 65535):16800' \
+		'forward_bcast:bool:1' \
+		'forward_dhcp:bool:1'
+}
+
+resolve_ifname() {
+	grep -qs "^ *$1:" /proc/net/dev && {
+		procd_append_param command -I "$1"
+		append ifaces "$1"
+	}
+}
+
+resolve_network() {
+	local ifn
+	fixup_interface "$1"
+	config_get ifn "$1" ifname
+	[ -z "$ifn" ] && return 1
+	resolve_ifname "$ifn"
+}
+
+start_relay() {
+	local cfg="$1"
+
+	local args=""
+	local ifaces=""
+
+	config_get proto "$cfg" proto
+	[ "$proto" = "relay" ] || return 0
+
+	SERVICE_DAEMONIZE=1
+	SERVICE_WRITE_PID=1
+	SERVICE_PID_FILE="/var/run/relay-$cfg.pid"
+	[ -f "$SERVICE_PID_FILE" ] && {
+		if grep -q relayd "/proc/$(cat $SERVICE_PID_FILE)/cmdline"; then
+			return 0
+		else
+			rm -f "$SERVICE_PID_FILE"
+		fi
+	}
+
+	procd_open_instance
+	procd_set_param command "$PROG"
+
+	local net networks
+	config_get networks "$cfg" network
+	for net in $networks; do
+		resolve_network "$net" || {
+			return 1
+		}
+	done
+
+	local ifn ifnames
+	config_get ifnames "$cfg" ifname
+	for ifn in $ifnames; do
+		resolve_ifname "$ifn"
+	done
+
+	local ipaddr
+	config_get ipaddr "$cfg" ipaddr
+	[ -n "$ipaddr" ] && procd_append_param command -L "$ipaddr"
+
+	local gateway
+	config_get gateway "$cfg" gateway
+	[ -n "$gateway" ] && procd_append_param command -G "$gateway"
+
+	local expiry # = 30
+	config_get expiry "$cfg" expiry
+	[ -n "$expiry" ] && procd_append_param command "$expiry"
+
+	local retry # = 5
+	config_get retry "$cfg" retry
+	[ -n "$retry" ] && procd_append_param command -p "$retry"
+
+	local table # = 16800
+	config_get table "$cfg" table
+	[ -n "$table" ] && procd_append_param command -T "$table"
+
+	local fwd_bcast # = 1
+	config_get_bool fwd_bcast "$cfg" forward_bcast 1
+	[ $fwd_bcast -eq 1 ] && procd_append_param command "-B"
+
+	local fwd_dhcp # = 1
+	config_get_bool fwd_dhcp "$cfg" forward_dhcp 1
+	[ $fwd_dhcp -eq 1 ] && procd_append_param command "-D"
+
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "network"
+}
+
+start_service() {
+	include /lib/network
+	config_load network
+	config_foreach start_relay interface
+}
diff --git a/trunk/package/network/services/samba36/Makefile b/trunk/package/network/services/samba36/Makefile
new file mode 100644
index 00000000..16838be4
--- /dev/null
+++ b/trunk/package/network/services/samba36/Makefile
@@ -0,0 +1,151 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=samba
+PKG_VERSION:=3.6.24
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
+	http://ftp.samba.org/pub/samba/stable
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=d98425c0c2b73e08f048d31ffc727fb0
+
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+MAKE_PATH:=source3
+CONFIGURE_PATH:=source3
+
+PKG_BUILD_BIN:=$(PKG_BUILD_DIR)/$(MAKE_PATH)/bin
+
+define Package/samba36-server
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Samba 3.6 SMB/CIFS server
+  URL:=http://www.samba.org/
+  DEPENDS:=+USE_EGLIBC:librt
+endef
+
+define Package/samba36-client
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Samba 3.6 SMB/CIFS client
+  URL:=http://www.samba.org/
+  DEPENDS:=+libreadline +libncurses
+endef
+
+define Package/samba36-server/config
+	config PACKAGE_SAMBA_MAX_DEBUG_LEVEL
+		int "Maximum level of compiled-in debug messages"
+		depends on PACKAGE_samba36-server || PACKAGE_samba36-client
+		default -1
+
+endef
+
+define Package/samba36-server/description
+ The Samba software suite is a collection of programs that implements the
+ SMB protocol for UNIX systems, allowing you to serve files and printers to
+ Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred
+ to as the LanManager or Netbios protocol.
+endef
+
+TARGET_CFLAGS += -DMAX_DEBUG_LEVEL=$(CONFIG_PACKAGE_SAMBA_MAX_DEBUG_LEVEL) -D__location__=\\\"\\\" -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+CONFIGURE_VARS += \
+	ac_cv_lib_attr_getxattr=no \
+	ac_cv_search_getxattr=no \
+	ac_cv_file__proc_sys_kernel_core_pattern=yes \
+	libreplace_cv_HAVE_C99_VSNPRINTF=yes \
+	libreplace_cv_HAVE_GETADDRINFO=yes \
+	libreplace_cv_HAVE_IFACE_IFCONF=yes \
+	LINUX_LFS_SUPPORT=yes \
+	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
+	samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
+	samba_cv_HAVE_IFACE_IFCONF=yes \
+	samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
+	samba_cv_HAVE_SECURE_MKSTEMP=yes \
+	samba_cv_HAVE_WRFILE_KEYTAB=no \
+	samba_cv_USE_SETREUID=yes \
+	samba_cv_USE_SETRESUID=yes \
+	samba_cv_have_setreuid=yes \
+	samba_cv_have_setresuid=yes \
+	ac_cv_header_zlib_h=no \
+	samba_cv_zlib_1_2_3=no
+
+CONFIGURE_ARGS += \
+	--exec-prefix=/usr \
+	--prefix=/ \
+	--disable-avahi \
+	--disable-cups \
+	--disable-pie \
+	--disable-relro \
+	--disable-static \
+	--disable-swat \
+	--disable-shared-libs \
+	--with-codepagedir=/etc/samba \
+	--with-configdir=/etc/samba \
+	--with-included-iniparser \
+	--with-included-popt \
+	--with-lockdir=/var/lock \
+	--with-logfilebase=/var/log \
+	--with-nmbdsocketdir=/var/nmbd \
+	--with-piddir=/var/run \
+	--with-privatedir=/etc/samba \
+	--with-sendfile-support \
+	--without-acl-support \
+	--without-cluster-support \
+	--without-ads \
+	--without-krb5 \
+	--without-ldap \
+	--without-pam \
+	--without-winbind \
+	--without-libtdb \
+	--without-libtalloc \
+	--without-libnetapi \
+	--without-libsmbclient \
+	--without-libsmbsharemodes \
+	--without-libtevent \
+	--without-libaddns \
+	--with-shared-modules=pdb_tdbsam,pdb_wbc_sam,idmap_nss,nss_info_template,auth_winbind,auth_wbc,auth_domain
+
+MAKE_FLAGS += DYNEXP= PICFLAG= MODULES=
+
+define Package/samba36-server/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba
+	$(INSTALL_DIR) $(1)/etc/samba
+	$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/valid.dat $(1)/etc/samba
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/samba.init $(1)/etc/init.d/samba
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_BIN)/samba_multicall $(1)/usr/sbin
+	$(LN) samba_multicall $(1)/usr/sbin/smbd
+	$(LN) samba_multicall $(1)/usr/sbin/nmbd
+	$(LN) samba_multicall $(1)/usr/sbin/smbpasswd
+endef
+
+define Package/samba36-client/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_BIN)/smbclient $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_BIN)/nmblookup $(1)/usr/sbin
+endef
+
+$(eval $(call BuildPackage,samba36-client))
+$(eval $(call BuildPackage,samba36-server))
+
diff --git a/trunk/package/network/services/samba36/files/samba.config b/trunk/package/network/services/samba36/files/samba.config
new file mode 100644
index 00000000..2e047ff4
--- /dev/null
+++ b/trunk/package/network/services/samba36/files/samba.config
@@ -0,0 +1,6 @@
+config samba
+	option 'name'			'libreCMC'
+	option 'workgroup'		'WORKGROUP'
+	option 'description'		'libreCMC'
+	option 'homes'			'1'
+
diff --git a/trunk/package/network/services/samba36/files/samba.init b/trunk/package/network/services/samba36/files/samba.init
new file mode 100755
index 00000000..cff13d67
--- /dev/null
+++ b/trunk/package/network/services/samba36/files/samba.init
@@ -0,0 +1,100 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2012 OpenWrt.org
+
+START=60
+
+smb_header() {
+	local interface
+	config_get interface $1 interface "loopback lan"
+
+	# resolve interfaces
+	local interfaces=$(
+		. /lib/functions/network.sh
+
+		local net
+		for net in $interface; do
+			local device
+			network_get_device device "$net" && {
+				local subnet
+				network_get_subnet  subnet "$net" && echo -n "$subnet "
+				network_get_subnet6 subnet "$net" && echo -n "$subnet "
+			}
+
+			echo -n "${device:-$net} "
+		done
+	)
+
+	local name workgroup description charset
+	local hostname="$(uci_get system.@system[0].hostname)"
+
+	config_get name        $1 name        "${hostname:-libreCMC}"
+	config_get workgroup   $1 workgroup   "${hostname:-libreCMC}"
+	config_get description $1 description "Samba on ${hostname:-libreCMC}"
+	config_get charset     $1 charset     "UTF-8"
+
+	mkdir -p /var/etc
+	sed -e "s#|NAME|#$name#g" \
+	    -e "s#|WORKGROUP|#$workgroup#g" \
+	    -e "s#|DESCRIPTION|#$description#g" \
+	    -e "s#|INTERFACES|#$interfaces#g" \
+	    -e "s#|CHARSET|#$charset#g" \
+	    /etc/samba/smb.conf.template > /var/etc/smb.conf
+
+	local homes
+	config_get_bool homes $1 homes 0
+	[ $homes -gt 0 ] && {
+		cat <<EOT >> /var/etc/smb.conf
+
+[homes]
+	comment     = Home Directories
+	browsable   = no
+	read only   = no
+	create mode = 0750
+EOT
+	}
+
+	[ -L /etc/samba/smb.conf ] || ln -nsf /var/etc/smb.conf /etc/samba/smb.conf
+}
+
+smb_add_share() {
+	local name
+	local path
+	local users
+	local read_only
+	local guest_ok
+	local create_mask
+	local dir_mask
+	local browseable
+
+	config_get name $1 name
+	config_get path $1 path
+	config_get users $1 users
+	config_get read_only $1 read_only
+	config_get guest_ok $1 guest_ok
+	config_get create_mask $1 create_mask
+	config_get dir_mask $1 dir_mask
+	config_get browseable $1 browseable
+
+	[ -z "$name" -o -z "$path" ] && return
+
+	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
+	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
+	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf
+	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/smb.conf
+	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/smb.conf
+	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/smb.conf
+	[ -n "$browseable" ] && echo -e "\tbrowseable = $browseable" >> /var/etc/smb.conf
+}
+
+start() {
+	config_load samba
+	config_foreach smb_header samba
+	config_foreach smb_add_share sambashare
+	service_start /usr/sbin/smbd -D
+	service_start /usr/sbin/nmbd -D
+}
+
+stop() {
+	service_stop /usr/sbin/smbd
+	service_stop /usr/sbin/nmbd
+}
diff --git a/trunk/package/network/services/samba36/files/smb.conf.template b/trunk/package/network/services/samba36/files/smb.conf.template
new file mode 100644
index 00000000..38a38557
--- /dev/null
+++ b/trunk/package/network/services/samba36/files/smb.conf.template
@@ -0,0 +1,34 @@
+[global]
+	netbios name = |NAME| 
+	display charset = |CHARSET|
+	interfaces = |INTERFACES|
+	server string = |DESCRIPTION|
+	unix charset = |CHARSET|
+	workgroup = |WORKGROUP|
+	browseable = yes
+	deadtime = 30
+	domain master = yes
+	encrypt passwords = true
+	enable core files = no
+	guest account = nobody
+	guest ok = yes
+	invalid users = root
+	local master = yes
+	load printers = no
+	map to guest = Bad User
+	max protocol = SMB2
+	min receivefile size = 16384
+	null passwords = yes
+	obey pam restrictions = yes
+	os level = 20
+	passdb backend = smbpasswd
+	preferred master = yes
+	printable = no
+	security = user
+	smb encrypt = disabled
+	smb passwd file = /etc/samba/smbpasswd
+	socket options = TCP_NODELAY IPTOS_LOWDELAY
+	syslog = 2
+	use sendfile = yes
+	writeable = yes
+	
diff --git a/trunk/package/network/services/samba36/patches/100-configure_fixes.patch b/trunk/package/network/services/samba36/patches/100-configure_fixes.patch
new file mode 100644
index 00000000..16e35c80
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/100-configure_fixes.patch
@@ -0,0 +1,14 @@
+--- a/source3/configure
++++ b/source3/configure
+@@ -13294,10 +13294,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINF
+ 	# see bug 5910, use our replacements if we detect
+ 	# a broken system.
+ 	if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++		$as_echo "assuming valid getaddrinfo without bug 5910" >&2
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/trunk/package/network/services/samba36/patches/110-multicall.patch b/trunk/package/network/services/samba36/patches/110-multicall.patch
new file mode 100644
index 00000000..22e6a3c1
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/110-multicall.patch
@@ -0,0 +1,119 @@
+--- a/source3/Makefile.in
++++ b/source3/Makefile.in
+@@ -73,22 +73,22 @@ LDAP_LIBS=@LDAP_LIBS@
+ NSCD_LIBS=@NSCD_LIBS@
+ UUID_LIBS=@UUID_LIBS@
+ LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
+-LIBWBCLIENT_LIBS=@LIBWBCLIENT_LIBS@
++LIBWBCLIENT_LIBS=@LIBWBCLIENT_STATIC@
+ PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
+ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
+ DNSSD_LIBS=@DNSSD_LIBS@
+ AVAHI_LIBS=@AVAHI_LIBS@
+ POPT_LIBS=@POPTLIBS@
+ LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
+-LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
++LIBTALLOC_LIBS=@LIBTALLOC_STATIC@
+ LIBTEVENT=@LIBTEVENT_STATIC@ @LIBTEVENT_SHARED@
+ LIBTEVENT_LIBS=@LIBTEVENT_LIBS@
+ LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
+ LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
+-LIBTDB_LIBS=@LIBTDB_LIBS@
++LIBTDB_LIBS=@LIBTDB_STATIC@
+ TDB_DEPS=@TDB_DEPS@
+ LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@
+-LIBNETAPI_LIBS=@LIBNETAPI_LIBS@
++LIBNETAPI_LIBS=@LIBNETAPI_STATIC@
+ LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
+ LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
+ 
+@@ -216,7 +216,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_P
+ 
+ # Note that all executable programs now provide for an optional executable suffix.
+ 
+-SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
++SBIN_PROGS = bin/samba_multicall@EXEEXT@ bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
+ 
+ BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
+ 	bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \
+@@ -1777,6 +1777,42 @@ bin/.dummy:
+ 	  dir=bin $(MAKEDIR); fi
+ 	@: >> $@ || : > $@ # what a fancy emoticon!
+ 
++smbd/server_multicall.o: smbd/server.c smbd/server.o
++	@echo Compiling $<.c
++	@$(COMPILE_CC_PATH) -Dmain=smbd_main && exit 0;\
++		echo "The following command failed:" 1>&2;\
++		echo "$(COMPILE_CC_PATH)" 1>&2;\
++		$(COMPILE_CC_PATH) >/dev/null 2>&1
++
++nmbd/nmbd_multicall.o: nmbd/nmbd.c nmbd/nmbd.o
++	@echo Compiling $<.c
++	@$(COMPILE_CC_PATH) -Dmain=nmbd_main && exit 0;\
++		echo "The following command failed:" 1>&2;\
++		echo "$(COMPILE_CC_PATH)" 1>&2;\
++		$(COMPILE_CC_PATH) >/dev/null 2>&1
++
++utils/smbpasswd_multicall.o: utils/smbpasswd.c utils/smbpasswd.o
++	@echo Compiling $<.c
++	@$(COMPILE_CC_PATH) -Dmain=smbpasswd_main && exit 0;\
++		echo "The following command failed:" 1>&2;\
++		echo "$(COMPILE_CC_PATH)" 1>&2;\
++		$(COMPILE_CC_PATH) >/dev/null 2>&1
++
++SMBD_MULTI_O = $(patsubst smbd/server.o,smbd/server_multicall.o,$(SMBD_OBJ))
++NMBD_MULTI_O = $(patsubst nmbd/nmbd.o,nmbd/nmbd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(NMBD_OBJ)))
++SMBPASSWD_MULTI_O = $(patsubst utils/smbpasswd.o,utils/smbpasswd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(SMBPASSWD_OBJ)))
++MULTI_O = multi.o
++
++MULTICALL_O = $(sort $(SMBD_MULTI_O) $(NMBD_MULTI_O) $(SMBPASSWD_MULTI_O) $(MULTI_O))
++
++bin/samba_multicall@EXEEXT@: $(BINARY_PREREQS) $(MULTICALL_O) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
++	@echo Linking $@
++	@$(CC) -o $@ $(MULTICALL_O) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
++		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
++		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
++		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) \
++		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
++
+ bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
+ 	@echo Linking $@
+ 	@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
+--- /dev/null
++++ b/source3/multi.c
+@@ -0,0 +1,35 @@
++#include <stdio.h>
++#include <string.h>
++
++extern int smbd_main(int argc, char **argv);
++extern int nmbd_main(int argc, char **argv);
++extern int smbpasswd_main(int argc, char **argv);
++
++static struct {
++	const char *name;
++	int (*func)(int argc, char **argv);
++} multicall[] = {
++	{ "smbd", smbd_main },
++	{ "nmbd", nmbd_main },
++	{ "smbpasswd", smbpasswd_main },
++};
++
++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
++
++int main(int argc, char **argv)
++{
++	int i;
++
++	for (i = 0; i < ARRAY_SIZE(multicall); i++) {
++		if (strstr(argv[0], multicall[i].name))
++			return multicall[i].func(argc, argv);
++	}
++
++	fprintf(stderr, "Invalid multicall command, available commands:");
++	for (i = 0; i < ARRAY_SIZE(multicall); i++)
++		fprintf(stderr, " %s", multicall[i].name);
++
++	fprintf(stderr, "\n");
++
++	return 1;
++}
diff --git a/trunk/package/network/services/samba36/patches/111-owrt_smbpasswd.patch b/trunk/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
new file mode 100644
index 00000000..79abea58
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
@@ -0,0 +1,281 @@
+--- a/source3/Makefile.in
++++ b/source3/Makefile.in
+@@ -1019,7 +1019,7 @@ TEST_LP_LOAD_OBJ = param/test_lp_load.o
+ 
+ PASSWD_UTIL_OBJ = utils/passwd_util.o
+ 
+-SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
++SMBPASSWD_OBJ = utils/owrt_smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
+ 		$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
+ 		$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
+ 		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
+@@ -1791,7 +1791,7 @@ nmbd/nmbd_multicall.o: nmbd/nmbd.c nmbd/
+ 		echo "$(COMPILE_CC_PATH)" 1>&2;\
+ 		$(COMPILE_CC_PATH) >/dev/null 2>&1
+ 
+-utils/smbpasswd_multicall.o: utils/smbpasswd.c utils/smbpasswd.o
++utils/smbpasswd_multicall.o: utils/owrt_smbpasswd.c utils/owrt_smbpasswd.o
+ 	@echo Compiling $<.c
+ 	@$(COMPILE_CC_PATH) -Dmain=smbpasswd_main && exit 0;\
+ 		echo "The following command failed:" 1>&2;\
+@@ -1800,7 +1800,7 @@ utils/smbpasswd_multicall.o: utils/smbpa
+ 
+ SMBD_MULTI_O = $(patsubst smbd/server.o,smbd/server_multicall.o,$(SMBD_OBJ))
+ NMBD_MULTI_O = $(patsubst nmbd/nmbd.o,nmbd/nmbd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(NMBD_OBJ)))
+-SMBPASSWD_MULTI_O = $(patsubst utils/smbpasswd.o,utils/smbpasswd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(SMBPASSWD_OBJ)))
++SMBPASSWD_MULTI_O = $(patsubst utils/owrt_smbpasswd.o,utils/smbpasswd_multicall.o,$(filter-out $(LIB_DUMMY_OBJ),$(SMBPASSWD_OBJ)))
+ MULTI_O = multi.o
+ 
+ MULTICALL_O = $(sort $(SMBD_MULTI_O) $(NMBD_MULTI_O) $(SMBPASSWD_MULTI_O) $(MULTI_O))
+--- /dev/null
++++ b/source3/utils/owrt_smbpasswd.c
+@@ -0,0 +1,249 @@
++/*
++ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * This program is distributed in the hope that 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., 675
++ * Mass Ave, Cambridge, MA 02139, USA.  */
++
++#include "includes.h"
++#include <endian.h>
++#include <stdio.h>
++
++static char buf[256];
++
++static void md4hash(const char *passwd, uchar p16[16])
++{
++	int len;
++	smb_ucs2_t wpwd[129];
++	int i;
++
++	len = strlen(passwd);
++	for (i = 0; i < len; i++) {
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++		wpwd[i] = (unsigned char)passwd[i];
++#else
++		wpwd[i] = (unsigned char)passwd[i] << 8;
++#endif
++	}
++	wpwd[i] = 0;
++
++	len = len * sizeof(int16);
++	mdfour(p16, (unsigned char *)wpwd, len);
++	ZERO_STRUCT(wpwd);
++}
++
++
++static bool find_passwd_line(FILE *fp, const char *user, char **next)
++{
++	char *p1;
++
++	while (!feof(fp)) {
++		if(!fgets(buf, sizeof(buf) - 1, fp))
++			continue;
++
++		p1 = strchr(buf, ':');
++
++		if (p1 - buf != strlen(user))
++			continue;
++
++		if (strncmp(buf, user, p1 - buf) != 0)
++			continue;
++
++		if (next)
++			*next = p1;
++		return true;
++	}
++	return false;
++}
++
++/* returns -1 if user is not present in /etc/passwd*/
++static int find_uid_for_user(const char *user)
++{
++	FILE *fp;
++	char *p1, *p2, *p3;
++	int ret = -1;
++
++	fp = fopen("/etc/passwd", "r");
++	if (!fp) {
++		printf("failed to open /etc/passwd");
++		goto out;
++	}
++
++	if (!find_passwd_line(fp, user, &p1)) {
++		printf("User %s not found or invalid in /etc/passwd\n", user);
++		goto out;
++	}
++
++	p2 = strchr(p1 + 1, ':');
++	if (!p2)
++		goto out;
++
++	p2++;
++	p3 = strchr(p2, ':');
++	if (!p1)
++		goto out;
++
++	*p3 = '\0';
++	ret = atoi(p2);
++
++out:
++	if(fp)
++		fclose(fp);
++	return ret;
++}
++
++static void smbpasswd_write_user(FILE *fp, const char *user, int uid, const char *password)
++{
++	static uchar nt_p16[NT_HASH_LEN];
++	int len = 0;
++	int i;
++
++	md4hash(strdup(password), nt_p16);
++
++	len += snprintf(buf + len, sizeof(buf) - len, "%s:%u:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:", user, uid);
++	for(i = 0; i < NT_HASH_LEN; i++)
++		len += snprintf(buf + len, sizeof(buf) - len, "%02X", nt_p16[i]);
++
++	snprintf(buf + len, sizeof(buf) - len, ":[U          ]:LCT-00000001:\n");
++	fputs(buf, fp);
++}
++
++static void smbpasswd_delete_user(FILE *fp)
++{
++	fpos_t r_pos, w_pos;
++	int len = strlen(buf);
++
++	fgetpos(fp, &r_pos);
++	fseek(fp, -len, SEEK_CUR);
++	fgetpos(fp, &w_pos);
++	fsetpos(fp, &r_pos);
++
++	while (fgets(buf, sizeof(buf) - 1, fp)) {
++		int cur_len = strlen(buf);
++
++		fsetpos(fp, &w_pos);
++		fputs(buf, fp);
++		fgetpos(fp, &w_pos);
++
++		fsetpos(fp, &r_pos);
++		fseek(fp, cur_len, SEEK_CUR);
++		fgetpos(fp, &r_pos);
++	}
++
++	fsetpos(fp, &w_pos);
++	ftruncate(fileno(fp), ftello(fp));
++}
++
++static int usage(const char *progname)
++{
++	fprintf(stderr,
++		"Usage: %s [options] <username>\n"
++		"\n"
++		"Options:\n"
++		"  -s		read password from stdin\n"
++		"  -a		add user\n"
++		"  -x		delete user\n",
++		progname);
++	return 1;
++}
++
++int main(int argc, char **argv)
++{
++	const char *prog = argv[0];
++	const char *user;
++	char *pw1, *pw2;
++	FILE *fp;
++	bool add = false, delete = false, get_stdin = false, found;
++	int ch;
++	int uid;
++
++	TALLOC_CTX *frame = talloc_stackframe();
++
++	while ((ch = getopt(argc, argv, "asx")) != EOF) {
++		switch (ch) {
++		case 's':
++			get_stdin = true;
++			break;
++		case 'a':
++			add = true;
++			break;
++		case 'x':
++			delete = true;
++			break;
++		default:
++			return usage(prog);
++		}
++	}
++
++	if (add && delete)
++		return usage(prog);
++
++	argc -= optind;
++	argv += optind;
++
++	if (!argc)
++		return usage(prog);
++
++	user = argv[0];
++	if (!delete) {
++		uid = find_uid_for_user(user);
++		if (uid < 0) {
++			fprintf(stderr, "Could not find user '%s' in /etc/passwd\n", user);
++			return 2;
++		}
++	}
++
++	fp = fopen("/etc/samba/smbpasswd", "r+");
++	if(!fp) {
++		fprintf(stderr, "Failed to open /etc/samba/smbpasswd");
++		return 3;
++	}
++
++	found = find_passwd_line(fp, user, NULL);
++	if (!add && !found) {
++		fprintf(stderr, "Could not find user '%s' in /etc/samba/smbpasswd\n", user);
++		return 3;
++	}
++
++	if (delete) {
++		smbpasswd_delete_user(fp);
++		goto out;
++	}
++
++	pw1 = get_pass("New SMB password:", get_stdin);
++	if (!pw1)
++		pw1 = strdup("");
++
++	pw2 = get_pass("Retype SMB password:", get_stdin);
++	if (!pw2)
++		pw2 = strdup("");
++
++	if (strcmp(pw1, pw2) != 0) {
++		fprintf(stderr, "Mismatch - password unchanged.\n");
++		goto out_free;
++	}
++
++	if (found)
++		fseek(fp, -strlen(buf), SEEK_CUR);
++	smbpasswd_write_user(fp, user, uid, pw2);
++
++out_free:
++	free(pw1);
++	free(pw2);
++out:
++	fclose(fp);
++	TALLOC_FREE(frame);
++
++	return 0;
++}
diff --git a/trunk/package/network/services/samba36/patches/120-add_missing_ifdef.patch b/trunk/package/network/services/samba36/patches/120-add_missing_ifdef.patch
new file mode 100644
index 00000000..dbd9adc1
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/120-add_missing_ifdef.patch
@@ -0,0 +1,26 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -119,9 +119,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
+ 		return false;
+ 	}
++#ifdef DEVELOPER
+ 	if (!smb_register_ndr_interface(&ndr_table_rpcecho)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_initshutdown)) {
+ 		return false;
+ 	}
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -628,7 +628,9 @@ static struct cmd_set *rpcclient_command
+ 	netlogon_commands,
+ 	srvsvc_commands,
+ 	dfs_commands,
++#ifdef DEVELOPER
+ 	echo_commands,
++#endif
+ 	epmapper_commands,
+ 	shutdown_commands,
+  	test_commands,
diff --git a/trunk/package/network/services/samba36/patches/200-remove_printer_support.patch b/trunk/package/network/services/samba36/patches/200-remove_printer_support.patch
new file mode 100644
index 00000000..de567a76
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/200-remove_printer_support.patch
@@ -0,0 +1,346 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -1110,6 +1110,10 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 					   "rpc_server",
+ 					   "spoolss",
+ 					   "embedded");
++#ifndef PRINTER_SUPPORT
++	if (1) {
++	} else
++#endif
+ 	if (StrCaseCmp(rpcsrv_type, "embedded") == 0) {
+ 		spoolss_cb.init         = spoolss_init_cb;
+ 		spoolss_cb.shutdown     = spoolss_shutdown_cb;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -624,7 +624,9 @@ static struct cmd_set *rpcclient_command
+ 	lsarpc_commands,
+ 	ds_commands,
+ 	samr_commands,
++#ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
++#endif
+ 	netlogon_commands,
+ 	srvsvc_commands,
+ 	dfs_commands,
+--- a/source3/printing/spoolssd.c
++++ b/source3/printing/spoolssd.c
+@@ -165,6 +165,10 @@ void start_spoolssd(struct tevent_contex
+ 	NTSTATUS status;
+ 	int ret;
+ 
++#ifndef PRINTER_SUPPORT
++	return;
++#endif
++
+ 	DEBUG(1, ("Forking SPOOLSS Daemon\n"));
+ 
+ 	pid = sys_fork();
+--- a/source3/utils/net_rpc.c
++++ b/source3/utils/net_rpc.c
+@@ -7841,6 +7841,10 @@ int net_rpc_printer(struct net_context *
+ 		{NULL, NULL, 0, NULL, NULL}
+ 	};
+ 
++#ifndef PRINTER_SUPPORT
++	return 0;
++#endif
++
+ 	if (argc == 0) {
+ 		if (c->display_usage) {
+ 			d_printf(_("Usage:\n"));
+--- a/source3/smbd/reply.c
++++ b/source3/smbd/reply.c
+@@ -5208,7 +5208,11 @@ void reply_printopen(struct smb_request
+ 		return;
+ 	}
+ 
+-	if (!CAN_PRINT(conn)) {
++
++#ifdef PRINTER_SUPPORT
++	if (!CAN_PRINT(conn))
++#endif
++	{
+ 		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+ 		END_PROFILE(SMBsplopen);
+ 		return;
+@@ -5314,7 +5318,10 @@ void reply_printqueue(struct smb_request
+ 	   is really quite gross and only worked when there was only
+ 	   one printer - I think we should now only accept it if they
+ 	   get it right (tridge) */
+-	if (!CAN_PRINT(conn)) {
++#ifdef PRINTER_SUPPORT
++	if (!CAN_PRINT(conn))
++#endif
++	{
+ 		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+ 		END_PROFILE(SMBsplretq);
+ 		return;
+--- a/source3/smbd/lanman.c
++++ b/source3/smbd/lanman.c
+@@ -784,6 +784,10 @@ static bool api_DosPrintQGetInfo(struct
+ 	union spoolss_JobInfo *job_info = NULL;
+ 	union spoolss_PrinterInfo printer_info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -999,6 +1003,10 @@ static bool api_DosPrintQEnum(struct smb
+ 	union spoolss_DriverInfo *driver_info;
+ 	union spoolss_JobInfo **job_info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!param_format || !output_format1 || !p) {
+ 		return False;
+ 	}
+@@ -3105,6 +3113,10 @@ static bool api_RDosPrintJobDel(struct s
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	enum spoolss_JobControl command;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -3238,6 +3250,10 @@ static bool api_WPrintQueueCtrl(struct s
+ 	struct sec_desc_buf secdesc_ctr;
+ 	enum spoolss_PrinterControl command;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !QueueName) {
+ 		return False;
+ 	}
+@@ -3404,6 +3420,10 @@ static bool api_PrintJobInfo(struct smbd
+ 	union spoolss_JobInfo info;
+ 	struct spoolss_SetJobInfo1 info1;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -4547,6 +4567,10 @@ static bool api_WPrintJobGetInfo(struct
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	union spoolss_JobInfo info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -4685,6 +4709,10 @@ static bool api_WPrintJobEnumerate(struc
+ 	uint32_t count = 0;
+ 	union spoolss_JobInfo *info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -4890,6 +4918,10 @@ static bool api_WPrintDestGetInfo(struct
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	union spoolss_PrinterInfo info;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5026,6 +5058,10 @@ static bool api_WPrintDestEnum(struct sm
+ 	union spoolss_PrinterInfo *info;
+ 	uint32_t count;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5129,6 +5165,10 @@ static bool api_WPrintDriverEnum(struct
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5193,6 +5233,10 @@ static bool api_WPrintQProcEnum(struct s
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5257,6 +5301,10 @@ static bool api_WPrintPortEnum(struct sm
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
++#ifndef PRINTER_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -141,7 +141,9 @@ static void exit_server_common(enum serv
+ 		rpc_eventlog_shutdown();
+ 		rpc_ntsvcs_shutdown();
+ 		rpc_svcctl_shutdown();
++#ifdef PRINTER_SUPPORT
+ 		rpc_spoolss_shutdown();
++#endif
+ 
+ 		rpc_srvsvc_shutdown();
+ 		rpc_winreg_shutdown();
+--- a/source3/smbd/open.c
++++ b/source3/smbd/open.c
+@@ -1608,6 +1608,9 @@ static NTSTATUS open_file_ntcreate(conne
+ 		 * Most of the passed parameters are ignored.
+ 		 */
+ 
++#ifndef PRINTER_SUPPORT
++		return NT_STATUS_ACCESS_DENIED;
++#endif
+ 		if (pinfo) {
+ 			*pinfo = FILE_WAS_CREATED;
+ 		}
+--- a/source3/smbd/close.c
++++ b/source3/smbd/close.c
+@@ -643,6 +643,9 @@ static NTSTATUS close_normal_file(struct
+ 	status = ntstatus_keeperror(status, tmp);
+ 
+ 	if (fsp->print_file) {
++#ifndef PRINTER_SUPPORT
++		return NT_STATUS_OK;
++#endif
+ 		/* FIXME: return spool errors */
+ 		print_spool_end(fsp, close_type);
+ 		file_free(req, fsp);
+--- a/source3/smbd/fileio.c
++++ b/source3/smbd/fileio.c
+@@ -298,6 +298,10 @@ ssize_t write_file(struct smb_request *r
+ 		uint32_t t;
+ 		int ret;
+ 
++#ifndef PRINTER_SUPPORT
++		return -1;
++#endif
++
+ 		ret = print_spool_write(fsp, data, n, pos, &t);
+ 		if (ret) {
+ 			errno = ret;
+--- a/source3/smbd/smb2_create.c
++++ b/source3/smbd/smb2_create.c
+@@ -486,7 +486,10 @@ static struct tevent_req *smbd_smb2_crea
+ 		info = FILE_WAS_OPENED;
+ 	} else if (CAN_PRINT(smb1req->conn)) {
+ 		status = file_new(smb1req, smb1req->conn, &result);
+-		if(!NT_STATUS_IS_OK(status)) {
++#ifdef PRINTER_SUPPORT
++		if(!NT_STATUS_IS_OK(status))
++#endif
++		{
+ 			tevent_req_nterror(req, status);
+ 			return tevent_req_post(req, ev);
+ 		}
+--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
++++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
+@@ -85,9 +85,11 @@ bool init_service_op_table( void )
+ 
+ 	/* add builtin services */
+ 
++#ifdef PRINTER_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "Spooler" );
+ 	svcctl_ops[i].ops  = &spoolss_svc_ops;
+ 	i++;
++#endif
+ 
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" );
+ 	svcctl_ops[i].ops  = &netlogon_svc_ops;
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -113,9 +113,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_winreg)) {
+ 		return false;
+ 	}
++#ifdef PRINTER_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_spoolss)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
+ 		return false;
+ 	}
+--- a/source3/smbd/process.c
++++ b/source3/smbd/process.c
+@@ -2423,8 +2423,10 @@ static bool housekeeping_fn(const struct
+ 
+ 	change_to_root_user();
+ 
++#ifdef PRINTER_SUPPORT
+ 	/* update printer queue caches if necessary */
+ 	update_monitored_printq_cache(sconn->msg_ctx);
++#endif
+ 
+ 	/* check if we need to reload services */
+ 	check_reload(sconn, time_mono(NULL));
+--- a/source3/smbd/server.c
++++ b/source3/smbd/server.c
+@@ -123,7 +123,9 @@ static void smb_pcap_updated(struct mess
+ {
+ 	struct tevent_context *ev_ctx =
+ 		talloc_get_type_abort(private_data, struct tevent_context);
+-
++#ifndef PRINTER_SUPPORT
++	return;
++#endif
+ 	DEBUG(10,("Got message saying pcap was updated. Reloading.\n"));
+ 	change_to_root_user();
+ 	reload_printers(ev_ctx, msg);
+@@ -1277,6 +1279,7 @@ extern void build_options(bool screen);
+ 	 * The print backend init also migrates the printing tdb's,
+ 	 * this requires a winreg pipe.
+ 	 */
++#ifdef PRINTER_SUPPORT
+ 	if (!print_backend_init(smbd_messaging_context()))
+ 		exit(1);
+ 
+@@ -1315,7 +1318,7 @@ extern void build_options(bool screen);
+ 				       smbd_messaging_context());
+ 		}
+ 	}
+-
++#endif
+ 	if (!is_daemon) {
+ 		/* inetd mode */
+ 		TALLOC_FREE(frame);
diff --git a/trunk/package/network/services/samba36/patches/210-remove_ad_support.patch b/trunk/package/network/services/samba36/patches/210-remove_ad_support.patch
new file mode 100644
index 00000000..6742dc04
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/210-remove_ad_support.patch
@@ -0,0 +1,88 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -95,9 +95,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_lsarpc)) {
+ 		return false;
+ 	}
++#ifdef ACTIVE_DIRECTORY
+ 	if (!smb_register_ndr_interface(&ndr_table_dssetup)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_samr)) {
+ 		return false;
+ 	}
+@@ -141,9 +143,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_epmapper)) {
+ 		return false;
+ 	}
++#ifdef ACTIVE_DIRECTORY
+ 	if (!smb_register_ndr_interface(&ndr_table_drsuapi)) {
+ 		return false;
+ 	}
++#endif
+ 	return true;
+ }
+ 
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -918,6 +918,7 @@ static bool netdfs_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef ACTIVE_DIRECTORY
+ static bool dssetup_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -966,6 +967,7 @@ static bool dssetup_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool wkssvc_init_cb(void *ptr)
+ {
+@@ -1172,12 +1174,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 	}
+ #endif
+ 
++#ifdef ACTIVE_DIRECTORY
+ 	dssetup_cb.init         = dssetup_init_cb;
+ 	dssetup_cb.shutdown     = NULL;
+ 	dssetup_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_dssetup_init(&dssetup_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	wkssvc_cb.init         = wkssvc_init_cb;
+ 	wkssvc_cb.shutdown     = NULL;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -132,7 +132,9 @@ static void exit_server_common(enum serv
+ 
+ 	if (am_parent) {
+ 		rpc_wkssvc_shutdown();
++#ifdef ACTIVE_DIRECTORY
+ 		rpc_dssetup_shutdown();
++#endif
+ #ifdef DEVELOPER
+ 		rpc_rpcecho_shutdown();
+ #endif
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -2904,12 +2904,14 @@ NTSTATUS cli_rpc_pipe_open_noauth_transp
+ 	status = rpc_pipe_bind(result, auth);
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		int lvl = 0;
++#ifdef ACTIVE_DIRECTORY
+ 		if (ndr_syntax_id_equal(interface,
+ 					&ndr_table_dssetup.syntax_id)) {
+ 			/* non AD domains just don't have this pipe, avoid
+ 			 * level 0 statement in that case - gd */
+ 			lvl = 3;
+ 		}
++#endif
+ 		DEBUG(lvl, ("cli_rpc_pipe_open_noauth: rpc_pipe_bind for pipe "
+ 			    "%s failed with error %s\n",
+ 			    get_pipe_name_from_syntax(talloc_tos(), interface),
diff --git a/trunk/package/network/services/samba36/patches/220-remove_services.patch b/trunk/package/network/services/samba36/patches/220-remove_services.patch
new file mode 100644
index 00000000..498232de
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/220-remove_services.patch
@@ -0,0 +1,98 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -131,6 +131,7 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_initshutdown)) {
+ 		return false;
+ 	}
++#ifdef EXTRA_SERVICES
+ 	if (!smb_register_ndr_interface(&ndr_table_svcctl)) {
+ 		return false;
+ 	}
+@@ -140,6 +141,7 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_ntsvcs)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_epmapper)) {
+ 		return false;
+ 	}
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -697,6 +697,7 @@ static bool spoolss_shutdown_cb(void *pt
+ 	return true;
+ }
+ 
++#ifdef EXTRA_SERVICES
+ static bool svcctl_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -733,6 +734,7 @@ static bool svcctl_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool svcctl_shutdown_cb(void *ptr)
+ {
+@@ -741,6 +743,8 @@ static bool svcctl_shutdown_cb(void *ptr
+ 	return true;
+ }
+ 
++#ifdef EXTRA_SERVICES
++
+ static bool ntsvcs_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -802,6 +806,7 @@ static bool eventlog_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool initshutdown_init_cb(void *ptr)
+ {
+@@ -1130,6 +1135,7 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		}
+ 	}
+ 
++#ifdef EXTRA_SERVICES
+ 	svcctl_cb.init         = svcctl_init_cb;
+ 	svcctl_cb.shutdown     = svcctl_shutdown_cb;
+ 	svcctl_cb.private_data = ep_ctx;
+@@ -1150,6 +1156,7 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 	if (!NT_STATUS_IS_OK(rpc_eventlog_init(&eventlog_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	initshutdown_cb.init         = initshutdown_init_cb;
+ 	initshutdown_cb.shutdown     = NULL;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -140,9 +140,11 @@ static void exit_server_common(enum serv
+ #endif
+ 		rpc_netdfs_shutdown();
+ 		rpc_initshutdown_shutdown();
++#ifdef EXTRA_SERVICES
+ 		rpc_eventlog_shutdown();
+-		rpc_ntsvcs_shutdown();
+ 		rpc_svcctl_shutdown();
++		rpc_ntsvcs_shutdown();
++#endif
+ #ifdef PRINTER_SUPPORT
+ 		rpc_spoolss_shutdown();
+ #endif
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -637,9 +637,11 @@ static struct cmd_set *rpcclient_command
+ 	shutdown_commands,
+  	test_commands,
+ 	wkssvc_commands,
++#ifdef EXTRA_SERVICES
+ 	ntsvcs_commands,
+ 	drsuapi_commands,
+ 	eventlog_commands,
++#endif
+ 	winreg_commands,
+ 	NULL
+ };
diff --git a/trunk/package/network/services/samba36/patches/230-remove_winreg_support.patch b/trunk/package/network/services/samba36/patches/230-remove_winreg_support.patch
new file mode 100644
index 00000000..df2be4f2
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/230-remove_winreg_support.patch
@@ -0,0 +1,146 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -409,6 +409,7 @@ static bool epmapper_shutdown_cb(void *p
+ 	return true;
+ }
+ 
++#ifdef WINREG_SUPPORT
+ static bool winreg_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -456,6 +457,7 @@ static bool winreg_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool srvsvc_init_cb(void *ptr)
+ {
+@@ -710,10 +712,12 @@ static bool svcctl_init_cb(void *ptr)
+ 					   "epmapper",
+ 					   "none");
+ 
++#ifdef WINREG_SUPPORT
+ 	ok = svcctl_init_winreg(ep_ctx->msg_ctx);
+ 	if (!ok) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	/* initialize the control hooks */
+ 	init_service_op_table();
+@@ -785,10 +789,12 @@ static bool eventlog_init_cb(void *ptr)
+ 					   "epmapper",
+ 					   "none");
+ 
++#ifdef WINREG_SUPPORT
+ 	ok = eventlog_init_winreg(ep_ctx->msg_ctx);
+ 	if (!ok) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	if (StrCaseCmp(rpcsrv_type, "embedded") == 0 ||
+ 	    StrCaseCmp(rpcsrv_type, "daemon") == 0) {
+@@ -1077,12 +1083,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		}
+ 	}
+ 
++#ifdef WINREG_SUPPORT
+ 	winreg_cb.init         = winreg_init_cb;
+ 	winreg_cb.shutdown     = NULL;
+ 	winreg_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_winreg_init(&winreg_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ 	srvsvc_cb.init         = srvsvc_init_cb;
+ 	srvsvc_cb.shutdown     = NULL;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -150,7 +150,9 @@ static void exit_server_common(enum serv
+ #endif
+ 
+ 		rpc_srvsvc_shutdown();
++#ifdef WINREG_SUPPORT
+ 		rpc_winreg_shutdown();
++#endif
+ 
+ 		rpc_netlogon_shutdown();
+ 		rpc_samr_shutdown();
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -112,9 +112,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_wkssvc)) {
+ 		return false;
+ 	}
++#ifdef WINREG_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_winreg)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef PRINTER_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_spoolss)) {
+ 		return false;
+--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
++++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
+@@ -95,9 +95,11 @@ bool init_service_op_table( void )
+ 	svcctl_ops[i].ops  = &netlogon_svc_ops;
+ 	i++;
+ 
++#ifdef WINREG_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "RemoteRegistry" );
+ 	svcctl_ops[i].ops  = &winreg_svc_ops;
+ 	i++;
++#endif
+ 
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "WINS" );
+ 	svcctl_ops[i].ops  = &wins_svc_ops;
+--- a/source3/services/svc_winreg_glue.c
++++ b/source3/services/svc_winreg_glue.c
+@@ -88,6 +88,10 @@ struct security_descriptor *svcctl_get_s
+ 	NTSTATUS status;
+ 	WERROR result = WERR_OK;
+ 
++#ifndef WINREG_SUPPORT
++	return NULL;
++#endif
++
+ 	key = talloc_asprintf(mem_ctx,
+ 			      "%s\\%s\\Security",
+ 			      TOP_LEVEL_SERVICES_KEY, name);
+@@ -161,6 +165,10 @@ bool svcctl_set_secdesc(struct messaging
+ 	NTSTATUS status;
+ 	WERROR result = WERR_OK;
+ 
++#ifndef WINREG_SUPPORT
++	return false;
++#endif
++
+ 	tmp_ctx = talloc_stackframe();
+ 	if (tmp_ctx == NULL) {
+ 		return false;
+@@ -272,6 +280,10 @@ const char *svcctl_get_string_value(TALL
+ 	NTSTATUS status;
+ 	WERROR result = WERR_OK;
+ 
++#ifndef WINREG_SUPPORT
++	return NULL;
++#endif
++
+ 	tmp_ctx = talloc_stackframe();
+ 	if (tmp_ctx == NULL) {
+ 		return NULL;
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -642,7 +642,9 @@ static struct cmd_set *rpcclient_command
+ 	drsuapi_commands,
+ 	eventlog_commands,
+ #endif
++#ifdef WINREG_SUPPORT
+ 	winreg_commands,
++#endif
+ 	NULL
+ };
+ 
diff --git a/trunk/package/network/services/samba36/patches/240-remove_dfs_api.patch b/trunk/package/network/services/samba36/patches/240-remove_dfs_api.patch
new file mode 100644
index 00000000..f4d432e9
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/240-remove_dfs_api.patch
@@ -0,0 +1,71 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -881,6 +881,7 @@ static bool rpcecho_init_cb(void *ptr) {
+ 
+ #endif
+ 
++#ifdef DFS_SUPPORT
+ static bool netdfs_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -928,6 +929,7 @@ static bool netdfs_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ #ifdef ACTIVE_DIRECTORY
+ static bool dssetup_init_cb(void *ptr)
+@@ -1173,12 +1175,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		return false;
+ 	}
+ 
++#ifdef DFS_SUPPORT
+ 	netdfs_cb.init         = netdfs_init_cb;
+ 	netdfs_cb.shutdown     = NULL;
+ 	netdfs_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_netdfs_init(&netdfs_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ #ifdef DEVELOPER
+ 	rpcecho_cb.init         = rpcecho_init_cb;
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -122,9 +122,11 @@ static bool initialize_interfaces(void)
+ 		return false;
+ 	}
+ #endif
++#ifdef DFS_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef DEVELOPER
+ 	if (!smb_register_ndr_interface(&ndr_table_rpcecho)) {
+ 		return false;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -138,7 +138,9 @@ static void exit_server_common(enum serv
+ #ifdef DEVELOPER
+ 		rpc_rpcecho_shutdown();
+ #endif
++#ifdef DFS_SUPPORT
+ 		rpc_netdfs_shutdown();
++#endif
+ 		rpc_initshutdown_shutdown();
+ #ifdef EXTRA_SERVICES
+ 		rpc_eventlog_shutdown();
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -629,7 +629,9 @@ static struct cmd_set *rpcclient_command
+ #endif
+ 	netlogon_commands,
+ 	srvsvc_commands,
++#ifdef DFS_SUPPORT
+ 	dfs_commands,
++#endif
+ #ifdef DEVELOPER
+ 	echo_commands,
+ #endif
diff --git a/trunk/package/network/services/samba36/patches/250-remove_domain_logon.patch b/trunk/package/network/services/samba36/patches/250-remove_domain_logon.patch
new file mode 100644
index 00000000..f7582ef3
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/250-remove_domain_logon.patch
@@ -0,0 +1,185 @@
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -606,6 +606,7 @@ static bool samr_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef NETLOGON_SUPPORT
+ static bool netlogon_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -654,6 +655,7 @@ static bool netlogon_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ static bool spoolss_init_cb(void *ptr)
+ {
+@@ -1116,12 +1118,15 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		return false;
+ 	}
+ 
++#ifdef NETLOGON_SUPPORT
+ 	netlogon_cb.init         = netlogon_init_cb;
+ 	netlogon_cb.shutdown     = NULL;
+ 	netlogon_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_netlogon_init(&netlogon_cb))) {
+ 		return false;
+ 	}
++#endif
++
+ 
+ 	rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
+ 					   "rpc_server",
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -103,9 +103,11 @@ static bool initialize_interfaces(void)
+ 	if (!smb_register_ndr_interface(&ndr_table_samr)) {
+ 		return false;
+ 	}
++#ifdef NETLOGON_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_netlogon)) {
+ 		return false;
+ 	}
++#endif
+ 	if (!smb_register_ndr_interface(&ndr_table_srvsvc)) {
+ 		return false;
+ 	}
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -156,7 +156,9 @@ static void exit_server_common(enum serv
+ 		rpc_winreg_shutdown();
+ #endif
+ 
++#ifdef NETLOGON_SUPPORT
+ 		rpc_netlogon_shutdown();
++#endif
+ 		rpc_samr_shutdown();
+ 		rpc_lsarpc_shutdown();
+ 	}
+--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
++++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
+@@ -91,9 +91,11 @@ bool init_service_op_table( void )
+ 	i++;
+ #endif
+ 
++#ifdef NETLOGON_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" );
+ 	svcctl_ops[i].ops  = &netlogon_svc_ops;
+ 	i++;
++#endif
+ 
+ #ifdef WINREG_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "RemoteRegistry" );
+--- a/source3/nmbd/nmbd_processlogon.c
++++ b/source3/nmbd/nmbd_processlogon.c
+@@ -320,6 +320,10 @@ void process_logon_packet(struct packet_
+ 	NTSTATUS status;
+ 	const char *pdc_name;
+ 
++#ifndef NETLOGON_SUPPORT
++	return;
++#endif
++
+ 	in_addr_to_sockaddr_storage(&ss, p->ip);
+ 	pss = iface_ip((struct sockaddr *)&ss);
+ 	if (!pss) {
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -627,7 +627,9 @@ static struct cmd_set *rpcclient_command
+ #ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
+ #endif
++#ifdef NETLOGON_SUPPORT
+ 	netlogon_commands,
++#endif
+ 	srvsvc_commands,
+ #ifdef DFS_SUPPORT
+ 	dfs_commands,
+--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
++++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+@@ -824,6 +824,10 @@ WERROR _wkssvc_NetrJoinDomain2(struct pi
+ 	WERROR werr;
+ 	struct security_token *token = p->session_info->security_token;
+ 
++#ifndef NETLOGON_SUPPORT
++	return WERR_NOT_SUPPORTED;
++#endif
++
+ 	if (!r->in.domain_name) {
+ 		return WERR_INVALID_PARAM;
+ 	}
+@@ -901,6 +905,10 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct
+ 	WERROR werr;
+ 	struct security_token *token = p->session_info->security_token;
+ 
++#ifndef NETLOGON_SUPPORT
++	return WERR_NOT_SUPPORTED;
++#endif
++
+ 	if (!r->in.account || !r->in.encrypted_password) {
+ 		return WERR_INVALID_PARAM;
+ 	}
+--- a/source3/libsmb/trusts_util.c
++++ b/source3/libsmb/trusts_util.c
+@@ -46,9 +46,11 @@ NTSTATUS trust_pw_change_and_store_it(st
+ 	NTSTATUS nt_status;
+ 
+ 	switch (sec_channel_type) {
++#ifdef NETLOGON_SUPPORT
+ 	case SEC_CHAN_WKSTA:
+ 	case SEC_CHAN_DOMAIN:
+ 		break;
++#endif
+ 	default:
+ 		return NT_STATUS_NOT_SUPPORTED;
+ 	}
+@@ -159,6 +161,11 @@ bool enumerate_domain_trusts( TALLOC_CTX
+ 	*num_domains = 0;
+ 	*sids = NULL;
+ 
++#ifndef NETLOGON_SUPPORT
++	return False;
++#endif
++
++
+ 	/* lookup a DC first */
+ 
+ 	if ( !get_dc_name(domain, NULL, dc_name, &dc_ss) ) {
+@@ -243,6 +250,10 @@ NTSTATUS change_trust_account_password(
+ 	struct cli_state *cli = NULL;
+ 	struct rpc_pipe_client *netlogon_pipe = NULL;
+ 
++#ifndef NETLOGON_SUPPORT
++	return NT_STATUS_UNSUCCESSFUL;
++#endif
++
+ 	DEBUG(5,("change_trust_account_password: Attempting to change trust account password in domain %s....\n",
+ 		domain));
+ 
+--- a/source3/auth/auth_domain.c
++++ b/source3/auth/auth_domain.c
+@@ -538,7 +538,9 @@ static NTSTATUS auth_init_trustdomain(st
+ 
+ NTSTATUS auth_domain_init(void) 
+ {
++#ifdef NETLOGON_SUPPORT
+ 	smb_register_auth(AUTH_INTERFACE_VERSION, "trustdomain", auth_init_trustdomain);
+ 	smb_register_auth(AUTH_INTERFACE_VERSION, "ntdomain", auth_init_ntdomain);
++#endif
+ 	return NT_STATUS_OK;
+ }
+--- a/source3/smbd/process.c
++++ b/source3/smbd/process.c
+@@ -2431,8 +2431,10 @@ static bool housekeeping_fn(const struct
+ 	/* check if we need to reload services */
+ 	check_reload(sconn, time_mono(NULL));
+ 
++#ifdef NETLOGON_SUPPORT
+ 	/* Change machine password if neccessary. */
+ 	attempt_machine_password_change();
++#endif
+ 
+         /*
+ 	 * Force a log file check.
diff --git a/trunk/package/network/services/samba36/patches/260-remove_samr.patch b/trunk/package/network/services/samba36/patches/260-remove_samr.patch
new file mode 100644
index 00000000..7e555730
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/260-remove_samr.patch
@@ -0,0 +1,144 @@
+--- a/source3/rpc_server/rpc_handles.c
++++ b/source3/rpc_server/rpc_handles.c
+@@ -59,8 +59,11 @@ struct handle_list {
+ 
+ static bool is_samr_lsa_pipe(const struct ndr_syntax_id *syntax)
+ {
+-	return (ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id)
+-		|| ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id));
++	return
++#ifdef SAMR_SUPPORT
++		ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id) ||
++#endif
++		ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id);
+ }
+ 
+ size_t num_pipe_handles(struct pipes_struct *p)
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -100,9 +100,11 @@ static bool initialize_interfaces(void)
+ 		return false;
+ 	}
+ #endif
++#ifdef SAMR_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_samr)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef NETLOGON_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_netlogon)) {
+ 		return false;
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -557,6 +557,7 @@ static bool lsarpc_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef SAMR_SUPPORT
+ static bool samr_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -605,6 +606,7 @@ static bool samr_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ #ifdef NETLOGON_SUPPORT
+ static bool netlogon_init_cb(void *ptr)
+@@ -1111,12 +1113,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 		return false;
+ 	}
+ 
++#ifdef SAMR_SUPPORT
+ 	samr_cb.init         = samr_init_cb;
+ 	samr_cb.shutdown     = NULL;
+ 	samr_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_samr_init(&samr_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ #ifdef NETLOGON_SUPPORT
+ 	netlogon_cb.init         = netlogon_init_cb;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -159,7 +159,9 @@ static void exit_server_common(enum serv
+ #ifdef NETLOGON_SUPPORT
+ 		rpc_netlogon_shutdown();
+ #endif
++#ifdef SAMR_SUPPORT
+ 		rpc_samr_shutdown();
++#endif
+ 		rpc_lsarpc_shutdown();
+ 	}
+ 
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -623,7 +623,9 @@ static struct cmd_set *rpcclient_command
+ 	rpcclient_commands,
+ 	lsarpc_commands,
+ 	ds_commands,
++#ifdef SAMR_SUPPORT
+ 	samr_commands,
++#endif
+ #ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
+ #endif
+--- a/source3/smbd/lanman.c
++++ b/source3/smbd/lanman.c
+@@ -2353,6 +2353,10 @@ static bool api_RNetGroupEnum(struct smb
+ 	NTSTATUS status, result;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -2541,6 +2545,10 @@ static bool api_NetUserGetGroups(struct
+ 	NTSTATUS status, result;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !UserName || !p) {
+ 		return False;
+ 	}
+@@ -2741,6 +2749,10 @@ static bool api_RNetUserEnum(struct smbd
+ 
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -2979,6 +2991,10 @@ static bool api_SamOEMChangePassword(str
+ 	int bufsize;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	*rparam_len = 4;
+ 	*rparam = smb_realloc_limit(*rparam,*rparam_len);
+ 	if (!*rparam) {
+@@ -4020,6 +4036,10 @@ static bool api_RNetUserGetInfo(struct s
+ 	union samr_UserInfo *info;
+ 	struct dcerpc_binding_handle *b = NULL;
+ 
++#ifndef SAMR_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !UserName || !p) {
+ 		return False;
+ 	}
diff --git a/trunk/package/network/services/samba36/patches/270-remove_registry_backend.patch b/trunk/package/network/services/samba36/patches/270-remove_registry_backend.patch
new file mode 100644
index 00000000..147b1cec
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/270-remove_registry_backend.patch
@@ -0,0 +1,43 @@
+--- a/source3/lib/smbconf/smbconf_init.c
++++ b/source3/lib/smbconf/smbconf_init.c
+@@ -68,9 +68,12 @@ sbcErr smbconf_init(TALLOC_CTX *mem_ctx,
+ 		}
+ 	}
+ 
++#ifdef REGISTRY_BACKEND
+ 	if (strequal(backend, "registry") || strequal(backend, "reg")) {
+ 		err = smbconf_init_reg(mem_ctx, conf_ctx, path);
+-	} else if (strequal(backend, "file") || strequal(backend, "txt")) {
++	} else
++#endif
++	if (strequal(backend, "file") || strequal(backend, "txt")) {
+ 		err = smbconf_init_txt(mem_ctx, conf_ctx, path);
+ 	} else if (sep == NULL) {
+ 		/*
+--- a/source3/lib/netapi/serverinfo.c
++++ b/source3/lib/netapi/serverinfo.c
+@@ -557,7 +557,10 @@ static WERROR NetServerSetInfo_l_1005(st
+ 		return WERR_INVALID_PARAM;
+ 	}
+ 
+-	if (!lp_config_backend_is_registry()) {
++#ifdef REGISTRY_BACKEND
++	if (!lp_config_backend_is_registry())
++#endif
++	{
+ 		libnetapi_set_error_string(ctx,
+ 			"Configuration manipulation requested but not "
+ 			"supported by backend");
+--- a/source3/smbd/server.c
++++ b/source3/smbd/server.c
+@@ -1230,8 +1230,10 @@ extern void build_options(bool screen);
+ 		exit(1);
+ 	}
+ 
++#ifdef REGISTRY_BACKEND
+ 	if (!W_ERROR_IS_OK(registry_init_full()))
+ 		exit(1);
++#endif
+ 
+ 	/* Open the share_info.tdb here, so we don't have to open
+ 	   after the fork on every single connection.  This is a small
diff --git a/trunk/package/network/services/samba36/patches/280-strip_srvsvc.patch b/trunk/package/network/services/samba36/patches/280-strip_srvsvc.patch
new file mode 100644
index 00000000..348cfbe7
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/280-strip_srvsvc.patch
@@ -0,0 +1,143 @@
+--- a/source3/smbd/lanman.c
++++ b/source3/smbd/lanman.c
+@@ -2197,6 +2197,10 @@ static bool api_RNetShareAdd(struct smbd
+ 	struct srvsvc_NetShareInfo2 info2;
+ 	struct dcerpc_binding_handle *b;
+ 
++#ifndef SRVSVC_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -3589,10 +3593,7 @@ static bool api_RNetServerGetInfo(struct
+ 	NTSTATUS status;
+ 	WERROR werr;
+ 	TALLOC_CTX *mem_ctx = talloc_tos();
+-	struct rpc_pipe_client *cli = NULL;
+-	union srvsvc_NetSrvInfo info;
+ 	int errcode;
+-	struct dcerpc_binding_handle *b;
+ 
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+@@ -3655,66 +3656,16 @@ static bool api_RNetServerGetInfo(struct
+ 	p = *rdata;
+ 	p2 = p + struct_len;
+ 
+-	status = rpc_pipe_open_interface(mem_ctx, &ndr_table_srvsvc.syntax_id,
+-					conn->session_info,
+-					&conn->sconn->client_id,
+-					conn->sconn->msg_ctx,
+-					&cli);
+-	if (!NT_STATUS_IS_OK(status)) {
+-		DEBUG(0,("api_RNetServerGetInfo: could not connect to srvsvc: %s\n",
+-			  nt_errstr(status)));
+-		errcode = W_ERROR_V(ntstatus_to_werror(status));
+-		goto out;
+-	}
+-
+-	b = cli->binding_handle;
+-
+-	status = dcerpc_srvsvc_NetSrvGetInfo(b, mem_ctx,
+-					     NULL,
+-					     101,
+-					     &info,
+-					     &werr);
+-	if (!NT_STATUS_IS_OK(status)) {
+-		errcode = W_ERROR_V(ntstatus_to_werror(status));
+-		goto out;
+-	}
+-	if (!W_ERROR_IS_OK(werr)) {
+-		errcode = W_ERROR_V(werr);
+-		goto out;
+-	}
+-
+-	if (info.info101 == NULL) {
+-		errcode = W_ERROR_V(WERR_INVALID_PARAM);
+-		goto out;
+-	}
+-
+ 	if (uLevel != 20) {
+-		srvstr_push(NULL, 0, p, info.info101->server_name, 16,
++		srvstr_push(NULL, 0, p, global_myname(), 16,
+ 			STR_ASCII|STR_UPPER|STR_TERMINATE);
+-  	}
++	}
+ 	p += 16;
+ 	if (uLevel > 0) {
+-		SCVAL(p,0,info.info101->version_major);
+-		SCVAL(p,1,info.info101->version_minor);
+-		SIVAL(p,2,info.info101->server_type);
+-
+-		if (mdrcnt == struct_len) {
+-			SIVAL(p,6,0);
+-		} else {
+-			SIVAL(p,6,PTR_DIFF(p2,*rdata));
+-			if (mdrcnt - struct_len <= 0) {
+-				return false;
+-			}
+-			push_ascii(p2,
+-				info.info101->comment,
+-				MIN(mdrcnt - struct_len,
+-					MAX_SERVER_STRING_LENGTH),
+-				STR_TERMINATE);
+-			p2 = skip_string(*rdata,*rdata_len,p2);
+-			if (!p2) {
+-				return False;
+-			}
+-		}
++		SCVAL(p,0,lp_major_announce_version());
++		SCVAL(p,1,lp_minor_announce_version());
++		SIVAL(p,2,lp_default_server_announce());
++		SIVAL(p,6,0);
+ 	}
+ 
+ 	if (uLevel > 1) {
+@@ -5405,6 +5356,10 @@ static bool api_RNetSessionEnum(struct s
+ 	uint32_t totalentries, resume_handle = 0;
+ 	uint32_t count = 0;
+ 
++#ifndef SRVSVC_SUPPORT
++	return False;
++#endif
++
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
++++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+@@ -1533,6 +1533,10 @@ WERROR _srvsvc_NetShareSetInfo(struct pi
+ 	TALLOC_CTX *ctx = p->mem_ctx;
+ 	union srvsvc_NetShareInfo *info = r->in.info;
+ 
++#ifndef FULL_SRVSVC
++	return WERR_ACCESS_DENIED;
++#endif
++
+ 	DEBUG(5,("_srvsvc_NetShareSetInfo: %d\n", __LINE__));
+ 
+ 	if (!r->in.share_name) {
+@@ -1763,6 +1767,10 @@ WERROR _srvsvc_NetShareAdd(struct pipes_
+ 	int max_connections = 0;
+ 	TALLOC_CTX *ctx = p->mem_ctx;
+ 
++#ifndef FULL_SRVSVC
++	return WERR_ACCESS_DENIED;
++#endif
++
+ 	DEBUG(5,("_srvsvc_NetShareAdd: %d\n", __LINE__));
+ 
+ 	if (r->out.parm_error) {
+@@ -1945,6 +1953,10 @@ WERROR _srvsvc_NetShareDel(struct pipes_
+ 	struct share_params *params;
+ 	TALLOC_CTX *ctx = p->mem_ctx;
+ 
++#ifndef FULL_SRVSVC
++	return WERR_ACCESS_DENIED;
++#endif
++
+ 	DEBUG(5,("_srvsvc_NetShareDel: %d\n", __LINE__));
+ 
+ 	if (!r->in.share_name) {
diff --git a/trunk/package/network/services/samba36/patches/290-remove_lsa.patch b/trunk/package/network/services/samba36/patches/290-remove_lsa.patch
new file mode 100644
index 00000000..fe37d5da
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/290-remove_lsa.patch
@@ -0,0 +1,73 @@
+--- a/source3/librpc/rpc/rpc_common.c
++++ b/source3/librpc/rpc/rpc_common.c
+@@ -92,9 +92,11 @@ bool smb_register_ndr_interface(const st
+ 
+ static bool initialize_interfaces(void)
+ {
++#ifdef LSA_SUPPORT
+ 	if (!smb_register_ndr_interface(&ndr_table_lsarpc)) {
+ 		return false;
+ 	}
++#endif
+ #ifdef ACTIVE_DIRECTORY
+ 	if (!smb_register_ndr_interface(&ndr_table_dssetup)) {
+ 		return false;
+--- a/source3/smbd/server_exit.c
++++ b/source3/smbd/server_exit.c
+@@ -162,7 +162,9 @@ static void exit_server_common(enum serv
+ #ifdef SAMR_SUPPORT
+ 		rpc_samr_shutdown();
+ #endif
++#ifdef LSA_SUPPORT
+ 		rpc_lsarpc_shutdown();
++#endif
+ 	}
+ 
+ 	/*
+--- a/source3/rpc_server/rpc_ep_setup.c
++++ b/source3/rpc_server/rpc_ep_setup.c
+@@ -508,6 +508,7 @@ static bool srvsvc_init_cb(void *ptr)
+ 	return true;
+ }
+ 
++#ifdef LSA_SUPPORT
+ static bool lsarpc_init_cb(void *ptr)
+ {
+ 	struct dcesrv_ep_context *ep_ctx =
+@@ -556,6 +557,7 @@ static bool lsarpc_init_cb(void *ptr)
+ 
+ 	return true;
+ }
++#endif
+ 
+ #ifdef SAMR_SUPPORT
+ static bool samr_init_cb(void *ptr)
+@@ -1106,12 +1108,14 @@ bool dcesrv_ep_setup(struct tevent_conte
+ 	}
+ 
+ 
++#ifdef LSA_SUPPORT
+ 	lsarpc_cb.init         = lsarpc_init_cb;
+ 	lsarpc_cb.shutdown     = NULL;
+ 	lsarpc_cb.private_data = ep_ctx;
+ 	if (!NT_STATUS_IS_OK(rpc_lsarpc_init(&lsarpc_cb))) {
+ 		return false;
+ 	}
++#endif
+ 
+ #ifdef SAMR_SUPPORT
+ 	samr_cb.init         = samr_init_cb;
+--- a/source3/rpc_server/rpc_handles.c
++++ b/source3/rpc_server/rpc_handles.c
+@@ -63,7 +63,10 @@ static bool is_samr_lsa_pipe(const struc
+ #ifdef SAMR_SUPPORT
+ 		ndr_syntax_id_equal(syntax, &ndr_table_samr.syntax_id) ||
+ #endif
+-		ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id);
++#ifdef LSA_SUPPORT
++		ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id) ||
++#endif
++		false;
+ }
+ 
+ size_t num_pipe_handles(struct pipes_struct *p)
diff --git a/trunk/package/network/services/samba36/patches/300-assert_debug_level.patch b/trunk/package/network/services/samba36/patches/300-assert_debug_level.patch
new file mode 100644
index 00000000..c5b07168
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/300-assert_debug_level.patch
@@ -0,0 +1,11 @@
+--- a/lib/util/util.h
++++ b/lib/util/util.h
+@@ -53,7 +53,7 @@ extern const char *panic_action;
+ #else
+ /* redefine the assert macro for non-developer builds */
+ #define SMB_ASSERT(b) do { if (!(b)) { \
+-        DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \
++        DEBUG(3,("PANIC: assert failed at %s(%d): %s\n", \
+ 	    __FILE__, __LINE__, #b)); }} while (0)
+ #endif
+ 
diff --git a/trunk/package/network/services/samba36/patches/310-remove_error_strings.patch b/trunk/package/network/services/samba36/patches/310-remove_error_strings.patch
new file mode 100644
index 00000000..8c7ae2d7
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/310-remove_error_strings.patch
@@ -0,0 +1,253 @@
+--- a/libcli/util/doserr.c
++++ b/libcli/util/doserr.c
+@@ -28,6 +28,7 @@ struct werror_code_struct {
+ 
+ static const struct werror_code_struct dos_errs[] =
+ {
++#ifdef VERBOSE_ERROR
+ 	{ "WERR_OK", WERR_OK },
+ 	{ "WERR_BADFILE", WERR_BADFILE },
+ 	{ "WERR_ACCESS_DENIED", WERR_ACCESS_DENIED },
+@@ -2668,6 +2669,7 @@ static const struct werror_code_struct d
+ 	{ "WERR_AMBIGUOUS_SYSTEM_DEVICE", WERR_AMBIGUOUS_SYSTEM_DEVICE },
+ 	{ "WERR_SYSTEM_DEVICE_NOT_FOUND", WERR_SYSTEM_DEVICE_NOT_FOUND },
+ 	/* END GENERATED-WIN32-ERROR-CODES */
++#endif
+ 	{ NULL, W_ERROR(0) }
+ };
+ 
+@@ -2684,12 +2686,14 @@ const char *win_errstr(WERROR werror)
+         static char msg[40];
+         int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (dos_errs[idx].dos_errstr != NULL) {
+ 		if (W_ERROR_V(dos_errs[idx].werror) == 
+                     W_ERROR_V(werror))
+                         return dos_errs[idx].dos_errstr;
+ 		idx++;
+ 	}
++#endif
+ 
+ 	slprintf(msg, sizeof(msg), "DOS code 0x%08x", W_ERROR_V(werror));
+ 
+@@ -2702,6 +2706,7 @@ struct werror_str_struct {
+ };
+ 
+ const struct werror_str_struct dos_err_strs[] = {
++#ifdef VERBOSE_ERROR
+ 	{ WERR_OK, "Success" },
+ 	{ WERR_ACCESS_DENIED, "Access is denied" },
+ 	{ WERR_INVALID_PARAM, "Invalid parameter" },
+@@ -5324,6 +5329,7 @@ const struct werror_str_struct dos_err_s
+ 	{ WERR_AMBIGUOUS_SYSTEM_DEVICE, "The requested system device cannot be identified due to multiple indistinguishable devices potentially matching the identification criteria." },
+ 	{ WERR_SYSTEM_DEVICE_NOT_FOUND, "The requested system device cannot be found." },
+ 	/* END GENERATED-WIN32-ERROR-CODES-DESC */
++#endif
+ };
+ 
+ 
+@@ -5334,6 +5340,7 @@ const struct werror_str_struct dos_err_s
+ 
+ const char *get_friendly_werror_msg(WERROR werror)
+ {
++#ifdef VERBOSE_ERROR
+ 	int i = 0;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(dos_err_strs); i++) {
+@@ -5342,6 +5349,7 @@ const char *get_friendly_werror_msg(WERR
+ 			return dos_err_strs[i].friendly_errstr;
+ 		}
+ 	}
++#endif
+ 
+ 	return win_errstr(werror);
+ }
+--- a/librpc/ndr/libndr.h
++++ b/librpc/ndr/libndr.h
+@@ -604,4 +604,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_enum
+ 
+ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b);
+ 
++#ifndef VERBOSE_ERROR
++#define ndr_print_bool(...) do {} while (0)
++#define ndr_print_struct(...) do {} while (0)
++#define ndr_print_null(...) do {} while (0)
++#define ndr_print_enum(...) do {} while (0)
++#define ndr_print_bitmap_flag(...) do {} while (0)
++#define ndr_print_ptr(...) do {} while (0)
++#define ndr_print_union(...) do {} while (0)
++#define ndr_print_bad_level(...) do {} while (0)
++#define ndr_print_array_uint8(...) do {} while (0)
++#define ndr_print_string_array(...) do {} while (0)
++#define ndr_print_string_array(...) do {} while (0)
++#define ndr_print_NTSTATUS(...) do {} while (0)
++#define ndr_print_WERROR(...) do {} while (0)
++#endif
++
+ #endif /* __LIBNDR_H__ */
+--- a/librpc/ndr/ndr_basic.c
++++ b/librpc/ndr/ndr_basic.c
+@@ -31,6 +31,19 @@
+ #define NDR_SIVAL(ndr, ofs, v) do { if (NDR_BE(ndr))  { RSIVAL(ndr->data,ofs,v); } else SIVAL(ndr->data,ofs,v); } while (0)
+ #define NDR_SIVALS(ndr, ofs, v) do { if (NDR_BE(ndr))  { RSIVALS(ndr->data,ofs,v); } else SIVALS(ndr->data,ofs,v); } while (0)
+ 
++#undef ndr_print_bool
++#undef ndr_print_struct
++#undef ndr_print_null
++#undef ndr_print_enum
++#undef ndr_print_bitmap_flag
++#undef ndr_print_ptr
++#undef ndr_print_union
++#undef ndr_print_bad_level
++#undef ndr_print_array_uint8
++#undef ndr_print_string_array
++#undef ndr_print_string_array
++#undef ndr_print_NTSTATUS
++#undef ndr_print_WERROR
+ 
+ /*
+   check for data leaks from the server by looking for non-zero pad bytes
+--- a/librpc/ndr/ndr_string.c
++++ b/librpc/ndr/ndr_string.c
+@@ -588,6 +588,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_stri
+ 	return NDR_ERR_SUCCESS;
+ }
+ 
++#undef ndr_print_string_array
+ _PUBLIC_ void ndr_print_string_array(struct ndr_print *ndr, const char *name, const char **a)
+ {
+ 	uint32_t count;
+--- a/librpc/rpc/dcerpc_error.c
++++ b/librpc/rpc/dcerpc_error.c
+@@ -31,6 +31,7 @@ struct dcerpc_fault_table {
+ static const struct dcerpc_fault_table dcerpc_faults[] =
+ {
+ #define _FAULT_STR(x) { #x , x }
++#ifdef VERBOSE_ERROR
+ 	_FAULT_STR(DCERPC_NCA_S_COMM_FAILURE),
+ 	_FAULT_STR(DCERPC_NCA_S_OP_RNG_ERROR),
+ 	_FAULT_STR(DCERPC_NCA_S_UNKNOWN_IF),
+@@ -78,6 +79,7 @@ static const struct dcerpc_fault_table d
+ 	_FAULT_STR(DCERPC_NCA_S_FAULT_CODESET_CONV_ERROR),
+ 	_FAULT_STR(DCERPC_NCA_S_FAULT_OBJECT_NOT_FOUND),
+ 	_FAULT_STR(DCERPC_NCA_S_FAULT_NO_CLIENT_STUB),
++#endif
+ 	{ NULL, 0 }
+ #undef _FAULT_STR
+ };
+@@ -87,12 +89,14 @@ _PUBLIC_ const char *dcerpc_errstr(TALLO
+ 	int idx = 0;
+ 	WERROR werr = W_ERROR(fault_code);
+ 
++#ifdef VERBOSE_ERROR
+ 	while (dcerpc_faults[idx].errstr != NULL) {
+ 		if (dcerpc_faults[idx].faultcode == fault_code) {
+ 			return dcerpc_faults[idx].errstr;
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	return win_errstr(werr);
+ }
+--- a/source3/libsmb/nterr.c
++++ b/source3/libsmb/nterr.c
+@@ -702,6 +702,7 @@ const char *nt_errstr(NTSTATUS nt_code)
+ 					NT_STATUS_DOS_CODE(nt_code));
+ 	}
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_errs[idx].nt_errstr != NULL) {
+ 		if (NT_STATUS_V(nt_errs[idx].nt_errcode) ==
+ 		    NT_STATUS_V(nt_code)) {
+@@ -709,6 +710,7 @@ const char *nt_errstr(NTSTATUS nt_code)
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	result = talloc_asprintf(talloc_tos(), "NT code 0x%08x",
+ 				 NT_STATUS_V(nt_code));
+@@ -724,12 +726,14 @@ const char *get_friendly_nt_error_msg(NT
+ {
+ 	int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_err_desc[idx].nt_errstr != NULL) {
+ 		if (NT_STATUS_V(nt_err_desc[idx].nt_errcode) == NT_STATUS_V(nt_code)) {
+ 			return nt_err_desc[idx].nt_errstr;
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	/* fall back to NT_STATUS_XXX string */
+ 
+@@ -745,6 +749,7 @@ const char *get_nt_error_c_code(NTSTATUS
+ 	char *result;
+ 	int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_errs[idx].nt_errstr != NULL) {
+ 		if (NT_STATUS_V(nt_errs[idx].nt_errcode) ==
+ 		    NT_STATUS_V(nt_code)) {
+@@ -752,6 +757,7 @@ const char *get_nt_error_c_code(NTSTATUS
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 
+ 	result = talloc_asprintf(talloc_tos(), "NT_STATUS(0x%08x)",
+ 				 NT_STATUS_V(nt_code));
+@@ -767,12 +773,14 @@ NTSTATUS nt_status_string_to_code(const
+ {
+ 	int idx = 0;
+ 
++#ifdef VERBOSE_ERROR
+ 	while (nt_errs[idx].nt_errstr != NULL) {
+ 		if (strcasecmp(nt_errs[idx].nt_errstr, nt_status_str) == 0) {
+ 			return nt_errs[idx].nt_errcode;
+ 		}
+ 		idx++;
+ 	}
++#endif
+ 	return NT_STATUS_UNSUCCESSFUL;
+ }
+ 
+--- a/lib/tdb/common/tdb_private.h
++++ b/lib/tdb/common/tdb_private.h
+@@ -69,7 +69,11 @@ typedef uint32_t tdb_off_t;
+ /* NB assumes there is a local variable called "tdb" that is the
+  * current context, also takes doubly-parenthesized print-style
+  * argument. */
++#ifdef VERBOSE_DEBUG
+ #define TDB_LOG(x) tdb->log.log_fn x
++#else
++#define TDB_LOG(x) do {} while(0)
++#endif
+ 
+ #ifdef TDB_TRACE
+ void tdb_trace(struct tdb_context *tdb, const char *op);
+--- a/source3/script/mkbuildoptions.awk
++++ b/source3/script/mkbuildoptions.awk
+@@ -55,7 +55,7 @@ BEGIN {
+ 	print "****************************************************************************/";
+ 	print "void build_options(bool screen)";
+ 	print "{";
+-	print "       if ((DEBUGLEVEL < 4) && (!screen)) {";
++	print "       if ((DEBUGLEVEL < 4) || (!screen)) {";
+ 	print "	       return;";
+ 	print "       }";
+ 	print "";
+--- a/source3/script/mkbuildoptions-waf.awk
++++ b/source3/script/mkbuildoptions-waf.awk
+@@ -55,7 +55,7 @@ BEGIN {
+ 	print "****************************************************************************/";
+ 	print "void build_options(bool screen)";
+ 	print "{";
+-	print "       if ((DEBUGLEVEL < 4) && (!screen)) {";
++	print "       if ((DEBUGLEVEL < 4) || (!screen)) {";
+ 	print "	       return;";
+ 	print "       }";
+ 	print "";
diff --git a/trunk/package/network/services/samba36/patches/320-debug_level_checks.patch b/trunk/package/network/services/samba36/patches/320-debug_level_checks.patch
new file mode 100644
index 00000000..c6f2e6e0
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/320-debug_level_checks.patch
@@ -0,0 +1,22 @@
+--- a/lib/util/debug.h
++++ b/lib/util/debug.h
+@@ -45,7 +45,7 @@ bool dbghdr( int level, const char *loca
+  * Redefine DEBUGLEVEL because so we don't have to change every source file
+  * that *unnecessarily* references it.
+  */
+-#define DEBUGLEVEL DEBUGLEVEL_CLASS[DBGC_ALL]
++#define DEBUGLEVEL 0
+ 
+ /*
+  * Define all new debug classes here. A class is represented by an entry in
+--- a/source3/nmbd/asyncdns.c
++++ b/source3/nmbd/asyncdns.c
+@@ -85,7 +85,7 @@ static void asyncdns_process(void)
+ 	struct query_record r;
+ 	unstring qname;
+ 
+-	DEBUGLEVEL = -1;
++	DEBUGLEVEL_CLASS[DBGC_ALL] = -1;
+ 
+ 	while (1) {
+ 		NTSTATUS status;
diff --git a/trunk/package/network/services/samba36/patches/330-librpc_default_print.patch b/trunk/package/network/services/samba36/patches/330-librpc_default_print.patch
new file mode 100644
index 00000000..f9c2e0e6
--- /dev/null
+++ b/trunk/package/network/services/samba36/patches/330-librpc_default_print.patch
@@ -0,0 +1,8854 @@
+--- a/source3/librpc/ndr/util.c
++++ b/source3/librpc/ndr/util.c
+@@ -28,3 +28,7 @@ _PUBLIC_ void ndr_print_sockaddr_storage
+ 	char addr[INET6_ADDRSTRLEN];
+ 	ndr->print(ndr, "%-25s: %s", name, print_sockaddr(addr, sizeof(addr), ss));
+ }
++
++_PUBLIC_ void ndr_print_disabled(struct ndr_print *ndr, const char *name, int flags, void *r)
++{
++}
+--- a/source3/librpc/gen_ndr/ndr_atsvc.c
++++ b/source3/librpc/gen_ndr/ndr_atsvc.c
+@@ -867,7 +867,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobAdd,
+-		(ndr_print_function_t) ndr_print_atsvc_JobAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -876,7 +876,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobDel),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobDel,
+-		(ndr_print_function_t) ndr_print_atsvc_JobDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -885,7 +885,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobEnum,
+-		(ndr_print_function_t) ndr_print_atsvc_JobEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -894,7 +894,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct atsvc_JobGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_atsvc_JobGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_atsvc_JobGetInfo,
+-		(ndr_print_function_t) ndr_print_atsvc_JobGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_audiosrv.c
++++ b/source3/librpc/gen_ndr/ndr_audiosrv.c
+@@ -594,7 +594,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_CreatezoneFactoriesList),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_CreatezoneFactoriesList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_CreatezoneFactoriesList,
+-		(ndr_print_function_t) ndr_print_audiosrv_CreatezoneFactoriesList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -603,7 +603,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_CreateGfxFactoriesList),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_CreateGfxFactoriesList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_CreateGfxFactoriesList,
+-		(ndr_print_function_t) ndr_print_audiosrv_CreateGfxFactoriesList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -612,7 +612,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_CreateGfxList),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_CreateGfxList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_CreateGfxList,
+-		(ndr_print_function_t) ndr_print_audiosrv_CreateGfxList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -621,7 +621,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_RemoveGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_RemoveGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_RemoveGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_RemoveGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -630,7 +630,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_AddGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_AddGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_AddGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_AddGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -639,7 +639,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_ModifyGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_ModifyGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_ModifyGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_ModifyGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -648,7 +648,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_OpenGfx),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_OpenGfx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_OpenGfx,
+-		(ndr_print_function_t) ndr_print_audiosrv_OpenGfx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -657,7 +657,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_Logon),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_Logon,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_Logon,
+-		(ndr_print_function_t) ndr_print_audiosrv_Logon,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -666,7 +666,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_Logoff),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_Logoff,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_Logoff,
+-		(ndr_print_function_t) ndr_print_audiosrv_Logoff,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -675,7 +675,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_RegisterSessionNotificationEvent),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_RegisterSessionNotificationEvent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_RegisterSessionNotificationEvent,
+-		(ndr_print_function_t) ndr_print_audiosrv_RegisterSessionNotificationEvent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -684,7 +684,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_UnregisterSessionNotificationEvent),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_UnregisterSessionNotificationEvent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_UnregisterSessionNotificationEvent,
+-		(ndr_print_function_t) ndr_print_audiosrv_UnregisterSessionNotificationEvent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -693,7 +693,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_SessionConnectState),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_SessionConnectState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_SessionConnectState,
+-		(ndr_print_function_t) ndr_print_audiosrv_SessionConnectState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -702,7 +702,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_DriverOpenDrvRegKey),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_DriverOpenDrvRegKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_DriverOpenDrvRegKey,
+-		(ndr_print_function_t) ndr_print_audiosrv_DriverOpenDrvRegKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -711,7 +711,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_AdvisePreferredDeviceChange),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_AdvisePreferredDeviceChange,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_AdvisePreferredDeviceChange,
+-		(ndr_print_function_t) ndr_print_audiosrv_AdvisePreferredDeviceChange,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -720,7 +720,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct audiosrv_GetPnpInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_audiosrv_GetPnpInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_audiosrv_GetPnpInfo,
+-		(ndr_print_function_t) ndr_print_audiosrv_GetPnpInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_backupkey.c
++++ b/source3/librpc/gen_ndr/ndr_backupkey.c
+@@ -740,7 +740,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct bkrp_BackupKey),
+ 		(ndr_push_flags_fn_t) ndr_push_bkrp_BackupKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_bkrp_BackupKey,
+-		(ndr_print_function_t) ndr_print_bkrp_BackupKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_browser.c
++++ b/source3/librpc/gen_ndr/ndr_browser.c
+@@ -928,7 +928,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrServerEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrServerEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrServerEnum,
+-		(ndr_print_function_t) ndr_print_BrowserrServerEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -937,7 +937,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrDebugCall),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrDebugCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrDebugCall,
+-		(ndr_print_function_t) ndr_print_BrowserrDebugCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -946,7 +946,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrQueryOtherDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrQueryOtherDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrQueryOtherDomains,
+-		(ndr_print_function_t) ndr_print_BrowserrQueryOtherDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -955,7 +955,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrResetNetlogonState),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrResetNetlogonState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrResetNetlogonState,
+-		(ndr_print_function_t) ndr_print_BrowserrResetNetlogonState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -964,7 +964,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrDebugTrace),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrDebugTrace,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrDebugTrace,
+-		(ndr_print_function_t) ndr_print_BrowserrDebugTrace,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -973,7 +973,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrQueryStatistics),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrQueryStatistics,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrQueryStatistics,
+-		(ndr_print_function_t) ndr_print_BrowserrQueryStatistics,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -982,7 +982,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserResetStatistics),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserResetStatistics,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserResetStatistics,
+-		(ndr_print_function_t) ndr_print_BrowserResetStatistics,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -991,7 +991,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct NetrBrowserStatisticsClear),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrBrowserStatisticsClear,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrBrowserStatisticsClear,
+-		(ndr_print_function_t) ndr_print_NetrBrowserStatisticsClear,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1000,7 +1000,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct NetrBrowserStatisticsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrBrowserStatisticsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrBrowserStatisticsGet,
+-		(ndr_print_function_t) ndr_print_NetrBrowserStatisticsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1009,7 +1009,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrSetNetlogonState),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrSetNetlogonState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrSetNetlogonState,
+-		(ndr_print_function_t) ndr_print_BrowserrSetNetlogonState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1018,7 +1018,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrQueryEmulatedDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrQueryEmulatedDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrQueryEmulatedDomains,
+-		(ndr_print_function_t) ndr_print_BrowserrQueryEmulatedDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1027,7 +1027,7 @@ static const struct ndr_interface_call b
+ 		sizeof(struct BrowserrServerEnumEx),
+ 		(ndr_push_flags_fn_t) ndr_push_BrowserrServerEnumEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BrowserrServerEnumEx,
+-		(ndr_print_function_t) ndr_print_BrowserrServerEnumEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dbgidl.c
++++ b/source3/librpc/gen_ndr/ndr_dbgidl.c
+@@ -48,7 +48,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dummy_dbgidl),
+ 		(ndr_push_flags_fn_t) ndr_push_dummy_dbgidl,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dummy_dbgidl,
+-		(ndr_print_function_t) ndr_print_dummy_dbgidl,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dcom.c
++++ b/source3/librpc/gen_ndr/ndr_dcom.c
+@@ -128,7 +128,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct UseProtSeq),
+ 		(ndr_push_flags_fn_t) ndr_push_UseProtSeq,
+ 		(ndr_pull_flags_fn_t) ndr_pull_UseProtSeq,
+-		(ndr_print_function_t) ndr_print_UseProtSeq,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -137,7 +137,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct GetCustomProtseqInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_GetCustomProtseqInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetCustomProtseqInfo,
+-		(ndr_print_function_t) ndr_print_GetCustomProtseqInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -146,7 +146,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct UpdateResolverBindings),
+ 		(ndr_push_flags_fn_t) ndr_push_UpdateResolverBindings,
+ 		(ndr_pull_flags_fn_t) ndr_pull_UpdateResolverBindings,
+-		(ndr_print_function_t) ndr_print_UpdateResolverBindings,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -450,7 +450,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct QueryInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_QueryInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_QueryInterface,
+-		(ndr_print_function_t) ndr_print_QueryInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -459,7 +459,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct AddRef),
+ 		(ndr_push_flags_fn_t) ndr_push_AddRef,
+ 		(ndr_pull_flags_fn_t) ndr_pull_AddRef,
+-		(ndr_print_function_t) ndr_print_AddRef,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -468,7 +468,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Release),
+ 		(ndr_push_flags_fn_t) ndr_push_Release,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Release,
+-		(ndr_print_function_t) ndr_print_Release,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -849,7 +849,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateInstance,
+-		(ndr_print_function_t) ndr_print_CreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -858,7 +858,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemoteCreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_RemoteCreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemoteCreateInstance,
+-		(ndr_print_function_t) ndr_print_RemoteCreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -867,7 +867,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct LockServer),
+ 		(ndr_push_flags_fn_t) ndr_push_LockServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_LockServer,
+-		(ndr_print_function_t) ndr_print_LockServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -876,7 +876,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemoteLockServer),
+ 		(ndr_push_flags_fn_t) ndr_push_RemoteLockServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemoteLockServer,
+-		(ndr_print_function_t) ndr_print_RemoteLockServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1434,7 +1434,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemQueryInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_RemQueryInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemQueryInterface,
+-		(ndr_print_function_t) ndr_print_RemQueryInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1443,7 +1443,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemAddRef),
+ 		(ndr_push_flags_fn_t) ndr_push_RemAddRef,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemAddRef,
+-		(ndr_print_function_t) ndr_print_RemAddRef,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1452,7 +1452,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemRelease),
+ 		(ndr_push_flags_fn_t) ndr_push_RemRelease,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemRelease,
+-		(ndr_print_function_t) ndr_print_RemRelease,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1590,7 +1590,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetClassObject),
+ 		(ndr_push_flags_fn_t) ndr_push_GetClassObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetClassObject,
+-		(ndr_print_function_t) ndr_print_GetClassObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1701,7 +1701,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ISCMLocalActivator_CreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_ISCMLocalActivator_CreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ISCMLocalActivator_CreateInstance,
+-		(ndr_print_function_t) ndr_print_ISCMLocalActivator_CreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1788,7 +1788,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IMachineLocalActivator_foo),
+ 		(ndr_push_flags_fn_t) ndr_push_IMachineLocalActivator_foo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IMachineLocalActivator_foo,
+-		(ndr_print_function_t) ndr_print_IMachineLocalActivator_foo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1875,7 +1875,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ILocalObjectExporter_Foo),
+ 		(ndr_push_flags_fn_t) ndr_push_ILocalObjectExporter_Foo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ILocalObjectExporter_Foo,
+-		(ndr_print_function_t) ndr_print_ILocalObjectExporter_Foo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2031,7 +2031,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ISystemActivatorRemoteCreateInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_ISystemActivatorRemoteCreateInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ISystemActivatorRemoteCreateInstance,
+-		(ndr_print_function_t) ndr_print_ISystemActivatorRemoteCreateInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2319,7 +2319,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemQueryInterface2),
+ 		(ndr_push_flags_fn_t) ndr_push_RemQueryInterface2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemQueryInterface2,
+-		(ndr_print_function_t) ndr_print_RemQueryInterface2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3040,7 +3040,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetTypeInfoCount),
+ 		(ndr_push_flags_fn_t) ndr_push_GetTypeInfoCount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetTypeInfoCount,
+-		(ndr_print_function_t) ndr_print_GetTypeInfoCount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3049,7 +3049,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetTypeInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_GetTypeInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetTypeInfo,
+-		(ndr_print_function_t) ndr_print_GetTypeInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3058,7 +3058,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetIDsOfNames),
+ 		(ndr_push_flags_fn_t) ndr_push_GetIDsOfNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetIDsOfNames,
+-		(ndr_print_function_t) ndr_print_GetIDsOfNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3067,7 +3067,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Invoke),
+ 		(ndr_push_flags_fn_t) ndr_push_Invoke,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Invoke,
+-		(ndr_print_function_t) ndr_print_Invoke,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3243,7 +3243,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct MarshalInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_MarshalInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_MarshalInterface,
+-		(ndr_print_function_t) ndr_print_MarshalInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3252,7 +3252,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct UnMarshalInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_UnMarshalInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_UnMarshalInterface,
+-		(ndr_print_function_t) ndr_print_UnMarshalInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3385,7 +3385,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct MakeCoffee),
+ 		(ndr_push_flags_fn_t) ndr_push_MakeCoffee,
+ 		(ndr_pull_flags_fn_t) ndr_pull_MakeCoffee,
+-		(ndr_print_function_t) ndr_print_MakeCoffee,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3681,7 +3681,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Read),
+ 		(ndr_push_flags_fn_t) ndr_push_Read,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Read,
+-		(ndr_print_function_t) ndr_print_Read,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3690,7 +3690,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Write),
+ 		(ndr_push_flags_fn_t) ndr_push_Write,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Write,
+-		(ndr_print_function_t) ndr_print_Write,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dfs.c
++++ b/source3/librpc/gen_ndr/ndr_dfs.c
+@@ -5910,7 +5910,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_GetManagerVersion),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetManagerVersion,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetManagerVersion,
+-		(ndr_print_function_t) ndr_print_dfs_GetManagerVersion,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5919,7 +5919,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Add),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Add,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Add,
+-		(ndr_print_function_t) ndr_print_dfs_Add,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5928,7 +5928,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Remove),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Remove,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Remove,
+-		(ndr_print_function_t) ndr_print_dfs_Remove,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5937,7 +5937,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_SetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_SetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_SetInfo,
+-		(ndr_print_function_t) ndr_print_dfs_SetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5946,7 +5946,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_GetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetInfo,
+-		(ndr_print_function_t) ndr_print_dfs_GetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5955,7 +5955,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Enum),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Enum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Enum,
+-		(ndr_print_function_t) ndr_print_dfs_Enum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5964,7 +5964,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Rename),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Rename,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Rename,
+-		(ndr_print_function_t) ndr_print_dfs_Rename,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5973,7 +5973,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Move),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Move,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Move,
+-		(ndr_print_function_t) ndr_print_dfs_Move,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5982,7 +5982,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_ManagerGetConfigInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_ManagerGetConfigInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_ManagerGetConfigInfo,
+-		(ndr_print_function_t) ndr_print_dfs_ManagerGetConfigInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5991,7 +5991,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_ManagerSendSiteInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_ManagerSendSiteInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_ManagerSendSiteInfo,
+-		(ndr_print_function_t) ndr_print_dfs_ManagerSendSiteInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6000,7 +6000,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_AddFtRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_AddFtRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_AddFtRoot,
+-		(ndr_print_function_t) ndr_print_dfs_AddFtRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6009,7 +6009,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_RemoveFtRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_RemoveFtRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_RemoveFtRoot,
+-		(ndr_print_function_t) ndr_print_dfs_RemoveFtRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6018,7 +6018,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_AddStdRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_AddStdRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_AddStdRoot,
+-		(ndr_print_function_t) ndr_print_dfs_AddStdRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6027,7 +6027,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_RemoveStdRoot),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_RemoveStdRoot,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_RemoveStdRoot,
+-		(ndr_print_function_t) ndr_print_dfs_RemoveStdRoot,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6036,7 +6036,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_ManagerInitialize),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_ManagerInitialize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_ManagerInitialize,
+-		(ndr_print_function_t) ndr_print_dfs_ManagerInitialize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6045,7 +6045,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_AddStdRootForced),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_AddStdRootForced,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_AddStdRootForced,
+-		(ndr_print_function_t) ndr_print_dfs_AddStdRootForced,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6054,7 +6054,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_GetDcAddress),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetDcAddress,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetDcAddress,
+-		(ndr_print_function_t) ndr_print_dfs_GetDcAddress,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6063,7 +6063,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_SetDcAddress),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_SetDcAddress,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_SetDcAddress,
+-		(ndr_print_function_t) ndr_print_dfs_SetDcAddress,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6072,7 +6072,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_FlushFtTable),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_FlushFtTable,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_FlushFtTable,
+-		(ndr_print_function_t) ndr_print_dfs_FlushFtTable,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6081,7 +6081,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Add2),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Add2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Add2,
+-		(ndr_print_function_t) ndr_print_dfs_Add2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6090,7 +6090,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_Remove2),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_Remove2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_Remove2,
+-		(ndr_print_function_t) ndr_print_dfs_Remove2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6099,7 +6099,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_EnumEx),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_EnumEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_EnumEx,
+-		(ndr_print_function_t) ndr_print_dfs_EnumEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6108,7 +6108,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct dfs_SetInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_SetInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_SetInfo2,
+-		(ndr_print_function_t) ndr_print_dfs_SetInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dfsblobs.c
++++ b/source3/librpc/gen_ndr/ndr_dfsblobs.c
+@@ -1398,7 +1398,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dfs_GetDFSReferral),
+ 		(ndr_push_flags_fn_t) ndr_push_dfs_GetDFSReferral,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dfs_GetDFSReferral,
+-		(ndr_print_function_t) ndr_print_dfs_GetDFSReferral,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dns.c
++++ b/source3/librpc/gen_ndr/ndr_dns.c
+@@ -860,7 +860,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_dns_name_packet),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_dns_name_packet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_dns_name_packet,
+-		(ndr_print_function_t) ndr_print_decode_dns_name_packet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dnsp.c
++++ b/source3/librpc/gen_ndr/ndr_dnsp.c
+@@ -700,7 +700,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_DnssrvRpcRecord),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_DnssrvRpcRecord,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_DnssrvRpcRecord,
+-		(ndr_print_function_t) ndr_print_decode_DnssrvRpcRecord,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dnsserver.c
++++ b/source3/librpc/gen_ndr/ndr_dnsserver.c
+@@ -48,7 +48,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dnsserver_foo),
+ 		(ndr_push_flags_fn_t) ndr_push_dnsserver_foo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dnsserver_foo,
+-		(ndr_print_function_t) ndr_print_dnsserver_foo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_drsblobs.c
++++ b/source3/librpc/gen_ndr/ndr_drsblobs.c
+@@ -5275,7 +5275,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_replPropertyMetaData),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_replPropertyMetaData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_replPropertyMetaData,
+-		(ndr_print_function_t) ndr_print_decode_replPropertyMetaData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5284,7 +5284,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_replUpToDateVector),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_replUpToDateVector,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_replUpToDateVector,
+-		(ndr_print_function_t) ndr_print_decode_replUpToDateVector,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5293,7 +5293,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_repsFromTo),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_repsFromTo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_repsFromTo,
+-		(ndr_print_function_t) ndr_print_decode_repsFromTo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5302,7 +5302,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_partialAttributeSet),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_partialAttributeSet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_partialAttributeSet,
+-		(ndr_print_function_t) ndr_print_decode_partialAttributeSet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5311,7 +5311,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_prefixMap),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_prefixMap,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_prefixMap,
+-		(ndr_print_function_t) ndr_print_decode_prefixMap,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5320,7 +5320,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_ldapControlDirSync),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ldapControlDirSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ldapControlDirSync,
+-		(ndr_print_function_t) ndr_print_decode_ldapControlDirSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5329,7 +5329,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_supplementalCredentials),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_supplementalCredentials,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_supplementalCredentials,
+-		(ndr_print_function_t) ndr_print_decode_supplementalCredentials,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5338,7 +5338,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_Packages),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_Packages,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_Packages,
+-		(ndr_print_function_t) ndr_print_decode_Packages,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5347,7 +5347,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_PrimaryKerberos),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_PrimaryKerberos,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_PrimaryKerberos,
+-		(ndr_print_function_t) ndr_print_decode_PrimaryKerberos,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5356,7 +5356,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_PrimaryCLEARTEXT),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_PrimaryCLEARTEXT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_PrimaryCLEARTEXT,
+-		(ndr_print_function_t) ndr_print_decode_PrimaryCLEARTEXT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5365,7 +5365,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_PrimaryWDigest),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_PrimaryWDigest,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_PrimaryWDigest,
+-		(ndr_print_function_t) ndr_print_decode_PrimaryWDigest,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5374,7 +5374,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_trustAuthInOut),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_trustAuthInOut,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_trustAuthInOut,
+-		(ndr_print_function_t) ndr_print_decode_trustAuthInOut,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5383,7 +5383,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_trustDomainPasswords),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_trustDomainPasswords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_trustDomainPasswords,
+-		(ndr_print_function_t) ndr_print_decode_trustDomainPasswords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5392,7 +5392,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_ExtendedErrorInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ExtendedErrorInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ExtendedErrorInfo,
+-		(ndr_print_function_t) ndr_print_decode_ExtendedErrorInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5401,7 +5401,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct decode_ForestTrustInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ForestTrustInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ForestTrustInfo,
+-		(ndr_print_function_t) ndr_print_decode_ForestTrustInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_drsuapi.c
++++ b/source3/librpc/gen_ndr/ndr_drsuapi.c
+@@ -16500,7 +16500,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsBind),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsBind,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsBind,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsBind,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16509,7 +16509,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsUnbind),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsUnbind,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsUnbind,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsUnbind,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16518,7 +16518,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaSync),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaSync,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16527,7 +16527,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetNCChanges),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetNCChanges,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetNCChanges,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetNCChanges,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16536,7 +16536,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaUpdateRefs),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaUpdateRefs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaUpdateRefs,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaUpdateRefs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16545,7 +16545,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaAdd,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16554,7 +16554,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaDel),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaDel,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16563,7 +16563,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaMod),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaMod,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaMod,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaMod,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16572,7 +16572,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_VERIFY_NAMES),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_VERIFY_NAMES,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_VERIFY_NAMES,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_VERIFY_NAMES,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16581,7 +16581,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetMemberships),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetMemberships,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetMemberships,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetMemberships,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16590,7 +16590,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_INTER_DOMAIN_MOVE),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_INTER_DOMAIN_MOVE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_INTER_DOMAIN_MOVE,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_INTER_DOMAIN_MOVE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16599,7 +16599,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetNT4ChangeLog),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetNT4ChangeLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetNT4ChangeLog,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetNT4ChangeLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16608,7 +16608,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsCrackNames),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsCrackNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsCrackNames,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsCrackNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16617,7 +16617,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsWriteAccountSpn),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsWriteAccountSpn,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsWriteAccountSpn,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsWriteAccountSpn,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16626,7 +16626,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsRemoveDSServer),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsRemoveDSServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsRemoveDSServer,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsRemoveDSServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16635,7 +16635,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_REMOVE_DS_DOMAIN),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_REMOVE_DS_DOMAIN,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_REMOVE_DS_DOMAIN,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_REMOVE_DS_DOMAIN,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16644,7 +16644,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetDomainControllerInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetDomainControllerInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetDomainControllerInfo,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetDomainControllerInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16653,7 +16653,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsAddEntry),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsAddEntry,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsAddEntry,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsAddEntry,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16662,7 +16662,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsExecuteKCC),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsExecuteKCC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsExecuteKCC,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsExecuteKCC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16671,7 +16671,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsReplicaGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsReplicaGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsReplicaGetInfo,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsReplicaGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16680,7 +16680,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_ADD_SID_HISTORY),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_ADD_SID_HISTORY,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_ADD_SID_HISTORY,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_ADD_SID_HISTORY,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16689,7 +16689,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_DsGetMemberships2),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_DsGetMemberships2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_DsGetMemberships2,
+-		(ndr_print_function_t) ndr_print_drsuapi_DsGetMemberships2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16698,7 +16698,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_REPLICA_VERIFY_OBJECTS),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_REPLICA_VERIFY_OBJECTS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_REPLICA_VERIFY_OBJECTS,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_REPLICA_VERIFY_OBJECTS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16707,7 +16707,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct DRSUAPI_GET_OBJECT_EXISTENCE),
+ 		(ndr_push_flags_fn_t) ndr_push_DRSUAPI_GET_OBJECT_EXISTENCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DRSUAPI_GET_OBJECT_EXISTENCE,
+-		(ndr_print_function_t) ndr_print_DRSUAPI_GET_OBJECT_EXISTENCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -16716,7 +16716,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct drsuapi_QuerySitesByCost),
+ 		(ndr_push_flags_fn_t) ndr_push_drsuapi_QuerySitesByCost,
+ 		(ndr_pull_flags_fn_t) ndr_pull_drsuapi_QuerySitesByCost,
+-		(ndr_print_function_t) ndr_print_drsuapi_QuerySitesByCost,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dsbackup.c
++++ b/source3/librpc/gen_ndr/ndr_dsbackup.c
+@@ -360,7 +360,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupPrepare),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupPrepare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupPrepare,
+-		(ndr_print_function_t) ndr_print_HrRBackupPrepare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -369,7 +369,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupEnd),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupEnd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupEnd,
+-		(ndr_print_function_t) ndr_print_HrRBackupEnd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -378,7 +378,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupGetAttachmentInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupGetAttachmentInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupGetAttachmentInformation,
+-		(ndr_print_function_t) ndr_print_HrRBackupGetAttachmentInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -387,7 +387,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupOpenFile),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupOpenFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupOpenFile,
+-		(ndr_print_function_t) ndr_print_HrRBackupOpenFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -396,7 +396,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupRead),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupRead,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupRead,
+-		(ndr_print_function_t) ndr_print_HrRBackupRead,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -405,7 +405,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupClose),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupClose,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupClose,
+-		(ndr_print_function_t) ndr_print_HrRBackupClose,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -414,7 +414,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupGetBackupLogs),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupGetBackupLogs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupGetBackupLogs,
+-		(ndr_print_function_t) ndr_print_HrRBackupGetBackupLogs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -423,7 +423,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupTruncateLogs),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupTruncateLogs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupTruncateLogs,
+-		(ndr_print_function_t) ndr_print_HrRBackupTruncateLogs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -432,7 +432,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRBackupPing),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRBackupPing,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRBackupPing,
+-		(ndr_print_function_t) ndr_print_HrRBackupPing,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -789,7 +789,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRIsNTDSOnline),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRIsNTDSOnline,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRIsNTDSOnline,
+-		(ndr_print_function_t) ndr_print_HrRIsNTDSOnline,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -798,7 +798,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestorePrepare),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestorePrepare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestorePrepare,
+-		(ndr_print_function_t) ndr_print_HrRRestorePrepare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -807,7 +807,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreRegister),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreRegister,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreRegister,
+-		(ndr_print_function_t) ndr_print_HrRRestoreRegister,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -816,7 +816,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreRegisterComplete),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreRegisterComplete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreRegisterComplete,
+-		(ndr_print_function_t) ndr_print_HrRRestoreRegisterComplete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -825,7 +825,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreGetDatabaseLocations),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreGetDatabaseLocations,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreGetDatabaseLocations,
+-		(ndr_print_function_t) ndr_print_HrRRestoreGetDatabaseLocations,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -834,7 +834,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreEnd),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreEnd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreEnd,
+-		(ndr_print_function_t) ndr_print_HrRRestoreEnd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -843,7 +843,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreSetCurrentLogNumber),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreSetCurrentLogNumber,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreSetCurrentLogNumber,
+-		(ndr_print_function_t) ndr_print_HrRRestoreSetCurrentLogNumber,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -852,7 +852,7 @@ static const struct ndr_interface_call a
+ 		sizeof(struct HrRRestoreCheckLogsForBackup),
+ 		(ndr_push_flags_fn_t) ndr_push_HrRRestoreCheckLogsForBackup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_HrRRestoreCheckLogsForBackup,
+-		(ndr_print_function_t) ndr_print_HrRRestoreCheckLogsForBackup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_dssetup.c
++++ b/source3/librpc/gen_ndr/ndr_dssetup.c
+@@ -995,7 +995,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleGetPrimaryDomainInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleGetPrimaryDomainInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleGetPrimaryDomainInformation,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleGetPrimaryDomainInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1004,7 +1004,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDnsNameToFlatName),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDnsNameToFlatName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDnsNameToFlatName,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDnsNameToFlatName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1013,7 +1013,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDcAsDc),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDcAsDc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDcAsDc,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDcAsDc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1022,7 +1022,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDcAsReplica),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDcAsReplica,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDcAsReplica,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDcAsReplica,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1031,7 +1031,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleDemoteDc),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleDemoteDc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleDemoteDc,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleDemoteDc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1040,7 +1040,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleGetDcOperationProgress),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleGetDcOperationProgress,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleGetDcOperationProgress,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleGetDcOperationProgress,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1049,7 +1049,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleGetDcOperationResults),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleGetDcOperationResults,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleGetDcOperationResults,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleGetDcOperationResults,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1058,7 +1058,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleCancel),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleCancel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleCancel,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleCancel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1067,7 +1067,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleServerSaveStateForUpgrade),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleServerSaveStateForUpgrade,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleServerSaveStateForUpgrade,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleServerSaveStateForUpgrade,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1076,7 +1076,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleUpgradeDownlevelServer),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleUpgradeDownlevelServer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleUpgradeDownlevelServer,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleUpgradeDownlevelServer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1085,7 +1085,7 @@ static const struct ndr_interface_call d
+ 		sizeof(struct dssetup_DsRoleAbortDownlevelServerUpgrade),
+ 		(ndr_push_flags_fn_t) ndr_push_dssetup_DsRoleAbortDownlevelServerUpgrade,
+ 		(ndr_pull_flags_fn_t) ndr_pull_dssetup_DsRoleAbortDownlevelServerUpgrade,
+-		(ndr_print_function_t) ndr_print_dssetup_DsRoleAbortDownlevelServerUpgrade,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_echo.c
++++ b/source3/librpc/gen_ndr/ndr_echo.c
+@@ -1458,7 +1458,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_AddOne),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_AddOne,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_AddOne,
+-		(ndr_print_function_t) ndr_print_echo_AddOne,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1467,7 +1467,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_EchoData),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_EchoData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_EchoData,
+-		(ndr_print_function_t) ndr_print_echo_EchoData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1476,7 +1476,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_SinkData),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_SinkData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_SinkData,
+-		(ndr_print_function_t) ndr_print_echo_SinkData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1485,7 +1485,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_SourceData),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_SourceData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_SourceData,
+-		(ndr_print_function_t) ndr_print_echo_SourceData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1494,7 +1494,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestCall),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestCall,
+-		(ndr_print_function_t) ndr_print_echo_TestCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1503,7 +1503,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestCall2),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestCall2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestCall2,
+-		(ndr_print_function_t) ndr_print_echo_TestCall2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1512,7 +1512,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestSleep),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestSleep,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestSleep,
+-		(ndr_print_function_t) ndr_print_echo_TestSleep,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1521,7 +1521,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestEnum,
+-		(ndr_print_function_t) ndr_print_echo_TestEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1530,7 +1530,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestSurrounding),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestSurrounding,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestSurrounding,
+-		(ndr_print_function_t) ndr_print_echo_TestSurrounding,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1539,7 +1539,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct echo_TestDoublePointer),
+ 		(ndr_push_flags_fn_t) ndr_push_echo_TestDoublePointer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_echo_TestDoublePointer,
+-		(ndr_print_function_t) ndr_print_echo_TestDoublePointer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_efs.c
++++ b/source3/librpc/gen_ndr/ndr_efs.c
+@@ -1327,7 +1327,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcOpenFileRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcOpenFileRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcOpenFileRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcOpenFileRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1336,7 +1336,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcReadFileRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcReadFileRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcReadFileRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcReadFileRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1345,7 +1345,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcWriteFileRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcWriteFileRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcWriteFileRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcWriteFileRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1354,7 +1354,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcCloseRaw),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcCloseRaw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcCloseRaw,
+-		(ndr_print_function_t) ndr_print_EfsRpcCloseRaw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1363,7 +1363,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcEncryptFileSrv),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcEncryptFileSrv,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcEncryptFileSrv,
+-		(ndr_print_function_t) ndr_print_EfsRpcEncryptFileSrv,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1372,7 +1372,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcDecryptFileSrv),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcDecryptFileSrv,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcDecryptFileSrv,
+-		(ndr_print_function_t) ndr_print_EfsRpcDecryptFileSrv,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1381,7 +1381,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcQueryUsersOnFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcQueryUsersOnFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcQueryUsersOnFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcQueryUsersOnFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1390,7 +1390,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcQueryRecoveryAgents),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcQueryRecoveryAgents,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcQueryRecoveryAgents,
+-		(ndr_print_function_t) ndr_print_EfsRpcQueryRecoveryAgents,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1399,7 +1399,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcRemoveUsersFromFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcRemoveUsersFromFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcRemoveUsersFromFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcRemoveUsersFromFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1408,7 +1408,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcAddUsersToFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcAddUsersToFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcAddUsersToFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcAddUsersToFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1417,7 +1417,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcSetFileEncryptionKey),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcSetFileEncryptionKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcSetFileEncryptionKey,
+-		(ndr_print_function_t) ndr_print_EfsRpcSetFileEncryptionKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1426,7 +1426,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcNotSupported),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcNotSupported,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcNotSupported,
+-		(ndr_print_function_t) ndr_print_EfsRpcNotSupported,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1435,7 +1435,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcFileKeyInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcFileKeyInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcFileKeyInfo,
+-		(ndr_print_function_t) ndr_print_EfsRpcFileKeyInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1444,7 +1444,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct EfsRpcDuplicateEncryptionInfoFile),
+ 		(ndr_push_flags_fn_t) ndr_push_EfsRpcDuplicateEncryptionInfoFile,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EfsRpcDuplicateEncryptionInfoFile,
+-		(ndr_print_function_t) ndr_print_EfsRpcDuplicateEncryptionInfoFile,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_epmapper.c
++++ b/source3/librpc/gen_ndr/ndr_epmapper.c
+@@ -2754,7 +2754,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Insert),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Insert,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Insert,
+-		(ndr_print_function_t) ndr_print_epm_Insert,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2763,7 +2763,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Delete),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Delete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Delete,
+-		(ndr_print_function_t) ndr_print_epm_Delete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2772,7 +2772,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Lookup),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Lookup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Lookup,
+-		(ndr_print_function_t) ndr_print_epm_Lookup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2781,7 +2781,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_Map),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_Map,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_Map,
+-		(ndr_print_function_t) ndr_print_epm_Map,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2790,7 +2790,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_LookupHandleFree),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_LookupHandleFree,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_LookupHandleFree,
+-		(ndr_print_function_t) ndr_print_epm_LookupHandleFree,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2799,7 +2799,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_InqObject),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_InqObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_InqObject,
+-		(ndr_print_function_t) ndr_print_epm_InqObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2808,7 +2808,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_MgmtDelete),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_MgmtDelete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_MgmtDelete,
+-		(ndr_print_function_t) ndr_print_epm_MgmtDelete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2817,7 +2817,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct epm_MapAuth),
+ 		(ndr_push_flags_fn_t) ndr_push_epm_MapAuth,
+ 		(ndr_pull_flags_fn_t) ndr_pull_epm_MapAuth,
+-		(ndr_print_function_t) ndr_print_epm_MapAuth,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_eventlog.c
++++ b/source3/librpc/gen_ndr/ndr_eventlog.c
+@@ -2983,7 +2983,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ClearEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ClearEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ClearEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_ClearEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2992,7 +2992,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_BackupEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_BackupEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_BackupEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_BackupEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3001,7 +3001,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_CloseEventLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_CloseEventLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_CloseEventLog,
+-		(ndr_print_function_t) ndr_print_eventlog_CloseEventLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3010,7 +3010,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_DeregisterEventSource),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_DeregisterEventSource,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_DeregisterEventSource,
+-		(ndr_print_function_t) ndr_print_eventlog_DeregisterEventSource,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3019,7 +3019,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_GetNumRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_GetNumRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_GetNumRecords,
+-		(ndr_print_function_t) ndr_print_eventlog_GetNumRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3028,7 +3028,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_GetOldestRecord),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_GetOldestRecord,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_GetOldestRecord,
+-		(ndr_print_function_t) ndr_print_eventlog_GetOldestRecord,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3037,7 +3037,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ChangeNotify),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ChangeNotify,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ChangeNotify,
+-		(ndr_print_function_t) ndr_print_eventlog_ChangeNotify,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3046,7 +3046,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3055,7 +3055,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_RegisterEventSourceW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_RegisterEventSourceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_RegisterEventSourceW,
+-		(ndr_print_function_t) ndr_print_eventlog_RegisterEventSourceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3064,7 +3064,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenBackupEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenBackupEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenBackupEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenBackupEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3073,7 +3073,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReadEventLogW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReadEventLogW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReadEventLogW,
+-		(ndr_print_function_t) ndr_print_eventlog_ReadEventLogW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3082,7 +3082,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReportEventW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReportEventW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReportEventW,
+-		(ndr_print_function_t) ndr_print_eventlog_ReportEventW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3091,7 +3091,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ClearEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ClearEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ClearEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_ClearEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3100,7 +3100,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_BackupEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_BackupEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_BackupEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_BackupEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3109,7 +3109,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3118,7 +3118,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_RegisterEventSourceA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_RegisterEventSourceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_RegisterEventSourceA,
+-		(ndr_print_function_t) ndr_print_eventlog_RegisterEventSourceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3127,7 +3127,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_OpenBackupEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_OpenBackupEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_OpenBackupEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_OpenBackupEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3136,7 +3136,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReadEventLogA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReadEventLogA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReadEventLogA,
+-		(ndr_print_function_t) ndr_print_eventlog_ReadEventLogA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3145,7 +3145,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReportEventA),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReportEventA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReportEventA,
+-		(ndr_print_function_t) ndr_print_eventlog_ReportEventA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3154,7 +3154,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_RegisterClusterSvc),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_RegisterClusterSvc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_RegisterClusterSvc,
+-		(ndr_print_function_t) ndr_print_eventlog_RegisterClusterSvc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3163,7 +3163,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_DeregisterClusterSvc),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_DeregisterClusterSvc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_DeregisterClusterSvc,
+-		(ndr_print_function_t) ndr_print_eventlog_DeregisterClusterSvc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3172,7 +3172,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_WriteClusterEvents),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_WriteClusterEvents,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_WriteClusterEvents,
+-		(ndr_print_function_t) ndr_print_eventlog_WriteClusterEvents,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3181,7 +3181,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_GetLogInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_GetLogInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_GetLogInformation,
+-		(ndr_print_function_t) ndr_print_eventlog_GetLogInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3190,7 +3190,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_FlushEventLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_FlushEventLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_FlushEventLog,
+-		(ndr_print_function_t) ndr_print_eventlog_FlushEventLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3199,7 +3199,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog_ReportEventAndSourceW),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog_ReportEventAndSourceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog_ReportEventAndSourceW,
+-		(ndr_print_function_t) ndr_print_eventlog_ReportEventAndSourceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_eventlog6.c
++++ b/source3/librpc/gen_ndr/ndr_eventlog6.c
+@@ -5482,7 +5482,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRegisterRemoteSubscription),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRegisterRemoteSubscription,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRegisterRemoteSubscription,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRegisterRemoteSubscription,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5491,7 +5491,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRemoteSubscriptionNextAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRemoteSubscriptionNextAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRemoteSubscriptionNextAsync,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRemoteSubscriptionNextAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5500,7 +5500,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRemoteSubscriptionNext),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRemoteSubscriptionNext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRemoteSubscriptionNext,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRemoteSubscriptionNext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5509,7 +5509,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRemoteSubscriptionWaitAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRemoteSubscriptionWaitAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRemoteSubscriptionWaitAsync,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRemoteSubscriptionWaitAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5518,7 +5518,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRegisterControllableOperation),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRegisterControllableOperation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRegisterControllableOperation,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRegisterControllableOperation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5527,7 +5527,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRegisterLogQuery),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRegisterLogQuery,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRegisterLogQuery,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRegisterLogQuery,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5536,7 +5536,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcClearLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcClearLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcClearLog,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcClearLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5545,7 +5545,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcExportLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcExportLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcExportLog,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcExportLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5554,7 +5554,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcLocalizeExportLog),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcLocalizeExportLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcLocalizeExportLog,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcLocalizeExportLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5563,7 +5563,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcMessageRender),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcMessageRender,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcMessageRender,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcMessageRender,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5572,7 +5572,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcMessageRenderDefault),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcMessageRenderDefault,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcMessageRenderDefault,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcMessageRenderDefault,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5581,7 +5581,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcQueryNext),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcQueryNext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcQueryNext,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcQueryNext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5590,7 +5590,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcQuerySeek),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcQuerySeek,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcQuerySeek,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcQuerySeek,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5599,7 +5599,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcClose),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcClose,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcClose,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcClose,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5608,7 +5608,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcCancel),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcCancel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcCancel,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcCancel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5617,7 +5617,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcAssertConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcAssertConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcAssertConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcAssertConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5626,7 +5626,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcRetractConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcRetractConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcRetractConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcRetractConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5635,7 +5635,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcOpenLogHandle),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcOpenLogHandle,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcOpenLogHandle,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcOpenLogHandle,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5644,7 +5644,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetLogFileInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetLogFileInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetLogFileInfo,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetLogFileInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5653,7 +5653,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetChannelList),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetChannelList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetChannelList,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetChannelList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5662,7 +5662,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetChannelConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetChannelConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetChannelConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetChannelConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5671,7 +5671,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcPutChannelConfig),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcPutChannelConfig,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcPutChannelConfig,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcPutChannelConfig,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5680,7 +5680,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherList),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherList,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5689,7 +5689,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherListForChannel),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherListForChannel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherListForChannel,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherListForChannel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5698,7 +5698,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherMetadata),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherMetadata,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherMetadata,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherMetadata,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5707,7 +5707,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetPublisherResourceMetadata),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetPublisherResourceMetadata,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetPublisherResourceMetadata,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetPublisherResourceMetadata,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5716,7 +5716,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetEventMetadataEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetEventMetadataEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetEventMetadataEnum,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetEventMetadataEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5725,7 +5725,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetNextEventMetadata),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetNextEventMetadata,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetNextEventMetadata,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetNextEventMetadata,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5734,7 +5734,7 @@ static const struct ndr_interface_call e
+ 		sizeof(struct eventlog6_EvtRpcGetClassicLogDisplayName),
+ 		(ndr_push_flags_fn_t) ndr_push_eventlog6_EvtRpcGetClassicLogDisplayName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_eventlog6_EvtRpcGetClassicLogDisplayName,
+-		(ndr_print_function_t) ndr_print_eventlog6_EvtRpcGetClassicLogDisplayName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_frsapi.c
++++ b/source3/librpc/gen_ndr/ndr_frsapi.c
+@@ -979,7 +979,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_VERIFY_PROMOTION),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_VERIFY_PROMOTION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_VERIFY_PROMOTION,
+-		(ndr_print_function_t) ndr_print_FRSAPI_VERIFY_PROMOTION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -988,7 +988,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_PROMOTION_STATUS),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_PROMOTION_STATUS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_PROMOTION_STATUS,
+-		(ndr_print_function_t) ndr_print_FRSAPI_PROMOTION_STATUS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -997,7 +997,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_START_DEMOTION),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_START_DEMOTION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_START_DEMOTION,
+-		(ndr_print_function_t) ndr_print_FRSAPI_START_DEMOTION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1006,7 +1006,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_COMMIT_DEMOTION),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_COMMIT_DEMOTION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_COMMIT_DEMOTION,
+-		(ndr_print_function_t) ndr_print_FRSAPI_COMMIT_DEMOTION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1015,7 +1015,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_SetDsPollingIntervalW),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_SetDsPollingIntervalW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_SetDsPollingIntervalW,
+-		(ndr_print_function_t) ndr_print_frsapi_SetDsPollingIntervalW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1024,7 +1024,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_GetDsPollingIntervalW),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_GetDsPollingIntervalW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_GetDsPollingIntervalW,
+-		(ndr_print_function_t) ndr_print_frsapi_GetDsPollingIntervalW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1033,7 +1033,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSAPI_VERIFY_PROMOTION_W),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSAPI_VERIFY_PROMOTION_W,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSAPI_VERIFY_PROMOTION_W,
+-		(ndr_print_function_t) ndr_print_FRSAPI_VERIFY_PROMOTION_W,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1042,7 +1042,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_InfoW),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_InfoW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_InfoW,
+-		(ndr_print_function_t) ndr_print_frsapi_InfoW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1051,7 +1051,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_IsPathReplicated),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_IsPathReplicated,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_IsPathReplicated,
+-		(ndr_print_function_t) ndr_print_frsapi_IsPathReplicated,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1060,7 +1060,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_WriterCommand),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_WriterCommand,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_WriterCommand,
+-		(ndr_print_function_t) ndr_print_frsapi_WriterCommand,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1069,7 +1069,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsapi_ForceReplication),
+ 		(ndr_push_flags_fn_t) ndr_push_frsapi_ForceReplication,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsapi_ForceReplication,
+-		(ndr_print_function_t) ndr_print_frsapi_ForceReplication,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_frsrpc.c
++++ b/source3/librpc/gen_ndr/ndr_frsrpc.c
+@@ -2781,7 +2781,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsSendCommPkt),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsSendCommPkt,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsSendCommPkt,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsSendCommPkt,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2790,7 +2790,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsVerifyPromotionParent),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsVerifyPromotionParent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsVerifyPromotionParent,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsVerifyPromotionParent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2799,7 +2799,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsStartPromotionParent),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsStartPromotionParent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsStartPromotionParent,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsStartPromotionParent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2808,7 +2808,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frsrpc_FrsNOP),
+ 		(ndr_push_flags_fn_t) ndr_push_frsrpc_FrsNOP,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frsrpc_FrsNOP,
+-		(ndr_print_function_t) ndr_print_frsrpc_FrsNOP,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2817,7 +2817,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2826,7 +2826,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_5),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_5,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_5,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_5,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2835,7 +2835,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_6),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_6,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_6,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_6,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2844,7 +2844,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_7),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_7,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_7,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_7,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2853,7 +2853,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_8),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_8,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_8,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_8,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2862,7 +2862,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_BACKUP_COMPLETE_9),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_BACKUP_COMPLETE_9,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_BACKUP_COMPLETE_9,
+-		(ndr_print_function_t) ndr_print_FRSRPC_BACKUP_COMPLETE_9,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2871,7 +2871,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSRPC_VERIFY_PROMOTION_PARENT_EX),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSRPC_VERIFY_PROMOTION_PARENT_EX,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSRPC_VERIFY_PROMOTION_PARENT_EX,
+-		(ndr_print_function_t) ndr_print_FRSRPC_VERIFY_PROMOTION_PARENT_EX,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_frstrans.c
++++ b/source3/librpc/gen_ndr/ndr_frstrans.c
+@@ -2331,7 +2331,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_CheckConnectivity),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_CheckConnectivity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_CheckConnectivity,
+-		(ndr_print_function_t) ndr_print_frstrans_CheckConnectivity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2340,7 +2340,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_EstablishConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_EstablishConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_EstablishConnection,
+-		(ndr_print_function_t) ndr_print_frstrans_EstablishConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2349,7 +2349,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_EstablishSession),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_EstablishSession,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_EstablishSession,
+-		(ndr_print_function_t) ndr_print_frstrans_EstablishSession,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2358,7 +2358,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RequestUpdates),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RequestUpdates,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RequestUpdates,
+-		(ndr_print_function_t) ndr_print_frstrans_RequestUpdates,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2367,7 +2367,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RequestVersionVector),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RequestVersionVector,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RequestVersionVector,
+-		(ndr_print_function_t) ndr_print_frstrans_RequestVersionVector,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2376,7 +2376,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_AsyncPoll),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_AsyncPoll,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_AsyncPoll,
+-		(ndr_print_function_t) ndr_print_frstrans_AsyncPoll,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2385,7 +2385,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_REQUEST_RECORDS),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_REQUEST_RECORDS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_REQUEST_RECORDS,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_REQUEST_RECORDS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2394,7 +2394,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_UPDATE_CANCEL),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_UPDATE_CANCEL,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_UPDATE_CANCEL,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_UPDATE_CANCEL,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2403,7 +2403,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RAW_GET_FILE_DATA),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RAW_GET_FILE_DATA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RAW_GET_FILE_DATA,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RAW_GET_FILE_DATA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2412,7 +2412,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_GET_SIGNATURES),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_GET_SIGNATURES,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_GET_SIGNATURES,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_GET_SIGNATURES,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2421,7 +2421,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_PUSH_SOURCE_NEEDS),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_PUSH_SOURCE_NEEDS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_PUSH_SOURCE_NEEDS,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_PUSH_SOURCE_NEEDS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2430,7 +2430,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_GET_FILE_DATA),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_GET_FILE_DATA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_GET_FILE_DATA,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_GET_FILE_DATA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2439,7 +2439,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_RDC_CLOSE),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_RDC_CLOSE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_RDC_CLOSE,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_RDC_CLOSE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2448,7 +2448,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_InitializeFileTransferAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_InitializeFileTransferAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_InitializeFileTransferAsync,
+-		(ndr_print_function_t) ndr_print_frstrans_InitializeFileTransferAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2457,7 +2457,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE),
+ 		(ndr_push_flags_fn_t) ndr_push_FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE,
+-		(ndr_print_function_t) ndr_print_FRSTRANS_OPNUM_0E_NOT_USED_ON_THE_WIRE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2466,7 +2466,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RawGetFileDataAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RawGetFileDataAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RawGetFileDataAsync,
+-		(ndr_print_function_t) ndr_print_frstrans_RawGetFileDataAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 1, frstrans_RawGetFileDataAsync_out_pipes },
+ 	},
+@@ -2475,7 +2475,7 @@ static const struct ndr_interface_call f
+ 		sizeof(struct frstrans_RdcGetFileDataAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_frstrans_RdcGetFileDataAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_frstrans_RdcGetFileDataAsync,
+-		(ndr_print_function_t) ndr_print_frstrans_RdcGetFileDataAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 1, frstrans_RdcGetFileDataAsync_out_pipes },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_initshutdown.c
++++ b/source3/librpc/gen_ndr/ndr_initshutdown.c
+@@ -277,7 +277,7 @@ static const struct ndr_interface_call i
+ 		sizeof(struct initshutdown_Init),
+ 		(ndr_push_flags_fn_t) ndr_push_initshutdown_Init,
+ 		(ndr_pull_flags_fn_t) ndr_pull_initshutdown_Init,
+-		(ndr_print_function_t) ndr_print_initshutdown_Init,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -286,7 +286,7 @@ static const struct ndr_interface_call i
+ 		sizeof(struct initshutdown_Abort),
+ 		(ndr_push_flags_fn_t) ndr_push_initshutdown_Abort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_initshutdown_Abort,
+-		(ndr_print_function_t) ndr_print_initshutdown_Abort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -295,7 +295,7 @@ static const struct ndr_interface_call i
+ 		sizeof(struct initshutdown_InitEx),
+ 		(ndr_push_flags_fn_t) ndr_push_initshutdown_InitEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_initshutdown_InitEx,
+-		(ndr_print_function_t) ndr_print_initshutdown_InitEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_keysvc.c
++++ b/source3/librpc/gen_ndr/ndr_keysvc.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct keysvc_Unknown0),
+ 		(ndr_push_flags_fn_t) ndr_push_keysvc_Unknown0,
+ 		(ndr_pull_flags_fn_t) ndr_pull_keysvc_Unknown0,
+-		(ndr_print_function_t) ndr_print_keysvc_Unknown0,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_krb5pac.c
++++ b/source3/librpc/gen_ndr/ndr_krb5pac.c
+@@ -1002,7 +1002,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_pac),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_pac,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_pac,
+-		(ndr_print_function_t) ndr_print_decode_pac,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1011,7 +1011,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_pac_raw),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_pac_raw,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_pac_raw,
+-		(ndr_print_function_t) ndr_print_decode_pac_raw,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1020,7 +1020,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_login_info),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_login_info,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_login_info,
+-		(ndr_print_function_t) ndr_print_decode_login_info,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1029,7 +1029,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_login_info_ctr),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_login_info_ctr,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_login_info_ctr,
+-		(ndr_print_function_t) ndr_print_decode_login_info_ctr,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -1038,7 +1038,7 @@ static const struct ndr_interface_call k
+ 		sizeof(struct decode_pac_validate),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_pac_validate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_pac_validate,
+-		(ndr_print_function_t) ndr_print_decode_pac_validate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_lsa.c
++++ b/source3/librpc/gen_ndr/ndr_lsa.c
+@@ -13565,7 +13565,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_Close),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_Close,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_Close,
+-		(ndr_print_function_t) ndr_print_lsa_Close,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13574,7 +13574,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_Delete),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_Delete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_Delete,
+-		(ndr_print_function_t) ndr_print_lsa_Delete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13583,7 +13583,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumPrivs),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumPrivs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumPrivs,
+-		(ndr_print_function_t) ndr_print_lsa_EnumPrivs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13592,7 +13592,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QuerySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QuerySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QuerySecurity,
+-		(ndr_print_function_t) ndr_print_lsa_QuerySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13601,7 +13601,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetSecObj),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetSecObj,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetSecObj,
+-		(ndr_print_function_t) ndr_print_lsa_SetSecObj,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13610,7 +13610,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_ChangePassword),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_ChangePassword,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_ChangePassword,
+-		(ndr_print_function_t) ndr_print_lsa_ChangePassword,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13619,7 +13619,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_OpenPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13628,7 +13628,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryInfoPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryInfoPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryInfoPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_QueryInfoPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13637,7 +13637,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetInfoPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetInfoPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetInfoPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_SetInfoPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13646,7 +13646,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_ClearAuditLog),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_ClearAuditLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_ClearAuditLog,
+-		(ndr_print_function_t) ndr_print_lsa_ClearAuditLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13655,7 +13655,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateAccount,
+-		(ndr_print_function_t) ndr_print_lsa_CreateAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13664,7 +13664,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumAccounts),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumAccounts,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumAccounts,
+-		(ndr_print_function_t) ndr_print_lsa_EnumAccounts,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13673,7 +13673,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_CreateTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13682,7 +13682,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumTrustDom),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumTrustDom,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumTrustDom,
+-		(ndr_print_function_t) ndr_print_lsa_EnumTrustDom,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13691,7 +13691,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13700,7 +13700,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupSids),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupSids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupSids,
+-		(ndr_print_function_t) ndr_print_lsa_LookupSids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13709,7 +13709,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateSecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateSecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateSecret,
+-		(ndr_print_function_t) ndr_print_lsa_CreateSecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13718,7 +13718,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenAccount,
+-		(ndr_print_function_t) ndr_print_lsa_OpenAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13727,7 +13727,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumPrivsAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumPrivsAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumPrivsAccount,
+-		(ndr_print_function_t) ndr_print_lsa_EnumPrivsAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13736,7 +13736,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_AddPrivilegesToAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_AddPrivilegesToAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_AddPrivilegesToAccount,
+-		(ndr_print_function_t) ndr_print_lsa_AddPrivilegesToAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13745,7 +13745,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_RemovePrivilegesFromAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_RemovePrivilegesFromAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_RemovePrivilegesFromAccount,
+-		(ndr_print_function_t) ndr_print_lsa_RemovePrivilegesFromAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13754,7 +13754,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_GetQuotasForAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_GetQuotasForAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_GetQuotasForAccount,
+-		(ndr_print_function_t) ndr_print_lsa_GetQuotasForAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13763,7 +13763,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetQuotasForAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetQuotasForAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetQuotasForAccount,
+-		(ndr_print_function_t) ndr_print_lsa_SetQuotasForAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13772,7 +13772,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_GetSystemAccessAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_GetSystemAccessAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_GetSystemAccessAccount,
+-		(ndr_print_function_t) ndr_print_lsa_GetSystemAccessAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13781,7 +13781,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetSystemAccessAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetSystemAccessAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetSystemAccessAccount,
+-		(ndr_print_function_t) ndr_print_lsa_SetSystemAccessAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13790,7 +13790,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_OpenTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13799,7 +13799,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryTrustedDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryTrustedDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryTrustedDomainInfo,
+-		(ndr_print_function_t) ndr_print_lsa_QueryTrustedDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13808,7 +13808,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetInformationTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetInformationTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetInformationTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_SetInformationTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13817,7 +13817,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenSecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenSecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenSecret,
+-		(ndr_print_function_t) ndr_print_lsa_OpenSecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13826,7 +13826,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetSecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetSecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetSecret,
+-		(ndr_print_function_t) ndr_print_lsa_SetSecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13835,7 +13835,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QuerySecret),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QuerySecret,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QuerySecret,
+-		(ndr_print_function_t) ndr_print_lsa_QuerySecret,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13844,7 +13844,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupPrivValue),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupPrivValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupPrivValue,
+-		(ndr_print_function_t) ndr_print_lsa_LookupPrivValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13853,7 +13853,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupPrivName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupPrivName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupPrivName,
+-		(ndr_print_function_t) ndr_print_lsa_LookupPrivName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13862,7 +13862,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupPrivDisplayName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupPrivDisplayName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupPrivDisplayName,
+-		(ndr_print_function_t) ndr_print_lsa_LookupPrivDisplayName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13871,7 +13871,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_DeleteObject),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_DeleteObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_DeleteObject,
+-		(ndr_print_function_t) ndr_print_lsa_DeleteObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13880,7 +13880,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumAccountsWithUserRight),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumAccountsWithUserRight,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumAccountsWithUserRight,
+-		(ndr_print_function_t) ndr_print_lsa_EnumAccountsWithUserRight,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13889,7 +13889,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumAccountRights),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumAccountRights,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumAccountRights,
+-		(ndr_print_function_t) ndr_print_lsa_EnumAccountRights,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13898,7 +13898,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_AddAccountRights),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_AddAccountRights,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_AddAccountRights,
+-		(ndr_print_function_t) ndr_print_lsa_AddAccountRights,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13907,7 +13907,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_RemoveAccountRights),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_RemoveAccountRights,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_RemoveAccountRights,
+-		(ndr_print_function_t) ndr_print_lsa_RemoveAccountRights,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13916,7 +13916,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryTrustedDomainInfoBySid),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryTrustedDomainInfoBySid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryTrustedDomainInfoBySid,
+-		(ndr_print_function_t) ndr_print_lsa_QueryTrustedDomainInfoBySid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13925,7 +13925,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetTrustedDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetTrustedDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetTrustedDomainInfo,
+-		(ndr_print_function_t) ndr_print_lsa_SetTrustedDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13934,7 +13934,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_DeleteTrustedDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_DeleteTrustedDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_DeleteTrustedDomain,
+-		(ndr_print_function_t) ndr_print_lsa_DeleteTrustedDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13943,7 +13943,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_StorePrivateData),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_StorePrivateData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_StorePrivateData,
+-		(ndr_print_function_t) ndr_print_lsa_StorePrivateData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13952,7 +13952,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_RetrievePrivateData),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_RetrievePrivateData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_RetrievePrivateData,
+-		(ndr_print_function_t) ndr_print_lsa_RetrievePrivateData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13961,7 +13961,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenPolicy2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenPolicy2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenPolicy2,
+-		(ndr_print_function_t) ndr_print_lsa_OpenPolicy2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13970,7 +13970,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_GetUserName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_GetUserName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_GetUserName,
+-		(ndr_print_function_t) ndr_print_lsa_GetUserName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13979,7 +13979,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryInfoPolicy2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryInfoPolicy2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryInfoPolicy2,
+-		(ndr_print_function_t) ndr_print_lsa_QueryInfoPolicy2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13988,7 +13988,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetInfoPolicy2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetInfoPolicy2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetInfoPolicy2,
+-		(ndr_print_function_t) ndr_print_lsa_SetInfoPolicy2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13997,7 +13997,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryTrustedDomainInfoByName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryTrustedDomainInfoByName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryTrustedDomainInfoByName,
+-		(ndr_print_function_t) ndr_print_lsa_QueryTrustedDomainInfoByName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14006,7 +14006,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetTrustedDomainInfoByName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetTrustedDomainInfoByName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetTrustedDomainInfoByName,
+-		(ndr_print_function_t) ndr_print_lsa_SetTrustedDomainInfoByName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14015,7 +14015,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_EnumTrustedDomainsEx),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_EnumTrustedDomainsEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_EnumTrustedDomainsEx,
+-		(ndr_print_function_t) ndr_print_lsa_EnumTrustedDomainsEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14024,7 +14024,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateTrustedDomainEx),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateTrustedDomainEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateTrustedDomainEx,
+-		(ndr_print_function_t) ndr_print_lsa_CreateTrustedDomainEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14033,7 +14033,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CloseTrustedDomainEx),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CloseTrustedDomainEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CloseTrustedDomainEx,
+-		(ndr_print_function_t) ndr_print_lsa_CloseTrustedDomainEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14042,7 +14042,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_QueryDomainInformationPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_QueryDomainInformationPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_QueryDomainInformationPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_QueryDomainInformationPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14051,7 +14051,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_SetDomainInformationPolicy),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_SetDomainInformationPolicy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_SetDomainInformationPolicy,
+-		(ndr_print_function_t) ndr_print_lsa_SetDomainInformationPolicy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14060,7 +14060,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_OpenTrustedDomainByName),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_OpenTrustedDomainByName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_OpenTrustedDomainByName,
+-		(ndr_print_function_t) ndr_print_lsa_OpenTrustedDomainByName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14069,7 +14069,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_TestCall),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_TestCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_TestCall,
+-		(ndr_print_function_t) ndr_print_lsa_TestCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14078,7 +14078,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupSids2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupSids2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupSids2,
+-		(ndr_print_function_t) ndr_print_lsa_LookupSids2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14087,7 +14087,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames2,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14096,7 +14096,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CreateTrustedDomainEx2),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CreateTrustedDomainEx2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CreateTrustedDomainEx2,
+-		(ndr_print_function_t) ndr_print_lsa_CreateTrustedDomainEx2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14105,7 +14105,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRWRITE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRWRITE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRWRITE,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRWRITE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14114,7 +14114,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRREAD),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRREAD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRREAD,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRREAD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14123,7 +14123,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRENUMERATE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRENUMERATE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRENUMERATE,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRENUMERATE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14132,7 +14132,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRWRITEDOMAINCREDENTIALS),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRWRITEDOMAINCREDENTIALS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRWRITEDOMAINCREDENTIALS,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRWRITEDOMAINCREDENTIALS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14141,7 +14141,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRREADDOMAINCREDENTIALS),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRREADDOMAINCREDENTIALS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRREADDOMAINCREDENTIALS,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRREADDOMAINCREDENTIALS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14150,7 +14150,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRDELETE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRDELETE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRDELETE,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRDELETE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14159,7 +14159,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRGETTARGETINFO),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRGETTARGETINFO,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRGETTARGETINFO,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRGETTARGETINFO,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14168,7 +14168,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRPROFILELOADED),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRPROFILELOADED,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRPROFILELOADED,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRPROFILELOADED,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14177,7 +14177,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames3),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames3,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14186,7 +14186,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRGETSESSIONTYPES),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRGETSESSIONTYPES,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRGETSESSIONTYPES,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRGETSESSIONTYPES,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14195,7 +14195,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARREGISTERAUDITEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARREGISTERAUDITEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARREGISTERAUDITEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARREGISTERAUDITEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14204,7 +14204,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARGENAUDITEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARGENAUDITEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARGENAUDITEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARGENAUDITEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14213,7 +14213,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARUNREGISTERAUDITEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARUNREGISTERAUDITEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARUNREGISTERAUDITEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARUNREGISTERAUDITEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14222,7 +14222,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_lsaRQueryForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_lsaRQueryForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_lsaRQueryForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_lsa_lsaRQueryForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14231,7 +14231,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_lsaRSetForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_lsaRSetForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_lsaRSetForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_lsa_lsaRSetForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14240,7 +14240,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_CREDRRENAME),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_CREDRRENAME,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_CREDRRENAME,
+-		(ndr_print_function_t) ndr_print_lsa_CREDRRENAME,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14249,7 +14249,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupSids3),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupSids3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupSids3,
+-		(ndr_print_function_t) ndr_print_lsa_LookupSids3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14258,7 +14258,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LookupNames4),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LookupNames4,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LookupNames4,
+-		(ndr_print_function_t) ndr_print_lsa_LookupNames4,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14267,7 +14267,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSAROPENPOLICYSCE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSAROPENPOLICYSCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSAROPENPOLICYSCE,
+-		(ndr_print_function_t) ndr_print_lsa_LSAROPENPOLICYSCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14276,7 +14276,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARADTREGISTERSECURITYEVENTSOURCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARADTREGISTERSECURITYEVENTSOURCE,
+-		(ndr_print_function_t) ndr_print_lsa_LSARADTREGISTERSECURITYEVENTSOURCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14285,7 +14285,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE,
+-		(ndr_print_function_t) ndr_print_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -14294,7 +14294,7 @@ static const struct ndr_interface_call l
+ 		sizeof(struct lsa_LSARADTREPORTSECURITYEVENT),
+ 		(ndr_push_flags_fn_t) ndr_push_lsa_LSARADTREPORTSECURITYEVENT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_lsa_LSARADTREPORTSECURITYEVENT,
+-		(ndr_print_function_t) ndr_print_lsa_LSARADTREPORTSECURITYEVENT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_mgmt.c
++++ b/source3/librpc/gen_ndr/ndr_mgmt.c
+@@ -515,7 +515,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_inq_if_ids),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_inq_if_ids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_inq_if_ids,
+-		(ndr_print_function_t) ndr_print_mgmt_inq_if_ids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -524,7 +524,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_inq_stats),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_inq_stats,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_inq_stats,
+-		(ndr_print_function_t) ndr_print_mgmt_inq_stats,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -533,7 +533,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_is_server_listening),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_is_server_listening,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_is_server_listening,
+-		(ndr_print_function_t) ndr_print_mgmt_is_server_listening,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -542,7 +542,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_stop_server_listening),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_stop_server_listening,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_stop_server_listening,
+-		(ndr_print_function_t) ndr_print_mgmt_stop_server_listening,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -551,7 +551,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct mgmt_inq_princ_name),
+ 		(ndr_push_flags_fn_t) ndr_push_mgmt_inq_princ_name,
+ 		(ndr_pull_flags_fn_t) ndr_pull_mgmt_inq_princ_name,
+-		(ndr_print_function_t) ndr_print_mgmt_inq_princ_name,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_msgsvc.c
++++ b/source3/librpc/gen_ndr/ndr_msgsvc.c
+@@ -165,7 +165,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameAdd,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -174,7 +174,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameEnum,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -183,7 +183,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameGetInfo,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -192,7 +192,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrMessageNameDel),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrMessageNameDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrMessageNameDel,
+-		(ndr_print_function_t) ndr_print_NetrMessageNameDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -276,7 +276,7 @@ static const struct ndr_interface_call m
+ 		sizeof(struct NetrSendMessage),
+ 		(ndr_push_flags_fn_t) ndr_push_NetrSendMessage,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NetrSendMessage,
+-		(ndr_print_function_t) ndr_print_NetrSendMessage,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_nbt.c
++++ b/source3/librpc/gen_ndr/ndr_nbt.c
+@@ -3671,7 +3671,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_nbt_netlogon_packet),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_nbt_netlogon_packet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_nbt_netlogon_packet,
+-		(ndr_print_function_t) ndr_print_decode_nbt_netlogon_packet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_netlogon.c
++++ b/source3/librpc/gen_ndr/ndr_netlogon.c
+@@ -17827,7 +17827,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonUasLogon),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonUasLogon,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonUasLogon,
+-		(ndr_print_function_t) ndr_print_netr_LogonUasLogon,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17836,7 +17836,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonUasLogoff),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonUasLogoff,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonUasLogoff,
+-		(ndr_print_function_t) ndr_print_netr_LogonUasLogoff,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17845,7 +17845,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogon),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogon,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogon,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogon,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17854,7 +17854,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogoff),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogoff,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogoff,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogoff,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17863,7 +17863,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerReqChallenge),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerReqChallenge,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerReqChallenge,
+-		(ndr_print_function_t) ndr_print_netr_ServerReqChallenge,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17872,7 +17872,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerAuthenticate),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerAuthenticate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerAuthenticate,
+-		(ndr_print_function_t) ndr_print_netr_ServerAuthenticate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17881,7 +17881,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerPasswordSet),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerPasswordSet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerPasswordSet,
+-		(ndr_print_function_t) ndr_print_netr_ServerPasswordSet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17890,7 +17890,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseDeltas),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseDeltas,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseDeltas,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseDeltas,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17899,7 +17899,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseSync),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseSync,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17908,7 +17908,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_AccountDeltas),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_AccountDeltas,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_AccountDeltas,
+-		(ndr_print_function_t) ndr_print_netr_AccountDeltas,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17917,7 +17917,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_AccountSync),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_AccountSync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_AccountSync,
+-		(ndr_print_function_t) ndr_print_netr_AccountSync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17926,7 +17926,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_GetDcName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_GetDcName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_GetDcName,
+-		(ndr_print_function_t) ndr_print_netr_GetDcName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17935,7 +17935,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonControl),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonControl,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonControl,
+-		(ndr_print_function_t) ndr_print_netr_LogonControl,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17944,7 +17944,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_GetAnyDCName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_GetAnyDCName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_GetAnyDCName,
+-		(ndr_print_function_t) ndr_print_netr_GetAnyDCName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17953,7 +17953,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonControl2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonControl2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonControl2,
+-		(ndr_print_function_t) ndr_print_netr_LogonControl2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17962,7 +17962,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerAuthenticate2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerAuthenticate2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerAuthenticate2,
+-		(ndr_print_function_t) ndr_print_netr_ServerAuthenticate2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17971,7 +17971,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseSync2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseSync2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseSync2,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseSync2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17980,7 +17980,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DatabaseRedo),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DatabaseRedo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DatabaseRedo,
+-		(ndr_print_function_t) ndr_print_netr_DatabaseRedo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17989,7 +17989,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonControl2Ex),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonControl2Ex,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonControl2Ex,
+-		(ndr_print_function_t) ndr_print_netr_LogonControl2Ex,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -17998,7 +17998,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NetrEnumerateTrustedDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NetrEnumerateTrustedDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NetrEnumerateTrustedDomains,
+-		(ndr_print_function_t) ndr_print_netr_NetrEnumerateTrustedDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18007,7 +18007,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetDCName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetDCName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetDCName,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetDCName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18016,7 +18016,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonGetCapabilities),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonGetCapabilities,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonGetCapabilities,
+-		(ndr_print_function_t) ndr_print_netr_LogonGetCapabilities,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18025,7 +18025,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONSETSERVICEBITS),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONSETSERVICEBITS,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONSETSERVICEBITS,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONSETSERVICEBITS,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18034,7 +18034,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonGetTrustRid),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonGetTrustRid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonGetTrustRid,
+-		(ndr_print_function_t) ndr_print_netr_LogonGetTrustRid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18043,7 +18043,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONCOMPUTESERVERDIGEST),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONCOMPUTESERVERDIGEST,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONCOMPUTESERVERDIGEST,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONCOMPUTESERVERDIGEST,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18052,7 +18052,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONCOMPUTECLIENTDIGEST),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONCOMPUTECLIENTDIGEST,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONCOMPUTECLIENTDIGEST,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONCOMPUTECLIENTDIGEST,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18061,7 +18061,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerAuthenticate3),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerAuthenticate3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerAuthenticate3,
+-		(ndr_print_function_t) ndr_print_netr_ServerAuthenticate3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18070,7 +18070,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetDCNameEx),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetDCNameEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetDCNameEx,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetDCNameEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18079,7 +18079,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetSiteName),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetSiteName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetSiteName,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetSiteName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18088,7 +18088,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonGetDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonGetDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonGetDomainInfo,
+-		(ndr_print_function_t) ndr_print_netr_LogonGetDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18097,7 +18097,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerPasswordSet2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerPasswordSet2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerPasswordSet2,
+-		(ndr_print_function_t) ndr_print_netr_ServerPasswordSet2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18106,7 +18106,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerPasswordGet),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerPasswordGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerPasswordGet,
+-		(ndr_print_function_t) ndr_print_netr_ServerPasswordGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18115,7 +18115,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONSENDTOSAM),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONSENDTOSAM,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONSENDTOSAM,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONSENDTOSAM,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18124,7 +18124,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRAddressToSitenamesW),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRAddressToSitenamesW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRAddressToSitenamesW,
+-		(ndr_print_function_t) ndr_print_netr_DsRAddressToSitenamesW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18133,7 +18133,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetDCNameEx2),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetDCNameEx2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetDCNameEx2,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetDCNameEx2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18142,7 +18142,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
+-		(ndr_print_function_t) ndr_print_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18151,7 +18151,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_NetrEnumerateTrustedDomainsEx),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_NetrEnumerateTrustedDomainsEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_NetrEnumerateTrustedDomainsEx,
+-		(ndr_print_function_t) ndr_print_netr_NetrEnumerateTrustedDomainsEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18160,7 +18160,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRAddressToSitenamesExW),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRAddressToSitenamesExW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRAddressToSitenamesExW,
+-		(ndr_print_function_t) ndr_print_netr_DsRAddressToSitenamesExW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18169,7 +18169,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrGetDcSiteCoverageW),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrGetDcSiteCoverageW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrGetDcSiteCoverageW,
+-		(ndr_print_function_t) ndr_print_netr_DsrGetDcSiteCoverageW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18178,7 +18178,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogonEx),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogonEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogonEx,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogonEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18187,7 +18187,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrEnumerateDomainTrusts),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrEnumerateDomainTrusts,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrEnumerateDomainTrusts,
+-		(ndr_print_function_t) ndr_print_netr_DsrEnumerateDomainTrusts,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18196,7 +18196,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrDeregisterDNSHostRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrDeregisterDNSHostRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrDeregisterDNSHostRecords,
+-		(ndr_print_function_t) ndr_print_netr_DsrDeregisterDNSHostRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18205,7 +18205,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerTrustPasswordsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerTrustPasswordsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerTrustPasswordsGet,
+-		(ndr_print_function_t) ndr_print_netr_ServerTrustPasswordsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18214,7 +18214,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsRGetForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsRGetForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsRGetForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_netr_DsRGetForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18223,7 +18223,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_GetForestTrustInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_GetForestTrustInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_GetForestTrustInformation,
+-		(ndr_print_function_t) ndr_print_netr_GetForestTrustInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18232,7 +18232,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_LogonSamLogonWithFlags),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_LogonSamLogonWithFlags,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_LogonSamLogonWithFlags,
+-		(ndr_print_function_t) ndr_print_netr_LogonSamLogonWithFlags,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18241,7 +18241,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_ServerGetTrustInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_ServerGetTrustInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_ServerGetTrustInfo,
+-		(ndr_print_function_t) ndr_print_netr_ServerGetTrustInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18250,7 +18250,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_Unused47),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_Unused47,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_Unused47,
+-		(ndr_print_function_t) ndr_print_netr_Unused47,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -18259,7 +18259,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct netr_DsrUpdateReadOnlyServerDnsRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_netr_DsrUpdateReadOnlyServerDnsRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_netr_DsrUpdateReadOnlyServerDnsRecords,
+-		(ndr_print_function_t) ndr_print_netr_DsrUpdateReadOnlyServerDnsRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_ntlmssp.c
++++ b/source3/librpc/gen_ndr/ndr_ntlmssp.c
+@@ -2408,7 +2408,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_NEGOTIATE_MESSAGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_NEGOTIATE_MESSAGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_NEGOTIATE_MESSAGE,
+-		(ndr_print_function_t) ndr_print_decode_NEGOTIATE_MESSAGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2417,7 +2417,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_CHALLENGE_MESSAGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_CHALLENGE_MESSAGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_CHALLENGE_MESSAGE,
+-		(ndr_print_function_t) ndr_print_decode_CHALLENGE_MESSAGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2426,7 +2426,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_AUTHENTICATE_MESSAGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_AUTHENTICATE_MESSAGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_AUTHENTICATE_MESSAGE,
+-		(ndr_print_function_t) ndr_print_decode_AUTHENTICATE_MESSAGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2435,7 +2435,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_NTLMv2_CLIENT_CHALLENGE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_NTLMv2_CLIENT_CHALLENGE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_NTLMv2_CLIENT_CHALLENGE,
+-		(ndr_print_function_t) ndr_print_decode_NTLMv2_CLIENT_CHALLENGE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2444,7 +2444,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_NTLMv2_RESPONSE),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_NTLMv2_RESPONSE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_NTLMv2_RESPONSE,
+-		(ndr_print_function_t) ndr_print_decode_NTLMv2_RESPONSE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_ntprinting.c
++++ b/source3/librpc/gen_ndr/ndr_ntprinting.c
+@@ -914,7 +914,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_ntprinting_form),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_form,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_form,
+-		(ndr_print_function_t) ndr_print_decode_ntprinting_form,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -923,7 +923,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_ntprinting_driver),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_driver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_driver,
+-		(ndr_print_function_t) ndr_print_decode_ntprinting_driver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -932,7 +932,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct decode_ntprinting_printer),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_ntprinting_printer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_ntprinting_printer,
+-		(ndr_print_function_t) ndr_print_decode_ntprinting_printer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_ntsvcs.c
++++ b/source3/librpc/gen_ndr/ndr_ntsvcs.c
+@@ -3466,7 +3466,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_Disconnect),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_Disconnect,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_Disconnect,
+-		(ndr_print_function_t) ndr_print_PNP_Disconnect,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3475,7 +3475,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_Connect),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_Connect,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_Connect,
+-		(ndr_print_function_t) ndr_print_PNP_Connect,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3484,7 +3484,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetVersion),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetVersion,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetVersion,
+-		(ndr_print_function_t) ndr_print_PNP_GetVersion,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3493,7 +3493,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetGlobalState),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetGlobalState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetGlobalState,
+-		(ndr_print_function_t) ndr_print_PNP_GetGlobalState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3502,7 +3502,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_InitDetection),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_InitDetection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_InitDetection,
+-		(ndr_print_function_t) ndr_print_PNP_InitDetection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3511,7 +3511,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_ReportLogOn),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_ReportLogOn,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_ReportLogOn,
+-		(ndr_print_function_t) ndr_print_PNP_ReportLogOn,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3520,7 +3520,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_ValidateDeviceInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_ValidateDeviceInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_ValidateDeviceInstance,
+-		(ndr_print_function_t) ndr_print_PNP_ValidateDeviceInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3529,7 +3529,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetRootDeviceInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetRootDeviceInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetRootDeviceInstance,
+-		(ndr_print_function_t) ndr_print_PNP_GetRootDeviceInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3538,7 +3538,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetRelatedDeviceInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetRelatedDeviceInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetRelatedDeviceInstance,
+-		(ndr_print_function_t) ndr_print_PNP_GetRelatedDeviceInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3547,7 +3547,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_EnumerateSubKeys),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_EnumerateSubKeys,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_EnumerateSubKeys,
+-		(ndr_print_function_t) ndr_print_PNP_EnumerateSubKeys,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3556,7 +3556,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceList),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceList,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3565,7 +3565,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceListSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceListSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceListSize,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceListSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3574,7 +3574,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDepth),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDepth,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDepth,
+-		(ndr_print_function_t) ndr_print_PNP_GetDepth,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3583,7 +3583,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3592,7 +3592,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetDeviceRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetDeviceRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetDeviceRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_SetDeviceRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3601,7 +3601,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassInstance,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3610,7 +3610,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_CreateKey),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_CreateKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_CreateKey,
+-		(ndr_print_function_t) ndr_print_PNP_CreateKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3619,7 +3619,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DeleteRegistryKey),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DeleteRegistryKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DeleteRegistryKey,
+-		(ndr_print_function_t) ndr_print_PNP_DeleteRegistryKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3628,7 +3628,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassCount),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassCount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassCount,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassCount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3637,7 +3637,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassName),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassName,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3646,7 +3646,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DeleteClassKey),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DeleteClassKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DeleteClassKey,
+-		(ndr_print_function_t) ndr_print_PNP_DeleteClassKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3655,7 +3655,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetInterfaceDeviceAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetInterfaceDeviceAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetInterfaceDeviceAlias,
+-		(ndr_print_function_t) ndr_print_PNP_GetInterfaceDeviceAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3664,7 +3664,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetInterfaceDeviceList),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetInterfaceDeviceList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetInterfaceDeviceList,
+-		(ndr_print_function_t) ndr_print_PNP_GetInterfaceDeviceList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3673,7 +3673,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetInterfaceDeviceListSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetInterfaceDeviceListSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetInterfaceDeviceListSize,
+-		(ndr_print_function_t) ndr_print_PNP_GetInterfaceDeviceListSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3682,7 +3682,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RegisterDeviceClassAssociation),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RegisterDeviceClassAssociation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RegisterDeviceClassAssociation,
+-		(ndr_print_function_t) ndr_print_PNP_RegisterDeviceClassAssociation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3691,7 +3691,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_UnregisterDeviceClassAssociation),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_UnregisterDeviceClassAssociation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_UnregisterDeviceClassAssociation,
+-		(ndr_print_function_t) ndr_print_PNP_UnregisterDeviceClassAssociation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3700,7 +3700,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetClassRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetClassRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetClassRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_GetClassRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3709,7 +3709,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetClassRegProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetClassRegProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetClassRegProp,
+-		(ndr_print_function_t) ndr_print_PNP_SetClassRegProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3718,7 +3718,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_CreateDevInst),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_CreateDevInst,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_CreateDevInst,
+-		(ndr_print_function_t) ndr_print_PNP_CreateDevInst,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3727,7 +3727,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DeviceInstanceAction),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DeviceInstanceAction,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DeviceInstanceAction,
+-		(ndr_print_function_t) ndr_print_PNP_DeviceInstanceAction,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3736,7 +3736,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetDeviceStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetDeviceStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetDeviceStatus,
+-		(ndr_print_function_t) ndr_print_PNP_GetDeviceStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3745,7 +3745,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetDeviceProblem),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetDeviceProblem,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetDeviceProblem,
+-		(ndr_print_function_t) ndr_print_PNP_SetDeviceProblem,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3754,7 +3754,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DisableDevInst),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DisableDevInst,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DisableDevInst,
+-		(ndr_print_function_t) ndr_print_PNP_DisableDevInst,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3763,7 +3763,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_UninstallDevInst),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_UninstallDevInst,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_UninstallDevInst,
+-		(ndr_print_function_t) ndr_print_PNP_UninstallDevInst,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3772,7 +3772,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_AddID),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_AddID,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_AddID,
+-		(ndr_print_function_t) ndr_print_PNP_AddID,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3781,7 +3781,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RegisterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RegisterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RegisterDriver,
+-		(ndr_print_function_t) ndr_print_PNP_RegisterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3790,7 +3790,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryRemove),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryRemove,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryRemove,
+-		(ndr_print_function_t) ndr_print_PNP_QueryRemove,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3799,7 +3799,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RequestDeviceEject),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RequestDeviceEject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RequestDeviceEject,
+-		(ndr_print_function_t) ndr_print_PNP_RequestDeviceEject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3808,7 +3808,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_IsDockStationPresent),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_IsDockStationPresent,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_IsDockStationPresent,
+-		(ndr_print_function_t) ndr_print_PNP_IsDockStationPresent,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3817,7 +3817,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RequestEjectPC),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RequestEjectPC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RequestEjectPC,
+-		(ndr_print_function_t) ndr_print_PNP_RequestEjectPC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3826,7 +3826,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_HwProfFlags),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_HwProfFlags,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_HwProfFlags,
+-		(ndr_print_function_t) ndr_print_PNP_HwProfFlags,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3835,7 +3835,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetHwProfInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetHwProfInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetHwProfInfo,
+-		(ndr_print_function_t) ndr_print_PNP_GetHwProfInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3844,7 +3844,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_AddEmptyLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_AddEmptyLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_AddEmptyLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_AddEmptyLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3853,7 +3853,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_FreeLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_FreeLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_FreeLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_FreeLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3862,7 +3862,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetFirstLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetFirstLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetFirstLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_GetFirstLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3871,7 +3871,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetNextLogConf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetNextLogConf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetNextLogConf,
+-		(ndr_print_function_t) ndr_print_PNP_GetNextLogConf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3880,7 +3880,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetLogConfPriority),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetLogConfPriority,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetLogConfPriority,
+-		(ndr_print_function_t) ndr_print_PNP_GetLogConfPriority,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3889,7 +3889,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_AddResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_AddResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_AddResDes,
+-		(ndr_print_function_t) ndr_print_PNP_AddResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3898,7 +3898,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_FreeResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_FreeResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_FreeResDes,
+-		(ndr_print_function_t) ndr_print_PNP_FreeResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3907,7 +3907,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetNextResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetNextResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetNextResDes,
+-		(ndr_print_function_t) ndr_print_PNP_GetNextResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3916,7 +3916,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetResDesData),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetResDesData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetResDesData,
+-		(ndr_print_function_t) ndr_print_PNP_GetResDesData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3925,7 +3925,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetResDesDataSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetResDesDataSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetResDesDataSize,
+-		(ndr_print_function_t) ndr_print_PNP_GetResDesDataSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3934,7 +3934,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_ModifyResDes),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_ModifyResDes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_ModifyResDes,
+-		(ndr_print_function_t) ndr_print_PNP_ModifyResDes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3943,7 +3943,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_DetectResourceLimit),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_DetectResourceLimit,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_DetectResourceLimit,
+-		(ndr_print_function_t) ndr_print_PNP_DetectResourceLimit,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3952,7 +3952,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryResConfList),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryResConfList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryResConfList,
+-		(ndr_print_function_t) ndr_print_PNP_QueryResConfList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3961,7 +3961,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_SetHwProf),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_SetHwProf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_SetHwProf,
+-		(ndr_print_function_t) ndr_print_PNP_SetHwProf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3970,7 +3970,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryArbitratorFreeData),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryArbitratorFreeData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryArbitratorFreeData,
+-		(ndr_print_function_t) ndr_print_PNP_QueryArbitratorFreeData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3979,7 +3979,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_QueryArbitratorFreeSize),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_QueryArbitratorFreeSize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_QueryArbitratorFreeSize,
+-		(ndr_print_function_t) ndr_print_PNP_QueryArbitratorFreeSize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3988,7 +3988,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RunDetection),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RunDetection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RunDetection,
+-		(ndr_print_function_t) ndr_print_PNP_RunDetection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3997,7 +3997,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_RegisterNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_RegisterNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_RegisterNotification,
+-		(ndr_print_function_t) ndr_print_PNP_RegisterNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4006,7 +4006,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_UnregisterNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_UnregisterNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_UnregisterNotification,
+-		(ndr_print_function_t) ndr_print_PNP_UnregisterNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4015,7 +4015,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetCustomDevProp),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetCustomDevProp,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetCustomDevProp,
+-		(ndr_print_function_t) ndr_print_PNP_GetCustomDevProp,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4024,7 +4024,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetVersionInternal),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetVersionInternal,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetVersionInternal,
+-		(ndr_print_function_t) ndr_print_PNP_GetVersionInternal,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4033,7 +4033,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetBlockedDriverInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetBlockedDriverInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetBlockedDriverInfo,
+-		(ndr_print_function_t) ndr_print_PNP_GetBlockedDriverInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4042,7 +4042,7 @@ static const struct ndr_interface_call n
+ 		sizeof(struct PNP_GetServerSideDeviceInstallFlags),
+ 		(ndr_push_flags_fn_t) ndr_push_PNP_GetServerSideDeviceInstallFlags,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PNP_GetServerSideDeviceInstallFlags,
+-		(ndr_print_function_t) ndr_print_PNP_GetServerSideDeviceInstallFlags,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_oxidresolver.c
++++ b/source3/librpc/gen_ndr/ndr_oxidresolver.c
+@@ -761,7 +761,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ResolveOxid),
+ 		(ndr_push_flags_fn_t) ndr_push_ResolveOxid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ResolveOxid,
+-		(ndr_print_function_t) ndr_print_ResolveOxid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -770,7 +770,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct SimplePing),
+ 		(ndr_push_flags_fn_t) ndr_push_SimplePing,
+ 		(ndr_pull_flags_fn_t) ndr_pull_SimplePing,
+-		(ndr_print_function_t) ndr_print_SimplePing,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -779,7 +779,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ComplexPing),
+ 		(ndr_push_flags_fn_t) ndr_push_ComplexPing,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ComplexPing,
+-		(ndr_print_function_t) ndr_print_ComplexPing,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -788,7 +788,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ServerAlive),
+ 		(ndr_push_flags_fn_t) ndr_push_ServerAlive,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ServerAlive,
+-		(ndr_print_function_t) ndr_print_ServerAlive,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -797,7 +797,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ResolveOxid2),
+ 		(ndr_push_flags_fn_t) ndr_push_ResolveOxid2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ResolveOxid2,
+-		(ndr_print_function_t) ndr_print_ResolveOxid2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -806,7 +806,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ServerAlive2),
+ 		(ndr_push_flags_fn_t) ndr_push_ServerAlive2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ServerAlive2,
+-		(ndr_print_function_t) ndr_print_ServerAlive2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_policyagent.c
++++ b/source3/librpc/gen_ndr/ndr_policyagent.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call p
+ 		sizeof(struct policyagent_Dummy),
+ 		(ndr_push_flags_fn_t) ndr_push_policyagent_Dummy,
+ 		(ndr_pull_flags_fn_t) ndr_pull_policyagent_Dummy,
+-		(ndr_print_function_t) ndr_print_policyagent_Dummy,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_preg.c
++++ b/source3/librpc/gen_ndr/ndr_preg.c
+@@ -204,7 +204,7 @@ static const struct ndr_interface_call p
+ 		sizeof(struct decode_preg_file),
+ 		(ndr_push_flags_fn_t) ndr_push_decode_preg_file,
+ 		(ndr_pull_flags_fn_t) ndr_pull_decode_preg_file,
+-		(ndr_print_function_t) ndr_print_decode_preg_file,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_remact.c
++++ b/source3/librpc/gen_ndr/ndr_remact.c
+@@ -373,7 +373,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RemoteActivation),
+ 		(ndr_push_flags_fn_t) ndr_push_RemoteActivation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RemoteActivation,
+-		(ndr_print_function_t) ndr_print_RemoteActivation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_rot.c
++++ b/source3/librpc/gen_ndr/ndr_rot.c
+@@ -489,7 +489,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_add),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_add,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_add,
+-		(ndr_print_function_t) ndr_print_rot_add,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -498,7 +498,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_remove),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_remove,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_remove,
+-		(ndr_print_function_t) ndr_print_rot_remove,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -507,7 +507,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_is_listed),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_is_listed,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_is_listed,
+-		(ndr_print_function_t) ndr_print_rot_is_listed,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -516,7 +516,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_get_interface_pointer),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_get_interface_pointer,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_get_interface_pointer,
+-		(ndr_print_function_t) ndr_print_rot_get_interface_pointer,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -525,7 +525,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_set_modification_time),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_set_modification_time,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_set_modification_time,
+-		(ndr_print_function_t) ndr_print_rot_set_modification_time,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -534,7 +534,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_get_modification_time),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_get_modification_time,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_get_modification_time,
+-		(ndr_print_function_t) ndr_print_rot_get_modification_time,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -543,7 +543,7 @@ static const struct ndr_interface_call r
+ 		sizeof(struct rot_enum),
+ 		(ndr_push_flags_fn_t) ndr_push_rot_enum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_rot_enum,
+-		(ndr_print_function_t) ndr_print_rot_enum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_samr.c
++++ b/source3/librpc/gen_ndr/ndr_samr.c
+@@ -12674,7 +12674,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect,
+-		(ndr_print_function_t) ndr_print_samr_Connect,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12683,7 +12683,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Close),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Close,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Close,
+-		(ndr_print_function_t) ndr_print_samr_Close,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12692,7 +12692,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetSecurity,
+-		(ndr_print_function_t) ndr_print_samr_SetSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12701,7 +12701,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QuerySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QuerySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QuerySecurity,
+-		(ndr_print_function_t) ndr_print_samr_QuerySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12710,7 +12710,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Shutdown),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Shutdown,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Shutdown,
+-		(ndr_print_function_t) ndr_print_samr_Shutdown,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12719,7 +12719,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_LookupDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_LookupDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_LookupDomain,
+-		(ndr_print_function_t) ndr_print_samr_LookupDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12728,7 +12728,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomains),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomains,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomains,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomains,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12737,7 +12737,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenDomain,
+-		(ndr_print_function_t) ndr_print_samr_OpenDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12746,7 +12746,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDomainInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12755,7 +12755,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetDomainInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetDomainInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetDomainInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetDomainInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12764,7 +12764,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateDomainGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateDomainGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateDomainGroup,
+-		(ndr_print_function_t) ndr_print_samr_CreateDomainGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12773,7 +12773,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomainGroups),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomainGroups,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomainGroups,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomainGroups,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12782,7 +12782,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateUser,
+-		(ndr_print_function_t) ndr_print_samr_CreateUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12791,7 +12791,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomainUsers),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomainUsers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomainUsers,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomainUsers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12800,7 +12800,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateDomAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateDomAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateDomAlias,
+-		(ndr_print_function_t) ndr_print_samr_CreateDomAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12809,7 +12809,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_EnumDomainAliases),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_EnumDomainAliases,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_EnumDomainAliases,
+-		(ndr_print_function_t) ndr_print_samr_EnumDomainAliases,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12818,7 +12818,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetAliasMembership),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetAliasMembership,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetAliasMembership,
+-		(ndr_print_function_t) ndr_print_samr_GetAliasMembership,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12827,7 +12827,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_LookupNames),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_LookupNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_LookupNames,
+-		(ndr_print_function_t) ndr_print_samr_LookupNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12836,7 +12836,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_LookupRids),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_LookupRids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_LookupRids,
+-		(ndr_print_function_t) ndr_print_samr_LookupRids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12845,7 +12845,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenGroup,
+-		(ndr_print_function_t) ndr_print_samr_OpenGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12854,7 +12854,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryGroupInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryGroupInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryGroupInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryGroupInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12863,7 +12863,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetGroupInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetGroupInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetGroupInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetGroupInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12872,7 +12872,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_AddGroupMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_AddGroupMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_AddGroupMember,
+-		(ndr_print_function_t) ndr_print_samr_AddGroupMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12881,7 +12881,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteDomainGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteDomainGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteDomainGroup,
+-		(ndr_print_function_t) ndr_print_samr_DeleteDomainGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12890,7 +12890,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteGroupMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteGroupMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteGroupMember,
+-		(ndr_print_function_t) ndr_print_samr_DeleteGroupMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12899,7 +12899,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryGroupMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryGroupMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryGroupMember,
+-		(ndr_print_function_t) ndr_print_samr_QueryGroupMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12908,7 +12908,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetMemberAttributesOfGroup),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetMemberAttributesOfGroup,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetMemberAttributesOfGroup,
+-		(ndr_print_function_t) ndr_print_samr_SetMemberAttributesOfGroup,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12917,7 +12917,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenAlias,
+-		(ndr_print_function_t) ndr_print_samr_OpenAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12926,7 +12926,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryAliasInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryAliasInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryAliasInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryAliasInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12935,7 +12935,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetAliasInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetAliasInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetAliasInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetAliasInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12944,7 +12944,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteDomAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteDomAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteDomAlias,
+-		(ndr_print_function_t) ndr_print_samr_DeleteDomAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12953,7 +12953,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_AddAliasMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_AddAliasMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_AddAliasMember,
+-		(ndr_print_function_t) ndr_print_samr_AddAliasMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12962,7 +12962,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteAliasMember),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteAliasMember,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteAliasMember,
+-		(ndr_print_function_t) ndr_print_samr_DeleteAliasMember,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12971,7 +12971,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetMembersInAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetMembersInAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetMembersInAlias,
+-		(ndr_print_function_t) ndr_print_samr_GetMembersInAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12980,7 +12980,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OpenUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OpenUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OpenUser,
+-		(ndr_print_function_t) ndr_print_samr_OpenUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12989,7 +12989,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_DeleteUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_DeleteUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_DeleteUser,
+-		(ndr_print_function_t) ndr_print_samr_DeleteUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -12998,7 +12998,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryUserInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryUserInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryUserInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryUserInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13007,7 +13007,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetUserInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetUserInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetUserInfo,
+-		(ndr_print_function_t) ndr_print_samr_SetUserInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13016,7 +13016,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ChangePasswordUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ChangePasswordUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ChangePasswordUser,
+-		(ndr_print_function_t) ndr_print_samr_ChangePasswordUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13025,7 +13025,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetGroupsForUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetGroupsForUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetGroupsForUser,
+-		(ndr_print_function_t) ndr_print_samr_GetGroupsForUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13034,7 +13034,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDisplayInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDisplayInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDisplayInfo,
+-		(ndr_print_function_t) ndr_print_samr_QueryDisplayInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13043,7 +13043,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetDisplayEnumerationIndex),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetDisplayEnumerationIndex,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetDisplayEnumerationIndex,
+-		(ndr_print_function_t) ndr_print_samr_GetDisplayEnumerationIndex,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13052,7 +13052,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_TestPrivateFunctionsDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_TestPrivateFunctionsDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_TestPrivateFunctionsDomain,
+-		(ndr_print_function_t) ndr_print_samr_TestPrivateFunctionsDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13061,7 +13061,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_TestPrivateFunctionsUser),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_TestPrivateFunctionsUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_TestPrivateFunctionsUser,
+-		(ndr_print_function_t) ndr_print_samr_TestPrivateFunctionsUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13070,7 +13070,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetUserPwInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetUserPwInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetUserPwInfo,
+-		(ndr_print_function_t) ndr_print_samr_GetUserPwInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13079,7 +13079,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_RemoveMemberFromForeignDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_RemoveMemberFromForeignDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_RemoveMemberFromForeignDomain,
+-		(ndr_print_function_t) ndr_print_samr_RemoveMemberFromForeignDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13088,7 +13088,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDomainInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDomainInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDomainInfo2,
+-		(ndr_print_function_t) ndr_print_samr_QueryDomainInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13097,7 +13097,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryUserInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryUserInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryUserInfo2,
+-		(ndr_print_function_t) ndr_print_samr_QueryUserInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13106,7 +13106,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDisplayInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDisplayInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDisplayInfo2,
+-		(ndr_print_function_t) ndr_print_samr_QueryDisplayInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13115,7 +13115,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetDisplayEnumerationIndex2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetDisplayEnumerationIndex2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetDisplayEnumerationIndex2,
+-		(ndr_print_function_t) ndr_print_samr_GetDisplayEnumerationIndex2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13124,7 +13124,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_CreateUser2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_CreateUser2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_CreateUser2,
+-		(ndr_print_function_t) ndr_print_samr_CreateUser2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13133,7 +13133,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_QueryDisplayInfo3),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_QueryDisplayInfo3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_QueryDisplayInfo3,
+-		(ndr_print_function_t) ndr_print_samr_QueryDisplayInfo3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13142,7 +13142,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_AddMultipleMembersToAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_AddMultipleMembersToAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_AddMultipleMembersToAlias,
+-		(ndr_print_function_t) ndr_print_samr_AddMultipleMembersToAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13151,7 +13151,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_RemoveMultipleMembersFromAlias),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_RemoveMultipleMembersFromAlias,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_RemoveMultipleMembersFromAlias,
+-		(ndr_print_function_t) ndr_print_samr_RemoveMultipleMembersFromAlias,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13160,7 +13160,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_OemChangePasswordUser2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_OemChangePasswordUser2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_OemChangePasswordUser2,
+-		(ndr_print_function_t) ndr_print_samr_OemChangePasswordUser2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13169,7 +13169,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ChangePasswordUser2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ChangePasswordUser2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ChangePasswordUser2,
+-		(ndr_print_function_t) ndr_print_samr_ChangePasswordUser2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13178,7 +13178,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetDomPwInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetDomPwInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetDomPwInfo,
+-		(ndr_print_function_t) ndr_print_samr_GetDomPwInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13187,7 +13187,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect2,
+-		(ndr_print_function_t) ndr_print_samr_Connect2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13196,7 +13196,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetUserInfo2),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetUserInfo2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetUserInfo2,
+-		(ndr_print_function_t) ndr_print_samr_SetUserInfo2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13205,7 +13205,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetBootKeyInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetBootKeyInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetBootKeyInformation,
+-		(ndr_print_function_t) ndr_print_samr_SetBootKeyInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13214,7 +13214,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_GetBootKeyInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_GetBootKeyInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_GetBootKeyInformation,
+-		(ndr_print_function_t) ndr_print_samr_GetBootKeyInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13223,7 +13223,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect3),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect3,
+-		(ndr_print_function_t) ndr_print_samr_Connect3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13232,7 +13232,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect4),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect4,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect4,
+-		(ndr_print_function_t) ndr_print_samr_Connect4,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13241,7 +13241,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ChangePasswordUser3),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ChangePasswordUser3,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ChangePasswordUser3,
+-		(ndr_print_function_t) ndr_print_samr_ChangePasswordUser3,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13250,7 +13250,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_Connect5),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_Connect5,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_Connect5,
+-		(ndr_print_function_t) ndr_print_samr_Connect5,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13259,7 +13259,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_RidToSid),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_RidToSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_RidToSid,
+-		(ndr_print_function_t) ndr_print_samr_RidToSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13268,7 +13268,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_SetDsrmPassword),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_SetDsrmPassword,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_SetDsrmPassword,
+-		(ndr_print_function_t) ndr_print_samr_SetDsrmPassword,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -13277,7 +13277,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct samr_ValidatePassword),
+ 		(ndr_push_flags_fn_t) ndr_push_samr_ValidatePassword,
+ 		(ndr_pull_flags_fn_t) ndr_pull_samr_ValidatePassword,
+-		(ndr_print_function_t) ndr_print_samr_ValidatePassword,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_scerpc.c
++++ b/source3/librpc/gen_ndr/ndr_scerpc.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct scerpc_Unknown0),
+ 		(ndr_push_flags_fn_t) ndr_push_scerpc_Unknown0,
+ 		(ndr_pull_flags_fn_t) ndr_pull_scerpc_Unknown0,
+-		(ndr_print_function_t) ndr_print_scerpc_Unknown0,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_spoolss.c
++++ b/source3/librpc/gen_ndr/ndr_spoolss.c
+@@ -32661,7 +32661,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinters),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinters,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinters,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinters,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32670,7 +32670,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_OpenPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_OpenPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_OpenPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_OpenPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32679,7 +32679,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetJob,
+-		(ndr_print_function_t) ndr_print_spoolss_SetJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32688,7 +32688,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetJob,
+-		(ndr_print_function_t) ndr_print_spoolss_GetJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32697,7 +32697,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumJobs),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumJobs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumJobs,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumJobs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32706,7 +32706,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32715,7 +32715,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32724,7 +32724,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32733,7 +32733,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32742,7 +32742,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterDriver,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32751,7 +32751,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterDrivers),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterDrivers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterDrivers,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterDrivers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32760,7 +32760,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriver,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32769,7 +32769,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriverDirectory),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriverDirectory,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriverDirectory,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriverDirectory,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32778,7 +32778,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterDriver),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterDriver,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterDriver,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterDriver,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32787,7 +32787,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrintProcessor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrintProcessor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrintProcessor,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrintProcessor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32796,7 +32796,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrintProcessors),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrintProcessors,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrintProcessors,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrintProcessors,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32805,7 +32805,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrintProcessorDirectory),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrintProcessorDirectory,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrintProcessorDirectory,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrintProcessorDirectory,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32814,7 +32814,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_StartDocPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_StartDocPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_StartDocPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_StartDocPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32823,7 +32823,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_StartPagePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_StartPagePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_StartPagePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_StartPagePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32832,7 +32832,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_WritePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_WritePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_WritePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_WritePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32841,7 +32841,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EndPagePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EndPagePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EndPagePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_EndPagePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32850,7 +32850,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AbortPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AbortPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AbortPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_AbortPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32859,7 +32859,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ReadPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ReadPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ReadPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ReadPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32868,7 +32868,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EndDocPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EndDocPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EndDocPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_EndDocPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32877,7 +32877,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddJob,
+-		(ndr_print_function_t) ndr_print_spoolss_AddJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32886,7 +32886,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ScheduleJob),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ScheduleJob,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ScheduleJob,
+-		(ndr_print_function_t) ndr_print_spoolss_ScheduleJob,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32895,7 +32895,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32904,7 +32904,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32913,7 +32913,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_WaitForPrinterChange),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_WaitForPrinterChange,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_WaitForPrinterChange,
+-		(ndr_print_function_t) ndr_print_spoolss_WaitForPrinterChange,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32922,7 +32922,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ClosePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ClosePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ClosePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ClosePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32931,7 +32931,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddForm,
+-		(ndr_print_function_t) ndr_print_spoolss_AddForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32940,7 +32940,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeleteForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeleteForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeleteForm,
+-		(ndr_print_function_t) ndr_print_spoolss_DeleteForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32949,7 +32949,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetForm,
+-		(ndr_print_function_t) ndr_print_spoolss_GetForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32958,7 +32958,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetForm),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetForm,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetForm,
+-		(ndr_print_function_t) ndr_print_spoolss_SetForm,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32967,7 +32967,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumForms),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumForms,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumForms,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumForms,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32976,7 +32976,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPorts),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPorts,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPorts,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPorts,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32985,7 +32985,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumMonitors),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumMonitors,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumMonitors,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumMonitors,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -32994,7 +32994,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPort,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33003,7 +33003,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ConfigurePort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ConfigurePort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ConfigurePort,
+-		(ndr_print_function_t) ndr_print_spoolss_ConfigurePort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33012,7 +33012,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePort,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33021,7 +33021,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_CreatePrinterIC),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_CreatePrinterIC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_CreatePrinterIC,
+-		(ndr_print_function_t) ndr_print_spoolss_CreatePrinterIC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33030,7 +33030,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_PlayGDIScriptOnPrinterIC),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_PlayGDIScriptOnPrinterIC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_PlayGDIScriptOnPrinterIC,
+-		(ndr_print_function_t) ndr_print_spoolss_PlayGDIScriptOnPrinterIC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33039,7 +33039,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterIC),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterIC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterIC,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterIC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33048,7 +33048,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33057,7 +33057,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33066,7 +33066,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_PrinterMessageBox),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_PrinterMessageBox,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_PrinterMessageBox,
+-		(ndr_print_function_t) ndr_print_spoolss_PrinterMessageBox,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33075,7 +33075,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddMonitor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddMonitor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddMonitor,
+-		(ndr_print_function_t) ndr_print_spoolss_AddMonitor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33084,7 +33084,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeleteMonitor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeleteMonitor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeleteMonitor,
+-		(ndr_print_function_t) ndr_print_spoolss_DeleteMonitor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33093,7 +33093,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrintProcessor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrintProcessor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrintProcessor,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrintProcessor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33102,7 +33102,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrintProvidor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrintProvidor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrintProvidor,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrintProvidor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33111,7 +33111,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrintProvidor),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrintProvidor,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrintProvidor,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrintProvidor,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33120,7 +33120,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrintProcDataTypes),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrintProcDataTypes,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrintProcDataTypes,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrintProcDataTypes,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33129,7 +33129,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ResetPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ResetPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ResetPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ResetPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33138,7 +33138,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriver2),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriver2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriver2,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriver2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33147,7 +33147,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_FindFirstPrinterChangeNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_FindFirstPrinterChangeNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_FindFirstPrinterChangeNotification,
+-		(ndr_print_function_t) ndr_print_spoolss_FindFirstPrinterChangeNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33156,7 +33156,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_FindNextPrinterChangeNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_FindNextPrinterChangeNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_FindNextPrinterChangeNotification,
+-		(ndr_print_function_t) ndr_print_spoolss_FindNextPrinterChangeNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33165,7 +33165,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_FindClosePrinterNotify),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_FindClosePrinterNotify,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_FindClosePrinterNotify,
+-		(ndr_print_function_t) ndr_print_spoolss_FindClosePrinterNotify,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33174,7 +33174,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterFindFirstPrinterChangeNotificationOld),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterFindFirstPrinterChangeNotificationOld,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterFindFirstPrinterChangeNotificationOld,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterFindFirstPrinterChangeNotificationOld,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33183,7 +33183,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ReplyOpenPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ReplyOpenPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ReplyOpenPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ReplyOpenPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33192,7 +33192,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterReplyPrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterReplyPrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterReplyPrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterReplyPrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33201,7 +33201,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ReplyClosePrinter),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ReplyClosePrinter,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ReplyClosePrinter,
+-		(ndr_print_function_t) ndr_print_spoolss_ReplyClosePrinter,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33210,7 +33210,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPortEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPortEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPortEx,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPortEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33219,7 +33219,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterFindFirstPrinterChangeNotification),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterFindFirstPrinterChangeNotification,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterFindFirstPrinterChangeNotification,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterFindFirstPrinterChangeNotification,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33228,7 +33228,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SpoolerInit),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SpoolerInit,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SpoolerInit,
+-		(ndr_print_function_t) ndr_print_spoolss_SpoolerInit,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33237,7 +33237,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_ResetPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_ResetPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_ResetPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_ResetPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33246,7 +33246,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RemoteFindFirstPrinterChangeNotifyEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RemoteFindFirstPrinterChangeNotifyEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RemoteFindFirstPrinterChangeNotifyEx,
+-		(ndr_print_function_t) ndr_print_spoolss_RemoteFindFirstPrinterChangeNotifyEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33255,7 +33255,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterReplyPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterReplyPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterReplyPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterReplyPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33264,7 +33264,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_RouterRefreshPrinterChangeNotify),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_RouterRefreshPrinterChangeNotify,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterRefreshPrinterChangeNotify,
+-		(ndr_print_function_t) ndr_print_spoolss_RouterRefreshPrinterChangeNotify,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33273,7 +33273,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_44),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_44,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_44,
+-		(ndr_print_function_t) ndr_print_spoolss_44,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33282,7 +33282,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_OpenPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_OpenPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_OpenPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_OpenPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33291,7 +33291,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterEx,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33300,7 +33300,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPort),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPort,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPort,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPort,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33309,7 +33309,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33318,7 +33318,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterData,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33327,7 +33327,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_4a),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_4a,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_4a,
+-		(ndr_print_function_t) ndr_print_spoolss_4a,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33336,7 +33336,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_4b),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_4b,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_4b,
+-		(ndr_print_function_t) ndr_print_spoolss_4b,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33345,7 +33345,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_4c),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_4c,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_4c,
+-		(ndr_print_function_t) ndr_print_spoolss_4c,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33354,7 +33354,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_SetPrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_SetPrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_SetPrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_SetPrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33363,7 +33363,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33372,7 +33372,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33381,7 +33381,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPrinterKey),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPrinterKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPrinterKey,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPrinterKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33390,7 +33390,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterDataEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterDataEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterDataEx,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterDataEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33399,7 +33399,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterKey),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterKey,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33408,7 +33408,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_53),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_53,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_53,
+-		(ndr_print_function_t) ndr_print_spoolss_53,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33417,7 +33417,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePrinterDriverEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePrinterDriverEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePrinterDriverEx,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePrinterDriverEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33426,7 +33426,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPerMachineConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPerMachineConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPerMachineConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPerMachineConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33435,7 +33435,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_DeletePerMachineConnection),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_DeletePerMachineConnection,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_DeletePerMachineConnection,
+-		(ndr_print_function_t) ndr_print_spoolss_DeletePerMachineConnection,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33444,7 +33444,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_EnumPerMachineConnections),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_EnumPerMachineConnections,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_EnumPerMachineConnections,
+-		(ndr_print_function_t) ndr_print_spoolss_EnumPerMachineConnections,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33453,7 +33453,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_XcvData),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_XcvData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_XcvData,
+-		(ndr_print_function_t) ndr_print_spoolss_XcvData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33462,7 +33462,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_AddPrinterDriverEx),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_AddPrinterDriverEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_AddPrinterDriverEx,
+-		(ndr_print_function_t) ndr_print_spoolss_AddPrinterDriverEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33471,7 +33471,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5a),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5a,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5a,
+-		(ndr_print_function_t) ndr_print_spoolss_5a,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33480,7 +33480,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5b),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5b,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5b,
+-		(ndr_print_function_t) ndr_print_spoolss_5b,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33489,7 +33489,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5c),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5c,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5c,
+-		(ndr_print_function_t) ndr_print_spoolss_5c,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33498,7 +33498,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5d),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5d,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5d,
+-		(ndr_print_function_t) ndr_print_spoolss_5d,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33507,7 +33507,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5e),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5e,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5e,
+-		(ndr_print_function_t) ndr_print_spoolss_5e,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33516,7 +33516,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_5f),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_5f,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_5f,
+-		(ndr_print_function_t) ndr_print_spoolss_5f,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33525,7 +33525,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_60),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_60,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_60,
+-		(ndr_print_function_t) ndr_print_spoolss_60,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33534,7 +33534,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_61),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_61,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_61,
+-		(ndr_print_function_t) ndr_print_spoolss_61,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33543,7 +33543,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_62),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_62,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_62,
+-		(ndr_print_function_t) ndr_print_spoolss_62,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33552,7 +33552,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_63),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_63,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_63,
+-		(ndr_print_function_t) ndr_print_spoolss_63,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33561,7 +33561,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_64),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_64,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_64,
+-		(ndr_print_function_t) ndr_print_spoolss_64,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33570,7 +33570,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_65),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_65,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_65,
+-		(ndr_print_function_t) ndr_print_spoolss_65,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33579,7 +33579,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetCorePrinterDrivers),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetCorePrinterDrivers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetCorePrinterDrivers,
+-		(ndr_print_function_t) ndr_print_spoolss_GetCorePrinterDrivers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33588,7 +33588,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_67),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_67,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_67,
+-		(ndr_print_function_t) ndr_print_spoolss_67,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33597,7 +33597,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_GetPrinterDriverPackagePath),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_GetPrinterDriverPackagePath,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_GetPrinterDriverPackagePath,
+-		(ndr_print_function_t) ndr_print_spoolss_GetPrinterDriverPackagePath,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33606,7 +33606,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_69),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_69,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_69,
+-		(ndr_print_function_t) ndr_print_spoolss_69,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33615,7 +33615,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6a),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6a,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6a,
+-		(ndr_print_function_t) ndr_print_spoolss_6a,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33624,7 +33624,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6b),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6b,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6b,
+-		(ndr_print_function_t) ndr_print_spoolss_6b,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33633,7 +33633,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6c),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6c,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6c,
+-		(ndr_print_function_t) ndr_print_spoolss_6c,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -33642,7 +33642,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct spoolss_6d),
+ 		(ndr_push_flags_fn_t) ndr_push_spoolss_6d,
+ 		(ndr_pull_flags_fn_t) ndr_pull_spoolss_6d,
+-		(ndr_print_function_t) ndr_print_spoolss_6d,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
++++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
+@@ -20229,7 +20229,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20238,7 +20238,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20247,7 +20247,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevControl),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevControl,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevControl,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevControl,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20256,7 +20256,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20265,7 +20265,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20274,7 +20274,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQSetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20283,7 +20283,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQPurge),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQPurge,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQPurge,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQPurge,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20292,7 +20292,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetCharDevQPurgeSelf),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetCharDevQPurgeSelf,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetCharDevQPurgeSelf,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetCharDevQPurgeSelf,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20301,7 +20301,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetConnEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetConnEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetConnEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetConnEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20310,7 +20310,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetFileEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetFileEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetFileEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetFileEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20319,7 +20319,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetFileGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetFileGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetFileGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetFileGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20328,7 +20328,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetFileClose),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetFileClose,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetFileClose,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetFileClose,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20337,7 +20337,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSessEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSessEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSessEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSessEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20346,7 +20346,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSessDel),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSessDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSessDel,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSessDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20355,7 +20355,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareAdd,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20364,7 +20364,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareEnumAll),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareEnumAll,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareEnumAll,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareEnumAll,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20373,7 +20373,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20382,7 +20382,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareSetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20391,7 +20391,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDel),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDel,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20400,7 +20400,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDelSticky),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDelSticky,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDelSticky,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDelSticky,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20409,7 +20409,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareCheck),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareCheck,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareCheck,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareCheck,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20418,7 +20418,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSrvGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSrvGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSrvGetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSrvGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20427,7 +20427,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSrvSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSrvSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSrvSetInfo,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSrvSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20436,7 +20436,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetDiskEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetDiskEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetDiskEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetDiskEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20445,7 +20445,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetServerStatisticsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetServerStatisticsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetServerStatisticsGet,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetServerStatisticsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20454,7 +20454,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetTransportAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetTransportAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetTransportAdd,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetTransportAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20463,7 +20463,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetTransportEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetTransportEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetTransportEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetTransportEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20472,7 +20472,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetTransportDel),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetTransportDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetTransportDel,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetTransportDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20481,7 +20481,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetRemoteTOD),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetRemoteTOD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetRemoteTOD,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetRemoteTOD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20490,7 +20490,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSetServiceBits),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSetServiceBits,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSetServiceBits,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSetServiceBits,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20499,7 +20499,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPathType),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPathType,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPathType,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPathType,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20508,7 +20508,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPathCanonicalize),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPathCanonicalize,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPathCanonicalize,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPathCanonicalize,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20517,7 +20517,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPathCompare),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPathCompare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPathCompare,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPathCompare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20526,7 +20526,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetNameValidate),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetNameValidate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetNameValidate,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetNameValidate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20535,7 +20535,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRPRNAMECANONICALIZE),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRPRNAMECANONICALIZE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRPRNAMECANONICALIZE,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRPRNAMECANONICALIZE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20544,7 +20544,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetPRNameCompare),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetPRNameCompare,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetPRNameCompare,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetPRNameCompare,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20553,7 +20553,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareEnum,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20562,7 +20562,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDelStart),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDelStart,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDelStart,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDelStart,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20571,7 +20571,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetShareDelCommit),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetShareDelCommit,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetShareDelCommit,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetShareDelCommit,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20580,7 +20580,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetGetFileSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetGetFileSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetGetFileSecurity,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetGetFileSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20589,7 +20589,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetSetFileSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetSetFileSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetSetFileSecurity,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetSetFileSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20598,7 +20598,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetServerTransportAddEx),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetServerTransportAddEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetServerTransportAddEx,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetServerTransportAddEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20607,7 +20607,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NetServerSetServiceBitsEx),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NetServerSetServiceBitsEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NetServerSetServiceBitsEx,
+-		(ndr_print_function_t) ndr_print_srvsvc_NetServerSetServiceBitsEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20616,7 +20616,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSGETVERSION),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSGETVERSION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSGETVERSION,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSGETVERSION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20625,7 +20625,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSCREATELOCALPARTITION),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSCREATELOCALPARTITION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSCREATELOCALPARTITION,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSCREATELOCALPARTITION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20634,7 +20634,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSDELETELOCALPARTITION),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSDELETELOCALPARTITION,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSDELETELOCALPARTITION,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSDELETELOCALPARTITION,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20643,7 +20643,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSSETLOCALVOLUMESTATE),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSSETLOCALVOLUMESTATE,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSSETLOCALVOLUMESTATE,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSSETLOCALVOLUMESTATE,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20652,7 +20652,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSSETSERVERINFO),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSSETSERVERINFO,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSSETSERVERINFO,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSSETSERVERINFO,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20661,7 +20661,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSCREATEEXITPOINT),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSCREATEEXITPOINT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSCREATEEXITPOINT,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSCREATEEXITPOINT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20670,7 +20670,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSDELETEEXITPOINT),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSDELETEEXITPOINT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSDELETEEXITPOINT,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSDELETEEXITPOINT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20679,7 +20679,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSMODIFYPREFIX),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSMODIFYPREFIX,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSMODIFYPREFIX,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSMODIFYPREFIX,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20688,7 +20688,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSFIXLOCALVOLUME),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSFIXLOCALVOLUME,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSFIXLOCALVOLUME,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSFIXLOCALVOLUME,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20697,7 +20697,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRDFSMANAGERREPORTSITEINFO),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRDFSMANAGERREPORTSITEINFO,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRDFSMANAGERREPORTSITEINFO,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRDFSMANAGERREPORTSITEINFO,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -20706,7 +20706,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct srvsvc_NETRSERVERTRANSPORTDELEX),
+ 		(ndr_push_flags_fn_t) ndr_push_srvsvc_NETRSERVERTRANSPORTDELEX,
+ 		(ndr_pull_flags_fn_t) ndr_pull_srvsvc_NETRSERVERTRANSPORTDELEX,
+-		(ndr_print_function_t) ndr_print_srvsvc_NETRSERVERTRANSPORTDELEX,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_svcctl.c
++++ b/source3/librpc/gen_ndr/ndr_svcctl.c
+@@ -7175,7 +7175,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_CloseServiceHandle),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_CloseServiceHandle,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_CloseServiceHandle,
+-		(ndr_print_function_t) ndr_print_svcctl_CloseServiceHandle,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7184,7 +7184,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ControlService),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ControlService,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ControlService,
+-		(ndr_print_function_t) ndr_print_svcctl_ControlService,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7193,7 +7193,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_DeleteService),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_DeleteService,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_DeleteService,
+-		(ndr_print_function_t) ndr_print_svcctl_DeleteService,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7202,7 +7202,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_LockServiceDatabase),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_LockServiceDatabase,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_LockServiceDatabase,
+-		(ndr_print_function_t) ndr_print_svcctl_LockServiceDatabase,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7211,7 +7211,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceObjectSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceObjectSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceObjectSecurity,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceObjectSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7220,7 +7220,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SetServiceObjectSecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SetServiceObjectSecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SetServiceObjectSecurity,
+-		(ndr_print_function_t) ndr_print_svcctl_SetServiceObjectSecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7229,7 +7229,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceStatus,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7238,7 +7238,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SetServiceStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SetServiceStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SetServiceStatus,
+-		(ndr_print_function_t) ndr_print_svcctl_SetServiceStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7247,7 +7247,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_UnlockServiceDatabase),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_UnlockServiceDatabase,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_UnlockServiceDatabase,
+-		(ndr_print_function_t) ndr_print_svcctl_UnlockServiceDatabase,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7256,7 +7256,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_NotifyBootConfigStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_NotifyBootConfigStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_NotifyBootConfigStatus,
+-		(ndr_print_function_t) ndr_print_svcctl_NotifyBootConfigStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7265,7 +7265,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SCSetServiceBitsW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SCSetServiceBitsW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SCSetServiceBitsW,
+-		(ndr_print_function_t) ndr_print_svcctl_SCSetServiceBitsW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7274,7 +7274,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfigW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfigW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfigW,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfigW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7283,7 +7283,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_CreateServiceW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_CreateServiceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_CreateServiceW,
+-		(ndr_print_function_t) ndr_print_svcctl_CreateServiceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7292,7 +7292,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumDependentServicesW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumDependentServicesW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumDependentServicesW,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumDependentServicesW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7301,7 +7301,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumServicesStatusW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumServicesStatusW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumServicesStatusW,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumServicesStatusW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7310,7 +7310,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenSCManagerW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenSCManagerW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenSCManagerW,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenSCManagerW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7319,7 +7319,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenServiceW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenServiceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenServiceW,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenServiceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7328,7 +7328,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfigW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfigW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfigW,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfigW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7337,7 +7337,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceLockStatusW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceLockStatusW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceLockStatusW,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceLockStatusW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7346,7 +7346,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_StartServiceW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_StartServiceW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_StartServiceW,
+-		(ndr_print_function_t) ndr_print_svcctl_StartServiceW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7355,7 +7355,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceDisplayNameW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceDisplayNameW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceDisplayNameW,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceDisplayNameW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7364,7 +7364,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceKeyNameW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceKeyNameW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceKeyNameW,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceKeyNameW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7373,7 +7373,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SCSetServiceBitsA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SCSetServiceBitsA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SCSetServiceBitsA,
+-		(ndr_print_function_t) ndr_print_svcctl_SCSetServiceBitsA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7382,7 +7382,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfigA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfigA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfigA,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfigA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7391,7 +7391,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_CreateServiceA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_CreateServiceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_CreateServiceA,
+-		(ndr_print_function_t) ndr_print_svcctl_CreateServiceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7400,7 +7400,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumDependentServicesA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumDependentServicesA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumDependentServicesA,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumDependentServicesA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7409,7 +7409,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumServicesStatusA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumServicesStatusA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumServicesStatusA,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumServicesStatusA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7418,7 +7418,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenSCManagerA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenSCManagerA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenSCManagerA,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenSCManagerA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7427,7 +7427,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_OpenServiceA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_OpenServiceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_OpenServiceA,
+-		(ndr_print_function_t) ndr_print_svcctl_OpenServiceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7436,7 +7436,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfigA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfigA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfigA,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfigA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7445,7 +7445,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceLockStatusA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceLockStatusA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceLockStatusA,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceLockStatusA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7454,7 +7454,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_StartServiceA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_StartServiceA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_StartServiceA,
+-		(ndr_print_function_t) ndr_print_svcctl_StartServiceA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7463,7 +7463,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceDisplayNameA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceDisplayNameA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceDisplayNameA,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceDisplayNameA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7472,7 +7472,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetServiceKeyNameA),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetServiceKeyNameA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetServiceKeyNameA,
+-		(ndr_print_function_t) ndr_print_svcctl_GetServiceKeyNameA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7481,7 +7481,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_GetCurrentGroupeStateW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_GetCurrentGroupeStateW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_GetCurrentGroupeStateW,
+-		(ndr_print_function_t) ndr_print_svcctl_GetCurrentGroupeStateW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7490,7 +7490,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_EnumServiceGroupW),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_EnumServiceGroupW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_EnumServiceGroupW,
+-		(ndr_print_function_t) ndr_print_svcctl_EnumServiceGroupW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7499,7 +7499,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfig2A),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfig2A,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfig2A,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfig2A,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7508,7 +7508,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_ChangeServiceConfig2W),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_ChangeServiceConfig2W,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_ChangeServiceConfig2W,
+-		(ndr_print_function_t) ndr_print_svcctl_ChangeServiceConfig2W,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7517,7 +7517,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfig2A),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfig2A,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfig2A,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfig2A,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7526,7 +7526,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceConfig2W),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceConfig2W,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceConfig2W,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceConfig2W,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7535,7 +7535,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_QueryServiceStatusEx),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_QueryServiceStatusEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_QueryServiceStatusEx,
+-		(ndr_print_function_t) ndr_print_svcctl_QueryServiceStatusEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7544,7 +7544,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct EnumServicesStatusExA),
+ 		(ndr_push_flags_fn_t) ndr_push_EnumServicesStatusExA,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EnumServicesStatusExA,
+-		(ndr_print_function_t) ndr_print_EnumServicesStatusExA,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7553,7 +7553,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct EnumServicesStatusExW),
+ 		(ndr_push_flags_fn_t) ndr_push_EnumServicesStatusExW,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EnumServicesStatusExW,
+-		(ndr_print_function_t) ndr_print_EnumServicesStatusExW,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7562,7 +7562,7 @@ static const struct ndr_interface_call s
+ 		sizeof(struct svcctl_SCSendTSMessage),
+ 		(ndr_push_flags_fn_t) ndr_push_svcctl_SCSendTSMessage,
+ 		(ndr_pull_flags_fn_t) ndr_pull_svcctl_SCSendTSMessage,
+-		(ndr_print_function_t) ndr_print_svcctl_SCSendTSMessage,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_trkwks.c
++++ b/source3/librpc/gen_ndr/ndr_trkwks.c
+@@ -51,7 +51,7 @@ static const struct ndr_interface_call t
+ 		sizeof(struct trkwks_Unknown0),
+ 		(ndr_push_flags_fn_t) ndr_push_trkwks_Unknown0,
+ 		(ndr_pull_flags_fn_t) ndr_pull_trkwks_Unknown0,
+-		(ndr_print_function_t) ndr_print_trkwks_Unknown0,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_unixinfo.c
++++ b/source3/librpc/gen_ndr/ndr_unixinfo.c
+@@ -472,7 +472,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_SidToUid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_SidToUid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_SidToUid,
+-		(ndr_print_function_t) ndr_print_unixinfo_SidToUid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -481,7 +481,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_UidToSid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_UidToSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_UidToSid,
+-		(ndr_print_function_t) ndr_print_unixinfo_UidToSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -490,7 +490,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_SidToGid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_SidToGid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_SidToGid,
+-		(ndr_print_function_t) ndr_print_unixinfo_SidToGid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -499,7 +499,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_GidToSid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_GidToSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_GidToSid,
+-		(ndr_print_function_t) ndr_print_unixinfo_GidToSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -508,7 +508,7 @@ static const struct ndr_interface_call u
+ 		sizeof(struct unixinfo_GetPWUid),
+ 		(ndr_push_flags_fn_t) ndr_push_unixinfo_GetPWUid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_unixinfo_GetPWUid,
+-		(ndr_print_function_t) ndr_print_unixinfo_GetPWUid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_w32time.c
++++ b/source3/librpc/gen_ndr/ndr_w32time.c
+@@ -135,7 +135,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct w32time_SyncTime),
+ 		(ndr_push_flags_fn_t) ndr_push_w32time_SyncTime,
+ 		(ndr_pull_flags_fn_t) ndr_pull_w32time_SyncTime,
+-		(ndr_print_function_t) ndr_print_w32time_SyncTime,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -144,7 +144,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct w32time_GetNetLogonServiceBits),
+ 		(ndr_push_flags_fn_t) ndr_push_w32time_GetNetLogonServiceBits,
+ 		(ndr_pull_flags_fn_t) ndr_pull_w32time_GetNetLogonServiceBits,
+-		(ndr_print_function_t) ndr_print_w32time_GetNetLogonServiceBits,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -153,7 +153,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct w32time_QueryProviderStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_w32time_QueryProviderStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_w32time_QueryProviderStatus,
+-		(ndr_print_function_t) ndr_print_w32time_QueryProviderStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wbint.c
++++ b/source3/librpc/gen_ndr/ndr_wbint.c
+@@ -2696,7 +2696,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Ping),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Ping,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Ping,
+-		(ndr_print_function_t) ndr_print_wbint_Ping,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2705,7 +2705,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupSid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupSid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupSid,
+-		(ndr_print_function_t) ndr_print_wbint_LookupSid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2714,7 +2714,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupSids),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupSids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupSids,
+-		(ndr_print_function_t) ndr_print_wbint_LookupSids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2723,7 +2723,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupName),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupName,
+-		(ndr_print_function_t) ndr_print_wbint_LookupName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2732,7 +2732,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Sid2Uid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Sid2Uid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Sid2Uid,
+-		(ndr_print_function_t) ndr_print_wbint_Sid2Uid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2741,7 +2741,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Sid2Gid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Sid2Gid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Sid2Gid,
+-		(ndr_print_function_t) ndr_print_wbint_Sid2Gid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2750,7 +2750,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Sids2UnixIDs),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Sids2UnixIDs,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Sids2UnixIDs,
+-		(ndr_print_function_t) ndr_print_wbint_Sids2UnixIDs,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2759,7 +2759,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Uid2Sid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Uid2Sid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Uid2Sid,
+-		(ndr_print_function_t) ndr_print_wbint_Uid2Sid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2768,7 +2768,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_Gid2Sid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_Gid2Sid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_Gid2Sid,
+-		(ndr_print_function_t) ndr_print_wbint_Gid2Sid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2777,7 +2777,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_AllocateUid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_AllocateUid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_AllocateUid,
+-		(ndr_print_function_t) ndr_print_wbint_AllocateUid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2786,7 +2786,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_AllocateGid),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_AllocateGid,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_AllocateGid,
+-		(ndr_print_function_t) ndr_print_wbint_AllocateGid,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2795,7 +2795,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QueryUser),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QueryUser,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QueryUser,
+-		(ndr_print_function_t) ndr_print_wbint_QueryUser,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2804,7 +2804,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupUserAliases),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupUserAliases,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupUserAliases,
+-		(ndr_print_function_t) ndr_print_wbint_LookupUserAliases,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2813,7 +2813,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupUserGroups),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupUserGroups,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupUserGroups,
+-		(ndr_print_function_t) ndr_print_wbint_LookupUserGroups,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2822,7 +2822,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QuerySequenceNumber),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QuerySequenceNumber,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QuerySequenceNumber,
+-		(ndr_print_function_t) ndr_print_wbint_QuerySequenceNumber,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2831,7 +2831,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupGroupMembers),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupGroupMembers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupGroupMembers,
+-		(ndr_print_function_t) ndr_print_wbint_LookupGroupMembers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2840,7 +2840,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QueryUserList),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QueryUserList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QueryUserList,
+-		(ndr_print_function_t) ndr_print_wbint_QueryUserList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2849,7 +2849,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_QueryGroupList),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_QueryGroupList,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_QueryGroupList,
+-		(ndr_print_function_t) ndr_print_wbint_QueryGroupList,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2858,7 +2858,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_DsGetDcName),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_DsGetDcName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_DsGetDcName,
+-		(ndr_print_function_t) ndr_print_wbint_DsGetDcName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2867,7 +2867,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_LookupRids),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_LookupRids,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_LookupRids,
+-		(ndr_print_function_t) ndr_print_wbint_LookupRids,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2876,7 +2876,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_CheckMachineAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_CheckMachineAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_CheckMachineAccount,
+-		(ndr_print_function_t) ndr_print_wbint_CheckMachineAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2885,7 +2885,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_ChangeMachineAccount),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_ChangeMachineAccount,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_ChangeMachineAccount,
+-		(ndr_print_function_t) ndr_print_wbint_ChangeMachineAccount,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -2894,7 +2894,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wbint_PingDc),
+ 		(ndr_push_flags_fn_t) ndr_push_wbint_PingDc,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wbint_PingDc,
+-		(ndr_print_function_t) ndr_print_wbint_PingDc,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_winreg.c
++++ b/source3/librpc/gen_ndr/ndr_winreg.c
+@@ -4864,7 +4864,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKCR),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKCR,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKCR,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKCR,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4873,7 +4873,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKCU),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKCU,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKCU,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKCU,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4882,7 +4882,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKLM),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKLM,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKLM,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKLM,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4891,7 +4891,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKPD),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKPD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKPD,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKPD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4900,7 +4900,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKU),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKU,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKU,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKU,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4909,7 +4909,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_CloseKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_CloseKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_CloseKey,
+-		(ndr_print_function_t) ndr_print_winreg_CloseKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4918,7 +4918,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_CreateKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_CreateKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_CreateKey,
+-		(ndr_print_function_t) ndr_print_winreg_CreateKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4927,7 +4927,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_DeleteKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_DeleteKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_DeleteKey,
+-		(ndr_print_function_t) ndr_print_winreg_DeleteKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4936,7 +4936,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_DeleteValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_DeleteValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_DeleteValue,
+-		(ndr_print_function_t) ndr_print_winreg_DeleteValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4945,7 +4945,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_EnumKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_EnumKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_EnumKey,
+-		(ndr_print_function_t) ndr_print_winreg_EnumKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4954,7 +4954,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_EnumValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_EnumValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_EnumValue,
+-		(ndr_print_function_t) ndr_print_winreg_EnumValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4963,7 +4963,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_FlushKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_FlushKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_FlushKey,
+-		(ndr_print_function_t) ndr_print_winreg_FlushKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4972,7 +4972,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_GetKeySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_GetKeySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_GetKeySecurity,
+-		(ndr_print_function_t) ndr_print_winreg_GetKeySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4981,7 +4981,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_LoadKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_LoadKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_LoadKey,
+-		(ndr_print_function_t) ndr_print_winreg_LoadKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4990,7 +4990,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_NotifyChangeKeyValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_NotifyChangeKeyValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_NotifyChangeKeyValue,
+-		(ndr_print_function_t) ndr_print_winreg_NotifyChangeKeyValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4999,7 +4999,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenKey,
+-		(ndr_print_function_t) ndr_print_winreg_OpenKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5008,7 +5008,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryInfoKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryInfoKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryInfoKey,
+-		(ndr_print_function_t) ndr_print_winreg_QueryInfoKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5017,7 +5017,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryValue,
+-		(ndr_print_function_t) ndr_print_winreg_QueryValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5026,7 +5026,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_ReplaceKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_ReplaceKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_ReplaceKey,
+-		(ndr_print_function_t) ndr_print_winreg_ReplaceKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5035,7 +5035,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_RestoreKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_RestoreKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_RestoreKey,
+-		(ndr_print_function_t) ndr_print_winreg_RestoreKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5044,7 +5044,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SaveKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SaveKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SaveKey,
+-		(ndr_print_function_t) ndr_print_winreg_SaveKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5053,7 +5053,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SetKeySecurity),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SetKeySecurity,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SetKeySecurity,
+-		(ndr_print_function_t) ndr_print_winreg_SetKeySecurity,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5062,7 +5062,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SetValue),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SetValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SetValue,
+-		(ndr_print_function_t) ndr_print_winreg_SetValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5071,7 +5071,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_UnLoadKey),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_UnLoadKey,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_UnLoadKey,
+-		(ndr_print_function_t) ndr_print_winreg_UnLoadKey,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5080,7 +5080,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_InitiateSystemShutdown),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_InitiateSystemShutdown,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_InitiateSystemShutdown,
+-		(ndr_print_function_t) ndr_print_winreg_InitiateSystemShutdown,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5089,7 +5089,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_AbortSystemShutdown),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_AbortSystemShutdown,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_AbortSystemShutdown,
+-		(ndr_print_function_t) ndr_print_winreg_AbortSystemShutdown,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5098,7 +5098,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_GetVersion),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_GetVersion,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_GetVersion,
+-		(ndr_print_function_t) ndr_print_winreg_GetVersion,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5107,7 +5107,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKCC),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKCC,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKCC,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKCC,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5116,7 +5116,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKDD),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKDD,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKDD,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKDD,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5125,7 +5125,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryMultipleValues),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryMultipleValues,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryMultipleValues,
+-		(ndr_print_function_t) ndr_print_winreg_QueryMultipleValues,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5134,7 +5134,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_InitiateSystemShutdownEx),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_InitiateSystemShutdownEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_InitiateSystemShutdownEx,
+-		(ndr_print_function_t) ndr_print_winreg_InitiateSystemShutdownEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5143,7 +5143,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_SaveKeyEx),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_SaveKeyEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_SaveKeyEx,
+-		(ndr_print_function_t) ndr_print_winreg_SaveKeyEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5152,7 +5152,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKPT),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKPT,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKPT,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKPT,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5161,7 +5161,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_OpenHKPN),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_OpenHKPN,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_OpenHKPN,
+-		(ndr_print_function_t) ndr_print_winreg_OpenHKPN,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5170,7 +5170,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_QueryMultipleValues2),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_QueryMultipleValues2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_QueryMultipleValues2,
+-		(ndr_print_function_t) ndr_print_winreg_QueryMultipleValues2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5179,7 +5179,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct winreg_DeleteKeyEx),
+ 		(ndr_push_flags_fn_t) ndr_push_winreg_DeleteKeyEx,
+ 		(ndr_pull_flags_fn_t) ndr_pull_winreg_DeleteKeyEx,
+-		(ndr_print_function_t) ndr_print_winreg_DeleteKeyEx,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wkssvc.c
++++ b/source3/librpc/gen_ndr/ndr_wkssvc.c
+@@ -11005,7 +11005,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaGetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11014,7 +11014,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaSetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11023,7 +11023,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaEnumUsers),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaEnumUsers,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaEnumUsers,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaEnumUsers,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11032,7 +11032,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaUserGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaUserGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaUserGetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaUserGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11041,7 +11041,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaUserSetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaUserSetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaUserSetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaUserSetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11050,7 +11050,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetWkstaTransportEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetWkstaTransportEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetWkstaTransportEnum,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetWkstaTransportEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11059,7 +11059,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaTransportAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaTransportAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaTransportAdd,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaTransportAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11068,7 +11068,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWkstaTransportDel),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWkstaTransportDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWkstaTransportDel,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWkstaTransportDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11077,7 +11077,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseAdd,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11086,7 +11086,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseGetInfo),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseGetInfo,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseGetInfo,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseGetInfo,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11095,7 +11095,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseDel),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseDel,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11104,7 +11104,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUseEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUseEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUseEnum,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUseEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11113,7 +11113,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrMessageBufferSend),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrMessageBufferSend,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrMessageBufferSend,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrMessageBufferSend,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11122,7 +11122,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrWorkstationStatisticsGet),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrWorkstationStatisticsGet,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrWorkstationStatisticsGet,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrWorkstationStatisticsGet,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11131,7 +11131,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrLogonDomainNameAdd),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrLogonDomainNameAdd,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrLogonDomainNameAdd,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrLogonDomainNameAdd,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11140,7 +11140,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrLogonDomainNameDel),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrLogonDomainNameDel,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrLogonDomainNameDel,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrLogonDomainNameDel,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11149,7 +11149,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrJoinDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrJoinDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrJoinDomain,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrJoinDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11158,7 +11158,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUnjoinDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUnjoinDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUnjoinDomain,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUnjoinDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11167,7 +11167,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrRenameMachineInDomain),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrRenameMachineInDomain,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrRenameMachineInDomain,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrRenameMachineInDomain,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11176,7 +11176,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrValidateName),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrValidateName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrValidateName,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrValidateName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11185,7 +11185,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrGetJoinInformation),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrGetJoinInformation,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrGetJoinInformation,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrGetJoinInformation,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11194,7 +11194,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrGetJoinableOus),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrGetJoinableOus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrGetJoinableOus,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrGetJoinableOus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11203,7 +11203,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrJoinDomain2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrJoinDomain2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrJoinDomain2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrJoinDomain2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11212,7 +11212,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrUnjoinDomain2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrUnjoinDomain2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrUnjoinDomain2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrUnjoinDomain2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11221,7 +11221,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrRenameMachineInDomain2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrRenameMachineInDomain2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrRenameMachineInDomain2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrRenameMachineInDomain2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11230,7 +11230,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrValidateName2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrValidateName2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrValidateName2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrValidateName2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11239,7 +11239,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrGetJoinableOus2),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrGetJoinableOus2,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrGetJoinableOus2,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrGetJoinableOus2,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11248,7 +11248,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrAddAlternateComputerName),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrAddAlternateComputerName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrAddAlternateComputerName,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrAddAlternateComputerName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11257,7 +11257,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrRemoveAlternateComputerName),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrRemoveAlternateComputerName,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrRemoveAlternateComputerName,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrRemoveAlternateComputerName,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11266,7 +11266,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrSetPrimaryComputername),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrSetPrimaryComputername,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrSetPrimaryComputername,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrSetPrimaryComputername,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -11275,7 +11275,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wkssvc_NetrEnumerateComputerNames),
+ 		(ndr_push_flags_fn_t) ndr_push_wkssvc_NetrEnumerateComputerNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wkssvc_NetrEnumerateComputerNames,
+-		(ndr_print_function_t) ndr_print_wkssvc_NetrEnumerateComputerNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wmi.c
++++ b/source3/librpc/gen_ndr/ndr_wmi.c
+@@ -139,7 +139,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Delete),
+ 		(ndr_push_flags_fn_t) ndr_push_Delete,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Delete,
+-		(ndr_print_function_t) ndr_print_Delete,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3704,7 +3704,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct OpenNamespace),
+ 		(ndr_push_flags_fn_t) ndr_push_OpenNamespace,
+ 		(ndr_pull_flags_fn_t) ndr_pull_OpenNamespace,
+-		(ndr_print_function_t) ndr_print_OpenNamespace,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3713,7 +3713,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CancelAsyncCall),
+ 		(ndr_push_flags_fn_t) ndr_push_CancelAsyncCall,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CancelAsyncCall,
+-		(ndr_print_function_t) ndr_print_CancelAsyncCall,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3722,7 +3722,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct QueryObjectSink),
+ 		(ndr_push_flags_fn_t) ndr_push_QueryObjectSink,
+ 		(ndr_pull_flags_fn_t) ndr_pull_QueryObjectSink,
+-		(ndr_print_function_t) ndr_print_QueryObjectSink,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3731,7 +3731,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetObject),
+ 		(ndr_push_flags_fn_t) ndr_push_GetObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetObject,
+-		(ndr_print_function_t) ndr_print_GetObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3740,7 +3740,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetObjectAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_GetObjectAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetObjectAsync,
+-		(ndr_print_function_t) ndr_print_GetObjectAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3749,7 +3749,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutClass),
+ 		(ndr_push_flags_fn_t) ndr_push_PutClass,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutClass,
+-		(ndr_print_function_t) ndr_print_PutClass,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3758,7 +3758,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutClassAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_PutClassAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutClassAsync,
+-		(ndr_print_function_t) ndr_print_PutClassAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3767,7 +3767,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteClass),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteClass,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteClass,
+-		(ndr_print_function_t) ndr_print_DeleteClass,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3776,7 +3776,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteClassAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteClassAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteClassAsync,
+-		(ndr_print_function_t) ndr_print_DeleteClassAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3785,7 +3785,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateClassEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateClassEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateClassEnum,
+-		(ndr_print_function_t) ndr_print_CreateClassEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3794,7 +3794,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateClassEnumAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateClassEnumAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateClassEnumAsync,
+-		(ndr_print_function_t) ndr_print_CreateClassEnumAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3803,7 +3803,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_PutInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutInstance,
+-		(ndr_print_function_t) ndr_print_PutInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3812,7 +3812,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct PutInstanceAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_PutInstanceAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_PutInstanceAsync,
+-		(ndr_print_function_t) ndr_print_PutInstanceAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3821,7 +3821,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteInstance),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteInstance,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteInstance,
+-		(ndr_print_function_t) ndr_print_DeleteInstance,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3830,7 +3830,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteInstanceAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteInstanceAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteInstanceAsync,
+-		(ndr_print_function_t) ndr_print_DeleteInstanceAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3839,7 +3839,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateInstanceEnum),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateInstanceEnum,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateInstanceEnum,
+-		(ndr_print_function_t) ndr_print_CreateInstanceEnum,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3848,7 +3848,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct CreateInstanceEnumAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_CreateInstanceEnumAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_CreateInstanceEnumAsync,
+-		(ndr_print_function_t) ndr_print_CreateInstanceEnumAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3857,7 +3857,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecQuery),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecQuery,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecQuery,
+-		(ndr_print_function_t) ndr_print_ExecQuery,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3866,7 +3866,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecQueryAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecQueryAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecQueryAsync,
+-		(ndr_print_function_t) ndr_print_ExecQueryAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3875,7 +3875,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecNotificationQuery),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecNotificationQuery,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecNotificationQuery,
+-		(ndr_print_function_t) ndr_print_ExecNotificationQuery,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3884,7 +3884,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecNotificationQueryAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecNotificationQueryAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecNotificationQueryAsync,
+-		(ndr_print_function_t) ndr_print_ExecNotificationQueryAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3893,7 +3893,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecMethod),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecMethod,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecMethod,
+-		(ndr_print_function_t) ndr_print_ExecMethod,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -3902,7 +3902,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct ExecMethodAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_ExecMethodAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_ExecMethodAsync,
+-		(ndr_print_function_t) ndr_print_ExecMethodAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4434,7 +4434,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Reset),
+ 		(ndr_push_flags_fn_t) ndr_push_Reset,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Reset,
+-		(ndr_print_function_t) ndr_print_Reset,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4443,7 +4443,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IEnumWbemClassObject_Next),
+ 		(ndr_push_flags_fn_t) ndr_push_IEnumWbemClassObject_Next,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IEnumWbemClassObject_Next,
+-		(ndr_print_function_t) ndr_print_IEnumWbemClassObject_Next,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4452,7 +4452,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct NextAsync),
+ 		(ndr_push_flags_fn_t) ndr_push_NextAsync,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NextAsync,
+-		(ndr_print_function_t) ndr_print_NextAsync,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4461,7 +4461,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IEnumWbemClassObject_Clone),
+ 		(ndr_push_flags_fn_t) ndr_push_IEnumWbemClassObject_Clone,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IEnumWbemClassObject_Clone,
+-		(ndr_print_function_t) ndr_print_IEnumWbemClassObject_Clone,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -4470,7 +4470,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Skip),
+ 		(ndr_push_flags_fn_t) ndr_push_Skip,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Skip,
+-		(ndr_print_function_t) ndr_print_Skip,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5143,7 +5143,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Clone),
+ 		(ndr_push_flags_fn_t) ndr_push_Clone,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Clone,
+-		(ndr_print_function_t) ndr_print_Clone,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5152,7 +5152,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetNames),
+ 		(ndr_push_flags_fn_t) ndr_push_GetNames,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetNames,
+-		(ndr_print_function_t) ndr_print_GetNames,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5161,7 +5161,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct BeginEnumeration),
+ 		(ndr_push_flags_fn_t) ndr_push_BeginEnumeration,
+ 		(ndr_pull_flags_fn_t) ndr_pull_BeginEnumeration,
+-		(ndr_print_function_t) ndr_print_BeginEnumeration,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5170,7 +5170,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Next),
+ 		(ndr_push_flags_fn_t) ndr_push_Next,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Next,
+-		(ndr_print_function_t) ndr_print_Next,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5179,7 +5179,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct EndEnumeration),
+ 		(ndr_push_flags_fn_t) ndr_push_EndEnumeration,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EndEnumeration,
+-		(ndr_print_function_t) ndr_print_EndEnumeration,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5188,7 +5188,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct SetValue),
+ 		(ndr_push_flags_fn_t) ndr_push_SetValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_SetValue,
+-		(ndr_print_function_t) ndr_print_SetValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5197,7 +5197,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetValue),
+ 		(ndr_push_flags_fn_t) ndr_push_GetValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetValue,
+-		(ndr_print_function_t) ndr_print_GetValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5206,7 +5206,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteValue),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteValue,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteValue,
+-		(ndr_print_function_t) ndr_print_DeleteValue,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5215,7 +5215,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct DeleteAll),
+ 		(ndr_push_flags_fn_t) ndr_push_DeleteAll,
+ 		(ndr_pull_flags_fn_t) ndr_pull_DeleteAll,
+-		(ndr_print_function_t) ndr_print_DeleteAll,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5963,7 +5963,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct EstablishPosition),
+ 		(ndr_push_flags_fn_t) ndr_push_EstablishPosition,
+ 		(ndr_pull_flags_fn_t) ndr_pull_EstablishPosition,
+-		(ndr_print_function_t) ndr_print_EstablishPosition,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5972,7 +5972,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct RequestChallenge),
+ 		(ndr_push_flags_fn_t) ndr_push_RequestChallenge,
+ 		(ndr_pull_flags_fn_t) ndr_pull_RequestChallenge,
+-		(ndr_print_function_t) ndr_print_RequestChallenge,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5981,7 +5981,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct WBEMLogin),
+ 		(ndr_push_flags_fn_t) ndr_push_WBEMLogin,
+ 		(ndr_pull_flags_fn_t) ndr_pull_WBEMLogin,
+-		(ndr_print_function_t) ndr_print_WBEMLogin,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -5990,7 +5990,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct NTLMLogin),
+ 		(ndr_push_flags_fn_t) ndr_push_NTLMLogin,
+ 		(ndr_pull_flags_fn_t) ndr_pull_NTLMLogin,
+-		(ndr_print_function_t) ndr_print_NTLMLogin,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6225,7 +6225,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct IWbemWCOSmartEnum_Next),
+ 		(ndr_push_flags_fn_t) ndr_push_IWbemWCOSmartEnum_Next,
+ 		(ndr_pull_flags_fn_t) ndr_pull_IWbemWCOSmartEnum_Next,
+-		(ndr_print_function_t) ndr_print_IWbemWCOSmartEnum_Next,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6479,7 +6479,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Fetch),
+ 		(ndr_push_flags_fn_t) ndr_push_Fetch,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Fetch,
+-		(ndr_print_function_t) ndr_print_Fetch,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6488,7 +6488,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Test),
+ 		(ndr_push_flags_fn_t) ndr_push_Test,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Test,
+-		(ndr_print_function_t) ndr_print_Test,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6920,7 +6920,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetResultObject),
+ 		(ndr_push_flags_fn_t) ndr_push_GetResultObject,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetResultObject,
+-		(ndr_print_function_t) ndr_print_GetResultObject,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6929,7 +6929,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetResultString),
+ 		(ndr_push_flags_fn_t) ndr_push_GetResultString,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetResultString,
+-		(ndr_print_function_t) ndr_print_GetResultString,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6938,7 +6938,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetResultServices),
+ 		(ndr_push_flags_fn_t) ndr_push_GetResultServices,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetResultServices,
+-		(ndr_print_function_t) ndr_print_GetResultServices,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -6947,7 +6947,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct GetCallStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_GetCallStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_GetCallStatus,
+-		(ndr_print_function_t) ndr_print_GetCallStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7211,7 +7211,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct SetStatus),
+ 		(ndr_push_flags_fn_t) ndr_push_SetStatus,
+ 		(ndr_pull_flags_fn_t) ndr_pull_SetStatus,
+-		(ndr_print_function_t) ndr_print_SetStatus,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -7220,7 +7220,7 @@ static const struct ndr_interface_call I
+ 		sizeof(struct Indicate),
+ 		(ndr_push_flags_fn_t) ndr_push_Indicate,
+ 		(ndr_pull_flags_fn_t) ndr_pull_Indicate,
+-		(ndr_print_function_t) ndr_print_Indicate,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_wzcsvc.c
++++ b/source3/librpc/gen_ndr/ndr_wzcsvc.c
+@@ -711,7 +711,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EnumInterfaces),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EnumInterfaces,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EnumInterfaces,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EnumInterfaces,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -720,7 +720,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_QueryInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_QueryInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_QueryInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_QueryInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -729,7 +729,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_SetInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_SetInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_SetInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_SetInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -738,7 +738,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_RefreshInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_RefreshInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_RefreshInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_RefreshInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -747,7 +747,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_QueryContext),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_QueryContext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_QueryContext,
+-		(ndr_print_function_t) ndr_print_wzcsvc_QueryContext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -756,7 +756,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_SetContext),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_SetContext,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_SetContext,
+-		(ndr_print_function_t) ndr_print_wzcsvc_SetContext,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -765,7 +765,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolUIResponse),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolUIResponse,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolUIResponse,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolUIResponse,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -774,7 +774,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolGetCustomAuthData),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolGetCustomAuthData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolGetCustomAuthData,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolGetCustomAuthData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -783,7 +783,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolSetCustomAuthData),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolSetCustomAuthData,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolSetCustomAuthData,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolSetCustomAuthData,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -792,7 +792,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolGetInterfaceParams),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolGetInterfaceParams,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolGetInterfaceParams,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolGetInterfaceParams,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -801,7 +801,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolSetInterfaceParams),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolSetInterfaceParams,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolSetInterfaceParams,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolSetInterfaceParams,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -810,7 +810,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolReAuthenticateInterface),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolReAuthenticateInterface,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolReAuthenticateInterface,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolReAuthenticateInterface,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -819,7 +819,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EapolQueryInterfaceState),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EapolQueryInterfaceState,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EapolQueryInterfaceState,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EapolQueryInterfaceState,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -828,7 +828,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_OpenWZCDbLogSession),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_OpenWZCDbLogSession,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_OpenWZCDbLogSession,
+-		(ndr_print_function_t) ndr_print_wzcsvc_OpenWZCDbLogSession,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -837,7 +837,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_CloseWZCDbLogSession),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_CloseWZCDbLogSession,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_CloseWZCDbLogSession,
+-		(ndr_print_function_t) ndr_print_wzcsvc_CloseWZCDbLogSession,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -846,7 +846,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_EnumWZCDbLogRecords),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_EnumWZCDbLogRecords,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_EnumWZCDbLogRecords,
+-		(ndr_print_function_t) ndr_print_wzcsvc_EnumWZCDbLogRecords,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -855,7 +855,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_FlushWZCdbLog),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_FlushWZCdbLog,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_FlushWZCdbLog,
+-		(ndr_print_function_t) ndr_print_wzcsvc_FlushWZCdbLog,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+@@ -864,7 +864,7 @@ static const struct ndr_interface_call w
+ 		sizeof(struct wzcsvc_GetWZCDbLogRecord),
+ 		(ndr_push_flags_fn_t) ndr_push_wzcsvc_GetWZCDbLogRecord,
+ 		(ndr_pull_flags_fn_t) ndr_pull_wzcsvc_GetWZCDbLogRecord,
+-		(ndr_print_function_t) ndr_print_wzcsvc_GetWZCDbLogRecord,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- a/source3/librpc/gen_ndr/ndr_xattr.c
++++ b/source3/librpc/gen_ndr/ndr_xattr.c
+@@ -1101,7 +1101,7 @@ static const struct ndr_interface_call x
+ 		sizeof(struct xattr_parse_DOSATTRIB),
+ 		(ndr_push_flags_fn_t) ndr_push_xattr_parse_DOSATTRIB,
+ 		(ndr_pull_flags_fn_t) ndr_pull_xattr_parse_DOSATTRIB,
+-		(ndr_print_function_t) ndr_print_xattr_parse_DOSATTRIB,
++		(ndr_print_function_t) ndr_print_disabled,
+ 		{ 0, NULL },
+ 		{ 0, NULL },
+ 	},
+--- /dev/null
++++ b/source3/remove-librpc-print-calls.sh
+@@ -0,0 +1,22 @@
++#!/usr/bin/env bash
++set -e
++for file in ${1:-librpc/gen_ndr/ndr_*.c}; do
++	quilt add "$file" || true
++	awk '
++$0 ~ /^static const struct ndr_interface_call .* = {$/ {
++	replace = 1
++}
++
++$0 ~ /^}$/ {
++	replace = 0;
++}
++
++replace == 1 {
++	gsub(/.ndr_print_function_t. .*,/, "(ndr_print_function_t) ndr_print_disabled,", $0)
++}
++{
++	print $0
++}
++	' < "$file" > "$file.new"
++	mv "$file.new" "$file"
++done
+--- a/librpc/ndr/libndr.h
++++ b/librpc/ndr/libndr.h
+@@ -603,6 +603,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_enum
+ _PUBLIC_ enum ndr_err_code ndr_push_enum_uint1632(struct ndr_push *ndr, int ndr_flags, uint16_t v);
+ 
+ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b);
++_PUBLIC_ void ndr_print_disabled(struct ndr_print *ndr, const char *name, int flags, void *r);
+ 
+ #ifndef VERBOSE_ERROR
+ #define ndr_print_bool(...) do {} while (0)
diff --git a/trunk/package/network/services/uhttpd/Makefile b/trunk/package/network/services/uhttpd/Makefile
new file mode 100644
index 00000000..e6e6753a
--- /dev/null
+++ b/trunk/package/network/services/uhttpd/Makefile
@@ -0,0 +1,142 @@
+#
+# Copyright (C) 2010-2014 Jo-Philipp Wich <jow@openwrt.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uhttpd
+PKG_VERSION:=2014-10-27
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=fd8e5e379c23c5fbcec3e76894b839233df09067
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=ISC
+
+PKG_BUILD_DEPENDS = ustream-ssl
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/uhttpd/default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE:=uHTTPd - tiny, single threaded HTTP server
+endef
+
+define Package/uhttpd
+  $(Package/uhttpd/default)
+  DEPENDS:=+libubox
+endef
+
+define Package/uhttpd/description
+ uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
+ support. It is intended as a drop-in replacement for the Busybox
+ HTTP daemon.
+endef
+
+define Package/uhttpd/config
+  config PACKAGE_uhttpd_debug
+    bool "Build with debug messages"
+    default n
+endef
+
+
+define Package/uhttpd-mod-tls
+  $(Package/uhttpd/default)
+  TITLE+= (TLS plugin)
+  DEPENDS:=uhttpd \
+	+PACKAGE_uhttpd-mod-tls_polarssl:libustream-polarssl \
+	+PACKAGE_uhttpd-mod-tls_cyassl:libustream-cyassl \
+	+PACKAGE_uhttpd-mod-tls_openssl:libustream-openssl
+endef
+
+define Package/uhttpd-mod-tls/description
+ The TLS plugin adds HTTPS support to uHTTPd.
+endef
+
+define Package/uhttpd-mod-tls/config
+  choice
+    depends on PACKAGE_uhttpd-mod-tls
+    prompt "TLS Provider"
+    default PACKAGE_uhttpd-mod-tls_polarssl
+
+    config PACKAGE_uhttpd-mod-tls_polarssl
+      bool "PolarSSL"
+
+    config PACKAGE_uhttpd-mod-tls_cyassl
+      bool "CyaSSL"
+
+    config PACKAGE_uhttpd-mod-tls_openssl
+      bool "OpenSSL"
+  endchoice
+endef
+
+define Package/uhttpd-mod-lua
+  $(Package/uhttpd/default)
+  TITLE+= (Lua plugin)
+  DEPENDS:=uhttpd +liblua
+endef
+
+define Package/uhttpd-mod-lua/description
+ The Lua plugin adds a CGI-like Lua runtime interface to uHTTPd.
+endef
+
+
+define Package/uhttpd-mod-ubus
+  $(Package/uhttpd/default)
+  TITLE+= (ubus plugin)
+  DEPENDS:=uhttpd +libubus +libblobmsg-json
+endef
+
+define Package/uhttpd-mod-ubus/description
+ The ubus plugin adds a HTTP/JSON RPC proxy for ubus and publishes the
+ session.* namespace and procedures.
+endef
+
+define Package/uhttpd/conffiles
+/etc/config/uhttpd
+/etc/uhttpd.crt
+/etc/uhttpd.key
+endef
+
+TARGET_LDFLAGS += -lcrypt
+
+CMAKE_OPTIONS = -DTLS_SUPPORT=on
+
+define Package/uhttpd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/uhttpd.init $(1)/etc/init.d/uhttpd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/uhttpd.config $(1)/etc/config/uhttpd
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd $(1)/usr/sbin/uhttpd
+endef
+
+define Package/uhttpd-mod-tls/install
+	true
+endef
+
+define Package/uhttpd-mod-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_lua.so $(1)/usr/lib/
+endef
+
+define Package/uhttpd-mod-ubus/install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ubus.so $(1)/usr/lib/
+	$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
+endef
+
+
+$(eval $(call BuildPackage,uhttpd))
+$(eval $(call BuildPackage,uhttpd-mod-tls))
+$(eval $(call BuildPackage,uhttpd-mod-lua))
+$(eval $(call BuildPackage,uhttpd-mod-ubus))
diff --git a/trunk/package/network/services/uhttpd/files/ubus.default b/trunk/package/network/services/uhttpd/files/ubus.default
new file mode 100644
index 00000000..397456db
--- /dev/null
+++ b/trunk/package/network/services/uhttpd/files/ubus.default
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then
+	uci set uhttpd.main.ubus_prefix=/ubus
+	uci commit uhttpd
+fi
diff --git a/trunk/package/network/services/uhttpd/files/uhttpd.config b/trunk/package/network/services/uhttpd/files/uhttpd.config
new file mode 100644
index 00000000..1ea2fa30
--- /dev/null
+++ b/trunk/package/network/services/uhttpd/files/uhttpd.config
@@ -0,0 +1,119 @@
+# Server configuration
+config uhttpd main
+
+	# HTTP listen addresses, multiple allowed
+	list listen_http	0.0.0.0:80
+	list listen_http	[::]:80
+
+	# HTTPS listen addresses, multiple allowed
+	list listen_https	0.0.0.0:443
+	list listen_https	[::]:443
+
+	# Server document root
+	option home		/www
+
+	# Reject requests from RFC1918 IP addresses
+	# directed to the servers public IP(s).
+	# This is a DNS rebinding countermeasure.
+	option rfc1918_filter 1
+
+	# Maximum number of concurrent requests.
+	# If this number is exceeded, further requests are
+	# queued until the number of running requests drops
+	# below the limit again.
+	option max_requests 3
+
+	# Maximum number of concurrent connections.
+	# If this number is exceeded, further TCP connection
+	# attempts are queued until the number of active
+	# connections drops below the limit again.
+	option max_connections 100
+
+	# Certificate and private key for HTTPS.
+	# If no listen_https addresses are given,
+	# the key options are ignored.
+	option cert		/etc/uhttpd.crt
+	option key		/etc/uhttpd.key
+
+	# CGI url prefix, will be searched in docroot.
+	# Default is /cgi-bin
+	option cgi_prefix	/cgi-bin
+
+	# List of extension->interpreter mappings.
+	# Files with an associated interpreter can
+	# be called outside of the CGI prefix and do
+	# not need to be executable.
+#	list interpreter	".php=/usr/bin/php-cgi"
+#	list interpreter	".cgi=/usr/bin/perl"
+
+	# Lua url prefix and handler script.
+	# Lua support is disabled if no prefix given.
+#	option lua_prefix	/luci
+#	option lua_handler	/usr/lib/lua/luci/sgi/uhttpd.lua
+
+	# Specify the ubus-rpc prefix and socket path.
+#	option ubus_prefix	/ubus
+#	option ubus_socket	/var/run/ubus.sock
+
+	# CGI/Lua timeout, if the called script does not
+	# write data within the given amount of seconds,
+	# the server will terminate the request with
+	# 504 Gateway Timeout response.
+	option script_timeout	60
+
+	# Network timeout, if the current connection is
+	# blocked for the specified amount of seconds,
+	# the server will terminate the associated
+	# request process.
+	option network_timeout	30
+
+	# HTTP Keep-Alive, specifies the timeout for persistent
+	# HTTP/1.1 connections. Setting this to 0 will disable
+	# persistent HTTP connections.
+	option http_keepalive	20
+
+	# TCP Keep-Alive, send periodic keep-alive probes
+	# over established connections to detect dead peers.
+	# The value is given in seconds to specify the
+	# interval between subsequent probes.
+	# Setting this to 0 will disable TCP keep-alive.
+	option tcp_keepalive	1
+
+	# Basic auth realm, defaults to local hostname
+#	option realm	libreCMC
+
+	# Configuration file in busybox httpd format
+#	option config	/etc/httpd.conf
+
+	# Do not follow symlinks that point outside of the
+	# home directory.
+#	option no_symlinks	0
+
+	# Do not produce directory listings but send 403
+	# instead if a client requests an url pointing to
+	# a directory without any index file.
+#	option no_dirlists	0
+
+	# Do not authenticate any ubus-rpc requests against
+	# the ubus session/access procedure.
+	# This is dangerous and should be always left off
+	# except for development and debug purposes!
+#	option no_ubusauth	0
+
+
+# Certificate defaults for px5g key generator
+config cert px5g
+
+	# Validity time
+	option days		730
+
+	# RSA key size
+	option bits		1024
+
+	# Location
+	option country		DE
+	option state		Berlin
+	option location		Berlin
+
+	# Common name
+	option commonname	libreCMC
diff --git a/trunk/package/network/services/uhttpd/files/uhttpd.init b/trunk/package/network/services/uhttpd/files/uhttpd.init
new file mode 100755
index 00000000..191b6b11
--- /dev/null
+++ b/trunk/package/network/services/uhttpd/files/uhttpd.init
@@ -0,0 +1,143 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2010 Jo-Philipp Wich
+
+START=50
+
+USE_PROCD=1
+
+UHTTPD_BIN="/usr/sbin/uhttpd"
+PX5G_BIN="/usr/sbin/px5g"
+
+append_arg() {
+	local cfg="$1"
+	local var="$2"
+	local opt="$3"
+	local def="$4"
+	local val
+
+	config_get val "$cfg" "$var"
+	[ -n "$val" -o -n "$def" ] && procd_append_param command "$opt" "${val:-$def}"
+}
+
+append_bool() {
+	local cfg="$1"
+	local var="$2"
+	local opt="$3"
+	local def="$4"
+	local val
+
+	config_get_bool val "$cfg" "$var" "$def"
+	[ "$val" = 1 ] && procd_append_param command "$opt"
+}
+
+generate_keys() {
+	local cfg="$1"
+	local key="$2"
+	local crt="$3"
+	local days bits country state location commonname
+
+	config_get days       "$cfg" days
+	config_get bits       "$cfg" bits
+	config_get country    "$cfg" country
+	config_get state      "$cfg" state
+	config_get location   "$cfg" location
+	config_get commonname "$cfg" commonname
+
+	[ -x "$PX5G_BIN" ] && {
+		$PX5G_BIN selfsigned -der \
+			-days ${days:-730} -newkey rsa:${bits:-1024} -keyout "$UHTTPD_KEY" -out "$UHTTPD_CERT" \
+			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/CN="${commonname:-libreCMC}"
+	}
+}
+
+start_instance()
+{
+	UHTTPD_CERT=""
+	UHTTPD_KEY=""
+
+	local cfg="$1"
+	local realm="$(uci_get system.@system[0].hostname)"
+	local listen http https interpreter indexes path handler
+
+	procd_open_instance
+	procd_set_param respawn
+	procd_set_param command "$UHTTPD_BIN" -f
+
+	append_arg "$cfg" home "-h"
+	append_arg "$cfg" realm "-r" "${realm:-libreCMC}"
+	append_arg "$cfg" config "-c"
+	append_arg "$cfg" cgi_prefix "-x"
+	[ -f /usr/lib/uhttpd_lua.so ] && {
+		config_get handler "$cfg" lua_handler
+		[ -f "$handler" ] && append_arg "$cfg" lua_prefix "-l" && {
+			procd_append_param command "-L" "$handler"
+		}
+	}
+	[ -f /usr/lib/uhttpd_ubus.so ] && {
+		append_arg "$cfg" ubus_prefix "-u"
+		append_arg "$cfg" ubus_socket "-U"
+	}
+	append_arg "$cfg" script_timeout "-t"
+	append_arg "$cfg" network_timeout "-T"
+	append_arg "$cfg" http_keepalive "-k"
+	append_arg "$cfg" tcp_keepalive "-A"
+	append_arg "$cfg" error_page "-E"
+	append_arg "$cfg" max_requests "-n" 3
+	append_arg "$cfg" max_connections "-N"
+
+	append_bool "$cfg" no_ubusauth "-a" 0
+	append_bool "$cfg" no_symlinks "-S" 0
+	append_bool "$cfg" no_dirlists "-D" 0
+	append_bool "$cfg" rfc1918_filter "-R" 0
+
+	config_get http "$cfg" listen_http
+	for listen in $http; do
+		 procd_append_param command -p "$listen"
+	done
+
+	config_get interpreter "$cfg" interpreter
+	for path in $interpreter; do
+		procd_append_param command -i "$path"
+	done
+
+	config_get indexes "$cfg" index_page
+	for path in $indexes; do
+		procd_append_param command -I "$path"
+	done
+
+	config_get https "$cfg" listen_https
+	config_get UHTTPD_KEY  "$cfg" key  /etc/uhttpd.key
+	config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt
+
+	[ -f /lib/libustream-ssl.so ] && [ -n "$https" ] && {
+		[ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || {
+			config_foreach generate_keys cert
+		}
+
+		[ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] && {
+			append_arg "$cfg" cert "-C"
+			append_arg "$cfg" key  "-K"
+
+			for listen in $https; do
+				procd_append_param command -s "$listen"
+			done
+		}
+	}
+
+	procd_close_instance
+
+	# Check if daemon is running, if not then
+	# re-execute in foreground to display error.
+#	sleep 1 && service_check $UHTTPD_BIN || \
+#		$UHTTPD_BIN -f $UHTTPD_ARGS
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "uhttpd"
+}
+
+start_service() {
+	config_load uhttpd
+	config_foreach start_instance uhttpd
+}
diff --git a/trunk/package/network/utils/arptables/Makefile b/trunk/package/network/utils/arptables/Makefile
new file mode 100644
index 00000000..62681dcd
--- /dev/null
+++ b/trunk/package/network/utils/arptables/Makefile
@@ -0,0 +1,43 @@
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=arptables
+PKG_VERSION:=0.0.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/ebtables
+PKG_MD5SUM:=c2e99c3aa9d78c9dfa30710ca3168182
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/arptables
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  TITLE:=ARP firewalling software
+  DEPENDS:=+kmod-arptables
+  URL:=http://ebtables.sourceforge.net
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		COPT_FLAGS="$(TARGET_CFLAGS)" \
+		KERNEL_DIR="./include/linux"
+endef
+
+define Package/arptables/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,arptables))
diff --git a/trunk/package/network/utils/arptables/patches/100-always_optimize.patch b/trunk/package/network/utils/arptables/patches/100-always_optimize.patch
new file mode 100644
index 00000000..b120eb78
--- /dev/null
+++ b/trunk/package/network/utils/arptables/patches/100-always_optimize.patch
@@ -0,0 +1,19 @@
+Index: arptables-v0.0.3-4/libarptc/libarptc_incl.c
+===================================================================
+--- arptables-v0.0.3-4.orig/libarptc/libarptc_incl.c	2010-03-08 16:49:28.000000000 +0100
++++ arptables-v0.0.3-4/libarptc/libarptc_incl.c	2012-08-14 12:10:29.527945144 +0200
+@@ -11,14 +11,6 @@
+ /* (C)1999 Paul ``Rusty'' Russell - Placed under the GNU GPL (See
+    COPYING for details). */
+ 
+-#ifndef __OPTIMIZE__
+-STRUCT_ENTRY_TARGET *
+-GET_TARGET(STRUCT_ENTRY *e)
+-{
+-	return (void *)e + e->target_offset;
+-}
+-#endif
+-
+ static int sockfd = -1;
+ static void *arptc_fn = NULL;
+ 
diff --git a/trunk/package/network/utils/comgt/Makefile b/trunk/package/network/utils/comgt/Makefile
new file mode 100644
index 00000000..9ab2f14e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/Makefile
@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=comgt
+PKG_VERSION:=0.32
+PKG_RELEASE:=24
+
+PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=@SF/comgt
+PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
+PKG_CHECK_FORMAT_SECURITY:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/comgt/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+endef
+
+define Package/comgt
+$(call Package/comgt/Default)
+  TITLE:=Option/Vodafone 3G/GPRS control tool
+  DEPENDS:=+chat
+  URL:=http://www.pharscape.org/comgt.html
+endef
+
+define Package/comgt-directip
+$(call Package/comgt/Default)
+  TITLE:=Sierra Wireless Direct-IP support
+  DEPENDS:=+comgt +kmod-usb-serial +kmod-usb-serial-sierrawireless +kmod-usb-net +kmod-usb-net-sierrawireless
+endef
+
+define Package/comgt-ncm
+$(call Package/comgt/Default)
+  TITLE+=NCM 3G/4G Support
+  DEPENDS:=+comgt +kmod-usb-serial +kmod-usb-serial-option +kmod-usb-net +kmod-usb-net-cdc-ncm +kmod-usb-net-huawei-cdc-ncm
+endef
+
+define Package/comgt/description
+ comgt is a scripting language interpreter useful for establishing 
+ communications on serial lines and through PCMCIA modems as well as GPRS 
+ and 3G datacards.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="" \
+		comgt
+endef
+
+define Package/comgt/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/comgt $(1)/usr/bin/
+	ln -s comgt $(1)/usr/bin/gcom
+	$(INSTALL_DIR) $(1)/etc/chatscripts
+	$(INSTALL_DATA) ./files/3g.chat $(1)/etc/chatscripts/3g.chat
+	$(INSTALL_DATA) ./files/evdo.chat $(1)/etc/chatscripts/evdo.chat
+	$(INSTALL_DIR) $(1)/etc/gcom
+	$(INSTALL_DATA) ./files/setpin.gcom $(1)/etc/gcom/setpin.gcom
+	$(INSTALL_DATA) ./files/setmode.gcom $(1)/etc/gcom/setmode.gcom
+	$(INSTALL_DATA) ./files/getcardinfo.gcom $(1)/etc/gcom/getcardinfo.gcom
+	$(INSTALL_DATA) ./files/getstrength.gcom $(1)/etc/gcom/getstrength.gcom
+	$(INSTALL_DATA) ./files/getcarrier.gcom $(1)/etc/gcom/getcarrier.gcom
+	$(INSTALL_DATA) ./files/getcnum.gcom $(1)/etc/gcom/getcnum.gcom
+	$(INSTALL_DATA) ./files/getimsi.gcom $(1)/etc/gcom/getimsi.gcom
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/tty
+	$(INSTALL_DATA) ./files/3g.usb $(1)/etc/hotplug.d/tty/30-3g
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/3g.sh $(1)/lib/netifd/proto/3g.sh
+	$(INSTALL_BIN) ./files/directip.sh $(1)/lib/netifd/proto/directip.sh
+	$(INSTALL_DIR) $(1)/lib/network/wwan/
+	$(INSTALL_DATA) ./files/data/* $(1)/lib/network/wwan/
+endef
+
+define Package/comgt-directip/install
+	$(INSTALL_DIR) $(1)/etc/gcom
+	$(INSTALL_DATA) ./files/directip.gcom $(1)/etc/gcom/directip.gcom
+	$(INSTALL_DATA) ./files/directip-stop.gcom $(1)/etc/gcom/directip-stop.gcom
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/directip.sh $(1)/lib/netifd/proto/directip.sh
+endef
+
+define Package/comgt-ncm/install
+	$(INSTALL_DIR) $(1)/etc/gcom
+	$(INSTALL_DATA) ./files/ncm.json $(1)/etc/gcom/ncm.json
+	$(INSTALL_DATA) ./files/runcommand.gcom $(1)/etc/gcom/runcommand.gcom
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) ./files/ncm.sh $(1)/lib/netifd/proto/ncm.sh
+endef
+
+$(eval $(call BuildPackage,comgt))
+$(eval $(call BuildPackage,comgt-directip))
+$(eval $(call BuildPackage,comgt-ncm))
diff --git a/trunk/package/network/utils/comgt/files/3g.chat b/trunk/package/network/utils/comgt/files/3g.chat
new file mode 100644
index 00000000..66562400
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/3g.chat
@@ -0,0 +1,12 @@
+ABORT   BUSY
+ABORT   'NO CARRIER'
+ABORT   ERROR
+REPORT  CONNECT
+TIMEOUT 10
+""      "AT&F"
+OK      "ATE1"
+OK      'AT+CGDCONT=1,"IP","$USE_APN"'
+SAY     "Calling UMTS/GPRS"
+TIMEOUT 30
+OK      "ATD$DIALNUMBER"
+CONNECT ' '
diff --git a/trunk/package/network/utils/comgt/files/3g.sh b/trunk/package/network/utils/comgt/files/3g.sh
new file mode 100644
index 00000000..96866267
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/3g.sh
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+[ -n "$INCLUDE_ONLY" ] || {
+	NOT_INCLUDED=1
+	INCLUDE_ONLY=1
+
+	. ../netifd-proto.sh
+	. ./ppp.sh
+	init_proto "$@"
+}
+
+proto_3g_init_config() {
+	no_device=1
+	available=1
+	ppp_generic_init_config
+	proto_config_add_string "device:device"
+	proto_config_add_string "apn"
+	proto_config_add_string "service"
+	proto_config_add_string "pincode"
+	proto_config_add_string "dialnumber"
+}
+
+proto_3g_setup() {
+	local interface="$1"
+	local chat
+
+	json_get_var device device
+	json_get_var apn apn
+	json_get_var service service
+	json_get_var pincode pincode
+	json_get_var dialnumber dialnumber
+
+	[ -n "$dat_device" ] && device=$dat_device
+	[ -e "$device" ] || {
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	case "$service" in
+		cdma|evdo)
+			chat="/etc/chatscripts/evdo.chat"
+		;;
+		*)
+			chat="/etc/chatscripts/3g.chat"
+			cardinfo=$(gcom -d "$device" -s /etc/gcom/getcardinfo.gcom)
+			if echo "$cardinfo" | grep -q Novatel; then
+				case "$service" in
+					umts_only) CODE=2;;
+					gprs_only) CODE=1;;
+					*) CODE=0;;
+				esac
+				export MODE="AT\$NWRAT=${CODE},2"
+			elif echo "$cardinfo" | grep -q Option; then
+				case "$service" in
+					umts_only) CODE=1;;
+					gprs_only) CODE=0;;
+					*) CODE=3;;
+				esac
+				export MODE="AT_OPSYS=${CODE}"
+			elif echo "$cardinfo" | grep -q "Sierra Wireless"; then
+				SIERRA=1
+			elif echo "$cardinfo" | grep -qi huawei; then
+				case "$service" in
+					umts_only) CODE="14,2";;
+					gprs_only) CODE="13,1";;
+					*) CODE="2,2";;
+				esac
+				export MODE="AT^SYSCFG=${CODE},3FFFFFFF,2,4"
+			fi
+
+			if [ -n "$pincode" ]; then
+				PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || {
+					proto_notify_error "$interface" PIN_FAILED
+					proto_block_restart "$interface"
+					return 1
+				}
+			fi
+			[ -n "$MODE" ] && gcom -d "$device" -s /etc/gcom/setmode.gcom
+
+			# wait for carrier to avoid firmware stability bugs
+			[ -n "$SIERRA" ] && {
+				gcom -d "$device" -s /etc/gcom/getcarrier.gcom || return 1
+			}
+
+			if [ -z "$dialnumber" ]; then
+				dialnumber="*99***1#"
+			fi
+
+		;;
+	esac
+
+	connect="${apn:+USE_APN=$apn }DIALNUMBER=$dialnumber /usr/sbin/chat -t5 -v -E -f $chat"
+	ppp_generic_setup "$interface" \
+		noaccomp \
+		nopcomp \
+		novj \
+		nobsdcomp \
+		noauth \
+		lock \
+		crtscts \
+		115200 "$device"
+	return 0
+}
+
+proto_3g_teardown() {
+	proto_kill_command "$interface"
+}
+
+[ -z "NOT_INCLUDED" ] || add_protocol 3g
diff --git a/trunk/package/network/utils/comgt/files/3g.usb b/trunk/package/network/utils/comgt/files/3g.usb
new file mode 100644
index 00000000..ac8326b7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/3g.usb
@@ -0,0 +1,33 @@
+#!/bin/sh
+. /lib/functions.sh
+. /lib/netifd/netifd-proto.sh
+
+find_3g_iface() {
+	local cfg="$1"
+	local tty="$2"
+
+	local proto
+	config_get proto "$cfg" proto
+	[ "$proto" = 3g ] || [ "$proto" = ncm ] || return 0
+
+	# bypass state vars here because 00-netstate could clobber .device
+	local dev=$(uci_get network "$cfg" device)
+
+	if [ "${dev##*/}" = "${tty##*/}" ]; then
+		if [ "$ACTION" = add ]; then
+			available=1
+		else
+			available=0
+		fi
+		proto_set_available "$cfg" $available
+	fi
+}
+
+case "$DEVICENAME" in
+	tty*)
+		[ -e "/dev/$DEVICENAME" ] || [ "$ACTION" = remove ] || exit 0
+		config_load network
+		config_foreach find_3g_iface interface "/dev/$DEVICENAME"
+	;;
+esac
+
diff --git a/trunk/package/network/utils/comgt/files/data/0421:03a7 b/trunk/package/network/utils/comgt/files/data/0421:03a7
new file mode 100644
index 00000000..13134013
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:03a7
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia C5-00 Mobile phone",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:060d b/trunk/package/network/utils/comgt/files/data/0421:060d
new file mode 100644
index 00000000..a9ad650d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:060d
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-10",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:060e b/trunk/package/network/utils/comgt/files/data/0421:060e
new file mode 100644
index 00000000..a9ad650d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:060e
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-10",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:0612 b/trunk/package/network/utils/comgt/files/data/0421:0612
new file mode 100644
index 00000000..bc3e780b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:0612
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-15/CS-18",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:0619 b/trunk/package/network/utils/comgt/files/data/0421:0619
new file mode 100644
index 00000000..52fbf584
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:0619
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-12",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:061e b/trunk/package/network/utils/comgt/files/data/0421:061e
new file mode 100644
index 00000000..c1cb9f44
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:061e
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-11",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:0623 b/trunk/package/network/utils/comgt/files/data/0421:0623
new file mode 100644
index 00000000..f6674bac
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:0623
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-17",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:0629 b/trunk/package/network/utils/comgt/files/data/0421:0629
new file mode 100644
index 00000000..b637c344
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:0629
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-18",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:062d b/trunk/package/network/utils/comgt/files/data/0421:062d
new file mode 100644
index 00000000..a95192b8
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:062d
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-19",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:062f b/trunk/package/network/utils/comgt/files/data/0421:062f
new file mode 100644
index 00000000..a95192b8
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:062f
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-19",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0421:0638 b/trunk/package/network/utils/comgt/files/data/0421:0638
new file mode 100644
index 00000000..5fa7d498
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0421:0638
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia 21M-02",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/05c6:0016 b/trunk/package/network/utils/comgt/files/data/05c6:0016
new file mode 100644
index 00000000..1a4a796b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/05c6:0016
@@ -0,0 +1,6 @@
+{
+	"desc": "iBall 3.5G Connect",
+	"control": 2,
+	"data": 2
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/05c6:0023 b/trunk/package/network/utils/comgt/files/data/05c6:0023
new file mode 100644
index 00000000..ce288ed4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/05c6:0023
@@ -0,0 +1,5 @@
+{
+	"desc": "Leoxsys LN-72V",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/05c6:00a0 b/trunk/package/network/utils/comgt/files/data/05c6:00a0
new file mode 100644
index 00000000..0b961602
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/05c6:00a0
@@ -0,0 +1,6 @@
+{
+	"desc": "Axesstel MV241",
+	"control": 2,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/05c6:6000 b/trunk/package/network/utils/comgt/files/data/05c6:6000
new file mode 100644
index 00000000..e8863b9e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/05c6:6000
@@ -0,0 +1,5 @@
+{
+	"desc": "Siemens SG75",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/05c6:9000 b/trunk/package/network/utils/comgt/files/data/05c6:9000
new file mode 100644
index 00000000..6a72f4ff
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/05c6:9000
@@ -0,0 +1,5 @@
+{
+	"desc": "Generic Qualcomm",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/07d1:3e01 b/trunk/package/network/utils/comgt/files/data/07d1:3e01
new file mode 100644
index 00000000..b1da1770
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/07d1:3e01
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-152",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/07d1:3e02 b/trunk/package/network/utils/comgt/files/data/07d1:3e02
new file mode 100644
index 00000000..cd1eceed
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/07d1:3e02
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/07d1:7e11 b/trunk/package/network/utils/comgt/files/data/07d1:7e11
new file mode 100644
index 00000000..84705b75
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/07d1:7e11
@@ -0,0 +1,6 @@
+{
+	"desc": "D-Link DWM-156",
+	"control": 1,
+	"data": 2
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0af0:4005 b/trunk/package/network/utils/comgt/files/data/0af0:4005
new file mode 100644
index 00000000..5ab6c127
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0af0:4005
@@ -0,0 +1,4 @@
+{
+	"desc": "Option GIO711",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0af0:6901 b/trunk/package/network/utils/comgt/files/data/0af0:6901
new file mode 100644
index 00000000..06b26643
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0af0:6901
@@ -0,0 +1,5 @@
+{
+	"desc": "Option GI0201",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/0af0:7201 b/trunk/package/network/utils/comgt/files/data/0af0:7201
new file mode 100644
index 00000000..20b18b76
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0af0:7201
@@ -0,0 +1,5 @@
+{
+	"desc": "Option GTM380",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/0af0:8120 b/trunk/package/network/utils/comgt/files/data/0af0:8120
new file mode 100644
index 00000000..c378e7fa
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0af0:8120
@@ -0,0 +1,4 @@
+{
+	"desc": "Option GTM681W",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0af0:9200 b/trunk/package/network/utils/comgt/files/data/0af0:9200
new file mode 100644
index 00000000..7e55a366
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0af0:9200
@@ -0,0 +1,5 @@
+{
+	"desc": "Option GTM671WFS",
+	"control": 2,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c000 b/trunk/package/network/utils/comgt/files/data/0b3c:c000
new file mode 100644
index 00000000..b45bbf41
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c000
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 100",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c001 b/trunk/package/network/utils/comgt/files/data/0b3c:c001
new file mode 100644
index 00000000..74a03346
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c001
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 120",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c002 b/trunk/package/network/utils/comgt/files/data/0b3c:c002
new file mode 100644
index 00000000..ed4f2fd3
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c002
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 140",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c003 b/trunk/package/network/utils/comgt/files/data/0b3c:c003
new file mode 100644
index 00000000..5b4ea480
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c003
@@ -0,0 +1,5 @@
+{
+	"desc": "Olivetti Olicard 145",
+	"control": 0,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c004 b/trunk/package/network/utils/comgt/files/data/0b3c:c004
new file mode 100644
index 00000000..d8193790
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c004
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 155",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c005 b/trunk/package/network/utils/comgt/files/data/0b3c:c005
new file mode 100644
index 00000000..f3768c6d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c005
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 200",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c00a b/trunk/package/network/utils/comgt/files/data/0b3c:c00a
new file mode 100644
index 00000000..a2ba14ab
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c00a
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 160",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0b3c:c00b b/trunk/package/network/utils/comgt/files/data/0b3c:c00b
new file mode 100644
index 00000000..1c6edb1f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0b3c:c00b
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 500",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0bdb:1900 b/trunk/package/network/utils/comgt/files/data/0bdb:1900
new file mode 100644
index 00000000..84a9a9b7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0bdb:1900
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3507g",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0bdb:1902 b/trunk/package/network/utils/comgt/files/data/0bdb:1902
new file mode 100644
index 00000000..84a9a9b7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0bdb:1902
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3507g",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0bdb:190a b/trunk/package/network/utils/comgt/files/data/0bdb:190a
new file mode 100644
index 00000000..2e826130
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0bdb:190a
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3307",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0bdb:190d b/trunk/package/network/utils/comgt/files/data/0bdb:190d
new file mode 100644
index 00000000..2f725eb7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0bdb:190d
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F5521gw",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0bdb:1910 b/trunk/package/network/utils/comgt/files/data/0bdb:1910
new file mode 100644
index 00000000..2f725eb7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0bdb:1910
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F5521gw",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0c88:17da b/trunk/package/network/utils/comgt/files/data/0c88:17da
new file mode 100644
index 00000000..d5ca787a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0c88:17da
@@ -0,0 +1,5 @@
+{
+	"desc": "Kyocera KPC650",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/0c88:180a b/trunk/package/network/utils/comgt/files/data/0c88:180a
new file mode 100644
index 00000000..a2bee34e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0c88:180a
@@ -0,0 +1,5 @@
+{
+	"desc": "Kyocera KPC680",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/0f3d:68a2 b/trunk/package/network/utils/comgt/files/data/0f3d:68a2
new file mode 100644
index 00000000..f85a049c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0f3d:68a2
@@ -0,0 +1,4 @@
+{
+	"desc": "Sierra MC7700",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/0f3d:68aa b/trunk/package/network/utils/comgt/files/data/0f3d:68aa
new file mode 100644
index 00000000..3a68c206
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/0f3d:68aa
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra Wireless AC313U/320U/330U Direct IP",
+	"control": 3,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1004:6124 b/trunk/package/network/utils/comgt/files/data/1004:6124
new file mode 100644
index 00000000..471d8a5c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1004:6124
@@ -0,0 +1,6 @@
+{
+	"desc": "LG L-05A",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1004:6141 b/trunk/package/network/utils/comgt/files/data/1004:6141
new file mode 100644
index 00000000..840dc64c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1004:6141
@@ -0,0 +1,6 @@
+{
+	"desc": "LG LUU-2100TI",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1004:6157 b/trunk/package/network/utils/comgt/files/data/1004:6157
new file mode 100644
index 00000000..ec949566
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1004:6157
@@ -0,0 +1,6 @@
+{
+	"desc": "LG LUU-2110TI",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1004:618f b/trunk/package/network/utils/comgt/files/data/1004:618f
new file mode 100644
index 00000000..df98b66b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1004:618f
@@ -0,0 +1,5 @@
+{
+	"desc": "LG L-02C",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/106c:3711 b/trunk/package/network/utils/comgt/files/data/106c:3711
new file mode 100644
index 00000000..4d22d4da
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/106c:3711
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-150",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/106c:3714 b/trunk/package/network/utils/comgt/files/data/106c:3714
new file mode 100644
index 00000000..5fa2a3a6
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/106c:3714
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-175",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/106c:3715 b/trunk/package/network/utils/comgt/files/data/106c:3715
new file mode 100644
index 00000000..8cbe23da
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/106c:3715
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-175AL",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/106c:3716 b/trunk/package/network/utils/comgt/files/data/106c:3716
new file mode 100644
index 00000000..18bd074f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/106c:3716
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-190",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/106c:3717 b/trunk/package/network/utils/comgt/files/data/106c:3717
new file mode 100644
index 00000000..e028a4b4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/106c:3717
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-185C/UM185E",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/106c:3718 b/trunk/package/network/utils/comgt/files/data/106c:3718
new file mode 100644
index 00000000..362f482b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/106c:3718
@@ -0,0 +1,4 @@
+{
+	"desc": "PANTECH UML-290 4G Modem",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/106c:3721 b/trunk/package/network/utils/comgt/files/data/106c:3721
new file mode 100644
index 00000000..ac61a082
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/106c:3721
@@ -0,0 +1,4 @@
+{
+	"desc": "PANTECH P4200 4G Modem",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0017 b/trunk/package/network/utils/comgt/files/data/1199:0017
new file mode 100644
index 00000000..a50654d7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0017
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra EM5625",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0018 b/trunk/package/network/utils/comgt/files/data/1199:0018
new file mode 100644
index 00000000..02d7494a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0018
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5720",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0019 b/trunk/package/network/utils/comgt/files/data/1199:0019
new file mode 100644
index 00000000..4d6d4a9d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0019
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC595U",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0020 b/trunk/package/network/utils/comgt/files/data/1199:0020
new file mode 100644
index 00000000..3482db4d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0020
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5725",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0021 b/trunk/package/network/utils/comgt/files/data/1199:0021
new file mode 100644
index 00000000..226c1b44
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0021
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC597E",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0022 b/trunk/package/network/utils/comgt/files/data/1199:0022
new file mode 100644
index 00000000..dd089a37
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0022
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra EM5725",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0023 b/trunk/package/network/utils/comgt/files/data/1199:0023
new file mode 100644
index 00000000..9c7e72b9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0023
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC597",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0024 b/trunk/package/network/utils/comgt/files/data/1199:0024
new file mode 100644
index 00000000..425d4ccc
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0024
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5727 CDMA",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0025 b/trunk/package/network/utils/comgt/files/data/1199:0025
new file mode 100644
index 00000000..002d6fb1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0025
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC598",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0026 b/trunk/package/network/utils/comgt/files/data/1199:0026
new file mode 100644
index 00000000..13998dee
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0026
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra T11",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0027 b/trunk/package/network/utils/comgt/files/data/1199:0027
new file mode 100644
index 00000000..af4824c9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0027
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC402",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0028 b/trunk/package/network/utils/comgt/files/data/1199:0028
new file mode 100644
index 00000000..34c896e4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0028
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5728",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0112 b/trunk/package/network/utils/comgt/files/data/1199:0112
new file mode 100644
index 00000000..083baeea
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0112
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra CDMA 1xEVDO PC Card, AC580",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0120 b/trunk/package/network/utils/comgt/files/data/1199:0120
new file mode 100644
index 00000000..4d6d4a9d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0120
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC595U",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0218 b/trunk/package/network/utils/comgt/files/data/1199:0218
new file mode 100644
index 00000000..02d7494a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0218
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5720",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0220 b/trunk/package/network/utils/comgt/files/data/1199:0220
new file mode 100644
index 00000000..3482db4d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0220
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5725",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0224 b/trunk/package/network/utils/comgt/files/data/1199:0224
new file mode 100644
index 00000000..a57e54a6
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0224
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5727",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:0301 b/trunk/package/network/utils/comgt/files/data/1199:0301
new file mode 100644
index 00000000..13fd7da9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:0301
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC250U",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6802 b/trunk/package/network/utils/comgt/files/data/1199:6802
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6802
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6803 b/trunk/package/network/utils/comgt/files/data/1199:6803
new file mode 100644
index 00000000..c694fa3e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6803
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8765",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6804 b/trunk/package/network/utils/comgt/files/data/1199:6804
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6804
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6805 b/trunk/package/network/utils/comgt/files/data/1199:6805
new file mode 100644
index 00000000..c694fa3e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6805
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8765",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6808 b/trunk/package/network/utils/comgt/files/data/1199:6808
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6808
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6809 b/trunk/package/network/utils/comgt/files/data/1199:6809
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6809
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6813 b/trunk/package/network/utils/comgt/files/data/1199:6813
new file mode 100644
index 00000000..f10c1044
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6813
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6815 b/trunk/package/network/utils/comgt/files/data/1199:6815
new file mode 100644
index 00000000..f10c1044
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6815
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6816 b/trunk/package/network/utils/comgt/files/data/1199:6816
new file mode 100644
index 00000000..f10c1044
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6816
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6820 b/trunk/package/network/utils/comgt/files/data/1199:6820
new file mode 100644
index 00000000..ce52c8f2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6820
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6821 b/trunk/package/network/utils/comgt/files/data/1199:6821
new file mode 100644
index 00000000..3ebd0be1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6821
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875U",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6822 b/trunk/package/network/utils/comgt/files/data/1199:6822
new file mode 100644
index 00000000..35ee919c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6822
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875E",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6833 b/trunk/package/network/utils/comgt/files/data/1199:6833
new file mode 100644
index 00000000..0fcd10e9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6833
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6834 b/trunk/package/network/utils/comgt/files/data/1199:6834
new file mode 100644
index 00000000..0b9eadf7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6834
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8780",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6835 b/trunk/package/network/utils/comgt/files/data/1199:6835
new file mode 100644
index 00000000..0fcd10e9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6835
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6838 b/trunk/package/network/utils/comgt/files/data/1199:6838
new file mode 100644
index 00000000..0b9eadf7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6838
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8780",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6839 b/trunk/package/network/utils/comgt/files/data/1199:6839
new file mode 100644
index 00000000..0fcd10e9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6839
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:683a b/trunk/package/network/utils/comgt/files/data/1199:683a
new file mode 100644
index 00000000..02da610c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:683a
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8785",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:683b b/trunk/package/network/utils/comgt/files/data/1199:683b
new file mode 100644
index 00000000..0f2a133c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:683b
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8785 Composite",
+	"control": 3,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6850 b/trunk/package/network/utils/comgt/files/data/1199:6850
new file mode 100644
index 00000000..1989d0ab
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6850
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6851 b/trunk/package/network/utils/comgt/files/data/1199:6851
new file mode 100644
index 00000000..16d8ab46
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6851
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC 881",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6852 b/trunk/package/network/utils/comgt/files/data/1199:6852
new file mode 100644
index 00000000..65be37b7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6852
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6853 b/trunk/package/network/utils/comgt/files/data/1199:6853
new file mode 100644
index 00000000..a8aee6d9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6853
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC881E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6855 b/trunk/package/network/utils/comgt/files/data/1199:6855
new file mode 100644
index 00000000..24eddc6f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6855
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880U",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6856 b/trunk/package/network/utils/comgt/files/data/1199:6856
new file mode 100644
index 00000000..415a80a1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6856
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra ATT USB Connect 881",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6859 b/trunk/package/network/utils/comgt/files/data/1199:6859
new file mode 100644
index 00000000..075cc6bc
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6859
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC885E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:685a b/trunk/package/network/utils/comgt/files/data/1199:685a
new file mode 100644
index 00000000..075cc6bc
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:685a
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC885E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6880 b/trunk/package/network/utils/comgt/files/data/1199:6880
new file mode 100644
index 00000000..e188c037
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6880
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C885",
+	"control": 3,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6890 b/trunk/package/network/utils/comgt/files/data/1199:6890
new file mode 100644
index 00000000..6d2f892a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6890
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C888",
+	"control": 3,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6891 b/trunk/package/network/utils/comgt/files/data/1199:6891
new file mode 100644
index 00000000..fa866e29
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6891
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C22 and C33",
+	"control": 3,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6892 b/trunk/package/network/utils/comgt/files/data/1199:6892
new file mode 100644
index 00000000..99a2bd2d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6892
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra Compass HSPA",
+	"control": 3,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:6893 b/trunk/package/network/utils/comgt/files/data/1199:6893
new file mode 100644
index 00000000..16f4dfda
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:6893
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C889",
+	"control": 3,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:68a2 b/trunk/package/network/utils/comgt/files/data/1199:68a2
new file mode 100644
index 00000000..ac1b1845
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:68a2
@@ -0,0 +1,4 @@
+{
+	"desc": "Sierra MC7710",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1199:68aa b/trunk/package/network/utils/comgt/files/data/1199:68aa
new file mode 100644
index 00000000..7c5a9f2b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1199:68aa
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC320U/AC330U Direct IP",
+	"control": 3,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1035 b/trunk/package/network/utils/comgt/files/data/12d1:1035
new file mode 100644
index 00000000..ad7025a1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1035
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI U8110",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1404 b/trunk/package/network/utils/comgt/files/data/12d1:1404
new file mode 100644
index 00000000..b186ad54
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1404
@@ -0,0 +1,4 @@
+{
+	"desc": "HUAWEI UMG1831",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1406 b/trunk/package/network/utils/comgt/files/data/12d1:1406
new file mode 100644
index 00000000..b1aa3178
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1406
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:140b b/trunk/package/network/utils/comgt/files/data/12d1:140b
new file mode 100644
index 00000000..cc99898a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:140b
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option EC1260 Wireless Data Modem HSD USB Card",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:140c b/trunk/package/network/utils/comgt/files/data/12d1:140c
new file mode 100644
index 00000000..148d1d1a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:140c
@@ -0,0 +1,4 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1412 b/trunk/package/network/utils/comgt/files/data/12d1:1412
new file mode 100644
index 00000000..e6fb6cc7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1412
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option EC168",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:141b b/trunk/package/network/utils/comgt/files/data/12d1:141b
new file mode 100644
index 00000000..b1aa3178
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:141b
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1433 b/trunk/package/network/utils/comgt/files/data/12d1:1433
new file mode 100644
index 00000000..c5d86cb1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1433
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option E1756C",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1436 b/trunk/package/network/utils/comgt/files/data/12d1:1436
new file mode 100644
index 00000000..7db8644b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1436
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option E1800",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1444 b/trunk/package/network/utils/comgt/files/data/12d1:1444
new file mode 100644
index 00000000..500d7751
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1444
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option E352-R1",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:144e b/trunk/package/network/utils/comgt/files/data/12d1:144e
new file mode 100644
index 00000000..a704946a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:144e
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3806",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1464 b/trunk/package/network/utils/comgt/files/data/12d1:1464
new file mode 100644
index 00000000..1b5397cd
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1464
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K4505",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1465 b/trunk/package/network/utils/comgt/files/data/12d1:1465
new file mode 100644
index 00000000..dbb20f7c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1465
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3765",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1491 b/trunk/package/network/utils/comgt/files/data/12d1:1491
new file mode 100644
index 00000000..c1ae9a56
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1491
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei R201",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14a5 b/trunk/package/network/utils/comgt/files/data/12d1:14a5
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14a5
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14a8 b/trunk/package/network/utils/comgt/files/data/12d1:14a8
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14a8
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14ac b/trunk/package/network/utils/comgt/files/data/12d1:14ac
new file mode 100644
index 00000000..148d1d1a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14ac
@@ -0,0 +1,4 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14ae b/trunk/package/network/utils/comgt/files/data/12d1:14ae
new file mode 100644
index 00000000..e27a798f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14ae
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3806",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14c6 b/trunk/package/network/utils/comgt/files/data/12d1:14c6
new file mode 100644
index 00000000..0cb4d8c1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14c6
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4605",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14c8 b/trunk/package/network/utils/comgt/files/data/12d1:14c8
new file mode 100644
index 00000000..958b1188
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14c8
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K5005",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14c9 b/trunk/package/network/utils/comgt/files/data/12d1:14c9
new file mode 100644
index 00000000..bc757918
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14c9
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K3770",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14ca b/trunk/package/network/utils/comgt/files/data/12d1:14ca
new file mode 100644
index 00000000..8155b4bf
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14ca
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K3771",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14cb b/trunk/package/network/utils/comgt/files/data/12d1:14cb
new file mode 100644
index 00000000..b496a60b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14cb
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K4510",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14cc b/trunk/package/network/utils/comgt/files/data/12d1:14cc
new file mode 100644
index 00000000..98488bd2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14cc
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4511",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14cf b/trunk/package/network/utils/comgt/files/data/12d1:14cf
new file mode 100644
index 00000000..18e1e1e3
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14cf
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3772",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:14d2 b/trunk/package/network/utils/comgt/files/data/12d1:14d2
new file mode 100644
index 00000000..414b8467
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:14d2
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E173/E177",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1506 b/trunk/package/network/utils/comgt/files/data/12d1:1506
new file mode 100644
index 00000000..65760e8f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1506
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E367/E398",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:150a b/trunk/package/network/utils/comgt/files/data/12d1:150a
new file mode 100644
index 00000000..45f191a3
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:150a
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E398",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:150c b/trunk/package/network/utils/comgt/files/data/12d1:150c
new file mode 100644
index 00000000..7ab4c499
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:150c
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E367",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:150f b/trunk/package/network/utils/comgt/files/data/12d1:150f
new file mode 100644
index 00000000..7ab4c499
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:150f
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E367",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:151b b/trunk/package/network/utils/comgt/files/data/12d1:151b
new file mode 100644
index 00000000..28e561c8
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:151b
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E392u-12",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:151d b/trunk/package/network/utils/comgt/files/data/12d1:151d
new file mode 100644
index 00000000..e5eae2a8
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:151d
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E3131",
+	"control": 3,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:156c b/trunk/package/network/utils/comgt/files/data/12d1:156c
new file mode 100644
index 00000000..3fc6b1b1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:156c
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E3276",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1576 b/trunk/package/network/utils/comgt/files/data/12d1:1576
new file mode 100644
index 00000000..1aeb021c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1576
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4201 composite",
+	"type": "mbim"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1577 b/trunk/package/network/utils/comgt/files/data/12d1:1577
new file mode 100644
index 00000000..46a12daf
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1577
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4202 composite",
+	"type": "mbim"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1578 b/trunk/package/network/utils/comgt/files/data/12d1:1578
new file mode 100644
index 00000000..6710d159
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1578
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4606 composite",
+	"type": "mbim"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1589 b/trunk/package/network/utils/comgt/files/data/12d1:1589
new file mode 100644
index 00000000..e2d35275
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1589
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E8278",
+	"type": "ncm"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c05 b/trunk/package/network/utils/comgt/files/data/12d1:1c05
new file mode 100644
index 00000000..c5612241
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c05
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173s",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c07 b/trunk/package/network/utils/comgt/files/data/12d1:1c07
new file mode 100644
index 00000000..cee72768
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c07
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E188",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c08 b/trunk/package/network/utils/comgt/files/data/12d1:1c08
new file mode 100644
index 00000000..4f6fb21f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c08
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173s",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c10 b/trunk/package/network/utils/comgt/files/data/12d1:1c10
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c10
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c12 b/trunk/package/network/utils/comgt/files/data/12d1:1c12
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c12
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c1e b/trunk/package/network/utils/comgt/files/data/12d1:1c1e
new file mode 100644
index 00000000..4622965a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c1e
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E586",
+	"type": "ncm"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c1f b/trunk/package/network/utils/comgt/files/data/12d1:1c1f
new file mode 100644
index 00000000..13cb40ff
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c1f
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E587",
+	"type": "ncm"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1c23 b/trunk/package/network/utils/comgt/files/data/12d1:1c23
new file mode 100644
index 00000000..d1043471
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1c23
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/12d1:1f16 b/trunk/package/network/utils/comgt/files/data/12d1:1f16
new file mode 100644
index 00000000..10d27cf5
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/12d1:1f16
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K5150 composite",
+	"mode": "mbim"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:1400 b/trunk/package/network/utils/comgt/files/data/1410:1400
new file mode 100644
index 00000000..e2bda967
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:1400
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel U730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:1410 b/trunk/package/network/utils/comgt/files/data/1410:1410
new file mode 100644
index 00000000..ba48aea9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:1410
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel U740",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:1420 b/trunk/package/network/utils/comgt/files/data/1410:1420
new file mode 100644
index 00000000..5cc96b69
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:1420
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel U870",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:1430 b/trunk/package/network/utils/comgt/files/data/1410:1430
new file mode 100644
index 00000000..012f3ad9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:1430
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel XU870",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:1450 b/trunk/package/network/utils/comgt/files/data/1410:1450
new file mode 100644
index 00000000..d1016773
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:1450
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel X950D",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:2100 b/trunk/package/network/utils/comgt/files/data/1410:2100
new file mode 100644
index 00000000..a0328cf9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:2100
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EV620",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:2110 b/trunk/package/network/utils/comgt/files/data/1410:2110
new file mode 100644
index 00000000..701bf424
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:2110
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel ES720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:2120 b/trunk/package/network/utils/comgt/files/data/1410:2120
new file mode 100644
index 00000000..7ab3c9d7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:2120
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel E725",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:2130 b/trunk/package/network/utils/comgt/files/data/1410:2130
new file mode 100644
index 00000000..98006e20
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:2130
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel ES620",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:2400 b/trunk/package/network/utils/comgt/files/data/1410:2400
new file mode 100644
index 00000000..cd9f2906
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:2400
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EU730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:2410 b/trunk/package/network/utils/comgt/files/data/1410:2410
new file mode 100644
index 00000000..4635063b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:2410
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EU740",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:2420 b/trunk/package/network/utils/comgt/files/data/1410:2420
new file mode 100644
index 00000000..340666c7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:2420
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EU870D",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:4100 b/trunk/package/network/utils/comgt/files/data/1410:4100
new file mode 100644
index 00000000..260a2891
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:4100
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MC727/U727",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:4400 b/trunk/package/network/utils/comgt/files/data/1410:4400
new file mode 100644
index 00000000..838a7fbf
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:4400
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel Ovation MC930D/MC950D",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:6000 b/trunk/package/network/utils/comgt/files/data/1410:6000
new file mode 100644
index 00000000..a12716e4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:6000
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB760",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:6001 b/trunk/package/network/utils/comgt/files/data/1410:6001
new file mode 100644
index 00000000..a12716e4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:6001
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB760",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:6002 b/trunk/package/network/utils/comgt/files/data/1410:6002
new file mode 100644
index 00000000..fce8e9bf
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:6002
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB760 3G",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:6010 b/trunk/package/network/utils/comgt/files/data/1410:6010
new file mode 100644
index 00000000..d08c399a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:6010
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MC780",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:7001 b/trunk/package/network/utils/comgt/files/data/1410:7001
new file mode 100644
index 00000000..079c7d52
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:7001
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MiFi 2372",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:7003 b/trunk/package/network/utils/comgt/files/data/1410:7003
new file mode 100644
index 00000000..079c7d52
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:7003
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MiFi 2372",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:7030 b/trunk/package/network/utils/comgt/files/data/1410:7030
new file mode 100644
index 00000000..0fc40290
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:7030
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB998",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:7031 b/trunk/package/network/utils/comgt/files/data/1410:7031
new file mode 100644
index 00000000..e1ba049c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:7031
@@ -0,0 +1,6 @@
+{
+	"desc": "Novatel USB679",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:7041 b/trunk/package/network/utils/comgt/files/data/1410:7041
new file mode 100644
index 00000000..03e8fcd5
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:7041
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MF3470",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:7042 b/trunk/package/network/utils/comgt/files/data/1410:7042
new file mode 100644
index 00000000..0bb9cdbd
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:7042
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel Ovation MC545/MC547",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:9011 b/trunk/package/network/utils/comgt/files/data/1410:9011
new file mode 100644
index 00000000..8247a97c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:9011
@@ -0,0 +1,4 @@
+{
+	"desc": "Novatel E371",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1410:b001 b/trunk/package/network/utils/comgt/files/data/1410:b001
new file mode 100644
index 00000000..3c13539a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1410:b001
@@ -0,0 +1,4 @@
+{
+	"desc": "Novatel MC551/USB551L",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1529:3100 b/trunk/package/network/utils/comgt/files/data/1529:3100
new file mode 100644
index 00000000..5e4fe34b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1529:3100
@@ -0,0 +1,6 @@
+{
+	"desc": "UBIQUAM U-100/105/200/300/520",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d5:6202 b/trunk/package/network/utils/comgt/files/data/16d5:6202
new file mode 100644
index 00000000..1ba8a502
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d5:6202
@@ -0,0 +1,5 @@
+{
+	"desc": "AnyData ADU-620UW",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/16d5:6501 b/trunk/package/network/utils/comgt/files/data/16d5:6501
new file mode 100644
index 00000000..09207df3
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d5:6501
@@ -0,0 +1,5 @@
+{
+	"desc": "AnyData ADU-300A",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/16d5:6502 b/trunk/package/network/utils/comgt/files/data/16d5:6502
new file mode 100644
index 00000000..4bdbf899
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d5:6502
@@ -0,0 +1,5 @@
+{
+	"desc": "AnyData ADU-500A",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/16d5:6603 b/trunk/package/network/utils/comgt/files/data/16d5:6603
new file mode 100644
index 00000000..5c108a2d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d5:6603
@@ -0,0 +1,6 @@
+{
+	"desc": "AnyData ADU-890WH",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d5:900d b/trunk/package/network/utils/comgt/files/data/16d5:900d
new file mode 100644
index 00000000..b1c48698
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d5:900d
@@ -0,0 +1,6 @@
+{
+	"desc": "AnyData ADU-890WH",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:5141 b/trunk/package/network/utils/comgt/files/data/16d8:5141
new file mode 100644
index 00000000..bda356fd
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:5141
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-510",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:5533 b/trunk/package/network/utils/comgt/files/data/16d8:5533
new file mode 100644
index 00000000..185d257d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:5533
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-550",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:5543 b/trunk/package/network/utils/comgt/files/data/16d8:5543
new file mode 100644
index 00000000..185d257d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:5543
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-550",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:5553 b/trunk/package/network/utils/comgt/files/data/16d8:5553
new file mode 100644
index 00000000..2403381d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:5553
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CDU-550",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6002 b/trunk/package/network/utils/comgt/files/data/16d8:6002
new file mode 100644
index 00000000..715878c4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6002
@@ -0,0 +1,5 @@
+{
+	"desc": "Franklin U300",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6006 b/trunk/package/network/utils/comgt/files/data/16d8:6006
new file mode 100644
index 00000000..bb8f87e0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6006
@@ -0,0 +1,5 @@
+{
+	"desc": "Cmotech CGU-628",
+	"control": 0,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6007 b/trunk/package/network/utils/comgt/files/data/16d8:6007
new file mode 100644
index 00000000..a0ed8bce
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6007
@@ -0,0 +1,4 @@
+{
+	"desc": "Cmotech CHE-628S",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6008 b/trunk/package/network/utils/comgt/files/data/16d8:6008
new file mode 100644
index 00000000..1afeb99d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6008
@@ -0,0 +1,4 @@
+{
+	"desc": "Franklin U301",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6522 b/trunk/package/network/utils/comgt/files/data/16d8:6522
new file mode 100644
index 00000000..44343d00
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6522
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CDU-650",
+	"control": 2,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6523 b/trunk/package/network/utils/comgt/files/data/16d8:6523
new file mode 100644
index 00000000..406566b9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6523
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CCU-650U",
+	"control": 2,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6532 b/trunk/package/network/utils/comgt/files/data/16d8:6532
new file mode 100644
index 00000000..5b6a147f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6532
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CCU-650",
+	"control": 2,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6533 b/trunk/package/network/utils/comgt/files/data/16d8:6533
new file mode 100644
index 00000000..07175f31
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6533
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNM-650",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:6543 b/trunk/package/network/utils/comgt/files/data/16d8:6543
new file mode 100644
index 00000000..c518ca72
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:6543
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-650",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/16d8:680a b/trunk/package/network/utils/comgt/files/data/16d8:680a
new file mode 100644
index 00000000..9b1c85fe
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/16d8:680a
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CDU-680",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0001 b/trunk/package/network/utils/comgt/files/data/19d2:0001
new file mode 100644
index 00000000..31ee3fd3
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0001
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0002 b/trunk/package/network/utils/comgt/files/data/19d2:0002
new file mode 100644
index 00000000..ee80af5f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0002
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE ET502HS/MT505UP/MF632",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0015 b/trunk/package/network/utils/comgt/files/data/19d2:0015
new file mode 100644
index 00000000..31ee3fd3
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0015
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0016 b/trunk/package/network/utils/comgt/files/data/19d2:0016
new file mode 100644
index 00000000..48c5fefd
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0016
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MF110/ZTE",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0017 b/trunk/package/network/utils/comgt/files/data/19d2:0017
new file mode 100644
index 00000000..87178fba
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0017
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0018 b/trunk/package/network/utils/comgt/files/data/19d2:0018
new file mode 100644
index 00000000..76120d48
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0018
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MSA110UP/ZTE",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0019 b/trunk/package/network/utils/comgt/files/data/19d2:0019
new file mode 100644
index 00000000..8d31ed76
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0019
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT689DC/ZTE",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0022 b/trunk/package/network/utils/comgt/files/data/19d2:0022
new file mode 100644
index 00000000..7ed8ed1c
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0022
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE K2525",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0024 b/trunk/package/network/utils/comgt/files/data/19d2:0024
new file mode 100644
index 00000000..5ae34af2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0024
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT503HSA",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0025 b/trunk/package/network/utils/comgt/files/data/19d2:0025
new file mode 100644
index 00000000..68baeb77
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0025
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF628",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0031 b/trunk/package/network/utils/comgt/files/data/19d2:0031
new file mode 100644
index 00000000..7aa8aa4b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0031
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF110/MF112/MF626",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0033 b/trunk/package/network/utils/comgt/files/data/19d2:0033
new file mode 100644
index 00000000..e99314e3
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0033
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF636",
+	"control": 1,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0037 b/trunk/package/network/utils/comgt/files/data/19d2:0037
new file mode 100644
index 00000000..8ee565d4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0037
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 2,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0039 b/trunk/package/network/utils/comgt/files/data/19d2:0039
new file mode 100644
index 00000000..c80a51ae
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0039
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF100",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0042 b/trunk/package/network/utils/comgt/files/data/19d2:0042
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0042
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0052 b/trunk/package/network/utils/comgt/files/data/19d2:0052
new file mode 100644
index 00000000..87178fba
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0052
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0055 b/trunk/package/network/utils/comgt/files/data/19d2:0055
new file mode 100644
index 00000000..87178fba
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0055
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0057 b/trunk/package/network/utils/comgt/files/data/19d2:0057
new file mode 100644
index 00000000..78007461
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0057
@@ -0,0 +1,5 @@
+{
+	"desc": "AIKO 83D",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0063 b/trunk/package/network/utils/comgt/files/data/19d2:0063
new file mode 100644
index 00000000..f45825d0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0063
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3565-Z",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0064 b/trunk/package/network/utils/comgt/files/data/19d2:0064
new file mode 100644
index 00000000..edb0efef
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0064
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF627",
+	"control": 0,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0066 b/trunk/package/network/utils/comgt/files/data/19d2:0066
new file mode 100644
index 00000000..c57d7aec
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0066
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF626",
+	"control": 1,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0073 b/trunk/package/network/utils/comgt/files/data/19d2:0073
new file mode 100644
index 00000000..0f9502f1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0073
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE A580",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0079 b/trunk/package/network/utils/comgt/files/data/19d2:0079
new file mode 100644
index 00000000..569a9996
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0079
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE A353",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0082 b/trunk/package/network/utils/comgt/files/data/19d2:0082
new file mode 100644
index 00000000..ea4fcd94
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0082
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF668/MF190",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0086 b/trunk/package/network/utils/comgt/files/data/19d2:0086
new file mode 100644
index 00000000..f25d77a6
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0086
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF645",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0091 b/trunk/package/network/utils/comgt/files/data/19d2:0091
new file mode 100644
index 00000000..4e429a63
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0091
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF636",
+	"control": 1,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0094 b/trunk/package/network/utils/comgt/files/data/19d2:0094
new file mode 100644
index 00000000..34a976eb
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0094
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC581",
+	"control": 3,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0104 b/trunk/package/network/utils/comgt/files/data/19d2:0104
new file mode 100644
index 00000000..0646b8d1
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0104
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K4505-Z",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0108 b/trunk/package/network/utils/comgt/files/data/19d2:0108
new file mode 100644
index 00000000..369d70f0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0108
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 1,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0116 b/trunk/package/network/utils/comgt/files/data/19d2:0116
new file mode 100644
index 00000000..bfe9b5d4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0116
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF651",
+	"control": 1,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0117 b/trunk/package/network/utils/comgt/files/data/19d2:0117
new file mode 100644
index 00000000..8610bbf4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0117
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF112",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0121 b/trunk/package/network/utils/comgt/files/data/19d2:0121
new file mode 100644
index 00000000..da5b96c0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0121
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF637",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0124 b/trunk/package/network/utils/comgt/files/data/19d2:0124
new file mode 100644
index 00000000..74b4f6fb
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0124
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF110",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0128 b/trunk/package/network/utils/comgt/files/data/19d2:0128
new file mode 100644
index 00000000..620eb90f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0128
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF651",
+	"control": 1,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0142 b/trunk/package/network/utils/comgt/files/data/19d2:0142
new file mode 100644
index 00000000..6d19e3e8
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0142
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF665C",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0143 b/trunk/package/network/utils/comgt/files/data/19d2:0143
new file mode 100644
index 00000000..6885a9b2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0143
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190B",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0152 b/trunk/package/network/utils/comgt/files/data/19d2:0152
new file mode 100644
index 00000000..20047be7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0152
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC583",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0157 b/trunk/package/network/utils/comgt/files/data/19d2:0157
new file mode 100644
index 00000000..d7be7c4d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0157
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF683",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0167 b/trunk/package/network/utils/comgt/files/data/19d2:0167
new file mode 100644
index 00000000..0eefdc12
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0167
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF820D",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0170 b/trunk/package/network/utils/comgt/files/data/19d2:0170
new file mode 100644
index 00000000..d7d6f97a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0170
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE A371",
+	"control": 0,
+	"data": 1
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0199 b/trunk/package/network/utils/comgt/files/data/19d2:0199
new file mode 100644
index 00000000..565afcf6
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0199
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF820S",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0257 b/trunk/package/network/utils/comgt/files/data/19d2:0257
new file mode 100644
index 00000000..6e943169
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0257
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF821",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0265 b/trunk/package/network/utils/comgt/files/data/19d2:0265
new file mode 100644
index 00000000..284c6ed9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0265
@@ -0,0 +1,4 @@
+{
+	"desc": "Onda MT8205/ZTE",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0284 b/trunk/package/network/utils/comgt/files/data/19d2:0284
new file mode 100644
index 00000000..4fc3bbbc
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0284
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF880",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:0326 b/trunk/package/network/utils/comgt/files/data/19d2:0326
new file mode 100644
index 00000000..c854f2a6
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:0326
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF821D",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1003 b/trunk/package/network/utils/comgt/files/data/19d2:1003
new file mode 100644
index 00000000..a7d0eb5a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1003
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3805-Z",
+	"control": 1,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1008 b/trunk/package/network/utils/comgt/files/data/19d2:1008
new file mode 100644
index 00000000..d0b329ce
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1008
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3570-Z",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1010 b/trunk/package/network/utils/comgt/files/data/19d2:1010
new file mode 100644
index 00000000..fe294f0f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1010
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3571-Z",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1015 b/trunk/package/network/utils/comgt/files/data/19d2:1015
new file mode 100644
index 00000000..a5eab00e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1015
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3806-Z",
+	"control": 1,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1018 b/trunk/package/network/utils/comgt/files/data/19d2:1018
new file mode 100644
index 00000000..48add8f4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1018
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K5006-Z",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1172 b/trunk/package/network/utils/comgt/files/data/19d2:1172
new file mode 100644
index 00000000..1b4c728f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1172
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K4510-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1173 b/trunk/package/network/utils/comgt/files/data/19d2:1173
new file mode 100644
index 00000000..1b4c728f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1173
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K4510-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1176 b/trunk/package/network/utils/comgt/files/data/19d2:1176
new file mode 100644
index 00000000..4bbd5b74
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1176
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3770-Z",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1177 b/trunk/package/network/utils/comgt/files/data/19d2:1177
new file mode 100644
index 00000000..3d196af4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1177
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3770-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1181 b/trunk/package/network/utils/comgt/files/data/19d2:1181
new file mode 100644
index 00000000..5ee7b2f2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1181
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3772-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1203 b/trunk/package/network/utils/comgt/files/data/19d2:1203
new file mode 100644
index 00000000..45025312
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1203
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF691",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1208 b/trunk/package/network/utils/comgt/files/data/19d2:1208
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1208
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1211 b/trunk/package/network/utils/comgt/files/data/19d2:1211
new file mode 100644
index 00000000..0df58f0a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1211
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF195",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1212 b/trunk/package/network/utils/comgt/files/data/19d2:1212
new file mode 100644
index 00000000..0df58f0a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1212
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF195",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1217 b/trunk/package/network/utils/comgt/files/data/19d2:1217
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1217
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1218 b/trunk/package/network/utils/comgt/files/data/19d2:1218
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1218
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1220 b/trunk/package/network/utils/comgt/files/data/19d2:1220
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1220
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1222 b/trunk/package/network/utils/comgt/files/data/19d2:1222
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1222
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1245 b/trunk/package/network/utils/comgt/files/data/19d2:1245
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1245
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1252 b/trunk/package/network/utils/comgt/files/data/19d2:1252
new file mode 100644
index 00000000..768a4333
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1252
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF669",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1254 b/trunk/package/network/utils/comgt/files/data/19d2:1254
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1254
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1256 b/trunk/package/network/utils/comgt/files/data/19d2:1256
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1256
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1270 b/trunk/package/network/utils/comgt/files/data/19d2:1270
new file mode 100644
index 00000000..7ad57f02
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1270
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF667",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1401 b/trunk/package/network/utils/comgt/files/data/19d2:1401
new file mode 100644
index 00000000..730b6349
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1401
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF60",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1402 b/trunk/package/network/utils/comgt/files/data/19d2:1402
new file mode 100644
index 00000000..730b6349
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1402
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF60",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1426 b/trunk/package/network/utils/comgt/files/data/19d2:1426
new file mode 100644
index 00000000..cb9337b4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1426
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF91D",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1512 b/trunk/package/network/utils/comgt/files/data/19d2:1512
new file mode 100644
index 00000000..7e4bbf75
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1512
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MFxxx",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1515 b/trunk/package/network/utils/comgt/files/data/19d2:1515
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1515
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1518 b/trunk/package/network/utils/comgt/files/data/19d2:1518
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1518
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1519 b/trunk/package/network/utils/comgt/files/data/19d2:1519
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1519
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1522 b/trunk/package/network/utils/comgt/files/data/19d2:1522
new file mode 100644
index 00000000..4c926f01
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1522
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF652",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1525 b/trunk/package/network/utils/comgt/files/data/19d2:1525
new file mode 100644
index 00000000..7a37c432
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1525
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF591",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1527 b/trunk/package/network/utils/comgt/files/data/19d2:1527
new file mode 100644
index 00000000..6b46c73d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1527
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF196",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1537 b/trunk/package/network/utils/comgt/files/data/19d2:1537
new file mode 100644
index 00000000..a6251640
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1537
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190J",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1538 b/trunk/package/network/utils/comgt/files/data/19d2:1538
new file mode 100644
index 00000000..a6251640
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1538
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190J",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:1544 b/trunk/package/network/utils/comgt/files/data/19d2:1544
new file mode 100644
index 00000000..a6251640
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:1544
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190J",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:2002 b/trunk/package/network/utils/comgt/files/data/19d2:2002
new file mode 100644
index 00000000..a049f196
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:2002
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3765-Z",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:2003 b/trunk/package/network/utils/comgt/files/data/19d2:2003
new file mode 100644
index 00000000..a2a08808
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:2003
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF180",
+	"control": 1,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:ffdd b/trunk/package/network/utils/comgt/files/data/19d2:ffdd
new file mode 100644
index 00000000..71d1050a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:ffdd
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC682",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:ffe4 b/trunk/package/network/utils/comgt/files/data/19d2:ffe4
new file mode 100644
index 00000000..03a16bff
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:ffe4
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE AC3781",
+	"control": 1,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:ffe9 b/trunk/package/network/utils/comgt/files/data/19d2:ffe9
new file mode 100644
index 00000000..57531e26
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:ffe9
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC2738",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:fff1 b/trunk/package/network/utils/comgt/files/data/19d2:fff1
new file mode 100644
index 00000000..4347f288
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:fff1
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE generic",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:fffb b/trunk/package/network/utils/comgt/files/data/19d2:fffb
new file mode 100644
index 00000000..4ff616a0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:fffb
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MG880",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:fffc b/trunk/package/network/utils/comgt/files/data/19d2:fffc
new file mode 100644
index 00000000..4ff616a0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:fffc
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MG880",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:fffd b/trunk/package/network/utils/comgt/files/data/19d2:fffd
new file mode 100644
index 00000000..4ff616a0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:fffd
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MG880",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:fffe b/trunk/package/network/utils/comgt/files/data/19d2:fffe
new file mode 100644
index 00000000..4e600498
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:fffe
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC8700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/19d2:ffff b/trunk/package/network/utils/comgt/files/data/19d2:ffff
new file mode 100644
index 00000000..747fa238
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/19d2:ffff
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC8710",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1a8d:1002 b/trunk/package/network/utils/comgt/files/data/1a8d:1002
new file mode 100644
index 00000000..93388be2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1a8d:1002
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-100/C-120",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1a8d:1003 b/trunk/package/network/utils/comgt/files/data/1a8d:1003
new file mode 100644
index 00000000..93388be2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1a8d:1003
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-100/C-120",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1a8d:1007 b/trunk/package/network/utils/comgt/files/data/1a8d:1007
new file mode 100644
index 00000000..f013968f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1a8d:1007
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-270",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1a8d:1009 b/trunk/package/network/utils/comgt/files/data/1a8d:1009
new file mode 100644
index 00000000..82e4bf03
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1a8d:1009
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-170/C-180",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1a8d:100c b/trunk/package/network/utils/comgt/files/data/1a8d:100c
new file mode 100644
index 00000000..1acb9eec
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1a8d:100c
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-320",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1a8d:100d b/trunk/package/network/utils/comgt/files/data/1a8d:100d
new file mode 100644
index 00000000..67db2b46
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1a8d:100d
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-508",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1a8d:2006 b/trunk/package/network/utils/comgt/files/data/1a8d:2006
new file mode 100644
index 00000000..78f36cef
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1a8d:2006
@@ -0,0 +1,6 @@
+{
+	"desc": "Bandrich C-33x",
+	"control": 0,
+	"data": 1
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:0000 b/trunk/package/network/utils/comgt/files/data/1bbb:0000
new file mode 100644
index 00000000..0be73afa
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:0000
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X060S/X070S/X080S/X200",
+	"control": 2,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:0012 b/trunk/package/network/utils/comgt/files/data/1bbb:0012
new file mode 100644
index 00000000..3eecac0e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:0012
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X085C",
+	"control": 2,
+	"data": 2
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:0017 b/trunk/package/network/utils/comgt/files/data/1bbb:0017
new file mode 100644
index 00000000..853c05c0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:0017
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X220L",
+	"control": 4,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:0052 b/trunk/package/network/utils/comgt/files/data/1bbb:0052
new file mode 100644
index 00000000..853c05c0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:0052
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X220L",
+	"control": 4,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:00b7 b/trunk/package/network/utils/comgt/files/data/1bbb:00b7
new file mode 100644
index 00000000..9eaffe66
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:00b7
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X600",
+	"control": 0,
+	"data": 4
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:00ca b/trunk/package/network/utils/comgt/files/data/1bbb:00ca
new file mode 100644
index 00000000..80d71fad
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:00ca
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X080C",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:011e b/trunk/package/network/utils/comgt/files/data/1bbb:011e
new file mode 100644
index 00000000..160221dd
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:011e
@@ -0,0 +1,4 @@
+{
+	"desc": "Alcatel L100V,",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1bbb:0203 b/trunk/package/network/utils/comgt/files/data/1bbb:0203
new file mode 100644
index 00000000..2632a632
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1bbb:0203
@@ -0,0 +1,4 @@
+{
+	"desc": "Alcatel L800Z,",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:6060 b/trunk/package/network/utils/comgt/files/data/1c9e:6060
new file mode 100644
index 00000000..6f77bb4b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:6060
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X020 & X030",
+	"control": 2,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:6061 b/trunk/package/network/utils/comgt/files/data/1c9e:6061
new file mode 100644
index 00000000..6f77bb4b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:6061
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X020 & X030",
+	"control": 2,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:9000 b/trunk/package/network/utils/comgt/files/data/1c9e:9000
new file mode 100644
index 00000000..39dcd776
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:9000
@@ -0,0 +1,6 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:9603 b/trunk/package/network/utils/comgt/files/data/1c9e:9603
new file mode 100644
index 00000000..fd3f099d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:9603
@@ -0,0 +1,5 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:9605 b/trunk/package/network/utils/comgt/files/data/1c9e:9605
new file mode 100644
index 00000000..c2992c16
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:9605
@@ -0,0 +1,5 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 1,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:9607 b/trunk/package/network/utils/comgt/files/data/1c9e:9607
new file mode 100644
index 00000000..c2992c16
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:9607
@@ -0,0 +1,5 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 1,
+	"data": 3
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:9801 b/trunk/package/network/utils/comgt/files/data/1c9e:9801
new file mode 100644
index 00000000..40dcc760
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:9801
@@ -0,0 +1,6 @@
+{
+	"desc": "4G Systems XS Stick W21",
+	"control": 2,
+	"data": 1
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1c9e:9900 b/trunk/package/network/utils/comgt/files/data/1c9e:9900
new file mode 100644
index 00000000..42da3aba
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1c9e:9900
@@ -0,0 +1,6 @@
+{
+	"desc": "Softbank C02LC",
+	"control": 1,
+	"data": 2
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/1e0e:9000 b/trunk/package/network/utils/comgt/files/data/1e0e:9000
new file mode 100644
index 00000000..bdb159da
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1e0e:9000
@@ -0,0 +1,5 @@
+{
+	"desc": "PROLink PHS100, Hyundai MB-810, A-Link 3GU",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1e0e:9100 b/trunk/package/network/utils/comgt/files/data/1e0e:9100
new file mode 100644
index 00000000..d1b2dda7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1e0e:9100
@@ -0,0 +1,5 @@
+{
+	"desc": "PROLink PHS300, A-Link 3GU",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1e0e:9200 b/trunk/package/network/utils/comgt/files/data/1e0e:9200
new file mode 100644
index 00000000..bdb159da
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1e0e:9200
@@ -0,0 +1,5 @@
+{
+	"desc": "PROLink PHS100, Hyundai MB-810, A-Link 3GU",
+	"control": 1,
+	"data": 2
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1e0e:ce16 b/trunk/package/network/utils/comgt/files/data/1e0e:ce16
new file mode 100644
index 00000000..93e0c3fa
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1e0e:ce16
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-162-U5, Micromax MMX 300c",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/1e0e:cefe b/trunk/package/network/utils/comgt/files/data/1e0e:cefe
new file mode 100644
index 00000000..ebc941df
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/1e0e:cefe
@@ -0,0 +1,6 @@
+{
+	"desc": "D-Link DWM-162-U5, Micromax MMX 300c",
+	"control": 1,
+	"data": 2
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/2001:7d00 b/trunk/package/network/utils/comgt/files/data/2001:7d00
new file mode 100644
index 00000000..b0cc4791
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2001:7d00
@@ -0,0 +1,6 @@
+{
+	"desc": "D-Link DWM-156 A6",
+	"control": 1,
+	"data": 0
+}	"generic": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/2001:7d01 b/trunk/package/network/utils/comgt/files/data/2001:7d01
new file mode 100644
index 00000000..ab8fd9de
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2001:7d01
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156 A7",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/2001:7d02 b/trunk/package/network/utils/comgt/files/data/2001:7d02
new file mode 100644
index 00000000..ab8fd9de
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2001:7d02
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156 A7",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/2001:7d03 b/trunk/package/network/utils/comgt/files/data/2001:7d03
new file mode 100644
index 00000000..ab8fd9de
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2001:7d03
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156 A7",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/211f:6801 b/trunk/package/network/utils/comgt/files/data/211f:6801
new file mode 100644
index 00000000..06cdddca
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/211f:6801
@@ -0,0 +1,5 @@
+{
+	"desc": "Celot K-3000/CT-650/CT-680",
+	"control": 2,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/2357:0201 b/trunk/package/network/utils/comgt/files/data/2357:0201
new file mode 100644
index 00000000..7ad8690e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2357:0201
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA180",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/2357:0202 b/trunk/package/network/utils/comgt/files/data/2357:0202
new file mode 100644
index 00000000..7ad8690e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2357:0202
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA180",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/2357:0203 b/trunk/package/network/utils/comgt/files/data/2357:0203
new file mode 100644
index 00000000..7ad8690e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2357:0203
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA180",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/2357:9000 b/trunk/package/network/utils/comgt/files/data/2357:9000
new file mode 100644
index 00000000..0ddb804a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/2357:9000
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA260",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8114 b/trunk/package/network/utils/comgt/files/data/413c:8114
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8114
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8115 b/trunk/package/network/utils/comgt/files/data/413c:8115
new file mode 100644
index 00000000..af27cbe0
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8115
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5500",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8116 b/trunk/package/network/utils/comgt/files/data/413c:8116
new file mode 100644
index 00000000..31b79bf9
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8116
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5505",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8117 b/trunk/package/network/utils/comgt/files/data/413c:8117
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8117
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8118 b/trunk/package/network/utils/comgt/files/data/413c:8118
new file mode 100644
index 00000000..b92d4151
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8118
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5510",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8128 b/trunk/package/network/utils/comgt/files/data/413c:8128
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8128
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8129 b/trunk/package/network/utils/comgt/files/data/413c:8129
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8129
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8133 b/trunk/package/network/utils/comgt/files/data/413c:8133
new file mode 100644
index 00000000..4ae84020
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8133
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8134 b/trunk/package/network/utils/comgt/files/data/413c:8134
new file mode 100644
index 00000000..4ae84020
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8134
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8135 b/trunk/package/network/utils/comgt/files/data/413c:8135
new file mode 100644
index 00000000..4ae84020
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8135
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8136 b/trunk/package/network/utils/comgt/files/data/413c:8136
new file mode 100644
index 00000000..d2bf508f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8136
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5520",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8137 b/trunk/package/network/utils/comgt/files/data/413c:8137
new file mode 100644
index 00000000..d2bf508f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8137
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5520",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8138 b/trunk/package/network/utils/comgt/files/data/413c:8138
new file mode 100644
index 00000000..d2bf508f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8138
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5520",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8147 b/trunk/package/network/utils/comgt/files/data/413c:8147
new file mode 100644
index 00000000..f0b0638f
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8147
@@ -0,0 +1,6 @@
+{
+	"desc": "Dell 5530",
+	"control": 0,
+	"data": 1
+}	"acm": 1
+}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8180 b/trunk/package/network/utils/comgt/files/data/413c:8180
new file mode 100644
index 00000000..1ae44053
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8180
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8181 b/trunk/package/network/utils/comgt/files/data/413c:8181
new file mode 100644
index 00000000..1ae44053
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8181
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8182 b/trunk/package/network/utils/comgt/files/data/413c:8182
new file mode 100644
index 00000000..1ae44053
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8182
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8186 b/trunk/package/network/utils/comgt/files/data/413c:8186
new file mode 100644
index 00000000..fa240998
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8186
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5620",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8194 b/trunk/package/network/utils/comgt/files/data/413c:8194
new file mode 100644
index 00000000..b361f54d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8194
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5630",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8195 b/trunk/package/network/utils/comgt/files/data/413c:8195
new file mode 100644
index 00000000..45b78768
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8195
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5800",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:8196 b/trunk/package/network/utils/comgt/files/data/413c:8196
new file mode 100644
index 00000000..cd247303
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:8196
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5800v2",
+	"type": "qmi"
+}
diff --git a/trunk/package/network/utils/comgt/files/data/413c:819b b/trunk/package/network/utils/comgt/files/data/413c:819b
new file mode 100644
index 00000000..e66c3fc4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/data/413c:819b
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5804",
+	"control": 1,
+	"data": 0
+}}
diff --git a/trunk/package/network/utils/comgt/files/directip-stop.gcom b/trunk/package/network/utils/comgt/files/directip-stop.gcom
new file mode 100644
index 00000000..1c148637
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/directip-stop.gcom
@@ -0,0 +1,16 @@
+opengt
+set com 115200n81
+set comecho off
+set senddelay 0.05
+waitquiet 1 0.2
+
+:start
+ send "AT!SCACT=0,3^m"
+ waitfor 5 "OK"
+ if % = 0 goto hangupok
+ print "WWAN error. Hangup failed.\r\n"
+ exit 1
+
+:hangupok
+ print "WWAN connection established.\r\n"
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/directip.gcom b/trunk/package/network/utils/comgt/files/directip.gcom
new file mode 100644
index 00000000..9a772a90
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/directip.gcom
@@ -0,0 +1,55 @@
+opengt
+set com 115200n81
+set comecho off
+set senddelay 0.05
+waitquiet 1 0.2
+
+:start
+ if $env("USE_AUTH") = "0" goto connect
+ send "AT$QCPDPP=3,"
+ send $env("USE_AUTH")
+ send ",\""
+ if $env("USE_USER") <> "" send $env("USE_USER")
+ send "\",\""
+ if $env("USE_PASS") <> "" send $env("USE_PASS")
+ send "\"^m"
+ waitfor 5 "OK"
+ if % = 0 goto connect
+ print "WWAN error. Auth failed.\r\n"
+ exit 1
+
+:connect
+ send "AT+CFUN=1^m"
+ send "AT+CGDCONT=3,\"IP\",\""
+ send $env("USE_APN")
+ send "\"^m"
+ waitfor 5 "OK"
+ if % = 0 goto connok
+ print "WWAN error. Connection failed.\r\n"
+ exit 1
+
+:connok
+ let c=1
+:loop
+ sleep 2
+ send "AT+CGATT?^m"
+ waitfor 5 "+CGATT: 1"
+ if % = 0 goto carrierok
+ if c > 10 goto carriererr
+ inc c
+ goto loop
+
+:carriererr
+ print "WWAN error. No carrier.\r\n"
+ exit 1
+
+:carrierok
+ send "AT!SCACT=1,3^m"
+ waitfor 5 "OK"
+ if % = 0 goto dialok
+ print "WWAN error. Dialing failed.\r\n"
+ exit 1
+
+:dialok
+ print "WWAN connection established.\r\n"
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/directip.sh b/trunk/package/network/utils/comgt/files/directip.sh
new file mode 100644
index 00000000..a633fa2e
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/directip.sh
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_directip_init_config() {
+	available=1
+	no_device=1
+	proto_config_add_string "device:device"
+	proto_config_add_string "apn"
+	proto_config_add_string "pincode"
+	proto_config_add_string "auth"
+	proto_config_add_string "username"
+	proto_config_add_string "password"
+}
+
+proto_directip_setup() {
+	local interface="$1"
+	local chat devpath devname
+
+	local device apn pincode ifname auth username password
+	json_get_vars device apn pincode auth username password
+
+	[ -n "$ctl_device" ] && device=$ctl_device
+
+	[ -e "$device" ] || {
+		proto_notify_error "$interface" NO_DEVICE
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	devname="$(basename "$device")"
+	devpath="$(readlink -f /sys/class/tty/$devname/device)"
+	ifname="$( ls "$devpath"/../../*/net )"
+
+	[ -n "$ifname" ] || {
+		proto_notify_error "$interface" NO_IFNAME
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	cardinfo=$(gcom -d "$device" -s /etc/gcom/getcardinfo.gcom)
+	[ -n $(echo "$cardinfo" | grep -q "Sierra Wireless") ] || {
+		proto_notify_error "$interface" BAD_DEVICE
+		proto_block_restart "$interface"
+		return 1
+	}
+
+	if [ -n "$pincode" ]; then
+		PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || {
+			proto_notify_error "$interface" PIN_FAILED
+			proto_block_restart "$interface"
+			return 1
+		}
+	fi
+	# wait for carrier to avoid firmware stability bugs
+	gcom -d "$device" -s /etc/gcom/getcarrier.gcom || return 1
+
+	local auth_type=0
+	case $auth in
+	pap) auth_type=1;;
+	chap) auth_type=2;;
+	esac
+
+	USE_APN="$apn" USE_USER="$username" USE_PASS="$password" USE_AUTH="$auth_type" \
+			gcom -d "$device" -s /etc/gcom/directip.gcom || {
+		proto_notify_error "$interface" CONNECT_FAILED
+		proto_block_restart "$interface"
+		return 1
+	}
+
+	logger -p daemon.info -t "directip[$$]" "Connected, starting DHCP"
+	proto_init_update "$ifname" 1
+	proto_send_update "$interface"
+
+	json_init
+	json_add_string name "${interface}_dhcp"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcp"
+	ubus call network add_dynamic "$(json_dump)"
+
+	json_init
+	json_add_string name "${interface}_dhcpv6"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcpv6"
+	ubus call network add_dynamic "$(json_dump)"
+
+	return 0
+}
+
+proto_directip_teardown() {
+	local interface="$1"
+
+	local device
+	json_get_vars device
+
+	[ -n "$ctl_device" ] && device=$ctl_device
+
+	gcom -d "$device" -s /etc/gcom/directip-stop.gcom || proto_notify_error "$interface" CONNECT_FAILED
+
+	proto_init_update "*" 0
+	proto_send_update "$interface"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol directip
+}
diff --git a/trunk/package/network/utils/comgt/files/evdo.chat b/trunk/package/network/utils/comgt/files/evdo.chat
new file mode 100644
index 00000000..de49e41a
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/evdo.chat
@@ -0,0 +1,17 @@
+# This is a simple chat script based off of the one provided by Sierra Wireless
+# for CDMA connections.  It should work for both Sprint and Verizon networks.
+
+ABORT	BUSY
+ABORT 	'NO CARRIER'
+ABORT	ERROR
+ABORT 	'NO DIAL TONE'
+ABORT 	'NO ANSWER'
+ABORT 	DELAYED
+REPORT	CONNECT
+TIMEOUT	10
+'' 		AT
+OK 		ATZ
+SAY     'Calling CDMA/EVDO'
+TIMEOUT	30
+OK		ATDT#777
+CONNECT	''
diff --git a/trunk/package/network/utils/comgt/files/getcardinfo.gcom b/trunk/package/network/utils/comgt/files/getcardinfo.gcom
new file mode 100644
index 00000000..5c69a646
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/getcardinfo.gcom
@@ -0,0 +1,14 @@
+opengt
+ set com 115200n81
+ set comecho off
+ set senddelay 0.02
+ waitquiet 0.2 0.2
+ flash 0.1
+
+:start
+ send "ATI^m"
+ get 1 "" $s
+ print $s
+
+:continue
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/getcarrier.gcom b/trunk/package/network/utils/comgt/files/getcarrier.gcom
new file mode 100644
index 00000000..1e0216d4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/getcarrier.gcom
@@ -0,0 +1,20 @@
+opengt
+  set senddelay 0.05
+  waitquiet 1 0.2
+  let c=1
+ :loop
+    inc c
+    send "AT+CGATT?^m"
+    waitfor 5 "+CGATT: 1","+CGATT: 0"
+    print "\n."
+    if % = -1 goto error
+    if c > 10 goto toolong
+    if % = 0 goto out
+    sleep 2
+    if % = 1 goto loop
+  :toolong
+  exit 1
+  :error
+  exit 0
+  :out
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/getcnum.gcom b/trunk/package/network/utils/comgt/files/getcnum.gcom
new file mode 100644
index 00000000..450cf8c4
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/getcnum.gcom
@@ -0,0 +1,20 @@
+opengt
+ set com 115200n81
+ set comecho off
+ set senddelay 0.02
+ waitquiet 0.2 0.2
+ flash 0.1
+
+:start
+ send "AT+CNUM^m"
+ get 1 "^m" $n
+ get 1 ":" $n
+ get 1 "\"" $n
+ get 1 "\"" $n
+ get 1 "\"" $n
+ get 1 "\"" $n
+ let n = len($n)
+ if n<1 goto continue
+ print $n
+:continue
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/getimsi.gcom b/trunk/package/network/utils/comgt/files/getimsi.gcom
new file mode 100644
index 00000000..04854561
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/getimsi.gcom
@@ -0,0 +1,17 @@
+opengt
+ set com 115200n81
+ set comecho off
+ set senddelay 0.02
+ waitquiet 0.2 0.2
+ flash 0.1
+
+:start
+ send "AT+CIMI^m"
+ get 1 "^m" $s
+ get 1 "^m" $s
+ let x = len($s)
+ if x<2 goto continue
+ let $s = $right($s, x-1)
+ print $s
+:continue
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/getstrength.gcom b/trunk/package/network/utils/comgt/files/getstrength.gcom
new file mode 100644
index 00000000..28862859
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/getstrength.gcom
@@ -0,0 +1,14 @@
+opengt
+ set com 115200n81
+ set comecho off
+ set senddelay 0.02
+ waitquiet 0.2 0.2
+ flash 0.1
+
+:start
+ send "AT+CSQ^m"
+ get 1 "" $s
+ print $s
+
+:continue
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/ncm.json b/trunk/package/network/utils/comgt/files/ncm.json
new file mode 100644
index 00000000..b9b15cdb
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/ncm.json
@@ -0,0 +1,49 @@
+{
+	"huawei": {
+		"initialize": [
+			"AT",
+			"ATZ",
+			"ATQ0",
+			"ATV1",
+			"ATE1",
+			"ATS0=0"
+		],
+		"modes": {
+			"preferlte": "AT^SYSCFGEX=\\\"030201\\\",3fffffff,2,4,7fffffffffffffff,,",
+			"preferumts": "AT^SYSCFGEX=\\\"0201\\\",3fffffff,2,4,7fffffffffffffff,,",
+			"lte": "AT^SYSCFGEX=\\\"03\\\",3fffffff,2,4,7fffffffffffffff,,",
+			"umts": "AT^SYSCFGEX=\\\"02\\\",3fffffff,2,4,7fffffffffffffff,,",
+			"gsm": "AT^SYSCFGEX=\\\"01\\\",3fffffff,2,4,7fffffffffffffff,,",
+			"auto": "AT^SYSCFGEX=\\\"00\\\",3fffffff,2,4,7fffffffffffffff,,"
+		},
+		"connect": "AT^NDISDUP=1,1,\\\"${apn}\\\"${username:+,\\\"$username\\\"}${password:+,\\\"$password\\\"}${auth:+,$auth}",
+		"disconnect": "AT^NDISDUP=1,0"
+	},
+	"SAMSUNG": {
+		"initialize": [
+			"AT",
+			"AT+CGREG=2",
+			"AT+CFUN=5",
+			"AT+MODESELECT=3",
+			"AT+CGDCONT=1,\\\"IP\\\",\\\"${apn}\\\""
+		],
+		"modes": {
+			"umts": "AT+CHANGEALLPATH=1"
+		},
+		"connect": "AT+CGATT=1",
+		"disconnect": "AT+CGATT=0"
+	},
+	"Sony": {
+		"initialize": [
+			"AT+CFUN=1",
+			"AT+CGDCONT=1,\\\"IP\\\",\\\"${apn}\\\"",
+			"AT*EIAAUW=1,1,\\\"${username}\\\",\\\"${password}\\\",${auth:-00111}"
+		],
+		"modes": {
+			"umts": "AT+CFUN=6",
+			"gsm": "AT+CFUN=5"
+		},
+		"connect": "AT*ENAP=1,1",
+		"disconnect": "AT*ENAP=0"
+	}
+}
diff --git a/trunk/package/network/utils/comgt/files/ncm.sh b/trunk/package/network/utils/comgt/files/ncm.sh
new file mode 100644
index 00000000..14e421fc
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/ncm.sh
@@ -0,0 +1,156 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
+
+proto_ncm_init_config() {
+	no_device=1
+	available=1
+	proto_config_add_string "device:device"
+	proto_config_add_string apn
+	proto_config_add_string auth
+	proto_config_add_string username
+	proto_config_add_string password
+	proto_config_add_string pincode
+	proto_config_add_string delay
+	proto_config_add_string mode
+}
+
+proto_ncm_setup() {
+	local interface="$1"
+
+	local manufacturer initialize setmode connect
+
+	local device apn auth username password pincode delay mode
+	json_get_vars device apn auth username password pincode delay mode
+
+	[ -n "$device" ] || {
+		echo "ncm[$$]" "No control device specified"
+		proto_notify_error "$interface" NO_DEVICE
+		proto_set_available "$interface" 0
+		return 1
+	}
+	[ -e "$device" ] || {
+		echo "ncm[$$]" "Control device not valid"
+		proto_set_available "$interface" 0
+		return 1
+	}
+	[ -n "$apn" ] || {
+		echo "ncm[$$]" "No APN specified"
+		proto_notify_error "$interface" NO_APN
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	[ -n "$delay" ] && sleep "$delay"
+
+	manufacturer=`gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | awk '/Manufacturer/ { print $2 }'`
+	[ $? -ne 0 ] && {
+		echo "ncm[$$]" "Failed to get modem information"
+		proto_notify_error "$interface" GETINFO_FAILED
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	json_load "$(cat /etc/gcom/ncm.json)"
+	json_select "$manufacturer"
+	[ $? -ne 0 ] && {
+		echo "ncm[$$]" "Unsupported modem"
+		proto_notify_error "$interface" UNSUPPORTED_MODEM
+		proto_set_available "$interface" 0
+		return 1
+	}
+	json_get_values initialize initialize
+	for i in $initialize; do
+		eval COMMAND="$i" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+			echo "ncm[$$]" "Failed to initialize modem"
+			proto_notify_error "$interface" INITIALIZE_FAILED
+			proto_set_available "$interface" 0
+			return 1
+		}
+	done
+
+	[ -n "$pincode" ] && {
+		PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || {
+			echo "ncm[$$]" "Unable to verify PIN"
+			proto_notify_error "$interface" PIN_FAILED
+			proto_block_restart "$interface"
+			return 1
+		}
+	}
+	[ -n "$mode" ] && {
+		json_select modes
+		json_get_var setmode "$mode"
+		COMMAND="$setmode" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+			echo "ncm[$$]" "Failed to set operating mode"
+			proto_notify_error "$interface" SETMODE_FAILED
+			proto_set_available "$interface" 0
+			return 1
+		}
+		json_select ..
+	}
+
+	json_get_var connect connect
+	eval COMMAND="$connect" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+		echo "ncm[$$]" "Failed to connect"
+		proto_notify_error "$interface" CONNECT_FAILED
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	echo "ncm[$$]" "Connected, starting DHCP"
+	proto_init_update "*" 1
+	proto_send_update "$interface"
+
+	json_init
+	json_add_string name "${interface}_dhcp"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcp"
+	json_close_object
+	ubus call network add_dynamic "$(json_dump)"
+
+	json_init
+	json_add_string name "${interface}_dhcpv6"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcpv6"
+	json_close_object
+	ubus call network add_dynamic "$(json_dump)"
+}
+
+proto_ncm_teardown() {
+	local interface="$1"
+
+	proto_init_update "*" 0
+	proto_send_update "$interface"
+
+	local manufacturer disconnect
+
+	local device 
+	json_get_vars device
+
+	echo "ncm[$$]" "Stopping network"
+
+	manufacturer=`gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | awk '/Manufacturer/ { print $2 }'`
+	[ $? -ne 0 ] && {
+		echo "ncm[$$]" "Failed to get modem information"
+		proto_notify_error "$interface" GETINFO_FAILED
+		return 1
+	}
+
+	json_load "$(cat /etc/gcom/ncm.json)"
+	json_select "$manufacturer" || {
+		echo "ncm[$$]" "Unsupported modem"
+		proto_notify_error "$interface" UNSUPPORTED_MODEM
+		return 1
+	}
+
+	json_get_var disconnect disconnect
+	COMMAND="$disconnect" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
+		echo "ncm[$$]" "Failed to disconnect"
+		proto_notify_error "$interface" DISCONNECT_FAILED
+		return 1
+	}
+}
+
+add_protocol ncm
diff --git a/trunk/package/network/utils/comgt/files/runcommand.gcom b/trunk/package/network/utils/comgt/files/runcommand.gcom
new file mode 100644
index 00000000..ab24339d
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/runcommand.gcom
@@ -0,0 +1,26 @@
+# run AT-command from environment
+opengt
+ set com 115200n81
+ set senddelay 0.02
+ waitquiet 1 0.2
+ flash 0.1
+
+:start
+ send "sending -> "
+ send $env("COMMAND")
+ send "^m"
+
+ waitfor 15 "OK","ERR","ERROR"
+ if % = 0 goto continue
+ if % = 1 goto error
+ if % = 2 goto error
+
+ print "Timeout running AT-command\n"
+ exit 1
+
+:error
+ print "Error running AT-command\n"
+ exit 1
+
+:continue
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/setmode.gcom b/trunk/package/network/utils/comgt/files/setmode.gcom
new file mode 100644
index 00000000..4ce0b5fa
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/setmode.gcom
@@ -0,0 +1,26 @@
+# set wwan mode from environment
+opengt
+ set com 115200n81
+ set senddelay 0.02
+ waitquiet 1 0.2
+ flash 0.1
+
+:start
+ print "Trying to set mode\n"
+ send $env("MODE")
+ send "^m"
+
+ waitfor 15 "OK","ERR","ERROR"
+ if % = 0 goto continue
+ if % = 1 goto modeerror
+ if % = 2 goto modeerror
+
+ print "Timeout setting WWAN mode!\n"
+ exit 1
+
+:modeerror
+ print "Error setting WWAN mode!\n"
+ exit 1
+
+:continue
+ exit 0
diff --git a/trunk/package/network/utils/comgt/files/setpin.gcom b/trunk/package/network/utils/comgt/files/setpin.gcom
new file mode 100644
index 00000000..66350fe2
--- /dev/null
+++ b/trunk/package/network/utils/comgt/files/setpin.gcom
@@ -0,0 +1,55 @@
+# set pin code from evnironment "$PINCODE"
+opengt
+ set com 115200n81
+ set senddelay 0.05
+ waitquiet 3 0.5
+ flash 0.1
+
+ let c=0
+:start
+ send "AT+CPIN?^m"
+ waitfor 15 "SIM PUK","SIM PIN","READY","ERROR","ERR"
+ if % = -1 goto timeout
+ if % = 0 goto ready
+ if % = 1 goto setpin
+ if % = 2 goto ready
+ if % = 3 goto checkrepeat
+ if % = 4 goto checkrepeat
+
+:checkrepeat
+ inc c
+ if c>3 goto pinerror
+ waitquiet 12 0.5
+ goto start
+
+:timeout
+ print "timeout checking for PIN."
+ exit 1
+
+:ready
+ print "SIM ready\n"
+ goto continue
+ exit 0
+
+:setpin
+ # check if output was "SIM PIN2", that's ok.
+ waitfor 1 "2"
+ if % = 0 goto ready
+
+ print "Trying to set PIN\n"
+ send "AT+CPIN=\""
+ send $env("PINCODE")
+ send "\"^m"
+
+ waitfor 20 "OK","ERR"
+ if % = -1 goto pinerror
+ if % = 0 goto continue
+ if % = 1 goto pinerror
+
+:pinerror
+ print "Error setting PIN, check card manually\n"
+ exit 1
+
+:continue
+ print "PIN set successfully\n"
+ exit 0
diff --git a/trunk/package/network/utils/comgt/patches/001-compile_fix.patch b/trunk/package/network/utils/comgt/patches/001-compile_fix.patch
new file mode 100644
index 00000000..15de850b
--- /dev/null
+++ b/trunk/package/network/utils/comgt/patches/001-compile_fix.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,6 +32,7 @@ SCRIPTPATH = /etc/comgt/
+ SCRIPTSRC = ./scripts/
+ BIN     = $(CPROG) 
+ MANP	= comgt.1 sigmon.1
++CC	= cc
+ 
+ CFLAGS  = -c
+ LDFLAGS =
+@@ -70,10 +71,5 @@ clean:
+ 	-rm *~
+ 	-rm $(SCRIPTSRC)*~
+ 
+-
+-comgt: comgt.o
+-	cc comgt.o $(LDFLAGS) -o comgt
+-
+-comgt.o: comgt.c comgt.h
+-	cc comgt.c $(CFLAGS) 
+-
++comgt:  comgt.c comgt.h
++	$(CC) $(CFLAGS) -o comgt $< $(LDFLAGS)
diff --git a/trunk/package/network/utils/comgt/patches/002-termios.patch b/trunk/package/network/utils/comgt/patches/002-termios.patch
new file mode 100644
index 00000000..3649f3cf
--- /dev/null
+++ b/trunk/package/network/utils/comgt/patches/002-termios.patch
@@ -0,0 +1,29 @@
+--- a/comgt.c
++++ b/comgt.c
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -81,7 +81,7 @@ char token[MAXTOKEN];   /* For gettoken(
+ char scriptfile[MAXPATH]; /* Script file name */
+ char scriptfilepath[MAXPATH]; /* temp storage for full path */
+ BOOL verbose=0; /* Log actions */
+-struct termio cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
++struct termios cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
+ int comfd=0; /* Communication file descriptor.  Defaults to stdin. */
+ char msg[STRINGL]; /* Massage messages here */
+ int preturn,returns[MAXGOSUBS];
+@@ -926,7 +926,7 @@ void setcom(void) {
+ }
+ 
+ void doset(void) {
+-  struct termio console;
++  struct termios console;
+   int a,b;
+   gettoken();
+   if(strcmp(token,"echo")==0) {
diff --git a/trunk/package/network/utils/comgt/patches/003-no_XCASE.patch b/trunk/package/network/utils/comgt/patches/003-no_XCASE.patch
new file mode 100644
index 00000000..f2060a82
--- /dev/null
+++ b/trunk/package/network/utils/comgt/patches/003-no_XCASE.patch
@@ -0,0 +1,20 @@
+--- a/comgt.c
++++ b/comgt.c
+@@ -1281,7 +1281,7 @@ void opengt(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;
+@@ -1336,7 +1336,7 @@ void opendevice(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;
diff --git a/trunk/package/network/utils/conntrack-tools/Makefile b/trunk/package/network/utils/conntrack-tools/Makefile
new file mode 100644
index 00000000..c697d656
--- /dev/null
+++ b/trunk/package/network/utils/conntrack-tools/Makefile
@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2009-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=conntrack-tools
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://www.netfilter.org/projects/conntrack-tools/files \
+	ftp://ftp.netfilter.org/pub/conntrack-tools \
+	http://mirrors.evolva.ro/netfilter.org/conntrack-tools
+PKG_MD5SUM:=5add24d4761baf17af630d5627a71752
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+TAR_OPTIONS += --exclude='*.rej'
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/conntrack-tools
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libnetfilter-conntrack
+  SUBMENU:=Firewall
+  TITLE:=Connection tracking userspace tools
+  URL:=http://conntrack-tools.netfilter.org/
+endef
+
+define Package/conntrack-tools/description
+ The conntrack-tools are a set of free software userspace tools for Linux
+ that allow system administrators interact with the Connection Tracking
+ System, which is the module that provides stateful packet inspection for
+ iptables. The conntrack-tools are the userspace daemon conntrackd and the
+ command line interface conntrack.
+endef
+
+define Package/conntrack-tools/conffiles
+/etc/conntrackd/conntrackd.conf
+endef
+
+define Package/conntrack-tools/install
+	$(INSTALL_DIR) $(1)/etc/conntrackd
+	$(INSTALL_CONF) \
+		$(PKG_BUILD_DIR)/doc/stats/conntrackd.conf \
+		$(1)/etc/conntrackd/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/conntrack \
+		$(PKG_INSTALL_DIR)/usr/sbin/conntrackd \
+		$(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,conntrack-tools))
diff --git a/trunk/package/network/utils/conntrack-tools/patches/100-compile_fix.patch b/trunk/package/network/utils/conntrack-tools/patches/100-compile_fix.patch
new file mode 100644
index 00000000..492f88fa
--- /dev/null
+++ b/trunk/package/network/utils/conntrack-tools/patches/100-compile_fix.patch
@@ -0,0 +1,10 @@
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -16,6 +16,7 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <stdlib.h>
+ #include "network.h"
+ 
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
diff --git a/trunk/package/network/utils/curl/Config.in b/trunk/package/network/utils/curl/Config.in
new file mode 100644
index 00000000..086f5c24
--- /dev/null
+++ b/trunk/package/network/utils/curl/Config.in
@@ -0,0 +1,112 @@
+menu "Configuration"
+	depends on PACKAGE_libcurl
+
+choice
+	prompt "SSL library"
+	default LIBCURL_POLARSSL
+
+config LIBCURL_POLARSSL
+	bool "PolarSSL"
+
+config LIBCURL_CYASSL
+	bool "CyaSSL"
+
+config LIBCURL_AXTLS
+	bool "axTLS"
+
+config LIBCURL_OPENSSL
+	bool "OpenSSL"
+
+config LIBCURL_GNUTLS
+	bool "GNUTLS"
+
+config LIBCURL_NOSSL
+	bool "No SSL support"
+
+endchoice
+
+config LIBCURL_COOKIES
+	bool "Enable cookies support"
+	default y
+
+config LIBCURL_CRYPTO_AUTH
+	bool "Enable cryptographic authentication"
+	default n
+
+config LIBCURL_DICT
+	bool "Enable DICT support"
+	default n
+
+config LIBCURL_FILE
+	bool "Enable FILE support"
+	default y
+
+config LIBCURL_FTP
+	bool "Enable FTP support"
+	default y
+
+config LIBCURL_GOPHER
+	bool "Enable Gopher support"
+	default n
+
+config LIBCURL_HTTP
+	bool "Enable HTTP support"
+	default y
+
+config LIBCURL_IMAP
+	bool "Enable IMAP support"
+	default n
+
+config LIBCURL_LDAP
+	bool "Enable LDAP support"
+	default n
+
+config LIBCURL_LDAPS
+	bool "Enable LDAPS support"
+	default n
+
+config LIBCURL_LIBCURL_OPTION
+	bool "Enable --libcurl C code generation support"
+	default n
+
+config LIBCURL_POP3
+	bool "Enable POP3 support"
+	default n
+
+config LIBCURL_PROXY
+	bool "Enable proxy support"
+	default n
+
+config LIBCURL_RTSP
+	bool "Enable RTSP support"
+	default n
+
+config LIBCURL_SMTP
+	bool "Enable SMTP support"
+	default n
+
+config LIBCURL_SSPI
+	bool "Enable SSPI"
+	default n
+
+config LIBCURL_TELNET
+	bool "Enable TELNET support"
+	default n
+
+config LIBCURL_TFTP
+	bool "Enable TFTP support"
+	default n
+
+config LIBCURL_THREADED_RESOLVER
+	bool "Enable threaded resolver"
+	default n
+
+config LIBCURL_TLS-SRP
+	bool "Enable TLS-SRP authentication"
+	default n
+
+config LIBCURL_ZLIB
+	bool "Use zlib"
+	default n
+
+endmenu
diff --git a/trunk/package/network/utils/curl/Makefile b/trunk/package/network/utils/curl/Makefile
new file mode 100644
index 00000000..f78fa9e9
--- /dev/null
+++ b/trunk/package/network/utils/curl/Makefile
@@ -0,0 +1,162 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=curl
+PKG_VERSION:=7.38.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
+	http://www.mirrorspace.org/curl/ \
+	ftp://ftp.sunet.se/pub/www/utilities/curl/ \
+	ftp://ftp.planetmirror.com/pub/curl/ \
+	http://www.mirrormonster.com/curl/download/ \
+	http://curl.mirrors.cyberservers.net/download/
+PKG_MD5SUM:=af6b3c299bd891f43cb5f76c4091b7b4
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+
+PKG_CONFIG_DEPENDS := \
+  LIBCURL_AXTLS \
+  LIBCURL_COOKIES \
+  LIBCURL_CRYPTO_AUTH \
+  LIBCURL_CYASSL \
+  LIBCURL_DICT \
+  LIBCURL_FILE \
+  LIBCURL_FTP \
+  LIBCURL_GNUTLS \
+  LIBCURL_GOPHER \
+  LIBCURL_HTTP \
+  LIBCURL_IMAP \
+  LIBCURL_LDAP \
+  LIBCURL_LDAPS \
+  LIBCURL_LIBCURL_OPTION \
+  LIBCURL_NOSSL \
+  LIBCURL_OPENSSL \
+  LIBCURL_POLARSSL \
+  LIBCURL_POP3 \
+  LIBCURL_PROXY \
+  LIBCURL_RTSP \
+  LIBCURL_SMTP \
+  LIBCURL_SSPI \
+  LIBCURL_TELNET \
+  LIBCURL_TFTP \
+  LIBCURL_THREADED_RESOLVER \
+  LIBCURL_TLS-SRP \
+  LIBCURL_ZLIB
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/curl/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://curl.haxx.se/
+  MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
+endef
+
+define Package/curl
+  $(call Package/curl/Default)
+  SUBMENU:=File Transfer
+  DEPENDS:=+libcurl
+  TITLE:=A client-side URL transfer utility
+endef
+
+define Package/libcurl
+  $(call Package/curl/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_AXTLS:libaxtls +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread
+  TITLE:=A client-side URL transfer library using $(if $(CONFIG_LIBCURL_POLARSSL),PolarSSL)$(if $(CONFIG_LIBCURL_OPENSSL),OpenSSL)$(if $(CONFIG_LIBCURL_GNUTLS),GNUTLS)$(if $(CONFIG_LIBCURL_NOSSL),no SSL)
+  MENU:=1
+endef
+
+
+define Package/libcurl/config
+  source "$(SOURCE)/Config.in"
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-thread \
+	--enable-nonblocking \
+	--disable-ares \
+	--disable-debug \
+	--disable-manual \
+	--disable-verbose \
+	--without-ca-bundle \
+	$(if $(CONFIG_LIBCURL_OPENSSL),--with-ca-path=/etc/ssl/certs/) \
+	--without-krb4 \
+	--without-libidn \
+	--without-nss \
+	--without-libssh2 \
+	$(call autoconf_bool,CONFIG_IPV6,ipv6) \
+	$(if $(CONFIG_LIBCURL_AXTLS),--with-axtls="$(STAGING_DIR)/usr",--without-axtls) \
+	$(if $(CONFIG_LIBCURL_COOKIES),--enable,--disable)-cookies \
+	$(if $(CONFIG_LIBCURL_CRYPTO-AUTH),--enable,--disable)-crypto-auth \
+	$(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \
+	$(if $(CONFIG_LIBCURL_DICT),--enable,--disable)-dict \
+	$(if $(CONFIG_LIBCURL_FILE),--enable,--disable)-file \
+	$(if $(CONFIG_LIBCURL_FTP),--enable,--disable)-ftp \
+	$(if $(CONFIG_LIBCURL_GOPHER),--enable,--disable)-gopher \
+	$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \
+	$(if $(CONFIG_LIBCURL_HTTP),--enable,--disable)-http \
+	$(if $(CONFIG_LIBCURL_IMAP),--enable,--disable)-imap \
+	$(if $(CONFIG_LIBCURL_LDAP),--enable,--disable)-ldap \
+	$(if $(CONFIG_LIBCURL_LDAPS),--enable,--disable)-ldaps \
+	$(if $(CONFIG_LIBCURL_LIBCURL-OPTION),--enable,--disable)-libcurl-option \
+	$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \
+	$(if $(CONFIG_LIBCURL_POLARSSL),--with-polarssl="$(STAGING_DIR)/usr",--without-polarssl) \
+	$(if $(CONFIG_LIBCURL_POP3),--enable,--disable)-pop3 \
+	$(if $(CONFIG_LIBCURL_PROXY),--enable,--disable)-proxy \
+	$(if $(CONFIG_LIBCURL_RTSP),--enable,--disable)-rtsp \
+	$(if $(CONFIG_LIBCURL_TELNET),--enable,--disable)-telnet \
+	$(if $(CONFIG_LIBCURL_TFTP),--enable,--disable)-tftp \
+	$(if $(CONFIG_LIBCURL_SMTP),--enable,--disable)-smtp \
+	$(if $(CONFIG_LIBCURL_SSPI),--enable,--disable)-sspi \
+	$(if $(CONFIG_LIBCURL_THREADED_RESOLVER),--enable,--disable)-threaded-resolver \
+	$(if $(CONFIG_LIBCURL_TLS-SRP),--enable,--disable)-tls-srp \
+	$(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CC="$(TARGET_CC)" \
+		install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/
+	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config
+	[ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc || true
+	$(LN) $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/
+endef
+
+define Package/curl/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
+endef
+
+define Package/libcurl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,curl))
+$(eval $(call BuildPackage,libcurl))
diff --git a/trunk/package/network/utils/curl/patches/100-check_long_long.patch b/trunk/package/network/utils/curl/patches/100-check_long_long.patch
new file mode 100644
index 00000000..05fb1bfb
--- /dev/null
+++ b/trunk/package/network/utils/curl/patches/100-check_long_long.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2877,6 +2877,7 @@ CURL_VERIFY_RUNTIMELIBS
+ 
+ AC_CHECK_SIZEOF(size_t)
+ AC_CHECK_SIZEOF(long)
++AC_CHECK_SIZEOF(long long)
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(short)
+ CURL_CONFIGURE_LONG
diff --git a/trunk/package/network/utils/curl/patches/200-no_docs_tests.patch b/trunk/package/network/utils/curl/patches/200-no_docs_tests.patch
new file mode 100644
index 00000000..42619a38
--- /dev/null
+++ b/trunk/package/network/utils/curl/patches/200-no_docs_tests.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -128,7 +128,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
+ bin_SCRIPTS = curl-config
+ 
+ SUBDIRS = lib src include
+-DIST_SUBDIRS = $(SUBDIRS) tests packages docs
++DIST_SUBDIRS = $(SUBDIRS) packages
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libcurl.pc
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -574,7 +574,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
+ 
+ bin_SCRIPTS = curl-config
+ SUBDIRS = lib src include
+-DIST_SUBDIRS = $(SUBDIRS) tests packages docs
++DIST_SUBDIRS = $(SUBDIRS) packages
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libcurl.pc
+ LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c	\
diff --git a/trunk/package/network/utils/dante/Makefile b/trunk/package/network/utils/dante/Makefile
new file mode 100644
index 00000000..f10dd86c
--- /dev/null
+++ b/trunk/package/network/utils/dante/Makefile
@@ -0,0 +1,117 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dante
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.inet.no/dante/files/
+PKG_MD5SUM:=69b9d6234154d7d6a91fcbd98c68e62a
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=BSD-4-Clause
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -D_GNU_SOURCE
+CONFIGURE_ARGS += \
+	--without-upnp \
+	--without-pam \
+	--disable-libwrap
+
+CONFIGURE_VARS += \
+	CC="$(TARGET_CC) $(TARGET_CFLAGS)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*,la} $(1)/usr/lib/
+endef
+
+
+define Package/dante/default
+  TITLE:=Dante SOCKS
+  URL:=http://www.inet.no/dante/
+endef
+
+define Package/dante/default/description
+Dante is a circuit-level firewall/proxy that can be used to provide convenient
+and secure network connectivity, requiring only that the server Dante runs on
+has external network connectivity. Dante is used daily by Fortune 100 companies
+and large international organizations, either as a standard SOCKS server or as
+a "reverse proxy". 
+endef
+
+define Package/libsocks
+  $(call Package/dante/default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= Library
+endef
+
+define Package/libsocks/description
+$(call Package/dante/default/description)
+This package provides the shared libsocks library.
+endef
+
+define Package/libsocks/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsocks.so* $(1)/usr/lib/
+endef
+
+
+define Package/sockd
+  $(call Package/dante/default)
+  SUBMENU:=Web Servers/Proxies
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE+= Daemon
+endef
+
+define Package/sockd/description
+$(call Package/dante/default/description)
+This package provides the Dante sockd daemon.
+endef
+
+define Package/sockd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/sockd $(1)/usr/sbin/
+endef
+
+
+define Package/socksify
+  $(call Package/dante/default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE+= Client
+endef
+
+define Package/socksify/description
+$(call Package/dante/default/description)
+This package provides the Dante socksify client.
+endef
+
+define Package/socksify/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/socksify $(1)/usr/bin/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdsocks.so* $(1)/usr/lib/
+endef
+
+
+$(eval $(call BuildPackage,libsocks))
+$(eval $(call BuildPackage,sockd))
+$(eval $(call BuildPackage,socksify))
diff --git a/trunk/package/network/utils/dante/patches/001-automake-compat.patch b/trunk/package/network/utils/dante/patches/001-automake-compat.patch
new file mode 100644
index 00000000..4349a4b8
--- /dev/null
+++ b/trunk/package/network/utils/dante/patches/001-automake-compat.patch
@@ -0,0 +1,482 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,7 @@ echo "Configuring Dante ${version}${pren
+ 
+ AM_INIT_AUTOMAKE(dante, ${version}${prename})
+ AC_CONFIG_SRCDIR(include/common.h)
+-AM_CONFIG_HEADER(include/autoconf.h)
++AM_CONFIG_HEADER(autoconfig-is-soo-stupid.h include/autoconf.h)
+ 
+ AC_DEFINE(BAREFOOTD, 0, [we are Dante])
+ 
+@@ -38,17 +38,6 @@ AC_PROG_CPP
+ 
+ AM_CONDITIONAL(PRERELEASE, test x$prerelease != x)
+ 
+-#known keywords for --enable/disable-foo(=yes/no)?
+-LTINTERNAL="dlopen|dlopen_self|dlopen_self_static|fast_install|libtool_lock|win32_dll|shared_with_static_runtimes|shared_with_static_runtimes_CXX|shared_with_static_runtimes_F77"
+-KNOWN_KEYWORDS="$LTINTERNAL|shared|static|debug|warnings|diagnostic|profiling|linting|libwrap|preload|serverdl|clientdl|internal|pidfile|drt_fallback"
+-for keyword in `set | egrep '^enable_' | sed -e 's/^enable_\(.*\)=.*/\1/'`; do
+-    echo $keyword | egrep "^(${KNOWN_KEYWORDS})$" > /dev/null
+-    if test $? -ne 0; then
+-	AC_MSG_WARN([unknown option '$keyword', ignoring ...])
+-	sleep 10;
+-    fi
+-done
+-
+ case $host in
+     *-*-osf*)
+       	AC_MSG_WARN([OSF support might be removed in the near future.])
+@@ -175,31 +164,6 @@ case $host in
+     #XXX make sure compiling with compiler options works
+ esac
+ 
+-AC_MSG_CHECKING([for support for -pipe compiler flag])
+-oCFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_RUN([
+-int main()
+-{
+-	return 0;
+-}], [AC_MSG_RESULT([yes])
+-     comp_flags="${comp_flags} -pipe"],
+-    AC_MSG_RESULT([no]))
+-CFLAGS="$oCFLAGS"
+-
+-AC_MSG_CHECKING([for support for -Wbounded compiler flag])
+-oCFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS -Wbounded"
+-AC_TRY_RUN([
+-int main()
+-{
+-        return 0;
+-}], [AC_MSG_RESULT([yes])
+-     comp_flags="${comp_flags} -Wbounded"],
+-    [AC_MSG_RESULT([no])
+-     AC_DEFINE(__bounded__(a,b,c), , [empty __bounded__ macro])])
+-CFLAGS="$oCFLAGS"
+-
+ AC_MSG_CHECKING([for compilation with debugging])
+ AC_ARG_ENABLE(debug,
+ [  --enable-debug          compile with debugging support],
+@@ -608,43 +572,6 @@ else
+ fi], [AC_MSG_RESULT(no)
+       AC_MSG_WARN([performance in the server might be degraded without support for the SO_SNDLOWAT socket option])])
+ 
+-AC_MSG_CHECKING([whether realloc with a NULL pointer calls malloc])
+-AC_TRY_RUN([
+-#include <stdlib.h>
+-#ifndef NULL
+-#define NULL (char *)0
+-#endif
+-
+-int main()
+-{
+-	/* will assume this test doesn\'t fail because of lack of memory */
+-	if (realloc(NULL, 1) == NULL)
+-		return 1;
+-	else
+-		return 0;
+-}], [AC_MSG_RESULT(yes)],
+-    [AC_DEFINE(HAVE_NOMALLOC_REALLOC, 1, [realloc never calls malloc])
+-     AC_MSG_RESULT(no)])
+-
+-AC_MSG_CHECKING([whether free can be called with NULL])
+-AC_TRY_RUN([
+-#include <stdlib.h>
+-#ifndef NULL
+-#define NULL (char *)0
+-#endif
+-
+-int main()
+-{
+-	/* will assume core dump/seg fault if it doesn\'t work */
+-	free(NULL);
+-	return 0;
+-}], [AC_MSG_RESULT(yes)],
+-    [AC_DEFINE(HAVE_NONULL_FREE, 1, [free does not accept NULL parameter])
+-     AC_MSG_RESULT(no)])
+-
+-#A good time to save the cache (preload code might fail)
+-AC_CACHE_SAVE
+-
+ m4_include(preload.m4)
+ 
+ #construct SUBDIRS variable
+@@ -722,31 +649,8 @@ case $host in
+ 	;;
+ esac
+ 
+-AC_MSG_CHECKING([for CMSG_SPACE in sys/socket.h])
+-AC_TRY_RUN([
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-int main()
+-{
+-   int d = CMSG_SPACE(4);
+-   return 0;
+-}
+-], [AC_MSG_RESULT(yes)
+-    AC_DEFINE(HAVE_CMSG_SPACE, 1, CMSG_SPACE exists)],
+-   [AC_MSG_RESULT(no)])
+-
+-AC_MSG_CHECKING([for CMSG_LEN in sys/socket.h])
+-AC_TRY_RUN([
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-int main()
+-{
+-   int d = CMSG_LEN(4);
+-   return 0;
+-}], [AC_MSG_RESULT(yes)
+-    AC_DEFINE(HAVE_CMSG_LEN, 1, [CMSG_LEN exists])],
+-   [AC_MSG_RESULT(no)])
++AC_DEFINE(HAVE_CMSG_SPACE, 1, [CMSG_SPACE exists])
++AC_DEFINE(HAVE_CMSG_LEN, 1, [CMSG_LEN exists])
+ 
+ AC_MSG_CHECKING([for sa_len in sockaddr])
+ AC_TRY_COMPILE([
+@@ -913,10 +817,6 @@ else
+     AC_MSG_RESULT([yes])
+ fi
+ 
+-dnl determine GSSAPI support
+-no_gssapi=t
+-m4_include(gssapi.m4)
+-
+ dnl compatibility library tests
+ m4_include(libscompat.m4)
+ 
+@@ -978,15 +878,6 @@ global:
+ fi
+ AC_SUBST(MAPOPT)
+ 
+-#expected select behaviour?
+-unset nb_select_err
+-L_UNCON_SELECT([],
+- [nb_select_err=t])
+-
+-if test x"${nb_select_err}" = xt; then
+-   AC_MSG_WARN([operations on nonblocking sockets might fail on this platform])
+-fi
+-
+ AC_MSG_CHECKING([direct route fallback in client enabled])
+ with_drtfallback=t
+ AC_ARG_ENABLE(drt-fallback,
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -180,63 +180,7 @@ selectcheck(s)
+     [AC_MSG_RESULT(no)
+      [$2]])])
+ 
+-#can it really be this simple?
+-#nope, doesn't handle coff files which also have no underscore
+-AC_DEFUN([L_SYMBOL_UNDERSCORE],
+-[AC_MSG_CHECKING(for object file type)
+-AH_TEMPLATE([HAVE_NO_SYMBOL_UNDERSCORE], [platform symbol type])
+-AC_TRY_RUN([
+-/* look for ELF identification header at the start of argv[0] */
+-
+-#include <stdio.h>
+-#include <fcntl.h>
+-#include <string.h>
+-
+-/*
+- * ELF header, from ELF standard (Portable Formats Specification,
+- *  Version 1.1).
+- */
+-char elfheader[] = { 0x7f, 'E', 'L', 'F' };
+-
+-int
+-main (argc, argv)
+-	int argc;
+-	char *argv[];
+-{
+-	int fd;
+-	int len = sizeof(elfheader);
+-	char header[len];
+-
+-	if ((fd = open(argv[0], O_RDONLY, 0)) == -1) {
+-		perror("open");
+-		exit(1);
+-	}
+-	if (read(fd, header, len) != len) {
+-		perror("read");
+-		exit(1);
+-	}
+-	if (memcmp(header, elfheader, len) == 0)
+-		exit(0); /* pointy ears */
+-	else
+-		exit(1);
+-}
+-], [AC_MSG_RESULT(elf)
+-    AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE)],
+-   [
+-	#XXX exceptions for coff platforms, should be detected automatically
+-	case $host in
+-		alpha*-dec-osf*)
+-			AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE)
+-			AC_MSG_RESULT(coff)
+-			;;
+-		*-*-hpux*) #XXX apparently does not use underscore
+-			AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE)
+-			AC_MSG_RESULT(a.out?)
+-			;;
+-		*)
+-			AC_MSG_RESULT(a.out)
+-			;;
+-	esac])])
++AC_DEFUN([L_SYMBOL_UNDERSCORE], [AC_DEFINE(HAVE_NO_SYMBOL_UNDERSCORE, [1], [Automake sucks])])
+ 
+ 
+ dnl addproto - generate AC_DEFINE statements
+--- a/preload.m4
++++ b/preload.m4
+@@ -517,91 +517,6 @@ AC_DEFINE_UNQUOTED(LIBRARY_LIBC, "${LIBC
+ 
+ L_SYMBOL_UNDERSCORE()
+ 
+-AC_MSG_CHECKING([for working dlsym])
+-AC_TRY_RUN([
+-#include <dlfcn.h>
+-#include <stdio.h>
+-
+-#include "include/symbols.h"
+-
+-int main()
+-{
+-	void *lib;
+-	void *sym;
+-
+-	if ((lib = dlopen(LIBRARY_CONNECT, DL_LAZY)) == NULL) {
+-		fprintf(stderr, "dlopen: %s", dlerror());
+-		return 1;
+-	}
+-	(void)dlerror();
+-	if ((sym = dlsym(lib, SYMBOL_CONNECT)) == NULL) {
+-		fprintf(stderr, "dlsym: %s", dlerror());
+-		return 1;
+-	}
+-	return 0;
+-}], [AC_MSG_RESULT(yes)],
+-    [AC_MSG_RESULT(no)
+-     no_preload_client=t
+-     no_preload_server=t
+-     no_preload=t])
+-
+-AC_MSG_CHECKING([for working RTLD_NEXT])
+-AC_TRY_RUN([
+-#define _GNU_SOURCE
+-#include <dlfcn.h>
+-#include <stdio.h>
+-
+-#include "include/symbols.h"
+-
+-int main()
+-{
+-	void *sym;
+-
+-	if ((sym = dlsym(RTLD_NEXT, SYMBOL_READ)) == NULL) {
+-		fprintf(stderr, "dlsym: %s", dlerror());
+-		return 1;
+-	}
+-	return 0;
+-}], [AC_MSG_RESULT(yes)
+-     AC_DEFINE(HAVE_RTLD_NEXT, 1, [have working dlsym RTLD_NEXT])],
+-    [AC_MSG_RESULT(no)
+-     AC_DEFINE(HAVE_RTLD_NEXT, 0, [no working dlsym RTLD_NEXT])])
+-
+-#solaris might block preloading
+-AC_MSG_CHECKING([libc preload blocking])
+-AC_TRY_RUN([
+-#include <stdlib.h>
+-#include <string.h>
+-#include <unistd.h>                                                             
+-int
+-main(int argc, char *argv[])
+-{
+-   char buf[1024];
+-  
+-   strcpy(buf, "lari -V ");
+-   strcat(buf, argv[0]);
+-   strcat(buf, " | grep read | grep protected > /dev/null");
+-
+-   /*
+-    * return error if 'protected'
+-    * (ignore errors, not indicative of blocking) */ 
+-   if (system(buf) == 0)
+-        return 1;
+-   else
+-        return 0;
+-}
+-
+-ssize_t
+-read(d, buf, nbytes)
+-   int d;
+-   void *buf;
+-   size_t nbytes;
+-{
+-   return 0;
+-}
+-], [AC_MSG_RESULT(no)],
+-   [AC_MSG_RESULT(yes)
+-    AC_MSG_WARN([this platform blocks preloading of libraries])
+-    blocked_preload=t])
++AC_DEFINE(HAVE_RTLD_NEXT, 1, [have working dlsym RTLD_NEXT])
+ 
+ AC_CONFIG_FILES(bin/socksify)
+--- a/libscompat.m4
++++ b/libscompat.m4
+@@ -1,70 +1,6 @@
+ dnl libscompat.m4 - tests related to replacement code in libscompat directory
+ 
+-AC_MSG_CHECKING([for __attribute__ support])
+-AC_TRY_RUN([
+-#include <stdlib.h>
+-
+-void errfunc(void) __attribute((noreturn));
+-
+-void errfunc(void)
+-{
+-    exit(0);
+-}
+-
+-int main()
+-{
+-    errfunc();
+-}], [AC_MSG_RESULT([yes])],
+-    [AC_MSG_RESULT([no])
+-     AC_DEFINE(__attribute__(a), , [empty __attribute__ macro])])
+-
+-AC_MSG_CHECKING([for __printf__ attribute support])
+-if test x"$have_suncc" = xt; then
+-    AC_MSG_RESULT([disabled for sun cc])
+-    AC_DEFINE(format(a,b,c), , [empty format attribute macro])
+-else
+-    AC_TRY_RUN([
+-#include <stdlib.h>
+-
+-void func(const char *fmt, ...)
+-   __attribute__((format(__printf__, 1, 2)));
+-
+-void func(const char *fmt, ...) {
+-     (void)fmt;
+-     return;
+-}
+-
+-int main()
+-{
+-    func("foo");
+-    return 0;
+-}], [AC_MSG_RESULT([yes])],
+-    [AC_MSG_RESULT([no])
+-     AC_DEFINE(format(a,b,c), , [empty format attribute macro])])
+-fi
+-
+-AC_MSG_CHECKING([for timer macros])
+-AC_TRY_RUN([
+-#include <sys/time.h>
+-
+-int main()
+-{
+-    struct timeval tv, tv2, tv3;
+-
+-    tv.tv_sec = 0;
+-    tv.tv_usec = 0;
+-    tv2.tv_sec = 0;
+-    tv2.tv_usec = 0;
+-    tv3.tv_sec = 0;
+-    tv3.tv_usec = 0;
+-
+-    timeradd(&tv, &tv2, &tv3);
+-    timersub(&tv3, &tv2, &tv);
+-
+-    return 0; }],
+-[AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_TIMER_MACROS, 1, [timeradd(), timersub etc. exist in sys/time.h])],
+-[AC_MSG_RESULT(no)])
++AC_DEFINE(HAVE_TIMER_MACROS, 1, [timeradd(), timersub etc. exist in sys/time.h])
+ 
+ AC_CHECK_FUNCS(daemon difftime getifaddrs freeifaddrs hstrerror inet_aton)
+ AC_CHECK_FUNCS(inet_pton issetugid memmove seteuid setegid)
+@@ -72,53 +8,7 @@ AC_CHECK_FUNCS(setproctitle sockatmark s
+ AC_CHECK_FUNCS(bzero)
+ #inet_ntoa - only checked for incorrect behavior
+ 
+-#try to detect gcc bug (irix 64 problem, affects among others inet_ntoa)
+-AC_MSG_CHECKING([for incorrect inet_ntoa behaviour])
+-AC_TRY_RUN([
+-#include <sys/types.h>
+-#include <netinet/in.h>
+-#include <arpa/inet.h>
+-#include <sys/socket.h>
+-int main(void)
+-{
+-    struct sockaddr_in addr;
+-    char *a, *b = "195.195.195.195";
+-    addr.sin_addr.s_addr = inet_addr(b);
+-    a = inet_ntoa(addr.sin_addr);
+-    if (strcmp(a, b) == 0)
+-	return 1;
+-    else
+-	return 0;
+-}
+-], [AC_DEFINE(HAVE_BROKEN_INET_NTOA, 1, [platform bug])
+-    AC_MSG_RESULT(yes)
+-    ac_cv_func_inet_ntoa=no],
+-    AC_MSG_RESULT(no))
+-
+-if test x${ac_cv_func_sockatmark} = xyes; then
+-   AC_MSG_CHECKING([for working sockatmark])
+-   AC_TRY_RUN([
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-int
+-main()
+-{
+-    int s;
+-    int r;
+-
+-    if ((s = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
+-	return 1;
+-    if ((r = sockatmark(s)) == -1)
+-	return 1;
+-    if (r == 0)
+-	return 0;
+-    else
+-	return 1; /* would likely indicate an error */
+-}], [AC_MSG_RESULT(yes)],
+-    [AC_MSG_RESULT(no)
+-     ac_cv_func_sockatmark=no])
+-fi
++ac_cv_func_sockatmark=no
+ 
+ #only compile files that are needed
+ unset LIBSCSRC
+@@ -139,24 +29,3 @@ AC_SUBST([LIBSCSRC])
+ if test x${ac_cv_func_bzero} = xno; then
+     AC_DEFINE(bzero(b, len), memset((b), 0, (len)), [bzero replacement])
+ fi
+-
+-#causes problems with packaging, allow test to be turned off
+-AC_ARG_WITH(glibc-secure,
+-[  --without-glibc-secure  disable libc_enable_secure check @<:@default=detect@:>@],
+-[GLIBCSEC=$withval])
+-
+-if test "${GLIBCSEC}" != no; then
+-    AC_MSG_CHECKING([for __libc_enable_secure])
+-    AC_TRY_RUN([
+-extern int __libc_enable_secure;
+-
+-int main()
+-{
+-    if (__libc_enable_secure == 0)
+-	return 0;
+-
+-	return 1;
+-}],[AC_MSG_RESULT([yes])
+-    AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1, [linux version of issetugid()])],
+-    AC_MSG_RESULT([no]))
+-fi
diff --git a/trunk/package/network/utils/dante/patches/100-do-not-use-defdname.patch b/trunk/package/network/utils/dante/patches/100-do-not-use-defdname.patch
new file mode 100644
index 00000000..37b91a9f
--- /dev/null
+++ b/trunk/package/network/utils/dante/patches/100-do-not-use-defdname.patch
@@ -0,0 +1,42 @@
+--- a/lib/addressmatch.c
++++ b/lib/addressmatch.c
+@@ -399,18 +399,6 @@ addrmatch(rule, address, protocol, alias
+          if (hostareeq(rule->addr.domain, hostent->h_name)
+          ||  hostisinlist(rule->addr.domain, (const char **)hostent->h_aliases))
+             matched = 1;
+-#if !HAVE_NO_RESOLVESTUFF
+-         else if (strchr(hostent->h_name, '.') == NULL) {
+-            /* if hostname we got is non-qualified, try to qualify it. */
+-            char fqdn[MAXHOSTNAMELEN];
+-
+-            snprintf(fqdn, sizeof(fqdn), "%s.%s",
+-            hostent->h_name, _res.defdname);
+-
+-            if (hostareeq(rule->addr.domain, fqdn))
+-               matched = 1;
+-         }
+-#endif /* !HAVE_NO_RESOLVESTUFF */
+       }
+ 
+       if (!matched && alias) {
+@@ -465,20 +453,6 @@ addrmatch(rule, address, protocol, alias
+                   matched = 1;
+                   break;
+                }
+-#if !HAVE_NO_RESOLVESTUFF
+-               else if (strchr(ip->h_name, '.') == NULL) {
+-                  /* if hostname we got is non-qualified, try to qualify it. */
+-                  char fqdn[MAXHOSTNAMELEN];
+-
+-                  snprintf(fqdn, sizeof(fqdn), "%s.%s",
+-                  ip->h_name, _res.defdname);
+-
+-                  if (hostareeq(rule->addr.domain, fqdn)) {
+-                     matched = 1;
+-                     break;
+-                  }
+-               }
+-#endif /* !HAVE_NO_RESOLVESTUFF */
+             }
+ 
+             hostentfree(host);
diff --git a/trunk/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch b/trunk/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
new file mode 100644
index 00000000..7281ba60
--- /dev/null
+++ b/trunk/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
@@ -0,0 +1,36 @@
+--- a/lib/address.c
++++ b/lib/address.c
+@@ -45,11 +45,12 @@
+ 
+ #include "interposition.h"
+ 
+-#ifndef __USE_GNU
+-#define __USE_GNU /* XXX for RTLD_NEXT on Linux */
+-#endif /* !__USE_GNU */
+ #include <dlfcn.h>
+ 
++#ifndef RTLD_NEXT
++#define RTLD_NEXT  ((void *) -1l)
++#endif
++
+ static const char rcsid[] =
+ "$Id: address.c,v 1.177.2.2 2010/05/24 16:38:36 karls Exp $";
+ 
+--- a/dlib/interposition.c
++++ b/dlib/interposition.c
+@@ -66,11 +66,12 @@ sendto(HAVE_PROT_SENDTO_1, HAVE_PROT_SEN
+     HAVE_PROT_SENDTO_4, HAVE_PROT_SENDTO_5, HAVE_PROT_SENDTO_6);
+ #endif
+ 
+-#ifndef __USE_GNU
+-#define __USE_GNU /* XXX for RTLD_NEXT on Linux */
+-#endif /* !__USE_GNU */
+ #include <dlfcn.h>
+ 
++#ifndef RTLD_NEXT
++#define RTLD_NEXT  ((void *) -1l)
++#endif
++
+ #undef accept
+ #undef bind
+ #undef bindresvport
diff --git a/trunk/package/network/utils/ebtables/Makefile b/trunk/package/network/utils/ebtables/Makefile
new file mode 100644
index 00000000..8c2fe2c7
--- /dev/null
+++ b/trunk/package/network/utils/ebtables/Makefile
@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ebtables
+PKG_VERSION:=2.0.10-4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/ebtables
+PKG_MD5SUM:=506742a3d44b9925955425a659c1a8d0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ebtables
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  DEPENDS:=+kmod-ebtables
+  TITLE:=Ethernet bridge firewall administration utility
+  URL:=http://ebtables.sourceforge.net/
+endef
+
+define Package/ebtables-utils
+  $(call Package/ebtables)
+  DEPENDS += ebtables
+  TITLE:=ebtables save/restore utilities
+endef
+
+define Package/ebtables/description
+	The ebtables program is a filtering tool for a bridging firewall. The
+	filtering is focussed on the Link Layer Ethernet frame fields. Apart
+	from filtering, it also gives the ability to alter the Ethernet MAC
+	addresses and implement a brouter.
+endef
+
+define Package/ebtables-utils/description
+	$(call Package/ebtables/description)
+endef
+
+MAKE_VARS += EXT_LIBSI="$(LIBGCC_S)"
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LIBDIR="/usr/lib/ebtables"
+
+define Package/ebtables/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/ethertypes $(1)/etc/
+	$(INSTALL_DIR) $(1)/usr/lib/ebtables
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib*.so $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/extensions/*.so $(1)/usr/lib/ebtables/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/
+endef
+
+define Package/ebtables-utils/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-save $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-restore $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,ebtables))
+$(eval $(call BuildPackage,ebtables-utils))
diff --git a/trunk/package/network/utils/fwknop/Makefile b/trunk/package/network/utils/fwknop/Makefile
new file mode 100644
index 00000000..ccf57a5c
--- /dev/null
+++ b/trunk/package/network/utils/fwknop/Makefile
@@ -0,0 +1,118 @@
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fwknop
+PKG_VERSION:=2.6.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download
+PKG_MD5SUM:=259ae562a8fd845b67662fc8e504467e
+PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fwknop/Default
+  TITLE:=FireWall KNock OPerator
+  URL:=http://www.cipherdyne.org/fwknop/
+endef
+
+define Package/fwknop/Default/description
+  Fwknop implements an authorization scheme known as Single Packet Authorization
+  (SPA) for Linux systems running iptables.  This mechanism requires only a
+  single encrypted and non-replayed packet to communicate various pieces of
+  information including desired access through an iptables policy. The main
+  application of this program is to use iptables in a default-drop stance to
+  protect services such as SSH with an additional layer of security in order to
+  make the exploitation of vulnerabilities (both 0-day and unpatched code) much
+  more difficult.
+endef
+
+define Package/fwknopd
+  $(call Package/fwknop/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  TITLE+= Daemon
+  DEPENDS:=+iptables +libfko +libpcap
+endef
+
+define Package/fwknopd/description
+  $(call Package/fwknop/Default/description)
+  This package contains the fwknop daemon.
+endef
+
+define Package/fwknopd/conffiles
+/etc/fwknop/access.conf
+/etc/fwknop/fwknopd.conf
+endef
+
+define Package/fwknop
+  $(call Package/fwknop/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  TITLE+= Client
+  DEPENDS:=+libfko
+endef
+
+define Package/fwknop/description
+  $(call Package/fwknop/Default/description)
+  This package contains the fwknop client.
+endef
+
+define Package/libfko
+  $(call Package/fwknop/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=Firewall
+  TITLE+= Library
+endef
+
+define Package/libfko/description
+  $(call Package/fwknop/Default/description)
+  This package contains the libfko shared library.
+endef
+
+CONFIGURE_ARGS += \
+	--without-gpgme \
+	--with-iptables=/usr/sbin/iptables
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/fko.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfko.{a,la,so*} $(1)/usr/lib/
+endef
+
+define Package/fwknopd/install
+	$(INSTALL_DIR) $(1)/etc/fwknop
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/fwknop/{access,fwknopd}.conf \
+		$(1)/etc/fwknop/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/extras/fwknop.init.openwrt \
+		$(1)/etc/init.d/fwknopd
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fwknopd $(1)/usr/sbin/
+endef
+
+define Package/fwknop/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fwknop $(1)/usr/bin/
+endef
+
+define Package/libfko/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfko.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,fwknopd))
+$(eval $(call BuildPackage,fwknop))
+$(eval $(call BuildPackage,libfko))
diff --git a/trunk/package/network/utils/fwknop/patches/001-fix_config.patch b/trunk/package/network/utils/fwknop/patches/001-fix_config.patch
new file mode 100644
index 00000000..bc0c258c
--- /dev/null
+++ b/trunk/package/network/utils/fwknop/patches/001-fix_config.patch
@@ -0,0 +1,18 @@
+--- a/server/fwknopd.conf.inst
++++ b/server/fwknopd.conf.inst
+@@ -392,8 +392,13 @@
+ # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is
+ # enabled.
+ #
+-#IPT_FORWARD_ACCESS      ACCEPT, filter, FORWARD, 1, FWKNOP_FORWARD, 1;
+-#IPT_DNAT_ACCESS         DNAT, nat, PREROUTING, 1, FWKNOP_PREROUTING, 1;
++
++# These two lines are changed specifically for Openwrt, due to
++# different naming conventions. IPT_FORWARD is still disabled
++# by default, and must be enabled earlier in this file to be used.
++
++IPT_FORWARD_ACCESS      ACCEPT, filter, zone_wan_forward, 1, FWKNOP_FORWARD, 1;
++IPT_DNAT_ACCESS         DNAT, nat, zone_wan_prerouting, 1, FWKNOP_PREROUTING, 1;
+ 
+ # The IPT_SNAT_ACCESS variable is not used unless both ENABLE_IPT_SNAT and
+ # ENABLE_IPT_FORWARDING are enabled.  Also, the external static IP must be
diff --git a/trunk/package/network/utils/fwknop/patches/002-fix_init.patch b/trunk/package/network/utils/fwknop/patches/002-fix_init.patch
new file mode 100644
index 00000000..6370c8e6
--- /dev/null
+++ b/trunk/package/network/utils/fwknop/patches/002-fix_init.patch
@@ -0,0 +1,17 @@
+--- a/extras/openwrt/package/fwknop/files/fwknopd.init
++++ b/extras/openwrt/package/fwknop/files/fwknopd.init
+@@ -11,12 +11,12 @@ FWKNOPD_BIN=/usr/sbin/fwknopd
+ 
+ start()
+ {
+-	$FWKNOPD_BIN
++	service_start $FWKNOPD_BIN
+ }
+ 
+ stop()
+ {
+-	$FWKNOPD_BIN -K
++	service_stop $FWKNOPD_BIN -K
+ }
+ 
+ restart()
diff --git a/trunk/package/network/utils/git/Makefile b/trunk/package/network/utils/git/Makefile
new file mode 100644
index 00000000..a909e77f
--- /dev/null
+++ b/trunk/package/network/utils/git/Makefile
@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2009-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=git
+PKG_VERSION:=2.2.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@KERNEL/software/scm/git/
+PKG_MD5SUM:=5c9d20582297f8f24606fe49f515b584
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/git
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Version Control Systems
+  DEPENDS:=+libopenssl +libpthread +librt
+  TITLE:=The fast version control system
+  URL:=http://git-scm.com
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+endef
+
+define Package/git/description
+ Git is a free & open source, distributed version control system
+ designed to handle everything from small to very large projects
+ with speed and efficiency.
+endef
+
+MAKE_FLAGS := \
+	CC="$(TARGET_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CPPFLAGS="$(TARGET_CPPFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	NO_CURL="YesPlease" \
+	NO_EXPAT="YesPlease" \
+	NO_MKSTEMPS="YesPlease" \
+	NO_GETTEXT="YesPlease" \
+	NO_UNIX_SOCKETS="YesPlease" \
+	NO_IPV6="YesPlease" \
+	NO_ICONV="YesPlease" \
+	NO_NSEC="YesPlease" \
+	NO_PERL="YesPlease" \
+	NO_PYTHON="YesPlease" \
+	NO_TCLTK="YesPlease"
+
+define Build/Configure
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		configure
+
+	( cd $(PKG_BUILD_DIR); \
+		./configure --prefix=/usr \
+	);
+endef
+
+define Package/git/install
+	$(INSTALL_DIR) $(1)
+	$(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,git))
diff --git a/trunk/package/network/utils/git/patches/100-convert_builtin.patch b/trunk/package/network/utils/git/patches/100-convert_builtin.patch
new file mode 100644
index 00000000..e7ded54d
--- /dev/null
+++ b/trunk/package/network/utils/git/patches/100-convert_builtin.patch
@@ -0,0 +1,252 @@
+--- a/Makefile
++++ b/Makefile
+@@ -529,16 +529,7 @@ EXTRA_PROGRAMS =
+ # ... and all the rest that could be moved out of bindir to gitexecdir
+ PROGRAMS += $(EXTRA_PROGRAMS)
+ 
+-PROGRAM_OBJS += credential-store.o
+-PROGRAM_OBJS += daemon.o
+-PROGRAM_OBJS += fast-import.o
+-PROGRAM_OBJS += http-backend.o
+-PROGRAM_OBJS += imap-send.o
+-PROGRAM_OBJS += sh-i18n--envsubst.o
+-PROGRAM_OBJS += shell.o
+-PROGRAM_OBJS += show-index.o
+-PROGRAM_OBJS += upload-pack.o
+-PROGRAM_OBJS += remote-testsvn.o
++PROGRAM_OBJS =
+ 
+ # Binary suffix, set to .exe for Windows builds
+ X =
+@@ -887,6 +878,12 @@ BUILTIN_OBJS += builtin/verify-commit.o
+ BUILTIN_OBJS += builtin/verify-pack.o
+ BUILTIN_OBJS += builtin/verify-tag.o
+ BUILTIN_OBJS += builtin/write-tree.o
++BUILTIN_OBJS += builtin/daemon.o
++BUILTIN_OBJS += builtin/fast-import.o
++BUILTIN_OBJS += builtin/http-backend.o
++BUILTIN_OBJS += builtin/imap-send.o
++BUILTIN_OBJS += builtin/shell.o
++BUILTIN_OBJS += builtin/upload-pack.o
+ 
+ GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
+ EXTLIBS =
+@@ -1049,7 +1046,7 @@ endif
+ EXTLIBS += -lz
+ 
+ ifndef NO_OPENSSL
+-	OPENSSL_LIBSSL = -lssl
++	EXTLIBS += -lssl
+ 	ifdef OPENSSLDIR
+ 		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
+ 		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
+@@ -1895,10 +1892,6 @@ endif
+ git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
+ 
+-git-imap-send$X: imap-send.o GIT-LDFLAGS $(GITLIBS)
+-	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+-		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
+-
+ git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+ 		$(LIBS) $(CURL_LIBCURL)
+@@ -2216,24 +2209,22 @@ endif
+ 	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
+ 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
+ 	{ test "$$bindir/" = "$$execdir/" || \
+-	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
++	  for p in $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+-		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
++		ln -s git "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
+ 	  done; \
+ 	} && \
+ 	for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
+ 		$(RM) "$$bindir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
+ 		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
+ 	done && \
+ 	for p in $(BUILT_INS); do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
+ 	done && \
+--- a/builtin.h
++++ b/builtin.h
+@@ -138,5 +138,11 @@ extern int cmd_verify_pack(int argc, con
+ extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
+ extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
+ extern int cmd_replace(int argc, const char **argv, const char *prefix);
++extern int cmd_daemon(int argc, char **argv, const char *prefix);
++extern int cmd_fast_import(int argc, char **argv, const char *prefix);
++extern int cmd_http_backend(int argc, char **argv, const char *prefix);
++extern int cmd_imap_send(int argc, char **argv, const char *prefix);
++extern int cmd_shell(int argc, char **argv, const char *prefix);
++extern int cmd_upload_pack(int argc, char **argv, const char *prefix);
+ 
+ #endif
+--- /dev/null
++++ b/builtin/daemon.c
+@@ -0,0 +1 @@
++#include "../daemon.c"
+--- /dev/null
++++ b/builtin/fast-import.c
+@@ -0,0 +1 @@
++#include "../fast-import.c"
+--- /dev/null
++++ b/builtin/http-backend.c
+@@ -0,0 +1 @@
++#include "../http-backend.c"
+--- /dev/null
++++ b/builtin/imap-send.c
+@@ -0,0 +1 @@
++#include "../imap-send.c"
+--- /dev/null
++++ b/builtin/shell.c
+@@ -0,0 +1 @@
++#include "../shell.c"
+--- /dev/null
++++ b/builtin/upload-pack.c
+@@ -0,0 +1 @@
++#include "../upload-pack.c"
+--- a/daemon.c
++++ b/daemon.c
+@@ -1096,7 +1096,7 @@ static int serve(struct string_list *lis
+ 	return service_loop(&socklist);
+ }
+ 
+-int main(int argc, char **argv)
++int cmd_daemon(int argc, char **argv, const char *prefix)
+ {
+ 	int listen_port = 0;
+ 	struct string_list listen_addr = STRING_LIST_INIT_NODUP;
+@@ -1292,12 +1292,13 @@ int main(int argc, char **argv)
+ 		store_pid(pid_file);
+ 
+ 	/* prepare argv for serving-processes */
+-	cld_argv = xmalloc(sizeof (char *) * (argc + 2));
+-	cld_argv[0] = argv[0];	/* git-daemon */
+-	cld_argv[1] = "--serve";
++	cld_argv = xmalloc(sizeof (char *) * (argc + 3));
++	cld_argv[0] = "git";
++	cld_argv[1] = argv[0];	/* daemon */
++	cld_argv[2] = "--serve";
+ 	for (i = 1; i < argc; ++i)
+-		cld_argv[i+1] = argv[i];
+-	cld_argv[argc+1] = NULL;
++		cld_argv[i+2] = argv[i];
++	cld_argv[argc+2] = NULL;
+ 
+ 	return serve(&listen_addr, listen_port, cred);
+ }
+--- a/fast-import.c
++++ b/fast-import.c
+@@ -3350,7 +3350,7 @@ static void parse_argv(void)
+ 		read_marks();
+ }
+ 
+-int main(int argc, char **argv)
++int cmd_fast_import(int argc, char **argv, const char *prefix)
+ {
+ 	unsigned int i;
+ 
+--- a/git.c
++++ b/git.c
+@@ -312,11 +312,11 @@ static int handle_alias(int *argcp, cons
+ 
+ struct cmd_struct {
+ 	const char *cmd;
+-	int (*fn)(int, const char **, const char *);
++	int (*fn)(int, char **, const char *);
+ 	int option;
+ };
+ 
+-static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
++static int run_builtin(struct cmd_struct *p, int argc, char **argv)
+ {
+ 	int status, help;
+ 	struct stat st;
+@@ -396,6 +396,7 @@ static struct cmd_struct commands[] = {
+ 	{ "config", cmd_config, RUN_SETUP_GENTLY },
+ 	{ "count-objects", cmd_count_objects, RUN_SETUP },
+ 	{ "credential", cmd_credential, RUN_SETUP_GENTLY },
++	{ "daemon", cmd_daemon },
+ 	{ "describe", cmd_describe, RUN_SETUP },
+ 	{ "diff", cmd_diff },
+ 	{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE },
+@@ -414,6 +415,8 @@ static struct cmd_struct commands[] = {
+ 	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
+ 	{ "hash-object", cmd_hash_object },
+ 	{ "help", cmd_help },
++	{ "http-backend", cmd_http_backend },
++	{ "imap-send", cmd_imap_send },
+ 	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
+ 	{ "init", cmd_init_db, NO_SETUP },
+ 	{ "init-db", cmd_init_db, NO_SETUP },
+@@ -462,6 +465,7 @@ static struct cmd_struct commands[] = {
+ 	{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
+ 	{ "rm", cmd_rm, RUN_SETUP },
+ 	{ "send-pack", cmd_send_pack, RUN_SETUP },
++	{ "shell", cmd_shell },
+ 	{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
+ 	{ "show", cmd_show, RUN_SETUP },
+ 	{ "show-branch", cmd_show_branch, RUN_SETUP },
+@@ -478,6 +482,7 @@ static struct cmd_struct commands[] = {
+ 	{ "update-server-info", cmd_update_server_info, RUN_SETUP },
+ 	{ "upload-archive", cmd_upload_archive },
+ 	{ "upload-archive--writer", cmd_upload_archive_writer },
++	{ "upload-pack", cmd_upload_pack },
+ 	{ "var", cmd_var, RUN_SETUP_GENTLY },
+ 	{ "verify-commit", cmd_verify_commit, RUN_SETUP },
+ 	{ "verify-pack", cmd_verify_pack },
+--- a/http-backend.c
++++ b/http-backend.c
+@@ -557,7 +557,7 @@ static struct service_cmd {
+ 	{"POST", "/git-receive-pack$", service_rpc}
+ };
+ 
+-int main(int argc, char **argv)
++int cmd_http_backend(int argc, char **argv, const char *prefix)
+ {
+ 	char *method = getenv("REQUEST_METHOD");
+ 	char *dir;
+--- a/imap-send.c
++++ b/imap-send.c
+@@ -1338,7 +1338,7 @@ static void git_imap_config(void)
+ 	git_config_get_string("imap.authmethod", &server.auth_method);
+ }
+ 
+-int main(int argc, char **argv)
++int cmd_imap_send(int argc, char **argv, const char *prefix)
+ {
+ 	struct strbuf all_msgs = STRBUF_INIT;
+ 	struct strbuf msg = STRBUF_INIT;
+--- a/shell.c
++++ b/shell.c
+@@ -138,7 +138,7 @@ static struct commands {
+ 	{ NULL },
+ };
+ 
+-int main(int argc, char **argv)
++int cmd_shell(int argc, char **argv, const char *prefix)
+ {
+ 	char *prog;
+ 	const char **user_argv;
+--- a/upload-pack.c
++++ b/upload-pack.c
+@@ -791,7 +791,7 @@ static int upload_pack_config(const char
+ 	return parse_hide_refs_config(var, value, "uploadpack");
+ }
+ 
+-int main(int argc, char **argv)
++int cmd_upload_pack(int argc, char **argv, const char *prefix)
+ {
+ 	char *dir;
+ 	int i;
diff --git a/trunk/package/network/utils/git/patches/200-disable_fasthash.patch b/trunk/package/network/utils/git/patches/200-disable_fasthash.patch
new file mode 100644
index 00000000..91f255f8
--- /dev/null
+++ b/trunk/package/network/utils/git/patches/200-disable_fasthash.patch
@@ -0,0 +1,12 @@
+--- a/config.mak.uname
++++ b/config.mak.uname
+@@ -17,9 +17,6 @@ endif
+ # because maintaining the nesting to match is a pain.  If
+ # we had "elif" things would have been much nicer...
+ 
+-ifeq ($(uname_M),x86_64)
+-	XDL_FAST_HASH = YesPlease
+-endif
+ ifeq ($(uname_S),OSF1)
+ 	# Need this for u_short definitions et al
+ 	BASIC_CFLAGS += -D_OSF_SOURCE
diff --git a/trunk/package/network/utils/ifenslave/Makefile b/trunk/package/network/utils/ifenslave/Makefile
new file mode 100644
index 00000000..658fe9ea
--- /dev/null
+++ b/trunk/package/network/utils/ifenslave/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ifenslave
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ifenslave
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-bonding @(LINUX_3_3||LINUX_3_6||LINUX_3_7||LINUX_3_8||LINUX_3_9||LINUX_3_10)
+  TITLE:=A utility to manipulate kernel ethernet bonding devices
+  VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
+  URL:=http://www.kernel.org
+endef
+
+define Package/ifenslave/description
+ ifenslave is needed to add/remove interfaces to/from ethernet bond devices.
+endef
+
+define Build/Prepare
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/ifenslave \
+		$(LINUX_DIR)/Documentation/networking/ifenslave.c
+endef
+
+define Package/ifenslave/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifenslave $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ifenslave))
diff --git a/trunk/package/network/utils/iftop/Makefile b/trunk/package/network/utils/iftop/Makefile
new file mode 100644
index 00000000..037fb15c
--- /dev/null
+++ b/trunk/package/network/utils/iftop/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iftop
+PKG_VERSION:=1.0pre2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.ex-parrot.com/~pdw/iftop/download
+PKG_MD5SUM:=fef521a49ec0122458d02c64212af3c5
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/iftop
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpcap +libncurses +libpthread
+  TITLE:=display bandwith usage on an interface
+  URL:=http://www.ex-parrot.com/~pdw/iftop/
+endef
+
+define Package/iftop/description
+	iftop does for network usage what top(1) does for CPU usage. It 
+	listens to network traffic on a named interface and displays a 
+	table of current bandwidth usage by pairs of hosts. Handy for 
+	answering the question 'why is our ADSL link so slow?'.
+endef
+
+define Package/iftop/install	
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iftop $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,iftop))
diff --git a/trunk/package/network/utils/iftop/patches/0001-force-ncurses.patch b/trunk/package/network/utils/iftop/patches/0001-force-ncurses.patch
new file mode 100644
index 00000000..bf23fb4d
--- /dev/null
+++ b/trunk/package/network/utils/iftop/patches/0001-force-ncurses.patch
@@ -0,0 +1,12 @@
+diff -ru iftop-1.0pre2-old/configure iftop-1.0pre2/configure
+--- iftop-1.0pre2-old/configure	2011-10-04 13:30:30.000000000 -0700
++++ iftop-1.0pre2/configure	2012-09-09 22:26:05.000000000 -0700
+@@ -7568,7 +7568,7 @@
+ { $as_echo "$as_me:$LINENO: checking for a curses library containing mvchgat" >&5
+ $as_echo_n "checking for a curses library containing mvchgat... " >&6; }
+ oldLIBS=$LIBS
+-for curseslib in ncursesw curses ncurses ; do
++for curseslib in ncurses ; do
+     LIBS="$oldLIBS -l$curseslib"
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
diff --git a/trunk/package/network/utils/iperf/Makefile b/trunk/package/network/utils/iperf/Makefile
new file mode 100644
index 00000000..414342d0
--- /dev/null
+++ b/trunk/package/network/utils/iperf/Makefile
@@ -0,0 +1,88 @@
+#
+# Copyright (C) 2007-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iperf
+PKG_VERSION:=2.0.5
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=44b5536b67719f4250faed632a3cd016
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=BSD-3-Clause
+
+PKG_BUILD_PARALLEL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
+
+include $(INCLUDE_DIR)/uclibc++.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/iperf/Default
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:= $(CXX_DEPENDS)
+  TITLE:=Internet Protocol bandwidth measuring tool
+  URL:=http://sourceforge.net/projects/iperf/
+endef
+
+define Package/iperf/Default/description
+ Iperf is a modern alternative for measuring TCP and UDP bandwidth
+ performance, allowing the tuning of various parameters and
+ characteristics.
+endef
+
+define Package/iperf
+$(call Package/iperf/Default)
+  TITLE+= (with single thread support)
+  VARIANT:=single
+endef
+
+define Package/iperf/description
+$(call Package/iperf/Default/description)
+ This package is built with single thread support.
+endef
+
+define Package/iperf-mt
+$(call Package/iperf/Default)
+  DEPENDS+= +libpthread
+  TITLE+= (with multithread support)
+  VARIANT:=mt
+endef
+
+define Package/iperf-mt/description
+$(call Package/iperf/Default/description)
+ This package is built with multithread support.
+endef
+
+CONFIGURE_ARGS += --disable-multicast
+CONFIGURE_VARS += ac_cv_func_malloc_0_nonnull=yes
+
+ifeq ($(BUILD_VARIANT),single)
+  CONFIGURE_ARGS += --disable-threads
+else
+  CONFIGURE_ARGS += --enable-threads=posix
+  CONFIGURE_VARS += ac_cv_func_pthread_cancel=no
+endif
+
+CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
+
+ifeq ($(BUILD_VARIANT),mt)
+  CONFIGURE_VARS += LIBS="-lpthread"
+endif
+
+define Package/iperf/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/iperf $(1)/usr/bin/iperf
+endef
+Package/iperf-mt/install = $(Package/iperf/install)
+
+$(eval $(call BuildPackage,iperf))
+$(eval $(call BuildPackage,iperf-mt))
diff --git a/trunk/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch b/trunk/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch
new file mode 100644
index 00000000..c61c7549
--- /dev/null
+++ b/trunk/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch
@@ -0,0 +1,14 @@
+--- a/src/Reporter.c
++++ b/src/Reporter.c
+@@ -308,6 +308,11 @@ ReportHeader* InitReport( thread_Setting
+ #else
+         // set start time
+         gettimeofday( &(reporthdr->report.startTime), NULL );
++
++	// set next time
++	reporthdr->report.nextTime = reporthdr->report.startTime;
++	TimeAdd( reporthdr->report.nextTime, reporthdr->report.intervalTime );
++
+         /*
+          * Process the report in this thread
+          */
diff --git a/trunk/package/network/utils/iproute2/Makefile b/trunk/package/network/utils/iproute2/Makefile
new file mode 100644
index 00000000..6cfff094
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/Makefile
@@ -0,0 +1,142 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iproute2
+PKG_VERSION:=3.16.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/
+PKG_MD5SUM:=6c823b40fdcfa7b8120743349a52ac18
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/iproute2/Default
+  TITLE:=Routing control utility ($(2))
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
+  SUBMENU:=Routing and Redirection
+  MAINTAINER:=Russell Senior <russell@personaltelco.net>
+  DEPENDS:= +libnl-tiny
+  VARIANT:=$(1)
+endef
+
+define Package/ip
+$(call Package/iproute2/Default,tiny,Minimal)
+  CONFLICTS:=ip-full
+endef
+
+Package/ip-full=$(call Package/iproute2/Default,full,Full)
+
+define Package/ip/conffiles
+/etc/iproute2/rt_tables
+endef
+
+define Package/ip-$(BUILD_VARIANT)/conffiles
+$(Package/ip/conffiles)
+endef
+
+define Package/tc
+$(call Package/iproute2/Default)
+  TITLE:=Traffic control utility
+  DEPENDS:=+kmod-sched-core
+endef
+
+define Package/genl
+$(call Package/iproute2/Default)
+  TITLE:=General netlink utility frontend
+endef
+
+define Package/ss
+$(call Package/iproute2/Default)
+  TITLE:=Socket statistics utility
+endef
+
+ifeq ($(BUILD_VARIANT),tiny)
+  IP_CONFIG_TINY:=y
+endif
+
+define Build/Configure
+	$(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
+	$(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
+		$(PKG_BUILD_DIR)/Makefile
+	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
+		$(PKG_BUILD_DIR)/Makefile
+	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-librecmc\";" \
+		> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
+endef
+
+ifdef CONFIG_USE_EGLIBC
+  ifndef CONFIG_EGLIBC_VERSION_2_13
+    TARGET_CFLAGS += -DHAVE_SETNS
+  endif
+endif
+ifdef CONFIG_USE_MUSL
+  TARGET_CFLAGS += -DHAVE_SETNS
+endif
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+
+MAKE_FLAGS += \
+	EXTRA_CCOPTS="$(TARGET_CFLAGS) -I../include -I$(STAGING_DIR)/usr/include/libnl-tiny" \
+	KERNEL_INCLUDE="$(LINUX_DIR)/include" \
+	SHARED_LIBS="" \
+	LDFLAGS="-Wl,--gc-sections" \
+	IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
+	FPIC="$(FPIC)"
+
+define Build/Compile
+	+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/include/libnetlink.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/
+endef
+
+define Package/ip/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/iproute2
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/iproute2/rt_tables $(1)/etc/iproute2
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/
+endef
+
+define Package/ip-$(BUILD_VARIANT)/install
+	$(Package/ip/install)
+endef
+
+define Package/tc/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/
+endef
+
+define Package/genl/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/
+endef
+
+define Package/ss/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,ip))
+$(eval $(call BuildPackage,ip-full))
+$(eval $(call BuildPackage,tc))
+$(eval $(call BuildPackage,genl))
+$(eval $(call BuildPackage,ss))
diff --git a/trunk/package/network/utils/iproute2/files/15-teql b/trunk/package/network/utils/iproute2/files/15-teql
new file mode 100644
index 00000000..a0c0e503
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/files/15-teql
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+if [ "$ACTION" != "ifup" ]; then
+	exit
+fi
+
+config_load network
+
+config_get teql $INTERFACE teql
+
+if [ "$teql" != "" ]; then
+    logger Adding device $DEVICE to TEQL master $teql
+    insmod sch_teql
+    tc qdisc add dev $DEVICE root $teql
+
+    # The kernel doesn't let us bring it up until it has at least one
+    # slave. So bring it up now, if it isn't already.
+    if ! cat /sys/class/net/$teql/carrier &>/dev/null; then
+        ifup $teql &
+    fi
+fi
diff --git a/trunk/package/network/utils/iproute2/patches/001-config.patch b/trunk/package/network/utils/iproute2/patches/001-config.patch
new file mode 100644
index 00000000..ece86529
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/001-config.patch
@@ -0,0 +1,7 @@
+--- /dev/null
++++ b/Config
+@@ -0,0 +1,4 @@
++# Fixed config to disable ATM support even if present on host system
++TC_CONFIG_ATM:=n
++TC_CONFIG_ACTION_GACT=y
++TC_CONFIG_ACTION_PROB=y
diff --git a/trunk/package/network/utils/iproute2/patches/004-darwin_fixes.patch b/trunk/package/network/utils/iproute2/patches/004-darwin_fixes.patch
new file mode 100644
index 00000000..e1a5e975
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/004-darwin_fixes.patch
@@ -0,0 +1,59 @@
+--- a/netem/maketable.c
++++ b/netem/maketable.c
+@@ -10,7 +10,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- a/netem/normal.c
++++ b/netem/normal.c
+@@ -8,8 +8,12 @@
+ #include <string.h>
+ #include <limits.h>
+ 
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
++#else
++#define NETEM_DIST_SCALE        8192
++#endif
+ 
+ #define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
+--- a/netem/pareto.c
++++ b/netem/pareto.c
+@@ -7,8 +7,12 @@
+ #include <math.h>
+ #include <limits.h>
+ 
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
++#else
++#define NETEM_DIST_SCALE        8192
++#endif
+ 
+ static const double a=3.0;
+ #define TABLESIZE	16384
+--- a/netem/paretonormal.c
++++ b/netem/paretonormal.c
+@@ -15,10 +15,13 @@
+ #include <string.h>
+ #include <math.h>
+ #include <limits.h>
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+-
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
++#else
++#define NETEM_DIST_SCALE        8192
++#endif
+ 
+ #define TABLESIZE	16384
+ #define TABLEFACTOR	NETEM_DIST_SCALE
diff --git a/trunk/package/network/utils/iproute2/patches/006-no_sctp.patch b/trunk/package/network/utils/iproute2/patches/006-no_sctp.patch
new file mode 100644
index 00000000..d4a0de00
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/006-no_sctp.patch
@@ -0,0 +1,18 @@
+--- a/ip/ipxfrm.c
++++ b/ip/ipxfrm.c
+@@ -469,7 +469,6 @@ void xfrm_selector_print(struct xfrm_sel
+ 	switch (sel->proto) {
+ 	case IPPROTO_TCP:
+ 	case IPPROTO_UDP:
+-	case IPPROTO_SCTP:
+ 	case IPPROTO_DCCP:
+ 	default: /* XXX */
+ 		if (sel->sport_mask)
+@@ -1282,7 +1281,6 @@ static int xfrm_selector_upspec_parse(st
+ 		switch (sel->proto) {
+ 		case IPPROTO_TCP:
+ 		case IPPROTO_UDP:
+-		case IPPROTO_SCTP:
+ 		case IPPROTO_DCCP:
+ 			break;
+ 		default:
diff --git a/trunk/package/network/utils/iproute2/patches/007-no_arpd.patch b/trunk/package/network/utils/iproute2/patches/007-no_arpd.patch
new file mode 100644
index 00000000..6a7e24ec
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/007-no_arpd.patch
@@ -0,0 +1,11 @@
+--- a/misc/Makefile
++++ b/misc/Makefile
+@@ -1,7 +1,7 @@
+ SSOBJ=ss.o ssfilter.o
+ LNSTATOBJ=lnstat.o lnstat_util.o
+ 
+-TARGETS=ss nstat ifstat rtacct arpd lnstat
++TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../Config
+ 
diff --git a/trunk/package/network/utils/iproute2/patches/008-no_netem.patch b/trunk/package/network/utils/iproute2/patches/008-no_netem.patch
new file mode 100644
index 00000000..165ce0c9
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/008-no_netem.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
+ CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+ 
+-SUBDIRS=lib ip tc bridge misc netem genl man
++SUBDIRS=lib ip tc bridge misc genl man
+ 
+ LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
+ LDLIBS += $(LIBNETLINK)
diff --git a/trunk/package/network/utils/iproute2/patches/010-type_fixes.patch b/trunk/package/network/utils/iproute2/patches/010-type_fixes.patch
new file mode 100644
index 00000000..e0055fce
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/010-type_fixes.patch
@@ -0,0 +1,396 @@
+--- a/include/iptables_common.h
++++ b/include/iptables_common.h
+@@ -2,6 +2,8 @@
+ #define _IPTABLES_COMMON_H
+ /* Shared definitions between ipv4 and ipv6. */
+ 
++#include <stdint.h>
++
+ enum exittype {
+ 	OTHER_PROBLEM = 1,
+ 	PARAMETER_PROBLEM,
+@@ -43,9 +45,9 @@ extern char *lib_dir;
+   extern void init_extensions(void);
+ #endif
+ 
+-#define __be32	u_int32_t
+-#define __le32	u_int32_t
+-#define __be16	u_int16_t
+-#define __le16	u_int16_t
++#define __be32	uint32_t
++#define __le32	uint32_t
++#define __be16	uint16_t
++#define __le16	uint16_t
+ 
+ #endif /*_IPTABLES_COMMON_H*/
+--- a/include/netinet/tcp.h
++++ /dev/null
+@@ -1,231 +0,0 @@
+-/*
+- * Copyright (c) 1982, 1986, 1993
+- *	The Regents of the University of California.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in the
+- *    documentation and/or other materials provided with the distribution.
+- * 4. Neither the name of the University nor the names of its contributors
+- *    may be used to endorse or promote products derived from this software
+- *    without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+- * SUCH DAMAGE.
+- *
+- *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
+- */
+-
+-#ifndef _NETINET_TCP_H
+-#define _NETINET_TCP_H	1
+-
+-#include <features.h>
+-
+-/*
+- * User-settable options (used with setsockopt).
+- */
+-#define	TCP_NODELAY	 1	/* Don't delay send to coalesce packets  */
+-#define	TCP_MAXSEG	 2	/* Set maximum segment size  */
+-#define TCP_CORK	 3	/* Control sending of partial frames  */
+-#define TCP_KEEPIDLE	 4	/* Start keeplives after this period */
+-#define TCP_KEEPINTVL	 5	/* Interval between keepalives */
+-#define TCP_KEEPCNT	 6	/* Number of keepalives before death */
+-#define TCP_SYNCNT	 7	/* Number of SYN retransmits */
+-#define TCP_LINGER2	 8	/* Life time of orphaned FIN-WAIT-2 state */
+-#define TCP_DEFER_ACCEPT 9	/* Wake up listener only when data arrive */
+-#define TCP_WINDOW_CLAMP 10	/* Bound advertised window */
+-#define TCP_INFO	 11	/* Information about this connection. */
+-#define	TCP_QUICKACK	 12	/* Bock/reenable quick ACKs.  */
+-#define TCP_CONGESTION	 13	/* Congestion control algorithm.  */
+-
+-#ifdef __USE_MISC
+-# include <sys/types.h>
+-
+-# ifdef __FAVOR_BSD
+-typedef	u_int32_t tcp_seq;
+-/*
+- * TCP header.
+- * Per RFC 793, September, 1981.
+- */
+-struct tcphdr
+-  {
+-    u_int16_t th_sport;		/* source port */
+-    u_int16_t th_dport;		/* destination port */
+-    tcp_seq th_seq;		/* sequence number */
+-    tcp_seq th_ack;		/* acknowledgement number */
+-#  if __BYTE_ORDER == __LITTLE_ENDIAN
+-    u_int8_t th_x2:4;		/* (unused) */
+-    u_int8_t th_off:4;		/* data offset */
+-#  endif
+-#  if __BYTE_ORDER == __BIG_ENDIAN
+-    u_int8_t th_off:4;		/* data offset */
+-    u_int8_t th_x2:4;		/* (unused) */
+-#  endif
+-    u_int8_t th_flags;
+-#  define TH_FIN	0x01
+-#  define TH_SYN	0x02
+-#  define TH_RST	0x04
+-#  define TH_PUSH	0x08
+-#  define TH_ACK	0x10
+-#  define TH_URG	0x20
+-    u_int16_t th_win;		/* window */
+-    u_int16_t th_sum;		/* checksum */
+-    u_int16_t th_urp;		/* urgent pointer */
+-};
+-
+-# else /* !__FAVOR_BSD */
+-struct tcphdr
+-  {
+-    u_int16_t source;
+-    u_int16_t dest;
+-    u_int32_t seq;
+-    u_int32_t ack_seq;
+-#  if __BYTE_ORDER == __LITTLE_ENDIAN
+-    u_int16_t res1:4;
+-    u_int16_t doff:4;
+-    u_int16_t fin:1;
+-    u_int16_t syn:1;
+-    u_int16_t rst:1;
+-    u_int16_t psh:1;
+-    u_int16_t ack:1;
+-    u_int16_t urg:1;
+-    u_int16_t res2:2;
+-#  elif __BYTE_ORDER == __BIG_ENDIAN
+-    u_int16_t doff:4;
+-    u_int16_t res1:4;
+-    u_int16_t res2:2;
+-    u_int16_t urg:1;
+-    u_int16_t ack:1;
+-    u_int16_t psh:1;
+-    u_int16_t rst:1;
+-    u_int16_t syn:1;
+-    u_int16_t fin:1;
+-#  else
+-#   error "Adjust your <bits/endian.h> defines"
+-#  endif
+-    u_int16_t window;
+-    u_int16_t check;
+-    u_int16_t urg_ptr;
+-};
+-# endif /* __FAVOR_BSD */
+-
+-enum
+-{
+-  TCP_ESTABLISHED = 1,
+-  TCP_SYN_SENT,
+-  TCP_SYN_RECV,
+-  TCP_FIN_WAIT1,
+-  TCP_FIN_WAIT2,
+-  TCP_TIME_WAIT,
+-  TCP_CLOSE,
+-  TCP_CLOSE_WAIT,
+-  TCP_LAST_ACK,
+-  TCP_LISTEN,
+-  TCP_CLOSING   /* now a valid state */
+-};
+-
+-# define TCPOPT_EOL		0
+-# define TCPOPT_NOP		1
+-# define TCPOPT_MAXSEG		2
+-# define TCPOLEN_MAXSEG		4
+-# define TCPOPT_WINDOW		3
+-# define TCPOLEN_WINDOW		3
+-# define TCPOPT_SACK_PERMITTED	4		/* Experimental */
+-# define TCPOLEN_SACK_PERMITTED	2
+-# define TCPOPT_SACK		5		/* Experimental */
+-# define TCPOPT_TIMESTAMP	8
+-# define TCPOLEN_TIMESTAMP	10
+-# define TCPOLEN_TSTAMP_APPA	(TCPOLEN_TIMESTAMP+2) /* appendix A */
+-
+-# define TCPOPT_TSTAMP_HDR	\
+-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
+-
+-/*
+- * Default maximum segment size for TCP.
+- * With an IP MSS of 576, this is 536,
+- * but 512 is probably more convenient.
+- * This should be defined as MIN(512, IP_MSS - sizeof (struct tcpiphdr)).
+- */
+-# define TCP_MSS	512
+-
+-# define TCP_MAXWIN	65535	/* largest value for (unscaled) window */
+-
+-# define TCP_MAX_WINSHIFT	14	/* maximum window shift */
+-
+-# define SOL_TCP		6	/* TCP level */
+-
+-
+-# define TCPI_OPT_TIMESTAMPS	1
+-# define TCPI_OPT_SACK		2
+-# define TCPI_OPT_WSCALE	4
+-# define TCPI_OPT_ECN		8
+-# define TCPI_OPT_ECN_SEEN	16
+-
+-/* Values for tcpi_state.  */
+-enum tcp_ca_state
+-{
+-  TCP_CA_Open = 0,
+-  TCP_CA_Disorder = 1,
+-  TCP_CA_CWR = 2,
+-  TCP_CA_Recovery = 3,
+-  TCP_CA_Loss = 4
+-};
+-
+-struct tcp_info
+-{
+-  u_int8_t	tcpi_state;
+-  u_int8_t	tcpi_ca_state;
+-  u_int8_t	tcpi_retransmits;
+-  u_int8_t	tcpi_probes;
+-  u_int8_t	tcpi_backoff;
+-  u_int8_t	tcpi_options;
+-  u_int8_t	tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+-
+-  u_int32_t	tcpi_rto;
+-  u_int32_t	tcpi_ato;
+-  u_int32_t	tcpi_snd_mss;
+-  u_int32_t	tcpi_rcv_mss;
+-
+-  u_int32_t	tcpi_unacked;
+-  u_int32_t	tcpi_sacked;
+-  u_int32_t	tcpi_lost;
+-  u_int32_t	tcpi_retrans;
+-  u_int32_t	tcpi_fackets;
+-
+-  /* Times. */
+-  u_int32_t	tcpi_last_data_sent;
+-  u_int32_t	tcpi_last_ack_sent;	/* Not remembered, sorry.  */
+-  u_int32_t	tcpi_last_data_recv;
+-  u_int32_t	tcpi_last_ack_recv;
+-
+-  /* Metrics. */
+-  u_int32_t	tcpi_pmtu;
+-  u_int32_t	tcpi_rcv_ssthresh;
+-  u_int32_t	tcpi_rtt;
+-  u_int32_t	tcpi_rttvar;
+-  u_int32_t	tcpi_snd_ssthresh;
+-  u_int32_t	tcpi_snd_cwnd;
+-  u_int32_t	tcpi_advmss;
+-  u_int32_t	tcpi_reordering;
+-  u_int32_t	tcpi_rcv_rtt;
+-  u_int32_t	tcpi_rcv_space;
+-  u_int32_t	tcpi_total_retrans;
+-
+-};
+-
+-#endif /* Misc.  */
+-
+-#endif /* netinet/tcp.h */
+--- a/include/iptables.h
++++ b/include/iptables.h
+@@ -20,7 +20,7 @@ struct ipt_get_revision
+ {
+ 	char name[IPT_FUNCTION_MAXNAMELEN-1];
+ 
+-	u_int8_t revision;
++	uint8_t revision;
+ };
+ #endif /* IPT_SO_GET_REVISION_MATCH   Old kernel source */
+ 
+@@ -39,7 +39,7 @@ struct iptables_match
+ 	ipt_chainlabel name;
+ 
+ 	/* Revision of match (0 by default). */
+-	u_int8_t revision;
++	uint8_t revision;
+ 
+ 	const char *version;
+ 
+@@ -92,7 +92,7 @@ struct iptables_target
+ 	ipt_chainlabel name;
+ 
+ 	/* Revision of target (0 by default). */
+-	u_int8_t revision;
++	uint8_t revision;
+ 
+ 	const char *version;
+ 
+@@ -153,7 +153,7 @@ extern char *mask_to_dotted(const struct
+ 
+ extern void parse_hostnetworkmask(const char *name, struct in_addr **addrpp,
+                       struct in_addr *maskp, unsigned int *naddrs);
+-extern u_int16_t parse_protocol(const char *s);
++extern uint16_t parse_protocol(const char *s);
+ 
+ extern int do_command(int argc, char *argv[], char **table,
+ 		      iptc_handle_t *handle);
+--- a/lib/dnet_ntop.c
++++ b/lib/dnet_ntop.c
+@@ -1,24 +1,25 @@
+ #include <errno.h>
+ #include <string.h>
++#include <stdint.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ 
+ #include "utils.h"
+ 
+-static __inline__ u_int16_t dn_ntohs(u_int16_t addr)
++static __inline__ uint16_t dn_ntohs(uint16_t addr)
+ {
+ 	union {
+-		u_int8_t byte[2];
+-		u_int16_t word;
++		uint8_t byte[2];
++		uint16_t word;
+ 	} u;
+ 
+ 	u.word = addr;
+-	return ((u_int16_t)u.byte[0]) | (((u_int16_t)u.byte[1]) << 8);
++	return ((uint16_t)u.byte[0]) | (((uint16_t)u.byte[1]) << 8);
+ }
+ 
+-static __inline__ int do_digit(char *str, u_int16_t *addr, u_int16_t scale, size_t *pos, size_t len, int *started)
++static __inline__ int do_digit(char *str, uint16_t *addr, uint16_t scale, size_t *pos, size_t len, int *started)
+ {
+-	u_int16_t tmp = *addr / scale;
++	uint16_t tmp = *addr / scale;
+ 
+ 	if (*pos == len)
+ 		return 1;
+@@ -36,7 +37,7 @@ static __inline__ int do_digit(char *str
+ 
+ static const char *dnet_ntop1(const struct dn_naddr *dna, char *str, size_t len)
+ {
+-	u_int16_t addr, area;
++	uint16_t addr, area;
+ 	size_t pos = 0;
+ 	int started = 0;
+ 
+--- a/lib/dnet_pton.c
++++ b/lib/dnet_pton.c
+@@ -1,23 +1,24 @@
+ #include <errno.h>
+ #include <string.h>
++#include <stdint.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ 
+ #include "utils.h"
+ 
+-static __inline__ u_int16_t dn_htons(u_int16_t addr)
++static __inline__ uint16_t dn_htons(uint16_t addr)
+ {
+         union {
+-                u_int8_t byte[2];
+-                u_int16_t word;
++                uint8_t byte[2];
++                uint16_t word;
+         } u;
+ 
+         u.word = addr;
+-        return ((u_int16_t)u.byte[0]) | (((u_int16_t)u.byte[1]) << 8);
++        return ((uint16_t)u.byte[0]) | (((uint16_t)u.byte[1]) << 8);
+ }
+ 
+ 
+-static int dnet_num(const char *src, u_int16_t * dst)
++static int dnet_num(const char *src, uint16_t * dst)
+ {
+ 	int rv = 0;
+ 	int tmp;
+@@ -38,9 +39,9 @@ static int dnet_num(const char *src, u_i
+ 
+ static int dnet_pton1(const char *src, struct dn_naddr *dna)
+ {
+-	u_int16_t addr;
+-	u_int16_t area = 0;
+-	u_int16_t node = 0;
++	uint16_t addr;
++	uint16_t area = 0;
++	uint16_t node = 0;
+ 	int pos;
+ 
+ 	pos = dnet_num(src, &area);
+--- a/include/libiptc/ipt_kernel_headers.h
++++ b/include/libiptc/ipt_kernel_headers.h
+@@ -5,7 +5,7 @@
+ 
+ #include <limits.h>
+ 
+-#if defined(__GLIBC__) && __GLIBC__ == 2
++#if 1
+ #include <netinet/ip.h>
+ #include <netinet/in.h>
+ #include <netinet/ip_icmp.h>
diff --git a/trunk/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch b/trunk/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch
new file mode 100644
index 00000000..ce958a93
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch
@@ -0,0 +1,9 @@
+--- a/tc/q_fifo.c
++++ b/tc/q_fifo.c
+@@ -98,5 +98,6 @@ struct qdisc_util pfifo_head_drop_qdisc_
+ extern int prio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt);
+ struct qdisc_util pfifo_fast_qdisc_util = {
+ 	.id = "pfifo_fast",
++	.parse_qopt = fifo_parse_opt,
+ 	.print_qopt = prio_print_opt,
+ };
diff --git a/trunk/package/network/utils/iproute2/patches/110-extra-ccopts.patch b/trunk/package/network/utils/iproute2/patches/110-extra-ccopts.patch
new file mode 100644
index 00000000..0e362300
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/110-extra-ccopts.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
+ CC = gcc
+ HOSTCC = gcc
+ DEFINES += -D_GNU_SOURCE
+-CCOPTS = -O2
++CCOPTS = -O2 $(EXTRA_CCOPTS)
+ WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
+ WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
+ 
diff --git a/trunk/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/trunk/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
new file mode 100644
index 00000000..3ea7d193
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
@@ -0,0 +1,10 @@
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,6 +1,6 @@
+ include ../Config
+ 
+-CFLAGS += -fPIC
++CFLAGS += $(FPIC)
+ 
+ UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o
+ 
diff --git a/trunk/package/network/utils/iproute2/patches/200-add-tc_esfq.patch b/trunk/package/network/utils/iproute2/patches/200-add-tc_esfq.patch
new file mode 100644
index 00000000..19d81997
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/200-add-tc_esfq.patch
@@ -0,0 +1,249 @@
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -8,6 +8,7 @@ SHARED_LIBS ?= y
+ TCMODULES :=
+ TCMODULES += q_fifo.o
+ TCMODULES += q_sfq.o
++TCMODULES += q_esfq.o
+ TCMODULES += q_red.o
+ TCMODULES += q_prio.o
+ TCMODULES += q_tbf.o
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
+@@ -226,6 +226,33 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++	TCA_SFQ_HASH_CLASSIC,
++	TCA_SFQ_HASH_DST,
++	TCA_SFQ_HASH_SRC,
++	TCA_SFQ_HASH_FWMARK,
++	/* conntrack */
++	TCA_SFQ_HASH_CTORIGDST,
++	TCA_SFQ_HASH_CTORIGSRC,
++	TCA_SFQ_HASH_CTREPLDST,
++	TCA_SFQ_HASH_CTREPLSRC,
++	TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++	unsigned	quantum;	/* Bytes per round allocated to flow */
++	int		perturb_period;	/* Period of hash perturbation */
++	__u32		limit;		/* Maximal packets in queue */
++	unsigned	divisor;	/* Hash divisor  */
++	unsigned	flows;		/* Maximal number of flows  */
++	unsigned	hash_kind;	/* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- /dev/null
++++ b/tc/q_esfq.c
+@@ -0,0 +1,200 @@
++/*
++ * q_esfq.c		ESFQ.
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:	Alexander Atanasov, <alex@ssi.bg>
++ *		Alexander Clouter, <alex@digriz.org.uk>
++ *		Corey Hickey, <bugfood-c@fatooh.org>
++ *
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <syslog.h>
++#include <fcntl.h>
++#include <math.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <string.h>
++
++#include "utils.h"
++#include "tc_util.h"
++
++static void explain(void)
++{
++	fprintf(stderr, "Usage: ... esfq [ perturb SECS ] [ quantum BYTES ] [ depth FLOWS ]\n\t[ divisor HASHBITS ] [ limit PKTS ] [ hash HASHTYPE]\n");
++	fprintf(stderr,"Where: \n");
++	fprintf(stderr,"HASHTYPE := { classic | src | dst | ctorigdst | ctorigsrc | ctrepldst | ctreplsrc | ctnatchg }\n");
++}
++
++#define usage() return(-1)
++
++static int esfq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
++{
++	int ok=0;
++	struct tc_esfq_qopt opt;
++
++	memset(&opt, 0, sizeof(opt));
++
++	opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
++
++	while (argc > 0) {
++		if (strcmp(*argv, "quantum") == 0) {
++			NEXT_ARG();
++			if (get_size(&opt.quantum, *argv)) {
++				fprintf(stderr, "Illegal \"quantum\"\n");
++				return -1;
++			}
++			ok++;
++		} else if (strcmp(*argv, "perturb") == 0) {
++			NEXT_ARG();
++			if (get_integer(&opt.perturb_period, *argv, 0)) {
++				fprintf(stderr, "Illegal \"perturb\"\n");
++				return -1;
++			}
++			ok++;
++		} else if (strcmp(*argv, "depth") == 0) {
++			NEXT_ARG();
++			if (get_integer((int *) &opt.flows, *argv, 0)) {
++				fprintf(stderr, "Illegal \"depth\"\n");
++				return -1;
++			}
++			ok++;
++		} else if (strcmp(*argv, "divisor") == 0) {
++			NEXT_ARG();
++			if (get_integer((int *) &opt.divisor, *argv, 0)) {
++				fprintf(stderr, "Illegal \"divisor\"\n");
++				return -1;
++			}
++			if(opt.divisor >= 14) {
++				fprintf(stderr, "Illegal \"divisor\": must be < 14\n");
++				return -1;
++			}
++			opt.divisor=pow(2,opt.divisor);
++			ok++;
++		} else if (strcmp(*argv, "limit") == 0) {
++			NEXT_ARG();
++			if (get_integer((int *) &opt.limit, *argv, 0)) {
++				fprintf(stderr, "Illegal \"limit\"\n");
++				return -1;
++			}
++			ok++;
++		} else if (strcmp(*argv, "hash") == 0) {
++			NEXT_ARG();
++			if(strcmp(*argv, "classic") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
++			} else
++			if(strcmp(*argv, "dst") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_DST;
++			} else
++			if(strcmp(*argv, "src") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_SRC;
++			} else
++			if(strcmp(*argv, "ctorigsrc") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_CTORIGSRC;
++			} else
++			if(strcmp(*argv, "ctorigdst") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_CTORIGDST;
++			} else
++			if(strcmp(*argv, "ctreplsrc") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_CTREPLSRC;
++			} else
++			if(strcmp(*argv, "ctrepldst") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_CTREPLDST;
++			} else
++			if(strcmp(*argv, "ctnatchg") == 0) {
++				opt.hash_kind= TCA_SFQ_HASH_CTNATCHG;
++			} else {
++				fprintf(stderr, "Illegal \"hash\"\n");
++				explain();
++				return -1;
++			}
++			ok++;
++		} else if (strcmp(*argv, "help") == 0) {
++			explain();
++			return -1;
++		} else {
++			fprintf(stderr, "What is \"%s\"?\n", *argv);
++			explain();
++			return -1;
++		}
++		argc--; argv++;
++	}
++
++	if (ok)
++		addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
++	return 0;
++}
++
++static int esfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
++{
++	struct tc_esfq_qopt *qopt;
++	SPRINT_BUF(b1);
++
++	if (opt == NULL)
++		return 0;
++
++	if (RTA_PAYLOAD(opt)  < sizeof(*qopt))
++		return -1;
++	qopt = RTA_DATA(opt);
++	fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1));
++	if (show_details) {
++		fprintf(f, "limit %up flows %u/%u ",
++			qopt->limit, qopt->flows, qopt->divisor);
++	}
++	if (qopt->perturb_period)
++		fprintf(f, "perturb %dsec ", qopt->perturb_period);
++
++		fprintf(f,"hash: ");
++	switch(qopt->hash_kind)
++	{
++	case TCA_SFQ_HASH_CLASSIC:
++		fprintf(f,"classic");
++		break;
++	case TCA_SFQ_HASH_DST:
++		fprintf(f,"dst");
++		break;
++	case TCA_SFQ_HASH_SRC:
++		fprintf(f,"src");
++		break;
++	case TCA_SFQ_HASH_CTORIGSRC:
++		fprintf(f,"ctorigsrc");
++		break;
++	case TCA_SFQ_HASH_CTORIGDST:
++		fprintf(f,"ctorigdst");
++		break;
++	case TCA_SFQ_HASH_CTREPLSRC:
++		fprintf(f,"ctreplsrc");
++		break;
++	case TCA_SFQ_HASH_CTREPLDST:
++		fprintf(f,"ctrepldst");
++		break;
++	case TCA_SFQ_HASH_CTNATCHG:
++		fprintf(f,"ctnatchg");
++		break;
++	default:
++		fprintf(f,"Unknown");
++	}
++	return 0;
++}
++
++static int esfq_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
++{
++	return 0;
++}
++
++
++struct qdisc_util esfq_qdisc_util = {
++	.id = "esfq",
++	.parse_qopt = esfq_parse_opt,
++	.print_qopt = esfq_print_opt,
++	.print_xstats = esfq_print_xstats,
++};
diff --git a/trunk/package/network/utils/iproute2/patches/210-add-act_connmark.patch b/trunk/package/network/utils/iproute2/patches/210-add-act_connmark.patch
new file mode 100644
index 00000000..c0bf07aa
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/210-add-act_connmark.patch
@@ -0,0 +1,87 @@
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -39,6 +39,7 @@ TCMODULES += m_mirred.o
+ TCMODULES += m_nat.o
+ TCMODULES += m_pedit.o
+ TCMODULES += m_skbedit.o
++TCMODULES += m_connmark.o
+ TCMODULES += m_csum.o
+ TCMODULES += m_simple.o
+ TCMODULES += p_ip.o
+--- /dev/null
++++ b/tc/m_connmark.c
+@@ -0,0 +1,74 @@
++/*
++ * m_connmark.c		Connection tracking marking import
++ *
++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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 <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++#include "utils.h"
++#include "tc_util.h"
++
++static void
++explain(void)
++{
++	fprintf(stderr, "Usage: ... connmark\n");
++}
++
++static void
++usage(void)
++{
++	explain();
++	exit(-1);
++}
++
++static int
++parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
++	      struct nlmsghdr *n)
++{
++	int argc = *argc_p;
++	char **argv = *argv_p;
++
++	if (matches(*argv, "connmark") != 0)
++		return -1;
++
++	NEXT_ARG();
++
++	if (matches(*argv, "help") == 0)
++		usage();
++
++	*argc_p = argc;
++	*argv_p = argv;
++	return 0;
++}
++
++static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg)
++{
++	if (arg == NULL)
++		return -1;
++
++	fprintf(f, " connmark");
++
++	return 0;
++}
++
++struct action_util connmark_action_util = {
++	.id = "connmark",
++	.parse_aopt = parse_connmark,
++	.print_aopt = print_connmark,
++};
diff --git a/trunk/package/network/utils/iproute2/patches/300-ip_tiny.patch b/trunk/package/network/utils/iproute2/patches/300-ip_tiny.patch
new file mode 100644
index 00000000..5b0d56c1
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/300-ip_tiny.patch
@@ -0,0 +1,115 @@
+--- a/ip/Makefile
++++ b/ip/Makefile
+@@ -15,6 +15,13 @@ ifeq ($(IP_CONFIG_SETNS),y)
+ 	CFLAGS += -DHAVE_SETNS
+ endif
+ 
++STATIC_SYM_FILTER:=
++ifeq ($(IP_CONFIG_TINY),y)
++  STATIC_SYM_FILTER:=iplink_can.c iplink_ipoib.c iplink_vxlan.c
++  CFLAGS += -DIPROUTE2_TINY
++endif
++STATIC_SYM_SOURCES:=$(filter-out $(STATIC_SYM_FILTER),$(wildcard *.c))
++
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+ SCRIPTS=ifcfg rtpr routel routef
+ TARGETS=ip rtmon
+@@ -42,7 +49,7 @@ else
+ 
+ ip: static-syms.o
+ static-syms.o: static-syms.h
+-static-syms.h: $(wildcard *.c)
++static-syms.h: $(STATIC_SYM_SOURCES)
+ 	files="$^" ; \
+ 	for s in `grep -B 3 '\<dlsym' $$files | sed -n '/snprintf/{s:.*"\([^"]*\)".*:\1:;s:%s::;p}'` ; do \
+ 		sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
+--- a/ip/ip.c
++++ b/ip/ip.c
+@@ -66,29 +66,41 @@ static const struct cmd {
+ 	int (*func)(int argc, char **argv);
+ } cmds[] = {
+ 	{ "address",	do_ipaddr },
++#ifndef IPROUTE2_TINY
+ 	{ "addrlabel",	do_ipaddrlabel },
++#endif
+ 	{ "maddress",	do_multiaddr },
+ 	{ "route",	do_iproute },
+ 	{ "rule",	do_iprule },
+ 	{ "neighbor",	do_ipneigh },
+ 	{ "neighbour",	do_ipneigh },
++#ifndef IPROUTE2_TINY
+ 	{ "ntable",	do_ipntable },
+ 	{ "ntbl",	do_ipntable },
++#endif
+ 	{ "link",	do_iplink },
++#ifndef IPROUTE2_TINY
+ 	{ "l2tp",	do_ipl2tp },
++#endif
+ 	{ "tunnel",	do_iptunnel },
+ 	{ "tunl",	do_iptunnel },
++#ifndef IPROUTE2_TINY
+ 	{ "tuntap",	do_iptuntap },
+ 	{ "tap",	do_iptuntap },
+ 	{ "token",	do_iptoken },
+ 	{ "tcpmetrics",	do_tcp_metrics },
+ 	{ "tcp_metrics",do_tcp_metrics },
++#endif
+ 	{ "monitor",	do_ipmonitor },
++#ifndef IPROUTE2_TINY
+ 	{ "xfrm",	do_xfrm },
++#endif
+ 	{ "mroute",	do_multiroute },
+ 	{ "mrule",	do_multirule },
+ 	{ "netns",	do_netns },
++#ifndef IPROUTE2_TINY
+ 	{ "netconf",	do_ipnetconf },
++#endif
+ 	{ "help",	do_help },
+ 	{ 0 }
+ };
+--- a/lib/utils.c
++++ b/lib/utils.c
+@@ -627,6 +627,7 @@ const char *rt_addr_n2a(int af, int len,
+ 	case AF_INET:
+ 	case AF_INET6:
+ 		return inet_ntop(af, addr, buf, buflen);
++#ifndef IPROUTE2_TINY
+ 	case AF_IPX:
+ 		return ipx_ntop(af, addr, buf, buflen);
+ 	case AF_DECnet:
+@@ -635,6 +636,7 @@ const char *rt_addr_n2a(int af, int len,
+ 		memcpy(dna.a_addr, addr, 2);
+ 		return dnet_ntop(af, &dna, buf, buflen);
+ 	}
++#endif
+ 	default:
+ 		return "???";
+ 	}
+@@ -710,6 +712,7 @@ const char *format_host(int af, int len,
+ 			case AF_INET6:
+ 				len = 16;
+ 				break;
++#ifndef IPROUTE2_TINY
+ 			case AF_IPX:
+ 				len = 10;
+ 				break;
+@@ -720,6 +723,7 @@ const char *format_host(int af, int len,
+ 				len = 2;
+ 				break;
+ #endif
++#endif
+ 			default: ;
+ 			}
+ 		}
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,5 +1,9 @@
+ include ../Config
+ 
++ifeq ($(IP_CONFIG_TINY),y)
++  CFLAGS += -DIPROUTE2_TINY
++endif
++
+ CFLAGS += $(FPIC)
+ 
+ UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o
diff --git a/trunk/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch b/trunk/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
new file mode 100644
index 00000000..7b829331
--- /dev/null
+++ b/trunk/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
@@ -0,0 +1,54 @@
+From 4e7dbf76227e8c7be7897dc81def3011f637864d Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Thu, 30 May 2013 11:54:04 +0200
+Subject: [PATCH] add support for dropping with FAILED_POLICY
+
+---
+ include/linux/fib_rules.h |    4 ++++
+ include/linux/rtnetlink.h |    1 +
+ ip/rtm_map.c              |    4 ++++
+ 3 files changed, 9 insertions(+)
+
+--- a/include/linux/fib_rules.h
++++ b/include/linux/fib_rules.h
+@@ -64,6 +64,10 @@ enum {
+ 	FR_ACT_BLACKHOLE,	/* Drop without notification */
+ 	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
+ 	FR_ACT_PROHIBIT,	/* Drop with EACCES */
++	FR_ACT_RES8,
++	FR_ACT_RES9,
++	FR_ACT_RES10,
++	FR_ACT_FAILED_POLICY,	/* Drop with EPERM */
+ 	__FR_ACT_MAX,
+ };
+ 
+--- a/include/linux/rtnetlink.h
++++ b/include/linux/rtnetlink.h
+@@ -203,6 +203,7 @@ enum {
+ 	RTN_THROW,		/* Not in this table		*/
+ 	RTN_NAT,		/* Translate this address	*/
+ 	RTN_XRESOLVE,		/* Use external resolver	*/
++	RTN_FAILED_POLICY,	/* Source address failed policy */
+ 	__RTN_MAX
+ };
+ 
+--- a/ip/rtm_map.c
++++ b/ip/rtm_map.c
+@@ -49,6 +49,8 @@ char *rtnl_rtntype_n2a(int id, char *buf
+ 		return "nat";
+ 	case RTN_XRESOLVE:
+ 		return "xresolve";
++	case RTN_FAILED_POLICY:
++		return "failed_policy";
+ 	default:
+ 		snprintf(buf, len, "%d", id);
+ 		return buf;
+@@ -84,6 +86,8 @@ int rtnl_rtntype_a2n(int *id, char *arg)
+ 		res = RTN_UNICAST;
+ 	else if (strcmp(arg, "throw") == 0)
+ 		res = RTN_THROW;
++	else if (strcmp(arg, "failed_policy") == 0)
++		res = RTN_FAILED_POLICY;
+ 	else {
+ 		res = strtoul(arg, &end, 0);
+ 		if (!end || end == arg || *end || res > 255)
diff --git a/trunk/package/network/utils/ipset/Makefile b/trunk/package/network/utils/ipset/Makefile
new file mode 100644
index 00000000..16ac8c6e
--- /dev/null
+++ b/trunk/package/network/utils/ipset/Makefile
@@ -0,0 +1,84 @@
+ 
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ipset
+PKG_VERSION:=6.20.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://ipset.netfilter.org
+PKG_MD5SUM:=8af741492752fbf24d3a28a9d1473d40
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ipset/Default
+  DEPENDS:= @(!(TARGET_ps3||TARGET_pxcab)||BROKEN)
+endef
+
+define Package/ipset
+$(call Package/ipset/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS+= +kmod-ipt-ipset +libmnl
+  TITLE:=IPset administration utility
+  URL:=http://ipset.netfilter.org/
+endef
+
+CONFIGURE_ARGS += \
+	--with-kbuild="$(LINUX_DIR)"
+
+MAKE_FLAGS += \
+	ARCH="$(LINUX_KARCH)" \
+	SHELL="$(BASH)"
+
+IPSET_MODULES:= \
+	ipset/ip_set \
+	ipset/ip_set_bitmap_ip \
+	ipset/ip_set_bitmap_ipmac \
+	ipset/ip_set_bitmap_port \
+	ipset/ip_set_hash_ip \
+	ipset/ip_set_hash_ipport \
+	ipset/ip_set_hash_ipportip \
+	ipset/ip_set_hash_ipportnet \
+	ipset/ip_set_hash_net \
+	ipset/ip_set_hash_netiface \
+	ipset/ip_set_hash_netport \
+	ipset/ip_set_list_set \
+	xt_set \
+
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(call Build/Compile/Default,modules)
+endef
+
+define Package/ipset/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/
+endef
+
+define KernelPackage/ipt-ipset
+$(call Package/ipset/Default)
+  SUBMENU:=Netfilter Extensions
+  TITLE:=IPset netfilter modules
+  DEPENDS+= +kmod-ipt-core +kmod-nfnetlink
+  FILES:=$(foreach mod,$(IPSET_MODULES),$(PKG_BUILD_DIR)/kernel/net/netfilter/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPSET_MODULES)))
+endef
+
+$(eval $(call BuildPackage,ipset))
+$(eval $(call KernelPackage,ipt-ipset))
diff --git a/trunk/package/network/utils/ipset/patches/001-timeout-size.patch b/trunk/package/network/utils/ipset/patches/001-timeout-size.patch
new file mode 100644
index 00000000..b9ff4e25
--- /dev/null
+++ b/trunk/package/network/utils/ipset/patches/001-timeout-size.patch
@@ -0,0 +1,28 @@
+diff --git a/lib/parse.c b/lib/parse.c
+index 8ea8542..440ef8f 100644
+--- a/lib/parse.c
++++ b/lib/parse.c
+@@ -1292,15 +1292,20 @@ ipset_parse_timeout(struct ipset_session *session,
+ 		    enum ipset_opt opt, const char *str)
+ {
+ 	int err;
+-	unsigned long long num = 0;
++	unsigned long long llnum = 0;
++	uint32_t num = 0;
+ 
+ 	assert(session);
+ 	assert(opt == IPSET_OPT_TIMEOUT);
+ 	assert(str);
+ 
+-	err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &num);
+-	if (err == 0)
++	err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &llnum);
++	if (err == 0) {
++		/* Timeout is expected to be 32bits wide, so we have
++		   to convert it here */
++		num = llnum;
+ 		return ipset_session_data_set(session, opt, &num);
++	}
+ 
+ 	return err;
+ }
diff --git a/trunk/package/network/utils/iptables/Makefile b/trunk/package/network/utils/iptables/Makefile
new file mode 100644
index 00000000..c749a33a
--- /dev/null
+++ b/trunk/package/network/utils/iptables/Makefile
@@ -0,0 +1,549 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=iptables
+PKG_VERSION:=1.4.21
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
+	ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
+	ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
+	ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
+PKG_MD5SUM:=536d048c8e8eeebcd9757d0863ebb0c0
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0
+
+ifneq ($(CONFIG_EXTERNAL_KERNEL_TREE),"")
+PATCH_DIR:=
+endif
+
+include $(INCLUDE_DIR)/package.mk
+ifeq ($(DUMP),)
+  -include $(LINUX_DIR)/.config
+  include $(INCLUDE_DIR)/netfilter.mk
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
+endif
+
+
+define Package/iptables/Default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  URL:=http://netfilter.org/
+endef
+
+define Package/iptables/Module
+$(call Package/iptables/Default)
+  DEPENDS:=iptables $(1)
+endef
+
+define Package/iptables
+$(call Package/iptables/Default)
+  TITLE:=IP firewall administration tool
+  MENU:=1
+  DEPENDS+= +kmod-ipt-core +libip4tc +IPV6:libip6tc +libxtables
+endef
+
+define Package/iptables/description
+IP firewall administration tool.
+
+ Matches:
+  - icmp
+  - tcp
+  - udp
+  - comment
+  - conntrack
+  - limit
+  - mac
+  - mark
+  - multiport
+  - set
+  - state
+  - time
+
+ Targets:
+  - ACCEPT
+  - CT
+  - DNAT
+  - DROP
+  - REJECT
+  - LOG
+  - MARK
+  - MASQUERADE
+  - REDIRECT
+  - SET
+  - SNAT
+  - TCPMSS
+
+ Tables:
+  - filter
+  - mangle
+  - nat
+  - raw
+
+endef
+
+define Package/iptables-mod-conntrack-extra
+$(call Package/iptables/Module, +kmod-ipt-conntrack-extra)
+  TITLE:=Extra connection tracking extensions
+endef
+
+define Package/iptables-mod-conntrack-extra/description
+Extra iptables extensions for connection tracking.
+
+ Matches:
+  - connbytes
+  - connlimit
+  - connmark
+  - recent
+  - helper
+
+ Targets:
+  - CONNMARK
+
+endef
+
+define Package/iptables-mod-filter
+$(call Package/iptables/Module, +kmod-ipt-filter)
+  TITLE:=Content inspection extensions
+endef
+
+define Package/iptables-mod-filter/description
+iptables extensions for packet content inspection.
+Includes support for:
+
+ Matches:
+  - layer7
+  - string
+
+endef
+
+define Package/iptables-mod-ipopt
+$(call Package/iptables/Module, +kmod-ipt-ipopt)
+  TITLE:=IP/Packet option extensions
+endef
+
+define Package/iptables-mod-ipopt/description
+iptables extensions for matching/changing IP packet options.
+
+ Matches:
+  - dscp
+  - ecn
+  - length
+  - statistic
+  - tcpmss
+  - unclean
+  - hl
+
+ Targets:
+  - DSCP
+  - CLASSIFY
+  - ECN
+  - HL
+
+endef
+
+define Package/iptables-mod-ipsec
+$(call Package/iptables/Module, +kmod-ipt-ipsec)
+  TITLE:=IPsec extensions
+endef
+
+define Package/iptables-mod-ipsec/description
+iptables extensions for matching ipsec traffic.
+
+ Matches:
+  - ah
+  - esp
+  - policy
+
+endef
+
+define Package/iptables-mod-nat-extra
+$(call Package/iptables/Module, +kmod-ipt-nat-extra)
+  TITLE:=Extra NAT extensions
+endef
+
+define Package/iptables-mod-nat-extra/description
+iptables extensions for extra NAT targets.
+
+ Targets:
+  - MIRROR
+  - NETMAP
+endef
+
+define Package/iptables-mod-ulog
+$(call Package/iptables/Module, +kmod-ipt-ulog)
+  TITLE:=user-space packet logging
+endef
+
+define Package/iptables-mod-ulog/description
+iptables extensions for user-space packet logging.
+
+ Targets:
+  - ULOG
+
+endef
+
+define Package/iptables-mod-nflog
+$(call Package/iptables/Module, +kmod-nfnetlink-log +kmod-ipt-nflog)
+  TITLE:=Netfilter NFLOG target
+endef
+
+define Package/iptables-mod-nflog/description
+ iptables extension for user-space logging via NFNETLINK.
+
+ Includes:
+  - libxt_NFLOG
+
+endef
+
+define Package/iptables-mod-nfqueue
+$(call Package/iptables/Module, +kmod-nfnetlink-queue +kmod-ipt-nfqueue)
+  TITLE:=Netfilter NFQUEUE target
+endef
+
+define Package/iptables-mod-nfqueue/description
+ iptables extension for user-space queuing via NFNETLINK.
+
+ Includes:
+  - libxt_NFQUEUE
+
+endef
+
+define Package/iptables-mod-hashlimit
+$(call Package/iptables/Module, +kmod-ipt-hashlimit)
+  TITLE:=hashlimit matching
+endef
+
+define Package/iptables-mod-hashlimit/description
+iptables extensions for hashlimit matching
+
+ Matches:
+  - hashlimit
+
+endef
+
+define Package/iptables-mod-iprange
+$(call Package/iptables/Module, +kmod-ipt-iprange)
+  TITLE:=IP range extension
+endef
+
+define Package/iptables-mod-iprange/description
+iptables extensions for matching ip ranges.
+
+ Matches:
+  - iprange
+
+endef
+
+define Package/iptables-mod-cluster
+$(call Package/iptables/Module, +kmod-ipt-cluster)
+  TITLE:=Match cluster extension
+endef
+
+define Package/iptables-mod-cluster/description
+iptables extensions for matching cluster.
+
+ Netfilter (IPv4/IPv6) module for matching cluster
+ This option allows you to build work-load-sharing clusters of
+ network servers/stateful firewalls without having a dedicated
+ load-balancing router/server/switch. Basically, this match returns
+ true when the packet must be handled by this cluster node. Thus,
+ all nodes see all packets and this match decides which node handles
+ what packets. The work-load sharing algorithm is based on source
+ address hashing.
+
+ This module is usable for ipv4 and ipv6.
+
+ If you select it, it enables kmod-ipt-cluster.
+
+ see `iptables -m cluster --help` for more information.
+endef
+
+define Package/iptables-mod-clusterip
+$(call Package/iptables/Module, +kmod-ipt-clusterip)
+  TITLE:=Clusterip extension
+endef
+
+define Package/iptables-mod-clusterip/description
+iptables extensions for CLUSTERIP.
+ The CLUSTERIP target allows you to build load-balancing clusters of
+ network servers without having a dedicated load-balancing
+ router/server/switch.
+
+ If you select it, it enables kmod-ipt-clusterip.
+
+ see `iptables -j CLUSTERIP --help` for more information.
+endef
+
+define Package/iptables-mod-extra
+$(call Package/iptables/Module, +kmod-ipt-extra)
+  TITLE:=Other extra iptables extensions
+endef
+
+define Package/iptables-mod-extra/description
+Other extra iptables extensions.
+
+ Matches:
+  - addrtype
+  - condition
+  - owner
+  - physdev (if ebtables is enabled)
+  - pkttype
+  - quota
+
+endef
+
+define Package/iptables-mod-led
+$(call Package/iptables/Module, +kmod-ipt-led)
+  TITLE:=LED trigger iptables extension
+endef
+
+define Package/iptables-mod-led/description
+iptables extension for triggering a LED.
+
+ Targets:
+  - LED
+
+endef
+
+define Package/iptables-mod-tproxy
+$(call Package/iptables/Module, +kmod-ipt-tproxy)
+  TITLE:=Transparent proxy iptables extensions
+endef
+
+define Package/iptables-mod-tproxy/description
+Transparent proxy iptables extensions.
+
+ Matches:
+  - socket
+
+ Targets:
+  - TPROXY
+
+endef
+
+define Package/iptables-mod-tee
+$(call Package/iptables/Module, +kmod-ipt-tee)
+  TITLE:=TEE iptables extensions
+endef
+
+define Package/iptables-mod-tee/description
+TEE iptables extensions.
+
+ Targets:
+  - TEE
+
+endef
+
+define Package/iptables-mod-u32
+$(call Package/iptables/Module, +kmod-ipt-u32)
+  TITLE:=U32 iptables extensions
+endef
+
+define Package/iptables-mod-u32/description
+U32 iptables extensions.
+
+ Matches:
+  - u32
+
+endef
+
+define Package/ip6tables
+$(call Package/iptables/Default)
+  DEPENDS:=@IPV6 +kmod-ip6tables +iptables
+  CATEGORY:=Network
+  TITLE:=IPv6 firewall administration tool
+  MENU:=1
+endef
+
+
+define Package/ip6tables-extra
+$(call Package/iptables/Default)
+  DEPENDS:=ip6tables +kmod-ip6tables-extra
+  TITLE:=IPv6 header matching modules
+endef
+
+define Package/ip6tables-mod-extra/description
+iptables header matching modules for IPv6
+endef
+
+define Package/ip6tables-mod-nat
+$(call Package/iptables/Default)
+  DEPENDS:=ip6tables +kmod-ipt-nat6
+  TITLE:=IPv6 NAT extensions
+endef
+
+define Package/ip6tables-mod-nat/description
+iptables extensions for IPv6-NAT targets.
+endef
+
+define Package/libiptc
+$(call Package/iptables/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libip4tc +IPV6:libip6tc
+  TITLE:=IPv4/IPv6 firewall - shared libiptc library (compatibility stub)
+endef
+
+define Package/libip4tc
+$(call Package/iptables/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=IPv4 firewall - shared libiptc library
+endef
+
+define Package/libip6tc
+$(call Package/iptables/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=IPv6 firewall - shared libiptc library
+endef
+
+define Package/libxtables
+ $(call Package/iptables/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=IPv4/IPv6 firewall - shared xtables library
+endef
+
+TARGET_CPPFLAGS := \
+	-I$(PKG_BUILD_DIR)/include \
+	-I$(LINUX_DIR)/user_headers/include \
+	$(TARGET_CPPFLAGS)
+
+TARGET_CFLAGS += \
+	-I$(PKG_BUILD_DIR)/include \
+	-I$(LINUX_DIR)/user_headers/include \
+	-ffunction-sections -fdata-sections
+
+TARGET_LDFLAGS += \
+	-Wl,--gc-sections
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-devel \
+	--with-kernel="$(LINUX_DIR)/user_headers" \
+	--with-xtlibdir=/usr/lib/iptables \
+	--enable-static \
+	$(if $(CONFIG_IPV6),,--disable-ipv6)
+
+MAKE_FLAGS := \
+	$(TARGET_CONFIGURE_OPTS) \
+	COPT_FLAGS="$(TARGET_CFLAGS)" \
+	KERNEL_DIR="$(LINUX_DIR)/user_headers/" PREFIX=/usr \
+	KBUILD_OUTPUT="$(LINUX_DIR)" \
+	BUILTIN_MODULES="$(patsubst ip6t_%,%,$(patsubst ipt_%,%,$(patsubst xt_%,%,$(IPT_BUILTIN) $(IPT_CONNTRACK-m) $(IPT_NAT-m))))"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/iptables
+	$(INSTALL_DIR) $(1)/usr/include/net/netfilter
+
+	# XXX: iptables header fixup, some headers are not installed by iptables anymore
+	$(CP) $(PKG_BUILD_DIR)/include/iptables/*.h $(1)/usr/include/iptables/
+	$(CP) $(PKG_BUILD_DIR)/include/iptables.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/include/ip6tables.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/include/libipulog $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/include/libiptc $(1)/usr/include/
+
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.so* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libip*tc.pc $(1)/usr/lib/pkgconfig/
+
+	# XXX: needed by firewall3
+	$(INSTALL_DIR) $(1)/usr/lib/iptables
+	$(CP) $(PKG_BUILD_DIR)/extensions/libext*.a $(1)/usr/lib/iptables/
+endef
+
+define Package/iptables/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/xtables-multi $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables{,-restore,-save} $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/iptables
+endef
+
+define Package/ip6tables/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables{,-restore,-save} $(1)/usr/sbin/
+endef
+
+define Package/libiptc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so* $(1)/usr/lib/
+endef
+
+define Package/libip4tc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip4tc.so* $(1)/usr/lib/
+endef
+
+define Package/libip6tc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip6tc.so* $(1)/usr/lib/
+endef
+
+define Package/libxtables/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/
+endef
+
+define BuildPlugin
+  define Package/$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/iptables
+	for m in $(patsubst xt_%,ipt_%,$(2)) $(patsubst ipt_%,xt_%,$(2)) $(patsubst xt_%,ip6t_%,$(2)) $(patsubst ip6t_%,xt_%,$(2)); do \
+		if [ -f $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so ]; then \
+			$(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \
+		fi; \
+	done
+	$(3)
+  endef
+
+  $$(eval $$(call BuildPackage,$(1)))
+endef
+
+L7_INSTALL:=\
+	$(INSTALL_DIR) $$(1)/etc/l7-protocols; \
+	$(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
+
+
+$(eval $(call BuildPackage,iptables))
+$(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m)))
+$(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
+$(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL)))
+$(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m)))
+$(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
+$(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))
+$(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m)))
+$(eval $(call BuildPlugin,iptables-mod-cluster,$(IPT_CLUSTER-m)))
+$(eval $(call BuildPlugin,iptables-mod-clusterip,$(IPT_CLUSTERIP-m)))
+$(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
+$(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
+$(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))
+$(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
+$(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
+$(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))
+$(eval $(call BuildPlugin,iptables-mod-nflog,$(IPT_NFLOG-m)))
+$(eval $(call BuildPlugin,iptables-mod-nfqueue,$(IPT_NFQUEUE-m)))
+$(eval $(call BuildPackage,ip6tables))
+$(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m)))
+$(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m)))
+$(eval $(call BuildPackage,libiptc))
+$(eval $(call BuildPackage,libip4tc))
+$(eval $(call BuildPackage,libip6tc))
+$(eval $(call BuildPackage,libxtables))
diff --git a/trunk/package/network/utils/iptables/files/l7/aim.pat b/trunk/package/network/utils/iptables/files/l7/aim.pat
new file mode 100644
index 00000000..5c43930f
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/aim.pat
@@ -0,0 +1,28 @@
+# AIM - AOL instant messenger (OSCAR and TOC)
+# Pattern attributes: good slow notsofast
+# Protocol groups: chat proprietary
+# Wiki: http://www.protocolinfo.org/wiki/AIM
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Usually runs on port 5190
+#
+# This may also match ICQ traffic.
+# 
+# This pattern has been tested and is believed to work well.
+
+aim
+# See http://gridley.res.carleton.edu/~straitm/final (and various other places)
+# The first bit matches OSCAR signon and data commands, but not sure what
+# \x03\x0b matches, but it works apparently.
+# The next three bits match various parts of the TOC signon process.
+# The third one is the magic number "*", then 0x01 for "signon", then up to four
+# bytes ("up to" because l7-filter strips out nulls) which contain a sequence
+# number (2 bytes) the data length (2 more) and 3 nulls (which don't count), 
+# then 0x01 for the version number (not sure if there ever has been another 
+# version)
+# The fourth one is a command string, followed by some stuff, then the
+# beginning of the "roasted" password
+
+# This pattern is too slow!
+
+^(\*[\x01\x02].*\x03\x0b|\*\x01.?.?.?.?\x01)|flapon|toc_signon.*0x
diff --git a/trunk/package/network/utils/iptables/files/l7/bittorrent.pat b/trunk/package/network/utils/iptables/files/l7/bittorrent.pat
new file mode 100644
index 00000000..4a3ba88d
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/bittorrent.pat
@@ -0,0 +1,25 @@
+# Bittorrent - P2P filesharing / publishing tool - http://www.bittorrent.com
+# Pattern attributes: good slow594 notsofast undermatch
+# Protocol groups: p2p open_source
+# Wiki: http://www.protocolinfo.org/wiki/Bittorrent
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# This pattern has been tested and is believed to work well.
+# It will, however, not work on bittorrent streams that are encrypted, since
+# it's impossible to match (well) encrypted data.
+
+bittorrent
+
+# Does not attempt to match the HTTP download of the tracker
+# 0x13 is the length of "bittorrent protocol"
+# Second two bits match UDP wierdness
+# Next bit matches something Azureus does
+# Ditto on the next bit.  Could also match on "user-agent: azureus", but that's in the next
+# packet and perhaps this will match multiple clients.
+# bitcomet-specific strings contributed by liangjun.
+
+# This is not a valid GNU basic regular expression (but that's ok).
+^(\x13bittorrent protocol|azver\x01$|get /scrape\?info_hash=get /announce\?info_hash=|get /client/bitcomet/|GET /data\?fid=)|d1:ad2:id20:|\x08'7P\)[RP]
+
+# This pattern is "fast", but won't catch as much
+#^(\x13bittorrent protocol|azver\x01$|get /scrape\?info_hash=)
diff --git a/trunk/package/network/utils/iptables/files/l7/edonkey.pat b/trunk/package/network/utils/iptables/files/l7/edonkey.pat
new file mode 100644
index 00000000..75807f8e
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/edonkey.pat
@@ -0,0 +1,37 @@
+# eDonkey2000 - P2P filesharing - http://edonkey2000.com and others
+# Pattern attributes: good veryfast fast overmatch
+# Protocol groups: p2p
+# Wiki: http://www.protocolinfo.org/wiki/EDonkey
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Tested recently (April/May 2006) with eMule 0.47a and eDonkey2000 1.4
+# and a long time ago with something else. 
+# 
+# In addition to matching what you might expect, this matches much of
+# what eMule does when you tell it to only connect to the KAD network. 
+# I don't quite know what to make of this.
+
+# Thanks to Matt Skidmore <fox AT woozle.org>
+
+edonkey
+
+# http://gd.tuwien.ac.at/opsys/linux/sf/p/pdonkey/eDonkey-protocol-0.6
+#
+# In addition to \xe3, \xc5 and \xd4, I see a lot of \xe5.
+# As of April 2006, I also see some \xe4.
+#
+# God this is a mess.  What an irritating protocol.  
+# This will match about 2% of streams with random data in them!
+# (But fortunately much fewer than 2% of streams that are other protocols.
+# You can test this with the data in ../testing/)
+
+^[\xc5\xd4\xe3-\xe5].?.?.?.?([\x01\x02\x05\x14\x15\x16\x18\x19\x1a\x1b\x1c\x20\x21\x32\x33\x34\x35\x36\x38\x40\x41\x42\x43\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58[\x60\x81\x82\x90\x91\x93\x96\x97\x98\x99\x9a\x9b\x9c\x9e\xa0\xa1\xa2\xa3\xa4]|\x59................?[ -~]|\x96....$)
+
+# matches everything and too much 
+# ^(\xe3|\xc5|\xd4)
+
+# ipp2p essentially uses "\xe3....\x47", which doesn't seem at all right to me.
+
+# bandwidtharbitrator uses 
+# e0.*@.*6[a-z].*p$|e0.*@.*[a-z]6[a-z].*p0$|e.*@.*[0-9]6.*p$|emule|edonkey
+# no comments to explain what all the mush is, of course...
diff --git a/trunk/package/network/utils/iptables/files/l7/fasttrack.pat b/trunk/package/network/utils/iptables/files/l7/fasttrack.pat
new file mode 100644
index 00000000..6ed8ff1d
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/fasttrack.pat
@@ -0,0 +1,23 @@
+# FastTrack - P2P filesharing (Kazaa, Morpheus, iMesh, Grokster, etc)
+# Pattern attributes: good slow notsofast
+# Protocol groups: p2p
+# Wiki: http://www.protocolinfo.org/wiki/Fasttrack
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Tested with Kazaa Lite Resurrection 0.0.7.6F
+#
+# This appears to match the download connections well, but not the search
+# connections (I think they are encrypted :-( ).
+
+fasttrack
+# while this is a valid http request, this will be caught because
+# the http pattern matches the response (and therefore the next packet)
+# Even so, it's best to put this match earlier in the chain.
+# http://cvs.berlios.de/cgi-bin/viewcvs.cgi/gift-fasttrack/giFT-FastTrack/PROTOCOL?rev=HEAD&content-type=text/vnd.viewcvs-markup
+
+# This pattern is kinda slow, but not too bad.
+^get (/.download/[ -~]*|/.supernode[ -~]|/.status[ -~]|/.network[ -~]*|/.files|/.hash=[0-9a-f]*/[ -~]*) http/1.1|user-agent: kazaa|x-kazaa(-username|-network|-ip|-supernodeip|-xferid|-xferuid|tag)|^give [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]?[0-9]?[0-9]?
+
+# This isn't much faster:
+#^get (/.download/.*|/.supernode.|/.status.|/.network.*|/.files|/.hash=[0-9a-f]*/.*) http/1.1|user-agent: kazaa|x-kazaa(-username|-network|-ip|-supernodeip|-xferid|-xferuid|tag)|^give [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]?[0-9]?[0-9]?
+
diff --git a/trunk/package/network/utils/iptables/files/l7/ftp.pat b/trunk/package/network/utils/iptables/files/l7/ftp.pat
new file mode 100644
index 00000000..44d97c46
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/ftp.pat
@@ -0,0 +1,46 @@
+# FTP - File Transfer Protocol - RFC 959
+# Pattern attributes: great notsofast fast
+# Protocol groups: document_retrieval ietf_internet_standard
+# Wiki: http://protocolinfo.org/wiki/FTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Usually runs on port 21.  Note that the data stream is on a dynamically
+# assigned port, which means that you will need the FTP connection 
+# tracking module in your kernel to usefully match FTP data transfers.
+# 
+# This pattern is well tested.
+#
+# Handles the first two things a server should say:
+#
+# First, the server says it's ready by sending "220".  Most servers say 
+# something after 220, even though they don't have to, and it usually 
+# includes the string "ftp" (l7-filter is case insensitive). This 
+# includes proftpd, vsftpd, wuftpd, warftpd, pureftpd, Bulletproof FTP 
+# Server, and whatever ftp.microsoft.com uses.  Almost all servers use only 
+# ASCII printable characters between the "220" and the "FTP", but non-English
+# ones might use others.
+# 
+# The next thing the server sends is a 331.  All the above servers also 
+# send something including "password" after this code.  By default, we 
+# do not match on this because it takes another packet and is more work 
+# for regexec.
+
+ftp
+# by default, we allow only ASCII
+^220[\x09-\x0d -~]*ftp
+
+# This covers UTF-8 as well 
+#^220[\x09-\x0d -~\x80-\xfd]*ftp
+
+# This allows any characters and is about 4x faster than either of the above 
+# (which are about the same as each other)
+#^220.*ftp
+
+# This is much slower
+#^220[\x09-\x0d -~]*ftp|331[\x09-\x0d -~]*password
+
+# This pattern is more precise, but takes longer to match. (3 packets vs. 1)
+#^220[\x09-\x0d -~]*\x0d\x0aUSER[\x09-\x0d -~]*\x0d\x0a331
+
+# same as above, but slightly less precise and only takes 2 packets.
+#^220[\x09-\x0d -~]*\x0d\x0aUSER[\x09-\x0d -~]*\x0d\x0a
diff --git a/trunk/package/network/utils/iptables/files/l7/gnutella.pat b/trunk/package/network/utils/iptables/files/l7/gnutella.pat
new file mode 100644
index 00000000..770ed43b
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/gnutella.pat
@@ -0,0 +1,34 @@
+# Gnutella - P2P filesharing
+# Pattern attributes: good notsofast notsofast
+# Protocol groups: p2p open_source
+# Wiki: http://www.protocolinfo.org/wiki/Gnutella
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# This should match both Gnutella and "Gnutella2" ("Mike's protocol")
+# 
+# Various clients use this protocol including Mactella, Shareaza,
+# GTK-gnutella, Gnucleus, Gnotella, LimeWire, iMesh and BearShare.
+# 
+# This is tested with gtk-gnutella and Shareaza.
+
+# http://www.gnutella2.com/tiki-index.php?page=UDP%20Transceiver
+# http://rfc-gnutella.sf.net/
+# http://www.gnutella2.com/tiki-index.php?page=Gnutella2%20Specification
+# http://en.wikipedia.org/wiki/Shareaza
+
+gnutella
+
+# The first part matches UDP messages - All start with "GND", then have
+# a flag byte which is either \x00, \x01 or \x02, then two sequence bytes
+# that can be anything, then a fragment number, which must start at 1.
+# The rest matches TCP first client message or first server message (in case 
+# we can't see client messages).  Some parts of this are empirical rather than 
+# document based.  Assumes version is between 0.0 and 2.9. (usually is
+# 0.4 or 0.6).  I'm guessing at many of the user-agents.
+# The last bit is emprical and probably only matches Limewire.
+^(gnd[\x01\x02]?.?.?\x01|gnutella connect/[012]\.[0-9]\x0d\x0a|get /uri-res/n2r\?urn:sha1:|get /.*user-agent: (gtk-gnutella|bearshare|mactella|gnucleus|gnotella|limewire|imesh)|get /.*content-type: application/x-gnutella-packets|giv [0-9]*:[0-9a-f]*/|queue [0-9a-f]* [1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?:[1-9][0-9]?[0-9]?[0-9]?|gnutella.*content-type: application/x-gnutella|...................?lime)
+
+# Needlessly precise, at the expense of time
+#^(gnd[\x01\x02]?.?.?\x01|gnutella connect/[012]\.[0-9]\x0d\x0a|get /uri-res/n2r\?urn:sha1:|get /[\x09-\x0d -~]*user-agent: (gtk-gnutella|bearshare|mactella|gnucleus|gnotella|limewire|imesh)|get /[\x09-\x0d -~]*content-type: application/x-gnutella-packets|giv [0-9]*:[0-9a-f]*/|queue [0-9a-f]* [1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?\.[1-9][0-9]?[0-9]?:[1-9][0-9]?[0-9]?[0-9]?|gnutella[\x09-\x0d -~]*content-type: application/x-gnutella|..................lime)
+
+
diff --git a/trunk/package/network/utils/iptables/files/l7/http.pat b/trunk/package/network/utils/iptables/files/l7/http.pat
new file mode 100644
index 00000000..5122310d
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/http.pat
@@ -0,0 +1,28 @@
+# HTTP - HyperText Transfer Protocol - RFC 2616
+# Pattern attributes: great slow notsofast superset
+# Protocol groups: document_retrieval ietf_draft_standard
+# Wiki: http://protocolinfo.org/wiki/HTTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Usually runs on port 80
+#
+# This pattern has been tested and is believed to work well.
+#
+# this intentionally catches the response from the server rather than
+# the request so that other protocols which use http (like kazaa) can be
+# caught based on specific http requests regardless of the ordering of
+# filters... also matches posts
+
+# Sites that serve really long cookies may break this by pushing the
+# server response too far away from the beginning of the connection. To
+# fix this, increase the kernel's data buffer length.
+
+http
+# Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF (rfc 2616)
+# As specified in rfc 2616 a status code is preceeded and followed by a
+# space. 
+http/(0\.9|1\.0|1\.1) [1-5][0-9][0-9] [\x09-\x0d -~]*(connection:|content-type:|content-length:|date:)|post [\x09-\x0d -~]* http/[01]\.[019]
+# A slightly faster version that might be good enough:
+#http/(0\.9|1\.0|1\.1) [1-5][0-9][0-9]|post [\x09-\x0d -~]* http/[01]\.[019]
+# old pattern(s):
+#(http[\x09-\x0d -~]*(200 ok|302 |304 )[\x09-\x0d -~]*(connection:|content-type:|content-length:))|^(post [\x09-\x0d -~]* http/)
diff --git a/trunk/package/network/utils/iptables/files/l7/ident.pat b/trunk/package/network/utils/iptables/files/l7/ident.pat
new file mode 100644
index 00000000..3205e5e6
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/ident.pat
@@ -0,0 +1,15 @@
+# Ident - Identification Protocol - RFC 1413
+# Pattern attributes: good fast fast
+# Protocol groups: networking ietf_proposed_standard
+# Wiki: http://www.protocolinfo.org/wiki/Ident
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Usually runs on port 113
+#
+# This pattern is believed to work.
+
+ident
+# "number , numberCRLF" possibly without the CR and/or LF.
+# ^$ is appropriate because the first packet should never have anything
+# else in it.
+^[1-9][0-9]?[0-9]?[0-9]?[0-9]?[\x09-\x0d]*,[\x09-\x0d]*[1-9][0-9]?[0-9]?[0-9]?[0-9]?(\x0d\x0a|[\x0d\x0a])?$
diff --git a/trunk/package/network/utils/iptables/files/l7/irc.pat b/trunk/package/network/utils/iptables/files/l7/irc.pat
new file mode 100644
index 00000000..e25360ca
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/irc.pat
@@ -0,0 +1,20 @@
+# IRC - Internet Relay Chat - RFC 1459
+# Pattern attributes: great veryfast fast
+# Protocol groups: chat ietf_proposed_standard
+# Wiki: http://www.protocolinfo.org/wiki/IRC
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Usually runs on port 6666 or 6667
+# Note that chat traffic runs on these ports, but IRC-DCC traffic (which
+# can use much more bandwidth) uses a dynamically assigned port, so you 
+# must have the IRC connection tracking module in your kernel to classify
+# this.
+#
+# This pattern has been tested and is believed to work well.
+
+irc
+# First thing that happens is that the client sends NICK and USER, in 
+# either order.  This allows MIRC color codes (\x02-\x0d instead of
+# \x09-\x0d).
+^(nick[\x09-\x0d -~]*user[\x09-\x0d -~]*:|user[\x09-\x0d -~]*:[\x02-\x0d -~]*nick[\x09-\x0d -~]*\x0d\x0a)
+
diff --git a/trunk/package/network/utils/iptables/files/l7/jabber.pat b/trunk/package/network/utils/iptables/files/l7/jabber.pat
new file mode 100644
index 00000000..7c328905
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/jabber.pat
@@ -0,0 +1,24 @@
+# Jabber (XMPP) - open instant messenger protocol - RFC 3920 - http://jabber.org
+# Pattern attributes: good notsofast notsofast
+# Protocol groups: chat ietf_proposed_standard
+# Wiki: http://www.protocolinfo.org/wiki/Jabber
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# This pattern has been tested with Gaim and Gabber.  It is only tested 
+# with non-SSL mode Jabber with no proxies.
+
+# Thanks to Jan Hudec for some improvements.
+
+# Jabber seems to take a long time to set up a connection.  I'm
+# connecting with Gabber 0.8.8 to 12jabber.org and the first 8 packets
+# is this:
+# <stream:stream to='12jabber.com' xmlns='jabber:client'
+# xmlns:stream='http://etherx.jabber.org/streams'><?xml
+# version='1.0'?><stream:stream
+# xmlns:stream='http://etherx.jabber.org/streams' id='3f73e951'
+# xmlns='jabber:client' from='12jabber.com'>
+#
+# No mention of my username or password yet, you'll note.
+
+jabber
+<stream:stream[\x09-\x0d ][ -~]*[\x09-\x0d ]xmlns=['"]jabber
diff --git a/trunk/package/network/utils/iptables/files/l7/msnmessenger.pat b/trunk/package/network/utils/iptables/files/l7/msnmessenger.pat
new file mode 100644
index 00000000..11dfc10b
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/msnmessenger.pat
@@ -0,0 +1,28 @@
+# MSN Messenger - Microsoft Network chat client
+# Pattern attributes: good slow notsofast
+# Protocol groups: chat proprietary
+# Wiki: http://www.protocolinfo.org/wiki/MSN_Messenger
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Usually uses TCP port 1863
+# http://www.hypothetic.org/docs/msn/index.php
+# http://msnpiki.msnfanatic.com/
+#
+# This pattern has been tested and is believed to work well.
+
+msnmessenger
+
+# First branch: login
+#   ver: allow versions up to 99.
+#   I've never seen a cvr other than cvr0.  Maybe this will be trouble later?
+#   Can't anchor at the beginning because sometimes this is encapsulated in
+#   HTTP.  But either way, the first packet ends like this.
+# Second/Third branches: accepting/sending a message
+#   I will assume that these can also be encapsulated in HTTP, although I have
+#   not checked.  Example of each direction:
+#   ANS 1 quadong@hotmail.com 1139803431.29427 17522047
+#   USR 1 quadong@hotmail.com 530423708.968145.366138
+
+# Branches are written entirely separately for better performance.
+ver [0-9]+ msnp[1-9][0-9]? [\x09-\x0d -~]*cvr0\x0d\x0a$|usr 1 [!-~]+ [0-9. ]+\x0d\x0a$|ans 1 [!-~]+ [0-9. ]+\x0d\x0a$
+
diff --git a/trunk/package/network/utils/iptables/files/l7/ntp.pat b/trunk/package/network/utils/iptables/files/l7/ntp.pat
new file mode 100644
index 00000000..760cfdbe
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/ntp.pat
@@ -0,0 +1,17 @@
+# (S)NTP - (Simple) Network Time Protocol - RFCs 1305 and 2030
+# Pattern attributes: good fast fast overmatch 
+# Protocol groups: time_synchronization ietf_draft_standard
+# Wiki: http://www.protocolinfo.org/wiki/NTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# This pattern is tested and is believed to work.
+
+# client|server
+# Requires the server's timestamp to be in the present or future (of 2005).
+# Tested with ntpdate on Linux.
+# Assumes version 2, 3 or 4.
+
+# Note that ntp packets are always 48 bytes, so you should match on that too.
+
+ntp
+^([\x13\x1b\x23\xd3\xdb\xe3]|[\x14\x1c$].......?.?.?.?.?.?.?.?.?[\xc6-\xff])
diff --git a/trunk/package/network/utils/iptables/files/l7/pop3.pat b/trunk/package/network/utils/iptables/files/l7/pop3.pat
new file mode 100644
index 00000000..3ae4c147
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/pop3.pat
@@ -0,0 +1,50 @@
+# POP3 - Post Office Protocol version 3 (popular e-mail protocol) - RFC 1939
+# Pattern attributes: great veryfast fast
+# Protocol groups: mail ietf_internet_standard
+# Wiki: http://www.protocolinfo.org/wiki/POP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# This pattern has been tested somewhat.
+
+# this is a difficult protocol to match because of the relative lack of 
+# distinguishing information.  Read on.
+pop3
+
+# this the most conservative pattern.  It should definitely work.
+#^(\+ok|-err)
+
+# this pattern assumes that the server says _something_ after +ok or -err
+# I think this is probably the way to go.
+^(\+ok |-err )
+
+# more that 90% of servers seem to say "pop" after "+ok", but not all.
+#^(\+ok .*pop)
+
+# Here's another tack. I think this is my second favorite.
+#^(\+ok [\x09-\x0d -~]*(ready|hello|pop|starting)|-err [\x09-\x0d -~]*(invalid|unknown|unimplemented|unrecognized|command))
+
+# this matches the server saying "you have N messages that are M bytes",
+# which the client probably asks for early in the session (not tested)
+#\+ok [0-9]+ [0-9]+
+
+# some sample servers:
+# RFC example:        +OK POP3 server ready <1896.697170952@dbc.mtview.ca.us>
+# mail.dreamhost.com: +OK Hello there.
+# pop.carleton.edu:   +OK POP3D(*) Server PMDFV6.2.2 at Fri, 12 Sep 2003 19:28:10 -0500 (CDT) (APOP disabled)
+# mail.earthlink.net: +OK NGPopper vEL_4_38 at earthlink.net ready <25509.1063412951@falcon>
+# *.email.umn.edu:    +OK Cubic Circle's v1.22 1998/04/11 POP3 ready <7d1e0000da67623f@aquamarine.tc.umn.edu>
+# mail.yale.edu:      +OK POP3 pantheon-po01 v2002.81 server ready
+# mail.gustavus.edu:  +OK POP3 solen v2001.78 server ready
+# mail.reed.edu:      +OK POP3 letra.reed.edu v2002.81 server ready
+# mail.bowdoin.edu:   +OK mail.bowdoin.edu POP3 service (iPlanet Messaging Server 5.2 HotFix 1.15 (built Apr 28 2003))
+# pop.colby.edu:      +OK Qpopper (version 4.0.5) at basalt starting.
+# mail.mac.com:       +OK Netscape Messaging Multiplexor ready
+
+# various error strings:
+#-ERR Invalid command.
+#-ERR invalid command
+#-ERR unimplemented
+#-ERR Invalid command, try one of: USER name, PASS string, QUIT
+#-ERR Unknown AUTHORIZATION state command
+#-ERR Unrecognized command
+#-ERR Unknown command: "sadf'".
diff --git a/trunk/package/network/utils/iptables/files/l7/smtp.pat b/trunk/package/network/utils/iptables/files/l7/smtp.pat
new file mode 100644
index 00000000..2f5d1957
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/smtp.pat
@@ -0,0 +1,40 @@
+# SMTP - Simple Mail Transfer Protocol - RFC 2821 (See also RFC 1869)
+# Pattern attributes: great notsofast fast
+# Protocol groups: mail ietf_internet_standard
+# Wiki: http://www.protocolinfo.org/wiki/SMTP
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# usually runs on port 25
+# 
+# This pattern has been tested and is believed to work well.
+
+# As usual, no text is required after "220", but all known servers have some
+# there.  It (almost?) always has string "smtp" in it.  The RFC examples
+# does not, so we match those too, just in case anyone has copied them 
+# literally.
+#
+# Some examples:
+# 220 mail.stalker.com ESMTP CommuniGate Pro 4.1.3
+# 220 mail.vieodata.com ESMTP Merak 6.1.0; Mon, 15 Sep 2003 13:48:11 -0400
+# 220 mail.ut.caldera.com ESMTP
+# 220 persephone.pmail.gen.nz ESMTP server ready.
+# 220 smtp1.superb.net ESMTP
+# 220 mail.kerio.com Kerio MailServer 5.6.7 ESMTP ready
+# 220-mail.deerfield.com ESMTP VisNetic.MailServer.v6.0.9.0; Mon, 15 Sep 2003 13:4
+# 220 altn.com ESMTP MDaemon 6.8.5; Mon, 15 Sep 2003 12:46:42 -0500
+# 220 X1 NT-ESMTP Server ipsmin0165atl2.interland.net (IMail 6.06 73062-3)
+# 220 mail.icewarp.com ESMTP Merak 6.1.1; Mon, 15 Sep 2003 19:43:23 +0200
+# 220-mail.email-scan.com ESMTP
+# 220 smaug.dreamhost.com ESMTP
+# 220 kona.carleton.edu -- Server ESMTP (PMDF V6.2#30648)
+# 220 letra.reed.edu ESMTP Sendmail 8.12.9/8.12.9; Mon, 15 Sep 2003 10:35:57 -0700 (PDT)
+# 220-swan.mail.pas.earthlink.net ESMTP Exim 3.33 #1 Mon, 15 Sep 2003 10:32:15 -0700
+# 
+# RFC examples:
+# 220 xyz.com Simple Mail Transfer Service Ready (RFC example)
+# 220 dbc.mtview.ca.us SMTP service ready
+
+smtp
+^220[\x09-\x0d -~]* (e?smtp|simple mail)
+userspace pattern=^220[\x09-\x0d -~]* (E?SMTP|[Ss]imple [Mm]ail)
+userspace flags=REG_NOSUB REG_EXTENDED
diff --git a/trunk/package/network/utils/iptables/files/l7/ssl.pat b/trunk/package/network/utils/iptables/files/l7/ssl.pat
new file mode 100644
index 00000000..ae30ee44
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/ssl.pat
@@ -0,0 +1,16 @@
+# SSL and TLS - Secure Socket Layer / Transport Layer Security - RFC 2246
+# Pattern attributes: good notsofast fast superset
+# Protocol groups: secure ietf_proposed_standard
+# Wiki: http://www.protocolinfo.org/wiki/SSL
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# Usually runs on port 443
+#
+# This is a superset of validcertssl.  For it to match, it must be first.
+# 
+# This pattern has been tested and is believed to work well.
+
+ssl
+# Server Hello with certificate | Client Hello
+# This allows SSL 3.X, which includes TLS 1.0, known internally as SSL 3.1
+^(.?.?\x16\x03.*\x16\x03|.?.?\x01\x03\x01?.*\x0b)
diff --git a/trunk/package/network/utils/iptables/files/l7/vnc.pat b/trunk/package/network/utils/iptables/files/l7/vnc.pat
new file mode 100644
index 00000000..79d0ae8a
--- /dev/null
+++ b/trunk/package/network/utils/iptables/files/l7/vnc.pat
@@ -0,0 +1,23 @@
+# VNC - Virtual Network Computing.  Also known as RFB - Remote Frame Buffer
+# Pattern attributes: great veryfast fast
+# Protocol groups: remote_access
+# Wiki: http://www.protocolinfo.org/wiki/VNC
+# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE
+#
+# http://www.realvnc.com/documentation.html
+# 
+# This pattern has been verified with vnc v3.3.7 on WinXP and Linux
+#
+# Thanks to Trevor Paskett <tpaskett AT cymphonix.com> for this pattern.
+
+vnc
+# Assumes single digit major and minor version numbers 
+# This message should be all alone in the first packet, so ^$ is appropriate
+^rfb 00[1-9]\.00[0-9]\x0a$
+
+# This is a more restrictive version which assumes the version numbers
+# are ones actually in existance at the time of this writing, i.e. 3.3,
+# 3.7 and 3.8 (with some clients wrongly reporting 3.5).  It should be
+# slightly faster, but probably not worth the extra maintenance. 
+# ^rfb 003\.00[3578]\x0a$
+
diff --git a/trunk/package/network/utils/iptables/patches/002-layer7_2.22.patch b/trunk/package/network/utils/iptables/patches/002-layer7_2.22.patch
new file mode 100644
index 00000000..ba4531e3
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/002-layer7_2.22.patch
@@ -0,0 +1,371 @@
+--- /dev/null
++++ b/extensions/libxt_layer7.c
+@@ -0,0 +1,368 @@
++/* 
++   Shared library add-on to iptables for layer 7 matching support. 
++  
++   By Matthew Strait <quadong@users.sf.net>, Oct 2003-Aug 2008.
++
++   http://l7-filter.sf.net 
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License
++   as published by the Free Software Foundation; either version
++   2 of the License, or (at your option) any later version.
++   http://www.gnu.org/licenses/gpl.txt
++*/
++
++#define _GNU_SOURCE
++#include <stdio.h>
++#include <netdb.h>
++#include <string.h>
++#include <stdlib.h>
++#include <getopt.h>
++#include <ctype.h>
++#include <dirent.h>
++
++#include <xtables.h>
++#include <linux/netfilter/xt_layer7.h>
++
++#define MAX_FN_LEN 256
++
++static char l7dir[MAX_FN_LEN] = "\0";
++
++/* Function which prints out usage message. */
++static void help(void)
++{
++	printf(
++	"layer7 match options:\n"
++	"    --l7dir <directory> : Look for patterns here instead of /etc/l7-protocols/\n"
++	"                          (--l7dir must be specified before --l7proto if used)\n"
++	"[!] --l7proto <name>: Match named protocol using /etc/l7-protocols/.../name.pat\n");
++}
++
++static const struct option opts[] = {
++	{ .name = "l7proto", .has_arg = 1, .val = 'p' },
++	{ .name = "l7dir",   .has_arg = 1, .val = 'd' },
++	{ .name = NULL }
++};
++
++/* reads filename, puts protocol info into layer7_protocol_info, number of protocols to numprotos */
++static int parse_protocol_file(char * filename, const char * protoname, struct xt_layer7_info *info)
++{
++	FILE * f;
++	char * line = NULL;
++	size_t len = 0;
++
++	enum { protocol, pattern, done } datatype = protocol;
++
++	f = fopen(filename, "r");
++
++	if(!f)
++		return 0;
++
++	while(getline(&line, &len, f) != -1)
++	{
++		if(strlen(line) < 2 || line[0] == '#')
++			continue;
++
++		/* strip the pesky newline... */
++		if(line[strlen(line) - 1] == '\n')
++			line[strlen(line) - 1] = '\0';
++
++		if(datatype == protocol)
++		{
++			/* Ignore everything on the line beginning with the 
++			first space or tab . For instance, this allows the 
++			protocol line in http.pat to be "http " (or 
++			"http I am so cool") instead of just "http". */
++			if(strchr(line, ' ')){
++				char * space = strchr(line, ' ');
++				space[0] = '\0';
++			}
++			if(strchr(line, '\t')){
++				char * space = strchr(line, '\t');
++				space[0] = '\0';
++			}
++
++			/* sanity check.  First non-comment non-blank 
++			line must be the same as the file name. */
++			if(strcmp(line, protoname))
++				xtables_error(OTHER_PROBLEM, 
++					"Protocol name (%s) doesn't match file name (%s).  Bailing out\n",
++					line, filename);
++
++			if(strlen(line) >= MAX_PROTOCOL_LEN)
++				 xtables_error(PARAMETER_PROBLEM, 
++					"Protocol name in %s too long!", filename);
++			strncpy(info->protocol, line, MAX_PROTOCOL_LEN);
++
++			datatype = pattern; 
++		}
++		else if(datatype == pattern)
++		{
++			if(strlen(line) >= MAX_PATTERN_LEN)
++				 xtables_error(PARAMETER_PROBLEM, "Pattern in %s too long!", filename);
++			strncpy(info->pattern, line, MAX_PATTERN_LEN);
++			
++			datatype = done;			
++			break;
++		}
++		else
++			xtables_error(OTHER_PROBLEM, "Internal error");
++	}
++
++	if(datatype != done)
++		xtables_error(OTHER_PROBLEM, "Failed to get all needed data from %s", filename);
++
++	if(line) free(line);
++	fclose(f);
++
++	return 1;
++}
++
++static int hex2dec(char c)
++{
++        switch (c)
++        {
++                case '0' ... '9':
++                        return c - '0';
++                case 'a' ... 'f':
++                        return c - 'a' + 10;
++                case 'A' ... 'F':
++                        return c - 'A' + 10;
++                default:
++                        xtables_error(OTHER_PROBLEM, "hex2dec: bad value!\n");
++                        return 0;
++        }
++}
++
++/* takes a string with \xHH escapes and returns one with the characters 
++they stand for */
++static char * pre_process(char * s)
++{
++	char * result = malloc(strlen(s) + 1);
++	int sindex = 0, rrindex = 0;
++        while( sindex < strlen(s) )
++        {
++            if( sindex + 3 < strlen(s) &&
++                s[sindex] == '\\' && s[sindex+1] == 'x' && 
++                isxdigit(s[sindex + 2]) && isxdigit(s[sindex + 3]) ) 
++                {
++                        /* carefully remember to call tolower here... */
++                        result[rrindex] = tolower( hex2dec(s[sindex + 2])*16 +
++                                                  hex2dec(s[sindex + 3] ) );
++
++			switch ( result[rrindex] )
++			{
++			case 0x24:
++			case 0x28:
++			case 0x29:
++			case 0x2a:
++			case 0x2b:
++			case 0x2e:
++			case 0x3f:
++			case 0x5b:
++			case 0x5c:
++			case 0x5d:
++			case 0x5e:
++			case 0x7c:
++				fprintf(stderr, 
++					"Warning: layer7 regexp contains a control character, %c, in hex (\\x%c%c).\n"
++					"I recommend that you write this as %c or \\%c, depending on what you meant.\n",
++					result[rrindex], s[sindex + 2], s[sindex + 3], result[rrindex], result[rrindex]);
++				break;
++			case 0x00:
++				fprintf(stderr, 
++					"Warning: null (\\x00) in layer7 regexp.  A null terminates the regexp string!\n");
++				break;
++			default:
++				break;
++			}
++
++
++                        sindex += 3; /* 4 total */
++                }
++                else
++                        result[rrindex] = tolower(s[sindex]);
++
++		sindex++; 
++		rrindex++;
++        }
++	result[rrindex] = '\0';
++
++	return result;
++}
++
++#define MAX_SUBDIRS 128
++static char ** readl7dir(char * dirname)
++{
++        DIR             * scratchdir;
++        struct dirent   ** namelist;
++	char ** subdirs = malloc(MAX_SUBDIRS * sizeof(char *));
++
++        int n, d = 1;
++	subdirs[0] = "";
++
++        n = scandir(dirname, &namelist, 0, alphasort);
++
++	if (n < 0)
++	{
++            perror("scandir");
++	    xtables_error(OTHER_PROBLEM, "Couldn't open %s\n", dirname);
++	}
++        else 
++	{
++            	while(n--) 
++		{
++			char fulldirname[MAX_FN_LEN];
++
++			snprintf(fulldirname, MAX_FN_LEN, "%s/%s", dirname, namelist[n]->d_name);
++
++                	if((scratchdir = opendir(fulldirname)) != NULL)
++			{
++				closedir(scratchdir);
++
++				if(!strcmp(namelist[n]->d_name, ".") || 
++				   !strcmp(namelist[n]->d_name, ".."))
++					/* do nothing */ ;
++				else
++				{
++					subdirs[d] = malloc(strlen(namelist[n]->d_name) + 1);
++					strcpy(subdirs[d], namelist[n]->d_name);
++					d++;
++					if(d >= MAX_SUBDIRS - 1)
++					{
++						fprintf(stderr, 
++						  "Too many subdirectories, skipping the rest!\n");
++						break;
++					}
++				}
++			}
++                	free(namelist[n]);
++            	}
++            	free(namelist);
++        }
++	
++	subdirs[d] = NULL;
++
++	return subdirs;
++}
++
++static void parse_layer7_protocol(const char *s, struct xt_layer7_info *info)
++{
++	char filename[MAX_FN_LEN];
++	char * dir = NULL;
++	char ** subdirs;
++	int n = 0, done = 0;
++
++	if(strlen(l7dir) > 0) dir = l7dir;
++	else                  dir = "/etc/l7-protocols";
++
++	subdirs = readl7dir(dir);
++
++	while(subdirs[n] != NULL)
++	{
++		int c = snprintf(filename, MAX_FN_LEN, "%s/%s/%s.pat", dir, subdirs[n], s);
++
++		if(c > MAX_FN_LEN)
++			xtables_error(OTHER_PROBLEM, 
++				"Filename beginning with %s is too long!\n", filename);
++
++		/* read in the pattern from the file */
++		if(parse_protocol_file(filename, s, info)){
++			done = 1;
++			break;
++		}
++		
++		n++;
++	}
++
++	if(!done)
++		xtables_error(OTHER_PROBLEM, 
++			"Couldn't find a pattern definition file for %s.\n", s);
++
++	/* process \xHH escapes and tolower everything. (our regex lib has no
++	case insensitivity option.) */
++	strncpy(info->pattern, pre_process(info->pattern), MAX_PATTERN_LEN);
++}
++
++/* Function which parses command options; returns true if it ate an option */
++static int parse(int c, char **argv, int invert, unsigned int *flags,
++      const void *entry, struct xt_entry_match **match)
++{
++	struct xt_layer7_info *layer7info = 
++		(struct xt_layer7_info *)(*match)->data;
++
++	switch (c) {
++	case 'p':
++		parse_layer7_protocol(argv[optind-1], layer7info);
++		if (invert)
++			layer7info->invert = true;
++		*flags = 1;
++		break;
++
++	case 'd':
++		if(strlen(argv[optind-1]) >= MAX_FN_LEN)
++			xtables_error(PARAMETER_PROBLEM, "directory name too long\n");
++
++		strncpy(l7dir, argv[optind-1], MAX_FN_LEN);
++
++		*flags = 1;
++		break;
++
++	default:
++		return 0;
++	}
++
++	return 1;
++}
++
++/* Final check; must have specified --l7proto */
++static void final_check(unsigned int flags)
++{
++	if (!flags)
++		xtables_error(PARAMETER_PROBLEM,
++			   "LAYER7 match: You must specify `--l7proto'");
++}
++
++static void print_protocol(char s[], int invert, int numeric)
++{
++	fputs("l7proto ", stdout);
++	if (invert) fputc('!', stdout);
++	printf("%s ", s);
++}
++
++/* Prints out the matchinfo. */
++static void print(const void *ip,
++      const struct xt_entry_match *match,
++      int numeric)
++{
++	printf("LAYER7 ");
++	print_protocol(((struct xt_layer7_info *)match->data)->protocol,
++		  ((struct xt_layer7_info *)match->data)->invert, numeric);
++}
++/* Saves the union ipt_matchinfo in parsable form to stdout. */
++static void save(const void *ip, const struct xt_entry_match *match)
++{
++        const struct xt_layer7_info *info =
++            (const struct xt_layer7_info*) match->data;
++
++        printf("--l7proto %s%s ", (info->invert)? "! ":"", info->protocol);
++}
++
++static struct xtables_match layer7 = { 
++    .family        = AF_INET,
++    .name          = "layer7",
++    .version       = XTABLES_VERSION,
++    .size          = XT_ALIGN(sizeof(struct xt_layer7_info)),
++    .userspacesize = XT_ALIGN(sizeof(struct xt_layer7_info)),
++    .help          = &help,
++    .parse         = &parse,
++    .final_check   = &final_check,
++    .print         = &print,
++    .save          = &save,
++    .extra_opts    = opts
++};
++
++void _init(void)
++{
++	xtables_register_match(&layer7);
++}
diff --git a/trunk/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch b/trunk/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
new file mode 100644
index 00000000..2b6c57ec
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
@@ -0,0 +1,18 @@
+--- a/libxtables/xtables.c
++++ b/libxtables/xtables.c
+@@ -336,6 +336,7 @@ static char *get_modprobe(void)
+ 
+ int xtables_insmod(const char *modname, const char *modprobe, bool quiet)
+ {
++#if 0
+ 	char *buf = NULL;
+ 	char *argv[4];
+ 	int status;
+@@ -380,6 +381,7 @@ int xtables_insmod(const char *modname, 
+ 	free(buf);
+ 	if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+ 		return 0;
++#endif
+ 	return -1;
+ }
+ 
diff --git a/trunk/package/network/utils/iptables/patches/030-no-libnfnetlink.patch b/trunk/package/network/utils/iptables/patches/030-no-libnfnetlink.patch
new file mode 100644
index 00000000..50542ac0
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/030-no-libnfnetlink.patch
@@ -0,0 +1,94 @@
+--- a/configure
++++ b/configure
+@@ -12367,77 +12367,7 @@ fi
+ fi
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
+-$as_echo_n "checking for libnfnetlink... " >&6; }
+-
+-if test -n "$libnfnetlink_CFLAGS"; then
+-    pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_libnfnetlink_CFLAGS=`$PKG_CONFIG --cflags "libnfnetlink >= 1.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$libnfnetlink_LIBS"; then
+-    pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_libnfnetlink_LIBS=`$PKG_CONFIG --libs "libnfnetlink >= 1.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
+-        else
+-	        libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$libnfnetlink_PKG_ERRORS" >&5
+-
+-	nfnetlink=0
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	nfnetlink=0
+-else
+-	libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS
+-	libnfnetlink_LIBS=$pkg_cv_libnfnetlink_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	nfnetlink=1
+-fi
+- if test "$nfnetlink" = 1; then
++if false; then
+   HAVE_LIBNFNETLINK_TRUE=
+   HAVE_LIBNFNETLINK_FALSE='#'
+ else
+--- a/configure.ac
++++ b/configure.ac
+@@ -111,9 +111,7 @@ if test "x$enable_bpfc" = "xyes" || test
+ 	AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool))
+ fi
+ 
+-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
+-	[nfnetlink=1], [nfnetlink=0])
+-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
++AM_CONDITIONAL([HAVE_LIBNFNETLINK], [false])
+ 
+ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
+ 	-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
diff --git a/trunk/package/network/utils/iptables/patches/100-bash-location.patch b/trunk/package/network/utils/iptables/patches/100-bash-location.patch
new file mode 100644
index 00000000..02ee45ba
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/100-bash-location.patch
@@ -0,0 +1,8 @@
+--- a/iptables/iptables-apply
++++ b/iptables/iptables-apply
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ #
+ # iptables-apply -- a safer way to update iptables remotely
+ #
diff --git a/trunk/package/network/utils/iptables/patches/200-configurable_builtin.patch b/trunk/package/network/utils/iptables/patches/200-configurable_builtin.patch
new file mode 100644
index 00000000..d35bc5a8
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/200-configurable_builtin.patch
@@ -0,0 +1,60 @@
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -45,9 +45,24 @@ pfx_symlinks  := NOTRACK state
+ pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
+ pf4_build_mod := $(filter-out @blacklist_modules@,${pf4_build_mod})
+ pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
+-pfx_objs      := $(patsubst %,libxt_%.o,${pfx_build_mod})
+-pf4_objs      := $(patsubst %,libipt_%.o,${pf4_build_mod})
+-pf6_objs      := $(patsubst %,libip6t_%.o,${pf6_build_mod})
++
++ifdef BUILTIN_MODULES
++pfx_build_static := $(filter $(BUILTIN_MODULES),${pfx_build_mod})
++pf4_build_static := $(filter $(BUILTIN_MODULES),${pf4_build_mod})
++pf6_build_static := $(filter $(BUILTIN_MODULES),${pf6_build_mod})
++else
++@ENABLE_STATIC_TRUE@ pfx_build_static := $(pfx_build_mod)
++@ENABLE_STATIC_TRUE@ pf4_build_static := $(pf4_build_mod)
++@ENABLE_STATIC_TRUE@ pf6_build_static := $(pf6_build_mod)
++endif
++
++pfx_build_mod := $(filter-out $(pfx_build_static),$(pfx_build_mod))
++pf4_build_mod := $(filter-out $(pf4_build_static),$(pf4_build_mod))
++pf6_build_mod := $(filter-out $(pf6_build_static),$(pf6_build_mod))
++
++pfx_objs      := $(patsubst %,libxt_%.o,${pfx_build_static})
++pf4_objs      := $(patsubst %,libipt_%.o,${pf4_build_static})
++pf6_objs      := $(patsubst %,libip6t_%.o,${pf6_build_static})
+ pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
+ pf4_solibs    := $(patsubst %,libipt_%.so,${pf4_build_mod})
+ pf6_solibs    := $(patsubst %,libip6t_%.so,${pf6_build_mod})
+@@ -58,11 +73,11 @@ pf6_solibs    := $(patsubst %,libip6t_%.
+ #
+ targets := libext.a libext4.a libext6.a matches.man targets.man
+ targets_install :=
+-@ENABLE_STATIC_TRUE@ libext_objs := ${pfx_objs}
+-@ENABLE_STATIC_TRUE@ libext4_objs := ${pf4_objs}
+-@ENABLE_STATIC_TRUE@ libext6_objs := ${pf6_objs}
+-@ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
+-@ENABLE_STATIC_FALSE@ targets_install += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
++libext_objs := ${pfx_objs}
++libext4_objs := ${pf4_objs}
++libext6_objs := ${pf6_objs}
++targets += ${pfx_solibs} ${pf4_solibs} ${pf6_solibs}
++targets_install := $(strip ${targets_install} ${pfx_solibs} ${pf4_solibs} ${pf6_solibs})
+ 
+ .SECONDARY:
+ 
+@@ -126,9 +141,9 @@ libext4.a: initext4.o ${libext4_objs}
+ libext6.a: initext6.o ${libext6_objs}
+ 	${AM_VERBOSE_AR} ${AR} crs $@ $^;
+ 
+-initext_func  := $(addprefix xt_,${pfx_build_mod})
+-initext4_func := $(addprefix ipt_,${pf4_build_mod})
+-initext6_func := $(addprefix ip6t_,${pf6_build_mod})
++initext_func  := $(addprefix xt_,${pfx_build_static})
++initext4_func := $(addprefix ipt_,${pf4_build_static})
++initext6_func := $(addprefix ip6t_,${pf6_build_static})
+ 
+ .initext.dd: FORCE
+ 	@echo "${initext_func}" >$@.tmp; \
diff --git a/trunk/package/network/utils/iptables/patches/300-musl_fixes.patch b/trunk/package/network/utils/iptables/patches/300-musl_fixes.patch
new file mode 100644
index 00000000..a78eda77
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/300-musl_fixes.patch
@@ -0,0 +1,127 @@
+--- a/extensions/libip6t_ipv6header.c
++++ b/extensions/libip6t_ipv6header.c
+@@ -10,6 +10,9 @@ on whether they contain certain headers 
+ #include <netdb.h>
+ #include <xtables.h>
+ #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
++#ifndef IPPROTO_HOPOPTS
++#	define IPPROTO_HOPOPTS 0
++#endif
+ 
+ enum {
+ 	O_HEADER = 0,
+--- a/extensions/libxt_TCPOPTSTRIP.c
++++ b/extensions/libxt_TCPOPTSTRIP.c
+@@ -12,6 +12,21 @@
+ #ifndef TCPOPT_MD5SIG
+ #	define TCPOPT_MD5SIG 19
+ #endif
++#ifndef TCPOPT_MAXSEG
++#	define TCPOPT_MAXSEG 2
++#endif
++#ifndef TCPOPT_WINDOW
++#	define TCPOPT_WINDOW 3
++#endif
++#ifndef TCPOPT_SACK_PERMITTED
++#	define TCPOPT_SACK_PERMITTED 4
++#endif
++#ifndef TCPOPT_SACK
++#	define TCPOPT_SACK 5
++#endif
++#ifndef TCPOPT_TIMESTAMP
++#	define TCPOPT_TIMESTAMP 8
++#endif
+ 
+ enum {
+ 	O_STRIP_OPTION = 0,
+--- a/include/libiptc/ipt_kernel_headers.h
++++ b/include/libiptc/ipt_kernel_headers.h
+@@ -5,7 +5,6 @@
+ 
+ #include <limits.h>
+ 
+-#if defined(__GLIBC__) && __GLIBC__ == 2
+ #include <netinet/ip.h>
+ #include <netinet/in.h>
+ #include <netinet/ip_icmp.h>
+@@ -13,15 +12,4 @@
+ #include <netinet/udp.h>
+ #include <net/if.h>
+ #include <sys/types.h>
+-#else /* libc5 */
+-#include <sys/socket.h>
+-#include <linux/ip.h>
+-#include <linux/in.h>
+-#include <linux/if.h>
+-#include <linux/icmp.h>
+-#include <linux/tcp.h>
+-#include <linux/udp.h>
+-#include <linux/types.h>
+-#include <linux/in6.h>
+-#endif
+ #endif
+--- a/include/linux/netfilter_ipv4/ip_tables.h
++++ b/include/linux/netfilter_ipv4/ip_tables.h
+@@ -16,6 +16,7 @@
+ #define _IPTABLES_H
+ 
+ #include <linux/types.h>
++#include <sys/types.h>
+ 
+ #include <linux/netfilter_ipv4.h>
+ 
+--- a/iptables/ip6tables-restore.c
++++ b/iptables/ip6tables-restore.c
+@@ -9,7 +9,7 @@
+  */
+ 
+ #include <getopt.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdbool.h>
+ #include <string.h>
+ #include <stdio.h>
+--- a/iptables/ip6tables-save.c
++++ b/iptables/ip6tables-save.c
+@@ -6,7 +6,7 @@
+  * This code is distributed under the terms of GNU GPL v2
+  */
+ #include <getopt.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+--- a/iptables/iptables-restore.c
++++ b/iptables/iptables-restore.c
+@@ -6,7 +6,7 @@
+  */
+ 
+ #include <getopt.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdbool.h>
+ #include <string.h>
+ #include <stdio.h>
+--- a/iptables/iptables-save.c
++++ b/iptables/iptables-save.c
+@@ -6,7 +6,7 @@
+  *
+  */
+ #include <getopt.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+--- a/iptables/iptables-xml.c
++++ b/iptables/iptables-xml.c
+@@ -7,7 +7,7 @@
+  */
+ 
+ #include <getopt.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/trunk/package/network/utils/iptables/patches/400-lenient-restore.patch b/trunk/package/network/utils/iptables/patches/400-lenient-restore.patch
new file mode 100644
index 00000000..55ced4a8
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/400-lenient-restore.patch
@@ -0,0 +1,172 @@
+--- a/iptables/ip6tables-restore.c
++++ b/iptables/ip6tables-restore.c
+@@ -14,6 +14,8 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdarg.h>
++#include <setjmp.h>
+ #include "ip6tables.h"
+ #include "xtables.h"
+ #include "libiptc/libip6tc.h"
+@@ -25,6 +27,7 @@
+ #define DEBUGP(x, args...)
+ #endif
+ 
++static jmp_buf jmp;
+ static int binary = 0, counters = 0, verbose = 0, noflush = 0;
+ 
+ /* Keeping track of external matches and targets.  */
+@@ -35,6 +38,7 @@ static const struct option options[] = {
+ 	{.name = "test",     .has_arg = false, .val = 't'},
+ 	{.name = "help",     .has_arg = false, .val = 'h'},
+ 	{.name = "noflush",  .has_arg = false, .val = 'n'},
++	{.name = "lenient",  .has_arg = false, .val = 'l'},
+ 	{.name = "modprobe", .has_arg = true,  .val = 'M'},
+ 	{.name = "table",    .has_arg = true,  .val = 'T'},
+ 	{NULL},
+@@ -51,6 +55,7 @@ static void print_usage(const char *name
+ 			"	   [ --test ]\n"
+ 			"	   [ --help ]\n"
+ 			"	   [ --noflush ]\n"
++			"	   [ --lenient ]\n"
+ 			"          [ --modprobe=<command>]\n", name);
+ 
+ 	exit(1);
+@@ -114,6 +119,17 @@ static void free_argv(void) {
+ 		free(newargv[i]);
+ }
+ 
++static void catch_exit_error(enum xtables_exittype status, const char *msg, ...)
++{
++	va_list args;
++	fprintf(stderr, "line %d: ", line);
++	va_start(args, msg);
++	vfprintf(stderr, msg, args);
++	va_end(args);
++	fprintf(stderr, "\n");
++	longjmp(jmp, status);
++}
++
+ static void add_param_to_argv(char *parsestart)
+ {
+ 	int quote_open = 0, escaped = 0, param_len = 0;
+@@ -204,7 +220,7 @@ int ip6tables_restore_main(int argc, cha
+ 	init_extensions6();
+ #endif
+ 
+-	while ((c = getopt_long(argc, argv, "bcvthnM:T:", options, NULL)) != -1) {
++	while ((c = getopt_long(argc, argv, "bcvthnlM:T:", options, NULL)) != -1) {
+ 		switch (c) {
+ 			case 'b':
+ 				binary = 1;
+@@ -225,6 +241,9 @@ int ip6tables_restore_main(int argc, cha
+ 			case 'n':
+ 				noflush = 1;
+ 				break;
++			case 'l':
++				ip6tables_globals.exit_err = catch_exit_error;
++				break;
+ 			case 'M':
+ 				xtables_modprobe_program = optarg;
+ 				break;
+@@ -437,8 +456,11 @@ int ip6tables_restore_main(int argc, cha
+ 			for (a = 0; a < newargc; a++)
+ 				DEBUGP("argv[%u]: %s\n", a, newargv[a]);
+ 
+-			ret = do_command6(newargc, newargv,
+-					 &newargv[2], &handle, true);
++			if (!setjmp(jmp))
++				ret = do_command6(newargc, newargv,
++						 &newargv[2], &handle, true);
++			else
++				ret = 1;
+ 
+ 			free_argv();
+ 			fflush(stdout);
+--- a/iptables/iptables-restore.c
++++ b/iptables/iptables-restore.c
+@@ -11,6 +11,8 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdarg.h>
++#include <setjmp.h>
+ #include "iptables.h"
+ #include "xtables.h"
+ #include "libiptc/libiptc.h"
+@@ -22,6 +24,7 @@
+ #define DEBUGP(x, args...)
+ #endif
+ 
++static jmp_buf jmp;
+ static int binary = 0, counters = 0, verbose = 0, noflush = 0;
+ 
+ /* Keeping track of external matches and targets.  */
+@@ -32,6 +35,7 @@ static const struct option options[] = {
+ 	{.name = "test",     .has_arg = false, .val = 't'},
+ 	{.name = "help",     .has_arg = false, .val = 'h'},
+ 	{.name = "noflush",  .has_arg = false, .val = 'n'},
++	{.name = "lenient",  .has_arg = false, .val = 'l'},
+ 	{.name = "modprobe", .has_arg = true,  .val = 'M'},
+ 	{.name = "table",    .has_arg = true,  .val = 'T'},
+ 	{NULL},
+@@ -50,6 +54,7 @@ static void print_usage(const char *name
+ 			"	   [ --test ]\n"
+ 			"	   [ --help ]\n"
+ 			"	   [ --noflush ]\n"
++			"	   [ --lenient ]\n"
+ 			"	   [ --table=<TABLE> ]\n"
+ 			"          [ --modprobe=<command>]\n", name);
+ 
+@@ -113,6 +118,17 @@ static void free_argv(void) {
+ 		free(newargv[i]);
+ }
+ 
++static void catch_exit_error(enum xtables_exittype status, const char *msg, ...)
++{
++	va_list args;
++	fprintf(stderr, "line %d: ", line);
++	va_start(args, msg);
++	vfprintf(stderr, msg, args);
++	va_end(args);
++	fprintf(stderr, "\n");
++	longjmp(jmp, status);
++}
++
+ static void add_param_to_argv(char *parsestart)
+ {
+ 	int quote_open = 0, escaped = 0, param_len = 0;
+@@ -204,7 +220,7 @@ iptables_restore_main(int argc, char *ar
+ 	init_extensions4();
+ #endif
+ 
+-	while ((c = getopt_long(argc, argv, "bcvthnM:T:", options, NULL)) != -1) {
++	while ((c = getopt_long(argc, argv, "bcvthnlM:T:", options, NULL)) != -1) {
+ 		switch (c) {
+ 			case 'b':
+ 				binary = 1;
+@@ -225,6 +241,9 @@ iptables_restore_main(int argc, char *ar
+ 			case 'n':
+ 				noflush = 1;
+ 				break;
++			case 'l':
++				iptables_globals.exit_err = catch_exit_error;
++				break;
+ 			case 'M':
+ 				xtables_modprobe_program = optarg;
+ 				break;
+@@ -437,8 +456,11 @@ iptables_restore_main(int argc, char *ar
+ 			for (a = 0; a < newargc; a++)
+ 				DEBUGP("argv[%u]: %s\n", a, newargv[a]);
+ 
+-			ret = do_command4(newargc, newargv,
+-					 &newargv[2], &handle, true);
++			if (!setjmp(jmp))
++				ret = do_command4(newargc, newargv,
++						 &newargv[2], &handle, true);
++			else
++				ret = 1;
+ 
+ 			free_argv();
+ 			fflush(stdout);
diff --git a/trunk/package/network/utils/iptables/patches/500-add-xt_id-match.patch b/trunk/package/network/utils/iptables/patches/500-add-xt_id-match.patch
new file mode 100644
index 00000000..94762f0a
--- /dev/null
+++ b/trunk/package/network/utils/iptables/patches/500-add-xt_id-match.patch
@@ -0,0 +1,59 @@
+--- /dev/null
++++ b/extensions/libxt_id.c
+@@ -0,0 +1,45 @@
++/* Shared library add-on to iptables to add id match support. */
++
++#include <stdio.h>
++#include <xtables.h>
++#include <linux/netfilter/xt_id.h>
++
++enum {
++	O_ID = 0,
++};
++
++static const struct xt_option_entry id_opts[] = {
++	{
++		.name  = "id",
++		.id    = O_ID,
++		.type  = XTTYPE_UINT32,
++		.flags = XTOPT_MAND | XTOPT_PUT,
++		XTOPT_POINTER(struct xt_id_info, id)
++	},
++	XTOPT_TABLEEND,
++};
++
++/* Saves the union ipt_matchinfo in parsable form to stdout. */
++static void
++id_save(const void *ip, const struct xt_entry_match *match)
++{
++	struct xt_id_info *idinfo = (void *)match->data;
++
++	printf(" --id %lu", idinfo->id);
++}
++
++static struct xtables_match id_match = {
++	.family		= NFPROTO_UNSPEC,
++	.name		= "id",
++	.version	= XTABLES_VERSION,
++	.size		= XT_ALIGN(sizeof(struct xt_id_info)),
++	.userspacesize	= XT_ALIGN(sizeof(struct xt_id_info)),
++	.save 		= id_save,
++	.x6_parse	= xtables_option_parse,
++	.x6_options	= id_opts,
++};
++
++void _init(void)
++{
++	xtables_register_match(&id_match);
++}
+--- /dev/null
++++ b/include/linux/netfilter/xt_id.h
+@@ -0,0 +1,8 @@
++#ifndef _XT_ID_H
++#define _XT_ID_H
++
++struct xt_id_info {
++	__u32 id;
++};
++
++#endif /* XT_ID_H */
diff --git a/trunk/package/network/utils/iputils/Makefile b/trunk/package/network/utils/iputils/Makefile
new file mode 100644
index 00000000..1dc993cb
--- /dev/null
+++ b/trunk/package/network/utils/iputils/Makefile
@@ -0,0 +1,181 @@
+# 
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iputils
+PKG_VERSION:=20101006
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-s$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.skbuff.net/iputils
+PKG_MD5SUM:=a36c25e9ec17e48be514dc0485e7376c
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
+
+PKG_BUILD_DEPENDS:=sysfsutils
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-s$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/iputils/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://www.skbuff.net/iputils
+endef
+
+
+define Package/iputils-arping
+$(call Package/iputils/Default)
+  TITLE:=iputils - arping
+  DEPENDS+= +libsysfs
+endef
+
+define Package/iputils-arping/description
+  Program arping from iputils.
+  Sends ARP REQUEST to a neighbour host.
+endef
+
+
+define Package/iputils-clockdiff
+$(call Package/iputils/Default)
+  TITLE:=iputils - clockdiff
+endef
+
+define Package/iputils-clockdiff/description
+  Program clockdiff from iputils.
+  Measures clock difference between hosts.
+endef
+
+
+define Package/iputils-ping
+$(call Package/iputils/Default)
+  TITLE:=iputils - ping
+endef
+
+define Package/iputils-ping/description
+  Program ping from iputils.
+  Sends ICMP ECHO_REQUEST to network hosts (IPv4).
+endef
+
+
+define Package/iputils-ping6
+$(call Package/iputils/Default)
+  TITLE:=iputils - ping6
+  DEPENDS+= @IPV6 +USE_EGLIBC:libopenssl
+endef
+
+define Package/iputils-ping6/description
+  Program ping6 from iputils.
+  Sends ICMP ECHO_REQUEST to network hosts (IPv6).
+endef
+
+
+define Package/iputils-tftpd
+$(call Package/iputils/Default)
+  TITLE:=iputils - tftpd
+endef
+
+define Package/iputils-tftpd/description
+  Program tftpd from iputils
+  Trivial File Transfer Protocol server.
+endef
+
+
+define Package/iputils-tracepath
+$(call Package/iputils/Default)
+  TITLE:=iputils - tracepath
+endef
+
+define Package/iputils-tracepath/description
+  Program tracepath from iputils.
+  Traces path to a network host discovering MTU along this path (IPv4).
+endef
+
+
+define Package/iputils-tracepath6
+$(call Package/iputils/Default)
+  TITLE:=iputils - tracepath6
+  DEPENDS+= @IPV6
+endef
+
+define Package/iputils-tracepath6/description
+  Program tracepath6 from iputils.
+  Traces path to a network host discovering MTU along this path (IPv6).
+endef
+
+
+define Package/iputils-traceroute6
+$(call Package/iputils/Default)
+  TITLE:=iputils - traceroute6
+  DEPENDS+= @IPV6
+endef
+
+define Package/iputils-traceroute6/description
+  Program traceroute6 from iputils.
+  Traces path to a network host (IPv6).
+endef
+
+ifdef CONFIG_USE_MUSL
+  TARGET_CFLAGS += -D__UCLIBC__
+endif
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
+	CONFIG_IPV6="$(CONFIG_IPV6)" \
+	CONFIG_USE_UCLIBC="$(CONFIG_USE_UCLIBC)$(CONFIG_USE_MUSL)" \
+
+define Package/iputils-arping/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/arping $(1)/usr/bin/
+endef
+
+define Package/iputils-clockdiff/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/clockdiff $(1)/usr/bin/
+endef
+
+define Package/iputils-ping/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ping $(1)/usr/bin/
+endef
+
+define Package/iputils-ping6/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ping6 $(1)/usr/bin/
+endef
+
+define Package/iputils-tftpd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tftpd $(1)/usr/sbin/
+endef
+
+define Package/iputils-tracepath/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tracepath $(1)/usr/bin/
+endef
+
+define Package/iputils-tracepath6/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tracepath6 $(1)/usr/bin/
+endef
+
+define Package/iputils-traceroute6/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/traceroute6 $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,iputils-arping))
+$(eval $(call BuildPackage,iputils-clockdiff))
+$(eval $(call BuildPackage,iputils-ping))
+$(eval $(call BuildPackage,iputils-tftpd))
+$(eval $(call BuildPackage,iputils-tracepath))
+$(eval $(call BuildPackage,iputils-ping6))
+$(eval $(call BuildPackage,iputils-tracepath6))
+$(eval $(call BuildPackage,iputils-traceroute6))
diff --git a/trunk/package/network/utils/iputils/patches/001-iputils.patch b/trunk/package/network/utils/iputils/patches/001-iputils.patch
new file mode 100644
index 00000000..e57db137
--- /dev/null
+++ b/trunk/package/network/utils/iputils/patches/001-iputils.patch
@@ -0,0 +1,14 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2002-09-20 18:23:55.000000000 +0000
++++ b/Makefile	2007-05-17 13:59:55.000000000 +0000
+@@ -16,8 +16,8 @@
+ CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
+ CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
+ 
+-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
+-IPV6_TARGETS=tracepath6 traceroute6 ping6
++IPV4_TARGETS=tracepath ping clockdiff arping tftpd
++IPV6_TARGETS=tracepath6 traceroute6 ping6
+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
+ 
+ LASTTAG:=`git describe HEAD | sed -e 's/-.*//'`
diff --git a/trunk/package/network/utils/iputils/patches/002-fix-ipv6.patch b/trunk/package/network/utils/iputils/patches/002-fix-ipv6.patch
new file mode 100644
index 00000000..4411ca7e
--- /dev/null
+++ b/trunk/package/network/utils/iputils/patches/002-fix-ipv6.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,10 @@ CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
+ 
+ IPV4_TARGETS=tracepath ping clockdiff arping tftpd
+ IPV6_TARGETS=tracepath6 traceroute6 ping6
+-TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
++TARGETS=$(IPV4_TARGETS)
++ifeq ($(CONFIG_IPV6),y)
++	TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
++endif
+ 
+ LASTTAG:=`git describe HEAD | sed -e 's/-.*//'`
+ TAG:=`date +s%Y%m%d`
diff --git a/trunk/package/network/utils/iputils/patches/003-fix-makefile.patch b/trunk/package/network/utils/iputils/patches/003-fix-makefile.patch
new file mode 100644
index 00000000..926c6855
--- /dev/null
+++ b/trunk/package/network/utils/iputils/patches/003-fix-makefile.patch
@@ -0,0 +1,18 @@
+--- a/Makefile
++++ b/Makefile
+@@ -30,9 +30,13 @@ all: $(TARGETS)
+ 
+ 
+ tftpd: tftpd.o tftpsubs.o
+-arping: arping.o -lsysfs
++arping: arping.o 
++	$(CC) $(CFLAGS) -o $@ arping.o -lsysfs
+ ping: ping.o ping_common.o
+-ping6: ping6.o ping_common.o -lresolv -lcrypto
++ping6: ping6.o ping_common.o
++ifneq ($(CONFIG_USE_UCLIBC),y)
++	$(CC) $(CFLAGS) -o $@ ping6.o ping_common.o -lresolv -lcrypto
++endif
+ ping.o ping6.o ping_common.o: ping_common.h
+ tftpd.o tftpsubs.o: tftp.h
+ 
diff --git a/trunk/package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch b/trunk/package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch
new file mode 100644
index 00000000..69558034
--- /dev/null
+++ b/trunk/package/network/utils/iputils/patches/010-ping6_uclibc_resolv.patch
@@ -0,0 +1,200 @@
+diff --git a/ping6.c b/ping6.c
+index c5ff881..ef2243f 100644
+--- a/ping6.c
++++ b/ping6.c
+@@ -71,9 +71,11 @@ char copyright[] =
+ #include <linux/filter.h>
+ #include <netinet/ip6.h>
+ #include <netinet/icmp6.h>
++#ifndef __UCLIBC__
+ #include <resolv.h>
+ 
+ #include "ping6_niquery.h"
++#endif /* __UCLIBC__ */
+ 
+ #ifndef SOL_IPV6
+ #define SOL_IPV6 IPPROTO_IPV6
+@@ -154,6 +156,7 @@ int pmtudisc=-1;
+ 
+ static int icmp_sock;
+ 
++#ifndef __UCLIBC__
+ #include <openssl/md5.h>
+ 
+ /* Node Information query */
+@@ -165,6 +168,7 @@ int ni_subject_type = 0;
+ char *ni_group;
+ 
+ __u8 ni_nonce[8];
++#endif /* __UCLIBC__ */
+ 
+ static struct in6_addr in6_anyaddr;
+ static __inline__ int ipv6_addr_any(struct in6_addr *addr)
+@@ -223,6 +227,7 @@ unsigned int if_name2index(const char *ifname)
+ 	return i;
+ }
+ 
++#ifndef __UCLIBC__
+ struct niquery_option {
+ 	char *name;
+ 	int namelen;
+@@ -512,6 +517,7 @@ char *ni_groupaddr(const char *name)
+ 		strcat(nigroup_buf, q);
+ 	return nigroup_buf;
+ }
++#endif /* __UCLIBC__ */
+ 
+ int main(int argc, char *argv[])
+ {
+@@ -595,12 +601,14 @@ int main(int argc, char *argv[])
+ 		case 'V':
+ 			printf("ping6 utility, iputils-ss%s\n", SNAPSHOT);
+ 			exit(0);
++#ifndef __UCLIBC__
+ 		case 'N':
+ 			if (niquery_option_handler(optarg) < 0) {
+ 				usage();
+ 				break;
+ 			}
+ 			break;
++#endif /* __UCLIBC__ */
+ 		COMMON_OPTIONS
+ 			common_options(ch);
+ 			break;
+@@ -663,6 +671,7 @@ int main(int argc, char *argv[])
+ 		argc--;
+ 	}
+ 
++#ifndef __UCLIBC__
+ 	if (ni_query >= 0) {
+ 		int i;
+ 		for (i = 0; i < 8; i++)
+@@ -674,15 +683,20 @@ int main(int argc, char *argv[])
+ 			ni_subject_type = NI_SUBJ_IPV6;
+ 		}
+ 	}
++#endif /* __UCLIBC__ */
+ 
+ 	if (argc > 1)
+ 		usage();
+ 	else if (argc == 1) {
+ 		target = *argv;
+ 	} else {
++#ifndef __UCLIBC__
+ 		if (ni_query < 0 && ni_subject_type != NI_SUBJ_NAME)
++#endif /* __UCLIBC__ */
+ 			usage();
++#ifndef __UCLIBC__
+ 		target = ni_group;
++#endif /* __UCLIBC__ */
+ 	}
+ 
+ 	memset(&hints, 0, sizeof(hints));
+@@ -817,7 +831,11 @@ int main(int argc, char *argv[])
+ 		exit(2);
+ 	}
+ 
++#ifndef __UCLIBC__
+ 	if (datalen >= sizeof(struct timeval) && (ni_query < 0)) {
++#else
++	if (datalen >= sizeof(struct timeval)) {
++#endif /* __UCLIBC__ */
+ 		/* can we time transfer */
+ 		timing = 1;
+ 	}
+@@ -866,9 +884,11 @@ int main(int argc, char *argv[])
+ 		ICMP6_FILTER_SETPASS(ICMP6_PARAM_PROB, &filter);
+ 	}
+ 
++#ifndef __UCLIBC__
+ 	if (ni_query >= 0)
+ 		ICMP6_FILTER_SETPASS(ICMPV6_NI_REPLY, &filter);
+ 	else
++#endif /* __UCLIBC__ */
+ 		ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filter);
+ 
+ 	err = setsockopt(icmp_sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filter,
+@@ -1100,6 +1120,7 @@ int build_echo(__u8 *_icmph)
+ 	return cc;
+ }
+ 
++#ifndef __UCLIBC__
+ int build_niquery(__u8 *_nih)
+ {
+ 	struct ni_hdr *nih;
+@@ -1125,6 +1146,7 @@ int build_niquery(__u8 *_nih)
+ 
+ 	return cc;
+ }
++#endif /* __UCLIBC__ */
+ 
+ int send_probe(void)
+ {
+@@ -1132,9 +1154,11 @@ int send_probe(void)
+ 
+ 	CLR((ntransmitted+1) % mx_dup_ck);
+ 
++#ifndef __UCLIBC__
+ 	if (ni_query >= 0)
+ 		len = build_niquery(outpack);
+ 	else
++#endif /* __UCLIBC__ */
+ 		len = build_echo(outpack);
+ 
+ 	if (cmsglen == 0) {
+@@ -1176,6 +1200,7 @@ static void putchar_safe(char c)
+ 		printf("\\%03o", c);
+ }
+ 
++#ifndef __UCLIBC__
+ void pr_niquery_reply_name(struct ni_hdr *nih, int len)
+ {
+ 	__u8 *h = (__u8 *)(nih + 1);
+@@ -1304,6 +1329,7 @@ void pr_niquery_reply(__u8 *_nih, int len)
+ 	}
+ 	putchar(';');
+ }
++#endif /* __UCLIBC__ */
+ 
+ /*
+  * parse_reply --
+@@ -1353,6 +1379,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv)
+ 				      hops, 0, tv, pr_addr(&from->sin6_addr),
+ 				      pr_echo_reply))
+ 			return 0;
++#ifndef __UCLIBC__
+ 	} else if (icmph->icmp6_type == ICMPV6_NI_REPLY) {
+ 		struct ni_hdr *nih = (struct ni_hdr *)icmph;
+ 		__u16 seq = ntohs(*(__u16 *)nih->ni_nonce);
+@@ -1363,6 +1390,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv)
+ 				      hops, 0, tv, pr_addr(&from->sin6_addr),
+ 				      pr_niquery_reply))
+ 			return 0;
++#endif /* __UCLIBC__ */
+ 	} else {
+ 		int nexthdr;
+ 		struct ip6_hdr *iph1 = (struct ip6_hdr*)(icmph+1);
+@@ -1557,7 +1585,9 @@ void usage(void)
+ "Usage: ping6 [-LUdfnqrvVaAD] [-c count] [-i interval] [-w deadline]\n"
+ "             [-p pattern] [-s packetsize] [-t ttl] [-I interface]\n"
+ "             [-M pmtudisc-hint] [-S sndbuf] [-F flowlabel] [-Q tclass]\n"
++#ifndef __UCLIBC__
+ "             [[-N nodeinfo-option] ...]\n"
++#endif /* __UCLIBC__ */
+ "             [hop1 ...] destination\n");
+ 	exit(2);
+ }
+diff --git a/ping6_niquery.h b/ping6_niquery.h
+index 61a5cfa..34c31f8 100644
+--- a/ping6_niquery.h
++++ b/ping6_niquery.h
+@@ -1,3 +1,4 @@
++#ifndef __UCLIBC__
+ #include <asm/byteorder.h>
+ 
+ /* Node Information Query */
+@@ -45,3 +46,4 @@ struct ni_hdr {
+ #define NI_IPV4ADDR_F_TRUNCATE		NI_IPV6ADDR_F_TRUNCATE
+ #define NI_IPV4ADDR_F_ALL		NI_IPV6ADDR_F_ALL
+ 
++#endif /* __UCLIBC__ */
diff --git a/trunk/package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch b/trunk/package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch
new file mode 100644
index 00000000..dc61b8c2
--- /dev/null
+++ b/trunk/package/network/utils/iputils/patches/011-ping6_use_gnu_source.patch
@@ -0,0 +1,11 @@
+--- a/ping6.c
++++ b/ping6.c
+@@ -66,6 +66,8 @@ char copyright[] =
+  *	More statistics could always be gathered.
+  *	This program has to run SUID to ROOT to access the ICMP socket.
+  */
++
++#define _GNU_SOURCE
+ #include "ping_common.h"
+ 
+ #include <linux/filter.h>
diff --git a/trunk/package/network/utils/iputils/patches/020-include_fixes.patch b/trunk/package/network/utils/iputils/patches/020-include_fixes.patch
new file mode 100644
index 00000000..0c977498
--- /dev/null
+++ b/trunk/package/network/utils/iputils/patches/020-include_fixes.patch
@@ -0,0 +1,32 @@
+--- a/ping_common.h
++++ b/ping_common.h
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <time.h>
++#include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <linux/sockios.h>
+@@ -24,6 +25,10 @@
+ 
+ #include "SNAPSHOT.h"
+ 
++#ifndef HZ
++#define HZ 100
++#endif
++
+ #define	DEFDATALEN	(64 - 8)	/* default data length */
+ 
+ #define	MAXWAIT		10		/* max seconds to wait for response */
+--- a/clockdiff.c
++++ b/clockdiff.c
+@@ -13,8 +13,6 @@
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <netinet/ip_icmp.h>
+-#define TSPTYPES
+-#include <protocols/timed.h>
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
diff --git a/trunk/package/network/utils/irssi/Makefile b/trunk/package/network/utils/irssi/Makefile
new file mode 100644
index 00000000..3fbfef11
--- /dev/null
+++ b/trunk/package/network/utils/irssi/Makefile
@@ -0,0 +1,98 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=irssi
+PKG_VERSION:=0.8.17
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://irssi.org/files/
+PKG_MD5SUM:=ecf64be47978d89a742b435a81cb47db
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/irssi/Default
+  SUBMENU:=Instant Messaging
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+glib2 +libncurses +libpthread
+  TITLE:=Console IRC client
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+  URL:=http://irssi.org/
+endef
+
+define Package/irssi/Default/description
+	Irssi is a terminal based IRC client for UNIX systems.
+endef
+
+define Package/irssi
+$(call Package/irssi/Default)
+  TITLE+= (with OpenSSL support)
+  DEPENDS+= +libopenssl
+  VARIANT:=ssl
+endef
+
+define Package/irssi/description
+$(call Package/irssi/Default/description)
+ This package is built with OpenSSL support.
+endef
+
+define Package/irssi-nossl
+$(call Package/irssi/Default)
+  TITLE+= (without OpenSSL support)
+  VARIANT:=nossl
+endef
+
+define Package/irssi-nossl/description
+$(call Package/irssi/Default/description)
+ This package is built without OpenSSL support.
+endef
+
+CONFIGURE_ARGS += \
+	--with-perl=no \
+	--with-glib-prefix="$(STAGING_DIR)/usr" \
+	--with-textui \
+	--without-terminfo \
+	--without-bot \
+	--disable-proxy
+
+EXTRA_CFLAGS+=$(TARGET_CPPFLAGS)
+EXTRA_LDFLAGS+=-lncurses
+
+ifeq ($(BUILD_VARIANT),ssl)
+	CONFIGURE_ARGS += \
+		--with-ssl="$(STAGING_DIR)/usr"
+endif
+
+ifeq ($(BUILD_VARIANT),nossl)
+	CONFIGURE_ARGS += \
+		--without-ssl \
+		--disable-ssl
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/irssi
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/irssi/* $(1)/usr/include/irssi/
+endef
+
+define Package/irssi/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME)
+endef
+
+Package/irssi-nossl/install = $(Package/irssi/install)
+
+$(eval $(call BuildPackage,irssi))
+$(eval $(call BuildPackage,irssi-nossl))
diff --git a/trunk/package/network/utils/iw/Makefile b/trunk/package/network/utils/iw/Makefile
new file mode 100644
index 00000000..62a88e8e
--- /dev/null
+++ b/trunk/package/network/utils/iw/Makefile
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2007-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iw
+PKG_VERSION:=3.15
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://www.kernel.org/pub/software/network/iw
+PKG_MD5SUM:=3b77ad7ec44a865a3bb2ab6c1c463bba
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/iw
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=cfg80211 interface configuration utility
+  URL:=http://wireless.kernel.org/en/users/Documentation/iw
+  DEPENDS:= +libnl-tiny @(!TARGET_avr32||BROKEN)
+endef
+
+define Build/Configure
+	echo "const char iw_version[] = \"$(PKG_VERSION)\";" > $(PKG_BUILD_DIR)/version.c
+	rm -f $(PKG_BUILD_DIR)/version.sh
+	touch $(PKG_BUILD_DIR)/version.sh
+	chmod +x $(PKG_BUILD_DIR)/version.sh
+endef
+
+TARGET_CPPFLAGS:= \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	$(TARGET_CPPFLAGS) \
+	-DCONFIG_LIBNL20 \
+	-D_GNU_SOURCE
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -ffunction-sections -fdata-sections" \
+	LDFLAGS="$(TARGET_LDFLAGS) -Wl,--gc-sections" \
+	NL1FOUND="" NL2FOUND=Y \
+	NLLIBNAME="libnl-tiny" \
+	LIBS="-lm -lnl-tiny" \
+	V=1
+
+define Package/iw/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iw $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,iw))
diff --git a/trunk/package/network/utils/iw/patches/001-nl80211_h_sync.patch b/trunk/package/network/utils/iw/patches/001-nl80211_h_sync.patch
new file mode 100644
index 00000000..64e33054
--- /dev/null
+++ b/trunk/package/network/utils/iw/patches/001-nl80211_h_sync.patch
@@ -0,0 +1,344 @@
+--- a/nl80211.h
++++ b/nl80211.h
+@@ -503,6 +503,9 @@
+  *	TX status event pertaining to the TX request.
+  *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
+  *	management frames at CCK rate or not in 2GHz band.
++ *	%NL80211_ATTR_CSA_C_OFFSETS_TX is an array of offsets to CSA
++ *	counters which will be updated to the current value. This attribute
++ *	is used during CSA period.
+  * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this
+  *	command may be used with the corresponding cookie to cancel the wait
+  *	time if it is known that it is no longer necessary.
+@@ -719,6 +722,22 @@
+  *	QoS mapping is relevant for IP packets, it is only valid during an
+  *	association. This is cleared on disassociation and AP restart.
+  *
++ * @NL80211_CMD_ADD_TX_TS: Ask the kernel to add a traffic stream for the given
++ *	%NL80211_ATTR_TSID and %NL80211_ATTR_MAC with %NL80211_ATTR_USER_PRIO
++ *	and %NL80211_ATTR_ADMITTED_TIME parameters.
++ *	Note that the action frame handshake with the AP shall be handled by
++ *	userspace via the normal management RX/TX framework, this only sets
++ *	up the TX TS in the driver/device.
++ *	If the admitted time attribute is not added then the request just checks
++ *	if a subsequent setup could be successful, the intent is to use this to
++ *	avoid setting up a session with the AP when local restrictions would
++ *	make that impossible. However, the subsequent "real" setup may still
++ *	fail even if the check was successful.
++ * @NL80211_CMD_DEL_TX_TS: Remove an existing TS with the %NL80211_ATTR_TSID
++ *	and %NL80211_ATTR_MAC parameters. It isn't necessary to call this
++ *	before removing a station entry entirely, or before disassociating
++ *	or similar, cleanup will happen in the driver/device in this case.
++ *
+  * @NL80211_CMD_MAX: highest used command number
+  * @__NL80211_CMD_AFTER_LAST: internal use
+  */
+@@ -890,6 +909,9 @@ enum nl80211_commands {
+ 
+ 	NL80211_CMD_SET_QOS_MAP,
+ 
++	NL80211_CMD_ADD_TX_TS,
++	NL80211_CMD_DEL_TX_TS,
++
+ 	/* add new commands above here */
+ 
+ 	/* used to define NL80211_CMD_MAX below */
+@@ -1525,10 +1547,10 @@ enum nl80211_commands {
+  *	operation).
+  * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information
+  *	for the time while performing a channel switch.
+- * @NL80211_ATTR_CSA_C_OFF_BEACON: Offset of the channel switch counter
+- *	field in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
+- * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
+- *	field in the probe response (%NL80211_ATTR_PROBE_RESP).
++ * @NL80211_ATTR_CSA_C_OFF_BEACON: An array of offsets (u16) to the channel
++ *	switch counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
++ * @NL80211_ATTR_CSA_C_OFF_PRESP: An array of offsets (u16) to the channel
++ *	switch counters in the probe response (%NL80211_ATTR_PROBE_RESP).
+  *
+  * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
+  *	As specified in the &enum nl80211_rxmgmt_flags.
+@@ -1576,9 +1598,49 @@ enum nl80211_commands {
+  *	advertise values that cannot always be met. In such cases, an attempt
+  *	to add a new station entry with @NL80211_CMD_NEW_STATION may fail.
+  *
++ * @NL80211_ATTR_CSA_C_OFFSETS_TX: An array of csa counter offsets (u16) which
++ *	should be updated when the frame is transmitted.
++ * @NL80211_ATTR_MAX_CSA_COUNTERS: U8 attribute used to advertise the maximum
++ *	supported number of csa counters.
++ *
+  * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.
+  *	As specified in the &enum nl80211_tdls_peer_capability.
+  *
++ * @NL80211_ATTR_IFACE_SOCKET_OWNER: flag attribute, if set during interface
++ *	creation then the new interface will be owned by the netlink socket
++ *	that created it and will be destroyed when the socket is closed
++ *
++ * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
++ *	the TDLS link initiator.
++ *
++ * @NL80211_ATTR_USE_RRM: flag for indicating whether the current connection
++ *	shall support Radio Resource Measurements (11k). This attribute can be
++ *	used with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests.
++ *	User space applications are expected to use this flag only if the
++ *	underlying device supports these minimal RRM features:
++ *		%NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
++ *		%NL80211_FEATURE_QUIET,
++ *	If this flag is used, driver must add the Power Capabilities IE to the
++ *	association request. In addition, it must also set the RRM capability
++ *	flag in the association request's Capability Info field.
++ *
++ * @NL80211_ATTR_WIPHY_DYN_ACK: flag attribute used to enable ACK timeout
++ *	estimation algorithm (dynack). In order to activate dynack
++ *	%NL80211_FEATURE_ACKTO_ESTIMATION feature flag must be set by lower
++ *	drivers to indicate dynack capability. Dynack is automatically disabled
++ *	setting valid value for coverage class.
++ *
++ * @NL80211_ATTR_TSID: a TSID value (u8 attribute)
++ * @NL80211_ATTR_USER_PRIO: user priority value (u8 attribute)
++ * @NL80211_ATTR_ADMITTED_TIME: admitted time in units of 32 microseconds
++ *	(per second) (u16 attribute)
++ *
++ * @NL80211_ATTR_SMPS_MODE: SMPS mode to use (ap mode). see
++ *	&enum nl80211_smps_mode.
++ *
++ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
++ *	transmit power to stay within regulatory limits. u32, dBi.
++ *
+  * @NL80211_ATTR_MAX: highest attribute number currently defined
+  * @__NL80211_ATTR_AFTER_LAST: internal use
+  */
+@@ -1914,6 +1976,25 @@ enum nl80211_attrs {
+ 
+ 	NL80211_ATTR_TDLS_PEER_CAPABILITY,
+ 
++	NL80211_ATTR_IFACE_SOCKET_OWNER,
++
++	NL80211_ATTR_CSA_C_OFFSETS_TX,
++	NL80211_ATTR_MAX_CSA_COUNTERS,
++
++	NL80211_ATTR_TDLS_INITIATOR,
++
++	NL80211_ATTR_USE_RRM,
++
++	NL80211_ATTR_WIPHY_DYN_ACK,
++
++	NL80211_ATTR_TSID,
++	NL80211_ATTR_USER_PRIO,
++	NL80211_ATTR_ADMITTED_TIME,
++
++	NL80211_ATTR_SMPS_MODE,
++
++	NL80211_ATTR_WIPHY_ANTENNA_GAIN,
++
+ 	/* add attributes here, update the policy in nl80211.c */
+ 
+ 	__NL80211_ATTR_AFTER_LAST,
+@@ -2182,6 +2263,8 @@ enum nl80211_sta_bss_param {
+  *	Contains a nested array of signal strength attributes (u8, dBm)
+  * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
+  *	Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
++ * @NL80211_STA_EXPECTED_THROUGHPUT: expected throughput considering also the
++ *	802.11 header (u32, kbps)
+  * @__NL80211_STA_INFO_AFTER_LAST: internal
+  * @NL80211_STA_INFO_MAX: highest possible station info attribute
+  */
+@@ -2213,6 +2296,7 @@ enum nl80211_sta_info {
+ 	NL80211_STA_INFO_TX_BYTES64,
+ 	NL80211_STA_INFO_CHAIN_SIGNAL,
+ 	NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
++	NL80211_STA_INFO_EXPECTED_THROUGHPUT,
+ 
+ 	/* keep last */
+ 	__NL80211_STA_INFO_AFTER_LAST,
+@@ -2336,9 +2420,34 @@ enum nl80211_band_attr {
+  *	using this channel as the primary or any of the secondary channels
+  *	isn't possible
+  * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
++ * @NL80211_FREQUENCY_ATTR_INDOOR_ONLY: Only indoor use is permitted on this
++ *	channel. A channel that has the INDOOR_ONLY attribute can only be
++ *	used when there is a clear assessment that the device is operating in
++ *	an indoor surroundings, i.e., it is connected to AC power (and not
++ *	through portable DC inverters) or is under the control of a master
++ *	that is acting as an AP and is connected to AC power.
++ * @NL80211_FREQUENCY_ATTR_GO_CONCURRENT: GO operation is allowed on this
++ *	channel if it's connected concurrently to a BSS on the same channel on
++ *	the 2 GHz band or to a channel in the same UNII band (on the 5 GHz
++ *	band), and IEEE80211_CHAN_RADAR is not set. Instantiating a GO on a
++ *	channel that has the GO_CONCURRENT attribute set can be done when there
++ *	is a clear assessment that the device is operating under the guidance of
++ *	an authorized master, i.e., setting up a GO while the device is also
++ *	connected to an AP with DFS and radar detection on the UNII band (it is
++ *	up to user-space, i.e., wpa_supplicant to perform the required
++ *	verifications)
++ * @NL80211_FREQUENCY_ATTR_NO_20MHZ: 20 MHz operation is not allowed
++ *	on this channel in current regulatory domain.
++ * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed
++ *	on this channel in current regulatory domain.
+  * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
+  *	currently defined
+  * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
++ *
++ * See https://apps.fcc.gov/eas/comments/GetPublishedDocument.html?id=327&tn=528122
++ * for more information on the FCC description of the relaxations allowed
++ * by NL80211_FREQUENCY_ATTR_INDOOR_ONLY and
++ * NL80211_FREQUENCY_ATTR_GO_CONCURRENT.
+  */
+ enum nl80211_frequency_attr {
+ 	__NL80211_FREQUENCY_ATTR_INVALID,
+@@ -2355,6 +2464,10 @@ enum nl80211_frequency_attr {
+ 	NL80211_FREQUENCY_ATTR_NO_80MHZ,
+ 	NL80211_FREQUENCY_ATTR_NO_160MHZ,
+ 	NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
++	NL80211_FREQUENCY_ATTR_INDOOR_ONLY,
++	NL80211_FREQUENCY_ATTR_GO_CONCURRENT,
++	NL80211_FREQUENCY_ATTR_NO_20MHZ,
++	NL80211_FREQUENCY_ATTR_NO_10MHZ,
+ 
+ 	/* keep last */
+ 	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
+@@ -2573,10 +2686,13 @@ enum nl80211_dfs_regions {
+  *	present has been registered with the wireless core that
+  *	has listed NL80211_FEATURE_CELL_BASE_REG_HINTS as a
+  *	supported feature.
++ * @NL80211_USER_REG_HINT_INDOOR: a user sent an hint indicating that the
++ *	platform is operating in an indoor environment.
+  */
+ enum nl80211_user_reg_hint_type {
+ 	NL80211_USER_REG_HINT_USER	= 0,
+ 	NL80211_USER_REG_HINT_CELL_BASE = 1,
++	NL80211_USER_REG_HINT_INDOOR    = 2,
+ };
+ 
+ /**
+@@ -2998,14 +3114,20 @@ enum nl80211_bss_scan_width {
+  * @NL80211_BSS_BSSID: BSSID of the BSS (6 octets)
+  * @NL80211_BSS_FREQUENCY: frequency in MHz (u32)
+  * @NL80211_BSS_TSF: TSF of the received probe response/beacon (u64)
++ *	(if @NL80211_BSS_PRESP_DATA is present then this is known to be
++ *	from a probe response, otherwise it may be from the same beacon
++ *	that the NL80211_BSS_BEACON_TSF will be from)
+  * @NL80211_BSS_BEACON_INTERVAL: beacon interval of the (I)BSS (u16)
+  * @NL80211_BSS_CAPABILITY: capability field (CPU order, u16)
+  * @NL80211_BSS_INFORMATION_ELEMENTS: binary attribute containing the
+  *	raw information elements from the probe response/beacon (bin);
+- *	if the %NL80211_BSS_BEACON_IES attribute is present, the IEs here are
+- *	from a Probe Response frame; otherwise they are from a Beacon frame.
++ *	if the %NL80211_BSS_BEACON_IES attribute is present and the data is
++ *	different then the IEs here are from a Probe Response frame; otherwise
++ *	they are from a Beacon frame.
+  *	However, if the driver does not indicate the source of the IEs, these
+  *	IEs may be from either frame subtype.
++ *	If present, the @NL80211_BSS_PRESP_DATA attribute indicates that the
++ *	data here is known to be from a probe response, without any heuristics.
+  * @NL80211_BSS_SIGNAL_MBM: signal strength of probe response/beacon
+  *	in mBm (100 * dBm) (s32)
+  * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
+@@ -3017,6 +3139,10 @@ enum nl80211_bss_scan_width {
+  *	yet been received
+  * @NL80211_BSS_CHAN_WIDTH: channel width of the control channel
+  *	(u32, enum nl80211_bss_scan_width)
++ * @NL80211_BSS_BEACON_TSF: TSF of the last received beacon (u64)
++ *	(not present if no beacon frame has been received yet)
++ * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and
++ *	@NL80211_BSS_TSF is known to be from a probe response (flag attribute)
+  * @__NL80211_BSS_AFTER_LAST: internal
+  * @NL80211_BSS_MAX: highest BSS attribute
+  */
+@@ -3034,6 +3160,8 @@ enum nl80211_bss {
+ 	NL80211_BSS_SEEN_MS_AGO,
+ 	NL80211_BSS_BEACON_IES,
+ 	NL80211_BSS_CHAN_WIDTH,
++	NL80211_BSS_BEACON_TSF,
++	NL80211_BSS_PRESP_DATA,
+ 
+ 	/* keep last */
+ 	__NL80211_BSS_AFTER_LAST,
+@@ -3650,6 +3778,8 @@ enum nl80211_iface_limit_attrs {
+  *	different channels may be used within this group.
+  * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap
+  *	of supported channel widths for radar detection.
++ * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap
++ *	of supported regulatory regions for radar detection.
+  * @NUM_NL80211_IFACE_COMB: number of attributes
+  * @MAX_NL80211_IFACE_COMB: highest attribute number
+  *
+@@ -3683,6 +3813,7 @@ enum nl80211_if_combination_attrs {
+ 	NL80211_IFACE_COMB_STA_AP_BI_MATCH,
+ 	NL80211_IFACE_COMB_NUM_CHANNELS,
+ 	NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
++	NL80211_IFACE_COMB_RADAR_DETECT_REGIONS,
+ 
+ 	/* keep last */
+ 	NUM_NL80211_IFACE_COMB,
+@@ -3893,6 +4024,29 @@ enum nl80211_ap_sme_features {
+  *	interface. An active monitor interface behaves like a normal monitor
+  *	interface, but gets added to the driver. It ensures that incoming
+  *	unicast packets directed at the configured interface address get ACKed.
++ * @NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE: This driver supports dynamic
++ *	channel bandwidth change (e.g., HT 20 <-> 40 MHz channel) during the
++ *	lifetime of a BSS.
++ * @NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES: This device adds a DS Parameter
++ *	Set IE to probe requests.
++ * @NL80211_FEATURE_WFA_TPC_IE_IN_PROBES: This device adds a WFA TPC Report IE
++ *	to probe requests.
++ * @NL80211_FEATURE_QUIET: This device, in client mode, supports Quiet Period
++ *	requests sent to it by an AP.
++ * @NL80211_FEATURE_TX_POWER_INSERTION: This device is capable of inserting the
++ *	current tx power value into the TPC Report IE in the spectrum
++ *	management TPC Report action frame, and in the Radio Measurement Link
++ *	Measurement Report action frame.
++ * @NL80211_FEATURE_ACKTO_ESTIMATION: This driver supports dynamic ACK timeout
++ *	estimation (dynack). %NL80211_ATTR_WIPHY_DYN_ACK flag attribute is used
++ *	to enable dynack.
++ * @NL80211_FEATURE_STATIC_SMPS: Device supports static spatial
++ *	multiplexing powersave, ie. can turn off all but one chain
++ *	even on HT connections that should be using more chains.
++ * @NL80211_FEATURE_DYNAMIC_SMPS: Device supports dynamic spatial
++ *	multiplexing powersave, ie. can turn off all but one chain
++ *	and then wake the rest up as required after, for example,
++ *	rts/cts handshake.
+  */
+ enum nl80211_feature_flags {
+ 	NL80211_FEATURE_SK_TX_STATUS			= 1 << 0,
+@@ -3913,6 +4067,14 @@ enum nl80211_feature_flags {
+ 	NL80211_FEATURE_FULL_AP_CLIENT_STATE		= 1 << 15,
+ 	NL80211_FEATURE_USERSPACE_MPM			= 1 << 16,
+ 	NL80211_FEATURE_ACTIVE_MONITOR			= 1 << 17,
++	NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE	= 1 << 18,
++	NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES	= 1 << 19,
++	NL80211_FEATURE_WFA_TPC_IE_IN_PROBES		= 1 << 20,
++	NL80211_FEATURE_QUIET				= 1 << 21,
++	NL80211_FEATURE_TX_POWER_INSERTION		= 1 << 22,
++	NL80211_FEATURE_ACKTO_ESTIMATION		= 1 << 23,
++	NL80211_FEATURE_STATIC_SMPS			= 1 << 24,
++	NL80211_FEATURE_DYNAMIC_SMPS			= 1 << 25,
+ };
+ 
+ /**
+@@ -3987,6 +4149,25 @@ enum nl80211_acl_policy {
+ };
+ 
+ /**
++ * enum nl80211_smps_mode - SMPS mode
++ *
++ * Requested SMPS mode (for AP mode)
++ *
++ * @NL80211_SMPS_OFF: SMPS off (use all antennas).
++ * @NL80211_SMPS_STATIC: static SMPS (use a single antenna)
++ * @NL80211_SMPS_DYNAMIC: dynamic smps (start with a single antenna and
++ *	turn on other antennas after CTS/RTS).
++ */
++enum nl80211_smps_mode {
++	NL80211_SMPS_OFF,
++	NL80211_SMPS_STATIC,
++	NL80211_SMPS_DYNAMIC,
++
++	__NL80211_SMPS_AFTER_LAST,
++	NL80211_SMPS_MAX = __NL80211_SMPS_AFTER_LAST - 1
++};
++
++/**
+  * enum nl80211_radar_event - type of radar event for DFS operation
+  *
+  * Type of event to be used with NL80211_ATTR_RADAR_EVENT to inform userspace
diff --git a/trunk/package/network/utils/iw/patches/010-dynack.patch b/trunk/package/network/utils/iw/patches/010-dynack.patch
new file mode 100644
index 00000000..00e4bf24
--- /dev/null
+++ b/trunk/package/network/utils/iw/patches/010-dynack.patch
@@ -0,0 +1,94 @@
+
+
+Add auto parameter to set distance command in order to enable ACK timeout
+estimation algorithm (dynack). Dynack is automatically disabled setting valid
+value for coverage class. Currently dynack is supported just by ath9k
+
+This patch is based on "configure dynack through mac80211/cfg80211 stack"
+patchset sent on linux-wireless
+
+Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+---
+ info.c    |  2 ++
+ nl80211.h | 12 ++++++++++++
+ phy.c     | 43 +++++++++++++++++++++++++------------------
+ 3 files changed, 39 insertions(+), 18 deletions(-)
+
+--- a/info.c
++++ b/info.c
+@@ -551,6 +551,8 @@ broken_combination:
+ 			printf("\tDevice supports scan flush.\n");
+ 		if (features & NL80211_FEATURE_AP_SCAN)
+ 			printf("\tDevice supports AP scan.\n");
++		if (features & NL80211_FEATURE_ACKTO_ESTIMATION)
++			printf("\tDevice supports ACK timeout estimation.\n");
+ 	}
+ 
+ 	if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
+--- a/phy.c
++++ b/phy.c
+@@ -362,39 +362,46 @@ static int handle_distance(struct nl8021
+ 			int argc, char **argv,
+ 			enum id_input id)
+ {
+-	char *end;
+-	unsigned int distance, coverage;
+-
+ 	if (argc != 1)
+ 		return 1;
+ 
+ 	if (!*argv[0])
+ 		return 1;
+ 
+-	distance = strtoul(argv[0], &end, 10);
++	if (strcmp("auto", argv[0]) == 0) {
++		NLA_PUT_FLAG(msg, NL80211_ATTR_WIPHY_DYN_ACK);
++	} else {
++		char *end;
++		unsigned int distance, coverage;
+ 
+-	if (*end)
+-		return 1;
++		distance = strtoul(argv[0], &end, 10);
+ 
+-	/*
+-	 * Divide double the distance by the speed of light in m/usec (300) to
+-	 * get round-trip time in microseconds and then divide the result by
+-	 * three to get coverage class as specified in IEEE 802.11-2007 table
+-	 * 7-27. Values are rounded upwards.
+-	 */
+-	coverage = (distance + 449) / 450;
+-	if (coverage > 255)
+-		return 1;
++		if (*end)
++			return 1;
++
++		/*
++		 * Divide double the distance by the speed of light
++		 * in m/usec (300) to get round-trip time in microseconds
++		 * and then divide the result by three to get coverage class
++		 * as specified in IEEE 802.11-2007 table 7-27.
++		 * Values are rounded upwards.
++		 */
++		coverage = (distance + 449) / 450;
++		if (coverage > 255)
++			return 1;
+ 
+-	NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS, coverage);
++		NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS, coverage);
++	}
+ 
+ 	return 0;
+  nla_put_failure:
+ 	return -ENOBUFS;
+ }
+-COMMAND(set, distance, "<distance>",
++COMMAND(set, distance, "<auto|distance>",
+ 	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_distance,
+-	"Set appropriate coverage class for given link distance in meters.\n"
++	"Enable ACK timeout estimation algorithm (dynack) or set appropriate\n"
++	"coverage class for given link distance in meters.\n"
++	"To disable dynack set valid value for coverage class.\n"
+ 	"Valid values: 0 - 114750");
+ 
+ static int handle_txpower(struct nl80211_state *state,
diff --git a/trunk/package/network/utils/iw/patches/120-antenna_gain.patch b/trunk/package/network/utils/iw/patches/120-antenna_gain.patch
new file mode 100644
index 00000000..cf6a3fa2
--- /dev/null
+++ b/trunk/package/network/utils/iw/patches/120-antenna_gain.patch
@@ -0,0 +1,34 @@
+--- a/phy.c
++++ b/phy.c
+@@ -495,3 +495,31 @@ COMMAND(set, antenna, "<bitmap> | all | 
+ 	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_antenna,
+ 	"Set a bitmap of allowed antennas to use for TX and RX.\n"
+ 	"The driver may reject antenna configurations it cannot support.");
++
++static int handle_antenna_gain(struct nl80211_state *state,
++			       struct nl_cb *cb,
++			       struct nl_msg *msg,
++			       int argc, char **argv,
++			       enum id_input id)
++{
++	char *endptr;
++	int dbm;
++
++	/* get the required args */
++	if (argc != 1)
++		return 1;
++
++	dbm = strtol(argv[0], &endptr, 10);
++	if (*endptr)
++		return 2;
++
++	NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_ANTENNA_GAIN, dbm);
++
++	return 0;
++
++ nla_put_failure:
++	return -ENOBUFS;
++}
++COMMAND(set, antenna_gain, "<antenna gain in dBm>",
++	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_antenna_gain,
++	"Specify antenna gain.");
diff --git a/trunk/package/network/utils/iw/patches/200-reduce_size.patch b/trunk/package/network/utils/iw/patches/200-reduce_size.patch
new file mode 100644
index 00000000..a6499b30
--- /dev/null
+++ b/trunk/package/network/utils/iw/patches/200-reduce_size.patch
@@ -0,0 +1,109 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,8 +15,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
+ OBJS = iw.o genl.o event.o info.o phy.o \
+ 	interface.o ibss.o station.o survey.o util.o \
+ 	mesh.o mpath.o scan.o reg.o version.o \
+-	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
+-	bitrate.o wowlan.o coalesce.o roc.o p2p.o
++	reason.o status.o connect.o link.o ps.o \
++	bitrate.o
+ OBJS += sections.o
+ 
+ OBJS-$(HWSIM) += hwsim.o
+--- a/info.c
++++ b/info.c
+@@ -207,6 +207,7 @@ next:
+ 				}
+ 			}
+ 
++#if 0
+ 			if (tb_band[NL80211_BAND_ATTR_RATES]) {
+ 			printf("\t\tBitrates (non-HT):\n");
+ 			nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) {
+@@ -223,6 +224,7 @@ next:
+ 				printf("\n");
+ 			}
+ 			}
++#endif
+ 		}
+ 	}
+ 
+@@ -273,6 +275,7 @@ next:
+ 		printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
+ 	}
+ 
++#if 0
+ 	if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
+ 		int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
+ 		int i;
+@@ -284,6 +287,7 @@ next:
+ 					cipher_name(ciphers[i]));
+ 		}
+ 	}
++#endif
+ 
+ 	if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
+ 	    tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
+@@ -303,11 +307,13 @@ next:
+ 			printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
+ 	}
+ 
++#if 0
+ 	if (tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES]) {
+ 		printf("\tsoftware interface modes (can always be added):\n");
+ 		nla_for_each_nested(nl_mode, tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES], rem_mode)
+ 			printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
+ 	}
++#endif
+ 
+ 	if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
+ 		struct nlattr *nl_combi;
+@@ -404,6 +410,7 @@ broken_combination:
+ 			printf("\tinterface combinations are not supported\n");
+ 	}
+ 
++#if 0
+ 	if (tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS]) {
+ 		printf("\tSupported commands:\n");
+ 		nla_for_each_nested(nl_cmd, tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS], rem_cmd)
+@@ -496,6 +503,7 @@ broken_combination:
+ 				printf("\t\t * wake up on TCP connection\n");
+ 		}
+ 	}
++#endif
+ 
+ 	if (tb_msg[NL80211_ATTR_ROAM_SUPPORT])
+ 		printf("\tDevice supports roaming.\n");
+@@ -532,6 +540,7 @@ broken_combination:
+ 		}
+ 	}
+ 
++#if 0
+ 	if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) {
+ 		unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]);
+ 
+@@ -554,6 +563,7 @@ broken_combination:
+ 		if (features & NL80211_FEATURE_ACKTO_ESTIMATION)
+ 			printf("\tDevice supports ACK timeout estimation.\n");
+ 	}
++#endif
+ 
+ 	if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
+ 		printf("\tDevice supports T-DLS.\n");
+@@ -603,6 +613,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP
+ 	 "List all wireless devices and their capabilities.");
+ TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL);
+ 
++#if 0
+ static int handle_commands(struct nl80211_state *state,
+ 			   struct nl_cb *cb, struct nl_msg *msg,
+ 			   int argc, char **argv, enum id_input id)
+@@ -615,6 +626,7 @@ static int handle_commands(struct nl8021
+ }
+ TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands,
+ 	 "list all known commands and their decimal & hex value");
++#endif
+ 
+ static int print_feature_handler(struct nl_msg *msg, void *arg)
+ {
diff --git a/trunk/package/network/utils/iwcap/Makefile b/trunk/package/network/utils/iwcap/Makefile
new file mode 100644
index 00000000..d3f88471
--- /dev/null
+++ b/trunk/package/network/utils/iwcap/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2012 Jo-Philipp Wich <jow@openwrt.org>
+#
+# This is free software, licensed under the Apache 2 license.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iwcap
+PKG_RELEASE:=1
+PKG_LICENSE:=Apache-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/iwcap
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Simple radiotap capture utility
+  MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+endef
+
+define Package/iwcap/description
+  The iwcap utility receives radiotap packet data from wifi monitor interfaces
+  and outputs it to pcap format. It gathers recived packets in a fixed ring
+  buffer to dump them on demand which is useful for background monitoring.
+  Alternatively the utility can stream the data to stdout to act as remote
+  capture drone for Wireshark or similar programs.
+endef
+
+
+define Build/Prepare
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) \
+		-o $(PKG_BUILD_DIR)/iwcap $(PKG_BUILD_DIR)/iwcap.c
+endef
+
+
+define Package/iwcap/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwcap $(1)/usr/sbin/iwcap
+endef
+
+$(eval $(call BuildPackage,iwcap))
diff --git a/trunk/package/network/utils/iwcap/src/iwcap.c b/trunk/package/network/utils/iwcap/src/iwcap.c
new file mode 100644
index 00000000..d335e500
--- /dev/null
+++ b/trunk/package/network/utils/iwcap/src/iwcap.c
@@ -0,0 +1,583 @@
+/*
+ * iwcap.c - A simply radiotap capture utility outputting pcap dumps
+ *
+ *    Copyright 2012 Jo-Philipp Wich <jow@openwrt.org>
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <syslog.h>
+#include <errno.h>
+#include <byteswap.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <linux/if_packet.h>
+
+#define ARPHRD_IEEE80211_RADIOTAP	803
+
+#define DLT_IEEE802_11_RADIO		127
+#define LEN_IEEE802_11_HDR			32
+
+#define FRAMETYPE_MASK				0xFC
+#define FRAMETYPE_BEACON			0x80
+#define FRAMETYPE_DATA				0x08
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define le16(x) __bswap_16(x)
+#else
+#define le16(x) (x)
+#endif
+
+uint8_t run_dump   = 0;
+uint8_t run_stop   = 0;
+uint8_t run_daemon = 0;
+
+uint32_t frames_captured = 0;
+uint32_t frames_filtered = 0;
+
+int capture_sock = -1;
+const char *ifname = NULL;
+
+
+struct ringbuf {
+	uint32_t len;            /* number of slots */
+	uint32_t fill;           /* last used slot */
+	uint32_t slen;           /* slot size */
+	void *buf;               /* ring memory */
+};
+
+struct ringbuf_entry {
+	uint32_t len;            /* used slot memory */
+	uint32_t olen;           /* original data size */
+	uint32_t sec;            /* epoch of slot creation */
+	uint32_t usec;			 /* epoch microseconds */
+};
+
+typedef struct pcap_hdr_s {
+	uint32_t magic_number;   /* magic number */
+	uint16_t version_major;  /* major version number */
+	uint16_t version_minor;  /* minor version number */
+	int32_t  thiszone;       /* GMT to local correction */
+	uint32_t sigfigs;        /* accuracy of timestamps */
+	uint32_t snaplen;        /* max length of captured packets, in octets */
+	uint32_t network;        /* data link type */
+} pcap_hdr_t;
+
+typedef struct pcaprec_hdr_s {
+	uint32_t ts_sec;         /* timestamp seconds */
+	uint32_t ts_usec;        /* timestamp microseconds */
+	uint32_t incl_len;       /* number of octets of packet saved in file */
+	uint32_t orig_len;       /* actual length of packet */
+} pcaprec_hdr_t;
+
+typedef struct ieee80211_radiotap_header {
+	u_int8_t  it_version;    /* set to 0 */
+	u_int8_t  it_pad;
+	u_int16_t it_len;        /* entire length */
+	u_int32_t it_present;    /* fields present */
+} __attribute__((__packed__)) radiotap_hdr_t;
+
+
+int check_type(void)
+{
+	struct ifreq ifr;
+
+	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+
+	if (ioctl(capture_sock, SIOCGIFHWADDR, &ifr) < 0)
+		return -1;
+
+	return (ifr.ifr_hwaddr.sa_family == ARPHRD_IEEE80211_RADIOTAP);
+}
+
+int set_promisc(int on)
+{
+	struct ifreq ifr;
+
+	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+
+	if (ioctl(capture_sock, SIOCGIFFLAGS, &ifr) < 0)
+		return -1;
+
+	if (on && !(ifr.ifr_flags & IFF_PROMISC))
+	{
+		ifr.ifr_flags |= IFF_PROMISC;
+
+		if (ioctl(capture_sock, SIOCSIFFLAGS, &ifr))
+			return -1;
+
+		return 1;
+	}
+	else if (!on && (ifr.ifr_flags & IFF_PROMISC))
+	{
+		ifr.ifr_flags &= ~IFF_PROMISC;
+
+		if (ioctl(capture_sock, SIOCSIFFLAGS, &ifr))
+			return -1;
+
+		return 1;
+	}
+
+	return 0;
+}
+
+
+void sig_dump(int sig)
+{
+	run_dump = 1;
+}
+
+void sig_teardown(int sig)
+{
+	run_stop = 1;
+}
+
+
+void write_pcap_header(FILE *o)
+{
+	pcap_hdr_t ghdr = {
+		.magic_number  = 0xa1b2c3d4,
+		.version_major = 2,
+		.version_minor = 4,
+		.thiszone      = 0,
+		.sigfigs       = 0,
+		.snaplen       = 0xFFFF,
+		.network       = DLT_IEEE802_11_RADIO
+	};
+
+	fwrite(&ghdr, 1, sizeof(ghdr), o);
+}
+
+void write_pcap_frame(FILE *o, uint32_t *sec, uint32_t *usec,
+					  uint16_t len, uint16_t olen)
+{
+	struct timeval tv;
+	pcaprec_hdr_t fhdr;
+
+	if (!sec || !usec)
+	{
+		gettimeofday(&tv, NULL);
+	}
+	else
+	{
+		tv.tv_sec  = *sec;
+		tv.tv_usec = *usec;
+	}
+
+	fhdr.ts_sec   = tv.tv_sec;
+	fhdr.ts_usec  = tv.tv_usec;
+	fhdr.incl_len = len;
+	fhdr.orig_len = olen;
+
+	fwrite(&fhdr, 1, sizeof(fhdr), o);
+}
+
+
+struct ringbuf * ringbuf_init(uint32_t num_item, uint16_t len_item)
+{
+	static struct ringbuf r;
+
+	if (len_item <= 0)
+		return NULL;
+
+	r.buf = malloc(num_item * (len_item + sizeof(struct ringbuf_entry)));
+
+	if (r.buf)
+	{
+		r.len = num_item;
+		r.fill = 0;
+		r.slen = (len_item + sizeof(struct ringbuf_entry));
+
+		memset(r.buf, 0, num_item * len_item);
+
+		return &r;
+	}
+
+	return NULL;
+}
+
+struct ringbuf_entry * ringbuf_add(struct ringbuf *r)
+{
+	struct timeval t;
+	struct ringbuf_entry *e;
+
+	gettimeofday(&t, NULL);
+
+	e = r->buf + (r->fill++ * r->slen);
+	r->fill %= r->len;
+
+	memset(e, 0, r->slen);
+
+	e->sec = t.tv_sec;
+	e->usec = t.tv_usec;
+
+	return e;
+}
+
+struct ringbuf_entry * ringbuf_get(struct ringbuf *r, int i)
+{
+	struct ringbuf_entry *e = r->buf + (((r->fill + i) % r->len) * r->slen);
+
+	if (e->len > 0)
+		return e;
+
+	return NULL;
+}
+
+void ringbuf_free(struct ringbuf *r)
+{
+	free(r->buf);
+	memset(r, 0, sizeof(*r));
+}
+
+
+void msg(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+
+	if (run_daemon)
+		vsyslog(LOG_INFO | LOG_USER, fmt, ap);
+	else
+		vfprintf(stderr, fmt, ap);
+
+	va_end(ap);
+}
+
+
+int main(int argc, char **argv)
+{
+	int i, n;
+	struct ringbuf *ring;
+	struct ringbuf_entry *e;
+	struct sockaddr_ll local = {
+		.sll_family   = AF_PACKET,
+		.sll_protocol = htons(ETH_P_ALL)
+	};
+
+	radiotap_hdr_t *rhdr;
+
+	uint8_t frametype;
+	uint8_t pktbuf[0xFFFF];
+	ssize_t pktlen;
+
+	FILE *o;
+
+	int opt;
+
+	uint8_t promisc        = 0;
+	uint8_t streaming      = 0;
+	uint8_t foreground     = 0;
+	uint8_t filter_data    = 0;
+	uint8_t filter_beacon  = 0;
+	uint8_t header_written = 0;
+
+	uint32_t ringsz   = 1024 * 1024; /* 1 Mbyte ring buffer */
+	uint16_t pktcap   = 256;		 /* truncate frames after 265KB */
+
+	const char *output = NULL;
+
+
+	while ((opt = getopt(argc, argv, "i:r:c:o:sfhBD")) != -1)
+	{
+		switch (opt)
+		{
+		case 'i':
+			ifname = optarg;
+			if (!(local.sll_ifindex = if_nametoindex(ifname)))
+			{
+				msg("Unknown interface '%s'\n", ifname);
+				return 2;
+			}
+			break;
+
+		case 'r':
+			ringsz = atoi(optarg);
+			if (ringsz < (3 * pktcap))
+			{
+				msg("Ring size of %d bytes is too short, "
+					"must be at least %d bytes\n", ringsz, 3 * pktcap);
+				return 3;
+			}
+			break;
+
+		case 'c':
+			pktcap = atoi(optarg);
+			if (pktcap <= (sizeof(radiotap_hdr_t) + LEN_IEEE802_11_HDR))
+			{
+				msg("Packet truncate after %d bytes is too short, "
+					"must be at least %d bytes\n",
+					pktcap, sizeof(radiotap_hdr_t) + LEN_IEEE802_11_HDR);
+				return 4;
+			}
+			break;
+
+		case 's':
+			streaming = 1;
+			break;
+
+		case 'o':
+			output = optarg;
+			break;
+
+		case 'B':
+			filter_beacon = 1;
+			break;
+
+		case 'D':
+			filter_data = 1;
+			break;
+
+		case 'f':
+			foreground = 1;
+			break;
+
+		case 'h':
+			msg(
+				"Usage:\n"
+				"  %s -i {iface} -s [-b] [-d]\n"
+				"  %s -i {iface} -o {file} [-r len] [-c len] [-B] [-D] [-f]\n"
+				"\n"
+				"  -i iface\n"
+				"    Specify interface to use, must be in monitor mode and\n"
+				"    produce IEEE 802.11 Radiotap headers.\n\n"
+				"  -s\n"
+				"    Stream to stdout instead of Dumping to file on USR1.\n\n"
+				"  -o file\n"
+				"    Write current ringbuffer contents to given output file\n"
+				"    on receipt of SIGUSR1.\n\n"
+				"  -r len\n"
+				"    Specify the amount of bytes to use for the ringbuffer.\n"
+				"    The default length is %d bytes.\n\n"
+				"  -c len\n"
+				"    Truncate captured packets after given amount of bytes.\n"
+				"    The default size limit is %d bytes.\n\n"
+				"  -B\n"
+				"    Don't store beacon frames in ring, default is keep.\n\n"
+				"  -D\n"
+				"    Don't store data frames in ring, default is keep.\n\n"
+				"  -f\n"
+				"    Do not daemonize but keep running in foreground.\n\n"
+				"  -h\n"
+				"    Display this help.\n\n",
+				argv[0], argv[0], ringsz, pktcap);
+
+			return 1;
+		}
+	}
+
+	if (!streaming && !output)
+	{
+		msg("No output file specified\n");
+		return 1;
+	}
+
+	if (streaming && output)
+	{
+		msg("The -s and -o options are exclusive\n");
+		return 1;
+	}
+
+	if (streaming && isatty(1))
+	{
+		msg("Refusing to stream into a terminal\n");
+		return 1;
+	}
+
+	if (!local.sll_ifindex)
+	{
+		msg("No interface specified\n");
+		return 2;
+	}
+
+	if (!check_type())
+	{
+		msg("Bad interface: not ARPHRD_IEEE80211_RADIOTAP\n");
+		return 2;
+	}
+
+	if ((capture_sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0)
+	{
+		msg("Unable to create raw socket: %s\n",
+				strerror(errno));
+		return 6;
+	}
+
+	if (bind(capture_sock, (struct sockaddr *)&local, sizeof(local)) == -1)
+	{
+		msg("Unable to bind to interface: %s\n",
+			strerror(errno));
+		return 7;
+	}
+
+	if (!streaming)
+	{
+		if (!foreground)
+		{
+			switch (fork())
+			{
+				case -1:
+					msg("Unable to fork: %s\n", strerror(errno));
+					return 8;
+
+				case 0:
+					umask(0077);
+					chdir("/");
+					freopen("/dev/null", "r", stdin);
+					freopen("/dev/null", "w", stdout);
+					freopen("/dev/null", "w", stderr);
+					run_daemon = 1;
+					break;
+
+				default:
+					msg("Daemon launched ...\n");
+					return 0;
+			}
+		}
+
+		msg("Monitoring interface %s ...\n", ifname);
+
+		if (!(ring = ringbuf_init(ringsz / pktcap, pktcap)))
+		{
+			msg("Unable to allocate ring buffer: %s\n",
+				strerror(errno));
+			return 5;
+		}
+
+		msg(" * Using %d bytes ringbuffer with %d slots\n", ringsz, ring->len);
+		msg(" * Truncating frames at %d bytes\n", pktcap);
+		msg(" * Dumping data to file %s\n", output);
+
+		signal(SIGUSR1, sig_dump);
+	}
+	else
+	{
+		msg("Monitoring interface %s ...\n", ifname);
+		msg(" * Streaming data to stdout\n");
+	}
+
+	msg(" * Beacon frames are %sfiltered\n", filter_beacon ? "" : "not ");
+	msg(" * Data frames are %sfiltered\n", filter_data ? "" : "not ");
+
+	signal(SIGINT, sig_teardown);
+	signal(SIGTERM, sig_teardown);
+
+	promisc = set_promisc(1);
+
+	/* capture loop */
+	while (1)
+	{
+		if (run_stop)
+		{
+			msg("Shutting down ...\n");
+
+			if (promisc)
+				set_promisc(0);
+
+			if (ring)
+				ringbuf_free(ring);
+
+			return 0;
+		}
+		else if (run_dump)
+		{
+			msg("Dumping ring to %s ...\n", output);
+
+			if (!(o = fopen(output, "w")))
+			{
+				msg("Unable to open %s: %s\n",
+					output, strerror(errno));
+			}
+			else
+			{
+				write_pcap_header(o);
+
+				/* sig_dump packet buffer */
+				for (i = 0, n = 0; i < ring->len; i++)
+				{
+					if (!(e = ringbuf_get(ring, i)))
+						continue;
+
+					write_pcap_frame(o, &(e->sec), &(e->usec), e->len, e->olen);
+					fwrite((void *)e + sizeof(*e), 1, e->len, o);
+					n++;
+				}
+
+				fclose(o);
+
+				msg(" * %d frames captured\n", frames_captured);
+				msg(" * %d frames filtered\n", frames_filtered);
+				msg(" * %d frames dumped\n", n);
+			}
+
+			run_dump = 0;
+		}
+
+		pktlen = recvfrom(capture_sock, pktbuf, sizeof(pktbuf), 0, NULL, 0);
+		frames_captured++;
+
+		/* check received frametype, if we should filter it, rewind the ring */
+		rhdr = (radiotap_hdr_t *)pktbuf;
+
+		if (pktlen <= sizeof(radiotap_hdr_t) || le16(rhdr->it_len) >= pktlen)
+		{
+			frames_filtered++;
+			continue;
+		}
+
+		frametype = *(uint8_t *)(pktbuf + le16(rhdr->it_len));
+
+		if ((filter_data   && (frametype & FRAMETYPE_MASK) == FRAMETYPE_DATA) ||
+		    (filter_beacon && (frametype & FRAMETYPE_MASK) == FRAMETYPE_BEACON))
+		{
+			frames_filtered++;
+			continue;
+		}
+
+		if (streaming)
+		{
+			if (!header_written)
+			{
+				write_pcap_header(stdout);
+				header_written = 1;
+			}
+
+			write_pcap_frame(stdout, NULL, NULL, pktlen, pktlen);
+			fwrite(pktbuf, 1, pktlen, stdout);
+			fflush(stdout);
+		}
+		else
+		{
+			e = ringbuf_add(ring);
+			e->olen = pktlen;
+			e->len = (pktlen > pktcap) ? pktcap : pktlen;
+
+			memcpy((void *)e + sizeof(*e), pktbuf, e->len);
+		}
+	}
+
+	return 0;
+}
diff --git a/trunk/package/network/utils/iwinfo/Makefile b/trunk/package/network/utils/iwinfo/Makefile
new file mode 100644
index 00000000..6cd8414d
--- /dev/null
+++ b/trunk/package/network/utils/iwinfo/Makefile
@@ -0,0 +1,121 @@
+#
+# Copyright (C) 2010-2014 Jo-Philipp Wich <jow@openwrt.org>
+#
+# This is free software, licensed under the GPL 2 license.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libiwinfo
+PKG_VERSION:=2014-10-27.1
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://git.openwrt.org/project/iwinfo.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=d5dc3d0605f76fbbbad005d998497e53a236aeda
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_CONFIG_DEPENDS := \
+	CONFIG_PACKAGE_kmod-brcm-wl \
+	CONFIG_PACKAGE_kmod-brcm-wl-mini \
+	CONFIG_PACKAGE_kmod-brcm-wl-mimo \
+	CONFIG_PACKAGE_kmod-madwifi \
+	CONFIG_PACKAGE_kmod-cfg80211
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/libiwinfo
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Generalized Wireless Information Library (iwinfo)
+  DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny +libuci
+  ABI_VERSION:=$(PKG_RELEASE)
+endef
+
+define Package/libiwinfo/description
+  Wireless information library with consistent interface for proprietary Broadcom,
+  madwifi, nl80211 and wext driver interfaces.
+endef
+
+
+define Package/libiwinfo-lua
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=libiwinfo Lua binding
+  DEPENDS:=+libiwinfo +liblua
+endef
+
+define Package/libiwinfo-lua/description
+  This is the Lua binding for the iwinfo library. It provides access to all enabled
+  backends.
+endef
+
+
+define Package/iwinfo
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Generalized Wireless Information utility
+  DEPENDS:=+libiwinfo
+endef
+
+define Package/iwinfo/description
+  Command line frontend for the wireless information library.
+endef
+
+
+define Build/Configure
+endef
+
+IWINFO_BACKENDS := \
+	$(if $(CONFIG_PACKAGE_kmod-brcm-wl),wl) \
+	$(if $(CONFIG_PACKAGE_kmod-brcm-wl-mini),wl) \
+	$(if $(CONFIG_PACKAGE_kmod-brcm-wl-mimo),wl) \
+	$(if $(CONFIG_PACKAGE_kmod-madwifi),madwifi) \
+	$(if $(CONFIG_PACKAGE_kmod-cfg80211),nl80211)
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE
+
+MAKE_FLAGS += \
+	FPIC="$(FPIC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	BACKENDS="$(IWINFO_BACKENDS)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/iwinfo
+	$(CP) $(PKG_BUILD_DIR)/include/iwinfo.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/include/iwinfo/* $(1)/usr/include/iwinfo/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so
+endef
+
+define Package/libiwinfo/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so
+	$(INSTALL_DIR) $(1)/usr/share/libiwinfo
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hardware.txt $(1)/usr/share/libiwinfo/hardware.txt
+endef
+
+define Package/libiwinfo-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so
+endef
+
+define Package/iwinfo/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo $(1)/usr/bin/iwinfo
+endef
+
+$(eval $(call BuildPackage,libiwinfo))
+$(eval $(call BuildPackage,libiwinfo-lua))
+$(eval $(call BuildPackage,iwinfo))
diff --git a/trunk/package/network/utils/linux-atm/Makefile b/trunk/package/network/utils/linux-atm/Makefile
new file mode 100644
index 00000000..8e5bf9f4
--- /dev/null
+++ b/trunk/package/network/utils/linux-atm/Makefile
@@ -0,0 +1,192 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=linux-atm
+PKG_VERSION:=2.5.2
+PKG_RELEASE:=5
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=d49499368c3cf15f73a05d9bce8824a8
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
+PKG_LICENSE:=GPL-2.0+
+
+include $(INCLUDE_DIR)/package.mk
+
+ATM_DEBUG_BINS:=aread awrite atmdiag atmdump atmswitch saaldump \
+		sonetdiag svc_recv svc_send ttcp_atm
+ATM_DEBUG_SBINS:=atmaddr atmloop atmtcp esi atmsigd bus \
+		 ilmid ilmidiag lecs les mpcd zeppelin
+ATM_DEBUG_TOOLS:=$(ATM_DEBUG_BINS) $(ATM_DEBUG_SBINS)
+
+define Package/linux-atm
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Linux ATM library
+  URL:=http://linux-atm.sourceforge.net/
+endef
+
+define Package/linux-atm/description
+  This package contains a library for accessing the Linux ATM subsystem.
+endef
+
+define Package/linux-atm/Default
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+linux-atm
+  URL:=http://linux-atm.sourceforge.net/
+  SUBMENU:=Linux ATM tools
+endef
+
+define Package/atm-tools
+  $(call Package/linux-atm/Default)
+  TITLE:=Linux ATM tools
+endef
+
+define Package/atm-tools/description
+  This package contains the Linux ATM tools.
+endef
+
+define Package/atm-diagnostics
+  $(call Package/linux-atm/Default)
+  TITLE:=Linux ATM Diagnostics
+endef
+
+define Package/atm-diagnostics/description
+  This package contains the Linux ATM diagnostics.
+endef
+
+define Package/atm-debug-tools
+  $(call Package/linux-atm/Default)
+  TITLE:=Linux ATM debugging tools
+endef
+
+define Package/atm-debug-tools/description
+  This package contains the Linux ATM debugging tools.
+endef
+
+define Package/br2684ctl
+  $(call Package/linux-atm/Default)
+  TITLE:=ATM Ethernet bridging configuration utility
+endef
+
+define Package/br2684ctl/description
+  Support for AAL5 encapsulation (RFC-1483/RFC-2684) over ATM.
+endef
+
+define GenAtmPlugin
+  define Package/$(1)
+     $(call Package/linux-atm/Default)
+     TITLE:=Linux ATM tool $(2)
+  endef
+
+  define Package/$(1)/description
+     Linux ATM tool $(2).
+  endef
+endef
+
+$(foreach t,$(ATM_DEBUG_TOOLS),$(eval $(call GenAtmPlugin,atm-$(t),$(t))))
+
+define Build/Configure
+	$(call Build/Configure/Default)
+	# prevent autoheader invocation
+	touch $(PKG_BUILD_DIR)/stamp-h.in
+endef
+
+unexport PREFIX
+
+define Build/Compile
+	# src/qgen is built with HOSTCC, which does not really like our LDFLAGS
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src/qgen \
+		LDFLAGS="" \
+		all
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) OBJCOPY=$(TARGET_CROSS)objcopy all
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include \
+		$(PKG_INSTALL_DIR)/usr/lib \
+		$(1)/usr/
+endef
+
+define Package/linux-atm/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so* $(1)/usr/lib/
+endef
+
+define Package/atm-tools/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmarp{,d} $(1)/usr/sbin/
+endef
+
+
+define BuildAtmPlugin
+  define Package/$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/$(3)
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/$(3)/$(2) $$(1)/usr/$(3)
+  endef
+
+  $$(eval $$(call BuildPackage,$(1)))
+endef
+
+define Package/atm-debug-tools/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmaddr $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmloop $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmtcp     $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/esi $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aread $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/awrite $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmdiag $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmdump $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/atmsigd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bus $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ilmid $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ilmidiag $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lecs $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/les $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mpcd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zeppelin $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmswitch $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/saaldump $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sonetdiag $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/svc_recv $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/svc_send $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ttcp_atm $(1)/usr/bin/
+endef
+
+define Package/atm-diagnostics/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aread $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/awrite $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmdiag $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/atmdump $(1)/usr/bin/
+endef
+
+define Package/br2684ctl/install
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_BIN) ./files/br2684ctl $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,linux-atm))
+$(eval $(call BuildPackage,atm-tools))
+$(eval $(call BuildPackage,atm-debug-tools))
+$(eval $(call BuildPackage,atm-diagnostics))
+$(eval $(call BuildPackage,br2684ctl))
+$(foreach t,$(ATM_DEBUG_BINS),$(eval $(call BuildAtmPlugin,atm-$(t),$(t),bin)))
+$(foreach t,$(ATM_DEBUG_SBINS),$(eval $(call BuildAtmPlugin,atm-$(t),$(t),sbin)))
diff --git a/trunk/package/network/utils/linux-atm/files/br2684ctl b/trunk/package/network/utils/linux-atm/files/br2684ctl
new file mode 100755
index 00000000..30b1a44e
--- /dev/null
+++ b/trunk/package/network/utils/linux-atm/files/br2684ctl
@@ -0,0 +1,89 @@
+#!/bin/sh /etc/rc.common
+
+START=50
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+start_daemon() {
+	. /lib/functions/network.sh
+
+	local cfg="$1"
+
+	local atmdev
+	config_get atmdev "$cfg" atmdev 0
+
+	local unit
+	config_get unit "$cfg" unit 0
+
+	local vpi
+	config_get vpi "$cfg" vpi 8
+
+	local vci
+	config_get vci "$cfg" vci 35
+
+	local encaps
+	config_get encaps "$cfg" encaps
+
+	case "$encaps" in
+		1|vc) encaps=1;;
+		*) encaps=0;;
+	esac
+
+	local payload
+	config_get payload "$cfg" payload
+
+	case "$payload" in
+		0|routed) payload=0;;
+		*) payload=1;;
+	esac
+
+	local qos
+	config_get qos "$cfg" qos
+
+	local sendsize
+	config_get sendsize "$cfg" sendsize
+
+	local circuit="$atmdev.$vpi.$vci"
+
+	network_defer_device "nas$unit"
+
+	SERVICE_PID_FILE="/var/run/br2684ctl-$circuit.pid" \
+	service_start /usr/sbin/br2684ctl \
+		-c "$unit" -e "$encaps" -p "$payload" \
+		-a "$circuit" ${qos:+-q "$qos"} ${sendsize:+-s "$sendsize"}
+	sleep 1
+
+	network_ready_device "nas$unit"
+}
+
+stop_daemon() {
+	local cfg="$1"
+
+	local atmdev
+	config_get atmdev "$cfg" atmdev 0
+
+	local unit
+	config_get unit "$cfg" unit 0
+
+	local vpi
+	config_get vpi "$cfg" vpi 8
+
+	local vci
+	config_get vci "$cfg" vci 35
+
+	local circuit="$atmdev.$vpi.$vci"
+	
+	SERVICE_PID_FILE="/var/run/br2684ctl-$circuit.pid" \
+	service_stop /usr/sbin/br2684ctl
+}
+
+start() {
+	config_load network
+	config_foreach start_daemon atm-bridge
+}
+
+stop() {
+	config_load network
+	config_foreach stop_daemon atm-bridge
+}
diff --git a/trunk/package/network/utils/linux-atm/patches/000-debian_16.patch b/trunk/package/network/utils/linux-atm/patches/000-debian_16.patch
new file mode 100644
index 00000000..4abaac07
--- /dev/null
+++ b/trunk/package/network/utils/linux-atm/patches/000-debian_16.patch
@@ -0,0 +1,270 @@
+--- a/src/arpd/io.c
++++ b/src/arpd/io.c
+@@ -277,7 +277,8 @@ static void accept_new(void)
+     struct atm_qos qos;
+     ENTRY *entry;
+     VCC *vcc;
+-    int fd,len,size,error;
++    int fd,error;
++    socklen_t len,size;
+ 
+     len = sizeof(addr);
+     if ((fd = accept(incoming,(struct sockaddr *) &addr,&len)) < 0) {
+@@ -614,7 +615,8 @@ int ip_itf_info(int number,uint32_t *ip,
+ 
+ int get_local(int fd,struct sockaddr_atmsvc *addr)
+ {
+-    int length,result;
++    int result;
++    size_t length;
+ 
+     length = sizeof(struct sockaddr_atmsvc);
+     result = getsockname(fd,(struct sockaddr *) addr,&length);
+--- a/src/arpd/table.c
++++ b/src/arpd/table.c
+@@ -101,7 +101,8 @@ static void dump_vcc(VCC *vcc)
+     char addr_buf[MAX_ATM_ADDR_LEN+1];
+     char qos_buf[MAX_ATM_QOS_LEN+1];
+     struct atm_qos qos;
+-    int size,sndbuf;
++    int sndbuf;
++    socklen_t size;
+ 
+     size = sizeof(addr);
+     if (getpeername(vcc->fd,(struct sockaddr *) &addr,&size) < 0) {
+--- a/src/ilmid/asn1/asn_int.c
++++ b/src/ilmid/asn1/asn_int.c
+@@ -185,7 +185,7 @@ FILE* f _AND_
+ AsnInt* v _AND_
+ unsigned short int indent)
+ {
+-    fprintf(f,"%d", *v);
++    fprintf(f,"%ld", *v);
+ } 
+ 
+ 
+@@ -370,5 +370,5 @@ FILE* f _AND_
+ UAsnInt* v _AND_
+ unsigned short int indent)
+ {
+-    fprintf(f,"%u", *v);
++    fprintf(f,"%lu", *v);
+ } 
+--- a/src/ilmid/asn1/asn_oid.c
++++ b/src/ilmid/asn1/asn_oid.c
+@@ -127,7 +127,7 @@ unsigned short int indent)
+     if (firstArcNum > 2)
+         firstArcNum = 2;
+ 
+-    fprintf(f,"%u %u", firstArcNum, arcNum - (firstArcNum * 40));
++    fprintf(f,"%d %lu", firstArcNum, arcNum - (firstArcNum * 40));
+ 
+     for (; i < v->octetLen ; )
+     {
+@@ -136,7 +136,7 @@ unsigned short int indent)
+ 
+         arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
+         i++;
+-        fprintf(f," %u", arcNum);
++        fprintf(f," %lu", arcNum);
+     }
+     fprintf(f,"}");
+ 
+--- a/src/lane/connect.c
++++ b/src/lane/connect.c
+@@ -258,7 +258,8 @@ static int
+ data_handler(const Event_t *event, void *funcdata)
+ {
+   Conn_t *tmp, *newconn;
+-  int fd, nbytes;
++  int fd;
++  socklen_t nbytes;
+   static char buffer[BUFSIZE];
+   LaneControl_t *ctmp;
+   struct sockaddr_atmsvc addr;
+--- a/src/lane/connect_bus.c
++++ b/src/lane/connect_bus.c
+@@ -170,7 +170,8 @@ static int
+ data_handler(const Event_t *event, void *funcdata)
+ {
+   Conn_t *tmp, *newconn;
+-  int fd, nbytes;
++  int fd;
++  socklen_t nbytes;
+   static char buffer[BUFSIZE];
+   struct sockaddr_atmsvc addr;
+ 
+--- a/src/lane/lane_atm.c
++++ b/src/lane/lane_atm.c
+@@ -138,7 +138,7 @@ atm_connect_back(const AtmAddr_t *our_ad
+   struct atm_blli blli;
+   struct atm_qos qos;
+   int fd, ret;
+-  int len = sizeof(address);
++  socklen_t len = sizeof(address);
+   
+   fd = socket(PF_ATMSVC, SOCK_DGRAM, 0);
+   if (fd <0) {
+--- a/src/lane/lecs.c
++++ b/src/lane/lecs.c
+@@ -119,7 +119,7 @@ int main(int argc, char **argv)
+   int just_dump=0;
+   fd_set fds;
+   struct sockaddr_atmsvc client;
+-  int len;
++  socklen_t len;
+   unsigned char buffer[P_SIZE];
+ 
+   while(i!=-1) {
+--- a/src/lib/ans.c
++++ b/src/lib/ans.c
+@@ -41,7 +41,7 @@
+ static int ans(const char *text,int wanted,void *result,int res_len)
+ {
+     unsigned char answer[MAX_ANSWER];
+-    unsigned char name[MAX_NAME];
++    char name[MAX_NAME];
+     unsigned char *pos,*data,*found;
+     int answer_len,name_len,data_len,found_len;
+     int questions,answers;
+--- a/src/lib/sdu2cell.c
++++ b/src/lib/sdu2cell.c
+@@ -15,7 +15,8 @@ int sdu2cell(int s,int sizes,const int *
+ {
+     struct atm_qos qos;
+     int trailer,total,cells;
+-    int size,i;
++    int i;
++    socklen_t size;
+ 
+     size = sizeof(qos);
+     if (getsockopt(s,SOL_AAL,SO_ATMQOS,&qos,&size) < 0) return -1;
+--- a/src/lib/unix.c
++++ b/src/lib/unix.c
+@@ -63,8 +63,8 @@ int un_attach(const char *path)
+ int un_recv_connect(int s,void *buf,int size)
+ {
+     struct sockaddr_un addr;
+-    int addr_size;
+     int len;
++    socklen_t addr_size;
+ 
+     addr_size = sizeof(addr);
+     len = recvfrom(s,buf,size,0,(struct sockaddr *) &addr,&addr_size);
+--- a/src/maint/atmtcp.c
++++ b/src/maint/atmtcp.c
+@@ -817,7 +817,8 @@ int main(int argc,char **argv)
+ 	}
+ 	else if (!strcmp(ARG,"listen") ||
+ 	  (do_background = !strcmp(ARG,"listen-bg"))) {
+-	    int fd,port,addr_len;
++	    int fd,port;
++	    socklen_t addr_len;
+ 	    int *fd2 = alloc_t(int);
+ 
+ 	    if ((fd = socket(PF_INET,SOCK_STREAM,0)) < 0) {
+--- a/src/maint/hediag.c
++++ b/src/maint/hediag.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+--- a/src/mpoad/io.c
++++ b/src/mpoad/io.c
+@@ -521,7 +521,8 @@ static int msg_from_mps(int slot)
+ static int accept_conn(int slot)
+ {
+         struct sockaddr_atmsvc sa;
+-        int i, new_fd, sa_len;
++        int i, new_fd;
++        socklen_t sa_len;
+ 
+         sa_len = sizeof(sa);
+         new_fd = accept(fds[slot].fd, (struct sockaddr *)&sa, &sa_len);
+--- a/src/sigd/io.c
++++ b/src/sigd/io.c
+@@ -355,7 +355,7 @@ int get_pvc(int itf,int *vci)
+     error = 0;
+     if (bind(s,(struct sockaddr *) &addr,sizeof(addr)) < 0) error = errno;
+     else {
+-	int size;
++	socklen_t size;
+ 
+ 	size = sizeof(addr);
+ 	if (getsockname(s,(struct sockaddr *) &addr,&size) < 0)
+--- a/src/test/ttcp.c
++++ b/src/test/ttcp.c
+@@ -92,7 +92,8 @@ struct sockaddr_in frominet;
+ struct sockaddr_atmsvc satm;
+ struct atm_qos qos;
+ 
+-int domain, fromlen;
++int domain;
++socklen_t fromlen;
+ int fd;				/* fd of network socket */
+ 
+ int buflen = 8 * 1024;		/* length of buffer */
+@@ -466,7 +467,7 @@ int no_check = 0;
+ 	    
+ 	    {
+ 		struct sockaddr_atmsvc peer;
+-		int peerlen = sizeof(peer);
++		socklen_t peerlen = sizeof(peer);
+ 		if (getpeername(fd, (struct sockaddr *) &peer, 
+ 				&peerlen) < 0) {
+ 		    err("getpeername");
+@@ -498,7 +499,7 @@ int no_check = 0;
+     /* set socket buffer size */
+ #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
+     if (sockbufsize) {
+-	int len;
++	socklen_t len;
+ 
+ 	if (trans) {
+ 	    /* set send socket buffer if we are transmitting */    
+--- a/src/mpoad/mpcd.8
++++ b/src/mpoad/mpcd.8
+@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A
+ .B ]]
+ .SH DESCRIPTION
+ MPOA client
+-.SM(MPC) is responsible for creating and receiving
++.SM (MPC) is responsible for creating and receiving
+ internetwork layer shortcuts. Using these shortcuts MPCs forward
+ unicast internetwork layer packets effectively over ATM without need
+ for routing protocols.
+@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o
+ shortcuts is done with the help of
+ .SM MPOA
+ server
+-.SM(MPS).
++.SM (MPS).
+ .PP
+ Just as the Linux
+ .SM LAN
+--- a/src/led/zeppelin.8
++++ b/src/led/zeppelin.8
+@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using
+ recommended. Token Ring support has received less testing than its
+ Ethernet counterpart.
+ .SH FILES
+-.IP \fI/var/run/lec[interface number].pid\fP
++.IP \fI/var/run/lec[interface\ number].pid\fP
+ The file containing the process id of zeppelin.
+ .SH BUGS
+ John Bonham died 1980 and Led Zeppelin broke.
+--- a/src/sigd/atmsigd.conf.4
++++ b/src/sigd/atmsigd.conf.4
+@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e
+ .P
+ If an option is specified in \fBatmsigd.conf\fP and on the command
+ line, the command line has priority.
+-.COMPATIBILITY
++.SH COMPATIBILITY
+ Certain options used by past versions of \fBatmsigd\fP but no longer documented
+ on the man page are still recognized and supported, but they also yield a
+ warning message. Future versions of \fBatmsigd\fP will not recognize those
diff --git a/trunk/package/network/utils/linux-atm/patches/200-no_libfl.patch b/trunk/package/network/utils/linux-atm/patches/200-no_libfl.patch
new file mode 100644
index 00000000..6db87793
--- /dev/null
+++ b/trunk/package/network/utils/linux-atm/patches/200-no_libfl.patch
@@ -0,0 +1,179 @@
+--- a/src/qgen/Makefile.am
++++ b/src/qgen/Makefile.am
+@@ -2,7 +2,7 @@ noinst_PROGRAMS = qgen
+ 
+ qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
+ 		qgen.h second.c third.c
+-qgen_LDADD = -lfl
++qgen_LDADD = 
+ 
+ COMPILE = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@
+ LINK = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ -o $@
+--- a/src/qgen/Makefile.in
++++ b/src/qgen/Makefile.in
+@@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@
+ qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
+ 		qgen.h second.c third.c
+ 
+-qgen_LDADD = -lfl
++qgen_LDADD =
+ COMPILE = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@
+ LINK = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ -o $@
+ 
+--- a/src/sigd/Makefile.am
++++ b/src/sigd/Makefile.am
+@@ -8,7 +8,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
+ 			$(top_builddir)/src/q2931/qd.dump.o \
+ 			$(top_builddir)/src/lib/libatm.la \
+ 			$(top_builddir)/src/saal/libsaal.a
+-atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
++atmsigd_LDADD = $(atmsigd_XTRAS) 
+ atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
+ 
+ CLEANFILES = mess.c
+--- a/src/sigd/Makefile.in
++++ b/src/sigd/Makefile.in
+@@ -245,7 +245,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
+ 			$(top_builddir)/src/lib/libatm.la \
+ 			$(top_builddir)/src/saal/libsaal.a
+ 
+-atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
++atmsigd_LDADD = $(atmsigd_XTRAS) 
+ atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
+ CLEANFILES = mess.c
+ sysconf_DATA = atmsigd.conf
+--- a/src/switch/debug/debug.c
++++ b/src/switch/debug/debug.c
+@@ -20,6 +20,11 @@
+ 
+ #define PRV(call) ((FAB *) (call)->fab)
+ 
++int yywrap(void)
++{
++        return 1;
++}
++
+ 
+ typedef struct _fab {
+     CALL *next; /* relay.c may not keep track of calls, but WE are */
+--- a/src/switch/debug/Makefile.am
++++ b/src/switch/debug/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = -I$(srcdir)/../../q2931
+ sw_debug_SOURCES = debug.c
+ sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
+ 			$(top_builddir)/src/lib/libatm.la
+-sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
++sw_debug_LDADD = $(sw_debug_XTRAS) 
+ 			
+ sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
+ 
+--- a/src/switch/debug/Makefile.in
++++ b/src/switch/debug/Makefile.in
+@@ -200,7 +200,8 @@ sw_debug_SOURCES = debug.c
+ sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
+ 			$(top_builddir)/src/lib/libatm.la
+ 
+-sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
++sw_debug_LDADD = $(sw_debug_XTRAS)
++
+ sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
+ EXTRA_DIST = demo README
+ all: all-am
+--- a/src/switch/tcp/Makefile.am
++++ b/src/switch/tcp/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = -I$(srcdir)/../../q2931
+ sw_tcp_SOURCES = tcpsw.c
+ sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
+ 		$(top_builddir)/src/lib/libatm.la
+-sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
++sw_tcp_LDADD = $(sw_tcp_XTRAS) 
+ sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
+ 
+ EXTRA_DIST = mkfiles README
+--- a/src/switch/tcp/Makefile.in
++++ b/src/switch/tcp/Makefile.in
+@@ -200,7 +200,7 @@ sw_tcp_SOURCES = tcpsw.c
+ sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
+ 		$(top_builddir)/src/lib/libatm.la
+ 
+-sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
++sw_tcp_LDADD = $(sw_tcp_XTRAS) 
+ sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
+ EXTRA_DIST = mkfiles README
+ all: all-am
+--- a/src/switch/tcp/tcpsw.c
++++ b/src/switch/tcp/tcpsw.c
+@@ -35,6 +35,10 @@
+ #define MAX_PACKET (ATM_MAX_AAL5_PDU+sizeof(struct atmtcp_hdr))
+ #define BUFFER_SIZE (MAX_PACKET*2)
+ 
++int yywrap(void)
++{
++        return 1;
++}
+ 
+ typedef struct _table {
+     struct _link *out;	/* output port */
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -20,7 +20,7 @@ br_SOURCES = br.c
+ bw_SOURCES = bw.c
+ isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
+ isp_XTRAS = $(LDADD)
+-isp_LDADD = $(isp_XTRAS) -lfl
++isp_LDADD = $(isp_XTRAS)
+ isp_DEPENDENCIES = $(isp_XTRAS)
+ window_SOURCES = window.c
+ 
+--- a/src/test/Makefile.in
++++ b/src/test/Makefile.in
+@@ -283,7 +283,7 @@ br_SOURCES = br.c
+ bw_SOURCES = bw.c
+ isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
+ isp_XTRAS = $(LDADD)
+-isp_LDADD = $(isp_XTRAS) -lfl
++isp_LDADD = $(isp_XTRAS)
+ isp_DEPENDENCIES = $(isp_XTRAS)
+ window_SOURCES = window.c
+ CLEANFILES = errnos.inc
+--- a/src/test/ispl_l.l
++++ b/src/test/ispl_l.l
+@@ -18,6 +18,11 @@
+ #include "ispl_y.h"
+ 
+ 
++int yywrap(void)
++{
++       return 1;
++}
++
+ static int lineno = 1;
+ 
+ %}
+--- a/src/qgen/ql_l.l
++++ b/src/qgen/ql_l.l
+@@ -11,6 +11,11 @@
+ #include "ql_y.h"
+ 
+ 
++int yywrap(void)
++{
++        return 1;
++}
++
+ typedef struct _tree {
+     struct _tree *left,*right;
+     const char str[0];
+--- a/src/sigd/cfg_l.l
++++ b/src/sigd/cfg_l.l
+@@ -16,6 +16,10 @@
+ 
+ #include "cfg_y.h"
+ 
++int yywrap(void)
++{
++        return 1;
++}
+ 
+ static int lineno = 1;
+ static int token; /* f@#%ing flex doesn't grok return after BEGIN */
diff --git a/trunk/package/network/utils/linux-atm/patches/300-objcopy_path.patch b/trunk/package/network/utils/linux-atm/patches/300-objcopy_path.patch
new file mode 100644
index 00000000..4f11516b
--- /dev/null
+++ b/trunk/package/network/utils/linux-atm/patches/300-objcopy_path.patch
@@ -0,0 +1,40 @@
+--- a/src/extra/Makefile.am
++++ b/src/extra/Makefile.am
+@@ -7,6 +7,8 @@ EXTRA_DIST = linux-atm.spec.in \
+ BUILT_SOURCES = pca200e.bin pca200e_ecd.bin2 sba200e_ecd.bin2
+ CLEANFILES = pca200e.bin pca200e_ecd.bin2 sba200e_ecd.bin2
+ 
++OBJCOPY = objcopy
++
+ install-exec-hook:
+ 	$(MKDIR_P) $(DESTDIR)/lib/firmware
+ 	$(INSTALL_DATA) $(srcdir)/pca200e.bin $(DESTDIR)/lib/firmware
+@@ -14,7 +16,7 @@ install-exec-hook:
+ 	$(INSTALL_DATA) $(srcdir)/sba200e_ecd.bin2 $(DESTDIR)/lib/firmware
+ 
+ %.bin %.bin2: %.data
+-	objcopy -Iihex $< -Obinary $@.gz
++	$(OBJCOPY) -Iihex $< -Obinary $@.gz
+ 	gzip -n -df $@.gz
+ 
+ 
+--- a/src/extra/Makefile.in
++++ b/src/extra/Makefile.in
+@@ -187,6 +187,8 @@ CLEANFILES = pca200e.bin pca200e_ecd.bin
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
++OBJCOPY = objcopy
++
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+@@ -385,7 +387,7 @@ install-exec-hook:
+ 	$(INSTALL_DATA) $(srcdir)/sba200e_ecd.bin2 $(DESTDIR)/lib/firmware
+ 
+ %.bin %.bin2: %.data
+-	objcopy -Iihex $< -Obinary $@.gz
++	$(OBJCOPY) -Iihex $< -Obinary $@.gz
+ 	gzip -n -df $@.gz
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/trunk/package/network/utils/linux-atm/patches/400-portability_fixes.patch b/trunk/package/network/utils/linux-atm/patches/400-portability_fixes.patch
new file mode 100644
index 00000000..462f57c3
--- /dev/null
+++ b/trunk/package/network/utils/linux-atm/patches/400-portability_fixes.patch
@@ -0,0 +1,60 @@
+diff -urN linux-atm-2.5.2/src/ilmid/io.c linux-atm-2.5.2.new/src/ilmid/io.c
+--- linux-atm-2.5.2/src/ilmid/io.c	2008-01-01 01:14:50.000000000 +0100
++++ linux-atm-2.5.2.new/src/ilmid/io.c	2012-11-23 17:32:18.149268039 +0100
+@@ -48,6 +48,14 @@
+ 			     be manually configured (after ilmid has
+ 			     registered the "official" address) - HACK */
+ 
++#ifndef SUN_LEN
++# include <string.h>            /* For prototype of `strlen'.  */
++
++/* Evaluate to actual length of the `sockaddr_un' structure.  */
++# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)        \
++                      + strlen ((ptr)->sun_path))
++#endif
++
+ extern SysGroup *remsys;
+ extern State ilmi_state;
+ static short atm_itf = -1; /* bad value */
+diff -urN linux-atm-2.5.2/src/mpoad/io.c linux-atm-2.5.2.new/src/mpoad/io.c
+--- linux-atm-2.5.2/src/mpoad/io.c	2008-01-01 01:14:51.000000000 +0100
++++ linux-atm-2.5.2.new/src/mpoad/io.c	2012-11-23 17:34:17.745271101 +0100
+@@ -10,14 +10,7 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/param.h> /* for OPEN_MAX   */
+-#if __GLIBC__ >= 2
+ #include <sys/poll.h>
+-#else /* ugly hack to make it compile on RH 4.2 - WA */
+-#include <syscall.h>
+-#include <linux/poll.h>
+-#define SYS_poll 168
+-_syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout);
+-#endif
+ #include <atm.h>
+ #include <linux/types.h>
+ #include <linux/atmioc.h>
+diff -urN linux-atm-2.5.2/src/sigd/atmsigd.c linux-atm-2.5.2.new/src/sigd/atmsigd.c
+--- linux-atm-2.5.2/src/sigd/atmsigd.c	2008-01-01 01:14:52.000000000 +0100
++++ linux-atm-2.5.2.new/src/sigd/atmsigd.c	2012-11-23 17:30:38.689265492 +0100
+@@ -517,7 +517,7 @@
+ 	    exit(0);
+ 	}
+     }
+-    (void) on_exit(trace_on_exit,NULL);
++    (void) atexit(trace_on_exit);
+     poll_loop();
+     close_all();
+     for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal);
+diff -urN linux-atm-2.5.2/src/test/align.c linux-atm-2.5.2.new/src/test/align.c
+--- linux-atm-2.5.2/src/test/align.c	2001-10-10 00:33:08.000000000 +0200
++++ linux-atm-2.5.2.new/src/test/align.c	2012-11-23 17:25:15.077257206 +0100
+@@ -24,7 +24,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <atm.h>
+ 
+ 
diff --git a/trunk/package/network/utils/maccalc/Makefile b/trunk/package/network/utils/maccalc/Makefile
new file mode 100644
index 00000000..b4800d00
--- /dev/null
+++ b/trunk/package/network/utils/maccalc/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=maccalc
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/maccalc
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=MAC address calculation
+endef
+
+define Package/maccalc/description
+ This package contains a MAC address manipulation utility.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+endef
+
+define Package/maccalc/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/maccalc $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,maccalc))
diff --git a/trunk/package/network/utils/maccalc/src/Makefile b/trunk/package/network/utils/maccalc/src/Makefile
new file mode 100644
index 00000000..486badb2
--- /dev/null
+++ b/trunk/package/network/utils/maccalc/src/Makefile
@@ -0,0 +1,14 @@
+CC = gcc
+CFLAGS = -Wall
+OBJS = main.o
+
+all: maccalc
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+maccalc: $(OBJS)
+	$(CC) -o $@ $(OBJS)
+
+clean:
+	rm -f maccalc *.o
diff --git a/trunk/package/network/utils/maccalc/src/main.c b/trunk/package/network/utils/maccalc/src/main.c
new file mode 100644
index 00000000..dcb5f55c
--- /dev/null
+++ b/trunk/package/network/utils/maccalc/src/main.c
@@ -0,0 +1,256 @@
+/*
+ * MAC address manupulation utility
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+
+#define MAC_ADDRESS_LEN		6
+
+#define ERR_INVALID		1
+#define ERR_IO			2
+
+static void usage(void);
+
+char *maccalc_name;
+
+static int parse_mac(const char *mac_str, unsigned char *buf)
+{
+	int t;
+
+	t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+		   &buf[0], &buf[1], &buf[2], &buf[3], &buf[4], &buf[5]);
+
+	if (t != MAC_ADDRESS_LEN)
+		return ERR_INVALID;
+
+	return 0;
+}
+
+static void print_mac(unsigned char *buf)
+{
+	printf("%02x:%02x:%02x:%02x:%02x:%02x\n",
+	       buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
+}
+
+static int maccalc_do_add(int argc, const char *argv[])
+{
+	unsigned char mac[MAC_ADDRESS_LEN];
+	uint32_t t;
+	int err;
+	int i;
+
+	if (argc != 2) {
+		usage();
+		return ERR_INVALID;
+	}
+
+	err = parse_mac(argv[0], mac);
+	if (err)
+		return err;
+
+	i = atoi(argv[1]);
+
+	t = (mac[3] << 16) | (mac[4] << 8) | mac[5];
+	t += i;
+	mac[3] = (t >> 16) & 0xff;
+	mac[4] = (t >> 8) & 0xff;
+	mac[5] = t & 0xff;
+
+	print_mac(mac);
+	return 0;
+}
+
+static int maccalc_do_logical(int argc, const char *argv[],
+			      unsigned char (*op)(unsigned char n1,
+						  unsigned char n2))
+{
+	unsigned char mac1[MAC_ADDRESS_LEN];
+	unsigned char mac2[MAC_ADDRESS_LEN];
+	int err;
+	int i;
+
+	if (argc != 2) {
+		usage();
+		return ERR_INVALID;
+	}
+
+	err = parse_mac(argv[0], mac1);
+	if (err)
+		return err;
+
+	err = parse_mac(argv[1], mac2);
+	if (err)
+		return err;
+
+	for (i = 0; i < MAC_ADDRESS_LEN; i++)
+		mac1[i] = op(mac1[i],mac2[i]);
+
+	print_mac(mac1);
+	return 0;
+}
+
+static int maccalc_do_mac2bin(int argc, const char *argv[])
+{
+	unsigned char mac[MAC_ADDRESS_LEN];
+	ssize_t c;
+	int err;
+
+	if (argc != 1) {
+		usage();
+		return ERR_INVALID;
+	}
+
+	err = parse_mac(argv[0], mac);
+	if (err)
+		return err;
+
+	c = write(STDOUT_FILENO, mac, sizeof(mac));
+	if (c != sizeof(mac)) {
+		fprintf(stderr, "failed to write to stdout\n");
+		return ERR_IO;
+	}
+
+	return 0;
+}
+
+static ssize_t read_safe(int fd, void *buf, size_t count)
+{
+	ssize_t total = 0;
+	ssize_t r;
+
+	while(count > 0) {
+		r = read(fd, buf, count);
+		if (r == 0)
+			/* EOF */
+			break;
+		if (r < 0) {
+			if (errno == EINTR)
+				/* interrupted by a signal, restart */
+				continue;
+			/* error */
+			total = -1;
+			break;
+		}
+
+		/* ok */
+		total += r;
+		count -= r;
+		buf += r;
+	}
+
+	return total;
+}
+
+static int maccalc_do_bin2mac(int argc, const char *argv[])
+{
+	unsigned char mac[MAC_ADDRESS_LEN];
+	ssize_t c;
+
+	if (argc != 0) {
+		usage();
+		return ERR_INVALID;
+	}
+
+	c = read_safe(STDIN_FILENO, mac, sizeof(mac));
+	if (c != sizeof(mac)) {
+		fprintf(stderr, "failed to read from stdin\n");
+		return ERR_IO;
+	}
+
+	print_mac(mac);
+	return 0;
+}
+
+static unsigned char op_or(unsigned char n1, unsigned char n2)
+{
+	return n1 | n2;
+}
+
+static int maccalc_do_or(int argc, const char *argv[])
+{
+	return maccalc_do_logical(argc, argv, op_or);
+}
+
+static unsigned char op_and(unsigned char n1, unsigned char n2)
+{
+	return n1 & n2;
+}
+
+static int maccalc_do_and(int argc, const char *argv[])
+{
+	return maccalc_do_logical(argc, argv, op_and);
+}
+
+static unsigned char op_xor(unsigned char n1, unsigned char n2)
+{
+	return n1 ^ n2;
+}
+
+static int maccalc_do_xor(int argc, const char *argv[])
+{
+	return maccalc_do_logical(argc, argv, op_xor);
+}
+
+static void usage(void)
+{
+	fprintf(stderr,
+		"Usage: %s <command>\n"
+		"valid commands:\n"
+		"  add <mac> <number>\n"
+		"  and|or|xor <mac1> <mac2>\n"
+		"  mac2bin <mac>\n"
+		"  bin2mac\n",
+		maccalc_name);
+}
+
+int main(int argc, const char *argv[])
+{
+	int (*op)(int argc, const char *argv[]);
+	int ret;
+
+	maccalc_name = (char *) argv[0];
+
+	if (argc < 2) {
+		usage();
+		return EXIT_FAILURE;
+	}
+
+	if (strcmp(argv[1], "add") == 0) {
+		op = maccalc_do_add;
+	} else if (strcmp(argv[1], "and") == 0) {
+		op = maccalc_do_and;
+	} else if (strcmp(argv[1], "or") == 0) {
+		op = maccalc_do_or;
+	} else if (strcmp(argv[1], "xor") == 0) {
+		op = maccalc_do_xor;
+	} else if (strcmp(argv[1], "mac2bin") == 0) {
+		op = maccalc_do_mac2bin;
+	} else if (strcmp(argv[1], "bin2mac") == 0) {
+		op = maccalc_do_bin2mac;
+	} else {
+		fprintf(stderr, "unknown command '%s'\n", argv[1]);
+		usage();
+		return EXIT_FAILURE;
+	}
+
+	argc -= 2;
+	argv += 2;
+
+	ret = op(argc, argv);
+	if (ret)
+		return EXIT_FAILURE;
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/package/network/utils/nftables/Makefile b/trunk/package/network/utils/nftables/Makefile
new file mode 100644
index 00000000..4f25ee91
--- /dev/null
+++ b/trunk/package/network/utils/nftables/Makefile
@@ -0,0 +1,44 @@
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nftables
+PKG_VERSION:=0.3+2014-10-21
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=git://git.netfilter.org/nftables
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=17b495957b29e699f59874d1ceca9535921b1a79
+PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+CONFIGURE_ARGS += \
+        --disable-debug \
+        --without-libgmp \
+        --without-cli \
+
+define Package/nftables
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  TITLE:=nftables packet filtering userspace utility
+  DEPENDS:=+kmod-nft-core +kmod-nft-nat +libnftnl
+  URL:=http://netfilter.org/projects/nftables/
+endef
+
+define Package/nftables/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/src/nft $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,nftables))
diff --git a/trunk/package/network/utils/nftables/patches/102-build-allow-building-with-mini-gmp-instead-of-gmp.patch b/trunk/package/network/utils/nftables/patches/102-build-allow-building-with-mini-gmp-instead-of-gmp.patch
new file mode 100644
index 00000000..211d32d4
--- /dev/null
+++ b/trunk/package/network/utils/nftables/patches/102-build-allow-building-with-mini-gmp-instead-of-gmp.patch
@@ -0,0 +1,4946 @@
+From da4e4f5db6561923ad239aa653660250aaeb5873 Mon Sep 17 00:00:00 2001
+From: Steven Barth <cyrus@openwrt.org>
+Date: Mon, 6 Oct 2014 07:26:13 +0200
+Subject: [PATCH 2/2] build: allow building with mini-gmp instead of gmp
+
+This introduces --without-libgmp which includes mini-gmp into nft
+(adding ~30k) but avoids linking libgmp which is >400k.
+
+This is useful for embedded distributions not using gmp otherwise.
+
+Note: currently --without-libgmp must be used with --disable-debug.
+
+Signed-off-by: Steven Barth <cyrus@openwrt.org>
+---
+ configure.ac          |   14 +-
+ include/bignum.h      |   17 +
+ include/expression.h  |    2 +-
+ include/gmputil.h     |    2 +-
+ include/mini-gmp.h    |  294 ++++
+ include/utils.h       |    4 +-
+ src/Makefile.in       |    5 +
+ src/datatype.c        |    4 +-
+ src/erec.c            |    4 +-
+ src/evaluate.c        |    8 +-
+ src/gmputil.c         |    1 -
+ src/mini-gmp-printf.c |   62 +
+ src/mini-gmp.c        | 4386 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 13 files changed, 4790 insertions(+), 13 deletions(-)
+ create mode 100644 include/bignum.h
+ create mode 100644 include/mini-gmp.h
+ create mode 100644 src/mini-gmp-printf.c
+ create mode 100644 src/mini-gmp.c
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,8 +68,18 @@ AC_CHECK_LIB([mnl], [mnl_socket_open], ,
+ AC_CHECK_LIB([nftnl], [nft_rule_alloc], ,
+ 	     AC_MSG_ERROR([No suitable version of libnftnl found]))
+ 
+-AC_CHECK_LIB([gmp], [__gmpz_init], ,
+-	     AC_MSG_ERROR([No suitable version of libgmp found]))
++AC_ARG_WITH([libgmp], [AS_HELP_STRING([--without-libgmp],
++            [Disable libgmp support (use builtin mini-gmp)])], [],
++            [with_libgmp=yes])
++AS_IF([test "x$with_libgmp" != xno], [
++AC_CHECK_LIB([gmp],[__gmpz_init], , AC_MSG_ERROR([No suitable version of libgmp found]))
++])
++AC_SUBST(with_libgmp)
++
++
++AS_IF([test "x$with_libgmp" != xyes -a "x$CONFIG_DEBUG" = xy], [
++AC_MSG_ERROR([--without-libgmp MUST be used with --disable-debug])
++])
+ 
+ AC_ARG_WITH([cli], [AS_HELP_STRING([--without-cli],
+             [disable interactive CLI (libreadline support)])],
+--- /dev/null
++++ b/include/bignum.h
+@@ -0,0 +1,17 @@
++#ifndef NFTABLES_BIGNUM_H
++#define NFTABLES_BIGNUM_H
++
++#ifdef HAVE_LIBGMP
++#include <gmp.h>
++
++#else
++
++#include <mini-gmp.h>
++#include <stdio.h>
++#include <stdarg.h>
++
++int gmp_printf(const char *format, const mpz_t value);
++
++#endif
++
++#endif /* NFTABLES_BIGNUM_H */
+--- a/include/expression.h
++++ b/include/expression.h
+@@ -2,7 +2,7 @@
+ #define NFTABLES_EXPRESSION_H
+ 
+ #include <stdbool.h>
+-#include <gmp.h>
++#include <bignum.h>
+ #include <linux/netfilter/nf_tables.h>
+ 
+ #include <nftables.h>
+--- a/include/gmputil.h
++++ b/include/gmputil.h
+@@ -1,7 +1,7 @@
+ #ifndef NFTABLES_GMPUTIL_H
+ #define NFTABLES_GMPUTIL_H
+ 
+-#include <gmp.h>
++#include <bignum.h>
+ #include <asm/byteorder.h>
+ 
+ enum mpz_word_order {
+--- /dev/null
++++ b/include/mini-gmp.h
+@@ -0,0 +1,294 @@
++/* mini-gmp, a minimalistic implementation of a GNU GMP subset.
++
++Copyright 2011-2014 Free Software Foundation, Inc.
++
++This file is part of the GNU MP Library.
++
++The GNU MP Library is free software; you can redistribute it and/or modify
++it under the terms of either:
++
++  * the GNU Lesser General Public License as published by the Free
++    Software Foundation; either version 3 of the License, or (at your
++    option) any later version.
++
++or
++
++  * the GNU General Public License as published by the Free Software
++    Foundation; either version 2 of the License, or (at your option) any
++    later version.
++
++or both in parallel, as here.
++
++The GNU MP Library is distributed in the hope that 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 copies of the GNU General Public License and the
++GNU Lesser General Public License along with the GNU MP Library.  If not,
++see https://www.gnu.org/licenses/.  */
++
++/* About mini-gmp: This is a minimal implementation of a subset of the
++   GMP interface. It is intended for inclusion into applications which
++   have modest bignums needs, as a fallback when the real GMP library
++   is not installed.
++
++   This file defines the public interface. */
++
++#ifndef __MINI_GMP_H__
++#define __MINI_GMP_H__
++
++/* For size_t */
++#include <stddef.h>
++
++#if defined (__cplusplus)
++extern "C" {
++#endif
++
++void mp_set_memory_functions (void *(*) (size_t),
++			      void *(*) (void *, size_t, size_t),
++			      void (*) (void *, size_t));
++
++void mp_get_memory_functions (void *(**) (size_t),
++			      void *(**) (void *, size_t, size_t),
++			      void (**) (void *, size_t));
++
++typedef unsigned long mp_limb_t;
++typedef long mp_size_t;
++typedef unsigned long mp_bitcnt_t;
++
++typedef mp_limb_t *mp_ptr;
++typedef const mp_limb_t *mp_srcptr;
++
++typedef struct
++{
++  int _mp_alloc;		/* Number of *limbs* allocated and pointed
++				   to by the _mp_d field.  */
++  int _mp_size;			/* abs(_mp_size) is the number of limbs the
++				   last field points to.  If _mp_size is
++				   negative this is a negative number.  */
++  mp_limb_t *_mp_d;		/* Pointer to the limbs.  */
++} __mpz_struct;
++
++typedef __mpz_struct mpz_t[1];
++
++typedef __mpz_struct *mpz_ptr;
++typedef const __mpz_struct *mpz_srcptr;
++
++extern const int mp_bits_per_limb;
++
++void mpn_copyi (mp_ptr, mp_srcptr, mp_size_t);
++void mpn_copyd (mp_ptr, mp_srcptr, mp_size_t);
++void mpn_zero (mp_ptr, mp_size_t);
++
++int mpn_cmp (mp_srcptr, mp_srcptr, mp_size_t);
++
++mp_limb_t mpn_add_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
++mp_limb_t mpn_add_n (mp_ptr, mp_srcptr, mp_srcptr, mp_size_t);
++mp_limb_t mpn_add (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
++
++mp_limb_t mpn_sub_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
++mp_limb_t mpn_sub_n (mp_ptr, mp_srcptr, mp_srcptr, mp_size_t);
++mp_limb_t mpn_sub (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
++
++mp_limb_t mpn_mul_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
++mp_limb_t mpn_addmul_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
++mp_limb_t mpn_submul_1 (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);
++
++mp_limb_t mpn_mul (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
++void mpn_mul_n (mp_ptr, mp_srcptr, mp_srcptr, mp_size_t);
++void mpn_sqr (mp_ptr, mp_srcptr, mp_size_t);
++int mpn_perfect_square_p (mp_srcptr, mp_size_t);
++mp_size_t mpn_sqrtrem (mp_ptr, mp_ptr, mp_srcptr, mp_size_t);
++
++mp_limb_t mpn_lshift (mp_ptr, mp_srcptr, mp_size_t, unsigned int);
++mp_limb_t mpn_rshift (mp_ptr, mp_srcptr, mp_size_t, unsigned int);
++
++mp_bitcnt_t mpn_scan0 (mp_srcptr, mp_bitcnt_t);
++mp_bitcnt_t mpn_scan1 (mp_srcptr, mp_bitcnt_t);
++
++mp_bitcnt_t mpn_popcount (mp_srcptr, mp_size_t);
++
++mp_limb_t mpn_invert_3by2 (mp_limb_t, mp_limb_t);
++#define mpn_invert_limb(x) mpn_invert_3by2 ((x), 0)
++
++size_t mpn_get_str (unsigned char *, int, mp_ptr, mp_size_t);
++mp_size_t mpn_set_str (mp_ptr, const unsigned char *, size_t, int);
++
++void mpz_init (mpz_t);
++void mpz_init2 (mpz_t, mp_bitcnt_t);
++void mpz_clear (mpz_t);
++
++#define mpz_odd_p(z)   (((z)->_mp_size != 0) & (int) (z)->_mp_d[0])
++#define mpz_even_p(z)  (! mpz_odd_p (z))
++
++int mpz_sgn (const mpz_t);
++int mpz_cmp_si (const mpz_t, long);
++int mpz_cmp_ui (const mpz_t, unsigned long);
++int mpz_cmp (const mpz_t, const mpz_t);
++int mpz_cmpabs_ui (const mpz_t, unsigned long);
++int mpz_cmpabs (const mpz_t, const mpz_t);
++int mpz_cmp_d (const mpz_t, double);
++int mpz_cmpabs_d (const mpz_t, double);
++
++void mpz_abs (mpz_t, const mpz_t);
++void mpz_neg (mpz_t, const mpz_t);
++void mpz_swap (mpz_t, mpz_t);
++
++void mpz_add_ui (mpz_t, const mpz_t, unsigned long);
++void mpz_add (mpz_t, const mpz_t, const mpz_t);
++void mpz_sub_ui (mpz_t, const mpz_t, unsigned long);
++void mpz_ui_sub (mpz_t, unsigned long, const mpz_t);
++void mpz_sub (mpz_t, const mpz_t, const mpz_t);
++
++void mpz_mul_si (mpz_t, const mpz_t, long int);
++void mpz_mul_ui (mpz_t, const mpz_t, unsigned long int);
++void mpz_mul (mpz_t, const mpz_t, const mpz_t);
++void mpz_mul_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++void mpz_addmul_ui (mpz_t, const mpz_t, unsigned long int);
++void mpz_addmul (mpz_t, const mpz_t, const mpz_t);
++void mpz_submul_ui (mpz_t, const mpz_t, unsigned long int);
++void mpz_submul (mpz_t, const mpz_t, const mpz_t);
++
++void mpz_cdiv_qr (mpz_t, mpz_t, const mpz_t, const mpz_t);
++void mpz_fdiv_qr (mpz_t, mpz_t, const mpz_t, const mpz_t);
++void mpz_tdiv_qr (mpz_t, mpz_t, const mpz_t, const mpz_t);
++void mpz_cdiv_q (mpz_t, const mpz_t, const mpz_t);
++void mpz_fdiv_q (mpz_t, const mpz_t, const mpz_t);
++void mpz_tdiv_q (mpz_t, const mpz_t, const mpz_t);
++void mpz_cdiv_r (mpz_t, const mpz_t, const mpz_t);
++void mpz_fdiv_r (mpz_t, const mpz_t, const mpz_t);
++void mpz_tdiv_r (mpz_t, const mpz_t, const mpz_t);
++
++void mpz_cdiv_q_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++void mpz_fdiv_q_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++void mpz_tdiv_q_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++void mpz_cdiv_r_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++void mpz_fdiv_r_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++void mpz_tdiv_r_2exp (mpz_t, const mpz_t, mp_bitcnt_t);
++
++void mpz_mod (mpz_t, const mpz_t, const mpz_t);
++
++void mpz_divexact (mpz_t, const mpz_t, const mpz_t);
++
++int mpz_divisible_p (const mpz_t, const mpz_t);
++int mpz_congruent_p (const mpz_t, const mpz_t, const mpz_t);
++
++unsigned long mpz_cdiv_qr_ui (mpz_t, mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_fdiv_qr_ui (mpz_t, mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_tdiv_qr_ui (mpz_t, mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_cdiv_q_ui (mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_fdiv_q_ui (mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_tdiv_q_ui (mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_cdiv_r_ui (mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_fdiv_r_ui (mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_tdiv_r_ui (mpz_t, const mpz_t, unsigned long);
++unsigned long mpz_cdiv_ui (const mpz_t, unsigned long);
++unsigned long mpz_fdiv_ui (const mpz_t, unsigned long);
++unsigned long mpz_tdiv_ui (const mpz_t, unsigned long);
++
++unsigned long mpz_mod_ui (mpz_t, const mpz_t, unsigned long);
++
++void mpz_divexact_ui (mpz_t, const mpz_t, unsigned long);
++
++int mpz_divisible_ui_p (const mpz_t, unsigned long);
++
++unsigned long mpz_gcd_ui (mpz_t, const mpz_t, unsigned long);
++void mpz_gcd (mpz_t, const mpz_t, const mpz_t);
++void mpz_gcdext (mpz_t, mpz_t, mpz_t, const mpz_t, const mpz_t);
++void mpz_lcm_ui (mpz_t, const mpz_t, unsigned long);
++void mpz_lcm (mpz_t, const mpz_t, const mpz_t);
++int mpz_invert (mpz_t, const mpz_t, const mpz_t);
++
++void mpz_sqrtrem (mpz_t, mpz_t, const mpz_t);
++void mpz_sqrt (mpz_t, const mpz_t);
++int mpz_perfect_square_p (const mpz_t);
++
++void mpz_pow_ui (mpz_t, const mpz_t, unsigned long);
++void mpz_ui_pow_ui (mpz_t, unsigned long, unsigned long);
++void mpz_powm (mpz_t, const mpz_t, const mpz_t, const mpz_t);
++void mpz_powm_ui (mpz_t, const mpz_t, unsigned long, const mpz_t);
++
++void mpz_rootrem (mpz_t, mpz_t, const mpz_t, unsigned long);
++int mpz_root (mpz_t, const mpz_t, unsigned long);
++
++void mpz_fac_ui (mpz_t, unsigned long);
++void mpz_bin_uiui (mpz_t, unsigned long, unsigned long);
++
++int mpz_probab_prime_p (const mpz_t, int);
++
++int mpz_tstbit (const mpz_t, mp_bitcnt_t);
++void mpz_setbit (mpz_t, mp_bitcnt_t);
++void mpz_clrbit (mpz_t, mp_bitcnt_t);
++void mpz_combit (mpz_t, mp_bitcnt_t);
++
++void mpz_com (mpz_t, const mpz_t);
++void mpz_and (mpz_t, const mpz_t, const mpz_t);
++void mpz_ior (mpz_t, const mpz_t, const mpz_t);
++void mpz_xor (mpz_t, const mpz_t, const mpz_t);
++
++mp_bitcnt_t mpz_popcount (const mpz_t);
++mp_bitcnt_t mpz_hamdist (const mpz_t, const mpz_t);
++mp_bitcnt_t mpz_scan0 (const mpz_t, mp_bitcnt_t);
++mp_bitcnt_t mpz_scan1 (const mpz_t, mp_bitcnt_t);
++
++int mpz_fits_slong_p (const mpz_t);
++int mpz_fits_ulong_p (const mpz_t);
++long int mpz_get_si (const mpz_t);
++unsigned long int mpz_get_ui (const mpz_t);
++double mpz_get_d (const mpz_t);
++size_t mpz_size (const mpz_t);
++mp_limb_t mpz_getlimbn (const mpz_t, mp_size_t);
++
++void mpz_realloc2 (mpz_t, mp_bitcnt_t);
++mp_srcptr mpz_limbs_read (mpz_srcptr);
++mp_ptr mpz_limbs_modify (mpz_t, mp_size_t);
++mp_ptr mpz_limbs_write (mpz_t, mp_size_t);
++void mpz_limbs_finish (mpz_t, mp_size_t);
++mpz_srcptr mpz_roinit_n (mpz_t, mp_srcptr, mp_size_t);
++
++#define MPZ_ROINIT_N(xp, xs) {{0, (xs),(xp) }}
++
++void mpz_set_si (mpz_t, signed long int);
++void mpz_set_ui (mpz_t, unsigned long int);
++void mpz_set (mpz_t, const mpz_t);
++void mpz_set_d (mpz_t, double);
++
++void mpz_init_set_si (mpz_t, signed long int);
++void mpz_init_set_ui (mpz_t, unsigned long int);
++void mpz_init_set (mpz_t, const mpz_t);
++void mpz_init_set_d (mpz_t, double);
++
++size_t mpz_sizeinbase (const mpz_t, int);
++char *mpz_get_str (char *, int, const mpz_t);
++int mpz_set_str (mpz_t, const char *, int);
++int mpz_init_set_str (mpz_t, const char *, int);
++
++/* This long list taken from gmp.h. */
++/* For reference, "defined(EOF)" cannot be used here.  In g++ 2.95.4,
++   <iostream> defines EOF but not FILE.  */
++#if defined (FILE)                                              \
++  || defined (H_STDIO)                                          \
++  || defined (_H_STDIO)               /* AIX */                 \
++  || defined (_STDIO_H)               /* glibc, Sun, SCO */     \
++  || defined (_STDIO_H_)              /* BSD, OSF */            \
++  || defined (__STDIO_H)              /* Borland */             \
++  || defined (__STDIO_H__)            /* IRIX */                \
++  || defined (_STDIO_INCLUDED)        /* HPUX */                \
++  || defined (__dj_include_stdio_h_)  /* DJGPP */               \
++  || defined (_FILE_DEFINED)          /* Microsoft */           \
++  || defined (__STDIO__)              /* Apple MPW MrC */       \
++  || defined (_MSL_STDIO_H)           /* Metrowerks */          \
++  || defined (_STDIO_H_INCLUDED)      /* QNX4 */		\
++  || defined (_ISO_STDIO_ISO_H)       /* Sun C++ */		\
++  || defined (__STDIO_LOADED)         /* VMS */
++size_t mpz_out_str (FILE *, int, const mpz_t);
++#endif
++
++void mpz_import (mpz_t, size_t, int, size_t, int, size_t, const void *);
++void *mpz_export (void *, size_t *, int, size_t, int, size_t, const mpz_t);
++
++#if defined (__cplusplus)
++}
++#endif
++#endif /* __MINI_GMP_H__ */
+--- a/include/utils.h
++++ b/include/utils.h
+@@ -9,14 +9,14 @@
+ #include <unistd.h>
+ #include <assert.h>
+ #include <list.h>
+-#include <gmp.h>
++#include <bignum.h>
+ 
+ #define BITS_PER_BYTE	8
+ 
+ #ifdef DEBUG
+ #define pr_debug(fmt, arg...) gmp_printf(fmt, ##arg)
+ #else
+-#define pr_debug(fmt, arg...) ({ if (false) gmp_printf(fmt, ##arg); 0; })
++#define pr_debug(fmt, arg...)
+ #endif
+ 
+ #define __fmtstring(x, y)	__attribute__((format(printf, x, y)))
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -31,3 +31,8 @@ nft-extra-clean-files	+= parser.c parser
+ 
+ nft-obj			+= scanner.o
+ nft-extra-clean-files	+= scanner.c scanner.h
++
++ifneq (@with_libgmp@,yes)
++nft-obj			+= mini-gmp.o
++nft-obj			+= mini-gmp-printf.o
++endif
+--- a/src/datatype.c
++++ b/src/datatype.c
+@@ -267,11 +267,9 @@ static struct error_record *integer_type
+ 					       struct expr **res)
+ {
+ 	mpz_t v;
+-	int len;
+ 
+ 	mpz_init(v);
+-	if (gmp_sscanf(sym->identifier, "%Zu%n", v, &len) != 1 ||
+-	    (int)strlen(sym->identifier) != len) {
++	if (mpz_set_str(v, sym->identifier, 0)) {
+ 		mpz_clear(v);
+ 		if (sym->dtype != &integer_type)
+ 			return NULL;
+--- a/src/erec.c
++++ b/src/erec.c
+@@ -43,6 +43,7 @@ static void erec_destroy(struct error_re
+ 	xfree(erec);
+ }
+ 
++__attribute__((format(printf, 3, 0)))
+ struct error_record *erec_vcreate(enum error_record_types type,
+ 				  const struct location *loc,
+ 				  const char *fmt, va_list ap)
+@@ -54,10 +55,11 @@ struct error_record *erec_vcreate(enum e
+ 	erec->num_locations	= 0;
+ 	erec_add_location(erec, loc);
+ 
+-	gmp_vasprintf(&erec->msg, fmt, ap);
++	if (vasprintf(&erec->msg, fmt, ap)) {}
+ 	return erec;
+ }
+ 
++__attribute__((format(printf, 3, 4)))
+ struct error_record *erec_create(enum error_record_types type,
+ 				 const struct location *loc,
+ 				 const char *fmt, ...)
+--- a/src/evaluate.c
++++ b/src/evaluate.c
+@@ -232,9 +232,13 @@ static int expr_evaluate_value(struct ev
+ 	case TYPE_INTEGER:
+ 		mpz_init_bitmask(mask, ctx->ectx.len);
+ 		if (mpz_cmp((*expr)->value, mask) > 0) {
++			char *valstr = mpz_get_str(NULL, 10, (*expr)->value);
++			char *rangestr = mpz_get_str(NULL, 10, mask);
+ 			expr_error(ctx->msgs, *expr,
+-				   "Value %Zu exceeds valid range 0-%Zu",
+-				   (*expr)->value, mask);
++				   "Value %s exceeds valid range 0-%s",
++				   valstr, rangestr);
++			free(valstr);
++			free(rangestr);
+ 			mpz_clear(mask);
+ 			return -1;
+ 		}
+--- a/src/gmputil.c
++++ b/src/gmputil.c
+@@ -14,7 +14,6 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <gmp.h>
+ 
+ #include <nftables.h>
+ #include <datatype.h>
+--- /dev/null
++++ b/src/mini-gmp-printf.c
+@@ -0,0 +1,63 @@
++#include <stdarg.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <bignum.h>
++
++// nftables mostly uses gmp_printf as below so we build a minimalistic
++// version to avoid the awkwardness of wrapping printf.
++// This requires rewriting other occurences of gmp_printf or
++// variants which are rare (only 1 so far).
++// Also we exclude pr_debug here since this is a rathole
++// and if debugging is desired then libgmp can be used.
++
++int gmp_printf(const char *f, const mpz_t value)
++{
++	int n = 0;
++	while (*f) {
++		if (*f != '%') {
++			if (fputc(*f, stdout) != *f)
++				return -1;
++
++			++n;
++		} else {
++			unsigned long prec = 0;
++			int base;
++			size_t len;
++			char *str;
++			bool ok;
++
++			if (*++f == '.')
++				prec = strtoul(++f, (char**)&f, 10);
++
++			if (*f++ != 'Z')
++				return -1;
++
++			if (*f == 'u')
++				base = 10;
++			else if (*f == 'x')
++				base = 16;
++			else
++				return -1;
++
++			len = mpz_sizeinbase(value, base);
++			while (prec-- > len) {
++				if (fputc('0', stdout) != '0')
++					return -1;
++
++				++n;
++			}
++
++			str = mpz_get_str(NULL, base, value);
++			ok = str && fwrite(str, 1, len, stdout) == len;
++			free(str);
++
++			if (!ok)
++				return -1;
++
++			n += len;
++		}
++		++f;
++	}
++	return n;
++}
+--- /dev/null
++++ b/src/mini-gmp.c
+@@ -0,0 +1,4386 @@
++/* mini-gmp, a minimalistic implementation of a GNU GMP subset.
++
++   Contributed to the GNU project by Niels Möller
++
++Copyright 1991-1997, 1999-2014 Free Software Foundation, Inc.
++
++This file is part of the GNU MP Library.
++
++The GNU MP Library is free software; you can redistribute it and/or modify
++it under the terms of either:
++
++  * the GNU Lesser General Public License as published by the Free
++    Software Foundation; either version 3 of the License, or (at your
++    option) any later version.
++
++or
++
++  * the GNU General Public License as published by the Free Software
++    Foundation; either version 2 of the License, or (at your option) any
++    later version.
++
++or both in parallel, as here.
++
++The GNU MP Library is distributed in the hope that 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 copies of the GNU General Public License and the
++GNU Lesser General Public License along with the GNU MP Library.  If not,
++see https://www.gnu.org/licenses/.  */
++
++/* NOTE: All functions in this file which are not declared in
++   mini-gmp.h are internal, and are not intended to be compatible
++   neither with GMP nor with future versions of mini-gmp. */
++
++/* Much of the material copied from GMP files, including: gmp-impl.h,
++   longlong.h, mpn/generic/add_n.c, mpn/generic/addmul_1.c,
++   mpn/generic/lshift.c, mpn/generic/mul_1.c,
++   mpn/generic/mul_basecase.c, mpn/generic/rshift.c,
++   mpn/generic/sbpi1_div_qr.c, mpn/generic/sub_n.c,
++   mpn/generic/submul_1.c. */
++
++#include <assert.h>
++#include <ctype.h>
++#include <limits.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#include "mini-gmp.h"
++
++
++/* Macros */
++#define GMP_LIMB_BITS (sizeof(mp_limb_t) * CHAR_BIT)
++
++#define GMP_LIMB_MAX (~ (mp_limb_t) 0)
++#define GMP_LIMB_HIGHBIT ((mp_limb_t) 1 << (GMP_LIMB_BITS - 1))
++
++#define GMP_HLIMB_BIT ((mp_limb_t) 1 << (GMP_LIMB_BITS / 2))
++#define GMP_LLIMB_MASK (GMP_HLIMB_BIT - 1)
++
++#define GMP_ULONG_BITS (sizeof(unsigned long) * CHAR_BIT)
++#define GMP_ULONG_HIGHBIT ((unsigned long) 1 << (GMP_ULONG_BITS - 1))
++
++#define GMP_ABS(x) ((x) >= 0 ? (x) : -(x))
++#define GMP_NEG_CAST(T,x) (-((T)((x) + 1) - 1))
++
++#define GMP_MIN(a, b) ((a) < (b) ? (a) : (b))
++#define GMP_MAX(a, b) ((a) > (b) ? (a) : (b))
++
++#define gmp_assert_nocarry(x) do { \
++    mp_limb_t __cy = x;		   \
++    assert (__cy == 0);		   \
++  } while (0)
++
++#define gmp_clz(count, x) do {						\
++    mp_limb_t __clz_x = (x);						\
++    unsigned __clz_c;							\
++    for (__clz_c = 0;							\
++	 (__clz_x & ((mp_limb_t) 0xff << (GMP_LIMB_BITS - 8))) == 0;	\
++	 __clz_c += 8)							\
++      __clz_x <<= 8;							\
++    for (; (__clz_x & GMP_LIMB_HIGHBIT) == 0; __clz_c++)		\
++      __clz_x <<= 1;							\
++    (count) = __clz_c;							\
++  } while (0)
++
++#define gmp_ctz(count, x) do {						\
++    mp_limb_t __ctz_x = (x);						\
++    unsigned __ctz_c = 0;						\
++    gmp_clz (__ctz_c, __ctz_x & - __ctz_x);				\
++    (count) = GMP_LIMB_BITS - 1 - __ctz_c;				\
++  } while (0)
++
++#define gmp_add_ssaaaa(sh, sl, ah, al, bh, bl) \
++  do {									\
++    mp_limb_t __x;							\
++    __x = (al) + (bl);							\
++    (sh) = (ah) + (bh) + (__x < (al));					\
++    (sl) = __x;								\
++  } while (0)
++
++#define gmp_sub_ddmmss(sh, sl, ah, al, bh, bl) \
++  do {									\
++    mp_limb_t __x;							\
++    __x = (al) - (bl);							\
++    (sh) = (ah) - (bh) - ((al) < (bl));					\
++    (sl) = __x;								\
++  } while (0)
++
++#define gmp_umul_ppmm(w1, w0, u, v)					\
++  do {									\
++    mp_limb_t __x0, __x1, __x2, __x3;					\
++    unsigned __ul, __vl, __uh, __vh;					\
++    mp_limb_t __u = (u), __v = (v);					\
++									\
++    __ul = __u & GMP_LLIMB_MASK;					\
++    __uh = __u >> (GMP_LIMB_BITS / 2);					\
++    __vl = __v & GMP_LLIMB_MASK;					\
++    __vh = __v >> (GMP_LIMB_BITS / 2);					\
++									\
++    __x0 = (mp_limb_t) __ul * __vl;					\
++    __x1 = (mp_limb_t) __ul * __vh;					\
++    __x2 = (mp_limb_t) __uh * __vl;					\
++    __x3 = (mp_limb_t) __uh * __vh;					\
++									\
++    __x1 += __x0 >> (GMP_LIMB_BITS / 2);/* this can't give carry */	\
++    __x1 += __x2;		/* but this indeed can */		\
++    if (__x1 < __x2)		/* did we get it? */			\
++      __x3 += GMP_HLIMB_BIT;	/* yes, add it in the proper pos. */	\
++									\
++    (w1) = __x3 + (__x1 >> (GMP_LIMB_BITS / 2));			\
++    (w0) = (__x1 << (GMP_LIMB_BITS / 2)) + (__x0 & GMP_LLIMB_MASK);	\
++  } while (0)
++
++#define gmp_udiv_qrnnd_preinv(q, r, nh, nl, d, di)			\
++  do {									\
++    mp_limb_t _qh, _ql, _r, _mask;					\
++    gmp_umul_ppmm (_qh, _ql, (nh), (di));				\
++    gmp_add_ssaaaa (_qh, _ql, _qh, _ql, (nh) + 1, (nl));		\
++    _r = (nl) - _qh * (d);						\
++    _mask = -(mp_limb_t) (_r > _ql); /* both > and >= are OK */		\
++    _qh += _mask;							\
++    _r += _mask & (d);							\
++    if (_r >= (d))							\
++      {									\
++	_r -= (d);							\
++	_qh++;								\
++      }									\
++									\
++    (r) = _r;								\
++    (q) = _qh;								\
++  } while (0)
++
++#define gmp_udiv_qr_3by2(q, r1, r0, n2, n1, n0, d1, d0, dinv)		\
++  do {									\
++    mp_limb_t _q0, _t1, _t0, _mask;					\
++    gmp_umul_ppmm ((q), _q0, (n2), (dinv));				\
++    gmp_add_ssaaaa ((q), _q0, (q), _q0, (n2), (n1));			\
++									\
++    /* Compute the two most significant limbs of n - q'd */		\
++    (r1) = (n1) - (d1) * (q);						\
++    gmp_sub_ddmmss ((r1), (r0), (r1), (n0), (d1), (d0));		\
++    gmp_umul_ppmm (_t1, _t0, (d0), (q));				\
++    gmp_sub_ddmmss ((r1), (r0), (r1), (r0), _t1, _t0);			\
++    (q)++;								\
++									\
++    /* Conditionally adjust q and the remainders */			\
++    _mask = - (mp_limb_t) ((r1) >= _q0);				\
++    (q) += _mask;							\
++    gmp_add_ssaaaa ((r1), (r0), (r1), (r0), _mask & (d1), _mask & (d0)); \
++    if ((r1) >= (d1))							\
++      {									\
++	if ((r1) > (d1) || (r0) >= (d0))				\
++	  {								\
++	    (q)++;							\
++	    gmp_sub_ddmmss ((r1), (r0), (r1), (r0), (d1), (d0));	\
++	  }								\
++      }									\
++  } while (0)
++
++/* Swap macros. */
++#define MP_LIMB_T_SWAP(x, y)						\
++  do {									\
++    mp_limb_t __mp_limb_t_swap__tmp = (x);				\
++    (x) = (y);								\
++    (y) = __mp_limb_t_swap__tmp;					\
++  } while (0)
++#define MP_SIZE_T_SWAP(x, y)						\
++  do {									\
++    mp_size_t __mp_size_t_swap__tmp = (x);				\
++    (x) = (y);								\
++    (y) = __mp_size_t_swap__tmp;					\
++  } while (0)
++#define MP_BITCNT_T_SWAP(x,y)			\
++  do {						\
++    mp_bitcnt_t __mp_bitcnt_t_swap__tmp = (x);	\
++    (x) = (y);					\
++    (y) = __mp_bitcnt_t_swap__tmp;		\
++  } while (0)
++#define MP_PTR_SWAP(x, y)						\
++  do {									\
++    mp_ptr __mp_ptr_swap__tmp = (x);					\
++    (x) = (y);								\
++    (y) = __mp_ptr_swap__tmp;						\
++  } while (0)
++#define MP_SRCPTR_SWAP(x, y)						\
++  do {									\
++    mp_srcptr __mp_srcptr_swap__tmp = (x);				\
++    (x) = (y);								\
++    (y) = __mp_srcptr_swap__tmp;					\
++  } while (0)
++
++#define MPN_PTR_SWAP(xp,xs, yp,ys)					\
++  do {									\
++    MP_PTR_SWAP (xp, yp);						\
++    MP_SIZE_T_SWAP (xs, ys);						\
++  } while(0)
++#define MPN_SRCPTR_SWAP(xp,xs, yp,ys)					\
++  do {									\
++    MP_SRCPTR_SWAP (xp, yp);						\
++    MP_SIZE_T_SWAP (xs, ys);						\
++  } while(0)
++
++#define MPZ_PTR_SWAP(x, y)						\
++  do {									\
++    mpz_ptr __mpz_ptr_swap__tmp = (x);					\
++    (x) = (y);								\
++    (y) = __mpz_ptr_swap__tmp;						\
++  } while (0)
++#define MPZ_SRCPTR_SWAP(x, y)						\
++  do {									\
++    mpz_srcptr __mpz_srcptr_swap__tmp = (x);				\
++    (x) = (y);								\
++    (y) = __mpz_srcptr_swap__tmp;					\
++  } while (0)
++
++const int mp_bits_per_limb = GMP_LIMB_BITS;
++
++
++/* Memory allocation and other helper functions. */
++static void
++gmp_die (const char *msg)
++{
++  fprintf (stderr, "%s\n", msg);
++  abort();
++}
++
++static void *
++gmp_default_alloc (size_t size)
++{
++  void *p;
++
++  assert (size > 0);
++
++  p = malloc (size);
++  if (!p)
++    gmp_die("gmp_default_alloc: Virtual memory exhausted.");
++
++  return p;
++}
++
++static void *
++gmp_default_realloc (void *old, size_t old_size, size_t new_size)
++{
++  mp_ptr p;
++
++  p = realloc (old, new_size);
++
++  if (!p)
++    gmp_die("gmp_default_realoc: Virtual memory exhausted.");
++
++  return p;
++}
++
++static void
++gmp_default_free (void *p, size_t size)
++{
++  free (p);
++}
++
++static void * (*gmp_allocate_func) (size_t) = gmp_default_alloc;
++static void * (*gmp_reallocate_func) (void *, size_t, size_t) = gmp_default_realloc;
++static void (*gmp_free_func) (void *, size_t) = gmp_default_free;
++
++void
++mp_get_memory_functions (void *(**alloc_func) (size_t),
++			 void *(**realloc_func) (void *, size_t, size_t),
++			 void (**free_func) (void *, size_t))
++{
++  if (alloc_func)
++    *alloc_func = gmp_allocate_func;
++
++  if (realloc_func)
++    *realloc_func = gmp_reallocate_func;
++
++  if (free_func)
++    *free_func = gmp_free_func;
++}
++
++void
++mp_set_memory_functions (void *(*alloc_func) (size_t),
++			 void *(*realloc_func) (void *, size_t, size_t),
++			 void (*free_func) (void *, size_t))
++{
++  if (!alloc_func)
++    alloc_func = gmp_default_alloc;
++  if (!realloc_func)
++    realloc_func = gmp_default_realloc;
++  if (!free_func)
++    free_func = gmp_default_free;
++
++  gmp_allocate_func = alloc_func;
++  gmp_reallocate_func = realloc_func;
++  gmp_free_func = free_func;
++}
++
++#define gmp_xalloc(size) ((*gmp_allocate_func)((size)))
++#define gmp_free(p) ((*gmp_free_func) ((p), 0))
++
++static mp_ptr
++gmp_xalloc_limbs (mp_size_t size)
++{
++  return gmp_xalloc (size * sizeof (mp_limb_t));
++}
++
++static mp_ptr
++gmp_xrealloc_limbs (mp_ptr old, mp_size_t size)
++{
++  assert (size > 0);
++  return (*gmp_reallocate_func) (old, 0, size * sizeof (mp_limb_t));
++}
++
++
++/* MPN interface */
++
++void
++mpn_copyi (mp_ptr d, mp_srcptr s, mp_size_t n)
++{
++  mp_size_t i;
++  for (i = 0; i < n; i++)
++    d[i] = s[i];
++}
++
++void
++mpn_copyd (mp_ptr d, mp_srcptr s, mp_size_t n)
++{
++  while (n-- > 0)
++    d[n] = s[n];
++}
++
++int
++mpn_cmp (mp_srcptr ap, mp_srcptr bp, mp_size_t n)
++{
++  while (--n >= 0)
++    {
++      if (ap[n] != bp[n])
++	return ap[n] > bp[n] ? 1 : -1;
++    }
++  return 0;
++}
++
++static int
++mpn_cmp4 (mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn)
++{
++  if (an != bn)
++    return an < bn ? -1 : 1;
++  else
++    return mpn_cmp (ap, bp, an);
++}
++
++static mp_size_t
++mpn_normalized_size (mp_srcptr xp, mp_size_t n)
++{
++  for (; n > 0 && xp[n-1] == 0; n--)
++    ;
++  return n;
++}
++
++#define mpn_zero_p(xp, n) (mpn_normalized_size ((xp), (n)) == 0)
++
++void
++mpn_zero (mp_ptr rp, mp_size_t n)
++{
++  mp_size_t i;
++
++  for (i = 0; i < n; i++)
++    rp[i] = 0;
++}
++
++mp_limb_t
++mpn_add_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b)
++{
++  mp_size_t i;
++
++  assert (n > 0);
++  i = 0;
++  do
++    {
++      mp_limb_t r = ap[i] + b;
++      /* Carry out */
++      b = (r < b);
++      rp[i] = r;
++    }
++  while (++i < n);
++
++  return b;
++}
++
++mp_limb_t
++mpn_add_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n)
++{
++  mp_size_t i;
++  mp_limb_t cy;
++
++  for (i = 0, cy = 0; i < n; i++)
++    {
++      mp_limb_t a, b, r;
++      a = ap[i]; b = bp[i];
++      r = a + cy;
++      cy = (r < cy);
++      r += b;
++      cy += (r < b);
++      rp[i] = r;
++    }
++  return cy;
++}
++
++mp_limb_t
++mpn_add (mp_ptr rp, mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn)
++{
++  mp_limb_t cy;
++
++  assert (an >= bn);
++
++  cy = mpn_add_n (rp, ap, bp, bn);
++  if (an > bn)
++    cy = mpn_add_1 (rp + bn, ap + bn, an - bn, cy);
++  return cy;
++}
++
++mp_limb_t
++mpn_sub_1 (mp_ptr rp, mp_srcptr ap, mp_size_t n, mp_limb_t b)
++{
++  mp_size_t i;
++
++  assert (n > 0);
++
++  i = 0;
++  do
++    {
++      mp_limb_t a = ap[i];
++      /* Carry out */
++      mp_limb_t cy = a < b;;
++      rp[i] = a - b;
++      b = cy;
++    }
++  while (++i < n);
++
++  return b;
++}
++
++mp_limb_t
++mpn_sub_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n)
++{
++  mp_size_t i;
++  mp_limb_t cy;
++
++  for (i = 0, cy = 0; i < n; i++)
++    {
++      mp_limb_t a, b;
++      a = ap[i]; b = bp[i];
++      b += cy;
++      cy = (b < cy);
++      cy += (a < b);
++      rp[i] = a - b;
++    }
++  return cy;
++}
++
++mp_limb_t
++mpn_sub (mp_ptr rp, mp_srcptr ap, mp_size_t an, mp_srcptr bp, mp_size_t bn)
++{
++  mp_limb_t cy;
++
++  assert (an >= bn);
++
++  cy = mpn_sub_n (rp, ap, bp, bn);
++  if (an > bn)
++    cy = mpn_sub_1 (rp + bn, ap + bn, an - bn, cy);
++  return cy;
++}
++
++mp_limb_t
++mpn_mul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t vl)
++{
++  mp_limb_t ul, cl, hpl, lpl;
++
++  assert (n >= 1);
++
++  cl = 0;
++  do
++    {
++      ul = *up++;
++      gmp_umul_ppmm (hpl, lpl, ul, vl);
++
++      lpl += cl;
++      cl = (lpl < cl) + hpl;
++
++      *rp++ = lpl;
++    }
++  while (--n != 0);
++
++  return cl;
++}
++
++mp_limb_t
++mpn_addmul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t vl)
++{
++  mp_limb_t ul, cl, hpl, lpl, rl;
++
++  assert (n >= 1);
++
++  cl = 0;
++  do
++    {
++      ul = *up++;
++      gmp_umul_ppmm (hpl, lpl, ul, vl);
++
++      lpl += cl;
++      cl = (lpl < cl) + hpl;
++
++      rl = *rp;
++      lpl = rl + lpl;
++      cl += lpl < rl;
++      *rp++ = lpl;
++    }
++  while (--n != 0);
++
++  return cl;
++}
++
++mp_limb_t
++mpn_submul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t vl)
++{
++  mp_limb_t ul, cl, hpl, lpl, rl;
++
++  assert (n >= 1);
++
++  cl = 0;
++  do
++    {
++      ul = *up++;
++      gmp_umul_ppmm (hpl, lpl, ul, vl);
++
++      lpl += cl;
++      cl = (lpl < cl) + hpl;
++
++      rl = *rp;
++      lpl = rl - lpl;
++      cl += lpl > rl;
++      *rp++ = lpl;
++    }
++  while (--n != 0);
++
++  return cl;
++}
++
++mp_limb_t
++mpn_mul (mp_ptr rp, mp_srcptr up, mp_size_t un, mp_srcptr vp, mp_size_t vn)
++{
++  assert (un >= vn);
++  assert (vn >= 1);
++
++  /* We first multiply by the low order limb. This result can be
++     stored, not added, to rp. We also avoid a loop for zeroing this
++     way. */
++
++  rp[un] = mpn_mul_1 (rp, up, un, vp[0]);
++  rp += 1, vp += 1, vn -= 1;
++
++  /* Now accumulate the product of up[] and the next higher limb from
++     vp[]. */
++
++  while (vn >= 1)
++    {
++      rp[un] = mpn_addmul_1 (rp, up, un, vp[0]);
++      rp += 1, vp += 1, vn -= 1;
++    }
++  return rp[un - 1];
++}
++
++void
++mpn_mul_n (mp_ptr rp, mp_srcptr ap, mp_srcptr bp, mp_size_t n)
++{
++  mpn_mul (rp, ap, n, bp, n);
++}
++
++void
++mpn_sqr (mp_ptr rp, mp_srcptr ap, mp_size_t n)
++{
++  mpn_mul (rp, ap, n, ap, n);
++}
++
++mp_limb_t
++mpn_lshift (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
++{
++  mp_limb_t high_limb, low_limb;
++  unsigned int tnc;
++  mp_size_t i;
++  mp_limb_t retval;
++
++  assert (n >= 1);
++  assert (cnt >= 1);
++  assert (cnt < GMP_LIMB_BITS);
++
++  up += n;
++  rp += n;
++
++  tnc = GMP_LIMB_BITS - cnt;
++  low_limb = *--up;
++  retval = low_limb >> tnc;
++  high_limb = (low_limb << cnt);
++
++  for (i = n; --i != 0;)
++    {
++      low_limb = *--up;
++      *--rp = high_limb | (low_limb >> tnc);
++      high_limb = (low_limb << cnt);
++    }
++  *--rp = high_limb;
++
++  return retval;
++}
++
++mp_limb_t
++mpn_rshift (mp_ptr rp, mp_srcptr up, mp_size_t n, unsigned int cnt)
++{
++  mp_limb_t high_limb, low_limb;
++  unsigned int tnc;
++  mp_size_t i;
++  mp_limb_t retval;
++
++  assert (n >= 1);
++  assert (cnt >= 1);
++  assert (cnt < GMP_LIMB_BITS);
++
++  tnc = GMP_LIMB_BITS - cnt;
++  high_limb = *up++;
++  retval = (high_limb << tnc);
++  low_limb = high_limb >> cnt;
++
++  for (i = n; --i != 0;)
++    {
++      high_limb = *up++;
++      *rp++ = low_limb | (high_limb << tnc);
++      low_limb = high_limb >> cnt;
++    }
++  *rp = low_limb;
++
++  return retval;
++}
++
++static mp_bitcnt_t
++mpn_common_scan (mp_limb_t limb, mp_size_t i, mp_srcptr up, mp_size_t un,
++		 mp_limb_t ux)
++{
++  unsigned cnt;
++
++  assert (ux == 0 || ux == GMP_LIMB_MAX);
++  assert (0 <= i && i <= un );
++
++  while (limb == 0)
++    {
++      i++;
++      if (i == un)
++	return (ux == 0 ? ~(mp_bitcnt_t) 0 : un * GMP_LIMB_BITS);
++      limb = ux ^ up[i];
++    }
++  gmp_ctz (cnt, limb);
++  return (mp_bitcnt_t) i * GMP_LIMB_BITS + cnt;
++}
++
++mp_bitcnt_t
++mpn_scan1 (mp_srcptr ptr, mp_bitcnt_t bit)
++{
++  mp_size_t i;
++  i = bit / GMP_LIMB_BITS;
++
++  return mpn_common_scan ( ptr[i] & (GMP_LIMB_MAX << (bit % GMP_LIMB_BITS)),
++			  i, ptr, i, 0);
++}
++
++mp_bitcnt_t
++mpn_scan0 (mp_srcptr ptr, mp_bitcnt_t bit)
++{
++  mp_size_t i;
++  i = bit / GMP_LIMB_BITS;
++
++  return mpn_common_scan (~ptr[i] & (GMP_LIMB_MAX << (bit % GMP_LIMB_BITS)),
++			  i, ptr, i, GMP_LIMB_MAX);
++}
++
++
++/* MPN division interface. */
++mp_limb_t
++mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
++{
++  mp_limb_t r, p, m;
++  unsigned ul, uh;
++  unsigned ql, qh;
++
++  /* First, do a 2/1 inverse. */
++  /* The inverse m is defined as floor( (B^2 - 1 - u1)/u1 ), so that 0 <
++   * B^2 - (B + m) u1 <= u1 */
++  assert (u1 >= GMP_LIMB_HIGHBIT);
++
++  ul = u1 & GMP_LLIMB_MASK;
++  uh = u1 >> (GMP_LIMB_BITS / 2);
++
++  qh = ~u1 / uh;
++  r = ((~u1 - (mp_limb_t) qh * uh) << (GMP_LIMB_BITS / 2)) | GMP_LLIMB_MASK;
++
++  p = (mp_limb_t) qh * ul;
++  /* Adjustment steps taken from udiv_qrnnd_c */
++  if (r < p)
++    {
++      qh--;
++      r += u1;
++      if (r >= u1) /* i.e. we didn't get carry when adding to r */
++	if (r < p)
++	  {
++	    qh--;
++	    r += u1;
++	  }
++    }
++  r -= p;
++
++  /* Do a 3/2 division (with half limb size) */
++  p = (r >> (GMP_LIMB_BITS / 2)) * qh + r;
++  ql = (p >> (GMP_LIMB_BITS / 2)) + 1;
++
++  /* By the 3/2 method, we don't need the high half limb. */
++  r = (r << (GMP_LIMB_BITS / 2)) + GMP_LLIMB_MASK - ql * u1;
++
++  if (r >= (p << (GMP_LIMB_BITS / 2)))
++    {
++      ql--;
++      r += u1;
++    }
++  m = ((mp_limb_t) qh << (GMP_LIMB_BITS / 2)) + ql;
++  if (r >= u1)
++    {
++      m++;
++      r -= u1;
++    }
++
++  if (u0 > 0)
++    {
++      mp_limb_t th, tl;
++      r = ~r;
++      r += u0;
++      if (r < u0)
++	{
++	  m--;
++	  if (r >= u1)
++	    {
++	      m--;
++	      r -= u1;
++	    }
++	  r -= u1;
++	}
++      gmp_umul_ppmm (th, tl, u0, m);
++      r += th;
++      if (r < th)
++	{
++	  m--;
++	  m -= ((r > u1) | ((r == u1) & (tl > u0)));
++	}
++    }
++
++  return m;
++}
++
++struct gmp_div_inverse
++{
++  /* Normalization shift count. */
++  unsigned shift;
++  /* Normalized divisor (d0 unused for mpn_div_qr_1) */
++  mp_limb_t d1, d0;
++  /* Inverse, for 2/1 or 3/2. */
++  mp_limb_t di;
++};
++
++static void
++mpn_div_qr_1_invert (struct gmp_div_inverse *inv, mp_limb_t d)
++{
++  unsigned shift;
++
++  assert (d > 0);
++  gmp_clz (shift, d);
++  inv->shift = shift;
++  inv->d1 = d << shift;
++  inv->di = mpn_invert_limb (inv->d1);
++}
++
++static void
++mpn_div_qr_2_invert (struct gmp_div_inverse *inv,
++		     mp_limb_t d1, mp_limb_t d0)
++{
++  unsigned shift;
++
++  assert (d1 > 0);
++  gmp_clz (shift, d1);
++  inv->shift = shift;
++  if (shift > 0)
++    {
++      d1 = (d1 << shift) | (d0 >> (GMP_LIMB_BITS - shift));
++      d0 <<= shift;
++    }
++  inv->d1 = d1;
++  inv->d0 = d0;
++  inv->di = mpn_invert_3by2 (d1, d0);
++}
++
++static void
++mpn_div_qr_invert (struct gmp_div_inverse *inv,
++		   mp_srcptr dp, mp_size_t dn)
++{
++  assert (dn > 0);
++
++  if (dn == 1)
++    mpn_div_qr_1_invert (inv, dp[0]);
++  else if (dn == 2)
++    mpn_div_qr_2_invert (inv, dp[1], dp[0]);
++  else
++    {
++      unsigned shift;
++      mp_limb_t d1, d0;
++
++      d1 = dp[dn-1];
++      d0 = dp[dn-2];
++      assert (d1 > 0);
++      gmp_clz (shift, d1);
++      inv->shift = shift;
++      if (shift > 0)
++	{
++	  d1 = (d1 << shift) | (d0 >> (GMP_LIMB_BITS - shift));
++	  d0 = (d0 << shift) | (dp[dn-3] >> (GMP_LIMB_BITS - shift));
++	}
++      inv->d1 = d1;
++      inv->d0 = d0;
++      inv->di = mpn_invert_3by2 (d1, d0);
++    }
++}
++
++/* Not matching current public gmp interface, rather corresponding to
++   the sbpi1_div_* functions. */
++static mp_limb_t
++mpn_div_qr_1_preinv (mp_ptr qp, mp_srcptr np, mp_size_t nn,
++		     const struct gmp_div_inverse *inv)
++{
++  mp_limb_t d, di;
++  mp_limb_t r;
++  mp_ptr tp = NULL;
++
++  if (inv->shift > 0)
++    {
++      tp = gmp_xalloc_limbs (nn);
++      r = mpn_lshift (tp, np, nn, inv->shift);
++      np = tp;
++    }
++  else
++    r = 0;
++
++  d = inv->d1;
++  di = inv->di;
++  while (nn-- > 0)
++    {
++      mp_limb_t q;
++
++      gmp_udiv_qrnnd_preinv (q, r, r, np[nn], d, di);
++      if (qp)
++	qp[nn] = q;
++    }
++  if (inv->shift > 0)
++    gmp_free (tp);
++
++  return r >> inv->shift;
++}
++
++static mp_limb_t
++mpn_div_qr_1 (mp_ptr qp, mp_srcptr np, mp_size_t nn, mp_limb_t d)
++{
++  assert (d > 0);
++
++  /* Special case for powers of two. */
++  if ((d & (d-1)) == 0)
++    {
++      mp_limb_t r = np[0] & (d-1);
++      if (qp)
++	{
++	  if (d <= 1)
++	    mpn_copyi (qp, np, nn);
++	  else
++	    {
++	      unsigned shift;
++	      gmp_ctz (shift, d);
++	      mpn_rshift (qp, np, nn, shift);
++	    }
++	}
++      return r;
++    }
++  else
++    {
++      struct gmp_div_inverse inv;
++      mpn_div_qr_1_invert (&inv, d);
++      return mpn_div_qr_1_preinv (qp, np, nn, &inv);
++    }
++}
++
++static void
++mpn_div_qr_2_preinv (mp_ptr qp, mp_ptr rp, mp_srcptr np, mp_size_t nn,
++		     const struct gmp_div_inverse *inv)
++{
++  unsigned shift;
++  mp_size_t i;
++  mp_limb_t d1, d0, di, r1, r0;
++  mp_ptr tp;
++
++  assert (nn >= 2);
++  shift = inv->shift;
++  d1 = inv->d1;
++  d0 = inv->d0;
++  di = inv->di;
++
++  if (shift > 0)
++    {
++      tp = gmp_xalloc_limbs (nn);
++      r1 = mpn_lshift (tp, np, nn, shift);
++      np = tp;
++    }
++  else
++    r1 = 0;
++
++  r0 = np[nn - 1];
++
++  i = nn - 2;
++  do
++    {
++      mp_limb_t n0, q;
++      n0 = np[i];
++      gmp_udiv_qr_3by2 (q, r1, r0, r1, r0, n0, d1, d0, di);
++
++      if (qp)
++	qp[i] = q;
++    }
++  while (--i >= 0);
++
++  if (shift > 0)
++    {
++      assert ((r0 << (GMP_LIMB_BITS - shift)) == 0);
++      r0 = (r0 >> shift) | (r1 << (GMP_LIMB_BITS - shift));
++      r1 >>= shift;
++
++      gmp_free (tp);
++    }
++
++  rp[1] = r1;
++  rp[0] = r0;
++}
++
++#if 0
++static void
++mpn_div_qr_2 (mp_ptr qp, mp_ptr rp, mp_srcptr np, mp_size_t nn,
++	      mp_limb_t d1, mp_limb_t d0)
++{
++  struct gmp_div_inverse inv;
++  assert (nn >= 2);
++
++  mpn_div_qr_2_invert (&inv, d1, d0);
++  mpn_div_qr_2_preinv (qp, rp, np, nn, &inv);
++}
++#endif
++
++static void
++mpn_div_qr_pi1 (mp_ptr qp,
++		mp_ptr np, mp_size_t nn, mp_limb_t n1,
++		mp_srcptr dp, mp_size_t dn,
++		mp_limb_t dinv)
++{
++  mp_size_t i;
++
++  mp_limb_t d1, d0;
++  mp_limb_t cy, cy1;
++  mp_limb_t q;
++
++  assert (dn > 2);
++  assert (nn >= dn);
++
++  d1 = dp[dn - 1];
++  d0 = dp[dn - 2];
++
++  assert ((d1 & GMP_LIMB_HIGHBIT) != 0);
++  /* Iteration variable is the index of the q limb.
++   *
++   * We divide <n1, np[dn-1+i], np[dn-2+i], np[dn-3+i],..., np[i]>
++   * by            <d1,          d0,        dp[dn-3],  ..., dp[0] >
++   */
++
++  i = nn - dn;
++  do
++    {
++      mp_limb_t n0 = np[dn-1+i];
++
++      if (n1 == d1 && n0 == d0)
++	{
++	  q = GMP_LIMB_MAX;
++	  mpn_submul_1 (np+i, dp, dn, q);
++	  n1 = np[dn-1+i];	/* update n1, last loop's value will now be invalid */
++	}
++      else
++	{
++	  gmp_udiv_qr_3by2 (q, n1, n0, n1, n0, np[dn-2+i], d1, d0, dinv);
++
++	  cy = mpn_submul_1 (np + i, dp, dn-2, q);
++
++	  cy1 = n0 < cy;
++	  n0 = n0 - cy;
++	  cy = n1 < cy1;
++	  n1 = n1 - cy1;
++	  np[dn-2+i] = n0;
++
++	  if (cy != 0)
++	    {
++	      n1 += d1 + mpn_add_n (np + i, np + i, dp, dn - 1);
++	      q--;
++	    }
++	}
++
++      if (qp)
++	qp[i] = q;
++    }
++  while (--i >= 0);
++
++  np[dn - 1] = n1;
++}
++
++static void
++mpn_div_qr_preinv (mp_ptr qp, mp_ptr np, mp_size_t nn,
++		   mp_srcptr dp, mp_size_t dn,
++		   const struct gmp_div_inverse *inv)
++{
++  assert (dn > 0);
++  assert (nn >= dn);
++
++  if (dn == 1)
++    np[0] = mpn_div_qr_1_preinv (qp, np, nn, inv);
++  else if (dn == 2)
++    mpn_div_qr_2_preinv (qp, np, np, nn, inv);
++  else
++    {
++      mp_limb_t nh;
++      unsigned shift;
++
++      assert (inv->d1 == dp[dn-1]);
++      assert (inv->d0 == dp[dn-2]);
++      assert ((inv->d1 & GMP_LIMB_HIGHBIT) != 0);
++
++      shift = inv->shift;
++      if (shift > 0)
++	nh = mpn_lshift (np, np, nn, shift);
++      else
++	nh = 0;
++
++      mpn_div_qr_pi1 (qp, np, nn, nh, dp, dn, inv->di);
++
++      if (shift > 0)
++	gmp_assert_nocarry (mpn_rshift (np, np, dn, shift));
++    }
++}
++
++static void
++mpn_div_qr (mp_ptr qp, mp_ptr np, mp_size_t nn, mp_srcptr dp, mp_size_t dn)
++{
++  struct gmp_div_inverse inv;
++  mp_ptr tp = NULL;
++
++  assert (dn > 0);
++  assert (nn >= dn);
++
++  mpn_div_qr_invert (&inv, dp, dn);
++  if (dn > 2 && inv.shift > 0)
++    {
++      tp = gmp_xalloc_limbs (dn);
++      gmp_assert_nocarry (mpn_lshift (tp, dp, dn, inv.shift));
++      dp = tp;
++    }
++  mpn_div_qr_preinv (qp, np, nn, dp, dn, &inv);
++  if (tp)
++    gmp_free (tp);
++}
++
++
++/* MPN base conversion. */
++static unsigned
++mpn_base_power_of_two_p (unsigned b)
++{
++  switch (b)
++    {
++    case 2: return 1;
++    case 4: return 2;
++    case 8: return 3;
++    case 16: return 4;
++    case 32: return 5;
++    case 64: return 6;
++    case 128: return 7;
++    case 256: return 8;
++    default: return 0;
++    }
++}
++
++struct mpn_base_info
++{
++  /* bb is the largest power of the base which fits in one limb, and
++     exp is the corresponding exponent. */
++  unsigned exp;
++  mp_limb_t bb;
++};
++
++static void
++mpn_get_base_info (struct mpn_base_info *info, mp_limb_t b)
++{
++  mp_limb_t m;
++  mp_limb_t p;
++  unsigned exp;
++
++  m = GMP_LIMB_MAX / b;
++  for (exp = 1, p = b; p <= m; exp++)
++    p *= b;
++
++  info->exp = exp;
++  info->bb = p;
++}
++
++static mp_bitcnt_t
++mpn_limb_size_in_base_2 (mp_limb_t u)
++{
++  unsigned shift;
++
++  assert (u > 0);
++  gmp_clz (shift, u);
++  return GMP_LIMB_BITS - shift;
++}
++
++static size_t
++mpn_get_str_bits (unsigned char *sp, unsigned bits, mp_srcptr up, mp_size_t un)
++{
++  unsigned char mask;
++  size_t sn, j;
++  mp_size_t i;
++  int shift;
++
++  sn = ((un - 1) * GMP_LIMB_BITS + mpn_limb_size_in_base_2 (up[un-1])
++	+ bits - 1) / bits;
++
++  mask = (1U << bits) - 1;
++
++  for (i = 0, j = sn, shift = 0; j-- > 0;)
++    {
++      unsigned char digit = up[i] >> shift;
++
++      shift += bits;
++
++      if (shift >= GMP_LIMB_BITS && ++i < un)
++	{
++	  shift -= GMP_LIMB_BITS;
++	  digit |= up[i] << (bits - shift);
++	}
++      sp[j] = digit & mask;
++    }
++  return sn;
++}
++
++/* We generate digits from the least significant end, and reverse at
++   the end. */
++static size_t
++mpn_limb_get_str (unsigned char *sp, mp_limb_t w,
++		  const struct gmp_div_inverse *binv)
++{
++  mp_size_t i;
++  for (i = 0; w > 0; i++)
++    {
++      mp_limb_t h, l, r;
++
++      h = w >> (GMP_LIMB_BITS - binv->shift);
++      l = w << binv->shift;
++
++      gmp_udiv_qrnnd_preinv (w, r, h, l, binv->d1, binv->di);
++      assert ( (r << (GMP_LIMB_BITS - binv->shift)) == 0);
++      r >>= binv->shift;
++
++      sp[i] = r;
++    }
++  return i;
++}
++
++static size_t
++mpn_get_str_other (unsigned char *sp,
++		   int base, const struct mpn_base_info *info,
++		   mp_ptr up, mp_size_t un)
++{
++  struct gmp_div_inverse binv;
++  size_t sn;
++  size_t i;
++
++  mpn_div_qr_1_invert (&binv, base);
++
++  sn = 0;
++
++  if (un > 1)
++    {
++      struct gmp_div_inverse bbinv;
++      mpn_div_qr_1_invert (&bbinv, info->bb);
++
++      do
++	{
++	  mp_limb_t w;
++	  size_t done;
++	  w = mpn_div_qr_1_preinv (up, up, un, &bbinv);
++	  un -= (up[un-1] == 0);
++	  done = mpn_limb_get_str (sp + sn, w, &binv);
++
++	  for (sn += done; done < info->exp; done++)
++	    sp[sn++] = 0;
++	}
++      while (un > 1);
++    }
++  sn += mpn_limb_get_str (sp + sn, up[0], &binv);
++
++  /* Reverse order */
++  for (i = 0; 2*i + 1 < sn; i++)
++    {
++      unsigned char t = sp[i];
++      sp[i] = sp[sn - i - 1];
++      sp[sn - i - 1] = t;
++    }
++
++  return sn;
++}
++
++size_t
++mpn_get_str (unsigned char *sp, int base, mp_ptr up, mp_size_t un)
++{
++  unsigned bits;
++
++  assert (un > 0);
++  assert (up[un-1] > 0);
++
++  bits = mpn_base_power_of_two_p (base);
++  if (bits)
++    return mpn_get_str_bits (sp, bits, up, un);
++  else
++    {
++      struct mpn_base_info info;
++
++      mpn_get_base_info (&info, base);
++      return mpn_get_str_other (sp, base, &info, up, un);
++    }
++}
++
++static mp_size_t
++mpn_set_str_bits (mp_ptr rp, const unsigned char *sp, size_t sn,
++		  unsigned bits)
++{
++  mp_size_t rn;
++  size_t j;
++  unsigned shift;
++
++  for (j = sn, rn = 0, shift = 0; j-- > 0; )
++    {
++      if (shift == 0)
++	{
++	  rp[rn++] = sp[j];
++	  shift += bits;
++	}
++      else
++	{
++	  rp[rn-1] |= (mp_limb_t) sp[j] << shift;
++	  shift += bits;
++	  if (shift >= GMP_LIMB_BITS)
++	    {
++	      shift -= GMP_LIMB_BITS;
++	      if (shift > 0)
++		rp[rn++] = (mp_limb_t) sp[j] >> (bits - shift);
++	    }
++	}
++    }
++  rn = mpn_normalized_size (rp, rn);
++  return rn;
++}
++
++static mp_size_t
++mpn_set_str_other (mp_ptr rp, const unsigned char *sp, size_t sn,
++		   mp_limb_t b, const struct mpn_base_info *info)
++{
++  mp_size_t rn;
++  mp_limb_t w;
++  unsigned k;
++  size_t j;
++
++  k = 1 + (sn - 1) % info->exp;
++
++  j = 0;
++  w = sp[j++];
++  for (; --k > 0; )
++    w = w * b + sp[j++];
++
++  rp[0] = w;
++
++  for (rn = (w > 0); j < sn;)
++    {
++      mp_limb_t cy;
++
++      w = sp[j++];
++      for (k = 1; k < info->exp; k++)
++	w = w * b + sp[j++];
++
++      cy = mpn_mul_1 (rp, rp, rn, info->bb);
++      cy += mpn_add_1 (rp, rp, rn, w);
++      if (cy > 0)
++	rp[rn++] = cy;
++    }
++  assert (j == sn);
++
++  return rn;
++}
++
++mp_size_t
++mpn_set_str (mp_ptr rp, const unsigned char *sp, size_t sn, int base)
++{
++  unsigned bits;
++
++  if (sn == 0)
++    return 0;
++
++  bits = mpn_base_power_of_two_p (base);
++  if (bits)
++    return mpn_set_str_bits (rp, sp, sn, bits);
++  else
++    {
++      struct mpn_base_info info;
++
++      mpn_get_base_info (&info, base);
++      return mpn_set_str_other (rp, sp, sn, base, &info);
++    }
++}
++
++
++/* MPZ interface */
++void
++mpz_init (mpz_t r)
++{
++  r->_mp_alloc = 1;
++  r->_mp_size = 0;
++  r->_mp_d = gmp_xalloc_limbs (1);
++}
++
++/* The utility of this function is a bit limited, since many functions
++   assigns the result variable using mpz_swap. */
++void
++mpz_init2 (mpz_t r, mp_bitcnt_t bits)
++{
++  mp_size_t rn;
++
++  bits -= (bits != 0);		/* Round down, except if 0 */
++  rn = 1 + bits / GMP_LIMB_BITS;
++
++  r->_mp_alloc = rn;
++  r->_mp_size = 0;
++  r->_mp_d = gmp_xalloc_limbs (rn);
++}
++
++void
++mpz_clear (mpz_t r)
++{
++  gmp_free (r->_mp_d);
++}
++
++static void *
++mpz_realloc (mpz_t r, mp_size_t size)
++{
++  size = GMP_MAX (size, 1);
++
++  r->_mp_d = gmp_xrealloc_limbs (r->_mp_d, size);
++  r->_mp_alloc = size;
++
++  if (GMP_ABS (r->_mp_size) > size)
++    r->_mp_size = 0;
++
++  return r->_mp_d;
++}
++
++/* Realloc for an mpz_t WHAT if it has less than NEEDED limbs.  */
++#define MPZ_REALLOC(z,n) ((n) > (z)->_mp_alloc			\
++			  ? mpz_realloc(z,n)			\
++			  : (z)->_mp_d)
++
++/* MPZ assignment and basic conversions. */
++void
++mpz_set_si (mpz_t r, signed long int x)
++{
++  if (x >= 0)
++    mpz_set_ui (r, x);
++  else /* (x < 0) */
++    {
++      r->_mp_size = -1;
++      r->_mp_d[0] = GMP_NEG_CAST (unsigned long int, x);
++    }
++}
++
++void
++mpz_set_ui (mpz_t r, unsigned long int x)
++{
++  if (x > 0)
++    {
++      r->_mp_size = 1;
++      r->_mp_d[0] = x;
++    }
++  else
++    r->_mp_size = 0;
++}
++
++void
++mpz_set (mpz_t r, const mpz_t x)
++{
++  /* Allow the NOP r == x */
++  if (r != x)
++    {
++      mp_size_t n;
++      mp_ptr rp;
++
++      n = GMP_ABS (x->_mp_size);
++      rp = MPZ_REALLOC (r, n);
++
++      mpn_copyi (rp, x->_mp_d, n);
++      r->_mp_size = x->_mp_size;
++    }
++}
++
++void
++mpz_init_set_si (mpz_t r, signed long int x)
++{
++  mpz_init (r);
++  mpz_set_si (r, x);
++}
++
++void
++mpz_init_set_ui (mpz_t r, unsigned long int x)
++{
++  mpz_init (r);
++  mpz_set_ui (r, x);
++}
++
++void
++mpz_init_set (mpz_t r, const mpz_t x)
++{
++  mpz_init (r);
++  mpz_set (r, x);
++}
++
++int
++mpz_fits_slong_p (const mpz_t u)
++{
++  mp_size_t us = u->_mp_size;
++
++  if (us == 0)
++    return 1;
++  else if (us == 1)
++    return u->_mp_d[0] < GMP_LIMB_HIGHBIT;
++  else if (us == -1)
++    return u->_mp_d[0] <= GMP_LIMB_HIGHBIT;
++  else
++    return 0;
++}
++
++int
++mpz_fits_ulong_p (const mpz_t u)
++{
++  mp_size_t us = u->_mp_size;
++
++  return (us == (us > 0));
++}
++
++long int
++mpz_get_si (const mpz_t u)
++{
++  mp_size_t us = u->_mp_size;
++
++  if (us > 0)
++    return (long) (u->_mp_d[0] & ~GMP_LIMB_HIGHBIT);
++  else if (us < 0)
++    return (long) (- u->_mp_d[0] | GMP_LIMB_HIGHBIT);
++  else
++    return 0;
++}
++
++unsigned long int
++mpz_get_ui (const mpz_t u)
++{
++  return u->_mp_size == 0 ? 0 : u->_mp_d[0];
++}
++
++size_t
++mpz_size (const mpz_t u)
++{
++  return GMP_ABS (u->_mp_size);
++}
++
++mp_limb_t
++mpz_getlimbn (const mpz_t u, mp_size_t n)
++{
++  if (n >= 0 && n < GMP_ABS (u->_mp_size))
++    return u->_mp_d[n];
++  else
++    return 0;
++}
++
++void
++mpz_realloc2 (mpz_t x, mp_bitcnt_t n)
++{
++  mpz_realloc (x, 1 + (n - (n != 0)) / GMP_LIMB_BITS);
++}
++
++mp_srcptr
++mpz_limbs_read (mpz_srcptr x)
++{
++  return x->_mp_d;;
++}
++
++mp_ptr
++mpz_limbs_modify (mpz_t x, mp_size_t n)
++{
++  assert (n > 0);
++  return MPZ_REALLOC (x, n);
++}
++
++mp_ptr
++mpz_limbs_write (mpz_t x, mp_size_t n)
++{
++  return mpz_limbs_modify (x, n);
++}
++
++void
++mpz_limbs_finish (mpz_t x, mp_size_t xs)
++{
++  mp_size_t xn;
++  xn = mpn_normalized_size (x->_mp_d, GMP_ABS (xs));
++  x->_mp_size = xs < 0 ? -xn : xn;
++}
++
++mpz_srcptr
++mpz_roinit_n (mpz_t x, mp_srcptr xp, mp_size_t xs)
++{
++  x->_mp_alloc = 0;
++  x->_mp_d = (mp_ptr) xp;
++  mpz_limbs_finish (x, xs);
++  return x;
++}
++
++
++/* Conversions and comparison to double. */
++void
++mpz_set_d (mpz_t r, double x)
++{
++  int sign;
++  mp_ptr rp;
++  mp_size_t rn, i;
++  double B;
++  double Bi;
++  mp_limb_t f;
++
++  /* x != x is true when x is a NaN, and x == x * 0.5 is true when x is
++     zero or infinity. */
++  if (x != x || x == x * 0.5)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++
++  sign = x < 0.0 ;
++  if (sign)
++    x = - x;
++
++  if (x < 1.0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++  B = 2.0 * (double) GMP_LIMB_HIGHBIT;
++  Bi = 1.0 / B;
++  for (rn = 1; x >= B; rn++)
++    x *= Bi;
++
++  rp = MPZ_REALLOC (r, rn);
++
++  f = (mp_limb_t) x;
++  x -= f;
++  assert (x < 1.0);
++  i = rn-1;
++  rp[i] = f;
++  while (--i >= 0)
++    {
++      x = B * x;
++      f = (mp_limb_t) x;
++      x -= f;
++      assert (x < 1.0);
++      rp[i] = f;
++    }
++
++  r->_mp_size = sign ? - rn : rn;
++}
++
++void
++mpz_init_set_d (mpz_t r, double x)
++{
++  mpz_init (r);
++  mpz_set_d (r, x);
++}
++
++double
++mpz_get_d (const mpz_t u)
++{
++  mp_size_t un;
++  double x;
++  double B = 2.0 * (double) GMP_LIMB_HIGHBIT;
++
++  un = GMP_ABS (u->_mp_size);
++
++  if (un == 0)
++    return 0.0;
++
++  x = u->_mp_d[--un];
++  while (un > 0)
++    x = B*x + u->_mp_d[--un];
++
++  if (u->_mp_size < 0)
++    x = -x;
++
++  return x;
++}
++
++int
++mpz_cmpabs_d (const mpz_t x, double d)
++{
++  mp_size_t xn;
++  double B, Bi;
++  mp_size_t i;
++
++  xn = x->_mp_size;
++  d = GMP_ABS (d);
++
++  if (xn != 0)
++    {
++      xn = GMP_ABS (xn);
++
++      B = 2.0 * (double) GMP_LIMB_HIGHBIT;
++      Bi = 1.0 / B;
++
++      /* Scale d so it can be compared with the top limb. */
++      for (i = 1; i < xn; i++)
++	d *= Bi;
++
++      if (d >= B)
++	return -1;
++
++      /* Compare floor(d) to top limb, subtract and cancel when equal. */
++      for (i = xn; i-- > 0;)
++	{
++	  mp_limb_t f, xl;
++
++	  f = (mp_limb_t) d;
++	  xl = x->_mp_d[i];
++	  if (xl > f)
++	    return 1;
++	  else if (xl < f)
++	    return -1;
++	  d = B * (d - f);
++	}
++    }
++  return - (d > 0.0);
++}
++
++int
++mpz_cmp_d (const mpz_t x, double d)
++{
++  if (x->_mp_size < 0)
++    {
++      if (d >= 0.0)
++	return -1;
++      else
++	return -mpz_cmpabs_d (x, d);
++    }
++  else
++    {
++      if (d < 0.0)
++	return 1;
++      else
++	return mpz_cmpabs_d (x, d);
++    }
++}
++
++
++/* MPZ comparisons and the like. */
++int
++mpz_sgn (const mpz_t u)
++{
++  mp_size_t usize = u->_mp_size;
++
++  return (usize > 0) - (usize < 0);
++}
++
++int
++mpz_cmp_si (const mpz_t u, long v)
++{
++  mp_size_t usize = u->_mp_size;
++
++  if (usize < -1)
++    return -1;
++  else if (v >= 0)
++    return mpz_cmp_ui (u, v);
++  else if (usize >= 0)
++    return 1;
++  else /* usize == -1 */
++    {
++      mp_limb_t ul = u->_mp_d[0];
++      if ((mp_limb_t)GMP_NEG_CAST (unsigned long int, v) < ul)
++	return -1;
++      else
++	return (mp_limb_t)GMP_NEG_CAST (unsigned long int, v) > ul;
++    }
++}
++
++int
++mpz_cmp_ui (const mpz_t u, unsigned long v)
++{
++  mp_size_t usize = u->_mp_size;
++
++  if (usize > 1)
++    return 1;
++  else if (usize < 0)
++    return -1;
++  else
++    {
++      mp_limb_t ul = (usize > 0) ? u->_mp_d[0] : 0;
++      return (ul > v) - (ul < v);
++    }
++}
++
++int
++mpz_cmp (const mpz_t a, const mpz_t b)
++{
++  mp_size_t asize = a->_mp_size;
++  mp_size_t bsize = b->_mp_size;
++
++  if (asize != bsize)
++    return (asize < bsize) ? -1 : 1;
++  else if (asize >= 0)
++    return mpn_cmp (a->_mp_d, b->_mp_d, asize);
++  else
++    return mpn_cmp (b->_mp_d, a->_mp_d, -asize);
++}
++
++int
++mpz_cmpabs_ui (const mpz_t u, unsigned long v)
++{
++  mp_size_t un = GMP_ABS (u->_mp_size);
++  mp_limb_t ul;
++
++  if (un > 1)
++    return 1;
++
++  ul = (un == 1) ? u->_mp_d[0] : 0;
++
++  return (ul > v) - (ul < v);
++}
++
++int
++mpz_cmpabs (const mpz_t u, const mpz_t v)
++{
++  return mpn_cmp4 (u->_mp_d, GMP_ABS (u->_mp_size),
++		   v->_mp_d, GMP_ABS (v->_mp_size));
++}
++
++void
++mpz_abs (mpz_t r, const mpz_t u)
++{
++  if (r != u)
++    mpz_set (r, u);
++
++  r->_mp_size = GMP_ABS (r->_mp_size);
++}
++
++void
++mpz_neg (mpz_t r, const mpz_t u)
++{
++  if (r != u)
++    mpz_set (r, u);
++
++  r->_mp_size = -r->_mp_size;
++}
++
++void
++mpz_swap (mpz_t u, mpz_t v)
++{
++  MP_SIZE_T_SWAP (u->_mp_size, v->_mp_size);
++  MP_SIZE_T_SWAP (u->_mp_alloc, v->_mp_alloc);
++  MP_PTR_SWAP (u->_mp_d, v->_mp_d);
++}
++
++
++/* MPZ addition and subtraction */
++
++/* Adds to the absolute value. Returns new size, but doesn't store it. */
++static mp_size_t
++mpz_abs_add_ui (mpz_t r, const mpz_t a, unsigned long b)
++{
++  mp_size_t an;
++  mp_ptr rp;
++  mp_limb_t cy;
++
++  an = GMP_ABS (a->_mp_size);
++  if (an == 0)
++    {
++      r->_mp_d[0] = b;
++      return b > 0;
++    }
++
++  rp = MPZ_REALLOC (r, an + 1);
++
++  cy = mpn_add_1 (rp, a->_mp_d, an, b);
++  rp[an] = cy;
++  an += cy;
++
++  return an;
++}
++
++/* Subtract from the absolute value. Returns new size, (or -1 on underflow),
++   but doesn't store it. */
++static mp_size_t
++mpz_abs_sub_ui (mpz_t r, const mpz_t a, unsigned long b)
++{
++  mp_size_t an = GMP_ABS (a->_mp_size);
++  mp_ptr rp = MPZ_REALLOC (r, an);
++
++  if (an == 0)
++    {
++      rp[0] = b;
++      return -(b > 0);
++    }
++  else if (an == 1 && a->_mp_d[0] < b)
++    {
++      rp[0] = b - a->_mp_d[0];
++      return -1;
++    }
++  else
++    {
++      gmp_assert_nocarry (mpn_sub_1 (rp, a->_mp_d, an, b));
++      return mpn_normalized_size (rp, an);
++    }
++}
++
++void
++mpz_add_ui (mpz_t r, const mpz_t a, unsigned long b)
++{
++  if (a->_mp_size >= 0)
++    r->_mp_size = mpz_abs_add_ui (r, a, b);
++  else
++    r->_mp_size = -mpz_abs_sub_ui (r, a, b);
++}
++
++void
++mpz_sub_ui (mpz_t r, const mpz_t a, unsigned long b)
++{
++  if (a->_mp_size < 0)
++    r->_mp_size = -mpz_abs_add_ui (r, a, b);
++  else
++    r->_mp_size = mpz_abs_sub_ui (r, a, b);
++}
++
++void
++mpz_ui_sub (mpz_t r, unsigned long a, const mpz_t b)
++{
++  if (b->_mp_size < 0)
++    r->_mp_size = mpz_abs_add_ui (r, b, a);
++  else
++    r->_mp_size = -mpz_abs_sub_ui (r, b, a);
++}
++
++static mp_size_t
++mpz_abs_add (mpz_t r, const mpz_t a, const mpz_t b)
++{
++  mp_size_t an = GMP_ABS (a->_mp_size);
++  mp_size_t bn = GMP_ABS (b->_mp_size);
++  mp_ptr rp;
++  mp_limb_t cy;
++
++  if (an < bn)
++    {
++      MPZ_SRCPTR_SWAP (a, b);
++      MP_SIZE_T_SWAP (an, bn);
++    }
++
++  rp = MPZ_REALLOC (r, an + 1);
++  cy = mpn_add (rp, a->_mp_d, an, b->_mp_d, bn);
++
++  rp[an] = cy;
++
++  return an + cy;
++}
++
++static mp_size_t
++mpz_abs_sub (mpz_t r, const mpz_t a, const mpz_t b)
++{
++  mp_size_t an = GMP_ABS (a->_mp_size);
++  mp_size_t bn = GMP_ABS (b->_mp_size);
++  int cmp;
++  mp_ptr rp;
++
++  cmp = mpn_cmp4 (a->_mp_d, an, b->_mp_d, bn);
++  if (cmp > 0)
++    {
++      rp = MPZ_REALLOC (r, an);
++      gmp_assert_nocarry (mpn_sub (rp, a->_mp_d, an, b->_mp_d, bn));
++      return mpn_normalized_size (rp, an);
++    }
++  else if (cmp < 0)
++    {
++      rp = MPZ_REALLOC (r, bn);
++      gmp_assert_nocarry (mpn_sub (rp, b->_mp_d, bn, a->_mp_d, an));
++      return -mpn_normalized_size (rp, bn);
++    }
++  else
++    return 0;
++}
++
++void
++mpz_add (mpz_t r, const mpz_t a, const mpz_t b)
++{
++  mp_size_t rn;
++
++  if ( (a->_mp_size ^ b->_mp_size) >= 0)
++    rn = mpz_abs_add (r, a, b);
++  else
++    rn = mpz_abs_sub (r, a, b);
++
++  r->_mp_size = a->_mp_size >= 0 ? rn : - rn;
++}
++
++void
++mpz_sub (mpz_t r, const mpz_t a, const mpz_t b)
++{
++  mp_size_t rn;
++
++  if ( (a->_mp_size ^ b->_mp_size) >= 0)
++    rn = mpz_abs_sub (r, a, b);
++  else
++    rn = mpz_abs_add (r, a, b);
++
++  r->_mp_size = a->_mp_size >= 0 ? rn : - rn;
++}
++
++
++/* MPZ multiplication */
++void
++mpz_mul_si (mpz_t r, const mpz_t u, long int v)
++{
++  if (v < 0)
++    {
++      mpz_mul_ui (r, u, GMP_NEG_CAST (unsigned long int, v));
++      mpz_neg (r, r);
++    }
++  else
++    mpz_mul_ui (r, u, (unsigned long int) v);
++}
++
++void
++mpz_mul_ui (mpz_t r, const mpz_t u, unsigned long int v)
++{
++  mp_size_t un, us;
++  mp_ptr tp;
++  mp_limb_t cy;
++
++  us = u->_mp_size;
++
++  if (us == 0 || v == 0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++
++  un = GMP_ABS (us);
++
++  tp = MPZ_REALLOC (r, un + 1);
++  cy = mpn_mul_1 (tp, u->_mp_d, un, v);
++  tp[un] = cy;
++
++  un += (cy > 0);
++  r->_mp_size = (us < 0) ? - un : un;
++}
++
++void
++mpz_mul (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  int sign;
++  mp_size_t un, vn, rn;
++  mpz_t t;
++  mp_ptr tp;
++
++  un = u->_mp_size;
++  vn = v->_mp_size;
++
++  if (un == 0 || vn == 0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++
++  sign = (un ^ vn) < 0;
++
++  un = GMP_ABS (un);
++  vn = GMP_ABS (vn);
++
++  mpz_init2 (t, (un + vn) * GMP_LIMB_BITS);
++
++  tp = t->_mp_d;
++  if (un >= vn)
++    mpn_mul (tp, u->_mp_d, un, v->_mp_d, vn);
++  else
++    mpn_mul (tp, v->_mp_d, vn, u->_mp_d, un);
++
++  rn = un + vn;
++  rn -= tp[rn-1] == 0;
++
++  t->_mp_size = sign ? - rn : rn;
++  mpz_swap (r, t);
++  mpz_clear (t);
++}
++
++void
++mpz_mul_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t bits)
++{
++  mp_size_t un, rn;
++  mp_size_t limbs;
++  unsigned shift;
++  mp_ptr rp;
++
++  un = GMP_ABS (u->_mp_size);
++  if (un == 0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++
++  limbs = bits / GMP_LIMB_BITS;
++  shift = bits % GMP_LIMB_BITS;
++
++  rn = un + limbs + (shift > 0);
++  rp = MPZ_REALLOC (r, rn);
++  if (shift > 0)
++    {
++      mp_limb_t cy = mpn_lshift (rp + limbs, u->_mp_d, un, shift);
++      rp[rn-1] = cy;
++      rn -= (cy == 0);
++    }
++  else
++    mpn_copyd (rp + limbs, u->_mp_d, un);
++
++  while (limbs > 0)
++    rp[--limbs] = 0;
++
++  r->_mp_size = (u->_mp_size < 0) ? - rn : rn;
++}
++
++void
++mpz_addmul_ui (mpz_t r, const mpz_t u, unsigned long int v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul_ui (t, u, v);
++  mpz_add (r, r, t);
++  mpz_clear (t);
++}
++
++void
++mpz_submul_ui (mpz_t r, const mpz_t u, unsigned long int v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul_ui (t, u, v);
++  mpz_sub (r, r, t);
++  mpz_clear (t);
++}
++
++void
++mpz_addmul (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul (t, u, v);
++  mpz_add (r, r, t);
++  mpz_clear (t);
++}
++
++void
++mpz_submul (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mpz_t t;
++  mpz_init (t);
++  mpz_mul (t, u, v);
++  mpz_sub (r, r, t);
++  mpz_clear (t);
++}
++
++
++/* MPZ division */
++enum mpz_div_round_mode { GMP_DIV_FLOOR, GMP_DIV_CEIL, GMP_DIV_TRUNC };
++
++/* Allows q or r to be zero. Returns 1 iff remainder is non-zero. */
++static int
++mpz_div_qr (mpz_t q, mpz_t r,
++	    const mpz_t n, const mpz_t d, enum mpz_div_round_mode mode)
++{
++  mp_size_t ns, ds, nn, dn, qs;
++  ns = n->_mp_size;
++  ds = d->_mp_size;
++
++  if (ds == 0)
++    gmp_die("mpz_div_qr: Divide by zero.");
++
++  if (ns == 0)
++    {
++      if (q)
++	q->_mp_size = 0;
++      if (r)
++	r->_mp_size = 0;
++      return 0;
++    }
++
++  nn = GMP_ABS (ns);
++  dn = GMP_ABS (ds);
++
++  qs = ds ^ ns;
++
++  if (nn < dn)
++    {
++      if (mode == GMP_DIV_CEIL && qs >= 0)
++	{
++	  /* q = 1, r = n - d */
++	  if (r)
++	    mpz_sub (r, n, d);
++	  if (q)
++	    mpz_set_ui (q, 1);
++	}
++      else if (mode == GMP_DIV_FLOOR && qs < 0)
++	{
++	  /* q = -1, r = n + d */
++	  if (r)
++	    mpz_add (r, n, d);
++	  if (q)
++	    mpz_set_si (q, -1);
++	}
++      else
++	{
++	  /* q = 0, r = d */
++	  if (r)
++	    mpz_set (r, n);
++	  if (q)
++	    q->_mp_size = 0;
++	}
++      return 1;
++    }
++  else
++    {
++      mp_ptr np, qp;
++      mp_size_t qn, rn;
++      mpz_t tq, tr;
++
++      mpz_init_set (tr, n);
++      np = tr->_mp_d;
++
++      qn = nn - dn + 1;
++
++      if (q)
++	{
++	  mpz_init2 (tq, qn * GMP_LIMB_BITS);
++	  qp = tq->_mp_d;
++	}
++      else
++	qp = NULL;
++
++      mpn_div_qr (qp, np, nn, d->_mp_d, dn);
++
++      if (qp)
++	{
++	  qn -= (qp[qn-1] == 0);
++
++	  tq->_mp_size = qs < 0 ? -qn : qn;
++	}
++      rn = mpn_normalized_size (np, dn);
++      tr->_mp_size = ns < 0 ? - rn : rn;
++
++      if (mode == GMP_DIV_FLOOR && qs < 0 && rn != 0)
++	{
++	  if (q)
++	    mpz_sub_ui (tq, tq, 1);
++	  if (r)
++	    mpz_add (tr, tr, d);
++	}
++      else if (mode == GMP_DIV_CEIL && qs >= 0 && rn != 0)
++	{
++	  if (q)
++	    mpz_add_ui (tq, tq, 1);
++	  if (r)
++	    mpz_sub (tr, tr, d);
++	}
++
++      if (q)
++	{
++	  mpz_swap (tq, q);
++	  mpz_clear (tq);
++	}
++      if (r)
++	mpz_swap (tr, r);
++
++      mpz_clear (tr);
++
++      return rn != 0;
++    }
++}
++
++void
++mpz_cdiv_qr (mpz_t q, mpz_t r, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (q, r, n, d, GMP_DIV_CEIL);
++}
++
++void
++mpz_fdiv_qr (mpz_t q, mpz_t r, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (q, r, n, d, GMP_DIV_FLOOR);
++}
++
++void
++mpz_tdiv_qr (mpz_t q, mpz_t r, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (q, r, n, d, GMP_DIV_TRUNC);
++}
++
++void
++mpz_cdiv_q (mpz_t q, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (q, NULL, n, d, GMP_DIV_CEIL);
++}
++
++void
++mpz_fdiv_q (mpz_t q, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (q, NULL, n, d, GMP_DIV_FLOOR);
++}
++
++void
++mpz_tdiv_q (mpz_t q, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (q, NULL, n, d, GMP_DIV_TRUNC);
++}
++
++void
++mpz_cdiv_r (mpz_t r, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (NULL, r, n, d, GMP_DIV_CEIL);
++}
++
++void
++mpz_fdiv_r (mpz_t r, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (NULL, r, n, d, GMP_DIV_FLOOR);
++}
++
++void
++mpz_tdiv_r (mpz_t r, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (NULL, r, n, d, GMP_DIV_TRUNC);
++}
++
++void
++mpz_mod (mpz_t r, const mpz_t n, const mpz_t d)
++{
++  mpz_div_qr (NULL, r, n, d, d->_mp_size >= 0 ? GMP_DIV_FLOOR : GMP_DIV_CEIL);
++}
++
++static void
++mpz_div_q_2exp (mpz_t q, const mpz_t u, mp_bitcnt_t bit_index,
++		enum mpz_div_round_mode mode)
++{
++  mp_size_t un, qn;
++  mp_size_t limb_cnt;
++  mp_ptr qp;
++  int adjust;
++
++  un = u->_mp_size;
++  if (un == 0)
++    {
++      q->_mp_size = 0;
++      return;
++    }
++  limb_cnt = bit_index / GMP_LIMB_BITS;
++  qn = GMP_ABS (un) - limb_cnt;
++  bit_index %= GMP_LIMB_BITS;
++
++  if (mode == ((un > 0) ? GMP_DIV_CEIL : GMP_DIV_FLOOR)) /* un != 0 here. */
++    /* Note: Below, the final indexing at limb_cnt is valid because at
++       that point we have qn > 0. */
++    adjust = (qn <= 0
++	      || !mpn_zero_p (u->_mp_d, limb_cnt)
++	      || (u->_mp_d[limb_cnt]
++		  & (((mp_limb_t) 1 << bit_index) - 1)));
++  else
++    adjust = 0;
++
++  if (qn <= 0)
++    qn = 0;
++
++  else
++    {
++      qp = MPZ_REALLOC (q, qn);
++
++      if (bit_index != 0)
++	{
++	  mpn_rshift (qp, u->_mp_d + limb_cnt, qn, bit_index);
++	  qn -= qp[qn - 1] == 0;
++	}
++      else
++	{
++	  mpn_copyi (qp, u->_mp_d + limb_cnt, qn);
++	}
++    }
++
++  q->_mp_size = qn;
++
++  if (adjust)
++    mpz_add_ui (q, q, 1);
++  if (un < 0)
++    mpz_neg (q, q);
++}
++
++static void
++mpz_div_r_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t bit_index,
++		enum mpz_div_round_mode mode)
++{
++  mp_size_t us, un, rn;
++  mp_ptr rp;
++  mp_limb_t mask;
++
++  us = u->_mp_size;
++  if (us == 0 || bit_index == 0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++  rn = (bit_index + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS;
++  assert (rn > 0);
++
++  rp = MPZ_REALLOC (r, rn);
++  un = GMP_ABS (us);
++
++  mask = GMP_LIMB_MAX >> (rn * GMP_LIMB_BITS - bit_index);
++
++  if (rn > un)
++    {
++      /* Quotient (with truncation) is zero, and remainder is
++	 non-zero */
++      if (mode == ((us > 0) ? GMP_DIV_CEIL : GMP_DIV_FLOOR)) /* us != 0 here. */
++	{
++	  /* Have to negate and sign extend. */
++	  mp_size_t i;
++	  mp_limb_t cy;
++
++	  for (cy = 1, i = 0; i < un; i++)
++	    {
++	      mp_limb_t s = ~u->_mp_d[i] + cy;
++	      cy = s < cy;
++	      rp[i] = s;
++	    }
++	  assert (cy == 0);
++	  for (; i < rn - 1; i++)
++	    rp[i] = GMP_LIMB_MAX;
++
++	  rp[rn-1] = mask;
++	  us = -us;
++	}
++      else
++	{
++	  /* Just copy */
++	  if (r != u)
++	    mpn_copyi (rp, u->_mp_d, un);
++
++	  rn = un;
++	}
++    }
++  else
++    {
++      if (r != u)
++	mpn_copyi (rp, u->_mp_d, rn - 1);
++
++      rp[rn-1] = u->_mp_d[rn-1] & mask;
++
++      if (mode == ((us > 0) ? GMP_DIV_CEIL : GMP_DIV_FLOOR)) /* us != 0 here. */
++	{
++	  /* If r != 0, compute 2^{bit_count} - r. */
++	  mp_size_t i;
++
++	  for (i = 0; i < rn && rp[i] == 0; i++)
++	    ;
++	  if (i < rn)
++	    {
++	      /* r > 0, need to flip sign. */
++	      rp[i] = ~rp[i] + 1;
++	      while (++i < rn)
++		rp[i] = ~rp[i];
++
++	      rp[rn-1] &= mask;
++
++	      /* us is not used for anything else, so we can modify it
++		 here to indicate flipped sign. */
++	      us = -us;
++	    }
++	}
++    }
++  rn = mpn_normalized_size (rp, rn);
++  r->_mp_size = us < 0 ? -rn : rn;
++}
++
++void
++mpz_cdiv_q_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t cnt)
++{
++  mpz_div_q_2exp (r, u, cnt, GMP_DIV_CEIL);
++}
++
++void
++mpz_fdiv_q_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t cnt)
++{
++  mpz_div_q_2exp (r, u, cnt, GMP_DIV_FLOOR);
++}
++
++void
++mpz_tdiv_q_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t cnt)
++{
++  mpz_div_q_2exp (r, u, cnt, GMP_DIV_TRUNC);
++}
++
++void
++mpz_cdiv_r_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t cnt)
++{
++  mpz_div_r_2exp (r, u, cnt, GMP_DIV_CEIL);
++}
++
++void
++mpz_fdiv_r_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t cnt)
++{
++  mpz_div_r_2exp (r, u, cnt, GMP_DIV_FLOOR);
++}
++
++void
++mpz_tdiv_r_2exp (mpz_t r, const mpz_t u, mp_bitcnt_t cnt)
++{
++  mpz_div_r_2exp (r, u, cnt, GMP_DIV_TRUNC);
++}
++
++void
++mpz_divexact (mpz_t q, const mpz_t n, const mpz_t d)
++{
++  gmp_assert_nocarry (mpz_div_qr (q, NULL, n, d, GMP_DIV_TRUNC));
++}
++
++int
++mpz_divisible_p (const mpz_t n, const mpz_t d)
++{
++  return mpz_div_qr (NULL, NULL, n, d, GMP_DIV_TRUNC) == 0;
++}
++
++int
++mpz_congruent_p (const mpz_t a, const mpz_t b, const mpz_t m)
++{
++  mpz_t t;
++  int res;
++
++  /* a == b (mod 0) iff a == b */
++  if (mpz_sgn (m) == 0)
++    return (mpz_cmp (a, b) == 0);
++
++  mpz_init (t);
++  mpz_sub (t, a, b);
++  res = mpz_divisible_p (t, m);
++  mpz_clear (t);
++
++  return res;
++}
++
++static unsigned long
++mpz_div_qr_ui (mpz_t q, mpz_t r,
++	       const mpz_t n, unsigned long d, enum mpz_div_round_mode mode)
++{
++  mp_size_t ns, qn;
++  mp_ptr qp;
++  mp_limb_t rl;
++  mp_size_t rs;
++
++  ns = n->_mp_size;
++  if (ns == 0)
++    {
++      if (q)
++	q->_mp_size = 0;
++      if (r)
++	r->_mp_size = 0;
++      return 0;
++    }
++
++  qn = GMP_ABS (ns);
++  if (q)
++    qp = MPZ_REALLOC (q, qn);
++  else
++    qp = NULL;
++
++  rl = mpn_div_qr_1 (qp, n->_mp_d, qn, d);
++  assert (rl < d);
++
++  rs = rl > 0;
++  rs = (ns < 0) ? -rs : rs;
++
++  if (rl > 0 && ( (mode == GMP_DIV_FLOOR && ns < 0)
++		  || (mode == GMP_DIV_CEIL && ns >= 0)))
++    {
++      if (q)
++	gmp_assert_nocarry (mpn_add_1 (qp, qp, qn, 1));
++      rl = d - rl;
++      rs = -rs;
++    }
++
++  if (r)
++    {
++      r->_mp_d[0] = rl;
++      r->_mp_size = rs;
++    }
++  if (q)
++    {
++      qn -= (qp[qn-1] == 0);
++      assert (qn == 0 || qp[qn-1] > 0);
++
++      q->_mp_size = (ns < 0) ? - qn : qn;
++    }
++
++  return rl;
++}
++
++unsigned long
++mpz_cdiv_qr_ui (mpz_t q, mpz_t r, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (q, r, n, d, GMP_DIV_CEIL);
++}
++
++unsigned long
++mpz_fdiv_qr_ui (mpz_t q, mpz_t r, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (q, r, n, d, GMP_DIV_FLOOR);
++}
++
++unsigned long
++mpz_tdiv_qr_ui (mpz_t q, mpz_t r, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (q, r, n, d, GMP_DIV_TRUNC);
++}
++
++unsigned long
++mpz_cdiv_q_ui (mpz_t q, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (q, NULL, n, d, GMP_DIV_CEIL);
++}
++
++unsigned long
++mpz_fdiv_q_ui (mpz_t q, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (q, NULL, n, d, GMP_DIV_FLOOR);
++}
++
++unsigned long
++mpz_tdiv_q_ui (mpz_t q, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (q, NULL, n, d, GMP_DIV_TRUNC);
++}
++
++unsigned long
++mpz_cdiv_r_ui (mpz_t r, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, r, n, d, GMP_DIV_CEIL);
++}
++unsigned long
++mpz_fdiv_r_ui (mpz_t r, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, r, n, d, GMP_DIV_FLOOR);
++}
++unsigned long
++mpz_tdiv_r_ui (mpz_t r, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, r, n, d, GMP_DIV_TRUNC);
++}
++
++unsigned long
++mpz_cdiv_ui (const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, NULL, n, d, GMP_DIV_CEIL);
++}
++
++unsigned long
++mpz_fdiv_ui (const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, NULL, n, d, GMP_DIV_FLOOR);
++}
++
++unsigned long
++mpz_tdiv_ui (const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, NULL, n, d, GMP_DIV_TRUNC);
++}
++
++unsigned long
++mpz_mod_ui (mpz_t r, const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, r, n, d, GMP_DIV_FLOOR);
++}
++
++void
++mpz_divexact_ui (mpz_t q, const mpz_t n, unsigned long d)
++{
++  gmp_assert_nocarry (mpz_div_qr_ui (q, NULL, n, d, GMP_DIV_TRUNC));
++}
++
++int
++mpz_divisible_ui_p (const mpz_t n, unsigned long d)
++{
++  return mpz_div_qr_ui (NULL, NULL, n, d, GMP_DIV_TRUNC) == 0;
++}
++
++
++/* GCD */
++static mp_limb_t
++mpn_gcd_11 (mp_limb_t u, mp_limb_t v)
++{
++  unsigned shift;
++
++  assert ( (u | v) > 0);
++
++  if (u == 0)
++    return v;
++  else if (v == 0)
++    return u;
++
++  gmp_ctz (shift, u | v);
++
++  u >>= shift;
++  v >>= shift;
++
++  if ( (u & 1) == 0)
++    MP_LIMB_T_SWAP (u, v);
++
++  while ( (v & 1) == 0)
++    v >>= 1;
++
++  while (u != v)
++    {
++      if (u > v)
++	{
++	  u -= v;
++	  do
++	    u >>= 1;
++	  while ( (u & 1) == 0);
++	}
++      else
++	{
++	  v -= u;
++	  do
++	    v >>= 1;
++	  while ( (v & 1) == 0);
++	}
++    }
++  return u << shift;
++}
++
++unsigned long
++mpz_gcd_ui (mpz_t g, const mpz_t u, unsigned long v)
++{
++  mp_size_t un;
++
++  if (v == 0)
++    {
++      if (g)
++	mpz_abs (g, u);
++    }
++  else
++    {
++      un = GMP_ABS (u->_mp_size);
++      if (un != 0)
++	v = mpn_gcd_11 (mpn_div_qr_1 (NULL, u->_mp_d, un, v), v);
++
++      if (g)
++	mpz_set_ui (g, v);
++    }
++
++  return v;
++}
++
++static mp_bitcnt_t
++mpz_make_odd (mpz_t r)
++{
++  mp_bitcnt_t shift;
++
++  assert (r->_mp_size > 0);
++  /* Count trailing zeros, equivalent to mpn_scan1, because we know that there is a 1 */
++  shift = mpn_common_scan (r->_mp_d[0], 0, r->_mp_d, 0, 0);
++  mpz_tdiv_q_2exp (r, r, shift);
++
++  return shift;
++}
++
++void
++mpz_gcd (mpz_t g, const mpz_t u, const mpz_t v)
++{
++  mpz_t tu, tv;
++  mp_bitcnt_t uz, vz, gz;
++
++  if (u->_mp_size == 0)
++    {
++      mpz_abs (g, v);
++      return;
++    }
++  if (v->_mp_size == 0)
++    {
++      mpz_abs (g, u);
++      return;
++    }
++
++  mpz_init (tu);
++  mpz_init (tv);
++
++  mpz_abs (tu, u);
++  uz = mpz_make_odd (tu);
++  mpz_abs (tv, v);
++  vz = mpz_make_odd (tv);
++  gz = GMP_MIN (uz, vz);
++
++  if (tu->_mp_size < tv->_mp_size)
++    mpz_swap (tu, tv);
++
++  mpz_tdiv_r (tu, tu, tv);
++  if (tu->_mp_size == 0)
++    {
++      mpz_swap (g, tv);
++    }
++  else
++    for (;;)
++      {
++	int c;
++
++	mpz_make_odd (tu);
++	c = mpz_cmp (tu, tv);
++	if (c == 0)
++	  {
++	    mpz_swap (g, tu);
++	    break;
++	  }
++	if (c < 0)
++	  mpz_swap (tu, tv);
++
++	if (tv->_mp_size == 1)
++	  {
++	    mp_limb_t vl = tv->_mp_d[0];
++	    mp_limb_t ul = mpz_tdiv_ui (tu, vl);
++	    mpz_set_ui (g, mpn_gcd_11 (ul, vl));
++	    break;
++	  }
++	mpz_sub (tu, tu, tv);
++      }
++  mpz_clear (tu);
++  mpz_clear (tv);
++  mpz_mul_2exp (g, g, gz);
++}
++
++void
++mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
++{
++  mpz_t tu, tv, s0, s1, t0, t1;
++  mp_bitcnt_t uz, vz, gz;
++  mp_bitcnt_t power;
++
++  if (u->_mp_size == 0)
++    {
++      /* g = 0 u + sgn(v) v */
++      signed long sign = mpz_sgn (v);
++      mpz_abs (g, v);
++      if (s)
++	mpz_set_ui (s, 0);
++      if (t)
++	mpz_set_si (t, sign);
++      return;
++    }
++
++  if (v->_mp_size == 0)
++    {
++      /* g = sgn(u) u + 0 v */
++      signed long sign = mpz_sgn (u);
++      mpz_abs (g, u);
++      if (s)
++	mpz_set_si (s, sign);
++      if (t)
++	mpz_set_ui (t, 0);
++      return;
++    }
++
++  mpz_init (tu);
++  mpz_init (tv);
++  mpz_init (s0);
++  mpz_init (s1);
++  mpz_init (t0);
++  mpz_init (t1);
++
++  mpz_abs (tu, u);
++  uz = mpz_make_odd (tu);
++  mpz_abs (tv, v);
++  vz = mpz_make_odd (tv);
++  gz = GMP_MIN (uz, vz);
++
++  uz -= gz;
++  vz -= gz;
++
++  /* Cofactors corresponding to odd gcd. gz handled later. */
++  if (tu->_mp_size < tv->_mp_size)
++    {
++      mpz_swap (tu, tv);
++      MPZ_SRCPTR_SWAP (u, v);
++      MPZ_PTR_SWAP (s, t);
++      MP_BITCNT_T_SWAP (uz, vz);
++    }
++
++  /* Maintain
++   *
++   * u = t0 tu + t1 tv
++   * v = s0 tu + s1 tv
++   *
++   * where u and v denote the inputs with common factors of two
++   * eliminated, and det (s0, t0; s1, t1) = 2^p. Then
++   *
++   * 2^p tu =  s1 u - t1 v
++   * 2^p tv = -s0 u + t0 v
++   */
++
++  /* After initial division, tu = q tv + tu', we have
++   *
++   * u = 2^uz (tu' + q tv)
++   * v = 2^vz tv
++   *
++   * or
++   *
++   * t0 = 2^uz, t1 = 2^uz q
++   * s0 = 0,    s1 = 2^vz
++   */
++
++  mpz_setbit (t0, uz);
++  mpz_tdiv_qr (t1, tu, tu, tv);
++  mpz_mul_2exp (t1, t1, uz);
++
++  mpz_setbit (s1, vz);
++  power = uz + vz;
++
++  if (tu->_mp_size > 0)
++    {
++      mp_bitcnt_t shift;
++      shift = mpz_make_odd (tu);
++      mpz_mul_2exp (t0, t0, shift);
++      mpz_mul_2exp (s0, s0, shift);
++      power += shift;
++
++      for (;;)
++	{
++	  int c;
++	  c = mpz_cmp (tu, tv);
++	  if (c == 0)
++	    break;
++
++	  if (c < 0)
++	    {
++	      /* tv = tv' + tu
++	       *
++	       * u = t0 tu + t1 (tv' + tu) = (t0 + t1) tu + t1 tv'
++	       * v = s0 tu + s1 (tv' + tu) = (s0 + s1) tu + s1 tv' */
++
++	      mpz_sub (tv, tv, tu);
++	      mpz_add (t0, t0, t1);
++	      mpz_add (s0, s0, s1);
++
++	      shift = mpz_make_odd (tv);
++	      mpz_mul_2exp (t1, t1, shift);
++	      mpz_mul_2exp (s1, s1, shift);
++	    }
++	  else
++	    {
++	      mpz_sub (tu, tu, tv);
++	      mpz_add (t1, t0, t1);
++	      mpz_add (s1, s0, s1);
++
++	      shift = mpz_make_odd (tu);
++	      mpz_mul_2exp (t0, t0, shift);
++	      mpz_mul_2exp (s0, s0, shift);
++	    }
++	  power += shift;
++	}
++    }
++
++  /* Now tv = odd part of gcd, and -s0 and t0 are corresponding
++     cofactors. */
++
++  mpz_mul_2exp (tv, tv, gz);
++  mpz_neg (s0, s0);
++
++  /* 2^p g = s0 u + t0 v. Eliminate one factor of two at a time. To
++     adjust cofactors, we need u / g and v / g */
++
++  mpz_divexact (s1, v, tv);
++  mpz_abs (s1, s1);
++  mpz_divexact (t1, u, tv);
++  mpz_abs (t1, t1);
++
++  while (power-- > 0)
++    {
++      /* s0 u + t0 v = (s0 - v/g) u - (t0 + u/g) v */
++      if (mpz_odd_p (s0) || mpz_odd_p (t0))
++	{
++	  mpz_sub (s0, s0, s1);
++	  mpz_add (t0, t0, t1);
++	}
++      mpz_divexact_ui (s0, s0, 2);
++      mpz_divexact_ui (t0, t0, 2);
++    }
++
++  /* Arrange so that |s| < |u| / 2g */
++  mpz_add (s1, s0, s1);
++  if (mpz_cmpabs (s0, s1) > 0)
++    {
++      mpz_swap (s0, s1);
++      mpz_sub (t0, t0, t1);
++    }
++  if (u->_mp_size < 0)
++    mpz_neg (s0, s0);
++  if (v->_mp_size < 0)
++    mpz_neg (t0, t0);
++
++  mpz_swap (g, tv);
++  if (s)
++    mpz_swap (s, s0);
++  if (t)
++    mpz_swap (t, t0);
++
++  mpz_clear (tu);
++  mpz_clear (tv);
++  mpz_clear (s0);
++  mpz_clear (s1);
++  mpz_clear (t0);
++  mpz_clear (t1);
++}
++
++void
++mpz_lcm (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mpz_t g;
++
++  if (u->_mp_size == 0 || v->_mp_size == 0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++
++  mpz_init (g);
++
++  mpz_gcd (g, u, v);
++  mpz_divexact (g, u, g);
++  mpz_mul (r, g, v);
++
++  mpz_clear (g);
++  mpz_abs (r, r);
++}
++
++void
++mpz_lcm_ui (mpz_t r, const mpz_t u, unsigned long v)
++{
++  if (v == 0 || u->_mp_size == 0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++
++  v /= mpz_gcd_ui (NULL, u, v);
++  mpz_mul_ui (r, u, v);
++
++  mpz_abs (r, r);
++}
++
++int
++mpz_invert (mpz_t r, const mpz_t u, const mpz_t m)
++{
++  mpz_t g, tr;
++  int invertible;
++
++  if (u->_mp_size == 0 || mpz_cmpabs_ui (m, 1) <= 0)
++    return 0;
++
++  mpz_init (g);
++  mpz_init (tr);
++
++  mpz_gcdext (g, tr, NULL, u, m);
++  invertible = (mpz_cmp_ui (g, 1) == 0);
++
++  if (invertible)
++    {
++      if (tr->_mp_size < 0)
++	{
++	  if (m->_mp_size >= 0)
++	    mpz_add (tr, tr, m);
++	  else
++	    mpz_sub (tr, tr, m);
++	}
++      mpz_swap (r, tr);
++    }
++
++  mpz_clear (g);
++  mpz_clear (tr);
++  return invertible;
++}
++
++
++/* Higher level operations (sqrt, pow and root) */
++
++void
++mpz_pow_ui (mpz_t r, const mpz_t b, unsigned long e)
++{
++  unsigned long bit;
++  mpz_t tr;
++  mpz_init_set_ui (tr, 1);
++
++  bit = GMP_ULONG_HIGHBIT;
++  do
++    {
++      mpz_mul (tr, tr, tr);
++      if (e & bit)
++	mpz_mul (tr, tr, b);
++      bit >>= 1;
++    }
++  while (bit > 0);
++
++  mpz_swap (r, tr);
++  mpz_clear (tr);
++}
++
++void
++mpz_ui_pow_ui (mpz_t r, unsigned long blimb, unsigned long e)
++{
++  mpz_t b;
++  mpz_init_set_ui (b, blimb);
++  mpz_pow_ui (r, b, e);
++  mpz_clear (b);
++}
++
++void
++mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
++{
++  mpz_t tr;
++  mpz_t base;
++  mp_size_t en, mn;
++  mp_srcptr mp;
++  struct gmp_div_inverse minv;
++  unsigned shift;
++  mp_ptr tp = NULL;
++
++  en = GMP_ABS (e->_mp_size);
++  mn = GMP_ABS (m->_mp_size);
++  if (mn == 0)
++    gmp_die ("mpz_powm: Zero modulo.");
++
++  if (en == 0)
++    {
++      mpz_set_ui (r, 1);
++      return;
++    }
++
++  mp = m->_mp_d;
++  mpn_div_qr_invert (&minv, mp, mn);
++  shift = minv.shift;
++
++  if (shift > 0)
++    {
++      /* To avoid shifts, we do all our reductions, except the final
++	 one, using a *normalized* m. */
++      minv.shift = 0;
++
++      tp = gmp_xalloc_limbs (mn);
++      gmp_assert_nocarry (mpn_lshift (tp, mp, mn, shift));
++      mp = tp;
++    }
++
++  mpz_init (base);
++
++  if (e->_mp_size < 0)
++    {
++      if (!mpz_invert (base, b, m))
++	gmp_die ("mpz_powm: Negative exponent and non-invertible base.");
++    }
++  else
++    {
++      mp_size_t bn;
++      mpz_abs (base, b);
++
++      bn = base->_mp_size;
++      if (bn >= mn)
++	{
++	  mpn_div_qr_preinv (NULL, base->_mp_d, base->_mp_size, mp, mn, &minv);
++	  bn = mn;
++	}
++
++      /* We have reduced the absolute value. Now take care of the
++	 sign. Note that we get zero represented non-canonically as
++	 m. */
++      if (b->_mp_size < 0)
++	{
++	  mp_ptr bp = MPZ_REALLOC (base, mn);
++	  gmp_assert_nocarry (mpn_sub (bp, mp, mn, bp, bn));
++	  bn = mn;
++	}
++      base->_mp_size = mpn_normalized_size (base->_mp_d, bn);
++    }
++  mpz_init_set_ui (tr, 1);
++
++  while (en-- > 0)
++    {
++      mp_limb_t w = e->_mp_d[en];
++      mp_limb_t bit;
++
++      bit = GMP_LIMB_HIGHBIT;
++      do
++	{
++	  mpz_mul (tr, tr, tr);
++	  if (w & bit)
++	    mpz_mul (tr, tr, base);
++	  if (tr->_mp_size > mn)
++	    {
++	      mpn_div_qr_preinv (NULL, tr->_mp_d, tr->_mp_size, mp, mn, &minv);
++	      tr->_mp_size = mpn_normalized_size (tr->_mp_d, mn);
++	    }
++	  bit >>= 1;
++	}
++      while (bit > 0);
++    }
++
++  /* Final reduction */
++  if (tr->_mp_size >= mn)
++    {
++      minv.shift = shift;
++      mpn_div_qr_preinv (NULL, tr->_mp_d, tr->_mp_size, mp, mn, &minv);
++      tr->_mp_size = mpn_normalized_size (tr->_mp_d, mn);
++    }
++  if (tp)
++    gmp_free (tp);
++
++  mpz_swap (r, tr);
++  mpz_clear (tr);
++  mpz_clear (base);
++}
++
++void
++mpz_powm_ui (mpz_t r, const mpz_t b, unsigned long elimb, const mpz_t m)
++{
++  mpz_t e;
++  mpz_init_set_ui (e, elimb);
++  mpz_powm (r, b, e, m);
++  mpz_clear (e);
++}
++
++/* x=trunc(y^(1/z)), r=y-x^z */
++void
++mpz_rootrem (mpz_t x, mpz_t r, const mpz_t y, unsigned long z)
++{
++  int sgn;
++  mpz_t t, u;
++
++  sgn = y->_mp_size < 0;
++  if ((~z & sgn) != 0)
++    gmp_die ("mpz_rootrem: Negative argument, with even root.");
++  if (z == 0)
++    gmp_die ("mpz_rootrem: Zeroth root.");
++
++  if (mpz_cmpabs_ui (y, 1) <= 0) {
++    if (x)
++      mpz_set (x, y);
++    if (r)
++      r->_mp_size = 0;
++    return;
++  }
++
++  mpz_init (u);
++  {
++    mp_bitcnt_t tb;
++    tb = mpz_sizeinbase (y, 2) / z + 1;
++    mpz_init2 (t, tb);
++    mpz_setbit (t, tb);
++  }
++
++  if (z == 2) /* simplify sqrt loop: z-1 == 1 */
++    do {
++      mpz_swap (u, t);			/* u = x */
++      mpz_tdiv_q (t, y, u);		/* t = y/x */
++      mpz_add (t, t, u);		/* t = y/x + x */
++      mpz_tdiv_q_2exp (t, t, 1);	/* x'= (y/x + x)/2 */
++    } while (mpz_cmpabs (t, u) < 0);	/* |x'| < |x| */
++  else /* z != 2 */ {
++    mpz_t v;
++
++    mpz_init (v);
++    if (sgn)
++      mpz_neg (t, t);
++
++    do {
++      mpz_swap (u, t);			/* u = x */
++      mpz_pow_ui (t, u, z - 1);		/* t = x^(z-1) */
++      mpz_tdiv_q (t, y, t);		/* t = y/x^(z-1) */
++      mpz_mul_ui (v, u, z - 1);		/* v = x*(z-1) */
++      mpz_add (t, t, v);		/* t = y/x^(z-1) + x*(z-1) */
++      mpz_tdiv_q_ui (t, t, z);		/* x'=(y/x^(z-1) + x*(z-1))/z */
++    } while (mpz_cmpabs (t, u) < 0);	/* |x'| < |x| */
++
++    mpz_clear (v);
++  }
++
++  if (r) {
++    mpz_pow_ui (t, u, z);
++    mpz_sub (r, y, t);
++  }
++  if (x)
++    mpz_swap (x, u);
++  mpz_clear (u);
++  mpz_clear (t);
++}
++
++int
++mpz_root (mpz_t x, const mpz_t y, unsigned long z)
++{
++  int res;
++  mpz_t r;
++
++  mpz_init (r);
++  mpz_rootrem (x, r, y, z);
++  res = r->_mp_size == 0;
++  mpz_clear (r);
++
++  return res;
++}
++
++/* Compute s = floor(sqrt(u)) and r = u - s^2. Allows r == NULL */
++void
++mpz_sqrtrem (mpz_t s, mpz_t r, const mpz_t u)
++{
++  mpz_rootrem (s, r, u, 2);
++}
++
++void
++mpz_sqrt (mpz_t s, const mpz_t u)
++{
++  mpz_rootrem (s, NULL, u, 2);
++}
++
++int
++mpz_perfect_square_p (const mpz_t u)
++{
++  if (u->_mp_size <= 0)
++    return (u->_mp_size == 0);
++  else
++    return mpz_root (NULL, u, 2);
++}
++
++int
++mpn_perfect_square_p (mp_srcptr p, mp_size_t n)
++{
++  mpz_t t;
++
++  assert (n > 0);
++  assert (p [n-1] != 0);
++  return mpz_root (NULL, mpz_roinit_n (t, p, n), 2);
++}
++
++mp_size_t
++mpn_sqrtrem (mp_ptr sp, mp_ptr rp, mp_srcptr p, mp_size_t n)
++{
++  mpz_t s, r, u;
++  mp_size_t res;
++
++  assert (n > 0);
++  assert (p [n-1] != 0);
++
++  mpz_init (r);
++  mpz_init (s);
++  mpz_rootrem (s, r, mpz_roinit_n (u, p, n), 2);
++
++  assert (s->_mp_size == (n+1)/2);
++  mpn_copyd (sp, s->_mp_d, s->_mp_size);
++  mpz_clear (s);
++  res = r->_mp_size;
++  if (rp)
++    mpn_copyd (rp, r->_mp_d, res);
++  mpz_clear (r);
++  return res;
++}
++
++/* Combinatorics */
++
++void
++mpz_fac_ui (mpz_t x, unsigned long n)
++{
++  mpz_set_ui (x, n + (n == 0));
++  for (;n > 2;)
++    mpz_mul_ui (x, x, --n);
++}
++
++void
++mpz_bin_uiui (mpz_t r, unsigned long n, unsigned long k)
++{
++  mpz_t t;
++
++  mpz_set_ui (r, k <= n);
++
++  if (k > (n >> 1))
++    k = (k <= n) ? n - k : 0;
++
++  mpz_init (t);
++  mpz_fac_ui (t, k);
++
++  for (; k > 0; k--)
++      mpz_mul_ui (r, r, n--);
++
++  mpz_divexact (r, r, t);
++  mpz_clear (t);
++}
++
++
++/* Primality testing */
++static int
++gmp_millerrabin (const mpz_t n, const mpz_t nm1, mpz_t y,
++		 const mpz_t q, mp_bitcnt_t k)
++{
++  assert (k > 0);
++
++  /* Caller must initialize y to the base. */
++  mpz_powm (y, y, q, n);
++
++  if (mpz_cmp_ui (y, 1) == 0 || mpz_cmp (y, nm1) == 0)
++    return 1;
++
++  while (--k > 0)
++    {
++      mpz_powm_ui (y, y, 2, n);
++      if (mpz_cmp (y, nm1) == 0)
++	return 1;
++      /* y == 1 means that the previous y was a non-trivial square root
++	 of 1 (mod n). y == 0 means that n is a power of the base.
++	 In either case, n is not prime. */
++      if (mpz_cmp_ui (y, 1) <= 0)
++	return 0;
++    }
++  return 0;
++}
++
++/* This product is 0xc0cfd797, and fits in 32 bits. */
++#define GMP_PRIME_PRODUCT \
++  (3UL*5UL*7UL*11UL*13UL*17UL*19UL*23UL*29UL)
++
++/* Bit (p+1)/2 is set, for each odd prime <= 61 */
++#define GMP_PRIME_MASK 0xc96996dcUL
++
++int
++mpz_probab_prime_p (const mpz_t n, int reps)
++{
++  mpz_t nm1;
++  mpz_t q;
++  mpz_t y;
++  mp_bitcnt_t k;
++  int is_prime;
++  int j;
++
++  /* Note that we use the absolute value of n only, for compatibility
++     with the real GMP. */
++  if (mpz_even_p (n))
++    return (mpz_cmpabs_ui (n, 2) == 0) ? 2 : 0;
++
++  /* Above test excludes n == 0 */
++  assert (n->_mp_size != 0);
++
++  if (mpz_cmpabs_ui (n, 64) < 0)
++    return (GMP_PRIME_MASK >> (n->_mp_d[0] >> 1)) & 2;
++
++  if (mpz_gcd_ui (NULL, n, GMP_PRIME_PRODUCT) != 1)
++    return 0;
++
++  /* All prime factors are >= 31. */
++  if (mpz_cmpabs_ui (n, 31*31) < 0)
++    return 2;
++
++  /* Use Miller-Rabin, with a deterministic sequence of bases, a[j] =
++     j^2 + j + 41 using Euler's polynomial. We potentially stop early,
++     if a[j] >= n - 1. Since n >= 31*31, this can happen only if reps >
++     30 (a[30] == 971 > 31*31 == 961). */
++
++  mpz_init (nm1);
++  mpz_init (q);
++  mpz_init (y);
++
++  /* Find q and k, where q is odd and n = 1 + 2**k * q.  */
++  nm1->_mp_size = mpz_abs_sub_ui (nm1, n, 1);
++  k = mpz_scan1 (nm1, 0);
++  mpz_tdiv_q_2exp (q, nm1, k);
++
++  for (j = 0, is_prime = 1; is_prime & (j < reps); j++)
++    {
++      mpz_set_ui (y, (unsigned long) j*j+j+41);
++      if (mpz_cmp (y, nm1) >= 0)
++	{
++	  /* Don't try any further bases. This "early" break does not affect
++	     the result for any reasonable reps value (<=5000 was tested) */
++	  assert (j >= 30);
++	  break;
++	}
++      is_prime = gmp_millerrabin (n, nm1, y, q, k);
++    }
++  mpz_clear (nm1);
++  mpz_clear (q);
++  mpz_clear (y);
++
++  return is_prime;
++}
++
++
++/* Logical operations and bit manipulation. */
++
++/* Numbers are treated as if represented in two's complement (and
++   infinitely sign extended). For a negative values we get the two's
++   complement from -x = ~x + 1, where ~ is bitwise complement.
++   Negation transforms
++
++     xxxx10...0
++
++   into
++
++     yyyy10...0
++
++   where yyyy is the bitwise complement of xxxx. So least significant
++   bits, up to and including the first one bit, are unchanged, and
++   the more significant bits are all complemented.
++
++   To change a bit from zero to one in a negative number, subtract the
++   corresponding power of two from the absolute value. This can never
++   underflow. To change a bit from one to zero, add the corresponding
++   power of two, and this might overflow. E.g., if x = -001111, the
++   two's complement is 110001. Clearing the least significant bit, we
++   get two's complement 110000, and -010000. */
++
++int
++mpz_tstbit (const mpz_t d, mp_bitcnt_t bit_index)
++{
++  mp_size_t limb_index;
++  unsigned shift;
++  mp_size_t ds;
++  mp_size_t dn;
++  mp_limb_t w;
++  int bit;
++
++  ds = d->_mp_size;
++  dn = GMP_ABS (ds);
++  limb_index = bit_index / GMP_LIMB_BITS;
++  if (limb_index >= dn)
++    return ds < 0;
++
++  shift = bit_index % GMP_LIMB_BITS;
++  w = d->_mp_d[limb_index];
++  bit = (w >> shift) & 1;
++
++  if (ds < 0)
++    {
++      /* d < 0. Check if any of the bits below is set: If so, our bit
++	 must be complemented. */
++      if (shift > 0 && (w << (GMP_LIMB_BITS - shift)) > 0)
++	return bit ^ 1;
++      while (limb_index-- > 0)
++	if (d->_mp_d[limb_index] > 0)
++	  return bit ^ 1;
++    }
++  return bit;
++}
++
++static void
++mpz_abs_add_bit (mpz_t d, mp_bitcnt_t bit_index)
++{
++  mp_size_t dn, limb_index;
++  mp_limb_t bit;
++  mp_ptr dp;
++
++  dn = GMP_ABS (d->_mp_size);
++
++  limb_index = bit_index / GMP_LIMB_BITS;
++  bit = (mp_limb_t) 1 << (bit_index % GMP_LIMB_BITS);
++
++  if (limb_index >= dn)
++    {
++      mp_size_t i;
++      /* The bit should be set outside of the end of the number.
++	 We have to increase the size of the number. */
++      dp = MPZ_REALLOC (d, limb_index + 1);
++
++      dp[limb_index] = bit;
++      for (i = dn; i < limb_index; i++)
++	dp[i] = 0;
++      dn = limb_index + 1;
++    }
++  else
++    {
++      mp_limb_t cy;
++
++      dp = d->_mp_d;
++
++      cy = mpn_add_1 (dp + limb_index, dp + limb_index, dn - limb_index, bit);
++      if (cy > 0)
++	{
++	  dp = MPZ_REALLOC (d, dn + 1);
++	  dp[dn++] = cy;
++	}
++    }
++
++  d->_mp_size = (d->_mp_size < 0) ? - dn : dn;
++}
++
++static void
++mpz_abs_sub_bit (mpz_t d, mp_bitcnt_t bit_index)
++{
++  mp_size_t dn, limb_index;
++  mp_ptr dp;
++  mp_limb_t bit;
++
++  dn = GMP_ABS (d->_mp_size);
++  dp = d->_mp_d;
++
++  limb_index = bit_index / GMP_LIMB_BITS;
++  bit = (mp_limb_t) 1 << (bit_index % GMP_LIMB_BITS);
++
++  assert (limb_index < dn);
++
++  gmp_assert_nocarry (mpn_sub_1 (dp + limb_index, dp + limb_index,
++				 dn - limb_index, bit));
++  dn = mpn_normalized_size (dp, dn);
++  d->_mp_size = (d->_mp_size < 0) ? - dn : dn;
++}
++
++void
++mpz_setbit (mpz_t d, mp_bitcnt_t bit_index)
++{
++  if (!mpz_tstbit (d, bit_index))
++    {
++      if (d->_mp_size >= 0)
++	mpz_abs_add_bit (d, bit_index);
++      else
++	mpz_abs_sub_bit (d, bit_index);
++    }
++}
++
++void
++mpz_clrbit (mpz_t d, mp_bitcnt_t bit_index)
++{
++  if (mpz_tstbit (d, bit_index))
++    {
++      if (d->_mp_size >= 0)
++	mpz_abs_sub_bit (d, bit_index);
++      else
++	mpz_abs_add_bit (d, bit_index);
++    }
++}
++
++void
++mpz_combit (mpz_t d, mp_bitcnt_t bit_index)
++{
++  if (mpz_tstbit (d, bit_index) ^ (d->_mp_size < 0))
++    mpz_abs_sub_bit (d, bit_index);
++  else
++    mpz_abs_add_bit (d, bit_index);
++}
++
++void
++mpz_com (mpz_t r, const mpz_t u)
++{
++  mpz_neg (r, u);
++  mpz_sub_ui (r, r, 1);
++}
++
++void
++mpz_and (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mp_size_t un, vn, rn, i;
++  mp_ptr up, vp, rp;
++
++  mp_limb_t ux, vx, rx;
++  mp_limb_t uc, vc, rc;
++  mp_limb_t ul, vl, rl;
++
++  un = GMP_ABS (u->_mp_size);
++  vn = GMP_ABS (v->_mp_size);
++  if (un < vn)
++    {
++      MPZ_SRCPTR_SWAP (u, v);
++      MP_SIZE_T_SWAP (un, vn);
++    }
++  if (vn == 0)
++    {
++      r->_mp_size = 0;
++      return;
++    }
++
++  uc = u->_mp_size < 0;
++  vc = v->_mp_size < 0;
++  rc = uc & vc;
++
++  ux = -uc;
++  vx = -vc;
++  rx = -rc;
++
++  /* If the smaller input is positive, higher limbs don't matter. */
++  rn = vx ? un : vn;
++
++  rp = MPZ_REALLOC (r, rn + rc);
++
++  up = u->_mp_d;
++  vp = v->_mp_d;
++
++  i = 0;
++  do
++    {
++      ul = (up[i] ^ ux) + uc;
++      uc = ul < uc;
++
++      vl = (vp[i] ^ vx) + vc;
++      vc = vl < vc;
++
++      rl = ( (ul & vl) ^ rx) + rc;
++      rc = rl < rc;
++      rp[i] = rl;
++    }
++  while (++i < vn);
++  assert (vc == 0);
++
++  for (; i < rn; i++)
++    {
++      ul = (up[i] ^ ux) + uc;
++      uc = ul < uc;
++
++      rl = ( (ul & vx) ^ rx) + rc;
++      rc = rl < rc;
++      rp[i] = rl;
++    }
++  if (rc)
++    rp[rn++] = rc;
++  else
++    rn = mpn_normalized_size (rp, rn);
++
++  r->_mp_size = rx ? -rn : rn;
++}
++
++void
++mpz_ior (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mp_size_t un, vn, rn, i;
++  mp_ptr up, vp, rp;
++
++  mp_limb_t ux, vx, rx;
++  mp_limb_t uc, vc, rc;
++  mp_limb_t ul, vl, rl;
++
++  un = GMP_ABS (u->_mp_size);
++  vn = GMP_ABS (v->_mp_size);
++  if (un < vn)
++    {
++      MPZ_SRCPTR_SWAP (u, v);
++      MP_SIZE_T_SWAP (un, vn);
++    }
++  if (vn == 0)
++    {
++      mpz_set (r, u);
++      return;
++    }
++
++  uc = u->_mp_size < 0;
++  vc = v->_mp_size < 0;
++  rc = uc | vc;
++
++  ux = -uc;
++  vx = -vc;
++  rx = -rc;
++
++  /* If the smaller input is negative, by sign extension higher limbs
++     don't matter. */
++  rn = vx ? vn : un;
++
++  rp = MPZ_REALLOC (r, rn + rc);
++
++  up = u->_mp_d;
++  vp = v->_mp_d;
++
++  i = 0;
++  do
++    {
++      ul = (up[i] ^ ux) + uc;
++      uc = ul < uc;
++
++      vl = (vp[i] ^ vx) + vc;
++      vc = vl < vc;
++
++      rl = ( (ul | vl) ^ rx) + rc;
++      rc = rl < rc;
++      rp[i] = rl;
++    }
++  while (++i < vn);
++  assert (vc == 0);
++
++  for (; i < rn; i++)
++    {
++      ul = (up[i] ^ ux) + uc;
++      uc = ul < uc;
++
++      rl = ( (ul | vx) ^ rx) + rc;
++      rc = rl < rc;
++      rp[i] = rl;
++    }
++  if (rc)
++    rp[rn++] = rc;
++  else
++    rn = mpn_normalized_size (rp, rn);
++
++  r->_mp_size = rx ? -rn : rn;
++}
++
++void
++mpz_xor (mpz_t r, const mpz_t u, const mpz_t v)
++{
++  mp_size_t un, vn, i;
++  mp_ptr up, vp, rp;
++
++  mp_limb_t ux, vx, rx;
++  mp_limb_t uc, vc, rc;
++  mp_limb_t ul, vl, rl;
++
++  un = GMP_ABS (u->_mp_size);
++  vn = GMP_ABS (v->_mp_size);
++  if (un < vn)
++    {
++      MPZ_SRCPTR_SWAP (u, v);
++      MP_SIZE_T_SWAP (un, vn);
++    }
++  if (vn == 0)
++    {
++      mpz_set (r, u);
++      return;
++    }
++
++  uc = u->_mp_size < 0;
++  vc = v->_mp_size < 0;
++  rc = uc ^ vc;
++
++  ux = -uc;
++  vx = -vc;
++  rx = -rc;
++
++  rp = MPZ_REALLOC (r, un + rc);
++
++  up = u->_mp_d;
++  vp = v->_mp_d;
++
++  i = 0;
++  do
++    {
++      ul = (up[i] ^ ux) + uc;
++      uc = ul < uc;
++
++      vl = (vp[i] ^ vx) + vc;
++      vc = vl < vc;
++
++      rl = (ul ^ vl ^ rx) + rc;
++      rc = rl < rc;
++      rp[i] = rl;
++    }
++  while (++i < vn);
++  assert (vc == 0);
++
++  for (; i < un; i++)
++    {
++      ul = (up[i] ^ ux) + uc;
++      uc = ul < uc;
++
++      rl = (ul ^ ux) + rc;
++      rc = rl < rc;
++      rp[i] = rl;
++    }
++  if (rc)
++    rp[un++] = rc;
++  else
++    un = mpn_normalized_size (rp, un);
++
++  r->_mp_size = rx ? -un : un;
++}
++
++static unsigned
++gmp_popcount_limb (mp_limb_t x)
++{
++  unsigned c;
++
++  /* Do 16 bits at a time, to avoid limb-sized constants. */
++  for (c = 0; x > 0; x >>= 16)
++    {
++      unsigned w = ((x >> 1) & 0x5555) + (x & 0x5555);
++      w = ((w >> 2) & 0x3333) + (w & 0x3333);
++      w = ((w >> 4) & 0x0f0f) + (w & 0x0f0f);
++      w = (w >> 8) + (w & 0x00ff);
++      c += w;
++    }
++  return c;
++}
++
++mp_bitcnt_t
++mpn_popcount (mp_srcptr p, mp_size_t n)
++{
++  mp_size_t i;
++  mp_bitcnt_t c;
++
++  for (c = 0, i = 0; i < n; i++)
++    c += gmp_popcount_limb (p[i]);
++
++  return c;
++}
++
++mp_bitcnt_t
++mpz_popcount (const mpz_t u)
++{
++  mp_size_t un;
++
++  un = u->_mp_size;
++
++  if (un < 0)
++    return ~(mp_bitcnt_t) 0;
++
++  return mpn_popcount (u->_mp_d, un);
++}
++
++mp_bitcnt_t
++mpz_hamdist (const mpz_t u, const mpz_t v)
++{
++  mp_size_t un, vn, i;
++  mp_limb_t uc, vc, ul, vl, comp;
++  mp_srcptr up, vp;
++  mp_bitcnt_t c;
++
++  un = u->_mp_size;
++  vn = v->_mp_size;
++
++  if ( (un ^ vn) < 0)
++    return ~(mp_bitcnt_t) 0;
++
++  comp = - (uc = vc = (un < 0));
++  if (uc)
++    {
++      assert (vn < 0);
++      un = -un;
++      vn = -vn;
++    }
++
++  up = u->_mp_d;
++  vp = v->_mp_d;
++
++  if (un < vn)
++    MPN_SRCPTR_SWAP (up, un, vp, vn);
++
++  for (i = 0, c = 0; i < vn; i++)
++    {
++      ul = (up[i] ^ comp) + uc;
++      uc = ul < uc;
++
++      vl = (vp[i] ^ comp) + vc;
++      vc = vl < vc;
++
++      c += gmp_popcount_limb (ul ^ vl);
++    }
++  assert (vc == 0);
++
++  for (; i < un; i++)
++    {
++      ul = (up[i] ^ comp) + uc;
++      uc = ul < uc;
++
++      c += gmp_popcount_limb (ul ^ comp);
++    }
++
++  return c;
++}
++
++mp_bitcnt_t
++mpz_scan1 (const mpz_t u, mp_bitcnt_t starting_bit)
++{
++  mp_ptr up;
++  mp_size_t us, un, i;
++  mp_limb_t limb, ux;
++
++  us = u->_mp_size;
++  un = GMP_ABS (us);
++  i = starting_bit / GMP_LIMB_BITS;
++
++  /* Past the end there's no 1 bits for u>=0, or an immediate 1 bit
++     for u<0. Notice this test picks up any u==0 too. */
++  if (i >= un)
++    return (us >= 0 ? ~(mp_bitcnt_t) 0 : starting_bit);
++
++  up = u->_mp_d;
++  ux = 0;
++  limb = up[i];
++
++  if (starting_bit != 0)
++    {
++      if (us < 0)
++	{
++	  ux = mpn_zero_p (up, i);
++	  limb = ~ limb + ux;
++	  ux = - (mp_limb_t) (limb >= ux);
++	}
++
++      /* Mask to 0 all bits before starting_bit, thus ignoring them. */
++      limb &= (GMP_LIMB_MAX << (starting_bit % GMP_LIMB_BITS));
++    }
++
++  return mpn_common_scan (limb, i, up, un, ux);
++}
++
++mp_bitcnt_t
++mpz_scan0 (const mpz_t u, mp_bitcnt_t starting_bit)
++{
++  mp_ptr up;
++  mp_size_t us, un, i;
++  mp_limb_t limb, ux;
++
++  us = u->_mp_size;
++  ux = - (mp_limb_t) (us >= 0);
++  un = GMP_ABS (us);
++  i = starting_bit / GMP_LIMB_BITS;
++
++  /* When past end, there's an immediate 0 bit for u>=0, or no 0 bits for
++     u<0.  Notice this test picks up all cases of u==0 too. */
++  if (i >= un)
++    return (ux ? starting_bit : ~(mp_bitcnt_t) 0);
++
++  up = u->_mp_d;
++  limb = up[i] ^ ux;
++
++  if (ux == 0)
++    limb -= mpn_zero_p (up, i); /* limb = ~(~limb + zero_p) */
++
++  /* Mask all bits before starting_bit, thus ignoring them. */
++  limb &= (GMP_LIMB_MAX << (starting_bit % GMP_LIMB_BITS));
++
++  return mpn_common_scan (limb, i, up, un, ux);
++}
++
++
++/* MPZ base conversion. */
++
++size_t
++mpz_sizeinbase (const mpz_t u, int base)
++{
++  mp_size_t un;
++  mp_srcptr up;
++  mp_ptr tp;
++  mp_bitcnt_t bits;
++  struct gmp_div_inverse bi;
++  size_t ndigits;
++
++  assert (base >= 2);
++  assert (base <= 36);
++
++  un = GMP_ABS (u->_mp_size);
++  if (un == 0)
++    return 1;
++
++  up = u->_mp_d;
++
++  bits = (un - 1) * GMP_LIMB_BITS + mpn_limb_size_in_base_2 (up[un-1]);
++  switch (base)
++    {
++    case 2:
++      return bits;
++    case 4:
++      return (bits + 1) / 2;
++    case 8:
++      return (bits + 2) / 3;
++    case 16:
++      return (bits + 3) / 4;
++    case 32:
++      return (bits + 4) / 5;
++      /* FIXME: Do something more clever for the common case of base
++	 10. */
++    }
++
++  tp = gmp_xalloc_limbs (un);
++  mpn_copyi (tp, up, un);
++  mpn_div_qr_1_invert (&bi, base);
++
++  ndigits = 0;
++  do
++    {
++      ndigits++;
++      mpn_div_qr_1_preinv (tp, tp, un, &bi);
++      un -= (tp[un-1] == 0);
++    }
++  while (un > 0);
++
++  gmp_free (tp);
++  return ndigits;
++}
++
++char *
++mpz_get_str (char *sp, int base, const mpz_t u)
++{
++  unsigned bits;
++  const char *digits;
++  mp_size_t un;
++  size_t i, sn;
++
++  if (base >= 0)
++    {
++      digits = "0123456789abcdefghijklmnopqrstuvwxyz";
++    }
++  else
++    {
++      base = -base;
++      digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
++    }
++  if (base <= 1)
++    base = 10;
++  if (base > 36)
++    return NULL;
++
++  sn = 1 + mpz_sizeinbase (u, base);
++  if (!sp)
++    sp = gmp_xalloc (1 + sn);
++
++  un = GMP_ABS (u->_mp_size);
++
++  if (un == 0)
++    {
++      sp[0] = '0';
++      sp[1] = '\0';
++      return sp;
++    }
++
++  i = 0;
++
++  if (u->_mp_size < 0)
++    sp[i++] = '-';
++
++  bits = mpn_base_power_of_two_p (base);
++
++  if (bits)
++    /* Not modified in this case. */
++    sn = i + mpn_get_str_bits ((unsigned char *) sp + i, bits, u->_mp_d, un);
++  else
++    {
++      struct mpn_base_info info;
++      mp_ptr tp;
++
++      mpn_get_base_info (&info, base);
++      tp = gmp_xalloc_limbs (un);
++      mpn_copyi (tp, u->_mp_d, un);
++
++      sn = i + mpn_get_str_other ((unsigned char *) sp + i, base, &info, tp, un);
++      gmp_free (tp);
++    }
++
++  for (; i < sn; i++)
++    sp[i] = digits[(unsigned char) sp[i]];
++
++  sp[sn] = '\0';
++  return sp;
++}
++
++int
++mpz_set_str (mpz_t r, const char *sp, int base)
++{
++  unsigned bits;
++  mp_size_t rn, alloc;
++  mp_ptr rp;
++  size_t sn;
++  int sign;
++  unsigned char *dp;
++
++  assert (base == 0 || (base >= 2 && base <= 36));
++
++  while (isspace( (unsigned char) *sp))
++    sp++;
++
++  sign = (*sp == '-');
++  sp += sign;
++
++  if (base == 0)
++    {
++      if (*sp == '0')
++	{
++	  sp++;
++	  if (*sp == 'x' || *sp == 'X')
++	    {
++	      base = 16;
++	      sp++;
++	    }
++	  else if (*sp == 'b' || *sp == 'B')
++	    {
++	      base = 2;
++	      sp++;
++	    }
++	  else
++	    base = 8;
++	}
++      else
++	base = 10;
++    }
++
++  sn = strlen (sp);
++  dp = gmp_xalloc (sn + (sn == 0));
++
++  for (sn = 0; *sp; sp++)
++    {
++      unsigned digit;
++
++      if (isspace ((unsigned char) *sp))
++	continue;
++      if (*sp >= '0' && *sp <= '9')
++	digit = *sp - '0';
++      else if (*sp >= 'a' && *sp <= 'z')
++	digit = *sp - 'a' + 10;
++      else if (*sp >= 'A' && *sp <= 'Z')
++	digit = *sp - 'A' + 10;
++      else
++	digit = base; /* fail */
++
++      if (digit >= base)
++	{
++	  gmp_free (dp);
++	  r->_mp_size = 0;
++	  return -1;
++	}
++
++      dp[sn++] = digit;
++    }
++
++  bits = mpn_base_power_of_two_p (base);
++
++  if (bits > 0)
++    {
++      alloc = (sn * bits + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS;
++      rp = MPZ_REALLOC (r, alloc);
++      rn = mpn_set_str_bits (rp, dp, sn, bits);
++    }
++  else
++    {
++      struct mpn_base_info info;
++      mpn_get_base_info (&info, base);
++      alloc = (sn + info.exp - 1) / info.exp;
++      rp = MPZ_REALLOC (r, alloc);
++      rn = mpn_set_str_other (rp, dp, sn, base, &info);
++    }
++  assert (rn <= alloc);
++  gmp_free (dp);
++
++  r->_mp_size = sign ? - rn : rn;
++
++  return 0;
++}
++
++int
++mpz_init_set_str (mpz_t r, const char *sp, int base)
++{
++  mpz_init (r);
++  return mpz_set_str (r, sp, base);
++}
++
++size_t
++mpz_out_str (FILE *stream, int base, const mpz_t x)
++{
++  char *str;
++  size_t len;
++
++  str = mpz_get_str (NULL, base, x);
++  len = strlen (str);
++  len = fwrite (str, 1, len, stream);
++  gmp_free (str);
++  return len;
++}
++
++
++static int
++gmp_detect_endian (void)
++{
++  static const int i = 2;
++  const unsigned char *p = (const unsigned char *) &i;
++  return 1 - *p;
++}
++
++/* Import and export. Does not support nails. */
++void
++mpz_import (mpz_t r, size_t count, int order, size_t size, int endian,
++	    size_t nails, const void *src)
++{
++  const unsigned char *p;
++  ptrdiff_t word_step;
++  mp_ptr rp;
++  mp_size_t rn;
++
++  /* The current (partial) limb. */
++  mp_limb_t limb;
++  /* The number of bytes already copied to this limb (starting from
++     the low end). */
++  size_t bytes;
++  /* The index where the limb should be stored, when completed. */
++  mp_size_t i;
++
++  if (nails != 0)
++    gmp_die ("mpz_import: Nails not supported.");
++
++  assert (order == 1 || order == -1);
++  assert (endian >= -1 && endian <= 1);
++
++  if (endian == 0)
++    endian = gmp_detect_endian ();
++
++  p = (unsigned char *) src;
++
++  word_step = (order != endian) ? 2 * size : 0;
++
++  /* Process bytes from the least significant end, so point p at the
++     least significant word. */
++  if (order == 1)
++    {
++      p += size * (count - 1);
++      word_step = - word_step;
++    }
++
++  /* And at least significant byte of that word. */
++  if (endian == 1)
++    p += (size - 1);
++
++  rn = (size * count + sizeof(mp_limb_t) - 1) / sizeof(mp_limb_t);
++  rp = MPZ_REALLOC (r, rn);
++
++  for (limb = 0, bytes = 0, i = 0; count > 0; count--, p += word_step)
++    {
++      size_t j;
++      for (j = 0; j < size; j++, p -= (ptrdiff_t) endian)
++	{
++	  limb |= (mp_limb_t) *p << (bytes++ * CHAR_BIT);
++	  if (bytes == sizeof(mp_limb_t))
++	    {
++	      rp[i++] = limb;
++	      bytes = 0;
++	      limb = 0;
++	    }
++	}
++    }
++  assert (i + (bytes > 0) == rn);
++  if (limb != 0)
++    rp[i++] = limb;
++  else
++    i = mpn_normalized_size (rp, i);
++
++  r->_mp_size = i;
++}
++
++void *
++mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
++	    size_t nails, const mpz_t u)
++{
++  size_t count;
++  mp_size_t un;
++
++  if (nails != 0)
++    gmp_die ("mpz_import: Nails not supported.");
++
++  assert (order == 1 || order == -1);
++  assert (endian >= -1 && endian <= 1);
++  assert (size > 0 || u->_mp_size == 0);
++
++  un = u->_mp_size;
++  count = 0;
++  if (un != 0)
++    {
++      size_t k;
++      unsigned char *p;
++      ptrdiff_t word_step;
++      /* The current (partial) limb. */
++      mp_limb_t limb;
++      /* The number of bytes left to to in this limb. */
++      size_t bytes;
++      /* The index where the limb was read. */
++      mp_size_t i;
++
++      un = GMP_ABS (un);
++
++      /* Count bytes in top limb. */
++      limb = u->_mp_d[un-1];
++      assert (limb != 0);
++
++      k = 0;
++      do {
++	k++; limb >>= CHAR_BIT;
++      } while (limb != 0);
++
++      count = (k + (un-1) * sizeof (mp_limb_t) + size - 1) / size;
++
++      if (!r)
++	r = gmp_xalloc (count * size);
++
++      if (endian == 0)
++	endian = gmp_detect_endian ();
++
++      p = (unsigned char *) r;
++
++      word_step = (order != endian) ? 2 * size : 0;
++
++      /* Process bytes from the least significant end, so point p at the
++	 least significant word. */
++      if (order == 1)
++	{
++	  p += size * (count - 1);
++	  word_step = - word_step;
++	}
++
++      /* And at least significant byte of that word. */
++      if (endian == 1)
++	p += (size - 1);
++
++      for (bytes = 0, i = 0, k = 0; k < count; k++, p += word_step)
++	{
++	  size_t j;
++	  for (j = 0; j < size; j++, p -= (ptrdiff_t) endian)
++	    {
++	      if (bytes == 0)
++		{
++		  if (i < un)
++		    limb = u->_mp_d[i++];
++		  bytes = sizeof (mp_limb_t);
++		}
++	      *p = limb;
++	      limb >>= CHAR_BIT;
++	      bytes--;
++	    }
++	}
++      assert (i == un);
++      assert (k == count);
++    }
++
++  if (countp)
++    *countp = count;
++
++  return r;
++}
diff --git a/trunk/package/network/utils/nftables/patches/104-fix-CFLAGS-handling.patch b/trunk/package/network/utils/nftables/patches/104-fix-CFLAGS-handling.patch
new file mode 100644
index 00000000..4a85df29
--- /dev/null
+++ b/trunk/package/network/utils/nftables/patches/104-fix-CFLAGS-handling.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.defs.in
++++ b/Makefile.defs.in
+@@ -24,6 +24,7 @@ LDFLAGS		+= @LIBS@
+ 
+ CPPFLAGS	+= @CPPFLAGS@
+ 
++CFLAGS		:=
+ CFLAGS		+= @CFLAGS@ @DEFS@
+ CFLAGS		+= -DDEFAULT_INCLUDE_PATH="\"$(confdir)\""
+ CFLAGS		+= -include config.h
diff --git a/trunk/package/network/utils/nginx/Config.in b/trunk/package/network/utils/nginx/Config.in
new file mode 100644
index 00000000..b135e42d
--- /dev/null
+++ b/trunk/package/network/utils/nginx/Config.in
@@ -0,0 +1,192 @@
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menu "Configuration"
+        depends on PACKAGE_nginx
+
+config NGINX_STUB_STATUS
+	bool
+	prompt "Enable stub status module"
+	help
+		Enable the stub status module which gives some status from the server.
+
+config NGINX_FLV
+	bool
+	prompt "Enable FLV module"
+	help
+		Provides the ability to seek within FLV (Flash) files using time-based offsets.
+
+config NGINX_SSL
+	bool
+	prompt "Enable SSL module"
+	help
+		Enable HTTPS/SSL support.
+
+config NGINX_DAV
+	bool
+	prompt "Enable WebDAV module"
+	help
+		Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
+
+config NGINX_LUA
+	bool
+	prompt "Enable LUA module"
+	help
+		Enable support for LUA scripts.
+
+config NGINX_PCRE
+	bool
+	prompt "Enable PCRE library usage"
+	default y
+
+config NGINX_HTTP_CACHE
+	bool
+	prompt "Enable HTTP cache"
+
+config NGINX_HTTP_CHARSET
+	bool
+	prompt "Enable HTTP charset module"
+	default y
+
+config NGINX_HTTP_GZIP
+	bool
+	prompt "Enable HTTP gzip module"
+	default y
+
+config NGINX_HTTP_SSI
+	bool
+	prompt "Enable HTTP ssi module"
+	default y
+
+config NGINX_HTTP_USERID
+	bool
+	prompt "Enable HTTP userid module"
+	default y
+
+config NGINX_HTTP_ACCESS
+	bool
+	prompt "Enable HTTP access module"
+	default y
+
+config NGINX_HTTP_AUTH_BASIC
+	bool
+	prompt "Enable HTTP auth basic"
+	default y
+
+config NGINX_HTTP_AUTOINDEX
+	bool
+	prompt "Enable HTTP autoindex module"
+	default y
+
+config NGINX_HTTP_GEO
+	bool
+	prompt "Enable HTTP geo module"
+	default y
+
+config NGINX_HTTP_MAP
+	bool
+	prompt "Enable HTTP map module"
+	default y
+
+config NGINX_HTTP_SPLIT_CLIENTS
+	bool
+	prompt "Enable HTTP split clients"
+	default y
+
+config NGINX_HTTP_REFERER
+	bool
+	prompt "Enable HTTP referer module"
+	default y
+
+config NGINX_HTTP_REWRITE
+	bool
+	prompt "Enable HTTP rewrite module"
+	select NGINX_PCRE
+	default y
+
+config NGINX_HTTP_PROXY
+	bool
+	prompt "Enable HTTP proxy module"
+	default y
+
+config NGINX_HTTP_FASTCGI
+	bool
+	prompt "Enable HTTP fastcgi module"
+	default y
+
+config NGINX_HTTP_UWSGI
+	bool
+	prompt "Enable HTTP uwsgi module"
+	default y
+
+config NGINX_HTTP_SCGI
+	bool
+	prompt "Enable HTTP scgi module"
+	default y
+
+config NGINX_HTTP_MEMCACHED
+	bool
+	prompt "Enable HTTP memcached module"
+	default y
+
+config NGINX_HTTP_LIMIT_CONN
+	bool
+	prompt "Enable HTTP limit conn"
+	default y
+
+config NGINX_HTTP_LIMIT_REQ
+	bool
+	prompt "Enable HTTP limit req"
+	default y
+
+config NGINX_HTTP_EMPTY_GIF
+	bool
+	prompt "Enable HTTP empty gif"
+	default y
+
+config NGINX_HTTP_BROWSER
+	bool
+	prompt "Enable HTTP browser module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_IP_HASH
+	bool
+	prompt "Enable HTTP IP hash module"
+	default y
+
+config NGINX_NAXSI
+	bool
+	prompt "Enable NAXSI module"
+	select PACKAGE_nginx-naxsi
+	default y
+	help
+		Enable support for NAXSI WAF.
+
+config NGINX_PROXYPROTOCOL
+	bool
+	prompt "Enable HAProxy proxyprotocol"
+	select PACKAGE_nginx-proxyprotocol
+	select NGINX_SSL
+	default n
+	help
+		Enable support for PROXY PROTOCOL
+
+config NGINX_SYSLOG
+	bool
+	prompt "Enable Syslog module"
+	select PACKAGE_nginx-syslog
+	default y
+	help
+		Provides the ability log to a remote destination
+
+config NGINX_HTTP_UPSTREAM_CHECK
+	bool
+	select NGINX_SSL
+	prompt "Enable HTTP upstream check module"
+	default n
+
+endmenu
diff --git a/trunk/package/network/utils/nginx/Makefile b/trunk/package/network/utils/nginx/Makefile
new file mode 100644
index 00000000..e93326e5
--- /dev/null
+++ b/trunk/package/network/utils/nginx/Makefile
@@ -0,0 +1,334 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nginx
+PKG_VERSION:=1.4.7
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://nginx.org/download/
+PKG_MD5SUM:=aee151d298dcbfeb88b3f7dd3e7a4d17
+PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
+PKG_LICENSE:=2-clause BSD-like license
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+PKG_CONFIG_DEPENDS := \
+	CONFIG_NGINX_STUB_STATUS \
+	CONFIG_NGINX_FLV \
+	CONFIG_NGINX_SSL \
+	CONFIG_NGINX_DAV \
+	CONFIG_NGINX_LUA \
+	CONFIG_NGINX_PCRE \
+	CONFIG_NGINX_HTTP_CACHE \
+	CONFIG_NGINX_HTTP_CHARSET \
+	CONFIG_NGINX_HTTP_GZIP \
+	CONFIG_NGINX_HTTP_SSI \
+	CONFIG_NGINX_HTTP_USERID \
+	CONFIG_NGINX_HTTP_ACCESS \
+	CONFIG_NGINX_HTTP_AUTH_BASIC \
+	CONFIG_NGINX_HTTP_AUTOINDEX \
+	CONFIG_NGINX_HTTP_GEO \
+	CONFIG_NGINX_HTTP_MAP \
+	CONFIG_NGINX_HTTP_SPLIT_CLIENTS \
+	CONFIG_NGINX_HTTP_REFERER \
+	CONFIG_NGINX_HTTP_REWRITE \
+	CONFIG_NGINX_HTTP_PROXY \
+	CONFIG_NGINX_HTTP_FASTCGI \
+	CONFIG_NGINX_HTTP_UWSGI \
+	CONFIG_NGINX_HTTP_SCGI \
+	CONFIG_NGINX_HTTP_MEMCACHED \
+	CONFIG_NGINX_HTTP_LIMIT_CONN \
+	CONFIG_NGINX_HTTP_LIMIT_REQ \
+	CONFIG_NGINX_HTTP_EMPTY_GIF \
+	CONFIG_NGINX_HTTP_BROWSER \
+	CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/nginx
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE:=Nginx web server
+  URL:=http://nginx.org/
+  DEPENDS:=+NGINX_PCRE:libpcre +(NGINX_SSL||NGINX_HTTP_CACHE||NGINX_HTTP_AUTH_BASIC):libopenssl +NGINX_HTTP_GZIP:zlib +libpthread +NGINX_LUA:liblua
+  MENU:=1
+endef
+
+define Package/nginx/description
+ nginx is an HTTP and reverse proxy server, as well as a mail proxy server,
+ written by Igor Sysoev.
+endef
+
+define Package/nginx/config
+  source "$(SOURCE)/Config.in"
+endef
+
+config_files=nginx.conf mime.types fastcgi_params koi-utf koi-win win-utf
+
+define Package/nginx/conffiles
+/etc/nginx/
+endef
+
+ADDITIONAL_MODULES:=
+ifeq ($(CONFIG_NGINX_NAXSI),y)
+  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src
+endif
+ifeq ($(CONFIG_IPV6),y)
+  ADDITIONAL_MODULES += --with-ipv6
+endif
+ifeq ($(CONFIG_NGINX_STUB_STATUS),y)
+  ADDITIONAL_MODULES += --with-http_stub_status_module
+endif
+ifeq ($(CONFIG_NGINX_FLV),y)
+  ADDITIONAL_MODULES += --with-http_flv_module
+endif
+ifeq ($(CONFIG_NGINX_SSL),y)
+  ADDITIONAL_MODULES += --with-http_ssl_module
+endif
+ifeq ($(CONFIG_NGINX_DAV),y)
+  ADDITIONAL_MODULES += --with-http_dav_module
+endif
+ifeq ($(CONFIG_NGINX_LUA),y)
+  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx
+endif
+ifneq ($(CONFIG_NGINX_HTTP_CACHE),y)
+  ADDITIONAL_MODULES += --without-http-cache
+endif
+ifneq ($(CONFIG_NGINX_PCRE),y)
+  ADDITIONAL_MODULES += --without-pcre
+endif
+ifneq ($(CONFIG_NGINX_HTTP_CHARSET),y)
+  ADDITIONAL_MODULES += --without-http_charset_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_GZIP),y)
+  ADDITIONAL_MODULES += --without-http_gzip_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_SSI),y)
+  ADDITIONAL_MODULES += --without-http_ssi_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_USERID),y)
+  ADDITIONAL_MODULES += --without-http_userid_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_ACCESS),y)
+  ADDITIONAL_MODULES += --without-http_access_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_AUTH_BASIC),y)
+  ADDITIONAL_MODULES += --without-http_auth_basic_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_AUTOINDEX),y)
+  ADDITIONAL_MODULES += --without-http_autoindex_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_GEO),y)
+  ADDITIONAL_MODULES += --without-http_geo_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_MAP),y)
+  ADDITIONAL_MODULES += --without-http_map_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_SPLIT_CLIENTS),y)
+  ADDITIONAL_MODULES += --without-http_split_clients_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_REFERER),y)
+  ADDITIONAL_MODULES += --without-http_referer_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_REWRITE),y)
+  ADDITIONAL_MODULES += --without-http_rewrite_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_PROXY),y)
+  ADDITIONAL_MODULES += --without-http_proxy_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_FASTCGI),y)
+  ADDITIONAL_MODULES += --without-http_fastcgi_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y)
+  ADDITIONAL_MODULES += --without-http_uwsgi_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_SCGI),y)
+  ADDITIONAL_MODULES += --without-http_scgi_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_MEMCACHED),y)
+  ADDITIONAL_MODULES += --without-http_memcached_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_LIMIT_CONN),y)
+  ADDITIONAL_MODULES += --without-http_limit_conn_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_LIMIT_REQ),y)
+  ADDITIONAL_MODULES += --without-http_limit_req_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_EMPTY_GIF),y)
+  ADDITIONAL_MODULES += --without-http_empty_gif_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_BROWSER),y)
+  ADDITIONAL_MODULES += --without-http_browser_module
+endif
+ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH),y)
+  ADDITIONAL_MODULES += --without-http_upstream_ip_hash_module
+endif
+ifeq ($(CONFIG_NGINX_PROXYPROTOCOL),y)
+  ADDITIONAL_MODULES += --with-proxy-protocol
+endif
+ifeq ($(CONFIG_NGINX_SYSLOG),y)
+  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-syslog
+endif
+ifeq ($(CONFIG_NGINX_HTTP_UPSTREAM_CHECK),y)
+  ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-upstream-check
+endif
+
+define Build/Configure
+	# TODO: fix --crossbuild
+	(cd $(PKG_BUILD_DIR) ;\
+		$(if $(CONFIG_NGINX_LUA),LUA_INC=$(STAGING_DIR)/usr/include LUA_LIB=$(STAGING_DIR)/usr/lib) \
+		./configure \
+			--crossbuild=Linux::$(ARCH) \
+			--prefix=/usr \
+			--conf-path=/etc/nginx/nginx.conf \
+			$(ADDITIONAL_MODULES) \
+			--error-log-path=/var/log/nginx/error.log \
+			--pid-path=/var/run/nginx.pid \
+			--lock-path=/var/lock/nginx.lock \
+			--http-log-path=/var/log/nginx/access.log \
+			--http-client-body-temp-path=/var/lib/nginx/body \
+			--http-proxy-temp-path=/var/lib/nginx/proxy \
+			--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+			--with-cc="$(TARGET_CC)" \
+			--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+			--with-ld-opt="$(TARGET_LDFLAGS)" )
+endef
+
+define Package/nginx/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(if $(CONFIG_NGINX_LUA),$(call Prepare/lua-nginx))
+	$(if $(CONFIG_NGINX_NAXSI),$(call Prepare/nginx-naxsi))
+	$(if $(CONFIG_NGINX_SYSLOG),$(call Prepare/nginx-syslog))
+	$(if $(CONFIG_NGINX_HTTP_UPSTREAM_CHECK),$(call Prepare/nginx-upstream-check))
+endef
+
+define Download/lua-nginx
+	VERSION:=d3ab0edd45bffe1b9a36abdf5bff544de436ccee
+	SUBDIR:=lua-nginx
+	FILE:=lua-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+	URL:=https://github.com/chaoslawful/lua-nginx-module.git
+	PROTO:=git
+endef
+
+define  Prepare/lua-nginx
+	$(eval $(call Download,lua-nginx))
+	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+	$(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx)
+endef
+
+define Download/nginx-upstream-check
+	VERSION:=d40b9f956d9d978005bb15616d2f283d4e3d2031
+	SUBDIR:=nginx-upstream-check
+	FILE:=nginx-upstream-check-$(PKG_VERSION)-$$(VERSION).tar.gz
+	URL:=https://github.com/yaoweibin/nginx_upstream_check_module.git
+	PROTO:=git
+endef
+
+define  Prepare/nginx-upstream-check
+	$(eval $(call Download,nginx-upstream-check))
+	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+	$(call PatchDir,$(PKG_BUILD_DIR),./patches-nginx-upstream-check)
+endef
+
+
+define Package/nginx-naxsi
+        MENU:=1
+        $(call Package/nginx)
+        TITLE:=nginx-naxsi
+        DEPENDS:=nginx @NGINX_NAXSI
+endef
+
+define Package/nginx-naxsi/description
+        NGINX WAF NAXSI
+endef
+
+define Package/nginx-proxyprotocol
+        MENU:=1
+        $(call Package/nginx)
+        TITLE:=nginx 
+        DEPENDS:=nginx @NGINX_PROXYPROTOCOL
+endef
+
+define Package/nginx-proxyprotocol/description
+        IMPLEMENT Proxy Protocol
+endef
+
+define Package/nginx-syslog
+        MENU:=1
+        $(call Package/nginx)
+        TITLE:=nginx-syslog
+        DEPENDS:=nginx @NGINX_SYSLOG
+endef
+
+define Package/nginx-syslog/description
+        IMPLEMENT Syslog Protocol
+endef
+
+define Download/nginx-naxsi
+	VERSION:=34dcb45fe4fdcb144c5258d83672f8e1e1c8db2e
+	SUBDIR:=nginx-naxsi
+	FILE:=nginx-naxsi-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+	URL:=https://github.com/nbs-system/naxsi.git
+	PROTO:=git
+endef
+
+define  Prepare/nginx-naxsi
+	$(eval $(call Download,nginx-naxsi))
+	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+endef
+
+define Package/nginx-naxsi/install
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx
+	chmod 0640 $(1)/etc/nginx/naxsi_core.rules
+endef
+
+define Download/nginx-syslog
+	VERSION:=7abf48e52552c40a21463e1a8c608e0e575261cd
+	SUBDIR:=nginx-syslog
+	FILE:=nginx-syslog-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+	URL:=https://github.com/splitice/nginx_syslog_patch.git
+	PROTO:=git
+endef
+
+define  Prepare/nginx-syslog
+	$(eval $(call Download,nginx-syslog))
+	gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+endef
+
+define Package/nginx-proxyprotocol/install
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_BIN) ./files/nginx.proxyprotocol.example $(1)/etc/nginx/nginx.conf.proxyprotocol
+	chmod 0640 $(1)/etc/nginx/nginx.conf.proxyprotocol
+endef
+
+define Package/nginx-syslog/install
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_BIN) ./files/nginx.syslog.example $(1)/etc/nginx/nginx.conf.syslog
+	chmod 0640 $(1)/etc/nginx/nginx.conf.syslog
+endef
+
+
+$(eval $(call BuildPackage,nginx))
+$(eval $(call BuildPackage,nginx-naxsi))
+$(eval $(call BuildPackage,nginx-proxyprotocol))
+$(eval $(call BuildPackage,nginx-syslog))
+
diff --git a/trunk/package/network/utils/nginx/files/nginx.init b/trunk/package/network/utils/nginx/files/nginx.init
new file mode 100644
index 00000000..adf36b44
--- /dev/null
+++ b/trunk/package/network/utils/nginx/files/nginx.init
@@ -0,0 +1,24 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2009-2012 OpenWrt.org
+
+START=50
+NGINX_BIN=/usr/sbin/nginx
+
+start() {
+	mkdir -p /var/log/nginx
+	mkdir -p /var/lib/nginx
+	$NGINX_BIN
+}
+
+stop() {
+	$NGINX_BIN -s stop
+}
+
+reload() {
+	$NGINX_BIN -s reload
+}
+
+shutdown() {
+	$NGINX_BIN -s quit
+}
+
diff --git a/trunk/package/network/utils/nginx/files/nginx.proxyprotocol.example b/trunk/package/network/utils/nginx/files/nginx.proxyprotocol.example
new file mode 100644
index 00000000..ab4bad62
--- /dev/null
+++ b/trunk/package/network/utils/nginx/files/nginx.proxyprotocol.example
@@ -0,0 +1,40 @@
+worker_processes  1;
+pid /tmp/nginx.pid;
+daemon off;
+master_process off;
+error_log stderr debug_core;
+
+events {
+ debug_connection <YOUR IPv4>;
+ debug_connection <YOUR IPV6>;
+ worker_connections  1024;
+}
+
+http {
+ default_type  application/octet-stream;
+ client_body_temp_path /tmp/body 1;
+
+ access_log /tmp/nginx_access.log;
+
+ server {
+#  listen       8082 ssl;
+# proxy protocol configuration for nginx 1.4.x:
+  listen       8082 accept_proxy_protocol=on;
+# same with spdy enabled:
+#  listen       8082 spdy ssl accept_proxy_protocol=on;
+  listen       [::]:8082 ipv6only=on;
+  ssl_certificate /your/certificate;
+  ssl_certificate_key /your/key;
+  server_name  localhost;
+# proxy protocol configuration for nginx 1.2.x:
+#  accept_proxy_protocol on;
+ 
+  location / {
+   proxy_pass        http://127.0.0.1:8084;
+   proxy_set_header  X-Real-IP  $remote_addr;
+   proxy_connect_timeout 10s;
+   proxy_read_timeout 10s;
+   send_proxy_protocol on;
+  }
+ }
+}
diff --git a/trunk/package/network/utils/nginx/files/nginx.syslog.example b/trunk/package/network/utils/nginx/files/nginx.syslog.example
new file mode 100644
index 00000000..05943448
--- /dev/null
+++ b/trunk/package/network/utils/nginx/files/nginx.syslog.example
@@ -0,0 +1,59 @@
+worker_processes  1;
+
+syslog local6 nginx;
+
+events {
+        worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] $request '
+        '"$status" $body_bytes_sent "$http_referer" '
+        '"$http_user_agent" "$http_x_forwarded_for"';
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        #send the log to syslog and file.
+        access_log  syslog:notice|logs/host1.access.log main;
+
+        # pre 1.5.x
+        error_log syslog:notice|logs/host1.error.log;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+    }
+
+    server {
+        listen       80;
+        server_name  www.example.com;
+
+        access_log  syslog:warn|logs/host2.access.log main;
+        error_log syslog:warn|logs/host2.error.log;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+    }
+
+    server {
+        listen       80;
+        server_name  www.test.com;
+
+        #send the log just to syslog.
+        access_log  syslog:error main;
+        error_log syslog:error;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+    }
+}
diff --git a/trunk/package/network/utils/nginx/patches-lua-nginx/300-ldl.patch b/trunk/package/network/utils/nginx/patches-lua-nginx/300-ldl.patch
new file mode 100644
index 00000000..d826bcf2
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches-lua-nginx/300-ldl.patch
@@ -0,0 +1,21 @@
+--- a/lua-nginx/config
++++ b/lua-nginx/config
+@@ -1,5 +1,5 @@
+ ngx_feature="Lua library"
+-ngx_feature_libs="-llua -lm"
++ngx_feature_libs="-llua -lm -ldl"
+ ngx_feature_name=
+ ngx_feature_run=no
+ ngx_feature_incs="#include <lauxlib.h>"
+@@ -47,9 +47,9 @@ else
+         ngx_feature="Lua library in $LUA_LIB and $LUA_INC (specified by the LUA_LIB and LUA_INC env)"
+         ngx_feature_path="$LUA_INC"
+         if [ $NGX_RPATH = YES ]; then
+-            ngx_feature_libs="-R$LUA_LIB -L$LUA_LIB -llua -lm"
++            ngx_feature_libs="-R$LUA_LIB -L$LUA_LIB -llua -lm -ldl"
+         else
+-            ngx_feature_libs="-L$LUA_LIB -llua -lm"
++            ngx_feature_libs="-L$LUA_LIB -llua -lm -ldl"
+         fi
+ 
+         . auto/feature
diff --git a/trunk/package/network/utils/nginx/patches-nginx-upstream-check/check_1.2.6+.patch b/trunk/package/network/utils/nginx/patches-nginx-upstream-check/check_1.2.6+.patch
new file mode 100644
index 00000000..3ab91347
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches-nginx-upstream-check/check_1.2.6+.patch
@@ -0,0 +1,209 @@
+diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c
+index 89ccc2b..a552044 100644
+--- a/src/http/modules/ngx_http_upstream_ip_hash_module.c
++++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c
+@@ -9,6 +9,10 @@
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++#include "ngx_http_upstream_check_handler.h"
++#endif
++
+ 
+ typedef struct {
+     /* the round robin data must be first */
+@@ -208,6 +212,12 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
+ 
+             if (!peer->down) {
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                               "get ip_hash peer, check_index: %ui",
++                               peer->check_index);
++                if (!ngx_http_check_peer_down(peer->check_index)) {
++#endif
+                 if (peer->max_fails == 0 || peer->fails < peer->max_fails) {
+                     break;
+                 }
+@@ -216,6 +226,9 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
+                     peer->checked = now;
+                     break;
+                 }
++#if (NGX_UPSTREAM_CHECK_MODULE)
++                }
++#endif
+             }
+ 
+             iphp->rrp.tried[n] |= m;
+diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c
+index 21156ae..c57393d 100644
+--- a/src/http/modules/ngx_http_upstream_least_conn_module.c
++++ b/src/http/modules/ngx_http_upstream_least_conn_module.c
+@@ -9,6 +9,10 @@
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++#include "ngx_http_upstream_check_handler.h"
++#endif
++
+ 
+ typedef struct {
+     ngx_uint_t                        *conns;
+@@ -203,6 +207,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
+             continue;
+         }
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                "get least_conn peer, check_index: %ui",
++                peer->check_index);
++
++        if (ngx_http_check_peer_down(peer->check_index)) {
++            continue;
++        }
++#endif
++
+         if (peer->max_fails
+             && peer->fails >= peer->max_fails
+             && now - peer->checked <= peer->fail_timeout)
+@@ -256,6 +270,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
+                 continue;
+             }
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
++                    "get least_conn peer, check_index: %ui",
++                    peer->check_index);
++
++            if (ngx_http_check_peer_down(peer->check_index)) {
++                continue;
++            }
++#endif
++
+             if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) {
+                 continue;
+             }
+diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
+index 4b78cff..f077b46 100644
+--- a/src/http/ngx_http_upstream_round_robin.c
++++ b/src/http/ngx_http_upstream_round_robin.c
+@@ -9,6 +9,9 @@
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++#include "ngx_http_upstream_check_handler.h"
++#endif
+ 
+ static ngx_int_t ngx_http_upstream_cmp_servers(const void *one,
+     const void *two);
+@@ -87,7 +90,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
+                 peers->peer[n].weight = server[i].weight;
+                 peers->peer[n].effective_weight = server[i].weight;
+                 peers->peer[n].current_weight = 0;
+-                n++;
++
++#if (NGX_UPSTREAM_CHECK_MODULE)
++                if (!server[i].down) {
++                    peers->peer[n].check_index =
++                        ngx_http_check_add_peer(cf, us, &server[i].addrs[j]);
++                }
++                else {
++                    peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
++                }
++#endif
++               n++;
+             }
+         }
+ 
+@@ -145,6 +158,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
+                 backup->peer[n].max_fails = server[i].max_fails;
+                 backup->peer[n].fail_timeout = server[i].fail_timeout;
+                 backup->peer[n].down = server[i].down;
++
++#if (NGX_UPSTREAM_CHECK_MODULE)
++                if (!server[i].down) {
++                    backup->peer[n].check_index =
++                        ngx_http_check_add_peer(cf, us, &server[i].addrs[j]);
++                }
++                else {
++                    backup->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
++                }
++#endif
++
+                 n++;
+             }
+         }
+@@ -206,6 +230,9 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
+         peers->peer[i].current_weight = 0;
+         peers->peer[i].max_fails = 1;
+         peers->peer[i].fail_timeout = 10;
++#if (NGX_UPSTREAM_CHECK_MODULE)
++        peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR;
++#endif
+     }
+ 
+     us->peer.data = peers;
+@@ -323,6 +350,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
+         peers->peer[0].current_weight = 0;
+         peers->peer[0].max_fails = 1;
+         peers->peer[0].fail_timeout = 10;
++#if (NGX_UPSTREAM_CHECK_MODULE)
++        peers->peer[0].check_index = (ngx_uint_t) NGX_ERROR;
++#endif
+ 
+     } else {
+ 
+@@ -356,6 +386,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
+             peers->peer[i].current_weight = 0;
+             peers->peer[i].max_fails = 1;
+             peers->peer[i].fail_timeout = 10;
++#if (NGX_UPSTREAM_CHECK_MODULE)
++            peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR;
++#endif
+         }
+     }
+ 
+@@ -434,6 +467,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
+             goto failed;
+         }
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++        if (ngx_http_check_peer_down(peer->check_index)) {
++            goto failed;
++        }
++#endif
++
+     } else {
+ 
+         /* there are several peers */
+@@ -531,6 +570,12 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp)
+             continue;
+         }
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++        if (ngx_http_check_peer_down(peer->check_index)) {
++            continue;
++        }
++#endif
++
+         if (peer->max_fails
+             && peer->fails >= peer->max_fails
+             && now - peer->checked <= peer->fail_timeout)
+diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h
+index 3f8cbf8..1613168 100644
+--- a/src/http/ngx_http_upstream_round_robin.h
++++ b/src/http/ngx_http_upstream_round_robin.h
+@@ -30,6 +30,10 @@ typedef struct {
+     ngx_uint_t                      max_fails;
+     time_t                          fail_timeout;
+ 
++#if (NGX_UPSTREAM_CHECK_MODULE)
++    ngx_uint_t                      check_index;
++#endif
++
+     ngx_uint_t                      down;          /* unsigned  down:1; */
+ 
+ #if (NGX_HTTP_SSL)
diff --git a/trunk/package/network/utils/nginx/patches/101-feature_test_fix.patch b/trunk/package/network/utils/nginx/patches/101-feature_test_fix.patch
new file mode 100644
index 00000000..8e15fe96
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches/101-feature_test_fix.patch
@@ -0,0 +1,107 @@
+--- a/auto/cc/name
++++ b/auto/cc/name
+@@ -7,7 +7,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+ 
+     ngx_feature="C compiler"
+     ngx_feature_name=
+-    ngx_feature_run=yes
++    ngx_feature_run=
+     ngx_feature_incs=
+     ngx_feature_path=
+     ngx_feature_libs=
+--- a/auto/cc/conf
++++ b/auto/cc/conf
+@@ -155,7 +155,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+     else
+         ngx_feature="C99 variadic macros"
+         ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
+-        ngx_feature_run=yes
++        ngx_feature_run=no
+         ngx_feature_incs="#include <stdio.h>
+ #define var(dummy, ...)  sprintf(__VA_ARGS__)"
+         ngx_feature_path=
+@@ -169,7 +169,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+ 
+     ngx_feature="gcc variadic macros"
+     ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
+-    ngx_feature_run=yes
++    ngx_feature_run=no
+     ngx_feature_incs="#include <stdio.h>
+ #define var(dummy, args...)  sprintf(args)"
+     ngx_feature_path=
+--- a/auto/os/linux
++++ b/auto/os/linux
+@@ -48,7 +48,7 @@ fi
+ 
+ ngx_feature="epoll"
+ ngx_feature_name="NGX_HAVE_EPOLL"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/epoll.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -73,7 +73,7 @@ fi
+ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
+ ngx_feature="sendfile()"
+ ngx_feature_name="NGX_HAVE_SENDFILE"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/sendfile.h>
+                   #include <errno.h>"
+ ngx_feature_path=
+@@ -94,7 +94,7 @@ fi
+ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+ ngx_feature="sendfile64()"
+ ngx_feature_name="NGX_HAVE_SENDFILE64"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/sendfile.h>
+                   #include <errno.h>"
+ ngx_feature_path=
+@@ -112,7 +112,7 @@ ngx_include="sys/prctl.h"; . auto/includ
+ 
+ ngx_feature="prctl(PR_SET_DUMPABLE)"
+ ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/prctl.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+--- a/auto/unix
++++ b/auto/unix
+@@ -618,7 +618,7 @@ ngx_feature_test="void *p; p = memalign(
+ 
+ ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
+ ngx_feature_name="NGX_HAVE_MAP_ANON"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/mman.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -631,7 +631,7 @@ ngx_feature_test="void *p;
+ 
+ ngx_feature='mmap("/dev/zero", MAP_SHARED)'
+ ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/mman.h>
+                   #include <sys/stat.h>
+                   #include <fcntl.h>"
+@@ -646,7 +646,7 @@ ngx_feature_test='void *p; int  fd;
+ 
+ ngx_feature="System V shared memory"
+ ngx_feature_name="NGX_HAVE_SYSVSHM"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/ipc.h>
+                   #include <sys/shm.h>"
+ ngx_feature_path=
+@@ -660,7 +660,7 @@ ngx_feature_test="int  id;
+ 
+ ngx_feature="POSIX semaphores"
+ ngx_feature_name="NGX_HAVE_POSIX_SEM"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <semaphore.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
diff --git a/trunk/package/network/utils/nginx/patches/102-sizeof_test_fix.patch b/trunk/package/network/utils/nginx/patches/102-sizeof_test_fix.patch
new file mode 100644
index 00000000..0cd93cc4
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches/102-sizeof_test_fix.patch
@@ -0,0 +1,26 @@
+--- a/auto/types/sizeof
++++ b/auto/types/sizeof
+@@ -25,8 +25,13 @@ $NGX_INCLUDE_UNISTD_H
+ $NGX_INCLUDE_INTTYPES_H
+ $NGX_INCLUDE_AUTO_CONFIG_H
+ 
++char object_code_block[] = {
++	'\n', 'e', '4', 'V', 'A',
++	'0', 'x', ('0' + sizeof($ngx_type)),
++	'Y', '3', 'p', 'M', '\n'
++};
++
+ int main() {
+-    printf("%d", (int) sizeof($ngx_type));
+     return 0;
+ }
+ 
+@@ -40,7 +45,7 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&
+ 
+ 
+ if [ -x $NGX_AUTOTEST ]; then
+-    ngx_size=`$NGX_AUTOTEST`
++    ngx_size=`sed -ne 's/^e4VA0x\(.\)Y3pM$/\1/p' < $NGX_AUTOTEST`
+     echo " $ngx_size bytes"
+ fi
+ 
diff --git a/trunk/package/network/utils/nginx/patches/103-sys_nerr.patch b/trunk/package/network/utils/nginx/patches/103-sys_nerr.patch
new file mode 100644
index 00000000..5f5d106f
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches/103-sys_nerr.patch
@@ -0,0 +1,12 @@
+--- a/src/os/unix/ngx_errno.c
++++ b/src/os/unix/ngx_errno.c
+@@ -8,6 +8,9 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ 
++#ifndef NGX_SYS_NERR
++#define NGX_SYS_NERR  128
++#endif
+ 
+ /*
+  * The strerror() messages are copied because:
diff --git a/trunk/package/network/utils/nginx/patches/200-config.patch b/trunk/package/network/utils/nginx/patches/200-config.patch
new file mode 100644
index 00000000..f3500957
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches/200-config.patch
@@ -0,0 +1,18 @@
+--- a/conf/nginx.conf
++++ b/conf/nginx.conf
+@@ -1,5 +1,5 @@
+ 
+-#user  nobody;
++user nobody nogroup;
+ worker_processes  1;
+ 
+ #error_log  logs/error.log;
+@@ -16,7 +16,7 @@ events {
+ 
+ http {
+     include       mime.types;
+-    default_type  application/octet-stream;
++    #default_type  application/octet-stream;
+ 
+     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+     #                  '$status $body_bytes_sent "$http_referer" '
diff --git a/trunk/package/network/utils/nginx/patches/300-crosscompile_ccflags.patch b/trunk/package/network/utils/nginx/patches/300-crosscompile_ccflags.patch
new file mode 100644
index 00000000..4a06a769
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches/300-crosscompile_ccflags.patch
@@ -0,0 +1,33 @@
+--- a/auto/endianness
++++ b/auto/endianness
+@@ -21,7 +21,7 @@ int main() {
+ 
+ END
+ 
+-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
++ngx_test="$CC $NGX_CC_OPT $CC_TEST_FLAGS $CC_AUX_FLAGS \
+           -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
+ 
+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
+--- a/auto/feature
++++ b/auto/feature
+@@ -39,7 +39,7 @@ int main() {
+ END
+ 
+ 
+-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \
++ngx_test="$CC $NGX_CC_OPT $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \
+           -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_TEST_LD_OPT $ngx_feature_libs"
+ 
+ ngx_feature_inc_path=
+--- a/auto/include
++++ b/auto/include
+@@ -27,7 +27,7 @@ int main() {
+ END
+ 
+ 
+-ngx_test="$CC -o $NGX_AUTOTEST $NGX_AUTOTEST.c"
++ngx_test="$CC $NGX_CC_OPT -o $NGX_AUTOTEST $NGX_AUTOTEST.c"
+ 
+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
+ 
diff --git a/trunk/package/network/utils/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch b/trunk/package/network/utils/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
new file mode 100644
index 00000000..ba63834e
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
@@ -0,0 +1,1183 @@
+Index: nginx-1.4.7/auto/modules
+===================================================================
+--- nginx-1.4.7.orig/auto/modules
++++ nginx-1.4.7/auto/modules
+@@ -297,6 +297,10 @@ if [ $HTTP_SSL = YES ]; then
+     HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS"
+ fi
+ 
++if [ $PROXY_PROTOCOL = YES ]; then
++    have=NGX_PROXY_PROTOCOL . auto/have
++fi
++
+ if [ $HTTP_PROXY = YES ]; then
+     have=NGX_HTTP_X_FORWARDED_FOR . auto/have
+     #USE_MD5=YES
+Index: nginx-1.4.7/auto/options
+===================================================================
+--- nginx-1.4.7.orig/auto/options
++++ nginx-1.4.7/auto/options
+@@ -47,6 +47,8 @@ USE_THREADS=NO
+ NGX_FILE_AIO=NO
+ NGX_IPV6=NO
+ 
++PROXY_PROTOCOL=NO
++
+ HTTP=YES
+ 
+ NGX_HTTP_LOG_PATH=
+@@ -192,6 +194,8 @@ do
+         --with-file-aio)                 NGX_FILE_AIO=YES           ;;
+         --with-ipv6)                     NGX_IPV6=YES               ;;
+ 
++        --with-proxy-protocol)           PROXY_PROTOCOL=YES         ;;
++
+         --without-http)                  HTTP=NO                    ;;
+         --without-http-cache)            HTTP_CACHE=NO              ;;
+ 
+@@ -350,6 +354,8 @@ cat << END
+   --with-file-aio                    enable file AIO support
+   --with-ipv6                        enable IPv6 support
+ 
++  --with-proxy-protocol              enable proxy protocol support
++
+   --with-http_ssl_module             enable ngx_http_ssl_module
+   --with-http_spdy_module            enable ngx_http_spdy_module
+   --with-http_realip_module          enable ngx_http_realip_module
+Index: nginx-1.4.7/auto/sources
+===================================================================
+--- nginx-1.4.7.orig/auto/sources
++++ nginx-1.4.7/auto/sources
+@@ -36,7 +36,8 @@ CORE_DEPS="src/core/nginx.h \
+            src/core/ngx_conf_file.h \
+            src/core/ngx_resolver.h \
+            src/core/ngx_open_file_cache.h \
+-           src/core/ngx_crypt.h"
++           src/core/ngx_crypt.h \
++           src/core/ngx_proxy_protocol.h"
+ 
+ 
+ CORE_SRCS="src/core/nginx.c \
+@@ -67,7 +68,8 @@ CORE_SRCS="src/core/nginx.c \
+            src/core/ngx_conf_file.c \
+            src/core/ngx_resolver.c \
+            src/core/ngx_open_file_cache.c \
+-           src/core/ngx_crypt.c"
++           src/core/ngx_crypt.c \
++           src/core/ngx_proxy_protocol.c"
+ 
+ 
+ REGEX_MODULE=ngx_regex_module
+Index: nginx-1.4.7/src/core/ngx_connection.h
+===================================================================
+--- nginx-1.4.7.orig/src/core/ngx_connection.h
++++ nginx-1.4.7/src/core/ngx_connection.h
+@@ -63,6 +63,10 @@ struct ngx_listening_s {
+     unsigned            shared:1;    /* shared between threads or processes */
+     unsigned            addr_ntop:1;
+ 
++#if (NGX_PROXY_PROTOCOL)
++    unsigned            accept_proxy_protocol:2; /* proxy_protocol flag */
++#endif
++
+ #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+     unsigned            ipv6only:1;
+ #endif
+@@ -148,6 +152,10 @@ struct ngx_connection_s {
+ 
+     ngx_uint_t          requests;
+ 
++#if (NGX_PROXY_PROTOCOL)
++    ngx_uint_t          proxy_protocol;
++#endif
++
+     unsigned            buffered:8;
+ 
+     unsigned            log_error:3;     /* ngx_connection_log_error_e */
+Index: nginx-1.4.7/src/core/ngx_core.h
+===================================================================
+--- nginx-1.4.7.orig/src/core/ngx_core.h
++++ nginx-1.4.7/src/core/ngx_core.h
+@@ -77,6 +77,9 @@ typedef void (*ngx_connection_handler_pt
+ #include <ngx_open_file_cache.h>
+ #include <ngx_os.h>
+ #include <ngx_connection.h>
++#if (NGX_PROXY_PROTOCOL)
++#include <ngx_proxy_protocol.h>
++#endif
+ 
+ 
+ #define LF     (u_char) 10
+Index: nginx-1.4.7/src/core/ngx_proxy_protocol.c
+===================================================================
+--- /dev/null
++++ nginx-1.4.7/src/core/ngx_proxy_protocol.c
+@@ -0,0 +1,430 @@
++
++/*
++ * Copyright (C) Baptiste Assmann
++ * Copyright (C) Exceliance
++ */
++
++
++#include <ngx_config.h>
++#include <ngx_core.h>
++#include <ngx_event.h>
++
++#if (NGX_PROXY_PROTOCOL)
++
++int
++ngx_recv_proxy_protocol(ngx_connection_t *c, u_char *buf, ssize_t n)
++{
++    u_char *end, *p, *t;
++    size_t len;
++    ssize_t s;
++    int step = 0;
++    ngx_proxy_protocol_t pp;
++
++    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "processing proxy protocol");
++
++    /* 16 is the minimal length of the proxy protocol string */
++    if (n < 18) {
++        step = 1;
++        goto fail;
++    }
++
++    s = n;
++    end = memchr(buf, '\n', n);
++    if (end == NULL) {
++        step = 2;
++        goto fail;
++    }
++
++    p = buf;
++    if (memcmp(p, "PROXY ", 6) != 0) {
++        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
++            "incorrect proxy protocol header string");
++        step = 3;
++        goto fail;
++    }
++    p += 6;
++    s -= 6;
++    if (s <= 0) {
++        step = 4;
++        goto fail;
++    }
++
++    ngx_memzero(&pp, sizeof(ngx_proxy_protocol_t));
++
++    if (memcmp(p, "TCP4 ", 5) == 0) {
++        struct sockaddr_in *sin_src;
++        struct sockaddr_in *sin_dst;
++
++        pp.pp_proto = NGX_PP_PROTO_TCP4;
++        pp.pp_src3.ss_family = AF_INET;
++        pp.pp_dst3.ss_family = AF_INET;
++        sin_src = (struct sockaddr_in *) &pp.pp_src3;
++        sin_dst = (struct sockaddr_in *) &pp.pp_dst3;
++
++        p += 5;
++        s -= 5;
++        if (s <= 0) {
++            step = 5;
++            goto fail;
++        }
++
++        /* l3 source address */
++        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
++            step = 6;
++            goto fail;
++        }
++        len = t - p;
++        if ((sin_src->sin_addr.s_addr = ngx_inet_addr(p, len)) == INADDR_NONE) {
++            step = 7;
++            goto fail;
++        }
++        pp.pp_src3_text.data = ngx_pcalloc(c->pool, len + 1);
++        ngx_memcpy(pp.pp_src3_text.data, p, len);
++        pp.pp_src3_text.len = len;
++
++        p += (len + 1);
++        s -= (len + 1);
++        if (s <= 0) {
++            step = 8;
++            goto fail;
++        }
++
++        /* l3 destination address */
++        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
++            step = 9;
++            goto fail;
++        }
++        len = t - p;
++        if ((sin_dst->sin_addr.s_addr = ngx_inet_addr(p, len)) == INADDR_NONE) {
++            step = 10;
++            goto fail;
++        }
++// FIXME pointer shift ???
++        pp.pp_dst3_text.data = ngx_pcalloc(c->pool, len + 1);
++        ngx_memcpy(pp.pp_dst3_text.data, p, len);
++        pp.pp_dst3_text.len = len;
++
++        p += (len + 1);
++        s -= (len + 1);
++        if (s <= 0) {
++            step = 11;
++            goto fail;
++        }
++
++        /* l4 source port */
++        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
++            step = 12;
++            goto fail;
++        }
++        len = t - p;
++        pp.pp_src4 = ngx_atoi(p, len);
++        if ((pp.pp_src4 < 1024)
++                || (pp.pp_src4 > 65535)) {
++            step = 13;
++            goto fail;
++        }
++        sin_src->sin_port = htons(pp.pp_src4);
++
++        p += (len + 1);
++        s -= (len + 1);
++        if (s <= 0) {
++            step = 14;
++            goto fail;
++        }
++
++        /* l4 destination port */
++        if ( (t = (u_char *)memchr(p, '\r', s)) == NULL ) {
++            step = 15;
++            goto fail;
++        }
++        len = t - p;
++        pp.pp_dst4 = ngx_atoi(p, len);
++        if (pp.pp_dst4 > 65535) {
++            step = 16;
++            goto fail;
++        }
++        sin_dst->sin_port = htons(pp.pp_dst4);
++
++        if (p[len + 1] != '\n') {
++            step = 17;
++            goto fail;
++        }
++
++        p += (len + 2);
++        s -= (len + 2);
++
++
++        /* if we managed to get there, then we can safely replace the
++         * information in the connection structure
++         */
++
++        /* updating connection with source information provided by proxy protocol */
++        if (pp.pp_src3_text.len > c->addr_text.len) {
++            ngx_pfree(c->pool, c->addr_text.data);
++            c->addr_text.data = ngx_pcalloc(c->pool, pp.pp_src3_text.len);
++        } else {
++            ngx_memzero(c->addr_text.data, c->addr_text.len);
++        }
++        ngx_memcpy(c->addr_text.data, pp.pp_src3_text.data, pp.pp_src3_text.len);
++        c->addr_text.len = pp.pp_src3_text.len;
++
++        ngx_pfree(c->pool, c->sockaddr);
++        c->socklen = NGX_SOCKADDRLEN;
++        c->sockaddr = ngx_pcalloc(c->pool, c->socklen);
++        ngx_memcpy(c->sockaddr, sin_src, c->socklen);
++
++        if (c->sockaddr->sa_family != AF_INET) {
++            ngx_pfree(c->pool, c->sockaddr);
++            c->socklen = NGX_SOCKADDRLEN;
++            c->sockaddr = ngx_pcalloc(c->pool, c->socklen);
++        } else {
++            ngx_memzero(c->sockaddr, sizeof(struct sockaddr_in));
++            c->socklen = NGX_SOCKADDRLEN;
++        }
++        ngx_memcpy(c->sockaddr, sin_src, c->socklen);
++
++        /* updating connection with destination information provided by proxy protocol */
++        ngx_pfree(c->pool, c->local_sockaddr);
++        c->local_sockaddr = ngx_pcalloc(c->pool, NGX_SOCKADDRLEN);
++        ngx_memcpy(c->local_sockaddr, sin_dst, NGX_SOCKADDRLEN);
++
++    }
++
++#if (NGX_HAVE_INET6)
++
++     else if (memcmp(p, "TCP6 ", 5) == 0) {
++
++        struct sockaddr_in6 *sin6_src;
++        struct sockaddr_in6 *sin6_dst;
++
++        pp.pp_proto = NGX_PP_PROTO_TCP6;
++        pp.pp_src3.ss_family = AF_INET6;
++        pp.pp_dst3.ss_family = AF_INET6;
++        sin6_src = (struct sockaddr_in6 *) &pp.pp_src3;
++        sin6_dst = (struct sockaddr_in6 *) &pp.pp_dst3;
++
++        p += 5;
++        s -= 5;
++        if (s <= 0) {
++            step = 18;
++            goto fail;
++        }
++
++        /* l3 source address */
++        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
++            step = 19;
++            goto fail;
++        }
++        len = t - p;
++        if (ngx_inet6_addr(p, len, sin6_src->sin6_addr.s6_addr) != NGX_OK) {
++            step = 20;
++            goto fail;
++        }
++        pp.pp_src3_text.data = ngx_pcalloc(c->pool, len + 1);
++        ngx_memcpy(pp.pp_src3_text.data, p, len);
++        pp.pp_src3_text.len = len;
++
++        p += (len + 1);
++        s -= (len + 1);
++        if (s <= 0) {
++            step = 21;
++            goto fail;
++        }
++
++        /* l3 destination address */
++        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
++            step = 22;
++            goto fail;
++        }
++        len = t - p;
++        if (ngx_inet6_addr(p, len, sin6_dst->sin6_addr.s6_addr) != NGX_OK) {
++            step = 23;
++            goto fail;
++        }
++        pp.pp_dst3_text.data = ngx_pcalloc(c->pool, len + 1);
++        ngx_memcpy(pp.pp_dst3_text.data, p, len);
++        pp.pp_dst3_text.len = len;
++
++        p += (len + 1);
++        s -= (len + 1);
++        if (s <= 0) {
++            step = 24;
++            goto fail;
++        }
++
++        /* l4 source port */
++        if ( (t = (u_char *)memchr(p, ' ', s)) == NULL ) {
++            step = 25;
++            goto fail;
++        }
++        len = t - p;
++        pp.pp_src4 = ngx_atoi(p, len);
++        if ((pp.pp_src4 < 1024)
++                || (pp.pp_src4 > 65535)) {
++            step = 26;
++            goto fail;
++        }
++        sin6_src->sin6_port = htons(pp.pp_src4);
++
++        p += (len + 1);
++        s -= (len + 1);
++        if (s <= 0) {
++            step = 27;
++            goto fail;
++        }
++
++        /* l4 destination port */
++        if ( (t = (u_char *)memchr(p, '\r', s)) == NULL ) {
++            step = 28;
++            goto fail;
++        }
++        len = t - p;
++        pp.pp_dst4 = ngx_atoi(p, len);
++        if (pp.pp_dst4 > 65535) {
++            step = 29;
++            goto fail;
++        }
++        sin6_dst->sin6_port = htons(pp.pp_dst4);
++
++        if (p[len + 1] != '\n') {
++            step = 30;
++            goto fail;
++        }
++
++        p += (len + 2);
++        s -= (len + 2);
++
++        /* if we managed to get there, then we can safely replace the
++         * information in the connection structure
++         */
++
++        /* updating connection with source provided by proxy protocol */
++        if (pp.pp_src3_text.len > c->addr_text.len) {
++            ngx_pfree(c->pool, c->addr_text.data);
++            c->addr_text.data = ngx_pcalloc(c->pool, pp.pp_src3_text.len);
++        } else {
++            ngx_memzero(c->addr_text.data, c->addr_text.len);
++        }
++        ngx_memcpy(c->addr_text.data, pp.pp_src3_text.data, pp.pp_src3_text.len);
++        c->addr_text.len = pp.pp_src3_text.len;
++
++        ngx_pfree(c->pool, c->sockaddr);
++        c->socklen = NGX_SOCKADDRLEN;
++        c->sockaddr = ngx_pcalloc(c->pool, c->socklen);
++        ngx_memcpy(c->sockaddr, sin6_src, c->socklen);
++
++        /* updating connection with destination provided by proxy protocol */
++        if (c->sockaddr->sa_family != AF_INET6) {
++            ngx_pfree(c->pool, c->local_sockaddr);
++            c->local_sockaddr = ngx_pcalloc(c->pool, NGX_SOCKADDRLEN);
++        } else {
++            ngx_memzero(c->sockaddr, sizeof(struct sockaddr_in6));
++            c->socklen = NGX_SOCKADDRLEN;
++        }
++//        ngx_memcpy(c->local_sockaddr, sin6_dst, NGX_SOCKADDRLEN);
++//FIXME must be finished here
++
++    }
++
++#endif
++
++    else {
++        step = 31;
++        goto fail;
++    }
++
++    ngx_print_proxy_protocol(&pp, c->log);
++
++    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
++            "proxy_protocol, asking to remove %z chars",
++            end + 1 - buf);
++
++    return (end + 1 - buf);
++
++fail:
++    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
++            "proxy_protocol error at step: %d", step);
++
++    return 0;
++
++}
++
++
++void
++ngx_print_proxy_protocol(ngx_proxy_protocol_t *p, ngx_log_t *log)
++{
++    switch (p->pp_proto) {
++        case NGX_PP_PROTO_TCP4:
++           ngx_log_debug0(NGX_LOG_DEBUG_EVENT, log, 0,
++               "proxy_protocol, proto: TCP4");
++        break;
++        case NGX_PP_PROTO_TCP6:
++           ngx_log_debug0(NGX_LOG_DEBUG_EVENT, log, 0,
++               "proxy_protocol, proto: TCP6");
++       break;
++   }
++
++    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
++       "proxy_protocol, string length: %d", ngx_proxy_protocol_string_length(p));
++    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
++       "proxy_protocol, src3: %s, %d", p->pp_src3_text.data, p->pp_src3_text.len);
++    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
++       "proxy_protocol, dst3: %s, %d", p->pp_dst3_text.data, p->pp_dst3_text.len);
++    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
++       "proxy_protocol, src4: %d", p->pp_src4);
++    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
++       "proxy_protocol, dst4: %d", p->pp_dst4);
++}
++
++
++int
++ngx_proxy_protocol_string_length(ngx_proxy_protocol_t *p)
++{
++    int len = 0;
++
++    /* 'PROXY ' */
++    len += (sizeof("PROXY ") - 1);
++
++    /* protocol version (TCP4 or TCP6) + space */
++    len += (sizeof("TCP0 ") - 1);
++
++    /* src3 + space */
++    len += p->pp_src3_text.len;
++    len += 1;
++
++    /* dst3 + space */
++    len += p->pp_dst3_text.len;
++    len += 1;
++
++    /* src4 */
++    if (p->pp_src4 < 10000)
++        /* 4 digits + 1 space */
++        len += (sizeof("0000 ") - 1);
++    else
++        /* 5 digits + 1 space */
++        len += (sizeof("00000 ") - 1);
++
++    /* dst4 */
++    if (p->pp_dst4 >= 10000)
++        /* 5 digits */
++        len += (sizeof("00000 ") - 1);
++    else if (p->pp_dst4 >= 1000)
++        /* 4 digits */
++        len += (sizeof("0000 ") - 1);
++    else if (p->pp_dst4 >= 100)
++        /* 3 digits */
++        len += (sizeof("000 ") - 1);
++    else if (p->pp_dst4 >= 10)
++        /* 2 digits */
++        len += (sizeof("00 ") - 1);
++    else
++        /* 1 digit */
++        len += (sizeof("0 ") - 1);
++
++    /* CRLF */
++    len += (sizeof(CRLF) - 1);
++
++    return len - 1;
++}
++
++#endif
+Index: nginx-1.4.7/src/core/ngx_proxy_protocol.h
+===================================================================
+--- /dev/null
++++ nginx-1.4.7/src/core/ngx_proxy_protocol.h
+@@ -0,0 +1,45 @@
++
++/*
++ * Copyright (C) Baptiste Assmann
++ * Copyright (C) Exceliance
++ */
++
++
++#ifndef _NGX_PROXY_PROTOCOL_H_INCLUDED_
++#define _NGX_PROXY_PROTOCOL_H_INCLUDED_
++
++
++#include <ngx_config.h>
++#include <ngx_core.h>
++
++
++#if (NGX_PROXY_PROTOCOL)
++
++typedef struct ngx_proxy_protocol_s ngx_proxy_protocol_t;
++
++typedef enum {
++    NGX_PP_PROTO_TCP4 = 1,
++    NGX_PP_PROTO_TCP6
++} ngx_pp_proto;
++
++
++struct ngx_proxy_protocol_s {
++    unsigned int	    pp_proto;	/* proxy protocol related information */
++    struct sockaddr_storage pp_src3;
++    ngx_str_t		    pp_src3_text;
++    struct sockaddr_storage pp_dst3;
++    ngx_str_t		    pp_dst3_text;
++    unsigned int	    pp_src4;
++    unsigned int	    pp_dst4;
++};
++
++
++int  ngx_recv_proxy_protocol(ngx_connection_t *, u_char *, ssize_t);
++void ngx_print_proxy_protocol(ngx_proxy_protocol_t *, ngx_log_t *);
++int  ngx_proxy_protocol_string_length(ngx_proxy_protocol_t *);
++
++
++#endif
++
++#endif /* _NGX_CONNECTION_H_INCLUDED_ */
++
+Index: nginx-1.4.7/src/http/modules/ngx_http_proxy_module.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/modules/ngx_http_proxy_module.c
++++ nginx-1.4.7/src/http/modules/ngx_http_proxy_module.c
+@@ -8,7 +8,9 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+-
++#if (NGX_PROXY_PROTOCOL)
++#include <ngx_proxy_protocol.h>
++#endif
+ 
+ typedef struct ngx_http_proxy_rewrite_s  ngx_http_proxy_rewrite_t;
+ 
+@@ -365,6 +367,17 @@ static ngx_command_t  ngx_http_proxy_com
+       offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf),
+       NULL },
+ 
++#if (NGX_PROXY_PROTOCOL)
++
++    { ngx_string("send_proxy_protocol"),
++      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
++      ngx_conf_set_flag_slot,
++      NGX_HTTP_LOC_CONF_OFFSET,
++      offsetof(ngx_http_proxy_loc_conf_t, upstream.send_proxy_protocol),
++      NULL },
++
++#endif
++
+ #if (NGX_HTTP_CACHE)
+ 
+     { ngx_string("proxy_cache"),
+@@ -2420,6 +2433,11 @@ ngx_http_proxy_create_loc_conf(ngx_conf_
+     conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
+ 
+     conf->upstream.intercept_errors = NGX_CONF_UNSET;
++
++#if (NGX_PROXY_PROTOCOL)
++    conf->upstream.send_proxy_protocol = NGX_CONF_UNSET;
++#endif
++
+ #if (NGX_HTTP_SSL)
+     conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
+ #endif
+@@ -2695,6 +2713,11 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t
+     ngx_conf_merge_value(conf->upstream.intercept_errors,
+                               prev->upstream.intercept_errors, 0);
+ 
++#if (NGX_PROXY_PROTOCOL)
++    ngx_conf_merge_value(conf->upstream.send_proxy_protocol,
++                              prev->upstream.send_proxy_protocol, 0);
++#endif
++
+ #if (NGX_HTTP_SSL)
+     ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
+                               prev->upstream.ssl_session_reuse, 1);
+Index: nginx-1.4.7/src/http/ngx_http.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http.c
++++ nginx-1.4.7/src/http/ngx_http.c
+@@ -1228,6 +1228,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
+ #if (NGX_HTTP_SPDY)
+     ngx_uint_t             spdy;
+ #endif
++#if (NGX_PROXY_PROTOCOL)
++    ngx_uint_t             accept_proxy_protocol;
++#endif
+ 
+     /*
+      * we cannot compare whole sockaddr struct's as kernel
+@@ -1283,6 +1286,10 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
+ #if (NGX_HTTP_SPDY)
+         spdy = lsopt->spdy || addr[i].opt.spdy;
+ #endif
++#if (NGX_PROXY_PROTOCOL)
++        accept_proxy_protocol = lsopt->accept_proxy_protocol
++                                || addr[i].opt.accept_proxy_protocol;
++#endif
+ 
+         if (lsopt->set) {
+ 
+@@ -1316,6 +1323,9 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
+ #if (NGX_HTTP_SPDY)
+         addr[i].opt.spdy = spdy;
+ #endif
++#if (NGX_PROXY_PROTOCOL)
++        addr[i].opt.accept_proxy_protocol = accept_proxy_protocol;
++#endif
+ 
+         return NGX_OK;
+     }
+@@ -1762,6 +1772,11 @@ ngx_http_add_listening(ngx_conf_t *cf, n
+     ls->pool_size = cscf->connection_pool_size;
+     ls->post_accept_timeout = cscf->client_header_timeout;
+ 
++#if (NGX_PROXY_PROTOCOL)
++// CLEANUP:    ls->accept_proxy_protocol = cscf->accept_proxy_protocol;
++    ls->accept_proxy_protocol = addr->opt.accept_proxy_protocol;
++#endif
++
+     clcf = cscf->ctx->loc_conf[ngx_http_core_module.ctx_index];
+ 
+     ls->logp = clcf->error_log;
+@@ -1840,6 +1855,9 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_h
+ #if (NGX_HTTP_SPDY)
+         addrs[i].conf.spdy = addr[i].opt.spdy;
+ #endif
++#if (NGX_PROXY_PROTOCOL)
++        addrs[i].conf.accept_proxy_protocol = addr[i].opt.accept_proxy_protocol;
++#endif
+ 
+         if (addr[i].hash.buckets == NULL
+             && (addr[i].wc_head == NULL
+@@ -1904,6 +1922,9 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_
+ #if (NGX_HTTP_SPDY)
+         addrs6[i].conf.spdy = addr[i].opt.spdy;
+ #endif
++#if (NGX_PROXY_PROTOCOL)
++        addrs6[i].conf.accept_proxy_protocol = addr[i].opt.accept_proxy_protocol;
++#endif
+ 
+         if (addr[i].hash.buckets == NULL
+             && (addr[i].wc_head == NULL
+Index: nginx-1.4.7/src/http/ngx_http_core_module.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http_core_module.c
++++ nginx-1.4.7/src/http/ngx_http_core_module.c
+@@ -4090,6 +4090,15 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx
+             continue;
+         }
+ 
++#if (NGX_PROXY_PROTOCOL)
++        if (ngx_strncmp(value[n].data, "accept_proxy_protocol=on", 24) == 0) {
++            lsopt.accept_proxy_protocol = 1;
++            lsopt.set = 1;
++            lsopt.bind = 1;
++            continue;
++        }
++#endif
++
+         if (ngx_strncmp(value[n].data, "ipv6only=o", 10) == 0) {
+ #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+             struct sockaddr  *sa;
+Index: nginx-1.4.7/src/http/ngx_http_core_module.h
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http_core_module.h
++++ nginx-1.4.7/src/http/ngx_http_core_module.h
+@@ -78,6 +78,11 @@ typedef struct {
+ #if (NGX_HTTP_SPDY)
+     unsigned                   spdy:1;
+ #endif
++
++#if (NGX_PROXY_PROTOCOL)
++    unsigned                   accept_proxy_protocol:2;
++#endif
++
+ #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+     unsigned                   ipv6only:1;
+ #endif
+@@ -234,6 +239,10 @@ struct ngx_http_addr_conf_s {
+ 
+     ngx_http_virtual_names_t  *virtual_names;
+ 
++#if (NGX_PROXY_PROTOCOL)
++    ngx_flag_t                  accept_proxy_protocol;
++#endif
++
+ #if (NGX_HTTP_SSL)
+     unsigned                   ssl:1;
+ #endif
+Index: nginx-1.4.7/src/http/ngx_http_request.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http_request.c
++++ nginx-1.4.7/src/http/ngx_http_request.c
+@@ -63,6 +63,9 @@ static void ngx_http_ssl_handshake(ngx_e
+ static void ngx_http_ssl_handshake_handler(ngx_connection_t *c);
+ #endif
+ 
++#if (NGX_PROXY_PROTOCOL)
++static void ngx_http_proxy_protocol(ngx_event_t *rev);
++#endif
+ 
+ static char *ngx_http_client_errors[] = {
+ 
+@@ -343,6 +346,14 @@ ngx_http_init_connection(ngx_connection_
+     }
+ #endif
+ 
++#if (NGX_PROXY_PROTOCOL)
++    {
++        if (hc->addr_conf->accept_proxy_protocol) {
++            rev->handler = ngx_http_proxy_protocol;
++        }
++    }
++#endif
++
+     if (rev->ready) {
+         /* the deferred accept(), rtsig, aio, iocp */
+ 
+@@ -364,7 +375,6 @@ ngx_http_init_connection(ngx_connection_
+     }
+ }
+ 
+-
+ static void
+ ngx_http_wait_request_handler(ngx_event_t *rev)
+ {
+@@ -469,6 +479,12 @@ ngx_http_wait_request_handler(ngx_event_
+     }
+ 
+     rev->handler = ngx_http_process_request_line;
++
++#if (NGX_PROXY_PROTOCOL)
++    if (hc->addr_conf->accept_proxy_protocol)
++        rev->handler = ngx_http_proxy_protocol;
++#endif
++
+     ngx_http_process_request_line(rev);
+ }
+ 
+@@ -582,6 +598,67 @@ ngx_http_create_request(ngx_connection_t
+     return r;
+ }
+ 
++#if (NGX_PROXY_PROTOCOL)
++
++static void
++ngx_http_proxy_protocol(ngx_event_t *rev)
++{
++    ssize_t                n;
++    size_t                 size = 1024;
++    u_char                 tmpbuf[size];
++    ngx_connection_t      *c;
++    ngx_http_connection_t *hc;
++
++    c = rev->data;
++    hc = c->data;
++    rev->handler = ngx_http_wait_request_handler;
++
++#if (NGX_HTTP_SPDY)
++    {
++        if (hc->addr_conf->spdy) {
++            rev->handler = ngx_http_spdy_init;
++        }
++    }
++#endif
++
++#if (NGX_HTTP_SSL)
++    {
++        if (hc->addr_conf->ssl) {
++            rev->handler = ngx_http_ssl_handshake;
++        }
++    }
++#endif
++
++    n = recv(c->fd, tmpbuf, size, MSG_PEEK);
++
++    if ((n <= 0) && (c->listening)
++            && (hc->addr_conf->accept_proxy_protocol)
++	    && (!c->proxy_protocol)) {
++        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http_proxy_protocol: pp required but not found");
++        return;
++    }
++    if ((n > 0) && (c->listening)
++            && (hc->addr_conf->accept_proxy_protocol)
++	    && (!c->proxy_protocol)) {
++        ssize_t m;
++        if (!(m = ngx_recv_proxy_protocol(c, tmpbuf, n))) {
++            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http_proxy_protocol: pp required but not found");
++            ngx_http_close_connection(c);
++            return;
++        }
++        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "ngx_http_proxy_protocol: pp required and found");
++
++        c->proxy_protocol = 1;
++
++        /* strip the proxy protocol string from the buffer */
++        recv(c->fd, tmpbuf, m, 0);
++    }
++
++    rev->handler(rev);
++}
++
++#endif
++
+ 
+ #if (NGX_HTTP_SSL)
+ 
+Index: nginx-1.4.7/src/http/ngx_http_upstream.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http_upstream.c
++++ nginx-1.4.7/src/http/ngx_http_upstream.c
+@@ -31,6 +31,10 @@ static ngx_int_t ngx_http_upstream_reini
+     ngx_http_upstream_t *u);
+ static void ngx_http_upstream_send_request(ngx_http_request_t *r,
+     ngx_http_upstream_t *u);
++#if (NGX_PROXY_PROTOCOL)
++static void ngx_http_upstream_send_proxy_protocol(ngx_http_request_t *r,
++    ngx_http_upstream_t *u);
++#endif
+ static void ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
+     ngx_http_upstream_t *u);
+ static void ngx_http_upstream_process_header(ngx_http_request_t *r,
+@@ -1255,6 +1259,13 @@ ngx_http_upstream_connect(ngx_http_reque
+ 
+     u->request_sent = 0;
+ 
++#if (NGX_PROXY_PROTOCOL)
++    if (u->conf->send_proxy_protocol && !(u->ssl && c->ssl == NULL)) {
++        ngx_http_upstream_send_proxy_protocol(r, u);
++	return;
++    }
++#endif
++
+     if (rc == NGX_AGAIN) {
+         ngx_add_timer(c->write, u->conf->connect_timeout);
+         return;
+@@ -1498,6 +1509,228 @@ ngx_http_upstream_send_request(ngx_http_
+ }
+ 
+ 
++#if (NGX_PROXY_PROTOCOL)
++
++static void
++ngx_http_upstream_send_proxy_protocol(ngx_http_request_t *r, ngx_http_upstream_t *u)
++{
++    size_t                   len;
++    ngx_int_t                rc;
++    ngx_connection_t        *uc;
++    ngx_connection_t        *cc;
++    ngx_chain_t             *pp_string;
++    ngx_proxy_protocol_t     pp;
++    ngx_buf_t               *b;
++    char                     port[6];
++    u_char                  *addr;
++    struct sockaddr_storage  sa_src;
++    struct sockaddr_storage  sa_dst;
++    socklen_t                addrlen = NGX_SOCKADDRLEN;
++    struct sockaddr_in      *sin_src;
++    struct sockaddr_in      *sin_dst;
++
++#if (NGX_HAVE_INET6)
++
++    struct sockaddr_in6     *sin6_src;
++    struct sockaddr_in6     *sin6_dst;
++
++#endif
++
++
++    uc = u->peer.connection;
++    cc = r->connection;
++
++    if ( !(u->conf->send_proxy_protocol) ) {
++        return;
++    }
++
++    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, uc->log, 0,
++                   "http upstream send proxy protocol");
++
++    if (!u->request_sent && ngx_http_upstream_test_connect(uc) != NGX_OK) {
++        ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
++        return;
++    }
++
++    uc->log->action = "sending proxy protocol to upstream";
++
++    len = 0;
++
++    if (r->connection->proxy_protocol) {
++        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, uc->log, 0,
++                   "PP: got proxy-protocol from client connection");
++
++        switch (cc->sockaddr->sa_family) {
++
++#if (NGX_HAVE_INET6)
++
++            case AF_INET6:
++
++                pp.pp_proto = NGX_PP_PROTO_TCP6;
++                sin6_dst = (struct sockaddr_in6 *) cc->local_sockaddr;
++                sin6_src = (struct sockaddr_in6 *) cc->sockaddr;
++
++                break;
++
++#endif
++
++            default:
++                pp.pp_proto = NGX_PP_PROTO_TCP4;
++                sin_dst = (struct sockaddr_in *) cc->local_sockaddr;
++                sin_src = (struct sockaddr_in *) cc->sockaddr;
++
++        }
++
++    } else {
++
++        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, uc->log, 0,
++                   "PP: collecting information from socket fd");
++
++        getsockname(cc->fd, (struct sockaddr *) &sa_dst, &addrlen);
++
++        switch (sa_dst.ss_family) {
++
++#if (NGX_HAVE_INET6)
++
++            case AF_INET6:
++
++                pp.pp_proto = NGX_PP_PROTO_TCP6;
++                sin6_dst = (struct sockaddr_in6 *) &sa_dst;
++
++                getpeername(cc->fd, (struct sockaddr *) &sa_src, &addrlen);
++                sin6_src = (struct sockaddr_in6 *) &sa_src;
++
++                break;
++
++#endif
++
++            default:
++
++                pp.pp_proto = NGX_PP_PROTO_TCP4;
++                sin_dst = (struct sockaddr_in *) &sa_dst;
++                getpeername(cc->fd, (struct sockaddr *) &sa_src, &addrlen);
++                sin_src = (struct sockaddr_in *) &sa_src;
++        }
++
++
++    }
++
++    switch (pp.pp_proto) {
++
++#if (NGX_HAVE_INET6)
++
++        case NGX_PP_PROTO_TCP6:
++
++            /* dst3 and dst4 */
++            addr = ngx_pcalloc(r->pool, NGX_INET6_ADDRSTRLEN);
++            ngx_inet_ntop(AF_INET6, &sin6_dst->sin6_addr, addr, NGX_INET6_ADDRSTRLEN);
++            pp.pp_dst3_text.data = ngx_pcalloc(r->pool, NGX_INET6_ADDRSTRLEN);
++            pp.pp_dst3_text.len = ngx_strlen(addr);
++            ngx_memcpy(pp.pp_dst3_text.data, addr, pp.pp_dst3_text.len);
++            pp.pp_dst4 = htons(sin6_dst->sin6_port);
++
++            ngx_memzero(addr, NGX_INET6_ADDRSTRLEN);
++
++            /* src3 and src4 */
++            ngx_inet_ntop(AF_INET6, &sin6_src->sin6_addr, addr, NGX_INET6_ADDRSTRLEN);
++            pp.pp_src3_text.data = ngx_pcalloc(r->pool, NGX_INET6_ADDRSTRLEN);
++            pp.pp_src3_text.len = ngx_strlen(addr);
++            ngx_memcpy(pp.pp_src3_text.data, addr, pp.pp_src3_text.len);
++            pp.pp_src4 = htons(sin6_src->sin6_port);
++
++        break;
++
++#endif
++
++        default:
++
++            /* dst3 and dst4 */
++            addr = ngx_pcalloc(r->pool, NGX_INET_ADDRSTRLEN);
++            ngx_inet_ntop(AF_INET, &sin_dst->sin_addr, addr, NGX_INET_ADDRSTRLEN);
++            pp.pp_dst3_text.data = ngx_pcalloc(r->pool, NGX_INET_ADDRSTRLEN);
++            pp.pp_dst3_text.len = ngx_strlen(addr);
++            ngx_memcpy(pp.pp_dst3_text.data, addr, pp.pp_dst3_text.len);
++            pp.pp_dst4 = htons(sin_dst->sin_port);
++
++            ngx_memzero(addr, NGX_INET_ADDRSTRLEN);
++
++            /* src3 and src4 */
++            ngx_inet_ntop(AF_INET, &sin_src->sin_addr, addr, NGX_INET_ADDRSTRLEN);
++            pp.pp_src3_text.data = ngx_pcalloc(r->pool, NGX_INET_ADDRSTRLEN);
++            pp.pp_src3_text.len = ngx_strlen(addr);
++            ngx_memcpy(pp.pp_src3_text.data, addr, pp.pp_src3_text.len);
++            pp.pp_src4 = htons(sin_src->sin_port);
++
++    }
++
++    len += ngx_proxy_protocol_string_length(&pp);
++
++    ngx_print_proxy_protocol(&pp, uc->log);
++
++    b = ngx_create_temp_buf(uc->pool, len);
++    if (b == NULL) {
++        return;
++    }
++
++    pp_string = ngx_alloc_chain_link(uc->pool);
++    if (pp_string == NULL) {
++        return;
++    }
++
++    pp_string->buf = b;
++    pp_string->next = NULL;
++
++    b->last = ngx_cpymem(b->last, "PROXY ", sizeof("PROXY ") - 1);
++
++    switch (pp.pp_proto) {
++        case NGX_PP_PROTO_TCP4:
++            b->last = ngx_cpymem(b->last, "TCP4 ", sizeof("TCP4 ") - 1);
++        break;
++        case NGX_PP_PROTO_TCP6:
++            b->last = ngx_cpymem(b->last, "TCP6 ", sizeof("TCP6 ") - 1);
++        break;
++    }
++
++    /* src3 */
++    b->last = ngx_cpymem(b->last, pp.pp_src3_text.data, pp.pp_src3_text.len);
++    b->last = ngx_cpymem(b->last, " ", 1);
++
++    /* dst3 */
++    b->last = ngx_cpymem(b->last, pp.pp_dst3_text.data, pp.pp_dst3_text.len);
++    b->last = ngx_cpymem(b->last, " ", 1);
++
++    /* src4 */
++    ngx_memzero(port, 6);
++    sprintf(port,"%d", pp.pp_src4);
++    b->last = ngx_cpymem(b->last, port, strlen(port));
++    b->last = ngx_cpymem(b->last, " ", 1);
++
++    /* dst4 */
++    ngx_memzero(port, 6);
++    sprintf(port,"%d", pp.pp_dst4);
++    b->last = ngx_cpymem(b->last, port, strlen(port));
++
++    /* CRLF */
++    b->last = ngx_cpymem(b->last, CRLF, sizeof(CRLF) - 1);
++
++    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, uc->log, 0,
++            "http upstream send proxy protocol: %d -%*s-",
++            ngx_proxy_protocol_string_length(&pp),
++            ngx_proxy_protocol_string_length(&pp) - 2,
++            b->start);
++
++    rc = ngx_output_chain(&u->output, pp_string);
++
++    if (rc == NGX_ERROR) {
++        ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
++        return;
++    }
++
++}
++
++#endif
++
++
+ static void
+ ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
+     ngx_http_upstream_t *u)
+Index: nginx-1.4.7/src/http/ngx_http_upstream.h
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http_upstream.h
++++ nginx-1.4.7/src/http/ngx_http_upstream.h
+@@ -188,6 +188,10 @@ typedef struct {
+     unsigned                         intercept_404:1;
+     unsigned                         change_buffering:1;
+ 
++#if (NGX_PROXY_PROTOCOL)
++    ngx_flag_t                       send_proxy_protocol;
++#endif
++
+ #if (NGX_HTTP_SSL)
+     ngx_ssl_t                       *ssl;
+     ngx_flag_t                       ssl_session_reuse;
+Index: nginx-1.4.7/auto/cc/gcc
+===================================================================
+--- nginx-1.4.7.orig/auto/cc/gcc
++++ nginx-1.4.7/auto/cc/gcc
+@@ -168,7 +168,7 @@ esac
+ 
+ 
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+ 
+ # debug
+ CFLAGS="$CFLAGS -g"
+Index: nginx-1.4.7/auto/cc/icc
+===================================================================
+--- nginx-1.4.7.orig/auto/cc/icc
++++ nginx-1.4.7/auto/cc/icc
+@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
+ esac
+ 
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS "
+ 
+ # debug
+ CFLAGS="$CFLAGS -g"
diff --git a/trunk/package/network/utils/nginx/patches/401-nginx-1.4.0-syslog.patch b/trunk/package/network/utils/nginx/patches/401-nginx-1.4.0-syslog.patch
new file mode 100644
index 00000000..941c79ae
--- /dev/null
+++ b/trunk/package/network/utils/nginx/patches/401-nginx-1.4.0-syslog.patch
@@ -0,0 +1,698 @@
+Index: nginx-1.4.7/src/core/ngx_cycle.c
+===================================================================
+--- nginx-1.4.7.orig/src/core/ngx_cycle.c
++++ nginx-1.4.7/src/core/ngx_cycle.c
+@@ -85,6 +85,12 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
+     cycle->pool = pool;
+     cycle->log = log;
+     cycle->new_log.log_level = NGX_LOG_ERR;
++#if (NGX_ENABLE_SYSLOG)
++    cycle->new_log.facility = SYSLOG_FACILITY;
++    cycle->new_log.facility = ERR_SYSLOG_PRIORITY;
++    cycle->new_log.syslog_on = 0;
++    cycle->new_log.syslog_set = 0;
++#endif
+     cycle->old_cycle = old_cycle;
+ 
+     cycle->conf_prefix.len = old_cycle->conf_prefix.len;
+Index: nginx-1.4.7/src/core/ngx_log.c
+===================================================================
+--- nginx-1.4.7.orig/src/core/ngx_log.c
++++ nginx-1.4.7/src/core/ngx_log.c
+@@ -10,6 +10,15 @@
+ 
+ 
+ static char *ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
++#if (NGX_ENABLE_SYSLOG)
++static char *ngx_set_syslog(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
++void log_exit(ngx_cycle_t *cycle);
++
++typedef struct{
++    ngx_str_t     name;
++    ngx_int_t     macro;
++} ngx_string_to_macro_t;
++#endif
+ 
+ 
+ static ngx_command_t  ngx_errlog_commands[] = {
+@@ -21,6 +30,15 @@ static ngx_command_t  ngx_errlog_command
+      0,
+      NULL},
+ 
++#if (NGX_ENABLE_SYSLOG)
++    {ngx_string("syslog"),
++     NGX_MAIN_CONF|NGX_CONF_TAKE12,
++     ngx_set_syslog,
++     0,
++     0,
++     NULL},
++#endif
++
+     ngx_null_command
+ };
+ 
+@@ -43,7 +61,11 @@ ngx_module_t  ngx_errlog_module = {
+     NULL,                                  /* init thread */
+     NULL,                                  /* exit thread */
+     NULL,                                  /* exit process */
+-    NULL,                                  /* exit master */
++#if (NGX_ENABLE_SYSLOG)
++    log_exit,                              /* exit master */
++#else
++    NULL,
++#endif
+     NGX_MODULE_V1_PADDING
+ };
+ 
+@@ -52,6 +74,48 @@ static ngx_log_t        ngx_log;
+ static ngx_open_file_t  ngx_log_file;
+ ngx_uint_t              ngx_use_stderr = 1;
+ 
++#if (NGX_ENABLE_SYSLOG)
++static ngx_string_to_macro_t ngx_syslog_facilities[] = {
++    {ngx_string("auth"),     LOG_AUTH},
++#if !(NGX_SOLARIS)
++    {ngx_string("authpriv"), LOG_AUTHPRIV},
++#endif
++    {ngx_string("cron"),     LOG_CRON},
++    {ngx_string("daemon"),   LOG_DAEMON},
++#if !(NGX_SOLARIS)
++    {ngx_string("ftp"),      LOG_FTP},
++#endif
++    {ngx_string("kern"),     LOG_KERN},
++    {ngx_string("local0"),   LOG_LOCAL0},
++    {ngx_string("local1"),   LOG_LOCAL1},
++    {ngx_string("local2"),   LOG_LOCAL2},
++    {ngx_string("local3"),   LOG_LOCAL3},
++    {ngx_string("local4"),   LOG_LOCAL4},
++    {ngx_string("local5"),   LOG_LOCAL5},
++    {ngx_string("local6"),   LOG_LOCAL6},
++    {ngx_string("local7"),   LOG_LOCAL7},
++    {ngx_string("lpr"),      LOG_LPR},
++    {ngx_string("mail"),     LOG_MAIL},
++    {ngx_string("news"),     LOG_NEWS},
++    {ngx_string("syslog"),   LOG_SYSLOG},
++    {ngx_string("user"),     LOG_USER},
++    {ngx_string("uucp"),     LOG_UUCP},
++    { ngx_null_string, 0}
++};
++
++static ngx_string_to_macro_t ngx_syslog_priorities[] = {
++    {ngx_string("emerg"), LOG_EMERG},
++    {ngx_string("alert"), LOG_ALERT},
++    {ngx_string("crit"),  LOG_CRIT},
++    {ngx_string("error"), LOG_ERR},
++    {ngx_string("err"),   LOG_ERR},
++    {ngx_string("warn"),  LOG_WARNING},
++    {ngx_string("notice"),LOG_NOTICE},
++    {ngx_string("info"),  LOG_INFO},
++    {ngx_string("debug"), LOG_DEBUG},
++    { ngx_null_string, 0}
++};
++#endif
+ 
+ static ngx_str_t err_levels[] = {
+     ngx_null_string,
+@@ -89,11 +153,16 @@ ngx_log_error_core(ngx_uint_t level, ngx
+     va_list  args;
+ #endif
+     u_char  *p, *last, *msg;
++#if (NGX_ENABLE_SYSLOG)
++    u_char *errstr_syslog;
++#endif
+     u_char   errstr[NGX_MAX_ERROR_STR];
+ 
++#if !(NGX_ENABLE_SYSLOG)
+     if (log->file->fd == NGX_INVALID_FILE) {
+         return;
+     }
++#endif
+ 
+     last = errstr + NGX_MAX_ERROR_STR;
+ 
+@@ -102,6 +171,10 @@ ngx_log_error_core(ngx_uint_t level, ngx
+ 
+     p = errstr + ngx_cached_err_log_time.len;
+ 
++#if (NGX_ENABLE_SYSLOG)
++    errstr_syslog = p;
++#endif
++
+     p = ngx_slprintf(p, last, " [%V] ", &err_levels[level]);
+ 
+     /* pid#tid */
+@@ -140,11 +213,27 @@ ngx_log_error_core(ngx_uint_t level, ngx
+ 
+     ngx_linefeed(p);
+ 
++#if (NGX_ENABLE_SYSLOG)
++    if (log->file != NULL && log->file->name.len != 0) {
+     (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
++    }
++
++    /* Don't send the debug level info to syslog */
++    if (log->syslog_on && level < NGX_LOG_DEBUG) {
++        /* write to syslog */
++        syslog(log->priority, "%.*s", (int)(p - errstr_syslog), errstr_syslog);
++    }
++#else
++    (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
++#endif
+ 
+     if (!ngx_use_stderr
+         || level > NGX_LOG_WARN
++#if (NGX_ENABLE_SYSLOG)
++        || (log->file != NULL && log->file->fd == ngx_stderr))
++#else
+         || log->file->fd == ngx_stderr)
++#endif
+     {
+         return;
+     }
+@@ -367,6 +456,50 @@ ngx_log_create(ngx_cycle_t *cycle, ngx_s
+ }
+ 
+ 
++#if (NGX_ENABLE_SYSLOG)
++ngx_int_t
++ngx_log_get_priority(ngx_conf_t *cf, ngx_str_t *priority)
++{
++    ngx_int_t  p = 0;
++    ngx_uint_t n, match = 0;
++
++    for (n = 0; ngx_syslog_priorities[n].name.len != 0; n++) {
++        if (ngx_strncmp(priority->data, ngx_syslog_priorities[n].name.data, 
++                    ngx_syslog_priorities[n].name.len) == 0) {
++            p = ngx_syslog_priorities[n].macro;
++            match = 1;
++        }
++    }
++
++    if (!match) {
++        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++                "invalid syslog priority \"%V\"", priority);
++        return -1;
++    }
++
++    return p;
++}
++
++
++char *
++ngx_log_set_priority(ngx_conf_t *cf, ngx_str_t *priority, ngx_log_t *log)
++{
++    log->priority = ERR_SYSLOG_PRIORITY;
++
++    if (priority->len == 0) {
++        return NGX_CONF_OK;
++    }
++
++    log->priority = ngx_log_get_priority(cf, priority);
++    if (log->priority == (-1)) {
++        return NGX_CONF_ERROR;
++    }
++
++    return NGX_CONF_OK;
++}
++#endif
++
++
+ char *
+ ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log)
+ {
+@@ -429,6 +562,13 @@ static char *
+ ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ {
+     ngx_str_t  *value, name;
++#if (NGX_ENABLE_SYSLOG)
++    u_char     *off = NULL;
++    ngx_str_t  priority;
++
++    ngx_str_null(&name);
++    ngx_str_null(&priority);
++#endif
+ 
+     if (cf->cycle->new_log.file) {
+         return "is duplicate";
+@@ -436,7 +576,44 @@ ngx_error_log(ngx_conf_t *cf, ngx_comman
+ 
+     value = cf->args->elts;
+ 
++#if (NGX_ENABLE_SYSLOG)
++    if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
++        if (!cf->cycle->new_log.syslog_set) {
++            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++                    "You must set the syslog directive and enable it first.");
++            return NGX_CONF_ERROR;
++        }
++
++        cf->cycle->new_log.syslog_on = 1;
++
++        if (value[1].data[sizeof("syslog") - 1] == ':') {
++            priority.len = value[1].len - sizeof("syslog");
++            priority.data = value[1].data + sizeof("syslog");
++
++            off = (u_char *)ngx_strchr(priority.data, (int) '|');
++            if (off != NULL) {
++                priority.len = off - priority.data;
++
++                off++;
++                name.len = value[1].data + value[1].len - off;
++                name.data = off;
++            }
++        }
++        else {
++            if (value[1].len > sizeof("syslog")) {
++                name.len = value[1].len - sizeof("syslog");
++                name.data = value[1].data + sizeof("syslog");
++            }
++        }
++
++        if (ngx_log_set_priority(cf, &priority, &cf->cycle->new_log) == NGX_CONF_ERROR) {
++            return NGX_CONF_ERROR;
++        }
++    }
++    else if (ngx_strcmp(value[1].data, "stderr") == 0) {
++#else
+     if (ngx_strcmp(value[1].data, "stderr") == 0) {
++#endif
+         ngx_str_null(&name);
+ 
+     } else {
+@@ -457,3 +634,63 @@ ngx_error_log(ngx_conf_t *cf, ngx_comman
+ 
+     return ngx_log_set_levels(cf, &cf->cycle->new_log);
+ }
++
++
++#if (NGX_ENABLE_SYSLOG)
++
++#define SYSLOG_IDENT_NAME "nginx"
++
++static char *
++ngx_set_syslog(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
++{
++    char       *program;
++    ngx_str_t  *value;
++    ngx_int_t   facility, match = 0;
++    ngx_uint_t  n;
++
++    value = cf->args->elts;
++
++    if (cf->cycle->new_log.syslog_set) {
++        return "is duplicate";
++    }
++
++    cf->cycle->new_log.syslog_set = 1;
++
++    for (n = 0; ngx_syslog_facilities[n].name.len != 0; n++) {
++        if (ngx_strncmp(value[1].data, ngx_syslog_facilities[n].name.data, 
++                    ngx_syslog_facilities[n].name.len) == 0) {
++            facility = ngx_syslog_facilities[n].macro;
++            match = 1;
++            break;
++        }
++    }
++
++    if (match) {
++        cf->cycle->new_log.facility = facility;
++        cf->cycle->new_log.priority = ERR_SYSLOG_PRIORITY;
++    }
++    else {
++        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++                "invalid syslog facility \"%V\"", &value[1]);
++        return NGX_CONF_ERROR;
++    }
++
++    program = SYSLOG_IDENT_NAME; 
++    if (cf->args->nelts > 2) {
++        program = (char *) value[2].data;
++    }
++
++    openlog(program, LOG_ODELAY, facility);
++
++    return NGX_CONF_OK;
++}
++
++
++void log_exit(ngx_cycle_t *cycle)
++{
++    if (cycle->new_log.syslog_set) {
++        closelog();
++    }
++}
++#endif
++
+Index: nginx-1.4.7/src/core/ngx_log.h
+===================================================================
+--- nginx-1.4.7.orig/src/core/ngx_log.h
++++ nginx-1.4.7/src/core/ngx_log.h
+@@ -12,6 +12,13 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ 
++#if (NGX_ENABLE_SYSLOG)
++#include <syslog.h>
++
++#define SYSLOG_FACILITY LOG_LOCAL5
++#define ERR_SYSLOG_PRIORITY LOG_ERR
++#endif
++
+ 
+ #define NGX_LOG_STDERR            0
+ #define NGX_LOG_EMERG             1
+@@ -61,6 +68,13 @@ struct ngx_log_s {
+      */
+ 
+     char                *action;
++
++#if (NGX_ENABLE_SYSLOG)
++    ngx_int_t           priority;
++    ngx_int_t           facility;
++    unsigned            syslog_on:1;      /* unsigned :1 syslog_on */
++    unsigned            syslog_set:1;      /*unsigned :1 syslog_set */
++#endif
+ };
+ 
+ 
+@@ -221,6 +235,10 @@ void ngx_cdecl ngx_log_debug_core(ngx_lo
+ 
+ ngx_log_t *ngx_log_init(u_char *prefix);
+ ngx_log_t *ngx_log_create(ngx_cycle_t *cycle, ngx_str_t *name);
++#if (NGX_ENABLE_SYSLOG)
++ngx_int_t ngx_log_get_priority(ngx_conf_t *cf, ngx_str_t *priority);
++char * ngx_log_set_priority(ngx_conf_t *cf, ngx_str_t *priority, ngx_log_t *log);
++#endif
+ char *ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log);
+ void ngx_cdecl ngx_log_abort(ngx_err_t err, const char *fmt, ...);
+ void ngx_cdecl ngx_log_stderr(ngx_err_t err, const char *fmt, ...);
+Index: nginx-1.4.7/src/http/modules/ngx_http_log_module.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/modules/ngx_http_log_module.c
++++ nginx-1.4.7/src/http/modules/ngx_http_log_module.c
+@@ -13,6 +13,11 @@
+ #include <zlib.h>
+ #endif
+ 
++#if (NGX_ENABLE_SYSLOG)
++#include <syslog.h>
++
++#define HTTP_SYSLOG_PRIORITY LOG_NOTICE
++#endif
+ 
+ typedef struct ngx_http_log_op_s  ngx_http_log_op_t;
+ 
+@@ -67,6 +72,11 @@ typedef struct {
+     time_t                      disk_full_time;
+     time_t                      error_log_time;
+     ngx_http_log_fmt_t         *format;
++
++#if (NGX_ENABLE_SYSLOG)
++    ngx_int_t                   priority;
++    unsigned                    syslog_on:1;      /* unsigned :1 syslog_on */
++#endif
+ } ngx_http_log_t;
+ 
+ 
+@@ -348,6 +358,14 @@ ngx_http_log_write(ngx_http_request_t *r
+     time_t               now;
+     ssize_t              n;
+     ngx_err_t            err;
++
++#if (NGX_ENABLE_SYSLOG)
++    n = 0;
++    if (log->syslog_on) {
++        syslog(log->priority, "%.*s", (int)len, buf);
++    }
++#endif
++
+ #if (NGX_ZLIB)
+     ngx_http_log_buf_t  *buffer;
+ #endif
+@@ -355,6 +373,9 @@ ngx_http_log_write(ngx_http_request_t *r
+     if (log->script == NULL) {
+         name = log->file->name.data;
+ 
++#if (NGX_ENABLE_SYSLOG)
++        if (name != NULL) {
++#endif
+ #if (NGX_ZLIB)
+         buffer = log->file->data;
+ 
+@@ -367,7 +388,11 @@ ngx_http_log_write(ngx_http_request_t *r
+ #else
+         n = ngx_write_fd(log->file->fd, buf, len);
+ #endif
+-
++#if (NGX_ENABLE_SYSLOG)
++        } else {
++            n = len;
++        }
++#endif
+     } else {
+         name = NULL;
+         n = ngx_http_log_script_write(r, log->script, &name, buf, len);
+@@ -1068,6 +1093,10 @@ ngx_http_log_merge_loc_conf(ngx_conf_t *
+     log->script = NULL;
+     log->disk_full_time = 0;
+     log->error_log_time = 0;
++#if (NGX_ENABLE_SYSLOG)
++    log->priority = HTTP_SYSLOG_PRIORITY;
++    log->syslog_on = 0;
++#endif
+ 
+     lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module);
+     fmt = lmcf->formats.elts;
+@@ -1096,6 +1125,13 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
+     ngx_http_log_main_conf_t   *lmcf;
+     ngx_http_script_compile_t   sc;
+ 
++#if (NGX_ENABLE_SYSLOG)
++    u_char                     *off;
++    ngx_str_t                   priority;
++    ngx_uint_t                  syslog_on = 0;
++    name = priority = (ngx_str_t)ngx_null_string;
++#endif
++
+     value = cf->args->elts;
+ 
+     if (ngx_strcmp(value[1].data, "off") == 0) {
+@@ -1108,6 +1144,38 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
+                            "invalid parameter \"%V\"", &value[2]);
+         return NGX_CONF_ERROR;
+     }
++#if (NGX_ENABLE_SYSLOG)
++    else if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
++        if (!cf->cycle->new_log.syslog_set) {
++            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++                               "You must set the syslog directive and enable it first.");
++            return NGX_CONF_ERROR;
++        }
++
++        syslog_on = 1;
++        if (value[1].data[sizeof("syslog") - 1] == ':') {
++            priority.len = value[1].len - sizeof("syslog");
++            priority.data = value[1].data + sizeof("syslog");
++
++            off = (u_char*) ngx_strchr(priority.data, '|'); 
++            if (off != NULL) {
++                priority.len = off - priority.data;
++                
++                off++;
++                name.len = value[1].data + value[1].len - off;
++                name.data = off;
++            }
++        }
++        else {
++            if (value[1].len > sizeof("syslog")) {
++                name.len = value[1].len - sizeof("syslog");
++                name.data = value[1].data + sizeof("syslog");
++            }
++        }
++    } else {
++        name = value[1];
++    }
++#endif
+ 
+     if (llcf->logs == NULL) {
+         llcf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t));
+@@ -1125,6 +1193,52 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
+ 
+     ngx_memzero(log, sizeof(ngx_http_log_t));
+ 
++#if (NGX_ENABLE_SYSLOG)
++    log->syslog_on = syslog_on;
++
++    if (priority.len == 0) {
++        log->priority = HTTP_SYSLOG_PRIORITY;
++    }
++    else {
++        log->priority = ngx_log_get_priority(cf, &priority);
++    }
++
++    if (name.len != 0) {
++        n = ngx_http_script_variables_count(&name);
++
++        if (n == 0) {
++            log->file = ngx_conf_open_file(cf->cycle, &name);
++            if (log->file == NULL) {
++                return NGX_CONF_ERROR;
++            }
++        } else {
++            if (ngx_conf_full_name(cf->cycle, &name, 0) != NGX_OK) {
++                return NGX_CONF_ERROR;
++            }
++            log->script = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_script_t));
++            if (log->script == NULL) {
++                return NGX_CONF_ERROR;
++            }
++            ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
++            sc.cf = cf;
++            sc.source = &name;
++            sc.lengths = &log->script->lengths;
++            sc.values = &log->script->values;
++            sc.variables = n;
++            sc.complete_lengths = 1;
++            sc.complete_values = 1;
++            if (ngx_http_script_compile(&sc) != NGX_OK) {
++                return NGX_CONF_ERROR;
++            }
++        }
++    }
++    else {
++        log->file = ngx_conf_open_file(cf->cycle, &name);
++        if (log->file == NULL) {
++            return NGX_CONF_ERROR;
++        }
++    }
++#else
+     n = ngx_http_script_variables_count(&value[1]);
+ 
+     if (n == 0) {
+@@ -1157,6 +1271,7 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx
+             return NGX_CONF_ERROR;
+         }
+     }
++#endif
+ 
+     if (cf->args->nelts >= 3) {
+         name = value[2];
+Index: nginx-1.4.7/src/http/ngx_http_core_module.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http_core_module.c
++++ nginx-1.4.7/src/http/ngx_http_core_module.c
+@@ -1462,6 +1462,9 @@ ngx_http_update_location_config(ngx_http
+ 
+     if (r == r->main) {
+         ngx_http_set_connection_log(r->connection, clcf->error_log);
++#if (NGX_ENABLE_SYSLOG)
++        r->connection->log->priority = clcf->error_log->priority;
++#endif
+     }
+ 
+     if ((ngx_io.flags & NGX_IO_SENDFILE) && clcf->sendfile) {
+@@ -4901,6 +4904,15 @@ ngx_http_core_error_log(ngx_conf_t *cf,
+ 
+     ngx_str_t  *value, name;
+ 
++#if (NGX_ENABLE_SYSLOG)
++    u_char     *off = NULL;
++    ngx_int_t   syslog_on = 0;
++    ngx_str_t   priority;
++
++    name = priority = (ngx_str_t) ngx_null_string;
++#endif
++
++
+     if (clcf->error_log) {
+         return "is duplicate";
+     }
+@@ -4910,6 +4922,36 @@ ngx_http_core_error_log(ngx_conf_t *cf,
+     if (ngx_strcmp(value[1].data, "stderr") == 0) {
+         ngx_str_null(&name);
+ 
++#if (NGX_ENABLE_SYSLOG)
++    } else if (ngx_strncmp(value[1].data, "syslog", sizeof("syslog") - 1) == 0) {
++        if (!cf->cycle->new_log.syslog_set) {
++            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
++                    "You must set the syslog directive and enable it first.");
++            return NGX_CONF_ERROR;
++        }
++
++        syslog_on = 1;
++
++        if (value[1].data[sizeof("syslog") - 1] == ':') {
++            priority.len = value[1].len - sizeof("syslog");
++            priority.data = value[1].data + sizeof("syslog");
++
++            off = (u_char*) ngx_strchr(priority.data, '|'); 
++            if (off != NULL) {
++                priority.len = off - priority.data;
++
++                off++;
++                name.len = value[1].data + value[1].len - off;
++                name.data = off;
++            }
++        }
++        else {
++            if (value[1].len > sizeof("syslog")) {
++                name.len = value[1].len - sizeof("syslog");
++                name.data = value[1].data + sizeof("syslog");
++            }
++        }
++#endif
+     } else {
+         name = value[1];
+     }
+@@ -4919,6 +4961,17 @@ ngx_http_core_error_log(ngx_conf_t *cf,
+         return NGX_CONF_ERROR;
+     }
+ 
++#if (NGX_ENABLE_SYSLOG)
++    if (syslog_on) {
++        clcf->error_log->syslog_on = 1;
++        if (ngx_log_set_priority(cf, &priority, clcf->error_log) == NGX_CONF_ERROR) {
++            return NGX_CONF_ERROR;
++        }
++    }
++
++    clcf->error_log->log_level = 0;
++#endif
++
+     if (cf->args->nelts == 2) {
+         clcf->error_log->log_level = NGX_LOG_ERR;
+         return NGX_CONF_OK;
+Index: nginx-1.4.7/src/http/ngx_http_request.c
+===================================================================
+--- nginx-1.4.7.orig/src/http/ngx_http_request.c
++++ nginx-1.4.7/src/http/ngx_http_request.c
+@@ -533,6 +533,9 @@ ngx_http_create_request(ngx_connection_t
+     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+ 
+     ngx_http_set_connection_log(r->connection, clcf->error_log);
++#if (NGX_ENABLE_SYSLOG)
++    c->log->priority = clcf->error_log->priority;
++#endif
+ 
+     r->header_in = hc->nbusy ? hc->busy[0] : c->buffer;
+ 
+@@ -872,6 +875,9 @@ ngx_http_ssl_servername(ngx_ssl_conn_t *
+     clcf = ngx_http_get_module_loc_conf(hc->conf_ctx, ngx_http_core_module);
+ 
+     ngx_http_set_connection_log(c, clcf->error_log);
++#if (NGX_ENABLE_SYSLOG)
++    c->log->priority = clcf->error_log->priority;
++#endif
+ 
+     sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
+ 
+@@ -2077,6 +2083,9 @@ ngx_http_set_virtual_server(ngx_http_req
+     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+ 
+     ngx_http_set_connection_log(r->connection, clcf->error_log);
++#if (NGX_ENABLE_SYSLOG)
++    r->connection->log->priority = clcf->error_log->priority;
++#endif
+ 
+     return NGX_OK;
+ }
diff --git a/trunk/package/network/utils/nmap/Makefile b/trunk/package/network/utils/nmap/Makefile
new file mode 100644
index 00000000..251b91e2
--- /dev/null
+++ b/trunk/package/network/utils/nmap/Makefile
@@ -0,0 +1,143 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+#TODO
+#
+# * uClibcpp not supported, performance +100x slower. libstdcpp is being used. https://bugs.busybox.net/show_bug.cgi?id=2545
+# * liblua is still not recognized/blindly accepted. Impossible to compile with support
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nmap
+PKG_VERSION:=6.47
+PKG_RELEASE:=2
+PKG_MAINTAINER=Nuno Goncalves <nunojpg@gmail.com>
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://nmap.org/dist/
+PKG_MD5SUM:=edfe81f6763223c0a29bfa15a8526e2a
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+NMAP_DEPENDS:=+libpcap +libstdcpp
+NCAT_DEPENDS:=+libpcap
+NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
+NDIFF_DEPENDS:=+python
+
+define Package/nmap/default
+  SUBMENU:=NMAP Suite
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://nmap.org/
+endef
+
+define Package/nmap
+$(call Package/nmap/default)
+  DEPENDS:=$(NMAP_DEPENDS)
+  VARIANT:=nossl
+  TITLE:=Utility for network exploration or security auditing
+endef
+
+define Package/nmap-ssl
+$(call Package/nmap/default)
+  DEPENDS:=$(NMAP_DEPENDS) +libopenssl
+  VARIANT:=ssl
+  TITLE:=Nmap (with OpenSSL support)
+endef
+
+define Package/ncat
+$(call Package/nmap/default)
+  DEPENDS:=$(NCAT_DEPENDS)
+  VARIANT:=nossl
+  TITLE:=Much-improved reimplementation of Netcat
+endef
+
+define Package/ncat-ssl
+$(call Package/nmap/default)
+  DEPENDS:=$(NCAT_DEPENDS) +libopenssl
+  VARIANT:=ssl
+  TITLE:=Ncat (with OpenSSL support)
+endef
+
+define Package/nping
+$(call Package/nmap/default)
+  DEPENDS:=$(NPING_DEPENDS)
+  VARIANT:=nossl
+  TITLE:=Network packet generation tool / ping utility
+endef
+
+define Package/ndiff
+$(call Package/nmap/default)
+  DEPENDS:=$(NDIFF_DEPENDS)
+  VARIANT:=nossl
+  TITLE:=Utility to compare the results of Nmap scans
+endef
+
+CONFIGURE_ARGS += \
+	--with-libdnet=included \
+	--with-libpcre=included \
+	--with-libpcap="$(STAGING_DIR)/usr" \
+	--without-liblua \
+	--without-zenmap
+
+CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-builtin"
+
+ifeq ($(BUILD_VARIANT),ssl)
+	CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"
+else
+	CONFIGURE_ARGS += --without-openssl
+endif
+
+define Package/nmap/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/share/nmap
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
+endef
+
+define Package/nmap-ssl/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/share/nmap
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/* $(1)/usr/share/nmap/
+endef
+
+define Package/ncat/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
+endef
+
+define Package/ncat-ssl/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncat $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/share/ncat
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/ncat/ca-bundle.crt $(1)/usr/share/ncat/
+endef
+
+define Package/ndiff/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndiff $(1)/usr/bin/
+endef
+
+define Package/nping/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nping $(1)/usr/bin/
+endef
+
+
+$(eval $(call BuildPackage,nmap))
+$(eval $(call BuildPackage,nmap-ssl))
+$(eval $(call BuildPackage,ncat))
+$(eval $(call BuildPackage,ncat-ssl))
+$(eval $(call BuildPackage,nping))
+$(eval $(call BuildPackage,ndiff))
diff --git a/trunk/package/network/utils/owipcalc/Makefile b/trunk/package/network/utils/owipcalc/Makefile
new file mode 100644
index 00000000..9d6b3979
--- /dev/null
+++ b/trunk/package/network/utils/owipcalc/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2012 Jo-Philipp Wich <jow@openwrt.org>
+#
+# This is free software, licensed under the Apache 2 license.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=owipcalc
+PKG_RELEASE:=3
+PKG_LICENSE:=Apache-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/owipcalc
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Simple IPv4/IPv6 address calculator
+  MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+endef
+
+define Package/owipcalc/description
+  The owipcalc utility supports a number of calculations and tests to work
+  with ip-address ranges, this is useful for scripts that e.g. need to
+  partition ipv6-prefixes into small subnets or to calculate address ranges
+  for dhcp pools.
+endef
+
+
+define Build/Prepare
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) \
+		-o $(PKG_BUILD_DIR)/owipcalc $(PKG_BUILD_DIR)/owipcalc.c
+endef
+
+
+define Package/owipcalc/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/owipcalc $(1)/usr/bin/owipcalc
+endef
+
+$(eval $(call BuildPackage,owipcalc))
diff --git a/trunk/package/network/utils/owipcalc/src/owipcalc.c b/trunk/package/network/utils/owipcalc/src/owipcalc.c
new file mode 100644
index 00000000..b1961269
--- /dev/null
+++ b/trunk/package/network/utils/owipcalc/src/owipcalc.c
@@ -0,0 +1,951 @@
+/*
+ * owipcalc - libreCMC IP Calculator
+ *
+ *   Copyright (C) 2012 Jo-Philipp Wich <jow@openwrt.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include <string.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
+
+
+struct cidr {
+	uint8_t family;
+	uint32_t prefix;
+	union {
+		struct in_addr v4;
+		struct in6_addr v6;
+	} addr;
+	union {
+		char v4[sizeof("255.255.255.255/255.255.255.255 ")];
+		char v6[sizeof("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:255.255.255.255/128 ")];
+	} buf;
+	struct cidr *next;
+};
+
+struct op {
+	const char *name;
+	const char *desc;
+	struct {
+		bool (*a1)(struct cidr *a);
+		bool (*a2)(struct cidr *a, struct cidr *b);
+	} f4;
+	struct {
+		bool (*a1)(struct cidr *a);
+		bool (*a2)(struct cidr *a, struct cidr *b);
+	} f6;
+};
+
+
+static bool quiet = false;
+static bool printed = false;
+
+static struct cidr *stack = NULL;
+
+#define qprintf(...) \
+	do { \
+		if (!quiet) printf(__VA_ARGS__); \
+		printed = true; \
+	} while(0)
+
+static void cidr_push(struct cidr *a)
+{
+	if (a)
+	{
+		a->next = stack;
+		stack = a;
+	}
+}
+
+static bool cidr_pop(struct cidr *a)
+{
+	struct cidr *old = stack;
+
+	if (old)
+	{
+		stack = stack->next;
+		free(old);
+
+		return true;
+	}
+
+	return false;
+}
+
+static struct cidr * cidr_clone(struct cidr *a)
+{
+	struct cidr *b = malloc(sizeof(*b));
+
+	if (!b)
+	{
+		fprintf(stderr, "out of memory\n");
+		exit(255);
+	}
+
+	memcpy(b, a, sizeof(*b));
+	cidr_push(b);
+
+	return b;
+}
+
+
+static struct cidr * cidr_parse4(const char *s)
+{
+	char *p = NULL, *r;
+	struct in_addr mask;
+	struct cidr *addr = malloc(sizeof(struct cidr));
+
+	if (!addr || (strlen(s) >= sizeof(addr->buf.v4)))
+		goto err;
+
+	snprintf(addr->buf.v4, sizeof(addr->buf.v4), "%s", s);
+
+	addr->family = AF_INET;
+
+	if ((p = strchr(addr->buf.v4, '/')) != NULL)
+	{
+		*p++ = 0;
+
+		if (strchr(p, '.') != NULL)
+		{
+			if (inet_pton(AF_INET, p, &mask) != 1)
+				goto err;
+
+			for (addr->prefix = 0; mask.s_addr; mask.s_addr >>= 1)
+				addr->prefix += (mask.s_addr & 1);
+		}
+		else
+		{
+			addr->prefix = strtoul(p, &r, 10);
+
+			if ((p == r) || (*r != 0) || (addr->prefix > 32))
+				goto err;
+		}
+	}
+	else
+	{
+		addr->prefix = 32;
+	}
+
+	if (p == addr->buf.v4+1)
+		memset(&addr->addr.v4, 0, sizeof(addr->addr.v4));
+	else if (inet_pton(AF_INET, addr->buf.v4, &addr->addr.v4) != 1)
+		goto err;
+
+	return addr;
+
+err:
+	if (addr)
+		free(addr);
+
+	return NULL;
+}
+
+static bool cidr_add4(struct cidr *a, struct cidr *b)
+{
+	uint32_t x = ntohl(a->addr.v4.s_addr);
+	uint32_t y = ntohl(b->addr.v4.s_addr);
+
+	struct cidr *n = cidr_clone(a);
+
+	if ((n->family != AF_INET) || (b->family != AF_INET))
+		return false;
+
+	if ((uint32_t)(x + y) < x)
+	{
+		fprintf(stderr, "overflow during 'add'\n");
+		return false;
+	}
+
+	n->addr.v4.s_addr = htonl(x + y);
+	return true;
+}
+
+static bool cidr_sub4(struct cidr *a, struct cidr *b)
+{
+	uint32_t x = ntohl(a->addr.v4.s_addr);
+	uint32_t y = ntohl(b->addr.v4.s_addr);
+
+	struct cidr *n = cidr_clone(a);
+
+	if ((n->family != AF_INET) || (b->family != AF_INET))
+		return false;
+
+	if ((uint32_t)(x - y) > x)
+	{
+		fprintf(stderr, "underflow during 'sub'\n");
+		return false;
+	}
+
+	n->addr.v4.s_addr = htonl(x - y);
+	return true;
+}
+
+static bool cidr_network4(struct cidr *a)
+{
+	struct cidr *n = cidr_clone(a);
+
+	n->addr.v4.s_addr &= htonl(~((1 << (32 - n->prefix)) - 1));
+	n->prefix = 32;
+
+	return true;
+}
+
+static bool cidr_broadcast4(struct cidr *a)
+{
+	struct cidr *n = cidr_clone(a);
+
+	n->addr.v4.s_addr |= htonl(((1 << (32 - n->prefix)) - 1));
+	n->prefix = 32;
+
+	return true;
+}
+
+static bool cidr_contains4(struct cidr *a, struct cidr *b)
+{
+	uint32_t net1 = a->addr.v4.s_addr & htonl(~((1 << (32 - a->prefix)) - 1));
+	uint32_t net2 = b->addr.v4.s_addr & htonl(~((1 << (32 - a->prefix)) - 1));
+
+	if (printed)
+		qprintf(" ");
+
+	if ((b->prefix >= a->prefix) && (net1 == net2))
+	{
+		qprintf("1");
+		return true;
+	}
+	else
+	{
+		qprintf("0");
+		return false;
+	}
+}
+
+static bool cidr_netmask4(struct cidr *a)
+{
+	struct cidr *n = cidr_clone(a);
+
+	n->addr.v4.s_addr = htonl(~((1 << (32 - n->prefix)) - 1));
+	n->prefix = 32;
+
+	return true;
+}
+
+static bool cidr_private4(struct cidr *a)
+{
+	uint32_t x = ntohl(a->addr.v4.s_addr);
+
+	if (printed)
+		qprintf(" ");
+
+	if (((x >= 0x0A000000) && (x <= 0x0AFFFFFF)) ||
+	    ((x >= 0xAC100000) && (x <= 0xAC1FFFFF)) ||
+	    ((x >= 0xC0A80000) && (x <= 0xC0A8FFFF)))
+	{
+		qprintf("1");
+		return true;
+	}
+	else
+	{
+		qprintf("0");
+		return false;
+	}
+}
+
+static bool cidr_linklocal4(struct cidr *a)
+{
+	uint32_t x = ntohl(a->addr.v4.s_addr);
+
+	if (printed)
+		qprintf(" ");
+
+	if ((x >= 0xA9FE0000) && (x <= 0xA9FEFFFF))
+	{
+		qprintf("1");
+		return true;
+	}
+	else
+	{
+		qprintf("0");
+		return false;
+	}
+}
+
+static bool cidr_prev4(struct cidr *a, struct cidr *b)
+{
+	struct cidr *n = cidr_clone(a);
+
+	n->prefix = b->prefix;
+	n->addr.v4.s_addr -= htonl(1 << (32 - b->prefix));
+
+	return true;
+}
+
+static bool cidr_next4(struct cidr *a, struct cidr *b)
+{
+	struct cidr *n = cidr_clone(a);
+
+	n->prefix = b->prefix;
+	n->addr.v4.s_addr += htonl(1 << (32 - b->prefix));
+
+	return true;
+}
+
+static bool cidr_6to4(struct cidr *a)
+{
+	struct cidr *n = cidr_clone(a);
+	uint32_t x = a->addr.v4.s_addr;
+
+	memset(&n->addr.v6.s6_addr, 0, sizeof(n->addr.v6.s6_addr));
+
+	n->family = AF_INET6;
+	n->prefix = 48;
+
+	n->addr.v6.s6_addr[0] = 0x20;
+	n->addr.v6.s6_addr[1] = 0x02;
+	n->addr.v6.s6_addr[2] = (x >> 24);
+	n->addr.v6.s6_addr[3] = (x >> 16) & 0xFF;
+	n->addr.v6.s6_addr[4] = (x >>  8) & 0xFF;
+	n->addr.v6.s6_addr[5] = x & 0xFF;
+
+	return true;
+}
+
+static bool cidr_print4(struct cidr *a)
+{
+	char *p;
+
+	if (!a || (a->family != AF_INET))
+		return false;
+
+	if (!(p = (char *)inet_ntop(AF_INET, &a->addr.v4, a->buf.v4, sizeof(a->buf.v4))))
+		return false;
+
+	if (printed)
+		qprintf(" ");
+
+	qprintf("%s", p);
+
+	if (a->prefix < 32)
+		qprintf("/%u", a->prefix);
+
+	cidr_pop(a);
+
+	return true;
+}
+
+
+static struct cidr * cidr_parse6(const char *s)
+{
+	char *p = NULL, *r;
+	struct cidr *addr = malloc(sizeof(struct cidr));
+
+	if (!addr || (strlen(s) >= sizeof(addr->buf.v6)))
+		goto err;
+
+	snprintf(addr->buf.v4, sizeof(addr->buf.v6), "%s", s);
+
+	addr->family = AF_INET6;
+
+	if ((p = strchr(addr->buf.v4, '/')) != NULL)
+	{
+		*p++ = 0;
+
+		addr->prefix = strtoul(p, &r, 10);
+
+		if ((p == r) || (*r != 0) || (addr->prefix > 128))
+			goto err;
+	}
+	else
+	{
+		addr->prefix = 128;
+	}
+
+	if (p == addr->buf.v4+1)
+		memset(&addr->addr.v6, 0, sizeof(addr->addr.v6));
+	else if (inet_pton(AF_INET6, addr->buf.v4, &addr->addr.v6) != 1)
+		goto err;
+
+	return addr;
+
+err:
+	if (addr)
+		free(addr);
+
+	return NULL;
+}
+
+static bool cidr_add6(struct cidr *a, struct cidr *b)
+{
+	uint8_t idx = 15, carry = 0, overflow = 0;
+
+	struct cidr *n = cidr_clone(a);
+	struct in6_addr *x = &n->addr.v6;
+	struct in6_addr *y = &b->addr.v6;
+
+	if ((a->family != AF_INET6) || (b->family != AF_INET6))
+		return false;
+
+	do {
+		overflow = !!((x->s6_addr[idx] + y->s6_addr[idx] + carry) >= 256);
+		x->s6_addr[idx] += y->s6_addr[idx] + carry;
+		carry = overflow;
+	}
+	while (idx-- > 0);
+
+	if (carry)
+	{
+		fprintf(stderr, "overflow during 'add'\n");
+		return false;
+	}
+
+	return true;
+}
+
+static bool cidr_sub6(struct cidr *a, struct cidr *b)
+{
+	uint8_t idx = 15, carry = 0, underflow = 0;
+
+	struct cidr *n = cidr_clone(a);
+	struct in6_addr *x = &n->addr.v6;
+	struct in6_addr *y = &b->addr.v6;
+
+	if ((n->family != AF_INET6) || (b->family != AF_INET6))
+		return false;
+
+	do {
+		underflow = !!((x->s6_addr[idx] - y->s6_addr[idx] - carry) < 0);
+		x->s6_addr[idx] -= y->s6_addr[idx] + carry;
+		carry = underflow;
+	}
+	while (idx-- > 0);
+
+	if (carry)
+	{
+		fprintf(stderr, "underflow during 'sub'\n");
+		return false;
+	}
+
+	return true;
+}
+
+static bool cidr_prev6(struct cidr *a, struct cidr *b)
+{
+	uint8_t idx, carry = 1, underflow = 0;
+	struct cidr *n = cidr_clone(a);
+	struct in6_addr *x = &n->addr.v6;
+
+	if (b->prefix == 0)
+	{
+		fprintf(stderr, "underflow during 'prev'\n");
+		return false;
+	}
+
+	idx = (b->prefix - 1) / 8;
+
+	do {
+		underflow = !!((x->s6_addr[idx] - carry) < 0);
+		x->s6_addr[idx] -= carry;
+		carry = underflow;
+	}
+	while (idx-- > 0);
+
+	if (carry)
+	{
+		fprintf(stderr, "underflow during 'prev'\n");
+		return false;
+	}
+
+	n->prefix = b->prefix;
+
+	return true;
+}
+
+static bool cidr_next6(struct cidr *a, struct cidr *b)
+{
+	uint8_t idx, carry = 1, overflow = 0;
+	struct cidr *n = cidr_clone(a);
+	struct in6_addr *x = &n->addr.v6;
+
+	if (b->prefix == 0)
+	{
+		fprintf(stderr, "overflow during 'next'\n");
+		return false;
+	}
+
+	idx = (b->prefix - 1) / 8;
+
+	do {
+		overflow = !!((x->s6_addr[idx] + carry) >= 256);
+		x->s6_addr[idx] += carry;
+		carry = overflow;
+	}
+	while (idx-- > 0);
+
+	if (carry)
+	{
+		fprintf(stderr, "overflow during 'next'\n");
+		return false;
+	}
+
+	n->prefix = b->prefix;
+
+	return true;
+}
+
+static bool cidr_network6(struct cidr *a)
+{
+	uint8_t i;
+	struct cidr *n = cidr_clone(a);
+
+	for (i = 0; i < (128 - n->prefix) / 8; i++)
+		n->addr.v6.s6_addr[15-i] = 0;
+
+	if ((128 - n->prefix) % 8)
+		n->addr.v6.s6_addr[15-i] &= ~((1 << ((128 - n->prefix) % 8)) - 1);
+
+	return true;
+}
+
+static bool cidr_contains6(struct cidr *a, struct cidr *b)
+{
+	struct cidr *n = cidr_clone(a);
+	struct in6_addr *x = &n->addr.v6;
+	struct in6_addr *y = &b->addr.v6;
+	uint8_t i = (128 - n->prefix) / 8;
+	uint8_t m = ~((1 << ((128 - n->prefix) % 8)) - 1);
+	uint8_t net1 = x->s6_addr[15-i] & m;
+	uint8_t net2 = y->s6_addr[15-i] & m;
+
+	if (printed)
+		qprintf(" ");
+
+	if ((b->prefix >= n->prefix) && (net1 == net2) &&
+	    ((i == 15) || !memcmp(&x->s6_addr, &y->s6_addr, 15-i)))
+	{
+		qprintf("1");
+		return true;
+	}
+	else
+	{
+		qprintf("0");
+		return false;
+	}
+}
+
+static bool cidr_linklocal6(struct cidr *a)
+{
+	if (printed)
+		qprintf(" ");
+
+	if ((a->addr.v6.s6_addr[0] == 0xFE) &&
+	    (a->addr.v6.s6_addr[1] >= 0x80) &&
+	    (a->addr.v6.s6_addr[1] <= 0xBF))
+	{
+		qprintf("1");
+		return true;
+	}
+	else
+	{
+		qprintf("0");
+		return false;
+	}
+}
+
+static bool cidr_ula6(struct cidr *a)
+{
+	if (printed)
+		qprintf(" ");
+
+	if ((a->addr.v6.s6_addr[0] >= 0xFC) &&
+	    (a->addr.v6.s6_addr[0] <= 0xFD))
+	{
+		qprintf("1");
+		return true;
+	}
+	else
+	{
+		qprintf("0");
+		return false;
+	}
+}
+
+static bool cidr_print6(struct cidr *a)
+{
+	char *p;
+
+	if (!a || (a->family != AF_INET6))
+		return NULL;
+
+	if (!(p = (char *)inet_ntop(AF_INET6, &a->addr.v6, a->buf.v6, sizeof(a->buf.v6))))
+		return false;
+
+	if (printed)
+		qprintf(" ");
+
+	qprintf("%s", p);
+
+	if (a->prefix < 128)
+		qprintf("/%u", a->prefix);
+
+	cidr_pop(a);
+
+	return true;
+}
+
+
+static struct cidr * cidr_parse(const char *op, const char *s, int af_hint)
+{
+	char *r;
+	struct cidr *a;
+
+	uint8_t i;
+	uint32_t sum = strtoul(s, &r, 0);
+
+	if ((r > s) && (*r == 0))
+	{
+		a = malloc(sizeof(struct cidr));
+
+		if (!a)
+			return NULL;
+
+		if (af_hint == AF_INET)
+		{
+			a->family = AF_INET;
+			a->prefix = sum;
+			a->addr.v4.s_addr = htonl(sum);
+		}
+		else
+		{
+			a->family = AF_INET6;
+			a->prefix = sum;
+
+			for (i = 0; i <= 15; i++)
+			{
+				a->addr.v6.s6_addr[15-i] = sum % 256;
+				sum >>= 8;
+			}
+		}
+
+		return a;
+	}
+
+	if (strchr(s, ':'))
+		a = cidr_parse6(s);
+	else
+		a = cidr_parse4(s);
+
+	if (!a)
+		return NULL;
+
+	if (a->family != af_hint)
+	{
+		fprintf(stderr, "attempt to '%s' %s with %s address\n",
+				op,
+				(af_hint == AF_INET) ? "ipv4" : "ipv6",
+				(af_hint != AF_INET) ? "ipv4" : "ipv6");
+		exit(4);
+	}
+
+	return a;
+}
+
+static bool cidr_howmany(struct cidr *a, struct cidr *b)
+{
+	if (printed)
+		qprintf(" ");
+
+	if (b->prefix < a->prefix)
+		qprintf("0");
+	else
+		qprintf("%u", 1 << (b->prefix - a->prefix));
+
+	return true;
+}
+
+static bool cidr_prefix(struct cidr *a, struct cidr *b)
+{
+	a->prefix = b->prefix;
+	return true;
+}
+
+static bool cidr_quiet(struct cidr *a)
+{
+	quiet = true;
+	return true;
+}
+
+
+struct op ops[] = {
+	{ .name = "add",
+	  .desc = "Add argument to base address",
+	  .f4.a2 = cidr_add4,
+	  .f6.a2 = cidr_add6 },
+
+	{ .name = "sub",
+	  .desc = "Substract argument from base address",
+	  .f4.a2 = cidr_sub4,
+	  .f6.a2 = cidr_sub6 },
+
+	{ .name = "next",
+	  .desc = "Advance base address to next prefix of given size",
+	  .f4.a2 = cidr_next4,
+	  .f6.a2 = cidr_next6 },
+
+	{ .name = "prev",
+	  .desc = "Lower base address to previous prefix of give size",
+	  .f4.a2 = cidr_prev4,
+	  .f6.a2 = cidr_prev6 },
+
+	{ .name = "network",
+	  .desc = "Turn base address into network address",
+	  .f4.a1 = cidr_network4,
+	  .f6.a1 = cidr_network6 },
+
+	{ .name = "broadcast",
+	  .desc = "Turn base address into broadcast address",
+	  .f4.a1 = cidr_broadcast4 },
+
+	{ .name = "prefix",
+	  .desc = "Set the prefix of base address to argument",
+	  .f4.a2 = cidr_prefix,
+	  .f6.a2 = cidr_prefix },
+
+	{ .name = "netmask",
+	  .desc = "Calculate netmask of base address",
+	  .f4.a1 = cidr_netmask4 },
+
+	{ .name = "6to4",
+	  .desc = "Calculate 6to4 prefix of given ipv4-address",
+	  .f4.a1 = cidr_6to4 },
+
+	{ .name = "howmany",
+	  .desc = "Print amount of righ-hand prefixes that fit into base address",
+	  .f4.a2 = cidr_howmany,
+	  .f6.a2 = cidr_howmany },
+
+	{ .name = "contains",
+	  .desc = "Print '1' if argument fits into base address or '0' if not",
+	  .f4.a2 = cidr_contains4,
+	  .f6.a2 = cidr_contains6 },
+
+	{ .name = "private",
+	  .desc = "Print '1' if base address is in RFC1918 private space or '0' "
+	          "if not",
+	  .f4.a1 = cidr_private4 },
+
+	{ .name = "linklocal",
+	  .desc = "Print '1' if base address is in 169.254.0.0/16 or FE80::/10 "
+	          "link local space or '0' if not",
+	  .f4.a1 = cidr_linklocal4,
+	  .f6.a1 = cidr_linklocal6 },
+
+	{ .name = "ula",
+	  .desc = "Print '1' if base address is in FC00::/7 unique local address "
+	          "(ULA) space or '0' if not",
+	  .f6.a1 = cidr_ula6 },
+
+	{ .name = "quiet",
+	  .desc = "Suppress output, useful for test operation where the result can "
+	          "be inferred from the exit code",
+	  .f4.a1 = cidr_quiet,
+	  .f6.a1 = cidr_quiet },
+
+	{ .name = "pop",
+	  .desc = "Pop intermediate result from stack",
+	  .f4.a1 = cidr_pop,
+	  .f6.a1 = cidr_pop },
+
+	{ .name = "print",
+	  .desc = "Print intermediate result and pop it from stack, invoked "
+	          "implicitely at the end of calculation if no intermediate prints "
+	          "happened",
+	  .f4.a1 = cidr_print4,
+	  .f6.a1 = cidr_print6 },
+};
+
+static void usage(const char *prog)
+{
+	int i;
+
+	fprintf(stderr,
+	        "\n"
+	        "Usage:\n\n"
+	        "  %s {base address} operation [argument] "
+	        "[operation [argument] ...]\n\n"
+	        "Operations:\n\n",
+	        prog);
+
+	for (i = 0; i < sizeof(ops) / sizeof(ops[0]); i++)
+	{
+		if (ops[i].f4.a2 || ops[i].f6.a2)
+		{
+			fprintf(stderr, "  %s %s\n",
+			        ops[i].name,
+			        (ops[i].f4.a2 && ops[i].f6.a2) ? "{ipv4/ipv6/amount}" :
+			         (ops[i].f6.a2 ? "{ipv6/amount}" : "{ipv4/amount}"));
+		}
+		else
+		{
+			fprintf(stderr, "  %s\n", ops[i].name);
+		}
+
+		fprintf(stderr, "    %s.\n", ops[i].desc);
+
+		if ((ops[i].f4.a1 && ops[i].f6.a1) || (ops[i].f4.a2 && ops[i].f6.a2))
+			fprintf(stderr, "    Applicable to ipv4- and ipv6-addresses.\n\n");
+		else if (ops[i].f6.a2 || ops[i].f6.a1)
+			fprintf(stderr, "    Only applicable to ipv6-addresses.\n\n");
+		else
+			fprintf(stderr, "    Only applicable to ipv4-addresses.\n\n");
+	}
+
+	fprintf(stderr,
+	        "Examples:\n\n"
+	        " Calculate a DHCP range:\n\n"
+	        "  $ %s 192.168.1.1/255.255.255.0 network add 100 print add 150 print\n"
+			"  192.168.1.100\n"
+			"  192.168.1.250\n\n"
+			" Count number of prefixes:\n\n"
+			"  $ %s 2001:0DB8:FDEF::/48 howmany ::/64\n"
+			"  65536\n\n",
+	        prog, prog);
+
+	exit(1);
+}
+
+static bool runop(char ***arg, int *status)
+{
+	int i;
+	char *arg1 = **arg;
+	char *arg2 = *(*arg+1);
+	struct cidr *a = stack;
+	struct cidr *b = NULL;
+
+	if (!arg1)
+		return false;
+
+	for (i = 0; i < sizeof(ops) / sizeof(ops[0]); i++)
+	{
+		if (!strcmp(ops[i].name, arg1))
+		{
+			if (ops[i].f4.a2 || ops[i].f6.a2)
+			{
+				if (!arg2)
+				{
+					fprintf(stderr, "'%s' requires an argument\n",
+							ops[i].name);
+
+					*status = 2;
+					return false;
+				}
+
+				b = cidr_parse(ops[i].name, arg2, a->family);
+
+				if (!b)
+				{
+					fprintf(stderr, "invalid address argument for '%s'\n",
+							ops[i].name);
+
+					*status = 3;
+					return false;
+				}
+
+				*arg += 2;
+
+				if (((a->family == AF_INET)  && !ops[i].f4.a2) ||
+					((a->family == AF_INET6) && !ops[i].f6.a2))
+				{
+					fprintf(stderr, "'%s' not supported for %s addresses\n",
+					        ops[i].name,
+							(a->family == AF_INET) ? "ipv4" : "ipv6");
+
+					*status = 5;
+					return false;
+				}
+
+				*status = !((a->family == AF_INET) ? ops[i].f4.a2(a, b)
+				                                   : ops[i].f6.a2(a, b));
+
+				return true;
+			}
+			else
+			{
+				*arg += 1;
+
+				if (((a->family == AF_INET)  && !ops[i].f4.a1) ||
+					((a->family == AF_INET6) && !ops[i].f6.a1))
+				{
+					fprintf(stderr, "'%s' not supported for %s addresses\n",
+					        ops[i].name,
+							(a->family == AF_INET) ? "ipv4" : "ipv6");
+
+					*status = 5;
+					return false;
+				}
+
+				*status = !((a->family == AF_INET) ? ops[i].f4.a1(a)
+				                                   : ops[i].f6.a1(a));
+
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+int main(int argc, char **argv)
+{
+	int status = 0;
+	char **arg = argv+2;
+	struct cidr *a;
+
+	if (argc < 3)
+		usage(argv[0]);
+
+	a = strchr(argv[1], ':') ? cidr_parse6(argv[1]) : cidr_parse4(argv[1]);
+
+	if (!a)
+		usage(argv[0]);
+
+	cidr_push(a);
+
+	while (runop(&arg, &status));
+
+	if (*arg)
+	{
+		fprintf(stderr, "unknown operation '%s'\n", *arg);
+		exit(6);
+	}
+
+	if (!printed && (status < 2))
+	{
+		if (stack->family == AF_INET)
+			cidr_print4(stack);
+		else
+			cidr_print6(stack);
+	}
+
+	qprintf("\n");
+
+	exit(status);
+}
diff --git a/trunk/package/network/utils/resolveip/Makefile b/trunk/package/network/utils/resolveip/Makefile
new file mode 100644
index 00000000..3243a800
--- /dev/null
+++ b/trunk/package/network/utils/resolveip/Makefile
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=resolveip
+PKG_RELEASE:=2
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/resolveip
+  SECTION:=utils
+  CATEGORY:=Base system
+  TITLE:=Simple DNS resolver with configurable timeout
+  MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+endef
+
+define Package/resolveip/description
+ This package contains the small resolveip utility which
+ can be used by scripts to turn host names into numeric
+ IP addresses. It supports IPv4 and IPv6 resolving and
+ has a configurable timeout to guarantee a certain maximum
+ runtime in case of slow or defunct DNS servers.
+endef
+
+define Build/Prepare
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)
+	$(INSTALL_DATA) ./src/resolveip.c $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -Wall \
+		-o $(PKG_BUILD_DIR)/resolveip $(PKG_BUILD_DIR)/resolveip.c
+endef
+
+define Package/resolveip/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/resolveip $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,resolveip))
diff --git a/trunk/package/network/utils/resolveip/src/resolveip.c b/trunk/package/network/utils/resolveip/src/resolveip.c
new file mode 100644
index 00000000..9f2286c6
--- /dev/null
+++ b/trunk/package/network/utils/resolveip/src/resolveip.c
@@ -0,0 +1,98 @@
+/*
+ * Based on code found at https://dev.openwrt.org/ticket/4876 .
+ * Extended by Jo-Philipp Wich <jow@openwrt.org> for use in libreCMC.
+ *
+ * You may use this program under the terms of the GPLv2 license.
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+
+
+static void abort_query(int sig)
+{
+	exit(1);
+}
+
+static void show_usage(void)
+{
+	printf("Usage:\n");
+	printf("	resolveip -h\n");
+	printf("	resolveip [-t timeout] hostname\n");
+	printf("	resolveip -4 [-t timeout] hostname\n");
+	printf("	resolveip -6 [-t timeout] hostname\n");
+	exit(255);
+}
+
+int main(int argc, char **argv)
+{
+	int timeout = 3;
+	int opt;
+	char ipaddr[INET6_ADDRSTRLEN];
+	void *addr;
+	struct addrinfo *res, *rp;
+	struct sigaction sa = {	.sa_handler = &abort_query };
+	struct addrinfo hints = {
+		.ai_family   = AF_UNSPEC,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_flags    = 0
+	};
+
+	while ((opt = getopt(argc, argv, "46t:h")) > -1)
+	{
+		switch ((char)opt)
+		{
+			case '4':
+				hints.ai_family = AF_INET;
+				break;
+
+			case '6':
+				hints.ai_family = AF_INET6;
+				break;
+
+			case 't':
+				timeout = atoi(optarg);
+				if (timeout <= 0)
+					show_usage();
+				break;
+
+			case 'h':
+				show_usage();
+				break;
+		}
+	}
+
+	if (!argv[optind])
+		show_usage();
+
+	sigaction(SIGALRM, &sa, NULL);
+	alarm(timeout);
+
+	if (getaddrinfo(argv[optind], NULL, &hints, &res))
+		exit(2);
+
+	for (rp = res; rp != NULL; rp = rp->ai_next)
+	{
+		addr = (rp->ai_family == AF_INET)
+			? (void *)&((struct sockaddr_in *)rp->ai_addr)->sin_addr
+			: (void *)&((struct sockaddr_in6 *)rp->ai_addr)->sin6_addr
+		;
+
+		if (!inet_ntop(rp->ai_family, addr, ipaddr, INET6_ADDRSTRLEN - 1))
+			exit(3);
+
+		printf("%s\n", ipaddr);
+	}
+
+	freeaddrinfo(res);
+	exit(0);
+}
diff --git a/trunk/package/network/utils/rssileds/Makefile b/trunk/package/network/utils/rssileds/Makefile
new file mode 100644
index 00000000..6ca4e32e
--- /dev/null
+++ b/trunk/package/network/utils/rssileds/Makefile
@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2011-2012 Daniel Golle <dgolle@allnet.de>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rssileds
+PKG_VERSION:=0.2
+PKG_RELEASE:=1
+PKG_LICNESE:=GPL-2.0+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/rssileds
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=RSSI real-time LED indicator
+  DEPENDS:=+libiwinfo
+  MAINTAINER:=Daniel Golle <dgolle@allnet.de>
+endef
+
+define Package/rssileds/description
+  A small process written in C to update the signal-strength indicator LEDs
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -Wall -liwinfo \
+		-o $(PKG_BUILD_DIR)/rssileds $(PKG_BUILD_DIR)/rssileds.c
+endef
+
+define Package/rssileds/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/rssileds.init $(1)/etc/init.d/rssileds
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rssileds $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,rssileds))
diff --git a/trunk/package/network/utils/rssileds/files/rssileds.init b/trunk/package/network/utils/rssileds/files/rssileds.init
new file mode 100644
index 00000000..b0d26272
--- /dev/null
+++ b/trunk/package/network/utils/rssileds/files/rssileds.init
@@ -0,0 +1,75 @@
+#!/bin/sh /etc/rc.common
+# (C) 2012 Daniel Golle, Allnet GmbH <dgolle@allnet.de>
+
+START=96
+STOP=96
+RSSILEDS_BIN="/usr/sbin/rssileds"
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+start_rssid() {
+	local name
+	local dev
+	local threshold
+	local refresh
+	local leds
+	config_get name $1 name
+	config_get dev $1 dev
+	config_get threshold $1 threshold
+	config_get refresh $1 refresh
+	leds="$( cur_iface=$1 ; config_foreach get_led led )"
+	SERVICE_PID_FILE=/var/run/rssileds-$dev.pid
+	service_start $RSSILEDS_BIN $dev $refresh $threshold $leds
+}
+
+stop_rssid() {
+	local dev
+	config_get dev $1 dev
+	SERVICE_PID_FILE=/var/run/rssileds-$dev.pid
+	service_stop $RSSILEDS_BIN
+}
+
+get_led() {
+	local name
+	local sysfs
+	local trigger
+	local iface
+	config_get sysfs $1 sysfs
+	config_get name $1 name "$sysfs"
+	config_get trigger $1 trigger "none"
+	config_get iface $1 iface
+	config_get minq $1 minq
+	config_get maxq $1 maxq
+	config_get offset $1 offset
+	config_get factor $1 factor
+	[ "$trigger" = "rssi" ] || return
+	[ "$iface" = "$cur_iface" ] || return
+	[ ! "$minq" ] || [ ! "$maxq" ] || [ ! "$offset" ] || [ ! "$factor" ] && return
+	echo "none" > /sys/class/leds/$sysfs/trigger
+	echo "$sysfs $minq $maxq $offset $factor"
+}
+
+off_led() {
+	local name
+	local sysfs
+	local trigger
+	config_get sysfs $1 sysfs
+	config_get name $1 name "$sysfs"
+	config_get trigger $1 trigger "none"
+	[ "$trigger" = "rssi" ] || return
+	echo "0" > /sys/class/leds/$sysfs/brightness
+}
+
+start() {
+	[ -e /sys/class/leds/ ] && [ -x "$RSSILEDS_BIN" ] && {
+		config_load system
+		config_foreach start_rssid rssid
+	}
+}
+
+stop() {
+	config_load system
+	config_foreach stop_rssid rssid
+	config_foreach off_led led
+}
diff --git a/trunk/package/network/utils/rssileds/src/rssileds.c b/trunk/package/network/utils/rssileds/src/rssileds.c
new file mode 100644
index 00000000..6956213e
--- /dev/null
+++ b/trunk/package/network/utils/rssileds/src/rssileds.c
@@ -0,0 +1,290 @@
+/*
+ * configurable RSSI LED control daemon for libreCMC
+ *  (c) 2012 Allnet GmbH, Daniel Golle <dgolle@allnet.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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
+ *
+ * The author may be reached as dgolle@allnet.de, or
+ * ALLNET GmbH
+ * Maistr. 2
+ * D-82110 Germering
+ * Germany
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#include <syslog.h>
+
+#include "iwinfo.h"
+
+#define RUN_DIR			"/var/run"
+#define LEDS_BASEPATH		"/sys/class/leds/"
+#define BACKEND_RETRY_DELAY	500000
+
+char *ifname;
+int qual_max;
+
+struct led {
+	char *sysfspath;
+	FILE *controlfd;
+	unsigned char state;
+};
+
+typedef struct rule rule_t;
+struct rule {
+	struct led *led;
+	int minq;
+	int maxq;
+	int boffset;
+	int bfactor;
+	rule_t *next;
+};
+
+void log_rules(rule_t *rules)
+{
+	rule_t *rule = rules;
+	while (rule)
+	{
+		syslog(LOG_INFO, " %s r: %d..%d, o: %d, f: %d\n",
+			rule->led->sysfspath,
+			rule->minq, rule->maxq,
+			rule->boffset, rule->bfactor);
+		rule = rule->next;
+	}
+}
+
+int set_led(struct led *led, unsigned char value)
+{
+	char buf[8];
+
+	if ( ! led )
+		return -1;
+
+	if ( ! led->controlfd )
+		return -1;
+
+	if ( led->state == value )
+		return 0;
+
+	snprintf(buf, 8, "%d", value);
+
+	rewind(led->controlfd);
+
+	if ( ! fwrite(buf, sizeof(char), strlen(buf), led->controlfd) )
+		return -2;
+
+	fflush(led->controlfd);
+	led->state=value;
+
+	return 0;
+}
+
+int init_led(struct led **led, char *ledname)
+{
+	struct led *newled;
+	struct stat statbuffer;
+	int status;
+	char *bp;
+	FILE *bfp;
+
+	bp = calloc(sizeof(char), strlen(ledname) + strlen(LEDS_BASEPATH) + 12);
+	if ( ! bp )
+		goto return_error;
+
+	sprintf(bp, "%s%s/brightness", LEDS_BASEPATH, ledname);
+
+	status = stat(bp, &statbuffer);
+	if ( status )
+		goto cleanup_fname;
+
+	bfp = fopen( bp, "w" );
+	if ( !bfp )
+		goto cleanup_fname;
+
+	if ( ferror(bfp) )
+		goto cleanup_fp;
+
+	/* sysfs path exists and, allocate LED struct */
+	newled = calloc(sizeof(struct led),1);
+	if ( !newled )
+		goto cleanup_fp;
+
+	newled->sysfspath = bp;
+	newled->controlfd = bfp;
+
+	*led = newled;
+
+	if ( set_led(newled, 255) )
+		goto cleanup_fp;
+
+	if ( set_led(newled, 0) )
+		goto cleanup_fp;
+
+	return 0;
+
+cleanup_fp:
+	fclose(bfp);
+cleanup_fname:
+	free(bp);
+return_error:
+	syslog(LOG_CRIT, "can't open LED %s\n", ledname);
+	*led = NULL;
+	return -1;
+}
+
+void close_led(struct led **led)
+{
+	fclose((*led)->controlfd);
+	free((*led)->sysfspath);
+	free((*led));
+	(*led)=NULL;
+}
+
+
+int quality(const struct iwinfo_ops *iw, const char *ifname)
+{
+	int qual;
+
+	if ( ! iw ) return -1;
+
+	if (qual_max < 1)
+		if (iw->quality_max(ifname, &qual_max))
+			return -1;
+
+	if (iw->quality(ifname, &qual))
+		return -1;
+
+	return ( qual * 100 ) / qual_max ;
+}
+
+int open_backend(const struct iwinfo_ops **iw, const char *ifname)
+{
+	*iw = iwinfo_backend(ifname);
+
+	if (!(*iw))
+		return 1;
+
+	return 0;
+}
+
+void update_leds(rule_t *rules, int q)
+{
+	rule_t *rule = rules;
+	while (rule)
+	{
+		int b;
+		/* offset and factore correction according to rule */
+		b = ( q + rule->boffset ) * rule->bfactor;
+		if ( b < 0 )
+			b=0;
+		if ( b > 255 )
+			b=255;
+
+		if ( q >= rule->minq && q <= rule->maxq )
+			set_led(rule->led, (unsigned char)b);
+		else
+			set_led(rule->led, 0);
+
+		rule = rule->next;
+	}
+}
+
+int main(int argc, char **argv)
+{
+	int i,q,q0,r,s;
+	const struct iwinfo_ops *iw = NULL;
+	rule_t *headrule = NULL, *currentrule = NULL;
+
+	if (argc < 9 || ( (argc-4) % 5 != 0 ) )
+	{
+		printf("syntax: %s (ifname) (refresh) (threshold) (rule) [rule] ...\n", argv[0]);
+		printf("  rule: (sysfs-name) (minq) (maxq) (offset) (factore)\n");
+		return 1;
+	}
+
+	ifname = argv[1];
+
+	/* refresh interval */
+	if ( sscanf(argv[2], "%d", &r) != 1 )
+		return 1;
+
+	/* sustain threshold */
+	if ( sscanf(argv[3], "%d", &s) != 1 )
+		return 1;
+
+	openlog("rssileds", LOG_PID, LOG_DAEMON);
+	syslog(LOG_INFO, "monitoring %s, refresh rate %d, threshold %d\n", ifname, r, s);
+
+	currentrule = headrule;
+	for (i=4; i<argc; i=i+5) {
+		if (! currentrule)
+		{
+			/* first element in the list */
+			currentrule = calloc(sizeof(rule_t),1);
+			headrule = currentrule;
+		}
+		else
+		{
+			/* follow-up element */
+			currentrule->next = calloc(sizeof(rule_t),1);
+			currentrule = currentrule->next;
+		}
+
+		if ( init_led(&(currentrule->led), argv[i]) )
+			return 1;
+		
+		if ( sscanf(argv[i+1], "%d", &(currentrule->minq)) != 1 )
+			return 1;
+
+		if ( sscanf(argv[i+2], "%d", &(currentrule->maxq)) != 1 )
+			return 1;
+		
+		if ( sscanf(argv[i+3], "%d", &(currentrule->boffset)) != 1 )
+			return 1;
+		
+		if ( sscanf(argv[i+4], "%d", &(currentrule->bfactor)) != 1 )
+			return 1;
+	}
+	log_rules(headrule);
+
+	q0 = -1;
+	do {
+		q = quality(iw, ifname);
+		if ( q < q0 - s || q > q0 + s ) {
+			update_leds(headrule, q);
+			q0=q;
+		};
+		// re-open backend...
+		if ( q == -1 && q0 == -1 ) {
+			if (iw) {
+				iwinfo_finish();
+				iw=NULL;
+				usleep(BACKEND_RETRY_DELAY);
+			}
+			while (open_backend(&iw, ifname))
+				usleep(BACKEND_RETRY_DELAY);
+		}
+		usleep(r);
+	} while(1);
+
+	iwinfo_finish();
+
+	return 0;
+}
diff --git a/trunk/package/network/utils/rsync/Config.in b/trunk/package/network/utils/rsync/Config.in
new file mode 100644
index 00000000..dfbfdf16
--- /dev/null
+++ b/trunk/package/network/utils/rsync/Config.in
@@ -0,0 +1,25 @@
+if PACKAGE_rsync
+
+	config RSYNC_xattr
+		bool
+		prompt "Enable xattr support"
+		default n
+
+	config RSYNC_acl
+		bool
+		prompt "Enable ACL support"
+		default n
+
+	config RSYNC_zlib
+		bool
+		prompt "Enable system zlib"
+		help 
+			Use the system's zlib library instead of rsync's internal copy. Enabling
+			this may create compatibility errors when using compression  with older
+			clients, or those using the current default of the bundled zlib.
+
+			rsync's upstream default is to use their bundled zlib. OpenWrt uses the
+			system zlib for space reasons. The system zlib will eventually become 
+			default for upstream as well.
+		default y
+endif
diff --git a/trunk/package/network/utils/rsync/Makefile b/trunk/package/network/utils/rsync/Makefile
new file mode 100644
index 00000000..284e922c
--- /dev/null
+++ b/trunk/package/network/utils/rsync/Makefile
@@ -0,0 +1,104 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rsync
+PKG_VERSION:=3.1.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
+PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe
+PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/rsync
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=File Transfer
+  TITLE:=Fast remote file copy program (like rcp)
+  DEPENDS:=+libpopt +RSYNC_xattr:libattr +RSYNC_acl:libacl +RSYNC_zlib:zlib
+  URL:=http://rsync.samba.org/
+  MENU:=1
+endef
+
+define Package/rsync/config
+	source "$(SOURCE)/Config.in"
+endef
+
+CONFIGURE_ARGS += \
+	--with-included-popt=no \
+	--disable-debug \
+	--disable-locale \
+
+ifeq ($(CONFIG_RSYNC_xattr),y)
+	CONFIGURE_ARGS+= --enable-xattr-support
+else
+	CONFIGURE_ARGS+= --disable-xattr-support
+endif
+
+ifeq ($(CONFIG_RSYNC_acl),y)
+	CONFIGURE_ARGS+= --enable-acl-support
+else
+	CONFIGURE_ARGS+= --disable-acl-support
+endif
+
+ifeq ($(CONFIG_RSYNC_zlib),y)
+	CONFIGURE_ARGS+= --with-included-zlib=no
+else
+	CONFIGURE_ARGS+= --with-included-zlib=yes
+endif
+
+define Package/rsyncd
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=File Transfer
+  TITLE:=Rsync daemon
+  DEPENDS:=+rsync
+  URL:=http://rsync.samba.org/
+endef
+
+define Package/rsync/description
+ rsync is a program that allows files to be copied to and from remote machines
+ in much the same way as rcp. It has many more options than rcp, and uses the
+ rsync remote-update protocol to greatly speed up file transfers when the
+ destination file already exists.
+
+ The rsync remote-update protocol allows rsync to transfer just the differences
+ between two sets of files across the network link.
+endef
+
+define Package/rsync/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
+endef
+
+define Package/rsyncd/description
+ rsyncd is a configuration file and initscript to utilize rsync as a daemon. It
+ uses the same binary as rsync.
+endef
+
+define Package/rsyncd/conffiles
+/etc/rsyncd.conf
+endef
+
+define Package/rsyncd/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/rsyncd.init $(1)/etc/init.d/rsyncd
+endef
+
+$(eval $(call BuildPackage,rsync))
+$(eval $(call BuildPackage,rsyncd))
diff --git a/trunk/package/network/utils/rsync/files/rsyncd.conf b/trunk/package/network/utils/rsync/files/rsyncd.conf
new file mode 100644
index 00000000..2f4cd9e9
--- /dev/null
+++ b/trunk/package/network/utils/rsync/files/rsyncd.conf
@@ -0,0 +1,16 @@
+# /etc/rsyncd.conf
+# Minimal configuration for rsync daemon
+
+# Next line required for init script
+pid file = /var/run/rsyncd.pid
+log file = /var/log/rsyncd.log
+use chroot = yes
+uid = nobody
+gid = nogroup
+read only = yes
+
+# Simple example to configure server
+#[openwrt-etc]
+#path = /etc
+#comment = OpenWrt Configuration Files
+#exclude = /init.d
diff --git a/trunk/package/network/utils/rsync/files/rsyncd.init b/trunk/package/network/utils/rsync/files/rsyncd.init
new file mode 100644
index 00000000..d226d0f3
--- /dev/null
+++ b/trunk/package/network/utils/rsync/files/rsyncd.init
@@ -0,0 +1,14 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2011-2014 OpenWrt.org
+
+START=90
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/bin/rsync
+
+start_service() {
+	procd_open_instance
+	procd_set_param command "$PROG" --daemon --no-detach
+	procd_close_instance
+}
diff --git a/trunk/package/network/utils/tcpdump/Makefile b/trunk/package/network/utils/tcpdump/Makefile
new file mode 100644
index 00000000..8e33a2bb
--- /dev/null
+++ b/trunk/package/network/utils/tcpdump/Makefile
@@ -0,0 +1,90 @@
+#
+# Copyright (C) 2007-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tcpdump
+PKG_VERSION:=4.5.1
+PKG_RELEASE:=4
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
+	http://ftp.gwdg.de/pub/misc/tcpdump/ \
+	http://www.at.tcpdump.org/ \
+	http://www.br.tcpdump.org/
+PKG_MD5SUM:=973a2513d0076e34aa9da7e15ed98e1b
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=BSD-3-Clause
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/tcpdump/default
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpcap
+  TITLE:=Network monitoring and data acquisition tool
+  URL:=http://www.tcpdump.org/
+endef
+
+define Package/tcpdump
+  $(Package/tcpdump/default)
+  VARIANT:=full
+endef
+
+define Package/tcpdump-mini
+  $(Package/tcpdump/default)
+  TITLE+= (minimal version)
+  VARIANT:=mini
+endef
+
+CONFIGURE_ARGS += \
+	--without-crypto
+
+ifeq ($(CONFIG_IPV6),y)
+CONFIGURE_ARGS += \
+	--enable-ipv6
+endif
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+CONFIGURE_VARS += \
+	BUILD_CC="$(TARGET_CC)" \
+	HOSTCC="$(HOSTCC)" \
+	td_cv_buggygetaddrinfo="no" \
+	ac_cv_linux_vers=$(LINUX_VERSION) \
+	ac_cv_header_rpc_rpcent_h=no \
+	ac_cv_lib_rpc_main=no \
+	ac_cv_path_PCAP_CONFIG=""
+
+MAKE_FLAGS :=
+
+ifeq ($(BUILD_VARIANT),mini)
+  TARGET_CFLAGS += -DTCPDUMP_MINI
+  CONFIGURE_ARGS += --disable-smb
+  MAKE_FLAGS += TCPDUMP_MINI=1
+endif
+
+MAKE_FLAGS += \
+	CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)"
+
+
+define Package/tcpdump/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tcpdump $(1)/usr/sbin/
+endef
+
+Package/tcpdump-mini/install = $(Package/tcpdump/install)
+
+$(eval $(call BuildPackage,tcpdump))
+$(eval $(call BuildPackage,tcpdump-mini))
diff --git a/trunk/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch b/trunk/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch
new file mode 100644
index 00000000..d2c724d5
--- /dev/null
+++ b/trunk/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch
@@ -0,0 +1,23 @@
+--- a/tcpdump.c
++++ b/tcpdump.c
+@@ -1095,20 +1095,6 @@ main(int argc, char **argv)
+ 				error("invalid data link type %s", gndo->ndo_dltname);
+ 			break;
+ 
+-#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
+-		case 'Y':
+-			{
+-			/* Undocumented flag */
+-#ifdef HAVE_PCAP_DEBUG
+-			extern int pcap_debug;
+-			pcap_debug = 1;
+-#else
+-			extern int yydebug;
+-			yydebug = 1;
+-#endif
+-			}
+-			break;
+-#endif
+ 		case 'z':
+ 			if (optarg) {
+ 				zflag = strdup(optarg);
diff --git a/trunk/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch b/trunk/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch
new file mode 100644
index 00000000..c8bdf149
--- /dev/null
+++ b/trunk/package/network/utils/tcpdump/patches/002-remove_static_libpcap_check.patch
@@ -0,0 +1,73 @@
+--- a/configure
++++ b/configure
+@@ -5813,28 +5813,6 @@ $as_echo "Using $pfopen" >&6; }
+ 		    LIBS="$LIBS $pfopen"
+ 	    fi
+     fi
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local pcap library" >&5
+-$as_echo_n "checking for local pcap library... " >&6; }
+-    libpcap=FAIL
+-    lastdir=FAIL
+-    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
+-	egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
+-    for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
+-	    basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \
+-	        sed -e 's/-PRE-GIT$//' `
+-	    if test $lastdir = $basedir ; then
+-		    		    continue;
+-	    fi
+-	    lastdir=$dir
+-	    if test -r $dir/libpcap.a ; then
+-		    libpcap=$dir/libpcap.a
+-		    d=$dir
+-		    	    fi
+-    done
+-    if test $libpcap = FAIL ; then
+-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
+-
+ 	    #
+ 	    # Look for pcap-config.
+ 	    #
+@@ -5989,41 +5967,6 @@ if test "x$ac_cv_lib_pcap_main" = xyes;
+   libpcap="-lpcap"
+ fi
+ 
+-		if test $libpcap = FAIL ; then
+-		    as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 5
+-		fi
+-																																								{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extraneous pcap header directories" >&5
+-$as_echo_n "checking for extraneous pcap header directories... " >&6; }
+-		if test \( ! -r /usr/local/include/pcap.h \) -a \
+-			\( ! -r /usr/include/pcap.h \); then
+-		    if test -r /usr/local/include/pcap/pcap.h; then
+-			d="/usr/local/include/pcap"
+-		    elif test -r /usr/include/pcap/pcap.h; then
+-			d="/usr/include/pcap"
+-		    fi
+-		fi
+-		if test -z "$d" ; then
+-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
+-		else
+-		    V_INCLS="-I$d $V_INCLS"
+-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found -- -I$d added" >&5
+-$as_echo "found -- -I$d added" >&6; }
+-		fi
+-	    fi
+-    else
+-	    V_PCAPDEP=$libpcap
+-	    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
+-    	 		egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
+-	    if test -r $d/pcap.h; then
+-		    V_INCLS="-I$d $V_INCLS"
+-	    elif test -r $places/pcap.h; then
+-		    V_INCLS="-I$places $V_INCLS"
+-	    else
+-                    as_fn_error see INSTALL "cannot find pcap.h" "$LINENO" 5
+- 	    fi
+-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libpcap" >&5
+-$as_echo "$libpcap" >&6; }
+ 	    # Extract the first word of "pcap-config", so it can be a program name with args.
+ set dummy pcap-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/trunk/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch b/trunk/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
new file mode 100644
index 00000000..8d07be6b
--- /dev/null
+++ b/trunk/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
@@ -0,0 +1,844 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -71,6 +71,22 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
+ 	@rm -f $@
+ 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
+ 
++ifdef TCPDUMP_MINI
++
++CSRC =	addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
++        nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
++	print-802_11.c print-aodv.c print-arp.c print-ascii.c \
++	print-bgp.c print-bootp.c print-cdp.c print-domain.c print-eap.c print-ether.c \
++	print-gre.c print-icmp.c print-igmp.c print-ip.c \
++	print-l2tp.c print-lldp.c print-llc.c \
++ 	print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \
++	print-ppp.c print-pppoe.c print-pptp.c print-radius.c print-raw.c print-rsvp.c \
++	print-sctp.c print-sip.c print-sll.c print-snmp.c print-stp.c print-sunrpc.c \
++	print-syslog.c print-tcp.c print-telnet.c print-tftp.c print-udp.c \
++	setsignal.c tcpdump.c util.c signature.c print-ipnet.c print-forces.c
++
++else
++
+ CSRC =	addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
+         nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
+ 	print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
+@@ -103,6 +119,8 @@ LIBNETDISSECT_SRC=print-isakmp.c
+ LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o)
+ LIBNETDISSECT=libnetdissect.a
+ 
++endif
++
+ LOCALSRC = @LOCALSRC@
+ GENSRC = version.c
+ LIBOBJS = @LIBOBJS@
+@@ -286,10 +304,12 @@ $(PROG): $(OBJ) @V_PCAPDEP@
+ 	@rm -f $@
+ 	$(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
++ifndef TCPDUMP_MINI
+ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
+ 	@rm -f $@
+ 	$(AR) cr $@ $(LIBNETDISSECT_OBJ) 
+ 	$(RANLIB) $@
++endif
+ 
+ datalinks.o: $(srcdir)/missing/datalinks.c
+ 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
+--- a/addrtoname.c
++++ b/addrtoname.c
+@@ -556,10 +556,10 @@ linkaddr_string(const u_char *ep, const
+ 
+ 	if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN)
+ 		return (etheraddr_string(ep));
+-
++#ifndef TCPDUMP_MINI
+ 	if (type == LINKADDR_FRELAY)
+ 		return (q922_string(ep));
+-
++#endif
+ 	tp = lookup_bytestring(ep, len);
+ 	if (tp->e_name)
+ 		return (tp->e_name);
+@@ -1159,6 +1159,7 @@ init_addrtoname(u_int32_t localnet, u_in
+ 	init_ipxsaparray();
+ }
+ 
++#ifndef TCPDUMP_MINI
+ const char *
+ dnaddr_string(u_short dnaddr)
+ {
+@@ -1178,6 +1179,7 @@ dnaddr_string(u_short dnaddr)
+ 
+ 	return(tp->name);
+ }
++#endif
+ 
+ /* Return a zero'ed hnamemem struct and cuts down on calloc() overhead */
+ struct hnamemem *
+--- a/print-ether.c
++++ b/print-ether.c
+@@ -342,6 +342,7 @@ ethertype_print(netdissect_options *ndo,
+   	        arp_print(ndo, p, length, caplen);
+ 		return (1);
+ 
++#ifndef TCPDUMP_MINI
+ 	case ETHERTYPE_DN:
+ 		decnet_print(/*ndo,*/p, length, caplen);
+ 		return (1);
+@@ -360,10 +361,13 @@ ethertype_print(netdissect_options *ndo,
+ 		ND_PRINT((ndo, "(NOV-ETHII) "));
+ 		ipx_print(/*ndo,*/p, length);
+ 		return (1);
++#endif
+ 
++#ifndef TCPDUMP_MINI
+         case ETHERTYPE_ISO:
+                 isoclns_print(/*ndo,*/p+1, length-1, length-1);
+                 return(1);
++#endif
+ 
+ 	case ETHERTYPE_PPPOED:
+ 	case ETHERTYPE_PPPOES:
+@@ -376,9 +380,11 @@ ethertype_print(netdissect_options *ndo,
+ 	        eap_print(ndo, p, length);
+ 		return (1);
+ 
++#ifndef TCPDUMP_MINI
+ 	case ETHERTYPE_RRCP:
+ 	        rrcp_print(ndo, p - 14 , length + 14);
+ 		return (1);
++#endif
+ 
+ 	case ETHERTYPE_PPP:
+ 		if (length) {
+@@ -387,6 +393,7 @@ ethertype_print(netdissect_options *ndo,
+ 		}
+ 		return (1);
+ 
++#ifndef TCPDUMP_MINI
+ 	case ETHERTYPE_MPCP:
+ 	        mpcp_print(/*ndo,*/p, length);
+ 		return (1);
+@@ -399,7 +406,7 @@ ethertype_print(netdissect_options *ndo,
+ 	case ETHERTYPE_CFM_OLD:
+ 	        cfm_print(/*ndo,*/p, length);
+ 		return (1);
+-
++#endif
+ 	case ETHERTYPE_LLDP:
+ 	        lldp_print(/*ndo,*/p, length);
+ 		return (1);
+@@ -407,6 +414,7 @@ ethertype_print(netdissect_options *ndo,
+         case ETHERTYPE_LOOPBACK:
+                 return (1);
+ 
++#ifndef TCPDUMP_MINI
+ 	case ETHERTYPE_MPLS:
+ 	case ETHERTYPE_MPLS_MULTI:
+ 		mpls_print(/*ndo,*/p, length);
+@@ -428,6 +436,7 @@ ethertype_print(netdissect_options *ndo,
+         case ETHERTYPE_CALM_FAST:
+                 calm_fast_print(ndo, p-14, p, length);
+                 return (1);
++#endif
+ 
+ 	case ETHERTYPE_LAT:
+ 	case ETHERTYPE_SCA:
+--- a/print-gre.c
++++ b/print-gre.c
+@@ -213,6 +213,7 @@ gre_print_0(const u_char *bp, u_int leng
+ 		ip6_print(gndo, bp, len);
+ 		break;
+ #endif
++#ifndef TCPDUMP_MINI
+ 	case ETHERTYPE_MPLS:
+ 		mpls_print(bp, len);
+ 		break;
+@@ -228,6 +229,7 @@ gre_print_0(const u_char *bp, u_int leng
+ 	case ETHERTYPE_TEB:
+ 		ether_print(gndo, bp, len, len, NULL, NULL);
+ 		break;
++#endif
+ 	default:
+ 		printf("gre-proto-0x%x", prot);
+ 	}
+--- a/print-igmp.c
++++ b/print-igmp.c
+@@ -309,6 +309,7 @@ igmp_print(register const u_char *bp, re
+         TCHECK2(bp[4], 4);
+         (void)printf("igmp leave %s", ipaddr_string(&bp[4]));
+         break;
++#ifndef TCPDUMP_MINI
+     case 0x13:
+         (void)printf("igmp dvmrp");
+         if (len < 8)
+@@ -320,6 +321,7 @@ igmp_print(register const u_char *bp, re
+         (void)printf("igmp pimv1");
+         pimv1_print(bp, len);
+         break;
++#endif
+     case 0x1e:
+         print_mresp(bp, len);
+         break;
+--- a/print-ip.c
++++ b/print-ip.c
+@@ -328,6 +328,7 @@ ip_print_demux(netdissect_options *ndo,
+ again:
+ 	switch (ipds->nh) {
+ 
++#ifndef TCPDUMP_MINI
+ 	case IPPROTO_AH:
+ 		ipds->nh = *ipds->cp;
+ 		ipds->advance = ah_print(ipds->cp);
+@@ -362,15 +363,15 @@ again:
+ 		ipds->nh = enh & 0xff;
+ 		goto again;
+ 	}
+-
++#endif
+ 	case IPPROTO_SCTP:
+ 		sctp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
+ 		break;
+-
++#ifndef TCPDUMP_MINI
+ 	case IPPROTO_DCCP:
+ 		dccp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
+ 		break;
+-
++#endif
+ 	case IPPROTO_TCP:
+ 		/* pass on the MF bit plus the offset to detect fragments */
+ 		tcp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
+@@ -388,7 +389,7 @@ again:
+ 		icmp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
+ 			   ipds->off & (IP_MF|IP_OFFMASK));
+ 		break;
+-
++#ifndef TCPDUMP_MINI
+ 	case IPPROTO_PIGP:
+ 		/*
+ 		 * XXX - the current IANA protocol number assignments
+@@ -409,15 +410,15 @@ again:
+ 	case IPPROTO_EIGRP:
+ 		eigrp_print(ipds->cp, ipds->len);
+ 		break;
+-
++#endif
+ 	case IPPROTO_ND:
+ 		ND_PRINT((ndo, " nd %d", ipds->len));
+ 		break;
+-
++#ifndef TCPDUMP_MINI
+ 	case IPPROTO_EGP:
+ 		egp_print(ipds->cp, ipds->len);
+ 		break;
+-
++#endif
+ 	case IPPROTO_OSPF:
+ 		ospf_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
+ 		break;
+@@ -451,10 +452,10 @@ again:
+ 		gre_print(ipds->cp, ipds->len);
+ 		break;
+ 
++#ifndef TCPDUMP_MINI
+ 	case IPPROTO_MOBILE:
+ 		mobile_print(ipds->cp, ipds->len);
+ 		break;
+-
+ 	case IPPROTO_PIM:
+ 		vec[0].ptr = ipds->cp;
+ 		vec[0].len = ipds->len;
+@@ -480,7 +481,7 @@ again:
+ 	case IPPROTO_PGM:
+ 		pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
+ 		break;
+-
++#endif
+ 	default:
+ 		if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
+ 			ND_PRINT((ndo, " %s", proto->p_name));
+--- a/print-ip6.c
++++ b/print-ip6.c
+@@ -192,9 +192,11 @@ ip6_print(netdissect_options *ndo, const
+ 		case IPPROTO_SCTP:
+ 			sctp_print(cp, (const u_char *)ip6, len);
+ 			return;
++#ifndef TCPDUMP_MINI
+ 		case IPPROTO_DCCP:
+ 			dccp_print(cp, (const u_char *)ip6, len);
+ 			return;
++#endif
+ 		case IPPROTO_TCP:
+ 			tcp_print(cp, len, (const u_char *)ip6, fragmented);
+ 			return;
+@@ -204,6 +206,7 @@ ip6_print(netdissect_options *ndo, const
+ 		case IPPROTO_ICMPV6:
+ 			icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented);
+ 			return;
++#ifndef TCPDUMP_MINI
+ 		case IPPROTO_AH:
+ 			advance = ah_print(cp);
+ 			nh = *cp;
+@@ -228,7 +231,7 @@ ip6_print(netdissect_options *ndo, const
+ 			pim_print(cp, len, nextproto6_cksum(ip6, cp, len,
+ 							    IPPROTO_PIM));
+ 			return;
+-
++#endif
+ 		case IPPROTO_OSPF:
+ 			ospf6_print(cp, len);
+ 			return;
+@@ -240,11 +243,11 @@ ip6_print(netdissect_options *ndo, const
+ 		case IPPROTO_IPV4:
+ 		        ip_print(ndo, cp, len);
+ 			return;
+-
++#ifndef TCPDUMP_MINI
+                 case IPPROTO_PGM:
+                         pgm_print(cp, len, (const u_char *)ip6);
+                         return;
+-
++#endif
+ 		case IPPROTO_GRE:
+ 			gre_print(cp, len);
+ 			return;
+--- a/print-llc.c
++++ b/print-llc.c
+@@ -196,7 +196,7 @@ llc_print(const u_char *p, u_int length,
+ 		control = EXTRACT_LE_16BITS(p + 2);
+ 		is_u = 0;
+ 	}
+-
++#ifndef TCPDUMP_MINI
+ 	if (ssap_field == LLCSAP_GLOBAL && dsap_field == LLCSAP_GLOBAL) {
+ 		/*
+ 		 * This is an Ethernet_802.3 IPX frame; it has an
+@@ -219,6 +219,7 @@ llc_print(const u_char *p, u_int length,
+             ipx_print(p, length);
+             return (1);
+ 	}
++#endif
+ 
+ 	dsap = dsap_field & ~LLC_IG;
+ 	ssap = ssap_field & ~LLC_GSAP;
+@@ -251,6 +252,7 @@ llc_print(const u_char *p, u_int length,
+ 		return (1);
+ 	}
+ 
++#ifndef TCPDUMP_MINI
+ 	if (ssap == LLCSAP_IPX && dsap == LLCSAP_IPX &&
+ 	    control == LLC_UI) {
+ 		/*
+@@ -266,6 +268,7 @@ llc_print(const u_char *p, u_int length,
+ 		ipx_print(p+3, length-3);
+ 		return (1);
+ 	}
++#endif
+ 
+ #ifdef TCPDUMP_DO_SMB
+ 	if (ssap == LLCSAP_NETBEUI && dsap == LLCSAP_NETBEUI
+@@ -297,11 +300,13 @@ llc_print(const u_char *p, u_int length,
+ 		return (1);
+ 	}
+ #endif
++#ifndef TCPDUMP_MINI
+ 	if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
+ 	    && control == LLC_UI) {
+ 		isoclns_print(p + 3, length - 3, caplen - 3);
+ 		return (1);
+ 	}
++#endif
+ 
+ 	if (ssap == LLCSAP_SNAP && dsap == LLCSAP_SNAP
+ 	    && control == LLC_UI) {
+@@ -444,6 +449,7 @@ snap_print(const u_char *p, u_int length
+                 case PID_CISCO_CDP:
+                         cdp_print(p, length, caplen);
+                         return (1);
++#ifndef TCPDUMP_MINI
+                 case PID_CISCO_DTP:
+                         dtp_print(p, length); 
+                         return (1);
+@@ -453,6 +459,7 @@ snap_print(const u_char *p, u_int length
+                 case PID_CISCO_VTP:
+                         vtp_print(p, length);
+                         return (1);
++#endif
+                 case PID_CISCO_PVST:
+                 case PID_CISCO_VLANBRIDGE:
+                         stp_print(p, length);
+@@ -484,6 +491,7 @@ snap_print(const u_char *p, u_int length
+ 			ether_print(gndo, p, length, caplen, NULL, NULL);
+ 			return (1);
+ 
++#ifndef TCPDUMP_MINI
+ 		case PID_RFC2684_802_5_FCS:
+ 		case PID_RFC2684_802_5_NOFCS:
+ 			/*
+@@ -525,6 +533,7 @@ snap_print(const u_char *p, u_int length
+ 			 */
+ 			fddi_print(p, length, caplen);
+ 			return (1);
++#endif
+ 
+ 		case PID_RFC2684_BPDU:
+ 			stp_print(p, length);
+--- a/print-null.c
++++ b/print-null.c
+@@ -128,7 +128,7 @@ null_if_print(const struct pcap_pkthdr *
+ 		ip6_print(gndo, p, length);
+ 		break;
+ #endif
+-
++#ifndef TCPDUMP_MINI
+ 	case BSD_AFNUM_ISO:
+ 		isoclns_print(p, length, caplen);
+ 		break;
+@@ -140,7 +140,7 @@ null_if_print(const struct pcap_pkthdr *
+ 	case BSD_AFNUM_IPX:
+ 		ipx_print(p, length);
+ 		break;
+-
++#endif
+ 	default:
+ 		/* unknown AF_ value */
+ 		if (!eflag)
+--- a/print-ppp.c
++++ b/print-ppp.c
+@@ -1262,7 +1262,7 @@ trunc:
+ 	return 0;
+ }
+ 
+-
++#ifndef TCPDUMP_MINI
+ static void
+ ppp_hdlc(const u_char *p, int length)
+ {
+@@ -1327,17 +1327,19 @@ cleanup:
+ 	free(b);
+         return;
+ }
++#endif
+ 
+ 
+ /* PPP */
+ static void
+ handle_ppp(u_int proto, const u_char *p, int length)
+ {
++#ifndef TCPDUMP_MINI
+         if ((proto & 0xff00) == 0x7e00) {/* is this an escape code ? */
+             ppp_hdlc(p-1, length);
+             return;
+         }
+-
++#endif
+ 	switch (proto) {
+ 	case PPP_LCP: /* fall through */
+ 	case PPP_IPCP:
+@@ -1371,6 +1373,7 @@ handle_ppp(u_int proto, const u_char *p,
+ 		ip6_print(gndo, p, length);
+ 		break;
+ #endif
++#ifndef TCPDUMP_MINI
+ 	case ETHERTYPE_IPX:	/*XXX*/
+ 	case PPP_IPX:
+ 		ipx_print(p, length);
+@@ -1382,6 +1385,7 @@ handle_ppp(u_int proto, const u_char *p,
+ 	case PPP_MPLS_MCAST:
+ 		mpls_print(p, length);
+ 		break;
++#endif
+ 	case PPP_COMP:
+ 		printf("compressed PPP data");
+ 		break;
+@@ -1520,6 +1524,7 @@ ppp_if_print(const struct pcap_pkthdr *h
+ 	return (0);
+ }
+ 
++#ifndef TCPDUMP_MINI
+ /*
+  * PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like
+  * framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547,
+@@ -1747,7 +1752,7 @@ printx:
+ #endif /* __bsdi__ */
+ 	return (hdrlength);
+ }
+-
++#endif
+ 
+ /*
+  * Local Variables:
+--- a/print-tcp.c
++++ b/print-tcp.c
+@@ -573,14 +573,14 @@ tcp_print(register const u_char *bp, reg
+                                         utoval >>= 1;
+                                 (void)printf(" %u", utoval);
+                                 break;
+-
++#ifndef TCPDUMP_MINI
+                         case TCPOPT_MPTCP:
+                                 datalen = len - 2;
+                                 LENCHECK(datalen);
+                                 if (!mptcp_print(cp-2, len, flags))
+                                         goto bad;
+                                 break;
+-
++#endif
+                         case TCPOPT_EXPERIMENT2:
+                                 datalen = len - 2;
+                                 LENCHECK(datalen);
+@@ -659,8 +659,8 @@ tcp_print(register const u_char *bp, reg
+         if ((flags & TH_RST) && vflag) {
+                 print_tcp_rst_data(bp, length);
+                 return;
+-        } 
+-
++        }
++#ifndef TCPDUMP_MINI
+         if (packettype) {
+                 switch (packettype) {
+                 case PT_ZMTP1:
+@@ -669,7 +669,7 @@ tcp_print(register const u_char *bp, reg
+                 }
+                 return;
+         }
+-
++#endif
+         if (sport == TELNET_PORT || dport == TELNET_PORT) {
+                 if (!qflag && vflag)
+                         telnet_print(bp, length);
+@@ -683,10 +683,12 @@ tcp_print(register const u_char *bp, reg
+ 	else if (sport == SMB_PORT || dport == SMB_PORT)
+ 		smb_tcp_print(bp, length);
+ #endif
++#ifndef TCPDUMP_MINI
+         else if (sport == BEEP_PORT || dport == BEEP_PORT)
+                 beep_print(bp, length);
+         else if (sport == OPENFLOW_PORT || dport == OPENFLOW_PORT)
+                 openflow_print(bp, length);
++#endif
+         else if (length > 2 &&
+                  (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT ||
+                   sport == MULTICASTDNS_PORT || dport == MULTICASTDNS_PORT)) {
+@@ -695,6 +697,7 @@ tcp_print(register const u_char *bp, reg
+                  * XXX packet could be unaligned, it can go strange
+                  */
+                 ns_print(bp + 2, length - 2, 0);
++#ifndef TCPDUMP_MINI
+         } else if (sport == MSDP_PORT || dport == MSDP_PORT) {
+                 msdp_print(bp, length);
+         } else if (sport == RPKI_RTR_PORT || dport == RPKI_RTR_PORT) {
+@@ -702,6 +705,7 @@ tcp_print(register const u_char *bp, reg
+         }
+         else if (length > 0 && (sport == LDP_PORT || dport == LDP_PORT)) {
+                 ldp_print(bp, length);
++#endif
+         }
+         else if ((sport == NFS_PORT || dport == NFS_PORT) &&
+                  length >= 4 && TTEST2(*bp, 4)) {
+--- a/print-udp.c
++++ b/print-udp.c
+@@ -418,11 +418,12 @@ udp_print(register const u_char *bp, u_i
+ 			vat_print((void *)(up + 1), up);
+ 			break;
+ 
++#ifndef TCPDUMP_MINI
+ 		case PT_WB:
+ 			udpipaddr_print(ip, sport, dport);
+ 			wb_print((void *)(up + 1), length);
+ 			break;
+-
++#endif
+ 		case PT_RPC:
+ 			rp = (struct sunrpc_msg *)(up + 1);
+ 			direction = (enum sunrpc_msg_type)EXTRACT_32BITS(&rp->rm_direction);
+@@ -450,11 +451,12 @@ udp_print(register const u_char *bp, u_i
+ 			snmp_print((const u_char *)(up + 1), length);
+ 			break;
+ 
++#ifndef TCPDUMP_MINI
+ 		case PT_CNFP:
+ 			udpipaddr_print(ip, sport, dport);
+ 			cnfp_print(cp, (const u_char *)ip);
+ 			break;
+-
++#endif
+ 		case PT_TFTP:
+ 			udpipaddr_print(ip, sport, dport);
+ 			tftp_print(cp, length);
+@@ -475,6 +477,7 @@ udp_print(register const u_char *bp, u_i
+ 			radius_print(cp, length);
+ 			break;
+ 
++#ifndef TCPDUMP_MINI
+ 		case PT_VXLAN:
+ 			udpipaddr_print(ip, sport, dport);
+ 			vxlan_print((const u_char *)(up + 1), length);
+@@ -489,6 +492,7 @@ udp_print(register const u_char *bp, u_i
+ 			udpipaddr_print(ip, sport, dport);
+ 			lmp_print(cp, length);
+ 			break;
++#endif
+ 		}
+ 		return;
+ 	}
+@@ -517,6 +521,7 @@ udp_print(register const u_char *bp, u_i
+ 			}
+ #endif
+ 		}
++#ifndef TCPDUMP_MINI
+ 		if (TTEST(((struct LAP *)cp)->type) &&
+ 		    ((struct LAP *)cp)->type == lapDDP &&
+ 		    (atalk_port(sport) || atalk_port(dport))) {
+@@ -525,6 +530,7 @@ udp_print(register const u_char *bp, u_i
+ 			llap_print(cp, length);
+ 			return;
+ 		}
++#endif
+ 	}
+ 	udpipaddr_print(ip, sport, dport);
+ 
+@@ -575,14 +581,18 @@ udp_print(register const u_char *bp, u_i
+ 			ns_print((const u_char *)(up + 1), length, 0);
+ 		else if (ISPORT(MULTICASTDNS_PORT))
+ 			ns_print((const u_char *)(up + 1), length, 1);
++#ifndef TCPDUMP_MINI
+ 		else if (ISPORT(TIMED_PORT))
+ 			timed_print((const u_char *)(up + 1));
++#endif
+ 		else if (ISPORT(TFTP_PORT))
+ 			tftp_print((const u_char *)(up + 1), length);
+ 		else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
+ 			bootp_print((const u_char *)(up + 1), length);
++#ifndef TCPDUMP_MINI
+ 		else if (ISPORT(RIP_PORT))
+ 			rip_print((const u_char *)(up + 1), length);
++#endif
+ 		else if (ISPORT(AODV_PORT))
+ 			aodv_print((const u_char *)(up + 1), length,
+ #ifdef INET6
+@@ -590,6 +600,7 @@ udp_print(register const u_char *bp, u_i
+ #else
+ 			    0);
+ #endif
++#ifndef TCPDUMP_MINI
+ 	        else if (ISPORT(ISAKMP_PORT))
+ 			 isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);
+   	        else if (ISPORT(ISAKMP_PORT_NATT))
+@@ -598,12 +609,15 @@ udp_print(register const u_char *bp, u_i
+    	        else if (ISPORT(ISAKMP_PORT_USER1) || ISPORT(ISAKMP_PORT_USER2))
+ 			isakmp_print(gndo, (const u_char *)(up + 1), length, bp2);
+ #endif
++#endif
+ 		else if (ISPORT(SNMP_PORT) || ISPORT(SNMPTRAP_PORT))
+ 			snmp_print((const u_char *)(up + 1), length);
+ 		else if (ISPORT(NTP_PORT))
+ 			ntp_print((const u_char *)(up + 1), length);
++#ifndef TCPDUMP_MINI
+ 		else if (ISPORT(KERBEROS_PORT) || ISPORT(KERBEROS_SEC_PORT))
+ 			krb_print((const void *)(up + 1));
++#endif
+ 		else if (ISPORT(L2TP_PORT))
+ 			l2tp_print((const u_char *)(up + 1), length);
+ #ifdef TCPDUMP_DO_SMB
+@@ -614,6 +628,7 @@ udp_print(register const u_char *bp, u_i
+ #endif
+ 		else if (dport == VAT_PORT)
+ 			vat_print((const void *)(up + 1), up);
++#ifndef TCPDUMP_MINI
+ 		else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
+ 			zephyr_print((const void *)(up + 1), length);
+ 		/*
+@@ -624,6 +639,7 @@ udp_print(register const u_char *bp, u_i
+ 			 (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH))
+ 			rx_print((const void *)(up + 1), length, sport, dport,
+ 				 (u_char *) ip);
++#endif
+ #ifdef INET6
+ 		else if (ISPORT(RIPNG_PORT))
+ 			ripng_print((const u_char *)(up + 1), length);
+@@ -635,21 +651,25 @@ udp_print(register const u_char *bp, u_i
+ 		/*
+ 		 * Kludge in test for whiteboard packets.
+ 		 */
++#ifndef TCPDUMP_MINI
+ 		else if (dport == WB_PORT)
+ 			wb_print((const void *)(up + 1), length);
+ 		else if (ISPORT(CISCO_AUTORP_PORT))
+ 			cisco_autorp_print((const void *)(up + 1), length);
++#endif
+ 		else if (ISPORT(RADIUS_PORT) ||
+ 			 ISPORT(RADIUS_NEW_PORT) ||
+ 			 ISPORT(RADIUS_ACCOUNTING_PORT) ||
+ 			 ISPORT(RADIUS_NEW_ACCOUNTING_PORT) )
+ 			radius_print((const u_char *)(up+1), length);
++#ifndef TCPDUMP_MINI
+ 		else if (dport == HSRP_PORT)
+ 			hsrp_print((const u_char *)(up + 1), length);
+ 		else if (ISPORT(LWRES_PORT))
+ 			lwres_print((const u_char *)(up + 1), length);
+ 		else if (ISPORT(LDP_PORT))
+ 			ldp_print((const u_char *)(up + 1), length);
++#endif
+ 		else if (ISPORT(OLSR_PORT))
+ 			olsr_print((const u_char *)(up + 1), length,
+ #if INET6
+@@ -657,6 +677,7 @@ udp_print(register const u_char *bp, u_i
+ #else
+ 					0);
+ #endif
++#ifndef TCPDUMP_MINI
+ 		else if (ISPORT(MPLS_LSP_PING_PORT))
+ 			lspping_print((const u_char *)(up + 1), length);
+ 		else if (dport == BFD_CONTROL_PORT ||
+@@ -674,14 +695,17 @@ udp_print(register const u_char *bp, u_i
+                         lwapp_control_print((const u_char *)(up + 1), length, 0);
+                 else if (ISPORT(LWAPP_DATA_PORT))
+                         lwapp_data_print((const u_char *)(up + 1), length);
++#endif
+                 else if (ISPORT(SIP_PORT))
+ 			sip_print((const u_char *)(up + 1), length);
+                 else if (ISPORT(SYSLOG_PORT))
+ 			syslog_print((const u_char *)(up + 1), length);
++#ifndef TCPDUMP_MINI
+                 else if (ISPORT(OTV_PORT))
+ 			otv_print((const u_char *)(up + 1), length);
+                 else if (ISPORT(VXLAN_PORT))
+ 			vxlan_print((const u_char *)(up + 1), length);
++#endif
+ 		else
+ 			(void)printf("UDP, length %u",
+ 			    (u_int32_t)(ulen - sizeof(*up)));
+--- a/tcpdump.c
++++ b/tcpdump.c
+@@ -161,6 +161,7 @@ struct ndo_printer {
+ 
+ 
+ static struct printer printers[] = {
++#ifndef TCPDUMP_MINI
+ 	{ arcnet_if_print,	DLT_ARCNET },
+ #ifdef DLT_ARCNET_LINUX
+ 	{ arcnet_linux_if_print, DLT_ARCNET_LINUX },
+@@ -179,19 +180,23 @@ static struct printer printers[] = {
+ #ifdef DLT_SLIP_BSDOS
+ 	{ sl_bsdos_if_print,	DLT_SLIP_BSDOS },
+ #endif
++#endif
+ 	{ ppp_if_print,		DLT_PPP },
+ #ifdef DLT_PPP_WITHDIRECTION
+ 	{ ppp_if_print,		DLT_PPP_WITHDIRECTION },
+ #endif
++#ifndef TCPDUMP_MINI
+ #ifdef DLT_PPP_BSDOS
+ 	{ ppp_bsdos_if_print,	DLT_PPP_BSDOS },
+ #endif
+ 	{ fddi_if_print,	DLT_FDDI },
++#endif
+ 	{ null_if_print,	DLT_NULL },
+ #ifdef DLT_LOOP
+ 	{ null_if_print,	DLT_LOOP },
+ #endif
+ 	{ raw_if_print,		DLT_RAW },
++#ifndef TCPDUMP_MINI
+ 	{ atm_if_print,		DLT_ATM_RFC1483 },
+ #ifdef DLT_C_HDLC
+ 	{ chdlc_if_print,	DLT_C_HDLC },
+@@ -202,6 +207,7 @@ static struct printer printers[] = {
+ #ifdef DLT_PPP_SERIAL
+ 	{ ppp_hdlc_if_print,	DLT_PPP_SERIAL },
+ #endif
++#endif
+ #ifdef DLT_PPP_ETHER
+ 	{ pppoe_if_print,	DLT_PPP_ETHER },
+ #endif
+@@ -211,6 +217,7 @@ static struct printer printers[] = {
+ #ifdef DLT_IEEE802_11
+ 	{ ieee802_11_if_print,	DLT_IEEE802_11},
+ #endif
++#ifndef TCPDUMP_MINI
+ #ifdef DLT_LTALK
+ 	{ ltalk_if_print,	DLT_LTALK },
+ #endif
+@@ -229,12 +236,14 @@ static struct printer printers[] = {
+ #ifdef DLT_IP_OVER_FC
+ 	{ ipfc_if_print,	DLT_IP_OVER_FC },
+ #endif
++#endif
+ #ifdef DLT_PRISM_HEADER
+ 	{ prism_if_print,	DLT_PRISM_HEADER },
+ #endif
+ #ifdef DLT_IEEE802_11_RADIO
+ 	{ ieee802_11_radio_if_print,	DLT_IEEE802_11_RADIO },
+ #endif
++#ifndef TCPDUMP_MINI
+ #ifdef DLT_ENC
+ 	{ enc_if_print,		DLT_ENC },
+ #endif
+@@ -244,9 +253,11 @@ static struct printer printers[] = {
+ #ifdef DLT_APPLE_IP_OVER_IEEE1394
+ 	{ ap1394_if_print,	DLT_APPLE_IP_OVER_IEEE1394 },
+ #endif
++#endif
+ #ifdef DLT_IEEE802_11_RADIO_AVS
+ 	{ ieee802_11_radio_avs_if_print,	DLT_IEEE802_11_RADIO_AVS },
+ #endif
++#ifndef TCPDUMP_MINI
+ #ifdef DLT_JUNIPER_ATM1
+ 	{ juniper_atm1_print,	DLT_JUNIPER_ATM1 },
+ #endif
+@@ -312,6 +323,7 @@ static struct printer printers[] = {
+ #ifdef DLT_IPV6
+ 	{ raw_if_print,		DLT_IPV6 },
+ #endif
++#endif
+ 	{ NULL,			0 },
+ };
+ 
+@@ -320,6 +332,7 @@ static struct ndo_printer ndo_printers[]
+ #ifdef DLT_IPNET
+ 	{ ipnet_if_print,	DLT_IPNET },
+ #endif
++#ifndef TCPDUMP_MINI
+ #ifdef DLT_IEEE802_15_4
+ 	{ ieee802_15_4_if_print, DLT_IEEE802_15_4 },
+ #endif
+@@ -329,15 +342,18 @@ static struct ndo_printer ndo_printers[]
+ #ifdef DLT_PPI
+ 	{ ppi_if_print,		DLT_PPI },
+ #endif
++#endif
+ #ifdef DLT_NETANALYZER
+ 	{ netanalyzer_if_print, DLT_NETANALYZER },
+ #endif
+ #ifdef DLT_NETANALYZER_TRANSPARENT
+ 	{ netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
+ #endif
++#ifndef TCPDUMP_MINI
+ #ifdef DLT_NFLOG
+ 	{ nflog_if_print,	DLT_NFLOG},
+ #endif
++#endif
+ 	{ NULL,			0 },
+ };
+ 
+--- a/print-sll.c
++++ b/print-sll.c
+@@ -154,14 +154,14 @@ recurse:
+ 		 * Yes - what type is it?
+ 		 */
+ 		switch (ether_type) {
+-
++#ifndef TCPDUMP_MINI
+ 		case LINUX_SLL_P_802_3:
+ 			/*
+ 			 * Ethernet_802.3 IPX frame.
+ 			 */
+ 			ipx_print(p, length);
+ 			break;
+-
++#endif
+ 		case LINUX_SLL_P_802_2:
+ 			/*
+ 			 * 802.2.
diff --git a/trunk/package/network/utils/umbim/Makefile b/trunk/package/network/utils/umbim/Makefile
new file mode 100644
index 00000000..a699a26b
--- /dev/null
+++ b/trunk/package/network/utils/umbim/Makefile
@@ -0,0 +1,45 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=umbim
+PKG_VERSION:=2014-09-09
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.openwrt.org/project/umbim.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=4ae19ab4fcdd70dbfc8c303d752502f2da5a7e75
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/umbim
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libubox +kmod-usb-net +kmod-usb-net-cdc-mbim
+  TITLE:=Control utility for mobile broadband modems
+endef
+
+define Package/umbim/description
+  umbim is a command line tool for controlling mobile broadband modems using
+  the MBIM-protocol.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include -ffunction-sections -fdata-sections
+
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+define Package/umbim/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/umbim $(1)/sbin/
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,umbim))
diff --git a/trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh b/trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
new file mode 100755
index 00000000..010a3a25
--- /dev/null
+++ b/trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+#DBG=-v
+
+proto_mbim_init_config() {
+	available=1
+	no_device=1
+	proto_config_add_string "device:device"
+	proto_config_add_string apn
+	proto_config_add_string pincode
+	proto_config_add_string delay
+	proto_config_add_string auth
+	proto_config_add_string username
+	proto_config_add_string password
+}
+
+proto_mbim_setup() {
+	local interface="$1"
+	local tid=2
+	local ret
+
+	local device apn pincode delay
+	json_get_vars device apn pincode delay auth username password
+
+	[ -n "$ctl_device" ] && device=$ctl_device
+
+	[ -n "$device" ] || {
+		echo "mbim[$$]" "No control device specified"
+		proto_notify_error "$interface" NO_DEVICE
+		proto_set_available "$interface" 0
+		return 1
+	}
+	[ -c "$device" ] || {
+		echo "mbim[$$]" "The specified control device does not exist"
+		proto_notify_error "$interface" NO_DEVICE
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	devname="$(basename "$device")"
+	devpath="$(readlink -f /sys/class/usbmisc/$devname/device/)"
+	ifname="$( ls "$devpath"/net )"
+
+	[ -n "$ifname" ] || {
+		echo "mbim[$$]" "Failed to find matching interface"
+		proto_notify_error "$interface" NO_IFNAME
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	[ -n "$apn" ] || {
+		echo "mbim[$$]" "No APN specified"
+		proto_notify_error "$interface" NO_APN
+		return 1
+	}
+
+	[ -n "$delay" ] && sleep "$delay"
+
+	echo "mbim[$$]" "Reading capabilities"
+	umbim $DBG -n -d $device caps || {
+		echo "mbim[$$]" "Failed to read modem caps"
+		proto_notify_error "$interface" PIN_FAILED
+		return 1
+	}
+	tid=$((tid + 1))
+
+	[ "$pincode" ] && {
+		echo "mbim[$$]" "Sending pin"
+		umbim $DBG -n -t $tid -d $device unlock "$pincode" || {
+			echo "mbim[$$]" "Unable to verify PIN"
+			proto_notify_error "$interface" PIN_FAILED
+			proto_block_restart "$interface"
+			return 1
+		}
+	}
+	tid=$((tid + 1))
+
+	echo "mbim[$$]" "Checking pin"
+	umbim $DBG -n -t $tid -d $device pinstate || {
+		echo "mbim[$$]" "PIN required"
+		proto_notify_error "$interface" PIN_FAILED
+		proto_block_restart "$interface"
+		return 1
+	}
+	tid=$((tid + 1))
+
+	echo "mbim[$$]" "Checking subscriber"
+ 	umbim $DBG -n -t $tid -d $device subscriber || {
+		echo "mbim[$$]" "Subscriber init failed"
+		proto_notify_error "$interface" NO_SUBSCRIBER
+		return 1
+	}
+	tid=$((tid + 1))
+
+	echo "mbim[$$]" "Register with network"
+  	umbim $DBG -n -t $tid -d $device registration || {
+		echo "mbim[$$]" "Subscriber registration failed"
+		proto_notify_error "$interface" NO_REGISTRATION
+		return 1
+	}
+	tid=$((tid + 1))
+
+	echo "mbim[$$]" "Attach to network"
+   	umbim $DBG -n -t $tid -d $device attach || {
+		echo "mbim[$$]" "Failed to attach to network"
+		proto_notify_error "$interface" ATTACH_FAILED
+		return 1
+	}
+	tid=$((tid + 1))
+ 
+	echo "mbim[$$]" "Connect to network"
+	while ! umbim $DBG -n -t $tid -d $device connect "$apn" "$auth" "$username" "$password"; do
+		tid=$((tid + 1))
+		sleep 1;
+	done
+	tid=$((tid + 1))
+
+	uci_set_state network $interface tid "$tid"
+
+	echo "mbim[$$]" "Connected, starting DHCP"
+	proto_init_update "$ifname" 1
+	proto_send_update "$interface"
+
+	json_init
+	json_add_string name "${interface}_dhcp"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcp"
+	json_close_object
+	ubus call network add_dynamic "$(json_dump)"
+
+	json_init
+	json_add_string name "${interface}_dhcpv6"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcpv6"
+	ubus call network add_dynamic "$(json_dump)"
+}
+
+proto_mbim_teardown() {
+	local interface="$1"
+
+	local device
+	json_get_vars device
+	local tid=$(uci_get_state network $interface tid)
+
+	[ -n "$ctl_device" ] && device=$ctl_device
+
+	echo "mbim[$$]" "Stopping network"
+	[ -n "$tid" ] && {
+		umbim $DBG -t$tid -d "$device" disconnect
+		uci_revert_state network $interface tid
+	}
+
+	proto_init_update "*" 0
+	proto_send_update "$interface"
+}
+
+[ -n "$INCLUDE_ONLY" ] || add_protocol mbim
diff --git a/trunk/package/network/utils/uqmi/Makefile b/trunk/package/network/utils/uqmi/Makefile
new file mode 100644
index 00000000..3704faf7
--- /dev/null
+++ b/trunk/package/network/utils/uqmi/Makefile
@@ -0,0 +1,50 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uqmi
+PKG_VERSION:=2014-12-03
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/uqmi.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=86bcdb8cca652676a78b2df8b5e3fb27a40c60a4
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Matti Laakso <malaakso@elisanet.fi>
+# PKG_MIRROR_MD5SUM:=
+# CMAKE_INSTALL:=1
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/uqmi
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libubox +libblobmsg-json +kmod-usb-net +kmod-usb-net-qmi-wwan
+  TITLE:=Control utility for mobile broadband modems
+endef
+
+define Package/uqmi/description
+  uqmi is a command line tool for controlling mobile broadband modems using
+  the QMI-protocol.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include -ffunction-sections -fdata-sections
+
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+CMAKE_OPTIONS += \
+	-DDEBUG=1
+
+define Package/uqmi/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uqmi $(1)/sbin/
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,uqmi))
diff --git a/trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
new file mode 100755
index 00000000..ae6aa730
--- /dev/null
+++ b/trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -0,0 +1,155 @@
+#!/bin/sh
+
+[ -n "$INCLUDE_ONLY" ] || {
+	. /lib/functions.sh
+	. ../netifd-proto.sh
+	init_proto "$@"
+}
+
+proto_qmi_init_config() {
+	available=1
+	no_device=1
+	proto_config_add_string "device:device"
+	proto_config_add_string apn
+	proto_config_add_string auth
+	proto_config_add_string username
+	proto_config_add_string password
+	proto_config_add_string pincode
+	proto_config_add_string delay
+	proto_config_add_string modes
+}
+
+qmi_disconnect() {
+	# disable previous autoconnect state using the global handle
+	# do not reuse previous wds client id to prevent hangs caused by stale data
+	uqmi -s -d "$device" \
+		--stop-network 0xffffffff \
+		--autoconnect > /dev/null
+}
+
+qmi_wds_release() {
+	[ -n "$cid" ] || return 0
+
+	uqmi -s -d "$device" --set-client-id wds,"$cid" --release-client-id wds
+	uci_revert_state network $interface cid
+}
+
+proto_qmi_setup() {
+	local interface="$1"
+
+	local device apn auth username password pincode delay modes cid pdh
+	json_get_vars device apn auth username password pincode delay modes
+
+	[ -n "$ctl_device" ] && device=$ctl_device
+
+	[ -n "$device" ] || {
+		echo "No control device specified"
+		proto_notify_error "$interface" NO_DEVICE
+		proto_set_available "$interface" 0
+		return 1
+	}
+	[ -c "$device" ] || {
+		echo "The specified control device does not exist"
+		proto_notify_error "$interface" NO_DEVICE
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	devname="$(basename "$device")"
+	devpath="$(readlink -f /sys/class/usbmisc/$devname/device/)"
+	ifname="$( ls "$devpath"/net )"
+	[ -n "$ifname" ] || {
+		echo "The interface could not be found."
+		proto_notify_error "$interface" NO_IFACE
+		proto_set_available "$interface" 0
+		return 1
+	}
+
+	[ -n "$delay" ] && sleep "$delay"
+
+	while uqmi -s -d "$device" --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do
+		sleep 1;
+	done
+
+	[ -n "$pincode" ] && {
+		uqmi -s -d "$device" --verify-pin1 "$pincode" || {
+			echo "Unable to verify PIN"
+			proto_notify_error "$interface" PIN_FAILED
+			proto_block_restart "$interface"
+			return 1
+		}
+	}
+
+	[ -n "$apn" ] || {
+		echo "No APN specified"
+		proto_notify_error "$interface" NO_APN
+		return 1
+	}
+
+	qmi_disconnect
+
+	uqmi -s -d "$device" --set-data-format 802.3
+	uqmi -s -d "$device" --wda-set-data-format 802.3
+
+	echo "Waiting for network registration"
+	while uqmi -s -d "$device" --get-serving-system | grep '"searching"' > /dev/null; do
+		sleep 5;
+	done
+
+	[ -n "$modes" ] && uqmi -s -d "$device" --set-network-modes "$modes"
+
+	echo "Starting network $apn"
+	cid=`uqmi -s -d "$device" --get-client-id wds`
+	[ $? -ne 0 ] && {
+		echo "Unable to obtain client ID"
+		proto_notify_error "$interface" NO_CID
+		return 1
+	}
+
+	uqmi -s -d "$device" --set-client-id wds,"$cid" \
+		--start-network "$apn" \
+		${auth:+--auth-type $auth} \
+		${username:+--username $username} \
+		${password:+--password $password} \
+		--autoconnect > /dev/null
+
+	echo "Starting DHCP"
+	proto_init_update "$ifname" 1
+	proto_send_update "$interface"
+
+	json_init
+	json_add_string name "${interface}_dhcp"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcp"
+	json_close_object
+	ubus call network add_dynamic "$(json_dump)"
+
+	json_init
+	json_add_string name "${interface}_dhcpv6"
+	json_add_string ifname "@$interface"
+	json_add_string proto "dhcpv6"
+	json_close_object
+	ubus call network add_dynamic "$(json_dump)"
+}
+
+proto_qmi_teardown() {
+	local interface="$1"
+
+	local device
+	json_get_vars device
+
+	[ -n "$ctl_device" ] && device=$ctl_device
+
+	local cid=$(uci_get_state network $interface cid)
+
+	echo "Stopping network"
+	qmi_disconnect
+	qmi_wds_release
+
+	proto_init_update "*" 0
+	proto_send_update "$interface"
+}
+
+[ -n "$INCLUDE_ONLY" ] || {
+	add_protocol qmi
+}
diff --git a/trunk/package/network/utils/wireless-tools/Makefile b/trunk/package/network/utils/wireless-tools/Makefile
new file mode 100644
index 00000000..67986baa
--- /dev/null
+++ b/trunk/package/network/utils/wireless-tools/Makefile
@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wireless-tools
+PKG_VERSION:=29
+PKG_MINOR:=
+PKG_RELEASE:=5
+
+PKG_SOURCE:=wireless_tools.$(PKG_VERSION)$(PKG_MINOR).tar.gz
+PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+PKG_MD5SUM:=e06c222e186f7cc013fd272d023710cb
+TAR_OPTIONS += || true
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wireless-tools/Default
+  URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+endef
+
+define Package/wireless-tools
+$(call Package/wireless-tools/Default)
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Tools for manipulating Linux Wireless Extensions
+endef
+
+define Package/wireless-tools/description
+ This package contains a collection of tools for configuring wireless
+ adapters implementing the "Linux Wireless Extensions".
+endef
+
+define Package/libiw
+$(call Package/wireless-tools/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for manipulating Linux Wireless Extensions
+endef
+
+define Package/libiw/description
+ This package contains a library for manipulating
+ "Linux Wireless Extensions".
+endef
+
+define Build/Compile
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -I." \
+		BUILD_WE_ESSENTIAL=y \
+		LIBS="-lm -Wl,--gc-sections" \
+		libiw.so.$(PKG_VERSION) iwmulticall
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		PREFIX="$(PKG_INSTALL_DIR)" \
+		INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
+		INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \
+		install-iwmulticall
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libiw.so* $(1)/usr/lib/
+	$(LN) libiw.so.$(PKG_VERSION) $(1)/usr/lib/libiw.so
+endef
+
+define Package/wireless-tools/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iwconfig $(1)/usr/sbin/
+	$(LN) iwconfig $(1)/usr/sbin/iwlist
+	$(LN) iwconfig $(1)/usr/sbin/iwpriv
+endef
+
+define Package/libiw/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libiw.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,wireless-tools))
+$(eval $(call BuildPackage,libiw))
diff --git a/trunk/package/network/utils/wireless-tools/patches/001-debian.patch b/trunk/package/network/utils/wireless-tools/patches/001-debian.patch
new file mode 100644
index 00000000..e00bad27
--- /dev/null
+++ b/trunk/package/network/utils/wireless-tools/patches/001-debian.patch
@@ -0,0 +1,35 @@
+--- a/iwlib.c
++++ b/iwlib.c
+@@ -667,6 +667,7 @@ iw_get_basic_config(int			skfd,
+ {
+   struct iwreq		wrq;
+ 
++  memset((char *) &wrq, 0, sizeof(struct iwreq));
+   memset((char *) info, 0, sizeof(struct wireless_config));
+ 
+   /* Get wireless name */
+--- a/Makefile
++++ b/Makefile
+@@ -73,8 +73,8 @@ DYNAMIC_LINK= libiw.so
+ # Install directories
+ INSTALL_DIR= $(PREFIX)/sbin/
+ INSTALL_LIB= $(PREFIX)/lib/
+-INSTALL_INC= $(PREFIX)/include/
+-INSTALL_MAN= $(PREFIX)/man/
++INSTALL_INC= $(PREFIX)/usr/include/
++INSTALL_MAN= $(PREFIX)/usr/share/man/
+ 
+ # Various commands
+ RM = rm -f
+@@ -102,9 +102,9 @@ ifdef BUILD_WE_ESSENTIAL
+ endif
+ 
+ # Other flags
+-CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
++#CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
+ 	-Wpointer-arith -Wcast-qual -Winline -I.
+-#CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
++CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
+ DEPFLAGS=-MMD
+ XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
+ PICFLAG=-fPIC
diff --git a/trunk/package/network/utils/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch b/trunk/package/network/utils/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch
new file mode 100644
index 00000000..2b61ef29
--- /dev/null
+++ b/trunk/package/network/utils/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch
@@ -0,0 +1,13 @@
+--- a/iwconfig.c
++++ b/iwconfig.c
+@@ -1034,8 +1034,8 @@ set_power_info(int		skfd,
+ 	wrq.u.power.disabled = 0;
+ 
+ 	/* Is there any value to grab ? */
+-	value = strtod(args[0], &unit);
+-	if(unit != args[0])
++	value = strtod(args[i], &unit);
++	if(unit != args[i])
+ 	  {
+ 	    struct iw_range	range;
+ 	    int			flags;
diff --git a/trunk/package/network/utils/wireless-tools/patches/003-we_essential_def.patch b/trunk/package/network/utils/wireless-tools/patches/003-we_essential_def.patch
new file mode 100644
index 00000000..8666f3e8
--- /dev/null
+++ b/trunk/package/network/utils/wireless-tools/patches/003-we_essential_def.patch
@@ -0,0 +1,359 @@
+--- a/iwlist.c
++++ b/iwlist.c
+@@ -58,7 +58,6 @@ typedef struct iw_auth_descr
+  * Maybe this should go in iwlib.c ?
+  */
+ 
+-#ifndef WE_ESSENTIAL
+ #define IW_ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0]))
+ 
+ //static const struct iwmask_name iw_enc_mode_name[] = {
+@@ -161,11 +160,8 @@ static const char *	iw_ie_key_mgmt_name[
+ };
+ #define	IW_IE_KEY_MGMT_NUM	IW_ARRAY_LEN(iw_ie_key_mgmt_name)
+ 
+-#endif	/* WE_ESSENTIAL */
+-
+ /************************* WPA SUBROUTINES *************************/
+ 
+-#ifndef WE_ESSENTIAL
+ /*------------------------------------------------------------------*/
+ /*
+  * Print all names corresponding to a mask.
+@@ -431,7 +427,6 @@ iw_print_gen_ie(unsigned char *	buffer,
+       offset += buffer[offset+1] + 2;
+     }
+ }
+-#endif	/* WE_ESSENTIAL */
+ 
+ /***************************** SCANNING *****************************/
+ /*
+@@ -585,12 +580,10 @@ print_scanning_token(struct stream_descr
+ 		     &event->u.qual, iw_range, has_range);
+       printf("                    %s\n", buffer);
+       break;
+-#ifndef WE_ESSENTIAL
+     case IWEVGENIE:
+       /* Informations Elements are complex, let's do only some of them */
+       iw_print_gen_ie(event->u.data.pointer, event->u.data.length);
+       break;
+-#endif	/* WE_ESSENTIAL */
+     case IWEVCUSTOM:
+       {
+ 	char custom[IW_CUSTOM_MAX+1];
+@@ -1302,7 +1295,6 @@ print_pm_info(int		skfd,
+   return(0);
+ }
+ 
+-#ifndef WE_ESSENTIAL
+ /************************** TRANSMIT POWER **************************/
+ 
+ /*------------------------------------------------------------------*/
+@@ -1405,6 +1397,7 @@ print_txpower_info(int		skfd,
+   return(0);
+ }
+ 
++#ifndef WE_ESSENTIAL
+ /*********************** RETRY LIMIT/LIFETIME ***********************/
+ 
+ /*------------------------------------------------------------------*/
+@@ -2060,8 +2053,8 @@ static const struct iwlist_entry iwlist_
+   { "encryption",	print_keys_info,	0, NULL },
+   { "keys",		print_keys_info,	0, NULL },
+   { "power",		print_pm_info,		0, NULL },
+-#ifndef WE_ESSENTIAL
+   { "txpower",		print_txpower_info,	0, NULL },
++#ifndef WE_ESSENTIAL
+   { "retry",		print_retry_info,	0, NULL },
+   { "ap",		print_ap_info,		0, NULL },
+   { "accesspoints",	print_ap_info,		0, NULL },
+--- a/iwconfig.c
++++ b/iwconfig.c
+@@ -106,16 +106,6 @@ get_info(int			skfd,
+     if(wrq.u.data.length > 1)
+       info->has_nickname = 1;
+ 
+-  if((info->has_range) && (info->range.we_version_compiled > 9))
+-    {
+-      /* Get Transmit Power */
+-      if(iw_get_ext(skfd, ifname, SIOCGIWTXPOW, &wrq) >= 0)
+-	{
+-	  info->has_txpower = 1;
+-	  memcpy(&(info->txpower), &(wrq.u.txpower), sizeof(iwparam));
+-	}
+-    }
+-
+   /* Get sensitivity */
+   if(iw_get_ext(skfd, ifname, SIOCGIWSENS, &wrq) >= 0)
+     {
+@@ -132,6 +122,17 @@ get_info(int			skfd,
+ 	  memcpy(&(info->retry), &(wrq.u.retry), sizeof(iwparam));
+ 	}
+     }
++#endif	/* WE_ESSENTIAL */
++
++  if((info->has_range) && (info->range.we_version_compiled > 9))
++    {
++      /* Get Transmit Power */
++      if(iw_get_ext(skfd, ifname, SIOCGIWTXPOW, &wrq) >= 0)
++	{
++	  info->has_txpower = 1;
++	  memcpy(&(info->txpower), &(wrq.u.txpower), sizeof(iwparam));
++	}
++    }
+ 
+   /* Get RTS threshold */
+   if(iw_get_ext(skfd, ifname, SIOCGIWRTS, &wrq) >= 0)
+@@ -146,7 +147,6 @@ get_info(int			skfd,
+       info->has_frag = 1;
+       memcpy(&(info->frag), &(wrq.u.frag), sizeof(iwparam));
+     }
+-#endif	/* WE_ESSENTIAL */
+ 
+   return(0);
+ }
+@@ -269,7 +269,6 @@ display_info(struct wireless_info *	info
+       printf("Bit Rate%c%s   ", (info->bitrate.fixed ? '=' : ':'), buffer);
+     }
+ 
+-#ifndef WE_ESSENTIAL
+   /* Display the Transmit Power */
+   if(info->has_txpower)
+     {
+@@ -286,6 +285,7 @@ display_info(struct wireless_info *	info
+       printf("Tx-Power%c%s   ", (info->txpower.fixed ? '=' : ':'), buffer);
+     }
+ 
++#ifndef WE_ESSENTIAL
+   /* Display sensitivity */
+   if(info->has_sens)
+     {
+@@ -340,6 +340,7 @@ display_info(struct wireless_info *	info
+       printf("   ");
+       tokens += 5;	/* Between 3 and 5, depend on flags */
+     }
++#endif	/* WE_ESSENTIAL */
+ 
+   /* Display the RTS threshold */
+   if(info->has_rts)
+@@ -383,7 +384,6 @@ display_info(struct wireless_info *	info
+   /* Formating */
+   if(tokens > 0)
+     printf("\n          ");
+-#endif	/* WE_ESSENTIAL */
+ 
+   /* Display encryption information */
+   /* Note : we display only the "current" key, use iwlist to list all keys */
+@@ -1196,6 +1196,7 @@ set_nwid_info(int		skfd,
+   /* 1 arg */
+   return(1);
+ }
++#endif	/* WE_ESSENTIAL */
+ 
+ /*------------------------------------------------------------------*/
+ /*
+@@ -1362,6 +1363,7 @@ set_txpower_info(int		skfd,
+   return(i);
+ }
+ 
++#ifndef WE_ESSENTIAL
+ /*------------------------------------------------------------------*/
+ /*
+  * Set Sensitivity
+@@ -1459,6 +1461,7 @@ set_retry_info(int		skfd,
+   /* Var args */
+   return(i);
+ }
++#endif	/* WE_ESSENTIAL */
+ 
+ /*------------------------------------------------------------------*/
+ /*
+@@ -1565,6 +1568,7 @@ set_frag_info(int		skfd,
+   return(1);
+ }
+ 
++#ifndef WE_ESSENTIAL
+ /*------------------------------------------------------------------*/
+ /*
+  * Set Modulation
+@@ -1719,21 +1723,21 @@ static const struct iwconfig_entry iwcon
+ 	"Set Nickname",			"NNN" },
+   { "nwid",		set_nwid_info,		1,	SIOCSIWNWID,
+ 	"Set NWID",			"{NN|on|off}" },
+-  { "ap",		set_apaddr_info,	1,	SIOCSIWAP,
+-	"Set AP Address",		"{N|off|auto}" },
+-  { "txpower",		set_txpower_info,	1,	SIOCSIWTXPOW,
+-	"Set Tx Power",			"{NmW|NdBm|off|auto}" },
+   { "sens",		set_sens_info,		1,	SIOCSIWSENS,
+ 	"Set Sensitivity",		"N" },
++  { "modulation",	set_modulation_info,	1,	SIOCGIWMODUL,
++	"Set Modulation",		"{11g|11a|CCK|OFDMg|...}" },
+   { "retry",		set_retry_info,		1,	SIOCSIWRETRY,
+ 	"Set Retry Limit",		"{limit N|lifetime N}" },
++#endif	/* WE_ESSENTIAL */
++  { "ap",		set_apaddr_info,	1,	SIOCSIWAP,
++	"Set AP Address",		"{N|off|auto}" },
++  { "txpower",		set_txpower_info,	1,	SIOCSIWTXPOW,
++	"Set Tx Power",			"{NmW|NdBm|off|auto}" },
+   { "rts",		set_rts_info,		1,	SIOCSIWRTS,
+ 	"Set RTS Threshold",		"{N|auto|fixed|off}" },
+   { "frag",		set_frag_info,		1,	SIOCSIWFRAG,
+ 	"Set Fragmentation Threshold",	"{N|auto|fixed|off}" },
+-  { "modulation",	set_modulation_info,	1,	SIOCGIWMODUL,
+-	"Set Modulation",		"{11g|11a|CCK|OFDMg|...}" },
+-#endif	/* WE_ESSENTIAL */
+   { "commit",		set_commit_info,	0,	SIOCSIWCOMMIT,
+ 	"Commit changes",		"" },
+   { NULL, NULL, 0, 0, NULL, NULL },
+--- a/iwmulticall.c
++++ b/iwmulticall.c
+@@ -81,7 +81,7 @@ extern int
+ #define main(args...) main_iwspy(args)
+ #include "iwspy.c"
+ #undef main
+-#endif	/* WE_ESSENTIAL */
++#endif
+ 
+ /* Get iwpriv in there. Mandatory for HostAP and some other drivers. */
+ #define main(args...) main_iwpriv(args)
+@@ -90,12 +90,14 @@ extern int
+ #undef iw_usage
+ #undef main
+ 
++#ifndef WE_ESSENTIAL
+ /* Do we really need iwgetid ? Well, it's not like it's a big one */
+ #define main(args...) main_iwgetid(args)
+ #define iw_usage(args...) iwgetid_usage(args)
+ #include "iwgetid.c"
+ #undef iw_usage
+ #undef main
++#endif
+ 
+ /* iwevent is useless for most people, don't grab it ? */
+ 
+@@ -131,11 +133,13 @@ main(int	argc,
+ #ifndef WE_ESSENTIAL
+   if(!strcmp(call_name, "iwspy"))
+     return(main_iwspy(argc, argv));
+-#endif	/* WE_ESSENTIAL */
++#endif
+   if(!strcmp(call_name, "iwpriv"))
+     return(main_iwpriv(argc, argv));
++#ifndef WE_ESSENTIAL
+   if(!strcmp(call_name, "iwgetid"))
+     return(main_iwgetid(argc, argv));
++#endif
+ 
+   /* Uh oh... Not supposed to come here. */
+   printf("iwmulticall : you are not supposed to call me this way...\n");
+--- a/iwlib.c
++++ b/iwlib.c
+@@ -113,6 +113,7 @@ const struct iw_modul_descr	iw_modul_lis
+   { IW_MODUL_11A, "11a", "IEEE 802.11a (5 GHz, up to 54 Mb/s)" },
+   { IW_MODUL_11B, "11b", "IEEE 802.11b (2.4 GHz, up to 11 Mb/s)" },
+ 
++#ifndef WE_ESSENTIAL
+   /* Proprietary aggregates */
+   { IW_MODUL_TURBO | IW_MODUL_11A, "turboa",
+     "Atheros turbo mode at 5 GHz (up to 108 Mb/s)" },
+@@ -120,6 +121,7 @@ const struct iw_modul_descr	iw_modul_lis
+     "Atheros turbo mode at 2.4 GHz (up to 108 Mb/s)" },
+   { IW_MODUL_PBCC | IW_MODUL_11B, "11+",
+     "TI 802.11+ (2.4 GHz, up to 22 Mb/s)" },
++#endif
+ 
+   /* Individual modulations */
+   { IW_MODUL_OFDM_G, "OFDMg",
+@@ -129,6 +131,7 @@ const struct iw_modul_descr	iw_modul_lis
+   { IW_MODUL_DS, "DS", "802.11 Direct Sequence (2.4 GHz, up to 2 Mb/s)" },
+   { IW_MODUL_FH, "FH", "802.11 Frequency Hopping (2,4 GHz, up to 2 Mb/s)" },
+ 
++#ifndef WE_ESSENTIAL
+   /* Proprietary modulations */
+   { IW_MODUL_TURBO, "turbo",
+     "Atheros turbo mode, channel bonding (up to 108 Mb/s)" },
+@@ -136,6 +139,7 @@ const struct iw_modul_descr	iw_modul_lis
+     "TI 802.11+ higher rates (2.4 GHz, up to 22 Mb/s)" },
+   { IW_MODUL_CUSTOM, "custom",
+     "Driver specific modulation (check driver documentation)" },
++#endif
+ };
+ 
+ /* Disable runtime version warning in iw_get_range_info() */
+@@ -440,6 +444,7 @@ iw_print_version_info(const char *	tooln
+       return -1;
+     }
+ 
++#ifndef WE_ESSENTIAL
+   /* Information about the tools themselves */
+   if(toolname != NULL)
+     printf("%-8.16s  Wireless-Tools version %d\n", toolname, WT_VERSION);
+@@ -452,6 +457,7 @@ iw_print_version_info(const char *	tooln
+   if(we_kernel_version > 15)
+     printf("Kernel    Currently compiled with Wireless Extension v%d.\n\n",
+ 	   we_kernel_version);
++#endif
+ 
+   /* Version for each device */
+   iw_enum_devices(skfd, &print_iface_version_info, NULL, 0);
+@@ -501,6 +507,7 @@ iw_get_range_info(int		skfd,
+       /* Copy stuff at the right place, ignore extra */
+       memcpy((char *) range, buffer, sizeof(iwrange));
+     }
++#ifndef WE_ESSENTIAL
+   else
+     {
+       /* Zero unknown fields */
+@@ -574,6 +581,7 @@ iw_get_range_info(int		skfd,
+        * If the driver source has not been updated to the latest, it doesn't
+        * matter because the new fields are set to zero */
+     }
++#endif
+ 
+   /* Don't complain twice.
+    * In theory, the test apply to each individual driver, but usually
+@@ -1542,6 +1550,7 @@ iw_print_key(char *			buffer,
+     }
+ }
+ 
++#ifndef WE_ESSENTIAL
+ /*------------------------------------------------------------------*/
+ /*
+  * Convert a passphrase into a key
+@@ -1556,6 +1565,7 @@ iw_pass_key(const char *	input,
+   fprintf(stderr, "Error: Passphrase not implemented\n");
+   return(-1);
+ }
++#endif
+ 
+ /*------------------------------------------------------------------*/
+ /*
+@@ -1578,12 +1588,14 @@ iw_in_key(const char *		input,
+ 	keylen = IW_ENCODING_TOKEN_MAX;
+       memcpy(key, input + 2, keylen);
+     }
++#ifndef WE_ESSENTIAL
+   else
+     if(!strncmp(input, "p:", 2))
+       {
+ 	/* Second case : as a passphrase (PrismII cards) */
+ 	return(iw_pass_key(input + 2, key));		/* skip "p:" */
+       }
++#endif
+     else
+       {
+ 	const char *	p;
+--- a/Makefile
++++ b/Makefile
+@@ -195,9 +195,9 @@ install-iwmulticall:: iwmulticall
+ 	install -m 755 $< $(INSTALL_DIR)/iwconfig
+ 	( cd $(INSTALL_DIR) ; \
+ 	  ln -f -s iwconfig iwlist ; \
+-	  ln -f -s iwconfig iwspy ; \
++	  $(if $(BUILD_WE_ESSENTIAL),,ln -f -s iwconfig iwspy ;) \
+ 	  ln -f -s iwconfig iwpriv ; \
+-	  ln -f -s iwconfig iwgetid )
++	  $(if $(BUILD_WE_ESSENTIAL),,ln -f -s iwconfig iwgetid ) )
+ 
+ clean::
+ 	$(RM_CMD) 
diff --git a/trunk/package/network/utils/wireless-tools/patches/004-increase_iwlist_buffer.patch b/trunk/package/network/utils/wireless-tools/patches/004-increase_iwlist_buffer.patch
new file mode 100644
index 00000000..f2fdb124
--- /dev/null
+++ b/trunk/package/network/utils/wireless-tools/patches/004-increase_iwlist_buffer.patch
@@ -0,0 +1,46 @@
+--- a/iwlist.c
++++ b/iwlist.c
+@@ -792,7 +792,8 @@ print_scanning_info(int		skfd,
+ 	  if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
+ 	    {
+ 	      /* Check if buffer was too small (WE-17 only) */
+-	      if((errno == E2BIG) && (range.we_version_compiled > 16))
++	      if((errno == E2BIG) && (range.we_version_compiled > 16)
++	         && (buflen < 0xFFFF))
+ 		{
+ 		  /* Some driver may return very large scan results, either
+ 		   * because there are many cells, or because they have many
+@@ -808,6 +809,10 @@ print_scanning_info(int		skfd,
+ 		  else
+ 		    buflen *= 2;
+ 
++                 /* wrq.u.data.length is 16 bits so max size is 65535 */
++                 if(buflen > 0xFFFF)
++                   buflen = 0xFFFF;
++
+ 		  /* Try again */
+ 		  goto realloc;
+ 		}
+@@ -2152,6 +2157,7 @@ main(int	argc,
+   char **args;			/* Command arguments */
+   int count;			/* Number of arguments */
+   const iwlist_cmd *iwcmd;
++  int goterr = 0;
+ 
+   if(argc < 2)
+     iw_usage(1);
+@@ -2199,12 +2205,12 @@ main(int	argc,
+ 
+   /* do the actual work */
+   if (dev)
+-    (*iwcmd->fn)(skfd, dev, args, count);
++    goterr = (*iwcmd->fn)(skfd, dev, args, count);
+   else
+     iw_enum_devices(skfd, iwcmd->fn, args, count);
+ 
+   /* Close the socket. */
+   iw_sockets_close(skfd);
+ 
+-  return 0;
++  return goterr;
+ }
diff --git a/trunk/package/network/utils/wwan/Makefile b/trunk/package/network/utils/wwan/Makefile
new file mode 100644
index 00000000..34c7df6a
--- /dev/null
+++ b/trunk/package/network/utils/wwan/Makefile
@@ -0,0 +1,33 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wwan
+PKG_VERSION:=2014-07-17
+PKG_RELEASE=1
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wwan
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Generic libreCMC 3G/4G proto handler
+endef
+
+define Build/Compile
+	true
+endef
+
+define Package/wwan/install
+	$(INSTALL_DIR) $(1)/lib/netifd/proto/
+	$(CP) ./files/wwan.sh $(1)/lib/netifd/proto/
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
+	$(INSTALL_BIN) ./files/wwan.usb $(1)/etc/hotplug.d/usb/00_wwan.sh
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/usbmisc
+	$(INSTALL_BIN) ./files/wwan.usbmisc $(1)/etc/hotplug.d/usbmisc/00_wwan.sh
+endef
+
+$(eval $(call BuildPackage,wwan))
diff --git a/trunk/package/network/utils/wwan/files/wwan.sh b/trunk/package/network/utils/wwan/files/wwan.sh
new file mode 100755
index 00000000..6b33600b
--- /dev/null
+++ b/trunk/package/network/utils/wwan/files/wwan.sh
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
+
+INCLUDE_ONLY=1
+
+ctl_device=""
+dat_device=""
+
+proto_mbim_setup() { echo "wwan[$$] mbim proto is missing"; }
+proto_qmi_setup() { echo "wwan[$$] qmi proto is missing"; }
+proto_ncm_setup() { echo "wwan[$$] ncm proto is missing"; }
+proto_3g_setup() { echo "wwan[$$] 3g proto is missing"; }
+proto_directip_setup() { echo "wwan[$$] directip proto is missing"; }
+
+[ -f ./mbim.sh ] && . ./mbim.sh
+[ -f ./ncm.sh ] && . ./ncm.sh
+[ -f ./qmi.sh ] && . ./qmi.sh
+[ -f ./3g.sh ] && { . ./ppp.sh; . ./3g.sh; }
+[ -f ./directip.sh ] && . ./directip.sh
+
+proto_wwan_init_config() {
+	available=1
+	no_device=1
+
+	proto_config_add_string apn
+	proto_config_add_string auth
+	proto_config_add_string username
+	proto_config_add_string password
+	proto_config_add_string pincode
+	proto_config_add_string delay
+	proto_config_add_string modes
+}
+
+proto_wwan_setup() {
+	local driver usb devicename desc
+
+	for a in `ls /sys/bus/usb/devices`; do
+		local vendor product
+		[ -z "$usb" -a -f /sys/bus/usb/devices/$a/idVendor -a -f /sys/bus/usb/devices/$a/idProduct ] || continue
+		vendor=$(cat /sys/bus/usb/devices/$a/idVendor)
+		product=$(cat /sys/bus/usb/devices/$a/idProduct)
+		[ -f /lib/network/wwan/$vendor:$product ] && {
+			usb=/lib/network/wwan/$vendor:$product
+			devicename=$a
+		}
+	done
+
+	[ -n "$usb" ] && {
+		local old_cb control data
+
+		json_set_namespace wwan old_cb
+		json_init
+		json_load "$(cat $usb)"
+		json_select
+		json_get_vars desc control data
+		json_set_namespace $old_cb
+
+		[ -n "$control" -a -n "$data" ] && {
+			ttys=$(ls -d /sys/bus/usb/devices/$devicename/${devicename}*/tty* | sed "s/.*\///g" | tr "\n" " ")
+			ctl_device=/dev/$(echo $ttys | cut -d" " -f $((control + 1)))
+			dat_device=/dev/$(echo $ttys | cut -d" " -f $((data + 1)))
+			driver=comgt
+		}
+	}
+
+	[ -z "$ctl_device" ] && for net in $(ls /sys/class/net/ | grep wwan); do
+		[ -z "$ctl_device" ] || continue
+		driver=$(grep DRIVER /sys/class/net/$net/device/uevent | cut -d= -f2)
+		case "$driver" in
+		qmi_wwan|cdc_mbim)
+			ctl_device=/dev/$(ls /sys/class/net/$net/device/usbmisc)
+			;;
+		sierra_net|*cdc_ncm)
+			ctl_device=/dev/$(cd /sys/class/net/$net/; find ../../../ -name ttyUSB* |xargs basename | head -n1)
+			;;
+		*) continue;;
+		esac
+		echo "wwan[$$]" "Using proto:$proto device:$ctl_device iface:$net desc:$desc"
+	done
+
+	[ -n "$ctl_device" ] || {
+		echo "wwan[$$]" "No valid device was found"
+		proto_notify_error "$interface" NO_DEVICE
+		proto_block_restart "$interface"
+		return 1
+	}
+
+	uci_set_state network $interface driver "$driver"
+	uci_set_state network $interface ctl_device "$ctl_device"
+	uci_set_state network $interface dat_device "$dat_device"
+
+	case $driver in
+	qmi_wwan)	proto_qmi_setup $@ ;;
+	cdc_mbim)	proto_mbim_setup $@ ;;
+	sierra_net)	proto_directip_setup $@ ;;
+	comgt)		proto_3g_setup $@ ;;
+	*cdc_ncm)	proto_ncm_setup $@ ;;
+	esac
+}
+
+proto_wwan_teardown() {
+	local interface=$1
+	local driver=$(uci_get_state network $interface driver)
+	ctl_device=$(uci_get_state network $interface ctl_device)
+	dat_device=$(uci_get_state network $interface dat_device)
+
+	case $driver in
+	qmi_wwan)	proto_qmi_teardown $@ ;;
+	cdc_mbim)	proto_mbim_teardown $@ ;;
+	sierra_net)	proto_mbim_teardown $@ ;;
+	comgt)		proto_3g_teardown $@ ;;
+	*cdc_ncm)	proto_ncm_teardown $@ ;;
+	esac
+}
+
+add_protocol wwan
diff --git a/trunk/package/network/utils/wwan/files/wwan.usb b/trunk/package/network/utils/wwan/files/wwan.usb
new file mode 100644
index 00000000..507b002d
--- /dev/null
+++ b/trunk/package/network/utils/wwan/files/wwan.usb
@@ -0,0 +1,18 @@
+[ "$ACTION" = add -a "$DEVTYPE" = usb_device ] || exit 0
+
+vid=$(cat /sys$DEVPATH/idVendor)
+pid=$(cat /sys$DEVPATH/idProduct)
+[ -f "/lib/network/wwan/$vid:$pid" ] || exit 0
+
+find_wwan_iface() {
+	local cfg="$1"
+	local proto
+	config_get proto "$cfg" proto
+	[ "$proto" = wwan ] || return 0
+	proto_set_available "$cfg" 1
+	ifup $cfg
+	exit 0
+}
+
+config_load network
+config_foreach find_wwan_iface interface
diff --git a/trunk/package/network/utils/wwan/files/wwan.usbmisc b/trunk/package/network/utils/wwan/files/wwan.usbmisc
new file mode 100644
index 00000000..404a5cc0
--- /dev/null
+++ b/trunk/package/network/utils/wwan/files/wwan.usbmisc
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+[ "$ACTION" = add ] || exit 0
+[ "${DEVNAME/[0-9]/}" = cdc-wdm ] || exit 0
+
+. /lib/functions.sh
+. /lib/netifd/netifd-proto.sh
+
+find_wwan_iface() {
+	local cfg="$1"
+
+	local proto device
+	config_get proto "$cfg" proto
+	config_get device "$cfg" device
+
+	[ "$proto" = wwan ] || [ "$proto" = mbim ] || [ "$proto" = qmi ] || return 0
+	[ -z "$device" -a "$proto" = wwan ] || [ "$device" = "/dev/$DEVNAME" ] || return 0
+
+	proto_set_available "$cfg" 1
+	ifup "$cfg"
+	exit 0
+}
+
+config_load network
+config_foreach find_wwan_iface interface
diff --git a/trunk/package/network/utils/xtables-addons/Makefile b/trunk/package/network/utils/xtables-addons/Makefile
new file mode 100644
index 00000000..59300f94
--- /dev/null
+++ b/trunk/package/network/utils/xtables-addons/Makefile
@@ -0,0 +1,153 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=xtables-addons
+PKG_VERSION:=2.5
+PKG_RELEASE:=1
+PKG_MD5SUM:=335663ece5fb17c7d0bb24dbdc697eb1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@SF/xtables-addons
+PKG_BUILD_DEPENDS:=iptables
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/xtables-addons
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Firewall
+  DEPENDS:=@!LINUX_3_3
+  TITLE:=Extensions not distributed in the main Xtables
+  URL:=http://xtables-addons.sourceforge.net/
+endef
+
+# uses GNU configure
+
+CONFIGURE_ARGS+= \
+	--with-kbuild="$(LINUX_DIR)" \
+	--with-xtables="$(STAGING_DIR)/usr" \
+	--with-xtlibdir="/usr/lib/iptables" \
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		DEPMOD="/bin/true" \
+		all
+endef
+
+define Build/Install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		DEPMOD="/bin/true" \
+		install
+endef
+
+# 1: extension/module suffix used in package name
+# 2: extension/module display name used in package title/description
+# 3: list of extensions to package
+# 4: list of modules to package
+# 5: module load priority
+# 6: module depends
+define BuildTemplate
+
+ ifneq ($(3),)
+  define Package/iptables-mod-$(1)
+    $$(call Package/xtables-addons)
+    CATEGORY:=Network
+    TITLE:=$(2) iptables extension
+    DEPENDS:=iptables $(if $(4),+kmod-ipt-$(1))
+  endef
+
+  define Package/iptables-mod-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/iptables
+	for m in $(3); do \
+		$(CP) \
+			$(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so \
+			$$(1)/usr/lib/iptables/ ; \
+	done
+  endef
+
+  $$(eval $$(call BuildPackage,iptables-mod-$(1)))
+ endif
+
+ ifneq ($(4),)
+  define KernelPackage/ipt-$(1)
+    SUBMENU:=Netfilter Extensions
+    TITLE:=$(2) netfilter module
+    DEPENDS:=+kmod-ipt-core $(5)
+    KCONFIG:=$(6)
+    FILES:=$(foreach mod,$(4),$(PKG_BUILD_DIR)/extensions/$(mod).$(LINUX_KMOD_SUFFIX))
+    AUTOLOAD:=$(call AutoProbe,$(notdir $(4)))
+  endef
+
+  $$(eval $$(call KernelPackage,ipt-$(1)))
+ endif
+
+endef
+
+
+define Package/iptaccount
+  $(call Package/xtables-addons)
+  CATEGORY:=Network
+  TITLE:=iptables-mod-account control utility
+  DEPENDS:=iptables +iptables-mod-account
+endef
+
+define Package/iptaccount/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libxt_ACCOUNT_cl.so* \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/sbin/iptaccount \
+		$(1)/usr/sbin/
+endef
+
+
+#$(eval $(call BuildTemplate,SUFFIX,DESCRIPTION,EXTENSION,MODULE,PRIORITY,DEPENDS))
+
+$(eval $(call BuildTemplate,compat-xtables,API compatibilty layer,,compat_xtables,+IPV6:kmod-ip6tables,CONFIG_NF_CONNTRACK_MARK=y))
+$(eval $(call BuildTemplate,nathelper-rtsp,RTSP Conntrack and NAT,,rtsp/nf_conntrack_rtsp rtsp/nf_nat_rtsp,+kmod-ipt-conntrack-extra +kmod-ipt-nat))
+
+$(eval $(call BuildTemplate,account,ACCOUNT,xt_ACCOUNT,ACCOUNT/xt_ACCOUNT,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,chaos,CHAOS,xt_CHAOS,xt_CHAOS,+kmod-ipt-compat-xtables +kmod-ipt-delude +kmod-ipt-tarpit))
+$(eval $(call BuildTemplate,condition,Condition,xt_condition,xt_condition,))
+$(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,dhcpmac,DHCPMAC,xt_DHCPMAC,xt_DHCPMAC,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,dnetmap,DNETMAP,xt_DNETMAP,xt_DNETMAP,+kmod-ipt-compat-xtables +kmod-ipt-nat))
+$(eval $(call BuildTemplate,fuzzy,fuzzy,xt_fuzzy,xt_fuzzy,))
+$(eval $(call BuildTemplate,geoip,geoip,xt_geoip,xt_geoip,))
+$(eval $(call BuildTemplate,iface,iface,xt_iface,xt_iface,))
+$(eval $(call BuildTemplate,ipmark,IPMARK,xt_IPMARK,xt_IPMARK,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,ipp2p,IPP2P,xt_ipp2p,xt_ipp2p,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,ipv4options,ipv4options,xt_ipv4options,xt_ipv4options,))
+$(eval $(call BuildTemplate,length2,length2,xt_length2,xt_length2,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,logmark,LOGMARK,xt_LOGMARK,xt_LOGMARK,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,lscan,lscan,xt_lscan,xt_lscan,))
+$(eval $(call BuildTemplate,lua,Lua PacketScript,xt_LUA,LUA/xt_LUA,+kmod-ipt-conntrack-extra))
+$(eval $(call BuildTemplate,psd,psd,xt_psd,xt_psd,))
+$(eval $(call BuildTemplate,quota2,quota2,xt_quota2,xt_quota2,))
+$(eval $(call BuildTemplate,sysrq,SYSRQ,xt_SYSRQ,xt_SYSRQ,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-xtables +IPV6:kmod-ipv6))
+
+$(eval $(call BuildPackage,iptaccount))
diff --git a/trunk/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch b/trunk/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
new file mode 100644
index 00000000..d3b7caa6
--- /dev/null
+++ b/trunk/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
@@ -0,0 +1,1954 @@
+--- a/configure
++++ b/configure
+@@ -1,9 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.69 for xtables-addons 2.5.
++# Generated by GNU Autoconf 2.68 for xtables-addons 2.5.
+ #
+ #
+-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -132,31 +134,6 @@ export LANGUAGE
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-# Use a proper internal environment variable to ensure we don't fall
+-  # into an infinite loop, continuously re-executing ourselves.
+-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+-    _as_can_reexec=no; export _as_can_reexec;
+-    # We cannot yet assume a decent shell, so we have to provide a
+-# neutralization value for shells without unset; and this also
+-# works around shells that cannot unset nonexistent variables.
+-# Preserve -v and -x to the replacement shell.
+-BASH_ENV=/dev/null
+-ENV=/dev/null
+-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-case $- in # ((((
+-  *v*x* | *x*v* ) as_opts=-vx ;;
+-  *v* ) as_opts=-v ;;
+-  *x* ) as_opts=-x ;;
+-  * ) as_opts= ;;
+-esac
+-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+-# Admittedly, this is quite paranoid, since all the known shells bail
+-# out after a failed `exec'.
+-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+-as_fn_exit 255
+-  fi
+-  # We don't want this to propagate to other subprocesses.
+-          { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+@@ -190,8 +167,7 @@ if ( set x; as_fn_ret_success y && test 
+ else
+   exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1
+-test -x / || exit 1"
++test x\$exitcode = x0 || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+@@ -244,25 +220,21 @@ IFS=$as_save_IFS
+ 
+ 
+       if test "x$CONFIG_SHELL" != x; then :
+-  export CONFIG_SHELL
+-             # We cannot yet assume a decent shell, so we have to provide a
+-# neutralization value for shells without unset; and this also
+-# works around shells that cannot unset nonexistent variables.
+-# Preserve -v and -x to the replacement shell.
+-BASH_ENV=/dev/null
+-ENV=/dev/null
+-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-case $- in # ((((
+-  *v*x* | *x*v* ) as_opts=-vx ;;
+-  *v* ) as_opts=-v ;;
+-  *x* ) as_opts=-x ;;
+-  * ) as_opts= ;;
+-esac
+-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+-# Admittedly, this is quite paranoid, since all the known shells bail
+-# out after a failed `exec'.
+-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+-exit 255
++  # We cannot yet assume a decent shell, so we have to provide a
++	# neutralization value for shells without unset; and this also
++	# works around shells that cannot unset nonexistent variables.
++	# Preserve -v and -x to the replacement shell.
++	BASH_ENV=/dev/null
++	ENV=/dev/null
++	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++	export CONFIG_SHELL
++	case $- in # ((((
++	  *v*x* | *x*v* ) as_opts=-vx ;;
++	  *v* ) as_opts=-v ;;
++	  *x* ) as_opts=-x ;;
++	  * ) as_opts= ;;
++	esac
++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -364,14 +336,6 @@ $as_echo X"$as_dir" |
+ 
+ 
+ } # as_fn_mkdir_p
+-
+-# as_fn_executable_p FILE
+-# -----------------------
+-# Test if FILE is an executable regular file.
+-as_fn_executable_p ()
+-{
+-  test -f "$1" && test -x "$1"
+-} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -493,10 +457,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+   chmod +x "$as_me.lineno" ||
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
+-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+-  # already done that, so ensure we don't try to do so again and fall
+-  # in an infinite loop.  This has already happened in practice.
+-  _as_can_reexec=no; export _as_can_reexec
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensitive to this).
+@@ -531,16 +491,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -pR'.
++    # In both cases, we have to default to `cp -p'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -pR'
++      as_ln_s='cp -p'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -pR'
++    as_ln_s='cp -p'
+   fi
+ else
+-  as_ln_s='cp -pR'
++  as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -552,8 +512,28 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-as_test_x='test -x'
+-as_executable_p=as_fn_executable_p
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
++else
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++	test -d "$1/.";
++      else
++	case $1 in #(
++	-*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
++fi
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -688,10 +668,6 @@ CPPFLAGS
+ LDFLAGS
+ CFLAGS
+ CC
+-AM_BACKSLASH
+-AM_DEFAULT_VERBOSITY
+-AM_DEFAULT_V
+-AM_V
+ am__untar
+ am__tar
+ AMTAR
+@@ -756,7 +732,6 @@ SHELL'
+ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+-enable_silent_rules
+ enable_dependency_tracking
+ enable_static
+ enable_shared
+@@ -1237,6 +1212,8 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1400,12 +1377,8 @@ Optional Features:
+   --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --enable-silent-rules   less verbose build output (undo: "make V=1")
+-  --disable-silent-rules  verbose build output (undo: "make V=0")
+-  --enable-dependency-tracking
+-                          do not reject slow dependency extractors
+-  --disable-dependency-tracking
+-                          speeds up one-time build
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
+   --enable-static[=PKGS]  build static libraries [default=no]
+   --enable-shared[=PKGS]  build shared libraries [default=yes]
+   --enable-fast-install[=PKGS]
+@@ -1415,7 +1388,7 @@ Optional Features:
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
++  --with-pic              try to use only PIC/non-PIC objects [default=use
+                           both]
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-sysroot=DIR Search for dependent libraries within DIR
+@@ -1512,9 +1485,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ xtables-addons configure 2.5
+-generated by GNU Autoconf 2.69
++generated by GNU Autoconf 2.68
+ 
+-Copyright (C) 2012 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1590,7 +1563,7 @@ $as_echo "$ac_try_echo"; } >&5
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 test -x conftest$ac_exeext
++	 $as_test_x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -1877,7 +1850,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by xtables-addons $as_me 2.5, which was
+-generated by GNU Autoconf 2.69.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2293,7 +2266,7 @@ case $as_dir/ in #((
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -2349,10 +2322,13 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-am__api_version='1.14'
++am__api_version='1.11'
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
++# Just in case
++sleep 1
++echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -2363,40 +2339,32 @@ case `pwd` in
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
+-# Do 'set' in a subshell so we don't clobber the current shell's
++# Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   am_has_slept=no
+-   for am_try in 1 2; do
+-     echo "timestamp, slept: $am_has_slept" > conftest.file
+-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-     if test "$*" = "X"; then
+-	# -L didn't work.
+-	set X `ls -t "$srcdir/configure" conftest.file`
+-     fi
+-     if test "$*" != "X $srcdir/configure conftest.file" \
+-	&& test "$*" != "X conftest.file $srcdir/configure"; then
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t "$srcdir/configure" conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" "$LINENO" 5
++   fi
+ 
+-	# If neither matched, then we have a broken ls.  This can happen
+-	# if, for instance, CONFIG_SHELL is bash and it inherits a
+-	# broken ls alias from the environment.  This has actually
+-	# happened.  Such a system could not be considered "sane".
+-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+-  alias in your environment" "$LINENO" 5
+-     fi
+-     if test "$2" = conftest.file || test $am_try -eq 2; then
+-       break
+-     fi
+-     # Just in case.
+-     sleep 1
+-     am_has_slept=yes
+-   done
+    test "$2" = conftest.file
+    )
+ then
+@@ -2408,16 +2376,6 @@ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-# If we didn't sleep, we still need to ensure time stamps of config.status and
+-# generated files are strictly newer.
+-am_sleep_pid=
+-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+-  ( sleep 1 ) &
+-  am_sleep_pid=$!
+-fi
+-
+-rm -f conftest.file
+-
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -2440,12 +2398,12 @@ if test x"${MISSING+set}" != xset; then
+   esac
+ fi
+ # Use eval to expand $SHELL
+-if eval "$MISSING --is-lightweight"; then
+-  am_missing_run="$MISSING "
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+ if test x"${install_sh}" != xset; then
+@@ -2457,10 +2415,10 @@ if test x"${install_sh}" != xset; then
+   esac
+ fi
+ 
+-# Installed binaries are usually stripped using 'strip' when the user
+-# run "make install-strip".  However 'strip' might not be the right
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the 'STRIP' environment variable to overrule this program.
++# will honor the `STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+@@ -2479,7 +2437,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2519,7 +2477,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2570,7 +2528,7 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_prog in mkdir gmkdir; do
+ 	 for ac_exec_ext in '' $ac_executable_extensions; do
+-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
++	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 	     'mkdir (GNU coreutils) '* | \
+ 	     'mkdir (coreutils) '* | \
+@@ -2599,6 +2557,12 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2617,7 +2581,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2681,45 +2645,6 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+ 
+-# Check whether --enable-silent-rules was given.
+-if test "${enable_silent_rules+set}" = set; then :
+-  enableval=$enable_silent_rules;
+-fi
+-
+-case $enable_silent_rules in # (((
+-  yes) AM_DEFAULT_VERBOSITY=0;;
+-   no) AM_DEFAULT_VERBOSITY=1;;
+-    *) AM_DEFAULT_VERBOSITY=1;;
+-esac
+-am_make=${MAKE-make}
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+-if ${am_cv_make_support_nested_variables+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if $as_echo 'TRUE=$(BAR$(V))
+-BAR0=false
+-BAR1=true
+-V=1
+-am__doit:
+-	@$(TRUE)
+-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+-  am_cv_make_support_nested_variables=yes
+-else
+-  am_cv_make_support_nested_variables=no
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+-$as_echo "$am_cv_make_support_nested_variables" >&6; }
+-if test $am_cv_make_support_nested_variables = yes; then
+-    AM_V='$(V)'
+-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+-else
+-  AM_V=$AM_DEFAULT_VERBOSITY
+-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+-fi
+-AM_BACKSLASH='\'
+-
+ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+   # is not polluted with repeated "-I."
+@@ -2770,111 +2695,18 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-# For better backward compatibility.  To be removed once Automake 1.9.x
+-# dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+-mkdir_p='$(MKDIR_P)'
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+ # in the wild :-(  We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
+ 
+-
+-# We'll loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar  pax cpio none'
+-
+ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
+ 
+ 
+-
+-# POSIX will say in a future version that running "rm -f" with no argument
+-# is OK; and we want to be able to make that assumption in our Makefile
+-# recipes.  So use an aggressive probe to check that the usage we want is
+-# actually supported "in the wild" to an acceptable degree.
+-# See automake bug#10828.
+-# To make any issue more visible, cause the running configure to be aborted
+-# by default if the 'rm' program in use doesn't match our expectations; the
+-# user can still override this though.
+-if rm -f && rm -fr && rm -rf; then : OK; else
+-  cat >&2 <<'END'
+-Oops!
+-
+-Your 'rm' program seems unable to run without file operands specified
+-on the command line, even when the '-f' option is present.  This is contrary
+-to the behaviour of most rm programs out there, and not conforming with
+-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+-
+-Please tell bug-automake@gnu.org about your system, including the value
+-of your $PATH and any error possibly output before this message.  This
+-can help us improve future automake versions.
+-
+-END
+-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+-    echo 'Configuration will proceed anyway, since you have set the' >&2
+-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+-    echo >&2
+-  else
+-    cat >&2 <<'END'
+-Aborting the configuration process, to ensure you take notice of the issue.
+-
+-You can download and install GNU coreutils to get an 'rm' implementation
+-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+-
+-If you want to complete the configuration process using your problematic
+-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+-to "yes", and re-run configure.
+-
+-END
+-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+-  fi
+-fi
+-
+-# Check whether --enable-silent-rules was given.
+-if test "${enable_silent_rules+set}" = set; then :
+-  enableval=$enable_silent_rules;
+-fi
+-
+-case $enable_silent_rules in # (((
+-  yes) AM_DEFAULT_VERBOSITY=0;;
+-   no) AM_DEFAULT_VERBOSITY=1;;
+-    *) AM_DEFAULT_VERBOSITY=0;;
+-esac
+-am_make=${MAKE-make}
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+-if ${am_cv_make_support_nested_variables+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if $as_echo 'TRUE=$(BAR$(V))
+-BAR0=false
+-BAR1=true
+-V=1
+-am__doit:
+-	@$(TRUE)
+-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+-  am_cv_make_support_nested_variables=yes
+-else
+-  am_cv_make_support_nested_variables=no
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+-$as_echo "$am_cv_make_support_nested_variables" >&6; }
+-if test $am_cv_make_support_nested_variables = yes; then
+-    AM_V='$(V)'
+-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+-else
+-  AM_V=$AM_DEFAULT_VERBOSITY
+-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+-fi
+-AM_BACKSLASH='\'
+-
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -2897,7 +2729,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2937,7 +2769,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2990,7 +2822,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3031,7 +2863,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -3089,7 +2921,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3133,7 +2965,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3579,7 +3411,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-struct stat;
++#include <sys/types.h>
++#include <sys/stat.h>
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -3663,65 +3496,6 @@ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+-if ${am_cv_prog_cc_c_o+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-  # Make sure it works both with $CC and with simple cc.
+-  # Following AC_PROG_CC_C_O, we do the test twice because some
+-  # compilers refuse to overwrite an existing .o file with -o,
+-  # though they will create one.
+-  am_cv_prog_cc_c_o=yes
+-  for am_i in 1 2; do
+-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+-   ac_status=$?
+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-   (exit $ac_status); } \
+-         && test -f conftest2.$ac_objext; then
+-      : OK
+-    else
+-      am_cv_prog_cc_c_o=no
+-      break
+-    fi
+-  done
+-  rm -f core conftest*
+-  unset am_i
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+-$as_echo "$am_cv_prog_cc_c_o" >&6; }
+-if test "$am_cv_prog_cc_c_o" != yes; then
+-   # Losing compiler, so override with the script.
+-   # FIXME: It is wrong to rewrite CC.
+-   # But if we don't then we get into trouble of one sort or another.
+-   # A longer-term fix would be to have automake use am__CC in this case,
+-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+-   CC="$am_aux_dir/compile $CC"
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+ DEPDIR="${am__leading_dot}deps"
+ 
+ ac_config_commands="$ac_config_commands depfiles"
+@@ -3741,7 +3515,7 @@ am__quote=
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from 'make'.
++# Ignore all kinds of additional output from `make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -3797,8 +3571,8 @@ else
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named 'D' -- because '-MD' means "put the output
+-  # in D".
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -3833,16 +3607,16 @@ else
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+-      # Solaris 10 /bin/sh.
+-      echo '/* dummy */' > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle '-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs.
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -3851,8 +3625,8 @@ else
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # After this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested.
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -3860,7 +3634,7 @@ else
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok '-c -o', but also, the minuso test has
++      # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -3914,6 +3688,131 @@ else
+ fi
+ 
+ 
++if test "x$CC" != xcc; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
++$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
++fi
++set dummy $CC; ac_cc=`$as_echo "$2" |
++		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++rm -f conftest2.*
++if { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } &&
++   test -f conftest2.$ac_objext && { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; };
++then
++  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++  if test "x$CC" != xcc; then
++    # Test first that cc exists at all.
++    if { ac_try='cc -c conftest.$ac_ext >&5'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++      rm -f conftest2.*
++      if { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } &&
++	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; };
++      then
++	# cc works too.
++	:
++      else
++	# cc exists but doesn't like -o.
++	eval ac_cv_prog_cc_${ac_cc}_c_o=no
++      fi
++    fi
++  fi
++else
++  eval ac_cv_prog_cc_${ac_cc}_c_o=no
++fi
++rm -f core conftest*
++
++fi
++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
++
++fi
++
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
++   # Losing compiler, so override with the script.
++   # FIXME: It is wrong to rewrite CC.
++   # But if we don't then we get into trouble of one sort or another.
++   # A longer-term fix would be to have automake use am__CC in this case,
++   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++   CC="$am_aux_dir/compile $CC"
++fi
++
+ 
+ 
+ if test -n "$ac_tool_prefix"; then
+@@ -3935,7 +3834,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3979,7 +3878,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4023,13 +3922,7 @@ $as_echo_n "checking the archiver ($AR) 
+ if ${am_cv_ar_interface+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-   am_cv_ar_interface=ar
++  am_cv_ar_interface=ar
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ int some_variable = 0;
+@@ -4060,11 +3953,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ 
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-   ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+@@ -4126,8 +4014,8 @@ esac
+ 
+ 
+ 
+-macro_version='2.4.2'
+-macro_revision='1.3337'
++macro_version='2.4'
++macro_revision='1.3293'
+ 
+ 
+ 
+@@ -4305,7 +4193,7 @@ do
+     for ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_SED" || continue
++      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ # Check for GNU ac_path_SED and select it if it is found.
+   # Check for GNU $ac_path_SED
+ case `"$ac_path_SED" --version 2>&1` in
+@@ -4381,7 +4269,7 @@ do
+     for ac_prog in grep ggrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_GREP" || continue
++      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4447,7 +4335,7 @@ do
+     for ac_prog in egrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_EGREP" || continue
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -4514,7 +4402,7 @@ do
+     for ac_prog in fgrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_FGREP" || continue
++      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ # Check for GNU ac_path_FGREP and select it if it is found.
+   # Check for GNU $ac_path_FGREP
+ case `"$ac_path_FGREP" --version 2>&1` in
+@@ -4770,7 +4658,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4814,7 +4702,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4972,11 +4860,6 @@ else
+     lt_cv_sys_max_cmd_len=196608
+     ;;
+ 
+-  os2*)
+-    # The test takes a long time on OS/2.
+-    lt_cv_sys_max_cmd_len=8192
+-    ;;
+-
+   osf*)
+     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -5016,7 +4899,7 @@ else
+       # If test is not a shell built-in, we'll probably end up computing a
+       # maximum length that is only half of the actual maximum length, but
+       # we can't tell.
+-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
++      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ 	      test $i != 17 # 1/2 MB should be enough
+       do
+@@ -5238,7 +5121,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5278,7 +5161,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5445,7 +5328,7 @@ irix5* | irix6* | nonstopux*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-# This must be glibc/ELF.
++# This must be Linux ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+@@ -5584,7 +5467,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5624,7 +5507,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5727,7 +5610,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5771,7 +5654,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5896,7 +5779,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5936,7 +5819,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5995,7 +5878,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6035,7 +5918,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6085,13 +5968,13 @@ old_postuninstall_cmds=
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
+ case $host_os in
+@@ -6238,7 +6121,6 @@ for ac_symprfx in "" "_"; do
+     # which start with @ or ?.
+     lt_cv_sys_global_symbol_pipe="$AWK '"\
+ "     {last_section=section; section=\$ 3};"\
+-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+ "     \$ 0!~/External *\|/{next};"\
+ "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+@@ -6627,7 +6509,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
+-*-*solaris*)
++sparc*-*solaris*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -6638,20 +6520,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+     case `/usr/bin/file conftest.o` in
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+-      yes*)
+-        case $host in
+-        i?86-*-solaris*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        sparc*-*-solaris*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-        esac
+-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+-          LD="${LD-ld}_sol2"
+-        fi
+-        ;;
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+       *)
+ 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ 	  LD="${LD-ld} -64"
+@@ -6684,7 +6553,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6724,7 +6593,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6804,7 +6673,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6844,7 +6713,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6896,7 +6765,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6936,7 +6805,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_NMEDIT="nmedit"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6988,7 +6857,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7028,7 +6897,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_LIPO="lipo"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7080,7 +6949,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7120,7 +6989,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OTOOL="otool"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7172,7 +7041,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7212,7 +7081,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OTOOL64="otool64"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7291,13 +7160,7 @@ else
+ 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+         _lt_result=$?
+-	# If there is a non-empty error log, and "single_module"
+-	# appears in it, assume the flag caused a linker warning
+-        if test -s conftest.err && $GREP single_module conftest.err; then
+-	  cat conftest.err >&5
+-	# Otherwise, if the output was created with a 0 exit code from
+-	# the compiler, it worked.
+-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
++	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ 	  lt_cv_apple_cc_single_mod=yes
+ 	else
+ 	  cat conftest.err >&5
+@@ -7308,7 +7171,6 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+-
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+ if ${lt_cv_ld_exported_symbols_list+:} false; then :
+@@ -7341,7 +7203,6 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+-
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+ $as_echo_n "checking for -force_load linker flag... " >&6; }
+ if ${lt_cv_ld_force_load+:} false; then :
+@@ -7363,9 +7224,7 @@ _LT_EOF
+       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+       _lt_result=$?
+-      if test -s conftest.err && $GREP force_load conftest.err; then
+-	cat conftest.err >&5
+-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
++      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ 	lt_cv_ld_force_load=yes
+       else
+ 	cat conftest.err >&5
+@@ -7740,22 +7599,7 @@ fi
+ 
+ # Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then :
+-  withval=$with_pic; lt_p=${PACKAGE-default}
+-    case $withval in
+-    yes|no) pic_mode=$withval ;;
+-    *)
+-      pic_mode=default
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for lt_pkg in $withval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$lt_pkg" = "X$lt_p"; then
+-	  pic_mode=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
++  withval=$with_pic; pic_mode="$withval"
+ else
+   pic_mode=default
+ fi
+@@ -7833,10 +7677,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+ 
+ 
+ 
+-
+-
+-
+-
+ test -z "$LN_S" && LN_S="ln -s"
+ 
+ 
+@@ -8126,10 +7966,6 @@ _lt_linker_boilerplate=`cat conftest.err
+ $RM -r conftest*
+ 
+ 
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+ if test -n "$compiler"; then
+ 
+ lt_prog_compiler_no_builtin_flag=
+@@ -8296,9 +8132,7 @@ lt_prog_compiler_static=
+     case $cc_basename in
+     nvcc*) # Cuda Compiler Driver 2.2
+       lt_prog_compiler_wl='-Xlinker '
+-      if test -n "$lt_prog_compiler_pic"; then
+-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+-      fi
++      lt_prog_compiler_pic='-Xcompiler -fPIC'
+       ;;
+     esac
+   else
+@@ -8389,33 +8223,18 @@ lt_prog_compiler_static=
+ 	;;
+       *)
+ 	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
++	*Sun\ F* | *Sun*Fortran*)
+ 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ 	  lt_prog_compiler_pic='-KPIC'
+ 	  lt_prog_compiler_static='-Bstatic'
+ 	  lt_prog_compiler_wl=''
+ 	  ;;
+-	*Sun\ F* | *Sun*Fortran*)
+-	  lt_prog_compiler_pic='-KPIC'
+-	  lt_prog_compiler_static='-Bstatic'
+-	  lt_prog_compiler_wl='-Qoption ld '
+-	  ;;
+ 	*Sun\ C*)
+ 	  # Sun C 5.9
+ 	  lt_prog_compiler_pic='-KPIC'
+ 	  lt_prog_compiler_static='-Bstatic'
+ 	  lt_prog_compiler_wl='-Wl,'
+ 	  ;;
+-        *Intel*\ [CF]*Compiler*)
+-	  lt_prog_compiler_wl='-Wl,'
+-	  lt_prog_compiler_pic='-fPIC'
+-	  lt_prog_compiler_static='-static'
+-	  ;;
+-	*Portland\ Group*)
+-	  lt_prog_compiler_wl='-Wl,'
+-	  lt_prog_compiler_pic='-fpic'
+-	  lt_prog_compiler_static='-Bstatic'
+-	  ;;
+ 	esac
+ 	;;
+       esac
+@@ -8777,6 +8596,7 @@ $as_echo_n "checking whether the $compil
+   hardcode_direct=no
+   hardcode_direct_absolute=no
+   hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
+   hardcode_libdir_separator=
+   hardcode_minus_L=no
+   hardcode_shlibpath_var=unsupported
+@@ -9026,7 +8846,8 @@ _LT_EOF
+ 	xlf* | bgf* | bgxlf* | mpixlf*)
+ 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_flag_spec=
++	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ 	  if test "x$supports_anon_versioning" = xyes; then
+ 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+@@ -9405,7 +9226,6 @@ fi
+ 	# The linker will not automatically build a static lib if we build a DLL.
+ 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ 	enable_shared_with_static_runtimes=yes
+-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 	# Don't use ranlib
+ 	old_postinstall_cmds='chmod 644 $oldlib'
+@@ -9451,7 +9271,6 @@ fi
+   hardcode_shlibpath_var=unsupported
+   if test "$lt_cv_ld_force_load" = "yes"; then
+     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+-
+   else
+     whole_archive_flag_spec=''
+   fi
+@@ -9480,6 +9299,10 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
++    freebsd1*)
++      ld_shlibs=no
++      ;;
++
+     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+     # support.  Future versions do this automatically, but an explicit c++rt0.o
+     # does not break anything, and helps significantly (at the cost of a little
+@@ -9492,7 +9315,7 @@ fi
+       ;;
+ 
+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2.*)
++    freebsd2*)
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_direct=yes
+       hardcode_minus_L=yes
+@@ -9531,6 +9354,7 @@ fi
+       fi
+       if test "$with_gnu_ld" = no; then
+ 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_ld='+b $libdir'
+ 	hardcode_libdir_separator=:
+ 	hardcode_direct=yes
+ 	hardcode_direct_absolute=yes
+@@ -10154,6 +9978,11 @@ esac
+ 
+ 
+ 
++
++
++
++
++
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+ 
+@@ -10243,7 +10072,7 @@ need_version=unknown
+ 
+ case $host_os in
+ aix3*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+   shlibpath_var=LIBPATH
+ 
+@@ -10252,7 +10081,7 @@ aix3*)
+   ;;
+ 
+ aix[4-9]*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   hardcode_into_libs=yes
+@@ -10317,7 +10146,7 @@ beos*)
+   ;;
+ 
+ bsdi[45]*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -10456,7 +10285,7 @@ darwin* | rhapsody*)
+   ;;
+ 
+ dgux*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -10464,6 +10293,10 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -10471,7 +10304,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[23].*) objformat=aout ;;
++    freebsd[123]*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -10489,7 +10322,7 @@ freebsd* | dragonfly*)
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+-  freebsd2.*)
++  freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -10509,18 +10342,17 @@ freebsd* | dragonfly*)
+   ;;
+ 
+ gnu*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+   ;;
+ 
+ haiku*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   dynamic_linker="$host_os runtime_loader"
+@@ -10581,7 +10413,7 @@ hpux9* | hpux10* | hpux11*)
+   ;;
+ 
+ interix[3-9]*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -10597,7 +10429,7 @@ irix5* | irix6* | nonstopux*)
+     nonstopux*) version_type=nonstopux ;;
+     *)
+ 	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux # correct to gnu/linux during the next big refactor
++		version_type=linux
+ 	else
+ 		version_type=irix
+ 	fi ;;
+@@ -10634,9 +10466,9 @@ linux*oldld* | linux*aout* | linux*coff*
+   dynamic_linker=no
+   ;;
+ 
+-# This must be glibc/ELF.
++# This must be Linux ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10718,7 +10550,7 @@ netbsd*)
+   ;;
+ 
+ newsos6)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+@@ -10787,7 +10619,7 @@ rdos*)
+   ;;
+ 
+ solaris*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10812,7 +10644,7 @@ sunos4*)
+   ;;
+ 
+ sysv4 | sysv4.3*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -10836,7 +10668,7 @@ sysv4 | sysv4.3*)
+ 
+ sysv4*MP*)
+   if test -d /usr/nec ;then
+-    version_type=linux # correct to gnu/linux during the next big refactor
++    version_type=linux
+     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+     soname_spec='$libname${shared_ext}.$major'
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -10867,7 +10699,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
+ 
+ tpf*)
+   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10877,7 +10709,7 @@ tpf*)
+   ;;
+ 
+ uts4*)
+-  version_type=linux # correct to gnu/linux during the next big refactor
++  version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -11659,8 +11491,6 @@ CC="$lt_save_CC"
+ 
+ 
+ 
+-
+-
+         ac_config_commands="$ac_config_commands libtool"
+ 
+ 
+@@ -11726,7 +11556,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -11769,7 +11599,7 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -11932,7 +11762,7 @@ regular_CFLAGS="-Wall -Waggregate-return
+ if test -n "$kbuilddir"; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5
+ $as_echo_n "checking kernel version that we will build against... " >&6; }
+-	krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
++	krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
+ 	kmajor="${krel%%[^0-9]*}";
+ 	kmajor="$(($kmajor+0))";
+ 	krel="${krel:${#kmajor}}";
+@@ -12076,14 +11906,6 @@ LIBOBJS=$ac_libobjs
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+-   if test -n "$am_sleep_pid"; then
+-     # Hide warnings about reused PIDs.
+-     wait $am_sleep_pid 2>/dev/null
+-   fi
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+-$as_echo "done" >&6; }
+  if test -n "$EXEEXT"; then
+   am__EXEEXT_TRUE=
+   am__EXEEXT_FALSE='#'
+@@ -12398,16 +12220,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -pR'.
++    # In both cases, we have to default to `cp -p'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -pR'
++      as_ln_s='cp -p'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -pR'
++    as_ln_s='cp -p'
+   fi
+ else
+-  as_ln_s='cp -pR'
++  as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -12467,16 +12289,28 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-
+-# as_fn_executable_p FILE
+-# -----------------------
+-# Test if FILE is an executable regular file.
+-as_fn_executable_p ()
+-{
+-  test -f "$1" && test -x "$1"
+-} # as_fn_executable_p
+-as_test_x='test -x'
+-as_executable_p=as_fn_executable_p
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
++else
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++	test -d "$1/.";
++      else
++	case $1 in #(
++	-*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
++fi
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -12498,7 +12332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by xtables-addons $as_me 2.5, which was
+-generated by GNU Autoconf 2.69.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -12564,10 +12398,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ xtables-addons config.status 2.5
+-configured by $0, generated by GNU Autoconf 2.69,
++configured by $0, generated by GNU Autoconf 2.68,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2012 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -12658,7 +12492,7 @@ fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   shift
+   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+   CONFIG_SHELL='$SHELL'
+@@ -12700,7 +12534,6 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$de
+ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+ host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+ host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+ host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+@@ -12783,6 +12616,7 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SE
+ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+ no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+ hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+ hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+ hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+@@ -12838,7 +12672,6 @@ _LTECHO_EOF'
+ # Quote evaled strings.
+ for var in SHELL \
+ ECHO \
+-PATH_SEPARATOR \
+ SED \
+ GREP \
+ EGREP \
+@@ -12889,6 +12722,7 @@ with_gnu_ld \
+ allow_undefined_flag \
+ no_undefined_flag \
+ hardcode_libdir_flag_spec \
++hardcode_libdir_flag_spec_ld \
+ hardcode_libdir_separator \
+ exclude_expsyms \
+ include_expsyms \
+@@ -13575,7 +13409,7 @@ $as_echo "$as_me: executing $ac_file com
+ 
+   case $ac_file$ac_mode in
+     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+-  # Older Autoconf quotes --file arguments for eval, but not when files
++  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+   # are listed without --file.  Let's play safe and only enable the eval
+   # if we detect the quoting.
+   case $CONFIG_FILES in
+@@ -13588,7 +13422,7 @@ $as_echo "$as_me: executing $ac_file com
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named 'Makefile.in', but
++    # We used to match only the files named `Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -13622,19 +13456,21 @@ $as_echo X"$mf" |
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running 'make'.
++    # from the Makefile without running `make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-    test -z "$am__include" && continue
++    test -z "am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`$as_dirname -- "$file" ||
+@@ -13688,8 +13524,8 @@ $as_echo X"$file" |
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-#                 Foundation, Inc.
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
+ #   Written by Gordon Matzigkeit, 1996
+ #
+ #   This file is part of GNU Libtool.
+@@ -13743,9 +13579,6 @@ SHELL=$lt_SHELL
+ # An echo program that protects backslashes.
+ ECHO=$lt_ECHO
+ 
+-# The PATH separator for the build system.
+-PATH_SEPARATOR=$lt_PATH_SEPARATOR
+-
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+@@ -14047,6 +13880,10 @@ no_undefined_flag=$lt_no_undefined_flag
+ # This must work even if \$libdir does not exist
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+ 
++# If ld is used when linking, flag to hardcode \$libdir into a binary
++# during linking.  This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
+ 
+ if test -n "$kbuilddir"; then
+ 	AC_MSG_CHECKING([kernel version that we will build against])
+-	krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
++	krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
+ 	kmajor="${krel%%[[^0-9]]*}";
+ 	kmajor="$(($kmajor+0))";
+ 	krel="${krel:${#kmajor}}";
diff --git a/trunk/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch b/trunk/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
new file mode 100644
index 00000000..6c169ee8
--- /dev/null
+++ b/trunk/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
@@ -0,0 +1,1526 @@
+--- /dev/null
++++ b/extensions/rtsp/Kbuild
+@@ -0,0 +1,4 @@
++# -*- Makefile -*-
++
++obj-m += nf_nat_rtsp.o
++obj-m += nf_conntrack_rtsp.o
+--- /dev/null
++++ b/extensions/rtsp/netfilter_helpers.h
+@@ -0,0 +1,133 @@
++/*
++ * Helpers for netfiler modules.  This file provides implementations for basic
++ * functions such as strncasecmp(), etc.
++ *
++ * gcc will warn for defined but unused functions, so we only include the
++ * functions requested.  The following macros are used:
++ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
++ *   NF_NEED_STRTOU16           nf_strtou16()
++ *   NF_NEED_STRTOU32           nf_strtou32()
++ */
++#ifndef _NETFILTER_HELPERS_H
++#define _NETFILTER_HELPERS_H
++
++/* Only include these functions for kernel code. */
++#ifdef __KERNEL__
++
++#include <linux/ctype.h>
++#define iseol(c) ( (c) == '\r' || (c) == '\n' )
++
++/*
++ * The standard strncasecmp()
++ */
++#ifdef NF_NEED_STRNCASECMP
++static int
++nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
++{
++    if (s1 == NULL || s2 == NULL)
++    {
++        if (s1 == NULL && s2 == NULL)
++        {
++            return 0;
++        }
++        return (s1 == NULL) ? -1 : 1;
++    }
++    while (len > 0 && tolower(*s1) == tolower(*s2))
++    {
++        len--;
++        s1++;
++        s2++;
++    }
++    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
++}
++#endif /* NF_NEED_STRNCASECMP */
++
++/*
++ * Parse a string containing a 16-bit unsigned integer.
++ * Returns the number of chars used, or zero if no number is found.
++ */
++#ifdef NF_NEED_STRTOU16
++static int
++nf_strtou16(const char* pbuf, u_int16_t* pval)
++{
++    int n = 0;
++
++    *pval = 0;
++    while (isdigit(pbuf[n]))
++    {
++        *pval = (*pval * 10) + (pbuf[n] - '0');
++        n++;
++    }
++
++    return n;
++}
++#endif /* NF_NEED_STRTOU16 */
++
++/*
++ * Parse a string containing a 32-bit unsigned integer.
++ * Returns the number of chars used, or zero if no number is found.
++ */
++#ifdef NF_NEED_STRTOU32
++static int
++nf_strtou32(const char* pbuf, u_int32_t* pval)
++{
++    int n = 0;
++
++    *pval = 0;
++    while (pbuf[n] >= '0' && pbuf[n] <= '9')
++    {
++        *pval = (*pval * 10) + (pbuf[n] - '0');
++        n++;
++    }
++
++    return n;
++}
++#endif /* NF_NEED_STRTOU32 */
++
++/*
++ * Given a buffer and length, advance to the next line and mark the current
++ * line.
++ */
++#ifdef NF_NEED_NEXTLINE
++static int
++nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
++{
++    uint    off = *poff;
++    uint    physlen = 0;
++
++    if (off >= len)
++    {
++        return 0;
++    }
++
++    while (p[off] != '\n')
++    {
++        if (len-off <= 1)
++        {
++            return 0;
++        }
++
++        physlen++;
++        off++;
++    }
++
++    /* if we saw a crlf, physlen needs adjusted */
++    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
++    {
++        physlen--;
++    }
++
++    /* advance past the newline */
++    off++;
++
++    *plineoff = *poff;
++    *plinelen = physlen;
++    *poff = off;
++
++    return 1;
++}
++#endif /* NF_NEED_NEXTLINE */
++
++#endif /* __KERNEL__ */
++
++#endif /* _NETFILTER_HELPERS_H */
+--- /dev/null
++++ b/extensions/rtsp/netfilter_mime.h
+@@ -0,0 +1,89 @@
++/*
++ * MIME functions for netfilter modules.  This file provides implementations
++ * for basic MIME parsing.  MIME headers are used in many protocols, such as
++ * HTTP, RTSP, SIP, etc.
++ *
++ * gcc will warn for defined but unused functions, so we only include the
++ * functions requested.  The following macros are used:
++ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
++ */
++#ifndef _NETFILTER_MIME_H
++#define _NETFILTER_MIME_H
++
++/* Only include these functions for kernel code. */
++#ifdef __KERNEL__
++
++#include <linux/ctype.h>
++
++/*
++ * Given a buffer and length, advance to the next line and mark the current
++ * line.  If the current line is empty, *plinelen will be set to zero.  If
++ * not, it will be set to the actual line length (including CRLF).
++ *
++ * 'line' in this context means logical line (includes LWS continuations).
++ * Returns 1 on success, 0 on failure.
++ */
++#ifdef NF_NEED_MIME_NEXTLINE
++static int
++nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
++{
++    uint    off = *poff;
++    uint    physlen = 0;
++    int     is_first_line = 1;
++
++    if (off >= len)
++    {
++        return 0;
++    }
++
++    do
++    {
++        while (p[off] != '\n')
++        {
++            if (len-off <= 1)
++            {
++                return 0;
++            }
++
++            physlen++;
++            off++;
++        }
++
++        /* if we saw a crlf, physlen needs adjusted */
++        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
++        {
++            physlen--;
++        }
++
++        /* advance past the newline */
++        off++;
++
++        /* check for an empty line */
++        if (physlen == 0)
++        {
++            break;
++        }
++
++        /* check for colon on the first physical line */
++        if (is_first_line)
++        {
++            is_first_line = 0;
++            if (memchr(p+(*poff), ':', physlen) == NULL)
++            {
++                return 0;
++            }
++        }
++    }
++    while (p[off] == ' ' || p[off] == '\t');
++
++    *plineoff = *poff;
++    *plinelen = (physlen == 0) ? 0 : (off - *poff);
++    *poff = off;
++
++    return 1;
++}
++#endif /* NF_NEED_MIME_NEXTLINE */
++
++#endif /* __KERNEL__ */
++
++#endif /* _NETFILTER_MIME_H */
+--- /dev/null
++++ b/extensions/rtsp/nf_conntrack_rtsp.c
+@@ -0,0 +1,576 @@
++/*
++ * RTSP extension for IP connection tracking
++ * (C) 2003 by Tom Marshall <tmarshall at real.com>
++ *
++ * 2005-02-13: Harald Welte <laforge at netfilter.org>
++ * 	- port to 2.6
++ * 	- update to recent post-2.6.11 api changes
++ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
++ *	- removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
++ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
++ * 			- Port to new NF API
++ * 2013-03-04: Il'inykh Sergey <sergeyi at inango-sw.com>. Inango Systems Ltd
++ *	- fixed rtcp nat mapping and other port mapping fixes
++ *	- simple TEARDOWN request handling
++ *	- codestyle fixes and other less significant bug fixes 
++ *
++ * based on ip_conntrack_irc.c
++ *
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ *
++ * Module load syntax:
++ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
++ *                              max_outstanding=n setup_timeout=secs
++ *
++ * If no ports are specified, the default will be port 554.
++ *
++ * With max_outstanding you can define the maximum number of not yet
++ * answered SETUP requests per RTSP session (default 8).
++ * With setup_timeout you can specify how long the system waits for
++ * an expected data channel (default 300 seconds).
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/netfilter.h>
++#include <linux/ip.h>
++#include <linux/inet.h>
++#include <net/tcp.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_expect.h>
++#include <net/netfilter/nf_conntrack_helper.h>
++#include "nf_conntrack_rtsp.h"
++
++#define NF_NEED_STRNCASECMP
++#define NF_NEED_STRTOU16
++#define NF_NEED_STRTOU32
++#define NF_NEED_NEXTLINE
++#include "netfilter_helpers.h"
++#define NF_NEED_MIME_NEXTLINE
++#include "netfilter_mime.h"
++
++#include <linux/ctype.h>
++
++#define MAX_PORTS 8
++static int ports[MAX_PORTS];
++static int num_ports = 0;
++static int max_outstanding = 8;
++static unsigned int setup_timeout = 300;
++
++MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
++MODULE_DESCRIPTION("RTSP connection tracking module");
++MODULE_LICENSE("GPL");
++module_param_array(ports, int, &num_ports, 0400);
++MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
++module_param(max_outstanding, int, 0400);
++MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
++module_param(setup_timeout, int, 0400);
++MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
++
++static char *rtsp_buffer;
++static DEFINE_SPINLOCK(rtsp_buffer_lock);
++
++static struct nf_conntrack_expect_policy rtsp_exp_policy;
++
++unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
++				 enum ip_conntrack_info ctinfo,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++				 unsigned int protoff,
++#endif
++				 unsigned int matchoff, unsigned int matchlen,
++				 struct ip_ct_rtsp_expect* prtspexp,
++				 struct nf_conntrack_expect *rtp_exp,
++				 struct nf_conntrack_expect *rtcp_exp);
++
++EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
++
++/*
++ * Max mappings we will allow for one RTSP connection (for RTP, the number
++ * of allocated ports is twice this value).  Note that SMIL burns a lot of
++ * ports so keep this reasonably high.  If this is too low, you will see a
++ * lot of "no free client map entries" messages.
++ */
++#define MAX_PORT_MAPS 16
++
++/*** default port list was here in the masq code: 554, 3030, 4040 ***/
++
++#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
++
++/*
++ * Parse an RTSP packet.
++ *
++ * Returns zero if parsing failed.
++ *
++ * Parameters:
++ *  IN      ptcp        tcp data pointer
++ *  IN      tcplen      tcp data len
++ *  IN/OUT  ptcpoff     points to current tcp offset
++ *  OUT     phdrsoff    set to offset of rtsp headers
++ *  OUT     phdrslen    set to length of rtsp headers
++ *  OUT     pcseqoff    set to offset of CSeq header
++ *  OUT     pcseqlen    set to length of CSeq header
++ */
++static int
++rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
++		   uint* phdrsoff, uint* phdrslen,
++		   uint* pcseqoff, uint* pcseqlen,
++		   uint* transoff, uint* translen)
++{
++	uint	entitylen = 0;
++	uint	lineoff;
++	uint	linelen;
++	
++	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
++		return 0;
++	
++	*phdrsoff = *ptcpoff;
++	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
++		if (linelen == 0) {
++			if (entitylen > 0)
++				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
++			break;
++		}
++		if (lineoff+linelen > tcplen) {
++			pr_info("!! overrun !!\n");
++			break;
++		}
++
++		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
++			*pcseqoff = lineoff;
++			*pcseqlen = linelen;
++		} 
++
++		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
++			*transoff = lineoff;
++			*translen = linelen;
++		}
++		
++		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
++			uint off = lineoff+15;
++			SKIP_WSPACE(ptcp+lineoff, linelen, off);
++			nf_strtou32(ptcp+off, &entitylen);
++		}
++	}
++	*phdrslen = (*ptcpoff) - (*phdrsoff);
++	
++	return 1;
++}
++
++/*
++ * Find lo/hi client ports (if any) in transport header
++ * In:
++ *   ptcp, tcplen = packet
++ *   tranoff, tranlen = buffer to search
++ *
++ * Out:
++ *   pport_lo, pport_hi = lo/hi ports (host endian)
++ *
++ * Returns nonzero if any client ports found
++ *
++ * Note: it is valid (and expected) for the client to request multiple
++ * transports, so we need to parse the entire line.
++ */
++static int
++rtsp_parse_transport(char* ptran, uint tranlen,
++		     struct ip_ct_rtsp_expect* prtspexp)
++{
++	int  rc = 0;
++	uint off = 0;
++	
++	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
++	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
++		pr_info("sanity check failed\n");
++		return 0;
++	}
++	
++	pr_debug("tran='%.*s'\n", (int)tranlen, ptran);
++	off += 10;
++	SKIP_WSPACE(ptran, tranlen, off);
++	
++	/* Transport: tran;field;field=val,tran;field;field=val,... */
++	while (off < tranlen) {
++		const char* pparamend;
++		uint        nextparamoff;
++		
++		pparamend = memchr(ptran+off, ',', tranlen-off);
++		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
++		nextparamoff = pparamend-ptran;
++		
++		while (off < nextparamoff) {
++			const char* pfieldend;
++			uint        nextfieldoff;
++			
++			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
++			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
++		   
++			if (strncmp(ptran+off, "client_port=", 12) == 0) {
++				u_int16_t   port;
++				uint        numlen;
++
++				off += 12;
++				numlen = nf_strtou16(ptran+off, &port);
++				off += numlen;
++				if (prtspexp->loport != 0 && prtspexp->loport != port)
++					pr_debug("multiple ports found, port %hu ignored\n", port);
++				else {
++					pr_debug("lo port found : %hu\n", port);
++					prtspexp->loport = prtspexp->hiport = port;
++					if (ptran[off] == '-') {
++						off++;
++						numlen = nf_strtou16(ptran+off, &port);
++						off += numlen;
++						prtspexp->pbtype = pb_range;
++						prtspexp->hiport = port;
++						
++						// If we have a range, assume rtp:
++						// loport must be even, hiport must be loport+1
++						if ((prtspexp->loport & 0x0001) != 0 ||
++						    prtspexp->hiport != prtspexp->loport+1) {
++							pr_debug("incorrect range: %hu-%hu, correcting\n",
++							       prtspexp->loport, prtspexp->hiport);
++							prtspexp->loport &= 0xfffe;
++							prtspexp->hiport = prtspexp->loport+1;
++						}
++					} else if (ptran[off] == '/') {
++						off++;
++						numlen = nf_strtou16(ptran+off, &port);
++						off += numlen;
++						prtspexp->pbtype = pb_discon;
++						prtspexp->hiport = port;
++					}
++					rc = 1;
++				}
++			}
++			
++			/*
++			 * Note we don't look for the destination parameter here.
++			 * If we are using NAT, the NAT module will handle it.  If not,
++			 * and the client is sending packets elsewhere, the expectation
++			 * will quietly time out.
++			 */
++			
++			off = nextfieldoff;
++		}
++		
++		off = nextparamoff;
++	}
++	
++	return rc;
++}
++
++
++/*** conntrack functions ***/
++
++/* outbound packet: client->server */
++
++static inline int
++help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	 struct nf_conn *ct, enum ip_conntrack_info ctinfo,
++	 unsigned int protoff)
++#else
++	 struct nf_conn *ct, enum ip_conntrack_info ctinfo)
++#endif
++{
++	struct ip_ct_rtsp_expect expinfo;
++	
++	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
++	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
++	//uint    tcplen = pktlen - iph->ihl * 4;
++	char*   pdata = rb_ptr;
++	//uint    datalen = tcplen - tcph->doff * 4;
++	uint    dataoff = 0;
++	int ret = NF_ACCEPT;
++	
++	struct nf_conntrack_expect *rtp_exp;
++	struct nf_conntrack_expect *rtcp_exp = NULL;
++	
++	__be16 be_loport;
++	__be16 be_hiport;
++	
++	typeof(nf_nat_rtsp_hook) nf_nat_rtsp;
++
++	memset(&expinfo, 0, sizeof(expinfo));
++	
++	while (dataoff < datalen) {
++		uint cmdoff = dataoff;
++		uint hdrsoff = 0;
++		uint hdrslen = 0;
++		uint cseqoff = 0;
++		uint cseqlen = 0;
++		uint transoff = 0;
++		uint translen = 0;
++		uint off;
++		
++		if (!rtsp_parse_message(pdata, datalen, &dataoff,
++					&hdrsoff, &hdrslen,
++					&cseqoff, &cseqlen,
++					&transoff, &translen))
++			break;      /* not a valid message */
++
++		if (strncmp(pdata+cmdoff, "TEARDOWN ", 9) == 0) {
++			pr_debug("teardown handled\n");
++			nf_ct_remove_expectations(ct); /* FIXME must be session id aware */
++			break;
++		}
++
++		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
++			continue;   /* not a SETUP message */
++
++		pr_debug("found a setup message\n");
++
++		off = 0;
++		if(translen)
++			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
++
++		if (expinfo.loport == 0) {
++			pr_debug("no udp transports found\n");
++			continue;   /* no udp transports found */
++		}
++
++		pr_debug("udp transport found, ports=(%d,%hu,%hu)\n",
++			 (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
++
++
++		be_loport = htons(expinfo.loport);
++
++		rtp_exp = nf_ct_expect_alloc(ct);
++		if (rtp_exp == NULL) {
++			ret = NF_DROP;
++			goto out;
++		}
++
++		nf_ct_expect_init(rtp_exp, NF_CT_EXPECT_CLASS_DEFAULT,
++				  nf_ct_l3num(ct),
++				  NULL, /* &ct->tuplehash[!dir].tuple.src.u3, */
++				  &ct->tuplehash[!dir].tuple.dst.u3,
++				  IPPROTO_UDP, NULL, &be_loport);
++
++		rtp_exp->flags = 0;
++
++		if (expinfo.pbtype == pb_range) {
++			pr_debug("setup expectation for rtcp\n");
++
++			be_hiport = htons(expinfo.hiport);
++			rtcp_exp = nf_ct_expect_alloc(ct);
++			if (rtcp_exp == NULL) {
++				ret = NF_DROP;
++				goto out1;
++			}
++
++			nf_ct_expect_init(rtcp_exp, NF_CT_EXPECT_CLASS_DEFAULT,
++					  nf_ct_l3num(ct),
++					  NULL, /* &ct->tuplehash[!dir].tuple.src.u3, */
++					  &ct->tuplehash[!dir].tuple.dst.u3,
++					  IPPROTO_UDP, NULL, &be_hiport);
++
++			rtcp_exp->flags = 0;
++
++			pr_debug("expect_related %pI4:%u-%u-%pI4:%u-%u\n",
++				   &rtp_exp->tuple.src.u3.ip,
++				   ntohs(rtp_exp->tuple.src.u.udp.port),
++				   ntohs(rtcp_exp->tuple.src.u.udp.port),
++				   &rtp_exp->tuple.dst.u3.ip,
++				   ntohs(rtp_exp->tuple.dst.u.udp.port),
++				   ntohs(rtcp_exp->tuple.dst.u.udp.port));
++		} else {
++			pr_debug("expect_related %pI4:%u-%pI4:%u\n",
++					&rtp_exp->tuple.src.u3.ip,
++					ntohs(rtp_exp->tuple.src.u.udp.port),
++					&rtp_exp->tuple.dst.u3.ip,
++					ntohs(rtp_exp->tuple.dst.u.udp.port));
++		}
++
++		nf_nat_rtsp = rcu_dereference(nf_nat_rtsp_hook);
++		if (nf_nat_rtsp && ct->status & IPS_NAT_MASK)
++			/* pass the request off to the nat helper */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++			ret = nf_nat_rtsp(skb, ctinfo, protoff, hdrsoff, hdrslen,
++					  &expinfo, rtp_exp, rtcp_exp);
++#else
++			ret = nf_nat_rtsp(skb, ctinfo, hdrsoff, hdrslen,
++					  &expinfo, rtp_exp, rtcp_exp);
++#endif
++		else {
++			if (nf_ct_expect_related(rtp_exp) == 0) {
++				if (rtcp_exp && nf_ct_expect_related(rtcp_exp) != 0) {
++					nf_ct_unexpect_related(rtp_exp);
++					pr_info("nf_conntrack_expect_related failed for rtcp\n");
++					ret = NF_DROP;
++				}
++			} else {
++				pr_info("nf_conntrack_expect_related failed for rtp\n");
++				ret = NF_DROP;
++			}
++		}
++		if (rtcp_exp) {
++			nf_ct_expect_put(rtcp_exp);
++		}
++out1:
++		nf_ct_expect_put(rtp_exp);
++		goto out;
++	}
++out:
++
++	return ret;
++}
++
++
++static inline int
++help_in(struct sk_buff *skb, size_t pktlen,
++	struct nf_conn* ct, enum ip_conntrack_info ctinfo)
++{
++	return NF_ACCEPT;
++}
++
++static int help(struct sk_buff *skb, unsigned int protoff,
++		struct nf_conn *ct, enum ip_conntrack_info ctinfo) 
++{
++	struct tcphdr _tcph, *th;
++	unsigned int dataoff, datalen;
++	char *rb_ptr;
++	int ret = NF_DROP;
++
++	/* Until there's been traffic both ways, don't look in packets. */
++	if (ctinfo != IP_CT_ESTABLISHED && 
++	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
++		pr_debug("conntrackinfo = %u\n", ctinfo);
++		return NF_ACCEPT;
++	} 
++
++	/* Not whole TCP header? */
++	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
++
++	if (!th)
++		return NF_ACCEPT;
++   
++	/* No data ? */
++	dataoff = protoff + th->doff*4;
++	datalen = skb->len - dataoff;
++	if (dataoff >= skb->len)
++		return NF_ACCEPT;
++
++	spin_lock_bh(&rtsp_buffer_lock);
++	rb_ptr = skb_header_pointer(skb, dataoff,
++				    skb->len - dataoff, rtsp_buffer);
++	BUG_ON(rb_ptr == NULL);
++
++#if 0
++	/* Checksum invalid?  Ignore. */
++	/* FIXME: Source route IP option packets --RR */
++	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
++			 csum_partial((char*)tcph, tcplen, 0)))
++	{
++		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
++		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
++		return NF_ACCEPT;
++	}
++#endif
++
++	switch (CTINFO2DIR(ctinfo)) {
++	case IP_CT_DIR_ORIGINAL:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo, protoff);
++#else
++		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
++#endif
++		break;
++	case IP_CT_DIR_REPLY:
++		pr_debug("IP_CT_DIR_REPLY\n");
++		/* inbound packet: server->client */
++		ret = NF_ACCEPT;
++		break;
++	}
++
++	spin_unlock_bh(&rtsp_buffer_lock);
++
++	return ret;
++}
++
++static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
++static char rtsp_names[MAX_PORTS][10];
++
++/* This function is intentionally _NOT_ defined as __exit */
++static void
++fini(void)
++{
++	int i;
++	for (i = 0; i < num_ports; i++) {
++		pr_debug("unregistering port %d\n", ports[i]);
++		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
++	}
++	kfree(rtsp_buffer);
++}
++
++static int __init
++init(void)
++{
++	int i, ret;
++	struct nf_conntrack_helper *hlpr;
++	char *tmpname;
++
++	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
++
++	if (max_outstanding < 1) {
++		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
++		return -EBUSY;
++	}
++	if (setup_timeout < 0) {
++		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
++		return -EBUSY;
++	}
++
++	rtsp_exp_policy.max_expected = max_outstanding;
++	rtsp_exp_policy.timeout = setup_timeout;
++	
++	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
++	if (!rtsp_buffer) 
++		return -ENOMEM;
++
++	/* If no port given, default to standard rtsp port */
++	if (ports[0] == 0) {
++		ports[0] = RTSP_PORT;
++		num_ports = 1;
++	}
++
++	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
++		hlpr = &rtsp_helpers[i];
++		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
++		hlpr->tuple.src.l3num = AF_INET;
++		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
++		hlpr->tuple.dst.protonum = IPPROTO_TCP;
++		hlpr->expect_policy = &rtsp_exp_policy;
++		hlpr->me = THIS_MODULE;
++		hlpr->help = help;
++
++		tmpname = &rtsp_names[i][0];
++		if (ports[i] == RTSP_PORT) {
++			sprintf(tmpname, "rtsp");
++		} else {
++			sprintf(tmpname, "rtsp-%d", i);
++		}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
++		strlcpy(hlpr->name, tmpname, sizeof(hlpr->name));
++#else
++		hlpr->name = tmpname;
++#endif
++		pr_debug("port #%d: %d\n", i, ports[i]);
++
++		ret = nf_conntrack_helper_register(hlpr);
++
++		if (ret) {
++			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
++			fini();
++			return -EBUSY;
++		}
++	}
++	return 0;
++}
++
++module_init(init);
++module_exit(fini);
+--- /dev/null
++++ b/extensions/rtsp/nf_conntrack_rtsp.h
+@@ -0,0 +1,72 @@
++/*
++ * RTSP extension for IP connection tracking.
++ * (C) 2003 by Tom Marshall <tmarshall at real.com>
++ * based on ip_conntrack_irc.h
++ *
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ *
++ * 2013-03-04: Il'inykh Sergey <sergeyi at inango-sw.com>. Inango Systems Ltd
++ *	- conditional compilation for kernel 3.7
++ *	- port mapping improvements
++*/
++#ifndef _IP_CONNTRACK_RTSP_H
++#define _IP_CONNTRACK_RTSP_H
++
++#include <linux/version.h>
++
++//#define IP_NF_RTSP_DEBUG 1
++#define IP_NF_RTSP_VERSION "0.7"
++
++#ifdef __KERNEL__
++/* port block types */
++typedef enum {
++    pb_single,  /* client_port=x */
++    pb_range,   /* client_port=x-y */
++    pb_discon   /* client_port=x/y (rtspbis) */
++} portblock_t;
++
++/* We record seq number and length of rtsp headers here, all in host order. */
++
++/*
++ * This structure is per expected connection.  It is a member of struct
++ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
++ * there and we are expected to only store the length of the data which
++ * needs replaced.  If a packet contains multiple RTSP messages, we create
++ * one expected connection per message.
++ *
++ * We use these variables to mark the entire header block.  This may seem
++ * like overkill, but the nature of RTSP requires it.  A header may appear
++ * multiple times in a message.  We must treat two Transport headers the
++ * same as one Transport header with two entries.
++ */
++struct ip_ct_rtsp_expect
++{
++    u_int32_t   len;        /* length of header block */
++    portblock_t pbtype;     /* Type of port block that was requested */
++    u_int16_t   loport;     /* Port that was requested, low or first */
++    u_int16_t   hiport;     /* Port that was requested, high or second */
++#if 0
++    uint        method;     /* RTSP method */
++    uint        cseq;       /* CSeq from request */
++#endif
++};
++
++extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
++					enum ip_conntrack_info ctinfo,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++					unsigned int protoff,
++#endif
++					unsigned int matchoff,
++					unsigned int matchlen,
++					struct ip_ct_rtsp_expect *prtspexp,
++					struct nf_conntrack_expect *rtp_exp,
++					struct nf_conntrack_expect *rtcp_exp);
++
++#define RTSP_PORT   554
++
++#endif /* __KERNEL__ */
++
++#endif /* _IP_CONNTRACK_RTSP_H */
+--- /dev/null
++++ b/extensions/rtsp/nf_nat_rtsp.c
+@@ -0,0 +1,617 @@
++/*
++ * RTSP extension for TCP NAT alteration
++ * (C) 2003 by Tom Marshall <tmarshall at real.com>
++ *
++ * 2013-03-04: Il'inykh Sergey <sergeyi at inango-sw.com>. Inango Systems Ltd
++ *	- fixed rtcp nat mapping and other port mapping fixes
++ *	- fixed system hard lock because of bug in the parser
++ *	- codestyle fixes and less significant fixes
++ *
++ * based on ip_nat_irc.c
++ *
++ *	This program is free software; you can redistribute it and/or
++ *	modify it under the terms of the GNU General Public License
++ *	as published by the Free Software Foundation; either version
++ *	2 of the License, or (at your option) any later version.
++ *
++ * Module load syntax:
++ *	insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
++ *	                     stunaddr=<address>
++ *	                     destaction=[auto|strip|none]
++ *
++ * If no ports are specified, the default will be port 554 only.
++ *
++ * stunaddr specifies the address used to detect that a client is using STUN.
++ * If this address is seen in the destination parameter, it is assumed that
++ * the client has already punched a UDP hole in the firewall, so we don't
++ * mangle the client_port.  If none is specified, it is autodetected.  It
++ * only needs to be set if you have multiple levels of NAT.  It should be
++ * set to the external address that the STUN clients detect.  Note that in
++ * this case, it will not be possible for clients to use UDP with servers
++ * between the NATs.
++ *
++ * If no destaction is specified, auto is used.
++ *   destaction=auto:  strip destination parameter if it is not stunaddr.
++ *   destaction=strip: always strip destination parameter (not recommended).
++ *   destaction=none:  do not touch destination parameter (not recommended).
++ */
++
++#include <linux/module.h>
++#include <linux/version.h>
++#include <net/tcp.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++# include <net/netfilter/nf_nat.h>
++#else
++# include <net/netfilter/nf_nat_rule.h>
++#endif
++#include <net/netfilter/nf_nat_helper.h>
++#include "nf_conntrack_rtsp.h"
++#include <net/netfilter/nf_conntrack_expect.h>
++
++#include <linux/inet.h>
++#include <linux/ctype.h>
++#define NF_NEED_STRNCASECMP
++#define NF_NEED_STRTOU16
++#include "netfilter_helpers.h"
++#define NF_NEED_MIME_NEXTLINE
++#include "netfilter_mime.h"
++
++#define MAX_PORTS     8
++#define DSTACT_AUTO   0
++#define DSTACT_STRIP  1
++#define DSTACT_NONE   2
++
++static char* stunaddr = NULL;
++static char* destaction = NULL;
++
++static u_int32_t extip = 0;
++static int       dstact = 0;
++
++static void nf_nat_rtsp_expected(struct nf_conn* ct, struct nf_conntrack_expect *exp);
++
++MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
++MODULE_DESCRIPTION("RTSP network address translation module");
++MODULE_LICENSE("GPL");
++module_param(stunaddr, charp, 0644);
++MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
++module_param(destaction, charp, 0644);
++MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
++
++#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
++
++/*** helper functions ***/
++
++static void
++get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
++{
++	struct iphdr*   iph  = ip_hdr(skb);
++	struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
++
++	*pptcpdata = (char*)tcph +  tcph->doff*4;
++	*ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
++}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++/* copy of sip_sprintf_addr */
++static int rtsp_sprintf_addr(const struct nf_conn *ct, char *buffer,
++			     const union nf_inet_addr *addr, bool delim)
++{
++	if (nf_ct_l3num(ct) == NFPROTO_IPV4) {
++		return sprintf(buffer, "%pI4", &addr->ip);
++	} else {
++		if (delim)
++			return sprintf(buffer, "[%pI6c]", &addr->ip6);
++		else
++			return sprintf(buffer, "%pI6c", &addr->ip6);
++	}
++}
++#endif
++
++/*** nat functions ***/
++
++/*
++ * Mangle the "Transport:" header:
++ *   - Replace all occurences of "client_port=<spec>"
++ *   - Handle destination parameter
++ *
++ * In:
++ *   ct, ctinfo = conntrack context
++ *   skb        = packet
++ *   tranoff    = Transport header offset from TCP data
++ *   tranlen    = Transport header length (incl. CRLF)
++ *   rport_lo   = replacement low  port (host endian)
++ *   rport_hi   = replacement high port (host endian)
++ *
++ * Returns packet size difference.
++ *
++ * Assumes that a complete transport header is present, ending with CR or LF
++ */
++static int
++rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++		 unsigned int protoff,
++#endif
++		 struct nf_conntrack_expect* rtp_exp,
++		 struct nf_conntrack_expect* rtcp_exp,
++		 struct ip_ct_rtsp_expect* prtspexp,
++		 struct sk_buff* skb, uint tranoff, uint tranlen)
++{
++	char*  ptcp;
++	uint   tcplen;
++	char*  ptran;
++	char   rbuf1[16];	  /* Replacement buffer (one port) */
++	uint   rbuf1len;	  /* Replacement len (one port) */
++	char   rbufa[16];	  /* Replacement buffer (all ports) */
++	uint   rbufalen;	  /* Replacement len (all ports) */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	union nf_inet_addr newip;
++#else
++	u_int32_t  newip;
++#endif
++	u_int16_t loport, hiport;
++	uint      off = 0;
++	uint      diff;		   /* Number of bytes we removed */
++
++	struct nf_conn *ct = rtp_exp->master;
++	/* struct nf_conn *ct = nf_ct_get(skb, &ctinfo); */
++	struct nf_conntrack_tuple *rtp_t;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	char szextaddr[INET6_ADDRSTRLEN];
++#else
++	char szextaddr[INET_ADDRSTRLEN];
++#endif
++	uint extaddrlen;
++	int  is_stun;
++
++	get_skb_tcpdata(skb, &ptcp, &tcplen);
++	ptran = ptcp+tranoff;
++
++	if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
++	    tranlen < 10 || !iseol(ptran[tranlen-1]) ||
++	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
++		pr_info("sanity check failed\n");
++		return 0;
++	}
++	off += 10;
++	SKIP_WSPACE(ptcp+tranoff, tranlen, off);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3;
++	rtp_t = &rtp_exp->tuple;
++	rtp_t->dst.u3 = newip;
++	if (rtcp_exp) {
++		rtcp_exp->tuple.dst.u3 = newip;
++	}
++	extaddrlen = rtsp_sprintf_addr(ct, szextaddr, &newip, true); // FIXME handle extip
++	pr_debug("stunaddr=%s (auto)\n", szextaddr);
++#else
++	newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++	rtp_t = &rtp_exp->tuple;
++	rtp_t->dst.u3.ip = newip;
++	if (rtcp_exp) {
++		rtcp_exp->tuple.dst.u3.ip = newip;
++	}
++	extaddrlen = extip ? sprintf(szextaddr, "%pI4", &extip)
++			   : sprintf(szextaddr, "%pI4", &newip);
++	pr_debug("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
++#endif
++	hiport = 0;
++	rbuf1len = rbufalen = 0;
++	switch (prtspexp->pbtype) {
++	case pb_single:
++		for (loport = prtspexp->loport; loport != 0; loport++) { /* XXX: improper wrap? */
++			rtp_t->dst.u.udp.port = htons(loport);
++			if (nf_ct_expect_related(rtp_exp) == 0) {
++				pr_debug("using port %hu\n", loport);
++				break;
++			}
++		}
++		if (loport != 0) {
++			rbuf1len = sprintf(rbuf1, "%hu", loport);
++			rbufalen = sprintf(rbufa, "%hu", loport);
++		}
++		break;
++	case pb_range:
++		for (loport = prtspexp->loport; loport != 0; loport += 2) { /* XXX: improper wrap? */
++			rtp_t->dst.u.udp.port = htons(loport);
++			if (nf_ct_expect_related(rtp_exp) != 0) {
++				continue;
++			}
++			hiport = loport + 1;
++			rtcp_exp->tuple.dst.u.udp.port = htons(hiport);
++			if (nf_ct_expect_related(rtcp_exp) != 0) {
++				nf_ct_unexpect_related(rtp_exp);
++				continue;
++			}
++
++			/* FIXME: invalid print in case of ipv6 */
++			pr_debug("nat expect_related %pI4:%u-%u-%pI4:%u-%u\n",
++				 &rtp_exp->tuple.src.u3.ip,
++				 ntohs(rtp_exp->tuple.src.u.udp.port),
++				 ntohs(rtcp_exp->tuple.src.u.udp.port),
++				 &rtp_exp->tuple.dst.u3.ip,
++				 ntohs(rtp_exp->tuple.dst.u.udp.port),
++				 ntohs(rtcp_exp->tuple.dst.u.udp.port));
++			break;
++		}
++		if (loport != 0) {
++			rbuf1len = sprintf(rbuf1, "%hu", loport);
++			rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
++		}
++		break;
++	case pb_discon:
++		for (loport = prtspexp->loport; loport != 0; loport++) { /* XXX: improper wrap? */
++			rtp_t->dst.u.udp.port = htons(loport);
++			if (nf_ct_expect_related(rtp_exp) == 0) {
++				pr_debug("using port %hu (1 of 2)\n", loport);
++				break;
++			}
++		}
++		for (hiport = prtspexp->hiport; hiport != 0; hiport++) { /* XXX: improper wrap? */
++			rtp_t->dst.u.udp.port = htons(hiport);
++			if (nf_ct_expect_related(rtp_exp) == 0) {
++				pr_debug("using port %hu (2 of 2)\n", hiport);
++				break;
++			}
++		}
++		if (loport != 0 && hiport != 0) {
++			rbuf1len = sprintf(rbuf1, "%hu", loport);
++			rbufalen = sprintf(rbufa, hiport == loport+1 ?
++					   "%hu-%hu":"%hu/%hu", loport, hiport);
++		}
++		break;
++	}
++
++	if (rbuf1len == 0)
++		return 0;   /* cannot get replacement port(s) */
++
++	/* Transport: tran;field;field=val,tran;field;field=val,...
++	   `off` is set to the start of Transport value from start of line
++	*/
++	while (off < tranlen) {
++		uint        saveoff;
++		const char* pparamend;
++		uint        nextparamoff;
++
++		pparamend = memchr(ptran+off, ',', tranlen-off);
++		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
++		nextparamoff = pparamend-ptran;
++
++		/*
++		 * We pass over each param twice.  On the first pass, we look for a
++		 * destination= field.  It is handled by the security policy.  If it
++		 * is present, allowed, and equal to our external address, we assume
++		 * that STUN is being used and we leave the client_port= field alone.
++		 */
++		is_stun = 0;
++		saveoff = off;
++		while (off < nextparamoff) {
++			const char* pfieldend;
++			uint        nextfieldoff;
++
++			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
++			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
++
++			if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0) {
++				if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
++					is_stun = 1;
++
++				if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun)) {
++					uint dstoff = (ptran-ptcp)+off;
++					uint dstlen = nextfieldoff-off;
++					char* pdstrep = NULL;
++					uint dstreplen = 0;
++					diff = dstlen;
++					if (dstact == DSTACT_AUTO && !is_stun) {
++						pr_debug("RTSP: replace dst addr\n");
++						dstoff += 12;
++						dstlen -= 13;
++						pdstrep = szextaddr;
++						dstreplen = extaddrlen;
++						diff = nextfieldoff-off-13-extaddrlen;
++					}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++					if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo, protoff,
++								      dstoff, dstlen, pdstrep, dstreplen)) {
++#else
++					if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
++								      dstoff, dstlen, pdstrep, dstreplen)) {
++#endif
++						/* mangle failed, all we can do is bail */
++						nf_ct_unexpect_related(rtp_exp);
++						if (rtcp_exp)
++							nf_ct_unexpect_related(rtcp_exp);
++						return 0;
++					}
++					get_skb_tcpdata(skb, &ptcp, &tcplen);
++					ptran = ptcp+tranoff;
++					tranlen -= diff;
++					nextparamoff -= diff;
++					nextfieldoff -= diff;
++				}
++			}
++
++			off = nextfieldoff;
++		}
++
++		if (is_stun)
++			continue;
++
++		off = saveoff;
++		while (off < nextparamoff) {
++			const char* pfieldend;
++			uint        nextfieldoff;
++
++			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
++			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
++
++			if (strncmp(ptran+off, "client_port=", 12) == 0) {
++				u_int16_t port;
++				uint	  numlen;
++				uint      origoff;
++				uint      origlen;
++				char*     rbuf = rbuf1;
++				uint      rbuflen = rbuf1len;
++
++				off += 12;
++				origoff = (ptran-ptcp)+off;
++				origlen = 0;
++				numlen = nf_strtou16(ptran+off, &port);
++				off += numlen;
++				origlen += numlen;
++				if (port != prtspexp->loport) {
++					pr_debug("multiple ports found, port %hu ignored\n", port);
++				} else {
++					if (ptran[off] == '-' || ptran[off] == '/') {
++						off++;
++						origlen++;
++						numlen = nf_strtou16(ptran+off, &port);
++						off += numlen;
++						origlen += numlen;
++						rbuf = rbufa;
++						rbuflen = rbufalen;
++					}
++
++					/*
++					 * note we cannot just memcpy() if the sizes are the same.
++					 * the mangle function does skb resizing, checks for a
++					 * cloned skb, and updates the checksums.
++					 *
++					 * parameter 4 below is offset from start of tcp data.
++					 */
++					diff = origlen-rbuflen;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++					if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo, protoff,
++								      origoff, origlen, rbuf, rbuflen)) {
++#else
++					if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
++								      origoff, origlen, rbuf, rbuflen)) {
++#endif
++						/* mangle failed, all we can do is bail */
++						nf_ct_unexpect_related(rtp_exp);
++						if (rtcp_exp)
++							nf_ct_unexpect_related(rtcp_exp);
++						return 0;
++					}
++					get_skb_tcpdata(skb, &ptcp, &tcplen);
++					ptran = ptcp+tranoff;
++					tranlen -= diff;
++					nextparamoff -= diff;
++					nextfieldoff -= diff;
++				}
++			}
++
++			off = nextfieldoff;
++		}
++
++		off = nextparamoff;
++	}
++
++	return 1;
++}
++
++static uint
++help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	 unsigned int protoff,
++#endif
++	 unsigned int matchoff, unsigned int matchlen,
++	 struct ip_ct_rtsp_expect* prtspexp,
++	 struct nf_conntrack_expect* rtp_exp,
++	 struct nf_conntrack_expect* rtcp_exp)
++{
++	char* ptcp;
++	uint  tcplen;
++	uint  hdrsoff;
++	uint  hdrslen;
++	uint  lineoff;
++	uint  linelen;
++	uint  off;
++	int   dir = CTINFO2DIR(ctinfo);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	union nf_inet_addr saddr = rtp_exp->master->tuplehash[dir].tuple.src.u3;
++#else
++	__be32 saddr = rtp_exp->master->tuplehash[dir].tuple.src.u3.ip;
++#endif
++
++	//struct iphdr* iph = (struct iphdr*)(*pskb)->nh.iph;
++	//struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
++
++	get_skb_tcpdata(skb, &ptcp, &tcplen);
++	hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
++	hdrslen = matchlen;
++	off = hdrsoff;
++	pr_debug("NAT rtsp help_out\n");
++
++	while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen)) {
++		if (linelen == 0)
++			break;
++
++		if (off > hdrsoff+hdrslen) {
++			pr_info("!! overrun !!");
++			break;
++		}
++		pr_debug("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
++
++		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
++			uint oldtcplen = tcplen;
++			pr_debug("hdr: Transport\n");
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++			if (!rtsp_mangle_tran(ctinfo, protoff, rtp_exp, rtcp_exp,
++					      prtspexp, skb, lineoff, linelen)) {
++#else
++			if (!rtsp_mangle_tran(ctinfo, rtp_exp, rtcp_exp, prtspexp,
++					      skb, lineoff, linelen)) {
++#endif
++				pr_debug("hdr: Transport mangle failed");
++				break;
++			}
++			rtp_exp->expectfn = nf_nat_rtsp_expected;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++			rtp_exp->saved_addr = saddr;
++#else
++			rtp_exp->saved_ip = saddr;
++#endif
++			rtp_exp->saved_proto.udp.port = htons(prtspexp->loport);
++			rtp_exp->dir = !dir;
++			if (rtcp_exp) {
++				rtcp_exp->expectfn = nf_nat_rtsp_expected;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++				rtcp_exp->saved_addr = saddr;
++#else
++				rtcp_exp->saved_ip = saddr;
++#endif
++				rtcp_exp->saved_proto.udp.port = htons(prtspexp->hiport);
++				rtcp_exp->dir = !dir;
++			}
++			get_skb_tcpdata(skb, &ptcp, &tcplen);
++			hdrslen -= (oldtcplen-tcplen);
++			off -= (oldtcplen-tcplen);
++			lineoff -= (oldtcplen-tcplen);
++			linelen -= (oldtcplen-tcplen);
++			pr_debug("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
++		}
++	}
++
++	return NF_ACCEPT;
++}
++
++static unsigned int
++nf_nat_rtsp(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	    unsigned int protoff,
++#endif
++	    unsigned int matchoff, unsigned int matchlen,
++	    struct ip_ct_rtsp_expect* prtspexp,
++	    struct nf_conntrack_expect* rtp_exp,
++	    struct nf_conntrack_expect* rtcp_exp)
++{
++	int dir = CTINFO2DIR(ctinfo);
++	int rc = NF_ACCEPT;
++
++	switch (dir) {
++	case IP_CT_DIR_ORIGINAL:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++		rc = help_out(skb, ctinfo, protoff, matchoff, matchlen, prtspexp,
++			      rtp_exp, rtcp_exp);
++#else
++		rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp,
++			      rtp_exp, rtcp_exp);
++#endif
++		break;
++	case IP_CT_DIR_REPLY:
++		pr_debug("unmangle ! %u\n", ctinfo);
++		/* XXX: unmangle */
++		rc = NF_ACCEPT;
++		break;
++	}
++	//UNLOCK_BH(&ip_rtsp_lock);
++
++	return rc;
++}
++
++static void nf_nat_rtsp_expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
++{
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	struct nf_nat_range range;
++#else
++	struct nf_nat_ipv4_range range;
++#endif
++
++	/* This must be a fresh one. */
++	BUG_ON(ct->status & IPS_NAT_DONE_MASK);
++
++	/* For DST manip, map port here to where it's expected. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	range.min_proto = range.max_proto = exp->saved_proto;
++	range.min_addr = range.max_addr = exp->saved_addr;
++#else
++	range.min = range.max = exp->saved_proto;
++	range.min_ip = range.max_ip = exp->saved_ip;
++#endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++	range.flags = (NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED);
++	nf_nat_setup_info(ct, &range, NF_NAT_MANIP_DST);
++#else
++	range.flags = (IP_NAT_RANGE_MAP_IPS | IP_NAT_RANGE_PROTO_SPECIFIED);
++	nf_nat_setup_info(ct, &range, IP_NAT_MANIP_DST);
++#endif
++
++	/* Change src to where master sends to, but only if the connection
++	 * actually came from the same source. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++	if (nf_inet_addr_cmp(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3,
++			     &ct->master->tuplehash[exp->dir].tuple.src.u3)) {
++		range.min_addr = range.max_addr
++			= ct->master->tuplehash[!exp->dir].tuple.dst.u3;
++#else
++	if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip ==
++	    ct->master->tuplehash[exp->dir].tuple.src.u3.ip) {
++		range.min_ip = range.max_ip
++			= ct->master->tuplehash[!exp->dir].tuple.dst.u3.ip;
++#endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++		range.flags = NF_NAT_RANGE_MAP_IPS;
++		nf_nat_setup_info(ct, &range, NF_NAT_MANIP_SRC);
++#else
++		range.flags = IP_NAT_RANGE_MAP_IPS;
++		nf_nat_setup_info(ct, &range, IP_NAT_MANIP_SRC);
++#endif
++	}
++}
++
++
++static void __exit fini(void)
++{
++	rcu_assign_pointer(nf_nat_rtsp_hook, NULL);
++	synchronize_net();
++}
++
++static int __init init(void)
++{
++	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
++
++	BUG_ON(nf_nat_rtsp_hook);
++	rcu_assign_pointer(nf_nat_rtsp_hook, nf_nat_rtsp);
++
++	if (stunaddr != NULL)
++		extip = in_aton(stunaddr);
++
++	if (destaction != NULL) {
++		if (strcmp(destaction, "auto") == 0)
++			dstact = DSTACT_AUTO;
++
++		if (strcmp(destaction, "strip") == 0)
++			dstact = DSTACT_STRIP;
++
++		if (strcmp(destaction, "none") == 0)
++			dstact = DSTACT_NONE;
++	}
++
++	return 0;
++}
++
++module_init(init);
++module_exit(fini);
+--- a/extensions/Kbuild
++++ b/extensions/Kbuild
+@@ -28,6 +28,7 @@ obj-${build_lscan}       += xt_lscan.o
+ obj-${build_pknock}      += pknock/
+ obj-${build_psd}         += xt_psd.o
+ obj-${build_quota2}      += xt_quota2.o
++obj-${build_rtsp}        += rtsp/
+ 
+ -include ${M}/*.Kbuild
+ -include ${M}/Kbuild.*
+--- a/mconfig
++++ b/mconfig
+@@ -22,3 +22,4 @@ build_lscan=m
+ build_pknock=m
+ build_psd=m
+ build_quota2=m
++build_rtsp=m
diff --git a/trunk/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch b/trunk/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
new file mode 100644
index 00000000..8bc30a7a
--- /dev/null
+++ b/trunk/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
@@ -0,0 +1,18158 @@
+--- /dev/null
++++ b/extensions/LUA/byte_array.c
+@@ -0,0 +1,145 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++#include "controller.h"
++
++/* Initialization helper function. This function should be used whenever
++ * a new byte array need to be initialized. Depending on the arguments it
++ * initializes the array in a different way. Have a look at the inline
++ * comments */
++lua_packet_segment * init_byte_array(lua_State *L, unsigned char * start, int length, int do_copy)
++{
++	lua_packet_segment *array;
++
++	if (length < 0)
++		luaL_error(L, "init_byte_array, requested size < 0");
++
++	if (start && do_copy) {
++		/* we have a start address where we copy from */
++		array = lua_newuserdata(L, sizeof(lua_packet_segment) + length);
++		array->start = (unsigned char *)array + sizeof(lua_packet_segment); /* aligning pointer */
++		memcpy(array->start, start, length);
++	}else if (start && !do_copy) {
++		/* just link the start pointer, in this case you have to free the memory yourself */
++		array = lua_newuserdata(L, sizeof(lua_packet_segment));
++		array->start = start;
++	}else{
++		/* create an empty array, fully managed by Lua */
++		array = lua_newuserdata(L, sizeof(lua_packet_segment) + length);
++		array->start = (unsigned char *)array + sizeof(lua_packet_segment); /* aligning pointer */
++		memset(array->start, 0, length);
++	}
++
++	array->length = length;
++	array->offset = 0;
++	array->changes = NULL;
++
++	luaL_getmetatable(L, LUA_BYTE_ARRAY);
++	lua_setmetatable(L, -2);
++
++	return array;
++}
++
++
++
++/* LUA_API: get one byte of the given byte array 
++ * access-pattern: array[<index>] */
++static int32_t get_byte_array(lua_State *L)
++{
++	lua_packet_segment * array = checkbytearray(L, 1);
++	int32_t index = luaL_checkinteger(L, 2); /* array starts with index 0 (not 1 as usual in Lua) */
++
++	luaL_argcheck(L, 0 <= index && index < array->length, 1, "index out of range");
++	lua_pushinteger(L, (array->start + array->offset)[index]);
++
++	return 1;
++}
++
++/* LUA_API: set one byte of the given byte array
++ * access-pattern: array[<index>]= 0xFF */
++static int32_t set_byte_array(lua_State *L)
++{
++	lua_packet_segment * array = checkbytearray(L, 1);
++	uint8_t byte;
++	int32_t index = luaL_checkinteger(L, 2);    /* array starts with index 0 (not 1 as usual in Lua) */
++	int32_t val = luaL_checkinteger(L, 3);
++	uint32_t  nob = 1 << CHAR_BIT;               /* we should use something like 1 << CHAR_BIT */
++
++	luaL_argcheck(L, 0 <= index && index < array->length, 1, "index out of range");
++	luaL_argcheck(L, 0 <= val && val < nob, 2, "cannot cast value to char");
++
++	byte = (uint8_t)val;
++
++	(array->start + array->offset)[index] = byte;
++
++	return 0;
++}
++
++/* LUA_API: get size of the given byte array
++ * access-pattern: #array (__length meta-method) */
++static int32_t get_byte_array_size(lua_State *L)
++{
++	lua_packet_segment * array = checkbytearray(L, 1);
++
++	lua_pushnumber(L, array->length);
++
++	return 1;
++}
++
++
++/* LUA_API: converts a given byte array to a string. 
++ * access-pattern: implicit through functions calling the
++ * __to_string() metamethod , e.g. print32_t */
++static int32_t byte_array_to_string(lua_State *L)
++{
++	lua_packet_segment * array = checkbytearray(L, 1);
++	uint8_t buf[(array->length * 3) + 255];
++	uint8_t hexval[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
++	char res[255 + (array->length * 3)]; /* make sure the buffer is big enough*/
++	int32_t i, n;
++	uint8_t *ptr = array->start + array->offset;
++
++	for (i = 0; i < array->length; i++) {
++		buf[i * 3] = hexval[(ptr[i] >> 4) & 0xF];
++		buf[(i * 3) + 1] = hexval[ptr[i] & 0x0F];
++		buf[(i * 3) + 2] = ' '; /* seperator */
++	}
++
++	buf[array->length * 3] = '\0';
++	n = sprintf(res, "byte_array: length: %d  value: %s", array->length, buf);
++
++	lua_pushlstring(L, res, n);
++
++	return 1;
++}
++
++static const struct luaL_Reg bytearray_lib_m [] = {
++	{ "__len",	get_byte_array_size  },
++	{ "__newindex", set_byte_array	     },
++	{ "__index",	get_byte_array	     },
++	{ "__tostring", byte_array_to_string },
++	{ NULL,		NULL		     }
++};
++
++void luaopen_bytearraylib(lua_State *L)
++{
++	luaL_newmetatable(L, LUA_BYTE_ARRAY);
++	luaL_register(L, NULL, bytearray_lib_m);
++	lua_pop(L, 1);
++}
++
++
+--- /dev/null
++++ b/extensions/LUA/controller.c
+@@ -0,0 +1,604 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#if defined(__KERNEL__)
++	#include <linux/mm.h>
++#endif
++#include "controller.h"
++
++/* the array 'supported_protocols' holds all pointers to the 
++ * static and dynamic protocol buffers. It is filled by the 
++ * call to register_protbuf */
++static struct protocol_buf * supported_protocols[MAX_NR_OF_PROTOCOLS];
++
++/* C_API: the function 'get_protocol_buf' returns the pointer 
++ * to the protocol buffer of a given protocol id. */
++struct protocol_buf * get_protocol_buf(uint32_t  protocol_id)
++{
++	return (struct protocol_buf *)supported_protocols[protocol_id];
++}
++
++
++/* LUA_INT: the function 'gc_packet_segment' is triggered by the 
++ * garbage collector whenever a userdata annotated with one of 
++ * the protocol buffer metatable should be collected. */
++static int32_t gc_packet_segment(lua_State *L)
++{
++	lua_packet_segment * seg = (lua_packet_segment *)lua_touserdata(L, 1);
++	if (seg && seg->changes) {
++		seg->changes->ref_count--;
++		if (seg->changes->ref_count <= 0) {
++			kfree(seg->changes->field_length_changes);
++			kfree(seg->changes->field_offset_changes);
++			kfree(seg->changes);
++			seg->changes = NULL;
++		}
++	}
++	return 0;
++}
++
++
++/* LUA_API: the function 'set_raw' is used to set the bytes of a segment 
++ * in 'raw' mode. The function is per default available in each protocol 
++ * buffer until it gets overridden by a specific setter function inside 
++ * a protocol buffer.
++ * 
++ * Parameters:
++ * 1. lua_packet_segment (implicit)
++ * 2. int32_t byte_value
++ *
++ * Upvalues:
++ * 1.  struct protocol_buf*
++ * 2.  int32_t field index, not used in this function
++ *
++ * Return: void
++ */
++static int32_t set_raw(lua_State *L)
++{
++	int32_t i;
++	uint32_t  nob;
++	uint8_t byte;
++	uint8_t *ptr;
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	int32_t val = luaL_checkinteger(L, 2);
++
++	nob = 1 << CHAR_BIT;
++
++	luaL_argcheck(L, 0 <= val && val < nob, 2, "cannot cast value to char");
++
++	byte = (uint8_t)val;
++	ptr = seg->start + seg->offset;
++
++	for (i = 0; i < seg->length; i++)
++		ptr[i] = byte;
++
++	return 0;
++}
++
++/* LUA_API: the function 'get_raw' is used to get the bytes of a segment 
++ * in 'raw' mode. The function is per default available in each protocol 
++ * buffer until it gets overridden by a specific getter function inside 
++ * a protocol buffer.
++ *
++ * Parameters:
++ * 1. lua_packet_segment (implicit)
++ * 2. uint32_t  offset
++ * 3. uint32_t  length 
++ *
++ * Upvalues:
++ * 1.  struct protocol_buf*
++ * 2.  int32_t field index, not used in this function
++ *
++ * Return: 
++ * the byte array representing the given array
++ */
++static int32_t get_raw(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	init_byte_array(L, seg->start + seg->offset,  seg->length, 1);
++
++	return 1;
++}
++/* LUA_API: The function 'get_segment' is used to get a new segment in 'raw' mode. 
++ * Typically this function is applied on another raw segment in order 
++ * to extract a part of the segment as new segment.
++ *
++ * Parameters:
++ * 1.  lua_packet_segment, implicit through object oriented access seg:raw(..)
++ * 2.  uint32_t  offset, this indicates where to start the new segment, see e.g below.
++ * 3.  uint32_t  length, this indicates the size of the new segment
++ *
++ * Upvalues:
++ * 1.  struct protocol_buf*
++ * 2.  int32_t field index, not used in this function
++ *
++ * Return:
++ * 1.  A lua_packet_segment annotated with the according metatable or False in
++ *     case the input data is not valid
++ *
++ * Example:
++ *
++ * +------------------------+---------------------------------------+
++ * | function call          | resulting lua_packet_segment          |
++ * +========================+===+===+===+===+===+===+===+===+===+===+
++ * | seg = packet:raw(0,10) | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |
++ * +------------------------+---+---+---+---+---+---+---+---+---+---+
++ * | 1st_half = seg:raw(0,5)| 0 | 1 | 2 | 3 | 4 |                   |
++ * +------------------------+---+---+---+---+---+---+---+---+---+---+
++ * | 2nd_half = seg:raw(5,5)|                   | 5 | 6 | 7 | 8 | 9 |
++ * +------------------------+-------------------+---+---+---+---+---+
++ */
++static int32_t get_segment(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++	uint32_t  offset = luaL_checkinteger(L, 2);
++	uint32_t  length = luaL_checkinteger(L, 3);
++	lua_packet_segment * new = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
++
++	new->start = seg->start;
++	new->offset = seg->offset + offset;
++	new->changes = NULL;
++	/* we allow a seg->length == 0 , this enables processing packets where the packetsize is not fixed (0 = not fixed)*/
++	if (seg->length != 0 && length > seg->length) {
++		lua_pushboolean(L, 0);
++		return 1;
++	}
++
++	new->length = length;
++	luaL_getmetatable(L, prot_buf->name);
++	lua_setmetatable(L, -2);
++
++	return 1;
++}
++
++/* LUA_API: the function 'get_segment_size' is used to get the size of a segment.
++ * 
++ * Parameters:
++ * 1.  lua_packet_segment, implicit through object oriented access seg:raw(..)
++ *
++ * Upvalues:
++ * 1.  struct protocol_buf*
++ * 2.  int32_t field index, not used in this function
++ *
++ * Return:
++ * 1.  Size as lua_Number
++ */
++static int32_t get_segment_size(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	lua_pushnumber(L, seg->length);
++	return 1;
++}
++
++/* LUA_API: the function 'get_segment_offset' is used to get the real offset 
++ * of a segment. This function returns the offset of the segment to the start
++ * of the buffer. This means the following
++ *     seg1 = packet:raw(2,10)
++ *     seg2 = seg1:raw(3,5)
++ *   offset = seg2:get_offset()
++ *
++ * will give an offset of 5, since the seg1 starts at offset 2, and seg2 starts
++ * at offset (seg1:get_offset() + 3).
++ * 
++ * Parameters:
++ * 1.  lua_packet_segment, implicit through object oriented access seg:raw(..)
++ *
++ * Upvalues:
++ * 1.  struct protocol_buf*
++ * 2.  int32_t field index, not used in this function
++ *
++ * Return:
++ * 1.  Offset as lua_Number
++ */
++static int32_t get_segment_offset(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	lua_pushnumber(L, seg->offset);
++	return 1;
++}
++
++/* LUA_API: overwrites the __tostring function of a lua_packet_segment.
++ * this will print32_t a nicely formated string, including length,
++ * offset and name of the protocol buffer.
++ *
++ * Parameters:
++ * 1. lua_packet_segment (implicit)
++ *
++ * Returns:
++ * 1. the representing string
++ */
++static int32_t packet_segment_tostring(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++	int32_t n;
++	char buf[128];
++
++	n = sprintf(buf, "type: %s, offset: %d, length: %d", prot_buf->name, seg->offset, seg->length);
++	lua_pushlstring(L, buf, n);
++
++	return 1;
++}
++
++
++static const struct luaL_Reg seg_access_functions [] = {
++	{ "set",	set_raw			},
++	{ "get",	get_raw			},
++	{ "raw",	get_segment		},
++	{ "get_offset", get_segment_offset	},
++	{ "get_size",	get_segment_size	},
++	{ "to_bytes",	get_raw			},
++	{ "__tostring", packet_segment_tostring },
++	{ "__gc",	gc_packet_segment	},
++	{ NULL,		NULL			}
++};
++
++/* C_API: the function 'get_metatable_from_protocol_type' is a helper
++ * used in controller.c as well as it may find usage in the static 
++ * protocol buffers and byte array implementation. */
++void get_metatable_from_protocol_type(lua_State *L, int32_t type)
++{
++	char * table;
++	lua_getglobal(L, SUPPORTED_PROTOCOL_TABLE);
++	lua_rawgeti(L, -1, type);
++	table = (char *)luaL_checkstring(L, -1);
++	lua_pop(L, 2); /* pop the table SUPPORTED_PROTOCOL_TABLE and the string pushed by lua_gettable */
++	luaL_getmetatable(L, table);
++	return;
++}
++
++/* C_INT: the function 'payload_contains_protocol' is used internally. 
++ * Depending if static or dynamic protocol buffer it calls the right
++ * validation function. */
++static int32_t payload_contains_protocol(lua_State *L, struct protocol_buf *prot_buf, lua_packet_segment *seg, uint32_t  prot_type)
++{
++	if (prot_buf->is_dynamic)
++		return has_protocol_dynamic(L, prot_buf, seg, prot_type);
++	else
++		return prot_buf->has_protocol(L, prot_buf, seg, prot_type);
++}
++
++/* C_INT: the function 'protocol_get_field_changes' is used interally. 
++ * It requests the field_changes struct calling the protocol buffers
++ * 'get_field_changes' function. This funciton is called, whenever
++ * the payload field with a given protocol type is requested inside 
++ * the function 'get_protocol_field' */
++static struct field_changes * protocol_get_field_changes(lua_State *L, struct protocol_buf *prot_buf, lua_packet_segment * seg)
++{
++	struct field_changes * changes = NULL;
++
++	if (prot_buf->get_field_changes) {
++		if (prot_buf->is_dynamic)
++			changes = get_field_changes_dynamic(L, prot_buf, seg);
++		else
++			changes = prot_buf->get_field_changes(L, seg);
++		 /* is already 1 when set by helper 'get_allocated_field_changes,
++		  * since not every prot_buf may use this function we enforce it. */
++		changes->ref_count = 1;
++	}
++	return changes;
++}
++
++/* C_INT: the function 'get_field_offset_in_bytes' wrapps the logic of 
++ * calculating the new length with considering the optional field_changes. */
++static int32_t get_field_offset_in_bytes(struct protocol_field * field, lua_packet_segment * seg, int32_t field_index)
++{
++	uint32_t  nr_of_bits, nr_of_bytes, field_offset;
++
++	field_offset = field->offset;
++	/* do we need to manipulate the default values stored inside the protocol buffer ?? */
++	if (seg->changes)
++		field_offset += seg->changes->field_offset_changes[field_index];
++	/* how many bits remain */
++	nr_of_bits = field_offset & (CHAR_BIT - 1);
++	/* assuming CHAR_BIT == 2 ^ 3 */
++	nr_of_bytes = (field_offset - nr_of_bits) >> 3;
++
++	return seg->offset + nr_of_bytes;
++}
++
++/* C_INT: the function 'get_field_length_in_bytes' wrapps the logic of 
++ * calculating the new offset with considering the optional field_changes. */
++static int32_t get_field_length_in_bytes(struct protocol_field * field, lua_packet_segment * seg, int32_t field_index)
++{
++	uint32_t  nr_of_bits, nr_of_bytes, field_length;
++
++	field_length = field->length;
++	/* if the field length is smaller than 1 byte, we take the size of one byte
++	 * we treat the case where field_length == 0 in a special way ...*/
++	if (field_length < CHAR_BIT && field_length > 0)
++		field_length = CHAR_BIT;
++
++	/* do we need to manipulate the default values stored inside the protocol buffer ?? */
++	if (seg->changes)
++		field_length += seg->changes->field_length_changes[field_index];
++	/* how many bits remain */
++	nr_of_bits = field_length & (CHAR_BIT - 1);
++	/* assuming CHAR_BIT == 2 ^ 3 */
++	nr_of_bytes = (field_length - nr_of_bits) >> 3;
++	return nr_of_bytes;
++}
++
++/* C_INT: the function 'initialize_field_getter_and_setter' initializes 
++ * the setter and getter function of the field, considering the optional
++ * field manipulator functions defined inside the protocol buffers. */
++static void initialize_field_getter_and_setter(lua_State *L, struct protocol_buf *prot_buf, int32_t field_index)
++{
++	/* lets check if there is a metatable on top of the stack */
++	struct protocol_field * f = (struct protocol_field *)&prot_buf->protocol_fields[field_index];
++
++	if (!lua_istable(L, -1)) luaL_error(L, "cannot initialize getter and setter for field %s->%s, "
++					    "not a table on top of the stack, is '%s'", prot_buf->name, f->name, lua_typename(L, lua_type(L, -1)));
++
++	/* is there a 'getter' to initialize ? */
++	lua_pushlightuserdata(L, prot_buf);     /* push upvalue 1 */
++	lua_pushinteger(L, field_index);        /* push upvalue 2 */
++	if (f->get) {
++		if (prot_buf->is_dynamic)
++			lua_pushcclosure(L, field_dynamic_getter, 2);
++		else
++			lua_pushcclosure(L, f->get, 2);
++	}else
++		/* there is no specific getter defined - fall back to 'get_raw'  */
++		lua_pushcclosure(L, get_raw, 2);
++	 /* set the metatable field 'get' */
++	lua_setfield(L, -2, "get");
++
++	/* is there a 'setter' to initialize ? */
++	lua_pushlightuserdata(L, prot_buf);     /* push upvalue 1 */
++	lua_pushinteger(L, field_index);        /* push upvalue 2 */
++	if (f->set) {
++		if (prot_buf->is_dynamic)
++			lua_pushcclosure(L, field_dynamic_setter, 2);
++		else
++			lua_pushcclosure(L, f->set, 2);
++	}else
++		/* there is no specific setter defined - fall back to 'set_raw'  */
++		lua_pushcclosure(L, set_raw, 2);
++	 /* set the metatable field 'set' */
++	lua_setfield(L, -2, "set");
++}
++
++/* LUA_API: 'get_protocol_field' is used in Lua as a closure for each field of a protocol
++ * buffer. E.g a call to ip = packet:data(packet_ip) will go to this function,
++ * and trigger the conversion of the raw packet to a ip packet. Each call
++ * to a field function of an IP packet, like ip:daddr() uses this function
++ * to to return the right data. In each case you will end up either with a
++ * new packet segment (annotated with the proper metatable) or a boolean
++ * value (False) if something went wrong. In the case everything went fine,
++ * the newly created lua_packet_segment is annotated with the proper
++ * metatable where the fields get and set also contain the specific getter
++ * and setter functions given by the protocol buffer. E.g. the function call
++ * ip:daddr():get() or ip:daddr():set(...) will call the proper function
++ * defined inside the corresponding field definition.
++ *
++ * Parameters:
++ * 1.  lua_packet_segment, implicit through object oriented access seg:raw(..)
++ * 2.  type of the protocol buffer, optional, and only used if the accessed
++ *     field is the payload field. If a type is provided for the access of the
++ *     payload field, the function tries to convert the data pointed to by the
++ *     payload field to the given type. To check if such a conversion is
++ *     possible, it calls the function pointed to by the protocol buffer member
++ *     has_protocol. If this function returns True, the conversion takes place.
++ *
++ * Upvalues:
++ * 1.  struct protocol_buf*
++ * 2.  int32_t field index
++ *
++ * Return:
++ * 1.  A lua_packet_segment annotated with the according metatable or False in
++ *     case the input data is not valid
++ */
++static int32_t get_protocol_field(lua_State *L)
++{
++	int32_t prot_type;
++	lua_packet_segment * seg, *new;
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	int32_t field_index = lua_tointeger(L, lua_upvalueindex(2));
++	struct protocol_field * field = &prot_buf->protocol_fields[field_index];
++
++	/* get the current packet segment */
++	seg = checkpacketseg(L, 1, prot_buf->name);
++
++	/* initialize the new packet segment */
++	new = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
++	new->start = seg->start;         /* the start is unchanged */
++	new->offset = get_field_offset_in_bytes(field, seg, field_index);
++	new->length = get_field_length_in_bytes(field, seg, field_index);
++
++	/* if new->length == 0 then no configuration was done, we guess the size by subtracting the
++	 * new offset from the packet length. since the old length is getting initialized by the
++	 * netfilter extension this assumption holds for the very last field of the protocol.
++	 * this 'feature' should be used by protocol buffers containing a payload, whereas the
++	 * payload field is the last field of the buffer. However, at compile-time unknown field
++	 * sizes (and offsets) of fields not being placed at the end of the protocol should be
++	 * initialized using the 'get_field_changes' hook system. */
++	if (new->length == 0)
++		new->length = (seg->length + seg->offset) - (new->offset);
++	         /*
++	                         printf("%s->%s:: seg->offset %i, seg->length %i, new->offset %i, new->length %i\n",
++	                                         prot_buf->name, field->name, seg->offset, seg->length, new->offset, new->length);
++	          */
++	/* special care for packet payload requests */
++	if (prot_buf->payload_field != NULL && strcmp(prot_buf->payload_field, field->name) == 0) {
++		/* we know the payload field is requested */
++		/* the requested payload can be delivered either as a common segment or as
++		 * an other packet type, such a conversion needs an extra protocol parameter
++		 * ... so lets check */
++
++		if (lua_isnumber(L, 2)) {
++			/* we have an extra parameter, ... lets see if it is a valid protocol
++			 * the parameter is the index of the 'supported_protocols'-array member */
++			prot_type = lua_tointeger(L, 2);
++			if (prot_type >= 0 && prot_type < PACKET_SENTINEL) {
++				/* we are sure the purpose of the request is to get the payload data,
++				 * converted to the given protocol.  lets check if the payload contains
++				 * data of the given protocol */
++				if (payload_contains_protocol(L, prot_buf, seg, prot_type)) {
++					/* success, we can  push the metatable for the given protocol */
++					get_metatable_from_protocol_type(L, prot_type);
++					if (!lua_isnil(L, -1))  /* check if the metatable was found */
++						/* perhaps the field offsets and lengths of the containing protocol
++						 * are not set correctly. request the optional 'field_changes' structure
++						 * holding the changes for lengths and offsets. */
++						new->changes = protocol_get_field_changes(L, get_protocol_buf(prot_type), new);
++					else{
++						/* failed, the requested protocol is not available
++						 * we push false and return */
++						lua_pop(L, 1); /* pop the userdata */
++						lua_pushboolean(L, 0);
++						return 1;
++					}
++				}else{
++					/* payload does not carry the provided protocol */
++					/* we push false and return */
++					lua_pop(L, 1); /* pop the userdata */
++					lua_pushboolean(L, 0);
++					return 1;
++				}
++			}else{
++				/* unknown protocol */
++				lua_pop(L, 1); /* pop the userdata */
++				luaL_error(L, "provided protocol is unknown");
++			}
++		}
++	}
++
++	/* if there is still the 'new' userdata on the top, we push our own metatable */
++	if (lua_isuserdata(L, -1)) {
++		luaL_getmetatable(L, prot_buf->name);
++		new->changes = seg->changes;
++		if (seg->changes)
++			new->changes->ref_count++;
++	}
++
++	/* a new packet segment is at index -2 , and the proper metatable at index -1 of the stack
++	 * lets set the propper setter and getter function for the requested field */
++	initialize_field_getter_and_setter(L, prot_buf, field_index);
++
++	lua_setmetatable(L, -2);
++	return 1;
++}
++
++/* C_API: 'register_protbuf' is only used internally. This function takes a
++ * pointer to a fully initialized protocol buffer struct and registers it
++ * inside the Lua state. Registering means:
++ *
++ * 1.  it creates a new metatable with the name of the protocol buffer.
++ * 2.  it registers the default functions which are stored in the luaL_Reg
++ *     array seg_access_functions.
++ * 3.  it loops over the protocol fields stored at prot_buf->protocol_fields
++ *     and registers a new function (using the field name) inside the
++ *     metatable. Each field points to the function 'get_protocol_field'
++ *     which acts as a closure taking a pointer to the protocol buffer as
++ *     well as the index of the field as upvalues.
++ * 4.  The protocol index, serves as numerical identifier of this protocol
++ *     buffer or even of the protocol itself. This index is stored as a
++ *     global value inside the Lua state as well as inside the Lua table
++ *     'supported_protocols'. Assuming the name of a procotol buffer is
++ *     "packet_ip" the following statements are true:
++ * 
++ *       supported_protocols[protocol_index] == "packet_ip"
++ *                                 packet_ip == protocol_index
++ *
++ *     This allows you to get all registered protocols from within Lua. This
++ *     is especially usefull for the dynamic protocol buffers where you have
++ *     to provide your own "has_protocol"-function, which probably needs the
++ *     information on which protocols it is able to contain.
++ */
++void register_protbuf(lua_State *L, struct protocol_buf * prot_buf, uint32_t  protocol_index)
++{
++	int32_t field_index;
++	luaL_Reg *reg = (struct luaL_Reg *)seg_access_functions;
++	struct protocol_field * field = prot_buf->protocol_fields;
++
++	luaL_newmetatable(L, prot_buf->name);
++
++	/* metatable.__index = metatable */
++	lua_pushvalue(L, -1);   /* duplicates the metatable */
++	lua_setfield(L, -2, "__index");
++
++	/* pushing default functions */
++	for (; reg->name; reg++) {
++		lua_pushlightuserdata(L, (void *)prot_buf);
++		lua_pushcclosure(L, reg->func, 1);
++		lua_setfield(L, -2, reg->name);
++	}
++
++	/* pushing functions specific to the protocol buffer */
++	for (field_index = 0; field->name; field++, field_index++) {
++		lua_pushlightuserdata(L, (void *)prot_buf);             /* upvalue: prot_buf */
++		lua_pushinteger(L, field_index);                        /* upvalue: index of protocol field */
++		lua_pushcclosure(L, get_protocol_field, 2);
++		lua_setfield(L, -2, field->name);
++	}
++	/* pop the metatable */
++	lua_pop(L, 1);
++
++	/* registering the array-index as the protocol_id*/
++	lua_getglobal(L, "_G");
++	lua_pushinteger(L, protocol_index);
++	lua_setfield(L, -2, prot_buf->name);
++	lua_pop(L, 1); /* pop _G */
++
++	lua_getglobal(L, SUPPORTED_PROTOCOL_TABLE);
++	lua_pushstring(L, prot_buf->name);
++	lua_rawseti(L, -2, protocol_index);
++
++	lua_pop(L, 1);  /* pop SUPPORTED_PROTOCOL_TABLE */
++
++	supported_protocols[protocol_index] = prot_buf;
++}
++
++void luaopen_controller(lua_State *L)
++{
++	/* registering a table inside the _G with table[protocol_index] = prot_buf->name */
++	lua_getglobal(L, "_G");
++	lua_newtable(L);
++	lua_setfield(L, -2, SUPPORTED_PROTOCOL_TABLE);
++	lua_pop(L, 1); /* pop _G */                   
++	
++	luaopen_protbuf_raw(L);
++	luaopen_protbuf_eth(L);
++	luaopen_protbuf_ip(L);
++	luaopen_protbuf_icmp(L);
++	luaopen_protbuf_tcp(L);
++	luaopen_protbuf_tcp_options(L);
++	luaopen_protbuf_udp(L);
++	luaopen_protbuf_tftp(L);
++	luaopen_protbuf_dynamic(L);
++	/* should follow all other static buffers */
++#if defined(__KERNEL__)
++	luaopen_nflib(L);
++#endif
++
++	luaopen_bytearraylib(L);
++}
++
++
++
++
+--- /dev/null
++++ b/extensions/LUA/controller.h
+@@ -0,0 +1,264 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef CONTROLLER_H_
++#define CONTROLLER_H_
++
++#include "stdlib.h"     /* wrapper */
++#include "string.h"     /* wrapper */
++#include "lua.h"
++#include "lualib.h"
++#include "lauxlib.h"
++
++#if defined(__KERNEL__)
++#include <linux/skbuff.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#endif
++
++
++/* to compile the stuff in userspace (for testing)*/
++#if !defined(__KERNEL__)
++#include <stdint.h>
++#define pr_debug printf;
++
++#define kmalloc(size, type) malloc(size)
++#define kfree(ptr) free(ptr)
++
++#endif
++
++
++/**********************************************************************/
++/* nf Lua configuration                                               */
++/**********************************************************************/
++#define MAX_NR_OF_PROTOCOLS 16
++#define SUPPORTED_PROTOCOL_TABLE "supported_protocols"
++
++#define MAX_NR_OF_FIELDS_IN_DYN_PROT_BUF 32
++
++
++/**********************************************************************/
++/* Static Protocol Buffer configuration                               */
++/**********************************************************************/
++
++/* the definitions of the stringified expression of the prot_bufs...
++ * make sure all static prot_bufs are listed and are unique */
++#define LUA_PACKET_SEG_RAW "packet_raw"
++#define LUA_PACKET_SEG_ETH "packet_eth"
++#define LUA_PACKET_SEG_ICMP "packet_icmp"
++#define LUA_PACKET_SEG_IP "packet_ip"
++#define LUA_PACKET_SEG_TCP "packet_tcp"
++#define LUA_PACKET_SEG_TCP_OPT "packet_tcp_opt"
++#define LUA_PACKET_SEG_UDP "packet_udp"
++#define LUA_PACKET_SEG_TFTP "packet_tftp"
++
++/* the enum holding all static prot_bufs... make sure it contains all
++ * static prot_bufs */
++enum PROT_BUF {
++	PACKET_RAW,
++	PACKET_ETH,
++	PACKET_IP,
++	PACKET_ICMP,
++	PACKET_TCP,
++	PACKET_TCP_OPTIONS,
++	PACKET_UDP,
++	PACKET_TFTP,
++	PACKET_DYNAMIC,
++	PACKET_SENTINEL
++};
++
++/* the luaopen-function of the prot_bufs... make sure it is called
++ * inside luaopen_controller */
++void luaopen_protbuf_raw(lua_State *L);
++void luaopen_protbuf_eth(lua_State *L);
++void luaopen_protbuf_ip(lua_State *L);
++void luaopen_protbuf_icmp(lua_State *L);
++void luaopen_protbuf_tcp(lua_State *L);
++void luaopen_protbuf_tcp_options(lua_State *L);
++void luaopen_protbuf_udp(lua_State *L);
++void luaopen_protbuf_tftp(lua_State *L);
++void luaopen_protbuf_dynamic(lua_State *L);
++
++/**********************************************************************/
++/* field changes                                                      */
++/**********************************************************************/
++struct field_changes {
++	int ref_count;
++	int *field_length_changes;
++	int *field_offset_changes;
++};
++
++/**********************************************************************/
++/* lua packet segment												  */
++/* ------------------                                                 */
++/* The struct lua_packet_segment is the integral part of a Lua packet.*/
++/* At the very beginning, when a new packet arrives in `lua_tg`_ such */
++/* a struct is initialized. The field start then points to the lowest */
++/* available header inside the sk_buff structure. During packet       */
++/* processing the start pointer remains the same, only the offset and */
++/* length value change.                                               */
++/**********************************************************************/
++#define checkpacketseg(L, i, seg_type) \
++	(lua_packet_segment *)luaL_checkudata(L, i, seg_type)
++
++typedef struct lua_packet_segment {
++	unsigned int offset;
++	unsigned int length;
++	struct field_changes * changes;
++	unsigned char * start;  /* need to be at the end because of the memory alignment */
++} lua_packet_segment;
++
++/**********************************************************************/
++/* protocol field                                                     */
++/* --------------													  */
++/* This structure is a container for the field definitions used by the*/
++/* protocol buffer. Each protocol field is expressed using this struct*/
++/* Have a look at the protocol buffers to see how the struct gets     */
++/* initialized.														  */
++/*																	  */
++/* name:														      */
++/*   This member expresses the name of the field, ending			  */
++/*   in its own Lua function to access the field.					  */
++/* offset / length:													  */
++/*   These members do specify the position inside the protocol header */
++/*   in bits (not bytes!).											  */
++/* get / set:														  */
++/*   The get and set functions take a function pointer pointing to the*/
++/*   specific getter and setter function for this field.			  */
++/**********************************************************************/
++struct protocol_field {
++	const char * name;
++	uint32_t offset;
++	uint32_t length;
++	lua_CFunction get;
++	lua_CFunction set;
++};
++#define PROT_FIELD_SENTINEL { NULL, 0, 0, NULL, NULL }
++
++
++/**********************************************************************/
++/* protocol_buf                                                       */
++/**********************************************************************/
++/* This structure is a container for all the information needed for a
++ * protocol buffer. It gets initialized in each protocol buffer header
++ * file or for the dynamic protocol buffers on runtime using the
++ * 'register_dynamic_protocol_buffer' function.
++ *
++ * name:
++ *   This member is used throughout the system. It is also exported
++ *   to Lua as a variable name holding the index of the 'supported_protocols'
++ *   array. The name is also used as the name of the generated Lua
++ *   metatable, that is why inside the macro checkpacketseg_ it
++ *   is always the name of a protocol buffer that is passed as the
++ *   second parameter.
++ * payload_field:
++ *   This member holds the string of the field responsible for payload
++ *   data. The payload field of a protocol has an extra property, since
++ *   it can be used to invoke another protocol buffer that is applied to
++ *   the payload content.
++ * has_protocol:
++ *   This member is used together with the payload_field. Since we must
++ *   be sure that the payload content does really contain a protocol
++ *   of type X. The function pointed to by has_protocol checks if the
++ *   protocol buffer X can be applied on the payload_data.
++ * protocol_fields:
++ *   This member points to the array of 'protocol_field' structures
++ * get_field_changes:
++ *   This member is optional. It is used to return a pointer to an initialized
++ *   field_changes struct. The function is called, whenever the payload field
++ *   is requested with a given protocol type. Usually this function will
++ *   initialize the field_changes struct depending on the content of the 
++ *   payload data. e.g.
++ *     tcp = ip:data(packet_tcp)
++ *   such a request will call the 'get_field_changes' function of the tcp
++ *   protocol buffer. This enables, that the tcp options field have the proper
++ *   length as well as the tcp data start at the right offset. 
++ */
++struct protocol_buf {
++	int is_dynamic;
++	const char * name;
++	char * payload_field;
++	int (*has_protocol)(lua_State *L, struct protocol_buf *prot_buf, lua_packet_segment * seg, int type);
++	struct protocol_field * protocol_fields;
++	struct field_changes * (*get_field_changes)(lua_State *L, lua_packet_segment * seg);
++};
++
++/**********************************************************************/
++/* lua byte array library                                             */
++/**********************************************************************/
++#define LUA_BYTE_ARRAY "byte_array"
++#define checkbytearray(L, i) \
++	(lua_packet_segment *)luaL_checkudata(L, i, LUA_BYTE_ARRAY)
++lua_packet_segment * init_byte_array(lua_State *L, unsigned char * start, int length, int do_copy);
++void luaopen_bytearraylib(lua_State *L);
++
++
++/**********************************************************************/
++/* lua netfilter environment library                                  */
++/**********************************************************************/
++#define NETFILTER_LIB "nf"
++#if defined(__KERNEL__)
++	struct lua_env {
++		lua_State *L;
++		/* perhaps more to come here (e.g. a state per CPU) */
++	}; 
++	#define LUA_ENV "lua_env"
++	#define checkluaenv(L, i) \
++	(struct lua_env *)luaL_checkudata(L, i, LUA_ENV)
++
++	void luaopen_nflib(lua_State *L);
++#endif
++
++void cleanup_dynamic_prot_bufs(void); /* freeing all dynamic prot bufs */
++/**********************************************************************/
++/* lua protbuf helpers                                                */
++/**********************************************************************/
++int get_1_bit_generic(lua_State *L);
++int set_1_bit_generic(lua_State *L);
++int get_lower_4_bit_generic(lua_State *L);
++int set_lower_4_bit_generic(lua_State *L);
++int get_upper_4_bit_generic(lua_State *L);
++int set_upper_4_bit_generic(lua_State *L);
++int get_8_bit_generic(lua_State *L);
++int set_8_bit_generic(lua_State *L);
++int get_16_bit_generic(lua_State *L);
++int set_16_bit_generic(lua_State *L);
++int get_32_bit_generic(lua_State *L);
++int set_32_bit_generic(lua_State *L);
++int set_data_generic(lua_State *L);
++int get_string_generic(lua_State *L);
++int get_byte_generic_str(lua_State *L);
++struct field_changes * get_allocated_field_changes(lua_State *L, int nr_of_fields);
++
++/* only used by the dynamic prot buf subsystem */
++#define MAX_NR_OF_DYN_PROT_BUFS 16
++int field_dynamic_setter(lua_State *L);
++int field_dynamic_getter(lua_State *L);
++int has_protocol_dynamic(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int type);
++struct field_changes * get_field_changes_dynamic(lua_State *L, struct protocol_buf *prot_buf, lua_packet_segment * seg);
++
++/**********************************************************************/
++/* lua controller API                                                 */
++/**********************************************************************/
++void luaopen_controller(lua_State *L);
++struct protocol_buf * get_protocol_buf(unsigned int protocol_id);
++void get_metatable_from_protocol_type(lua_State *L, int type);
++void register_protbuf(lua_State *L, struct protocol_buf * prot_buf, unsigned int protocol_index);
++
++
++#endif /* CONTROLLER_H_ */
+--- /dev/null
++++ b/extensions/LUA/Kbuild
+@@ -0,0 +1,49 @@
++# -*- Makefile -*-
++
++# Adding debug options
++EXTRA_CFLAGS += -DDEBUG
++
++obj-m += xt_LUA.o
++
++EXTRA_CFLAGS += -I$(src)/prot_buf_new
++xt_LUA-y += xt_LUA_target.o \
++
++xt_LUA-y += nf_lua.o \
++			prot_buf_helpers.o \
++			byte_array.o \
++			controller.o \
++			prot_buf_ethernet.o \
++			prot_buf_icmp.o \
++			prot_buf_ip.o \
++			prot_buf_raw.o \
++			prot_buf_tcp.o \
++			prot_buf_udp.o \
++			prot_buf_tftp.o \
++			prot_buf_dynamic.o \
++
++
++# Adding Lua Support
++EXTRA_CFLAGS += -I$(src)/lua -I$(src)/lua/include 
++xt_LUA-y += lua/lapi.o \
++			lua/lbaselib.o \
++			lua/lcode.o \
++			lua/ldebug.o \
++			lua/ldo.o \
++			lua/ldump.o \
++			lua/lfunc.o \
++			lua/lgc.o \
++			lua/llex.o \
++			lua/lmem.o \
++			lua/lobject.o \
++			lua/lopcodes.o \
++			lua/lparser.o \
++			lua/lstate.o \
++			lua/lstring.o \
++			lua/lstrlib.o \
++			lua/ltable.o \
++			lua/ltablib.o \
++			lua/ltm.o \
++			lua/lundump.o \
++			lua/lvm.o \
++			lua/lzio.o \
++			lua/lauxlib.o \
+--- /dev/null
++++ b/extensions/LUA/libxt_LUA.c
+@@ -0,0 +1,191 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <getopt.h>
++#include <stdio.h>
++#include <stdbool.h>
++#include <stdlib.h>
++#include <string.h>
++#include <xtables.h>
++#include <linux/netfilter.h>
++#include <linux/netfilter/x_tables.h>
++#include "xt_LUA.h"
++
++enum {
++	FLAG_SCRIPT   = 1 << 0,
++	FLAG_STATE    = 1 << 1,
++	FLAG_FUNCTION = 1 << 2,
++};
++
++static const struct option lua_tg_opts[] = {
++	{ .name = "script",   .has_arg = true, .val = 's' },
++	{ .name = "state",    .has_arg = true, .val = 'l' },
++	{ .name = "function", .has_arg = true, .val = 'f' },
++	{ NULL },
++};
++
++
++static void lua_tg_help(void)
++{
++	printf(
++		"LUA target options:\n"
++		"  --script SCRIPT      Process packet with the Lua script given by SCRIPT\n"
++		"                                                                       \n"
++		"  --state ID           Process packet within the Lua state given by ID.\n"
++		"                       Omitting --state infers the ID 0, which can be\n"
++		"                       refered to the 'global' state.\n"
++		"                                                                       \n"
++		"  --function FUNCTION  Name of the function that processes the Lua packet\n"
++		"\n");
++}
++
++static void
++lua_tg_init(struct xt_entry_target *target)
++{
++	struct xt_lua_tginfo *info = (void *)target->data;
++
++	info->state_id = 0;
++	strncpy(info->function, "process_packet\0", sizeof("process_packet\0"));
++}
++
++static int
++lua_tg_parse(int32_t c, char **argv, int32_t invert, uint32_t  *flags,
++	     const void *entry, struct xt_entry_target **target)
++{
++	struct xt_lua_tginfo *info = (void *)(*target)->data;
++	char buf[MAX_SCRIPT_SIZE];
++	long script_size;
++	uint32_t  state_id;
++	FILE *file;
++
++	switch (c) {
++	case 's':
++		if (*flags & FLAG_SCRIPT)
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Cannot specify --script more than once");
++
++		if (strlen(optarg) > sizeof(info->filename))
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Maximum script length is %zu",
++				      sizeof(info->filename));
++
++		if (strchr(optarg, '\n'))
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Newlines not allowed in script name");
++		file = fopen(optarg, "rb");
++		if (file != NULL) {
++			fseek(file, 0, SEEK_END);
++			script_size = ftell(file);
++			if (script_size > MAX_SCRIPT_SIZE)
++				xtables_error(PARAMETER_PROBLEM,
++					      "LUA: The size of the script is too big");
++
++			fseek(file, 0, SEEK_SET);
++			fread(buf, script_size, 1, file);
++			fclose(file);
++		} else
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Cannot open script %s", optarg);
++
++		strncpy(info->filename, optarg, sizeof(info->filename));
++		strncpy(info->buf, buf, sizeof(info->buf));
++		info->script_size = script_size;
++
++		*flags |= FLAG_SCRIPT;
++		return true;
++
++	case 'l':
++		if (*flags & FLAG_STATE)
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Cannot specify --state more than once");
++
++		if (!xtables_strtoui(optarg, NULL, &state_id, 0, 8))
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Invalid --state %s", optarg);
++
++		info->state_id = state_id;
++		*flags |= FLAG_STATE;
++		return true;
++
++	case 'f':
++		if (*flags & FLAG_FUNCTION)
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Cannot specify --function more than once");
++		if (strlen(optarg) > sizeof(info->function))
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Maximum function length is %zu",
++				      sizeof(info->function));
++
++		if (strchr(optarg, '\n'))
++			xtables_error(PARAMETER_PROBLEM,
++				      "LUA: Newlines not allowed in function name");
++
++		strncpy(info->function, optarg, sizeof(info->function));
++
++		*flags |= FLAG_FUNCTION;
++		return true;
++	}
++
++	return false;
++}
++
++static void
++lua_tg_check(uint32_t  flags)
++{
++	if (flags == 0)
++		xtables_error(PARAMETER_PROBLEM, "LUA: --script parameter required");
++}
++
++static void
++lua_tg_print(const void *entry, const struct xt_entry_target *target,
++	     int32_t numeric)
++{
++	const struct xt_lua_tginfo *info = (const void *)target->data;
++
++	printf("LUA script: %s ", info->filename);
++}
++
++static void
++lua_tg_save(const void *entry, const struct xt_entry_target *target)
++{
++	const struct xt_lua_tginfo *info = (const void *)target->data;
++
++	printf("--script %s ", info->filename);
++}
++
++static struct xtables_target lua_tg_reg = {
++	.name			= "LUA",
++	.version		= XTABLES_VERSION,
++	.revision		= 0,
++	.family			= NFPROTO_UNSPEC,
++	.size			= XT_ALIGN(sizeof(struct xt_lua_tginfo)),
++	.userspacesize		= XT_ALIGN(sizeof(struct xt_lua_tginfo)),
++	.help			= lua_tg_help,
++	.init			= lua_tg_init,
++	.parse			= lua_tg_parse,
++	.final_check		= lua_tg_check,
++	.print			= lua_tg_print,
++	.save			= lua_tg_save,
++	.extra_opts		= lua_tg_opts,
++};
++
++static __attribute__((constructor)) void lua_tg_ldr(void)
++{
++	xtables_register_target(&lua_tg_reg);
++}
++
+--- /dev/null
++++ b/extensions/LUA/libxt_LUA.man
+@@ -0,0 +1 @@
++Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+--- /dev/null
++++ b/extensions/LUA/lua/include/ctype.h
+@@ -0,0 +1,11 @@
++#include <linux/ctype.h>
++#undef  isalnum
++#define isalnum(c)      (((__ismask(c)&(_U|_L|_D)) != 0) && (c > 0))
++#undef  isalpha
++#define isalpha(c)      (((__ismask(c)&(_U|_L)) != 0) && (c > 0))
++#undef  iscntrl
++#define iscntrl(c)      (((__ismask(c)&(_C)) != 0) && (c > 0))
++#undef  isdigit
++#define isdigit(c)      (((__ismask(c)&(_D)) != 0) && (c > 0))
++#undef  isspace
++#define isspace(c)      (((__ismask(c)&(_S)) != 0) && (c > 0))
+--- /dev/null
++++ b/extensions/LUA/lua/include/errno.h
+@@ -0,0 +1 @@
++#include <linux/errno.h>
+--- /dev/null
++++ b/extensions/LUA/lua/include/locale.h
+@@ -0,0 +1,5 @@
++struct lconv {
++   char * decimal_point ;
++} ;
++
++#define localeconv()		NULL
+--- /dev/null
++++ b/extensions/LUA/lua/include/setjmp.h
+@@ -0,0 +1,26 @@
++/*
++ * arch/um/include/sysdep-i386/archsetjmp.h
++ */
++
++#ifndef _KLIBC_ARCHSETJMP_H
++#define _KLIBC_ARCHSETJMP_H
++
++struct __jmp_buf {
++	unsigned int __ebx;
++	unsigned int __esp;
++	unsigned int __ebp;
++	unsigned int __esi;
++	unsigned int __edi;
++	unsigned int __eip;
++};
++
++typedef struct __jmp_buf jmp_buf[1];
++
++#define JB_IP __eip
++#define JB_SP __esp
++
++int setjmp(jmp_buf);
++void longjmp(jmp_buf, int);
++
++#endif				/* _SETJMP_H */
++
+--- /dev/null
++++ b/extensions/LUA/lua/include/stdio.h
+@@ -0,0 +1 @@
++#include <linux/kernel.h>
+--- /dev/null
++++ b/extensions/LUA/lua/include/stdlib.h
+@@ -0,0 +1,7 @@
++#include <linux/kernel.h>
++
++#define exit(E)         return
++#define strtoul		simple_strtoul
++#define strcoll		strcmp
++
++#define CHAR_BIT 8
+--- /dev/null
++++ b/extensions/LUA/lua/include/string.h
+@@ -0,0 +1 @@
++#include <linux/string.h>
+--- /dev/null
++++ b/extensions/LUA/lua/lapi.c
+@@ -0,0 +1,1086 @@
++/*
++** $Id: lapi.c,v 2.55.1.5 2008/07/04 18:41:18 roberto Exp $
++** Lua API
++** See Copyright Notice in lua.h
++*/
++
++#include <stdarg.h>
++#include <math.h>
++#include <assert.h>
++#include <string.h>
++
++#define lapi_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lapi.h"
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "lgc.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "ltm.h"
++#include "lundump.h"
++#include "lvm.h"
++
++
++
++const char lua_ident[] =
++  "$Lua: " LUA_RELEASE " " LUA_COPYRIGHT " $\n"
++  "$Authors: " LUA_AUTHORS " $\n"
++  "$URL: www.lua.org $\n";
++
++
++
++#define api_checknelems(L, n)	api_check(L, (n) <= (L->top - L->base))
++
++#define api_checkvalidindex(L, i)	api_check(L, (i) != luaO_nilobject)
++
++#define api_incr_top(L)   {api_check(L, L->top < L->ci->top); L->top++;}
++
++
++
++static TValue *index2adr (lua_State *L, int idx) {
++  if (idx > 0) {
++    TValue *o = L->base + (idx - 1);
++    api_check(L, idx <= L->ci->top - L->base);
++    if (o >= L->top) return cast(TValue *, luaO_nilobject);
++    else return o;
++  }
++  else if (idx > LUA_REGISTRYINDEX) {
++    api_check(L, idx != 0 && -idx <= L->top - L->base);
++    return L->top + idx;
++  }
++  else switch (idx) {  /* pseudo-indices */
++    case LUA_REGISTRYINDEX: return registry(L);
++    case LUA_ENVIRONINDEX: {
++      Closure *func = curr_func(L);
++      sethvalue(L, &L->env, func->c.env);
++      return &L->env;
++    }
++    case LUA_GLOBALSINDEX: return gt(L);
++    default: {
++      Closure *func = curr_func(L);
++      idx = LUA_GLOBALSINDEX - idx;
++      return (idx <= func->c.nupvalues)
++                ? &func->c.upvalue[idx-1]
++                : cast(TValue *, luaO_nilobject);
++    }
++  }
++}
++
++
++static Table *getcurrenv (lua_State *L) {
++  if (L->ci == L->base_ci)  /* no enclosing function? */
++    return hvalue(gt(L));  /* use global table as environment */
++  else {
++    Closure *func = curr_func(L);
++    return func->c.env;
++  }
++}
++
++
++void luaA_pushobject (lua_State *L, const TValue *o) {
++  setobj2s(L, L->top, o);
++  api_incr_top(L);
++}
++
++
++LUA_API int lua_checkstack (lua_State *L, int size) {
++  int res = 1;
++  lua_lock(L);
++  if (size > LUAI_MAXCSTACK || (L->top - L->base + size) > LUAI_MAXCSTACK)
++    res = 0;  /* stack overflow */
++  else if (size > 0) {
++    luaD_checkstack(L, size);
++    if (L->ci->top < L->top + size)
++      L->ci->top = L->top + size;
++  }
++  lua_unlock(L);
++  return res;
++}
++
++
++LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
++  int i;
++  if (from == to) return;
++  lua_lock(to);
++  api_checknelems(from, n);
++  api_check(from, G(from) == G(to));
++  api_check(from, to->ci->top - to->top >= n);
++  from->top -= n;
++  for (i = 0; i < n; i++) {
++    setobj2s(to, to->top++, from->top + i);
++  }
++  lua_unlock(to);
++}
++
++
++LUA_API void lua_setlevel (lua_State *from, lua_State *to) {
++  to->nCcalls = from->nCcalls;
++}
++
++
++LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
++  lua_CFunction old;
++  lua_lock(L);
++  old = G(L)->panic;
++  G(L)->panic = panicf;
++  lua_unlock(L);
++  return old;
++}
++
++
++LUA_API lua_State *lua_newthread (lua_State *L) {
++  lua_State *L1;
++  lua_lock(L);
++  luaC_checkGC(L);
++  L1 = luaE_newthread(L);
++  setthvalue(L, L->top, L1);
++  api_incr_top(L);
++  lua_unlock(L);
++  luai_userstatethread(L, L1);
++  return L1;
++}
++
++
++
++/*
++** basic stack manipulation
++*/
++
++
++LUA_API int lua_gettop (lua_State *L) {
++  return cast_int(L->top - L->base);
++}
++
++
++LUA_API void lua_settop (lua_State *L, int idx) {
++  lua_lock(L);
++  if (idx >= 0) {
++    api_check(L, idx <= L->stack_last - L->base);
++    while (L->top < L->base + idx)
++      setnilvalue(L->top++);
++    L->top = L->base + idx;
++  }
++  else {
++    api_check(L, -(idx+1) <= (L->top - L->base));
++    L->top += idx+1;  /* `subtract' index (index is negative) */
++  }
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_remove (lua_State *L, int idx) {
++  StkId p;
++  lua_lock(L);
++  p = index2adr(L, idx);
++  api_checkvalidindex(L, p);
++  while (++p < L->top) setobjs2s(L, p-1, p);
++  L->top--;
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_insert (lua_State *L, int idx) {
++  StkId p;
++  StkId q;
++  lua_lock(L);
++  p = index2adr(L, idx);
++  api_checkvalidindex(L, p);
++  for (q = L->top; q>p; q--) setobjs2s(L, q, q-1);
++  setobjs2s(L, p, L->top);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_replace (lua_State *L, int idx) {
++  StkId o;
++  lua_lock(L);
++  /* explicit test for incompatible code */
++  if (idx == LUA_ENVIRONINDEX && L->ci == L->base_ci)
++    luaG_runerror(L, "no calling environment");
++  api_checknelems(L, 1);
++  o = index2adr(L, idx);
++  api_checkvalidindex(L, o);
++  if (idx == LUA_ENVIRONINDEX) {
++    Closure *func = curr_func(L);
++    api_check(L, ttistable(L->top - 1)); 
++    func->c.env = hvalue(L->top - 1);
++    luaC_barrier(L, func, L->top - 1);
++  }
++  else {
++    setobj(L, o, L->top - 1);
++    if (idx < LUA_GLOBALSINDEX)  /* function upvalue? */
++      luaC_barrier(L, curr_func(L), L->top - 1);
++  }
++  L->top--;
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_pushvalue (lua_State *L, int idx) {
++  lua_lock(L);
++  setobj2s(L, L->top, index2adr(L, idx));
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++
++/*
++** access functions (stack -> C)
++*/
++
++
++LUA_API int lua_type (lua_State *L, int idx) {
++  StkId o = index2adr(L, idx);
++  return (o == luaO_nilobject) ? LUA_TNONE : ttype(o);
++}
++
++
++LUA_API const char *lua_typename (lua_State *L, int t) {
++  UNUSED(L);
++  return (t == LUA_TNONE) ? "no value" : luaT_typenames[t];
++}
++
++
++LUA_API int lua_iscfunction (lua_State *L, int idx) {
++  StkId o = index2adr(L, idx);
++  return iscfunction(o);
++}
++
++
++LUA_API int lua_isnumber (lua_State *L, int idx) {
++  TValue n;
++  const TValue *o = index2adr(L, idx);
++  return tonumber(o, &n);
++}
++
++
++LUA_API int lua_isstring (lua_State *L, int idx) {
++  int t = lua_type(L, idx);
++  return (t == LUA_TSTRING || t == LUA_TNUMBER);
++}
++
++
++LUA_API int lua_isuserdata (lua_State *L, int idx) {
++  const TValue *o = index2adr(L, idx);
++  return (ttisuserdata(o) || ttislightuserdata(o));
++}
++
++
++LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
++  StkId o1 = index2adr(L, index1);
++  StkId o2 = index2adr(L, index2);
++  return (o1 == luaO_nilobject || o2 == luaO_nilobject) ? 0
++         : luaO_rawequalObj(o1, o2);
++}
++
++
++LUA_API int lua_equal (lua_State *L, int index1, int index2) {
++  StkId o1, o2;
++  int i;
++  lua_lock(L);  /* may call tag method */
++  o1 = index2adr(L, index1);
++  o2 = index2adr(L, index2);
++  i = (o1 == luaO_nilobject || o2 == luaO_nilobject) ? 0 : equalobj(L, o1, o2);
++  lua_unlock(L);
++  return i;
++}
++
++
++LUA_API int lua_lessthan (lua_State *L, int index1, int index2) {
++  StkId o1, o2;
++  int i;
++  lua_lock(L);  /* may call tag method */
++  o1 = index2adr(L, index1);
++  o2 = index2adr(L, index2);
++  i = (o1 == luaO_nilobject || o2 == luaO_nilobject) ? 0
++       : luaV_lessthan(L, o1, o2);
++  lua_unlock(L);
++  return i;
++}
++
++
++
++LUA_API lua_Number lua_tonumber (lua_State *L, int idx) {
++  TValue n;
++  const TValue *o = index2adr(L, idx);
++  if (tonumber(o, &n))
++    return nvalue(o);
++  else
++    return 0;
++}
++
++
++LUA_API lua_Integer lua_tointeger (lua_State *L, int idx) {
++  TValue n;
++  const TValue *o = index2adr(L, idx);
++  if (tonumber(o, &n)) {
++    lua_Integer res;
++    lua_Number num = nvalue(o);
++    lua_number2integer(res, num);
++    return res;
++  }
++  else
++    return 0;
++}
++
++
++LUA_API int lua_toboolean (lua_State *L, int idx) {
++  const TValue *o = index2adr(L, idx);
++  return !l_isfalse(o);
++}
++
++
++LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
++  StkId o = index2adr(L, idx);
++  if (!ttisstring(o)) {
++    lua_lock(L);  /* `luaV_tostring' may create a new string */
++    if (!luaV_tostring(L, o)) {  /* conversion failed? */
++      if (len != NULL) *len = 0;
++      lua_unlock(L);
++      return NULL;
++    }
++    luaC_checkGC(L);
++    o = index2adr(L, idx);  /* previous call may reallocate the stack */
++    lua_unlock(L);
++  }
++  if (len != NULL) *len = tsvalue(o)->len;
++  return svalue(o);
++}
++
++
++LUA_API size_t lua_objlen (lua_State *L, int idx) {
++  StkId o = index2adr(L, idx);
++  switch (ttype(o)) {
++    case LUA_TSTRING: return tsvalue(o)->len;
++    case LUA_TUSERDATA: return uvalue(o)->len;
++    case LUA_TTABLE: return luaH_getn(hvalue(o));
++    case LUA_TNUMBER: {
++      size_t l;
++      lua_lock(L);  /* `luaV_tostring' may create a new string */
++      l = (luaV_tostring(L, o) ? tsvalue(o)->len : 0);
++      lua_unlock(L);
++      return l;
++    }
++    default: return 0;
++  }
++}
++
++
++LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
++  StkId o = index2adr(L, idx);
++  return (!iscfunction(o)) ? NULL : clvalue(o)->c.f;
++}
++
++
++LUA_API void *lua_touserdata (lua_State *L, int idx) {
++  StkId o = index2adr(L, idx);
++  switch (ttype(o)) {
++    case LUA_TUSERDATA: return (rawuvalue(o) + 1);
++    case LUA_TLIGHTUSERDATA: return pvalue(o);
++    default: return NULL;
++  }
++}
++
++
++LUA_API lua_State *lua_tothread (lua_State *L, int idx) {
++  StkId o = index2adr(L, idx);
++  return (!ttisthread(o)) ? NULL : thvalue(o);
++}
++
++
++LUA_API const void *lua_topointer (lua_State *L, int idx) {
++  StkId o = index2adr(L, idx);
++  switch (ttype(o)) {
++    case LUA_TTABLE: return hvalue(o);
++    case LUA_TFUNCTION: return clvalue(o);
++    case LUA_TTHREAD: return thvalue(o);
++    case LUA_TUSERDATA:
++    case LUA_TLIGHTUSERDATA:
++      return lua_touserdata(L, idx);
++    default: return NULL;
++  }
++}
++
++
++
++/*
++** push functions (C -> stack)
++*/
++
++
++LUA_API void lua_pushnil (lua_State *L) {
++  lua_lock(L);
++  setnilvalue(L->top);
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
++  lua_lock(L);
++  setnvalue(L->top, n);
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
++  lua_lock(L);
++  setnvalue(L->top, cast_num(n));
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
++  lua_lock(L);
++  luaC_checkGC(L);
++  setsvalue2s(L, L->top, luaS_newlstr(L, s, len));
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_pushstring (lua_State *L, const char *s) {
++  if (s == NULL)
++    lua_pushnil(L);
++  else
++    lua_pushlstring(L, s, strlen(s));
++}
++
++
++LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
++                                      va_list argp) {
++  const char *ret;
++  lua_lock(L);
++  luaC_checkGC(L);
++  ret = luaO_pushvfstring(L, fmt, argp);
++  lua_unlock(L);
++  return ret;
++}
++
++
++LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
++  const char *ret;
++  va_list argp;
++  lua_lock(L);
++  luaC_checkGC(L);
++  va_start(argp, fmt);
++  ret = luaO_pushvfstring(L, fmt, argp);
++  va_end(argp);
++  lua_unlock(L);
++  return ret;
++}
++
++
++LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
++  Closure *cl;
++  lua_lock(L);
++  luaC_checkGC(L);
++  api_checknelems(L, n);
++  cl = luaF_newCclosure(L, n, getcurrenv(L));
++  cl->c.f = fn;
++  L->top -= n;
++  while (n--)
++    setobj2n(L, &cl->c.upvalue[n], L->top+n);
++  setclvalue(L, L->top, cl);
++  lua_assert(iswhite(obj2gco(cl)));
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_pushboolean (lua_State *L, int b) {
++  lua_lock(L);
++  setbvalue(L->top, (b != 0));  /* ensure that true is 1 */
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
++  lua_lock(L);
++  setpvalue(L->top, p);
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API int lua_pushthread (lua_State *L) {
++  lua_lock(L);
++  setthvalue(L, L->top, L);
++  api_incr_top(L);
++  lua_unlock(L);
++  return (G(L)->mainthread == L);
++}
++
++
++
++/*
++** get functions (Lua -> stack)
++*/
++
++
++LUA_API void lua_gettable (lua_State *L, int idx) {
++  StkId t;
++  lua_lock(L);
++  t = index2adr(L, idx);
++  api_checkvalidindex(L, t);
++  luaV_gettable(L, t, L->top - 1, L->top - 1);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
++  StkId t;
++  TValue key;
++  lua_lock(L);
++  t = index2adr(L, idx);
++  api_checkvalidindex(L, t);
++  setsvalue(L, &key, luaS_new(L, k));
++  luaV_gettable(L, t, &key, L->top);
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_rawget (lua_State *L, int idx) {
++  StkId t;
++  lua_lock(L);
++  t = index2adr(L, idx);
++  api_check(L, ttistable(t));
++  setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1));
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_rawgeti (lua_State *L, int idx, int n) {
++  StkId o;
++  lua_lock(L);
++  o = index2adr(L, idx);
++  api_check(L, ttistable(o));
++  setobj2s(L, L->top, luaH_getnum(hvalue(o), n));
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_createtable (lua_State *L, int narray, int nrec) {
++  lua_lock(L);
++  luaC_checkGC(L);
++  sethvalue(L, L->top, luaH_new(L, narray, nrec));
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++LUA_API int lua_getmetatable (lua_State *L, int objindex) {
++  const TValue *obj;
++  Table *mt = NULL;
++  int res;
++  lua_lock(L);
++  obj = index2adr(L, objindex);
++  switch (ttype(obj)) {
++    case LUA_TTABLE:
++      mt = hvalue(obj)->metatable;
++      break;
++    case LUA_TUSERDATA:
++      mt = uvalue(obj)->metatable;
++      break;
++    default:
++      mt = G(L)->mt[ttype(obj)];
++      break;
++  }
++  if (mt == NULL)
++    res = 0;
++  else {
++    sethvalue(L, L->top, mt);
++    api_incr_top(L);
++    res = 1;
++  }
++  lua_unlock(L);
++  return res;
++}
++
++
++LUA_API void lua_getfenv (lua_State *L, int idx) {
++  StkId o;
++  lua_lock(L);
++  o = index2adr(L, idx);
++  api_checkvalidindex(L, o);
++  switch (ttype(o)) {
++    case LUA_TFUNCTION:
++      sethvalue(L, L->top, clvalue(o)->c.env);
++      break;
++    case LUA_TUSERDATA:
++      sethvalue(L, L->top, uvalue(o)->env);
++      break;
++    case LUA_TTHREAD:
++      setobj2s(L, L->top,  gt(thvalue(o)));
++      break;
++    default:
++      setnilvalue(L->top);
++      break;
++  }
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++/*
++** set functions (stack -> Lua)
++*/
++
++
++LUA_API void lua_settable (lua_State *L, int idx) {
++  StkId t;
++  lua_lock(L);
++  api_checknelems(L, 2);
++  t = index2adr(L, idx);
++  api_checkvalidindex(L, t);
++  luaV_settable(L, t, L->top - 2, L->top - 1);
++  L->top -= 2;  /* pop index and value */
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
++  StkId t;
++  TValue key;
++  lua_lock(L);
++  api_checknelems(L, 1);
++  t = index2adr(L, idx);
++  api_checkvalidindex(L, t);
++  setsvalue(L, &key, luaS_new(L, k));
++  luaV_settable(L, t, &key, L->top - 1);
++  L->top--;  /* pop value */
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_rawset (lua_State *L, int idx) {
++  StkId t;
++  lua_lock(L);
++  api_checknelems(L, 2);
++  t = index2adr(L, idx);
++  api_check(L, ttistable(t));
++  setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1);
++  luaC_barriert(L, hvalue(t), L->top-1);
++  L->top -= 2;
++  lua_unlock(L);
++}
++
++
++LUA_API void lua_rawseti (lua_State *L, int idx, int n) {
++  StkId o;
++  lua_lock(L);
++  api_checknelems(L, 1);
++  o = index2adr(L, idx);
++  api_check(L, ttistable(o));
++  setobj2t(L, luaH_setnum(L, hvalue(o), n), L->top-1);
++  luaC_barriert(L, hvalue(o), L->top-1);
++  L->top--;
++  lua_unlock(L);
++}
++
++
++LUA_API int lua_setmetatable (lua_State *L, int objindex) {
++  TValue *obj;
++  Table *mt;
++  lua_lock(L);
++  api_checknelems(L, 1);
++  obj = index2adr(L, objindex);
++  api_checkvalidindex(L, obj);
++  if (ttisnil(L->top - 1))
++    mt = NULL;
++  else {
++    api_check(L, ttistable(L->top - 1));
++    mt = hvalue(L->top - 1);
++  }
++  switch (ttype(obj)) {
++    case LUA_TTABLE: {
++      hvalue(obj)->metatable = mt;
++      if (mt)
++        luaC_objbarriert(L, hvalue(obj), mt);
++      break;
++    }
++    case LUA_TUSERDATA: {
++      uvalue(obj)->metatable = mt;
++      if (mt)
++        luaC_objbarrier(L, rawuvalue(obj), mt);
++      break;
++    }
++    default: {
++      G(L)->mt[ttype(obj)] = mt;
++      break;
++    }
++  }
++  L->top--;
++  lua_unlock(L);
++  return 1;
++}
++
++
++LUA_API int lua_setfenv (lua_State *L, int idx) {
++  StkId o;
++  int res = 1;
++  lua_lock(L);
++  api_checknelems(L, 1);
++  o = index2adr(L, idx);
++  api_checkvalidindex(L, o);
++  api_check(L, ttistable(L->top - 1));
++  switch (ttype(o)) {
++    case LUA_TFUNCTION:
++      clvalue(o)->c.env = hvalue(L->top - 1);
++      break;
++    case LUA_TUSERDATA:
++      uvalue(o)->env = hvalue(L->top - 1);
++      break;
++    case LUA_TTHREAD:
++      sethvalue(L, gt(thvalue(o)), hvalue(L->top - 1));
++      break;
++    default:
++      res = 0;
++      break;
++  }
++  if (res) luaC_objbarrier(L, gcvalue(o), hvalue(L->top - 1));
++  L->top--;
++  lua_unlock(L);
++  return res;
++}
++
++
++/*
++** `load' and `call' functions (run Lua code)
++*/
++
++
++#define adjustresults(L,nres) \
++    { if (nres == LUA_MULTRET && L->top >= L->ci->top) L->ci->top = L->top; }
++
++
++#define checkresults(L,na,nr) \
++     api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)))
++	
++
++LUA_API void lua_call (lua_State *L, int nargs, int nresults) {
++  StkId func;
++  lua_lock(L);
++  api_checknelems(L, nargs+1);
++  checkresults(L, nargs, nresults);
++  func = L->top - (nargs+1);
++  luaD_call(L, func, nresults);
++  adjustresults(L, nresults);
++  lua_unlock(L);
++}
++
++
++
++/*
++** Execute a protected call.
++*/
++struct CallS {  /* data to `f_call' */
++  StkId func;
++  int nresults;
++};
++
++
++static void f_call (lua_State *L, void *ud) {
++  struct CallS *c = cast(struct CallS *, ud);
++  luaD_call(L, c->func, c->nresults);
++}
++
++
++
++LUA_API int lua_pcall (lua_State *L, int nargs, int nresults, int errfunc) {
++  struct CallS c;
++  int status;
++  ptrdiff_t func;
++  lua_lock(L);
++  api_checknelems(L, nargs+1);
++  checkresults(L, nargs, nresults);
++  if (errfunc == 0)
++    func = 0;
++  else {
++    StkId o = index2adr(L, errfunc);
++    api_checkvalidindex(L, o);
++    func = savestack(L, o);
++  }
++  c.func = L->top - (nargs+1);  /* function to be called */
++  c.nresults = nresults;
++  status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
++  adjustresults(L, nresults);
++  lua_unlock(L);
++  return status;
++}
++
++
++/*
++** Execute a protected C call.
++*/
++struct CCallS {  /* data to `f_Ccall' */
++  lua_CFunction func;
++  void *ud;
++};
++
++
++static void f_Ccall (lua_State *L, void *ud) {
++  struct CCallS *c = cast(struct CCallS *, ud);
++  Closure *cl;
++  cl = luaF_newCclosure(L, 0, getcurrenv(L));
++  cl->c.f = c->func;
++  setclvalue(L, L->top, cl);  /* push function */
++  api_incr_top(L);
++  setpvalue(L->top, c->ud);  /* push only argument */
++  api_incr_top(L);
++  luaD_call(L, L->top - 2, 0);
++}
++
++
++LUA_API int lua_cpcall (lua_State *L, lua_CFunction func, void *ud) {
++  struct CCallS c;
++  int status;
++  lua_lock(L);
++  c.func = func;
++  c.ud = ud;
++  status = luaD_pcall(L, f_Ccall, &c, savestack(L, L->top), 0);
++  lua_unlock(L);
++  return status;
++}
++
++
++LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
++                      const char *chunkname) {
++  ZIO z;
++  int status;
++  lua_lock(L);
++  if (!chunkname) chunkname = "?";
++  luaZ_init(L, &z, reader, data);
++  status = luaD_protectedparser(L, &z, chunkname);
++  lua_unlock(L);
++  return status;
++}
++
++
++LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data) {
++  int status;
++  TValue *o;
++  lua_lock(L);
++  api_checknelems(L, 1);
++  o = L->top - 1;
++  if (isLfunction(o))
++    status = luaU_dump(L, clvalue(o)->l.p, writer, data, 0);
++  else
++    status = 1;
++  lua_unlock(L);
++  return status;
++}
++
++
++LUA_API int  lua_status (lua_State *L) {
++  return L->status;
++}
++
++
++/*
++** Garbage-collection function
++*/
++
++LUA_API int lua_gc (lua_State *L, int what, int data) {
++  int res = 0;
++  global_State *g;
++  lua_lock(L);
++  g = G(L);
++  switch (what) {
++    case LUA_GCSTOP: {
++      g->GCthreshold = MAX_LUMEM;
++      break;
++    }
++    case LUA_GCRESTART: {
++      g->GCthreshold = g->totalbytes;
++      break;
++    }
++    case LUA_GCCOLLECT: {
++      luaC_fullgc(L);
++      break;
++    }
++    case LUA_GCCOUNT: {
++      /* GC values are expressed in Kbytes: #bytes/2^10 */
++      res = cast_int(g->totalbytes >> 10);
++      break;
++    }
++    case LUA_GCCOUNTB: {
++      res = cast_int(g->totalbytes & 0x3ff);
++      break;
++    }
++    case LUA_GCSTEP: {
++      lu_mem a = (cast(lu_mem, data) << 10);
++      if (a <= g->totalbytes)
++        g->GCthreshold = g->totalbytes - a;
++      else
++        g->GCthreshold = 0;
++      while (g->GCthreshold <= g->totalbytes) {
++        luaC_step(L);
++        if (g->gcstate == GCSpause) {  /* end of cycle? */
++          res = 1;  /* signal it */
++          break;
++        }
++      }
++      break;
++    }
++    case LUA_GCSETPAUSE: {
++      res = g->gcpause;
++      g->gcpause = data;
++      break;
++    }
++    case LUA_GCSETSTEPMUL: {
++      res = g->gcstepmul;
++      g->gcstepmul = data;
++      break;
++    }
++    default: res = -1;  /* invalid option */
++  }
++  lua_unlock(L);
++  return res;
++}
++
++
++
++/*
++** miscellaneous functions
++*/
++
++
++LUA_API int lua_error (lua_State *L) {
++  lua_lock(L);
++  api_checknelems(L, 1);
++  luaG_errormsg(L);
++  lua_unlock(L);
++  return 0;  /* to avoid warnings */
++}
++
++
++LUA_API int lua_next (lua_State *L, int idx) {
++  StkId t;
++  int more;
++  lua_lock(L);
++  t = index2adr(L, idx);
++  api_check(L, ttistable(t));
++  more = luaH_next(L, hvalue(t), L->top - 1);
++  if (more) {
++    api_incr_top(L);
++  }
++  else  /* no more elements */
++    L->top -= 1;  /* remove key */
++  lua_unlock(L);
++  return more;
++}
++
++
++LUA_API void lua_concat (lua_State *L, int n) {
++  lua_lock(L);
++  api_checknelems(L, n);
++  if (n >= 2) {
++    luaC_checkGC(L);
++    luaV_concat(L, n, cast_int(L->top - L->base) - 1);
++    L->top -= (n-1);
++  }
++  else if (n == 0) {  /* push empty string */
++    setsvalue2s(L, L->top, luaS_newlstr(L, "", 0));
++    api_incr_top(L);
++  }
++  /* else n == 1; nothing to do */
++  lua_unlock(L);
++}
++
++
++LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) {
++  lua_Alloc f;
++  lua_lock(L);
++  if (ud) *ud = G(L)->ud;
++  f = G(L)->frealloc;
++  lua_unlock(L);
++  return f;
++}
++
++
++LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) {
++  lua_lock(L);
++  G(L)->ud = ud;
++  G(L)->frealloc = f;
++  lua_unlock(L);
++}
++
++
++LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
++  Udata *u;
++  lua_lock(L);
++  luaC_checkGC(L);
++  u = luaS_newudata(L, size, getcurrenv(L));
++  setuvalue(L, L->top, u);
++  api_incr_top(L);
++  lua_unlock(L);
++  return u + 1;
++}
++
++
++
++
++static const char *aux_upvalue (StkId fi, int n, TValue **val) {
++  Closure *f;
++  if (!ttisfunction(fi)) return NULL;
++  f = clvalue(fi);
++  if (f->c.isC) {
++    if (!(1 <= n && n <= f->c.nupvalues)) return NULL;
++    *val = &f->c.upvalue[n-1];
++    return "";
++  }
++  else {
++    Proto *p = f->l.p;
++    if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
++    *val = f->l.upvals[n-1]->v;
++    return getstr(p->upvalues[n-1]);
++  }
++}
++
++
++LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) {
++  const char *name;
++  TValue *val;
++  lua_lock(L);
++  name = aux_upvalue(index2adr(L, funcindex), n, &val);
++  if (name) {
++    setobj2s(L, L->top, val);
++    api_incr_top(L);
++  }
++  lua_unlock(L);
++  return name;
++}
++
++
++LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
++  const char *name;
++  TValue *val;
++  StkId fi;
++  lua_lock(L);
++  fi = index2adr(L, funcindex);
++  api_checknelems(L, 1);
++  name = aux_upvalue(fi, n, &val);
++  if (name) {
++    L->top--;
++    setobj(L, val, L->top);
++    luaC_barrier(L, clvalue(fi), L->top);
++  }
++  lua_unlock(L);
++  return name;
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lapi.h
+@@ -0,0 +1,16 @@
++/*
++** $Id: lapi.h,v 2.2.1.1 2007/12/27 13:02:25 roberto Exp $
++** Auxiliary functions from Lua API
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lapi_h
++#define lapi_h
++
++
++#include "lobject.h"
++
++
++LUAI_FUNC void luaA_pushobject (lua_State *L, const TValue *o);
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lauxlib.c
+@@ -0,0 +1,674 @@
++/*
++** $Id: lauxlib.c,v 1.159.1.3 2008/01/21 13:20:51 roberto Exp $
++** Auxiliary functions for building Lua libraries
++** See Copyright Notice in lua.h
++*/
++
++#include <stdarg.h>
++
++#if !defined(__KERNEL__)
++#include <ctype.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#else
++#include <linux/ctype.h>
++#include <linux/errno.h>
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#endif
++
++/* This file uses only the official API of Lua.
++** Any function declared here could be written as an application function.
++*/
++
++#define lauxlib_c
++#define LUA_LIB
++
++#include "lua.h"
++
++#include "lauxlib.h"
++
++
++#define FREELIST_REF	0	/* free list of references */
++
++
++/* convert a stack index to positive */
++#define abs_index(L, i)		((i) > 0 || (i) <= LUA_REGISTRYINDEX ? (i) : \
++					lua_gettop(L) + (i) + 1)
++
++
++/*
++** {======================================================
++** Error-report functions
++** =======================================================
++*/
++
++
++LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
++  lua_Debug ar;
++  if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
++    return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
++  lua_getinfo(L, "n", &ar);
++  if (strcmp(ar.namewhat, "method") == 0) {
++    narg--;  /* do not count `self' */
++    if (narg == 0)  /* error is in the self argument itself? */
++      return luaL_error(L, "calling " LUA_QS " on bad self (%s)",
++                           ar.name, extramsg);
++  }
++  if (ar.name == NULL)
++    ar.name = "?";
++  return luaL_error(L, "bad argument #%d to " LUA_QS " (%s)",
++                        narg, ar.name, extramsg);
++}
++
++
++LUALIB_API int luaL_typerror (lua_State *L, int narg, const char *tname) {
++  const char *msg = lua_pushfstring(L, "%s expected, got %s",
++                                    tname, luaL_typename(L, narg));
++  return luaL_argerror(L, narg, msg);
++}
++
++
++static void tag_error (lua_State *L, int narg, int tag) {
++  luaL_typerror(L, narg, lua_typename(L, tag));
++}
++
++
++LUALIB_API void luaL_where (lua_State *L, int level) {
++  lua_Debug ar;
++  if (lua_getstack(L, level, &ar)) {  /* check function at level */
++    lua_getinfo(L, "Sl", &ar);  /* get info about it */
++    if (ar.currentline > 0) {  /* is there info? */
++      lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
++      return;
++    }
++  }
++  lua_pushliteral(L, "");  /* else, no information available... */
++}
++
++
++LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
++  va_list argp;
++  va_start(argp, fmt);
++  luaL_where(L, 1);
++  lua_pushvfstring(L, fmt, argp);
++  va_end(argp);
++  lua_concat(L, 2);
++  return lua_error(L);
++}
++
++/* }====================================================== */
++
++
++LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def,
++                                 const char *const lst[]) {
++  const char *name = (def) ? luaL_optstring(L, narg, def) :
++                             luaL_checkstring(L, narg);
++  int i;
++  for (i=0; lst[i]; i++)
++    if (strcmp(lst[i], name) == 0)
++      return i;
++  return luaL_argerror(L, narg,
++                       lua_pushfstring(L, "invalid option " LUA_QS, name));
++}
++
++
++LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
++  lua_getfield(L, LUA_REGISTRYINDEX, tname);  /* get registry.name */
++  if (!lua_isnil(L, -1))  /* name already in use? */
++    return 0;  /* leave previous value on top, but return 0 */
++  lua_pop(L, 1);
++  lua_newtable(L);  /* create metatable */
++  lua_pushvalue(L, -1);
++  lua_setfield(L, LUA_REGISTRYINDEX, tname);  /* registry.name = metatable */
++  return 1;
++}
++
++
++LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
++  void *p = lua_touserdata(L, ud);
++  if (p != NULL) {  /* value is a userdata? */
++    if (lua_getmetatable(L, ud)) {  /* does it have a metatable? */
++      lua_getfield(L, LUA_REGISTRYINDEX, tname);  /* get correct metatable */
++      if (lua_rawequal(L, -1, -2)) {  /* does it have the correct mt? */
++        lua_pop(L, 2);  /* remove both metatables */
++        return p;
++      }
++    }
++  }
++  luaL_typerror(L, ud, tname);  /* else error */
++  return NULL;  /* to avoid warnings */
++}
++
++
++LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *mes) {
++  if (!lua_checkstack(L, space))
++    luaL_error(L, "stack overflow (%s)", mes);
++}
++
++
++LUALIB_API void luaL_checktype (lua_State *L, int narg, int t) {
++  if (lua_type(L, narg) != t)
++    tag_error(L, narg, t);
++}
++
++
++LUALIB_API void luaL_checkany (lua_State *L, int narg) {
++  if (lua_type(L, narg) == LUA_TNONE)
++    luaL_argerror(L, narg, "value expected");
++}
++
++
++LUALIB_API const char *luaL_checklstring (lua_State *L, int narg, size_t *len) {
++  const char *s = lua_tolstring(L, narg, len);
++  if (!s) tag_error(L, narg, LUA_TSTRING);
++  return s;
++}
++
++
++LUALIB_API const char *luaL_optlstring (lua_State *L, int narg,
++                                        const char *def, size_t *len) {
++  if (lua_isnoneornil(L, narg)) {
++    if (len)
++      *len = (def ? strlen(def) : 0);
++    return def;
++  }
++  else return luaL_checklstring(L, narg, len);
++}
++
++
++LUALIB_API lua_Number luaL_checknumber (lua_State *L, int narg) {
++  lua_Number d = lua_tonumber(L, narg);
++  if (d == 0 && !lua_isnumber(L, narg))  /* avoid extra test when d is not 0 */
++    tag_error(L, narg, LUA_TNUMBER);
++  return d;
++}
++
++
++LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) {
++  return luaL_opt(L, luaL_checknumber, narg, def);
++}
++
++
++LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) {
++  lua_Integer d = lua_tointeger(L, narg);
++  if (d == 0 && !lua_isnumber(L, narg))  /* avoid extra test when d is not 0 */
++    tag_error(L, narg, LUA_TNUMBER);
++  return d;
++}
++
++
++LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int narg,
++                                                      lua_Integer def) {
++  return luaL_opt(L, luaL_checkinteger, narg, def);
++}
++
++
++LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
++  if (!lua_getmetatable(L, obj))  /* no metatable? */
++    return 0;
++  lua_pushstring(L, event);
++  lua_rawget(L, -2);
++  if (lua_isnil(L, -1)) {
++    lua_pop(L, 2);  /* remove metatable and metafield */
++    return 0;
++  }
++  else {
++    lua_remove(L, -2);  /* remove only metatable */
++    return 1;
++  }
++}
++
++
++LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
++  obj = abs_index(L, obj);
++  if (!luaL_getmetafield(L, obj, event))  /* no metafield? */
++    return 0;
++  lua_pushvalue(L, obj);
++  lua_call(L, 1, 1);
++  return 1;
++}
++
++
++LUALIB_API void (luaL_register) (lua_State *L, const char *libname,
++                                const luaL_Reg *l) {
++  luaI_openlib(L, libname, l, 0);
++}
++
++
++static int libsize (const luaL_Reg *l) {
++  int size = 0;
++  for (; l->name; l++) size++;
++  return size;
++}
++
++
++LUALIB_API void luaI_openlib (lua_State *L, const char *libname,
++                              const luaL_Reg *l, int nup) {
++  if (libname) {
++    int size = libsize(l);
++    /* check whether lib already exists */
++    luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1);
++    lua_getfield(L, -1, libname);  /* get _LOADED[libname] */
++    if (!lua_istable(L, -1)) {  /* not found? */
++      lua_pop(L, 1);  /* remove previous result */
++      /* try global variable (and create one if it does not exist) */
++      if (luaL_findtable(L, LUA_GLOBALSINDEX, libname, size) != NULL)
++        luaL_error(L, "name conflict for module " LUA_QS, libname);
++      lua_pushvalue(L, -1);
++      lua_setfield(L, -3, libname);  /* _LOADED[libname] = new table */
++    }
++    lua_remove(L, -2);  /* remove _LOADED table */
++    lua_insert(L, -(nup+1));  /* move library table to below upvalues */
++  }
++  for (; l->name; l++) {
++    int i;
++    for (i=0; i<nup; i++)  /* copy upvalues to the top */
++      lua_pushvalue(L, -nup);
++    lua_pushcclosure(L, l->func, nup);
++    lua_setfield(L, -(nup+2), l->name);
++  }
++  lua_pop(L, nup);  /* remove upvalues */
++}
++
++
++
++/*
++** {======================================================
++** getn-setn: size for arrays
++** =======================================================
++*/
++
++#if defined(LUA_COMPAT_GETN)
++
++static int checkint (lua_State *L, int topop) {
++  int n = (lua_type(L, -1) == LUA_TNUMBER) ? lua_tointeger(L, -1) : -1;
++  lua_pop(L, topop);
++  return n;
++}
++
++
++static void getsizes (lua_State *L) {
++  lua_getfield(L, LUA_REGISTRYINDEX, "LUA_SIZES");
++  if (lua_isnil(L, -1)) {  /* no `size' table? */
++    lua_pop(L, 1);  /* remove nil */
++    lua_newtable(L);  /* create it */
++    lua_pushvalue(L, -1);  /* `size' will be its own metatable */
++    lua_setmetatable(L, -2);
++    lua_pushliteral(L, "kv");
++    lua_setfield(L, -2, "__mode");  /* metatable(N).__mode = "kv" */
++    lua_pushvalue(L, -1);
++    lua_setfield(L, LUA_REGISTRYINDEX, "LUA_SIZES");  /* store in register */
++  }
++}
++
++
++LUALIB_API void luaL_setn (lua_State *L, int t, int n) {
++  t = abs_index(L, t);
++  lua_pushliteral(L, "n");
++  lua_rawget(L, t);
++  if (checkint(L, 1) >= 0) {  /* is there a numeric field `n'? */
++    lua_pushliteral(L, "n");  /* use it */
++    lua_pushinteger(L, n);
++    lua_rawset(L, t);
++  }
++  else {  /* use `sizes' */
++    getsizes(L);
++    lua_pushvalue(L, t);
++    lua_pushinteger(L, n);
++    lua_rawset(L, -3);  /* sizes[t] = n */
++    lua_pop(L, 1);  /* remove `sizes' */
++  }
++}
++
++
++LUALIB_API int luaL_getn (lua_State *L, int t) {
++  int n;
++  t = abs_index(L, t);
++  lua_pushliteral(L, "n");  /* try t.n */
++  lua_rawget(L, t);
++  if ((n = checkint(L, 1)) >= 0) return n;
++  getsizes(L);  /* else try sizes[t] */
++  lua_pushvalue(L, t);
++  lua_rawget(L, -2);
++  if ((n = checkint(L, 2)) >= 0) return n;
++  return (int)lua_objlen(L, t);
++}
++
++#endif
++
++/* }====================================================== */
++
++
++
++LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p,
++                                                               const char *r) {
++  const char *wild;
++  size_t l = strlen(p);
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "luaL_gsub: cannot allocate memory");
++  luaL_buffinit(L, b);
++  while ((wild = strstr(s, p)) != NULL) {
++    luaL_addlstring(b, s, wild - s);  /* push prefix */
++    luaL_addstring(b, r);  /* push replacement in place of pattern */
++    s = wild + l;  /* continue after `p' */
++  }
++  luaL_addstring(b, s);  /* push last suffix */
++  luaL_pushresult(b);
++  kfree(b);
++  return lua_tostring(L, -1);
++}
++
++
++LUALIB_API const char *luaL_findtable (lua_State *L, int idx,
++                                       const char *fname, int szhint) {
++  const char *e;
++  lua_pushvalue(L, idx);
++  do {
++    e = strchr(fname, '.');
++    if (e == NULL) e = fname + strlen(fname);
++    lua_pushlstring(L, fname, e - fname);
++    lua_rawget(L, -2);
++    if (lua_isnil(L, -1)) {  /* no such field? */
++      lua_pop(L, 1);  /* remove this nil */
++      lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */
++      lua_pushlstring(L, fname, e - fname);
++      lua_pushvalue(L, -2);
++      lua_settable(L, -4);  /* set new table into field */
++    }
++    else if (!lua_istable(L, -1)) {  /* field has a non-table value? */
++      lua_pop(L, 2);  /* remove table and value */
++      return fname;  /* return problematic part of the name */
++    }
++    lua_remove(L, -2);  /* remove previous table */
++    fname = e + 1;
++  } while (*e == '.');
++  return NULL;
++}
++
++
++
++/*
++** {======================================================
++** Generic Buffer manipulation
++** =======================================================
++*/
++
++
++#define bufflen(B)	((B)->p - (B)->buffer)
++#define bufffree(B)	((size_t)(LUAL_BUFFERSIZE - bufflen(B)))
++
++#define LIMIT	(LUA_MINSTACK/2)
++
++
++static int emptybuffer (luaL_Buffer *B) {
++  size_t l = bufflen(B);
++  if (l == 0) return 0;  /* put nothing on stack */
++  else {
++    lua_pushlstring(B->L, B->buffer, l);
++    B->p = B->buffer;
++    B->lvl++;
++    return 1;
++  }
++}
++
++
++static void adjuststack (luaL_Buffer *B) {
++  if (B->lvl > 1) {
++    lua_State *L = B->L;
++    int toget = 1;  /* number of levels to concat */
++    size_t toplen = lua_strlen(L, -1);
++    do {
++      size_t l = lua_strlen(L, -(toget+1));
++      if (B->lvl - toget + 1 >= LIMIT || toplen > l) {
++        toplen += l;
++        toget++;
++      }
++      else break;
++    } while (toget < B->lvl);
++    lua_concat(L, toget);
++    B->lvl = B->lvl - toget + 1;
++  }
++}
++
++
++LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) {
++  if (emptybuffer(B))
++    adjuststack(B);
++  return B->buffer;
++}
++
++
++LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
++  while (l--)
++    luaL_addchar(B, *s++);
++}
++
++
++LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
++  luaL_addlstring(B, s, strlen(s));
++}
++
++
++LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
++  emptybuffer(B);
++  lua_concat(B->L, B->lvl);
++  B->lvl = 1;
++}
++
++
++LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
++  lua_State *L = B->L;
++  size_t vl;
++  const char *s = lua_tolstring(L, -1, &vl);
++  if (vl <= bufffree(B)) {  /* fit into buffer? */
++    memcpy(B->p, s, vl);  /* put it there */
++    B->p += vl;
++    lua_pop(L, 1);  /* remove from stack */
++  }
++  else {
++    if (emptybuffer(B))
++      lua_insert(L, -2);  /* put buffer before new value */
++    B->lvl++;  /* add new value into B stack */
++    adjuststack(B);
++  }
++}
++
++
++LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
++  B->L = L;
++  B->p = B->buffer;
++  B->lvl = 0;
++}
++
++/* }====================================================== */
++
++
++LUALIB_API int luaL_ref (lua_State *L, int t) {
++  int ref;
++  t = abs_index(L, t);
++  if (lua_isnil(L, -1)) {
++    lua_pop(L, 1);  /* remove from stack */
++    return LUA_REFNIL;  /* `nil' has a unique fixed reference */
++  }
++  lua_rawgeti(L, t, FREELIST_REF);  /* get first free element */
++  ref = (int)lua_tointeger(L, -1);  /* ref = t[FREELIST_REF] */
++  lua_pop(L, 1);  /* remove it from stack */
++  if (ref != 0) {  /* any free element? */
++    lua_rawgeti(L, t, ref);  /* remove it from list */
++    lua_rawseti(L, t, FREELIST_REF);  /* (t[FREELIST_REF] = t[ref]) */
++  }
++  else {  /* no free elements */
++    ref = (int)lua_objlen(L, t);
++    ref++;  /* create new reference */
++  }
++  lua_rawseti(L, t, ref);
++  return ref;
++}
++
++
++LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
++  if (ref >= 0) {
++    t = abs_index(L, t);
++    lua_rawgeti(L, t, FREELIST_REF);
++    lua_rawseti(L, t, ref);  /* t[ref] = t[FREELIST_REF] */
++    lua_pushinteger(L, ref);
++    lua_rawseti(L, t, FREELIST_REF);  /* t[FREELIST_REF] = ref */
++  }
++}
++
++
++
++/*
++** {======================================================
++** Load functions
++** =======================================================
++*/
++
++#if !defined(__KERNEL__)
++typedef struct LoadF {
++  int extraline;
++  FILE *f;
++  char buff[LUAL_BUFFERSIZE];
++} LoadF;
++
++
++static const char *getF (lua_State *L, void *ud, size_t *size) {
++  LoadF *lf = (LoadF *)ud;
++  (void)L;
++  if (lf->extraline) {
++    lf->extraline = 0;
++    *size = 1;
++    return "\n";
++  }
++  if (feof(lf->f)) return NULL;
++  *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);
++  return (*size > 0) ? lf->buff : NULL;
++}
++
++
++static int errfile (lua_State *L, const char *what, int fnameindex) {
++  const char *serr = strerror(errno);
++  const char *filename = lua_tostring(L, fnameindex) + 1;
++  lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
++  lua_remove(L, fnameindex);
++  return LUA_ERRFILE;
++}
++
++
++LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
++  LoadF lf;
++  int status, readstatus;
++  int c;
++  int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
++  lf.extraline = 0;
++  if (filename == NULL) {
++    lua_pushliteral(L, "=stdin");
++    lf.f = stdin;
++  }
++  else {
++    lua_pushfstring(L, "@%s", filename);
++    lf.f = fopen(filename, "r");
++    if (lf.f == NULL) return errfile(L, "open", fnameindex);
++  }
++  c = getc(lf.f);
++  if (c == '#') {  /* Unix exec. file? */
++    lf.extraline = 1;
++    while ((c = getc(lf.f)) != EOF && c != '\n') ;  /* skip first line */
++    if (c == '\n') c = getc(lf.f);
++  }
++  if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
++    lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
++    if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
++    /* skip eventual `#!...' */
++   while ((c = getc(lf.f)) != EOF && c != LUA_SIGNATURE[0]) ;
++    lf.extraline = 0;
++  }
++  ungetc(c, lf.f);
++  status = lua_load(L, getF, &lf, lua_tostring(L, -1));
++  readstatus = ferror(lf.f);
++  if (filename) fclose(lf.f);  /* close file (even in case of errors) */
++  if (readstatus) {
++    lua_settop(L, fnameindex);  /* ignore results from `lua_load' */
++    return errfile(L, "read", fnameindex);
++  }
++  lua_remove(L, fnameindex);
++  return status;
++}
++#endif
++
++typedef struct LoadS {
++  const char *s;
++  size_t size;
++} LoadS;
++
++
++static const char *getS (lua_State *L, void *ud, size_t *size) {
++  LoadS *ls = (LoadS *)ud;
++  (void)L;
++  if (ls->size == 0) return NULL;
++  *size = ls->size;
++  ls->size = 0;
++  return ls->s;
++}
++
++
++LUALIB_API int luaL_loadbuffer (lua_State *L, const char *buff, size_t size,
++                                const char *name) {
++  LoadS ls;
++  ls.s = buff;
++  ls.size = size;
++  return lua_load(L, getS, &ls, name);
++}
++
++
++LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s) {
++  return luaL_loadbuffer(L, s, strlen(s), s);
++}
++
++
++
++/* }====================================================== */
++
++
++static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
++  (void)ud;
++  (void)osize;
++  if (nsize == 0) {
++#if !defined(__KERNEL__)
++    free(ptr);
++#else
++    kfree(ptr);
++#endif
++    return NULL;
++  }
++  else
++#if !defined(__KERNEL__)
++    return realloc(ptr, nsize);
++#else
++    return krealloc(ptr, nsize, GFP_ATOMIC);
++#endif
++}
++
++
++static int lpanic (lua_State *L) {
++  (void)L;  /* to avoid warnings */
++#if !defined(__KERNEL__)
++  fprintf(stderr, "PANIC: unprotected error in call to Lua API (%s)\n",
++#else
++  printk( "PANIC: unprotected error in call to Lua API (%s)\n",
++#endif
++                   lua_tostring(L, -1));
++  return 0;
++}
++
++
++LUALIB_API lua_State *luaL_newstate (void) {
++  lua_State *L = lua_newstate(l_alloc, NULL);
++  if (L) lua_atpanic(L, &lpanic);
++  return L;
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lauxlib.h
+@@ -0,0 +1,184 @@
++/*
++** $Id: lauxlib.h,v 1.88.1.1 2007/12/27 13:02:25 roberto Exp $
++** Auxiliary functions for building Lua libraries
++** See Copyright Notice in lua.h
++*/
++
++
++#ifndef lauxlib_h
++#define lauxlib_h
++
++
++#include <stddef.h>
++#include <linux/slab.h>	/* for kmalloc and kfree when allocating luaL_Buffer */
++
++#if !defined(__KERNEL__)
++#include <stdio.h>
++#endif
++
++#include "lua.h"
++
++
++#if defined(LUA_COMPAT_GETN)
++LUALIB_API int (luaL_getn) (lua_State *L, int t);
++LUALIB_API void (luaL_setn) (lua_State *L, int t, int n);
++#else
++#define luaL_getn(L,i)          ((int)lua_objlen(L, i))
++#define luaL_setn(L,i,j)        ((void)0)  /* no op! */
++#endif
++
++#if defined(LUA_COMPAT_OPENLIB)
++#define luaI_openlib	luaL_openlib
++#endif
++
++
++/* extra error code for `luaL_load' */
++#define LUA_ERRFILE     (LUA_ERRERR+1)
++
++
++typedef struct luaL_Reg {
++  const char *name;
++  lua_CFunction func;
++} luaL_Reg;
++
++
++
++LUALIB_API void (luaI_openlib) (lua_State *L, const char *libname,
++                                const luaL_Reg *l, int nup);
++LUALIB_API void (luaL_register) (lua_State *L, const char *libname,
++                                const luaL_Reg *l);
++LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
++LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
++LUALIB_API int (luaL_typerror) (lua_State *L, int narg, const char *tname);
++LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
++LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg,
++                                                          size_t *l);
++LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
++                                          const char *def, size_t *l);
++LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
++LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
++
++LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
++LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
++                                          lua_Integer def);
++
++LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
++LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
++LUALIB_API void (luaL_checkany) (lua_State *L, int narg);
++
++LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
++LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
++
++LUALIB_API void (luaL_where) (lua_State *L, int lvl);
++LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
++
++LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
++                                   const char *const lst[]);
++
++LUALIB_API int (luaL_ref) (lua_State *L, int t);
++LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
++
++#if !defined(__KERNEL__)
++LUALIB_API int (luaL_loadfile) (lua_State *L, const char *filename);
++#endif
++
++LUALIB_API int (luaL_loadbuffer) (lua_State *L, const char *buff, size_t sz,
++                                  const char *name);
++LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
++
++LUALIB_API lua_State *(luaL_newstate) (void);
++
++
++LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
++                                                  const char *r);
++
++LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx,
++                                         const char *fname, int szhint);
++
++
++
++
++/*
++** ===============================================================
++** some useful macros
++** ===============================================================
++*/
++
++#define luaL_argcheck(L, cond,numarg,extramsg)	\
++		((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
++#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
++#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
++#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
++#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
++#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
++#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
++
++#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
++
++#if !defined(__KERNEL__)
++#define luaL_dofile(L, fn) \
++	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
++#endif
++
++#define luaL_dostring(L, s) \
++	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
++
++#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
++
++#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
++
++/*
++** {======================================================
++** Generic Buffer manipulation
++** =======================================================
++*/
++
++
++
++typedef struct luaL_Buffer {
++  char *p;			/* current position in buffer */
++  int lvl;  /* number of strings in the stack (level) */
++  lua_State *L;
++  char buffer[LUAL_BUFFERSIZE];
++} luaL_Buffer;
++
++#define luaL_addchar(B,c) \
++  ((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \
++   (*(B)->p++ = (char)(c)))
++
++/* compatibility only */
++#define luaL_putchar(B,c)	luaL_addchar(B,c)
++
++#define luaL_addsize(B,n)	((B)->p += (n))
++
++
++LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
++LUALIB_API char *(luaL_prepbuffer) (luaL_Buffer *B);
++LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
++LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
++LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
++LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
++
++
++/* }====================================================== */
++
++
++/* compatibility with ref system */
++
++/* pre-defined references */
++#define LUA_NOREF       (-2)
++#define LUA_REFNIL      (-1)
++
++#define lua_ref(L,lock) ((lock) ? luaL_ref(L, LUA_REGISTRYINDEX) : \
++      (lua_pushstring(L, "unlocked references are obsolete"), lua_error(L), 0))
++
++#define lua_unref(L,ref)        luaL_unref(L, LUA_REGISTRYINDEX, (ref))
++
++#define lua_getref(L,ref)       lua_rawgeti(L, LUA_REGISTRYINDEX, (ref))
++
++
++#define luaL_reg	luaL_Reg
++
++#endif
++
++
+--- /dev/null
++++ b/extensions/LUA/lua/lbaselib.c
+@@ -0,0 +1,647 @@
++/*
++** $Id: lbaselib.c,v 1.191.1.6 2008/02/14 16:46:22 roberto Exp $
++** Basic library
++** See Copyright Notice in lua.h
++*/
++
++
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/string.h>
++
++#define lbaselib_c
++#define LUA_LIB
++
++#include "lua.h"
++
++#include "lauxlib.h"
++#include "lualib.h"
++
++
++
++
++/*
++** If your system does not support `stdout', you can just remove this function.
++** If you need, you can define your own `print' function, following this
++** model but changing `fputs' to put the strings at a proper place
++** (a console window or a log file, for instance).
++*/
++static int luaB_print (lua_State *L) {
++  int n = lua_gettop(L);  /* number of arguments */
++  int i;
++  lua_getglobal(L, "tostring");
++  for (i=1; i<=n; i++) {
++    const char *s;
++    lua_pushvalue(L, -1);  /* function to be called */
++    lua_pushvalue(L, i);   /* value to print */
++    lua_call(L, 1, 1);
++    s = lua_tostring(L, -1);  /* get result */
++    if (s == NULL)
++      return luaL_error(L, LUA_QL("tostring") " must return a string to "
++                           LUA_QL("print"));
++    printk(KERN_INFO "LUA[print]: %s", s);
++    lua_pop(L, 1);  /* pop result */
++  }
++  return 0;
++}
++
++
++static int luaB_tonumber (lua_State *L) {
++  int base = luaL_optint(L, 2, 10);
++  if (base == 10) {  /* standard conversion */
++    luaL_checkany(L, 1);
++    if (lua_isnumber(L, 1)) {
++      lua_pushnumber(L, lua_tonumber(L, 1));
++      return 1;
++    }
++  }
++  else {
++    const char *s1 = luaL_checkstring(L, 1);
++    char *s2;
++    unsigned long n;
++    luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
++    n = simple_strtoul(s1, &s2, base);
++    if (s1 != s2) {  /* at least one valid digit? */
++      while (isspace((unsigned char)(*s2))) s2++;  /* skip trailing spaces */
++      if (*s2 == '\0') {  /* no invalid trailing characters? */
++        lua_pushnumber(L, (lua_Number)n);
++        return 1;
++      }
++    }
++  }
++  lua_pushnil(L);  /* else not a number */
++  return 1;
++}
++
++
++static int luaB_error (lua_State *L) {
++  int level = luaL_optint(L, 2, 1);
++  lua_settop(L, 1);
++  if (lua_isstring(L, 1) && level > 0) {  /* add extra information? */
++    luaL_where(L, level);
++    lua_pushvalue(L, 1);
++    lua_concat(L, 2);
++  }
++  return lua_error(L);
++}
++
++
++static int luaB_getmetatable (lua_State *L) {
++  luaL_checkany(L, 1);
++  if (!lua_getmetatable(L, 1)) {
++    lua_pushnil(L);
++    return 1;  /* no metatable */
++  }
++  luaL_getmetafield(L, 1, "__metatable");
++  return 1;  /* returns either __metatable field (if present) or metatable */
++}
++
++
++static int luaB_setmetatable (lua_State *L) {
++  int t = lua_type(L, 2);
++  luaL_checktype(L, 1, LUA_TTABLE);
++  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
++                    "nil or table expected");
++  if (luaL_getmetafield(L, 1, "__metatable"))
++    luaL_error(L, "cannot change a protected metatable");
++  lua_settop(L, 2);
++  lua_setmetatable(L, 1);
++  return 1;
++}
++
++
++static void getfunc (lua_State *L, int opt) {
++  if (lua_isfunction(L, 1)) lua_pushvalue(L, 1);
++  else {
++    lua_Debug ar;
++    int level = opt ? luaL_optint(L, 1, 1) : luaL_checkint(L, 1);
++    luaL_argcheck(L, level >= 0, 1, "level must be non-negative");
++    if (lua_getstack(L, level, &ar) == 0)
++      luaL_argerror(L, 1, "invalid level");
++    lua_getinfo(L, "f", &ar);
++    if (lua_isnil(L, -1))
++      luaL_error(L, "no function environment for tail call at level %d",
++                    level);
++  }
++}
++
++
++static int luaB_getfenv (lua_State *L) {
++  getfunc(L, 1);
++  if (lua_iscfunction(L, -1))  /* is a C function? */
++    lua_pushvalue(L, LUA_GLOBALSINDEX);  /* return the thread's global env. */
++  else
++    lua_getfenv(L, -1);
++  return 1;
++}
++
++
++static int luaB_setfenv (lua_State *L) {
++  luaL_checktype(L, 2, LUA_TTABLE);
++  getfunc(L, 0);
++  lua_pushvalue(L, 2);
++  if (lua_isnumber(L, 1) && lua_tonumber(L, 1) == 0) {
++    /* change environment of current thread */
++    lua_pushthread(L);
++    lua_insert(L, -2);
++    lua_setfenv(L, -2);
++    return 0;
++  }
++  else if (lua_iscfunction(L, -2) || lua_setfenv(L, -2) == 0)
++    luaL_error(L,
++          LUA_QL("setfenv") " cannot change environment of given object");
++  return 1;
++}
++
++
++static int luaB_rawequal (lua_State *L) {
++  luaL_checkany(L, 1);
++  luaL_checkany(L, 2);
++  lua_pushboolean(L, lua_rawequal(L, 1, 2));
++  return 1;
++}
++
++
++static int luaB_rawget (lua_State *L) {
++  luaL_checktype(L, 1, LUA_TTABLE);
++  luaL_checkany(L, 2);
++  lua_settop(L, 2);
++  lua_rawget(L, 1);
++  return 1;
++}
++
++static int luaB_rawset (lua_State *L) {
++  luaL_checktype(L, 1, LUA_TTABLE);
++  luaL_checkany(L, 2);
++  luaL_checkany(L, 3);
++  lua_settop(L, 3);
++  lua_rawset(L, 1);
++  return 1;
++}
++
++
++static int luaB_gcinfo (lua_State *L) {
++  lua_pushinteger(L, lua_getgccount(L));
++  return 1;
++}
++
++static int luaB_collectgarbage (lua_State *L) {
++  static const char *const opts[] = {"stop", "restart", "collect",
++    "count", "step", "setpause", "setstepmul", NULL};
++  static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
++    LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL};
++  int o = luaL_checkoption(L, 1, "collect", opts);
++  int ex = luaL_optint(L, 2, 0);
++  int res = lua_gc(L, optsnum[o], ex);
++  switch (optsnum[o]) {
++    case LUA_GCCOUNT: {
++      int b = lua_gc(L, LUA_GCCOUNTB, 0);
++      lua_pushnumber(L, res + ((lua_Number)b/1024));
++      return 1;
++    }
++    case LUA_GCSTEP: {
++      lua_pushboolean(L, res);
++      return 1;
++    }
++    default: {
++      lua_pushnumber(L, res);
++      return 1;
++    }
++  }
++}
++
++
++static int luaB_type (lua_State *L) {
++  luaL_checkany(L, 1);
++  lua_pushstring(L, luaL_typename(L, 1));
++  return 1;
++}
++
++
++static int luaB_next (lua_State *L) {
++  luaL_checktype(L, 1, LUA_TTABLE);
++  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
++  if (lua_next(L, 1))
++    return 2;
++  else {
++    lua_pushnil(L);
++    return 1;
++  }
++}
++
++
++static int luaB_pairs (lua_State *L) {
++  luaL_checktype(L, 1, LUA_TTABLE);
++  lua_pushvalue(L, lua_upvalueindex(1));  /* return generator, */
++  lua_pushvalue(L, 1);  /* state, */
++  lua_pushnil(L);  /* and initial value */
++  return 3;
++}
++
++
++static int ipairsaux (lua_State *L) {
++  int i = luaL_checkint(L, 2);
++  luaL_checktype(L, 1, LUA_TTABLE);
++  i++;  /* next value */
++  lua_pushinteger(L, i);
++  lua_rawgeti(L, 1, i);
++  return (lua_isnil(L, -1)) ? 0 : 2;
++}
++
++
++static int luaB_ipairs (lua_State *L) {
++  luaL_checktype(L, 1, LUA_TTABLE);
++  lua_pushvalue(L, lua_upvalueindex(1));  /* return generator, */
++  lua_pushvalue(L, 1);  /* state, */
++  lua_pushinteger(L, 0);  /* and initial value */
++  return 3;
++}
++
++
++static int load_aux (lua_State *L, int status) {
++  if (status == 0)  /* OK? */
++    return 1;
++  else {
++    lua_pushnil(L);
++    lua_insert(L, -2);  /* put before error message */
++    return 2;  /* return nil plus error message */
++  }
++}
++
++
++static int luaB_loadstring (lua_State *L) {
++  size_t l;
++  const char *s = luaL_checklstring(L, 1, &l);
++  const char *chunkname = luaL_optstring(L, 2, s);
++  return load_aux(L, luaL_loadbuffer(L, s, l, chunkname));
++}
++
++/*
++static int luaB_loadfile (lua_State *L) {
++  const char *fname = luaL_optstring(L, 1, NULL);
++  return load_aux(L, luaL_loadfile(L, fname));
++}
++*/
++
++/*
++** Reader for generic `load' function: `lua_load' uses the
++** stack for internal stuff, so the reader cannot change the
++** stack top. Instead, it keeps its resulting string in a
++** reserved slot inside the stack.
++*/
++static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
++  (void)ud;  /* to avoid warnings */
++  luaL_checkstack(L, 2, "too many nested functions");
++  lua_pushvalue(L, 1);  /* get function */
++  lua_call(L, 0, 1);  /* call it */
++  if (lua_isnil(L, -1)) {
++    *size = 0;
++    return NULL;
++  }
++  else if (lua_isstring(L, -1)) {
++    lua_replace(L, 3);  /* save string in a reserved stack slot */
++    return lua_tolstring(L, 3, size);
++  }
++  else luaL_error(L, "reader function must return a string");
++  return NULL;  /* to avoid warnings */
++}
++
++
++static int luaB_load (lua_State *L) {
++  int status;
++  const char *cname = luaL_optstring(L, 2, "=(load)");
++  luaL_checktype(L, 1, LUA_TFUNCTION);
++  lua_settop(L, 3);  /* function, eventual name, plus one reserved slot */
++  status = lua_load(L, generic_reader, NULL, cname);
++  return load_aux(L, status);
++}
++
++/*
++static int luaB_dofile (lua_State *L) {
++  const char *fname = luaL_optstring(L, 1, NULL);
++  int n = lua_gettop(L);
++  if (luaL_loadfile(L, fname) != 0) lua_error(L);
++  lua_call(L, 0, LUA_MULTRET);
++  return lua_gettop(L) - n;
++}
++*/
++
++static int luaB_assert (lua_State *L) {
++  luaL_checkany(L, 1);
++  if (!lua_toboolean(L, 1))
++    return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
++  return lua_gettop(L);
++}
++
++
++static int luaB_unpack (lua_State *L) {
++  int i, e, n;
++  luaL_checktype(L, 1, LUA_TTABLE);
++  i = luaL_optint(L, 2, 1);
++  e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1));
++  if (i > e) return 0;  /* empty range */
++  n = e - i + 1;  /* number of elements */
++  if (n <= 0 || !lua_checkstack(L, n))  /* n <= 0 means arith. overflow */
++    return luaL_error(L, "too many results to unpack");
++  lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
++  while (i++ < e)  /* push arg[i + 1...e] */
++    lua_rawgeti(L, 1, i);
++  return n;
++}
++
++
++static int luaB_select (lua_State *L) {
++  int n = lua_gettop(L);
++  if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
++    lua_pushinteger(L, n-1);
++    return 1;
++  }
++  else {
++    int i = luaL_checkint(L, 1);
++    if (i < 0) i = n + i;
++    else if (i > n) i = n;
++    luaL_argcheck(L, 1 <= i, 1, "index out of range");
++    return n - i;
++  }
++}
++
++
++static int luaB_pcall (lua_State *L) {
++  int status;
++  luaL_checkany(L, 1);
++  status = lua_pcall(L, lua_gettop(L) - 1, LUA_MULTRET, 0);
++  lua_pushboolean(L, (status == 0));
++  lua_insert(L, 1);
++  return lua_gettop(L);  /* return status + all results */
++}
++
++
++static int luaB_xpcall (lua_State *L) {
++  int status;
++  luaL_checkany(L, 2);
++  lua_settop(L, 2);
++  lua_insert(L, 1);  /* put error function under function to be called */
++  status = lua_pcall(L, 0, LUA_MULTRET, 1);
++  lua_pushboolean(L, (status == 0));
++  lua_replace(L, 1);
++  return lua_gettop(L);  /* return status + all results */
++}
++
++
++static int luaB_tostring (lua_State *L) {
++  luaL_checkany(L, 1);
++  if (luaL_callmeta(L, 1, "__tostring"))  /* is there a metafield? */
++    return 1;  /* use its value */
++  switch (lua_type(L, 1)) {
++    case LUA_TNUMBER:
++      lua_pushstring(L, lua_tostring(L, 1));
++      break;
++    case LUA_TSTRING:
++      lua_pushvalue(L, 1);
++      break;
++    case LUA_TBOOLEAN:
++      lua_pushstring(L, (lua_toboolean(L, 1) ? "true" : "false"));
++      break;
++    case LUA_TNIL:
++      lua_pushliteral(L, "nil");
++      break;
++    default:
++      lua_pushfstring(L, "%s: %p", luaL_typename(L, 1), lua_topointer(L, 1));
++      break;
++  }
++  return 1;
++}
++
++
++static int luaB_newproxy (lua_State *L) {
++  lua_settop(L, 1);
++  lua_newuserdata(L, 0);  /* create proxy */
++  if (lua_toboolean(L, 1) == 0)
++    return 1;  /* no metatable */
++  else if (lua_isboolean(L, 1)) {
++    lua_newtable(L);  /* create a new metatable `m' ... */
++    lua_pushvalue(L, -1);  /* ... and mark `m' as a valid metatable */
++    lua_pushboolean(L, 1);
++    lua_rawset(L, lua_upvalueindex(1));  /* weaktable[m] = true */
++  }
++  else {
++    int validproxy = 0;  /* to check if weaktable[metatable(u)] == true */
++    if (lua_getmetatable(L, 1)) {
++      lua_rawget(L, lua_upvalueindex(1));
++      validproxy = lua_toboolean(L, -1);
++      lua_pop(L, 1);  /* remove value */
++    }
++    luaL_argcheck(L, validproxy, 1, "boolean or proxy expected");
++    lua_getmetatable(L, 1);  /* metatable is valid; get it */
++  }
++  lua_setmetatable(L, 2);
++  return 1;
++}
++
++
++static const luaL_Reg base_funcs[] = {
++  {"assert", luaB_assert},
++  {"collectgarbage", luaB_collectgarbage},
++//  {"dofile", luaB_dofile},
++  {"error", luaB_error},
++  {"gcinfo", luaB_gcinfo},
++  {"getfenv", luaB_getfenv},
++  {"getmetatable", luaB_getmetatable},
++//  {"loadfile", luaB_loadfile},
++  {"load", luaB_load},
++  {"loadstring", luaB_loadstring},
++  {"next", luaB_next},
++  {"pcall", luaB_pcall},
++  {"print", luaB_print},
++  {"rawequal", luaB_rawequal},
++  {"rawget", luaB_rawget},
++  {"rawset", luaB_rawset},
++  {"select", luaB_select},
++  {"setfenv", luaB_setfenv},
++  {"setmetatable", luaB_setmetatable},
++  {"tonumber", luaB_tonumber},
++  {"tostring", luaB_tostring},
++  {"type", luaB_type},
++  {"unpack", luaB_unpack},
++  {"xpcall", luaB_xpcall},
++  {NULL, NULL}
++};
++
++
++/*
++** {======================================================
++** Coroutine library
++** =======================================================
++*/
++
++#define CO_RUN	0	/* running */
++#define CO_SUS	1	/* suspended */
++#define CO_NOR	2	/* 'normal' (it resumed another coroutine) */
++#define CO_DEAD	3
++
++static const char *const statnames[] =
++    {"running", "suspended", "normal", "dead"};
++
++static int costatus (lua_State *L, lua_State *co) {
++  if (L == co) return CO_RUN;
++  switch (lua_status(co)) {
++    case LUA_YIELD:
++      return CO_SUS;
++    case 0: {
++      lua_Debug ar;
++      if (lua_getstack(co, 0, &ar) > 0)  /* does it have frames? */
++        return CO_NOR;  /* it is running */
++      else if (lua_gettop(co) == 0)
++          return CO_DEAD;
++      else
++        return CO_SUS;  /* initial state */
++    }
++    default:  /* some error occured */
++      return CO_DEAD;
++  }
++}
++
++
++static int luaB_costatus (lua_State *L) {
++  lua_State *co = lua_tothread(L, 1);
++  luaL_argcheck(L, co, 1, "coroutine expected");
++  lua_pushstring(L, statnames[costatus(L, co)]);
++  return 1;
++}
++
++
++static int auxresume (lua_State *L, lua_State *co, int narg) {
++  int status = costatus(L, co);
++  if (!lua_checkstack(co, narg))
++    luaL_error(L, "too many arguments to resume");
++  if (status != CO_SUS) {
++    lua_pushfstring(L, "cannot resume %s coroutine", statnames[status]);
++    return -1;  /* error flag */
++  }
++  lua_xmove(L, co, narg);
++  lua_setlevel(L, co);
++  status = lua_resume(co, narg);
++  if (status == 0 || status == LUA_YIELD) {
++    int nres = lua_gettop(co);
++    if (!lua_checkstack(L, nres + 1))
++      luaL_error(L, "too many results to resume");
++    lua_xmove(co, L, nres);  /* move yielded values */
++    return nres;
++  }
++  else {
++    lua_xmove(co, L, 1);  /* move error message */
++    return -1;  /* error flag */
++  }
++}
++
++
++static int luaB_coresume (lua_State *L) {
++  lua_State *co = lua_tothread(L, 1);
++  int r;
++  luaL_argcheck(L, co, 1, "coroutine expected");
++  r = auxresume(L, co, lua_gettop(L) - 1);
++  if (r < 0) {
++    lua_pushboolean(L, 0);
++    lua_insert(L, -2);
++    return 2;  /* return false + error message */
++  }
++  else {
++    lua_pushboolean(L, 1);
++    lua_insert(L, -(r + 1));
++    return r + 1;  /* return true + `resume' returns */
++  }
++}
++
++
++static int luaB_auxwrap (lua_State *L) {
++  lua_State *co = lua_tothread(L, lua_upvalueindex(1));
++  int r = auxresume(L, co, lua_gettop(L));
++  if (r < 0) {
++    if (lua_isstring(L, -1)) {  /* error object is a string? */
++      luaL_where(L, 1);  /* add extra info */
++      lua_insert(L, -2);
++      lua_concat(L, 2);
++    }
++    lua_error(L);  /* propagate error */
++  }
++  return r;
++}
++
++
++static int luaB_cocreate (lua_State *L) {
++  lua_State *NL = lua_newthread(L);
++  luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1), 1,
++    "Lua function expected");
++  lua_pushvalue(L, 1);  /* move function to top */
++  lua_xmove(L, NL, 1);  /* move function from L to NL */
++  return 1;
++}
++
++
++static int luaB_cowrap (lua_State *L) {
++  luaB_cocreate(L);
++  lua_pushcclosure(L, luaB_auxwrap, 1);
++  return 1;
++}
++
++
++static int luaB_yield (lua_State *L) {
++  return lua_yield(L, lua_gettop(L));
++}
++
++
++static int luaB_corunning (lua_State *L) {
++  if (lua_pushthread(L))
++    lua_pushnil(L);  /* main thread is not a coroutine */
++  return 1;
++}
++
++
++static const luaL_Reg co_funcs[] = {
++  {"create", luaB_cocreate},
++  {"resume", luaB_coresume},
++  {"running", luaB_corunning},
++  {"status", luaB_costatus},
++  {"wrap", luaB_cowrap},
++  {"yield", luaB_yield},
++  {NULL, NULL}
++};
++
++/* }====================================================== */
++
++
++static void auxopen (lua_State *L, const char *name,
++                     lua_CFunction f, lua_CFunction u) {
++  lua_pushcfunction(L, u);
++  lua_pushcclosure(L, f, 1);
++  lua_setfield(L, -2, name);
++}
++
++
++static void base_open (lua_State *L) {
++  /* set global _G */
++  lua_pushvalue(L, LUA_GLOBALSINDEX);
++  lua_setglobal(L, "_G");
++  /* open lib into global table */
++  luaL_register(L, "_G", base_funcs);
++  lua_pushliteral(L, LUA_VERSION);
++  lua_setglobal(L, "_VERSION");  /* set global _VERSION */
++  /* `ipairs' and `pairs' need auxliliary functions as upvalues */
++  auxopen(L, "ipairs", luaB_ipairs, ipairsaux);
++  auxopen(L, "pairs", luaB_pairs, luaB_next);
++  /* `newproxy' needs a weaktable as upvalue */
++  lua_createtable(L, 0, 1);  /* new table `w' */
++  lua_pushvalue(L, -1);  /* `w' will be its own metatable */
++  lua_setmetatable(L, -2);
++  lua_pushliteral(L, "kv");
++  lua_setfield(L, -2, "__mode");  /* metatable(w).__mode = "kv" */
++  lua_pushcclosure(L, luaB_newproxy, 1);
++  lua_setglobal(L, "newproxy");  /* set global `newproxy' */
++}
++
++
++LUALIB_API int luaopen_base (lua_State *L) {
++  base_open(L);
++  luaL_register(L, LUA_COLIBNAME, co_funcs);
++  return 2;
++}
+--- /dev/null
++++ b/extensions/LUA/lua/lcode.c
+@@ -0,0 +1,838 @@
++/*
++** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
++** Code generator for Lua
++** See Copyright Notice in lua.h
++*/
++
++#include <stdlib.h>
++
++#define lcode_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lcode.h"
++#include "ldebug.h"
++#include "ldo.h"
++#include "lgc.h"
++#include "llex.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lopcodes.h"
++#include "lparser.h"
++#include "ltable.h"
++
++
++#define hasjumps(e)	((e)->t != (e)->f)
++
++
++static int isnumeral(expdesc *e) {
++  return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
++}
++
++
++void luaK_nil (FuncState *fs, int from, int n) {
++  Instruction *previous;
++  if (fs->pc > fs->lasttarget) {  /* no jumps to current position? */
++    if (fs->pc == 0) {  /* function start? */
++      if (from >= fs->nactvar)
++        return;  /* positions are already clean */
++    }
++    else {
++      previous = &fs->f->code[fs->pc-1];
++      if (GET_OPCODE(*previous) == OP_LOADNIL) {
++        int pfrom = GETARG_A(*previous);
++        int pto = GETARG_B(*previous);
++        if (pfrom <= from && from <= pto+1) {  /* can connect both? */
++          if (from+n-1 > pto)
++            SETARG_B(*previous, from+n-1);
++          return;
++        }
++      }
++    }
++  }
++  luaK_codeABC(fs, OP_LOADNIL, from, from+n-1, 0);  /* else no optimization */
++}
++
++
++int luaK_jump (FuncState *fs) {
++  int jpc = fs->jpc;  /* save list of jumps to here */
++  int j;
++  fs->jpc = NO_JUMP;
++  j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
++  luaK_concat(fs, &j, jpc);  /* keep them on hold */
++  return j;
++}
++
++
++void luaK_ret (FuncState *fs, int first, int nret) {
++  luaK_codeABC(fs, OP_RETURN, first, nret+1, 0);
++}
++
++
++static int condjump (FuncState *fs, OpCode op, int A, int B, int C) {
++  luaK_codeABC(fs, op, A, B, C);
++  return luaK_jump(fs);
++}
++
++
++static void fixjump (FuncState *fs, int pc, int dest) {
++  Instruction *jmp = &fs->f->code[pc];
++  int offset = dest-(pc+1);
++  lua_assert(dest != NO_JUMP);
++  if (abs(offset) > MAXARG_sBx)
++    luaX_syntaxerror(fs->ls, "control structure too long");
++  SETARG_sBx(*jmp, offset);
++}
++
++
++/*
++** returns current `pc' and marks it as a jump target (to avoid wrong
++** optimizations with consecutive instructions not in the same basic block).
++*/
++int luaK_getlabel (FuncState *fs) {
++  fs->lasttarget = fs->pc;
++  return fs->pc;
++}
++
++
++static int getjump (FuncState *fs, int pc) {
++  int offset = GETARG_sBx(fs->f->code[pc]);
++  if (offset == NO_JUMP)  /* point to itself represents end of list */
++    return NO_JUMP;  /* end of list */
++  else
++    return (pc+1)+offset;  /* turn offset into absolute position */
++}
++
++
++static Instruction *getjumpcontrol (FuncState *fs, int pc) {
++  Instruction *pi = &fs->f->code[pc];
++  if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1))))
++    return pi-1;
++  else
++    return pi;
++}
++
++
++/*
++** check whether list has any jump that do not produce a value
++** (or produce an inverted value)
++*/
++static int need_value (FuncState *fs, int list) {
++  for (; list != NO_JUMP; list = getjump(fs, list)) {
++    Instruction i = *getjumpcontrol(fs, list);
++    if (GET_OPCODE(i) != OP_TESTSET) return 1;
++  }
++  return 0;  /* not found */
++}
++
++
++static int patchtestreg (FuncState *fs, int node, int reg) {
++  Instruction *i = getjumpcontrol(fs, node);
++  if (GET_OPCODE(*i) != OP_TESTSET)
++    return 0;  /* cannot patch other instructions */
++  if (reg != NO_REG && reg != GETARG_B(*i))
++    SETARG_A(*i, reg);
++  else  /* no register to put value or register already has the value */
++    *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i));
++
++  return 1;
++}
++
++
++static void removevalues (FuncState *fs, int list) {
++  for (; list != NO_JUMP; list = getjump(fs, list))
++      patchtestreg(fs, list, NO_REG);
++}
++
++
++static void patchlistaux (FuncState *fs, int list, int vtarget, int reg,
++                          int dtarget) {
++  while (list != NO_JUMP) {
++    int next = getjump(fs, list);
++    if (patchtestreg(fs, list, reg))
++      fixjump(fs, list, vtarget);
++    else
++      fixjump(fs, list, dtarget);  /* jump to default target */
++    list = next;
++  }
++}
++
++
++static void dischargejpc (FuncState *fs) {
++  patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc);
++  fs->jpc = NO_JUMP;
++}
++
++
++void luaK_patchlist (FuncState *fs, int list, int target) {
++  if (target == fs->pc)
++    luaK_patchtohere(fs, list);
++  else {
++    lua_assert(target < fs->pc);
++    patchlistaux(fs, list, target, NO_REG, target);
++  }
++}
++
++
++void luaK_patchtohere (FuncState *fs, int list) {
++  luaK_getlabel(fs);
++  luaK_concat(fs, &fs->jpc, list);
++}
++
++
++void luaK_concat (FuncState *fs, int *l1, int l2) {
++  if (l2 == NO_JUMP) return;
++  else if (*l1 == NO_JUMP)
++    *l1 = l2;
++  else {
++    int list = *l1;
++    int next;
++    while ((next = getjump(fs, list)) != NO_JUMP)  /* find last element */
++      list = next;
++    fixjump(fs, list, l2);
++  }
++}
++
++
++void luaK_checkstack (FuncState *fs, int n) {
++  int newstack = fs->freereg + n;
++  if (newstack > fs->f->maxstacksize) {
++    if (newstack >= MAXSTACK)
++      luaX_syntaxerror(fs->ls, "function or expression too complex");
++    fs->f->maxstacksize = cast_byte(newstack);
++  }
++}
++
++
++void luaK_reserveregs (FuncState *fs, int n) {
++  luaK_checkstack(fs, n);
++  fs->freereg += n;
++}
++
++
++static void freereg (FuncState *fs, int reg) {
++  if (!ISK(reg) && reg >= fs->nactvar) {
++    fs->freereg--;
++    lua_assert(reg == fs->freereg);
++  }
++}
++
++
++static void freeexp (FuncState *fs, expdesc *e) {
++  if (e->k == VNONRELOC)
++    freereg(fs, e->u.s.info);
++}
++
++
++static int addk (FuncState *fs, TValue *k, TValue *v) {
++  lua_State *L = fs->L;
++  TValue *idx = luaH_set(L, fs->h, k);
++  Proto *f = fs->f;
++  int oldsize = f->sizek;
++  if (ttisnumber(idx)) {
++    lua_assert(luaO_rawequalObj(&fs->f->k[cast_int(nvalue(idx))], v));
++    return cast_int(nvalue(idx));
++  }
++  else {  /* constant not found; create a new entry */
++    setnvalue(idx, cast_num(fs->nk));
++    luaM_growvector(L, f->k, fs->nk, f->sizek, TValue,
++                    MAXARG_Bx, "constant table overflow");
++    while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
++    setobj(L, &f->k[fs->nk], v);
++    luaC_barrier(L, f, v);
++    return fs->nk++;
++  }
++}
++
++
++int luaK_stringK (FuncState *fs, TString *s) {
++  TValue o;
++  setsvalue(fs->L, &o, s);
++  return addk(fs, &o, &o);
++}
++
++
++int luaK_numberK (FuncState *fs, lua_Number r) {
++  TValue o;
++  setnvalue(&o, r);
++  return addk(fs, &o, &o);
++}
++
++
++static int boolK (FuncState *fs, int b) {
++  TValue o;
++  setbvalue(&o, b);
++  return addk(fs, &o, &o);
++}
++
++
++static int nilK (FuncState *fs) {
++  TValue k, v;
++  setnilvalue(&v);
++  /* cannot use nil as key; instead use table itself to represent nil */
++  sethvalue(fs->L, &k, fs->h);
++  return addk(fs, &k, &v);
++}
++
++
++void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) {
++  if (e->k == VCALL) {  /* expression is an open function call? */
++    SETARG_C(getcode(fs, e), nresults+1);
++  }
++  else if (e->k == VVARARG) {
++    SETARG_B(getcode(fs, e), nresults+1);
++    SETARG_A(getcode(fs, e), fs->freereg);
++    luaK_reserveregs(fs, 1);
++  }
++}
++
++
++void luaK_setoneret (FuncState *fs, expdesc *e) {
++  if (e->k == VCALL) {  /* expression is an open function call? */
++    e->k = VNONRELOC;
++    e->u.s.info = GETARG_A(getcode(fs, e));
++  }
++  else if (e->k == VVARARG) {
++    SETARG_B(getcode(fs, e), 2);
++    e->k = VRELOCABLE;  /* can relocate its simple result */
++  }
++}
++
++
++void luaK_dischargevars (FuncState *fs, expdesc *e) {
++  switch (e->k) {
++    case VLOCAL: {
++      e->k = VNONRELOC;
++      break;
++    }
++    case VUPVAL: {
++      e->u.s.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.s.info, 0);
++      e->k = VRELOCABLE;
++      break;
++    }
++    case VGLOBAL: {
++      e->u.s.info = luaK_codeABx(fs, OP_GETGLOBAL, 0, e->u.s.info);
++      e->k = VRELOCABLE;
++      break;
++    }
++    case VINDEXED: {
++      freereg(fs, e->u.s.aux);
++      freereg(fs, e->u.s.info);
++      e->u.s.info = luaK_codeABC(fs, OP_GETTABLE, 0, e->u.s.info, e->u.s.aux);
++      e->k = VRELOCABLE;
++      break;
++    }
++    case VVARARG:
++    case VCALL: {
++      luaK_setoneret(fs, e);
++      break;
++    }
++    default: break;  /* there is one value available (somewhere) */
++  }
++}
++
++
++static int code_label (FuncState *fs, int A, int b, int jump) {
++  luaK_getlabel(fs);  /* those instructions may be jump targets */
++  return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
++}
++
++
++static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
++  luaK_dischargevars(fs, e);
++  switch (e->k) {
++    case VNIL: {
++      luaK_nil(fs, reg, 1);
++      break;
++    }
++    case VFALSE:  case VTRUE: {
++      luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
++      break;
++    }
++    case VK: {
++      luaK_codeABx(fs, OP_LOADK, reg, e->u.s.info);
++      break;
++    }
++    case VKNUM: {
++      luaK_codeABx(fs, OP_LOADK, reg, luaK_numberK(fs, e->u.nval));
++      break;
++    }
++    case VRELOCABLE: {
++      Instruction *pc = &getcode(fs, e);
++      SETARG_A(*pc, reg);
++      break;
++    }
++    case VNONRELOC: {
++      if (reg != e->u.s.info)
++        luaK_codeABC(fs, OP_MOVE, reg, e->u.s.info, 0);
++      break;
++    }
++    default: {
++      lua_assert(e->k == VVOID || e->k == VJMP);
++      return;  /* nothing to do... */
++    }
++  }
++  e->u.s.info = reg;
++  e->k = VNONRELOC;
++}
++
++
++static void discharge2anyreg (FuncState *fs, expdesc *e) {
++  if (e->k != VNONRELOC) {
++    luaK_reserveregs(fs, 1);
++    discharge2reg(fs, e, fs->freereg-1);
++  }
++}
++
++
++static void exp2reg (FuncState *fs, expdesc *e, int reg) {
++  discharge2reg(fs, e, reg);
++  if (e->k == VJMP)
++    luaK_concat(fs, &e->t, e->u.s.info);  /* put this jump in `t' list */
++  if (hasjumps(e)) {
++    int final;  /* position after whole expression */
++    int p_f = NO_JUMP;  /* position of an eventual LOAD false */
++    int p_t = NO_JUMP;  /* position of an eventual LOAD true */
++    if (need_value(fs, e->t) || need_value(fs, e->f)) {
++      int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
++      p_f = code_label(fs, reg, 0, 1);
++      p_t = code_label(fs, reg, 1, 0);
++      luaK_patchtohere(fs, fj);
++    }
++    final = luaK_getlabel(fs);
++    patchlistaux(fs, e->f, final, reg, p_f);
++    patchlistaux(fs, e->t, final, reg, p_t);
++  }
++  e->f = e->t = NO_JUMP;
++  e->u.s.info = reg;
++  e->k = VNONRELOC;
++}
++
++
++void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
++  luaK_dischargevars(fs, e);
++  freeexp(fs, e);
++  luaK_reserveregs(fs, 1);
++  exp2reg(fs, e, fs->freereg - 1);
++}
++
++
++int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
++  luaK_dischargevars(fs, e);
++  if (e->k == VNONRELOC) {
++    if (!hasjumps(e)) return e->u.s.info;  /* exp is already in a register */
++    if (e->u.s.info >= fs->nactvar) {  /* reg. is not a local? */
++      exp2reg(fs, e, e->u.s.info);  /* put value on it */
++      return e->u.s.info;
++    }
++  }
++  luaK_exp2nextreg(fs, e);  /* default */
++  return e->u.s.info;
++}
++
++
++void luaK_exp2val (FuncState *fs, expdesc *e) {
++  if (hasjumps(e))
++    luaK_exp2anyreg(fs, e);
++  else
++    luaK_dischargevars(fs, e);
++}
++
++
++int luaK_exp2RK (FuncState *fs, expdesc *e) {
++  luaK_exp2val(fs, e);
++  switch (e->k) {
++    case VKNUM:
++    case VTRUE:
++    case VFALSE:
++    case VNIL: {
++      if (fs->nk <= MAXINDEXRK) {  /* constant fit in RK operand? */
++        e->u.s.info = (e->k == VNIL)  ? nilK(fs) :
++                      (e->k == VKNUM) ? luaK_numberK(fs, e->u.nval) :
++                                        boolK(fs, (e->k == VTRUE));
++        e->k = VK;
++        return RKASK(e->u.s.info);
++      }
++      else break;
++    }
++    case VK: {
++      if (e->u.s.info <= MAXINDEXRK)  /* constant fit in argC? */
++        return RKASK(e->u.s.info);
++      else break;
++    }
++    default: break;
++  }
++  /* not a constant in the right range: put it in a register */
++  return luaK_exp2anyreg(fs, e);
++}
++
++
++void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) {
++  switch (var->k) {
++    case VLOCAL: {
++      freeexp(fs, ex);
++      exp2reg(fs, ex, var->u.s.info);
++      return;
++    }
++    case VUPVAL: {
++      int e = luaK_exp2anyreg(fs, ex);
++      luaK_codeABC(fs, OP_SETUPVAL, e, var->u.s.info, 0);
++      break;
++    }
++    case VGLOBAL: {
++      int e = luaK_exp2anyreg(fs, ex);
++      luaK_codeABx(fs, OP_SETGLOBAL, e, var->u.s.info);
++      break;
++    }
++    case VINDEXED: {
++      int e = luaK_exp2RK(fs, ex);
++      luaK_codeABC(fs, OP_SETTABLE, var->u.s.info, var->u.s.aux, e);
++      break;
++    }
++    default: {
++      lua_assert(0);  /* invalid var kind to store */
++      break;
++    }
++  }
++  freeexp(fs, ex);
++}
++
++
++void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
++  int func;
++  luaK_exp2anyreg(fs, e);
++  freeexp(fs, e);
++  func = fs->freereg;
++  luaK_reserveregs(fs, 2);
++  luaK_codeABC(fs, OP_SELF, func, e->u.s.info, luaK_exp2RK(fs, key));
++  freeexp(fs, key);
++  e->u.s.info = func;
++  e->k = VNONRELOC;
++}
++
++
++static void invertjump (FuncState *fs, expdesc *e) {
++  Instruction *pc = getjumpcontrol(fs, e->u.s.info);
++  lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
++                                           GET_OPCODE(*pc) != OP_TEST);
++  SETARG_A(*pc, !(GETARG_A(*pc)));
++}
++
++
++static int jumponcond (FuncState *fs, expdesc *e, int cond) {
++  if (e->k == VRELOCABLE) {
++    Instruction ie = getcode(fs, e);
++    if (GET_OPCODE(ie) == OP_NOT) {
++      fs->pc--;  /* remove previous OP_NOT */
++      return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond);
++    }
++    /* else go through */
++  }
++  discharge2anyreg(fs, e);
++  freeexp(fs, e);
++  return condjump(fs, OP_TESTSET, NO_REG, e->u.s.info, cond);
++}
++
++
++void luaK_goiftrue (FuncState *fs, expdesc *e) {
++  int pc;  /* pc of last jump */
++  luaK_dischargevars(fs, e);
++  switch (e->k) {
++    case VK: case VKNUM: case VTRUE: {
++      pc = NO_JUMP;  /* always true; do nothing */
++      break;
++    }
++    case VFALSE: {
++      pc = luaK_jump(fs);  /* always jump */
++      break;
++    }
++    case VJMP: {
++      invertjump(fs, e);
++      pc = e->u.s.info;
++      break;
++    }
++    default: {
++      pc = jumponcond(fs, e, 0);
++      break;
++    }
++  }
++  luaK_concat(fs, &e->f, pc);  /* insert last jump in `f' list */
++  luaK_patchtohere(fs, e->t);
++  e->t = NO_JUMP;
++}
++
++
++static void luaK_goiffalse (FuncState *fs, expdesc *e) {
++  int pc;  /* pc of last jump */
++  luaK_dischargevars(fs, e);
++  switch (e->k) {
++    case VNIL: case VFALSE: {
++      pc = NO_JUMP;  /* always false; do nothing */
++      break;
++    }
++    case VTRUE: {
++      pc = luaK_jump(fs);  /* always jump */
++      break;
++    }
++    case VJMP: {
++      pc = e->u.s.info;
++      break;
++    }
++    default: {
++      pc = jumponcond(fs, e, 1);
++      break;
++    }
++  }
++  luaK_concat(fs, &e->t, pc);  /* insert last jump in `t' list */
++  luaK_patchtohere(fs, e->f);
++  e->f = NO_JUMP;
++}
++
++
++static void codenot (FuncState *fs, expdesc *e) {
++  luaK_dischargevars(fs, e);
++  switch (e->k) {
++    case VNIL: case VFALSE: {
++      e->k = VTRUE;
++      break;
++    }
++    case VK: case VKNUM: case VTRUE: {
++      e->k = VFALSE;
++      break;
++    }
++    case VJMP: {
++      invertjump(fs, e);
++      break;
++    }
++    case VRELOCABLE:
++    case VNONRELOC: {
++      discharge2anyreg(fs, e);
++      freeexp(fs, e);
++      e->u.s.info = luaK_codeABC(fs, OP_NOT, 0, e->u.s.info, 0);
++      e->k = VRELOCABLE;
++      break;
++    }
++    default: {
++      lua_assert(0);  /* cannot happen */
++      break;
++    }
++  }
++  /* interchange true and false lists */
++  { int temp = e->f; e->f = e->t; e->t = temp; }
++  removevalues(fs, e->f);
++  removevalues(fs, e->t);
++}
++
++
++void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
++  t->u.s.aux = luaK_exp2RK(fs, k);
++  t->k = VINDEXED;
++}
++
++
++static int constfolding (OpCode op, expdesc *e1, expdesc *e2) {
++  lua_Number v1, v2, r;
++  if (!isnumeral(e1) || !isnumeral(e2)) return 0;
++  v1 = e1->u.nval;
++  v2 = e2->u.nval;
++  switch (op) {
++    case OP_ADD: r = luai_numadd(v1, v2); break;
++    case OP_SUB: r = luai_numsub(v1, v2); break;
++    case OP_MUL: r = luai_nummul(v1, v2); break;
++    case OP_DIV:
++      if (v2 == 0) return 0;  /* do not attempt to divide by 0 */
++      r = luai_numdiv(v1, v2); break;
++    case OP_MOD:
++      if (v2 == 0) return 0;  /* do not attempt to divide by 0 */
++      r = luai_nummod(v1, v2); break;
++    case OP_POW: r = luai_numpow(v1, v2); break;
++    case OP_UNM: r = luai_numunm(v1); break;
++    case OP_LEN: return 0;  /* no constant folding for 'len' */
++    default: lua_assert(0); r = 0; break;
++  }
++  if (luai_numisnan(r)) return 0;  /* do not attempt to produce NaN */
++  e1->u.nval = r;
++  return 1;
++}
++
++
++static void codearith (FuncState *fs, OpCode op, expdesc *e1, expdesc *e2) {
++  if (constfolding(op, e1, e2))
++    return;
++  else {
++    int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0;
++    int o1 = luaK_exp2RK(fs, e1);
++    if (o1 > o2) {
++      freeexp(fs, e1);
++      freeexp(fs, e2);
++    }
++    else {
++      freeexp(fs, e2);
++      freeexp(fs, e1);
++    }
++    e1->u.s.info = luaK_codeABC(fs, op, 0, o1, o2);
++    e1->k = VRELOCABLE;
++  }
++}
++
++
++static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1,
++                                                          expdesc *e2) {
++  int o1 = luaK_exp2RK(fs, e1);
++  int o2 = luaK_exp2RK(fs, e2);
++  freeexp(fs, e2);
++  freeexp(fs, e1);
++  if (cond == 0 && op != OP_EQ) {
++    int temp;  /* exchange args to replace by `<' or `<=' */
++    temp = o1; o1 = o2; o2 = temp;  /* o1 <==> o2 */
++    cond = 1;
++  }
++  e1->u.s.info = condjump(fs, op, cond, o1, o2);
++  e1->k = VJMP;
++}
++
++
++void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
++  expdesc e2;
++  e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
++  switch (op) {
++    case OPR_MINUS: {
++      if (!isnumeral(e))
++        luaK_exp2anyreg(fs, e);  /* cannot operate on non-numeric constants */
++      codearith(fs, OP_UNM, e, &e2);
++      break;
++    }
++    case OPR_NOT: codenot(fs, e); break;
++    case OPR_LEN: {
++      luaK_exp2anyreg(fs, e);  /* cannot operate on constants */
++      codearith(fs, OP_LEN, e, &e2);
++      break;
++    }
++    default: lua_assert(0);
++  }
++}
++
++
++void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
++  switch (op) {
++    case OPR_AND: {
++      luaK_goiftrue(fs, v);
++      break;
++    }
++    case OPR_OR: {
++      luaK_goiffalse(fs, v);
++      break;
++    }
++    case OPR_CONCAT: {
++      luaK_exp2nextreg(fs, v);  /* operand must be on the `stack' */
++      break;
++    }
++    case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
++    case OPR_MOD: case OPR_POW: {
++      if (!isnumeral(v)) luaK_exp2RK(fs, v);
++      break;
++    }
++    default: {
++      luaK_exp2RK(fs, v);
++      break;
++    }
++  }
++}
++
++
++void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
++  switch (op) {
++    case OPR_AND: {
++      lua_assert(e1->t == NO_JUMP);  /* list must be closed */
++      luaK_dischargevars(fs, e2);
++      luaK_concat(fs, &e2->f, e1->f);
++      *e1 = *e2;
++      break;
++    }
++    case OPR_OR: {
++      lua_assert(e1->f == NO_JUMP);  /* list must be closed */
++      luaK_dischargevars(fs, e2);
++      luaK_concat(fs, &e2->t, e1->t);
++      *e1 = *e2;
++      break;
++    }
++    case OPR_CONCAT: {
++      luaK_exp2val(fs, e2);
++      if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) {
++        lua_assert(e1->u.s.info == GETARG_B(getcode(fs, e2))-1);
++        freeexp(fs, e1);
++        SETARG_B(getcode(fs, e2), e1->u.s.info);
++        e1->k = VRELOCABLE; e1->u.s.info = e2->u.s.info;
++      }
++      else {
++        luaK_exp2nextreg(fs, e2);  /* operand must be on the 'stack' */
++        codearith(fs, OP_CONCAT, e1, e2);
++      }
++      break;
++    }
++    case OPR_ADD: codearith(fs, OP_ADD, e1, e2); break;
++    case OPR_SUB: codearith(fs, OP_SUB, e1, e2); break;
++    case OPR_MUL: codearith(fs, OP_MUL, e1, e2); break;
++    case OPR_DIV: codearith(fs, OP_DIV, e1, e2); break;
++    case OPR_MOD: codearith(fs, OP_MOD, e1, e2); break;
++    case OPR_POW: codearith(fs, OP_POW, e1, e2); break;
++    case OPR_EQ: codecomp(fs, OP_EQ, 1, e1, e2); break;
++    case OPR_NE: codecomp(fs, OP_EQ, 0, e1, e2); break;
++    case OPR_LT: codecomp(fs, OP_LT, 1, e1, e2); break;
++    case OPR_LE: codecomp(fs, OP_LE, 1, e1, e2); break;
++    case OPR_GT: codecomp(fs, OP_LT, 0, e1, e2); break;
++    case OPR_GE: codecomp(fs, OP_LE, 0, e1, e2); break;
++    default: lua_assert(0);
++  }
++}
++
++
++void luaK_fixline (FuncState *fs, int line) {
++  fs->f->lineinfo[fs->pc - 1] = line;
++}
++
++
++static int luaK_code (FuncState *fs, Instruction i, int line) {
++  Proto *f = fs->f;
++  dischargejpc(fs);  /* `pc' will change */
++  /* put new instruction in code array */
++  luaM_growvector(fs->L, f->code, fs->pc, f->sizecode, Instruction,
++                  MAX_INT, "code size overflow");
++  f->code[fs->pc] = i;
++  /* save corresponding line information */
++  luaM_growvector(fs->L, f->lineinfo, fs->pc, f->sizelineinfo, int,
++                  MAX_INT, "code size overflow");
++  f->lineinfo[fs->pc] = line;
++  return fs->pc++;
++}
++
++
++int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) {
++  lua_assert(getOpMode(o) == iABC);
++  lua_assert(getBMode(o) != OpArgN || b == 0);
++  lua_assert(getCMode(o) != OpArgN || c == 0);
++  return luaK_code(fs, CREATE_ABC(o, a, b, c), fs->ls->lastline);
++}
++
++
++int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
++  lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
++  lua_assert(getCMode(o) == OpArgN);
++  return luaK_code(fs, CREATE_ABx(o, a, bc), fs->ls->lastline);
++}
++
++
++void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
++  int c =  (nelems - 1)/LFIELDS_PER_FLUSH + 1;
++  int b = (tostore == LUA_MULTRET) ? 0 : tostore;
++  lua_assert(tostore != 0);
++  if (c <= MAXARG_C)
++    luaK_codeABC(fs, OP_SETLIST, base, b, c);
++  else {
++    luaK_codeABC(fs, OP_SETLIST, base, b, 0);
++    luaK_code(fs, cast(Instruction, c), fs->ls->lastline);
++  }
++  fs->freereg = base + 1;  /* free registers with list values */
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lcode.h
+@@ -0,0 +1,76 @@
++/*
++** $Id: lcode.h,v 1.48.1.1 2007/12/27 13:02:25 roberto Exp $
++** Code generator for Lua
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lcode_h
++#define lcode_h
++
++#include "llex.h"
++#include "lobject.h"
++#include "lopcodes.h"
++#include "lparser.h"
++
++
++/*
++** Marks the end of a patch list. It is an invalid value both as an absolute
++** address, and as a list link (would link an element to itself).
++*/
++#define NO_JUMP (-1)
++
++
++/*
++** grep "ORDER OPR" if you change these enums
++*/
++typedef enum BinOpr {
++  OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
++  OPR_CONCAT,
++  OPR_NE, OPR_EQ,
++  OPR_LT, OPR_LE, OPR_GT, OPR_GE,
++  OPR_AND, OPR_OR,
++  OPR_NOBINOPR
++} BinOpr;
++
++
++typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
++
++
++#define getcode(fs,e)	((fs)->f->code[(e)->u.s.info])
++
++#define luaK_codeAsBx(fs,o,A,sBx)	luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx)
++
++#define luaK_setmultret(fs,e)	luaK_setreturns(fs, e, LUA_MULTRET)
++
++LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
++LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
++LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
++LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
++LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
++LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
++LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s);
++LUAI_FUNC int luaK_numberK (FuncState *fs, lua_Number r);
++LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
++LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
++LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
++LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
++LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
++LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
++LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
++LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
++LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
++LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults);
++LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e);
++LUAI_FUNC int luaK_jump (FuncState *fs);
++LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
++LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
++LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
++LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
++LUAI_FUNC int luaK_getlabel (FuncState *fs);
++LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v);
++LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
++LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, expdesc *v2);
++LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/ldebug.c
+@@ -0,0 +1,637 @@
++/*
++** $Id: ldebug.c,v 2.29.1.6 2008/05/08 16:56:26 roberto Exp $
++** Debug Interface
++** See Copyright Notice in lua.h
++*/
++
++
++#include <stdarg.h>
++#include <stddef.h>
++#include <string.h>
++
++#define ldebug_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lapi.h"
++#include "lcode.h"
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "lobject.h"
++#include "lopcodes.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "ltm.h"
++#include "lvm.h"
++
++
++
++static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name);
++
++
++static int currentpc (lua_State *L, CallInfo *ci) {
++  if (!isLua(ci)) return -1;  /* function is not a Lua function? */
++  if (ci == L->ci)
++    ci->savedpc = L->savedpc;
++  return pcRel(ci->savedpc, ci_func(ci)->l.p);
++}
++
++
++static int currentline (lua_State *L, CallInfo *ci) {
++  int pc = currentpc(L, ci);
++  if (pc < 0)
++    return -1;  /* only active lua functions have current-line information */
++  else
++    return getline(ci_func(ci)->l.p, pc);
++}
++
++
++/*
++** this function can be called asynchronous (e.g. during a signal)
++*/
++LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
++  if (func == NULL || mask == 0) {  /* turn off hooks? */
++    mask = 0;
++    func = NULL;
++  }
++  L->hook = func;
++  L->basehookcount = count;
++  resethookcount(L);
++  L->hookmask = cast_byte(mask);
++  return 1;
++}
++
++
++LUA_API lua_Hook lua_gethook (lua_State *L) {
++  return L->hook;
++}
++
++
++LUA_API int lua_gethookmask (lua_State *L) {
++  return L->hookmask;
++}
++
++
++LUA_API int lua_gethookcount (lua_State *L) {
++  return L->basehookcount;
++}
++
++
++LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
++  int status;
++  CallInfo *ci;
++  lua_lock(L);
++  for (ci = L->ci; level > 0 && ci > L->base_ci; ci--) {
++    level--;
++    if (f_isLua(ci))  /* Lua function? */
++      level -= ci->tailcalls;  /* skip lost tail calls */
++  }
++  if (level == 0 && ci > L->base_ci) {  /* level found? */
++    status = 1;
++    ar->i_ci = cast_int(ci - L->base_ci);
++  }
++  else if (level < 0) {  /* level is of a lost tail call? */
++    status = 1;
++    ar->i_ci = 0;
++  }
++  else status = 0;  /* no such level */
++  lua_unlock(L);
++  return status;
++}
++
++
++static Proto *getluaproto (CallInfo *ci) {
++  return (isLua(ci) ? ci_func(ci)->l.p : NULL);
++}
++
++
++static const char *findlocal (lua_State *L, CallInfo *ci, int n) {
++  const char *name;
++  Proto *fp = getluaproto(ci);
++  if (fp && (name = luaF_getlocalname(fp, n, currentpc(L, ci))) != NULL)
++    return name;  /* is a local variable in a Lua function */
++  else {
++    StkId limit = (ci == L->ci) ? L->top : (ci+1)->func;
++    if (limit - ci->base >= n && n > 0)  /* is 'n' inside 'ci' stack? */
++      return "(*temporary)";
++    else
++      return NULL;
++  }
++}
++
++
++LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
++  CallInfo *ci = L->base_ci + ar->i_ci;
++  const char *name = findlocal(L, ci, n);
++  lua_lock(L);
++  if (name)
++      luaA_pushobject(L, ci->base + (n - 1));
++  lua_unlock(L);
++  return name;
++}
++
++
++LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
++  CallInfo *ci = L->base_ci + ar->i_ci;
++  const char *name = findlocal(L, ci, n);
++  lua_lock(L);
++  if (name)
++      setobjs2s(L, ci->base + (n - 1), L->top - 1);
++  L->top--;  /* pop value */
++  lua_unlock(L);
++  return name;
++}
++
++
++static void funcinfo (lua_Debug *ar, Closure *cl) {
++  if (cl->c.isC) {
++    ar->source = "=[C]";
++    ar->linedefined = -1;
++    ar->lastlinedefined = -1;
++    ar->what = "C";
++  }
++  else {
++    ar->source = getstr(cl->l.p->source);
++    ar->linedefined = cl->l.p->linedefined;
++    ar->lastlinedefined = cl->l.p->lastlinedefined;
++    ar->what = (ar->linedefined == 0) ? "main" : "Lua";
++  }
++  luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
++}
++
++
++static void info_tailcall (lua_Debug *ar) {
++  ar->name = ar->namewhat = "";
++  ar->what = "tail";
++  ar->lastlinedefined = ar->linedefined = ar->currentline = -1;
++  ar->source = "=(tail call)";
++  luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
++  ar->nups = 0;
++}
++
++
++static void collectvalidlines (lua_State *L, Closure *f) {
++  if (f == NULL || f->c.isC) {
++    setnilvalue(L->top);
++  }
++  else {
++    Table *t = luaH_new(L, 0, 0);
++    int *lineinfo = f->l.p->lineinfo;
++    int i;
++    for (i=0; i<f->l.p->sizelineinfo; i++)
++      setbvalue(luaH_setnum(L, t, lineinfo[i]), 1);
++    sethvalue(L, L->top, t); 
++  }
++  incr_top(L);
++}
++
++
++static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
++                    Closure *f, CallInfo *ci) {
++  int status = 1;
++  if (f == NULL) {
++    info_tailcall(ar);
++    return status;
++  }
++  for (; *what; what++) {
++    switch (*what) {
++      case 'S': {
++        funcinfo(ar, f);
++        break;
++      }
++      case 'l': {
++        ar->currentline = (ci) ? currentline(L, ci) : -1;
++        break;
++      }
++      case 'u': {
++        ar->nups = f->c.nupvalues;
++        break;
++      }
++      case 'n': {
++        ar->namewhat = (ci) ? getfuncname(L, ci, &ar->name) : NULL;
++        if (ar->namewhat == NULL) {
++          ar->namewhat = "";  /* not found */
++          ar->name = NULL;
++        }
++        break;
++      }
++      case 'L':
++      case 'f':  /* handled by lua_getinfo */
++        break;
++      default: status = 0;  /* invalid option */
++    }
++  }
++  return status;
++}
++
++
++LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
++  int status;
++  Closure *f = NULL;
++  CallInfo *ci = NULL;
++  lua_lock(L);
++  if (*what == '>') {
++    StkId func = L->top - 1;
++    luai_apicheck(L, ttisfunction(func));
++    what++;  /* skip the '>' */
++    f = clvalue(func);
++    L->top--;  /* pop function */
++  }
++  else if (ar->i_ci != 0) {  /* no tail call? */
++    ci = L->base_ci + ar->i_ci;
++    lua_assert(ttisfunction(ci->func));
++    f = clvalue(ci->func);
++  }
++  status = auxgetinfo(L, what, ar, f, ci);
++  if (strchr(what, 'f')) {
++    if (f == NULL) setnilvalue(L->top);
++    else setclvalue(L, L->top, f);
++    incr_top(L);
++  }
++  if (strchr(what, 'L'))
++    collectvalidlines(L, f);
++  lua_unlock(L);
++  return status;
++}
++
++
++/*
++** {======================================================
++** Symbolic Execution and code checker
++** =======================================================
++*/
++
++#define check(x)		if (!(x)) return 0;
++
++#define checkjump(pt,pc)	check(0 <= pc && pc < pt->sizecode)
++
++#define checkreg(pt,reg)	check((reg) < (pt)->maxstacksize)
++
++
++
++static int precheck (const Proto *pt) {
++  check(pt->maxstacksize <= MAXSTACK);
++  check(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize);
++  check(!(pt->is_vararg & VARARG_NEEDSARG) ||
++              (pt->is_vararg & VARARG_HASARG));
++  check(pt->sizeupvalues <= pt->nups);
++  check(pt->sizelineinfo == pt->sizecode || pt->sizelineinfo == 0);
++  check(pt->sizecode > 0 && GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN);
++  return 1;
++}
++
++
++#define checkopenop(pt,pc)	luaG_checkopenop((pt)->code[(pc)+1])
++
++int luaG_checkopenop (Instruction i) {
++  switch (GET_OPCODE(i)) {
++    case OP_CALL:
++    case OP_TAILCALL:
++    case OP_RETURN:
++    case OP_SETLIST: {
++      check(GETARG_B(i) == 0);
++      return 1;
++    }
++    default: return 0;  /* invalid instruction after an open call */
++  }
++}
++
++
++static int checkArgMode (const Proto *pt, int r, enum OpArgMask mode) {
++  switch (mode) {
++    case OpArgN: check(r == 0); break;
++    case OpArgU: break;
++    case OpArgR: checkreg(pt, r); break;
++    case OpArgK:
++      check(ISK(r) ? INDEXK(r) < pt->sizek : r < pt->maxstacksize);
++      break;
++  }
++  return 1;
++}
++
++
++static Instruction symbexec (const Proto *pt, int lastpc, int reg) {
++  int pc;
++  int last;  /* stores position of last instruction that changed `reg' */
++  last = pt->sizecode-1;  /* points to final return (a `neutral' instruction) */
++  check(precheck(pt));
++  for (pc = 0; pc < lastpc; pc++) {
++    Instruction i = pt->code[pc];
++    OpCode op = GET_OPCODE(i);
++    int a = GETARG_A(i);
++    int b = 0;
++    int c = 0;
++    check(op < NUM_OPCODES);
++    checkreg(pt, a);
++    switch (getOpMode(op)) {
++      case iABC: {
++        b = GETARG_B(i);
++        c = GETARG_C(i);
++        check(checkArgMode(pt, b, getBMode(op)));
++        check(checkArgMode(pt, c, getCMode(op)));
++        break;
++      }
++      case iABx: {
++        b = GETARG_Bx(i);
++        if (getBMode(op) == OpArgK) check(b < pt->sizek);
++        break;
++      }
++      case iAsBx: {
++        b = GETARG_sBx(i);
++        if (getBMode(op) == OpArgR) {
++          int dest = pc+1+b;
++          check(0 <= dest && dest < pt->sizecode);
++          if (dest > 0) {
++            int j;
++            /* check that it does not jump to a setlist count; this
++               is tricky, because the count from a previous setlist may
++               have the same value of an invalid setlist; so, we must
++               go all the way back to the first of them (if any) */
++            for (j = 0; j < dest; j++) {
++              Instruction d = pt->code[dest-1-j];
++              if (!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0)) break;
++            }
++            /* if 'j' is even, previous value is not a setlist (even if
++               it looks like one) */
++            check((j&1) == 0);
++          }
++        }
++        break;
++      }
++    }
++    if (testAMode(op)) {
++      if (a == reg) last = pc;  /* change register `a' */
++    }
++    if (testTMode(op)) {
++      check(pc+2 < pt->sizecode);  /* check skip */
++      check(GET_OPCODE(pt->code[pc+1]) == OP_JMP);
++    }
++    switch (op) {
++      case OP_LOADBOOL: {
++        if (c == 1) {  /* does it jump? */
++          check(pc+2 < pt->sizecode);  /* check its jump */
++          check(GET_OPCODE(pt->code[pc+1]) != OP_SETLIST ||
++                GETARG_C(pt->code[pc+1]) != 0);
++        }
++        break;
++      }
++      case OP_LOADNIL: {
++        if (a <= reg && reg <= b)
++          last = pc;  /* set registers from `a' to `b' */
++        break;
++      }
++      case OP_GETUPVAL:
++      case OP_SETUPVAL: {
++        check(b < pt->nups);
++        break;
++      }
++      case OP_GETGLOBAL:
++      case OP_SETGLOBAL: {
++        check(ttisstring(&pt->k[b]));
++        break;
++      }
++      case OP_SELF: {
++        checkreg(pt, a+1);
++        if (reg == a+1) last = pc;
++        break;
++      }
++      case OP_CONCAT: {
++        check(b < c);  /* at least two operands */
++        break;
++      }
++      case OP_TFORLOOP: {
++        check(c >= 1);  /* at least one result (control variable) */
++        checkreg(pt, a+2+c);  /* space for results */
++        if (reg >= a+2) last = pc;  /* affect all regs above its base */
++        break;
++      }
++      case OP_FORLOOP:
++      case OP_FORPREP:
++        checkreg(pt, a+3);
++        /* go through */
++      case OP_JMP: {
++        int dest = pc+1+b;
++        /* not full check and jump is forward and do not skip `lastpc'? */
++        if (reg != NO_REG && pc < dest && dest <= lastpc)
++          pc += b;  /* do the jump */
++        break;
++      }
++      case OP_CALL:
++      case OP_TAILCALL: {
++        if (b != 0) {
++          checkreg(pt, a+b-1);
++        }
++        c--;  /* c = num. returns */
++        if (c == LUA_MULTRET) {
++          check(checkopenop(pt, pc));
++        }
++        else if (c != 0)
++          checkreg(pt, a+c-1);
++        if (reg >= a) last = pc;  /* affect all registers above base */
++        break;
++      }
++      case OP_RETURN: {
++        b--;  /* b = num. returns */
++        if (b > 0) checkreg(pt, a+b-1);
++        break;
++      }
++      case OP_SETLIST: {
++        if (b > 0) checkreg(pt, a + b);
++        if (c == 0) {
++          pc++;
++          check(pc < pt->sizecode - 1);
++        }
++        break;
++      }
++      case OP_CLOSURE: {
++        int nup, j;
++        check(b < pt->sizep);
++        nup = pt->p[b]->nups;
++        check(pc + nup < pt->sizecode);
++        for (j = 1; j <= nup; j++) {
++          OpCode op1 = GET_OPCODE(pt->code[pc + j]);
++          check(op1 == OP_GETUPVAL || op1 == OP_MOVE);
++        }
++        if (reg != NO_REG)  /* tracing? */
++          pc += nup;  /* do not 'execute' these pseudo-instructions */
++        break;
++      }
++      case OP_VARARG: {
++        check((pt->is_vararg & VARARG_ISVARARG) &&
++             !(pt->is_vararg & VARARG_NEEDSARG));
++        b--;
++        if (b == LUA_MULTRET) check(checkopenop(pt, pc));
++        checkreg(pt, a+b-1);
++        break;
++      }
++      default: break;
++    }
++  }
++  return pt->code[last];
++}
++
++#undef check
++#undef checkjump
++#undef checkreg
++
++/* }====================================================== */
++
++
++int luaG_checkcode (const Proto *pt) {
++  return (symbexec(pt, pt->sizecode, NO_REG) != 0);
++}
++
++
++static const char *kname (Proto *p, int c) {
++  if (ISK(c) && ttisstring(&p->k[INDEXK(c)]))
++    return svalue(&p->k[INDEXK(c)]);
++  else
++    return "?";
++}
++
++
++static const char *getobjname (lua_State *L, CallInfo *ci, int stackpos,
++                               const char **name) {
++  if (isLua(ci)) {  /* a Lua function? */
++    Proto *p = ci_func(ci)->l.p;
++    int pc = currentpc(L, ci);
++    Instruction i;
++    *name = luaF_getlocalname(p, stackpos+1, pc);
++    if (*name)  /* is a local? */
++      return "local";
++    i = symbexec(p, pc, stackpos);  /* try symbolic execution */
++    lua_assert(pc != -1);
++    switch (GET_OPCODE(i)) {
++      case OP_GETGLOBAL: {
++        int g = GETARG_Bx(i);  /* global index */
++        lua_assert(ttisstring(&p->k[g]));
++        *name = svalue(&p->k[g]);
++        return "global";
++      }
++      case OP_MOVE: {
++        int a = GETARG_A(i);
++        int b = GETARG_B(i);  /* move from `b' to `a' */
++        if (b < a)
++          return getobjname(L, ci, b, name);  /* get name for `b' */
++        break;
++      }
++      case OP_GETTABLE: {
++        int k = GETARG_C(i);  /* key index */
++        *name = kname(p, k);
++        return "field";
++      }
++      case OP_GETUPVAL: {
++        int u = GETARG_B(i);  /* upvalue index */
++        *name = p->upvalues ? getstr(p->upvalues[u]) : "?";
++        return "upvalue";
++      }
++      case OP_SELF: {
++        int k = GETARG_C(i);  /* key index */
++        *name = kname(p, k);
++        return "method";
++      }
++      default: break;
++    }
++  }
++  return NULL;  /* no useful name found */
++}
++
++
++static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
++  Instruction i;
++  if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
++    return NULL;  /* calling function is not Lua (or is unknown) */
++  ci--;  /* calling function */
++  i = ci_func(ci)->l.p->code[currentpc(L, ci)];
++  if (GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL ||
++      GET_OPCODE(i) == OP_TFORLOOP)
++    return getobjname(L, ci, GETARG_A(i), name);
++  else
++    return NULL;  /* no useful name can be found */
++}
++
++
++/* only ANSI way to check whether a pointer points to an array */
++static int isinstack (CallInfo *ci, const TValue *o) {
++  StkId p;
++  for (p = ci->base; p < ci->top; p++)
++    if (o == p) return 1;
++  return 0;
++}
++
++
++void luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
++  const char *name = NULL;
++  const char *t = luaT_typenames[ttype(o)];
++  const char *kind = (isinstack(L->ci, o)) ?
++                         getobjname(L, L->ci, cast_int(o - L->base), &name) :
++                         NULL;
++  if (kind)
++    luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)",
++                op, kind, name, t);
++  else
++    luaG_runerror(L, "attempt to %s a %s value", op, t);
++}
++
++
++void luaG_concaterror (lua_State *L, StkId p1, StkId p2) {
++  if (ttisstring(p1) || ttisnumber(p1)) p1 = p2;
++  lua_assert(!ttisstring(p1) && !ttisnumber(p1));
++  luaG_typeerror(L, p1, "concatenate");
++}
++
++
++void luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) {
++  TValue temp;
++  if (luaV_tonumber(p1, &temp) == NULL)
++    p2 = p1;  /* first operand is wrong */
++  luaG_typeerror(L, p2, "perform arithmetic on");
++}
++
++
++int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
++  const char *t1 = luaT_typenames[ttype(p1)];
++  const char *t2 = luaT_typenames[ttype(p2)];
++  if (t1[2] == t2[2])
++    luaG_runerror(L, "attempt to compare two %s values", t1);
++  else
++    luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
++  return 0;
++}
++
++
++static void addinfo (lua_State *L, const char *msg) {
++  CallInfo *ci = L->ci;
++  if (isLua(ci)) {  /* is Lua code? */
++    char buff[LUA_IDSIZE];  /* add file:line information */
++    int line = currentline(L, ci);
++    luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE);
++    luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
++  }
++}
++
++
++void luaG_errormsg (lua_State *L) {
++  if (L->errfunc != 0) {  /* is there an error handling function? */
++    StkId errfunc = restorestack(L, L->errfunc);
++    if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
++    setobjs2s(L, L->top, L->top - 1);  /* move argument */
++    setobjs2s(L, L->top - 1, errfunc);  /* push function */
++    incr_top(L);
++    luaD_call(L, L->top - 2, 1);  /* call it */
++  }
++  luaD_throw(L, LUA_ERRRUN);
++}
++
++
++void luaG_runerror (lua_State *L, const char *fmt, ...) {
++  va_list argp;
++  va_start(argp, fmt);
++  addinfo(L, luaO_pushvfstring(L, fmt, argp));
++  va_end(argp);
++  luaG_errormsg(L);
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/ldebug.h
+@@ -0,0 +1,33 @@
++/*
++** $Id: ldebug.h,v 2.3.1.1 2007/12/27 13:02:25 roberto Exp $
++** Auxiliary functions from Debug Interface module
++** See Copyright Notice in lua.h
++*/
++
++#ifndef ldebug_h
++#define ldebug_h
++
++
++#include "lstate.h"
++
++
++#define pcRel(pc, p)	(cast(int, (pc) - (p)->code) - 1)
++
++#define getline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
++
++#define resethookcount(L)	(L->hookcount = L->basehookcount)
++
++
++LUAI_FUNC void luaG_typeerror (lua_State *L, const TValue *o,
++                                             const char *opname);
++LUAI_FUNC void luaG_concaterror (lua_State *L, StkId p1, StkId p2);
++LUAI_FUNC void luaG_aritherror (lua_State *L, const TValue *p1,
++                                              const TValue *p2);
++LUAI_FUNC int luaG_ordererror (lua_State *L, const TValue *p1,
++                                             const TValue *p2);
++LUAI_FUNC void luaG_runerror (lua_State *L, const char *fmt, ...);
++LUAI_FUNC void luaG_errormsg (lua_State *L);
++LUAI_FUNC int luaG_checkcode (const Proto *pt);
++LUAI_FUNC int luaG_checkopenop (Instruction i);
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/ldo.c
+@@ -0,0 +1,515 @@
++/*
++** $Id: ldo.c,v 2.38.1.3 2008/01/18 22:31:22 roberto Exp $
++** Stack and Call structure of Lua
++** See Copyright Notice in lua.h
++*/
++
++#include <setjmp.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define ldo_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "lgc.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lopcodes.h"
++#include "lparser.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "ltm.h"
++#include "lundump.h"
++#include "lvm.h"
++#include "lzio.h"
++
++
++
++/*
++** {======================================================
++** Error-recovery functions
++** =======================================================
++*/
++
++
++/* chain list of long jump buffers */
++struct lua_longjmp {
++  struct lua_longjmp *previous;
++  luai_jmpbuf b;
++  volatile int status;  /* error code */
++};
++
++
++void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop) {
++  switch (errcode) {
++    case LUA_ERRMEM: {
++      setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
++      break;
++    }
++    case LUA_ERRERR: {
++      setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
++      break;
++    }
++    case LUA_ERRSYNTAX:
++    case LUA_ERRRUN: {
++      setobjs2s(L, oldtop, L->top - 1);  /* error message on current top */
++      break;
++    }
++  }
++  L->top = oldtop + 1;
++}
++
++
++static void restore_stack_limit (lua_State *L) {
++  lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK - 1);
++  if (L->size_ci > LUAI_MAXCALLS) {  /* there was an overflow? */
++    int inuse = cast_int(L->ci - L->base_ci);
++    if (inuse + 1 < LUAI_MAXCALLS)  /* can `undo' overflow? */
++      luaD_reallocCI(L, LUAI_MAXCALLS);
++  }
++}
++
++
++static void resetstack (lua_State *L, int status) {
++  L->ci = L->base_ci;
++  L->base = L->ci->base;
++  luaF_close(L, L->base);  /* close eventual pending closures */
++  luaD_seterrorobj(L, status, L->base);
++  L->nCcalls = L->baseCcalls;
++  L->allowhook = 1;
++  restore_stack_limit(L);
++  L->errfunc = 0;
++  L->errorJmp = NULL;
++}
++
++
++void luaD_throw (lua_State *L, int errcode) {
++  if (L->errorJmp) {
++    L->errorJmp->status = errcode;
++    LUAI_THROW(L, L->errorJmp);
++  }
++  else {
++    L->status = cast_byte(errcode);
++    if (G(L)->panic) {
++      resetstack(L, errcode);
++      lua_unlock(L);
++      G(L)->panic(L);
++    }
++    exit(EXIT_FAILURE);
++  }
++}
++
++
++int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
++  struct lua_longjmp lj;
++  lj.status = 0;
++  lj.previous = L->errorJmp;  /* chain new error handler */
++  L->errorJmp = &lj;
++  LUAI_TRY(L, &lj,
++    (*f)(L, ud);
++  );
++  L->errorJmp = lj.previous;  /* restore old error handler */
++  return lj.status;
++}
++
++/* }====================================================== */
++
++
++static void correctstack (lua_State *L, TValue *oldstack) {
++  CallInfo *ci;
++  GCObject *up;
++  L->top = (L->top - oldstack) + L->stack;
++  for (up = L->openupval; up != NULL; up = up->gch.next)
++    gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack;
++  for (ci = L->base_ci; ci <= L->ci; ci++) {
++    ci->top = (ci->top - oldstack) + L->stack;
++    ci->base = (ci->base - oldstack) + L->stack;
++    ci->func = (ci->func - oldstack) + L->stack;
++  }
++  L->base = (L->base - oldstack) + L->stack;
++}
++
++
++void luaD_reallocstack (lua_State *L, int newsize) {
++  TValue *oldstack = L->stack;
++  int realsize = newsize + 1 + EXTRA_STACK;
++  lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK - 1);
++  luaM_reallocvector(L, L->stack, L->stacksize, realsize, TValue);
++  L->stacksize = realsize;
++  L->stack_last = L->stack+newsize;
++  correctstack(L, oldstack);
++}
++
++
++void luaD_reallocCI (lua_State *L, int newsize) {
++  CallInfo *oldci = L->base_ci;
++  luaM_reallocvector(L, L->base_ci, L->size_ci, newsize, CallInfo);
++  L->size_ci = newsize;
++  L->ci = (L->ci - oldci) + L->base_ci;
++  L->end_ci = L->base_ci + L->size_ci - 1;
++}
++
++
++void luaD_growstack (lua_State *L, int n) {
++  if (n <= L->stacksize)  /* double size is enough? */
++    luaD_reallocstack(L, 2*L->stacksize);
++  else
++    luaD_reallocstack(L, L->stacksize + n);
++}
++
++
++static CallInfo *growCI (lua_State *L) {
++  if (L->size_ci > LUAI_MAXCALLS)  /* overflow while handling overflow? */
++    luaD_throw(L, LUA_ERRERR);
++  else {
++    luaD_reallocCI(L, 2*L->size_ci);
++    if (L->size_ci > LUAI_MAXCALLS)
++      luaG_runerror(L, "stack overflow");
++  }
++  return ++L->ci;
++}
++
++
++void luaD_callhook (lua_State *L, int event, int line) {
++  lua_Hook hook = L->hook;
++  if (hook && L->allowhook) {
++    ptrdiff_t top = savestack(L, L->top);
++    ptrdiff_t ci_top = savestack(L, L->ci->top);
++    lua_Debug ar;
++    ar.event = event;
++    ar.currentline = line;
++    if (event == LUA_HOOKTAILRET)
++      ar.i_ci = 0;  /* tail call; no debug information about it */
++    else
++      ar.i_ci = cast_int(L->ci - L->base_ci);
++    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
++    L->ci->top = L->top + LUA_MINSTACK;
++    lua_assert(L->ci->top <= L->stack_last);
++    L->allowhook = 0;  /* cannot call hooks inside a hook */
++    lua_unlock(L);
++    (*hook)(L, &ar);
++    lua_lock(L);
++    lua_assert(!L->allowhook);
++    L->allowhook = 1;
++    L->ci->top = restorestack(L, ci_top);
++    L->top = restorestack(L, top);
++  }
++}
++
++
++static StkId adjust_varargs (lua_State *L, Proto *p, int actual) {
++  int i;
++  int nfixargs = p->numparams;
++  Table *htab = NULL;
++  StkId base, fixed;
++  for (; actual < nfixargs; ++actual)
++    setnilvalue(L->top++);
++#if defined(LUA_COMPAT_VARARG)
++  if (p->is_vararg & VARARG_NEEDSARG) { /* compat. with old-style vararg? */
++    int nvar = actual - nfixargs;  /* number of extra arguments */
++    lua_assert(p->is_vararg & VARARG_HASARG);
++    luaC_checkGC(L);
++    htab = luaH_new(L, nvar, 1);  /* create `arg' table */
++    for (i=0; i<nvar; i++)  /* put extra arguments into `arg' table */
++      setobj2n(L, luaH_setnum(L, htab, i+1), L->top - nvar + i);
++    /* store counter in field `n' */
++    setnvalue(luaH_setstr(L, htab, luaS_newliteral(L, "n")), cast_num(nvar));
++  }
++#endif
++  /* move fixed parameters to final position */
++  fixed = L->top - actual;  /* first fixed argument */
++  base = L->top;  /* final position of first argument */
++  for (i=0; i<nfixargs; i++) {
++    setobjs2s(L, L->top++, fixed+i);
++    setnilvalue(fixed+i);
++  }
++  /* add `arg' parameter */
++  if (htab) {
++    sethvalue(L, L->top++, htab);
++    lua_assert(iswhite(obj2gco(htab)));
++  }
++  return base;
++}
++
++
++static StkId tryfuncTM (lua_State *L, StkId func) {
++  const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
++  StkId p;
++  ptrdiff_t funcr = savestack(L, func);
++  if (!ttisfunction(tm))
++    luaG_typeerror(L, func, "call");
++  /* Open a hole inside the stack at `func' */
++  for (p = L->top; p > func; p--) setobjs2s(L, p, p-1);
++  incr_top(L);
++  func = restorestack(L, funcr);  /* previous call may change stack */
++  setobj2s(L, func, tm);  /* tag method is the new function to be called */
++  return func;
++}
++
++
++
++#define inc_ci(L) \
++  ((L->ci == L->end_ci) ? growCI(L) : \
++   (condhardstacktests(luaD_reallocCI(L, L->size_ci)), ++L->ci))
++
++
++int luaD_precall (lua_State *L, StkId func, int nresults) {
++  LClosure *cl;
++  ptrdiff_t funcr;
++  if (!ttisfunction(func)) /* `func' is not a function? */
++    func = tryfuncTM(L, func);  /* check the `function' tag method */
++  funcr = savestack(L, func);
++  cl = &clvalue(func)->l;
++  L->ci->savedpc = L->savedpc;
++  if (!cl->isC) {  /* Lua function? prepare its call */
++    CallInfo *ci;
++    StkId st, base;
++    Proto *p = cl->p;
++    luaD_checkstack(L, p->maxstacksize);
++    func = restorestack(L, funcr);
++    if (!p->is_vararg) {  /* no varargs? */
++      base = func + 1;
++      if (L->top > base + p->numparams)
++        L->top = base + p->numparams;
++    }
++    else {  /* vararg function */
++      int nargs = cast_int(L->top - func) - 1;
++      base = adjust_varargs(L, p, nargs);
++      func = restorestack(L, funcr);  /* previous call may change the stack */
++    }
++    ci = inc_ci(L);  /* now `enter' new function */
++    ci->func = func;
++    L->base = ci->base = base;
++    ci->top = L->base + p->maxstacksize;
++    lua_assert(ci->top <= L->stack_last);
++    L->savedpc = p->code;  /* starting point */
++    ci->tailcalls = 0;
++    ci->nresults = nresults;
++    for (st = L->top; st < ci->top; st++)
++      setnilvalue(st);
++    L->top = ci->top;
++    if (L->hookmask & LUA_MASKCALL) {
++      L->savedpc++;  /* hooks assume 'pc' is already incremented */
++      luaD_callhook(L, LUA_HOOKCALL, -1);
++      L->savedpc--;  /* correct 'pc' */
++    }
++    return PCRLUA;
++  }
++  else {  /* if is a C function, call it */
++    CallInfo *ci;
++    int n;
++    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
++    ci = inc_ci(L);  /* now `enter' new function */
++    ci->func = restorestack(L, funcr);
++    L->base = ci->base = ci->func + 1;
++    ci->top = L->top + LUA_MINSTACK;
++    lua_assert(ci->top <= L->stack_last);
++    ci->nresults = nresults;
++    if (L->hookmask & LUA_MASKCALL)
++      luaD_callhook(L, LUA_HOOKCALL, -1);
++    lua_unlock(L);
++    n = (*curr_func(L)->c.f)(L);  /* do the actual call */
++    lua_lock(L);
++    if (n < 0)  /* yielding? */
++      return PCRYIELD;
++    else {
++      luaD_poscall(L, L->top - n);
++      return PCRC;
++    }
++  }
++}
++
++
++static StkId callrethooks (lua_State *L, StkId firstResult) {
++  ptrdiff_t fr = savestack(L, firstResult);  /* next call may change stack */
++  luaD_callhook(L, LUA_HOOKRET, -1);
++  if (f_isLua(L->ci)) {  /* Lua function? */
++    while ((L->hookmask & LUA_MASKRET) && L->ci->tailcalls--) /* tail calls */
++      luaD_callhook(L, LUA_HOOKTAILRET, -1);
++  }
++  return restorestack(L, fr);
++}
++
++
++int luaD_poscall (lua_State *L, StkId firstResult) {
++  StkId res;
++  int wanted, i;
++  CallInfo *ci;
++  if (L->hookmask & LUA_MASKRET)
++    firstResult = callrethooks(L, firstResult);
++  ci = L->ci--;
++  res = ci->func;  /* res == final position of 1st result */
++  wanted = ci->nresults;
++  L->base = (ci - 1)->base;  /* restore base */
++  L->savedpc = (ci - 1)->savedpc;  /* restore savedpc */
++  /* move results to correct place */
++  for (i = wanted; i != 0 && firstResult < L->top; i--)
++    setobjs2s(L, res++, firstResult++);
++  while (i-- > 0)
++    setnilvalue(res++);
++  L->top = res;
++  return (wanted - LUA_MULTRET);  /* 0 iff wanted == LUA_MULTRET */
++}
++
++
++/*
++** Call a function (C or Lua). The function to be called is at *func.
++** The arguments are on the stack, right after the function.
++** When returns, all the results are on the stack, starting at the original
++** function position.
++*/
++void luaD_call (lua_State *L, StkId func, int nResults) {
++  if (++L->nCcalls >= LUAI_MAXCCALLS) {
++    if (L->nCcalls == LUAI_MAXCCALLS)
++      luaG_runerror(L, "C stack overflow");
++    else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3)))
++      luaD_throw(L, LUA_ERRERR);  /* error while handing stack error */
++  }
++  if (luaD_precall(L, func, nResults) == PCRLUA)  /* is a Lua function? */
++    luaV_execute(L, 1);  /* call it */
++  L->nCcalls--;
++  luaC_checkGC(L);
++}
++
++
++static void resume (lua_State *L, void *ud) {
++  StkId firstArg = cast(StkId, ud);
++  CallInfo *ci = L->ci;
++  if (L->status == 0) {  /* start coroutine? */
++    lua_assert(ci == L->base_ci && firstArg > L->base);
++    if (luaD_precall(L, firstArg - 1, LUA_MULTRET) != PCRLUA)
++      return;
++  }
++  else {  /* resuming from previous yield */
++    lua_assert(L->status == LUA_YIELD);
++    L->status = 0;
++    if (!f_isLua(ci)) {  /* `common' yield? */
++      /* finish interrupted execution of `OP_CALL' */
++      lua_assert(GET_OPCODE(*((ci-1)->savedpc - 1)) == OP_CALL ||
++                 GET_OPCODE(*((ci-1)->savedpc - 1)) == OP_TAILCALL);
++      if (luaD_poscall(L, firstArg))  /* complete it... */
++        L->top = L->ci->top;  /* and correct top if not multiple results */
++    }
++    else  /* yielded inside a hook: just continue its execution */
++      L->base = L->ci->base;
++  }
++  luaV_execute(L, cast_int(L->ci - L->base_ci));
++}
++
++
++static int resume_error (lua_State *L, const char *msg) {
++  L->top = L->ci->base;
++  setsvalue2s(L, L->top, luaS_new(L, msg));
++  incr_top(L);
++  lua_unlock(L);
++  return LUA_ERRRUN;
++}
++
++
++LUA_API int lua_resume (lua_State *L, int nargs) {
++  int status;
++  lua_lock(L);
++  if (L->status != LUA_YIELD && (L->status != 0 || L->ci != L->base_ci))
++      return resume_error(L, "cannot resume non-suspended coroutine");
++  if (L->nCcalls >= LUAI_MAXCCALLS)
++    return resume_error(L, "C stack overflow");
++  luai_userstateresume(L, nargs);
++  lua_assert(L->errfunc == 0);
++  L->baseCcalls = ++L->nCcalls;
++  status = luaD_rawrunprotected(L, resume, L->top - nargs);
++  if (status != 0) {  /* error? */
++    L->status = cast_byte(status);  /* mark thread as `dead' */
++    luaD_seterrorobj(L, status, L->top);
++    L->ci->top = L->top;
++  }
++  else {
++    lua_assert(L->nCcalls == L->baseCcalls);
++    status = L->status;
++  }
++  --L->nCcalls;
++  lua_unlock(L);
++  return status;
++}
++
++
++LUA_API int lua_yield (lua_State *L, int nresults) {
++  luai_userstateyield(L, nresults);
++  lua_lock(L);
++  if (L->nCcalls > L->baseCcalls)
++    luaG_runerror(L, "attempt to yield across metamethod/C-call boundary");
++  L->base = L->top - nresults;  /* protect stack slots below */
++  L->status = LUA_YIELD;
++  lua_unlock(L);
++  return -1;
++}
++
++
++int luaD_pcall (lua_State *L, Pfunc func, void *u,
++                ptrdiff_t old_top, ptrdiff_t ef) {
++  int status;
++  unsigned short oldnCcalls = L->nCcalls;
++  ptrdiff_t old_ci = saveci(L, L->ci);
++  lu_byte old_allowhooks = L->allowhook;
++  ptrdiff_t old_errfunc = L->errfunc;
++  L->errfunc = ef;
++  status = luaD_rawrunprotected(L, func, u);
++  if (status != 0) {  /* an error occurred? */
++    StkId oldtop = restorestack(L, old_top);
++    luaF_close(L, oldtop);  /* close eventual pending closures */
++    luaD_seterrorobj(L, status, oldtop);
++    L->nCcalls = oldnCcalls;
++    L->ci = restoreci(L, old_ci);
++    L->base = L->ci->base;
++    L->savedpc = L->ci->savedpc;
++    L->allowhook = old_allowhooks;
++    restore_stack_limit(L);
++  }
++  L->errfunc = old_errfunc;
++  return status;
++}
++
++
++
++/*
++** Execute a protected parser.
++*/
++struct SParser {  /* data to `f_parser' */
++  ZIO *z;
++  Mbuffer buff;  /* buffer to be used by the scanner */
++  const char *name;
++};
++
++static void f_parser (lua_State *L, void *ud) {
++  int i;
++  Proto *tf;
++  Closure *cl;
++  struct SParser *p = cast(struct SParser *, ud);
++  int c = luaZ_lookahead(p->z);
++  luaC_checkGC(L);
++  tf = ((c == LUA_SIGNATURE[0]) ? luaU_undump : luaY_parser)(L, p->z,
++                                                             &p->buff, p->name);
++  cl = luaF_newLclosure(L, tf->nups, hvalue(gt(L)));
++  cl->l.p = tf;
++  for (i = 0; i < tf->nups; i++)  /* initialize eventual upvalues */
++    cl->l.upvals[i] = luaF_newupval(L);
++  setclvalue(L, L->top, cl);
++  incr_top(L);
++}
++
++
++int luaD_protectedparser (lua_State *L, ZIO *z, const char *name) {
++  struct SParser p;
++  int status;
++  p.z = z; p.name = name;
++  luaZ_initbuffer(L, &p.buff);
++  status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc);
++  luaZ_freebuffer(L, &p.buff);
++  return status;
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/ldo.h
+@@ -0,0 +1,57 @@
++/*
++** $Id: ldo.h,v 2.7.1.1 2007/12/27 13:02:25 roberto Exp $
++** Stack and Call structure of Lua
++** See Copyright Notice in lua.h
++*/
++
++#ifndef ldo_h
++#define ldo_h
++
++
++#include "lobject.h"
++#include "lstate.h"
++#include "lzio.h"
++
++
++#define luaD_checkstack(L,n)	\
++  if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TValue)) \
++    luaD_growstack(L, n); \
++  else condhardstacktests(luaD_reallocstack(L, L->stacksize - EXTRA_STACK - 1));
++
++
++#define incr_top(L) {luaD_checkstack(L,1); L->top++;}
++
++#define savestack(L,p)		((char *)(p) - (char *)L->stack)
++#define restorestack(L,n)	((TValue *)((char *)L->stack + (n)))
++
++#define saveci(L,p)		((char *)(p) - (char *)L->base_ci)
++#define restoreci(L,n)		((CallInfo *)((char *)L->base_ci + (n)))
++
++
++/* results from luaD_precall */
++#define PCRLUA		0	/* initiated a call to a Lua function */
++#define PCRC		1	/* did a call to a C function */
++#define PCRYIELD	2	/* C funtion yielded */
++
++
++/* type of protected functions, to be ran by `runprotected' */
++typedef void (*Pfunc) (lua_State *L, void *ud);
++
++LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name);
++LUAI_FUNC void luaD_callhook (lua_State *L, int event, int line);
++LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults);
++LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults);
++LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
++                                        ptrdiff_t oldtop, ptrdiff_t ef);
++LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
++LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
++LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
++LUAI_FUNC void luaD_growstack (lua_State *L, int n);
++
++LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
++LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
++
++LUAI_FUNC void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop);
++
++#endif
++
+--- /dev/null
++++ b/extensions/LUA/lua/ldump.c
+@@ -0,0 +1,164 @@
++/*
++** $Id: ldump.c,v 2.8.1.1 2007/12/27 13:02:25 roberto Exp $
++** save precompiled Lua chunks
++** See Copyright Notice in lua.h
++*/
++
++#include <stddef.h>
++
++#define ldump_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lobject.h"
++#include "lstate.h"
++#include "lundump.h"
++
++typedef struct {
++ lua_State* L;
++ lua_Writer writer;
++ void* data;
++ int strip;
++ int status;
++} DumpState;
++
++#define DumpMem(b,n,size,D)	DumpBlock(b,(n)*(size),D)
++#define DumpVar(x,D)	 	DumpMem(&x,1,sizeof(x),D)
++
++static void DumpBlock(const void* b, size_t size, DumpState* D)
++{
++ if (D->status==0)
++ {
++  lua_unlock(D->L);
++  D->status=(*D->writer)(D->L,b,size,D->data);
++  lua_lock(D->L);
++ }
++}
++
++static void DumpChar(int y, DumpState* D)
++{
++ char x=(char)y;
++ DumpVar(x,D);
++}
++
++static void DumpInt(int x, DumpState* D)
++{
++ DumpVar(x,D);
++}
++
++static void DumpNumber(lua_Number x, DumpState* D)
++{
++ DumpVar(x,D);
++}
++
++static void DumpVector(const void* b, int n, size_t size, DumpState* D)
++{
++ DumpInt(n,D);
++ DumpMem(b,n,size,D);
++}
++
++static void DumpString(const TString* s, DumpState* D)
++{
++ if (s==NULL || getstr(s)==NULL)
++ {
++  size_t size=0;
++  DumpVar(size,D);
++ }
++ else
++ {
++  size_t size=s->tsv.len+1;		/* include trailing '\0' */
++  DumpVar(size,D);
++  DumpBlock(getstr(s),size,D);
++ }
++}
++
++#define DumpCode(f,D)	 DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
++
++static void DumpFunction(const Proto* f, const TString* p, DumpState* D);
++
++static void DumpConstants(const Proto* f, DumpState* D)
++{
++ int i,n=f->sizek;
++ DumpInt(n,D);
++ for (i=0; i<n; i++)
++ {
++  const TValue* o=&f->k[i];
++  DumpChar(ttype(o),D);
++  switch (ttype(o))
++  {
++   case LUA_TNIL:
++	break;
++   case LUA_TBOOLEAN:
++	DumpChar(bvalue(o),D);
++	break;
++   case LUA_TNUMBER:
++	DumpNumber(nvalue(o),D);
++	break;
++   case LUA_TSTRING:
++	DumpString(rawtsvalue(o),D);
++	break;
++   default:
++	lua_assert(0);			/* cannot happen */
++	break;
++  }
++ }
++ n=f->sizep;
++ DumpInt(n,D);
++ for (i=0; i<n; i++) DumpFunction(f->p[i],f->source,D);
++}
++
++static void DumpDebug(const Proto* f, DumpState* D)
++{
++ int i,n;
++ n= (D->strip) ? 0 : f->sizelineinfo;
++ DumpVector(f->lineinfo,n,sizeof(int),D);
++ n= (D->strip) ? 0 : f->sizelocvars;
++ DumpInt(n,D);
++ for (i=0; i<n; i++)
++ {
++  DumpString(f->locvars[i].varname,D);
++  DumpInt(f->locvars[i].startpc,D);
++  DumpInt(f->locvars[i].endpc,D);
++ }
++ n= (D->strip) ? 0 : f->sizeupvalues;
++ DumpInt(n,D);
++ for (i=0; i<n; i++) DumpString(f->upvalues[i],D);
++}
++
++static void DumpFunction(const Proto* f, const TString* p, DumpState* D)
++{
++ DumpString((f->source==p || D->strip) ? NULL : f->source,D);
++ DumpInt(f->linedefined,D);
++ DumpInt(f->lastlinedefined,D);
++ DumpChar(f->nups,D);
++ DumpChar(f->numparams,D);
++ DumpChar(f->is_vararg,D);
++ DumpChar(f->maxstacksize,D);
++ DumpCode(f,D);
++ DumpConstants(f,D);
++ DumpDebug(f,D);
++}
++
++static void DumpHeader(DumpState* D)
++{
++ char h[LUAC_HEADERSIZE];
++ luaU_header(h);
++ DumpBlock(h,LUAC_HEADERSIZE,D);
++}
++
++/*
++** dump Lua function as precompiled chunk
++*/
++int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip)
++{
++ DumpState D;
++ D.L=L;
++ D.writer=w;
++ D.data=data;
++ D.strip=strip;
++ D.status=0;
++ DumpHeader(&D);
++ DumpFunction(f,NULL,&D);
++ return D.status;
++}
+--- /dev/null
++++ b/extensions/LUA/lua/lfunc.c
+@@ -0,0 +1,174 @@
++/*
++** $Id: lfunc.c,v 2.12.1.2 2007/12/28 14:58:43 roberto Exp $
++** Auxiliary functions to manipulate prototypes and closures
++** See Copyright Notice in lua.h
++*/
++
++
++#include <stddef.h>
++
++#define lfunc_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lfunc.h"
++#include "lgc.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lstate.h"
++
++
++
++Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e) {
++  Closure *c = cast(Closure *, luaM_malloc(L, sizeCclosure(nelems)));
++  luaC_link(L, obj2gco(c), LUA_TFUNCTION);
++  c->c.isC = 1;
++  c->c.env = e;
++  c->c.nupvalues = cast_byte(nelems);
++  return c;
++}
++
++
++Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e) {
++  Closure *c = cast(Closure *, luaM_malloc(L, sizeLclosure(nelems)));
++  luaC_link(L, obj2gco(c), LUA_TFUNCTION);
++  c->l.isC = 0;
++  c->l.env = e;
++  c->l.nupvalues = cast_byte(nelems);
++  while (nelems--) c->l.upvals[nelems] = NULL;
++  return c;
++}
++
++
++UpVal *luaF_newupval (lua_State *L) {
++  UpVal *uv = luaM_new(L, UpVal);
++  luaC_link(L, obj2gco(uv), LUA_TUPVAL);
++  uv->v = &uv->u.value;
++  setnilvalue(uv->v);
++  return uv;
++}
++
++
++UpVal *luaF_findupval (lua_State *L, StkId level) {
++  global_State *g = G(L);
++  GCObject **pp = &L->openupval;
++  UpVal *p;
++  UpVal *uv;
++  while (*pp != NULL && (p = ngcotouv(*pp))->v >= level) {
++    lua_assert(p->v != &p->u.value);
++    if (p->v == level) {  /* found a corresponding upvalue? */
++      if (isdead(g, obj2gco(p)))  /* is it dead? */
++        changewhite(obj2gco(p));  /* ressurect it */
++      return p;
++    }
++    pp = &p->next;
++  }
++  uv = luaM_new(L, UpVal);  /* not found: create a new one */
++  uv->tt = LUA_TUPVAL;
++  uv->marked = luaC_white(g);
++  uv->v = level;  /* current value lives in the stack */
++  uv->next = *pp;  /* chain it in the proper position */
++  *pp = obj2gco(uv);
++  uv->u.l.prev = &g->uvhead;  /* double link it in `uvhead' list */
++  uv->u.l.next = g->uvhead.u.l.next;
++  uv->u.l.next->u.l.prev = uv;
++  g->uvhead.u.l.next = uv;
++  lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
++  return uv;
++}
++
++
++static void unlinkupval (UpVal *uv) {
++  lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
++  uv->u.l.next->u.l.prev = uv->u.l.prev;  /* remove from `uvhead' list */
++  uv->u.l.prev->u.l.next = uv->u.l.next;
++}
++
++
++void luaF_freeupval (lua_State *L, UpVal *uv) {
++  if (uv->v != &uv->u.value)  /* is it open? */
++    unlinkupval(uv);  /* remove from open list */
++  luaM_free(L, uv);  /* free upvalue */
++}
++
++
++void luaF_close (lua_State *L, StkId level) {
++  UpVal *uv;
++  global_State *g = G(L);
++  while (L->openupval != NULL && (uv = ngcotouv(L->openupval))->v >= level) {
++    GCObject *o = obj2gco(uv);
++    lua_assert(!isblack(o) && uv->v != &uv->u.value);
++    L->openupval = uv->next;  /* remove from `open' list */
++    if (isdead(g, o))
++      luaF_freeupval(L, uv);  /* free upvalue */
++    else {
++      unlinkupval(uv);
++      setobj(L, &uv->u.value, uv->v);
++      uv->v = &uv->u.value;  /* now current value lives here */
++      luaC_linkupval(L, uv);  /* link upvalue into `gcroot' list */
++    }
++  }
++}
++
++
++Proto *luaF_newproto (lua_State *L) {
++  Proto *f = luaM_new(L, Proto);
++  luaC_link(L, obj2gco(f), LUA_TPROTO);
++  f->k = NULL;
++  f->sizek = 0;
++  f->p = NULL;
++  f->sizep = 0;
++  f->code = NULL;
++  f->sizecode = 0;
++  f->sizelineinfo = 0;
++  f->sizeupvalues = 0;
++  f->nups = 0;
++  f->upvalues = NULL;
++  f->numparams = 0;
++  f->is_vararg = 0;
++  f->maxstacksize = 0;
++  f->lineinfo = NULL;
++  f->sizelocvars = 0;
++  f->locvars = NULL;
++  f->linedefined = 0;
++  f->lastlinedefined = 0;
++  f->source = NULL;
++  return f;
++}
++
++
++void luaF_freeproto (lua_State *L, Proto *f) {
++  luaM_freearray(L, f->code, f->sizecode, Instruction);
++  luaM_freearray(L, f->p, f->sizep, Proto *);
++  luaM_freearray(L, f->k, f->sizek, TValue);
++  luaM_freearray(L, f->lineinfo, f->sizelineinfo, int);
++  luaM_freearray(L, f->locvars, f->sizelocvars, struct LocVar);
++  luaM_freearray(L, f->upvalues, f->sizeupvalues, TString *);
++  luaM_free(L, f);
++}
++
++
++void luaF_freeclosure (lua_State *L, Closure *c) {
++  int size = (c->c.isC) ? sizeCclosure(c->c.nupvalues) :
++                          sizeLclosure(c->l.nupvalues);
++  luaM_freemem(L, c, size);
++}
++
++
++/*
++** Look for n-th local variable at line `line' in function `func'.
++** Returns NULL if not found.
++*/
++const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
++  int i;
++  for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
++    if (pc < f->locvars[i].endpc) {  /* is variable active? */
++      local_number--;
++      if (local_number == 0)
++        return getstr(f->locvars[i].varname);
++    }
++  }
++  return NULL;  /* not found */
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lfunc.h
+@@ -0,0 +1,34 @@
++/*
++** $Id: lfunc.h,v 2.4.1.1 2007/12/27 13:02:25 roberto Exp $
++** Auxiliary functions to manipulate prototypes and closures
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lfunc_h
++#define lfunc_h
++
++
++#include "lobject.h"
++
++
++#define sizeCclosure(n)	(cast(int, sizeof(CClosure)) + \
++                         cast(int, sizeof(TValue)*((n)-1)))
++
++#define sizeLclosure(n)	(cast(int, sizeof(LClosure)) + \
++                         cast(int, sizeof(TValue *)*((n)-1)))
++
++
++LUAI_FUNC Proto *luaF_newproto (lua_State *L);
++LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
++LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
++LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
++LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
++LUAI_FUNC void luaF_close (lua_State *L, StkId level);
++LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
++LUAI_FUNC void luaF_freeclosure (lua_State *L, Closure *c);
++LUAI_FUNC void luaF_freeupval (lua_State *L, UpVal *uv);
++LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
++                                         int pc);
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lgc.c
+@@ -0,0 +1,711 @@
++/*
++** $Id: lgc.c,v 2.38.1.1 2007/12/27 13:02:25 roberto Exp $
++** Garbage Collector
++** See Copyright Notice in lua.h
++*/
++
++#include <string.h>
++
++#define lgc_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "lgc.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "ltm.h"
++
++
++#define GCSTEPSIZE	1024u
++#define GCSWEEPMAX	40
++#define GCSWEEPCOST	10
++#define GCFINALIZECOST	100
++
++
++#define maskmarks	cast_byte(~(bitmask(BLACKBIT)|WHITEBITS))
++
++#define makewhite(g,x)	\
++   ((x)->gch.marked = cast_byte(((x)->gch.marked & maskmarks) | luaC_white(g)))
++
++#define white2gray(x)	reset2bits((x)->gch.marked, WHITE0BIT, WHITE1BIT)
++#define black2gray(x)	resetbit((x)->gch.marked, BLACKBIT)
++
++#define stringmark(s)	reset2bits((s)->tsv.marked, WHITE0BIT, WHITE1BIT)
++
++
++#define isfinalized(u)		testbit((u)->marked, FINALIZEDBIT)
++#define markfinalized(u)	l_setbit((u)->marked, FINALIZEDBIT)
++
++
++#define KEYWEAK         bitmask(KEYWEAKBIT)
++#define VALUEWEAK       bitmask(VALUEWEAKBIT)
++
++
++
++#define markvalue(g,o) { checkconsistency(o); \
++  if (iscollectable(o) && iswhite(gcvalue(o))) reallymarkobject(g,gcvalue(o)); }
++
++#define markobject(g,t) { if (iswhite(obj2gco(t))) \
++		reallymarkobject(g, obj2gco(t)); }
++
++
++#define setthreshold(g)  (g->GCthreshold = (g->estimate/100) * g->gcpause)
++
++
++static void removeentry (Node *n) {
++  lua_assert(ttisnil(gval(n)));
++  if (iscollectable(gkey(n)))
++    setttype(gkey(n), LUA_TDEADKEY);  /* dead key; remove it */
++}
++
++
++static void reallymarkobject (global_State *g, GCObject *o) {
++  lua_assert(iswhite(o) && !isdead(g, o));
++  white2gray(o);
++  switch (o->gch.tt) {
++    case LUA_TSTRING: {
++      return;
++    }
++    case LUA_TUSERDATA: {
++      Table *mt = gco2u(o)->metatable;
++      gray2black(o);  /* udata are never gray */
++      if (mt) markobject(g, mt);
++      markobject(g, gco2u(o)->env);
++      return;
++    }
++    case LUA_TUPVAL: {
++      UpVal *uv = gco2uv(o);
++      markvalue(g, uv->v);
++      if (uv->v == &uv->u.value)  /* closed? */
++        gray2black(o);  /* open upvalues are never black */
++      return;
++    }
++    case LUA_TFUNCTION: {
++      gco2cl(o)->c.gclist = g->gray;
++      g->gray = o;
++      break;
++    }
++    case LUA_TTABLE: {
++      gco2h(o)->gclist = g->gray;
++      g->gray = o;
++      break;
++    }
++    case LUA_TTHREAD: {
++      gco2th(o)->gclist = g->gray;
++      g->gray = o;
++      break;
++    }
++    case LUA_TPROTO: {
++      gco2p(o)->gclist = g->gray;
++      g->gray = o;
++      break;
++    }
++    default: lua_assert(0);
++  }
++}
++
++
++static void marktmu (global_State *g) {
++  GCObject *u = g->tmudata;
++  if (u) {
++    do {
++      u = u->gch.next;
++      makewhite(g, u);  /* may be marked, if left from previous GC */
++      reallymarkobject(g, u);
++    } while (u != g->tmudata);
++  }
++}
++
++
++/* move `dead' udata that need finalization to list `tmudata' */
++size_t luaC_separateudata (lua_State *L, int all) {
++  global_State *g = G(L);
++  size_t deadmem = 0;
++  GCObject **p = &g->mainthread->next;
++  GCObject *curr;
++  while ((curr = *p) != NULL) {
++    if (!(iswhite(curr) || all) || isfinalized(gco2u(curr)))
++      p = &curr->gch.next;  /* don't bother with them */
++    else if (fasttm(L, gco2u(curr)->metatable, TM_GC) == NULL) {
++      markfinalized(gco2u(curr));  /* don't need finalization */
++      p = &curr->gch.next;
++    }
++    else {  /* must call its gc method */
++      deadmem += sizeudata(gco2u(curr));
++      markfinalized(gco2u(curr));
++      *p = curr->gch.next;
++      /* link `curr' at the end of `tmudata' list */
++      if (g->tmudata == NULL)  /* list is empty? */
++        g->tmudata = curr->gch.next = curr;  /* creates a circular list */
++      else {
++        curr->gch.next = g->tmudata->gch.next;
++        g->tmudata->gch.next = curr;
++        g->tmudata = curr;
++      }
++    }
++  }
++  return deadmem;
++}
++
++
++static int traversetable (global_State *g, Table *h) {
++  int i;
++  int weakkey = 0;
++  int weakvalue = 0;
++  const TValue *mode;
++  if (h->metatable)
++    markobject(g, h->metatable);
++  mode = gfasttm(g, h->metatable, TM_MODE);
++  if (mode && ttisstring(mode)) {  /* is there a weak mode? */
++    weakkey = (strchr(svalue(mode), 'k') != NULL);
++    weakvalue = (strchr(svalue(mode), 'v') != NULL);
++    if (weakkey || weakvalue) {  /* is really weak? */
++      h->marked &= ~(KEYWEAK | VALUEWEAK);  /* clear bits */
++      h->marked |= cast_byte((weakkey << KEYWEAKBIT) |
++                             (weakvalue << VALUEWEAKBIT));
++      h->gclist = g->weak;  /* must be cleared after GC, ... */
++      g->weak = obj2gco(h);  /* ... so put in the appropriate list */
++    }
++  }
++  if (weakkey && weakvalue) return 1;
++  if (!weakvalue) {
++    i = h->sizearray;
++    while (i--)
++      markvalue(g, &h->array[i]);
++  }
++  i = sizenode(h);
++  while (i--) {
++    Node *n = gnode(h, i);
++    lua_assert(ttype(gkey(n)) != LUA_TDEADKEY || ttisnil(gval(n)));
++    if (ttisnil(gval(n)))
++      removeentry(n);  /* remove empty entries */
++    else {
++      lua_assert(!ttisnil(gkey(n)));
++      if (!weakkey) markvalue(g, gkey(n));
++      if (!weakvalue) markvalue(g, gval(n));
++    }
++  }
++  return weakkey || weakvalue;
++}
++
++
++/*
++** All marks are conditional because a GC may happen while the
++** prototype is still being created
++*/
++static void traverseproto (global_State *g, Proto *f) {
++  int i;
++  if (f->source) stringmark(f->source);
++  for (i=0; i<f->sizek; i++)  /* mark literals */
++    markvalue(g, &f->k[i]);
++  for (i=0; i<f->sizeupvalues; i++) {  /* mark upvalue names */
++    if (f->upvalues[i])
++      stringmark(f->upvalues[i]);
++  }
++  for (i=0; i<f->sizep; i++) {  /* mark nested protos */
++    if (f->p[i])
++      markobject(g, f->p[i]);
++  }
++  for (i=0; i<f->sizelocvars; i++) {  /* mark local-variable names */
++    if (f->locvars[i].varname)
++      stringmark(f->locvars[i].varname);
++  }
++}
++
++
++
++static void traverseclosure (global_State *g, Closure *cl) {
++  markobject(g, cl->c.env);
++  if (cl->c.isC) {
++    int i;
++    for (i=0; i<cl->c.nupvalues; i++)  /* mark its upvalues */
++      markvalue(g, &cl->c.upvalue[i]);
++  }
++  else {
++    int i;
++    lua_assert(cl->l.nupvalues == cl->l.p->nups);
++    markobject(g, cl->l.p);
++    for (i=0; i<cl->l.nupvalues; i++)  /* mark its upvalues */
++      markobject(g, cl->l.upvals[i]);
++  }
++}
++
++
++static void checkstacksizes (lua_State *L, StkId max) {
++  int ci_used = cast_int(L->ci - L->base_ci);  /* number of `ci' in use */
++  int s_used = cast_int(max - L->stack);  /* part of stack in use */
++  if (L->size_ci > LUAI_MAXCALLS)  /* handling overflow? */
++    return;  /* do not touch the stacks */
++  if (4*ci_used < L->size_ci && 2*BASIC_CI_SIZE < L->size_ci)
++    luaD_reallocCI(L, L->size_ci/2);  /* still big enough... */
++  condhardstacktests(luaD_reallocCI(L, ci_used + 1));
++  if (4*s_used < L->stacksize &&
++      2*(BASIC_STACK_SIZE+EXTRA_STACK) < L->stacksize)
++    luaD_reallocstack(L, L->stacksize/2);  /* still big enough... */
++  condhardstacktests(luaD_reallocstack(L, s_used));
++}
++
++
++static void traversestack (global_State *g, lua_State *l) {
++  StkId o, lim;
++  CallInfo *ci;
++  markvalue(g, gt(l));
++  lim = l->top;
++  for (ci = l->base_ci; ci <= l->ci; ci++) {
++    lua_assert(ci->top <= l->stack_last);
++    if (lim < ci->top) lim = ci->top;
++  }
++  for (o = l->stack; o < l->top; o++)
++    markvalue(g, o);
++  for (; o <= lim; o++)
++    setnilvalue(o);
++  checkstacksizes(l, lim);
++}
++
++
++/*
++** traverse one gray object, turning it to black.
++** Returns `quantity' traversed.
++*/
++static l_mem propagatemark (global_State *g) {
++  GCObject *o = g->gray;
++  lua_assert(isgray(o));
++  gray2black(o);
++  switch (o->gch.tt) {
++    case LUA_TTABLE: {
++      Table *h = gco2h(o);
++      g->gray = h->gclist;
++      if (traversetable(g, h))  /* table is weak? */
++        black2gray(o);  /* keep it gray */
++      return sizeof(Table) + sizeof(TValue) * h->sizearray +
++                             sizeof(Node) * sizenode(h);
++    }
++    case LUA_TFUNCTION: {
++      Closure *cl = gco2cl(o);
++      g->gray = cl->c.gclist;
++      traverseclosure(g, cl);
++      return (cl->c.isC) ? sizeCclosure(cl->c.nupvalues) :
++                           sizeLclosure(cl->l.nupvalues);
++    }
++    case LUA_TTHREAD: {
++      lua_State *th = gco2th(o);
++      g->gray = th->gclist;
++      th->gclist = g->grayagain;
++      g->grayagain = o;
++      black2gray(o);
++      traversestack(g, th);
++      return sizeof(lua_State) + sizeof(TValue) * th->stacksize +
++                                 sizeof(CallInfo) * th->size_ci;
++    }
++    case LUA_TPROTO: {
++      Proto *p = gco2p(o);
++      g->gray = p->gclist;
++      traverseproto(g, p);
++      return sizeof(Proto) + sizeof(Instruction) * p->sizecode +
++                             sizeof(Proto *) * p->sizep +
++                             sizeof(TValue) * p->sizek + 
++                             sizeof(int) * p->sizelineinfo +
++                             sizeof(LocVar) * p->sizelocvars +
++                             sizeof(TString *) * p->sizeupvalues;
++    }
++    default: lua_assert(0); return 0;
++  }
++}
++
++
++static size_t propagateall (global_State *g) {
++  size_t m = 0;
++  while (g->gray) m += propagatemark(g);
++  return m;
++}
++
++
++/*
++** The next function tells whether a key or value can be cleared from
++** a weak table. Non-collectable objects are never removed from weak
++** tables. Strings behave as `values', so are never removed too. for
++** other objects: if really collected, cannot keep them; for userdata
++** being finalized, keep them in keys, but not in values
++*/
++static int iscleared (const TValue *o, int iskey) {
++  if (!iscollectable(o)) return 0;
++  if (ttisstring(o)) {
++    stringmark(rawtsvalue(o));  /* strings are `values', so are never weak */
++    return 0;
++  }
++  return iswhite(gcvalue(o)) ||
++    (ttisuserdata(o) && (!iskey && isfinalized(uvalue(o))));
++}
++
++
++/*
++** clear collected entries from weaktables
++*/
++static void cleartable (GCObject *l) {
++  while (l) {
++    Table *h = gco2h(l);
++    int i = h->sizearray;
++    lua_assert(testbit(h->marked, VALUEWEAKBIT) ||
++               testbit(h->marked, KEYWEAKBIT));
++    if (testbit(h->marked, VALUEWEAKBIT)) {
++      while (i--) {
++        TValue *o = &h->array[i];
++        if (iscleared(o, 0))  /* value was collected? */
++          setnilvalue(o);  /* remove value */
++      }
++    }
++    i = sizenode(h);
++    while (i--) {
++      Node *n = gnode(h, i);
++      if (!ttisnil(gval(n)) &&  /* non-empty entry? */
++          (iscleared(key2tval(n), 1) || iscleared(gval(n), 0))) {
++        setnilvalue(gval(n));  /* remove value ... */
++        removeentry(n);  /* remove entry from table */
++      }
++    }
++    l = h->gclist;
++  }
++}
++
++
++static void freeobj (lua_State *L, GCObject *o) {
++  switch (o->gch.tt) {
++    case LUA_TPROTO: luaF_freeproto(L, gco2p(o)); break;
++    case LUA_TFUNCTION: luaF_freeclosure(L, gco2cl(o)); break;
++    case LUA_TUPVAL: luaF_freeupval(L, gco2uv(o)); break;
++    case LUA_TTABLE: luaH_free(L, gco2h(o)); break;
++    case LUA_TTHREAD: {
++      lua_assert(gco2th(o) != L && gco2th(o) != G(L)->mainthread);
++      luaE_freethread(L, gco2th(o));
++      break;
++    }
++    case LUA_TSTRING: {
++      G(L)->strt.nuse--;
++      luaM_freemem(L, o, sizestring(gco2ts(o)));
++      break;
++    }
++    case LUA_TUSERDATA: {
++      luaM_freemem(L, o, sizeudata(gco2u(o)));
++      break;
++    }
++    default: lua_assert(0);
++  }
++}
++
++
++
++#define sweepwholelist(L,p)	sweeplist(L,p,MAX_LUMEM)
++
++
++static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count) {
++  GCObject *curr;
++  global_State *g = G(L);
++  int deadmask = otherwhite(g);
++  while ((curr = *p) != NULL && count-- > 0) {
++    if (curr->gch.tt == LUA_TTHREAD)  /* sweep open upvalues of each thread */
++      sweepwholelist(L, &gco2th(curr)->openupval);
++    if ((curr->gch.marked ^ WHITEBITS) & deadmask) {  /* not dead? */
++      lua_assert(!isdead(g, curr) || testbit(curr->gch.marked, FIXEDBIT));
++      makewhite(g, curr);  /* make it white (for next cycle) */
++      p = &curr->gch.next;
++    }
++    else {  /* must erase `curr' */
++      lua_assert(isdead(g, curr) || deadmask == bitmask(SFIXEDBIT));
++      *p = curr->gch.next;
++      if (curr == g->rootgc)  /* is the first element of the list? */
++        g->rootgc = curr->gch.next;  /* adjust first */
++      freeobj(L, curr);
++    }
++  }
++  return p;
++}
++
++
++static void checkSizes (lua_State *L) {
++  global_State *g = G(L);
++  /* check size of string hash */
++  if (g->strt.nuse < cast(lu_int32, g->strt.size/4) &&
++      g->strt.size > MINSTRTABSIZE*2)
++    luaS_resize(L, g->strt.size/2);  /* table is too big */
++  /* check size of buffer */
++  if (luaZ_sizebuffer(&g->buff) > LUA_MINBUFFER*2) {  /* buffer too big? */
++    size_t newsize = luaZ_sizebuffer(&g->buff) / 2;
++    luaZ_resizebuffer(L, &g->buff, newsize);
++  }
++}
++
++
++static void GCTM (lua_State *L) {
++  global_State *g = G(L);
++  GCObject *o = g->tmudata->gch.next;  /* get first element */
++  Udata *udata = rawgco2u(o);
++  const TValue *tm;
++  /* remove udata from `tmudata' */
++  if (o == g->tmudata)  /* last element? */
++    g->tmudata = NULL;
++  else
++    g->tmudata->gch.next = udata->uv.next;
++  udata->uv.next = g->mainthread->next;  /* return it to `root' list */
++  g->mainthread->next = o;
++  makewhite(g, o);
++  tm = fasttm(L, udata->uv.metatable, TM_GC);
++  if (tm != NULL) {
++    lu_byte oldah = L->allowhook;
++    lu_mem oldt = g->GCthreshold;
++    L->allowhook = 0;  /* stop debug hooks during GC tag method */
++    g->GCthreshold = 2*g->totalbytes;  /* avoid GC steps */
++    setobj2s(L, L->top, tm);
++    setuvalue(L, L->top+1, udata);
++    L->top += 2;
++    luaD_call(L, L->top - 2, 0);
++    L->allowhook = oldah;  /* restore hooks */
++    g->GCthreshold = oldt;  /* restore threshold */
++  }
++}
++
++
++/*
++** Call all GC tag methods
++*/
++void luaC_callGCTM (lua_State *L) {
++  while (G(L)->tmudata)
++    GCTM(L);
++}
++
++
++void luaC_freeall (lua_State *L) {
++  global_State *g = G(L);
++  int i;
++  g->currentwhite = WHITEBITS | bitmask(SFIXEDBIT);  /* mask to collect all elements */
++  sweepwholelist(L, &g->rootgc);
++  for (i = 0; i < g->strt.size; i++)  /* free all string lists */
++    sweepwholelist(L, &g->strt.hash[i]);
++}
++
++
++static void markmt (global_State *g) {
++  int i;
++  for (i=0; i<NUM_TAGS; i++)
++    if (g->mt[i]) markobject(g, g->mt[i]);
++}
++
++
++/* mark root set */
++static void markroot (lua_State *L) {
++  global_State *g = G(L);
++  g->gray = NULL;
++  g->grayagain = NULL;
++  g->weak = NULL;
++  markobject(g, g->mainthread);
++  /* make global table be traversed before main stack */
++  markvalue(g, gt(g->mainthread));
++  markvalue(g, registry(L));
++  markmt(g);
++  g->gcstate = GCSpropagate;
++}
++
++
++static void remarkupvals (global_State *g) {
++  UpVal *uv;
++  for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) {
++    lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
++    if (isgray(obj2gco(uv)))
++      markvalue(g, uv->v);
++  }
++}
++
++
++static void atomic (lua_State *L) {
++  global_State *g = G(L);
++  size_t udsize;  /* total size of userdata to be finalized */
++  /* remark occasional upvalues of (maybe) dead threads */
++  remarkupvals(g);
++  /* traverse objects cautch by write barrier and by 'remarkupvals' */
++  propagateall(g);
++  /* remark weak tables */
++  g->gray = g->weak;
++  g->weak = NULL;
++  lua_assert(!iswhite(obj2gco(g->mainthread)));
++  markobject(g, L);  /* mark running thread */
++  markmt(g);  /* mark basic metatables (again) */
++  propagateall(g);
++  /* remark gray again */
++  g->gray = g->grayagain;
++  g->grayagain = NULL;
++  propagateall(g);
++  udsize = luaC_separateudata(L, 0);  /* separate userdata to be finalized */
++  marktmu(g);  /* mark `preserved' userdata */
++  udsize += propagateall(g);  /* remark, to propagate `preserveness' */
++  cleartable(g->weak);  /* remove collected objects from weak tables */
++  /* flip current white */
++  g->currentwhite = cast_byte(otherwhite(g));
++  g->sweepstrgc = 0;
++  g->sweepgc = &g->rootgc;
++  g->gcstate = GCSsweepstring;
++  g->estimate = g->totalbytes - udsize;  /* first estimate */
++}
++
++
++static l_mem singlestep (lua_State *L) {
++  global_State *g = G(L);
++  /*lua_checkmemory(L);*/
++  switch (g->gcstate) {
++    case GCSpause: {
++      markroot(L);  /* start a new collection */
++      return 0;
++    }
++    case GCSpropagate: {
++      if (g->gray)
++        return propagatemark(g);
++      else {  /* no more `gray' objects */
++        atomic(L);  /* finish mark phase */
++        return 0;
++      }
++    }
++    case GCSsweepstring: {
++      lu_mem old = g->totalbytes;
++      sweepwholelist(L, &g->strt.hash[g->sweepstrgc++]);
++      if (g->sweepstrgc >= g->strt.size)  /* nothing more to sweep? */
++        g->gcstate = GCSsweep;  /* end sweep-string phase */
++      lua_assert(old >= g->totalbytes);
++      g->estimate -= old - g->totalbytes;
++      return GCSWEEPCOST;
++    }
++    case GCSsweep: {
++      lu_mem old = g->totalbytes;
++      g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX);
++      if (*g->sweepgc == NULL) {  /* nothing more to sweep? */
++        checkSizes(L);
++        g->gcstate = GCSfinalize;  /* end sweep phase */
++      }
++      lua_assert(old >= g->totalbytes);
++      g->estimate -= old - g->totalbytes;
++      return GCSWEEPMAX*GCSWEEPCOST;
++    }
++    case GCSfinalize: {
++      if (g->tmudata) {
++        GCTM(L);
++        if (g->estimate > GCFINALIZECOST)
++          g->estimate -= GCFINALIZECOST;
++        return GCFINALIZECOST;
++      }
++      else {
++        g->gcstate = GCSpause;  /* end collection */
++        g->gcdept = 0;
++        return 0;
++      }
++    }
++    default: lua_assert(0); return 0;
++  }
++}
++
++
++void luaC_step (lua_State *L) {
++  global_State *g = G(L);
++  l_mem lim = (GCSTEPSIZE/100) * g->gcstepmul;
++  if (lim == 0)
++    lim = (MAX_LUMEM-1)/2;  /* no limit */
++  g->gcdept += g->totalbytes - g->GCthreshold;
++  do {
++    lim -= singlestep(L);
++    if (g->gcstate == GCSpause)
++      break;
++  } while (lim > 0);
++  if (g->gcstate != GCSpause) {
++    if (g->gcdept < GCSTEPSIZE)
++      g->GCthreshold = g->totalbytes + GCSTEPSIZE;  /* - lim/g->gcstepmul;*/
++    else {
++      g->gcdept -= GCSTEPSIZE;
++      g->GCthreshold = g->totalbytes;
++    }
++  }
++  else {
++    lua_assert(g->totalbytes >= g->estimate);
++    setthreshold(g);
++  }
++}
++
++
++void luaC_fullgc (lua_State *L) {
++  global_State *g = G(L);
++  if (g->gcstate <= GCSpropagate) {
++    /* reset sweep marks to sweep all elements (returning them to white) */
++    g->sweepstrgc = 0;
++    g->sweepgc = &g->rootgc;
++    /* reset other collector lists */
++    g->gray = NULL;
++    g->grayagain = NULL;
++    g->weak = NULL;
++    g->gcstate = GCSsweepstring;
++  }
++  lua_assert(g->gcstate != GCSpause && g->gcstate != GCSpropagate);
++  /* finish any pending sweep phase */
++  while (g->gcstate != GCSfinalize) {
++    lua_assert(g->gcstate == GCSsweepstring || g->gcstate == GCSsweep);
++    singlestep(L);
++  }
++  markroot(L);
++  while (g->gcstate != GCSpause) {
++    singlestep(L);
++  }
++  setthreshold(g);
++}
++
++
++void luaC_barrierf (lua_State *L, GCObject *o, GCObject *v) {
++  global_State *g = G(L);
++  lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
++  lua_assert(g->gcstate != GCSfinalize && g->gcstate != GCSpause);
++  lua_assert(ttype(&o->gch) != LUA_TTABLE);
++  /* must keep invariant? */
++  if (g->gcstate == GCSpropagate)
++    reallymarkobject(g, v);  /* restore invariant */
++  else  /* don't mind */
++    makewhite(g, o);  /* mark as white just to avoid other barriers */
++}
++
++
++void luaC_barrierback (lua_State *L, Table *t) {
++  global_State *g = G(L);
++  GCObject *o = obj2gco(t);
++  lua_assert(isblack(o) && !isdead(g, o));
++  lua_assert(g->gcstate != GCSfinalize && g->gcstate != GCSpause);
++  black2gray(o);  /* make table gray (again) */
++  t->gclist = g->grayagain;
++  g->grayagain = o;
++}
++
++
++void luaC_link (lua_State *L, GCObject *o, lu_byte tt) {
++  global_State *g = G(L);
++  o->gch.next = g->rootgc;
++  g->rootgc = o;
++  o->gch.marked = luaC_white(g);
++  o->gch.tt = tt;
++}
++
++
++void luaC_linkupval (lua_State *L, UpVal *uv) {
++  global_State *g = G(L);
++  GCObject *o = obj2gco(uv);
++  o->gch.next = g->rootgc;  /* link upvalue into `rootgc' list */
++  g->rootgc = o;
++  if (isgray(o)) { 
++    if (g->gcstate == GCSpropagate) {
++      gray2black(o);  /* closed upvalues need barrier */
++      luaC_barrier(L, uv, uv->v);
++    }
++    else {  /* sweep phase: sweep it (turning it into white) */
++      makewhite(g, o);
++      lua_assert(g->gcstate != GCSfinalize && g->gcstate != GCSpause);
++    }
++  }
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lgc.h
+@@ -0,0 +1,110 @@
++/*
++** $Id: lgc.h,v 2.15.1.1 2007/12/27 13:02:25 roberto Exp $
++** Garbage Collector
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lgc_h
++#define lgc_h
++
++
++#include "lobject.h"
++
++
++/*
++** Possible states of the Garbage Collector
++*/
++#define GCSpause	0
++#define GCSpropagate	1
++#define GCSsweepstring	2
++#define GCSsweep	3
++#define GCSfinalize	4
++
++
++/*
++** some userful bit tricks
++*/
++#define resetbits(x,m)	((x) &= cast(lu_byte, ~(m)))
++#define setbits(x,m)	((x) |= (m))
++#define testbits(x,m)	((x) & (m))
++#define bitmask(b)	(1<<(b))
++#define bit2mask(b1,b2)	(bitmask(b1) | bitmask(b2))
++#define l_setbit(x,b)	setbits(x, bitmask(b))
++#define resetbit(x,b)	resetbits(x, bitmask(b))
++#define testbit(x,b)	testbits(x, bitmask(b))
++#define set2bits(x,b1,b2)	setbits(x, (bit2mask(b1, b2)))
++#define reset2bits(x,b1,b2)	resetbits(x, (bit2mask(b1, b2)))
++#define test2bits(x,b1,b2)	testbits(x, (bit2mask(b1, b2)))
++
++
++
++/*
++** Layout for bit use in `marked' field:
++** bit 0 - object is white (type 0)
++** bit 1 - object is white (type 1)
++** bit 2 - object is black
++** bit 3 - for userdata: has been finalized
++** bit 3 - for tables: has weak keys
++** bit 4 - for tables: has weak values
++** bit 5 - object is fixed (should not be collected)
++** bit 6 - object is "super" fixed (only the main thread)
++*/
++
++
++#define WHITE0BIT	0
++#define WHITE1BIT	1
++#define BLACKBIT	2
++#define FINALIZEDBIT	3
++#define KEYWEAKBIT	3
++#define VALUEWEAKBIT	4
++#define FIXEDBIT	5
++#define SFIXEDBIT	6
++#define WHITEBITS	bit2mask(WHITE0BIT, WHITE1BIT)
++
++
++#define iswhite(x)      test2bits((x)->gch.marked, WHITE0BIT, WHITE1BIT)
++#define isblack(x)      testbit((x)->gch.marked, BLACKBIT)
++#define isgray(x)	(!isblack(x) && !iswhite(x))
++
++#define otherwhite(g)	(g->currentwhite ^ WHITEBITS)
++#define isdead(g,v)	((v)->gch.marked & otherwhite(g) & WHITEBITS)
++
++#define changewhite(x)	((x)->gch.marked ^= WHITEBITS)
++#define gray2black(x)	l_setbit((x)->gch.marked, BLACKBIT)
++
++#define valiswhite(x)	(iscollectable(x) && iswhite(gcvalue(x)))
++
++#define luaC_white(g)	cast(lu_byte, (g)->currentwhite & WHITEBITS)
++
++
++#define luaC_checkGC(L) { \
++  condhardstacktests(luaD_reallocstack(L, L->stacksize - EXTRA_STACK - 1)); \
++  if (G(L)->totalbytes >= G(L)->GCthreshold) \
++	luaC_step(L); }
++
++
++#define luaC_barrier(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
++	luaC_barrierf(L,obj2gco(p),gcvalue(v)); }
++
++#define luaC_barriert(L,t,v) { if (valiswhite(v) && isblack(obj2gco(t)))  \
++	luaC_barrierback(L,t); }
++
++#define luaC_objbarrier(L,p,o)  \
++	{ if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \
++		luaC_barrierf(L,obj2gco(p),obj2gco(o)); }
++
++#define luaC_objbarriert(L,t,o)  \
++   { if (iswhite(obj2gco(o)) && isblack(obj2gco(t))) luaC_barrierback(L,t); }
++
++LUAI_FUNC size_t luaC_separateudata (lua_State *L, int all);
++LUAI_FUNC void luaC_callGCTM (lua_State *L);
++LUAI_FUNC void luaC_freeall (lua_State *L);
++LUAI_FUNC void luaC_step (lua_State *L);
++LUAI_FUNC void luaC_fullgc (lua_State *L);
++LUAI_FUNC void luaC_link (lua_State *L, GCObject *o, lu_byte tt);
++LUAI_FUNC void luaC_linkupval (lua_State *L, UpVal *uv);
++LUAI_FUNC void luaC_barrierf (lua_State *L, GCObject *o, GCObject *v);
++LUAI_FUNC void luaC_barrierback (lua_State *L, Table *t);
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/llex.c
+@@ -0,0 +1,460 @@
++/*
++** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
++** Lexical Analyzer
++** See Copyright Notice in lua.h
++*/
++
++#include <ctype.h>
++#include <locale.h>
++#include <string.h>
++
++#define llex_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldo.h"
++#include "llex.h"
++#include "lobject.h"
++#include "lparser.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "lzio.h"
++
++
++
++#define next(ls) (ls->current = zgetc(ls->z))
++
++
++
++
++#define currIsNewline(ls)	(ls->current == '\n' || ls->current == '\r')
++
++
++/* ORDER RESERVED */
++const char *const luaX_tokens [] = {
++    "and", "break", "do", "else", "elseif",
++    "end", "false", "for", "function", "if",
++    "in", "local", "nil", "not", "or", "repeat",
++    "return", "then", "true", "until", "while",
++    "..", "...", "==", ">=", "<=", "~=",
++    "<number>", "<name>", "<string>", "<eof>",
++    NULL
++};
++
++
++#define save_and_next(ls) (save(ls, ls->current), next(ls))
++
++
++static void save (LexState *ls, int c) {
++  Mbuffer *b = ls->buff;
++  if (b->n + 1 > b->buffsize) {
++    size_t newsize;
++    if (b->buffsize >= MAX_SIZET/2)
++      luaX_lexerror(ls, "lexical element too long", 0);
++    newsize = b->buffsize * 2;
++    luaZ_resizebuffer(ls->L, b, newsize);
++  }
++  b->buffer[b->n++] = cast(char, c);
++}
++
++
++void luaX_init (lua_State *L) {
++  int i;
++  for (i=0; i<NUM_RESERVED; i++) {
++    TString *ts = luaS_new(L, luaX_tokens[i]);
++    luaS_fix(ts);  /* reserved words are never collected */
++    lua_assert(strlen(luaX_tokens[i])+1 <= TOKEN_LEN);
++    ts->tsv.reserved = cast_byte(i+1);  /* reserved word */
++  }
++}
++
++
++#define MAXSRC          80
++
++
++const char *luaX_token2str (LexState *ls, int token) {
++  if (token < FIRST_RESERVED) {
++    lua_assert(token == cast(unsigned char, token));
++    return (iscntrl(token)) ? luaO_pushfstring(ls->L, "char(%d)", token) :
++                              luaO_pushfstring(ls->L, "%c", token);
++  }
++  else
++    return luaX_tokens[token-FIRST_RESERVED];
++}
++
++
++static const char *txtToken (LexState *ls, int token) {
++  switch (token) {
++    case TK_NAME:
++    case TK_STRING:
++    case TK_NUMBER:
++      save(ls, '\0');
++      return luaZ_buffer(ls->buff);
++    default:
++      return luaX_token2str(ls, token);
++  }
++}
++
++
++void luaX_lexerror (LexState *ls, const char *msg, int token) {
++  char buff[MAXSRC];
++  luaO_chunkid(buff, getstr(ls->source), MAXSRC);
++  msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg);
++  if (token)
++    luaO_pushfstring(ls->L, "%s near " LUA_QS, msg, txtToken(ls, token));
++  luaD_throw(ls->L, LUA_ERRSYNTAX);
++}
++
++
++void luaX_syntaxerror (LexState *ls, const char *msg) {
++  luaX_lexerror(ls, msg, ls->t.token);
++}
++
++
++TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
++  lua_State *L = ls->L;
++  TString *ts = luaS_newlstr(L, str, l);
++  TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
++  if (ttisnil(o))
++    setbvalue(o, 1);  /* make sure `str' will not be collected */
++  return ts;
++}
++
++
++static void inclinenumber (LexState *ls) {
++  int old = ls->current;
++  lua_assert(currIsNewline(ls));
++  next(ls);  /* skip `\n' or `\r' */
++  if (currIsNewline(ls) && ls->current != old)
++    next(ls);  /* skip `\n\r' or `\r\n' */
++  if (++ls->linenumber >= MAX_INT)
++    luaX_syntaxerror(ls, "chunk has too many lines");
++}
++
++
++void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source) {
++  ls->decpoint = '.';
++  ls->L = L;
++  ls->lookahead.token = TK_EOS;  /* no look-ahead token */
++  ls->z = z;
++  ls->fs = NULL;
++  ls->linenumber = 1;
++  ls->lastline = 1;
++  ls->source = source;
++  luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER);  /* initialize buffer */
++  next(ls);  /* read first char */
++}
++
++
++
++/*
++** =======================================================
++** LEXICAL ANALYZER
++** =======================================================
++*/
++
++
++
++static int check_next (LexState *ls, const char *set) {
++  if (!strchr(set, ls->current))
++    return 0;
++  save_and_next(ls);
++  return 1;
++}
++
++
++static void buffreplace (LexState *ls, char from, char to) {
++  size_t n = luaZ_bufflen(ls->buff);
++  char *p = luaZ_buffer(ls->buff);
++  while (n--)
++    if (p[n] == from) p[n] = to;
++}
++
++
++static void trydecpoint (LexState *ls, SemInfo *seminfo) {
++  /* format error: try to update decimal point separator */
++  char old = ls->decpoint;
++  struct lconv *cv = localeconv();
++  ls->decpoint = (cv ? cv->decimal_point[0] : '.');
++  buffreplace(ls, old, ls->decpoint);  /* try updated decimal separator */
++  if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
++    /* format error with correct decimal point: no more options */
++    buffreplace(ls, ls->decpoint, '.');  /* undo change (for error message) */
++    luaX_lexerror(ls, "malformed number", TK_NUMBER);
++  }
++}
++
++
++/* LUA_NUMBER */
++static void read_numeral (LexState *ls, SemInfo *seminfo) {
++  lua_assert(isdigit(ls->current));
++  do {
++    save_and_next(ls);
++  } while (isdigit(ls->current) || ls->current == '.');
++  if (check_next(ls, "Ee"))  /* `E'? */
++    check_next(ls, "+-");  /* optional exponent sign */
++  while (isalnum(ls->current) || ls->current == '_')
++    save_and_next(ls);
++  save(ls, '\0');
++  buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
++  if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r))  /* format error? */
++    trydecpoint(ls, seminfo); /* try to update decimal point separator */
++}
++
++
++static int skip_sep (LexState *ls) {
++  int count = 0;
++  int s = ls->current;
++  lua_assert(s == '[' || s == ']');
++  save_and_next(ls);
++  while (ls->current == '=') {
++    save_and_next(ls);
++    count++;
++  }
++  return (ls->current == s) ? count : (-count) - 1;
++}
++
++
++static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
++  int cont = 0;
++  (void)(cont);  /* avoid warnings when `cont' is not used */
++  save_and_next(ls);  /* skip 2nd `[' */
++  if (currIsNewline(ls))  /* string starts with a newline? */
++    inclinenumber(ls);  /* skip it */
++  for (;;) {
++    switch (ls->current) {
++      case EOZ:
++        luaX_lexerror(ls, (seminfo) ? "unfinished long string" :
++                                   "unfinished long comment", TK_EOS);
++        break;  /* to avoid warnings */
++#if defined(LUA_COMPAT_LSTR)
++      case '[': {
++        if (skip_sep(ls) == sep) {
++          save_and_next(ls);  /* skip 2nd `[' */
++          cont++;
++#if LUA_COMPAT_LSTR == 1
++          if (sep == 0)
++            luaX_lexerror(ls, "nesting of [[...]] is deprecated", '[');
++#endif
++        }
++        break;
++      }
++#endif
++      case ']': {
++        if (skip_sep(ls) == sep) {
++          save_and_next(ls);  /* skip 2nd `]' */
++#if defined(LUA_COMPAT_LSTR) && LUA_COMPAT_LSTR == 2
++          cont--;
++          if (sep == 0 && cont >= 0) break;
++#endif
++          goto endloop;
++        }
++        break;
++      }
++      case '\n':
++      case '\r': {
++        save(ls, '\n');
++        inclinenumber(ls);
++        if (!seminfo) luaZ_resetbuffer(ls->buff);  /* avoid wasting space */
++        break;
++      }
++      default: {
++        if (seminfo) save_and_next(ls);
++        else next(ls);
++      }
++    }
++  } endloop:
++  if (seminfo)
++    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
++                                     luaZ_bufflen(ls->buff) - 2*(2 + sep));
++}
++
++
++static void read_string (LexState *ls, int del, SemInfo *seminfo) {
++  save_and_next(ls);
++  while (ls->current != del) {
++    switch (ls->current) {
++      case EOZ:
++        luaX_lexerror(ls, "unfinished string", TK_EOS);
++        continue;  /* to avoid warnings */
++      case '\n':
++      case '\r':
++        luaX_lexerror(ls, "unfinished string", TK_STRING);
++        continue;  /* to avoid warnings */
++      case '\\': {
++        int c;
++        next(ls);  /* do not save the `\' */
++        switch (ls->current) {
++          case 'a': c = '\a'; break;
++          case 'b': c = '\b'; break;
++          case 'f': c = '\f'; break;
++          case 'n': c = '\n'; break;
++          case 'r': c = '\r'; break;
++          case 't': c = '\t'; break;
++          case 'v': c = '\v'; break;
++          case '\n':  /* go through */
++          case '\r': save(ls, '\n'); inclinenumber(ls); continue;
++          case EOZ: continue;  /* will raise an error next loop */
++          default: {
++            if (!isdigit(ls->current))
++              save_and_next(ls);  /* handles \\, \", \', and \? */
++            else {  /* \xxx */
++              int i = 0;
++              c = 0;
++              do {
++                c = 10*c + (ls->current-'0');
++                next(ls);
++              } while (++i<3 && isdigit(ls->current));
++              if (c > UCHAR_MAX)
++                luaX_lexerror(ls, "escape sequence too large", TK_STRING);
++              save(ls, c);
++            }
++            continue;
++          }
++        }
++        save(ls, c);
++        next(ls);
++        continue;
++      }
++      default:
++        save_and_next(ls);
++    }
++  }
++  save_and_next(ls);  /* skip delimiter */
++  seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
++                                   luaZ_bufflen(ls->buff) - 2);
++}
++
++
++static int llex (LexState *ls, SemInfo *seminfo) {
++  luaZ_resetbuffer(ls->buff);
++  for (;;) {
++    switch (ls->current) {
++      case '\n':
++      case '\r': {
++        inclinenumber(ls);
++        continue;
++      }
++      case '-': {
++        next(ls);
++        if (ls->current != '-') return '-';
++        /* else is a comment */
++        next(ls);
++        if (ls->current == '[') {
++          int sep = skip_sep(ls);
++          luaZ_resetbuffer(ls->buff);  /* `skip_sep' may dirty the buffer */
++          if (sep >= 0) {
++            read_long_string(ls, NULL, sep);  /* long comment */
++            luaZ_resetbuffer(ls->buff);
++            continue;
++          }
++        }
++        /* else short comment */
++        while (!currIsNewline(ls) && ls->current != EOZ)
++          next(ls);
++        continue;
++      }
++      case '[': {
++        int sep = skip_sep(ls);
++        if (sep >= 0) {
++          read_long_string(ls, seminfo, sep);
++          return TK_STRING;
++        }
++        else if (sep == -1) return '[';
++        else luaX_lexerror(ls, "invalid long string delimiter", TK_STRING);
++      }
++      case '=': {
++        next(ls);
++        if (ls->current != '=') return '=';
++        else { next(ls); return TK_EQ; }
++      }
++      case '<': {
++        next(ls);
++        if (ls->current != '=') return '<';
++        else { next(ls); return TK_LE; }
++      }
++      case '>': {
++        next(ls);
++        if (ls->current != '=') return '>';
++        else { next(ls); return TK_GE; }
++      }
++      case '~': {
++        next(ls);
++        if (ls->current != '=') return '~';
++        else { next(ls); return TK_NE; }
++      }
++      case '"':
++      case '\'': {
++        read_string(ls, ls->current, seminfo);
++        return TK_STRING;
++      }
++      case '.': {
++        save_and_next(ls);
++        if (check_next(ls, ".")) {
++          if (check_next(ls, "."))
++            return TK_DOTS;   /* ... */
++          else return TK_CONCAT;   /* .. */
++        }
++        else if (!isdigit(ls->current)) return '.';
++        else {
++          read_numeral(ls, seminfo);
++          return TK_NUMBER;
++        }
++      }
++      case EOZ: {
++        return TK_EOS;
++      }
++      default: {
++        if (isspace(ls->current)) {
++          lua_assert(!currIsNewline(ls));
++          next(ls);
++          continue;
++        }
++        else if (isdigit(ls->current)) {
++          read_numeral(ls, seminfo);
++          return TK_NUMBER;
++        }
++        else if (isalpha(ls->current) || ls->current == '_') {
++          /* identifier or reserved word */
++          TString *ts;
++          do {
++            save_and_next(ls);
++          } while (isalnum(ls->current) || ls->current == '_');
++          ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
++                                  luaZ_bufflen(ls->buff));
++          if (ts->tsv.reserved > 0)  /* reserved word? */
++            return ts->tsv.reserved - 1 + FIRST_RESERVED;
++          else {
++            seminfo->ts = ts;
++            return TK_NAME;
++          }
++        }
++        else {
++          int c = ls->current;
++          next(ls);
++          return c;  /* single-char tokens (+ - / ...) */
++        }
++      }
++    }
++  }
++}
++
++
++void luaX_next (LexState *ls) {
++  ls->lastline = ls->linenumber;
++  if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
++    ls->t = ls->lookahead;  /* use this one */
++    ls->lookahead.token = TK_EOS;  /* and discharge it */
++  }
++  else
++    ls->t.token = llex(ls, &ls->t.seminfo);  /* read next token */
++}
++
++
++void luaX_lookahead (LexState *ls) {
++  lua_assert(ls->lookahead.token == TK_EOS);
++  ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/llex.h
+@@ -0,0 +1,81 @@
++/*
++** $Id: llex.h,v 1.58.1.1 2007/12/27 13:02:25 roberto Exp $
++** Lexical Analyzer
++** See Copyright Notice in lua.h
++*/
++
++#ifndef llex_h
++#define llex_h
++
++#include "lobject.h"
++#include "lzio.h"
++
++
++#define FIRST_RESERVED	257
++
++/* maximum length of a reserved word */
++#define TOKEN_LEN	(sizeof("function")/sizeof(char))
++
++
++/*
++* WARNING: if you change the order of this enumeration,
++* grep "ORDER RESERVED"
++*/
++enum RESERVED {
++  /* terminal symbols denoted by reserved words */
++  TK_AND = FIRST_RESERVED, TK_BREAK,
++  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
++  TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
++  TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
++  /* other terminal symbols */
++  TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER,
++  TK_NAME, TK_STRING, TK_EOS
++};
++
++/* number of reserved words */
++#define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
++
++
++/* array with token `names' */
++LUAI_DATA const char *const luaX_tokens [];
++
++
++typedef union {
++  lua_Number r;
++  TString *ts;
++} SemInfo;  /* semantics information */
++
++
++typedef struct Token {
++  int token;
++  SemInfo seminfo;
++} Token;
++
++
++typedef struct LexState {
++  int current;  /* current character (charint) */
++  int linenumber;  /* input line counter */
++  int lastline;  /* line of last token `consumed' */
++  Token t;  /* current token */
++  Token lookahead;  /* look ahead token */
++  struct FuncState *fs;  /* `FuncState' is private to the parser */
++  struct lua_State *L;
++  ZIO *z;  /* input stream */
++  Mbuffer *buff;  /* buffer for tokens */
++  TString *source;  /* current source name */
++  char decpoint;  /* locale decimal point */
++} LexState;
++
++
++LUAI_FUNC void luaX_init (lua_State *L);
++LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z,
++                              TString *source);
++LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l);
++LUAI_FUNC void luaX_next (LexState *ls);
++LUAI_FUNC void luaX_lookahead (LexState *ls);
++LUAI_FUNC void luaX_lexerror (LexState *ls, const char *msg, int token);
++LUAI_FUNC void luaX_syntaxerror (LexState *ls, const char *s);
++LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/llimits.h
+@@ -0,0 +1,125 @@
++/*
++** $Id: llimits.h,v 1.69.1.1 2007/12/27 13:02:25 roberto Exp $
++** Limits, basic types, and some other `installation-dependent' definitions
++** See Copyright Notice in lua.h
++*/
++
++#ifndef llimits_h
++#define llimits_h
++
++#include <stddef.h>
++#include <limits.h>
++
++#include "lua.h"
++
++typedef LUAI_UINT32 lu_int32;
++
++typedef LUAI_UMEM lu_mem;
++
++typedef LUAI_MEM l_mem;
++
++
++
++/* chars used as small naturals (so that `char' is reserved for characters) */
++typedef unsigned char lu_byte;
++
++
++#define MAX_SIZET	((size_t)(~(size_t)0)-2)
++
++#define MAX_LUMEM	((lu_mem)(~(lu_mem)0)-2)
++
++
++#define MAX_INT (LUA_INT_MAX-2)  /* maximum value of an int (-2 for safety) */
++
++/*
++** conversion of pointer to integer
++** this is for hashing only; there is no problem if the integer
++** cannot hold the whole pointer value
++*/
++#define IntPoint(p)  ((unsigned int)(lu_mem)(p))
++
++
++
++/* type to ensure maximum alignment */
++typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
++
++
++/* result of a `usual argument conversion' over lua_Number */
++typedef LUAI_UACNUMBER l_uacNumber;
++
++
++/* internal assertions for in-house debugging */
++#ifdef lua_assert
++
++#define check_exp(c,e)		(lua_assert(c), (e))
++#define api_check(l,e)		lua_assert(e)
++
++#else
++
++#define lua_assert(c)		((void)0)
++#define check_exp(c,e)		(e)
++#define api_check		luai_apicheck
++
++#endif
++
++
++#ifndef UNUSED
++#define UNUSED(x)	((void)(x))	/* to avoid warnings */
++#endif
++
++
++#ifndef cast
++#define cast(t, exp)	((t)(exp))
++#endif
++
++#define cast_byte(i)	cast(lu_byte, (i))
++#define cast_num(i)	cast(lua_Number, (i))
++#define cast_int(i)	cast(int, (i))
++
++
++
++/*
++** type for virtual-machine instructions
++** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
++*/
++typedef lu_int32 Instruction;
++
++
++
++/* maximum stack for a Lua function */
++#define MAXSTACK	250
++
++
++
++/* minimum size for the string table (must be power of 2) */
++#ifndef MINSTRTABSIZE
++#define MINSTRTABSIZE	32
++#endif
++
++
++/* minimum size for string buffer */
++#ifndef LUA_MINBUFFER
++#define LUA_MINBUFFER	32
++#endif
++
++
++#ifndef lua_lock
++#define lua_lock(L)     ((void) 0) 
++#define lua_unlock(L)   ((void) 0)
++#endif
++
++#ifndef luai_threadyield
++#define luai_threadyield(L)     {lua_unlock(L); lua_lock(L);}
++#endif
++
++
++/*
++** macro to control inclusion of some hard tests on stack reallocation
++*/ 
++#ifndef HARDSTACKTESTS
++#define condhardstacktests(x)	((void)0)
++#else
++#define condhardstacktests(x)	x
++#endif
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lmem.c
+@@ -0,0 +1,86 @@
++/*
++** $Id: lmem.c,v 1.70.1.1 2007/12/27 13:02:25 roberto Exp $
++** Interface to Memory Manager
++** See Copyright Notice in lua.h
++*/
++
++
++#include <stddef.h>
++
++#define lmem_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldebug.h"
++#include "ldo.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lstate.h"
++
++
++
++/*
++** About the realloc function:
++** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
++** (`osize' is the old size, `nsize' is the new size)
++**
++** Lua ensures that (ptr == NULL) iff (osize == 0).
++**
++** * frealloc(ud, NULL, 0, x) creates a new block of size `x'
++**
++** * frealloc(ud, p, x, 0) frees the block `p'
++** (in this specific case, frealloc must return NULL).
++** particularly, frealloc(ud, NULL, 0, 0) does nothing
++** (which is equivalent to free(NULL) in ANSI C)
++**
++** frealloc returns NULL if it cannot create or reallocate the area
++** (any reallocation to an equal or smaller size cannot fail!)
++*/
++
++
++
++#define MINSIZEARRAY	4
++
++
++void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
++                     int limit, const char *errormsg) {
++  void *newblock;
++  int newsize;
++  if (*size >= limit/2) {  /* cannot double it? */
++    if (*size >= limit)  /* cannot grow even a little? */
++      luaG_runerror(L, errormsg);
++    newsize = limit;  /* still have at least one free place */
++  }
++  else {
++    newsize = (*size)*2;
++    if (newsize < MINSIZEARRAY)
++      newsize = MINSIZEARRAY;  /* minimum size */
++  }
++  newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
++  *size = newsize;  /* update only when everything else is OK */
++  return newblock;
++}
++
++
++void *luaM_toobig (lua_State *L) {
++  luaG_runerror(L, "memory allocation error: block too big");
++  return NULL;  /* to avoid warnings */
++}
++
++
++
++/*
++** generic allocation routine.
++*/
++void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
++  global_State *g = G(L);
++  lua_assert((osize == 0) == (block == NULL));
++  block = (*g->frealloc)(g->ud, block, osize, nsize);
++  if (block == NULL && nsize > 0)
++    luaD_throw(L, LUA_ERRMEM);
++  lua_assert((nsize == 0) == (block == NULL));
++  g->totalbytes = (g->totalbytes - osize) + nsize;
++  return block;
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lmem.h
+@@ -0,0 +1,49 @@
++/*
++** $Id: lmem.h,v 1.31.1.1 2007/12/27 13:02:25 roberto Exp $
++** Interface to Memory Manager
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lmem_h
++#define lmem_h
++
++
++#include <stddef.h>
++
++#include "llimits.h"
++#include "lua.h"
++
++#define MEMERRMSG	"not enough memory"
++
++
++#define luaM_reallocv(L,b,on,n,e) \
++	((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ?  /* +1 to avoid warnings */ \
++		luaM_realloc_(L, (b), (on)*(e), (n)*(e)) : \
++		luaM_toobig(L))
++
++#define luaM_freemem(L, b, s)	luaM_realloc_(L, (b), (s), 0)
++#define luaM_free(L, b)		luaM_realloc_(L, (b), sizeof(*(b)), 0)
++#define luaM_freearray(L, b, n, t)   luaM_reallocv(L, (b), n, 0, sizeof(t))
++
++#define luaM_malloc(L,t)	luaM_realloc_(L, NULL, 0, (t))
++#define luaM_new(L,t)		cast(t *, luaM_malloc(L, sizeof(t)))
++#define luaM_newvector(L,n,t) \
++		cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t)))
++
++#define luaM_growvector(L,v,nelems,size,t,limit,e) \
++          if ((nelems)+1 > (size)) \
++            ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e)))
++
++#define luaM_reallocvector(L, v,oldn,n,t) \
++   ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
++
++
++LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
++                                                          size_t size);
++LUAI_FUNC void *luaM_toobig (lua_State *L);
++LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
++                               size_t size_elem, int limit,
++                               const char *errormsg);
++
++#endif
++
+--- /dev/null
++++ b/extensions/LUA/lua/lobject.c
+@@ -0,0 +1,215 @@
++/*
++** $Id: lobject.c,v 2.22.1.1 2007/12/27 13:02:25 roberto Exp $
++** Some generic functions over Lua objects
++** See Copyright Notice in lua.h
++*/
++
++#include <stdarg.h>
++
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define lobject_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldo.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "lvm.h"
++
++
++
++const TValue luaO_nilobject_ = {{NULL}, LUA_TNIL};
++
++
++/*
++** converts an integer to a "floating point byte", represented as
++** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if
++** eeeee != 0 and (xxx) otherwise.
++*/
++int luaO_int2fb (unsigned int x) {
++  int e = 0;  /* expoent */
++  while (x >= 16) {
++    x = (x+1) >> 1;
++    e++;
++  }
++  if (x < 8) return x;
++  else return ((e+1) << 3) | (cast_int(x) - 8);
++}
++
++
++/* converts back */
++int luaO_fb2int (int x) {
++  int e = (x >> 3) & 31;
++  if (e == 0) return x;
++  else return ((x & 7)+8) << (e - 1);
++}
++
++
++int luaO_log2 (unsigned int x) {
++  static const lu_byte log_2[256] = {
++    0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
++    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
++    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
++    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
++    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
++    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
++    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
++    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
++  };
++  int l = -1;
++  while (x >= 256) { l += 8; x >>= 8; }
++  return l + log_2[x];
++
++}
++
++
++int luaO_rawequalObj (const TValue *t1, const TValue *t2) {
++  if (ttype(t1) != ttype(t2)) return 0;
++  else switch (ttype(t1)) {
++    case LUA_TNIL:
++      return 1;
++    case LUA_TNUMBER:
++      return luai_numeq(nvalue(t1), nvalue(t2));
++    case LUA_TBOOLEAN:
++      return bvalue(t1) == bvalue(t2);  /* boolean true must be 1 !! */
++    case LUA_TLIGHTUSERDATA:
++      return pvalue(t1) == pvalue(t2);
++    default:
++      lua_assert(iscollectable(t1));
++      return gcvalue(t1) == gcvalue(t2);
++  }
++}
++
++
++int luaO_str2d (const char *s, lua_Number *result) {
++  char *endptr;
++  *result = lua_str2number(s, &endptr);
++  if (endptr == s) return 0;  /* conversion failed */
++  if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
++    *result = cast_num(strtoul(s, &endptr, 16));
++  if (*endptr == '\0') return 1;  /* most common case */
++  while (isspace(cast(unsigned char, *endptr))) endptr++;
++  if (*endptr != '\0') return 0;  /* invalid trailing characters? */
++  return 1;
++}
++
++
++
++static void pushstr (lua_State *L, const char *str) {
++  setsvalue2s(L, L->top, luaS_new(L, str));
++  incr_top(L);
++}
++
++
++/* this function handles only `%d', `%c', %f, %p, and `%s' formats */
++const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
++  int n = 1;
++  pushstr(L, "");
++  for (;;) {
++    const char *e = strchr(fmt, '%');
++    if (e == NULL) break;
++    setsvalue2s(L, L->top, luaS_newlstr(L, fmt, e-fmt));
++    incr_top(L);
++    switch (*(e+1)) {
++      case 's': {
++        const char *s = va_arg(argp, char *);
++        if (s == NULL) s = "(null)";
++        pushstr(L, s);
++        break;
++      }
++      case 'c': {
++        char buff[2];
++        buff[0] = cast(char, va_arg(argp, int));
++        buff[1] = '\0';
++        pushstr(L, buff);
++        break;
++      }
++      case 'd': {
++        setnvalue(L->top, cast_num(va_arg(argp, int)));
++        incr_top(L);
++        break;
++      }
++      case 'f': {
++        setnvalue(L->top, cast_num(va_arg(argp, l_uacNumber)));
++        incr_top(L);
++        break;
++      }
++      case 'p': {
++        char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
++        sprintf(buff, "%p", va_arg(argp, void *));
++        pushstr(L, buff);
++        break;
++      }
++      case '%': {
++        pushstr(L, "%");
++        break;
++      }
++      default: {
++        char buff[3];
++        buff[0] = '%';
++        buff[1] = *(e+1);
++        buff[2] = '\0';
++        pushstr(L, buff);
++        break;
++      }
++    }
++    n += 2;
++    fmt = e+2;
++  }
++  pushstr(L, fmt);
++  luaV_concat(L, n+1, cast_int(L->top - L->base) - 1);
++  L->top -= n;
++  return svalue(L->top - 1);
++}
++
++
++const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
++  const char *msg;
++  va_list argp;
++  va_start(argp, fmt);
++  msg = luaO_pushvfstring(L, fmt, argp);
++  va_end(argp);
++  return msg;
++}
++
++
++void luaO_chunkid (char *out, const char *source, size_t bufflen) {
++  if (*source == '=') {
++    strncpy(out, source+1, bufflen);  /* remove first char */
++    out[bufflen-1] = '\0';  /* ensures null termination */
++  }
++  else {  /* out = "source", or "...source" */
++    if (*source == '@') {
++      size_t l;
++      source++;  /* skip the `@' */
++      bufflen -= sizeof(" '...' ");
++      l = strlen(source);
++      strcpy(out, "");
++      if (l > bufflen) {
++        source += (l-bufflen);  /* get last part of file name */
++        strcat(out, "...");
++      }
++      strcat(out, source);
++    }
++    else {  /* out = [string "string"] */
++      size_t len = strcspn(source, "\n\r");  /* stop at first newline */
++      bufflen -= sizeof(" [string \"...\"] ");
++      if (len > bufflen) len = bufflen;
++      strcpy(out, "[string \"");
++      if (source[len] != '\0') {  /* must truncate? */
++        strncat(out, source, len);
++        strcat(out, "...");
++      }
++      else
++        strcat(out, source);
++      strcat(out, "\"]");
++    }
++  }
++}
+--- /dev/null
++++ b/extensions/LUA/lua/lobject.h
+@@ -0,0 +1,381 @@
++/*
++** $Id: lobject.h,v 2.20.1.2 2008/08/06 13:29:48 roberto Exp $
++** Type definitions for Lua objects
++** See Copyright Notice in lua.h
++*/
++
++
++#ifndef lobject_h
++#define lobject_h
++
++
++#include <stdarg.h>
++
++
++#include "llimits.h"
++#include "lua.h"
++
++
++/* tags for values visible from Lua */
++#define LAST_TAG	LUA_TTHREAD
++
++#define NUM_TAGS	(LAST_TAG+1)
++
++
++/*
++** Extra tags for non-values
++*/
++#define LUA_TPROTO	(LAST_TAG+1)
++#define LUA_TUPVAL	(LAST_TAG+2)
++#define LUA_TDEADKEY	(LAST_TAG+3)
++
++
++/*
++** Union of all collectable objects
++*/
++typedef union GCObject GCObject;
++
++
++/*
++** Common Header for all collectable objects (in macro form, to be
++** included in other objects)
++*/
++#define CommonHeader	GCObject *next; lu_byte tt; lu_byte marked
++
++
++/*
++** Common header in struct form
++*/
++typedef struct GCheader {
++  CommonHeader;
++} GCheader;
++
++
++
++
++/*
++** Union of all Lua values
++*/
++typedef union {
++  GCObject *gc;
++  void *p;
++  lua_Number n;
++  int b;
++} Value;
++
++
++/*
++** Tagged Values
++*/
++
++#define TValuefields	Value value; int tt
++
++typedef struct lua_TValue {
++  TValuefields;
++} TValue;
++
++
++/* Macros to test type */
++#define ttisnil(o)	(ttype(o) == LUA_TNIL)
++#define ttisnumber(o)	(ttype(o) == LUA_TNUMBER)
++#define ttisstring(o)	(ttype(o) == LUA_TSTRING)
++#define ttistable(o)	(ttype(o) == LUA_TTABLE)
++#define ttisfunction(o)	(ttype(o) == LUA_TFUNCTION)
++#define ttisboolean(o)	(ttype(o) == LUA_TBOOLEAN)
++#define ttisuserdata(o)	(ttype(o) == LUA_TUSERDATA)
++#define ttisthread(o)	(ttype(o) == LUA_TTHREAD)
++#define ttislightuserdata(o)	(ttype(o) == LUA_TLIGHTUSERDATA)
++
++/* Macros to access values */
++#define ttype(o)	((o)->tt)
++#define gcvalue(o)	check_exp(iscollectable(o), (o)->value.gc)
++#define pvalue(o)	check_exp(ttislightuserdata(o), (o)->value.p)
++#define nvalue(o)	check_exp(ttisnumber(o), (o)->value.n)
++#define rawtsvalue(o)	check_exp(ttisstring(o), &(o)->value.gc->ts)
++#define tsvalue(o)	(&rawtsvalue(o)->tsv)
++#define rawuvalue(o)	check_exp(ttisuserdata(o), &(o)->value.gc->u)
++#define uvalue(o)	(&rawuvalue(o)->uv)
++#define clvalue(o)	check_exp(ttisfunction(o), &(o)->value.gc->cl)
++#define hvalue(o)	check_exp(ttistable(o), &(o)->value.gc->h)
++#define bvalue(o)	check_exp(ttisboolean(o), (o)->value.b)
++#define thvalue(o)	check_exp(ttisthread(o), &(o)->value.gc->th)
++
++#define l_isfalse(o)	(ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0))
++
++/*
++** for internal debug only
++*/
++#define checkconsistency(obj) \
++  lua_assert(!iscollectable(obj) || (ttype(obj) == (obj)->value.gc->gch.tt))
++
++#define checkliveness(g,obj) \
++  lua_assert(!iscollectable(obj) || \
++  ((ttype(obj) == (obj)->value.gc->gch.tt) && !isdead(g, (obj)->value.gc)))
++
++
++/* Macros to set values */
++#define setnilvalue(obj) ((obj)->tt=LUA_TNIL)
++
++#define setnvalue(obj,x) \
++  { TValue *i_o=(obj); i_o->value.n=(x); i_o->tt=LUA_TNUMBER; }
++
++#define setpvalue(obj,x) \
++  { TValue *i_o=(obj); i_o->value.p=(x); i_o->tt=LUA_TLIGHTUSERDATA; }
++
++#define setbvalue(obj,x) \
++  { TValue *i_o=(obj); i_o->value.b=(x); i_o->tt=LUA_TBOOLEAN; }
++
++#define setsvalue(L,obj,x) \
++  { TValue *i_o=(obj); \
++    i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TSTRING; \
++    checkliveness(G(L),i_o); }
++
++#define setuvalue(L,obj,x) \
++  { TValue *i_o=(obj); \
++    i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TUSERDATA; \
++    checkliveness(G(L),i_o); }
++
++#define setthvalue(L,obj,x) \
++  { TValue *i_o=(obj); \
++    i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TTHREAD; \
++    checkliveness(G(L),i_o); }
++
++#define setclvalue(L,obj,x) \
++  { TValue *i_o=(obj); \
++    i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TFUNCTION; \
++    checkliveness(G(L),i_o); }
++
++#define sethvalue(L,obj,x) \
++  { TValue *i_o=(obj); \
++    i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TTABLE; \
++    checkliveness(G(L),i_o); }
++
++#define setptvalue(L,obj,x) \
++  { TValue *i_o=(obj); \
++    i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TPROTO; \
++    checkliveness(G(L),i_o); }
++
++
++
++
++#define setobj(L,obj1,obj2) \
++  { const TValue *o2=(obj2); TValue *o1=(obj1); \
++    o1->value = o2->value; o1->tt=o2->tt; \
++    checkliveness(G(L),o1); }
++
++
++/*
++** different types of sets, according to destination
++*/
++
++/* from stack to (same) stack */
++#define setobjs2s	setobj
++/* to stack (not from same stack) */
++#define setobj2s	setobj
++#define setsvalue2s	setsvalue
++#define sethvalue2s	sethvalue
++#define setptvalue2s	setptvalue
++/* from table to same table */
++#define setobjt2t	setobj
++/* to table */
++#define setobj2t	setobj
++/* to new object */
++#define setobj2n	setobj
++#define setsvalue2n	setsvalue
++
++#define setttype(obj, tt) (ttype(obj) = (tt))
++
++
++#define iscollectable(o)	(ttype(o) >= LUA_TSTRING)
++
++
++
++typedef TValue *StkId;  /* index to stack elements */
++
++
++/*
++** String headers for string table
++*/
++typedef union TString {
++  L_Umaxalign dummy;  /* ensures maximum alignment for strings */
++  struct {
++    CommonHeader;
++    lu_byte reserved;
++    unsigned int hash;
++    size_t len;
++  } tsv;
++} TString;
++
++
++#define getstr(ts)	cast(const char *, (ts) + 1)
++#define svalue(o)       getstr(rawtsvalue(o))
++
++
++
++typedef union Udata {
++  L_Umaxalign dummy;  /* ensures maximum alignment for `local' udata */
++  struct {
++    CommonHeader;
++    struct Table *metatable;
++    struct Table *env;
++    size_t len;
++  } uv;
++} Udata;
++
++
++
++
++/*
++** Function Prototypes
++*/
++typedef struct Proto {
++  CommonHeader;
++  TValue *k;  /* constants used by the function */
++  Instruction *code;
++  struct Proto **p;  /* functions defined inside the function */
++  int *lineinfo;  /* map from opcodes to source lines */
++  struct LocVar *locvars;  /* information about local variables */
++  TString **upvalues;  /* upvalue names */
++  TString  *source;
++  int sizeupvalues;
++  int sizek;  /* size of `k' */
++  int sizecode;
++  int sizelineinfo;
++  int sizep;  /* size of `p' */
++  int sizelocvars;
++  int linedefined;
++  int lastlinedefined;
++  GCObject *gclist;
++  lu_byte nups;  /* number of upvalues */
++  lu_byte numparams;
++  lu_byte is_vararg;
++  lu_byte maxstacksize;
++} Proto;
++
++
++/* masks for new-style vararg */
++#define VARARG_HASARG		1
++#define VARARG_ISVARARG		2
++#define VARARG_NEEDSARG		4
++
++
++typedef struct LocVar {
++  TString *varname;
++  int startpc;  /* first point where variable is active */
++  int endpc;    /* first point where variable is dead */
++} LocVar;
++
++
++
++/*
++** Upvalues
++*/
++
++typedef struct UpVal {
++  CommonHeader;
++  TValue *v;  /* points to stack or to its own value */
++  union {
++    TValue value;  /* the value (when closed) */
++    struct {  /* double linked list (when open) */
++      struct UpVal *prev;
++      struct UpVal *next;
++    } l;
++  } u;
++} UpVal;
++
++
++/*
++** Closures
++*/
++
++#define ClosureHeader \
++	CommonHeader; lu_byte isC; lu_byte nupvalues; GCObject *gclist; \
++	struct Table *env
++
++typedef struct CClosure {
++  ClosureHeader;
++  lua_CFunction f;
++  TValue upvalue[1];
++} CClosure;
++
++
++typedef struct LClosure {
++  ClosureHeader;
++  struct Proto *p;
++  UpVal *upvals[1];
++} LClosure;
++
++
++typedef union Closure {
++  CClosure c;
++  LClosure l;
++} Closure;
++
++
++#define iscfunction(o)	(ttype(o) == LUA_TFUNCTION && clvalue(o)->c.isC)
++#define isLfunction(o)	(ttype(o) == LUA_TFUNCTION && !clvalue(o)->c.isC)
++
++
++/*
++** Tables
++*/
++
++typedef union TKey {
++  struct {
++    TValuefields;
++    struct Node *next;  /* for chaining */
++  } nk;
++  TValue tvk;
++} TKey;
++
++
++typedef struct Node {
++  TValue i_val;
++  TKey i_key;
++} Node;
++
++
++typedef struct Table {
++  CommonHeader;
++  lu_byte flags;  /* 1<<p means tagmethod(p) is not present */ 
++  lu_byte lsizenode;  /* log2 of size of `node' array */
++  struct Table *metatable;
++  TValue *array;  /* array part */
++  Node *node;
++  Node *lastfree;  /* any free position is before this position */
++  GCObject *gclist;
++  int sizearray;  /* size of `array' array */
++} Table;
++
++
++
++/*
++** `module' operation for hashing (size is always a power of 2)
++*/
++#define lmod(s,size) \
++	(check_exp((size&(size-1))==0, (cast(int, (s) & ((size)-1)))))
++
++
++#define twoto(x)	(1<<(x))
++#define sizenode(t)	(twoto((t)->lsizenode))
++
++
++#define luaO_nilobject		(&luaO_nilobject_)
++
++LUAI_DATA const TValue luaO_nilobject_;
++
++#define ceillog2(x)	(luaO_log2((x)-1) + 1)
++
++LUAI_FUNC int luaO_log2 (unsigned int x);
++LUAI_FUNC int luaO_int2fb (unsigned int x);
++LUAI_FUNC int luaO_fb2int (int x);
++LUAI_FUNC int luaO_rawequalObj (const TValue *t1, const TValue *t2);
++LUAI_FUNC int luaO_str2d (const char *s, lua_Number *result);
++LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
++                                                       va_list argp);
++LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
++LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len);
++
++
++#endif
++
+--- /dev/null
++++ b/extensions/LUA/lua/lopcodes.c
+@@ -0,0 +1,102 @@
++/*
++** $Id: lopcodes.c,v 1.37.1.1 2007/12/27 13:02:25 roberto Exp $
++** See Copyright Notice in lua.h
++*/
++
++
++#define lopcodes_c
++#define LUA_CORE
++
++
++#include "lopcodes.h"
++
++
++/* ORDER OP */
++
++const char *const luaP_opnames[NUM_OPCODES+1] = {
++  "MOVE",
++  "LOADK",
++  "LOADBOOL",
++  "LOADNIL",
++  "GETUPVAL",
++  "GETGLOBAL",
++  "GETTABLE",
++  "SETGLOBAL",
++  "SETUPVAL",
++  "SETTABLE",
++  "NEWTABLE",
++  "SELF",
++  "ADD",
++  "SUB",
++  "MUL",
++  "DIV",
++  "MOD",
++  "POW",
++  "UNM",
++  "NOT",
++  "LEN",
++  "CONCAT",
++  "JMP",
++  "EQ",
++  "LT",
++  "LE",
++  "TEST",
++  "TESTSET",
++  "CALL",
++  "TAILCALL",
++  "RETURN",
++  "FORLOOP",
++  "FORPREP",
++  "TFORLOOP",
++  "SETLIST",
++  "CLOSE",
++  "CLOSURE",
++  "VARARG",
++  NULL
++};
++
++
++#define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m))
++
++const lu_byte luaP_opmodes[NUM_OPCODES] = {
++/*       T  A    B       C     mode		   opcode	*/
++  opmode(0, 1, OpArgR, OpArgN, iABC) 		/* OP_MOVE */
++ ,opmode(0, 1, OpArgK, OpArgN, iABx)		/* OP_LOADK */
++ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_LOADBOOL */
++ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_LOADNIL */
++ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_GETUPVAL */
++ ,opmode(0, 1, OpArgK, OpArgN, iABx)		/* OP_GETGLOBAL */
++ ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_GETTABLE */
++ ,opmode(0, 0, OpArgK, OpArgN, iABx)		/* OP_SETGLOBAL */
++ ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_SETUPVAL */
++ ,opmode(0, 0, OpArgK, OpArgK, iABC)		/* OP_SETTABLE */
++ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_NEWTABLE */
++ ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_SELF */
++ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_ADD */
++ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_SUB */
++ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MUL */
++ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_DIV */
++ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MOD */
++ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_POW */
++ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_UNM */
++ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_NOT */
++ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_LEN */
++ ,opmode(0, 1, OpArgR, OpArgR, iABC)		/* OP_CONCAT */
++ ,opmode(0, 0, OpArgR, OpArgN, iAsBx)		/* OP_JMP */
++ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_EQ */
++ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LT */
++ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LE */
++ ,opmode(1, 1, OpArgR, OpArgU, iABC)		/* OP_TEST */
++ ,opmode(1, 1, OpArgR, OpArgU, iABC)		/* OP_TESTSET */
++ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_CALL */
++ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_TAILCALL */
++ ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_RETURN */
++ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORLOOP */
++ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORPREP */
++ ,opmode(1, 0, OpArgN, OpArgU, iABC)		/* OP_TFORLOOP */
++ ,opmode(0, 0, OpArgU, OpArgU, iABC)		/* OP_SETLIST */
++ ,opmode(0, 0, OpArgN, OpArgN, iABC)		/* OP_CLOSE */
++ ,opmode(0, 1, OpArgU, OpArgN, iABx)		/* OP_CLOSURE */
++ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_VARARG */
++};
++
+--- /dev/null
++++ b/extensions/LUA/lua/lopcodes.h
+@@ -0,0 +1,268 @@
++/*
++** $Id: lopcodes.h,v 1.125.1.1 2007/12/27 13:02:25 roberto Exp $
++** Opcodes for Lua virtual machine
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lopcodes_h
++#define lopcodes_h
++
++#include "llimits.h"
++
++
++/*===========================================================================
++  We assume that instructions are unsigned numbers.
++  All instructions have an opcode in the first 6 bits.
++  Instructions can have the following fields:
++	`A' : 8 bits
++	`B' : 9 bits
++	`C' : 9 bits
++	`Bx' : 18 bits (`B' and `C' together)
++	`sBx' : signed Bx
++
++  A signed argument is represented in excess K; that is, the number
++  value is the unsigned value minus K. K is exactly the maximum value
++  for that argument (so that -max is represented by 0, and +max is
++  represented by 2*max), which is half the maximum for the corresponding
++  unsigned argument.
++===========================================================================*/
++
++
++enum OpMode {iABC, iABx, iAsBx};  /* basic instruction format */
++
++
++/*
++** size and position of opcode arguments.
++*/
++#define SIZE_C		9
++#define SIZE_B		9
++#define SIZE_Bx		(SIZE_C + SIZE_B)
++#define SIZE_A		8
++
++#define SIZE_OP		6
++
++#define POS_OP		0
++#define POS_A		(POS_OP + SIZE_OP)
++#define POS_C		(POS_A + SIZE_A)
++#define POS_B		(POS_C + SIZE_C)
++#define POS_Bx		POS_C
++
++
++/*
++** limits for opcode arguments.
++** we use (signed) int to manipulate most arguments,
++** so they must fit in LUAI_BITSINT-1 bits (-1 for sign)
++*/
++#if SIZE_Bx < LUAI_BITSINT-1
++#define MAXARG_Bx        ((1<<SIZE_Bx)-1)
++#define MAXARG_sBx        (MAXARG_Bx>>1)         /* `sBx' is signed */
++#else
++#define MAXARG_Bx        MAX_INT
++#define MAXARG_sBx        MAX_INT
++#endif
++
++
++#define MAXARG_A        ((1<<SIZE_A)-1)
++#define MAXARG_B        ((1<<SIZE_B)-1)
++#define MAXARG_C        ((1<<SIZE_C)-1)
++
++
++/* creates a mask with `n' 1 bits at position `p' */
++#define MASK1(n,p)	((~((~(Instruction)0)<<n))<<p)
++
++/* creates a mask with `n' 0 bits at position `p' */
++#define MASK0(n,p)	(~MASK1(n,p))
++
++/*
++** the following macros help to manipulate instructions
++*/
++
++#define GET_OPCODE(i)	(cast(OpCode, ((i)>>POS_OP) & MASK1(SIZE_OP,0)))
++#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
++		((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
++
++#define GETARG_A(i)	(cast(int, ((i)>>POS_A) & MASK1(SIZE_A,0)))
++#define SETARG_A(i,u)	((i) = (((i)&MASK0(SIZE_A,POS_A)) | \
++		((cast(Instruction, u)<<POS_A)&MASK1(SIZE_A,POS_A))))
++
++#define GETARG_B(i)	(cast(int, ((i)>>POS_B) & MASK1(SIZE_B,0)))
++#define SETARG_B(i,b)	((i) = (((i)&MASK0(SIZE_B,POS_B)) | \
++		((cast(Instruction, b)<<POS_B)&MASK1(SIZE_B,POS_B))))
++
++#define GETARG_C(i)	(cast(int, ((i)>>POS_C) & MASK1(SIZE_C,0)))
++#define SETARG_C(i,b)	((i) = (((i)&MASK0(SIZE_C,POS_C)) | \
++		((cast(Instruction, b)<<POS_C)&MASK1(SIZE_C,POS_C))))
++
++#define GETARG_Bx(i)	(cast(int, ((i)>>POS_Bx) & MASK1(SIZE_Bx,0)))
++#define SETARG_Bx(i,b)	((i) = (((i)&MASK0(SIZE_Bx,POS_Bx)) | \
++		((cast(Instruction, b)<<POS_Bx)&MASK1(SIZE_Bx,POS_Bx))))
++
++#define GETARG_sBx(i)	(GETARG_Bx(i)-MAXARG_sBx)
++#define SETARG_sBx(i,b)	SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_sBx))
++
++
++#define CREATE_ABC(o,a,b,c)	((cast(Instruction, o)<<POS_OP) \
++			| (cast(Instruction, a)<<POS_A) \
++			| (cast(Instruction, b)<<POS_B) \
++			| (cast(Instruction, c)<<POS_C))
++
++#define CREATE_ABx(o,a,bc)	((cast(Instruction, o)<<POS_OP) \
++			| (cast(Instruction, a)<<POS_A) \
++			| (cast(Instruction, bc)<<POS_Bx))
++
++
++/*
++** Macros to operate RK indices
++*/
++
++/* this bit 1 means constant (0 means register) */
++#define BITRK		(1 << (SIZE_B - 1))
++
++/* test whether value is a constant */
++#define ISK(x)		((x) & BITRK)
++
++/* gets the index of the constant */
++#define INDEXK(r)	((int)(r) & ~BITRK)
++
++#define MAXINDEXRK	(BITRK - 1)
++
++/* code a constant index as a RK value */
++#define RKASK(x)	((x) | BITRK)
++
++
++/*
++** invalid register that fits in 8 bits
++*/
++#define NO_REG		MAXARG_A
++
++
++/*
++** R(x) - register
++** Kst(x) - constant (in constant table)
++** RK(x) == if ISK(x) then Kst(INDEXK(x)) else R(x)
++*/
++
++
++/*
++** grep "ORDER OP" if you change these enums
++*/
++
++typedef enum {
++/*----------------------------------------------------------------------
++name		args	description
++------------------------------------------------------------------------*/
++OP_MOVE,/*	A B	R(A) := R(B)					*/
++OP_LOADK,/*	A Bx	R(A) := Kst(Bx)					*/
++OP_LOADBOOL,/*	A B C	R(A) := (Bool)B; if (C) pc++			*/
++OP_LOADNIL,/*	A B	R(A) := ... := R(B) := nil			*/
++OP_GETUPVAL,/*	A B	R(A) := UpValue[B]				*/
++
++OP_GETGLOBAL,/*	A Bx	R(A) := Gbl[Kst(Bx)]				*/
++OP_GETTABLE,/*	A B C	R(A) := R(B)[RK(C)]				*/
++
++OP_SETGLOBAL,/*	A Bx	Gbl[Kst(Bx)] := R(A)				*/
++OP_SETUPVAL,/*	A B	UpValue[B] := R(A)				*/
++OP_SETTABLE,/*	A B C	R(A)[RK(B)] := RK(C)				*/
++
++OP_NEWTABLE,/*	A B C	R(A) := {} (size = B,C)				*/
++
++OP_SELF,/*	A B C	R(A+1) := R(B); R(A) := R(B)[RK(C)]		*/
++
++OP_ADD,/*	A B C	R(A) := RK(B) + RK(C)				*/
++OP_SUB,/*	A B C	R(A) := RK(B) - RK(C)				*/
++OP_MUL,/*	A B C	R(A) := RK(B) * RK(C)				*/
++OP_DIV,/*	A B C	R(A) := RK(B) / RK(C)				*/
++OP_MOD,/*	A B C	R(A) := RK(B) % RK(C)				*/
++OP_POW,/*	A B C	R(A) := RK(B) ^ RK(C)				*/
++OP_UNM,/*	A B	R(A) := -R(B)					*/
++OP_NOT,/*	A B	R(A) := not R(B)				*/
++OP_LEN,/*	A B	R(A) := length of R(B)				*/
++
++OP_CONCAT,/*	A B C	R(A) := R(B).. ... ..R(C)			*/
++
++OP_JMP,/*	sBx	pc+=sBx					*/
++
++OP_EQ,/*	A B C	if ((RK(B) == RK(C)) ~= A) then pc++		*/
++OP_LT,/*	A B C	if ((RK(B) <  RK(C)) ~= A) then pc++  		*/
++OP_LE,/*	A B C	if ((RK(B) <= RK(C)) ~= A) then pc++  		*/
++
++OP_TEST,/*	A C	if not (R(A) <=> C) then pc++			*/ 
++OP_TESTSET,/*	A B C	if (R(B) <=> C) then R(A) := R(B) else pc++	*/ 
++
++OP_CALL,/*	A B C	R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
++OP_TAILCALL,/*	A B C	return R(A)(R(A+1), ... ,R(A+B-1))		*/
++OP_RETURN,/*	A B	return R(A), ... ,R(A+B-2)	(see note)	*/
++
++OP_FORLOOP,/*	A sBx	R(A)+=R(A+2);
++			if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
++OP_FORPREP,/*	A sBx	R(A)-=R(A+2); pc+=sBx				*/
++
++OP_TFORLOOP,/*	A C	R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2)); 
++                        if R(A+3) ~= nil then R(A+2)=R(A+3) else pc++	*/ 
++OP_SETLIST,/*	A B C	R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B	*/
++
++OP_CLOSE,/*	A 	close all variables in the stack up to (>=) R(A)*/
++OP_CLOSURE,/*	A Bx	R(A) := closure(KPROTO[Bx], R(A), ... ,R(A+n))	*/
++
++OP_VARARG/*	A B	R(A), R(A+1), ..., R(A+B-1) = vararg		*/
++} OpCode;
++
++
++#define NUM_OPCODES	(cast(int, OP_VARARG) + 1)
++
++
++
++/*===========================================================================
++  Notes:
++  (*) In OP_CALL, if (B == 0) then B = top. C is the number of returns - 1,
++      and can be 0: OP_CALL then sets `top' to last_result+1, so
++      next open instruction (OP_CALL, OP_RETURN, OP_SETLIST) may use `top'.
++
++  (*) In OP_VARARG, if (B == 0) then use actual number of varargs and
++      set top (like in OP_CALL with C == 0).
++
++  (*) In OP_RETURN, if (B == 0) then return up to `top'
++
++  (*) In OP_SETLIST, if (B == 0) then B = `top';
++      if (C == 0) then next `instruction' is real C
++
++  (*) For comparisons, A specifies what condition the test should accept
++      (true or false).
++
++  (*) All `skips' (pc++) assume that next instruction is a jump
++===========================================================================*/
++
++
++/*
++** masks for instruction properties. The format is:
++** bits 0-1: op mode
++** bits 2-3: C arg mode
++** bits 4-5: B arg mode
++** bit 6: instruction set register A
++** bit 7: operator is a test
++*/  
++
++enum OpArgMask {
++  OpArgN,  /* argument is not used */
++  OpArgU,  /* argument is used */
++  OpArgR,  /* argument is a register or a jump offset */
++  OpArgK   /* argument is a constant or register/constant */
++};
++
++LUAI_DATA const lu_byte luaP_opmodes[NUM_OPCODES];
++
++#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 3))
++#define getBMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3))
++#define getCMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3))
++#define testAMode(m)	(luaP_opmodes[m] & (1 << 6))
++#define testTMode(m)	(luaP_opmodes[m] & (1 << 7))
++
++
++LUAI_DATA const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
++
++
++/* number of list items to accumulate before a SETLIST instruction */
++#define LFIELDS_PER_FLUSH	50
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lparser.c
+@@ -0,0 +1,1339 @@
++/*
++** $Id: lparser.c,v 2.42.1.3 2007/12/28 15:32:23 roberto Exp $
++** Lua Parser
++** See Copyright Notice in lua.h
++*/
++
++
++#include <string.h>
++
++#define lparser_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lcode.h"
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "llex.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lopcodes.h"
++#include "lparser.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++
++
++
++#define hasmultret(k)		((k) == VCALL || (k) == VVARARG)
++
++#define getlocvar(fs, i)	((fs)->f->locvars[(fs)->actvar[i]])
++
++#define luaY_checklimit(fs,v,l,m)	if ((v)>(l)) errorlimit(fs,l,m)
++
++
++/*
++** nodes for block list (list of active blocks)
++*/
++typedef struct BlockCnt {
++  struct BlockCnt *previous;  /* chain */
++  int breaklist;  /* list of jumps out of this loop */
++  lu_byte nactvar;  /* # active locals outside the breakable structure */
++  lu_byte upval;  /* true if some variable in the block is an upvalue */
++  lu_byte isbreakable;  /* true if `block' is a loop */
++} BlockCnt;
++
++
++
++/*
++** prototypes for recursive non-terminal functions
++*/
++static void chunk (LexState *ls);
++static void expr (LexState *ls, expdesc *v);
++
++
++static void anchor_token (LexState *ls) {
++  if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) {
++    TString *ts = ls->t.seminfo.ts;
++    luaX_newstring(ls, getstr(ts), ts->tsv.len);
++  }
++}
++
++
++static void error_expected (LexState *ls, int token) {
++  luaX_syntaxerror(ls,
++      luaO_pushfstring(ls->L, LUA_QS " expected", luaX_token2str(ls, token)));
++}
++
++
++static void errorlimit (FuncState *fs, int limit, const char *what) {
++  const char *msg = (fs->f->linedefined == 0) ?
++    luaO_pushfstring(fs->L, "main function has more than %d %s", limit, what) :
++    luaO_pushfstring(fs->L, "function at line %d has more than %d %s",
++                            fs->f->linedefined, limit, what);
++  luaX_lexerror(fs->ls, msg, 0);
++}
++
++
++static int testnext (LexState *ls, int c) {
++  if (ls->t.token == c) {
++    luaX_next(ls);
++    return 1;
++  }
++  else return 0;
++}
++
++
++static void check (LexState *ls, int c) {
++  if (ls->t.token != c)
++    error_expected(ls, c);
++}
++
++static void checknext (LexState *ls, int c) {
++  check(ls, c);
++  luaX_next(ls);
++}
++
++
++#define check_condition(ls,c,msg)	{ if (!(c)) luaX_syntaxerror(ls, msg); }
++
++
++
++static void check_match (LexState *ls, int what, int who, int where) {
++  if (!testnext(ls, what)) {
++    if (where == ls->linenumber)
++      error_expected(ls, what);
++    else {
++      luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
++             LUA_QS " expected (to close " LUA_QS " at line %d)",
++              luaX_token2str(ls, what), luaX_token2str(ls, who), where));
++    }
++  }
++}
++
++
++static TString *str_checkname (LexState *ls) {
++  TString *ts;
++  check(ls, TK_NAME);
++  ts = ls->t.seminfo.ts;
++  luaX_next(ls);
++  return ts;
++}
++
++
++static void init_exp (expdesc *e, expkind k, int i) {
++  e->f = e->t = NO_JUMP;
++  e->k = k;
++  e->u.s.info = i;
++}
++
++
++static void codestring (LexState *ls, expdesc *e, TString *s) {
++  init_exp(e, VK, luaK_stringK(ls->fs, s));
++}
++
++
++static void checkname(LexState *ls, expdesc *e) {
++  codestring(ls, e, str_checkname(ls));
++}
++
++
++static int registerlocalvar (LexState *ls, TString *varname) {
++  FuncState *fs = ls->fs;
++  Proto *f = fs->f;
++  int oldsize = f->sizelocvars;
++  luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
++                  LocVar, SHRT_MAX, "too many local variables");
++  while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
++  f->locvars[fs->nlocvars].varname = varname;
++  luaC_objbarrier(ls->L, f, varname);
++  return fs->nlocvars++;
++}
++
++
++#define new_localvarliteral(ls,v,n) \
++  new_localvar(ls, luaX_newstring(ls, "" v, (sizeof(v)/sizeof(char))-1), n)
++
++
++static void new_localvar (LexState *ls, TString *name, int n) {
++  FuncState *fs = ls->fs;
++  luaY_checklimit(fs, fs->nactvar+n+1, LUAI_MAXVARS, "local variables");
++  fs->actvar[fs->nactvar+n] = cast(unsigned short, registerlocalvar(ls, name));
++}
++
++
++static void adjustlocalvars (LexState *ls, int nvars) {
++  FuncState *fs = ls->fs;
++  fs->nactvar = cast_byte(fs->nactvar + nvars);
++  for (; nvars; nvars--) {
++    getlocvar(fs, fs->nactvar - nvars).startpc = fs->pc;
++  }
++}
++
++
++static void removevars (LexState *ls, int tolevel) {
++  FuncState *fs = ls->fs;
++  while (fs->nactvar > tolevel)
++    getlocvar(fs, --fs->nactvar).endpc = fs->pc;
++}
++
++
++static int indexupvalue (FuncState *fs, TString *name, expdesc *v) {
++  int i;
++  Proto *f = fs->f;
++  int oldsize = f->sizeupvalues;
++  for (i=0; i<f->nups; i++) {
++    if (fs->upvalues[i].k == v->k && fs->upvalues[i].info == v->u.s.info) {
++      lua_assert(f->upvalues[i] == name);
++      return i;
++    }
++  }
++  /* new one */
++  luaY_checklimit(fs, f->nups + 1, LUAI_MAXUPVALUES, "upvalues");
++  luaM_growvector(fs->L, f->upvalues, f->nups, f->sizeupvalues,
++                  TString *, MAX_INT, "");
++  while (oldsize < f->sizeupvalues) f->upvalues[oldsize++] = NULL;
++  f->upvalues[f->nups] = name;
++  luaC_objbarrier(fs->L, f, name);
++  lua_assert(v->k == VLOCAL || v->k == VUPVAL);
++  fs->upvalues[f->nups].k = cast_byte(v->k);
++  fs->upvalues[f->nups].info = cast_byte(v->u.s.info);
++  return f->nups++;
++}
++
++
++static int searchvar (FuncState *fs, TString *n) {
++  int i;
++  for (i=fs->nactvar-1; i >= 0; i--) {
++    if (n == getlocvar(fs, i).varname)
++      return i;
++  }
++  return -1;  /* not found */
++}
++
++
++static void markupval (FuncState *fs, int level) {
++  BlockCnt *bl = fs->bl;
++  while (bl && bl->nactvar > level) bl = bl->previous;
++  if (bl) bl->upval = 1;
++}
++
++
++static int singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) {
++  if (fs == NULL) {  /* no more levels? */
++    init_exp(var, VGLOBAL, NO_REG);  /* default is global variable */
++    return VGLOBAL;
++  }
++  else {
++    int v = searchvar(fs, n);  /* look up at current level */
++    if (v >= 0) {
++      init_exp(var, VLOCAL, v);
++      if (!base)
++        markupval(fs, v);  /* local will be used as an upval */
++      return VLOCAL;
++    }
++    else {  /* not found at current level; try upper one */
++      if (singlevaraux(fs->prev, n, var, 0) == VGLOBAL)
++        return VGLOBAL;
++      var->u.s.info = indexupvalue(fs, n, var);  /* else was LOCAL or UPVAL */
++      var->k = VUPVAL;  /* upvalue in this level */
++      return VUPVAL;
++    }
++  }
++}
++
++
++static void singlevar (LexState *ls, expdesc *var) {
++  TString *varname = str_checkname(ls);
++  FuncState *fs = ls->fs;
++  if (singlevaraux(fs, varname, var, 1) == VGLOBAL)
++    var->u.s.info = luaK_stringK(fs, varname);  /* info points to global name */
++}
++
++
++static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
++  FuncState *fs = ls->fs;
++  int extra = nvars - nexps;
++  if (hasmultret(e->k)) {
++    extra++;  /* includes call itself */
++    if (extra < 0) extra = 0;
++    luaK_setreturns(fs, e, extra);  /* last exp. provides the difference */
++    if (extra > 1) luaK_reserveregs(fs, extra-1);
++  }
++  else {
++    if (e->k != VVOID) luaK_exp2nextreg(fs, e);  /* close last expression */
++    if (extra > 0) {
++      int reg = fs->freereg;
++      luaK_reserveregs(fs, extra);
++      luaK_nil(fs, reg, extra);
++    }
++  }
++}
++
++
++static void enterlevel (LexState *ls) {
++  if (++ls->L->nCcalls > LUAI_MAXCCALLS)
++	luaX_lexerror(ls, "chunk has too many syntax levels", 0);
++}
++
++
++#define leavelevel(ls)	((ls)->L->nCcalls--)
++
++
++static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isbreakable) {
++  bl->breaklist = NO_JUMP;
++  bl->isbreakable = isbreakable;
++  bl->nactvar = fs->nactvar;
++  bl->upval = 0;
++  bl->previous = fs->bl;
++  fs->bl = bl;
++  lua_assert(fs->freereg == fs->nactvar);
++}
++
++
++static void leaveblock (FuncState *fs) {
++  BlockCnt *bl = fs->bl;
++  fs->bl = bl->previous;
++  removevars(fs->ls, bl->nactvar);
++  if (bl->upval)
++    luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0);
++  /* a block either controls scope or breaks (never both) */
++  lua_assert(!bl->isbreakable || !bl->upval);
++  lua_assert(bl->nactvar == fs->nactvar);
++  fs->freereg = fs->nactvar;  /* free registers */
++  luaK_patchtohere(fs, bl->breaklist);
++}
++
++
++static void pushclosure (LexState *ls, FuncState *func, expdesc *v) {
++  FuncState *fs = ls->fs;
++  Proto *f = fs->f;
++  int oldsize = f->sizep;
++  int i;
++  luaM_growvector(ls->L, f->p, fs->np, f->sizep, Proto *,
++                  MAXARG_Bx, "constant table overflow");
++  while (oldsize < f->sizep) f->p[oldsize++] = NULL;
++  f->p[fs->np++] = func->f;
++  luaC_objbarrier(ls->L, f, func->f);
++  init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np-1));
++  for (i=0; i<func->f->nups; i++) {
++    OpCode o = (func->upvalues[i].k == VLOCAL) ? OP_MOVE : OP_GETUPVAL;
++    luaK_codeABC(fs, o, 0, func->upvalues[i].info, 0);
++  }
++}
++
++
++static void open_func (LexState *ls, FuncState *fs) {
++  lua_State *L = ls->L;
++  Proto *f = luaF_newproto(L);
++  fs->f = f;
++  fs->prev = ls->fs;  /* linked list of funcstates */
++  fs->ls = ls;
++  fs->L = L;
++  ls->fs = fs;
++  fs->pc = 0;
++  fs->lasttarget = -1;
++  fs->jpc = NO_JUMP;
++  fs->freereg = 0;
++  fs->nk = 0;
++  fs->np = 0;
++  fs->nlocvars = 0;
++  fs->nactvar = 0;
++  fs->bl = NULL;
++  f->source = ls->source;
++  f->maxstacksize = 2;  /* registers 0/1 are always valid */
++  fs->h = luaH_new(L, 0, 0);
++  /* anchor table of constants and prototype (to avoid being collected) */
++  sethvalue2s(L, L->top, fs->h);
++  incr_top(L);
++  setptvalue2s(L, L->top, f);
++  incr_top(L);
++}
++
++
++static void close_func (LexState *ls) {
++  lua_State *L = ls->L;
++  FuncState *fs = ls->fs;
++  Proto *f = fs->f;
++  removevars(ls, 0);
++  luaK_ret(fs, 0, 0);  /* final return */
++  luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction);
++  f->sizecode = fs->pc;
++  luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int);
++  f->sizelineinfo = fs->pc;
++  luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue);
++  f->sizek = fs->nk;
++  luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *);
++  f->sizep = fs->np;
++  luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar);
++  f->sizelocvars = fs->nlocvars;
++  luaM_reallocvector(L, f->upvalues, f->sizeupvalues, f->nups, TString *);
++  f->sizeupvalues = f->nups;
++  lua_assert(luaG_checkcode(f));
++  lua_assert(fs->bl == NULL);
++  ls->fs = fs->prev;
++  L->top -= 2;  /* remove table and prototype from the stack */
++  /* last token read was anchored in defunct function; must reanchor it */
++  if (fs) anchor_token(ls);
++}
++
++
++Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, const char *name) {
++  struct LexState lexstate;
++  struct FuncState funcstate;
++  lexstate.buff = buff;
++  luaX_setinput(L, &lexstate, z, luaS_new(L, name));
++  open_func(&lexstate, &funcstate);
++  funcstate.f->is_vararg = VARARG_ISVARARG;  /* main func. is always vararg */
++  luaX_next(&lexstate);  /* read first token */
++  chunk(&lexstate);
++  check(&lexstate, TK_EOS);
++  close_func(&lexstate);
++  lua_assert(funcstate.prev == NULL);
++  lua_assert(funcstate.f->nups == 0);
++  lua_assert(lexstate.fs == NULL);
++  return funcstate.f;
++}
++
++
++
++/*============================================================*/
++/* GRAMMAR RULES */
++/*============================================================*/
++
++
++static void field (LexState *ls, expdesc *v) {
++  /* field -> ['.' | ':'] NAME */
++  FuncState *fs = ls->fs;
++  expdesc key;
++  luaK_exp2anyreg(fs, v);
++  luaX_next(ls);  /* skip the dot or colon */
++  checkname(ls, &key);
++  luaK_indexed(fs, v, &key);
++}
++
++
++static void yindex (LexState *ls, expdesc *v) {
++  /* index -> '[' expr ']' */
++  luaX_next(ls);  /* skip the '[' */
++  expr(ls, v);
++  luaK_exp2val(ls->fs, v);
++  checknext(ls, ']');
++}
++
++
++/*
++** {======================================================================
++** Rules for Constructors
++** =======================================================================
++*/
++
++
++struct ConsControl {
++  expdesc v;  /* last list item read */
++  expdesc *t;  /* table descriptor */
++  int nh;  /* total number of `record' elements */
++  int na;  /* total number of array elements */
++  int tostore;  /* number of array elements pending to be stored */
++};
++
++
++static void recfield (LexState *ls, struct ConsControl *cc) {
++  /* recfield -> (NAME | `['exp1`]') = exp1 */
++  FuncState *fs = ls->fs;
++  int reg = ls->fs->freereg;
++  expdesc key, val;
++  int rkkey;
++  if (ls->t.token == TK_NAME) {
++    luaY_checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
++    checkname(ls, &key);
++  }
++  else  /* ls->t.token == '[' */
++    yindex(ls, &key);
++  cc->nh++;
++  checknext(ls, '=');
++  rkkey = luaK_exp2RK(fs, &key);
++  expr(ls, &val);
++  luaK_codeABC(fs, OP_SETTABLE, cc->t->u.s.info, rkkey, luaK_exp2RK(fs, &val));
++  fs->freereg = reg;  /* free registers */
++}
++
++
++static void closelistfield (FuncState *fs, struct ConsControl *cc) {
++  if (cc->v.k == VVOID) return;  /* there is no list item */
++  luaK_exp2nextreg(fs, &cc->v);
++  cc->v.k = VVOID;
++  if (cc->tostore == LFIELDS_PER_FLUSH) {
++    luaK_setlist(fs, cc->t->u.s.info, cc->na, cc->tostore);  /* flush */
++    cc->tostore = 0;  /* no more items pending */
++  }
++}
++
++
++static void lastlistfield (FuncState *fs, struct ConsControl *cc) {
++  if (cc->tostore == 0) return;
++  if (hasmultret(cc->v.k)) {
++    luaK_setmultret(fs, &cc->v);
++    luaK_setlist(fs, cc->t->u.s.info, cc->na, LUA_MULTRET);
++    cc->na--;  /* do not count last expression (unknown number of elements) */
++  }
++  else {
++    if (cc->v.k != VVOID)
++      luaK_exp2nextreg(fs, &cc->v);
++    luaK_setlist(fs, cc->t->u.s.info, cc->na, cc->tostore);
++  }
++}
++
++
++static void listfield (LexState *ls, struct ConsControl *cc) {
++  expr(ls, &cc->v);
++  luaY_checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor");
++  cc->na++;
++  cc->tostore++;
++}
++
++
++static void constructor (LexState *ls, expdesc *t) {
++  /* constructor -> ?? */
++  FuncState *fs = ls->fs;
++  int line = ls->linenumber;
++  int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
++  struct ConsControl cc;
++  cc.na = cc.nh = cc.tostore = 0;
++  cc.t = t;
++  init_exp(t, VRELOCABLE, pc);
++  init_exp(&cc.v, VVOID, 0);  /* no value (yet) */
++  luaK_exp2nextreg(ls->fs, t);  /* fix it at stack top (for gc) */
++  checknext(ls, '{');
++  do {
++    lua_assert(cc.v.k == VVOID || cc.tostore > 0);
++    if (ls->t.token == '}') break;
++    closelistfield(fs, &cc);
++    switch(ls->t.token) {
++      case TK_NAME: {  /* may be listfields or recfields */
++        luaX_lookahead(ls);
++        if (ls->lookahead.token != '=')  /* expression? */
++          listfield(ls, &cc);
++        else
++          recfield(ls, &cc);
++        break;
++      }
++      case '[': {  /* constructor_item -> recfield */
++        recfield(ls, &cc);
++        break;
++      }
++      default: {  /* constructor_part -> listfield */
++        listfield(ls, &cc);
++        break;
++      }
++    }
++  } while (testnext(ls, ',') || testnext(ls, ';'));
++  check_match(ls, '}', '{', line);
++  lastlistfield(fs, &cc);
++  SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */
++  SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh));  /* set initial table size */
++}
++
++/* }====================================================================== */
++
++
++
++static void parlist (LexState *ls) {
++  /* parlist -> [ param { `,' param } ] */
++  FuncState *fs = ls->fs;
++  Proto *f = fs->f;
++  int nparams = 0;
++  f->is_vararg = 0;
++  if (ls->t.token != ')') {  /* is `parlist' not empty? */
++    do {
++      switch (ls->t.token) {
++        case TK_NAME: {  /* param -> NAME */
++          new_localvar(ls, str_checkname(ls), nparams++);
++          break;
++        }
++        case TK_DOTS: {  /* param -> `...' */
++          luaX_next(ls);
++#if defined(LUA_COMPAT_VARARG)
++          /* use `arg' as default name */
++          new_localvarliteral(ls, "arg", nparams++);
++          f->is_vararg = VARARG_HASARG | VARARG_NEEDSARG;
++#endif
++          f->is_vararg |= VARARG_ISVARARG;
++          break;
++        }
++        default: luaX_syntaxerror(ls, "<name> or " LUA_QL("...") " expected");
++      }
++    } while (!f->is_vararg && testnext(ls, ','));
++  }
++  adjustlocalvars(ls, nparams);
++  f->numparams = cast_byte(fs->nactvar - (f->is_vararg & VARARG_HASARG));
++  luaK_reserveregs(fs, fs->nactvar);  /* reserve register for parameters */
++}
++
++
++static void body (LexState *ls, expdesc *e, int needself, int line) {
++  /* body ->  `(' parlist `)' chunk END */
++  FuncState new_fs;
++  open_func(ls, &new_fs);
++  new_fs.f->linedefined = line;
++  checknext(ls, '(');
++  if (needself) {
++    new_localvarliteral(ls, "self", 0);
++    adjustlocalvars(ls, 1);
++  }
++  parlist(ls);
++  checknext(ls, ')');
++  chunk(ls);
++  new_fs.f->lastlinedefined = ls->linenumber;
++  check_match(ls, TK_END, TK_FUNCTION, line);
++  close_func(ls);
++  pushclosure(ls, &new_fs, e);
++}
++
++
++static int explist1 (LexState *ls, expdesc *v) {
++  /* explist1 -> expr { `,' expr } */
++  int n = 1;  /* at least one expression */
++  expr(ls, v);
++  while (testnext(ls, ',')) {
++    luaK_exp2nextreg(ls->fs, v);
++    expr(ls, v);
++    n++;
++  }
++  return n;
++}
++
++
++static void funcargs (LexState *ls, expdesc *f) {
++  FuncState *fs = ls->fs;
++  expdesc args;
++  int base, nparams;
++  int line = ls->linenumber;
++  switch (ls->t.token) {
++    case '(': {  /* funcargs -> `(' [ explist1 ] `)' */
++      if (line != ls->lastline)
++        luaX_syntaxerror(ls,"ambiguous syntax (function call x new statement)");
++      luaX_next(ls);
++      if (ls->t.token == ')')  /* arg list is empty? */
++        args.k = VVOID;
++      else {
++        explist1(ls, &args);
++        luaK_setmultret(fs, &args);
++      }
++      check_match(ls, ')', '(', line);
++      break;
++    }
++    case '{': {  /* funcargs -> constructor */
++      constructor(ls, &args);
++      break;
++    }
++    case TK_STRING: {  /* funcargs -> STRING */
++      codestring(ls, &args, ls->t.seminfo.ts);
++      luaX_next(ls);  /* must use `seminfo' before `next' */
++      break;
++    }
++    default: {
++      luaX_syntaxerror(ls, "function arguments expected");
++      return;
++    }
++  }
++  lua_assert(f->k == VNONRELOC);
++  base = f->u.s.info;  /* base register for call */
++  if (hasmultret(args.k))
++    nparams = LUA_MULTRET;  /* open call */
++  else {
++    if (args.k != VVOID)
++      luaK_exp2nextreg(fs, &args);  /* close last argument */
++    nparams = fs->freereg - (base+1);
++  }
++  init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
++  luaK_fixline(fs, line);
++  fs->freereg = base+1;  /* call remove function and arguments and leaves
++                            (unless changed) one result */
++}
++
++
++
++
++/*
++** {======================================================================
++** Expression parsing
++** =======================================================================
++*/
++
++
++static void prefixexp (LexState *ls, expdesc *v) {
++  /* prefixexp -> NAME | '(' expr ')' */
++  switch (ls->t.token) {
++    case '(': {
++      int line = ls->linenumber;
++      luaX_next(ls);
++      expr(ls, v);
++      check_match(ls, ')', '(', line);
++      luaK_dischargevars(ls->fs, v);
++      return;
++    }
++    case TK_NAME: {
++      singlevar(ls, v);
++      return;
++    }
++    default: {
++      luaX_syntaxerror(ls, "unexpected symbol");
++      return;
++    }
++  }
++}
++
++
++static void primaryexp (LexState *ls, expdesc *v) {
++  /* primaryexp ->
++        prefixexp { `.' NAME | `[' exp `]' | `:' NAME funcargs | funcargs } */
++  FuncState *fs = ls->fs;
++  prefixexp(ls, v);
++  for (;;) {
++    switch (ls->t.token) {
++      case '.': {  /* field */
++        field(ls, v);
++        break;
++      }
++      case '[': {  /* `[' exp1 `]' */
++        expdesc key;
++        luaK_exp2anyreg(fs, v);
++        yindex(ls, &key);
++        luaK_indexed(fs, v, &key);
++        break;
++      }
++      case ':': {  /* `:' NAME funcargs */
++        expdesc key;
++        luaX_next(ls);
++        checkname(ls, &key);
++        luaK_self(fs, v, &key);
++        funcargs(ls, v);
++        break;
++      }
++      case '(': case TK_STRING: case '{': {  /* funcargs */
++        luaK_exp2nextreg(fs, v);
++        funcargs(ls, v);
++        break;
++      }
++      default: return;
++    }
++  }
++}
++
++
++static void simpleexp (LexState *ls, expdesc *v) {
++  /* simpleexp -> NUMBER | STRING | NIL | true | false | ... |
++                  constructor | FUNCTION body | primaryexp */
++  switch (ls->t.token) {
++    case TK_NUMBER: {
++      init_exp(v, VKNUM, 0);
++      v->u.nval = ls->t.seminfo.r;
++      break;
++    }
++    case TK_STRING: {
++      codestring(ls, v, ls->t.seminfo.ts);
++      break;
++    }
++    case TK_NIL: {
++      init_exp(v, VNIL, 0);
++      break;
++    }
++    case TK_TRUE: {
++      init_exp(v, VTRUE, 0);
++      break;
++    }
++    case TK_FALSE: {
++      init_exp(v, VFALSE, 0);
++      break;
++    }
++    case TK_DOTS: {  /* vararg */
++      FuncState *fs = ls->fs;
++      check_condition(ls, fs->f->is_vararg,
++                      "cannot use " LUA_QL("...") " outside a vararg function");
++      fs->f->is_vararg &= ~VARARG_NEEDSARG;  /* don't need 'arg' */
++      init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
++      break;
++    }
++    case '{': {  /* constructor */
++      constructor(ls, v);
++      return;
++    }
++    case TK_FUNCTION: {
++      luaX_next(ls);
++      body(ls, v, 0, ls->linenumber);
++      return;
++    }
++    default: {
++      primaryexp(ls, v);
++      return;
++    }
++  }
++  luaX_next(ls);
++}
++
++
++static UnOpr getunopr (int op) {
++  switch (op) {
++    case TK_NOT: return OPR_NOT;
++    case '-': return OPR_MINUS;
++    case '#': return OPR_LEN;
++    default: return OPR_NOUNOPR;
++  }
++}
++
++
++static BinOpr getbinopr (int op) {
++  switch (op) {
++    case '+': return OPR_ADD;
++    case '-': return OPR_SUB;
++    case '*': return OPR_MUL;
++    case '/': return OPR_DIV;
++    case '%': return OPR_MOD;
++    case '^': return OPR_POW;
++    case TK_CONCAT: return OPR_CONCAT;
++    case TK_NE: return OPR_NE;
++    case TK_EQ: return OPR_EQ;
++    case '<': return OPR_LT;
++    case TK_LE: return OPR_LE;
++    case '>': return OPR_GT;
++    case TK_GE: return OPR_GE;
++    case TK_AND: return OPR_AND;
++    case TK_OR: return OPR_OR;
++    default: return OPR_NOBINOPR;
++  }
++}
++
++
++static const struct {
++  lu_byte left;  /* left priority for each binary operator */
++  lu_byte right; /* right priority */
++} priority[] = {  /* ORDER OPR */
++   {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7},  /* `+' `-' `/' `%' */
++   {10, 9}, {5, 4},                 /* power and concat (right associative) */
++   {3, 3}, {3, 3},                  /* equality and inequality */
++   {3, 3}, {3, 3}, {3, 3}, {3, 3},  /* order */
++   {2, 2}, {1, 1}                   /* logical (and/or) */
++};
++
++#define UNARY_PRIORITY	8  /* priority for unary operators */
++
++
++/*
++** subexpr -> (simpleexp | unop subexpr) { binop subexpr }
++** where `binop' is any binary operator with a priority higher than `limit'
++*/
++static BinOpr subexpr (LexState *ls, expdesc *v, unsigned int limit) {
++  BinOpr op;
++  UnOpr uop;
++  enterlevel(ls);
++  uop = getunopr(ls->t.token);
++  if (uop != OPR_NOUNOPR) {
++    luaX_next(ls);
++    subexpr(ls, v, UNARY_PRIORITY);
++    luaK_prefix(ls->fs, uop, v);
++  }
++  else simpleexp(ls, v);
++  /* expand while operators have priorities higher than `limit' */
++  op = getbinopr(ls->t.token);
++  while (op != OPR_NOBINOPR && priority[op].left > limit) {
++    expdesc v2;
++    BinOpr nextop;
++    luaX_next(ls);
++    luaK_infix(ls->fs, op, v);
++    /* read sub-expression with higher priority */
++    nextop = subexpr(ls, &v2, priority[op].right);
++    luaK_posfix(ls->fs, op, v, &v2);
++    op = nextop;
++  }
++  leavelevel(ls);
++  return op;  /* return first untreated operator */
++}
++
++
++static void expr (LexState *ls, expdesc *v) {
++  subexpr(ls, v, 0);
++}
++
++/* }==================================================================== */
++
++
++
++/*
++** {======================================================================
++** Rules for Statements
++** =======================================================================
++*/
++
++
++static int block_follow (int token) {
++  switch (token) {
++    case TK_ELSE: case TK_ELSEIF: case TK_END:
++    case TK_UNTIL: case TK_EOS:
++      return 1;
++    default: return 0;
++  }
++}
++
++
++static void block (LexState *ls) {
++  /* block -> chunk */
++  FuncState *fs = ls->fs;
++  BlockCnt bl;
++  enterblock(fs, &bl, 0);
++  chunk(ls);
++  lua_assert(bl.breaklist == NO_JUMP);
++  leaveblock(fs);
++}
++
++
++/*
++** structure to chain all variables in the left-hand side of an
++** assignment
++*/
++struct LHS_assign {
++  struct LHS_assign *prev;
++  expdesc v;  /* variable (global, local, upvalue, or indexed) */
++};
++
++
++/*
++** check whether, in an assignment to a local variable, the local variable
++** is needed in a previous assignment (to a table). If so, save original
++** local value in a safe place and use this safe copy in the previous
++** assignment.
++*/
++static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) {
++  FuncState *fs = ls->fs;
++  int extra = fs->freereg;  /* eventual position to save local variable */
++  int conflict = 0;
++  for (; lh; lh = lh->prev) {
++    if (lh->v.k == VINDEXED) {
++      if (lh->v.u.s.info == v->u.s.info) {  /* conflict? */
++        conflict = 1;
++        lh->v.u.s.info = extra;  /* previous assignment will use safe copy */
++      }
++      if (lh->v.u.s.aux == v->u.s.info) {  /* conflict? */
++        conflict = 1;
++        lh->v.u.s.aux = extra;  /* previous assignment will use safe copy */
++      }
++    }
++  }
++  if (conflict) {
++    luaK_codeABC(fs, OP_MOVE, fs->freereg, v->u.s.info, 0);  /* make copy */
++    luaK_reserveregs(fs, 1);
++  }
++}
++
++
++static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) {
++  expdesc e;
++  check_condition(ls, VLOCAL <= lh->v.k && lh->v.k <= VINDEXED,
++                      "syntax error");
++  if (testnext(ls, ',')) {  /* assignment -> `,' primaryexp assignment */
++    struct LHS_assign nv;
++    nv.prev = lh;
++    primaryexp(ls, &nv.v);
++    if (nv.v.k == VLOCAL)
++      check_conflict(ls, lh, &nv.v);
++    luaY_checklimit(ls->fs, nvars, LUAI_MAXCCALLS - ls->L->nCcalls,
++                    "variables in assignment");
++    assignment(ls, &nv, nvars+1);
++  }
++  else {  /* assignment -> `=' explist1 */
++    int nexps;
++    checknext(ls, '=');
++    nexps = explist1(ls, &e);
++    if (nexps != nvars) {
++      adjust_assign(ls, nvars, nexps, &e);
++      if (nexps > nvars)
++        ls->fs->freereg -= nexps - nvars;  /* remove extra values */
++    }
++    else {
++      luaK_setoneret(ls->fs, &e);  /* close last expression */
++      luaK_storevar(ls->fs, &lh->v, &e);
++      return;  /* avoid default */
++    }
++  }
++  init_exp(&e, VNONRELOC, ls->fs->freereg-1);  /* default assignment */
++  luaK_storevar(ls->fs, &lh->v, &e);
++}
++
++
++static int cond (LexState *ls) {
++  /* cond -> exp */
++  expdesc v;
++  expr(ls, &v);  /* read condition */
++  if (v.k == VNIL) v.k = VFALSE;  /* `falses' are all equal here */
++  luaK_goiftrue(ls->fs, &v);
++  return v.f;
++}
++
++
++static void breakstat (LexState *ls) {
++  FuncState *fs = ls->fs;
++  BlockCnt *bl = fs->bl;
++  int upval = 0;
++  while (bl && !bl->isbreakable) {
++    upval |= bl->upval;
++    bl = bl->previous;
++  }
++  if (!bl)
++    luaX_syntaxerror(ls, "no loop to break");
++  if (upval)
++    luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0);
++  luaK_concat(fs, &bl->breaklist, luaK_jump(fs));
++}
++
++
++static void whilestat (LexState *ls, int line) {
++  /* whilestat -> WHILE cond DO block END */
++  FuncState *fs = ls->fs;
++  int whileinit;
++  int condexit;
++  BlockCnt bl;
++  luaX_next(ls);  /* skip WHILE */
++  whileinit = luaK_getlabel(fs);
++  condexit = cond(ls);
++  enterblock(fs, &bl, 1);
++  checknext(ls, TK_DO);
++  block(ls);
++  luaK_patchlist(fs, luaK_jump(fs), whileinit);
++  check_match(ls, TK_END, TK_WHILE, line);
++  leaveblock(fs);
++  luaK_patchtohere(fs, condexit);  /* false conditions finish the loop */
++}
++
++
++static void repeatstat (LexState *ls, int line) {
++  /* repeatstat -> REPEAT block UNTIL cond */
++  int condexit;
++  FuncState *fs = ls->fs;
++  int repeat_init = luaK_getlabel(fs);
++  BlockCnt bl1, bl2;
++  enterblock(fs, &bl1, 1);  /* loop block */
++  enterblock(fs, &bl2, 0);  /* scope block */
++  luaX_next(ls);  /* skip REPEAT */
++  chunk(ls);
++  check_match(ls, TK_UNTIL, TK_REPEAT, line);
++  condexit = cond(ls);  /* read condition (inside scope block) */
++  if (!bl2.upval) {  /* no upvalues? */
++    leaveblock(fs);  /* finish scope */
++    luaK_patchlist(ls->fs, condexit, repeat_init);  /* close the loop */
++  }
++  else {  /* complete semantics when there are upvalues */
++    breakstat(ls);  /* if condition then break */
++    luaK_patchtohere(ls->fs, condexit);  /* else... */
++    leaveblock(fs);  /* finish scope... */
++    luaK_patchlist(ls->fs, luaK_jump(fs), repeat_init);  /* and repeat */
++  }
++  leaveblock(fs);  /* finish loop */
++}
++
++
++static int exp1 (LexState *ls) {
++  expdesc e;
++  int k;
++  expr(ls, &e);
++  k = e.k;
++  luaK_exp2nextreg(ls->fs, &e);
++  return k;
++}
++
++
++static void forbody (LexState *ls, int base, int line, int nvars, int isnum) {
++  /* forbody -> DO block */
++  BlockCnt bl;
++  FuncState *fs = ls->fs;
++  int prep, endfor;
++  adjustlocalvars(ls, 3);  /* control variables */
++  checknext(ls, TK_DO);
++  prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs);
++  enterblock(fs, &bl, 0);  /* scope for declared variables */
++  adjustlocalvars(ls, nvars);
++  luaK_reserveregs(fs, nvars);
++  block(ls);
++  leaveblock(fs);  /* end of scope for declared variables */
++  luaK_patchtohere(fs, prep);
++  endfor = (isnum) ? luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP) :
++                     luaK_codeABC(fs, OP_TFORLOOP, base, 0, nvars);
++  luaK_fixline(fs, line);  /* pretend that `OP_FOR' starts the loop */
++  luaK_patchlist(fs, (isnum ? endfor : luaK_jump(fs)), prep + 1);
++}
++
++
++static void fornum (LexState *ls, TString *varname, int line) {
++  /* fornum -> NAME = exp1,exp1[,exp1] forbody */
++  FuncState *fs = ls->fs;
++  int base = fs->freereg;
++  new_localvarliteral(ls, "(for index)", 0);
++  new_localvarliteral(ls, "(for limit)", 1);
++  new_localvarliteral(ls, "(for step)", 2);
++  new_localvar(ls, varname, 3);
++  checknext(ls, '=');
++  exp1(ls);  /* initial value */
++  checknext(ls, ',');
++  exp1(ls);  /* limit */
++  if (testnext(ls, ','))
++    exp1(ls);  /* optional step */
++  else {  /* default step = 1 */
++    luaK_codeABx(fs, OP_LOADK, fs->freereg, luaK_numberK(fs, 1));
++    luaK_reserveregs(fs, 1);
++  }
++  forbody(ls, base, line, 1, 1);
++}
++
++
++static void forlist (LexState *ls, TString *indexname) {
++  /* forlist -> NAME {,NAME} IN explist1 forbody */
++  FuncState *fs = ls->fs;
++  expdesc e;
++  int nvars = 0;
++  int line;
++  int base = fs->freereg;
++  /* create control variables */
++  new_localvarliteral(ls, "(for generator)", nvars++);
++  new_localvarliteral(ls, "(for state)", nvars++);
++  new_localvarliteral(ls, "(for control)", nvars++);
++  /* create declared variables */
++  new_localvar(ls, indexname, nvars++);
++  while (testnext(ls, ','))
++    new_localvar(ls, str_checkname(ls), nvars++);
++  checknext(ls, TK_IN);
++  line = ls->linenumber;
++  adjust_assign(ls, 3, explist1(ls, &e), &e);
++  luaK_checkstack(fs, 3);  /* extra space to call generator */
++  forbody(ls, base, line, nvars - 3, 0);
++}
++
++
++static void forstat (LexState *ls, int line) {
++  /* forstat -> FOR (fornum | forlist) END */
++  FuncState *fs = ls->fs;
++  TString *varname;
++  BlockCnt bl;
++  enterblock(fs, &bl, 1);  /* scope for loop and control variables */
++  luaX_next(ls);  /* skip `for' */
++  varname = str_checkname(ls);  /* first variable name */
++  switch (ls->t.token) {
++    case '=': fornum(ls, varname, line); break;
++    case ',': case TK_IN: forlist(ls, varname); break;
++    default: luaX_syntaxerror(ls, LUA_QL("=") " or " LUA_QL("in") " expected");
++  }
++  check_match(ls, TK_END, TK_FOR, line);
++  leaveblock(fs);  /* loop scope (`break' jumps to this point) */
++}
++
++
++static int test_then_block (LexState *ls) {
++  /* test_then_block -> [IF | ELSEIF] cond THEN block */
++  int condexit;
++  luaX_next(ls);  /* skip IF or ELSEIF */
++  condexit = cond(ls);
++  checknext(ls, TK_THEN);
++  block(ls);  /* `then' part */
++  return condexit;
++}
++
++
++static void ifstat (LexState *ls, int line) {
++  /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
++  FuncState *fs = ls->fs;
++  int flist;
++  int escapelist = NO_JUMP;
++  flist = test_then_block(ls);  /* IF cond THEN block */
++  while (ls->t.token == TK_ELSEIF) {
++    luaK_concat(fs, &escapelist, luaK_jump(fs));
++    luaK_patchtohere(fs, flist);
++    flist = test_then_block(ls);  /* ELSEIF cond THEN block */
++  }
++  if (ls->t.token == TK_ELSE) {
++    luaK_concat(fs, &escapelist, luaK_jump(fs));
++    luaK_patchtohere(fs, flist);
++    luaX_next(ls);  /* skip ELSE (after patch, for correct line info) */
++    block(ls);  /* `else' part */
++  }
++  else
++    luaK_concat(fs, &escapelist, flist);
++  luaK_patchtohere(fs, escapelist);
++  check_match(ls, TK_END, TK_IF, line);
++}
++
++
++static void localfunc (LexState *ls) {
++  expdesc v, b;
++  FuncState *fs = ls->fs;
++  new_localvar(ls, str_checkname(ls), 0);
++  init_exp(&v, VLOCAL, fs->freereg);
++  luaK_reserveregs(fs, 1);
++  adjustlocalvars(ls, 1);
++  body(ls, &b, 0, ls->linenumber);
++  luaK_storevar(fs, &v, &b);
++  /* debug information will only see the variable after this point! */
++  getlocvar(fs, fs->nactvar - 1).startpc = fs->pc;
++}
++
++
++static void localstat (LexState *ls) {
++  /* stat -> LOCAL NAME {`,' NAME} [`=' explist1] */
++  int nvars = 0;
++  int nexps;
++  expdesc e;
++  do {
++    new_localvar(ls, str_checkname(ls), nvars++);
++  } while (testnext(ls, ','));
++  if (testnext(ls, '='))
++    nexps = explist1(ls, &e);
++  else {
++    e.k = VVOID;
++    nexps = 0;
++  }
++  adjust_assign(ls, nvars, nexps, &e);
++  adjustlocalvars(ls, nvars);
++}
++
++
++static int funcname (LexState *ls, expdesc *v) {
++  /* funcname -> NAME {field} [`:' NAME] */
++  int needself = 0;
++  singlevar(ls, v);
++  while (ls->t.token == '.')
++    field(ls, v);
++  if (ls->t.token == ':') {
++    needself = 1;
++    field(ls, v);
++  }
++  return needself;
++}
++
++
++static void funcstat (LexState *ls, int line) {
++  /* funcstat -> FUNCTION funcname body */
++  int needself;
++  expdesc v, b;
++  luaX_next(ls);  /* skip FUNCTION */
++  needself = funcname(ls, &v);
++  body(ls, &b, needself, line);
++  luaK_storevar(ls->fs, &v, &b);
++  luaK_fixline(ls->fs, line);  /* definition `happens' in the first line */
++}
++
++
++static void exprstat (LexState *ls) {
++  /* stat -> func | assignment */
++  FuncState *fs = ls->fs;
++  struct LHS_assign v;
++  primaryexp(ls, &v.v);
++  if (v.v.k == VCALL)  /* stat -> func */
++    SETARG_C(getcode(fs, &v.v), 1);  /* call statement uses no results */
++  else {  /* stat -> assignment */
++    v.prev = NULL;
++    assignment(ls, &v, 1);
++  }
++}
++
++
++static void retstat (LexState *ls) {
++  /* stat -> RETURN explist */
++  FuncState *fs = ls->fs;
++  expdesc e;
++  int first, nret;  /* registers with returned values */
++  luaX_next(ls);  /* skip RETURN */
++  if (block_follow(ls->t.token) || ls->t.token == ';')
++    first = nret = 0;  /* return no values */
++  else {
++    nret = explist1(ls, &e);  /* optional return values */
++    if (hasmultret(e.k)) {
++      luaK_setmultret(fs, &e);
++      if (e.k == VCALL && nret == 1) {  /* tail call? */
++        SET_OPCODE(getcode(fs,&e), OP_TAILCALL);
++        lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar);
++      }
++      first = fs->nactvar;
++      nret = LUA_MULTRET;  /* return all values */
++    }
++    else {
++      if (nret == 1)  /* only one single value? */
++        first = luaK_exp2anyreg(fs, &e);
++      else {
++        luaK_exp2nextreg(fs, &e);  /* values must go to the `stack' */
++        first = fs->nactvar;  /* return all `active' values */
++        lua_assert(nret == fs->freereg - first);
++      }
++    }
++  }
++  luaK_ret(fs, first, nret);
++}
++
++
++static int statement (LexState *ls) {
++  int line = ls->linenumber;  /* may be needed for error messages */
++  switch (ls->t.token) {
++    case TK_IF: {  /* stat -> ifstat */
++      ifstat(ls, line);
++      return 0;
++    }
++    case TK_WHILE: {  /* stat -> whilestat */
++      whilestat(ls, line);
++      return 0;
++    }
++    case TK_DO: {  /* stat -> DO block END */
++      luaX_next(ls);  /* skip DO */
++      block(ls);
++      check_match(ls, TK_END, TK_DO, line);
++      return 0;
++    }
++    case TK_FOR: {  /* stat -> forstat */
++      forstat(ls, line);
++      return 0;
++    }
++    case TK_REPEAT: {  /* stat -> repeatstat */
++      repeatstat(ls, line);
++      return 0;
++    }
++    case TK_FUNCTION: {
++      funcstat(ls, line);  /* stat -> funcstat */
++      return 0;
++    }
++    case TK_LOCAL: {  /* stat -> localstat */
++      luaX_next(ls);  /* skip LOCAL */
++      if (testnext(ls, TK_FUNCTION))  /* local function? */
++        localfunc(ls);
++      else
++        localstat(ls);
++      return 0;
++    }
++    case TK_RETURN: {  /* stat -> retstat */
++      retstat(ls);
++      return 1;  /* must be last statement */
++    }
++    case TK_BREAK: {  /* stat -> breakstat */
++      luaX_next(ls);  /* skip BREAK */
++      breakstat(ls);
++      return 1;  /* must be last statement */
++    }
++    default: {
++      exprstat(ls);
++      return 0;  /* to avoid warnings */
++    }
++  }
++}
++
++
++static void chunk (LexState *ls) {
++  /* chunk -> { stat [`;'] } */
++  int islast = 0;
++  enterlevel(ls);
++  while (!islast && !block_follow(ls->t.token)) {
++    islast = statement(ls);
++    testnext(ls, ';');
++    lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
++               ls->fs->freereg >= ls->fs->nactvar);
++    ls->fs->freereg = ls->fs->nactvar;  /* free registers */
++  }
++  leavelevel(ls);
++}
++
++/* }====================================================================== */
+--- /dev/null
++++ b/extensions/LUA/lua/lparser.h
+@@ -0,0 +1,82 @@
++/*
++** $Id: lparser.h,v 1.57.1.1 2007/12/27 13:02:25 roberto Exp $
++** Lua Parser
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lparser_h
++#define lparser_h
++
++#include "llimits.h"
++#include "lobject.h"
++#include "lzio.h"
++
++
++/*
++** Expression descriptor
++*/
++
++typedef enum {
++  VVOID,	/* no value */
++  VNIL,
++  VTRUE,
++  VFALSE,
++  VK,		/* info = index of constant in `k' */
++  VKNUM,	/* nval = numerical value */
++  VLOCAL,	/* info = local register */
++  VUPVAL,       /* info = index of upvalue in `upvalues' */
++  VGLOBAL,	/* info = index of table; aux = index of global name in `k' */
++  VINDEXED,	/* info = table register; aux = index register (or `k') */
++  VJMP,		/* info = instruction pc */
++  VRELOCABLE,	/* info = instruction pc */
++  VNONRELOC,	/* info = result register */
++  VCALL,	/* info = instruction pc */
++  VVARARG	/* info = instruction pc */
++} expkind;
++
++typedef struct expdesc {
++  expkind k;
++  union {
++    struct { int info, aux; } s;
++    lua_Number nval;
++  } u;
++  int t;  /* patch list of `exit when true' */
++  int f;  /* patch list of `exit when false' */
++} expdesc;
++
++
++typedef struct upvaldesc {
++  lu_byte k;
++  lu_byte info;
++} upvaldesc;
++
++
++struct BlockCnt;  /* defined in lparser.c */
++
++
++/* state needed to generate code for a given function */
++typedef struct FuncState {
++  Proto *f;  /* current function header */
++  Table *h;  /* table to find (and reuse) elements in `k' */
++  struct FuncState *prev;  /* enclosing function */
++  struct LexState *ls;  /* lexical state */
++  struct lua_State *L;  /* copy of the Lua state */
++  struct BlockCnt *bl;  /* chain of current blocks */
++  int pc;  /* next position to code (equivalent to `ncode') */
++  int lasttarget;   /* `pc' of last `jump target' */
++  int jpc;  /* list of pending jumps to `pc' */
++  int freereg;  /* first free register */
++  int nk;  /* number of elements in `k' */
++  int np;  /* number of elements in `p' */
++  short nlocvars;  /* number of elements in `locvars' */
++  lu_byte nactvar;  /* number of active local variables */
++  upvaldesc upvalues[LUAI_MAXUPVALUES];  /* upvalues */
++  unsigned short actvar[LUAI_MAXVARS];  /* declared-variable stack */
++} FuncState;
++
++
++LUAI_FUNC Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
++                                            const char *name);
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lstate.c
+@@ -0,0 +1,214 @@
++/*
++** $Id: lstate.c,v 2.36.1.2 2008/01/03 15:20:39 roberto Exp $
++** Global State
++** See Copyright Notice in lua.h
++*/
++
++
++#include <stddef.h>
++
++#define lstate_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "lgc.h"
++#include "llex.h"
++#include "lmem.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "ltm.h"
++
++
++#define state_size(x)	(sizeof(x) + LUAI_EXTRASPACE)
++#define fromstate(l)	(cast(lu_byte *, (l)) - LUAI_EXTRASPACE)
++#define tostate(l)   (cast(lua_State *, cast(lu_byte *, l) + LUAI_EXTRASPACE))
++
++
++/*
++** Main thread combines a thread state and the global state
++*/
++typedef struct LG {
++  lua_State l;
++  global_State g;
++} LG;
++  
++
++
++static void stack_init (lua_State *L1, lua_State *L) {
++  /* initialize CallInfo array */
++  L1->base_ci = luaM_newvector(L, BASIC_CI_SIZE, CallInfo);
++  L1->ci = L1->base_ci;
++  L1->size_ci = BASIC_CI_SIZE;
++  L1->end_ci = L1->base_ci + L1->size_ci - 1;
++  /* initialize stack array */
++  L1->stack = luaM_newvector(L, BASIC_STACK_SIZE + EXTRA_STACK, TValue);
++  L1->stacksize = BASIC_STACK_SIZE + EXTRA_STACK;
++  L1->top = L1->stack;
++  L1->stack_last = L1->stack+(L1->stacksize - EXTRA_STACK)-1;
++  /* initialize first ci */
++  L1->ci->func = L1->top;
++  setnilvalue(L1->top++);  /* `function' entry for this `ci' */
++  L1->base = L1->ci->base = L1->top;
++  L1->ci->top = L1->top + LUA_MINSTACK;
++}
++
++
++static void freestack (lua_State *L, lua_State *L1) {
++  luaM_freearray(L, L1->base_ci, L1->size_ci, CallInfo);
++  luaM_freearray(L, L1->stack, L1->stacksize, TValue);
++}
++
++
++/*
++** open parts that may cause memory-allocation errors
++*/
++static void f_luaopen (lua_State *L, void *ud) {
++  global_State *g = G(L);
++  UNUSED(ud);
++  stack_init(L, L);  /* init stack */
++  sethvalue(L, gt(L), luaH_new(L, 0, 2));  /* table of globals */
++  sethvalue(L, registry(L), luaH_new(L, 0, 2));  /* registry */
++  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
++  luaT_init(L);
++  luaX_init(L);
++  luaS_fix(luaS_newliteral(L, MEMERRMSG));
++  g->GCthreshold = 4*g->totalbytes;
++}
++
++
++static void preinit_state (lua_State *L, global_State *g) {
++  G(L) = g;
++  L->stack = NULL;
++  L->stacksize = 0;
++  L->errorJmp = NULL;
++  L->hook = NULL;
++  L->hookmask = 0;
++  L->basehookcount = 0;
++  L->allowhook = 1;
++  resethookcount(L);
++  L->openupval = NULL;
++  L->size_ci = 0;
++  L->nCcalls = L->baseCcalls = 0;
++  L->status = 0;
++  L->base_ci = L->ci = NULL;
++  L->savedpc = NULL;
++  L->errfunc = 0;
++  setnilvalue(gt(L));
++}
++
++
++static void close_state (lua_State *L) {
++  global_State *g = G(L);
++  luaF_close(L, L->stack);  /* close all upvalues for this thread */
++  luaC_freeall(L);  /* collect all objects */
++  lua_assert(g->rootgc == obj2gco(L));
++  lua_assert(g->strt.nuse == 0);
++  luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size, TString *);
++  luaZ_freebuffer(L, &g->buff);
++  freestack(L, L);
++  lua_assert(g->totalbytes == sizeof(LG));
++  (*g->frealloc)(g->ud, fromstate(L), state_size(LG), 0);
++}
++
++
++lua_State *luaE_newthread (lua_State *L) {
++  lua_State *L1 = tostate(luaM_malloc(L, state_size(lua_State)));
++  luaC_link(L, obj2gco(L1), LUA_TTHREAD);
++  preinit_state(L1, G(L));
++  stack_init(L1, L);  /* init stack */
++  setobj2n(L, gt(L1), gt(L));  /* share table of globals */
++  L1->hookmask = L->hookmask;
++  L1->basehookcount = L->basehookcount;
++  L1->hook = L->hook;
++  resethookcount(L1);
++  lua_assert(iswhite(obj2gco(L1)));
++  return L1;
++}
++
++
++void luaE_freethread (lua_State *L, lua_State *L1) {
++  luaF_close(L1, L1->stack);  /* close all upvalues for this thread */
++  lua_assert(L1->openupval == NULL);
++  luai_userstatefree(L1);
++  freestack(L, L1);
++  luaM_freemem(L, fromstate(L1), state_size(lua_State));
++}
++
++
++LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
++  int i;
++  lua_State *L;
++  global_State *g;
++  void *l = (*f)(ud, NULL, 0, state_size(LG));
++  if (l == NULL) return NULL;
++  L = tostate(l);
++  g = &((LG *)L)->g;
++  L->next = NULL;
++  L->tt = LUA_TTHREAD;
++  g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT);
++  L->marked = luaC_white(g);
++  set2bits(L->marked, FIXEDBIT, SFIXEDBIT);
++  preinit_state(L, g);
++  g->frealloc = f;
++  g->ud = ud;
++  g->mainthread = L;
++  g->uvhead.u.l.prev = &g->uvhead;
++  g->uvhead.u.l.next = &g->uvhead;
++  g->GCthreshold = 0;  /* mark it as unfinished state */
++  g->strt.size = 0;
++  g->strt.nuse = 0;
++  g->strt.hash = NULL;
++  setnilvalue(registry(L));
++  luaZ_initbuffer(L, &g->buff);
++  g->panic = NULL;
++  g->gcstate = GCSpause;
++  g->rootgc = obj2gco(L);
++  g->sweepstrgc = 0;
++  g->sweepgc = &g->rootgc;
++  g->gray = NULL;
++  g->grayagain = NULL;
++  g->weak = NULL;
++  g->tmudata = NULL;
++  g->totalbytes = sizeof(LG);
++  g->gcpause = LUAI_GCPAUSE;
++  g->gcstepmul = LUAI_GCMUL;
++  g->gcdept = 0;
++  for (i=0; i<NUM_TAGS; i++) g->mt[i] = NULL;
++  if (luaD_rawrunprotected(L, f_luaopen, NULL) != 0) {
++    /* memory allocation error: free partial state */
++    close_state(L);
++    L = NULL;
++  }
++  else
++    luai_userstateopen(L);
++  return L;
++}
++
++
++static void callallgcTM (lua_State *L, void *ud) {
++  UNUSED(ud);
++  luaC_callGCTM(L);  /* call GC metamethods for all udata */
++}
++
++
++LUA_API void lua_close (lua_State *L) {
++  L = G(L)->mainthread;  /* only the main thread can be closed */
++  lua_lock(L);
++  luaF_close(L, L->stack);  /* close all upvalues for this thread */
++  luaC_separateudata(L, 1);  /* separate udata that have GC metamethods */
++  L->errfunc = 0;  /* no error function during GC metamethods */
++  do {  /* repeat until no more errors */
++    L->ci = L->base_ci;
++    L->base = L->top = L->ci->base;
++    L->nCcalls = L->baseCcalls = 0;
++  } while (luaD_rawrunprotected(L, callallgcTM, NULL) != 0);
++  lua_assert(G(L)->tmudata == NULL);
++  luai_userstateclose(L);
++  close_state(L);
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lstate.h
+@@ -0,0 +1,169 @@
++/*
++** $Id: lstate.h,v 2.24.1.2 2008/01/03 15:20:39 roberto Exp $
++** Global State
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lstate_h
++#define lstate_h
++
++#include "lua.h"
++
++#include "lobject.h"
++#include "ltm.h"
++#include "lzio.h"
++
++
++
++struct lua_longjmp;  /* defined in ldo.c */
++
++
++/* table of globals */
++#define gt(L)	(&L->l_gt)
++
++/* registry */
++#define registry(L)	(&G(L)->l_registry)
++
++
++/* extra stack space to handle TM calls and some other extras */
++#define EXTRA_STACK   5
++
++
++#define BASIC_CI_SIZE           8
++
++#define BASIC_STACK_SIZE        (2*LUA_MINSTACK)
++
++
++
++typedef struct stringtable {
++  GCObject **hash;
++  lu_int32 nuse;  /* number of elements */
++  int size;
++} stringtable;
++
++
++/*
++** informations about a call
++*/
++typedef struct CallInfo {
++  StkId base;  /* base for this function */
++  StkId func;  /* function index in the stack */
++  StkId	top;  /* top for this function */
++  const Instruction *savedpc;
++  int nresults;  /* expected number of results from this function */
++  int tailcalls;  /* number of tail calls lost under this entry */
++} CallInfo;
++
++
++
++#define curr_func(L)	(clvalue(L->ci->func))
++#define ci_func(ci)	(clvalue((ci)->func))
++#define f_isLua(ci)	(!ci_func(ci)->c.isC)
++#define isLua(ci)	(ttisfunction((ci)->func) && f_isLua(ci))
++
++
++/*
++** `global state', shared by all threads of this state
++*/
++typedef struct global_State {
++  stringtable strt;  /* hash table for strings */
++  lua_Alloc frealloc;  /* function to reallocate memory */
++  void *ud;         /* auxiliary data to `frealloc' */
++  lu_byte currentwhite;
++  lu_byte gcstate;  /* state of garbage collector */
++  int sweepstrgc;  /* position of sweep in `strt' */
++  GCObject *rootgc;  /* list of all collectable objects */
++  GCObject **sweepgc;  /* position of sweep in `rootgc' */
++  GCObject *gray;  /* list of gray objects */
++  GCObject *grayagain;  /* list of objects to be traversed atomically */
++  GCObject *weak;  /* list of weak tables (to be cleared) */
++  GCObject *tmudata;  /* last element of list of userdata to be GC */
++  Mbuffer buff;  /* temporary buffer for string concatentation */
++  lu_mem GCthreshold;
++  lu_mem totalbytes;  /* number of bytes currently allocated */
++  lu_mem estimate;  /* an estimate of number of bytes actually in use */
++  lu_mem gcdept;  /* how much GC is `behind schedule' */
++  int gcpause;  /* size of pause between successive GCs */
++  int gcstepmul;  /* GC `granularity' */
++  lua_CFunction panic;  /* to be called in unprotected errors */
++  TValue l_registry;
++  struct lua_State *mainthread;
++  UpVal uvhead;  /* head of double-linked list of all open upvalues */
++  struct Table *mt[NUM_TAGS];  /* metatables for basic types */
++  TString *tmname[TM_N];  /* array with tag-method names */
++} global_State;
++
++
++/*
++** `per thread' state
++*/
++struct lua_State {
++  CommonHeader;
++  lu_byte status;
++  StkId top;  /* first free slot in the stack */
++  StkId base;  /* base of current function */
++  global_State *l_G;
++  CallInfo *ci;  /* call info for current function */
++  const Instruction *savedpc;  /* `savedpc' of current function */
++  StkId stack_last;  /* last free slot in the stack */
++  StkId stack;  /* stack base */
++  CallInfo *end_ci;  /* points after end of ci array*/
++  CallInfo *base_ci;  /* array of CallInfo's */
++  int stacksize;
++  int size_ci;  /* size of array `base_ci' */
++  unsigned short nCcalls;  /* number of nested C calls */
++  unsigned short baseCcalls;  /* nested C calls when resuming coroutine */
++  lu_byte hookmask;
++  lu_byte allowhook;
++  int basehookcount;
++  int hookcount;
++  lua_Hook hook;
++  TValue l_gt;  /* table of globals */
++  TValue env;  /* temporary place for environments */
++  GCObject *openupval;  /* list of open upvalues in this stack */
++  GCObject *gclist;
++  struct lua_longjmp *errorJmp;  /* current error recover point */
++  ptrdiff_t errfunc;  /* current error handling function (stack index) */
++};
++
++
++#define G(L)	(L->l_G)
++
++
++/*
++** Union of all collectable objects
++*/
++union GCObject {
++  GCheader gch;
++  union TString ts;
++  union Udata u;
++  union Closure cl;
++  struct Table h;
++  struct Proto p;
++  struct UpVal uv;
++  struct lua_State th;  /* thread */
++};
++
++
++/* macros to convert a GCObject into a specific value */
++#define rawgco2ts(o)	check_exp((o)->gch.tt == LUA_TSTRING, &((o)->ts))
++#define gco2ts(o)	(&rawgco2ts(o)->tsv)
++#define rawgco2u(o)	check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u))
++#define gco2u(o)	(&rawgco2u(o)->uv)
++#define gco2cl(o)	check_exp((o)->gch.tt == LUA_TFUNCTION, &((o)->cl))
++#define gco2h(o)	check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h))
++#define gco2p(o)	check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p))
++#define gco2uv(o)	check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv))
++#define ngcotouv(o) \
++	check_exp((o) == NULL || (o)->gch.tt == LUA_TUPVAL, &((o)->uv))
++#define gco2th(o)	check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th))
++
++/* macro to convert any Lua object into a GCObject */
++#define obj2gco(v)	(cast(GCObject *, (v)))
++
++
++LUAI_FUNC lua_State *luaE_newthread (lua_State *L);
++LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
++
++#endif
++
+--- /dev/null
++++ b/extensions/LUA/lua/lstring.c
+@@ -0,0 +1,110 @@
++/*
++** $Id: lstring.c,v 2.8.1.1 2007/12/27 13:02:25 roberto Exp $
++** String table (keeps all strings handled by Lua)
++** See Copyright Notice in lua.h
++*/
++
++#include <string.h>
++
++#define lstring_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lmem.h"
++#include "lobject.h"
++#include "lstate.h"
++#include "lstring.h"
++
++
++
++void luaS_resize (lua_State *L, int newsize) {
++  GCObject **newhash;
++  stringtable *tb;
++  int i;
++  if (G(L)->gcstate == GCSsweepstring)
++    return;  /* cannot resize during GC traverse */
++  newhash = luaM_newvector(L, newsize, GCObject *);
++  tb = &G(L)->strt;
++  for (i=0; i<newsize; i++) newhash[i] = NULL;
++  /* rehash */
++  for (i=0; i<tb->size; i++) {
++    GCObject *p = tb->hash[i];
++    while (p) {  /* for each node in the list */
++      GCObject *next = p->gch.next;  /* save next */
++      unsigned int h = gco2ts(p)->hash;
++      int h1 = lmod(h, newsize);  /* new position */
++      lua_assert(cast_int(h%newsize) == lmod(h, newsize));
++      p->gch.next = newhash[h1];  /* chain it */
++      newhash[h1] = p;
++      p = next;
++    }
++  }
++  luaM_freearray(L, tb->hash, tb->size, TString *);
++  tb->size = newsize;
++  tb->hash = newhash;
++}
++
++
++static TString *newlstr (lua_State *L, const char *str, size_t l,
++                                       unsigned int h) {
++  TString *ts;
++  stringtable *tb;
++  if (l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
++    luaM_toobig(L);
++  ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
++  ts->tsv.len = l;
++  ts->tsv.hash = h;
++  ts->tsv.marked = luaC_white(G(L));
++  ts->tsv.tt = LUA_TSTRING;
++  ts->tsv.reserved = 0;
++  memcpy(ts+1, str, l*sizeof(char));
++  ((char *)(ts+1))[l] = '\0';  /* ending 0 */
++  tb = &G(L)->strt;
++  h = lmod(h, tb->size);
++  ts->tsv.next = tb->hash[h];  /* chain new entry */
++  tb->hash[h] = obj2gco(ts);
++  tb->nuse++;
++  if (tb->nuse > cast(lu_int32, tb->size) && tb->size <= MAX_INT/2)
++    luaS_resize(L, tb->size*2);  /* too crowded */
++  return ts;
++}
++
++
++TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
++  GCObject *o;
++  unsigned int h = cast(unsigned int, l);  /* seed */
++  size_t step = (l>>5)+1;  /* if string is too long, don't hash all its chars */
++  size_t l1;
++  for (l1=l; l1>=step; l1-=step)  /* compute hash */
++    h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
++  for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
++       o != NULL;
++       o = o->gch.next) {
++    TString *ts = rawgco2ts(o);
++    if (ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0)) {
++      /* string may be dead */
++      if (isdead(G(L), o)) changewhite(o);
++      return ts;
++    }
++  }
++  return newlstr(L, str, l, h);  /* not found */
++}
++
++
++Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
++  Udata *u;
++  if (s > MAX_SIZET - sizeof(Udata))
++    luaM_toobig(L);
++  u = cast(Udata *, luaM_malloc(L, s + sizeof(Udata)));
++  u->uv.marked = luaC_white(G(L));  /* is not finalized */
++  u->uv.tt = LUA_TUSERDATA;
++  u->uv.len = s;
++  u->uv.metatable = NULL;
++  u->uv.env = e;
++  /* chain it on udata list (after main thread) */
++  u->uv.next = G(L)->mainthread->next;
++  G(L)->mainthread->next = obj2gco(u);
++  return u;
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lstring.h
+@@ -0,0 +1,31 @@
++/*
++** $Id: lstring.h,v 1.43.1.1 2007/12/27 13:02:25 roberto Exp $
++** String table (keep all strings handled by Lua)
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lstring_h
++#define lstring_h
++
++
++#include "lgc.h"
++#include "lobject.h"
++#include "lstate.h"
++
++
++#define sizestring(s)	(sizeof(union TString)+((s)->len+1)*sizeof(char))
++
++#define sizeudata(u)	(sizeof(union Udata)+(u)->len)
++
++#define luaS_new(L, s)	(luaS_newlstr(L, s, strlen(s)))
++#define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
++                                 (sizeof(s)/sizeof(char))-1))
++
++#define luaS_fix(s)	l_setbit((s)->tsv.marked, FIXEDBIT)
++
++LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
++LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
++LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lstrlib.c
+@@ -0,0 +1,883 @@
++/*
++** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
++** Standard library for string operations and pattern-matching
++** See Copyright Notice in lua.h
++*/
++
++
++#include <ctype.h>
++#include <stddef.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define lstrlib_c
++#define LUA_LIB
++
++#include "lua.h"
++
++#include "lauxlib.h"
++#include "lualib.h"
++
++
++/* macro to `unsign' a character */
++#define uchar(c)        ((unsigned char)(c))
++
++
++
++static int str_len (lua_State *L) {
++  size_t l;
++  luaL_checklstring(L, 1, &l);
++  lua_pushinteger(L, l);
++  return 1;
++}
++
++
++static ptrdiff_t posrelat (ptrdiff_t pos, size_t len) {
++  /* relative string position: negative means back from end */
++  if (pos < 0) pos += (ptrdiff_t)len + 1;
++  return (pos >= 0) ? pos : 0;
++}
++
++
++static int str_sub (lua_State *L) {
++  size_t l;
++  const char *s = luaL_checklstring(L, 1, &l);
++  ptrdiff_t start = posrelat(luaL_checkinteger(L, 2), l);
++  ptrdiff_t end = posrelat(luaL_optinteger(L, 3, -1), l);
++  if (start < 1) start = 1;
++  if (end > (ptrdiff_t)l) end = (ptrdiff_t)l;
++  if (start <= end)
++    lua_pushlstring(L, s+start-1, end-start+1);
++  else lua_pushliteral(L, "");
++  return 1;
++}
++
++
++static int str_reverse (lua_State *L) {
++  size_t l;
++  const char *s = luaL_checklstring(L, 1, &l);
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_reverse: cannot allocate memory");
++  luaL_buffinit(L, b);
++  while (l--) luaL_addchar(b, s[l]);
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++
++static int str_lower (lua_State *L) {
++  size_t l;
++  size_t i;
++  const char *s = luaL_checklstring(L, 1, &l);
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_lower: cannot allocate memory");
++  luaL_buffinit(L, b);
++  for (i=0; i<l; i++)
++    luaL_addchar(b, tolower(uchar(s[i])));
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++
++static int str_upper (lua_State *L) {
++  size_t l;
++  size_t i;
++  const char *s = luaL_checklstring(L, 1, &l);
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_upper: cannot allocate memory");
++  luaL_buffinit(L, b);
++  for (i=0; i<l; i++)
++    luaL_addchar(b, toupper(uchar(s[i])));
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++static int str_rep (lua_State *L) {
++  size_t l;
++  const char *s = luaL_checklstring(L, 1, &l);
++  int n = luaL_checkint(L, 2);
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_rep: cannot allocate memory");
++  luaL_buffinit(L, b);
++  while (n-- > 0)
++    luaL_addlstring(b, s, l);
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++
++static int str_byte (lua_State *L) {
++  size_t l;
++  const char *s = luaL_checklstring(L, 1, &l);
++  ptrdiff_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
++  ptrdiff_t pose = posrelat(luaL_optinteger(L, 3, posi), l);
++  int n, i;
++  if (posi <= 0) posi = 1;
++  if ((size_t)pose > l) pose = l;
++  if (posi > pose) return 0;  /* empty interval; return no values */
++  n = (int)(pose -  posi + 1);
++  if (posi + n <= pose)  /* overflow? */
++    luaL_error(L, "string slice too long");
++  luaL_checkstack(L, n, "string slice too long");
++  for (i=0; i<n; i++)
++    lua_pushinteger(L, uchar(s[posi+i-1]));
++  return n;
++}
++
++
++static int str_char (lua_State *L) {
++  int n = lua_gettop(L);  /* number of arguments */
++  int i;
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_char: cannot allocate memory");
++  luaL_buffinit(L, b);
++  for (i=1; i<=n; i++) {
++    int c = luaL_checkint(L, i);
++    luaL_argcheck(L, uchar(c) == c, i, "invalid value");
++    luaL_addchar(b, uchar(c));
++  }
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++
++static int writer (lua_State *L, const void* b, size_t size, void* B) {
++  (void)L;
++  luaL_addlstring((luaL_Buffer*) B, (const char *)b, size);
++  return 0;
++}
++
++
++static int str_dump (lua_State *L) {
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_dump: cannot allocate memory");
++  luaL_checktype(L, 1, LUA_TFUNCTION);
++  lua_settop(L, 1);
++  luaL_buffinit(L,b);
++  if (lua_dump(L, writer, b) != 0){
++	  kfree(b);
++	  luaL_error(L, "unable to dump given function");
++  }
++
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++
++
++/*
++** {======================================================
++** PATTERN MATCHING
++** =======================================================
++*/
++
++
++#define CAP_UNFINISHED	(-1)
++#define CAP_POSITION	(-2)
++
++typedef struct MatchState {
++  const char *src_init;  /* init of source string */
++  const char *src_end;  /* end (`\0') of source string */
++  lua_State *L;
++  int level;  /* total number of captures (finished or unfinished) */
++  struct {
++    const char *init;
++    ptrdiff_t len;
++  } capture[LUA_MAXCAPTURES];
++} MatchState;
++
++
++#define L_ESC		'%'
++#define SPECIALS	"^$*+?.([%-"
++
++
++static int check_capture (MatchState *ms, int l) {
++  l -= '1';
++  if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
++    return luaL_error(ms->L, "invalid capture index");
++  return l;
++}
++
++
++static int capture_to_close (MatchState *ms) {
++  int level = ms->level;
++  for (level--; level>=0; level--)
++    if (ms->capture[level].len == CAP_UNFINISHED) return level;
++  return luaL_error(ms->L, "invalid pattern capture");
++}
++
++
++static const char *classend (MatchState *ms, const char *p) {
++  switch (*p++) {
++    case L_ESC: {
++      if (*p == '\0')
++        luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")");
++      return p+1;
++    }
++    case '[': {
++      if (*p == '^') p++;
++      do {  /* look for a `]' */
++        if (*p == '\0')
++          luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")");
++        if (*(p++) == L_ESC && *p != '\0')
++          p++;  /* skip escapes (e.g. `%]') */
++      } while (*p != ']');
++      return p+1;
++    }
++    default: {
++      return p;
++    }
++  }
++}
++
++
++static int match_class (int c, int cl) {
++  int res;
++  switch (tolower(cl)) {
++    case 'a' : res = isalpha(c); break;
++    case 'c' : res = iscntrl(c); break;
++    case 'd' : res = isdigit(c); break;
++    case 'l' : res = islower(c); break;
++    case 'p' : res = ispunct(c); break;
++    case 's' : res = isspace(c); break;
++    case 'u' : res = isupper(c); break;
++    case 'w' : res = isalnum(c); break;
++    case 'x' : res = isxdigit(c); break;
++    case 'z' : res = (c == 0); break;
++    default: return (cl == c);
++  }
++  return (islower(cl) ? res : !res);
++}
++
++
++static int matchbracketclass (int c, const char *p, const char *ec) {
++  int sig = 1;
++  if (*(p+1) == '^') {
++    sig = 0;
++    p++;  /* skip the `^' */
++  }
++  while (++p < ec) {
++    if (*p == L_ESC) {
++      p++;
++      if (match_class(c, uchar(*p)))
++        return sig;
++    }
++    else if ((*(p+1) == '-') && (p+2 < ec)) {
++      p+=2;
++      if (uchar(*(p-2)) <= c && c <= uchar(*p))
++        return sig;
++    }
++    else if (uchar(*p) == c) return sig;
++  }
++  return !sig;
++}
++
++
++static int singlematch (int c, const char *p, const char *ep) {
++  switch (*p) {
++    case '.': return 1;  /* matches any char */
++    case L_ESC: return match_class(c, uchar(*(p+1)));
++    case '[': return matchbracketclass(c, p, ep-1);
++    default:  return (uchar(*p) == c);
++  }
++}
++
++
++static const char *match (MatchState *ms, const char *s, const char *p);
++
++
++static const char *matchbalance (MatchState *ms, const char *s,
++                                   const char *p) {
++  if (*p == 0 || *(p+1) == 0)
++    luaL_error(ms->L, "unbalanced pattern");
++  if (*s != *p) return NULL;
++  else {
++    int b = *p;
++    int e = *(p+1);
++    int cont = 1;
++    while (++s < ms->src_end) {
++      if (*s == e) {
++        if (--cont == 0) return s+1;
++      }
++      else if (*s == b) cont++;
++    }
++  }
++  return NULL;  /* string ends out of balance */
++}
++
++
++static const char *max_expand (MatchState *ms, const char *s,
++                                 const char *p, const char *ep) {
++  ptrdiff_t i = 0;  /* counts maximum expand for item */
++  while ((s+i)<ms->src_end && singlematch(uchar(*(s+i)), p, ep))
++    i++;
++  /* keeps trying to match with the maximum repetitions */
++  while (i>=0) {
++    const char *res = match(ms, (s+i), ep+1);
++    if (res) return res;
++    i--;  /* else didn't match; reduce 1 repetition to try again */
++  }
++  return NULL;
++}
++
++
++static const char *min_expand (MatchState *ms, const char *s,
++                                 const char *p, const char *ep) {
++  for (;;) {
++    const char *res = match(ms, s, ep+1);
++    if (res != NULL)
++      return res;
++    else if (s<ms->src_end && singlematch(uchar(*s), p, ep))
++      s++;  /* try with one more repetition */
++    else return NULL;
++  }
++}
++
++
++static const char *start_capture (MatchState *ms, const char *s,
++                                    const char *p, int what) {
++  const char *res;
++  int level = ms->level;
++  if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
++  ms->capture[level].init = s;
++  ms->capture[level].len = what;
++  ms->level = level+1;
++  if ((res=match(ms, s, p)) == NULL)  /* match failed? */
++    ms->level--;  /* undo capture */
++  return res;
++}
++
++
++static const char *end_capture (MatchState *ms, const char *s,
++                                  const char *p) {
++  int l = capture_to_close(ms);
++  const char *res;
++  ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
++  if ((res = match(ms, s, p)) == NULL)  /* match failed? */
++    ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
++  return res;
++}
++
++
++static const char *match_capture (MatchState *ms, const char *s, int l) {
++  size_t len;
++  l = check_capture(ms, l);
++  len = ms->capture[l].len;
++  if ((size_t)(ms->src_end-s) >= len &&
++      memcmp(ms->capture[l].init, s, len) == 0)
++    return s+len;
++  else return NULL;
++}
++
++
++static const char *match (MatchState *ms, const char *s, const char *p) {
++  init: /* using goto's to optimize tail recursion */
++  switch (*p) {
++    case '(': {  /* start capture */
++      if (*(p+1) == ')')  /* position capture? */
++        return start_capture(ms, s, p+2, CAP_POSITION);
++      else
++        return start_capture(ms, s, p+1, CAP_UNFINISHED);
++    }
++    case ')': {  /* end capture */
++      return end_capture(ms, s, p+1);
++    }
++    case L_ESC: {
++      switch (*(p+1)) {
++        case 'b': {  /* balanced string? */
++          s = matchbalance(ms, s, p+2);
++          if (s == NULL) return NULL;
++          p+=4; goto init;  /* else return match(ms, s, p+4); */
++        }
++        case 'f': {  /* frontier? */
++          const char *ep; char previous;
++          p += 2;
++          if (*p != '[')
++            luaL_error(ms->L, "missing " LUA_QL("[") " after "
++                               LUA_QL("%%f") " in pattern");
++          ep = classend(ms, p);  /* points to what is next */
++          previous = (s == ms->src_init) ? '\0' : *(s-1);
++          if (matchbracketclass(uchar(previous), p, ep-1) ||
++             !matchbracketclass(uchar(*s), p, ep-1)) return NULL;
++          p=ep; goto init;  /* else return match(ms, s, ep); */
++        }
++        default: {
++          if (isdigit(uchar(*(p+1)))) {  /* capture results (%0-%9)? */
++            s = match_capture(ms, s, uchar(*(p+1)));
++            if (s == NULL) return NULL;
++            p+=2; goto init;  /* else return match(ms, s, p+2) */
++          }
++          goto dflt;  /* case default */
++        }
++      }
++    }
++    case '\0': {  /* end of pattern */
++      return s;  /* match succeeded */
++    }
++    case '$': {
++      if (*(p+1) == '\0')  /* is the `$' the last char in pattern? */
++        return (s == ms->src_end) ? s : NULL;  /* check end of string */
++      else goto dflt;
++    }
++    default: dflt: {  /* it is a pattern item */
++      const char *ep = classend(ms, p);  /* points to what is next */
++      int m = s<ms->src_end && singlematch(uchar(*s), p, ep);
++      switch (*ep) {
++        case '?': {  /* optional */
++          const char *res;
++          if (m && ((res=match(ms, s+1, ep+1)) != NULL))
++            return res;
++          p=ep+1; goto init;  /* else return match(ms, s, ep+1); */
++        }
++        case '*': {  /* 0 or more repetitions */
++          return max_expand(ms, s, p, ep);
++        }
++        case '+': {  /* 1 or more repetitions */
++          return (m ? max_expand(ms, s+1, p, ep) : NULL);
++        }
++        case '-': {  /* 0 or more repetitions (minimum) */
++          return min_expand(ms, s, p, ep);
++        }
++        default: {
++          if (!m) return NULL;
++          s++; p=ep; goto init;  /* else return match(ms, s+1, ep); */
++        }
++      }
++    }
++  }
++}
++
++
++
++static const char *lmemfind (const char *s1, size_t l1,
++                               const char *s2, size_t l2) {
++  if (l2 == 0) return s1;  /* empty strings are everywhere */
++  else if (l2 > l1) return NULL;  /* avoids a negative `l1' */
++  else {
++    const char *init;  /* to search for a `*s2' inside `s1' */
++    l2--;  /* 1st char will be checked by `memchr' */
++    l1 = l1-l2;  /* `s2' cannot be found after that */
++    while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
++      init++;   /* 1st char is already checked */
++      if (memcmp(init, s2+1, l2) == 0)
++        return init-1;
++      else {  /* correct `l1' and `s1' to try again */
++        l1 -= init-s1;
++        s1 = init;
++      }
++    }
++    return NULL;  /* not found */
++  }
++}
++
++
++static void push_onecapture (MatchState *ms, int i, const char *s,
++                                                    const char *e) {
++  if (i >= ms->level) {
++    if (i == 0)  /* ms->level == 0, too */
++      lua_pushlstring(ms->L, s, e - s);  /* add whole match */
++    else
++      luaL_error(ms->L, "invalid capture index");
++  }
++  else {
++    ptrdiff_t l = ms->capture[i].len;
++    if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
++    if (l == CAP_POSITION)
++      lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1);
++    else
++      lua_pushlstring(ms->L, ms->capture[i].init, l);
++  }
++}
++
++
++static int push_captures (MatchState *ms, const char *s, const char *e) {
++  int i;
++  int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
++  luaL_checkstack(ms->L, nlevels, "too many captures");
++  for (i = 0; i < nlevels; i++)
++    push_onecapture(ms, i, s, e);
++  return nlevels;  /* number of strings pushed */
++}
++
++
++static int str_find_aux (lua_State *L, int find) {
++  size_t l1, l2;
++  const char *s = luaL_checklstring(L, 1, &l1);
++  const char *p = luaL_checklstring(L, 2, &l2);
++  ptrdiff_t init = posrelat(luaL_optinteger(L, 3, 1), l1) - 1;
++  if (init < 0) init = 0;
++  else if ((size_t)(init) > l1) init = (ptrdiff_t)l1;
++  if (find && (lua_toboolean(L, 4) ||  /* explicit request? */
++      strpbrk(p, SPECIALS) == NULL)) {  /* or no special characters? */
++    /* do a plain search */
++    const char *s2 = lmemfind(s+init, l1-init, p, l2);
++    if (s2) {
++      lua_pushinteger(L, s2-s+1);
++      lua_pushinteger(L, s2-s+l2);
++      return 2;
++    }
++  }
++  else {
++    MatchState ms;
++    int anchor = (*p == '^') ? (p++, 1) : 0;
++    const char *s1=s+init;
++    ms.L = L;
++    ms.src_init = s;
++    ms.src_end = s+l1;
++    do {
++      const char *res;
++      ms.level = 0;
++      if ((res=match(&ms, s1, p)) != NULL) {
++        if (find) {
++          lua_pushinteger(L, s1-s+1);  /* start */
++          lua_pushinteger(L, res-s);   /* end */
++          return push_captures(&ms, NULL, 0) + 2;
++        }
++        else
++          return push_captures(&ms, s1, res);
++      }
++    } while (s1++ < ms.src_end && !anchor);
++  }
++  lua_pushnil(L);  /* not found */
++  return 1;
++}
++
++
++static int str_find (lua_State *L) {
++  return str_find_aux(L, 1);
++}
++
++
++static int str_match (lua_State *L) {
++  return str_find_aux(L, 0);
++}
++
++
++static int gmatch_aux (lua_State *L) {
++  MatchState ms;
++  size_t ls;
++  const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls);
++  const char *p = lua_tostring(L, lua_upvalueindex(2));
++  const char *src;
++  ms.L = L;
++  ms.src_init = s;
++  ms.src_end = s+ls;
++  for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3));
++       src <= ms.src_end;
++       src++) {
++    const char *e;
++    ms.level = 0;
++    if ((e = match(&ms, src, p)) != NULL) {
++      lua_Integer newstart = e-s;
++      if (e == src) newstart++;  /* empty match? go at least one position */
++      lua_pushinteger(L, newstart);
++      lua_replace(L, lua_upvalueindex(3));
++      return push_captures(&ms, src, e);
++    }
++  }
++  return 0;  /* not found */
++}
++
++
++static int gmatch (lua_State *L) {
++  luaL_checkstring(L, 1);
++  luaL_checkstring(L, 2);
++  lua_settop(L, 2);
++  lua_pushinteger(L, 0);
++  lua_pushcclosure(L, gmatch_aux, 3);
++  return 1;
++}
++
++
++static int gfind_nodef (lua_State *L) {
++  return luaL_error(L, LUA_QL("string.gfind") " was renamed to "
++                       LUA_QL("string.gmatch"));
++}
++
++
++static void add_s (MatchState *ms, luaL_Buffer *b, const char *s,
++                                                   const char *e) {
++  size_t l, i;
++  const char *news = lua_tolstring(ms->L, 3, &l);
++  for (i = 0; i < l; i++) {
++    if (news[i] != L_ESC)
++      luaL_addchar(b, news[i]);
++    else {
++      i++;  /* skip ESC */
++      if (!isdigit(uchar(news[i])))
++        luaL_addchar(b, news[i]);
++      else if (news[i] == '0')
++          luaL_addlstring(b, s, e - s);
++      else {
++        push_onecapture(ms, news[i] - '1', s, e);
++        luaL_addvalue(b);  /* add capture to accumulated result */
++      }
++    }
++  }
++}
++
++
++static void add_value (MatchState *ms, luaL_Buffer *b, const char *s,
++                                                       const char *e) {
++  lua_State *L = ms->L;
++  switch (lua_type(L, 3)) {
++    case LUA_TNUMBER:
++    case LUA_TSTRING: {
++      add_s(ms, b, s, e);
++      return;
++    }
++    case LUA_TFUNCTION: {
++      int n;
++      lua_pushvalue(L, 3);
++      n = push_captures(ms, s, e);
++      lua_call(L, n, 1);
++      break;
++    }
++    case LUA_TTABLE: {
++      push_onecapture(ms, 0, s, e);
++      lua_gettable(L, 3);
++      break;
++    }
++  }
++  if (!lua_toboolean(L, -1)) {  /* nil or false? */
++    lua_pop(L, 1);
++    lua_pushlstring(L, s, e - s);  /* keep original text */
++  }
++  else if (!lua_isstring(L, -1))
++    luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1));
++  luaL_addvalue(b);  /* add result to accumulator */
++}
++
++
++static int str_gsub (lua_State *L) {
++  size_t srcl;
++  const char *src = luaL_checklstring(L, 1, &srcl);
++  const char *p = luaL_checkstring(L, 2);
++  int  tr = lua_type(L, 3);
++  int max_s = luaL_optint(L, 4, srcl+1);
++  int anchor = (*p == '^') ? (p++, 1) : 0;
++  int n = 0;
++  MatchState ms;
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_gsub: cannot allocate memory");
++  luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
++                   tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
++                      "string/function/table expected");
++  luaL_buffinit(L, b);
++  ms.L = L;
++  ms.src_init = src;
++  ms.src_end = src+srcl;
++  while (n < max_s) {
++    const char *e;
++    ms.level = 0;
++    e = match(&ms, src, p);
++    if (e) {
++      n++;
++      add_value(&ms, b, src, e);
++    }
++    if (e && e>src) /* non empty match? */
++      src = e;  /* skip it */
++    else if (src < ms.src_end)
++      luaL_addchar(b, *src++);
++    else break;
++    if (anchor) break;
++  }
++  luaL_addlstring(b, src, ms.src_end-src);
++  luaL_pushresult(b);
++  lua_pushinteger(L, n);  /* number of substitutions */
++  kfree(b);
++  return 2;
++}
++
++/* }====================================================== */
++
++
++/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */
++#define MAX_ITEM	512
++/* valid flags in a format specification */
++#define FLAGS	"-+ #0"
++/*
++** maximum size of each format specification (such as '%-099.99d')
++** (+10 accounts for %99.99x plus margin of error)
++*/
++#define MAX_FORMAT	(sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
++
++
++static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
++  size_t l;
++  const char *s = luaL_checklstring(L, arg, &l);
++  luaL_addchar(b, '"');
++  while (l--) {
++    switch (*s) {
++      case '"': case '\\': case '\n': {
++        luaL_addchar(b, '\\');
++        luaL_addchar(b, *s);
++        break;
++      }
++      case '\r': {
++        luaL_addlstring(b, "\\r", 2);
++        break;
++      }
++      case '\0': {
++        luaL_addlstring(b, "\\000", 4);
++        break;
++      }
++      default: {
++        luaL_addchar(b, *s);
++        break;
++      }
++    }
++    s++;
++  }
++  luaL_addchar(b, '"');
++}
++
++static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
++  const char *p = strfrmt;
++  while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
++  if ((size_t)(p - strfrmt) >= sizeof(FLAGS))
++    luaL_error(L, "invalid format (repeated flags)");
++  if (isdigit(uchar(*p))) p++;  /* skip width */
++  if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
++  if (*p == '.') {
++    p++;
++    if (isdigit(uchar(*p))) p++;  /* skip precision */
++    if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
++  }
++  if (isdigit(uchar(*p)))
++    luaL_error(L, "invalid format (width or precision too long)");
++  *(form++) = '%';
++  strncpy(form, strfrmt, p - strfrmt + 1);
++  form += p - strfrmt + 1;
++  *form = '\0';
++  return p;
++}
++
++
++static void addintlen (char *form) {
++  size_t l = strlen(form);
++  char spec = form[l - 1];
++  strcpy(form + l - 1, LUA_INTFRMLEN);
++  form[l + sizeof(LUA_INTFRMLEN) - 2] = spec;
++  form[l + sizeof(LUA_INTFRMLEN) - 1] = '\0';
++}
++
++
++static int str_format (lua_State *L) {
++  int arg = 1;
++  size_t sfl;
++  const char *strfrmt = luaL_checklstring(L, arg, &sfl);
++  const char *strfrmt_end = strfrmt+sfl;
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "str_format: cannot allocate memory");
++  luaL_buffinit(L, b);
++  while (strfrmt < strfrmt_end) {
++    if (*strfrmt != L_ESC)
++      luaL_addchar(b, *strfrmt++);
++    else if (*++strfrmt == L_ESC)
++      luaL_addchar(b, *strfrmt++);  /* %% */
++    else { /* format item */
++      char form[MAX_FORMAT];  /* to store the format (`%...') */
++      char buff[MAX_ITEM];  /* to store the formatted item */
++      arg++;
++      strfrmt = scanformat(L, strfrmt, form);
++      switch (*strfrmt++) {
++        case 'c': {
++          sprintf(buff, form, (int)luaL_checknumber(L, arg));
++          break;
++        }
++        case 'd':  case 'i': {
++          addintlen(form);
++          sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
++          break;
++        }
++        case 'o':  case 'u':  case 'x':  case 'X': {
++          addintlen(form);
++          sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
++          break;
++        }
++        case 'q': {
++          addquoted(L, b, arg);
++          continue;  /* skip the 'addsize' at the end */
++        }
++        case 's': {
++          size_t l;
++          const char *s = luaL_checklstring(L, arg, &l);
++          if (!strchr(form, '.') && l >= 100) {
++            /* no precision and string is too long to be formatted;
++               keep original string */
++            lua_pushvalue(L, arg);
++            luaL_addvalue(b);
++            continue;  /* skip the `addsize' at the end */
++          }
++          else {
++            sprintf(buff, form, s);
++            break;
++          }
++        }
++        default: {  /* also treat cases `pnLlh' */
++          kfree(b);
++          return luaL_error(L, "invalid option " LUA_QL("%%%c") " to "
++                               LUA_QL("format"), *(strfrmt - 1));
++        }
++      }
++      luaL_addlstring(b, buff, strlen(buff));
++    }
++  }
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++
++static const luaL_Reg strlib[] = {
++  {"byte", str_byte},
++  {"char", str_char},
++  {"dump", str_dump},
++  {"find", str_find},
++  {"format", str_format},
++  {"gfind", gfind_nodef},
++  {"gmatch", gmatch},
++  {"gsub", str_gsub},
++  {"len", str_len},
++  {"lower", str_lower},
++  {"match", str_match},
++  {"rep", str_rep},
++  {"reverse", str_reverse},
++  {"sub", str_sub},
++  {"upper", str_upper},
++  {NULL, NULL}
++};
++
++
++static void createmetatable (lua_State *L) {
++  lua_createtable(L, 0, 1);  /* create metatable for strings */
++  lua_pushliteral(L, "");  /* dummy string */
++  lua_pushvalue(L, -2);
++  lua_setmetatable(L, -2);  /* set string metatable */
++  lua_pop(L, 1);  /* pop dummy string */
++  lua_pushvalue(L, -2);  /* string library... */
++  lua_setfield(L, -2, "__index");  /* ...is the __index metamethod */
++  lua_pop(L, 1);  /* pop metatable */
++}
++
++
++/*
++** Open string library
++*/
++LUALIB_API int luaopen_string (lua_State *L) {
++  luaL_register(L, LUA_STRLIBNAME, strlib);
++#if defined(LUA_COMPAT_GFIND)
++  lua_getfield(L, -1, "gmatch");
++  lua_setfield(L, -2, "gfind");
++#endif
++  createmetatable(L);
++  return 1;
++}
+--- /dev/null
++++ b/extensions/LUA/lua/ltable.c
+@@ -0,0 +1,588 @@
++/*
++** $Id: ltable.c,v 2.32.1.2 2007/12/28 15:32:23 roberto Exp $
++** Lua tables (hash)
++** See Copyright Notice in lua.h
++*/
++
++
++/*
++** Implementation of tables (aka arrays, objects, or hash tables).
++** Tables keep its elements in two parts: an array part and a hash part.
++** Non-negative integer keys are all candidates to be kept in the array
++** part. The actual size of the array is the largest `n' such that at
++** least half the slots between 0 and n are in use.
++** Hash uses a mix of chained scatter table with Brent's variation.
++** A main invariant of these tables is that, if an element is not
++** in its main position (i.e. the `original' position that its hash gives
++** to it), then the colliding element is in its own main position.
++** Hence even when the load factor reaches 100%, performance remains good.
++*/
++
++#include <math.h>
++#include <string.h>
++
++#define ltable_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldebug.h"
++#include "ldo.h"
++#include "lgc.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lstate.h"
++#include "ltable.h"
++
++
++/*
++** max size of array part is 2^MAXBITS
++*/
++#if LUAI_BITSINT > 26
++#define MAXBITS		26
++#else
++#define MAXBITS		(LUAI_BITSINT-2)
++#endif
++
++#define MAXASIZE	(1 << MAXBITS)
++
++
++#define hashpow2(t,n)      (gnode(t, lmod((n), sizenode(t))))
++  
++#define hashstr(t,str)  hashpow2(t, (str)->tsv.hash)
++#define hashboolean(t,p)        hashpow2(t, p)
++
++
++/*
++** for some types, it is better to avoid modulus by power of 2, as
++** they tend to have many 2 factors.
++*/
++#define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
++
++
++#define hashpointer(t,p)	hashmod(t, IntPoint(p))
++
++
++/*
++** number of ints inside a lua_Number
++*/
++#define numints		cast_int(sizeof(lua_Number)/sizeof(int))
++
++
++
++#define dummynode		(&dummynode_)
++
++static const Node dummynode_ = {
++  {{NULL}, LUA_TNIL},  /* value */
++  {{{NULL}, LUA_TNIL, NULL}}  /* key */
++};
++
++
++/*
++** hash for lua_Numbers
++*/
++static Node *hashnum (const Table *t, lua_Number n) {
++  unsigned int a[numints];
++  int i;
++  if (luai_numeq(n, 0))  /* avoid problems with -0 */
++    return gnode(t, 0);
++  memcpy(a, &n, sizeof(a));
++  for (i = 1; i < numints; i++) a[0] += a[i];
++  return hashmod(t, a[0]);
++}
++
++
++
++/*
++** returns the `main' position of an element in a table (that is, the index
++** of its hash value)
++*/
++static Node *mainposition (const Table *t, const TValue *key) {
++  switch (ttype(key)) {
++    case LUA_TNUMBER:
++      return hashnum(t, nvalue(key));
++    case LUA_TSTRING:
++      return hashstr(t, rawtsvalue(key));
++    case LUA_TBOOLEAN:
++      return hashboolean(t, bvalue(key));
++    case LUA_TLIGHTUSERDATA:
++      return hashpointer(t, pvalue(key));
++    default:
++      return hashpointer(t, gcvalue(key));
++  }
++}
++
++
++/*
++** returns the index for `key' if `key' is an appropriate key to live in
++** the array part of the table, -1 otherwise.
++*/
++static int arrayindex (const TValue *key) {
++  if (ttisnumber(key)) {
++    lua_Number n = nvalue(key);
++    int k;
++    lua_number2int(k, n);
++    if (luai_numeq(cast_num(k), n))
++      return k;
++  }
++  return -1;  /* `key' did not match some condition */
++}
++
++
++/*
++** returns the index of a `key' for table traversals. First goes all
++** elements in the array part, then elements in the hash part. The
++** beginning of a traversal is signalled by -1.
++*/
++static int findindex (lua_State *L, Table *t, StkId key) {
++  int i;
++  if (ttisnil(key)) return -1;  /* first iteration */
++  i = arrayindex(key);
++  if (0 < i && i <= t->sizearray)  /* is `key' inside array part? */
++    return i-1;  /* yes; that's the index (corrected to C) */
++  else {
++    Node *n = mainposition(t, key);
++    do {  /* check whether `key' is somewhere in the chain */
++      /* key may be dead already, but it is ok to use it in `next' */
++      if (luaO_rawequalObj(key2tval(n), key) ||
++            (ttype(gkey(n)) == LUA_TDEADKEY && iscollectable(key) &&
++             gcvalue(gkey(n)) == gcvalue(key))) {
++        i = cast_int(n - gnode(t, 0));  /* key index in hash table */
++        /* hash elements are numbered after array ones */
++        return i + t->sizearray;
++      }
++      else n = gnext(n);
++    } while (n);
++    luaG_runerror(L, "invalid key to " LUA_QL("next"));  /* key not found */
++    return 0;  /* to avoid warnings */
++  }
++}
++
++
++int luaH_next (lua_State *L, Table *t, StkId key) {
++  int i = findindex(L, t, key);  /* find original element */
++  for (i++; i < t->sizearray; i++) {  /* try first array part */
++    if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
++      setnvalue(key, cast_num(i+1));
++      setobj2s(L, key+1, &t->array[i]);
++      return 1;
++    }
++  }
++  for (i -= t->sizearray; i < sizenode(t); i++) {  /* then hash part */
++    if (!ttisnil(gval(gnode(t, i)))) {  /* a non-nil value? */
++      setobj2s(L, key, key2tval(gnode(t, i)));
++      setobj2s(L, key+1, gval(gnode(t, i)));
++      return 1;
++    }
++  }
++  return 0;  /* no more elements */
++}
++
++
++/*
++** {=============================================================
++** Rehash
++** ==============================================================
++*/
++
++
++static int computesizes (int nums[], int *narray) {
++  int i;
++  int twotoi;  /* 2^i */
++  int a = 0;  /* number of elements smaller than 2^i */
++  int na = 0;  /* number of elements to go to array part */
++  int n = 0;  /* optimal size for array part */
++  for (i = 0, twotoi = 1; twotoi/2 < *narray; i++, twotoi *= 2) {
++    if (nums[i] > 0) {
++      a += nums[i];
++      if (a > twotoi/2) {  /* more than half elements present? */
++        n = twotoi;  /* optimal size (till now) */
++        na = a;  /* all elements smaller than n will go to array part */
++      }
++    }
++    if (a == *narray) break;  /* all elements already counted */
++  }
++  *narray = n;
++  lua_assert(*narray/2 <= na && na <= *narray);
++  return na;
++}
++
++
++static int countint (const TValue *key, int *nums) {
++  int k = arrayindex(key);
++  if (0 < k && k <= MAXASIZE) {  /* is `key' an appropriate array index? */
++    nums[ceillog2(k)]++;  /* count as such */
++    return 1;
++  }
++  else
++    return 0;
++}
++
++
++static int numusearray (const Table *t, int *nums) {
++  int lg;
++  int ttlg;  /* 2^lg */
++  int ause = 0;  /* summation of `nums' */
++  int i = 1;  /* count to traverse all array keys */
++  for (lg=0, ttlg=1; lg<=MAXBITS; lg++, ttlg*=2) {  /* for each slice */
++    int lc = 0;  /* counter */
++    int lim = ttlg;
++    if (lim > t->sizearray) {
++      lim = t->sizearray;  /* adjust upper limit */
++      if (i > lim)
++        break;  /* no more elements to count */
++    }
++    /* count elements in range (2^(lg-1), 2^lg] */
++    for (; i <= lim; i++) {
++      if (!ttisnil(&t->array[i-1]))
++        lc++;
++    }
++    nums[lg] += lc;
++    ause += lc;
++  }
++  return ause;
++}
++
++
++static int numusehash (const Table *t, int *nums, int *pnasize) {
++  int totaluse = 0;  /* total number of elements */
++  int ause = 0;  /* summation of `nums' */
++  int i = sizenode(t);
++  while (i--) {
++    Node *n = &t->node[i];
++    if (!ttisnil(gval(n))) {
++      ause += countint(key2tval(n), nums);
++      totaluse++;
++    }
++  }
++  *pnasize += ause;
++  return totaluse;
++}
++
++
++static void setarrayvector (lua_State *L, Table *t, int size) {
++  int i;
++  luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
++  for (i=t->sizearray; i<size; i++)
++     setnilvalue(&t->array[i]);
++  t->sizearray = size;
++}
++
++
++static void setnodevector (lua_State *L, Table *t, int size) {
++  int lsize;
++  if (size == 0) {  /* no elements to hash part? */
++    t->node = cast(Node *, dummynode);  /* use common `dummynode' */
++    lsize = 0;
++  }
++  else {
++    int i;
++    lsize = ceillog2(size);
++    if (lsize > MAXBITS)
++      luaG_runerror(L, "table overflow");
++    size = twoto(lsize);
++    t->node = luaM_newvector(L, size, Node);
++    for (i=0; i<size; i++) {
++      Node *n = gnode(t, i);
++      gnext(n) = NULL;
++      setnilvalue(gkey(n));
++      setnilvalue(gval(n));
++    }
++  }
++  t->lsizenode = cast_byte(lsize);
++  t->lastfree = gnode(t, size);  /* all positions are free */
++}
++
++
++static void resize (lua_State *L, Table *t, int nasize, int nhsize) {
++  int i;
++  int oldasize = t->sizearray;
++  int oldhsize = t->lsizenode;
++  Node *nold = t->node;  /* save old hash ... */
++  if (nasize > oldasize)  /* array part must grow? */
++    setarrayvector(L, t, nasize);
++  /* create new hash part with appropriate size */
++  setnodevector(L, t, nhsize);  
++  if (nasize < oldasize) {  /* array part must shrink? */
++    t->sizearray = nasize;
++    /* re-insert elements from vanishing slice */
++    for (i=nasize; i<oldasize; i++) {
++      if (!ttisnil(&t->array[i]))
++        setobjt2t(L, luaH_setnum(L, t, i+1), &t->array[i]);
++    }
++    /* shrink array */
++    luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
++  }
++  /* re-insert elements from hash part */
++  for (i = twoto(oldhsize) - 1; i >= 0; i--) {
++    Node *old = nold+i;
++    if (!ttisnil(gval(old)))
++      setobjt2t(L, luaH_set(L, t, key2tval(old)), gval(old));
++  }
++  if (nold != dummynode)
++    luaM_freearray(L, nold, twoto(oldhsize), Node);  /* free old array */
++}
++
++
++void luaH_resizearray (lua_State *L, Table *t, int nasize) {
++  int nsize = (t->node == dummynode) ? 0 : sizenode(t);
++  resize(L, t, nasize, nsize);
++}
++
++
++static void rehash (lua_State *L, Table *t, const TValue *ek) {
++  int nasize, na;
++  int nums[MAXBITS+1];  /* nums[i] = number of keys between 2^(i-1) and 2^i */
++  int i;
++  int totaluse;
++  for (i=0; i<=MAXBITS; i++) nums[i] = 0;  /* reset counts */
++  nasize = numusearray(t, nums);  /* count keys in array part */
++  totaluse = nasize;  /* all those keys are integer keys */
++  totaluse += numusehash(t, nums, &nasize);  /* count keys in hash part */
++  /* count extra key */
++  nasize += countint(ek, nums);
++  totaluse++;
++  /* compute new size for array part */
++  na = computesizes(nums, &nasize);
++  /* resize the table to new computed sizes */
++  resize(L, t, nasize, totaluse - na);
++}
++
++
++
++/*
++** }=============================================================
++*/
++
++
++Table *luaH_new (lua_State *L, int narray, int nhash) {
++  Table *t = luaM_new(L, Table);
++  luaC_link(L, obj2gco(t), LUA_TTABLE);
++  t->metatable = NULL;
++  t->flags = cast_byte(~0);
++  /* temporary values (kept only if some malloc fails) */
++  t->array = NULL;
++  t->sizearray = 0;
++  t->lsizenode = 0;
++  t->node = cast(Node *, dummynode);
++  setarrayvector(L, t, narray);
++  setnodevector(L, t, nhash);
++  return t;
++}
++
++
++void luaH_free (lua_State *L, Table *t) {
++  if (t->node != dummynode)
++    luaM_freearray(L, t->node, sizenode(t), Node);
++  luaM_freearray(L, t->array, t->sizearray, TValue);
++  luaM_free(L, t);
++}
++
++
++static Node *getfreepos (Table *t) {
++  while (t->lastfree-- > t->node) {
++    if (ttisnil(gkey(t->lastfree)))
++      return t->lastfree;
++  }
++  return NULL;  /* could not find a free place */
++}
++
++
++
++/*
++** inserts a new key into a hash table; first, check whether key's main 
++** position is free. If not, check whether colliding node is in its main 
++** position or not: if it is not, move colliding node to an empty place and 
++** put new key in its main position; otherwise (colliding node is in its main 
++** position), new key goes to an empty position. 
++*/
++static TValue *newkey (lua_State *L, Table *t, const TValue *key) {
++  Node *mp = mainposition(t, key);
++  if (!ttisnil(gval(mp)) || mp == dummynode) {
++    Node *othern;
++    Node *n = getfreepos(t);  /* get a free place */
++    if (n == NULL) {  /* cannot find a free place? */
++      rehash(L, t, key);  /* grow table */
++      return luaH_set(L, t, key);  /* re-insert key into grown table */
++    }
++    lua_assert(n != dummynode);
++    othern = mainposition(t, key2tval(mp));
++    if (othern != mp) {  /* is colliding node out of its main position? */
++      /* yes; move colliding node into free position */
++      while (gnext(othern) != mp) othern = gnext(othern);  /* find previous */
++      gnext(othern) = n;  /* redo the chain with `n' in place of `mp' */
++      *n = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
++      gnext(mp) = NULL;  /* now `mp' is free */
++      setnilvalue(gval(mp));
++    }
++    else {  /* colliding node is in its own main position */
++      /* new node will go into free position */
++      gnext(n) = gnext(mp);  /* chain new position */
++      gnext(mp) = n;
++      mp = n;
++    }
++  }
++  gkey(mp)->value = key->value; gkey(mp)->tt = key->tt;
++  luaC_barriert(L, t, key);
++  lua_assert(ttisnil(gval(mp)));
++  return gval(mp);
++}
++
++
++/*
++** search function for integers
++*/
++const TValue *luaH_getnum (Table *t, int key) {
++  /* (1 <= key && key <= t->sizearray) */
++  if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray))
++    return &t->array[key-1];
++  else {
++    lua_Number nk = cast_num(key);
++    Node *n = hashnum(t, nk);
++    do {  /* check whether `key' is somewhere in the chain */
++      if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
++        return gval(n);  /* that's it */
++      else n = gnext(n);
++    } while (n);
++    return luaO_nilobject;
++  }
++}
++
++
++/*
++** search function for strings
++*/
++const TValue *luaH_getstr (Table *t, TString *key) {
++  Node *n = hashstr(t, key);
++  do {  /* check whether `key' is somewhere in the chain */
++    if (ttisstring(gkey(n)) && rawtsvalue(gkey(n)) == key)
++      return gval(n);  /* that's it */
++    else n = gnext(n);
++  } while (n);
++  return luaO_nilobject;
++}
++
++
++/*
++** main search function
++*/
++const TValue *luaH_get (Table *t, const TValue *key) {
++  switch (ttype(key)) {
++    case LUA_TNIL: return luaO_nilobject;
++    case LUA_TSTRING: return luaH_getstr(t, rawtsvalue(key));
++    case LUA_TNUMBER: {
++      int k;
++      lua_Number n = nvalue(key);
++      lua_number2int(k, n);
++      if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */
++        return luaH_getnum(t, k);  /* use specialized version */
++      /* else go through */
++    }
++    default: {
++      Node *n = mainposition(t, key);
++      do {  /* check whether `key' is somewhere in the chain */
++        if (luaO_rawequalObj(key2tval(n), key))
++          return gval(n);  /* that's it */
++        else n = gnext(n);
++      } while (n);
++      return luaO_nilobject;
++    }
++  }
++}
++
++
++TValue *luaH_set (lua_State *L, Table *t, const TValue *key) {
++  const TValue *p = luaH_get(t, key);
++  t->flags = 0;
++  if (p != luaO_nilobject)
++    return cast(TValue *, p);
++  else {
++    if (ttisnil(key)) luaG_runerror(L, "table index is nil");
++    else if (ttisnumber(key) && luai_numisnan(nvalue(key)))
++      luaG_runerror(L, "table index is NaN");
++    return newkey(L, t, key);
++  }
++}
++
++
++TValue *luaH_setnum (lua_State *L, Table *t, int key) {
++  const TValue *p = luaH_getnum(t, key);
++  if (p != luaO_nilobject)
++    return cast(TValue *, p);
++  else {
++    TValue k;
++    setnvalue(&k, cast_num(key));
++    return newkey(L, t, &k);
++  }
++}
++
++
++TValue *luaH_setstr (lua_State *L, Table *t, TString *key) {
++  const TValue *p = luaH_getstr(t, key);
++  if (p != luaO_nilobject)
++    return cast(TValue *, p);
++  else {
++    TValue k;
++    setsvalue(L, &k, key);
++    return newkey(L, t, &k);
++  }
++}
++
++
++static int unbound_search (Table *t, unsigned int j) {
++  unsigned int i = j;  /* i is zero or a present index */
++  j++;
++  /* find `i' and `j' such that i is present and j is not */
++  while (!ttisnil(luaH_getnum(t, j))) {
++    i = j;
++    j *= 2;
++    if (j > cast(unsigned int, MAX_INT)) {  /* overflow? */
++      /* table was built with bad purposes: resort to linear search */
++      i = 1;
++      while (!ttisnil(luaH_getnum(t, i))) i++;
++      return i - 1;
++    }
++  }
++  /* now do a binary search between them */
++  while (j - i > 1) {
++    unsigned int m = (i+j)/2;
++    if (ttisnil(luaH_getnum(t, m))) j = m;
++    else i = m;
++  }
++  return i;
++}
++
++
++/*
++** Try to find a boundary in table `t'. A `boundary' is an integer index
++** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil).
++*/
++int luaH_getn (Table *t) {
++  unsigned int j = t->sizearray;
++  if (j > 0 && ttisnil(&t->array[j - 1])) {
++    /* there is a boundary in the array part: (binary) search for it */
++    unsigned int i = 0;
++    while (j - i > 1) {
++      unsigned int m = (i+j)/2;
++      if (ttisnil(&t->array[m - 1])) j = m;
++      else i = m;
++    }
++    return i;
++  }
++  /* else must find a boundary in hash part */
++  else if (t->node == dummynode)  /* hash part is empty? */
++    return j;  /* that is easy... */
++  else return unbound_search(t, j);
++}
++
++
++
++#if defined(LUA_DEBUG)
++
++Node *luaH_mainposition (const Table *t, const TValue *key) {
++  return mainposition(t, key);
++}
++
++int luaH_isdummy (Node *n) { return n == dummynode; }
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/ltable.h
+@@ -0,0 +1,40 @@
++/*
++** $Id: ltable.h,v 2.10.1.1 2007/12/27 13:02:25 roberto Exp $
++** Lua tables (hash)
++** See Copyright Notice in lua.h
++*/
++
++#ifndef ltable_h
++#define ltable_h
++
++#include "lobject.h"
++
++
++#define gnode(t,i)	(&(t)->node[i])
++#define gkey(n)		(&(n)->i_key.nk)
++#define gval(n)		(&(n)->i_val)
++#define gnext(n)	((n)->i_key.nk.next)
++
++#define key2tval(n)	(&(n)->i_key.tvk)
++
++
++LUAI_FUNC const TValue *luaH_getnum (Table *t, int key);
++LUAI_FUNC TValue *luaH_setnum (lua_State *L, Table *t, int key);
++LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
++LUAI_FUNC TValue *luaH_setstr (lua_State *L, Table *t, TString *key);
++LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
++LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key);
++LUAI_FUNC Table *luaH_new (lua_State *L, int narray, int lnhash);
++LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, int nasize);
++LUAI_FUNC void luaH_free (lua_State *L, Table *t);
++LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key);
++LUAI_FUNC int luaH_getn (Table *t);
++
++
++#if defined(LUA_DEBUG)
++LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key);
++LUAI_FUNC int luaH_isdummy (Node *n);
++#endif
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/ltablib.c
+@@ -0,0 +1,288 @@
++/*
++** $Id: ltablib.c,v 1.38.1.3 2008/02/14 16:46:58 roberto Exp $
++** Library for Table Manipulation
++** See Copyright Notice in lua.h
++*/
++
++
++#include <stddef.h>
++
++#define ltablib_c
++#define LUA_LIB
++
++#include "lua.h"
++
++#include "lauxlib.h"
++#include "lualib.h"
++
++
++#define aux_getn(L,n)	(luaL_checktype(L, n, LUA_TTABLE), luaL_getn(L, n))
++
++
++static int foreachi (lua_State *L) {
++  int i;
++  int n = aux_getn(L, 1);
++  luaL_checktype(L, 2, LUA_TFUNCTION);
++  for (i=1; i <= n; i++) {
++    lua_pushvalue(L, 2);  /* function */
++    lua_pushinteger(L, i);  /* 1st argument */
++    lua_rawgeti(L, 1, i);  /* 2nd argument */
++    lua_call(L, 2, 1);
++    if (!lua_isnil(L, -1))
++      return 1;
++    lua_pop(L, 1);  /* remove nil result */
++  }
++  return 0;
++}
++
++
++static int foreach (lua_State *L) {
++  luaL_checktype(L, 1, LUA_TTABLE);
++  luaL_checktype(L, 2, LUA_TFUNCTION);
++  lua_pushnil(L);  /* first key */
++  while (lua_next(L, 1)) {
++    lua_pushvalue(L, 2);  /* function */
++    lua_pushvalue(L, -3);  /* key */
++    lua_pushvalue(L, -3);  /* value */
++    lua_call(L, 2, 1);
++    if (!lua_isnil(L, -1))
++      return 1;
++    lua_pop(L, 2);  /* remove value and result */
++  }
++  return 0;
++}
++
++
++static int maxn (lua_State *L) {
++  lua_Number max = 0;
++  luaL_checktype(L, 1, LUA_TTABLE);
++  lua_pushnil(L);  /* first key */
++  while (lua_next(L, 1)) {
++    lua_pop(L, 1);  /* remove value */
++    if (lua_type(L, -1) == LUA_TNUMBER) {
++      lua_Number v = lua_tonumber(L, -1);
++      if (v > max) max = v;
++    }
++  }
++  lua_pushnumber(L, max);
++  return 1;
++}
++
++
++static int getn (lua_State *L) {
++  lua_pushinteger(L, aux_getn(L, 1));
++  return 1;
++}
++
++
++static int setn (lua_State *L) {
++  luaL_checktype(L, 1, LUA_TTABLE);
++#ifndef luaL_setn
++  luaL_setn(L, 1, luaL_checkint(L, 2));
++#else
++  luaL_error(L, LUA_QL("setn") " is obsolete");
++#endif
++  lua_pushvalue(L, 1);
++  return 1;
++}
++
++
++static int tinsert (lua_State *L) {
++  int e = aux_getn(L, 1) + 1;  /* first empty element */
++  int pos;  /* where to insert new element */
++  switch (lua_gettop(L)) {
++    case 2: {  /* called with only 2 arguments */
++      pos = e;  /* insert new element at the end */
++      break;
++    }
++    case 3: {
++      int i;
++      pos = luaL_checkint(L, 2);  /* 2nd argument is the position */
++      if (pos > e) e = pos;  /* `grow' array if necessary */
++      for (i = e; i > pos; i--) {  /* move up elements */
++        lua_rawgeti(L, 1, i-1);
++        lua_rawseti(L, 1, i);  /* t[i] = t[i-1] */
++      }
++      break;
++    }
++    default: {
++      return luaL_error(L, "wrong number of arguments to " LUA_QL("insert"));
++    }
++  }
++  luaL_setn(L, 1, e);  /* new size */
++  lua_rawseti(L, 1, pos);  /* t[pos] = v */
++  return 0;
++}
++
++
++static int tremove (lua_State *L) {
++  int e = aux_getn(L, 1);
++  int pos = luaL_optint(L, 2, e);
++  if (!(1 <= pos && pos <= e))  /* position is outside bounds? */
++   return 0;  /* nothing to remove */
++  luaL_setn(L, 1, e - 1);  /* t.n = n-1 */
++  lua_rawgeti(L, 1, pos);  /* result = t[pos] */
++  for ( ;pos<e; pos++) {
++    lua_rawgeti(L, 1, pos+1);
++    lua_rawseti(L, 1, pos);  /* t[pos] = t[pos+1] */
++  }
++  lua_pushnil(L);
++  lua_rawseti(L, 1, e);  /* t[e] = nil */
++  return 1;
++}
++
++
++static void addfield (lua_State *L, luaL_Buffer *b, int i) {
++  lua_rawgeti(L, 1, i);
++  if (!lua_isstring(L, -1))
++    luaL_error(L, "invalid value (%s) at index %d in table for "
++                  LUA_QL("concat"), luaL_typename(L, -1), i);
++    luaL_addvalue(b);
++}
++
++
++static int tconcat (lua_State *L) {
++  size_t lsep;
++  int i, last;
++  const char *sep = luaL_optlstring(L, 2, "", &lsep);
++  luaL_Buffer *b = (luaL_Buffer *)kmalloc(sizeof(luaL_Buffer) + BUFSIZ, GFP_ATOMIC);
++  if(!b) luaL_error(L, "tconcat: cannot allocate memory");
++  luaL_checktype(L, 1, LUA_TTABLE);
++  i = luaL_optint(L, 3, 1);
++  last = luaL_opt(L, luaL_checkint, 4, luaL_getn(L, 1));
++  luaL_buffinit(L, b);
++  for (; i < last; i++) {
++    addfield(L, b, i);
++    luaL_addlstring(b, sep, lsep);
++  }
++  if (i == last)  /* add last value (if interval was not empty) */
++    addfield(L, b, i);
++  luaL_pushresult(b);
++  kfree(b);
++  return 1;
++}
++
++
++
++/*
++** {======================================================
++** Quicksort
++** (based on `Algorithms in MODULA-3', Robert Sedgewick;
++**  Addison-Wesley, 1993.)
++*/
++
++
++static void set2 (lua_State *L, int i, int j) {
++  lua_rawseti(L, 1, i);
++  lua_rawseti(L, 1, j);
++}
++
++static int sort_comp (lua_State *L, int a, int b) {
++  if (!lua_isnil(L, 2)) {  /* function? */
++    int res;
++    lua_pushvalue(L, 2);
++    lua_pushvalue(L, a-1);  /* -1 to compensate function */
++    lua_pushvalue(L, b-2);  /* -2 to compensate function and `a' */
++    lua_call(L, 2, 1);
++    res = lua_toboolean(L, -1);
++    lua_pop(L, 1);
++    return res;
++  }
++  else  /* a < b? */
++    return lua_lessthan(L, a, b);
++}
++
++static void auxsort (lua_State *L, int l, int u) {
++  while (l < u) {  /* for tail recursion */
++    int i, j;
++    /* sort elements a[l], a[(l+u)/2] and a[u] */
++    lua_rawgeti(L, 1, l);
++    lua_rawgeti(L, 1, u);
++    if (sort_comp(L, -1, -2))  /* a[u] < a[l]? */
++      set2(L, l, u);  /* swap a[l] - a[u] */
++    else
++      lua_pop(L, 2);
++    if (u-l == 1) break;  /* only 2 elements */
++    i = (l+u)/2;
++    lua_rawgeti(L, 1, i);
++    lua_rawgeti(L, 1, l);
++    if (sort_comp(L, -2, -1))  /* a[i]<a[l]? */
++      set2(L, i, l);
++    else {
++      lua_pop(L, 1);  /* remove a[l] */
++      lua_rawgeti(L, 1, u);
++      if (sort_comp(L, -1, -2))  /* a[u]<a[i]? */
++        set2(L, i, u);
++      else
++        lua_pop(L, 2);
++    }
++    if (u-l == 2) break;  /* only 3 elements */
++    lua_rawgeti(L, 1, i);  /* Pivot */
++    lua_pushvalue(L, -1);
++    lua_rawgeti(L, 1, u-1);
++    set2(L, i, u-1);
++    /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
++    i = l; j = u-1;
++    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
++      /* repeat ++i until a[i] >= P */
++      while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
++        if (i>u) luaL_error(L, "invalid order function for sorting");
++        lua_pop(L, 1);  /* remove a[i] */
++      }
++      /* repeat --j until a[j] <= P */
++      while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
++        if (j<l) luaL_error(L, "invalid order function for sorting");
++        lua_pop(L, 1);  /* remove a[j] */
++      }
++      if (j<i) {
++        lua_pop(L, 3);  /* pop pivot, a[i], a[j] */
++        break;
++      }
++      set2(L, i, j);
++    }
++    lua_rawgeti(L, 1, u-1);
++    lua_rawgeti(L, 1, i);
++    set2(L, u-1, i);  /* swap pivot (a[u-1]) with a[i] */
++    /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
++    /* adjust so that smaller half is in [j..i] and larger one in [l..u] */
++    if (i-l < u-i) {
++      j=l; i=i-1; l=i+2;
++    }
++    else {
++      j=i+1; i=u; u=j-2;
++    }
++    auxsort(L, j, i);  /* call recursively the smaller one */
++  }  /* repeat the routine for the larger one */
++}
++
++static int sort (lua_State *L) {
++  int n = aux_getn(L, 1);
++  luaL_checkstack(L, 40, "");  /* assume array is smaller than 2^40 */
++  if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
++    luaL_checktype(L, 2, LUA_TFUNCTION);
++  lua_settop(L, 2);  /* make sure there is two arguments */
++  auxsort(L, 1, n);
++  return 0;
++}
++
++/* }====================================================== */
++
++
++static const luaL_Reg tab_funcs[] = {
++  {"concat", tconcat},
++  {"foreach", foreach},
++  {"foreachi", foreachi},
++  {"getn", getn},
++  {"maxn", maxn},
++  {"insert", tinsert},
++  {"remove", tremove},
++  {"setn", setn},
++  {"sort", sort},
++  {NULL, NULL}
++};
++
++
++LUALIB_API int luaopen_table (lua_State *L) {
++  luaL_register(L, LUA_TABLIBNAME, tab_funcs);
++  return 1;
++}
+--- /dev/null
++++ b/extensions/LUA/lua/ltm.c
+@@ -0,0 +1,74 @@
++/*
++** $Id: ltm.c,v 2.8.1.1 2007/12/27 13:02:25 roberto Exp $
++** Tag methods
++** See Copyright Notice in lua.h
++*/
++
++#include <string.h>
++
++#define ltm_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "lobject.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "ltm.h"
++
++
++
++const char *const luaT_typenames[] = {
++  "nil", "boolean", "userdata", "number",
++  "string", "table", "function", "userdata", "thread",
++  "proto", "upval"
++};
++
++
++void luaT_init (lua_State *L) {
++  static const char *const luaT_eventname[] = {  /* ORDER TM */
++    "__index", "__newindex",
++    "__gc", "__mode", "__eq",
++    "__add", "__sub", "__mul", "__div", "__mod",
++    "__pow", "__unm", "__len", "__lt", "__le",
++    "__concat", "__call"
++  };
++  int i;
++  for (i=0; i<TM_N; i++) {
++    G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
++    luaS_fix(G(L)->tmname[i]);  /* never collect these names */
++  }
++}
++
++
++/*
++** function to be used with macro "fasttm": optimized for absence of
++** tag methods
++*/
++const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
++  const TValue *tm = luaH_getstr(events, ename);
++  lua_assert(event <= TM_EQ);
++  if (ttisnil(tm)) {  /* no tag method? */
++    events->flags |= cast_byte(1u<<event);  /* cache this fact */
++    return NULL;
++  }
++  else return tm;
++}
++
++
++const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
++  Table *mt;
++  switch (ttype(o)) {
++    case LUA_TTABLE:
++      mt = hvalue(o)->metatable;
++      break;
++    case LUA_TUSERDATA:
++      mt = uvalue(o)->metatable;
++      break;
++    default:
++      mt = G(L)->mt[ttype(o)];
++  }
++  return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/ltm.h
+@@ -0,0 +1,54 @@
++/*
++** $Id: ltm.h,v 2.6.1.1 2007/12/27 13:02:25 roberto Exp $
++** Tag methods
++** See Copyright Notice in lua.h
++*/
++
++#ifndef ltm_h
++#define ltm_h
++
++
++#include "lobject.h"
++
++
++/*
++* WARNING: if you change the order of this enumeration,
++* grep "ORDER TM"
++*/
++typedef enum {
++  TM_INDEX,
++  TM_NEWINDEX,
++  TM_GC,
++  TM_MODE,
++  TM_EQ,  /* last tag method with `fast' access */
++  TM_ADD,
++  TM_SUB,
++  TM_MUL,
++  TM_DIV,
++  TM_MOD,
++  TM_POW,
++  TM_UNM,
++  TM_LEN,
++  TM_LT,
++  TM_LE,
++  TM_CONCAT,
++  TM_CALL,
++  TM_N		/* number of elements in the enum */
++} TMS;
++
++
++
++#define gfasttm(g,et,e) ((et) == NULL ? NULL : \
++  ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
++
++#define fasttm(l,et,e)	gfasttm(G(l), et, e)
++
++LUAI_DATA const char *const luaT_typenames[];
++
++
++LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
++LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
++                                                       TMS event);
++LUAI_FUNC void luaT_init (lua_State *L);
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/luaconf.h
+@@ -0,0 +1,797 @@
++/*
++** $Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
++** Configuration file for Lua
++** See Copyright Notice in lua.h
++*/
++
++
++#ifndef lconfig_h
++#define lconfig_h
++
++#include <stddef.h>
++
++#if !defined(__KERNEL__)
++#include <limits.h>
++#else
++#define UCHAR_MAX	255
++#define SHRT_MAX        32767
++#define BUFSIZ 		8192
++#define NO_FPU
++#endif
++
++/*
++** ==================================================================
++** Search for "@@" to find all configurable definitions.
++** ===================================================================
++*/
++
++
++/*
++@@ LUA_ANSI controls the use of non-ansi features.
++** CHANGE it (define it) if you want Lua to avoid the use of any
++** non-ansi feature or library.
++*/
++#if defined(__STRICT_ANSI__)
++#define LUA_ANSI
++#endif
++
++
++#if !defined(LUA_ANSI) && defined(_WIN32)
++#define LUA_WIN
++#endif
++
++#if defined(LUA_USE_LINUX)
++#define LUA_USE_POSIX
++#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
++#define LUA_USE_READLINE	/* needs some extra libraries */
++#endif
++
++#if defined(LUA_USE_MACOSX)
++#define LUA_USE_POSIX
++#define LUA_DL_DYLD		/* does not need extra library */
++#endif
++
++
++
++/*
++@@ LUA_USE_POSIX includes all functionallity listed as X/Open System
++@* Interfaces Extension (XSI).
++** CHANGE it (define it) if your system is XSI compatible.
++*/
++#if defined(LUA_USE_POSIX)
++#define LUA_USE_MKSTEMP
++#define LUA_USE_ISATTY
++#define LUA_USE_POPEN
++#define LUA_USE_ULONGJMP
++#endif
++
++
++/*
++@@ LUA_PATH and LUA_CPATH are the names of the environment variables that
++@* Lua check to set its paths.
++@@ LUA_INIT is the name of the environment variable that Lua
++@* checks for initialization code.
++** CHANGE them if you want different names.
++*/
++#define LUA_PATH        "LUA_PATH"
++#define LUA_CPATH       "LUA_CPATH"
++#define LUA_INIT	"LUA_INIT"
++
++
++/*
++@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
++@* Lua libraries.
++@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
++@* C libraries.
++** CHANGE them if your machine has a non-conventional directory
++** hierarchy or if you want to install your libraries in
++** non-conventional directories.
++*/
++#if defined(_WIN32)
++/*
++** In Windows, any exclamation mark ('!') in the path is replaced by the
++** path of the directory of the executable file of the current process.
++*/
++#define LUA_LDIR	"!\\lua\\"
++#define LUA_CDIR	"!\\"
++#define LUA_PATH_DEFAULT  \
++		".\\?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
++		             LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua"
++#define LUA_CPATH_DEFAULT \
++	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
++
++#else
++#define LUA_ROOT	"/usr/local/"
++#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
++#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
++#define LUA_PATH_DEFAULT  \
++		"./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
++		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
++#define LUA_CPATH_DEFAULT \
++	"./?.so;"  LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
++#endif
++
++
++/*
++@@ LUA_DIRSEP is the directory separator (for submodules).
++** CHANGE it if your machine does not use "/" as the directory separator
++** and is not Windows. (On Windows Lua automatically uses "\".)
++*/
++#if defined(_WIN32)
++#define LUA_DIRSEP	"\\"
++#else
++#define LUA_DIRSEP	"/"
++#endif
++
++
++/*
++@@ LUA_PATHSEP is the character that separates templates in a path.
++@@ LUA_PATH_MARK is the string that marks the substitution points in a
++@* template.
++@@ LUA_EXECDIR in a Windows path is replaced by the executable's
++@* directory.
++@@ LUA_IGMARK is a mark to ignore all before it when bulding the
++@* luaopen_ function name.
++** CHANGE them if for some reason your system cannot use those
++** characters. (E.g., if one of those characters is a common character
++** in file/directory names.) Probably you do not need to change them.
++*/
++#define LUA_PATHSEP	";"
++#define LUA_PATH_MARK	"?"
++#define LUA_EXECDIR	"!"
++#define LUA_IGMARK	"-"
++
++
++/*
++@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
++** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
++** machines, ptrdiff_t gives a good choice between int or long.)
++*/
++#define LUA_INTEGER	ptrdiff_t
++
++
++/*
++@@ LUA_API is a mark for all core API functions.
++@@ LUALIB_API is a mark for all standard library functions.
++** CHANGE them if you need to define those functions in some special way.
++** For instance, if you want to create one Windows DLL with the core and
++** the libraries, you may want to use the following definition (define
++** LUA_BUILD_AS_DLL to get it).
++*/
++#if defined(LUA_BUILD_AS_DLL)
++
++#if defined(LUA_CORE) || defined(LUA_LIB)
++#define LUA_API __declspec(dllexport)
++#else
++#define LUA_API __declspec(dllimport)
++#endif
++
++#else
++
++#define LUA_API		extern
++
++#endif
++
++/* more often than not the libs go together with the core */
++#define LUALIB_API	LUA_API
++
++
++/*
++@@ LUAI_FUNC is a mark for all extern functions that are not to be
++@* exported to outside modules.
++@@ LUAI_DATA is a mark for all extern (const) variables that are not to
++@* be exported to outside modules.
++** CHANGE them if you need to mark them in some special way. Elf/gcc
++** (versions 3.2 and later) mark them as "hidden" to optimize access
++** when Lua is compiled as a shared library.
++*/
++#if defined(luaall_c)
++#define LUAI_FUNC	static
++#define LUAI_DATA	/* empty */
++
++#elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
++      defined(__ELF__)
++#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
++#define LUAI_DATA	LUAI_FUNC
++
++#else
++#define LUAI_FUNC	extern
++#define LUAI_DATA	extern
++#endif
++
++
++
++/*
++@@ LUA_QL describes how error messages quote program elements.
++** CHANGE it if you want a different appearance.
++*/
++#define LUA_QL(x)	"'" x "'"
++#define LUA_QS		LUA_QL("%s")
++
++
++/*
++@@ LUA_IDSIZE gives the maximum size for the description of the source
++@* of a function in debug information.
++** CHANGE it if you want a different size.
++*/
++#define LUA_IDSIZE	60
++
++
++/*
++** {==================================================================
++** Stand-alone configuration
++** ===================================================================
++*/
++
++#if defined(lua_c) || defined(luaall_c)
++
++/*
++@@ lua_stdin_is_tty detects whether the standard input is a 'tty' (that
++@* is, whether we're running lua interactively).
++** CHANGE it if you have a better definition for non-POSIX/non-Windows
++** systems.
++*/
++#if defined(LUA_USE_ISATTY)
++#include <unistd.h>
++#define lua_stdin_is_tty()	isatty(0)
++#elif defined(LUA_WIN)
++#include <io.h>
++#include <stdio.h>
++#define lua_stdin_is_tty()	_isatty(_fileno(stdin))
++#else
++#define lua_stdin_is_tty()	1  /* assume stdin is a tty */
++#endif
++
++
++/*
++@@ LUA_PROMPT is the default prompt used by stand-alone Lua.
++@@ LUA_PROMPT2 is the default continuation prompt used by stand-alone Lua.
++** CHANGE them if you want different prompts. (You can also change the
++** prompts dynamically, assigning to globals _PROMPT/_PROMPT2.)
++*/
++#define LUA_PROMPT		"> "
++#define LUA_PROMPT2		">> "
++
++
++/*
++@@ LUA_PROGNAME is the default name for the stand-alone Lua program.
++** CHANGE it if your stand-alone interpreter has a different name and
++** your system is not able to detect that name automatically.
++*/
++#define LUA_PROGNAME		"lua"
++
++
++/*
++@@ LUA_MAXINPUT is the maximum length for an input line in the
++@* stand-alone interpreter.
++** CHANGE it if you need longer lines.
++*/
++#define LUA_MAXINPUT	512
++
++
++/*
++@@ lua_readline defines how to show a prompt and then read a line from
++@* the standard input.
++@@ lua_saveline defines how to "save" a read line in a "history".
++@@ lua_freeline defines how to free a line read by lua_readline.
++** CHANGE them if you want to improve this functionality (e.g., by using
++** GNU readline and history facilities).
++*/
++#if defined(LUA_USE_READLINE)
++#include <stdio.h>
++#include <readline/readline.h>
++#include <readline/history.h>
++#define lua_readline(L,b,p)	((void)L, ((b)=readline(p)) != NULL)
++#define lua_saveline(L,idx) \
++	if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
++	  add_history(lua_tostring(L, idx));  /* add it to history */
++#define lua_freeline(L,b)	((void)L, free(b))
++#else
++#define lua_readline(L,b,p)	\
++	((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
++	fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
++#define lua_saveline(L,idx)	{ (void)L; (void)idx; }
++#define lua_freeline(L,b)	{ (void)L; (void)b; }
++#endif
++
++#endif
++
++/* }================================================================== */
++
++
++/*
++@@ LUAI_GCPAUSE defines the default pause between garbage-collector cycles
++@* as a percentage.
++** CHANGE it if you want the GC to run faster or slower (higher values
++** mean larger pauses which mean slower collection.) You can also change
++** this value dynamically.
++*/
++#define LUAI_GCPAUSE	200  /* 200% (wait memory to double before next GC) */
++
++
++/*
++@@ LUAI_GCMUL defines the default speed of garbage collection relative to
++@* memory allocation as a percentage.
++** CHANGE it if you want to change the granularity of the garbage
++** collection. (Higher values mean coarser collections. 0 represents
++** infinity, where each step performs a full collection.) You can also
++** change this value dynamically.
++*/
++#define LUAI_GCMUL	200 /* GC runs 'twice the speed' of memory allocation */
++
++
++
++/*
++@@ LUA_COMPAT_GETN controls compatibility with old getn behavior.
++** CHANGE it (define it) if you want exact compatibility with the
++** behavior of setn/getn in Lua 5.0.
++*/
++#undef LUA_COMPAT_GETN
++
++/*
++@@ LUA_COMPAT_LOADLIB controls compatibility about global loadlib.
++** CHANGE it to undefined as soon as you do not need a global 'loadlib'
++** function (the function is still available as 'package.loadlib').
++*/
++#undef LUA_COMPAT_LOADLIB
++
++/*
++@@ LUA_COMPAT_VARARG controls compatibility with old vararg feature.
++** CHANGE it to undefined as soon as your programs use only '...' to
++** access vararg parameters (instead of the old 'arg' table).
++*/
++#define LUA_COMPAT_VARARG
++
++/*
++@@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
++** CHANGE it to undefined as soon as your programs use 'math.fmod' or
++** the new '%' operator instead of 'math.mod'.
++*/
++#define LUA_COMPAT_MOD
++
++/*
++@@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
++@* facility.
++** CHANGE it to 2 if you want the old behaviour, or undefine it to turn
++** off the advisory error when nesting [[...]].
++*/
++#define LUA_COMPAT_LSTR		1
++
++/*
++@@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
++** CHANGE it to undefined as soon as you rename 'string.gfind' to
++** 'string.gmatch'.
++*/
++#define LUA_COMPAT_GFIND
++
++/*
++@@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
++@* behavior.
++** CHANGE it to undefined as soon as you replace to 'luaL_register'
++** your uses of 'luaL_openlib'
++*/
++#define LUA_COMPAT_OPENLIB
++
++
++
++/*
++@@ luai_apicheck is the assert macro used by the Lua-C API.
++** CHANGE luai_apicheck if you want Lua to perform some checks in the
++** parameters it gets from API calls. This may slow down the interpreter
++** a bit, but may be quite useful when debugging C code that interfaces
++** with Lua. A useful redefinition is to use assert.h.
++*/
++#if defined(LUA_USE_APICHECK)
++#include <assert.h>
++#define luai_apicheck(L,o)	{ (void)L; assert(o); }
++#else
++#define luai_apicheck(L,o)	{ (void)L; }
++#endif
++
++
++/*
++@@ LUAI_BITSINT defines the number of bits in an int.
++** CHANGE here if Lua cannot automatically detect the number of bits of
++** your machine. Probably you do not need to change this.
++*/
++/* avoid overflows in comparison */
++#if !defined(__KERNEL__)
++#include <limits.h>
++#define LUA_INT_MAX INT_MAX
++#else
++#define LUA_INT_MAX (~0U>>1)
++#endif
++
++#if LUA_INT_MAX-20 < 32760
++#define LUAI_BITSINT	16
++#elif LUA_INT_MAX > 2147483640L
++/* int has at least 32 bits */
++#define LUAI_BITSINT	32
++#else
++#error "you must define LUA_BITSINT with number of bits in an integer"
++#endif
++
++
++/*
++@@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
++@@ LUAI_INT32 is an signed integer with at least 32 bits.
++@@ LUAI_UMEM is an unsigned integer big enough to count the total
++@* memory used by Lua.
++@@ LUAI_MEM is a signed integer big enough to count the total memory
++@* used by Lua.
++** CHANGE here if for some weird reason the default definitions are not
++** good enough for your machine. (The definitions in the 'else'
++** part always works, but may waste space on machines with 64-bit
++** longs.) Probably you do not need to change this.
++*/
++#if LUAI_BITSINT >= 32
++#define LUAI_UINT32	unsigned int
++#define LUAI_INT32	int
++#define LUAI_MAXINT32	INT_MAX
++#define LUAI_UMEM	size_t
++#define LUAI_MEM	ptrdiff_t
++#else
++/* 16-bit ints */
++#define LUAI_UINT32	unsigned long
++#define LUAI_INT32	long
++#define LUAI_MAXINT32	LONG_MAX
++#define LUAI_UMEM	unsigned long
++#define LUAI_MEM	long
++#endif
++
++
++/*
++@@ LUAI_MAXCALLS limits the number of nested calls.
++** CHANGE it if you need really deep recursive calls. This limit is
++** arbitrary; its only purpose is to stop infinite recursion before
++** exhausting memory.
++*/
++#define LUAI_MAXCALLS	20000
++
++
++/*
++@@ LUAI_MAXCSTACK limits the number of Lua stack slots that a C function
++@* can use.
++** CHANGE it if you need lots of (Lua) stack space for your C
++** functions. This limit is arbitrary; its only purpose is to stop C
++** functions to consume unlimited stack space. (must be smaller than
++** -LUA_REGISTRYINDEX)
++*/
++#define LUAI_MAXCSTACK	8000
++
++
++
++/*
++** {==================================================================
++** CHANGE (to smaller values) the following definitions if your system
++** has a small C stack. (Or you may want to change them to larger
++** values if your system has a large C stack and these limits are
++** too rigid for you.) Some of these constants control the size of
++** stack-allocated arrays used by the compiler or the interpreter, while
++** others limit the maximum number of recursive calls that the compiler
++** or the interpreter can perform. Values too large may cause a C stack
++** overflow for some forms of deep constructs.
++** ===================================================================
++*/
++
++
++/*
++@@ LUAI_MAXCCALLS is the maximum depth for nested C calls (short) and
++@* syntactical nested non-terminals in a program.
++*/
++#define LUAI_MAXCCALLS		200
++
++
++/*
++@@ LUAI_MAXVARS is the maximum number of local variables per function
++@* (must be smaller than 250).
++*/
++#define LUAI_MAXVARS		200
++
++
++/*
++@@ LUAI_MAXUPVALUES is the maximum number of upvalues per function
++@* (must be smaller than 250).
++*/
++#define LUAI_MAXUPVALUES	60
++
++
++/*
++@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
++*/
++#define LUAL_BUFFERSIZE		BUFSIZ
++
++/* }================================================================== */
++
++
++
++
++/*
++** {==================================================================
++@@ LUA_NUMBER is the type of numbers in Lua.
++** CHANGE the following definitions only if you want to build Lua
++** with a number type different from double. You may also need to
++** change lua_number2int & lua_number2integer.
++** ===================================================================
++*/
++#if !defined(NO_FPU)
++#define LUA_NUMBER_DOUBLE
++#define LUA_NUMBER	double
++#else
++#define LUA_NUMBER	long
++#endif
++
++/*
++@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
++@* over a number.
++*/
++#define LUAI_UACNUMBER	LUA_NUMBER
++
++
++/*
++@@ LUA_NUMBER_SCAN is the format for reading numbers.
++@@ LUA_NUMBER_FMT is the format for writing numbers.
++@@ lua_number2str converts a number to a string.
++@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
++@@ lua_str2number converts a string to a number.
++*/
++#if !defined(NO_FPU)
++#define LUA_NUMBER_SCAN		"%lf"
++#define LUA_NUMBER_FMT		"%.14g"
++#define lua_str2number(s,p)	strtod((s), (p))
++#else
++#define LUA_NUMBER_SCAN		"%ld"
++#define LUA_NUMBER_FMT		"%ld"
++#if !defined(__KERNEL__)
++#define lua_str2number(s,p)	strtol((s), (p), 10)
++#else
++#define lua_str2number(s,p)	simple_strtol((s), (p), 10)
++#endif
++#endif
++
++#define LUAI_MAXNUMBER2STR	32 /* 16 digits, sign, point, and \0 */
++#define lua_number2str(s,n)	sprintf((s), LUA_NUMBER_FMT, (n))
++
++/*
++@@ The luai_num* macros define the primitive operations over numbers.
++*/
++#if defined(LUA_CORE)
++#define luai_numadd(a,b)	((a)+(b))
++#define luai_numsub(a,b)	((a)-(b))
++#define luai_nummul(a,b)	((a)*(b))
++#define luai_numdiv(a,b)	((a)/(b))
++#define luai_numunm(a)		(-(a))
++#define luai_numeq(a,b)		((a)==(b))
++#define luai_numlt(a,b)		((a)<(b))
++#define luai_numle(a,b)		((a)<=(b))
++#define luai_numisnan(a)	(!luai_numeq((a), (a)))
++#if !defined(NO_FPU)
++#include <math.h>
++#define luai_nummod(a,b)	((a) - floor((a)/(b))*(b))
++#define luai_numpow(a,b)	(pow(a,b))
++#else
++#define luai_nummod(a,b)	((a)%(b))
++#define luai_numpow(a,b)	luai_nummul(a,b)
++#endif
++#endif
++
++
++/*
++@@ lua_number2int is a macro to convert lua_Number to int.
++@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
++** CHANGE them if you know a faster way to convert a lua_Number to
++** int (with any rounding method and without throwing errors) in your
++** system. In Pentium machines, a naive typecast from double to int
++** in C is extremely slow, so any alternative is worth trying.
++*/
++
++/* On a Pentium, resort to a trick */
++#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
++    (defined(__i386) || defined (_M_IX86) || defined(__i386__))
++
++/* On a Microsoft compiler, use assembler */
++#if defined(_MSC_VER)
++
++#define lua_number2int(i,d)   __asm fld d   __asm fistp i
++#define lua_number2integer(i,n)		lua_number2int(i, n)
++
++/* the next trick should work on any Pentium, but sometimes clashes
++   with a DirectX idiosyncrasy */
++#else
++
++union luai_Cast { double l_d; long l_l; };
++#define lua_number2int(i,d) \
++  { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
++#define lua_number2integer(i,n)		lua_number2int(i, n)
++
++#endif
++
++
++/* this option always works, but may be slow */
++#else
++#define lua_number2int(i,d)	((i)=(int)(d))
++#define lua_number2integer(i,d)	((i)=(lua_Integer)(d))
++
++#endif
++
++/* }================================================================== */
++
++
++/*
++@@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
++** CHANGE it if your system requires alignments larger than double. (For
++** instance, if your system supports long doubles and they must be
++** aligned in 16-byte boundaries, then you should add long double in the
++** union.) Probably you do not need to change this.
++*/
++#define LUAI_USER_ALIGNMENT_T	union { double u; void *s; long l; }
++
++
++/*
++@@ LUAI_THROW/LUAI_TRY define how Lua does exception handling.
++** CHANGE them if you prefer to use longjmp/setjmp even with C++
++** or if want/don't to use _longjmp/_setjmp instead of regular
++** longjmp/setjmp. By default, Lua handles errors with exceptions when
++** compiling as C++ code, with _longjmp/_setjmp when asked to use them,
++** and with longjmp/setjmp otherwise.
++*/
++#if defined(__KERNEL__)
++#undef LUA_USE_ULONGJMP
++#endif
++
++#if defined(__cplusplus)
++/* C++ exceptions */
++#define LUAI_THROW(L,c)	throw(c)
++#define LUAI_TRY(L,c,a)	try { a } catch(...) \
++	{ if ((c)->status == 0) (c)->status = -1; }
++#define luai_jmpbuf	int  /* dummy variable */
++
++#elif defined(LUA_USE_ULONGJMP)
++/* in Unix, try _longjmp/_setjmp (more efficient) */
++#define LUAI_THROW(L,c)	_longjmp((c)->b, 1)
++#define LUAI_TRY(L,c,a)	if (_setjmp((c)->b) == 0) { a }
++#define luai_jmpbuf	jmp_buf
++
++#else
++/* default handling with long jumps */
++#define LUAI_THROW(L,c)	longjmp((c)->b, 1)
++#define LUAI_TRY(L,c,a)	if (setjmp((c)->b) == 0) { a }
++#define luai_jmpbuf	jmp_buf
++
++#endif
++
++
++/*
++@@ LUA_MAXCAPTURES is the maximum number of captures that a pattern
++@* can do during pattern-matching.
++** CHANGE it if you need more captures. This limit is arbitrary.
++*/
++#define LUA_MAXCAPTURES		32
++
++
++/*
++@@ lua_tmpnam is the function that the OS library uses to create a
++@* temporary name.
++@@ LUA_TMPNAMBUFSIZE is the maximum size of a name created by lua_tmpnam.
++** CHANGE them if you have an alternative to tmpnam (which is considered
++** insecure) or if you want the original tmpnam anyway.  By default, Lua
++** uses tmpnam except when POSIX is available, where it uses mkstemp.
++*/
++#if defined(loslib_c) || defined(luaall_c)
++
++#if defined(LUA_USE_MKSTEMP)
++#include <unistd.h>
++#define LUA_TMPNAMBUFSIZE	32
++#define lua_tmpnam(b,e)	{ \
++	strcpy(b, "/tmp/lua_XXXXXX"); \
++	e = mkstemp(b); \
++	if (e != -1) close(e); \
++	e = (e == -1); }
++
++#else
++#define LUA_TMPNAMBUFSIZE	L_tmpnam
++#define lua_tmpnam(b,e)		{ e = (tmpnam(b) == NULL); }
++#endif
++
++#endif
++
++
++/*
++@@ lua_popen spawns a new process connected to the current one through
++@* the file streams.
++** CHANGE it if you have a way to implement it in your system.
++*/
++#if defined(LUA_USE_POPEN)
++
++#define lua_popen(L,c,m)	((void)L, fflush(NULL), popen(c,m))
++#define lua_pclose(L,file)	((void)L, (pclose(file) != -1))
++
++#elif defined(LUA_WIN)
++
++#define lua_popen(L,c,m)	((void)L, _popen(c,m))
++#define lua_pclose(L,file)	((void)L, (_pclose(file) != -1))
++
++#else
++
++#define lua_popen(L,c,m)	((void)((void)c, m),  \
++		luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
++#define lua_pclose(L,file)		((void)((void)L, file), 0)
++
++#endif
++
++/*
++@@ LUA_DL_* define which dynamic-library system Lua should use.
++** CHANGE here if Lua has problems choosing the appropriate
++** dynamic-library system for your platform (either Windows' DLL, Mac's
++** dyld, or Unix's dlopen). If your system is some kind of Unix, there
++** is a good chance that it has dlopen, so LUA_DL_DLOPEN will work for
++** it.  To use dlopen you also need to adapt the src/Makefile (probably
++** adding -ldl to the linker options), so Lua does not select it
++** automatically.  (When you change the makefile to add -ldl, you must
++** also add -DLUA_USE_DLOPEN.)
++** If you do not want any kind of dynamic library, undefine all these
++** options.
++** By default, _WIN32 gets LUA_DL_DLL and MAC OS X gets LUA_DL_DYLD.
++*/
++#if defined(LUA_USE_DLOPEN)
++#define LUA_DL_DLOPEN
++#endif
++
++#if defined(LUA_WIN)
++#define LUA_DL_DLL
++#endif
++
++
++/*
++@@ LUAI_EXTRASPACE allows you to add user-specific data in a lua_State
++@* (the data goes just *before* the lua_State pointer).
++** CHANGE (define) this if you really need that. This value must be
++** a multiple of the maximum alignment required for your machine.
++*/
++#define LUAI_EXTRASPACE		0
++
++
++/*
++@@ luai_userstate* allow user-specific actions on threads.
++** CHANGE them if you defined LUAI_EXTRASPACE and need to do something
++** extra when a thread is created/deleted/resumed/yielded.
++*/
++#define luai_userstateopen(L)		((void)L)
++#define luai_userstateclose(L)		((void)L)
++#define luai_userstatethread(L,L1)	((void)L)
++#define luai_userstatefree(L)		((void)L)
++#define luai_userstateresume(L,n)	((void)L)
++#define luai_userstateyield(L,n)	((void)L)
++
++
++/*
++@@ LUA_INTFRMLEN is the length modifier for integer conversions
++@* in 'string.format'.
++@@ LUA_INTFRM_T is the integer type correspoding to the previous length
++@* modifier.
++** CHANGE them if your system supports long long or does not support long.
++*/
++
++#if defined(LUA_USELONGLONG)
++
++#define LUA_INTFRMLEN		"ll"
++#define LUA_INTFRM_T		long long
++
++#else
++
++#define LUA_INTFRMLEN		"l"
++#define LUA_INTFRM_T		long
++
++#endif
++
++/* =================================================================== */
++
++/*
++** Local configuration. You can use this space to add your redefinitions
++** without modifying the main part of the file.
++*/
++
++
++
++#endif
++
+--- /dev/null
++++ b/extensions/LUA/lua/lua.h
+@@ -0,0 +1,387 @@
++/*
++** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $
++** Lua - An Extensible Extension Language
++** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
++** See Copyright Notice at the end of this file
++*/
++
++
++#ifndef lua_h
++#define lua_h
++
++#include <stdarg.h>
++#include <stddef.h>
++
++#include "luaconf.h"
++
++
++#define LUA_VERSION	"Lua 5.1"
++#define LUA_RELEASE	"Lua 5.1.4"
++#define LUA_VERSION_NUM	501
++#define LUA_COPYRIGHT	"Copyright (C) 1994-2008 Lua.org, PUC-Rio"
++#define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
++
++
++/* mark for precompiled code (`<esc>Lua') */
++#define	LUA_SIGNATURE	"\033Lua"
++
++/* option for multiple returns in `lua_pcall' and `lua_call' */
++#define LUA_MULTRET	(-1)
++
++
++/*
++** pseudo-indices
++*/
++#define LUA_REGISTRYINDEX	(-10000)
++#define LUA_ENVIRONINDEX	(-10001)
++#define LUA_GLOBALSINDEX	(-10002)
++#define lua_upvalueindex(i)	(LUA_GLOBALSINDEX-(i))
++
++
++/* thread status; 0 is OK */
++#define LUA_YIELD	1
++#define LUA_ERRRUN	2
++#define LUA_ERRSYNTAX	3
++#define LUA_ERRMEM	4
++#define LUA_ERRERR	5
++
++
++typedef struct lua_State lua_State;
++
++typedef int (*lua_CFunction) (lua_State *L);
++
++
++/*
++** functions that read/write blocks when loading/dumping Lua chunks
++*/
++typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
++
++typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud);
++
++
++/*
++** prototype for memory-allocation functions
++*/
++typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
++
++
++/*
++** basic types
++*/
++#define LUA_TNONE		(-1)
++
++#define LUA_TNIL		0
++#define LUA_TBOOLEAN		1
++#define LUA_TLIGHTUSERDATA	2
++#define LUA_TNUMBER		3
++#define LUA_TSTRING		4
++#define LUA_TTABLE		5
++#define LUA_TFUNCTION		6
++#define LUA_TUSERDATA		7
++#define LUA_TTHREAD		8
++
++
++
++/* minimum Lua stack available to a C function */
++#define LUA_MINSTACK	20
++
++
++/*
++** generic extra include file
++*/
++#if defined(LUA_USER_H)
++#include LUA_USER_H
++#endif
++
++
++/* type of numbers in Lua */
++typedef LUA_NUMBER lua_Number;
++
++
++/* type for integer functions */
++typedef LUA_INTEGER lua_Integer;
++
++
++
++/*
++** state manipulation
++*/
++LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
++LUA_API void       (lua_close) (lua_State *L);
++LUA_API lua_State *(lua_newthread) (lua_State *L);
++
++LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
++
++
++/*
++** basic stack manipulation
++*/
++LUA_API int   (lua_gettop) (lua_State *L);
++LUA_API void  (lua_settop) (lua_State *L, int idx);
++LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
++LUA_API void  (lua_remove) (lua_State *L, int idx);
++LUA_API void  (lua_insert) (lua_State *L, int idx);
++LUA_API void  (lua_replace) (lua_State *L, int idx);
++LUA_API int   (lua_checkstack) (lua_State *L, int sz);
++
++LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
++
++
++/*
++** access functions (stack -> C)
++*/
++
++LUA_API int             (lua_isnumber) (lua_State *L, int idx);
++LUA_API int             (lua_isstring) (lua_State *L, int idx);
++LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
++LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
++LUA_API int             (lua_type) (lua_State *L, int idx);
++LUA_API const char     *(lua_typename) (lua_State *L, int tp);
++
++LUA_API int            (lua_equal) (lua_State *L, int idx1, int idx2);
++LUA_API int            (lua_rawequal) (lua_State *L, int idx1, int idx2);
++LUA_API int            (lua_lessthan) (lua_State *L, int idx1, int idx2);
++
++LUA_API lua_Number      (lua_tonumber) (lua_State *L, int idx);
++LUA_API lua_Integer     (lua_tointeger) (lua_State *L, int idx);
++LUA_API int             (lua_toboolean) (lua_State *L, int idx);
++LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
++LUA_API size_t          (lua_objlen) (lua_State *L, int idx);
++LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
++LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
++LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
++LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
++
++
++/*
++** push functions (C -> stack)
++*/
++LUA_API void  (lua_pushnil) (lua_State *L);
++LUA_API void  (lua_pushnumber) (lua_State *L, lua_Number n);
++LUA_API void  (lua_pushinteger) (lua_State *L, lua_Integer n);
++LUA_API void  (lua_pushlstring) (lua_State *L, const char *s, size_t l);
++LUA_API void  (lua_pushstring) (lua_State *L, const char *s);
++LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
++                                                      va_list argp);
++LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
++LUA_API void  (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
++LUA_API void  (lua_pushboolean) (lua_State *L, int b);
++LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
++LUA_API int   (lua_pushthread) (lua_State *L);
++
++
++/*
++** get functions (Lua -> stack)
++*/
++LUA_API void  (lua_gettable) (lua_State *L, int idx);
++LUA_API void  (lua_getfield) (lua_State *L, int idx, const char *k);
++LUA_API void  (lua_rawget) (lua_State *L, int idx);
++LUA_API void  (lua_rawgeti) (lua_State *L, int idx, int n);
++LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
++LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
++LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
++LUA_API void  (lua_getfenv) (lua_State *L, int idx);
++
++
++/*
++** set functions (stack -> Lua)
++*/
++LUA_API void  (lua_settable) (lua_State *L, int idx);
++LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
++LUA_API void  (lua_rawset) (lua_State *L, int idx);
++LUA_API void  (lua_rawseti) (lua_State *L, int idx, int n);
++LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
++LUA_API int   (lua_setfenv) (lua_State *L, int idx);
++
++
++/*
++** `load' and `call' functions (load and run Lua code)
++*/
++LUA_API void  (lua_call) (lua_State *L, int nargs, int nresults);
++LUA_API int   (lua_pcall) (lua_State *L, int nargs, int nresults, int errfunc);
++LUA_API int   (lua_cpcall) (lua_State *L, lua_CFunction func, void *ud);
++LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
++                                        const char *chunkname);
++
++LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
++
++
++/*
++** coroutine functions
++*/
++LUA_API int  (lua_yield) (lua_State *L, int nresults);
++LUA_API int  (lua_resume) (lua_State *L, int narg);
++LUA_API int  (lua_status) (lua_State *L);
++
++/*
++** garbage-collection function and options
++*/
++
++#define LUA_GCSTOP		0
++#define LUA_GCRESTART		1
++#define LUA_GCCOLLECT		2
++#define LUA_GCCOUNT		3
++#define LUA_GCCOUNTB		4
++#define LUA_GCSTEP		5
++#define LUA_GCSETPAUSE		6
++#define LUA_GCSETSTEPMUL	7
++
++LUA_API int (lua_gc) (lua_State *L, int what, int data);
++
++
++/*
++** miscellaneous functions
++*/
++
++LUA_API int   (lua_error) (lua_State *L);
++
++LUA_API int   (lua_next) (lua_State *L, int idx);
++
++LUA_API void  (lua_concat) (lua_State *L, int n);
++
++LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
++LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
++
++
++
++/* 
++** ===============================================================
++** some useful macros
++** ===============================================================
++*/
++
++#define lua_pop(L,n)		lua_settop(L, -(n)-1)
++
++#define lua_newtable(L)		lua_createtable(L, 0, 0)
++
++#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
++
++#define lua_pushcfunction(L,f)	lua_pushcclosure(L, (f), 0)
++
++#define lua_strlen(L,i)		lua_objlen(L, (i))
++
++#define lua_isfunction(L,n)	(lua_type(L, (n)) == LUA_TFUNCTION)
++#define lua_istable(L,n)	(lua_type(L, (n)) == LUA_TTABLE)
++#define lua_islightuserdata(L,n)	(lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
++#define lua_isnil(L,n)		(lua_type(L, (n)) == LUA_TNIL)
++#define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
++#define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
++#define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
++#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
++
++#define lua_pushliteral(L, s)	\
++	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
++
++#define lua_setglobal(L,s)	lua_setfield(L, LUA_GLOBALSINDEX, (s))
++#define lua_getglobal(L,s)	lua_getfield(L, LUA_GLOBALSINDEX, (s))
++
++#define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
++
++
++
++/*
++** compatibility macros and functions
++*/
++
++#define lua_open()	luaL_newstate()
++
++#define lua_getregistry(L)	lua_pushvalue(L, LUA_REGISTRYINDEX)
++
++#define lua_getgccount(L)	lua_gc(L, LUA_GCCOUNT, 0)
++
++#define lua_Chunkreader		lua_Reader
++#define lua_Chunkwriter		lua_Writer
++
++
++/* hack */
++LUA_API void lua_setlevel	(lua_State *from, lua_State *to);
++
++
++/*
++** {======================================================================
++** Debug API
++** =======================================================================
++*/
++
++
++/*
++** Event codes
++*/
++#define LUA_HOOKCALL	0
++#define LUA_HOOKRET	1
++#define LUA_HOOKLINE	2
++#define LUA_HOOKCOUNT	3
++#define LUA_HOOKTAILRET 4
++
++
++/*
++** Event masks
++*/
++#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
++#define LUA_MASKRET	(1 << LUA_HOOKRET)
++#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
++#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
++
++typedef struct lua_Debug lua_Debug;  /* activation record */
++
++
++/* Functions to be called by the debuger in specific events */
++typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
++
++
++LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
++LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
++LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
++LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
++LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n);
++LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n);
++
++LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count);
++LUA_API lua_Hook lua_gethook (lua_State *L);
++LUA_API int lua_gethookmask (lua_State *L);
++LUA_API int lua_gethookcount (lua_State *L);
++
++
++struct lua_Debug {
++  int event;
++  const char *name;	/* (n) */
++  const char *namewhat;	/* (n) `global', `local', `field', `method' */
++  const char *what;	/* (S) `Lua', `C', `main', `tail' */
++  const char *source;	/* (S) */
++  int currentline;	/* (l) */
++  int nups;		/* (u) number of upvalues */
++  int linedefined;	/* (S) */
++  int lastlinedefined;	/* (S) */
++  char short_src[LUA_IDSIZE]; /* (S) */
++  /* private part */
++  int i_ci;  /* active function */
++};
++
++/* }====================================================================== */
++
++
++/******************************************************************************
++* Copyright (C) 1994-2008 Lua.org, PUC-Rio.  All rights reserved.
++*
++* Permission is hereby granted, free of charge, to any person obtaining
++* a copy of this software and associated documentation files (the
++* "Software"), to deal in the Software without restriction, including
++* without limitation the rights to use, copy, modify, merge, publish,
++* distribute, sublicense, and/or sell copies of the Software, and to
++* permit persons to whom the Software is furnished to do so, subject to
++* the following conditions:
++*
++* The above copyright notice and this permission notice shall be
++* included in all copies or substantial portions of the Software.
++*
++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++******************************************************************************/
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lualib.h
+@@ -0,0 +1,55 @@
++/*
++** $Id: lualib.h,v 1.36.1.1 2007/12/27 13:02:25 roberto Exp $
++** Lua standard libraries
++** See Copyright Notice in lua.h
++*/
++
++
++#ifndef lualib_h
++#define lualib_h
++
++#include "lua.h"
++
++
++/* Key to file-handle type */
++#define LUA_FILEHANDLE		"FILE*"
++
++
++#define LUA_COLIBNAME	"coroutine"
++LUALIB_API int (luaopen_base) (lua_State *L);
++
++#define LUA_TABLIBNAME	"table"
++LUALIB_API int (luaopen_table) (lua_State *L);
++/*
++#define LUA_IOLIBNAME	"io"
++LUALIB_API int (luaopen_io) (lua_State *L);
++
++#define LUA_OSLIBNAME	"os"
++LUALIB_API int (luaopen_os) (lua_State *L);
++*/
++
++#define LUA_STRLIBNAME	"string"
++LUALIB_API int (luaopen_string) (lua_State *L);
++
++/*
++#define LUA_MATHLIBNAME	"math"
++LUALIB_API int (luaopen_math) (lua_State *L);
++
++#define LUA_DBLIBNAME	"debug"
++LUALIB_API int (luaopen_debug) (lua_State *L);
++
++#define LUA_LOADLIBNAME	"package"
++LUALIB_API int (luaopen_package) (lua_State *L);
++*/
++
++/* open all previous libraries */
++LUALIB_API void (luaL_openlibs) (lua_State *L);
++
++
++
++#ifndef lua_assert
++#define lua_assert(x)	((void)0)
++#endif
++
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lundump.c
+@@ -0,0 +1,227 @@
++/*
++** $Id: lundump.c,v 2.7.1.4 2008/04/04 19:51:41 roberto Exp $
++** load precompiled Lua chunks
++** See Copyright Notice in lua.h
++*/
++
++#include <string.h>
++
++#define lundump_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "lmem.h"
++#include "lobject.h"
++#include "lstring.h"
++#include "lundump.h"
++#include "lzio.h"
++
++typedef struct {
++ lua_State* L;
++ ZIO* Z;
++ Mbuffer* b;
++ const char* name;
++} LoadState;
++
++#ifdef LUAC_TRUST_BINARIES
++#define IF(c,s)
++#define error(S,s)
++#else
++#define IF(c,s)		if (c) error(S,s)
++
++static void error(LoadState* S, const char* why)
++{
++ luaO_pushfstring(S->L,"%s: %s in precompiled chunk",S->name,why);
++ luaD_throw(S->L,LUA_ERRSYNTAX);
++}
++#endif
++
++#define LoadMem(S,b,n,size)	LoadBlock(S,b,(n)*(size))
++#define	LoadByte(S)		(lu_byte)LoadChar(S)
++#define LoadVar(S,x)		LoadMem(S,&x,1,sizeof(x))
++#define LoadVector(S,b,n,size)	LoadMem(S,b,n,size)
++
++static void LoadBlock(LoadState* S, void* b, size_t size)
++{
++ size_t r=luaZ_read(S->Z,b,size);
++ IF (r!=0, "unexpected end");
++}
++
++static int LoadChar(LoadState* S)
++{
++ char x;
++ LoadVar(S,x);
++ return x;
++}
++
++static int LoadInt(LoadState* S)
++{
++ int x;
++ LoadVar(S,x);
++ IF (x<0, "bad integer");
++ return x;
++}
++
++static lua_Number LoadNumber(LoadState* S)
++{
++ lua_Number x;
++ LoadVar(S,x);
++ return x;
++}
++
++static TString* LoadString(LoadState* S)
++{
++ size_t size;
++ LoadVar(S,size);
++ if (size==0)
++  return NULL;
++ else
++ {
++  char* s=luaZ_openspace(S->L,S->b,size);
++  LoadBlock(S,s,size);
++  return luaS_newlstr(S->L,s,size-1);		/* remove trailing '\0' */
++ }
++}
++
++static void LoadCode(LoadState* S, Proto* f)
++{
++ int n=LoadInt(S);
++ f->code=luaM_newvector(S->L,n,Instruction);
++ f->sizecode=n;
++ LoadVector(S,f->code,n,sizeof(Instruction));
++}
++
++static Proto* LoadFunction(LoadState* S, TString* p);
++
++static void LoadConstants(LoadState* S, Proto* f)
++{
++ int i,n;
++ n=LoadInt(S);
++ f->k=luaM_newvector(S->L,n,TValue);
++ f->sizek=n;
++ for (i=0; i<n; i++) setnilvalue(&f->k[i]);
++ for (i=0; i<n; i++)
++ {
++  TValue* o=&f->k[i];
++  int t=LoadChar(S);
++  switch (t)
++  {
++   case LUA_TNIL:
++   	setnilvalue(o);
++	break;
++   case LUA_TBOOLEAN:
++   	setbvalue(o,LoadChar(S)!=0);
++	break;
++   case LUA_TNUMBER:
++	setnvalue(o,LoadNumber(S));
++	break;
++   case LUA_TSTRING:
++	setsvalue2n(S->L,o,LoadString(S));
++	break;
++   default:
++	error(S,"bad constant");
++	break;
++  }
++ }
++ n=LoadInt(S);
++ f->p=luaM_newvector(S->L,n,Proto*);
++ f->sizep=n;
++ for (i=0; i<n; i++) f->p[i]=NULL;
++ for (i=0; i<n; i++) f->p[i]=LoadFunction(S,f->source);
++}
++
++static void LoadDebug(LoadState* S, Proto* f)
++{
++ int i,n;
++ n=LoadInt(S);
++ f->lineinfo=luaM_newvector(S->L,n,int);
++ f->sizelineinfo=n;
++ LoadVector(S,f->lineinfo,n,sizeof(int));
++ n=LoadInt(S);
++ f->locvars=luaM_newvector(S->L,n,LocVar);
++ f->sizelocvars=n;
++ for (i=0; i<n; i++) f->locvars[i].varname=NULL;
++ for (i=0; i<n; i++)
++ {
++  f->locvars[i].varname=LoadString(S);
++  f->locvars[i].startpc=LoadInt(S);
++  f->locvars[i].endpc=LoadInt(S);
++ }
++ n=LoadInt(S);
++ f->upvalues=luaM_newvector(S->L,n,TString*);
++ f->sizeupvalues=n;
++ for (i=0; i<n; i++) f->upvalues[i]=NULL;
++ for (i=0; i<n; i++) f->upvalues[i]=LoadString(S);
++}
++
++static Proto* LoadFunction(LoadState* S, TString* p)
++{
++ Proto* f;
++ if (++S->L->nCcalls > LUAI_MAXCCALLS) error(S,"code too deep");
++ f=luaF_newproto(S->L);
++ setptvalue2s(S->L,S->L->top,f); incr_top(S->L);
++ f->source=LoadString(S); if (f->source==NULL) f->source=p;
++ f->linedefined=LoadInt(S);
++ f->lastlinedefined=LoadInt(S);
++ f->nups=LoadByte(S);
++ f->numparams=LoadByte(S);
++ f->is_vararg=LoadByte(S);
++ f->maxstacksize=LoadByte(S);
++ LoadCode(S,f);
++ LoadConstants(S,f);
++ LoadDebug(S,f);
++ IF (!luaG_checkcode(f), "bad code");
++ S->L->top--;
++ S->L->nCcalls--;
++ return f;
++}
++
++static void LoadHeader(LoadState* S)
++{
++ char h[LUAC_HEADERSIZE];
++ char s[LUAC_HEADERSIZE];
++ luaU_header(h);
++ LoadBlock(S,s,LUAC_HEADERSIZE);
++ IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
++}
++
++/*
++** load precompiled chunk
++*/
++Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
++{
++ LoadState S;
++ if (*name=='@' || *name=='=')
++  S.name=name+1;
++ else if (*name==LUA_SIGNATURE[0])
++  S.name="binary string";
++ else
++  S.name=name;
++ S.L=L;
++ S.Z=Z;
++ S.b=buff;
++ LoadHeader(&S);
++ return LoadFunction(&S,luaS_newliteral(L,"=?"));
++}
++
++/*
++* make header
++*/
++void luaU_header (char* h)
++{
++ int x=1;
++ memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-1);
++ h+=sizeof(LUA_SIGNATURE)-1;
++ *h++=(char)LUAC_VERSION;
++ *h++=(char)LUAC_FORMAT;
++ *h++=(char)*(char*)&x;				/* endianness */
++ *h++=(char)sizeof(int);
++ *h++=(char)sizeof(size_t);
++ *h++=(char)sizeof(Instruction);
++ *h++=(char)sizeof(lua_Number);
++ *h++=(char)(((lua_Number)0.5)==0);		/* is lua_Number integral? */
++}
+--- /dev/null
++++ b/extensions/LUA/lua/lundump.h
+@@ -0,0 +1,36 @@
++/*
++** $Id: lundump.h,v 1.37.1.1 2007/12/27 13:02:25 roberto Exp $
++** load precompiled Lua chunks
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lundump_h
++#define lundump_h
++
++#include "lobject.h"
++#include "lzio.h"
++
++/* load one chunk; from lundump.c */
++LUAI_FUNC Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name);
++
++/* make header; from lundump.c */
++LUAI_FUNC void luaU_header (char* h);
++
++/* dump one chunk; from ldump.c */
++LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
++
++#ifdef luac_c
++/* print one chunk; from print.c */
++LUAI_FUNC void luaU_print (const Proto* f, int full);
++#endif
++
++/* for header of binary files -- this is Lua 5.1 */
++#define LUAC_VERSION		0x51
++
++/* for header of binary files -- this is the official format */
++#define LUAC_FORMAT		0
++
++/* size of header of binary files */
++#define LUAC_HEADERSIZE		12
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lvm.c
+@@ -0,0 +1,762 @@
++/*
++** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
++** Lua virtual machine
++** See Copyright Notice in lua.h
++*/
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define lvm_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "ldebug.h"
++#include "ldo.h"
++#include "lfunc.h"
++#include "lgc.h"
++#include "lobject.h"
++#include "lopcodes.h"
++#include "lstate.h"
++#include "lstring.h"
++#include "ltable.h"
++#include "ltm.h"
++#include "lvm.h"
++
++
++
++/* limit for table tag-method chains (to avoid loops) */
++#define MAXTAGLOOP	100
++
++
++const TValue *luaV_tonumber (const TValue *obj, TValue *n) {
++  lua_Number num;
++  if (ttisnumber(obj)) return obj;
++  if (ttisstring(obj) && luaO_str2d(svalue(obj), &num)) {
++    setnvalue(n, num);
++    return n;
++  }
++  else
++    return NULL;
++}
++
++
++int luaV_tostring (lua_State *L, StkId obj) {
++  if (!ttisnumber(obj))
++    return 0;
++  else {
++    char s[LUAI_MAXNUMBER2STR];
++    lua_Number n = nvalue(obj);
++    lua_number2str(s, n);
++    setsvalue2s(L, obj, luaS_new(L, s));
++    return 1;
++  }
++}
++
++
++static void traceexec (lua_State *L, const Instruction *pc) {
++  lu_byte mask = L->hookmask;
++  const Instruction *oldpc = L->savedpc;
++  L->savedpc = pc;
++  if ((mask & LUA_MASKCOUNT) && L->hookcount == 0) {
++    resethookcount(L);
++    luaD_callhook(L, LUA_HOOKCOUNT, -1);
++  }
++  if (mask & LUA_MASKLINE) {
++    Proto *p = ci_func(L->ci)->l.p;
++    int npc = pcRel(pc, p);
++    int newline = getline(p, npc);
++    /* call linehook when enter a new function, when jump back (loop),
++       or when enter a new line */
++    if (npc == 0 || pc <= oldpc || newline != getline(p, pcRel(oldpc, p)))
++      luaD_callhook(L, LUA_HOOKLINE, newline);
++  }
++}
++
++
++static void callTMres (lua_State *L, StkId res, const TValue *f,
++                        const TValue *p1, const TValue *p2) {
++  ptrdiff_t result = savestack(L, res);
++  setobj2s(L, L->top, f);  /* push function */
++  setobj2s(L, L->top+1, p1);  /* 1st argument */
++  setobj2s(L, L->top+2, p2);  /* 2nd argument */
++  luaD_checkstack(L, 3);
++  L->top += 3;
++  luaD_call(L, L->top - 3, 1);
++  res = restorestack(L, result);
++  L->top--;
++  setobjs2s(L, res, L->top);
++}
++
++
++
++static void callTM (lua_State *L, const TValue *f, const TValue *p1,
++                    const TValue *p2, const TValue *p3) {
++  setobj2s(L, L->top, f);  /* push function */
++  setobj2s(L, L->top+1, p1);  /* 1st argument */
++  setobj2s(L, L->top+2, p2);  /* 2nd argument */
++  setobj2s(L, L->top+3, p3);  /* 3th argument */
++  luaD_checkstack(L, 4);
++  L->top += 4;
++  luaD_call(L, L->top - 4, 0);
++}
++
++
++void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) {
++  int loop;
++  for (loop = 0; loop < MAXTAGLOOP; loop++) {
++    const TValue *tm;
++    if (ttistable(t)) {  /* `t' is a table? */
++      Table *h = hvalue(t);
++      const TValue *res = luaH_get(h, key); /* do a primitive get */
++      if (!ttisnil(res) ||  /* result is no nil? */
++          (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
++        setobj2s(L, val, res);
++        return;
++      }
++      /* else will try the tag method */
++    }
++    else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX)))
++      luaG_typeerror(L, t, "index");
++    if (ttisfunction(tm)) {
++      callTMres(L, val, tm, t, key);
++      return;
++    }
++    t = tm;  /* else repeat with `tm' */ 
++  }
++  luaG_runerror(L, "loop in gettable");
++}
++
++
++void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
++  int loop;
++  for (loop = 0; loop < MAXTAGLOOP; loop++) {
++    const TValue *tm;
++    if (ttistable(t)) {  /* `t' is a table? */
++      Table *h = hvalue(t);
++      TValue *oldval = luaH_set(L, h, key); /* do a primitive set */
++      if (!ttisnil(oldval) ||  /* result is no nil? */
++          (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */
++        setobj2t(L, oldval, val);
++        luaC_barriert(L, h, val);
++        return;
++      }
++      /* else will try the tag method */
++    }
++    else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
++      luaG_typeerror(L, t, "index");
++    if (ttisfunction(tm)) {
++      callTM(L, tm, t, key, val);
++      return;
++    }
++    t = tm;  /* else repeat with `tm' */ 
++  }
++  luaG_runerror(L, "loop in settable");
++}
++
++
++static int call_binTM (lua_State *L, const TValue *p1, const TValue *p2,
++                       StkId res, TMS event) {
++  const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
++  if (ttisnil(tm))
++    tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
++  if (ttisnil(tm)) return 0;
++  callTMres(L, res, tm, p1, p2);
++  return 1;
++}
++
++
++static const TValue *get_compTM (lua_State *L, Table *mt1, Table *mt2,
++                                  TMS event) {
++  const TValue *tm1 = fasttm(L, mt1, event);
++  const TValue *tm2;
++  if (tm1 == NULL) return NULL;  /* no metamethod */
++  if (mt1 == mt2) return tm1;  /* same metatables => same metamethods */
++  tm2 = fasttm(L, mt2, event);
++  if (tm2 == NULL) return NULL;  /* no metamethod */
++  if (luaO_rawequalObj(tm1, tm2))  /* same metamethods? */
++    return tm1;
++  return NULL;
++}
++
++
++static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2,
++                         TMS event) {
++  const TValue *tm1 = luaT_gettmbyobj(L, p1, event);
++  const TValue *tm2;
++  if (ttisnil(tm1)) return -1;  /* no metamethod? */
++  tm2 = luaT_gettmbyobj(L, p2, event);
++  if (!luaO_rawequalObj(tm1, tm2))  /* different metamethods? */
++    return -1;
++  callTMres(L, L->top, tm1, p1, p2);
++  return !l_isfalse(L->top);
++}
++
++
++static int l_strcmp (const TString *ls, const TString *rs) {
++  const char *l = getstr(ls);
++  size_t ll = ls->tsv.len;
++  const char *r = getstr(rs);
++  size_t lr = rs->tsv.len;
++  for (;;) {
++    int temp = strcoll(l, r);
++    if (temp != 0) return temp;
++    else {  /* strings are equal up to a `\0' */
++      size_t len = strlen(l);  /* index of first `\0' in both strings */
++      if (len == lr)  /* r is finished? */
++        return (len == ll) ? 0 : 1;
++      else if (len == ll)  /* l is finished? */
++        return -1;  /* l is smaller than r (because r is not finished) */
++      /* both strings longer than `len'; go on comparing (after the `\0') */
++      len++;
++      l += len; ll -= len; r += len; lr -= len;
++    }
++  }
++}
++
++
++int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
++  int res;
++  if (ttype(l) != ttype(r))
++    return luaG_ordererror(L, l, r);
++  else if (ttisnumber(l))
++    return luai_numlt(nvalue(l), nvalue(r));
++  else if (ttisstring(l))
++    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
++  else if ((res = call_orderTM(L, l, r, TM_LT)) != -1)
++    return res;
++  return luaG_ordererror(L, l, r);
++}
++
++
++static int lessequal (lua_State *L, const TValue *l, const TValue *r) {
++  int res;
++  if (ttype(l) != ttype(r))
++    return luaG_ordererror(L, l, r);
++  else if (ttisnumber(l))
++    return luai_numle(nvalue(l), nvalue(r));
++  else if (ttisstring(l))
++    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
++  else if ((res = call_orderTM(L, l, r, TM_LE)) != -1)  /* first try `le' */
++    return res;
++  else if ((res = call_orderTM(L, r, l, TM_LT)) != -1)  /* else try `lt' */
++    return !res;
++  return luaG_ordererror(L, l, r);
++}
++
++
++int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2) {
++  const TValue *tm;
++  lua_assert(ttype(t1) == ttype(t2));
++  switch (ttype(t1)) {
++    case LUA_TNIL: return 1;
++    case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2));
++    case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2);  /* true must be 1 !! */
++    case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
++    case LUA_TUSERDATA: {
++      if (uvalue(t1) == uvalue(t2)) return 1;
++      tm = get_compTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable,
++                         TM_EQ);
++      break;  /* will try TM */
++    }
++    case LUA_TTABLE: {
++      if (hvalue(t1) == hvalue(t2)) return 1;
++      tm = get_compTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
++      break;  /* will try TM */
++    }
++    default: return gcvalue(t1) == gcvalue(t2);
++  }
++  if (tm == NULL) return 0;  /* no TM? */
++  callTMres(L, L->top, tm, t1, t2);  /* call TM */
++  return !l_isfalse(L->top);
++}
++
++
++void luaV_concat (lua_State *L, int total, int last) {
++  do {
++    StkId top = L->base + last + 1;
++    int n = 2;  /* number of elements handled in this pass (at least 2) */
++    if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) {
++      if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT))
++        luaG_concaterror(L, top-2, top-1);
++    } else if (tsvalue(top-1)->len == 0)  /* second op is empty? */
++      (void)tostring(L, top - 2);  /* result is first op (as string) */
++    else {
++      /* at least two string values; get as many as possible */
++      size_t tl = tsvalue(top-1)->len;
++      char *buffer;
++      int i;
++      /* collect total length */
++      for (n = 1; n < total && tostring(L, top-n-1); n++) {
++        size_t l = tsvalue(top-n-1)->len;
++        if (l >= MAX_SIZET - tl) luaG_runerror(L, "string length overflow");
++        tl += l;
++      }
++      buffer = luaZ_openspace(L, &G(L)->buff, tl);
++      tl = 0;
++      for (i=n; i>0; i--) {  /* concat all strings */
++        size_t l = tsvalue(top-i)->len;
++        memcpy(buffer+tl, svalue(top-i), l);
++        tl += l;
++      }
++      setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl));
++    }
++    total -= n-1;  /* got `n' strings to create 1 new */
++    last -= n-1;
++  } while (total > 1);  /* repeat until only 1 result left */
++}
++
++
++static void Arith (lua_State *L, StkId ra, const TValue *rb,
++                   const TValue *rc, TMS op) {
++  TValue tempb, tempc;
++  const TValue *b, *c;
++  if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
++      (c = luaV_tonumber(rc, &tempc)) != NULL) {
++    lua_Number nb = nvalue(b), nc = nvalue(c);
++    switch (op) {
++      case TM_ADD: setnvalue(ra, luai_numadd(nb, nc)); break;
++      case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); break;
++      case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); break;
++      case TM_DIV: setnvalue(ra, luai_numdiv(nb, nc)); break;
++      case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); break;
++      case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break;
++      case TM_UNM: setnvalue(ra, luai_numunm(nb)); break;
++      default: lua_assert(0); break;
++    }
++  }
++  else if (!call_binTM(L, rb, rc, ra, op))
++    luaG_aritherror(L, rb, rc);
++}
++
++
++
++/*
++** some macros for common tasks in `luaV_execute'
++*/
++
++#define runtime_check(L, c)	{ if (!(c)) break; }
++
++#define RA(i)	(base+GETARG_A(i))
++/* to be used after possible stack reallocation */
++#define RB(i)	check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i))
++#define RC(i)	check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i))
++#define RKB(i)	check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \
++	ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i))
++#define RKC(i)	check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \
++	ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i))
++#define KBx(i)	check_exp(getBMode(GET_OPCODE(i)) == OpArgK, k+GETARG_Bx(i))
++
++
++#define dojump(L,pc,i)	{(pc) += (i); luai_threadyield(L);}
++
++
++#define Protect(x)	{ L->savedpc = pc; {x;}; base = L->base; }
++
++
++#define arith_op(op,tm) { \
++        TValue *rb = RKB(i); \
++        TValue *rc = RKC(i); \
++        if (ttisnumber(rb) && ttisnumber(rc)) { \
++          lua_Number nb = nvalue(rb), nc = nvalue(rc); \
++          setnvalue(ra, op(nb, nc)); \
++        } \
++        else \
++          Protect(Arith(L, ra, rb, rc, tm)); \
++      }
++
++
++
++void luaV_execute (lua_State *L, int nexeccalls) {
++  LClosure *cl;
++  StkId base;
++  TValue *k;
++  const Instruction *pc;
++ reentry:  /* entry point */
++  lua_assert(isLua(L->ci));
++  pc = L->savedpc;
++  cl = &clvalue(L->ci->func)->l;
++  base = L->base;
++  k = cl->p->k;
++  /* main loop of interpreter */
++  for (;;) {
++    const Instruction i = *pc++;
++    StkId ra;
++    if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
++        (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
++      traceexec(L, pc);
++      if (L->status == LUA_YIELD) {  /* did hook yield? */
++        L->savedpc = pc - 1;
++        return;
++      }
++      base = L->base;
++    }
++    /* warning!! several calls may realloc the stack and invalidate `ra' */
++    ra = RA(i);
++    lua_assert(base == L->base && L->base == L->ci->base);
++    lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
++    lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
++    switch (GET_OPCODE(i)) {
++      case OP_MOVE: {
++        setobjs2s(L, ra, RB(i));
++        continue;
++      }
++      case OP_LOADK: {
++        setobj2s(L, ra, KBx(i));
++        continue;
++      }
++      case OP_LOADBOOL: {
++        setbvalue(ra, GETARG_B(i));
++        if (GETARG_C(i)) pc++;  /* skip next instruction (if C) */
++        continue;
++      }
++      case OP_LOADNIL: {
++        TValue *rb = RB(i);
++        do {
++          setnilvalue(rb--);
++        } while (rb >= ra);
++        continue;
++      }
++      case OP_GETUPVAL: {
++        int b = GETARG_B(i);
++        setobj2s(L, ra, cl->upvals[b]->v);
++        continue;
++      }
++      case OP_GETGLOBAL: {
++        TValue g;
++        TValue *rb = KBx(i);
++        sethvalue(L, &g, cl->env);
++        lua_assert(ttisstring(rb));
++        Protect(luaV_gettable(L, &g, rb, ra));
++        continue;
++      }
++      case OP_GETTABLE: {
++        Protect(luaV_gettable(L, RB(i), RKC(i), ra));
++        continue;
++      }
++      case OP_SETGLOBAL: {
++        TValue g;
++        sethvalue(L, &g, cl->env);
++        lua_assert(ttisstring(KBx(i)));
++        Protect(luaV_settable(L, &g, KBx(i), ra));
++        continue;
++      }
++      case OP_SETUPVAL: {
++        UpVal *uv = cl->upvals[GETARG_B(i)];
++        setobj(L, uv->v, ra);
++        luaC_barrier(L, uv, ra);
++        continue;
++      }
++      case OP_SETTABLE: {
++        Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
++        continue;
++      }
++      case OP_NEWTABLE: {
++        int b = GETARG_B(i);
++        int c = GETARG_C(i);
++        sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
++        Protect(luaC_checkGC(L));
++        continue;
++      }
++      case OP_SELF: {
++        StkId rb = RB(i);
++        setobjs2s(L, ra+1, rb);
++        Protect(luaV_gettable(L, rb, RKC(i), ra));
++        continue;
++      }
++      case OP_ADD: {
++        arith_op(luai_numadd, TM_ADD);
++        continue;
++      }
++      case OP_SUB: {
++        arith_op(luai_numsub, TM_SUB);
++        continue;
++      }
++      case OP_MUL: {
++        arith_op(luai_nummul, TM_MUL);
++        continue;
++      }
++      case OP_DIV: {
++        arith_op(luai_numdiv, TM_DIV);
++        continue;
++      }
++      case OP_MOD: {
++        arith_op(luai_nummod, TM_MOD);
++        continue;
++      }
++      case OP_POW: {
++        arith_op(luai_numpow, TM_POW);
++        continue;
++      }
++      case OP_UNM: {
++        TValue *rb = RB(i);
++        if (ttisnumber(rb)) {
++          lua_Number nb = nvalue(rb);
++          setnvalue(ra, luai_numunm(nb));
++        }
++        else {
++          Protect(Arith(L, ra, rb, rb, TM_UNM));
++        }
++        continue;
++      }
++      case OP_NOT: {
++        int res = l_isfalse(RB(i));  /* next assignment may change this value */
++        setbvalue(ra, res);
++        continue;
++      }
++      case OP_LEN: {
++        const TValue *rb = RB(i);
++        switch (ttype(rb)) {
++          case LUA_TTABLE: {
++            setnvalue(ra, cast_num(luaH_getn(hvalue(rb))));
++            break;
++          }
++          case LUA_TSTRING: {
++            setnvalue(ra, cast_num(tsvalue(rb)->len));
++            break;
++          }
++          default: {  /* try metamethod */
++            Protect(
++              if (!call_binTM(L, rb, luaO_nilobject, ra, TM_LEN))
++                luaG_typeerror(L, rb, "get length of");
++            )
++          }
++        }
++        continue;
++      }
++      case OP_CONCAT: {
++        int b = GETARG_B(i);
++        int c = GETARG_C(i);
++        Protect(luaV_concat(L, c-b+1, c); luaC_checkGC(L));
++        setobjs2s(L, RA(i), base+b);
++        continue;
++      }
++      case OP_JMP: {
++        dojump(L, pc, GETARG_sBx(i));
++        continue;
++      }
++      case OP_EQ: {
++        TValue *rb = RKB(i);
++        TValue *rc = RKC(i);
++        Protect(
++          if (equalobj(L, rb, rc) == GETARG_A(i))
++            dojump(L, pc, GETARG_sBx(*pc));
++        )
++        pc++;
++        continue;
++      }
++      case OP_LT: {
++        Protect(
++          if (luaV_lessthan(L, RKB(i), RKC(i)) == GETARG_A(i))
++            dojump(L, pc, GETARG_sBx(*pc));
++        )
++        pc++;
++        continue;
++      }
++      case OP_LE: {
++        Protect(
++          if (lessequal(L, RKB(i), RKC(i)) == GETARG_A(i))
++            dojump(L, pc, GETARG_sBx(*pc));
++        )
++        pc++;
++        continue;
++      }
++      case OP_TEST: {
++        if (l_isfalse(ra) != GETARG_C(i))
++          dojump(L, pc, GETARG_sBx(*pc));
++        pc++;
++        continue;
++      }
++      case OP_TESTSET: {
++        TValue *rb = RB(i);
++        if (l_isfalse(rb) != GETARG_C(i)) {
++          setobjs2s(L, ra, rb);
++          dojump(L, pc, GETARG_sBx(*pc));
++        }
++        pc++;
++        continue;
++      }
++      case OP_CALL: {
++        int b = GETARG_B(i);
++        int nresults = GETARG_C(i) - 1;
++        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
++        L->savedpc = pc;
++        switch (luaD_precall(L, ra, nresults)) {
++          case PCRLUA: {
++            nexeccalls++;
++            goto reentry;  /* restart luaV_execute over new Lua function */
++          }
++          case PCRC: {
++            /* it was a C function (`precall' called it); adjust results */
++            if (nresults >= 0) L->top = L->ci->top;
++            base = L->base;
++            continue;
++          }
++          default: {
++            return;  /* yield */
++          }
++        }
++      }
++      case OP_TAILCALL: {
++        int b = GETARG_B(i);
++        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
++        L->savedpc = pc;
++        lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
++        switch (luaD_precall(L, ra, LUA_MULTRET)) {
++          case PCRLUA: {
++            /* tail call: put new frame in place of previous one */
++            CallInfo *ci = L->ci - 1;  /* previous frame */
++            int aux;
++            StkId func = ci->func;
++            StkId pfunc = (ci+1)->func;  /* previous function index */
++            if (L->openupval) luaF_close(L, ci->base);
++            L->base = ci->base = ci->func + ((ci+1)->base - pfunc);
++            for (aux = 0; pfunc+aux < L->top; aux++)  /* move frame down */
++              setobjs2s(L, func+aux, pfunc+aux);
++            ci->top = L->top = func+aux;  /* correct top */
++            lua_assert(L->top == L->base + clvalue(func)->l.p->maxstacksize);
++            ci->savedpc = L->savedpc;
++            ci->tailcalls++;  /* one more call lost */
++            L->ci--;  /* remove new frame */
++            goto reentry;
++          }
++          case PCRC: {  /* it was a C function (`precall' called it) */
++            base = L->base;
++            continue;
++          }
++          default: {
++            return;  /* yield */
++          }
++        }
++      }
++      case OP_RETURN: {
++        int b = GETARG_B(i);
++        if (b != 0) L->top = ra+b-1;
++        if (L->openupval) luaF_close(L, base);
++        L->savedpc = pc;
++        b = luaD_poscall(L, ra);
++        if (--nexeccalls == 0)  /* was previous function running `here'? */
++          return;  /* no: return */
++        else {  /* yes: continue its execution */
++          if (b) L->top = L->ci->top;
++          lua_assert(isLua(L->ci));
++          lua_assert(GET_OPCODE(*((L->ci)->savedpc - 1)) == OP_CALL);
++          goto reentry;
++        }
++      }
++      case OP_FORLOOP: {
++        lua_Number step = nvalue(ra+2);
++        lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
++        lua_Number limit = nvalue(ra+1);
++        if (luai_numlt(0, step) ? luai_numle(idx, limit)
++                                : luai_numle(limit, idx)) {
++          dojump(L, pc, GETARG_sBx(i));  /* jump back */
++          setnvalue(ra, idx);  /* update internal index... */
++          setnvalue(ra+3, idx);  /* ...and external index */
++        }
++        continue;
++      }
++      case OP_FORPREP: {
++        const TValue *init = ra;
++        const TValue *plimit = ra+1;
++        const TValue *pstep = ra+2;
++        L->savedpc = pc;  /* next steps may throw errors */
++        if (!tonumber(init, ra))
++          luaG_runerror(L, LUA_QL("for") " initial value must be a number");
++        else if (!tonumber(plimit, ra+1))
++          luaG_runerror(L, LUA_QL("for") " limit must be a number");
++        else if (!tonumber(pstep, ra+2))
++          luaG_runerror(L, LUA_QL("for") " step must be a number");
++        setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep)));
++        dojump(L, pc, GETARG_sBx(i));
++        continue;
++      }
++      case OP_TFORLOOP: {
++        StkId cb = ra + 3;  /* call base */
++        setobjs2s(L, cb+2, ra+2);
++        setobjs2s(L, cb+1, ra+1);
++        setobjs2s(L, cb, ra);
++        L->top = cb+3;  /* func. + 2 args (state and index) */
++        Protect(luaD_call(L, cb, GETARG_C(i)));
++        L->top = L->ci->top;
++        cb = RA(i) + 3;  /* previous call may change the stack */
++        if (!ttisnil(cb)) {  /* continue loop? */
++          setobjs2s(L, cb-1, cb);  /* save control variable */
++          dojump(L, pc, GETARG_sBx(*pc));  /* jump back */
++        }
++        pc++;
++        continue;
++      }
++      case OP_SETLIST: {
++        int n = GETARG_B(i);
++        int c = GETARG_C(i);
++        int last;
++        Table *h;
++        if (n == 0) {
++          n = cast_int(L->top - ra) - 1;
++          L->top = L->ci->top;
++        }
++        if (c == 0) c = cast_int(*pc++);
++        runtime_check(L, ttistable(ra));
++        h = hvalue(ra);
++        last = ((c-1)*LFIELDS_PER_FLUSH) + n;
++        if (last > h->sizearray)  /* needs more space? */
++          luaH_resizearray(L, h, last);  /* pre-alloc it at once */
++        for (; n > 0; n--) {
++          TValue *val = ra+n;
++          setobj2t(L, luaH_setnum(L, h, last--), val);
++          luaC_barriert(L, h, val);
++        }
++        continue;
++      }
++      case OP_CLOSE: {
++        luaF_close(L, ra);
++        continue;
++      }
++      case OP_CLOSURE: {
++        Proto *p;
++        Closure *ncl;
++        int nup, j;
++        p = cl->p->p[GETARG_Bx(i)];
++        nup = p->nups;
++        ncl = luaF_newLclosure(L, nup, cl->env);
++        ncl->l.p = p;
++        for (j=0; j<nup; j++, pc++) {
++          if (GET_OPCODE(*pc) == OP_GETUPVAL)
++            ncl->l.upvals[j] = cl->upvals[GETARG_B(*pc)];
++          else {
++            lua_assert(GET_OPCODE(*pc) == OP_MOVE);
++            ncl->l.upvals[j] = luaF_findupval(L, base + GETARG_B(*pc));
++          }
++        }
++        setclvalue(L, ra, ncl);
++        Protect(luaC_checkGC(L));
++        continue;
++      }
++      case OP_VARARG: {
++        int b = GETARG_B(i) - 1;
++        int j;
++        CallInfo *ci = L->ci;
++        int n = cast_int(ci->base - ci->func) - cl->p->numparams - 1;
++        if (b == LUA_MULTRET) {
++          Protect(luaD_checkstack(L, n));
++          ra = RA(i);  /* previous call may change the stack */
++          b = n;
++          L->top = ra + n;
++        }
++        for (j = 0; j < b; j++) {
++          if (j < n) {
++            setobjs2s(L, ra + j, ci->base - n + j);
++          }
++          else {
++            setnilvalue(ra + j);
++          }
++        }
++        continue;
++      }
++    }
++  }
++}
++
+--- /dev/null
++++ b/extensions/LUA/lua/lvm.h
+@@ -0,0 +1,36 @@
++/*
++** $Id: lvm.h,v 2.5.1.1 2007/12/27 13:02:25 roberto Exp $
++** Lua virtual machine
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lvm_h
++#define lvm_h
++
++
++#include "ldo.h"
++#include "lobject.h"
++#include "ltm.h"
++
++
++#define tostring(L,o) ((ttype(o) == LUA_TSTRING) || (luaV_tostring(L, o)))
++
++#define tonumber(o,n)	(ttype(o) == LUA_TNUMBER || \
++                         (((o) = luaV_tonumber(o,n)) != NULL))
++
++#define equalobj(L,o1,o2) \
++	(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
++
++
++LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
++LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
++LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
++LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
++LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key,
++                                            StkId val);
++LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key,
++                                            StkId val);
++LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
++LUAI_FUNC void luaV_concat (lua_State *L, int total, int last);
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/lua/lzio.c
+@@ -0,0 +1,81 @@
++/*
++** $Id: lzio.c,v 1.31.1.1 2007/12/27 13:02:25 roberto Exp $
++** a generic input stream interface
++** See Copyright Notice in lua.h
++*/
++
++#include <string.h>
++
++#define lzio_c
++#define LUA_CORE
++
++#include "lua.h"
++
++#include "llimits.h"
++#include "lmem.h"
++#include "lstate.h"
++#include "lzio.h"
++
++
++int luaZ_fill (ZIO *z) {
++  size_t size;
++  lua_State *L = z->L;
++  const char *buff;
++  lua_unlock(L);
++  buff = z->reader(L, z->data, &size);
++  lua_lock(L);
++  if (buff == NULL || size == 0) return EOZ;
++  z->n = size - 1;
++  z->p = buff;
++  return char2int(*(z->p++));
++}
++
++
++int luaZ_lookahead (ZIO *z) {
++  if (z->n == 0) {
++    if (luaZ_fill(z) == EOZ)
++      return EOZ;
++    else {
++      z->n++;  /* luaZ_fill removed first byte; put back it */
++      z->p--;
++    }
++  }
++  return char2int(*z->p);
++}
++
++
++void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
++  z->L = L;
++  z->reader = reader;
++  z->data = data;
++  z->n = 0;
++  z->p = NULL;
++}
++
++
++/* --------------------------------------------------------------- read --- */
++size_t luaZ_read (ZIO *z, void *b, size_t n) {
++  while (n) {
++    size_t m;
++    if (luaZ_lookahead(z) == EOZ)
++      return n;  /* return number of missing bytes */
++    m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
++    memcpy(b, z->p, m);
++    z->n -= m;
++    z->p += m;
++    b = (char *)b + m;
++    n -= m;
++  }
++  return 0;
++}
++
++/* ------------------------------------------------------------------------ */
++char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n) {
++  if (n > buff->buffsize) {
++    if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
++    luaZ_resizebuffer(L, buff, n);
++  }
++  return buff->buffer;
++}
++
++
+--- /dev/null
++++ b/extensions/LUA/lua/lzio.h
+@@ -0,0 +1,67 @@
++/*
++** $Id: lzio.h,v 1.21.1.1 2007/12/27 13:02:25 roberto Exp $
++** Buffered streams
++** See Copyright Notice in lua.h
++*/
++
++
++#ifndef lzio_h
++#define lzio_h
++
++#include "lua.h"
++
++#include "lmem.h"
++
++
++#define EOZ	(-1)			/* end of stream */
++
++typedef struct Zio ZIO;
++
++#define char2int(c)	cast(int, cast(unsigned char, (c)))
++
++#define zgetc(z)  (((z)->n--)>0 ?  char2int(*(z)->p++) : luaZ_fill(z))
++
++typedef struct Mbuffer {
++  char *buffer;
++  size_t n;
++  size_t buffsize;
++} Mbuffer;
++
++#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
++
++#define luaZ_buffer(buff)	((buff)->buffer)
++#define luaZ_sizebuffer(buff)	((buff)->buffsize)
++#define luaZ_bufflen(buff)	((buff)->n)
++
++#define luaZ_resetbuffer(buff) ((buff)->n = 0)
++
++
++#define luaZ_resizebuffer(L, buff, size) \
++	(luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
++	(buff)->buffsize = size)
++
++#define luaZ_freebuffer(L, buff)	luaZ_resizebuffer(L, buff, 0)
++
++
++LUAI_FUNC char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
++LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
++                                        void *data);
++LUAI_FUNC size_t luaZ_read (ZIO* z, void* b, size_t n);	/* read next n bytes */
++LUAI_FUNC int luaZ_lookahead (ZIO *z);
++
++
++
++/* --------- Private Part ------------------ */
++
++struct Zio {
++  size_t n;			/* bytes still unread */
++  const char *p;		/* current position in buffer */
++  lua_Reader reader;
++  void* data;			/* additional data */
++  lua_State *L;			/* Lua state (for reader) */
++};
++
++
++LUAI_FUNC int luaZ_fill (ZIO *z);
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/Makefile
+@@ -0,0 +1,389 @@
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# extensions/LUA/Makefile.  Generated from Makefile.in by configure.
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
++# Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++
++# -*- Makefile -*-
++# AUTOMAKE
++
++pkgdatadir = $(datadir)/xtables-addons
++pkgincludedir = $(includedir)/xtables-addons
++pkglibdir = $(libdir)/xtables-addons
++pkglibexecdir = $(libexecdir)/xtables-addons
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = i686-pc-linux-gnu
++host_triplet = i686-pc-linux-gnu
++DIST_COMMON = $(srcdir)/../../Makefile.extra $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in
++subdir = extensions/LUA
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
++SOURCES =
++DIST_SOURCES =
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = ${SHELL} /home/andre/Dropbox/xtables-addons/missing --run aclocal-1.11
++AMTAR = ${SHELL} /home/andre/Dropbox/xtables-addons/missing --run tar
++AR = ar
++AUTOCONF = ${SHELL} /home/andre/Dropbox/xtables-addons/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/andre/Dropbox/xtables-addons/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/andre/Dropbox/xtables-addons/missing --run automake-1.11
++AWK = mawk
++CC = gcc
++CCDEPMODE = depmode=gcc3
++CFLAGS = -g -O2
++CPP = gcc -E
++CPPFLAGS = 
++CYGPATH_W = echo
++DEFS = -DHAVE_CONFIG_H
++DEPDIR = .deps
++DSYMUTIL = 
++DUMPBIN = 
++ECHO_C = 
++ECHO_N = -n
++ECHO_T = 
++EGREP = /bin/grep -E
++EXEEXT = 
++FGREP = /bin/grep -F
++GREP = /bin/grep
++INSTALL = /usr/bin/install -c
++INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_PROGRAM = ${INSTALL}
++INSTALL_SCRIPT = ${INSTALL}
++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
++LD = /usr/bin/ld
++LDFLAGS = 
++LIBOBJS = 
++LIBS = 
++LIBTOOL = $(SHELL) $(top_builddir)/libtool
++LIPO = 
++LN_S = ln -s
++LTLIBOBJS = 
++MAKEINFO = ${SHELL} /home/andre/Dropbox/xtables-addons/missing --run makeinfo
++MKDIR_P = /bin/mkdir -p
++NM = /usr/bin/nm -B
++NMEDIT = 
++OBJDUMP = objdump
++OBJEXT = o
++OTOOL = 
++OTOOL64 = 
++PACKAGE = xtables-addons
++PACKAGE_BUGREPORT = 
++PACKAGE_NAME = xtables-addons
++PACKAGE_STRING = xtables-addons 1.21
++PACKAGE_TARNAME = xtables-addons
++PACKAGE_URL = 
++PACKAGE_VERSION = 1.21
++PATH_SEPARATOR = :
++PKG_CONFIG = /usr/bin/pkg-config
++RANLIB = ranlib
++SED = /bin/sed
++SET_MAKE = 
++SHELL = /bin/bash
++STRIP = strip
++VERSION = 1.21
++abs_builddir = /home/andre/Dropbox/xtables-addons/extensions/LUA
++abs_srcdir = /home/andre/Dropbox/xtables-addons/extensions/LUA
++abs_top_builddir = /home/andre/Dropbox/xtables-addons
++abs_top_srcdir = /home/andre/Dropbox/xtables-addons
++ac_ct_CC = gcc
++ac_ct_DUMPBIN = 
++am__include = include
++am__leading_dot = .
++am__quote = 
++am__tar = ${AMTAR} chof - "$$tardir"
++am__untar = ${AMTAR} xf -
++bindir = ${exec_prefix}/bin
++build = i686-pc-linux-gnu
++build_alias = 
++build_cpu = i686
++build_os = linux-gnu
++build_vendor = pc
++builddir = .
++datadir = ${datarootdir}
++datarootdir = ${prefix}/share
++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
++dvidir = ${docdir}
++exec_prefix = ${prefix}
++host = i686-pc-linux-gnu
++host_alias = 
++host_cpu = i686
++host_os = linux-gnu
++host_vendor = pc
++htmldir = ${docdir}
++includedir = ${prefix}/include
++infodir = ${datarootdir}/info
++install_sh = ${SHELL} /home/andre/Dropbox/xtables-addons/install-sh
++kbuilddir = /lib/modules/2.6.33-020633-generic/build
++kinclude_CFLAGS =  -I /lib/modules/2.6.33-020633-generic/build/include
++ksourcedir = 
++libdir = ${exec_prefix}/lib
++libexecdir = ${exec_prefix}/libexec
++libxtables_CFLAGS =  
++libxtables_LIBS = -L/lib -lxtables  
++localedir = ${datarootdir}/locale
++localstatedir = ${prefix}/var
++lt_ECHO = echo
++mandir = ${datarootdir}/man
++mkdir_p = /bin/mkdir -p
++oldincludedir = /usr/include
++pdfdir = ${docdir}
++prefix = /usr/local
++program_transform_name = s,x,x,
++psdir = ${docdir}
++regular_CFLAGS = -D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 	-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations 	-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes 	-Winline -pipe -DXTABLES_LIBDIR=\"${xtlibdir}\"
++sbindir = ${exec_prefix}/sbin
++sharedstatedir = ${prefix}/com
++srcdir = .
++sysconfdir = ${prefix}/etc
++target_alias = 
++top_build_prefix = ../../
++top_builddir = ../..
++top_srcdir = ../..
++xtlibdir = ${libexecdir}/xtables
++XA_SRCDIR = ${srcdir}
++XA_TOPSRCDIR = ${top_srcdir}
++XA_ABSTOPSRCDIR = ${abs_top_srcdir}
++_mcall = -f ${top_builddir}/Makefile.iptrules
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../Makefile.extra $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/LUA/Makefile'; \
++	$(am__cd) $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign extensions/LUA/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure:  $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d "$(distdir)/$$file"; then \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
++	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++	  else \
++	    test -f "$(distdir)/$$file" \
++	    || cp -p $$d/$$file "$(distdir)/$$file" \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile all-local
++installdirs:
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool clean-local mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++html-am:
++
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-dvi: install-dvi-am
++
++install-dvi-am:
++
++install-exec-am: install-exec-local
++
++install-html: install-html-am
++
++install-html-am:
++
++install-info: install-info-am
++
++install-info-am:
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-pdf-am:
++
++install-ps: install-ps-am
++
++install-ps-am:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am:
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am all-local check check-am clean clean-generic \
++	clean-libtool clean-local distclean distclean-generic \
++	distclean-libtool distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-exec-local \
++	install-html install-html-am install-info install-info-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
++	ps ps-am uninstall uninstall-am
++
++export XA_SRCDIR
++export XA_TOPSRCDIR
++export XA_ABSTOPSRCDIR
++
++all-local: user-all-local
++
++install-exec-local: user-install-local
++
++clean-local: user-clean-local
++
++user-all-local:
++	${MAKE} ${_mcall} all;
++
++# Have no user-install-data-local ATM
++user-install-local: user-install-exec-local
++
++user-install-exec-local:
++	${MAKE} ${_mcall} install;
++
++user-clean-local:
++	${MAKE} ${_mcall} clean;
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++
+--- /dev/null
++++ b/extensions/LUA/Makefile.am
+@@ -0,0 +1 @@
++include ../../Makefile.extra
+--- /dev/null
++++ b/extensions/LUA/Makefile.in
+@@ -0,0 +1,389 @@
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
++# Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++# -*- Makefile -*-
++# AUTOMAKE
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++DIST_COMMON = $(srcdir)/../../Makefile.extra $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in
++subdir = extensions/LUA
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
++SOURCES =
++DIST_SOURCES =
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++AMTAR = @AMTAR@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++GREP = @GREP@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++RANLIB = @RANLIB@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++VERSION = @VERSION@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++kbuilddir = @kbuilddir@
++kinclude_CFLAGS = @kinclude_CFLAGS@
++ksourcedir = @ksourcedir@
++libdir = @libdir@
++libexecdir = @libexecdir@
++libxtables_CFLAGS = @libxtables_CFLAGS@
++libxtables_LIBS = @libxtables_LIBS@
++localedir = @localedir@
++localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++regular_CFLAGS = @regular_CFLAGS@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++xtlibdir = @xtlibdir@
++XA_SRCDIR = ${srcdir}
++XA_TOPSRCDIR = ${top_srcdir}
++XA_ABSTOPSRCDIR = ${abs_top_srcdir}
++_mcall = -f ${top_builddir}/Makefile.iptrules
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../../Makefile.extra $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/LUA/Makefile'; \
++	$(am__cd) $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign extensions/LUA/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure:  $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d "$(distdir)/$$file"; then \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
++	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++	  else \
++	    test -f "$(distdir)/$$file" \
++	    || cp -p $$d/$$file "$(distdir)/$$file" \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile all-local
++installdirs:
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool clean-local mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++html-am:
++
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-dvi: install-dvi-am
++
++install-dvi-am:
++
++install-exec-am: install-exec-local
++
++install-html: install-html-am
++
++install-html-am:
++
++install-info: install-info-am
++
++install-info-am:
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-pdf-am:
++
++install-ps: install-ps-am
++
++install-ps-am:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am:
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am all-local check check-am clean clean-generic \
++	clean-libtool clean-local distclean distclean-generic \
++	distclean-libtool distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-exec-local \
++	install-html install-html-am install-info install-info-am \
++	install-man install-pdf install-pdf-am install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
++	ps ps-am uninstall uninstall-am
++
++export XA_SRCDIR
++export XA_TOPSRCDIR
++export XA_ABSTOPSRCDIR
++
++all-local: user-all-local
++
++install-exec-local: user-install-local
++
++clean-local: user-clean-local
++
++user-all-local:
++	${MAKE} ${_mcall} all;
++
++# Have no user-install-data-local ATM
++user-install-local: user-install-exec-local
++
++user-install-exec-local:
++	${MAKE} ${_mcall} install;
++
++user-clean-local:
++	${MAKE} ${_mcall} clean;
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++
+--- /dev/null
++++ b/extensions/LUA/Mbuild
+@@ -0,0 +1,3 @@
++# -*- Makefile -*-
++
++obj-${build_LUA}     += libxt_LUA.so
+--- /dev/null
++++ b/extensions/LUA/nf_lua.c
+@@ -0,0 +1,64 @@
++#if defined(__KERNEL__)
++
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/timer.h>
++#include <linux/random.h>
++#include <linux/netfilter/x_tables.h>
++
++#endif
++
++#include "lua.h"
++#include "lobject.h" /*sizeof(udata) */
++#include "lauxlib.h"
++#include "controller.h"
++
++#if defined(__KERNEL__) /* reachs until luaopen_nflib */
++
++
++static int32_t nf_get_random(lua_State *L)
++{
++	uint32_t  rand = 0;
++
++	get_random_bytes(&rand, sizeof(uint32_t ));
++	lua_pushnumber(L, rand);
++	return 1;
++}
++
++static int32_t nf_get_time(lua_State *L)
++{
++	lua_pushnumber(L, jiffies_to_msecs(jiffies_64));
++	return 1;
++}
++
++static const struct luaL_Reg nf_lua_lib_f [] = {
++	{ "get_random",	   nf_get_random    },
++	{ "get_time",	   nf_get_time	    },
++	{ NULL,		   NULL		    }
++};
++
++void luaopen_nflib(lua_State *L)
++{
++	int32_t top;
++
++	luaL_register(L, NETFILTER_LIB, nf_lua_lib_f);
++	lua_pop(L, 1);
++
++	/* registering verdicts inside the _G */
++	lua_getglobal(L, "_G");
++	top = lua_gettop(L);
++
++	lua_pushinteger(L, XT_CONTINUE);
++	lua_setfield(L, top, "XT_CONTINUE");    /* continiue with next rule */
++
++	lua_pushinteger(L, NF_DROP);
++	lua_setfield(L, top, "NF_DROP");        /* stop traversal in the current table hook and drop packet */
++
++	lua_pushinteger(L, NF_ACCEPT);
++	lua_setfield(L, top, "NF_ACCEPT");      /* stop traversal in the current table hook and accept packet */
++
++	lua_pop(L, 1);                          /* pop _G */
++}
++
++#endif
+--- /dev/null
++++ b/extensions/LUA/prot_buf_dynamic.c
+@@ -0,0 +1,486 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "controller.h"
++
++
++
++struct protocol_buf * dyn_prot_buf_array[MAX_NR_OF_DYN_PROT_BUFS] = { NULL }; 
++
++
++/* LUA_API: the function 'field_dynamic_setter' acts as a wrapper around
++ * a given Lua field setter function of a dynamic protocol buffer. The 
++ * string containing the lua function name was piggybacked in the 'set'
++ * member of the protocol_field. We call this function passing the actual
++ * segment as byte array and the set value.
++ * 
++ * Paramters:
++ * 1.  lua_packet_segment (implicit)
++ * 2.  some lua value 
++ *
++ * Upvalues:
++ * 1.  pointer to the protocol buffer 
++ * 2.  field index 
++ *
++ * Returns:
++ * 1.  true or false if the 'set' was successful
++ */
++int32_t field_dynamic_setter(lua_State *L)
++{
++	size_t nbytes;
++	lua_packet_segment * array;
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	int32_t field_index = lua_tointeger(L, lua_upvalueindex(2));
++    
++	/* the function name is piggybacked as a string */
++	lua_getglobal(L, (char *)prot_buf->protocol_fields[field_index].set);
++	if (!lua_isfunction(L, -1)) {
++		lua_pushboolean(L, 0);
++		return 1;
++	}
++
++	nbytes = sizeof(lua_packet_segment) + seg->length * sizeof(uint8_t);
++	array = (lua_packet_segment *)lua_newuserdata(L, nbytes);
++	array->length = seg->length;
++	array->start = seg->start + seg->offset;
++	array->changes = NULL;
++
++	luaL_getmetatable(L, LUA_BYTE_ARRAY);
++	lua_setmetatable(L, -2);
++	lua_pushvalue(L, 2); /* push value to set */
++	if (lua_pcall(L, 2, 1, 0) != 0) {
++		pr_debug("Error: %s \n", lua_tostring(L, -1));
++		lua_pop(L, 1);
++		lua_pushboolean(L, 0);
++	}
++	return 1;
++}
++
++/* LUA_API: the function 'field_dynamic_getter' acts as a wrapper around
++ * a given Lua field getter function of a dynamic protocol buffer. The 
++ * string containing the lua function name was piggybacked in the 'get'
++ * member of the protocol_field. We call this function passing the actual
++ * segment as byte array.
++ * 
++ * Paramters:
++ * 1.  lua_packet_segment (implicit)
++ *
++ * Upvalues:
++ * 1.  pointer to the protocol buffer 
++ * 2.  field index 
++ *
++ * Returns:
++ * 1.  true or false if the 'get' was successful
++ */
++int32_t field_dynamic_getter(lua_State *L)
++{
++	size_t nbytes;
++	lua_packet_segment * array;
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	int32_t field_index = lua_tointeger(L, lua_upvalueindex(2));
++    
++	/* the function name is piggybacked as a string */
++	lua_getglobal(L, (char *)prot_buf->protocol_fields[field_index].get);
++	if (!lua_isfunction(L, -1)) {
++		lua_pushboolean(L, 0);
++		return 1;
++	}
++
++	nbytes = sizeof(lua_packet_segment) + seg->length * sizeof(uint8_t);
++	array = (lua_packet_segment *)lua_newuserdata(L, nbytes);
++	array->length = seg->length;
++	array->start = seg->start + seg->offset;
++	array->changes = NULL;
++
++	luaL_getmetatable(L, LUA_BYTE_ARRAY);
++	lua_setmetatable(L, -2);
++	if (lua_pcall(L, 1, 1, 0) != 0) {
++		pr_debug("Error: %s \n", luaL_checkstring(L, -1));
++		lua_pop(L, 1);
++		lua_pushboolean(L, 0);
++	}
++	return 1;
++}
++
++/* LUA_API: the function 'has_protocol_dynamic' acts as a wrapper around 
++ * a given lua has_protocol function of a dynamic protocol buffer. The 
++ * string containing the lua function name was piggybacked in the 'has_protocol'
++ * member of the protocol_buffer. We call this function passing the actual
++ * segment.
++ * 
++ * Paramters:
++ * 1.  lua_packet_segment
++ * 2.  protocol type 
++ *
++ * Returns:
++ * 1.  true or false if the payload field contains the given protocol 
++ */
++int32_t has_protocol_dynamic(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int32_t type)
++{
++	lua_packet_segment *seg_new;
++	int32_t res = 0;                                      
++	
++    /* the function name is piggybacked as a string */
++	lua_getglobal(L, (char *)prot_buf->has_protocol);
++	seg_new = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
++	seg_new->start = seg->start;
++	seg_new->offset = seg->offset;
++	seg_new->length = seg->length;
++	seg_new->changes = NULL;
++	luaL_getmetatable(L, prot_buf->name);
++	lua_setmetatable(L, -2);
++	lua_pushinteger(L, type);  /* push the protocol type */
++	if (lua_pcall(L, 2, 1, 0) != 0) {
++		pr_debug("Error: %s \n", luaL_checkstring(L, -1));
++		lua_pop(L, 1);
++		return 0;
++	}
++	res = lua_toboolean(L, -1);
++	lua_pop(L, 1);
++
++	return res;
++}
++
++/* LUA_API: the function 'get_field_changes_dynamic' acts as a wrapper around 
++ * a given lua get_field_changes function of a dynamic protocol buffer. The 
++ * string containing the lua function name was piggybacked in the 'get_field_changes'
++ * member of the protocol_buffer. We call this function passing the actual
++ * segment. The lua function must return two lua table containing the offset 
++ * and length changes (in bits). 
++ * 
++ * Paramters:
++ * 1.  lua_packet_segment 
++ *
++ * Returns:
++ * 1.  new allocated field_changes struct 
++ */
++struct field_changes * get_field_changes_dynamic(lua_State *L, struct protocol_buf *prot_buf, lua_packet_segment * seg)
++{
++	lua_packet_segment *seg_new;
++	struct field_changes * changes;
++	int32_t nr_of_changes, i;
++
++	lua_getglobal(L, (char *)prot_buf->get_field_changes);
++
++	seg_new = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
++	seg_new->start = seg->start;
++	seg_new->offset = seg->offset;
++	seg_new->length = seg->length;
++	seg_new->changes = NULL;
++	luaL_getmetatable(L, prot_buf->name);
++	lua_setmetatable(L, -2);
++
++	if (lua_pcall(L, 1, 2, 0) != 0)
++		luaL_error(L, "inside get_field_changes_dynamic. %s\n", lua_tostring(L, -1));
++
++	/* the function call must return a table containing length changes */
++	luaL_checktype(L, -1, LUA_TTABLE);
++	/* the function call must return a table containing offset changes */
++	luaL_checktype(L, -2, LUA_TTABLE);
++	/* both tables have to be of same size */
++	if (lua_objlen(L, -1) != lua_objlen(L, -2))
++		luaL_error(L, "the provided tables are not of equal size");
++
++	nr_of_changes = lua_objlen(L, -1);
++	changes = get_allocated_field_changes(L, nr_of_changes);
++
++	/* loop over the tables */
++	for (i = 1; i < nr_of_changes; i++) {
++		lua_rawgeti(L, -1, i);  /* push length value of field at index i */
++		changes->field_length_changes[i - 1] = luaL_checkinteger(L, -1);
++		lua_pop(L, 1);          /* pop offset value */
++
++		lua_rawgeti(L, -2, i);  /* push offset value of field at index i */
++		changes->field_offset_changes[i - 1] = luaL_checkinteger(L, -1);
++		lua_pop(L, 1);          /* pop length value */
++	}
++
++	/* pop both tables */
++	lua_pop(L, 2);
++
++	return changes;
++}
++
++/* C_INT: 'get_free_protocol_index' is only used internally. This function
++ * gets a free slot inside the array holding all the  protocol buffers.
++ * There are several ways to get to this information. In this case I take
++ * the way over the reflected array SUPPORTED_PROTOCOL_TABLE inside the
++ * Lua state. Since this function is called at laodtime, we do not have
++ * to care about performance.
++ */
++static int32_t get_free_protocol_index(lua_State *L)
++{
++	int32_t protocol_index;
++
++	lua_getglobal(L, SUPPORTED_PROTOCOL_TABLE);
++	protocol_index = lua_objlen(L, -1) + 1;
++	lua_pop(L, 1);
++	return protocol_index;
++}
++
++/* C_API: 'free_dynamic_prot_buf' frees the allocated memory of a given
++ * dynamic protocol buffer. this function is normally called inside a 
++ * cleanup routine. Be aware, before running this function you must be 
++ * sure that no references to the dynamic protocol buffers were available.
++ * It's recomended to close the Lua state before calling the function. */
++void free_dynamic_prot_buf(struct protocol_buf * prot_buf)
++{
++	struct protocol_field * field = prot_buf->protocol_fields;
++
++	for (; field->name != NULL; field++) {
++		if (field->get) kfree(field->get);
++		if (field->set) kfree(field->set);
++		if (field->name) kfree((char *)field->name);
++	}
++
++	if (prot_buf->payload_field) kfree(prot_buf->payload_field);
++	if (prot_buf->has_protocol) kfree(prot_buf->has_protocol);
++
++	if (prot_buf->get_field_changes) kfree(prot_buf->get_field_changes);
++	kfree((char *)prot_buf->name);
++	kfree(prot_buf);
++	return;
++}
++
++void cleanup_dynamic_prot_bufs(void)
++{
++	int32_t i;
++
++	for (i = 0; i < MAX_NR_OF_DYN_PROT_BUFS; i++) {
++		if (dyn_prot_buf_array[i]) {
++			free_dynamic_prot_buf(dyn_prot_buf_array[i]);
++			dyn_prot_buf_array[i] = NULL;
++		}
++	}
++	return;
++}
++
++
++/* C_INT: 'free_protocol_fields' is used internally as a helper function for
++ * 'register_dynamic_protbuf'. It is used when durin registration an error
++ * occurs and the afore allocated fields needed to be freed. */
++static inline void free_protocol_fields(struct protocol_field * prot_fields, int32_t i)
++{
++	struct protocol_field * f;
++
++	while (i >= 0) {
++		f = &prot_fields[i];
++		if (f->name) kfree((void *)f->name);
++		if (f->get) kfree((void *)f->get);
++		if (f->set) kfree((void *)f->set);
++		kfree((void *)f);
++		i--;
++	}
++}
++
++/* LUA_API: 'register_dynamic_protbuf' is called from within the Lua script.
++ * it takes a Lua table representing the dynamic protocol buffer as parameter.
++ * e.g.:
++ * 	eth_prot_buf = {
++ * 		name = "packet_eth_dyn",
++ * 		payload_field = "data",
++ * 		protocol_fields = {
++ * 			{"dmac", 		0, 		48,		nil,	nil	},
++ * 			{"smac", 		48, 	48,		nil,	nil	},
++ * 			{"type", 		96, 	16,		nil,	nil	},
++ * 			{"data", 		112, 	0,		nil,	nil },
++ * 		},
++ *		has_protocol = "eth_dyn_has_protocol",
++ *		get_field_changes = "eth_dyn_get_field_changes"
++ * 	}
++ * register_dynamic_protbuf(eth_prot_buf)
++ * 
++ * the table gets parsed and a new protocol_buf struct is allocated and 
++ * initialized using 'register_protbuf', which is also used for the static
++ * protocol buffers. This enables an identical behavior like the static
++ * protocol buffers. The dynamic protocol buffers are not garbage collected,
++ * use 'free_dynamic_protbuf' to free them after closing the Lua state. 
++ */
++static int32_t register_dynamic_protbuf(lua_State *L)
++{
++	struct protocol_buf *prot_buf;
++	struct protocol_field *field, sentinel = PROT_FIELD_SENTINEL;
++	int32_t nr_of_fields, i;
++
++	prot_buf = (struct protocol_buf *)kmalloc(sizeof(struct protocol_buf), GFP_KERNEL);
++	prot_buf->is_dynamic = 1;
++
++	/* check if parameter is a table */
++	luaL_checktype(L, 1, LUA_TTABLE);
++
++	/* initialize prot_buf.name */
++	lua_getfield(L, 1, "name");
++	prot_buf->name = kmalloc(lua_objlen(L, -1), GFP_KERNEL);
++	strcpy((char *)prot_buf->name, luaL_checkstring(L, -1));
++	lua_pop(L, 1);  /* pop res from lua_getfield */
++
++	/* check if protocol buffer is already registered */
++	lua_getglobal(L, prot_buf->name);
++	if (!lua_isnil(L, -1)) {
++		lua_pop(L, 1); /* pop res from lua_getglobal */
++		pr_debug("protocol_buf '%s' already registered.\n", prot_buf->name);
++		goto free_prot_buf;
++	}
++	lua_pop(L, 1); /* pop res from lua_getglobal */
++
++	/* initialize payload field */
++	lua_getfield(L, 1, "payload_field");
++	if (lua_isstring(L, -1)) {
++		prot_buf->payload_field = kmalloc(lua_objlen(L, -1), GFP_KERNEL);
++		strcpy(prot_buf->payload_field, lua_tostring(L, -1));
++	}else
++		prot_buf->payload_field = NULL;
++	lua_pop(L, 1); /* pop res from lua_getfield */
++
++	/* initialize protocol_fields field*/
++	lua_getfield(L, 1, "protocol_fields");
++	if (!lua_istable(L, -1)) {
++		pr_debug("invalid protocol_fields table.\n");
++		goto err2;
++
++	}
++
++	nr_of_fields = lua_objlen(L, -1);
++	prot_buf->protocol_fields = (struct protocol_field *)kmalloc((nr_of_fields + 1) * sizeof(struct protocol_field), GFP_KERNEL);
++
++	for (i = 1; i <= nr_of_fields; i++) {
++		field = &prot_buf->protocol_fields[i - 1];
++		/* initialize protocol field */
++		lua_rawgeti(L, -1, i);  /* push field-table */
++		if (!lua_istable(L, -1)) {
++			free_protocol_fields(prot_buf->protocol_fields, i);
++			pr_debug("invalid protocol_field at %i.\n", i);
++			goto err;
++		}
++
++		/* initialize protocol field name */
++		lua_rawgeti(L, -1, 1);
++		if (!lua_isstring(L, -1)) {
++			free_protocol_fields(prot_buf->protocol_fields, i);
++			pr_debug("invalid protocol_field name at %i.\n", i);
++			goto err;
++		}
++
++		field->name = kmalloc(lua_objlen(L, -1), GFP_KERNEL);
++		strcpy((char*)field->name, lua_tostring(L, -1));
++		lua_pop(L, 1); /* pop field name */
++
++		/* initialize protocol field offset */
++		lua_rawgeti(L, -1, 2);
++		if (!lua_isnumber(L, -1)) {
++			free_protocol_fields(prot_buf->protocol_fields, i);
++			pr_debug("invalid protocol_field offset at %i.\n", i);
++			goto err;
++		}
++		field->offset = lua_tointeger(L, -1);
++		lua_pop(L, 1); /* pop field offset */
++
++		/* initialize protocol field length */
++		lua_rawgeti(L, -1, 3);
++		if (!lua_isnumber(L, -1)) {
++			free_protocol_fields(prot_buf->protocol_fields, i);
++			pr_debug("invalid protocol_field length at %i.\n", i);
++			goto err;
++		}
++		field->length = lua_tointeger(L, -1);
++		lua_pop(L, 1); /* pop field length */
++
++		/* initialize protocol field getter */
++		lua_rawgeti(L, -1, 4);
++		if (lua_isstring(L, -1)) {
++			field->get = kmalloc(lua_objlen(L, -1), GFP_KERNEL);
++			strcpy((char *)field->get, lua_tostring(L, -1)); /* the get-wrapper knows about the piggybacked string */
++		}else
++			field->get = NULL;
++		lua_pop(L, 1); /* pop field getter */
++
++		/* initialize protocol field setter */
++		lua_rawgeti(L, -1, 5);
++		if (lua_isstring(L, -1)) {
++			field->set = kmalloc(lua_objlen(L, -1), GFP_KERNEL);
++			strcpy((char *)field->set, lua_tostring(L, -1)); /* the set-wrapper knows about the piggybacked string */
++		}else
++			field->set = NULL;
++		lua_pop(L, 1); /* pop field setter */
++
++		/* field initialization completed */
++		lua_pop(L, 1); /* pop field-table */
++	}
++
++	/* put sentinel at the end of protocol_fields */
++	memcpy(&prot_buf->protocol_fields[nr_of_fields], &sentinel, sizeof(sentinel));
++	lua_pop(L, 1); /* pop protocol-fields-table */
++
++	/* initialize has_protocol field */
++	lua_getfield(L, 1, "has_protocol");
++	if (lua_isstring(L, -1)) {
++		prot_buf->has_protocol = kmalloc(lua_objlen(L, -1), GFP_KERNEL);
++		strcpy((char *)prot_buf->has_protocol, lua_tostring(L, -1)); /* the has_protocol-wrapper knows about the piggybacked string */
++	}else
++		prot_buf->has_protocol = NULL;
++	lua_pop(L, 1); /* pop has_protocol */
++
++	/* initialize get_field_changes field */
++	lua_getfield(L, 1, "get_field_changes");
++	if (lua_isstring(L, -1)) {
++		prot_buf->get_field_changes = kmalloc(lua_objlen(L, -1), GFP_KERNEL);
++		strcpy((char *)prot_buf->get_field_changes, lua_tostring(L, -1)); /* the get_field_changes-wrapper knows about the piggybacked string */
++	}else
++		prot_buf->get_field_changes = NULL;
++	lua_pop(L, 1);                                                  /* pop get_field_changes */
++
++	/* Storing the pointer to the DYNAMIC protbuf within dyn_prot_buf_array, in order to free it at cleanup */
++	for (i = 0; i < MAX_NR_OF_DYN_PROT_BUFS; i++) {
++		if (!dyn_prot_buf_array[i]) {
++			dyn_prot_buf_array[i] = prot_buf;
++			break;
++		}else
++			goto err;
++	}
++	
++	/* call the "common" register_protbuf */
++	register_protbuf(L, prot_buf, get_free_protocol_index(L));      /* register prot_buf as it is done with the static ones */
++
++	return 0;
++
++err:
++	kfree(prot_buf->protocol_fields);
++err2:
++	if (prot_buf->payload_field) kfree(prot_buf->payload_field);
++free_prot_buf:
++	kfree((void *)prot_buf->name);
++	kfree(prot_buf);
++
++	luaL_error(L, "one or more error happend while registering a dynamic protocol buffer, please consult the debug log");
++
++	return 0;
++
++}
++
++void luaopen_protbuf_dynamic(lua_State *L)
++{
++	lua_getglobal(L, "_G");
++	lua_pushcclosure(L, register_dynamic_protbuf, 0);
++	lua_setfield(L, -2, "register_dynamic_protbuf");
++	lua_pop(L, 1); /* pop _G */
++	return;
++}
+--- /dev/null
++++ b/extensions/LUA/prot_buf_ethernet.c
+@@ -0,0 +1,60 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "controller.h"
++
++
++static int32_t eth_has_protocol(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int32_t protocol_type)
++{
++	uint8_t *embedded_protocol = seg->start + seg->offset + 12 /*bytes*/;
++	unsigned short res = (unsigned short)((embedded_protocol[1] << CHAR_BIT) | (embedded_protocol[0] << CHAR_BIT));
++
++	switch (res) {
++	case 0x0800:    /* 1: Internet Protocol (IP) */
++		if (protocol_type == PACKET_IP) return 1;
++		break;
++	default:
++		return 0;
++	}
++
++	return 0;
++}
++
++static const struct protocol_field eth_protocol_fields[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "dmac", 0,		      48,	       NULL,		  NULL		    },
++	{ "smac", 48,		      48,	       NULL,		  NULL		    },
++	{ "type", 96,		      16,	       NULL,		  NULL		    },
++	{ "data", 112,		      0,	       NULL,		  NULL		    },
++	PROT_FIELD_SENTINEL,
++};
++
++static const struct protocol_buf eth_protocol_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_ETH,
++	.payload_field			= "data",
++	.protocol_fields		= (struct protocol_field *)&eth_protocol_fields,
++	.has_protocol			= &eth_has_protocol,
++	.get_field_changes		= NULL,
++};
++
++
++void luaopen_protbuf_eth(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&eth_protocol_buf, PACKET_ETH);
++}
+--- /dev/null
++++ b/extensions/LUA/prot_buf_helpers.c
+@@ -0,0 +1,216 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#if defined(__KERNEL__)
++#include <linux/netfilter_ipv4.h>
++#include <linux/slab.h>         /* kmalloc */
++#endif
++
++#include "controller.h"
++
++int32_t get_header_size(struct protocol_buf * prot_buf)
++{
++	int32_t bit_counter = 0;
++	struct protocol_field * field = prot_buf->protocol_fields;
++
++	for (; field->name; field++)
++		bit_counter += field->length;
++
++	return bit_counter >> 3;
++}
++
++
++int32_t set_32_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	*(uint32_t  *)(seg->start + seg->offset) = (uint32_t  )htonl(luaL_checkinteger(L, 2));
++	return 0;
++}
++int32_t get_32_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	lua_pushinteger(L, ntohl(*((uint32_t  *)(seg->start + seg->offset))));
++	return 1;
++}
++
++int32_t set_16_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	*(uint16_t *)(seg->start + seg->offset) = (uint16_t)htons(luaL_checkinteger(L, 2));
++	return 0;
++}
++int32_t get_16_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	lua_pushinteger(L, ntohs(*((uint16_t *)(seg->start + seg->offset))));
++	return 1;
++}
++
++int32_t set_lower_4_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++	uint8_t b = (uint8_t)luaL_checkinteger(L, 2) << 4;
++	uint8_t * pos = (uint8_t *)(seg->start + seg->offset);
++
++	*pos &= 0x0F; /* reset lower 4 bits*/
++	*pos |= b;
++
++	return 0;
++}
++
++int32_t get_lower_4_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	lua_pushinteger(L, (*(uint8_t *)(seg->start + seg->offset)) >> 4);
++	return 1;
++}
++
++int32_t set_upper_4_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++	uint8_t b = (uint8_t)luaL_checkinteger(L, 2) << 4;
++	uint8_t * pos = (uint8_t *)(seg->start + seg->offset);
++
++	*pos &= 0xF0; /* reset upper 4 bits*/
++	*pos |= (b >> 4);
++
++	return 0;
++}
++
++int32_t get_upper_4_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	lua_pushinteger(L, (*(uint8_t *)(seg->start + seg->offset)) & 0x0F);
++	return 1;
++}
++
++
++int32_t set_8_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	*(uint8_t *)(seg->start + seg->offset) = (uint8_t)luaL_checkinteger(L, 2);
++	return 0;
++}
++
++int32_t get_8_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++	lua_pushinteger(L, *(uint8_t *)(seg->start + seg->offset));
++	return 1;
++}
++
++int32_t set_1_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++	unsigned long l = 0;
++
++	memcpy(&l, (seg->start + seg->offset), seg->length);
++	l |= (1 << ((CHAR_BIT * seg->length) - luaL_checkinteger(L, 2)));
++	memcpy((seg->start + seg->offset), &l, seg->length);
++
++	return 0;
++}
++
++int32_t get_1_bit_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++	unsigned long l = 0;
++	uint32_t  bit = 0;
++
++	memcpy(&l, (seg->start + seg->offset), seg->length);
++	bit = l & (1 << ((CHAR_BIT * seg->length) - luaL_checkinteger(L, 2)));
++
++	lua_pushboolean(L, bit);
++	return 1;
++}
++
++int32_t get_string_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++    
++	/* Warning we cast from uchar to char */
++	lua_pushlstring(L, (char *)seg->start + seg->offset, seg->length);
++	return 1;
++}
++
++int32_t set_data_generic(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++	lua_packet_segment * data = checkbytearray(L, 2);
++
++	pr_debug("seg->length %u, data->length %u\n", seg->length, data->length);
++
++	if (seg->length >= data->length)
++		memcpy((seg->start + seg->offset), data->start, data->length);
++	else
++		luaL_error(L, "provided byte array too big for given packet segment");
++	return 0;
++}
++
++struct field_changes * get_allocated_field_changes(lua_State *L, int32_t nr_of_fields)
++{
++	struct field_changes * changes;
++
++	changes = kmalloc(sizeof(struct field_changes), GFP_ATOMIC);
++
++	if (!changes)
++		goto failure;
++
++	changes->field_length_changes = kmalloc(nr_of_fields * sizeof(int), GFP_ATOMIC);
++	if (!changes->field_length_changes)
++		goto free1;
++
++	changes->field_offset_changes = kmalloc(nr_of_fields * sizeof(int), GFP_ATOMIC);
++	if (!changes->field_offset_changes)
++		goto free2;
++
++	memset(changes->field_length_changes, 0, nr_of_fields * sizeof(int));
++	memset(changes->field_offset_changes, 0, nr_of_fields * sizeof(int));
++
++	changes->ref_count = 1;
++
++	return changes;
++
++free2: kfree(changes->field_length_changes);
++free1: kfree(changes);
++failure:
++	if (!changes) luaL_error(L, "couldnt allocate memory inside 'get_allocated_field_changes'");
++	return NULL; /* only to omit warnings */
++}
+\ No newline at end of file
+--- /dev/null
++++ b/extensions/LUA/prot_buf_icmp.c
+@@ -0,0 +1,49 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "controller.h"
++
++static int32_t icmp_has_protocol(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int32_t protocol_type)
++{
++	return 0;
++}
++
++static const struct protocol_field icmp_protocol_fields[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "type",     0,		   8,		   NULL,	      NULL	},
++	{ "code",     8,		   8,		   NULL,	      NULL	},
++	{ "checksum", 16,		   16,		   NULL,	      NULL	},
++	{ "id",	      32,		   16,		   NULL,	      NULL	},
++	{ "sequence", 48,		   16,		   NULL,	      NULL	},
++	PROT_FIELD_SENTINEL,
++};
++
++static const struct protocol_buf icmp_protocol_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_ICMP,
++	.payload_field			= NULL,
++	.protocol_fields		= (struct protocol_field *)&icmp_protocol_fields,
++	.has_protocol			= &icmp_has_protocol,
++	.get_field_changes		= NULL,
++};
++
++void luaopen_protbuf_icmp(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&icmp_protocol_buf, PACKET_ICMP);
++}
++
+--- /dev/null
++++ b/extensions/LUA/prot_buf_ip.c
+@@ -0,0 +1,209 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#if defined(__KERNEL__)
++	#include <net/checksum.h>
++	#include <net/tcp.h>
++#endif
++
++#include "controller.h"
++
++
++#define IP_FMT "%u.%u.%u.%u"
++#define IP_ACC(buf) buf[0], buf[1], buf[2], buf[3]
++
++
++static int32_t ip_version_set(lua_State *L)
++{
++	uint8_t version_checked;
++	lua_packet_segment * seg = checkpacketseg(L, 1, LUA_PACKET_SEG_IP);
++	uint8_t *version_seg = seg->start + seg->offset;
++	int32_t version = luaL_checkinteger(L, 2);
++
++	luaL_argcheck(L, version >= 0 && version <= 15, 1, "version number invalid");
++
++	version_checked = (uint8_t)version;
++
++	version_seg[0] &= (uint8_t)0x0F;  /* reset version bits */
++	version_seg[0] |= version_checked << 4;
++
++	return 0;
++}
++static int32_t ip_version_get(lua_State *L)
++{
++	lua_packet_segment * seg = checkpacketseg(L, 1, LUA_PACKET_SEG_IP);
++	uint8_t *version_seg = seg->start + seg->offset;
++	uint8_t v = version_seg[0] & 0xF0;
++
++	v >>= 4;
++
++	lua_pushinteger(L, v);
++	return 1;
++}
++
++static int32_t ip_ihl_set(lua_State *L)
++{
++	uint8_t ihl_checked;
++	lua_packet_segment * seg = checkpacketseg(L, 1, LUA_PACKET_SEG_IP);
++	uint8_t *ihl_seg = seg->start + seg->offset;
++	int32_t ihl = luaL_checkinteger(L, 2);
++
++	luaL_argcheck(L, ihl >= 5 && ihl <= 15, 1, "ip header length invalid");         // RFC 791 5x32 = 160 bits
++
++	ihl_checked = (uint8_t)ihl;
++
++	ihl_seg[0] &= (uint8_t)0xF0;      /* reset ihl bits */
++	ihl_seg[0] |= ihl_checked;
++
++	return 0;
++}
++static int32_t ip_ihl_get(lua_State *L)
++{
++	lua_packet_segment * seg = checkpacketseg(L, 1, LUA_PACKET_SEG_IP);
++	uint8_t *ihl_seg = seg->start + seg->offset;
++	uint8_t v = ihl_seg[0] & 0x0F;
++
++	lua_pushinteger(L, v);
++	return 1;
++}
++
++static int32_t ip_addr_set(lua_State *L)
++{
++	int32_t field_id = lua_tointeger(L, lua_upvalueindex(2));
++	lua_packet_segment * seg = checkpacketseg(L, 1, LUA_PACKET_SEG_IP);
++	uint8_t *addr_seg = seg->start + seg->offset;
++	uint32_t  old_addr;
++	char *ip = (char *)luaL_checkstring(L, 2);
++	uint32_t  a, b, c, d;
++	struct sk_buff * skb = (struct sk_buff *)lua_touserdata(L, 3);
++
++	/* for tcp / udp checksumming*/
++	uint32_t  prot_offset;
++	uint8_t *check, *protocol_seg;
++
++	/* end */
++
++	sscanf(ip, IP_FMT, &a, &b, &c, &d);
++
++	luaL_argcheck(L, a < 256 && b < 256 && c < 256 && d < 256, 1, "invalid ip addr");
++
++	old_addr = *((uint32_t  *)addr_seg);
++	addr_seg[0] = (uint8_t)a;
++	addr_seg[1] = (uint8_t)b;
++	addr_seg[2] = (uint8_t)c;
++	addr_seg[3] = (uint8_t)d;
++
++#if defined(__KERNEL__)
++	if (old_addr != *(uint32_t  *)addr_seg) {
++		int32_t offset = (field_id == 10) ? -2 : -6;         /* offset from saddr or daddr */
++
++		csum_replace4((uint16_t *)(addr_seg + offset), old_addr, *(uint32_t  *)addr_seg);
++
++		prot_offset = (field_id == 10) ? -3 : -7;         /* offset from saddr or daddr */
++		protocol_seg = seg->start + seg->offset + prot_offset;
++
++		if (skb && (protocol_seg[0] == 0x06 || protocol_seg[0] == 0x11)) {               /* is payload TCP or UDP ? */
++
++			check = seg->start + seg->offset;                       /* tmp res */
++			check += (field_id == 10) ? 8 : 16;                     /* the start of the payload, depending saddr or daddr */
++			check += (protocol_seg[0] == 0x06) ? 16 : 6;            /* the start of the checksum, depending on TCP or UDP */
++
++			inet_proto_csum_replace4((__sum16 *)check, skb, old_addr, *(uint32_t  *)addr_seg, 1);
++
++			lua_pop(L, 1);
++		}
++	}
++#endif
++	return 0;
++}
++
++
++
++
++
++static int32_t ip_addr_get(lua_State *L)
++{
++	lua_packet_segment * seg = checkpacketseg(L, 1, LUA_PACKET_SEG_IP);
++	uint8_t *addr_seg = seg->start + seg->offset;
++
++	char buf[16]; /*max: 255.255.255.255\0 --> 16 chars */
++
++	sprintf(buf, IP_FMT, IP_ACC(addr_seg));
++	lua_pushstring(L, buf);
++	return 1;
++}
++
++static int32_t ip_has_protocol(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int32_t protocol_type)
++{
++	uint8_t * embedded_protocol = seg->start + seg->offset + 9 /*bytes*/;
++
++	switch (embedded_protocol[0]) {
++	case 0x01:      /* 1: Internet Control Message Protocol (ICMP) */
++		if (protocol_type == PACKET_ICMP) return 1;
++		break;
++	case 0x02:      /* 2: Internet Group Management Protocol (IGMP) */
++		break;
++	case 0x06:      /* 6: Transmission Control Protocol (TCP) */
++		if (protocol_type == PACKET_TCP) return 1;
++		break;
++	case 0x11:      /* 17: User Datagram Protocol (UDP) */
++		if (protocol_type == PACKET_UDP) return 1;
++		break;
++	case 0x59:      /* 89: Open Shortest Path First (OSPF) */
++		break;
++	case 0x84:      /* 132: Stream Control Transmission Protocol (SCTP) */
++		break;
++	default:
++		break;
++	}
++
++	return 0;
++}
++
++static const struct protocol_field ip_protocol_fields[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "version",  0,		   4,		   ip_version_get,		   ip_version_set		},
++	{ "ihl",      4,		   4,		   ip_ihl_get,			   ip_ihl_set			},
++	{ "tos",      8,		   8,		   get_8_bit_generic,		   set_8_bit_generic		},
++	{ "tot_len",  16,		   16,		   get_16_bit_generic,		   set_16_bit_generic		},
++	{ "id",	      32,		   16,		   get_16_bit_generic,		   set_16_bit_generic		},
++	{ "flags",    48,		   3,		   get_1_bit_generic,		   set_1_bit_generic		},
++	{ "frag_off", 51,		   13,		   NULL,			   NULL				},
++	{ "ttl",      64,		   8,		   get_8_bit_generic,		   set_8_bit_generic		},
++	{ "protocol", 72,		   8,		   get_8_bit_generic,		   set_8_bit_generic		},
++	{ "check",    80,		   16,		   get_16_bit_generic,		   set_16_bit_generic		},
++	{ "saddr",    96,		   32,		   ip_addr_get,			   ip_addr_set			},
++	{ "daddr",    128,		   32,		   ip_addr_get,			   ip_addr_set			},
++	{ "data",     160,		   0,		   NULL,			   set_data_generic		},
++	PROT_FIELD_SENTINEL,
++};
++
++static const struct protocol_buf ip_protocol_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_IP,
++	.payload_field			= "data",
++	.protocol_fields		= (struct protocol_field *)&ip_protocol_fields,
++	.has_protocol			= &ip_has_protocol,
++	.get_field_changes		= NULL,
++};
++
++void luaopen_protbuf_ip(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&ip_protocol_buf, PACKET_IP);
++}
++
+--- /dev/null
++++ b/extensions/LUA/prot_buf_raw.c
+@@ -0,0 +1,43 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "controller.h"
++static int32_t raw_has_protocol(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int32_t protocol_type)
++{
++	return 1;
++}
++
++static const struct protocol_field raw_protocol_fields[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "data", 0,		    0,		    NULL,	       NULL	 },
++	PROT_FIELD_SENTINEL,
++};
++
++static const struct protocol_buf raw_protocol_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_RAW,
++	.payload_field			= "data",
++	.protocol_fields		= (struct protocol_field *)&raw_protocol_fields,
++	.has_protocol			= &raw_has_protocol,
++	.get_field_changes		= NULL,
++};
++
++void luaopen_protbuf_raw(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&raw_protocol_buf, PACKET_RAW);
++}
+--- /dev/null
++++ b/extensions/LUA/prot_buf_tcp.c
+@@ -0,0 +1,188 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#if defined(__KERNEL__)
++	#include <net/checksum.h>
++	#include <net/tcp.h>
++#endif
++#include "controller.h"
++
++
++static int32_t tcp_has_protocol(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int32_t protocol_type)
++{
++	return 1;
++}
++
++static int32_t tcp_set_checksum(lua_State *L)
++{
++	struct protocol_buf * prot_buf = (struct protocol_buf *)lua_topointer(L, lua_upvalueindex(1));
++	lua_packet_segment * seg = checkpacketseg(L, 1, prot_buf->name);
++
++#if defined(__KERNEL__)
++	uint8_t * check_seg = seg->start + seg->offset;
++	uint8_t * tcp_hdr = check_seg - 16;
++	uint8_t * saddr = tcp_hdr - 8;
++	uint8_t * daddr = saddr + 4;
++	uint32_t  len = 20 + (seg->changes->field_length_changes[11] / 8) + (seg->changes->field_length_changes[10] / 8);
++	unsigned short checksum = tcp_v4_check(len, *(uint32_t  *)saddr, *(uint32_t  *)daddr,
++					       csum_partial(tcp_hdr, len, 0));
++
++	memcpy(check_seg, &checksum, sizeof(unsigned short));
++#endif
++	return 0;
++}
++
++
++static const struct protocol_field tcp_protocol_fields[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "sport",	 0,			     16,	      get_16_bit_generic,		    set_16_bit_generic		   },
++	{ "dport",	 16,			     16,	      get_16_bit_generic,		    set_16_bit_generic		   },
++	{ "seq",	 32,			     32,	      get_32_bit_generic,		    set_32_bit_generic		   },
++	{ "ack",	 64,			     32,	      get_32_bit_generic,		    set_32_bit_generic		   },
++	{ "data_off",	 96,			     4,		      get_lower_4_bit_generic,		    set_lower_4_bit_generic	   },
++	{ "reserved",	 100,			     4,		      get_upper_4_bit_generic,		    set_upper_4_bit_generic	   },
++	{ "flags",	 104,			     8,		      get_1_bit_generic,		    set_1_bit_generic		   },
++	{ "window_size", 112,			     16,	      get_16_bit_generic,		    set_16_bit_generic		   },
++	{ "check",	 128,			     16,	      get_16_bit_generic,		    tcp_set_checksum		   },
++	{ "urgent",	 144,			     16,	      NULL,				    NULL			   },
++	{ "options",	 160,			     0,		      NULL,				    set_data_generic		   },
++	{ "data",	 160,			     0,		      NULL,				    set_data_generic		   }, /* begin of data depends on options */
++	PROT_FIELD_SENTINEL,
++};
++
++
++static const struct protocol_field tcp_options_and_data[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "MSS",   0,			       16,		get_16_bit_generic,		set_16_bit_generic	     },
++	{ "WS",	   0,			       8,		get_8_bit_generic,		set_8_bit_generic	     },
++	{ "SACK",  0,			       16,		get_16_bit_generic,		set_16_bit_generic	     },
++	{ "TSVAL", 0,			       32,		get_32_bit_generic,		set_32_bit_generic	     },
++	{ "TSER",  0,			       32,		get_32_bit_generic,		set_32_bit_generic	     },
++	PROT_FIELD_SENTINEL,
++};
++
++
++static struct field_changes * tcp_get_field_changes(lua_State *L, lua_packet_segment * seg);
++
++static const struct protocol_buf tcp_protocol_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_TCP,
++	.payload_field			= "data",
++	.protocol_fields		= (struct protocol_field *)&tcp_protocol_fields,
++	.has_protocol			= &tcp_has_protocol,
++	.get_field_changes		= &tcp_get_field_changes,
++};
++
++
++static struct field_changes * tcp_options_get_field_changes(lua_State *L, lua_packet_segment * seg);
++
++static const struct protocol_buf tcp_options_and_data_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_TCP_OPT,
++	.payload_field			= NULL,
++	.protocol_fields		= (struct protocol_field *)&tcp_options_and_data,
++	.has_protocol			= NULL,
++	.get_field_changes		= &tcp_options_get_field_changes,
++};
++
++struct field_changes * tcp_get_field_changes(lua_State *L, lua_packet_segment * seg)
++{
++	/* depending on the value stored inside the 'data_off'-field, the length of
++	 * the 'options' field has to be changed, as well as the length and offset
++	 * of the 'data' field */
++	uint8_t *tcp_hdr = seg->start + seg->offset;
++
++	/* get the pointer to the 'data_off' field */
++	uint8_t * data_off_field = tcp_hdr + 12; /* 12 bytes offset */
++	/* extract the stored header length in bits */
++	uint32_t  tcp_hdr_len = ((*(uint8_t *)data_off_field) >> 4) * 32;
++
++	/* get an allocated 'field_changes' structure */
++	struct field_changes * changes = get_allocated_field_changes(L, 12);
++
++	/* depending on the tcp header length, change the length of the options*/
++	changes->field_length_changes[10] = tcp_hdr_len - 160;
++	/* depending on the options length, change the offset of the data */
++	changes->field_offset_changes[11] = changes->field_length_changes[10];
++	changes->field_length_changes[11] = (seg->length * 8) - tcp_hdr_len;
++
++	return changes;
++
++}
++
++struct field_changes * tcp_options_get_field_changes(lua_State *L, lua_packet_segment * seg)
++{
++	/* depending on the value stored inside the 'data_off'-field, the length of
++	 * the 'options' field has to be changed, as well as the length and offset
++	 * of the 'data' field */
++	uint8_t *tcp_opt_hdr = seg->start + seg->offset;
++
++	/* get an allocated 'field_changes' structure */
++	struct field_changes * changes = get_allocated_field_changes(L, 5);
++
++	int32_t MSS = 0, WS = 0, SACK = 0, TS = 0, i;
++
++	uint8_t b1, b2;
++
++	for (i = 0; i < seg->length; i++) {
++		b1 = tcp_opt_hdr[i];
++		b2 = tcp_opt_hdr[i + 1];
++
++		if (b1 == 0x00)
++			break;
++
++		/* test for MSS */
++		if (!MSS && (b1 == 0x02 && b2 == 0x04)) {
++			changes->field_offset_changes[0] = (i + 2) * CHAR_BIT;
++			MSS = 1;
++		}
++
++		/* test for WS --- yet buggy somehow */
++		if (!WS && (b1 == 0x03 && b2 == 0x03)) {
++			changes->field_offset_changes[1] = (i + 2) * CHAR_BIT;
++			WS = 1;
++		}
++
++		/* test for SACK*/
++		if (!SACK && (b1 == 0x04 && b2 == 0x02)) {
++			changes->field_offset_changes[2] = i * CHAR_BIT;        /* has no value */
++			SACK = 1;
++		}
++
++		/* test for TS */
++		if (!TS && (b1 == 0x08 && b2 == 0x0A)) {
++			changes->field_offset_changes[3] = (i + 2) * CHAR_BIT;
++			changes->field_offset_changes[4] = (i + 2 + 4) * CHAR_BIT;
++			TS = 1;
++		}
++	}
++
++	return changes;
++
++}
++
++void luaopen_protbuf_tcp(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&tcp_protocol_buf, PACKET_TCP);
++}
++void luaopen_protbuf_tcp_options(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&tcp_options_and_data_buf, PACKET_TCP_OPTIONS);
++}
++
++
+--- /dev/null
++++ b/extensions/LUA/prot_buf_tftp.c
+@@ -0,0 +1,87 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++#include "controller.h"
++
++static const struct protocol_field tftp_protocol_fields[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "opcode",  		0,		16,		get_16_bit_generic,	NULL},
++	{ "filename",  		0,		0,		get_string_generic,	NULL},
++	{ "mode", 			0,		0,		get_string_generic, NULL},
++	{ "block_nr",		0,		16,		get_16_bit_generic, NULL},
++	{ "data",			0,		0,		NULL, NULL},
++	PROT_FIELD_SENTINEL,
++};
++
++struct field_changes * tftp_get_field_changes(lua_State *L, lua_packet_segment * seg)
++{
++	/* depending on the value stored inside the 'opcode'-field we have to change
++	 * offsets and lengths */
++	uint8_t *tftp_hdr = seg->start + seg->offset;
++	short opcode = ntohs(*((uint16_t *)tftp_hdr));
++	/* get an allocated 'field_changes' structure */
++	struct field_changes * changes = get_allocated_field_changes(L, 5);
++	switch (opcode) {
++		case 1:	/* Read Request (RRQ) */
++			/* setting offset and length of field 'filename' */
++			changes->field_offset_changes[1] = sizeof(unsigned short) << 3;
++			changes->field_length_changes[1] = strlen((char *)tftp_hdr + sizeof(unsigned short)) << 3;
++			/* setting offset and length of field 'mode' */
++			changes->field_offset_changes[2] = changes->field_offset_changes[1] + changes->field_length_changes[1];
++			changes->field_length_changes[2] = strlen((char *)tftp_hdr + (changes->field_offset_changes[2] >> 3));
++			break;
++		case 2:	/* Write Request (WRQ) */
++			/* setting offset and length of field 'filename' */
++			changes->field_offset_changes[1] = sizeof(unsigned short) << 3;
++			changes->field_length_changes[1] = strlen((char *)tftp_hdr + sizeof(unsigned short)) << 3;
++			/* setting offset and length of field 'mode' */
++			changes->field_offset_changes[2] = changes->field_offset_changes[1] + changes->field_length_changes[1];
++			changes->field_length_changes[2] = strlen((char *)tftp_hdr + (changes->field_offset_changes[2] >> 3));
++			break;
++		case 3:	/* Data (DATA) */
++			/* setting offset of field 'block_nr' */
++			changes->field_offset_changes[3] = sizeof(unsigned short) << 3;
++			/* setting offset of field 'data' */
++			changes->field_offset_changes[4] = changes->field_offset_changes[3] + (sizeof(unsigned short) << 3);
++			break;
++		case 4: /* Acknowledgment (ACK) */
++			/* setting offset of field 'block_nr' */
++			changes->field_offset_changes[3] = sizeof(unsigned short) << 3;
++			break;
++		case 5: /* Error (ERROR) */
++			/* we don't care ... yet */
++			break;
++		default:
++			break;
++	}
++
++	return changes;
++}
++
++static const struct protocol_buf tftp_protocol_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_TFTP,
++	.payload_field		= NULL,
++	.protocol_fields	= (struct protocol_field *)&tftp_protocol_fields,
++	.has_protocol		= NULL, /* we don't need it, since we don't provide a payload field */
++	.get_field_changes	= tftp_get_field_changes,
++};
++
++void luaopen_protbuf_tftp(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&tftp_protocol_buf, PACKET_TFTP);
++}
+--- /dev/null
++++ b/extensions/LUA/prot_buf_udp.c
+@@ -0,0 +1,53 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#if defined(__KERNEL__)
++	#include <net/checksum.h>
++#endif
++
++#include "controller.h"
++
++
++static int32_t udp_has_protocol(lua_State *L, struct protocol_buf * prot_buf, lua_packet_segment * seg, int32_t protocol_type)
++{
++	return 1;
++}
++
++static const struct protocol_field udp_protocol_fields[] = {
++	/*	 field name    offset  length  getter  setter  */
++	{ "sport",  0,			       16,		get_16_bit_generic,		set_16_bit_generic	},
++	{ "dport",  16,			       16,		get_16_bit_generic,		set_16_bit_generic	},
++	{ "length", 32,			       16,		get_16_bit_generic,		set_16_bit_generic	},
++	{ "check",  48,			       16,		get_16_bit_generic,		set_16_bit_generic	},
++	{ "data",   64,			       0,		NULL,			  NULL		    },
++	PROT_FIELD_SENTINEL,
++};
++
++static const struct protocol_buf udp_protocol_buf = {
++	.is_dynamic			= 0,
++	.name				= LUA_PACKET_SEG_UDP,
++	.payload_field			= "data",
++	.protocol_fields		= (struct protocol_field *)&udp_protocol_fields,
++	.has_protocol			= &udp_has_protocol,
++	.get_field_changes		= NULL,
++};
++
++void luaopen_protbuf_udp(lua_State *L)
++{
++	register_protbuf(L, (struct protocol_buf *)&udp_protocol_buf, PACKET_UDP);
++}
+--- /dev/null
++++ b/extensions/LUA/xt_LUA.h
+@@ -0,0 +1,36 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre.graf@stud.unibas.ch>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef XT_LUA_H_
++#define XT_LUA_H_
++
++#define MAX_FILENAME_SIZE  256
++#define MAX_FUNCTION_SIZE  256
++#define MAX_SCRIPT_SIZE 32768
++#define LUA_STATE_ARRAY_SIZE 128
++
++/* the targetsize is stored in a u16, so max size of the xt_lua_tginfo cannot exceed 64K*/
++struct xt_lua_tginfo {
++	char buf[MAX_SCRIPT_SIZE];
++	char filename[MAX_FILENAME_SIZE];
++	char function[MAX_FUNCTION_SIZE];
++	__u64 script_size;
++	__u32 state_id;
++};
++
++#endif /* XT_LUA_H_ */
+--- /dev/null
++++ b/extensions/LUA/xt_LUA_target.c
+@@ -0,0 +1,286 @@
++/*
++ *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
++ *	by Andre Graf <andre@dergraf.org>
++ *
++ *	This program is free software; you can redistribute it and/or modify
++ *	it under the terms of the GNU General Public License as published by
++ *	the Free Software Foundation; either version 2 of the License, or
++ *	(at your option) any later version.
++ *
++ *	This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <net/ip.h>
++#include <linux/netfilter/x_tables.h>
++#include "xt_LUA.h"
++
++#include "controller.h"
++
++/*::*
++ * lua_envs
++ * ----------
++ * This array holds a defined number of `lua_envs`_ structures.
++ * The used array index is also used as the Lua state identifier.
++ * The size of the array is defined in `LUA_STATE_ARRAY_SIZE`_.
++ */
++struct lua_env * lua_envs[LUA_STATE_ARRAY_SIZE];
++
++/*::*
++ * lua_state_refs
++ * --------------
++ * This array holds the reference counts of the several `lua_nf_state`_s
++ * which are stored inside the array `lua_states`_.
++ */
++uint32_t  lua_state_refs[LUA_STATE_ARRAY_SIZE] = { 0 };
++
++/*::*
++ * lua_tg
++ * ------
++ * This function is called whenever a packet matches all matching conditions
++ * inside a rule. It is the target. It extracts the state identifier comming
++ * inside the *xt_target_param* structure and uses it to access the proper
++ * Lua state inside the `lua_states`_ array.
++ *
++ * It then constructs a new Lua userdata of type *lua_packet_segment* and
++ * initializes it with the lowest network header available. This userdata
++ * is annotated with the Lua metatable `LUA_PACKET_SEG_RAW`_ which converts
++ * the userdata to a raw lua packet having all raw functions available.
++ * This raw packet is the single parameter to the Lua function *process_packet*
++ * which must be defined inside the Lua script provided by the user. So far
++ * hardcoded, may be later configured by Lua - subject to change.
++ *
++ * The process_packet function must return an integer value, the verdict. For
++ * convenience reasons xt_LUA exports the verdicts NF_ACCEPT, NF_DROP and
++ * XT_CONTINUE inside the *register_lua_packet_lib* function.
++ */
++
++spinlock_t lock = SPIN_LOCK_UNLOCKED;
++
++static uint32_t 
++lua_tg(struct sk_buff *pskb, const struct xt_target_param *par)
++{
++	uint32_t  verdict;
++	lua_packet_segment *p;
++	const struct xt_lua_tginfo *info = par->targinfo;
++	lua_State * L;
++
++	/* START critical section on SMP, PacketScript is on the sequential trail at the moment TODO*/
++	spin_lock_irq(&lock);
++
++	L = lua_envs[info->state_id]->L;
++
++	if (!skb_make_writable(pskb, pskb->len))
++		return NF_DROP;
++
++	/* call the function provided by --function parameter or the default 'process_packet' defined in Lua */
++	lua_getglobal(L, info->function);
++
++	/* push the lua_packet_segment as a parameter */
++	p = (lua_packet_segment *)lua_newuserdata(L, sizeof(lua_packet_segment));
++	if (pskb->mac_header)
++		p->start = pskb->mac_header;
++	else if (pskb->network_header)
++		p->start = pskb->network_header;
++	else if (pskb->transport_header)
++		p->start = pskb->transport_header;
++	p->offset = 0;
++	p->length = (unsigned long)pskb->tail - (unsigned long)p->start;
++	p->changes = NULL;
++
++	/* marking userdata 'lua_packet_seg' with the corresponding metatable */
++	luaL_getmetatable(L, LUA_PACKET_SEG_RAW);
++	lua_setmetatable(L, -2);
++
++	/* push a reference to the skb as a parameter, needed at the moment for calculating TCP checksum, but I am not happy with it*/
++	lua_pushlightuserdata(L, (void *)skb_get(pskb));
++
++	/* do the function call (2 argument, 1 result) */
++	if (lua_pcall(L, 2, 1, 0) != 0) {
++		printk(KERN_ERR "LUA [%d]: pcall '%s' failed: %s\n", info->state_id, info->function, lua_tostring(L, -1));
++		lua_pop(L, 1);
++		return NF_DROP;
++	}
++
++	if (!lua_isnumber(L, -1)) {
++		printk(KERN_ERR "LUA [%d]: function '%s' must return a verdict\n", info->state_id, info->function);
++		lua_pop(L, 1);
++		return NF_DROP;
++	}
++
++	verdict = lua_tonumber(L, -1);
++	lua_pop(L, 1);
++
++	kfree_skb(pskb);
++
++	/* END critical section on SMP */
++	spin_unlock_irq(&lock);
++
++
++	return verdict;
++
++} 
++/* Helper for checkentry */
++static bool load_script_into_state(uint32_t  state_id, unsigned long script_size, char *script_buf)
++{
++	char *buf = kmalloc(script_size, GFP_KERNEL);
++	int32_t ret;
++	struct lua_env * env = kmalloc(sizeof(struct lua_env), GFP_KERNEL);
++
++	if (!script_size > 0) {
++		pr_debug("LUA [%d]: script_size %lu < 0\n", state_id, script_size);
++		return false;
++	}
++
++	env->L = lua_open();
++	luaopen_base(env->L);
++	luaopen_controller(env->L);
++
++	lua_getglobal(env->L, "_G");
++	lua_pushinteger(env->L, state_id);
++	lua_setfield(env->L, -2, "STATE_ID");
++	lua_pop(env->L, 1); /* pop _G */
++
++	strncpy(buf, script_buf, script_size);
++	ret = luaL_loadbuffer(env->L, buf, script_size, "PacketScript, loadbuffer") ||
++	      lua_pcall(env->L, 0, 1, 0);
++
++	if (ret != 0) {
++		printk(KERN_ERR "LUA [%d]: failure loading script, error %s \n", state_id, lua_tostring(env->L, -1));
++		lua_pop(env->L, 1);
++		kfree(buf);
++		kfree(env);
++		return false;
++	}
++
++	lua_envs[state_id] = env;
++
++	kfree(buf);
++
++	return true;
++}
++/*::*
++ * lua_tg_checkentry
++ * -----------------
++ * This function is used as a kernel-side sanity check of the data comming
++ * from the iptables userspace program. Since this is the function which is
++ * called everytime a new rule (with -j xt_LUA) is injected, this function
++ * is used to do the bookkeeping work, such as counting the reference of
++ * several Lua states and the initialization of new states if needed. As an
++ * extra initialization step it loads the provided Lua script into the Lua
++ * state.
++ *
++ * Lua state initialization
++ * ~~~~~~~~~~~~~~~~~~~~~~~~
++ * 1. If a new rule is inserted and there is no existing state for the given
++ *    state identifier (default state identifier is 0) a new Lua state is
++ *    initialized using *lua_open*.
++ * 2. The Lua base library is registered inside the newly initialized state.
++ *    Have a look at *lua/lbaselib.c* to see what functions of the Lua base
++ *    library are available inside Lua.
++ * 3. The Lua packet library is registered inside the Lua state using the
++ *    function *register_lua_packet_lib*. So far this function only registers
++ *    the Netfilter verdicts NF_ACCEPT, NF_DROP and XT_CONTINUE inside the
++ *    global environment of the given Lua state.
++ * 4. All the protocol Buffers, and the functions for accessing the bytes are
++ *    registered using *register_protocols*.
++ *
++ * Lua state reference counting
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ * Bookkeeping of the Lua states inside the *lua_state_refs* array. The
++ * state identifier is mapped to the array index, which holds an integer
++ * counting the several initialized states.
++ *
++ * Loading the Lua script
++ * ~~~~~~~~~~~~~~~~~~~~~~
++ * Copying the buffer which was initialized by the userspace program to a
++ * buffer with the proper size. The script is then loaded by the function
++ * xt_LUA_loadcode, which wrapps the *luaL_loadbuffer* function and does
++ * some workqueue initialization. So far this is done each time this function
++ * is called, subject to change.
++ */
++static bool
++lua_tg_checkentry(const struct xt_tgchk_param *par)
++{
++	const struct xt_lua_tginfo *info = par->targinfo;
++
++	if (load_script_into_state(info->state_id, info->script_size, (char *)info->buf)) {
++		lua_state_refs[info->state_id]++;
++		return true;
++	}
++	return false;
++}
++
++/*::*
++ * lua_tg_destroy
++ * --------------
++ * This function is the counterpart of the `lua_tg_checkentry`_ function. It is
++ * responsible to free all the resources alocated inside the checkentry process.
++ * To be more specific it frees the Lua state using *lua_close* and kfree on all
++ * the dynamically allocated pointers to the registered dynamic protocol buffers.
++ *
++ * Additionally the function cares about decrementing the reference counters
++ * inside the array `lua_states`_.
++ */
++static void
++lua_tg_destroy(const struct xt_tgdtor_param *par)
++{
++	const struct xt_lua_tginfo *info = par->targinfo;
++	struct lua_env * env = lua_envs[info->state_id];
++
++	if (lua_state_refs[info->state_id] == 1) {
++		lua_close(env->L);
++		cleanup_dynamic_prot_bufs();  /* clean memory allocated by protocols defined in Lua */
++		kfree(env);
++		pr_debug("LUA [%d]: Rule removed, close Lua state\n", info->state_id);
++	} else
++		pr_debug("LUA [%d]: Rule removed, Lua state stays open, referenced %d time(s)\n",
++			 info->state_id, lua_state_refs[info->state_id] - 1);
++	
++	lua_state_refs[info->state_id]--;
++}
++
++static struct xt_target lua_tg_reg __read_mostly = {
++	.name			= "LUA",
++	.revision		= 0,
++	.family			= NFPROTO_UNSPEC,
++	.targetsize		= XT_ALIGN(sizeof(struct xt_lua_tginfo)),
++	.target			= lua_tg,
++	.checkentry		= lua_tg_checkentry,
++	.destroy		= lua_tg_destroy,
++	.me			= THIS_MODULE,
++};
++
++
++static int32_t lua_tg_init(void)
++{
++	return xt_register_target(&lua_tg_reg);
++}
++
++static void lua_tg_exit(void)
++{
++	xt_unregister_target(&lua_tg_reg);
++}
++
++module_init(lua_tg_init);
++module_exit(lua_tg_exit);
++
++MODULE_AUTHOR("Andre Graf <andre@dergraf.org>");
++MODULE_DESCRIPTION("Xtables: Processing of matched packets using the Lua scripting environment");
++MODULE_ALIAS("ipt_LUA");
++MODULE_ALIAS("ipt6t_LUA");
++MODULE_ALIAS("arpt_LUA");
++MODULE_ALIAS("ebt_LUA");
++MODULE_LICENSE("GPL");
++
++
++
+--- a/extensions/Kbuild
++++ b/extensions/Kbuild
+@@ -29,6 +29,7 @@ obj-${build_pknock}      += pknock/
+ obj-${build_psd}         += xt_psd.o
+ obj-${build_quota2}      += xt_quota2.o
+ obj-${build_rtsp}        += rtsp/
++obj-${build_LUA}         += LUA/
+ 
+ -include ${M}/*.Kbuild
+ -include ${M}/Kbuild.*
+--- a/extensions/Mbuild
++++ b/extensions/Mbuild
+@@ -22,3 +22,4 @@ obj-${build_pknock}      += pknock/
+ obj-${build_psd}         += libxt_psd.so
+ obj-${build_quota2}      += libxt_quota2.so
+ obj-${build_gradm}       += libxt_gradm.so
++obj-${build_LUA}         += LUA/
+--- a/mconfig
++++ b/mconfig
+@@ -23,3 +23,4 @@ build_pknock=m
+ build_psd=m
+ build_quota2=m
+ build_rtsp=m
++build_LUA=m
diff --git a/trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch b/trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
new file mode 100644
index 00000000..966d29df
--- /dev/null
+++ b/trunk/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
@@ -0,0 +1,89 @@
+--- a/extensions/LUA/xt_LUA_target.c
++++ b/extensions/LUA/xt_LUA_target.c
+@@ -64,10 +64,10 @@ uint32_t  lua_state_refs[LUA_STATE_ARRAY
+  * XT_CONTINUE inside the *register_lua_packet_lib* function.
+  */
+ 
+-spinlock_t lock = SPIN_LOCK_UNLOCKED;
++DEFINE_SPINLOCK(lock);
+ 
+ static uint32_t 
+-lua_tg(struct sk_buff *pskb, const struct xt_target_param *par)
++lua_tg(struct sk_buff *pskb, const struct xt_action_param *par)
+ {
+ 	uint32_t  verdict;
+ 	lua_packet_segment *p;
+@@ -208,16 +208,16 @@ static bool load_script_into_state(uint3
+  * some workqueue initialization. So far this is done each time this function
+  * is called, subject to change.
+  */
+-static bool
++static int
+ lua_tg_checkentry(const struct xt_tgchk_param *par)
+ {
+ 	const struct xt_lua_tginfo *info = par->targinfo;
+ 
+ 	if (load_script_into_state(info->state_id, info->script_size, (char *)info->buf)) {
+ 		lua_state_refs[info->state_id]++;
+-		return true;
++		return 0;
+ 	}
+-	return false;
++	return -EINVAL;
+ }
+ 
+ /*::*
+--- a/extensions/LUA/lua/llimits.h
++++ b/extensions/LUA/lua/llimits.h
+@@ -8,7 +8,6 @@
+ #define llimits_h
+ 
+ #include <stddef.h>
+-#include <limits.h>
+ 
+ #include "lua.h"
+ 
+--- a/extensions/LUA/lua/lapi.c
++++ b/extensions/LUA/lua/lapi.c
+@@ -4,9 +4,6 @@
+ ** See Copyright Notice in lua.h
+ */
+ 
+-#include <stdarg.h>
+-#include <math.h>
+-#include <assert.h>
+ #include <string.h>
+ 
+ #define lapi_c
+--- a/extensions/LUA/lua/ltable.c
++++ b/extensions/LUA/lua/ltable.c
+@@ -18,7 +18,6 @@
+ ** Hence even when the load factor reaches 100%, performance remains good.
+ */
+ 
+-#include <math.h>
+ #include <string.h>
+ 
+ #define ltable_c
+--- a/extensions/LUA/lua/luaconf.h
++++ b/extensions/LUA/lua/luaconf.h
+@@ -13,6 +13,10 @@
+ #if !defined(__KERNEL__)
+ #include <limits.h>
+ #else
++#undef UCHAR_MAX
++#undef SHRT_MAX
++#undef BUFSIZ
++#undef NO_FPU
+ #define UCHAR_MAX	255
+ #define SHRT_MAX        32767
+ #define BUFSIZ 		8192
+@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; 
+ */
+ #if defined(__KERNEL__)
+ #undef LUA_USE_ULONGJMP
++#define setjmp __builtin_setjmp
++#define longjmp __builtin_longjmp
+ #endif
+ 
+ #if defined(__cplusplus)
diff --git a/trunk/package/network/utils/xtables-addons/patches/300-geoip-endian-detection.patch b/trunk/package/network/utils/xtables-addons/patches/300-geoip-endian-detection.patch
new file mode 100644
index 00000000..842e7afc
--- /dev/null
+++ b/trunk/package/network/utils/xtables-addons/patches/300-geoip-endian-detection.patch
@@ -0,0 +1,18 @@
+--- a/extensions/libxt_geoip.c
++++ b/extensions/libxt_geoip.c
+@@ -59,13 +59,13 @@ geoip_get_subnets(const char *code, uint
+ 
+ 	/* Use simple integer vector files */
+ 	if (nfproto == NFPROTO_IPV6) {
+-#if __BYTE_ORDER == _BIG_ENDIAN
++#if BYTE_ORDER == BIG_ENDIAN
+ 		snprintf(buf, sizeof(buf), GEOIP_DB_DIR "/BE/%s.iv6", code);
+ #else
+ 		snprintf(buf, sizeof(buf), GEOIP_DB_DIR "/LE/%s.iv6", code);
+ #endif
+ 	} else {
+-#if __BYTE_ORDER == _BIG_ENDIAN
++#if BYTE_ORDER == BIG_ENDIAN
+ 		snprintf(buf, sizeof(buf), GEOIP_DB_DIR "/BE/%s.iv4", code);
+ #else
+ 		snprintf(buf, sizeof(buf), GEOIP_DB_DIR "/LE/%s.iv4", code);
diff --git a/trunk/package/system/ca-certificates/Makefile b/trunk/package/system/ca-certificates/Makefile
new file mode 100644
index 00000000..0caf0271
--- /dev/null
+++ b/trunk/package/system/ca-certificates/Makefile
@@ -0,0 +1,48 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ca-certificates
+PKG_VERSION:=20141019
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates
+PKG_MD5SUM:=f619282081c8bfc65ea64c37fa5285ed
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ca-certificates
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=System CA certificates
+endef
+
+define Build/Install
+	mkdir -p \
+		$(PKG_INSTALL_DIR)/usr/sbin \
+		$(PKG_INSTALL_DIR)/usr/share/ca-certificates
+	$(call Build/Install/Default,)
+endef
+
+define Package/ca-certificates/install
+	$(INSTALL_DIR) $(1)/etc/ssl/certs
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ca-certificates/*/*.crt $(1)/etc/ssl/certs/
+
+	for CERTFILE in `ls -1 $(1)/etc/ssl/certs`; do \
+		HASH=`openssl x509 -hash -noout -in $(1)/etc/ssl/certs/$$$$CERTFILE` ; \
+		SUFFIX=0 ; \
+		while [ -h "$(1)/etc/ssl/certs/$$$$HASH.$$$$SUFFIX" ]; do \
+			let "SUFFIX += 1" ; \
+		done ; \
+		ln -s "$$$$CERTFILE" "$(1)/etc/ssl/certs/$$$$HASH.$$$$SUFFIX" ; \
+	done
+endef
+
+$(eval $(call BuildPackage,ca-certificates))
diff --git a/trunk/package/system/fstools/Makefile b/trunk/package/system/fstools/Makefile
new file mode 100644
index 00000000..9a1a13b8
--- /dev/null
+++ b/trunk/package/system/fstools/Makefile
@@ -0,0 +1,80 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fstools
+PKG_VERSION:=2014-12-01
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/fstools.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=e65232440111b8f6654218033431e5bdd20525c2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+CMAKE_INSTALL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_USE_MIPS16:=0
+
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
+
+define Package/fstools
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+ubox +USE_EGLIBC:librt +NAND_SUPPORT:ubi-utils
+  TITLE:=libreCMC filesystem tools
+endef
+
+define Package/block-mount
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Block device mounting and checking
+  DEPENDS:=+ubox +libubox +libuci
+endef
+
+define Package/fstools/install
+	$(INSTALL_DIR) $(1)/sbin $(1)/lib
+
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset,snapshot_tool} $(1)/sbin/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libfstools.so $(1)/lib/
+	$(INSTALL_BIN) ./files/snapshot $(1)/sbin/
+	ln -s /sbin/jffs2reset $(1)/sbin/jffs2mark
+endef
+
+define Package/block-mount/install
+	$(INSTALL_DIR) $(1)/sbin $(1)/lib $(1)/usr/sbin $(1)/etc/hotplug.d/block $(1)/etc/init.d/ $(1)/etc/uci-defaults/
+
+	$(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab
+	$(INSTALL_DATA) ./files/fstab.default $(1)/etc/uci-defaults/10-fstab
+	$(INSTALL_DATA) ./files/mount.hotplug $(1)/etc/hotplug.d/block/10-mount
+
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblkid-tiny.so $(1)/lib/
+	ln -s /sbin/block $(1)/usr/sbin/swapon
+	ln -s /sbin/block $(1)/usr/sbin/swapoff
+
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libubi-utils.a $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,fstools))
+$(eval $(call BuildPackage,block-mount))
diff --git a/trunk/package/system/fstools/files/fstab.default b/trunk/package/system/fstools/files/fstab.default
new file mode 100644
index 00000000..dd4ba1c4
--- /dev/null
+++ b/trunk/package/system/fstools/files/fstab.default
@@ -0,0 +1 @@
+[ ! -f /etc/config/fstab ] && ( block detect > /etc/config/fstab )
diff --git a/trunk/package/system/fstools/files/fstab.init b/trunk/package/system/fstools/files/fstab.init
new file mode 100644
index 00000000..be49470e
--- /dev/null
+++ b/trunk/package/system/fstools/files/fstab.init
@@ -0,0 +1,14 @@
+#!/bin/sh /etc/rc.common
+# (C) 2013 openwrt.org
+
+START=40
+
+start() {                            
+	echo "this file has been obseleted. please call \"/sbin/block mount\" directly"
+	/sbin/block mount
+}
+
+stop() {                            
+	echo "this file has been obseleted. please call \"/sbin/block umount\" directly"
+	/sbin/block umount
+}
diff --git a/trunk/package/system/fstools/files/mount.hotplug b/trunk/package/system/fstools/files/mount.hotplug
new file mode 100644
index 00000000..946924e3
--- /dev/null
+++ b/trunk/package/system/fstools/files/mount.hotplug
@@ -0,0 +1 @@
+/sbin/block hotplug
diff --git a/trunk/package/system/fstools/files/snapshot b/trunk/package/system/fstools/files/snapshot
new file mode 100644
index 00000000..a0e0ec0c
--- /dev/null
+++ b/trunk/package/system/fstools/files/snapshot
@@ -0,0 +1,111 @@
+#!/bin/sh
+# Copyright (C) 2014 OpenWrt.org
+
+
+do_snapshot_unpack() {
+	echo "- snapshot -"
+	mkdir /tmp/snapshot
+	cd /tmp/snapshot
+	snapshot_tool read
+	block=`ls block*.tar.gz 2> /dev/null`
+	[ -z "$block" ] || for a in $block; do
+		tar xzf $a -C /
+		rm -f $a
+	done
+}
+
+do_config_unpack() {
+	echo "- config -"
+	snapshot_tool config_read
+	[ -f /tmp/config.tar.gz ] && {
+		tar xzf /tmp/config.tar.gz -C /
+		rm -f /tmp/config.tar.gz
+	}
+}
+
+do_snapshot_push() {
+	cd /volatile
+	tar czf /tmp/snapshot.tar.gz *
+	snapshot_tool write
+	reboot
+}
+
+do_config_push() {
+	cd /volatile
+	tar czf /tmp/config.tar.gz *
+	snapshot_tool config_write
+}
+
+do_snapshot_upgrade() {
+	opkg update
+	[ $? -eq 0 ] || exit 1
+
+	opkg list-upgradable
+	[ $? -eq 0 ] || exit 2
+	
+	UPDATES=`opkg list-upgradable | cut -d" " -f1`
+	[ -z "${UPDATES}" ] && exit 0
+
+	opkg upgrade ${UPDATES}
+	[ $? -eq 0 ] || exit 3
+
+	do_snapshot_push
+	sleep 5
+	reboot
+	sleep 10
+}
+
+do_convert_jffs2() {
+	snapshot_tool write
+	sleep 2
+	reboot -f
+}
+
+do_convert() {
+	. /lib/functions.sh
+	. /lib/upgrade/common.sh
+	ubus call system upgrade
+	touch /tmp/sysupgrade
+	cd /overlay
+	tar czf /tmp/snapshot.tar.gz *
+	kill_remaining TERM
+	sleep 3
+	kill_remaining KILL
+	run_ramfs '. /sbin/snapshot; do_convert_jffs2'
+}
+
+[ -n "$(cat /proc/mounts|grep /overlay|grep jffs2)" ] && {
+case $1 in
+convert)
+	do_convert
+	;;
+esac
+}
+
+[ -d /volatile ] && {
+case $1 in
+push)
+	do_snapshot_push
+	;;
+config)
+	do_config_push
+	;;
+upgrade)
+	do_snapshot_upgrade
+	;;
+info)
+	snapshot_tool info
+	;;
+esac
+}
+
+[ "$SNAPSHOT" = "magic" ] && {
+case $1 in
+unpack)
+	do_snapshot_unpack
+	;;
+config_unpack)
+	do_config_unpack
+	;;
+esac
+}
diff --git a/trunk/package/system/mountd/Makefile b/trunk/package/system/mountd/Makefile
new file mode 100644
index 00000000..76f8a0b6
--- /dev/null
+++ b/trunk/package/system/mountd/Makefile
@@ -0,0 +1,49 @@
+# Copyright (C) 2009-2012 OpenWrt.org
+# All rights reserved.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mountd
+PKG_VERSION:=0.1
+PKG_RELEASE:=6
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_MD5SUM:=b77253ee4321d24d200fffc4f7ca3d15
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_CHECK_FORMAT_SECURITY:=0
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mountd
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=libreCMC automount daemon
+  DEPENDS:=@USB_SUPPORT +uci +kmod-usb-storage +kmod-fs-autofs4
+  URL:=http://www.openwrt.org
+endef
+
+define Package/mountd/description
+  librecmc automount daemon
+endef
+
+define Package/mountd/conffiles
+/etc/config/mountd
+endef
+
+define Build/Compile
+	$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(PKG_BUILD_DIR)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(MAKE) -C $(PKG_BUILD_DIR)
+endef
+
+define Package/mountd/install
+	$(INSTALL_DIR) $(1)/sbin/ $(1)/etc/config/ $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mountd $(1)/sbin/
+	$(INSTALL_DATA) ./files/mountd.config $(1)/etc/config/mountd
+	$(INSTALL_BIN) ./files/mountd.init $(1)/etc/init.d/mountd
+endef
+
+$(eval $(call BuildPackage,mountd))
diff --git a/trunk/package/system/mountd/files/mountd.config b/trunk/package/system/mountd/files/mountd.config
new file mode 100644
index 00000000..56101295
--- /dev/null
+++ b/trunk/package/system/mountd/files/mountd.config
@@ -0,0 +1,3 @@
+config mountd mountd
+	option	timeout		60
+	option	path		/tmp/mounts/
diff --git a/trunk/package/system/mountd/files/mountd.init b/trunk/package/system/mountd/files/mountd.init
new file mode 100755
index 00000000..c294c50f
--- /dev/null
+++ b/trunk/package/system/mountd/files/mountd.init
@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+
+START=80
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+SERVICE_PID_FILE=/var/run/mountd.pid
+
+MOUNTD_BIN=/sbin/mountd
+
+start()
+{
+	service_start $MOUNTD_BIN -f
+}
+
+stop()
+{
+	service_stop $MOUNTD_BIN
+}
diff --git a/trunk/package/system/mountd/patches/010-uci_rename_history_to_delta.patch b/trunk/package/system/mountd/patches/010-uci_rename_history_to_delta.patch
new file mode 100644
index 00000000..65b2f843
--- /dev/null
+++ b/trunk/package/system/mountd/patches/010-uci_rename_history_to_delta.patch
@@ -0,0 +1,27 @@
+---
+ lib/uci.c  |    2 +-
+ lib/ucix.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/lib/uci.c
++++ b/lib/uci.c
+@@ -28,7 +28,7 @@ struct uci_package *p = NULL;
+ struct uci_context* uci_init(char *config_file)
+ {
+ 	struct uci_context *ctx = uci_alloc_context();
+-	uci_add_history_path(ctx, "/var/state");
++	uci_add_delta_path(ctx, "/var/state");
+ 	if(uci_load(ctx, config_file, &p) != UCI_OK)
+ 	{
+ 		log_printf("/etc/config/%s is missing or corrupt\n", config_file);
+--- a/lib/ucix.c
++++ b/lib/ucix.c
+@@ -18,7 +18,7 @@ static inline int ucix_get_ptr(struct uc
+ struct uci_context* ucix_init(const char *config_file)
+ {
+ 	struct uci_context *ctx = uci_alloc_context();
+-	uci_add_history_path(ctx, "/var/state");
++	uci_add_delta_path(ctx, "/var/state");
+ 	if(uci_load(ctx, config_file, NULL) != UCI_OK)
+ 	{
+ 		printf("%s/%s is missing or corrupt\n", ctx->savedir, config_file);
diff --git a/trunk/package/system/mountd/patches/020-handle_timeout.patch b/trunk/package/system/mountd/patches/020-handle_timeout.patch
new file mode 100644
index 00000000..badf40fe
--- /dev/null
+++ b/trunk/package/system/mountd/patches/020-handle_timeout.patch
@@ -0,0 +1,32 @@
+--- a/lib/autofs.c
++++ b/lib/autofs.c
+@@ -140,6 +140,7 @@ static int fullread(void *ptr, size_t le
+ 
+ static int autofs_in(union autofs_v5_packet_union *pkt)
+ {
++	int res;
+ 	struct pollfd fds[1];
+ 
+ 	fds[0].fd = fdout;
+@@ -147,15 +148,19 @@ static int autofs_in(union autofs_v5_pac
+ 
+ 	while(1)
+ 	{
+-		if(poll(fds, 2, 1000) == -1)
++		res = poll(fds, 1, -1);
++
++		if (res == -1)
+ 		{
+ 			if (errno == EINTR)
+ 				continue;
+ 			log_printf("failed while trying to read packet from kernel\n");
+ 			return -1;
+ 		}
+-		if(fds[0].revents & POLLIN)
++		else if ((res > 0) && (fds[0].revents & POLLIN))
++		{
+ 			return fullread(pkt, sizeof(*pkt));
++		}
+ 	}
+ }
+ 
diff --git a/trunk/package/system/mountd/patches/030-ext4_support.patch b/trunk/package/system/mountd/patches/030-ext4_support.patch
new file mode 100644
index 00000000..7bbaf14a
--- /dev/null
+++ b/trunk/package/system/mountd/patches/030-ext4_support.patch
@@ -0,0 +1,85 @@
+diff -ruN mountd-0.1.orig/include/fs.h mountd-0.1/include/fs.h
+--- mountd-0.1.orig/include/fs.h	2009-10-02 22:57:04.000000000 +0200
++++ mountd-0.1/include/fs.h	2012-07-08 18:42:32.000000000 +0200
+@@ -7,5 +7,6 @@
+ #define EFI			7
+ #define NTFS		8
+ #define EXTENDED	9
++#define EXT4		10
+ 
+ int detect_fs(char *device);
+diff -ruN mountd-0.1.orig/lib/fs.c mountd-0.1/lib/fs.c
+--- mountd-0.1.orig/lib/fs.c	2009-10-02 23:26:22.000000000 +0200
++++ mountd-0.1/lib/fs.c	2012-07-08 19:28:08.000000000 +0200
+@@ -91,9 +91,14 @@
+ 		goto out;
+ 	if(get_le_short(buffer + 56) == 0xEF53)
+ 	{
+-		if((get_le_long(buffer + 96) & 0x0008)
+-			|| (get_le_long(buffer + 92) & 0x0004))
+-			ret = EXT3;
++		if(get_le_long(buffer + 92) & 0x0004)
++		{
++			if ((get_le_long(buffer + 96) < 0x0000040)
++				&& (get_le_long(buffer + 100) < 0x0000008))
++				ret = EXT3;
++			else
++				ret = EXT4;
++		}
+ 		else
+ 			ret = EXT2;
+ 	}
+diff -ruN mountd-0.1.orig/lib/mount.c mountd-0.1/lib/mount.c
+--- mountd-0.1.orig/lib/mount.c	2009-10-03 12:54:57.000000000 +0200
++++ mountd-0.1/lib/mount.c	2012-07-08 19:04:29.000000000 +0200
+@@ -53,7 +53,10 @@
+ 	"EXT3",
+ 	"FAT",
+ 	"HFSPLUS",
+-	"NTFS"
++	"",
++	"NTFS",
++	"",
++	"EXT4"
+ };
+ 
+ #define MAX_MOUNTED		32
+@@ -93,7 +96,7 @@
+ 		ucix_add_option(ctx, mountd, q->serial, "rev", q->rev);
+ 		snprintf(t, 64, "size%d", atoi(&q->dev[3]));
+ 		ucix_add_option(ctx, mountd, q->serial, t, q->size);
+-		if(q->fs > MBR && q->fs <= NTFS)
++		if(q->fs > MBR && q->fs <= EXT4)
+ 		{
+ 			snprintf(t, 64, "fs%d", atoi(&q->dev[3]));
+ 			ucix_add_option(ctx, mountd, q->serial, t, fs_names[q->fs]);
+@@ -131,7 +134,7 @@
+ {
+ 	struct mount *mount;
+ 	char tmp[64], tmp2[64];
+-	if(fs <= MBR || fs > NTFS)
++	if(fs <= MBR || fs > EXT4)
+ 		return;
+ 	mount  = malloc(sizeof(struct mount));
+ 	INIT_LIST_HEAD(&mount->list);
+@@ -147,7 +150,7 @@
+ 	mount->mounted = 0;
+ 	mount->fs = fs;
+ 	list_add(&mount->list, &mounts);
+-	if((!mount->ignore) && (mount->fs > MBR) && (mount->fs <= NTFS))
++	if((!mount->ignore) && (mount->fs > MBR) && (mount->fs <= EXT4))
+ 	{
+ 		log_printf("new mount : %s -> %s (%s)\n", name, dev, fs_names[mount->fs]);
+ 		snprintf(tmp, 64, "%s%s", uci_path, name);
+@@ -226,6 +229,11 @@
+ 			log_printf("mount -t vfat -o rw,uid=1000,gid=1000 /dev/%s %s", mount->dev, tmp);
+ 			ret = system_printf("mount -t vfat -o rw,uid=1000,gid=1000 /dev/%s %s", mount->dev, tmp);
+ 		}
++		if(mount->fs == EXT4)
++		{
++			log_printf("mount -t ext4 -o rw,defaults /dev/%s %s", mount->dev, tmp);
++			ret = system_printf("mount -t ext4 -o rw,defaults /dev/%s %s", mount->dev, tmp);
++		}
+ 		if(mount->fs == EXT3)
+ 		{
+ 			log_printf("mount -t ext3 -o rw,defaults /dev/%s %s", mount->dev, tmp);
diff --git a/trunk/package/system/mountd/patches/040-optional-daemonize.patch b/trunk/package/system/mountd/patches/040-optional-daemonize.patch
new file mode 100644
index 00000000..b4bc8d08
--- /dev/null
+++ b/trunk/package/system/mountd/patches/040-optional-daemonize.patch
@@ -0,0 +1,13 @@
+--- a/main.c
++++ b/main.c
+@@ -13,7 +13,9 @@
+ 
+ int main(int argc, char *argv[])
+ {
+-	daemon(0,0);
++	if ((argc < 2) || strcmp(argv[1], "-f"))
++		daemon(0,0);
++
+ 	daemonize = 1;
+ 	log_start();
+ 	log_printf("Starting libreCMC (auto)mountd V1\n");
diff --git a/trunk/package/system/mountd/patches/050-no_error_h.patch b/trunk/package/system/mountd/patches/050-no_error_h.patch
new file mode 100644
index 00000000..16a75f04
--- /dev/null
+++ b/trunk/package/system/mountd/patches/050-no_error_h.patch
@@ -0,0 +1,10 @@
+--- a/lib/fs.c
++++ b/lib/fs.c
+@@ -2,7 +2,6 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <error.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/trunk/package/system/mountd/patches/060-link_libubox.patch b/trunk/package/system/mountd/patches/060-link_libubox.patch
new file mode 100644
index 00000000..39acc1c5
--- /dev/null
+++ b/trunk/package/system/mountd/patches/060-link_libubox.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@ PROG=mountd
+ OBJS=main.o lib/log.o lib/sys.o lib/autofs.o lib/mount.o lib/timer.o lib/signal.o lib/ucix.o lib/led.o lib/fs.o lib/ucix.o
+ 
+ LDFLAGS?=
+-LDFLAGS+=-ldl -luci
++LDFLAGS+=-ldl -luci -lubox
+ 
+ CFLAGS?=
+ CFLAGS+= -Wall
diff --git a/trunk/package/system/mtd/Makefile b/trunk/package/system/mtd/Makefile
new file mode 100644
index 00000000..7a4f73a1
--- /dev/null
+++ b/trunk/package/system/mtd/Makefile
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mtd
+PKG_RELEASE:=20
+
+PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)
+STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS)
+
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mtd
+  SECTION:=utils
+  CATEGORY:=Base system
+  DEPENDS:=+libubox
+  TITLE:=Update utility for trx firmware images
+endef
+
+define Package/mtd/description
+ This package contains an utility useful to upgrade from other firmware or 
+ older libreCMC releases.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+target=$(firstword $(subst -, ,$(BOARD)))
+
+MAKE_FLAGS += TARGET="$(target)"
+TARGET_CFLAGS := $(TARGET_CFLAGS) -Dtarget_$(target)=1 -Wall
+
+ifdef CONFIG_MTD_REDBOOT_PARTS
+  MAKE_FLAGS += FIS_SUPPORT=1
+  TARGET_CFLAGS += -DFIS_SUPPORT=1
+endif
+
+define Package/mtd/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mtd $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,mtd))
diff --git a/trunk/package/system/mtd/src/Makefile b/trunk/package/system/mtd/src/Makefile
new file mode 100644
index 00000000..27ac3390
--- /dev/null
+++ b/trunk/package/system/mtd/src/Makefile
@@ -0,0 +1,20 @@
+CC = gcc
+CFLAGS += -Wall
+LDFLAGS += -lubox
+
+obj = mtd.o jffs2.o crc32.o md5.o
+obj.seama = seama.o md5.o
+obj.ar71xx = trx.o $(obj.seama)
+obj.brcm = trx.o
+obj.brcm47xx = $(obj.brcm)
+obj.bcm53xx = $(obj.brcm)
+obj.brcm63xx = imagetag.o
+obj.ramips = $(obj.seama)
+
+ifdef FIS_SUPPORT
+  obj += fis.o
+endif
+
+mtd: $(obj) $(obj.$(TARGET))
+clean:
+	rm -f *.o jffs2
diff --git a/trunk/package/system/mtd/src/crc32.c b/trunk/package/system/mtd/src/crc32.c
new file mode 100644
index 00000000..6b1e50c4
--- /dev/null
+++ b/trunk/package/system/mtd/src/crc32.c
@@ -0,0 +1,95 @@
+/*
+ *  COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or
+ *  code or tables extracted from it, as desired without restriction.
+ *
+ *  First, the polynomial itself and its table of feedback terms.  The
+ *  polynomial is
+ *  X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0
+ *
+ *  Note that we take it "backwards" and put the highest-order term in
+ *  the lowest-order bit.  The X^32 term is "implied"; the LSB is the
+ *  X^31 term, etc.  The X^0 term (usually shown as "+1") results in
+ *  the MSB being 1
+ *
+ *  Note that the usual hardware shift register implementation, which
+ *  is what we're using (we're merely optimizing it by doing eight-bit
+ *  chunks at a time) shifts bits into the lowest-order term.  In our
+ *  implementation, that means shifting towards the right.  Why do we
+ *  do it this way?  Because the calculated CRC must be transmitted in
+ *  order from highest-order term to lowest-order term.  UARTs transmit
+ *  characters in order from LSB to MSB.  By storing the CRC this way
+ *  we hand it to the UART in the order low-byte to high-byte; the UART
+ *  sends each low-bit to hight-bit; and the result is transmission bit
+ *  by bit from highest- to lowest-order term without requiring any bit
+ *  shuffling on our part.  Reception works similarly
+ *
+ *  The feedback terms table consists of 256, 32-bit entries.  Notes
+ *
+ *      The table can be generated at runtime if desired; code to do so
+ *      is shown later.  It might not be obvious, but the feedback
+ *      terms simply represent the results of eight shift/xor opera
+ *      tions for all combinations of data and CRC register values
+ *
+ *      The values must be right-shifted by eight bits by the "updcrc
+ *      logic; the shift must be unsigned (bring in zeroes).  On some
+ *      hardware you could probably optimize the shift in assembler by
+ *      using byte-swap instructions
+ *      polynomial $edb88320
+ */
+
+#include <stdint.h>
+
+const uint32_t crc32_table[256] = {
+	0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+	0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+	0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+	0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+	0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+	0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+	0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+	0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+	0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+	0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+	0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+	0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+	0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+	0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+	0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+	0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+	0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+	0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+	0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+	0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+	0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+	0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+	0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+	0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+	0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+	0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+	0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+	0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+	0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+	0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+	0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+	0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+	0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+	0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+	0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+	0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+	0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+	0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+	0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+	0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+	0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+	0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+	0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+	0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+	0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+	0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+	0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+	0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+	0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+	0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+	0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+	0x2d02ef8dL
+};
diff --git a/trunk/package/system/mtd/src/crc32.h b/trunk/package/system/mtd/src/crc32.h
new file mode 100644
index 00000000..68f8ee4f
--- /dev/null
+++ b/trunk/package/system/mtd/src/crc32.h
@@ -0,0 +1,26 @@
+#ifndef CRC32_H
+#define CRC32_H
+
+#include <stdint.h>
+
+extern const uint32_t crc32_table[256];
+
+/* Return a 32-bit CRC of the contents of the buffer. */
+
+static inline uint32_t
+crc32(uint32_t val, const void *ss, int len)
+{
+	const unsigned char *s = ss;
+	while (--len >= 0)
+		val = crc32_table[(val ^ *s++) & 0xff] ^ (val >> 8);
+	return val;
+}
+
+static inline unsigned int crc32buf(char *buf, size_t len)
+{
+	return crc32(0xFFFFFFFF, buf, len);
+}
+
+
+
+#endif
diff --git a/trunk/package/system/mtd/src/fis.c b/trunk/package/system/mtd/src/fis.c
new file mode 100644
index 00000000..f825f590
--- /dev/null
+++ b/trunk/package/system/mtd/src/fis.c
@@ -0,0 +1,262 @@
+/*
+ * FIS table updating code for mtd
+ *
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ */
+#include <sys/mman.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include "crc32.h"
+#include "mtd.h"
+#include "fis.h"
+
+struct fis_image_hdr {
+	unsigned char name[16];
+	uint32_t flash_base;
+	uint32_t mem_base;
+	uint32_t size;
+	uint32_t entry_point;
+	uint32_t data_length;
+} __attribute__((packed));
+
+struct fis_image_crc {
+	uint32_t desc;
+	uint32_t file;
+} __attribute__((packed));
+
+struct fis_image_desc {
+	struct fis_image_hdr hdr;
+	char _pad[256 - sizeof(struct fis_image_hdr) - sizeof(struct fis_image_crc)];
+	struct fis_image_crc crc;
+} __attribute__((packed));
+
+static int fis_fd = -1;
+static struct fis_image_desc *fis_desc;
+static int fis_erasesize = 0;
+
+static void
+fis_close(void)
+{
+	if (fis_desc)
+		munmap(fis_desc, fis_erasesize);
+
+	if (fis_fd >= 0)
+		close(fis_fd);
+
+	fis_fd = -1;
+	fis_desc = NULL;
+}
+
+static struct fis_image_desc *
+fis_open(void)
+{
+	struct fis_image_desc *desc;
+
+	if (fis_fd >= 0)
+		fis_close();
+
+	fis_fd = mtd_check_open("FIS directory");
+	if (fis_fd < 0)
+		goto error;
+
+	close(fis_fd);
+	fis_fd = mtd_open("FIS directory", true);
+	if (fis_fd < 0)
+		goto error;
+
+	fis_erasesize = erasesize;
+	desc = mmap(NULL, erasesize, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fis_fd, 0);
+	if (desc == MAP_FAILED)
+		goto error;
+
+	fis_desc = desc;
+	return desc;
+
+error:
+	fis_close();
+	return NULL;
+}
+
+int
+fis_validate(struct fis_part *old, int n_old, struct fis_part *new, int n_new)
+{
+	struct fis_image_desc *desc;
+	void *end;
+	int found = 0;
+	int i;
+
+	desc = fis_open();
+	if (!desc)
+		return -1;
+
+	for (i = 0; i < n_new - 1; i++) {
+		if (!new[i].size) {
+			fprintf(stderr, "FIS error: only the last partition can detect the size automatically\n");
+			i = -1;
+			goto done;
+		}
+	}
+
+	end = desc;
+	end = (char *) end + fis_erasesize;
+	while ((void *) desc < end) {
+		if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff))
+			break;
+
+		for (i = 0; i < n_old; i++) {
+			if (!strncmp((char *) desc->hdr.name, (char *) old[i].name, sizeof(desc->hdr.name))) {
+				found++;
+				goto next;
+			}
+		}
+next:
+		desc++;
+		continue;
+	}
+
+	if (found == n_old)
+		i = 1;
+	else
+		i = -1;
+
+done:
+	fis_close();
+	return i;
+}
+
+int
+fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new)
+{
+	struct fis_image_desc *fisdir = NULL;
+	struct fis_image_desc *redboot = NULL;
+	struct fis_image_desc *first = NULL;
+	struct fis_image_desc *last = NULL;
+	struct fis_image_desc *first_fb = NULL;
+	struct fis_image_desc *last_fb = NULL;
+	struct fis_image_desc *desc;
+	struct fis_part *part;
+	uint32_t offset = 0, size = 0;
+	char *start, *end, *tmp;
+	int i;
+
+	desc = fis_open();
+	if (!desc)
+		return -1;
+
+	if (!quiet)
+		fprintf(stderr, "Updating FIS table... \n");
+
+	start = (char *) desc;
+	end = (char *) desc + fis_erasesize;
+	while ((char *) desc < end) {
+		if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff))
+			break;
+
+		if (!strcmp((char *) desc->hdr.name, "FIS directory"))
+			fisdir = desc;
+
+		if (!strcmp((char *) desc->hdr.name, "RedBoot"))
+			redboot = desc;
+
+		/* update max offset */
+		if (offset < desc->hdr.flash_base)
+			offset = desc->hdr.flash_base;
+
+		for (i = 0; i < n_old; i++) {
+			if (!strncmp((char *) desc->hdr.name, (char *) old[i].name, sizeof(desc->hdr.name))) {
+				last = desc;
+				if (!first)
+					first = desc;
+				break;
+			}
+		}
+		desc++;
+	}
+	desc--;
+
+	first_fb = first;
+	last_fb = last;
+
+	if (first_fb->hdr.flash_base > last_fb->hdr.flash_base) {
+		first_fb = last;
+		last_fb = first;
+	}
+
+	/* determine size of available space */
+	desc = (struct fis_image_desc *) start;
+	while ((char *) desc < end) {
+		if (!desc->hdr.name[0] || (desc->hdr.name[0] == 0xff))
+			break;
+
+		if (desc->hdr.flash_base > last_fb->hdr.flash_base &&
+		    desc->hdr.flash_base < offset)
+			offset = desc->hdr.flash_base;
+
+		desc++;
+	}
+	desc--;
+
+	size = offset - first_fb->hdr.flash_base;
+
+#ifdef notyet
+	desc = first - 1;
+	if (redboot && (desc >= redboot)) {
+		if (first->hdr.flash_base - desc->hdr.size > desc->hdr.flash_base) {
+			int delta = first->hdr.flash_base - desc->hdr.size - desc->hdr.flash_base;
+
+			offset -= delta;
+			size += delta;
+		}
+	}
+#endif
+
+	last++;
+	desc = first + n_new;
+	offset = first_fb->hdr.flash_base;
+
+	if (desc != last) {
+		if (desc > last)
+			tmp = (char *) desc;
+		else
+			tmp = (char *) last;
+
+		memmove(desc, last, end - tmp);
+		if (desc < last) {
+			tmp = end - (last - desc) * sizeof(struct fis_image_desc);
+			memset(tmp, 0xff, tmp - end);
+		}
+	}
+
+	for (part = new, desc = first; desc < first + n_new; desc++, part++) {
+		memset(desc, 0, sizeof(struct fis_image_desc));
+		memcpy(desc->hdr.name, part->name, sizeof(desc->hdr.name));
+		desc->crc.desc = 0;
+		desc->crc.file = 0;
+
+		desc->hdr.flash_base = offset;
+		desc->hdr.mem_base = part->loadaddr;
+		desc->hdr.entry_point = part->loadaddr;
+		desc->hdr.size = (part->size > 0) ? part->size : size;
+		desc->hdr.data_length = desc->hdr.size;
+
+		offset += desc->hdr.size;
+		size -= desc->hdr.size;
+	}
+
+	msync(fis_desc, fis_erasesize, MS_SYNC|MS_INVALIDATE);
+	fis_close();
+
+	return 0;
+}
diff --git a/trunk/package/system/mtd/src/fis.h b/trunk/package/system/mtd/src/fis.h
new file mode 100644
index 00000000..bdf1103d
--- /dev/null
+++ b/trunk/package/system/mtd/src/fis.h
@@ -0,0 +1,14 @@
+#ifndef __FIS_H
+#define __FIS_H
+
+struct fis_part {
+	unsigned char name[16];
+	uint32_t offset;
+	uint32_t loadaddr;
+	uint32_t size;
+};
+
+int fis_validate(struct fis_part *old, int n_old, struct fis_part *new, int n_new);
+int fis_remap(struct fis_part *old, int n_old, struct fis_part *new, int n_new);
+
+#endif
diff --git a/trunk/package/system/mtd/src/imagetag.c b/trunk/package/system/mtd/src/imagetag.c
new file mode 100644
index 00000000..72c3a9da
--- /dev/null
+++ b/trunk/package/system/mtd/src/imagetag.c
@@ -0,0 +1,316 @@
+/*
+ * imagetag.c
+ *
+ * Copyright (C) 2005 Mike Baker
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyrigth (C) 2010 Daniel Dickinson <librecmc@cshore.neomailbox.net>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <errno.h>
+
+#include <sys/ioctl.h>
+#include <mtd/mtd-user.h>
+#include <linux/bcm963xx_tag.h>
+
+#include "mtd.h"
+#include "crc32.h"
+
+ssize_t pread(int fd, void *buf, size_t count, off_t offset);
+ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
+
+#define CRC_START 0xFFFFFFFF
+
+static uint32_t strntoul(char *str, char **endptr, int base, size_t len) {
+  char *newstr;
+  uint32_t res = 0;
+
+  newstr = calloc(len + 1, sizeof(char));
+  if (newstr) {
+	strncpy(newstr, str, len); 
+	res = strtoul(newstr, endptr, base);
+	free(newstr);
+  }
+  return res;
+}
+
+uint32_t compute_crc32(uint32_t crc, off_t start, size_t compute_len, int fd)
+{
+	uint8_t readbuf[1024];
+	ssize_t res;
+	off_t offset = start;
+
+	/* Read a buffer's worth of bytes  */
+	while (fd && (compute_len >= sizeof(readbuf))) {
+		res = pread(fd, readbuf, sizeof(readbuf), offset);
+		crc = crc32(crc, readbuf, res);
+		compute_len = compute_len - res;
+		offset += res;
+	}
+
+	/* Less than buffer-size bytes remains, read compute_len bytes */
+	if (fd && (compute_len > 0)) {
+	  res = pread(fd, readbuf, compute_len, offset);
+	  crc = crc32(crc, readbuf, res);
+	}
+
+	return crc;
+}
+
+int
+trx_fixup(int fd, const char *name)
+{
+	struct mtd_info_user mtdInfo;
+	unsigned long len;
+	void *ptr, *scan;
+	int bfd;
+	struct bcm_tag *tag;
+	ssize_t res;
+	uint32_t cfelen, imagelen, imagestart, rootfslen;
+	uint32_t imagecrc, rootfscrc, headercrc;
+	uint32_t offset = 0;
+	cfelen = imagelen = imagestart = imagecrc = rootfscrc = headercrc = rootfslen = 0;
+
+
+	if (ioctl(fd, MEMGETINFO, &mtdInfo) < 0) {
+		fprintf(stderr, "Failed to get mtd info\n");
+		goto err;
+	}
+
+	len = mtdInfo.size;
+	if (mtdInfo.size <= 0) {
+		fprintf(stderr, "Invalid MTD device size\n");
+		goto err;
+	}
+
+	bfd = mtd_open(name, true);
+	ptr = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, bfd, 0);
+	if (!ptr || (ptr == (void *) -1)) {
+		perror("mmap");
+		goto err1;
+	}
+
+	tag = (struct bcm_tag *) (ptr);
+
+	cfelen = strntoul(&tag->cfe_length[0], NULL, 10, IMAGE_LEN);
+	if (cfelen) {
+	  fprintf(stderr, "Non-zero CFE length.  This is currently unsupported.\n");
+	  exit(1);
+	}
+
+	headercrc = compute_crc32(CRC_START, offset, offsetof(struct bcm_tag, header_crc), fd);
+	if (headercrc != *(uint32_t *)(&tag->header_crc)) {
+		fprintf(stderr, "Tag verify failed.  This may not be a valid image.\n");
+		exit(1);
+	}
+
+	sprintf(&tag->root_length[0], "%u", 0);
+	strncpy(&tag->total_length[0], &tag->kernel_length[0], IMAGE_LEN);
+
+	imagestart = sizeof(tag);
+	memcpy(&tag->image_crc, &tag->kernel_crc, sizeof(uint32_t));
+	memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t));
+	rootfscrc = CRC_START;
+	memcpy(&tag->rootfs_crc, &rootfscrc, sizeof(uint32_t));
+	headercrc = crc32(CRC_START, tag, offsetof(struct bcm_tag, header_crc));
+	memcpy(&tag->header_crc, &headercrc, sizeof(uint32_t));
+
+	msync(ptr, sizeof(struct bcm_tag), MS_SYNC|MS_INVALIDATE);
+	munmap(ptr, len);
+	close(bfd);
+	return 0;
+
+err1:
+	close(bfd);
+err:
+	fprintf(stderr, "Error fixing up imagetag header\n");
+	return -1;
+}
+
+
+int
+trx_check(int imagefd, const char *mtd, char *buf, int *len)
+{
+    struct bcm_tag *tag = (const struct bcm_tag *) buf;
+	int fd;
+	uint32_t headerCRC;
+	uint32_t imageLen;
+
+	if (strcmp(mtd, "linux") != 0)
+		return 1;
+
+	*len = read(imagefd, buf, sizeof(struct bcm_tag));
+	if (*len < sizeof(struct bcm_tag)) {
+		fprintf(stdout, "Could not get image header, file too small (%d bytes)\n", *len);
+		return 0;
+	}
+	headerCRC = crc32buf(buf, offsetof(struct bcm_tag, header_crc));
+	if (*(uint32_t *)(&tag->header_crc) != headerCRC) {
+  
+	  if (quiet < 2) {
+		fprintf(stderr, "Bad header CRC got %08x, calculated %08x\n",
+				*(uint32_t *)(&tag->header_crc), headerCRC);
+		fprintf(stderr, "This is not the correct file format; refusing to flash.\n"
+				"Please specify the correct file or use -f to force.\n");
+	  }
+	  return 0;
+	}
+
+	/* check if image fits to mtd device */
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		exit(1);
+	}
+
+	imageLen = strntoul(&tag->total_length[0], NULL, 10, IMAGE_LEN);
+	
+	if(mtdsize < imageLen) {
+		fprintf(stderr, "Image too big for partition: %s\n", mtd);
+		close(fd);
+		return 0;
+	}
+
+	close(fd);
+	return 1;
+}
+
+int
+mtd_fixtrx(const char *mtd, size_t offset)
+{
+	int fd;
+	struct bcm_tag *tag;
+	char *buf;
+	ssize_t res;
+	size_t block_offset;
+	uint32_t cfelen, imagelen, imagestart, rootfslen;
+	uint32_t imagecrc, rootfscrc, headercrc;
+	cfelen = imagelen = imagestart = imagecrc = rootfscrc = headercrc = rootfslen = 0;
+
+	if (quiet < 2)
+		fprintf(stderr, "Trying to fix trx header in %s at 0x%x...\n", mtd, offset);
+
+	block_offset = offset & ~(erasesize - 1);
+	offset -= block_offset;
+
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		exit(1);
+	}
+
+	if (block_offset + erasesize > mtdsize) {
+		fprintf(stderr, "Offset too large, device size 0x%x\n", mtdsize);
+		exit(1);
+	}
+
+	buf = malloc(erasesize);
+	if (!buf) {
+		perror("malloc");
+		exit(1);
+	}
+
+	res = pread(fd, buf, erasesize, block_offset);
+	if (res != erasesize) {
+		perror("pread");
+		exit(1);
+	}
+
+	tag = (struct bcm_tag *) (buf + offset);
+
+	cfelen = strntoul(tag->cfe_length, NULL, 10, IMAGE_LEN);
+	if (cfelen) {
+	  fprintf(stderr, "Non-zero CFE length.  This is currently unsupported.\n");
+	  exit(1);
+	}
+
+	if (quiet < 2) {
+	  fprintf(stderr, "Verifying we actually have an imagetag.\n");
+	}
+
+	headercrc = compute_crc32(CRC_START, offset, offsetof(struct bcm_tag, header_crc), fd);
+	if (headercrc != *(uint32_t *)(&tag->header_crc)) {
+		fprintf(stderr, "Tag verify failed.  This may not be a valid image.\n");
+		exit(1);
+	}
+
+	if (quiet < 2) {
+	  fprintf(stderr, "Checking current fixed status.\n");
+	}
+
+	rootfslen = strntoul(&tag->root_length[0], NULL, 10, IMAGE_LEN);
+	if (rootfslen == 0) {
+	  if (quiet < 2) 
+		fprintf(stderr, "Header already fixed, exiting\n");
+	  close(fd);
+	  return 0;
+	}
+
+	if (quiet < 2) {
+	  fprintf(stderr, "Setting root length to 0.\n");
+	}
+
+	sprintf(&tag->root_length[0], "%u", 0);
+	strncpy(&tag->total_length[0], &tag->kernel_length[0], IMAGE_LEN);
+
+	if (quiet < 2) {
+	  fprintf(stderr, "Recalculating CRCs.\n");
+	}
+
+	imagestart = sizeof(tag);
+	memcpy(&tag->image_crc, &tag->kernel_crc, sizeof(uint32_t));
+	memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t));
+	rootfscrc = CRC_START;
+	memcpy(&tag->rootfs_crc, &rootfscrc, sizeof(uint32_t));
+	headercrc = crc32(CRC_START, tag, offsetof(struct bcm_tag, header_crc));
+	memcpy(&tag->header_crc, &headercrc, sizeof(uint32_t));
+
+	if (quiet < 2) {
+	  fprintf(stderr, "Erasing imagetag block\n");
+	}
+
+	if (mtd_erase_block(fd, block_offset)) {
+		fprintf(stderr, "Can't erase block at 0x%x (%s)\n", block_offset, strerror(errno));
+		exit(1);
+	}
+
+	if (quiet < 2) {
+	  fprintf(stderr, "New image crc32: 0x%x, rewriting block\n", 
+			  *(uint32_t *)(&tag->image_crc));
+	  fprintf(stderr, "New header crc32: 0x%x, rewriting block\n", headercrc);  
+	}
+
+	if (pwrite(fd, buf, erasesize, block_offset) != erasesize) {
+		fprintf(stderr, "Error writing block (%s)\n", strerror(errno));
+		exit(1);
+	}
+
+	if (quiet < 2)
+		fprintf(stderr, "Done.\n");
+
+	close (fd);
+	sync();
+	return 0;
+
+}
diff --git a/trunk/package/system/mtd/src/jffs2.c b/trunk/package/system/mtd/src/jffs2.c
new file mode 100644
index 00000000..c29fb33e
--- /dev/null
+++ b/trunk/package/system/mtd/src/jffs2.c
@@ -0,0 +1,366 @@
+/*
+ * jffs2 on-disk structure generator for mtd
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ * Based on:
+ *   JFFS2 -- Journalling Flash File System, Version 2.
+ *   Copyright © 2001-2007 Red Hat, Inc.
+ *   Created by David Woodhouse <dwmw2@infradead.org>
+ */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <endian.h>
+#include "jffs2.h"
+#include "crc32.h"
+#include "mtd.h"
+
+#define PAD(x) (((x)+3)&~3)
+
+#if BYTE_ORDER == BIG_ENDIAN
+# define CLEANMARKER "\x19\x85\x20\x03\x00\x00\x00\x0c\xf0\x60\xdc\x98"
+#else
+# define CLEANMARKER "\x85\x19\x03\x20\x0c\x00\x00\x00\xb1\xb0\x1e\xe4"
+#endif
+
+static int last_ino = 0;
+static int last_version = 0;
+static char *buf = NULL;
+static int ofs = 0;
+static int outfd = -1;
+static int mtdofs = 0;
+static int target_ino = 0;
+
+static void prep_eraseblock(void);
+
+static void pad(int size)
+{
+	if ((ofs % size == 0) && (ofs < erasesize))
+		return;
+
+	if (ofs < erasesize) {
+		memset(buf + ofs, 0xff, (size - (ofs % size)));
+		ofs += (size - (ofs % size));
+	}
+	ofs = ofs % erasesize;
+	if (ofs == 0) {
+		while (mtd_block_is_bad(outfd, mtdofs) && (mtdofs < mtdsize)) {
+			if (!quiet)
+				fprintf(stderr, "\nSkipping bad block at 0x%08x   ", mtdofs);
+
+			mtdofs += erasesize;
+
+			/* Move the file pointer along over the bad block. */
+			lseek(outfd, erasesize, SEEK_CUR);
+		}
+		mtd_erase_block(outfd, mtdofs);
+		write(outfd, buf, erasesize);
+		mtdofs += erasesize;
+	}
+}
+
+static inline int rbytes(void)
+{
+	return erasesize - (ofs % erasesize);
+}
+
+static inline void add_data(char *ptr, int len)
+{
+	if (ofs + len > erasesize) {
+		pad(erasesize);
+		prep_eraseblock();
+	}
+	memcpy(buf + ofs, ptr, len);
+	ofs += len;
+}
+
+static void prep_eraseblock(void)
+{
+	if (ofs > 0)
+		return;
+
+	add_data(CLEANMARKER, sizeof(CLEANMARKER) - 1);
+}
+
+static int add_dirent(const char *name, const char type, int parent)
+{
+	struct jffs2_raw_dirent *de;
+
+	if (ofs - erasesize < sizeof(struct jffs2_raw_dirent) + strlen(name))
+		pad(erasesize);
+
+	prep_eraseblock();
+	last_ino++;
+	memset(buf + ofs, 0, sizeof(struct jffs2_raw_dirent));
+	de = (struct jffs2_raw_dirent *) (buf + ofs);
+
+	de->magic = JFFS2_MAGIC_BITMASK;
+	de->nodetype = JFFS2_NODETYPE_DIRENT;
+	de->type = type;
+	de->name_crc = crc32(0, name, strlen(name));
+	de->ino = last_ino++;
+	de->pino = parent;
+	de->totlen = sizeof(*de) + strlen(name);
+	de->hdr_crc = crc32(0, (void *) de, sizeof(struct jffs2_unknown_node) - 4);
+	de->version = last_version++;
+	de->mctime = 0;
+	de->nsize = strlen(name);
+	de->node_crc = crc32(0, (void *) de, sizeof(*de) - 8);
+	memcpy(de->name, name, strlen(name));
+
+	ofs += sizeof(struct jffs2_raw_dirent) + de->nsize;
+	pad(4);
+
+	return de->ino;
+}
+
+static int add_dir(const char *name, int parent)
+{
+	struct jffs2_raw_inode ri;
+	int inode;
+
+	inode = add_dirent(name, IFTODT(S_IFDIR), parent);
+
+	if (rbytes() < sizeof(ri))
+		pad(erasesize);
+	prep_eraseblock();
+
+	memset(&ri, 0, sizeof(ri));
+	ri.magic = JFFS2_MAGIC_BITMASK;
+	ri.nodetype = JFFS2_NODETYPE_INODE;
+	ri.totlen = sizeof(ri);
+	ri.hdr_crc = crc32(0, &ri, sizeof(struct jffs2_unknown_node) - 4);
+
+	ri.ino = inode;
+	ri.mode = S_IFDIR | 0755;
+	ri.uid = ri.gid = 0;
+	ri.atime = ri.ctime = ri.mtime = 0;
+	ri.isize = ri.csize = ri.dsize = 0;
+	ri.version = 1;
+	ri.node_crc = crc32(0, &ri, sizeof(ri) - 8);
+	ri.data_crc = 0;
+
+	add_data((char *) &ri, sizeof(ri));
+	pad(4);
+	return inode;
+}
+
+static void add_file(const char *name, int parent)
+{
+	int inode, f_offset = 0, fd;
+	struct jffs2_raw_inode ri;
+	struct stat st;
+	char wbuf[4096];
+	const char *fname;
+
+	if (stat(name, &st)) {
+		fprintf(stderr, "File %s does not exist\n", name);
+		return;
+	}
+
+	fname = strrchr(name, '/');
+	if (fname)
+		fname++;
+	else
+		fname = name;
+
+	inode = add_dirent(fname, IFTODT(S_IFREG), parent);
+	memset(&ri, 0, sizeof(ri));
+	ri.magic = JFFS2_MAGIC_BITMASK;
+	ri.nodetype = JFFS2_NODETYPE_INODE;
+
+	ri.ino = inode;
+	ri.mode = st.st_mode;
+	ri.uid = ri.gid = 0;
+	ri.atime = st.st_atime;
+	ri.ctime = st.st_ctime;
+	ri.mtime = st.st_mtime;
+	ri.isize = st.st_size;
+	ri.compr = 0;
+	ri.usercompr = 0;
+
+	fd = open(name, 0);
+	if (fd < 0) {
+		fprintf(stderr, "File %s does not exist\n", name);
+		return;
+	}
+
+	for (;;) {
+		int len = 0;
+
+		for (;;) {
+			len = rbytes() - sizeof(ri);
+			if (len > 128)
+				break;
+
+			pad(erasesize);
+			prep_eraseblock();
+		}
+
+		if (len > sizeof(wbuf))
+			len = sizeof(wbuf);
+
+		len = read(fd, wbuf, len);
+		if (len <= 0)
+			break;
+
+		ri.totlen = sizeof(ri) + len;
+		ri.hdr_crc = crc32(0, &ri, sizeof(struct jffs2_unknown_node) - 4);
+		ri.version = ++last_version;
+		ri.offset = f_offset;
+		ri.csize = ri.dsize = len;
+		ri.node_crc = crc32(0, &ri, sizeof(ri) - 8);
+		ri.data_crc = crc32(0, wbuf, len);
+		f_offset += len;
+		add_data((char *) &ri, sizeof(ri));
+		add_data(wbuf, len);
+		pad(4);
+		prep_eraseblock();
+	}
+
+	close(fd);
+}
+
+int mtd_replace_jffs2(const char *mtd, int fd, int ofs, const char *filename)
+{
+	outfd = fd;
+	mtdofs = ofs;
+
+	buf = malloc(erasesize);
+	target_ino = 1;
+	if (!last_ino)
+		last_ino = 1;
+	add_file(filename, target_ino);
+	pad(erasesize);
+
+	/* add eof marker, pad to eraseblock size and write the data */
+	add_data(JFFS2_EOF, sizeof(JFFS2_EOF) - 1);
+	pad(erasesize);
+	free(buf);
+
+	return (mtdofs - ofs);
+}
+
+void mtd_parse_jffs2data(const char *buf, const char *dir)
+{
+	struct jffs2_unknown_node *node = (struct jffs2_unknown_node *) buf;
+	unsigned int ofs = 0;
+
+	while (ofs < erasesize) {
+		node = (struct jffs2_unknown_node *) (buf + ofs);
+		if (node->magic != 0x1985)
+			break;
+
+		ofs += PAD(node->totlen);
+		if (node->nodetype == JFFS2_NODETYPE_DIRENT) {
+			struct jffs2_raw_dirent *de = (struct jffs2_raw_dirent *) node;
+
+			/* is this the right directory name and is it a subdirectory of / */
+			if (*dir && (de->pino == 1) && !strncmp((char *) de->name, dir, de->nsize))
+				target_ino = de->ino;
+
+			/* store the last inode and version numbers for adding extra files */
+			if (last_ino < de->ino)
+				last_ino = de->ino;
+			if (last_version < de->version)
+				last_version = de->version;
+		}
+	}
+}
+
+int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir)
+{
+	int err = -1, fdeof = 0;
+
+	outfd = mtd_check_open(mtd);
+	if (outfd < 0)
+		return -1;
+
+	if (quiet < 2)
+		fprintf(stderr, "Appending %s to jffs2 partition %s\n", filename, mtd);
+	
+	buf = malloc(erasesize);
+	if (!buf) {
+		fprintf(stderr, "Out of memory!\n");
+		goto done;
+	}
+
+	if (!*dir)
+		target_ino = 1;
+
+	/* parse the structure of the jffs2 first
+	 * locate the directory that the file is going to be placed in */
+	for(;;) {
+		struct jffs2_unknown_node *node = (struct jffs2_unknown_node *) buf;
+
+		if (read(outfd, buf, erasesize) != erasesize) {
+			fdeof = 1;
+			break;
+		}
+		mtdofs += erasesize;
+
+		if (node->magic == 0x8519) {
+			fprintf(stderr, "Error: wrong endianness filesystem\n");
+			goto done;
+		}
+
+		/* assume  no magic == end of filesystem
+		 * the filesystem will probably end with be32(0xdeadc0de) */
+		if (node->magic != 0x1985)
+			break;
+
+		mtd_parse_jffs2data(buf, dir);
+	}
+
+	if (fdeof) {
+		fprintf(stderr, "Error: No room for additional data\n");
+		goto done;
+	}
+
+	/* jump back one eraseblock */
+	mtdofs -= erasesize;
+	lseek(outfd, mtdofs, SEEK_SET);
+
+	ofs = 0;
+
+	if (!last_ino)
+		last_ino = 1;
+
+	if (!target_ino)
+		target_ino = add_dir(dir, 1);
+
+	add_file(filename, target_ino);
+	pad(erasesize);
+
+	/* add eof marker, pad to eraseblock size and write the data */
+	add_data(JFFS2_EOF, sizeof(JFFS2_EOF) - 1);
+	pad(erasesize);
+
+	err = 0;
+
+	if (trx_fixup) {
+	  trx_fixup(outfd, mtd);
+	}
+
+done:
+	close(outfd);
+	if (buf)
+		free(buf);
+
+	return err;
+}
diff --git a/trunk/package/system/mtd/src/jffs2.h b/trunk/package/system/mtd/src/jffs2.h
new file mode 100644
index 00000000..858e77a0
--- /dev/null
+++ b/trunk/package/system/mtd/src/jffs2.h
@@ -0,0 +1,216 @@
+/*
+ * JFFS2 -- Journalling Flash File System, Version 2.
+ *
+ * Copyright (C) 2001-2003 Red Hat, Inc.
+ *
+ * Created by David Woodhouse <dwmw2@infradead.org>
+ *
+ * For licensing information, see the file 'LICENCE' in the
+ * jffs2 directory.
+ *
+ *
+ */
+
+#ifndef __LINUX_JFFS2_H__
+#define __LINUX_JFFS2_H__
+
+#define JFFS2_SUPER_MAGIC   0x72b6
+
+/* You must include something which defines the C99 uintXX_t types. 
+   We don't do it from here because this file is used in too many
+   different environments. */
+
+/* Values we may expect to find in the 'magic' field */
+#define JFFS2_OLD_MAGIC_BITMASK 0x1984
+#define JFFS2_MAGIC_BITMASK 0x1985
+#define KSAMTIB_CIGAM_2SFFJ 0x8519 /* For detecting wrong-endian fs */
+#define JFFS2_EMPTY_BITMASK 0xffff
+#define JFFS2_DIRTY_BITMASK 0x0000
+
+/* Summary node MAGIC marker */
+#define JFFS2_SUM_MAGIC	0x02851885
+
+/* We only allow a single char for length, and 0xFF is empty flash so
+   we don't want it confused with a real length. Hence max 254.
+*/
+#define JFFS2_MAX_NAME_LEN 254
+
+/* How small can we sensibly write nodes? */
+#define JFFS2_MIN_DATA_LEN 128
+
+#define JFFS2_COMPR_NONE	0x00
+#define JFFS2_COMPR_ZERO	0x01
+#define JFFS2_COMPR_RTIME	0x02
+#define JFFS2_COMPR_RUBINMIPS	0x03
+#define JFFS2_COMPR_COPY	0x04
+#define JFFS2_COMPR_DYNRUBIN	0x05
+#define JFFS2_COMPR_ZLIB	0x06
+/* Compatibility flags. */
+#define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+#define JFFS2_NODE_ACCURATE 0x2000
+/* INCOMPAT: Fail to mount the filesystem */
+#define JFFS2_FEATURE_INCOMPAT 0xc000
+/* ROCOMPAT: Mount read-only */
+#define JFFS2_FEATURE_ROCOMPAT 0x8000
+/* RWCOMPAT_COPY: Mount read/write, and copy the node when it's GC'd */
+#define JFFS2_FEATURE_RWCOMPAT_COPY 0x4000
+/* RWCOMPAT_DELETE: Mount read/write, and delete the node when it's GC'd */
+#define JFFS2_FEATURE_RWCOMPAT_DELETE 0x0000
+
+#define JFFS2_NODETYPE_DIRENT (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 1)
+#define JFFS2_NODETYPE_INODE (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 2)
+#define JFFS2_NODETYPE_CLEANMARKER (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
+#define JFFS2_NODETYPE_PADDING (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 4)
+
+#define JFFS2_NODETYPE_SUMMARY (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 6)
+
+#define JFFS2_NODETYPE_XATTR (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 8)
+#define JFFS2_NODETYPE_XREF (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 9)
+
+/* XATTR Related */
+#define JFFS2_XPREFIX_USER		1	/* for "user." */
+#define JFFS2_XPREFIX_SECURITY		2	/* for "security." */
+#define JFFS2_XPREFIX_ACL_ACCESS	3	/* for "system.posix_acl_access" */
+#define JFFS2_XPREFIX_ACL_DEFAULT	4	/* for "system.posix_acl_default" */
+#define JFFS2_XPREFIX_TRUSTED		5	/* for "trusted.*" */
+
+#define JFFS2_ACL_VERSION		0x0001
+
+// Maybe later...
+//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
+//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
+
+
+#define JFFS2_INO_FLAG_PREREAD	  1	/* Do read_inode() for this one at
+					   mount time, don't wait for it to
+					   happen later */
+#define JFFS2_INO_FLAG_USERCOMPR  2	/* User has requested a specific
+					   compression type */
+
+
+/* These can go once we've made sure we've caught all uses without
+   byteswapping */
+
+typedef	uint32_t jint32_t;
+
+typedef uint32_t jmode_t;
+
+typedef uint16_t jint16_t;
+
+struct jffs2_unknown_node
+{
+	/* All start like this */
+	jint16_t magic;
+	jint16_t nodetype;
+	jint32_t totlen; /* So we can skip over nodes we don't grok */
+	jint32_t hdr_crc;
+};
+
+struct jffs2_raw_dirent
+{
+	jint16_t magic;
+	jint16_t nodetype;	/* == JFFS2_NODETYPE_DIRENT */
+	jint32_t totlen;
+	jint32_t hdr_crc;
+	jint32_t pino;
+	jint32_t version;
+	jint32_t ino; /* == zero for unlink */
+	jint32_t mctime;
+	uint8_t nsize;
+	uint8_t type;
+	uint8_t unused[2];
+	jint32_t node_crc;
+	jint32_t name_crc;
+	uint8_t name[0];
+};
+
+/* The JFFS2 raw inode structure: Used for storage on physical media.  */
+/* The uid, gid, atime, mtime and ctime members could be longer, but
+   are left like this for space efficiency. If and when people decide
+   they really need them extended, it's simple enough to add support for
+   a new type of raw node.
+*/
+struct jffs2_raw_inode
+{
+	jint16_t magic;      /* A constant magic number.  */
+	jint16_t nodetype;   /* == JFFS2_NODETYPE_INODE */
+	jint32_t totlen;     /* Total length of this node (inc data, etc.) */
+	jint32_t hdr_crc;
+	jint32_t ino;        /* Inode number.  */
+	jint32_t version;    /* Version number.  */
+	jmode_t mode;       /* The file's type or mode.  */
+	jint16_t uid;        /* The file's owner.  */
+	jint16_t gid;        /* The file's group.  */
+	jint32_t isize;      /* Total resultant size of this inode (used for truncations)  */
+	jint32_t atime;      /* Last access time.  */
+	jint32_t mtime;      /* Last modification time.  */
+	jint32_t ctime;      /* Change time.  */
+	jint32_t offset;     /* Where to begin to write.  */
+	jint32_t csize;      /* (Compressed) data size */
+	jint32_t dsize;	     /* Size of the node's data. (after decompression) */
+	uint8_t compr;       /* Compression algorithm used */
+	uint8_t usercompr;   /* Compression algorithm requested by the user */
+	jint16_t flags;	     /* See JFFS2_INO_FLAG_* */
+	jint32_t data_crc;   /* CRC for the (compressed) data.  */
+	jint32_t node_crc;   /* CRC for the raw inode (excluding data)  */
+	uint8_t data[0];
+};
+
+struct jffs2_raw_xattr {
+	jint16_t magic;
+	jint16_t nodetype;	/* = JFFS2_NODETYPE_XATTR */
+	jint32_t totlen;
+	jint32_t hdr_crc;
+	jint32_t xid;		/* XATTR identifier number */
+	jint32_t version;
+	uint8_t xprefix;
+	uint8_t name_len;
+	jint16_t value_len;
+	jint32_t data_crc;
+	jint32_t node_crc;
+	uint8_t data[0];
+} __attribute__((packed));
+
+struct jffs2_raw_xref
+{
+	jint16_t magic;
+	jint16_t nodetype;	/* = JFFS2_NODETYPE_XREF */
+	jint32_t totlen;
+	jint32_t hdr_crc;
+	jint32_t ino;		/* inode number */
+	jint32_t xid;		/* XATTR identifier number */
+	jint32_t xseqno;	/* xref sequencial number */
+	jint32_t node_crc;
+} __attribute__((packed));
+
+struct jffs2_raw_summary
+{
+	jint16_t magic;
+	jint16_t nodetype; 	/* = JFFS2_NODETYPE_SUMMARY */
+	jint32_t totlen;
+	jint32_t hdr_crc;
+	jint32_t sum_num;	/* number of sum entries*/
+	jint32_t cln_mkr;	/* clean marker size, 0 = no cleanmarker */
+	jint32_t padded;	/* sum of the size of padding nodes */
+	jint32_t sum_crc;	/* summary information crc */
+	jint32_t node_crc; 	/* node crc */
+	jint32_t sum[0]; 	/* inode summary info */
+};
+
+union jffs2_node_union
+{
+	struct jffs2_raw_inode i;
+	struct jffs2_raw_dirent d;
+	struct jffs2_raw_xattr x;
+	struct jffs2_raw_xref r;
+	struct jffs2_raw_summary s;
+	struct jffs2_unknown_node u;
+};
+
+/* Data payload for device nodes. */
+union jffs2_device_node {
+	jint16_t old;
+	jint32_t new;
+};
+
+#endif /* __LINUX_JFFS2_H__ */
diff --git a/trunk/package/system/mtd/src/md5.c b/trunk/package/system/mtd/src/md5.c
new file mode 100644
index 00000000..20397603
--- /dev/null
+++ b/trunk/package/system/mtd/src/md5.c
@@ -0,0 +1,307 @@
+
+
+/*
+ ***********************************************************************
+ ** md5.c -- the source code for MD5 routines                         **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 1/91 SRD,AJ,BSK,JT Reference C ver., 7/10 constant corr. **
+ ***********************************************************************
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#include <string.h>
+#include "md5.h"
+
+/*
+ ***********************************************************************
+ **  Message-digest routines:                                         **
+ **  To form the message digest for a message M                       **
+ **    (1) Initialize a context buffer mdContext using MD5_Init       **
+ **    (2) Call MD5_Update on mdContext and M                         **
+ **    (3) Call MD5_Final on mdContext                                **
+ **  The message digest is now in mdContext->digest[0...15]           **
+ ***********************************************************************
+ */
+
+/* forward declaration */
+static void Transform ();
+
+static unsigned char PADDING[64] = {
+  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/* F, G, H and I are basic MD5 functions */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
+/* Rotation is separate from addition to prevent recomputation */
+#define FF(a, b, c, d, x, s, ac) \
+  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) \
+  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) \
+  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) \
+  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+
+#ifdef __STDC__
+#define UL(x)	x##U
+#else
+#define UL(x)	x
+#endif
+
+/* The routine MD5_Init initializes the message-digest context
+   mdContext. All fields are set to zero.
+ */
+void MD5_Init (mdContext)
+MD5_CTX *mdContext;
+{
+  mdContext->i[0] = mdContext->i[1] = (UINT4)0;
+
+  /* Load magic initialization constants.
+   */
+  mdContext->buf[0] = (UINT4)0x67452301;
+  mdContext->buf[1] = (UINT4)0xefcdab89;
+  mdContext->buf[2] = (UINT4)0x98badcfe;
+  mdContext->buf[3] = (UINT4)0x10325476;
+}
+
+/* The routine MD5Update updates the message-digest context to
+   account for the presence of each of the characters inBuf[0..inLen-1]
+   in the message whose digest is being computed.
+ */
+void MD5_Update (mdContext, inBuf, inLen)
+MD5_CTX *mdContext;
+unsigned char *inBuf;
+unsigned int inLen;
+{
+  UINT4 in[16];
+  int mdi;
+  unsigned int i, ii;
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* update number of bits */
+  if ((mdContext->i[0] + ((UINT4)inLen << 3)) < mdContext->i[0])
+    mdContext->i[1]++;
+  mdContext->i[0] += ((UINT4)inLen << 3);
+  mdContext->i[1] += ((UINT4)inLen >> 29);
+
+  while (inLen--) {
+    /* add new character to buffer, increment mdi */
+    mdContext->in[mdi++] = *inBuf++;
+
+    /* transform if necessary */
+    if (mdi == 0x40) {
+      for (i = 0, ii = 0; i < 16; i++, ii += 4)
+        in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+                (((UINT4)mdContext->in[ii+2]) << 16) |
+                (((UINT4)mdContext->in[ii+1]) << 8) |
+                ((UINT4)mdContext->in[ii]);
+      Transform (mdContext->buf, in);
+      mdi = 0;
+    }
+  }
+}
+
+/* The routine MD5Final terminates the message-digest computation and
+   ends with the desired message digest in mdContext->digest[0...15].
+ */
+void MD5_Final (hash, mdContext)
+unsigned char hash[];
+MD5_CTX *mdContext;
+{
+  UINT4 in[16];
+  int mdi;
+  unsigned int i, ii;
+  unsigned int padLen;
+
+  /* save number of bits */
+  in[14] = mdContext->i[0];
+  in[15] = mdContext->i[1];
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* pad out to 56 mod 64 */
+  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
+  MD5_Update (mdContext, PADDING, padLen);
+
+  /* append length in bits and transform */
+  for (i = 0, ii = 0; i < 14; i++, ii += 4)
+    in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+            (((UINT4)mdContext->in[ii+2]) << 16) |
+            (((UINT4)mdContext->in[ii+1]) << 8) |
+            ((UINT4)mdContext->in[ii]);
+  Transform (mdContext->buf, in);
+
+  /* store buffer in digest */
+  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
+    mdContext->digest[ii] = (unsigned char)(mdContext->buf[i] & 0xFF);
+    mdContext->digest[ii+1] =
+      (unsigned char)((mdContext->buf[i] >> 8) & 0xFF);
+    mdContext->digest[ii+2] =
+      (unsigned char)((mdContext->buf[i] >> 16) & 0xFF);
+    mdContext->digest[ii+3] =
+      (unsigned char)((mdContext->buf[i] >> 24) & 0xFF);
+  }
+  memcpy(hash, mdContext->digest, 16);
+}
+
+/* Basic MD5 step. Transforms buf based on in.
+ */
+static void Transform (buf, in)
+UINT4 *buf;
+UINT4 *in;
+{
+  UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+  /* Round 1 */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+  FF ( a, b, c, d, in[ 0], S11, UL(3614090360)); /* 1 */
+  FF ( d, a, b, c, in[ 1], S12, UL(3905402710)); /* 2 */
+  FF ( c, d, a, b, in[ 2], S13, UL( 606105819)); /* 3 */
+  FF ( b, c, d, a, in[ 3], S14, UL(3250441966)); /* 4 */
+  FF ( a, b, c, d, in[ 4], S11, UL(4118548399)); /* 5 */
+  FF ( d, a, b, c, in[ 5], S12, UL(1200080426)); /* 6 */
+  FF ( c, d, a, b, in[ 6], S13, UL(2821735955)); /* 7 */
+  FF ( b, c, d, a, in[ 7], S14, UL(4249261313)); /* 8 */
+  FF ( a, b, c, d, in[ 8], S11, UL(1770035416)); /* 9 */
+  FF ( d, a, b, c, in[ 9], S12, UL(2336552879)); /* 10 */
+  FF ( c, d, a, b, in[10], S13, UL(4294925233)); /* 11 */
+  FF ( b, c, d, a, in[11], S14, UL(2304563134)); /* 12 */
+  FF ( a, b, c, d, in[12], S11, UL(1804603682)); /* 13 */
+  FF ( d, a, b, c, in[13], S12, UL(4254626195)); /* 14 */
+  FF ( c, d, a, b, in[14], S13, UL(2792965006)); /* 15 */
+  FF ( b, c, d, a, in[15], S14, UL(1236535329)); /* 16 */
+
+  /* Round 2 */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+  GG ( a, b, c, d, in[ 1], S21, UL(4129170786)); /* 17 */
+  GG ( d, a, b, c, in[ 6], S22, UL(3225465664)); /* 18 */
+  GG ( c, d, a, b, in[11], S23, UL( 643717713)); /* 19 */
+  GG ( b, c, d, a, in[ 0], S24, UL(3921069994)); /* 20 */
+  GG ( a, b, c, d, in[ 5], S21, UL(3593408605)); /* 21 */
+  GG ( d, a, b, c, in[10], S22, UL(  38016083)); /* 22 */
+  GG ( c, d, a, b, in[15], S23, UL(3634488961)); /* 23 */
+  GG ( b, c, d, a, in[ 4], S24, UL(3889429448)); /* 24 */
+  GG ( a, b, c, d, in[ 9], S21, UL( 568446438)); /* 25 */
+  GG ( d, a, b, c, in[14], S22, UL(3275163606)); /* 26 */
+  GG ( c, d, a, b, in[ 3], S23, UL(4107603335)); /* 27 */
+  GG ( b, c, d, a, in[ 8], S24, UL(1163531501)); /* 28 */
+  GG ( a, b, c, d, in[13], S21, UL(2850285829)); /* 29 */
+  GG ( d, a, b, c, in[ 2], S22, UL(4243563512)); /* 30 */
+  GG ( c, d, a, b, in[ 7], S23, UL(1735328473)); /* 31 */
+  GG ( b, c, d, a, in[12], S24, UL(2368359562)); /* 32 */
+
+  /* Round 3 */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+  HH ( a, b, c, d, in[ 5], S31, UL(4294588738)); /* 33 */
+  HH ( d, a, b, c, in[ 8], S32, UL(2272392833)); /* 34 */
+  HH ( c, d, a, b, in[11], S33, UL(1839030562)); /* 35 */
+  HH ( b, c, d, a, in[14], S34, UL(4259657740)); /* 36 */
+  HH ( a, b, c, d, in[ 1], S31, UL(2763975236)); /* 37 */
+  HH ( d, a, b, c, in[ 4], S32, UL(1272893353)); /* 38 */
+  HH ( c, d, a, b, in[ 7], S33, UL(4139469664)); /* 39 */
+  HH ( b, c, d, a, in[10], S34, UL(3200236656)); /* 40 */
+  HH ( a, b, c, d, in[13], S31, UL( 681279174)); /* 41 */
+  HH ( d, a, b, c, in[ 0], S32, UL(3936430074)); /* 42 */
+  HH ( c, d, a, b, in[ 3], S33, UL(3572445317)); /* 43 */
+  HH ( b, c, d, a, in[ 6], S34, UL(  76029189)); /* 44 */
+  HH ( a, b, c, d, in[ 9], S31, UL(3654602809)); /* 45 */
+  HH ( d, a, b, c, in[12], S32, UL(3873151461)); /* 46 */
+  HH ( c, d, a, b, in[15], S33, UL( 530742520)); /* 47 */
+  HH ( b, c, d, a, in[ 2], S34, UL(3299628645)); /* 48 */
+
+  /* Round 4 */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+  II ( a, b, c, d, in[ 0], S41, UL(4096336452)); /* 49 */
+  II ( d, a, b, c, in[ 7], S42, UL(1126891415)); /* 50 */
+  II ( c, d, a, b, in[14], S43, UL(2878612391)); /* 51 */
+  II ( b, c, d, a, in[ 5], S44, UL(4237533241)); /* 52 */
+  II ( a, b, c, d, in[12], S41, UL(1700485571)); /* 53 */
+  II ( d, a, b, c, in[ 3], S42, UL(2399980690)); /* 54 */
+  II ( c, d, a, b, in[10], S43, UL(4293915773)); /* 55 */
+  II ( b, c, d, a, in[ 1], S44, UL(2240044497)); /* 56 */
+  II ( a, b, c, d, in[ 8], S41, UL(1873313359)); /* 57 */
+  II ( d, a, b, c, in[15], S42, UL(4264355552)); /* 58 */
+  II ( c, d, a, b, in[ 6], S43, UL(2734768916)); /* 59 */
+  II ( b, c, d, a, in[13], S44, UL(1309151649)); /* 60 */
+  II ( a, b, c, d, in[ 4], S41, UL(4149444226)); /* 61 */
+  II ( d, a, b, c, in[11], S42, UL(3174756917)); /* 62 */
+  II ( c, d, a, b, in[ 2], S43, UL( 718787259)); /* 63 */
+  II ( b, c, d, a, in[ 9], S44, UL(3951481745)); /* 64 */
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
+
+/*
+ ***********************************************************************
+ ** End of md5.c                                                      **
+ ******************************** (cut) ********************************
+ */
diff --git a/trunk/package/system/mtd/src/md5.h b/trunk/package/system/mtd/src/md5.h
new file mode 100644
index 00000000..f7a0c964
--- /dev/null
+++ b/trunk/package/system/mtd/src/md5.h
@@ -0,0 +1,65 @@
+/*
+ ***********************************************************************
+ ** md5.h -- header file for implementation of MD5                    **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
+ ** Revised (for MD5): RLR 4/27/91                                    **
+ **   -- G modified to have y&~z instead of y&z                       **
+ **   -- FF, GG, HH modified to add in last register done             **
+ **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
+ **   -- distinct additive constant for each step                     **
+ **   -- round 4 added, working mod 7                                 **
+ ***********************************************************************
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#ifndef __MD5_INCLUDE__
+
+/* typedef a 32-bit type */
+#ifdef _LP64
+typedef unsigned int UINT4;
+typedef int          INT4;
+#else
+typedef unsigned long UINT4;
+typedef long          INT4;
+#endif
+#define _UINT4_T
+
+/* Data structure for MD5 (Message-Digest) computation */
+typedef struct {
+  UINT4 i[2];                   /* number of _bits_ handled mod 2^64 */
+  UINT4 buf[4];                                    /* scratch buffer */
+  unsigned char in[64];                              /* input buffer */
+  unsigned char digest[16];     /* actual digest after MD5Final call */
+} MD5_CTX;
+
+void MD5_Init ();
+void MD5_Update ();
+void MD5_Final ();
+
+#define __MD5_INCLUDE__
+#endif /* __MD5_INCLUDE__ */
diff --git a/trunk/package/system/mtd/src/mtd.c b/trunk/package/system/mtd/src/mtd.c
new file mode 100644
index 00000000..72b9ddfe
--- /dev/null
+++ b/trunk/package/system/mtd/src/mtd.c
@@ -0,0 +1,907 @@
+/*
+ * mtd - simple memory technology device manipulation tool
+ *
+ * Copyright (C) 2005      Waldemar Brodkorb <wbx@dass-it.de>,
+ * Copyright (C) 2005-2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ *
+ * The code is based on the linux-mtd examples.
+ */
+
+#define _GNU_SOURCE
+#include <limits.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <sys/syscall.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <time.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/reboot.h>
+#include <linux/reboot.h>
+#include <mtd/mtd-user.h>
+#include "fis.h"
+#include "mtd.h"
+
+#include <libubox/md5.h>
+
+#define MAX_ARGS 8
+#define JFFS2_DEFAULT_DIR	"" /* directory name without /, empty means root dir */
+
+static char *buf = NULL;
+static char *imagefile = NULL;
+static char *jffs2file = NULL, *jffs2dir = JFFS2_DEFAULT_DIR;
+static int buflen = 0;
+int quiet;
+int no_erase;
+int mtdsize = 0;
+int erasesize = 0;
+int jffs2_skip_bytes=0;
+int mtdtype = 0;
+
+int mtd_open(const char *mtd, bool block)
+{
+	FILE *fp;
+	char dev[PATH_MAX];
+	int i;
+	int ret;
+	int flags = O_RDWR | O_SYNC;
+	char name[PATH_MAX];
+
+	snprintf(name, sizeof(name), "\"%s\"", mtd);
+	if ((fp = fopen("/proc/mtd", "r"))) {
+		while (fgets(dev, sizeof(dev), fp)) {
+			if (sscanf(dev, "mtd%d:", &i) && strstr(dev, name)) {
+				snprintf(dev, sizeof(dev), "/dev/mtd%s/%d", (block ? "block" : ""), i);
+				if ((ret=open(dev, flags))<0) {
+					snprintf(dev, sizeof(dev), "/dev/mtd%s%d", (block ? "block" : ""), i);
+					ret=open(dev, flags);
+				}
+				fclose(fp);
+				return ret;
+			}
+		}
+		fclose(fp);
+	}
+
+	return open(mtd, flags);
+}
+
+int mtd_check_open(const char *mtd)
+{
+	struct mtd_info_user mtdInfo;
+	int fd;
+
+	fd = mtd_open(mtd, false);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		return -1;
+	}
+
+	if(ioctl(fd, MEMGETINFO, &mtdInfo)) {
+		fprintf(stderr, "Could not get MTD device info from %s\n", mtd);
+		close(fd);
+		return -1;
+	}
+	mtdsize = mtdInfo.size;
+	erasesize = mtdInfo.erasesize;
+	mtdtype = mtdInfo.type;
+
+	return fd;
+}
+
+int mtd_block_is_bad(int fd, int offset)
+{
+	int r = 0;
+	loff_t o = offset;
+
+	if (mtdtype == MTD_NANDFLASH)
+	{
+		r = ioctl(fd, MEMGETBADBLOCK, &o);
+		if (r < 0)
+		{
+			fprintf(stderr, "Failed to get erase block status\n");
+			exit(1);
+		}
+	}
+	return r;
+}
+
+int mtd_erase_block(int fd, int offset)
+{
+	struct erase_info_user mtdEraseInfo;
+
+	mtdEraseInfo.start = offset;
+	mtdEraseInfo.length = erasesize;
+	ioctl(fd, MEMUNLOCK, &mtdEraseInfo);
+	if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0)
+		return -1;
+
+	return 0;
+}
+
+int mtd_write_buffer(int fd, const char *buf, int offset, int length)
+{
+	lseek(fd, offset, SEEK_SET);
+	write(fd, buf, length);
+	return 0;
+}
+
+
+static int
+image_check(int imagefd, const char *mtd)
+{
+	int ret = 1;
+	if (trx_check) {
+	  ret = trx_check(imagefd, mtd, buf, &buflen);
+	}
+
+	return ret;
+}
+
+static int mtd_check(const char *mtd)
+{
+	char *next = NULL;
+	char *str = NULL;
+	int fd;
+
+	if (strchr(mtd, ':')) {
+		str = strdup(mtd);
+		mtd = str;
+	}
+
+	do {
+		next = strchr(mtd, ':');
+		if (next) {
+			*next = 0;
+			next++;
+		}
+
+		fd = mtd_check_open(mtd);
+		if (fd < 0)
+			return 0;
+
+		if (!buf)
+			buf = malloc(erasesize);
+
+		close(fd);
+		mtd = next;
+	} while (next);
+
+	if (str)
+		free(str);
+
+	return 1;
+}
+
+static int
+mtd_unlock(const char *mtd)
+{
+	struct erase_info_user mtdLockInfo;
+	char *next = NULL;
+	char *str = NULL;
+	int fd;
+
+	if (strchr(mtd, ':')) {
+		str = strdup(mtd);
+		mtd = str;
+	}
+
+	do {
+		next = strchr(mtd, ':');
+		if (next) {
+			*next = 0;
+			next++;
+		}
+
+		fd = mtd_check_open(mtd);
+		if(fd < 0) {
+			fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+			exit(1);
+		}
+
+		if (quiet < 2)
+			fprintf(stderr, "Unlocking %s ...\n", mtd);
+
+		mtdLockInfo.start = 0;
+		mtdLockInfo.length = mtdsize;
+		ioctl(fd, MEMUNLOCK, &mtdLockInfo);
+		close(fd);
+		mtd = next;
+	} while (next);
+
+	if (str)
+		free(str);
+
+	return 0;
+}
+
+static int
+mtd_erase(const char *mtd)
+{
+	int fd;
+	struct erase_info_user mtdEraseInfo;
+
+	if (quiet < 2)
+		fprintf(stderr, "Erasing %s ...\n", mtd);
+
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		exit(1);
+	}
+
+	mtdEraseInfo.length = erasesize;
+
+	for (mtdEraseInfo.start = 0;
+		 mtdEraseInfo.start < mtdsize;
+		 mtdEraseInfo.start += erasesize) {
+		if (mtd_block_is_bad(fd, mtdEraseInfo.start)) {
+			if (!quiet)
+				fprintf(stderr, "\nSkipping bad block at 0x%x   ", mtdEraseInfo.start);
+		} else {
+			ioctl(fd, MEMUNLOCK, &mtdEraseInfo);
+			if(ioctl(fd, MEMERASE, &mtdEraseInfo))
+				fprintf(stderr, "Failed to erase block on %s at 0x%x\n", mtd, mtdEraseInfo.start);
+		}
+	}
+
+	close(fd);
+	return 0;
+
+}
+
+static int
+mtd_dump(const char *mtd, int part_offset, int size)
+{
+	int ret = 0, offset = 0;
+	int fd;
+	char *buf;
+
+	if (quiet < 2)
+		fprintf(stderr, "Dumping %s ...\n", mtd);
+
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		return -1;
+	}
+
+	if (!size)
+		size = mtdsize;
+
+	if (part_offset)
+		lseek(fd, part_offset, SEEK_SET);
+
+	buf = malloc(erasesize);
+	if (!buf)
+		return -1;
+
+	do {
+		int len = (size > erasesize) ? (erasesize) : (size);
+		int rlen = read(fd, buf, len);
+
+		if (rlen < 0) {
+			if (errno == EINTR)
+				continue;
+			ret = -1;
+			goto out;
+		}
+		if (!rlen || rlen != len)
+			break;
+		if (mtd_block_is_bad(fd, offset)) {
+			fprintf(stderr, "skipping bad block at 0x%08x\n", offset);
+		} else {
+			size -= rlen;
+			write(1, buf, rlen);
+		}
+		offset += rlen;
+	} while (size > 0);
+
+out:
+	close(fd);
+	return ret;
+}
+
+static int
+mtd_verify(const char *mtd, char *file)
+{
+	uint32_t f_md5[4], m_md5[4];
+	struct stat s;
+	md5_ctx_t ctx;
+	int ret = 0;
+	int fd;
+
+	if (quiet < 2)
+		fprintf(stderr, "Verifying %s against %s ...\n", mtd, file);
+
+	if (stat(file, &s) || md5sum(file, f_md5)) {
+		fprintf(stderr, "Failed to hash %s\n", file);
+		return -1;
+	}
+
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		return -1;
+	}
+
+	md5_begin(&ctx);
+	do {
+		char buf[256];
+		int len = (s.st_size > sizeof(buf)) ? (sizeof(buf)) : (s.st_size);
+		int rlen = read(fd, buf, len);
+
+		if (rlen < 0) {
+			if (errno == EINTR)
+				continue;
+			ret = -1;
+			goto out;
+		}
+		if (!rlen)
+			break;
+		md5_hash(buf, rlen, &ctx);
+		s.st_size -= rlen;
+	} while (s.st_size > 0);
+
+	md5_end(m_md5, &ctx);
+
+	fprintf(stderr, "%08x%08x%08x%08x - %s\n", m_md5[0], m_md5[1], m_md5[2], m_md5[3], mtd);
+	fprintf(stderr, "%08x%08x%08x%08x - %s\n", f_md5[0], f_md5[1], f_md5[2], f_md5[3], file);
+
+	ret = memcmp(f_md5, m_md5, sizeof(m_md5));
+	if (!ret)
+		fprintf(stderr, "Success\n");
+	else
+		fprintf(stderr, "Failed\n");
+
+out:
+	close(fd);
+	return ret;
+}
+
+static void
+indicate_writing(const char *mtd)
+{
+	if (quiet < 2)
+		fprintf(stderr, "\nWriting from %s to %s ... ", imagefile, mtd);
+
+	if (!quiet)
+		fprintf(stderr, " [ ]");
+}
+
+static int
+mtd_write(int imagefd, const char *mtd, char *fis_layout, size_t part_offset)
+{
+	char *next = NULL;
+	char *str = NULL;
+	int fd, result;
+	ssize_t r, w, e;
+	ssize_t skip = 0;
+	uint32_t offset = 0;
+	int jffs2_replaced = 0;
+	int skip_bad_blocks = 0;
+
+#ifdef FIS_SUPPORT
+	static struct fis_part new_parts[MAX_ARGS];
+	static struct fis_part old_parts[MAX_ARGS];
+	int n_new = 0, n_old = 0;
+
+	if (fis_layout) {
+		const char *tmp = mtd;
+		char *word, *brkt;
+		int ret;
+
+		memset(&old_parts, 0, sizeof(old_parts));
+		memset(&new_parts, 0, sizeof(new_parts));
+
+		do {
+			next = strchr(tmp, ':');
+			if (!next)
+				next = (char *) tmp + strlen(tmp);
+
+			memcpy(old_parts[n_old].name, tmp, next - tmp);
+
+			n_old++;
+			tmp = next + 1;
+		} while(*next);
+
+		for (word = strtok_r(fis_layout, ",", &brkt);
+		     word;
+			 word = strtok_r(NULL, ",", &brkt)) {
+
+			tmp = strtok(word, ":");
+			strncpy((char *) new_parts[n_new].name, tmp, sizeof(new_parts[n_new].name) - 1);
+
+			tmp = strtok(NULL, ":");
+			if (!tmp)
+				goto next;
+
+			new_parts[n_new].size = strtoul(tmp, NULL, 0);
+
+			tmp = strtok(NULL, ":");
+			if (!tmp)
+				goto next;
+
+			new_parts[n_new].loadaddr = strtoul(tmp, NULL, 16);
+next:
+			n_new++;
+		}
+		ret = fis_validate(old_parts, n_old, new_parts, n_new);
+		if (ret < 0) {
+			fprintf(stderr, "Failed to validate the new FIS partition table\n");
+			exit(1);
+		}
+		if (ret == 0)
+			fis_layout = NULL;
+	}
+#endif
+
+	if (strchr(mtd, ':')) {
+		str = strdup(mtd);
+		mtd = str;
+	}
+
+	r = 0;
+
+resume:
+	next = strchr(mtd, ':');
+	if (next) {
+		*next = 0;
+		next++;
+	}
+
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		exit(1);
+	}
+	if (part_offset > 0) {
+		fprintf(stderr, "Seeking on mtd device '%s' to: %zu\n", mtd, part_offset);
+		lseek(fd, part_offset, SEEK_SET);
+	}
+
+	indicate_writing(mtd);
+
+	w = e = 0;
+	for (;;) {
+		/* buffer may contain data already (from trx check or last mtd partition write attempt) */
+		while (buflen < erasesize) {
+			r = read(imagefd, buf + buflen, erasesize - buflen);
+			if (r < 0) {
+				if ((errno == EINTR) || (errno == EAGAIN))
+					continue;
+				else {
+					perror("read");
+					break;
+				}
+			}
+
+			if (r == 0)
+				break;
+
+			buflen += r;
+		}
+
+		if (buflen == 0)
+			break;
+
+		if (buflen < erasesize) {
+			/* Pad block to eraseblock size */
+			memset(&buf[buflen], 0xff, erasesize - buflen);
+			buflen = erasesize;
+		}
+
+		if (skip > 0) {
+			skip -= buflen;
+			buflen = 0;
+			if (skip <= 0)
+				indicate_writing(mtd);
+
+			continue;
+		}
+
+		if (jffs2file && w >= jffs2_skip_bytes) {
+			if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF) - 1) == 0) {
+				if (!quiet)
+					fprintf(stderr, "\b\b\b   ");
+				if (quiet < 2)
+					fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd);
+				/* got an EOF marker - this is the place to add some jffs2 data */
+				skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
+				jffs2_replaced = 1;
+
+				/* don't add it again */
+				jffs2file = NULL;
+
+				w += skip;
+				e += skip;
+				skip -= buflen;
+				buflen = 0;
+				offset = 0;
+				continue;
+			}
+			/* no EOF marker, make sure we figure out the last inode number
+			 * before appending some data */
+			mtd_parse_jffs2data(buf, jffs2dir);
+		}
+
+		/* need to erase the next block before writing data to it */
+		if(!no_erase)
+		{
+			while (w + buflen > e - skip_bad_blocks) {
+				if (!quiet)
+					fprintf(stderr, "\b\b\b[e]");
+
+				if (mtd_block_is_bad(fd, e)) {
+					if (!quiet)
+						fprintf(stderr, "\nSkipping bad block at 0x%08zx   ", e);
+
+					skip_bad_blocks += erasesize;
+					e += erasesize;
+
+					// Move the file pointer along over the bad block.
+					lseek(fd, erasesize, SEEK_CUR);
+					continue;
+				}
+
+				if (mtd_erase_block(fd, e) < 0) {
+					if (next) {
+						if (w < e) {
+							write(fd, buf + offset, e - w);
+							offset = e - w;
+						}
+						w = 0;
+						e = 0;
+						close(fd);
+						mtd = next;
+						fprintf(stderr, "\b\b\b   \n");
+						goto resume;
+					} else {
+						fprintf(stderr, "Failed to erase block\n");
+						exit(1);
+					}
+				}
+
+				/* erase the chunk */
+				e += erasesize;
+			}
+		}
+
+		if (!quiet)
+			fprintf(stderr, "\b\b\b[w]");
+
+		if ((result = write(fd, buf + offset, buflen)) < buflen) {
+			if (result < 0) {
+				fprintf(stderr, "Error writing image.\n");
+				exit(1);
+			} else {
+				fprintf(stderr, "Insufficient space.\n");
+				exit(1);
+			}
+		}
+		w += buflen;
+
+		buflen = 0;
+		offset = 0;
+	}
+
+	if (jffs2_replaced && trx_fixup) {
+		trx_fixup(fd, mtd);
+	}
+
+	if (!quiet)
+		fprintf(stderr, "\b\b\b\b    ");
+
+	if (quiet < 2)
+		fprintf(stderr, "\n");
+
+#ifdef FIS_SUPPORT
+	if (fis_layout) {
+		if (fis_remap(old_parts, n_old, new_parts, n_new) < 0)
+			fprintf(stderr, "Failed to update the FIS partition table\n");
+	}
+#endif
+
+	close(fd);
+	return 0;
+}
+
+static void usage(void)
+{
+	fprintf(stderr, "Usage: mtd [<options> ...] <command> [<arguments> ...] <device>[:<device>...]\n\n"
+	"The device is in the format of mtdX (eg: mtd4) or its label.\n"
+	"mtd recognizes these commands:\n"
+	"        unlock                  unlock the device\n"
+	"        refresh                 refresh mtd partition\n"
+	"        erase                   erase all data on device\n"
+	"        verify <imagefile>|-    verify <imagefile> (use - for stdin) to device\n"
+	"        write <imagefile>|-     write <imagefile> (use - for stdin) to device\n"
+	"        jffs2write <file>       append <file> to the jffs2 partition on the device\n");
+	if (mtd_fixtrx) {
+	    fprintf(stderr,
+	"        fixtrx                  fix the checksum in a trx header on first boot\n");
+	}
+	if (mtd_fixseama) {
+	    fprintf(stderr,
+	"        fixseama                fix the checksum in a seama header on first boot\n");
+	}
+	fprintf(stderr,
+	"Following options are available:\n"
+	"        -q                      quiet mode (once: no [w] on writing,\n"
+	"                                           twice: no status messages)\n"
+	"        -n                      write without first erasing the blocks\n"
+	"        -r                      reboot after successful command\n"
+	"        -f                      force write without trx checks\n"
+	"        -e <device>             erase <device> before executing the command\n"
+	"        -d <name>               directory for jffs2write, defaults to \"tmp\"\n"
+	"        -j <name>               integrate <file> into jffs2 data when writing an image\n"
+	"        -s <number>             skip the first n bytes when appending data to the jffs2 partiton, defaults to \"0\"\n"
+	"        -p                      write beginning at partition offset\n"
+	"        -l <length>             the length of data that we want to dump\n");
+	if (mtd_fixtrx) {
+	    fprintf(stderr,
+	"        -o offset               offset of the image header in the partition(for fixtrx)\n");
+	}
+	fprintf(stderr,
+#ifdef FIS_SUPPORT
+	"        -F <part>[:<size>[:<entrypoint>]][,<part>...]\n"
+	"                                alter the fis partition table to create new partitions replacing\n"
+	"                                the partitions provided as argument to the write command\n"
+	"                                (only valid together with the write command)\n"
+#endif
+	"\n"
+	"Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n"
+	"         mtd -r write linux.trx linux\n\n");
+	exit(1);
+}
+
+static void do_reboot(void)
+{
+	fprintf(stderr, "Rebooting ...\n");
+	fflush(stderr);
+
+	/* try regular reboot method first */
+	system("/sbin/reboot");
+	sleep(2);
+
+	/* if we're still alive at this point, force the kernel to reboot */
+	syscall(SYS_reboot,LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,LINUX_REBOOT_CMD_RESTART,NULL);
+}
+
+int main (int argc, char **argv)
+{
+	int ch, i, boot, imagefd = 0, force, unlocked;
+	char *erase[MAX_ARGS], *device = NULL;
+	char *fis_layout = NULL;
+	size_t offset = 0, part_offset = 0, dump_len = 0;
+	enum {
+		CMD_ERASE,
+		CMD_WRITE,
+		CMD_UNLOCK,
+		CMD_JFFS2WRITE,
+		CMD_FIXTRX,
+		CMD_FIXSEAMA,
+		CMD_VERIFY,
+		CMD_DUMP,
+	} cmd = -1;
+
+	erase[0] = NULL;
+	boot = 0;
+	force = 0;
+	buflen = 0;
+	quiet = 0;
+	no_erase = 0;
+
+	while ((ch = getopt(argc, argv,
+#ifdef FIS_SUPPORT
+			"F:"
+#endif
+			"frnqe:d:s:j:p:o:l:")) != -1)
+		switch (ch) {
+			case 'f':
+				force = 1;
+				break;
+			case 'r':
+				boot = 1;
+				break;
+			case 'n':
+				no_erase = 1;
+				break;
+			case 'j':
+				jffs2file = optarg;
+				break;
+			case 's':
+				errno = 0;
+				jffs2_skip_bytes = strtoul(optarg, 0, 0);
+				if (errno) {
+						fprintf(stderr, "-s: illegal numeric string\n");
+						usage();
+				}
+				break;
+			case 'q':
+				quiet++;
+				break;
+			case 'e':
+				i = 0;
+				while ((erase[i] != NULL) && ((i + 1) < MAX_ARGS))
+					i++;
+
+				erase[i++] = optarg;
+				erase[i] = NULL;
+				break;
+			case 'd':
+				jffs2dir = optarg;
+				break;
+			case 'p':
+				errno = 0;
+				part_offset = strtoul(optarg, 0, 0);
+				if (errno) {
+					fprintf(stderr, "-p: illegal numeric string\n");
+					usage();
+				}
+				break;
+			case 'l':
+				errno = 0;
+				dump_len = strtoul(optarg, 0, 0);
+				if (errno) {
+					fprintf(stderr, "-l: illegal numeric string\n");
+					usage();
+				}
+				break;
+			case 'o':
+				errno = 0;
+				offset = strtoul(optarg, 0, 0);
+				if (errno) {
+					fprintf(stderr, "-o: illegal numeric string\n");
+					usage();
+				}
+				break;
+#ifdef FIS_SUPPORT
+			case 'F':
+				fis_layout = optarg;
+				break;
+#endif
+			case '?':
+			default:
+				usage();
+		}
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 2)
+		usage();
+
+	if ((strcmp(argv[0], "unlock") == 0) && (argc == 2)) {
+		cmd = CMD_UNLOCK;
+		device = argv[1];
+	} else if ((strcmp(argv[0], "erase") == 0) && (argc == 2)) {
+		cmd = CMD_ERASE;
+		device = argv[1];
+	} else if (((strcmp(argv[0], "fixtrx") == 0) && (argc == 2)) && mtd_fixtrx) {
+		cmd = CMD_FIXTRX;
+		device = argv[1];
+	} else if (((strcmp(argv[0], "fixseama") == 0) && (argc == 2)) && mtd_fixseama) {
+		cmd = CMD_FIXSEAMA;
+		device = argv[1];
+	} else if ((strcmp(argv[0], "verify") == 0) && (argc == 3)) {
+		cmd = CMD_VERIFY;
+		imagefile = argv[1];
+		device = argv[2];
+	} else if ((strcmp(argv[0], "dump") == 0) && (argc == 2)) {
+		cmd = CMD_DUMP;
+		device = argv[1];
+	} else if ((strcmp(argv[0], "write") == 0) && (argc == 3)) {
+		cmd = CMD_WRITE;
+		device = argv[2];
+
+		if (strcmp(argv[1], "-") == 0) {
+			imagefile = "<stdin>";
+			imagefd = 0;
+		} else {
+			imagefile = argv[1];
+			if ((imagefd = open(argv[1], O_RDONLY)) < 0) {
+				fprintf(stderr, "Couldn't open image file: %s!\n", imagefile);
+				exit(1);
+			}
+		}
+
+		if (!mtd_check(device)) {
+			fprintf(stderr, "Can't open device for writing!\n");
+			exit(1);
+		}
+		/* check trx file before erasing or writing anything */
+		if (!image_check(imagefd, device) && !force) {
+			fprintf(stderr, "Image check failed.\n");
+			exit(1);
+		}
+	} else if ((strcmp(argv[0], "jffs2write") == 0) && (argc == 3)) {
+		cmd = CMD_JFFS2WRITE;
+		device = argv[2];
+
+		imagefile = argv[1];
+		if (!mtd_check(device)) {
+			fprintf(stderr, "Can't open device for writing!\n");
+			exit(1);
+		}
+	} else {
+		usage();
+	}
+
+	sync();
+
+	i = 0;
+	unlocked = 0;
+	while (erase[i] != NULL) {
+		mtd_unlock(erase[i]);
+		mtd_erase(erase[i]);
+		if (strcmp(erase[i], device) == 0)
+			unlocked = 1;
+		i++;
+	}
+
+	switch (cmd) {
+		case CMD_UNLOCK:
+			if (!unlocked)
+				mtd_unlock(device);
+			break;
+		case CMD_VERIFY:
+			mtd_verify(device, imagefile);
+			break;
+		case CMD_DUMP:
+			mtd_dump(device, offset, dump_len);
+			break;
+		case CMD_ERASE:
+			if (!unlocked)
+				mtd_unlock(device);
+			mtd_erase(device);
+			break;
+		case CMD_WRITE:
+			if (!unlocked)
+				mtd_unlock(device);
+			mtd_write(imagefd, device, fis_layout, part_offset);
+			break;
+		case CMD_JFFS2WRITE:
+			if (!unlocked)
+				mtd_unlock(device);
+			mtd_write_jffs2(device, imagefile, jffs2dir);
+			break;
+		case CMD_FIXTRX:
+		    if (mtd_fixtrx) {
+			    mtd_fixtrx(device, offset);
+            }
+		case CMD_FIXSEAMA:
+			if (mtd_fixseama)
+			    mtd_fixseama(device, 0);
+			break;
+	}
+
+	sync();
+
+	if (boot)
+		do_reboot();
+
+	return 0;
+}
diff --git a/trunk/package/system/mtd/src/mtd.h b/trunk/package/system/mtd/src/mtd.h
new file mode 100644
index 00000000..d94f3943
--- /dev/null
+++ b/trunk/package/system/mtd/src/mtd.h
@@ -0,0 +1,30 @@
+#ifndef __mtd_h
+#define __mtd_h
+
+#include <stdbool.h>
+
+#ifdef target_brcm47xx
+#define target_brcm 1
+#endif
+
+#define JFFS2_EOF "\xde\xad\xc0\xde"
+
+extern int quiet;
+extern int mtdsize;
+extern int erasesize;
+
+extern int mtd_open(const char *mtd, bool block);
+extern int mtd_check_open(const char *mtd);
+extern int mtd_block_is_bad(int fd, int offset);
+extern int mtd_erase_block(int fd, int offset);
+extern int mtd_write_buffer(int fd, const char *buf, int offset, int length);
+extern int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir);
+extern int mtd_replace_jffs2(const char *mtd, int fd, int ofs, const char *filename);
+extern void mtd_parse_jffs2data(const char *buf, const char *dir);
+
+/* target specific functions */
+extern int trx_fixup(int fd, const char *name)  __attribute__ ((weak));
+extern int trx_check(int imagefd, const char *mtd, char *buf, int *len) __attribute__ ((weak));
+extern int mtd_fixtrx(const char *mtd, size_t offset) __attribute__ ((weak));
+extern int mtd_fixseama(const char *mtd, size_t offset) __attribute__ ((weak));
+#endif /* __mtd_h */
diff --git a/trunk/package/system/mtd/src/seama.c b/trunk/package/system/mtd/src/seama.c
new file mode 100644
index 00000000..b0c8bf3d
--- /dev/null
+++ b/trunk/package/system/mtd/src/seama.c
@@ -0,0 +1,179 @@
+/*
+ * seama.c
+ *
+ * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Based on the trx fixup code:
+ *   Copyright (C) 2005 Mike Baker
+ *   Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include <sys/ioctl.h>
+#include <mtd/mtd-user.h>
+#include "mtd.h"
+#include "seama.h"
+#include "md5.h"
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define STORE32_LE(X)           ((((X) & 0x000000FF) << 24) | (((X) & 0x0000FF00) << 8) | (((X) & 0x00FF0000) >> 8) | (((X) & 0xFF000000) >> 24))
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#define STORE32_LE(X)           (X)
+#else
+#error unknown endianness!
+#endif
+
+ssize_t pread(int fd, void *buf, size_t count, off_t offset);
+ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
+
+int
+seama_fix_md5(char *buf, size_t len)
+{
+	struct seama_hdr *shdr;
+	char *data;
+	size_t msize;
+	size_t isize;
+	MD5_CTX ctx;
+	unsigned char digest[16];
+	int i;
+
+	if (len < sizeof(struct seama_hdr))
+		return -1;
+
+	shdr = (struct seama_hdr *) buf;
+	if (shdr->magic != htonl(SEAMA_MAGIC)) {
+		fprintf(stderr, "no SEAMA header found\n");
+		return -1;
+	}
+
+	isize = ntohl(shdr->size);
+	msize = ntohs(shdr->metasize);
+	if (isize == 0) {
+		/* the image contains no checksum */
+		return -1;
+	}
+
+	len -= sizeof(struct seama_hdr) + sizeof(digest) + msize;
+	if (isize > len)
+		isize = len;
+
+	data = buf + sizeof(struct seama_hdr) + sizeof(digest) + msize;
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, data, isize);
+	MD5_Final(digest, &ctx);
+
+	if (!memcmp(digest, &buf[sizeof(struct seama_hdr)], sizeof(digest))) {
+		if (quiet < 2)
+			fprintf(stderr, "the header is fixed already\n");
+		return -1;
+	}
+
+	if (quiet < 2) {
+		fprintf(stderr, "new size:%u, new MD5: ", isize);
+		for (i = 0; i < sizeof(digest); i++)
+			fprintf(stderr, "%02x", digest[i]);
+
+		fprintf(stderr, "\n");
+	}
+
+	/* update the size in the image */
+	shdr->size = htonl(isize);
+
+	/* update the checksum in the image */
+	for (i = 0; i < sizeof(digest); i++)
+		buf[sizeof(struct seama_hdr) + i] = digest[i];
+
+	return 0;
+}
+
+int
+mtd_fixseama(const char *mtd, size_t offset)
+{
+	int fd;
+	char *buf;
+	ssize_t res;
+	size_t block_offset;
+
+	if (quiet < 2)
+		fprintf(stderr, "Trying to fix SEAMA header in %s at 0x%x...\n",
+			mtd, offset);
+
+	block_offset = offset & ~(erasesize - 1);
+	offset -= block_offset;
+
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		exit(1);
+	}
+
+	if (block_offset + erasesize > mtdsize) {
+		fprintf(stderr, "Offset too large, device size 0x%x\n",
+			mtdsize);
+		exit(1);
+	}
+
+	buf = malloc(mtdsize);
+	if (!buf) {
+		perror("malloc");
+		exit(1);
+	}
+
+	res = pread(fd, buf, mtdsize, block_offset);
+	if (res != mtdsize) {
+		perror("pread");
+		exit(1);
+	}
+
+	if (seama_fix_md5(buf, mtdsize))
+		goto out;
+
+	if (mtd_erase_block(fd, block_offset)) {
+		fprintf(stderr, "Can't erease block at 0x%x (%s)\n",
+			block_offset, strerror(errno));
+		exit(1);
+	}
+
+	if (quiet < 2)
+		fprintf(stderr, "Rewriting block at 0x%x\n", block_offset);
+
+	if (pwrite(fd, buf, erasesize, block_offset) != erasesize) {
+		fprintf(stderr, "Error writing block (%s)\n", strerror(errno));
+		exit(1);
+	}
+
+	if (quiet < 2)
+		fprintf(stderr, "Done.\n");
+
+out:
+	close (fd);
+	sync();
+
+	return 0;
+}
+
diff --git a/trunk/package/system/mtd/src/seama.h b/trunk/package/system/mtd/src/seama.h
new file mode 100644
index 00000000..02683b6e
--- /dev/null
+++ b/trunk/package/system/mtd/src/seama.h
@@ -0,0 +1,108 @@
+/* vi: set sw=4 ts=4: */
+/*
+ *	(SEA)ttle i(MA)ge is the image which used in project seattle.
+ *
+ *	Created by David Hsieh <david_hsieh@alphanetworks.com>
+ *	Copyright (C) 2008-2009 Alpha Networks, Inc.
+ *
+ *	This file is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either'
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	The GNU C Library is distributed in the hope that it will be useful,'
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with the GNU C Library; if not, write to the Free
+ *	Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *	02111-1307 USA.
+ */
+
+#ifndef __SEAMA_HEADER_FILE__
+#define __SEAMA_HEADER_FILE__
+
+#include <stdint.h>
+
+#define SEAMA_MAGIC		0x5EA3A417
+
+/*
+ *	SEAMA looks like the following map.
+ *	All the data of the header should be in network byte order.
+ *
+ *  +-------------+-------------+------------
+ *	| SEAMA magic               |     ^
+ *  +-------------+-------------+     |
+ *	| reserved    | meta size   |     |
+ *  +-------------+-------------+   header
+ *	| image size (0 bytes)      |     |
+ *  +-------------+-------------+     |
+ *	~ Meta data                 ~     v
+ *  +-------------+-------------+------------
+ *	| SEAMA magic               |   ^     ^
+ *  +-------------+-------------+   |     |
+ *	| reserved    | meta size   |   |     |
+ *  +-------------+-------------+   |     |
+ *	| image size                |   |     |
+ *  +-------------+-------------+ header  |
+ *	|                           |   |     |
+ *	| 16 bytes of MD5 digest    |   |     |
+ *	|                           |   |     |
+ *	|                           |   |     |
+ *  +-------------+-------------+   |     |
+ *	~ Meta data                 ~   v     |
+ *  +-------------+-------------+-------  |
+ *	|                           |         |
+ *	| Image of the 1st entity   |         |
+ *	~                           ~ 1st entity
+ *	|                           |         |
+ *	|                           |         v
+ *  +-------------+-------------+-------------
+ *	| SEAMA magic               |   ^     ^
+ *  +-------------+-------------+   |     |
+ *	| reserved    | meta size   |   |     |
+ *  +-------------+-------------+   |     |
+ *	| image size                |   |     |
+ *  +-------------+-------------+ header  |
+ *	|                           |   |     |
+ *	| 16 bytes of MD5 digest    |   |     |
+ *	|                           |   |     |
+ *	|                           |   |     |
+ *  +-------------+-------------+   |     |
+ *	~ Meta data                 ~   v     |
+ *  +-------------+-------------+-------  |
+ *	|                           |         |
+ *	| Image of the 2nd entity   |         |
+ *	~                           ~ 2nd entity
+ *	|                           |         |
+ *	|                           |         v
+ *  +-------------+-------------+-------------
+ */
+
+
+/*
+ *	SEAMA header
+ *
+ *	|<-------- 32 bits -------->|
+ *  +-------------+-------------+
+ *	| SEAMA magic               |
+ *  +-------------+-------------+
+ *	| reserved    | meta size   |
+ *  +-------------+-------------+
+ *	| image size                |
+ *  +-------------+-------------+
+ */
+/* seama header */
+typedef struct seama_hdr	seamahdr_t;
+struct seama_hdr
+{
+	uint32_t	magic;			/* should always be SEAMA_MAGIC. */
+	uint16_t	reserved;		/* reserved for  */
+	uint16_t	metasize;		/* size of the META data */
+	uint32_t	size;			/* size of the image */
+} __attribute__ ((packed));
+
+
+#endif
diff --git a/trunk/package/system/mtd/src/trx.c b/trunk/package/system/mtd/src/trx.c
new file mode 100644
index 00000000..089d1ace
--- /dev/null
+++ b/trunk/package/system/mtd/src/trx.c
@@ -0,0 +1,222 @@
+/*
+ * trx.c
+ *
+ * Copyright (C) 2005 Mike Baker
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <errno.h>
+
+#include <sys/ioctl.h>
+#include <mtd/mtd-user.h>
+#include "mtd.h"
+#include "crc32.h"
+
+#define TRX_MAGIC       0x30524448      /* "HDR0" */
+struct trx_header {
+	uint32_t magic;		/* "HDR0" */
+	uint32_t len;		/* Length of file including header */
+	uint32_t crc32;		/* 32-bit CRC from flag_version to end of file */
+	uint32_t flag_version;	/* 0:15 flags, 16:31 version */
+	uint32_t offsets[3];    /* Offsets of partitions from start of header */
+};
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define STORE32_LE(X)           ((((X) & 0x000000FF) << 24) | (((X) & 0x0000FF00) << 8) | (((X) & 0x00FF0000) >> 8) | (((X) & 0xFF000000) >> 24))
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#define STORE32_LE(X)           (X)
+#else
+#error unknown endianness!
+#endif
+
+ssize_t pread(int fd, void *buf, size_t count, off_t offset);
+ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
+
+int
+trx_fixup(int fd, const char *name)
+{
+	struct mtd_info_user mtdInfo;
+	unsigned long len;
+	struct trx_header *trx;
+	void *ptr, *scan;
+	int bfd;
+
+	if (ioctl(fd, MEMGETINFO, &mtdInfo) < 0) {
+		fprintf(stderr, "Failed to get mtd info\n");
+		goto err;
+	}
+
+	len = mtdInfo.size;
+	if (mtdInfo.size <= 0) {
+		fprintf(stderr, "Invalid MTD device size\n");
+		goto err;
+	}
+
+	bfd = mtd_open(name, true);
+	ptr = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, bfd, 0);
+	if (!ptr || (ptr == (void *) -1)) {
+		perror("mmap");
+		goto err1;
+	}
+
+	trx = ptr;
+	if (trx->magic != TRX_MAGIC) {
+		fprintf(stderr, "TRX header not found\n");
+		goto err;
+	}
+
+	scan = ptr + offsetof(struct trx_header, flag_version);
+	trx->crc32 = crc32buf(scan, trx->len - (scan - ptr));
+	msync(ptr, sizeof(struct trx_header), MS_SYNC|MS_INVALIDATE);
+	munmap(ptr, len);
+	close(bfd);
+	return 0;
+
+err1:
+	close(bfd);
+err:
+	fprintf(stderr, "Error fixing up TRX header\n");
+	return -1;
+}
+
+#ifndef target_ar71xx
+int
+trx_check(int imagefd, const char *mtd, char *buf, int *len)
+{
+	const struct trx_header *trx = (const struct trx_header *) buf;
+	int fd;
+
+	if (strcmp(mtd, "firmware") != 0)
+		return 1;
+
+	*len = read(imagefd, buf, 32);
+	if (*len < 32) {
+		fprintf(stdout, "Could not get image header, file too small (%d bytes)\n", *len);
+		return 0;
+	}
+
+	if (trx->magic != TRX_MAGIC || trx->len < sizeof(struct trx_header)) {
+		if (quiet < 2) {
+			fprintf(stderr, "Bad trx header\n");
+			fprintf(stderr, "This is not the correct file format; refusing to flash.\n"
+					"Please specify the correct file or use -f to force.\n");
+		}
+		return 0;
+	}
+
+	/* check if image fits to mtd device */
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		exit(1);
+	}
+
+	if(mtdsize < trx->len) {
+		fprintf(stderr, "Image too big for partition: %s\n", mtd);
+		close(fd);
+		return 0;
+	}
+
+	close(fd);
+	return 1;
+}
+#endif
+
+int
+mtd_fixtrx(const char *mtd, size_t offset)
+{
+	int fd;
+	struct trx_header *trx;
+	char *buf;
+	ssize_t res;
+	size_t block_offset;
+
+	if (quiet < 2)
+		fprintf(stderr, "Trying to fix trx header in %s at 0x%x...\n", mtd, offset);
+
+	fd = mtd_check_open(mtd);
+	if(fd < 0) {
+		fprintf(stderr, "Could not open mtd device: %s\n", mtd);
+		exit(1);
+	}
+
+	block_offset = offset & ~(erasesize - 1);
+	offset -= block_offset;
+
+	if (block_offset + erasesize > mtdsize) {
+		fprintf(stderr, "Offset too large, device size 0x%x\n", mtdsize);
+		exit(1);
+	}
+
+	buf = malloc(erasesize);
+	if (!buf) {
+		perror("malloc");
+		exit(1);
+	}
+
+	res = pread(fd, buf, erasesize, block_offset);
+	if (res != erasesize) {
+		perror("pread");
+		exit(1);
+	}
+
+	trx = (struct trx_header *) (buf + offset);
+	if (trx->magic != STORE32_LE(0x30524448)) {
+		fprintf(stderr, "No trx magic found\n");
+		exit(1);
+	}
+
+	if (trx->len == STORE32_LE(erasesize - offset)) {
+		if (quiet < 2)
+			fprintf(stderr, "Header already fixed, exiting\n");
+		close(fd);
+		return 0;
+	}
+
+	trx->len = STORE32_LE(erasesize - offset);
+
+	trx->crc32 = STORE32_LE(crc32buf((char*) &trx->flag_version, erasesize - offset - 3*4));
+	if (mtd_erase_block(fd, block_offset)) {
+		fprintf(stderr, "Can't erease block at 0x%x (%s)\n", block_offset, strerror(errno));
+		exit(1);
+	}
+
+	if (quiet < 2)
+		fprintf(stderr, "New crc32: 0x%x, rewriting block\n", trx->crc32);
+
+	if (pwrite(fd, buf, erasesize, block_offset) != erasesize) {
+		fprintf(stderr, "Error writing block (%s)\n", strerror(errno));
+		exit(1);
+	}
+
+	if (quiet < 2)
+		fprintf(stderr, "Done.\n");
+
+	close (fd);
+	sync();
+	return 0;
+
+}
+
diff --git a/trunk/package/system/opkg/Makefile b/trunk/package/system/opkg/Makefile
new file mode 100644
index 00000000..391adfa0
--- /dev/null
+++ b/trunk/package/system/opkg/Makefile
@@ -0,0 +1,154 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/version.mk
+include $(INCLUDE_DIR)/feeds.mk
+
+PKG_NAME:=opkg
+PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d
+PKG_VERSION:=$(PKG_REV)
+PKG_RELEASE:=7
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://git.yoctoproject.org/git/opkg
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES = autogen.sh aclocal.m4
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_PARALLEL:=1
+HOST_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/opkg/Default
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=opkg package manager
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  URL:=http://wiki.openmoko.org/wiki/Opkg
+endef
+
+define Package/opkg/Default/description
+  Lightweight package management system
+  opkg is the opkg Package Management System, for handling
+  installation and removal of packages on a system. It can
+  recursively follow dependencies and download all packages
+  necessary to install a particular package.
+
+  opkg knows how to install both .ipk and .deb packages.
+endef
+
+define Package/opkg
+  $(call Package/opkg/Default)
+  VARIANT:=unsigned
+endef
+
+define Package/opkg/description
+  $(call Package/opkg/Default/description)
+endef
+
+define Package/opkg/conffiles
+/etc/opkg.conf
+endef
+
+
+define Package/opkg-smime
+  $(call Package/opkg/Default)
+  TITLE+= (with S/MIME signature support)
+  DEPENDS+=+libopenssl
+  VARIANT:=smime
+endef
+
+define Package/opkg-smime/description
+  $(call Package/opkg/Default/description)
+
+  This package allows the Package index to be verified with S/MIME.
+endef
+
+Package/opkg-smime/conffiles = $(Package/opkg/conffiles)
+
+TARGET_CFLAGS += $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds)
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
+
+CONFIGURE_ARGS += \
+	--disable-curl \
+	--disable-gpg \
+	--with-opkgetcdir=/etc \
+	--with-opkglockfile=/var/lock/opkg.lock
+
+ifeq ($(BUILD_VARIANT),smime)
+	CONFIGURE_ARGS += --enable-openssl --enable-sha256
+endif
+
+MAKE_FLAGS = \
+		CC="$(TARGET_CC)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		HOST_CPU="$(PKGARCH)" \
+		LDFLAGS="-Wl,--gc-sections" \
+
+define Package/opkg/Default/install
+	$(INSTALL_DIR) $(1)/usr/lib/opkg
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/opkg$(2).conf $(1)/etc/opkg.conf
+  ifeq ($(CONFIG_PER_FEED_REPO),)
+	echo "src/gz %n %U" >> $(1)/etc/opkg.conf
+  else
+	for d in base $(FEEDS_ENABLED); do \
+		echo "src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \
+	done
+    ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),)
+	for d in $(FEEDS_DISABLED); do \
+		echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \
+	done
+    endif
+  endif
+	$(VERSION_SED) $(1)/etc/opkg.conf
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
+endef
+
+Package/opkg/install = $(call Package/opkg/Default/install,$(1),)
+
+define Package/opkg-smime/install
+	$(call Package/opkg/Default/install,$(1),-smime)
+	$(INSTALL_DIR) $(1)/etc/ssl/certs
+	$(if $(CONFIG_OPKGSMIME_CERT),$(INSTALL_DATA) $(call qstrip,$(CONFIG_OPKGSMIME_CERT)) $(1)/etc/ssl/certs/opkg.pem,)
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libopkg $(1)/usr/include/
+endef
+
+
+HOST_CONFIGURE_ARGS+= \
+	--disable-curl \
+	--disable-gpg \
+	--with-opkgetcdir=/etc \
+	--with-opkglockfile=/tmp/opkg.lock
+
+define Host/Compile
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/opkg-cl $(STAGING_DIR_HOST)/bin/opkg
+endef
+
+$(eval $(call BuildPackage,opkg))
+$(eval $(call BuildPackage,opkg-smime))
+$(eval $(call HostBuild))
diff --git a/trunk/package/system/opkg/files/opkg-smime.conf b/trunk/package/system/opkg/files/opkg-smime.conf
new file mode 100644
index 00000000..fd2cade1
--- /dev/null
+++ b/trunk/package/system/opkg/files/opkg-smime.conf
@@ -0,0 +1,6 @@
+dest root /
+dest ram /tmp
+lists_dir ext /var/opkg-lists
+option overlay_root /overlay
+option check_signature 1
+option signature_ca_file /etc/ssl/certs/opkg.pem
diff --git a/trunk/package/system/opkg/files/opkg.conf b/trunk/package/system/opkg/files/opkg.conf
new file mode 100644
index 00000000..d8d3a2d6
--- /dev/null
+++ b/trunk/package/system/opkg/files/opkg.conf
@@ -0,0 +1,4 @@
+dest root /
+dest ram /tmp
+lists_dir ext /var/opkg-lists
+option overlay_root /overlay
diff --git a/trunk/package/system/opkg/patches/001-ship-pkg-m4.patch b/trunk/package/system/opkg/patches/001-ship-pkg-m4.patch
new file mode 100644
index 00000000..4ca0f889
--- /dev/null
+++ b/trunk/package/system/opkg/patches/001-ship-pkg-m4.patch
@@ -0,0 +1,168 @@
+--- /dev/null
++++ b/m4/pkg.m4
+@@ -0,0 +1,157 @@
++# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# 
++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that 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.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=m4_default([$1], [0.9.0])
++	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		AC_MSG_RESULT([yes])
++	else
++		AC_MSG_RESULT([no])
++		PKG_CONFIG=""
++	fi
++		
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists.  Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++  m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++  $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++    if test -n "$$1"; then
++        pkg_cv_[]$1="$$1"
++    else
++        PKG_CHECK_EXISTS([$3],
++                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++			 [pkg_failed=yes])
++    fi
++else
++	pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++        _PKG_SHORT_ERRORS_SUPPORTED
++        if test $_pkg_short_errors_supported = yes; then
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++        else 
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++	ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++		[AC_MSG_RESULT([no])
++                $4])
++elif test $pkg_failed = untried; then
++	ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++		[$4])
++else
++	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++        AC_MSG_RESULT([yes])
++	ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-ACLOCAL_AMFLAGS = -I shave
++ACLOCAL_AMFLAGS = -I shave -I m4
+ 
+ SUBDIRS = libbb libopkg src tests utils man
+ 
diff --git a/trunk/package/system/opkg/patches/002-no-shave.patch b/trunk/package/system/opkg/patches/002-no-shave.patch
new file mode 100644
index 00000000..313aa71b
--- /dev/null
+++ b/trunk/package/system/opkg/patches/002-no-shave.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,6 @@ AC_CONFIG_SRCDIR([libopkg/pkg.c])
+ 
+ AC_CONFIG_AUX_DIR([conf])
+ AC_CONFIG_MACRO_DIR([m4])
+-AC_CONFIG_MACRO_DIR([shave])
+ 
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(libopkg/config.h)
+@@ -277,9 +276,6 @@ AC_SUBST(opkgetcdir)
+ AC_SUBST(opkglockfile)
+ AC_SUBST([CLEAN_DATE])
+ 
+-# Setup output beautifier.
+-SHAVE_INIT([shave], [enable])
+-
+ AC_OUTPUT(
+     Makefile
+     libopkg/Makefile
+@@ -289,8 +285,6 @@ AC_OUTPUT(
+     utils/Makefile
+     utils/update-alternatives
+     libopkg.pc
+-    shave/shave
+-    shave/shave-libtool
+     man/Makefile
+     man/opkg-cl.1
+     man/opkg-key.1
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-ACLOCAL_AMFLAGS = -I shave -I m4
++ACLOCAL_AMFLAGS = -I m4
+ 
+ SUBDIRS = libbb libopkg src tests utils man
+ 
diff --git a/trunk/package/system/opkg/patches/004-host_cpu.patch b/trunk/package/system/opkg/patches/004-host_cpu.patch
new file mode 100644
index 00000000..d500d603
--- /dev/null
+++ b/trunk/package/system/opkg/patches/004-host_cpu.patch
@@ -0,0 +1,20 @@
+--- a/libbb/Makefile.am
++++ b/libbb/Makefile.am
+@@ -1,6 +1,6 @@
+ HOST_CPU=@host_cpu@
+ BUILD_CPU=@build_cpu@
+-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@
++ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@
+ 
+ noinst_LTLIBRARIES = libbb.la
+ 
+--- a/libopkg/Makefile.am
++++ b/libopkg/Makefile.am
+@@ -1,5 +1,5 @@
+-
+-AM_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DOPKGLOCKFILE=\"@opkglockfile@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS)
++HOST_CPU=@host_cpu@
++AM_CFLAGS=-Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DOPKGLOCKFILE=\"@opkglockfile@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS)
+ 
+ libopkg_includedir=$(includedir)/libopkg
+ libopkg_include_HEADERS= *.h
diff --git a/trunk/package/system/opkg/patches/007-force_static.patch b/trunk/package/system/opkg/patches/007-force_static.patch
new file mode 100644
index 00000000..38cdb7a8
--- /dev/null
+++ b/trunk/package/system/opkg/patches/007-force_static.patch
@@ -0,0 +1,71 @@
+--- a/libopkg/Makefile.am
++++ b/libopkg/Makefile.am
+@@ -38,16 +38,10 @@
+ opkg_util_sources += sha256.c sha256.h
+ endif
+ 
+-lib_LTLIBRARIES = libopkg.la
+-libopkg_la_SOURCES = \
++noinst_LIBRARIES = libopkg.a
++libopkg_a_SOURCES = \
+ 	$(opkg_libcore_sources) \
+ 	$(opkg_cmd_sources) $(opkg_db_sources) \
+ 	$(opkg_util_sources) $(opkg_list_sources)
+ 
+-libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
+-
+-# make sure we only export symbols that are for public use
+-#libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*"
+-
+-
+-
++libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a
+--- a/libbb/Makefile.am
++++ b/libbb/Makefile.am
+@@ -2,9 +2,9 @@
+ BUILD_CPU=@build_cpu@
+ ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@
+ 
+-noinst_LTLIBRARIES = libbb.la
++noinst_LIBRARIES = libbb.a
+ 
+-libbb_la_SOURCES = gz_open.c \
++libbb_a_SOURCES = gz_open.c \
+ 	libbb.h \
+ 	unzip.c \
+ 	wfopen.c \
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -4,11 +4,11 @@
+ #noinst_PROGRAMS = libopkg_test opkg_active_list_test
+ noinst_PROGRAMS = libopkg_test
+ 
+-#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
++#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
+ #opkg_hash_test_SOURCES = opkg_hash_test.c
+ #opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
+ 
+-#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
++#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
+ #opkg_extract_test_SOURCES = opkg_extract_test.c
+ #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
+ 
+@@ -16,7 +16,7 @@
+ #opkg_active_list_test_SOURCES = opkg_active_list_test.c
+ #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
+ 
+-libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la
++libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
+ libopkg_test_SOURCE = libopkg_test.c
+ libopkg_test_LDFLAGS = -static
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,5 +2,5 @@
+ bin_PROGRAMS = opkg-cl
+ 
+ opkg_cl_SOURCES = opkg-cl.c
+-opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
+-                $(top_builddir)/libbb/libbb.la 
++opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \
++                $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
diff --git a/trunk/package/system/opkg/patches/009-remove-upgrade-all.patch b/trunk/package/system/opkg/patches/009-remove-upgrade-all.patch
new file mode 100644
index 00000000..395a2a6f
--- /dev/null
+++ b/trunk/package/system/opkg/patches/009-remove-upgrade-all.patch
@@ -0,0 +1,41 @@
+--- a/libopkg/opkg_cmd.c
++++ b/libopkg/opkg_cmd.c
+@@ -551,18 +551,6 @@ opkg_upgrade_cmd(int argc, char **argv)
+ 			    err = -1;
+                }
+ 	  }
+-     } else {
+-	  pkg_vec_t *installed = pkg_vec_alloc();
+-
+-	  pkg_info_preinstall_check();
+-
+-	  pkg_hash_fetch_all_installed(installed);
+-	  for (i = 0; i < installed->len; i++) {
+-	       pkg = installed->pkgs[i];
+-	       if (opkg_upgrade_pkg(pkg))
+-		       err = -1;
+-	  }
+-	  pkg_vec_free(installed);
+      }
+ 
+      if (opkg_configure_packages(NULL))
+@@ -1258,7 +1246,7 @@ opkg_print_architecture_cmd(int argc, ch
+    array for easier maintenance */
+ static opkg_cmd_t cmds[] = {
+      {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+-     {"upgrade", 0, (opkg_cmd_fun_t)opkg_upgrade_cmd, PFM_DESCRIPTION|PFM_SOURCE},
++     {"upgrade", 1, (opkg_cmd_fun_t)opkg_upgrade_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+      {"list", 0, (opkg_cmd_fun_t)opkg_list_cmd, PFM_SOURCE},
+      {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
+      {"list-installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
+--- a/src/opkg-cl.c
++++ b/src/opkg-cl.c
+@@ -221,7 +221,7 @@ usage()
+ 
+ 	printf("\nPackage Manipulation:\n");
+ 	printf("\tupdate			Update list of available packages\n");
+-	printf("\tupgrade			Upgrade installed packages\n");
++	printf("\tupgrade <pkgs>		Upgrade packages\n");
+ 	printf("\tinstall <pkgs>		Install package(s)\n");
+ 	printf("\tconfigure <pkgs>	Configure unpacked package(s)\n");
+ 	printf("\tremove <pkgs|regexp>	Remove package(s)\n");
diff --git a/trunk/package/system/opkg/patches/011-old-config-location.patch b/trunk/package/system/opkg/patches/011-old-config-location.patch
new file mode 100644
index 00000000..05559268
--- /dev/null
+++ b/trunk/package/system/opkg/patches/011-old-config-location.patch
@@ -0,0 +1,12 @@
+--- a/src/opkg-cl.c
++++ b/src/opkg-cl.c
+@@ -207,6 +207,9 @@ args_parse(int argc, char *argv[])
+ 		}
+ 	}
+ 
++	if(!conf->conf_file && !conf->offline_root)
++		conf->conf_file = xstrdup("/etc/opkg.conf");
++
+ 	if (parse_err)
+ 		return parse_err;
+ 	else
diff --git a/trunk/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch b/trunk/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
new file mode 100644
index 00000000..a47ae77c
--- /dev/null
+++ b/trunk/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
@@ -0,0 +1,23 @@
+--- a/libopkg/opkg_install.c
++++ b/libopkg/opkg_install.c
+@@ -274,6 +274,7 @@ unpack_pkg_control_files(pkg_t *pkg)
+      while (1) {
+ 	  char *cf_name;
+ 	  char *cf_name_in_dest;
++	  int i;
+ 
+ 	  cf_name = file_read_line_alloc(conffiles_file);
+ 	  if (cf_name == NULL) {
+@@ -282,6 +283,12 @@ unpack_pkg_control_files(pkg_t *pkg)
+ 	  if (cf_name[0] == '\0') {
+ 	       continue;
+ 	  }
++	  for (i = strlen(cf_name) - 1;
++	       (i >= 0) && (cf_name[i] == ' ' || cf_name[i] == '\t');
++	       i--
++	  ) {
++	       cf_name[i] = '\0';
++	  }
+ 
+ 	  /* Prepend dest->root_dir to conffile name.
+ 	     Take pains to avoid multiple slashes. */
diff --git a/trunk/package/system/opkg/patches/014-errors-to-stderr.patch b/trunk/package/system/opkg/patches/014-errors-to-stderr.patch
new file mode 100644
index 00000000..f0a93a87
--- /dev/null
+++ b/trunk/package/system/opkg/patches/014-errors-to-stderr.patch
@@ -0,0 +1,15 @@
+--- a/libopkg/opkg_message.c
++++ b/libopkg/opkg_message.c
+@@ -64,10 +64,10 @@ print_error_list(void)
+ 	struct errlist *err = error_list_head;
+ 
+ 	if (err) {
+-		printf("Collected errors:\n");
++		fprintf(stderr, "Collected errors:\n");
+ 		/* Here we print the errors collected and free the list */
+ 		while (err != NULL) {
+-			printf(" * %s", err->errmsg);
++			fprintf(stderr, " * %s", err->errmsg);
+ 			err = err->next;
+ 		}
+ 	}
diff --git a/trunk/package/system/opkg/patches/020-avoid_getline.patch b/trunk/package/system/opkg/patches/020-avoid_getline.patch
new file mode 100644
index 00000000..8a1a8f62
--- /dev/null
+++ b/trunk/package/system/opkg/patches/020-avoid_getline.patch
@@ -0,0 +1,317 @@
+--- a/libopkg/parse_util.c
++++ b/libopkg/parse_util.c
+@@ -22,6 +22,7 @@
+ #include "libbb/libbb.h"
+ 
+ #include "parse_util.h"
++#include "pkg_parse.h"
+ 
+ int
+ is_field(const char *type, const char *line)
+@@ -86,3 +87,84 @@ parse_list(const char *raw, unsigned int
+ 	*count = line_count;
+ 	return depends;
+ }
++
++int
++parse_from_stream_nomalloc(parse_line_t parse_line, void *item, FILE *fp, uint mask,
++						char **buf0, size_t buf0len)
++{
++	int ret, lineno;
++	char *buf, *nl;
++	size_t buflen;
++
++	lineno = 1;
++	ret = 0;
++
++	buflen = buf0len;
++	buf = *buf0;
++	buf[0] = '\0';
++
++	while (1) {
++		if (fgets(buf, (int)buflen, fp) == NULL) {
++			if (ferror(fp)) {
++				opkg_perror(ERROR, "fgets");
++				ret = -1;
++			} else if (strlen(*buf0) == buf0len-1) {
++				opkg_msg(ERROR, "Missing new line character"
++						" at end of file!\n");
++				parse_line(item, *buf0, mask);
++			}
++			break;
++		}
++
++		nl = strchr(buf, '\n');
++		if (nl == NULL) {
++			if (strlen(buf) < buflen-1) {
++				/*
++				 * Line could be exactly buflen-1 long and
++				 * missing a newline, but we won't know until
++				 * fgets fails to read more data.
++				 */
++				opkg_msg(ERROR, "Missing new line character"
++						" at end of file!\n");
++				parse_line(item, *buf0, mask);
++				break;
++			}
++			if (buf0len >= EXCESSIVE_LINE_LEN) {
++				opkg_msg(ERROR, "Excessively long line at "
++					"%d. Corrupt file?\n",
++					lineno);
++				ret = -1;
++				break;
++			}
++
++			/*
++			 * Realloc and point buf past the data already read,
++			 * at the NULL terminator inserted by fgets.
++			 * |<--------------- buf0len ----------------->|
++			 * |                     |<------- buflen ---->|
++			 * |---------------------|---------------------|
++			 * buf0                   buf
++			 */
++			buflen = buf0len +1;
++			buf0len *= 2;
++			*buf0 = xrealloc(*buf0, buf0len);
++			buf = *buf0 + buflen -2;
++
++			continue;
++		}
++
++		*nl = '\0';
++
++		lineno++;
++
++		if (parse_line(item, *buf0, mask))
++			break;
++
++		buf = *buf0;
++		buflen = buf0len;
++		buf[0] = '\0';
++	}
++
++	return ret;
++}
++
+--- a/libopkg/parse_util.h
++++ b/libopkg/parse_util.h
+@@ -22,4 +22,8 @@ int is_field(const char *type, const cha
+ char *parse_simple(const char *type, const char *line);
+ char **parse_list(const char *raw, unsigned int *count, const char sep, int skip_field);
+ 
++typedef int (*parse_line_t)(void *, const char *, uint);
++int parse_from_stream_nomalloc(parse_line_t parse_line, void *item, FILE *fp, uint mask,
++						char **buf0, size_t buf0len);
++
+ #endif
+--- a/libopkg/pkg_hash.c
++++ b/libopkg/pkg_hash.c
+@@ -23,6 +23,7 @@
+ #include "opkg_message.h"
+ #include "pkg_vec.h"
+ #include "pkg_hash.h"
++#include "parse_util.h"
+ #include "pkg_parse.h"
+ #include "opkg_utils.h"
+ #include "sprintf_alloc.h"
+@@ -119,8 +120,14 @@ pkg_hash_add_from_file(const char *file_
+ 		pkg->src = src;
+ 		pkg->dest = dest;
+ 
+-		ret = pkg_parse_from_stream_nomalloc(pkg, fp, 0,
++		ret = parse_from_stream_nomalloc(pkg_parse_line, pkg, fp, 0,
+ 				&buf, len);
++
++		if (pkg->name == NULL) {
++			/* probably just a blank line */
++			ret = 1;
++		}
++
+ 		if (ret) {
+ 			pkg_deinit (pkg);
+ 			free(pkg);
+--- a/libopkg/pkg_parse.c
++++ b/libopkg/pkg_parse.c
+@@ -104,9 +104,11 @@ get_arch_priority(const char *arch)
+ 	return 0;
+ }
+ 
+-static int
+-pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
++int
++pkg_parse_line(void *ptr, const char *line, uint mask)
+ {
++	pkg_t *pkg = (pkg_t *) ptr;
++
+ 	/* these flags are a bit hackish... */
+ 	static int reading_conffiles = 0, reading_description = 0;
+ 	int ret = 0;
+@@ -266,91 +268,6 @@ dont_reset_flags:
+ }
+ 
+ int
+-pkg_parse_from_stream_nomalloc(pkg_t *pkg, FILE *fp, uint mask,
+-						char **buf0, size_t buf0len)
+-{
+-	int ret, lineno;
+-	char *buf, *nl;
+-	size_t buflen;
+-
+-	lineno = 1;
+-	ret = 0;
+-
+-	buflen = buf0len;
+-	buf = *buf0;
+-	buf[0] = '\0';
+-
+-	while (1) {
+-		if (fgets(buf, (int)buflen, fp) == NULL) {
+-			if (ferror(fp)) {
+-				opkg_perror(ERROR, "fgets");
+-				ret = -1;
+-			} else if (strlen(*buf0) == buf0len-1) {
+-				opkg_msg(ERROR, "Missing new line character"
+-						" at end of file!\n");
+-				pkg_parse_line(pkg, *buf0, mask);
+-			}
+-			break;
+-		}
+-
+-		nl = strchr(buf, '\n');
+-		if (nl == NULL) {
+-			if (strlen(buf) < buflen-1) {
+-				/*
+-				 * Line could be exactly buflen-1 long and
+-				 * missing a newline, but we won't know until
+-				 * fgets fails to read more data.
+-				 */
+-				opkg_msg(ERROR, "Missing new line character"
+-						" at end of file!\n");
+-				pkg_parse_line(pkg, *buf0, mask);
+-				break;
+-			}
+-			if (buf0len >= EXCESSIVE_LINE_LEN) {
+-				opkg_msg(ERROR, "Excessively long line at "
+-					"%d. Corrupt file?\n",
+-					lineno);
+-				ret = -1;
+-				break;
+-			}
+-
+-			/*
+-			 * Realloc and point buf past the data already read,
+-			 * at the NULL terminator inserted by fgets.
+-			 * |<--------------- buf0len ----------------->|
+-			 * |                     |<------- buflen ---->|
+-			 * |---------------------|---------------------|
+-			 * buf0                   buf
+-			 */
+-			buflen = buf0len +1;
+-			buf0len *= 2;
+-			*buf0 = xrealloc(*buf0, buf0len);
+-			buf = *buf0 + buflen -2;
+-
+-			continue;
+-		}
+-
+-		*nl = '\0';
+-
+-		lineno++;
+-
+-		if (pkg_parse_line(pkg, *buf0, mask))
+-			break;
+-
+-		buf = *buf0;
+-		buflen = buf0len;
+-		buf[0] = '\0';
+-	}
+-
+-	if (pkg->name == NULL) {
+-		/* probably just a blank line */
+-		ret = 1;
+-	}
+-
+-	return ret;
+-}
+-
+-int
+ pkg_parse_from_stream(pkg_t *pkg, FILE *fp, uint mask)
+ {
+ 	int ret;
+@@ -358,8 +275,13 @@ pkg_parse_from_stream(pkg_t *pkg, FILE *
+ 	const size_t len = 4096;
+ 
+ 	buf = xmalloc(len);
+-	ret = pkg_parse_from_stream_nomalloc(pkg, fp, mask, &buf, len);
++	ret = parse_from_stream_nomalloc(pkg_parse_line, pkg, fp, mask, &buf, len);
+ 	free(buf);
+ 
++	if (pkg->name == NULL) {
++		/* probably just a blank line */
++		ret = 1;
++	}
++
+ 	return ret;
+ }
+--- a/libopkg/pkg_parse.h
++++ b/libopkg/pkg_parse.h
+@@ -18,10 +18,11 @@
+ #ifndef PKG_PARSE_H
+ #define PKG_PARSE_H
+ 
++#include "pkg.h"
++
+ int parse_version(pkg_t *pkg, const char *raw);
+ int pkg_parse_from_stream(pkg_t *pkg, FILE *fp, uint mask);
+-int pkg_parse_from_stream_nomalloc(pkg_t *pkg, FILE *fp, uint mask,
+-						char **buf0, size_t buf0len);
++int pkg_parse_line(void *ptr, const char *line, uint mask);
+ 
+ #define EXCESSIVE_LINE_LEN	(4096 << 8)
+ 
+--- a/libopkg/release_parse.c
++++ b/libopkg/release_parse.c
+@@ -23,8 +23,10 @@
+ #include "parse_util.h"
+ 
+ static int
+-release_parse_line(release_t *release, const char *line)
++release_parse_line(void *ptr, const char *line, uint mask)
+ {
++	release_t *release = (release_t *) ptr;
++
+ 	int ret = 0;
+ 	unsigned int count = 0;
+ 	char **list = 0;
+@@ -111,25 +113,14 @@ dont_reset_flags:
+ int
+ release_parse_from_stream(release_t *release, FILE *fp)
+ {
+-	int ret = 0;
+-	char *buf = NULL;
+-	size_t buflen, nread;
+-
+-	nread = getline(&buf, &buflen, fp);
+-	while ( nread != -1 ) {
+-		if (buf[nread-1] == '\n') buf[nread-1] = '\0';
+-		if (release_parse_line(release, buf))
+-                        opkg_msg(DEBUG, "Failed to parse release line for %s:\n\t%s\n",
+-					release->name, buf);
+-		nread = getline(&buf, &buflen, fp);
+-	}
+-
+-	if (!feof(fp)) {
+-		opkg_perror(ERROR, "Problems reading Release file for %sd\n", release->name);
+-		ret = -1;
+-	}
++	int ret;
++	char *buf;
++	const size_t len = 4096;
+ 
++	buf = xmalloc(len);
++	ret = parse_from_stream_nomalloc(release_parse_line, release, fp, 0, &buf, len);
+ 	free(buf);
++
+ 	return ret;
+ }
+ 
diff --git a/trunk/package/system/opkg/patches/030-fix-double-free.patch b/trunk/package/system/opkg/patches/030-fix-double-free.patch
new file mode 100644
index 00000000..312e06c5
--- /dev/null
+++ b/trunk/package/system/opkg/patches/030-fix-double-free.patch
@@ -0,0 +1,10 @@
+--- a/libopkg/opkg_remove.c
++++ b/libopkg/opkg_remove.c
+@@ -138,7 +138,6 @@ opkg_remove_dependent_pkgs(pkg_t *pkg, a
+     for (i = 0; i < dependent_pkgs->len; i++) {
+         err = opkg_remove_pkg(dependent_pkgs->pkgs[i],0);
+         if (err) {
+-            pkg_vec_free(dependent_pkgs);
+             break;
+ 	}
+     }
diff --git a/trunk/package/system/opkg/patches/040-wrap-descriptions-only-on-ttys.patch b/trunk/package/system/opkg/patches/040-wrap-descriptions-only-on-ttys.patch
new file mode 100644
index 00000000..95406687
--- /dev/null
+++ b/trunk/package/system/opkg/patches/040-wrap-descriptions-only-on-ttys.patch
@@ -0,0 +1,31 @@
+--- a/libopkg/pkg_parse.c
++++ b/libopkg/pkg_parse.c
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <unistd.h>
+ 
+ #include "pkg.h"
+ #include "opkg_utils.h"
+@@ -239,10 +240,16 @@ pkg_parse_line(void *ptr, const char *li
+ 
+ 	case ' ':
+ 		if ((mask & PFM_DESCRIPTION) && reading_description) {
+-			pkg->description = xrealloc(pkg->description,
+-						strlen(pkg->description)
+-						+ 1 + strlen(line) + 1);
+-			strcat(pkg->description, "\n");
++			if (isatty(1)) {
++				pkg->description = xrealloc(pkg->description,
++							strlen(pkg->description)
++							+ 1 + strlen(line) + 1);
++				strcat(pkg->description, "\n");
++			} else {
++				pkg->description = xrealloc(pkg->description,
++							strlen(pkg->description)
++							+ 1 + strlen(line));
++			}
+ 			strcat(pkg->description, (line));
+ 			goto dont_reset_flags;
+ 		} else if ((mask & PFM_CONFFILES) && reading_conffiles) {
diff --git a/trunk/package/system/opkg/patches/050-add-case-insensitive-flag.patch b/trunk/package/system/opkg/patches/050-add-case-insensitive-flag.patch
new file mode 100644
index 00000000..4b9215b8
--- /dev/null
+++ b/trunk/package/system/opkg/patches/050-add-case-insensitive-flag.patch
@@ -0,0 +1,169 @@
+--- a/libopkg/opkg_cmd.c
++++ b/libopkg/opkg_cmd.c
+@@ -436,7 +436,7 @@ opkg_configure_packages(char *pkg_name)
+      for(i = 0; i < ordered->len; i++) {
+ 	  pkg = ordered->pkgs[i];
+ 
+-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0))
++	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
+ 	       continue;
+ 
+ 	  if (pkg->state_status == SS_UNPACKED) {
+@@ -610,7 +610,7 @@ opkg_list_cmd(int argc, char **argv)
+      for (i=0; i < available->len; i++) {
+ 	  pkg = available->pkgs[i];
+ 	  /* if we have package name or pattern and pkg does not match, then skip it */
+-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0))
++	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
+ 	       continue;
+           print_pkg(pkg);
+      }
+@@ -637,7 +637,7 @@ opkg_list_installed_cmd(int argc, char *
+      for (i=0; i < available->len; i++) {
+ 	  pkg = available->pkgs[i];
+ 	  /* if we have package name or pattern and pkg does not match, then skip it */
+-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0))
++	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
+ 	       continue;
+           print_pkg(pkg);
+      }
+@@ -666,7 +666,7 @@ opkg_list_changed_conffiles_cmd(int argc
+      for (i=0; i < available->len; i++) {
+ 	  pkg = available->pkgs[i];
+ 	  /* if we have package name or pattern and pkg does not match, then skip it */
+-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0))
++	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
+ 	    continue;
+ 	  if (nv_pair_list_empty(&pkg->conffiles))
+ 	    continue;
+@@ -722,7 +722,7 @@ opkg_info_status_cmd(int argc, char **ar
+ 
+      for (i=0; i < available->len; i++) {
+ 	  pkg = available->pkgs[i];
+-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) {
++	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase)) {
+ 	       continue;
+ 	  }
+ 
+@@ -792,7 +792,7 @@ opkg_remove_cmd(int argc, char **argv)
+      for (i=0; i<argc; i++) {
+         for (a=0; a<available->len; a++) {
+             pkg = available->pkgs[a];
+-	    if (fnmatch(argv[i], pkg->name, 0)) {
++	    if (fnmatch(argv[i], pkg->name, conf->nocase)) {
+                continue;
+             }
+             if (conf->restrict_to_default_dest) {
+@@ -926,7 +926,7 @@ opkg_depends_cmd(int argc, char **argv)
+ 		for (j=0; j<available_pkgs->len; j++) {
+ 			pkg = available_pkgs->pkgs[j];
+ 
+-			if (fnmatch(argv[i], pkg->name, 0) != 0)
++			if (fnmatch(argv[i], pkg->name, conf->nocase) != 0)
+ 				continue;
+ 
+ 			depends_count = pkg->depends_count +
+@@ -1147,9 +1147,9 @@ opkg_what_provides_replaces_cmd(enum wha
+ 			      ((what_field_type == WHATPROVIDES)
+ 			       ? pkg->provides[k]
+ 			       : pkg->replaces[k]);
+-			 if (fnmatch(target, apkg->name, 0) == 0) {
++			 if (fnmatch(target, apkg->name, conf->nocase) == 0) {
+ 			      opkg_msg(NOTICE, "    %s", pkg->name);
+-			      if (strcmp(target, apkg->name) != 0)
++			      if ((conf->nocase ? strcasecmp(target, apkg->name) : strcmp(target, apkg->name)) != 0)
+ 				   opkg_msg(NOTICE, "\t%s %s\n",
+ 						   rel_str, apkg->name);
+ 			      opkg_message(NOTICE, "\n");
+@@ -1200,7 +1200,7 @@ opkg_search_cmd(int argc, char **argv)
+ 
+ 	  for (iter = str_list_first(installed_files); iter; iter = str_list_next(installed_files, iter)) {
+ 	       installed_file = (char *)iter->data;
+-	       if (fnmatch(argv[0], installed_file, 0)==0)
++	       if (fnmatch(argv[0], installed_file, conf->nocase)==0)
+ 	            print_pkg(pkg);
+ 	  }
+ 
+--- a/libopkg/opkg_conf.c
++++ b/libopkg/opkg_conf.c
+@@ -62,6 +62,7 @@ opkg_option_t options[] = {
+ 	  { "noaction", OPKG_OPT_TYPE_BOOL, &_conf.noaction },
+ 	  { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only },
+ 	  { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps },
++	  { "nocase", OPKG_OPT_TYPE_BOOL, &_conf.nocase },
+ 	  { "offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root },
+ 	  { "overlay_root", OPKG_OPT_TYPE_STRING, &_conf.overlay_root },
+ 	  { "proxy_passwd", OPKG_OPT_TYPE_STRING, &_conf.proxy_passwd },
+--- a/libopkg/opkg_conf.h
++++ b/libopkg/opkg_conf.h
+@@ -24,6 +24,7 @@ extern opkg_conf_t *conf;
+ #include "config.h"
+ 
+ #include <stdarg.h>
++#include <fnmatch.h> /* FNM_CASEFOLD */
+ 
+ #include "hash_table.h"
+ #include "pkg_src_list.h"
+@@ -79,6 +80,7 @@ struct opkg_conf
+      int force_remove;
+      int check_signature;
+      int nodeps; /* do not follow dependencies */
++     int nocase; /* perform case insensitive matching */
+      char *offline_root;
+      char *overlay_root;
+      int query_all;
+--- a/src/opkg-cl.c
++++ b/src/opkg-cl.c
+@@ -47,6 +47,7 @@ enum {
+ 	ARGS_OPT_NOACTION,
+ 	ARGS_OPT_DOWNLOAD_ONLY,
+ 	ARGS_OPT_NODEPS,
++	ARGS_OPT_NOCASE,
+ 	ARGS_OPT_AUTOREMOVE,
+ 	ARGS_OPT_CACHE,
+ };
+@@ -86,6 +87,7 @@ static struct option long_options[] = {
+ 	{"noaction", 0, 0, ARGS_OPT_NOACTION},
+ 	{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
+ 	{"nodeps", 0, 0, ARGS_OPT_NODEPS},
++	{"nocase", 0, 0, ARGS_OPT_NOCASE},
+ 	{"offline", 1, 0, 'o'},
+ 	{"offline-root", 1, 0, 'o'},
+ 	{"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
+@@ -107,7 +109,7 @@ args_parse(int argc, char *argv[])
+ 	char *tuple, *targ;
+ 
+ 	while (1) {
+-		c = getopt_long_only(argc, argv, "Ad:f:no:p:t:vV::",
++		c = getopt_long_only(argc, argv, "Ad:f:ino:p:t:vV::",
+ 				long_options, &option_index);
+ 		if (c == -1)
+ 			break;
+@@ -122,6 +124,9 @@ args_parse(int argc, char *argv[])
+ 		case 'f':
+ 			conf->conf_file = xstrdup(optarg);
+ 			break;
++		case 'i':
++			conf->nocase = FNM_CASEFOLD;
++			break;
+ 		case 'o':
+ 			conf->offline_root = xstrdup(optarg);
+ 			break;
+@@ -176,6 +181,9 @@ args_parse(int argc, char *argv[])
+ 		case ARGS_OPT_NODEPS:
+ 			conf->nodeps = 1;
+ 			break;
++		case ARGS_OPT_NOCASE:
++			conf->nocase = FNM_CASEFOLD;
++			break;
+ 		case ARGS_OPT_ADD_ARCH:
+ 		case ARGS_OPT_ADD_DEST:
+ 			tuple = xstrdup(optarg);
+@@ -287,6 +295,7 @@ usage()
+ 	printf("\t--noaction		No action -- test only\n");
+ 	printf("\t--download-only	No action -- download only\n");
+ 	printf("\t--nodeps		Do not follow dependencies\n");
++	printf("\t--nocase		Perform case insensitive pattern matching\n");
+ 	printf("\t--force-removal-of-dependent-packages\n");
+ 	printf("\t			Remove package and all dependencies\n");
+ 	printf("\t--autoremove		Remove packages that were installed\n");
diff --git a/trunk/package/system/opkg/patches/060-add-find-command.patch b/trunk/package/system/opkg/patches/060-add-find-command.patch
new file mode 100644
index 00000000..17625349
--- /dev/null
+++ b/trunk/package/system/opkg/patches/060-add-find-command.patch
@@ -0,0 +1,58 @@
+--- a/libopkg/opkg_cmd.c
++++ b/libopkg/opkg_cmd.c
+@@ -594,7 +594,7 @@ opkg_download_cmd(int argc, char **argv)
+ 
+ 
+ static int
+-opkg_list_cmd(int argc, char **argv)
++opkg_list_find_cmd(int argc, char **argv, int use_desc)
+ {
+      int i;
+      pkg_vec_t *available;
+@@ -610,7 +610,8 @@ opkg_list_cmd(int argc, char **argv)
+      for (i=0; i < available->len; i++) {
+ 	  pkg = available->pkgs[i];
+ 	  /* if we have package name or pattern and pkg does not match, then skip it */
+-	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
++	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase) &&
++	      (!use_desc || !pkg->description || fnmatch(pkg_name, pkg->description, conf->nocase)))
+ 	       continue;
+           print_pkg(pkg);
+      }
+@@ -619,6 +620,18 @@ opkg_list_cmd(int argc, char **argv)
+      return 0;
+ }
+ 
++static int
++opkg_list_cmd(int argc, char **argv)
++{
++	return opkg_list_find_cmd(argc, argv, 0);
++}
++
++static int
++opkg_find_cmd(int argc, char **argv)
++{
++	return opkg_list_find_cmd(argc, argv, 1);
++}
++
+ 
+ static int
+ opkg_list_installed_cmd(int argc, char **argv)
+@@ -1262,6 +1275,7 @@ static opkg_cmd_t cmds[] = {
+      {"configure", 0, (opkg_cmd_fun_t)opkg_configure_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+      {"files", 1, (opkg_cmd_fun_t)opkg_files_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+      {"search", 1, (opkg_cmd_fun_t)opkg_search_cmd, PFM_DESCRIPTION|PFM_SOURCE},
++     {"find", 1, (opkg_cmd_fun_t)opkg_find_cmd, PFM_SOURCE},
+      {"download", 1, (opkg_cmd_fun_t)opkg_download_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+      {"compare_versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+      {"compare-versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+--- a/src/opkg-cl.c
++++ b/src/opkg-cl.c
+@@ -246,6 +246,7 @@ usage()
+ 	printf("\tlist-changed-conffiles	List user modified configuration files\n");
+ 	printf("\tfiles <pkg>		List files belonging to <pkg>\n");
+ 	printf("\tsearch <file|regexp>	List package providing <file>\n");
++	printf("\tfind <regexp>		List packages whose name or description matches <regexp>\n");
+ 	printf("\tinfo [pkg|regexp]	Display all info for <pkg>\n");
+ 	printf("\tstatus [pkg|regexp]	Display all status for <pkg>\n");
+ 	printf("\tdownload <pkg>		Download <pkg> to current directory\n");
diff --git a/trunk/package/system/opkg/patches/070-use_gzipped_pkg_list.patch b/trunk/package/system/opkg/patches/070-use_gzipped_pkg_list.patch
new file mode 100644
index 00000000..d32b5191
--- /dev/null
+++ b/trunk/package/system/opkg/patches/070-use_gzipped_pkg_list.patch
@@ -0,0 +1,120 @@
+--- a/libopkg/opkg.c
++++ b/libopkg/opkg.c
+@@ -592,49 +592,8 @@ opkg_update_package_lists(opkg_progress_
+ 				      src->gzip ? "Packages.gz" : "Packages");
+ 
+ 		sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
+-		if (src->gzip) {
+-			FILE *in, *out;
+-			struct _curl_cb_data cb_data;
+-			char *tmp_file_name = NULL;
+ 
+-			sprintf_alloc(&tmp_file_name, "%s/%s.gz", tmp,
+-				      src->name);
+-
+-			opkg_msg(INFO, "Downloading %s to %s...\n", url,
+-					tmp_file_name);
+-
+-			cb_data.cb = progress_callback;
+-			cb_data.progress_data = &pdata;
+-			cb_data.user_data = user_data;
+-			cb_data.start_range =
+-			    100 * sources_done / sources_list_count;
+-			cb_data.finish_range =
+-			    100 * (sources_done + 1) / sources_list_count;
+-
+-			err = opkg_download(url, tmp_file_name,
+-					  (curl_progress_func) curl_progress_cb,
+-					  &cb_data, 0);
+-
+-			if (err == 0) {
+-				opkg_msg(INFO, "Inflating %s...\n",
+-						tmp_file_name);
+-				in = fopen(tmp_file_name, "r");
+-				out = fopen(list_file_name, "w");
+-				if (in && out)
+-					unzip(in, out);
+-				else
+-					err = 1;
+-				if (in)
+-					fclose(in);
+-				if (out)
+-					fclose(out);
+-				unlink(tmp_file_name);
+-			}
+-			free(tmp_file_name);
+-		} else
+-			err = opkg_download(url, list_file_name, NULL, NULL, 0);
+-
+-		if (err) {
++		if (opkg_download(url, list_file_name, NULL, NULL, 0)) {
+ 			opkg_msg(ERROR, "Couldn't retrieve %s\n", url);
+ 			result = -1;
+ 		}
+--- a/libopkg/opkg_cmd.c
++++ b/libopkg/opkg_cmd.c
+@@ -162,30 +162,7 @@ opkg_update_cmd(int argc, char **argv)
+ 	      sprintf_alloc(&url, "%s/%s", src->value, src->gzip ? "Packages.gz" : "Packages");
+ 
+ 	  sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
+-	  if (src->gzip) {
+-	      char *tmp_file_name;
+-	      FILE *in, *out;
+-
+-	      sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
+-	      err = opkg_download(url, tmp_file_name, NULL, NULL, 0);
+-	      if (err == 0) {
+-		   opkg_msg(NOTICE, "Inflating %s.\n", url);
+-		   in = fopen (tmp_file_name, "r");
+-		   out = fopen (list_file_name, "w");
+-		   if (in && out)
+-			unzip (in, out);
+-		   else
+-			err = 1;
+-		   if (in)
+-			fclose (in);
+-		   if (out)
+-			fclose (out);
+-		   unlink (tmp_file_name);
+-	      }
+-	      free(tmp_file_name);
+-	  } else
+-	      err = opkg_download(url, list_file_name, NULL, NULL, 0);
+-	  if (err) {
++	  if (opkg_download(url, list_file_name, NULL, NULL, 0)) {
+ 	       failures++;
+ 	  } else {
+ 	       opkg_msg(NOTICE, "Updated list of available packages in %s.\n",
+--- a/libopkg/pkg_hash.c
++++ b/libopkg/pkg_hash.c
+@@ -102,12 +102,18 @@ pkg_hash_add_from_file(const char *file_
+ 			pkg_src_t *src, pkg_dest_t *dest, int is_status_file)
+ {
+ 	pkg_t *pkg;
+-	FILE *fp;
++	FILE *fp, *fp_c = NULL;
+ 	char *buf;
+ 	const size_t len = 4096;
+ 	int ret = 0;
++	int pid;
+ 
+ 	fp = fopen(file_name, "r");
++	if (fp && src && src->gzip) {
++		fp_c = fp;
++		fp = gz_open(fp_c, &pid);
++	}
++
+ 	if (fp == NULL) {
+ 		opkg_perror(ERROR, "Failed to open %s", file_name);
+ 		return -1;
+@@ -154,6 +160,10 @@ pkg_hash_add_from_file(const char *file_
+ 
+ 	free(buf);
+ 	fclose(fp);
++	if (fp_c) {
++		fclose(fp_c);
++		gz_close(pid);
++	}
+ 
+ 	return ret;
+ }
diff --git a/trunk/package/system/opkg/patches/080-suppress-blank-package-fields.patch b/trunk/package/system/opkg/patches/080-suppress-blank-package-fields.patch
new file mode 100644
index 00000000..976b97d7
--- /dev/null
+++ b/trunk/package/system/opkg/patches/080-suppress-blank-package-fields.patch
@@ -0,0 +1,16 @@
+--- a/libopkg/parse_util.c
++++ b/libopkg/parse_util.c
+@@ -35,7 +35,12 @@ is_field(const char *type, const char *l
+ char *
+ parse_simple(const char *type, const char *line)
+ {
+-	return trim_xstrdup(line + strlen(type) + 1);
++	char *field = trim_xstrdup(line + strlen(type) + 1);
++	if (strlen(field) == 0) {
++		free(field);
++		return NULL;
++	}
++	return field;
+ }
+ 
+ /*
diff --git a/trunk/package/system/opkg/patches/090-suppress-blank-provides-field.patch b/trunk/package/system/opkg/patches/090-suppress-blank-provides-field.patch
new file mode 100644
index 00000000..7adf9223
--- /dev/null
+++ b/trunk/package/system/opkg/patches/090-suppress-blank-provides-field.patch
@@ -0,0 +1,11 @@
+--- a/libopkg/pkg.c
++++ b/libopkg/pkg.c
+@@ -731,7 +731,7 @@ pkg_formatted_field(FILE *fp, pkg_t *pkg
+ 	  } else if (strcasecmp(field, "Priority") == 0) {
+                fprintf(fp, "Priority: %s\n", pkg->priority);
+ 	  } else if (strcasecmp(field, "Provides") == 0) {
+-	       if (pkg->provides_count) {
++	       if (pkg->provides_count > 1) {
+                   fprintf(fp, "Provides:");
+ 		  for(i = 1; i < pkg->provides_count; i++) {
+                       fprintf(fp, "%s %s", i == 1 ? "" : ",",
diff --git a/trunk/package/system/opkg/patches/100-add-force-checksum.patch b/trunk/package/system/opkg/patches/100-add-force-checksum.patch
new file mode 100644
index 00000000..5f65a754
--- /dev/null
+++ b/trunk/package/system/opkg/patches/100-add-force-checksum.patch
@@ -0,0 +1,85 @@
+--- a/libopkg/opkg_conf.c
++++ b/libopkg/opkg_conf.c
+@@ -54,6 +54,7 @@ opkg_option_t options[] = {
+ 	  { "force_reinstall", OPKG_OPT_TYPE_BOOL, &_conf.force_reinstall },
+ 	  { "force_space", OPKG_OPT_TYPE_BOOL, &_conf.force_space },
+ 	  { "force_postinstall", OPKG_OPT_TYPE_BOOL, &_conf.force_postinstall },
++	  { "force_checksum", OPKG_OPT_TYPE_BOOL, &_conf.force_checksum },
+           { "check_signature", OPKG_OPT_TYPE_BOOL, &_conf.check_signature },
+ 	  { "ftp_proxy", OPKG_OPT_TYPE_STRING, &_conf.ftp_proxy },
+ 	  { "http_proxy", OPKG_OPT_TYPE_STRING, &_conf.http_proxy },
+--- a/libopkg/opkg_conf.h
++++ b/libopkg/opkg_conf.h
+@@ -78,6 +78,7 @@ struct opkg_conf
+      int force_removal_of_essential_packages;
+      int force_postinstall;
+      int force_remove;
++     int force_checksum;
+      int check_signature;
+      int nodeps; /* do not follow dependencies */
+      int nocase; /* perform case insensitive matching */
+--- a/libopkg/opkg_install.c
++++ b/libopkg/opkg_install.c
+@@ -1327,12 +1327,19 @@ opkg_install_pkg(pkg_t *pkg, int from_up
+          file_md5 = file_md5sum_alloc(pkg->local_filename);
+          if (file_md5 && strcmp(file_md5, pkg->md5sum))
+          {
+-              opkg_msg(ERROR, "Package %s md5sum mismatch. "
+-			"Either the opkg or the package index are corrupt. "
+-			"Try 'opkg update'.\n",
+-			pkg->name);
+-              free(file_md5);
+-              return -1;
++              if (!conf->force_checksum)
++              {
++                  opkg_msg(ERROR, "Package %s md5sum mismatch. "
++			    "Either the opkg or the package index are corrupt. "
++			    "Try 'opkg update'.\n",
++			    pkg->name);
++                  free(file_md5);
++                  return -1;
++              }
++              else
++              {
++                  opkg_msg(NOTICE, "Ignored %s md5sum mismatch.\n", pkg->name);
++              }
+          }
+ 	 if (file_md5)
+               free(file_md5);
+--- a/src/opkg-cl.c
++++ b/src/opkg-cl.c
+@@ -42,6 +42,7 @@ enum {
+ 	ARGS_OPT_FORCE_SPACE,
+ 	ARGS_OPT_FORCE_POSTINSTALL,
+ 	ARGS_OPT_FORCE_REMOVE,
++	ARGS_OPT_FORCE_CHECKSUM,
+ 	ARGS_OPT_ADD_ARCH,
+ 	ARGS_OPT_ADD_DEST,
+ 	ARGS_OPT_NOACTION,
+@@ -84,6 +85,8 @@ static struct option long_options[] = {
+ 	{"force_postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
+ 	{"force-remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
+ 	{"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
++	{"force-checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},
++	{"force_checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},
+ 	{"noaction", 0, 0, ARGS_OPT_NOACTION},
+ 	{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
+ 	{"nodeps", 0, 0, ARGS_OPT_NODEPS},
+@@ -178,6 +181,9 @@ args_parse(int argc, char *argv[])
+ 		case ARGS_OPT_FORCE_REMOVE:
+ 			conf->force_remove = 1;
+ 			break;
++		case ARGS_OPT_FORCE_CHECKSUM:
++			conf->force_checksum = 1;
++			break;
+ 		case ARGS_OPT_NODEPS:
+ 			conf->nodeps = 1;
+ 			break;
+@@ -293,6 +299,7 @@ usage()
+ 	printf("\t--force-space		Disable free space checks\n");
+ 	printf("\t--force-postinstall	Run postinstall scripts even in offline mode\n");
+ 	printf("\t--force-remove	Remove package even if prerm script fails\n");
++	printf("\t--force-checksum	Don't fail on checksum mismatches\n");
+ 	printf("\t--noaction		No action -- test only\n");
+ 	printf("\t--download-only	No action -- download only\n");
+ 	printf("\t--nodeps		Do not follow dependencies\n");
diff --git a/trunk/package/system/opkg/patches/110-upgrade.patch b/trunk/package/system/opkg/patches/110-upgrade.patch
new file mode 100644
index 00000000..071df0e0
--- /dev/null
+++ b/trunk/package/system/opkg/patches/110-upgrade.patch
@@ -0,0 +1,49 @@
+--- a/libopkg/opkg_install.c
++++ b/libopkg/opkg_install.c
+@@ -1405,9 +1405,10 @@
+ 	  opkg_state_changed++;
+ 	  pkg->state_flag |= SF_FILELIST_CHANGED;
+ 
+-	  if (old_pkg)
++	  if (old_pkg) {
+                pkg_remove_orphan_dependent(pkg, old_pkg);
+-
++	       pkg->is_upgrade = 1;
++	  }
+ 	  /* XXX: BUG: we really should treat replacement more like an upgrade
+ 	   *      Instead, we're going to remove the replacees
+ 	   */
+@@ -1466,7 +1467,7 @@
+ 	  }
+ 
+ 
+-	  opkg_msg(INFO, "Installing maintainer scripts.\n");
++	  opkg_msg(INFO, "%s maintainer scripts.\n", (pkg->is_upgrade) ? ("Upgrading") : ("Installing"));
+ 	  if (install_maintainer_scripts(pkg, old_pkg)) {
+ 		opkg_msg(ERROR, "Failed to extract maintainer scripts for %s."
+ 			       " Package debris may remain!\n",
+--- a/libopkg/pkg.c
++++ b/libopkg/pkg.c
+@@ -1285,6 +1285,12 @@
+      setenv("PKG_ROOT",
+ 	    pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir, 1);
+ 
++	if (pkg->is_upgrade)
++		setenv("PKG_UPGRADE", "1", 1);
++	else
++		setenv("PKG_UPGRADE", "0", 1);
++
++
+      if (! file_exists(path)) {
+ 	  free(path);
+ 	  return 0;
+--- a/libopkg/pkg.h
++++ b/libopkg/pkg.h
+@@ -184,6 +184,7 @@
+      /* this flag specifies whether the package was installed to satisfy another
+       * package's dependancies */
+      int auto_installed;
++     int is_upgrade;
+ };
+ 
+ pkg_t *pkg_new(void);
diff --git a/trunk/package/system/procd/Makefile b/trunk/package/system/procd/Makefile
new file mode 100644
index 00000000..ad8cc8fb
--- /dev/null
+++ b/trunk/package/system/procd/Makefile
@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=procd
+PKG_VERSION:=2014-12-02
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=40c4e68266a7b04239394c528c4c290d960fc38c
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
+
+define Package/procd
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_EGLIBC:librt +libubox +libubus +NAND_SUPPORT:procd-nand
+  TITLE:=libreCMC system process manager
+endef
+
+define Package/procd-nand
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=@NAND_SUPPORT +ubi-utils
+  TITLE:=libreCMC sysupgrade nand helper
+endef
+
+define Package/procd-nand-firstboot
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=procd-nand
+  TITLE:=libreCMC firstboot nand helper
+endef
+
+define Package/procd/config
+menu "Configuration"
+	depends on PACKAGE_procd
+
+config PROCD_SHOW_BOOT
+	bool
+	default n
+	prompt "Print the shutdown to the console as well as logging it to syslog"
+
+config PROCD_ZRAM_TMPFS
+	bool
+	default n
+	prompt "Mount /tmp using zram."
+endmenu
+endef
+
+PKG_CONFIG_DEPENDS:= PROCD_SHOW_BOOT PROCD_ZRAM_TMPFS
+
+ifeq ($(CONFIG_PROCD_SHOW_BOOT),y)
+  CMAKE_OPTIONS += -DSHOW_BOOT_ON_CONSOLE=1
+endif
+
+ifeq ($(CONFIG_PROCD_ZRAM_TMPFS),y)
+  CMAKE_OPTIONS += -DZRAM_TMPFS=1
+endif
+
+define Package/procd/install
+	$(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/functions
+
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/{init,procd,askfirst,udevtrigger} $(1)/sbin/
+	$(INSTALL_BIN) ./files/reload_config $(1)/sbin/
+	$(INSTALL_DATA) ./files/hotplug*.json $(1)/etc/
+	$(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
+endef
+
+define Package/procd-nand/install
+	$(INSTALL_DIR) $(1)/sbin $(1)/lib/upgrade
+
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upgraded $(1)/sbin/
+	$(INSTALL_DATA) ./files/nand.sh $(1)/lib/upgrade/
+endef
+
+define Package/procd-nand-firstboot/install
+	$(INSTALL_DIR) $(1)/lib/preinit
+
+	$(INSTALL_DATA) ./files/nand-preinit.sh $(1)/lib/preinit/60-nand-firstboot.sh
+endef
+
+$(eval $(call BuildPackage,procd))
+$(eval $(call BuildPackage,procd-nand))
+$(eval $(call BuildPackage,procd-nand-firstboot))
diff --git a/trunk/package/system/procd/files/hotplug-preinit.json b/trunk/package/system/procd/files/hotplug-preinit.json
new file mode 100644
index 00000000..614b1047
--- /dev/null
+++ b/trunk/package/system/procd/files/hotplug-preinit.json
@@ -0,0 +1,20 @@
+[
+	[ "case", "ACTION", {
+		"add": [
+			[ "if",
+				[ "has", "FIRMWARE" ],
+				[
+					[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ],
+					[ "load-firmware", "/lib/firmware" ],
+					[ "return" ]
+				]
+			],
+		],
+	}, ],
+	[ "if",
+		[ "and",
+			[ "eq", "SUBSYSTEM", "button" ],
+		],
+		[ "exec", "/etc/rc.button/failsafe" ]
+	],
+]
diff --git a/trunk/package/system/procd/files/hotplug.json b/trunk/package/system/procd/files/hotplug.json
new file mode 100644
index 00000000..d5740195
--- /dev/null
+++ b/trunk/package/system/procd/files/hotplug.json
@@ -0,0 +1,86 @@
+[
+	[ "case", "ACTION", {
+		"add": [
+			[ "if",
+				[ "and",
+					[ "has", "MAJOR" ],
+					[ "has", "MINOR" ],
+				],
+				[
+					[ "if",
+						[ "or",
+							[ "eq", "DEVNAME",
+								[ "null", "full", "ptmx", "zero" ],
+							],
+							[ "regex", "DEVNAME",
+								[ "^gpio", "^hvc" ],
+							],
+						],
+						[
+							[ "makedev", "/dev/%DEVNAME%", "0666" ],
+							[ "return" ],
+						]
+					],
+					[ "if",
+						[ "or",
+							[ "eq", "DEVNAME", "mapper/control" ],
+							[ "regex", "DEVPATH", "^ppp" ],
+						],
+						[
+							[ "makedev", "/dev/%DEVNAME%", "0600" ],
+							[ "return" ],
+						],
+					],
+					[ "if",
+						[ "has", "DEVNAME" ],
+						[ "makedev", "/dev/%DEVNAME%", "0644" ],
+					],
+				],
+			],
+			[ "if",
+				[ "has", "FIRMWARE" ],
+				[
+					[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ],
+					[ "load-firmware", "/lib/firmware" ],
+					[ "return" ]
+				]
+			],
+		],
+		"remove" : [
+			[ "if",
+				[ "and",
+					[ "has", "DEVNAME" ],
+					[ "has", "MAJOR" ],
+					[ "has", "MINOR" ],
+				],
+				[ "rm", "/dev/%DEVNAME%" ]
+			]
+		]
+	} ],
+	[ "if",
+		[ "eq", "SUBSYSTEM", "platform" ],
+		[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
+	],
+	[ "if",
+		[ "and",
+			[ "has", "BUTTON" ],
+			[ "eq", "SUBSYSTEM", "button" ],
+		],
+		[ "exec", "/etc/rc.button/%BUTTON%" ]
+	],
+	[ "if",
+		[ "eq", "SUBSYSTEM",
+			[ "net", "input", "usb", "usbmisc", "ieee1394", "block", "atm", "zaptel", "tty", "button" ]
+		],
+		[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
+	],
+	[ "if",
+		[ "and",
+			[ "eq", "SUBSYSTEM", "usb-serial" ],
+			[ "regex", "DEVNAME",
+				[ "^ttyUSB", "^ttyACM" ]
+			],
+		],
+		[ "exec", "/sbin/hotplug-call", "tty" ]
+	],
+]
diff --git a/trunk/package/system/procd/files/nand-preinit.sh b/trunk/package/system/procd/files/nand-preinit.sh
new file mode 100644
index 00000000..cf596246
--- /dev/null
+++ b/trunk/package/system/procd/files/nand-preinit.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Copyright (C) 2014 OpenWrt.org
+
+nand_takeover() {
+	. /lib/upgrade/nand.sh
+	mtd=$(find_mtd_index "$CI_UBIPART")
+	esize=$(cat /proc/mtd | grep mtd$mtd |cut -d" " -f 3)
+	[ -z "$esize" ] && return 1
+	esize=$(printf "%d" 0x$esize)
+	for a in `seq 0 64`; do
+		mtd -o $((a * esize)) -l 400 dump /dev/mtd$mtd > /tmp/takeover.hdr
+		MAGIC=$(dd if=/tmp/takeover.hdr bs=1 skip=261 count=5 2> /dev/null)
+		SIZE=$(printf "%d" 0x$(dd if=/tmp/takeover.hdr bs=4 count=1 2> /dev/null | hexdump -v -n 4 -e '1/1 "%02x"'))
+		[ "$MAGIC" = "ustar" ] && {
+			mtd -o $((a * esize)) -l $((SIZE + 4)) dump /dev/mtd$mtd | dd bs=1 skip=4 of=/tmp/sysupgrade.tar
+			nand_do_upgrade_stage2 /tmp/sysupgrade.tar
+		}
+	done
+}
+
+boot_hook_add initramfs nand_takeover
diff --git a/trunk/package/system/procd/files/nand.sh b/trunk/package/system/procd/files/nand.sh
new file mode 100644
index 00000000..7fb9343c
--- /dev/null
+++ b/trunk/package/system/procd/files/nand.sh
@@ -0,0 +1,355 @@
+#!/bin/sh
+# Copyright (C) 2014 OpenWrt.org
+#
+
+. /lib/functions.sh
+
+# 'kernel' partition on NAND contains the kernel
+CI_KERNPART="kernel"
+
+# 'ubi' partition on NAND contains UBI
+CI_UBIPART="ubi"
+
+ubi_mknod() {
+	local dir="$1"
+	local dev="/dev/$(basename $dir)"
+
+	[ -e "$dev" ] && return 0
+
+	local devid="$(cat $dir/dev)"
+	local major="${devid%%:*}"
+	local minor="${devid##*:}"
+	mknod "$dev" c $major $minor
+}
+
+nand_find_volume() {
+	local ubidevdir ubivoldir
+	ubidevdir="/sys/devices/virtual/ubi/$1"
+	[ ! -d "$ubidevdir" ] && return 1
+	for ubivoldir in $ubidevdir/${1}_*; do
+		[ ! -d "$ubivoldir" ] && continue
+		if [ "$( cat $ubivoldir/name )" = "$2" ]; then
+			basename $ubivoldir
+			ubi_mknod "$ubivoldir"
+			return 0
+		fi
+	done
+}
+
+nand_find_ubi() {
+	local ubidevdir ubidev mtdnum
+	mtdnum="$( find_mtd_index $1 )"
+	[ ! "$mtdnum" ] && return 1
+	for ubidevdir in /sys/devices/virtual/ubi/ubi*; do
+		[ ! -d "$ubidevdir" ] && continue
+		cmtdnum="$( cat $ubidevdir/mtd_num )"
+		[ ! "$mtdnum" ] && continue
+		if [ "$mtdnum" = "$cmtdnum" ]; then
+			ubidev=$( basename $ubidevdir )
+			ubi_mknod "$ubidevdir"
+			echo $ubidev
+			return 0
+		fi
+	done
+}
+
+nand_get_magic_long() {
+	dd if="$1" skip=$2 bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+get_magic_long_tar() {
+	( tar xf $1 $2 -O | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
+}
+
+identify_magic() {
+	local magic=$1
+	case "$magic" in
+		"55424923")
+			echo "ubi"
+			;;
+		"31181006")
+			echo "ubifs"
+			;;
+		"68737173")
+			echo "squashfs"
+			;;
+		"d00dfeed")
+			echo "fit"
+			;;
+		"4349"*)
+			echo "combined"
+			;;
+		*)
+			echo "unknown $magic"
+			;;
+	esac
+}
+
+
+identify() {
+	identify_magic $(nand_get_magic_long "$1" "${2:-0}")
+}
+
+identify_tar() {
+	identify_magic $(get_magic_long_tar "$1" "$2")
+}
+
+nand_restore_config() {
+	sync
+	local ubidev=$( nand_find_ubi $CI_UBIPART )
+	local ubivol="$( nand_find_volume $ubidev rootfs_data )"
+	[ ! "$ubivol" ] &&
+		ubivol="$( nand_find_volume $ubidev rootfs )"
+	mkdir /tmp/new_root
+	if ! mount -t ubifs /dev/$ubivol /tmp/new_root; then
+		echo "mounting ubifs $ubivol failed"
+		rmdir /tmp/new_root
+		return 1
+	fi
+	mv "$1" "/tmp/new_root/sysupgrade.tgz"
+	umount /tmp/new_root
+	sync
+	rmdir /tmp/new_root
+}
+
+nand_upgrade_prepare_ubi() {
+	local rootfs_length="$1"
+	local rootfs_type="$2"
+	local has_kernel="${3:-0}"
+	local has_env="${4:-0}"
+
+	local mtdnum="$( find_mtd_index "$CI_UBIPART" )"
+	if [ ! "$mtdnum" ]; then
+		echo "cannot find ubi mtd partition $CI_UBIPART"
+		return 1
+	fi
+
+	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
+	if [ ! "$ubidev" ]; then
+		ubiattach -m "$mtdnum"
+		sync
+		ubidev="$( nand_find_ubi "$CI_UBIPART" )"
+	fi
+
+	if [ ! "$ubidev" ]; then
+		ubiformat /dev/mtd$mtdnum -y
+		ubiattach -m "$mtdnum"
+		sync
+		ubidev="$( nand_find_ubi "$CI_UBIPART" )"
+		[ "$has_env" -gt 0 ] && {
+			ubimkvol /dev/$ubidev -n 0 -N ubootenv -s 1MiB
+			ubimkvol /dev/$ubidev -n 1 -N ubootenv2 -s 1MiB
+		}
+	fi
+
+	local kern_ubivol="$( nand_find_volume $ubidev kernel )"
+	local root_ubivol="$( nand_find_volume $ubidev rootfs )"
+	local data_ubivol="$( nand_find_volume $ubidev rootfs_data )"
+
+	# remove ubiblock device of rootfs
+	local root_ubiblk="ubiblock${root_ubivol:3}"
+	if [ "$root_ubivol" -a -e "/dev/$root_ubiblk" ]; then
+		echo "removing $root_ubiblk"
+		if ! ubiblock -r /dev/$root_ubivol; then
+			echo "cannot remove $root_ubiblk"
+			return 1;
+		fi
+	fi
+
+	# kill volumes
+	[ "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N kernel || true
+	[ "$root_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs || true
+	[ "$data_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs_data || true
+
+	# update kernel
+	if [ "$has_kernel" = "1" ]; then
+		if ! ubimkvol /dev/$ubidev -N kernel -s $kernel_length; then
+			echo "cannot create kernel volume"
+			return 1;
+		fi
+	fi
+
+	# update rootfs
+	local root_size_param
+	if [ "$rootfs_type" = "ubifs" ]; then
+		root_size_param="-m"
+	else
+		root_size_param="-s $rootfs_length"
+	fi
+	if ! ubimkvol /dev/$ubidev -N rootfs $root_size_param; then
+		echo "cannot create rootfs volume"
+		return 1;
+	fi
+
+	# create rootfs_data for non-ubifs rootfs
+	if [ "$rootfs_type" != "ubifs" ]; then
+		if ! ubimkvol /dev/$ubidev -N rootfs_data -m; then
+			echo "cannot initialize rootfs_data volume"
+			return 1
+		fi
+	fi
+	sync
+	return 0
+}
+
+nand_do_upgrade_success() {
+	local conf_tar="/tmp/sysupgrade.tgz"
+	
+	sync
+	[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
+	echo "sysupgrade successful"
+	reboot -f
+}
+
+# Flash the UBI image to MTD partition
+nand_upgrade_ubinized() {
+	local ubi_file="$1"
+	local mtdnum="$(find_mtd_index "$CI_UBIPART")"
+
+	[ ! "$mtdnum" ] && {
+		CI_UBIPART="rootfs"
+		mtdnum="$(find_mtd_index "$CI_UBIPART")"
+	}
+
+	if [ ! "$mtdnum" ]; then
+		echo "cannot find mtd device $CI_UBIPART"
+		reboot -f
+	fi
+
+	local mtddev="/dev/mtd${mtdnum}"
+	ubidetach -p "${mtddev}" || true
+	sync
+	ubiformat "${mtddev}" -y -f "${ubi_file}"
+	ubiattach -p "${mtddev}"
+	nand_do_upgrade_success
+}
+
+# Write the UBIFS image to UBI volume
+nand_upgrade_ubifs() {
+	local rootfs_length=`(cat $1 | wc -c) 2> /dev/null`
+
+	nand_upgrade_prepare_ubi "$rootfs_length" "ubifs" "0" "0"
+	
+	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
+	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
+	ubiupdatevol /dev/$root_ubivol -s $rootfs_length $1
+
+	nand_do_upgrade_success
+}
+
+nand_upgrade_tar() {
+	local tar_file="$1"
+	local board_name="$(cat /tmp/sysinfo/board_name)"
+	local kernel_mtd="$(find_mtd_index $CI_KERNPART)"
+
+	local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null`
+	local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null`
+
+	local rootfs_type="$(identify_tar "$tar_file" sysupgrade-$board_name/root)"
+
+	local has_kernel=1
+	local has_env=0
+
+	[ "$kernel_length" != 0 -a -n "$kernel_mtd" ] && {
+		tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - $CI_KERNPART
+	}
+	[ "$kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
+
+	nand_upgrade_prepare_ubi "$rootfs_length" "$rootfs_type" "$has_kernel" "$has_env"
+
+	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
+	[ "$has_kernel" = "1" ] && {
+		local kern_ubivol="$(nand_find_volume $ubidev kernel)"
+	 	tar xf $tar_file sysupgrade-$board_name/kernel -O | \
+			ubiupdatevol /dev/$kern_ubivol -s $kernel_length -
+	}
+
+	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
+	tar xf $tar_file sysupgrade-$board_name/root -O | \
+		ubiupdatevol /dev/$root_ubivol -s $rootfs_length -
+
+	nand_do_upgrade_success
+}
+
+# Recognize type of passed file and start the upgrade process
+nand_do_upgrade_stage2() {
+	local file_type=$(identify $1)
+
+	[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
+
+	case "$file_type" in
+		"ubi")		nand_upgrade_ubinized $1;;
+		"ubifs")	nand_upgrade_ubifs $1;;
+		*)		nand_upgrade_tar $1;;
+	esac
+}
+
+nand_upgrade_stage2() {
+	[ $1 = "nand" ] && {
+		[ -f "$2" ] && {
+			touch /tmp/sysupgrade
+
+			killall -9 telnetd
+			killall -9 dropbear
+			killall -9 ash
+
+			kill_remaining TERM
+			sleep 3
+			kill_remaining KILL
+
+			sleep 1
+
+			if [ -n "$(rootfs_type)" ]; then
+				v "Switching to ramdisk..."
+				run_ramfs ". /lib/functions.sh; include /lib/upgrade; nand_do_upgrade_stage2 $2"
+			else
+				nand_do_upgrade_stage2 $2
+			fi
+			return 0
+		}
+		echo "Nand upgrade failed"
+		exit 1
+	}
+}
+
+nand_upgrade_stage1() {
+	[ -f /tmp/sysupgrade-nand-path ] && {
+		path="$(cat /tmp/sysupgrade-nand-path)"
+		[ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] &&
+			rm $CONF_TAR
+
+		ubus call system nandupgrade "{\"path\": \"$path\" }"
+		exit 0
+	}
+}
+append sysupgrade_pre_upgrade nand_upgrade_stage1
+
+# Check if passed file is a valid one for NAND sysupgrade. Currently it accepts
+# 3 types of files:
+# 1) UBI - should contain an ubinized image, header is checked for the proper
+#    MAGIC
+# 2) UBIFS - should contain UBIFS partition that will replace "rootfs" volume,
+#    header is checked for the proper MAGIC
+# 3) TAR - archive has to include "sysupgrade-BOARD" directory with a non-empty
+#    "CONTROL" file (at this point its content isn't verified)
+#
+# You usually want to call this function in platform_check_image.
+#
+# $(1): board name, used in case of passing TAR file
+# $(2): file to be checked
+nand_do_platform_check() {
+	local board_name="$1"
+	local tar_file="$2"
+	local control_length=`(tar xf $tar_file sysupgrade-$board_name/CONTROL -O | wc -c) 2> /dev/null`
+	local file_type="$(identify $2)"
+
+	[ "$control_length" = 0 -a "$file_type" != "ubi" -a "$file_type" != "ubifs" ] && {
+		echo "Invalid sysupgrade file."
+		return 1
+	}
+
+	echo -n $2 > /tmp/sysupgrade-nand-path
+	cp /sbin/upgraded /tmp/
+
+	return 0
+}
diff --git a/trunk/package/system/procd/files/procd.sh b/trunk/package/system/procd/files/procd.sh
new file mode 100644
index 00000000..be1d888a
--- /dev/null
+++ b/trunk/package/system/procd/files/procd.sh
@@ -0,0 +1,371 @@
+# procd API:
+#
+# procd_open_service(name, [script]):
+#   Initialize a new procd command message containing a service with one or more instances
+#
+# procd_close_service()
+#   Send the command message for the service
+#
+# procd_open_instance([name]):
+#   Add an instance to the service described by the previous procd_open_service call
+#
+# procd_set_param(type, [value...])
+#   Available types:
+#     command: command line (array).
+#     respawn info: array with 3 values $restart_timeout $fail_hreshold $max_fail
+#     env: environment variable (passed to the process)
+#     data: arbitrary name/value pairs for detecting config changes (table)
+#     file: configuration files (array)
+#     netdev: bound network device (detects ifindex changes)
+#     limits: resource limits (passed to the process)
+#     user info: array with 1 values $username
+#
+#   No space separation is done for arrays/tables - use one function argument per command line argument
+#
+# procd_close_instance():
+#   Complete the instance being prepared
+#
+# procd_kill(service, [instance]):
+#   Kill a service instance (or all instances)
+#
+
+. $IPKG_INSTROOT/usr/share/libubox/jshn.sh
+
+_PROCD_SERVICE=
+
+_procd_call() {
+	local old_cb
+
+	json_set_namespace procd old_cb
+	"$@"
+	json_set_namespace $old_cb
+}
+
+_procd_wrapper() {
+	while [ -n "$1" ]; do
+		eval "$1() { _procd_call _$1 \"\$@\"; }"
+		shift
+	done
+}
+
+_procd_ubus_call() {
+	local cmd="$1"
+
+	[ -n "$PROCD_DEBUG" ] && json_dump >&2
+	ubus call service "$cmd" "$(json_dump)"
+	json_cleanup
+}
+
+_procd_open_service() {
+	local name="$1"
+	local script="$2"
+
+	_PROCD_SERVICE="$name"
+	_PROCD_INSTANCE_SEQ=0
+
+	json_init
+	json_add_string name "$name"
+	[ -n "$script" ] && json_add_string script "$script"
+	json_add_object instances
+}
+
+_procd_close_service() {
+	json_close_object
+	service_triggers
+	_procd_ubus_call set
+}
+
+_procd_add_array_data() {
+	while [ "$#" -gt 0 ]; do
+		json_add_string "" "$1"
+		shift
+	done
+}
+
+_procd_add_array() {
+	json_add_array "$1"
+	shift
+	_procd_add_array_data "$@"
+	json_close_array
+}
+
+_procd_add_table_data() {
+	while [ -n "$1" ]; do
+		local var="${1%%=*}"
+		local val="${1#*=}"
+		[ "$1" = "$val" ] && val=
+		json_add_string "$var" "$val"
+		shift
+	done
+}
+
+_procd_add_table() {
+	json_add_object "$1"
+	shift
+	_procd_add_table_data "$@"
+	json_close_object
+}
+
+_procd_open_instance() {
+	local name="$1"; shift
+
+	_PROCD_INSTANCE_SEQ="$(($_PROCD_INSTANCE_SEQ + 1))"
+	name="${name:-instance$_PROCD_INSTANCE_SEQ}"
+	json_add_object "$name"
+}
+
+_procd_open_trigger() {
+	json_add_array "triggers"
+}
+
+_procd_open_validate() {
+	json_add_array "validate"
+}
+
+_procd_set_param() {
+	local type="$1"; shift
+
+	case "$type" in
+		env|data|limits)
+			_procd_add_table "$type" "$@"
+		;;
+		command|netdev|file|respawn|watch)
+			_procd_add_array "$type" "$@"
+		;;
+		error)
+			json_add_array "$type"
+			json_add_string "" "$@"
+			json_close_array
+		;;
+		nice)
+			json_add_int "$type" "$1"
+		;;
+		user)
+			json_add_string "$type" "$1"
+		;;
+	esac
+}
+
+_procd_add_interface_trigger() {
+	json_add_array
+	_procd_add_array_data "$1"
+	shift
+
+	json_add_array
+	_procd_add_array_data "if"
+
+	json_add_array
+	_procd_add_array_data "eq" "interface" "$1"
+	shift
+	json_close_array
+
+	json_add_array
+	_procd_add_array_data "run_script" "$@"
+	json_close_array
+
+	json_close_array
+
+	json_close_array
+}
+
+_procd_add_reload_interface_trigger() {
+	local script=$(readlink "$initscript")
+	local name=$(basename ${script:-$initscript})
+
+	_procd_open_trigger
+	_procd_add_interface_trigger "interface.*" $1 /etc/init.d/$name reload
+	_procd_close_trigger
+}
+
+_procd_add_config_trigger() {
+	json_add_array
+	_procd_add_array_data "$1"
+	shift
+
+	json_add_array
+	_procd_add_array_data "if"
+
+	json_add_array
+	_procd_add_array_data "eq" "package" "$1"
+	shift
+	json_close_array
+
+	json_add_array
+	_procd_add_array_data "run_script" "$@"
+	json_close_array
+
+	json_close_array
+
+	json_close_array
+}
+
+_procd_add_raw_trigger() {
+	json_add_array
+	_procd_add_array_data "$1"
+	shift
+	local timeout=$1
+	shift
+
+	json_add_array
+	json_add_array
+	_procd_add_array_data "run_script" "$@"
+	json_close_array
+	json_close_array
+
+	json_add_int "" "$timeout"
+
+	json_close_array
+}
+
+_procd_add_reload_trigger() {
+	local script=$(readlink "$initscript")
+	local name=$(basename ${script:-$initscript})
+	local file
+
+	_procd_open_trigger
+	for file in "$@"; do
+		_procd_add_config_trigger "config.change" "$file" /etc/init.d/$name reload
+	done
+	_procd_close_trigger
+}
+
+_procd_add_validation() {
+	_procd_open_validate
+	$@
+	_procd_close_validate
+}
+
+_procd_append_param() {
+	local type="$1"; shift
+	local _json_no_warning=1
+
+	json_select "$type"
+	[ $? = 0 ] || {
+		_procd_set_param "$type" "$@"
+		return
+	}
+	case "$type" in
+		env|data|limits)
+			_procd_add_table_data "$@"
+		;;
+		command|netdev|file|respawn|watch)
+			_procd_add_array_data "$@"
+		;;
+		error)
+			json_add_string "" "$@"
+		;;
+	esac
+	json_select ..
+}
+
+_procd_close_instance() {
+	json_close_object
+}
+
+_procd_close_trigger() {
+	json_close_array
+}
+
+_procd_close_validate() {
+	json_close_array
+}
+
+_procd_add_instance() {
+	_procd_open_instance
+	_procd_set_param command "$@"
+	_procd_close_instance
+}
+
+_procd_kill() {
+	local service="$1"
+	local instance="$2"
+
+	json_init
+	[ -n "$service" ] && json_add_string name "$service"
+	[ -n "$instance" ] && json_add_string instance "$instance"
+	_procd_ubus_call delete
+}
+
+procd_open_data() {
+	local name="$1"
+	json_set_namespace procd __procd_old_cb
+	json_add_object data
+}
+
+procd_close_data() {
+	json_close_object
+	json_set_namespace $__procd_old_cb
+}
+
+_procd_set_config_changed() {
+	local package="$1"
+
+	json_init
+	json_add_string type config.change
+	json_add_object data
+	json_add_string package "$package"
+	json_close_object
+
+	ubus call service event "$(json_dump)"
+}
+
+procd_add_mdns_service() {
+	local service proto port
+	service=$1; shift
+	proto=$1; shift
+	port=$1; shift
+	json_add_object "${service}_$port"
+	json_add_string "service" "_$service._$proto.local"
+	json_add_int port "$port"
+	[ -n "$1" ] && {
+		json_add_array txt
+		for txt in $@; do json_add_string "" $txt; done
+		json_select ..
+	}
+	json_select ..
+}
+
+procd_add_mdns() {
+	procd_open_data
+	json_add_object "mdns"
+	procd_add_mdns_service $@
+	json_close_object
+	procd_close_data
+}
+
+uci_validate_section()
+{
+	local _package="$1"
+	local _type="$2"
+	local _name="$3"
+	local _result
+	local _error
+	shift; shift; shift
+	_result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
+	_error=$?
+	eval "$_result"
+	[ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null`
+	return $_error
+}
+
+_procd_wrapper \
+	procd_open_service \
+	procd_close_service \
+	procd_add_instance \
+	procd_add_raw_trigger \
+	procd_add_config_trigger \
+	procd_add_interface_trigger \
+	procd_add_reload_trigger \
+	procd_add_reload_interface_trigger \
+	procd_add_interface_reload \
+	procd_open_trigger \
+	procd_close_trigger \
+	procd_open_instance \
+	procd_close_instance \
+	procd_open_validate \
+	procd_close_validate \
+	procd_set_param \
+	procd_append_param \
+	procd_add_validation \
+	procd_set_config_changed \
+	procd_kill
diff --git a/trunk/package/system/procd/files/reload_config b/trunk/package/system/procd/files/reload_config
new file mode 100644
index 00000000..8d1cdb13
--- /dev/null
+++ b/trunk/package/system/procd/files/reload_config
@@ -0,0 +1,15 @@
+#!/bin/sh
+rm -rf /var/run/config.check
+mkdir -p /var/run/config.check
+for config in /etc/config/*; do
+	file=${config##*/}
+	uci show "${file##*/}" > /var/run/config.check/$file
+done
+MD5FILE=/var/run/config.md5
+[ -f $MD5FILE ] && {
+	for c in `md5sum -c $MD5FILE 2>/dev/null| grep FAILED | cut -d: -f1`; do
+		ubus call service event "{ \"type\": \"config.change\", \"data\": { \"package\": \"$(basename $c)\" }}"
+	done
+}
+md5sum /var/run/config.check/* > $MD5FILE
+rm -rf /var/run/config.check
diff --git a/trunk/package/system/rpcd/Makefile b/trunk/package/system/rpcd/Makefile
new file mode 100644
index 00000000..d3e7ff93
--- /dev/null
+++ b/trunk/package/system/rpcd/Makefile
@@ -0,0 +1,96 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rpcd
+PKG_VERSION:=2014-10-20
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/luci2/rpcd.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_SOURCE_VERSION:=d99e8adc4fbcf9e7a0b36df05ee1bccbedd45a2a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/include/rpcd $(1)/usr/include/
+endef
+
+define Package/rpcd/default
+  SECTION:=utils
+  CATEGORY:=Base system
+  TITLE:=libreCMC ubus RPC backend server
+  DEPENDS:=+libubus +libubox
+endef
+
+define Package/rpcd
+  $(Package/rpcd/default)
+  DEPENDS+= +libuci +libblobmsg-json
+endef
+
+define Package/rpcd/description
+ This package provides the UBUS RPC backend server to expose various
+ functionality to frontend programs via JSON-RPC.
+endef
+
+define Package/rpcd/conffiles
+/etc/config/rpcd
+endef
+
+define Package/rpcd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/rpcd.init $(1)/etc/init.d/rpcd
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpcd $(1)/sbin/rpcd
+	$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/unauthenticated.json $(1)/usr/share/rpcd/acl.d/unauthenticated.json
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/rpcd.config $(1)/etc/config/rpcd
+endef
+
+
+# 1: plugin name
+# 2: extra dependencies
+# 3: plugin title/description
+define BuildPlugin
+
+  PKG_CONFIG_DEPENDS += CONFIG_PACKAGE_luci-rpc-mod-$(1)
+
+  define Package/rpcd-mod-$(1)
+    $(Package/rpcd/default)
+    TITLE+= ($(1) plugin)
+    DEPENDS+=rpcd $(2)
+  endef
+
+  define Package/rpcd-mod-$(1)/description
+    $(3)
+  endef
+
+  define Package/rpcd-mod-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/rpcd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(1).so $$(1)/usr/lib/rpcd/
+  endef
+
+  $$(eval $$(call BuildPackage,rpcd-mod-$(1)))
+
+endef
+
+$(eval $(call BuildPackage,rpcd))
+$(eval $(call BuildPlugin,file,,Provides ubus calls for file and directory operations.))
+$(eval $(call BuildPlugin,iwinfo,+libiwinfo,Provides ubus calls for accessing iwinfo data.))
diff --git a/trunk/package/system/rpcd/files/rpcd.config b/trunk/package/system/rpcd/files/rpcd.config
new file mode 100644
index 00000000..499ea276
--- /dev/null
+++ b/trunk/package/system/rpcd/files/rpcd.config
@@ -0,0 +1,7 @@
+
+config login
+	option username 'root'
+	option password '$p$root'
+	list read '*'
+	list write '*'
+
diff --git a/trunk/package/system/rpcd/files/rpcd.init b/trunk/package/system/rpcd/files/rpcd.init
new file mode 100755
index 00000000..98b63336
--- /dev/null
+++ b/trunk/package/system/rpcd/files/rpcd.init
@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=12
+
+USE_PROCD=1
+NAME=rpcd
+PROG=/sbin/rpcd
+
+start_service() {
+	procd_open_instance
+	procd_set_param command "$PROG"
+	procd_close_instance
+}
+
+stop() {
+	service_stop /sbin/rpcd
+}
+
+reload() {
+	service_reload /sbin/rpcd
+}
diff --git a/trunk/package/system/ubox/Makefile b/trunk/package/system/ubox/Makefile
new file mode 100644
index 00000000..b758736f
--- /dev/null
+++ b/trunk/package/system/ubox/Makefile
@@ -0,0 +1,46 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ubox
+PKG_VERSION:=2014-10-06
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=0b274c16a3f9d235735a4b84215071e1e004caa9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+CMAKE_INSTALL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
+
+define Package/ubox
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_EGLIBC:librt
+  TITLE:=libreCMC system helper toolbox
+endef
+
+define Package/ubox/install
+	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/etc/init.d/
+
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,logd,logread,validate_data} $(1)/sbin/
+	$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
+
+	ln -s /sbin/kmodloader $(1)/usr/sbin/rmmod
+	ln -s /sbin/kmodloader $(1)/usr/sbin/insmod
+	ln -s /sbin/kmodloader $(1)/usr/sbin/lsmod
+	ln -s /sbin/kmodloader $(1)/usr/sbin/modinfo
+	ln -s /sbin/kmodloader $(1)/usr/sbin/modprobe
+endef
+
+$(eval $(call BuildPackage,ubox))
diff --git a/trunk/package/system/ubox/files/log.init b/trunk/package/system/ubox/files/log.init
new file mode 100644
index 00000000..3e06fa5b
--- /dev/null
+++ b/trunk/package/system/ubox/files/log.init
@@ -0,0 +1,94 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2013 OpenWrt.org
+
+# start after and stop before networking
+START=12
+STOP=89
+PIDCOUNT=0
+
+USE_PROCD=1
+PROG=/sbin/logread
+
+validate_log_section()
+{
+	uci_validate_section system system "${1}" \
+		'log_file:string' \
+		'log_size:uinteger' \
+		'log_ip:ipaddr' \
+		'log_remote:bool:1' \
+		'log_port:port:514' \
+		'log_proto:or("tcp", "udp"):udp' \
+		'log_prefix:string'
+}
+
+validate_log_daemon()
+{
+	uci_validate_section system system "${1}" \
+		'log_size:uinteger:0' \
+		'log_buffer_size:uinteger:0'
+}
+
+start_service_daemon()
+{
+	local log_buffer_size log_size
+	validate_log_daemon "${1}"
+	[ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size
+	[ $log_buffer_size -eq 0 ] && log_buffer_size=16
+	procd_open_instance
+	procd_set_param command "/sbin/logd"
+	procd_append_param command -S "${log_buffer_size}"
+	procd_set_param respawn
+	procd_close_instance
+}
+
+start_service_file()
+{
+	PIDCOUNT="$(( ${PIDCOUNT} + 1))"
+	local pid_file="/var/run/logread.${PIDCOUNT}.pid"
+	local log_file log_size
+
+	validate_log_section "${1}" || {
+		echo "validation failed"
+		return 1
+	}
+	[ -z "${log_file}" ] && return
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file"
+	[ -n "${log_size}" ] && procd_append_param command -S "$log_size"
+	procd_close_instance
+}
+
+start_service_remote()
+{
+	PIDCOUNT="$(( ${PIDCOUNT} + 1))"
+	local pid_file="/var/run/logread.${PIDCOUNT}.pid"
+	local log_ip log_port log_proto log_prefix log_remote
+
+	validate_log_section "${1}" || {
+		echo "validation failed"
+		return 1
+	}
+	[ "${log_remote}" -ne 0 ] || return
+	[ -z "${log_ip}" ] && return
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file"
+	[ "${log_proto}" != "udp" ] || procd_append_param command -u
+	[ -z "${log_prefix}" ] || procd_append_param command -P "${log_prefix}"
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "system"
+	procd_add_validation validate_log_section
+}
+
+start_service()
+{
+	config_load system
+	config_foreach start_service_daemon system
+	config_foreach start_service_file system
+	config_foreach start_service_remote system
+}
diff --git a/trunk/package/system/ubus/Makefile b/trunk/package/system/ubus/Makefile
new file mode 100644
index 00000000..bca733d8
--- /dev/null
+++ b/trunk/package/system/ubus/Makefile
@@ -0,0 +1,80 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ubus
+PKG_VERSION:=2014-09-17
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://nbd.name/luci2/ubus.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=4c4f35cf2230d70b9ddd87638ca911e8a563f2f3
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/ubus
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+libubus +libblobmsg-json +ubusd
+  TITLE:=libreCMC RPC client utility
+endef
+
+define Package/ubusd
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=libreCMC RPC daemon
+  DEPENDS:=+libubox
+endef
+
+define Package/libubus
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libubox
+  ABI_VERSION:=$(PKG_VERSION)
+  TITLE:=libreCMC RPC client library
+endef
+
+define Package/libubus-lua
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libubus +liblua
+  TITLE:=Lua binding for the libreCMC RPC client
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+
+CMAKE_OPTIONS = \
+	-DLUAPATH=/usr/lib/lua
+
+define Package/ubus/install
+	$(INSTALL_DIR) $(1)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ubus $(1)/bin/
+endef
+
+define Package/ubusd/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ubusd $(1)/sbin/
+endef
+
+define Package/libubus/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/
+endef
+
+define Package/libubus-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(CP) $(PKG_BUILD_DIR)/lua/ubus.so $(1)/usr/lib/lua/
+endef
+
+$(eval $(call BuildPackage,libubus))
+$(eval $(call BuildPackage,libubus-lua))
+$(eval $(call BuildPackage,ubus))
+$(eval $(call BuildPackage,ubusd))
diff --git a/trunk/package/system/uci/Makefile b/trunk/package/system/uci/Makefile
new file mode 100644
index 00000000..fd87b5d1
--- /dev/null
+++ b/trunk/package/system/uci/Makefile
@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2008-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+UCI_VERSION=2014-04-11
+UCI_RELEASE=1
+
+PKG_NAME:=uci
+PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
+PKG_RELEASE:=1
+PKG_REV:=e339407372ffc70b1451e4eda218c01aa95a6a7f
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://nbd.name/uci.git
+PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=git
+
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_BUILD_PARALLEL:=0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+# set to 1 to enable debugging
+DEBUG=
+
+define Package/libuci
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=C library for the Unified Configuration Interface (UCI)
+  DEPENDS:=+libubox
+endef
+
+define Package/uci
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+libuci
+  TITLE:=Utility for the Unified Configuration Interface (UCI)
+endef
+
+define Package/libuci-lua
+  SECTION=libs
+  CATEGORY=Libraries
+  DEPENDS:=+libuci +liblua
+  TITLE:=Lua plugin for UCI
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
+
+CMAKE_OPTIONS = \
+	-DLUAPATH=/usr/lib/lua \
+	$(if $(DEBUG),-DUCI_DEBUG=ON)
+
+define Package/libuci/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/
+endef
+
+define Package/libuci-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/
+endef
+
+define Package/uci/install
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
+	$(CP) ./files/* $(1)/
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/uci{,_config,_blob,map}.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,uci))
+$(eval $(call BuildPackage,libuci))
+$(eval $(call BuildPackage,libuci-lua))
diff --git a/trunk/package/system/uci/files/lib/config/uci.sh b/trunk/package/system/uci/files/lib/config/uci.sh
new file mode 100644
index 00000000..db84c834
--- /dev/null
+++ b/trunk/package/system/uci/files/lib/config/uci.sh
@@ -0,0 +1,137 @@
+#!/bin/sh
+# Shell script compatibility wrappers for /sbin/uci
+#
+# Copyright (C) 2008-2010  OpenWrt.org
+# Copyright (C) 2008  Felix Fietkau <nbd@openwrt.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that 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
+
+CONFIG_APPEND=
+uci_load() {
+	local PACKAGE="$1"
+	local DATA
+	local RET
+	local VAR
+
+	_C=0
+	if [ -z "$CONFIG_APPEND" ]; then
+		for VAR in $CONFIG_LIST_STATE; do
+			export ${NO_EXPORT:+-n} CONFIG_${VAR}=
+			export ${NO_EXPORT:+-n} CONFIG_${VAR}_LENGTH=
+		done
+		export ${NO_EXPORT:+-n} CONFIG_LIST_STATE=
+		export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
+		export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
+		export ${NO_EXPORT:+-n} CONFIG_SECTION=
+	fi
+
+	DATA="$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${LOAD_STATE:+-P /var/state} -S -n export "$PACKAGE" 2>/dev/null)"
+	RET="$?"
+	[ "$RET" != 0 -o -z "$DATA" ] || eval "$DATA"
+	unset DATA
+
+	${CONFIG_SECTION:+config_cb}
+	return "$RET"
+}
+
+uci_set_default() {
+	local PACKAGE="$1"
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$PACKAGE" > /dev/null && return 0
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$PACKAGE"
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$PACKAGE"
+}
+
+uci_revert_state() {
+	local PACKAGE="$1"
+	local CONFIG="$2"
+	local OPTION="$3"
+
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state revert "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
+}
+
+uci_set_state() {
+	local PACKAGE="$1"
+	local CONFIG="$2"
+	local OPTION="$3"
+	local VALUE="$4"
+
+	[ "$#" = 4 ] || return 0
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state set "$PACKAGE.$CONFIG${OPTION:+.$OPTION}=$VALUE"
+}
+
+uci_toggle_state() {
+	uci_revert_state "$1" "$2" "$3"
+	uci_set_state "$1" "$2" "$3" "$4"
+}
+
+uci_set() {
+	local PACKAGE="$1"
+	local CONFIG="$2"
+	local OPTION="$3"
+	local VALUE="$4"
+
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
+}
+
+uci_get_state() {
+	uci_get "$1" "$2" "$3" "$4" "/var/state"
+}
+
+uci_get() {
+	local PACKAGE="$1"
+	local CONFIG="$2"
+	local OPTION="$3"
+	local DEFAULT="$4"
+	local STATE="$5"
+
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${STATE:+-P $STATE} -q get "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
+	RET="$?"
+	[ "$RET" -ne 0 ] && [ -n "$DEFAULT" ] && echo "$DEFAULT"
+	return "$RET"
+}
+
+uci_add() {
+	local PACKAGE="$1"
+	local TYPE="$2"
+	local CONFIG="$3"
+
+	if [ -z "$CONFIG" ]; then
+		export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")"
+	else
+		/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG=$TYPE"
+		export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG"
+	fi
+}
+
+uci_rename() {
+	local PACKAGE="$1"
+	local CONFIG="$2"
+	local VALUE="$3"
+
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} rename "$PACKAGE.$CONFIG=$VALUE"
+}
+
+uci_remove() {
+	local PACKAGE="$1"
+	local CONFIG="$2"
+	local OPTION="$3"
+
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}"
+}
+
+uci_commit() {
+	local PACKAGE="$1"
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit $PACKAGE
+}
diff --git a/trunk/package/system/udev/Config.in b/trunk/package/system/udev/Config.in
new file mode 100644
index 00000000..a9f3e00a
--- /dev/null
+++ b/trunk/package/system/udev/Config.in
@@ -0,0 +1,117 @@
+# udev package config
+
+menu "Configuration"
+	depends on PACKAGE_udev
+
+config UDEV_DISABLE_LOGGING
+	bool "Disable udev logging to syslog"
+	default n
+	help
+	  Disable logging of udev messages to the syslog.  If
+	  unsure, choose the default N.
+
+config UDEV_ENABLE_DEBUG
+	bool "Enable debug build of the udev package"
+	default n
+	help
+	  Compile in udev debug messages.  If unsure, choose
+	  the default N.
+
+config UDEV_EXTRA_accelerometer
+	bool "Install udev accelerometer callout"
+	default y
+	help
+	  accelerometer - udev callout to export device orientation
+	  through property
+
+config UDEV_EXTRA_ata_id
+	bool "Install udev ata_id callout"
+	default y
+	help
+	  ata_id - udev callout to read product/serial number
+	  from ATA drives
+
+config UDEV_EXTRA_cdrom_id
+	bool "Install udev cdrom_id callout"
+	default y
+	help
+	  cdrom_id - udev callout to determine the capabilities
+	  of optical drives and media
+
+config UDEV_EXTRA_collect
+	bool "Install udev collect"
+	default n
+	help
+	  Adds ID to the list governed by <checkpoint>
+
+config UDEV_EXTRA_edd_id
+	bool "Install udev edd_id callout"
+	default n
+	help
+	  edd_id - udev callout to identify BIOS disk drives
+	  via EDD
+
+config UDEV_EXTRA_firmware
+	bool "Install firmware support"
+	default n
+	help
+	  udev firmware loader via EDD
+
+config UDEV_EXTRA_floppy
+	bool "Install create_floppy_devices callout"
+	default n
+	help
+	  create_floppy_devices - udev callout to create all
+	  possible floppy devices based on the CMOS type
+
+config UDEV_EXTRA_input_id
+	bool "Install input_id callout"
+	default y
+	help
+	 input_id - udev callout to classify input devices
+
+config UDEV_EXTRA_mtd_probe
+	bool "Install mtd_probe callout"
+	default y
+	help
+	  mtd_probe - udev callout to probe mtd devices
+
+config UDEV_EXTRA_path_id
+	bool "Install udev path_id callout"
+	default y
+	help
+	  path_id - udev callout to create a device path based
+	  unique name for a device to implement the Linux
+	  Persistent Device Naming scheme
+
+config UDEV_EXTRA_qemu
+	bool "Install qemu specific rules"
+	default y
+	help
+	  Install rules for autosuspension of QEMU emulated
+	  USB HID devices
+
+config UDEV_EXTRA_rule_generator
+	bool "Install udev rule_generator"
+	default y
+	help
+
+config UDEV_EXTRA_scsi_id
+	bool "Install udev scsi_id callout"
+	default y
+	help
+	  scsi_id - retrieve and generate a unique SCSI identifier
+
+config UDEV_EXTRA_usb_id
+	bool "Install udev usb_id callout"
+	default y
+	help
+	  usb_id - can find the unique id of USB devices
+
+config UDEV_EXTRA_v4l_id
+	bool "Install udev v4l_id callout"
+	default y
+	help
+	  v4l_id - udev callout to identify Video4Linux devices
+
+endmenu
diff --git a/trunk/package/system/udev/Makefile b/trunk/package/system/udev/Makefile
new file mode 100644
index 00000000..a99533e4
--- /dev/null
+++ b/trunk/package/system/udev/Makefile
@@ -0,0 +1,157 @@
+#
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=udev
+PKG_VERSION:=173
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/hotplug/
+PKG_MD5SUM:=91a88a359b60bbd074b024883cc0dbde
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+PKG_INSTALL=1
+
+define Package/udev
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Dynamic device management subsystem
+  URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
+  MAINTAINER:=Geoff Levand <geoff@infradead.org>
+  MENU:=1
+  DEPENDS:=+librt
+endef
+
+define Package/udev/description
+	udev allows Linux users to have a dynamic /dev directory and it
+	provides the ability to have persistent device names.
+endef
+
+define Package/udev/conffiles
+/etc/udev/udev.conf
+endef
+
+define Package/udev/config
+	source "$(SOURCE)/Config.in"
+endef
+
+udev-args-$(CONFIG_UDEV_DISABLE_LOGGING) += --disable-logging
+udev-args-$(CONFIG_UDEV_ENABLE_DEBUG) += --enable-debug
+udev-args-$(CONFIG_UDEV_EXTRA_edd_id) += --enable-edd
+udev-args-$(CONFIG_UDEV_EXTRA_floppy) += --enable-floppy
+
+# TODO: make hwdb and introspection work
+
+CONFIGURE_ARGS += --prefix=/usr --exec-prefix= --sysconfdir=/etc \
+	--disable-hwdb --disable-keymap --disable-gudev --disable-introspection \
+	--libexecdir=/lib/udev --disable-gtk-doc-html \
+	--sbindir=/sbin $(udev-args-y)
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_accelerometer) += accelerometer
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_accelerometer) += 61-accelerometer.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_ata_id) += ata_id
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_cdrom_id) += cdrom_id
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_cdrom_id) += 60-cdrom_id.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_collect) += collect
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_edd_id) += edd_id
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_edd_id) += 61-persistent-storage-edd.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_firmware) += firmware
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_firmware) += 50-firmware.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_floppy) += create_floppy_devices
+
+# TODO: make gudev work
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_input_id) += input_id
+
+# TODO: make keymap work
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_mtd_probe) += mtd_probe
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_mtd_probe) += 75-probe_mtd.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_path_id) += path_id
+
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_qemu) += 42-qemu-usb.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_rule_generator) += \
+	write_cd_rules write_net_rules
+udev-extra-lib-data-$(CONFIG_UDEV_EXTRA_rule_generator) += \
+	rule_generator.functions
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_rule_generator) += \
+	75-cd-aliases-generator.rules 75-persistent-net-generator.rules
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_scsi_id) += scsi_id
+
+# TODO: make udev-acl work
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_usb_id) += usb_id
+
+udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_v4l_id) += v4l_id
+udev-extra-rules-$(CONFIG_UDEV_EXTRA_v4l_id) += 60-persistent-v4l.rules
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libudev.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/share/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/udev.pc $(1)/usr/share/pkgconfig
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/lib/pkgconfig/libudev.pc $(1)/usr/lib/pkgconfig
+endef
+
+define Package/udev/install
+	$(INSTALL_DIR) $(1)/etc/udev/rules.d
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/udev/udev.conf $(1)/etc/udev
+
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/sbin/udevadm \
+		$(PKG_INSTALL_DIR)/sbin/udevd \
+		$(1)/sbin
+
+	$(INSTALL_DIR) $(1)/lib/udev/rules.d
+	$(INSTALL_DATA) \
+		$(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
+			$(udev-extra-rules-y)) \
+		$(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
+			50-udev-default.rules \
+			60-persistent-input.rules \
+			60-persistent-serial.rules \
+			60-persistent-storage.rules \
+			80-drivers.rules \
+			95-udev-late.rules) \
+		$(1)/lib/udev/rules.d
+
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib
+
+	$(INSTALL_DIR) $(1)/lib/udev
+ifneq ($(udev-extra-lib-bin-y),)
+		$(INSTALL_BIN) \
+			$(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \
+				$(udev-extra-lib-bin-y)) \
+			$(1)/lib/udev/
+endif
+ifneq ($(udev-extra-lib-data-y),)
+		$(INSTALL_DATA) \
+			$(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \
+				$(udev-extra-lib-data-y)) \
+			$(1)/lib/udev/
+endif
+endef
+
+$(eval $(call BuildPackage,udev))
diff --git a/trunk/package/system/udev/patches/0001-build-don-t-use-gc-sections.patch b/trunk/package/system/udev/patches/0001-build-don-t-use-gc-sections.patch
new file mode 100644
index 00000000..f01a5ae1
--- /dev/null
+++ b/trunk/package/system/udev/patches/0001-build-don-t-use-gc-sections.patch
@@ -0,0 +1,31 @@
+From 971a09345f108189ed899b236784a5440e43c8b6 Mon Sep 17 00:00:00 2001
+From: Daniel Mierswa <impulze@impulze.org>
+Date: Sun, 31 Jul 2011 23:51:49 +0000
+Subject: [PATCH 1/2] build: don't use --gc-sections
+
+somehow won't work with the wrt toolchain
+---
+ Makefile.am |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a0c007a..3d8ce92 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,12 +18,9 @@ AM_CPPFLAGS = \
+ 	-DLIBEXECDIR=\""$(libexecdir)"\"
+ 
+ AM_CFLAGS = \
+-	-fvisibility=hidden \
+-	-ffunction-sections \
+-	-fdata-sections
++	-fvisibility=hidden
+ 
+ AM_LDFLAGS = \
+-	-Wl,--gc-sections \
+ 	-Wl,--as-needed
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+-- 
+1.7.6
+
diff --git a/trunk/package/system/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch b/trunk/package/system/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch
new file mode 100644
index 00000000..55466bc2
--- /dev/null
+++ b/trunk/package/system/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch
@@ -0,0 +1,25 @@
+From ae90737100d901723af9890e69798bd1dac9a86d Mon Sep 17 00:00:00 2001
+From: Daniel Mierswa <impulze@impulze.org>
+Date: Sun, 31 Jul 2011 23:53:21 +0000
+Subject: [PATCH 2/2] udevd: add -lrt for message queue symbols
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3d8ce92..7d8a4b6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -164,7 +164,7 @@ udev_udevd_SOURCES = \
+ 	udev/udevd.c \
+ 	udev/sd-daemon.h \
+ 	udev/sd-daemon.c
+-udev_udevd_LDADD = libudev/libudev-private.la
++udev_udevd_LDADD = libudev/libudev-private.la -lrt
+ 
+ udev_udevadm_SOURCES = \
+ 	$(udev_common_sources) \
+-- 
+1.7.6
+
diff --git a/trunk/package/system/udev/patches/0003-add_btn_trigger_happy_define.patch b/trunk/package/system/udev/patches/0003-add_btn_trigger_happy_define.patch
new file mode 100644
index 00000000..77eaf13a
--- /dev/null
+++ b/trunk/package/system/udev/patches/0003-add_btn_trigger_happy_define.patch
@@ -0,0 +1,13 @@
+--- a/extras/input_id/input_id.c
++++ b/extras/input_id/input_id.c
+@@ -30,6 +30,10 @@
+ #include "libudev.h"
+ #include "libudev-private.h"
+ 
++#ifndef BTN_TRIGGER_HAPPY
++#define BTN_TRIGGER_HAPPY 0x2c0
++#endif
++
+ /* we must use this kernel-compatible implementation */
+ #define BITS_PER_LONG (sizeof(unsigned long) * 8)
+ #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
diff --git a/trunk/package/system/zram-swap/Makefile b/trunk/package/system/zram-swap/Makefile
new file mode 100644
index 00000000..1fe3804e
--- /dev/null
+++ b/trunk/package/system/zram-swap/Makefile
@@ -0,0 +1,46 @@
+# 
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=zram-swap
+PKG_VERSION:=1
+PKG_RELEASE:=2
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/zram-swap
+  SECTION:=utils
+  CATEGORY:=Base system
+  DEPENDS:=+kmod-zram +!BUSYBOX_CONFIG_MKSWAP:swap-utils +!BUSYBOX_CONFIG_SWAPONOFF:block-mount
+  TITLE:=ZRAM swap scripts
+  PKGARCH:=all
+endef
+
+define Package/zram-swap/description
+ A script to activate swaping on a compressed zram partition. This 
+ could be used to increase the available memory, by using compressed 
+ memory.
+endef
+
+define Build/Prepare
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/zram-swap/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/zram.init $(1)/etc/init.d/zram
+endef
+
+$(eval $(call BuildPackage,zram-swap))
diff --git a/trunk/package/system/zram-swap/files/zram.init b/trunk/package/system/zram-swap/files/zram.init
new file mode 100644
index 00000000..23de915c
--- /dev/null
+++ b/trunk/package/system/zram-swap/files/zram.init
@@ -0,0 +1,123 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+
+ram_size()
+{
+	local line
+
+	while read line; do case "$line" in MemTotal:*) set $line; echo "$2"; break ;; esac; done </proc/meminfo
+}
+
+zram_size()	# in megabytes
+{
+	local zram_size="$( uci -q get system.@system[0].zram_size_mb )"
+	local ram_size="$( ram_size )"
+
+	if [ -z "$zram_size" ]; then
+		# e.g. 6mb for 16mb-routers or 61mb for 128mb-routers
+		echo $(( $ram_size / 2048 ))
+	else
+		echo "$zram_size"
+	fi
+}
+
+zram_applicable()
+{
+	local zram_dev="$1"
+
+	grep -sq ^"$zram_dev " /proc/swaps && {
+		logger -s -t zram_applicable -p daemon.notice "[OK] '$zram_dev' already active"
+		return 1
+	}
+
+	[ -e "$zram_dev" ] || {
+		logger -s -t zram_applicable -p daemon.crit "[ERROR] device '$zram_dev' not found"
+		return 1
+	}
+
+	which mkswap >/dev/null || {
+		logger -s -t zram_applicable -p daemon.err "[ERROR] 'mkswap' not installed"
+		return 1
+	}
+
+	which swapon >/dev/null || {
+		logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapon' not installed"
+		return 1
+	}
+
+	which swapoff >/dev/null || {
+		logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapoff' not installed"
+		return 1
+	}
+}
+
+zram_dev()
+{
+	local core="$1"
+
+	echo "/dev/zram${core:-0}"
+}
+
+zram_reset()
+{
+	local dev="$1"
+	local message="$2"
+	local proc_entry="/sys/block/$( basename "$dev" )/reset"
+
+	logger -s -t zram_reset -p daemon.debug "$message via $proc_entry"
+	echo "1" >"$proc_entry"
+}
+
+list_cpu_idx()
+{
+	local line i=0
+
+	while read line; do {
+		case "$line" in
+			[Pp]rocessor*)
+				echo $i
+				i=$(( $i + 1 ))
+			;;
+		esac
+	} done <"/proc/cpuinfo"
+}
+
+start()
+{
+	# http://shmilyxbq-compcache.googlecode.com/hg/README
+	# if >1 cpu_core, reinit kmodule with e.g. num_devices=4
+
+	local zram_size="$( zram_size )"
+	local zram_dev core
+
+	for core in $( list_cpu_idx ); do {
+		zram_dev="$( zram_dev "$core" )"
+		zram_applicable "$zram_dev" || return 1
+
+		logger -s -t zram_start -p daemon.debug "activating '$zram_dev' for swapping ($zram_size MegaBytes)"
+
+		zram_reset "$zram_dev" "enforcing defaults"
+		echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename $zram_dev )/disksize"
+		mkswap "$zram_dev"
+		swapon "$zram_dev"
+	} done
+}
+
+stop()
+{
+	local zram_dev proc_entry
+
+	for core in $( list_cpu_idx ); do {
+		zram_dev="$( zram_dev "$core" )"
+		proc_entry="/sys/block/$( basename "$zram_dev" )/reset"
+
+		grep -sq ^"$zram_dev " /proc/swaps && {
+			logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev"
+			swapoff "$zram_dev"
+		}
+
+		zram_reset "$zram_dev" "claiming memory back"
+	} done
+}
+
diff --git a/trunk/package/utils/admswconfig/Makefile b/trunk/package/utils/admswconfig/Makefile
new file mode 100644
index 00000000..e16258f4
--- /dev/null
+++ b/trunk/package/utils/admswconfig/Makefile
@@ -0,0 +1,52 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=admswconfig
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
+PKG_MD5SUM:=faafd4618f970119a665b11b21ac6a26
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/admswconfig
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=ADM5120 Switch configuration tool
+  DEPENDS:=@TARGET_adm5120
+  URL:=http://sharon.esrac.ele.tue.nl/users/pe1rxq/linux-adm/admswconfig/
+  MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+endef
+
+define Package/admswconfig/description
+ A program to configure the internal ethernet switch of an ADM5120 processor.
+ You need the corresponding driver for the switch in the kernel. 
+ With this program you can configure which ports of the switch belong 
+ to the different ethernet devices.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -Os $(PKG_BUILD_DIR)/admswconfig.c -o $(PKG_BUILD_DIR)/$(PKG_NAME)
+endef
+
+define Package/admswconfig/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/admswconfig $(1)/sbin/
+	$(INSTALL_DIR) $(1)/lib/network/
+	$(INSTALL_DATA) ./files/admswswitch.sh $(1)/lib/network/admswswitch.sh
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/admswconfig $(1)/etc/init.d/admswconfig
+endef
+
+$(eval $(call BuildPackage,admswconfig))
diff --git a/trunk/package/utils/admswconfig/files/admswconfig b/trunk/package/utils/admswconfig/files/admswconfig
new file mode 100644
index 00000000..72310306
--- /dev/null
+++ b/trunk/package/utils/admswconfig/files/admswconfig
@@ -0,0 +1,68 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=05
+
+start() {
+	[ -e /etc/config/network ] && exit 0
+
+	mkdir -p /etc/config
+
+	board_name=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /system type/ {print $2}' /proc/cpuinfo)
+
+	case "$board_name" in
+	"Compex WP54"*)
+		board="Compex WP54";;
+	esac
+
+	echo "$board" |awk '
+	function p(cfgname, name) {
+		if (c[name] != "") print "	option " cfgname "	\"" c[name] "\""
+	}
+
+	BEGIN {
+		FS="="
+		c["lan_ifname"]="eth0"
+		c["wan_ifname"]="eth1"
+		c["eth0ports"]="1 2 3 4"
+		c["eth1ports"]="0"
+	}
+	END {
+		board=$1
+		if (board == "Compex WP54") {
+			c["eth0ports"]="0"
+			c["eth1ports"]="1"
+		}
+
+		print "#### VLAN configuration "
+		print "config switch"
+		p("eth0", "eth0ports")
+		p("eth1", "eth1ports")
+		print ""
+		print ""
+		print "#### Loopback configuration"
+		print "config interface loopback"
+		print "	option ifname	\"lo\""
+		print "	option proto	static"
+		print "	option ipaddr	127.0.0.1"
+		print "	option netmask	255.0.0.0"
+		print ""
+		print ""
+		print "#### LAN configuration"
+		print "config interface lan"
+		print "	option type 	bridge"
+		p("ifname", "lan_ifname")
+		p("macaddr", "lan_macaddr")
+		print "	option proto	static"
+		print "	option ipaddr	192.168.1.1"
+		print "	option netmask	255.255.255.0"
+		print ""
+		print ""
+		print "#### WAN configuration"
+		print "config interface	wan"
+		p("ifname", "wan_ifname")
+		p("macaddr", "wan_macaddr")
+		print "	option proto	dhcp"
+	}' > /etc/config/network
+}
+
diff --git a/trunk/package/utils/admswconfig/files/admswswitch.sh b/trunk/package/utils/admswconfig/files/admswswitch.sh
new file mode 100644
index 00000000..984d7eea
--- /dev/null
+++ b/trunk/package/utils/admswconfig/files/admswswitch.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+setup_switch_vlan() {
+	config_get ports "$CONFIG_SECTION" "eth$1"
+	ports=`echo "$ports"| sed s/" "/""/g`
+	ifconfig eth$1 down
+	admswconfig eth$1 ${ports}c
+	ifconfig eth$1 up
+}
+
+setup_switch() {
+	config_cb() {
+		case "$1" in
+			switch)
+				option_cb() {
+					case "$1" in
+						eth*) setup_switch_vlan "${1##eth}";;
+					esac
+				}
+			;;
+			*)
+				option_cb() { return 0; }
+			;;
+		esac
+	}
+	config_load network
+}
diff --git a/trunk/package/utils/admswconfig/patches/001-matrix.patch b/trunk/package/utils/admswconfig/patches/001-matrix.patch
new file mode 100644
index 00000000..e50d5157
--- /dev/null
+++ b/trunk/package/utils/admswconfig/patches/001-matrix.patch
@@ -0,0 +1,15 @@
+--- a/admswconfig.c
++++ b/admswconfig.c
+@@ -111,9 +111,9 @@ int main(int argc, char **argv)
+ 		}
+ 	} else {
+ 		/* display matrix */
+-		printf("ethX\tport0\tport1\tport2\tport3\tport4");
+-		if (info.ports == 6)
+-			printf("\tport5");
++		printf("ethX");
++		for (i = 0; i < info.ports; i++)
++			printf("\tport%d", i);
+ 		printf("\tCPU\n");
+ 		for (i = 0; i < info.ports; i++) {
+ 			printf("%d", i);
diff --git a/trunk/package/utils/busybox/Config-defaults.in b/trunk/package/utils/busybox/Config-defaults.in
new file mode 100644
index 00000000..5797243a
--- /dev/null
+++ b/trunk/package/utils/busybox/Config-defaults.in
@@ -0,0 +1,2673 @@
+config BUSYBOX_DEFAULT_HAVE_DOT_CONFIG
+	bool
+	default y
+config BUSYBOX_DEFAULT_DESKTOP
+	bool
+	default n
+config BUSYBOX_DEFAULT_EXTRA_COMPAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_INCLUDE_SUSv2
+	bool
+	default y
+config BUSYBOX_DEFAULT_USE_PORTABLE_CODE
+	bool
+	default n
+config BUSYBOX_DEFAULT_PLATFORM_LINUX
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_BUFFERS_USE_MALLOC
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BUFFERS_GO_ON_STACK
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_BUFFERS_GO_IN_BSS
+	bool
+	default n
+config BUSYBOX_DEFAULT_SHOW_USAGE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VERBOSE_USAGE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_COMPRESS_USAGE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_INSTALLER
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_NO_USR
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOCALE_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_USING_LOCALE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHECK_UNICODE_IN_ENV
+	bool
+	default n
+config BUSYBOX_DEFAULT_SUBST_WCHAR
+	int
+	default 0
+config BUSYBOX_DEFAULT_LAST_SUPPORTED_WCHAR
+	int
+	default 0
+config BUSYBOX_DEFAULT_UNICODE_COMBINING_WCHARS
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_WIDE_WCHARS
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_BIDI_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_NEUTRAL_TABLE
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_PRESERVE_BROKEN
+	bool
+	default n
+config BUSYBOX_DEFAULT_LONG_OPTS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DEVPTS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_CLEAN_UP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_UTMP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_WTMP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PIDFILE
+	bool
+	default y
+config BUSYBOX_DEFAULT_PID_FILE_PATH
+	string
+	default "/var/run"
+config BUSYBOX_DEFAULT_FEATURE_SUID
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SUID_CONFIG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SUID_CONFIG_QUIET
+	bool
+	default n
+config BUSYBOX_DEFAULT_SELINUX
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PREFER_APPLETS
+	bool
+	default y
+config BUSYBOX_DEFAULT_BUSYBOX_EXEC_PATH
+	string
+	default "/proc/self/exe"
+config BUSYBOX_DEFAULT_FEATURE_SYSLOG
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_HAVE_RPC
+	bool
+	default n
+config BUSYBOX_DEFAULT_STATIC
+	bool
+	default n
+config BUSYBOX_DEFAULT_PIE
+	bool
+	default n
+config BUSYBOX_DEFAULT_NOMMU
+	bool
+	default n
+config BUSYBOX_DEFAULT_BUILD_LIBBUSYBOX
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INDIVIDUAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SHARED_BUSYBOX
+	bool
+	default n
+config BUSYBOX_DEFAULT_LFS
+	bool
+	default y
+config BUSYBOX_DEFAULT_CROSS_COMPILER_PREFIX
+	string
+	default ""
+config BUSYBOX_DEFAULT_SYSROOT
+	string
+	default ""
+config BUSYBOX_DEFAULT_EXTRA_CFLAGS
+	string
+	default ""
+config BUSYBOX_DEFAULT_EXTRA_LDFLAGS
+	string
+	default ""
+config BUSYBOX_DEFAULT_EXTRA_LDLIBS
+	string
+	default ""
+config BUSYBOX_DEFAULT_DEBUG
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEBUG_PESSIMIZE
+	bool
+	default n
+config BUSYBOX_DEFAULT_WERROR
+	bool
+	default n
+config BUSYBOX_DEFAULT_NO_DEBUG_LIB
+	bool
+	default y
+config BUSYBOX_DEFAULT_DMALLOC
+	bool
+	default n
+config BUSYBOX_DEFAULT_EFENCE
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_APPLET_SYMLINKS
+	bool
+	default y
+config BUSYBOX_DEFAULT_INSTALL_APPLET_HARDLINKS
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_APPLET_SCRIPT_WRAPPERS
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_APPLET_DONT
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_SYMLINK
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_HARDLINK
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_SCRIPT_WRAPPER
+	bool
+	default n
+config BUSYBOX_DEFAULT_PREFIX
+	string
+	default "./_install"
+config BUSYBOX_DEFAULT_FEATURE_SYSTEMD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_RTMINMAX
+	bool
+	default n
+config BUSYBOX_DEFAULT_PASSWORD_MINLEN
+	int
+	default 6
+config BUSYBOX_DEFAULT_MD5_SMALL
+	int
+	default 1
+config BUSYBOX_DEFAULT_SHA3_SMALL
+	int
+	default 1
+config BUSYBOX_DEFAULT_FEATURE_FAST_TOP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_ETC_NETWORKS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_USE_TERMIOS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_EDITING
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_EDITING_MAX_LEN
+	int
+	default 512
+config BUSYBOX_DEFAULT_FEATURE_EDITING_VI
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_EDITING_HISTORY
+	int
+	default 256
+config BUSYBOX_DEFAULT_FEATURE_EDITING_SAVEHISTORY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_EDITING_SAVE_ON_EXIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_REVERSE_SEARCH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAB_COMPLETION
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_USERNAME_COMPLETION
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_EDITING_FANCY_PROMPT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_EDITING_ASK_TERMINAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_NON_POSIX_CP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VERBOSE_CP_MESSAGE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_COPYBUF_KB
+	int
+	default 4
+config BUSYBOX_DEFAULT_FEATURE_SKIP_ROOTFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_MONOTONIC_SYSCALL
+	bool
+	default n
+config BUSYBOX_DEFAULT_IOCTL_HEX2STR_ERROR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_HWIB
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SEAMLESS_XZ
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SEAMLESS_LZMA
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SEAMLESS_BZ2
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SEAMLESS_GZ
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SEAMLESS_Z
+	bool
+	default n
+config BUSYBOX_DEFAULT_AR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_AR_LONG_FILENAMES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_AR_CREATE
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNCOMPRESS
+	bool
+	default n
+config BUSYBOX_DEFAULT_GUNZIP
+	bool
+	default y
+config BUSYBOX_DEFAULT_BUNZIP2
+	bool
+	default y
+config BUSYBOX_DEFAULT_UNLZMA
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LZMA_FAST
+	bool
+	default n
+config BUSYBOX_DEFAULT_LZMA
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNXZ
+	bool
+	default n
+config BUSYBOX_DEFAULT_XZ
+	bool
+	default n
+config BUSYBOX_DEFAULT_BZIP2
+	bool
+	default n
+config BUSYBOX_DEFAULT_CPIO
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CPIO_O
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CPIO_P
+	bool
+	default n
+config BUSYBOX_DEFAULT_DPKG
+	bool
+	default n
+config BUSYBOX_DEFAULT_DPKG_DEB
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	bool
+	default n
+config BUSYBOX_DEFAULT_GZIP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_GZIP_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_GZIP_FAST
+	int
+	default 0
+config BUSYBOX_DEFAULT_LZOP
+	bool
+	default n
+config BUSYBOX_DEFAULT_LZOP_COMPR_HIGH
+	bool
+	default n
+config BUSYBOX_DEFAULT_RPM
+	bool
+	default n
+config BUSYBOX_DEFAULT_RPM2CPIO
+	bool
+	default n
+config BUSYBOX_DEFAULT_TAR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TAR_CREATE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TAR_AUTODETECT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAR_FROM
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TAR_OLDGNU_COMPATIBILITY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAR_OLDSUN_COMPATIBILITY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAR_GNU_EXTENSIONS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TAR_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAR_TO_COMMAND
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAR_UNAME_GNAME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAR_NOPRESERVE_TIME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TAR_SELINUX
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNZIP
+	bool
+	default n
+config BUSYBOX_DEFAULT_BASENAME
+	bool
+	default y
+config BUSYBOX_DEFAULT_CAT
+	bool
+	default y
+config BUSYBOX_DEFAULT_DATE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DATE_ISOFMT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DATE_NANO
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DATE_COMPAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_HOSTID
+	bool
+	default y
+config BUSYBOX_DEFAULT_ID
+	bool
+	default y
+config BUSYBOX_DEFAULT_GROUPS
+	bool
+	default n
+config BUSYBOX_DEFAULT_TEST
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TEST_64
+	bool
+	default y
+config BUSYBOX_DEFAULT_TOUCH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TOUCH_NODEREF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TOUCH_SUSV3
+	bool
+	default n
+config BUSYBOX_DEFAULT_TR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TR_CLASSES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TR_EQUIV
+	bool
+	default n
+config BUSYBOX_DEFAULT_BASE64
+	bool
+	default n
+config BUSYBOX_DEFAULT_WHO
+	bool
+	default n
+config BUSYBOX_DEFAULT_USERS
+	bool
+	default n
+config BUSYBOX_DEFAULT_CAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_CATV
+	bool
+	default n
+config BUSYBOX_DEFAULT_CHGRP
+	bool
+	default y
+config BUSYBOX_DEFAULT_CHMOD
+	bool
+	default y
+config BUSYBOX_DEFAULT_CHOWN
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_CHOWN_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_CHROOT
+	bool
+	default y
+config BUSYBOX_DEFAULT_CKSUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_COMM
+	bool
+	default n
+config BUSYBOX_DEFAULT_CP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_CP_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_CUT
+	bool
+	default y
+config BUSYBOX_DEFAULT_DD
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
+	bool
+	default y
+config BUSYBOX_DEFAULT_DF
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DF_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_DIRNAME
+	bool
+	default y
+config BUSYBOX_DEFAULT_DOS2UNIX
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNIX2DOS
+	bool
+	default n
+config BUSYBOX_DEFAULT_DU
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+	bool
+	default y
+config BUSYBOX_DEFAULT_ECHO
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FANCY_ECHO
+	bool
+	default y
+config BUSYBOX_DEFAULT_ENV
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_ENV_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_EXPAND
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_EXPAND_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_EXPR
+	bool
+	default y
+config BUSYBOX_DEFAULT_EXPR_MATH_SUPPORT_64
+	bool
+	default y
+config BUSYBOX_DEFAULT_FALSE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FOLD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FSYNC
+	bool
+	default y
+config BUSYBOX_DEFAULT_HEAD
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FANCY_HEAD
+	bool
+	default y
+config BUSYBOX_DEFAULT_INSTALL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INSTALL_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_LN
+	bool
+	default y
+config BUSYBOX_DEFAULT_LOGNAME
+	bool
+	default n
+config BUSYBOX_DEFAULT_LS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_FILETYPES
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_FOLLOWLINKS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_RECURSIVE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_SORTFILES
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_TIMESTAMPS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_USERNAME
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_COLOR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LS_COLOR_IS_DEFAULT
+	bool
+	default y
+config BUSYBOX_DEFAULT_MD5SUM
+	bool
+	default y
+config BUSYBOX_DEFAULT_MKDIR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MKDIR_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_MKFIFO
+	bool
+	default y
+config BUSYBOX_DEFAULT_MKNOD
+	bool
+	default y
+config BUSYBOX_DEFAULT_MV
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MV_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_NICE
+	bool
+	default y
+config BUSYBOX_DEFAULT_NOHUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_OD
+	bool
+	default n
+config BUSYBOX_DEFAULT_PRINTENV
+	bool
+	default n
+config BUSYBOX_DEFAULT_PRINTF
+	bool
+	default y
+config BUSYBOX_DEFAULT_PWD
+	bool
+	default y
+config BUSYBOX_DEFAULT_READLINK
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_READLINK_FOLLOW
+	bool
+	default y
+config BUSYBOX_DEFAULT_REALPATH
+	bool
+	default n
+config BUSYBOX_DEFAULT_RM
+	bool
+	default y
+config BUSYBOX_DEFAULT_RMDIR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_RMDIR_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_SEQ
+	bool
+	default y
+config BUSYBOX_DEFAULT_SHA1SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_SHA256SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_SHA512SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_SHA3SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_SLEEP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FANCY_SLEEP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FLOAT_SLEEP
+	bool
+	default n
+config BUSYBOX_DEFAULT_SORT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SORT_BIG
+	bool
+	default n
+config BUSYBOX_DEFAULT_SPLIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SPLIT_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_STAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_STAT_FORMAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_STTY
+	bool
+	default n
+config BUSYBOX_DEFAULT_SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_SYNC
+	bool
+	default y
+config BUSYBOX_DEFAULT_TAC
+	bool
+	default n
+config BUSYBOX_DEFAULT_TAIL
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FANCY_TAIL
+	bool
+	default y
+config BUSYBOX_DEFAULT_TEE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TEE_USE_BLOCK_IO
+	bool
+	default y
+config BUSYBOX_DEFAULT_TRUE
+	bool
+	default y
+config BUSYBOX_DEFAULT_TTY
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNAME
+	bool
+	default y
+config BUSYBOX_DEFAULT_UNEXPAND
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_UNEXPAND_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNIQ
+	bool
+	default y
+config BUSYBOX_DEFAULT_USLEEP
+	bool
+	default n
+config BUSYBOX_DEFAULT_UUDECODE
+	bool
+	default n
+config BUSYBOX_DEFAULT_UUENCODE
+	bool
+	default n
+config BUSYBOX_DEFAULT_WC
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_WC_LARGE
+	bool
+	default n
+config BUSYBOX_DEFAULT_WHOAMI
+	bool
+	default n
+config BUSYBOX_DEFAULT_YES
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_PRESERVE_HARDLINKS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_AUTOWIDTH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_HUMAN_READABLE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MD5_SHA1_SUM_CHECK
+	bool
+	default y
+config BUSYBOX_DEFAULT_CHVT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FGCONSOLE
+	bool
+	default n
+config BUSYBOX_DEFAULT_CLEAR
+	bool
+	default y
+config BUSYBOX_DEFAULT_DEALLOCVT
+	bool
+	default n
+config BUSYBOX_DEFAULT_DUMPKMAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_KBD_MODE
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOADFONT
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOADKMAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_OPENVT
+	bool
+	default n
+config BUSYBOX_DEFAULT_RESET
+	bool
+	default y
+config BUSYBOX_DEFAULT_RESIZE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_RESIZE_PRINT
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETCONSOLE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SETCONSOLE_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETFONT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SETFONT_TEXTUAL_MAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEFAULT_SETFONT_DIR
+	string
+	default ""
+config BUSYBOX_DEFAULT_SETKEYCODES
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETLOGCONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_SHOWKEY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LOADFONT_PSF2
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW
+	bool
+	default n
+config BUSYBOX_DEFAULT_MKTEMP
+	bool
+	default y
+config BUSYBOX_DEFAULT_PIPE_PROGRESS
+	bool
+	default n
+config BUSYBOX_DEFAULT_RUN_PARTS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_RUN_PARTS_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_RUN_PARTS_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_START_STOP_DAEMON
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_START_STOP_DAEMON_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_WHICH
+	bool
+	default y
+config BUSYBOX_DEFAULT_AWK
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_AWK_LIBM
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_AWK_GNU_EXTENSIONS
+	bool
+	default y
+config BUSYBOX_DEFAULT_CMP
+	bool
+	default y
+config BUSYBOX_DEFAULT_DIFF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DIFF_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DIFF_DIR
+	bool
+	default n
+config BUSYBOX_DEFAULT_ED
+	bool
+	default n
+config BUSYBOX_DEFAULT_PATCH
+	bool
+	default n
+config BUSYBOX_DEFAULT_SED
+	bool
+	default y
+config BUSYBOX_DEFAULT_VI
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_MAX_LEN
+	int
+	default 1024
+config BUSYBOX_DEFAULT_FEATURE_VI_8BIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VI_COLON
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_YANKMARK
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_SEARCH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_REGEX_SEARCH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VI_USE_SIGNALS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_DOT_CMD
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_READONLY
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_SETOPTS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_SET
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_WIN_RESIZE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_VI_ASK_TERMINAL
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_ALLOW_EXEC
+	bool
+	default y
+config BUSYBOX_DEFAULT_FIND
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_PRINT0
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_MTIME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FIND_MMIN
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FIND_PERM
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_TYPE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_XDEV
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_MAXDEPTH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_NEWER
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FIND_INUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FIND_EXEC
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_USER
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_GROUP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_NOT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_DEPTH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_PAREN
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_SIZE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_PRUNE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_DELETE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FIND_PATH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_REGEX
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FIND_CONTEXT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FIND_LINKS
+	bool
+	default n
+config BUSYBOX_DEFAULT_GREP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_GREP_EGREP_ALIAS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_GREP_FGREP_ALIAS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_GREP_CONTEXT
+	bool
+	default y
+config BUSYBOX_DEFAULT_XARGS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_CONFIRMATION
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_QUOTES
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_TERMOPT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_ZERO_TERM
+	bool
+	default y
+config BUSYBOX_DEFAULT_BOOTCHARTD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BOOTCHARTD_BLOATED_HEADER
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BOOTCHARTD_CONFIG_FILE
+	bool
+	default n
+config BUSYBOX_DEFAULT_HALT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_CALL_TELINIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_TELINIT_PATH
+	string
+	default ""
+config BUSYBOX_DEFAULT_INIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_USE_INITTAB
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_KILL_REMOVED
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_KILL_DELAY
+	int
+	default 0
+config BUSYBOX_DEFAULT_FEATURE_INIT_SCTTY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INIT_SYSLOG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_EXTRA_QUIET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INIT_COREDUMPS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INITRD
+	bool
+	default n
+config BUSYBOX_DEFAULT_INIT_TERMINAL_TYPE
+	string
+	default ""
+config BUSYBOX_DEFAULT_MESG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MESG_ENABLE_ONLY_GROUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_ADD_SHELL
+	bool
+	default n
+config BUSYBOX_DEFAULT_REMOVE_SHELL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SHADOWPASSWDS
+	bool
+	default y
+config BUSYBOX_DEFAULT_USE_BB_PWD_GRP
+	bool
+	default n
+config BUSYBOX_DEFAULT_USE_BB_SHADOW
+	bool
+	default n
+config BUSYBOX_DEFAULT_USE_BB_CRYPT
+	bool
+	default n
+config BUSYBOX_DEFAULT_USE_BB_CRYPT_SHA
+	bool
+	default n
+config BUSYBOX_DEFAULT_ADDUSER
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_ADDUSER_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHECK_NAMES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FIRST_SYSTEM_ID
+	int
+	default 0
+config BUSYBOX_DEFAULT_LAST_SYSTEM_ID
+	int
+	default 0
+config BUSYBOX_DEFAULT_ADDGROUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_ADDGROUP_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_ADDUSER_TO_GROUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_DELUSER
+	bool
+	default n
+config BUSYBOX_DEFAULT_DELGROUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DEL_USER_FROM_GROUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_GETTY
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOGIN
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOGIN_SESSION_AS_CHILD
+	bool
+	default n
+config BUSYBOX_DEFAULT_PAM
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOGIN_SCRIPTS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_NOLOGIN
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SECURETTY
+	bool
+	default n
+config BUSYBOX_DEFAULT_PASSWD
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_PASSWD_WEAK_CHECK
+	bool
+	default y
+config BUSYBOX_DEFAULT_CRYPTPW
+	bool
+	default n
+config BUSYBOX_DEFAULT_CHPASSWD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO
+	string
+	default "md5"
+config BUSYBOX_DEFAULT_SU
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SU_SYSLOG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SU_CHECKS_SHELLS
+	bool
+	default n
+config BUSYBOX_DEFAULT_SULOGIN
+	bool
+	default n
+config BUSYBOX_DEFAULT_VLOCK
+	bool
+	default n
+config BUSYBOX_DEFAULT_CHATTR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FSCK
+	bool
+	default n
+config BUSYBOX_DEFAULT_LSATTR
+	bool
+	default n
+config BUSYBOX_DEFAULT_TUNE2FS
+	bool
+	default n
+config BUSYBOX_DEFAULT_MODINFO
+	bool
+	default n
+config BUSYBOX_DEFAULT_MODPROBE_SMALL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSMOD
+	bool
+	default n
+config BUSYBOX_DEFAULT_RMMOD
+	bool
+	default n
+config BUSYBOX_DEFAULT_LSMOD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+	bool
+	default n
+config BUSYBOX_DEFAULT_MODPROBE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MODPROBE_BLACKLIST
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEPMOD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_2_4_MODULES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INSMOD_TRY_MMAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INSMOD_VERSION_CHECKING
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INSMOD_LOADINKMEM
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INSMOD_LOAD_MAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INSMOD_LOAD_MAP_FULL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHECK_TAINTED_MODULE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MODUTILS_ALIAS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MODUTILS_SYMBOLS
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEFAULT_MODULES_DIR
+	string
+	default ""
+config BUSYBOX_DEFAULT_DEFAULT_DEPMOD_FILE
+	string
+	default ""
+config BUSYBOX_DEFAULT_BLOCKDEV
+	bool
+	default n
+config BUSYBOX_DEFAULT_FSTRIM
+	bool
+	default n
+config BUSYBOX_DEFAULT_MDEV
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MDEV_CONF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME_REGEXP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MDEV_EXEC
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
+	bool
+	default n
+config BUSYBOX_DEFAULT_REV
+	bool
+	default n
+config BUSYBOX_DEFAULT_ACPID
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_ACPID_COMPAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_BLKID
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BLKID_TYPE
+	bool
+	default n
+config BUSYBOX_DEFAULT_DMESG
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_DMESG_PRETTY
+	bool
+	default y
+config BUSYBOX_DEFAULT_FBSET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FBSET_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FBSET_READMODE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FDFLUSH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FDFORMAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FDISK
+	bool
+	default n
+config BUSYBOX_DEFAULT_FDISK_SUPPORT_LARGE_DISKS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FDISK_WRITABLE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_AIX_LABEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SGI_LABEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SUN_LABEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_OSF_LABEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_GPT_LABEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FDISK_ADVANCED
+	bool
+	default n
+config BUSYBOX_DEFAULT_FINDFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FLOCK
+	bool
+	default n
+config BUSYBOX_DEFAULT_FREERAMDISK
+	bool
+	default n
+config BUSYBOX_DEFAULT_FSCK_MINIX
+	bool
+	default n
+config BUSYBOX_DEFAULT_MKFS_EXT2
+	bool
+	default n
+config BUSYBOX_DEFAULT_MKFS_MINIX
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MINIX2
+	bool
+	default n
+config BUSYBOX_DEFAULT_MKFS_REISER
+	bool
+	default n
+config BUSYBOX_DEFAULT_MKFS_VFAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_GETOPT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_GETOPT_LONG
+	bool
+	default n
+config BUSYBOX_DEFAULT_HEXDUMP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_HEXDUMP_REVERSE
+	bool
+	default n
+config BUSYBOX_DEFAULT_HD
+	bool
+	default n
+config BUSYBOX_DEFAULT_HWCLOCK
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_HWCLOCK_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HWCLOCK_ADJTIME_FHS
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPCRM
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPCS
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOSETUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_LSPCI
+	bool
+	default n
+config BUSYBOX_DEFAULT_LSUSB
+	bool
+	default n
+config BUSYBOX_DEFAULT_MKSWAP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MKSWAP_UUID
+	bool
+	default n
+config BUSYBOX_DEFAULT_MORE
+	bool
+	default n
+config BUSYBOX_DEFAULT_MOUNT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
+	bool
+	default y
+config BUSYBOX_DEFAULT_PIVOT_ROOT
+	bool
+	default y
+config BUSYBOX_DEFAULT_RDATE
+	bool
+	default n
+config BUSYBOX_DEFAULT_RDEV
+	bool
+	default n
+config BUSYBOX_DEFAULT_READPROFILE
+	bool
+	default n
+config BUSYBOX_DEFAULT_RTCWAKE
+	bool
+	default n
+config BUSYBOX_DEFAULT_SCRIPT
+	bool
+	default n
+config BUSYBOX_DEFAULT_SCRIPTREPLAY
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETARCH
+	bool
+	default n
+config BUSYBOX_DEFAULT_SWAPONOFF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SWAPON_PRI
+	bool
+	default n
+config BUSYBOX_DEFAULT_SWITCH_ROOT
+	bool
+	default y
+config BUSYBOX_DEFAULT_UMOUNT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_UMOUNT_ALL
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP_CREATE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MTAB_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_VOLUMEID
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BTRFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_CRAMFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXFAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_F2FS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_FAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_HFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ISO9660
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_JFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXRAID
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXSWAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LUKS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NILFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NTFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_OCFS2
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_REISERFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ROMFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SQUASHFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SYSV
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_UDF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_XFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_CONSPY
+	bool
+	default n
+config BUSYBOX_DEFAULT_LESS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LESS_MAXLINES
+	int
+	default 9999999
+config BUSYBOX_DEFAULT_FEATURE_LESS_BRACKETS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_REGEXP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_WINCH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_ASK_TERMINAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_DASHCMD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_LINENUMS
+	bool
+	default n
+config BUSYBOX_DEFAULT_NANDWRITE
+	bool
+	default n
+config BUSYBOX_DEFAULT_NANDDUMP
+	bool
+	default n
+config BUSYBOX_DEFAULT_RFKILL
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETSERIAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_UBIATTACH
+	bool
+	default n
+config BUSYBOX_DEFAULT_UBIDETACH
+	bool
+	default n
+config BUSYBOX_DEFAULT_UBIMKVOL
+	bool
+	default n
+config BUSYBOX_DEFAULT_UBIRMVOL
+	bool
+	default n
+config BUSYBOX_DEFAULT_UBIRSVOL
+	bool
+	default n
+config BUSYBOX_DEFAULT_UBIUPDATEVOL
+	bool
+	default n
+config BUSYBOX_DEFAULT_WALL
+	bool
+	default n
+config BUSYBOX_DEFAULT_ADJTIMEX
+	bool
+	default n
+config BUSYBOX_DEFAULT_BBCONFIG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_COMPRESS_BBCONFIG
+	bool
+	default n
+config BUSYBOX_DEFAULT_BEEP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BEEP_FREQ
+	int
+	default 0
+config BUSYBOX_DEFAULT_FEATURE_BEEP_LENGTH_MS
+	int
+	default 0
+config BUSYBOX_DEFAULT_CHAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHAT_NOFAIL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHAT_TTY_HIFI
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHAT_IMPLICIT_CR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHAT_SWALLOW_OPTS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHAT_SEND_ESCAPES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHAT_VAR_ABORT_LEN
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHAT_CLR_ABORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_CHRT
+	bool
+	default n
+config BUSYBOX_DEFAULT_CROND
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_CROND_D
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CROND_DIR
+	string
+	default "/etc"
+config BUSYBOX_DEFAULT_CRONTAB
+	bool
+	default y
+config BUSYBOX_DEFAULT_DC
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DC_LIBM
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEVFSD
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEVFSD_MODLOAD
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEVFSD_FG_NP
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEVFSD_VERBOSE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_DEVFS
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEVMEM
+	bool
+	default y
+config BUSYBOX_DEFAULT_EJECT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_EJECT_SCSI
+	bool
+	default n
+config BUSYBOX_DEFAULT_FBSPLASH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FLASHCP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FLASH_LOCK
+	bool
+	default n
+config BUSYBOX_DEFAULT_FLASH_UNLOCK
+	bool
+	default n
+config BUSYBOX_DEFAULT_FLASH_ERASEALL
+	bool
+	default n
+config BUSYBOX_DEFAULT_IONICE
+	bool
+	default n
+config BUSYBOX_DEFAULT_INOTIFYD
+	bool
+	default n
+config BUSYBOX_DEFAULT_LAST
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LAST_SMALL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LAST_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_HDPARM
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_GET_IDENTITY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_SCAN_HWIF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_DRIVE_RESET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_GETSET_DMA
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOCK
+	bool
+	default y
+config BUSYBOX_DEFAULT_MAKEDEVS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MAKEDEVS_LEAF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MAKEDEVS_TABLE
+	bool
+	default n
+config BUSYBOX_DEFAULT_MAN
+	bool
+	default n
+config BUSYBOX_DEFAULT_MICROCOM
+	bool
+	default n
+config BUSYBOX_DEFAULT_MOUNTPOINT
+	bool
+	default n
+config BUSYBOX_DEFAULT_MT
+	bool
+	default n
+config BUSYBOX_DEFAULT_RAIDAUTORUN
+	bool
+	default n
+config BUSYBOX_DEFAULT_READAHEAD
+	bool
+	default n
+config BUSYBOX_DEFAULT_RUNLEVEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_RX
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETSID
+	bool
+	default n
+config BUSYBOX_DEFAULT_STRINGS
+	bool
+	default y
+config BUSYBOX_DEFAULT_TASKSET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_TIME
+	bool
+	default y
+config BUSYBOX_DEFAULT_TIMEOUT
+	bool
+	default n
+config BUSYBOX_DEFAULT_TTYSIZE
+	bool
+	default n
+config BUSYBOX_DEFAULT_VOLNAME
+	bool
+	default n
+config BUSYBOX_DEFAULT_WATCHDOG
+	bool
+	default n
+config BUSYBOX_DEFAULT_NAMEIF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_NAMEIF_EXTENDED
+	bool
+	default n
+config BUSYBOX_DEFAULT_NBDCLIENT
+	bool
+	default n
+config BUSYBOX_DEFAULT_NC
+	bool
+	default y
+config BUSYBOX_DEFAULT_NC_SERVER
+	bool
+	default n
+config BUSYBOX_DEFAULT_NC_EXTRA
+	bool
+	default n
+config BUSYBOX_DEFAULT_NC_110_COMPAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_PING
+	bool
+	default y
+config BUSYBOX_DEFAULT_PING6
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FANCY_PING
+	bool
+	default y
+config BUSYBOX_DEFAULT_WHOIS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IPV6
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_UNIX_LOCAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PREFER_IPV4_ADDRESS
+	bool
+	default y
+config BUSYBOX_DEFAULT_VERBOSE_RESOLUTION_ERRORS
+	bool
+	default y
+config BUSYBOX_DEFAULT_ARP
+	bool
+	default n
+config BUSYBOX_DEFAULT_ARPING
+	bool
+	default y
+config BUSYBOX_DEFAULT_BRCTL
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_BRCTL_FANCY
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_BRCTL_SHOW
+	bool
+	default y
+config BUSYBOX_DEFAULT_DNSD
+	bool
+	default n
+config BUSYBOX_DEFAULT_ETHER_WAKE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FAKEIDENTD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FTPD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FTP_WRITE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FTPD_ACCEPT_BROKEN_LIST
+	bool
+	default n
+config BUSYBOX_DEFAULT_FTPGET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FTPPUT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_FTPGETPUT_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_HOSTNAME
+	bool
+	default n
+config BUSYBOX_DEFAULT_HTTPD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_RANGES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_USE_SENDFILE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_SETUID
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_BASIC_AUTH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_AUTH_MD5
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_CGI
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_ENCODE_URL_STR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_ERROR_PAGES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_PROXY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HTTPD_GZIP
+	bool
+	default n
+config BUSYBOX_DEFAULT_IFCONFIG
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_IFCONFIG_STATUS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_IFCONFIG_SLIP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFCONFIG_HW
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_IFCONFIG_BROADCAST_PLUS
+	bool
+	default y
+config BUSYBOX_DEFAULT_IFENSLAVE
+	bool
+	default n
+config BUSYBOX_DEFAULT_IFPLUGD
+	bool
+	default n
+config BUSYBOX_DEFAULT_IFUPDOWN
+	bool
+	default n
+config BUSYBOX_DEFAULT_IFUPDOWN_IFSTATE_PATH
+	string
+	default ""
+config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IP_BUILTIN
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IPV4
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IPV6
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_MAPPING
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+	bool
+	default n
+config BUSYBOX_DEFAULT_INETD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_INETD_RPC
+	bool
+	default n
+config BUSYBOX_DEFAULT_IP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IP_ADDRESS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IP_LINK
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IP_ROUTE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IP_TUNNEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IP_RULE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IP_SHORT_FORMS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IP_RARE_PROTOCOLS
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPADDR
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPLINK
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPROUTE
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPTUNNEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPRULE
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPCALC
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IPCALC_FANCY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IPCALC_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_NETMSG
+	bool
+	default y
+config BUSYBOX_DEFAULT_NETSTAT
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_NETSTAT_WIDE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
+	bool
+	default y
+config BUSYBOX_DEFAULT_NSLOOKUP
+	bool
+	default y
+config BUSYBOX_DEFAULT_NTPD
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_NTPD_SERVER
+	bool
+	default y
+config BUSYBOX_DEFAULT_PSCAN
+	bool
+	default n
+config BUSYBOX_DEFAULT_ROUTE
+	bool
+	default y
+config BUSYBOX_DEFAULT_SLATTACH
+	bool
+	default n
+config BUSYBOX_DEFAULT_TCPSVD
+	bool
+	default n
+config BUSYBOX_DEFAULT_TELNET
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TELNET_TTYPE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TELNET_AUTOLOGIN
+	bool
+	default n
+config BUSYBOX_DEFAULT_TELNETD
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TELNETD_STANDALONE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TELNETD_INETD_WAIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_TFTP
+	bool
+	default n
+config BUSYBOX_DEFAULT_TFTPD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TFTP_GET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TFTP_PUT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TFTP_BLOCKSIZE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TFTP_PROGRESS_BAR
+	bool
+	default n
+config BUSYBOX_DEFAULT_TFTP_DEBUG
+	bool
+	default n
+config BUSYBOX_DEFAULT_TRACEROUTE
+	bool
+	default y
+config BUSYBOX_DEFAULT_TRACEROUTE6
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_VERBOSE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_SOURCE_ROUTE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_USE_ICMP
+	bool
+	default n
+config BUSYBOX_DEFAULT_TUNCTL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TUNCTL_UG
+	bool
+	default n
+config BUSYBOX_DEFAULT_UDHCPC6
+	bool
+	default n
+config BUSYBOX_DEFAULT_UDHCPD
+	bool
+	default n
+config BUSYBOX_DEFAULT_DHCPRELAY
+	bool
+	default n
+config BUSYBOX_DEFAULT_DUMPLEASES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_UDHCPD_WRITE_LEASES_EARLY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_UDHCPD_BASE_IP_ON_MAC
+	bool
+	default n
+config BUSYBOX_DEFAULT_DHCPD_LEASES_FILE
+	string
+	default ""
+config BUSYBOX_DEFAULT_UDHCPC
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_UDHCPC_ARPING
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_UDHCP_PORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_UDHCP_DEBUG
+	int
+	default 0
+config BUSYBOX_DEFAULT_FEATURE_UDHCP_RFC3397
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_UDHCP_8021Q
+	bool
+	default n
+config BUSYBOX_DEFAULT_UDHCPC_DEFAULT_SCRIPT
+	string
+	default "/usr/share/udhcpc/default.script"
+config BUSYBOX_DEFAULT_UDHCPC_SLACK_FOR_BUGGY_SERVERS
+	int
+	default 80
+config BUSYBOX_DEFAULT_IFUPDOWN_UDHCPC_CMD_OPTIONS
+	string
+	default ""
+config BUSYBOX_DEFAULT_UDPSVD
+	bool
+	default n
+config BUSYBOX_DEFAULT_VCONFIG
+	bool
+	default y
+config BUSYBOX_DEFAULT_WGET
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
+	bool
+	default n
+config BUSYBOX_DEFAULT_ZCIP
+	bool
+	default n
+config BUSYBOX_DEFAULT_LPD
+	bool
+	default n
+config BUSYBOX_DEFAULT_LPR
+	bool
+	default n
+config BUSYBOX_DEFAULT_LPQ
+	bool
+	default n
+config BUSYBOX_DEFAULT_MAKEMIME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MIME_CHARSET
+	string
+	default ""
+config BUSYBOX_DEFAULT_POPMAILDIR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_POPMAILDIR_DELIVERY
+	bool
+	default n
+config BUSYBOX_DEFAULT_REFORMIME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_REFORMIME_COMPAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_SENDMAIL
+	bool
+	default n
+config BUSYBOX_DEFAULT_IOSTAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_LSOF
+	bool
+	default n
+config BUSYBOX_DEFAULT_MPSTAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_NMETER
+	bool
+	default n
+config BUSYBOX_DEFAULT_PMAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_POWERTOP
+	bool
+	default n
+config BUSYBOX_DEFAULT_PSTREE
+	bool
+	default n
+config BUSYBOX_DEFAULT_PWDX
+	bool
+	default n
+config BUSYBOX_DEFAULT_SMEMCAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_TOP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TOP_SMP_CPU
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TOP_DECIMALS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TOP_SMP_PROCESS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TOPMEM
+	bool
+	default n
+config BUSYBOX_DEFAULT_UPTIME
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_UPTIME_UTMP_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FREE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FUSER
+	bool
+	default n
+config BUSYBOX_DEFAULT_KILL
+	bool
+	default y
+config BUSYBOX_DEFAULT_KILLALL
+	bool
+	default y
+config BUSYBOX_DEFAULT_KILLALL5
+	bool
+	default n
+config BUSYBOX_DEFAULT_PGREP
+	bool
+	default y
+config BUSYBOX_DEFAULT_PIDOF
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_PIDOF_SINGLE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PIDOF_OMIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_PKILL
+	bool
+	default n
+config BUSYBOX_DEFAULT_PS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_PS_WIDE
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_PS_LONG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PS_TIME
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PS_ADDITIONAL_COLUMNS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PS_UNUSUAL_SYSTEMS
+	bool
+	default n
+config BUSYBOX_DEFAULT_RENICE
+	bool
+	default n
+config BUSYBOX_DEFAULT_BB_SYSCTL
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SHOW_THREADS
+	bool
+	default n
+config BUSYBOX_DEFAULT_WATCH
+	bool
+	default n
+config BUSYBOX_DEFAULT_RUNSV
+	bool
+	default n
+config BUSYBOX_DEFAULT_RUNSVDIR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_RUNSVDIR_LOG
+	bool
+	default n
+config BUSYBOX_DEFAULT_SV
+	bool
+	default n
+config BUSYBOX_DEFAULT_SV_DEFAULT_SERVICE_DIR
+	string
+	default ""
+config BUSYBOX_DEFAULT_SVLOGD
+	bool
+	default n
+config BUSYBOX_DEFAULT_CHPST
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETUIDGID
+	bool
+	default n
+config BUSYBOX_DEFAULT_ENVUIDGID
+	bool
+	default n
+config BUSYBOX_DEFAULT_ENVDIR
+	bool
+	default n
+config BUSYBOX_DEFAULT_SOFTLIMIT
+	bool
+	default n
+config BUSYBOX_DEFAULT_CHCON
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHCON_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_GETENFORCE
+	bool
+	default n
+config BUSYBOX_DEFAULT_GETSEBOOL
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOAD_POLICY
+	bool
+	default n
+config BUSYBOX_DEFAULT_MATCHPATHCON
+	bool
+	default n
+config BUSYBOX_DEFAULT_RESTORECON
+	bool
+	default n
+config BUSYBOX_DEFAULT_RUNCON
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_RUNCON_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_SELINUXENABLED
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETENFORCE
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETFILES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SETFILES_CHECK_OPTION
+	bool
+	default n
+config BUSYBOX_DEFAULT_SETSEBOOL
+	bool
+	default n
+config BUSYBOX_DEFAULT_SESTATUS
+	bool
+	default n
+config BUSYBOX_DEFAULT_ASH
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_BASH_COMPAT
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_IDLE_TIMEOUT
+	bool
+	default n
+config BUSYBOX_DEFAULT_ASH_JOB_CONTROL
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_ALIAS
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_GETOPTS
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_BUILTIN_ECHO
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_BUILTIN_PRINTF
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_BUILTIN_TEST
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_CMDCMD
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_MAIL
+	bool
+	default n
+config BUSYBOX_DEFAULT_ASH_OPTIMIZE_FOR_SIZE
+	bool
+	default n
+config BUSYBOX_DEFAULT_ASH_RANDOM_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_ASH_EXPAND_PRMT
+	bool
+	default y
+config BUSYBOX_DEFAULT_CTTYHACK
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_BASH_COMPAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_BRACE_EXPANSION
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_HELP
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_INTERACTIVE
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_SAVEHISTORY
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_JOB
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_TICK
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_IF
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_LOOPS
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_CASE
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_FUNCTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_LOCAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_RANDOM_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_EXPORT_N
+	bool
+	default n
+config BUSYBOX_DEFAULT_HUSH_MODE_X
+	bool
+	default n
+config BUSYBOX_DEFAULT_MSH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SH_IS_ASH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SH_IS_HUSH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SH_IS_NONE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BASH_IS_ASH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BASH_IS_HUSH
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_BASH_IS_NONE
+	bool
+	default y
+config BUSYBOX_DEFAULT_SH_MATH_SUPPORT
+	bool
+	default y
+config BUSYBOX_DEFAULT_SH_MATH_SUPPORT_64
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SH_EXTRA_QUIET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SH_STANDALONE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SH_NOFORK
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SH_HISTFILESIZE
+	bool
+	default n
+config BUSYBOX_DEFAULT_SYSLOGD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_ROTATE_LOGFILE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_REMOTE_LOG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SYSLOGD_DUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SYSLOGD_CFG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SYSLOGD_READ_BUFFER_SIZE
+	int
+	default 0
+config BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG_BUFFER_SIZE
+	int
+	default 0
+config BUSYBOX_DEFAULT_LOGREAD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LOGREAD_REDUCED_LOCKING
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG
+	bool
+	default n
+config BUSYBOX_DEFAULT_KLOGD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_KLOGD_KLOGCTL
+	bool
+	default n
+config BUSYBOX_DEFAULT_LOGGER
+	bool
+	default y
diff --git a/trunk/package/utils/busybox/Config.in b/trunk/package/utils/busybox/Config.in
new file mode 100644
index 00000000..142a5f69
--- /dev/null
+++ b/trunk/package/utils/busybox/Config.in
@@ -0,0 +1,26 @@
+if PACKAGE_busybox
+
+config BUSYBOX_CUSTOM
+	bool "Customize busybox options"
+	default n
+        help
+          Enabling this allows full customization of busybox settings.
+          Note that there are many options here that can result in a build
+          that doesn't work properly.  Enabling customization will mark your
+          build as "tainted" for the purpose of bug reports.
+          See the variables written to /etc/librecmc_release
+
+          Unless you know what you are doing, you should leave this as 'n'
+
+	source "package/utils/busybox/Config-defaults.in"
+
+	if BUSYBOX_CUSTOM
+	source "package/utils/busybox/config/Config.in"
+	endif
+
+config BUSYBOX_USE_LIBRPC
+	bool
+	default y if BUSYBOX_CUSTOM && BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+	default y if !BUSYBOX_CUSTOM && BUSYBOX_DEFAULT_FEATURE_HAVE_RPC
+
+endif
diff --git a/trunk/package/utils/busybox/Makefile b/trunk/package/utils/busybox/Makefile
new file mode 100644
index 00000000..74802a65
--- /dev/null
+++ b/trunk/package/utils/busybox/Makefile
@@ -0,0 +1,123 @@
+# 
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=busybox
+PKG_VERSION:=1.22.1
+PKG_RELEASE:=5
+PKG_FLAGS:=essential
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.busybox.net/downloads \
+		http://distfiles.gentoo.org/distfiles/
+PKG_MD5SUM:=337d1a15ab1cb1d4ed423168b1eb7d7e
+
+PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam
+PKG_BUILD_PARALLEL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=LICENSE archival/libarchive/bz/LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(DUMP),)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s)
+endif
+
+ifneq ($(findstring c,$(LIBRECMC_VERBOSE)),)
+  BB_MAKE_VERBOSE := V=1
+else
+  BB_MAKE_VERBOSE :=
+endif
+
+define Package/busybox
+  SECTION:=base
+  CATEGORY:=Base system
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+  TITLE:=Core utilities for embedded Linux
+  URL:=http://busybox.net/
+  DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam
+  MENU:=1
+endef
+
+define Package/busybox/description
+ The Swiss Army Knife of embedded Linux.
+ It slices, it dices, it makes Julian Fries.
+endef
+
+define Package/busybox/config
+	source "$(SOURCE)/Config.in"
+endef
+
+BUSYBOX_SYM=$(if $(CONFIG_BUSYBOX_CUSTOM),CONFIG,DEFAULT)
+
+define Build/Configure
+	rm -f $(PKG_BUILD_DIR)/.configured*
+	grep 'CONFIG_BUSYBOX_$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_\\2,g" > $(PKG_BUILD_DIR)/.config
+	yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		KBUILD_HAVE_NLS=no \
+		ARCH="$(ARCH)" \
+		$(BB_MAKE_VERBOSE) \
+		oldconfig
+endef
+
+ifdef CONFIG_GCC_VERSION_LLVM
+  TARGET_CFLAGS += -fnested-functions
+endif
+
+LDLIBS:=m crypt
+ifdef CONFIG_BUSYBOX_USE_LIBRPC
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+  export LDFLAGS=$(TARGET_LDFLAGS)
+  LDLIBS += rpc
+endif
+
+ifdef CONFIG_BUSYBOX_CONFIG_PAM
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+  export LDFLAGS=$(TARGET_LDFLAGS)
+  LDLIBS += pam pam_misc pthread
+endif
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		KBUILD_HAVE_NLS=no \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(ARCH)" \
+		SKIP_STRIP=y \
+		LDLIBS="$(LDLIBS)" \
+		$(BB_MAKE_VERBOSE) \
+		all
+	rm -rf $(PKG_INSTALL_DIR)
+	$(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \;
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(ARCH)" \
+		CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \
+		LDLIBS="$(LDLIBS)" \
+		$(BB_MAKE_VERBOSE) \
+		install
+endef
+
+define Package/busybox/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(INSTALL_BIN) ./files/cron $(1)/etc/init.d/cron
+	$(INSTALL_BIN) ./files/telnet $(1)/etc/init.d/telnet
+	$(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd
+	$(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug
+	-rm -rf $(1)/lib64
+endef
+
+$(eval $(call BuildPackage,busybox))
diff --git a/trunk/package/utils/busybox/config/Config.in b/trunk/package/utils/busybox/config/Config.in
new file mode 100644
index 00000000..71ba45b9
--- /dev/null
+++ b/trunk/package/utils/busybox/config/Config.in
@@ -0,0 +1,818 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+
+config BUSYBOX_CONFIG_HAVE_DOT_CONFIG
+	bool
+	default BUSYBOX_DEFAULT_HAVE_DOT_CONFIG
+
+menu "Busybox Settings"
+
+menu "General Configuration"
+
+config BUSYBOX_CONFIG_DESKTOP
+	bool "Enable options for full-blown desktop systems"
+	default BUSYBOX_DEFAULT_DESKTOP
+	help
+	  Enable options and features which are not essential.
+	  Select this only if you plan to use busybox on full-blown
+	  desktop machine with common Linux distro, not on an embedded box.
+
+config BUSYBOX_CONFIG_EXTRA_COMPAT
+	bool "Provide compatible behavior for rare corner cases (bigger code)"
+	default BUSYBOX_DEFAULT_EXTRA_COMPAT
+	help
+	  This option makes grep, sed etc handle rare corner cases
+	  (embedded NUL bytes and such). This makes code bigger and uses
+	  some GNU extensions in libc. You probably only need this option
+	  if you plan to run busybox on desktop.
+
+config BUSYBOX_CONFIG_INCLUDE_SUSv2
+	bool "Enable obsolete features removed before SUSv3"
+	default BUSYBOX_DEFAULT_INCLUDE_SUSv2
+	help
+	  This option will enable backwards compatibility with SuSv2,
+	  specifically, old-style numeric options ('command -1 <file>')
+	  will be supported in head, tail, and fold. (Note: should
+	  affect renice too.)
+
+config BUSYBOX_CONFIG_USE_PORTABLE_CODE
+	bool "Avoid using GCC-specific code constructs"
+	default BUSYBOX_DEFAULT_USE_PORTABLE_CODE
+	help
+	  Use this option if you are trying to compile busybox with
+	  compiler other than gcc.
+	  If you do use gcc, this option may needlessly increase code size.
+
+config BUSYBOX_CONFIG_PLATFORM_LINUX
+	bool "Enable Linux-specific applets and features"
+	default BUSYBOX_DEFAULT_PLATFORM_LINUX
+	help
+	  For the most part, busybox requires only POSIX compatibility
+	  from the target system, but some applets and features use
+	  Linux-specific interfaces.
+
+	  Answering 'N' here will disable such applets and hide the
+	  corresponding configuration options.
+
+choice
+	prompt "Buffer allocation policy"
+	default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK
+	help
+	  There are 3 ways BusyBox can handle buffer allocations:
+	  - Use malloc. This costs code size for the call to xmalloc.
+	  - Put them on stack. For some very small machines with limited stack
+	    space, this can be deadly. For most folks, this works just fine.
+	  - Put them in BSS. This works beautifully for computers with a real
+	    MMU (and OS support), but wastes runtime RAM for uCLinux. This
+	    behavior was the only one available for BusyBox versions 0.48 and
+	    earlier.
+
+config BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC
+	bool "Allocate with Malloc"
+
+config BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK
+	bool "Allocate on the Stack"
+
+config BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS
+	bool "Allocate in the .bss section"
+
+endchoice
+
+config BUSYBOX_CONFIG_SHOW_USAGE
+	bool "Show applet usage messages"
+	default BUSYBOX_DEFAULT_SHOW_USAGE
+	help
+	  Enabling this option, BusyBox applets will show terse help messages
+	  when invoked with wrong arguments.
+	  If you do not want to show any (helpful) usage message when
+	  issuing wrong command syntax, you can say 'N' here,
+	  saving approximately 7k.
+
+config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE
+	bool "Show verbose applet usage messages"
+	default BUSYBOX_DEFAULT_FEATURE_VERBOSE_USAGE
+	depends on BUSYBOX_CONFIG_SHOW_USAGE
+	help
+	  All BusyBox applets will show verbose help messages when
+	  busybox is invoked with --help. This will add a lot of text to the
+	  busybox binary. In the default configuration, this will add about
+	  13k, but it can add much more depending on your configuration.
+
+config BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE
+	bool "Store applet usage messages in compressed form"
+	default BUSYBOX_DEFAULT_FEATURE_COMPRESS_USAGE
+	depends on BUSYBOX_CONFIG_SHOW_USAGE
+	help
+	  Store usage messages in .bz compressed form, uncompress them
+	  on-the-fly when <applet> --help is called.
+
+	  If you have a really tiny busybox with few applets enabled (and
+	  bunzip2 isn't one of them), the overhead of the decompressor might
+	  be noticeable. Also, if you run executables directly from ROM
+	  and have very little memory, this might not be a win. Otherwise,
+	  you probably want this.
+
+config BUSYBOX_CONFIG_FEATURE_INSTALLER
+	bool "Support --install [-s] to install applet links at runtime"
+	default BUSYBOX_DEFAULT_FEATURE_INSTALLER
+	help
+	  Enable 'busybox --install [-s]' support. This will allow you to use
+	  busybox at runtime to create hard links or symlinks for all the
+	  applets that are compiled into busybox.
+
+config BUSYBOX_CONFIG_INSTALL_NO_USR
+	bool "Don't use /usr"
+	default BUSYBOX_DEFAULT_INSTALL_NO_USR
+	help
+	  Disable use of /usr. busybox --install and "make install"
+	  will install applets only to /bin and /sbin,
+	  never to /usr/bin or /usr/sbin.
+
+config BUSYBOX_CONFIG_LOCALE_SUPPORT
+	bool "Enable locale support (system needs locale for this to work)"
+	default BUSYBOX_DEFAULT_LOCALE_SUPPORT
+	help
+	  Enable this if your system has locale support and you would like
+	  busybox to support locale settings.
+
+config BUSYBOX_CONFIG_UNICODE_SUPPORT
+	bool "Support Unicode"
+	default BUSYBOX_DEFAULT_UNICODE_SUPPORT
+	help
+	  This makes various applets aware that one byte is not
+	  one character on screen.
+
+	  Busybox aims to eventually work correctly with Unicode displays.
+	  Any older encodings are not guaranteed to work.
+	  Probably by the time when busybox will be fully Unicode-clean,
+	  other encodings will be mainly of historic interest.
+
+config BUSYBOX_CONFIG_UNICODE_USING_LOCALE
+	bool "Use libc routines for Unicode (else uses internal ones)"
+	default BUSYBOX_DEFAULT_UNICODE_USING_LOCALE
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT && BUSYBOX_CONFIG_LOCALE_SUPPORT
+	help
+	  With this option on, Unicode support is implemented using libc
+	  routines. Otherwise, internal implementation is used.
+	  Internal implementation is smaller.
+
+config BUSYBOX_CONFIG_FEATURE_CHECK_UNICODE_IN_ENV
+	bool "Check $LC_ALL, $LC_CTYPE and $LANG environment variables"
+	default BUSYBOX_DEFAULT_FEATURE_CHECK_UNICODE_IN_ENV
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT && !BUSYBOX_CONFIG_UNICODE_USING_LOCALE
+	help
+	  With this option on, Unicode support is activated
+	  only if locale-related variables have the value of the form
+	  "xxxx.utf8"
+
+	  Otherwise, Unicode support will be always enabled and active.
+
+config BUSYBOX_CONFIG_SUBST_WCHAR
+	int "Character code to substitute unprintable characters with"
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+	default BUSYBOX_DEFAULT_SUBST_WCHAR
+	help
+	  Typical values are 63 for '?' (works with any output device),
+	  30 for ASCII substitute control code,
+	  65533 (0xfffd) for Unicode replacement character.
+
+config BUSYBOX_CONFIG_LAST_SUPPORTED_WCHAR
+	int "Range of supported Unicode characters"
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+	default BUSYBOX_DEFAULT_LAST_SUPPORTED_WCHAR
+	help
+	  Any character with Unicode value bigger than this is assumed
+	  to be non-printable on output device. Many applets replace
+	  such chars with substitution character.
+
+	  The idea is that many valid printable Unicode chars are
+	  nevertheless are not displayed correctly. Think about
+	  combining charachers, double-wide hieroglyphs, obscure
+	  characters in dozens of ancient scripts...
+	  Many terminals, terminal emulators, xterms etc will fail
+	  to handle them correctly. Choose the smallest value
+	  which suits your needs.
+
+	  Typical values are:
+	  126 - ASCII only
+	  767 (0x2ff) - there are no combining chars in [0..767] range
+			(the range includes Latin 1, Latin Ext. A and B),
+			code is ~700 bytes smaller for this case.
+	  4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
+			code is ~300 bytes smaller for this case.
+	  12799 (0x31ff) - nearly all non-ideographic characters are
+			available in [0..12799] range, including
+			East Asian scripts like katakana, hiragana, hangul,
+			bopomofo...
+	  0 - off, any valid printable Unicode character will be printed.
+
+config BUSYBOX_CONFIG_UNICODE_COMBINING_WCHARS
+	bool "Allow zero-width Unicode characters on output"
+	default BUSYBOX_DEFAULT_UNICODE_COMBINING_WCHARS
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+	help
+	  With this option off, any Unicode char with width of 0
+	  is substituted on output.
+
+config BUSYBOX_CONFIG_UNICODE_WIDE_WCHARS
+	bool "Allow wide Unicode characters on output"
+	default BUSYBOX_DEFAULT_UNICODE_WIDE_WCHARS
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+	help
+	  With this option off, any Unicode char with width > 1
+	  is substituted on output.
+
+config BUSYBOX_CONFIG_UNICODE_BIDI_SUPPORT
+	bool "Bidirectional character-aware line input"
+	default BUSYBOX_DEFAULT_UNICODE_BIDI_SUPPORT
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT && !BUSYBOX_CONFIG_UNICODE_USING_LOCALE
+	help
+	  With this option on, right-to-left Unicode characters
+	  are treated differently on input (e.g. cursor movement).
+
+config BUSYBOX_CONFIG_UNICODE_NEUTRAL_TABLE
+	bool "In bidi input, support non-ASCII neutral chars too"
+	default BUSYBOX_DEFAULT_UNICODE_NEUTRAL_TABLE
+	depends on BUSYBOX_CONFIG_UNICODE_BIDI_SUPPORT
+	help
+	  In most cases it's enough to treat only ASCII non-letters
+	  (i.e. punctuation, numbers and space) as characters
+	  with neutral directionality.
+	  With this option on, more extensive (and bigger) table
+	  of neutral chars will be used.
+
+config BUSYBOX_CONFIG_UNICODE_PRESERVE_BROKEN
+	bool "Make it possible to enter sequences of chars which are not Unicode"
+	default BUSYBOX_DEFAULT_UNICODE_PRESERVE_BROKEN
+	depends on BUSYBOX_CONFIG_UNICODE_SUPPORT
+	help
+	  With this option on, on line-editing input (such as used by shells)
+	  invalid UTF-8 bytes are not substituted with the selected
+	  substitution character.
+	  For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
+	  at shell prompt will list file named 0xff (single char name
+	  with char value 255), not file named '?'.
+
+config BUSYBOX_CONFIG_LONG_OPTS
+	bool "Support for --long-options"
+	default BUSYBOX_DEFAULT_LONG_OPTS
+	help
+	  Enable this if you want busybox applets to use the gnu --long-option
+	  style, in addition to single character -a -b -c style options.
+
+config BUSYBOX_CONFIG_FEATURE_DEVPTS
+	bool "Use the devpts filesystem for Unix98 PTYs"
+	default BUSYBOX_DEFAULT_FEATURE_DEVPTS
+	help
+	  Enable if you want BusyBox to use Unix98 PTY support. If enabled,
+	  busybox will use /dev/ptmx for the master side of the pseudoterminal
+	  and /dev/pts/<number> for the slave side. Otherwise, BSD style
+	  /dev/ttyp<number> will be used. To use this option, you should have
+	  devpts mounted.
+
+config BUSYBOX_CONFIG_FEATURE_CLEAN_UP
+	bool "Clean up all memory before exiting (usually not needed)"
+	default BUSYBOX_DEFAULT_FEATURE_CLEAN_UP
+	help
+	  As a size optimization, busybox normally exits without explicitly
+	  freeing dynamically allocated memory or closing files. This saves
+	  space since the OS will clean up for us, but it can confuse debuggers
+	  like valgrind, which report tons of memory and resource leaks.
+
+	  Don't enable this unless you have a really good reason to clean
+	  things up manually.
+
+config BUSYBOX_CONFIG_FEATURE_UTMP
+	bool "Support utmp file"
+	default BUSYBOX_DEFAULT_FEATURE_UTMP
+	help
+	  The file /var/run/utmp is used to track who is currently logged in.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will create and delete entries there.
+	  "who" applet requires this option.
+
+config BUSYBOX_CONFIG_FEATURE_WTMP
+	bool "Support wtmp file"
+	default BUSYBOX_DEFAULT_FEATURE_WTMP
+	depends on BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	  The file /var/run/wtmp is used to track when users have logged into
+	  and logged out of the system.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will append new entries there.
+	  "last" applet requires this option.
+
+config BUSYBOX_CONFIG_FEATURE_PIDFILE
+	bool "Support writing pidfiles"
+	default BUSYBOX_DEFAULT_FEATURE_PIDFILE
+	help
+	  This option makes some applets (e.g. crond, syslogd, inetd) write
+	  a pidfile at the configured PID_FILE_PATH.  It has no effect
+	  on applets which require pidfiles to run.
+
+config BUSYBOX_CONFIG_PID_FILE_PATH
+	string "Path to directory for pidfile"
+	default BUSYBOX_DEFAULT_PID_FILE_PATH
+	depends on BUSYBOX_CONFIG_FEATURE_PIDFILE
+	help
+	  This is the default path where pidfiles are created.  Applets which
+	  allow you to set the pidfile path on the command line will override
+	  this value.  The option has no effect on applets that require you to
+	  specify a pidfile path.
+
+config BUSYBOX_CONFIG_FEATURE_SUID
+	bool "Support for SUID/SGID handling"
+	default BUSYBOX_DEFAULT_FEATURE_SUID
+	help
+	  With this option you can install the busybox binary belonging
+	  to root with the suid bit set, enabling some applets to perform
+	  root-level operations even when run by ordinary users
+	  (for example, mounting of user mounts in fstab needs this).
+
+	  Busybox will automatically drop privileges for applets
+	  that don't need root access.
+
+	  If you are really paranoid and don't want to do this, build two
+	  busybox binaries with different applets in them (and the appropriate
+	  symlinks pointing to each binary), and only set the suid bit on the
+	  one that needs it.
+
+	  The applets which require root rights (need suid bit or
+	  to be run by root) and will refuse to execute otherwise:
+	  crontab, login, passwd, su, vlock, wall.
+
+	  The applets which will use root rights if they have them
+	  (via suid bit, or because run by root), but would try to work
+	  without root right nevertheless:
+	  findfs, ping[6], traceroute[6], mount.
+
+	  Note that if you DONT select this option, but DO make busybox
+	  suid root, ALL applets will run under root, which is a huge
+	  security hole (think "cp /some/file /etc/passwd").
+
+config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
+	bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
+	default BUSYBOX_DEFAULT_FEATURE_SUID_CONFIG
+	depends on BUSYBOX_CONFIG_FEATURE_SUID
+	help
+	  Allow the SUID / SGID state of an applet to be determined at runtime
+	  by checking /etc/busybox.conf. (This is sort of a poor man's sudo.)
+	  The format of this file is as follows:
+
+	  APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
+
+	  s: USER or GROUP is allowed to execute APPLET.
+	     APPLET will run under USER or GROUP
+	     (reagardless of who's running it).
+	  S: USER or GROUP is NOT allowed to execute APPLET.
+	     APPLET will run under USER or GROUP.
+	     This option is not very sensical.
+	  x: USER/GROUP/others are allowed to execute APPLET.
+	     No UID/GID change will be done when it is run.
+	  -: USER/GROUP/others are not allowed to execute APPLET.
+
+	  An example might help:
+
+	  [SUID]
+	  su = ssx root.0 # applet su can be run by anyone and runs with
+	                  # euid=0/egid=0
+	  su = ssx        # exactly the same
+
+	  mount = sx- root.disk # applet mount can be run by root and members
+	                        # of group disk (but not anyone else)
+	                        # and runs with euid=0 (egid is not changed)
+
+	  cp = --- # disable applet cp for everyone
+
+	  The file has to be owned by user root, group root and has to be
+	  writeable only by root:
+	        (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
+	  The busybox executable has to be owned by user root, group
+	  root and has to be setuid root for this to work:
+	        (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+
+	  Robert 'sandman' Griebl has more information here:
+	  <url: http://www.softforge.de/bb/suid.html >.
+
+config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG_QUIET
+	bool "Suppress warning message if /etc/busybox.conf is not readable"
+	default BUSYBOX_DEFAULT_FEATURE_SUID_CONFIG_QUIET
+	depends on BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
+	help
+	  /etc/busybox.conf should be readable by the user needing the SUID,
+	  check this option to avoid users to be notified about missing
+	  permissions.
+
+config BUSYBOX_CONFIG_SELINUX
+	bool "Support NSA Security Enhanced Linux"
+	default BUSYBOX_DEFAULT_SELINUX
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Enable support for SELinux in applets ls, ps, and id. Also provide
+	  the option of compiling in SELinux applets.
+
+	  If you do not have a complete SELinux userland installed, this stuff
+	  will not compile. Go visit
+		http://www.nsa.gov/selinux/index.html
+	  to download the necessary stuff to allow busybox to compile with
+	  this option enabled. Specifially, libselinux 1.28 or better is
+	  directly required by busybox. If the installation is located in a
+	  non-standard directory, provide it by invoking make as follows:
+		CFLAGS=-I<libselinux-include-path> \
+		LDFLAGS=-L<libselinux-lib-path> \
+		make
+
+	  Most people will leave this set to 'N'.
+
+config BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS
+	bool "exec prefers applets"
+	default BUSYBOX_DEFAULT_FEATURE_PREFER_APPLETS
+	help
+	  This is an experimental option which directs applets about to
+	  call 'exec' to try and find an applicable busybox applet before
+	  searching the PATH. This is typically done by exec'ing
+	  /proc/self/exe.
+	  This may affect shell, find -exec, xargs and similar applets.
+	  They will use applets even if /bin/<applet> -> busybox link
+	  is missing (or is not a link to busybox). However, this causes
+	  problems in chroot jails without mounted /proc and with ps/top
+	  (command name can be shown as 'exe' for applets started this way).
+
+config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
+	string "Path to BusyBox executable"
+	default BUSYBOX_DEFAULT_BUSYBOX_EXEC_PATH
+	help
+	  When Busybox applets need to run other busybox applets, BusyBox
+	  sometimes needs to exec() itself. When the /proc filesystem is
+	  mounted, /proc/self/exe always points to the currently running
+	  executable. If you haven't got /proc, set this to wherever you
+	  want to run BusyBox from.
+
+# These are auto-selected by other options
+
+config BUSYBOX_CONFIG_FEATURE_SYSLOG
+	bool #No description makes it a hidden option
+	default BUSYBOX_DEFAULT_FEATURE_SYSLOG
+	#help
+	#  This option is auto-selected when you select any applet which may
+	#  send its output to syslog. You do not need to select it manually.
+
+config BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+	bool #No description makes it a hidden option
+	default BUSYBOX_DEFAULT_FEATURE_HAVE_RPC
+	#help
+	#  This is automatically selected if any of enabled applets need it.
+	#  You do not need to select it manually.
+
+endmenu
+
+menu 'Build Options'
+
+config BUSYBOX_CONFIG_STATIC
+	bool "Build BusyBox as a static binary (no shared libs)"
+	default BUSYBOX_DEFAULT_STATIC
+	help
+	  If you want to build a static BusyBox binary, which does not
+	  use or require any shared libraries, then enable this option.
+	  This can cause BusyBox to be considerably larger, so you should
+	  leave this option false unless you have a good reason (i.e.
+	  your target platform does not support shared libraries, or
+	  you are building an initrd which doesn't need anything but
+	  BusyBox, etc).
+
+	  Most people will leave this set to 'N'.
+
+config BUSYBOX_CONFIG_PIE
+	bool "Build BusyBox as a position independent executable"
+	default BUSYBOX_DEFAULT_PIE
+	depends on !BUSYBOX_CONFIG_STATIC
+	help
+	  Hardened code option. PIE binaries are loaded at a different
+	  address at each invocation. This has some overhead,
+	  particularly on x86-32 which is short on registers.
+
+	  Most people will leave this set to 'N'.
+
+config BUSYBOX_CONFIG_NOMMU
+	bool "Force NOMMU build"
+	default BUSYBOX_DEFAULT_NOMMU
+	help
+	  Busybox tries to detect whether architecture it is being
+	  built against supports MMU or not. If this detection fails,
+	  or if you want to build NOMMU version of busybox for testing,
+	  you may force NOMMU build here.
+
+	  Most people will leave this set to 'N'.
+
+# PIE can be made to work with BUILD_LIBBUSYBOX, but currently
+# build system does not support that
+config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+	bool "Build shared libbusybox"
+	default BUSYBOX_DEFAULT_BUILD_LIBBUSYBOX
+	depends on !BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS && !BUSYBOX_CONFIG_PIE && !BUSYBOX_CONFIG_STATIC
+	help
+	  Build a shared library libbusybox.so.N.N.N which contains all
+	  busybox code.
+
+	  This feature allows every applet to be built as a tiny
+	  separate executable. Enabling it for "one big busybox binary"
+	  approach serves no purpose and increases code size.
+	  You should almost certainly say "no" to this.
+
+### config FEATURE_FULL_LIBBUSYBOX
+###	bool "Feature-complete libbusybox"
+###	default n if !FEATURE_SHARED_BUSYBOX
+###	depends on BUILD_LIBBUSYBOX
+###	help
+###	  Build a libbusybox with the complete feature-set, disregarding
+###	  the actually selected config.
+###
+###	  Normally, libbusybox will only contain the features which are
+###	  used by busybox itself. If you plan to write a separate
+###	  standalone application which uses libbusybox say 'Y'.
+###
+###	  Note: libbusybox is GPL, not LGPL, and exports no stable API that
+###	  might act as a copyright barrier. We can and will modify the
+###	  exported function set between releases (even minor version number
+###	  changes), and happily break out-of-tree features.
+###
+###	  Say 'N' if in doubt.
+
+config BUSYBOX_CONFIG_FEATURE_INDIVIDUAL
+	bool "Produce a binary for each applet, linked against libbusybox"
+	default BUSYBOX_DEFAULT_FEATURE_INDIVIDUAL
+	depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+	help
+	  If your CPU architecture doesn't allow for sharing text/rodata
+	  sections of running binaries, but allows for runtime dynamic
+	  libraries, this option will allow you to reduce memory footprint
+	  when you have many different applets running at once.
+
+	  If your CPU architecture allows for sharing text/rodata,
+	  having single binary is more optimal.
+
+	  Each applet will be a tiny program, dynamically linked
+	  against libbusybox.so.N.N.N.
+
+	  You need to have a working dynamic linker.
+
+config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
+	bool "Produce additional busybox binary linked against libbusybox"
+	default BUSYBOX_DEFAULT_FEATURE_SHARED_BUSYBOX
+	depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
+	help
+	  Build busybox, dynamically linked against libbusybox.so.N.N.N.
+
+	  You need to have a working dynamic linker.
+
+### config BUILD_AT_ONCE
+###	bool "Compile all sources at once"
+###	default n
+###	help
+###	  Normally each source-file is compiled with one invocation of
+###	  the compiler.
+###	  If you set this option, all sources are compiled at once.
+###	  This gives the compiler more opportunities to optimize which can
+###	  result in smaller and/or faster binaries.
+###
+###	  Setting this option will consume alot of memory, e.g. if you
+###	  enable all applets with all features, gcc uses more than 300MB
+###	  RAM during compilation of busybox.
+###
+###	  This option is most likely only beneficial for newer compilers
+###	  such as gcc-4.1 and above.
+###
+###	  Say 'N' unless you know what you are doing.
+
+config BUSYBOX_CONFIG_LFS
+	bool
+	default BUSYBOX_DEFAULT_LFS
+	help
+	  If you want to build BusyBox with large file support, then enable
+	  this option. This will have no effect if your kernel or your C
+	  library lacks large file support for large files. Some of the
+	  programs that can benefit from large file support include dd, gzip,
+	  cp, mount, tar, and many others. If you want to access files larger
+	  than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'.
+
+config BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX
+	string "Cross Compiler prefix"
+	default BUSYBOX_DEFAULT_CROSS_COMPILER_PREFIX
+	help
+	  If you want to build BusyBox with a cross compiler, then you
+	  will need to set this to the cross-compiler prefix, for example,
+	  "i386-uclibc-".
+
+	  Note that CROSS_COMPILE environment variable or
+	  "make CROSS_COMPILE=xxx ..." will override this selection.
+
+	  Native builds leave this empty.
+
+config BUSYBOX_CONFIG_SYSROOT
+	string "Path to sysroot"
+	default BUSYBOX_DEFAULT_SYSROOT
+	help
+	  If you want to build BusyBox with a cross compiler, then you
+	  might also need to specify where /usr/include and /usr/lib
+	  will be found.
+
+	  For example, BusyBox can be built against an installed
+	  Android NDK, platform version 9, for ARM ABI with
+
+	  CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
+
+	  Native builds leave this empty.
+
+config BUSYBOX_CONFIG_EXTRA_CFLAGS
+	string "Additional CFLAGS"
+	default BUSYBOX_DEFAULT_EXTRA_CFLAGS
+	help
+	  Additional CFLAGS to pass to the compiler verbatim.
+
+config BUSYBOX_CONFIG_EXTRA_LDFLAGS
+	string "Additional LDFLAGS"
+	default BUSYBOX_DEFAULT_EXTRA_LDFLAGS
+	help
+	  Additional LDFLAGS to pass to the linker verbatim.
+
+config BUSYBOX_CONFIG_EXTRA_LDLIBS
+	string "Additional LDLIBS"
+	default BUSYBOX_DEFAULT_EXTRA_LDLIBS
+	help
+	  Additional LDLIBS to pass to the linker with -l.
+
+endmenu
+
+menu 'Debugging Options'
+
+config BUSYBOX_CONFIG_DEBUG
+	bool "Build BusyBox with extra Debugging symbols"
+	default BUSYBOX_DEFAULT_DEBUG
+	help
+	  Say Y here if you wish to examine BusyBox internals while applets are
+	  running. This increases the size of the binary considerably, and
+	  should only be used when doing development. If you are doing
+	  development and want to debug BusyBox, answer Y.
+
+	  Most people should answer N.
+
+config BUSYBOX_CONFIG_DEBUG_PESSIMIZE
+	bool "Disable compiler optimizations"
+	default BUSYBOX_DEFAULT_DEBUG_PESSIMIZE
+	depends on BUSYBOX_CONFIG_DEBUG
+	help
+	  The compiler's optimization of source code can eliminate and reorder
+	  code, resulting in an executable that's hard to understand when
+	  stepping through it with a debugger. This switches it off, resulting
+	  in a much bigger executable that more closely matches the source
+	  code.
+
+config BUSYBOX_CONFIG_WERROR
+	bool "Abort compilation on any warning"
+	default BUSYBOX_DEFAULT_WERROR
+	help
+	  Selecting this will add -Werror to gcc command line.
+
+	  Most people should answer N.
+
+choice
+	prompt "Additional debugging library"
+	default BUSYBOX_CONFIG_NO_DEBUG_LIB
+	help
+	  Using an additional debugging library will make BusyBox become
+	  considerable larger and will cause it to run more slowly. You
+	  should always leave this option disabled for production use.
+
+	  dmalloc support:
+	  ----------------
+	  This enables compiling with dmalloc ( http://dmalloc.com/ )
+	  which is an excellent public domain mem leak and malloc problem
+	  detector. To enable dmalloc, before running busybox you will
+	  want to properly set your environment, for example:
+	    export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
+	  The 'debug=' value is generated using the following command
+	    dmalloc -p log-stats -p log-non-free -p log-bad-space \
+	       -p log-elapsed-time -p check-fence -p check-heap \
+	       -p check-lists -p check-blank -p check-funcs -p realloc-copy \
+	       -p allow-free-null
+
+	  Electric-fence support:
+	  -----------------------
+	  This enables compiling with Electric-fence support. Electric
+	  fence is another very useful malloc debugging library which uses
+	  your computer's virtual memory hardware to detect illegal memory
+	  accesses. This support will make BusyBox be considerable larger
+	  and run slower, so you should leave this option disabled unless
+	  you are hunting a hard to find memory problem.
+
+
+config BUSYBOX_CONFIG_NO_DEBUG_LIB
+	bool "None"
+
+config BUSYBOX_CONFIG_DMALLOC
+	bool "Dmalloc"
+
+config BUSYBOX_CONFIG_EFENCE
+	bool "Electric-fence"
+
+endchoice
+
+endmenu
+
+menu 'Installation Options ("make install" behavior)'
+
+choice
+	prompt "What kind of applet links to install"
+	default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
+	help
+	  Choose what kind of links to applets are created by "make install".
+
+config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
+	bool "as soft-links"
+	help
+	  Install applets as soft-links to the busybox binary. This needs some
+	  free inodes on the filesystem, but might help with filesystem
+	  generators that can't cope with hard-links.
+
+config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS
+	bool "as hard-links"
+	help
+	  Install applets as hard-links to the busybox binary. This might
+	  count on a filesystem with few inodes.
+
+config BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
+	bool "as script wrappers"
+	help
+	  Install applets as script wrappers that call the busybox binary.
+
+config BUSYBOX_CONFIG_INSTALL_APPLET_DONT
+	bool "not installed"
+	help
+	  Do not install applet links. Useful when you plan to use
+	  busybox --install for installing links, or plan to use
+	  a standalone shell and thus don't need applet links.
+
+endchoice
+
+choice
+	prompt "/bin/sh applet link"
+	default BUSYBOX_CONFIG_INSTALL_SH_APPLET_SYMLINK
+	depends on BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
+	help
+	  Choose how you install /bin/sh applet link.
+
+config BUSYBOX_CONFIG_INSTALL_SH_APPLET_SYMLINK
+	bool "as soft-link"
+	help
+	  Install /bin/sh applet as soft-link to the busybox binary.
+
+config BUSYBOX_CONFIG_INSTALL_SH_APPLET_HARDLINK
+	bool "as hard-link"
+	help
+	  Install /bin/sh applet as hard-link to the busybox binary.
+
+config BUSYBOX_CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER
+	bool "as script wrapper"
+	help
+	  Install /bin/sh applet as script wrapper that calls
+	  the busybox binary.
+
+endchoice
+
+config BUSYBOX_CONFIG_PREFIX
+	string "BusyBox installation prefix"
+	default BUSYBOX_DEFAULT_PREFIX
+	help
+	  Define your directory to install BusyBox files/subdirs in.
+
+endmenu
+
+source package/utils/busybox/config/libbb/Config.in
+
+endmenu
+
+comment "Applets"
+
+source package/utils/busybox/config/archival/Config.in
+source package/utils/busybox/config/coreutils/Config.in
+source package/utils/busybox/config/console-tools/Config.in
+source package/utils/busybox/config/debianutils/Config.in
+source package/utils/busybox/config/editors/Config.in
+source package/utils/busybox/config/findutils/Config.in
+source package/utils/busybox/config/init/Config.in
+source package/utils/busybox/config/loginutils/Config.in
+source package/utils/busybox/config/e2fsprogs/Config.in
+source package/utils/busybox/config/modutils/Config.in
+source package/utils/busybox/config/util-linux/Config.in
+source package/utils/busybox/config/miscutils/Config.in
+source package/utils/busybox/config/networking/Config.in
+source package/utils/busybox/config/printutils/Config.in
+source package/utils/busybox/config/mailutils/Config.in
+source package/utils/busybox/config/procps/Config.in
+source package/utils/busybox/config/runit/Config.in
+source package/utils/busybox/config/selinux/Config.in
+source package/utils/busybox/config/shell/Config.in
+source package/utils/busybox/config/sysklogd/Config.in
diff --git a/trunk/package/utils/busybox/config/archival/Config.in b/trunk/package/utils/busybox/config/archival/Config.in
new file mode 100644
index 00000000..e977bb49
--- /dev/null
+++ b/trunk/package/utils/busybox/config/archival/Config.in
@@ -0,0 +1,372 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Archival Utilities"
+
+config BUSYBOX_CONFIG_FEATURE_SEAMLESS_XZ
+	bool "Make tar, rpm, modprobe etc understand .xz data"
+	default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_XZ
+	help
+	  Make tar, rpm, modprobe etc understand .xz data.
+
+config BUSYBOX_CONFIG_FEATURE_SEAMLESS_LZMA
+	bool "Make tar, rpm, modprobe etc understand .lzma data"
+	default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_LZMA
+	help
+	  Make tar, rpm, modprobe etc understand .lzma data.
+
+config BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2
+	bool "Make tar, rpm, modprobe etc understand .bz2 data"
+	default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_BZ2
+	help
+	  Make tar, rpm, modprobe etc understand .bz2 data.
+
+config BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ
+	bool "Make tar, rpm, modprobe etc understand .gz data"
+	default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_GZ
+	help
+	  Make tar, rpm, modprobe etc understand .gz data.
+
+config BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z
+	bool "tar, rpm, modprobe etc understand .Z data"
+	default BUSYBOX_DEFAULT_FEATURE_SEAMLESS_Z
+	help
+	  Make tar, rpm, modprobe etc understand .Z data.
+
+config BUSYBOX_CONFIG_AR
+	bool "ar"
+	default BUSYBOX_DEFAULT_AR  # needs to be improved to be able to replace binutils ar
+	help
+	  ar is an archival utility program used to create, modify, and
+	  extract contents from archives. An archive is a single file holding
+	  a collection of other files in a structure that makes it possible to
+	  retrieve the original individual files (called archive members).
+	  The original files' contents, mode (permissions), timestamp, owner,
+	  and group are preserved in the archive, and can be restored on
+	  extraction.
+
+	  The stored filename is limited to 15 characters. (for more information
+	  see long filename support).
+	  ar has 60 bytes of overheads for every stored file.
+
+	  This implementation of ar can extract archives, it cannot create or
+	  modify them.
+	  On an x86 system, the ar applet adds about 1K.
+
+	  Unless you have a specific application which requires ar, you should
+	  probably say N here.
+
+config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES
+	bool "Support for long filenames (not needed for debs)"
+	default BUSYBOX_DEFAULT_FEATURE_AR_LONG_FILENAMES
+	depends on BUSYBOX_CONFIG_AR
+	help
+	  By default the ar format can only store the first 15 characters
+	  of the filename, this option removes that limitation.
+	  It supports the GNU ar long filename method which moves multiple long
+	  filenames into a the data section of a new ar entry.
+
+config BUSYBOX_CONFIG_FEATURE_AR_CREATE
+	bool "Support archive creation"
+	default BUSYBOX_DEFAULT_FEATURE_AR_CREATE
+	depends on BUSYBOX_CONFIG_AR
+	help
+	  This enables archive creation (-c and -r) with busybox ar.
+config BUSYBOX_CONFIG_UNCOMPRESS
+	bool "uncompress"
+	default BUSYBOX_DEFAULT_UNCOMPRESS
+	help
+	  uncompress is used to decompress archives created by compress.
+	  Not much used anymore, replaced by gzip/gunzip.
+config BUSYBOX_CONFIG_GUNZIP
+	bool "gunzip"
+	default BUSYBOX_DEFAULT_GUNZIP
+	help
+	  gunzip is used to decompress archives created by gzip.
+	  You can use the `-t' option to test the integrity of
+	  an archive, without decompressing it.
+config BUSYBOX_CONFIG_BUNZIP2
+	bool "bunzip2"
+	default BUSYBOX_DEFAULT_BUNZIP2
+	help
+	  bunzip2 is a compression utility using the Burrows-Wheeler block
+	  sorting text compression algorithm, and Huffman coding. Compression
+	  is generally considerably better than that achieved by more
+	  conventional LZ77/LZ78-based compressors, and approaches the
+	  performance of the PPM family of statistical compressors.
+
+	  Unless you have a specific application which requires bunzip2, you
+	  should probably say N here.
+config BUSYBOX_CONFIG_UNLZMA
+	bool "unlzma"
+	default BUSYBOX_DEFAULT_UNLZMA
+	help
+	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
+	  compression algorithm, and range coding. Compression
+	  is generally considerably better than that achieved by the bzip2
+	  compressors.
+
+	  The BusyBox unlzma applet is limited to decompression only.
+	  On an x86 system, this applet adds about 4K.
+
+config BUSYBOX_CONFIG_FEATURE_LZMA_FAST
+	bool "Optimize unlzma for speed"
+	default BUSYBOX_DEFAULT_FEATURE_LZMA_FAST
+	depends on BUSYBOX_CONFIG_UNLZMA
+	help
+	  This option reduces decompression time by about 25% at the cost of
+	  a 1K bigger binary.
+
+config BUSYBOX_CONFIG_LZMA
+	bool "Provide lzma alias which supports only unpacking"
+	default BUSYBOX_DEFAULT_LZMA
+	depends on BUSYBOX_CONFIG_UNLZMA
+	help
+	  Enable this option if you want commands like "lzma -d" to work.
+	  IOW: you'll get lzma applet, but it will always require -d option.
+config BUSYBOX_CONFIG_UNXZ
+	bool "unxz"
+	default BUSYBOX_DEFAULT_UNXZ
+	help
+	  unxz is a unlzma successor.
+
+config BUSYBOX_CONFIG_XZ
+	bool "Provide xz alias which supports only unpacking"
+	default BUSYBOX_DEFAULT_XZ
+	depends on BUSYBOX_CONFIG_UNXZ
+	help
+	  Enable this option if you want commands like "xz -d" to work.
+	  IOW: you'll get xz applet, but it will always require -d option.
+config BUSYBOX_CONFIG_BZIP2
+	bool "bzip2"
+	default BUSYBOX_DEFAULT_BZIP2
+	help
+	  bzip2 is a compression utility using the Burrows-Wheeler block
+	  sorting text compression algorithm, and Huffman coding. Compression
+	  is generally considerably better than that achieved by more
+	  conventional LZ77/LZ78-based compressors, and approaches the
+	  performance of the PPM family of statistical compressors.
+
+	  Unless you have a specific application which requires bzip2, you
+	  should probably say N here.
+config BUSYBOX_CONFIG_CPIO
+	bool "cpio"
+	default BUSYBOX_DEFAULT_CPIO
+	help
+	  cpio is an archival utility program used to create, modify, and
+	  extract contents from archives.
+	  cpio has 110 bytes of overheads for every stored file.
+
+	  This implementation of cpio can extract cpio archives created in the
+	  "newc" or "crc" format, it cannot create or modify them.
+
+	  Unless you have a specific application which requires cpio, you
+	  should probably say N here.
+
+config BUSYBOX_CONFIG_FEATURE_CPIO_O
+	bool "Support for archive creation"
+	default BUSYBOX_DEFAULT_FEATURE_CPIO_O
+	depends on BUSYBOX_CONFIG_CPIO
+	help
+	  This implementation of cpio can create cpio archives in the "newc"
+	  format only.
+
+config BUSYBOX_CONFIG_FEATURE_CPIO_P
+	bool "Support for passthrough mode"
+	default BUSYBOX_DEFAULT_FEATURE_CPIO_P
+	depends on BUSYBOX_CONFIG_FEATURE_CPIO_O
+	help
+	  Passthrough mode. Rarely used.
+config BUSYBOX_CONFIG_DPKG
+	bool "dpkg"
+	default BUSYBOX_DEFAULT_DPKG
+	select BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ
+	help
+	  dpkg is a medium-level tool to install, build, remove and manage
+	  Debian packages.
+
+	  This implementation of dpkg has a number of limitations,
+	  you should use the official dpkg if possible.
+config BUSYBOX_CONFIG_DPKG_DEB
+	bool "dpkg_deb"
+	default BUSYBOX_DEFAULT_DPKG_DEB
+	select BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ
+	help
+	  dpkg-deb unpacks and provides information about Debian archives.
+
+	  This implementation of dpkg-deb cannot pack archives.
+
+	  Unless you have a specific application which requires dpkg-deb,
+	  say N here.
+
+config BUSYBOX_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	bool "Extract only (-x)"
+	default BUSYBOX_DEFAULT_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	depends on BUSYBOX_CONFIG_DPKG_DEB
+	help
+	  This reduces dpkg-deb to the equivalent of
+	  "ar -p <deb> data.tar.gz | tar -zx". However it saves space as none
+	  of the extra dpkg-deb, ar or tar options are needed, they are linked
+	  to internally.
+config BUSYBOX_CONFIG_GZIP
+	bool "gzip"
+	default BUSYBOX_DEFAULT_GZIP
+	help
+	  gzip is used to compress files.
+	  It's probably the most widely used UNIX compression program.
+
+config BUSYBOX_CONFIG_FEATURE_GZIP_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_GZIP_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_GZIP && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Enable use of long options, increases size by about 106 Bytes
+
+config BUSYBOX_CONFIG_GZIP_FAST
+	int "Trade memory for gzip speed (0:small,slow - 2:fast,big)"
+	default BUSYBOX_DEFAULT_GZIP_FAST
+	range 0 2
+	depends on BUSYBOX_CONFIG_GZIP
+	help
+	  Enable big memory options for gzip.
+	  0: small buffers, small hash-tables
+	  1: larger buffers, larger hash-tables
+	  2: larger buffers, largest hash-tables
+	  Larger models may give slightly better compression
+config BUSYBOX_CONFIG_LZOP
+	bool "lzop"
+	default BUSYBOX_DEFAULT_LZOP
+	help
+	  Lzop compression/decompresion.
+
+config BUSYBOX_CONFIG_LZOP_COMPR_HIGH
+	bool "lzop compression levels 7,8,9 (not very useful)"
+	default BUSYBOX_DEFAULT_LZOP_COMPR_HIGH
+	depends on BUSYBOX_CONFIG_LZOP
+	help
+	  High levels (7,8,9) of lzop compression. These levels
+	  are actually slower than gzip at equivalent compression ratios
+	  and take up 3.2K of code.
+config BUSYBOX_CONFIG_RPM
+	bool "rpm"
+	default BUSYBOX_DEFAULT_RPM
+	help
+	  Mini RPM applet - queries and extracts RPM packages.
+config BUSYBOX_CONFIG_RPM2CPIO
+	bool "rpm2cpio"
+	default BUSYBOX_DEFAULT_RPM2CPIO
+	help
+	  Converts a RPM file into a CPIO archive.
+config BUSYBOX_CONFIG_TAR
+	bool "tar"
+	default BUSYBOX_DEFAULT_TAR
+	help
+	  tar is an archiving program. It's commonly used with gzip to
+	  create compressed archives. It's probably the most widely used
+	  UNIX archive program.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_CREATE
+	bool "Enable archive creation"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_CREATE
+	depends on BUSYBOX_CONFIG_TAR
+	help
+	  If you enable this option you'll be able to create
+	  tar archives using the `-c' option.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT
+	bool "Autodetect compressed tarballs"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_AUTODETECT
+	depends on BUSYBOX_CONFIG_TAR && (BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z || BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ || BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2 || BUSYBOX_CONFIG_FEATURE_SEAMLESS_LZMA || BUSYBOX_CONFIG_FEATURE_SEAMLESS_XZ)
+	help
+	  With this option tar can automatically detect compressed
+	  tarballs. Currently it works only on files (not pipes etc).
+
+config BUSYBOX_CONFIG_FEATURE_TAR_FROM
+	bool "Enable -X (exclude from) and -T (include from) options)"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_FROM
+	depends on BUSYBOX_CONFIG_TAR
+	help
+	  If you enable this option you'll be able to specify
+	  a list of files to include or exclude from an archive.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY
+	bool "Support for old tar header format"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_OLDGNU_COMPATIBILITY
+	depends on BUSYBOX_CONFIG_TAR || BUSYBOX_CONFIG_DPKG
+	help
+	  This option is required to unpack archives created in
+	  the old GNU format; help to kill this old format by
+	  repacking your ancient archives with the new format.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY
+	bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_OLDSUN_COMPATIBILITY
+	depends on BUSYBOX_CONFIG_TAR || BUSYBOX_CONFIG_DPKG
+	help
+	  This option is required to unpack archives created by some old
+	  version of Sun's tar (it was calculating checksum using signed
+	  arithmetic). It is said to be fixed in newer Sun tar, but "old"
+	  tarballs still exist.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
+	bool "Support for GNU tar extensions (long filenames)"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_GNU_EXTENSIONS
+	depends on BUSYBOX_CONFIG_TAR || BUSYBOX_CONFIG_DPKG
+	help
+	  With this option busybox supports GNU long filenames and
+	  linknames.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_TAR && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Enable use of long options, increases size by about 400 Bytes
+
+config BUSYBOX_CONFIG_FEATURE_TAR_TO_COMMAND
+	bool "Support for writing to an external program"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_TO_COMMAND
+	depends on BUSYBOX_CONFIG_TAR && BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS
+	help
+	  If you enable this option you'll be able to instruct tar to send
+	  the contents of each extracted file to the standard input of an
+	  external program.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME
+	bool "Enable use of user and group names"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_UNAME_GNAME
+	depends on BUSYBOX_CONFIG_TAR
+	help
+	  Enables use of user and group names in tar. This affects contents
+	  listings (-t) and preserving permissions when unpacking (-p).
+	  +200 bytes.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_NOPRESERVE_TIME
+	bool "Enable -m (do not preserve time) option"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_NOPRESERVE_TIME
+	depends on BUSYBOX_CONFIG_TAR
+	help
+	  With this option busybox supports GNU tar -m
+	  (do not preserve time) option.
+
+config BUSYBOX_CONFIG_FEATURE_TAR_SELINUX
+	bool "Support for extracting SELinux labels"
+	default BUSYBOX_DEFAULT_FEATURE_TAR_SELINUX
+	depends on BUSYBOX_CONFIG_TAR && BUSYBOX_CONFIG_SELINUX
+	help
+	  With this option busybox supports restoring SELinux labels
+	  when extracting files from tar archives.
+config BUSYBOX_CONFIG_UNZIP
+	bool "unzip"
+	default BUSYBOX_DEFAULT_UNZIP
+	help
+	  unzip will list or extract files from a ZIP archive,
+	  commonly found on DOS/WIN systems. The default behavior
+	  (with no options) is to extract the archive into the
+	  current directory. Use the `-d' option to extract to a
+	  directory of your choice.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/console-tools/Config.in b/trunk/package/utils/busybox/config/console-tools/Config.in
new file mode 100644
index 00000000..53937d2b
--- /dev/null
+++ b/trunk/package/utils/busybox/config/console-tools/Config.in
@@ -0,0 +1,176 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Console Utilities"
+
+
+config BUSYBOX_CONFIG_CHVT
+	bool "chvt"
+	default BUSYBOX_DEFAULT_CHVT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program is used to change to another terminal.
+	  Example: chvt 4 (change to terminal /dev/tty4)
+
+config BUSYBOX_CONFIG_FGCONSOLE
+	bool "fgconsole"
+	default BUSYBOX_DEFAULT_FGCONSOLE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program prints active (foreground) console number.
+
+config BUSYBOX_CONFIG_CLEAR
+	bool "clear"
+	default BUSYBOX_DEFAULT_CLEAR
+	help
+	  This program clears the terminal screen.
+
+config BUSYBOX_CONFIG_DEALLOCVT
+	bool "deallocvt"
+	default BUSYBOX_DEFAULT_DEALLOCVT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program deallocates unused virtual consoles.
+
+config BUSYBOX_CONFIG_DUMPKMAP
+	bool "dumpkmap"
+	default BUSYBOX_DEFAULT_DUMPKMAP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program dumps the kernel's keyboard translation table to
+	  stdout, in binary format. You can then use loadkmap to load it.
+
+config BUSYBOX_CONFIG_KBD_MODE
+	bool "kbd_mode"
+	default BUSYBOX_DEFAULT_KBD_MODE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program reports and sets keyboard mode.
+
+config BUSYBOX_CONFIG_LOADFONT
+	bool "loadfont"
+	default BUSYBOX_DEFAULT_LOADFONT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program loads a console font from standard input.
+
+config BUSYBOX_CONFIG_LOADKMAP
+	bool "loadkmap"
+	default BUSYBOX_DEFAULT_LOADKMAP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program loads a keyboard translation table from
+	  standard input.
+
+config BUSYBOX_CONFIG_OPENVT
+	bool "openvt"
+	default BUSYBOX_DEFAULT_OPENVT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program is used to start a command on an unused
+	  virtual terminal.
+
+config BUSYBOX_CONFIG_RESET
+	bool "reset"
+	default BUSYBOX_DEFAULT_RESET
+	help
+	  This program is used to reset the terminal screen, if it
+	  gets messed up.
+
+config BUSYBOX_CONFIG_RESIZE
+	bool "resize"
+	default BUSYBOX_DEFAULT_RESIZE
+	help
+	  This program is used to (re)set the width and height of your current
+	  terminal.
+
+config BUSYBOX_CONFIG_FEATURE_RESIZE_PRINT
+	bool "Print environment variables"
+	default BUSYBOX_DEFAULT_FEATURE_RESIZE_PRINT
+	depends on BUSYBOX_CONFIG_RESIZE
+	help
+	  Prints the newly set size (number of columns and rows) of
+	  the terminal.
+	  E.g.:
+	  COLUMNS=80;LINES=44;export COLUMNS LINES;
+
+config BUSYBOX_CONFIG_SETCONSOLE
+	bool "setconsole"
+	default BUSYBOX_DEFAULT_SETCONSOLE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program redirects the system console to another device,
+	  like the current tty while logged in via telnet.
+
+config BUSYBOX_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_SETCONSOLE_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_SETCONSOLE && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the setconsole applet.
+
+config BUSYBOX_CONFIG_SETFONT
+	bool "setfont"
+	default BUSYBOX_DEFAULT_SETFONT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Allows to load console screen map. Useful for i18n.
+
+config BUSYBOX_CONFIG_FEATURE_SETFONT_TEXTUAL_MAP
+	bool "Support reading textual screen maps"
+	default BUSYBOX_DEFAULT_FEATURE_SETFONT_TEXTUAL_MAP
+	depends on BUSYBOX_CONFIG_SETFONT
+	help
+	  Support reading textual screen maps.
+
+config BUSYBOX_CONFIG_DEFAULT_SETFONT_DIR
+	string "Default directory for console-tools files"
+	default BUSYBOX_DEFAULT_DEFAULT_SETFONT_DIR
+	depends on BUSYBOX_CONFIG_SETFONT
+	help
+	  Directory to use if setfont's params are simple filenames
+	  (not /path/to/file or ./file). Default is "" (no default directory).
+
+config BUSYBOX_CONFIG_SETKEYCODES
+	bool "setkeycodes"
+	default BUSYBOX_DEFAULT_SETKEYCODES
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program loads entries into the kernel's scancode-to-keycode
+	  map, allowing unusual keyboards to generate usable keycodes.
+
+config BUSYBOX_CONFIG_SETLOGCONS
+	bool "setlogcons"
+	default BUSYBOX_DEFAULT_SETLOGCONS
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This program redirects the output console of kernel messages.
+
+config BUSYBOX_CONFIG_SHOWKEY
+	bool "showkey"
+	default BUSYBOX_DEFAULT_SHOWKEY
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Shows keys pressed.
+
+comment "Common options for loadfont and setfont"
+	depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT
+
+config BUSYBOX_CONFIG_FEATURE_LOADFONT_PSF2
+	bool "Support for PSF2 console fonts"
+	default BUSYBOX_DEFAULT_FEATURE_LOADFONT_PSF2
+	depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT
+	help
+	  Support PSF2 console fonts.
+
+config BUSYBOX_CONFIG_FEATURE_LOADFONT_RAW
+	bool "Support for old (raw) console fonts"
+	default BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW
+	depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT
+	help
+	  Support old (raw) console fonts.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/coreutils/Config.in b/trunk/package/utils/busybox/config/coreutils/Config.in
new file mode 100644
index 00000000..c00eca95
--- /dev/null
+++ b/trunk/package/utils/busybox/config/coreutils/Config.in
@@ -0,0 +1,933 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Coreutils"
+
+config BUSYBOX_CONFIG_BASENAME
+	bool "basename"
+	default BUSYBOX_DEFAULT_BASENAME
+	help
+	  basename is used to strip the directory and suffix from filenames,
+	  leaving just the filename itself. Enable this option if you wish
+	  to enable the 'basename' utility.
+config BUSYBOX_CONFIG_CAT
+	bool "cat"
+	default BUSYBOX_DEFAULT_CAT
+	help
+	  cat is used to concatenate files and print them to the standard
+	  output. Enable this option if you wish to enable the 'cat' utility.
+config BUSYBOX_CONFIG_DATE
+	bool "date"
+	default BUSYBOX_DEFAULT_DATE
+	help
+	  date is used to set the system date or display the
+	  current time in the given format.
+
+config BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT
+	bool "Enable ISO date format output (-I)"
+	default BUSYBOX_DEFAULT_FEATURE_DATE_ISOFMT
+	depends on BUSYBOX_CONFIG_DATE
+	help
+	  Enable option (-I) to output an ISO-8601 compliant
+	  date/time string.
+
+# defaults to "no": stat's nanosecond field is a bit non-portable
+config BUSYBOX_CONFIG_FEATURE_DATE_NANO
+	bool "Support %[num]N nanosecond format specifier"
+	default BUSYBOX_DEFAULT_FEATURE_DATE_NANO
+	depends on BUSYBOX_CONFIG_DATE  # syscall(__NR_clock_gettime)
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Support %[num]N format specifier. Adds ~250 bytes of code.
+
+config BUSYBOX_CONFIG_FEATURE_DATE_COMPAT
+	bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
+	default BUSYBOX_DEFAULT_FEATURE_DATE_COMPAT
+	depends on BUSYBOX_CONFIG_DATE
+	help
+	  System time can be set by 'date -s DATE' and simply 'date DATE',
+	  but formats of DATE string are different. 'date DATE' accepts
+	  a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+	  unnatural placement of year between minutes and seconds.
+	  date -s (and other commands like touch -d) use more sensible
+	  formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+
+	  With this option off, 'date DATE' is 'date -s DATE' support
+	  the same format. With it on, 'date DATE' additionally supports
+	  MMDDhhmm[[YY]YY][.ss] format.
+config BUSYBOX_CONFIG_HOSTID
+	bool "hostid"
+	default BUSYBOX_DEFAULT_HOSTID
+	help
+	  hostid prints the numeric identifier (in hexadecimal) for
+	  the current host.
+config BUSYBOX_CONFIG_ID
+	bool "id"
+	default BUSYBOX_DEFAULT_ID
+	help
+	  id displays the current user and group ID names.
+config BUSYBOX_CONFIG_GROUPS
+	bool "groups"
+	default BUSYBOX_DEFAULT_GROUPS
+	help
+	  Print the group names associated with current user id.
+config BUSYBOX_CONFIG_TEST
+	bool "test"
+	default BUSYBOX_DEFAULT_TEST
+	help
+	  test is used to check file types and compare values,
+	  returning an appropriate exit code. The bash shell
+	  has test built in, ash can build it in optionally.
+
+config BUSYBOX_CONFIG_FEATURE_TEST_64
+	bool "Extend test to 64 bit"
+	default BUSYBOX_DEFAULT_FEATURE_TEST_64
+	depends on BUSYBOX_CONFIG_TEST || BUSYBOX_CONFIG_ASH_BUILTIN_TEST || BUSYBOX_CONFIG_HUSH
+	help
+	  Enable 64-bit support in test.
+config BUSYBOX_CONFIG_TOUCH
+	bool "touch"
+	default BUSYBOX_DEFAULT_TOUCH
+	help
+	  touch is used to create or change the access and/or
+	  modification timestamp of specified files.
+
+config BUSYBOX_CONFIG_FEATURE_TOUCH_NODEREF
+	bool "Add support for -h"
+	default BUSYBOX_DEFAULT_FEATURE_TOUCH_NODEREF
+	depends on BUSYBOX_CONFIG_TOUCH
+	help
+	  Enable touch to have the -h option.
+	  This requires libc support for lutimes() function.
+
+config BUSYBOX_CONFIG_FEATURE_TOUCH_SUSV3
+	bool "Add support for SUSV3 features (-d -t -r)"
+	default BUSYBOX_DEFAULT_FEATURE_TOUCH_SUSV3
+	depends on BUSYBOX_CONFIG_TOUCH
+	help
+	  Enable touch to use a reference file or a given date/time argument.
+config BUSYBOX_CONFIG_TR
+	bool "tr"
+	default BUSYBOX_DEFAULT_TR
+	help
+	  tr is used to squeeze, and/or delete characters from standard
+	  input, writing to standard output.
+
+config BUSYBOX_CONFIG_FEATURE_TR_CLASSES
+	bool "Enable character classes (such as [:upper:])"
+	default BUSYBOX_DEFAULT_FEATURE_TR_CLASSES
+	depends on BUSYBOX_CONFIG_TR
+	help
+	  Enable character classes, enabling commands such as:
+	  tr [:upper:] [:lower:] to convert input into lowercase.
+
+config BUSYBOX_CONFIG_FEATURE_TR_EQUIV
+	bool "Enable equivalence classes"
+	default BUSYBOX_DEFAULT_FEATURE_TR_EQUIV
+	depends on BUSYBOX_CONFIG_TR
+	help
+	  Enable equivalence classes, which essentially add the enclosed
+	  character to the current set. For instance, tr [=a=] xyz would
+	  replace all instances of 'a' with 'xyz'. This option is mainly
+	  useful for cases when no other way of expressing a character
+	  is possible.
+config BUSYBOX_CONFIG_BASE64
+	bool "base64"
+	default BUSYBOX_DEFAULT_BASE64
+	help
+	  Base64 encode and decode
+config BUSYBOX_CONFIG_WHO
+      bool "who"
+      default BUSYBOX_DEFAULT_WHO
+      depends on BUSYBOX_CONFIG_FEATURE_UTMP
+      help
+        who is used to show who is logged on.
+config BUSYBOX_CONFIG_USERS
+      bool "users"
+      default BUSYBOX_DEFAULT_USERS
+      depends on BUSYBOX_CONFIG_FEATURE_UTMP
+      help
+        Print users currently logged on.
+
+config BUSYBOX_CONFIG_CAL
+	bool "cal"
+	default BUSYBOX_DEFAULT_CAL
+	help
+	  cal is used to display a monthly calender.
+
+config BUSYBOX_CONFIG_CATV
+	bool "catv"
+	default BUSYBOX_DEFAULT_CATV
+	help
+	  Display nonprinting characters as escape sequences (like some
+	  implementations' cat -v option).
+
+config BUSYBOX_CONFIG_CHGRP
+	bool "chgrp"
+	default BUSYBOX_DEFAULT_CHGRP
+	help
+	  chgrp is used to change the group ownership of files.
+
+config BUSYBOX_CONFIG_CHMOD
+	bool "chmod"
+	default BUSYBOX_DEFAULT_CHMOD
+	help
+	  chmod is used to change the access permission of files.
+
+config BUSYBOX_CONFIG_CHOWN
+	bool "chown"
+	default BUSYBOX_DEFAULT_CHOWN
+	help
+	  chown is used to change the user and/or group ownership
+	  of files.
+
+config BUSYBOX_CONFIG_FEATURE_CHOWN_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_CHOWN_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_CHOWN && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Enable use of long options
+
+config BUSYBOX_CONFIG_CHROOT
+	bool "chroot"
+	default BUSYBOX_DEFAULT_CHROOT
+	help
+	  chroot is used to change the root directory and run a command.
+	  The default command is `/bin/sh'.
+
+config BUSYBOX_CONFIG_CKSUM
+	bool "cksum"
+	default BUSYBOX_DEFAULT_CKSUM
+	help
+	  cksum is used to calculate the CRC32 checksum of a file.
+
+config BUSYBOX_CONFIG_COMM
+	bool "comm"
+	default BUSYBOX_DEFAULT_COMM
+	help
+	  comm is used to compare two files line by line and return
+	  a three-column output.
+
+config BUSYBOX_CONFIG_CP
+	bool "cp"
+	default BUSYBOX_DEFAULT_CP
+	help
+	  cp is used to copy files and directories.
+
+config BUSYBOX_CONFIG_FEATURE_CP_LONG_OPTIONS
+	bool "Enable long options for cp"
+	default BUSYBOX_DEFAULT_FEATURE_CP_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_CP && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Enable long options for cp.
+	  Also add support for --parents option.
+
+config BUSYBOX_CONFIG_CUT
+	bool "cut"
+	default BUSYBOX_DEFAULT_CUT
+	help
+	  cut is used to print selected parts of lines from
+	  each file to stdout.
+
+config BUSYBOX_CONFIG_DD
+	bool "dd"
+	default BUSYBOX_DEFAULT_DD
+	help
+	  dd copies a file (from standard input to standard output,
+	  by default) using specific input and output blocksizes,
+	  while optionally performing conversions on it.
+
+config BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
+	bool "Enable DD signal handling for status reporting"
+	default BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
+	depends on BUSYBOX_CONFIG_DD
+	help
+	  Sending a SIGUSR1 signal to a running `dd' process makes it
+	  print to standard error the number of records read and written
+	  so far, then to resume copying.
+
+	  $ dd if=/dev/zero of=/dev/null&
+	  $ pid=$! kill -USR1 $pid; sleep 1; kill $pid
+	  10899206+0 records in
+	  10899206+0 records out
+
+config BUSYBOX_CONFIG_FEATURE_DD_THIRD_STATUS_LINE
+	bool "Enable the third status line upon signal"
+	default BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
+	depends on BUSYBOX_CONFIG_DD && BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
+	help
+	  Displays a coreutils-like third status line with transferred bytes,
+	  elapsed time and speed.
+
+config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS
+	bool "Enable ibs, obs and conv options"
+	default BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
+	depends on BUSYBOX_CONFIG_DD
+	help
+	  Enables support for writing a certain number of bytes in and out,
+	  at a time, and performing conversions on the data stream.
+
+config BUSYBOX_CONFIG_DF
+	bool "df"
+	default BUSYBOX_DEFAULT_DF
+	help
+	  df reports the amount of disk space used and available
+	  on filesystems.
+
+config BUSYBOX_CONFIG_FEATURE_DF_FANCY
+	bool "Enable -a, -i, -B"
+	default BUSYBOX_DEFAULT_FEATURE_DF_FANCY
+	depends on BUSYBOX_CONFIG_DF
+	help
+	  This option enables -a, -i and -B.
+
+	    -a Show all filesystems
+	    -i Inodes
+	    -B <SIZE> Blocksize
+
+config BUSYBOX_CONFIG_DIRNAME
+	bool "dirname"
+	default BUSYBOX_DEFAULT_DIRNAME
+	help
+	  dirname is used to strip a non-directory suffix from
+	  a file name.
+
+config BUSYBOX_CONFIG_DOS2UNIX
+	bool "dos2unix/unix2dos"
+	default BUSYBOX_DEFAULT_DOS2UNIX
+	help
+	  dos2unix is used to convert a text file from DOS format to
+	  UNIX format, and vice versa.
+
+config BUSYBOX_CONFIG_UNIX2DOS
+	bool
+	default BUSYBOX_DEFAULT_UNIX2DOS
+	depends on BUSYBOX_CONFIG_DOS2UNIX
+	help
+	  unix2dos is used to convert a text file from UNIX format to
+	  DOS format, and vice versa.
+
+config BUSYBOX_CONFIG_DU
+	bool "du (default blocksize of 512 bytes)"
+	default BUSYBOX_DEFAULT_DU
+	help
+	  du is used to report the amount of disk space used
+	  for specified files.
+
+config BUSYBOX_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+	bool "Use a default blocksize of 1024 bytes (1K)"
+	default BUSYBOX_DEFAULT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
+	depends on BUSYBOX_CONFIG_DU
+	help
+	  Use a blocksize of (1K) instead of the default 512b.
+
+config BUSYBOX_CONFIG_ECHO
+	bool "echo (basic SuSv3 version taking no options)"
+	default BUSYBOX_DEFAULT_ECHO
+	help
+	  echo is used to print a specified string to stdout.
+
+# this entry also appears in shell/Config.in, next to the echo builtin
+config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
+	bool "Enable echo options (-n and -e)"
+	default BUSYBOX_DEFAULT_FEATURE_FANCY_ECHO
+	depends on BUSYBOX_CONFIG_ECHO || BUSYBOX_CONFIG_ASH_BUILTIN_ECHO || BUSYBOX_CONFIG_HUSH
+	help
+	  This adds options (-n and -e) to echo.
+
+config BUSYBOX_CONFIG_ENV
+	bool "env"
+	default BUSYBOX_DEFAULT_ENV
+	help
+	  env is used to set an environment variable and run
+	  a command; without options it displays the current
+	  environment.
+
+config BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_ENV_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the env applet.
+
+config BUSYBOX_CONFIG_EXPAND
+	bool "expand"
+	default BUSYBOX_DEFAULT_EXPAND
+	help
+	  By default, convert all tabs to spaces.
+
+config BUSYBOX_CONFIG_FEATURE_EXPAND_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_EXPAND_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_EXPAND && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the expand applet.
+
+config BUSYBOX_CONFIG_EXPR
+	bool "expr"
+	default BUSYBOX_DEFAULT_EXPR
+	help
+	  expr is used to calculate numbers and print the result
+	  to standard output.
+
+config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64
+	bool "Extend Posix numbers support to 64 bit"
+	default BUSYBOX_DEFAULT_EXPR_MATH_SUPPORT_64
+	depends on BUSYBOX_CONFIG_EXPR
+	help
+	  Enable 64-bit math support in the expr applet. This will make
+	  the applet slightly larger, but will allow computation with very
+	  large numbers.
+
+config BUSYBOX_CONFIG_FALSE
+	bool "false"
+	default BUSYBOX_DEFAULT_FALSE
+	help
+	  false returns an exit code of FALSE (1).
+
+config BUSYBOX_CONFIG_FOLD
+	bool "fold"
+	default BUSYBOX_DEFAULT_FOLD
+	help
+	  Wrap text to fit a specific width.
+
+config BUSYBOX_CONFIG_FSYNC
+	bool "fsync"
+	default BUSYBOX_DEFAULT_FSYNC
+	help
+	  fsync is used to flush file-related cached blocks to disk.
+
+config BUSYBOX_CONFIG_HEAD
+	bool "head"
+	default BUSYBOX_DEFAULT_HEAD
+	help
+	  head is used to print the first specified number of lines
+	  from files.
+
+config BUSYBOX_CONFIG_FEATURE_FANCY_HEAD
+	bool "Enable head options (-c, -q, and -v)"
+	default BUSYBOX_DEFAULT_FEATURE_FANCY_HEAD
+	depends on BUSYBOX_CONFIG_HEAD
+	help
+	  This enables the head options (-c, -q, and -v).
+
+config BUSYBOX_CONFIG_INSTALL
+	bool "install"
+	default BUSYBOX_DEFAULT_INSTALL
+	help
+	  Copy files and set attributes.
+
+config BUSYBOX_CONFIG_FEATURE_INSTALL_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_INSTALL_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the install applet.
+
+####config LENGTH
+####	bool "length"
+####	default y
+####	help
+####	  length is used to print out the length of a specified string.
+
+config BUSYBOX_CONFIG_LN
+	bool "ln"
+	default BUSYBOX_DEFAULT_LN
+	help
+	  ln is used to create hard or soft links between files.
+
+config BUSYBOX_CONFIG_LOGNAME
+	bool "logname"
+	default BUSYBOX_DEFAULT_LOGNAME
+	help
+	  logname is used to print the current user's login name.
+
+config BUSYBOX_CONFIG_LS
+	bool "ls"
+	default BUSYBOX_DEFAULT_LS
+	help
+	  ls is used to list the contents of directories.
+
+config BUSYBOX_CONFIG_FEATURE_LS_FILETYPES
+	bool "Enable filetyping options (-p and -F)"
+	default BUSYBOX_DEFAULT_FEATURE_LS_FILETYPES
+	depends on BUSYBOX_CONFIG_LS
+	help
+	  Enable the ls options (-p and -F).
+
+config BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS
+	bool "Enable symlinks dereferencing (-L)"
+	default BUSYBOX_DEFAULT_FEATURE_LS_FOLLOWLINKS
+	depends on BUSYBOX_CONFIG_LS
+	help
+	  Enable the ls option (-L).
+
+config BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE
+	bool "Enable recursion (-R)"
+	default BUSYBOX_DEFAULT_FEATURE_LS_RECURSIVE
+	depends on BUSYBOX_CONFIG_LS
+	help
+	  Enable the ls option (-R).
+
+config BUSYBOX_CONFIG_FEATURE_LS_SORTFILES
+	bool "Sort the file names"
+	default BUSYBOX_DEFAULT_FEATURE_LS_SORTFILES
+	depends on BUSYBOX_CONFIG_LS
+	help
+	  Allow ls to sort file names alphabetically.
+
+config BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS
+	bool "Show file timestamps"
+	default BUSYBOX_DEFAULT_FEATURE_LS_TIMESTAMPS
+	depends on BUSYBOX_CONFIG_LS
+	help
+	  Allow ls to display timestamps for files.
+
+config BUSYBOX_CONFIG_FEATURE_LS_USERNAME
+	bool "Show username/groupnames"
+	default BUSYBOX_DEFAULT_FEATURE_LS_USERNAME
+	depends on BUSYBOX_CONFIG_LS
+	help
+	  Allow ls to display username/groupname for files.
+
+config BUSYBOX_CONFIG_FEATURE_LS_COLOR
+	bool "Allow use of color to identify file types"
+	default BUSYBOX_DEFAULT_FEATURE_LS_COLOR
+	depends on BUSYBOX_CONFIG_LS && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  This enables the --color option to ls.
+
+config BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
+	bool "Produce colored ls output by default"
+	default BUSYBOX_DEFAULT_FEATURE_LS_COLOR_IS_DEFAULT
+	depends on BUSYBOX_CONFIG_FEATURE_LS_COLOR
+	help
+	  Saying yes here will turn coloring on by default,
+	  even if no "--color" option is given to the ls command.
+	  This is not recommended, since the colors are not
+	  configurable, and the output may not be legible on
+	  many output screens.
+
+config BUSYBOX_CONFIG_MD5SUM
+	bool "md5sum"
+	default BUSYBOX_DEFAULT_MD5SUM
+	help
+	  md5sum is used to print or check MD5 checksums.
+
+config BUSYBOX_CONFIG_MKDIR
+	bool "mkdir"
+	default BUSYBOX_DEFAULT_MKDIR
+	help
+	  mkdir is used to create directories with the specified names.
+
+config BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_MKDIR_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the mkdir applet.
+
+config BUSYBOX_CONFIG_MKFIFO
+	bool "mkfifo"
+	default BUSYBOX_DEFAULT_MKFIFO
+	help
+	  mkfifo is used to create FIFOs (named pipes).
+	  The `mknod' program can also create FIFOs.
+
+config BUSYBOX_CONFIG_MKNOD
+	bool "mknod"
+	default BUSYBOX_DEFAULT_MKNOD
+	help
+	  mknod is used to create FIFOs or block/character special
+	  files with the specified names.
+
+config BUSYBOX_CONFIG_MV
+	bool "mv"
+	default BUSYBOX_DEFAULT_MV
+	help
+	  mv is used to move or rename files or directories.
+
+config BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_MV_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the mv applet.
+
+config BUSYBOX_CONFIG_NICE
+	bool "nice"
+	default BUSYBOX_DEFAULT_NICE
+	help
+	  nice runs a program with modified scheduling priority.
+
+config BUSYBOX_CONFIG_NOHUP
+	bool "nohup"
+	default BUSYBOX_DEFAULT_NOHUP
+	help
+	  run a command immune to hangups, with output to a non-tty.
+
+config BUSYBOX_CONFIG_OD
+	bool "od"
+	default BUSYBOX_DEFAULT_OD
+	help
+	  od is used to dump binary files in octal and other formats.
+
+config BUSYBOX_CONFIG_PRINTENV
+	bool "printenv"
+	default BUSYBOX_DEFAULT_PRINTENV
+	help
+	  printenv is used to print all or part of environment.
+
+config BUSYBOX_CONFIG_PRINTF
+	bool "printf"
+	default BUSYBOX_DEFAULT_PRINTF
+	help
+	  printf is used to format and print specified strings.
+	  It's similar to `echo' except it has more options.
+
+config BUSYBOX_CONFIG_PWD
+	bool "pwd"
+	default BUSYBOX_DEFAULT_PWD
+	help
+	  pwd is used to print the current directory.
+
+config BUSYBOX_CONFIG_READLINK
+	bool "readlink"
+	default BUSYBOX_DEFAULT_READLINK
+	help
+	  This program reads a symbolic link and returns the name
+	  of the file it points to
+
+config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW
+	bool "Enable canonicalization by following all symlinks (-f)"
+	default BUSYBOX_DEFAULT_FEATURE_READLINK_FOLLOW
+	depends on BUSYBOX_CONFIG_READLINK
+	help
+	  Enable the readlink option (-f).
+
+config BUSYBOX_CONFIG_REALPATH
+	bool "realpath"
+	default BUSYBOX_DEFAULT_REALPATH
+	help
+	  Return the canonicalized absolute pathname.
+	  This isn't provided by GNU shellutils, but where else does it belong.
+
+config BUSYBOX_CONFIG_RM
+	bool "rm"
+	default BUSYBOX_DEFAULT_RM
+	help
+	  rm is used to remove files or directories.
+
+config BUSYBOX_CONFIG_RMDIR
+	bool "rmdir"
+	default BUSYBOX_DEFAULT_RMDIR
+	help
+	  rmdir is used to remove empty directories.
+
+config BUSYBOX_CONFIG_FEATURE_RMDIR_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_RMDIR_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_RMDIR && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the rmdir applet, including
+	  --ignore-fail-on-non-empty for compatibility with GNU rmdir.
+
+config BUSYBOX_CONFIG_SEQ
+	bool "seq"
+	default BUSYBOX_DEFAULT_SEQ
+	help
+	  print a sequence of numbers
+
+config BUSYBOX_CONFIG_SHA1SUM
+	bool "sha1sum"
+	default BUSYBOX_DEFAULT_SHA1SUM
+	help
+	  Compute and check SHA1 message digest
+
+config BUSYBOX_CONFIG_SHA256SUM
+	bool "sha256sum"
+	default BUSYBOX_DEFAULT_SHA256SUM
+	help
+	  Compute and check SHA256 message digest
+
+config BUSYBOX_CONFIG_SHA512SUM
+	bool "sha512sum"
+	default BUSYBOX_DEFAULT_SHA512SUM
+	help
+	  Compute and check SHA512 message digest
+
+config BUSYBOX_CONFIG_SHA3SUM
+	bool "sha3sum"
+	default BUSYBOX_DEFAULT_SHA3SUM
+	help
+	  Compute and check SHA3 (512-bit) message digest
+
+config BUSYBOX_CONFIG_SLEEP
+	bool "sleep"
+	default BUSYBOX_DEFAULT_SLEEP
+	help
+	  sleep is used to pause for a specified number of seconds.
+	  It comes in 3 versions:
+	  - small: takes one integer parameter
+	  - fancy: takes multiple integer arguments with suffixes:
+	    sleep 1d 2h 3m 15s
+	  - fancy with fractional numbers:
+	    sleep 2.3s 4.5h sleeps for 16202.3 seconds
+	  Last one is "the most compatible" with coreutils sleep,
+	  but it adds around 1k of code.
+
+config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
+	bool "Enable multiple arguments and s/m/h/d suffixes"
+	default BUSYBOX_DEFAULT_FEATURE_FANCY_SLEEP
+	depends on BUSYBOX_CONFIG_SLEEP
+	help
+	  Allow sleep to pause for specified minutes, hours, and days.
+
+config BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP
+	bool "Enable fractional arguments"
+	default BUSYBOX_DEFAULT_FEATURE_FLOAT_SLEEP
+	depends on BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
+	help
+	  Allow for fractional numeric parameters.
+
+config BUSYBOX_CONFIG_SORT
+	bool "sort"
+	default BUSYBOX_DEFAULT_SORT
+	help
+	  sort is used to sort lines of text in specified files.
+
+config BUSYBOX_CONFIG_FEATURE_SORT_BIG
+	bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)"
+	default BUSYBOX_DEFAULT_FEATURE_SORT_BIG
+	depends on BUSYBOX_CONFIG_SORT
+	help
+	  Without this, sort only supports -r, -u, and an integer version
+	  of -n. Selecting this adds sort keys, floating point support, and
+	  more. This adds a little over 3k to a nonstatic build on x86.
+
+	  The SuSv3 sort standard is available at:
+	  http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
+
+config BUSYBOX_CONFIG_SPLIT
+	bool "split"
+	default BUSYBOX_DEFAULT_SPLIT
+	help
+	  split a file into pieces.
+
+config BUSYBOX_CONFIG_FEATURE_SPLIT_FANCY
+	bool "Fancy extensions"
+	default BUSYBOX_DEFAULT_FEATURE_SPLIT_FANCY
+	depends on BUSYBOX_CONFIG_SPLIT
+	help
+	  Add support for features not required by SUSv3.
+	  Supports additional suffixes 'b' for 512 bytes,
+	  'g' for 1GiB for the -b option.
+
+config BUSYBOX_CONFIG_STAT
+	bool "stat"
+	default BUSYBOX_DEFAULT_STAT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX # statfs()
+	help
+	  display file or filesystem status.
+
+config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT
+	bool "Enable custom formats (-c)"
+	default BUSYBOX_DEFAULT_FEATURE_STAT_FORMAT
+	depends on BUSYBOX_CONFIG_STAT
+	help
+	  Without this, stat will not support the '-c format' option where
+	  users can pass a custom format string for output. This adds about
+	  7k to a nonstatic build on amd64.
+
+config BUSYBOX_CONFIG_STTY
+	bool "stty"
+	default BUSYBOX_DEFAULT_STTY
+	help
+	  stty is used to change and print terminal line settings.
+
+config BUSYBOX_CONFIG_SUM
+	bool "sum"
+	default BUSYBOX_DEFAULT_SUM
+	help
+	  checksum and count the blocks in a file
+
+config BUSYBOX_CONFIG_SYNC
+	bool "sync"
+	default BUSYBOX_DEFAULT_SYNC
+	help
+	  sync is used to flush filesystem buffers.
+
+config BUSYBOX_CONFIG_TAC
+	bool "tac"
+	default BUSYBOX_DEFAULT_TAC
+	help
+	  tac is used to concatenate and print files in reverse.
+
+config BUSYBOX_CONFIG_TAIL
+	bool "tail"
+	default BUSYBOX_DEFAULT_TAIL
+	help
+	  tail is used to print the last specified number of lines
+	  from files.
+
+config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL
+	bool "Enable extra tail options (-q, -s, -v, and -F)"
+	default BUSYBOX_DEFAULT_FEATURE_FANCY_TAIL
+	depends on BUSYBOX_CONFIG_TAIL
+	help
+	  The options (-q, -s, and -v) are provided by GNU tail, but
+	  are not specific in the SUSv3 standard.
+
+	    -q      Never output headers giving file names
+	    -s SEC  Wait SEC seconds between reads with -f
+	    -v      Always output headers giving file names
+
+config BUSYBOX_CONFIG_TEE
+	bool "tee"
+	default BUSYBOX_DEFAULT_TEE
+	help
+	  tee is used to read from standard input and write
+	  to standard output and files.
+
+config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO
+	bool "Enable block I/O (larger/faster) instead of byte I/O"
+	default BUSYBOX_DEFAULT_FEATURE_TEE_USE_BLOCK_IO
+	depends on BUSYBOX_CONFIG_TEE
+	help
+	  Enable this option for a faster tee, at expense of size.
+
+config BUSYBOX_CONFIG_TRUE
+	bool "true"
+	default BUSYBOX_DEFAULT_TRUE
+	help
+	  true returns an exit code of TRUE (0).
+
+config BUSYBOX_CONFIG_TTY
+	bool "tty"
+	default BUSYBOX_DEFAULT_TTY
+	help
+	  tty is used to print the name of the current terminal to
+	  standard output.
+
+config BUSYBOX_CONFIG_UNAME
+	bool "uname"
+	default BUSYBOX_DEFAULT_UNAME
+	help
+	  uname is used to print system information.
+
+config BUSYBOX_CONFIG_UNEXPAND
+	bool "unexpand"
+	default BUSYBOX_DEFAULT_UNEXPAND
+	help
+	  By default, convert only leading sequences of blanks to tabs.
+
+config BUSYBOX_CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_UNEXPAND_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_UNEXPAND && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the unexpand applet.
+
+config BUSYBOX_CONFIG_UNIQ
+	bool "uniq"
+	default BUSYBOX_DEFAULT_UNIQ
+	help
+	  uniq is used to remove duplicate lines from a sorted file.
+
+config BUSYBOX_CONFIG_USLEEP
+	bool "usleep"
+	default BUSYBOX_DEFAULT_USLEEP
+	help
+	  usleep is used to pause for a specified number of microseconds.
+
+config BUSYBOX_CONFIG_UUDECODE
+	bool "uudecode"
+	default BUSYBOX_DEFAULT_UUDECODE
+	help
+	  uudecode is used to decode a uuencoded file.
+
+config BUSYBOX_CONFIG_UUENCODE
+	bool "uuencode"
+	default BUSYBOX_DEFAULT_UUENCODE
+	help
+	  uuencode is used to uuencode a file.
+
+config BUSYBOX_CONFIG_WC
+	bool "wc"
+	default BUSYBOX_DEFAULT_WC
+	help
+	  wc is used to print the number of bytes, words, and lines,
+	  in specified files.
+
+config BUSYBOX_CONFIG_FEATURE_WC_LARGE
+	bool "Support very large files in wc"
+	default BUSYBOX_DEFAULT_FEATURE_WC_LARGE
+	depends on BUSYBOX_CONFIG_WC
+	help
+	  Use "unsigned long long" in wc for counter variables.
+
+config BUSYBOX_CONFIG_WHOAMI
+	bool "whoami"
+	default BUSYBOX_DEFAULT_WHOAMI
+	help
+	  whoami is used to print the username of the current
+	  user id (same as id -un).
+
+config BUSYBOX_CONFIG_YES
+	bool "yes"
+	default BUSYBOX_DEFAULT_YES
+	help
+	  yes is used to repeatedly output a specific string, or
+	  the default string `y'.
+
+comment "Common options for cp and mv"
+	depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV
+
+config BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS
+	bool "Preserve hard links"
+	default BUSYBOX_DEFAULT_FEATURE_PRESERVE_HARDLINKS
+	depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV
+	help
+	  Allow cp and mv to preserve hard links.
+
+comment "Common options for ls, more and telnet"
+	depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET
+
+config BUSYBOX_CONFIG_FEATURE_AUTOWIDTH
+	bool "Calculate terminal & column widths"
+	default BUSYBOX_DEFAULT_FEATURE_AUTOWIDTH
+	depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET
+	help
+	  This option allows utilities such as 'ls', 'more' and 'telnet'
+	  to determine the width of the screen, which can allow them to
+	  display additional text or avoid wrapping text onto the next line.
+	  If you leave this disabled, your utilities will be especially
+	  primitive and will be unable to determine the current screen width.
+
+comment "Common options for df, du, ls"
+	depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS
+
+config BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE
+	bool "Support for human readable output (example 13k, 23M, 235G)"
+	default BUSYBOX_DEFAULT_FEATURE_HUMAN_READABLE
+	depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS
+	help
+	  Allow df, du, and ls to have human readable output.
+
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
+	depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM || BUSYBOX_CONFIG_SHA256SUM || BUSYBOX_CONFIG_SHA512SUM || BUSYBOX_CONFIG_SHA3SUM
+
+config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
+	bool "Enable -c, -s and -w options"
+	default BUSYBOX_DEFAULT_FEATURE_MD5_SHA1_SUM_CHECK
+	depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM || BUSYBOX_CONFIG_SHA256SUM || BUSYBOX_CONFIG_SHA512SUM || BUSYBOX_CONFIG_SHA3SUM
+	help
+	  Enabling the -c options allows files to be checked
+	  against pre-calculated hash values.
+
+	  -s and -w are useful options when verifying checksums.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/debianutils/Config.in b/trunk/package/utils/busybox/config/debianutils/Config.in
new file mode 100644
index 00000000..533ad475
--- /dev/null
+++ b/trunk/package/utils/busybox/config/debianutils/Config.in
@@ -0,0 +1,85 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Debian Utilities"
+
+
+config BUSYBOX_CONFIG_MKTEMP
+	bool "mktemp"
+	default BUSYBOX_DEFAULT_MKTEMP
+	help
+	  mktemp is used to create unique temporary files
+
+config BUSYBOX_CONFIG_PIPE_PROGRESS
+	bool "pipe_progress"
+	default BUSYBOX_DEFAULT_PIPE_PROGRESS
+	help
+	  Display a dot to indicate pipe activity.
+
+config BUSYBOX_CONFIG_RUN_PARTS
+	bool "run-parts"
+	default BUSYBOX_DEFAULT_RUN_PARTS
+	help
+	  run-parts is a utility designed to run all the scripts in a directory.
+
+	  It is useful to set up a directory like cron.daily, where you need to
+	  execute all the scripts in that directory.
+
+	  In this implementation of run-parts some features (such as report
+	  mode) are not implemented.
+
+	  Unless you know that run-parts is used in some of your scripts
+	  you can safely say N here.
+
+config BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_RUN_PARTS_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_RUN_PARTS && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the run-parts applet.
+
+config BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY
+	bool "Support additional arguments"
+	default BUSYBOX_DEFAULT_FEATURE_RUN_PARTS_FANCY
+	depends on BUSYBOX_CONFIG_RUN_PARTS
+	help
+	  Support additional options:
+	  -l --list print the names of the all matching files (not
+	            limited to executables), but don't actually run them.
+
+config BUSYBOX_CONFIG_START_STOP_DAEMON
+	bool "start-stop-daemon"
+	default BUSYBOX_DEFAULT_START_STOP_DAEMON
+	help
+	  start-stop-daemon is used to control the creation and
+	  termination of system-level processes, usually the ones
+	  started during the startup of the system.
+
+config BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_FANCY
+	bool "Support additional arguments"
+	default BUSYBOX_DEFAULT_FEATURE_START_STOP_DAEMON_FANCY
+	depends on BUSYBOX_CONFIG_START_STOP_DAEMON
+	help
+	  Support additional arguments.
+	  -o|--oknodo ignored since we exit with 0 anyway
+	  -v|--verbose
+	  -N|--nicelevel N
+
+config BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_START_STOP_DAEMON && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the start-stop-daemon applet.
+
+config BUSYBOX_CONFIG_WHICH
+	bool "which"
+	default BUSYBOX_DEFAULT_WHICH
+	help
+	  which is used to find programs in your PATH and
+	  print out their pathnames.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/e2fsprogs/Config.in b/trunk/package/utils/busybox/config/e2fsprogs/Config.in
new file mode 100644
index 00000000..f8262401
--- /dev/null
+++ b/trunk/package/utils/busybox/config/e2fsprogs/Config.in
@@ -0,0 +1,71 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux Ext2 FS Progs"
+
+
+config BUSYBOX_CONFIG_CHATTR
+	bool "chattr"
+	default BUSYBOX_DEFAULT_CHATTR
+	help
+	  chattr changes the file attributes on a second extended file system.
+
+### config E2FSCK
+###	bool "e2fsck"
+###	default y
+###	help
+###	  e2fsck is used to check Linux second extended file systems (ext2fs).
+###	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+###	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+###	  provided.
+
+config BUSYBOX_CONFIG_FSCK
+	bool "fsck"
+	default BUSYBOX_DEFAULT_FSCK
+	help
+	  fsck is used to check and optionally repair one or more filesystems.
+	  In actuality, fsck is simply a front-end for the various file system
+	  checkers (fsck.fstype) available under Linux.
+
+config BUSYBOX_CONFIG_LSATTR
+	bool "lsattr"
+	default BUSYBOX_DEFAULT_LSATTR
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  lsattr lists the file attributes on a second extended file system.
+
+### config MKE2FS
+###	bool "mke2fs"
+###	default y
+###	help
+###	  mke2fs is used to create an ext2/ext3 filesystem. The normal compat
+###	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+
+config BUSYBOX_CONFIG_TUNE2FS
+	bool "tune2fs"
+	default BUSYBOX_DEFAULT_TUNE2FS  # off: it is too limited compared to upstream version
+	help
+	  tune2fs allows the system administrator to adjust various tunable
+	  filesystem parameters on Linux ext2/ext3 filesystems.
+
+### config E2LABEL
+###	bool "e2label"
+###	default y
+###	depends on TUNE2FS
+###	help
+###	  e2label will display or change the filesystem label on the ext2
+###	  filesystem located on device.
+
+### NB: this one is now provided by util-linux/volume_id/*
+### config FINDFS
+###	bool "findfs"
+###	default y
+###	depends on TUNE2FS
+###	help
+###	  findfs will search the disks in the system looking for a filesystem
+###	  which has a label matching label or a UUID equal to uuid.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/trunk/package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
new file mode 100644
index 00000000..d7a5396d
--- /dev/null
+++ b/trunk/package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
@@ -0,0 +1,69 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux Ext2 FS Progs"
+
+
+config BUSYBOX_CONFIG_CHATTR
+	bool "chattr"
+	default BUSYBOX_DEFAULT_CHATTR
+	help
+	  chattr changes the file attributes on a second extended file system.
+
+config BUSYBOX_CONFIG_E2FSCK
+	bool "e2fsck"
+	default BUSYBOX_DEFAULT_E2FSCK
+	help
+	  e2fsck is used to check Linux second extended file systems (ext2fs).
+	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+	  provided.
+
+config BUSYBOX_CONFIG_FSCK
+	bool "fsck"
+	default BUSYBOX_DEFAULT_FSCK
+	help
+	  fsck is used to check and optionally repair one or more filesystems.
+	  In actuality, fsck is simply a front-end for the various file system
+	  checkers (fsck.fstype) available under Linux.
+
+config BUSYBOX_CONFIG_LSATTR
+	bool "lsattr"
+	default BUSYBOX_DEFAULT_LSATTR
+	help
+	  lsattr lists the file attributes on a second extended file system.
+
+config BUSYBOX_CONFIG_MKE2FS
+	bool "mke2fs"
+	default BUSYBOX_DEFAULT_MKE2FS
+	help
+	  mke2fs is used to create an ext2/ext3 filesystem. The normal compat
+	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+
+config BUSYBOX_CONFIG_TUNE2FS
+	bool "tune2fs"
+	default BUSYBOX_DEFAULT_TUNE2FS
+	help
+	  tune2fs allows the system administrator to adjust various tunable
+	  filesystem parameters on Linux ext2/ext3 filesystems.
+
+config BUSYBOX_CONFIG_E2LABEL
+	bool "e2label"
+	default BUSYBOX_DEFAULT_E2LABEL
+	depends on BUSYBOX_CONFIG_TUNE2FS
+	help
+	  e2label will display or change the filesystem label on the ext2
+	  filesystem located on device.
+
+config BUSYBOX_CONFIG_FINDFS
+	bool "findfs"
+	default BUSYBOX_DEFAULT_FINDFS
+	depends on BUSYBOX_CONFIG_TUNE2FS
+	help
+	  findfs will search the disks in the system looking for a filesystem
+	  which has a label matching label or a UUID equal to uuid.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/editors/Config.in b/trunk/package/utils/busybox/config/editors/Config.in
new file mode 100644
index 00000000..90f9f008
--- /dev/null
+++ b/trunk/package/utils/busybox/config/editors/Config.in
@@ -0,0 +1,204 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Editors"
+
+config BUSYBOX_CONFIG_AWK
+	bool "awk"
+	default BUSYBOX_DEFAULT_AWK
+	help
+	  Awk is used as a pattern scanning and processing language. This is
+	  the BusyBox implementation of that programming language.
+
+config BUSYBOX_CONFIG_FEATURE_AWK_LIBM
+	bool "Enable math functions (requires libm)"
+	default BUSYBOX_DEFAULT_FEATURE_AWK_LIBM
+	depends on BUSYBOX_CONFIG_AWK
+	help
+	  Enable math functions of the Awk programming language.
+	  NOTE: This will require libm to be present for linking.
+
+config BUSYBOX_CONFIG_FEATURE_AWK_GNU_EXTENSIONS
+	bool "Enable a few GNU extensions"
+	default BUSYBOX_DEFAULT_FEATURE_AWK_GNU_EXTENSIONS
+	depends on BUSYBOX_CONFIG_AWK
+	help
+	  Enable a few features from gawk:
+	  * command line option -e AWK_PROGRAM
+	  * simultaneous use of -f and -e on the command line.
+	    This enables the use of awk library files.
+	    Ex: awk -f mylib.awk -e '{print myfunction($1);}' ...
+config BUSYBOX_CONFIG_CMP
+	bool "cmp"
+	default BUSYBOX_DEFAULT_CMP
+	help
+	  cmp is used to compare two files and returns the result
+	  to standard output.
+config BUSYBOX_CONFIG_DIFF
+	bool "diff"
+	default BUSYBOX_DEFAULT_DIFF
+	help
+	  diff compares two files or directories and outputs the
+	  differences between them in a form that can be given to
+	  the patch command.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_DIFF_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Enable use of long options.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
+	bool "Enable directory support"
+	default BUSYBOX_DEFAULT_FEATURE_DIFF_DIR
+	depends on BUSYBOX_CONFIG_DIFF
+	help
+	  This option enables support for directory and subdirectory
+	  comparison.
+config BUSYBOX_CONFIG_ED
+	bool "ed"
+	default BUSYBOX_DEFAULT_ED
+	help
+	  The original 1970's Unix text editor, from the days of teletypes.
+	  Small, simple, evil. Part of SUSv3. If you're not already using
+	  this, you don't need it.
+config BUSYBOX_CONFIG_PATCH
+	bool "patch"
+	default BUSYBOX_DEFAULT_PATCH
+	help
+	  Apply a unified diff formatted patch.
+config BUSYBOX_CONFIG_SED
+	bool "sed"
+	default BUSYBOX_DEFAULT_SED
+	help
+	  sed is used to perform text transformations on a file
+	  or input from a pipeline.
+config BUSYBOX_CONFIG_VI
+	bool "vi"
+	default BUSYBOX_DEFAULT_VI
+	help
+	  'vi' is a text editor. More specifically, it is the One True
+	  text editor <grin>. It does, however, have a rather steep
+	  learning curve. If you are not already comfortable with 'vi'
+	  you may wish to use something else.
+
+config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN
+	int "Maximum screen width in vi"
+	range 256 16384
+	default BUSYBOX_DEFAULT_FEATURE_VI_MAX_LEN
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Contrary to what you may think, this is not eating much.
+	  Make it smaller than 4k only if you are very limited on memory.
+
+config BUSYBOX_CONFIG_FEATURE_VI_8BIT
+	bool "Allow vi to display 8-bit chars (otherwise shows dots)"
+	default BUSYBOX_DEFAULT_FEATURE_VI_8BIT
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  If your terminal can display characters with high bit set,
+	  you may want to enable this. Note: vi is not Unicode-capable.
+	  If your terminal combines several 8-bit bytes into one character
+	  (as in Unicode mode), this will not work properly.
+
+config BUSYBOX_CONFIG_FEATURE_VI_COLON
+	bool "Enable \":\" colon commands (no \"ex\" mode)"
+	default BUSYBOX_DEFAULT_FEATURE_VI_COLON
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Enable a limited set of colon commands for vi. This does not
+	  provide an "ex" mode.
+
+config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK
+	bool "Enable yank/put commands and mark cmds"
+	default BUSYBOX_DEFAULT_FEATURE_VI_YANKMARK
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  This will enable you to use yank and put, as well as mark in
+	  busybox vi.
+
+config BUSYBOX_CONFIG_FEATURE_VI_SEARCH
+	bool "Enable search and replace cmds"
+	default BUSYBOX_DEFAULT_FEATURE_VI_SEARCH
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Select this if you wish to be able to do search and replace in
+	  busybox vi.
+
+config BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH
+	bool "Enable regex in search and replace"
+	default BUSYBOX_DEFAULT_FEATURE_VI_REGEX_SEARCH   # Uses GNU regex, which may be unavailable. FIXME
+	depends on BUSYBOX_CONFIG_FEATURE_VI_SEARCH
+	help
+	  Use extended regex search.
+
+config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS
+	bool "Catch signals"
+	default BUSYBOX_DEFAULT_FEATURE_VI_USE_SIGNALS
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Selecting this option will make busybox vi signal aware. This will
+	  make busybox vi support SIGWINCH to deal with Window Changes, catch
+	  Ctrl-Z and Ctrl-C and alarms.
+
+config BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD
+	bool "Remember previous cmd and \".\" cmd"
+	default BUSYBOX_DEFAULT_FEATURE_VI_DOT_CMD
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Make busybox vi remember the last command and be able to repeat it.
+
+config BUSYBOX_CONFIG_FEATURE_VI_READONLY
+	bool "Enable -R option and \"view\" mode"
+	default BUSYBOX_DEFAULT_FEATURE_VI_READONLY
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Enable the read-only command line option, which allows the user to
+	  open a file in read-only mode.
+
+config BUSYBOX_CONFIG_FEATURE_VI_SETOPTS
+	bool "Enable set-able options, ai ic showmatch"
+	default BUSYBOX_DEFAULT_FEATURE_VI_SETOPTS
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Enable the editor to set some (ai, ic, showmatch) options.
+
+config BUSYBOX_CONFIG_FEATURE_VI_SET
+	bool "Support for :set"
+	default BUSYBOX_DEFAULT_FEATURE_VI_SET
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Support for ":set".
+
+config BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE
+	bool "Handle window resize"
+	default BUSYBOX_DEFAULT_FEATURE_VI_WIN_RESIZE
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  Make busybox vi behave nicely with terminals that get resized.
+
+config BUSYBOX_CONFIG_FEATURE_VI_ASK_TERMINAL
+	bool "Use 'tell me cursor position' ESC sequence to measure window"
+	default BUSYBOX_DEFAULT_FEATURE_VI_ASK_TERMINAL
+	depends on BUSYBOX_CONFIG_VI
+	help
+	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+	  this option makes vi perform a last-ditch effort to find it:
+	  position cursor to 999,999 and ask terminal to report real
+	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+
+	  This is not clean but helps a lot on serial lines and such.
+
+config BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC
+	bool "Allow vi and awk to execute shell commands"
+	default BUSYBOX_DEFAULT_FEATURE_ALLOW_EXEC
+	depends on BUSYBOX_CONFIG_VI || BUSYBOX_CONFIG_AWK
+	help
+	  Enables vi and awk features which allows user to execute
+	  shell commands (using system() C call).
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/findutils/Config.in b/trunk/package/utils/busybox/config/findutils/Config.in
new file mode 100644
index 00000000..55929d28
--- /dev/null
+++ b/trunk/package/utils/busybox/config/findutils/Config.in
@@ -0,0 +1,252 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Finding Utilities"
+
+config BUSYBOX_CONFIG_FIND
+	bool "find"
+	default BUSYBOX_DEFAULT_FIND
+	help
+	  find is used to search your system to find specified files.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_PRINT0
+	bool "Enable -print0: NUL-terminated output"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_PRINT0
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Causes output names to be separated by a NUL character
+	  rather than a newline. This allows names that contain
+	  newlines and other whitespace to be more easily
+	  interpreted by other programs.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_MTIME
+	bool "Enable -mtime: modified time matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_MTIME
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Allow searching based on the modification time of
+	  files, in days.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_MMIN
+	bool "Enable -mmin: modified time matching by minutes"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_MMIN
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Allow searching based on the modification time of
+	  files, in minutes.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_PERM
+	bool "Enable -perm: permissions matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_PERM
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Enable searching based on file permissions.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_TYPE
+	bool "Enable -type: file type matching (file/dir/link/...)"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_TYPE
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Enable searching based on file type (file,
+	  directory, socket, device, etc.).
+
+config BUSYBOX_CONFIG_FEATURE_FIND_XDEV
+	bool "Enable -xdev: 'stay in filesystem'"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_XDEV
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  This option allows find to restrict searches to a single filesystem.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_MAXDEPTH
+	bool "Enable -mindepth N and -maxdepth N"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_MAXDEPTH
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  This option enables -mindepth N and -maxdepth N option.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_NEWER
+	bool "Enable -newer: compare file modification times"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_NEWER
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the 'find -newer' option for finding any files which have
+	  modification time that is more recent than the specified FILE.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_INUM
+	bool "Enable -inum: inode number matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_INUM
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the 'find -inum' option for searching by inode number.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_EXEC
+	bool "Enable -exec: execute commands"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_EXEC
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the 'find -exec' option for executing commands based upon
+	  the files matched.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_USER
+	bool "Enable -user: username/uid matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_USER
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the 'find -user' option for searching by username or uid.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_GROUP
+	bool "Enable -group: group/gid matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_GROUP
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the 'find -group' option for searching by group name or gid.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_NOT
+	bool "Enable the 'not' (!) operator"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_NOT
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the '!' operator to invert the test results.
+	  If 'Enable full-blown desktop' is enabled, then will also support
+	  the non-POSIX notation '-not'.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_DEPTH
+	bool "Enable -depth"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_DEPTH
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Process each directory's contents before the directory itself.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_PAREN
+	bool "Enable parens in options"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_PAREN
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Enable usage of parens '(' to specify logical order of arguments.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_SIZE
+	bool "Enable -size: file size matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_SIZE
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the 'find -size' option for searching by file size.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_PRUNE
+	bool "Enable -prune: exclude subdirectories"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_PRUNE
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  If the file is a directory, dont descend into it. Useful for
+	  exclusion .svn and CVS directories.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_DELETE
+	bool "Enable -delete: delete files/dirs"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_DELETE
+	depends on BUSYBOX_CONFIG_FIND && BUSYBOX_CONFIG_FEATURE_FIND_DEPTH
+	help
+	  Support the 'find -delete' option for deleting files and directories.
+	  WARNING: This option can do much harm if used wrong. Busybox will not
+	  try to protect the user from doing stupid things. Use with care.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_PATH
+	bool "Enable -path: match pathname with shell pattern"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_PATH
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  The -path option matches whole pathname instead of just filename.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_REGEX
+	bool "Enable -regex: match pathname with regex"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_REGEX
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  The -regex option matches whole pathname against regular expression.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_CONTEXT
+	bool "Enable -context: security context matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_CONTEXT
+	depends on BUSYBOX_CONFIG_FIND && BUSYBOX_CONFIG_SELINUX
+	help
+	  Support the 'find -context' option for matching security context.
+
+config BUSYBOX_CONFIG_FEATURE_FIND_LINKS
+	bool "Enable -links: link count matching"
+	default BUSYBOX_DEFAULT_FEATURE_FIND_LINKS
+	depends on BUSYBOX_CONFIG_FIND
+	help
+	  Support the 'find -links' option for matching number of links.
+config BUSYBOX_CONFIG_GREP
+	bool "grep"
+	default BUSYBOX_DEFAULT_GREP
+	help
+	  grep is used to search files for a specified pattern.
+
+config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS
+	bool "Enable extended regular expressions (egrep & grep -E)"
+	default BUSYBOX_DEFAULT_FEATURE_GREP_EGREP_ALIAS
+	depends on BUSYBOX_CONFIG_GREP
+	help
+	  Enabled support for extended regular expressions. Extended
+	  regular expressions allow for alternation (foo|bar), grouping,
+	  and various repetition operators.
+
+config BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS
+	bool "Alias fgrep to grep -F"
+	default BUSYBOX_DEFAULT_FEATURE_GREP_FGREP_ALIAS
+	depends on BUSYBOX_CONFIG_GREP
+	help
+	  fgrep sees the search pattern as a normal string rather than
+	  regular expressions.
+	  grep -F always works, this just creates the fgrep alias.
+
+config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT
+	bool "Enable before and after context flags (-A, -B and -C)"
+	default BUSYBOX_DEFAULT_FEATURE_GREP_CONTEXT
+	depends on BUSYBOX_CONFIG_GREP
+	help
+	  Print the specified number of leading (-B) and/or trailing (-A)
+	  context surrounding our matching lines.
+	  Print the specified number of context lines (-C).
+config BUSYBOX_CONFIG_XARGS
+	bool "xargs"
+	default BUSYBOX_DEFAULT_XARGS
+	help
+	  xargs is used to execute a specified command for
+	  every item from standard input.
+
+config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
+	bool "Enable -p: prompt and confirmation"
+	default BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_CONFIRMATION
+	depends on BUSYBOX_CONFIG_XARGS
+	help
+	  Support -p: prompt the user whether to run each command
+	  line and read a line from the terminal.
+
+config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
+	bool "Enable single and double quotes and backslash"
+	default BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_QUOTES
+	depends on BUSYBOX_CONFIG_XARGS
+	help
+	  Support quoting in the input.
+
+config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
+	bool "Enable -x: exit if -s or -n is exceeded"
+	default BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_TERMOPT
+	depends on BUSYBOX_CONFIG_XARGS
+	help
+	  Support -x: exit if the command size (see the -s or -n option)
+	  is exceeded.
+
+config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
+	bool "Enable -0: NUL-terminated input"
+	default BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_ZERO_TERM
+	depends on BUSYBOX_CONFIG_XARGS
+	help
+	  Support -0: input items are terminated by a NUL character
+	  instead of whitespace, and the quotes and backslash
+	  are not special.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/init/Config.in b/trunk/package/utils/busybox/config/init/Config.in
new file mode 100644
index 00000000..634207f7
--- /dev/null
+++ b/trunk/package/utils/busybox/config/init/Config.in
@@ -0,0 +1,184 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Init Utilities"
+
+config BUSYBOX_CONFIG_BOOTCHARTD
+	bool "bootchartd"
+	default BUSYBOX_DEFAULT_BOOTCHARTD
+	help
+	  bootchartd is commonly used to profile the boot process
+	  for the purpose of speeding it up. In this case, it is started
+	  by the kernel as the init process. This is configured by adding
+	  the init=/sbin/bootchartd option to the kernel command line.
+
+	  It can also be used to monitor the resource usage of a specific
+	  application or the running system in general. In this case,
+	  bootchartd is started interactively by running bootchartd start
+	  and stopped using bootchartd stop.
+
+config BUSYBOX_CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER
+	bool "Compatible, bloated header"
+	default BUSYBOX_DEFAULT_FEATURE_BOOTCHARTD_BLOATED_HEADER
+	depends on BUSYBOX_CONFIG_BOOTCHARTD
+	help
+	  Create extended header file compatible with "big" bootchartd.
+	  "Big" bootchartd is a shell script and it dumps some
+	  "convenient" info int the header, such as:
+	    title = Boot chart for `hostname` (`date`)
+	    system.uname = `uname -srvm`
+	    system.release = `cat /etc/DISTRO-release`
+	    system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
+	    system.kernel.options = `cat /proc/cmdline`
+	  This data is not mandatory for bootchart graph generation,
+	  and is considered bloat. Nevertheless, this option
+	  makes bootchartd applet to dump a subset of it.
+
+config BUSYBOX_CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE
+	bool "Support bootchartd.conf"
+	default BUSYBOX_DEFAULT_FEATURE_BOOTCHARTD_CONFIG_FILE
+	depends on BUSYBOX_CONFIG_BOOTCHARTD
+	help
+	  Enable reading and parsing of $PWD/bootchartd.conf
+	  and /etc/bootchartd.conf files.
+config BUSYBOX_CONFIG_HALT
+	bool "poweroff, halt, and reboot"
+	default BUSYBOX_DEFAULT_HALT
+	help
+	  Stop all processes and either halt, reboot, or power off the system.
+
+config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
+	bool "Call telinit on shutdown and reboot"
+	default BUSYBOX_DEFAULT_FEATURE_CALL_TELINIT
+	depends on BUSYBOX_CONFIG_HALT && !BUSYBOX_CONFIG_INIT
+	help
+	  Call an external program (normally telinit) to facilitate
+	  a switch to a proper runlevel.
+
+	  This option is only available if you selected halt and friends,
+	  but did not select init.
+
+config BUSYBOX_CONFIG_TELINIT_PATH
+	string "Path to telinit executable"
+	default BUSYBOX_DEFAULT_TELINIT_PATH
+	depends on BUSYBOX_CONFIG_FEATURE_CALL_TELINIT
+	help
+	  When busybox halt and friends have to call external telinit
+	  to facilitate proper shutdown, this path is to be used when
+	  locating telinit executable.
+config BUSYBOX_CONFIG_INIT
+	bool "init"
+	default BUSYBOX_DEFAULT_INIT
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  init is the first program run when the system boots.
+
+config BUSYBOX_CONFIG_FEATURE_USE_INITTAB
+	bool "Support reading an inittab file"
+	default BUSYBOX_DEFAULT_FEATURE_USE_INITTAB
+	depends on BUSYBOX_CONFIG_INIT
+	help
+	  Allow init to read an inittab file when the system boot.
+
+config BUSYBOX_CONFIG_FEATURE_KILL_REMOVED
+	bool "Support killing processes that have been removed from inittab"
+	default BUSYBOX_DEFAULT_FEATURE_KILL_REMOVED
+	depends on BUSYBOX_CONFIG_FEATURE_USE_INITTAB
+	help
+	  When respawn entries are removed from inittab and a SIGHUP is
+	  sent to init, this option will make init kill the processes
+	  that have been removed.
+
+config BUSYBOX_CONFIG_FEATURE_KILL_DELAY
+	int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
+	range 0 1024
+	default BUSYBOX_DEFAULT_FEATURE_KILL_DELAY
+	depends on BUSYBOX_CONFIG_FEATURE_KILL_REMOVED
+	help
+	  With nonzero setting, init sends TERM, forks, child waits N
+	  seconds, sends KILL and exits. Setting it too high is unwise
+	  (child will hang around for too long and could actually kill
+	  the wrong process!)
+
+config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
+	bool "Run commands with leading dash with controlling tty"
+	default BUSYBOX_DEFAULT_FEATURE_INIT_SCTTY
+	depends on BUSYBOX_CONFIG_INIT
+	help
+	  If this option is enabled, init will try to give a controlling
+	  tty to any command which has leading hyphen (often it's "-/bin/sh").
+	  More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
+	  If device attached to STDIN_FILENO can be a ctty but is not yet
+	  a ctty for other session, it will become this process' ctty.
+	  This is not the traditional init behavour, but is often what you want
+	  in an embedded system where the console is only accessed during
+	  development or for maintenance.
+	  NB: using cttyhack applet may work better.
+
+config BUSYBOX_CONFIG_FEATURE_INIT_SYSLOG
+	bool "Enable init to write to syslog"
+	default BUSYBOX_DEFAULT_FEATURE_INIT_SYSLOG
+	depends on BUSYBOX_CONFIG_INIT
+
+config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET
+	bool "Be _extra_ quiet on boot"
+	default BUSYBOX_DEFAULT_FEATURE_EXTRA_QUIET
+	depends on BUSYBOX_CONFIG_INIT
+	help
+	  Prevent init from logging some messages to the console during boot.
+
+config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS
+	bool "Support dumping core for child processes (debugging only)"
+	default BUSYBOX_DEFAULT_FEATURE_INIT_COREDUMPS
+	depends on BUSYBOX_CONFIG_INIT
+	help
+	  If this option is enabled and the file /.init_enable_core
+	  exists, then init will call setrlimit() to allow unlimited
+	  core file sizes. If this option is disabled, processes
+	  will not generate any core files.
+
+config BUSYBOX_CONFIG_FEATURE_INITRD
+	bool "Support running init from within an initrd (not initramfs)"
+	default BUSYBOX_DEFAULT_FEATURE_INITRD
+	depends on BUSYBOX_CONFIG_INIT
+	help
+	  Legacy support for running init under the old-style initrd. Allows
+	  the name linuxrc to act as init, and it doesn't assume init is PID 1.
+
+	  This does not apply to initramfs, which runs /init as PID 1 and
+	  requires no special support.
+
+config BUSYBOX_CONFIG_INIT_TERMINAL_TYPE
+	string "Initial terminal type"
+	default BUSYBOX_DEFAULT_INIT_TERMINAL_TYPE
+	depends on BUSYBOX_CONFIG_INIT
+	help
+	  This is the initial value set by init for the TERM environment
+	  variable. This variable is used by programs which make use of
+	  extended terminal capabilities.
+
+	  Note that on Linux, init attempts to detect serial terminal and
+	  sets TERM to "vt102" if one is found.
+config BUSYBOX_CONFIG_MESG
+	bool "mesg"
+	default BUSYBOX_DEFAULT_MESG
+	help
+	  Mesg controls access to your terminal by others. It is typically
+	  used to allow or disallow other users to write to your terminal
+
+config BUSYBOX_CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP
+	bool "Enable writing to tty only by group, not by everybody"
+	default BUSYBOX_DEFAULT_FEATURE_MESG_ENABLE_ONLY_GROUP
+	depends on BUSYBOX_CONFIG_MESG
+	help
+	  Usually, ttys are owned by group "tty", and "write" tool is
+	  setgid to this group. This way, "mesg y" only needs to enable
+	  "write by owning group" bit in tty mode.
+
+	  If you set this option to N, "mesg y" will enable writing
+	  by anybody at all. This is not recommended.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/libbb/Config.in b/trunk/package/utils/busybox/config/libbb/Config.in
new file mode 100644
index 00000000..e66a15b6
--- /dev/null
+++ b/trunk/package/utils/busybox/config/libbb/Config.in
@@ -0,0 +1,249 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Busybox Library Tuning"
+
+config BUSYBOX_CONFIG_FEATURE_SYSTEMD
+	bool "Enable systemd support"
+	default BUSYBOX_DEFAULT_FEATURE_SYSTEMD
+	help
+	  If you plan to use busybox daemons on a system where daemons
+	  are controlled by systemd, enable this option.
+	  If you don't use systemd, it is still safe to enable it,
+	  but the downside is increased code size.
+config BUSYBOX_CONFIG_FEATURE_RTMINMAX
+	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
+	default BUSYBOX_DEFAULT_FEATURE_RTMINMAX
+	help
+	  Support RTMIN[+n] and RTMAX[-n] signal names
+	  in kill, killall etc. This costs ~250 bytes.
+
+config BUSYBOX_CONFIG_PASSWORD_MINLEN
+	int "Minimum password length"
+	default BUSYBOX_DEFAULT_PASSWORD_MINLEN
+	range 5 32
+	help
+	  Minimum allowable password length.
+
+config BUSYBOX_CONFIG_MD5_SMALL
+	int "MD5: Trade bytes for speed (0:fast, 3:slow)"
+	default BUSYBOX_DEFAULT_MD5_SMALL
+	range 0 3
+	help
+	  Trade binary size versus speed for the md5sum algorithm.
+	  Approximate values running uClibc and hashing
+	  linux-2.4.4.tar.bz2 were:
+	                    user times (sec)  text size (386)
+	  0 (fastest)         1.1                6144
+	  1                   1.4                5392
+	  2                   3.0                5088
+	  3 (smallest)        5.1                4912
+
+config BUSYBOX_CONFIG_SHA3_SMALL
+	int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
+	default BUSYBOX_DEFAULT_SHA3_SMALL
+	range 0 1
+	help
+	  Trade binary size versus speed for the sha3sum algorithm.
+	  SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+	  64-bit x86: +270 bytes of code, 45% faster
+	  32-bit x86: +450 bytes of code, 75% faster
+
+config BUSYBOX_CONFIG_FEATURE_FAST_TOP
+	bool "Faster /proc scanning code (+100 bytes)"
+	default BUSYBOX_DEFAULT_FEATURE_FAST_TOP
+	help
+	  This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
+	  but code size is slightly bigger.
+
+config BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS
+	bool "Support for /etc/networks"
+	default BUSYBOX_DEFAULT_FEATURE_ETC_NETWORKS
+	help
+	  Enable support for network names in /etc/networks. This is
+	  a rarely used feature which allows you to use names
+	  instead of IP/mask pairs in route command.
+
+config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS
+	bool "Use termios to manipulate the screen"
+	default BUSYBOX_DEFAULT_FEATURE_USE_TERMIOS
+	depends on BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TOP || BUSYBOX_CONFIG_POWERTOP
+	help
+	  This option allows utilities such as 'more' and 'top' to determine
+	  the size of the screen. If you leave this disabled, your utilities
+	  that display things on the screen will be especially primitive and
+	  will be unable to determine the current screen size, and will be
+	  unable to move the cursor.
+
+config BUSYBOX_CONFIG_FEATURE_EDITING
+	bool "Command line editing"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING
+	help
+	  Enable line editing (mainly for shell command line).
+
+config BUSYBOX_CONFIG_FEATURE_EDITING_MAX_LEN
+	int "Maximum length of input"
+	range 128 8192
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_MAX_LEN
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+	help
+	  Line editing code uses on-stack buffers for storage.
+	  You may want to decrease this parameter if your target machine
+	  benefits from smaller stack usage.
+
+config BUSYBOX_CONFIG_FEATURE_EDITING_VI
+	bool "vi-style line editing commands"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_VI
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+	help
+	  Enable vi-style line editing. In shells, this mode can be
+	  turned on and off with "set -o vi" and "set +o vi".
+
+config BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY
+	int "History size"
+	# Don't allow way too big values here, code uses fixed "char *history[N]" struct member
+	range 0 9999
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_HISTORY
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+	help
+	  Specify command history size (0 - disable).
+
+config BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY
+	bool "History saving"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_SAVEHISTORY
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+	help
+	  Enable history saving in shells.
+
+config BUSYBOX_CONFIG_FEATURE_EDITING_SAVE_ON_EXIT
+	bool "Save history on shell exit, not after every command"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_SAVE_ON_EXIT
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY
+	help
+	  Save history on shell exit, not after every command.
+
+config BUSYBOX_CONFIG_FEATURE_REVERSE_SEARCH
+	bool "Reverse history search"
+	default BUSYBOX_DEFAULT_FEATURE_REVERSE_SEARCH
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY
+	help
+	  Enable readline-like Ctrl-R combination for reverse history search.
+	  Increases code by about 0.5k.
+
+config BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION
+	bool "Tab completion"
+	default BUSYBOX_DEFAULT_FEATURE_TAB_COMPLETION
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+	help
+	  Enable tab completion.
+
+config BUSYBOX_CONFIG_FEATURE_USERNAME_COMPLETION
+	bool "Username completion"
+	default BUSYBOX_DEFAULT_FEATURE_USERNAME_COMPLETION
+	depends on BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION
+	help
+	  Enable username completion.
+
+config BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT
+	bool "Fancy shell prompts"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_FANCY_PROMPT
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+	help
+	  Setting this option allows for prompts to use things like \w and
+	  \$ and escape codes.
+
+config BUSYBOX_CONFIG_FEATURE_EDITING_ASK_TERMINAL
+	bool "Query cursor position from terminal"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_ASK_TERMINAL
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+	help
+	  Allow usage of "ESC [ 6 n" sequence. Terminal answers back with
+	  current cursor position. This information is used to make line
+	  editing more robust in some cases.
+	  If you are not sure whether your terminals respond to this code
+	  correctly, or want to save on code size (about 400 bytes),
+	  then do not turn this option on.
+
+config BUSYBOX_CONFIG_FEATURE_NON_POSIX_CP
+	bool "Non-POSIX, but safer, copying to special nodes"
+	default BUSYBOX_DEFAULT_FEATURE_NON_POSIX_CP
+	help
+	  With this option, "cp file symlink" will delete symlink
+	  and create a regular file. This does not conform to POSIX,
+	  but prevents a symlink attack.
+	  Similarly, "cp file device" will not send file's data
+	  to the device. (To do that, use "cat file >device")
+
+config BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE
+	bool "Give more precise messages when copy fails (cp, mv etc)"
+	default BUSYBOX_DEFAULT_FEATURE_VERBOSE_CP_MESSAGE
+	help
+	  Error messages with this feature enabled:
+	    $ cp file /does_not_exist/file
+	    cp: cannot create '/does_not_exist/file': Path does not exist
+	    $ cp file /vmlinuz/file
+	    cp: cannot stat '/vmlinuz/file': Path has non-directory component
+	  If this feature is not enabled, they will be, respectively:
+	    cp: cannot create '/does_not_exist/file': No such file or directory
+	    cp: cannot stat '/vmlinuz/file': Not a directory
+	  This will cost you ~60 bytes.
+
+config BUSYBOX_CONFIG_FEATURE_COPYBUF_KB
+	int "Copy buffer size, in kilobytes"
+	range 1 1024
+	default BUSYBOX_DEFAULT_FEATURE_COPYBUF_KB
+	help
+	  Size of buffer used by cp, mv, install, wget etc.
+	  Buffers which are 4 kb or less will be allocated on stack.
+	  Bigger buffers will be allocated with mmap, with fallback to 4 kb
+	  stack buffer if mmap fails.
+
+config BUSYBOX_CONFIG_FEATURE_SKIP_ROOTFS
+	bool "Skip rootfs in mount table"
+	default BUSYBOX_DEFAULT_FEATURE_SKIP_ROOTFS
+	help
+	  Ignore rootfs entry in mount table.
+
+	  In Linux, kernel has a special filesystem, rootfs, which is initially
+	  mounted on /. It contains initramfs data, if kernel is configured
+	  to have one. Usually, another file system is mounted over / early
+	  in boot process, and therefore most tools which manipulate
+	  mount table, such as df, will skip rootfs entry.
+
+	  However, some systems do not mount anything on /.
+	  If you need to configure busybox for one of these systems,
+	  you may find it useful to turn this option off to make df show
+	  initramfs statistics.
+
+	  Otherwise, choose Y.
+
+config BUSYBOX_CONFIG_MONOTONIC_SYSCALL
+	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
+	default BUSYBOX_DEFAULT_MONOTONIC_SYSCALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
+	  time intervals (time, ping, traceroute etc need this).
+	  Probably requires Linux 2.6+. If not selected, gettimeofday
+	  will be used instead (which gives wrong results if date/time
+	  is reset).
+
+config BUSYBOX_CONFIG_IOCTL_HEX2STR_ERROR
+	bool "Use ioctl names rather than hex values in error messages"
+	default BUSYBOX_DEFAULT_IOCTL_HEX2STR_ERROR
+	help
+	  Use ioctl names rather than hex values in error messages
+	  (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
+	  saves about 1400 bytes.
+
+config BUSYBOX_CONFIG_FEATURE_HWIB
+	bool "Support infiniband HW"
+	default BUSYBOX_DEFAULT_FEATURE_HWIB
+	help
+	  Support for printing infiniband addresses in
+	  network applets.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/loginutils/Config.in b/trunk/package/utils/busybox/config/loginutils/Config.in
new file mode 100644
index 00000000..7fbe6a0a
--- /dev/null
+++ b/trunk/package/utils/busybox/config/loginutils/Config.in
@@ -0,0 +1,342 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Login/Password Management Utilities"
+
+config BUSYBOX_CONFIG_ADD_SHELL
+       bool "add-shell"
+       default BUSYBOX_DEFAULT_ADD_SHELL if BUSYBOX_CONFIG_DESKTOP
+       help
+         Add shells to /etc/shells.
+
+config BUSYBOX_CONFIG_REMOVE_SHELL
+       bool "remove-shell"
+       default BUSYBOX_DEFAULT_REMOVE_SHELL if BUSYBOX_CONFIG_DESKTOP
+       help
+         Remove shells from /etc/shells.
+
+config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
+	bool "Support for shadow passwords"
+	default BUSYBOX_DEFAULT_FEATURE_SHADOWPASSWDS
+	help
+	  Build support for shadow password in /etc/shadow. This file is only
+	  readable by root and thus the encrypted passwords are no longer
+	  publicly readable.
+
+config BUSYBOX_CONFIG_USE_BB_PWD_GRP
+	bool "Use internal password and group functions rather than system functions"
+	default BUSYBOX_DEFAULT_USE_BB_PWD_GRP
+	help
+	  If you leave this disabled, busybox will use the system's password
+	  and group functions. And if you are using the GNU C library
+	  (glibc), you will then need to install the /etc/nsswitch.conf
+	  configuration file and the required /lib/libnss_* libraries in
+	  order for the password and group functions to work. This generally
+	  makes your embedded system quite a bit larger.
+
+	  Enabling this option will cause busybox to directly access the
+	  system's /etc/password, /etc/group files (and your system will be
+	  smaller, and I will get fewer emails asking about how glibc NSS
+	  works). When this option is enabled, you will not be able to use
+	  PAM to access remote LDAP password servers and whatnot. And if you
+	  want hostname resolution to work with glibc, you still need the
+	  /lib/libnss_* libraries.
+
+	  If you need to use glibc's nsswitch.conf mechanism
+	  (e.g. if user/group database is NOT stored in /etc/passwd etc),
+	  you must NOT use this option.
+
+	  If you enable this option, it will add about 1.5k.
+
+config BUSYBOX_CONFIG_USE_BB_SHADOW
+	bool "Use internal shadow password functions"
+	default BUSYBOX_DEFAULT_USE_BB_SHADOW
+	depends on BUSYBOX_CONFIG_USE_BB_PWD_GRP && BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
+	help
+	  If you leave this disabled, busybox will use the system's shadow
+	  password handling functions. And if you are using the GNU C library
+	  (glibc), you will then need to install the /etc/nsswitch.conf
+	  configuration file and the required /lib/libnss_* libraries in
+	  order for the shadow password functions to work. This generally
+	  makes your embedded system quite a bit larger.
+
+	  Enabling this option will cause busybox to directly access the
+	  system's /etc/shadow file when handling shadow passwords. This
+	  makes your system smaller (and I will get fewer emails asking about
+	  how glibc NSS works). When this option is enabled, you will not be
+	  able to use PAM to access shadow passwords from remote LDAP
+	  password servers and whatnot.
+
+config BUSYBOX_CONFIG_USE_BB_CRYPT
+	bool "Use internal crypt functions"
+	default BUSYBOX_DEFAULT_USE_BB_CRYPT
+	help
+	  Busybox has internal DES and MD5 crypt functions.
+	  They produce results which are identical to corresponding
+	  standard C library functions.
+
+	  If you leave this disabled, busybox will use the system's
+	  crypt functions. Most C libraries use large (~70k)
+	  static buffers there, and also combine them with more general
+	  DES encryption/decryption.
+
+	  For busybox, having large static buffers is undesirable,
+	  especially on NOMMU machines. Busybox also doesn't need
+	  DES encryption/decryption and can do with smaller code.
+
+	  If you enable this option, it will add about 4.8k of code
+	  if you are building dynamically linked executable.
+	  In static build, it makes code _smaller_ by about 1.2k,
+	  and likely many kilobytes less of bss.
+
+config BUSYBOX_CONFIG_USE_BB_CRYPT_SHA
+	bool "Enable SHA256/512 crypt functions"
+	default BUSYBOX_DEFAULT_USE_BB_CRYPT_SHA
+	depends on BUSYBOX_CONFIG_USE_BB_CRYPT
+	help
+	  Enable this if you have passwords starting with "$5$" or "$6$"
+	  in your /etc/passwd or /etc/shadow files. These passwords
+	  are hashed using SHA256 and SHA512 algorithms. Support for them
+	  was added to glibc in 2008.
+	  With this option off, login will fail password check for any
+	  user which has password encrypted with these algorithms.
+
+config BUSYBOX_CONFIG_ADDUSER
+	bool "adduser"
+	default BUSYBOX_DEFAULT_ADDUSER
+	help
+	  Utility for creating a new user account.
+
+config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_ADDUSER_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the adduser applet.
+
+config BUSYBOX_CONFIG_FEATURE_CHECK_NAMES
+	bool "Enable sanity check on user/group names in adduser and addgroup"
+	default BUSYBOX_DEFAULT_FEATURE_CHECK_NAMES
+	depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP
+	help
+	  Enable sanity check on user and group names in adduser and addgroup.
+	  To avoid problems, the user or group name should consist only of
+	  letters, digits, underscores, periods, at signs and dashes,
+	  and not start with a dash (as defined by IEEE Std 1003.1-2001).
+	  For compatibility with Samba machine accounts "$" is also supported
+	  at the end of the user or group name.
+
+config BUSYBOX_CONFIG_FIRST_SYSTEM_ID
+	int "First valid system uid or gid for adduser and addgroup"
+	depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP
+	range 0 64900
+	default BUSYBOX_DEFAULT_FIRST_SYSTEM_ID
+	help
+	  First valid system uid or gid for adduser and addgroup
+
+config BUSYBOX_CONFIG_LAST_SYSTEM_ID
+	int "Last valid system uid or gid for adduser and addgroup"
+	depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP
+	range 0 64900
+	default BUSYBOX_DEFAULT_LAST_SYSTEM_ID
+	help
+	  Last valid system uid or gid for adduser and addgroup
+
+config BUSYBOX_CONFIG_ADDGROUP
+	bool "addgroup"
+	default BUSYBOX_DEFAULT_ADDGROUP
+	help
+	  Utility for creating a new group account.
+
+config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_ADDGROUP_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the addgroup applet.
+
+config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
+	bool "Support for adding users to groups"
+	default BUSYBOX_DEFAULT_FEATURE_ADDUSER_TO_GROUP
+	depends on BUSYBOX_CONFIG_ADDGROUP
+	help
+	  If  called  with two non-option arguments,
+	  addgroup will add an existing user to an
+	  existing group.
+
+config BUSYBOX_CONFIG_DELUSER
+	bool "deluser"
+	default BUSYBOX_DEFAULT_DELUSER
+	help
+	  Utility for deleting a user account.
+
+config BUSYBOX_CONFIG_DELGROUP
+	bool "delgroup"
+	default BUSYBOX_DEFAULT_DELGROUP
+	help
+	  Utility for deleting a group account.
+
+config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP
+	bool "Support for removing users from groups"
+	default BUSYBOX_DEFAULT_FEATURE_DEL_USER_FROM_GROUP
+	depends on BUSYBOX_CONFIG_DELGROUP
+	help
+	  If called with two non-option arguments, deluser
+	  or delgroup will remove an user from a specified group.
+
+config BUSYBOX_CONFIG_GETTY
+	bool "getty"
+	default BUSYBOX_DEFAULT_GETTY
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  getty lets you log in on a tty. It is normally invoked by init.
+
+	  Note that you can save a few bytes by disabling it and
+	  using login applet directly.
+	  If you need to reset tty attributes before calling login,
+	  this script approximates getty:
+
+	  exec </dev/$1 >/dev/$1 2>&1 || exit 1
+	  reset
+	  stty sane; stty ispeed 38400; stty ospeed 38400
+	  printf "%s login: " "`hostname`"
+	  read -r login
+	  exec /bin/login "$login"
+
+config BUSYBOX_CONFIG_LOGIN
+	bool "login"
+	default BUSYBOX_DEFAULT_LOGIN
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  login is used when signing onto a system.
+
+	  Note that Busybox binary must be setuid root for this applet to
+	  work properly.
+
+config BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD
+	bool "Run logged in session in a child process"
+	default BUSYBOX_DEFAULT_LOGIN_SESSION_AS_CHILD if BUSYBOX_CONFIG_PAM
+	depends on BUSYBOX_CONFIG_LOGIN
+	help
+	  Run the logged in session in a child process.  This allows
+	  login to clean up things such as utmp entries or PAM sessions
+	  when the login session is complete.  If you use PAM, you
+	  almost always would want this to be set to Y, else PAM session
+	  will not be cleaned up.
+
+config BUSYBOX_CONFIG_PAM
+	bool "Support for PAM (Pluggable Authentication Modules)"
+	default BUSYBOX_DEFAULT_PAM
+	depends on BUSYBOX_CONFIG_LOGIN
+	help
+	  Use PAM in login(1) instead of direct access to password database.
+
+config BUSYBOX_CONFIG_LOGIN_SCRIPTS
+	bool "Support for login scripts"
+	depends on BUSYBOX_CONFIG_LOGIN
+	default BUSYBOX_DEFAULT_LOGIN_SCRIPTS
+	help
+	  Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
+	  just prior to switching from root to logged-in user.
+
+config BUSYBOX_CONFIG_FEATURE_NOLOGIN
+	bool "Support for /etc/nologin"
+	default BUSYBOX_DEFAULT_FEATURE_NOLOGIN
+	depends on BUSYBOX_CONFIG_LOGIN
+	help
+	  The file /etc/nologin is used by (some versions of) login(1).
+	  If it exists, non-root logins are prohibited.
+
+config BUSYBOX_CONFIG_FEATURE_SECURETTY
+	bool "Support for /etc/securetty"
+	default BUSYBOX_DEFAULT_FEATURE_SECURETTY
+	depends on BUSYBOX_CONFIG_LOGIN
+	help
+	  The file /etc/securetty is used by (some versions of) login(1).
+	  The file contains the device names of tty lines (one per line,
+	  without leading /dev/) on which root is allowed to login.
+
+config BUSYBOX_CONFIG_PASSWD
+	bool "passwd"
+	default BUSYBOX_DEFAULT_PASSWD
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  passwd changes passwords for user and group accounts. A normal user
+	  may only change the password for his/her own account, the super user
+	  may change the password for any account. The administrator of a group
+	  may change the password for the group.
+
+	  Note that Busybox binary must be setuid root for this applet to
+	  work properly.
+
+config BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK
+	bool "Check new passwords for weakness"
+	default BUSYBOX_DEFAULT_FEATURE_PASSWD_WEAK_CHECK
+	depends on BUSYBOX_CONFIG_PASSWD
+	help
+	  With this option passwd will refuse new passwords which are "weak".
+
+config BUSYBOX_CONFIG_CRYPTPW
+	bool "cryptpw"
+	default BUSYBOX_DEFAULT_CRYPTPW
+	help
+	  Encrypts the given password with the crypt(3) libc function
+	  using the given salt. Debian has this utility under mkpasswd
+	  name. Busybox provides mkpasswd as an alias for cryptpw.
+
+config BUSYBOX_CONFIG_CHPASSWD
+	bool "chpasswd"
+	default BUSYBOX_DEFAULT_CHPASSWD
+	help
+	  Reads a file of user name and password pairs from standard input
+	  and uses this information to update a group of existing users.
+
+config BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO
+	string "Default password encryption method (passwd -a, cryptpw -m parameter)"
+	default BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO
+	depends on BUSYBOX_CONFIG_PASSWD || BUSYBOX_CONFIG_CRYPTPW
+	help
+	  Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
+
+config BUSYBOX_CONFIG_SU
+	bool "su"
+	default BUSYBOX_DEFAULT_SU
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  su is used to become another user during a login session.
+	  Invoked without a username, su defaults to becoming the super user.
+
+	  Note that Busybox binary must be setuid root for this applet to
+	  work properly.
+
+config BUSYBOX_CONFIG_FEATURE_SU_SYSLOG
+	bool "Enable su to write to syslog"
+	default BUSYBOX_DEFAULT_FEATURE_SU_SYSLOG
+	depends on BUSYBOX_CONFIG_SU
+
+config BUSYBOX_CONFIG_FEATURE_SU_CHECKS_SHELLS
+	bool "Enable su to check user's shell to be listed in /etc/shells"
+	depends on BUSYBOX_CONFIG_SU
+	default BUSYBOX_DEFAULT_FEATURE_SU_CHECKS_SHELLS
+
+config BUSYBOX_CONFIG_SULOGIN
+	bool "sulogin"
+	default BUSYBOX_DEFAULT_SULOGIN
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  sulogin is invoked when the system goes into single user
+	  mode (this is done through an entry in inittab).
+
+config BUSYBOX_CONFIG_VLOCK
+	bool "vlock"
+	default BUSYBOX_DEFAULT_VLOCK
+	help
+	  Build the "vlock" applet which allows you to lock (virtual) terminals.
+
+	  Note that Busybox binary must be setuid root for this applet to
+	  work properly.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/mailutils/Config.in b/trunk/package/utils/busybox/config/mailutils/Config.in
new file mode 100644
index 00000000..64b9a2ba
--- /dev/null
+++ b/trunk/package/utils/busybox/config/mailutils/Config.in
@@ -0,0 +1,55 @@
+# DO NOT EDIT. This file is generated from Config.src
+menu "Mail Utilities"
+
+
+config BUSYBOX_CONFIG_MAKEMIME
+	bool "makemime"
+	default BUSYBOX_DEFAULT_MAKEMIME
+	help
+	  Create MIME-formatted messages.
+
+config BUSYBOX_CONFIG_FEATURE_MIME_CHARSET
+	string "Default charset"
+	default BUSYBOX_DEFAULT_FEATURE_MIME_CHARSET
+	depends on BUSYBOX_CONFIG_MAKEMIME || BUSYBOX_CONFIG_REFORMIME || BUSYBOX_CONFIG_SENDMAIL
+	help
+	  Default charset of the message.
+
+config BUSYBOX_CONFIG_POPMAILDIR
+	bool "popmaildir"
+	default BUSYBOX_DEFAULT_POPMAILDIR
+	help
+	  Simple yet powerful POP3 mail popper. Delivers content
+	  of remote mailboxes to local Maildir.
+
+config BUSYBOX_CONFIG_FEATURE_POPMAILDIR_DELIVERY
+	bool "Allow message filters and custom delivery program"
+	default BUSYBOX_DEFAULT_FEATURE_POPMAILDIR_DELIVERY
+	depends on BUSYBOX_CONFIG_POPMAILDIR
+	help
+	  Allow to use a custom program to filter the content
+	  of the message before actual delivery (-F "prog [args...]").
+	  Allow to use a custom program for message actual delivery
+	  (-M "prog [args...]").
+
+config BUSYBOX_CONFIG_REFORMIME
+	bool "reformime"
+	default BUSYBOX_DEFAULT_REFORMIME
+	help
+	  Parse MIME-formatted messages.
+
+config BUSYBOX_CONFIG_FEATURE_REFORMIME_COMPAT
+	bool "Accept and ignore options other than -x and -X"
+	default BUSYBOX_DEFAULT_FEATURE_REFORMIME_COMPAT
+	depends on BUSYBOX_CONFIG_REFORMIME
+	help
+	  Accept (for compatibility only) and ignore options
+	  other than -x and -X.
+
+config BUSYBOX_CONFIG_SENDMAIL
+	bool "sendmail"
+	default BUSYBOX_DEFAULT_SENDMAIL
+	help
+	  Barebones sendmail.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/miscutils/Config.in b/trunk/package/utils/busybox/config/miscutils/Config.in
new file mode 100644
index 00000000..0e0e459a
--- /dev/null
+++ b/trunk/package/utils/busybox/config/miscutils/Config.in
@@ -0,0 +1,762 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Miscellaneous Utilities"
+
+config BUSYBOX_CONFIG_CONSPY
+	bool "conspy"
+	default BUSYBOX_DEFAULT_CONSPY
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  A text-mode VNC like program for Linux virtual terminals.
+	  example:  conspy NUM      shared access to console num
+	  or        conspy -nd NUM  screenshot of console num
+	  or        conspy -cs NUM  poor man's GNU screen like
+config BUSYBOX_CONFIG_LESS
+	bool "less"
+	default BUSYBOX_DEFAULT_LESS
+	help
+	  'less' is a pager, meaning that it displays text files. It possesses
+	  a wide array of features, and is an improvement over 'more'.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES
+	int "Max number of input lines less will try to eat"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_MAXLINES
+	depends on BUSYBOX_CONFIG_LESS
+
+config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS
+	bool "Enable bracket searching"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_BRACKETS
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  This option adds the capability to search for matching left and right
+	  brackets, facilitating programming.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
+	bool "Enable -m/-M"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  The -M/-m flag enables a more sophisticated status line.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
+	bool "Enable marks"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  Marks enable positions in a file to be stored for easy reference.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP
+	bool "Enable regular expressions"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_REGEXP
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  Enable regular expressions, allowing complex file searches.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_WINCH
+	bool "Enable automatic resizing on window size changes"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_WINCH
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  Makes less track window size changes.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_ASK_TERMINAL
+	bool "Use 'tell me cursor position' ESC sequence to measure window"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_ASK_TERMINAL
+	depends on BUSYBOX_CONFIG_FEATURE_LESS_WINCH
+	help
+	  Makes less track window size changes.
+	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+	  this option makes less perform a last-ditch effort to find it:
+	  position cursor to 999,999 and ask terminal to report real
+	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+
+	  This is not clean but helps a lot on serial lines and such.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	bool "Enable flag changes ('-' command)"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_DASHCMD
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  This enables the ability to change command-line flags within
+	  less itself ('-' keyboard command).
+
+config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS
+	bool "Enable dynamic switching of line numbers"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_LINENUMS
+	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	help
+	  Enables "-N" command.
+config BUSYBOX_CONFIG_NANDWRITE
+	bool "nandwrite"
+	default BUSYBOX_DEFAULT_NANDWRITE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Write to the specified MTD device, with bad blocks awareness
+
+config BUSYBOX_CONFIG_NANDDUMP
+	bool "nanddump"
+	default BUSYBOX_DEFAULT_NANDDUMP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Dump the content of raw NAND chip
+config BUSYBOX_CONFIG_RFKILL
+	bool "rfkill"
+	default BUSYBOX_DEFAULT_RFKILL # doesn't build on Ubuntu 9.04
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Enable/disable wireless devices.
+
+	  rfkill list : list all wireless devices
+	  rfkill list bluetooth : list all bluetooth devices
+	  rfkill list 1 : list device corresponding to the given index
+	  rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
+
+config BUSYBOX_CONFIG_SETSERIAL
+	bool "setserial"
+	default BUSYBOX_DEFAULT_SETSERIAL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Retrieve or set Linux serial port.
+config BUSYBOX_CONFIG_UBIATTACH
+	bool "ubiattach"
+	default BUSYBOX_DEFAULT_UBIATTACH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Attach MTD device to an UBI device.
+
+config BUSYBOX_CONFIG_UBIDETACH
+	bool "ubidetach"
+	default BUSYBOX_DEFAULT_UBIDETACH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Detach MTD device from an UBI device.
+
+config BUSYBOX_CONFIG_UBIMKVOL
+	bool "ubimkvol"
+	default BUSYBOX_DEFAULT_UBIMKVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Create a UBI volume.
+
+config BUSYBOX_CONFIG_UBIRMVOL
+	bool "ubirmvol"
+	default BUSYBOX_DEFAULT_UBIRMVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Delete a UBI volume.
+
+config BUSYBOX_CONFIG_UBIRSVOL
+	bool "ubirsvol"
+	default BUSYBOX_DEFAULT_UBIRSVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Resize a UBI volume.
+
+config BUSYBOX_CONFIG_UBIUPDATEVOL
+	bool "ubiupdatevol"
+	default BUSYBOX_DEFAULT_UBIUPDATEVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Update a UBI volume.
+config BUSYBOX_CONFIG_WALL
+	bool "wall"
+	default BUSYBOX_DEFAULT_WALL
+	depends on BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	  Write a message to all users that are logged in.
+
+config BUSYBOX_CONFIG_ADJTIMEX
+	bool "adjtimex"
+	default BUSYBOX_DEFAULT_ADJTIMEX
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Adjtimex reads and optionally sets adjustment parameters for
+	  the Linux clock adjustment algorithm.
+
+config BUSYBOX_CONFIG_BBCONFIG
+	bool "bbconfig"
+	default BUSYBOX_DEFAULT_BBCONFIG
+	help
+	  The bbconfig applet will print the config file with which
+	  busybox was built.
+
+config BUSYBOX_CONFIG_FEATURE_COMPRESS_BBCONFIG
+	bool "Compress bbconfig data"
+	default BUSYBOX_DEFAULT_FEATURE_COMPRESS_BBCONFIG
+	depends on BUSYBOX_CONFIG_BBCONFIG
+	help
+	  Store bbconfig data in compressed form, uncompress them on-the-fly
+	  before output.
+
+	  If you have a really tiny busybox with few applets enabled (and
+	  bunzip2 isn't one of them), the overhead of the decompressor might
+	  be noticeable. Also, if you run executables directly from ROM
+	  and have very little memory, this might not be a win. Otherwise,
+	  you probably want this.
+
+config BUSYBOX_CONFIG_BEEP
+	bool "beep"
+	default BUSYBOX_DEFAULT_BEEP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The beep applets beeps in a given freq/Hz.
+
+config BUSYBOX_CONFIG_FEATURE_BEEP_FREQ
+	int "default frequency"
+	range 0 2147483647
+	default BUSYBOX_DEFAULT_FEATURE_BEEP_FREQ
+	depends on BUSYBOX_CONFIG_BEEP
+	help
+	  Frequency for default beep.
+
+config BUSYBOX_CONFIG_FEATURE_BEEP_LENGTH_MS
+	int "default length"
+	range 0 2147483647
+	default BUSYBOX_DEFAULT_FEATURE_BEEP_LENGTH_MS
+	depends on BUSYBOX_CONFIG_BEEP
+	help
+	  Length in ms for default beep.
+
+config BUSYBOX_CONFIG_CHAT
+	bool "chat"
+	default BUSYBOX_DEFAULT_CHAT
+	help
+	  Simple chat utility.
+
+config BUSYBOX_CONFIG_FEATURE_CHAT_NOFAIL
+	bool "Enable NOFAIL expect strings"
+	depends on BUSYBOX_CONFIG_CHAT
+	default BUSYBOX_DEFAULT_FEATURE_CHAT_NOFAIL
+	help
+	  When enabled expect strings which are started with a dash trigger
+	  no-fail mode. That is when expectation is not met within timeout
+	  the script is not terminated but sends next SEND string and waits
+	  for next EXPECT string. This allows to compose far more flexible
+	  scripts.
+
+config BUSYBOX_CONFIG_FEATURE_CHAT_TTY_HIFI
+	bool "Force STDIN to be a TTY"
+	depends on BUSYBOX_CONFIG_CHAT
+	default BUSYBOX_DEFAULT_FEATURE_CHAT_TTY_HIFI
+	help
+	  Original chat always treats STDIN as a TTY device and sets for it
+	  so-called raw mode. This option turns on such behaviour.
+
+config BUSYBOX_CONFIG_FEATURE_CHAT_IMPLICIT_CR
+	bool "Enable implicit Carriage Return"
+	depends on BUSYBOX_CONFIG_CHAT
+	default BUSYBOX_DEFAULT_FEATURE_CHAT_IMPLICIT_CR
+	help
+	  When enabled make chat to terminate all SEND strings with a "\r"
+	  unless "\c" is met anywhere in the string.
+
+config BUSYBOX_CONFIG_FEATURE_CHAT_SWALLOW_OPTS
+	bool "Swallow options"
+	depends on BUSYBOX_CONFIG_CHAT
+	default BUSYBOX_DEFAULT_FEATURE_CHAT_SWALLOW_OPTS
+	help
+	  Busybox chat require no options. To make it not fail when used
+	  in place of original chat (which has a bunch of options) turn
+	  this on.
+
+config BUSYBOX_CONFIG_FEATURE_CHAT_SEND_ESCAPES
+	bool "Support weird SEND escapes"
+	depends on BUSYBOX_CONFIG_CHAT
+	default BUSYBOX_DEFAULT_FEATURE_CHAT_SEND_ESCAPES
+	help
+	  Original chat uses some escape sequences in SEND arguments which
+	  are not sent to device but rather performs special actions.
+	  E.g. "\K" means to send a break sequence to device.
+	  "\d" delays execution for a second, "\p" -- for a 1/100 of second.
+	  Before turning this option on think twice: do you really need them?
+
+config BUSYBOX_CONFIG_FEATURE_CHAT_VAR_ABORT_LEN
+	bool "Support variable-length ABORT conditions"
+	depends on BUSYBOX_CONFIG_CHAT
+	default BUSYBOX_DEFAULT_FEATURE_CHAT_VAR_ABORT_LEN
+	help
+	  Original chat uses fixed 50-bytes length ABORT conditions. Say N here.
+
+config BUSYBOX_CONFIG_FEATURE_CHAT_CLR_ABORT
+	bool "Support revoking of ABORT conditions"
+	depends on BUSYBOX_CONFIG_CHAT
+	default BUSYBOX_DEFAULT_FEATURE_CHAT_CLR_ABORT
+	help
+	  Support CLR_ABORT directive.
+
+config BUSYBOX_CONFIG_CHRT
+	bool "chrt"
+	default BUSYBOX_DEFAULT_CHRT
+	help
+	  manipulate real-time attributes of a process.
+	  This requires sched_{g,s}etparam support in your libc.
+
+config BUSYBOX_CONFIG_CROND
+	bool "crond"
+	default BUSYBOX_DEFAULT_CROND
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  Crond is a background daemon that parses individual crontab
+	  files and executes commands on behalf of the users in question.
+	  This is a port of dcron from slackware. It uses files of the
+	  format /var/spool/cron/crontabs/<username> files, for example:
+	      $ cat /var/spool/cron/crontabs/root
+	      # Run daily cron jobs at 4:40 every day:
+	      40 4 * * * /etc/cron/daily > /dev/null 2>&1
+
+config BUSYBOX_CONFIG_FEATURE_CROND_D
+	bool "Support option -d to redirect output to stderr"
+	depends on BUSYBOX_CONFIG_CROND
+	default BUSYBOX_DEFAULT_FEATURE_CROND_D
+	help
+	  -d sets loglevel to 0 (most verbose) and directs all output to stderr.
+
+config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL
+	bool "Report command output via email (using sendmail)"
+	default BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
+	depends on BUSYBOX_CONFIG_CROND
+	help
+	  Command output will be sent to corresponding user via email.
+
+config BUSYBOX_CONFIG_FEATURE_CROND_DIR
+	string "crond spool directory"
+	default BUSYBOX_DEFAULT_FEATURE_CROND_DIR
+	depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB
+	help
+	  Location of crond spool.
+
+config BUSYBOX_CONFIG_CRONTAB
+	bool "crontab"
+	default BUSYBOX_DEFAULT_CRONTAB
+	help
+	  Crontab manipulates the crontab for a particular user. Only
+	  the superuser may specify a different user and/or crontab directory.
+	  Note that Busybox binary must be setuid root for this applet to
+	  work properly.
+
+config BUSYBOX_CONFIG_DC
+	bool "dc"
+	default BUSYBOX_DEFAULT_DC
+	help
+	  Dc is a reverse-polish desk calculator which supports unlimited
+	  precision arithmetic.
+
+config BUSYBOX_CONFIG_FEATURE_DC_LIBM
+	bool "Enable power and exp functions (requires libm)"
+	default BUSYBOX_DEFAULT_FEATURE_DC_LIBM
+	depends on BUSYBOX_CONFIG_DC
+	help
+	  Enable power and exp functions.
+	  NOTE: This will require libm to be present for linking.
+
+config BUSYBOX_CONFIG_DEVFSD
+	bool "devfsd (obsolete)"
+	default BUSYBOX_DEFAULT_DEVFSD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  This is deprecated and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+	  See docs/mdev.txt for detailed instructions on how to use mdev
+	  instead.
+
+	  Provides compatibility with old device names on a devfs systems.
+	  You should set it to true if you have devfs enabled.
+	  The following keywords in devsfd.conf are supported:
+	  "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
+	  "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
+	  "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
+
+	  But only if they are written UPPERCASE!!!!!!!!
+
+config BUSYBOX_CONFIG_DEVFSD_MODLOAD
+	bool "Adds support for MODLOAD keyword in devsfd.conf"
+	default BUSYBOX_DEFAULT_DEVFSD_MODLOAD
+	depends on BUSYBOX_CONFIG_DEVFSD
+	help
+	  This actually doesn't work with busybox modutils but needs
+	  the external modutils.
+
+config BUSYBOX_CONFIG_DEVFSD_FG_NP
+	bool "Enables the -fg and -np options"
+	default BUSYBOX_DEFAULT_DEVFSD_FG_NP
+	depends on BUSYBOX_CONFIG_DEVFSD
+	help
+	  -fg  Run the daemon in the foreground.
+	  -np  Exit after parsing the configuration file.
+	       Do not poll for events.
+
+config BUSYBOX_CONFIG_DEVFSD_VERBOSE
+	bool "Increases logging (and size)"
+	default BUSYBOX_DEFAULT_DEVFSD_VERBOSE
+	depends on BUSYBOX_CONFIG_DEVFSD
+	help
+	  Increases logging to stderr or syslog.
+
+config BUSYBOX_CONFIG_FEATURE_DEVFS
+	bool "Use devfs names for all devices (obsolete)"
+	default BUSYBOX_DEFAULT_FEATURE_DEVFS
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This is obsolete and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+
+	  For legacy systems -- if there is no way around devfsd -- this
+	  tells busybox to look for names like /dev/loop/0 instead of
+	  /dev/loop0. If your /dev directory has normal names instead of
+	  devfs names, you don't want this.
+
+config BUSYBOX_CONFIG_DEVMEM
+	bool "devmem"
+	default BUSYBOX_DEFAULT_DEVMEM
+	help
+	  devmem is a small program that reads and writes from physical
+	  memory using /dev/mem.
+
+config BUSYBOX_CONFIG_EJECT
+	bool "eject"
+	default BUSYBOX_DEFAULT_EJECT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Used to eject cdroms. (defaults to /dev/cdrom)
+
+config BUSYBOX_CONFIG_FEATURE_EJECT_SCSI
+	bool "SCSI support"
+	default BUSYBOX_DEFAULT_FEATURE_EJECT_SCSI
+	depends on BUSYBOX_CONFIG_EJECT
+	help
+	  Add the -s option to eject, this allows to eject SCSI-Devices and
+	  usb-storage devices.
+
+config BUSYBOX_CONFIG_FBSPLASH
+	bool "fbsplash"
+	default BUSYBOX_DEFAULT_FBSPLASH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Shows splash image and progress bar on framebuffer device.
+	  Can be used during boot phase of an embedded device. ~2kb.
+	  Usage:
+	  - use kernel option 'vga=xxx' or otherwise enable fb device.
+	  - put somewhere fbsplash.cfg file and an image in .ppm format.
+	  - $ setsid fbsplash [params] &
+	    -c: hide cursor
+	    -d /dev/fbN: framebuffer device (if not /dev/fb0)
+	    -s path_to_image_file (can be "-" for stdin)
+	    -i path_to_cfg_file (can be "-" for stdin)
+	    -f path_to_fifo (can be "-" for stdin)
+	  - if you want to run it only in presence of kernel parameter:
+	    grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params] &
+	  - commands for fifo:
+	    "NN" (ASCII decimal number) - percentage to show on progress bar
+	    "exit" - well you guessed it
+
+config BUSYBOX_CONFIG_FLASHCP
+	bool "flashcp"
+	default BUSYBOX_DEFAULT_FLASHCP  # doesn't build on Ubuntu 8.04
+	help
+	  The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
+	  This utility is used to copy images into a MTD device.
+
+config BUSYBOX_CONFIG_FLASH_LOCK
+	bool "flash_lock"
+	default BUSYBOX_DEFAULT_FLASH_LOCK  # doesn't build on Ubuntu 8.04
+	help
+	  The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
+	  utility locks part or all of the flash device.
+
+config BUSYBOX_CONFIG_FLASH_UNLOCK
+	bool "flash_unlock"
+	default BUSYBOX_DEFAULT_FLASH_UNLOCK  # doesn't build on Ubuntu 8.04
+	help
+	  The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
+	  utility unlocks part or all of the flash device.
+
+config BUSYBOX_CONFIG_FLASH_ERASEALL
+	bool "flash_eraseall"
+	default BUSYBOX_DEFAULT_FLASH_ERASEALL  # doesn't build on Ubuntu 8.04
+	help
+	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
+	  This utility is used to erase the whole MTD device.
+
+config BUSYBOX_CONFIG_IONICE
+	bool "ionice"
+	default BUSYBOX_DEFAULT_IONICE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Set/set program io scheduling class and priority
+	  Requires kernel >= 2.6.13
+
+config BUSYBOX_CONFIG_INOTIFYD
+	bool "inotifyd"
+	default BUSYBOX_DEFAULT_INOTIFYD  # doesn't build on Knoppix 5
+	help
+	  Simple inotify daemon. Reports filesystem changes. Requires
+	  kernel >= 2.6.13
+
+config BUSYBOX_CONFIG_LAST
+	bool "last"
+	default BUSYBOX_DEFAULT_LAST
+	depends on BUSYBOX_CONFIG_FEATURE_WTMP
+	help
+	  'last' displays a list of the last users that logged into the system.
+
+choice
+	prompt "Choose last implementation"
+	depends on BUSYBOX_CONFIG_LAST
+	default BUSYBOX_CONFIG_FEATURE_LAST_FANCY
+
+config BUSYBOX_CONFIG_FEATURE_LAST_SMALL
+	bool "small"
+	help
+	  This is a small version of last with just the basic set of
+	  features.
+
+config BUSYBOX_CONFIG_FEATURE_LAST_FANCY
+	bool "huge"
+	help
+	  'last' displays detailed information about the last users that
+	  logged into the system (mimics sysvinit last). +900 bytes.
+endchoice
+
+config BUSYBOX_CONFIG_HDPARM
+	bool "hdparm"
+	default BUSYBOX_DEFAULT_HDPARM
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Get/Set hard drive parameters. Primarily intended for ATA
+	  drives. Adds about 13k (or around 30k if you enable the
+	  FEATURE_HDPARM_GET_IDENTITY option)....
+
+config BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY
+	bool "Support obtaining detailed information directly from drives"
+	default BUSYBOX_DEFAULT_FEATURE_HDPARM_GET_IDENTITY
+	depends on BUSYBOX_CONFIG_HDPARM
+	help
+	  Enables the -I and -i options to obtain detailed information
+	  directly from drives about their capabilities and supported ATA
+	  feature set. If no device name is specified, hdparm will read
+	  identify data from stdin. Enabling this option will add about 16k...
+
+config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
+	bool "Register an IDE interface (DANGEROUS)"
+	default BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_SCAN_HWIF
+	depends on BUSYBOX_CONFIG_HDPARM
+	help
+	  Enables the 'hdparm -R' option to register an IDE interface.
+	  This is dangerous stuff, so you should probably say N.
+
+config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
+	bool "Un-register an IDE interface (DANGEROUS)"
+	default BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
+	depends on BUSYBOX_CONFIG_HDPARM
+	help
+	  Enables the 'hdparm -U' option to un-register an IDE interface.
+	  This is dangerous stuff, so you should probably say N.
+
+config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
+	bool "Perform device reset (DANGEROUS)"
+	default BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_DRIVE_RESET
+	depends on BUSYBOX_CONFIG_HDPARM
+	help
+	  Enables the 'hdparm -w' option to perform a device reset.
+	  This is dangerous stuff, so you should probably say N.
+
+config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+	bool "Tristate device for hotswap (DANGEROUS)"
+	default BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+	depends on BUSYBOX_CONFIG_HDPARM
+	help
+	  Enables the 'hdparm -x' option to tristate device for hotswap,
+	  and the '-b' option to get/set bus state. This is dangerous
+	  stuff, so you should probably say N.
+
+config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
+	bool "Get/set using_dma flag"
+	default BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_GETSET_DMA
+	depends on BUSYBOX_CONFIG_HDPARM
+	help
+	  Enables the 'hdparm -d' option to get/set using_dma flag.
+
+config BUSYBOX_CONFIG_LOCK
+	bool "lock"
+	default BUSYBOX_DEFAULT_LOCK
+	help
+	  Small utility for using locks in scripts
+
+config BUSYBOX_CONFIG_MAKEDEVS
+	bool "makedevs"
+	default BUSYBOX_DEFAULT_MAKEDEVS
+	help
+	  'makedevs' is a utility used to create a batch of devices with
+	  one command.
+
+	  There are two choices for command line behaviour, the interface
+	  as used by LEAF/Linux Router Project, or a device table file.
+
+	  'leaf' is traditionally what busybox follows, it allows multiple
+	  devices of a particluar type to be created per command.
+	  e.g. /dev/hda[0-9]
+	  Device properties are passed as command line arguments.
+
+	  'table' reads device properties from a file or stdin, allowing
+	  a batch of unrelated devices to be made with one command.
+	  User/group names are allowed as an alternative to uid/gid.
+
+choice
+	prompt "Choose makedevs behaviour"
+	depends on BUSYBOX_CONFIG_MAKEDEVS
+	default BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE
+
+config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_LEAF
+	bool "leaf"
+
+config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE
+	bool "table"
+
+endchoice
+
+config BUSYBOX_CONFIG_MAN
+	bool "man"
+	default BUSYBOX_DEFAULT_MAN
+	help
+	  Format and display manual pages.
+
+config BUSYBOX_CONFIG_MICROCOM
+	bool "microcom"
+	default BUSYBOX_DEFAULT_MICROCOM
+	help
+	  The poor man's minicom utility for chatting with serial port devices.
+
+config BUSYBOX_CONFIG_MOUNTPOINT
+	bool "mountpoint"
+	default BUSYBOX_DEFAULT_MOUNTPOINT
+	help
+	  mountpoint checks if the directory is a mountpoint.
+
+config BUSYBOX_CONFIG_MT
+	bool "mt"
+	default BUSYBOX_DEFAULT_MT
+	help
+	  mt is used to control tape devices. You can use the mt utility
+	  to advance or rewind a tape past a specified number of archive
+	  files on the tape.
+
+config BUSYBOX_CONFIG_RAIDAUTORUN
+	bool "raidautorun"
+	default BUSYBOX_DEFAULT_RAIDAUTORUN
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  raidautorun tells the kernel md driver to
+	  search and start RAID arrays.
+
+config BUSYBOX_CONFIG_READAHEAD
+	bool "readahead"
+	default BUSYBOX_DEFAULT_READAHEAD
+	depends on BUSYBOX_CONFIG_LFS
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Preload the files listed on the command line into RAM cache so that
+	  subsequent reads on these files will not block on disk I/O.
+
+	  This applet just calls the readahead(2) system call on each file.
+	  It is mainly useful in system startup scripts to preload files
+	  or executables before they are used. When used at the right time
+	  (in particular when a CPU bound process is running) it can
+	  significantly speed up system startup.
+
+	  As readahead(2) blocks until each file has been read, it is best to
+	  run this applet as a background job.
+
+config BUSYBOX_CONFIG_RUNLEVEL
+	bool "runlevel"
+	default BUSYBOX_DEFAULT_RUNLEVEL
+	depends on BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	  find the current and previous system runlevel.
+
+	  This applet uses utmp but does not rely on busybox supporing
+	  utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
+
+config BUSYBOX_CONFIG_RX
+	bool "rx"
+	default BUSYBOX_DEFAULT_RX
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Receive files using the Xmodem protocol.
+
+config BUSYBOX_CONFIG_SETSID
+	bool "setsid"
+	default BUSYBOX_DEFAULT_SETSID
+	help
+	  setsid runs a program in a new session
+
+config BUSYBOX_CONFIG_STRINGS
+	bool "strings"
+	default BUSYBOX_DEFAULT_STRINGS
+	help
+	  strings prints the printable character sequences for each file
+	  specified.
+
+config BUSYBOX_CONFIG_TASKSET
+	bool "taskset"
+	default BUSYBOX_DEFAULT_TASKSET  # doesn't build on some non-x86 targets (m68k)
+	help
+	  Retrieve or set a processes's CPU affinity.
+	  This requires sched_{g,s}etaffinity support in your libc.
+
+config BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY
+	bool "Fancy output"
+	default BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY
+	depends on BUSYBOX_CONFIG_TASKSET
+	help
+	  Add code for fancy output. This merely silences a compiler-warning
+	  and adds about 135 Bytes. May be needed for machines with alot
+	  of CPUs.
+
+config BUSYBOX_CONFIG_TIME
+	bool "time"
+	default BUSYBOX_DEFAULT_TIME
+	help
+	  The time command runs the specified program with the given arguments.
+	  When the command finishes, time writes a message to standard output
+	  giving timing statistics about this program run.
+
+config BUSYBOX_CONFIG_TIMEOUT
+	bool "timeout"
+	default BUSYBOX_DEFAULT_TIMEOUT
+	help
+	  Runs a program and watches it. If it does not terminate in
+	  specified number of seconds, it is sent a signal.
+
+config BUSYBOX_CONFIG_TTYSIZE
+	bool "ttysize"
+	default BUSYBOX_DEFAULT_TTYSIZE
+	help
+	  A replacement for "stty size". Unlike stty, can report only width,
+	  only height, or both, in any order. It also does not complain on
+	  error, but returns default 80x24.
+	  Usage in shell scripts: width=`ttysize w`.
+
+config BUSYBOX_CONFIG_VOLNAME
+	bool "volname"
+	default BUSYBOX_DEFAULT_VOLNAME
+	help
+	  Prints a CD-ROM volume name.
+
+config BUSYBOX_CONFIG_WATCHDOG
+	bool "watchdog"
+	default BUSYBOX_DEFAULT_WATCHDOG
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The watchdog utility is used with hardware or software watchdog
+	  device drivers. It opens the specified watchdog device special file
+	  and periodically writes a magic character to the device. If the
+	  watchdog applet ever fails to write the magic character within a
+	  certain amount of time, the watchdog device assumes the system has
+	  hung, and will cause the hardware to reboot.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/modutils/Config.in b/trunk/package/utils/busybox/config/modutils/Config.in
new file mode 100644
index 00000000..9add56ef
--- /dev/null
+++ b/trunk/package/utils/busybox/config/modutils/Config.in
@@ -0,0 +1,269 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux Module Utilities"
+
+config BUSYBOX_CONFIG_MODINFO
+	bool "modinfo"
+	default BUSYBOX_DEFAULT_MODINFO
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Show information about a Linux Kernel module
+
+config BUSYBOX_CONFIG_MODPROBE_SMALL
+	bool "Simplified modutils"
+	default BUSYBOX_DEFAULT_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Simplified modutils.
+
+	  With this option modprobe does not require modules.dep file
+	  and does not use /etc/modules.conf file.
+	  It scans module files in /lib/modules/`uname -r` and
+	  determines dependencies and module alias names on the fly.
+	  This may make module loading slower, most notably
+	  when one needs to load module by alias (this requires
+	  scanning through module _bodies_).
+
+	  At the first attempt to load a module by alias modprobe
+	  will try to generate modules.dep.bb file in order to speed up
+	  future loads by alias. Failure to do so (read-only /lib/modules,
+	  etc) is not reported, and future modprobes will be slow too.
+
+	  NB: modules.dep.bb file format is not compatible
+	  with modules.dep file as created/used by standard module tools.
+
+	  Additional module parameters can be stored in
+	  /etc/modules/$module_name files.
+
+	  Apart from modprobe, other utilities are also provided:
+	  - insmod is an alias to modprobe
+	  - rmmod is an alias to modprobe -r
+	  - depmod generates modules.dep.bb
+
+	  As of 2008-07, this code is experimental. It is 14kb smaller
+	  than "non-small" modutils.
+
+config BUSYBOX_CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
+	bool "Accept module options on modprobe command line"
+	default BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
+	depends on BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Allow insmod and modprobe take module options from command line.
+
+config BUSYBOX_CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
+	bool "Skip loading of already loaded modules"
+	default BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
+	depends on BUSYBOX_CONFIG_MODPROBE_SMALL
+	help
+	  Check if the module is already loaded.
+
+config BUSYBOX_CONFIG_INSMOD
+	bool "insmod"
+	default BUSYBOX_DEFAULT_INSMOD
+	depends on !BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  insmod is used to load specified modules in the running kernel.
+
+config BUSYBOX_CONFIG_RMMOD
+	bool "rmmod"
+	default BUSYBOX_DEFAULT_RMMOD
+	depends on !BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  rmmod is used to unload specified modules from the kernel.
+
+config BUSYBOX_CONFIG_LSMOD
+	bool "lsmod"
+	default BUSYBOX_DEFAULT_LSMOD
+	depends on !BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  lsmod is used to display a list of loaded modules.
+
+config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+	bool "Pretty output"
+	default BUSYBOX_DEFAULT_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+	depends on BUSYBOX_CONFIG_LSMOD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This option makes output format of lsmod adjusted to
+	  the format of module-init-tools for Linux kernel 2.6.
+	  Increases size somewhat.
+
+config BUSYBOX_CONFIG_MODPROBE
+	bool "modprobe"
+	default BUSYBOX_DEFAULT_MODPROBE
+	depends on !BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Handle the loading of modules, and their dependencies on a high
+	  level.
+
+config BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST
+	bool "Blacklist support"
+	default BUSYBOX_DEFAULT_FEATURE_MODPROBE_BLACKLIST
+	depends on BUSYBOX_CONFIG_MODPROBE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Say 'y' here to enable support for the 'blacklist' command in
+	  modprobe.conf. This prevents the alias resolver to resolve
+	  blacklisted modules. This is useful if you want to prevent your
+	  hardware autodetection scripts to load modules like evdev, frame
+	  buffer drivers etc.
+
+config BUSYBOX_CONFIG_DEPMOD
+	bool "depmod"
+	default BUSYBOX_DEFAULT_DEPMOD
+	depends on !BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  depmod generates modules.dep (and potentially modules.alias
+	  and modules.symbols) that contain dependency information
+	  for modprobe.
+
+comment "Options common to multiple modutils"
+
+config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
+	bool "Support version 2.2/2.4 Linux kernels"
+	default BUSYBOX_DEFAULT_FEATURE_2_4_MODULES
+	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_LSMOD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Support module loading for 2.2.x and 2.4.x Linux kernels.
+	  This increases size considerably. Say N unless you plan
+	  to run ancient kernels.
+
+config BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP
+	bool "Try to load module from a mmap'ed area"
+	default BUSYBOX_DEFAULT_FEATURE_INSMOD_TRY_MMAP
+	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This option causes module loading code to try to mmap
+	  module first. If it does not work (for example,
+	  it does not work for compressed modules), module will be read
+	  (and unpacked if needed) into a memory block allocated by malloc.
+
+	  The only case when mmap works but malloc does not is when
+	  you are trying to load a big module on a very memory-constrained
+	  machine. Malloc will momentarily need 2x as much memory as mmap.
+
+	  Choosing N saves about 250 bytes of code (on 32-bit x86).
+
+config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING
+	bool "Enable module version checking"
+	default BUSYBOX_DEFAULT_FEATURE_INSMOD_VERSION_CHECKING
+	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE)
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Support checking of versions for modules. This is used to
+	  ensure that the kernel and module are made for each other.
+
+config BUSYBOX_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
+	bool "Add module symbols to kernel symbol table"
+	default BUSYBOX_DEFAULT_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
+	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE)
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  By adding module symbols to the kernel symbol table, Oops messages
+	  occuring within kernel modules can be properly debugged. By enabling
+	  this feature, module symbols will always be added to the kernel symbol
+	  table for proper debugging support. If you are not interested in
+	  Oops messages from kernel modules, say N.
+
+config BUSYBOX_CONFIG_FEATURE_INSMOD_LOADINKMEM
+	bool "In kernel memory optimization (uClinux only)"
+	default BUSYBOX_DEFAULT_FEATURE_INSMOD_LOADINKMEM
+	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE)
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This is a special uClinux only memory optimization that lets insmod
+	  load the specified kernel module directly into kernel space, reducing
+	  memory usage by preventing the need for two copies of the module
+	  being loaded into memory.
+
+config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP
+	bool "Enable insmod load map (-m) option"
+	default BUSYBOX_DEFAULT_FEATURE_INSMOD_LOAD_MAP
+	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && BUSYBOX_CONFIG_INSMOD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Enabling this, one would be able to get a load map
+	  output on stdout. This makes kernel module debugging
+	  easier.
+	  If you don't plan to debug kernel modules, you
+	  don't need this option.
+
+config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
+	bool "Symbols in load map"
+	default BUSYBOX_DEFAULT_FEATURE_INSMOD_LOAD_MAP_FULL
+	depends on BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Without this option, -m will only output section
+	  load map. With this option, -m will also output
+	  symbols load map.
+
+config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
+	bool "Support tainted module checking with new kernels"
+	default BUSYBOX_DEFAULT_FEATURE_CHECK_TAINTED_MODULE
+	depends on (BUSYBOX_CONFIG_LSMOD || BUSYBOX_CONFIG_FEATURE_2_4_MODULES) && !BUSYBOX_CONFIG_MODPROBE_SMALL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Support checking for tainted modules. These are usually binary
+	  only modules that will make the linux-kernel list ignore your
+	  support request.
+	  This option is required to support GPLONLY modules.
+
+config BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS
+	bool "Support for module.aliases file"
+	default BUSYBOX_DEFAULT_FEATURE_MODUTILS_ALIAS
+	depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Generate and parse modules.alias containing aliases for bus
+	  identifiers:
+	    alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs
+
+	  and aliases for logical modules names e.g.:
+	    alias padlock_aes aes
+	    alias aes_i586 aes
+	    alias aes_generic aes
+
+	  Say Y if unsure.
+
+config BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS
+	bool "Support for module.symbols file"
+	default BUSYBOX_DEFAULT_FEATURE_MODUTILS_SYMBOLS
+	depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Generate and parse modules.symbols containing aliases for
+	  symbol_request() kernel calls, such as:
+	    alias symbol:usb_sg_init usbcore
+
+	  Say Y if unsure.
+
+config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR
+	string "Default directory containing modules"
+	default BUSYBOX_DEFAULT_DEFAULT_MODULES_DIR
+	depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL || BUSYBOX_CONFIG_MODINFO
+	help
+	  Directory that contains kernel modules.
+	  Defaults to "/lib/modules"
+
+config BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE
+	string "Default name of modules.dep"
+	default BUSYBOX_DEFAULT_DEFAULT_DEPMOD_FILE
+	depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL || BUSYBOX_CONFIG_MODINFO
+	help
+	  Filename that contains kernel modules dependencies.
+	  Defaults to "modules.dep"
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/networking/Config.in b/trunk/package/utils/busybox/config/networking/Config.in
new file mode 100644
index 00000000..80dd42ab
--- /dev/null
+++ b/trunk/package/utils/busybox/config/networking/Config.in
@@ -0,0 +1,1098 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Networking Utilities"
+
+config BUSYBOX_CONFIG_NAMEIF
+	bool "nameif"
+	default BUSYBOX_DEFAULT_NAMEIF
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  nameif is used to rename network interface by its MAC address.
+	  Renamed interfaces MUST be in the down state.
+	  It is possible to use a file (default: /etc/mactab)
+	  with list of new interface names and MACs.
+	  Maximum interface name length: IFNAMSIZ = 16
+	  File fields are separated by space or tab.
+	  File format:
+	  # Comment
+	  new_interface_name    XX:XX:XX:XX:XX:XX
+
+config BUSYBOX_CONFIG_FEATURE_NAMEIF_EXTENDED
+	bool "Extended nameif"
+	default BUSYBOX_DEFAULT_FEATURE_NAMEIF_EXTENDED
+	depends on BUSYBOX_CONFIG_NAMEIF
+	help
+	  This extends the nameif syntax to support the bus_info, driver,
+	  phyaddr selectors. The syntax is compatible to the normal nameif.
+	  File format:
+	    new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+	    new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+	    new_interface_name  phy_address=2 00:80:C8:38:91:B5
+	    new_interface_name  mac=00:80:C8:38:91:B5
+	    new_interface_name  00:80:C8:38:91:B5
+config BUSYBOX_CONFIG_NBDCLIENT
+	bool "nbd-client"
+	default BUSYBOX_DEFAULT_NBDCLIENT
+	help
+	  Network block device client
+config BUSYBOX_CONFIG_NC
+	bool "nc"
+	default BUSYBOX_DEFAULT_NC
+	help
+	  A simple Unix utility which reads and writes data across network
+	  connections.
+
+config BUSYBOX_CONFIG_NC_SERVER
+	bool "Netcat server options (-l)"
+	default BUSYBOX_DEFAULT_NC_SERVER
+	depends on BUSYBOX_CONFIG_NC
+	help
+	  Allow netcat to act as a server.
+
+config BUSYBOX_CONFIG_NC_EXTRA
+	bool "Netcat extensions (-eiw and -f FILE)"
+	default BUSYBOX_DEFAULT_NC_EXTRA
+	depends on BUSYBOX_CONFIG_NC
+	help
+	  Add -e (support for executing the rest of the command line after
+	  making or receiving a successful connection), -i (delay interval for
+	  lines sent), -w (timeout for initial connection).
+
+config BUSYBOX_CONFIG_NC_110_COMPAT
+	bool "Netcat 1.10 compatibility (+2.5k)"
+	default BUSYBOX_DEFAULT_NC_110_COMPAT  # off specially for Rob
+	depends on BUSYBOX_CONFIG_NC
+	help
+	  This option makes nc closely follow original nc-1.10.
+	  The code is about 2.5k bigger. It enables
+	  -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
+	  busybox-specific extensions: -f FILE.
+config BUSYBOX_CONFIG_PING
+	bool "ping"
+	default BUSYBOX_DEFAULT_PING
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
+	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
+
+config BUSYBOX_CONFIG_PING6
+	bool "ping6"
+	default BUSYBOX_DEFAULT_PING6
+	depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_PING
+	help
+	  This will give you a ping that can talk IPv6.
+
+config BUSYBOX_CONFIG_FEATURE_FANCY_PING
+	bool "Enable fancy ping output"
+	default BUSYBOX_DEFAULT_FEATURE_FANCY_PING
+	depends on BUSYBOX_CONFIG_PING
+	help
+	  Make the output from the ping applet include statistics, and at the
+	  same time provide full support for ICMP packets.
+config BUSYBOX_CONFIG_WHOIS
+	bool "whois"
+	default BUSYBOX_DEFAULT_WHOIS
+	help
+	  whois is a client for the whois directory service
+
+config BUSYBOX_CONFIG_FEATURE_IPV6
+	bool "Enable IPv6 support"
+	default BUSYBOX_DEFAULT_FEATURE_IPV6
+	help
+	  Enable IPv6 support in busybox.
+	  This adds IPv6 support in the networking applets.
+
+config BUSYBOX_CONFIG_FEATURE_UNIX_LOCAL
+	bool "Enable Unix domain socket support (usually not needed)"
+	default BUSYBOX_DEFAULT_FEATURE_UNIX_LOCAL
+	help
+	  Enable Unix domain socket support in all busybox networking
+	  applets.  Address of the form local:/path/to/unix/socket
+	  will be recognized.
+
+	  This extension is almost never used in real world usage.
+	  You most likely want to say N.
+
+config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS
+	bool "Prefer IPv4 addresses from DNS queries"
+	default BUSYBOX_DEFAULT_FEATURE_PREFER_IPV4_ADDRESS
+	depends on BUSYBOX_CONFIG_FEATURE_IPV6
+	help
+	  Use IPv4 address of network host if it has one.
+
+	  If this option is off, the first returned address will be used.
+	  This may cause problems when your DNS server is IPv6-capable and
+	  is returning IPv6 host addresses too. If IPv6 address
+	  precedes IPv4 one in DNS reply, busybox network applets
+	  (e.g. wget) will use IPv6 address. On an IPv6-incapable host
+	  or network applets will fail to connect to the host
+	  using IPv6 address.
+
+config BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS
+	bool "Verbose resolution errors"
+	default BUSYBOX_DEFAULT_VERBOSE_RESOLUTION_ERRORS
+	help
+	  Enable if you are not satisfied with simplistic
+	  "can't resolve 'hostname.com'" and want to know more.
+	  This may increase size of your executable a bit.
+
+config BUSYBOX_CONFIG_ARP
+	bool "arp"
+	default BUSYBOX_DEFAULT_ARP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Manipulate the system ARP cache.
+
+config BUSYBOX_CONFIG_ARPING
+	bool "arping"
+	default BUSYBOX_DEFAULT_ARPING
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Ping hosts by ARP packets.
+
+config BUSYBOX_CONFIG_BRCTL
+	bool "brctl"
+	default BUSYBOX_DEFAULT_BRCTL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Manage ethernet bridges.
+	  Supports addbr/delbr and addif/delif.
+
+config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
+	bool "Fancy options"
+	default BUSYBOX_DEFAULT_FEATURE_BRCTL_FANCY
+	depends on BUSYBOX_CONFIG_BRCTL
+	help
+	  Add support for extended option like:
+	    setageing, setfd, sethello, setmaxage,
+	    setpathcost, setportprio, setbridgeprio,
+	    stp
+	  This adds about 600 bytes.
+
+config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
+	bool "Support show"
+	default BUSYBOX_DEFAULT_FEATURE_BRCTL_SHOW
+	depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
+	help
+	  Add support for option which prints the current config:
+	    show
+
+config BUSYBOX_CONFIG_DNSD
+	bool "dnsd"
+	default BUSYBOX_DEFAULT_DNSD
+	help
+	  Small and static DNS server daemon.
+
+config BUSYBOX_CONFIG_ETHER_WAKE
+	bool "ether-wake"
+	default BUSYBOX_DEFAULT_ETHER_WAKE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Send a magic packet to wake up sleeping machines.
+
+config BUSYBOX_CONFIG_FAKEIDENTD
+	bool "fakeidentd"
+	default BUSYBOX_DEFAULT_FAKEIDENTD
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  fakeidentd listens on the ident port and returns a predefined
+	  fake value on any query.
+
+config BUSYBOX_CONFIG_FTPD
+	bool "ftpd"
+	default BUSYBOX_DEFAULT_FTPD
+	help
+	  simple FTP daemon. You have to run it via inetd.
+
+config BUSYBOX_CONFIG_FEATURE_FTP_WRITE
+	bool "Enable upload commands"
+	default BUSYBOX_DEFAULT_FEATURE_FTP_WRITE
+	depends on BUSYBOX_CONFIG_FTPD
+	help
+	  Enable all kinds of FTP upload commands (-w option)
+
+config BUSYBOX_CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST
+	bool "Enable workaround for RFC-violating clients"
+	default BUSYBOX_DEFAULT_FEATURE_FTPD_ACCEPT_BROKEN_LIST
+	depends on BUSYBOX_CONFIG_FTPD
+	help
+	  Some ftp clients (among them KDE's Konqueror) issue illegal
+	  "LIST -l" requests. This option works around such problems.
+	  It might prevent you from listing files starting with "-" and
+	  it increases the code size by ~40 bytes.
+	  Most other ftp servers seem to behave similar to this.
+
+config BUSYBOX_CONFIG_FTPGET
+	bool "ftpget"
+	default BUSYBOX_DEFAULT_FTPGET
+	help
+	  Retrieve a remote file via FTP.
+
+config BUSYBOX_CONFIG_FTPPUT
+	bool "ftpput"
+	default BUSYBOX_DEFAULT_FTPPUT
+	help
+	  Store a remote file via FTP.
+
+config BUSYBOX_CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS
+	bool "Enable long options in ftpget/ftpput"
+	default BUSYBOX_DEFAULT_FEATURE_FTPGETPUT_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_LONG_OPTS && (BUSYBOX_CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT)
+	help
+	  Support long options for the ftpget/ftpput applet.
+
+config BUSYBOX_CONFIG_HOSTNAME
+	bool "hostname"
+	default BUSYBOX_DEFAULT_HOSTNAME
+	help
+	  Show or set the system's host name.
+
+config BUSYBOX_CONFIG_HTTPD
+	bool "httpd"
+	default BUSYBOX_DEFAULT_HTTPD
+	help
+	  Serve web pages via an HTTP server.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES
+	bool "Support 'Ranges:' header"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_RANGES
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  Makes httpd emit "Accept-Ranges: bytes" header and understand
+	  "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
+	  downloads, seeking in multimedia players etc.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE
+	bool "Use sendfile system call"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_USE_SENDFILE
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  When enabled, httpd will use the kernel sendfile() function
+	  instead of read/write loop.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
+	bool "Enable -u <user> option"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_SETUID
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  This option allows the server to run as a specific user
+	  rather than defaulting to the user that starts the server.
+	  Use of this option requires special privileges to change to a
+	  different user.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
+	bool "Enable Basic http Authentication"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_BASIC_AUTH
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  Utilizes password settings from /etc/httpd.conf for basic
+	  authentication on a per url basis.
+	  Example for httpd.conf file:
+	  /adm:toor:PaSsWd
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
+	bool "Support MD5 crypted passwords for http Authentication"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_AUTH_MD5
+	depends on BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
+	help
+	  Enables encrypted passwords, and wildcard user/passwords
+	  in httpd.conf file.
+	  User '*' means 'any system user name is ok',
+	  password of '*' means 'use system password for this user'
+	  Examples:
+	  /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+	  /adm:root:*
+	  /wiki:*:*
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
+	bool "Support Common Gateway Interface (CGI)"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_CGI
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  This option allows scripts and executables to be invoked
+	  when specific URLs are requested.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+	bool "Support for running scripts through an interpreter"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+	depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
+	help
+	  This option enables support for running scripts through an
+	  interpreter. Turn this on if you want PHP scripts to work
+	  properly. You need to supply an additional line in your
+	  httpd.conf file:
+	  *.php:/path/to/your/php
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
+	bool "Set REMOTE_PORT environment variable for CGI"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
+	depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
+	help
+	  Use of this option can assist scripts in generating
+	  references that contain a unique port number.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
+	bool "Enable -e option (useful for CGIs written as shell scripts)"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_ENCODE_URL_STR
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  This option allows html encoding of arbitrary strings for display
+	  by the browser. Output goes to stdout.
+	  For example, httpd -e "<Hello World>" produces
+	  "&#60Hello&#32World&#62".
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
+	bool "Support for custom error pages"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_ERROR_PAGES
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  This option allows you to define custom error pages in
+	  the configuration file instead of the default HTTP status
+	  error pages. For instance, if you add the line:
+	        E404:/path/e404.html
+	  in the config file, the server will respond the specified
+	  '/path/e404.html' file instead of the terse '404 NOT FOUND'
+	  message.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY
+	bool "Support for reverse proxy"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_PROXY
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  This option allows you to define URLs that will be forwarded
+	  to another HTTP server. To setup add the following line to the
+	  configuration file
+	        P:/url/:http://hostname[:port]/new/path/
+	  Then a request to /url/myfile will be forwarded to
+	  http://hostname[:port]/new/path/myfile.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP
+	bool "Support for GZIP content encoding"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_GZIP
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	  Makes httpd send files using GZIP content encoding if the
+	  client supports it and a pre-compressed <file>.gz exists.
+
+config BUSYBOX_CONFIG_IFCONFIG
+	bool "ifconfig"
+	default BUSYBOX_DEFAULT_IFCONFIG
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Ifconfig is used to configure the kernel-resident network interfaces.
+
+config BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS
+	bool "Enable status reporting output (+7k)"
+	default BUSYBOX_DEFAULT_FEATURE_IFCONFIG_STATUS
+	depends on BUSYBOX_CONFIG_IFCONFIG
+	help
+	  If ifconfig is called with no arguments it will display the status
+	  of the currently active interfaces.
+
+config BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP
+	bool "Enable slip-specific options \"keepalive\" and \"outfill\""
+	default BUSYBOX_DEFAULT_FEATURE_IFCONFIG_SLIP
+	depends on BUSYBOX_CONFIG_IFCONFIG
+	help
+	  Allow "keepalive" and "outfill" support for SLIP. If you're not
+	  planning on using serial lines, leave this unchecked.
+
+config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
+	bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
+	default BUSYBOX_DEFAULT_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
+	depends on BUSYBOX_CONFIG_IFCONFIG
+	help
+	  Allow the start address for shared memory, start address for I/O,
+	  and/or the interrupt line used by the specified device.
+
+config BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW
+	bool "Enable option \"hw\" (ether only)"
+	default BUSYBOX_DEFAULT_FEATURE_IFCONFIG_HW
+	depends on BUSYBOX_CONFIG_IFCONFIG
+	help
+	  Set the hardware address of this interface, if the device driver
+	  supports  this  operation. Currently, we only support the 'ether'
+	  class.
+
+config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
+	bool "Set the broadcast automatically"
+	default BUSYBOX_DEFAULT_FEATURE_IFCONFIG_BROADCAST_PLUS
+	depends on BUSYBOX_CONFIG_IFCONFIG
+	help
+	  Setting this will make ifconfig attempt to find the broadcast
+	  automatically if the value '+' is used.
+
+config BUSYBOX_CONFIG_IFENSLAVE
+	bool "ifenslave"
+	default BUSYBOX_DEFAULT_IFENSLAVE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Userspace application to bind several interfaces
+	  to a logical interface (use with kernel bonding driver).
+
+config BUSYBOX_CONFIG_IFPLUGD
+	bool "ifplugd"
+	default BUSYBOX_DEFAULT_IFPLUGD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Network interface plug detection daemon.
+
+config BUSYBOX_CONFIG_IFUPDOWN
+	bool "ifupdown"
+	default BUSYBOX_DEFAULT_IFUPDOWN
+	help
+	  Activate or deactivate the specified interfaces. This applet makes
+	  use of either "ifconfig" and "route" or the "ip" command to actually
+	  configure network interfaces. Therefore, you will probably also want
+	  to enable either IFCONFIG and ROUTE, or enable
+	  FEATURE_IFUPDOWN_IP and the various IP options. Of
+	  course you could use non-busybox versions of these programs, so
+	  against my better judgement (since this will surely result in plenty
+	  of support questions on the mailing list), I do not force you to
+	  enable these additional options. It is up to you to supply either
+	  "ifconfig", "route" and "run-parts" or the "ip" command, either
+	  via busybox or via standalone utilities.
+
+config BUSYBOX_CONFIG_IFUPDOWN_IFSTATE_PATH
+	string "Absolute path to ifstate file"
+	default BUSYBOX_DEFAULT_IFUPDOWN_IFSTATE_PATH
+	depends on BUSYBOX_CONFIG_IFUPDOWN
+	help
+	  ifupdown keeps state information in a file called ifstate.
+	  Typically it is located in /var/run/ifstate, however
+	  some distributions tend to put it in other places
+	  (debian, for example, uses /etc/network/run/ifstate).
+	  This config option defines location of ifstate.
+
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
+	bool "Use ip applet"
+	default BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IP
+	depends on BUSYBOX_CONFIG_IFUPDOWN
+	help
+	  Use the iproute "ip" command to implement "ifup" and "ifdown", rather
+	  than the default of using the older 'ifconfig' and 'route' utilities.
+
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
+	bool "Use busybox ip applet"
+	default BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IP_BUILTIN
+	depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	select BUSYBOX_CONFIG_IP
+	select BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
+	select BUSYBOX_CONFIG_FEATURE_IP_LINK
+	select BUSYBOX_CONFIG_FEATURE_IP_ROUTE
+	help
+	  Use the busybox iproute "ip" applet to implement "ifupdown".
+
+	  If left disabled, you must install the full-blown iproute2
+	  utility or the  "ifup" and "ifdown" applets will not work.
+
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
+	bool "Use busybox ifconfig and route applets"
+	default BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
+	depends on BUSYBOX_CONFIG_IFUPDOWN && !BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
+	select BUSYBOX_CONFIG_IFCONFIG
+	select BUSYBOX_CONFIG_ROUTE
+	help
+	  Use the busybox iproute "ifconfig" and "route" applets to
+	  implement the "ifup" and "ifdown" utilities.
+
+	  If left disabled, you must install the full-blown ifconfig
+	  and route utilities, or the  "ifup" and "ifdown" applets will not
+	  work.
+
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4
+	bool "Support for IPv4"
+	default BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IPV4
+	depends on BUSYBOX_CONFIG_IFUPDOWN
+	help
+	  If you want ifup/ifdown to talk IPv4, leave this on.
+
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6
+	bool "Support for IPv6"
+	default BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IPV6
+	depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_FEATURE_IPV6
+	help
+	  If you need support for IPv6, turn this option on.
+
+### UNUSED
+###config FEATURE_IFUPDOWN_IPX
+###	bool "Support for IPX"
+###	default y
+###	depends on IFUPDOWN
+###	help
+###	  If this option is selected you can use busybox to work with IPX
+###	  networks.
+
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING
+	bool "Enable mapping support"
+	default BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_MAPPING
+	depends on BUSYBOX_CONFIG_IFUPDOWN
+	help
+	  This enables support for the "mapping" stanza, unless you have
+	  a weird network setup you don't need it.
+
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+	bool "Support for external dhcp clients"
+	default BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+	depends on BUSYBOX_CONFIG_IFUPDOWN
+	help
+	  This enables support for the external dhcp clients. Clients are
+	  tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+	  Otherwise, if udhcpc applet is enabled, it is used.
+	  Otherwise, ifup/ifdown will have no support for DHCP.
+
+config BUSYBOX_CONFIG_INETD
+	bool "inetd"
+	default BUSYBOX_DEFAULT_INETD
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  Internet superserver daemon
+
+config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+	bool "Support echo service"
+	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
+	depends on BUSYBOX_CONFIG_INETD
+	help
+	  Echo received data internal inetd service
+
+config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+	bool "Support discard service"
+	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
+	depends on BUSYBOX_CONFIG_INETD
+	help
+	  Internet /dev/null internal inetd service
+
+config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+	bool "Support time service"
+	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_TIME
+	depends on BUSYBOX_CONFIG_INETD
+	help
+	  Return 32 bit time since 1900 internal inetd service
+
+config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+	bool "Support daytime service"
+	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
+	depends on BUSYBOX_CONFIG_INETD
+	help
+	  Return human-readable time internal inetd service
+
+config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+	bool "Support chargen service"
+	default BUSYBOX_DEFAULT_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
+	depends on BUSYBOX_CONFIG_INETD
+	help
+	  Familiar character generator internal inetd service
+
+config BUSYBOX_CONFIG_FEATURE_INETD_RPC
+	bool "Support RPC services"
+	default BUSYBOX_DEFAULT_FEATURE_INETD_RPC
+	depends on BUSYBOX_CONFIG_INETD
+	select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+	help
+	  Support Sun-RPC based services
+
+config BUSYBOX_CONFIG_IP
+	bool "ip"
+	default BUSYBOX_DEFAULT_IP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The "ip" applet is a TCP/IP interface configuration and routing
+	  utility. You generally don't need "ip" to use busybox with
+	  TCP/IP.
+
+config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
+	bool "ip address"
+	default BUSYBOX_DEFAULT_FEATURE_IP_ADDRESS
+	depends on BUSYBOX_CONFIG_IP
+	help
+	  Address manipulation support for the "ip" applet.
+
+config BUSYBOX_CONFIG_FEATURE_IP_LINK
+	bool "ip link"
+	default BUSYBOX_DEFAULT_FEATURE_IP_LINK
+	depends on BUSYBOX_CONFIG_IP
+	help
+	  Configure network devices with "ip".
+
+config BUSYBOX_CONFIG_FEATURE_IP_ROUTE
+	bool "ip route"
+	default BUSYBOX_DEFAULT_FEATURE_IP_ROUTE
+	depends on BUSYBOX_CONFIG_IP
+	help
+	  Add support for routing table management to "ip".
+
+config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
+	bool "ip tunnel"
+	default BUSYBOX_DEFAULT_FEATURE_IP_TUNNEL
+	depends on BUSYBOX_CONFIG_IP
+	help
+	  Add support for tunneling commands to "ip".
+
+config BUSYBOX_CONFIG_FEATURE_IP_RULE
+	bool "ip rule"
+	default BUSYBOX_DEFAULT_FEATURE_IP_RULE
+	depends on BUSYBOX_CONFIG_IP
+	help
+	  Add support for rule commands to "ip".
+
+config BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS
+	bool "Support short forms of ip commands"
+	default BUSYBOX_DEFAULT_FEATURE_IP_SHORT_FORMS
+	depends on BUSYBOX_CONFIG_IP
+	help
+	  Also support short-form of ip <OBJECT> commands:
+	  ip addr   -> ipaddr
+	  ip link   -> iplink
+	  ip route  -> iproute
+	  ip tunnel -> iptunnel
+	  ip rule   -> iprule
+
+	  Say N unless you desparately need the short form of the ip
+	  object commands.
+
+config BUSYBOX_CONFIG_FEATURE_IP_RARE_PROTOCOLS
+	bool "Support displaying rarely used link types"
+	default BUSYBOX_DEFAULT_FEATURE_IP_RARE_PROTOCOLS
+	depends on BUSYBOX_CONFIG_IP
+	help
+	  If you are not going to use links of type "frad", "econet",
+	  "bif" etc, you probably don't need to enable this.
+	  Ethernet, wireless, infrared, ppp/slip, ip tunnelling
+	  link types are supported without this option selected.
+
+config BUSYBOX_CONFIG_IPADDR
+	bool
+	default BUSYBOX_DEFAULT_IPADDR
+	depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
+
+config BUSYBOX_CONFIG_IPLINK
+	bool
+	default BUSYBOX_DEFAULT_IPLINK
+	depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_LINK
+
+config BUSYBOX_CONFIG_IPROUTE
+	bool
+	default BUSYBOX_DEFAULT_IPROUTE
+	depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_ROUTE
+
+config BUSYBOX_CONFIG_IPTUNNEL
+	bool
+	default BUSYBOX_DEFAULT_IPTUNNEL
+	depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
+
+config BUSYBOX_CONFIG_IPRULE
+	bool
+	default BUSYBOX_DEFAULT_IPRULE
+	depends on BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS && BUSYBOX_CONFIG_FEATURE_IP_RULE
+
+config BUSYBOX_CONFIG_IPCALC
+	bool "ipcalc"
+	default BUSYBOX_DEFAULT_IPCALC
+	help
+	  ipcalc takes an IP address and netmask and calculates the
+	  resulting broadcast, network, and host range.
+
+config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY
+	bool "Fancy IPCALC, more options, adds 1 kbyte"
+	default BUSYBOX_DEFAULT_FEATURE_IPCALC_FANCY
+	depends on BUSYBOX_CONFIG_IPCALC
+	help
+	  Adds the options hostname, prefix and silent to the output of
+	  "ipcalc".
+
+config BUSYBOX_CONFIG_FEATURE_IPCALC_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_IPCALC_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_IPCALC && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the ipcalc applet.
+
+config BUSYBOX_CONFIG_NETMSG
+	bool "netmsg"
+	default BUSYBOX_DEFAULT_NETMSG
+	help
+	  simple program for sending udp broadcast messages
+
+config BUSYBOX_CONFIG_NETSTAT
+	bool "netstat"
+	default BUSYBOX_DEFAULT_NETSTAT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  netstat prints information about the Linux networking subsystem.
+
+config BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE
+	bool "Enable wide netstat output"
+	default BUSYBOX_DEFAULT_FEATURE_NETSTAT_WIDE
+	depends on BUSYBOX_CONFIG_NETSTAT
+	help
+	  Add support for wide columns. Useful when displaying IPv6 addresses
+	  (-W option).
+
+config BUSYBOX_CONFIG_FEATURE_NETSTAT_PRG
+	bool "Enable PID/Program name output"
+	default BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
+	depends on BUSYBOX_CONFIG_NETSTAT
+	help
+	  Add support for -p flag to print out PID and program name.
+	  +700 bytes of code.
+
+config BUSYBOX_CONFIG_NSLOOKUP
+	bool "nslookup"
+	default BUSYBOX_DEFAULT_NSLOOKUP
+	help
+	  nslookup is a tool to query Internet name servers.
+
+config BUSYBOX_CONFIG_NTPD
+	bool "ntpd"
+	default BUSYBOX_DEFAULT_NTPD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The NTP client/server daemon.
+
+config BUSYBOX_CONFIG_FEATURE_NTPD_SERVER
+	bool "Make ntpd usable as a NTP server"
+	default BUSYBOX_DEFAULT_FEATURE_NTPD_SERVER
+	depends on BUSYBOX_CONFIG_NTPD
+	help
+	  Make ntpd usable as a NTP server. If you disable this option
+	  ntpd will be usable only as a NTP client.
+
+config BUSYBOX_CONFIG_PSCAN
+	bool "pscan"
+	default BUSYBOX_DEFAULT_PSCAN
+	help
+	  Simple network port scanner.
+
+config BUSYBOX_CONFIG_ROUTE
+	bool "route"
+	default BUSYBOX_DEFAULT_ROUTE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Route displays or manipulates the kernel's IP routing tables.
+
+config BUSYBOX_CONFIG_SLATTACH
+	bool "slattach"
+	default BUSYBOX_DEFAULT_SLATTACH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  slattach is a small utility to attach network interfaces to serial
+	  lines.
+
+#config TC
+#	bool "tc"
+#	default y
+#	help
+#	  show / manipulate traffic control settings
+#
+#config FEATURE_TC_INGRESS
+#	def_bool n
+#	depends on TC
+
+config BUSYBOX_CONFIG_TCPSVD
+	bool "tcpsvd"
+	default BUSYBOX_DEFAULT_TCPSVD
+	help
+	  tcpsvd listens on a TCP port and runs a program for each new
+	  connection.
+
+config BUSYBOX_CONFIG_TELNET
+	bool "telnet"
+	default BUSYBOX_DEFAULT_TELNET
+	help
+	  Telnet is an interface to the TELNET protocol, but is also commonly
+	  used to test other simple protocols.
+
+config BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE
+	bool "Pass TERM type to remote host"
+	default BUSYBOX_DEFAULT_FEATURE_TELNET_TTYPE
+	depends on BUSYBOX_CONFIG_TELNET
+	help
+	  Setting this option will forward the TERM environment variable to the
+	  remote host you are connecting to. This is useful to make sure that
+	  things like ANSI colors and other control sequences behave.
+
+config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN
+	bool "Pass USER type to remote host"
+	default BUSYBOX_DEFAULT_FEATURE_TELNET_AUTOLOGIN
+	depends on BUSYBOX_CONFIG_TELNET
+	help
+	  Setting this option will forward the USER environment variable to the
+	  remote host you are connecting to. This is useful when you need to
+	  log into a machine without telling the username (autologin). This
+	  option enables `-a' and `-l USER' arguments.
+
+config BUSYBOX_CONFIG_TELNETD
+	bool "telnetd"
+	default BUSYBOX_DEFAULT_TELNETD
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  A daemon for the TELNET protocol, allowing you to log onto the host
+	  running the daemon. Please keep in mind that the TELNET protocol
+	  sends passwords in plain text. If you can't afford the space for an
+	  SSH daemon and you trust your network, you may say 'y' here. As a
+	  more secure alternative, you should seriously consider installing the
+	  very small Dropbear SSH daemon instead:
+		http://matt.ucc.asn.au/dropbear/dropbear.html
+
+	  Note that for busybox telnetd to work you need several things:
+	  First of all, your kernel needs:
+		  UNIX98_PTYS=y
+		  DEVPTS_FS=y
+
+	  Next, you need a /dev/pts directory on your root filesystem:
+
+		  $ ls -ld /dev/pts
+		  drwxr-xr-x  2 root root 0 Sep 23 13:21 /dev/pts/
+
+	  Next you need the pseudo terminal master multiplexer /dev/ptmx:
+
+		  $ ls -la /dev/ptmx
+		  crw-rw-rw-  1 root tty 5, 2 Sep 23 13:55 /dev/ptmx
+
+	  Any /dev/ttyp[0-9]* files you may have can be removed.
+	  Next, you need to mount the devpts filesystem on /dev/pts using:
+
+		  mount -t devpts devpts /dev/pts
+
+	  You need to be sure that busybox has LOGIN and
+	  FEATURE_SUID enabled. And finally, you should make
+	  certain that Busybox has been installed setuid root:
+
+		chown root.root /bin/busybox
+		chmod 4755 /bin/busybox
+
+	  with all that done, telnetd _should_ work....
+
+
+config BUSYBOX_CONFIG_FEATURE_TELNETD_STANDALONE
+	bool "Support standalone telnetd (not inetd only)"
+	default BUSYBOX_DEFAULT_FEATURE_TELNETD_STANDALONE
+	depends on BUSYBOX_CONFIG_TELNETD
+	help
+	  Selecting this will make telnetd able to run standalone.
+
+config BUSYBOX_CONFIG_FEATURE_TELNETD_INETD_WAIT
+	bool "Support -w SEC option (inetd wait mode)"
+	default BUSYBOX_DEFAULT_FEATURE_TELNETD_INETD_WAIT
+	depends on BUSYBOX_CONFIG_FEATURE_TELNETD_STANDALONE
+	help
+	  This option allows you to run telnetd in "inet wait" mode.
+	  Example inetd.conf line (note "wait", not usual "nowait"):
+
+	  telnet stream tcp wait root /bin/telnetd telnetd -w10
+
+	  In this example, inetd passes _listening_ socket_ as fd 0
+	  to telnetd when connection appears.
+	  telnetd will wait for connections until all existing
+	  connections are closed, and no new connections
+	  appear during 10 seconds. Then it exits, and inetd continues
+	  to listen for new connections.
+
+	  This option is rarely used. "tcp nowait" is much more usual
+	  way of running tcp services, including telnetd.
+	  You most probably want to say N here.
+
+config BUSYBOX_CONFIG_TFTP
+	bool "tftp"
+	default BUSYBOX_DEFAULT_TFTP
+	help
+	  This enables the Trivial File Transfer Protocol client program. TFTP
+	  is usually used for simple, small transfers such as a root image
+	  for a network-enabled bootloader.
+
+config BUSYBOX_CONFIG_TFTPD
+	bool "tftpd"
+	default BUSYBOX_DEFAULT_TFTPD
+	help
+	  This enables the Trivial File Transfer Protocol server program.
+	  It expects that stdin is a datagram socket and a packet
+	  is already pending on it. It will exit after one transfer.
+	  In other words: it should be run from inetd in nowait mode,
+	  or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
+
+comment "Common options for tftp/tftpd"
+	depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
+
+config BUSYBOX_CONFIG_FEATURE_TFTP_GET
+	bool "Enable 'tftp get' and/or tftpd upload code"
+	default BUSYBOX_DEFAULT_FEATURE_TFTP_GET
+	depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
+	help
+	  Add support for the GET command within the TFTP client. This allows
+	  a client to retrieve a file from a TFTP server.
+	  Also enable upload support in tftpd, if tftpd is selected.
+
+	  Note: this option does _not_ make tftpd capable of download
+	  (the usual operation people need from it)!
+
+config BUSYBOX_CONFIG_FEATURE_TFTP_PUT
+	bool "Enable 'tftp put' and/or tftpd download code"
+	default BUSYBOX_DEFAULT_FEATURE_TFTP_PUT
+	depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
+	help
+	  Add support for the PUT command within the TFTP client. This allows
+	  a client to transfer a file to a TFTP server.
+	  Also enable download support in tftpd, if tftpd is selected.
+
+config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
+	bool "Enable 'blksize' and 'tsize' protocol options"
+	default BUSYBOX_DEFAULT_FEATURE_TFTP_BLOCKSIZE
+	depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
+	help
+	  Allow tftp to specify block size, and tftpd to understand
+	  "blksize" and "tsize" options.
+
+config BUSYBOX_CONFIG_FEATURE_TFTP_PROGRESS_BAR
+	bool "Enable tftp progress meter"
+	default BUSYBOX_DEFAULT_FEATURE_TFTP_PROGRESS_BAR
+	depends on BUSYBOX_CONFIG_TFTP && BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
+	help
+	  Show progress bar.
+
+config BUSYBOX_CONFIG_TFTP_DEBUG
+	bool "Enable debug"
+	default BUSYBOX_DEFAULT_TFTP_DEBUG
+	depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
+	help
+	  Make tftp[d] print debugging messages on stderr.
+	  This is useful if you are diagnosing a bug in tftp[d].
+
+config BUSYBOX_CONFIG_TRACEROUTE
+	bool "traceroute"
+	default BUSYBOX_DEFAULT_TRACEROUTE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Utility to trace the route of IP packets.
+
+config BUSYBOX_CONFIG_TRACEROUTE6
+	bool "traceroute6"
+	default BUSYBOX_DEFAULT_TRACEROUTE6
+	depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_TRACEROUTE
+	help
+	  Utility to trace the route of IPv6 packets.
+
+config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
+	bool "Enable verbose output"
+	default BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_VERBOSE
+	depends on BUSYBOX_CONFIG_TRACEROUTE
+	help
+	  Add some verbosity to traceroute. This includes among other things
+	  hostnames and ICMP response types.
+
+config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
+	bool "Enable loose source route"
+	default BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_SOURCE_ROUTE
+	depends on BUSYBOX_CONFIG_TRACEROUTE
+	help
+	  Add option to specify a loose source route gateway
+	  (8 maximum).
+
+config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
+	bool "Use ICMP instead of UDP"
+	default BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_USE_ICMP
+	depends on BUSYBOX_CONFIG_TRACEROUTE
+	help
+	  Add option -I to use ICMP ECHO instead of UDP datagrams.
+
+config BUSYBOX_CONFIG_TUNCTL
+	bool "tunctl"
+	default BUSYBOX_DEFAULT_TUNCTL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  tunctl creates or deletes tun devices.
+
+config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
+	bool "Support owner:group assignment"
+	default BUSYBOX_DEFAULT_FEATURE_TUNCTL_UG
+	depends on BUSYBOX_CONFIG_TUNCTL
+	help
+	  Allow to specify owner and group of newly created interface.
+	  340 bytes of pure bloat. Say no here.
+
+source package/utils/busybox/config/networking/udhcp/Config.in
+
+config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
+	string "ifup udhcpc command line options"
+	default BUSYBOX_DEFAULT_IFUPDOWN_UDHCPC_CMD_OPTIONS
+	depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_UDHCPC
+	help
+	  Command line options to pass to udhcpc from ifup.
+	  Intended to alter options not available in /etc/network/interfaces.
+	  (IE: --syslog --background etc...)
+
+config BUSYBOX_CONFIG_UDPSVD
+	bool "udpsvd"
+	default BUSYBOX_DEFAULT_UDPSVD
+	help
+	  udpsvd listens on an UDP port and runs a program for each new
+	  connection.
+
+config BUSYBOX_CONFIG_VCONFIG
+	bool "vconfig"
+	default BUSYBOX_DEFAULT_VCONFIG
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Creates, removes, and configures VLAN interfaces
+
+config BUSYBOX_CONFIG_WGET
+	bool "wget"
+	default BUSYBOX_DEFAULT_WGET
+	help
+	  wget is a utility for non-interactive download of files from HTTP
+	  and FTP servers.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR
+	bool "Enable a nifty process meter (+2k)"
+	default BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
+	depends on BUSYBOX_CONFIG_WGET
+	help
+	  Enable the transfer progress bar for wget transfers.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION
+	bool "Enable HTTP authentication"
+	default BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
+	depends on BUSYBOX_CONFIG_WGET
+	help
+	  Support authenticated HTTP transfers.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the wget applet.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
+	bool "Enable timeout option -T SEC"
+	default BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
+	depends on BUSYBOX_CONFIG_WGET
+	help
+	  Supports network read and connect timeouts for wget,
+	  so that wget will give up and timeout, through the -T
+	  command line option.
+
+	  Currently only connect and network data read timeout are
+	  supported (i.e., timeout is not applied to the DNS query). When
+	  FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
+	  will work in addition to -T.
+
+config BUSYBOX_CONFIG_ZCIP
+	bool "zcip"
+	default BUSYBOX_DEFAULT_ZCIP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
+	  It's a daemon that allocates and defends a dynamically assigned
+	  address on the 169.254/16 network, requiring no system administrator.
+
+	  See http://www.zeroconf.org for further details, and "zcip.script"
+	  in the busybox examples.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/networking/udhcp/Config.in b/trunk/package/utils/busybox/config/networking/udhcp/Config.in
new file mode 100644
index 00000000..576a01a2
--- /dev/null
+++ b/trunk/package/utils/busybox/config/networking/udhcp/Config.in
@@ -0,0 +1,160 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+config BUSYBOX_CONFIG_UDHCPC6
+	bool "udhcp client for DHCPv6 (udhcpc6)"
+	default BUSYBOX_DEFAULT_UDHCPC6  # not yet ready
+	depends on BUSYBOX_CONFIG_FEATURE_IPV6
+	help
+	  udhcpc6 is a DHCPv6 client
+
+config BUSYBOX_CONFIG_UDHCPD
+	bool "udhcp server (udhcpd)"
+	default BUSYBOX_DEFAULT_UDHCPD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  udhcpd is a DHCP server geared primarily toward embedded systems,
+	  while striving to be fully functional and RFC compliant.
+
+config BUSYBOX_CONFIG_DHCPRELAY
+	bool "dhcprelay"
+	default BUSYBOX_DEFAULT_DHCPRELAY
+	depends on BUSYBOX_CONFIG_UDHCPD
+	help
+	  dhcprelay listens for dhcp requests on one or more interfaces
+	  and forwards these requests to a different interface or dhcp
+	  server.
+
+config BUSYBOX_CONFIG_DUMPLEASES
+	bool "Lease display utility (dumpleases)"
+	default BUSYBOX_DEFAULT_DUMPLEASES
+	depends on BUSYBOX_CONFIG_UDHCPD
+	help
+	  dumpleases displays the leases written out by the udhcpd server.
+	  Lease times are stored in the file by time remaining in lease, or
+	  by the absolute time that it expires in seconds from epoch.
+
+config BUSYBOX_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY
+	bool "Rewrite the lease file at every new acknowledge"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPD_WRITE_LEASES_EARLY
+	depends on BUSYBOX_CONFIG_UDHCPD
+	help
+	  If selected, udhcpd will write a new file with leases every
+	  time a new lease has been accepted, thus eliminating the need
+	  to send SIGUSR1 for the initial writing or updating. Any timed
+	  rewriting remains undisturbed.
+
+config BUSYBOX_CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC
+	bool "Select IP address based on client MAC"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPD_BASE_IP_ON_MAC
+	depends on BUSYBOX_CONFIG_UDHCPD
+	help
+	  If selected, udhcpd will base its selection of IP address to offer
+	  on the client's hardware address. Otherwise udhcpd uses the next
+	  consecutive free address.
+
+	  This reduces the frequency of IP address changes for clients
+	  which let their lease expire, and makes consecutive DHCPOFFERS
+	  for the same client to (almost always) contain the same
+	  IP address.
+
+config BUSYBOX_CONFIG_DHCPD_LEASES_FILE
+	string "Absolute path to lease file"
+	default BUSYBOX_DEFAULT_DHCPD_LEASES_FILE
+	depends on BUSYBOX_CONFIG_UDHCPD
+	help
+	  udhcpd stores addresses in a lease file. This is the absolute path
+	  of the file. Normally it is safe to leave it untouched.
+
+config BUSYBOX_CONFIG_UDHCPC
+	bool "udhcp client (udhcpc)"
+	default BUSYBOX_DEFAULT_UDHCPC
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  udhcpc is a DHCP client geared primarily toward embedded systems,
+	  while striving to be fully functional and RFC compliant.
+
+	  The udhcp client negotiates a lease with the DHCP server and
+	  runs a script when a lease is obtained or lost.
+
+config BUSYBOX_CONFIG_FEATURE_UDHCPC_ARPING
+	bool "Verify that the offered address is free, using ARP ping"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCPC_ARPING
+	depends on BUSYBOX_CONFIG_UDHCPC
+	help
+	  If selected, udhcpc will send ARP probes and make sure
+	  the offered address is really not in use by anyone. The client
+	  will DHCPDECLINE the offer if the address is in use,
+	  and restart the discover process.
+
+config BUSYBOX_CONFIG_FEATURE_UDHCP_PORT
+	bool "Enable '-P port' option for udhcpd and udhcpc"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCP_PORT
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC
+	help
+	  At the cost of ~300 bytes, enables -P port option.
+	  This feature is typically not needed.
+
+config BUSYBOX_CONFIG_UDHCP_DEBUG
+	int "Maximum verbosity level for udhcp applets (0..9)"
+	default BUSYBOX_DEFAULT_UDHCP_DEBUG
+	range 0 9
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_DHCPRELAY
+	help
+	  Verbosity can be increased with multiple -v options.
+	  This option controls how high it can be cranked up.
+
+	  Bigger values result in bigger code. Levels above 1
+	  are very verbose and useful for debugging only.
+
+config BUSYBOX_CONFIG_FEATURE_UDHCP_RFC3397
+	bool "Support for RFC3397 domain search (experimental)"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCP_RFC3397
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC
+	help
+	  If selected, both client and server will support passing of domain
+	  search lists via option 119, specified in RFC 3397,
+	  and SIP servers option 120, specified in RFC 3361.
+
+config BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q
+	bool "Support for 802.1Q VLAN parameters"
+	default BUSYBOX_DEFAULT_FEATURE_UDHCP_8021Q
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC
+	help
+	  If selected, both client and server will support passing of VLAN
+	  ID and priority via options 132 and 133 as per 802.1Q.
+
+config BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT
+	string "Absolute path to config script"
+	default BUSYBOX_DEFAULT_UDHCPC_DEFAULT_SCRIPT
+	depends on BUSYBOX_CONFIG_UDHCPC
+	help
+	  This script is called after udhcpc receives an answer. See
+	  examples/udhcp for a working example. Normally it is safe
+	  to leave this untouched.
+
+config BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS
+	int "DHCP options slack buffer size"
+	default BUSYBOX_DEFAULT_UDHCPC_SLACK_FOR_BUGGY_SERVERS
+	range 0 924
+	depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC
+	help
+	  Some buggy DHCP servers send DHCP offer packets with option
+	  field larger than we expect (which might also be considered a
+	  buffer overflow attempt). These packets are normally discarded.
+	  If circumstances beyond your control force you to support such
+	  servers, this may help. The upper limit (924) makes dhcpc accept
+	  even 1500 byte packets (maximum-sized ethernet packets).
+
+	  This option does not make dhcp[cd] emit non-standard
+	  sized packets.
+
+	  Known buggy DHCP servers:
+	  3Com OfficeConnect Remote 812 ADSL Router:
+	    seems to confuse maximum allowed UDP packet size with
+	    maximum size of entire IP packet, and sends packets which are
+	    28 bytes too large.
+	  Seednet (ISP) VDSL: sends packets 2 bytes too large.
diff --git a/trunk/package/utils/busybox/config/printutils/Config.in b/trunk/package/utils/busybox/config/printutils/Config.in
new file mode 100644
index 00000000..cccc4a54
--- /dev/null
+++ b/trunk/package/utils/busybox/config/printutils/Config.in
@@ -0,0 +1,28 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Print Utilities"
+
+
+config BUSYBOX_CONFIG_LPD
+	bool "lpd"
+	default BUSYBOX_DEFAULT_LPD
+	help
+	  lpd is a print spooling daemon.
+
+config BUSYBOX_CONFIG_LPR
+	bool "lpr"
+	default BUSYBOX_DEFAULT_LPR
+	help
+	  lpr sends files (or standard input) to a print spooling daemon.
+
+config BUSYBOX_CONFIG_LPQ
+	bool "lpq"
+	default BUSYBOX_DEFAULT_LPQ
+	help
+	  lpq is a print spool queue examination and manipulation program.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/procps/Config.in b/trunk/package/utils/busybox/config/procps/Config.in
new file mode 100644
index 00000000..6eafbda0
--- /dev/null
+++ b/trunk/package/utils/busybox/config/procps/Config.in
@@ -0,0 +1,273 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Process Utilities"
+
+config BUSYBOX_CONFIG_IOSTAT
+	bool "iostat"
+	default BUSYBOX_DEFAULT_IOSTAT
+	help
+	  Report CPU and I/O statistics
+config BUSYBOX_CONFIG_LSOF
+	bool "lsof"
+	default BUSYBOX_DEFAULT_LSOF
+	help
+	  Show open files in the format of:
+	  PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+config BUSYBOX_CONFIG_MPSTAT
+	bool "mpstat"
+	default BUSYBOX_DEFAULT_MPSTAT
+	help
+	  Per-processor statistics
+config BUSYBOX_CONFIG_NMETER
+	bool "nmeter"
+	default BUSYBOX_DEFAULT_NMETER
+	help
+	  Prints selected system stats continuously, one line per update.
+config BUSYBOX_CONFIG_PMAP
+       bool "pmap"
+       default BUSYBOX_DEFAULT_PMAP
+       help
+         Display processes' memory mappings.
+config BUSYBOX_CONFIG_POWERTOP
+	bool "powertop"
+	default BUSYBOX_DEFAULT_POWERTOP
+	help
+	  Analyze power consumption on Intel-based laptops
+config BUSYBOX_CONFIG_PSTREE
+	bool "pstree"
+	default BUSYBOX_DEFAULT_PSTREE
+	help
+	  Display a tree of processes.
+config BUSYBOX_CONFIG_PWDX
+	bool "pwdx"
+	default BUSYBOX_DEFAULT_PWDX
+	help
+	  Report current working directory of a process
+config BUSYBOX_CONFIG_SMEMCAP
+	bool "smemcap"
+	default BUSYBOX_DEFAULT_SMEMCAP
+	help
+	  smemcap is a tool for capturing process data for smem,
+	  a memory usage statistic tool.
+config BUSYBOX_CONFIG_TOP
+	bool "top"
+	default BUSYBOX_DEFAULT_TOP
+	help
+	  The top program provides a dynamic real-time view of a running
+	  system.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	bool "Show CPU per-process usage percentage"
+	default BUSYBOX_DEFAULT_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	depends on BUSYBOX_CONFIG_TOP
+	help
+	  Make top display CPU usage for each process.
+	  This adds about 2k.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	bool "Show CPU global usage percentage"
+	default BUSYBOX_DEFAULT_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	help
+	  Makes top display "CPU: NN% usr NN% sys..." line.
+	  This adds about 0.5k.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU
+	bool "SMP CPU usage display ('c' key)"
+	default BUSYBOX_DEFAULT_FEATURE_TOP_SMP_CPU
+	depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	help
+	  Allow 'c' key to switch between individual/cumulative CPU stats
+	  This adds about 0.5k.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS
+	bool "Show 1/10th of a percent in CPU/mem statistics"
+	default BUSYBOX_DEFAULT_FEATURE_TOP_DECIMALS
+	depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	help
+	  Show 1/10th of a percent in CPU/mem statistics.
+	  This adds about 0.3k.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS
+	bool "Show CPU process runs on ('j' field)"
+	default BUSYBOX_DEFAULT_FEATURE_TOP_SMP_PROCESS
+	depends on BUSYBOX_CONFIG_TOP
+	help
+	  Show CPU where process was last found running on.
+	  This is the 'j' field.
+
+config BUSYBOX_CONFIG_FEATURE_TOPMEM
+	bool "Topmem command ('s' key)"
+	default BUSYBOX_DEFAULT_FEATURE_TOPMEM
+	depends on BUSYBOX_CONFIG_TOP
+	help
+	  Enable 's' in top (gives lots of memory info).
+config BUSYBOX_CONFIG_UPTIME
+	bool "uptime"
+	default BUSYBOX_DEFAULT_UPTIME
+	select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo()
+	help
+	  uptime gives a one line display of the current time, how long
+	  the system has been running, how many users are currently logged
+	  on, and the system load averages for the past 1, 5, and 15 minutes.
+
+config BUSYBOX_CONFIG_FEATURE_UPTIME_UTMP_SUPPORT
+	bool "Support for showing the number of users"
+	default BUSYBOX_DEFAULT_FEATURE_UPTIME_UTMP_SUPPORT
+	depends on BUSYBOX_CONFIG_UPTIME && BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	  Makes uptime display the number of users currently logged on.
+
+config BUSYBOX_CONFIG_FREE
+	bool "free"
+	default BUSYBOX_DEFAULT_FREE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo()
+	help
+	  free displays the total amount of free and used physical and swap
+	  memory in the system, as well as the buffers used by the kernel.
+	  The shared memory column should be ignored; it is obsolete.
+
+config BUSYBOX_CONFIG_FUSER
+	bool "fuser"
+	default BUSYBOX_DEFAULT_FUSER
+	help
+	  fuser lists all PIDs (Process IDs) that currently have a given
+	  file open. fuser can also list all PIDs that have a given network
+	  (TCP or UDP) port open.
+
+config BUSYBOX_CONFIG_KILL
+	bool "kill"
+	default BUSYBOX_DEFAULT_KILL
+	help
+	  The command kill sends the specified signal to the specified
+	  process or process group. If no signal is specified, the TERM
+	  signal is sent.
+
+config BUSYBOX_CONFIG_KILLALL
+	bool "killall"
+	default BUSYBOX_DEFAULT_KILLALL
+	depends on BUSYBOX_CONFIG_KILL
+	help
+	  killall sends a signal to all processes running any of the
+	  specified commands. If no signal name is specified, SIGTERM is
+	  sent.
+
+config BUSYBOX_CONFIG_KILLALL5
+	bool "killall5"
+	default BUSYBOX_DEFAULT_KILLALL5
+	depends on BUSYBOX_CONFIG_KILL
+
+config BUSYBOX_CONFIG_PGREP
+	bool "pgrep"
+	default BUSYBOX_DEFAULT_PGREP
+	help
+	  Look for processes by name.
+
+config BUSYBOX_CONFIG_PIDOF
+	bool "pidof"
+	default BUSYBOX_DEFAULT_PIDOF
+	help
+	  Pidof finds the process id's (pids) of the named programs. It prints
+	  those id's on the standard output.
+
+config BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE
+	bool "Enable argument for single shot (-s)"
+	default BUSYBOX_DEFAULT_FEATURE_PIDOF_SINGLE
+	depends on BUSYBOX_CONFIG_PIDOF
+	help
+	  Support argument '-s' for returning only the first pid found.
+
+config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT
+	bool "Enable argument for omitting pids (-o)"
+	default BUSYBOX_DEFAULT_FEATURE_PIDOF_OMIT
+	depends on BUSYBOX_CONFIG_PIDOF
+	help
+	  Support argument '-o' for omitting the given pids in output.
+	  The special pid %PPID can be used to name the parent process
+	  of the pidof, in other words the calling shell or shell script.
+
+config BUSYBOX_CONFIG_PKILL
+	bool "pkill"
+	default BUSYBOX_DEFAULT_PKILL
+	help
+	  Send signals to processes by name.
+
+config BUSYBOX_CONFIG_PS
+	bool "ps"
+	default BUSYBOX_DEFAULT_PS
+	help
+	  ps gives a snapshot of the current processes.
+
+config BUSYBOX_CONFIG_FEATURE_PS_WIDE
+	bool "Enable wide output option (-w)"
+	default BUSYBOX_DEFAULT_FEATURE_PS_WIDE
+	depends on BUSYBOX_CONFIG_PS && !BUSYBOX_CONFIG_DESKTOP
+	help
+	  Support argument 'w' for wide output.
+	  If given once, 132 chars are printed, and if given more
+	  than once, the length is unlimited.
+
+config BUSYBOX_CONFIG_FEATURE_PS_LONG
+	bool "Enable long output option (-l)"
+	default BUSYBOX_DEFAULT_FEATURE_PS_LONG
+	depends on BUSYBOX_CONFIG_PS && !BUSYBOX_CONFIG_DESKTOP
+	help
+	  Support argument 'l' for long output.
+	  Adds fields PPID, RSS, START, TIME & TTY
+
+config BUSYBOX_CONFIG_FEATURE_PS_TIME
+	bool "Enable time and elapsed time output"
+	default BUSYBOX_DEFAULT_FEATURE_PS_TIME
+	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Support -o time and -o etime output specifiers.
+
+config BUSYBOX_CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS
+	bool "Enable additional ps columns"
+	default BUSYBOX_DEFAULT_FEATURE_PS_ADDITIONAL_COLUMNS
+	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
+	help
+	  Support -o rgroup, -o ruser, -o nice output specifiers.
+
+config BUSYBOX_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS
+	bool "Support Linux prior to 2.4.0 and non-ELF systems"
+	default BUSYBOX_DEFAULT_FEATURE_PS_UNUSUAL_SYSTEMS
+	depends on BUSYBOX_CONFIG_FEATURE_PS_TIME
+	help
+	  Include support for measuring HZ on old kernels and non-ELF systems
+	  (if you are on Linux 2.4.0+ and use ELF, you don't need this)
+
+config BUSYBOX_CONFIG_RENICE
+	bool "renice"
+	default BUSYBOX_DEFAULT_RENICE
+	help
+	  Renice alters the scheduling priority of one or more running
+	  processes.
+
+config BUSYBOX_CONFIG_BB_SYSCTL
+	bool "sysctl"
+	default BUSYBOX_DEFAULT_BB_SYSCTL
+	help
+	  Configure kernel parameters at runtime.
+
+config BUSYBOX_CONFIG_FEATURE_SHOW_THREADS
+	bool "Support for showing threads in ps/pstree/top"
+	default BUSYBOX_DEFAULT_FEATURE_SHOW_THREADS
+	depends on BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_TOP || BUSYBOX_CONFIG_PSTREE
+	help
+	  Enables the ps -T option, showing of threads in pstree,
+	  and 'h' command in top.
+
+config BUSYBOX_CONFIG_WATCH
+	bool "watch"
+	default BUSYBOX_DEFAULT_WATCH
+	help
+	  watch is used to execute a program periodically, showing
+	  output to the screen.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/runit/Config.in b/trunk/package/utils/busybox/config/runit/Config.in
new file mode 100644
index 00000000..8074fb18
--- /dev/null
+++ b/trunk/package/utils/busybox/config/runit/Config.in
@@ -0,0 +1,89 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Runit Utilities"
+
+
+config BUSYBOX_CONFIG_RUNSV
+	bool "runsv"
+	default BUSYBOX_DEFAULT_RUNSV
+	help
+	  runsv starts and monitors a service and optionally an appendant log
+	  service.
+
+config BUSYBOX_CONFIG_RUNSVDIR
+	bool "runsvdir"
+	default BUSYBOX_DEFAULT_RUNSVDIR
+	help
+	  runsvdir starts a runsv process for each subdirectory, or symlink to
+	  a directory, in the services directory dir, up to a limit of 1000
+	  subdirectories, and restarts a runsv process if it terminates.
+
+config BUSYBOX_CONFIG_FEATURE_RUNSVDIR_LOG
+	bool "Enable scrolling argument log"
+	depends on BUSYBOX_CONFIG_RUNSVDIR
+	default BUSYBOX_DEFAULT_FEATURE_RUNSVDIR_LOG
+	help
+	  Enable feature where second parameter of runsvdir holds last error
+	  message (viewable via top/ps). Otherwise (feature is off
+	  or no parameter), error messages go to stderr only.
+
+config BUSYBOX_CONFIG_SV
+	bool "sv"
+	default BUSYBOX_DEFAULT_SV
+	help
+	  sv reports the current status and controls the state of services
+	  monitored by the runsv supervisor.
+
+config BUSYBOX_CONFIG_SV_DEFAULT_SERVICE_DIR
+	string "Default directory for services"
+	default BUSYBOX_DEFAULT_SV_DEFAULT_SERVICE_DIR
+	depends on BUSYBOX_CONFIG_SV
+	help
+	  Default directory for services.
+	  Defaults to "/var/service"
+
+config BUSYBOX_CONFIG_SVLOGD
+	bool "svlogd"
+	default BUSYBOX_DEFAULT_SVLOGD
+	help
+	  svlogd continuously reads log data from its standard input, optionally
+	  filters log messages, and writes the data to one or more automatically
+	  rotated logs.
+
+config BUSYBOX_CONFIG_CHPST
+	bool "chpst"
+	default BUSYBOX_DEFAULT_CHPST
+	help
+	  chpst changes the process state according to the given options, and
+	  execs specified program.
+
+config BUSYBOX_CONFIG_SETUIDGID
+	bool "setuidgid"
+	default BUSYBOX_DEFAULT_SETUIDGID
+	help
+	  Sets soft resource limits as specified by options
+
+config BUSYBOX_CONFIG_ENVUIDGID
+	bool "envuidgid"
+	default BUSYBOX_DEFAULT_ENVUIDGID
+	help
+	  Sets $UID to account's uid and $GID to account's gid
+
+config BUSYBOX_CONFIG_ENVDIR
+	bool "envdir"
+	default BUSYBOX_DEFAULT_ENVDIR
+	help
+	  Sets various environment variables as specified by files
+	  in the given directory
+
+config BUSYBOX_CONFIG_SOFTLIMIT
+	bool "softlimit"
+	default BUSYBOX_DEFAULT_SOFTLIMIT
+	help
+	  Sets soft resource limits as specified by options
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/selinux/Config.in b/trunk/package/utils/busybox/config/selinux/Config.in
new file mode 100644
index 00000000..3340e4bb
--- /dev/null
+++ b/trunk/package/utils/busybox/config/selinux/Config.in
@@ -0,0 +1,124 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "SELinux Utilities"
+	depends on BUSYBOX_CONFIG_SELINUX
+
+
+config BUSYBOX_CONFIG_CHCON
+	bool "chcon"
+	default BUSYBOX_DEFAULT_CHCON
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to change the security context of file.
+
+config BUSYBOX_CONFIG_FEATURE_CHCON_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_CHCON_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_CHCON && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the chcon applet.
+
+config BUSYBOX_CONFIG_GETENFORCE
+	bool "getenforce"
+	default BUSYBOX_DEFAULT_GETENFORCE
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to get the current mode of SELinux.
+
+config BUSYBOX_CONFIG_GETSEBOOL
+	bool "getsebool"
+	default BUSYBOX_DEFAULT_GETSEBOOL
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to get SELinux boolean values.
+
+config BUSYBOX_CONFIG_LOAD_POLICY
+	bool "load_policy"
+	default BUSYBOX_DEFAULT_LOAD_POLICY
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to load SELinux policy.
+
+config BUSYBOX_CONFIG_MATCHPATHCON
+	bool "matchpathcon"
+	default BUSYBOX_DEFAULT_MATCHPATHCON
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to get default security context of the
+	  specified path from the file contexts configuration.
+
+config BUSYBOX_CONFIG_RESTORECON
+	bool "restorecon"
+	default BUSYBOX_DEFAULT_RESTORECON
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to relabel files. The feature is almost
+	  the same as setfiles, but usage is a little different.
+
+config BUSYBOX_CONFIG_RUNCON
+	bool "runcon"
+	default BUSYBOX_DEFAULT_RUNCON
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to run command in speficied security context.
+
+config BUSYBOX_CONFIG_FEATURE_RUNCON_LONG_OPTIONS
+	bool "Enable long options"
+	default BUSYBOX_DEFAULT_FEATURE_RUNCON_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_RUNCON && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  Support long options for the runcon applet.
+
+config BUSYBOX_CONFIG_SELINUXENABLED
+	bool "selinuxenabled"
+	default BUSYBOX_DEFAULT_SELINUXENABLED
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support for this command to be used within shell scripts
+	  to determine if selinux is enabled.
+
+config BUSYBOX_CONFIG_SETENFORCE
+	bool "setenforce"
+	default BUSYBOX_DEFAULT_SETENFORCE
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to modify the mode SELinux is running in.
+
+config BUSYBOX_CONFIG_SETFILES
+	bool "setfiles"
+	default BUSYBOX_DEFAULT_SETFILES
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support to modify to relabel files.
+	  Notice: If you built libselinux with -D_FILE_OFFSET_BITS=64,
+	  (It is default in libselinux's Makefile), you _must_ enable
+	  CONFIG_LFS.
+
+config BUSYBOX_CONFIG_FEATURE_SETFILES_CHECK_OPTION
+	bool "Enable check option"
+	default BUSYBOX_DEFAULT_FEATURE_SETFILES_CHECK_OPTION
+	depends on BUSYBOX_CONFIG_SETFILES
+	help
+	  Support "-c" option (check the validity of the contexts against
+	  the specified binary policy) for setfiles. Requires libsepol.
+
+config BUSYBOX_CONFIG_SETSEBOOL
+	bool "setsebool"
+	default BUSYBOX_DEFAULT_SETSEBOOL
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Enable support for change boolean.
+	  semanage and -P option is not supported yet.
+
+config BUSYBOX_CONFIG_SESTATUS
+	bool "sestatus"
+	default BUSYBOX_DEFAULT_SESTATUS
+	depends on BUSYBOX_CONFIG_SELINUX
+	help
+	  Displays the status of SELinux.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/shell/Config.in b/trunk/package/utils/busybox/config/shell/Config.in
new file mode 100644
index 00000000..c375f0c2
--- /dev/null
+++ b/trunk/package/utils/busybox/config/shell/Config.in
@@ -0,0 +1,437 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Shells"
+
+config BUSYBOX_CONFIG_ASH
+	bool "ash"
+	default BUSYBOX_DEFAULT_ASH
+	depends on !BUSYBOX_CONFIG_NOMMU
+	help
+	  Tha 'ash' shell adds about 60k in the default configuration and is
+	  the most complete and most pedantically correct shell included with
+	  busybox. This shell is actually a derivative of the Debian 'dash'
+	  shell (by Herbert Xu), which was created by porting the 'ash' shell
+	  (written by Kenneth Almquist) from NetBSD.
+
+config BUSYBOX_CONFIG_ASH_BASH_COMPAT
+	bool "bash-compatible extensions"
+	default BUSYBOX_DEFAULT_ASH_BASH_COMPAT
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable bash-compatible extensions.
+
+config BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT
+	bool "Idle timeout variable"
+	default BUSYBOX_DEFAULT_ASH_IDLE_TIMEOUT
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enables bash-like auto-logout after $TMOUT seconds of idle time.
+
+config BUSYBOX_CONFIG_ASH_JOB_CONTROL
+	bool "Job control"
+	default BUSYBOX_DEFAULT_ASH_JOB_CONTROL
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable job control in the ash shell.
+
+config BUSYBOX_CONFIG_ASH_ALIAS
+	bool "Alias support"
+	default BUSYBOX_DEFAULT_ASH_ALIAS
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable alias support in the ash shell.
+
+config BUSYBOX_CONFIG_ASH_GETOPTS
+	bool "Builtin getopt to parse positional parameters"
+	default BUSYBOX_DEFAULT_ASH_GETOPTS
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable support for getopts builtin in ash.
+
+config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
+	bool "Builtin version of 'echo'"
+	default BUSYBOX_DEFAULT_ASH_BUILTIN_ECHO
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable support for echo builtin in ash.
+
+config BUSYBOX_CONFIG_ASH_BUILTIN_PRINTF
+	bool "Builtin version of 'printf'"
+	default BUSYBOX_DEFAULT_ASH_BUILTIN_PRINTF
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable support for printf builtin in ash.
+
+config BUSYBOX_CONFIG_ASH_BUILTIN_TEST
+	bool "Builtin version of 'test'"
+	default BUSYBOX_DEFAULT_ASH_BUILTIN_TEST
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable support for test builtin in ash.
+
+config BUSYBOX_CONFIG_ASH_CMDCMD
+	bool "'command' command to override shell builtins"
+	default BUSYBOX_DEFAULT_ASH_CMDCMD
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable support for the ash 'command' builtin, which allows
+	  you to run the specified command with the specified arguments,
+	  even when there is an ash builtin command with the same name.
+
+config BUSYBOX_CONFIG_ASH_MAIL
+	bool "Check for new mail on interactive shells"
+	default BUSYBOX_DEFAULT_ASH_MAIL
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable "check for new mail" function in the ash shell.
+
+config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE
+	bool "Optimize for size instead of speed"
+	default BUSYBOX_DEFAULT_ASH_OPTIMIZE_FOR_SIZE
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Compile ash for reduced size at the price of speed.
+
+config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT
+	bool "Pseudorandom generator and $RANDOM variable"
+	default BUSYBOX_DEFAULT_ASH_RANDOM_SUPPORT
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  Enable pseudorandom generator and dynamic variable "$RANDOM".
+	  Each read of "$RANDOM" will generate a new pseudorandom value.
+	  You can reset the generator by using a specified start value.
+	  After "unset RANDOM" the generator will switch off and this
+	  variable will no longer have special treatment.
+
+config BUSYBOX_CONFIG_ASH_EXPAND_PRMT
+	bool "Expand prompt string"
+	default BUSYBOX_DEFAULT_ASH_EXPAND_PRMT
+	depends on BUSYBOX_CONFIG_ASH
+	help
+	  "PS#" may contain volatile content, such as backquote commands.
+	  This option recreates the prompt string from the environment
+	  variable each time it is displayed.
+
+config BUSYBOX_CONFIG_CTTYHACK
+	bool "cttyhack"
+	default BUSYBOX_DEFAULT_CTTYHACK
+	help
+	  One common problem reported on the mailing list is the "can't
+	  access tty; job control turned off" error message, which typically
+	  appears when one tries to use a shell with stdin/stdout on
+	  /dev/console.
+	  This device is special - it cannot be a controlling tty.
+
+	  The proper solution is to use the correct device instead of
+	  /dev/console.
+
+	  cttyhack provides a "quick and dirty" solution to this problem.
+	  It analyzes stdin with various ioctls, trying to determine whether
+	  it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
+	  On Linux it also checks sysfs for a pointer to the active console.
+	  If cttyhack is able to find the real console device, it closes
+	  stdin/out/err and reopens that device.
+	  Then it executes the given program. Opening the device will make
+	  that device a controlling tty. This may require cttyhack
+	  to be a session leader.
+
+	  Example for /etc/inittab (for busybox init):
+
+	  ::respawn:/bin/cttyhack /bin/sh
+
+	  Starting an interactive shell from boot shell script:
+
+	  setsid cttyhack sh
+
+	  Giving controlling tty to shell running with PID 1:
+
+	  # exec cttyhack sh
+
+	  Without cttyhack, you need to know exact tty name,
+	  and do something like this:
+
+	  # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+
+	  Starting getty on a controlling tty from a shell script:
+
+	  # getty 115200 $(cttyhack)
+config BUSYBOX_CONFIG_HUSH
+	bool "hush"
+	default BUSYBOX_DEFAULT_HUSH
+	help
+	  hush is a small shell (25k). It handles the normal flow control
+	  constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
+	  case/esac. Redirections, here documents, $((arithmetic))
+	  and functions are supported.
+
+	  It will compile and work on no-mmu systems.
+
+	  It does not handle select, aliases, tilde expansion,
+	  &>file and >&file redirection of stdout+stderr.
+
+config BUSYBOX_CONFIG_HUSH_BASH_COMPAT
+	bool "bash-compatible extensions"
+	default BUSYBOX_DEFAULT_HUSH_BASH_COMPAT
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable bash-compatible extensions.
+
+config BUSYBOX_CONFIG_HUSH_BRACE_EXPANSION
+	bool "Brace expansion"
+	default BUSYBOX_DEFAULT_HUSH_BRACE_EXPANSION
+	depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT
+	help
+	  Enable {abc,def} extension.
+
+config BUSYBOX_CONFIG_HUSH_HELP
+	bool "help builtin"
+	default BUSYBOX_DEFAULT_HUSH_HELP
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable help builtin in hush. Code size + ~1 kbyte.
+
+config BUSYBOX_CONFIG_HUSH_INTERACTIVE
+	bool "Interactive mode"
+	default BUSYBOX_DEFAULT_HUSH_INTERACTIVE
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable interactive mode (prompt and command editing).
+	  Without this, hush simply reads and executes commands
+	  from stdin just like a shell script from a file.
+	  No prompt, no PS1/PS2 magic shell variables.
+
+config BUSYBOX_CONFIG_HUSH_SAVEHISTORY
+	bool "Save command history to .hush_history"
+	default BUSYBOX_DEFAULT_HUSH_SAVEHISTORY
+	depends on BUSYBOX_CONFIG_HUSH_INTERACTIVE && BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY
+	help
+	  Enable history saving in hush.
+
+config BUSYBOX_CONFIG_HUSH_JOB
+	bool "Job control"
+	default BUSYBOX_DEFAULT_HUSH_JOB
+	depends on BUSYBOX_CONFIG_HUSH_INTERACTIVE
+	help
+	  Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
+	  command (not entire shell), fg/bg builtins work. Without this option,
+	  "cmd &" still works by simply spawning a process and immediately
+	  prompting for next command (or executing next command in a script),
+	  but no separate process group is formed.
+
+config BUSYBOX_CONFIG_HUSH_TICK
+	bool "Process substitution"
+	default BUSYBOX_DEFAULT_HUSH_TICK
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable process substitution `command` and $(command) in hush.
+
+config BUSYBOX_CONFIG_HUSH_IF
+	bool "Support if/then/elif/else/fi"
+	default BUSYBOX_DEFAULT_HUSH_IF
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable if/then/elif/else/fi in hush.
+
+config BUSYBOX_CONFIG_HUSH_LOOPS
+	bool "Support for, while and until loops"
+	default BUSYBOX_DEFAULT_HUSH_LOOPS
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable for, while and until loops in hush.
+
+config BUSYBOX_CONFIG_HUSH_CASE
+	bool "Support case ... esac statement"
+	default BUSYBOX_DEFAULT_HUSH_CASE
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable case ... esac statement in hush. +400 bytes.
+
+config BUSYBOX_CONFIG_HUSH_FUNCTIONS
+	bool "Support funcname() { commands; } syntax"
+	default BUSYBOX_DEFAULT_HUSH_FUNCTIONS
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable support for shell functions in hush. +800 bytes.
+
+config BUSYBOX_CONFIG_HUSH_LOCAL
+	bool "Support local builtin"
+	default BUSYBOX_DEFAULT_HUSH_LOCAL
+	depends on BUSYBOX_CONFIG_HUSH_FUNCTIONS
+	help
+	  Enable support for local variables in functions.
+
+config BUSYBOX_CONFIG_HUSH_RANDOM_SUPPORT
+	bool "Pseudorandom generator and $RANDOM variable"
+	default BUSYBOX_DEFAULT_HUSH_RANDOM_SUPPORT
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable pseudorandom generator and dynamic variable "$RANDOM".
+	  Each read of "$RANDOM" will generate a new pseudorandom value.
+
+config BUSYBOX_CONFIG_HUSH_EXPORT_N
+	bool "Support 'export -n' option"
+	default BUSYBOX_DEFAULT_HUSH_EXPORT_N
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  export -n unexports variables. It is a bash extension.
+
+config BUSYBOX_CONFIG_HUSH_MODE_X
+	bool "Support 'hush -x' option and 'set -x' command"
+	default BUSYBOX_DEFAULT_HUSH_MODE_X
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  This instructs hush to print commands before execution.
+	  Adds ~300 bytes.
+
+config BUSYBOX_CONFIG_MSH
+	bool "msh (deprecated: aliased to hush)"
+	default BUSYBOX_DEFAULT_MSH
+	select BUSYBOX_CONFIG_HUSH
+	help
+	  msh is deprecated and will be removed, please migrate to hush.
+
+
+
+choice
+	prompt "Choose which shell is aliased to 'sh' name"
+	default BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+	help
+	  Choose which shell you want to be executed by 'sh' alias.
+	  The ash shell is the most bash compatible and full featured one.
+
+# note: cannot use "select ASH" here, it breaks "make allnoconfig"
+config BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+	depends on BUSYBOX_CONFIG_ASH
+	bool "ash"
+	depends on !BUSYBOX_CONFIG_NOMMU
+
+config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
+	depends on BUSYBOX_CONFIG_HUSH
+	bool "hush"
+
+config BUSYBOX_CONFIG_FEATURE_SH_IS_NONE
+	bool "none"
+
+endchoice
+
+choice
+	prompt "Choose which shell is aliased to 'bash' name"
+	default BUSYBOX_CONFIG_FEATURE_BASH_IS_NONE
+	help
+	  Choose which shell you want to be executed by 'bash' alias.
+	  The ash shell is the most bash compatible and full featured one.
+
+	  Note that selecting this option does not switch on any bash
+	  compatibility code. It merely makes it possible to install
+	  /bin/bash (sym)link and run scripts which start with
+	  #!/bin/bash line.
+
+	  Many systems use it in scripts which use bash-specific features,
+	  even simple ones like $RANDOM. Without this option, busybox
+	  can't be used for running them because it won't recongnize
+	  "bash" as a supported applet name.
+
+config BUSYBOX_CONFIG_FEATURE_BASH_IS_ASH
+	depends on BUSYBOX_CONFIG_ASH
+	bool "ash"
+	depends on !BUSYBOX_CONFIG_NOMMU
+
+config BUSYBOX_CONFIG_FEATURE_BASH_IS_HUSH
+	depends on BUSYBOX_CONFIG_HUSH
+	bool "hush"
+
+config BUSYBOX_CONFIG_FEATURE_BASH_IS_NONE
+	bool "none"
+
+endchoice
+
+
+config BUSYBOX_CONFIG_SH_MATH_SUPPORT
+	bool "POSIX math support"
+	default BUSYBOX_DEFAULT_SH_MATH_SUPPORT
+	depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH
+	help
+	  Enable math support in the shell via $((...)) syntax.
+
+config BUSYBOX_CONFIG_SH_MATH_SUPPORT_64
+	bool "Extend POSIX math support to 64 bit"
+	default BUSYBOX_DEFAULT_SH_MATH_SUPPORT_64
+	depends on BUSYBOX_CONFIG_SH_MATH_SUPPORT
+	help
+	  Enable 64-bit math support in the shell. This will make the shell
+	  slightly larger, but will allow computation with very large numbers.
+	  This is not in POSIX, so do not rely on this in portable code.
+
+config BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET
+	bool "Hide message on interactive shell startup"
+	default BUSYBOX_DEFAULT_FEATURE_SH_EXTRA_QUIET
+	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
+	help
+	  Remove the busybox introduction when starting a shell.
+
+config BUSYBOX_CONFIG_FEATURE_SH_STANDALONE
+	bool "Standalone shell"
+	default BUSYBOX_DEFAULT_FEATURE_SH_STANDALONE
+	depends on (BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH) && BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS
+	help
+	  This option causes busybox shells to use busybox applets
+	  in preference to executables in the PATH whenever possible. For
+	  example, entering the command 'ifconfig' into the shell would cause
+	  busybox to use the ifconfig busybox applet. Specifying the fully
+	  qualified executable name, such as '/sbin/ifconfig' will still
+	  execute the /sbin/ifconfig executable on the filesystem. This option
+	  is generally used when creating a statically linked version of busybox
+	  for use as a rescue shell, in the event that you screw up your system.
+
+	  This is implemented by re-execing /proc/self/exe (typically)
+	  with right parameters. Some selected applets ("NOFORK" applets)
+	  can even be executed without creating new process.
+	  Instead, busybox will call <applet>_main() internally.
+
+	  However, this causes problems in chroot jails without mounted /proc
+	  and with ps/top (command name can be shown as 'exe' for applets
+	  started this way).
+# untrue?
+#	  Note that this will *also* cause applets to take precedence
+#	  over shell builtins of the same name. So turning this on will
+#	  eliminate any performance gained by turning on the builtin "echo"
+#	  and "test" commands in ash.
+# untrue?
+#	  Note that when using this option, the shell will attempt to directly
+#	  run '/bin/busybox'. If you do not have the busybox binary sitting in
+#	  that exact location with that exact name, this option will not work at
+#	  all.
+
+config BUSYBOX_CONFIG_FEATURE_SH_NOFORK
+	bool "Run 'nofork' applets directly"
+	default BUSYBOX_DEFAULT_FEATURE_SH_NOFORK
+	depends on (BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH) && BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS
+	help
+	  This option causes busybox shells to not execute typical
+	  fork/exec/wait sequence, but call <applet>_main directly,
+	  if possible. (Sometimes it is not possible: for example,
+	  this is not possible in pipes).
+
+	  This will be done only for some applets (those which are marked
+	  NOFORK in include/applets.h).
+
+	  This may significantly speed up some shell scripts.
+
+	  This feature is relatively new. Use with care. Report bugs
+	  to project mailing list.
+
+config BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE
+	bool "Use $HISTFILESIZE"
+	default BUSYBOX_DEFAULT_FEATURE_SH_HISTFILESIZE
+	depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
+	help
+	  This option makes busybox shells to use $HISTFILESIZE variable
+	  to set shell history size. Note that its max value is capped
+	  by "History size" setting in library tuning section.
+
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/sysklogd/Config.in b/trunk/package/utils/busybox/config/sysklogd/Config.in
new file mode 100644
index 00000000..de36a1e8
--- /dev/null
+++ b/trunk/package/utils/busybox/config/sysklogd/Config.in
@@ -0,0 +1,169 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "System Logging Utilities"
+
+
+config BUSYBOX_CONFIG_SYSLOGD
+	bool "syslogd"
+	default BUSYBOX_DEFAULT_SYSLOGD
+	help
+	  The syslogd utility is used to record logs of all the
+	  significant events that occur on a system. Every
+	  message that is logged records the date and time of the
+	  event, and will generally also record the name of the
+	  application that generated the message. When used in
+	  conjunction with klogd, messages from the Linux kernel
+	  can also be recorded. This is terribly useful,
+	  especially for finding what happened when something goes
+	  wrong. And something almost always will go wrong if
+	  you wait long enough....
+
+config BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE
+	bool "Rotate message files"
+	default BUSYBOX_DEFAULT_FEATURE_ROTATE_LOGFILE
+	depends on BUSYBOX_CONFIG_SYSLOGD
+	help
+	  This enables syslogd to rotate the message files
+	  on his own. No need to use an external rotatescript.
+
+config BUSYBOX_CONFIG_FEATURE_REMOTE_LOG
+	bool "Remote Log support"
+	default BUSYBOX_DEFAULT_FEATURE_REMOTE_LOG
+	depends on BUSYBOX_CONFIG_SYSLOGD
+	help
+	  When you enable this feature, the syslogd utility can
+	  be used to send system log messages to another system
+	  connected via a network. This allows the remote
+	  machine to log all the system messages, which can be
+	  terribly useful for reducing the number of serial
+	  cables you use. It can also be a very good security
+	  measure to prevent system logs from being tampered with
+	  by an intruder.
+
+config BUSYBOX_CONFIG_FEATURE_SYSLOGD_DUP
+	bool "Support -D (drop dups) option"
+	default BUSYBOX_DEFAULT_FEATURE_SYSLOGD_DUP
+	depends on BUSYBOX_CONFIG_SYSLOGD
+	help
+	  Option -D instructs syslogd to drop consecutive messages
+	  which are totally the same.
+
+config BUSYBOX_CONFIG_FEATURE_SYSLOGD_CFG
+	bool "Support syslog.conf"
+	default BUSYBOX_DEFAULT_FEATURE_SYSLOGD_CFG
+	depends on BUSYBOX_CONFIG_SYSLOGD
+	help
+	  Supports restricted syslogd config. See docs/syslog.conf.txt
+
+config BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE
+	int "Read buffer size in bytes"
+	default BUSYBOX_DEFAULT_FEATURE_SYSLOGD_READ_BUFFER_SIZE
+	range 256 20000
+	depends on BUSYBOX_CONFIG_SYSLOGD
+	help
+	  This option sets the size of the syslog read buffer.
+	  Actual memory usage increases around five times the
+	  change done here.
+
+config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
+	bool "Circular Buffer support"
+	default BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG
+	depends on BUSYBOX_CONFIG_SYSLOGD
+	help
+	  When you enable this feature, the syslogd utility will
+	  use a circular buffer to record system log messages.
+	  When the buffer is filled it will continue to overwrite
+	  the oldest messages. This can be very useful for
+	  systems with little or no permanent storage, since
+	  otherwise system logs can eventually fill up your
+	  entire filesystem, which may cause your system to
+	  break badly.
+
+config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
+	int "Circular buffer size in Kbytes (minimum 4KB)"
+	default BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG_BUFFER_SIZE
+	range 4 2147483647
+	depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
+	help
+	  This option sets the size of the circular buffer
+	  used to record system log messages.
+
+config BUSYBOX_CONFIG_LOGREAD
+	bool "logread"
+	default BUSYBOX_DEFAULT_LOGREAD
+	depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
+	help
+	  If you enabled Circular Buffer support, you almost
+	  certainly want to enable this feature as well. This
+	  utility will allow you to read the messages that are
+	  stored in the syslogd circular buffer.
+
+config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
+	bool "Double buffering"
+	default BUSYBOX_DEFAULT_FEATURE_LOGREAD_REDUCED_LOCKING
+	depends on BUSYBOX_CONFIG_LOGREAD
+	help
+	  'logread' ouput to slow serial terminals can have
+	  side effects on syslog because of the semaphore.
+	  This option make logread to double buffer copy
+	  from circular buffer, minimizing semaphore
+	  contention at some minor memory expense.
+
+config BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
+	bool "Linux kernel printk buffer support"
+	default BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG
+	depends on BUSYBOX_CONFIG_SYSLOGD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  When you enable this feature, the syslogd utility will
+	  write system log message to the Linux kernel's printk buffer.
+	  This can be used as a smaller alternative to the syslogd IPC
+	  support, as klogd and logread aren't needed.
+
+	  NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+
+config BUSYBOX_CONFIG_KLOGD
+	bool "klogd"
+	default BUSYBOX_DEFAULT_KLOGD
+	help
+	  klogd is a utility which intercepts and logs all
+	  messages from the Linux kernel and sends the messages
+	  out to the 'syslogd' utility so they can be logged. If
+	  you wish to record the messages produced by the kernel,
+	  you should enable this option.
+
+comment "klogd should not be used together with syslog to kernel printk buffer"
+	depends on BUSYBOX_CONFIG_KLOGD && BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
+
+config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
+	bool "Use the klogctl() interface"
+	default BUSYBOX_DEFAULT_FEATURE_KLOGD_KLOGCTL
+	depends on BUSYBOX_CONFIG_KLOGD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The klogd applet supports two interfaces for reading
+	  kernel messages. Linux provides the klogctl() interface
+	  which allows reading messages from the kernel ring buffer
+	  independently from the file system.
+
+	  If you answer 'N' here, klogd will use the more portable
+	  approach of reading them from /proc or a device node.
+	  However, this method requires the file to be available.
+
+	  If in doubt, say 'Y'.
+
+config BUSYBOX_CONFIG_LOGGER
+	bool "logger"
+	default BUSYBOX_DEFAULT_LOGGER
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	    The logger utility allows you to send arbitrary text
+	    messages to the system log (i.e. the 'syslogd' utility) so
+	    they can be logged. This is generally used to help locate
+	    problems that occur within programs and scripts.
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/util-linux/Config.in b/trunk/package/utils/busybox/config/util-linux/Config.in
new file mode 100644
index 00000000..f78234de
--- /dev/null
+++ b/trunk/package/utils/busybox/config/util-linux/Config.in
@@ -0,0 +1,777 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux System Utilities"
+
+config BUSYBOX_CONFIG_BLOCKDEV
+	bool "blockdev"
+	default BUSYBOX_DEFAULT_BLOCKDEV
+	help
+	  Performs some ioctls with block devices.
+config BUSYBOX_CONFIG_FSTRIM
+	bool "fstrim"
+	default BUSYBOX_DEFAULT_FSTRIM
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Discard unused blocks on a mounted filesystem.
+config BUSYBOX_CONFIG_MDEV
+	bool "mdev"
+	default BUSYBOX_DEFAULT_MDEV
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  mdev is a mini-udev implementation for dynamically creating device
+	  nodes in the /dev directory.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
+	bool "Support /etc/mdev.conf"
+	default BUSYBOX_DEFAULT_FEATURE_MDEV_CONF
+	depends on BUSYBOX_CONFIG_MDEV
+	help
+	  Add support for the mdev config file to control ownership and
+	  permissions of the device nodes.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_RENAME
+	bool "Support subdirs/symlinks"
+	default BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME
+	depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF
+	help
+	  Add support for renaming devices and creating symlinks.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_RENAME_REGEXP
+	bool "Support regular expressions substitutions when renaming device"
+	default BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME_REGEXP
+	depends on BUSYBOX_CONFIG_FEATURE_MDEV_RENAME
+	help
+	  Add support for regular expressions substitutions when renaming
+	  device.
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
+	bool "Support command execution at device addition/removal"
+	default BUSYBOX_DEFAULT_FEATURE_MDEV_EXEC
+	depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF
+	help
+	  This adds support for an optional field to /etc/mdev.conf for
+	  executing commands when devices are created/removed.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
+	bool "Support loading of firmwares"
+	default BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
+	depends on BUSYBOX_CONFIG_MDEV
+	help
+	  Some devices need to load firmware before they can be usable.
+
+	  These devices will request userspace look up the files in
+	  /lib/firmware/ and if it exists, send it to the kernel for
+	  loading into the hardware.
+config BUSYBOX_CONFIG_REV
+	bool "rev"
+	default BUSYBOX_DEFAULT_REV
+	help
+	  Reverse lines of a file or files.
+
+config BUSYBOX_CONFIG_ACPID
+	bool "acpid"
+	default BUSYBOX_DEFAULT_ACPID
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  acpid listens to ACPI events coming either in textual form from
+	  /proc/acpi/event (though it is marked deprecated it is still widely
+	  used and _is_ a standard) or in binary form from specified evdevs
+	  (just use /dev/input/event*).
+
+	  It parses the event to retrieve ACTION and a possible PARAMETER.
+	  It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
+	  (if the resulting path is a directory) or directly as an executable.
+
+	  N.B. acpid relies on run-parts so have the latter installed.
+
+config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT
+	bool "Accept and ignore redundant options"
+	default BUSYBOX_DEFAULT_FEATURE_ACPID_COMPAT
+	depends on BUSYBOX_CONFIG_ACPID
+	help
+	  Accept and ignore compatibility options -g -m -s -S -v.
+
+config BUSYBOX_CONFIG_BLKID
+	bool "blkid"
+	default BUSYBOX_DEFAULT_BLKID
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	select BUSYBOX_CONFIG_VOLUMEID
+	help
+	  Lists labels and UUIDs of all filesystems.
+	  WARNING:
+	  With all submodules selected, it will add ~8k to busybox.
+
+config BUSYBOX_CONFIG_FEATURE_BLKID_TYPE
+	bool "Print filesystem type"
+	default BUSYBOX_DEFAULT_FEATURE_BLKID_TYPE
+	depends on BUSYBOX_CONFIG_BLKID
+	help
+	  Show TYPE="filesystem type"
+
+config BUSYBOX_CONFIG_DMESG
+	bool "dmesg"
+	default BUSYBOX_DEFAULT_DMESG
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  dmesg is used to examine or control the kernel ring buffer. When the
+	  Linux kernel prints messages to the system log, they are stored in
+	  the kernel ring buffer. You can use dmesg to print the kernel's ring
+	  buffer, clear the kernel ring buffer, change the size of the kernel
+	  ring buffer, and change the priority level at which kernel messages
+	  are also logged to the system console. Enable this option if you
+	  wish to enable the 'dmesg' utility.
+
+config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY
+	bool "Pretty dmesg output"
+	default BUSYBOX_DEFAULT_FEATURE_DMESG_PRETTY
+	depends on BUSYBOX_CONFIG_DMESG
+	help
+	  If you wish to scrub the syslog level from the output, say 'Y' here.
+	  The syslog level is a string prefixed to every line with the form
+	  "<#>".
+
+	  With this option you will see:
+	    # dmesg
+	    Linux version 2.6.17.4 .....
+	    BIOS-provided physical RAM map:
+	     BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+	  Without this option you will see:
+	    # dmesg
+	    <5>Linux version 2.6.17.4 .....
+	    <6>BIOS-provided physical RAM map:
+	    <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+
+config BUSYBOX_CONFIG_FBSET
+	bool "fbset"
+	default BUSYBOX_DEFAULT_FBSET
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  fbset is used to show or change the settings of a Linux frame buffer
+	  device. The frame buffer device provides a simple and unique
+	  interface to access a graphics display. Enable this option
+	  if you wish to enable the 'fbset' utility.
+
+config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY
+	bool "Turn on extra fbset options"
+	default BUSYBOX_DEFAULT_FEATURE_FBSET_FANCY
+	depends on BUSYBOX_CONFIG_FBSET
+	help
+	  This option enables extended fbset options, allowing one to set the
+	  framebuffer size, color depth, etc. interface to access a graphics
+	  display. Enable this option if you wish to enable extended fbset
+	  options.
+
+config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
+	bool "Turn on fbset readmode support"
+	default BUSYBOX_DEFAULT_FEATURE_FBSET_READMODE
+	depends on BUSYBOX_CONFIG_FBSET
+	help
+	  This option allows fbset to read the video mode database stored by
+	  default BUSYBOX_DEFAULT_FEATURE_FBSET_READMODE /etc/fb.modes, which can be used to set frame buffer
+	  device to pre-defined video modes.
+
+config BUSYBOX_CONFIG_FDFLUSH
+	bool "fdflush"
+	default BUSYBOX_DEFAULT_FDFLUSH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  fdflush is only needed when changing media on slightly-broken
+	  removable media drives. It is used to make Linux believe that a
+	  hardware disk-change switch has been actuated, which causes Linux to
+	  forget anything it has cached from the previous media. If you have
+	  such a slightly-broken drive, you will need to run fdflush every time
+	  you change a disk. Most people have working hardware and can safely
+	  leave this disabled.
+
+config BUSYBOX_CONFIG_FDFORMAT
+	bool "fdformat"
+	default BUSYBOX_DEFAULT_FDFORMAT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  fdformat is used to low-level format a floppy disk.
+
+config BUSYBOX_CONFIG_FDISK
+	bool "fdisk"
+	default BUSYBOX_DEFAULT_FDISK
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The fdisk utility is used to divide hard disks into one or more
+	  logical disks, which are generally called partitions. This utility
+	  can be used to list and edit the set of partitions or BSD style
+	  'disk slices' that are defined on a hard drive.
+
+config BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS
+	bool "Support over 4GB disks"
+	default BUSYBOX_DEFAULT_FDISK_SUPPORT_LARGE_DISKS
+	depends on BUSYBOX_CONFIG_FDISK
+	depends on !BUSYBOX_CONFIG_LFS   # with LFS no special code is needed
+	help
+	  Enable this option to support large disks > 4GB.
+
+config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	bool "Write support"
+	default BUSYBOX_DEFAULT_FEATURE_FDISK_WRITABLE
+	depends on BUSYBOX_CONFIG_FDISK
+	help
+	  Enabling this option allows you to create or change a partition table
+	  and write those changes out to disk. If you leave this option
+	  disabled, you will only be able to view the partition table.
+
+config BUSYBOX_CONFIG_FEATURE_AIX_LABEL
+	bool "Support AIX disklabels"
+	default BUSYBOX_DEFAULT_FEATURE_AIX_LABEL
+	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	help
+	  Enabling this option allows you to create or change AIX disklabels.
+	  Most people can safely leave this option disabled.
+
+config BUSYBOX_CONFIG_FEATURE_SGI_LABEL
+	bool "Support SGI disklabels"
+	default BUSYBOX_DEFAULT_FEATURE_SGI_LABEL
+	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	help
+	  Enabling this option allows you to create or change SGI disklabels.
+	  Most people can safely leave this option disabled.
+
+config BUSYBOX_CONFIG_FEATURE_SUN_LABEL
+	bool "Support SUN disklabels"
+	default BUSYBOX_DEFAULT_FEATURE_SUN_LABEL
+	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	help
+	  Enabling this option allows you to create or change SUN disklabels.
+	  Most people can safely leave this option disabled.
+
+config BUSYBOX_CONFIG_FEATURE_OSF_LABEL
+	bool "Support BSD disklabels"
+	default BUSYBOX_DEFAULT_FEATURE_OSF_LABEL
+	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	help
+	  Enabling this option allows you to create or change BSD disklabels
+	  and define and edit BSD disk slices.
+
+config BUSYBOX_CONFIG_FEATURE_GPT_LABEL
+	bool "Support GPT disklabels"
+	default BUSYBOX_DEFAULT_FEATURE_GPT_LABEL
+	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	help
+	  Enabling this option allows you to view GUID Partition Table
+	  disklabels.
+
+config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
+	bool "Support expert mode"
+	default BUSYBOX_DEFAULT_FEATURE_FDISK_ADVANCED
+	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	help
+	  Enabling this option allows you to do terribly unsafe things like
+	  define arbitrary drive geometry, move the beginning of data in a
+	  partition, and similarly evil things. Unless you have a very good
+	  reason you would be wise to leave this disabled.
+
+config BUSYBOX_CONFIG_FINDFS
+	bool "findfs"
+	default BUSYBOX_DEFAULT_FINDFS
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	select BUSYBOX_CONFIG_VOLUMEID
+	help
+	  Prints the name of a filesystem with given label or UUID.
+	  WARNING:
+	  With all submodules selected, it will add ~8k to busybox.
+
+config BUSYBOX_CONFIG_FLOCK
+	bool "flock"
+	default BUSYBOX_DEFAULT_FLOCK
+	help
+	  Manage locks from shell scripts
+
+config BUSYBOX_CONFIG_FREERAMDISK
+	bool "freeramdisk"
+	default BUSYBOX_DEFAULT_FREERAMDISK
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Linux allows you to create ramdisks. This utility allows you to
+	  delete them and completely free all memory that was used for the
+	  ramdisk. For example, if you boot Linux into a ramdisk and later
+	  pivot_root, you may want to free the memory that is allocated to the
+	  ramdisk. If you have no use for freeing memory from a ramdisk, leave
+	  this disabled.
+
+config BUSYBOX_CONFIG_FSCK_MINIX
+	bool "fsck_minix"
+	default BUSYBOX_DEFAULT_FSCK_MINIX
+	help
+	  The minix filesystem is a nice, small, compact, read-write filesystem
+	  with little overhead. It is not a journaling filesystem however and
+	  can experience corruption if it is not properly unmounted or if the
+	  power goes off in the middle of a write. This utility allows you to
+	  check for and attempt to repair any corruption that occurs to a minix
+	  filesystem.
+
+config BUSYBOX_CONFIG_MKFS_EXT2
+	bool "mkfs_ext2"
+	default BUSYBOX_DEFAULT_MKFS_EXT2
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Utility to create EXT2 filesystems.
+
+config BUSYBOX_CONFIG_MKFS_MINIX
+	bool "mkfs_minix"
+	default BUSYBOX_DEFAULT_MKFS_MINIX
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The minix filesystem is a nice, small, compact, read-write filesystem
+	  with little overhead. If you wish to be able to create minix
+	  filesystems this utility will do the job for you.
+
+config BUSYBOX_CONFIG_FEATURE_MINIX2
+	bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
+	default BUSYBOX_DEFAULT_FEATURE_MINIX2
+	depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
+	help
+	  If you wish to be able to create version 2 minix filesystems, enable
+	  this. If you enabled 'mkfs_minix' then you almost certainly want to
+	  be using the version 2 filesystem support.
+
+config BUSYBOX_CONFIG_MKFS_REISER
+	bool "mkfs_reiser"
+	default BUSYBOX_DEFAULT_MKFS_REISER
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Utility to create ReiserFS filesystems.
+	  Note: this applet needs a lot of testing and polishing.
+
+config BUSYBOX_CONFIG_MKFS_VFAT
+	bool "mkfs_vfat"
+	default BUSYBOX_DEFAULT_MKFS_VFAT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Utility to create FAT32 filesystems.
+
+config BUSYBOX_CONFIG_GETOPT
+	bool "getopt"
+	default BUSYBOX_DEFAULT_GETOPT
+	help
+	  The getopt utility is used to break up (parse) options in command
+	  lines to make it easy to write complex shell scripts that also check
+	  for legal (and illegal) options. If you want to write horribly
+	  complex shell scripts, or use some horribly complex shell script
+	  written by others, this utility may be for you. Most people will
+	  wisely leave this disabled.
+
+config BUSYBOX_CONFIG_FEATURE_GETOPT_LONG
+	bool "Support option -l"
+	default BUSYBOX_DEFAULT_FEATURE_GETOPT_LONG if BUSYBOX_CONFIG_LONG_OPTS
+	depends on BUSYBOX_CONFIG_GETOPT
+	help
+	  Enable support for long options (option -l).
+
+config BUSYBOX_CONFIG_HEXDUMP
+	bool "hexdump"
+	default BUSYBOX_DEFAULT_HEXDUMP
+	help
+	  The hexdump utility is used to display binary data in a readable
+	  way that is comparable to the output from most hex editors.
+
+config BUSYBOX_CONFIG_FEATURE_HEXDUMP_REVERSE
+	bool "Support -R, reverse of 'hexdump -Cv'"
+	default BUSYBOX_DEFAULT_FEATURE_HEXDUMP_REVERSE
+	depends on BUSYBOX_CONFIG_HEXDUMP
+	help
+	  The hexdump utility is used to display binary data in an ascii
+	  readable way. This option creates binary data from an ascii input.
+	  NB: this option is non-standard. It's unwise to use it in scripts
+	  aimed to be portable.
+
+config BUSYBOX_CONFIG_HD
+	bool "hd"
+	default BUSYBOX_DEFAULT_HD
+	depends on BUSYBOX_CONFIG_HEXDUMP
+	help
+	  hd is an alias to hexdump -C.
+
+config BUSYBOX_CONFIG_HWCLOCK
+	bool "hwclock"
+	default BUSYBOX_DEFAULT_HWCLOCK
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The hwclock utility is used to read and set the hardware clock
+	  on a system. This is primarily used to set the current time on
+	  shutdown in the hardware clock, so the hardware will keep the
+	  correct time when Linux is _not_ running.
+
+config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
+	bool "Support long options (--hctosys,...)"
+	default BUSYBOX_DEFAULT_FEATURE_HWCLOCK_LONG_OPTIONS
+	depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_LONG_OPTS
+	help
+	  By default, the hwclock utility only uses short options. If you
+	  are overly fond of its long options, such as --hctosys, --utc, etc)
+	  then enable this option.
+
+config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
+	bool "Use FHS /var/lib/hwclock/adjtime"
+	default BUSYBOX_DEFAULT_FEATURE_HWCLOCK_ADJTIME_FHS  # util-linux-ng in Fedora 13 still uses /etc/adjtime
+	depends on BUSYBOX_CONFIG_HWCLOCK
+	help
+	  Starting with FHS 2.3, the adjtime state file is supposed to exist
+	  at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish
+	  to use the FHS behavior, answer Y here, otherwise answer N for the
+	  classic /etc/adjtime path.
+
+	  pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
+
+config BUSYBOX_CONFIG_IPCRM
+	bool "ipcrm"
+	default BUSYBOX_DEFAULT_IPCRM
+	help
+	  The ipcrm utility allows the removal of System V interprocess
+	  communication (IPC) objects and the associated data structures
+	  from the system.
+
+config BUSYBOX_CONFIG_IPCS
+	bool "ipcs"
+	default BUSYBOX_DEFAULT_IPCS
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The ipcs utility is used to provide information on the currently
+	  allocated System V interprocess (IPC) objects in the system.
+
+config BUSYBOX_CONFIG_LOSETUP
+	bool "losetup"
+	default BUSYBOX_DEFAULT_LOSETUP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  losetup is used to associate or detach a loop device with a regular
+	  file or block device, and to query the status of a loop device. This
+	  version does not currently support enabling data encryption.
+
+config BUSYBOX_CONFIG_LSPCI
+	bool "lspci"
+	default BUSYBOX_DEFAULT_LSPCI
+	#select PLATFORM_LINUX
+	help
+	  lspci is a utility for displaying information about PCI buses in the
+	  system and devices connected to them.
+
+	  This version uses sysfs (/sys/bus/pci/devices) only.
+
+config BUSYBOX_CONFIG_LSUSB
+	bool "lsusb"
+	default BUSYBOX_DEFAULT_LSUSB
+	#select PLATFORM_LINUX
+	help
+	  lsusb is a utility for displaying information about USB buses in the
+	  system and devices connected to them.
+
+	  This version uses sysfs (/sys/bus/usb/devices) only.
+
+config BUSYBOX_CONFIG_MKSWAP
+	bool "mkswap"
+	default BUSYBOX_DEFAULT_MKSWAP
+	help
+	  The mkswap utility is used to configure a file or disk partition as
+	  Linux swap space. This allows Linux to use the entire file or
+	  partition as if it were additional RAM, which can greatly increase
+	  the capability of low-memory machines. This additional memory is
+	  much slower than real RAM, but can be very helpful at preventing your
+	  applications being killed by the Linux out of memory (OOM) killer.
+	  Once you have created swap space using 'mkswap' you need to enable
+	  the swap space using the 'swapon' utility.
+
+config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
+	bool "UUID support"
+	default BUSYBOX_DEFAULT_FEATURE_MKSWAP_UUID
+	depends on BUSYBOX_CONFIG_MKSWAP
+	help
+	  Generate swap spaces with universally unique identifiers.
+
+config BUSYBOX_CONFIG_MORE
+	bool "more"
+	default BUSYBOX_DEFAULT_MORE
+	help
+	  more is a simple utility which allows you to read text one screen
+	  sized page at a time. If you want to read text that is larger than
+	  the screen, and you are using anything faster than a 300 baud modem,
+	  you will probably find this utility very helpful. If you don't have
+	  any need to reading text files, you can leave this disabled.
+
+config BUSYBOX_CONFIG_MOUNT
+	bool "mount"
+	default BUSYBOX_DEFAULT_MOUNT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  All files and filesystems in Unix are arranged into one big directory
+	  tree. The 'mount' utility is used to graft a filesystem onto a
+	  particular part of the tree. A filesystem can either live on a block
+	  device, or it can be accessible over the network, as is the case with
+	  NFS filesystems. Most people using BusyBox will also want to enable
+	  the 'mount' utility.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE
+	bool "Support option -f"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
+	depends on BUSYBOX_CONFIG_MOUNT
+	help
+	  Enable support for faking a file system mount.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE
+	bool "Support option -v"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
+	depends on BUSYBOX_CONFIG_MOUNT
+	help
+	  Enable multi-level -v[vv...] verbose messages. Useful if you
+	  debug mount problems and want to see what is exactly passed
+	  to the kernel.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS
+	bool "Support mount helpers"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
+	depends on BUSYBOX_CONFIG_MOUNT
+	help
+	  Enable mounting of virtual file systems via external helpers.
+	  E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
+	  "obexfs -b00.11.22.33.44.55 /mnt"
+	  Also "mount -t sometype [-o opts] fs /mnt" will try
+	  "sometype [-o opts] fs /mnt" if simple mount syscall fails.
+	  The idea is to use such virtual filesystems in /etc/fstab.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
+	bool "Support specifying devices by label or UUID"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
+	depends on BUSYBOX_CONFIG_MOUNT
+	select BUSYBOX_CONFIG_VOLUMEID
+	help
+	  This allows for specifying a device by label or uuid, rather than by
+	  name. This feature utilizes the same functionality as blkid/findfs.
+	  This also enables label or uuid support for swapon.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
+	bool "Support mounting NFS file systems on Linux < 2.6.23"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
+	depends on BUSYBOX_CONFIG_MOUNT
+	select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  Enable mounting of NFS file systems on Linux kernels prior
+	  to version 2.6.23. Note that in this case mounting of NFS
+	  over IPv6 will not be possible.
+
+	  Note that this option links in RPC support from libc,
+	  which is rather large (~10 kbytes on uclibc).
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS
+	bool "Support mounting CIFS/SMB file systems"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
+	depends on BUSYBOX_CONFIG_MOUNT
+	help
+	  Enable support for samba mounts.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
+	depends on BUSYBOX_CONFIG_MOUNT
+	bool "Support lots of -o flags in mount"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
+	help
+	  Without this, mount only supports ro/rw/remount. With this, it
+	  supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
+	  noatime, diratime, nodiratime, loud, bind, move, shared, slave,
+	  private, unbindable, rshared, rslave, rprivate, and runbindable.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB
+	depends on BUSYBOX_CONFIG_MOUNT
+	bool "Support /etc/fstab and -a"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
+	help
+	  Support mount all and looking for files in /etc/fstab.
+
+config BUSYBOX_CONFIG_PIVOT_ROOT
+	bool "pivot_root"
+	default BUSYBOX_DEFAULT_PIVOT_ROOT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The pivot_root utility swaps the mount points for the root filesystem
+	  with some other mounted filesystem. This allows you to do all sorts
+	  of wild and crazy things with your Linux system and is far more
+	  powerful than 'chroot'.
+
+	  Note: This is for initrd in linux 2.4. Under initramfs (introduced
+	  in linux 2.6) use switch_root instead.
+
+config BUSYBOX_CONFIG_RDATE
+	bool "rdate"
+	default BUSYBOX_DEFAULT_RDATE
+	help
+	  The rdate utility allows you to synchronize the date and time of your
+	  system clock with the date and time of a remote networked system using
+	  the RFC868 protocol, which is built into the inetd daemon on most
+	  systems.
+
+config BUSYBOX_CONFIG_RDEV
+	bool "rdev"
+	default BUSYBOX_DEFAULT_RDEV
+	help
+	  Print the device node associated with the filesystem mounted at '/'.
+
+config BUSYBOX_CONFIG_READPROFILE
+	bool "readprofile"
+	default BUSYBOX_DEFAULT_READPROFILE
+	#select PLATFORM_LINUX
+	help
+	  This allows you to parse /proc/profile for basic profiling.
+
+config BUSYBOX_CONFIG_RTCWAKE
+	bool "rtcwake"
+	default BUSYBOX_DEFAULT_RTCWAKE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Enter a system sleep state until specified wakeup time.
+
+config BUSYBOX_CONFIG_SCRIPT
+	bool "script"
+	default BUSYBOX_DEFAULT_SCRIPT
+	help
+	  The script makes typescript of terminal session.
+
+config BUSYBOX_CONFIG_SCRIPTREPLAY
+	bool "scriptreplay"
+	default BUSYBOX_DEFAULT_SCRIPTREPLAY
+	help
+	  This program replays a typescript, using timing information
+	  given by script -t.
+
+config BUSYBOX_CONFIG_SETARCH
+	bool "setarch"
+	default BUSYBOX_DEFAULT_SETARCH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The linux32 utility is used to create a 32bit environment for the
+	  specified program (usually a shell). It only makes sense to have
+	  this util on a system that supports both 64bit and 32bit userland
+	  (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
+
+config BUSYBOX_CONFIG_SWAPONOFF
+	bool "swaponoff"
+	default BUSYBOX_DEFAULT_SWAPONOFF
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  This option enables both the 'swapon' and the 'swapoff' utilities.
+	  Once you have created some swap space using 'mkswap', you also need
+	  to enable your swap space with the 'swapon' utility. The 'swapoff'
+	  utility is used, typically at system shutdown, to disable any swap
+	  space. If you are not using any swap space, you can leave this
+	  option disabled.
+
+config BUSYBOX_CONFIG_FEATURE_SWAPON_PRI
+	bool "Support priority option -p"
+	default BUSYBOX_DEFAULT_FEATURE_SWAPON_PRI
+	depends on BUSYBOX_CONFIG_SWAPONOFF
+	help
+	  Enable support for setting swap device priority in swapon.
+
+config BUSYBOX_CONFIG_SWITCH_ROOT
+	bool "switch_root"
+	default BUSYBOX_DEFAULT_SWITCH_ROOT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  The switch_root utility is used from initramfs to select a new
+	  root device. Under initramfs, you have to use this instead of
+	  pivot_root. (Stop reading here if you don't care why.)
+
+	  Booting with initramfs extracts a gzipped cpio archive into rootfs
+	  (which is a variant of ramfs/tmpfs). Because rootfs can't be moved
+	  or unmounted*, pivot_root will not work from initramfs. Instead,
+	  switch_root deletes everything out of rootfs (including itself),
+	  does a mount --move that overmounts rootfs with the new root, and
+	  then execs the specified init program.
+
+	  * Because the Linux kernel uses rootfs internally as the starting
+	  and ending point for searching through the kernel's doubly linked
+	  list of active mount points. That's why.
+
+config BUSYBOX_CONFIG_UMOUNT
+	bool "umount"
+	default BUSYBOX_DEFAULT_UMOUNT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  When you want to remove a mounted filesystem from its current mount
+	  point, for example when you are shutting down the system, the
+	  'umount' utility is the tool to use. If you enabled the 'mount'
+	  utility, you almost certainly also want to enable 'umount'.
+
+config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL
+	bool "Support option -a"
+	default BUSYBOX_DEFAULT_FEATURE_UMOUNT_ALL
+	depends on BUSYBOX_CONFIG_UMOUNT
+	help
+	  Support -a option to unmount all currently mounted filesystems.
+
+comment "Common options for mount/umount"
+	depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
+	bool "Support loopback mounts"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP
+	depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
+	help
+	  Enabling this feature allows automatic mounting of files (containing
+	  filesystem images) via the linux kernel's loopback devices.
+	  The mount command will detect you are trying to mount a file instead
+	  of a block device, and transparently associate the file with a
+	  loopback device. The umount command will also free that loopback
+	  device.
+
+	  You can still use the 'losetup' utility (to manually associate files
+	  with loop devices) if you need to do something advanced, such as
+	  specify an offset or cryptographic options to the loopback device.
+	  (If you don't want umount to free the loop device, use "umount -D".)
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP_CREATE
+	bool "Create new loopback devices if needed"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP_CREATE
+	depends on BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
+	help
+	  Linux kernels >= 2.6.24 support unlimited loopback devices. They are
+	  allocated for use when trying to use a loop device. The loop device
+	  must however exist.
+
+	  This feature lets mount to try to create next /dev/loopN device
+	  if it does not find a free one.
+
+config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
+	bool "Support for the old /etc/mtab file"
+	default BUSYBOX_DEFAULT_FEATURE_MTAB_SUPPORT
+	depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
+	select BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE
+	help
+	  Historically, Unix systems kept track of the currently mounted
+	  partitions in the file "/etc/mtab". These days, the kernel exports
+	  the list of currently mounted partitions in "/proc/mounts", rendering
+	  the old mtab file obsolete. (In modern systems, /etc/mtab should be
+	  a symlink to /proc/mounts.)
+
+	  The only reason to have mount maintain an /etc/mtab file itself is if
+	  your stripped-down embedded system does not have a /proc directory.
+	  If you must use this, keep in mind it's inherently brittle (for
+	  example a mount under chroot won't update it), can't handle modern
+	  features like separate per-process filesystem namespaces, requires
+	  that your /etc directory be writable, tends to get easily confused
+	  by --bind or --move mounts, won't update if you rename a directory
+	  that contains a mount point, and so on. (In brief: avoid.)
+
+	  About the only reason to use this is if you've removed /proc from
+	  your kernel.
+
+source package/utils/busybox/config/util-linux/volume_id/Config.in
+
+endmenu
diff --git a/trunk/package/utils/busybox/config/util-linux/volume_id/Config.in b/trunk/package/utils/busybox/config/util-linux/volume_id/Config.in
new file mode 100644
index 00000000..306550b7
--- /dev/null
+++ b/trunk/package/utils/busybox/config/util-linux/volume_id/Config.in
@@ -0,0 +1,304 @@
+# DO NOT EDIT. This file is generated from Config.src
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+config BUSYBOX_CONFIG_VOLUMEID
+	bool #No description makes it a hidden option
+	default BUSYBOX_DEFAULT_VOLUMEID
+
+menu "Filesystem/Volume identification"
+	depends on BUSYBOX_CONFIG_VOLUMEID
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS
+	bool "btrfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BTRFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS
+	bool "cramfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_CRAMFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXFAT
+	bool "exFAT filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXFAT
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  exFAT (extended FAT) is a proprietary file system designed especially
+	  for flash drives. It has many features from NTFS, but with less
+	  overhead. exFAT is used on most SDXC cards for consumer electronics.
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
+	bool "Ext filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXT
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS
+	bool "f2fs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_F2FS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  F2FS (aka Flash-Friendly File System) is a log-structured file system,
+	  which is adapted to newer forms of storage. F2FS also remedies some
+	  known issues of the older log structured file systems, such as high
+	  cleaning overhead.
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT
+	bool "fat filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_FAT
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS
+	bool "hfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_HFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660
+	bool "iso9660 filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ISO9660
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS
+	bool "jfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_JFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID
+	bool "linuxraid"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXRAID
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP
+	bool "linux swap filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXSWAP
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS
+	bool "luks filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LUKS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NILFS
+	bool "nilfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NILFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  NILFS is a New Implementation of a Log-Structured File System (LFS)
+	  that supports continuous snapshots. This provides features like
+	  versioning of the entire filesystem, restoration of files that
+	  were deleted a few minutes ago. NILFS keeps consistency like
+	  conventional LFS, so it provides quick recovery after system crashes.
+
+	  The possible use of NILFS includes versioning, tamper detection,
+	  SOX compliance logging, and so forth. It can serve as an alternative
+	  filesystem for Linux desktop environment, or as a basis of advanced
+	  storage appliances.
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS
+	bool "ntfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NTFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2
+	bool "ocfs2 filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_OCFS2
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS
+	bool "Reiser filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_REISERFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS
+	bool "romfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ROMFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS
+	bool "SquashFS filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SQUASHFS
+	depends on BUSYBOX_CONFIG_VOLUMEID && BUSYBOX_CONFIG_FEATURE_BLKID_TYPE
+	help
+	  Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+	  intended for general read-only filesystem use and in constrained block
+	  device/memory systems (e.g. embedded systems) where low overhead is
+	  needed.
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV
+	bool "sysv filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SYSV
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF
+	bool "udf filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_UDF
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+### config FEATURE_VOLUMEID_HIGHPOINTRAID
+###	bool "highpoint raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_HPFS
+###	bool "hpfs filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_ISWRAID
+###	bool "intel raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_LSIRAID
+###	bool "lsi raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_LVM
+###	bool "lvm"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_MAC
+###	bool "mac filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_MINIX
+###	bool "minix filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_MSDOS
+###	bool "msdos filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_NVIDIARAID
+###	bool "nvidia raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_PROMISERAID
+###	bool "promise raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_SILICONRAID
+###	bool "silicon raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_UFS
+###	bool "ufs filesystem"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+### config FEATURE_VOLUMEID_VIARAID
+###	bool "via raid"
+###	default y
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+
+config BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS
+	bool "xfs filesystem"
+	default BUSYBOX_DEFAULT_FEATURE_VOLUMEID_XFS
+	depends on BUSYBOX_CONFIG_VOLUMEID
+	help
+	  TODO
+
+
+endmenu
diff --git a/trunk/package/utils/busybox/convert_defaults.pl b/trunk/package/utils/busybox/convert_defaults.pl
new file mode 100755
index 00000000..dada6ef0
--- /dev/null
+++ b/trunk/package/utils/busybox/convert_defaults.pl
@@ -0,0 +1,13 @@
+#!/usr/bin/env perl
+
+while (<>) {
+	/^(# )?CONFIG_([^=]+)(=(.+)| is not set)/ and do {
+		my $default = $4;
+		$1 and $default = "n";
+		my $name = $2;
+		my $type = "bool";
+		$default =~ /^\"/ and $type = "string";
+		$default =~ /^\d/ and $type = "int";
+		print "config BUSYBOX_DEFAULT_$name\n\t$type\n\tdefault $default\n";
+	};
+}
diff --git a/trunk/package/utils/busybox/convert_menuconfig.pl b/trunk/package/utils/busybox/convert_menuconfig.pl
new file mode 100755
index 00000000..cc4802a6
--- /dev/null
+++ b/trunk/package/utils/busybox/convert_menuconfig.pl
@@ -0,0 +1,67 @@
+#!/usr/bin/perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+use strict;
+my $PATH = $ARGV[0];
+($PATH and -d $PATH) or die 'invalid path';
+
+my %config;
+
+open FIND, "find \"$PATH\" -name Config.in |";
+while (<FIND>) {
+	chomp;
+	my $input = $_;
+	s/^$PATH\///g;
+	s/sysdeps\/linux\///g;
+	my $output = $_;
+	print STDERR "$input => $output\n";
+	$output =~ /^(.+)\/[^\/]+$/ and system("mkdir -p $1");
+
+	open INPUT, $input;
+	open OUTPUT, ">$output";
+	my ($cur, $default_set, $line);
+	while ($line = <INPUT>) {
+		next if $line =~ /^\s*mainmenu/;
+
+		# FIXME: make this dynamic
+		$line =~ s/default FEATURE_BUFFERS_USE_MALLOC/default FEATURE_BUFFERS_GO_ON_STACK/;
+		$line =~ s/default FEATURE_SH_IS_NONE/default FEATURE_SH_IS_ASH/;
+
+		if ($line =~ /^\s*config\s*([\w_]+)/) {
+			$cur = $1;
+			undef $default_set;
+		}
+		if ($line =~ /^\s*(menu|choice|end|source)/) {
+			undef $cur;
+			undef $default_set;
+		}
+		$line =~ s/^(\s*source\s+)/$1package\/utils\/busybox\/config\//;
+
+		$line =~ s/^(\s*(prompt "[^"]+" if|config|depends|depends on|select|default|default \w if)\s+\!?)([A-Z_])/$1BUSYBOX_CONFIG_$3/g;
+		$line =~ s/(( \|\| | \&\& | \( )!?)([A-Z_])/$1BUSYBOX_CONFIG_$3/g;
+		$line =~ s/(\( ?!?)([A-Z_]+ (\|\||&&))/$1BUSYBOX_CONFIG_$2/g;
+
+		if ($cur) {
+			($cur eq 'LFS') and do {
+				$line =~ s/^(\s*(bool|tristate|string))\s*".+"$/$1/;
+			};
+			if ($line =~ /^\s*default/) {
+				my $c;
+				$default_set = 1;
+				$c = "BUSYBOX_DEFAULT_$cur";
+
+				$line =~ s/^(\s*default\s*)(\w+|"[^"]*")(.*)/$1$c$3/;
+			}
+		}
+
+		print OUTPUT $line;
+	}
+	close OUTPUT;
+	close INPUT;
+}
+close FIND;
diff --git a/trunk/package/utils/busybox/files/cron b/trunk/package/utils/busybox/files/cron
new file mode 100755
index 00000000..19ecc431
--- /dev/null
+++ b/trunk/package/utils/busybox/files/cron
@@ -0,0 +1,38 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=50
+
+USE_PROCD=1
+PROG=/usr/sbin/crond
+
+validate_cron_section() {
+	uci_validate_section system system "${1}" \
+		'cronloglevel:uinteger'
+}
+
+start_service () {
+	[ -z "$(ls /etc/crontabs/)" ] && return 1
+
+	loglevel=$(uci_get "system.@system[0].cronloglevel")
+
+	[ -z "${loglevel}" ] || {
+		/sbin/validate_data uinteger "${loglevel}" 2>/dev/null
+		[ "$?" -eq 0 ] || {
+			echo "validation failed"
+			return 1
+		}
+	}
+
+	mkdir -p /var/spool/cron
+	ln -s /etc/crontabs /var/spool/cron/ 2>/dev/null
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f -c /etc/crontabs -l ${loglevel:-5}
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_validation validate_cron_section
+}
diff --git a/trunk/package/utils/busybox/files/ntpd-hotplug b/trunk/package/utils/busybox/files/ntpd-hotplug
new file mode 100755
index 00000000..ddc1490a
--- /dev/null
+++ b/trunk/package/utils/busybox/files/ntpd-hotplug
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ "$1" = stratum ] || exit 0
+ACTION="$1" /sbin/hotplug-call ntp
diff --git a/trunk/package/utils/busybox/files/sysntpd b/trunk/package/utils/busybox/files/sysntpd
new file mode 100755
index 00000000..f73bb830
--- /dev/null
+++ b/trunk/package/utils/busybox/files/sysntpd
@@ -0,0 +1,42 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2011 OpenWrt.org
+
+START=98
+
+USE_PROCD=1
+PROG=/usr/sbin/ntpd
+HOTPLUG_SCRIPT=/usr/sbin/ntpd-hotplug
+
+validate_ntp_section() {
+	uci_validate_section system timeserver "${1}" \
+		'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0'
+}
+
+start_service() {
+	local server enabled enable_server peer
+
+	validate_ntp_section ntp || {
+		echo "validation failed"
+		return 1
+	}
+
+	[ $enabled = 0 ] && return
+
+	[ -z "$server" ] && return
+
+	procd_open_instance
+	procd_set_param command "$PROG" -n
+	[ "$enable_server" = "1" ] && procd_append_param command -l
+	[ -x "$HOTPLUG_SCRIPT" ] && procd_append_param command -S "$HOTPLUG_SCRIPT"
+	for peer in $server; do
+		procd_append_param command -p $peer
+	done
+	procd_set_param respawn
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "system"
+	procd_add_validation validate_ntp_section
+}
diff --git a/trunk/package/utils/busybox/files/telnet b/trunk/package/utils/busybox/files/telnet
new file mode 100755
index 00000000..a1d1cdf9
--- /dev/null
+++ b/trunk/package/utils/busybox/files/telnet
@@ -0,0 +1,38 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=50
+
+USE_PROCD=1
+PROG=/usr/sbin/telnetd
+
+has_root_pwd() {
+	local pwd=$([ -f "$1" ] && cat "$1")
+	      pwd="${pwd#*root:}"
+	      pwd="${pwd%%:*}"
+
+	test -n "${pwd#[\!x]}"
+}
+
+get_root_home() {
+	local homedir=$([ -f "$1" ] && cat "$1")
+	homedir="${homedir#*:*:0:0:*:}"
+
+	echo "${homedir%%:*}"
+}
+
+has_ssh_pubkey() {
+	( /etc/init.d/dropbear enabled 2> /dev/null && grep -qs "^ssh-" /etc/dropbear/authorized_keys ) || \
+	( /etc/init.d/sshd enabled 2> /dev/null && grep -qs "^ssh-" "$(get_root_home /etc/passwd)"/.ssh/authorized_keys )
+}
+
+start_service() {
+	if ( ! has_ssh_pubkey && \
+	     ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
+	   ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
+	then
+		procd_open_instance
+		procd_set_param command "$PROG" -F -l /bin/login.sh
+		procd_close_instance
+	fi
+}
diff --git a/trunk/package/utils/busybox/patches/001-resource_h_include.patch b/trunk/package/utils/busybox/patches/001-resource_h_include.patch
new file mode 100644
index 00000000..d66d66d6
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/001-resource_h_include.patch
@@ -0,0 +1,10 @@
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -35,6 +35,7 @@
+ #include <sys/poll.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
++#include <sys/resource.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
diff --git a/trunk/package/utils/busybox/patches/002-upstream_ash_fix.patch b/trunk/package/utils/busybox/patches/002-upstream_ash_fix.patch
new file mode 100644
index 00000000..46fd7f88
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/002-upstream_ash_fix.patch
@@ -0,0 +1,11 @@
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -13014,7 +13014,7 @@ init(void)
+ 		setvar2("PPID", utoa(getppid()));
+ #if ENABLE_ASH_BASH_COMPAT
+ 		p = lookupvar("SHLVL");
+-		setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1));
++		setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT);
+ #endif
+ 		p = lookupvar("PWD");
+ 		if (p) {
diff --git a/trunk/package/utils/busybox/patches/003-upstream_date_fix.patch b/trunk/package/utils/busybox/patches/003-upstream_date_fix.patch
new file mode 100644
index 00000000..5b389c47
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/003-upstream_date_fix.patch
@@ -0,0 +1,30 @@
+--- a/libbb/time.c
++++ b/libbb/time.c
+@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char 
+ 			/* else end != NUL and we error out */
+ 		}
+ 	} else
+-	/* yyyy-mm-dd HH */
+-	if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
++	if (strchr(date_str, '-')
++	    /* Why strchr('-') check?
++	     * sscanf below will trash ptm->tm_year, this breaks
++	     * if parse_str is "10101010" (iow, "MMddhhmm" form)
++	     * because we destroy year. Do these sscanf
++	     * only if we saw a dash in parse_str.
++	     */
++		/* yyyy-mm-dd HH */
++	 && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
+ 				&ptm->tm_mon, &ptm->tm_mday,
+ 				&ptm->tm_hour,
+ 				&end) >= 4
+-	/* yyyy-mm-dd */
+-	 || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
++		/* yyyy-mm-dd */
++	     || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
+ 				&ptm->tm_mon, &ptm->tm_mday,
+ 				&end) >= 3
++	    )
+ 	) {
+ 		ptm->tm_year -= 1900; /* Adjust years */
+ 		ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
diff --git a/trunk/package/utils/busybox/patches/004-upstream_iplink_fix.patch b/trunk/package/utils/busybox/patches/004-upstream_iplink_fix.patch
new file mode 100644
index 00000000..0e253568
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/004-upstream_iplink_fix.patch
@@ -0,0 +1,19 @@
+--- a/networking/libiproute/iplink.c
++++ b/networking/libiproute/iplink.c
+@@ -31,6 +31,16 @@
+ #ifndef IFLA_LINKINFO
+ # define IFLA_LINKINFO 18
+ # define IFLA_INFO_KIND 1
++# define IFLA_INFO_DATA 2
++#endif
++
++#ifndef IFLA_VLAN_MAX
++# define IFLA_VLAN_ID 1
++# define IFLA_VLAN_FLAGS 2
++struct ifla_vlan_flags {
++	uint32_t	flags;
++	uint32_t	mask;
++};
+ #endif
+ 
+ /* taken from linux/sockios.h */
diff --git a/trunk/package/utils/busybox/patches/005-upstream_nc_fix.patch b/trunk/package/utils/busybox/patches/005-upstream_nc_fix.patch
new file mode 100644
index 00000000..1bd23592
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/005-upstream_nc_fix.patch
@@ -0,0 +1,15 @@
+--- a/networking/nc_bloaty.c
++++ b/networking/nc_bloaty.c
+@@ -175,9 +175,9 @@ enum {
+ 	OPT_w = (1 << 5),
+ 	OPT_l = (1 << 6) * ENABLE_NC_SERVER,
+ 	OPT_k = (1 << 7) * ENABLE_NC_SERVER,
+-	OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+-	OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+-	OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++	OPT_i = (1 << (6+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++	OPT_o = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++	OPT_z = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+ };
+ 
+ #define o_nflag   (option_mask32 & OPT_n)
diff --git a/trunk/package/utils/busybox/patches/006-upstream_lzop_fix.patch b/trunk/package/utils/busybox/patches/006-upstream_lzop_fix.patch
new file mode 100644
index 00000000..6e453eb9
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/006-upstream_lzop_fix.patch
@@ -0,0 +1,59 @@
+From a9dc7c2f59dc5e92870d2d46316ea5c1f14740e3 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 30 Jun 2014 10:14:34 +0200
+Subject: [PATCH] lzop: add overflow check
+
+See CVE-2014-4607
+http://www.openwall.com/lists/oss-security/2014/06/26/20
+
+function                                             old     new   delta
+lzo1x_decompress_safe                               1010    1031     +21
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ archival/libarchive/liblzo.h  | 2 ++
+ archival/libarchive/lzo1x_d.c | 3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/archival/libarchive/liblzo.h
++++ b/archival/libarchive/liblzo.h
+@@ -76,11 +76,13 @@
+ #    define TEST_IP             (ip < ip_end)
+ #    define NEED_IP(x) \
+             if ((unsigned)(ip_end - ip) < (unsigned)(x))  goto input_overrun
++#    define TEST_IV(x)          if ((x) > (unsigned)0 - (511)) goto input_overrun
+ 
+ #    undef TEST_OP              /* don't need both of the tests here */
+ #    define TEST_OP             1
+ #    define NEED_OP(x) \
+             if ((unsigned)(op_end - op) < (unsigned)(x))  goto output_overrun
++#    define TEST_OV(x)          if ((x) > (unsigned)0 - (511)) goto output_overrun
+ 
+ #define HAVE_ANY_OP 1
+ 
+--- a/archival/libarchive/lzo1x_d.c
++++ b/archival/libarchive/lzo1x_d.c
+@@ -92,6 +92,7 @@ int lzo1x_decompress_safe(const uint8_t*
+ 				ip++;
+ 				NEED_IP(1);
+ 			}
++			TEST_IV(t);
+ 			t += 15 + *ip++;
+ 		}
+ 		/* copy literals */
+@@ -224,6 +225,7 @@ int lzo1x_decompress_safe(const uint8_t*
+ 						ip++;
+ 						NEED_IP(1);
+ 					}
++					TEST_IV(t);
+ 					t += 31 + *ip++;
+ 				}
+ #if defined(COPY_DICT)
+@@ -265,6 +267,7 @@ int lzo1x_decompress_safe(const uint8_t*
+ 						ip++;
+ 						NEED_IP(1);
+ 					}
++					TEST_IV(t);
+ 					t += 7 + *ip++;
+ 				}
+ #if defined(COPY_DICT)
diff --git a/trunk/package/utils/busybox/patches/007-upstream_zcat_no_ext_fix.patch b/trunk/package/utils/busybox/patches/007-upstream_zcat_no_ext_fix.patch
new file mode 100644
index 00000000..24838001
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/007-upstream_zcat_no_ext_fix.patch
@@ -0,0 +1,59 @@
+From 28dd64a0e1a9cffcde7799f2849b66c0e16bb9cc Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Fri, 10 Jan 2014 14:06:57 +0100
+Subject: [PATCH] libarchive: open_zipped() does not need to check extensions
+ for e.g. gzip
+
+We only need to check for signature-less extensions,
+currently only .lzma. The rest can be happily autodetected.
+
+This fixes "zcat FILE_WITHOUT_GZ_EXT" case, among others.
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+(cherry picked from commit 7c47b560a8fc97956dd8132bd7f1863d83c19866)
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ archival/libarchive/open_transformer.c | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+--- a/archival/libarchive/open_transformer.c
++++ b/archival/libarchive/open_transformer.c
+@@ -182,27 +182,26 @@ int FAST_FUNC setup_unzip_on_fd(int fd,
+ 
+ int FAST_FUNC open_zipped(const char *fname)
+ {
+-	char *sfx;
+ 	int fd;
+ 
+ 	fd = open(fname, O_RDONLY);
+ 	if (fd < 0)
+ 		return fd;
+ 
+-	sfx = strrchr(fname, '.');
+-	if (sfx) {
+-		sfx++;
+-		if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
+-			/* .lzma has no header/signature, just trust it */
++	if (ENABLE_FEATURE_SEAMLESS_LZMA) {
++		/* .lzma has no header/signature, can only detect it by extension */
++		char *sfx = strrchr(fname, '.');
++		if (sfx && strcmp(sfx+1, "lzma") == 0) {
+ 			open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma");
+-		else
+-		if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
+-		 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
+-		 || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
+-		) {
+-			setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
++			return fd;
+ 		}
+ 	}
++	if ((ENABLE_FEATURE_SEAMLESS_GZ)
++	 || (ENABLE_FEATURE_SEAMLESS_BZ2)
++	 || (ENABLE_FEATURE_SEAMLESS_XZ)
++	) {
++		setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
++	}
+ 
+ 	return fd;
+ }
diff --git a/trunk/package/utils/busybox/patches/100-trylink_bash.patch b/trunk/package/utils/busybox/patches/100-trylink_bash.patch
new file mode 100644
index 00000000..f9571fcb
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/100-trylink_bash.patch
@@ -0,0 +1,8 @@
+--- a/scripts/trylink
++++ b/scripts/trylink
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ 
+ debug=false
+ 
diff --git a/trunk/package/utils/busybox/patches/101-gen_build_files_bash.patch b/trunk/package/utils/busybox/patches/101-gen_build_files_bash.patch
new file mode 100644
index 00000000..d258fb8b
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/101-gen_build_files_bash.patch
@@ -0,0 +1,8 @@
+--- a/scripts/gen_build_files.sh
++++ b/scripts/gen_build_files.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ 
+ # Note: was using sed OPTS CMD -- FILES
+ # but users complain that many sed implementations
diff --git a/trunk/package/utils/busybox/patches/110-no_static_libgcc.patch b/trunk/package/utils/busybox/patches/110-no_static_libgcc.patch
new file mode 100644
index 00000000..2148a09e
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/110-no_static_libgcc.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -51,7 +51,7 @@ CFLAGS += $(call cc-option,-fno-builtin-
+ # -fno-guess-branch-probability: prohibit pseudo-random guessing
+ # of branch probabilities (hopefully makes bloatcheck more stable):
+ CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
+-CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
++CFLAGS += $(call cc-option,-funsigned-char,)
+ CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
+ # Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary):
+ CFLAGS += $(call cc-option,-fno-unwind-tables,)
diff --git a/trunk/package/utils/busybox/patches/120-remove_uclibc_rpc_check.patch b/trunk/package/utils/busybox/patches/120-remove_uclibc_rpc_check.patch
new file mode 100644
index 00000000..a18b7dc6
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/120-remove_uclibc_rpc_check.patch
@@ -0,0 +1,12 @@
+--- a/util-linux/mount.c
++++ b/util-linux/mount.c
+@@ -138,9 +138,6 @@
+ #if ENABLE_FEATURE_MOUNT_NFS
+ /* This is just a warning of a common mistake.  Possibly this should be a
+  * uclibc faq entry rather than in busybox... */
+-# if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+-#  error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support"
+-# endif
+ # include <rpc/rpc.h>
+ # include <rpc/pmap_prot.h>
+ # include <rpc/pmap_clnt.h>
diff --git a/trunk/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch b/trunk/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch
new file mode 100644
index 00000000..54f878a6
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch
@@ -0,0 +1,13 @@
+--- a/scripts/kconfig/mconf.c
++++ b/scripts/kconfig/mconf.c
+@@ -27,6 +27,10 @@
+ #include <unistd.h>
+ #include <locale.h>
+ 
++#ifndef SIGWINCH
++#define SIGWINCH 28
++#endif
++
+ #define LKC_DIRECT_LINK
+ #include "lkc.h"
+ 
diff --git a/trunk/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch b/trunk/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
new file mode 100644
index 00000000..f3470fdc
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
@@ -0,0 +1,18 @@
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -681,6 +681,7 @@ static int bcast_or_ucast(struct dhcp_pa
+ static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
+ {
+ 	struct dhcp_packet packet;
++	static int msgs = 0;
+ 
+ 	/* Fill in: op, htype, hlen, cookie, chaddr fields,
+ 	 * random xid field (we override it below),
+@@ -698,6 +699,7 @@ static NOINLINE int send_discover(uint32
+ 	 */
+ 	add_client_options(&packet);
+ 
++	if (msgs++ < 3)
+ 	bb_info_msg("Sending discover...");
+ 	return raw_bcast_from_client_config_ifindex(&packet);
+ }
diff --git a/trunk/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch b/trunk/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch
new file mode 100644
index 00000000..3e4e0496
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch
@@ -0,0 +1,15 @@
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -1400,6 +1400,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+ 		/* silence "uninitialized!" warning */
+ 		unsigned timestamp_before_wait = timestamp_before_wait;
+ 
++		/* When running on a bridge, the ifindex may have changed (e.g. if
++		 * member interfaces were added/removed or if the status of the
++		 * bridge changed).
++		 * Workaround: refresh it here before processing the next packet */
++		udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.client_mac);
++
+ 		//bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode);
+ 
+ 		/* Was opening raw or udp socket here
diff --git a/trunk/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch b/trunk/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch
new file mode 100644
index 00000000..4bb64b8a
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch
@@ -0,0 +1,10 @@
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -1087,7 +1087,6 @@ static void perform_renew(void)
+ 		state = RENEW_REQUESTED;
+ 		break;
+ 	case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
+-		udhcp_run_script(NULL, "deconfig");
+ 	case REQUESTING:
+ 	case RELEASED:
+ 		change_listen_mode(LISTEN_RAW);
diff --git a/trunk/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch b/trunk/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch
new file mode 100644
index 00000000..6da568a9
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/204-udhcpc_src_ip_rebind.patch
@@ -0,0 +1,53 @@
+Index: busybox-1.22.1/networking/udhcp/dhcpc.c
+===================================================================
+--- busybox-1.22.1.orig/networking/udhcp/dhcpc.c
++++ busybox-1.22.1/networking/udhcp/dhcpc.c
+@@ -659,10 +659,10 @@ static void add_client_options(struct dh
+  * client reverts to using the IP broadcast address.
+  */
+ 
+-static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet)
++static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet, uint32_t src_nip)
+ {
+ 	return udhcp_send_raw_packet(packet,
+-		/*src*/ INADDR_ANY, CLIENT_PORT,
++		/*src*/ src_nip, CLIENT_PORT,
+ 		/*dst*/ INADDR_BROADCAST, SERVER_PORT, MAC_BCAST_ADDR,
+ 		client_config.ifindex);
+ }
+@@ -673,7 +673,7 @@ static int bcast_or_ucast(struct dhcp_pa
+ 		return udhcp_send_kernel_packet(packet,
+ 			ciaddr, CLIENT_PORT,
+ 			server, SERVER_PORT);
+-	return raw_bcast_from_client_config_ifindex(packet);
++	return raw_bcast_from_client_config_ifindex(packet, ciaddr);
+ }
+ 
+ /* Broadcast a DHCP discover packet to the network, with an optionally requested IP */
+@@ -701,7 +701,7 @@ static NOINLINE int send_discover(uint32
+ 
+ 	if (msgs++ < 3)
+ 	bb_info_msg("Sending discover...");
+-	return raw_bcast_from_client_config_ifindex(&packet);
++	return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
+ }
+ 
+ /* Broadcast a DHCP request message */
+@@ -745,7 +745,7 @@ static NOINLINE int send_select(uint32_t
+ 
+ 	addr.s_addr = requested;
+ 	bb_info_msg("Sending select for %s...", inet_ntoa(addr));
+-	return raw_bcast_from_client_config_ifindex(&packet);
++	return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
+ }
+ 
+ /* Unicast or broadcast a DHCP renew message */
+@@ -813,7 +813,7 @@ static NOINLINE int send_decline(/*uint3
+ 	udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
+ 
+ 	bb_info_msg("Sending decline...");
+-	return raw_bcast_from_client_config_ifindex(&packet);
++	return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
+ }
+ #endif
+ 
diff --git a/trunk/package/utils/busybox/patches/210-add_netmsg_util.patch b/trunk/package/utils/busybox/patches/210-add_netmsg_util.patch
new file mode 100644
index 00000000..1f6c92ed
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/210-add_netmsg_util.patch
@@ -0,0 +1,103 @@
+--- a/include/applets.src.h
++++ b/include/applets.src.h
+@@ -255,6 +255,7 @@ IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DRO
+ IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
+ IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
+ IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_NETMSG(APPLET(netmsg, BB_DIR_BIN, BB_SUID_REQUIRE))
+ IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP))
+ IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
+ IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP))
+--- a/networking/Config.src
++++ b/networking/Config.src
+@@ -620,6 +620,12 @@ config FEATURE_IPCALC_LONG_OPTIONS
+ 	help
+ 	  Support long options for the ipcalc applet.
+ 
++config NETMSG
++	bool "netmsg"
++	default n
++	help
++	  simple program for sending udp broadcast messages
++
+ config NETSTAT
+ 	bool "netstat"
+ 	default y
+--- a/networking/Kbuild.src
++++ b/networking/Kbuild.src
+@@ -27,6 +27,7 @@ lib-$(CONFIG_IP)           += ip.o
+ lib-$(CONFIG_IPCALC)       += ipcalc.o
+ lib-$(CONFIG_NAMEIF)       += nameif.o
+ lib-$(CONFIG_NC)           += nc.o
++lib-$(CONFIG_NETMSG)       += netmsg.o
+ lib-$(CONFIG_NETSTAT)      += netstat.o
+ lib-$(CONFIG_NSLOOKUP)     += nslookup.o
+ lib-$(CONFIG_NTPD)         += ntpd.o
+--- /dev/null
++++ b/networking/netmsg.c
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This is free software, licensed under the GNU General Public License v2.
++ */
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <netdb.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "busybox.h"
++
++//usage:#define netmsg_trivial_usage NOUSAGE_STR
++//usage:#define netmsg_full_usage ""
++
++#ifndef CONFIG_NETMSG
++int main(int argc, char **argv)
++#else
++int netmsg_main(int argc, char **argv)
++#endif
++{
++	int s;
++	struct sockaddr_in addr;
++	int optval = 1;
++	unsigned char buf[1001];
++
++	if (argc != 3) {
++		fprintf(stderr, "usage: %s <ip> \"<message>\"\n", argv[0]);
++		exit(1);
++	}
++
++	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
++		perror("Opening socket");
++		exit(1);
++	}
++
++	memset(&addr, 0, sizeof(addr));
++	addr.sin_family = AF_INET;
++	addr.sin_addr.s_addr = inet_addr(argv[1]);
++	addr.sin_port = htons(0x1337);
++
++	memset(buf, 0, 1001);
++	buf[0] = 0xde;
++	buf[1] = 0xad;
++
++	strncpy(buf + 2, argv[2], 998);
++
++	if (setsockopt (s, SOL_SOCKET, SO_BROADCAST, (caddr_t) &optval, sizeof (optval)) < 0) {
++		perror("setsockopt()");
++		goto fail;
++	}
++
++	if (sendto(s, buf, 1001, 0, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
++		perror("sendto()");
++		goto fail;
++	}
++
++	return 0;
++
++fail:
++	close(s);
++	exit(1);
++}
diff --git a/trunk/package/utils/busybox/patches/220-add_lock_util.patch b/trunk/package/utils/busybox/patches/220-add_lock_util.patch
new file mode 100644
index 00000000..ce663b61
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/220-add_lock_util.patch
@@ -0,0 +1,173 @@
+--- a/include/applets.src.h
++++ b/include/applets.src.h
+@@ -212,6 +212,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, 
+ IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
+ IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
+ IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
++IF_LOCK(APPLET(lock, BB_DIR_BIN, BB_SUID_DROP))
+ IF_LOGGER(APPLET(logger, BB_DIR_USR_BIN, BB_SUID_DROP))
+ /* Needs to be run by root or be suid root - needs to change uid and gid: */
+ IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE))
+--- a/miscutils/Config.src
++++ b/miscutils/Config.src
+@@ -419,6 +419,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
+ 	help
+ 	  Enables the 'hdparm -d' option to get/set using_dma flag.
+ 
++config LOCK
++	bool "lock"
++	default n
++	help
++	  Small utility for using locks in scripts
++
+ config MAKEDEVS
+ 	bool "makedevs"
+ 	default y
+--- a/miscutils/Kbuild.src
++++ b/miscutils/Kbuild.src
+@@ -29,6 +29,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o
+ lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o
+ lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o
+ lib-$(CONFIG_LESS)        += less.o
++lib-$(CONFIG_LOCK)        += lock.o
+ lib-$(CONFIG_MAKEDEVS)    += makedevs.o
+ lib-$(CONFIG_MAN)         += man.o
+ lib-$(CONFIG_MICROCOM)    += microcom.o
+--- /dev/null
++++ b/miscutils/lock.c
+@@ -0,0 +1,135 @@
++/*
++ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This is free software, licensed under the GNU General Public License v2.
++ */
++#include <sys/types.h>
++#include <sys/file.h>
++#include <sys/stat.h>
++#include <signal.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <stdio.h>
++#include "busybox.h"
++
++//usage:#define lock_trivial_usage NOUSAGE_STR
++//usage:#define lock_full_usage ""
++
++static int unlock = 0;
++static int shared = 0;
++static int waitonly = 0;
++static int fd;
++static char *file;
++
++static void usage(char *name)
++{
++	fprintf(stderr, "Usage: %s [-suw] <filename>\n"
++	                "	-s	Use shared locking\n"
++	                "	-u	Unlock\n"
++	                "	-w	Wait for the lock to become free, don't acquire lock\n"
++					"\n", name);
++	exit(1);
++}
++
++static void exit_unlock(int sig)
++{
++	flock(fd, LOCK_UN);
++	exit(0);
++}
++
++static int do_unlock(void)
++{
++	FILE *f;
++	int i;
++
++	if ((f = fopen(file, "r")) == NULL)
++		return 0;
++
++	fscanf(f, "%d", &i);
++	if (i > 0)
++		kill(i, SIGTERM);
++
++	fclose(f);
++
++	return 0;
++}
++
++static int do_lock(void)
++{
++	int pid;
++	char pidstr[8];
++
++	if ((fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0700)) < 0) {
++		if ((fd = open(file, O_RDWR)) < 0) {
++			fprintf(stderr, "Can't open %s\n", file);
++			return 1;
++		}
++	}
++
++	if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) {
++		fprintf(stderr, "Can't lock %s\n", file);
++		return 1;
++	}
++
++	pid = fork();
++
++	if (pid < 0)
++		return -1;
++
++	if (pid == 0) {
++		signal(SIGKILL, exit_unlock);
++		signal(SIGTERM, exit_unlock);
++		signal(SIGINT, exit_unlock);
++		if (waitonly)
++			exit_unlock(0);
++		else
++			while (1)
++				sleep(1);
++	} else {
++		if (!waitonly) {
++			lseek(fd, 0, SEEK_SET);
++			ftruncate(fd, 0);
++			sprintf(pidstr, "%d\n", pid);
++			write(fd, pidstr, strlen(pidstr));
++			close(fd);
++		}
++
++		return 0;
++	}
++	return 0;
++}
++
++int lock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
++int lock_main(int argc, char **argv)
++{
++	char **args = &argv[1];
++	int c = argc - 1;
++
++	while ((*args != NULL) && (*args)[0] == '-') {
++		char *ch = *args;
++		while (*(++ch) > 0) {
++			switch(*ch) {
++				case 'w':
++					waitonly = 1;
++					break;
++				case 's':
++					shared = 1;
++					break;
++				case 'u':
++					unlock = 1;
++					break;
++			}
++		}
++		c--;
++		args++;
++	}
++
++	if (c != 1)
++		usage(argv[0]);
++
++	file = *args;
++	if (unlock)
++		return do_unlock();
++	else
++		return do_lock();
++}
diff --git a/trunk/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch b/trunk/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
new file mode 100644
index 00000000..d46a0e3f
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
@@ -0,0 +1,48 @@
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -238,6 +238,7 @@ typedef struct {
+ typedef struct {
+ 	len_and_sockaddr *p_lsa;
+ 	char             *p_dotted;
++	char             *p_hostname;
+ 	int              p_fd;
+ 	int              datapoint_idx;
+ 	uint32_t         lastpkt_refid;
+@@ -738,8 +739,9 @@ add_peers(char *s)
+ 	peer_t *p;
+ 
+ 	p = xzalloc(sizeof(*p));
+-	p->p_lsa = xhost2sockaddr(s, 123);
+-	p->p_dotted = xmalloc_sockaddr2dotted_noport(&p->p_lsa->u.sa);
++	p->p_hostname = s;
++	p->p_lsa = NULL;
++	p->p_dotted = NULL;
+ 	p->p_fd = -1;
+ 	p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
+ 	p->next_action_time = G.cur_time; /* = set_next(p, 0); */
+@@ -788,6 +790,25 @@ send_query_to_peer(peer_t *p)
+ 	 *
+ 	 * Uncomment this and use strace to see it in action:
+ 	 */
++
++	/* See if the peer hostname already resolved yet, if not, retry to resolv and return on failure */
++	if (!p->p_lsa)
++	{
++		p->p_lsa = host2sockaddr(p->p_hostname, 123);
++
++		if (p->p_lsa)
++		{
++			p->p_dotted = xmalloc_sockaddr2dotted_noport(&p->p_lsa->u.sa);
++			VERB1 bb_error_msg("resolved peer %s to %s", p->p_hostname, p->p_dotted);
++		}
++		else
++		{
++			set_next(p, RETRY_INTERVAL);
++			VERB1 bb_error_msg("could not resolve peer %s, skipping", p->p_hostname);
++			return;
++		}
++	}
++
+ #define PROBE_LOCAL_ADDR /* { len_and_sockaddr lsa; lsa.len = LSA_SIZEOF_SA; getsockname(p->query.fd, &lsa.u.sa, &lsa.len); } */
+ 
+ 	if (p->p_fd == -1) {
diff --git a/trunk/package/utils/busybox/patches/240-telnetd_intr.patch b/trunk/package/utils/busybox/patches/240-telnetd_intr.patch
new file mode 100644
index 00000000..ccb4ea42
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/240-telnetd_intr.patch
@@ -0,0 +1,10 @@
+--- a/networking/telnetd.c
++++ b/networking/telnetd.c
+@@ -331,6 +331,7 @@ make_new_session(
+ 
+ 	/* Restore default signal handling ASAP */
+ 	bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
++	signal(SIGINT, SIG_DFL);
+ 
+ 	pid = getpid();
+ 
diff --git a/trunk/package/utils/busybox/patches/250-date-k-flag.patch b/trunk/package/utils/busybox/patches/250-date-k-flag.patch
new file mode 100644
index 00000000..d17d61f9
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/250-date-k-flag.patch
@@ -0,0 +1,87 @@
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -123,6 +123,7 @@
+ //usage:	IF_FEATURE_DATE_ISOFMT(
+ //usage:     "\n	-D FMT		Use FMT for -d TIME conversion"
+ //usage:	)
++//usage:     "\n	-k		Set Kernel timezone from localtime and exit"
+ //usage:     "\n"
+ //usage:     "\nRecognized TIME formats:"
+ //usage:     "\n	hh:mm[:ss]"
+@@ -138,6 +139,7 @@
+ //usage:       "Wed Apr 12 18:52:41 MDT 2000\n"
+ 
+ #include "libbb.h"
++#include <sys/time.h>
+ #if ENABLE_FEATURE_DATE_NANO
+ # include <sys/syscall.h>
+ #endif
+@@ -148,8 +150,9 @@ enum {
+ 	OPT_UTC       = (1 << 2), /* u */
+ 	OPT_DATE      = (1 << 3), /* d */
+ 	OPT_REFERENCE = (1 << 4), /* r */
+-	OPT_TIMESPEC  = (1 << 5) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
+-	OPT_HINT      = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
++	OPT_KERNELTZ  = (1 << 5), /* k */
++	OPT_TIMESPEC  = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
++	OPT_HINT      = (1 << 7) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
+ };
+ 
+ static void maybe_set_utc(int opt)
+@@ -167,12 +170,15 @@ static const char date_longopts[] ALIGN1
+ 	/*	"universal\0" No_argument       "u" */
+ 		"date\0"      Required_argument "d"
+ 		"reference\0" Required_argument "r"
++		"set-kernel-tz\0" No_argument   "k"
+ 		;
+ #endif
+ 
+ int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int date_main(int argc UNUSED_PARAM, char **argv)
+ {
++	time_t tt;
++	struct timezone tz;
+ 	struct timespec ts;
+ 	struct tm tm_time;
+ 	char buf_fmt_dt2str[64];
+@@ -187,7 +193,7 @@ int date_main(int argc UNUSED_PARAM, cha
+ 	opt_complementary = "d--s:s--d"
+ 		IF_FEATURE_DATE_ISOFMT(":R--I:I--R");
+ 	IF_LONG_OPTS(applet_long_options = date_longopts;)
+-	opt = getopt32(argv, "Rs:ud:r:"
++	opt = getopt32(argv, "Rs:ud:r:k"
+ 			IF_FEATURE_DATE_ISOFMT("I::D:"),
+ 			&date_str, &date_str, &filename
+ 			IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
+@@ -244,6 +250,31 @@ int date_main(int argc UNUSED_PARAM, cha
+ 	if (*argv)
+ 		bb_show_usage();
+ 
++	/* Setting of kernel timezone was requested */
++	if (opt & OPT_KERNELTZ) {
++		tt = time(NULL);
++		localtime_r(&tt, &tm_time);
++
++		/* workaround warp_clock() on first invocation */
++		memset(&tz, 0, sizeof(tz));
++		settimeofday(NULL, &tz);
++
++		memset(&tz, 0, sizeof(tz));
++#ifdef __USE_BSD
++		tz.tz_minuteswest = -(tm_time.tm_gmtoff / 60);
++#else
++		tz.tz_minuteswest = -(tm_time.__tm_gmtoff / 60);
++#endif
++
++		if (settimeofday(NULL, &tz))
++		{
++			bb_perror_msg("can't set kernel time zone");
++			return EXIT_FAILURE;
++		}
++
++		return EXIT_SUCCESS;
++	}
++
+ 	/* Now we have parsed all the information except the date format
+ 	 * which depends on whether the clock is being set or read */
+ 
diff --git a/trunk/package/utils/busybox/patches/260-arping_missing_includes.patch b/trunk/package/utils/busybox/patches/260-arping_missing_includes.patch
new file mode 100644
index 00000000..a9d4a62a
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/260-arping_missing_includes.patch
@@ -0,0 +1,11 @@
+--- a/networking/arping.c
++++ b/networking/arping.c
+@@ -24,6 +24,8 @@
+ 
+ #include <arpa/inet.h>
+ #include <net/if.h>
++#include <net/if_arp.h>
++#include <netinet/if_ether.h>
+ #include <netinet/ether.h>
+ #include <netpacket/packet.h>
+ 
diff --git a/trunk/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch b/trunk/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch
new file mode 100644
index 00000000..3bfd48a2
--- /dev/null
+++ b/trunk/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch
@@ -0,0 +1,20 @@
+--- a/libbb/printable_string.c
++++ b/libbb/printable_string.c
+@@ -31,8 +31,6 @@ const char* FAST_FUNC printable_string(u
+ 		}
+ 		if (c < ' ')
+ 			break;
+-		if (c >= 0x7f)
+-			break;
+ 		s++;
+ 	}
+ 
+@@ -45,7 +43,7 @@ const char* FAST_FUNC printable_string(u
+ 			unsigned char c = *d;
+ 			if (c == '\0')
+ 				break;
+-			if (c < ' ' || c >= 0x7f)
++			if (c < ' ')
+ 				*d = '?';
+ 			d++;
+ 		}
diff --git a/trunk/package/utils/e2fsprogs/Makefile b/trunk/package/utils/e2fsprogs/Makefile
new file mode 100644
index 00000000..b91c9578
--- /dev/null
+++ b/trunk/package/utils/e2fsprogs/Makefile
@@ -0,0 +1,170 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright 2010 Vertical Communications
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=e2fsprogs
+PKG_VERSION:=1.42.4
+PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/e2fsprogs
+
+PKG_BUILD_DEPENDS:=util-linux
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/e2fsprogs/Default
+  URL:=http://e2fsprogs.sourceforge.net/
+  SUBMENU:=Filesystem
+endef
+
+define Package/e2fsprogs
+$(call Package/e2fsprogs/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Ext2/3/4 filesystem utilities
+  DEPENDS:=+libuuid +libext2fs
+endef
+
+define Package/e2fsprogs/description
+ This package contains essential ext2 filesystem utilities which consists of
+ e2fsck, mke2fs and most of the other core ext2 filesystem utilities.
+endef
+
+define Package/libext2fs
+$(call Package/e2fsprogs/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=ext2/3/4 filesystem library
+endef
+
+define Package/libext2fs/description
+ libext2fs is a library which can access ext2, ext3 and ext4 filesystems.
+endef
+
+define Package/tune2fs
+$(call Package/e2fsprogs)
+  TITLE:=Ext2 Filesystem tune utility
+  DEPENDS:= +e2fsprogs
+endef
+
+define Package/resize2fs
+$(call Package/e2fsprogs)
+  TITLE:=Ext2 Filesystem resize utility
+  DEPENDS:= +e2fsprogs
+endef
+
+define Package/badblocks
+$(call Package/e2fsprogs)
+  TITLE:=Ext2 Filesystem badblocks utility
+  DEPENDS:= +e2fsprogs
+endef
+
+TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
+
+CONFIGURE_VARS += \
+	ac_cv_lib_pthread_sem_init=no
+
+CONFIGURE_ARGS += \
+	--disable-testio-debug \
+	--enable-elf-shlibs	\
+	--disable-libuuid	\
+	--enable-libblkid	\
+	--disable-uuidd		\
+	--disable-tls		\
+	--disable-nls		\
+	--disable-rpath
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/config/
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/util \
+		BUILDCC="$(HOSTCC)" \
+		CFLAGS="" \
+		CPPFLAGS="" \
+		LDFLAGS="" \
+		subst
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		LDFLAGS=-Wl,--gc-sections \
+		BUILDCC="$(HOSTCC)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		LIBBLKID="$(PKG_BUILD_DIR)/lib/libblkid.a -luuid" \
+		all
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/lib/ext2fs/ext2fs.pc $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/lib/et/com_err.pc $(1)/usr/lib/pkgconfig
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libext2fs.{so,a}* $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libcom_err.{so,a}* $(1)/usr/lib
+
+	$(INSTALL_DIR) $(1)/usr/include/ext2fs
+	$(CP) $(PKG_BUILD_DIR)/lib/ext2fs/*.h $(1)/usr/include/ext2fs
+	$(INSTALL_DIR) $(1)/usr/include/et
+	$(CP) $(PKG_BUILD_DIR)/lib/et/*.h $(1)/usr/include/et
+endef
+
+define Package/e2fsprogs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/
+	$(LN) mke2fs $(1)/usr/sbin/mkfs.ext2
+	$(LN) mke2fs $(1)/usr/sbin/mkfs.ext3
+	$(LN) mke2fs $(1)/usr/sbin/mkfs.ext4
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libe2p.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/lib/functions/fsck
+	$(INSTALL_DATA) ./files/e2fsck.sh $(1)/lib/functions/fsck/
+	$(INSTALL_DATA) ./files/e2fsck.conf $(1)/etc/e2fsck.conf
+endef
+
+define Package/libcom_err/install
+endef
+
+define Package/libext2fs/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* \
+		$(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* \
+		$(1)/usr/lib/
+endef
+
+define Package/libext2fs/install_lib
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/ext2fs/libext2fs.a $(1)/usr/lib/libext2fs_pic.a
+endef
+
+define Package/tune2fs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
+endef
+
+define Package/resize2fs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/
+endef
+
+define Package/badblocks/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/badblocks $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,e2fsprogs))
+$(eval $(call BuildPackage,libext2fs))
+$(eval $(call BuildPackage,tune2fs))
+$(eval $(call BuildPackage,resize2fs))
+$(eval $(call BuildPackage,badblocks))
diff --git a/trunk/package/utils/e2fsprogs/files/e2fsck.conf b/trunk/package/utils/e2fsprogs/files/e2fsck.conf
new file mode 100644
index 00000000..9c96b495
--- /dev/null
+++ b/trunk/package/utils/e2fsprogs/files/e2fsck.conf
@@ -0,0 +1,3 @@
+[options]
+broken_system_clock = true
+
diff --git a/trunk/package/utils/e2fsprogs/files/e2fsck.sh b/trunk/package/utils/e2fsprogs/files/e2fsck.sh
new file mode 100644
index 00000000..22031edb
--- /dev/null
+++ b/trunk/package/utils/e2fsprogs/files/e2fsck.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Copyright 2010 Vertical Communications
+# Copyright 2012 OpenWrt.org
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+fsck_e2fsck() {
+	set -o pipefail
+	e2fsck -p "$device" 2>&1 | logger -t "fstab: e2fsck ($device)"
+	local status="$?"
+	set +o pipefail
+	case "$status" in
+		0|1) ;; #success
+		2) reboot;;
+		4) echo "e2fsck ($device): Warning! Uncorrected errors."| logger -t fstab
+			return 1
+			;;
+		*) echo "e2fsck ($device): Error $status. Check not complete."| logger -t fstab;;
+	esac
+	return 0
+}
+
+fsck_ext2() {
+	fsck_e2fsck "$@"
+}
+
+fsck_ext3() {
+	fsck_e2fsck "$@"
+}
+
+fsck_ext4() {
+	fsck_e2fsck "$@"
+}
+
+append libmount_known_fsck "ext2"
+append libmount_known_fsck "ext3"
+append libmount_known_fsck "ext4"
diff --git a/trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch b/trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
new file mode 100644
index 00000000..e0564dc3
--- /dev/null
+++ b/trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
@@ -0,0 +1,38 @@
+--- a/configure
++++ b/configure
+@@ -5038,7 +5038,7 @@ if test "${ac_cv_lib_blkid_blkid_get_cac
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lblkid $LIBBLKID $LIBS"
++LIBS="-lblkid $LIBBLKID $LIBUUID $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -146,10 +146,10 @@ partinfo: partinfo.o
+ 	$(E) "	LD $@"
+ 	$(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+ 
+-e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
++e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBEXT2FS)
+ 	$(E) "	LD $@"
+ 	$(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
+-		$(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
++		$(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
+ 
+ tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
+ 		$(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS)
+@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
+ 		$(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
+ 		$(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
+ 
+-fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
++fsck: $(FSCK_OBJS) $(DEPLIBBLKID) $(DEPLIBUUID)
+ 	$(E) "	LD $@"
+-	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
++	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
+ 
+ fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
+ 	$(E) "	LD $@"
diff --git a/trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch b/trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch
new file mode 100644
index 00000000..209b47c1
--- /dev/null
+++ b/trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch
@@ -0,0 +1,10 @@
+--- a/util/symlinks.c
++++ b/util/symlinks.c
+@@ -8,7 +8,6 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <sys/param.h>
diff --git a/trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch b/trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch
new file mode 100644
index 00000000..62f1e08e
--- /dev/null
+++ b/trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch
@@ -0,0 +1,13 @@
+--- a/lib/et/Makefile.in
++++ b/lib/et/Makefile.in
+@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk
+ LIBRARY= libcom_err
+ LIBDIR= et
+ 
+-ELF_VERSION = 2.1
+-ELF_SO_VERSION = 2
++ELF_VERSION = 0.0
++ELF_SO_VERSION = 0
+ ELF_IMAGE = libcom_err
+ ELF_MYDIR = et
+ ELF_INSTALL_DIR = $(root_libdir)
diff --git a/trunk/package/utils/fbtest/Makefile b/trunk/package/utils/fbtest/Makefile
new file mode 100644
index 00000000..05e67cb6
--- /dev/null
+++ b/trunk/package/utils/fbtest/Makefile
@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fbtest
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fbtest
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Frame buffer device testing tool
+  DEPENDS:=@DISPLAY_SUPPORT
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+endef
+
+define Package/fbtest/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fbtest $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,fbtest))
diff --git a/trunk/package/utils/fbtest/src/Makefile b/trunk/package/utils/fbtest/src/Makefile
new file mode 100644
index 00000000..075bc0ec
--- /dev/null
+++ b/trunk/package/utils/fbtest/src/Makefile
@@ -0,0 +1,14 @@
+CC = gcc
+CFLAGS = -Wall
+OBJS = fbtest.o
+
+all: fbtest
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+fbtest: $(OBJS)
+	$(CC) -o $@ $(OBJS)
+
+clean:
+	rm -f rbcfg *.o
diff --git a/trunk/package/utils/fbtest/src/fbtest.c b/trunk/package/utils/fbtest/src/fbtest.c
new file mode 100644
index 00000000..6e9c2f85
--- /dev/null
+++ b/trunk/package/utils/fbtest/src/fbtest.c
@@ -0,0 +1,448 @@
+/******************************************************************************
+ *	fbtest - fbtest.c
+ *	test program for the tuxbox-framebuffer device
+ *	tests all GTX/eNX supported modes
+ *                                                                            
+ *	(c) 2003 Carsten Juttner (carjay@gmx.net)
+ *
+ * 	This program is free software; you can redistribute it and/or modify
+ * 	it under the terms of the GNU General Public License as published by
+ * 	The Free Software Foundation; either version 2 of the License, or
+ * 	(at your option) any later version.
+ *
+ * 	This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  									      
+ ******************************************************************************
+ * $Id: fbtest.c,v 1.5 2005/01/14 23:14:41 carjay Exp $
+ ******************************************************************************/
+
+// TODO: - should restore the colour map and mode to what it was before
+//	 - is colour map handled correctly?
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+
+#include <linux/fb.h>
+
+#include <error.h>
+
+#define FBDEV "/dev/fb0"
+
+struct vidsize{
+	int width;
+	int height;
+};
+static
+const struct vidsize vidsizetable[]={	// all supported sizes
+	{720,576},{720,480},{720,288},{720,240},
+	{640,576},{640,480},{640,288},{640,240},
+	{360,576},{360,480},{360,288},{360,240},
+	{320,576},{320,480},{320,288},{320,240}
+};
+#define VIDSIZENUM (sizeof(vidsizetable)/sizeof(struct vidsize))
+
+enum pixenum{	// keep in sync with pixname !
+	CLUT4=0,
+	CLUT8,
+	RGB565,
+	ARGB1555,
+	ARGB
+};
+const char *pixname[] = {
+	"CLUT4",
+	"CLUT8",
+	"RGB565",
+	"ARGB1555",
+	"ARGB"
+};
+
+struct pixelformat{
+	char *name;
+	struct fb_bitfield red;
+	struct fb_bitfield green;
+	struct fb_bitfield blue;
+	struct fb_bitfield transp;
+	char bpp;
+	char pixenum;
+};
+
+static		// so far these are all modes supported by the eNX (only partially by GTX)
+const struct pixelformat pixelformattable[] = {
+	{ .name = "CLUT4 ARGB8888", 	// CLUT4 (ARGB8888)
+		.bpp = 4, .pixenum = CLUT4,
+		.red = 	 { .offset = 0, .length=8, .msb_right =0 },
+		.green = { .offset = 0, .length=8, .msb_right =0 },
+		.blue =  { .offset = 0, .length=8, .msb_right =0 },
+		.transp=  { .offset = 0, .length=8, .msb_right =0 }
+	},
+	{ .name = "CLUT4 ARGB1555", 	// CLUT4 (ARGB1555)
+		.bpp = 4, .pixenum = CLUT4,
+		.red = 	 { .offset = 0, .length=5, .msb_right =0 },
+		.green = { .offset = 0, .length=5, .msb_right =0 },
+		.blue =  { .offset = 0, .length=5, .msb_right =0 },
+		.transp=  { .offset = 0, .length=1, .msb_right =0 }
+	},
+	{ .name = "CLUT8 ARGB8888",	// CLUT8 (ARGB8888)
+		.bpp = 8, .pixenum = CLUT8,
+		.red = 	 { .offset = 0, .length=8, .msb_right =0 },
+		.green = { .offset = 0, .length=8, .msb_right =0 },
+		.blue =  { .offset = 0, .length=8, .msb_right =0 },
+		.transp=  { .offset = 0, .length=8, .msb_right =0 }
+	},
+	{ .name = "CLUT8 ARGB1555",	// CLUT8 (ARGB1555)
+		.bpp = 8, .pixenum = CLUT8,
+		.red = 	 { .offset = 0, .length=5, .msb_right =0 },
+		.green = { .offset = 0, .length=5, .msb_right =0 },
+		.blue =  { .offset = 0, .length=5, .msb_right =0 },
+		.transp=  { .offset = 0, .length=1, .msb_right =0 }
+	},
+	{ .name = "ARGB1555", 	// ARGB1555
+		.bpp = 16, .pixenum = ARGB1555,
+		.red = 	 { .offset = 10, .length=5, .msb_right =0 },
+		.green = { .offset = 5,  .length=5, .msb_right =0 },
+		.blue =  { .offset = 0,  .length=5, .msb_right =0 },
+		.transp=  { .offset = 15, .length=1, .msb_right =0 }
+	},
+	{ .name = "RGB565", 		// RGB565
+		.bpp = 16, .pixenum = RGB565,
+		.red = 	 { .offset = 11, .length=5, .msb_right =0 },
+		.green = { .offset = 5,  .length=6, .msb_right =0 },
+		.blue =  { .offset = 0,  .length=5, .msb_right =0 },
+		.transp=  { .offset = 0,  .length=0, .msb_right =0 }
+	},
+	{ .name = "ARGB",	// 32 f*cking bits, the real McCoy :)
+		.bpp = 32, .pixenum = ARGB,
+		.red = 	 { .offset = 16, .length=8, .msb_right =0 },
+		.green = { .offset = 8,  .length=8, .msb_right =0 },
+		.blue =  { .offset = 0,  .length=8, .msb_right =0 },
+		.transp=  { .offset = 24, .length=8, .msb_right =0 }
+	}
+};
+#define PIXELFORMATNUM (sizeof(pixelformattable)/sizeof(struct pixelformat))
+
+struct colour {
+	__u16 r;
+	__u16 g;
+	__u16 b;
+	__u16 a;
+};
+static
+struct colour colourtable[] = {
+	{.r =0xffff, .g = 0xffff, .b=0xffff, .a=0xffff},	// fully transparent white
+	{.r =0xffff, .g = 0x0000, .b=0x0000, .a=0x0000},	// red
+	{.r =0x0000, .g = 0xffff, .b=0x0000, .a=0x0000},	// green
+	{.r =0x0000, .g = 0x0000, .b=0xffff, .a=0x0000},	// blue
+	{.r =0x0000, .g = 0x0000, .b=0x0000, .a=0x0000}		// black
+};
+#define COLOURNUM (sizeof(colourtable)/sizeof(struct colour))
+
+struct rect{
+	int x;
+	int y;
+	int width;
+	int height;
+	const struct colour *col;
+};
+struct pixel{		// up to 32 bits of pixel information
+	char byte[4];
+};
+
+void col2pixel (struct pixel *pix, const struct pixelformat *pixf, const struct colour *col){
+	switch (pixf->pixenum){
+		case RGB565:
+			pix->byte[0]=(col->r&0xf8)|(col->g&0xfc)>>5;
+			pix->byte[1]=(col->g&0xfc)<<3|(col->b&0xf8)>>3;
+			break;
+		case ARGB1555:
+			pix->byte[0]=(col->a&0x80)|(col->r&0xf8)>>1|(col->g&0xf8)>>6;
+			pix->byte[1]=(col->g&0xf8)<<2|(col->b&0xf8)>>3;
+			break;
+		case ARGB:
+			pix->byte[0]=col->a;
+			pix->byte[1]=col->r;
+			pix->byte[2]=col->g;
+			pix->byte[3]=col->b;
+			break;
+		default:
+			printf ("unknown pixelformat\n");
+			exit(1);
+	}
+}
+
+int setmode(int fbd, const struct pixelformat *pixf,const struct vidsize *vids){
+	struct fb_var_screeninfo var;
+	int stat;
+	stat = ioctl (fbd, FBIOGET_VSCREENINFO,&var);
+	if (stat<0) return -2;
+	
+	var.xres= vids->width;
+	var.xres_virtual = vids->width;
+	var.yres= vids->height;
+	var.yres_virtual = vids->height;
+	
+	var.bits_per_pixel = pixf->bpp;
+	var.red = pixf->red;
+	var.green = pixf->green;
+	var.blue = pixf->blue;
+	var.transp = pixf->transp;
+
+	stat = ioctl (fbd, FBIOPUT_VSCREENINFO,&var);
+	if (stat<0) return -1;
+	return 0;
+}
+
+// unefficient implementation, do NOT use it for your next ego shooter, please :)
+// for 4-Bit only rectangles with even width are supported
+// CLUT-modes use value of red component as index
+void drawrect(void *videoram, struct rect *r, const struct pixelformat *pixf, const struct vidsize *vids){
+	int x,y,corwidth, bpp = 0, tocopy = 1;
+	struct pixel pix;
+	unsigned char *pmem = videoram;
+	corwidth = r->width;	// actually only "corrected" for 4 Bit
+
+	if (pixf->pixenum!=CLUT4&&pixf->pixenum!=CLUT8){
+		switch (pixf->pixenum){
+			case ARGB1555:
+			case RGB565:
+				bpp = 16;
+				tocopy = 2;
+				break;
+			case ARGB:
+				bpp = 32;
+				tocopy = 4;
+				break;
+			default:
+				printf ("drawrect: unknown pixelformat(%d) bpp:%d\n",pixf->pixenum,pixf->bpp);
+				exit(1);
+		}
+		col2pixel(&pix,pixf,r->col);
+	} else {
+		switch (pixf->pixenum){	// CLUT = Colour LookUp Table (palette)
+			case CLUT4:	// take red value as index in this case
+				pix.byte[0]=(r->col->r)<<4|(r->col->r&0xf);	// slightly cryptic... "rect->colour->red"
+				corwidth>>=1;	// we copy bytes
+				bpp=4;
+				tocopy=1;
+				break;
+			case CLUT8:
+				pix.byte[0]=(r->col->r&0xff);
+				bpp=8;
+				tocopy=1;
+				break;
+		}
+	}
+	pmem=videoram+((((r->y*vids->width)+r->x)*bpp)>>3);
+	for (y=0;y<r->height;y++){
+		int offset = 0;
+		for (x=0;x<corwidth;x++){
+			memcpy (pmem+offset,pix.byte,tocopy);
+			offset+=tocopy;
+		}
+		pmem +=((vids->width*bpp)>>3);	// skip one whole line, actually should be taken from "fix-info"
+	}
+}
+			
+// create quick little test image, 4 colours from table
+void draw4field(void *videoram, const struct pixelformat *pixf, const struct vidsize *vids){
+	struct rect r;
+	struct colour c;
+	int height, width;
+	c.r = 1;	// only used for the indexed modes, r is taken as index
+	height = vids->height;
+	width = vids->width;
+
+	r.height = height>>1;
+	r.width = width>>1;
+	r.x = 0;	r.y = 0;
+	if (pixf->pixenum==CLUT4||pixf->pixenum==CLUT8) r.col = &c;
+	else r.col = &colourtable[1];
+	drawrect (videoram, &r, pixf, vids);
+
+	r.x = width/2;	r.y = 0;
+	if (pixf->pixenum==CLUT4||pixf->pixenum==CLUT8) c.r = 2;
+	else r.col = &colourtable[2];
+	drawrect (videoram, &r, pixf, vids);
+
+	r.x = 0;	r.y = height/2;
+	if (pixf->pixenum==CLUT4||pixf->pixenum==CLUT8) c.r = 3;
+	else r.col = &colourtable[3];
+	drawrect (videoram, &r, pixf, vids);
+
+	r.x = width/2;	r.y = height/2;
+	if (pixf->pixenum==CLUT4||pixf->pixenum==CLUT8) c.r = 0;
+	else r.col = &colourtable[0];
+	drawrect (videoram, &r, pixf, vids);
+}
+
+void usage(char *name){
+ 	printf ("Usage: %s [options]\n"
+		"Options: -f<pixelformat>\n"
+		"            where format is one of:\n"
+		"              CLUT4,CLUT8,ARGB1555,RGB565,ARGB\n"
+		"         -s<width>x<heigth>\n"
+		"            where width is either 720,640,360,320\n"
+		"                  and height is either 288,240,480,576\n"
+		"         -n\n"
+		"            disables clearing the framebuffer after drawing\n"
+		"            the testimage. This can be useful to keep the last\n"
+		"            drawn image onscreen.\n"
+		"\nExample: %s -fRGB322\n",name,name);
+	exit(0);
+}
+
+int main (int argc,char **argv){
+	struct fb_fix_screeninfo fix;
+	struct fb_var_screeninfo var;
+	struct fb_cmap cmap;
+	struct rect r;
+	int fbd;
+	unsigned char *pfb;
+	int stat;
+	int optchar,fmode=-1,smode=-1,clear=1;
+	int i_cmap,i_size,i_pix;
+	extern char *optarg;
+	
+	if (argc!=0&&argc>4) usage(argv[0]);
+	while ( (optchar = getopt (argc,argv,"f:s:n"))!= -1){
+		int i,height,width;
+		switch (optchar){
+			case 'f':
+				for (i=0;i<(sizeof(pixname)/sizeof(char*));i++){
+					if (!strncmp (optarg,pixname[i],strlen(pixname[i]))){
+						fmode=i;
+						printf ("displaying only %s-modes\n",pixname[i]);
+						break;
+					}
+				}
+				if (fmode==-1){
+					printf ("unknown pixelformat\n");
+					exit(0);
+				}
+				break;
+			case 's':
+				if (sscanf (optarg,"%dx%d",&width,&height)!=2){
+					printf ("parsing size failed\n");
+					exit(0);
+				} else {
+					printf ("requested size %dx%d\n",width,height);
+					for (i=0;i<VIDSIZENUM;i++){
+						if (vidsizetable[i].width == width &&
+							vidsizetable[i].height == height){
+							smode = i;
+							break;
+						}
+					}
+					if (smode==-1){
+						printf ("this size is not supported\n");
+						exit(0);
+					}
+				}
+				break;
+			case 'n':
+				clear = 0;
+				printf ("clearing framebuffer after drawing is disabled\n");
+				break;
+			case '?':
+				usage (argv[0]);
+		}
+	}
+	
+	fbd = open (FBDEV, O_RDWR);
+	if (fbd<0){
+		perror ("Error opening framebuffer device");
+		return 1;
+	}
+	stat = ioctl (fbd, FBIOGET_FSCREENINFO,&fix);
+	if (stat<0){
+		perror ("Error getting fix screeninfo");
+		return 1;
+	}
+	stat = ioctl (fbd, FBIOGET_VSCREENINFO,&var);
+	if (stat<0){
+		perror ("Error getting var screeninfo");
+		return 1;
+	}
+	stat = ioctl (fbd, FBIOPUT_VSCREENINFO,&var);
+	if (stat<0){
+		perror ("Error setting mode");
+		return 1;
+	}
+	pfb = mmap (0, fix.smem_len, PROT_READ|PROT_WRITE, MAP_SHARED, fbd, 0);
+	if (pfb == MAP_FAILED){
+		perror ("Error mmap'ing framebuffer device");
+		return 1;
+	}
+
+	// iterate over all modes
+	for (i_pix=0;i_pix<PIXELFORMATNUM;i_pix++){
+		if (fmode!=-1 && pixelformattable[i_pix].pixenum != fmode) continue;
+		printf ("testing: %s",pixelformattable[i_pix].name);
+		printf (" for sizes: \n");
+		for (i_size=0;i_size<VIDSIZENUM;i_size++){
+			if (smode!=-1 && i_size!=smode) continue;
+			printf ("%dx%d ",vidsizetable[i_size].width,vidsizetable[i_size].height);
+			fflush(stdout);
+			if ((i_size%4)==3) printf ("\n");
+			
+			// try to set mode
+			stat = setmode(fbd,&pixelformattable[i_pix],&vidsizetable[i_size]);
+			if (stat==-2) perror ("fbtest: could not get fb_var-screeninfo from fb-device");
+			else if (stat==-1){
+				printf ("\nCould not set mode %s (%dx%d), possible reasons:\n"
+					"- you have a GTX (soz m8)\n"
+					"- your configuration does not have enough graphics RAM\n"
+					"- you found a bug\n"
+					"choose your poison accordingly...\n",
+					pixelformattable[i_pix].name,vidsizetable[i_size].width,vidsizetable[i_size].height);
+					continue;
+			}
+			// fill cmap;
+			cmap.len = 1;
+			if ((pixelformattable[i_pix].bpp==4)||
+				((pixelformattable[i_pix].bpp==8)&&(pixelformattable[i_pix].red.length!=3))){
+				for (i_cmap=0;i_cmap<COLOURNUM;i_cmap++){
+					cmap.start=i_cmap;
+					cmap.red=&colourtable[i_cmap].r;
+					cmap.green=&colourtable[i_cmap].g;
+					cmap.blue=&colourtable[i_cmap].b;
+					cmap.transp=&colourtable[i_cmap].a;
+					stat = ioctl (fbd, FBIOPUTCMAP, &cmap);
+					if (stat<0) printf ("setting colourmap failed\n");
+				}
+			}
+			// create the test image
+			draw4field(pfb,&pixelformattable[i_pix],&vidsizetable[i_size]);
+			usleep (500000);
+			// clear screen
+			if (clear){
+				r.x=r.y=0;r.width = vidsizetable[i_size].width; r.height = vidsizetable[i_size].height;
+				r.col = &colourtable[4];
+				drawrect(pfb,&r,&pixelformattable[i_pix],&vidsizetable[i_size]);
+			}
+		}
+		printf ("\n");
+	}
+
+	stat = munmap (pfb,fix.smem_len);
+	if (stat<0){
+		perror ("Error munmap'ing framebuffer device");
+		return 1;
+	}
+	close (fbd);
+	return 0;
+}
diff --git a/trunk/package/utils/flashrom/Makefile b/trunk/package/utils/flashrom/Makefile
new file mode 100644
index 00000000..45e20caf
--- /dev/null
+++ b/trunk/package/utils/flashrom/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2010-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=flashrom
+PKG_VERSION:=0.9.7
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://download.flashrom.org/releases
+PKG_MD5SUM:=d239bafa1b46619d851f70f84a5b122a
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/flashrom
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=FlashROM Utility
+  URL:=http://www.flashrom.org/
+  DEPENDS:=+zlib +pciutils +(TARGET_x86||TARGET_x86_64):dmidecode +libftdi
+endef
+
+define Package/flashrom/description
+ flashrom is an utility for identifying, reading, writing, verifying
+ and erasing flash chips. It's often used to flash BIOS/EFI/coreboot
+ /firmware images.
+endef
+
+MAKE_FLAGS += \
+	PREFIX="/usr"
+
+define Package/flashrom/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/flashrom $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,flashrom))
diff --git a/trunk/package/utils/flashrom/patches/100-mipsel_fix.patch b/trunk/package/utils/flashrom/patches/100-mipsel_fix.patch
new file mode 100755
index 00000000..3e34aeec
--- /dev/null
+++ b/trunk/package/utils/flashrom/patches/100-mipsel_fix.patch
@@ -0,0 +1,16 @@
+diff -uprN a/internal.c b/internal.c
+--- a/internal.c	2014-06-13 16:44:14.263689579 +0200
++++ b/internal.c	2014-06-13 16:46:04.229020785 +0200
+@@ -337,10 +337,12 @@ int internal_init(void)
+ 	init_superio_ite();
+ #endif
+ 
++#if defined(__i386__) || defined(__x86_64__) || defined (__arm__)
+ 	if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) {
+ 		msg_perr("Aborting to be safe.\n");
+ 		return 1;
+ 	}
++#endif
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined (__mips)
+ 	register_par_programmer(&par_programmer_internal, internal_buses_supported);
diff --git a/trunk/package/utils/fuse/Makefile b/trunk/package/utils/fuse/Makefile
new file mode 100644
index 00000000..0620b6cf
--- /dev/null
+++ b/trunk/package/utils/fuse/Makefile
@@ -0,0 +1,111 @@
+# 
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=fuse
+PKG_VERSION:=2.9.0
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=894ee11674f89a915ae87524aed55bc4
+
+PKG_LICENSE:=LGPLv2.1 GPLv2
+PKG_LICENSE_FILES:=COPYING.LIB COPYING
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fuse/Default
+  TITLE:=FUSE
+  URL:=http://fuse.sourceforge.net/
+endef
+
+define Package/fuse/Default/description
+ FUSE (Filesystem in UserSpacE)
+endef
+
+define Package/fuse-utils
+$(call Package/fuse/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libfuse
+  TITLE+= (utilities)
+  SUBMENU:=Filesystem
+endef
+
+define Package/fuse-utils/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE utilities.
+ - fusermount
+ - ulockmgr_server
+endef
+
+define Package/libfuse
+$(call Package/fuse/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (library)
+  DEPENDS:=+kmod-fuse +libpthread
+  SUBMENU:=Filesystem
+endef
+
+define Package/libfuse/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE shared libraries, needed by other programs.
+ - libfuse
+ - libulockmgr
+endef
+
+# generic args
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--disable-example \
+	--disable-mtab
+
+# generic package uses lib & utils
+CONFIGURE_ARGS += --enable-lib --enable-util
+
+define Build/InstallDev
+	@echo "--> Build/InstallDev enter"
+	mkdir -p $(1)/usr/include
+	$(CP)	$(PKG_INSTALL_DIR)/usr/include/{fuse,*.h} $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/*.{a,so*} $(1)/usr/lib/
+	mkdir -p $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
+	$(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
+	$(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
+	@echo "--> Build/InstallDev leave"
+endef
+
+define Package/fuse-utils/install
+	@echo "--> Package/fuse-utils/install enter"
+	$(INSTALL_DIR) $(1)/usr/bin
+	# use cp and keep fusermount sticky bit
+	$(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f -exec $(CP) -a {} $(1)/usr/bin/ \;
+	@echo "--> Package/fuse-utils/install leave"
+endef
+
+define Package/libfuse/install
+	@echo "--> Package/libfuse/install enter"
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
+	@echo "--> Package/libfuse/install leave"
+endef
+
+define Package/kmod-fuse/install
+	@echo "--> Package/kmod-fuse/install enter/leave"
+endef
+
+$(eval $(call BuildPackage,fuse-utils))
+$(eval $(call BuildPackage,libfuse))
diff --git a/trunk/package/utils/fuse/patches/112-no_break_on_mknod.patch b/trunk/package/utils/fuse/patches/112-no_break_on_mknod.patch
new file mode 100644
index 00000000..5f913df6
--- /dev/null
+++ b/trunk/package/utils/fuse/patches/112-no_break_on_mknod.patch
@@ -0,0 +1,11 @@
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -641,7 +641,7 @@ mount_util.c: $(top_srcdir)/lib/mount_ut
+ 
+ install-exec-hook:
+ 	-chmod u+s $(DESTDIR)$(bindir)/fusermount
+-	@if test ! -e $(DESTDIR)/dev/fuse; then \
++	-@if test ! -e $(DESTDIR)/dev/fuse; then \
+ 		$(mkdir_p) $(DESTDIR)/dev; \
+ 		echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
+ 		mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
diff --git a/trunk/package/utils/hostap-utils/Makefile b/trunk/package/utils/hostap-utils/Makefile
new file mode 100644
index 00000000..1d7b2212
--- /dev/null
+++ b/trunk/package/utils/hostap-utils/Makefile
@@ -0,0 +1,44 @@
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hostap-utils
+PKG_VERSION:=0.4.7
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=afe041581b8f01666e353bec20917c85
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/hostap-utils
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=kmod-hostap
+  TITLE:=Host AP driver utility programs
+  URL:=http://hostap.epitest.fi/
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -Wall" \
+		all
+endef
+
+define Package/hostap-utils/install	
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_crypt_conf $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_diag $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_io_debug $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostap_rid $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/prism2_srec $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/split_combined_hex $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,hostap-utils))
diff --git a/trunk/package/utils/jsonfilter/Makefile b/trunk/package/utils/jsonfilter/Makefile
new file mode 100644
index 00000000..94b26f3b
--- /dev/null
+++ b/trunk/package/utils/jsonfilter/Makefile
@@ -0,0 +1,33 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=jsonfilter
+PKG_VERSION:=2014-06-19
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://git.openwrt.org/project/jsonpath.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=cdc760c58077f44fc40adbbe41e1556a67c1b9a9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+CMAKE_INSTALL:=1
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=ISC
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/jsonfilter
+  SECTION:=base
+  CATEGORY:=Base system
+  DEPENDS:=+libubox +libjson-c
+  TITLE:=libreCMC JSON filter utility
+  URL:=http://git.openwrt.org/?p=project/jsonpath.git
+endef
+
+define Package/jsonfilter/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jsonpath $(1)/usr/bin/jsonfilter
+endef
+
+$(eval $(call BuildPackage,jsonfilter))
diff --git a/trunk/package/utils/lua/Makefile b/trunk/package/utils/lua/Makefile
new file mode 100644
index 00000000..e40188ed
--- /dev/null
+++ b/trunk/package/utils/lua/Makefile
@@ -0,0 +1,183 @@
+# 
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua
+PKG_VERSION:=5.1.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
+	http://ftp.gwdg.de/pub/languages/lua/ \
+	http://mirrors.dotsrc.org/lua/ \
+	http://www.tecgraf.puc-rio.br/lua/ftp/
+PKG_MD5SUM:=2e115fe26e435e33b0d5c022e4490567
+PKG_BUILD_PARALLEL:=1
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYRIGHT
+
+HOST_PATCH_DIR := ./patches-host
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/lua/Default
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Lua programming language
+  URL:=http://www.lua.org/
+  MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+endef
+
+define Package/lua/Default/description
+ Lua is a powerful light-weight programming language designed for extending 
+ applications. Lua is also frequently used as a general-purpose, stand-alone 
+ language. Lua is free software.
+endef
+
+define Package/liblua
+$(call Package/lua/Default)
+  SUBMENU:=
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (libraries)
+endef
+
+define Package/liblua/description
+$(call Package/lua/Default/description)
+ This package contains the Lua shared libraries, needed by other programs.
+endef
+
+define Package/lua
+$(call Package/lua/Default)
+  DEPENDS:=+liblua
+  TITLE+= (interpreter)
+endef
+
+define Package/lua/description
+$(call Package/lua/Default/description)
+ This package contains the Lua language interpreter.
+endef
+
+define Package/luac
+$(call Package/lua/Default)
+  DEPENDS:=+liblua
+  TITLE+= (compiler)
+endef
+
+define Package/luac/description
+$(call Package/lua/Default/description)
+ This package contains the Lua language compiler.
+endef
+
+define Package/lua-examples
+$(call Package/lua/Default)
+  DEPENDS:=lua
+  TITLE+= (examples)
+endef
+
+define Package/lua-examples/description
+$(call Package/lua/Default/description)
+ This package contains Lua language examples.
+endef
+
+define Build/Configure
+endef
+
+TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99
+
+ifneq ($(CONFIG_USE_EGLIBC),)
+  ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),)
+    TARGET_CFLAGS += -DNO_GETLOGIN
+  endif
+endif
+
+define Build/Compile
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CROSS)gcc" \
+		AR="$(TARGET_CROSS)ar rcu" \
+		RANLIB="$(TARGET_CROSS)ranlib" \
+		INSTALL_ROOT=/usr \
+		CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+		MYLDFLAGS="$(TARGET_LDFLAGS)" \
+		PKG_VERSION=$(PKG_VERSION) \
+		linux
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		INSTALL_TOP="$(PKG_INSTALL_DIR)/usr" \
+		install
+endef
+
+define Host/Configure
+	$(SED) 's,"/usr/local/","$(STAGING_DIR_HOST)/",' $(HOST_BUILD_DIR)/src/luaconf.h
+endef
+
+ifeq ($(HOST_OS),Darwin)
+	LUA_OS:=macosx
+else
+	ifeq ($(HOST_OS),FreeBSD)
+		LUA_OS:=freebsd
+	else
+		LUA_OS:=linux
+	endif
+endif
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		CC="$(HOSTCC) -std=gnu99" \
+		$(LUA_OS)
+endef
+
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		INSTALL_TOP="$(STAGING_DIR_HOST)" \
+		install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lnum_config.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so*} $(1)/usr/lib/
+	$(LN) liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/etc/lua.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/liblua/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so.* $(1)/usr/lib/
+endef
+
+define Package/lua/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/
+endef
+
+define Package/luac/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/
+endef
+
+define Package/lua-examples/install
+	$(INSTALL_DIR) $(1)/usr/share/lua/examples
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/test/*.lua \
+		$(1)/usr/share/lua/examples/
+endef
+
+$(eval $(call BuildPackage,liblua))
+$(eval $(call BuildPackage,lua))
+$(eval $(call BuildPackage,luac))
+$(eval $(call BuildPackage,lua-examples))
+$(eval $(call HostBuild))
+
diff --git a/trunk/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch b/trunk/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch
new file mode 100644
index 00000000..74b8c6f8
--- /dev/null
+++ b/trunk/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch
@@ -0,0 +1,3736 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -25,7 +25,7 @@ PLATS= aix ansi bsd freebsd generic linu
+ LUA_A=	liblua.a
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+-	lundump.o lvm.o lzio.o
++	lundump.o lvm.o lzio.o lnum.o
+ LIB_O=	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
+ 	lstrlib.o loadlib.o linit.o
+ 
+@@ -148,6 +148,7 @@ llex.o: llex.c lua.h luaconf.h ldo.h lob
+ lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h
+ lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+   ltm.h lzio.h lmem.h ldo.h
++lnum.o: lnum.c lua.h llex.h lnum.h
+ loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h
+ lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \
+   ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h
+@@ -179,4 +180,18 @@ lzio.o: lzio.c lua.h luaconf.h llimits.h
+ print.o: print.c ldebug.h lstate.h lua.h luaconf.h lobject.h llimits.h \
+   ltm.h lzio.h lmem.h lopcodes.h lundump.h
+ 
++luaconf.h: lnum_config.h
++lapi.c: lnum.h
++lauxlib.c: llimits.h
++lbaselib.c: llimits.h lobject.h lapi.h
++lcode.c: lnum.h
++liolib.c: lnum.h llex.h
++llex.c: lnum.h
++lnum.h: lobject.h
++lobject.c: llex.h lnum.h
++ltable.c: lnum.h
++lua.c: llimits.h
++lvm.c: llex.h lnum.h
++print.c: lnum.h
++
+ # (end of Makefile)
+--- a/src/lapi.c
++++ b/src/lapi.c
+@@ -28,7 +28,7 @@
+ #include "ltm.h"
+ #include "lundump.h"
+ #include "lvm.h"
+-
++#include "lnum.h"
+ 
+ 
+ const char lua_ident[] =
+@@ -241,12 +241,13 @@ LUA_API void lua_pushvalue (lua_State *L
+ 
+ LUA_API int lua_type (lua_State *L, int idx) {
+   StkId o = index2adr(L, idx);
+-  return (o == luaO_nilobject) ? LUA_TNONE : ttype(o);
++  return (o == luaO_nilobject) ? LUA_TNONE : ttype_ext(o);
+ }
+ 
+ 
+ LUA_API const char *lua_typename (lua_State *L, int t) {
+   UNUSED(L);
++  lua_assert( t!= LUA_TINT );
+   return (t == LUA_TNONE) ? "no value" : luaT_typenames[t];
+ }
+ 
+@@ -264,6 +265,14 @@ LUA_API int lua_isnumber (lua_State *L, 
+ }
+ 
+ 
++LUA_API int lua_isinteger (lua_State *L, int idx) {
++  TValue tmp;
++  lua_Integer dum;
++  const TValue *o = index2adr(L, idx);
++  return tonumber(o,&tmp) && (ttisint(o) || tt_integer_valued(o,&dum));
++}
++
++
+ LUA_API int lua_isstring (lua_State *L, int idx) {
+   int t = lua_type(L, idx);
+   return (t == LUA_TSTRING || t == LUA_TNUMBER);
+@@ -309,31 +318,66 @@ LUA_API int lua_lessthan (lua_State *L, 
+ }
+ 
+ 
+-
+ LUA_API lua_Number lua_tonumber (lua_State *L, int idx) {
+   TValue n;
+   const TValue *o = index2adr(L, idx);
+-  if (tonumber(o, &n))
++  if (tonumber(o, &n)) {
++#ifdef LNUM_COMPLEX
++    if (nvalue_img(o) != 0)
++      luaG_runerror(L, "expecting a real number");
++#endif
+     return nvalue(o);
+-  else
+-    return 0;
++  }
++  return 0;
+ }
+ 
+ 
+ LUA_API lua_Integer lua_tointeger (lua_State *L, int idx) {
+   TValue n;
++    /* Lua 5.1 documented behaviour is to return nonzero for non-integer:
++     * "If the number is not an integer, it is truncated in some non-specified way." 
++     * I would suggest to change this, to return 0 for anything that would
++     * not fit in 'lua_Integer'.
++     */
++#ifdef LUA_COMPAT_TOINTEGER
++  /* Lua 5.1 compatible */
+   const TValue *o = index2adr(L, idx);
+   if (tonumber(o, &n)) {
+-    lua_Integer res;
+-    lua_Number num = nvalue(o);
+-    lua_number2integer(res, num);
+-    return res;
++    lua_Integer i;
++    lua_Number d;
++    if (ttisint(o)) return ivalue(o);
++    d= nvalue_fast(o);
++# ifdef LNUM_COMPLEX
++    if (nvalue_img_fast(o) != 0)
++      luaG_runerror(L, "expecting a real number");
++# endif
++    lua_number2integer(i, d);
++    return i;
+   }
+-  else
+-    return 0;
++#else
++  /* New suggestion */
++  const TValue *o = index2adr(L, idx);
++  if (tonumber(o, &n)) {
++    lua_Integer i;
++    if (ttisint(o)) return ivalue(o);
++    if (tt_integer_valued(o,&i)) return i;
++  }
++#endif
++  return 0;
+ }
+ 
+ 
++#ifdef LNUM_COMPLEX
++LUA_API lua_Complex lua_tocomplex (lua_State *L, int idx) {
++  TValue tmp;
++  const TValue *o = index2adr(L, idx);
++  if (tonumber(o, &tmp))
++    return nvalue_complex(o);
++  return 0;
++}
++#endif
++
++
+ LUA_API int lua_toboolean (lua_State *L, int idx) {
+   const TValue *o = index2adr(L, idx);
+   return !l_isfalse(o);
+@@ -364,6 +408,7 @@ LUA_API size_t lua_objlen (lua_State *L,
+     case LUA_TSTRING: return tsvalue(o)->len;
+     case LUA_TUSERDATA: return uvalue(o)->len;
+     case LUA_TTABLE: return luaH_getn(hvalue(o));
++    case LUA_TINT:
+     case LUA_TNUMBER: {
+       size_t l;
+       lua_lock(L);  /* `luaV_tostring' may create a new string */
+@@ -426,6 +471,8 @@ LUA_API void lua_pushnil (lua_State *L) 
+ }
+ 
+ 
++/* 'lua_pushnumber()' may lose accuracy on integers, 'lua_pushinteger' will not.
++ */
+ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
+   lua_lock(L);
+   setnvalue(L->top, n);
+@@ -434,12 +481,22 @@ LUA_API void lua_pushnumber (lua_State *
+ }
+ 
+ 
+-LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
++LUA_API void lua_pushinteger (lua_State *L, lua_Integer i) {
++  lua_lock(L);
++  setivalue(L->top, i);
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++#ifdef LNUM_COMPLEX
++LUA_API void lua_pushcomplex (lua_State *L, lua_Complex v) {
+   lua_lock(L);
+-  setnvalue(L->top, cast_num(n));
++  setnvalue_complex( L->top, v );
+   api_incr_top(L);
+   lua_unlock(L);
+ }
++#endif
+ 
+ 
+ LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
+@@ -569,7 +626,7 @@ LUA_API void lua_rawgeti (lua_State *L, 
+   lua_lock(L);
+   o = index2adr(L, idx);
+   api_check(L, ttistable(o));
+-  setobj2s(L, L->top, luaH_getnum(hvalue(o), n));
++  setobj2s(L, L->top, luaH_getint(hvalue(o), n));
+   api_incr_top(L);
+   lua_unlock(L);
+ }
+@@ -597,6 +654,9 @@ LUA_API int lua_getmetatable (lua_State 
+     case LUA_TUSERDATA:
+       mt = uvalue(obj)->metatable;
+       break;
++    case LUA_TINT:
++      mt = G(L)->mt[LUA_TNUMBER];
++      break;
+     default:
+       mt = G(L)->mt[ttype(obj)];
+       break;
+@@ -687,7 +747,7 @@ LUA_API void lua_rawseti (lua_State *L, 
+   api_checknelems(L, 1);
+   o = index2adr(L, idx);
+   api_check(L, ttistable(o));
+-  setobj2t(L, luaH_setnum(L, hvalue(o), n), L->top-1);
++  setobj2t(L, luaH_setint(L, hvalue(o), n), L->top-1);
+   luaC_barriert(L, hvalue(o), L->top-1);
+   L->top--;
+   lua_unlock(L);
+@@ -721,7 +781,7 @@ LUA_API int lua_setmetatable (lua_State 
+       break;
+     }
+     default: {
+-      G(L)->mt[ttype(obj)] = mt;
++      G(L)->mt[ttype_ext(obj)] = mt;
+       break;
+     }
+   }
+@@ -1085,3 +1145,32 @@ LUA_API const char *lua_setupvalue (lua_
+   return name;
+ }
+ 
++
++/* Help function for 'luaB_tonumber()', avoids multiple str->number
++ * conversions for Lua "tonumber()".
++ *
++ * Also pushes floating point numbers with integer value as integer, which
++ * can be used by 'tonumber()' in scripts to bring values back to integer
++ * realm.
++ *
++ * Note: The 'back to integer realm' is _not_ to affect string conversions:
++ * 'tonumber("4294967295.1")' should give a floating point value, although
++ * the value would be 4294967296 (and storable in int64 realm).
++ */
++int lua_pushvalue_as_number (lua_State *L, int idx)
++{
++  const TValue *o = index2adr(L, idx);
++  TValue tmp;
++  lua_Integer i;
++  if (ttisnumber(o)) {
++    if ( (!ttisint(o)) && tt_integer_valued(o,&i)) {
++      lua_pushinteger( L, i );
++      return 1;
++    }
++  } else if (!tonumber(o, &tmp)) {
++    return 0;
++  }
++  if (ttisint(o)) lua_pushinteger( L, ivalue(o) );
++  else lua_pushnumber( L, nvalue_fast(o) );
++  return 1;
++}
+--- a/src/lapi.h
++++ b/src/lapi.h
+@@ -13,4 +13,6 @@
+ 
+ LUAI_FUNC void luaA_pushobject (lua_State *L, const TValue *o);
+ 
++int lua_pushvalue_as_number (lua_State *L, int idx);
++
+ #endif
+--- a/src/lauxlib.c
++++ b/src/lauxlib.c
+@@ -23,7 +23,7 @@
+ #include "lua.h"
+ 
+ #include "lauxlib.h"
+-
++#include "llimits.h"
+ 
+ #define FREELIST_REF	0	/* free list of references */
+ 
+@@ -66,7 +66,7 @@ LUALIB_API int luaL_typerror (lua_State 
+ 
+ 
+ static void tag_error (lua_State *L, int narg, int tag) {
+-  luaL_typerror(L, narg, lua_typename(L, tag));
++  luaL_typerror(L, narg, tag==LUA_TINT ? "integer" : lua_typename(L, tag));
+ }
+ 
+ 
+@@ -188,8 +188,8 @@ LUALIB_API lua_Number luaL_optnumber (lu
+ 
+ LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) {
+   lua_Integer d = lua_tointeger(L, narg);
+-  if (d == 0 && !lua_isnumber(L, narg))  /* avoid extra test when d is not 0 */
+-    tag_error(L, narg, LUA_TNUMBER);
++  if (d == 0 && !lua_isinteger(L, narg))  /* avoid extra test when d is not 0 */
++    tag_error(L, narg, LUA_TINT);
+   return d;
+ }
+ 
+@@ -200,6 +200,16 @@ LUALIB_API lua_Integer luaL_optinteger (
+ }
+ 
+ 
++#ifdef LNUM_COMPLEX
++LUALIB_API lua_Complex luaL_checkcomplex (lua_State *L, int narg) {
++  lua_Complex c = lua_tocomplex(L, narg);
++  if (c == 0 && !lua_isnumber(L, narg))  /* avoid extra test when c is not 0 */
++    tag_error(L, narg, LUA_TNUMBER);
++  return c;
++}
++#endif
++
++
+ LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
+   if (!lua_getmetatable(L, obj))  /* no metatable? */
+     return 0;
+--- a/src/lauxlib.h
++++ b/src/lauxlib.h
+@@ -57,6 +57,12 @@ LUALIB_API lua_Number (luaL_optnumber) (
+ LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
+ LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
+                                           lua_Integer def);
++#define luaL_checkint32(L,narg) ((int)luaL_checkinteger(L,narg))
++#define luaL_optint32(L,narg,def) ((int)luaL_optinteger(L,narg,def))
++
++#ifdef LNUM_COMPLEX
++  LUALIB_API lua_Complex (luaL_checkcomplex) (lua_State *L, int narg);
++#endif
+ 
+ LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
+ LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
+--- a/src/lbaselib.c
++++ b/src/lbaselib.c
+@@ -18,7 +18,9 @@
+ 
+ #include "lauxlib.h"
+ #include "lualib.h"
+-
++#include "llimits.h"
++#include "lobject.h"
++#include "lapi.h"
+ 
+ 
+ 
+@@ -54,20 +56,25 @@ static int luaB_tonumber (lua_State *L) 
+   int base = luaL_optint(L, 2, 10);
+   if (base == 10) {  /* standard conversion */
+     luaL_checkany(L, 1);
+-    if (lua_isnumber(L, 1)) {
+-      lua_pushnumber(L, lua_tonumber(L, 1));
++    if (lua_isnumber(L, 1)) {       /* numeric string, or a number */
++      lua_pushvalue_as_number(L,1);     /* API extension (not to lose accuracy here) */
+       return 1;
+-    }
++	}
+   }
+   else {
+     const char *s1 = luaL_checkstring(L, 1);
+     char *s2;
+-    unsigned long n;
++    unsigned LUA_INTEGER n;
+     luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+-    n = strtoul(s1, &s2, base);
++    n = lua_str2ul(s1, &s2, base);
+     if (s1 != s2) {  /* at least one valid digit? */
+       while (isspace((unsigned char)(*s2))) s2++;  /* skip trailing spaces */
+       if (*s2 == '\0') {  /* no invalid trailing characters? */
++	  
++		/* Push as number, there needs to be separate 'luaB_tointeger' for
++		 * when the caller wants to preserve the bits (matters if unsigned
++		 * values are used).
++		 */
+         lua_pushnumber(L, (lua_Number)n);
+         return 1;
+       }
+@@ -144,7 +151,7 @@ static int luaB_setfenv (lua_State *L) {
+   luaL_checktype(L, 2, LUA_TTABLE);
+   getfunc(L, 0);
+   lua_pushvalue(L, 2);
+-  if (lua_isnumber(L, 1) && lua_tonumber(L, 1) == 0) {
++  if (lua_isnumber(L, 1) && lua_tointeger(L, 1) == 0) {
+     /* change environment of current thread */
+     lua_pushthread(L);
+     lua_insert(L, -2);
+@@ -209,7 +216,7 @@ static int luaB_collectgarbage (lua_Stat
+       return 1;
+     }
+     default: {
+-      lua_pushnumber(L, res);
++      lua_pushinteger(L, res);
+       return 1;
+     }
+   }
+@@ -631,6 +638,8 @@ static void base_open (lua_State *L) {
+   luaL_register(L, "_G", base_funcs);
+   lua_pushliteral(L, LUA_VERSION);
+   lua_setglobal(L, "_VERSION");  /* set global _VERSION */
++  lua_pushliteral(L, LUA_LNUM);
++  lua_setglobal(L, "_LNUM");  /* "[complex] double|float|ldouble int32|int64" */
+   /* `ipairs' and `pairs' need auxiliary functions as upvalues */
+   auxopen(L, "ipairs", luaB_ipairs, ipairsaux);
+   auxopen(L, "pairs", luaB_pairs, luaB_next);
+--- a/src/lcode.c
++++ b/src/lcode.c
+@@ -22,13 +22,18 @@
+ #include "lopcodes.h"
+ #include "lparser.h"
+ #include "ltable.h"
++#include "lnum.h"
+ 
+ 
+ #define hasjumps(e)	((e)->t != (e)->f)
+ 
+-
+ static int isnumeral(expdesc *e) {
+-  return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
++  int ek=
++#ifdef LNUM_COMPLEX
++    (e->k == VKNUM2) ||
++#endif
++    (e->k == VKINT) || (e->k == VKNUM);
++  return (ek && e->t == NO_JUMP && e->f == NO_JUMP);
+ }
+ 
+ 
+@@ -231,12 +236,16 @@ static int addk (FuncState *fs, TValue *
+   TValue *idx = luaH_set(L, fs->h, k);
+   Proto *f = fs->f;
+   int oldsize = f->sizek;
+-  if (ttisnumber(idx)) {
+-    lua_assert(luaO_rawequalObj(&fs->f->k[cast_int(nvalue(idx))], v));
+-    return cast_int(nvalue(idx));
++  if (ttype(idx)==LUA_TNUMBER) {
++    luai_normalize(idx);
++    lua_assert( ttype(idx)==LUA_TINT );     /* had no fraction */
++  }
++  if (ttisint(idx)) {
++    lua_assert(luaO_rawequalObj(&fs->f->k[ivalue(idx)], v));
++    return cast_int(ivalue(idx));
+   }
+   else {  /* constant not found; create a new entry */
+-    setnvalue(idx, cast_num(fs->nk));
++    setivalue(idx, fs->nk);
+     luaM_growvector(L, f->k, fs->nk, f->sizek, TValue,
+                     MAXARG_Bx, "constant table overflow");
+     while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
+@@ -261,6 +270,21 @@ int luaK_numberK (FuncState *fs, lua_Num
+ }
+ 
+ 
++int luaK_integerK (FuncState *fs, lua_Integer r) {
++  TValue o;
++  setivalue(&o, r);
++  return addk(fs, &o, &o);
++}
++
++
++#ifdef LNUM_COMPLEX
++static int luaK_imagK (FuncState *fs, lua_Number r) {
++  TValue o;
++  setnvalue_complex(&o, r*I);
++  return addk(fs, &o, &o);
++}
++#endif
++
+ static int boolK (FuncState *fs, int b) {
+   TValue o;
+   setbvalue(&o, b);
+@@ -359,6 +383,16 @@ static void discharge2reg (FuncState *fs
+       luaK_codeABx(fs, OP_LOADK, reg, luaK_numberK(fs, e->u.nval));
+       break;
+     }
++    case VKINT: {
++      luaK_codeABx(fs, OP_LOADK, reg, luaK_integerK(fs, e->u.ival));
++      break;
++    }
++#ifdef LNUM_COMPLEX
++    case VKNUM2: {
++      luaK_codeABx(fs, OP_LOADK, reg, luaK_imagK(fs, e->u.nval));
++      break;
++    }
++#endif
+     case VRELOCABLE: {
+       Instruction *pc = &getcode(fs, e);
+       SETARG_A(*pc, reg);
+@@ -444,6 +478,10 @@ void luaK_exp2val (FuncState *fs, expdes
+ int luaK_exp2RK (FuncState *fs, expdesc *e) {
+   luaK_exp2val(fs, e);
+   switch (e->k) {
++#ifdef LNUM_COMPLEX
++    case VKNUM2:
++#endif
++    case VKINT:
+     case VKNUM:
+     case VTRUE:
+     case VFALSE:
+@@ -451,6 +489,10 @@ int luaK_exp2RK (FuncState *fs, expdesc 
+       if (fs->nk <= MAXINDEXRK) {  /* constant fit in RK operand? */
+         e->u.s.info = (e->k == VNIL)  ? nilK(fs) :
+                       (e->k == VKNUM) ? luaK_numberK(fs, e->u.nval) :
++                      (e->k == VKINT) ? luaK_integerK(fs, e->u.ival) :
++#ifdef LNUM_COMPLEX
++                      (e->k == VKNUM2) ? luaK_imagK(fs, e->u.nval) :
++#endif
+                                         boolK(fs, (e->k == VTRUE));
+         e->k = VK;
+         return RKASK(e->u.s.info);
+@@ -540,7 +582,10 @@ void luaK_goiftrue (FuncState *fs, expde
+   int pc;  /* pc of last jump */
+   luaK_dischargevars(fs, e);
+   switch (e->k) {
+-    case VK: case VKNUM: case VTRUE: {
++#ifdef LNUM_COMPLEX
++    case VKNUM2:
++#endif
++    case VKINT: case VK: case VKNUM: case VTRUE: {
+       pc = NO_JUMP;  /* always true; do nothing */
+       break;
+     }
+@@ -590,7 +635,10 @@ static void codenot (FuncState *fs, expd
+       e->k = VTRUE;
+       break;
+     }
+-    case VK: case VKNUM: case VTRUE: {
++#ifdef LNUM_COMPLEX
++    case VKNUM2:
++#endif
++    case VKINT: case VK: case VKNUM: case VTRUE: {
+       e->k = VFALSE;
+       break;
+     }
+@@ -626,25 +674,70 @@ void luaK_indexed (FuncState *fs, expdes
+ 
+ static int constfolding (OpCode op, expdesc *e1, expdesc *e2) {
+   lua_Number v1, v2, r;
++  int vkres= VKNUM;
+   if (!isnumeral(e1) || !isnumeral(e2)) return 0;
+-  v1 = e1->u.nval;
+-  v2 = e2->u.nval;
++
++  /* real and imaginary parts don't mix. */
++#ifdef LNUM_COMPLEX
++  if (e1->k == VKNUM2) {
++    if ((op != OP_UNM) && (e2->k != VKNUM2)) return 0; 
++    vkres= VKNUM2; }
++  else if (e2->k == VKNUM2) { return 0; }
++#endif
++  if ((e1->k == VKINT) && (e2->k == VKINT)) {
++    lua_Integer i1= e1->u.ival, i2= e2->u.ival;
++    lua_Integer rr;
++    int done= 0;
++    /* Integer/integer calculations (may end up producing floating point) */
++    switch (op) {
++      case OP_ADD: done= try_addint( &rr, i1, i2 ); break;
++      case OP_SUB: done= try_subint( &rr, i1, i2 ); break;
++      case OP_MUL: done= try_mulint( &rr, i1, i2 ); break;
++      case OP_DIV: done= try_divint( &rr, i1, i2 ); break;
++      case OP_MOD: done= try_modint( &rr, i1, i2 ); break;
++      case OP_POW: done= try_powint( &rr, i1, i2 ); break;
++      case OP_UNM: done= try_unmint( &rr, i1 ); break;
++      default:     done= 0; break;
++    }
++    if (done) {
++      e1->u.ival = rr;  /* remained within integer range */
++      return 1;
++    }
++  }
++  v1 = (e1->k == VKINT) ? ((lua_Number)e1->u.ival) : e1->u.nval;
++  v2 = (e2->k == VKINT) ? ((lua_Number)e2->u.ival) : e2->u.nval;
++
+   switch (op) {
+     case OP_ADD: r = luai_numadd(v1, v2); break;
+     case OP_SUB: r = luai_numsub(v1, v2); break;
+-    case OP_MUL: r = luai_nummul(v1, v2); break;
++    case OP_MUL: 
++#ifdef LNUM_COMPLEX
++        if (vkres==VKNUM2) return 0;    /* leave to runtime (could do here, but not worth it?) */
++#endif
++        r = luai_nummul(v1, v2); break;
+     case OP_DIV:
+       if (v2 == 0) return 0;  /* do not attempt to divide by 0 */
+-      r = luai_numdiv(v1, v2); break;
++#ifdef LNUM_COMPLEX
++        if (vkres==VKNUM2) return 0;    /* leave to runtime */
++#endif
++        r = luai_numdiv(v1, v2); break;
+     case OP_MOD:
+       if (v2 == 0) return 0;  /* do not attempt to divide by 0 */
++#ifdef LNUM_COMPLEX
++      if (vkres==VKNUM2) return 0;    /* leave to runtime */
++#endif
+       r = luai_nummod(v1, v2); break;
+-    case OP_POW: r = luai_numpow(v1, v2); break;
++    case OP_POW: 
++#ifdef LNUM_COMPLEX
++      if (vkres==VKNUM2) return 0;    /* leave to runtime */
++#endif
++      r = luai_numpow(v1, v2); break;
+     case OP_UNM: r = luai_numunm(v1); break;
+     case OP_LEN: return 0;  /* no constant folding for 'len' */
+     default: lua_assert(0); r = 0; break;
+   }
+   if (luai_numisnan(r)) return 0;  /* do not attempt to produce NaN */
++  e1->k = cast(expkind,vkres);
+   e1->u.nval = r;
+   return 1;
+ }
+@@ -688,7 +781,8 @@ static void codecomp (FuncState *fs, OpC
+ 
+ void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
+   expdesc e2;
+-  e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
++  e2.t = e2.f = NO_JUMP; e2.k = VKINT; e2.u.ival = 0;
++
+   switch (op) {
+     case OPR_MINUS: {
+       if (!isnumeral(e))
+--- a/src/lcode.h
++++ b/src/lcode.h
+@@ -71,6 +71,6 @@ LUAI_FUNC void luaK_prefix (FuncState *f
+ LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
+ LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, expdesc *v2);
+ LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
+-
++LUAI_FUNC int luaK_integerK (FuncState *fs, lua_Integer r);
+ 
+ #endif
+--- a/src/ldebug.c
++++ b/src/ldebug.c
+@@ -183,7 +183,7 @@ static void collectvalidlines (lua_State
+     int *lineinfo = f->l.p->lineinfo;
+     int i;
+     for (i=0; i<f->l.p->sizelineinfo; i++)
+-      setbvalue(luaH_setnum(L, t, lineinfo[i]), 1);
++      setbvalue(luaH_setint(L, t, lineinfo[i]), 1);
+     sethvalue(L, L->top, t); 
+   }
+   incr_top(L);
+@@ -566,7 +566,7 @@ static int isinstack (CallInfo *ci, cons
+ 
+ void luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
+   const char *name = NULL;
+-  const char *t = luaT_typenames[ttype(o)];
++  const char *t = luaT_typenames[ttype_ext(o)];
+   const char *kind = (isinstack(L->ci, o)) ?
+                          getobjname(L, L->ci, cast_int(o - L->base), &name) :
+                          NULL;
+@@ -594,8 +594,8 @@ void luaG_aritherror (lua_State *L, cons
+ 
+ 
+ int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
+-  const char *t1 = luaT_typenames[ttype(p1)];
+-  const char *t2 = luaT_typenames[ttype(p2)];
++  const char *t1 = luaT_typenames[ttype_ext(p1)];
++  const char *t2 = luaT_typenames[ttype_ext(p2)];
+   if (t1[2] == t2[2])
+     luaG_runerror(L, "attempt to compare two %s values", t1);
+   else
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -220,9 +220,9 @@ static StkId adjust_varargs (lua_State *
+     luaD_checkstack(L, p->maxstacksize);
+     htab = luaH_new(L, nvar, 1);  /* create `arg' table */
+     for (i=0; i<nvar; i++)  /* put extra arguments into `arg' table */
+-      setobj2n(L, luaH_setnum(L, htab, i+1), L->top - nvar + i);
++      setobj2n(L, luaH_setint(L, htab, i+1), L->top - nvar + i);
+     /* store counter in field `n' */
+-    setnvalue(luaH_setstr(L, htab, luaS_newliteral(L, "n")), cast_num(nvar));
++    setivalue(luaH_setstr(L, htab, luaS_newliteral(L, "n")), nvar);
+   }
+ #endif
+   /* move fixed parameters to final position */
+--- a/src/ldump.c
++++ b/src/ldump.c
+@@ -52,6 +52,11 @@ static void DumpNumber(lua_Number x, Dum
+  DumpVar(x,D);
+ }
+ 
++static void DumpInteger(lua_Integer x, DumpState* D)
++{
++ DumpVar(x,D);
++}
++
+ static void DumpVector(const void* b, int n, size_t size, DumpState* D)
+ {
+  DumpInt(n,D);
+@@ -93,8 +98,11 @@ static void DumpConstants(const Proto* f
+ 	DumpChar(bvalue(o),D);
+ 	break;
+    case LUA_TNUMBER:
+-	DumpNumber(nvalue(o),D);
++	DumpNumber(nvalue_fast(o),D);
+ 	break;
++   case LUA_TINT:
++	DumpInteger(ivalue(o),D);
++    break;
+    case LUA_TSTRING:
+ 	DumpString(rawtsvalue(o),D);
+ 	break;
+--- a/src/liolib.c
++++ b/src/liolib.c
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ctype.h>
+ 
+ #define liolib_c
+ #define LUA_LIB
+@@ -18,7 +19,8 @@
+ #include "lauxlib.h"
+ #include "lualib.h"
+ 
+-
++#include "lnum.h"
++#include "llex.h"
+ 
+ #define IO_INPUT	1
+ #define IO_OUTPUT	2
+@@ -269,6 +271,13 @@ static int io_lines (lua_State *L) {
+ ** =======================================================
+ */
+ 
++/*
++* Many problems if we intend the same 'n' format specifier (see 'file:read()')
++* to work for both FP and integer numbers, without losing their accuracy. So
++* we don't. 'n' reads numbers as floating points, 'i' as integers. Old code
++* remains valid, but won't provide full integer accuracy (this only matters
++* with float FP and/or 64-bit integers).
++*/
+ 
+ static int read_number (lua_State *L, FILE *f) {
+   lua_Number d;
+@@ -282,6 +291,43 @@ static int read_number (lua_State *L, FI
+   }
+ }
+ 
++static int read_integer (lua_State *L, FILE *f) {
++  lua_Integer i;
++  if (fscanf(f, LUA_INTEGER_SCAN, &i) == 1) {
++    lua_pushinteger(L, i);
++    return 1;
++  }
++  else return 0;  /* read fails */
++}
++
++#ifdef LNUM_COMPLEX
++static int read_complex (lua_State *L, FILE *f) {
++  /* NNN / NNNi / NNN+MMMi / NNN-MMMi */
++  lua_Number a,b;
++  if (fscanf(f, LUA_NUMBER_SCAN, &a) == 1) {
++    int c=fgetc(f);
++    switch(c) {
++        case 'i':
++            lua_pushcomplex(L, a*I);
++            return 1;
++        case '+':
++        case '-':
++            /* "i" is consumed if at the end; just 'NNN+MMM' will most likely
++             * behave as if "i" was there? (TBD: test)
++             */
++            if (fscanf(f, LUA_NUMBER_SCAN "i", &b) == 1) {
++                lua_pushcomplex(L, a+ (c=='+' ? b:-b)*I);
++                return 1;
++            }
++    }
++    ungetc( c,f );
++    lua_pushnumber(L,a);  /*real part only*/
++    return 1;
++  }
++  return 0;  /* read fails */
++}
++#endif
++
+ 
+ static int test_eof (lua_State *L, FILE *f) {
+   int c = getc(f);
+@@ -355,6 +401,14 @@ static int g_read (lua_State *L, FILE *f
+           case 'n':  /* number */
+             success = read_number(L, f);
+             break;
++          case 'i':  /* integer (full accuracy) */
++            success = read_integer(L, f);
++            break;
++#ifdef LNUM_COMPLEX
++          case 'c':  /* complex */
++            success = read_complex(L, f);
++            break;
++#endif
+           case 'l':  /* line */
+             success = read_line(L, f);
+             break;
+@@ -415,9 +469,10 @@ static int g_write (lua_State *L, FILE *
+   int status = 1;
+   for (; nargs--; arg++) {
+     if (lua_type(L, arg) == LUA_TNUMBER) {
+-      /* optimization: could be done exactly as for strings */
+-      status = status &&
+-          fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
++      if (lua_isinteger(L,arg))
++          status = status && fprintf(f, LUA_INTEGER_FMT, lua_tointeger(L, arg)) > 0;
++      else
++          status = status && fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
+     }
+     else {
+       size_t l;
+@@ -460,7 +515,7 @@ static int f_setvbuf (lua_State *L) {
+   static const char *const modenames[] = {"no", "full", "line", NULL};
+   FILE *f = tofile(L);
+   int op = luaL_checkoption(L, 2, NULL, modenames);
+-  lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
++  size_t sz = luaL_optint32(L, 3, LUAL_BUFFERSIZE);
+   int res = setvbuf(f, NULL, mode[op], sz);
+   return pushresult(L, res == 0, NULL);
+ }
+--- a/src/llex.c
++++ b/src/llex.c
+@@ -22,6 +22,7 @@
+ #include "lstring.h"
+ #include "ltable.h"
+ #include "lzio.h"
++#include "lnum.h"
+ 
+ 
+ 
+@@ -34,13 +35,17 @@
+ 
+ 
+ /* ORDER RESERVED */
+-const char *const luaX_tokens [] = {
++static const char *const luaX_tokens [] = {
+     "and", "break", "do", "else", "elseif",
+     "end", "false", "for", "function", "if",
+     "in", "local", "nil", "not", "or", "repeat",
+     "return", "then", "true", "until", "while",
+     "..", "...", "==", ">=", "<=", "~=",
+     "<number>", "<name>", "<string>", "<eof>",
++    "<integer>",
++#ifdef LNUM_COMPLEX
++    "<number2>",
++#endif
+     NULL
+ };
+ 
+@@ -90,7 +95,11 @@ static const char *txtToken (LexState *l
+   switch (token) {
+     case TK_NAME:
+     case TK_STRING:
++    case TK_INT:
+     case TK_NUMBER:
++#ifdef LNUM_COMPLEX
++    case TK_NUMBER2:
++#endif
+       save(ls, '\0');
+       return luaZ_buffer(ls->buff);
+     default:
+@@ -175,23 +184,27 @@ static void buffreplace (LexState *ls, c
+     if (p[n] == from) p[n] = to;
+ }
+ 
+-
+-static void trydecpoint (LexState *ls, SemInfo *seminfo) {
++/* TK_NUMBER (/ TK_NUMBER2) */
++static int trydecpoint (LexState *ls, SemInfo *seminfo) {
+   /* format error: try to update decimal point separator */
+   struct lconv *cv = localeconv();
+   char old = ls->decpoint;
++  int ret;
+   ls->decpoint = (cv ? cv->decimal_point[0] : '.');
+   buffreplace(ls, old, ls->decpoint);  /* try updated decimal separator */
+-  if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
++  ret= luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r, NULL);
++  if (!ret) {
+     /* format error with correct decimal point: no more options */
+     buffreplace(ls, ls->decpoint, '.');  /* undo change (for error message) */
+     luaX_lexerror(ls, "malformed number", TK_NUMBER);
+   }
++  return ret;
+ }
+ 
+ 
+-/* LUA_NUMBER */
+-static void read_numeral (LexState *ls, SemInfo *seminfo) {
++/* TK_NUMBER / TK_INT (/TK_NUMBER2) */
++static int read_numeral (LexState *ls, SemInfo *seminfo) {
++  int ret;
+   lua_assert(isdigit(ls->current));
+   do {
+     save_and_next(ls);
+@@ -202,8 +215,9 @@ static void read_numeral (LexState *ls, 
+     save_and_next(ls);
+   save(ls, '\0');
+   buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
+-  if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r))  /* format error? */
+-    trydecpoint(ls, seminfo); /* try to update decimal point separator */
++  ret= luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r, &seminfo->i );
++  if (!ret) return trydecpoint(ls, seminfo); /* try to update decimal point separator */
++  return ret;
+ }
+ 
+ 
+@@ -331,6 +345,7 @@ static void read_string (LexState *ls, i
+ }
+ 
+ 
++/* char / TK_* */
+ static int llex (LexState *ls, SemInfo *seminfo) {
+   luaZ_resetbuffer(ls->buff);
+   for (;;) {
+@@ -402,8 +417,7 @@ static int llex (LexState *ls, SemInfo *
+         }
+         else if (!isdigit(ls->current)) return '.';
+         else {
+-          read_numeral(ls, seminfo);
+-          return TK_NUMBER;
++          return read_numeral(ls, seminfo);
+         }
+       }
+       case EOZ: {
+@@ -416,8 +430,7 @@ static int llex (LexState *ls, SemInfo *
+           continue;
+         }
+         else if (isdigit(ls->current)) {
+-          read_numeral(ls, seminfo);
+-          return TK_NUMBER;
++          return read_numeral(ls, seminfo);
+         }
+         else if (isalpha(ls->current) || ls->current == '_') {
+           /* identifier or reserved word */
+--- a/src/llex.h
++++ b/src/llex.h
+@@ -29,19 +29,22 @@ enum RESERVED {
+   TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
+   /* other terminal symbols */
+   TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER,
+-  TK_NAME, TK_STRING, TK_EOS
++  TK_NAME, TK_STRING, TK_EOS, TK_INT
++#ifdef LNUM_COMPLEX
++  , TK_NUMBER2   /* imaginary constants: Ni */ 
++#endif
+ };
+ 
+ /* number of reserved words */
+ #define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
+ 
+ 
+-/* array with token `names' */
+-LUAI_DATA const char *const luaX_tokens [];
+-
+-
++/* SemInfo is a local data structure of 'llex.c', used for carrying a string
++ * or a number. A separate token (TK_*) will tell, how to interpret the data.
++ */      
+ typedef union {
+   lua_Number r;
++  lua_Integer i;
+   TString *ts;
+ } SemInfo;  /* semantics information */
+ 
+--- a/src/llimits.h
++++ b/src/llimits.h
+@@ -49,6 +49,7 @@ typedef LUAI_USER_ALIGNMENT_T L_Umaxalig
+ 
+ /* result of a `usual argument conversion' over lua_Number */
+ typedef LUAI_UACNUMBER l_uacNumber;
++typedef LUAI_UACINTEGER l_uacInteger;
+ 
+ 
+ /* internal assertions for in-house debugging */
+@@ -80,7 +81,6 @@ typedef LUAI_UACNUMBER l_uacNumber;
+ #define cast_int(i)	cast(int, (i))
+ 
+ 
+-
+ /*
+ ** type for virtual-machine instructions
+ ** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
+--- a/src/lmathlib.c
++++ b/src/lmathlib.c
+@@ -4,7 +4,6 @@
+ ** See Copyright Notice in lua.h
+ */
+ 
+-
+ #include <stdlib.h>
+ #include <math.h>
+ 
+@@ -16,113 +15,210 @@
+ #include "lauxlib.h"
+ #include "lualib.h"
+ 
++/* 'luai_vectpow()' as a replacement for 'cpow()'. Defined in the header; we
++ * don't intrude the code libs internal functions.
++ */
++#ifdef LNUM_COMPLEX
++# include "lnum.h"    
++#endif
+ 
+ #undef PI
+-#define PI (3.14159265358979323846)
+-#define RADIANS_PER_DEGREE (PI/180.0)
+-
++#ifdef LNUM_FLOAT
++# define PI (3.14159265358979323846F)
++#elif defined(M_PI)
++# define PI M_PI
++#else
++# define PI (3.14159265358979323846264338327950288)
++#endif
++#define RADIANS_PER_DEGREE (PI/180)
+ 
++#undef HUGE
++#ifdef LNUM_FLOAT
++# define HUGE HUGE_VALF
++#elif defined(LNUM_LDOUBLE)
++# define HUGE HUGE_VALL
++#else
++# define HUGE HUGE_VAL
++#endif
+ 
+ static int math_abs (lua_State *L) {
+-  lua_pushnumber(L, fabs(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushnumber(L, _LF(cabs) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(fabs) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_sin (lua_State *L) {
+-  lua_pushnumber(L, sin(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(csin) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(sin) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_sinh (lua_State *L) {
+-  lua_pushnumber(L, sinh(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(csinh) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(sinh) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_cos (lua_State *L) {
+-  lua_pushnumber(L, cos(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ccos) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(cos) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_cosh (lua_State *L) {
+-  lua_pushnumber(L, cosh(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ccosh) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(cosh) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_tan (lua_State *L) {
+-  lua_pushnumber(L, tan(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ctan) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(tan) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_tanh (lua_State *L) {
+-  lua_pushnumber(L, tanh(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ctanh) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(tanh) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_asin (lua_State *L) {
+-  lua_pushnumber(L, asin(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(casin) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(asin) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_acos (lua_State *L) {
+-  lua_pushnumber(L, acos(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(cacos) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(acos) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_atan (lua_State *L) {
+-  lua_pushnumber(L, atan(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(catan) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(atan) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_atan2 (lua_State *L) {
+-  lua_pushnumber(L, atan2(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++  /* scalars only */
++  lua_pushnumber(L, _LF(atan2) (luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
+   return 1;
+ }
+ 
+ static int math_ceil (lua_State *L) {
+-  lua_pushnumber(L, ceil(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_Complex v= luaL_checkcomplex(L, 1);
++  lua_pushcomplex(L, _LF(ceil) (_LF(creal)(v)) + _LF(ceil) (_LF(cimag)(v))*I);
++#else
++  lua_pushnumber(L, _LF(ceil) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_floor (lua_State *L) {
+-  lua_pushnumber(L, floor(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_Complex v= luaL_checkcomplex(L, 1);
++  lua_pushcomplex(L, _LF(floor) (_LF(creal)(v)) + _LF(floor) (_LF(cimag)(v))*I);
++#else
++  lua_pushnumber(L, _LF(floor) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+-static int math_fmod (lua_State *L) {
+-  lua_pushnumber(L, fmod(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++static int math_fmod (lua_State *L) {  
++  /* scalars only */
++  lua_pushnumber(L, _LF(fmod) (luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
+   return 1;
+ }
+ 
+ static int math_modf (lua_State *L) {
+-  double ip;
+-  double fp = modf(luaL_checknumber(L, 1), &ip);
++  /* scalars only */
++  lua_Number ip;
++  lua_Number fp = _LF(modf) (luaL_checknumber(L, 1), &ip);
+   lua_pushnumber(L, ip);
+   lua_pushnumber(L, fp);
+   return 2;
+ }
+ 
+ static int math_sqrt (lua_State *L) {
+-  lua_pushnumber(L, sqrt(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(csqrt) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(sqrt) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_pow (lua_State *L) {
+-  lua_pushnumber(L, pow(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++#ifdef LNUM_COMPLEX
++  /* C99 'cpow' gives somewhat inaccurate results (i.e. (-1)^2 = -1+1.2246467991474e-16i). 
++  * 'luai_vectpow' smoothens such, reusing it is the reason we need to #include "lnum.h".
++  */
++  lua_pushcomplex(L, luai_vectpow(luaL_checkcomplex(L,1), luaL_checkcomplex(L,2)));
++#else
++  lua_pushnumber(L, _LF(pow) (luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++#endif
+   return 1;
+ }
+ 
+ static int math_log (lua_State *L) {
+-  lua_pushnumber(L, log(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(clog) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(log) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_log10 (lua_State *L) {
+-  lua_pushnumber(L, log10(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  /* Not in standard <complex.h> , but easy to calculate: log_a(x) = log_b(x) / log_b(a) 
++  */
++  lua_pushcomplex(L, _LF(clog) (luaL_checkcomplex(L,1)) / _LF(log) (10));
++#else
++  lua_pushnumber(L, _LF(log10) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_exp (lua_State *L) {
+-  lua_pushnumber(L, exp(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(cexp) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(exp) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+@@ -138,19 +234,20 @@ static int math_rad (lua_State *L) {
+ 
+ static int math_frexp (lua_State *L) {
+   int e;
+-  lua_pushnumber(L, frexp(luaL_checknumber(L, 1), &e));
++  lua_pushnumber(L, _LF(frexp) (luaL_checknumber(L, 1), &e));
+   lua_pushinteger(L, e);
+   return 2;
+ }
+ 
+ static int math_ldexp (lua_State *L) {
+-  lua_pushnumber(L, ldexp(luaL_checknumber(L, 1), luaL_checkint(L, 2)));
++  lua_pushnumber(L, _LF(ldexp) (luaL_checknumber(L, 1), luaL_checkint(L, 2)));
+   return 1;
+ }
+ 
+ 
+ 
+ static int math_min (lua_State *L) {
++  /* scalars only */
+   int n = lua_gettop(L);  /* number of arguments */
+   lua_Number dmin = luaL_checknumber(L, 1);
+   int i;
+@@ -165,6 +262,7 @@ static int math_min (lua_State *L) {
+ 
+ 
+ static int math_max (lua_State *L) {
++  /* scalars only */
+   int n = lua_gettop(L);  /* number of arguments */
+   lua_Number dmax = luaL_checknumber(L, 1);
+   int i;
+@@ -182,25 +280,20 @@ static int math_random (lua_State *L) {
+   /* the `%' avoids the (rare) case of r==1, and is needed also because on
+      some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
+   lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
+-  switch (lua_gettop(L)) {  /* check number of arguments */
+-    case 0: {  /* no arguments */
+-      lua_pushnumber(L, r);  /* Number between 0 and 1 */
+-      break;
+-    }
+-    case 1: {  /* only upper limit */
+-      int u = luaL_checkint(L, 1);
+-      luaL_argcheck(L, 1<=u, 1, "interval is empty");
+-      lua_pushnumber(L, floor(r*u)+1);  /* int between 1 and `u' */
+-      break;
+-    }
+-    case 2: {  /* lower and upper limits */
+-      int l = luaL_checkint(L, 1);
+-      int u = luaL_checkint(L, 2);
+-      luaL_argcheck(L, l<=u, 2, "interval is empty");
+-      lua_pushnumber(L, floor(r*(u-l+1))+l);  /* int between `l' and `u' */
+-      break;
+-    }
+-    default: return luaL_error(L, "wrong number of arguments");
++  int n= lua_gettop(L);  /* number of arguments */
++  if (n==0) {	/* no arguments: range [0,1) */
++    lua_pushnumber(L, r);
++  } else if (n<=2) {	/* int range [1,u] or [l,u] */
++    int l= n==1 ? 1 : luaL_checkint(L, 1);
++    int u = luaL_checkint(L, n);
++    int tmp;
++    lua_Number d;
++    luaL_argcheck(L, l<=u, n, "interval is empty");
++    d= _LF(floor)(r*(u-l+1));
++    lua_number2int(tmp,d);
++    lua_pushinteger(L, l+tmp);
++  } else {
++    return luaL_error(L, "wrong number of arguments");
+   }
+   return 1;
+ }
+@@ -211,6 +304,66 @@ static int math_randomseed (lua_State *L
+   return 0;
+ }
+ 
++/* 
++* Lua 5.1 does not have acosh, asinh, atanh for scalars (not ANSI C)
++*/
++#if __STDC_VERSION__ >= 199901L
++static int math_acosh (lua_State *L) {
++# ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(cacosh) (luaL_checkcomplex(L,1)));
++# else
++  lua_pushnumber(L, _LF(acosh) (luaL_checknumber(L,1)));
++# endif
++  return 1;
++}
++static int math_asinh (lua_State *L) {
++# ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(casinh) (luaL_checkcomplex(L,1)));
++# else
++  lua_pushnumber(L, _LF(asinh) (luaL_checknumber(L,1)));
++# endif
++  return 1;
++}
++static int math_atanh (lua_State *L) {
++# ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(catanh) (luaL_checkcomplex(L,1)));
++# else
++  lua_pushnumber(L, _LF(atanh) (luaL_checknumber(L,1)));
++# endif
++  return 1;
++}
++#endif
++
++/* 
++ * C99 complex functions, not covered above.
++*/
++#ifdef LNUM_COMPLEX
++static int math_arg (lua_State *L) {
++  lua_pushnumber(L, _LF(carg) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_imag (lua_State *L) {
++  lua_pushnumber(L, _LF(cimag) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_real (lua_State *L) {
++  lua_pushnumber(L, _LF(creal) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_conj (lua_State *L) {
++  lua_pushcomplex(L, _LF(conj) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_proj (lua_State *L) {
++  lua_pushcomplex(L, _LF(cproj) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++#endif
++
+ 
+ static const luaL_Reg mathlib[] = {
+   {"abs",   math_abs},
+@@ -241,6 +394,18 @@ static const luaL_Reg mathlib[] = {
+   {"sqrt",  math_sqrt},
+   {"tanh",   math_tanh},
+   {"tan",   math_tan},
++#if __STDC_VERSION__ >= 199901L
++  {"acosh",  math_acosh},
++  {"asinh",  math_asinh},
++  {"atanh",  math_atanh},
++#endif
++#ifdef LNUM_COMPLEX
++  {"arg",   math_arg},
++  {"imag",  math_imag},
++  {"real",  math_real},
++  {"conj",  math_conj},
++  {"proj",  math_proj},
++#endif
+   {NULL, NULL}
+ };
+ 
+@@ -252,8 +417,10 @@ LUALIB_API int luaopen_math (lua_State *
+   luaL_register(L, LUA_MATHLIBNAME, mathlib);
+   lua_pushnumber(L, PI);
+   lua_setfield(L, -2, "pi");
+-  lua_pushnumber(L, HUGE_VAL);
++  lua_pushnumber(L, HUGE);
+   lua_setfield(L, -2, "huge");
++  lua_pushinteger(L, LUA_INTEGER_MAX );
++  lua_setfield(L, -2, "hugeint");
+ #if defined(LUA_COMPAT_MOD)
+   lua_getfield(L, -1, "fmod");
+   lua_setfield(L, -2, "mod");
+--- /dev/null
++++ b/src/lnum.c
+@@ -0,0 +1,312 @@
++/*
++** $Id: lnum.c,v ... $
++** Internal number model
++** See Copyright Notice in lua.h
++*/
++
++#include <stdlib.h>
++#include <math.h>
++#include <ctype.h>
++#include <string.h>
++#include <stdio.h>
++#include <errno.h>
++
++#define lnum_c
++#define LUA_CORE
++
++#include "lua.h"
++#include "llex.h"
++#include "lnum.h"
++
++/*
++** lua_real2str converts a (non-complex) number to a string.
++** lua_str2real converts a string to a (non-complex) number.
++*/
++#define lua_real2str(s,n)  sprintf((s), LUA_NUMBER_FMT, (n))
++
++/*
++* Note: Only 'strtod()' is part of ANSI C; others are C99 and
++* may need '--std=c99' compiler setting (at least on Ubuntu 7.10).
++* 
++* Visual C++ 2008 Express does not have 'strtof()', nor 'strtold()'.
++* References to '_strtold()' exist but don't compile. It seems best
++* to leave Windows users with DOUBLE only (or compile with MinGW).
++*
++* In practise, using '(long double)strtod' is a risky thing, since
++* it will cause accuracy loss in reading in numbers, and such losses
++* will pile up in later processing. Get a real 'strtold()' or don't
++* use that mode at all.
++*/
++#ifdef LNUM_DOUBLE
++# define lua_str2real	strtod
++#elif defined(LNUM_FLOAT)
++# define lua_str2real	strtof
++#elif defined(LNUM_LDOUBLE)
++# define lua_str2real	strtold
++#endif
++
++#define lua_integer2str(s,v) sprintf((s), LUA_INTEGER_FMT, (v))
++
++/* 's' is expected to be LUAI_MAXNUMBER2STR long (enough for any number)
++*/
++void luaO_num2buf( char *s, const TValue *o )
++{
++  lua_Number n;
++  lua_assert( ttisnumber(o) );
++
++  /* Reason to handle integers differently is not only speed, but accuracy as
++   * well. We want to make any integer tostring() without roundings, at all.
++   */
++  if (ttisint(o)) {
++    lua_integer2str( s, ivalue(o) );
++    return;
++  }
++  n= nvalue_fast(o);
++  lua_real2str(s, n);
++
++#ifdef LNUM_COMPLEX
++  lua_Number n2= nvalue_img_fast(o);
++  if (n2!=0) {   /* Postfix with +-Ni */
++      int re0= (n == 0);
++      char *s2= re0 ? s : strchr(s,'\0'); 
++      if ((!re0) && (n2>0)) *s2++= '+';
++      lua_real2str( s2, n2 );
++      strcat(s2,"i");
++  }
++#endif
++}
++
++/*
++* If a LUA_TNUMBER has integer value, give it.
++*/
++int /*bool*/ tt_integer_valued( const TValue *o, lua_Integer *ref ) {
++  lua_Number d;
++  lua_Integer i;
++
++  lua_assert( ttype(o)==LUA_TNUMBER );
++  lua_assert( ref );
++#ifdef LNUM_COMPLEX
++  if (nvalue_img_fast(o)!=0) return 0;
++#endif
++  d= nvalue_fast(o);
++  lua_number2integer(i, d);
++  if (cast_num(i) == d) {
++    *ref= i; return 1;
++  }
++  return 0;
++}
++
++/* 
++ * Lua 5.1.3 (using 'strtod()') allows 0x+hex but not 0+octal. This is good,
++ * and we should NOT use 'autobase' 0 with 'strtoul[l]()' for this reason.
++ *
++ * Lua 5.1.3 allows '0x...' numbers to overflow and lose precision; this is not
++ * good. On Visual C++ 2008, 'strtod()' does not even take them in. Better to
++ * require hex values to fit 'lua_Integer' or give an error that they don't?
++ *
++ * Full hex range (0 .. 0xff..ff) is stored as integers, not to lose any bits.
++ * Numerical value of 0xff..ff will be -1, if used in calculations.
++ * 
++ * Returns: TK_INT for a valid integer, '*endptr_ref' updated
++ *          TK_NUMBER for seemingly numeric, to be parsed as floating point
++ *          0 for bad characters, not a number (or '0x' out of range)
++ */
++static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) {
++  char *endptr;
++  /* 'v' gets ULONG_MAX on possible overflow (which is > LUA_INTEGER_MAX);
++   * we don't have to check 'errno' here.
++   */
++  unsigned LUA_INTEGER v= lua_str2ul(s, &endptr, 10);
++  if (endptr == s) return 0;  /* nothing numeric */
++  if (v==0 && *endptr=='x') {
++    errno= 0;   /* needs to be set, 'strtoul[l]' does not clear it */
++    v= lua_str2ul(endptr+1, &endptr, 16);  /* retry as hex, unsigned range */
++    if (errno==ERANGE) {   /* clamped to 0xff..ff */
++#if (defined(LNUM_INT32) && !defined(LNUM_FLOAT)) || defined(LNUM_LDOUBLE)
++      return TK_NUMBER; /* Allow to be read as floating point (has more integer range) */
++#else
++      return 0;  /* Reject the number */
++#endif
++    }
++  } else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) {
++    return TK_NUMBER;	/* not in signed range, or has '.', 'e' etc. trailing */
++  }
++  *res= (lua_Integer)v;
++  *endptr_ref= endptr;
++  return TK_INT;
++}
++
++/* 0 / TK_NUMBER / TK_INT (/ TK_NUMBER2) */
++int luaO_str2d (const char *s, lua_Number *res_n, lua_Integer *res_i) {
++  char *endptr;
++  int ret= TK_NUMBER;
++  /* Check integers first, if caller is allowing. 
++   * If 'res2'==NULL, they're only looking for floating point. 
++   */
++  if (res_i) {
++    ret= luaO_str2i(s,res_i,&endptr);
++    if (ret==0) return 0;
++  }
++  if (ret==TK_NUMBER) {
++    lua_assert(res_n);
++    /* Note: Visual C++ 2008 Express 'strtod()' does not read in "0x..."
++     *       numbers; it will read '0' and spit 'x' as endptr.
++     *       This means hex constants not fitting in 'lua_Integer' won't 
++     *       be read in at all. What to do?
++     */
++    *res_n = lua_str2real(s, &endptr);
++    if (endptr == s) return 0;  /* conversion failed */
++    /* Visual C++ 2008 'strtod()' does not allow "0x..." input. */
++#if defined(_MSC_VER) && !defined(LNUM_FLOAT) && !defined(LNUM_INT64)
++    if (*res_n==0 && *endptr=='x') {
++      /* Hex constant too big for 'lua_Integer' but that could fit in 'lua_Number'
++       * integer bits 
++       */
++      unsigned __int64 v= _strtoui64( s, &endptr, 16 );
++      /* We just let > 64 bit values be clamped to _UI64_MAX (MSDN does not say 'errno'==ERANGE would be set) */
++      *res_n= cast_num(v);
++      if (*res_n != v) return 0;    /* Would have lost accuracy */
++    }
++#endif
++#ifdef LNUM_COMPLEX
++    if (*endptr == 'i') { endptr++; ret= TK_NUMBER2; }
++#endif
++  }
++  if (*endptr) {
++    while (isspace(cast(unsigned char, *endptr))) endptr++;
++    if (*endptr) return 0;  /* invalid trail */
++  }
++  return ret;
++}
++
++
++/* Functions for finding out, when integer operations remain in range
++ * (and doing them).
++ */
++int try_addint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  lua_Integer v= ib+ic; /* may overflow */
++  if (ib>0 && ic>0)      { if (v < 0) return 0; /*overflow, use floats*/ }
++  else if (ib<0 && ic<0) { if (v >= 0) return 0; }
++  *r= v;
++  return 1;
++}
++
++int try_subint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  lua_Integer v= ib-ic; /* may overflow */
++  if (ib>=0 && ic<0)     { if (v < 0) return 0; /*overflow, use floats*/ }
++  else if (ib<0 && ic>0) { if (v >= 0) return 0; }
++  *r= v;
++  return 1;
++}
++
++int try_mulint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  if (ib!=LUA_INTEGER_MIN && ic!=LUA_INTEGER_MIN) {
++    lua_Integer b= luai_abs(ib), c= luai_abs(ic);
++    if ( (ib==0) || (LUA_INTEGER_MAX/b >= c) ) {
++      *r= ib*ic;  /* no overflow */
++      return 1;
++    }
++  } else if (ib==0 || ic==0) {
++    *r= 0; return 1;
++  }
++
++  /* Result can be LUA_INTEGER_MIN; if it is, calculating it using floating 
++   * point will not cause accuracy loss.
++   */
++  if ( luai_nummul( cast_num(ib), cast_num(ic) ) == LUA_INTEGER_MIN ) {
++    *r= LUA_INTEGER_MIN;
++    return 1;
++  }
++  return 0;
++}
++
++int try_divint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  /* N/0: leave to float side, to give an error
++  */
++  if (ic==0) return 0;
++
++  /* N/LUA_INTEGER_MIN: always non-integer results, or 0 or +1
++  */
++  if (ic==LUA_INTEGER_MIN) {
++    if (ib==LUA_INTEGER_MIN) { *r=1; return 1; }
++    if (ib==0) { *r=0; return 1; }
++
++  /* LUA_INTEGER_MIN (-2^31|63)/N: calculate using float side (either the division 
++   *    causes non-integer results, or there is no accuracy loss in int->fp->int
++   *    conversions (N=2,4,8,..,256 and N=2^30,2^29,..2^23).
++   */
++  } else if (ib==LUA_INTEGER_MIN) {
++    lua_Number d= luai_numdiv( cast_num(LUA_INTEGER_MIN), cast_num(ic) );
++    lua_Integer i; lua_number2integer(i,d);
++    if (cast_num(i)==d) { *r= i; return 1; }
++  
++  } else {
++    /* Note: We _can_ use ANSI C mod here, even on negative values, since
++     *       we only test for == 0 (the sign would be implementation dependent).
++     */
++     if (ib%ic == 0) { *r= ib/ic; return 1; }
++  }
++
++  return 0;
++}
++
++int try_modint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  if (ic!=0) {
++    /* ANSI C can be trusted when b%c==0, or when values are non-negative. 
++     * b - (floor(b/c) * c)
++     *   -->
++     * + +: b - (b/c) * c (b % c can be used)
++     * - -: b - (b/c) * c (b % c could work, but not defined by ANSI C)
++     * 0 -: b - (b/c) * c (=0, b % c could work, but not defined by ANSI C)
++     * - +: b - (b/c-1) * c (when b!=-c)
++     * + -: b - (b/c-1) * c (when b!=-c)
++     *
++     * o MIN%MIN ends up 0, via overflow in calcs but that does not matter.
++     * o MIN%MAX ends up MAX-1 (and other such numbers), also after overflow,
++     *   but that does not matter, results do.
++     */
++    lua_Integer v= ib % ic;
++    if ( v!=0 && (ib<0 || ic<0) ) {
++      v= ib - ((ib/ic) - ((ib<=0 && ic<0) ? 0:1)) * ic;
++    }      
++    /* Result should always have same sign as 2nd argument. (PIL2) */
++    lua_assert( (v<0) ? (ic<0) : (v>0) ? (ic>0) : 1 );
++    *r= v;
++    return 1;
++  }
++  return 0;  /* let float side return NaN */
++}
++
++int try_powint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++
++    /* In FLOAT/INT32 or FLOAT|DOUBLE/INT64 modes, calculating integer powers 
++     * via FP realm may lose accuracy (i.e. 7^11 = 1977326743, which fits int32
++     * but not 23-bit float mantissa). 
++     *
++     * The current solution is dumb, but it works and uses little code. Use of
++     * integer powers is not anticipated to be very frequent (apart from 2^x,
++     * which is separately optimized).
++     */
++  if (ib==0) *r=0;
++  else if (ic<0) return 0;  /* FP realm */
++  else if (ib==2 && ic < (int)sizeof(lua_Integer)*8-1) *r= ((lua_Integer)1)<<ic;   /* 1,2,4,...2^30 | 2^62 optimization */
++  else if (ic==0) *r=1;
++  else if (luai_abs(ib)==1) *r= (ic%2) ? ib:1;
++  else {
++    lua_Integer x= ib;
++    while( --ic ) {
++      if (!try_mulint( &x, x, ib ))
++        return 0; /* FP realm */
++    }
++    *r= x;
++  }
++  return 1;
++}
++
++int try_unmint( lua_Integer *r, lua_Integer ib ) {
++  /* Negating LUA_INTEGER_MIN leaves the range. */
++  if ( ib != LUA_INTEGER_MIN )  
++    { *r= -ib; return 1; }
++  return 0;
++}
++
+--- /dev/null
++++ b/src/lnum.h
+@@ -0,0 +1,116 @@
++/*
++** $Id: lnum.h,v ... $
++** Internal Number model
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lnum_h
++#define lnum_h
++
++#include <math.h>
++
++#include "lobject.h"
++
++/*
++** The luai_num* macros define the primitive operations over 'lua_Number's
++** (not 'lua_Integer's, not 'lua_Complex').
++*/
++#define luai_numadd(a,b)	((a)+(b))
++#define luai_numsub(a,b)	((a)-(b))
++#define luai_nummul(a,b)	((a)*(b))
++#define luai_numdiv(a,b)	((a)/(b))
++#define luai_nummod(a,b)	((a) - _LF(floor)((a)/(b))*(b))
++#define luai_numpow(a,b)	(_LF(pow)(a,b))
++#define luai_numunm(a)		(-(a))
++#define luai_numeq(a,b)	    ((a)==(b))
++#define luai_numlt(a,b)	    ((a)<(b))
++#define luai_numle(a,b)	    ((a)<=(b))
++#define luai_numisnan(a)	(!luai_numeq((a), (a)))
++
++int try_addint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_subint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_mulint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_divint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_modint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_powint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_unmint( lua_Integer *r, lua_Integer ib );
++
++#ifdef LNUM_COMPLEX
++  static inline lua_Complex luai_vectunm( lua_Complex a ) { return -a; }
++  static inline lua_Complex luai_vectadd( lua_Complex a, lua_Complex b ) { return a+b; }
++  static inline lua_Complex luai_vectsub( lua_Complex a, lua_Complex b ) { return a-b; }
++  static inline lua_Complex luai_vectmul( lua_Complex a, lua_Complex b ) { return a*b; }
++  static inline lua_Complex luai_vectdiv( lua_Complex a, lua_Complex b ) { return a/b; }
++
++/* 
++ * C99 does not provide modulus for complex numbers. It most likely is not
++ * meaningful at all.
++ */
++
++/* 
++ * Complex power
++ *
++ * C99 'cpow' gives inaccurate results for many common cases s.a. (1i)^2 -> 
++ * -1+1.2246467991474e-16i (OS X 10.4, gcc 4.0.1 build 5367)
++ * 
++ * [(a+bi)^(c+di)] = (r^c) * exp(-d*t) * cos(c*t + d*ln(r)) +
++ *                 = (r^c) * exp(-d*t) * sin(c*t + d*ln(r)) *i
++ * r = sqrt(a^2+b^2), t = arctan( b/a )
++ * 
++ * Reference: <http://home.att.net/~srschmitt/complexnumbers.html>
++ * Could also be calculated using: x^y = exp(ln(x)*y)
++ *
++ * Note: Defined here (and not in .c) so 'lmathlib.c' can share the 
++ *       implementation.
++ */
++  static inline
++  lua_Complex luai_vectpow( lua_Complex a, lua_Complex b )
++  {
++# if 1
++    lua_Number ar= _LF(creal)(a), ai= _LF(cimag)(a);
++    lua_Number br= _LF(creal)(b), bi= _LF(cimag)(b);
++    
++    if (ai==0 && bi==0) {     /* a^c (real) */
++        return luai_numpow( ar, br );
++    } 
++
++    int br_int= (int)br;
++    
++    if ( ai!=0 && bi==0 && br_int==br && br_int!=0 && br_int!=INT_MIN ) { 
++        /* (a+bi)^N, N = { +-1,+-2, ... +-INT_MAX } 
++        */
++        lua_Number k= luai_numpow( _LF(sqrt) (ar*ar + ai*ai), br );
++        lua_Number cos_z, sin_z;
++
++        /* Situation depends upon c (N) in the following manner:
++         * 
++         * N%4==0                                => cos(c*t)=1, sin(c*t)=0
++         * (N*sign(b))%4==1 or (N*sign(b))%4==-3 => cos(c*t)=0, sin(c*t)=1
++         * N%4==2 or N%4==-2                     => cos(c*t)=-1, sin(c*t)=0
++         * (N*sign(b))%4==-1 or (N*sign(b))%4==3 => cos(c*t)=0, sin(c*t)=-1
++         */
++      int br_int_abs = br_int<0 ? -br_int:br_int;
++      
++      switch( (br_int_abs%4) * (br_int<0 ? -1:1) * (ai<0 ? -1:1) ) {
++        case 0:             cos_z=1, sin_z=0; break;
++        case 2: case -2:    cos_z=-1, sin_z=0; break;
++        case 1: case -3:    cos_z=0, sin_z=1; break;
++        case 3: case -1:    cos_z=0, sin_z=-1; break;
++        default:            lua_assert(0); return 0;
++      }
++      return k*cos_z + (k*sin_z)*I;
++    }
++# endif
++    return _LF(cpow) ( a, b );
++  }
++#endif
++
++LUAI_FUNC int luaO_str2d (const char *s, lua_Number *res1, lua_Integer *res2);
++LUAI_FUNC void luaO_num2buf( char *s, const TValue *o );
++
++LUAI_FUNC int /*bool*/ tt_integer_valued( const TValue *o, lua_Integer *ref );
++
++#define luai_normalize(o) \
++{ lua_Integer _i; if (tt_integer_valued(o,&_i)) setivalue(o,_i); }
++
++#endif
+--- /dev/null
++++ b/src/lnum_config.h
+@@ -0,0 +1,221 @@
++/*
++** $Id: lnum_config.h,v ... $
++** Internal Number model
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lnum_config_h
++#define lnum_config_h
++
++/*
++** Default number modes
++*/
++#if (!defined LNUM_DOUBLE) && (!defined LNUM_FLOAT) && (!defined LNUM_LDOUBLE)
++# define LNUM_FLOAT
++#endif
++#if (!defined LNUM_INT16) && (!defined LNUM_INT32) && (!defined LNUM_INT64)
++# define LNUM_INT32
++#endif
++
++/*
++** Require C99 mode for COMPLEX, FLOAT and LDOUBLE (only DOUBLE is ANSI C).
++*/
++#if defined(LNUM_COMPLEX) && (__STDC_VERSION__ < 199901L)
++# error "Need C99 for complex (use '--std=c99' or similar)"
++#elif defined(LNUM_LDOUBLE) && (__STDC_VERSION__ < 199901L) && !defined(_MSC_VER)
++# error "Need C99 for 'long double' (use '--std=c99' or similar)"
++#elif defined(LNUM_FLOAT) && (__STDC_VERSION__ < 199901L)
++/* LNUM_FLOAT not supported on Windows */
++# error "Need C99 for 'float' (use '--std=c99' or similar)"
++#endif
++ 
++/*
++** Number mode identifier to accompany the version string.
++*/
++#ifdef LNUM_COMPLEX
++# define _LNUM1 "complex "
++#else
++# define _LNUM1 ""
++#endif
++#ifdef LNUM_DOUBLE
++# define _LNUM2 "double"
++#elif defined(LNUM_FLOAT)
++# define _LNUM2 "float"
++#elif defined(LNUM_LDOUBLE)
++# define _LNUM2 "ldouble"
++#endif
++#ifdef LNUM_INT32
++# define _LNUM3 "int32"
++#elif defined(LNUM_INT64)
++# define _LNUM3 "int64"
++#elif defined(LNUM_INT16)
++# define _LNUM3 "int16"
++#endif
++#define LUA_LNUM _LNUM1 _LNUM2 " " _LNUM3
++
++/*
++** LUA_NUMBER is the type of floating point number in Lua
++** LUA_NUMBER_SCAN is the format for reading numbers.
++** LUA_NUMBER_FMT is the format for writing numbers.
++*/
++#ifdef LNUM_FLOAT
++# define LUA_NUMBER         float
++# define LUA_NUMBER_SCAN    "%f"
++# define LUA_NUMBER_FMT     "%g"  
++#elif (defined LNUM_DOUBLE)
++# define LUA_NUMBER	        double
++# define LUA_NUMBER_SCAN    "%lf"
++# define LUA_NUMBER_FMT     "%.14g"
++#elif (defined LNUM_LDOUBLE)
++# define LUA_NUMBER         long double
++# define LUA_NUMBER_SCAN    "%Lg"
++# define LUA_NUMBER_FMT     "%.20Lg"
++#endif
++
++
++/* 
++** LUAI_MAXNUMBER2STR: size of a buffer fitting any number->string result.
++**
++**  double:  24 (sign, x.xxxxxxxxxxxxxxe+nnnn, and \0)
++**  int64:   21 (19 digits, sign, and \0)
++**  long double: 43 for 128-bit (sign, x.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxe+nnnn, and \0)
++**           30 for 80-bit (sign, x.xxxxxxxxxxxxxxxxxxxxe+nnnn, and \0)
++*/
++#ifdef LNUM_LDOUBLE
++# define _LUAI_MN2S 44
++#else
++# define _LUAI_MN2S 24
++#endif
++
++#ifdef LNUM_COMPLEX
++# define LUAI_MAXNUMBER2STR (2*_LUAI_MN2S)
++#else
++# define LUAI_MAXNUMBER2STR _LUAI_MN2S
++#endif
++
++/*
++** LUA_INTEGER is the integer type used by lua_pushinteger/lua_tointeger/lua_isinteger.
++** LUA_INTEGER_SCAN is the format for reading integers
++** LUA_INTEGER_FMT is the format for writing integers
++**
++** Note: Visual C++ 2005 does not have 'strtoull()', use '_strtoui64()' instead.
++*/
++#ifdef LNUM_INT32
++# if LUAI_BITSINT > 16
++#  define LUA_INTEGER   int
++#  define LUA_INTEGER_SCAN "%d"
++#  define LUA_INTEGER_FMT "%d"
++# else
++/* Note: 'LUA_INTEGER' being 'ptrdiff_t' (as in Lua 5.1) causes problems with
++ *       'printf()' operations. Also 'unsigned ptrdiff_t' is invalid.
++ */
++#  define LUA_INTEGER   long
++#  define LUA_INTEGER_SCAN "%ld"
++#  define LUA_INTEGER_FMT "%ld"
++# endif
++# define LUA_INTEGER_MAX 0x7FFFFFFF             /* 2^31-1 */
++/* */
++#elif defined(LNUM_INT64)
++# define LUA_INTEGER	long long
++# ifdef _MSC_VER
++#  define lua_str2ul    _strtoui64
++# else
++#  define lua_str2ul    strtoull
++# endif
++# define LUA_INTEGER_SCAN "%lld"
++# define LUA_INTEGER_FMT "%lld"
++# define LUA_INTEGER_MAX 0x7fffffffffffffffLL       /* 2^63-1 */ 
++# define LUA_INTEGER_MIN (-LUA_INTEGER_MAX - 1LL)   /* -2^63 */
++/* */
++#elif defined(LNUM_INT16)
++# if LUAI_BITSINT > 16
++#  define LUA_INTEGER    short
++#  define LUA_INTEGER_SCAN "%hd"
++#  define LUA_INTEGER_FMT "%hd"
++# else
++#  define LUA_INTEGER    int
++#  define LUA_INTEGER_SCAN "%d"
++#  define LUA_INTEGER_FMT "%d"
++# endif
++# define LUA_INTEGER_MAX 0x7FFF             /* 2^16-1 */
++#endif
++
++#ifndef lua_str2ul
++# define lua_str2ul (unsigned LUA_INTEGER)strtoul
++#endif
++#ifndef LUA_INTEGER_MIN
++# define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1)  /* -2^16|32 */
++#endif
++
++/*
++@@ lua_number2int is a macro to convert lua_Number to int.
++@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
++** CHANGE them if you know a faster way to convert a lua_Number to
++** int (with any rounding method and without throwing errors) in your
++** system. In Pentium machines, a naive typecast from double to int
++** in C is extremely slow, so any alternative is worth trying.
++*/
++
++/* On a Pentium, resort to a trick */
++#if defined(LNUM_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
++    (defined(__i386) || defined (_M_IX86) || defined(__i386__))
++
++/* On a Microsoft compiler, use assembler */
++# if defined(_MSC_VER)
++#  define lua_number2int(i,d)   __asm fld d   __asm fistp i
++# else
++
++/* the next trick should work on any Pentium, but sometimes clashes
++   with a DirectX idiosyncrasy */
++union luai_Cast { double l_d; long l_l; };
++#  define lua_number2int(i,d) \
++  { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
++# endif
++
++# ifndef LNUM_INT64
++#  define lua_number2integer    lua_number2int
++# endif
++
++/* this option always works, but may be slow */
++#else
++# define lua_number2int(i,d)        ((i)=(int)(d))
++#endif
++
++/* Note: Some compilers (OS X gcc 4.0?) may choke on double->long long conversion 
++ *       since it can lose precision. Others do require 'long long' there.  
++ */
++#ifndef lua_number2integer
++# define lua_number2integer(i,d)    ((i)=(lua_Integer)(d))
++#endif
++
++/*
++** 'luai_abs()' to give absolute value of 'lua_Integer'
++*/
++#ifdef LNUM_INT32
++# define luai_abs abs
++#elif defined(LNUM_INT64) && (__STDC_VERSION__ >= 199901L)
++# define luai_abs llabs
++#else
++# define luai_abs(v) ((v) >= 0 ? (v) : -(v))
++#endif
++
++/*
++** LUAI_UACNUMBER is the result of an 'usual argument conversion' over a number.
++** LUAI_UACINTEGER the same, over an integer.
++*/
++#define LUAI_UACNUMBER	double
++#define LUAI_UACINTEGER long
++
++/* ANSI C only has math funcs for 'double. C99 required for float and long double
++ * variants.
++ */
++#ifdef LNUM_DOUBLE
++# define _LF(name) name
++#elif defined(LNUM_FLOAT)
++# define _LF(name) name ## f
++#elif defined(LNUM_LDOUBLE)
++# define _LF(name) name ## l
++#endif
++
++#endif
++
+--- a/src/lobject.c
++++ b/src/lobject.c
+@@ -21,7 +21,8 @@
+ #include "lstate.h"
+ #include "lstring.h"
+ #include "lvm.h"
+-
++#include "llex.h"
++#include "lnum.h"
+ 
+ 
+ const TValue luaO_nilobject_ = {{NULL}, LUA_TNIL};
+@@ -70,12 +71,31 @@ int luaO_log2 (unsigned int x) {
+ 
+ 
+ int luaO_rawequalObj (const TValue *t1, const TValue *t2) {
+-  if (ttype(t1) != ttype(t2)) return 0;
++  if (!ttype_ext_same(t1,t2)) return 0;
+   else switch (ttype(t1)) {
+     case LUA_TNIL:
+       return 1;
++    case LUA_TINT:
++      if (ttype(t2)==LUA_TINT)
++        return ivalue(t1) == ivalue(t2);
++      else {  /* t1:int, t2:num */
++#ifdef LNUM_COMPLEX
++        if (nvalue_img_fast(t2) != 0) return 0;
++#endif
++        /* Avoid doing accuracy losing cast, if possible. */
++        lua_Integer tmp;
++        if (tt_integer_valued(t2,&tmp)) 
++          return ivalue(t1) == tmp;
++        else
++          return luai_numeq( cast_num(ivalue(t1)), nvalue_fast(t2) );
++        }
+     case LUA_TNUMBER:
+-      return luai_numeq(nvalue(t1), nvalue(t2));
++        if (ttype(t2)==LUA_TINT)
++          return luaO_rawequalObj(t2, t1);  /* swap LUA_TINT to left */
++#ifdef LNUM_COMPLEX
++        if (!luai_numeq(nvalue_img_fast(t1), nvalue_img_fast(t2))) return 0;
++#endif
++        return luai_numeq(nvalue_fast(t1), nvalue_fast(t2));
+     case LUA_TBOOLEAN:
+       return bvalue(t1) == bvalue(t2);  /* boolean true must be 1 !! */
+     case LUA_TLIGHTUSERDATA:
+@@ -86,21 +106,6 @@ int luaO_rawequalObj (const TValue *t1, 
+   }
+ }
+ 
+-
+-int luaO_str2d (const char *s, lua_Number *result) {
+-  char *endptr;
+-  *result = lua_str2number(s, &endptr);
+-  if (endptr == s) return 0;  /* conversion failed */
+-  if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
+-    *result = cast_num(strtoul(s, &endptr, 16));
+-  if (*endptr == '\0') return 1;  /* most common case */
+-  while (isspace(cast(unsigned char, *endptr))) endptr++;
+-  if (*endptr != '\0') return 0;  /* invalid trailing characters? */
+-  return 1;
+-}
+-
+-
+-
+ static void pushstr (lua_State *L, const char *str) {
+   setsvalue2s(L, L->top, luaS_new(L, str));
+   incr_top(L);
+@@ -131,7 +136,11 @@ const char *luaO_pushvfstring (lua_State
+         break;
+       }
+       case 'd': {
+-        setnvalue(L->top, cast_num(va_arg(argp, int)));
++        /* This is tricky for 64-bit integers; maybe they even cannot be
++         * supported on all compilers; depends on the conversions applied to
++         * variable argument lists. TBD: test!
++         */
++        setivalue(L->top, (lua_Integer) va_arg(argp, l_uacInteger));
+         incr_top(L);
+         break;
+       }
+@@ -212,3 +221,4 @@ void luaO_chunkid (char *out, const char
+     }
+   }
+ }
++
+--- a/src/lobject.h
++++ b/src/lobject.h
+@@ -17,7 +17,11 @@
+ 
+ 
+ /* tags for values visible from Lua */
+-#define LAST_TAG	LUA_TTHREAD
++#if LUA_TINT > LUA_TTHREAD
++# define LAST_TAG   LUA_TINT
++#else
++# define LAST_TAG	LUA_TTHREAD
++#endif
+ 
+ #define NUM_TAGS	(LAST_TAG+1)
+ 
+@@ -59,7 +63,12 @@ typedef struct GCheader {
+ typedef union {
+   GCObject *gc;
+   void *p;
++#ifdef LNUM_COMPLEX
++  lua_Complex n;
++#else
+   lua_Number n;
++#endif
++  lua_Integer i;
+   int b;
+ } Value;
+ 
+@@ -77,7 +86,11 @@ typedef struct lua_TValue {
+ 
+ /* Macros to test type */
+ #define ttisnil(o)	(ttype(o) == LUA_TNIL)
+-#define ttisnumber(o)	(ttype(o) == LUA_TNUMBER)
++#define ttisint(o) (ttype(o) == LUA_TINT)
++#define ttisnumber(o) ((ttype(o) == LUA_TINT) || (ttype(o) == LUA_TNUMBER))
++#ifdef LNUM_COMPLEX
++# define ttiscomplex(o) ((ttype(o) == LUA_TNUMBER) && (nvalue_img_fast(o)!=0))
++#endif
+ #define ttisstring(o)	(ttype(o) == LUA_TSTRING)
+ #define ttistable(o)	(ttype(o) == LUA_TTABLE)
+ #define ttisfunction(o)	(ttype(o) == LUA_TFUNCTION)
+@@ -90,7 +103,25 @@ typedef struct lua_TValue {
+ #define ttype(o)	((o)->tt)
+ #define gcvalue(o)	check_exp(iscollectable(o), (o)->value.gc)
+ #define pvalue(o)	check_exp(ttislightuserdata(o), (o)->value.p)
+-#define nvalue(o)	check_exp(ttisnumber(o), (o)->value.n)
++
++#define ttype_ext(o) ( ttype(o) == LUA_TINT ? LUA_TNUMBER : ttype(o) )
++#define ttype_ext_same(o1,o2) ( (ttype(o1)==ttype(o2)) || (ttisnumber(o1) && ttisnumber(o2)) )
++
++/* '_fast' variants are for cases where 'ttype(o)' is known to be LUA_TNUMBER.
++ */
++#ifdef LNUM_COMPLEX
++#  define nvalue_complex_fast(o) check_exp( ttype(o)==LUA_TNUMBER, (o)->value.n )   
++#  define nvalue_fast(o)     ( _LF(creal) ( nvalue_complex_fast(o) ) )
++#  define nvalue_img_fast(o) ( _LF(cimag) ( nvalue_complex_fast(o) ) )
++#  define nvalue_complex(o) check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? (o)->value.i : (o)->value.n )
++#  define nvalue_img(o) check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? 0 : _LF(cimag)( (o)->value.n ) ) 
++#  define nvalue(o) check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? cast_num((o)->value.i) : _LF(creal)((o)->value.n) ) 
++#else
++# define nvalue(o)	check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? cast_num((o)->value.i) : (o)->value.n )
++# define nvalue_fast(o) check_exp( ttype(o)==LUA_TNUMBER, (o)->value.n )   
++#endif
++#define ivalue(o)	check_exp( ttype(o)==LUA_TINT, (o)->value.i )
++
+ #define rawtsvalue(o)	check_exp(ttisstring(o), &(o)->value.gc->ts)
+ #define tsvalue(o)	(&rawtsvalue(o)->tsv)
+ #define rawuvalue(o)	check_exp(ttisuserdata(o), &(o)->value.gc->u)
+@@ -116,8 +147,27 @@ typedef struct lua_TValue {
+ /* Macros to set values */
+ #define setnilvalue(obj) ((obj)->tt=LUA_TNIL)
+ 
+-#define setnvalue(obj,x) \
+-  { TValue *i_o=(obj); i_o->value.n=(x); i_o->tt=LUA_TNUMBER; }
++/* Must not have side effects, 'x' may be expression.
++*/
++#define setivalue(obj,x) \
++    { TValue *i_o=(obj); i_o->value.i=(x); i_o->tt=LUA_TINT; }
++
++# define setnvalue(obj,x) \
++    { TValue *i_o=(obj); i_o->value.n= (x); i_o->tt=LUA_TNUMBER; }
++
++/* Note: Complex always has "inline", both are C99.
++*/
++#ifdef LNUM_COMPLEX
++  static inline void setnvalue_complex_fast( TValue *obj, lua_Complex x ) {
++    lua_assert( _LF(cimag)(x) != 0 );
++    obj->value.n= x; obj->tt= LUA_TNUMBER;
++  }
++  static inline void setnvalue_complex( TValue *obj, lua_Complex x ) {
++    if (_LF(cimag)(x) == 0) { setnvalue(obj, _LF(creal)(x)); }
++    else { obj->value.n= x; obj->tt= LUA_TNUMBER; }
++  }
++#endif
++
+ 
+ #define setpvalue(obj,x) \
+   { TValue *i_o=(obj); i_o->value.p=(x); i_o->tt=LUA_TLIGHTUSERDATA; }
+@@ -155,9 +205,6 @@ typedef struct lua_TValue {
+     i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TPROTO; \
+     checkliveness(G(L),i_o); }
+ 
+-
+-
+-
+ #define setobj(L,obj1,obj2) \
+   { const TValue *o2=(obj2); TValue *o1=(obj1); \
+     o1->value = o2->value; o1->tt=o2->tt; \
+@@ -185,8 +232,11 @@ typedef struct lua_TValue {
+ 
+ #define setttype(obj, tt) (ttype(obj) = (tt))
+ 
+-
+-#define iscollectable(o)	(ttype(o) >= LUA_TSTRING)
++#if LUA_TINT >= LUA_TSTRING
++# define iscollectable(o)	((ttype(o) >= LUA_TSTRING) && (ttype(o) != LUA_TINT))
++#else
++# define iscollectable(o)	(ttype(o) >= LUA_TSTRING)
++#endif
+ 
+ 
+ 
+@@ -370,12 +420,10 @@ LUAI_FUNC int luaO_log2 (unsigned int x)
+ LUAI_FUNC int luaO_int2fb (unsigned int x);
+ LUAI_FUNC int luaO_fb2int (int x);
+ LUAI_FUNC int luaO_rawequalObj (const TValue *t1, const TValue *t2);
+-LUAI_FUNC int luaO_str2d (const char *s, lua_Number *result);
+ LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
+                                                        va_list argp);
+ LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
+ LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len);
+ 
+-
+ #endif
+ 
+--- a/src/loslib.c
++++ b/src/loslib.c
+@@ -186,15 +186,30 @@ static int os_time (lua_State *L) {
+   }
+   if (t == (time_t)(-1))
+     lua_pushnil(L);
+-  else
+-    lua_pushnumber(L, (lua_Number)t);
++  else {
++     /* On float systems the pushed value must be an integer, NOT a number.
++      * Otherwise, accuracy is lost in the time_t->float conversion.
++      */
++#ifdef LNUM_FLOAT
++     lua_pushinteger(L, (lua_Integer) t);
++#else
++     lua_pushnumber(L, (lua_Number) t);
++#endif
++     }
+   return 1;
+ }
+ 
+ 
+ static int os_difftime (lua_State *L) {
++#ifdef LNUM_FLOAT
++  lua_Integer i= (lua_Integer)
++    difftime( (time_t)(luaL_checkinteger(L, 1)),
++              (time_t)(luaL_optinteger(L, 2, 0)));
++  lua_pushinteger(L, i);
++#else
+   lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
+                              (time_t)(luaL_optnumber(L, 2, 0))));
++#endif
+   return 1;
+ }
+ 
+--- a/src/lparser.c
++++ b/src/lparser.c
+@@ -33,7 +33,6 @@
+ 
+ #define luaY_checklimit(fs,v,l,m)	if ((v)>(l)) errorlimit(fs,l,m)
+ 
+-
+ /*
+ ** nodes for block list (list of active blocks)
+ */
+@@ -72,7 +71,7 @@ static void errorlimit (FuncState *fs, i
+   const char *msg = (fs->f->linedefined == 0) ?
+     luaO_pushfstring(fs->L, "main function has more than %d %s", limit, what) :
+     luaO_pushfstring(fs->L, "function at line %d has more than %d %s",
+-                            fs->f->linedefined, limit, what);
++                            (fs->f->linedefined), limit, what);
+   luaX_lexerror(fs->ls, msg, 0);
+ }
+ 
+@@ -733,6 +732,18 @@ static void simpleexp (LexState *ls, exp
+       v->u.nval = ls->t.seminfo.r;
+       break;
+     }
++    case TK_INT: {
++      init_exp(v, VKINT, 0);
++      v->u.ival = ls->t.seminfo.i;
++      break;
++    }
++#ifdef LNUM_COMPLEX
++    case TK_NUMBER2: {
++      init_exp(v, VKNUM2, 0);
++      v->u.nval = ls->t.seminfo.r;
++      break;
++    }
++#endif
+     case TK_STRING: {
+       codestring(ls, v, ls->t.seminfo.ts);
+       break;
+@@ -1079,7 +1090,7 @@ static void fornum (LexState *ls, TStrin
+   if (testnext(ls, ','))
+     exp1(ls);  /* optional step */
+   else {  /* default step = 1 */
+-    luaK_codeABx(fs, OP_LOADK, fs->freereg, luaK_numberK(fs, 1));
++    luaK_codeABx(fs, OP_LOADK, fs->freereg, luaK_integerK(fs, 1));
+     luaK_reserveregs(fs, 1);
+   }
+   forbody(ls, base, line, 1, 1);
+--- a/src/lparser.h
++++ b/src/lparser.h
+@@ -31,7 +31,11 @@ typedef enum {
+   VRELOCABLE,	/* info = instruction pc */
+   VNONRELOC,	/* info = result register */
+   VCALL,	/* info = instruction pc */
+-  VVARARG	/* info = instruction pc */
++  VVARARG,	/* info = instruction pc */
++  VKINT     /* ival = integer value */
++#ifdef LNUM_COMPLEX
++  ,VKNUM2   /* nval = imaginary value */
++#endif
+ } expkind;
+ 
+ typedef struct expdesc {
+@@ -39,6 +43,7 @@ typedef struct expdesc {
+   union {
+     struct { int info, aux; } s;
+     lua_Number nval;
++    lua_Integer ival;
+   } u;
+   int t;  /* patch list of `exit when true' */
+   int f;  /* patch list of `exit when false' */
+--- a/src/lstrlib.c
++++ b/src/lstrlib.c
+@@ -43,8 +43,8 @@ static ptrdiff_t posrelat (ptrdiff_t pos
+ static int str_sub (lua_State *L) {
+   size_t l;
+   const char *s = luaL_checklstring(L, 1, &l);
+-  ptrdiff_t start = posrelat(luaL_checkinteger(L, 2), l);
+-  ptrdiff_t end = posrelat(luaL_optinteger(L, 3, -1), l);
++  ptrdiff_t start = posrelat(luaL_checkint32(L, 2), l);
++  ptrdiff_t end = posrelat(luaL_optint32(L, 3, -1), l);
+   if (start < 1) start = 1;
+   if (end > (ptrdiff_t)l) end = (ptrdiff_t)l;
+   if (start <= end)
+@@ -106,8 +106,8 @@ static int str_rep (lua_State *L) {
+ static int str_byte (lua_State *L) {
+   size_t l;
+   const char *s = luaL_checklstring(L, 1, &l);
+-  ptrdiff_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
+-  ptrdiff_t pose = posrelat(luaL_optinteger(L, 3, posi), l);
++  ptrdiff_t posi = posrelat(luaL_optint32(L, 2, 1), l);
++  ptrdiff_t pose = posrelat(luaL_optint32(L, 3, posi), l);
+   int n, i;
+   if (posi <= 0) posi = 1;
+   if ((size_t)pose > l) pose = l;
+@@ -496,7 +496,7 @@ static int str_find_aux (lua_State *L, i
+   size_t l1, l2;
+   const char *s = luaL_checklstring(L, 1, &l1);
+   const char *p = luaL_checklstring(L, 2, &l2);
+-  ptrdiff_t init = posrelat(luaL_optinteger(L, 3, 1), l1) - 1;
++  ptrdiff_t init = posrelat(luaL_optint32(L, 3, 1), l1) - 1;
+   if (init < 0) init = 0;
+   else if ((size_t)(init) > l1) init = (ptrdiff_t)l1;
+   if (find && (lua_toboolean(L, 4) ||  /* explicit request? */
+@@ -690,7 +690,7 @@ static int str_gsub (lua_State *L) {
+ ** maximum size of each format specification (such as '%-099.99d')
+ ** (+10 accounts for %99.99x plus margin of error)
+ */
+-#define MAX_FORMAT	(sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
++#define MAX_FORMAT	(sizeof(FLAGS) + sizeof(LUA_INTEGER_FMT)-2 + 10)
+ 
+ 
+ static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
+@@ -747,9 +747,9 @@ static const char *scanformat (lua_State
+ static void addintlen (char *form) {
+   size_t l = strlen(form);
+   char spec = form[l - 1];
+-  strcpy(form + l - 1, LUA_INTFRMLEN);
+-  form[l + sizeof(LUA_INTFRMLEN) - 2] = spec;
+-  form[l + sizeof(LUA_INTFRMLEN) - 1] = '\0';
++  const char *tmp= LUA_INTEGER_FMT;   /* "%lld" or "%ld" */
++  strcpy(form + l - 1, tmp+1);
++  form[l + sizeof(LUA_INTEGER_FMT)-4] = spec;
+ }
+ 
+ 
+@@ -779,12 +779,12 @@ static int str_format (lua_State *L) {
+         }
+         case 'd':  case 'i': {
+           addintlen(form);
+-          sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
++          sprintf(buff, form, luaL_checkinteger(L, arg));
+           break;
+         }
+         case 'o':  case 'u':  case 'x':  case 'X': {
+           addintlen(form);
+-          sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
++          sprintf(buff, form, (unsigned LUA_INTEGER)luaL_checkinteger(L, arg));
+           break;
+         }
+         case 'e':  case 'E': case 'f':
+--- a/src/ltable.c
++++ b/src/ltable.c
+@@ -33,6 +33,7 @@
+ #include "lobject.h"
+ #include "lstate.h"
+ #include "ltable.h"
++#include "lnum.h"
+ 
+ 
+ /*
+@@ -51,25 +52,15 @@
+   
+ #define hashstr(t,str)  hashpow2(t, (str)->tsv.hash)
+ #define hashboolean(t,p)        hashpow2(t, p)
+-
++#define hashint(t,i)    hashpow2(t,i)
+ 
+ /*
+ ** for some types, it is better to avoid modulus by power of 2, as
+ ** they tend to have many 2 factors.
+ */
+ #define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
+-
+-
+ #define hashpointer(t,p)	hashmod(t, IntPoint(p))
+ 
+-
+-/*
+-** number of ints inside a lua_Number
+-*/
+-#define numints		cast_int(sizeof(lua_Number)/sizeof(int))
+-
+-
+-
+ #define dummynode		(&dummynode_)
+ 
+ static const Node dummynode_ = {
+@@ -80,27 +71,46 @@ static const Node dummynode_ = {
+ 
+ /*
+ ** hash for lua_Numbers
++**
++** for non-complex modes, never called with 'lua_Integer' value range (s.a. 0)
+ */
+ static Node *hashnum (const Table *t, lua_Number n) {
+-  unsigned int a[numints];
+-  int i;
+-  if (luai_numeq(n, 0))  /* avoid problems with -0 */
+-    return gnode(t, 0);
+-  memcpy(a, &n, sizeof(a));
+-  for (i = 1; i < numints; i++) a[0] += a[i];
+-  return hashmod(t, a[0]);
++  const unsigned int *p= cast(const unsigned int *,&n);
++  unsigned int sum= *p;
++  unsigned int m= sizeof(lua_Number)/sizeof(int);
++  unsigned int i;
++  /* OS X Intel has 'm'==4 and gives "Bus error" if the last integer of 
++   * 'n' is read; the actual size of long double is only 80 bits = 10 bytes.
++   * Linux x86 has 'm'==3, and does not require reduction.
++   */
++#if defined(LNUM_LDOUBLE) && defined(__i386__)
++  if (m>3) m--;
++#endif
++  for (i = 1; i < m; i++) sum += p[i];
++  return hashmod(t, sum);
+ }
+ 
+ 
+-
+ /*
+ ** returns the `main' position of an element in a table (that is, the index
+ ** of its hash value)
++**
++** Floating point numbers with integer value give the hash position of the
++** integer (so they use the same table position).
+ */
+ static Node *mainposition (const Table *t, const TValue *key) {
++  lua_Integer i;
+   switch (ttype(key)) {
+     case LUA_TNUMBER:
+-      return hashnum(t, nvalue(key));
++      if (tt_integer_valued(key,&i)) 
++        return hashint(t, i);
++#ifdef LNUM_COMPLEX
++      if (nvalue_img_fast(key)!=0 && luai_numeq(nvalue_fast(key),0))
++        return gnode(t, 0);  /* 0 and -0 to give same hash */
++#endif
++      return hashnum(t, nvalue_fast(key));
++    case LUA_TINT:
++      return hashint(t, ivalue(key));
+     case LUA_TSTRING:
+       return hashstr(t, rawtsvalue(key));
+     case LUA_TBOOLEAN:
+@@ -116,16 +126,20 @@ static Node *mainposition (const Table *
+ /*
+ ** returns the index for `key' if `key' is an appropriate key to live in
+ ** the array part of the table, -1 otherwise.
++**
++** Anything <=0 is taken as not being in the array part.
+ */
+-static int arrayindex (const TValue *key) {
+-  if (ttisnumber(key)) {
+-    lua_Number n = nvalue(key);
+-    int k;
+-    lua_number2int(k, n);
+-    if (luai_numeq(cast_num(k), n))
+-      return k;
++static int arrayindex (const TValue *key, int max) {
++  lua_Integer k;
++  switch( ttype(key) ) {
++    case LUA_TINT:
++      k= ivalue(key); break;
++    case LUA_TNUMBER:
++      if (tt_integer_valued(key,&k)) break;
++    default:
++      return -1;  /* not to be used as array index */
+   }
+-  return -1;  /* `key' did not match some condition */
++  return ((k>0) && (k <= max)) ? cast_int(k) : -1;
+ }
+ 
+ 
+@@ -137,8 +151,8 @@ static int arrayindex (const TValue *key
+ static int findindex (lua_State *L, Table *t, StkId key) {
+   int i;
+   if (ttisnil(key)) return -1;  /* first iteration */
+-  i = arrayindex(key);
+-  if (0 < i && i <= t->sizearray)  /* is `key' inside array part? */
++  i = arrayindex(key, t->sizearray);
++  if (i>0)  /* inside array part? */
+     return i-1;  /* yes; that's the index (corrected to C) */
+   else {
+     Node *n = mainposition(t, key);
+@@ -163,7 +177,7 @@ int luaH_next (lua_State *L, Table *t, S
+   int i = findindex(L, t, key);  /* find original element */
+   for (i++; i < t->sizearray; i++) {  /* try first array part */
+     if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
+-      setnvalue(key, cast_num(i+1));
++      setivalue(key, i+1);
+       setobj2s(L, key+1, &t->array[i]);
+       return 1;
+     }
+@@ -209,8 +223,8 @@ static int computesizes (int nums[], int
+ 
+ 
+ static int countint (const TValue *key, int *nums) {
+-  int k = arrayindex(key);
+-  if (0 < k && k <= MAXASIZE) {  /* is `key' an appropriate array index? */
++  int k = arrayindex(key,MAXASIZE);
++  if (k>0) {  /* appropriate array index? */
+     nums[ceillog2(k)]++;  /* count as such */
+     return 1;
+   }
+@@ -308,7 +322,7 @@ static void resize (lua_State *L, Table 
+     /* re-insert elements from vanishing slice */
+     for (i=nasize; i<oldasize; i++) {
+       if (!ttisnil(&t->array[i]))
+-        setobjt2t(L, luaH_setnum(L, t, i+1), &t->array[i]);
++        setobjt2t(L, luaH_setint(L, t, i+1), &t->array[i]);
+     }
+     /* shrink array */
+     luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
+@@ -409,7 +423,9 @@ static TValue *newkey (lua_State *L, Tab
+     othern = mainposition(t, key2tval(mp));
+     if (othern != mp) {  /* is colliding node out of its main position? */
+       /* yes; move colliding node into free position */
+-      while (gnext(othern) != mp) othern = gnext(othern);  /* find previous */
++      while (gnext(othern) != mp) {
++        othern = gnext(othern);  /* find previous */
++      }
+       gnext(othern) = n;  /* redo the chain with `n' in place of `mp' */
+       *n = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+       gnext(mp) = NULL;  /* now `mp' is free */
+@@ -432,17 +448,18 @@ static TValue *newkey (lua_State *L, Tab
+ /*
+ ** search function for integers
+ */
+-const TValue *luaH_getnum (Table *t, int key) {
++const TValue *luaH_getint (Table *t, lua_Integer key) {
+   /* (1 <= key && key <= t->sizearray) */
+   if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray))
+     return &t->array[key-1];
+   else {
+-    lua_Number nk = cast_num(key);
+-    Node *n = hashnum(t, nk);
++    Node *n = hashint(t, key);
+     do {  /* check whether `key' is somewhere in the chain */
+-      if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
++      if (ttisint(gkey(n)) && (ivalue(gkey(n)) == key)) {
+         return gval(n);  /* that's it */
+-      else n = gnext(n);
++      } else { 
++      n = gnext(n);
++    }
+     } while (n);
+     return luaO_nilobject;
+   }
+@@ -470,14 +487,12 @@ const TValue *luaH_get (Table *t, const 
+   switch (ttype(key)) {
+     case LUA_TNIL: return luaO_nilobject;
+     case LUA_TSTRING: return luaH_getstr(t, rawtsvalue(key));
++    case LUA_TINT: return luaH_getint(t, ivalue(key));
+     case LUA_TNUMBER: {
+-      int k;
+-      lua_Number n = nvalue(key);
+-      lua_number2int(k, n);
+-      if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */
+-        return luaH_getnum(t, k);  /* use specialized version */
+-      /* else go through */
+-    }
++      lua_Integer i;
++      if (tt_integer_valued(key,&i))
++        return luaH_getint(t,i);
++    } /* pass through */
+     default: {
+       Node *n = mainposition(t, key);
+       do {  /* check whether `key' is somewhere in the chain */
+@@ -498,20 +513,25 @@ TValue *luaH_set (lua_State *L, Table *t
+     return cast(TValue *, p);
+   else {
+     if (ttisnil(key)) luaG_runerror(L, "table index is nil");
+-    else if (ttisnumber(key) && luai_numisnan(nvalue(key)))
+-      luaG_runerror(L, "table index is NaN");
++    else if (ttype(key)==LUA_TNUMBER) {
++      lua_Integer k;
++      if (luai_numisnan(nvalue_fast(key)))
++        luaG_runerror(L, "table index is NaN");
++      if (tt_integer_valued(key,&k))
++        return luaH_setint(L, t, k);
++    }
+     return newkey(L, t, key);
+   }
+ }
+ 
+ 
+-TValue *luaH_setnum (lua_State *L, Table *t, int key) {
+-  const TValue *p = luaH_getnum(t, key);
++TValue *luaH_setint (lua_State *L, Table *t, lua_Integer key) {
++  const TValue *p = luaH_getint(t, key);
+   if (p != luaO_nilobject)
+     return cast(TValue *, p);
+   else {
+     TValue k;
+-    setnvalue(&k, cast_num(key));
++    setivalue(&k, key);
+     return newkey(L, t, &k);
+   }
+ }
+@@ -533,20 +553,21 @@ static int unbound_search (Table *t, uns
+   unsigned int i = j;  /* i is zero or a present index */
+   j++;
+   /* find `i' and `j' such that i is present and j is not */
+-  while (!ttisnil(luaH_getnum(t, j))) {
++  while (!ttisnil(luaH_getint(t, j))) {
+     i = j;
+     j *= 2;
+     if (j > cast(unsigned int, MAX_INT)) {  /* overflow? */
+       /* table was built with bad purposes: resort to linear search */
+-      i = 1;
+-      while (!ttisnil(luaH_getnum(t, i))) i++;
+-      return i - 1;
++      for( i = 1; i<MAX_INT+1; i++ ) {
++        if (ttisnil(luaH_getint(t, i))) break;
++      }
++      return i - 1;  /* up to MAX_INT */
+     }
+   }
+   /* now do a binary search between them */
+   while (j - i > 1) {
+     unsigned int m = (i+j)/2;
+-    if (ttisnil(luaH_getnum(t, m))) j = m;
++    if (ttisnil(luaH_getint(t, m))) j = m;
+     else i = m;
+   }
+   return i;
+--- a/src/ltable.h
++++ b/src/ltable.h
+@@ -18,8 +18,8 @@
+ #define key2tval(n)	(&(n)->i_key.tvk)
+ 
+ 
+-LUAI_FUNC const TValue *luaH_getnum (Table *t, int key);
+-LUAI_FUNC TValue *luaH_setnum (lua_State *L, Table *t, int key);
++LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
++LUAI_FUNC TValue *luaH_setint (lua_State *L, Table *t, lua_Integer key);
+ LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
+ LUAI_FUNC TValue *luaH_setstr (lua_State *L, Table *t, TString *key);
+ LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
+--- a/src/ltm.c
++++ b/src/ltm.c
+@@ -19,7 +19,6 @@
+ #include "ltm.h"
+ 
+ 
+-
+ const char *const luaT_typenames[] = {
+   "nil", "boolean", "userdata", "number",
+   "string", "table", "function", "userdata", "thread",
+@@ -67,6 +66,9 @@ const TValue *luaT_gettmbyobj (lua_State
+     case LUA_TUSERDATA:
+       mt = uvalue(o)->metatable;
+       break;
++    case LUA_TINT:
++      mt = G(L)->mt[LUA_TNUMBER];
++      break;
+     default:
+       mt = G(L)->mt[ttype(o)];
+   }
+--- a/src/lua.c
++++ b/src/lua.c
+@@ -16,7 +16,7 @@
+ 
+ #include "lauxlib.h"
+ #include "lualib.h"
+-
++#include "llimits.h"
+ 
+ 
+ static lua_State *globalL = NULL;
+@@ -382,6 +382,15 @@ int main (int argc, char **argv) {
+     l_message(argv[0], "cannot create state: not enough memory");
+     return EXIT_FAILURE;
+   }
++  /* Checking 'sizeof(lua_Integer)' cannot be made in preprocessor on all compilers.
++  */
++#ifdef LNUM_INT16
++  lua_assert( sizeof(lua_Integer) == 2 );
++#elif defined(LNUM_INT32)
++  lua_assert( sizeof(lua_Integer) == 4 );
++#elif defined(LNUM_INT64)
++  lua_assert( sizeof(lua_Integer) == 8 );
++#endif
+   s.argc = argc;
+   s.argv = argv;
+   status = lua_cpcall(L, &pmain, &s);
+--- a/src/lua.h
++++ b/src/lua.h
+@@ -19,7 +19,7 @@
+ #define LUA_VERSION	"Lua 5.1"
+ #define LUA_RELEASE	"Lua 5.1.5"
+ #define LUA_VERSION_NUM	501
+-#define LUA_COPYRIGHT	"Copyright (C) 1994-2012 Lua.org, PUC-Rio"
++#define LUA_COPYRIGHT	"Copyright (C) 1994-2012 Lua.org, PUC-Rio" " (" LUA_LNUM ")"
+ #define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
+ 
+ 
+@@ -71,6 +71,16 @@ typedef void * (*lua_Alloc) (void *ud, v
+ */
+ #define LUA_TNONE		(-1)
+ 
++/* LUA_TINT is an internal type, not visible to applications. There are three
++ * potential values where it can be tweaked to (code autoadjusts to these):
++ *
++ * -2: not 'usual' type value; good since 'LUA_TINT' is not part of the API
++ * LUA_TNUMBER+1: shifts other type values upwards, breaking binary compatibility
++ *     not acceptable for 5.1, maybe 5.2 onwards?
++ *  9: greater than existing (5.1) type values.
++*/
++#define LUA_TINT (-2)
++
+ #define LUA_TNIL		0
+ #define LUA_TBOOLEAN		1
+ #define LUA_TLIGHTUSERDATA	2
+@@ -139,6 +149,8 @@ LUA_API int             (lua_isuserdata)
+ LUA_API int             (lua_type) (lua_State *L, int idx);
+ LUA_API const char     *(lua_typename) (lua_State *L, int tp);
+ 
++LUA_API int             (lua_isinteger) (lua_State *L, int idx);
++
+ LUA_API int            (lua_equal) (lua_State *L, int idx1, int idx2);
+ LUA_API int            (lua_rawequal) (lua_State *L, int idx1, int idx2);
+ LUA_API int            (lua_lessthan) (lua_State *L, int idx1, int idx2);
+@@ -244,6 +256,19 @@ LUA_API lua_Alloc (lua_getallocf) (lua_S
+ LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
+ 
+ 
++/*
++* It is unnecessary to break Lua C API 'lua_tonumber()' compatibility, just
++* because the Lua number type is complex. Most C modules would use scalars
++* only. We'll introduce new 'lua_tocomplex' and 'lua_pushcomplex' for when
++* the module really wants to use them.
++*/
++#ifdef LNUM_COMPLEX
++  #include <complex.h>
++  typedef LUA_NUMBER complex lua_Complex;
++  LUA_API lua_Complex (lua_tocomplex) (lua_State *L, int idx);
++  LUA_API void (lua_pushcomplex) (lua_State *L, lua_Complex v);
++#endif
++
+ 
+ /* 
+ ** ===============================================================
+@@ -268,7 +293,12 @@ LUA_API void lua_setallocf (lua_State *L
+ #define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
+ #define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
+ #define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
+-#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
++
++#if LUA_TINT < 0
++# define lua_isnoneornil(L, n)	( (lua_type(L,(n)) <= 0) && (lua_type(L,(n)) != LUA_TINT) )
++#else
++# define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
++#endif
+ 
+ #define lua_pushliteral(L, s)	\
+ 	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
+@@ -386,3 +416,4 @@ struct lua_Debug {
+ 
+ 
+ #endif
++
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -10,7 +10,9 @@
+ 
+ #include <limits.h>
+ #include <stddef.h>
+-
++#ifdef lua_assert
++# include <assert.h>
++#endif
+ 
+ /*
+ ** ==================================================================
+@@ -136,14 +138,38 @@
+ 
+ 
+ /*
+-@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
+-** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
+-** machines, ptrdiff_t gives a good choice between int or long.)
++@@ LUAI_BITSINT defines the number of bits in an int.
++** CHANGE here if Lua cannot automatically detect the number of bits of
++** your machine. Probably you do not need to change this.
+ */
+-#define LUA_INTEGER	ptrdiff_t
++/* avoid overflows in comparison */
++#if INT_MAX-20 < 32760
++#define LUAI_BITSINT	16
++#elif INT_MAX > 2147483640L
++/* int has at least 32 bits */
++#define LUAI_BITSINT	32
++#else
++#error "you must define LUA_BITSINT with number of bits in an integer"
++#endif
+ 
+ 
+ /*
++@@ LNUM_DOUBLE | LNUM_FLOAT | LNUM_LDOUBLE: Generic Lua number mode
++@@ LNUM_INT32 | LNUM_INT64: Integer type
++@@ LNUM_COMPLEX: Define for using 'a+bi' numbers
++@@
++@@ You can combine LNUM_xxx but only one of each group. I.e. '-DLNUM_FLOAT
++@@ -DLNUM_INT32 -DLNUM_COMPLEX' gives float range complex numbers, with 
++@@ 32-bit scalar integer range optimized.
++**
++** These are kept in a separate configuration file mainly for ease of patching
++** (can be changed if integerated to Lua proper).
++*/
++/*#define LNUM_DOUBLE*/
++/*#define LNUM_INT32*/
++#include "lnum_config.h"
++
++/*
+ @@ LUA_API is a mark for all core API functions.
+ @@ LUALIB_API is a mark for all standard library functions.
+ ** CHANGE them if you need to define those functions in some special way.
+@@ -383,22 +409,6 @@
+ 
+ 
+ /*
+-@@ LUAI_BITSINT defines the number of bits in an int.
+-** CHANGE here if Lua cannot automatically detect the number of bits of
+-** your machine. Probably you do not need to change this.
+-*/
+-/* avoid overflows in comparison */
+-#if INT_MAX-20 < 32760
+-#define LUAI_BITSINT	16
+-#elif INT_MAX > 2147483640L
+-/* int has at least 32 bits */
+-#define LUAI_BITSINT	32
+-#else
+-#error "you must define LUA_BITSINT with number of bits in an integer"
+-#endif
+-
+-
+-/*
+ @@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
+ @@ LUAI_INT32 is an signed integer with at least 32 bits.
+ @@ LUAI_UMEM is an unsigned integer big enough to count the total
+@@ -425,6 +435,15 @@
+ #define LUAI_MEM	long
+ #endif
+ 
++/*
++@@ LUAI_BOOL carries 0 and nonzero (normally 1). It may be defined as 'char'
++** (to save memory), 'int' (for speed), 'bool' (for C++) or '_Bool' (C99)
++*/
++#ifdef __cplusplus
++# define LUAI_BOOL bool
++#else
++# define LUAI_BOOL int
++#endif
+ 
+ /*
+ @@ LUAI_MAXCALLS limits the number of nested calls.
+@@ -490,101 +509,6 @@
+ /* }================================================================== */
+ 
+ 
+-
+-
+-/*
+-** {==================================================================
+-@@ LUA_NUMBER is the type of numbers in Lua.
+-** CHANGE the following definitions only if you want to build Lua
+-** with a number type different from double. You may also need to
+-** change lua_number2int & lua_number2integer.
+-** ===================================================================
+-*/
+-
+-#define LUA_NUMBER_DOUBLE
+-#define LUA_NUMBER	double
+-
+-/*
+-@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
+-@* over a number.
+-*/
+-#define LUAI_UACNUMBER	double
+-
+-
+-/*
+-@@ LUA_NUMBER_SCAN is the format for reading numbers.
+-@@ LUA_NUMBER_FMT is the format for writing numbers.
+-@@ lua_number2str converts a number to a string.
+-@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
+-@@ lua_str2number converts a string to a number.
+-*/
+-#define LUA_NUMBER_SCAN		"%lf"
+-#define LUA_NUMBER_FMT		"%.14g"
+-#define lua_number2str(s,n)	sprintf((s), LUA_NUMBER_FMT, (n))
+-#define LUAI_MAXNUMBER2STR	32 /* 16 digits, sign, point, and \0 */
+-#define lua_str2number(s,p)	strtod((s), (p))
+-
+-
+-/*
+-@@ The luai_num* macros define the primitive operations over numbers.
+-*/
+-#if defined(LUA_CORE)
+-#include <math.h>
+-#define luai_numadd(a,b)	((a)+(b))
+-#define luai_numsub(a,b)	((a)-(b))
+-#define luai_nummul(a,b)	((a)*(b))
+-#define luai_numdiv(a,b)	((a)/(b))
+-#define luai_nummod(a,b)	((a) - floor((a)/(b))*(b))
+-#define luai_numpow(a,b)	(pow(a,b))
+-#define luai_numunm(a)		(-(a))
+-#define luai_numeq(a,b)		((a)==(b))
+-#define luai_numlt(a,b)		((a)<(b))
+-#define luai_numle(a,b)		((a)<=(b))
+-#define luai_numisnan(a)	(!luai_numeq((a), (a)))
+-#endif
+-
+-
+-/*
+-@@ lua_number2int is a macro to convert lua_Number to int.
+-@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
+-** CHANGE them if you know a faster way to convert a lua_Number to
+-** int (with any rounding method and without throwing errors) in your
+-** system. In Pentium machines, a naive typecast from double to int
+-** in C is extremely slow, so any alternative is worth trying.
+-*/
+-
+-/* On a Pentium, resort to a trick */
+-#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
+-    (defined(__i386) || defined (_M_IX86) || defined(__i386__))
+-
+-/* On a Microsoft compiler, use assembler */
+-#if defined(_MSC_VER)
+-
+-#define lua_number2int(i,d)   __asm fld d   __asm fistp i
+-#define lua_number2integer(i,n)		lua_number2int(i, n)
+-
+-/* the next trick should work on any Pentium, but sometimes clashes
+-   with a DirectX idiosyncrasy */
+-#else
+-
+-union luai_Cast { double l_d; long l_l; };
+-#define lua_number2int(i,d) \
+-  { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
+-#define lua_number2integer(i,n)		lua_number2int(i, n)
+-
+-#endif
+-
+-
+-/* this option always works, but may be slow */
+-#else
+-#define lua_number2int(i,d)	((i)=(int)(d))
+-#define lua_number2integer(i,d)	((i)=(lua_Integer)(d))
+-
+-#endif
+-
+-/* }================================================================== */
+-
+-
+ /*
+ @@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
+ ** CHANGE it if your system requires alignments larger than double. (For
+@@ -728,28 +652,6 @@ union luai_Cast { double l_d; long l_l; 
+ #define luai_userstateyield(L,n)	((void)L)
+ 
+ 
+-/*
+-@@ LUA_INTFRMLEN is the length modifier for integer conversions
+-@* in 'string.format'.
+-@@ LUA_INTFRM_T is the integer type correspoding to the previous length
+-@* modifier.
+-** CHANGE them if your system supports long long or does not support long.
+-*/
+-
+-#if defined(LUA_USELONGLONG)
+-
+-#define LUA_INTFRMLEN		"ll"
+-#define LUA_INTFRM_T		long long
+-
+-#else
+-
+-#define LUA_INTFRMLEN		"l"
+-#define LUA_INTFRM_T		long
+-
+-#endif
+-
+-
+-
+ /* =================================================================== */
+ 
+ /*
+--- a/src/lundump.c
++++ b/src/lundump.c
+@@ -73,6 +73,13 @@ static lua_Number LoadNumber(LoadState* 
+  return x;
+ }
+ 
++static lua_Integer LoadInteger(LoadState* S)
++{
++ lua_Integer x;
++ LoadVar(S,x);
++ return x;
++}
++
+ static TString* LoadString(LoadState* S)
+ {
+  size_t size;
+@@ -119,6 +126,9 @@ static void LoadConstants(LoadState* S, 
+    case LUA_TNUMBER:
+ 	setnvalue(o,LoadNumber(S));
+ 	break;
++   case LUA_TINT:   /* Integer type saved in bytecode (see lcode.c) */
++	setivalue(o,LoadInteger(S));
++	break;
+    case LUA_TSTRING:
+ 	setsvalue2n(S->L,o,LoadString(S));
+ 	break;
+@@ -223,5 +233,22 @@ void luaU_header (char* h)
+  *h++=(char)sizeof(size_t);
+  *h++=(char)sizeof(Instruction);
+  *h++=(char)sizeof(lua_Number);
+- *h++=(char)(((lua_Number)0.5)==0);		/* is lua_Number integral? */
++
++ /* 
++  * Last byte of header (0/1 in unpatched Lua 5.1.3):
++  *
++  * 0: lua_Number is float or double, lua_Integer not used. (nonpatched only)
++  * 1: lua_Number is integer (nonpatched only)
++  *
++  * +2: LNUM_INT16: sizeof(lua_Integer)
++  * +4: LNUM_INT32: sizeof(lua_Integer)
++  * +8: LNUM_INT64: sizeof(lua_Integer)
++  *
++  * +0x80: LNUM_COMPLEX
++  */
++ *h++ = (char)(sizeof(lua_Integer)
++#ifdef LNUM_COMPLEX
++    | 0x80
++#endif
++    );
+ }
+--- a/src/lvm.c
++++ b/src/lvm.c
+@@ -25,22 +25,35 @@
+ #include "ltable.h"
+ #include "ltm.h"
+ #include "lvm.h"
+-
+-
++#include "llex.h"
++#include "lnum.h"
+ 
+ /* limit for table tag-method chains (to avoid loops) */
+ #define MAXTAGLOOP	100
+ 
+ 
+-const TValue *luaV_tonumber (const TValue *obj, TValue *n) {
+-  lua_Number num;
++/*
++ * If 'obj' is a string, it is tried to be interpreted as a number.
++ */
++const TValue *luaV_tonumber ( const TValue *obj, TValue *n) {
++  lua_Number d;
++  lua_Integer i;
++  
+   if (ttisnumber(obj)) return obj;
+-  if (ttisstring(obj) && luaO_str2d(svalue(obj), &num)) {
+-    setnvalue(n, num);
+-    return n;
+-  }
+-  else
+-    return NULL;
++
++  if (ttisstring(obj)) {
++    switch( luaO_str2d( svalue(obj), &d, &i ) ) {
++        case TK_INT:
++            setivalue(n,i); return n;
++        case TK_NUMBER: 
++            setnvalue(n,d); return n;
++#ifdef LNUM_COMPLEX
++        case TK_NUMBER2:    /* "N.NNNi", != 0 */
++            setnvalue_complex_fast(n, d*I); return n;
++#endif
++        }
++    }
++  return NULL;
+ }
+ 
+ 
+@@ -49,8 +62,7 @@ int luaV_tostring (lua_State *L, StkId o
+     return 0;
+   else {
+     char s[LUAI_MAXNUMBER2STR];
+-    lua_Number n = nvalue(obj);
+-    lua_number2str(s, n);
++    luaO_num2buf(s,obj);
+     setsvalue2s(L, obj, luaS_new(L, s));
+     return 1;
+   }
+@@ -222,59 +234,127 @@ static int l_strcmp (const TString *ls, 
+ }
+ 
+ 
++#ifdef LNUM_COMPLEX
++void error_complex( lua_State *L, const TValue *l, const TValue *r )
++{
++  char buf1[ LUAI_MAXNUMBER2STR ];
++  char buf2[ LUAI_MAXNUMBER2STR ];
++  luaO_num2buf( buf1, l );
++  luaO_num2buf( buf2, r );
++  luaG_runerror( L, "unable to compare: %s with %s", buf1, buf2 );
++  /* no return */
++}
++#endif
++
++
+ int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
+   int res;
+-  if (ttype(l) != ttype(r))
++  int tl,tr;
++  lua_Integer tmp;
++
++  if (!ttype_ext_same(l,r))
+     return luaG_ordererror(L, l, r);
+-  else if (ttisnumber(l))
+-    return luai_numlt(nvalue(l), nvalue(r));
+-  else if (ttisstring(l))
+-    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
+-  else if ((res = call_orderTM(L, l, r, TM_LT)) != -1)
++#ifdef LNUM_COMPLEX
++  if ( (nvalue_img(l)!=0) || (nvalue_img(r)!=0) )
++    error_complex( L, l, r );
++#endif
++  tl= ttype(l); tr= ttype(r);
++  if (tl==tr) {  /* clear arithmetics */
++    switch(tl) {
++      case LUA_TINT:      return ivalue(l) < ivalue(r);
++      case LUA_TNUMBER:   return luai_numlt(nvalue_fast(l), nvalue_fast(r));
++      case LUA_TSTRING:   return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
++    }
++  } else if (tl==LUA_TINT) {  /* l:int, r:num */
++    /* Avoid accuracy losing casts: if 'r' is integer by value, do comparisons
++     * in integer realm. Only otherwise cast 'l' to FP (which might change its
++     * value).
++     */
++    if (tt_integer_valued(r,&tmp)) 
++        return ivalue(l) < tmp;
++    else 
++        return luai_numlt( cast_num(ivalue(l)), nvalue_fast(r) );
++
++  } else if (tl==LUA_TNUMBER) {  /* l:num, r:int */
++    if (tt_integer_valued(l,&tmp)) 
++        return tmp < ivalue(r);
++    else
++        return luai_numlt( nvalue_fast(l), cast_num(ivalue(r)) );
++
++  } else if ((res = call_orderTM(L, l, r, TM_LT)) != -1)
+     return res;
++
+   return luaG_ordererror(L, l, r);
+ }
+ 
+ 
+ static int lessequal (lua_State *L, const TValue *l, const TValue *r) {
+   int res;
+-  if (ttype(l) != ttype(r))
++  int tl, tr;
++  lua_Integer tmp;
++
++  if (!ttype_ext_same(l,r))
+     return luaG_ordererror(L, l, r);
+-  else if (ttisnumber(l))
+-    return luai_numle(nvalue(l), nvalue(r));
+-  else if (ttisstring(l))
+-    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
+-  else if ((res = call_orderTM(L, l, r, TM_LE)) != -1)  /* first try `le' */
++#ifdef LNUM_COMPLEX
++  if ( (nvalue_img(l)!=0) || (nvalue_img(r)!=0) )
++    error_complex( L, l, r );
++#endif
++  tl= ttype(l); tr= ttype(r);
++  if (tl==tr) {  /* clear arithmetics */
++    switch(tl) {
++      case LUA_TINT:      return ivalue(l) <= ivalue(r);
++      case LUA_TNUMBER:   return luai_numle(nvalue_fast(l), nvalue_fast(r));
++      case LUA_TSTRING:   return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
++    }
++  }
++  if (tl==LUA_TINT) {  /* l:int, r:num */
++    if (tt_integer_valued(r,&tmp)) 
++        return ivalue(l) <= tmp;
++    else
++        return luai_numle( cast_num(ivalue(l)), nvalue_fast(r) );
++
++  } else if (tl==LUA_TNUMBER) {  /* l:num, r:int */
++    if (tt_integer_valued(l,&tmp)) 
++        return tmp <= ivalue(r);
++    else
++        return luai_numle( nvalue_fast(l), cast_num(ivalue(r)) );
++
++  } else if ((res = call_orderTM(L, l, r, TM_LE)) != -1)  /* first try `le' */
+     return res;
+   else if ((res = call_orderTM(L, r, l, TM_LT)) != -1)  /* else try `lt' */
+     return !res;
++
+   return luaG_ordererror(L, l, r);
+ }
+ 
+ 
+-int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2) {
++/* Note: 'luaV_equalval()' and 'luaO_rawequalObj()' have largely overlapping
++ *       implementation. LUA_TNIL..LUA_TLIGHTUSERDATA cases could be handled
++ *       simply by the 'default' case here.
++ */
++int luaV_equalval (lua_State *L, const TValue *l, const TValue *r) {
+   const TValue *tm;
+-  lua_assert(ttype(t1) == ttype(t2));
+-  switch (ttype(t1)) {
++  lua_assert(ttype_ext_same(l,r));
++  switch (ttype(l)) {
+     case LUA_TNIL: return 1;
+-    case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2));
+-    case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2);  /* true must be 1 !! */
+-    case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
++    case LUA_TINT:
++    case LUA_TNUMBER: return luaO_rawequalObj(l,r);
++    case LUA_TBOOLEAN: return bvalue(l) == bvalue(r);  /* true must be 1 !! */
++    case LUA_TLIGHTUSERDATA: return pvalue(l) == pvalue(r);
+     case LUA_TUSERDATA: {
+-      if (uvalue(t1) == uvalue(t2)) return 1;
+-      tm = get_compTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable,
+-                         TM_EQ);
++      if (uvalue(l) == uvalue(r)) return 1;
++      tm = get_compTM(L, uvalue(l)->metatable, uvalue(r)->metatable, TM_EQ);
+       break;  /* will try TM */
+     }
+     case LUA_TTABLE: {
+-      if (hvalue(t1) == hvalue(t2)) return 1;
+-      tm = get_compTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
++      if (hvalue(l) == hvalue(r)) return 1;
++      tm = get_compTM(L, hvalue(l)->metatable, hvalue(r)->metatable, TM_EQ);
+       break;  /* will try TM */
+     }
+-    default: return gcvalue(t1) == gcvalue(t2);
++    default: return gcvalue(l) == gcvalue(r);
+   }
+   if (tm == NULL) return 0;  /* no TM? */
+-  callTMres(L, L->top, tm, t1, t2);  /* call TM */
++  callTMres(L, L->top, tm, l, r);  /* call TM */
+   return !l_isfalse(L->top);
+ }
+ 
+@@ -314,30 +394,6 @@ void luaV_concat (lua_State *L, int tota
+ }
+ 
+ 
+-static void Arith (lua_State *L, StkId ra, const TValue *rb,
+-                   const TValue *rc, TMS op) {
+-  TValue tempb, tempc;
+-  const TValue *b, *c;
+-  if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
+-      (c = luaV_tonumber(rc, &tempc)) != NULL) {
+-    lua_Number nb = nvalue(b), nc = nvalue(c);
+-    switch (op) {
+-      case TM_ADD: setnvalue(ra, luai_numadd(nb, nc)); break;
+-      case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); break;
+-      case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); break;
+-      case TM_DIV: setnvalue(ra, luai_numdiv(nb, nc)); break;
+-      case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); break;
+-      case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break;
+-      case TM_UNM: setnvalue(ra, luai_numunm(nb)); break;
+-      default: lua_assert(0); break;
+-    }
+-  }
+-  else if (!call_binTM(L, rb, rc, ra, op))
+-    luaG_aritherror(L, rb, rc);
+-}
+-
+-
+-
+ /*
+ ** some macros for common tasks in `luaV_execute'
+ */
+@@ -361,17 +417,154 @@ static void Arith (lua_State *L, StkId r
+ #define Protect(x)	{ L->savedpc = pc; {x;}; base = L->base; }
+ 
+ 
+-#define arith_op(op,tm) { \
+-        TValue *rb = RKB(i); \
+-        TValue *rc = RKC(i); \
+-        if (ttisnumber(rb) && ttisnumber(rc)) { \
+-          lua_Number nb = nvalue(rb), nc = nvalue(rc); \
+-          setnvalue(ra, op(nb, nc)); \
+-        } \
+-        else \
+-          Protect(Arith(L, ra, rb, rc, tm)); \
++/* Note: if called for unary operations, 'rc'=='rb'.
++ */
++static void Arith (lua_State *L, StkId ra, const TValue *rb,
++                   const TValue *rc, TMS op) {
++  TValue tempb, tempc;
++  const TValue *b, *c;
++  lua_Number nb,nc;
++
++  if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
++      (c = luaV_tonumber(rc, &tempc)) != NULL) {
++
++    /* Keep integer arithmetics in the integer realm, if possible.
++     */
++    if (ttisint(b) && ttisint(c)) {
++      lua_Integer ib = ivalue(b), ic = ivalue(c);
++      lua_Integer *ri = &ra->value.i;
++      ra->tt= LUA_TINT;  /* part of 'setivalue(ra)' */
++      switch (op) {
++        case TM_ADD: if (try_addint( ri, ib, ic)) return; break;
++        case TM_SUB: if (try_subint( ri, ib, ic)) return; break;
++        case TM_MUL: if (try_mulint( ri, ib, ic)) return; break;
++        case TM_DIV: if (try_divint( ri, ib, ic)) return; break;
++        case TM_MOD: if (try_modint( ri, ib, ic)) return; break;
++        case TM_POW: if (try_powint( ri, ib, ic)) return; break;
++        case TM_UNM: if (try_unmint( ri, ib)) return; break;
++        default: lua_assert(0);
++      }
++    }
++    /* Fallback to floating point, when leaving range. */
++
++#ifdef LNUM_COMPLEX
++    if ((nvalue_img(b)!=0) || (nvalue_img(c)!=0)) {
++      lua_Complex r;
++      if (op==TM_UNM) {
++        r= -nvalue_complex_fast(b);     /* never an integer (or scalar) */
++        setnvalue_complex_fast( ra, r );
++      } else {
++        lua_Complex bb= nvalue_complex(b), cc= nvalue_complex(c);
++        switch (op) {
++          case TM_ADD: r= bb + cc; break;
++          case TM_SUB: r= bb - cc; break;
++          case TM_MUL: r= bb * cc; break;
++          case TM_DIV: r= bb / cc; break;
++          case TM_MOD: 
++            luaG_runerror(L, "attempt to use %% on complex numbers");  /* no return */
++          case TM_POW: r= luai_vectpow( bb, cc ); break;
++          default: lua_assert(0); r=0;
++        }
++        setnvalue_complex( ra, r );
+       }
++      return;
++    }
++#endif
++    nb = nvalue(b); nc = nvalue(c);
++    switch (op) {
++      case TM_ADD: setnvalue(ra, luai_numadd(nb, nc)); return;
++      case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); return;
++      case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); return;
++      case TM_DIV: setnvalue(ra, luai_numdiv(nb, nc)); return;
++      case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); return;
++      case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); return;
++      case TM_UNM: setnvalue(ra, luai_numunm(nb)); return;
++      default: lua_assert(0);
++    }
++  }
++  
++  /* Either operand not a number */
++  if (!call_binTM(L, rb, rc, ra, op))
++    luaG_aritherror(L, rb, rc);
++}
+ 
++/* Helper macro to sort arithmetic operations into four categories:
++ *  TK_INT: integer - integer operands
++ *  TK_NUMBER: number - number (non complex, either may be integer)
++ *  TK_NUMBER2: complex numbers (at least the other)
++ *  0: non-numeric (at least the other)
++*/
++#ifdef LNUM_COMPLEX
++static inline int arith_mode( const TValue *rb, const TValue *rc ) {
++  if (ttisint(rb) && ttisint(rc)) return TK_INT;
++  if (ttiscomplex(rb) || ttiscomplex(rc)) return TK_NUMBER2;
++  if (ttisnumber(rb) && ttisnumber(rc)) return TK_NUMBER;
++  return 0;
++}
++#else
++# define arith_mode(rb,rc) \
++    ( (ttisint(rb) && ttisint(rc)) ? TK_INT : \
++      (ttisnumber(rb) && ttisnumber(rc)) ? TK_NUMBER : 0 )
++#endif
++
++/* arith_op macro for two operators:
++ * automatically chooses, which function (number, integer, complex) to use
++ */
++#define ARITH_OP2_START( op_num, op_int ) \
++  int failed= 0; \
++  switch( arith_mode(rb,rc) ) { \
++    case TK_INT: \
++      if (op_int ( &(ra)->value.i, ivalue(rb), ivalue(rc) )) \
++        { ra->tt= LUA_TINT; break; } /* else flow through */ \
++    case TK_NUMBER: \
++      setnvalue(ra, op_num ( nvalue(rb), nvalue(rc) )); break;
++
++#define ARITH_OP2_END \
++    default: \
++      failed= 1; break; \
++  } if (!failed) continue;
++
++#define arith_op_continue_scalar( op_num, op_int ) \
++    ARITH_OP2_START( op_num, op_int ) \
++    ARITH_OP2_END
++
++#ifdef LNUM_COMPLEX
++# define arith_op_continue( op_num, op_int, op_complex ) \
++    ARITH_OP2_START( op_num, op_int ) \
++      case TK_NUMBER2: \
++        setnvalue_complex( ra, op_complex ( nvalue_complex(rb), nvalue_complex(rc) ) ); break; \
++    ARITH_OP2_END
++#else
++# define arith_op_continue(op_num,op_int,_) arith_op_continue_scalar(op_num,op_int)
++#endif
++
++/* arith_op macro for one operator:
++ */
++#define ARITH_OP1_START( op_num, op_int ) \
++  int failed= 0; \
++  switch( arith_mode(rb,rb) ) { \
++    case TK_INT: \
++      if (op_int ( &(ra)->value.i, ivalue(rb) )) \
++        { ra->tt= LUA_TINT; break; } /* else flow through */ \
++      case TK_NUMBER: \
++        setnvalue(ra, op_num (nvalue(rb))); break; \
++
++#define ARITH_OP1_END \
++      default: \
++        failed= 1; break; \
++  } if (!failed) continue;
++
++#ifdef LNUM_COMPLEX
++# define arith_op1_continue( op_num, op_int, op_complex ) \
++    ARITH_OP1_START( op_num, op_int ) \
++      case TK_NUMBER2: \
++        setnvalue_complex( ra, op_complex ( nvalue_complex_fast(rb) )); break; \
++    ARITH_OP1_END
++#else
++# define arith_op1_continue( op_num, op_int, _ ) \
++    ARITH_OP1_START( op_num, op_int ) \
++    ARITH_OP1_END
++#endif
+ 
+ 
+ void luaV_execute (lua_State *L, int nexeccalls) {
+@@ -472,38 +665,45 @@ void luaV_execute (lua_State *L, int nex
+         continue;
+       }
+       case OP_ADD: {
+-        arith_op(luai_numadd, TM_ADD);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue( luai_numadd, try_addint, luai_vectadd );
++        Protect(Arith(L, ra, rb, rc, TM_ADD)); \
+         continue;
+       }
+       case OP_SUB: {
+-        arith_op(luai_numsub, TM_SUB);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue( luai_numsub, try_subint, luai_vectsub );
++        Protect(Arith(L, ra, rb, rc, TM_SUB));
+         continue;
+       }
+       case OP_MUL: {
+-        arith_op(luai_nummul, TM_MUL);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue(luai_nummul, try_mulint, luai_vectmul);
++        Protect(Arith(L, ra, rb, rc, TM_MUL));
+         continue;
+       }
+       case OP_DIV: {
+-        arith_op(luai_numdiv, TM_DIV);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue(luai_numdiv, try_divint, luai_vectdiv);
++        Protect(Arith(L, ra, rb, rc, TM_DIV));
+         continue;
+       }
+       case OP_MOD: {
+-        arith_op(luai_nummod, TM_MOD);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue_scalar(luai_nummod, try_modint);  /* scalars only */
++        Protect(Arith(L, ra, rb, rc, TM_MOD));
+         continue;
+       }
+       case OP_POW: {
+-        arith_op(luai_numpow, TM_POW);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue(luai_numpow, try_powint, luai_vectpow);
++        Protect(Arith(L, ra, rb, rc, TM_POW));
+         continue;
+       }
+       case OP_UNM: {
+         TValue *rb = RB(i);
+-        if (ttisnumber(rb)) {
+-          lua_Number nb = nvalue(rb);
+-          setnvalue(ra, luai_numunm(nb));
+-        }
+-        else {
+-          Protect(Arith(L, ra, rb, rb, TM_UNM));
+-        }
++        arith_op1_continue(luai_numunm, try_unmint, luai_vectunm);
++        Protect(Arith(L, ra, rb, rb, TM_UNM));
+         continue;
+       }
+       case OP_NOT: {
+@@ -515,11 +715,11 @@ void luaV_execute (lua_State *L, int nex
+         const TValue *rb = RB(i);
+         switch (ttype(rb)) {
+           case LUA_TTABLE: {
+-            setnvalue(ra, cast_num(luaH_getn(hvalue(rb))));
++            setivalue(ra, luaH_getn(hvalue(rb)));
+             break;
+           }
+           case LUA_TSTRING: {
+-            setnvalue(ra, cast_num(tsvalue(rb)->len));
++            setivalue(ra, tsvalue(rb)->len);
+             break;
+           }
+           default: {  /* try metamethod */
+@@ -652,14 +852,30 @@ void luaV_execute (lua_State *L, int nex
+         }
+       }
+       case OP_FORLOOP: {
+-        lua_Number step = nvalue(ra+2);
+-        lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
+-        lua_Number limit = nvalue(ra+1);
+-        if (luai_numlt(0, step) ? luai_numle(idx, limit)
+-                                : luai_numle(limit, idx)) {
+-          dojump(L, pc, GETARG_sBx(i));  /* jump back */
+-          setnvalue(ra, idx);  /* update internal index... */
+-          setnvalue(ra+3, idx);  /* ...and external index */
++        /* If start,step and limit are all integers, we don't need to check
++         * against overflow in the looping.
++         */
++        if (ttisint(ra) && ttisint(ra+1) && ttisint(ra+2)) {
++          lua_Integer step = ivalue(ra+2);
++          lua_Integer idx = ivalue(ra) + step; /* increment index */
++          lua_Integer limit = ivalue(ra+1);
++          if (step > 0 ? (idx <= limit) : (limit <= idx)) {
++            dojump(L, pc, GETARG_sBx(i));  /* jump back */
++            setivalue(ra, idx);  /* update internal index... */
++            setivalue(ra+3, idx);  /* ...and external index */
++          }
++        } else {
++          /* non-integer looping (don't use 'nvalue_fast', some may be integer!) 
++          */
++          lua_Number step = nvalue(ra+2);
++          lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
++          lua_Number limit = nvalue(ra+1);
++          if (luai_numlt(0, step) ? luai_numle(idx, limit)
++                                  : luai_numle(limit, idx)) {
++            dojump(L, pc, GETARG_sBx(i));  /* jump back */
++            setnvalue(ra, idx);  /* update internal index... */
++            setnvalue(ra+3, idx);  /* ...and external index */
++          }
+         }
+         continue;
+       }
+@@ -668,13 +884,21 @@ void luaV_execute (lua_State *L, int nex
+         const TValue *plimit = ra+1;
+         const TValue *pstep = ra+2;
+         L->savedpc = pc;  /* next steps may throw errors */
++        /* Using same location for tonumber's both arguments, effectively does
++         * in-place modification (string->number). */
+         if (!tonumber(init, ra))
+           luaG_runerror(L, LUA_QL("for") " initial value must be a number");
+         else if (!tonumber(plimit, ra+1))
+           luaG_runerror(L, LUA_QL("for") " limit must be a number");
+         else if (!tonumber(pstep, ra+2))
+           luaG_runerror(L, LUA_QL("for") " step must be a number");
+-        setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep)));
++        /* Step back one value (keep within integers if we can)
++         */
++        if (!( ttisint(ra) && ttisint(pstep) &&
++               try_subint( &ra->value.i, ivalue(ra), ivalue(pstep) ) )) {
++            /* don't use 'nvalue_fast()', values may be integer */
++            setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep)));
++        }
+         dojump(L, pc, GETARG_sBx(i));
+         continue;
+       }
+@@ -711,7 +935,7 @@ void luaV_execute (lua_State *L, int nex
+           luaH_resizearray(L, h, last);  /* pre-alloc it at once */
+         for (; n > 0; n--) {
+           TValue *val = ra+n;
+-          setobj2t(L, luaH_setnum(L, h, last--), val);
++          setobj2t(L, luaH_setint(L, h, last--), val);
+           luaC_barriert(L, h, val);
+         }
+         continue;
+--- a/src/lvm.h
++++ b/src/lvm.h
+@@ -15,11 +15,9 @@
+ 
+ #define tostring(L,o) ((ttype(o) == LUA_TSTRING) || (luaV_tostring(L, o)))
+ 
+-#define tonumber(o,n)	(ttype(o) == LUA_TNUMBER || \
+-                         (((o) = luaV_tonumber(o,n)) != NULL))
++#define tonumber(o,n) (ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL))
+ 
+-#define equalobj(L,o1,o2) \
+-	(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
++#define equalobj(L,o1,o2) (ttype_ext_same(o1,o2) && luaV_equalval(L, o1, o2))
+ 
+ 
+ LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
+--- a/src/print.c
++++ b/src/print.c
+@@ -14,6 +14,7 @@
+ #include "lobject.h"
+ #include "lopcodes.h"
+ #include "lundump.h"
++#include "lnum.h"
+ 
+ #define PrintFunction	luaU_print
+ 
+@@ -59,8 +60,16 @@ static void PrintConstant(const Proto* f
+   case LUA_TBOOLEAN:
+ 	printf(bvalue(o) ? "true" : "false");
+ 	break;
++  case LUA_TINT:
++	printf(LUA_INTEGER_FMT,ivalue(o));
++	break;
+   case LUA_TNUMBER:
+-	printf(LUA_NUMBER_FMT,nvalue(o));
++#ifdef LNUM_COMPLEX
++    // TBD: Do we get complex values here?
++    { lua_Number b= nvalue_img_fast(o);
++	  printf( LUA_NUMBER_FMT "%s" LUA_NUMBER_FMT "i", nvalue_fast(o), b>=0 ? "+":"", b ); }
++#endif
++	printf(LUA_NUMBER_FMT,nvalue_fast(o));
+ 	break;
+   case LUA_TSTRING:
+ 	PrintString(rawtsvalue(o));
diff --git a/trunk/package/utils/lua/patches-host/011-lnum-use-double.patch b/trunk/package/utils/lua/patches-host/011-lnum-use-double.patch
new file mode 100644
index 00000000..14c720bf
--- /dev/null
+++ b/trunk/package/utils/lua/patches-host/011-lnum-use-double.patch
@@ -0,0 +1,11 @@
+--- a/src/lnum_config.h
++++ b/src/lnum_config.h
+@@ -11,7 +11,7 @@
+ ** Default number modes
+ */
+ #if (!defined LNUM_DOUBLE) && (!defined LNUM_FLOAT) && (!defined LNUM_LDOUBLE)
+-# define LNUM_FLOAT
++# define LNUM_DOUBLE
+ #endif
+ #if (!defined LNUM_INT16) && (!defined LNUM_INT32) && (!defined LNUM_INT64)
+ # define LNUM_INT32
diff --git a/trunk/package/utils/lua/patches-host/015-lnum-ppc-compat.patch b/trunk/package/utils/lua/patches-host/015-lnum-ppc-compat.patch
new file mode 100644
index 00000000..2ea59f17
--- /dev/null
+++ b/trunk/package/utils/lua/patches-host/015-lnum-ppc-compat.patch
@@ -0,0 +1,11 @@
+--- a/src/lua.h
++++ b/src/lua.h
+@@ -79,7 +79,7 @@ typedef void * (*lua_Alloc) (void *ud, v
+  *     not acceptable for 5.1, maybe 5.2 onwards?
+  *  9: greater than existing (5.1) type values.
+ */
+-#define LUA_TINT (-2)
++#define LUA_TINT 9
+ 
+ #define LUA_TNIL		0
+ #define LUA_TBOOLEAN		1
diff --git a/trunk/package/utils/lua/patches-host/030-archindependent-bytecode.patch b/trunk/package/utils/lua/patches-host/030-archindependent-bytecode.patch
new file mode 100644
index 00000000..8dfef85d
--- /dev/null
+++ b/trunk/package/utils/lua/patches-host/030-archindependent-bytecode.patch
@@ -0,0 +1,111 @@
+--- a/src/ldump.c
++++ b/src/ldump.c
+@@ -67,12 +67,12 @@ static void DumpString(const TString* s,
+ {
+  if (s==NULL || getstr(s)==NULL)
+  {
+-  size_t size=0;
++  unsigned int size=0;
+   DumpVar(size,D);
+  }
+  else
+  {
+-  size_t size=s->tsv.len+1;		/* include trailing '\0' */
++  unsigned int size=s->tsv.len+1;		/* include trailing '\0' */
+   DumpVar(size,D);
+   DumpBlock(getstr(s),size,D);
+  }
+--- a/src/lundump.c
++++ b/src/lundump.c
+@@ -25,6 +25,7 @@ typedef struct {
+  ZIO* Z;
+  Mbuffer* b;
+  const char* name;
++ int swap;
+ } LoadState;
+ 
+ #ifdef LUAC_TRUST_BINARIES
+@@ -40,7 +41,6 @@ static void error(LoadState* S, const ch
+ }
+ #endif
+ 
+-#define LoadMem(S,b,n,size)	LoadBlock(S,b,(n)*(size))
+ #define	LoadByte(S)		(lu_byte)LoadChar(S)
+ #define LoadVar(S,x)		LoadMem(S,&x,1,sizeof(x))
+ #define LoadVector(S,b,n,size)	LoadMem(S,b,n,size)
+@@ -51,6 +51,49 @@ static void LoadBlock(LoadState* S, void
+  IF (r!=0, "unexpected end");
+ }
+ 
++static void LoadMem (LoadState* S, void* b, int n, size_t size)
++{
++ LoadBlock(S,b,n*size);
++ if (S->swap)
++ {
++  char* p=(char*) b;
++  char c;
++  switch (size)
++  {
++   case 1:
++  	break;
++   case 2:
++	while (n--)
++	{
++	 c=p[0]; p[0]=p[1]; p[1]=c;
++	 p+=2;
++	}
++  	break;
++   case 4:
++	while (n--)
++	{
++	 c=p[0]; p[0]=p[3]; p[3]=c;
++	 c=p[1]; p[1]=p[2]; p[2]=c;
++	 p+=4;
++	}
++  	break;
++   case 8:
++	while (n--)
++	{
++	 c=p[0]; p[0]=p[7]; p[7]=c;
++	 c=p[1]; p[1]=p[6]; p[6]=c;
++	 c=p[2]; p[2]=p[5]; p[5]=c;
++	 c=p[3]; p[3]=p[4]; p[4]=c;
++	 p+=8;
++	}
++  	break;
++   default:
++   	IF(1, "bad size");
++  	break;
++  }
++ }
++}
++
+ static int LoadChar(LoadState* S)
+ {
+  char x;
+@@ -82,7 +125,7 @@ static lua_Integer LoadInteger(LoadState
+ 
+ static TString* LoadString(LoadState* S)
+ {
+- size_t size;
++ unsigned int size;
+  LoadVar(S,size);
+  if (size==0)
+   return NULL;
+@@ -196,6 +239,7 @@ static void LoadHeader(LoadState* S)
+  char s[LUAC_HEADERSIZE];
+  luaU_header(h);
+  LoadBlock(S,s,LUAC_HEADERSIZE);
++ S->swap=(s[6]!=h[6]); s[6]=h[6];
+  IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
+ }
+ 
+@@ -230,7 +274,7 @@ void luaU_header (char* h)
+  *h++=(char)LUAC_FORMAT;
+  *h++=(char)*(char*)&x;				/* endianness */
+  *h++=(char)sizeof(int);
+- *h++=(char)sizeof(size_t);
++ *h++=(char)sizeof(unsigned int);
+  *h++=(char)sizeof(Instruction);
+  *h++=(char)sizeof(lua_Number);
+ 
diff --git a/trunk/package/utils/lua/patches-host/100-no_readline.patch b/trunk/package/utils/lua/patches-host/100-no_readline.patch
new file mode 100644
index 00000000..209c302b
--- /dev/null
+++ b/trunk/package/utils/lua/patches-host/100-no_readline.patch
@@ -0,0 +1,49 @@
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -38,7 +38,6 @@
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+-#define LUA_USE_READLINE	/* needs some extra libraries */
+ #endif
+ 
+ #if defined(LUA_USE_MACOSX)
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,6 +17,7 @@
+ MYCFLAGS=
+ MYLDFLAGS=
+ MYLIBS=
++# USE_READLINE=1
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+@@ -75,7 +76,7 @@
+ 	@echo "MYLIBS = $(MYLIBS)"
+ 
+ # convenience targets for popular platforms
+-
++RFLAG=$(if $(USE_READLINE),-DLUA_USE_READLINE)
+ none:
+ 	@echo "Please choose a platform:"
+ 	@echo "   $(PLATS)"
+@@ -90,16 +91,16 @@
+ 	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
+ 
+ freebsd:
+-	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
++	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" $(RFLAG)" MYLIBS="-Wl,-E$(if $(USE_READLINE), -lreadline)"
+ 
+ generic:
+ 	$(MAKE) all MYCFLAGS=
+ 
+ linux:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
++	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX $(RFLAG)" MYLIBS="-Wl,-E -ldl $(if $(USE_READLINE), -lreadline -lhistory -lncurses)"
+ 
+ macosx:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
++	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX $(if $(USE_READLINE), MYLIBS="-lreadline")
+ # use this on Mac OS X 10.3-
+ #	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+ 
diff --git a/trunk/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch b/trunk/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
new file mode 100644
index 00000000..74b8c6f8
--- /dev/null
+++ b/trunk/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
@@ -0,0 +1,3736 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -25,7 +25,7 @@ PLATS= aix ansi bsd freebsd generic linu
+ LUA_A=	liblua.a
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+-	lundump.o lvm.o lzio.o
++	lundump.o lvm.o lzio.o lnum.o
+ LIB_O=	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
+ 	lstrlib.o loadlib.o linit.o
+ 
+@@ -148,6 +148,7 @@ llex.o: llex.c lua.h luaconf.h ldo.h lob
+ lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h
+ lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+   ltm.h lzio.h lmem.h ldo.h
++lnum.o: lnum.c lua.h llex.h lnum.h
+ loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h
+ lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \
+   ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h
+@@ -179,4 +180,18 @@ lzio.o: lzio.c lua.h luaconf.h llimits.h
+ print.o: print.c ldebug.h lstate.h lua.h luaconf.h lobject.h llimits.h \
+   ltm.h lzio.h lmem.h lopcodes.h lundump.h
+ 
++luaconf.h: lnum_config.h
++lapi.c: lnum.h
++lauxlib.c: llimits.h
++lbaselib.c: llimits.h lobject.h lapi.h
++lcode.c: lnum.h
++liolib.c: lnum.h llex.h
++llex.c: lnum.h
++lnum.h: lobject.h
++lobject.c: llex.h lnum.h
++ltable.c: lnum.h
++lua.c: llimits.h
++lvm.c: llex.h lnum.h
++print.c: lnum.h
++
+ # (end of Makefile)
+--- a/src/lapi.c
++++ b/src/lapi.c
+@@ -28,7 +28,7 @@
+ #include "ltm.h"
+ #include "lundump.h"
+ #include "lvm.h"
+-
++#include "lnum.h"
+ 
+ 
+ const char lua_ident[] =
+@@ -241,12 +241,13 @@ LUA_API void lua_pushvalue (lua_State *L
+ 
+ LUA_API int lua_type (lua_State *L, int idx) {
+   StkId o = index2adr(L, idx);
+-  return (o == luaO_nilobject) ? LUA_TNONE : ttype(o);
++  return (o == luaO_nilobject) ? LUA_TNONE : ttype_ext(o);
+ }
+ 
+ 
+ LUA_API const char *lua_typename (lua_State *L, int t) {
+   UNUSED(L);
++  lua_assert( t!= LUA_TINT );
+   return (t == LUA_TNONE) ? "no value" : luaT_typenames[t];
+ }
+ 
+@@ -264,6 +265,14 @@ LUA_API int lua_isnumber (lua_State *L, 
+ }
+ 
+ 
++LUA_API int lua_isinteger (lua_State *L, int idx) {
++  TValue tmp;
++  lua_Integer dum;
++  const TValue *o = index2adr(L, idx);
++  return tonumber(o,&tmp) && (ttisint(o) || tt_integer_valued(o,&dum));
++}
++
++
+ LUA_API int lua_isstring (lua_State *L, int idx) {
+   int t = lua_type(L, idx);
+   return (t == LUA_TSTRING || t == LUA_TNUMBER);
+@@ -309,31 +318,66 @@ LUA_API int lua_lessthan (lua_State *L, 
+ }
+ 
+ 
+-
+ LUA_API lua_Number lua_tonumber (lua_State *L, int idx) {
+   TValue n;
+   const TValue *o = index2adr(L, idx);
+-  if (tonumber(o, &n))
++  if (tonumber(o, &n)) {
++#ifdef LNUM_COMPLEX
++    if (nvalue_img(o) != 0)
++      luaG_runerror(L, "expecting a real number");
++#endif
+     return nvalue(o);
+-  else
+-    return 0;
++  }
++  return 0;
+ }
+ 
+ 
+ LUA_API lua_Integer lua_tointeger (lua_State *L, int idx) {
+   TValue n;
++    /* Lua 5.1 documented behaviour is to return nonzero for non-integer:
++     * "If the number is not an integer, it is truncated in some non-specified way." 
++     * I would suggest to change this, to return 0 for anything that would
++     * not fit in 'lua_Integer'.
++     */
++#ifdef LUA_COMPAT_TOINTEGER
++  /* Lua 5.1 compatible */
+   const TValue *o = index2adr(L, idx);
+   if (tonumber(o, &n)) {
+-    lua_Integer res;
+-    lua_Number num = nvalue(o);
+-    lua_number2integer(res, num);
+-    return res;
++    lua_Integer i;
++    lua_Number d;
++    if (ttisint(o)) return ivalue(o);
++    d= nvalue_fast(o);
++# ifdef LNUM_COMPLEX
++    if (nvalue_img_fast(o) != 0)
++      luaG_runerror(L, "expecting a real number");
++# endif
++    lua_number2integer(i, d);
++    return i;
+   }
+-  else
+-    return 0;
++#else
++  /* New suggestion */
++  const TValue *o = index2adr(L, idx);
++  if (tonumber(o, &n)) {
++    lua_Integer i;
++    if (ttisint(o)) return ivalue(o);
++    if (tt_integer_valued(o,&i)) return i;
++  }
++#endif
++  return 0;
+ }
+ 
+ 
++#ifdef LNUM_COMPLEX
++LUA_API lua_Complex lua_tocomplex (lua_State *L, int idx) {
++  TValue tmp;
++  const TValue *o = index2adr(L, idx);
++  if (tonumber(o, &tmp))
++    return nvalue_complex(o);
++  return 0;
++}
++#endif
++
++
+ LUA_API int lua_toboolean (lua_State *L, int idx) {
+   const TValue *o = index2adr(L, idx);
+   return !l_isfalse(o);
+@@ -364,6 +408,7 @@ LUA_API size_t lua_objlen (lua_State *L,
+     case LUA_TSTRING: return tsvalue(o)->len;
+     case LUA_TUSERDATA: return uvalue(o)->len;
+     case LUA_TTABLE: return luaH_getn(hvalue(o));
++    case LUA_TINT:
+     case LUA_TNUMBER: {
+       size_t l;
+       lua_lock(L);  /* `luaV_tostring' may create a new string */
+@@ -426,6 +471,8 @@ LUA_API void lua_pushnil (lua_State *L) 
+ }
+ 
+ 
++/* 'lua_pushnumber()' may lose accuracy on integers, 'lua_pushinteger' will not.
++ */
+ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
+   lua_lock(L);
+   setnvalue(L->top, n);
+@@ -434,12 +481,22 @@ LUA_API void lua_pushnumber (lua_State *
+ }
+ 
+ 
+-LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
++LUA_API void lua_pushinteger (lua_State *L, lua_Integer i) {
++  lua_lock(L);
++  setivalue(L->top, i);
++  api_incr_top(L);
++  lua_unlock(L);
++}
++
++
++#ifdef LNUM_COMPLEX
++LUA_API void lua_pushcomplex (lua_State *L, lua_Complex v) {
+   lua_lock(L);
+-  setnvalue(L->top, cast_num(n));
++  setnvalue_complex( L->top, v );
+   api_incr_top(L);
+   lua_unlock(L);
+ }
++#endif
+ 
+ 
+ LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
+@@ -569,7 +626,7 @@ LUA_API void lua_rawgeti (lua_State *L, 
+   lua_lock(L);
+   o = index2adr(L, idx);
+   api_check(L, ttistable(o));
+-  setobj2s(L, L->top, luaH_getnum(hvalue(o), n));
++  setobj2s(L, L->top, luaH_getint(hvalue(o), n));
+   api_incr_top(L);
+   lua_unlock(L);
+ }
+@@ -597,6 +654,9 @@ LUA_API int lua_getmetatable (lua_State 
+     case LUA_TUSERDATA:
+       mt = uvalue(obj)->metatable;
+       break;
++    case LUA_TINT:
++      mt = G(L)->mt[LUA_TNUMBER];
++      break;
+     default:
+       mt = G(L)->mt[ttype(obj)];
+       break;
+@@ -687,7 +747,7 @@ LUA_API void lua_rawseti (lua_State *L, 
+   api_checknelems(L, 1);
+   o = index2adr(L, idx);
+   api_check(L, ttistable(o));
+-  setobj2t(L, luaH_setnum(L, hvalue(o), n), L->top-1);
++  setobj2t(L, luaH_setint(L, hvalue(o), n), L->top-1);
+   luaC_barriert(L, hvalue(o), L->top-1);
+   L->top--;
+   lua_unlock(L);
+@@ -721,7 +781,7 @@ LUA_API int lua_setmetatable (lua_State 
+       break;
+     }
+     default: {
+-      G(L)->mt[ttype(obj)] = mt;
++      G(L)->mt[ttype_ext(obj)] = mt;
+       break;
+     }
+   }
+@@ -1085,3 +1145,32 @@ LUA_API const char *lua_setupvalue (lua_
+   return name;
+ }
+ 
++
++/* Help function for 'luaB_tonumber()', avoids multiple str->number
++ * conversions for Lua "tonumber()".
++ *
++ * Also pushes floating point numbers with integer value as integer, which
++ * can be used by 'tonumber()' in scripts to bring values back to integer
++ * realm.
++ *
++ * Note: The 'back to integer realm' is _not_ to affect string conversions:
++ * 'tonumber("4294967295.1")' should give a floating point value, although
++ * the value would be 4294967296 (and storable in int64 realm).
++ */
++int lua_pushvalue_as_number (lua_State *L, int idx)
++{
++  const TValue *o = index2adr(L, idx);
++  TValue tmp;
++  lua_Integer i;
++  if (ttisnumber(o)) {
++    if ( (!ttisint(o)) && tt_integer_valued(o,&i)) {
++      lua_pushinteger( L, i );
++      return 1;
++    }
++  } else if (!tonumber(o, &tmp)) {
++    return 0;
++  }
++  if (ttisint(o)) lua_pushinteger( L, ivalue(o) );
++  else lua_pushnumber( L, nvalue_fast(o) );
++  return 1;
++}
+--- a/src/lapi.h
++++ b/src/lapi.h
+@@ -13,4 +13,6 @@
+ 
+ LUAI_FUNC void luaA_pushobject (lua_State *L, const TValue *o);
+ 
++int lua_pushvalue_as_number (lua_State *L, int idx);
++
+ #endif
+--- a/src/lauxlib.c
++++ b/src/lauxlib.c
+@@ -23,7 +23,7 @@
+ #include "lua.h"
+ 
+ #include "lauxlib.h"
+-
++#include "llimits.h"
+ 
+ #define FREELIST_REF	0	/* free list of references */
+ 
+@@ -66,7 +66,7 @@ LUALIB_API int luaL_typerror (lua_State 
+ 
+ 
+ static void tag_error (lua_State *L, int narg, int tag) {
+-  luaL_typerror(L, narg, lua_typename(L, tag));
++  luaL_typerror(L, narg, tag==LUA_TINT ? "integer" : lua_typename(L, tag));
+ }
+ 
+ 
+@@ -188,8 +188,8 @@ LUALIB_API lua_Number luaL_optnumber (lu
+ 
+ LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) {
+   lua_Integer d = lua_tointeger(L, narg);
+-  if (d == 0 && !lua_isnumber(L, narg))  /* avoid extra test when d is not 0 */
+-    tag_error(L, narg, LUA_TNUMBER);
++  if (d == 0 && !lua_isinteger(L, narg))  /* avoid extra test when d is not 0 */
++    tag_error(L, narg, LUA_TINT);
+   return d;
+ }
+ 
+@@ -200,6 +200,16 @@ LUALIB_API lua_Integer luaL_optinteger (
+ }
+ 
+ 
++#ifdef LNUM_COMPLEX
++LUALIB_API lua_Complex luaL_checkcomplex (lua_State *L, int narg) {
++  lua_Complex c = lua_tocomplex(L, narg);
++  if (c == 0 && !lua_isnumber(L, narg))  /* avoid extra test when c is not 0 */
++    tag_error(L, narg, LUA_TNUMBER);
++  return c;
++}
++#endif
++
++
+ LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
+   if (!lua_getmetatable(L, obj))  /* no metatable? */
+     return 0;
+--- a/src/lauxlib.h
++++ b/src/lauxlib.h
+@@ -57,6 +57,12 @@ LUALIB_API lua_Number (luaL_optnumber) (
+ LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
+ LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
+                                           lua_Integer def);
++#define luaL_checkint32(L,narg) ((int)luaL_checkinteger(L,narg))
++#define luaL_optint32(L,narg,def) ((int)luaL_optinteger(L,narg,def))
++
++#ifdef LNUM_COMPLEX
++  LUALIB_API lua_Complex (luaL_checkcomplex) (lua_State *L, int narg);
++#endif
+ 
+ LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
+ LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
+--- a/src/lbaselib.c
++++ b/src/lbaselib.c
+@@ -18,7 +18,9 @@
+ 
+ #include "lauxlib.h"
+ #include "lualib.h"
+-
++#include "llimits.h"
++#include "lobject.h"
++#include "lapi.h"
+ 
+ 
+ 
+@@ -54,20 +56,25 @@ static int luaB_tonumber (lua_State *L) 
+   int base = luaL_optint(L, 2, 10);
+   if (base == 10) {  /* standard conversion */
+     luaL_checkany(L, 1);
+-    if (lua_isnumber(L, 1)) {
+-      lua_pushnumber(L, lua_tonumber(L, 1));
++    if (lua_isnumber(L, 1)) {       /* numeric string, or a number */
++      lua_pushvalue_as_number(L,1);     /* API extension (not to lose accuracy here) */
+       return 1;
+-    }
++	}
+   }
+   else {
+     const char *s1 = luaL_checkstring(L, 1);
+     char *s2;
+-    unsigned long n;
++    unsigned LUA_INTEGER n;
+     luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+-    n = strtoul(s1, &s2, base);
++    n = lua_str2ul(s1, &s2, base);
+     if (s1 != s2) {  /* at least one valid digit? */
+       while (isspace((unsigned char)(*s2))) s2++;  /* skip trailing spaces */
+       if (*s2 == '\0') {  /* no invalid trailing characters? */
++	  
++		/* Push as number, there needs to be separate 'luaB_tointeger' for
++		 * when the caller wants to preserve the bits (matters if unsigned
++		 * values are used).
++		 */
+         lua_pushnumber(L, (lua_Number)n);
+         return 1;
+       }
+@@ -144,7 +151,7 @@ static int luaB_setfenv (lua_State *L) {
+   luaL_checktype(L, 2, LUA_TTABLE);
+   getfunc(L, 0);
+   lua_pushvalue(L, 2);
+-  if (lua_isnumber(L, 1) && lua_tonumber(L, 1) == 0) {
++  if (lua_isnumber(L, 1) && lua_tointeger(L, 1) == 0) {
+     /* change environment of current thread */
+     lua_pushthread(L);
+     lua_insert(L, -2);
+@@ -209,7 +216,7 @@ static int luaB_collectgarbage (lua_Stat
+       return 1;
+     }
+     default: {
+-      lua_pushnumber(L, res);
++      lua_pushinteger(L, res);
+       return 1;
+     }
+   }
+@@ -631,6 +638,8 @@ static void base_open (lua_State *L) {
+   luaL_register(L, "_G", base_funcs);
+   lua_pushliteral(L, LUA_VERSION);
+   lua_setglobal(L, "_VERSION");  /* set global _VERSION */
++  lua_pushliteral(L, LUA_LNUM);
++  lua_setglobal(L, "_LNUM");  /* "[complex] double|float|ldouble int32|int64" */
+   /* `ipairs' and `pairs' need auxiliary functions as upvalues */
+   auxopen(L, "ipairs", luaB_ipairs, ipairsaux);
+   auxopen(L, "pairs", luaB_pairs, luaB_next);
+--- a/src/lcode.c
++++ b/src/lcode.c
+@@ -22,13 +22,18 @@
+ #include "lopcodes.h"
+ #include "lparser.h"
+ #include "ltable.h"
++#include "lnum.h"
+ 
+ 
+ #define hasjumps(e)	((e)->t != (e)->f)
+ 
+-
+ static int isnumeral(expdesc *e) {
+-  return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP);
++  int ek=
++#ifdef LNUM_COMPLEX
++    (e->k == VKNUM2) ||
++#endif
++    (e->k == VKINT) || (e->k == VKNUM);
++  return (ek && e->t == NO_JUMP && e->f == NO_JUMP);
+ }
+ 
+ 
+@@ -231,12 +236,16 @@ static int addk (FuncState *fs, TValue *
+   TValue *idx = luaH_set(L, fs->h, k);
+   Proto *f = fs->f;
+   int oldsize = f->sizek;
+-  if (ttisnumber(idx)) {
+-    lua_assert(luaO_rawequalObj(&fs->f->k[cast_int(nvalue(idx))], v));
+-    return cast_int(nvalue(idx));
++  if (ttype(idx)==LUA_TNUMBER) {
++    luai_normalize(idx);
++    lua_assert( ttype(idx)==LUA_TINT );     /* had no fraction */
++  }
++  if (ttisint(idx)) {
++    lua_assert(luaO_rawequalObj(&fs->f->k[ivalue(idx)], v));
++    return cast_int(ivalue(idx));
+   }
+   else {  /* constant not found; create a new entry */
+-    setnvalue(idx, cast_num(fs->nk));
++    setivalue(idx, fs->nk);
+     luaM_growvector(L, f->k, fs->nk, f->sizek, TValue,
+                     MAXARG_Bx, "constant table overflow");
+     while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
+@@ -261,6 +270,21 @@ int luaK_numberK (FuncState *fs, lua_Num
+ }
+ 
+ 
++int luaK_integerK (FuncState *fs, lua_Integer r) {
++  TValue o;
++  setivalue(&o, r);
++  return addk(fs, &o, &o);
++}
++
++
++#ifdef LNUM_COMPLEX
++static int luaK_imagK (FuncState *fs, lua_Number r) {
++  TValue o;
++  setnvalue_complex(&o, r*I);
++  return addk(fs, &o, &o);
++}
++#endif
++
+ static int boolK (FuncState *fs, int b) {
+   TValue o;
+   setbvalue(&o, b);
+@@ -359,6 +383,16 @@ static void discharge2reg (FuncState *fs
+       luaK_codeABx(fs, OP_LOADK, reg, luaK_numberK(fs, e->u.nval));
+       break;
+     }
++    case VKINT: {
++      luaK_codeABx(fs, OP_LOADK, reg, luaK_integerK(fs, e->u.ival));
++      break;
++    }
++#ifdef LNUM_COMPLEX
++    case VKNUM2: {
++      luaK_codeABx(fs, OP_LOADK, reg, luaK_imagK(fs, e->u.nval));
++      break;
++    }
++#endif
+     case VRELOCABLE: {
+       Instruction *pc = &getcode(fs, e);
+       SETARG_A(*pc, reg);
+@@ -444,6 +478,10 @@ void luaK_exp2val (FuncState *fs, expdes
+ int luaK_exp2RK (FuncState *fs, expdesc *e) {
+   luaK_exp2val(fs, e);
+   switch (e->k) {
++#ifdef LNUM_COMPLEX
++    case VKNUM2:
++#endif
++    case VKINT:
+     case VKNUM:
+     case VTRUE:
+     case VFALSE:
+@@ -451,6 +489,10 @@ int luaK_exp2RK (FuncState *fs, expdesc 
+       if (fs->nk <= MAXINDEXRK) {  /* constant fit in RK operand? */
+         e->u.s.info = (e->k == VNIL)  ? nilK(fs) :
+                       (e->k == VKNUM) ? luaK_numberK(fs, e->u.nval) :
++                      (e->k == VKINT) ? luaK_integerK(fs, e->u.ival) :
++#ifdef LNUM_COMPLEX
++                      (e->k == VKNUM2) ? luaK_imagK(fs, e->u.nval) :
++#endif
+                                         boolK(fs, (e->k == VTRUE));
+         e->k = VK;
+         return RKASK(e->u.s.info);
+@@ -540,7 +582,10 @@ void luaK_goiftrue (FuncState *fs, expde
+   int pc;  /* pc of last jump */
+   luaK_dischargevars(fs, e);
+   switch (e->k) {
+-    case VK: case VKNUM: case VTRUE: {
++#ifdef LNUM_COMPLEX
++    case VKNUM2:
++#endif
++    case VKINT: case VK: case VKNUM: case VTRUE: {
+       pc = NO_JUMP;  /* always true; do nothing */
+       break;
+     }
+@@ -590,7 +635,10 @@ static void codenot (FuncState *fs, expd
+       e->k = VTRUE;
+       break;
+     }
+-    case VK: case VKNUM: case VTRUE: {
++#ifdef LNUM_COMPLEX
++    case VKNUM2:
++#endif
++    case VKINT: case VK: case VKNUM: case VTRUE: {
+       e->k = VFALSE;
+       break;
+     }
+@@ -626,25 +674,70 @@ void luaK_indexed (FuncState *fs, expdes
+ 
+ static int constfolding (OpCode op, expdesc *e1, expdesc *e2) {
+   lua_Number v1, v2, r;
++  int vkres= VKNUM;
+   if (!isnumeral(e1) || !isnumeral(e2)) return 0;
+-  v1 = e1->u.nval;
+-  v2 = e2->u.nval;
++
++  /* real and imaginary parts don't mix. */
++#ifdef LNUM_COMPLEX
++  if (e1->k == VKNUM2) {
++    if ((op != OP_UNM) && (e2->k != VKNUM2)) return 0; 
++    vkres= VKNUM2; }
++  else if (e2->k == VKNUM2) { return 0; }
++#endif
++  if ((e1->k == VKINT) && (e2->k == VKINT)) {
++    lua_Integer i1= e1->u.ival, i2= e2->u.ival;
++    lua_Integer rr;
++    int done= 0;
++    /* Integer/integer calculations (may end up producing floating point) */
++    switch (op) {
++      case OP_ADD: done= try_addint( &rr, i1, i2 ); break;
++      case OP_SUB: done= try_subint( &rr, i1, i2 ); break;
++      case OP_MUL: done= try_mulint( &rr, i1, i2 ); break;
++      case OP_DIV: done= try_divint( &rr, i1, i2 ); break;
++      case OP_MOD: done= try_modint( &rr, i1, i2 ); break;
++      case OP_POW: done= try_powint( &rr, i1, i2 ); break;
++      case OP_UNM: done= try_unmint( &rr, i1 ); break;
++      default:     done= 0; break;
++    }
++    if (done) {
++      e1->u.ival = rr;  /* remained within integer range */
++      return 1;
++    }
++  }
++  v1 = (e1->k == VKINT) ? ((lua_Number)e1->u.ival) : e1->u.nval;
++  v2 = (e2->k == VKINT) ? ((lua_Number)e2->u.ival) : e2->u.nval;
++
+   switch (op) {
+     case OP_ADD: r = luai_numadd(v1, v2); break;
+     case OP_SUB: r = luai_numsub(v1, v2); break;
+-    case OP_MUL: r = luai_nummul(v1, v2); break;
++    case OP_MUL: 
++#ifdef LNUM_COMPLEX
++        if (vkres==VKNUM2) return 0;    /* leave to runtime (could do here, but not worth it?) */
++#endif
++        r = luai_nummul(v1, v2); break;
+     case OP_DIV:
+       if (v2 == 0) return 0;  /* do not attempt to divide by 0 */
+-      r = luai_numdiv(v1, v2); break;
++#ifdef LNUM_COMPLEX
++        if (vkres==VKNUM2) return 0;    /* leave to runtime */
++#endif
++        r = luai_numdiv(v1, v2); break;
+     case OP_MOD:
+       if (v2 == 0) return 0;  /* do not attempt to divide by 0 */
++#ifdef LNUM_COMPLEX
++      if (vkres==VKNUM2) return 0;    /* leave to runtime */
++#endif
+       r = luai_nummod(v1, v2); break;
+-    case OP_POW: r = luai_numpow(v1, v2); break;
++    case OP_POW: 
++#ifdef LNUM_COMPLEX
++      if (vkres==VKNUM2) return 0;    /* leave to runtime */
++#endif
++      r = luai_numpow(v1, v2); break;
+     case OP_UNM: r = luai_numunm(v1); break;
+     case OP_LEN: return 0;  /* no constant folding for 'len' */
+     default: lua_assert(0); r = 0; break;
+   }
+   if (luai_numisnan(r)) return 0;  /* do not attempt to produce NaN */
++  e1->k = cast(expkind,vkres);
+   e1->u.nval = r;
+   return 1;
+ }
+@@ -688,7 +781,8 @@ static void codecomp (FuncState *fs, OpC
+ 
+ void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
+   expdesc e2;
+-  e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
++  e2.t = e2.f = NO_JUMP; e2.k = VKINT; e2.u.ival = 0;
++
+   switch (op) {
+     case OPR_MINUS: {
+       if (!isnumeral(e))
+--- a/src/lcode.h
++++ b/src/lcode.h
+@@ -71,6 +71,6 @@ LUAI_FUNC void luaK_prefix (FuncState *f
+ LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
+ LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, expdesc *v2);
+ LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
+-
++LUAI_FUNC int luaK_integerK (FuncState *fs, lua_Integer r);
+ 
+ #endif
+--- a/src/ldebug.c
++++ b/src/ldebug.c
+@@ -183,7 +183,7 @@ static void collectvalidlines (lua_State
+     int *lineinfo = f->l.p->lineinfo;
+     int i;
+     for (i=0; i<f->l.p->sizelineinfo; i++)
+-      setbvalue(luaH_setnum(L, t, lineinfo[i]), 1);
++      setbvalue(luaH_setint(L, t, lineinfo[i]), 1);
+     sethvalue(L, L->top, t); 
+   }
+   incr_top(L);
+@@ -566,7 +566,7 @@ static int isinstack (CallInfo *ci, cons
+ 
+ void luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
+   const char *name = NULL;
+-  const char *t = luaT_typenames[ttype(o)];
++  const char *t = luaT_typenames[ttype_ext(o)];
+   const char *kind = (isinstack(L->ci, o)) ?
+                          getobjname(L, L->ci, cast_int(o - L->base), &name) :
+                          NULL;
+@@ -594,8 +594,8 @@ void luaG_aritherror (lua_State *L, cons
+ 
+ 
+ int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
+-  const char *t1 = luaT_typenames[ttype(p1)];
+-  const char *t2 = luaT_typenames[ttype(p2)];
++  const char *t1 = luaT_typenames[ttype_ext(p1)];
++  const char *t2 = luaT_typenames[ttype_ext(p2)];
+   if (t1[2] == t2[2])
+     luaG_runerror(L, "attempt to compare two %s values", t1);
+   else
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -220,9 +220,9 @@ static StkId adjust_varargs (lua_State *
+     luaD_checkstack(L, p->maxstacksize);
+     htab = luaH_new(L, nvar, 1);  /* create `arg' table */
+     for (i=0; i<nvar; i++)  /* put extra arguments into `arg' table */
+-      setobj2n(L, luaH_setnum(L, htab, i+1), L->top - nvar + i);
++      setobj2n(L, luaH_setint(L, htab, i+1), L->top - nvar + i);
+     /* store counter in field `n' */
+-    setnvalue(luaH_setstr(L, htab, luaS_newliteral(L, "n")), cast_num(nvar));
++    setivalue(luaH_setstr(L, htab, luaS_newliteral(L, "n")), nvar);
+   }
+ #endif
+   /* move fixed parameters to final position */
+--- a/src/ldump.c
++++ b/src/ldump.c
+@@ -52,6 +52,11 @@ static void DumpNumber(lua_Number x, Dum
+  DumpVar(x,D);
+ }
+ 
++static void DumpInteger(lua_Integer x, DumpState* D)
++{
++ DumpVar(x,D);
++}
++
+ static void DumpVector(const void* b, int n, size_t size, DumpState* D)
+ {
+  DumpInt(n,D);
+@@ -93,8 +98,11 @@ static void DumpConstants(const Proto* f
+ 	DumpChar(bvalue(o),D);
+ 	break;
+    case LUA_TNUMBER:
+-	DumpNumber(nvalue(o),D);
++	DumpNumber(nvalue_fast(o),D);
+ 	break;
++   case LUA_TINT:
++	DumpInteger(ivalue(o),D);
++    break;
+    case LUA_TSTRING:
+ 	DumpString(rawtsvalue(o),D);
+ 	break;
+--- a/src/liolib.c
++++ b/src/liolib.c
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ctype.h>
+ 
+ #define liolib_c
+ #define LUA_LIB
+@@ -18,7 +19,8 @@
+ #include "lauxlib.h"
+ #include "lualib.h"
+ 
+-
++#include "lnum.h"
++#include "llex.h"
+ 
+ #define IO_INPUT	1
+ #define IO_OUTPUT	2
+@@ -269,6 +271,13 @@ static int io_lines (lua_State *L) {
+ ** =======================================================
+ */
+ 
++/*
++* Many problems if we intend the same 'n' format specifier (see 'file:read()')
++* to work for both FP and integer numbers, without losing their accuracy. So
++* we don't. 'n' reads numbers as floating points, 'i' as integers. Old code
++* remains valid, but won't provide full integer accuracy (this only matters
++* with float FP and/or 64-bit integers).
++*/
+ 
+ static int read_number (lua_State *L, FILE *f) {
+   lua_Number d;
+@@ -282,6 +291,43 @@ static int read_number (lua_State *L, FI
+   }
+ }
+ 
++static int read_integer (lua_State *L, FILE *f) {
++  lua_Integer i;
++  if (fscanf(f, LUA_INTEGER_SCAN, &i) == 1) {
++    lua_pushinteger(L, i);
++    return 1;
++  }
++  else return 0;  /* read fails */
++}
++
++#ifdef LNUM_COMPLEX
++static int read_complex (lua_State *L, FILE *f) {
++  /* NNN / NNNi / NNN+MMMi / NNN-MMMi */
++  lua_Number a,b;
++  if (fscanf(f, LUA_NUMBER_SCAN, &a) == 1) {
++    int c=fgetc(f);
++    switch(c) {
++        case 'i':
++            lua_pushcomplex(L, a*I);
++            return 1;
++        case '+':
++        case '-':
++            /* "i" is consumed if at the end; just 'NNN+MMM' will most likely
++             * behave as if "i" was there? (TBD: test)
++             */
++            if (fscanf(f, LUA_NUMBER_SCAN "i", &b) == 1) {
++                lua_pushcomplex(L, a+ (c=='+' ? b:-b)*I);
++                return 1;
++            }
++    }
++    ungetc( c,f );
++    lua_pushnumber(L,a);  /*real part only*/
++    return 1;
++  }
++  return 0;  /* read fails */
++}
++#endif
++
+ 
+ static int test_eof (lua_State *L, FILE *f) {
+   int c = getc(f);
+@@ -355,6 +401,14 @@ static int g_read (lua_State *L, FILE *f
+           case 'n':  /* number */
+             success = read_number(L, f);
+             break;
++          case 'i':  /* integer (full accuracy) */
++            success = read_integer(L, f);
++            break;
++#ifdef LNUM_COMPLEX
++          case 'c':  /* complex */
++            success = read_complex(L, f);
++            break;
++#endif
+           case 'l':  /* line */
+             success = read_line(L, f);
+             break;
+@@ -415,9 +469,10 @@ static int g_write (lua_State *L, FILE *
+   int status = 1;
+   for (; nargs--; arg++) {
+     if (lua_type(L, arg) == LUA_TNUMBER) {
+-      /* optimization: could be done exactly as for strings */
+-      status = status &&
+-          fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
++      if (lua_isinteger(L,arg))
++          status = status && fprintf(f, LUA_INTEGER_FMT, lua_tointeger(L, arg)) > 0;
++      else
++          status = status && fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
+     }
+     else {
+       size_t l;
+@@ -460,7 +515,7 @@ static int f_setvbuf (lua_State *L) {
+   static const char *const modenames[] = {"no", "full", "line", NULL};
+   FILE *f = tofile(L);
+   int op = luaL_checkoption(L, 2, NULL, modenames);
+-  lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
++  size_t sz = luaL_optint32(L, 3, LUAL_BUFFERSIZE);
+   int res = setvbuf(f, NULL, mode[op], sz);
+   return pushresult(L, res == 0, NULL);
+ }
+--- a/src/llex.c
++++ b/src/llex.c
+@@ -22,6 +22,7 @@
+ #include "lstring.h"
+ #include "ltable.h"
+ #include "lzio.h"
++#include "lnum.h"
+ 
+ 
+ 
+@@ -34,13 +35,17 @@
+ 
+ 
+ /* ORDER RESERVED */
+-const char *const luaX_tokens [] = {
++static const char *const luaX_tokens [] = {
+     "and", "break", "do", "else", "elseif",
+     "end", "false", "for", "function", "if",
+     "in", "local", "nil", "not", "or", "repeat",
+     "return", "then", "true", "until", "while",
+     "..", "...", "==", ">=", "<=", "~=",
+     "<number>", "<name>", "<string>", "<eof>",
++    "<integer>",
++#ifdef LNUM_COMPLEX
++    "<number2>",
++#endif
+     NULL
+ };
+ 
+@@ -90,7 +95,11 @@ static const char *txtToken (LexState *l
+   switch (token) {
+     case TK_NAME:
+     case TK_STRING:
++    case TK_INT:
+     case TK_NUMBER:
++#ifdef LNUM_COMPLEX
++    case TK_NUMBER2:
++#endif
+       save(ls, '\0');
+       return luaZ_buffer(ls->buff);
+     default:
+@@ -175,23 +184,27 @@ static void buffreplace (LexState *ls, c
+     if (p[n] == from) p[n] = to;
+ }
+ 
+-
+-static void trydecpoint (LexState *ls, SemInfo *seminfo) {
++/* TK_NUMBER (/ TK_NUMBER2) */
++static int trydecpoint (LexState *ls, SemInfo *seminfo) {
+   /* format error: try to update decimal point separator */
+   struct lconv *cv = localeconv();
+   char old = ls->decpoint;
++  int ret;
+   ls->decpoint = (cv ? cv->decimal_point[0] : '.');
+   buffreplace(ls, old, ls->decpoint);  /* try updated decimal separator */
+-  if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
++  ret= luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r, NULL);
++  if (!ret) {
+     /* format error with correct decimal point: no more options */
+     buffreplace(ls, ls->decpoint, '.');  /* undo change (for error message) */
+     luaX_lexerror(ls, "malformed number", TK_NUMBER);
+   }
++  return ret;
+ }
+ 
+ 
+-/* LUA_NUMBER */
+-static void read_numeral (LexState *ls, SemInfo *seminfo) {
++/* TK_NUMBER / TK_INT (/TK_NUMBER2) */
++static int read_numeral (LexState *ls, SemInfo *seminfo) {
++  int ret;
+   lua_assert(isdigit(ls->current));
+   do {
+     save_and_next(ls);
+@@ -202,8 +215,9 @@ static void read_numeral (LexState *ls, 
+     save_and_next(ls);
+   save(ls, '\0');
+   buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
+-  if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r))  /* format error? */
+-    trydecpoint(ls, seminfo); /* try to update decimal point separator */
++  ret= luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r, &seminfo->i );
++  if (!ret) return trydecpoint(ls, seminfo); /* try to update decimal point separator */
++  return ret;
+ }
+ 
+ 
+@@ -331,6 +345,7 @@ static void read_string (LexState *ls, i
+ }
+ 
+ 
++/* char / TK_* */
+ static int llex (LexState *ls, SemInfo *seminfo) {
+   luaZ_resetbuffer(ls->buff);
+   for (;;) {
+@@ -402,8 +417,7 @@ static int llex (LexState *ls, SemInfo *
+         }
+         else if (!isdigit(ls->current)) return '.';
+         else {
+-          read_numeral(ls, seminfo);
+-          return TK_NUMBER;
++          return read_numeral(ls, seminfo);
+         }
+       }
+       case EOZ: {
+@@ -416,8 +430,7 @@ static int llex (LexState *ls, SemInfo *
+           continue;
+         }
+         else if (isdigit(ls->current)) {
+-          read_numeral(ls, seminfo);
+-          return TK_NUMBER;
++          return read_numeral(ls, seminfo);
+         }
+         else if (isalpha(ls->current) || ls->current == '_') {
+           /* identifier or reserved word */
+--- a/src/llex.h
++++ b/src/llex.h
+@@ -29,19 +29,22 @@ enum RESERVED {
+   TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
+   /* other terminal symbols */
+   TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER,
+-  TK_NAME, TK_STRING, TK_EOS
++  TK_NAME, TK_STRING, TK_EOS, TK_INT
++#ifdef LNUM_COMPLEX
++  , TK_NUMBER2   /* imaginary constants: Ni */ 
++#endif
+ };
+ 
+ /* number of reserved words */
+ #define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
+ 
+ 
+-/* array with token `names' */
+-LUAI_DATA const char *const luaX_tokens [];
+-
+-
++/* SemInfo is a local data structure of 'llex.c', used for carrying a string
++ * or a number. A separate token (TK_*) will tell, how to interpret the data.
++ */      
+ typedef union {
+   lua_Number r;
++  lua_Integer i;
+   TString *ts;
+ } SemInfo;  /* semantics information */
+ 
+--- a/src/llimits.h
++++ b/src/llimits.h
+@@ -49,6 +49,7 @@ typedef LUAI_USER_ALIGNMENT_T L_Umaxalig
+ 
+ /* result of a `usual argument conversion' over lua_Number */
+ typedef LUAI_UACNUMBER l_uacNumber;
++typedef LUAI_UACINTEGER l_uacInteger;
+ 
+ 
+ /* internal assertions for in-house debugging */
+@@ -80,7 +81,6 @@ typedef LUAI_UACNUMBER l_uacNumber;
+ #define cast_int(i)	cast(int, (i))
+ 
+ 
+-
+ /*
+ ** type for virtual-machine instructions
+ ** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
+--- a/src/lmathlib.c
++++ b/src/lmathlib.c
+@@ -4,7 +4,6 @@
+ ** See Copyright Notice in lua.h
+ */
+ 
+-
+ #include <stdlib.h>
+ #include <math.h>
+ 
+@@ -16,113 +15,210 @@
+ #include "lauxlib.h"
+ #include "lualib.h"
+ 
++/* 'luai_vectpow()' as a replacement for 'cpow()'. Defined in the header; we
++ * don't intrude the code libs internal functions.
++ */
++#ifdef LNUM_COMPLEX
++# include "lnum.h"    
++#endif
+ 
+ #undef PI
+-#define PI (3.14159265358979323846)
+-#define RADIANS_PER_DEGREE (PI/180.0)
+-
++#ifdef LNUM_FLOAT
++# define PI (3.14159265358979323846F)
++#elif defined(M_PI)
++# define PI M_PI
++#else
++# define PI (3.14159265358979323846264338327950288)
++#endif
++#define RADIANS_PER_DEGREE (PI/180)
+ 
++#undef HUGE
++#ifdef LNUM_FLOAT
++# define HUGE HUGE_VALF
++#elif defined(LNUM_LDOUBLE)
++# define HUGE HUGE_VALL
++#else
++# define HUGE HUGE_VAL
++#endif
+ 
+ static int math_abs (lua_State *L) {
+-  lua_pushnumber(L, fabs(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushnumber(L, _LF(cabs) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(fabs) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_sin (lua_State *L) {
+-  lua_pushnumber(L, sin(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(csin) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(sin) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_sinh (lua_State *L) {
+-  lua_pushnumber(L, sinh(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(csinh) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(sinh) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_cos (lua_State *L) {
+-  lua_pushnumber(L, cos(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ccos) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(cos) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_cosh (lua_State *L) {
+-  lua_pushnumber(L, cosh(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ccosh) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(cosh) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_tan (lua_State *L) {
+-  lua_pushnumber(L, tan(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ctan) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(tan) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_tanh (lua_State *L) {
+-  lua_pushnumber(L, tanh(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(ctanh) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(tanh) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_asin (lua_State *L) {
+-  lua_pushnumber(L, asin(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(casin) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(asin) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_acos (lua_State *L) {
+-  lua_pushnumber(L, acos(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(cacos) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(acos) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_atan (lua_State *L) {
+-  lua_pushnumber(L, atan(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(catan) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(atan) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_atan2 (lua_State *L) {
+-  lua_pushnumber(L, atan2(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++  /* scalars only */
++  lua_pushnumber(L, _LF(atan2) (luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
+   return 1;
+ }
+ 
+ static int math_ceil (lua_State *L) {
+-  lua_pushnumber(L, ceil(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_Complex v= luaL_checkcomplex(L, 1);
++  lua_pushcomplex(L, _LF(ceil) (_LF(creal)(v)) + _LF(ceil) (_LF(cimag)(v))*I);
++#else
++  lua_pushnumber(L, _LF(ceil) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_floor (lua_State *L) {
+-  lua_pushnumber(L, floor(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_Complex v= luaL_checkcomplex(L, 1);
++  lua_pushcomplex(L, _LF(floor) (_LF(creal)(v)) + _LF(floor) (_LF(cimag)(v))*I);
++#else
++  lua_pushnumber(L, _LF(floor) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+-static int math_fmod (lua_State *L) {
+-  lua_pushnumber(L, fmod(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++static int math_fmod (lua_State *L) {  
++  /* scalars only */
++  lua_pushnumber(L, _LF(fmod) (luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
+   return 1;
+ }
+ 
+ static int math_modf (lua_State *L) {
+-  double ip;
+-  double fp = modf(luaL_checknumber(L, 1), &ip);
++  /* scalars only */
++  lua_Number ip;
++  lua_Number fp = _LF(modf) (luaL_checknumber(L, 1), &ip);
+   lua_pushnumber(L, ip);
+   lua_pushnumber(L, fp);
+   return 2;
+ }
+ 
+ static int math_sqrt (lua_State *L) {
+-  lua_pushnumber(L, sqrt(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(csqrt) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(sqrt) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_pow (lua_State *L) {
+-  lua_pushnumber(L, pow(luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++#ifdef LNUM_COMPLEX
++  /* C99 'cpow' gives somewhat inaccurate results (i.e. (-1)^2 = -1+1.2246467991474e-16i). 
++  * 'luai_vectpow' smoothens such, reusing it is the reason we need to #include "lnum.h".
++  */
++  lua_pushcomplex(L, luai_vectpow(luaL_checkcomplex(L,1), luaL_checkcomplex(L,2)));
++#else
++  lua_pushnumber(L, _LF(pow) (luaL_checknumber(L, 1), luaL_checknumber(L, 2)));
++#endif
+   return 1;
+ }
+ 
+ static int math_log (lua_State *L) {
+-  lua_pushnumber(L, log(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(clog) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(log) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_log10 (lua_State *L) {
+-  lua_pushnumber(L, log10(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  /* Not in standard <complex.h> , but easy to calculate: log_a(x) = log_b(x) / log_b(a) 
++  */
++  lua_pushcomplex(L, _LF(clog) (luaL_checkcomplex(L,1)) / _LF(log) (10));
++#else
++  lua_pushnumber(L, _LF(log10) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+ static int math_exp (lua_State *L) {
+-  lua_pushnumber(L, exp(luaL_checknumber(L, 1)));
++#ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(cexp) (luaL_checkcomplex(L,1)));
++#else
++  lua_pushnumber(L, _LF(exp) (luaL_checknumber(L, 1)));
++#endif
+   return 1;
+ }
+ 
+@@ -138,19 +234,20 @@ static int math_rad (lua_State *L) {
+ 
+ static int math_frexp (lua_State *L) {
+   int e;
+-  lua_pushnumber(L, frexp(luaL_checknumber(L, 1), &e));
++  lua_pushnumber(L, _LF(frexp) (luaL_checknumber(L, 1), &e));
+   lua_pushinteger(L, e);
+   return 2;
+ }
+ 
+ static int math_ldexp (lua_State *L) {
+-  lua_pushnumber(L, ldexp(luaL_checknumber(L, 1), luaL_checkint(L, 2)));
++  lua_pushnumber(L, _LF(ldexp) (luaL_checknumber(L, 1), luaL_checkint(L, 2)));
+   return 1;
+ }
+ 
+ 
+ 
+ static int math_min (lua_State *L) {
++  /* scalars only */
+   int n = lua_gettop(L);  /* number of arguments */
+   lua_Number dmin = luaL_checknumber(L, 1);
+   int i;
+@@ -165,6 +262,7 @@ static int math_min (lua_State *L) {
+ 
+ 
+ static int math_max (lua_State *L) {
++  /* scalars only */
+   int n = lua_gettop(L);  /* number of arguments */
+   lua_Number dmax = luaL_checknumber(L, 1);
+   int i;
+@@ -182,25 +280,20 @@ static int math_random (lua_State *L) {
+   /* the `%' avoids the (rare) case of r==1, and is needed also because on
+      some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
+   lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
+-  switch (lua_gettop(L)) {  /* check number of arguments */
+-    case 0: {  /* no arguments */
+-      lua_pushnumber(L, r);  /* Number between 0 and 1 */
+-      break;
+-    }
+-    case 1: {  /* only upper limit */
+-      int u = luaL_checkint(L, 1);
+-      luaL_argcheck(L, 1<=u, 1, "interval is empty");
+-      lua_pushnumber(L, floor(r*u)+1);  /* int between 1 and `u' */
+-      break;
+-    }
+-    case 2: {  /* lower and upper limits */
+-      int l = luaL_checkint(L, 1);
+-      int u = luaL_checkint(L, 2);
+-      luaL_argcheck(L, l<=u, 2, "interval is empty");
+-      lua_pushnumber(L, floor(r*(u-l+1))+l);  /* int between `l' and `u' */
+-      break;
+-    }
+-    default: return luaL_error(L, "wrong number of arguments");
++  int n= lua_gettop(L);  /* number of arguments */
++  if (n==0) {	/* no arguments: range [0,1) */
++    lua_pushnumber(L, r);
++  } else if (n<=2) {	/* int range [1,u] or [l,u] */
++    int l= n==1 ? 1 : luaL_checkint(L, 1);
++    int u = luaL_checkint(L, n);
++    int tmp;
++    lua_Number d;
++    luaL_argcheck(L, l<=u, n, "interval is empty");
++    d= _LF(floor)(r*(u-l+1));
++    lua_number2int(tmp,d);
++    lua_pushinteger(L, l+tmp);
++  } else {
++    return luaL_error(L, "wrong number of arguments");
+   }
+   return 1;
+ }
+@@ -211,6 +304,66 @@ static int math_randomseed (lua_State *L
+   return 0;
+ }
+ 
++/* 
++* Lua 5.1 does not have acosh, asinh, atanh for scalars (not ANSI C)
++*/
++#if __STDC_VERSION__ >= 199901L
++static int math_acosh (lua_State *L) {
++# ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(cacosh) (luaL_checkcomplex(L,1)));
++# else
++  lua_pushnumber(L, _LF(acosh) (luaL_checknumber(L,1)));
++# endif
++  return 1;
++}
++static int math_asinh (lua_State *L) {
++# ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(casinh) (luaL_checkcomplex(L,1)));
++# else
++  lua_pushnumber(L, _LF(asinh) (luaL_checknumber(L,1)));
++# endif
++  return 1;
++}
++static int math_atanh (lua_State *L) {
++# ifdef LNUM_COMPLEX
++  lua_pushcomplex(L, _LF(catanh) (luaL_checkcomplex(L,1)));
++# else
++  lua_pushnumber(L, _LF(atanh) (luaL_checknumber(L,1)));
++# endif
++  return 1;
++}
++#endif
++
++/* 
++ * C99 complex functions, not covered above.
++*/
++#ifdef LNUM_COMPLEX
++static int math_arg (lua_State *L) {
++  lua_pushnumber(L, _LF(carg) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_imag (lua_State *L) {
++  lua_pushnumber(L, _LF(cimag) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_real (lua_State *L) {
++  lua_pushnumber(L, _LF(creal) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_conj (lua_State *L) {
++  lua_pushcomplex(L, _LF(conj) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++
++static int math_proj (lua_State *L) {
++  lua_pushcomplex(L, _LF(cproj) (luaL_checkcomplex(L,1)));
++  return 1;
++}
++#endif
++
+ 
+ static const luaL_Reg mathlib[] = {
+   {"abs",   math_abs},
+@@ -241,6 +394,18 @@ static const luaL_Reg mathlib[] = {
+   {"sqrt",  math_sqrt},
+   {"tanh",   math_tanh},
+   {"tan",   math_tan},
++#if __STDC_VERSION__ >= 199901L
++  {"acosh",  math_acosh},
++  {"asinh",  math_asinh},
++  {"atanh",  math_atanh},
++#endif
++#ifdef LNUM_COMPLEX
++  {"arg",   math_arg},
++  {"imag",  math_imag},
++  {"real",  math_real},
++  {"conj",  math_conj},
++  {"proj",  math_proj},
++#endif
+   {NULL, NULL}
+ };
+ 
+@@ -252,8 +417,10 @@ LUALIB_API int luaopen_math (lua_State *
+   luaL_register(L, LUA_MATHLIBNAME, mathlib);
+   lua_pushnumber(L, PI);
+   lua_setfield(L, -2, "pi");
+-  lua_pushnumber(L, HUGE_VAL);
++  lua_pushnumber(L, HUGE);
+   lua_setfield(L, -2, "huge");
++  lua_pushinteger(L, LUA_INTEGER_MAX );
++  lua_setfield(L, -2, "hugeint");
+ #if defined(LUA_COMPAT_MOD)
+   lua_getfield(L, -1, "fmod");
+   lua_setfield(L, -2, "mod");
+--- /dev/null
++++ b/src/lnum.c
+@@ -0,0 +1,312 @@
++/*
++** $Id: lnum.c,v ... $
++** Internal number model
++** See Copyright Notice in lua.h
++*/
++
++#include <stdlib.h>
++#include <math.h>
++#include <ctype.h>
++#include <string.h>
++#include <stdio.h>
++#include <errno.h>
++
++#define lnum_c
++#define LUA_CORE
++
++#include "lua.h"
++#include "llex.h"
++#include "lnum.h"
++
++/*
++** lua_real2str converts a (non-complex) number to a string.
++** lua_str2real converts a string to a (non-complex) number.
++*/
++#define lua_real2str(s,n)  sprintf((s), LUA_NUMBER_FMT, (n))
++
++/*
++* Note: Only 'strtod()' is part of ANSI C; others are C99 and
++* may need '--std=c99' compiler setting (at least on Ubuntu 7.10).
++* 
++* Visual C++ 2008 Express does not have 'strtof()', nor 'strtold()'.
++* References to '_strtold()' exist but don't compile. It seems best
++* to leave Windows users with DOUBLE only (or compile with MinGW).
++*
++* In practise, using '(long double)strtod' is a risky thing, since
++* it will cause accuracy loss in reading in numbers, and such losses
++* will pile up in later processing. Get a real 'strtold()' or don't
++* use that mode at all.
++*/
++#ifdef LNUM_DOUBLE
++# define lua_str2real	strtod
++#elif defined(LNUM_FLOAT)
++# define lua_str2real	strtof
++#elif defined(LNUM_LDOUBLE)
++# define lua_str2real	strtold
++#endif
++
++#define lua_integer2str(s,v) sprintf((s), LUA_INTEGER_FMT, (v))
++
++/* 's' is expected to be LUAI_MAXNUMBER2STR long (enough for any number)
++*/
++void luaO_num2buf( char *s, const TValue *o )
++{
++  lua_Number n;
++  lua_assert( ttisnumber(o) );
++
++  /* Reason to handle integers differently is not only speed, but accuracy as
++   * well. We want to make any integer tostring() without roundings, at all.
++   */
++  if (ttisint(o)) {
++    lua_integer2str( s, ivalue(o) );
++    return;
++  }
++  n= nvalue_fast(o);
++  lua_real2str(s, n);
++
++#ifdef LNUM_COMPLEX
++  lua_Number n2= nvalue_img_fast(o);
++  if (n2!=0) {   /* Postfix with +-Ni */
++      int re0= (n == 0);
++      char *s2= re0 ? s : strchr(s,'\0'); 
++      if ((!re0) && (n2>0)) *s2++= '+';
++      lua_real2str( s2, n2 );
++      strcat(s2,"i");
++  }
++#endif
++}
++
++/*
++* If a LUA_TNUMBER has integer value, give it.
++*/
++int /*bool*/ tt_integer_valued( const TValue *o, lua_Integer *ref ) {
++  lua_Number d;
++  lua_Integer i;
++
++  lua_assert( ttype(o)==LUA_TNUMBER );
++  lua_assert( ref );
++#ifdef LNUM_COMPLEX
++  if (nvalue_img_fast(o)!=0) return 0;
++#endif
++  d= nvalue_fast(o);
++  lua_number2integer(i, d);
++  if (cast_num(i) == d) {
++    *ref= i; return 1;
++  }
++  return 0;
++}
++
++/* 
++ * Lua 5.1.3 (using 'strtod()') allows 0x+hex but not 0+octal. This is good,
++ * and we should NOT use 'autobase' 0 with 'strtoul[l]()' for this reason.
++ *
++ * Lua 5.1.3 allows '0x...' numbers to overflow and lose precision; this is not
++ * good. On Visual C++ 2008, 'strtod()' does not even take them in. Better to
++ * require hex values to fit 'lua_Integer' or give an error that they don't?
++ *
++ * Full hex range (0 .. 0xff..ff) is stored as integers, not to lose any bits.
++ * Numerical value of 0xff..ff will be -1, if used in calculations.
++ * 
++ * Returns: TK_INT for a valid integer, '*endptr_ref' updated
++ *          TK_NUMBER for seemingly numeric, to be parsed as floating point
++ *          0 for bad characters, not a number (or '0x' out of range)
++ */
++static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) {
++  char *endptr;
++  /* 'v' gets ULONG_MAX on possible overflow (which is > LUA_INTEGER_MAX);
++   * we don't have to check 'errno' here.
++   */
++  unsigned LUA_INTEGER v= lua_str2ul(s, &endptr, 10);
++  if (endptr == s) return 0;  /* nothing numeric */
++  if (v==0 && *endptr=='x') {
++    errno= 0;   /* needs to be set, 'strtoul[l]' does not clear it */
++    v= lua_str2ul(endptr+1, &endptr, 16);  /* retry as hex, unsigned range */
++    if (errno==ERANGE) {   /* clamped to 0xff..ff */
++#if (defined(LNUM_INT32) && !defined(LNUM_FLOAT)) || defined(LNUM_LDOUBLE)
++      return TK_NUMBER; /* Allow to be read as floating point (has more integer range) */
++#else
++      return 0;  /* Reject the number */
++#endif
++    }
++  } else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) {
++    return TK_NUMBER;	/* not in signed range, or has '.', 'e' etc. trailing */
++  }
++  *res= (lua_Integer)v;
++  *endptr_ref= endptr;
++  return TK_INT;
++}
++
++/* 0 / TK_NUMBER / TK_INT (/ TK_NUMBER2) */
++int luaO_str2d (const char *s, lua_Number *res_n, lua_Integer *res_i) {
++  char *endptr;
++  int ret= TK_NUMBER;
++  /* Check integers first, if caller is allowing. 
++   * If 'res2'==NULL, they're only looking for floating point. 
++   */
++  if (res_i) {
++    ret= luaO_str2i(s,res_i,&endptr);
++    if (ret==0) return 0;
++  }
++  if (ret==TK_NUMBER) {
++    lua_assert(res_n);
++    /* Note: Visual C++ 2008 Express 'strtod()' does not read in "0x..."
++     *       numbers; it will read '0' and spit 'x' as endptr.
++     *       This means hex constants not fitting in 'lua_Integer' won't 
++     *       be read in at all. What to do?
++     */
++    *res_n = lua_str2real(s, &endptr);
++    if (endptr == s) return 0;  /* conversion failed */
++    /* Visual C++ 2008 'strtod()' does not allow "0x..." input. */
++#if defined(_MSC_VER) && !defined(LNUM_FLOAT) && !defined(LNUM_INT64)
++    if (*res_n==0 && *endptr=='x') {
++      /* Hex constant too big for 'lua_Integer' but that could fit in 'lua_Number'
++       * integer bits 
++       */
++      unsigned __int64 v= _strtoui64( s, &endptr, 16 );
++      /* We just let > 64 bit values be clamped to _UI64_MAX (MSDN does not say 'errno'==ERANGE would be set) */
++      *res_n= cast_num(v);
++      if (*res_n != v) return 0;    /* Would have lost accuracy */
++    }
++#endif
++#ifdef LNUM_COMPLEX
++    if (*endptr == 'i') { endptr++; ret= TK_NUMBER2; }
++#endif
++  }
++  if (*endptr) {
++    while (isspace(cast(unsigned char, *endptr))) endptr++;
++    if (*endptr) return 0;  /* invalid trail */
++  }
++  return ret;
++}
++
++
++/* Functions for finding out, when integer operations remain in range
++ * (and doing them).
++ */
++int try_addint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  lua_Integer v= ib+ic; /* may overflow */
++  if (ib>0 && ic>0)      { if (v < 0) return 0; /*overflow, use floats*/ }
++  else if (ib<0 && ic<0) { if (v >= 0) return 0; }
++  *r= v;
++  return 1;
++}
++
++int try_subint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  lua_Integer v= ib-ic; /* may overflow */
++  if (ib>=0 && ic<0)     { if (v < 0) return 0; /*overflow, use floats*/ }
++  else if (ib<0 && ic>0) { if (v >= 0) return 0; }
++  *r= v;
++  return 1;
++}
++
++int try_mulint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  if (ib!=LUA_INTEGER_MIN && ic!=LUA_INTEGER_MIN) {
++    lua_Integer b= luai_abs(ib), c= luai_abs(ic);
++    if ( (ib==0) || (LUA_INTEGER_MAX/b >= c) ) {
++      *r= ib*ic;  /* no overflow */
++      return 1;
++    }
++  } else if (ib==0 || ic==0) {
++    *r= 0; return 1;
++  }
++
++  /* Result can be LUA_INTEGER_MIN; if it is, calculating it using floating 
++   * point will not cause accuracy loss.
++   */
++  if ( luai_nummul( cast_num(ib), cast_num(ic) ) == LUA_INTEGER_MIN ) {
++    *r= LUA_INTEGER_MIN;
++    return 1;
++  }
++  return 0;
++}
++
++int try_divint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  /* N/0: leave to float side, to give an error
++  */
++  if (ic==0) return 0;
++
++  /* N/LUA_INTEGER_MIN: always non-integer results, or 0 or +1
++  */
++  if (ic==LUA_INTEGER_MIN) {
++    if (ib==LUA_INTEGER_MIN) { *r=1; return 1; }
++    if (ib==0) { *r=0; return 1; }
++
++  /* LUA_INTEGER_MIN (-2^31|63)/N: calculate using float side (either the division 
++   *    causes non-integer results, or there is no accuracy loss in int->fp->int
++   *    conversions (N=2,4,8,..,256 and N=2^30,2^29,..2^23).
++   */
++  } else if (ib==LUA_INTEGER_MIN) {
++    lua_Number d= luai_numdiv( cast_num(LUA_INTEGER_MIN), cast_num(ic) );
++    lua_Integer i; lua_number2integer(i,d);
++    if (cast_num(i)==d) { *r= i; return 1; }
++  
++  } else {
++    /* Note: We _can_ use ANSI C mod here, even on negative values, since
++     *       we only test for == 0 (the sign would be implementation dependent).
++     */
++     if (ib%ic == 0) { *r= ib/ic; return 1; }
++  }
++
++  return 0;
++}
++
++int try_modint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++  if (ic!=0) {
++    /* ANSI C can be trusted when b%c==0, or when values are non-negative. 
++     * b - (floor(b/c) * c)
++     *   -->
++     * + +: b - (b/c) * c (b % c can be used)
++     * - -: b - (b/c) * c (b % c could work, but not defined by ANSI C)
++     * 0 -: b - (b/c) * c (=0, b % c could work, but not defined by ANSI C)
++     * - +: b - (b/c-1) * c (when b!=-c)
++     * + -: b - (b/c-1) * c (when b!=-c)
++     *
++     * o MIN%MIN ends up 0, via overflow in calcs but that does not matter.
++     * o MIN%MAX ends up MAX-1 (and other such numbers), also after overflow,
++     *   but that does not matter, results do.
++     */
++    lua_Integer v= ib % ic;
++    if ( v!=0 && (ib<0 || ic<0) ) {
++      v= ib - ((ib/ic) - ((ib<=0 && ic<0) ? 0:1)) * ic;
++    }      
++    /* Result should always have same sign as 2nd argument. (PIL2) */
++    lua_assert( (v<0) ? (ic<0) : (v>0) ? (ic>0) : 1 );
++    *r= v;
++    return 1;
++  }
++  return 0;  /* let float side return NaN */
++}
++
++int try_powint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
++
++    /* In FLOAT/INT32 or FLOAT|DOUBLE/INT64 modes, calculating integer powers 
++     * via FP realm may lose accuracy (i.e. 7^11 = 1977326743, which fits int32
++     * but not 23-bit float mantissa). 
++     *
++     * The current solution is dumb, but it works and uses little code. Use of
++     * integer powers is not anticipated to be very frequent (apart from 2^x,
++     * which is separately optimized).
++     */
++  if (ib==0) *r=0;
++  else if (ic<0) return 0;  /* FP realm */
++  else if (ib==2 && ic < (int)sizeof(lua_Integer)*8-1) *r= ((lua_Integer)1)<<ic;   /* 1,2,4,...2^30 | 2^62 optimization */
++  else if (ic==0) *r=1;
++  else if (luai_abs(ib)==1) *r= (ic%2) ? ib:1;
++  else {
++    lua_Integer x= ib;
++    while( --ic ) {
++      if (!try_mulint( &x, x, ib ))
++        return 0; /* FP realm */
++    }
++    *r= x;
++  }
++  return 1;
++}
++
++int try_unmint( lua_Integer *r, lua_Integer ib ) {
++  /* Negating LUA_INTEGER_MIN leaves the range. */
++  if ( ib != LUA_INTEGER_MIN )  
++    { *r= -ib; return 1; }
++  return 0;
++}
++
+--- /dev/null
++++ b/src/lnum.h
+@@ -0,0 +1,116 @@
++/*
++** $Id: lnum.h,v ... $
++** Internal Number model
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lnum_h
++#define lnum_h
++
++#include <math.h>
++
++#include "lobject.h"
++
++/*
++** The luai_num* macros define the primitive operations over 'lua_Number's
++** (not 'lua_Integer's, not 'lua_Complex').
++*/
++#define luai_numadd(a,b)	((a)+(b))
++#define luai_numsub(a,b)	((a)-(b))
++#define luai_nummul(a,b)	((a)*(b))
++#define luai_numdiv(a,b)	((a)/(b))
++#define luai_nummod(a,b)	((a) - _LF(floor)((a)/(b))*(b))
++#define luai_numpow(a,b)	(_LF(pow)(a,b))
++#define luai_numunm(a)		(-(a))
++#define luai_numeq(a,b)	    ((a)==(b))
++#define luai_numlt(a,b)	    ((a)<(b))
++#define luai_numle(a,b)	    ((a)<=(b))
++#define luai_numisnan(a)	(!luai_numeq((a), (a)))
++
++int try_addint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_subint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_mulint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_divint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_modint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_powint( lua_Integer *r, lua_Integer ib, lua_Integer ic );
++int try_unmint( lua_Integer *r, lua_Integer ib );
++
++#ifdef LNUM_COMPLEX
++  static inline lua_Complex luai_vectunm( lua_Complex a ) { return -a; }
++  static inline lua_Complex luai_vectadd( lua_Complex a, lua_Complex b ) { return a+b; }
++  static inline lua_Complex luai_vectsub( lua_Complex a, lua_Complex b ) { return a-b; }
++  static inline lua_Complex luai_vectmul( lua_Complex a, lua_Complex b ) { return a*b; }
++  static inline lua_Complex luai_vectdiv( lua_Complex a, lua_Complex b ) { return a/b; }
++
++/* 
++ * C99 does not provide modulus for complex numbers. It most likely is not
++ * meaningful at all.
++ */
++
++/* 
++ * Complex power
++ *
++ * C99 'cpow' gives inaccurate results for many common cases s.a. (1i)^2 -> 
++ * -1+1.2246467991474e-16i (OS X 10.4, gcc 4.0.1 build 5367)
++ * 
++ * [(a+bi)^(c+di)] = (r^c) * exp(-d*t) * cos(c*t + d*ln(r)) +
++ *                 = (r^c) * exp(-d*t) * sin(c*t + d*ln(r)) *i
++ * r = sqrt(a^2+b^2), t = arctan( b/a )
++ * 
++ * Reference: <http://home.att.net/~srschmitt/complexnumbers.html>
++ * Could also be calculated using: x^y = exp(ln(x)*y)
++ *
++ * Note: Defined here (and not in .c) so 'lmathlib.c' can share the 
++ *       implementation.
++ */
++  static inline
++  lua_Complex luai_vectpow( lua_Complex a, lua_Complex b )
++  {
++# if 1
++    lua_Number ar= _LF(creal)(a), ai= _LF(cimag)(a);
++    lua_Number br= _LF(creal)(b), bi= _LF(cimag)(b);
++    
++    if (ai==0 && bi==0) {     /* a^c (real) */
++        return luai_numpow( ar, br );
++    } 
++
++    int br_int= (int)br;
++    
++    if ( ai!=0 && bi==0 && br_int==br && br_int!=0 && br_int!=INT_MIN ) { 
++        /* (a+bi)^N, N = { +-1,+-2, ... +-INT_MAX } 
++        */
++        lua_Number k= luai_numpow( _LF(sqrt) (ar*ar + ai*ai), br );
++        lua_Number cos_z, sin_z;
++
++        /* Situation depends upon c (N) in the following manner:
++         * 
++         * N%4==0                                => cos(c*t)=1, sin(c*t)=0
++         * (N*sign(b))%4==1 or (N*sign(b))%4==-3 => cos(c*t)=0, sin(c*t)=1
++         * N%4==2 or N%4==-2                     => cos(c*t)=-1, sin(c*t)=0
++         * (N*sign(b))%4==-1 or (N*sign(b))%4==3 => cos(c*t)=0, sin(c*t)=-1
++         */
++      int br_int_abs = br_int<0 ? -br_int:br_int;
++      
++      switch( (br_int_abs%4) * (br_int<0 ? -1:1) * (ai<0 ? -1:1) ) {
++        case 0:             cos_z=1, sin_z=0; break;
++        case 2: case -2:    cos_z=-1, sin_z=0; break;
++        case 1: case -3:    cos_z=0, sin_z=1; break;
++        case 3: case -1:    cos_z=0, sin_z=-1; break;
++        default:            lua_assert(0); return 0;
++      }
++      return k*cos_z + (k*sin_z)*I;
++    }
++# endif
++    return _LF(cpow) ( a, b );
++  }
++#endif
++
++LUAI_FUNC int luaO_str2d (const char *s, lua_Number *res1, lua_Integer *res2);
++LUAI_FUNC void luaO_num2buf( char *s, const TValue *o );
++
++LUAI_FUNC int /*bool*/ tt_integer_valued( const TValue *o, lua_Integer *ref );
++
++#define luai_normalize(o) \
++{ lua_Integer _i; if (tt_integer_valued(o,&_i)) setivalue(o,_i); }
++
++#endif
+--- /dev/null
++++ b/src/lnum_config.h
+@@ -0,0 +1,221 @@
++/*
++** $Id: lnum_config.h,v ... $
++** Internal Number model
++** See Copyright Notice in lua.h
++*/
++
++#ifndef lnum_config_h
++#define lnum_config_h
++
++/*
++** Default number modes
++*/
++#if (!defined LNUM_DOUBLE) && (!defined LNUM_FLOAT) && (!defined LNUM_LDOUBLE)
++# define LNUM_FLOAT
++#endif
++#if (!defined LNUM_INT16) && (!defined LNUM_INT32) && (!defined LNUM_INT64)
++# define LNUM_INT32
++#endif
++
++/*
++** Require C99 mode for COMPLEX, FLOAT and LDOUBLE (only DOUBLE is ANSI C).
++*/
++#if defined(LNUM_COMPLEX) && (__STDC_VERSION__ < 199901L)
++# error "Need C99 for complex (use '--std=c99' or similar)"
++#elif defined(LNUM_LDOUBLE) && (__STDC_VERSION__ < 199901L) && !defined(_MSC_VER)
++# error "Need C99 for 'long double' (use '--std=c99' or similar)"
++#elif defined(LNUM_FLOAT) && (__STDC_VERSION__ < 199901L)
++/* LNUM_FLOAT not supported on Windows */
++# error "Need C99 for 'float' (use '--std=c99' or similar)"
++#endif
++ 
++/*
++** Number mode identifier to accompany the version string.
++*/
++#ifdef LNUM_COMPLEX
++# define _LNUM1 "complex "
++#else
++# define _LNUM1 ""
++#endif
++#ifdef LNUM_DOUBLE
++# define _LNUM2 "double"
++#elif defined(LNUM_FLOAT)
++# define _LNUM2 "float"
++#elif defined(LNUM_LDOUBLE)
++# define _LNUM2 "ldouble"
++#endif
++#ifdef LNUM_INT32
++# define _LNUM3 "int32"
++#elif defined(LNUM_INT64)
++# define _LNUM3 "int64"
++#elif defined(LNUM_INT16)
++# define _LNUM3 "int16"
++#endif
++#define LUA_LNUM _LNUM1 _LNUM2 " " _LNUM3
++
++/*
++** LUA_NUMBER is the type of floating point number in Lua
++** LUA_NUMBER_SCAN is the format for reading numbers.
++** LUA_NUMBER_FMT is the format for writing numbers.
++*/
++#ifdef LNUM_FLOAT
++# define LUA_NUMBER         float
++# define LUA_NUMBER_SCAN    "%f"
++# define LUA_NUMBER_FMT     "%g"  
++#elif (defined LNUM_DOUBLE)
++# define LUA_NUMBER	        double
++# define LUA_NUMBER_SCAN    "%lf"
++# define LUA_NUMBER_FMT     "%.14g"
++#elif (defined LNUM_LDOUBLE)
++# define LUA_NUMBER         long double
++# define LUA_NUMBER_SCAN    "%Lg"
++# define LUA_NUMBER_FMT     "%.20Lg"
++#endif
++
++
++/* 
++** LUAI_MAXNUMBER2STR: size of a buffer fitting any number->string result.
++**
++**  double:  24 (sign, x.xxxxxxxxxxxxxxe+nnnn, and \0)
++**  int64:   21 (19 digits, sign, and \0)
++**  long double: 43 for 128-bit (sign, x.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxe+nnnn, and \0)
++**           30 for 80-bit (sign, x.xxxxxxxxxxxxxxxxxxxxe+nnnn, and \0)
++*/
++#ifdef LNUM_LDOUBLE
++# define _LUAI_MN2S 44
++#else
++# define _LUAI_MN2S 24
++#endif
++
++#ifdef LNUM_COMPLEX
++# define LUAI_MAXNUMBER2STR (2*_LUAI_MN2S)
++#else
++# define LUAI_MAXNUMBER2STR _LUAI_MN2S
++#endif
++
++/*
++** LUA_INTEGER is the integer type used by lua_pushinteger/lua_tointeger/lua_isinteger.
++** LUA_INTEGER_SCAN is the format for reading integers
++** LUA_INTEGER_FMT is the format for writing integers
++**
++** Note: Visual C++ 2005 does not have 'strtoull()', use '_strtoui64()' instead.
++*/
++#ifdef LNUM_INT32
++# if LUAI_BITSINT > 16
++#  define LUA_INTEGER   int
++#  define LUA_INTEGER_SCAN "%d"
++#  define LUA_INTEGER_FMT "%d"
++# else
++/* Note: 'LUA_INTEGER' being 'ptrdiff_t' (as in Lua 5.1) causes problems with
++ *       'printf()' operations. Also 'unsigned ptrdiff_t' is invalid.
++ */
++#  define LUA_INTEGER   long
++#  define LUA_INTEGER_SCAN "%ld"
++#  define LUA_INTEGER_FMT "%ld"
++# endif
++# define LUA_INTEGER_MAX 0x7FFFFFFF             /* 2^31-1 */
++/* */
++#elif defined(LNUM_INT64)
++# define LUA_INTEGER	long long
++# ifdef _MSC_VER
++#  define lua_str2ul    _strtoui64
++# else
++#  define lua_str2ul    strtoull
++# endif
++# define LUA_INTEGER_SCAN "%lld"
++# define LUA_INTEGER_FMT "%lld"
++# define LUA_INTEGER_MAX 0x7fffffffffffffffLL       /* 2^63-1 */ 
++# define LUA_INTEGER_MIN (-LUA_INTEGER_MAX - 1LL)   /* -2^63 */
++/* */
++#elif defined(LNUM_INT16)
++# if LUAI_BITSINT > 16
++#  define LUA_INTEGER    short
++#  define LUA_INTEGER_SCAN "%hd"
++#  define LUA_INTEGER_FMT "%hd"
++# else
++#  define LUA_INTEGER    int
++#  define LUA_INTEGER_SCAN "%d"
++#  define LUA_INTEGER_FMT "%d"
++# endif
++# define LUA_INTEGER_MAX 0x7FFF             /* 2^16-1 */
++#endif
++
++#ifndef lua_str2ul
++# define lua_str2ul (unsigned LUA_INTEGER)strtoul
++#endif
++#ifndef LUA_INTEGER_MIN
++# define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1)  /* -2^16|32 */
++#endif
++
++/*
++@@ lua_number2int is a macro to convert lua_Number to int.
++@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
++** CHANGE them if you know a faster way to convert a lua_Number to
++** int (with any rounding method and without throwing errors) in your
++** system. In Pentium machines, a naive typecast from double to int
++** in C is extremely slow, so any alternative is worth trying.
++*/
++
++/* On a Pentium, resort to a trick */
++#if defined(LNUM_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
++    (defined(__i386) || defined (_M_IX86) || defined(__i386__))
++
++/* On a Microsoft compiler, use assembler */
++# if defined(_MSC_VER)
++#  define lua_number2int(i,d)   __asm fld d   __asm fistp i
++# else
++
++/* the next trick should work on any Pentium, but sometimes clashes
++   with a DirectX idiosyncrasy */
++union luai_Cast { double l_d; long l_l; };
++#  define lua_number2int(i,d) \
++  { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
++# endif
++
++# ifndef LNUM_INT64
++#  define lua_number2integer    lua_number2int
++# endif
++
++/* this option always works, but may be slow */
++#else
++# define lua_number2int(i,d)        ((i)=(int)(d))
++#endif
++
++/* Note: Some compilers (OS X gcc 4.0?) may choke on double->long long conversion 
++ *       since it can lose precision. Others do require 'long long' there.  
++ */
++#ifndef lua_number2integer
++# define lua_number2integer(i,d)    ((i)=(lua_Integer)(d))
++#endif
++
++/*
++** 'luai_abs()' to give absolute value of 'lua_Integer'
++*/
++#ifdef LNUM_INT32
++# define luai_abs abs
++#elif defined(LNUM_INT64) && (__STDC_VERSION__ >= 199901L)
++# define luai_abs llabs
++#else
++# define luai_abs(v) ((v) >= 0 ? (v) : -(v))
++#endif
++
++/*
++** LUAI_UACNUMBER is the result of an 'usual argument conversion' over a number.
++** LUAI_UACINTEGER the same, over an integer.
++*/
++#define LUAI_UACNUMBER	double
++#define LUAI_UACINTEGER long
++
++/* ANSI C only has math funcs for 'double. C99 required for float and long double
++ * variants.
++ */
++#ifdef LNUM_DOUBLE
++# define _LF(name) name
++#elif defined(LNUM_FLOAT)
++# define _LF(name) name ## f
++#elif defined(LNUM_LDOUBLE)
++# define _LF(name) name ## l
++#endif
++
++#endif
++
+--- a/src/lobject.c
++++ b/src/lobject.c
+@@ -21,7 +21,8 @@
+ #include "lstate.h"
+ #include "lstring.h"
+ #include "lvm.h"
+-
++#include "llex.h"
++#include "lnum.h"
+ 
+ 
+ const TValue luaO_nilobject_ = {{NULL}, LUA_TNIL};
+@@ -70,12 +71,31 @@ int luaO_log2 (unsigned int x) {
+ 
+ 
+ int luaO_rawequalObj (const TValue *t1, const TValue *t2) {
+-  if (ttype(t1) != ttype(t2)) return 0;
++  if (!ttype_ext_same(t1,t2)) return 0;
+   else switch (ttype(t1)) {
+     case LUA_TNIL:
+       return 1;
++    case LUA_TINT:
++      if (ttype(t2)==LUA_TINT)
++        return ivalue(t1) == ivalue(t2);
++      else {  /* t1:int, t2:num */
++#ifdef LNUM_COMPLEX
++        if (nvalue_img_fast(t2) != 0) return 0;
++#endif
++        /* Avoid doing accuracy losing cast, if possible. */
++        lua_Integer tmp;
++        if (tt_integer_valued(t2,&tmp)) 
++          return ivalue(t1) == tmp;
++        else
++          return luai_numeq( cast_num(ivalue(t1)), nvalue_fast(t2) );
++        }
+     case LUA_TNUMBER:
+-      return luai_numeq(nvalue(t1), nvalue(t2));
++        if (ttype(t2)==LUA_TINT)
++          return luaO_rawequalObj(t2, t1);  /* swap LUA_TINT to left */
++#ifdef LNUM_COMPLEX
++        if (!luai_numeq(nvalue_img_fast(t1), nvalue_img_fast(t2))) return 0;
++#endif
++        return luai_numeq(nvalue_fast(t1), nvalue_fast(t2));
+     case LUA_TBOOLEAN:
+       return bvalue(t1) == bvalue(t2);  /* boolean true must be 1 !! */
+     case LUA_TLIGHTUSERDATA:
+@@ -86,21 +106,6 @@ int luaO_rawequalObj (const TValue *t1, 
+   }
+ }
+ 
+-
+-int luaO_str2d (const char *s, lua_Number *result) {
+-  char *endptr;
+-  *result = lua_str2number(s, &endptr);
+-  if (endptr == s) return 0;  /* conversion failed */
+-  if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
+-    *result = cast_num(strtoul(s, &endptr, 16));
+-  if (*endptr == '\0') return 1;  /* most common case */
+-  while (isspace(cast(unsigned char, *endptr))) endptr++;
+-  if (*endptr != '\0') return 0;  /* invalid trailing characters? */
+-  return 1;
+-}
+-
+-
+-
+ static void pushstr (lua_State *L, const char *str) {
+   setsvalue2s(L, L->top, luaS_new(L, str));
+   incr_top(L);
+@@ -131,7 +136,11 @@ const char *luaO_pushvfstring (lua_State
+         break;
+       }
+       case 'd': {
+-        setnvalue(L->top, cast_num(va_arg(argp, int)));
++        /* This is tricky for 64-bit integers; maybe they even cannot be
++         * supported on all compilers; depends on the conversions applied to
++         * variable argument lists. TBD: test!
++         */
++        setivalue(L->top, (lua_Integer) va_arg(argp, l_uacInteger));
+         incr_top(L);
+         break;
+       }
+@@ -212,3 +221,4 @@ void luaO_chunkid (char *out, const char
+     }
+   }
+ }
++
+--- a/src/lobject.h
++++ b/src/lobject.h
+@@ -17,7 +17,11 @@
+ 
+ 
+ /* tags for values visible from Lua */
+-#define LAST_TAG	LUA_TTHREAD
++#if LUA_TINT > LUA_TTHREAD
++# define LAST_TAG   LUA_TINT
++#else
++# define LAST_TAG	LUA_TTHREAD
++#endif
+ 
+ #define NUM_TAGS	(LAST_TAG+1)
+ 
+@@ -59,7 +63,12 @@ typedef struct GCheader {
+ typedef union {
+   GCObject *gc;
+   void *p;
++#ifdef LNUM_COMPLEX
++  lua_Complex n;
++#else
+   lua_Number n;
++#endif
++  lua_Integer i;
+   int b;
+ } Value;
+ 
+@@ -77,7 +86,11 @@ typedef struct lua_TValue {
+ 
+ /* Macros to test type */
+ #define ttisnil(o)	(ttype(o) == LUA_TNIL)
+-#define ttisnumber(o)	(ttype(o) == LUA_TNUMBER)
++#define ttisint(o) (ttype(o) == LUA_TINT)
++#define ttisnumber(o) ((ttype(o) == LUA_TINT) || (ttype(o) == LUA_TNUMBER))
++#ifdef LNUM_COMPLEX
++# define ttiscomplex(o) ((ttype(o) == LUA_TNUMBER) && (nvalue_img_fast(o)!=0))
++#endif
+ #define ttisstring(o)	(ttype(o) == LUA_TSTRING)
+ #define ttistable(o)	(ttype(o) == LUA_TTABLE)
+ #define ttisfunction(o)	(ttype(o) == LUA_TFUNCTION)
+@@ -90,7 +103,25 @@ typedef struct lua_TValue {
+ #define ttype(o)	((o)->tt)
+ #define gcvalue(o)	check_exp(iscollectable(o), (o)->value.gc)
+ #define pvalue(o)	check_exp(ttislightuserdata(o), (o)->value.p)
+-#define nvalue(o)	check_exp(ttisnumber(o), (o)->value.n)
++
++#define ttype_ext(o) ( ttype(o) == LUA_TINT ? LUA_TNUMBER : ttype(o) )
++#define ttype_ext_same(o1,o2) ( (ttype(o1)==ttype(o2)) || (ttisnumber(o1) && ttisnumber(o2)) )
++
++/* '_fast' variants are for cases where 'ttype(o)' is known to be LUA_TNUMBER.
++ */
++#ifdef LNUM_COMPLEX
++#  define nvalue_complex_fast(o) check_exp( ttype(o)==LUA_TNUMBER, (o)->value.n )   
++#  define nvalue_fast(o)     ( _LF(creal) ( nvalue_complex_fast(o) ) )
++#  define nvalue_img_fast(o) ( _LF(cimag) ( nvalue_complex_fast(o) ) )
++#  define nvalue_complex(o) check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? (o)->value.i : (o)->value.n )
++#  define nvalue_img(o) check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? 0 : _LF(cimag)( (o)->value.n ) ) 
++#  define nvalue(o) check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? cast_num((o)->value.i) : _LF(creal)((o)->value.n) ) 
++#else
++# define nvalue(o)	check_exp( ttisnumber(o), (ttype(o)==LUA_TINT) ? cast_num((o)->value.i) : (o)->value.n )
++# define nvalue_fast(o) check_exp( ttype(o)==LUA_TNUMBER, (o)->value.n )   
++#endif
++#define ivalue(o)	check_exp( ttype(o)==LUA_TINT, (o)->value.i )
++
+ #define rawtsvalue(o)	check_exp(ttisstring(o), &(o)->value.gc->ts)
+ #define tsvalue(o)	(&rawtsvalue(o)->tsv)
+ #define rawuvalue(o)	check_exp(ttisuserdata(o), &(o)->value.gc->u)
+@@ -116,8 +147,27 @@ typedef struct lua_TValue {
+ /* Macros to set values */
+ #define setnilvalue(obj) ((obj)->tt=LUA_TNIL)
+ 
+-#define setnvalue(obj,x) \
+-  { TValue *i_o=(obj); i_o->value.n=(x); i_o->tt=LUA_TNUMBER; }
++/* Must not have side effects, 'x' may be expression.
++*/
++#define setivalue(obj,x) \
++    { TValue *i_o=(obj); i_o->value.i=(x); i_o->tt=LUA_TINT; }
++
++# define setnvalue(obj,x) \
++    { TValue *i_o=(obj); i_o->value.n= (x); i_o->tt=LUA_TNUMBER; }
++
++/* Note: Complex always has "inline", both are C99.
++*/
++#ifdef LNUM_COMPLEX
++  static inline void setnvalue_complex_fast( TValue *obj, lua_Complex x ) {
++    lua_assert( _LF(cimag)(x) != 0 );
++    obj->value.n= x; obj->tt= LUA_TNUMBER;
++  }
++  static inline void setnvalue_complex( TValue *obj, lua_Complex x ) {
++    if (_LF(cimag)(x) == 0) { setnvalue(obj, _LF(creal)(x)); }
++    else { obj->value.n= x; obj->tt= LUA_TNUMBER; }
++  }
++#endif
++
+ 
+ #define setpvalue(obj,x) \
+   { TValue *i_o=(obj); i_o->value.p=(x); i_o->tt=LUA_TLIGHTUSERDATA; }
+@@ -155,9 +205,6 @@ typedef struct lua_TValue {
+     i_o->value.gc=cast(GCObject *, (x)); i_o->tt=LUA_TPROTO; \
+     checkliveness(G(L),i_o); }
+ 
+-
+-
+-
+ #define setobj(L,obj1,obj2) \
+   { const TValue *o2=(obj2); TValue *o1=(obj1); \
+     o1->value = o2->value; o1->tt=o2->tt; \
+@@ -185,8 +232,11 @@ typedef struct lua_TValue {
+ 
+ #define setttype(obj, tt) (ttype(obj) = (tt))
+ 
+-
+-#define iscollectable(o)	(ttype(o) >= LUA_TSTRING)
++#if LUA_TINT >= LUA_TSTRING
++# define iscollectable(o)	((ttype(o) >= LUA_TSTRING) && (ttype(o) != LUA_TINT))
++#else
++# define iscollectable(o)	(ttype(o) >= LUA_TSTRING)
++#endif
+ 
+ 
+ 
+@@ -370,12 +420,10 @@ LUAI_FUNC int luaO_log2 (unsigned int x)
+ LUAI_FUNC int luaO_int2fb (unsigned int x);
+ LUAI_FUNC int luaO_fb2int (int x);
+ LUAI_FUNC int luaO_rawequalObj (const TValue *t1, const TValue *t2);
+-LUAI_FUNC int luaO_str2d (const char *s, lua_Number *result);
+ LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
+                                                        va_list argp);
+ LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
+ LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len);
+ 
+-
+ #endif
+ 
+--- a/src/loslib.c
++++ b/src/loslib.c
+@@ -186,15 +186,30 @@ static int os_time (lua_State *L) {
+   }
+   if (t == (time_t)(-1))
+     lua_pushnil(L);
+-  else
+-    lua_pushnumber(L, (lua_Number)t);
++  else {
++     /* On float systems the pushed value must be an integer, NOT a number.
++      * Otherwise, accuracy is lost in the time_t->float conversion.
++      */
++#ifdef LNUM_FLOAT
++     lua_pushinteger(L, (lua_Integer) t);
++#else
++     lua_pushnumber(L, (lua_Number) t);
++#endif
++     }
+   return 1;
+ }
+ 
+ 
+ static int os_difftime (lua_State *L) {
++#ifdef LNUM_FLOAT
++  lua_Integer i= (lua_Integer)
++    difftime( (time_t)(luaL_checkinteger(L, 1)),
++              (time_t)(luaL_optinteger(L, 2, 0)));
++  lua_pushinteger(L, i);
++#else
+   lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
+                              (time_t)(luaL_optnumber(L, 2, 0))));
++#endif
+   return 1;
+ }
+ 
+--- a/src/lparser.c
++++ b/src/lparser.c
+@@ -33,7 +33,6 @@
+ 
+ #define luaY_checklimit(fs,v,l,m)	if ((v)>(l)) errorlimit(fs,l,m)
+ 
+-
+ /*
+ ** nodes for block list (list of active blocks)
+ */
+@@ -72,7 +71,7 @@ static void errorlimit (FuncState *fs, i
+   const char *msg = (fs->f->linedefined == 0) ?
+     luaO_pushfstring(fs->L, "main function has more than %d %s", limit, what) :
+     luaO_pushfstring(fs->L, "function at line %d has more than %d %s",
+-                            fs->f->linedefined, limit, what);
++                            (fs->f->linedefined), limit, what);
+   luaX_lexerror(fs->ls, msg, 0);
+ }
+ 
+@@ -733,6 +732,18 @@ static void simpleexp (LexState *ls, exp
+       v->u.nval = ls->t.seminfo.r;
+       break;
+     }
++    case TK_INT: {
++      init_exp(v, VKINT, 0);
++      v->u.ival = ls->t.seminfo.i;
++      break;
++    }
++#ifdef LNUM_COMPLEX
++    case TK_NUMBER2: {
++      init_exp(v, VKNUM2, 0);
++      v->u.nval = ls->t.seminfo.r;
++      break;
++    }
++#endif
+     case TK_STRING: {
+       codestring(ls, v, ls->t.seminfo.ts);
+       break;
+@@ -1079,7 +1090,7 @@ static void fornum (LexState *ls, TStrin
+   if (testnext(ls, ','))
+     exp1(ls);  /* optional step */
+   else {  /* default step = 1 */
+-    luaK_codeABx(fs, OP_LOADK, fs->freereg, luaK_numberK(fs, 1));
++    luaK_codeABx(fs, OP_LOADK, fs->freereg, luaK_integerK(fs, 1));
+     luaK_reserveregs(fs, 1);
+   }
+   forbody(ls, base, line, 1, 1);
+--- a/src/lparser.h
++++ b/src/lparser.h
+@@ -31,7 +31,11 @@ typedef enum {
+   VRELOCABLE,	/* info = instruction pc */
+   VNONRELOC,	/* info = result register */
+   VCALL,	/* info = instruction pc */
+-  VVARARG	/* info = instruction pc */
++  VVARARG,	/* info = instruction pc */
++  VKINT     /* ival = integer value */
++#ifdef LNUM_COMPLEX
++  ,VKNUM2   /* nval = imaginary value */
++#endif
+ } expkind;
+ 
+ typedef struct expdesc {
+@@ -39,6 +43,7 @@ typedef struct expdesc {
+   union {
+     struct { int info, aux; } s;
+     lua_Number nval;
++    lua_Integer ival;
+   } u;
+   int t;  /* patch list of `exit when true' */
+   int f;  /* patch list of `exit when false' */
+--- a/src/lstrlib.c
++++ b/src/lstrlib.c
+@@ -43,8 +43,8 @@ static ptrdiff_t posrelat (ptrdiff_t pos
+ static int str_sub (lua_State *L) {
+   size_t l;
+   const char *s = luaL_checklstring(L, 1, &l);
+-  ptrdiff_t start = posrelat(luaL_checkinteger(L, 2), l);
+-  ptrdiff_t end = posrelat(luaL_optinteger(L, 3, -1), l);
++  ptrdiff_t start = posrelat(luaL_checkint32(L, 2), l);
++  ptrdiff_t end = posrelat(luaL_optint32(L, 3, -1), l);
+   if (start < 1) start = 1;
+   if (end > (ptrdiff_t)l) end = (ptrdiff_t)l;
+   if (start <= end)
+@@ -106,8 +106,8 @@ static int str_rep (lua_State *L) {
+ static int str_byte (lua_State *L) {
+   size_t l;
+   const char *s = luaL_checklstring(L, 1, &l);
+-  ptrdiff_t posi = posrelat(luaL_optinteger(L, 2, 1), l);
+-  ptrdiff_t pose = posrelat(luaL_optinteger(L, 3, posi), l);
++  ptrdiff_t posi = posrelat(luaL_optint32(L, 2, 1), l);
++  ptrdiff_t pose = posrelat(luaL_optint32(L, 3, posi), l);
+   int n, i;
+   if (posi <= 0) posi = 1;
+   if ((size_t)pose > l) pose = l;
+@@ -496,7 +496,7 @@ static int str_find_aux (lua_State *L, i
+   size_t l1, l2;
+   const char *s = luaL_checklstring(L, 1, &l1);
+   const char *p = luaL_checklstring(L, 2, &l2);
+-  ptrdiff_t init = posrelat(luaL_optinteger(L, 3, 1), l1) - 1;
++  ptrdiff_t init = posrelat(luaL_optint32(L, 3, 1), l1) - 1;
+   if (init < 0) init = 0;
+   else if ((size_t)(init) > l1) init = (ptrdiff_t)l1;
+   if (find && (lua_toboolean(L, 4) ||  /* explicit request? */
+@@ -690,7 +690,7 @@ static int str_gsub (lua_State *L) {
+ ** maximum size of each format specification (such as '%-099.99d')
+ ** (+10 accounts for %99.99x plus margin of error)
+ */
+-#define MAX_FORMAT	(sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10)
++#define MAX_FORMAT	(sizeof(FLAGS) + sizeof(LUA_INTEGER_FMT)-2 + 10)
+ 
+ 
+ static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
+@@ -747,9 +747,9 @@ static const char *scanformat (lua_State
+ static void addintlen (char *form) {
+   size_t l = strlen(form);
+   char spec = form[l - 1];
+-  strcpy(form + l - 1, LUA_INTFRMLEN);
+-  form[l + sizeof(LUA_INTFRMLEN) - 2] = spec;
+-  form[l + sizeof(LUA_INTFRMLEN) - 1] = '\0';
++  const char *tmp= LUA_INTEGER_FMT;   /* "%lld" or "%ld" */
++  strcpy(form + l - 1, tmp+1);
++  form[l + sizeof(LUA_INTEGER_FMT)-4] = spec;
+ }
+ 
+ 
+@@ -779,12 +779,12 @@ static int str_format (lua_State *L) {
+         }
+         case 'd':  case 'i': {
+           addintlen(form);
+-          sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
++          sprintf(buff, form, luaL_checkinteger(L, arg));
+           break;
+         }
+         case 'o':  case 'u':  case 'x':  case 'X': {
+           addintlen(form);
+-          sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
++          sprintf(buff, form, (unsigned LUA_INTEGER)luaL_checkinteger(L, arg));
+           break;
+         }
+         case 'e':  case 'E': case 'f':
+--- a/src/ltable.c
++++ b/src/ltable.c
+@@ -33,6 +33,7 @@
+ #include "lobject.h"
+ #include "lstate.h"
+ #include "ltable.h"
++#include "lnum.h"
+ 
+ 
+ /*
+@@ -51,25 +52,15 @@
+   
+ #define hashstr(t,str)  hashpow2(t, (str)->tsv.hash)
+ #define hashboolean(t,p)        hashpow2(t, p)
+-
++#define hashint(t,i)    hashpow2(t,i)
+ 
+ /*
+ ** for some types, it is better to avoid modulus by power of 2, as
+ ** they tend to have many 2 factors.
+ */
+ #define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
+-
+-
+ #define hashpointer(t,p)	hashmod(t, IntPoint(p))
+ 
+-
+-/*
+-** number of ints inside a lua_Number
+-*/
+-#define numints		cast_int(sizeof(lua_Number)/sizeof(int))
+-
+-
+-
+ #define dummynode		(&dummynode_)
+ 
+ static const Node dummynode_ = {
+@@ -80,27 +71,46 @@ static const Node dummynode_ = {
+ 
+ /*
+ ** hash for lua_Numbers
++**
++** for non-complex modes, never called with 'lua_Integer' value range (s.a. 0)
+ */
+ static Node *hashnum (const Table *t, lua_Number n) {
+-  unsigned int a[numints];
+-  int i;
+-  if (luai_numeq(n, 0))  /* avoid problems with -0 */
+-    return gnode(t, 0);
+-  memcpy(a, &n, sizeof(a));
+-  for (i = 1; i < numints; i++) a[0] += a[i];
+-  return hashmod(t, a[0]);
++  const unsigned int *p= cast(const unsigned int *,&n);
++  unsigned int sum= *p;
++  unsigned int m= sizeof(lua_Number)/sizeof(int);
++  unsigned int i;
++  /* OS X Intel has 'm'==4 and gives "Bus error" if the last integer of 
++   * 'n' is read; the actual size of long double is only 80 bits = 10 bytes.
++   * Linux x86 has 'm'==3, and does not require reduction.
++   */
++#if defined(LNUM_LDOUBLE) && defined(__i386__)
++  if (m>3) m--;
++#endif
++  for (i = 1; i < m; i++) sum += p[i];
++  return hashmod(t, sum);
+ }
+ 
+ 
+-
+ /*
+ ** returns the `main' position of an element in a table (that is, the index
+ ** of its hash value)
++**
++** Floating point numbers with integer value give the hash position of the
++** integer (so they use the same table position).
+ */
+ static Node *mainposition (const Table *t, const TValue *key) {
++  lua_Integer i;
+   switch (ttype(key)) {
+     case LUA_TNUMBER:
+-      return hashnum(t, nvalue(key));
++      if (tt_integer_valued(key,&i)) 
++        return hashint(t, i);
++#ifdef LNUM_COMPLEX
++      if (nvalue_img_fast(key)!=0 && luai_numeq(nvalue_fast(key),0))
++        return gnode(t, 0);  /* 0 and -0 to give same hash */
++#endif
++      return hashnum(t, nvalue_fast(key));
++    case LUA_TINT:
++      return hashint(t, ivalue(key));
+     case LUA_TSTRING:
+       return hashstr(t, rawtsvalue(key));
+     case LUA_TBOOLEAN:
+@@ -116,16 +126,20 @@ static Node *mainposition (const Table *
+ /*
+ ** returns the index for `key' if `key' is an appropriate key to live in
+ ** the array part of the table, -1 otherwise.
++**
++** Anything <=0 is taken as not being in the array part.
+ */
+-static int arrayindex (const TValue *key) {
+-  if (ttisnumber(key)) {
+-    lua_Number n = nvalue(key);
+-    int k;
+-    lua_number2int(k, n);
+-    if (luai_numeq(cast_num(k), n))
+-      return k;
++static int arrayindex (const TValue *key, int max) {
++  lua_Integer k;
++  switch( ttype(key) ) {
++    case LUA_TINT:
++      k= ivalue(key); break;
++    case LUA_TNUMBER:
++      if (tt_integer_valued(key,&k)) break;
++    default:
++      return -1;  /* not to be used as array index */
+   }
+-  return -1;  /* `key' did not match some condition */
++  return ((k>0) && (k <= max)) ? cast_int(k) : -1;
+ }
+ 
+ 
+@@ -137,8 +151,8 @@ static int arrayindex (const TValue *key
+ static int findindex (lua_State *L, Table *t, StkId key) {
+   int i;
+   if (ttisnil(key)) return -1;  /* first iteration */
+-  i = arrayindex(key);
+-  if (0 < i && i <= t->sizearray)  /* is `key' inside array part? */
++  i = arrayindex(key, t->sizearray);
++  if (i>0)  /* inside array part? */
+     return i-1;  /* yes; that's the index (corrected to C) */
+   else {
+     Node *n = mainposition(t, key);
+@@ -163,7 +177,7 @@ int luaH_next (lua_State *L, Table *t, S
+   int i = findindex(L, t, key);  /* find original element */
+   for (i++; i < t->sizearray; i++) {  /* try first array part */
+     if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
+-      setnvalue(key, cast_num(i+1));
++      setivalue(key, i+1);
+       setobj2s(L, key+1, &t->array[i]);
+       return 1;
+     }
+@@ -209,8 +223,8 @@ static int computesizes (int nums[], int
+ 
+ 
+ static int countint (const TValue *key, int *nums) {
+-  int k = arrayindex(key);
+-  if (0 < k && k <= MAXASIZE) {  /* is `key' an appropriate array index? */
++  int k = arrayindex(key,MAXASIZE);
++  if (k>0) {  /* appropriate array index? */
+     nums[ceillog2(k)]++;  /* count as such */
+     return 1;
+   }
+@@ -308,7 +322,7 @@ static void resize (lua_State *L, Table 
+     /* re-insert elements from vanishing slice */
+     for (i=nasize; i<oldasize; i++) {
+       if (!ttisnil(&t->array[i]))
+-        setobjt2t(L, luaH_setnum(L, t, i+1), &t->array[i]);
++        setobjt2t(L, luaH_setint(L, t, i+1), &t->array[i]);
+     }
+     /* shrink array */
+     luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
+@@ -409,7 +423,9 @@ static TValue *newkey (lua_State *L, Tab
+     othern = mainposition(t, key2tval(mp));
+     if (othern != mp) {  /* is colliding node out of its main position? */
+       /* yes; move colliding node into free position */
+-      while (gnext(othern) != mp) othern = gnext(othern);  /* find previous */
++      while (gnext(othern) != mp) {
++        othern = gnext(othern);  /* find previous */
++      }
+       gnext(othern) = n;  /* redo the chain with `n' in place of `mp' */
+       *n = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+       gnext(mp) = NULL;  /* now `mp' is free */
+@@ -432,17 +448,18 @@ static TValue *newkey (lua_State *L, Tab
+ /*
+ ** search function for integers
+ */
+-const TValue *luaH_getnum (Table *t, int key) {
++const TValue *luaH_getint (Table *t, lua_Integer key) {
+   /* (1 <= key && key <= t->sizearray) */
+   if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray))
+     return &t->array[key-1];
+   else {
+-    lua_Number nk = cast_num(key);
+-    Node *n = hashnum(t, nk);
++    Node *n = hashint(t, key);
+     do {  /* check whether `key' is somewhere in the chain */
+-      if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
++      if (ttisint(gkey(n)) && (ivalue(gkey(n)) == key)) {
+         return gval(n);  /* that's it */
+-      else n = gnext(n);
++      } else { 
++      n = gnext(n);
++    }
+     } while (n);
+     return luaO_nilobject;
+   }
+@@ -470,14 +487,12 @@ const TValue *luaH_get (Table *t, const 
+   switch (ttype(key)) {
+     case LUA_TNIL: return luaO_nilobject;
+     case LUA_TSTRING: return luaH_getstr(t, rawtsvalue(key));
++    case LUA_TINT: return luaH_getint(t, ivalue(key));
+     case LUA_TNUMBER: {
+-      int k;
+-      lua_Number n = nvalue(key);
+-      lua_number2int(k, n);
+-      if (luai_numeq(cast_num(k), nvalue(key))) /* index is int? */
+-        return luaH_getnum(t, k);  /* use specialized version */
+-      /* else go through */
+-    }
++      lua_Integer i;
++      if (tt_integer_valued(key,&i))
++        return luaH_getint(t,i);
++    } /* pass through */
+     default: {
+       Node *n = mainposition(t, key);
+       do {  /* check whether `key' is somewhere in the chain */
+@@ -498,20 +513,25 @@ TValue *luaH_set (lua_State *L, Table *t
+     return cast(TValue *, p);
+   else {
+     if (ttisnil(key)) luaG_runerror(L, "table index is nil");
+-    else if (ttisnumber(key) && luai_numisnan(nvalue(key)))
+-      luaG_runerror(L, "table index is NaN");
++    else if (ttype(key)==LUA_TNUMBER) {
++      lua_Integer k;
++      if (luai_numisnan(nvalue_fast(key)))
++        luaG_runerror(L, "table index is NaN");
++      if (tt_integer_valued(key,&k))
++        return luaH_setint(L, t, k);
++    }
+     return newkey(L, t, key);
+   }
+ }
+ 
+ 
+-TValue *luaH_setnum (lua_State *L, Table *t, int key) {
+-  const TValue *p = luaH_getnum(t, key);
++TValue *luaH_setint (lua_State *L, Table *t, lua_Integer key) {
++  const TValue *p = luaH_getint(t, key);
+   if (p != luaO_nilobject)
+     return cast(TValue *, p);
+   else {
+     TValue k;
+-    setnvalue(&k, cast_num(key));
++    setivalue(&k, key);
+     return newkey(L, t, &k);
+   }
+ }
+@@ -533,20 +553,21 @@ static int unbound_search (Table *t, uns
+   unsigned int i = j;  /* i is zero or a present index */
+   j++;
+   /* find `i' and `j' such that i is present and j is not */
+-  while (!ttisnil(luaH_getnum(t, j))) {
++  while (!ttisnil(luaH_getint(t, j))) {
+     i = j;
+     j *= 2;
+     if (j > cast(unsigned int, MAX_INT)) {  /* overflow? */
+       /* table was built with bad purposes: resort to linear search */
+-      i = 1;
+-      while (!ttisnil(luaH_getnum(t, i))) i++;
+-      return i - 1;
++      for( i = 1; i<MAX_INT+1; i++ ) {
++        if (ttisnil(luaH_getint(t, i))) break;
++      }
++      return i - 1;  /* up to MAX_INT */
+     }
+   }
+   /* now do a binary search between them */
+   while (j - i > 1) {
+     unsigned int m = (i+j)/2;
+-    if (ttisnil(luaH_getnum(t, m))) j = m;
++    if (ttisnil(luaH_getint(t, m))) j = m;
+     else i = m;
+   }
+   return i;
+--- a/src/ltable.h
++++ b/src/ltable.h
+@@ -18,8 +18,8 @@
+ #define key2tval(n)	(&(n)->i_key.tvk)
+ 
+ 
+-LUAI_FUNC const TValue *luaH_getnum (Table *t, int key);
+-LUAI_FUNC TValue *luaH_setnum (lua_State *L, Table *t, int key);
++LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
++LUAI_FUNC TValue *luaH_setint (lua_State *L, Table *t, lua_Integer key);
+ LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
+ LUAI_FUNC TValue *luaH_setstr (lua_State *L, Table *t, TString *key);
+ LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
+--- a/src/ltm.c
++++ b/src/ltm.c
+@@ -19,7 +19,6 @@
+ #include "ltm.h"
+ 
+ 
+-
+ const char *const luaT_typenames[] = {
+   "nil", "boolean", "userdata", "number",
+   "string", "table", "function", "userdata", "thread",
+@@ -67,6 +66,9 @@ const TValue *luaT_gettmbyobj (lua_State
+     case LUA_TUSERDATA:
+       mt = uvalue(o)->metatable;
+       break;
++    case LUA_TINT:
++      mt = G(L)->mt[LUA_TNUMBER];
++      break;
+     default:
+       mt = G(L)->mt[ttype(o)];
+   }
+--- a/src/lua.c
++++ b/src/lua.c
+@@ -16,7 +16,7 @@
+ 
+ #include "lauxlib.h"
+ #include "lualib.h"
+-
++#include "llimits.h"
+ 
+ 
+ static lua_State *globalL = NULL;
+@@ -382,6 +382,15 @@ int main (int argc, char **argv) {
+     l_message(argv[0], "cannot create state: not enough memory");
+     return EXIT_FAILURE;
+   }
++  /* Checking 'sizeof(lua_Integer)' cannot be made in preprocessor on all compilers.
++  */
++#ifdef LNUM_INT16
++  lua_assert( sizeof(lua_Integer) == 2 );
++#elif defined(LNUM_INT32)
++  lua_assert( sizeof(lua_Integer) == 4 );
++#elif defined(LNUM_INT64)
++  lua_assert( sizeof(lua_Integer) == 8 );
++#endif
+   s.argc = argc;
+   s.argv = argv;
+   status = lua_cpcall(L, &pmain, &s);
+--- a/src/lua.h
++++ b/src/lua.h
+@@ -19,7 +19,7 @@
+ #define LUA_VERSION	"Lua 5.1"
+ #define LUA_RELEASE	"Lua 5.1.5"
+ #define LUA_VERSION_NUM	501
+-#define LUA_COPYRIGHT	"Copyright (C) 1994-2012 Lua.org, PUC-Rio"
++#define LUA_COPYRIGHT	"Copyright (C) 1994-2012 Lua.org, PUC-Rio" " (" LUA_LNUM ")"
+ #define LUA_AUTHORS 	"R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
+ 
+ 
+@@ -71,6 +71,16 @@ typedef void * (*lua_Alloc) (void *ud, v
+ */
+ #define LUA_TNONE		(-1)
+ 
++/* LUA_TINT is an internal type, not visible to applications. There are three
++ * potential values where it can be tweaked to (code autoadjusts to these):
++ *
++ * -2: not 'usual' type value; good since 'LUA_TINT' is not part of the API
++ * LUA_TNUMBER+1: shifts other type values upwards, breaking binary compatibility
++ *     not acceptable for 5.1, maybe 5.2 onwards?
++ *  9: greater than existing (5.1) type values.
++*/
++#define LUA_TINT (-2)
++
+ #define LUA_TNIL		0
+ #define LUA_TBOOLEAN		1
+ #define LUA_TLIGHTUSERDATA	2
+@@ -139,6 +149,8 @@ LUA_API int             (lua_isuserdata)
+ LUA_API int             (lua_type) (lua_State *L, int idx);
+ LUA_API const char     *(lua_typename) (lua_State *L, int tp);
+ 
++LUA_API int             (lua_isinteger) (lua_State *L, int idx);
++
+ LUA_API int            (lua_equal) (lua_State *L, int idx1, int idx2);
+ LUA_API int            (lua_rawequal) (lua_State *L, int idx1, int idx2);
+ LUA_API int            (lua_lessthan) (lua_State *L, int idx1, int idx2);
+@@ -244,6 +256,19 @@ LUA_API lua_Alloc (lua_getallocf) (lua_S
+ LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
+ 
+ 
++/*
++* It is unnecessary to break Lua C API 'lua_tonumber()' compatibility, just
++* because the Lua number type is complex. Most C modules would use scalars
++* only. We'll introduce new 'lua_tocomplex' and 'lua_pushcomplex' for when
++* the module really wants to use them.
++*/
++#ifdef LNUM_COMPLEX
++  #include <complex.h>
++  typedef LUA_NUMBER complex lua_Complex;
++  LUA_API lua_Complex (lua_tocomplex) (lua_State *L, int idx);
++  LUA_API void (lua_pushcomplex) (lua_State *L, lua_Complex v);
++#endif
++
+ 
+ /* 
+ ** ===============================================================
+@@ -268,7 +293,12 @@ LUA_API void lua_setallocf (lua_State *L
+ #define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
+ #define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
+ #define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
+-#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
++
++#if LUA_TINT < 0
++# define lua_isnoneornil(L, n)	( (lua_type(L,(n)) <= 0) && (lua_type(L,(n)) != LUA_TINT) )
++#else
++# define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
++#endif
+ 
+ #define lua_pushliteral(L, s)	\
+ 	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
+@@ -386,3 +416,4 @@ struct lua_Debug {
+ 
+ 
+ #endif
++
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -10,7 +10,9 @@
+ 
+ #include <limits.h>
+ #include <stddef.h>
+-
++#ifdef lua_assert
++# include <assert.h>
++#endif
+ 
+ /*
+ ** ==================================================================
+@@ -136,14 +138,38 @@
+ 
+ 
+ /*
+-@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
+-** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
+-** machines, ptrdiff_t gives a good choice between int or long.)
++@@ LUAI_BITSINT defines the number of bits in an int.
++** CHANGE here if Lua cannot automatically detect the number of bits of
++** your machine. Probably you do not need to change this.
+ */
+-#define LUA_INTEGER	ptrdiff_t
++/* avoid overflows in comparison */
++#if INT_MAX-20 < 32760
++#define LUAI_BITSINT	16
++#elif INT_MAX > 2147483640L
++/* int has at least 32 bits */
++#define LUAI_BITSINT	32
++#else
++#error "you must define LUA_BITSINT with number of bits in an integer"
++#endif
+ 
+ 
+ /*
++@@ LNUM_DOUBLE | LNUM_FLOAT | LNUM_LDOUBLE: Generic Lua number mode
++@@ LNUM_INT32 | LNUM_INT64: Integer type
++@@ LNUM_COMPLEX: Define for using 'a+bi' numbers
++@@
++@@ You can combine LNUM_xxx but only one of each group. I.e. '-DLNUM_FLOAT
++@@ -DLNUM_INT32 -DLNUM_COMPLEX' gives float range complex numbers, with 
++@@ 32-bit scalar integer range optimized.
++**
++** These are kept in a separate configuration file mainly for ease of patching
++** (can be changed if integerated to Lua proper).
++*/
++/*#define LNUM_DOUBLE*/
++/*#define LNUM_INT32*/
++#include "lnum_config.h"
++
++/*
+ @@ LUA_API is a mark for all core API functions.
+ @@ LUALIB_API is a mark for all standard library functions.
+ ** CHANGE them if you need to define those functions in some special way.
+@@ -383,22 +409,6 @@
+ 
+ 
+ /*
+-@@ LUAI_BITSINT defines the number of bits in an int.
+-** CHANGE here if Lua cannot automatically detect the number of bits of
+-** your machine. Probably you do not need to change this.
+-*/
+-/* avoid overflows in comparison */
+-#if INT_MAX-20 < 32760
+-#define LUAI_BITSINT	16
+-#elif INT_MAX > 2147483640L
+-/* int has at least 32 bits */
+-#define LUAI_BITSINT	32
+-#else
+-#error "you must define LUA_BITSINT with number of bits in an integer"
+-#endif
+-
+-
+-/*
+ @@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
+ @@ LUAI_INT32 is an signed integer with at least 32 bits.
+ @@ LUAI_UMEM is an unsigned integer big enough to count the total
+@@ -425,6 +435,15 @@
+ #define LUAI_MEM	long
+ #endif
+ 
++/*
++@@ LUAI_BOOL carries 0 and nonzero (normally 1). It may be defined as 'char'
++** (to save memory), 'int' (for speed), 'bool' (for C++) or '_Bool' (C99)
++*/
++#ifdef __cplusplus
++# define LUAI_BOOL bool
++#else
++# define LUAI_BOOL int
++#endif
+ 
+ /*
+ @@ LUAI_MAXCALLS limits the number of nested calls.
+@@ -490,101 +509,6 @@
+ /* }================================================================== */
+ 
+ 
+-
+-
+-/*
+-** {==================================================================
+-@@ LUA_NUMBER is the type of numbers in Lua.
+-** CHANGE the following definitions only if you want to build Lua
+-** with a number type different from double. You may also need to
+-** change lua_number2int & lua_number2integer.
+-** ===================================================================
+-*/
+-
+-#define LUA_NUMBER_DOUBLE
+-#define LUA_NUMBER	double
+-
+-/*
+-@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
+-@* over a number.
+-*/
+-#define LUAI_UACNUMBER	double
+-
+-
+-/*
+-@@ LUA_NUMBER_SCAN is the format for reading numbers.
+-@@ LUA_NUMBER_FMT is the format for writing numbers.
+-@@ lua_number2str converts a number to a string.
+-@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
+-@@ lua_str2number converts a string to a number.
+-*/
+-#define LUA_NUMBER_SCAN		"%lf"
+-#define LUA_NUMBER_FMT		"%.14g"
+-#define lua_number2str(s,n)	sprintf((s), LUA_NUMBER_FMT, (n))
+-#define LUAI_MAXNUMBER2STR	32 /* 16 digits, sign, point, and \0 */
+-#define lua_str2number(s,p)	strtod((s), (p))
+-
+-
+-/*
+-@@ The luai_num* macros define the primitive operations over numbers.
+-*/
+-#if defined(LUA_CORE)
+-#include <math.h>
+-#define luai_numadd(a,b)	((a)+(b))
+-#define luai_numsub(a,b)	((a)-(b))
+-#define luai_nummul(a,b)	((a)*(b))
+-#define luai_numdiv(a,b)	((a)/(b))
+-#define luai_nummod(a,b)	((a) - floor((a)/(b))*(b))
+-#define luai_numpow(a,b)	(pow(a,b))
+-#define luai_numunm(a)		(-(a))
+-#define luai_numeq(a,b)		((a)==(b))
+-#define luai_numlt(a,b)		((a)<(b))
+-#define luai_numle(a,b)		((a)<=(b))
+-#define luai_numisnan(a)	(!luai_numeq((a), (a)))
+-#endif
+-
+-
+-/*
+-@@ lua_number2int is a macro to convert lua_Number to int.
+-@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
+-** CHANGE them if you know a faster way to convert a lua_Number to
+-** int (with any rounding method and without throwing errors) in your
+-** system. In Pentium machines, a naive typecast from double to int
+-** in C is extremely slow, so any alternative is worth trying.
+-*/
+-
+-/* On a Pentium, resort to a trick */
+-#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
+-    (defined(__i386) || defined (_M_IX86) || defined(__i386__))
+-
+-/* On a Microsoft compiler, use assembler */
+-#if defined(_MSC_VER)
+-
+-#define lua_number2int(i,d)   __asm fld d   __asm fistp i
+-#define lua_number2integer(i,n)		lua_number2int(i, n)
+-
+-/* the next trick should work on any Pentium, but sometimes clashes
+-   with a DirectX idiosyncrasy */
+-#else
+-
+-union luai_Cast { double l_d; long l_l; };
+-#define lua_number2int(i,d) \
+-  { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
+-#define lua_number2integer(i,n)		lua_number2int(i, n)
+-
+-#endif
+-
+-
+-/* this option always works, but may be slow */
+-#else
+-#define lua_number2int(i,d)	((i)=(int)(d))
+-#define lua_number2integer(i,d)	((i)=(lua_Integer)(d))
+-
+-#endif
+-
+-/* }================================================================== */
+-
+-
+ /*
+ @@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
+ ** CHANGE it if your system requires alignments larger than double. (For
+@@ -728,28 +652,6 @@ union luai_Cast { double l_d; long l_l; 
+ #define luai_userstateyield(L,n)	((void)L)
+ 
+ 
+-/*
+-@@ LUA_INTFRMLEN is the length modifier for integer conversions
+-@* in 'string.format'.
+-@@ LUA_INTFRM_T is the integer type correspoding to the previous length
+-@* modifier.
+-** CHANGE them if your system supports long long or does not support long.
+-*/
+-
+-#if defined(LUA_USELONGLONG)
+-
+-#define LUA_INTFRMLEN		"ll"
+-#define LUA_INTFRM_T		long long
+-
+-#else
+-
+-#define LUA_INTFRMLEN		"l"
+-#define LUA_INTFRM_T		long
+-
+-#endif
+-
+-
+-
+ /* =================================================================== */
+ 
+ /*
+--- a/src/lundump.c
++++ b/src/lundump.c
+@@ -73,6 +73,13 @@ static lua_Number LoadNumber(LoadState* 
+  return x;
+ }
+ 
++static lua_Integer LoadInteger(LoadState* S)
++{
++ lua_Integer x;
++ LoadVar(S,x);
++ return x;
++}
++
+ static TString* LoadString(LoadState* S)
+ {
+  size_t size;
+@@ -119,6 +126,9 @@ static void LoadConstants(LoadState* S, 
+    case LUA_TNUMBER:
+ 	setnvalue(o,LoadNumber(S));
+ 	break;
++   case LUA_TINT:   /* Integer type saved in bytecode (see lcode.c) */
++	setivalue(o,LoadInteger(S));
++	break;
+    case LUA_TSTRING:
+ 	setsvalue2n(S->L,o,LoadString(S));
+ 	break;
+@@ -223,5 +233,22 @@ void luaU_header (char* h)
+  *h++=(char)sizeof(size_t);
+  *h++=(char)sizeof(Instruction);
+  *h++=(char)sizeof(lua_Number);
+- *h++=(char)(((lua_Number)0.5)==0);		/* is lua_Number integral? */
++
++ /* 
++  * Last byte of header (0/1 in unpatched Lua 5.1.3):
++  *
++  * 0: lua_Number is float or double, lua_Integer not used. (nonpatched only)
++  * 1: lua_Number is integer (nonpatched only)
++  *
++  * +2: LNUM_INT16: sizeof(lua_Integer)
++  * +4: LNUM_INT32: sizeof(lua_Integer)
++  * +8: LNUM_INT64: sizeof(lua_Integer)
++  *
++  * +0x80: LNUM_COMPLEX
++  */
++ *h++ = (char)(sizeof(lua_Integer)
++#ifdef LNUM_COMPLEX
++    | 0x80
++#endif
++    );
+ }
+--- a/src/lvm.c
++++ b/src/lvm.c
+@@ -25,22 +25,35 @@
+ #include "ltable.h"
+ #include "ltm.h"
+ #include "lvm.h"
+-
+-
++#include "llex.h"
++#include "lnum.h"
+ 
+ /* limit for table tag-method chains (to avoid loops) */
+ #define MAXTAGLOOP	100
+ 
+ 
+-const TValue *luaV_tonumber (const TValue *obj, TValue *n) {
+-  lua_Number num;
++/*
++ * If 'obj' is a string, it is tried to be interpreted as a number.
++ */
++const TValue *luaV_tonumber ( const TValue *obj, TValue *n) {
++  lua_Number d;
++  lua_Integer i;
++  
+   if (ttisnumber(obj)) return obj;
+-  if (ttisstring(obj) && luaO_str2d(svalue(obj), &num)) {
+-    setnvalue(n, num);
+-    return n;
+-  }
+-  else
+-    return NULL;
++
++  if (ttisstring(obj)) {
++    switch( luaO_str2d( svalue(obj), &d, &i ) ) {
++        case TK_INT:
++            setivalue(n,i); return n;
++        case TK_NUMBER: 
++            setnvalue(n,d); return n;
++#ifdef LNUM_COMPLEX
++        case TK_NUMBER2:    /* "N.NNNi", != 0 */
++            setnvalue_complex_fast(n, d*I); return n;
++#endif
++        }
++    }
++  return NULL;
+ }
+ 
+ 
+@@ -49,8 +62,7 @@ int luaV_tostring (lua_State *L, StkId o
+     return 0;
+   else {
+     char s[LUAI_MAXNUMBER2STR];
+-    lua_Number n = nvalue(obj);
+-    lua_number2str(s, n);
++    luaO_num2buf(s,obj);
+     setsvalue2s(L, obj, luaS_new(L, s));
+     return 1;
+   }
+@@ -222,59 +234,127 @@ static int l_strcmp (const TString *ls, 
+ }
+ 
+ 
++#ifdef LNUM_COMPLEX
++void error_complex( lua_State *L, const TValue *l, const TValue *r )
++{
++  char buf1[ LUAI_MAXNUMBER2STR ];
++  char buf2[ LUAI_MAXNUMBER2STR ];
++  luaO_num2buf( buf1, l );
++  luaO_num2buf( buf2, r );
++  luaG_runerror( L, "unable to compare: %s with %s", buf1, buf2 );
++  /* no return */
++}
++#endif
++
++
+ int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
+   int res;
+-  if (ttype(l) != ttype(r))
++  int tl,tr;
++  lua_Integer tmp;
++
++  if (!ttype_ext_same(l,r))
+     return luaG_ordererror(L, l, r);
+-  else if (ttisnumber(l))
+-    return luai_numlt(nvalue(l), nvalue(r));
+-  else if (ttisstring(l))
+-    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
+-  else if ((res = call_orderTM(L, l, r, TM_LT)) != -1)
++#ifdef LNUM_COMPLEX
++  if ( (nvalue_img(l)!=0) || (nvalue_img(r)!=0) )
++    error_complex( L, l, r );
++#endif
++  tl= ttype(l); tr= ttype(r);
++  if (tl==tr) {  /* clear arithmetics */
++    switch(tl) {
++      case LUA_TINT:      return ivalue(l) < ivalue(r);
++      case LUA_TNUMBER:   return luai_numlt(nvalue_fast(l), nvalue_fast(r));
++      case LUA_TSTRING:   return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0;
++    }
++  } else if (tl==LUA_TINT) {  /* l:int, r:num */
++    /* Avoid accuracy losing casts: if 'r' is integer by value, do comparisons
++     * in integer realm. Only otherwise cast 'l' to FP (which might change its
++     * value).
++     */
++    if (tt_integer_valued(r,&tmp)) 
++        return ivalue(l) < tmp;
++    else 
++        return luai_numlt( cast_num(ivalue(l)), nvalue_fast(r) );
++
++  } else if (tl==LUA_TNUMBER) {  /* l:num, r:int */
++    if (tt_integer_valued(l,&tmp)) 
++        return tmp < ivalue(r);
++    else
++        return luai_numlt( nvalue_fast(l), cast_num(ivalue(r)) );
++
++  } else if ((res = call_orderTM(L, l, r, TM_LT)) != -1)
+     return res;
++
+   return luaG_ordererror(L, l, r);
+ }
+ 
+ 
+ static int lessequal (lua_State *L, const TValue *l, const TValue *r) {
+   int res;
+-  if (ttype(l) != ttype(r))
++  int tl, tr;
++  lua_Integer tmp;
++
++  if (!ttype_ext_same(l,r))
+     return luaG_ordererror(L, l, r);
+-  else if (ttisnumber(l))
+-    return luai_numle(nvalue(l), nvalue(r));
+-  else if (ttisstring(l))
+-    return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
+-  else if ((res = call_orderTM(L, l, r, TM_LE)) != -1)  /* first try `le' */
++#ifdef LNUM_COMPLEX
++  if ( (nvalue_img(l)!=0) || (nvalue_img(r)!=0) )
++    error_complex( L, l, r );
++#endif
++  tl= ttype(l); tr= ttype(r);
++  if (tl==tr) {  /* clear arithmetics */
++    switch(tl) {
++      case LUA_TINT:      return ivalue(l) <= ivalue(r);
++      case LUA_TNUMBER:   return luai_numle(nvalue_fast(l), nvalue_fast(r));
++      case LUA_TSTRING:   return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0;
++    }
++  }
++  if (tl==LUA_TINT) {  /* l:int, r:num */
++    if (tt_integer_valued(r,&tmp)) 
++        return ivalue(l) <= tmp;
++    else
++        return luai_numle( cast_num(ivalue(l)), nvalue_fast(r) );
++
++  } else if (tl==LUA_TNUMBER) {  /* l:num, r:int */
++    if (tt_integer_valued(l,&tmp)) 
++        return tmp <= ivalue(r);
++    else
++        return luai_numle( nvalue_fast(l), cast_num(ivalue(r)) );
++
++  } else if ((res = call_orderTM(L, l, r, TM_LE)) != -1)  /* first try `le' */
+     return res;
+   else if ((res = call_orderTM(L, r, l, TM_LT)) != -1)  /* else try `lt' */
+     return !res;
++
+   return luaG_ordererror(L, l, r);
+ }
+ 
+ 
+-int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2) {
++/* Note: 'luaV_equalval()' and 'luaO_rawequalObj()' have largely overlapping
++ *       implementation. LUA_TNIL..LUA_TLIGHTUSERDATA cases could be handled
++ *       simply by the 'default' case here.
++ */
++int luaV_equalval (lua_State *L, const TValue *l, const TValue *r) {
+   const TValue *tm;
+-  lua_assert(ttype(t1) == ttype(t2));
+-  switch (ttype(t1)) {
++  lua_assert(ttype_ext_same(l,r));
++  switch (ttype(l)) {
+     case LUA_TNIL: return 1;
+-    case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2));
+-    case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2);  /* true must be 1 !! */
+-    case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
++    case LUA_TINT:
++    case LUA_TNUMBER: return luaO_rawequalObj(l,r);
++    case LUA_TBOOLEAN: return bvalue(l) == bvalue(r);  /* true must be 1 !! */
++    case LUA_TLIGHTUSERDATA: return pvalue(l) == pvalue(r);
+     case LUA_TUSERDATA: {
+-      if (uvalue(t1) == uvalue(t2)) return 1;
+-      tm = get_compTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable,
+-                         TM_EQ);
++      if (uvalue(l) == uvalue(r)) return 1;
++      tm = get_compTM(L, uvalue(l)->metatable, uvalue(r)->metatable, TM_EQ);
+       break;  /* will try TM */
+     }
+     case LUA_TTABLE: {
+-      if (hvalue(t1) == hvalue(t2)) return 1;
+-      tm = get_compTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ);
++      if (hvalue(l) == hvalue(r)) return 1;
++      tm = get_compTM(L, hvalue(l)->metatable, hvalue(r)->metatable, TM_EQ);
+       break;  /* will try TM */
+     }
+-    default: return gcvalue(t1) == gcvalue(t2);
++    default: return gcvalue(l) == gcvalue(r);
+   }
+   if (tm == NULL) return 0;  /* no TM? */
+-  callTMres(L, L->top, tm, t1, t2);  /* call TM */
++  callTMres(L, L->top, tm, l, r);  /* call TM */
+   return !l_isfalse(L->top);
+ }
+ 
+@@ -314,30 +394,6 @@ void luaV_concat (lua_State *L, int tota
+ }
+ 
+ 
+-static void Arith (lua_State *L, StkId ra, const TValue *rb,
+-                   const TValue *rc, TMS op) {
+-  TValue tempb, tempc;
+-  const TValue *b, *c;
+-  if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
+-      (c = luaV_tonumber(rc, &tempc)) != NULL) {
+-    lua_Number nb = nvalue(b), nc = nvalue(c);
+-    switch (op) {
+-      case TM_ADD: setnvalue(ra, luai_numadd(nb, nc)); break;
+-      case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); break;
+-      case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); break;
+-      case TM_DIV: setnvalue(ra, luai_numdiv(nb, nc)); break;
+-      case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); break;
+-      case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break;
+-      case TM_UNM: setnvalue(ra, luai_numunm(nb)); break;
+-      default: lua_assert(0); break;
+-    }
+-  }
+-  else if (!call_binTM(L, rb, rc, ra, op))
+-    luaG_aritherror(L, rb, rc);
+-}
+-
+-
+-
+ /*
+ ** some macros for common tasks in `luaV_execute'
+ */
+@@ -361,17 +417,154 @@ static void Arith (lua_State *L, StkId r
+ #define Protect(x)	{ L->savedpc = pc; {x;}; base = L->base; }
+ 
+ 
+-#define arith_op(op,tm) { \
+-        TValue *rb = RKB(i); \
+-        TValue *rc = RKC(i); \
+-        if (ttisnumber(rb) && ttisnumber(rc)) { \
+-          lua_Number nb = nvalue(rb), nc = nvalue(rc); \
+-          setnvalue(ra, op(nb, nc)); \
+-        } \
+-        else \
+-          Protect(Arith(L, ra, rb, rc, tm)); \
++/* Note: if called for unary operations, 'rc'=='rb'.
++ */
++static void Arith (lua_State *L, StkId ra, const TValue *rb,
++                   const TValue *rc, TMS op) {
++  TValue tempb, tempc;
++  const TValue *b, *c;
++  lua_Number nb,nc;
++
++  if ((b = luaV_tonumber(rb, &tempb)) != NULL &&
++      (c = luaV_tonumber(rc, &tempc)) != NULL) {
++
++    /* Keep integer arithmetics in the integer realm, if possible.
++     */
++    if (ttisint(b) && ttisint(c)) {
++      lua_Integer ib = ivalue(b), ic = ivalue(c);
++      lua_Integer *ri = &ra->value.i;
++      ra->tt= LUA_TINT;  /* part of 'setivalue(ra)' */
++      switch (op) {
++        case TM_ADD: if (try_addint( ri, ib, ic)) return; break;
++        case TM_SUB: if (try_subint( ri, ib, ic)) return; break;
++        case TM_MUL: if (try_mulint( ri, ib, ic)) return; break;
++        case TM_DIV: if (try_divint( ri, ib, ic)) return; break;
++        case TM_MOD: if (try_modint( ri, ib, ic)) return; break;
++        case TM_POW: if (try_powint( ri, ib, ic)) return; break;
++        case TM_UNM: if (try_unmint( ri, ib)) return; break;
++        default: lua_assert(0);
++      }
++    }
++    /* Fallback to floating point, when leaving range. */
++
++#ifdef LNUM_COMPLEX
++    if ((nvalue_img(b)!=0) || (nvalue_img(c)!=0)) {
++      lua_Complex r;
++      if (op==TM_UNM) {
++        r= -nvalue_complex_fast(b);     /* never an integer (or scalar) */
++        setnvalue_complex_fast( ra, r );
++      } else {
++        lua_Complex bb= nvalue_complex(b), cc= nvalue_complex(c);
++        switch (op) {
++          case TM_ADD: r= bb + cc; break;
++          case TM_SUB: r= bb - cc; break;
++          case TM_MUL: r= bb * cc; break;
++          case TM_DIV: r= bb / cc; break;
++          case TM_MOD: 
++            luaG_runerror(L, "attempt to use %% on complex numbers");  /* no return */
++          case TM_POW: r= luai_vectpow( bb, cc ); break;
++          default: lua_assert(0); r=0;
++        }
++        setnvalue_complex( ra, r );
+       }
++      return;
++    }
++#endif
++    nb = nvalue(b); nc = nvalue(c);
++    switch (op) {
++      case TM_ADD: setnvalue(ra, luai_numadd(nb, nc)); return;
++      case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); return;
++      case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); return;
++      case TM_DIV: setnvalue(ra, luai_numdiv(nb, nc)); return;
++      case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); return;
++      case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); return;
++      case TM_UNM: setnvalue(ra, luai_numunm(nb)); return;
++      default: lua_assert(0);
++    }
++  }
++  
++  /* Either operand not a number */
++  if (!call_binTM(L, rb, rc, ra, op))
++    luaG_aritherror(L, rb, rc);
++}
+ 
++/* Helper macro to sort arithmetic operations into four categories:
++ *  TK_INT: integer - integer operands
++ *  TK_NUMBER: number - number (non complex, either may be integer)
++ *  TK_NUMBER2: complex numbers (at least the other)
++ *  0: non-numeric (at least the other)
++*/
++#ifdef LNUM_COMPLEX
++static inline int arith_mode( const TValue *rb, const TValue *rc ) {
++  if (ttisint(rb) && ttisint(rc)) return TK_INT;
++  if (ttiscomplex(rb) || ttiscomplex(rc)) return TK_NUMBER2;
++  if (ttisnumber(rb) && ttisnumber(rc)) return TK_NUMBER;
++  return 0;
++}
++#else
++# define arith_mode(rb,rc) \
++    ( (ttisint(rb) && ttisint(rc)) ? TK_INT : \
++      (ttisnumber(rb) && ttisnumber(rc)) ? TK_NUMBER : 0 )
++#endif
++
++/* arith_op macro for two operators:
++ * automatically chooses, which function (number, integer, complex) to use
++ */
++#define ARITH_OP2_START( op_num, op_int ) \
++  int failed= 0; \
++  switch( arith_mode(rb,rc) ) { \
++    case TK_INT: \
++      if (op_int ( &(ra)->value.i, ivalue(rb), ivalue(rc) )) \
++        { ra->tt= LUA_TINT; break; } /* else flow through */ \
++    case TK_NUMBER: \
++      setnvalue(ra, op_num ( nvalue(rb), nvalue(rc) )); break;
++
++#define ARITH_OP2_END \
++    default: \
++      failed= 1; break; \
++  } if (!failed) continue;
++
++#define arith_op_continue_scalar( op_num, op_int ) \
++    ARITH_OP2_START( op_num, op_int ) \
++    ARITH_OP2_END
++
++#ifdef LNUM_COMPLEX
++# define arith_op_continue( op_num, op_int, op_complex ) \
++    ARITH_OP2_START( op_num, op_int ) \
++      case TK_NUMBER2: \
++        setnvalue_complex( ra, op_complex ( nvalue_complex(rb), nvalue_complex(rc) ) ); break; \
++    ARITH_OP2_END
++#else
++# define arith_op_continue(op_num,op_int,_) arith_op_continue_scalar(op_num,op_int)
++#endif
++
++/* arith_op macro for one operator:
++ */
++#define ARITH_OP1_START( op_num, op_int ) \
++  int failed= 0; \
++  switch( arith_mode(rb,rb) ) { \
++    case TK_INT: \
++      if (op_int ( &(ra)->value.i, ivalue(rb) )) \
++        { ra->tt= LUA_TINT; break; } /* else flow through */ \
++      case TK_NUMBER: \
++        setnvalue(ra, op_num (nvalue(rb))); break; \
++
++#define ARITH_OP1_END \
++      default: \
++        failed= 1; break; \
++  } if (!failed) continue;
++
++#ifdef LNUM_COMPLEX
++# define arith_op1_continue( op_num, op_int, op_complex ) \
++    ARITH_OP1_START( op_num, op_int ) \
++      case TK_NUMBER2: \
++        setnvalue_complex( ra, op_complex ( nvalue_complex_fast(rb) )); break; \
++    ARITH_OP1_END
++#else
++# define arith_op1_continue( op_num, op_int, _ ) \
++    ARITH_OP1_START( op_num, op_int ) \
++    ARITH_OP1_END
++#endif
+ 
+ 
+ void luaV_execute (lua_State *L, int nexeccalls) {
+@@ -472,38 +665,45 @@ void luaV_execute (lua_State *L, int nex
+         continue;
+       }
+       case OP_ADD: {
+-        arith_op(luai_numadd, TM_ADD);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue( luai_numadd, try_addint, luai_vectadd );
++        Protect(Arith(L, ra, rb, rc, TM_ADD)); \
+         continue;
+       }
+       case OP_SUB: {
+-        arith_op(luai_numsub, TM_SUB);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue( luai_numsub, try_subint, luai_vectsub );
++        Protect(Arith(L, ra, rb, rc, TM_SUB));
+         continue;
+       }
+       case OP_MUL: {
+-        arith_op(luai_nummul, TM_MUL);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue(luai_nummul, try_mulint, luai_vectmul);
++        Protect(Arith(L, ra, rb, rc, TM_MUL));
+         continue;
+       }
+       case OP_DIV: {
+-        arith_op(luai_numdiv, TM_DIV);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue(luai_numdiv, try_divint, luai_vectdiv);
++        Protect(Arith(L, ra, rb, rc, TM_DIV));
+         continue;
+       }
+       case OP_MOD: {
+-        arith_op(luai_nummod, TM_MOD);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue_scalar(luai_nummod, try_modint);  /* scalars only */
++        Protect(Arith(L, ra, rb, rc, TM_MOD));
+         continue;
+       }
+       case OP_POW: {
+-        arith_op(luai_numpow, TM_POW);
++        TValue *rb = RKB(i), *rc= RKC(i);
++        arith_op_continue(luai_numpow, try_powint, luai_vectpow);
++        Protect(Arith(L, ra, rb, rc, TM_POW));
+         continue;
+       }
+       case OP_UNM: {
+         TValue *rb = RB(i);
+-        if (ttisnumber(rb)) {
+-          lua_Number nb = nvalue(rb);
+-          setnvalue(ra, luai_numunm(nb));
+-        }
+-        else {
+-          Protect(Arith(L, ra, rb, rb, TM_UNM));
+-        }
++        arith_op1_continue(luai_numunm, try_unmint, luai_vectunm);
++        Protect(Arith(L, ra, rb, rb, TM_UNM));
+         continue;
+       }
+       case OP_NOT: {
+@@ -515,11 +715,11 @@ void luaV_execute (lua_State *L, int nex
+         const TValue *rb = RB(i);
+         switch (ttype(rb)) {
+           case LUA_TTABLE: {
+-            setnvalue(ra, cast_num(luaH_getn(hvalue(rb))));
++            setivalue(ra, luaH_getn(hvalue(rb)));
+             break;
+           }
+           case LUA_TSTRING: {
+-            setnvalue(ra, cast_num(tsvalue(rb)->len));
++            setivalue(ra, tsvalue(rb)->len);
+             break;
+           }
+           default: {  /* try metamethod */
+@@ -652,14 +852,30 @@ void luaV_execute (lua_State *L, int nex
+         }
+       }
+       case OP_FORLOOP: {
+-        lua_Number step = nvalue(ra+2);
+-        lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
+-        lua_Number limit = nvalue(ra+1);
+-        if (luai_numlt(0, step) ? luai_numle(idx, limit)
+-                                : luai_numle(limit, idx)) {
+-          dojump(L, pc, GETARG_sBx(i));  /* jump back */
+-          setnvalue(ra, idx);  /* update internal index... */
+-          setnvalue(ra+3, idx);  /* ...and external index */
++        /* If start,step and limit are all integers, we don't need to check
++         * against overflow in the looping.
++         */
++        if (ttisint(ra) && ttisint(ra+1) && ttisint(ra+2)) {
++          lua_Integer step = ivalue(ra+2);
++          lua_Integer idx = ivalue(ra) + step; /* increment index */
++          lua_Integer limit = ivalue(ra+1);
++          if (step > 0 ? (idx <= limit) : (limit <= idx)) {
++            dojump(L, pc, GETARG_sBx(i));  /* jump back */
++            setivalue(ra, idx);  /* update internal index... */
++            setivalue(ra+3, idx);  /* ...and external index */
++          }
++        } else {
++          /* non-integer looping (don't use 'nvalue_fast', some may be integer!) 
++          */
++          lua_Number step = nvalue(ra+2);
++          lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
++          lua_Number limit = nvalue(ra+1);
++          if (luai_numlt(0, step) ? luai_numle(idx, limit)
++                                  : luai_numle(limit, idx)) {
++            dojump(L, pc, GETARG_sBx(i));  /* jump back */
++            setnvalue(ra, idx);  /* update internal index... */
++            setnvalue(ra+3, idx);  /* ...and external index */
++          }
+         }
+         continue;
+       }
+@@ -668,13 +884,21 @@ void luaV_execute (lua_State *L, int nex
+         const TValue *plimit = ra+1;
+         const TValue *pstep = ra+2;
+         L->savedpc = pc;  /* next steps may throw errors */
++        /* Using same location for tonumber's both arguments, effectively does
++         * in-place modification (string->number). */
+         if (!tonumber(init, ra))
+           luaG_runerror(L, LUA_QL("for") " initial value must be a number");
+         else if (!tonumber(plimit, ra+1))
+           luaG_runerror(L, LUA_QL("for") " limit must be a number");
+         else if (!tonumber(pstep, ra+2))
+           luaG_runerror(L, LUA_QL("for") " step must be a number");
+-        setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep)));
++        /* Step back one value (keep within integers if we can)
++         */
++        if (!( ttisint(ra) && ttisint(pstep) &&
++               try_subint( &ra->value.i, ivalue(ra), ivalue(pstep) ) )) {
++            /* don't use 'nvalue_fast()', values may be integer */
++            setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep)));
++        }
+         dojump(L, pc, GETARG_sBx(i));
+         continue;
+       }
+@@ -711,7 +935,7 @@ void luaV_execute (lua_State *L, int nex
+           luaH_resizearray(L, h, last);  /* pre-alloc it at once */
+         for (; n > 0; n--) {
+           TValue *val = ra+n;
+-          setobj2t(L, luaH_setnum(L, h, last--), val);
++          setobj2t(L, luaH_setint(L, h, last--), val);
+           luaC_barriert(L, h, val);
+         }
+         continue;
+--- a/src/lvm.h
++++ b/src/lvm.h
+@@ -15,11 +15,9 @@
+ 
+ #define tostring(L,o) ((ttype(o) == LUA_TSTRING) || (luaV_tostring(L, o)))
+ 
+-#define tonumber(o,n)	(ttype(o) == LUA_TNUMBER || \
+-                         (((o) = luaV_tonumber(o,n)) != NULL))
++#define tonumber(o,n) (ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL))
+ 
+-#define equalobj(L,o1,o2) \
+-	(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
++#define equalobj(L,o1,o2) (ttype_ext_same(o1,o2) && luaV_equalval(L, o1, o2))
+ 
+ 
+ LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
+--- a/src/print.c
++++ b/src/print.c
+@@ -14,6 +14,7 @@
+ #include "lobject.h"
+ #include "lopcodes.h"
+ #include "lundump.h"
++#include "lnum.h"
+ 
+ #define PrintFunction	luaU_print
+ 
+@@ -59,8 +60,16 @@ static void PrintConstant(const Proto* f
+   case LUA_TBOOLEAN:
+ 	printf(bvalue(o) ? "true" : "false");
+ 	break;
++  case LUA_TINT:
++	printf(LUA_INTEGER_FMT,ivalue(o));
++	break;
+   case LUA_TNUMBER:
+-	printf(LUA_NUMBER_FMT,nvalue(o));
++#ifdef LNUM_COMPLEX
++    // TBD: Do we get complex values here?
++    { lua_Number b= nvalue_img_fast(o);
++	  printf( LUA_NUMBER_FMT "%s" LUA_NUMBER_FMT "i", nvalue_fast(o), b>=0 ? "+":"", b ); }
++#endif
++	printf(LUA_NUMBER_FMT,nvalue_fast(o));
+ 	break;
+   case LUA_TSTRING:
+ 	PrintString(rawtsvalue(o));
diff --git a/trunk/package/utils/lua/patches/011-lnum-use-double.patch b/trunk/package/utils/lua/patches/011-lnum-use-double.patch
new file mode 100644
index 00000000..14c720bf
--- /dev/null
+++ b/trunk/package/utils/lua/patches/011-lnum-use-double.patch
@@ -0,0 +1,11 @@
+--- a/src/lnum_config.h
++++ b/src/lnum_config.h
+@@ -11,7 +11,7 @@
+ ** Default number modes
+ */
+ #if (!defined LNUM_DOUBLE) && (!defined LNUM_FLOAT) && (!defined LNUM_LDOUBLE)
+-# define LNUM_FLOAT
++# define LNUM_DOUBLE
+ #endif
+ #if (!defined LNUM_INT16) && (!defined LNUM_INT32) && (!defined LNUM_INT64)
+ # define LNUM_INT32
diff --git a/trunk/package/utils/lua/patches/015-lnum-ppc-compat.patch b/trunk/package/utils/lua/patches/015-lnum-ppc-compat.patch
new file mode 100644
index 00000000..2ea59f17
--- /dev/null
+++ b/trunk/package/utils/lua/patches/015-lnum-ppc-compat.patch
@@ -0,0 +1,11 @@
+--- a/src/lua.h
++++ b/src/lua.h
+@@ -79,7 +79,7 @@ typedef void * (*lua_Alloc) (void *ud, v
+  *     not acceptable for 5.1, maybe 5.2 onwards?
+  *  9: greater than existing (5.1) type values.
+ */
+-#define LUA_TINT (-2)
++#define LUA_TINT 9
+ 
+ #define LUA_TNIL		0
+ #define LUA_TBOOLEAN		1
diff --git a/trunk/package/utils/lua/patches/020-shared_liblua.patch b/trunk/package/utils/lua/patches/020-shared_liblua.patch
new file mode 100644
index 00000000..bcd410f6
--- /dev/null
+++ b/trunk/package/utils/lua/patches/020-shared_liblua.patch
@@ -0,0 +1,140 @@
+--- a/Makefile
++++ b/Makefile
+@@ -42,8 +42,8 @@ PLATS= aix ansi bsd freebsd generic linu
+ 
+ # What to install.
+ TO_BIN= lua luac
+-TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+-TO_LIB= liblua.a
++TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp lnum_config.h
++TO_LIB= liblua.a liblua.so.$R
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -63,6 +63,7 @@ install: dummy
+ 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
++	ln -s liblua.so.$R $(INSTALL_LIB)/liblua.so
+ 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+ 
+ ranlib:
+--- a/src/ldo.h
++++ b/src/ldo.h
+@@ -46,7 +46,7 @@ LUAI_FUNC int luaD_pcall (lua_State *L, 
+ LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
+ LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
+ LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
+-LUAI_FUNC void luaD_growstack (lua_State *L, int n);
++LUA_API void luaD_growstack (lua_State *L, int n);
+ 
+ LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
+ LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
+--- a/src/lfunc.h
++++ b/src/lfunc.h
+@@ -18,7 +18,7 @@
+                          cast(int, sizeof(TValue *)*((n)-1)))
+ 
+ 
+-LUAI_FUNC Proto *luaF_newproto (lua_State *L);
++LUA_API Proto *luaF_newproto (lua_State *L);
+ LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
+ LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
+ LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
+--- a/src/lmem.h
++++ b/src/lmem.h
+@@ -38,9 +38,9 @@
+    ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
+ 
+ 
+-LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
++LUA_API void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
+                                                           size_t size);
+-LUAI_FUNC void *luaM_toobig (lua_State *L);
++LUA_API void *luaM_toobig (lua_State *L);
+ LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
+                                size_t size_elem, int limit,
+                                const char *errormsg);
+--- a/src/lstring.h
++++ b/src/lstring.h
+@@ -25,7 +25,7 @@
+ 
+ LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
+ LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
+-LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
++LUA_API TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+ 
+ 
+ #endif
+--- a/src/lundump.h
++++ b/src/lundump.h
+@@ -17,7 +17,7 @@ LUAI_FUNC Proto* luaU_undump (lua_State*
+ LUAI_FUNC void luaU_header (char* h);
+ 
+ /* dump one chunk; from ldump.c */
+-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
++LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
+ 
+ #ifdef luac_c
+ /* print one chunk; from print.c */
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -23,6 +23,7 @@ MYLIBS=
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o lnum.o
+@@ -33,11 +34,12 @@ LUA_T=	lua
+ LUA_O=	lua.o
+ 
+ LUAC_T=	luac
+-LUAC_O=	luac.o print.o
++LUAC_O=	luac.o print.o lopcodes.o
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
++ALL_SO= $(LUA_SO)
+ 
+ default: $(PLAT)
+ 
+@@ -47,14 +49,23 @@ o:	$(ALL_O)
+ 
+ a:	$(ALL_A)
+ 
++so:	$(ALL_SO)
++
+ $(LUA_A): $(CORE_O) $(LIB_O)
+ 	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
++	ln -fs $@.$(PKG_VERSION) $@
++
++$(LUA_T): $(LUA_O) $(LUA_SO)
++	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS)
++
++$(LUAC_T): $(LUAC_O) $(LUA_SO)
++	$(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++$(LUAC_T)-host: $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+ clean:
+@@ -96,7 +107,7 @@ generic:
+ 	$(MAKE) all MYCFLAGS=
+ 
+ linux:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
++	$(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
+ 
+ macosx:
+ 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
diff --git a/trunk/package/utils/lua/patches/030-archindependent-bytecode.patch b/trunk/package/utils/lua/patches/030-archindependent-bytecode.patch
new file mode 100644
index 00000000..8dfef85d
--- /dev/null
+++ b/trunk/package/utils/lua/patches/030-archindependent-bytecode.patch
@@ -0,0 +1,111 @@
+--- a/src/ldump.c
++++ b/src/ldump.c
+@@ -67,12 +67,12 @@ static void DumpString(const TString* s,
+ {
+  if (s==NULL || getstr(s)==NULL)
+  {
+-  size_t size=0;
++  unsigned int size=0;
+   DumpVar(size,D);
+  }
+  else
+  {
+-  size_t size=s->tsv.len+1;		/* include trailing '\0' */
++  unsigned int size=s->tsv.len+1;		/* include trailing '\0' */
+   DumpVar(size,D);
+   DumpBlock(getstr(s),size,D);
+  }
+--- a/src/lundump.c
++++ b/src/lundump.c
+@@ -25,6 +25,7 @@ typedef struct {
+  ZIO* Z;
+  Mbuffer* b;
+  const char* name;
++ int swap;
+ } LoadState;
+ 
+ #ifdef LUAC_TRUST_BINARIES
+@@ -40,7 +41,6 @@ static void error(LoadState* S, const ch
+ }
+ #endif
+ 
+-#define LoadMem(S,b,n,size)	LoadBlock(S,b,(n)*(size))
+ #define	LoadByte(S)		(lu_byte)LoadChar(S)
+ #define LoadVar(S,x)		LoadMem(S,&x,1,sizeof(x))
+ #define LoadVector(S,b,n,size)	LoadMem(S,b,n,size)
+@@ -51,6 +51,49 @@ static void LoadBlock(LoadState* S, void
+  IF (r!=0, "unexpected end");
+ }
+ 
++static void LoadMem (LoadState* S, void* b, int n, size_t size)
++{
++ LoadBlock(S,b,n*size);
++ if (S->swap)
++ {
++  char* p=(char*) b;
++  char c;
++  switch (size)
++  {
++   case 1:
++  	break;
++   case 2:
++	while (n--)
++	{
++	 c=p[0]; p[0]=p[1]; p[1]=c;
++	 p+=2;
++	}
++  	break;
++   case 4:
++	while (n--)
++	{
++	 c=p[0]; p[0]=p[3]; p[3]=c;
++	 c=p[1]; p[1]=p[2]; p[2]=c;
++	 p+=4;
++	}
++  	break;
++   case 8:
++	while (n--)
++	{
++	 c=p[0]; p[0]=p[7]; p[7]=c;
++	 c=p[1]; p[1]=p[6]; p[6]=c;
++	 c=p[2]; p[2]=p[5]; p[5]=c;
++	 c=p[3]; p[3]=p[4]; p[4]=c;
++	 p+=8;
++	}
++  	break;
++   default:
++   	IF(1, "bad size");
++  	break;
++  }
++ }
++}
++
+ static int LoadChar(LoadState* S)
+ {
+  char x;
+@@ -82,7 +125,7 @@ static lua_Integer LoadInteger(LoadState
+ 
+ static TString* LoadString(LoadState* S)
+ {
+- size_t size;
++ unsigned int size;
+  LoadVar(S,size);
+  if (size==0)
+   return NULL;
+@@ -196,6 +239,7 @@ static void LoadHeader(LoadState* S)
+  char s[LUAC_HEADERSIZE];
+  luaU_header(h);
+  LoadBlock(S,s,LUAC_HEADERSIZE);
++ S->swap=(s[6]!=h[6]); s[6]=h[6];
+  IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
+ }
+ 
+@@ -230,7 +274,7 @@ void luaU_header (char* h)
+  *h++=(char)LUAC_FORMAT;
+  *h++=(char)*(char*)&x;				/* endianness */
+  *h++=(char)sizeof(int);
+- *h++=(char)sizeof(size_t);
++ *h++=(char)sizeof(unsigned int);
+  *h++=(char)sizeof(Instruction);
+  *h++=(char)sizeof(lua_Number);
+ 
diff --git a/trunk/package/utils/lua/patches/100-no_readline.patch b/trunk/package/utils/lua/patches/100-no_readline.patch
new file mode 100644
index 00000000..0350e470
--- /dev/null
+++ b/trunk/package/utils/lua/patches/100-no_readline.patch
@@ -0,0 +1,49 @@
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -38,7 +38,6 @@
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+-#define LUA_USE_READLINE	/* needs some extra libraries */
+ #endif
+ 
+ #if defined(LUA_USE_MACOSX)
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,6 +17,7 @@ LIBS= -lm $(MYLIBS)
+ MYCFLAGS=
+ MYLDFLAGS=
+ MYLIBS=
++# USE_READLINE=1
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+@@ -86,7 +87,7 @@ echo:
+ 	@echo "MYLIBS = $(MYLIBS)"
+ 
+ # convenience targets for popular platforms
+-
++RFLAG=$(if $(USE_READLINE),-DLUA_USE_READLINE)
+ none:
+ 	@echo "Please choose a platform:"
+ 	@echo "   $(PLATS)"
+@@ -101,16 +102,16 @@ bsd:
+ 	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
+ 
+ freebsd:
+-	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
++	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX $(RFLAG)" MYLIBS="-Wl,-E$(if $(USE_READLINE), -lreadline)"
+ 
+ generic:
+ 	$(MAKE) all MYCFLAGS=
+ 
+ linux:
+-	$(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
++	$(MAKE) all MYCFLAGS+="-DLUA_USE_LINUX $(RFLAG)" MYLIBS="-Wl,-E -ldl $(if $(USE_READLINE), -lreadline -lhistory -lncurses)"
+ 
+ macosx:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
++	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX $(if $(USE_READLINE), MYLIBS="-lreadline")
+ # use this on Mac OS X 10.3-
+ #	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+ 
diff --git a/trunk/package/utils/lua/patches/200-lua-path.patch b/trunk/package/utils/lua/patches/200-lua-path.patch
new file mode 100644
index 00000000..05445774
--- /dev/null
+++ b/trunk/package/utils/lua/patches/200-lua-path.patch
@@ -0,0 +1,15 @@
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -95,9 +95,9 @@
+ 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
+-#define LUA_ROOT	"/usr/local/"
+-#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+-#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
++#define LUA_ROOT	"/usr/"
++#define LUA_LDIR	LUA_ROOT "share/lua/"
++#define LUA_CDIR	LUA_ROOT "lib/lua/"
+ #define LUA_PATH_DEFAULT  \
+ 		"./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+ 		            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
diff --git a/trunk/package/utils/lua/patches/300-opcode_performance.patch b/trunk/package/utils/lua/patches/300-opcode_performance.patch
new file mode 100644
index 00000000..5fbb8738
--- /dev/null
+++ b/trunk/package/utils/lua/patches/300-opcode_performance.patch
@@ -0,0 +1,363 @@
+--- a/src/lvm.c
++++ b/src/lvm.c
+@@ -31,6 +31,9 @@
+ /* limit for table tag-method chains (to avoid loops) */
+ #define MAXTAGLOOP	100
+ 
++#ifdef __GNUC__
++#define COMPUTED_GOTO 1
++#endif
+ 
+ /*
+  * If 'obj' is a string, it is tried to be interpreted as a number.
+@@ -566,12 +569,63 @@ static inline int arith_mode( const TVal
+     ARITH_OP1_END
+ #endif
+ 
++#ifdef COMPUTED_GOTO
++#define OPCODE_TARGET(op) DO_OP_##op:
++#define CALL_OPCODE(op) goto *opcodes[op];
++#define OPCODE_PTR(op) [OP_##op] = &&DO_OP_##op
++#else
++#define OPCODE_TARGET(op) case OP_##op:
++#define CALL_OPCODE(op) switch (op)
++#endif
++
+ 
+ void luaV_execute (lua_State *L, int nexeccalls) {
+   LClosure *cl;
+   StkId base;
+   TValue *k;
+   const Instruction *pc;
++#ifdef COMPUTED_GOTO
++  static const void *opcodes[] = {
++   OPCODE_PTR(MOVE),
++   OPCODE_PTR(LOADK),
++   OPCODE_PTR(LOADBOOL),
++   OPCODE_PTR(LOADNIL),
++   OPCODE_PTR(GETUPVAL),
++   OPCODE_PTR(GETGLOBAL),
++   OPCODE_PTR(GETTABLE),
++   OPCODE_PTR(SETGLOBAL),
++   OPCODE_PTR(SETUPVAL),
++   OPCODE_PTR(SETTABLE),
++   OPCODE_PTR(NEWTABLE),
++   OPCODE_PTR(SELF),
++   OPCODE_PTR(ADD),
++   OPCODE_PTR(SUB),
++   OPCODE_PTR(MUL),
++   OPCODE_PTR(DIV),
++   OPCODE_PTR(MOD),
++   OPCODE_PTR(POW),
++   OPCODE_PTR(UNM),
++   OPCODE_PTR(NOT),
++   OPCODE_PTR(LEN),
++   OPCODE_PTR(CONCAT),
++   OPCODE_PTR(JMP),
++   OPCODE_PTR(EQ),
++   OPCODE_PTR(LT),
++   OPCODE_PTR(LE),
++   OPCODE_PTR(TEST),
++   OPCODE_PTR(TESTSET),
++   OPCODE_PTR(CALL),
++   OPCODE_PTR(TAILCALL),
++   OPCODE_PTR(RETURN),
++   OPCODE_PTR(FORLOOP),
++   OPCODE_PTR(FORPREP),
++   OPCODE_PTR(TFORLOOP),
++   OPCODE_PTR(SETLIST),
++   OPCODE_PTR(CLOSE),
++   OPCODE_PTR(CLOSURE),
++   OPCODE_PTR(VARARG)
++  };
++#endif
+  reentry:  /* entry point */
+   lua_assert(isLua(L->ci));
+   pc = L->savedpc;
+@@ -596,33 +650,33 @@ void luaV_execute (lua_State *L, int nex
+     lua_assert(base == L->base && L->base == L->ci->base);
+     lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
+     lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
+-    switch (GET_OPCODE(i)) {
+-      case OP_MOVE: {
++    CALL_OPCODE(GET_OPCODE(i)) {
++      OPCODE_TARGET(MOVE) {
+         setobjs2s(L, ra, RB(i));
+         continue;
+       }
+-      case OP_LOADK: {
++      OPCODE_TARGET(LOADK) {
+         setobj2s(L, ra, KBx(i));
+         continue;
+       }
+-      case OP_LOADBOOL: {
++      OPCODE_TARGET(LOADBOOL) {
+         setbvalue(ra, GETARG_B(i));
+         if (GETARG_C(i)) pc++;  /* skip next instruction (if C) */
+         continue;
+       }
+-      case OP_LOADNIL: {
++      OPCODE_TARGET(LOADNIL) {
+         TValue *rb = RB(i);
+         do {
+           setnilvalue(rb--);
+         } while (rb >= ra);
+         continue;
+       }
+-      case OP_GETUPVAL: {
++      OPCODE_TARGET(GETUPVAL) {
+         int b = GETARG_B(i);
+         setobj2s(L, ra, cl->upvals[b]->v);
+         continue;
+       }
+-      case OP_GETGLOBAL: {
++      OPCODE_TARGET(GETGLOBAL) {
+         TValue g;
+         TValue *rb = KBx(i);
+         sethvalue(L, &g, cl->env);
+@@ -630,88 +684,88 @@ void luaV_execute (lua_State *L, int nex
+         Protect(luaV_gettable(L, &g, rb, ra));
+         continue;
+       }
+-      case OP_GETTABLE: {
++      OPCODE_TARGET(GETTABLE) {
+         Protect(luaV_gettable(L, RB(i), RKC(i), ra));
+         continue;
+       }
+-      case OP_SETGLOBAL: {
++      OPCODE_TARGET(SETGLOBAL) {
+         TValue g;
+         sethvalue(L, &g, cl->env);
+         lua_assert(ttisstring(KBx(i)));
+         Protect(luaV_settable(L, &g, KBx(i), ra));
+         continue;
+       }
+-      case OP_SETUPVAL: {
++      OPCODE_TARGET(SETUPVAL) {
+         UpVal *uv = cl->upvals[GETARG_B(i)];
+         setobj(L, uv->v, ra);
+         luaC_barrier(L, uv, ra);
+         continue;
+       }
+-      case OP_SETTABLE: {
++      OPCODE_TARGET(SETTABLE) {
+         Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
+         continue;
+       }
+-      case OP_NEWTABLE: {
++      OPCODE_TARGET(NEWTABLE) {
+         int b = GETARG_B(i);
+         int c = GETARG_C(i);
+         sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
+         Protect(luaC_checkGC(L));
+         continue;
+       }
+-      case OP_SELF: {
++      OPCODE_TARGET(SELF) {
+         StkId rb = RB(i);
+         setobjs2s(L, ra+1, rb);
+         Protect(luaV_gettable(L, rb, RKC(i), ra));
+         continue;
+       }
+-      case OP_ADD: {
++      OPCODE_TARGET(ADD) {
+         TValue *rb = RKB(i), *rc= RKC(i);
+         arith_op_continue( luai_numadd, try_addint, luai_vectadd );
+         Protect(Arith(L, ra, rb, rc, TM_ADD)); \
+         continue;
+       }
+-      case OP_SUB: {
++      OPCODE_TARGET(SUB) {
+         TValue *rb = RKB(i), *rc= RKC(i);
+         arith_op_continue( luai_numsub, try_subint, luai_vectsub );
+         Protect(Arith(L, ra, rb, rc, TM_SUB));
+         continue;
+       }
+-      case OP_MUL: {
++      OPCODE_TARGET(MUL) {
+         TValue *rb = RKB(i), *rc= RKC(i);
+         arith_op_continue(luai_nummul, try_mulint, luai_vectmul);
+         Protect(Arith(L, ra, rb, rc, TM_MUL));
+         continue;
+       }
+-      case OP_DIV: {
++      OPCODE_TARGET(DIV) {
+         TValue *rb = RKB(i), *rc= RKC(i);
+         arith_op_continue(luai_numdiv, try_divint, luai_vectdiv);
+         Protect(Arith(L, ra, rb, rc, TM_DIV));
+         continue;
+       }
+-      case OP_MOD: {
++      OPCODE_TARGET(MOD) {
+         TValue *rb = RKB(i), *rc= RKC(i);
+         arith_op_continue_scalar(luai_nummod, try_modint);  /* scalars only */
+         Protect(Arith(L, ra, rb, rc, TM_MOD));
+         continue;
+       }
+-      case OP_POW: {
++      OPCODE_TARGET(POW) {
+         TValue *rb = RKB(i), *rc= RKC(i);
+         arith_op_continue(luai_numpow, try_powint, luai_vectpow);
+         Protect(Arith(L, ra, rb, rc, TM_POW));
+         continue;
+       }
+-      case OP_UNM: {
++      OPCODE_TARGET(UNM) {
+         TValue *rb = RB(i);
+         arith_op1_continue(luai_numunm, try_unmint, luai_vectunm);
+         Protect(Arith(L, ra, rb, rb, TM_UNM));
+         continue;
+       }
+-      case OP_NOT: {
++      OPCODE_TARGET(NOT) {
+         int res = l_isfalse(RB(i));  /* next assignment may change this value */
+         setbvalue(ra, res);
+         continue;
+       }
+-      case OP_LEN: {
++      OPCODE_TARGET(LEN) {
+         const TValue *rb = RB(i);
+         switch (ttype(rb)) {
+           case LUA_TTABLE: {
+@@ -731,18 +785,18 @@ void luaV_execute (lua_State *L, int nex
+         }
+         continue;
+       }
+-      case OP_CONCAT: {
++      OPCODE_TARGET(CONCAT) {
+         int b = GETARG_B(i);
+         int c = GETARG_C(i);
+         Protect(luaV_concat(L, c-b+1, c); luaC_checkGC(L));
+         setobjs2s(L, RA(i), base+b);
+         continue;
+       }
+-      case OP_JMP: {
++      OPCODE_TARGET(JMP) {
+         dojump(L, pc, GETARG_sBx(i));
+         continue;
+       }
+-      case OP_EQ: {
++      OPCODE_TARGET(EQ) {
+         TValue *rb = RKB(i);
+         TValue *rc = RKC(i);
+         Protect(
+@@ -752,7 +806,7 @@ void luaV_execute (lua_State *L, int nex
+         pc++;
+         continue;
+       }
+-      case OP_LT: {
++      OPCODE_TARGET(LT) {
+         Protect(
+           if (luaV_lessthan(L, RKB(i), RKC(i)) == GETARG_A(i))
+             dojump(L, pc, GETARG_sBx(*pc));
+@@ -760,7 +814,7 @@ void luaV_execute (lua_State *L, int nex
+         pc++;
+         continue;
+       }
+-      case OP_LE: {
++      OPCODE_TARGET(LE) {
+         Protect(
+           if (lessequal(L, RKB(i), RKC(i)) == GETARG_A(i))
+             dojump(L, pc, GETARG_sBx(*pc));
+@@ -768,13 +822,13 @@ void luaV_execute (lua_State *L, int nex
+         pc++;
+         continue;
+       }
+-      case OP_TEST: {
++      OPCODE_TARGET(TEST) {
+         if (l_isfalse(ra) != GETARG_C(i))
+           dojump(L, pc, GETARG_sBx(*pc));
+         pc++;
+         continue;
+       }
+-      case OP_TESTSET: {
++      OPCODE_TARGET(TESTSET) {
+         TValue *rb = RB(i);
+         if (l_isfalse(rb) != GETARG_C(i)) {
+           setobjs2s(L, ra, rb);
+@@ -783,7 +837,7 @@ void luaV_execute (lua_State *L, int nex
+         pc++;
+         continue;
+       }
+-      case OP_CALL: {
++      OPCODE_TARGET(CALL) {
+         int b = GETARG_B(i);
+         int nresults = GETARG_C(i) - 1;
+         if (b != 0) L->top = ra+b;  /* else previous instruction set top */
+@@ -804,7 +858,7 @@ void luaV_execute (lua_State *L, int nex
+           }
+         }
+       }
+-      case OP_TAILCALL: {
++      OPCODE_TARGET(TAILCALL) {
+         int b = GETARG_B(i);
+         if (b != 0) L->top = ra+b;  /* else previous instruction set top */
+         L->savedpc = pc;
+@@ -836,7 +890,7 @@ void luaV_execute (lua_State *L, int nex
+           }
+         }
+       }
+-      case OP_RETURN: {
++      OPCODE_TARGET(RETURN) {
+         int b = GETARG_B(i);
+         if (b != 0) L->top = ra+b-1;
+         if (L->openupval) luaF_close(L, base);
+@@ -851,7 +905,7 @@ void luaV_execute (lua_State *L, int nex
+           goto reentry;
+         }
+       }
+-      case OP_FORLOOP: {
++      OPCODE_TARGET(FORLOOP) {
+         /* If start,step and limit are all integers, we don't need to check
+          * against overflow in the looping.
+          */
+@@ -879,7 +933,7 @@ void luaV_execute (lua_State *L, int nex
+         }
+         continue;
+       }
+-      case OP_FORPREP: {
++      OPCODE_TARGET(FORPREP) {
+         const TValue *init = ra;
+         const TValue *plimit = ra+1;
+         const TValue *pstep = ra+2;
+@@ -902,7 +956,7 @@ void luaV_execute (lua_State *L, int nex
+         dojump(L, pc, GETARG_sBx(i));
+         continue;
+       }
+-      case OP_TFORLOOP: {
++      OPCODE_TARGET(TFORLOOP) {
+         StkId cb = ra + 3;  /* call base */
+         setobjs2s(L, cb+2, ra+2);
+         setobjs2s(L, cb+1, ra+1);
+@@ -918,7 +972,7 @@ void luaV_execute (lua_State *L, int nex
+         pc++;
+         continue;
+       }
+-      case OP_SETLIST: {
++      OPCODE_TARGET(SETLIST) {
+         int n = GETARG_B(i);
+         int c = GETARG_C(i);
+         int last;
+@@ -940,11 +994,11 @@ void luaV_execute (lua_State *L, int nex
+         }
+         continue;
+       }
+-      case OP_CLOSE: {
++      OPCODE_TARGET(CLOSE) {
+         luaF_close(L, ra);
+         continue;
+       }
+-      case OP_CLOSURE: {
++      OPCODE_TARGET(CLOSURE) {
+         Proto *p;
+         Closure *ncl;
+         int nup, j;
+@@ -964,7 +1018,7 @@ void luaV_execute (lua_State *L, int nex
+         Protect(luaC_checkGC(L));
+         continue;
+       }
+-      case OP_VARARG: {
++      OPCODE_TARGET(VARARG) {
+         int b = GETARG_B(i) - 1;
+         int j;
+         CallInfo *ci = L->ci;
diff --git a/trunk/package/utils/mdadm/Makefile b/trunk/package/utils/mdadm/Makefile
new file mode 100644
index 00000000..69eec5b3
--- /dev/null
+++ b/trunk/package/utils/mdadm/Makefile
@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mdadm
+PKG_VERSION:=3.2.5
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_MD5SUM:=2fd33dedcdb06f0d1461f50ddabb7e4a
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mdadm
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=A tool for managing Soft RAID under Linux
+  URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm/
+  DEPENDS:=+@KERNEL_DIRECT_IO
+endef
+
+define Package/mdadm/description
+ A tool for managing Linux Software RAID arrays.
+endef
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -DHAVE_STDINT_H" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		mdadm
+endef
+
+define Package/mdadm/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdadm $(1)/sbin
+endef
+
+$(eval $(call BuildPackage,mdadm))
diff --git a/trunk/package/utils/mdadm/patches/000-compile.patch b/trunk/package/utils/mdadm/patches/000-compile.patch
new file mode 100644
index 00000000..6d474891
--- /dev/null
+++ b/trunk/package/utils/mdadm/patches/000-compile.patch
@@ -0,0 +1,11 @@
+--- a/sha1.h
++++ b/sha1.h
+@@ -26,8 +26,6 @@
+ # include <limits.h>
+ #endif
+ 
+-#include "ansidecl.h"
+-
+ /* The following contortions are an attempt to use the C preprocessor
+    to determine an unsigned integral type that is 32 bits wide.  An
+    alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
diff --git a/trunk/package/utils/mdadm/patches/100-cross_compile.patch b/trunk/package/utils/mdadm/patches/100-cross_compile.patch
new file mode 100644
index 00000000..8709e578
--- /dev/null
+++ b/trunk/package/utils/mdadm/patches/100-cross_compile.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -76,7 +76,6 @@ FAILED_SLOTS_DIR = /run/mdadm/failed-slo
+ DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
+ DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
+ DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\"
+-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
+ 
+ # The glibc TLS ABI requires applications that call clone(2) to set up
+ # TLS data structures, use pthreads until mdmon implements this support
+@@ -183,7 +182,7 @@ raid6check : raid6check.o mdadm.h $(CHEC
+ 
+ mdassemble : $(ASSEMBLE_SRCS) $(INCL)
+ 	rm -f $(OBJS)
+-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
++	$(CC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
+ 
+ mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)
+ 	rm -f $(OBJS)
diff --git a/trunk/package/utils/mdadm/patches/200-reduce_size.patch b/trunk/package/utils/mdadm/patches/200-reduce_size.patch
new file mode 100644
index 00000000..3d8c2f42
--- /dev/null
+++ b/trunk/package/utils/mdadm/patches/200-reduce_size.patch
@@ -0,0 +1,25 @@
+--- a/Incremental.c
++++ b/Incremental.c
+@@ -1508,6 +1508,10 @@ static int Incremental_container(struct 
+ 	if (ra_all == ra_blocked)
+ 		return 0;
+ 
++#ifndef MDADM_FULL
++	return 0;
++#endif
++
+ 	/* Now move all suitable spares from spare container */
+ 	domains = domain_from_array(list, st->ss->name);
+ 	memcpy(suuid, uuid_zero, sizeof(int[4]));
+--- a/util.c
++++ b/util.c
+@@ -928,7 +928,9 @@ void wait_for(char *dev, int fd)
+ struct superswitch *superlist[] =
+ {
+ 	&super0, &super1,
++#ifdef MDADM_FULL
+ 	&super_ddf, &super_imsm,
++#endif
+ 	&mbr, &gpt,
+ 	NULL };
+ 
diff --git a/trunk/package/utils/mkelfimage/Makefile b/trunk/package/utils/mkelfimage/Makefile
new file mode 100644
index 00000000..2433c720
--- /dev/null
+++ b/trunk/package/utils/mkelfimage/Makefile
@@ -0,0 +1,35 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mkelfimage
+PKG_VERSION:=2.7
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/m/mkelfimage/
+PKG_MD5SUM:=e505cb87e9c0cdc44cf03d2c4ea8c74b
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mkelfimage
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=mkelfimage
+  HIDDEN:=1
+  DEPENDS:=@i386
+  DEFAULT:=y if TARGET_x86
+endef
+
+CONFIGURE_VARS += AS="$(TARGET_CROSS)as"
+MAKE_FLAGS += HOST_CC="$(HOSTCC)" DEFS="-I$(STAGING_DIR_HOST)/include"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/objdir/sbin/mkelfImage $(STAGING_DIR_HOST)/bin
+endef
+
+$(eval $(call BuildPackage,mkelfimage))
diff --git a/trunk/package/utils/mkelfimage/patches/no-stack-protector.patch b/trunk/package/utils/mkelfimage/patches/no-stack-protector.patch
new file mode 100644
index 00000000..108583ae
--- /dev/null
+++ b/trunk/package/utils/mkelfimage/patches/no-stack-protector.patch
@@ -0,0 +1,11 @@
+--- mkelfimage-2.7.old//Makefile	2006-03-28 02:44:59.000000000 +0300
++++ mkelfimage-2.7/Makefile	2011-01-17 14:15:13.000000000 +0200
+@@ -14,7 +14,7 @@
+ pkglibdir = $(libdir)/$(PACKAGE)
+ pkgincludedir = $(includedir)/$(PACKAGE)
+ 
+-CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include
++CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include -fno-stack-protector
+ HOST_CPPFLAGS=$(CPPFLAGS)
+ I386_CPPFLAGS=$(CPPFLAGS) -I arch/i386/include
+ IA64_CPPFLAGS=$(CPPFLAGS) -I arch/ia64/include
diff --git a/trunk/package/utils/nano/Makefile b/trunk/package/utils/nano/Makefile
new file mode 100644
index 00000000..49f0b9bb
--- /dev/null
+++ b/trunk/package/utils/nano/Makefile
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nano
+PKG_VERSION:=2.3.6
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.nano-editor.org/dist/v2.3
+PKG_MD5SUM:=df3d201aecb3155a80633990cc467831
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/nano
+  SUBMENU:=Editors
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=An enhanced clone of the Pico text editor
+  URL:=http://www.nano-editor.org/
+  MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
+  DEPENDS:=+libncurses
+endef
+
+define Package/nano/description
+  GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone
+  of the Pico text editor.
+endef
+
+CONFIGURE_ARGS += \
+	--enable-tiny \
+	--disable-glibtest \
+	--disable-utf8 \
+        --without-slang \
+        --disable-color \
+
+CONFIGURE_VARS += \
+	ac_cv_header_regex_h=no \
+
+define Package/nano/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,nano))
+
diff --git a/trunk/package/utils/nvram/Makefile b/trunk/package/utils/nvram/Makefile
new file mode 100644
index 00000000..fe70e346
--- /dev/null
+++ b/trunk/package/utils/nvram/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nvram
+PKG_RELEASE:=9
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/nvram
+  SECTION:=utils
+  CATEGORY:=Base system
+  TITLE:=Userspace port of the Broadcom NVRAM manipulation tool
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  DEPENDS:=@TARGET_brcm47xx||@TARGET_bcm53xx||@TARGET_ar71xx
+endef
+
+define Package/nvram/description
+ This package contains an utility to manipulate NVRAM on Broadcom based devices.
+ It works on bcm47xx (Linux 2.6) without using the kernel api.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libnvram.so.0.1 $(1)/usr/lib/
+	ln -s libnvram.so.0.1 $(1)/usr/lib/libnvram.so
+endef
+
+define Package/nvram/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libnvram.so.0.1 $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,nvram))
diff --git a/trunk/package/utils/nvram/files/nvram.init b/trunk/package/utils/nvram/files/nvram.init
new file mode 100755
index 00000000..467ab281
--- /dev/null
+++ b/trunk/package/utils/nvram/files/nvram.init
@@ -0,0 +1,98 @@
+#!/bin/sh /etc/rc.common
+# NVRAM setup
+#
+# This file handles the NVRAM quirks of various hardware.
+
+START=02
+alias debug=${DEBUG:-:}
+
+nvram_default() {
+	[ -z "$(nvram get $1)" ] && nvram set "$1=$2"
+}
+
+nvram_set() { # for the linksys fixup part
+	[ "$(nvram get "$1")" = "$2" -a "$2" != "" ] || {
+		COMMIT=1
+		/usr/sbin/nvram set "$1=$2"
+	}
+}
+
+fixup_linksys() {
+	# work around braindead CFE defaults in linksys routers
+	boardtype=$(nvram get boardtype)
+	boardnum=$(nvram get boardnum)
+	boardflags=$(($(nvram get boardflags)))
+	adm_switch="$(( ($boardflags & 0x80) >> 7 ))"
+
+	[ -n "$(nvram get vxkilled)" ] && boardtype=0 # don't mess with the ram settings on the hacked cfe
+	case "$(( $boardtype ))" in
+		"1800") #0x708
+			if [ "$adm_switch" = 0 ]; then
+				nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))"
+				[ "$COMMIT" = 1 ] && {
+					nvram_set clkfreq 216
+					nvram_set sdram_ncdl 0x0
+					nvram_set pa0itssit 62
+					nvram_set pa0b0 0x15eb
+					nvram_set pa0b1 0xfa82
+					nvram_set pa0b2 0xfe66
+					nvram_set pa0maxpwr 0x4e
+				}
+			fi
+		;;
+		"1127") #0x467
+			nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))"
+			[ "$COMMIT" = 1 ] && {
+				nvram_set sdram_ncdl 0x0
+				nvram_set pa0itssit 62
+				nvram_set pa0b0 0x168b
+				nvram_set pa0b1 0xfabf
+				nvram_set pa0b2 0xfeaf
+				nvram_set pa0maxpwr 0x4e
+			}
+		;;
+		"1071") #0x042f
+			# do sanity check first! max 0x0011 = 128mb
+			SDRAM_INIT=$(printf %d $(/usr/sbin/nvram get sdram_init))
+			[ "$SDRAM_INIT" -lt "9" -o "$SDRAM_INIT" -gt "17" ] && {
+				# set this to default: 0x09 only if value is invaild like 16MB on Asus WL-500GP
+				echo "sdram_init is invaild: $(printf 0x%04x $SDRAM_INIT), force to default!"
+				nvram_set sdram_init 0x0009
+			}
+			# on WRT54G3GV2 set flag, so checksum errors of firmware image 2 don't stop the boot process
+			noset_try_flag=$(nvram get noset_try_flag)
+			[ "$noset_try_flag" = 0 ] && {
+				echo "setting noset_try_flag to 1."
+				nvram_set noset_try_flag 1
+			}
+			[ "$COMMIT" = 1 ] && {
+				nvram_set sdram_ncdl 0x0
+			}
+	esac
+}
+
+start() {
+	# Don't do any fixups on the WGT634U
+	[ "$(cat /proc/diag/model)" = "Netgear WGT634U" ] && return
+
+	fixup_linksys
+
+	# OFDM Power Offset is set incorrectly on many boards.
+	# Setting it to 0 will increase the tx power to normal levels.
+	nvram_set opo 0x0
+
+	[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && {
+		# if default wifi mac, set two higher than the lan mac
+		nvram set il0macaddr=$(nvram get et0macaddr|
+		awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
+	}
+
+	[ "$(nvram get et0macaddr)" = "00:90:4c:c0:00:08" ] && {
+		# OvisLink WL-1600GL mac workaround
+		nvram set et0macaddr=$(hexdump -n 6 -s 130976 -e '5/1 "%02x:" "%02x" ' /dev/mtd/0)
+		nvram set il0macaddr=$(nvram get et0macaddr|
+		awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
+	}
+
+	[ "$COMMIT" = "1" ] && nvram commit
+}
diff --git a/trunk/package/utils/nvram/src/Makefile b/trunk/package/utils/nvram/src/Makefile
new file mode 100644
index 00000000..4872728b
--- /dev/null
+++ b/trunk/package/utils/nvram/src/Makefile
@@ -0,0 +1,33 @@
+CLI_FILENAME = nvram
+
+LIB_VERMAJOR = 0
+LIB_VERMINOR = 1
+LIB_FILENAME = libnvram.so
+
+LIB_CFLAGS  = $(CFLAGS) -shared -fPIC
+LIB_LDFLAGS = $(LDFLAGS) -Wl,-soname,$(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
+
+CLI_CFLAGS  = $(CFLAGS)
+CLI_LDFLAGS = $(LDFLAGS)
+
+CLI_OBJ = cli.o
+LIB_OBJ = crc.o nvram.o
+
+all: cli libnvram
+
+cli: libnvram
+	$(CC) $(CLI_CFLAGS) -c -o cli.o cli.c
+	$(CC) -o $(CLI_FILENAME) $(CLI_LDFLAGS) $(CLI_OBJ) \
+		$(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
+
+cli.o: cli.c
+	$(CC) $(CLI_CFLAGS) -c -o $@ $<
+
+libnvram:
+	$(CC) $(LIB_CFLAGS) -c -o crc.o crc.c
+	$(CC) $(LIB_CFLAGS) -c -o nvram.o nvram.c
+	$(CC) $(LIB_CFLAGS) $(LIB_LDFLAGS) \
+		-o $(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR) $(LIB_OBJ)
+
+clean:
+	rm -f $(CLI_FILENAME) $(LIB_FILENAME)* *.o
diff --git a/trunk/package/utils/nvram/src/cli.c b/trunk/package/utils/nvram/src/cli.c
new file mode 100644
index 00000000..66ef9048
--- /dev/null
+++ b/trunk/package/utils/nvram/src/cli.c
@@ -0,0 +1,246 @@
+/*
+ * Command line interface for libnvram
+ *
+ * Copyright 2009, Jo-Philipp Wich <xm@subsignal.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ *
+ * The libnvram code is based on Broadcom code for Linux 2.4.x .
+ *
+ */
+
+#include "nvram.h"
+
+
+static nvram_handle_t * nvram_open_rdonly(void)
+{
+	const char *file = nvram_find_staging();
+
+	if( file == NULL )
+		file = nvram_find_mtd();
+
+	if( file != NULL )
+		return nvram_open(file, NVRAM_RO);
+
+	return NULL;
+}
+
+static nvram_handle_t * nvram_open_staging(void)
+{
+	if( nvram_find_staging() != NULL || nvram_to_staging() == 0 )
+		return nvram_open(NVRAM_STAGING, NVRAM_RW);
+
+	return NULL;
+}
+
+static int do_show(nvram_handle_t *nvram)
+{
+	nvram_tuple_t *t;
+	int stat = 1;
+
+	if( (t = nvram_getall(nvram)) != NULL )
+	{
+		while( t )
+		{
+			printf("%s=%s\n", t->name, t->value);
+			t = t->next;
+		}
+
+		stat = 0;
+	}
+
+	return stat;
+}
+
+static int do_get(nvram_handle_t *nvram, const char *var)
+{
+	const char *val;
+	int stat = 1;
+
+	if( (val = nvram_get(nvram, var)) != NULL )
+	{
+		printf("%s\n", val);
+		stat = 0;
+	}
+
+	return stat;
+}
+
+static int do_unset(nvram_handle_t *nvram, const char *var)
+{
+	return nvram_unset(nvram, var);
+}
+
+static int do_set(nvram_handle_t *nvram, const char *pair)
+{
+	char *val = strstr(pair, "=");
+	char var[strlen(pair)];
+	int stat = 1;
+
+	if( val != NULL )
+	{
+		memset(var, 0, sizeof(var));
+		strncpy(var, pair, (int)(val-pair));
+		stat = nvram_set(nvram, var, (char *)(val + 1));
+	}
+
+	return stat;
+}
+
+static int do_info(nvram_handle_t *nvram)
+{
+	nvram_header_t *hdr = nvram_header(nvram);
+
+	/* CRC8 over the last 11 bytes of the header and data bytes */
+	uint8_t crc = hndcrc8((unsigned char *) &hdr[0] + NVRAM_CRC_START_POSITION,
+		hdr->len - NVRAM_CRC_START_POSITION, 0xff);
+
+	/* Show info */
+	printf("Magic:         0x%08X\n",   hdr->magic);
+	printf("Length:        0x%08X\n",   hdr->len);
+	printf("Offset:        0x%08X\n",   nvram->offset);
+
+	printf("CRC8:          0x%02X (calculated: 0x%02X)\n",
+		hdr->crc_ver_init & 0xFF, crc);
+
+	printf("Version:       0x%02X\n",   (hdr->crc_ver_init >> 8) & 0xFF);
+	printf("SDRAM init:    0x%04X\n",   (hdr->crc_ver_init >> 16) & 0xFFFF);
+	printf("SDRAM config:  0x%04X\n",   hdr->config_refresh & 0xFFFF);
+	printf("SDRAM refresh: 0x%04X\n",   (hdr->config_refresh >> 16) & 0xFFFF);
+	printf("NCDL values:   0x%08X\n\n", hdr->config_ncdl);
+
+	printf("%i bytes used / %i bytes available (%.2f%%)\n",
+		hdr->len, NVRAM_SPACE - hdr->len,
+		(100.00 / (double)NVRAM_SPACE) * (double)hdr->len);
+
+	return 0;
+}
+
+
+int main( int argc, const char *argv[] )
+{
+	nvram_handle_t *nvram;
+	int commit = 0;
+	int write = 0;
+	int stat = 1;
+	int done = 0;
+	int i;
+
+	/* Ugly... iterate over arguments to see whether we can expect a write */
+	for( i = 1; i < argc; i++ )
+		if( ( !strcmp(argv[i], "set")   && ++i < argc ) ||
+			( !strcmp(argv[i], "unset") && ++i < argc ) ||
+			!strcmp(argv[i], "commit") )
+		{
+			write = 1;
+			break;
+		}
+
+
+	nvram = write ? nvram_open_staging() : nvram_open_rdonly();
+
+	if( nvram != NULL && argc > 1 )
+	{
+		for( i = 1; i < argc; i++ )
+		{
+			if( !strcmp(argv[i], "show") )
+			{
+				stat = do_show(nvram);
+				done++;
+			}
+			else if( !strcmp(argv[i], "info") )
+			{
+				stat = do_info(nvram);
+				done++;
+			}
+			else if( !strcmp(argv[i], "get") || !strcmp(argv[i], "unset") || !strcmp(argv[i], "set") )
+			{
+				if( (i+1) < argc )
+				{
+					switch(argv[i++][0])
+					{
+						case 'g':
+							stat = do_get(nvram, argv[i]);
+							break;
+
+						case 'u':
+							stat = do_unset(nvram, argv[i]);
+							break;
+
+						case 's':
+							stat = do_set(nvram, argv[i]);
+							break;
+					}
+					done++;
+				}
+				else
+				{
+					fprintf(stderr, "Command '%s' requires an argument!\n", argv[i]);
+					done = 0;
+					break;
+				}
+			}
+			else if( !strcmp(argv[i], "commit") )
+			{
+				commit = 1;
+				done++;
+			}
+			else
+			{
+				fprintf(stderr, "Unknown option '%s' !\n", argv[i]);
+				done = 0;
+				break;
+			}
+		}
+
+		if( write )
+			stat = nvram_commit(nvram);
+
+		nvram_close(nvram);
+
+		if( commit )
+			stat = staging_to_nvram();
+	}
+
+	if( !nvram )
+	{
+		fprintf(stderr,
+			"Could not open nvram! Possible reasons are:\n"
+			"	- No device found (/proc not mounted or no nvram present)\n"
+			"	- Insufficient permissions to open mtd device\n"
+			"	- Insufficient memory to complete operation\n"
+			"	- Memory mapping failed or not supported\n"
+		);
+
+		stat = 1;
+	}
+	else if( !done )
+	{
+		fprintf(stderr,
+			"Usage:\n"
+			"	nvram show\n"
+			"	nvram info\n"
+			"	nvram get variable\n"
+			"	nvram set variable=value [set ...]\n"
+			"	nvram unset variable [unset ...]\n"
+			"	nvram commit\n"
+		);
+
+		stat = 1;
+	}
+
+	return stat;
+}
diff --git a/trunk/package/utils/nvram/src/crc.c b/trunk/package/utils/nvram/src/crc.c
new file mode 100644
index 00000000..22a36652
--- /dev/null
+++ b/trunk/package/utils/nvram/src/crc.c
@@ -0,0 +1,69 @@
+#include "nvram.h"
+
+/*******************************************************************************
+ * crc8
+ *
+ * Computes a crc8 over the input data using the polynomial:
+ *
+ *       x^8 + x^7 +x^6 + x^4 + x^2 + 1
+ *
+ * The caller provides the initial value (either CRC8_INIT_VALUE
+ * or the previous returned value) to allow for processing of
+ * discontiguous blocks of data.  When generating the CRC the
+ * caller is responsible for complementing the final return value
+ * and inserting it into the byte stream.  When checking, a final
+ * return value of CRC8_GOOD_VALUE indicates a valid CRC.
+ *
+ * Reference: Dallas Semiconductor Application Note 27
+ *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms",
+ *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
+ *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
+ *
+ * ****************************************************************************
+ */
+
+static const uint8_t crc8_table[256] = {
+	0x00, 0xF7, 0xB9, 0x4E, 0x25, 0xD2, 0x9C, 0x6B,
+	0x4A, 0xBD, 0xF3, 0x04, 0x6F, 0x98, 0xD6, 0x21,
+	0x94, 0x63, 0x2D, 0xDA, 0xB1, 0x46, 0x08, 0xFF,
+	0xDE, 0x29, 0x67, 0x90, 0xFB, 0x0C, 0x42, 0xB5,
+	0x7F, 0x88, 0xC6, 0x31, 0x5A, 0xAD, 0xE3, 0x14,
+	0x35, 0xC2, 0x8C, 0x7B, 0x10, 0xE7, 0xA9, 0x5E,
+	0xEB, 0x1C, 0x52, 0xA5, 0xCE, 0x39, 0x77, 0x80,
+	0xA1, 0x56, 0x18, 0xEF, 0x84, 0x73, 0x3D, 0xCA,
+	0xFE, 0x09, 0x47, 0xB0, 0xDB, 0x2C, 0x62, 0x95,
+	0xB4, 0x43, 0x0D, 0xFA, 0x91, 0x66, 0x28, 0xDF,
+	0x6A, 0x9D, 0xD3, 0x24, 0x4F, 0xB8, 0xF6, 0x01,
+	0x20, 0xD7, 0x99, 0x6E, 0x05, 0xF2, 0xBC, 0x4B,
+	0x81, 0x76, 0x38, 0xCF, 0xA4, 0x53, 0x1D, 0xEA,
+	0xCB, 0x3C, 0x72, 0x85, 0xEE, 0x19, 0x57, 0xA0,
+	0x15, 0xE2, 0xAC, 0x5B, 0x30, 0xC7, 0x89, 0x7E,
+	0x5F, 0xA8, 0xE6, 0x11, 0x7A, 0x8D, 0xC3, 0x34,
+	0xAB, 0x5C, 0x12, 0xE5, 0x8E, 0x79, 0x37, 0xC0,
+	0xE1, 0x16, 0x58, 0xAF, 0xC4, 0x33, 0x7D, 0x8A,
+	0x3F, 0xC8, 0x86, 0x71, 0x1A, 0xED, 0xA3, 0x54,
+	0x75, 0x82, 0xCC, 0x3B, 0x50, 0xA7, 0xE9, 0x1E,
+	0xD4, 0x23, 0x6D, 0x9A, 0xF1, 0x06, 0x48, 0xBF,
+	0x9E, 0x69, 0x27, 0xD0, 0xBB, 0x4C, 0x02, 0xF5,
+	0x40, 0xB7, 0xF9, 0x0E, 0x65, 0x92, 0xDC, 0x2B,
+	0x0A, 0xFD, 0xB3, 0x44, 0x2F, 0xD8, 0x96, 0x61,
+	0x55, 0xA2, 0xEC, 0x1B, 0x70, 0x87, 0xC9, 0x3E,
+	0x1F, 0xE8, 0xA6, 0x51, 0x3A, 0xCD, 0x83, 0x74,
+	0xC1, 0x36, 0x78, 0x8F, 0xE4, 0x13, 0x5D, 0xAA,
+	0x8B, 0x7C, 0x32, 0xC5, 0xAE, 0x59, 0x17, 0xE0,
+	0x2A, 0xDD, 0x93, 0x64, 0x0F, 0xF8, 0xB6, 0x41,
+	0x60, 0x97, 0xD9, 0x2E, 0x45, 0xB2, 0xFC, 0x0B,
+	0xBE, 0x49, 0x07, 0xF0, 0x9B, 0x6C, 0x22, 0xD5,
+	0xF4, 0x03, 0x4D, 0xBA, 0xD1, 0x26, 0x68, 0x9F
+};
+
+uint8_t hndcrc8 (
+	uint8_t * pdata,  /* pointer to array of data to process */
+	uint32_t nbytes,  /* number of input data bytes to process */
+	uint8_t crc       /* either CRC8_INIT_VALUE or previous return value */
+) {
+	while (nbytes-- > 0)
+		crc = crc8_table[(crc ^ *pdata++) & 0xff];
+
+	return crc;
+}
diff --git a/trunk/package/utils/nvram/src/nvram.c b/trunk/package/utils/nvram/src/nvram.c
new file mode 100644
index 00000000..a0bc006d
--- /dev/null
+++ b/trunk/package/utils/nvram/src/nvram.c
@@ -0,0 +1,556 @@
+/*
+ * NVRAM variable manipulation (common)
+ *
+ * Copyright 2004, Broadcom Corporation
+ * Copyright 2009-2010, OpenWrt.org
+ * All Rights Reserved.
+ *
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ */
+
+#include "nvram.h"
+
+#define TRACE(msg) \
+	printf("%s(%i) in %s(): %s\n", \
+		__FILE__, __LINE__, __FUNCTION__, msg ? msg : "?")
+
+size_t nvram_erase_size = 0;
+
+
+/*
+ * -- Helper functions --
+ */
+
+/* String hash */
+static uint32_t hash(const char *s)
+{
+	uint32_t hash = 0;
+
+	while (*s)
+		hash = 31 * hash + *s++;
+
+	return hash;
+}
+
+/* Free all tuples. */
+static void _nvram_free(nvram_handle_t *h)
+{
+	uint32_t i;
+	nvram_tuple_t *t, *next;
+
+	/* Free hash table */
+	for (i = 0; i < NVRAM_ARRAYSIZE(h->nvram_hash); i++) {
+		for (t = h->nvram_hash[i]; t; t = next) {
+			next = t->next;
+			free(t);
+		}
+		h->nvram_hash[i] = NULL;
+	}
+
+	/* Free dead table */
+	for (t = h->nvram_dead; t; t = next) {
+		next = t->next;
+		free(t);
+	}
+
+	h->nvram_dead = NULL;
+}
+
+/* (Re)allocate NVRAM tuples. */
+static nvram_tuple_t * _nvram_realloc( nvram_handle_t *h, nvram_tuple_t *t,
+	const char *name, const char *value )
+{
+	if ((strlen(value) + 1) > NVRAM_SPACE)
+		return NULL;
+
+	if (!t) {
+		if (!(t = malloc(sizeof(nvram_tuple_t) + strlen(name) + 1)))
+			return NULL;
+
+		/* Copy name */
+		t->name = (char *) &t[1];
+		strcpy(t->name, name);
+
+		t->value = NULL;
+	}
+
+	/* Copy value */
+	if (!t->value || strcmp(t->value, value))
+	{
+		if(!(t->value = (char *) realloc(t->value, strlen(value)+1)))
+			return NULL;
+
+		strcpy(t->value, value);
+		t->value[strlen(value)] = '\0';
+	}
+
+	return t;
+}
+
+/* (Re)initialize the hash table. */
+static int _nvram_rehash(nvram_handle_t *h)
+{
+	nvram_header_t *header = nvram_header(h);
+	char buf[] = "0xXXXXXXXX", *name, *value, *eq;
+
+	/* (Re)initialize hash table */
+	_nvram_free(h);
+
+	/* Parse and set "name=value\0 ... \0\0" */
+	name = (char *) &header[1];
+
+	for (; *name; name = value + strlen(value) + 1) {
+		if (!(eq = strchr(name, '=')))
+			break;
+		*eq = '\0';
+		value = eq + 1;
+		nvram_set(h, name, value);
+		*eq = '=';
+	}
+
+	/* Set special SDRAM parameters */
+	if (!nvram_get(h, "sdram_init")) {
+		sprintf(buf, "0x%04X", (uint16_t)(header->crc_ver_init >> 16));
+		nvram_set(h, "sdram_init", buf);
+	}
+	if (!nvram_get(h, "sdram_config")) {
+		sprintf(buf, "0x%04X", (uint16_t)(header->config_refresh & 0xffff));
+		nvram_set(h, "sdram_config", buf);
+	}
+	if (!nvram_get(h, "sdram_refresh")) {
+		sprintf(buf, "0x%04X",
+			(uint16_t)((header->config_refresh >> 16) & 0xffff));
+		nvram_set(h, "sdram_refresh", buf);
+	}
+	if (!nvram_get(h, "sdram_ncdl")) {
+		sprintf(buf, "0x%08X", header->config_ncdl);
+		nvram_set(h, "sdram_ncdl", buf);
+	}
+
+	return 0;
+}
+
+
+/*
+ * -- Public functions --
+ */
+
+/* Get nvram header. */
+nvram_header_t * nvram_header(nvram_handle_t *h)
+{
+	return (nvram_header_t *) &h->mmap[h->offset];
+}
+
+/* Get the value of an NVRAM variable. */
+char * nvram_get(nvram_handle_t *h, const char *name)
+{
+	uint32_t i;
+	nvram_tuple_t *t;
+	char *value;
+
+	if (!name)
+		return NULL;
+
+	/* Hash the name */
+	i = hash(name) % NVRAM_ARRAYSIZE(h->nvram_hash);
+
+	/* Find the associated tuple in the hash table */
+	for (t = h->nvram_hash[i]; t && strcmp(t->name, name); t = t->next);
+
+	value = t ? t->value : NULL;
+
+	return value;
+}
+
+/* Set the value of an NVRAM variable. */
+int nvram_set(nvram_handle_t *h, const char *name, const char *value)
+{
+	uint32_t i;
+	nvram_tuple_t *t, *u, **prev;
+
+	/* Hash the name */
+	i = hash(name) % NVRAM_ARRAYSIZE(h->nvram_hash);
+
+	/* Find the associated tuple in the hash table */
+	for (prev = &h->nvram_hash[i], t = *prev;
+		 t && strcmp(t->name, name); prev = &t->next, t = *prev);
+
+	/* (Re)allocate tuple */
+	if (!(u = _nvram_realloc(h, t, name, value)))
+		return -12; /* -ENOMEM */
+
+	/* Value reallocated */
+	if (t && t == u)
+		return 0;
+
+	/* Move old tuple to the dead table */
+	if (t) {
+		*prev = t->next;
+		t->next = h->nvram_dead;
+		h->nvram_dead = t;
+	}
+
+	/* Add new tuple to the hash table */
+	u->next = h->nvram_hash[i];
+	h->nvram_hash[i] = u;
+
+	return 0;
+}
+
+/* Unset the value of an NVRAM variable. */
+int nvram_unset(nvram_handle_t *h, const char *name)
+{
+	uint32_t i;
+	nvram_tuple_t *t, **prev;
+
+	if (!name)
+		return 0;
+
+	/* Hash the name */
+	i = hash(name) % NVRAM_ARRAYSIZE(h->nvram_hash);
+
+	/* Find the associated tuple in the hash table */
+	for (prev = &h->nvram_hash[i], t = *prev;
+		 t && strcmp(t->name, name); prev = &t->next, t = *prev);
+
+	/* Move it to the dead table */
+	if (t) {
+		*prev = t->next;
+		t->next = h->nvram_dead;
+		h->nvram_dead = t;
+	}
+
+	return 0;
+}
+
+/* Get all NVRAM variables. */
+nvram_tuple_t * nvram_getall(nvram_handle_t *h)
+{
+	int i;
+	nvram_tuple_t *t, *l, *x;
+
+	l = NULL;
+
+	for (i = 0; i < NVRAM_ARRAYSIZE(h->nvram_hash); i++) {
+		for (t = h->nvram_hash[i]; t; t = t->next) {
+			if( (x = (nvram_tuple_t *) malloc(sizeof(nvram_tuple_t))) != NULL )
+			{
+				x->name  = t->name;
+				x->value = t->value;
+				x->next  = l;
+				l = x;
+			}
+			else
+			{
+				break;
+			}
+		}
+	}
+
+	return l;
+}
+
+/* Regenerate NVRAM. */
+int nvram_commit(nvram_handle_t *h)
+{
+	nvram_header_t *header = nvram_header(h);
+	char *init, *config, *refresh, *ncdl;
+	char *ptr, *end;
+	int i;
+	nvram_tuple_t *t;
+	nvram_header_t tmp;
+	uint8_t crc;
+
+	/* Regenerate header */
+	header->magic = NVRAM_MAGIC;
+	header->crc_ver_init = (NVRAM_VERSION << 8);
+	if (!(init = nvram_get(h, "sdram_init")) ||
+		!(config = nvram_get(h, "sdram_config")) ||
+		!(refresh = nvram_get(h, "sdram_refresh")) ||
+		!(ncdl = nvram_get(h, "sdram_ncdl"))) {
+		header->crc_ver_init |= SDRAM_INIT << 16;
+		header->config_refresh = SDRAM_CONFIG;
+		header->config_refresh |= SDRAM_REFRESH << 16;
+		header->config_ncdl = 0;
+	} else {
+		header->crc_ver_init |= (strtoul(init, NULL, 0) & 0xffff) << 16;
+		header->config_refresh = strtoul(config, NULL, 0) & 0xffff;
+		header->config_refresh |= (strtoul(refresh, NULL, 0) & 0xffff) << 16;
+		header->config_ncdl = strtoul(ncdl, NULL, 0);
+	}
+
+	/* Clear data area */
+	ptr = (char *) header + sizeof(nvram_header_t);
+	memset(ptr, 0xFF, NVRAM_SPACE - sizeof(nvram_header_t));
+	memset(&tmp, 0, sizeof(nvram_header_t));
+
+	/* Leave space for a double NUL at the end */
+	end = (char *) header + NVRAM_SPACE - 2;
+
+	/* Write out all tuples */
+	for (i = 0; i < NVRAM_ARRAYSIZE(h->nvram_hash); i++) {
+		for (t = h->nvram_hash[i]; t; t = t->next) {
+			if ((ptr + strlen(t->name) + 1 + strlen(t->value) + 1) > end)
+				break;
+			ptr += sprintf(ptr, "%s=%s", t->name, t->value) + 1;
+		}
+	}
+
+	/* End with a double NULL and pad to 4 bytes */
+	*ptr = '\0';
+	ptr++;
+
+	if( (int)ptr % 4 )
+		memset(ptr, 0, 4 - ((int)ptr % 4));
+
+	ptr++;
+
+	/* Set new length */
+	header->len = NVRAM_ROUNDUP(ptr - (char *) header, 4);
+
+	/* Little-endian CRC8 over the last 11 bytes of the header */
+	tmp.crc_ver_init   = header->crc_ver_init;
+	tmp.config_refresh = header->config_refresh;
+	tmp.config_ncdl    = header->config_ncdl;
+	crc = hndcrc8((unsigned char *) &tmp + NVRAM_CRC_START_POSITION,
+		sizeof(nvram_header_t) - NVRAM_CRC_START_POSITION, 0xff);
+
+	/* Continue CRC8 over data bytes */
+	crc = hndcrc8((unsigned char *) &header[0] + sizeof(nvram_header_t),
+		header->len - sizeof(nvram_header_t), crc);
+
+	/* Set new CRC8 */
+	header->crc_ver_init |= crc;
+
+	/* Write out */
+	msync(h->mmap, h->length, MS_SYNC);
+	fsync(h->fd);
+
+	/* Reinitialize hash table */
+	return _nvram_rehash(h);
+}
+
+/* Open NVRAM and obtain a handle. */
+nvram_handle_t * nvram_open(const char *file, int rdonly)
+{
+	int i;
+	int fd;
+	char *mtd = NULL;
+	nvram_handle_t *h;
+	nvram_header_t *header;
+	int offset = -1;
+
+	/* If erase size or file are undefined then try to define them */
+	if( (nvram_erase_size == 0) || (file == NULL) )
+	{
+		/* Finding the mtd will set the appropriate erase size */
+		if( (mtd = nvram_find_mtd()) == NULL || nvram_erase_size == 0 )
+		{
+			free(mtd);
+			return NULL;
+		}
+	}
+
+	if( (fd = open(file ? file : mtd, O_RDWR)) > -1 )
+	{
+		char *mmap_area = (char *) mmap(
+			NULL, nvram_erase_size, PROT_READ | PROT_WRITE,
+			(( rdonly == NVRAM_RO ) ? MAP_PRIVATE : MAP_SHARED) | MAP_LOCKED, fd, 0);
+
+		if( mmap_area != MAP_FAILED )
+		{
+			for( i = 0; i <= ((nvram_erase_size - NVRAM_SPACE) / sizeof(uint32_t)); i++ )
+			{
+				if( ((uint32_t *)mmap_area)[i] == NVRAM_MAGIC )
+				{
+					offset = i * sizeof(uint32_t);
+					break;
+				}
+			}
+
+			if( offset < 0 )
+			{
+				free(mtd);
+				return NULL;
+			}
+			else if( (h = malloc(sizeof(nvram_handle_t))) != NULL )
+			{
+				memset(h, 0, sizeof(nvram_handle_t));
+
+				h->fd     = fd;
+				h->mmap   = mmap_area;
+				h->length = nvram_erase_size;
+				h->offset = offset;
+
+				header = nvram_header(h);
+
+				if( header->magic == NVRAM_MAGIC )
+				{
+					_nvram_rehash(h);
+					free(mtd);
+					return h;
+				}
+				else
+				{
+					munmap(h->mmap, h->length);
+					free(h);
+				}
+			}
+		}
+	}
+
+	free(mtd);
+	return NULL;
+}
+
+/* Close NVRAM and free memory. */
+int nvram_close(nvram_handle_t *h)
+{
+	_nvram_free(h);
+	munmap(h->mmap, h->length);
+	close(h->fd);
+	free(h);
+
+	return 0;
+}
+
+/* Determine NVRAM device node. */
+char * nvram_find_mtd(void)
+{
+	FILE *fp;
+	int i, esz;
+	char dev[PATH_MAX];
+	char *path = NULL;
+	struct stat s;
+	int supported = 1;
+
+	/* Refuse any operation on the WGT634U */
+	if( (fp = fopen("/proc/diag/model", "r")) )
+	{
+		if( fgets(dev, sizeof(dev), fp) && !strncmp(dev, "Netgear WGT634U", 15) )
+			supported = 0;
+
+		fclose(fp);
+	}
+
+	if( supported && (fp = fopen("/proc/mtd", "r")) )
+	{
+		while( fgets(dev, sizeof(dev), fp) )
+		{
+			if( strstr(dev, "nvram") && sscanf(dev, "mtd%d: %08x", &i, &esz) )
+			{
+				nvram_erase_size = esz;
+
+				sprintf(dev, "/dev/mtdblock/%d", i);
+				if( stat(dev, &s) > -1 && (s.st_mode & S_IFBLK) )
+				{
+					if( (path = (char *) malloc(strlen(dev)+1)) != NULL )
+					{
+						strncpy(path, dev, strlen(dev)+1);
+						break;
+					}
+				}
+				else
+				{
+					sprintf(dev, "/dev/mtdblock%d", i);
+					if( stat(dev, &s) > -1 && (s.st_mode & S_IFBLK) )
+					{
+						if( (path = (char *) malloc(strlen(dev)+1)) != NULL )
+						{
+							strncpy(path, dev, strlen(dev)+1);
+							break;
+						}
+					}
+				}
+			}
+		}
+		fclose(fp);
+	}
+
+	return path;
+}
+
+/* Check NVRAM staging file. */
+char * nvram_find_staging(void)
+{
+	struct stat s;
+
+	if( (stat(NVRAM_STAGING, &s) > -1) && (s.st_mode & S_IFREG) )
+	{
+		return NVRAM_STAGING;
+	}
+
+	return NULL;
+}
+
+/* Copy NVRAM contents to staging file. */
+int nvram_to_staging(void)
+{
+	int fdmtd, fdstg, stat;
+	char *mtd = nvram_find_mtd();
+	char buf[nvram_erase_size];
+
+	stat = -1;
+
+	if( (mtd != NULL) && (nvram_erase_size > 0) )
+	{
+		if( (fdmtd = open(mtd, O_RDONLY)) > -1 )
+		{
+			if( read(fdmtd, buf, sizeof(buf)) == sizeof(buf) )
+			{
+				if((fdstg = open(NVRAM_STAGING, O_WRONLY | O_CREAT, 0600)) > -1)
+				{
+					write(fdstg, buf, sizeof(buf));
+					fsync(fdstg);
+					close(fdstg);
+
+					stat = 0;
+				}
+			}
+
+			close(fdmtd);
+		}
+	}
+
+	free(mtd);
+	return stat;
+}
+
+/* Copy staging file to NVRAM device. */
+int staging_to_nvram(void)
+{
+	int fdmtd, fdstg, stat;
+	char *mtd = nvram_find_mtd();
+	char buf[nvram_erase_size];
+
+	stat = -1;
+
+	if( (mtd != NULL) && (nvram_erase_size > 0) )
+	{
+		if( (fdstg = open(NVRAM_STAGING, O_RDONLY)) > -1 )
+		{
+			if( read(fdstg, buf, sizeof(buf)) == sizeof(buf) )
+			{
+				if( (fdmtd = open(mtd, O_WRONLY | O_SYNC)) > -1 )
+				{
+					write(fdmtd, buf, sizeof(buf));
+					fsync(fdmtd);
+					close(fdmtd);
+					stat = 0;
+				}
+			}
+
+			close(fdstg);
+
+			if( !stat )
+				stat = unlink(NVRAM_STAGING) ? 1 : 0;
+		}
+	}
+
+	free(mtd);
+	return stat;
+}
diff --git a/trunk/package/utils/nvram/src/nvram.h b/trunk/package/utils/nvram/src/nvram.h
new file mode 100644
index 00000000..c72f67e9
--- /dev/null
+++ b/trunk/package/utils/nvram/src/nvram.h
@@ -0,0 +1,123 @@
+/*
+ * NVRAM variable manipulation
+ *
+ * Copyright 2007, Broadcom Corporation
+ * Copyright 2009, OpenWrt.org
+ * All Rights Reserved.
+ *
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ */
+
+#ifndef _nvram_h_
+#define _nvram_h_
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "sdinitvals.h"
+
+
+struct nvram_header {
+	uint32_t magic;
+	uint32_t len;
+	uint32_t crc_ver_init;	/* 0:7 crc, 8:15 ver, 16:31 sdram_init */
+	uint32_t config_refresh;	/* 0:15 sdram_config, 16:31 sdram_refresh */
+	uint32_t config_ncdl;	/* ncdl values for memc */
+} __attribute__((__packed__));
+
+struct nvram_tuple {
+	char *name;
+	char *value;
+	struct nvram_tuple *next;
+};
+
+struct nvram_handle {
+	int fd;
+	char *mmap;
+	unsigned int length;
+	unsigned int offset;
+	struct nvram_tuple *nvram_hash[257];
+	struct nvram_tuple *nvram_dead;
+};
+
+typedef struct nvram_handle nvram_handle_t;
+typedef struct nvram_header nvram_header_t;
+typedef struct nvram_tuple  nvram_tuple_t;
+
+
+/* Get nvram header. */
+nvram_header_t * nvram_header(nvram_handle_t *h);
+
+/* Set the value of an NVRAM variable */
+int nvram_set(nvram_handle_t *h, const char *name, const char *value);
+
+/* Get the value of an NVRAM variable. */
+char * nvram_get(nvram_handle_t *h, const char *name);
+
+/* Unset the value of an NVRAM variable. */
+int nvram_unset(nvram_handle_t *h, const char *name);
+
+/* Get all NVRAM variables. */
+nvram_tuple_t * nvram_getall(nvram_handle_t *h);
+
+/* Regenerate NVRAM. */
+int nvram_commit(nvram_handle_t *h);
+
+/* Open NVRAM and obtain a handle. */
+nvram_handle_t * nvram_open(const char *file, int rdonly);
+
+/* Close NVRAM and free memory. */
+int nvram_close(nvram_handle_t *h);
+
+/* Get the value of an NVRAM variable in a safe way, use "" instead of NULL. */
+#define nvram_safe_get(h, name) (nvram_get(h, name) ? : "")
+
+/* Computes a crc8 over the input data. */
+uint8_t hndcrc8 (uint8_t * pdata, uint32_t nbytes, uint8_t crc);
+
+/* Returns the crc value of the nvram. */
+uint8_t nvram_calc_crc(nvram_header_t * nvh);
+
+/* Determine NVRAM device node. */
+char * nvram_find_mtd(void);
+
+/* Copy NVRAM contents to staging file. */
+int nvram_to_staging(void);
+
+/* Copy staging file to NVRAM device. */
+int staging_to_nvram(void);
+
+/* Check NVRAM staging file. */
+char * nvram_find_staging(void);
+
+
+/* Staging file for NVRAM */
+#define NVRAM_STAGING		"/tmp/.nvram"
+#define NVRAM_RO			1
+#define NVRAM_RW			0
+
+/* Helper macros */
+#define NVRAM_ARRAYSIZE(a)	sizeof(a)/sizeof(a[0])
+#define	NVRAM_ROUNDUP(x, y)	((((x)+((y)-1))/(y))*(y))
+
+/* NVRAM constants */
+#define NVRAM_SPACE			0x8000
+#define NVRAM_MAGIC			0x48534C46	/* 'FLSH' */
+#define NVRAM_VERSION		1
+
+#define NVRAM_CRC_START_POSITION	9 /* magic, len, crc8 to be skipped */
+
+
+#endif /* _nvram_h_ */
diff --git a/trunk/package/utils/nvram/src/sdinitvals.h b/trunk/package/utils/nvram/src/sdinitvals.h
new file mode 100644
index 00000000..5a289ade
--- /dev/null
+++ b/trunk/package/utils/nvram/src/sdinitvals.h
@@ -0,0 +1,30 @@
+/*
+ * SDRAM init values
+ *
+ * Copyright 2007, Broadcom Corporation
+ * Copyright 2009, OpenWrt.org
+ * All Rights Reserved.
+ *
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ */
+
+#ifndef _sdinitvals_h_
+#define _sdinitvals_h_
+
+/* SDRAM refresh control (refresh) register bits */
+#define SDRAM_REF(p)    (((p)&0xff) | SDRAM_REF_EN)     /* Refresh period */
+#define SDRAM_REF_EN    0x8000          /* Writing 1 enables periodic refresh */
+
+/* SDRAM Core default Init values (OCP ID 0x803) */
+#define MEM4MX16X2      0x419   /* 16 MB */
+
+#define SDRAM_INIT	MEM4MX16X2
+#define SDRAM_BURSTFULL 0x0000  /* Use full page bursts */
+#define SDRAM_CONFIG    SDRAM_BURSTFULL
+#define SDRAM_REFRESH   SDRAM_REF(0x40)
+
+#endif /* _sdinitvals_h_ */
diff --git a/trunk/package/utils/pciutils/Makefile b/trunk/package/utils/pciutils/Makefile
new file mode 100644
index 00000000..d3b0765f
--- /dev/null
+++ b/trunk/package/utils/pciutils/Makefile
@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=pciutils
+PKG_VERSION:=3.3.0
+PKG_RELEASE:=1
+PKG_USE_MIPS16:=0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils
+PKG_MD5SUM:=bf6ce5c50b273ffc2d27f659e929a37e
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/pciutils
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Linux PCI Utilities
+  URL:=http://mj.ucw.cz/pciutils.shtml
+  DEPENDS:=+zlib
+endef
+
+define Package/pciutils/description
+ contains collection of programs for inspecting and manipulating configuration
+ of PCI devices
+endef
+
+define Package/pciutils/postinst
+#!/bin/sh
+[ -z "$${IPKG_INSTROOT}" ] || \
+(cd $${PKG_ROOT}/usr/share; $${PKG_ROOT}/usr/sbin/update-pciids; rm pci.ids.gz.old)
+exit 0
+endef
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+	PREFIX="/usr" \
+	HOST="$(GNU_TARGET_NAME)" \
+	ZLIB="yes" \
+
+ifneq ($(CONFIG_USE_EGLIBC),)
+TARGET_LDFLAGS += -lresolv
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libpci.a $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/include/pci
+	$(CP) $(foreach i,pci.h config.h header.h types.h, \
+		$(PKG_BUILD_DIR)/lib/$(i)) $(1)/usr/include/pci
+endef
+
+define Package/pciutils/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{lspci,setpci,update-pciids} $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/share
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pci.ids.gz $(1)/usr/share/
+endef
+
+$(eval $(call BuildPackage,pciutils))
diff --git a/trunk/package/utils/pciutils/patches/100-remove-no-timestamping.patch b/trunk/package/utils/pciutils/patches/100-remove-no-timestamping.patch
new file mode 100644
index 00000000..93bc85fa
--- /dev/null
+++ b/trunk/package/utils/pciutils/patches/100-remove-no-timestamping.patch
@@ -0,0 +1,11 @@
+--- a/update-pciids.sh
++++ b/update-pciids.sh
+@@ -33,7 +33,7 @@ if which curl >/dev/null 2>&1 ; then
+ 	DL="curl -o $DEST.new $SRC"
+     ${quiet} && DL="$DL -s -S"
+ elif which wget >/dev/null 2>&1 ; then
+-	DL="wget --no-timestamping -O $DEST.new $SRC"
++	DL="wget -O $DEST.new $SRC"
+ 	${quiet} && DL="$DL -q"
+ elif which lynx >/dev/null 2>&1 ; then
+ 	DL="eval lynx -source $SRC >$DEST.new"
diff --git a/trunk/package/utils/pciutils/patches/101-no-strip.patch b/trunk/package/utils/pciutils/patches/101-no-strip.patch
new file mode 100644
index 00000000..610a7553
--- /dev/null
+++ b/trunk/package/utils/pciutils/patches/101-no-strip.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -111,7 +111,7 @@ distclean: clean
+ install: all
+ # -c is ignored on Linux, but required on FreeBSD
+ 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
+-	$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
+ 	$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
+ 	$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
+ 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
diff --git a/trunk/package/utils/pciutils/patches/102-compressed-ids.patch b/trunk/package/utils/pciutils/patches/102-compressed-ids.patch
new file mode 100644
index 00000000..9b319384
--- /dev/null
+++ b/trunk/package/utils/pciutils/patches/102-compressed-ids.patch
@@ -0,0 +1,31 @@
+--- a/update-pciids.sh
++++ b/update-pciids.sh
+@@ -6,9 +6,8 @@ set -e
+ SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
+ DEST=pci.ids
+ PCI_COMPRESSED_IDS=
+-GREP=grep
+ 
+-# if pci.ids is read-only (because the filesystem is read-only),
++# if pci.ids.gz is read-only (because the filesystem is read-only),
+ # then just skip this whole process.
+ if ! touch ${DEST} >/dev/null 2>&1 ; then
+ 	${quiet} || echo "${DEST} is read-only, exiting." 1>&2
+@@ -18,7 +17,7 @@ fi
+ if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
+ 	DECOMP="cat"
+ 	SRC="$SRC.gz"
+-	GREP=zgrep
++	DEST="$DEST.gz"
+ elif which bzip2 >/dev/null 2>&1 ; then
+ 	DECOMP="bzip2 -d"
+ 	SRC="$SRC.bz2"
+@@ -53,7 +52,7 @@ if ! $DECOMP <$DEST.new >$DEST.neww ; th
+ 	exit 1
+ fi
+ 
+-if ! $GREP >/dev/null "^C " $DEST.neww ; then
++if ! zcat $DEST.neww | grep >/dev/null "^C " ; then
+ 	echo >&2 "update-pciids: missing class info, probably truncated file"
+ 	exit 1
+ fi
diff --git a/trunk/package/utils/pciutils/patches/103-relative-path-ids.patch b/trunk/package/utils/pciutils/patches/103-relative-path-ids.patch
new file mode 100644
index 00000000..c6d69068
--- /dev/null
+++ b/trunk/package/utils/pciutils/patches/103-relative-path-ids.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -88,7 +88,7 @@ lspci: LDLIBS+=$(LIBKMOD_LIBS)
+ ls-kernel.o: CFLAGS+=$(LIBKMOD_CFLAGS)
+ 
+ update-pciids: update-pciids.sh
+-	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
++	sed <$< >$@ "s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
+ 	chmod +x $@
+ 
+ # The example of use of libpci
diff --git a/trunk/package/utils/pciutils/patches/104-resolv.patch b/trunk/package/utils/pciutils/patches/104-resolv.patch
new file mode 100644
index 00000000..c38d1cfc
--- /dev/null
+++ b/trunk/package/utils/pciutils/patches/104-resolv.patch
@@ -0,0 +1,11 @@
+--- a/lib/configure
++++ b/lib/configure
+@@ -57,7 +57,7 @@ echo >>$c "#define PCI_OS_`echo $sys | t
+ echo >$m 'WITH_LIBS='
+ 
+ echo_n "Looking for access methods..."
+-LIBRESOLV=-lresolv
++LIBRESOLV=
+ LIBEXT=so
+ 
+ case $sys in
diff --git a/trunk/package/utils/px5g-standalone/Makefile b/trunk/package/utils/px5g-standalone/Makefile
new file mode 100644
index 00000000..d6843b01
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/Makefile
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2010-2014 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=px5g
+PKG_RELEASE:=2
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_CHECK_FORMAT_SECURITY:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/px5g-standalone
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Standalone X.509 certificate generator (standalone version)
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+endef
+
+define Package/px5g-standalone/description
+ Px5g is a tiny standalone X.509 certificate generator.
+ It suitable to create key files and certificates in DER
+ and PEM format for use with stunnel, uhttpd and others.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/px5g-standalone/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/px5g $(1)/usr/sbin/px5g
+endef
+
+$(eval $(call BuildPackage,px5g-standalone))
diff --git a/trunk/package/utils/px5g-standalone/src/Makefile b/trunk/package/utils/px5g-standalone/src/Makefile
new file mode 100644
index 00000000..2bd95739
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/Makefile
@@ -0,0 +1,14 @@
+CFLAGS?=-O2
+CFLAGS+=
+SFLAGS:=--std=gnu99
+WFLAGS:=-Wall -Werror -pedantic
+LDFLAGS?=
+BINARY:=px5g
+
+all: $(BINARY)
+
+$(BINARY): *.c library/*.c
+	$(CC) -I. $(CFLAGS) $(SFLAGS) $(WFLAGS) $(LDFLAGS) -o $@ $+
+
+clean:
+	rm -f $(BINARY)
diff --git a/trunk/package/utils/px5g-standalone/src/library/base64.c b/trunk/package/utils/px5g-standalone/src/library/base64.c
new file mode 100644
index 00000000..b7cc5b84
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/library/base64.c
@@ -0,0 +1,264 @@
+/*
+ *  RFC 1521 base64 encoding/decoding
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_BASE64_C)
+
+#include "polarssl/base64.h"
+
+static const unsigned char base64_enc_map[64] =
+{
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+    'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+    'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+    'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+    'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+    'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', '+', '/'
+};
+
+static const unsigned char base64_dec_map[128] =
+{
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127,  62, 127, 127, 127,  63,  52,  53,
+     54,  55,  56,  57,  58,  59,  60,  61, 127, 127,
+    127,  64, 127, 127, 127,   0,   1,   2,   3,   4,
+      5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
+     25, 127, 127, 127, 127, 127, 127,  26,  27,  28,
+     29,  30,  31,  32,  33,  34,  35,  36,  37,  38,
+     39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
+     49,  50,  51, 127, 127, 127, 127, 127
+};
+
+/*
+ * Encode a buffer into base64 format
+ */
+int base64_encode( unsigned char *dst, int *dlen,
+                   unsigned char *src, int  slen )
+{
+    int i, n;
+    int C1, C2, C3;
+    unsigned char *p;
+
+    if( slen == 0 )
+        return( 0 );
+
+    n = (slen << 3) / 6;
+
+    switch( (slen << 3) - (n * 6) )
+    {
+        case  2: n += 3; break;
+        case  4: n += 2; break;
+        default: break;
+    }
+
+    if( *dlen < n + 1 )
+    {
+        *dlen = n + 1;
+        return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
+    }
+
+    n = (slen / 3) * 3;
+
+    for( i = 0, p = dst; i < n; i += 3 )
+    {
+        C1 = *src++;
+        C2 = *src++;
+        C3 = *src++;
+
+        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+        *p++ = base64_enc_map[(((C1 &  3) << 4) + (C2 >> 4)) & 0x3F];
+        *p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];
+        *p++ = base64_enc_map[C3 & 0x3F];
+    }
+
+    if( i < slen )
+    {
+        C1 = *src++;
+        C2 = ((i + 1) < slen) ? *src++ : 0;
+
+        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+        *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
+
+        if( (i + 1) < slen )
+             *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
+        else *p++ = '=';
+
+        *p++ = '=';
+    }
+
+    *dlen = p - dst;
+    *p = 0;
+
+    return( 0 );
+}
+
+/*
+ * Decode a base64-formatted buffer
+ */
+int base64_decode( unsigned char *dst, int *dlen,
+                   unsigned char *src, int  slen )
+{
+    int i, j, n;
+    unsigned long x;
+    unsigned char *p;
+
+    for( i = j = n = 0; i < slen; i++ )
+    {
+        if( ( slen - i ) >= 2 &&
+            src[i] == '\r' && src[i + 1] == '\n' )
+            continue;
+
+        if( src[i] == '\n' )
+            continue;
+
+        if( src[i] == '=' && ++j > 2 )
+            return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );
+
+        if( src[i] > 127 || base64_dec_map[src[i]] == 127 )
+            return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );
+
+        if( base64_dec_map[src[i]] < 64 && j != 0 )
+            return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );
+
+        n++;
+    }
+
+    if( n == 0 )
+        return( 0 );
+
+    n = ((n * 6) + 7) >> 3;
+
+    if( *dlen < n )
+    {
+        *dlen = n;
+        return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
+    }
+
+   for( j = 3, n = x = 0, p = dst; i > 0; i--, src++ )
+   {
+        if( *src == '\r' || *src == '\n' )
+            continue;
+
+        j -= ( base64_dec_map[*src] == 64 );
+        x  = (x << 6) | ( base64_dec_map[*src] & 0x3F );
+
+        if( ++n == 4 )
+        {
+            n = 0;
+            if( j > 0 ) *p++ = (unsigned char)( x >> 16 );
+            if( j > 1 ) *p++ = (unsigned char)( x >>  8 );
+            if( j > 2 ) *p++ = (unsigned char)( x       );
+        }
+    }
+
+    *dlen = p - dst;
+
+    return( 0 );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+
+#include <string.h>
+#include <stdio.h>
+
+static const unsigned char base64_test_dec[64] =
+{
+    0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD,
+    0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,
+    0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09,
+    0x0C, 0xB6, 0xE9, 0x10, 0x6F, 0x22, 0xEE, 0x13,
+    0xCA, 0xB3, 0x07, 0x05, 0x76, 0xC9, 0xFA, 0x31,
+    0x6C, 0x08, 0x34, 0xFF, 0x8D, 0xC2, 0x6C, 0x38,
+    0x00, 0x43, 0xE9, 0x54, 0x97, 0xAF, 0x50, 0x4B,
+    0xD1, 0x41, 0xBA, 0x95, 0x31, 0x5A, 0x0B, 0x97
+};
+
+static const unsigned char base64_test_enc[] =
+    "JEhuVodiWr2/F9mixBcaAZTtjx4Rs9cJDLbpEG8i7hPK"
+    "swcFdsn6MWwINP+Nwmw4AEPpVJevUEvRQbqVMVoLlw==";
+
+/*
+ * Checkup routine
+ */
+int base64_self_test( int verbose )
+{
+    int len;
+    unsigned char *src, buffer[128];
+
+    if( verbose != 0 )
+        printf( "  Base64 encoding test: " );
+
+    len = sizeof( buffer );
+    src = (unsigned char *) base64_test_dec;
+
+    if( base64_encode( buffer, &len, src, 64 ) != 0 ||
+         memcmp( base64_test_enc, buffer, 88 ) != 0 ) 
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  Base64 decoding test: " );
+
+    len = sizeof( buffer );
+    src = (unsigned char *) base64_test_enc;
+
+    if( base64_decode( buffer, &len, src, 88 ) != 0 ||
+         memcmp( base64_test_dec, buffer, 64 ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n\n" );
+
+    return( 0 );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/utils/px5g-standalone/src/library/bignum.c b/trunk/package/utils/px5g-standalone/src/library/bignum.c
new file mode 100644
index 00000000..8b7c12ff
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/library/bignum.c
@@ -0,0 +1,2010 @@
+/*
+ *  Multi-precision integer library
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  This MPI implementation is based on:
+ *
+ *  http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
+ *  http://www.stillhq.com/extracted/gnupg-api/mpi/
+ *  http://math.libtomcrypt.com/files/tommath.pdf
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_BIGNUM_C)
+
+#include "polarssl/bignum.h"
+#include "polarssl/bn_mul.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#define ciL    ((int) sizeof(t_int))    /* chars in limb  */
+#define biL    (ciL << 3)               /* bits  in limb  */
+#define biH    (ciL << 2)               /* half limb size */
+
+/*
+ * Convert between bits/chars and number of limbs
+ */
+#define BITS_TO_LIMBS(i)  (((i) + biL - 1) / biL)
+#define CHARS_TO_LIMBS(i) (((i) + ciL - 1) / ciL)
+
+/*
+ * Initialize one or more mpi
+ */
+void mpi_init( mpi *X, ... )
+{
+    va_list args;
+
+    va_start( args, X );
+
+    while( X != NULL )
+    {
+        X->s = 1;
+        X->n = 0;
+        X->p = NULL;
+
+        X = va_arg( args, mpi* );
+    }
+
+    va_end( args );
+}
+
+/*
+ * Unallocate one or more mpi
+ */
+void mpi_free( mpi *X, ... )
+{
+    va_list args;
+
+    va_start( args, X );
+
+    while( X != NULL )
+    {
+        if( X->p != NULL )
+        {
+            memset( X->p, 0, X->n * ciL );
+            free( X->p );
+        }
+
+        X->s = 1;
+        X->n = 0;
+        X->p = NULL;
+
+        X = va_arg( args, mpi* );
+    }
+
+    va_end( args );
+}
+
+/*
+ * Enlarge to the specified number of limbs
+ */
+int mpi_grow( mpi *X, int nblimbs )
+{
+    t_int *p;
+
+    if( X->n < nblimbs )
+    {
+        if( ( p = (t_int *) malloc( nblimbs * ciL ) ) == NULL )
+            return( 1 );
+
+        memset( p, 0, nblimbs * ciL );
+
+        if( X->p != NULL )
+        {
+            memcpy( p, X->p, X->n * ciL );
+            memset( X->p, 0, X->n * ciL );
+            free( X->p );
+        }
+
+        X->n = nblimbs;
+        X->p = p;
+    }
+
+    return( 0 );
+}
+
+/*
+ * Copy the contents of Y into X
+ */
+int mpi_copy( mpi *X, mpi *Y )
+{
+    int ret, i;
+
+    if( X == Y )
+        return( 0 );
+
+    for( i = Y->n - 1; i > 0; i-- )
+        if( Y->p[i] != 0 )
+            break;
+    i++;
+
+    X->s = Y->s;
+
+    MPI_CHK( mpi_grow( X, i ) );
+
+    memset( X->p, 0, X->n * ciL );
+    memcpy( X->p, Y->p, i * ciL );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Swap the contents of X and Y
+ */
+void mpi_swap( mpi *X, mpi *Y )
+{
+    mpi T;
+
+    memcpy( &T,  X, sizeof( mpi ) );
+    memcpy(  X,  Y, sizeof( mpi ) );
+    memcpy(  Y, &T, sizeof( mpi ) );
+}
+
+/*
+ * Set value from integer
+ */
+int mpi_lset( mpi *X, int z )
+{
+    int ret;
+
+    MPI_CHK( mpi_grow( X, 1 ) );
+    memset( X->p, 0, X->n * ciL );
+
+    X->p[0] = ( z < 0 ) ? -z : z;
+    X->s    = ( z < 0 ) ? -1 : 1;
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Return the number of least significant bits
+ */
+int mpi_lsb( mpi *X )
+{
+    int i, j, count = 0;
+
+    for( i = 0; i < X->n; i++ )
+        for( j = 0; j < (int) biL; j++, count++ )
+            if( ( ( X->p[i] >> j ) & 1 ) != 0 )
+                return( count );
+
+    return( 0 );
+}
+
+/*
+ * Return the number of most significant bits
+ */
+int mpi_msb( mpi *X )
+{
+    int i, j;
+
+    for( i = X->n - 1; i > 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+
+    for( j = biL - 1; j >= 0; j-- )
+        if( ( ( X->p[i] >> j ) & 1 ) != 0 )
+            break;
+
+    return( ( i * biL ) + j + 1 );
+}
+
+/*
+ * Return the total size in bytes
+ */
+int mpi_size( mpi *X )
+{
+    return( ( mpi_msb( X ) + 7 ) >> 3 );
+}
+
+/*
+ * Convert an ASCII character to digit value
+ */
+static int mpi_get_digit( t_int *d, int radix, char c )
+{
+    *d = 255;
+
+    if( c >= 0x30 && c <= 0x39 ) *d = c - 0x30;
+    if( c >= 0x41 && c <= 0x46 ) *d = c - 0x37;
+    if( c >= 0x61 && c <= 0x66 ) *d = c - 0x57;
+
+    if( *d >= (t_int) radix )
+        return( POLARSSL_ERR_MPI_INVALID_CHARACTER );
+
+    return( 0 );
+}
+
+/*
+ * Import from an ASCII string
+ */
+int mpi_read_string( mpi *X, int radix, char *s )
+{
+    int ret, i, j, n;
+    t_int d;
+    mpi T;
+
+    if( radix < 2 || radix > 16 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    mpi_init( &T, NULL );
+
+    if( radix == 16 )
+    {
+        n = BITS_TO_LIMBS( strlen( s ) << 2 );
+
+        MPI_CHK( mpi_grow( X, n ) );
+        MPI_CHK( mpi_lset( X, 0 ) );
+
+        for( i = strlen( s ) - 1, j = 0; i >= 0; i--, j++ )
+        {
+            if( i == 0 && s[i] == '-' )
+            {
+                X->s = -1;
+                break;
+            }
+
+            MPI_CHK( mpi_get_digit( &d, radix, s[i] ) );
+            X->p[j / (2 * ciL)] |= d << ( (j % (2 * ciL)) << 2 );
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_lset( X, 0 ) );
+
+        for( i = 0; i < (int) strlen( s ); i++ )
+        {
+            if( i == 0 && s[i] == '-' )
+            {
+                X->s = -1;
+                continue;
+            }
+
+            MPI_CHK( mpi_get_digit( &d, radix, s[i] ) );
+            MPI_CHK( mpi_mul_int( &T, X, radix ) );
+            MPI_CHK( mpi_add_int( X, &T, d ) );
+        }
+    }
+
+cleanup:
+
+    mpi_free( &T, NULL );
+
+    return( ret );
+}
+
+/*
+ * Helper to write the digits high-order first
+ */
+static int mpi_write_hlp( mpi *X, int radix, char **p )
+{
+    int ret;
+    t_int r;
+
+    if( radix < 2 || radix > 16 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    MPI_CHK( mpi_mod_int( &r, X, radix ) );
+    MPI_CHK( mpi_div_int( X, NULL, X, radix ) );
+
+    if( mpi_cmp_int( X, 0 ) != 0 )
+        MPI_CHK( mpi_write_hlp( X, radix, p ) );
+
+    if( r < 10 )
+        *(*p)++ = (char)( r + 0x30 );
+    else
+        *(*p)++ = (char)( r + 0x37 );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Export into an ASCII string
+ */
+int mpi_write_string( mpi *X, int radix, char *s, int *slen )
+{
+    int ret = 0, n;
+    char *p;
+    mpi T;
+
+    if( radix < 2 || radix > 16 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    n = mpi_msb( X );
+    if( radix >=  4 ) n >>= 1;
+    if( radix >= 16 ) n >>= 1;
+    n += 3;
+
+    if( *slen < n )
+    {
+        *slen = n;
+        return( POLARSSL_ERR_MPI_BUFFER_TOO_SMALL );
+    }
+
+    p = s;
+    mpi_init( &T, NULL );
+
+    if( X->s == -1 )
+        *p++ = '-';
+
+    if( radix == 16 )
+    {
+        int c, i, j, k;
+
+        for( i = X->n - 1, k = 0; i >= 0; i-- )
+        {
+            for( j = ciL - 1; j >= 0; j-- )
+            {
+                c = ( X->p[i] >> (j << 3) ) & 0xFF;
+
+                if( c == 0 && k == 0 && (i + j) != 0 )
+                    continue;
+
+                p += sprintf( p, "%02X", c );
+                k = 1;
+            }
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_copy( &T, X ) );
+        MPI_CHK( mpi_write_hlp( &T, radix, &p ) );
+    }
+
+    *p++ = '\0';
+    *slen = p - s;
+
+cleanup:
+
+    mpi_free( &T, NULL );
+
+    return( ret );
+}
+
+/*
+ * Read X from an opened file
+ */
+int mpi_read_file( mpi *X, int radix, FILE *fin )
+{
+    t_int d;
+    int slen;
+    char *p;
+    char s[1024];
+
+    memset( s, 0, sizeof( s ) );
+    if( fgets( s, sizeof( s ) - 1, fin ) == NULL )
+        return( POLARSSL_ERR_MPI_FILE_IO_ERROR );
+
+    slen = strlen( s );
+    if( s[slen - 1] == '\n' ) { slen--; s[slen] = '\0'; }
+    if( s[slen - 1] == '\r' ) { slen--; s[slen] = '\0'; }
+
+    p = s + slen;
+    while( --p >= s )
+        if( mpi_get_digit( &d, radix, *p ) != 0 )
+            break;
+
+    return( mpi_read_string( X, radix, p + 1 ) );
+}
+
+/*
+ * Write X into an opened file (or stdout if fout == NULL)
+ */
+int mpi_write_file( char *p, mpi *X, int radix, FILE *fout )
+{
+    int n, ret;
+    size_t slen;
+    size_t plen;
+    char s[1024];
+
+    n = sizeof( s );
+    memset( s, 0, n );
+    n -= 2;
+
+    MPI_CHK( mpi_write_string( X, radix, s, (int *) &n ) );
+
+    if( p == NULL ) p = "";
+
+    plen = strlen( p );
+    slen = strlen( s );
+    s[slen++] = '\r';
+    s[slen++] = '\n';
+
+    if( fout != NULL )
+    {
+        if( fwrite( p, 1, plen, fout ) != plen ||
+            fwrite( s, 1, slen, fout ) != slen )
+            return( POLARSSL_ERR_MPI_FILE_IO_ERROR );
+    }
+    else
+        printf( "%s%s", p, s );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Import X from unsigned binary data, big endian
+ */
+int mpi_read_binary( mpi *X, unsigned char *buf, int buflen )
+{
+    int ret, i, j, n;
+
+    for( n = 0; n < buflen; n++ )
+        if( buf[n] != 0 )
+            break;
+
+    MPI_CHK( mpi_grow( X, CHARS_TO_LIMBS( buflen - n ) ) );
+    MPI_CHK( mpi_lset( X, 0 ) );
+
+    for( i = buflen - 1, j = 0; i >= n; i--, j++ )
+        X->p[j / ciL] |= ((t_int) buf[i]) << ((j % ciL) << 3);
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Export X into unsigned binary data, big endian
+ */
+int mpi_write_binary( mpi *X, unsigned char *buf, int buflen )
+{
+    int i, j, n;
+
+    n = mpi_size( X );
+
+    if( buflen < n )
+        return( POLARSSL_ERR_MPI_BUFFER_TOO_SMALL );
+
+    memset( buf, 0, buflen );
+
+    for( i = buflen - 1, j = 0; n > 0; i--, j++, n-- )
+        buf[i] = (unsigned char)( X->p[j / ciL] >> ((j % ciL) << 3) );
+
+    return( 0 );
+}
+
+/*
+ * Left-shift: X <<= count
+ */
+int mpi_shift_l( mpi *X, int count )
+{
+    int ret, i, v0, t1;
+    t_int r0 = 0, r1;
+
+    v0 = count / (biL    );
+    t1 = count & (biL - 1);
+
+    i = mpi_msb( X ) + count;
+
+    if( X->n * (int) biL < i )
+        MPI_CHK( mpi_grow( X, BITS_TO_LIMBS( i ) ) );
+
+    ret = 0;
+
+    /*
+     * shift by count / limb_size
+     */
+    if( v0 > 0 )
+    {
+        for( i = X->n - 1; i >= v0; i-- )
+            X->p[i] = X->p[i - v0];
+
+        for( ; i >= 0; i-- )
+            X->p[i] = 0;
+    }
+
+    /*
+     * shift by count % limb_size
+     */
+    if( t1 > 0 )
+    {
+        for( i = v0; i < X->n; i++ )
+        {
+            r1 = X->p[i] >> (biL - t1);
+            X->p[i] <<= t1;
+            X->p[i] |= r0;
+            r0 = r1;
+        }
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Right-shift: X >>= count
+ */
+int mpi_shift_r( mpi *X, int count )
+{
+    int i, v0, v1;
+    t_int r0 = 0, r1;
+
+    v0 = count /  biL;
+    v1 = count & (biL - 1);
+
+    /*
+     * shift by count / limb_size
+     */
+    if( v0 > 0 )
+    {
+        for( i = 0; i < X->n - v0; i++ )
+            X->p[i] = X->p[i + v0];
+
+        for( ; i < X->n; i++ )
+            X->p[i] = 0;
+    }
+
+    /*
+     * shift by count % limb_size
+     */
+    if( v1 > 0 )
+    {
+        for( i = X->n - 1; i >= 0; i-- )
+        {
+            r1 = X->p[i] << (biL - v1);
+            X->p[i] >>= v1;
+            X->p[i] |= r0;
+            r0 = r1;
+        }
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare unsigned values
+ */
+int mpi_cmp_abs( mpi *X, mpi *Y )
+{
+    int i, j;
+
+    for( i = X->n - 1; i >= 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+
+    for( j = Y->n - 1; j >= 0; j-- )
+        if( Y->p[j] != 0 )
+            break;
+
+    if( i < 0 && j < 0 )
+        return( 0 );
+
+    if( i > j ) return(  1 );
+    if( j > i ) return( -1 );
+
+    for( ; i >= 0; i-- )
+    {
+        if( X->p[i] > Y->p[i] ) return(  1 );
+        if( X->p[i] < Y->p[i] ) return( -1 );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare signed values
+ */
+int mpi_cmp_mpi( mpi *X, mpi *Y )
+{
+    int i, j;
+
+    for( i = X->n - 1; i >= 0; i-- )
+        if( X->p[i] != 0 )
+            break;
+
+    for( j = Y->n - 1; j >= 0; j-- )
+        if( Y->p[j] != 0 )
+            break;
+
+    if( i < 0 && j < 0 )
+        return( 0 );
+
+    if( i > j ) return(  X->s );
+    if( j > i ) return( -X->s );
+
+    if( X->s > 0 && Y->s < 0 ) return(  1 );
+    if( Y->s > 0 && X->s < 0 ) return( -1 );
+
+    for( ; i >= 0; i-- )
+    {
+        if( X->p[i] > Y->p[i] ) return(  X->s );
+        if( X->p[i] < Y->p[i] ) return( -X->s );
+    }
+
+    return( 0 );
+}
+
+/*
+ * Compare signed values
+ */
+int mpi_cmp_int( mpi *X, int z )
+{
+    mpi Y;
+    t_int p[1];
+
+    *p  = ( z < 0 ) ? -z : z;
+    Y.s = ( z < 0 ) ? -1 : 1;
+    Y.n = 1;
+    Y.p = p;
+
+    return( mpi_cmp_mpi( X, &Y ) );
+}
+
+/*
+ * Unsigned addition: X = |A| + |B|  (HAC 14.7)
+ */
+int mpi_add_abs( mpi *X, mpi *A, mpi *B )
+{
+    int ret, i, j;
+    t_int *o, *p, c;
+
+    if( X == B )
+    {
+        mpi *T = A; A = X; B = T;
+    }
+
+    if( X != A )
+        MPI_CHK( mpi_copy( X, A ) );
+
+    for( j = B->n - 1; j >= 0; j-- )
+        if( B->p[j] != 0 )
+            break;
+
+    MPI_CHK( mpi_grow( X, j + 1 ) );
+
+    o = B->p; p = X->p; c = 0;
+
+    for( i = 0; i <= j; i++, o++, p++ )
+    {
+        *p +=  c; c  = ( *p <  c );
+        *p += *o; c += ( *p < *o );
+    }
+
+    while( c != 0 )
+    {
+        if( i >= X->n )
+        {
+            MPI_CHK( mpi_grow( X, i + 1 ) );
+            p = X->p + i;
+        }
+
+        *p += c; c = ( *p < c ); i++;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Helper for mpi substraction
+ */
+static void mpi_sub_hlp( int n, t_int *s, t_int *d )
+{
+    int i;
+    t_int c, z;
+
+    for( i = c = 0; i < n; i++, s++, d++ )
+    {
+        z = ( *d <  c );     *d -=  c;
+        c = ( *d < *s ) + z; *d -= *s;
+    }
+
+    while( c != 0 )
+    {
+        z = ( *d < c ); *d -= c;
+        c = z; i++; d++;
+    }
+}
+
+/*
+ * Unsigned substraction: X = |A| - |B|  (HAC 14.9)
+ */
+int mpi_sub_abs( mpi *X, mpi *A, mpi *B )
+{
+    mpi TB;
+    int ret, n;
+
+    if( mpi_cmp_abs( A, B ) < 0 )
+        return( POLARSSL_ERR_MPI_NEGATIVE_VALUE );
+
+    mpi_init( &TB, NULL );
+
+    if( X == B )
+    {
+        MPI_CHK( mpi_copy( &TB, B ) );
+        B = &TB;
+    }
+
+    if( X != A )
+        MPI_CHK( mpi_copy( X, A ) );
+
+    ret = 0;
+
+    for( n = B->n - 1; n >= 0; n-- )
+        if( B->p[n] != 0 )
+            break;
+
+    mpi_sub_hlp( n + 1, B->p, X->p );
+
+cleanup:
+
+    mpi_free( &TB, NULL );
+
+    return( ret );
+}
+
+/*
+ * Signed addition: X = A + B
+ */
+int mpi_add_mpi( mpi *X, mpi *A, mpi *B )
+{
+    int ret, s = A->s;
+
+    if( A->s * B->s < 0 )
+    {
+        if( mpi_cmp_abs( A, B ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_abs( X, A, B ) );
+            X->s =  s;
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_abs( X, B, A ) );
+            X->s = -s;
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_add_abs( X, A, B ) );
+        X->s = s;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Signed substraction: X = A - B
+ */
+int mpi_sub_mpi( mpi *X, mpi *A, mpi *B )
+{
+    int ret, s = A->s;
+
+    if( A->s * B->s > 0 )
+    {
+        if( mpi_cmp_abs( A, B ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_abs( X, A, B ) );
+            X->s =  s;
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_abs( X, B, A ) );
+            X->s = -s;
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_add_abs( X, A, B ) );
+        X->s = s;
+    }
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Signed addition: X = A + b
+ */
+int mpi_add_int( mpi *X, mpi *A, int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mpi_add_mpi( X, A, &_B ) );
+}
+
+/*
+ * Signed substraction: X = A - b
+ */
+int mpi_sub_int( mpi *X, mpi *A, int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mpi_sub_mpi( X, A, &_B ) );
+}
+
+/*
+ * Helper for mpi multiplication
+ */ 
+static void mpi_mul_hlp( int i, t_int *s, t_int *d, t_int b )
+{
+    t_int c = 0, t = 0;
+
+#if defined(MULADDC_HUIT)
+    for( ; i >= 8; i -= 8 )
+    {
+        MULADDC_INIT
+        MULADDC_HUIT
+        MULADDC_STOP
+    }
+
+    for( ; i > 0; i-- )
+    {
+        MULADDC_INIT
+        MULADDC_CORE
+        MULADDC_STOP
+    }
+#else
+    for( ; i >= 16; i -= 16 )
+    {
+        MULADDC_INIT
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_STOP
+    }
+
+    for( ; i >= 8; i -= 8 )
+    {
+        MULADDC_INIT
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_CORE   MULADDC_CORE
+        MULADDC_STOP
+    }
+
+    for( ; i > 0; i-- )
+    {
+        MULADDC_INIT
+        MULADDC_CORE
+        MULADDC_STOP
+    }
+#endif
+
+    t++;
+
+    do {
+        *d += c; c = ( *d < c ); d++;
+    }
+    while( c != 0 );
+}
+
+/*
+ * Baseline multiplication: X = A * B  (HAC 14.12)
+ */
+int mpi_mul_mpi( mpi *X, mpi *A, mpi *B )
+{
+    int ret, i, j;
+    mpi TA, TB;
+
+    mpi_init( &TA, &TB, NULL );
+
+    if( X == A ) { MPI_CHK( mpi_copy( &TA, A ) ); A = &TA; }
+    if( X == B ) { MPI_CHK( mpi_copy( &TB, B ) ); B = &TB; }
+
+    for( i = A->n - 1; i >= 0; i-- )
+        if( A->p[i] != 0 )
+            break;
+
+    for( j = B->n - 1; j >= 0; j-- )
+        if( B->p[j] != 0 )
+            break;
+
+    MPI_CHK( mpi_grow( X, i + j + 2 ) );
+    MPI_CHK( mpi_lset( X, 0 ) );
+
+    for( i++; j >= 0; j-- )
+        mpi_mul_hlp( i, A->p, X->p + j, B->p[j] );
+
+    X->s = A->s * B->s;
+
+cleanup:
+
+    mpi_free( &TB, &TA, NULL );
+
+    return( ret );
+}
+
+/*
+ * Baseline multiplication: X = A * b
+ */
+int mpi_mul_int( mpi *X, mpi *A, t_int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    _B.s = 1;
+    _B.n = 1;
+    _B.p = p;
+    p[0] = b;
+
+    return( mpi_mul_mpi( X, A, &_B ) );
+}
+
+/*
+ * Division by mpi: A = Q * B + R  (HAC 14.20)
+ */
+int mpi_div_mpi( mpi *Q, mpi *R, mpi *A, mpi *B )
+{
+    int ret, i, n, t, k;
+    mpi X, Y, Z, T1, T2;
+
+    if( mpi_cmp_int( B, 0 ) == 0 )
+        return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
+
+    mpi_init( &X, &Y, &Z, &T1, &T2, NULL );
+
+    if( mpi_cmp_abs( A, B ) < 0 )
+    {
+        if( Q != NULL ) MPI_CHK( mpi_lset( Q, 0 ) );
+        if( R != NULL ) MPI_CHK( mpi_copy( R, A ) );
+        return( 0 );
+    }
+
+    MPI_CHK( mpi_copy( &X, A ) );
+    MPI_CHK( mpi_copy( &Y, B ) );
+    X.s = Y.s = 1;
+
+    MPI_CHK( mpi_grow( &Z, A->n + 2 ) );
+    MPI_CHK( mpi_lset( &Z,  0 ) );
+    MPI_CHK( mpi_grow( &T1, 2 ) );
+    MPI_CHK( mpi_grow( &T2, 3 ) );
+
+    k = mpi_msb( &Y ) % biL;
+    if( k < (int) biL - 1 )
+    {
+        k = biL - 1 - k;
+        MPI_CHK( mpi_shift_l( &X, k ) );
+        MPI_CHK( mpi_shift_l( &Y, k ) );
+    }
+    else k = 0;
+
+    n = X.n - 1;
+    t = Y.n - 1;
+    mpi_shift_l( &Y, biL * (n - t) );
+
+    while( mpi_cmp_mpi( &X, &Y ) >= 0 )
+    {
+        Z.p[n - t]++;
+        mpi_sub_mpi( &X, &X, &Y );
+    }
+    mpi_shift_r( &Y, biL * (n - t) );
+
+    for( i = n; i > t ; i-- )
+    {
+        if( X.p[i] >= Y.p[t] )
+            Z.p[i - t - 1] = ~0;
+        else
+        {
+#if defined(POLARSSL_HAVE_LONGLONG)
+            t_dbl r;
+
+            r  = (t_dbl) X.p[i] << biL;
+            r |= (t_dbl) X.p[i - 1];
+            r /= Y.p[t];
+            if( r > ((t_dbl) 1 << biL) - 1)
+                r = ((t_dbl) 1 << biL) - 1;
+
+            Z.p[i - t - 1] = (t_int) r;
+#else
+            /*
+             * __udiv_qrnnd_c, from gmp/longlong.h
+             */
+            t_int q0, q1, r0, r1;
+            t_int d0, d1, d, m;
+
+            d  = Y.p[t];
+            d0 = ( d << biH ) >> biH;
+            d1 = ( d >> biH );
+
+            q1 = X.p[i] / d1;
+            r1 = X.p[i] - d1 * q1;
+            r1 <<= biH;
+            r1 |= ( X.p[i - 1] >> biH );
+
+            m = q1 * d0;
+            if( r1 < m )
+            {
+                q1--, r1 += d;
+                while( r1 >= d && r1 < m )
+                    q1--, r1 += d;
+            }
+            r1 -= m;
+
+            q0 = r1 / d1;
+            r0 = r1 - d1 * q0;
+            r0 <<= biH;
+            r0 |= ( X.p[i - 1] << biH ) >> biH;
+
+            m = q0 * d0;
+            if( r0 < m )
+            {
+                q0--, r0 += d;
+                while( r0 >= d && r0 < m )
+                    q0--, r0 += d;
+            }
+            r0 -= m;
+
+            Z.p[i - t - 1] = ( q1 << biH ) | q0;
+#endif
+        }
+
+        Z.p[i - t - 1]++;
+        do
+        {
+            Z.p[i - t - 1]--;
+
+            MPI_CHK( mpi_lset( &T1, 0 ) );
+            T1.p[0] = (t < 1) ? 0 : Y.p[t - 1];
+            T1.p[1] = Y.p[t];
+            MPI_CHK( mpi_mul_int( &T1, &T1, Z.p[i - t - 1] ) );
+
+            MPI_CHK( mpi_lset( &T2, 0 ) );
+            T2.p[0] = (i < 2) ? 0 : X.p[i - 2];
+            T2.p[1] = (i < 1) ? 0 : X.p[i - 1];
+            T2.p[2] = X.p[i];
+        }
+        while( mpi_cmp_mpi( &T1, &T2 ) > 0 );
+
+        MPI_CHK( mpi_mul_int( &T1, &Y, Z.p[i - t - 1] ) );
+        MPI_CHK( mpi_shift_l( &T1,  biL * (i - t - 1) ) );
+        MPI_CHK( mpi_sub_mpi( &X, &X, &T1 ) );
+
+        if( mpi_cmp_int( &X, 0 ) < 0 )
+        {
+            MPI_CHK( mpi_copy( &T1, &Y ) );
+            MPI_CHK( mpi_shift_l( &T1, biL * (i - t - 1) ) );
+            MPI_CHK( mpi_add_mpi( &X, &X, &T1 ) );
+            Z.p[i - t - 1]--;
+        }
+    }
+
+    if( Q != NULL )
+    {
+        mpi_copy( Q, &Z );
+        Q->s = A->s * B->s;
+    }
+
+    if( R != NULL )
+    {
+        mpi_shift_r( &X, k );
+        mpi_copy( R, &X );
+
+        R->s = A->s;
+        if( mpi_cmp_int( R, 0 ) == 0 )
+            R->s = 1;
+    }
+
+cleanup:
+
+    mpi_free( &X, &Y, &Z, &T1, &T2, NULL );
+
+    return( ret );
+}
+
+/*
+ * Division by int: A = Q * b + R
+ *
+ * Returns 0 if successful
+ *         1 if memory allocation failed
+ *         POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0
+ */
+int mpi_div_int( mpi *Q, mpi *R, mpi *A, int b )
+{
+    mpi _B;
+    t_int p[1];
+
+    p[0] = ( b < 0 ) ? -b : b;
+    _B.s = ( b < 0 ) ? -1 : 1;
+    _B.n = 1;
+    _B.p = p;
+
+    return( mpi_div_mpi( Q, R, A, &_B ) );
+}
+
+/*
+ * Modulo: R = A mod B
+ */
+int mpi_mod_mpi( mpi *R, mpi *A, mpi *B )
+{
+    int ret;
+
+    MPI_CHK( mpi_div_mpi( NULL, R, A, B ) );
+
+    while( mpi_cmp_int( R, 0 ) < 0 )
+      MPI_CHK( mpi_add_mpi( R, R, B ) );
+
+    while( mpi_cmp_mpi( R, B ) >= 0 )
+      MPI_CHK( mpi_sub_mpi( R, R, B ) );
+
+cleanup:
+
+    return( ret );
+}
+
+/*
+ * Modulo: r = A mod b
+ */
+int mpi_mod_int( t_int *r, mpi *A, int b )
+{
+    int i;
+    t_int x, y, z;
+
+    if( b == 0 )
+        return( POLARSSL_ERR_MPI_DIVISION_BY_ZERO );
+
+    if( b < 0 )
+        b = -b;
+
+    /*
+     * handle trivial cases
+     */
+    if( b == 1 )
+    {
+        *r = 0;
+        return( 0 );
+    }
+
+    if( b == 2 )
+    {
+        *r = A->p[0] & 1;
+        return( 0 );
+    }
+
+    /*
+     * general case
+     */
+    for( i = A->n - 1, y = 0; i >= 0; i-- )
+    {
+        x  = A->p[i];
+        y  = ( y << biH ) | ( x >> biH );
+        z  = y / b;
+        y -= z * b;
+
+        x <<= biH;
+        y  = ( y << biH ) | ( x >> biH );
+        z  = y / b;
+        y -= z * b;
+    }
+
+    *r = y;
+
+    return( 0 );
+}
+
+/*
+ * Fast Montgomery initialization (thanks to Tom St Denis)
+ */
+static void mpi_montg_init( t_int *mm, mpi *N )
+{
+    t_int x, m0 = N->p[0];
+
+    x  = m0;
+    x += ( ( m0 + 2 ) & 4 ) << 1;
+    x *= ( 2 - ( m0 * x ) );
+
+    if( biL >= 16 ) x *= ( 2 - ( m0 * x ) );
+    if( biL >= 32 ) x *= ( 2 - ( m0 * x ) );
+    if( biL >= 64 ) x *= ( 2 - ( m0 * x ) );
+
+    *mm = ~x + 1;
+}
+
+/*
+ * Montgomery multiplication: A = A * B * R^-1 mod N  (HAC 14.36)
+ */
+static void mpi_montmul( mpi *A, mpi *B, mpi *N, t_int mm, mpi *T )
+{
+    int i, n, m;
+    t_int u0, u1, *d;
+
+    memset( T->p, 0, T->n * ciL );
+
+    d = T->p;
+    n = N->n;
+    m = ( B->n < n ) ? B->n : n;
+
+    for( i = 0; i < n; i++ )
+    {
+        /*
+         * T = (T + u0*B + u1*N) / 2^biL
+         */
+        u0 = A->p[i];
+        u1 = ( d[0] + u0 * B->p[0] ) * mm;
+
+        mpi_mul_hlp( m, B->p, d, u0 );
+        mpi_mul_hlp( n, N->p, d, u1 );
+
+        *d++ = u0; d[n + 1] = 0;
+    }
+
+    memcpy( A->p, d, (n + 1) * ciL );
+
+    if( mpi_cmp_abs( A, N ) >= 0 )
+        mpi_sub_hlp( n, N->p, A->p );
+    else
+        /* prevent timing attacks */
+        mpi_sub_hlp( n, A->p, T->p );
+}
+
+/*
+ * Montgomery reduction: A = A * R^-1 mod N
+ */
+static void mpi_montred( mpi *A, mpi *N, t_int mm, mpi *T )
+{
+    t_int z = 1;
+    mpi U;
+
+    U.n = U.s = z;
+    U.p = &z;
+
+    mpi_montmul( A, &U, N, mm, T );
+}
+
+/*
+ * Sliding-window exponentiation: X = A^E mod N  (HAC 14.85)
+ */
+int mpi_exp_mod( mpi *X, mpi *A, mpi *E, mpi *N, mpi *_RR )
+{
+    int ret, i, j, wsize, wbits;
+    int bufsize, nblimbs, nbits;
+    t_int ei, mm, state;
+    mpi RR, T, W[64];
+
+    if( mpi_cmp_int( N, 0 ) < 0 || ( N->p[0] & 1 ) == 0 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    /*
+     * Init temps and window size
+     */
+    mpi_montg_init( &mm, N );
+    mpi_init( &RR, &T, NULL );
+    memset( W, 0, sizeof( W ) );
+
+    i = mpi_msb( E );
+
+    wsize = ( i > 671 ) ? 6 : ( i > 239 ) ? 5 :
+            ( i >  79 ) ? 4 : ( i >  23 ) ? 3 : 1;
+
+    j = N->n + 1;
+    MPI_CHK( mpi_grow( X, j ) );
+    MPI_CHK( mpi_grow( &W[1],  j ) );
+    MPI_CHK( mpi_grow( &T, j * 2 ) );
+
+    /*
+     * If 1st call, pre-compute R^2 mod N
+     */
+    if( _RR == NULL || _RR->p == NULL )
+    {
+        MPI_CHK( mpi_lset( &RR, 1 ) );
+        MPI_CHK( mpi_shift_l( &RR, N->n * 2 * biL ) );
+        MPI_CHK( mpi_mod_mpi( &RR, &RR, N ) );
+
+        if( _RR != NULL )
+            memcpy( _RR, &RR, sizeof( mpi ) );
+    }
+    else
+        memcpy( &RR, _RR, sizeof( mpi ) );
+
+    /*
+     * W[1] = A * R^2 * R^-1 mod N = A * R mod N
+     */
+    if( mpi_cmp_mpi( A, N ) >= 0 )
+        mpi_mod_mpi( &W[1], A, N );
+    else   mpi_copy( &W[1], A );
+
+    mpi_montmul( &W[1], &RR, N, mm, &T );
+
+    /*
+     * X = R^2 * R^-1 mod N = R mod N
+     */
+    MPI_CHK( mpi_copy( X, &RR ) );
+    mpi_montred( X, N, mm, &T );
+
+    if( wsize > 1 )
+    {
+        /*
+         * W[1 << (wsize - 1)] = W[1] ^ (wsize - 1)
+         */
+        j =  1 << (wsize - 1);
+
+        MPI_CHK( mpi_grow( &W[j], N->n + 1 ) );
+        MPI_CHK( mpi_copy( &W[j], &W[1]    ) );
+
+        for( i = 0; i < wsize - 1; i++ )
+            mpi_montmul( &W[j], &W[j], N, mm, &T );
+    
+        /*
+         * W[i] = W[i - 1] * W[1]
+         */
+        for( i = j + 1; i < (1 << wsize); i++ )
+        {
+            MPI_CHK( mpi_grow( &W[i], N->n + 1 ) );
+            MPI_CHK( mpi_copy( &W[i], &W[i - 1] ) );
+
+            mpi_montmul( &W[i], &W[1], N, mm, &T );
+        }
+    }
+
+    nblimbs = E->n;
+    bufsize = 0;
+    nbits   = 0;
+    wbits   = 0;
+    state   = 0;
+
+    while( 1 )
+    {
+        if( bufsize == 0 )
+        {
+            if( nblimbs-- == 0 )
+                break;
+
+            bufsize = sizeof( t_int ) << 3;
+        }
+
+        bufsize--;
+
+        ei = (E->p[nblimbs] >> bufsize) & 1;
+
+        /*
+         * skip leading 0s
+         */
+        if( ei == 0 && state == 0 )
+            continue;
+
+        if( ei == 0 && state == 1 )
+        {
+            /*
+             * out of window, square X
+             */
+            mpi_montmul( X, X, N, mm, &T );
+            continue;
+        }
+
+        /*
+         * add ei to current window
+         */
+        state = 2;
+
+        nbits++;
+        wbits |= (ei << (wsize - nbits));
+
+        if( nbits == wsize )
+        {
+            /*
+             * X = X^wsize R^-1 mod N
+             */
+            for( i = 0; i < wsize; i++ )
+                mpi_montmul( X, X, N, mm, &T );
+
+            /*
+             * X = X * W[wbits] R^-1 mod N
+             */
+            mpi_montmul( X, &W[wbits], N, mm, &T );
+
+            state--;
+            nbits = 0;
+            wbits = 0;
+        }
+    }
+
+    /*
+     * process the remaining bits
+     */
+    for( i = 0; i < nbits; i++ )
+    {
+        mpi_montmul( X, X, N, mm, &T );
+
+        wbits <<= 1;
+
+        if( (wbits & (1 << wsize)) != 0 )
+            mpi_montmul( X, &W[1], N, mm, &T );
+    }
+
+    /*
+     * X = A^E * R * R^-1 mod N = A^E mod N
+     */
+    mpi_montred( X, N, mm, &T );
+
+cleanup:
+
+    for( i = (1 << (wsize - 1)); i < (1 << wsize); i++ )
+        mpi_free( &W[i], NULL );
+
+    if( _RR != NULL )
+         mpi_free( &W[1], &T, NULL );
+    else mpi_free( &W[1], &T, &RR, NULL );
+
+    return( ret );
+}
+
+/*
+ * Greatest common divisor: G = gcd(A, B)  (HAC 14.54)
+ */
+int mpi_gcd( mpi *G, mpi *A, mpi *B )
+{
+    int ret, lz, lzt;
+    mpi TG, TA, TB;
+
+    mpi_init( &TG, &TA, &TB, NULL );
+
+    MPI_CHK( mpi_copy( &TA, A ) );
+    MPI_CHK( mpi_copy( &TB, B ) );
+
+    lz = mpi_lsb( &TA );
+    lzt = mpi_lsb( &TB );
+
+    if ( lzt < lz )
+        lz = lzt;
+
+    MPI_CHK( mpi_shift_r( &TA, lz ) );
+    MPI_CHK( mpi_shift_r( &TB, lz ) );
+
+    TA.s = TB.s = 1;
+
+    while( mpi_cmp_int( &TA, 0 ) != 0 )
+    {
+        MPI_CHK( mpi_shift_r( &TA, mpi_lsb( &TA ) ) );
+        MPI_CHK( mpi_shift_r( &TB, mpi_lsb( &TB ) ) );
+
+        if( mpi_cmp_mpi( &TA, &TB ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_abs( &TA, &TA, &TB ) );
+            MPI_CHK( mpi_shift_r( &TA, 1 ) );
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_abs( &TB, &TB, &TA ) );
+            MPI_CHK( mpi_shift_r( &TB, 1 ) );
+        }
+    }
+
+    MPI_CHK( mpi_shift_l( &TB, lz ) );
+    MPI_CHK( mpi_copy( G, &TB ) );
+
+cleanup:
+
+    mpi_free( &TB, &TA, &TG, NULL );
+
+    return( ret );
+}
+
+#if defined(POLARSSL_GENPRIME)
+
+/*
+ * Modular inverse: X = A^-1 mod N  (HAC 14.61 / 14.64)
+ */
+int mpi_inv_mod( mpi *X, mpi *A, mpi *N )
+{
+    int ret;
+    mpi G, TA, TU, U1, U2, TB, TV, V1, V2;
+
+    if( mpi_cmp_int( N, 0 ) <= 0 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    mpi_init( &TA, &TU, &U1, &U2, &G,
+              &TB, &TV, &V1, &V2, NULL );
+
+    MPI_CHK( mpi_gcd( &G, A, N ) );
+
+    if( mpi_cmp_int( &G, 1 ) != 0 )
+    {
+        ret = POLARSSL_ERR_MPI_NOT_ACCEPTABLE;
+        goto cleanup;
+    }
+
+    MPI_CHK( mpi_mod_mpi( &TA, A, N ) );
+    MPI_CHK( mpi_copy( &TU, &TA ) );
+    MPI_CHK( mpi_copy( &TB, N ) );
+    MPI_CHK( mpi_copy( &TV, N ) );
+
+    MPI_CHK( mpi_lset( &U1, 1 ) );
+    MPI_CHK( mpi_lset( &U2, 0 ) );
+    MPI_CHK( mpi_lset( &V1, 0 ) );
+    MPI_CHK( mpi_lset( &V2, 1 ) );
+
+    do
+    {
+        while( ( TU.p[0] & 1 ) == 0 )
+        {
+            MPI_CHK( mpi_shift_r( &TU, 1 ) );
+
+            if( ( U1.p[0] & 1 ) != 0 || ( U2.p[0] & 1 ) != 0 )
+            {
+                MPI_CHK( mpi_add_mpi( &U1, &U1, &TB ) );
+                MPI_CHK( mpi_sub_mpi( &U2, &U2, &TA ) );
+            }
+
+            MPI_CHK( mpi_shift_r( &U1, 1 ) );
+            MPI_CHK( mpi_shift_r( &U2, 1 ) );
+        }
+
+        while( ( TV.p[0] & 1 ) == 0 )
+        {
+            MPI_CHK( mpi_shift_r( &TV, 1 ) );
+
+            if( ( V1.p[0] & 1 ) != 0 || ( V2.p[0] & 1 ) != 0 )
+            {
+                MPI_CHK( mpi_add_mpi( &V1, &V1, &TB ) );
+                MPI_CHK( mpi_sub_mpi( &V2, &V2, &TA ) );
+            }
+
+            MPI_CHK( mpi_shift_r( &V1, 1 ) );
+            MPI_CHK( mpi_shift_r( &V2, 1 ) );
+        }
+
+        if( mpi_cmp_mpi( &TU, &TV ) >= 0 )
+        {
+            MPI_CHK( mpi_sub_mpi( &TU, &TU, &TV ) );
+            MPI_CHK( mpi_sub_mpi( &U1, &U1, &V1 ) );
+            MPI_CHK( mpi_sub_mpi( &U2, &U2, &V2 ) );
+        }
+        else
+        {
+            MPI_CHK( mpi_sub_mpi( &TV, &TV, &TU ) );
+            MPI_CHK( mpi_sub_mpi( &V1, &V1, &U1 ) );
+            MPI_CHK( mpi_sub_mpi( &V2, &V2, &U2 ) );
+        }
+    }
+    while( mpi_cmp_int( &TU, 0 ) != 0 );
+
+    while( mpi_cmp_int( &V1, 0 ) < 0 )
+        MPI_CHK( mpi_add_mpi( &V1, &V1, N ) );
+
+    while( mpi_cmp_mpi( &V1, N ) >= 0 )
+        MPI_CHK( mpi_sub_mpi( &V1, &V1, N ) );
+
+    MPI_CHK( mpi_copy( X, &V1 ) );
+
+cleanup:
+
+    mpi_free( &V2, &V1, &TV, &TB, &G,
+              &U2, &U1, &TU, &TA, NULL );
+
+    return( ret );
+}
+
+static const int small_prime[] =
+{
+        3,    5,    7,   11,   13,   17,   19,   23,
+       29,   31,   37,   41,   43,   47,   53,   59,
+       61,   67,   71,   73,   79,   83,   89,   97,
+      101,  103,  107,  109,  113,  127,  131,  137,
+      139,  149,  151,  157,  163,  167,  173,  179,
+      181,  191,  193,  197,  199,  211,  223,  227,
+      229,  233,  239,  241,  251,  257,  263,  269,
+      271,  277,  281,  283,  293,  307,  311,  313,
+      317,  331,  337,  347,  349,  353,  359,  367,
+      373,  379,  383,  389,  397,  401,  409,  419,
+      421,  431,  433,  439,  443,  449,  457,  461,
+      463,  467,  479,  487,  491,  499,  503,  509,
+      521,  523,  541,  547,  557,  563,  569,  571,
+      577,  587,  593,  599,  601,  607,  613,  617,
+      619,  631,  641,  643,  647,  653,  659,  661,
+      673,  677,  683,  691,  701,  709,  719,  727,
+      733,  739,  743,  751,  757,  761,  769,  773,
+      787,  797,  809,  811,  821,  823,  827,  829,
+      839,  853,  857,  859,  863,  877,  881,  883,
+      887,  907,  911,  919,  929,  937,  941,  947,
+      953,  967,  971,  977,  983,  991,  997, -103
+};
+
+/*
+ * Miller-Rabin primality test  (HAC 4.24)
+ */
+int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng )
+{
+    int ret, i, j, n, s, xs;
+    mpi W, R, T, A, RR;
+    unsigned char *p;
+
+    if( mpi_cmp_int( X, 0 ) == 0 )
+        return( 0 );
+
+    mpi_init( &W, &R, &T, &A, &RR, NULL );
+
+    xs = X->s; X->s = 1;
+
+    /*
+     * test trivial factors first
+     */
+    if( ( X->p[0] & 1 ) == 0 )
+        return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
+
+    for( i = 0; small_prime[i] > 0; i++ )
+    {
+        t_int r;
+
+        if( mpi_cmp_int( X, small_prime[i] ) <= 0 )
+            return( 0 );
+
+        MPI_CHK( mpi_mod_int( &r, X, small_prime[i] ) );
+
+        if( r == 0 )
+            return( POLARSSL_ERR_MPI_NOT_ACCEPTABLE );
+    }
+
+    /*
+     * W = |X| - 1
+     * R = W >> lsb( W )
+     */
+    s = mpi_lsb( &W );
+    MPI_CHK( mpi_sub_int( &W, X, 1 ) );
+    MPI_CHK( mpi_copy( &R, &W ) );
+    MPI_CHK( mpi_shift_r( &R, s ) );
+
+    i = mpi_msb( X );
+    /*
+     * HAC, table 4.4
+     */
+    n = ( ( i >= 1300 ) ?  2 : ( i >=  850 ) ?  3 :
+          ( i >=  650 ) ?  4 : ( i >=  350 ) ?  8 :
+          ( i >=  250 ) ? 12 : ( i >=  150 ) ? 18 : 27 );
+
+    for( i = 0; i < n; i++ )
+    {
+        /*
+         * pick a random A, 1 < A < |X| - 1
+         */
+        MPI_CHK( mpi_grow( &A, X->n ) );
+
+        p = (unsigned char *) A.p;
+        for( j = 0; j < A.n * ciL; j++ )
+            *p++ = (unsigned char) f_rng( p_rng );
+
+        j = mpi_msb( &A ) - mpi_msb( &W );
+        MPI_CHK( mpi_shift_r( &A, j + 1 ) );
+        A.p[0] |= 3;
+
+        /*
+         * A = A^R mod |X|
+         */
+        MPI_CHK( mpi_exp_mod( &A, &A, &R, X, &RR ) );
+
+        if( mpi_cmp_mpi( &A, &W ) == 0 ||
+            mpi_cmp_int( &A,  1 ) == 0 )
+            continue;
+
+        j = 1;
+        while( j < s && mpi_cmp_mpi( &A, &W ) != 0 )
+        {
+            /*
+             * A = A * A mod |X|
+             */
+            MPI_CHK( mpi_mul_mpi( &T, &A, &A ) );
+            MPI_CHK( mpi_mod_mpi( &A, &T, X  ) );
+
+            if( mpi_cmp_int( &A, 1 ) == 0 )
+                break;
+
+            j++;
+        }
+
+        /*
+         * not prime if A != |X| - 1 or A == 1
+         */
+        if( mpi_cmp_mpi( &A, &W ) != 0 ||
+            mpi_cmp_int( &A,  1 ) == 0 )
+        {
+            ret = POLARSSL_ERR_MPI_NOT_ACCEPTABLE;
+            break;
+        }
+    }
+
+cleanup:
+
+    X->s = xs;
+
+    mpi_free( &RR, &A, &T, &R, &W, NULL );
+
+    return( ret );
+}
+
+/*
+ * Prime number generation
+ */
+int mpi_gen_prime( mpi *X, int nbits, int dh_flag,
+                   int (*f_rng)(void *), void *p_rng )
+{
+    int ret, k, n;
+    unsigned char *p;
+    mpi Y;
+
+    if( nbits < 3 )
+        return( POLARSSL_ERR_MPI_BAD_INPUT_DATA );
+
+    mpi_init( &Y, NULL );
+
+    n = BITS_TO_LIMBS( nbits );
+
+    MPI_CHK( mpi_grow( X, n ) );
+    MPI_CHK( mpi_lset( X, 0 ) );
+
+    p = (unsigned char *) X->p;
+    for( k = 0; k < X->n * ciL; k++ )
+        *p++ = (unsigned char) f_rng( p_rng );
+
+    k = mpi_msb( X );
+    if( k < nbits ) MPI_CHK( mpi_shift_l( X, nbits - k ) );
+    if( k > nbits ) MPI_CHK( mpi_shift_r( X, k - nbits ) );
+
+    X->p[0] |= 3;
+
+    if( dh_flag == 0 )
+    {
+        while( ( ret = mpi_is_prime( X, f_rng, p_rng ) ) != 0 )
+        {
+            if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
+                goto cleanup;
+
+            MPI_CHK( mpi_add_int( X, X, 2 ) );
+        }
+    }
+    else
+    {
+        MPI_CHK( mpi_sub_int( &Y, X, 1 ) );
+        MPI_CHK( mpi_shift_r( &Y, 1 ) );
+
+        while( 1 )
+        {
+            if( ( ret = mpi_is_prime( X, f_rng, p_rng ) ) == 0 )
+            {
+                if( ( ret = mpi_is_prime( &Y, f_rng, p_rng ) ) == 0 )
+                    break;
+
+                if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
+                    goto cleanup;
+            }
+
+            if( ret != POLARSSL_ERR_MPI_NOT_ACCEPTABLE )
+                goto cleanup;
+
+            MPI_CHK( mpi_add_int( &Y, X, 1 ) );
+            MPI_CHK( mpi_add_int(  X, X, 2 ) );
+            MPI_CHK( mpi_shift_r( &Y, 1 ) );
+        }
+    }
+
+cleanup:
+
+    mpi_free( &Y, NULL );
+
+    return( ret );
+}
+
+#endif
+
+#if defined(POLARSSL_SELF_TEST)
+
+#define GCD_PAIR_COUNT	3
+
+static const int gcd_pairs[GCD_PAIR_COUNT][3] =
+{
+    { 693, 609, 21 },
+    { 1764, 868, 28 },
+    { 768454923, 542167814, 1 }
+};
+
+/*
+ * Checkup routine
+ */
+int mpi_self_test( int verbose )
+{
+    int ret, i;
+    mpi A, E, N, X, Y, U, V;
+
+    mpi_init( &A, &E, &N, &X, &Y, &U, &V, NULL );
+
+    MPI_CHK( mpi_read_string( &A, 16,
+        "EFE021C2645FD1DC586E69184AF4A31E" \
+        "D5F53E93B5F123FA41680867BA110131" \
+        "944FE7952E2517337780CB0DB80E61AA" \
+        "E7C8DDC6C5C6AADEB34EB38A2F40D5E6" ) );
+
+    MPI_CHK( mpi_read_string( &E, 16,
+        "B2E7EFD37075B9F03FF989C7C5051C20" \
+        "34D2A323810251127E7BF8625A4F49A5" \
+        "F3E27F4DA8BD59C47D6DAABA4C8127BD" \
+        "5B5C25763222FEFCCFC38B832366C29E" ) );
+
+    MPI_CHK( mpi_read_string( &N, 16,
+        "0066A198186C18C10B2F5ED9B522752A" \
+        "9830B69916E535C8F047518A889A43A5" \
+        "94B6BED27A168D31D4A52F88925AA8F5" ) );
+
+    MPI_CHK( mpi_mul_mpi( &X, &A, &N ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "602AB7ECA597A3D6B56FF9829A5E8B85" \
+        "9E857EA95A03512E2BAE7391688D264A" \
+        "A5663B0341DB9CCFD2C4C5F421FEC814" \
+        "8001B72E848A38CAE1C65F78E56ABDEF" \
+        "E12D3C039B8A02D6BE593F0BBBDA56F1" \
+        "ECF677152EF804370C1A305CAF3B5BF1" \
+        "30879B56C61DE584A0F53A2447A51E" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #1 (mul_mpi): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    MPI_CHK( mpi_div_mpi( &X, &Y, &A, &N ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "256567336059E52CAE22925474705F39A94" ) );
+
+    MPI_CHK( mpi_read_string( &V, 16,
+        "6613F26162223DF488E9CD48CC132C7A" \
+        "0AC93C701B001B092E4E5B9F73BCD27B" \
+        "9EE50D0657C77F374E903CDFA4C642" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #2 (div_mpi): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 ||
+        mpi_cmp_mpi( &Y, &V ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    MPI_CHK( mpi_exp_mod( &X, &A, &E, &N, NULL ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "36E139AEA55215609D2816998ED020BB" \
+        "BD96C37890F65171D948E9BC7CBAA4D9" \
+        "325D24D6A3C12710F10A09FA08AB87" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #3 (exp_mod): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    MPI_CHK( mpi_inv_mod( &X, &A, &N ) );
+
+    MPI_CHK( mpi_read_string( &U, 16,
+        "003A0AAEDD7E784FC07D8F9EC6E3BFD5" \
+        "C3DBA76456363A10869622EAC2DD84EC" \
+        "C5B8A74DAC4D09E03B5E0BE779F2DF61" ) );
+
+    if( verbose != 0 )
+        printf( "  MPI test #4 (inv_mod): " );
+
+    if( mpi_cmp_mpi( &X, &U ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+    if( verbose != 0 )
+        printf( "  MPI test #5 (simple gcd): " );
+
+    for ( i = 0; i < GCD_PAIR_COUNT; i++)
+    {
+        MPI_CHK( mpi_lset( &X, gcd_pairs[i][0] ) );
+	MPI_CHK( mpi_lset( &Y, gcd_pairs[i][1] ) );
+
+	MPI_CHK( mpi_gcd( &A, &X, &Y ) );
+
+	if( mpi_cmp_int( &A, gcd_pairs[i][2] ) != 0 )
+	{
+		if( verbose != 0 )
+			printf( "failed at %d\n", i );
+
+		return( 1 );
+	}
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n" );
+
+cleanup:
+
+    if( ret != 0 && verbose != 0 )
+        printf( "Unexpected error, return code = %08X\n", ret );
+
+    mpi_free( &V, &U, &Y, &X, &N, &E, &A, NULL );
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    return( ret );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/utils/px5g-standalone/src/library/havege.c b/trunk/package/utils/px5g-standalone/src/library/havege.c
new file mode 100644
index 00000000..266299d3
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/library/havege.c
@@ -0,0 +1,276 @@
+/*
+ *  HAVEGE: HArdware Volatile Entropy Gathering and Expansion
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  The HAVEGE RNG was designed by Andre Seznec in 2002.
+ *
+ *  http://www.irisa.fr/caps/projects/hipsor/publi.php
+ *
+ *  Contact: seznec(at)irisa_dot_fr - orocheco(at)irisa_dot_fr
+ */
+
+#include <string.h>
+#include <time.h>
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_HAVEGE_C)
+
+#include "polarssl/havege.h"
+#include "polarssl/timing.h"
+
+/* ------------------------------------------------------------------------
+ * On average, one iteration accesses two 8-word blocks in the havege WALK
+ * table, and generates 16 words in the RES array.
+ *
+ * The data read in the WALK table is updated and permuted after each use.
+ * The result of the hardware clock counter read is used  for this update.
+ *
+ * 25 conditional tests are present.  The conditional tests are grouped in
+ * two nested  groups of 12 conditional tests and 1 test that controls the
+ * permutation; on average, there should be 6 tests executed and 3 of them
+ * should be mispredicted.
+ * ------------------------------------------------------------------------
+ */
+
+#define SWAP(X,Y) { int *T = X; X = Y; Y = T; }
+
+#define TST1_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1;
+#define TST2_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1;
+
+#define TST1_LEAVE U1++; }
+#define TST2_LEAVE U2++; }
+
+#define ONE_ITERATION                                   \
+                                                        \
+    PTEST = PT1 >> 20;                                  \
+                                                        \
+    TST1_ENTER  TST1_ENTER  TST1_ENTER  TST1_ENTER      \
+    TST1_ENTER  TST1_ENTER  TST1_ENTER  TST1_ENTER      \
+    TST1_ENTER  TST1_ENTER  TST1_ENTER  TST1_ENTER      \
+                                                        \
+    TST1_LEAVE  TST1_LEAVE  TST1_LEAVE  TST1_LEAVE      \
+    TST1_LEAVE  TST1_LEAVE  TST1_LEAVE  TST1_LEAVE      \
+    TST1_LEAVE  TST1_LEAVE  TST1_LEAVE  TST1_LEAVE      \
+                                                        \
+    PTX = (PT1 >> 18) & 7;                              \
+    PT1 &= 0x1FFF;                                      \
+    PT2 &= 0x1FFF;                                      \
+    CLK = (int) hardclock();                            \
+                                                        \
+    i = 0;                                              \
+    A = &WALK[PT1    ]; RES[i++] ^= *A;                 \
+    B = &WALK[PT2    ]; RES[i++] ^= *B;                 \
+    C = &WALK[PT1 ^ 1]; RES[i++] ^= *C;                 \
+    D = &WALK[PT2 ^ 4]; RES[i++] ^= *D;                 \
+                                                        \
+    IN = (*A >> (1)) ^ (*A << (31)) ^ CLK;              \
+    *A = (*B >> (2)) ^ (*B << (30)) ^ CLK;              \
+    *B = IN ^ U1;                                       \
+    *C = (*C >> (3)) ^ (*C << (29)) ^ CLK;              \
+    *D = (*D >> (4)) ^ (*D << (28)) ^ CLK;              \
+                                                        \
+    A = &WALK[PT1 ^ 2]; RES[i++] ^= *A;                 \
+    B = &WALK[PT2 ^ 2]; RES[i++] ^= *B;                 \
+    C = &WALK[PT1 ^ 3]; RES[i++] ^= *C;                 \
+    D = &WALK[PT2 ^ 6]; RES[i++] ^= *D;                 \
+                                                        \
+    if( PTEST & 1 ) SWAP( A, C );                       \
+                                                        \
+    IN = (*A >> (5)) ^ (*A << (27)) ^ CLK;              \
+    *A = (*B >> (6)) ^ (*B << (26)) ^ CLK;              \
+    *B = IN; CLK = (int) hardclock();                   \
+    *C = (*C >> (7)) ^ (*C << (25)) ^ CLK;              \
+    *D = (*D >> (8)) ^ (*D << (24)) ^ CLK;              \
+                                                        \
+    A = &WALK[PT1 ^ 4];                                 \
+    B = &WALK[PT2 ^ 1];                                 \
+                                                        \
+    PTEST = PT2 >> 1;                                   \
+                                                        \
+    PT2 = (RES[(i - 8) ^ PTY] ^ WALK[PT2 ^ PTY ^ 7]);   \
+    PT2 = ((PT2 & 0x1FFF) & (~8)) ^ ((PT1 ^ 8) & 0x8);  \
+    PTY = (PT2 >> 10) & 7;                              \
+                                                        \
+    TST2_ENTER  TST2_ENTER  TST2_ENTER  TST2_ENTER      \
+    TST2_ENTER  TST2_ENTER  TST2_ENTER  TST2_ENTER      \
+    TST2_ENTER  TST2_ENTER  TST2_ENTER  TST2_ENTER      \
+                                                        \
+    TST2_LEAVE  TST2_LEAVE  TST2_LEAVE  TST2_LEAVE      \
+    TST2_LEAVE  TST2_LEAVE  TST2_LEAVE  TST2_LEAVE      \
+    TST2_LEAVE  TST2_LEAVE  TST2_LEAVE  TST2_LEAVE      \
+                                                        \
+    C = &WALK[PT1 ^ 5];                                 \
+    D = &WALK[PT2 ^ 5];                                 \
+                                                        \
+    RES[i++] ^= *A;                                     \
+    RES[i++] ^= *B;                                     \
+    RES[i++] ^= *C;                                     \
+    RES[i++] ^= *D;                                     \
+                                                        \
+    IN = (*A >> ( 9)) ^ (*A << (23)) ^ CLK;             \
+    *A = (*B >> (10)) ^ (*B << (22)) ^ CLK;             \
+    *B = IN ^ U2;                                       \
+    *C = (*C >> (11)) ^ (*C << (21)) ^ CLK;             \
+    *D = (*D >> (12)) ^ (*D << (20)) ^ CLK;             \
+                                                        \
+    A = &WALK[PT1 ^ 6]; RES[i++] ^= *A;                 \
+    B = &WALK[PT2 ^ 3]; RES[i++] ^= *B;                 \
+    C = &WALK[PT1 ^ 7]; RES[i++] ^= *C;                 \
+    D = &WALK[PT2 ^ 7]; RES[i++] ^= *D;                 \
+                                                        \
+    IN = (*A >> (13)) ^ (*A << (19)) ^ CLK;             \
+    *A = (*B >> (14)) ^ (*B << (18)) ^ CLK;             \
+    *B = IN;                                            \
+    *C = (*C >> (15)) ^ (*C << (17)) ^ CLK;             \
+    *D = (*D >> (16)) ^ (*D << (16)) ^ CLK;             \
+                                                        \
+    PT1 = ( RES[(i - 8) ^ PTX] ^                        \
+            WALK[PT1 ^ PTX ^ 7] ) & (~1);               \
+    PT1 ^= (PT2 ^ 0x10) & 0x10;                         \
+                                                        \
+    for( n++, i = 0; i < 16; i++ )                      \
+        hs->pool[n % COLLECT_SIZE] ^= RES[i];
+
+/*
+ * Entropy gathering function
+ */
+static void havege_fill( havege_state *hs )
+{
+    int i, n = 0;
+    int  U1,  U2, *A, *B, *C, *D;
+    int PT1, PT2, *WALK, RES[16];
+    int PTX, PTY, CLK, PTEST, IN;
+
+    WALK = hs->WALK;
+    PT1  = hs->PT1;
+    PT2  = hs->PT2;
+
+    PTX  = U1 = 0;
+    PTY  = U2 = 0;
+
+    memset( RES, 0, sizeof( RES ) );
+
+    while( n < COLLECT_SIZE * 4 )
+    {
+        ONE_ITERATION
+        ONE_ITERATION
+        ONE_ITERATION
+        ONE_ITERATION
+    }
+
+    hs->PT1 = PT1;
+    hs->PT2 = PT2;
+
+    hs->offset[0] = 0;
+    hs->offset[1] = COLLECT_SIZE / 2;
+}
+
+/*
+ * HAVEGE initialization
+ */
+void havege_init( havege_state *hs )
+{
+    memset( hs, 0, sizeof( havege_state ) );
+
+    havege_fill( hs );
+}
+
+/*
+ * HAVEGE rand function
+ */
+int havege_rand( void *p_rng )
+{
+    int ret;
+    havege_state *hs = (havege_state *) p_rng;
+
+    if( hs->offset[1] >= COLLECT_SIZE )
+        havege_fill( hs );
+
+    ret  = hs->pool[hs->offset[0]++];
+    ret ^= hs->pool[hs->offset[1]++];
+
+    return( ret );
+}
+
+#if defined(POLARSSL_RAND_TEST)
+
+#include <stdio.h>
+
+int main( int argc, char *argv[] )
+{
+    FILE *f;
+    time_t t;
+    int i, j, k;
+    havege_state hs;
+    unsigned char buf[1024];
+
+    if( argc < 2 )
+    {
+        fprintf( stderr, "usage: %s <output filename>\n", argv[0] );
+        return( 1 );
+    }
+
+    if( ( f = fopen( argv[1], "wb+" ) ) == NULL )
+    {
+        printf( "failed to open '%s' for writing.\n", argv[0] );
+        return( 1 );
+    }
+
+    havege_init( &hs );
+
+    t = time( NULL );
+
+    for( i = 0, k = 32768; i < k; i++ )
+    {
+        for( j = 0; j < sizeof( buf ); j++ )
+            buf[j] = havege_rand( &hs );
+
+        fwrite( buf, sizeof( buf ), 1, f );
+
+        printf( "Generating 32Mb of data in file '%s'... %04.1f" \
+                "%% done\r", argv[1], (100 * (float) (i + 1)) / k );
+        fflush( stdout );
+    }
+
+    if( t == time( NULL ) )
+        t--;
+
+    fclose( f );
+    return( 0 );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/utils/px5g-standalone/src/library/rsa.c b/trunk/package/utils/px5g-standalone/src/library/rsa.c
new file mode 100644
index 00000000..131b6c6c
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/library/rsa.c
@@ -0,0 +1,750 @@
+/*
+ *  The RSA public-key cryptosystem
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  RSA was designed by Ron Rivest, Adi Shamir and Len Adleman.
+ *
+ *  http://theory.lcs.mit.edu/~rivest/rsapaper.pdf
+ *  http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_RSA_C)
+
+#include "polarssl/rsa.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+/*
+ * Initialize an RSA context
+ */
+void rsa_init( rsa_context *ctx,
+               int padding,
+               int hash_id,
+               int (*f_rng)(void *),
+               void *p_rng )
+{
+    memset( ctx, 0, sizeof( rsa_context ) );
+
+    ctx->padding = padding;
+    ctx->hash_id = hash_id;
+
+    ctx->f_rng = f_rng;
+    ctx->p_rng = p_rng;
+}
+
+#if defined(POLARSSL_GENPRIME)
+
+/*
+ * Generate an RSA keypair
+ */
+int rsa_gen_key( rsa_context *ctx, int nbits, int exponent )
+{
+    int ret;
+    mpi P1, Q1, H, G;
+
+    if( ctx->f_rng == NULL || nbits < 128 || exponent < 3 )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    mpi_init( &P1, &Q1, &H, &G, NULL );
+
+    /*
+     * find primes P and Q with Q < P so that:
+     * GCD( E, (P-1)*(Q-1) ) == 1
+     */
+    MPI_CHK( mpi_lset( &ctx->E, exponent ) );
+
+    do
+    {
+        MPI_CHK( mpi_gen_prime( &ctx->P, ( nbits + 1 ) >> 1, 0, 
+                                ctx->f_rng, ctx->p_rng ) );
+
+        MPI_CHK( mpi_gen_prime( &ctx->Q, ( nbits + 1 ) >> 1, 0,
+                                ctx->f_rng, ctx->p_rng ) );
+
+        if( mpi_cmp_mpi( &ctx->P, &ctx->Q ) < 0 )
+            mpi_swap( &ctx->P, &ctx->Q );
+
+        if( mpi_cmp_mpi( &ctx->P, &ctx->Q ) == 0 )
+            continue;
+
+        MPI_CHK( mpi_mul_mpi( &ctx->N, &ctx->P, &ctx->Q ) );
+        if( mpi_msb( &ctx->N ) != nbits )
+            continue;
+
+        MPI_CHK( mpi_sub_int( &P1, &ctx->P, 1 ) );
+        MPI_CHK( mpi_sub_int( &Q1, &ctx->Q, 1 ) );
+        MPI_CHK( mpi_mul_mpi( &H, &P1, &Q1 ) );
+        MPI_CHK( mpi_gcd( &G, &ctx->E, &H  ) );
+    }
+    while( mpi_cmp_int( &G, 1 ) != 0 );
+
+    /*
+     * D  = E^-1 mod ((P-1)*(Q-1))
+     * DP = D mod (P - 1)
+     * DQ = D mod (Q - 1)
+     * QP = Q^-1 mod P
+     */
+    MPI_CHK( mpi_inv_mod( &ctx->D , &ctx->E, &H  ) );
+    MPI_CHK( mpi_mod_mpi( &ctx->DP, &ctx->D, &P1 ) );
+    MPI_CHK( mpi_mod_mpi( &ctx->DQ, &ctx->D, &Q1 ) );
+    MPI_CHK( mpi_inv_mod( &ctx->QP, &ctx->Q, &ctx->P ) );
+
+    ctx->len = ( mpi_msb( &ctx->N ) + 7 ) >> 3;
+
+cleanup:
+
+    mpi_free( &G, &H, &Q1, &P1, NULL );
+
+    if( ret != 0 )
+    {
+        rsa_free( ctx );
+        return( POLARSSL_ERR_RSA_KEY_GEN_FAILED | ret );
+    }
+
+    return( 0 );   
+}
+
+#endif
+
+/*
+ * Check a public RSA key
+ */
+int rsa_check_pubkey( rsa_context *ctx )
+{
+    if( ( ctx->N.p[0] & 1 ) == 0 || 
+        ( ctx->E.p[0] & 1 ) == 0 )
+        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
+
+    if( mpi_msb( &ctx->N ) < 128 ||
+        mpi_msb( &ctx->N ) > 4096 )
+        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
+
+    if( mpi_msb( &ctx->E ) < 2 ||
+        mpi_msb( &ctx->E ) > 64 )
+        return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED );
+
+    return( 0 );
+}
+
+/*
+ * Check a private RSA key
+ */
+int rsa_check_privkey( rsa_context *ctx )
+{
+    int ret;
+    mpi PQ, DE, P1, Q1, H, I, G;
+
+    if( ( ret = rsa_check_pubkey( ctx ) ) != 0 )
+        return( ret );
+
+    mpi_init( &PQ, &DE, &P1, &Q1, &H, &I, &G, NULL );
+
+    MPI_CHK( mpi_mul_mpi( &PQ, &ctx->P, &ctx->Q ) );
+    MPI_CHK( mpi_mul_mpi( &DE, &ctx->D, &ctx->E ) );
+    MPI_CHK( mpi_sub_int( &P1, &ctx->P, 1 ) );
+    MPI_CHK( mpi_sub_int( &Q1, &ctx->Q, 1 ) );
+    MPI_CHK( mpi_mul_mpi( &H, &P1, &Q1 ) );
+    MPI_CHK( mpi_mod_mpi( &I, &DE, &H  ) );
+    MPI_CHK( mpi_gcd( &G, &ctx->E, &H  ) );
+
+    if( mpi_cmp_mpi( &PQ, &ctx->N ) == 0 &&
+        mpi_cmp_int( &I, 1 ) == 0 &&
+        mpi_cmp_int( &G, 1 ) == 0 )
+    {
+        mpi_free( &G, &I, &H, &Q1, &P1, &DE, &PQ, NULL );
+        return( 0 );
+    }
+
+cleanup:
+
+    mpi_free( &G, &I, &H, &Q1, &P1, &DE, &PQ, NULL );
+    return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED | ret );
+}
+
+/*
+ * Do an RSA public key operation
+ */
+int rsa_public( rsa_context *ctx,
+                unsigned char *input,
+                unsigned char *output )
+{
+    int ret, olen;
+    mpi T;
+
+    mpi_init( &T, NULL );
+
+    MPI_CHK( mpi_read_binary( &T, input, ctx->len ) );
+
+    if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
+    {
+        mpi_free( &T, NULL );
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+    olen = ctx->len;
+    MPI_CHK( mpi_exp_mod( &T, &T, &ctx->E, &ctx->N, &ctx->RN ) );
+    MPI_CHK( mpi_write_binary( &T, output, olen ) );
+
+cleanup:
+
+    mpi_free( &T, NULL );
+
+    if( ret != 0 )
+        return( POLARSSL_ERR_RSA_PUBLIC_FAILED | ret );
+
+    return( 0 );
+}
+
+/*
+ * Do an RSA private key operation
+ */
+int rsa_private( rsa_context *ctx,
+                 unsigned char *input,
+                 unsigned char *output )
+{
+    int ret, olen;
+    mpi T, T1, T2;
+
+    mpi_init( &T, &T1, &T2, NULL );
+
+    MPI_CHK( mpi_read_binary( &T, input, ctx->len ) );
+
+    if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 )
+    {
+        mpi_free( &T, NULL );
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+#if 0
+    MPI_CHK( mpi_exp_mod( &T, &T, &ctx->D, &ctx->N, &ctx->RN ) );
+#else
+    /*
+     * faster decryption using the CRT
+     *
+     * T1 = input ^ dP mod P
+     * T2 = input ^ dQ mod Q
+     */
+    MPI_CHK( mpi_exp_mod( &T1, &T, &ctx->DP, &ctx->P, &ctx->RP ) );
+    MPI_CHK( mpi_exp_mod( &T2, &T, &ctx->DQ, &ctx->Q, &ctx->RQ ) );
+
+    /*
+     * T = (T1 - T2) * (Q^-1 mod P) mod P
+     */
+    MPI_CHK( mpi_sub_mpi( &T, &T1, &T2 ) );
+    MPI_CHK( mpi_mul_mpi( &T1, &T, &ctx->QP ) );
+    MPI_CHK( mpi_mod_mpi( &T, &T1, &ctx->P ) );
+
+    /*
+     * output = T2 + T * Q
+     */
+    MPI_CHK( mpi_mul_mpi( &T1, &T, &ctx->Q ) );
+    MPI_CHK( mpi_add_mpi( &T, &T2, &T1 ) );
+#endif
+
+    olen = ctx->len;
+    MPI_CHK( mpi_write_binary( &T, output, olen ) );
+
+cleanup:
+
+    mpi_free( &T, &T1, &T2, NULL );
+
+    if( ret != 0 )
+        return( POLARSSL_ERR_RSA_PRIVATE_FAILED | ret );
+
+    return( 0 );
+}
+
+/*
+ * Add the message padding, then do an RSA operation
+ */
+int rsa_pkcs1_encrypt( rsa_context *ctx,
+                       int mode, int  ilen,
+                       unsigned char *input,
+                       unsigned char *output )
+{
+    int nb_pad, olen;
+    unsigned char *p = output;
+
+    olen = ctx->len;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            if( ilen < 0 || olen < ilen + 11 )
+                return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+            nb_pad = olen - 3 - ilen;
+
+            *p++ = 0;
+            *p++ = RSA_CRYPT;
+
+            while( nb_pad-- > 0 )
+            {
+                do {
+                    *p = (unsigned char) rand();
+                } while( *p == 0 );
+                p++;
+            }
+            *p++ = 0;
+            memcpy( p, input, ilen );
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    return( ( mode == RSA_PUBLIC )
+            ? rsa_public(  ctx, output, output )
+            : rsa_private( ctx, output, output ) );
+}
+
+/*
+ * Do an RSA operation, then remove the message padding
+ */
+int rsa_pkcs1_decrypt( rsa_context *ctx,
+                       int mode, int *olen,
+                       unsigned char *input,
+                       unsigned char *output,
+		       int output_max_len)
+{
+    int ret, ilen;
+    unsigned char *p;
+    unsigned char buf[512];
+
+    ilen = ctx->len;
+
+    if( ilen < 16 || ilen > (int) sizeof( buf ) )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    ret = ( mode == RSA_PUBLIC )
+          ? rsa_public(  ctx, input, buf )
+          : rsa_private( ctx, input, buf );
+
+    if( ret != 0 )
+        return( ret );
+
+    p = buf;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            if( *p++ != 0 || *p++ != RSA_CRYPT )
+                return( POLARSSL_ERR_RSA_INVALID_PADDING );
+
+            while( *p != 0 )
+            {
+                if( p >= buf + ilen - 1 )
+                    return( POLARSSL_ERR_RSA_INVALID_PADDING );
+                p++;
+            }
+            p++;
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    if (ilen - (int)(p - buf) > output_max_len)
+    	return( POLARSSL_ERR_RSA_OUTPUT_TO_LARGE );
+
+    *olen = ilen - (int)(p - buf);
+    memcpy( output, p, *olen );
+
+    return( 0 );
+}
+
+/*
+ * Do an RSA operation to sign the message digest
+ */
+int rsa_pkcs1_sign( rsa_context *ctx,
+                    int mode,
+                    int hash_id,
+                    int hashlen,
+                    unsigned char *hash,
+                    unsigned char *sig )
+{
+    int nb_pad, olen;
+    unsigned char *p = sig;
+
+    olen = ctx->len;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            switch( hash_id )
+            {
+                case RSA_RAW:
+                    nb_pad = olen - 3 - hashlen;
+                    break;
+
+                case RSA_MD2:
+                case RSA_MD4:
+                case RSA_MD5:
+                    nb_pad = olen - 3 - 34;
+                    break;
+
+                case RSA_SHA1:
+                    nb_pad = olen - 3 - 35;
+                    break;
+
+                default:
+                    return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+            }
+
+            if( nb_pad < 8 )
+                return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+            *p++ = 0;
+            *p++ = RSA_SIGN;
+            memset( p, 0xFF, nb_pad );
+            p += nb_pad;
+            *p++ = 0;
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    switch( hash_id )
+    {
+        case RSA_RAW:
+            memcpy( p, hash, hashlen );
+            break;
+
+        case RSA_MD2:
+            memcpy( p, ASN1_HASH_MDX, 18 );
+            memcpy( p + 18, hash, 16 );
+            p[13] = 2; break;
+
+        case RSA_MD4:
+            memcpy( p, ASN1_HASH_MDX, 18 );
+            memcpy( p + 18, hash, 16 );
+            p[13] = 4; break;
+
+        case RSA_MD5:
+            memcpy( p, ASN1_HASH_MDX, 18 );
+            memcpy( p + 18, hash, 16 );
+            p[13] = 5; break;
+
+        case RSA_SHA1:
+            memcpy( p, ASN1_HASH_SHA1, 15 );
+            memcpy( p + 15, hash, 20 );
+            break;
+
+        default:
+            return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+    }
+
+    return( ( mode == RSA_PUBLIC )
+            ? rsa_public(  ctx, sig, sig )
+            : rsa_private( ctx, sig, sig ) );
+}
+
+/*
+ * Do an RSA operation and check the message digest
+ */
+int rsa_pkcs1_verify( rsa_context *ctx,
+                      int mode,
+                      int hash_id,
+                      int hashlen,
+                      unsigned char *hash,
+                      unsigned char *sig )
+{
+    int ret, len, siglen;
+    unsigned char *p, c;
+    unsigned char buf[512];
+
+    siglen = ctx->len;
+
+    if( siglen < 16 || siglen > (int) sizeof( buf ) )
+        return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
+
+    ret = ( mode == RSA_PUBLIC )
+          ? rsa_public(  ctx, sig, buf )
+          : rsa_private( ctx, sig, buf );
+
+    if( ret != 0 )
+        return( ret );
+
+    p = buf;
+
+    switch( ctx->padding )
+    {
+        case RSA_PKCS_V15:
+
+            if( *p++ != 0 || *p++ != RSA_SIGN )
+                return( POLARSSL_ERR_RSA_INVALID_PADDING );
+
+            while( *p != 0 )
+            {
+                if( p >= buf + siglen - 1 || *p != 0xFF )
+                    return( POLARSSL_ERR_RSA_INVALID_PADDING );
+                p++;
+            }
+            p++;
+            break;
+
+        default:
+
+            return( POLARSSL_ERR_RSA_INVALID_PADDING );
+    }
+
+    len = siglen - (int)( p - buf );
+
+    if( len == 34 )
+    {
+        c = p[13];
+        p[13] = 0;
+
+        if( memcmp( p, ASN1_HASH_MDX, 18 ) != 0 )
+            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+
+        if( ( c == 2 && hash_id == RSA_MD2 ) ||
+            ( c == 4 && hash_id == RSA_MD4 ) ||
+            ( c == 5 && hash_id == RSA_MD5 ) )
+        {
+            if( memcmp( p + 18, hash, 16 ) == 0 ) 
+                return( 0 );
+            else
+                return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+        }
+    }
+
+    if( len == 35 && hash_id == RSA_SHA1 )
+    {
+        if( memcmp( p, ASN1_HASH_SHA1, 15 ) == 0 &&
+            memcmp( p + 15, hash, 20 ) == 0 )
+            return( 0 );
+        else
+            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+    }
+
+    if( len == hashlen && hash_id == RSA_RAW )
+    {
+        if( memcmp( p, hash, hashlen ) == 0 )
+            return( 0 );
+        else
+            return( POLARSSL_ERR_RSA_VERIFY_FAILED );
+    }
+
+    return( POLARSSL_ERR_RSA_INVALID_PADDING );
+}
+
+/*
+ * Free the components of an RSA key
+ */
+void rsa_free( rsa_context *ctx )
+{
+    mpi_free( &ctx->RQ, &ctx->RP, &ctx->RN,
+              &ctx->QP, &ctx->DQ, &ctx->DP,
+              &ctx->Q,  &ctx->P,  &ctx->D,
+              &ctx->E,  &ctx->N,  NULL );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+
+#include "polarssl/sha1.h"
+
+/*
+ * Example RSA-1024 keypair, for test purposes
+ */
+#define KEY_LEN 128
+
+#define RSA_N   "9292758453063D803DD603D5E777D788" \
+                "8ED1D5BF35786190FA2F23EBC0848AEA" \
+                "DDA92CA6C3D80B32C4D109BE0F36D6AE" \
+                "7130B9CED7ACDF54CFC7555AC14EEBAB" \
+                "93A89813FBF3C4F8066D2D800F7C38A8" \
+                "1AE31942917403FF4946B0A83D3D3E05" \
+                "EE57C6F5F5606FB5D4BC6CD34EE0801A" \
+                "5E94BB77B07507233A0BC7BAC8F90F79"
+
+#define RSA_E   "10001"
+
+#define RSA_D   "24BF6185468786FDD303083D25E64EFC" \
+                "66CA472BC44D253102F8B4A9D3BFA750" \
+                "91386C0077937FE33FA3252D28855837" \
+                "AE1B484A8A9A45F7EE8C0C634F99E8CD" \
+                "DF79C5CE07EE72C7F123142198164234" \
+                "CABB724CF78B8173B9F880FC86322407" \
+                "AF1FEDFDDE2BEB674CA15F3E81A1521E" \
+                "071513A1E85B5DFA031F21ECAE91A34D"
+
+#define RSA_P   "C36D0EB7FCD285223CFB5AABA5BDA3D8" \
+                "2C01CAD19EA484A87EA4377637E75500" \
+                "FCB2005C5C7DD6EC4AC023CDA285D796" \
+                "C3D9E75E1EFC42488BB4F1D13AC30A57"
+
+#define RSA_Q   "C000DF51A7C77AE8D7C7370C1FF55B69" \
+                "E211C2B9E5DB1ED0BF61D0D9899620F4" \
+                "910E4168387E3C30AA1E00C339A79508" \
+                "8452DD96A9A5EA5D9DCA68DA636032AF"
+
+#define RSA_DP  "C1ACF567564274FB07A0BBAD5D26E298" \
+                "3C94D22288ACD763FD8E5600ED4A702D" \
+                "F84198A5F06C2E72236AE490C93F07F8" \
+                "3CC559CD27BC2D1CA488811730BB5725"
+
+#define RSA_DQ  "4959CBF6F8FEF750AEE6977C155579C7" \
+                "D8AAEA56749EA28623272E4F7D0592AF" \
+                "7C1F1313CAC9471B5C523BFE592F517B" \
+                "407A1BD76C164B93DA2D32A383E58357"
+
+#define RSA_QP  "9AE7FBC99546432DF71896FC239EADAE" \
+                "F38D18D2B2F0E2DD275AA977E2BF4411" \
+                "F5A3B2A5D33605AEBBCCBA7FEB9F2D2F" \
+                "A74206CEC169D74BF5A8C50D6F48EA08"
+
+#define PT_LEN  24
+#define RSA_PT  "\xAA\xBB\xCC\x03\x02\x01\x00\xFF\xFF\xFF\xFF\xFF" \
+                "\x11\x22\x33\x0A\x0B\x0C\xCC\xDD\xDD\xDD\xDD\xDD"
+
+/*
+ * Checkup routine
+ */
+int rsa_self_test( int verbose )
+{
+    int len;
+    rsa_context rsa;
+    unsigned char sha1sum[20];
+    unsigned char rsa_plaintext[PT_LEN];
+    unsigned char rsa_decrypted[PT_LEN];
+    unsigned char rsa_ciphertext[KEY_LEN];
+
+    memset( &rsa, 0, sizeof( rsa_context ) );
+
+    rsa.len = KEY_LEN;
+    mpi_read_string( &rsa.N , 16, RSA_N  );
+    mpi_read_string( &rsa.E , 16, RSA_E  );
+    mpi_read_string( &rsa.D , 16, RSA_D  );
+    mpi_read_string( &rsa.P , 16, RSA_P  );
+    mpi_read_string( &rsa.Q , 16, RSA_Q  );
+    mpi_read_string( &rsa.DP, 16, RSA_DP );
+    mpi_read_string( &rsa.DQ, 16, RSA_DQ );
+    mpi_read_string( &rsa.QP, 16, RSA_QP );
+
+    if( verbose != 0 )
+        printf( "  RSA key validation: " );
+
+    if( rsa_check_pubkey(  &rsa ) != 0 ||
+        rsa_check_privkey( &rsa ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 encryption : " );
+
+    memcpy( rsa_plaintext, RSA_PT, PT_LEN );
+
+    if( rsa_pkcs1_encrypt( &rsa, RSA_PUBLIC, PT_LEN,
+                           rsa_plaintext, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 decryption : " );
+
+    if( rsa_pkcs1_decrypt( &rsa, RSA_PRIVATE, &len,
+                           rsa_ciphertext, rsa_decrypted,
+			   sizeof(rsa_decrypted) ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( memcmp( rsa_decrypted, rsa_plaintext, len ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 data sign  : " );
+
+    sha1( rsa_plaintext, PT_LEN, sha1sum );
+
+    if( rsa_pkcs1_sign( &rsa, RSA_PRIVATE, RSA_SHA1, 20,
+                        sha1sum, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n  PKCS#1 sig. verify: " );
+
+    if( rsa_pkcs1_verify( &rsa, RSA_PUBLIC, RSA_SHA1, 20,
+                          sha1sum, rsa_ciphertext ) != 0 )
+    {
+        if( verbose != 0 )
+            printf( "failed\n" );
+
+        return( 1 );
+    }
+
+    if( verbose != 0 )
+        printf( "passed\n\n" );
+
+    rsa_free( &rsa );
+
+    return( 0 );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/utils/px5g-standalone/src/library/sha1.c b/trunk/package/utils/px5g-standalone/src/library/sha1.c
new file mode 100644
index 00000000..54a4416f
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/library/sha1.c
@@ -0,0 +1,622 @@
+/*
+ *  FIPS-180-1 compliant SHA-1 implementation
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  The SHA-1 standard was published by NIST in 1993.
+ *
+ *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_SHA1_C)
+
+#include "polarssl/sha1.h"
+
+#include <string.h>
+#include <stdio.h>
+
+/*
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_ULONG_BE
+#define GET_ULONG_BE(n,b,i)                             \
+{                                                       \
+    (n) = ( (unsigned long) (b)[(i)    ] << 24 )        \
+        | ( (unsigned long) (b)[(i) + 1] << 16 )        \
+        | ( (unsigned long) (b)[(i) + 2] <<  8 )        \
+        | ( (unsigned long) (b)[(i) + 3]       );       \
+}
+#endif
+
+#ifndef PUT_ULONG_BE
+#define PUT_ULONG_BE(n,b,i)                             \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
+}
+#endif
+
+/*
+ * SHA-1 context setup
+ */
+void sha1_starts( sha1_context *ctx )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
+    ctx->state[4] = 0xC3D2E1F0;
+}
+
+static void sha1_process( sha1_context *ctx, unsigned char data[64] )
+{
+    unsigned long temp, W[16], A, B, C, D, E;
+
+    GET_ULONG_BE( W[ 0], data,  0 );
+    GET_ULONG_BE( W[ 1], data,  4 );
+    GET_ULONG_BE( W[ 2], data,  8 );
+    GET_ULONG_BE( W[ 3], data, 12 );
+    GET_ULONG_BE( W[ 4], data, 16 );
+    GET_ULONG_BE( W[ 5], data, 20 );
+    GET_ULONG_BE( W[ 6], data, 24 );
+    GET_ULONG_BE( W[ 7], data, 28 );
+    GET_ULONG_BE( W[ 8], data, 32 );
+    GET_ULONG_BE( W[ 9], data, 36 );
+    GET_ULONG_BE( W[10], data, 40 );
+    GET_ULONG_BE( W[11], data, 44 );
+    GET_ULONG_BE( W[12], data, 48 );
+    GET_ULONG_BE( W[13], data, 52 );
+    GET_ULONG_BE( W[14], data, 56 );
+    GET_ULONG_BE( W[15], data, 60 );
+
+#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
+
+#define R(t)                                            \
+(                                                       \
+    temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^     \
+           W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],      \
+    ( W[t & 0x0F] = S(temp,1) )                         \
+)
+
+#define P(a,b,c,d,e,x)                                  \
+{                                                       \
+    e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
+}
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+
+#define F(x,y,z) (z ^ (x & (y ^ z)))
+#define K 0x5A827999
+
+    P( A, B, C, D, E, W[0]  );
+    P( E, A, B, C, D, W[1]  );
+    P( D, E, A, B, C, W[2]  );
+    P( C, D, E, A, B, W[3]  );
+    P( B, C, D, E, A, W[4]  );
+    P( A, B, C, D, E, W[5]  );
+    P( E, A, B, C, D, W[6]  );
+    P( D, E, A, B, C, W[7]  );
+    P( C, D, E, A, B, W[8]  );
+    P( B, C, D, E, A, W[9]  );
+    P( A, B, C, D, E, W[10] );
+    P( E, A, B, C, D, W[11] );
+    P( D, E, A, B, C, W[12] );
+    P( C, D, E, A, B, W[13] );
+    P( B, C, D, E, A, W[14] );
+    P( A, B, C, D, E, W[15] );
+    P( E, A, B, C, D, R(16) );
+    P( D, E, A, B, C, R(17) );
+    P( C, D, E, A, B, R(18) );
+    P( B, C, D, E, A, R(19) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0x6ED9EBA1
+
+    P( A, B, C, D, E, R(20) );
+    P( E, A, B, C, D, R(21) );
+    P( D, E, A, B, C, R(22) );
+    P( C, D, E, A, B, R(23) );
+    P( B, C, D, E, A, R(24) );
+    P( A, B, C, D, E, R(25) );
+    P( E, A, B, C, D, R(26) );
+    P( D, E, A, B, C, R(27) );
+    P( C, D, E, A, B, R(28) );
+    P( B, C, D, E, A, R(29) );
+    P( A, B, C, D, E, R(30) );
+    P( E, A, B, C, D, R(31) );
+    P( D, E, A, B, C, R(32) );
+    P( C, D, E, A, B, R(33) );
+    P( B, C, D, E, A, R(34) );
+    P( A, B, C, D, E, R(35) );
+    P( E, A, B, C, D, R(36) );
+    P( D, E, A, B, C, R(37) );
+    P( C, D, E, A, B, R(38) );
+    P( B, C, D, E, A, R(39) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) ((x & y) | (z & (x | y)))
+#define K 0x8F1BBCDC
+
+    P( A, B, C, D, E, R(40) );
+    P( E, A, B, C, D, R(41) );
+    P( D, E, A, B, C, R(42) );
+    P( C, D, E, A, B, R(43) );
+    P( B, C, D, E, A, R(44) );
+    P( A, B, C, D, E, R(45) );
+    P( E, A, B, C, D, R(46) );
+    P( D, E, A, B, C, R(47) );
+    P( C, D, E, A, B, R(48) );
+    P( B, C, D, E, A, R(49) );
+    P( A, B, C, D, E, R(50) );
+    P( E, A, B, C, D, R(51) );
+    P( D, E, A, B, C, R(52) );
+    P( C, D, E, A, B, R(53) );
+    P( B, C, D, E, A, R(54) );
+    P( A, B, C, D, E, R(55) );
+    P( E, A, B, C, D, R(56) );
+    P( D, E, A, B, C, R(57) );
+    P( C, D, E, A, B, R(58) );
+    P( B, C, D, E, A, R(59) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0xCA62C1D6
+
+    P( A, B, C, D, E, R(60) );
+    P( E, A, B, C, D, R(61) );
+    P( D, E, A, B, C, R(62) );
+    P( C, D, E, A, B, R(63) );
+    P( B, C, D, E, A, R(64) );
+    P( A, B, C, D, E, R(65) );
+    P( E, A, B, C, D, R(66) );
+    P( D, E, A, B, C, R(67) );
+    P( C, D, E, A, B, R(68) );
+    P( B, C, D, E, A, R(69) );
+    P( A, B, C, D, E, R(70) );
+    P( E, A, B, C, D, R(71) );
+    P( D, E, A, B, C, R(72) );
+    P( C, D, E, A, B, R(73) );
+    P( B, C, D, E, A, R(74) );
+    P( A, B, C, D, E, R(75) );
+    P( E, A, B, C, D, R(76) );
+    P( D, E, A, B, C, R(77) );
+    P( C, D, E, A, B, R(78) );
+    P( B, C, D, E, A, R(79) );
+
+#undef K
+#undef F
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+}
+
+/*
+ * SHA-1 process buffer
+ */
+void sha1_update( sha1_context *ctx, unsigned char *input, int ilen )
+{
+    int fill;
+    unsigned long left;
+
+    if( ilen <= 0 )
+        return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if( ctx->total[0] < (unsigned long) ilen )
+        ctx->total[1]++;
+
+    if( left && ilen >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left),
+                (void *) input, fill );
+        sha1_process( ctx, ctx->buffer );
+        input += fill;
+        ilen  -= fill;
+        left = 0;
+    }
+
+    while( ilen >= 64 )
+    {
+        sha1_process( ctx, input );
+        input += 64;
+        ilen  -= 64;
+    }
+
+    if( ilen > 0 )
+    {
+        memcpy( (void *) (ctx->buffer + left),
+                (void *) input, ilen );
+    }
+}
+
+static const unsigned char sha1_padding[64] =
+{
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*
+ * SHA-1 final digest
+ */
+void sha1_finish( sha1_context *ctx, unsigned char output[20] )
+{
+    unsigned long last, padn;
+    unsigned long high, low;
+    unsigned char msglen[8];
+
+    high = ( ctx->total[0] >> 29 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_ULONG_BE( high, msglen, 0 );
+    PUT_ULONG_BE( low,  msglen, 4 );
+
+    last = ctx->total[0] & 0x3F;
+    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
+
+    sha1_update( ctx, (unsigned char *) sha1_padding, padn );
+    sha1_update( ctx, msglen, 8 );
+
+    PUT_ULONG_BE( ctx->state[0], output,  0 );
+    PUT_ULONG_BE( ctx->state[1], output,  4 );
+    PUT_ULONG_BE( ctx->state[2], output,  8 );
+    PUT_ULONG_BE( ctx->state[3], output, 12 );
+    PUT_ULONG_BE( ctx->state[4], output, 16 );
+}
+
+/*
+ * output = SHA-1( input buffer )
+ */
+void sha1( unsigned char *input, int ilen, unsigned char output[20] )
+{
+    sha1_context ctx;
+
+    sha1_starts( &ctx );
+    sha1_update( &ctx, input, ilen );
+    sha1_finish( &ctx, output );
+
+    memset( &ctx, 0, sizeof( sha1_context ) );
+}
+
+/*
+ * output = SHA-1( file contents )
+ */
+int sha1_file( char *path, unsigned char output[20] )
+{
+    FILE *f;
+    size_t n;
+    sha1_context ctx;
+    unsigned char buf[1024];
+
+    if( ( f = fopen( path, "rb" ) ) == NULL )
+        return( 1 );
+
+    sha1_starts( &ctx );
+
+    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+        sha1_update( &ctx, buf, (int) n );
+
+    sha1_finish( &ctx, output );
+
+    memset( &ctx, 0, sizeof( sha1_context ) );
+
+    if( ferror( f ) != 0 )
+    {
+        fclose( f );
+        return( 2 );
+    }
+
+    fclose( f );
+    return( 0 );
+}
+
+/*
+ * SHA-1 HMAC context setup
+ */
+void sha1_hmac_starts( sha1_context *ctx, unsigned char *key, int keylen )
+{
+    int i;
+    unsigned char sum[20];
+
+    if( keylen > 64 )
+    {
+        sha1( key, keylen, sum );
+        keylen = 20;
+        key = sum;
+    }
+
+    memset( ctx->ipad, 0x36, 64 );
+    memset( ctx->opad, 0x5C, 64 );
+
+    for( i = 0; i < keylen; i++ )
+    {
+        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
+        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
+    }
+
+    sha1_starts( ctx );
+    sha1_update( ctx, ctx->ipad, 64 );
+
+    memset( sum, 0, sizeof( sum ) );
+}
+
+/*
+ * SHA-1 HMAC process buffer
+ */
+void sha1_hmac_update( sha1_context *ctx, unsigned char *input, int ilen )
+{
+    sha1_update( ctx, input, ilen );
+}
+
+/*
+ * SHA-1 HMAC final digest
+ */
+void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] )
+{
+    unsigned char tmpbuf[20];
+
+    sha1_finish( ctx, tmpbuf );
+    sha1_starts( ctx );
+    sha1_update( ctx, ctx->opad, 64 );
+    sha1_update( ctx, tmpbuf, 20 );
+    sha1_finish( ctx, output );
+
+    memset( tmpbuf, 0, sizeof( tmpbuf ) );
+}
+
+/*
+ * output = HMAC-SHA-1( hmac key, input buffer )
+ */
+void sha1_hmac( unsigned char *key, int keylen,
+                unsigned char *input, int ilen,
+                unsigned char output[20] )
+{
+    sha1_context ctx;
+
+    sha1_hmac_starts( &ctx, key, keylen );
+    sha1_hmac_update( &ctx, input, ilen );
+    sha1_hmac_finish( &ctx, output );
+
+    memset( &ctx, 0, sizeof( sha1_context ) );
+}
+
+#if defined(POLARSSL_SELF_TEST)
+/*
+ * FIPS-180-1 test vectors
+ */
+static unsigned char sha1_test_buf[3][57] = 
+{
+    { "abc" },
+    { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
+    { "" }
+};
+
+static const int sha1_test_buflen[3] =
+{
+    3, 56, 1000
+};
+
+static const unsigned char sha1_test_sum[3][20] =
+{
+    { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E,
+      0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D },
+    { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE,
+      0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 },
+    { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E,
+      0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }
+};
+
+/*
+ * RFC 2202 test vectors
+ */
+static unsigned char sha1_hmac_test_key[7][26] =
+{
+    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
+      "\x0B\x0B\x0B\x0B" },
+    { "Jefe" },
+    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
+      "\xAA\xAA\xAA\xAA" },
+    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
+      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
+    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
+      "\x0C\x0C\x0C\x0C" },
+    { "" }, /* 0xAA 80 times */
+    { "" }
+};
+
+static const int sha1_hmac_test_keylen[7] =
+{
+    20, 4, 20, 25, 20, 80, 80
+};
+
+static unsigned char sha1_hmac_test_buf[7][74] =
+{
+    { "Hi There" },
+    { "what do ya want for nothing?" },
+    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
+      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
+    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
+      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
+    { "Test With Truncation" },
+    { "Test Using Larger Than Block-Size Key - Hash Key First" },
+    { "Test Using Larger Than Block-Size Key and Larger"
+      " Than One Block-Size Data" }
+};
+
+static const int sha1_hmac_test_buflen[7] =
+{
+    8, 28, 50, 50, 20, 54, 73
+};
+
+static const unsigned char sha1_hmac_test_sum[7][20] =
+{
+    { 0xB6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xE2, 0x8B,
+      0xC0, 0xB6, 0xFB, 0x37, 0x8C, 0x8E, 0xF1, 0x46, 0xBE, 0x00 },
+    { 0xEF, 0xFC, 0xDF, 0x6A, 0xE5, 0xEB, 0x2F, 0xA2, 0xD2, 0x74,
+      0x16, 0xD5, 0xF1, 0x84, 0xDF, 0x9C, 0x25, 0x9A, 0x7C, 0x79 },
+    { 0x12, 0x5D, 0x73, 0x42, 0xB9, 0xAC, 0x11, 0xCD, 0x91, 0xA3,
+      0x9A, 0xF4, 0x8A, 0xA1, 0x7B, 0x4F, 0x63, 0xF1, 0x75, 0xD3 },
+    { 0x4C, 0x90, 0x07, 0xF4, 0x02, 0x62, 0x50, 0xC6, 0xBC, 0x84,
+      0x14, 0xF9, 0xBF, 0x50, 0xC8, 0x6C, 0x2D, 0x72, 0x35, 0xDA },
+    { 0x4C, 0x1A, 0x03, 0x42, 0x4B, 0x55, 0xE0, 0x7F, 0xE7, 0xF2,
+      0x7B, 0xE1 },
+    { 0xAA, 0x4A, 0xE5, 0xE1, 0x52, 0x72, 0xD0, 0x0E, 0x95, 0x70,
+      0x56, 0x37, 0xCE, 0x8A, 0x3B, 0x55, 0xED, 0x40, 0x21, 0x12 },
+    { 0xE8, 0xE9, 0x9D, 0x0F, 0x45, 0x23, 0x7D, 0x78, 0x6D, 0x6B,
+      0xBA, 0xA7, 0x96, 0x5C, 0x78, 0x08, 0xBB, 0xFF, 0x1A, 0x91 }
+};
+
+/*
+ * Checkup routine
+ */
+int sha1_self_test( int verbose )
+{
+    int i, j, buflen;
+    unsigned char buf[1024];
+    unsigned char sha1sum[20];
+    sha1_context ctx;
+
+    /*
+     * SHA-1
+     */
+    for( i = 0; i < 3; i++ )
+    {
+        if( verbose != 0 )
+            printf( "  SHA-1 test #%d: ", i + 1 );
+
+        sha1_starts( &ctx );
+
+        if( i == 2 )
+        {
+            memset( buf, 'a', buflen = 1000 );
+
+            for( j = 0; j < 1000; j++ )
+                sha1_update( &ctx, buf, buflen );
+        }
+        else
+            sha1_update( &ctx, sha1_test_buf[i],
+                               sha1_test_buflen[i] );
+
+        sha1_finish( &ctx, sha1sum );
+
+        if( memcmp( sha1sum, sha1_test_sum[i], 20 ) != 0 )
+        {
+            if( verbose != 0 )
+                printf( "failed\n" );
+
+            return( 1 );
+        }
+
+        if( verbose != 0 )
+            printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    for( i = 0; i < 7; i++ )
+    {
+        if( verbose != 0 )
+            printf( "  HMAC-SHA-1 test #%d: ", i + 1 );
+
+        if( i == 5 || i == 6 )
+        {
+            memset( buf, '\xAA', buflen = 80 );
+            sha1_hmac_starts( &ctx, buf, buflen );
+        }
+        else
+            sha1_hmac_starts( &ctx, sha1_hmac_test_key[i],
+                                    sha1_hmac_test_keylen[i] );
+
+        sha1_hmac_update( &ctx, sha1_hmac_test_buf[i],
+                                sha1_hmac_test_buflen[i] );
+
+        sha1_hmac_finish( &ctx, sha1sum );
+
+        buflen = ( i == 4 ) ? 12 : 20;
+
+        if( memcmp( sha1sum, sha1_hmac_test_sum[i], buflen ) != 0 )
+        {
+            if( verbose != 0 )
+                printf( "failed\n" );
+
+            return( 1 );
+        }
+
+        if( verbose != 0 )
+            printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    return( 0 );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/utils/px5g-standalone/src/library/timing.c b/trunk/package/utils/px5g-standalone/src/library/timing.c
new file mode 100644
index 00000000..6b7ab740
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/library/timing.c
@@ -0,0 +1,265 @@
+/*
+ *  Portable interface to the CPU cycle counter
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_TIMING_C)
+
+#include "polarssl/timing.h"
+
+#if defined(WIN32)
+
+#include <windows.h>
+#include <winbase.h>
+
+struct _hr_time
+{
+    LARGE_INTEGER start;
+};
+
+#else
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <time.h>
+
+struct _hr_time
+{
+    struct timeval start;
+};
+
+#endif
+
+#if (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+
+unsigned long hardclock( void )
+{
+    unsigned long tsc;
+    __asm   rdtsc
+    __asm   mov  [tsc], eax
+    return( tsc );
+}
+
+#else
+#if defined(__GNUC__) && defined(__i386__)
+
+unsigned long hardclock( void )
+{
+    unsigned long tsc;
+    asm( "rdtsc" : "=a" (tsc) );
+    return( tsc );
+}
+
+#else
+#if defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
+
+unsigned long hardclock( void )
+{
+    unsigned long lo, hi;
+    asm( "rdtsc" : "=a" (lo), "=d" (hi) );
+    return( lo | (hi << 32) );
+}
+
+#else
+#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+
+unsigned long hardclock( void )
+{
+    unsigned long tbl, tbu0, tbu1;
+
+    do
+    {
+        asm( "mftbu %0" : "=r" (tbu0) );
+        asm( "mftb  %0" : "=r" (tbl ) );
+        asm( "mftbu %0" : "=r" (tbu1) );
+    }
+    while( tbu0 != tbu1 );
+
+    return( tbl );
+}
+
+#else
+#if defined(__GNUC__) && defined(__sparc__)
+
+unsigned long hardclock( void )
+{
+    unsigned long tick;
+    asm( ".byte 0x83, 0x41, 0x00, 0x00" );
+    asm( "mov   %%g1, %0" : "=r" (tick) );
+    return( tick );
+}
+
+#else
+#if defined(__GNUC__) && defined(__alpha__)
+
+unsigned long hardclock( void )
+{
+    unsigned long cc;
+    asm( "rpcc %0" : "=r" (cc) );
+    return( cc & 0xFFFFFFFF );
+}
+
+#else
+#if defined(__GNUC__) && defined(__ia64__)
+
+unsigned long hardclock( void )
+{
+    unsigned long itc;
+    asm( "mov %0 = ar.itc" : "=r" (itc) );
+    return( itc );
+}
+
+#else
+
+static int hardclock_init = 0;
+static struct timeval tv_init;
+
+unsigned long hardclock( void )
+{
+    struct timeval tv_cur;
+
+    if( hardclock_init == 0 )
+    {
+        gettimeofday( &tv_init, NULL );
+        hardclock_init = 1;
+    }
+
+    gettimeofday( &tv_cur, NULL );
+    return( ( tv_cur.tv_sec  - tv_init.tv_sec  ) * 1000000
+          + ( tv_cur.tv_usec - tv_init.tv_usec ) );
+}
+
+#endif /* generic */
+#endif /* IA-64   */
+#endif /* Alpha   */
+#endif /* SPARC8  */
+#endif /* PowerPC */
+#endif /* AMD64   */
+#endif /* i586+   */
+
+int alarmed = 0;
+
+#if defined(WIN32)
+
+unsigned long get_timer( struct hr_time *val, int reset )
+{
+    unsigned long delta;
+    LARGE_INTEGER offset, hfreq;
+    struct _hr_time *t = (struct _hr_time *) val;
+
+    QueryPerformanceCounter(  &offset );
+    QueryPerformanceFrequency( &hfreq );
+
+    delta = (unsigned long)( ( 1000 *
+        ( offset.QuadPart - t->start.QuadPart ) ) /
+           hfreq.QuadPart );
+
+    if( reset )
+        QueryPerformanceCounter( &t->start );
+
+    return( delta );
+}
+
+DWORD WINAPI TimerProc( LPVOID uElapse )
+{
+    Sleep( (DWORD) uElapse );
+    alarmed = 1;
+    return( TRUE );
+}
+
+void set_alarm( int seconds )
+{
+    DWORD ThreadId;
+
+    alarmed = 0;
+    CloseHandle( CreateThread( NULL, 0, TimerProc,
+        (LPVOID) ( seconds * 1000 ), 0, &ThreadId ) );
+}
+
+void m_sleep( int milliseconds )
+{
+    Sleep( milliseconds );
+}
+
+#else
+
+unsigned long get_timer( struct hr_time *val, int reset )
+{
+    unsigned long delta;
+    struct timeval offset;
+    struct _hr_time *t = (struct _hr_time *) val;
+
+    gettimeofday( &offset, NULL );
+
+    delta = ( offset.tv_sec  - t->start.tv_sec  ) * 1000
+          + ( offset.tv_usec - t->start.tv_usec ) / 1000;
+
+    if( reset )
+    {
+        t->start.tv_sec  = offset.tv_sec;
+        t->start.tv_usec = offset.tv_usec;
+    }
+
+    return( delta );
+}
+
+static void sighandler( int signum )
+{
+    alarmed = 1;
+    signal( signum, sighandler );
+}
+
+void set_alarm( int seconds )
+{
+    alarmed = 0;
+    signal( SIGALRM, sighandler );
+    alarm( seconds );
+}
+
+void m_sleep( int milliseconds )
+{
+    struct timeval tv;
+
+    tv.tv_sec  = milliseconds / 1000;
+    tv.tv_usec = milliseconds * 1000;
+
+    select( 0, NULL, NULL, NULL, &tv );
+}
+
+#endif
+
+#endif
diff --git a/trunk/package/utils/px5g-standalone/src/library/x509write.c b/trunk/package/utils/px5g-standalone/src/library/x509write.c
new file mode 100644
index 00000000..10915687
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/library/x509write.c
@@ -0,0 +1,1162 @@
+/*
+ *  X.509 certificate and private key writing
+ *
+ *  Copyright (C) 2006-2007  Pascal Vizeli <pvizeli@yahoo.de>
+ *  Modifications (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+/*
+ *  The ITU-T X.509 standard defines a certificat format for PKI.
+ *
+ *  http://www.ietf.org/rfc/rfc2459.txt
+ *  http://www.ietf.org/rfc/rfc3279.txt
+ *
+ *  ftp://ftp.rsasecurity.com/pub/pkcs/ascii/pkcs-1v2.asc
+ *
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf
+ *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+ *
+ *  For CRS:
+ *  http://www.faqs.org/rfcs/rfc2314.html
+ */
+#include "polarssl/config.h"
+#include "polarssl/x509.h"
+#include "polarssl/base64.h"
+#include "polarssl/sha1.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <time.h>
+
+#define and &&
+#define or ||
+
+#if defined _MSC_VER && !defined snprintf
+#define snprintf _snprintf
+#endif
+
+static int x509write_realloc_node(x509_node *node, size_t larger);
+static int x509write_file(x509_node *node, char *path, int format, const char* pem_prolog, const char* pem_epilog);
+
+/*
+ * evaluate how mani octet have this integer
+ */
+static int asn1_eval_octet(unsigned int digit)
+{
+    int i, byte;
+
+    for (byte = 4, i = 24; i >= 0; i -= 8, --byte)
+        if (((digit >> i) & 0xFF) != 0)
+            return byte;
+
+    return 0;
+}
+
+/*
+ * write the asn.1 lenght form into p
+ */
+static int asn1_add_len(unsigned int size, x509_node *node)
+{
+    if (size > 127) {
+
+        /* long size */
+        int byte = asn1_eval_octet(size);
+        int i = 0;
+
+        *(node->p) = (0x80 | byte) & 0xFF;
+        ++node->p;
+
+        for (i = byte; i > 0; --i) {
+
+            *(node->p) = (size >> ((i - 1) * 8)) & 0xFF;
+            ++node->p;
+        }
+
+    } else {
+
+        /* short size */
+        *(node->p) = size & 0xFF;
+        if (size != 0)
+            ++node->p;
+    }
+
+    return 0;
+}
+
+/*
+ * write a ans.1 object into p
+ */
+static int asn1_add_obj(unsigned char *value, unsigned int size, int tag,
+        x509_node *node)
+{
+    int tl = 2;
+
+    if (tag == ASN1_BIT_STRING)
+        ++tl;
+
+    if (size > 127)
+        x509write_realloc_node(node, (size_t) size + tl +
+                asn1_eval_octet(size));
+    else
+        x509write_realloc_node(node, (size_t) size + tl);
+
+    if (node->data == NULL)
+        return 1;
+
+    /* tag */
+    *(node->p) = tag & 0xFF;
+    ++node->p;
+
+    /* len */
+    if (tag == ASN1_BIT_STRING) {
+        asn1_add_len((unsigned int) size + 1, node);
+        *(node->p) = 0x00;
+        ++node->p;
+    } else {
+        asn1_add_len((unsigned int) size, node);
+    }
+
+    /* value */
+    if (size > 0) {
+
+        memcpy(node->p, value, (size_t) size);
+        if ((node->p += size -1) != node->end)
+            return POLARSSL_ERR_X509_POINT_ERROR;
+    } else {
+        /* make nothing -> NULL */
+    }
+
+    return 0;
+}
+
+/*
+ * write a asn.1 conform integer object
+ */
+static int asn1_add_int(signed int value, x509_node *node)
+{
+    signed int i = 0, neg = 1;
+    unsigned int byte, u_val = 0, tmp_val = 0;
+
+    /* if negate? */
+    if (value < 0) {
+        neg = -1;
+        u_val = ~value;
+    } else {
+        u_val = value;
+    }
+
+    byte = asn1_eval_octet(u_val);
+    /* 0 isn't NULL */
+    if (byte == 0)
+        byte = 1;
+
+    /* ASN.1 integer is signed! */
+    if (byte < 4 and ((u_val >> ((byte -1) * 8)) & 0xFF) == 0x80)
+        byte += 1;
+
+    if (x509write_realloc_node(node, (size_t) byte + 2) != 0)
+        return 1;
+
+    /* tag */
+    *(node->p) = ASN1_INTEGER;
+    ++node->p;
+
+    /* len */
+    asn1_add_len(byte, node);
+
+    /* value */
+    for (i = byte; i > 0; --i) {
+
+        tmp_val = (u_val >> ((i - 1) * 8)) & 0xFF;
+        if (neg == 1)
+            *(node->p) = tmp_val;
+        else
+            *(node->p) = ~tmp_val;
+
+        if (i > 1)
+          ++node->p;
+    }
+
+    if (node->p != node->end)
+        return POLARSSL_ERR_X509_POINT_ERROR;
+
+    return 0;
+}
+
+/*
+ * write a asn.1 conform mpi object
+ */
+static int asn1_add_mpi(mpi *value, int tag, x509_node *node)
+{
+    size_t size = (mpi_msb(value) / 8) + 1;
+    unsigned char *buf;
+    int buf_len = (int) size, tl = 2;
+
+    if (tag == ASN1_BIT_STRING)
+        ++tl;
+
+    if (size > 127)
+        x509write_realloc_node(node, size + (size_t) tl +
+            asn1_eval_octet((unsigned int)size));
+    else
+        x509write_realloc_node(node, size + (size_t) tl);
+
+    if (node->data == NULL)
+        return 1;
+
+    buf = (unsigned char*) malloc(size);
+    if (mpi_write_binary(value, buf, buf_len) != 0)
+        return POLARSSL_ERR_MPI_BUFFER_TOO_SMALL;
+
+    /* tag */
+    *(node->p) = tag & 0xFF;
+    ++node->p;
+
+    /* len */
+    if (tag == ASN1_BIT_STRING) {
+        asn1_add_len((unsigned int) size + 1, node);
+        *(node->p) = 0x00;
+        ++node->p;
+    } else {
+        asn1_add_len((unsigned int) size, node);
+    }
+
+    /* value */
+    memcpy(node->p, buf, size);
+    free(buf);
+
+    if ((node->p += (int) size -1) != node->end)
+        return POLARSSL_ERR_X509_POINT_ERROR;
+
+    return 0;
+}
+
+/*
+ * write a node into asn.1 conform object
+ */
+static int asn1_append_tag(x509_node *node, int tag)
+{
+    int tl = 2;
+
+    x509_node tmp;
+    x509write_init_node(&tmp);
+
+    if (tag == ASN1_BIT_STRING)
+        ++tl;
+
+    if (node->len > 127)
+        x509write_realloc_node(&tmp, node->len + (size_t) tl +
+            asn1_eval_octet((unsigned int)node->len));
+    else
+        x509write_realloc_node(&tmp, node->len + (size_t) tl);
+
+    if (tmp.data == NULL) {
+        x509write_free_node(&tmp);
+        return 1;
+    }
+
+    /* tag */
+    *(tmp.p) = tag & 0xFF;
+    ++tmp.p;
+
+    /* len */
+    if (tag == ASN1_BIT_STRING) {
+        asn1_add_len((unsigned int) node->len + 1, &tmp);
+        *(tmp.p) = 0x00;
+        ++tmp.p;
+    } else {
+        asn1_add_len((unsigned int) node->len, &tmp);
+    }
+
+    /* value */
+    memcpy(tmp.p, node->data, node->len);
+
+    /* good? */
+    if ((tmp.p += (int) node->len -1) != tmp.end) {
+        x509write_free_node(&tmp);
+        return POLARSSL_ERR_X509_POINT_ERROR;
+    }
+
+    free(node->data);
+    node->data = tmp.data;
+    node->p = tmp.p;
+    node->end = tmp.end;
+    node->len = tmp.len;
+
+    return 0;
+}
+
+/*
+ * write nodes into a asn.1 object
+ */
+static int asn1_append_nodes(x509_node *node, int tag, int anz, ...)
+{
+    va_list ap;
+    size_t size = 0;
+    x509_node *tmp;
+    int count;
+
+    va_start(ap, anz);
+    count = anz;
+
+    while (count--) {
+
+        tmp = va_arg(ap, x509_node*);
+        if (tmp->data != NULL)
+            size += tmp->len;
+    }
+
+    if ( size > 127) {
+        if (x509write_realloc_node(node, size + (size_t) 2 +
+                    asn1_eval_octet(size)) != 0)
+            return 1;
+    } else {
+        if (x509write_realloc_node(node, size + (size_t) 2) != 0)
+            return 1;
+    }
+
+    /* tag */
+    *(node->p) = tag & 0xFF;
+    ++node->p;
+
+    /* len */
+    asn1_add_len(size, node);
+
+    /* value */
+    va_start(ap, anz);
+    count = anz;
+
+    while (count--) {
+
+        tmp = va_arg(ap, x509_node*);
+        if (tmp->data != NULL) {
+
+            memcpy(node->p, tmp->data, tmp->len);
+            if ((node->p += (int) tmp->len -1) != node->end)
+                ++node->p;
+        }
+    }
+
+    va_end(ap);
+    return 0;
+}
+
+/*
+ * write a ASN.1 conform object identifiere include a "tag"
+ */
+static int asn1_add_oid(x509_node *node, unsigned char *oid, size_t len,
+        int tag, int tag_val, unsigned char *value, size_t val_len)
+{
+    int ret;
+    x509_node tmp;
+
+    x509write_init_node(&tmp);
+
+    /* OBJECT IDENTIFIER */
+    if ((ret = asn1_add_obj(oid, len, ASN1_OID, &tmp)) != 0) {
+        x509write_free_node(&tmp);
+        return ret;
+    }
+
+    /* value */
+    if ((ret = asn1_add_obj(value, val_len, tag_val, &tmp)) != 0) {
+        x509write_free_node(&tmp);
+        return ret;
+    }
+
+    /* SET/SEQUENCE */
+    if ((ret = asn1_append_nodes(node, tag, 1, &tmp)) != 0) {
+        x509write_free_node(&tmp);
+        return ret;
+    }
+
+    x509write_free_node(&tmp);
+    return 0;
+}
+
+/*
+ *  utcTime        UTCTime
+ */
+static int asn1_add_date_utc(unsigned char *time, x509_node *node)
+{
+    unsigned char date[13], *sp;
+    x509_time xtime;
+    int ret;
+
+    sscanf((char*)time, "%d-%d-%d %d:%d:%d", &xtime.year, &xtime.mon,
+    	&xtime.day, &xtime.hour, &xtime.min, &xtime.sec);
+
+    /* convert to YY */
+    if (xtime.year > 2000)
+        xtime.year -= 2000;
+    else
+        xtime.year -= 1900;
+
+    snprintf((char*)date, 13, "%2d%2d%2d%2d%2d%2d", xtime.year, xtime.mon, xtime.day,
+        xtime.hour, xtime.min, xtime.sec);
+
+    /* replace ' ' to '0' */
+    for (sp = date; *sp != '\0'; ++sp)
+        if (*sp == '\x20')
+            *sp = '\x30';
+
+    date[12] = 'Z';
+
+    if ((ret = asn1_add_obj(date, 13, ASN1_UTC_TIME, node)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * serialize an rsa key into DER
+ */
+
+int x509write_serialize_key(rsa_context *rsa, x509_node *node)
+{
+    int ret = 0;
+    x509write_init_node(node);
+
+    /* vers, n, e, d, p, q, dp, dq, pq */
+    if ((ret = asn1_add_int(rsa->ver, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->N, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->E, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->D, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->P, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->Q, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->DP, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->DQ, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_add_mpi(&rsa->QP, ASN1_INTEGER, node)) != 0)
+        return ret;
+    if ((ret = asn1_append_tag(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * write a der/pem encoded rsa private key into a file
+ */
+int x509write_keyfile(rsa_context *rsa, char *path, int out_flag)
+{
+    int ret = 0;
+    const char	key_beg[] = "-----BEGIN RSA PRIVATE KEY-----\n",
+                key_end[] = "-----END RSA PRIVATE KEY-----\n";
+    x509_node node;
+
+    x509write_init_node(&node);
+    if ((ret = x509write_serialize_key(rsa,&node)) != 0) {
+        x509write_free_node(&node);
+	      return ret;
+    }
+
+    ret = x509write_file(&node,path,out_flag,key_beg,key_end);
+    x509write_free_node(&node);
+
+    return ret;
+}
+
+
+/*
+ * reasize the memory for node
+ */
+static int x509write_realloc_node(x509_node *node, size_t larger)
+{
+    /* init len */
+    if (node->data == NULL) {
+        node->len = 0;
+        node->data = malloc(larger);
+        if(node->data == NULL)
+            return 1;
+    } else {
+        /* realloc memory */
+        if ((node->data = realloc(node->data, node->len + larger)) == NULL)
+            return 1;
+    }
+
+    /* init pointer */
+    node->p = &node->data[node->len];
+    node->len += larger;
+    node->end = &node->data[node->len -1];
+
+    return 0;
+}
+
+/*
+ * init node
+ */
+void x509write_init_node(x509_node *node)
+{
+    memset(node, 0, sizeof(x509_node));
+}
+
+/*
+ * clean memory
+ */
+void x509write_free_node(x509_node *node)
+{
+    if (node->data != NULL)
+        free(node->data);
+    node->p = NULL;
+    node->end = NULL;
+    node->len = 0;
+}
+
+/*
+ * write a x509 certificate into file
+ */
+int x509write_crtfile(x509_raw *chain, unsigned char *path, int out_flag)
+{
+    const char	cer_beg[] = "-----BEGIN CERTIFICATE-----\n",
+		cer_end[] = "-----END CERTIFICATE-----\n";
+
+    return x509write_file(&chain->raw, (char*)path, out_flag, cer_beg, cer_end);
+}
+
+/*
+ * write a x509 certificate into file
+ */
+int x509write_csrfile(x509_raw *chain, unsigned char *path, int out_flag)
+{
+    const char	cer_beg[] = "-----BEGIN CERTIFICATE REQUEST-----\n",
+		cer_end[] = "-----END CERTIFICATE REQUEST-----\n";
+
+    return x509write_file(&chain->raw, (char*)path, out_flag, cer_beg, cer_end);
+}
+
+/*
+ * write an x509 file
+ */
+static int x509write_file(x509_node *node, char *path, int format,
+        const char* pem_prolog, const char* pem_epilog)
+{
+    FILE *ofstream = stdout;
+    int is_err = 1, buf_len, i, n;
+    unsigned char* base_buf;
+
+    if (path) {
+    	if ((ofstream = fopen(path, "wb")) == NULL)
+    		return 1;
+    }
+
+    switch (format) {
+        case X509_OUTPUT_DER:
+            if (fwrite(node->data, 1, node->len, ofstream)
+                != node->len)
+                is_err = -1;
+            break;
+
+        case X509_OUTPUT_PEM:
+            if (fprintf(ofstream,pem_prolog)<0) {
+                is_err = -1;
+                break;
+            }
+
+            buf_len = node->len << 1;
+            base_buf = (unsigned char*) malloc((size_t)buf_len);
+            memset(base_buf,0,buf_len);
+            if (base64_encode(base_buf, &buf_len, node->data,
+                        (int) node->len) != 0) {
+                is_err = -1;
+                break;
+            }
+
+            n=strlen((char*)base_buf);
+            for(i=0;i<n;i+=64) {
+                fprintf(ofstream,"%.64s\n",&base_buf[i]);
+            }
+
+            if (fprintf(ofstream, pem_epilog)<0) {
+                is_err = -1;
+                break;
+            }
+
+            free(base_buf);
+    }
+
+    fclose(ofstream);
+
+    if (is_err == -1)
+        return 1;
+
+    return 0;
+}
+
+
+/*
+ * add the owner public key to x509 certificate
+ */
+int x509write_add_pubkey(x509_raw *chain, rsa_context *pubkey)
+{
+    x509_node n_tmp, n_tmp2, *node;
+    int ret;
+
+    node = &chain->subpubkey;
+
+    x509write_init_node(&n_tmp);
+    x509write_init_node(&n_tmp2);
+
+    /*
+    *  RSAPublicKey ::= SEQUENCE {
+    *      modulus           INTEGER,  -- n
+    *      publicExponent    INTEGER   -- e
+    *  }
+    */
+    if ((ret = asn1_add_mpi(&pubkey->N, ASN1_INTEGER, &n_tmp)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+    if ((ret = asn1_add_mpi(&pubkey->E, ASN1_INTEGER, &n_tmp)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+    if ((ret = asn1_append_tag(&n_tmp, ASN1_CONSTRUCTED | ASN1_SEQUENCE))
+            != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+
+    /*
+     *  SubjectPublicKeyInfo  ::=  SEQUENCE  {
+     *       algorithm            AlgorithmIdentifier,
+     *       subjectPublicKey     BIT STRING }
+     */
+    if ((ret = asn1_append_tag(&n_tmp, ASN1_BIT_STRING)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+       return ret;
+    }
+    if ((ret = asn1_add_oid(&n_tmp2, (unsigned char*)OID_PKCS1_RSA, 9,
+                  ASN1_CONSTRUCTED | ASN1_SEQUENCE, ASN1_NULL,
+                  (unsigned char *)"", 0)) != 0) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+
+    if ((ret = asn1_append_nodes(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE, 2,
+                   &n_tmp2, &n_tmp))) {
+        x509write_free_node(&n_tmp);
+        x509write_free_node(&n_tmp2);
+        return ret;
+    }
+
+    x509write_free_node(&n_tmp);
+    x509write_free_node(&n_tmp2);
+    return 0;
+}
+
+/*
+ *  RelativeDistinguishedName ::=
+ *    SET OF AttributeTypeAndValue
+ *
+ *  AttributeTypeAndValue ::= SEQUENCE {
+ *    type     AttributeType,
+ *    value    AttributeValue }
+ */
+static int x509write_add_name(x509_node *node, unsigned char *oid,
+        unsigned int oid_len, unsigned char *value, int len, int value_tag)
+{
+    int ret;
+    x509_node n_tmp;
+
+    x509write_init_node(&n_tmp);
+
+    if ((ret = asn1_add_oid(&n_tmp, oid, oid_len,
+                ASN1_CONSTRUCTED | ASN1_SEQUENCE, value_tag,
+                value, len))) {
+        x509write_free_node(&n_tmp);
+        return ret;
+    }
+
+    if ((asn1_append_nodes(node, ASN1_CONSTRUCTED | ASN1_SET, 1, &n_tmp))
+            != 0) {
+        x509write_free_node(&n_tmp);
+        return ret;
+    }
+
+    x509write_free_node(&n_tmp);
+    return 0;
+}
+
+/*
+ * Parse the name string and add to node
+ */
+static int x509write_parse_names(x509_node *node, unsigned char *names)
+{
+    unsigned char *sp, *begin = NULL;
+    unsigned char oid[3] = OID_X520, tag[4], *tag_sp = tag;
+    unsigned char *C = NULL, *CN = NULL, *O = NULL, *OU = NULL,
+                  *ST = NULL, *L = NULL, *R = NULL;
+    int C_len = 0, CN_len = 0, O_len = 0, OU_len = 0, ST_len = 0,
+		L_len = 0, R_len = 0;
+    int ret = 0, is_tag = 1, is_begin = -1, len = 0;
+
+
+    for (sp = names; ; ++sp) {
+
+        /* filter tag */
+        if (is_tag == 1) {
+
+            if (tag_sp == &tag[3])
+                return POLARSSL_ERR_X509_VALUE_TO_LENGTH;
+
+            /* is tag end? */
+            if (*sp == '=') {
+                is_tag = -1;
+                *tag_sp = '\0';
+                is_begin = 1;
+                /* set len 0 (reset) */
+                len = 0;
+            } else {
+                /* tag hasn't ' '! */
+                if (*sp != ' ') {
+                    *tag_sp = *sp;
+                    ++tag_sp;
+                }
+            }
+        /* filter value */
+        } else {
+
+            /* set pointer of value begin */
+            if (is_begin == 1) {
+                begin = sp;
+                is_begin = -1;
+            }
+
+            /* is value at end? */
+            if (*sp == ';' or *sp == '\0') {
+                is_tag = 1;
+
+                /* common name */
+                if (tag[0] == 'C' and tag[1] == 'N') {
+                    CN = begin;
+                    CN_len = len;
+
+                /* organization */
+                } else if (tag[0] == 'O' and tag[1] == '\0') {
+                    O = begin;
+                    O_len = len;
+
+                /* country */
+                } else if (tag[0] == 'C' and tag[1] == '\0') {
+                    C = begin;
+                    C_len = len;
+
+                /* organisation unit */
+                } else if (tag[0] == 'O' and tag[1] == 'U') {
+                    OU = begin;
+                    OU_len = len;
+
+                /* state */
+                } else if (tag[0] == 'S' and tag[1] == 'T') {
+                    ST = begin;
+                    ST_len = len;
+
+                /* locality */
+                } else if (tag[0] == 'L' and tag[1] == '\0') {
+                    L = begin;
+                    L_len = len;
+
+                /* email */
+                } else if (tag[0] == 'R' and tag[1] == '\0') {
+                    R = begin;
+                    R_len = len;
+                }
+
+                /* set tag poiner to begin */
+                tag_sp = tag;
+
+                /* is at end? */
+                if (*sp == '\0' or *(sp +1) == '\0')
+                    break;
+            } else {
+                ++len;
+            }
+        }
+
+        /* make saver */
+        if (*sp == '\0')
+          break;
+    } /* end for */
+
+    /* country */
+    if (C != NULL) {
+        oid[2] = X520_COUNTRY;
+        if ((ret = x509write_add_name(node, oid, 3, C, C_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* state */
+    if (ST != NULL) {
+        oid[2] = X520_STATE;
+        if ((ret = x509write_add_name(node, oid, 3, ST, ST_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* locality */
+    if (L != NULL) {
+        oid[2] = X520_LOCALITY;
+        if ((ret = x509write_add_name(node, oid, 3, L, L_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* organization */
+    if (O != NULL) {
+        oid[2] = X520_ORGANIZATION;
+        if ((ret = x509write_add_name(node, oid, 3, O, O_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* organisation unit */
+    if (OU != NULL) {
+        oid[2] = X520_ORG_UNIT;
+        if ((ret = x509write_add_name(node, oid, 3, OU, OU_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* common name */
+    if (CN != NULL) {
+        oid[2] = X520_COMMON_NAME;
+        if ((ret = x509write_add_name(node, oid, 3, CN, CN_len,
+                        ASN1_PRINTABLE_STRING)) != 0)
+            return ret;
+    }
+
+    /* email */
+    if (R != NULL) {
+        if ((ret = x509write_add_name(node, (unsigned char*)OID_PKCS9_EMAIL,
+        		9, R, R_len, ASN1_IA5_STRING)) != 0)
+            return ret;
+    }
+
+    if ((asn1_append_tag(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * Copy raw data from orginal ca to node
+ */
+static int x509write_copy_from_raw(x509_node *node, x509_buf *raw)
+{
+    if (x509write_realloc_node(node, raw->len) != 0)
+        return 1;
+
+    memcpy(node->p, raw->p, (size_t)raw->len);
+    if ((node->p += raw->len -1) != node->end)
+        return POLARSSL_ERR_X509_POINT_ERROR;
+
+    return 0;
+}
+
+/*
+ * Add the issuer
+ */
+
+int x509write_add_issuer(x509_raw *crt, unsigned char *issuer)
+{
+    return x509write_parse_names(&crt->issuer, issuer);
+}
+
+/*
+ * Add the subject
+ */
+int x509write_add_subject(x509_raw *crt, unsigned char *subject)
+{
+    return x509write_parse_names(&crt->subject, subject);
+}
+
+/*
+ * Copy issuer line from another cert to issuer
+ */
+int x509write_copy_issuer(x509_raw *crt, x509_cert *from_crt)
+{
+    return x509write_copy_from_raw(&crt->issuer, &from_crt->issuer_raw);
+}
+
+/*
+ * Copy subject line from another cert
+ */
+int x509write_copy_subject(x509_raw *crt, x509_cert *from_crt)
+{
+    return x509write_copy_from_raw(&crt->subject, &from_crt->subject_raw);
+}
+
+/*
+ * Copy subject line form antoher cert into issuer
+ */
+int x509write_copy_issuer_form_subject(x509_raw *crt,
+        x509_cert *from_crt)
+{
+    return x509write_copy_from_raw(&crt->issuer, &from_crt->subject_raw);
+}
+
+/*
+ * Copy issuer line from another cert into subject
+ */
+int x509write_copy_subject_from_issuer(x509_raw *crt,
+        x509_cert * from_crt)
+{
+    return x509write_copy_from_raw(&crt->subject, &from_crt->issuer_raw);
+}
+
+/*
+ *  Validity ::= SEQUENCE {
+ *       notBefore      Time,
+ *       notAfter       Time }
+ *
+ *  Time ::= CHOICE {
+ *       utcTime        UTCTime,
+ *       generalTime    GeneralizedTime }
+ */
+/* TODO: No handle GeneralizedTime! */
+int x509write_add_validity(x509_raw *chain, unsigned char *befor,
+        unsigned char *after)
+{
+    int ret;
+
+    x509_node *node = &chain->validity;
+
+    /* notBefore */
+    if ((ret = asn1_add_date_utc(befor, node)) != 0)
+        return ret;
+
+    /* notAfter */
+    if ((ret = asn1_add_date_utc(after, node)) != 0)
+        return ret;
+
+    if ((ret = asn1_append_tag(node, ASN1_CONSTRUCTED | ASN1_SEQUENCE)) != 0)
+        return ret;
+
+    return 0;
+}
+
+/*
+ * make hash from tbs and sign that with private key
+ */
+static int x509write_make_sign(x509_raw *chain, rsa_context *privkey)
+{
+    int ret;
+    unsigned char hash[20], *sign;
+    size_t sign_len = (size_t) mpi_size(&privkey->N);
+
+    /* make hash */
+    sha1(chain->tbs.data, chain->tbs.len, hash);
+
+    /* create sign */
+    sign = (unsigned char *) malloc(sign_len);
+    if (sign == NULL)
+        return 1;
+
+    if ((ret = rsa_pkcs1_sign(privkey, RSA_PRIVATE, RSA_SHA1, 20, hash,
+                    sign)) != 0)
+        return ret;
+
+    if ((ret = asn1_add_obj(sign, sign_len, ASN1_BIT_STRING,
+                    &chain->sign)) != 0)
+        return ret;
+
+    /*
+     *  AlgorithmIdentifier  ::=  SEQUENCE  {
+     *       algorithm               OBJECT IDENTIFIER,
+     *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+     */
+    return asn1_add_oid(&chain->signalg, (unsigned char*)OID_PKCS1_RSA_SHA, 9,
+                  ASN1_CONSTRUCTED | ASN1_SEQUENCE, ASN1_NULL,
+                  (unsigned char*)"", 0);
+}
+
+/*
+ * Create a random serial
+ */
+static int get_random_serial(void)
+{
+    int random = 0;
+    FILE *fd;
+
+    fd = fopen("/dev/urandom", "r");
+
+    if (fd) {
+	if (fread(&random, 1, sizeof(random), fd) != sizeof(random))
+            random = 0;
+
+        fclose(fd);
+    }
+
+    return random;
+}
+
+/*
+ * Create a self signed certificate
+ */
+int x509write_create_sign(x509_raw *chain, rsa_context *privkey)
+{
+    int ret, serial;
+
+    /*
+     *  Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
+     */
+    if ((ret = asn1_add_int(2, &chain->version)) != 0)
+        return ret;
+
+    if ((ret = asn1_append_tag(&chain->version, ASN1_CONTEXT_SPECIFIC |
+                    ASN1_CONSTRUCTED)) != 0)
+        return ret;
+
+
+    /*
+     *  CertificateSerialNumber  ::=  INTEGER
+     */
+    serial = get_random_serial();
+
+    if (serial == 0)
+        return 1;
+
+    if ((ret = asn1_add_int(serial, &chain->serial)) != 0)
+        return ret;
+
+    /*
+     *  AlgorithmIdentifier  ::=  SEQUENCE  {
+     *       algorithm               OBJECT IDENTIFIER,
+     *       parameters              ANY DEFINED BY algorithm OPTIONAL  }
+     */
+    if ((ret = asn1_add_oid(&chain->tbs_signalg,
+				(unsigned char*)OID_PKCS1_RSA_SHA, 9, ASN1_CONSTRUCTED |
+				ASN1_SEQUENCE, ASN1_NULL, (unsigned char*)"", 0)) != 0)
+        return ret;
+
+   /*
+    *  Create the tbs
+    */
+    if ((ret = asn1_append_nodes(&chain->tbs, ASN1_CONSTRUCTED |
+                    ASN1_SEQUENCE, 7, &chain->version, &chain->serial,
+                    &chain->tbs_signalg, &chain->issuer, &chain->validity,
+                    &chain->subject, &chain->subpubkey)) != 0)
+        return ret;
+
+    /* make signing */
+    if ((ret = x509write_make_sign(chain, privkey)) != 0)
+        return ret;
+
+    /* finishing */
+    if ((ret = asn1_append_nodes(&chain->raw, ASN1_CONSTRUCTED |
+                    ASN1_SEQUENCE, 3, &chain->tbs, &chain->signalg,
+                    &chain->sign)) != 0)
+        return ret;
+
+    return 0;
+}
+
+int x509write_create_selfsign(x509_raw *chain, rsa_context *privkey)
+{
+    /*
+     * On self signed certificate are subject and issuer the same
+     */
+    x509write_free_node(&chain->issuer);
+    chain->issuer = chain->subject;
+    return x509write_create_sign(chain, privkey);
+}
+
+/*
+ * CertificationRequestInfo ::= SEQUENCE                    {
+ *    version                       Version,
+ *    subject                       Name,
+ *    subjectPublicKeyInfo          SubjectPublicKeyInfo,
+ *    attributes                    [0] IMPLICIT Attributes }
+ *
+ * CertificationRequest ::=   SEQUENCE                      {
+ *    certificationRequestInfo  CertificationRequestInfo,
+ *    signatureAlgorithm        SignatureAlgorithmIdentifier,
+ *    signature                 Signature                   }
+ *
+ * It use chain.serail for attributes!
+ *
+ */
+int x509write_create_csr(x509_raw *chain, rsa_context *privkey)
+{
+    int ret;
+
+    /* version ::= INTEGER */
+    if ((ret = asn1_add_int(0, &chain->version)) != 0)
+        return ret;
+
+    /* write attributes */
+    if ((ret = asn1_add_obj((unsigned char*)"", 0, ASN1_CONTEXT_SPECIFIC |
+                    ASN1_CONSTRUCTED, &chain->serial)) != 0)
+        return ret;
+
+    /* create CertificationRequestInfo */
+    if ((ret = asn1_append_nodes(&chain->tbs, ASN1_CONSTRUCTED |
+                    ASN1_SEQUENCE, 4, &chain->version, &chain->subject,
+                    &chain->subpubkey, &chain->serial)) != 0)
+        return ret;
+
+    /* make signing */
+    if ((ret = x509write_make_sign(chain, privkey)) != 0)
+        return ret;
+
+    /* finish */
+    if ((ret = asn1_append_nodes(&chain->raw, ASN1_CONSTRUCTED | ASN1_SEQUENCE,
+                    3, &chain->tbs, &chain->signalg, &chain->sign)) != 0)
+        return ret;
+
+    return ret;
+}
+
+/*
+ * Free memory
+ */
+void x509write_free_raw(x509_raw *chain)
+{
+    x509write_free_node(&chain->raw);
+    x509write_free_node(&chain->tbs);
+    x509write_free_node(&chain->version);
+    x509write_free_node(&chain->serial);
+    x509write_free_node(&chain->tbs_signalg);
+    x509write_free_node(&chain->issuer);
+    x509write_free_node(&chain->validity);
+    if (chain->subject.data != chain->issuer.data)
+        x509write_free_node(&chain->subject);
+    x509write_free_node(&chain->subpubkey);
+    x509write_free_node(&chain->signalg);
+    x509write_free_node(&chain->sign);
+}
+
+void x509write_init_raw(x509_raw *chain)
+{
+    memset((void *) chain, 0, sizeof(x509_raw));
+}
+
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/base64.h b/trunk/package/utils/px5g-standalone/src/polarssl/base64.h
new file mode 100644
index 00000000..c48267b1
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/base64.h
@@ -0,0 +1,93 @@
+/**
+ * \file base64.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_BASE64_H
+#define POLARSSL_BASE64_H
+
+#define POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL               -0x0010
+#define POLARSSL_ERR_BASE64_INVALID_CHARACTER              -0x0012
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Encode a buffer into base64 format
+ *
+ * \param dst      destination buffer
+ * \param dlen     size of the buffer
+ * \param src      source buffer
+ * \param slen     amount of data to be encoded
+ *
+ * \return         0 if successful, or POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL.
+ *                 *dlen is always updated to reflect the amount
+ *                 of data that has (or would have) been written.
+ *
+ * \note           Call this function with *dlen = 0 to obtain the
+ *                 required buffer size in *dlen
+ */
+int base64_encode( unsigned char *dst, int *dlen,
+                   unsigned char *src, int  slen );
+
+/**
+ * \brief          Decode a base64-formatted buffer
+ *
+ * \param dst      destination buffer
+ * \param dlen     size of the buffer
+ * \param src      source buffer
+ * \param slen     amount of data to be decoded
+ *
+ * \return         0 if successful, POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL, or
+ *                 POLARSSL_ERR_BASE64_INVALID_DATA if the input data is not
+ *                 correct. *dlen is always updated to reflect the amount
+ *                 of data that has (or would have) been written.
+ *
+ * \note           Call this function with *dlen = 0 to obtain the
+ *                 required buffer size in *dlen
+ */
+int base64_decode( unsigned char *dst, int *dlen,
+                   unsigned char *src, int  slen );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int base64_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* base64.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/bignum.h b/trunk/package/utils/px5g-standalone/src/polarssl/bignum.h
new file mode 100644
index 00000000..c6673033
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/bignum.h
@@ -0,0 +1,437 @@
+/**
+ * \file bignum.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_BIGNUM_H
+#define POLARSSL_BIGNUM_H
+
+#include <stdio.h>
+
+#define POLARSSL_ERR_MPI_FILE_IO_ERROR                     -0x0002
+#define POLARSSL_ERR_MPI_BAD_INPUT_DATA                    -0x0004
+#define POLARSSL_ERR_MPI_INVALID_CHARACTER                 -0x0006
+#define POLARSSL_ERR_MPI_BUFFER_TOO_SMALL                  -0x0008
+#define POLARSSL_ERR_MPI_NEGATIVE_VALUE                    -0x000A
+#define POLARSSL_ERR_MPI_DIVISION_BY_ZERO                  -0x000C
+#define POLARSSL_ERR_MPI_NOT_ACCEPTABLE                    -0x000E
+
+#define MPI_CHK(f) if( ( ret = f ) != 0 ) goto cleanup
+
+/*
+ * Define the base integer type, architecture-wise
+ */
+#if defined(POLARSSL_HAVE_INT8)
+typedef unsigned char  t_int;
+typedef unsigned short t_dbl;
+#else
+#if defined(POLARSSL_HAVE_INT16)
+typedef unsigned short t_int;
+typedef unsigned long  t_dbl;
+#else
+  typedef unsigned long t_int;
+  #if defined(_MSC_VER) && defined(_M_IX86)
+  typedef unsigned __int64 t_dbl;
+  #else
+    #if defined(__amd64__) || defined(__x86_64__)    || \
+        defined(__ppc64__) || defined(__powerpc64__) || \
+        defined(__ia64__)  || defined(__alpha__)
+    typedef unsigned int t_dbl __attribute__((mode(TI)));
+    #else
+    typedef unsigned long long t_dbl;
+    #endif
+  #endif
+#endif
+#endif
+
+/**
+ * \brief          MPI structure
+ */
+typedef struct
+{
+    int s;              /*!<  integer sign      */
+    int n;              /*!<  total # of limbs  */
+    t_int *p;           /*!<  pointer to limbs  */
+}
+mpi;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Initialize one or more mpi
+ */
+void mpi_init( mpi *X, ... );
+
+/**
+ * \brief          Unallocate one or more mpi
+ */
+void mpi_free( mpi *X, ... );
+
+/**
+ * \brief          Enlarge to the specified number of limbs
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_grow( mpi *X, int nblimbs );
+
+/**
+ * \brief          Copy the contents of Y into X
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_copy( mpi *X, mpi *Y );
+
+/**
+ * \brief          Swap the contents of X and Y
+ */
+void mpi_swap( mpi *X, mpi *Y );
+
+/**
+ * \brief          Set value from integer
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_lset( mpi *X, int z );
+
+/**
+ * \brief          Return the number of least significant bits
+ */
+int mpi_lsb( mpi *X );
+
+/**
+ * \brief          Return the number of most significant bits
+ */
+int mpi_msb( mpi *X );
+
+/**
+ * \brief          Return the total size in bytes
+ */
+int mpi_size( mpi *X );
+
+/**
+ * \brief          Import from an ASCII string
+ *
+ * \param X        destination mpi
+ * \param radix    input numeric base
+ * \param s        null-terminated string buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ */
+int mpi_read_string( mpi *X, int radix, char *s );
+
+/**
+ * \brief          Export into an ASCII string
+ *
+ * \param X        source mpi
+ * \param radix    output numeric base
+ * \param s        string buffer
+ * \param slen     string buffer size
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ *
+ * \note           Call this function with *slen = 0 to obtain the
+ *                 minimum required buffer size in *slen.
+ */
+int mpi_write_string( mpi *X, int radix, char *s, int *slen );
+
+/**
+ * \brief          Read X from an opened file
+ *
+ * \param X        destination mpi
+ * \param radix    input numeric base
+ * \param fin      input file handle
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ */
+int mpi_read_file( mpi *X, int radix, FILE *fin );
+
+/**
+ * \brief          Write X into an opened file, or stdout
+ *
+ * \param p        prefix, can be NULL
+ * \param X        source mpi
+ * \param radix    output numeric base
+ * \param fout     output file handle
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_MPI_XXX error code
+ *
+ * \note           Set fout == NULL to print X on the console.
+ */
+int mpi_write_file( char *p, mpi *X, int radix, FILE *fout );
+
+/**
+ * \brief          Import X from unsigned binary data, big endian
+ *
+ * \param X        destination mpi
+ * \param buf      input buffer
+ * \param buflen   input buffer size
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_read_binary( mpi *X, unsigned char *buf, int buflen );
+
+/**
+ * \brief          Export X into unsigned binary data, big endian
+ *
+ * \param X        source mpi
+ * \param buf      output buffer
+ * \param buflen   output buffer size
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_MPI_BUFFER_TOO_SMALL if buf isn't large enough
+ *
+ * \note           Call this function with *buflen = 0 to obtain the
+ *                 minimum required buffer size in *buflen.
+ */
+int mpi_write_binary( mpi *X, unsigned char *buf, int buflen );
+
+/**
+ * \brief          Left-shift: X <<= count
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_shift_l( mpi *X, int count );
+
+/**
+ * \brief          Right-shift: X >>= count
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_shift_r( mpi *X, int count );
+
+/**
+ * \brief          Compare unsigned values
+ *
+ * \return         1 if |X| is greater than |Y|,
+ *                -1 if |X| is lesser  than |Y| or
+ *                 0 if |X| is equal to |Y|
+ */
+int mpi_cmp_abs( mpi *X, mpi *Y );
+
+/**
+ * \brief          Compare signed values
+ *
+ * \return         1 if X is greater than Y,
+ *                -1 if X is lesser  than Y or
+ *                 0 if X is equal to Y
+ */
+int mpi_cmp_mpi( mpi *X, mpi *Y );
+
+/**
+ * \brief          Compare signed values
+ *
+ * \return         1 if X is greater than z,
+ *                -1 if X is lesser  than z or
+ *                 0 if X is equal to z
+ */
+int mpi_cmp_int( mpi *X, int z );
+
+/**
+ * \brief          Unsigned addition: X = |A| + |B|
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_add_abs( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Unsigned substraction: X = |A| - |B|
+ *
+ * \return         0 if successful,
+ *                 POLARSSL_ERR_MPI_NEGATIVE_VALUE if B is greater than A
+ */
+int mpi_sub_abs( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Signed addition: X = A + B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_add_mpi( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Signed substraction: X = A - B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_sub_mpi( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Signed addition: X = A + b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_add_int( mpi *X, mpi *A, int b );
+
+/**
+ * \brief          Signed substraction: X = A - b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_sub_int( mpi *X, mpi *A, int b );
+
+/**
+ * \brief          Baseline multiplication: X = A * B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_mul_mpi( mpi *X, mpi *A, mpi *B );
+
+/**
+ * \brief          Baseline multiplication: X = A * b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_mul_int( mpi *X, mpi *A, t_int b );
+
+/**
+ * \brief          Division by mpi: A = Q * B + R
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0
+ *
+ * \note           Either Q or R can be NULL.
+ */
+int mpi_div_mpi( mpi *Q, mpi *R, mpi *A, mpi *B );
+
+/**
+ * \brief          Division by int: A = Q * b + R
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0
+ *
+ * \note           Either Q or R can be NULL.
+ */
+int mpi_div_int( mpi *Q, mpi *R, mpi *A, int b );
+
+/**
+ * \brief          Modulo: R = A mod B
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if B == 0
+ */
+int mpi_mod_mpi( mpi *R, mpi *A, mpi *B );
+
+/**
+ * \brief          Modulo: r = A mod b
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_DIVISION_BY_ZERO if b == 0
+ */
+int mpi_mod_int( t_int *r, mpi *A, int b );
+
+/**
+ * \brief          Sliding-window exponentiation: X = A^E mod N
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or even
+ *
+ * \note           _RR is used to avoid re-computing R*R mod N across
+ *                 multiple calls, which speeds up things a bit. It can
+ *                 be set to NULL if the extra performance is unneeded.
+ */
+int mpi_exp_mod( mpi *X, mpi *A, mpi *E, mpi *N, mpi *_RR );
+
+/**
+ * \brief          Greatest common divisor: G = gcd(A, B)
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed
+ */
+int mpi_gcd( mpi *G, mpi *A, mpi *B );
+
+/**
+ * \brief          Modular inverse: X = A^-1 mod N
+ *
+ * \return         0 if successful,
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if N is negative or nil
+ *                 POLARSSL_ERR_MPI_NOT_ACCEPTABLE if A has no inverse mod N
+ */
+int mpi_inv_mod( mpi *X, mpi *A, mpi *N );
+
+/**
+ * \brief          Miller-Rabin primality test
+ *
+ * \return         0 if successful (probably prime),
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_NOT_ACCEPTABLE if X is not prime
+ */
+int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng );
+
+/**
+ * \brief          Prime number generation
+ *
+ * \param X        destination mpi
+ * \param nbits    required size of X in bits
+ * \param dh_flag  if 1, then (X-1)/2 will be prime too
+ * \param f_rng    RNG function
+ * \param p_rng    RNG parameter
+ *
+ * \return         0 if successful (probably prime),
+ *                 1 if memory allocation failed,
+ *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if nbits is < 3
+ */
+int mpi_gen_prime( mpi *X, int nbits, int dh_flag,
+                   int (*f_rng)(void *), void *p_rng );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int mpi_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* bignum.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/bn_mul.h b/trunk/package/utils/px5g-standalone/src/polarssl/bn_mul.h
new file mode 100644
index 00000000..f6d34da5
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/bn_mul.h
@@ -0,0 +1,731 @@
+/**
+ * \file bn_mul.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *      Multiply source vector [s] with b, add result
+ *       to destination vector [d] and set carry c.
+ *
+ *      Currently supports:
+ *
+ *         . IA-32 (386+)         . AMD64 / EM64T
+ *         . IA-32 (SSE2)         . Motorola 68000
+ *         . PowerPC, 32-bit      . MicroBlaze
+ *         . PowerPC, 64-bit      . TriCore
+ *         . SPARC v8             . ARM v3+
+ *         . Alpha                . MIPS32
+ *         . C, longlong          . C, generic
+ */
+#ifndef POLARSSL_BN_MUL_H
+#define POLARSSL_BN_MUL_H
+
+#include "polarssl/config.h"
+
+#if defined(POLARSSL_HAVE_ASM)
+
+#if defined(__GNUC__)
+#if defined(__i386__)
+
+#define MULADDC_INIT                            \
+    asm( "movl   %%ebx, %0      " : "=m" (t));  \
+    asm( "movl   %0, %%esi      " :: "m" (s));  \
+    asm( "movl   %0, %%edi      " :: "m" (d));  \
+    asm( "movl   %0, %%ecx      " :: "m" (c));  \
+    asm( "movl   %0, %%ebx      " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "lodsl                 " );            \
+    asm( "mull   %ebx           " );            \
+    asm( "addl   %ecx,   %eax   " );            \
+    asm( "adcl   $0,     %edx   " );            \
+    asm( "addl   (%edi), %eax   " );            \
+    asm( "adcl   $0,     %edx   " );            \
+    asm( "movl   %edx,   %ecx   " );            \
+    asm( "stosl                 " );
+
+#if defined(POLARSSL_HAVE_SSE2)
+
+#define MULADDC_HUIT                            \
+    asm( "movd     %ecx,     %mm1     " );      \
+    asm( "movd     %ebx,     %mm0     " );      \
+    asm( "movd     (%edi),   %mm3     " );      \
+    asm( "paddq    %mm3,     %mm1     " );      \
+    asm( "movd     (%esi),   %mm2     " );      \
+    asm( "pmuludq  %mm0,     %mm2     " );      \
+    asm( "movd     4(%esi),  %mm4     " );      \
+    asm( "pmuludq  %mm0,     %mm4     " );      \
+    asm( "movd     8(%esi),  %mm6     " );      \
+    asm( "pmuludq  %mm0,     %mm6     " );      \
+    asm( "movd     12(%esi), %mm7     " );      \
+    asm( "pmuludq  %mm0,     %mm7     " );      \
+    asm( "paddq    %mm2,     %mm1     " );      \
+    asm( "movd     4(%edi),  %mm3     " );      \
+    asm( "paddq    %mm4,     %mm3     " );      \
+    asm( "movd     8(%edi),  %mm5     " );      \
+    asm( "paddq    %mm6,     %mm5     " );      \
+    asm( "movd     12(%edi), %mm4     " );      \
+    asm( "paddq    %mm4,     %mm7     " );      \
+    asm( "movd     %mm1,     (%edi)   " );      \
+    asm( "movd     16(%esi), %mm2     " );      \
+    asm( "pmuludq  %mm0,     %mm2     " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "movd     20(%esi), %mm4     " );      \
+    asm( "pmuludq  %mm0,     %mm4     " );      \
+    asm( "paddq    %mm3,     %mm1     " );      \
+    asm( "movd     24(%esi), %mm6     " );      \
+    asm( "pmuludq  %mm0,     %mm6     " );      \
+    asm( "movd     %mm1,     4(%edi)  " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "movd     28(%esi), %mm3     " );      \
+    asm( "pmuludq  %mm0,     %mm3     " );      \
+    asm( "paddq    %mm5,     %mm1     " );      \
+    asm( "movd     16(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm2     " );      \
+    asm( "movd     %mm1,     8(%edi)  " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm7,     %mm1     " );      \
+    asm( "movd     20(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm4     " );      \
+    asm( "movd     %mm1,     12(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm2,     %mm1     " );      \
+    asm( "movd     24(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm6     " );      \
+    asm( "movd     %mm1,     16(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm4,     %mm1     " );      \
+    asm( "movd     28(%edi), %mm5     " );      \
+    asm( "paddq    %mm5,     %mm3     " );      \
+    asm( "movd     %mm1,     20(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm6,     %mm1     " );      \
+    asm( "movd     %mm1,     24(%edi) " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "paddq    %mm3,     %mm1     " );      \
+    asm( "movd     %mm1,     28(%edi) " );      \
+    asm( "addl     $32,      %edi     " );      \
+    asm( "addl     $32,      %esi     " );      \
+    asm( "psrlq    $32,      %mm1     " );      \
+    asm( "movd     %mm1,     %ecx     " );
+
+#define MULADDC_STOP                            \
+    asm( "emms                        " );      \
+    asm( "movl   %0, %%ebx      " :: "m" (t));  \
+    asm( "movl   %%ecx, %0      " : "=m" (c));  \
+    asm( "movl   %%edi, %0      " : "=m" (d));  \
+    asm( "movl   %%esi, %0      " : "=m" (s) :: \
+    "eax", "ecx", "edx", "esi", "edi" );
+
+#else
+
+#define MULADDC_STOP                            \
+    asm( "movl   %0, %%ebx      " :: "m" (t));  \
+    asm( "movl   %%ecx, %0      " : "=m" (c));  \
+    asm( "movl   %%edi, %0      " : "=m" (d));  \
+    asm( "movl   %%esi, %0      " : "=m" (s) :: \
+    "eax", "ecx", "edx", "esi", "edi" );
+
+#endif /* SSE2 */
+#endif /* i386 */
+
+#if defined(__amd64__) || defined (__x86_64__)
+
+#define MULADDC_INIT                            \
+    asm( "movq   %0, %%rsi      " :: "m" (s));  \
+    asm( "movq   %0, %%rdi      " :: "m" (d));  \
+    asm( "movq   %0, %%rcx      " :: "m" (c));  \
+    asm( "movq   %0, %%rbx      " :: "m" (b));  \
+    asm( "xorq   %r8, %r8       " );
+
+#define MULADDC_CORE                            \
+    asm( "movq  (%rsi),%rax     " );            \
+    asm( "mulq   %rbx           " );            \
+    asm( "addq   $8,   %rsi     " );            \
+    asm( "addq   %rcx, %rax     " );            \
+    asm( "movq   %r8,  %rcx     " );            \
+    asm( "adcq   $0,   %rdx     " );            \
+    asm( "nop                   " );            \
+    asm( "addq   %rax, (%rdi)   " );            \
+    asm( "adcq   %rdx, %rcx     " );            \
+    asm( "addq   $8,   %rdi     " );
+
+#define MULADDC_STOP                            \
+    asm( "movq   %%rcx, %0      " : "=m" (c));  \
+    asm( "movq   %%rdi, %0      " : "=m" (d));  \
+    asm( "movq   %%rsi, %0      " : "=m" (s) :: \
+    "rax", "rcx", "rdx", "rbx", "rsi", "rdi", "r8" );
+
+#endif /* AMD64 */
+
+#if defined(__mc68020__) || defined(__mcpu32__)
+
+#define MULADDC_INIT                            \
+    asm( "movl   %0, %%a2       " :: "m" (s));  \
+    asm( "movl   %0, %%a3       " :: "m" (d));  \
+    asm( "movl   %0, %%d3       " :: "m" (c));  \
+    asm( "movl   %0, %%d2       " :: "m" (b));  \
+    asm( "moveq  #0, %d0        " );
+
+#define MULADDC_CORE                            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addl   %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "moveq  #0,  %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "addxl  %d4, %d3       " );
+
+#define MULADDC_STOP                            \
+    asm( "movl   %%d3, %0       " : "=m" (c));  \
+    asm( "movl   %%a3, %0       " : "=m" (d));  \
+    asm( "movl   %%a2, %0       " : "=m" (s) :: \
+    "d0", "d1", "d2", "d3", "d4", "a2", "a3" );
+
+#define MULADDC_HUIT                            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d4:%d1   " );            \
+    asm( "addxl  %d3, %d1       " );            \
+    asm( "addxl  %d0, %d4       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "movel  %a2@+, %d1     " );            \
+    asm( "mulul  %d2, %d3:%d1   " );            \
+    asm( "addxl  %d4, %d1       " );            \
+    asm( "addxl  %d0, %d3       " );            \
+    asm( "addl   %d1, %a3@+     " );            \
+    asm( "addxl  %d0, %d3       " );
+
+#endif /* MC68000 */
+
+#if defined(__powerpc__)   || defined(__ppc__)
+#if defined(__powerpc64__) || defined(__ppc64__)
+
+#if defined(__MACH__) && defined(__APPLE__)
+
+#define MULADDC_INIT                            \
+    asm( "ld     r3, %0         " :: "m" (s));  \
+    asm( "ld     r4, %0         " :: "m" (d));  \
+    asm( "ld     r5, %0         " :: "m" (c));  \
+    asm( "ld     r6, %0         " :: "m" (b));  \
+    asm( "addi   r3, r3, -8     " );            \
+    asm( "addi   r4, r4, -8     " );            \
+    asm( "addic  r5, r5,  0     " );
+
+#define MULADDC_CORE                            \
+    asm( "ldu    r7, 8(r3)      " );            \
+    asm( "mulld  r8, r7, r6     " );            \
+    asm( "mulhdu r9, r7, r6     " );            \
+    asm( "adde   r8, r8, r5     " );            \
+    asm( "ld     r7, 8(r4)      " );            \
+    asm( "addze  r5, r9         " );            \
+    asm( "addc   r8, r8, r7     " );            \
+    asm( "stdu   r8, 8(r4)      " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  r5, r5         " );            \
+    asm( "addi   r4, r4, 8      " );            \
+    asm( "addi   r3, r3, 8      " );            \
+    asm( "std    r5, %0         " : "=m" (c));  \
+    asm( "std    r4, %0         " : "=m" (d));  \
+    asm( "std    r3, %0         " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#else
+
+#define MULADDC_INIT                            \
+    asm( "ld     %%r3, %0       " :: "m" (s));  \
+    asm( "ld     %%r4, %0       " :: "m" (d));  \
+    asm( "ld     %%r5, %0       " :: "m" (c));  \
+    asm( "ld     %%r6, %0       " :: "m" (b));  \
+    asm( "addi   %r3, %r3, -8   " );            \
+    asm( "addi   %r4, %r4, -8   " );            \
+    asm( "addic  %r5, %r5,  0   " );
+
+#define MULADDC_CORE                            \
+    asm( "ldu    %r7, 8(%r3)    " );            \
+    asm( "mulld  %r8, %r7, %r6  " );            \
+    asm( "mulhdu %r9, %r7, %r6  " );            \
+    asm( "adde   %r8, %r8, %r5  " );            \
+    asm( "ld     %r7, 8(%r4)    " );            \
+    asm( "addze  %r5, %r9       " );            \
+    asm( "addc   %r8, %r8, %r7  " );            \
+    asm( "stdu   %r8, 8(%r4)    " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  %r5, %r5       " );            \
+    asm( "addi   %r4, %r4, 8    " );            \
+    asm( "addi   %r3, %r3, 8    " );            \
+    asm( "std    %%r5, %0       " : "=m" (c));  \
+    asm( "std    %%r4, %0       " : "=m" (d));  \
+    asm( "std    %%r3, %0       " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#endif
+
+#else /* PPC32 */
+
+#if defined(__MACH__) && defined(__APPLE__)
+
+#define MULADDC_INIT                            \
+    asm( "lwz    r3, %0         " :: "m" (s));  \
+    asm( "lwz    r4, %0         " :: "m" (d));  \
+    asm( "lwz    r5, %0         " :: "m" (c));  \
+    asm( "lwz    r6, %0         " :: "m" (b));  \
+    asm( "addi   r3, r3, -4     " );            \
+    asm( "addi   r4, r4, -4     " );            \
+    asm( "addic  r5, r5,  0     " );
+
+#define MULADDC_CORE                            \
+    asm( "lwzu   r7, 4(r3)      " );            \
+    asm( "mullw  r8, r7, r6     " );            \
+    asm( "mulhwu r9, r7, r6     " );            \
+    asm( "adde   r8, r8, r5     " );            \
+    asm( "lwz    r7, 4(r4)      " );            \
+    asm( "addze  r5, r9         " );            \
+    asm( "addc   r8, r8, r7     " );            \
+    asm( "stwu   r8, 4(r4)      " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  r5, r5         " );            \
+    asm( "addi   r4, r4, 4      " );            \
+    asm( "addi   r3, r3, 4      " );            \
+    asm( "stw    r5, %0         " : "=m" (c));  \
+    asm( "stw    r4, %0         " : "=m" (d));  \
+    asm( "stw    r3, %0         " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#else
+
+#define MULADDC_INIT                            \
+    asm( "lwz    %%r3, %0       " :: "m" (s));  \
+    asm( "lwz    %%r4, %0       " :: "m" (d));  \
+    asm( "lwz    %%r5, %0       " :: "m" (c));  \
+    asm( "lwz    %%r6, %0       " :: "m" (b));  \
+    asm( "addi   %r3, %r3, -4   " );            \
+    asm( "addi   %r4, %r4, -4   " );            \
+    asm( "addic  %r5, %r5,  0   " );
+
+#define MULADDC_CORE                            \
+    asm( "lwzu   %r7, 4(%r3)    " );            \
+    asm( "mullw  %r8, %r7, %r6  " );            \
+    asm( "mulhwu %r9, %r7, %r6  " );            \
+    asm( "adde   %r8, %r8, %r5  " );            \
+    asm( "lwz    %r7, 4(%r4)    " );            \
+    asm( "addze  %r5, %r9       " );            \
+    asm( "addc   %r8, %r8, %r7  " );            \
+    asm( "stwu   %r8, 4(%r4)    " );
+
+#define MULADDC_STOP                            \
+    asm( "addze  %r5, %r5       " );            \
+    asm( "addi   %r4, %r4, 4    " );            \
+    asm( "addi   %r3, %r3, 4    " );            \
+    asm( "stw    %%r5, %0       " : "=m" (c));  \
+    asm( "stw    %%r4, %0       " : "=m" (d));  \
+    asm( "stw    %%r3, %0       " : "=m" (s) :: \
+    "r3", "r4", "r5", "r6", "r7", "r8", "r9" );
+
+#endif
+
+#endif /* PPC32 */
+#endif /* PPC64 */
+
+#if defined(__sparc__)
+
+#define MULADDC_INIT                            \
+    asm( "ld     %0, %%o0       " :: "m" (s));  \
+    asm( "ld     %0, %%o1       " :: "m" (d));  \
+    asm( "ld     %0, %%o2       " :: "m" (c));  \
+    asm( "ld     %0, %%o3       " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "ld    [%o0], %o4      " );            \
+    asm( "inc      4,  %o0      " );            \
+    asm( "ld    [%o1], %o5      " );            \
+    asm( "umul   %o3,  %o4, %o4 " );            \
+    asm( "addcc  %o4,  %o2, %o4 " );            \
+    asm( "rd      %y,  %g1      " );            \
+    asm( "addx   %g1,    0, %g1 " );            \
+    asm( "addcc  %o4,  %o5, %o4 " );            \
+    asm( "st     %o4, [%o1]     " );            \
+    asm( "addx   %g1,    0, %o2 " );            \
+    asm( "inc      4,  %o1      " );
+
+#define MULADDC_STOP                            \
+    asm( "st     %%o2, %0       " : "=m" (c));  \
+    asm( "st     %%o1, %0       " : "=m" (d));  \
+    asm( "st     %%o0, %0       " : "=m" (s) :: \
+    "g1", "o0", "o1", "o2", "o3", "o4", "o5" );
+
+#endif /* SPARCv8 */
+
+#if defined(__microblaze__) || defined(microblaze)
+
+#define MULADDC_INIT                            \
+    asm( "lwi   r3,   %0        " :: "m" (s));  \
+    asm( "lwi   r4,   %0        " :: "m" (d));  \
+    asm( "lwi   r5,   %0        " :: "m" (c));  \
+    asm( "lwi   r6,   %0        " :: "m" (b));  \
+    asm( "andi  r7,   r6, 0xffff" );            \
+    asm( "bsrli r6,   r6, 16    " );
+
+#define MULADDC_CORE                            \
+    asm( "lhui  r8,   r3,   0   " );            \
+    asm( "addi  r3,   r3,   2   " );            \
+    asm( "lhui  r9,   r3,   0   " );            \
+    asm( "addi  r3,   r3,   2   " );            \
+    asm( "mul   r10,  r9,  r6   " );            \
+    asm( "mul   r11,  r8,  r7   " );            \
+    asm( "mul   r12,  r9,  r7   " );            \
+    asm( "mul   r13,  r8,  r6   " );            \
+    asm( "bsrli  r8, r10,  16   " );            \
+    asm( "bsrli  r9, r11,  16   " );            \
+    asm( "add   r13, r13,  r8   " );            \
+    asm( "add   r13, r13,  r9   " );            \
+    asm( "bslli r10, r10,  16   " );            \
+    asm( "bslli r11, r11,  16   " );            \
+    asm( "add   r12, r12, r10   " );            \
+    asm( "addc  r13, r13,  r0   " );            \
+    asm( "add   r12, r12, r11   " );            \
+    asm( "addc  r13, r13,  r0   " );            \
+    asm( "lwi   r10,  r4,   0   " );            \
+    asm( "add   r12, r12, r10   " );            \
+    asm( "addc  r13, r13,  r0   " );            \
+    asm( "add   r12, r12,  r5   " );            \
+    asm( "addc   r5, r13,  r0   " );            \
+    asm( "swi   r12,  r4,   0   " );            \
+    asm( "addi   r4,  r4,   4   " );
+
+#define MULADDC_STOP                            \
+    asm( "swi   r5,   %0        " : "=m" (c));  \
+    asm( "swi   r4,   %0        " : "=m" (d));  \
+    asm( "swi   r3,   %0        " : "=m" (s) :: \
+     "r3", "r4" , "r5" , "r6" , "r7" , "r8" ,   \
+     "r9", "r10", "r11", "r12", "r13" );
+
+#endif /* MicroBlaze */
+
+#if defined(__tricore__)
+
+#define MULADDC_INIT                            \
+    asm( "ld.a   %%a2, %0       " :: "m" (s));  \
+    asm( "ld.a   %%a3, %0       " :: "m" (d));  \
+    asm( "ld.w   %%d4, %0       " :: "m" (c));  \
+    asm( "ld.w   %%d1, %0       " :: "m" (b));  \
+    asm( "xor    %d5, %d5       " );
+
+#define MULADDC_CORE                            \
+    asm( "ld.w   %d0,   [%a2+]      " );        \
+    asm( "madd.u %e2, %e4, %d0, %d1 " );        \
+    asm( "ld.w   %d0,   [%a3]       " );        \
+    asm( "addx   %d2,    %d2,  %d0  " );        \
+    asm( "addc   %d3,    %d3,    0  " );        \
+    asm( "mov    %d4,    %d3        " );        \
+    asm( "st.w  [%a3+],  %d2        " );
+
+#define MULADDC_STOP                            \
+    asm( "st.w   %0, %%d4       " : "=m" (c));  \
+    asm( "st.a   %0, %%a3       " : "=m" (d));  \
+    asm( "st.a   %0, %%a2       " : "=m" (s) :: \
+    "d0", "d1", "e2", "d4", "a2", "a3" );
+
+#endif /* TriCore */
+
+#if defined(__arm__)
+
+#define MULADDC_INIT                            \
+    asm( "ldr    r0, %0         " :: "m" (s));  \
+    asm( "ldr    r1, %0         " :: "m" (d));  \
+    asm( "ldr    r2, %0         " :: "m" (c));  \
+    asm( "ldr    r3, %0         " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "ldr    r4, [r0], #4   " );            \
+    asm( "mov    r5, #0         " );            \
+    asm( "ldr    r6, [r1]       " );            \
+    asm( "umlal  r2, r5, r3, r4 " );            \
+    asm( "adds   r7, r6, r2     " );            \
+    asm( "adc    r2, r5, #0     " );            \
+    asm( "str    r7, [r1], #4   " );
+
+#define MULADDC_STOP                            \
+    asm( "str    r2, %0         " : "=m" (c));  \
+    asm( "str    r1, %0         " : "=m" (d));  \
+    asm( "str    r0, %0         " : "=m" (s) :: \
+    "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7" );
+
+#endif /* ARMv3 */
+
+#if defined(__alpha__)
+
+#define MULADDC_INIT                            \
+    asm( "ldq    $1, %0         " :: "m" (s));  \
+    asm( "ldq    $2, %0         " :: "m" (d));  \
+    asm( "ldq    $3, %0         " :: "m" (c));  \
+    asm( "ldq    $4, %0         " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "ldq    $6,  0($1)     " );            \
+    asm( "addq   $1,  8, $1     " );            \
+    asm( "mulq   $6, $4, $7     " );            \
+    asm( "umulh  $6, $4, $6     " );            \
+    asm( "addq   $7, $3, $7     " );            \
+    asm( "cmpult $7, $3, $3     " );            \
+    asm( "ldq    $5,  0($2)     " );            \
+    asm( "addq   $7, $5, $7     " );            \
+    asm( "cmpult $7, $5, $5     " );            \
+    asm( "stq    $7,  0($2)     " );            \
+    asm( "addq   $2,  8, $2     " );            \
+    asm( "addq   $6, $3, $3     " );            \
+    asm( "addq   $5, $3, $3     " );
+
+#define MULADDC_STOP                            \
+    asm( "stq    $3, %0         " : "=m" (c));  \
+    asm( "stq    $2, %0         " : "=m" (d));  \
+    asm( "stq    $1, %0         " : "=m" (s) :: \
+    "$1", "$2", "$3", "$4", "$5", "$6", "$7" );
+
+#endif /* Alpha */
+
+#if defined(__mips__)
+
+#define MULADDC_INIT                            \
+    asm( "lw     $10, %0        " :: "m" (s));  \
+    asm( "lw     $11, %0        " :: "m" (d));  \
+    asm( "lw     $12, %0        " :: "m" (c));  \
+    asm( "lw     $13, %0        " :: "m" (b));
+
+#define MULADDC_CORE                            \
+    asm( "lw     $14, 0($10)    " );            \
+    asm( "multu  $13, $14       " );            \
+    asm( "addi   $10, $10, 4    " );            \
+    asm( "mflo   $14            " );            \
+    asm( "mfhi   $9             " );            \
+    asm( "addu   $14, $12, $14  " );            \
+    asm( "lw     $15, 0($11)    " );            \
+    asm( "sltu   $12, $14, $12  " );            \
+    asm( "addu   $15, $14, $15  " );            \
+    asm( "sltu   $14, $15, $14  " );            \
+    asm( "addu   $12, $12, $9   " );            \
+    asm( "sw     $15, 0($11)    " );            \
+    asm( "addu   $12, $12, $14  " );            \
+    asm( "addi   $11, $11, 4    " );
+
+#define MULADDC_STOP                            \
+    asm( "sw     $12, %0        " : "=m" (c));  \
+    asm( "sw     $11, %0        " : "=m" (d));  \
+    asm( "sw     $10, %0        " : "=m" (s) :: \
+    "$9", "$10", "$11", "$12", "$13", "$14", "$15" );
+
+#endif /* MIPS */
+#endif /* GNUC */
+
+#if (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+
+#define MULADDC_INIT                            \
+    __asm   mov     esi, s                      \
+    __asm   mov     edi, d                      \
+    __asm   mov     ecx, c                      \
+    __asm   mov     ebx, b
+
+#define MULADDC_CORE                            \
+    __asm   lodsd                               \
+    __asm   mul     ebx                         \
+    __asm   add     eax, ecx                    \
+    __asm   adc     edx, 0                      \
+    __asm   add     eax, [edi]                  \
+    __asm   adc     edx, 0                      \
+    __asm   mov     ecx, edx                    \
+    __asm   stosd
+
+#if defined(POLARSSL_HAVE_SSE2)
+
+#define EMIT __asm _emit
+
+#define MULADDC_HUIT                            \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0xC9             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0xC3             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x1F             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x16             \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x7E  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF8             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x5F  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xDC             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xEE             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x67  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xFC             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x0F             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x56  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD0             \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x66  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xE0             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x76  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xF0             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x04  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x5E  EMIT 0x1C  \
+    EMIT 0x0F  EMIT 0xF4  EMIT 0xD8             \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCD             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xD5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x08  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCF             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xE5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x0C  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCA             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xF5             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x10  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCC             \
+    EMIT 0x0F  EMIT 0x6E  EMIT 0x6F  EMIT 0x1C  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xDD             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x14  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCE             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x18  \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0xD4  EMIT 0xCB             \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0x4F  EMIT 0x1C  \
+    EMIT 0x83  EMIT 0xC7  EMIT 0x20             \
+    EMIT 0x83  EMIT 0xC6  EMIT 0x20             \
+    EMIT 0x0F  EMIT 0x73  EMIT 0xD1  EMIT 0x20  \
+    EMIT 0x0F  EMIT 0x7E  EMIT 0xC9
+
+#define MULADDC_STOP                            \
+    EMIT 0x0F  EMIT 0x77                        \
+    __asm   mov     c, ecx                      \
+    __asm   mov     d, edi                      \
+    __asm   mov     s, esi                      \
+
+#else
+
+#define MULADDC_STOP                            \
+    __asm   mov     c, ecx                      \
+    __asm   mov     d, edi                      \
+    __asm   mov     s, esi                      \
+
+#endif /* SSE2 */
+#endif /* MSVC */
+
+#endif /* POLARSSL_HAVE_ASM */
+
+#if !defined(MULADDC_CORE)
+#if defined(POLARSSL_HAVE_LONGLONG)
+
+#define MULADDC_INIT                    \
+{                                       \
+    t_dbl r;                            \
+    t_int r0, r1;
+
+#define MULADDC_CORE                    \
+    r   = *(s++) * (t_dbl) b;           \
+    r0  = r;                            \
+    r1  = r >> biL;                     \
+    r0 += c;  r1 += (r0 <  c);          \
+    r0 += *d; r1 += (r0 < *d);          \
+    c = r1; *(d++) = r0;
+
+#define MULADDC_STOP                    \
+}
+
+#else
+#define MULADDC_INIT                    \
+{                                       \
+    t_int s0, s1, b0, b1;               \
+    t_int r0, r1, rx, ry;               \
+    b0 = ( b << biH ) >> biH;           \
+    b1 = ( b >> biH );
+
+#define MULADDC_CORE                    \
+    s0 = ( *s << biH ) >> biH;          \
+    s1 = ( *s >> biH ); s++;            \
+    rx = s0 * b1; r0 = s0 * b0;         \
+    ry = s1 * b0; r1 = s1 * b1;         \
+    r1 += ( rx >> biH );                \
+    r1 += ( ry >> biH );                \
+    rx <<= biH; ry <<= biH;             \
+    r0 += rx; r1 += (r0 < rx);          \
+    r0 += ry; r1 += (r0 < ry);          \
+    r0 +=  c; r1 += (r0 <  c);          \
+    r0 += *d; r1 += (r0 < *d);          \
+    c = r1; *(d++) = r0;
+
+#define MULADDC_STOP                    \
+}
+
+#endif /* C (generic)  */
+#endif /* C (longlong) */
+
+#endif /* bn_mul.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/config.h b/trunk/package/utils/px5g-standalone/src/polarssl/config.h
new file mode 100644
index 00000000..79cd3dba
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/config.h
@@ -0,0 +1,329 @@
+/**
+ * \file config.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This set of compile-time options may be used to enable
+ * or disable features selectively, and reduce the global
+ * memory footprint.
+ */
+#ifndef POLARSSL_CONFIG_H
+#define POLARSSL_CONFIG_H
+
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/*
+ * Uncomment if native integers are 8-bit wide.
+ *
+#define POLARSSL_HAVE_INT8
+ */
+
+/*
+ * Uncomment if native integers are 16-bit wide.
+ *
+#define POLARSSL_HAVE_INT16
+ */
+
+/*
+ * Uncomment if the compiler supports long long.
+#define POLARSSL_HAVE_LONGLONG
+ */
+
+
+/*
+ * Uncomment to enable the use of assembly code.
+ */
+/* #define POLARSSL_HAVE_ASM */
+
+/*
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ *
+#define POLARSSL_HAVE_SSE2
+ */
+
+/*
+ * Enable all SSL/TLS debugging messages.
+ */
+#define POLARSSL_DEBUG_MSG
+
+/*
+ * Enable the checkup functions (*_self_test).
+ */
+#define POLARSSL_SELF_TEST
+
+/*
+ * Enable the prime-number generation code.
+ */
+#define POLARSSL_GENPRIME
+
+/*
+ * Uncomment this macro to store the AES tables in ROM.
+ *
+#define POLARSSL_AES_ROM_TABLES
+ */
+
+/*
+ * Module:  library/aes.c
+ * Caller:  library/ssl_tls.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_RSA_AES_128_SHA
+ *      SSL_RSA_AES_256_SHA
+ *      SSL_EDH_RSA_AES_256_SHA
+ */
+#define POLARSSL_AES_C
+
+/*
+ * Module:  library/arc4.c
+ * Caller:  library/ssl_tls.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_RSA_RC4_128_MD5
+ *      SSL_RSA_RC4_128_SHA
+ */
+#define POLARSSL_ARC4_C
+
+/*
+ * Module:  library/base64.c
+ * Caller:  library/x509parse.c
+ *
+ * This module is required for X.509 support.
+ */
+#define POLARSSL_BASE64_C
+
+/*
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/rsa.c
+ *          library/ssl_tls.c
+ *          library/x509parse.c
+ *
+ * This module is required for RSA and DHM support.
+ */
+#define POLARSSL_BIGNUM_C
+
+/*
+ * Module:  library/camellia.c
+ * Caller:
+ *
+ * This module enabled the following cipher suites:
+ */
+#define POLARSSL_CAMELLIA_C
+
+/*
+ * Module:  library/certs.c
+ * Caller:
+ *
+ * This module is used for testing (ssl_client/server).
+ */
+#define POLARSSL_CERTS_C
+
+/*
+ * Module:  library/debug.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *
+ * This module provides debugging functions.
+ */
+#define POLARSSL_DEBUG_C
+
+/*
+ * Module:  library/des.c
+ * Caller:  library/ssl_tls.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_RSA_DES_168_SHA
+ *      SSL_EDH_RSA_DES_168_SHA
+ */
+#define POLARSSL_DES_C
+
+/*
+ * Module:  library/dhm.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module enables the following ciphersuites:
+ *      SSL_EDH_RSA_DES_168_SHA
+ *      SSL_EDH_RSA_AES_256_SHA
+ */
+#define POLARSSL_DHM_C
+
+/*
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * This module enables the HAVEGE random number generator.
+ */
+#define POLARSSL_HAVEGE_C
+
+/*
+ * Module:  library/md2.c
+ * Caller:  library/x509parse.c
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+#define POLARSSL_MD2_C
+ */
+
+/*
+ * Module:  library/md4.c
+ * Caller:  library/x509parse.c
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+#define POLARSSL_MD4_C
+ */
+
+/*
+ * Module:  library/md5.c
+ * Caller:  library/ssl_tls.c
+ *          library/x509parse.c
+ *
+ * This module is required for SSL/TLS and X.509.
+ */
+#define POLARSSL_MD5_C
+
+/*
+ * Module:  library/net.c
+ * Caller:
+ *
+ * This module provides TCP/IP networking routines.
+ */
+#define POLARSSL_NET_C
+
+/*
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+#define POLARSSL_PADLOCK_C
+
+/*
+ * Module:  library/rsa.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *          library/x509.c
+ *
+ * This module is required for SSL/TLS and MD5-signed certificates.
+ */
+#define POLARSSL_RSA_C
+
+/*
+ * Module:  library/sha1.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *          library/x509parse.c
+ *
+ * This module is required for SSL/TLS and SHA1-signed certificates.
+ */
+#define POLARSSL_SHA1_C
+
+/*
+ * Module:  library/sha2.c
+ * Caller:
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ */
+#define POLARSSL_SHA2_C
+
+/*
+ * Module:  library/sha4.c
+ * Caller:
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+#define POLARSSL_SHA4_C
+
+/*
+ * Module:  library/ssl_cli.c
+ * Caller:
+ *
+ * This module is required for SSL/TLS client support.
+ */
+#define POLARSSL_SSL_CLI_C
+
+/*
+ * Module:  library/ssl_srv.c
+ * Caller:
+ *
+ * This module is required for SSL/TLS server support.
+ */
+#define POLARSSL_SSL_SRV_C
+
+/*
+ * Module:  library/ssl_tls.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *
+ * This module is required for SSL/TLS.
+ */
+#define POLARSSL_SSL_TLS_C
+
+/*
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+#define POLARSSL_TIMING_C
+
+/*
+ * Module:  library/x509parse.c
+ * Caller:  library/ssl_cli.c
+ *          library/ssl_srv.c
+ *          library/ssl_tls.c
+ *
+ * This module is required for X.509 certificate parsing.
+ */
+#define POLARSSL_X509_PARSE_C
+
+/*
+ * Module:  library/x509_write.c
+ * Caller:
+ *
+ * This module is required for X.509 certificate writing.
+ */
+#define POLARSSL_X509_WRITE_C
+
+/*
+ * Module:  library/xtea.c
+ * Caller:
+ */
+#define POLARSSL_XTEA_C
+
+#endif /* config.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/havege.h b/trunk/package/utils/px5g-standalone/src/polarssl/havege.h
new file mode 100644
index 00000000..c27cecac
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/havege.h
@@ -0,0 +1,75 @@
+/**
+ * \file havege.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_HAVEGE_H
+#define POLARSSL_HAVEGE_H
+
+#define COLLECT_SIZE 1024
+
+/**
+ * \brief          HAVEGE state structure
+ */
+typedef struct
+{
+    int PT1, PT2, offset[2];
+    int pool[COLLECT_SIZE];
+    int WALK[8192];
+}
+havege_state;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          HAVEGE initialization
+ *
+ * \param hs       HAVEGE state to be initialized
+ */
+void havege_init( havege_state *hs );
+
+/**
+ * \brief          HAVEGE rand function
+ *
+ * \param rng_st   points to an HAVEGE state
+ *
+ * \return         A random int
+ */
+int havege_rand( void *p_rng );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* havege.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/rsa.h b/trunk/package/utils/px5g-standalone/src/polarssl/rsa.h
new file mode 100644
index 00000000..b31dc2f1
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/rsa.h
@@ -0,0 +1,309 @@
+/**
+ * \file rsa.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_RSA_H
+#define POLARSSL_RSA_H
+
+#include "polarssl/bignum.h"
+
+#define POLARSSL_ERR_RSA_BAD_INPUT_DATA                    -0x0400
+#define POLARSSL_ERR_RSA_INVALID_PADDING                   -0x0410
+#define POLARSSL_ERR_RSA_KEY_GEN_FAILED                    -0x0420
+#define POLARSSL_ERR_RSA_KEY_CHECK_FAILED                  -0x0430
+#define POLARSSL_ERR_RSA_PUBLIC_FAILED                     -0x0440
+#define POLARSSL_ERR_RSA_PRIVATE_FAILED                    -0x0450
+#define POLARSSL_ERR_RSA_VERIFY_FAILED                     -0x0460
+#define POLARSSL_ERR_RSA_OUTPUT_TO_LARGE                   -0x0470
+
+/*
+ * PKCS#1 constants
+ */
+#define RSA_RAW         0
+#define RSA_MD2         2
+#define RSA_MD4         3
+#define RSA_MD5         4
+#define RSA_SHA1        5
+#define RSA_SHA256      6
+
+#define RSA_PUBLIC      0
+#define RSA_PRIVATE     1
+
+#define RSA_PKCS_V15    0
+#define RSA_PKCS_V21    1
+
+#define RSA_SIGN        1
+#define RSA_CRYPT       2
+
+/*
+ * DigestInfo ::= SEQUENCE {
+ *   digestAlgorithm DigestAlgorithmIdentifier,
+ *   digest Digest }
+ *
+ * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
+ *
+ * Digest ::= OCTET STRING
+ */
+#define ASN1_HASH_MDX                       \
+    "\x30\x20\x30\x0C\x06\x08\x2A\x86\x48"  \
+    "\x86\xF7\x0D\x02\x00\x05\x00\x04\x10"
+
+#define ASN1_HASH_SHA1                      \
+    "\x30\x21\x30\x09\x06\x05\x2B\x0E\x03"  \
+    "\x02\x1A\x05\x00\x04\x14"
+
+/**
+ * \brief          RSA context structure
+ */
+typedef struct
+{
+    int ver;                    /*!<  always 0          */
+    int len;                    /*!<  size(N) in chars  */
+
+    mpi N;                      /*!<  public modulus    */
+    mpi E;                      /*!<  public exponent   */
+
+    mpi D;                      /*!<  private exponent  */
+    mpi P;                      /*!<  1st prime factor  */
+    mpi Q;                      /*!<  2nd prime factor  */
+    mpi DP;                     /*!<  D % (P - 1)       */
+    mpi DQ;                     /*!<  D % (Q - 1)       */
+    mpi QP;                     /*!<  1 / (Q % P)       */
+
+    mpi RN;                     /*!<  cached R^2 mod N  */
+    mpi RP;                     /*!<  cached R^2 mod P  */
+    mpi RQ;                     /*!<  cached R^2 mod Q  */
+
+    int padding;                /*!<  1.5 or OAEP/PSS   */
+    int hash_id;                /*!<  hash identifier   */
+    int (*f_rng)(void *);       /*!<  RNG function      */
+    void *p_rng;                /*!<  RNG parameter     */
+}
+rsa_context;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Initialize an RSA context
+ *
+ * \param ctx      RSA context to be initialized
+ * \param padding  RSA_PKCS_V15 or RSA_PKCS_V21
+ * \param hash_id  RSA_PKCS_V21 hash identifier
+ * \param f_rng    RNG function
+ * \param p_rng    RNG parameter
+ *
+ * \note           The hash_id parameter is actually ignored
+ *                 when using RSA_PKCS_V15 padding.
+ *
+ * \note           Currently (xyssl-0.8), RSA_PKCS_V21 padding
+ *                 is not supported.
+ */
+void rsa_init( rsa_context *ctx,
+               int padding,
+               int hash_id,
+               int (*f_rng)(void *),
+               void *p_rng );
+
+/**
+ * \brief          Generate an RSA keypair
+ *
+ * \param ctx      RSA context that will hold the key
+ * \param nbits    size of the public key in bits
+ * \param exponent public exponent (e.g., 65537)
+ *
+ * \note           rsa_init() must be called beforehand to setup
+ *                 the RSA context (especially f_rng and p_rng).
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ */
+int rsa_gen_key( rsa_context *ctx, int nbits, int exponent );
+
+/**
+ * \brief          Check a public RSA key
+ *
+ * \param ctx      RSA context to be checked
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ */
+int rsa_check_pubkey( rsa_context *ctx );
+
+/**
+ * \brief          Check a private RSA key
+ *
+ * \param ctx      RSA context to be checked
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ */
+int rsa_check_privkey( rsa_context *ctx );
+
+/**
+ * \brief          Do an RSA public key operation
+ *
+ * \param ctx      RSA context
+ * \param input    input buffer
+ * \param output   output buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           This function does NOT take care of message
+ *                 padding. Also, be sure to set input[0] = 0.
+ *
+ * \note           The input and output buffers must be large
+ *                 enough (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_public( rsa_context *ctx,
+                unsigned char *input,
+                unsigned char *output );
+
+/**
+ * \brief          Do an RSA private key operation
+ *
+ * \param ctx      RSA context
+ * \param input    input buffer
+ * \param output   output buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The input and output buffers must be large
+ *                 enough (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_private( rsa_context *ctx,
+                 unsigned char *input,
+                 unsigned char *output );
+
+/**
+ * \brief          Add the message padding, then do an RSA operation
+ *
+ * \param ctx      RSA context
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param ilen     contains the the plaintext length
+ * \param input    buffer holding the data to be encrypted
+ * \param output   buffer that will hold the ciphertext
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The output buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_pkcs1_encrypt( rsa_context *ctx,
+                       int mode, int  ilen,
+                       unsigned char *input,
+                       unsigned char *output );
+
+/**
+ * \brief          Do an RSA operation, then remove the message padding
+ *
+ * \param ctx      RSA context
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param input    buffer holding the encrypted data
+ * \param output   buffer that will hold the plaintext
+ * \param olen     will contain the plaintext length
+ * \param output_max_len	maximum length of the output buffer
+ *
+ * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The output buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used) otherwise
+ *                 an error is thrown.
+ */
+int rsa_pkcs1_decrypt( rsa_context *ctx,
+                       int mode, int *olen,
+                       unsigned char *input,
+                       unsigned char *output,
+		       int output_max_len);
+
+/**
+ * \brief          Do a private RSA to sign a message digest
+ *
+ * \param ctx      RSA context
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param hash_id  RSA_RAW, RSA_MD{2,4,5} or RSA_SHA{1,256}
+ * \param hashlen  message digest length (for RSA_RAW only)
+ * \param hash     buffer holding the message digest
+ * \param sig      buffer that will hold the ciphertext
+ *
+ * \return         0 if the signing operation was successful,
+ *                 or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The "sig" buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_pkcs1_sign( rsa_context *ctx,
+                    int mode,
+                    int hash_id,
+                    int hashlen,
+                    unsigned char *hash,
+                    unsigned char *sig );
+
+/**
+ * \brief          Do a public RSA and check the message digest
+ *
+ * \param ctx      points to an RSA public key
+ * \param mode     RSA_PUBLIC or RSA_PRIVATE
+ * \param hash_id  RSA_RAW, RSA_MD{2,4,5} or RSA_SHA{1,256}
+ * \param hashlen  message digest length (for RSA_RAW only)
+ * \param hash     buffer holding the message digest
+ * \param sig      buffer holding the ciphertext
+ *
+ * \return         0 if the verify operation was successful,
+ *                 or an POLARSSL_ERR_RSA_XXX error code
+ *
+ * \note           The "sig" buffer must be as large as the size
+ *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
+ */
+int rsa_pkcs1_verify( rsa_context *ctx,
+                      int mode,
+                      int hash_id,
+                      int hashlen,
+                      unsigned char *hash,
+                      unsigned char *sig );
+
+/**
+ * \brief          Free the components of an RSA key
+ */
+void rsa_free( rsa_context *ctx );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int rsa_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* rsa.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/sha1.h b/trunk/package/utils/px5g-standalone/src/polarssl/sha1.h
new file mode 100644
index 00000000..3ca7dc31
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/sha1.h
@@ -0,0 +1,150 @@
+/**
+ * \file sha1.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_SHA1_H
+#define POLARSSL_SHA1_H
+
+/**
+ * \brief          SHA-1 context structure
+ */
+typedef struct
+{
+    unsigned long total[2];     /*!< number of bytes processed  */
+    unsigned long state[5];     /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
+
+    unsigned char ipad[64];     /*!< HMAC: inner padding        */
+    unsigned char opad[64];     /*!< HMAC: outer padding        */
+}
+sha1_context;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          SHA-1 context setup
+ *
+ * \param ctx      context to be initialized
+ */
+void sha1_starts( sha1_context *ctx );
+
+/**
+ * \brief          SHA-1 process buffer
+ *
+ * \param ctx      SHA-1 context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha1_update( sha1_context *ctx, unsigned char *input, int ilen );
+
+/**
+ * \brief          SHA-1 final digest
+ *
+ * \param ctx      SHA-1 context
+ * \param output   SHA-1 checksum result
+ */
+void sha1_finish( sha1_context *ctx, unsigned char output[20] );
+
+/**
+ * \brief          Output = SHA-1( input buffer )
+ *
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   SHA-1 checksum result
+ */
+void sha1( unsigned char *input, int ilen, unsigned char output[20] );
+
+/**
+ * \brief          Output = SHA-1( file contents )
+ *
+ * \param path     input file name
+ * \param output   SHA-1 checksum result
+ *
+ * \return         0 if successful, 1 if fopen failed,
+ *                 or 2 if fread failed
+ */
+int sha1_file( char *path, unsigned char output[20] );
+
+/**
+ * \brief          SHA-1 HMAC context setup
+ *
+ * \param ctx      HMAC context to be initialized
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ */
+void sha1_hmac_starts( sha1_context *ctx, unsigned char *key, int keylen );
+
+/**
+ * \brief          SHA-1 HMAC process buffer
+ *
+ * \param ctx      HMAC context
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ */
+void sha1_hmac_update( sha1_context *ctx, unsigned char *input, int ilen );
+
+/**
+ * \brief          SHA-1 HMAC final digest
+ *
+ * \param ctx      HMAC context
+ * \param output   SHA-1 HMAC checksum result
+ */
+void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] );
+
+/**
+ * \brief          Output = HMAC-SHA-1( hmac key, input buffer )
+ *
+ * \param key      HMAC secret key
+ * \param keylen   length of the HMAC key
+ * \param input    buffer holding the  data
+ * \param ilen     length of the input data
+ * \param output   HMAC-SHA-1 result
+ */
+void sha1_hmac( unsigned char *key, int keylen,
+                unsigned char *input, int ilen,
+                unsigned char output[20] );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int sha1_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* sha1.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/timing.h b/trunk/package/utils/px5g-standalone/src/polarssl/timing.h
new file mode 100644
index 00000000..62d627f6
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/timing.h
@@ -0,0 +1,81 @@
+/**
+ * \file timing.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_TIMING_H
+#define POLARSSL_TIMING_H
+
+/**
+ * \brief          timer structure
+ */
+struct hr_time
+{
+    unsigned char opaque[32];
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int alarmed;
+
+/**
+ * \brief          Return the CPU cycle counter value
+ */
+unsigned long hardclock( void );
+
+/**
+ * \brief          Return the elapsed time in milliseconds
+ *
+ * \param val      points to a timer structure
+ * \param reset    if set to 1, the timer is restarted
+ */
+unsigned long get_timer( struct hr_time *val, int reset );
+
+/**
+ * \brief          Setup an alarm clock
+ *
+ * \param seconds  delay before the "alarmed" flag is set
+ */
+void set_alarm( int seconds );
+
+/**
+ * \brief          Sleep for a certain amount of time
+ */
+void m_sleep( int milliseconds );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* timing.h */
diff --git a/trunk/package/utils/px5g-standalone/src/polarssl/x509.h b/trunk/package/utils/px5g-standalone/src/polarssl/x509.h
new file mode 100644
index 00000000..908a1dbf
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/polarssl/x509.h
@@ -0,0 +1,549 @@
+/**
+ * \file x509.h
+ *
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef POLARSSL_X509_H
+#define POLARSSL_X509_H
+
+#include "polarssl/rsa.h"
+
+#define POLARSSL_ERR_ASN1_OUT_OF_DATA                      -0x0014
+#define POLARSSL_ERR_ASN1_UNEXPECTED_TAG                   -0x0016
+#define POLARSSL_ERR_ASN1_INVALID_LENGTH                   -0x0018
+#define POLARSSL_ERR_ASN1_LENGTH_MISMATCH                  -0x001A
+#define POLARSSL_ERR_ASN1_INVALID_DATA                     -0x001C
+
+#define POLARSSL_ERR_X509_FEATURE_UNAVAILABLE              -0x0020
+#define POLARSSL_ERR_X509_CERT_INVALID_PEM                 -0x0040
+#define POLARSSL_ERR_X509_CERT_INVALID_FORMAT              -0x0060
+#define POLARSSL_ERR_X509_CERT_INVALID_VERSION             -0x0080
+#define POLARSSL_ERR_X509_CERT_INVALID_SERIAL              -0x00A0
+#define POLARSSL_ERR_X509_CERT_INVALID_ALG                 -0x00C0
+#define POLARSSL_ERR_X509_CERT_INVALID_NAME                -0x00E0
+#define POLARSSL_ERR_X509_CERT_INVALID_DATE                -0x0100
+#define POLARSSL_ERR_X509_CERT_INVALID_PUBKEY              -0x0120
+#define POLARSSL_ERR_X509_CERT_INVALID_SIGNATURE           -0x0140
+#define POLARSSL_ERR_X509_CERT_INVALID_EXTENSIONS          -0x0160
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_VERSION             -0x0180
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG             -0x01A0
+#define POLARSSL_ERR_X509_CERT_UNKNOWN_PK_ALG              -0x01C0
+#define POLARSSL_ERR_X509_CERT_SIG_MISMATCH                -0x01E0
+#define POLARSSL_ERR_X509_CERT_VERIFY_FAILED               -0x0200
+#define POLARSSL_ERR_X509_KEY_INVALID_PEM                  -0x0220
+#define POLARSSL_ERR_X509_KEY_INVALID_VERSION              -0x0240
+#define POLARSSL_ERR_X509_KEY_INVALID_FORMAT               -0x0260
+#define POLARSSL_ERR_X509_KEY_INVALID_ENC_IV               -0x0280
+#define POLARSSL_ERR_X509_KEY_UNKNOWN_ENC_ALG              -0x02A0
+#define POLARSSL_ERR_X509_KEY_PASSWORD_REQUIRED            -0x02C0
+#define POLARSSL_ERR_X509_KEY_PASSWORD_MISMATCH            -0x02E0
+#define POLARSSL_ERR_X509_POINT_ERROR                      -0x0300
+#define POLARSSL_ERR_X509_VALUE_TO_LENGTH                  -0x0320
+
+#define BADCERT_EXPIRED                 1
+#define BADCERT_REVOKED                 2
+#define BADCERT_CN_MISMATCH             4
+#define BADCERT_NOT_TRUSTED             8
+
+/*
+ * DER constants
+ */
+#define ASN1_BOOLEAN                 0x01
+#define ASN1_INTEGER                 0x02
+#define ASN1_BIT_STRING              0x03
+#define ASN1_OCTET_STRING            0x04
+#define ASN1_NULL                    0x05
+#define ASN1_OID                     0x06
+#define ASN1_UTF8_STRING             0x0C
+#define ASN1_SEQUENCE                0x10
+#define ASN1_SET                     0x11
+#define ASN1_PRINTABLE_STRING        0x13
+#define ASN1_T61_STRING              0x14
+#define ASN1_IA5_STRING              0x16
+#define ASN1_UTC_TIME                0x17
+#define ASN1_UNIVERSAL_STRING        0x1C
+#define ASN1_BMP_STRING              0x1E
+#define ASN1_PRIMITIVE               0x00
+#define ASN1_CONSTRUCTED             0x20
+#define ASN1_CONTEXT_SPECIFIC        0x80
+
+/*
+ * various object identifiers
+ */
+#define X520_COMMON_NAME                3
+#define X520_COUNTRY                    6
+#define X520_LOCALITY                   7
+#define X520_STATE                      8
+#define X520_ORGANIZATION              10
+#define X520_ORG_UNIT                  11
+#define PKCS9_EMAIL                     1
+
+#define X509_OUTPUT_DER              0x01
+#define X509_OUTPUT_PEM              0x02
+#define PEM_LINE_LENGTH                72
+#define X509_ISSUER                  0x01
+#define X509_SUBJECT                 0x02
+
+#define OID_X520                "\x55\x04"
+#define OID_CN                  "\x55\x04\x03"
+#define OID_PKCS1               "\x2A\x86\x48\x86\xF7\x0D\x01\x01"
+#define OID_PKCS1_RSA           "\x2A\x86\x48\x86\xF7\x0D\x01\x01\x01"
+#define OID_PKCS1_RSA_SHA       "\x2A\x86\x48\x86\xF7\x0D\x01\x01\x05"
+#define OID_PKCS9               "\x2A\x86\x48\x86\xF7\x0D\x01\x09"
+#define OID_PKCS9_EMAIL         "\x2A\x86\x48\x86\xF7\x0D\x01\x09\x01"
+
+/*
+ * Structures for parsing X.509 certificates
+ */
+typedef struct _x509_buf
+{
+    int tag;
+    int len;
+    unsigned char *p;
+}
+x509_buf;
+
+typedef struct _x509_name
+{
+    x509_buf oid;
+    x509_buf val;
+    struct _x509_name *next;
+}
+x509_name;
+
+typedef struct _x509_time
+{
+    int year, mon, day;
+    int hour, min, sec;
+}
+x509_time;
+
+typedef struct _x509_cert
+{
+    x509_buf raw;
+    x509_buf tbs;
+
+    int version;
+    x509_buf serial;
+    x509_buf sig_oid1;
+
+    x509_buf issuer_raw;
+    x509_buf subject_raw;
+
+    x509_name issuer;
+    x509_name subject;
+
+    x509_time valid_from;
+    x509_time valid_to;
+
+    x509_buf pk_oid;
+    rsa_context rsa;
+
+    x509_buf issuer_id;
+    x509_buf subject_id;
+    x509_buf v3_ext;
+
+    int ca_istrue;
+    int max_pathlen;
+
+    x509_buf sig_oid2;
+    x509_buf sig;
+
+    struct _x509_cert *next; 
+}
+x509_cert;
+
+/*
+ * Structures for writing X.509 certificates
+ */
+typedef struct _x509_node
+{
+    unsigned char *data;
+    unsigned char *p;
+    unsigned char *end;
+
+    size_t len;
+}
+x509_node;
+
+typedef struct _x509_raw
+{
+    x509_node raw;
+    x509_node tbs;
+
+    x509_node version;
+    x509_node serial;
+    x509_node tbs_signalg;
+    x509_node issuer;
+    x509_node validity;
+    x509_node subject;
+    x509_node subpubkey;
+
+    x509_node signalg;
+    x509_node sign;
+}
+x509_raw;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          Parse one or more certificates and add them
+ *                 to the chained list
+ *
+ * \param chain    points to the start of the chain
+ * \param buf      buffer holding the certificate data
+ * \param buflen   size of the buffer
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_crt( x509_cert *crt, unsigned char *buf, int buflen );
+
+/**
+ * \brief          Load one or more certificates and add them
+ *                 to the chained list
+ *
+ * \param chain    points to the start of the chain
+ * \param path     filename to read the certificates from
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_crtfile( x509_cert *crt, char *path );
+
+/**
+ * \brief          Parse a private RSA key
+ *
+ * \param rsa      RSA context to be initialized
+ * \param buf      input buffer
+ * \param buflen   size of the buffer
+ * \param pwd      password for decryption (optional)
+ * \param pwdlen   size of the password
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_key( rsa_context *rsa,
+                   unsigned char *buf, int buflen,
+                   unsigned char *pwd, int pwdlen );
+
+/**
+ * \brief          Load and parse a private RSA key
+ *
+ * \param rsa      RSA context to be initialized
+ * \param path     filename to read the private key from
+ * \param pwd      password to decrypt the file (can be NULL)
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509parse_keyfile( rsa_context *rsa, char *path, char *password );
+
+/**
+ * \brief          Store the certificate DN in printable form into buf;
+ *                 no more than (end - buf) characters will be written.
+ */
+int x509parse_dn_gets( char *buf, char *end, x509_name *dn );
+
+/**
+ * \brief          Returns an informational string about the
+ *                 certificate.
+ */
+char *x509parse_cert_info( char *prefix, x509_cert *crt );
+
+/**
+ * \brief          Return 0 if the certificate is still valid,
+ *                 or BADCERT_EXPIRED
+ */
+int x509parse_expired( x509_cert *crt );
+
+/**
+ * \brief          Verify the certificate signature
+ *
+ * \param crt      a certificate to be verified
+ * \param trust_ca the trusted CA chain
+ * \param cn       expected Common Name (can be set to
+ *                 NULL if the CN must not be verified)
+ * \param flags    result of the verification
+ *
+ * \return         0 if successful or POLARSSL_ERR_X509_SIG_VERIFY_FAILED,
+ *                 in which case *flags will have one or more of
+ *                 the following values set:
+ *                      BADCERT_EXPIRED --
+ *                      BADCERT_REVOKED --
+ *                      BADCERT_CN_MISMATCH --
+ *                      BADCERT_NOT_TRUSTED
+ *
+ * \note           TODO: add two arguments, depth and crl
+ */
+int x509parse_verify( x509_cert *crt,
+                      x509_cert *trust_ca,
+                      char *cn, int *flags );
+
+/**
+ * \brief          Unallocate all certificate data
+ */
+void x509_free( x509_cert *crt );
+
+/**
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int x509_self_test( int verbose );
+
+/**
+ * \brief          Write a certificate info file
+ *
+ * \param chain    points to the raw certificate data
+ * \param path     filename to write the certificate to
+ * \param format   X509_OUTPUT_DER or X509_OUTPUT_PEM
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_crtfile( x509_raw *chain,
+                       unsigned char *path,
+                       int format );
+
+/**
+ * \brief          Write a certificate signing request message format file
+ *
+ * \param chain    points to the raw certificate (with x509write_create_csr) data
+ * \param path     filename to write the certificate to
+ * \param format   X509_OUTPUT_DER or X509_OUTPUT_PEM
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_csrfile( x509_raw *chain,
+                       unsigned char *path,
+                       int format );
+
+/*
+ * \brief          Write a private RSA key into a file
+ *
+ * \param rsa      points to an RSA key
+ * \param path     filename to write the key to
+ * \param format   X509_OUTPUT_DER or X509_OUTPUT_PEM
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_keyfile( rsa_context *rsa,
+                       char *path,
+                       int format );
+
+/**
+ * \brief          Add a public key to certificate
+ *
+ * \param chain    points to the raw certificate data
+ * \param pubkey   points to an RSA key
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_pubkey( x509_raw *chain, rsa_context *pubkey );
+
+/**
+ * \brief          Create x509 subject/issuer field to raw certificate
+ *                 from string or CA cert. Make string NULL if you will
+ *                 use the CA copy function or make CA NULL then used
+ *                 the string parse.
+ *
+ * \param chain    points to the raw certificate data
+ * \param names    a string that can hold (separete with ";"):
+ *                     CN=CommonName
+ *                 --   O=Organization
+ *                 --  OU=OrgUnit
+ *                 --  ST=State
+ *                 --   L=Locality
+ *                 --   R=Email
+ *                 --   C=Country
+ *                 . Make that NULL if you didn't need that.
+ * \param flag     flag is X509_ISSUER or X509_SUBJECT that defined
+ *                 where change
+ * \param ca       the certificate for copy data. Make that NULL if you
+ *                 didn't need that.
+ * \param ca_flag  set the ca field from copy to crt
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_customize ( x509_raw *crt, 
+                          unsigned char *names, 
+                          int flag, 
+                          x509_cert *ca, 
+                          int ca_flag );
+
+/**
+* \brief          Add x509 issuer field
+*
+* \param chain    points to the raw certificate data
+* \param issuer   a string holding (separete with ";"):
+*                     CN=CommonName
+*                 --   O=Organization
+*                 --  OU=OrgUnit
+*                 --  ST=State
+*                 --   L=Locality
+*                 --   R=Email
+*                 --   C=Country
+*                 . Set this to NULL if not needed.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_add_issuer( x509_raw *crt, unsigned char *issuer);
+
+/**
+ * \brief          Add x509 subject field
+ *
+ * \param chain    points to the raw certificate data
+ * \param subject  a string holding (separete with ";"):
+ *                     CN=CommonName
+ *                 --   O=Organization
+ *                 --  OU=OrgUnit
+ *                 --  ST=State
+ *                 --   L=Locality
+ *                 --   R=Email
+ *                 --   C=Country
+ *                 . Set this to NULL if not needed.
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_subject( x509_raw *crt, unsigned char *subject);
+
+/**
+* \brief          Copy x509 issuer field from another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose issuer is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_issuer(x509_raw *crt, x509_cert *from_crt);
+
+/**
+* \brief          Copy x509 subject field from another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose subject is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_subject(x509_raw *crt, x509_cert *from_crt);
+
+/**
+* \brief          Copy x509 issuer field from the subject of another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose subject is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_issuer_from_subject(x509_raw *crt, x509_cert *from_crt);
+
+/**
+* \brief          Copy x509 subject field from the issuer of another certificate
+*
+* \param chain    points to the raw certificate data
+* \param from_crt the certificate whose issuer is to be copied.
+* \return         0 if successful, or a specific X509 error code
+*/
+int x509write_copy_subject_from_issuer(x509_raw *crt, x509_cert *from_crt);
+
+/**
+ * \brief          Create x509 validity time in UTC
+ *
+ * \param chain    points to the raw certificate data
+ * \param before   valid not before in format YYYY-MM-DD hh:mm:ss
+ * \param after    valid not after  in format YYYY-MM-DD hh:mm:ss
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_add_validity( x509_raw *crt,
+                               unsigned char *before,
+                               unsigned char *after );
+
+/**
+ * \brief          Create a self-signed certificate
+ *
+ * \param chain    points to the raw certificate data
+ * \param rsa      a private key to sign the certificate
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_create_selfsign( x509_raw *crt, rsa_context *raw );
+
+/**
+ * \brief          Create a certificate
+ *
+ * \param chain    points to the raw certificate data
+ * \param rsa      a private key to sign the certificate
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_create_sign( x509_raw *crt, rsa_context *raw );
+
+/**
+ * \brief          Create a certificate signing request
+ *
+ * \param chain    points to the raw certificate data. Didn't use the
+ *                 same chain that u have use for certificate.
+ * \param privkey  a rsa private key
+ *
+ * \return         0 if successful, or a specific X509 error code
+ */
+int x509write_create_csr( x509_raw *chain, rsa_context *privkey );
+
+/**
+ * \brief           Serialize an rsa key into DER
+ *
+ * \param rsa       a rsa key for output
+ * \param node      a x509 node for write into
+ *
+ * \return          0 if successful, or a specific X509 error code
+ */
+int x509write_serialize_key( rsa_context *rsa, x509_node *node );
+
+/**
+ * \brief          Unallocate all raw certificate data
+ */
+void x509write_free_raw( x509_raw *crt );
+
+/**
+ * \brief          Allocate all raw certificate data
+ */
+void x509write_init_raw( x509_raw *crt );
+
+/**
+ * \brief          Unallocate all node certificate data
+ */
+void x509write_free_node( x509_node *crt_node );
+
+/**
+ * \brief          Allocate all node certificate data
+ */
+void x509write_init_node( x509_node *crt_node );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* x509.h */
diff --git a/trunk/package/utils/px5g-standalone/src/px5g.c b/trunk/package/utils/px5g-standalone/src/px5g.c
new file mode 100644
index 00000000..cf50ad28
--- /dev/null
+++ b/trunk/package/utils/px5g-standalone/src/px5g.c
@@ -0,0 +1,200 @@
+/*
+ * px5g - Embedded x509 key and certificate generator based on PolarSSL
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <limits.h>
+#include "polarssl/havege.h"
+#include "polarssl/bignum.h"
+#include "polarssl/x509.h"
+#include "polarssl/rsa.h"
+
+#define PX5G_VERSION "0.1"
+#define PX5G_COPY "Copyright (c) 2009 Steven Barth <steven@midlink.org>"
+#define PX5G_LICENSE "Licensed under the GNU Lesser General Public License v2.1"
+
+int rsakey(char **arg) {
+	havege_state hs;
+	rsa_context rsa;
+
+	unsigned int ksize = 512;
+	int exp = 65537;
+	char *path = NULL;
+	int flag = X509_OUTPUT_PEM;
+
+	while (*arg && **arg == '-') {
+		if (!strcmp(*arg, "-out") && arg[1]) {
+			path = arg[1];
+			arg++;
+		} else if (!strcmp(*arg, "-3")) {
+			exp = 3;
+		} else if (!strcmp(*arg, "-der")) {
+			flag = X509_OUTPUT_DER;
+		}
+		arg++;
+	}
+
+	if (*arg) {
+		ksize = (unsigned int)atoi(*arg);
+	}
+
+	havege_init(&hs);
+	rsa_init(&rsa, RSA_PKCS_V15, 0, havege_rand, &hs);
+
+	fprintf(stderr, "Generating RSA private key, %i bit long modulus\n", ksize);
+	if (rsa_gen_key(&rsa, ksize, exp)) {
+		fprintf(stderr, "error: key generation failed\n");
+		return 1;
+	}
+
+	if (x509write_keyfile(&rsa, path, flag)) {
+		fprintf(stderr, "error: I/O error\n");
+		return 1;
+	}
+
+	rsa_free(&rsa);
+	return 0;
+}
+
+int selfsigned(char **arg) {
+	havege_state hs;
+	rsa_context rsa;
+	x509_node node;
+
+	char *subject = "";
+	unsigned int ksize = 512;
+	int exp = 65537;
+	unsigned int days = 30;
+	char *keypath = NULL, *certpath = NULL;
+	int flag = X509_OUTPUT_PEM;
+	time_t from = time(NULL), to;
+	char fstr[20], tstr[20];
+
+	while (*arg && **arg == '-') {
+		if (!strcmp(*arg, "-der")) {
+			flag = X509_OUTPUT_DER;
+		} else if (!strcmp(*arg, "-newkey") && arg[1]) {
+			if (strncmp(arg[1], "rsa:", 4)) {
+				fprintf(stderr, "error: invalid algorithm");
+				return 1;
+			}
+			ksize = (unsigned int)atoi(arg[1] + 4);
+			arg++;
+		} else if (!strcmp(*arg, "-days") && arg[1]) {
+			days = (unsigned int)atoi(arg[1]);
+			arg++;
+		} else if (!strcmp(*arg, "-keyout") && arg[1]) {
+			keypath = arg[1];
+			arg++;
+		} else if (!strcmp(*arg, "-out") && arg[1]) {
+			certpath = arg[1];
+			arg++;
+		} else if (!strcmp(*arg, "-subj") && arg[1]) {
+			if (arg[1][0] != '/' || strchr(arg[1], ';')) {
+				fprintf(stderr, "error: invalid subject");
+				return 1;
+			}
+			subject = calloc(strlen(arg[1]) + 1, 1);
+			char *oldc = arg[1] + 1, *newc = subject, *delim;
+			do {
+				delim = strchr(oldc, '=');
+				if (!delim) {
+					fprintf(stderr, "error: invalid subject");
+					return 1;
+				}
+				memcpy(newc, oldc, delim - oldc + 1);
+				newc += delim - oldc + 1;
+				oldc = delim + 1;
+
+				delim = strchr(oldc, '/');
+				if (!delim) {
+					delim = arg[1] + strlen(arg[1]);
+				}
+				memcpy(newc, oldc, delim - oldc);
+				newc += delim - oldc;
+				*newc++ = ';';
+				oldc = delim + 1;
+			} while(*delim);
+			arg++;
+		}
+		arg++;
+	}
+
+	havege_init(&hs);
+	rsa_init(&rsa, RSA_PKCS_V15, 0, havege_rand, &hs);
+	x509write_init_node(&node);
+	fprintf(stderr, "Generating RSA private key, %i bit long modulus\n", ksize);
+	if (rsa_gen_key(&rsa, ksize, exp)) {
+		fprintf(stderr, "error: key generation failed\n");
+		return 1;
+	}
+
+	if (keypath) {
+		if (x509write_keyfile(&rsa, keypath, flag)) {
+			fprintf(stderr, "error: I/O error\n");
+			return 1;
+		}
+	}
+
+	from = (from < 1000000000) ? 1000000000 : from;
+	strftime(fstr, sizeof(fstr), "%F %H:%M:%S", gmtime(&from));
+	to = from + 60 * 60 * 24 * days;
+	if (to < from)
+		to = INT_MAX;
+	strftime(tstr, sizeof(tstr), "%F %H:%M:%S", gmtime(&to));
+
+	x509_raw cert;
+	x509write_init_raw(&cert);
+	x509write_add_pubkey(&cert, &rsa);
+	x509write_add_subject(&cert, (unsigned char*)subject);
+	x509write_add_validity(&cert, (unsigned char*)fstr, (unsigned char*)tstr);
+	fprintf(stderr, "Generating selfsigned certificate with subject '%s'"
+			" and validity %s-%s\n", subject, fstr, tstr);
+	if (x509write_create_selfsign(&cert, &rsa)) {
+		fprintf(stderr, "error: certificate generation failed\n");
+	}
+
+	if (x509write_crtfile(&cert, (unsigned char*)certpath, flag)) {
+		fprintf(stderr, "error: I/O error\n");
+		return 1;
+	}
+
+	x509write_free_raw(&cert);
+	rsa_free(&rsa);
+	return 0;
+}
+
+int main(int argc, char *argv[]) {
+	if (!argv[1]) {
+		//Usage
+	} else if (!strcmp(argv[1], "rsakey")) {
+		return rsakey(argv+2);
+	} else if (!strcmp(argv[1], "selfsigned")) {
+		return selfsigned(argv+2);
+	}
+
+	fprintf(stderr,
+		"PX5G X.509 Certificate Generator Utility v" PX5G_VERSION "\n" PX5G_COPY
+		"\nbased on PolarSSL by Christophe Devine and Paul Bakker\n\n");
+	fprintf(stderr, "Usage: %s [rsakey|selfsigned]\n", *argv);
+	return 1;
+}
diff --git a/trunk/package/utils/px5g/Makefile b/trunk/package/utils/px5g/Makefile
new file mode 100644
index 00000000..df2a170d
--- /dev/null
+++ b/trunk/package/utils/px5g/Makefile
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2010-2014 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=px5g
+PKG_RELEASE:=2
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/px5g
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=X.509 certificate generator (using PolarSSL)
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  DEPENDS:=+libpolarssl
+endef
+
+define Package/px5g/description
+ Px5g is a tiny standalone X.509 certificate generator.
+ It suitable to create key files and certificates in DER
+ and PEM format for use with stunnel, uhttpd and others.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/px5g px5g.c -lpolarssl
+endef
+
+define Package/px5g/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/px5g $(1)/usr/sbin/px5g
+endef
+
+$(eval $(call BuildPackage,px5g))
diff --git a/trunk/package/utils/px5g/px5g.c b/trunk/package/utils/px5g/px5g.c
new file mode 100644
index 00000000..633aa513
--- /dev/null
+++ b/trunk/package/utils/px5g/px5g.c
@@ -0,0 +1,273 @@
+/*
+ * px5g - Embedded x509 key and certificate generator based on PolarSSL
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <limits.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdbool.h>
+
+#include <polarssl/bignum.h>
+#include <polarssl/x509_crt.h>
+#include <polarssl/rsa.h>
+
+#define PX5G_VERSION "0.2"
+#define PX5G_COPY "Copyright (c) 2009 Steven Barth <steven@midlink.org>"
+#define PX5G_LICENSE "Licensed under the GNU Lesser General Public License v2.1"
+
+static int urandom_fd;
+static char buf[16384];
+
+static int _urandom(void *ctx, unsigned char *out, size_t len)
+{
+	read(urandom_fd, out, len);
+	return 0;
+}
+
+static void write_file(const char *path, int len, bool pem)
+{
+	FILE *f = stdout;
+	const char *buf_start = buf;
+
+	if (!pem)
+		buf_start += sizeof(buf) - len;
+
+	if (!len) {
+		fprintf(stderr, "No data to write\n");
+		exit(1);
+	}
+
+	if (!f) {
+		fprintf(stderr, "error: I/O error\n");
+		exit(1);
+	}
+
+	if (path)
+		f = fopen(path, "w");
+
+	fwrite(buf_start, 1, len, f);
+	fclose(f);
+}
+
+static void write_key(pk_context *key, const char *path, bool pem)
+{
+	int len = 0;
+
+	if (pem) {
+		if (pk_write_key_pem(key, (void *) buf, sizeof(buf)) == 0)
+			len = strlen(buf);
+	} else {
+		len = pk_write_key_der(key, (void *) buf, sizeof(buf));
+		if (len < 0)
+			len = 0;
+	}
+
+	write_file(path, len, pem);
+}
+
+static void gen_key(pk_context *key, int ksize, int exp, bool pem)
+{
+	pk_init(key);
+	pk_init_ctx(key, pk_info_from_type(POLARSSL_PK_RSA));
+	fprintf(stderr, "Generating RSA private key, %i bit long modulus\n", ksize);
+	if (rsa_gen_key(pk_rsa(*key), _urandom, NULL, ksize, exp)) {
+		fprintf(stderr, "error: key generation failed\n");
+		exit(1);
+	}
+}
+
+int rsakey(char **arg)
+{
+	pk_context key;
+	unsigned int ksize = 512;
+	int exp = 65537;
+	char *path = NULL;
+	bool pem = true;
+
+	while (*arg && **arg == '-') {
+		if (!strcmp(*arg, "-out") && arg[1]) {
+			path = arg[1];
+			arg++;
+		} else if (!strcmp(*arg, "-3")) {
+			exp = 3;
+		} else if (!strcmp(*arg, "-der")) {
+			pem = false;
+		}
+		arg++;
+	}
+
+	if (*arg)
+		ksize = (unsigned int)atoi(*arg);
+
+	gen_key(&key, ksize, exp, pem);
+	write_key(&key, path, pem);
+
+	pk_free(&key);
+
+	return 0;
+}
+
+int selfsigned(char **arg)
+{
+	pk_context key;
+	x509write_cert cert;
+	mpi serial;
+
+	char *subject = "";
+	unsigned int ksize = 512;
+	int exp = 65537;
+	unsigned int days = 30;
+	char *keypath = NULL, *certpath = NULL;
+	bool pem = true;
+	time_t from = time(NULL), to;
+	char fstr[20], tstr[20], sstr[17];
+	int len;
+
+	while (*arg && **arg == '-') {
+		if (!strcmp(*arg, "-der")) {
+			pem = false;
+		} else if (!strcmp(*arg, "-newkey") && arg[1]) {
+			if (strncmp(arg[1], "rsa:", 4)) {
+				fprintf(stderr, "error: invalid algorithm");
+				return 1;
+			}
+			ksize = (unsigned int)atoi(arg[1] + 4);
+			arg++;
+		} else if (!strcmp(*arg, "-days") && arg[1]) {
+			days = (unsigned int)atoi(arg[1]);
+			arg++;
+		} else if (!strcmp(*arg, "-keyout") && arg[1]) {
+			keypath = arg[1];
+			arg++;
+		} else if (!strcmp(*arg, "-out") && arg[1]) {
+			certpath = arg[1];
+			arg++;
+		} else if (!strcmp(*arg, "-subj") && arg[1]) {
+			if (arg[1][0] != '/' || strchr(arg[1], ';')) {
+				fprintf(stderr, "error: invalid subject");
+				return 1;
+			}
+			subject = calloc(strlen(arg[1]) + 1, 1);
+			char *oldc = arg[1] + 1, *newc = subject, *delim;
+			do {
+				delim = strchr(oldc, '=');
+				if (!delim) {
+					fprintf(stderr, "error: invalid subject");
+					return 1;
+				}
+				memcpy(newc, oldc, delim - oldc + 1);
+				newc += delim - oldc + 1;
+				oldc = delim + 1;
+
+				delim = strchr(oldc, '/');
+				if (!delim) {
+					delim = arg[1] + strlen(arg[1]);
+				}
+				memcpy(newc, oldc, delim - oldc);
+				newc += delim - oldc;
+				*newc++ = ';';
+				oldc = delim + 1;
+			} while(*delim);
+			arg++;
+		}
+		arg++;
+	}
+
+	gen_key(&key, ksize, exp, pem);
+
+	if (keypath)
+		write_key(&key, keypath, pem);
+
+	from = (from < 1000000000) ? 1000000000 : from;
+	strftime(fstr, sizeof(fstr), "%Y%m%d%H%M%S", gmtime(&from));
+	to = from + 60 * 60 * 24 * days;
+	if (to < from)
+		to = INT_MAX;
+	strftime(tstr, sizeof(tstr), "%Y%m%d%H%M%S", gmtime(&to));
+
+	fprintf(stderr, "Generating selfsigned certificate with subject '%s'"
+			" and validity %s-%s\n", subject, fstr, tstr);
+
+	x509write_crt_init(&cert);
+	x509write_crt_set_md_alg(&cert, POLARSSL_MD_SHA1);
+	x509write_crt_set_issuer_key(&cert, &key);
+	x509write_crt_set_subject_key(&cert, &key);
+	x509write_crt_set_subject_name(&cert, subject);
+	x509write_crt_set_issuer_name(&cert, subject);
+	x509write_crt_set_validity(&cert, fstr, tstr);
+	x509write_crt_set_basic_constraints(&cert, 0, -1);
+	x509write_crt_set_subject_key_identifier(&cert);
+	x509write_crt_set_authority_key_identifier(&cert);
+
+	_urandom(NULL, buf, 8);
+	for (len = 0; len < 8; len++)
+		sprintf(sstr + len*2, "%02x", (unsigned char) buf[len]);
+
+	mpi_init(&serial);
+	mpi_read_string(&serial, 16, sstr);
+	x509write_crt_set_serial(&cert, &serial);
+
+	if (pem) {
+		if (x509write_crt_pem(&cert, (void *) buf, sizeof(buf), _urandom, NULL) < 0) {
+			fprintf(stderr, "Failed to generate certificate\n");
+			return 1;
+		}
+
+		len = strlen(buf);
+	} else {
+		len = x509write_crt_der(&cert, (void *) buf, sizeof(buf), _urandom, NULL);
+		if (len < 0) {
+			fprintf(stderr, "Failed to generate certificate: %d\n", len);
+			return 1;
+		}
+	}
+	write_file(certpath, len, pem);
+
+	x509write_crt_free(&cert);
+	mpi_free(&serial);
+	pk_free(&key);
+
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	urandom_fd = open("/dev/urandom", O_RDONLY);
+
+	if (!argv[1]) {
+		//Usage
+	} else if (!strcmp(argv[1], "rsakey")) {
+		return rsakey(argv+2);
+	} else if (!strcmp(argv[1], "selfsigned")) {
+		return selfsigned(argv+2);
+	}
+
+	fprintf(stderr,
+		"PX5G X.509 Certificate Generator Utility v" PX5G_VERSION "\n" PX5G_COPY
+		"\nbased on PolarSSL by Christophe Devine and Paul Bakker\n\n");
+	fprintf(stderr, "Usage: %s [rsakey|selfsigned]\n", *argv);
+	return 1;
+}
diff --git a/trunk/package/utils/robocfg/Makefile b/trunk/package/utils/robocfg/Makefile
new file mode 100644
index 00000000..4bc72f51
--- /dev/null
+++ b/trunk/package/utils/robocfg/Makefile
@@ -0,0 +1,39 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=robocfg
+PKG_VERSION:=0.01
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/robocfg
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=BCM5325E/536x switch configuration utility
+endef
+
+define Package/robocfg/description
+ This package contains an utility for configuring the Broadcom BCM5325E/536x 
+ based switches.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/robocfg/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/robocfg $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,robocfg))
diff --git a/trunk/package/utils/robocfg/src/Makefile b/trunk/package/utils/robocfg/src/Makefile
new file mode 100644
index 00000000..e11acb02
--- /dev/null
+++ b/trunk/package/utils/robocfg/src/Makefile
@@ -0,0 +1,11 @@
+
+all: robocfg
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $^
+
+robocfg: robocfg.o
+	$(CC) -o $@ $^
+
+clean:
+	rm -f *.o robocfg
diff --git a/trunk/package/utils/robocfg/src/etc53xx.h b/trunk/package/utils/robocfg/src/etc53xx.h
new file mode 100644
index 00000000..d5b1310c
--- /dev/null
+++ b/trunk/package/utils/robocfg/src/etc53xx.h
@@ -0,0 +1,619 @@
+/*
+ * Broadcom Home Gateway Reference Design
+ * BCM53xx Register definitions
+ *
+ * Copyright 2004, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ */
+
+#ifndef __BCM535M_H_
+#define __BCM535M_H_
+
+/* ROBO embedded device type */
+#define ROBO_DEV_5380 1
+#define ROBO_DEV_5365 2
+#define ROBO_DEV_5350 3
+
+/* BCM5325m GLOBAL PAGE REGISTER MAP */
+#ifndef _CFE_
+#pragma pack(1)
+#endif
+
+/* BCM5325m Serial Management Port (SMP) Page offsets */
+#define ROBO_CTRL_PAGE        0x00  /* Control registers */
+#define ROBO_STAT_PAGE        0x01  /* Status register */
+#define ROBO_MGMT_PAGE        0x02  /* Management Mode registers */
+#define ROBO_MIB_AC_PAGE      0x03  /* MIB Autocast registers */
+#define ROBO_ARLCTRL_PAGE     0x04  /* ARL Control Registers */
+#define ROBO_ARLIO_PAGE       0x05  /* ARL Access Registers */
+#define ROBO_FRAMEBUF_PAGE    0x06  /* Management frame access registers */
+#define ROBO_MEM_ACCESS_PAGE  0x08  /* Memory access registers */
+
+/* PHY Registers */
+#define ROBO_PORT0_MII_PAGE    0x10 /* Port 0 MII Registers */
+#define ROBO_PORT1_MII_PAGE    0x11 /* Port 1 MII Registers */
+#define ROBO_PORT2_MII_PAGE    0x12 /* Port 2 MII Registers */
+#define ROBO_PORT3_MII_PAGE    0x13 /* Port 3 MII Registers */
+#define ROBO_PORT4_MII_PAGE    0x14 /* Port 4 MII Registers */
+/* (start) registers only for BCM5380 */
+#define ROBO_PORT5_MII_PAGE    0x15 /* Port 5 MII Registers */
+#define ROBO_PORT6_MII_PAGE    0x16 /* Port 6 MII Registers */
+#define ROBO_PORT7_MII_PAGE    0x17 /* Port 7 MII Registers */
+/* (end) registers only for BCM5380 */
+#define ROBO_IM_PORT_PAGE      0x18 /* Inverse MII Port (to EMAC) */
+#define ROBO_ALL_PORT_PAGE     0x19 /* All ports MII Registers (broadcast)*/
+
+/* MAC Statistics registers */
+#define ROBO_PORT0_MIB_PAGE       0x20 /* Port 0 10/100 MIB Statistics */
+#define ROBO_PORT1_MIB_PAGE       0x21 /* Port 1 10/100 MIB Statistics */
+#define ROBO_PORT2_MIB_PAGE       0x22 /* Port 2 10/100 MIB Statistics */
+#define ROBO_PORT3_MIB_PAGE       0x23 /* Port 3 10/100 MIB Statistics */
+#define ROBO_PORT4_MIB_PAGE       0x24 /* Port 4 10/100 MIB Statistics */
+/* (start) registers only for BCM5380 */
+#define ROBO_PORT5_MIB_PAGE       0x25 /* Port 5 10/100 MIB Statistics */
+#define ROBO_PORT6_MIB_PAGE       0x26 /* Port 6 10/100 MIB Statistics */
+#define ROBO_PORT7_MIB_PAGE       0x27 /* Port 7 10/100 MIB Statistics */
+/* (end) registers only for BCM5380 */
+#define ROBO_IM_PORT_MIB_PAGE     0x28 /* Inverse MII Port MIB Statistics */
+
+/* Quality of Service (QoS) Registers */
+#define ROBO_QOS_PAGE             0x30 /* QoS Registers */
+
+/* VLAN Registers */
+#define ROBO_VLAN_PAGE            0x34 /* VLAN Registers */
+
+/* Note SPI Data/IO Registers not used */
+#define ROBO_SPI_DATA_IO_0_PAGE   0xf0 /* SPI Data I/O 0 */
+#define ROBO_SPI_DATA_IO_1_PAGE   0xf1 /* SPI Data I/O 1 */
+#define ROBO_SPI_DATA_IO_2_PAGE   0xf2 /* SPI Data I/O 2 */
+#define ROBO_SPI_DATA_IO_3_PAGE   0xf3 /* SPI Data I/O 3 */
+#define ROBO_SPI_DATA_IO_4_PAGE   0xf4 /* SPI Data I/O 4 */
+#define ROBO_SPI_DATA_IO_5_PAGE   0xf5 /* SPI Data I/O 5 */
+#define ROBO_SPI_DATA_IO_6_PAGE   0xf6 /* SPI Data I/O 6 */
+#define ROBO_SPI_DATA_IO_7_PAGE   0xf7 /* SPI Data I/O 7 */
+
+#define ROBO_SPI_STATUS_PAGE      0xfe /* SPI Status Registers */
+#define ROBO_PAGE_PAGE            0xff /* Page Registers */
+
+
+/* BCM5325m CONTROL PAGE (0x00) REGISTER MAP : 8bit (byte) registers */
+typedef struct _ROBO_PORT_CTRL_STRUC
+{
+    unsigned char   rx_disable:1;   /* rx disable */
+    unsigned char   tx_disable:1;   /* tx disable */
+    unsigned char   rsvd:3;         /* reserved */
+    unsigned char   stp_state:3;    /* spanning tree state */
+} ROBO_PORT_CTRL_STRUC;
+
+#define ROBO_PORT0_CTRL           0x00 /* 10/100 Port 0 Control */
+#define ROBO_PORT1_CTRL           0x01 /* 10/100 Port 1 Control */
+#define ROBO_PORT2_CTRL           0x02 /* 10/100 Port 2 Control */
+#define ROBO_PORT3_CTRL           0x03 /* 10/100 Port 3 Control */
+#define ROBO_PORT4_CTRL           0x04 /* 10/100 Port 4 Control */
+/* (start) registers only for BCM5380 */
+#define ROBO_PORT5_CTRL           0x05 /* 10/100 Port 5 Control */
+#define ROBO_PORT6_CTRL           0x06 /* 10/100 Port 6 Control */
+#define ROBO_PORT7_CTRL           0x07 /* 10/100 Port 7 Control */
+/* (end) registers only for BCM5380 */
+#define ROBO_IM_PORT_CTRL         0x08 /* 10/100 Port 8 Control */
+#define ROBO_SMP_CTRL             0x0a /* SMP Control register */
+#define ROBO_SWITCH_MODE          0x0b /* Switch Mode Control */
+#define ROBO_PORT_OVERRIDE_CTRL   0x0e /* Port state override */
+#define ROBO_PORT_OVERRIDE_RVMII  (1<<4) /* Bit 4 enables RvMII */
+#define ROBO_PD_MODE_CTRL         0x0f /* Power-down mode control */
+#define ROBO_IP_MULTICAST_CTRL    0x21 /* IP Multicast control */
+
+/* BCM5325m STATUS PAGE (0x01) REGISTER MAP : 16bit/48bit registers */
+#define ROBO_HALF_DUPLEX 0
+#define ROBO_FULL_DUPLEX 1
+
+#define ROBO_LINK_STAT_SUMMARY    0x00 /* Link Status Summary: 16bit */
+#define ROBO_LINK_STAT_CHANGE     0x02 /* Link Status Change: 16bit */
+#define ROBO_SPEED_STAT_SUMMARY   0x04 /* Port Speed Summary: 16bit*/
+#define ROBO_DUPLEX_STAT_SUMMARY  0x06 /* Duplex Status Summary: 16bit */
+#define ROBO_PAUSE_STAT_SUMMARY   0x08 /* PAUSE Status Summary: 16bit */
+#define ROBO_SOURCE_ADDR_CHANGE   0x0C /* Source Address Change: 16bit	*/
+#define ROBO_LSA_PORT0            0x10 /* Last Source Addr, Port 0: 48bits*/
+#define ROBO_LSA_PORT1            0x16 /* Last Source Addr, Port 1: 48bits*/
+#define ROBO_LSA_PORT2            0x1c /* Last Source Addr, Port 2: 48bits*/
+#define ROBO_LSA_PORT3            0x22 /* Last Source Addr, Port 3: 48bits*/
+#define ROBO_LSA_PORT4            0x28 /* Last Source Addr, Port 4: 48bits*/
+#define ROBO_LSA_IM_PORT          0x40 /* Last Source Addr, IM Port: 48bits*/
+
+/* BCM5325m MANAGEMENT MODE REGISTERS (0x02) REGISTER MAP: 8/48 bit regs*/
+typedef struct _ROBO_GLOBAL_CONFIG_STRUC
+{
+    unsigned char   resetMIB:1;         /* reset MIB counters */
+    unsigned char   rxBPDU:1;           /* receive BDPU enable */
+    unsigned char   rsvd1:2;            /* reserved */
+    unsigned char   MIBacHdrCtrl:1;     /* MIB autocast header control */
+    unsigned char   MIBac:1;            /* MIB autocast enable */
+    unsigned char   frameMgmtPort:2;    /* frame management port */
+} ROBO_GLOBAL_CONFIG_STRUC;
+#define ROBO_GLOBAL_CONFIG        0x00 /* Global Management Config: 8bit*/
+#define ROBO_MGMT_PORT_ID         0x02 /* Management Port ID: 8bit*/
+#define ROBO_RMON_MIB_STEER       0x04 /* RMON Mib Steering: 16bit */
+#define ROBO_MIB_MODE_SELECT      0x04 /* MIB Mode select: 16bit (BCM5350) */
+#define ROBO_AGE_TIMER_CTRL       0x06 /* Age time control: 32bit */
+#define ROBO_MIRROR_CAP_CTRL      0x10 /* Mirror Capture : 16bit */
+#define ROBO_MIRROR_ING_CTRL      0x12 /* Mirror Ingress Control: 16bit */
+#define ROBO_MIRROR_ING_DIV_CTRL  0x14 /* Mirror Ingress Divider: 16bit */
+#define ROBO_MIRROR_ING_MAC_ADDR  0x16 /* Ingress Mirror MAC Addr: 48bit*/
+#define ROBO_MIRROR_EGR_CTRL      0x1c /* Mirror Egress Control: 16bit */
+#define ROBO_MIRROR_EGR_DIV_CTRL  0x1e /* Mirror Egress Divider: 16bit */
+#define ROBO_MIRROR_EGR_MAC_ADDR  0x20 /* Egress Mirror MAC Addr: 48bit*/
+
+/* BCM5325m MIB AUTOCAST REGISTERS (0x03) REGISTER MAP: 8/16/48 bit regs */
+#define ROBO_MIB_AC_PORT          0x00 /* MIB Autocast Port: 16bit */
+#define ROBO_MIB_AC_HDR_PTR       0x02 /* MIB Autocast Header pointer:16bit*/ 
+#define ROBO_MIB_AC_HDR_LEN       0x04 /* MIB Autocast Header Len: 16bit */
+#define ROBO_MIB_AC_DA            0x06 /* MIB Autocast DA: 48bit */
+#define ROBO_MIB_AC_SA            0x0c /* MIB Autocast SA: 48bit */
+#define ROBO_MIB_AC_TYPE          0x12 /* MIB Autocast Type: 16bit */
+#define ROBO_MIB_AC_RATE          0x14 /* MIB Autocast Rate: 8bit */
+#define ROBO_GET_AC_RATE(secs) ((secs)*10)
+#define ROBO_AC_RATE_MAX          0xff
+#define ROBO_AC_RATE_DEFAULT      0x64  /* 10 secs */
+typedef struct _ROBO_MIB_AC_STRUCT
+{
+    unsigned char   opcode:4;       /* Tx MIB Autocast opcode */
+    unsigned char   portno:4;       /* zero-based port no. */
+    unsigned char   portstate:8;    /* port state */
+    unsigned long long TxOctets;   
+    unsigned int    TxDropPkts;
+    unsigned int    rsvd;
+    unsigned int    TxBroadcastPkts;
+    unsigned int    TxMulticastPkts;
+    unsigned int    TxUnicastPkts;
+    unsigned int    TxCollisions;
+    unsigned int    TxSingleCollision;
+    unsigned int    TxMultiCollision;
+    unsigned int    TxDeferredTransmit;
+    unsigned int    TxLateCollision;
+    unsigned int    TxExcessiveCollision;
+    unsigned int    TxFrameInDiscards;
+    unsigned int    TxPausePkts;
+    unsigned int    rsvd1[2];
+    unsigned long long RxOctets;
+    unsigned int    RxUndersizePkts;
+    unsigned int    RxPausePkts;
+    unsigned int    RxPkts64Octets;
+    unsigned int    RxPkts64to127Octets;
+    unsigned int    RxPkts128to255Octets;
+    unsigned int    RxPkts256to511Octets;
+    unsigned int    RxPkts512to1023Octets;
+    unsigned int    RxPkts1024to1522Octets;
+    unsigned int    RxOversizePkts;
+    unsigned int    RxJabbers;
+    unsigned int    RxAlignmentErrors;
+    unsigned int    RxFCSErrors;
+    unsigned long long RxGoodOctets;
+    unsigned int    RxDropPkts;
+    unsigned int    RxUnicastPkts;
+    unsigned int    RxMulticastPkts;
+    unsigned int    RxBroadcastPkts;
+    unsigned int    RxSAChanges;
+    unsigned int    RxFragments;
+    unsigned int    RxExcessSizeDisc;
+    unsigned int    RxSymbolError;
+} ROBO_MIB_AC_STRUCT;
+
+/* BCM5325m ARL CONTROL REGISTERS (0x04) REGISTER MAP: 8/16/48/64 bit regs */
+#define ROBO_ARL_CONFIG           0x00 /* ARL Global Configuration: 8bit*/
+#define ROBO_BPDU_MC_ADDR_REG     0x04 /* BPDU Multicast Address Reg:64bit*/
+#define ROBO_MULTIPORT_ADDR_1     0x10 /* Multiport Address 1: 48 bits*/
+#define ROBO_MULTIPORT_VECTOR_1   0x16 /* Multiport Vector 1: 16 bits */
+#define ROBO_MULTIPORT_ADDR_2     0x20 /* Multiport Address 2: 48 bits*/
+#define ROBO_MULTIPORT_VECTOR_2   0x26 /* Multiport Vector 2: 16 bits */
+#define ROBO_SECURE_SRC_PORT_MASK 0x30 /* Secure Source Port Mask: 16 bits*/
+#define ROBO_SECURE_DST_PORT_MASK 0x32 /* Secure Dest Port Mask: 16 bits */
+
+
+/* BCM5325m ARL IO REGISTERS (0x05) REGISTER MAP: 8/16/48/64 bit regs */
+#define ARL_TABLE_WRITE 0              /* for read/write state in control reg */
+#define ARL_TABLE_READ  1              /* for read/write state in control reg */
+#ifdef BCM5380
+#define ARL_VID_BYTES   2              /* number of bytes for VID */
+#else
+#define ARL_VID_BYTES   1              /* number of bytes for VID */
+#endif
+typedef struct _ROBO_ARL_RW_CTRL_STRUC
+{
+    unsigned char   ARLrw:1;    /* ARL read/write (1=read) */
+    unsigned char   rsvd:6;     /* reserved */
+    unsigned char   ARLStart:1; /* ARL start/done (1=start) */
+} ROBO_ARL_RW_CTRL_STRUC;
+typedef struct _ROBO_ARL_SEARCH_CTRL_STRUC
+{
+    unsigned char   valid:1;    /* ARL search result valid */
+    unsigned char   rsvd:6;     /* reserved */
+    unsigned char   ARLStart:1; /* ARL start/done (1=start) */
+} ROBO_ARL_SEARCH_CTRL_STRUC;
+typedef struct _ROBO_ARL_ENTRY_CTRL_STRUC
+{
+    unsigned char   portID:4;   /* port id */
+    unsigned char   chipID:2;   /* chip id */
+    unsigned char   rsvd:5;     /* reserved */
+    unsigned char   prio:2;     /* priority */
+    unsigned char   age:1;      /* age */
+    unsigned char   staticEn:1; /* static */
+    unsigned char   valid:1;    /* valid */
+} ROBO_ARL_ENTRY_CTRL_STRUC;
+typedef struct _ROBO_ARL_SEARCH_RESULT_CTRL_STRUC
+{
+    unsigned char   portID:4;   /* port id */
+    unsigned char   rsvd:1;     /* reserved */
+    unsigned char   vid:8;   	/* vlan id */
+    unsigned char   age:1;      /* age */
+    unsigned char   staticEn:1; /* static */
+    unsigned char   valid:1;    /* valid */
+} ROBO_ARL_SEARCH_RESULT_CTRL_STRUC;
+typedef struct _ROBO_ARL_ENTRY_MAC_STRUC
+{
+    unsigned char   macBytes[6];    /* MAC address */
+} ROBO_ARL_ENTRY_MAC_STRUC;
+
+typedef struct _ROBO_ARL_ENTRY_STRUC
+{
+    ROBO_ARL_ENTRY_MAC_STRUC    mac;    /* MAC address */
+    ROBO_ARL_ENTRY_CTRL_STRUC   ctrl;   /* control bits */
+} ROBO_ARL_ENTRY_STRUC;
+
+typedef struct _ROBO_ARL_SEARCH_RESULT_STRUC
+{
+    ROBO_ARL_ENTRY_MAC_STRUC    mac;    		/* MAC address */
+    ROBO_ARL_SEARCH_RESULT_CTRL_STRUC   ctrl;   /* control bits */
+} ROBO_ARL_SEARCH_RESULT_STRUC;
+
+/* multicast versions of ARL entry structs */
+typedef struct _ROBO_ARL_ENTRY_MCAST_CTRL_STRUC
+{
+    unsigned int    portMask:12;/* multicast port mask */
+    unsigned char   prio:1;     /* priority */
+    unsigned char   gigPort:1;  /* gigabit port 1 mask */
+    unsigned char   staticEn:1; /* static */
+    unsigned char   valid:1;    /* valid */
+} ROBO_ARL_ENTRY_MCAST_CTRL_STRUC;
+typedef struct _ROBO_ARL_SEARCH_RESULT_MCAST_CTRL_STRUC
+{
+    unsigned int    portMask:13;   	/* multicast port mask */
+    unsigned char   age:1;      	/* age */
+    unsigned char   staticEn:1; 	/* static */
+    unsigned char   valid:1;    	/* valid */
+} ROBO_ARL_SEARCH_RESULT_MCAST_CTRL_STRUC;
+/* BCM5350 extension register */
+typedef struct _ROBO_ARL_SEARCH_RESULT_EXTENSION
+{
+    unsigned int    prio:2;         /* priority */
+    unsigned int    portMask:1;     /* MSB (MII) of port mask for multicast */
+    unsigned int    reserved:5;
+} ROBO_ARL_SEARCH_RESULT_EXTENSION;
+
+typedef struct _ROBO_ARL_ENTRY_MCAST_STRUC
+{
+    ROBO_ARL_ENTRY_MAC_STRUC        mac;    /* MAC address */
+    ROBO_ARL_ENTRY_MCAST_CTRL_STRUC ctrl;   /* control bits */
+} ROBO_ARL_ENTRY_MCAST_STRUC;
+typedef struct _ROBO_ARL_SEARCH_RESULT_MCAST_STRUC
+{
+    ROBO_ARL_ENTRY_MAC_STRUC    mac;    				/* MAC address */
+    ROBO_ARL_SEARCH_RESULT_MCAST_CTRL_STRUC   ctrl;   	/* control bits */
+} ROBO_ARL_SEARCH_RESULT_MCAST_STRUC;
+
+#define ROBO_ARL_RW_CTRL          0x00 /* ARL Read/Write Control :  8bit */
+#define ROBO_ARL_MAC_ADDR_IDX     0x02 /* MAC Address Index: 48bit */
+#define ROBO_ARL_VID_TABLE_IDX    0x08 /* VID Table Address Index: 8bit */
+#define ROBO_ARL_ENTRY0           0x10 /* ARL Entry 0 : 64 bit */
+#define ROBO_ARL_ENTRY1           0x18 /* ARL Entry 1 : 64 bit */
+#define ROBO_ARL_SEARCH_CTRL      0x20 /* ARL Search Control: 8bit */
+#define ROBO_ARL_SEARCH_ADDR      0x22 /* ARL Search Address: 16bit */
+#define ROBO_ARL_SEARCH_RESULT    0x24 /* ARL Search Result: 64bit */
+#define ROBO_ARL_SEARCH_RESULT_EXT 0x2c /* ARL Search Result Extension (5350): 8bit */
+#define ROBO_ARL_VID_ENTRY0       0x30 /* ARL VID Entry 0: 64bit */
+#define ROBO_ARL_VID_ENTRY1       0x32 /* ARL VID Entry 1: 64bit */
+
+/* BCM5325m MANAGEMENT FRAME REGISTERS (0x6) REGISTER MAP: 8/16 bit regs */
+#define ROBO_MGMT_FRAME_RD_DATA   0x00 /* Management Frame Read Data :8bit*/
+#define ROBO_MGMT_FRAME_WR_DATA   0x01 /* Management Frame Write Data:8bit*/
+#define ROBO_MGMT_FRAME_WR_CTRL   0x02 /* Write Control: 16bit */
+#define ROBO_MGMT_FRAME_RD_STAT   0x04 /* Read Status: 16bit */
+
+/* BCM5325m MEMORY ACCESS REGISTERS (Page 0x08) REGISTER MAP: 32 bit regs */
+#define MEM_TABLE_READ  1               /* for read/write state in mem access reg */
+#define MEM_TABLE_WRITE 0               /* for read/write state in mem access reg */
+#define MEM_TABLE_ACCESS_START 1        /* for mem access read/write start */
+#define MEM_TABLE_ACCESS_DONE  0        /* for mem access read/write done */
+#define VLAN_TABLE_ADDR 0x3800          /* BCM5380 only */
+#ifdef BCM5380
+#define NUM_ARL_TABLE_ENTRIES 4096      /* number of entries in ARL table */
+#define NUM_VLAN_TABLE_ENTRIES 2048     /* number of entries in VLAN table */
+#define ARL_TABLE_ADDR 0                /* offset of ARL table start */
+#else
+#define NUM_ARL_TABLE_ENTRIES 2048      /* number of entries in ARL table */
+#define NUM_VLAN_TABLE_ENTRIES 256      /* number of entries in VLAN table */
+#define ARL_TABLE_ADDR 0x3800           /* offset of ARL table start */
+/* corresponding values for 5350 */
+#define NUM_ARL_TABLE_ENTRIES_5350 1024 /* number of entries in ARL table (5350) */
+#define NUM_VLAN_TABLE_ENTRIES_5350 16  /* number of entries in VLAN table */
+#define ARL_TABLE_ADDR_5350 0x1c00      /* offset of ARL table start (5350) */
+#endif
+typedef struct _ROBO_MEM_ACCESS_CTRL_STRUC
+{
+    unsigned int    memAddr:14; /* 64-bit memory address */
+    unsigned char   rsvd:4;     /* reserved */
+    unsigned char   readEn:1;   /* read enable (0 == write) */
+    unsigned char   startDone:1;/* memory access start/done */
+    unsigned int    rsvd1:12;   /* reserved */
+} ROBO_MEM_ACCESS_CTRL_STRUC;
+typedef struct _ROBO_MEM_ACCESS_DATA_STRUC
+{
+    unsigned int    memData[2]; /* 64-bit data */
+    unsigned short  rsvd;       /* reserved */
+} ROBO_MEM_ACCESS_DATA_STRUC;
+
+#ifdef BCM5380
+typedef struct _ROBO_ARL_TABLE_DATA_STRUC
+{
+    unsigned char   MACaddr[6]; /* MAC addr */
+    unsigned int    portID:4;   /* port ID */
+    unsigned int    chipID:2;   /* chip ID */
+    unsigned int    rsvd:6;     /* reserved */
+    unsigned int    highPrio:1; /* high priority address */
+    unsigned int    age:1;      /* entry accessed/learned since ageing process */
+    unsigned int    staticAddr:1;/* entry is static */
+    unsigned int    valid:1;    /* entry is valid */
+    unsigned int    vid:12;     /* vlan id */
+    unsigned int    rsvd2:4;    /* reserved */
+} ROBO_ARL_TABLE_DATA_STRUC;
+#else
+typedef struct _ROBO_ARL_TABLE_DATA_STRUC
+{
+    unsigned char   MACaddr[6]; /* MAC addr */
+    unsigned int    portID:4;   /* port ID */
+    unsigned int    chipID:2;   /* chip ID */
+    unsigned int    rsvd:7;     /* reserved */
+    unsigned int    age:1;      /* entry accessed/learned since ageing process */
+    unsigned int    staticAddr:1;/* entry is static */
+    unsigned int    valid:1;    /* entry is valid */
+} ROBO_ARL_TABLE_DATA_STRUC;
+#endif
+
+/* multicast format*/
+typedef struct _ROBO_ARL_TABLE_MCAST_DATA_STRUC
+{
+    unsigned char   MACaddr[6]; /* MAC addr */
+    unsigned int    portMask:12;/* multicast port mask */
+    unsigned char   prio:1;     /* priority */
+    unsigned char   gigPort:1;  /* gigabit port 1 mask */
+    unsigned char   staticEn:1; /* static */
+    unsigned char   valid:1;    /* valid */
+    unsigned int    vid:12;     /* vlan id */
+    unsigned int    rsvd2:4;    /* reserved */
+} ROBO_ARL_TABLE_MCAST_DATA_STRUC;
+#define ROBO_MEM_ACCESS_CTRL      0x00 /* Memory Read/Write Control :32bit*/
+#define ROBO_MEM_ACCESS_DATA      0x04 /* Memory Read/Write Data:64bit*/
+
+/* BCM5325m SWITCH PORT (0x10-18) REGISTER MAP: 8/16 bit regs */
+typedef struct _ROBO_MII_CTRL_STRUC
+{
+    unsigned char   rsvd:8;     /* reserved */
+    unsigned char   duplex:1;   /* duplex mode */
+    unsigned char   restartAN:1;/* restart auto-negotiation */
+    unsigned char   rsvd1:1;    /* reserved */
+    unsigned char   powerDown:1;/* power down */
+    unsigned char   ANenable:1; /* auto-negotiation enable */
+    unsigned char   speed:1;    /* forced speed selection */
+    unsigned char   loopback:1; /* loopback */
+    unsigned char   reset:1;    /* reset */
+} ROBO_MII_CTRL_STRUC;
+typedef struct _ROBO_MII_AN_ADVERT_STRUC
+{
+    unsigned char   selector:5;     /* advertise selector field */
+    unsigned char   T10BaseT:1;     /* advertise 10BaseT */
+    unsigned char   T10BaseTFull:1; /* advertise 10BaseT, full duplex */
+    unsigned char   T100BaseX:1;    /* advertise 100BaseX */
+    unsigned char   T100BaseXFull:1;/* advertise 100BaseX full duplex */
+    unsigned char   noT4:1;         /* do not advertise T4 */
+    unsigned char   pause:1;        /* advertise pause for full duplex */
+    unsigned char   rsvd:2;         /* reserved */
+    unsigned char   remoteFault:1;  /* transmit remote fault */
+    unsigned char   rsvd1:1;        /* reserved */
+    unsigned char   nextPage:1;     /* nex page operation supported */
+} ROBO_MII_AN_ADVERT_STRUC;
+#define ROBO_MII_CTRL                 0x00 /* Port MII Control */
+#define ROBO_MII_STAT                 0x02 /* Port MII Status  */
+/* Fields of link status register */
+#define ROBO_MII_STAT_JABBER          (1<<1) /* Jabber detected */
+#define ROBO_MII_STAT_LINK            (1<<2) /* Link status */
+
+#define ROBO_MII_PHYID_HI             0x04 /* Port PHY ID High */
+#define ROBO_MII_PHYID_LO             0x06 /* Port PHY ID Low */
+#define ROBO_MII_ANA_REG              0x08 /* MII Auto-Neg Advertisement */
+#define ROBO_MII_ANP_REG              0x0a /* MII Auto-Neg Partner Ability */
+#define ROBO_MII_AN_EXP_REG           0x0c /* MII Auto-Neg Expansion */
+#define ROBO_MII_AN_NP_REG            0x0e /* MII next page */
+#define ROBO_MII_ANP_NP_REG           0x10 /* MII Partner next page */
+#define ROBO_MII_100BX_AUX_CTRL       0x20 /* 100BASE-X Auxiliary Control */
+#define ROBO_MII_100BX_AUX_STAT       0x22 /* 100BASE-X Auxiliary Status  */
+#define ROBO_MII_100BX_RCV_ERR_CTR    0x24 /* 100BASE-X Receive Error Ctr */
+#define ROBO_MII_100BX_RCV_FS_ERR     0x26 /* 100BASE-X Rcv False Sense Ctr */
+#define ROBO_MII_AUX_CTRL             0x30 /* Auxiliary Control/Status */
+/* Fields of Auxiliary control register */
+#define ROBO_MII_AUX_CTRL_FD         (1<<0) /* Full duplex link detected*/
+#define ROBO_MII_AUX_CTRL_SP100      (1<<1) /* Speed 100 indication */
+#define ROBO_MII_AUX_STATUS           0x32 /* Aux Status Summary */
+#define ROBO_MII_CONN_STATUS          0x34 /* Aux Connection Status */
+#define ROBO_MII_AUX_MODE2            0x36 /* Aux Mode 2 */
+#define ROBO_MII_AUX_ERR_STATUS       0x38 /* Aux Error and General Status */
+#define ROBO_MII_AUX_MULTI_PHY        0x3c /* Aux Multiple PHY Register*/
+#define ROBO_MII_BROADCOM_TEST        0x3e /* Broadcom Test Register */
+
+
+/* BCM5325m PORT MIB REGISTERS (Pages 0x20-0x24,0x28) REGISTER MAP: 64/32 */
+/* Tranmit Statistics */
+#define ROBO_MIB_TX_OCTETS            0x00 /* 64b: TxOctets */
+#define ROBO_MIB_TX_DROP_PKTS         0x08 /* 32b: TxDropPkts */
+#define ROBO_MIB_TX_BC_PKTS           0x10 /* 32b: TxBroadcastPkts */
+#define ROBO_MIB_TX_MC_PKTS           0x14 /* 32b: TxMulticastPkts */
+#define ROBO_MIB_TX_UC_PKTS           0x18 /* 32b: TxUnicastPkts */
+#define ROBO_MIB_TX_COLLISIONS        0x1c /* 32b: TxCollisions */
+#define ROBO_MIB_TX_SINGLE_COLLISIONS 0x20 /* 32b: TxSingleCollision */
+#define ROBO_MIB_TX_MULTI_COLLISIONS  0x24 /* 32b: TxMultiCollision */
+#define ROBO_MIB_TX_DEFER_TX          0x28 /* 32b: TxDeferred Transmit */
+#define ROBO_MIB_TX_LATE_COLLISIONS   0x2c /* 32b: TxLateCollision */
+#define ROBO_MIB_EXCESS_COLLISIONS    0x30 /* 32b: TxExcessiveCollision*/
+#define ROBO_MIB_FRAME_IN_DISCARDS    0x34 /* 32b: TxFrameInDiscards */
+#define ROBO_MIB_TX_PAUSE_PKTS        0x38 /* 32b: TxPausePkts */
+
+/* Receive Statistics */
+#define ROBO_MIB_RX_OCTETS            0x44 /* 64b: RxOctets */
+#define ROBO_MIB_RX_UNDER_SIZE_PKTS   0x4c /* 32b: RxUndersizePkts(runts)*/
+#define ROBO_MIB_RX_PAUSE_PKTS        0x50 /* 32b: RxPausePkts */
+#define ROBO_MIB_RX_PKTS_64           0x54 /* 32b: RxPkts64Octets */
+#define ROBO_MIB_RX_PKTS_65_TO_127    0x58 /* 32b: RxPkts64to127Octets*/
+#define ROBO_MIB_RX_PKTS_128_TO_255   0x5c /* 32b: RxPkts128to255Octets*/
+#define ROBO_MIB_RX_PKTS_256_TO_511   0x60 /* 32b: RxPkts256to511Octets*/
+#define ROBO_MIB_RX_PKTS_512_TO_1023  0x64 /* 32b: RxPkts512to1023Octets*/
+#define ROBO_MIB_RX_PKTS_1024_TO_1522 0x68 /* 32b: RxPkts1024to1522Octets*/
+#define ROBO_MIB_RX_OVER_SIZE_PKTS    0x6c /* 32b: RxOversizePkts*/
+#define ROBO_MIB_RX_JABBERS           0x70 /* 32b: RxJabbers*/
+#define ROBO_MIB_RX_ALIGNMENT_ERRORS  0x74 /* 32b: RxAlignmentErrors*/
+#define ROBO_MIB_RX_FCS_ERRORS        0x78 /* 32b: RxFCSErrors */
+#define ROBO_MIB_RX_GOOD_OCTETS       0x7c /* 32b: RxGoodOctets */
+#define ROBO_MIB_RX_DROP_PKTS         0x84 /* 32b: RxDropPkts */
+#define ROBO_MIB_RX_UC_PKTS           0x88 /* 32b: RxUnicastPkts */
+#define ROBO_MIB_RX_MC_PKTS           0x8c /* 32b: RxMulticastPkts */
+#define ROBO_MIB_RX_BC_PKTS           0x90 /* 32b: RxBroadcastPkts */
+#define ROBO_MIB_RX_SA_CHANGES        0x94 /* 32b: RxSAChanges */
+#define ROBO_MIB_RX_FRAGMENTS         0x98 /* 32b: RxFragments */
+#define ROBO_MIB_RX_EXCESS_SZ_DISC    0x9c /* 32b: RxExcessSizeDisc*/
+#define ROBO_MIB_RX_SYMBOL_ERROR      0xa0 /* 32b: RxSymbolError */
+
+/* BCM5350 MIB Statistics */
+/* Group 0 */
+#define ROBO_MIB_TX_GOOD_PKTS         0x00 /* 16b: TxGoodPkts */
+#define ROBO_MIB_TX_UNICAST_PKTS      0x02 /* 16b: TxUnicastPkts */
+#define ROBO_MIB_RX_GOOD_PKTS         0x04 /* 16b: RxGoodPkts */
+#define ROBO_MIB_RX_GOOD_UNICAST_PKTS 0x06 /* 16b: RxGoodUnicastPkts */
+/* Group 1 */
+#define ROBO_MIB_TX_COLLISION         0x00 /* 16b: TxCollision */
+#define ROBO_MIB_TX_OCTETS_5350       0x02 /* 16b: TxOctets */
+#define ROBO_MIB_RX_FCS_ERRORS_5350   0x04 /* 16b: RxFCSErrors */
+#define ROBO_MIB_RX_GOOD_OCTETS_5350  0x06 /* 16b: RxGoodOctets */
+
+/* BCM5325m QoS REGISTERS (Page 0x30) REGISTER MAP: 8/16 */
+#define ROBO_QOS_CTRL                 0x00 /* 16b: QoS Control Register */
+#define ROBO_QOS_LOCAL_WEIGHT_CTRL    0x10 /* 8b: Local HQ/LQ Weight Register*/
+#define ROBO_QOS_CPU_WEIGHT_CTRL      0x12 /* 8b: CPU HQ/LQ Weight Register*/
+#define ROBO_QOS_PAUSE_ENA            0x13 /* 16b: Qos Pause Enable Register*/
+#define ROBO_QOS_PRIO_THRESHOLD       0x15 /* 8b: Priority Threshold Register*/
+#define ROBO_QOS_RESERVED             0x16 /* 8b: Qos Reserved Register */
+
+/* BCM5325m VLAN REGISTERS (Page 0x34) REGISTER MAP: 8/16bit */
+typedef struct _ROBO_VLAN_CTRL0_STRUC
+{
+    unsigned char   frameControlP:2;    /* 802.1P frame control */
+    unsigned char   frameControlQ:2;    /* 802.1Q frame control */
+    unsigned char   dropMissedVID:1;    /* enable drop missed VID packet */
+    unsigned char   vidMacHash:1;       /* VID_MAC hash enable */
+    unsigned char   vidMacCheck:1;      /* VID_MAC check enable */
+    unsigned char   VLANen:1;           /* 802.1Q VLAN enable */
+} ROBO_VLAN_CTRL0_STRUC;
+#define VLAN_TABLE_WRITE 1              /* for read/write state in table access reg */
+#define VLAN_TABLE_READ 0               /* for read/write state in table access reg */
+#define VLAN_ID_HIGH_BITS 0             /* static high bits in table access reg */
+#define VLAN_ID_MAX 255                 /* max VLAN id */
+#define VLAN_ID_MAX5350 15              /* max VLAN id (5350) */
+#define VLAN_ID_MASK VLAN_ID_MAX        /* VLAN id mask */
+#ifdef BCM5380
+#define VLAN_UNTAG_SHIFT 13             /* for postioning untag bits in write reg */
+#define VLAN_VALID 0x4000000             /* valid bit in write reg */
+#else
+#define VLAN_UNTAG_SHIFT 7              /* for postioning untag bits in write reg */
+#define VLAN_VALID 0x4000               /* valid bit in write reg */
+/* corresponding values for 5350 */
+#define VLAN_UNTAG_SHIFT_5350 6         /* for postioning untag bits in write reg */
+#define VLAN_VALID_5350 0x00100000      /* valid bit in write reg */
+#endif
+typedef struct _ROBO_VLAN_TABLE_ACCESS_STRUC
+{
+    unsigned char   VLANid:8;           /* VLAN ID (low 8 bits) */
+    unsigned char   VLANidHi:4;         /* VLAN ID (fixed upper portion) */
+    unsigned char   readWriteState:1;   /* read/write state (write = 1) */
+    volatile unsigned char   readWriteEnable:1;  /* table read/write enable */
+    unsigned char   rsvd:2;             /* reserved */
+} ROBO_VLAN_TABLE_ACCESS_STRUC;
+#ifdef BCM5380
+typedef struct _ROBO_VLAN_READ_WRITE_STRUC
+{
+    unsigned int    VLANgroup:13;/* VLAN group mask */
+    unsigned int    VLANuntag:13;/* VLAN untag enable mask */
+    unsigned char   valid:1;     /* valid */
+    unsigned char   rsvd:5;      /* reserved */
+} ROBO_VLAN_READ_WRITE_STRUC;
+#else
+typedef struct _ROBO_VLAN_READ_WRITE_STRUC
+{
+    unsigned char   VLANgroup:7;         /* VLAN group mask */
+    unsigned char   VLANuntag:7;         /* VLAN untag enable mask */
+    unsigned char   valid:1;             /* valid */
+    unsigned char   rsvd:1;              /* reserved */
+} ROBO_VLAN_READ_WRITE_STRUC;
+typedef struct _ROBO_VLAN_READ_WRITE_STRUC_5350
+{
+    unsigned char   VLANgroup:6;         /* VLAN group mask */
+    unsigned char   VLANuntag:6;         /* VLAN untag enable mask */
+    unsigned char   highVID:8;           /* upper bits of vid */
+    unsigned char   valid:1;             /* valid */
+    unsigned int    rsvd:11;             /* reserved */
+} ROBO_VLAN_READ_WRITE_STRUC_5350;
+#endif
+#define ROBO_VLAN_CTRL0             0x00 /* 8b: VLAN Control 0 Register */
+#define ROBO_VLAN_CTRL1             0x01 /* 8b: VLAN Control 1 Register */
+#define ROBO_VLAN_CTRL2             0x02 /* 8b: VLAN Control 2 Register */
+#define ROBO_VLAN_CTRL3             0x03 /* 8b: VLAN Control 3 Register */
+#define ROBO_VLAN_CTRL4             0x04 /* 8b: VLAN Control 4 Register */
+#define ROBO_VLAN_CTRL5             0x05 /* 8b: VLAN Control 5 Register */
+#define ROBO_VLAN_TABLE_ACCESS      0x08 /* 14b: VLAN Table Access Register */
+#define ROBO_VLAN_TABLE_ACCESS_5350 0x06 /* 14b: VLAN Table Access Register (5350) */
+#define ROBO_VLAN_WRITE             0x0a /* 15b: VLAN Write Register */
+#define ROBO_VLAN_WRITE_5350        0x08 /* 15b: VLAN Write Register (5350) */
+#define ROBO_VLAN_READ              0x0c /* 15b: VLAN Read Register */
+#define ROBO_VLAN_PORT0_DEF_TAG     0x10 /* 16b: VLAN Port 0 Default Tag Register */
+#define ROBO_VLAN_PORT1_DEF_TAG     0x12 /* 16b: VLAN Port 1 Default Tag Register */
+#define ROBO_VLAN_PORT2_DEF_TAG     0x14 /* 16b: VLAN Port 2 Default Tag Register */
+#define ROBO_VLAN_PORT3_DEF_TAG     0x16 /* 16b: VLAN Port 3 Default Tag Register */
+#define ROBO_VLAN_PORT4_DEF_TAG     0x18 /* 16b: VLAN Port 4 Default Tag Register */
+#define ROBO_VLAN_PORTMII_DEF_TAG   0x1a /* 16b: VLAN Port MII Default Tag Register */
+/* 5380 only */
+#define ROBO_VLAN_PORT5_DEF_TAG     0x1a /* 16b: VLAN Port 5 Default Tag Register */
+#define ROBO_VLAN_PORT6_DEF_TAG     0x1c /* 16b: VLAN Port 6 Default Tag Register */
+#define ROBO_VLAN_PORT7_DEF_TAG     0x1e /* 16b: VLAN Port 7 Default Tag Register */
+
+/* obsolete */
+#define ROBO_VLAN_PORT0_CTRL       0x00 /* 16b: Port 0 VLAN  Register */
+#define ROBO_VLAN_PORT1_CTRL       0x02 /* 16b: Port 1 VLAN  Register */
+#define ROBO_VLAN_PORT2_CTRL       0x04 /* 16b: Port 2 VLAN  Register */
+#define ROBO_VLAN_PORT3_CTRL       0x06 /* 16b: Port 3 VLAN  Register */
+#define ROBO_VLAN_PORT4_CTRL       0x08 /* 16b: Port 4 VLAN  Register */
+#define ROBO_VLAN_IM_PORT_CTRL     0x10 /* 16b: Inverse MII Port VLAN Reg */
+#define ROBO_VLAN_SMP_PORT_CTRL    0x12 /* 16b: Serial Port VLAN  Register */
+#define ROBO_VLAN_PORTSPI_DEF_TAG  0x1c /* 16b: VLAN Port SPI Default Tag Register */
+#define ROBO_VLAN_PRIORITY_REMAP   0x20 /* 24b: VLAN Priority Re-Map Register */
+
+#ifndef _CFE_
+#pragma pack()
+#endif
+
+
+#endif /* !__BCM535M_H_ */
+
+
+
+
+
diff --git a/trunk/package/utils/robocfg/src/robocfg.c b/trunk/package/utils/robocfg/src/robocfg.c
new file mode 100644
index 00000000..64a6d86e
--- /dev/null
+++ b/trunk/package/utils/robocfg/src/robocfg.c
@@ -0,0 +1,582 @@
+/*
+ * Broadcom BCM5325E/536x switch configuration utility
+ *
+ * Copyright (C) 2005 Oleg I. Vdovikin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor, Boston, MA  
+ * 02110-1301, USA.
+ */
+ 
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+
+/* linux stuff */
+typedef u_int64_t u64;
+typedef u_int32_t u32;
+typedef u_int16_t u16;
+typedef u_int8_t u8;
+
+#include <linux/if.h>
+#include <linux/sockios.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+
+#include "etc53xx.h"
+#define ROBO_PHY_ADDR	0x1E	/* robo switch phy address */
+
+/* MII registers */
+#define REG_MII_PAGE	0x10	/* MII Page register */
+#define REG_MII_ADDR	0x11	/* MII Address register */
+#define REG_MII_DATA0	0x18	/* MII Data register 0 */
+
+#define REG_MII_PAGE_ENABLE	1
+#define REG_MII_ADDR_WRITE	1
+#define REG_MII_ADDR_READ	2
+
+/* Private et.o ioctls */
+#define SIOCGETCPHYRD           (SIOCDEVPRIVATE + 9)
+#define SIOCSETCPHYWR           (SIOCDEVPRIVATE + 10)
+
+typedef struct {
+	struct ifreq ifr;
+	int fd;
+	int et;			/* use private ioctls */
+} robo_t;
+
+static u16 mdio_read(robo_t *robo, u16 phy_id, u8 reg)
+{
+	if (robo->et) {
+		int args[2] = { reg };
+		
+		if (phy_id != ROBO_PHY_ADDR) {
+			fprintf(stderr,
+				"Access to real 'phy' registers unavaliable.\n"
+				"Upgrade kernel driver.\n");
+
+			return 0xffff;
+		}
+	
+		robo->ifr.ifr_data = (caddr_t) args;
+		if (ioctl(robo->fd, SIOCGETCPHYRD, (caddr_t)&robo->ifr) < 0) {
+			perror("SIOCGETCPHYRD");
+			exit(1);
+		}
+	
+		return args[1];
+	} else {
+		struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&robo->ifr.ifr_data;
+		mii->phy_id = phy_id;
+		mii->reg_num = reg;
+		if (ioctl(robo->fd, SIOCGMIIREG, &robo->ifr) < 0) {
+			perror("SIOCGMIIREG");
+			exit(1);
+		}
+		return mii->val_out;
+	}
+}
+
+static void mdio_write(robo_t *robo, u16 phy_id, u8 reg, u16 val)
+{
+	if (robo->et) {
+		int args[2] = { reg, val };
+
+		if (phy_id != ROBO_PHY_ADDR) {
+			fprintf(stderr,
+				"Access to real 'phy' registers unavaliable.\n"
+				"Upgrade kernel driver.\n");
+			return;
+		}
+		
+		robo->ifr.ifr_data = (caddr_t) args;
+		if (ioctl(robo->fd, SIOCSETCPHYWR, (caddr_t)&robo->ifr) < 0) {
+			perror("SIOCGETCPHYWR");
+			exit(1);
+		}
+	} else {
+		struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&robo->ifr.ifr_data;
+		mii->phy_id = phy_id;
+		mii->reg_num = reg;
+		mii->val_in = val;
+		if (ioctl(robo->fd, SIOCSMIIREG, &robo->ifr) < 0) {
+			perror("SIOCSMIIREG");
+			exit(1);
+		}
+	}
+}
+
+static int robo_reg(robo_t *robo, u8 page, u8 reg, u8 op)
+{
+	int i = 3;
+	
+	/* set page number */
+	mdio_write(robo, ROBO_PHY_ADDR, REG_MII_PAGE, 
+		(page << 8) | REG_MII_PAGE_ENABLE);
+	
+	/* set register address */
+	mdio_write(robo, ROBO_PHY_ADDR, REG_MII_ADDR, 
+		(reg << 8) | op);
+
+	/* check if operation completed */
+	while (i--) {
+		if ((mdio_read(robo, ROBO_PHY_ADDR, REG_MII_ADDR) & 3) == 0)
+			return 0;
+	}
+
+	fprintf(stderr, "robo_reg: timeout\n");
+	exit(1);
+	
+	return 0;
+}
+
+static void robo_read(robo_t *robo, u8 page, u8 reg, u16 *val, int count)
+{
+	int i;
+	
+	robo_reg(robo, page, reg, REG_MII_ADDR_READ);
+	
+	for (i = 0; i < count; i++)
+		val[i] = mdio_read(robo, ROBO_PHY_ADDR, REG_MII_DATA0 + i);
+}
+
+static u16 robo_read16(robo_t *robo, u8 page, u8 reg)
+{
+	robo_reg(robo, page, reg, REG_MII_ADDR_READ);
+	
+	return mdio_read(robo, ROBO_PHY_ADDR, REG_MII_DATA0);
+}
+
+static u32 robo_read32(robo_t *robo, u8 page, u8 reg)
+{
+	robo_reg(robo, page, reg, REG_MII_ADDR_READ);
+	
+	return mdio_read(robo, ROBO_PHY_ADDR, REG_MII_DATA0) +
+		(mdio_read(robo, ROBO_PHY_ADDR, REG_MII_DATA0 + 1) << 16);
+}
+
+static void robo_write16(robo_t *robo, u8 page, u8 reg, u16 val16)
+{
+	/* write data */
+	mdio_write(robo, ROBO_PHY_ADDR, REG_MII_DATA0, val16);
+
+	robo_reg(robo, page, reg, REG_MII_ADDR_WRITE);
+}
+
+static void robo_write32(robo_t *robo, u8 page, u8 reg, u32 val32)
+{
+	/* write data */
+	mdio_write(robo, ROBO_PHY_ADDR, REG_MII_DATA0, val32 & 65535);
+	mdio_write(robo, ROBO_PHY_ADDR, REG_MII_DATA0 + 1, val32 >> 16);
+	
+	robo_reg(robo, page, reg, REG_MII_ADDR_WRITE);
+}
+
+/* checks that attached switch is 5325E/5350 */
+static int robo_vlan5350(robo_t *robo)
+{
+	/* set vlan access id to 15 and read it back */
+	u16 val16 = 15;
+	robo_write16(robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
+	
+	/* 5365 will refuse this as it does not have this reg */
+	return (robo_read16(robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350) == val16);
+}
+
+u8 port[6] = { 0, 1, 2, 3, 4, 8 };
+char ports[6] = { 'W', '4', '3', '2', '1', 'C' };
+char *rxtx[4] = { "enabled", "rx_disabled", "tx_disabled", "disabled" };
+char *stp[8] = { "none", "disable", "block", "listen", "learn", "forward", "6", "7" };
+
+struct {
+	char *name;
+	u16 bmcr;
+} media[5] = { { "auto", BMCR_ANENABLE | BMCR_ANRESTART }, 
+	{ "10HD", 0 }, { "10FD", BMCR_FULLDPLX },
+	{ "100HD", BMCR_SPEED100 }, { "100FD", BMCR_SPEED100 | BMCR_FULLDPLX } };
+
+struct {
+	char *name;
+	u16 value;
+} mdix[3] = { { "auto", 0x0000 }, { "on", 0x1800 }, { "off", 0x0800 } };
+
+void usage()
+{
+	fprintf(stderr, "Broadcom BCM5325E/536x switch configuration utility\n"
+		"Copyright (C) 2005 Oleg I. Vdovikin\n\n"
+		"This program is distributed in the hope that it will be useful,\n"
+		"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+		"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+		"GNU General Public License for more details.\n\n");
+
+	fprintf(stderr, "Usage: robocfg <op> ... <op>\n"
+			"Operations are as below:\n"
+			"\tshow\n"
+			"\tswitch <enable|disable>\n"
+			"\tport <port_number> [state <%s|%s|%s|%s>]\n\t\t[stp %s|%s|%s|%s|%s|%s] [tag <vlan_tag>]\n"
+			"\t\t[media %s|%s|%s|%s|%s] [mdi-x %s|%s|%s]\n"
+			"\tvlan <vlan_number> [ports <ports_list>]\n"
+			"\tvlans <enable|disable|reset>\n\n"
+			"\tports_list should be one argument, space separated, quoted if needed,\n"
+			"\tport number could be followed by 't' to leave packet vlan tagged (CPU \n"
+			"\tport default) or by 'u' to untag packet (other ports default) before \n"
+			"\tbringing it to the port, '*' is ignored\n"
+			"\nSamples:\n"
+			"1) ASUS WL-500g Deluxe stock config (eth0 is WAN, eth0.1 is LAN):\n"
+			"robocfg switch disable vlans enable reset vlan 0 ports \"0 5u\" vlan 1 ports \"1 2 3 4 5t\""
+			" port 0 state enabled stp none switch enable\n"
+			"2) WRT54g, WL-500g Deluxe libreCMC config (vlan0 is LAN, vlan1 is WAN):\n"
+			"robocfg switch disable vlans enable reset vlan 0 ports \"1 2 3 4 5t\" vlan 1 ports \"0 5t\""
+			" port 0 state enabled stp none switch enable\n",
+			rxtx[0], rxtx[1], rxtx[2], rxtx[3], stp[0], stp[1], stp[2], stp[3], stp[4], stp[5],
+			media[0].name, media[1].name, media[2].name, media[3].name, media[4].name,
+			mdix[0].name, mdix[1].name, mdix[2].name);
+}
+
+static robo_t robo;
+int bcm53xx_probe(const char *dev)
+{
+	struct ethtool_drvinfo info;
+	unsigned int phyid;
+	int ret;
+
+	fprintf(stderr, "probing %s\n", dev);
+
+	strcpy(robo.ifr.ifr_name, dev);
+	memset(&info, 0, sizeof(info));
+	info.cmd = ETHTOOL_GDRVINFO;
+	robo.ifr.ifr_data = (caddr_t)&info;
+	ret = ioctl(robo.fd, SIOCETHTOOL, (caddr_t)&robo.ifr);
+	if (ret < 0) {
+		perror("SIOCETHTOOL");
+		return ret;
+	}
+
+	if (	strcmp(info.driver, "et0") &&
+		strcmp(info.driver, "b44") &&
+		strcmp(info.driver, "bcm63xx_enet") ) {
+			fprintf(stderr, "driver not supported %s\n", info.driver);
+			return -ENOSYS;
+	}
+
+	/* try access using MII ioctls - get phy address */
+	robo.et = 0;
+	if (ioctl(robo.fd, SIOCGMIIPHY, &robo.ifr) < 0)
+		robo.et = 1;
+
+	if (robo.et) {
+		unsigned int args[2] = { 2 };
+		
+		robo.ifr.ifr_data = (caddr_t) args;
+		ret = ioctl(robo.fd, SIOCGETCPHYRD, (caddr_t)&robo.ifr);
+		if (ret < 0) {
+			perror("SIOCGETCPHYRD");
+			return ret;
+		}
+		phyid = args[1] & 0xffff;
+	
+		args[0] = 3;
+		robo.ifr.ifr_data = (caddr_t) args;
+		ret = ioctl(robo.fd, SIOCGETCPHYRD, (caddr_t)&robo.ifr);
+		if (ret < 0) {
+			perror("SIOCGETCPHYRD");
+			return ret;
+		}
+		phyid |= args[1] << 16;
+	} else {
+		struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&robo.ifr.ifr_data;
+		mii->phy_id = ROBO_PHY_ADDR;
+		mii->reg_num = 2;
+		ret = ioctl(robo.fd, SIOCGMIIREG, &robo.ifr);
+		if (ret < 0) {
+			perror("SIOCGMIIREG");
+			return ret;
+		}
+		phyid = mii->val_out & 0xffff;
+
+		mii->phy_id = ROBO_PHY_ADDR;
+		mii->reg_num = 3;
+		ret = ioctl(robo.fd, SIOCGMIIREG, &robo.ifr);
+		if (ret < 0) {
+			perror("SIOCGMIIREG");
+			return ret;
+		}
+		phyid |= mii->val_out << 16;
+	}
+
+	if (phyid == 0xffffffff || phyid == 0x55210022) {
+		perror("phyid");
+		return -EIO;
+	}
+	
+	return 0;
+}
+
+int
+main(int argc, char *argv[])
+{
+	u16 val16;
+	u16 mac[3];
+	int i = 0, j;
+	int robo5350 = 0;
+	u32 phyid;
+	
+	if ((robo.fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+		perror("socket");
+		exit(1);
+	}
+
+	if (bcm53xx_probe("eth1")) {
+		if (bcm53xx_probe("eth0")) {
+			perror("bcm53xx_probe");
+			exit(1);
+		}
+	}
+
+	robo5350 = robo_vlan5350(&robo);
+	
+	for (i = 1; i < argc;) {
+		if (strcasecmp(argv[i], "port") == 0 && (i + 1) < argc)
+		{
+			int index = atoi(argv[++i]);
+			/* read port specs */
+			while (++i < argc) {
+				if (strcasecmp(argv[i], "state") == 0 && ++i < argc) {
+					for (j = 0; j < 4 && strcasecmp(argv[i], rxtx[j]); j++);
+					if (j < 4) {
+						/* change state */
+						robo_write16(&robo,ROBO_CTRL_PAGE, port[index],
+							(robo_read16(&robo, ROBO_CTRL_PAGE, port[index]) & ~(3 << 0)) | (j << 0));
+					} else {
+						fprintf(stderr, "Invalid state '%s'.\n", argv[i]);
+						exit(1);
+					}
+				} else
+				if (strcasecmp(argv[i], "stp") == 0 && ++i < argc) {
+					for (j = 0; j < 8 && strcasecmp(argv[i], stp[j]); j++);
+					if (j < 8) {
+						/* change stp */
+						robo_write16(&robo,ROBO_CTRL_PAGE, port[index],
+							(robo_read16(&robo, ROBO_CTRL_PAGE, port[index]) & ~(7 << 5)) | (j << 5));
+					} else {
+						fprintf(stderr, "Invalid stp '%s'.\n", argv[i]);
+						exit(1);
+					}
+				} else
+				if (strcasecmp(argv[i], "media") == 0 && ++i < argc) {
+					for (j = 0; j < 5 && strcasecmp(argv[i], media[j].name); j++);
+					if (j < 5) {
+                                    		mdio_write(&robo, port[index], MII_BMCR, media[j].bmcr);
+					} else {
+						fprintf(stderr, "Invalid media '%s'.\n", argv[i]);
+						exit(1);
+					}
+				} else
+				if (strcasecmp(argv[i], "mdi-x") == 0 && ++i < argc) {
+					for (j = 0; j < 3 && strcasecmp(argv[i], mdix[j].name); j++);
+					if (j < 3) {
+                                    		mdio_write(&robo, port[index], 0x1c, mdix[j].value |
+						    (mdio_read(&robo, port[index], 0x1c) & ~0x1800));
+					} else {
+						fprintf(stderr, "Invalid mdi-x '%s'.\n", argv[i]);
+						exit(1);
+					}
+				} else
+				if (strcasecmp(argv[i], "tag") == 0 && ++i < argc) {
+					j = atoi(argv[i]);
+					/* change vlan tag */
+					robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (index << 1), j);
+				} else break;
+			}
+		} else
+		if (strcasecmp(argv[i], "vlan") == 0 && (i + 1) < argc)
+		{
+			int index = atoi(argv[++i]);
+			while (++i < argc) {
+				if (strcasecmp(argv[i], "ports") == 0 && ++i < argc) {
+					char *ports = argv[i];
+					int untag = 0;
+					int member = 0;
+					
+					while (*ports >= '0' && *ports <= '9') {
+						j = *ports++ - '0';
+						member |= 1 << j;
+						
+						/* untag if needed, CPU port requires special handling */
+						if (*ports == 'u' || (j != 5 && (*ports == ' ' || *ports == 0))) 
+						{
+							untag |= 1 << j;
+							if (*ports) ports++;
+							/* change default vlan tag */
+							robo_write16(&robo, ROBO_VLAN_PAGE, 
+								ROBO_VLAN_PORT0_DEF_TAG + (j << 1), index);
+						} else 
+						if (*ports == '*' || *ports == 't' || *ports == ' ') ports++;
+						else break;
+						
+						while (*ports == ' ') ports++;
+					}
+					
+					if (*ports) {
+						fprintf(stderr, "Invalid ports '%s'.\n", argv[i]);
+						exit(1);
+					} else {
+						/* write config now */
+						val16 = (index) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */;
+						if (robo5350) {
+							robo_write32(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5350,
+								(1 << 20) /* valid */ | (untag << 6) | member);
+							robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
+						} else {
+							robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_WRITE,
+								(1 << 14)  /* valid */ | (untag << 7) | member);
+							robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
+						}
+					}
+				} else break;
+			}
+		} else
+		if (strcasecmp(argv[i], "switch") == 0 && (i + 1) < argc)
+		{
+			/* enable/disable switching */
+			robo_write16(&robo, ROBO_CTRL_PAGE, ROBO_SWITCH_MODE,
+				(robo_read16(&robo, ROBO_CTRL_PAGE, ROBO_SWITCH_MODE) & ~2) |
+				(*argv[++i] == 'e' ? 2 : 0));
+			i++;
+		} else
+		if (strcasecmp(argv[i], "vlans") == 0 && (i + 1) < argc)
+		{
+			while (++i < argc) {
+				if (strcasecmp(argv[i], "reset") == 0) {
+					/* reset vlan validity bit */
+					for (j = 0; j <= (robo5350 ? VLAN_ID_MAX5350 : VLAN_ID_MAX); j++) 
+					{
+						/* write config now */
+						val16 = (j) /* vlan */ | (1 << 12) /* write */ | (1 << 13) /* enable */;
+						if (robo5350) {
+							robo_write32(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_WRITE_5350, 0);
+							robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
+						} else {
+							robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_WRITE, 0);
+							robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
+						}
+					}
+				} else 
+				if (strcasecmp(argv[i], "enable") == 0 || strcasecmp(argv[i], "disable") == 0) 
+				{
+					int disable = (*argv[i] == 'd') || (*argv[i] == 'D');
+					/* enable/disable vlans */
+					robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_CTRL0, disable ? 0 :
+						(1 << 7) /* 802.1Q VLAN */ | (3 << 5) /* mac check and hash */);
+
+					robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_CTRL1, disable ? 0 :
+						(1 << 1) | (1 << 2) | (1 << 3) /* RSV multicast */);
+
+					robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_CTRL4, disable ? 0 :
+						(1 << 6) /* drop invalid VID frames */);
+
+					robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_CTRL5, disable ? 0 :
+						(1 << 3) /* drop miss V table frames */);
+
+				} else break;
+			}
+		} else
+		if (strcasecmp(argv[i], "show") == 0)
+		{
+			break;
+		} else {
+			fprintf(stderr, "Invalid option %s\n", argv[i]);
+			usage();
+			exit(1);
+		}
+	}
+
+	if (i == argc) {
+		if (argc == 1) usage();
+		return 0;
+	}
+	
+	/* show config */
+		
+	printf("Switch: %sabled\n", robo_read16(&robo, ROBO_CTRL_PAGE, ROBO_SWITCH_MODE) & 2 ? "en" : "dis");
+
+	for (i = 0; i < 6; i++) {
+		printf(robo_read16(&robo, ROBO_STAT_PAGE, ROBO_LINK_STAT_SUMMARY) & (1 << port[i]) ?
+			"Port %d(%c): %s%s " : "Port %d(%c):  DOWN ", i, ports[i],
+			robo_read16(&robo, ROBO_STAT_PAGE, ROBO_SPEED_STAT_SUMMARY) & (1 << port[i]) ? "100" : " 10",
+			robo_read16(&robo, ROBO_STAT_PAGE, ROBO_DUPLEX_STAT_SUMMARY) & (1 << port[i]) ? "FD" : "HD");
+		
+		val16 = robo_read16(&robo, ROBO_CTRL_PAGE, port[i]);
+		
+		printf("%s stp: %s vlan: %d ", rxtx[val16 & 3], stp[(val16 >> 5) & 7],
+			robo_read16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_PORT0_DEF_TAG + (i << 1)));
+			
+		robo_read(&robo, ROBO_STAT_PAGE, ROBO_LSA_PORT0 + port[i] * 6, mac, 3);
+		
+		printf("mac: %02x:%02x:%02x:%02x:%02x:%02x\n",
+			mac[2] >> 8, mac[2] & 255, mac[1] >> 8, mac[1] & 255, mac[0] >> 8, mac[0] & 255);
+	}
+	
+	val16 = robo_read16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_CTRL0);
+	
+	printf("VLANs: %s %sabled%s%s\n", 
+		robo5350 ? "BCM5325/535x" : "BCM536x",
+		(val16 & (1 << 7)) ? "en" : "dis", 
+		(val16 & (1 << 6)) ? " mac_check" : "", 
+		(val16 & (1 << 5)) ? " mac_hash" : "");
+	
+	/* scan VLANs */
+	for (i = 0; i <= (robo5350 ? VLAN_ID_MAX5350 : VLAN_ID_MAX); i++) {
+		/* issue read */
+		val16 = (i) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */;
+		
+		if (robo5350) {
+			u32 val32;
+			robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
+			/* actual read */
+			val32 = robo_read32(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_READ);
+			if ((val32 & (1 << 20)) /* valid */) {
+				printf("vlan%d:", i);
+				for (j = 0; j < 6; j++) {
+					if (val32 & (1 << j)) {
+						printf(" %d%s", j, (val32 & (1 << (j + 6))) ? 
+							(j == 5 ? "u" : "") : "t");
+					}
+				}
+				printf("\n");
+			}
+		} else {
+			robo_write16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
+			/* actual read */
+			val16 = robo_read16(&robo, ROBO_VLAN_PAGE, ROBO_VLAN_READ);
+			if ((val16 & (1 << 14)) /* valid */) {
+				printf("vlan%d:", i);
+				for (j = 0; j < 6; j++) {
+					if (val16 & (1 << j)) {
+						printf(" %d%s", j, (val16 & (1 << (j + 7))) ? 
+							(j == 5 ? "u" : "") : "t");
+					}
+				}
+				printf("\n");
+			}
+		}
+	}
+	
+	return (0);
+}
diff --git a/trunk/package/utils/spidev_test/Makefile b/trunk/package/utils/spidev_test/Makefile
new file mode 100644
index 00000000..807039a1
--- /dev/null
+++ b/trunk/package/utils/spidev_test/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=spidev-test
+PKG_RELEASE:=$(LINUX_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/spidev-test
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+kmod-spi-dev
+  TITLE:=SPI testing utility
+  VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
+  URL:=http://www.kernel.org
+  MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+endef
+
+define Package/spidev-test/description
+  SPI testing utility.
+endef
+
+define Build/Prepare
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/spidev_test \
+		$(LINUX_DIR)/Documentation/spi/spidev_test.c
+endef
+
+define Package/spidev-test/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/spidev_test $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,spidev-test))
diff --git a/trunk/package/utils/ubi-utils/Makefile b/trunk/package/utils/ubi-utils/Makefile
new file mode 100644
index 00000000..80085c4f
--- /dev/null
+++ b/trunk/package/utils/ubi-utils/Makefile
@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2009-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ubi-utils
+PKG_REV:=7d2839b8dede3ae368780364b4a07473d2303219
+PKG_VERSION:=1.5.1
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+
+PKG_INSTALL:=1
+
+PKG_BUILD_DEPENDS:=util-linux liblzo zlib
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_BUILD_DIR:=$(BUILD_DIR)/ubi-utils/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ubi-utils
+  TITLE:=Utilities for ubi info/debug
+  SECTION:=utils
+  CATEGORY:=Utilities
+  URL:=http://www.linux-mtd.infradead.org/
+  DEPENDS:=@NAND_SUPPORT
+endef
+
+define Package/ubi-utils/description
+  Utilities for manipulating memory technology devices.
+endef
+
+MAKE_FLAGS += \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	BUILDDIR="$(PKG_BUILD_DIR)" \
+	LDLIBS+="$(LIBGCC_S)" \
+	WITHOUT_XATTR=1 \
+	WITHOUT_LZO=1
+
+define Package/ubi-utils/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/{ubiattach,ubicrc32,ubiblock,ubidetach,ubiformat,ubimkvol} $(1)/usr/sbin/
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/{ubinfo,ubinize,ubirename,ubirmvol,ubirsvol,ubiupdatevol} $(1)/usr/sbin/
+endef
+
+
+$(eval $(call BuildPackage,ubi-utils))
diff --git a/trunk/package/utils/ubi-utils/patches/010-fix-rpmatch.patch b/trunk/package/utils/ubi-utils/patches/010-fix-rpmatch.patch
new file mode 100644
index 00000000..4a04676b
--- /dev/null
+++ b/trunk/package/utils/ubi-utils/patches/010-fix-rpmatch.patch
@@ -0,0 +1,19 @@
+--- a/include/common.h
++++ b/include/common.h
+@@ -122,10 +122,12 @@
+ 		}
+ 
+ 		if (strcmp("\n", line) != 0) {
+-			switch (rpmatch(line)) {
+-			case 0: ret = false; break;
+-			case 1: ret = true; break;
+-			case -1:
++			switch (line[0]) {
++			case 'N':
++			case 'n': ret = false; break;
++			case 'Y':
++			case 'y': ret = true; break;
++			default:
+ 				puts("unknown response; please try again");
+ 				continue;
+ 			}
diff --git a/trunk/package/utils/ubi-utils/patches/100-fix_includes.patch b/trunk/package/utils/ubi-utils/patches/100-fix_includes.patch
new file mode 100644
index 00000000..44421d02
--- /dev/null
+++ b/trunk/package/utils/ubi-utils/patches/100-fix_includes.patch
@@ -0,0 +1,30 @@
+--- a/lib/libfec.c
++++ b/lib/libfec.c
+@@ -45,6 +45,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ /*
+  * stuff used for testing purposes only
+--- a/serve_image.c
++++ b/serve_image.c
+@@ -3,7 +3,6 @@
+ 
+ #include <time.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <netdb.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--- a/recv_image.c
++++ b/recv_image.c
+@@ -4,7 +4,6 @@
+ #define _BSD_SOURCE	/* struct ip_mreq */
+ 
+ #include <errno.h>
+-#include <error.h>
+ #include <stdio.h>
+ #include <netdb.h>
+ #include <stdlib.h>
diff --git a/trunk/package/utils/ubi-utils/patches/130-lzma_jffs2.patch b/trunk/package/utils/ubi-utils/patches/130-lzma_jffs2.patch
new file mode 100644
index 00000000..c788f25d
--- /dev/null
+++ b/trunk/package/utils/ubi-utils/patches/130-lzma_jffs2.patch
@@ -0,0 +1,5029 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ 
+ VERSION = 1.5.1
+ 
+-CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS)
++CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) -I./include/linux/lzma
+ 
+ ifeq ($(WITHOUT_XATTR), 1)
+   CPPFLAGS += -DWITHOUT_XATTR
+@@ -84,7 +84,7 @@
+ #
+ # Utils in top level
+ #
+-obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o compr_lzo.o compr.o rbtree.o
++obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o $(if $(WITHOUT_LZO),,compr_lzo.o) compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o compr.o rbtree.o
+ LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
+ LDLIBS_mkfs.jffs2  = -lz $(LZOLDLIBS)
+ 
+--- a/compr.c
++++ b/compr.c
+@@ -520,6 +520,9 @@ int jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++	jffs2_lzma_init();
++#endif
+ 	return 0;
+ }
+ 
+@@ -534,5 +537,8 @@ int jffs2_compressors_exit(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++	jffs2_lzma_exit();
++#endif
+ 	return 0;
+ }
+--- a/compr.h
++++ b/compr.h
+@@ -18,13 +18,14 @@
+ 
+ #define CONFIG_JFFS2_ZLIB
+ #define CONFIG_JFFS2_RTIME
+-#define CONFIG_JFFS2_LZO
++#define CONFIG_JFFS2_LZMA
+ 
+ #define JFFS2_RUBINMIPS_PRIORITY 10
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_COMPR_MODE_NONE       0
+ #define JFFS2_COMPR_MODE_PRIORITY   1
+@@ -115,5 +116,10 @@ void jffs2_rtime_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
++
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen, void *model)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen, void *model)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++	int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++	props.dictSize = LZMA_BEST_DICT(0x2000);
++	props.level = LZMA_BEST_LEVEL;
++	props.lc = LZMA_BEST_LC;
++	props.lp = LZMA_BEST_LP;
++	props.pb = LZMA_BEST_PB;
++	props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++	if (ret < 0)
++	return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++	return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/include/linux/jffs2.h
++++ b/include/linux/jffs2.h
+@@ -47,6 +47,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,61 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++	if (size == 0)
++		return NULL;
++
++	return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++	if (address != NULL)
++		LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,116 @@
++/* LzFind.h  -- Match finder for LZ algorithms
++2008-04-04
++Copyright (c) 1999-2008 Igor Pavlov
++You can use any of the following license options:
++  1) GNU Lesser General Public License (GNU LGPL)
++  2) Common Public License (CPL)
++  3) Common Development and Distribution License (CDDL) Version 1.0 
++  4) Igor Pavlov, as the author of this code, expressly permits you to 
++     statically or dynamically link your code (or bind by name) to this file, 
++     while you keep this file unmodified.
++*/
++
++#ifndef __LZFIND_H
++#define __LZFIND_H
++
++#include "Types.h"
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  int btMode;
++  /* int skipModeBits; */
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, 
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue, 
++    UInt32 *distances, UInt32 maxLen);
++
++/* 
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,56 @@
++/* LzHash.h  -- HASH functions for LZ algorithms
++2008-03-26
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzFind.h for license options */
++
++#ifndef __LZHASH_H
++#define __LZHASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,232 @@
++/* LzmaDec.h -- LZMA Decoder
++2008-04-29
++Copyright (c) 1999-2008 Igor Pavlov
++You can use any of the following license options:
++  1) GNU Lesser General Public License (GNU LGPL)
++  2) Common Public License (CPL)
++  3) Common Development and Distribution License (CDDL) Version 1.0 
++  4) Igor Pavlov, as the author of this code, expressly permits you to 
++     statically or dynamically link your code (or bind by name) to this file, 
++     while you keep this file unmodified.
++*/
++
++#ifndef __LZMADEC_H
++#define __LZMADEC_H
++
++#include "Types.h"
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs, 
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */  
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */  
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum 
++{
++  LZMA_FINISH_ANY,   /* finish at any point */      
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer 
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize. 
++        You must use correct finish mode in that case. */ 
++
++typedef enum 
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */   
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */  
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different 
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually. 
++   For Buffer Interface you must always use variant 1. 
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */  
++
++/* You can use it, if you want to eliminate the overhead for data copying from 
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!! 
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED 
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, 
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */  
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode: 
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, 
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */  
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED 
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, 
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,74 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2008-04-27
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzFind.h for license options */
++
++#ifndef __LZMAENC_H
++#define __LZMAENC_H
++
++#include "Types.h"
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */ 
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version 
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */ 
++  int lp;          /* 0 <= lp <= 4, default = 0 */ 
++  int pb;          /* 0 <= pb <= 4, default = 2 */ 
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error 
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream, 
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error 
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, 
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,130 @@
++/* Types.h -- Basic types
++2008-04-11
++Igor Pavlov
++Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++/* #define _SZ_NO_INT_64 */
++/* define it if your compiler doesn't support 64-bit integers */
++
++#ifdef _SZ_NO_INT_64
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++#include <stddef.h>
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_STD_CALL __stdcall 
++#define MY_FAST_CALL MY_NO_INLINE __fastcall 
++
++#else
++
++#define MY_CDECL
++#define MY_STD_CALL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++      (result < size) means error */
++} ISeqOutStream;
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++#endif
+--- /dev/null
++++ b/lzma/LzFind.c
+@@ -0,0 +1,753 @@
++/* LzFind.c  -- Match finder for LZ algorithms
++2008-04-04
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzFind.h for license options */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase, 
++    p->buffer - p->keepSizeBefore, 
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached) 
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  /* p->skipModeBits = 0; */
++  p->directInput = 0;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, 
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1; 
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = (historySize /* >> p->skipModeBits */) + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        /* hs >>= p->skipModeBits; */
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit) 
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit) 
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for(i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p) 
++{ 
++  return (p->pos - p->historySize - 1) & kNormalizeMask; 
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, 
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while(++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, 
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while(++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while(++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] = 
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET; 
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET; 
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET; 
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2) 
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4) 
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lzma/LzmaDec.c
+@@ -0,0 +1,1014 @@
++/* LzmaDec.c -- LZMA Decoder
++2008-04-29
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzmaDec.h for license options */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; } 
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)               
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; } 
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)               
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while(i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols) 
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++/*
++#define LZMA_STREAM_WAS_FINISHED_ID (-1)
++#define LZMA_SPEC_LEN_OFFSET (-3)
++*/
++
++Byte kLiteralNextStates[kNumStates * 2] = 
++{
++  0, 0, 0, 0, 1, 2, 3,  4,  5,  6,  4,  5, 
++  7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10
++};
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded. 
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization 
++Out:
++  Result:
++    0 - OK
++    1 - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) + 
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++
++      state = kLiteralNextStates[state];
++      /* if (state < 4) state = 0; else if (state < 10) state -= 3; else state -= 6; */
++      continue;
++    }
++    else             
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else 
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance; 
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while(--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1; 
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++        /* state = kLiteralNextStates[state]; */
++      }
++
++      len += kMatchMinLen;
++
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do 
++            *(dest) = (Byte)*(dest + src); 
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++/* LzmaDec_DecodeReal2 decodes LZMA-symbols and sets p->needFlush and p->needInit, if required. */
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum 
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE * 
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) + 
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] + 
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else             
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else 
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << 
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while(--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) 
++{ 
++  p->needFlush = 1; 
++  p->remainLen = 0; 
++  p->tempBufSize = 0; 
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p) 
++{ 
++  p->dicPos = 0; 
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1; 
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen, 
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = p->buf - src;
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0) 
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc) 
++{ 
++  alloc->Free(alloc, p->probs);  
++  p->probs = 0; 
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc) 
++{ 
++  alloc->Free(alloc, p->dic); 
++  p->dic = 0; 
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize; 
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, 
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lzma/LzmaEnc.c
+@@ -0,0 +1,2335 @@
++/* LzmaEnc.c -- LZMA Encoder
++2008-04-28
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzmaEnc.h for license options */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include <string.h>
++
++#include "LzmaEnc.h"
++
++#include "LzFind.h"
++#ifdef COMPRESS_MF_MT
++#include "LzFindMt.h"
++#endif
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3; 
++  if (p->lp < 0) p->lp = 0; 
++  if (p->pb < 0) p->pb = 2; 
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1); 
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64); 
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1); 
++  if (p->numHashBytes < 0) p->numHashBytes = 4; 
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0) p->numThreads = ((p->btMode && p->algo) ? 2 : 1);
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos) 
++{ 
++  UInt32 res; 
++  BSR2_RET(pos, res); 
++  return res; 
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct _COptimal
++{
++  UInt32 price;    
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;     
++
++  UInt32 posPrev;
++  UInt32 backPrev;     
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6 
++#define kDicLogSizeMin 0 
++#define kDicLogSizeMax 32 
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex / 2))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct _CRangeEnc
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct _CSeqInStreamBuf
++{
++  ISeqInStream funcTable;
++  const Byte *data;
++  SizeT rem;
++} CSeqInStreamBuf;
++
++static SRes MyRead(void *pp, void *data, size_t *size)
++{
++  size_t curSize = *size;
++  CSeqInStreamBuf *p = (CSeqInStreamBuf *)pp;
++  if (p->rem < curSize)
++    curSize = p->rem;
++  memcpy(data, p->data, curSize);
++  p->rem -= curSize;
++  p->data += curSize;
++  *size = curSize;
++  return SZ_OK;
++}
++
++typedef struct 
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct _CLzmaEnc
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifdef COMPRESS_MF_MT
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifdef COMPRESS_MF_MT
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  Bool longestMatchWasFound;
++  UInt32 longestMatchLength;    
++  UInt32 numDistancePairs;
++
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matchDistances[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  ISeqInStream *inStream;
++  CSeqInStreamBuf seqBufInStream;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifdef COMPRESS_MF_MT
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++/*
++  void UpdateChar() { Index = kLiteralNextStates[Index]; }
++  void UpdateMatch() { Index = kMatchNextStates[Index]; }
++  void UpdateRep() { Index = kRepNextStates[Index]; }
++  void UpdateShortRep() { Index = kShortRepNextStates[Index]; }
++*/
++
++#define IsCharState(s) ((s) < 7)
++
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0) 
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);                      
++  } 
++  p->cacheSize++;                               
++  p->low = (UInt32)p->low << 8;                           
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do 
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do 
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++};
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do 
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++};
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0 ;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++};
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numDistancePairs;
++  numDistancePairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matchDistances);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numDistancePairs / 2);
++  if (ttt >= 61994)
++    ttt = ttt;
++
++  ttt++;
++  {
++    UInt32 i;
++  for (i = 0; i < numDistancePairs; i += 2)
++    printf("%2d %6d   | ", p->matchDistances[i], p->matchDistances[i + 1]);
++  }
++  #endif
++  if (numDistancePairs > 0)
++  {
++    lenRes = p->matchDistances[numDistancePairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      UInt32 numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) + 1;
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matchDistances[numDistancePairs - 1] + 1;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numDistancePairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return 
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex; 
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvailableBytes, lenMain, numDistancePairs;
++  const Byte *data;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 repLens[LZMA_NUM_REPS];
++  UInt32 repMaxIndex, i;
++  UInt32 *matchDistances;
++  Byte currentByte, matchByte; 
++  UInt32 posState;
++  UInt32 matchPrice, repMatchPrice;
++  UInt32 lenEnd;
++  UInt32 len;
++  UInt32 normalMatchPrice;
++  UInt32 cur;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++
++  if (!p->longestMatchWasFound)
++  {
++    lenMain = ReadMatchDistances(p, &numDistancePairs);
++  }
++  else
++  {
++    lenMain = p->longestMatchLength;
++    numDistancePairs = p->numDistancePairs;
++    p->longestMatchWasFound = False;
++  }
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  if (numAvailableBytes < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvailableBytes > LZMA_MATCH_LEN_MAX)
++    numAvailableBytes = LZMA_MATCH_LEN_MAX;
++
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matchDistances = p->matchDistances;
++  if (lenMain >= p->numFastBytes)
++  {
++    *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; 
++    MovePos(p, lenMain - 1);
++    return lenMain;
++  }
++  currentByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) + 
++        (!IsCharState(p->state) ? 
++          LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, currentByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == currentByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price) 
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= lenMain)
++  {
++    UInt32 offs = 0;
++    while (len > matchDistances[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matchDistances[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price) 
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matchDistances[offs])
++      {
++        offs += 2;
++        if (offs == numDistancePairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailableBytesFull, newLen, numDistancePairs;
++    COptimal *curOpt;
++    UInt32 posPrev;
++    UInt32 state;
++    UInt32 curPrice;
++    Bool nextIsChar;
++    const Byte *data;
++    Byte currentByte, matchByte;
++    UInt32 posState;
++    UInt32 curAnd1Price;
++    COptimal *nextOpt;
++    UInt32 matchPrice, repMatchPrice;  
++    UInt32 numAvailableBytes;
++    UInt32 startLen;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    numAvailableBytesFull = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++    newLen = ReadMatchDistances(p, &numDistancePairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numDistancePairs = numDistancePairs;
++      p->longestMatchLength = newLen;
++      p->longestMatchWasFound = True;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price; 
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    currentByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price += 
++        (!IsCharState(state) ? 
++          LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, currentByte, p->ProbPrices));
++    }   
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price) 
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == currentByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp <  numAvailableBytesFull)
++        numAvailableBytesFull = temp;
++    }
++    numAvailableBytes = numAvailableBytesFull;
++
++    if (numAvailableBytes < 2)
++      continue;
++    if (numAvailableBytes > p->numFastBytes)
++      numAvailableBytes = p->numFastBytes;
++    if (!nextIsChar && matchByte != currentByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailableBytesFull)
++        limit = numAvailableBytesFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price + 
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price) 
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price) 
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailableBytesFull)
++            limit = numAvailableBytesFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = 
++                price + p->repLenEnc.prices[posState][lenTest - 2] + 
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice + 
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price) 
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvailableBytes)
++    {
++      newLen = numAvailableBytes;
++      for (numDistancePairs = 0; newLen > matchDistances[numDistancePairs]; numDistancePairs += 2);
++      matchDistances[numDistancePairs] = newLen;
++      numDistancePairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matchDistances[offs])
++        offs += 2;
++      curBack = matchDistances[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price) 
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matchDistances[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailableBytesFull)
++            limit = numAvailableBytesFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice + 
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice + 
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price) 
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numDistancePairs)
++            break;
++          curBack = matchDistances[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  UInt32 lenMain, numDistancePairs;
++  const Byte *data;
++  UInt32 repLens[LZMA_NUM_REPS];
++  UInt32 repMaxIndex, i;
++  UInt32 *matchDistances;
++  UInt32 backMain;
++
++  if (!p->longestMatchWasFound)
++  {
++    lenMain = ReadMatchDistances(p, &numDistancePairs);
++  }
++  else
++  {
++    lenMain = p->longestMatchLength;
++    numDistancePairs = p->numDistancePairs;
++    p->longestMatchWasFound = False;
++  }
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  if (numAvailableBytes > LZMA_MATCH_LEN_MAX)
++    numAvailableBytes = LZMA_MATCH_LEN_MAX;
++  if (numAvailableBytes < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++
++  repMaxIndex = 0;
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    const Byte *data2 = data - (p->reps[i] + 1);
++    UInt32 len;
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    repLens[i] = len;
++    if (len > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  matchDistances = p->matchDistances;
++  if (lenMain >= p->numFastBytes)
++  {
++    *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; 
++    MovePos(p, lenMain - 1);
++    return lenMain;
++  }
++
++  backMain = 0; /* for GCC */
++  if (lenMain >= 2)
++  {
++    backMain = matchDistances[numDistancePairs - 1];
++    while (numDistancePairs > 2 && lenMain == matchDistances[numDistancePairs - 4] + 1)
++    {
++      if (!ChangePair(matchDistances[numDistancePairs - 3], backMain))
++        break;
++      numDistancePairs -= 2;
++      lenMain = matchDistances[numDistancePairs - 2];
++      backMain = matchDistances[numDistancePairs - 1];
++    }
++    if (lenMain == 2 && backMain >= 0x80)
++      lenMain = 1;
++  }
++
++  if (repLens[repMaxIndex] >= 2)
++  {
++    if (repLens[repMaxIndex] + 1 >= lenMain || 
++        (repLens[repMaxIndex] + 2 >= lenMain && (backMain > (1 << 9))) ||
++        (repLens[repMaxIndex] + 3 >= lenMain && (backMain > (1 << 15))))
++    {
++      UInt32 lenRes;
++      *backRes = repMaxIndex;
++      lenRes = repLens[repMaxIndex];
++      MovePos(p, lenRes - 1);
++      return lenRes;
++    }
++  }
++  
++  if (lenMain >= 2 && numAvailableBytes > 2)
++  {
++    UInt32 i;
++    numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++    p->longestMatchLength = ReadMatchDistances(p, &p->numDistancePairs);
++    if (p->longestMatchLength >= 2)
++    {
++      UInt32 newDistance = matchDistances[p->numDistancePairs - 1];
++      if ((p->longestMatchLength >= lenMain && newDistance < backMain) || 
++          (p->longestMatchLength == lenMain + 1 && !ChangePair(backMain, newDistance)) ||
++          (p->longestMatchLength > lenMain + 1) ||
++          (p->longestMatchLength + 1 >= lenMain && lenMain >= 3 && ChangePair(newDistance, backMain)))
++      {
++        p->longestMatchWasFound = True;
++        *backRes = (UInt32)(-1);
++        return 1;
++      }
++    }
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    for (i = 0; i < LZMA_NUM_REPS; i++)
++    {
++      UInt32 len;
++      const Byte *data2 = data - (p->reps[i] + 1);
++      if (data[1] != data2[1] || data[2] != data2[2])
++      {
++        repLens[i] = 0;
++        continue;
++      }
++      for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++);
++      if (len + 1 >= lenMain)
++      {
++        p->longestMatchWasFound = True;
++        *backRes = (UInt32)(-1);
++        return 1;
++      }
++    }
++    *backRes = backMain + LZMA_NUM_REPS; 
++    MovePos(p, lenMain - 2);
++    return lenMain;
++  }
++  *backRes = (UInt32)(-1);
++  return 1;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  { 
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifdef COMPRESS_MF_MT
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifdef COMPRESS_MF_MT
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->inStream != 0)
++  {
++    p->matchFinderBase.stream = p->inStream;
++    p->matchFinder.Init(p->matchFinderObj);
++    p->inStream = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numDistancePairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numDistancePairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == 0xFFFFFFFF)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifdef COMPRESS_MF_MT
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifdef COMPRESS_MF_MT
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for(i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for(i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->longestMatchWasFound = False;
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize = 
++  p->repLenEnc.tableSize = 
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqInStream *inStream, ISeqOutStream *outStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->inStream = inStream;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, 
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->inStream = inStream;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->seqBufInStream.funcTable.Read = MyRead;
++  p->seqBufInStream.data = src;
++  p->seqBufInStream.rem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->inStream = &p->seqBufInStream.funcTable;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifdef COMPRESS_MF_MT
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #endif
++}
++
++typedef struct _CSeqOutStreamBuf
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit, 
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(pp, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  SRes res = SZ_OK;
++
++  #ifdef COMPRESS_MF_MT
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  RINOK(LzmaEnc_Prepare(pp, inStream, outStream, alloc, allocBig));
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(pp, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(pp);
++  return res;
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++  res = LzmaEnc_Encode(pp, &outStream.funcTable, &p->seqBufInStream.funcTable, 
++      progress, alloc, allocBig);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, 
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- a/mkfs.jffs2.c
++++ b/mkfs.jffs2.c
+@@ -1659,11 +1659,11 @@ int main(int argc, char **argv)
+ 						  }
+ 						  erase_block_size *= units;
+ 
+-						  /* If it's less than 8KiB, they're not allowed */
+-						  if (erase_block_size < 0x2000) {
+-							  fprintf(stderr, "Erase size 0x%x too small. Increasing to 8KiB minimum\n",
++						  /* If it's less than 4KiB, they're not allowed */
++						  if (erase_block_size < 0x1000) {
++							  fprintf(stderr, "Erase size 0x%x too small. Increasing to 4KiB minimum\n",
+ 									  erase_block_size);
+-							  erase_block_size = 0x2000;
++							  erase_block_size = 0x1000;
+ 						  }
+ 						  break;
+ 					  }
diff --git a/trunk/package/utils/ugps/Makefile b/trunk/package/utils/ugps/Makefile
new file mode 100644
index 00000000..6f9dc352
--- /dev/null
+++ b/trunk/package/utils/ugps/Makefile
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ugps
+PKG_VERSION:=2014-08-01
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=git://git.openwrt.org/project/ugps.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=1c31c99edd9de9dcb403750b04041eccc751ac5e
+
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_LICENSE:=GPL-2.0+
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/ugps
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=libreCMC GPS Daemon
+  DEPENDS:=+libubox +libubus
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+
+define Package/ugps/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ugps $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/ugps.init $(1)/etc/init.d/ugps
+	$(INSTALL_BIN) ./files/gps.config $(1)/etc/config/gps
+endef
+
+$(eval $(call BuildPackage,ugps))
diff --git a/trunk/package/utils/ugps/files/gps.config b/trunk/package/utils/ugps/files/gps.config
new file mode 100644
index 00000000..d997a590
--- /dev/null
+++ b/trunk/package/utils/ugps/files/gps.config
@@ -0,0 +1,2 @@
+config gps
+	option	'tty'	'ttyACM0'
diff --git a/trunk/package/utils/ugps/files/ugps.init b/trunk/package/utils/ugps/files/ugps.init
new file mode 100644
index 00000000..621d0178
--- /dev/null
+++ b/trunk/package/utils/ugps/files/ugps.init
@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2014 OpenWrt.org
+
+START=80
+
+USE_PROCD=1
+PROG=/usr/sbin/ugps
+
+service_triggers() {
+	procd_add_reload_trigger gps
+}
+
+start_service() {
+	local tty="$(uci get gps.@gps[-1].tty)"
+
+	[ -d "/sys/class/tty/$tty/" ] || return
+
+	procd_open_instance
+	procd_set_param command "$PROG" "/dev/$tty"
+	procd_set_param respawn
+	procd_close_instance
+}
diff --git a/trunk/package/utils/usbmode/Makefile b/trunk/package/utils/usbmode/Makefile
new file mode 100644
index 00000000..ec595880
--- /dev/null
+++ b/trunk/package/utils/usbmode/Makefile
@@ -0,0 +1,59 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=usbmode
+PKG_VERSION:=2014-08-26
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://git.openwrt.org/project/usbmode.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=993a9a542791953c4804f7ddbb3a07756738e37a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+PKG_DATA_VERSION:=20140529
+PKG_DATA_URL:=http://www.draisberghof.de/usb_modeswitch
+PKG_DATA_PATH:=usb-modeswitch-data-$(PKG_DATA_VERSION)
+PKG_DATA_FILENAME:=$(PKG_DATA_PATH).tar.bz2
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Download/data
+  FILE:=$(PKG_DATA_FILENAME)
+  URL:=$(PKG_DATA_URL)
+  MD5SUM:=dff94177781298aaf0b3c2a3c3dea6b2
+endef
+$(eval $(call Download,data))
+
+define Package/usb-modeswitch
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libubox +libblobmsg-json +libusb-1.0
+  TITLE:=USB mode switching utility
+endef
+
+define Build/Prepare
+	$(Build/Prepare/Default)
+	tar xvfj $(DL_DIR)/$(PKG_DATA_FILENAME) -C $(PKG_BUILD_DIR)
+	rm -f \
+		$(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/05c6:1000:sVe=GT
+	cp ./data/* $(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/
+endef
+
+define Package/usb-modeswitch/install
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(1)/etc/init.d $(1)/sbin
+	perl $(PKG_BUILD_DIR)/convert-modeswitch.pl \
+		$(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/* \
+		> $(1)/etc/usb-mode.json
+	$(INSTALL_DATA) ./files/usbmode.hotplug $(1)/etc/hotplug.d/usb/20-usb_mode
+	$(INSTALL_BIN) ./files/usbmode.init $(1)/etc/init.d/usbmode
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbmode $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,usb-modeswitch))
diff --git a/trunk/package/utils/usbmode/data/12d1:1f16 b/trunk/package/utils/usbmode/data/12d1:1f16
new file mode 100644
index 00000000..beda01fb
--- /dev/null
+++ b/trunk/package/utils/usbmode/data/12d1:1f16
@@ -0,0 +1,2 @@
+# Vodafone K5150
+MBIM=1
diff --git a/trunk/package/utils/usbmode/files/usbmode.hotplug b/trunk/package/utils/usbmode/files/usbmode.hotplug
new file mode 100644
index 00000000..b238894b
--- /dev/null
+++ b/trunk/package/utils/usbmode/files/usbmode.hotplug
@@ -0,0 +1 @@
+/etc/init.d/usbmode start
diff --git a/trunk/package/utils/usbmode/files/usbmode.init b/trunk/package/utils/usbmode/files/usbmode.init
new file mode 100755
index 00000000..43e8ec56
--- /dev/null
+++ b/trunk/package/utils/usbmode/files/usbmode.init
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2013 OpenWrt.org
+
+START=20
+USE_PROCD=1
+
+start_service()
+{
+	procd_open_instance
+	procd_set_param command "/sbin/usbmode" -s
+	procd_close_instance
+}
diff --git a/trunk/package/utils/usbreset/Makefile b/trunk/package/utils/usbreset/Makefile
new file mode 100644
index 00000000..d8efa54c
--- /dev/null
+++ b/trunk/package/utils/usbreset/Makefile
@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2011-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=usbreset
+PKG_RELEASE:=4
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/usbreset
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Utility to send a USB port reset to a USB device
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+endef
+
+define Package/usbreset/description
+ This package contains the small usbreset utility which
+ can be used to send a USB port reset to a USB device -
+ useful for debugging or to force re-detection of particular
+ devices.
+endef
+
+define Build/Prepare
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)
+	$(INSTALL_DATA) ./src/usbreset.c $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -Wall \
+		-o $(PKG_BUILD_DIR)/usbreset $(PKG_BUILD_DIR)/usbreset.c
+endef
+
+define Package/usbreset/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/usbreset $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,usbreset))
diff --git a/trunk/package/utils/usbreset/src/usbreset.c b/trunk/package/utils/usbreset/src/usbreset.c
new file mode 100644
index 00000000..ead30b1d
--- /dev/null
+++ b/trunk/package/utils/usbreset/src/usbreset.c
@@ -0,0 +1,235 @@
+/* usbreset -- send a USB port reset to a USB device */
+
+/*
+
+http://marc.info/?l=linux-usb-users&m=116827193506484&w=2
+
+and needs mounted usbfs filesystem
+
+	sudo mount -t usbfs none /proc/bus/usb
+
+There is a way to suspend a USB device.  In order to use it,
+you must have a kernel with CONFIG_PM_SYSFS_DEPRECATED turned on.  To
+suspend a device, do (as root):
+
+	echo -n 2 >/sys/bus/usb/devices/.../power/state
+
+where the "..." is the ID for your device.  To unsuspend, do the same
+thing but with a "0" instead of the "2" above.
+
+Note that this mechanism is slated to be removed from the kernel within
+the next year.  Hopefully some other mechanism will take its place.
+
+> To reset a
+> device?
+
+Here's a program to do it.  You invoke it as either
+
+	usbreset /proc/bus/usb/BBB/DDD
+or
+	usbreset /dev/usbB.D
+
+depending on how your system is set up, where BBB and DDD are the bus and
+device address numbers.
+
+Alan Stern
+
+*/
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <limits.h>
+#include <dirent.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+
+#include <linux/usbdevice_fs.h>
+
+
+static char *usbfs = NULL;
+
+struct usbentry {
+	int bus_num;
+	int dev_num;
+	int vendor_id;
+	int product_id;
+	char vendor_name[128];
+	char product_name[128];
+};
+
+
+static char *sysfs_attr(const char *dev, const char *attr)
+{
+	int fd, len = 0;
+	char path[PATH_MAX];
+	static char buf[129];
+
+	memset(buf, 0, sizeof(buf));
+	snprintf(path, sizeof(path) - 1, "/sys/bus/usb/devices/%s/%s", dev, attr);
+
+	if ((fd = open(path, O_RDONLY)) >= 0)
+	{
+		len = read(fd, buf, sizeof(buf) - 1);
+		close(fd);
+	}
+
+	while (--len > 0 && isspace(buf[len]))
+		buf[len] = 0;
+
+	return (len >= 0) ? buf : NULL;
+}
+
+static struct usbentry * parse_devlist(DIR *d)
+{
+	char *attr;
+	struct dirent *e;
+	static struct usbentry dev;
+
+	do {
+		e = readdir(d);
+
+		if (!e)
+			return NULL;
+	}
+	while(!isdigit(e->d_name[0]) || strchr(e->d_name, ':'));
+
+	memset(&dev, 0, sizeof(dev));
+
+	if ((attr = sysfs_attr(e->d_name, "busnum")) != NULL)
+		dev.bus_num = strtoul(attr, NULL, 10);
+
+	if ((attr = sysfs_attr(e->d_name, "devnum")) != NULL)
+		dev.dev_num = strtoul(attr, NULL, 10);
+
+	if ((attr = sysfs_attr(e->d_name, "idVendor")) != NULL)
+		dev.vendor_id = strtoul(attr, NULL, 16);
+
+	if ((attr = sysfs_attr(e->d_name, "idProduct")) != NULL)
+		dev.product_id = strtoul(attr, NULL, 16);
+
+	if ((attr = sysfs_attr(e->d_name, "manufacturer")) != NULL)
+		strcpy(dev.vendor_name, attr);
+
+	if ((attr = sysfs_attr(e->d_name, "product")) != NULL)
+		strcpy(dev.product_name, attr);
+
+	if (dev.bus_num && dev.dev_num && dev.vendor_id && dev.product_id)
+		return &dev;
+
+	return NULL;
+}
+
+static void list_devices(void)
+{
+	DIR *devs = opendir("/sys/bus/usb/devices");
+	struct usbentry *dev;
+
+	if (!devs)
+		return;
+
+	while ((dev = parse_devlist(devs)) != NULL)
+	{
+		printf("  Number %03d/%03d  ID %04x:%04x  %s\n",
+			   dev->bus_num, dev->dev_num,
+			   dev->vendor_id, dev->product_id,
+			   dev->product_name);
+	}
+
+	closedir(devs);
+}
+
+struct usbentry * find_device(int *bus, int *dev,
+                              int *vid, int *pid,
+                              const char *product)
+{
+	DIR *devs = opendir("/sys/bus/usb/devices");
+
+	struct usbentry *e, *match = NULL;
+
+	if (!devs)
+		return NULL;
+
+	while ((e = parse_devlist(devs)) != NULL)
+	{
+		if ((bus && (e->bus_num == *bus) && (e->dev_num == *dev)) ||
+			(vid && (e->vendor_id == *vid) && (e->product_id == *pid)) ||
+			(product && !strcasecmp(e->product_name, product)))
+		{
+			match = e;
+			break;
+		}
+	}
+
+	closedir(devs);
+
+	return match;
+}
+
+static void reset_device(struct usbentry *dev)
+{
+	int fd;
+	char path[PATH_MAX];
+
+	snprintf(path, sizeof(path) - 1, "/dev/bus/usb/%03d/%03d",
+	         dev->bus_num, dev->dev_num);
+
+	printf("Resetting %s ... ", dev->product_name);
+
+	if ((fd = open(path, O_WRONLY)) > -1)
+	{
+		if (ioctl(fd, USBDEVFS_RESET, 0) < 0)
+			printf("failed [%s]\n", strerror(errno));
+		else
+			printf("ok\n");
+
+		close(fd);
+	}
+	else
+	{
+		printf("can't open [%s]\n", strerror(errno));
+	}
+}
+
+
+int main(int argc, char **argv)
+{
+	int id1, id2;
+	struct usbentry *dev;
+
+	if ((argc == 2) && (sscanf(argv[1], "%3d/%3d", &id1, &id2) == 2))
+	{
+		dev = find_device(&id1, &id2, NULL, NULL, NULL);
+	}
+	else if ((argc == 2) && (sscanf(argv[1], "%4x:%4x", &id1, &id2) == 2))
+	{
+		dev = find_device(NULL, NULL, &id1, &id2, NULL);
+	}
+	else if ((argc == 2) && strlen(argv[1]) < 128)
+	{
+		dev = find_device(NULL, NULL, NULL, NULL, argv[1]);
+	}
+	else
+	{
+		printf("Usage:\n"
+		       "  usbreset PPPP:VVVV - reset by product and vendor id\n"
+		       "  usbreset BBB/DDD   - reset by bus and device number\n"
+		       "  usbreset \"Product\" - reset by product name\n\n"
+		       "Devices:\n");
+		list_devices();
+		return 1;
+	}
+
+	if (!dev)
+	{
+		fprintf(stderr, "No such device found\n");
+		return 1;
+	}
+
+	reset_device(dev);
+	return 0;
+}
diff --git a/trunk/package/utils/usbutils/Makefile b/trunk/package/utils/usbutils/Makefile
new file mode 100644
index 00000000..b1c058b0
--- /dev/null
+++ b/trunk/package/utils/usbutils/Makefile
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2007-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=usbutils
+PKG_VERSION:=007
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
+PKG_MD5SUM:=a6bd63d5c44cebb717a960eae22a3ca9
+
+USB_IDS_VERSION:=2013-01-16
+USB_IDS_MD5SUM:=2a2344907b6344f0935c86efaf9de620
+USB_IDS_FILE:=usb.ids.$(USB_IDS_VERSION).gz
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/usbutils
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libusb-1.0 +zlib +librt +libpthread
+  TITLE:=USB devices listing utilities
+  URL:=http://www.linux-usb.org/
+endef
+
+define Download/usb_ids
+  FILE:=$(USB_IDS_FILE)
+  URL:=http://mirror2.openwrt.org/sources
+  MD5SUM:=$(USB_IDS_MD5SUM)
+endef
+$(eval $(call Download,usb_ids))
+
+define Build/Prepare
+	$(Build/Prepare/Default)
+	echo '#!/bin/sh' > $(PKG_BUILD_DIR)/update-usbids.sh.in
+	echo 'cp $(DL_DIR)/$(USB_IDS_FILE) usb.ids.gz' >> $(PKG_BUILD_DIR)/update-usbids.sh.in
+endef
+
+define Package/usbutils/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsusb $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/share
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids.gz $(1)/usr/share/
+endef
+
+$(eval $(call BuildPackage,usbutils))
diff --git a/trunk/package/utils/util-linux/Makefile b/trunk/package/utils/util-linux/Makefile
new file mode 100644
index 00000000..70a865c9
--- /dev/null
+++ b/trunk/package/utils/util-linux/Makefile
@@ -0,0 +1,620 @@
+#
+# Copyright (C) 2007-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=util-linux
+PKG_VERSION:=2.25.2
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.25
+PKG_MD5SUM:=cab3d7be354000f629bc601238b629b3
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING getopt/COPYING libblkid/COPYING libmount/COPYING Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.LGPLv2.1 libuuid/COPYING Documentation/licenses/COPYING.BSD-3
+
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=libncurses
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/util-linux/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+endef
+
+CONFIGURE_ARGS += \
+	--enable-new-mount	\
+	--with-ncurses		\
+	--disable-tls		\
+	--disable-sulogin	\
+	--without-python	\
+	--without-udev
+
+TARGET_CFLAGS += $(FPIC) -std=gnu99
+
+define Build/InstallDev
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		BUILDCC="$(HOSTCC)" \
+		DESTDIR="$(1)" \
+		installdirs install-data
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/libblkid/blkid.pc $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/libmount/mount.pc $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/libsmartcols/smartcols.pc $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/libuuid/uuid.pc $(1)/usr/lib/pkgconfig
+
+	$(INSTALL_DIR) $(1)/usr/include/blkid
+	$(CP) $(PKG_BUILD_DIR)/libblkid/src/blkid.h $(1)/usr/include/blkid
+	$(INSTALL_DIR) $(1)/usr/include/libmount
+	$(CP) $(PKG_BUILD_DIR)/libmount/src/libmount.h $(1)/usr/include/libmount
+	$(INSTALL_DIR) $(1)/usr/include/uuid
+	$(CP) $(PKG_BUILD_DIR)/libuuid/src/uuid.h $(1)/usr/include/uuid
+	$(INSTALL_DIR) $(1)/usr/include/smartcols
+	$(CP) $(PKG_BUILD_DIR)/libsmartcols/src/libsmartcols.h $(1)/usr/include/smartcols
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libblkid.{a,so*} $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libmount.{a,so*} $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libuuid.{a,so*} $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.{a,so*} $(1)/usr/lib
+endef
+
+define Package/libblkid
+$(call Package/util-linux/Default)
+  DEPENDS:=+libuuid
+  TITLE:=block device id library
+  SECTION:=libs
+  CATEGORY:=Libraries
+endef
+
+define Package/libblkid/description
+ The libblkid library is used to identify block devices (disks) as to their
+ content (e.g. filesystem type, partitions) as well as extracting additional
+ information such as filesystem labels/volume names, partitions, unique
+ identifiers/serial numbers...
+endef
+
+define Package/libmount
+$(call Package/util-linux/Default)
+  DEPENDS:=+libblkid
+  TITLE:=mount library
+  SECTION:=libs
+  CATEGORY:=Libraries
+endef
+
+define Package/libmount/description
+ The libmount library is used to parse /etc/fstab, /etc/mtab and
+ /proc/self/mountinfo files, manage the mtab file, evaluate mount options...
+endef
+
+define Package/libuuid
+$(call Package/util-linux/Default)
+  TITLE:=DCE compatible Universally Unique Identifier library
+  SECTION:=libs
+  CATEGORY:=Libraries
+endef
+
+define Package/libuuid/description
+ The UUID library is used to generate unique identifiers for objects
+ that may be accessible beyond the local system. This library
+ generates UUIDs compatible with those created by the Open Software
+ Foundation (OSF) Distributed Computing Environment (DCE) utility.
+endef
+
+define Package/libsmartcols
+$(call Package/util-linux/Default)
+  TITLE:=table or tree library
+  SECTION:=libs
+  CATEGORY:=Libraries
+endef
+
+define Package/libsmartcols/description
+ The smartcols library is used to print tables and trees in a pretty way.
+endef
+
+define Package/agetty
+$(call Package/util-linux/Default)
+  TITLE:=alternative Linux getty
+  SUBMENU=Terminal
+endef
+
+define Package/agetty/description
+ agetty opens a tty port, prompts for a login name and invokes the
+ /bin/login command
+endef
+
+define Package/blkid
+$(call Package/util-linux/Default)
+  TITLE:=locate/print block device attributes
+  DEPENDS:= +libblkid +libuuid
+  SUBMENU=disc
+endef
+
+define Package/blkid/description
+ The blkid program is the command-line interface to working with the libblkid
+ library.
+endef
+
+define Package/cal
+$(call Package/util-linux/Default)
+  TITLE:=display a calendar
+  DEPENDS:= +libncurses
+endef
+
+define Package/cal/description
+ cal displays a simple calendar
+endef
+
+define Package/cfdisk
+$(call Package/util-linux/Default)
+  TITLE:=display or manipulate disk partition table
+  DEPENDS:= +libblkid +libncurses +libsmartcols
+  SUBMENU:=disc
+endef
+
+define Package/cfdisk/description
+ cfdisk is a curses-based program for partitioning any hard disk drive
+endef
+
+define Package/dmesg
+$(call Package/util-linux/Default)
+  TITLE:=print or control the kernel ring buffer
+  DEPENDS:= +librt
+endef
+
+define Package/dmesg/description
+ dmesg  is used to examine or control the kernel ring buffer
+endef
+
+define Package/fdisk
+$(call Package/util-linux/Default)
+  TITLE:=manipulate disk partition table
+  DEPENDS:= +libblkid +libsmartcols
+  SUBMENU=disc
+endef
+
+define Package/fdisk/description
+ a menu-driven program for creation and manipulation of partition tables
+endef
+
+define Package/findfs
+$(call Package/util-linux/Default)
+  TITLE:=find a filesystem by label or UUID
+  DEPENDS:= +libblkid
+  SUBMENU=disc
+endef
+
+define Package/findfs/description
+ findfs will search the disks in the system looking for a filesystem which has
+ a label matching label or a UUID equal to uuid
+endef
+
+define Package/flock
+$(call Package/util-linux/Default)
+  TITLE:=manage locks from shell scripts
+endef
+
+define Package/flock/description
+  manages flock locks from within shell scripts or the command line
+endef
+
+define Package/getopt
+$(call Package/util-linux/Default)
+  TITLE:=parse command options (enhanced)
+endef
+
+define Package/getopt/description
+ getopt is used to break up (parse) options in command lines for easy parsing
+ by shell procedures, and to check for legal options
+endef
+
+define Package/hwclock
+$(call Package/util-linux/Default)
+  TITLE:=query or set the hardware clock
+endef
+
+define Package/hwclock/description
+ hwclock is a tool for accessing the Hardware Clock
+endef
+
+define Package/logger
+$(call Package/util-linux/Default)
+  TITLE:=a shell command interface to the syslog system log module
+endef
+
+define Package/logger/description
+ logger makes entries in the system log, it provides a shell command interface
+ to the syslog system log module
+endef
+
+define Package/look
+$(call Package/util-linux/Default)
+  TITLE:=display lines beginning with a given string
+endef
+
+define Package/look/description
+ look utility displays any lines in file which contain string
+endef
+
+define Package/losetup
+$(call Package/util-linux/Default)
+  TITLE:=set up and control loop devices
+endef
+
+define Package/losetup/description
+ losetup is used to associate loop devices with regular files or block devices,
+ to detach loop devices and to query the status of a loop device
+endef
+
+define Package/lsblk
+$(call Package/util-linux/Default)
+  TITLE:=list block devices
+  DEPENDS:= +libblkid +libmount +libsmartcols
+  SUBMENU=disc
+endef
+
+define Package/lsblk/description
+ lsblk lists information about all or the specified block devices
+endef
+
+define Package/mcookie
+$(call Package/util-linux/Default)
+  TITLE:=generate magic cookies for xauth
+endef
+
+define Package/mcookie/description
+ mcookie generates a 128-bit random hexadecimal number for use with the X
+ authority system
+endef
+
+define Package/mount-utils
+$(call Package/util-linux/Default)
+  TITLE:=related (u)mount utilities
+  DEPENDS+= +libmount +libsmartcols
+endef
+
+define Package/mount-utils/description
+ contains: mount, umount, findmnt
+endef
+
+define Package/namei
+$(call Package/util-linux/Default)
+  TITLE:=follow a pathname until a terminal point is found
+endef
+
+define Package/namei/description
+ namei uses its arguments as pathnames to any type of Unix file (symlinks,
+ files, directories, and so forth)
+endef
+
+define Package/rename
+$(call Package/util-linux/Default)
+  TITLE:=rename files
+endef
+
+define Package/rename/description
+ rename will rename the specified files by replacing the first occurrence of
+ expression in their name by replacement
+endef
+
+define Package/partx-utils
+$(call Package/util-linux/Default)
+  TITLE:=inform kernel about the presence and numbering of on-disk partitions
+  DEPENDS:= +libblkid +libsmartcols
+  SUBMENU=disc
+endef
+
+define Package/partx-utils/description
+ contains partx, addpart, delpart
+endef
+
+define Package/script-utils
+$(call Package/util-linux/Default)
+  TITLE:=make and replay typescript of terminal session
+  SUBMENU=Terminal
+endef
+
+define Package/script-utils/description
+ contains: script, scriptreplay
+endef
+
+define Package/setterm
+$(call Package/util-linux/Default)
+  TITLE:=set terminal attributes
+  DEPENDS:= +libncurses
+  SUBMENU:=Terminal
+endef
+
+define Package/setterm/description
+ setterm writes to standard output a character string that will invoke the
+ specified terminal capabilities
+endef
+
+define Package/sfdisk
+$(call Package/util-linux/Default)
+  TITLE:=partition table manipulator for Linux
+  SUBMENU=disc
+endef
+
+define Package/sfdisk/description
+ list the size of a partition, list the partitions on a device, check the
+ partitions on a device and repartition a device
+endef
+
+define Package/swap-utils
+$(call Package/util-linux/Default)
+  TITLE:=swap space management utilities
+  DEPENDS+= +libblkid
+  SUBMENU:=disc
+endef
+
+define Package/swap-utils/description
+ contains: mkswap, swaplabel
+endef
+
+define Package/uuidd
+$(call Package/util-linux/Default)
+  TITLE:=UUID generation daemon
+  DEPENDS:= +libuuid
+endef
+
+define Package/uuidd/description
+ The uuidd daemon is used by the UUID library to generate universally unique
+ identifiers (UUIDs), especially time-based UUIDs, in a secure and
+ guaranteed-unique fashion, even in the face of large numbers of threads
+ running on different CPUs trying to grab UUIDs.
+endef
+
+define Package/uuidgen
+$(call Package/util-linux/Default)
+  TITLE:=create a new UUID value
+  DEPENDS:= +libuuid
+endef
+
+define Package/uuidgen/description
+ The uuidgen program creates (and prints) a new universally unique identifier
+ (UUID) using the libuuid library. The new UUID can reasonably be considered
+ unique among all UUIDs created on the local system, and among UUIDs created on
+ other systems in the past and in the future.
+endef
+
+define Package/wall
+$(call Package/util-linux/Default)
+  TITLE:=send a message to everybody's terminal
+  SUBMENU=Terminal
+endef
+
+define Package/wall/description
+ wall sends a message to everybody logged in with their mesg permission
+ set to yes
+endef
+
+define Package/whereis
+$(call Package/util-linux/Default)
+  TITLE:=locate the binary, source, and manual page files for a command
+endef
+
+define Package/whereis/description
+ whereis locates source/binary and manuals sections for specified files
+endef
+
+define Package/wipefs
+$(call Package/util-linux/Default)
+  TITLE:=wipe a signature from a device
+  DEPENDS:= +libblkid
+  SUBMENU:=disc
+endef
+
+define Package/wipefs/description
+ wipefs can erase filesystem, raid or partition table signatures (magic
+ strings) from the specified device to make the signature invisible for
+ libblkid.
+endef
+
+define Package/libblkid/install
+        $(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libblkid.so.* $(1)/usr/lib/
+endef
+
+define Package/libmount/install
+        $(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libmount.so.* $(1)/usr/lib/
+endef
+
+define Package/libsmartcols/install
+        $(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.so.* $(1)/usr/lib/
+endef
+
+define Package/libuuid/install
+        $(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so.* $(1)/usr/lib/
+endef
+
+define Package/agetty/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/agetty $(1)/usr/sbin/
+endef
+
+define Package/blkid/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/blkid $(1)/usr/sbin/
+endef
+
+define Package/cal/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cal $(1)/usr/bin/
+endef
+
+define Package/cfdisk/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/cfdisk $(1)/usr/sbin/
+endef
+
+define Package/dmesg/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dmesg $(1)/usr/sbin/
+endef
+
+define Package/fdisk/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/fdisk $(1)/usr/sbin/
+endef
+
+define Package/findfs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/findfs $(1)/usr/sbin/
+endef
+
+define Package/flock/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/flock $(1)/usr/bin/
+endef
+
+define Package/getopt/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt $(1)/usr/bin/
+endef
+
+define Package/hwclock/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock $(1)/usr/sbin/
+endef
+
+define Package/logger/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/logger $(1)/usr/bin/
+endef
+
+define Package/look/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/look $(1)/usr/bin/
+endef
+
+define Package/losetup/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/losetup $(1)/usr/sbin/
+endef
+
+define Package/lsblk/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/lsblk $(1)/usr/bin/
+endef
+
+define Package/mcookie/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mcookie $(1)/usr/bin/
+endef
+
+define Package/mount-utils/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{u,}mount $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/mountpoint $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/findmnt $(1)/usr/bin/
+endef
+
+define Package/namei/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/namei $(1)/usr/bin/
+endef
+
+define Package/rename/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rename $(1)/usr/bin/
+endef
+
+define Package/partx-utils/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/partx $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/addpart $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/delpart $(1)/usr/sbin/
+endef
+
+define Package/script-utils/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/script $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scriptreplay $(1)/usr/bin/
+endef
+
+define Package/setterm/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/setterm $(1)/usr/bin/
+endef
+
+define Package/sfdisk/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sfdisk $(1)/usr/sbin/
+endef
+
+define Package/swap-utils/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/mkswap $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/swaplabel $(1)/usr/sbin/
+endef
+
+define Package/uuidd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/uuidd $(1)/usr/sbin/
+endef
+
+define Package/uuidgen/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/uuidgen $(1)/usr/bin/
+endef
+
+define Package/wall/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wall $(1)/usr/bin/
+endef
+
+define Package/whereis/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/whereis $(1)/usr/bin/
+endef
+
+define Package/wipefs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/wipefs $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,libblkid))
+$(eval $(call BuildPackage,libmount))
+$(eval $(call BuildPackage,libsmartcols))
+$(eval $(call BuildPackage,libuuid))
+$(eval $(call BuildPackage,agetty))
+$(eval $(call BuildPackage,blkid))
+$(eval $(call BuildPackage,cal))
+$(eval $(call BuildPackage,cfdisk))
+$(eval $(call BuildPackage,dmesg))
+$(eval $(call BuildPackage,fdisk))
+$(eval $(call BuildPackage,findfs))
+$(eval $(call BuildPackage,flock))
+$(eval $(call BuildPackage,getopt))
+$(eval $(call BuildPackage,hwclock))
+$(eval $(call BuildPackage,logger))
+$(eval $(call BuildPackage,look))
+$(eval $(call BuildPackage,losetup))
+$(eval $(call BuildPackage,lsblk))
+$(eval $(call BuildPackage,mcookie))
+$(eval $(call BuildPackage,mount-utils))
+$(eval $(call BuildPackage,namei))
+$(eval $(call BuildPackage,rename))
+$(eval $(call BuildPackage,partx-utils))
+$(eval $(call BuildPackage,script-utils))
+$(eval $(call BuildPackage,setterm))
+$(eval $(call BuildPackage,sfdisk))
+$(eval $(call BuildPackage,swap-utils))
+$(eval $(call BuildPackage,uuidd))
+$(eval $(call BuildPackage,uuidgen))
+$(eval $(call BuildPackage,wall))
+$(eval $(call BuildPackage,whereis))
+$(eval $(call BuildPackage,wipefs))
diff --git a/trunk/package/utils/util-linux/patches/0001-switch_root-improve-statfs-f_type-portability.patch b/trunk/package/utils/util-linux/patches/0001-switch_root-improve-statfs-f_type-portability.patch
new file mode 100644
index 00000000..761ace77
--- /dev/null
+++ b/trunk/package/utils/util-linux/patches/0001-switch_root-improve-statfs-f_type-portability.patch
@@ -0,0 +1,49 @@
+From 8f806bb1ea30f15db7ca36d1cfa79349f8115302 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 6 Nov 2014 12:50:27 +0100
+Subject: [PATCH] switch_root: improve statfs->f_type portability
+
+__SWORD_TYPE is not available everywhere, for example it's not defined
+by musl libc. It also seems that __SWORD_TYPE is not used for f_type
+on some architectures (s390x).
+
+Reported-by: Natanael Copa <ncopa@alpinelinux.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ include/statfs_magic.h  | 11 +++++++++++
+ sys-utils/switch_root.c |  4 ++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+--- a/include/statfs_magic.h
++++ b/include/statfs_magic.h
+@@ -1,6 +1,17 @@
+ #ifndef UTIL_LINUX_STATFS_MAGIC_H
+ #define UTIL_LINUX_STATFS_MAGIC_H
+ 
++#include <sys/statfs.h>
++
++/*
++ * If possible then don't depend on internal libc __SWORD_TYPE type.
++ */
++#ifdef __GNUC__
++typedef __typeof__( ((struct statfs *)0)->f_type )	ul_statfs_ftype_t;
++#else
++typedef __SWORD_TYPE	ul_statfs_ftype_t;
++#endif
++
+ /*
+  *  Unfortunately, Linux kernel hedeader file <linux/magic.h> is incomplete
+  *  mess and kernel returns by statfs f_type many numbers that are nowhere
+--- a/sys-utils/switch_root.c
++++ b/sys-utils/switch_root.c
+@@ -181,8 +181,8 @@ static int switchroot(const char *newroo
+ 		if (pid <= 0) {
+ 			struct statfs stfs;
+ 			if (fstatfs(cfd, &stfs) == 0 &&
+-			    (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC ||
+-			     stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC))
++			    (stfs.f_type == (ul_statfs_ftype_t) STATFS_RAMFS_MAGIC ||
++			     stfs.f_type == (ul_statfs_ftype_t) STATFS_TMPFS_MAGIC))
+ 				recursiveRemove(cfd);
+ 			else
+ 				warn(_("old root filesystem is not an initramfs"));
diff --git a/trunk/package/utils/util-linux/patches/0002-lib-colors-use-static-buffers-when-parse-scheme.patch b/trunk/package/utils/util-linux/patches/0002-lib-colors-use-static-buffers-when-parse-scheme.patch
new file mode 100644
index 00000000..ccd82fd0
--- /dev/null
+++ b/trunk/package/utils/util-linux/patches/0002-lib-colors-use-static-buffers-when-parse-scheme.patch
@@ -0,0 +1,126 @@
+From 6508db29ded734ac4ff5e5e19486c143c9eb3d89 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Fri, 21 Nov 2014 12:23:47 +0100
+Subject: [PATCH] lib/colors: use static buffers when parse scheme
+
+* use static buffers when parse scheme colors
+* cleanup deallocation on error in sequence parser
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+This is modified upstream patch.
+
+--- a/lib/colors.c
++++ b/lib/colors.c
+@@ -416,28 +416,31 @@ static int colors_add_scheme(struct ul_c
+ 			     char *name,
+ 			     char *seq0)
+ {
+-	struct ul_color_scheme *cs;
+-	char *seq;
++	struct ul_color_scheme *cs = NULL;
++	char *seq = NULL;
+ 	int rc;
+ 
+ 	if (!cc || !name || !*name || !seq0 || !*seq0)
+ 		return -EINVAL;
+ 
+ 	rc = cn_sequence(seq0, &seq);
+-	free(seq0);
+ 	if (rc)
+ 		return rc;
+ 
++	rc = -ENOMEM;
++
+ 	/* convert logical name (e.g. "red") to real ESC code */
+ 	if (isalpha(*seq)) {
+ 		const char *s = color_sequence_from_colorname(seq);
+ 		char *p;
+ 
+-		if (!s)
+-			return -EINVAL;
++		if (!s) {
++			rc = -EINVAL;
++			goto err;
++		}
+ 		p = strdup(s);
+ 		if (!p)
+-			return -ENOMEM;
++			goto err;
+ 		free(seq);
+ 		seq = p;
+ 	}
+@@ -447,17 +450,28 @@ static int colors_add_scheme(struct ul_c
+ 		void *tmp = realloc(cc->schemes, (cc->nschemes + 10)
+ 					* sizeof(struct ul_color_scheme));
+ 		if (!tmp)
+-			return -ENOMEM;
++			goto err;
+ 		cc->schemes = tmp;
+ 		cc->schemes_sz = cc->nschemes + 10;
+ 	}
+ 
+ 	/* add a new item */
+-	cs = &cc->schemes[cc->nschemes++];
+-	cs->name = name;
++	cs = &cc->schemes[cc->nschemes];
+ 	cs->seq = seq;
++	cs->name = strdup(name);
++	if (!cs->name)
++		goto err;
+ 
++	cc->nschemes++;
+ 	return 0;
++err:
++	if (cs) {
++		free(cs->seq);
++		free(cs->name);
++		cs->seq = cs->name = NULL;
++	} else
++		free(seq);
++	return rc;
+ }
+ 
+ /*
+@@ -543,7 +557,8 @@ static int colors_read_schemes(struct ul
+ {
+ 	int rc = 0;
+ 	FILE *f = NULL;
+-	char buf[BUFSIZ];
++	char buf[BUFSIZ],
++	     cn[129], seq[129];
+ 
+ 	if (!cc->configured)
+ 		rc = colors_read_configuration(cc);
+@@ -560,7 +575,6 @@ static int colors_read_schemes(struct ul
+ 	}
+ 
+ 	while (fgets(buf, sizeof(buf), f)) {
+-		char *cn = NULL, *seq = NULL;
+ 		char *p = strchr(buf, '\n');
+ 
+ 		if (!p) {
+@@ -576,17 +590,14 @@ static int colors_read_schemes(struct ul
+ 		if (*p == '\0' || *p == '#')
+ 			continue;
+ 
+-		rc = sscanf(p,  UL_SCNsA" "	/* name */
+-				UL_SCNsA,	/* color */
+-				&cn, &seq);
+-		if (rc == 2 && cn && seq)
++		rc = sscanf(p, "%128[^ ] %128[^\n ]", cn, seq);
++		if (rc == 2 && *cn && *seq) {
+ 			rc = colors_add_scheme(cc, cn, seq);	/* set rc=0 on success */
+-		if (rc) {
+-			free(cn);
+-			free(seq);
++			if (rc)
++				goto done;
+ 		}
+-		rc = 0;
+ 	}
++	rc = 0;
+ 
+ done:
+ 	if (f)
diff --git a/trunk/package/utils/util-linux/patches/001-no-printf-alloc.patch b/trunk/package/utils/util-linux/patches/001-no-printf-alloc.patch
new file mode 100644
index 00000000..ad9eef09
--- /dev/null
+++ b/trunk/package/utils/util-linux/patches/001-no-printf-alloc.patch
@@ -0,0 +1,104 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -798,7 +798,6 @@ AC_ARG_ENABLE([libmount],
+ )
+ UL_BUILD_INIT([libmount])
+ UL_REQUIRES_BUILD([libmount], [libblkid])
+-UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier])
+ AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes])
+ AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes])
+ 
+--- a/libmount/src/tab_parse.c
++++ b/libmount/src/tab_parse.c
+@@ -22,6 +22,10 @@
+ #include "pathnames.h"
+ #include "strutils.h"
+ 
++#ifndef HAVE_SCANF_MS_MODIFIER
++# define UL_SCNsA "%s"
++#endif
++
+ static int next_number(char **s, int *num)
+ {
+ 	char *end = NULL;
+@@ -52,16 +56,31 @@ static int mnt_parse_table_line(struct l
+ 	int rc, n = 0, xrc;
+ 	char *src = NULL, *fstype = NULL, *optstr = NULL;
+ 
++#ifndef HAVE_SCANF_MS_MODIFIER
++	size_t len = strlen(s) + 1;
++	src = malloc(len);
++	fstype = malloc(len);
++	fs->target = malloc(len);
++	optstr = malloc(len);
++#endif
++
+ 	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
+ 			UL_SCNsA" "	/* (2) target */
+ 			UL_SCNsA" "	/* (3) FS type */
+ 			UL_SCNsA" "	/* (4) options */
+ 			"%n",		/* byte count */
+ 
++#ifdef HAVE_SCANF_MS_MODIFIER
+ 			&src,
+ 			&fs->target,
+ 			&fstype,
+ 			&optstr,
++#else
++			src,
++			fs->target,
++			fstype,
++			optstr,
++#endif
+ 			&n);
+ 	xrc = rc;
+ 
+@@ -127,6 +146,16 @@ static int mnt_parse_mountinfo_line(stru
+ 	unsigned int maj, min;
+ 	char *fstype = NULL, *src = NULL, *p;
+ 
++#ifndef HAVE_SCANF_MS_MODIFIER
++	size_t len = strlen(s) + 1;
++	fs->root = malloc(len);
++	fs->target = malloc(len);
++	fs->vfs_optstr = malloc(len);
++	fs->fs_optstr = malloc(len);
++	fstype = malloc(len);
++	src = malloc(len);
++#endif
++
+ 	rc = sscanf(s,	"%d "		/* (1) id */
+ 			"%d "		/* (2) parent */
+ 			"%u:%u "	/* (3) maj:min */
+@@ -138,9 +167,15 @@ static int mnt_parse_mountinfo_line(stru
+ 			&fs->id,
+ 			&fs->parent,
+ 			&maj, &min,
++#ifdef HAVE_SCANF_MS_MODIFIER
+ 			&fs->root,
+ 			&fs->target,
+ 			&fs->vfs_optstr,
++#else
++			fs->root,
++			fs->target,
++			fs->vfs_optstr,
++#endif
+ 			&end);
+ 
+ 	if (rc >= 7 && end > 0)
+@@ -160,9 +195,15 @@ static int mnt_parse_mountinfo_line(stru
+ 			UL_SCNsA" "	/* (9) source */
+ 			UL_SCNsA,	/* (10) fs options (fs specific) */
+ 
++#ifdef HAVE_SCANF_MS_MODIFIER
+ 			&fstype,
+ 			&src,
+ 			&fs->fs_optstr);
++#else
++			fstype,
++			src,
++			fs->fs_optstr);
++#endif
+ 
+ 	if (rc >= 10) {
+ 		size_t sz;
diff --git a/trunk/package/utils/util-linux/patches/002-mkostemp.patch b/trunk/package/utils/util-linux/patches/002-mkostemp.patch
new file mode 100644
index 00000000..02818423
--- /dev/null
+++ b/trunk/package/utils/util-linux/patches/002-mkostemp.patch
@@ -0,0 +1,46 @@
+Support older hosts with latest util-linux-native
+
+mkostemp is not defined on older machines.  So we detect this and
+provide a define that uses mkstemp instead.
+
+O_CLOEXEC is not defined on older machines.  It is however defined
+in the 'c.h' header.  Fix up the users to include 'c.h'.
+
+fdisks/fdisksunlabel.c was modified to use qsort_r, however
+this is not defined on older hosts.  Revert:
+  commit c69bbca9c1f6645097bd20fe3a21f5a99a2a0698
+  fdisk: (sun): use ask API, remove global variable
+
+Upstream-Status: Inappropriate [other]
+Patches revert upstream changes in order to support older
+machines.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+---
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -315,6 +315,7 @@ AC_CHECK_FUNCS([ \
+ 	llseek \
+ 	lseek64 \
+ 	mempcpy \
++	mkostemp \
+ 	nanosleep \
+ 	open_memstream \
+ 	personality \
+--- a/include/c.h
++++ b/include/c.h
+@@ -233,6 +233,13 @@ static inline int dirfd(DIR *d)
+ #endif
+ 
+ /*
++ * mkostemp replacement
++ */
++#ifndef HAVE_MKOSTEMP
++#define mkostemp(template, flags) mkstemp(template)
++#endif
++
++/*
+  * MAXHOSTNAMELEN replacement
+  */
+ static inline size_t get_hostname_max(void)
diff --git a/trunk/package/utils/xfsprogs/Makefile b/trunk/package/utils/xfsprogs/Makefile
new file mode 100644
index 00000000..7fc9a641
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/Makefile
@@ -0,0 +1,90 @@
+# 
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xfsprogs
+PKG_RELEASE:=1
+PKG_VERSION:=3.1.7
+PKG_SOURCE_URL:=ftp://oss.sgi.com/projects/xfs/previous/
+PKG_MD5SUM:=049cf9873794ea49d0bb3f12d45748a4
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+PKG_CHECK_FORMAT_SECURITY:=0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/xfsprogs/default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Filesystem
+  DEPENDS:=+libuuid +libpthread +librt
+  URL:=http://oss.sgi.com/projects/xfs
+endef
+
+define Package/xfs-mkfs
+$(call Package/xfsprogs/default)
+  TITLE:=Utility for creating XFS filesystems
+endef
+
+define Package/xfs-fsck
+$(call Package/xfsprogs/default)
+  TITLE:=Utilities for checking and repairing XFS filesystems
+endef
+
+define Package/xfs-growfs
+$(call Package/xfsprogs/default)
+  TITLE:=Utility for increasing the size of XFS filesystems
+endef
+
+CONFIGURE_ARGS += \
+	--enable-gettext=no \
+	--enable-lib64=no \
+	--enable-blkid=no
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_LARGEFILE64_SOURCE \
+	-D_FILE_OFFSET_BITS=64 \
+	-D_GNU_SOURCE
+
+MAKE_FLAGS += \
+	DEBUG= Q= \
+	PCFLAGS="-Wall" \
+	PKG_PLATFORM=linux \
+	ENABLE_GETTEXT=no \
+	prefix=$(PKG_INSTALL_DIR)/usr \
+	exec_prefix=$(PKG_INSTALL_DIR)/usr \
+	PKG_SBIN_DIR=$(PKG_INSTALL_DIR)/usr/sbin \
+	PKG_ROOT_SBIN_DIR=$(PKG_INSTALL_DIR)/sbin \
+	PKG_MAN_DIR=$(PKG_INSTALL_DIR)/usr/man \
+	PKG_LOCALE_DIR=$(PKG_INSTALL_DIR)/usr/share/locale \
+	PKG_ROOT_LIB_DIR=$(PKG_INSTALL_DIR)/lib \
+	PKG_DOC_DIR=$(PKG_INSTALL_DIR)/usr/share/doc/xfsprogs
+
+define Package/xfs-mkfs/install
+	mkdir -p $(1)/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mkfs.xfs $(1)/sbin
+endef
+
+define Package/xfs-fsck/install
+	mkdir -p $(1)/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/xfs_repair $(1)/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/sbin
+endef
+
+define Package/xfs-growfs/install
+	mkdir -p $(1)/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_growfs $(1)/sbin
+endef
+
+$(eval $(call BuildPackage,xfs-mkfs))
+$(eval $(call BuildPackage,xfs-fsck))
+$(eval $(call BuildPackage,xfs-growfs))
diff --git a/trunk/package/utils/xfsprogs/patches/001-automake-compat.patch b/trunk/package/utils/xfsprogs/patches/001-automake-compat.patch
new file mode 100644
index 00000000..3003d6d2
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/patches/001-automake-compat.patch
@@ -0,0 +1,84 @@
+commit 2222aa77e11b959e0e5a0ded3482e56799593bc2
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:34:15 2012 +0100
+
+    001-automake-compat
+
+diff --git a/configure.in b/configure.in
+index 664c0e9..d91b6ec 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,8 @@ AC_INIT(include/libxfs.h)
+ AC_PREREQ(2.50)
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_MACRO_DIR([m4])
+-AC_CONFIG_HEADER(include/platform_defs.h)
++# Put a dummy here (http://www.mail-archive.com/automake@gnu.org/msg09241.html)
++AC_CONFIG_HEADERS([doesnotexist.h include/platform_defs.h])
+ AC_PREFIX_DEFAULT(/usr)
+ 
+ AC_PROG_LIBTOOL
+diff --git a/include/builddefs.in b/include/builddefs.in
+index 81ebfcd..5a4a0e8 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -20,6 +20,8 @@
+ ifndef _BUILDDEFS_INCLUDED_
+ _BUILDDEFS_INCLUDED_ = 1
+ 
++SHELL = @SHELL@
++
+ DEBUG = @debug_build@
+ OPTIMIZER = @opt_build@
+ MALLOCLIB = @malloc_lib@
+diff --git a/m4/package_types.m4 b/m4/package_types.m4
+index 0a0e087..66a136a 100644
+--- a/m4/package_types.m4
++++ b/m4/package_types.m4
+@@ -9,7 +9,7 @@ AC_DEFUN([AC_TYPE_PSINT],
+ #include <stddef.h>
+     ], [
+          __psint_t  psint;
+-    ], AC_DEFINE(HAVE___PSINT_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
++    ], AC_DEFINE([HAVE___PSINT_T], [1], [Define if __psint_t exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+   ])
+ 
+ # 
+@@ -23,7 +23,7 @@ AC_DEFUN([AC_TYPE_PSUNSIGNED],
+ #include <stddef.h>
+     ], [
+         __psunsigned_t  psuint;
+-    ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
++    ], AC_DEFINE([HAVE___PSUNSIGNED_T], [1], [Define if __psunsigned_t exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+   ])
+ 
+ # 
+@@ -37,7 +37,7 @@ AC_DEFUN([AC_TYPE_U32],
+ #include <stddef.h>
+     ], [
+          __u32  u32;
+-    ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
++    ], AC_DEFINE([HAVE___U32], [1], [Define if __u32 exists]) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+   ])
+ 
+ # 
+@@ -50,15 +50,15 @@ AC_DEFUN([AC_SIZEOF_POINTERS_AND_LONG],
+     AC_CHECK_SIZEOF(long, 4)
+     AC_CHECK_SIZEOF(char *, 4)
+     if test $ac_cv_sizeof_long -eq 4 -o $ac_cv_sizeof_long -eq 0; then
+-      AC_DEFINE(HAVE_32BIT_LONG)
++      AC_DEFINE([HAVE_32BIT_LONG], [1], [Define if long is 32bit])
+     fi
+     if test $ac_cv_sizeof_long -eq 8; then
+-      AC_DEFINE(HAVE_64BIT_LONG)
++      AC_DEFINE([HAVE_64BIT_LONG], [1], [Define if long is 64bit])
+     fi
+     if test $ac_cv_sizeof_char_p -eq 4 -o $ac_cv_sizeof_char_p -eq 0; then
+-      AC_DEFINE(HAVE_32BIT_PTR)
++      AC_DEFINE([HAVE_32BIT_PTR], [1], [Define if char* is 32bit])
+     fi
+     if test $ac_cv_sizeof_char_p -eq 8; then
+-      AC_DEFINE(HAVE_64BIT_PTR)
++      AC_DEFINE([HAVE_64BIT_PTR], [1], [Define if char* is 64bit])
+     fi
+   ])
diff --git a/trunk/package/utils/xfsprogs/patches/100-no_aio.patch b/trunk/package/utils/xfsprogs/patches/100-no_aio.patch
new file mode 100644
index 00000000..30d36b4d
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/patches/100-no_aio.patch
@@ -0,0 +1,21 @@
+commit e72b7bd12fdef06c3494b919376bfe886aa8bb4d
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:35:43 2012 +0100
+
+    100-no_aio
+
+diff --git a/configure.in b/configure.in
+index d91b6ec..8dc8b4a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -92,8 +92,8 @@ AC_PACKAGE_GLOBALS(xfsprogs)
+ AC_PACKAGE_UTILITIES(xfsprogs)
+ AC_MULTILIB($enable_lib64)
+ 
+-AC_PACKAGE_NEED_AIO_H
+-AC_PACKAGE_NEED_LIO_LISTIO
++librt="-lrt"
++AC_SUBST(librt)
+ 
+ AC_PACKAGE_NEED_UUID_H
+ AC_PACKAGE_NEED_UUIDCOMPARE
diff --git a/trunk/package/utils/xfsprogs/patches/110-uclibc_no_ustat.patch b/trunk/package/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
new file mode 100644
index 00000000..071dfc1a
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
@@ -0,0 +1,34 @@
+commit 7b1d0a98e779170232c0a81b4749ab934ec67a7e
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:36:42 2012 +0100
+
+    110-uclibc_no_ustat
+
+diff --git a/libxfs/linux.c b/libxfs/linux.c
+index 2e07d54..6a6c905 100644
+--- a/libxfs/linux.c
++++ b/libxfs/linux.c
+@@ -21,7 +21,6 @@
+ #include <mntent.h>
+ #include <sys/stat.h>
+ #undef ustat
+-#include <sys/ustat.h>
+ #include <sys/mount.h>
+ #include <sys/ioctl.h>
+ #include <sys/sysinfo.h>
+@@ -49,6 +51,7 @@ static int max_block_alignment;
+ int
+ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
+ {
++#if 0
+ 	/* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
+ 	struct ustat	ust[2];
+ 	struct stat64	st;
+@@ -68,6 +71,7 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
+ 				progname, name);
+ 		return 1;
+ 	}
++#endif
+ 	return 0;
+ }
+ 
diff --git a/trunk/package/utils/xfsprogs/patches/120-portability.patch b/trunk/package/utils/xfsprogs/patches/120-portability.patch
new file mode 100644
index 00000000..1e9b5336
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/patches/120-portability.patch
@@ -0,0 +1,47 @@
+commit d2aef8b3967e53fe58178f5af50fef488ee0faed
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:37:52 2012 +0100
+
+    120-portability
+
+diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
+index c01e0b9..2e2f320 100644
+--- a/copy/xfs_copy.c
++++ b/copy/xfs_copy.c
+@@ -463,6 +463,15 @@ read_ag_header(int fd, xfs_agnumber_t agno, wbuf *buf, ag_header_t *ag,
+ }
+ 
+ 
++static void sig_mask(int type)
++{
++	sigset_t mask;
++	sigemptyset(&mask);
++	sigaddset(&mask, SIGCHLD);
++	sigprocmask(type, &mask, NULL);
++}
++
++
+ void
+ write_wbuf(void)
+ {
+@@ -478,9 +487,9 @@ write_wbuf(void)
+ 		if (target[i].state != INACTIVE)
+ 			pthread_mutex_unlock(&targ[i].wait);	/* wake up */
+ 
+-	sigrelse(SIGCHLD);
++	sig_mask(SIG_UNBLOCK);
+ 	pthread_mutex_lock(&mainwait);
+-	sighold(SIGCHLD);
++	sig_mask(SIG_BLOCK);
+ }
+ 
+ 
+@@ -847,7 +856,7 @@ main(int argc, char **argv)
+ 	/* set up sigchild signal handler */
+ 
+ 	signal(SIGCHLD, handler);
+-	sighold(SIGCHLD);
++	sig_mask(SIG_BLOCK);
+ 
+ 	/* make children */
+ 
diff --git a/trunk/package/utils/xfsprogs/patches/130-uclibc_no_xattr.patch b/trunk/package/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
new file mode 100644
index 00000000..a9b5a6fe
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
@@ -0,0 +1,34 @@
+commit 10d6058b24f18cb31889154f830b191849f45106
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:38:27 2012 +0100
+
+    130-uclibc_no_xattr
+
+diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
+index 40c2e6f..4f54059 100644
+--- a/fsr/xfs_fsr.c
++++ b/fsr/xfs_fsr.c
+@@ -35,7 +35,6 @@
+ #include <sys/wait.h>
+ #include <sys/vfs.h>
+ #include <sys/statvfs.h>
+-#include <sys/xattr.h>
+ 
+ 
+ #ifndef XFS_XFLAG_NODEFRAG
+@@ -990,6 +992,7 @@ fsr_setup_attr_fork(
+ 	int		tfd,
+ 	xfs_bstat_t	*bstatp)
+ {
++#if 0
+ 	struct stat64	tstatbuf;
+ 	int		i;
+ 	int		last_forkoff = 0;
+@@ -1108,6 +1111,7 @@ fsr_setup_attr_fork(
+ out:
+ 	if (dflag)
+ 		fsrprintf(_("set temp attr\n"));
++#endif
+ 	return 0;
+ }
+ 
diff --git a/trunk/package/utils/xfsprogs/patches/140-no_po.patch b/trunk/package/utils/xfsprogs/patches/140-no_po.patch
new file mode 100644
index 00000000..f915a9cf
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/patches/140-no_po.patch
@@ -0,0 +1,20 @@
+diff -urN xfsprogs-3.1.7/Makefile xfsprogs-3.1.7.new/Makefile
+--- xfsprogs-3.1.7/Makefile	2011-11-18 00:30:24.000000000 +0100
++++ xfsprogs-3.1.7.new/Makefile	2012-04-20 14:15:48.641722955 +0200
+@@ -41,7 +41,7 @@
+ 
+ LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk
+ TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
+-		mdrestore repair rtcp m4 man doc po debian
++		mdrestore repair rtcp m4 man doc debian
+ 
+ SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
+ 
+@@ -135,7 +135,6 @@
+ 	$(Q)$(MAKE) $(MAKEOPTS) -C . $@
+ else
+ 	$(Q)$(MAKE) $(MAKEOPTS) $(SRCDIR)
+-	$(Q)$(MAKE) $(MAKEOPTS) -C po
+ 	$(Q)$(MAKE) $(MAKEOPTS) source-link
+ 	$(Q)cd $(SRCDIR) && dpkg-buildpackage
+ endif
diff --git a/trunk/package/utils/xfsprogs/patches/150-include_fixes.patch b/trunk/package/utils/xfsprogs/patches/150-include_fixes.patch
new file mode 100644
index 00000000..793622a1
--- /dev/null
+++ b/trunk/package/utils/xfsprogs/patches/150-include_fixes.patch
@@ -0,0 +1,72 @@
+--- a/libhandle/handle.c
++++ b/libhandle/handle.c
+@@ -20,6 +20,7 @@
+ #include <xfs/xfs.h>
+ #include <xfs/handle.h>
+ #include <xfs/parent.h>
++#include <linux/limits.h>
+ 
+ /* just pick a value we know is more than big enough */
+ #define	MAXHANSIZ	64
+--- a/libhandle/jdm.c
++++ b/libhandle/jdm.c
+@@ -20,6 +20,7 @@
+ #include <xfs/handle.h>
+ #include <xfs/jdm.h>
+ #include <xfs/parent.h>
++#include <linux/limits.h>
+ 
+ /* internal fshandle - typecast to a void for external use */
+ #define FSHANDLE_SZ		8
+--- a/libdisk/evms.c
++++ b/libdisk/evms.c
+@@ -22,6 +22,7 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/sysmacros.h>
++#include <sys/stat.h>
+ #include <disk/volume.h>
+ #include "evms.h"
+ 
+--- a/libdisk/evms.h
++++ b/libdisk/evms.h
+@@ -16,6 +16,8 @@
+  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
++#include <sys/types.h>
++
+ #define EVMS_MAJOR			117
+ #define EVMS_GET_VOL_STRIPE_INFO	\
+ 		_IOR(EVMS_MAJOR, 0xF0, struct evms_vol_stripe_info_s)
+--- a/libdisk/fstype.h
++++ b/libdisk/fstype.h
+@@ -192,7 +192,7 @@ struct adfs_super_block {
+ 	char    s_dummy2[62];
+ 	char    s_checksum[1];
+ };
+-#define adfsblksize(s)	((uint) s.s_blksize[0])
++#define adfsblksize(s)	((unsigned int) s.s_blksize[0])
+ 
+ /* found in first 4 bytes of block 1 */
+ struct vxfs_super_block {
+--- a/fsr/xfs_fsr.c
++++ b/fsr/xfs_fsr.c
+@@ -25,6 +25,7 @@
+ #include <xfs/xfs_dinode.h>
+ #include <xfs/xfs_attr_sf.h>
+ 
++#include <paths.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <malloc.h>
+--- a/libdisk/xvm.c
++++ b/libdisk/xvm.c
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <disk/volume.h>
+ #include "xvm.h"
+ 
diff --git a/trunk/rules.mk b/trunk/rules.mk
new file mode 100644
index 00000000..803ec861
--- /dev/null
+++ b/trunk/rules.mk
@@ -0,0 +1,335 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifneq ($(__rules_inc),1)
+__rules_inc=1
+
+ifeq ($(DUMP),)
+  -include $(TOPDIR)/.config
+endif
+include $(TOPDIR)/include/debug.mk
+include $(TOPDIR)/include/verbose.mk
+
+export TMP_DIR:=$(TOPDIR)/tmp
+
+qstrip=$(strip $(subst ",,$(1)))
+#"))
+
+empty:=
+space:= $(empty) $(empty)
+comma:=,
+merge=$(subst $(space),,$(1))
+confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
+strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
+
+define sep
+
+endef
+
+_SINGLE=export MAKEFLAGS=$(space);
+CFLAGS:=
+ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
+ARCH_PACKAGES:=$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))
+BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
+TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))
+export EXTRA_OPTIMIZATION:=$(call qstrip,$(CONFIG_EXTRA_OPTIMIZATION))
+TARGET_SUFFIX=$(call qstrip,$(CONFIG_TARGET_SUFFIX))
+BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX))
+SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
+export SHELL:=/usr/bin/env bash
+
+OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH))
+
+ifeq ($(ARCH),powerpc)
+  FPIC:=-fPIC
+else
+  FPIC:=-fpic
+endif
+
+HOST_FPIC:=-fPIC
+
+ARCH_SUFFIX:=$(call qstrip,$(CONFIG_CPU_TYPE))
+GCC_ARCH:=
+
+ifneq ($(ARCH_SUFFIX),)
+  ARCH_SUFFIX:=_$(ARCH_SUFFIX)
+endif
+ifneq ($(filter -march=armv%,$(TARGET_OPTIMIZATION)),)
+  GCC_ARCH:=$(patsubst -march=%,%,$(filter -march=armv%,$(TARGET_OPTIMIZATION)))
+endif
+ifdef CONFIG_HAS_SPE_FPU
+  TARGET_SUFFIX:=$(TARGET_SUFFIX)spe
+endif
+ifdef CONFIG_MIPS64_ABI
+  ifneq ($(CONFIG_MIPS64_ABI_O32),y)
+     ARCH_SUFFIX:=$(ARCH_SUFFIX)_$(call qstrip,$(CONFIG_MIPS64_ABI))
+  endif
+endif
+
+DL_DIR:=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl)
+BIN_DIR:=$(if $(call qstrip,$(CONFIG_BINARY_FOLDER)),$(call qstrip,$(CONFIG_BINARY_FOLDER)),$(TOPDIR)/bin/$(BOARD))
+INCLUDE_DIR:=$(TOPDIR)/include
+SCRIPT_DIR:=$(TOPDIR)/scripts
+BUILD_DIR_BASE:=$(TOPDIR)/build_dir
+BUILD_DIR_HOST:=$(BUILD_DIR_BASE)/host
+STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION))
+  LIBC:=$(call qstrip,$(CONFIG_LIBC))
+  LIBCV:=$(call qstrip,$(CONFIG_LIBC_VERSION))
+  REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-librecmc-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))
+  GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-librecmc-linux
+  DIR_SUFFIX:=_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+  BIN_DIR:=$(BIN_DIR)$(if $(CONFIG_USE_UCLIBC),,-$(LIBC))
+  TARGET_DIR_NAME = target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+  TOOLCHAIN_DIR_NAME = toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
+else
+  ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+    GNU_TARGET_NAME=$(call qstrip,$(CONFIG_TARGET_NAME))
+  else
+    GNU_TARGET_NAME=$(shell gcc -dumpmachine)
+  endif
+  REAL_GNU_TARGET_NAME=$(GNU_TARGET_NAME)
+  TARGET_DIR_NAME:=target-$(GNU_TARGET_NAME)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+  TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME)
+endif
+
+PACKAGE_DIR:=$(BIN_DIR)/packages
+BUILD_DIR:=$(BUILD_DIR_BASE)/$(TARGET_DIR_NAME)
+STAGING_DIR:=$(TOPDIR)/staging_dir/$(TARGET_DIR_NAME)
+BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/$(TOOLCHAIN_DIR_NAME)
+TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/$(TOOLCHAIN_DIR_NAME)
+STAMP_DIR:=$(BUILD_DIR)/stamp
+STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
+TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR))
+TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD)
+STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
+BUILD_LOG_DIR:=$(TOPDIR)/logs
+PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
+
+TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
+TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) $(EXTRA_OPTIMIZATION)
+TARGET_CXXFLAGS = $(TARGET_CFLAGS)
+TARGET_ASFLAGS_DEFAULT = $(TARGET_CFLAGS)
+TARGET_ASFLAGS = $(TARGET_ASFLAGS_DEFAULT)
+TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+LIBGCC_S_PATH=$(realpath $(wildcard $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC))))
+LIBGCC_S=$(if $(LIBGCC_S_PATH),-L$(dir $(LIBGCC_S_PATH)) -lgcc_s)
+LIBGCC_A=$(realpath $(lastword $(wildcard $(dir $(LIBGCC_S_PATH))/gcc/*/*/libgcc.a)))
+else
+LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a))
+LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(LIBGCC_A))
+endif
+LIBRPC=-lrpc
+LIBRPC_DEPENDS=+librpc
+
+ifeq ($(CONFIG_ARCH_64BIT),y)
+  LIB_SUFFIX:=64
+endif
+
+ifndef DUMP
+  ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+    -include $(TOOLCHAIN_DIR)/info.mk
+    export GCC_HONOUR_COPTS:=0
+    TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-librecmc-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-)
+    TARGET_CFLAGS+= -fhonour-copts $(if $(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),,-Wno-error=unused-but-set-variable)
+    TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include -I$(TOOLCHAIN_DIR)/include
+    TARGET_LDFLAGS+= -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib
+    TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)
+  else
+    ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+      TARGET_CROSS:=$(call qstrip,$(CONFIG_TOOLCHAIN_PREFIX))
+      TOOLCHAIN_ROOT_DIR:=$(call qstrip,$(CONFIG_TOOLCHAIN_ROOT))
+      TOOLCHAIN_BIN_DIRS:=$(patsubst ./%,$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_BIN_PATH)))
+      TOOLCHAIN_INC_DIRS:=$(patsubst ./%,$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_INC_PATH)))
+      TOOLCHAIN_LIB_DIRS:=$(patsubst ./%,$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_LIB_PATH)))
+      ifneq ($(TOOLCHAIN_BIN_DIRS),)
+        TARGET_PATH:=$(subst $(space),:,$(TOOLCHAIN_BIN_DIRS)):$(TARGET_PATH)
+      endif
+      ifneq ($(TOOLCHAIN_INC_DIRS),)
+        TARGET_CPPFLAGS+= $(patsubst %,-I%,$(TOOLCHAIN_INC_DIRS))
+      endif
+      ifneq ($(TOOLCHAIN_LIB_DIRS),)
+        TARGET_LDFLAGS+= $(patsubst %,-L%,$(TOOLCHAIN_LIB_DIRS))
+      endif
+      TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)
+    endif
+  endif
+endif
+TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH)
+
+ifeq ($(CONFIG_SOFT_FLOAT),y)
+  SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
+  ifeq ($(CONFIG_arm),y)
+    TARGET_CFLAGS+= -mfloat-abi=soft
+  else
+    TARGET_CFLAGS+= -msoft-float
+  endif
+else
+  SOFT_FLOAT_CONFIG_OPTION:=
+  ifeq ($(CONFIG_arm),y)
+    TARGET_CFLAGS+= -mfloat-abi=hard
+  endif
+endif
+
+export PATH:=$(TARGET_PATH)
+export STAGING_DIR
+export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh;
+
+PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config
+
+export PKG_CONFIG
+
+HOSTCC:=gcc
+HOSTCXX:=g++
+HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include
+HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
+HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib
+
+TARGET_CC:=$(TARGET_CROSS)gcc
+TARGET_AR:=$(TARGET_CROSS)ar
+TARGET_RANLIB:=$(TARGET_CROSS)ranlib
+TARGET_CXX:=$(TARGET_CROSS)g++
+KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
+SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
+CP:=cp -fpR
+LN:=ln -sf
+XARGS:=xargs -r
+
+INSTALL_BIN:=install -m0755
+INSTALL_DIR:=install -d -m0755
+INSTALL_DATA:=install -m0644
+INSTALL_CONF:=install -m0600
+
+TARGET_CC_NOCACHE:=$(TARGET_CC)
+TARGET_CXX_NOCACHE:=$(TARGET_CXX)
+HOSTCC_NOCACHE:=$(HOSTCC)
+HOSTCXX_NOCACHE:=$(HOSTCXX)
+export TARGET_CC_NOCACHE
+export TARGET_CXX_NOCACHE
+export HOSTCC_NOCACHE
+
+ifneq ($(CONFIG_CCACHE),)
+  TARGET_CC:= ccache_cc
+  TARGET_CXX:= ccache_cxx
+  HOSTCC:= ccache $(HOSTCC)
+  HOSTCXX:= ccache $(HOSTCXX)
+endif
+
+TARGET_CONFIGURE_OPTS = \
+  AR=$(TARGET_CROSS)ar \
+  AS="$(TARGET_CC) -c $(TARGET_ASFLAGS)" \
+  LD=$(TARGET_CROSS)ld \
+  NM=$(TARGET_CROSS)nm \
+  CC="$(TARGET_CC)" \
+  GCC="$(TARGET_CC)" \
+  CXX="$(TARGET_CXX)" \
+  RANLIB=$(TARGET_CROSS)ranlib \
+  STRIP=$(TARGET_CROSS)strip \
+  OBJCOPY=$(TARGET_CROSS)objcopy \
+  OBJDUMP=$(TARGET_CROSS)objdump \
+  SIZE=$(TARGET_CROSS)size
+
+# strip an entire directory
+ifneq ($(CONFIG_NO_STRIP),)
+  RSTRIP:=:
+  STRIP:=:
+else
+  ifneq ($(CONFIG_USE_STRIP),)
+    STRIP:=$(TARGET_CROSS)strip $(call qstrip,$(CONFIG_STRIP_ARGS))
+  else
+    ifneq ($(CONFIG_USE_SSTRIP),)
+      STRIP:=$(STAGING_DIR_HOST)/bin/sstrip
+    endif
+  endif
+  RSTRIP:= \
+    export CROSS="$(TARGET_CROSS)" \
+		$(if $(CONFIG_KERNEL_KALLSYMS),NO_RENAME=1) \
+		$(if $(CONFIG_KERNEL_PROFILING),KEEP_SYMBOLS=1); \
+    NM="$(TARGET_CROSS)nm" \
+    STRIP="$(STRIP)" \
+    STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \
+    $(SCRIPT_DIR)/rstrip.sh
+endif
+
+ifeq ($(CONFIG_IPV6),y)
+  DISABLE_IPV6:=
+else
+  DISABLE_IPV6:=--disable-ipv6
+endif
+
+TAR_OPTIONS:=-xf -
+
+ifeq ($(CONFIG_BUILD_LOG),y)
+  BUILD_LOG:=1
+endif
+
+export BISON_PKGDATADIR:=$(STAGING_DIR_HOST)/share/bison
+export M4:=$(STAGING_DIR_HOST)/bin/m4
+
+define shvar
+V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+endef
+
+define shexport
+export $(call shvar,$(1))=$$(call $(1))
+endef
+
+define include_mk
+$(eval -include $(if $(DUMP),,$(STAGING_DIR)/mk/$(strip $(1))))
+endef
+
+# Execute commands under flock
+# $(1) => The shell expression.
+# $(2) => The lock name. If not given, the global lock will be used.
+define locked
+	SHELL= \
+	$(STAGING_DIR_HOST)/bin/flock \
+		$(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \
+		-c '$(subst ','\'',$(1))'
+endef
+
+# Recursively copy paths into another directory, purge dangling
+# symlinks before.
+# $(1) => File glob expression
+# $(2) => Destination directory
+define file_copy
+	for src_dir in $(sort $(foreach d,$(wildcard $(1)),$(dir $(d)))); do \
+		( cd $$src_dir; find -type f -or -type d ) | \
+			( cd $(2); while :; do \
+				read FILE; \
+				[ -z "$$FILE" ] && break; \
+				[ -L "$$FILE" ] || continue; \
+				echo "Removing symlink $(2)/$$FILE"; \
+				rm -f "$$FILE"; \
+			done; ); \
+	done; \
+	$(CP) $(1) $(2)
+endef
+
+# file extension
+ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1)))
+
+all:
+FORCE: ;
+.PHONY: FORCE
+
+val.%:
+	@$(if $(filter undefined,$(origin $*)),\
+		echo "$* undefined" >&2, \
+		echo '$(subst ','"'"',$($*))' \
+	)
+
+var.%:
+	@$(if $(filter undefined,$(origin $*)),\
+		echo "$* undefined" >&2, \
+		echo "$*='"'$(subst ','"'\"'\"'"',$($*))'"'" \
+	)
+
+endif #__rules_inc
diff --git a/trunk/scripts/arm-magic.sh b/trunk/scripts/arm-magic.sh
new file mode 100755
index 00000000..3f140aed
--- /dev/null
+++ b/trunk/scripts/arm-magic.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+#   Empty/wrong machtype-workaround generator
+#
+#   Copyright (C) 2006-2012 Imre Kaloz <kaloz@openwrt.org>
+#   based on linux/arch/arm/boot/compressed/head-xscale.S
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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
+
+# NOTE: for now it's for only IXP4xx in big endian mode
+
+# list of supported boards, in "boardname machtypeid" format
+for board in "avila 526" "gateway7001 731" "nslu2 597" "nas100d 865" "wg302v1 889" "wg302v2 890" "pronghorn 928" "pronghornmetro 1040" "compex 1273" "wrt300nv2 1077" "loft 849" "dsmg600 964" "fsg3 1091" "ap1000 1543" "tw2662 1658" "tw5334 1664" "ixdpg425 604" "cambria 1468" "sidewinder 1041" "ap42x 4418"
+do
+  set -- $board
+  hexid=$(printf %x\\n $2)
+  if [ "$2" -lt "256" ]; then
+    # we have a low machtypeid, we just need a "mov" (e3a)
+    printf "\xe3\xa0\x10\x$hexid" > $BIN_DIR/librecmc-$1-zImage
+  else
+    # we have a high machtypeid, we need a "mov" (e3a) and an "orr" (e38)
+    if [ "$2" -lt "4096" ]; then
+      printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "2 3")\xe3\x81\x1c\x$(echo $hexid|cut -b 1)" > $BIN_DIR/librecmc-$1-zImage
+    else
+      printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "3 4")\xe3\x81\x1c\x$(echo $hexid|cut -b "1 2")" > $BIN_DIR/librecmc-$1-zImage
+    fi
+  fi
+    # generate the image
+    cat $BIN_DIR/$IMG_PREFIX-zImage >> $BIN_DIR/librecmc-$1-zImage
+done
diff --git a/trunk/scripts/brcmImage.pl b/trunk/scripts/brcmImage.pl
new file mode 100755
index 00000000..e8adc094
--- /dev/null
+++ b/trunk/scripts/brcmImage.pl
@@ -0,0 +1,162 @@
+#!/usr/bin/perl
+#
+#    Copyright (C) 2009	Henk Vergonet <Henk.Vergonet@gmail.com>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+# Description:
+#   Replacement for brcmImagebuilder
+#
+# Disclaimer:
+#   Use this software at your own risk.
+#
+# Changelog:
+#   2009-01-01	Henk.Vergonet at gmail.com
+#
+use strict;
+use Getopt::Std;
+use Compress::Zlib;
+
+my $version = "0.1";
+my %arg = (
+	o => 'bcm963xx_fs_kernel',
+	b => 'libreCMC',
+	c => '6348',
+	s => 64,
+	f => 0xbfc00000,
+	x => 0x00010000,
+	a => 0x80010000,
+	e => 0x80010000,
+	i => 2,
+);
+my $prog = $0;
+$prog =~ s/^.*\///;
+getopts("r:k:o:lc:b:s:f:i:a:e:tpvh", \%arg);
+
+die "usage: $prog ~opts~
+
+  -r <file>	: input rootfs file
+  -k <file>	: input kernel file
+  -o <file>	: output image file, default $arg{o}
+  -l		: littleendian system, default ".($arg{l} ? 'yes' : 'no')."
+  -c <chipid>	: default $arg{c} 
+  -b <boardid>	: default $arg{b} 
+  -s <size_kb>	: erase sise flash, default $arg{s} 
+  -f <baseaddr>	: flash base, default ".sprintf('0x%x', $arg{f})."
+  -x <cfelen>	: length of cfe, default ".sprintf('0x%x', $arg{x})."
+  -i		: 2=dual image, default $arg{i}
+
+  -a <loadaddr>	: Kernel load address, default ".sprintf('0x%x', $arg{a})."
+  -e <entryaddr>: Kernel entry address, default ".sprintf('0x%x', $arg{e})."
+  -t		: Prefix kernel with load,entry,size
+
+  -p		: Add a 'gOtO' partition 
+
+  -v		: be more verbose
+  -h		: help, version $version
+
+EXAMPLES:
+    $prog -k kern -r rootfs
+" if $arg{h} || !$arg{k} || !$arg{r};
+
+sub Read_Image
+{
+	open my $fh, $_[0] or die "open $_[0]: $!";
+	local $/;	# Set input to "slurp" mode.
+	my $buf = <$fh>;
+	close $fh;
+	return $buf;
+}
+
+sub Padlen
+{
+	my $p = $_[0] % $_[1];
+	return ($p ? $_[1] - $p : 0);
+}
+
+sub Pad
+{
+	my ($buf, $off, $bs) = @_[0..2];
+	$buf .= chr(255) x Padlen(length($buf) + $off, $bs);
+	return $buf;
+}
+
+sub bcmImage
+{
+	my ($k, $f) = @_[0..1];
+	my $tmp = $arg{x} + 0x100 + $arg{f};
+	
+	# regular: rootfs+kernel
+	my ($img, $fa, $ka) = ( $f.$k, $tmp, $tmp + length($f) );
+
+	# test: kernel+rootfs
+#	my ($img, $fa, $ka) = ( $k.$f, $tmp + length($k), $tmp );
+
+	$fa = 0 unless length($f);
+
+	my $hdr = pack("a4a20a14a6a16a2a10a12a10a12a10a12a10a2a2a74Na16",
+		'6',
+		'LinuxInside', 
+		'ver. 2.0', 
+		$arg{c},
+		$arg{b},
+		($arg{l} ? '0' : '1'),
+		length($img),
+		'0',
+		'0',
+		$fa,
+		length($f),
+		$ka,
+		length($k),
+		($arg{i}==2 ? '1' : '0'),
+		'',		# if 1, the image is INACTIVE; if 0, active
+		'',
+		~crc32($k, crc32($f)),
+		'');
+	$hdr .= pack('Na16', ~crc32($hdr), '');
+
+	printf "kernel at 0x%x length 0x%x(%u)\n", $ka, length($k), length($k)
+		if $arg{v};
+	printf "rootfs at 0x%x length 0x%x(%u)\n", $fa, length($f), length($f)
+		if $arg{v};
+
+	open(FO, ">$arg{o}");
+	print FO $hdr;
+	print FO $img;
+	close FO;
+}
+
+# MAIN
+
+my $kern = Read_Image $arg{k};
+my $root = Read_Image $arg{r};
+
+$kern = pack('NNN', $arg{a}, $arg{e}, length($kern)).$kern if $arg{t};
+
+# specific fixup for the CFE that expects rootfs-kernel order
+if ($arg{p}) {
+	$kern = Pad($kern, 0x10c, $arg{s} * 1024);
+	my $dummy_root = pack('a4NN',
+			'gOtO',
+			length($kern)+12,
+			length($root)+Padlen(length($root), $arg{s} * 1024)
+	);
+	$kern .= $root;
+	$root = $dummy_root;
+}
+
+bcmImage($kern, $root);
+
diff --git a/trunk/scripts/bundle-libraries.sh b/trunk/scripts/bundle-libraries.sh
new file mode 100755
index 00000000..508fe787
--- /dev/null
+++ b/trunk/scripts/bundle-libraries.sh
@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+#
+#   Script to install host system binaries along with required libraries.
+#
+#   Copyright (C) 2012-2013 Jo-Philipp Wich <jow@openwrt.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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
+
+DIR="$1"; shift
+
+_cp() {
+	cp ${VERBOSE:+-v} -L "$1" "$2" || {
+		echo "cp($1 $2) failed" >&2
+		exit 1
+	}
+}
+
+_md() {
+	mkdir ${VERBOSE:+-v} -p "$1" || {
+		echo "mkdir($1) failed" >&2
+		exit 2
+	}
+}
+
+_ln() {
+	ln ${VERBOSE:+-v} -sf "$1" "$2" || {
+		echo "ln($1 $2) failed" >&2
+		exit 3
+	}
+}
+
+for LDD in ${PATH//://ldd }/ldd; do
+	"$LDD" --version >/dev/null 2>/dev/null && break
+	LDD=""
+done
+
+[ -n "$LDD" -a -x "$LDD" ] || LDD=
+
+for BIN in "$@"; do
+	[ -n "$BIN" -a -x "$BIN" -a -n "$DIR" ] || {
+		echo "Usage: $0 <destdir> <executable> ..." >&2
+		exit 1
+	}
+
+	[ ! -d "$DIR/bundled/lib" ] && {
+		_md "$DIR/bundled/lib"
+		_md "$DIR/bundled/usr"
+		_ln "../lib" "$DIR/bundled/usr/lib"
+	}
+
+	LDSO=""
+
+	echo "Bundling ${BIN##*/}"
+	[ -n "$LDD" ] && {
+		for token in $("$LDD" "$BIN" 2>/dev/null); do
+			case "$token" in */*.so*)
+				case "$token" in
+					*ld-*.so*) LDSO="${token##*/}" ;;
+					*) echo " * lib: ${token##*/}" ;;
+				esac
+
+				dest="$DIR/bundled/lib/${token##*/}"
+				ddir="${dest%/*}"
+
+				[ -f "$token" -a ! -f "$dest" ] && {
+					_md "$ddir"
+					_cp "$token" "$dest"
+				}
+			;; esac
+		done
+	}
+
+	_md "$DIR"
+
+	# is a dynamically linked executable
+	if [ -n "$LDSO" ]; then
+		_cp "$BIN" "$DIR/bundled/${BIN##*/}"
+
+		RUN="${LDSO#ld-}"; RUN="run-${RUN%%.so*}.sh"
+
+		[ -x "$DIR/bundled/$RUN" ] || {
+			cat <<-EOF > "$DIR/bundled/$RUN"
+				#!/usr/bin/env bash
+				dir="\$(dirname "\$0")"
+				bin="\$(basename "\$0")"
+				exec -a "\$0" "\$dir/bundled/lib/$LDSO" --library-path "\$dir/bundled/lib" "\$dir/bundled/\$bin" "\$@"
+			EOF
+			chmod ${VERBOSE:+-v} 0755 "$DIR/bundled/$RUN"
+		}
+
+		_ln "./bundled/$RUN" "$DIR/${BIN##*/}"
+
+	# is a static executable or non-elf binary
+	else
+		[ -n "$LDD" ] && echo " * not dynamically linked"
+		_cp "$BIN" "$DIR/${BIN##*/}"
+	fi
+done
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
new file mode 100755
index 00000000..aa4b0e1d
--- /dev/null
+++ b/trunk/scripts/checkpatch.pl
@@ -0,0 +1,3490 @@
+#!/usr/bin/perl -w
+# (c) 2001, Dave Jones. (the file handling bit)
+# (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
+# (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
+# (c) 2008-2010 Andy Whitcroft <apw@canonical.com>
+# (c) 2013 Vasilis Tsiligiannis <acinonyx@librecmc.gr> (adapt for libreCMC tree)
+# Licensed under the terms of the GNU GPL License version 2
+
+use strict;
+
+my $P = $0;
+$P =~ s@.*/@@g;
+
+my $V = '0.32-librecmc';
+
+use Getopt::Long qw(:config no_auto_abbrev);
+
+my $quiet = 0;
+my $tree = 1;
+my $chk_signoff = 1;
+my $chk_patch = 1;
+my $tst_only;
+my $emacs = 0;
+my $terse = 0;
+my $file = 0;
+my $check = 0;
+my $summary = 1;
+my $mailback = 0;
+my $summary_file = 0;
+my $show_types = 0;
+my $root;
+my %debug;
+my %ignore_type = ();
+my @ignore = ();
+my $help = 0;
+my $configuration_file = ".checkpatch.conf";
+
+sub help {
+	my ($exitcode) = @_;
+
+	print << "EOM";
+Usage: $P [OPTION]... [FILE]...
+Version: $V
+
+Options:
+  -q, --quiet                quiet
+  --no-tree                  run without a kernel tree
+  --no-signoff               do not check for 'Signed-off-by' line
+  --patch                    treat FILE as patchfile (default)
+  --emacs                    emacs compile window format
+  --terse                    one line per report
+  -f, --file                 treat FILE as regular source file
+  --subjective, --strict     enable more subjective tests
+  --ignore TYPE(,TYPE2...)   ignore various comma separated message types
+  --show-types               show the message "types" in the output
+  --root=PATH                PATH to the kernel tree root
+  --no-summary               suppress the per-file summary
+  --mailback                 only produce a report in case of warnings/errors
+  --summary-file             include the filename in summary
+  --debug KEY=[0|1]          turn on/off debugging of KEY, where KEY is one of
+                             'values', 'possible', 'type', and 'attr' (default
+                             is all off)
+  --test-only=WORD           report only warnings/errors containing WORD
+                             literally
+  -h, --help, --version      display this help and exit
+
+When FILE is - read standard input.
+EOM
+
+	exit($exitcode);
+}
+
+my $conf = which_conf($configuration_file);
+if (-f $conf) {
+	my @conf_args;
+	open(my $conffile, '<', "$conf")
+	    or warn "$P: Can't find a readable $configuration_file file $!\n";
+
+	while (<$conffile>) {
+		my $line = $_;
+
+		$line =~ s/\s*\n?$//g;
+		$line =~ s/^\s*//g;
+		$line =~ s/\s+/ /g;
+
+		next if ($line =~ m/^\s*#/);
+		next if ($line =~ m/^\s*$/);
+
+		my @words = split(" ", $line);
+		foreach my $word (@words) {
+			last if ($word =~ m/^#/);
+			push (@conf_args, $word);
+		}
+	}
+	close($conffile);
+	unshift(@ARGV, @conf_args) if @conf_args;
+}
+
+GetOptions(
+	'q|quiet+'	=> \$quiet,
+	'tree!'		=> \$tree,
+	'signoff!'	=> \$chk_signoff,
+	'patch!'	=> \$chk_patch,
+	'emacs!'	=> \$emacs,
+	'terse!'	=> \$terse,
+	'f|file!'	=> \$file,
+	'subjective!'	=> \$check,
+	'strict!'	=> \$check,
+	'ignore=s'	=> \@ignore,
+	'show-types!'	=> \$show_types,
+	'root=s'	=> \$root,
+	'summary!'	=> \$summary,
+	'mailback!'	=> \$mailback,
+	'summary-file!'	=> \$summary_file,
+
+	'debug=s'	=> \%debug,
+	'test-only=s'	=> \$tst_only,
+	'h|help'	=> \$help,
+	'version'	=> \$help
+) or help(1);
+
+help(0) if ($help);
+
+my $exit = 0;
+
+if ($#ARGV < 0) {
+	print "$P: no input files\n";
+	exit(1);
+}
+
+@ignore = split(/,/, join(',',@ignore));
+foreach my $word (@ignore) {
+	$word =~ s/\s*\n?$//g;
+	$word =~ s/^\s*//g;
+	$word =~ s/\s+/ /g;
+	$word =~ tr/[a-z]/[A-Z]/;
+
+	next if ($word =~ m/^\s*#/);
+	next if ($word =~ m/^\s*$/);
+
+	$ignore_type{$word}++;
+}
+
+my $dbg_values = 0;
+my $dbg_possible = 0;
+my $dbg_type = 0;
+my $dbg_attr = 0;
+for my $key (keys %debug) {
+	## no critic
+	eval "\${dbg_$key} = '$debug{$key}';";
+	die "$@" if ($@);
+}
+
+my $rpt_cleaners = 0;
+
+if ($terse) {
+	$emacs = 1;
+	$quiet++;
+}
+
+if ($tree) {
+	if (defined $root) {
+		if (!top_of_librecmc_tree($root)) {
+			die "$P: $root: --root does not point at a valid tree\n";
+		}
+	} else {
+		if (top_of_librecmc_tree('.')) {
+			$root = '.';
+		} elsif ($0 =~ m@(.*)/scripts/[^/]*$@ &&
+						top_of_librecmc_tree($1)) {
+			$root = $1;
+		}
+	}
+
+	if (!defined $root) {
+		print "Must be run from the top-level dir. of a libreCMC tree\n";
+		exit(2);
+	}
+}
+
+my $emitted_corrupt = 0;
+
+our $Ident	= qr{
+			[A-Za-z_][A-Za-z\d_]*
+			(?:\s*\#\#\s*[A-Za-z_][A-Za-z\d_]*)*
+		}x;
+our $Storage	= qr{extern|static|asmlinkage};
+our $Sparse	= qr{
+			__user|
+			__kernel|
+			__force|
+			__iomem|
+			__must_check|
+			__init_refok|
+			__kprobes|
+			__ref|
+			__rcu
+		}x;
+
+# Notes to $Attribute:
+# We need \b after 'init' otherwise 'initconst' will cause a false positive in a check
+our $Attribute	= qr{
+			const|
+			__percpu|
+			__nocast|
+			__safe|
+			__bitwise__|
+			__packed__|
+			__packed2__|
+			__naked|
+			__maybe_unused|
+			__always_unused|
+			__noreturn|
+			__used|
+			__cold|
+			__noclone|
+			__deprecated|
+			__read_mostly|
+			__kprobes|
+			__(?:mem|cpu|dev|)(?:initdata|initconst|init\b)|
+			____cacheline_aligned|
+			____cacheline_aligned_in_smp|
+			____cacheline_internodealigned_in_smp|
+			__weak
+		  }x;
+our $Modifier;
+our $Inline	= qr{inline|__always_inline|noinline};
+our $Member	= qr{->$Ident|\.$Ident|\[[^]]*\]};
+our $Lval	= qr{$Ident(?:$Member)*};
+
+our $Constant	= qr{(?i:(?:[0-9]+|0x[0-9a-f]+)[ul]*)};
+our $Assignment	= qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
+our $Compare    = qr{<=|>=|==|!=|<|>};
+our $Operators	= qr{
+			<=|>=|==|!=|
+			=>|->|<<|>>|<|>|!|~|
+			&&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%
+		  }x;
+
+our $NonptrType;
+our $Type;
+our $Declare;
+
+our $NON_ASCII_UTF8	= qr{
+	[\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
+	|  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+	| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+	|  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+	|  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+	| [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+	|  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+}x;
+
+our $UTF8	= qr{
+	[\x09\x0A\x0D\x20-\x7E]              # ASCII
+	| $NON_ASCII_UTF8
+}x;
+
+our $typeTypedefs = qr{(?x:
+	(?:__)?(?:u|s|be|le)(?:8|16|32|64)|
+	atomic_t
+)};
+
+our $logFunctions = qr{(?x:
+	printk(?:_ratelimited|_once|)|
+	[a-z0-9]+_(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
+	WARN(?:_RATELIMIT|_ONCE|)|
+	panic|
+	MODULE_[A-Z_]+
+)};
+
+our $signature_tags = qr{(?xi:
+	Signed-off-by:|
+	Acked-by:|
+	Tested-by:|
+	Reviewed-by:|
+	Reported-by:|
+	To:|
+	Cc:
+)};
+
+our @typeList = (
+	qr{void},
+	qr{(?:unsigned\s+)?char},
+	qr{(?:unsigned\s+)?short},
+	qr{(?:unsigned\s+)?int},
+	qr{(?:unsigned\s+)?long},
+	qr{(?:unsigned\s+)?long\s+int},
+	qr{(?:unsigned\s+)?long\s+long},
+	qr{(?:unsigned\s+)?long\s+long\s+int},
+	qr{unsigned},
+	qr{float},
+	qr{double},
+	qr{bool},
+	qr{struct\s+$Ident},
+	qr{union\s+$Ident},
+	qr{enum\s+$Ident},
+	qr{${Ident}_t},
+	qr{${Ident}_handler},
+	qr{${Ident}_handler_fn},
+);
+our @modifierList = (
+	qr{fastcall},
+);
+
+our $allowed_asm_includes = qr{(?x:
+	irq|
+	memory
+)};
+# memory.h: ARM has a custom one
+
+sub build_types {
+	my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
+	my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
+	$Modifier	= qr{(?:$Attribute|$Sparse|$mods)};
+	$NonptrType	= qr{
+			(?:$Modifier\s+|const\s+)*
+			(?:
+				(?:typeof|__typeof__)\s*\([^\)]*\)|
+				(?:$typeTypedefs\b)|
+				(?:${all}\b)
+			)
+			(?:\s+$Modifier|\s+const)*
+		  }x;
+	$Type	= qr{
+			$NonptrType
+			(?:(?:\s|\*|\[\])+\s*const|(?:\s|\*|\[\])+|(?:\s*\[\s*\])+)?
+			(?:\s+$Inline|\s+$Modifier)*
+		  }x;
+	$Declare	= qr{(?:$Storage\s+)?$Type};
+}
+build_types();
+
+
+our $Typecast	= qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
+
+# Using $balanced_parens, $LvalOrFunc, or $FuncArg
+# requires at least perl version v5.10.0
+# Any use must be runtime checked with $^V
+
+our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
+our $LvalOrFunc	= qr{($Lval)\s*($balanced_parens{0,1})\s*};
+our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
+
+sub deparenthesize {
+	my ($string) = @_;
+	return "" if (!defined($string));
+	$string =~ s@^\s*\(\s*@@g;
+	$string =~ s@\s*\)\s*$@@g;
+	$string =~ s@\s+@ @g;
+	return $string;
+}
+
+$chk_signoff = 0 if ($file);
+
+my @rawlines = ();
+my @lines = ();
+my $vname;
+for my $filename (@ARGV) {
+	my $FILE;
+	if ($file) {
+		open($FILE, '-|', "diff -u /dev/null $filename") ||
+			die "$P: $filename: diff failed - $!\n";
+	} elsif ($filename eq '-') {
+		open($FILE, '<&STDIN');
+	} else {
+		open($FILE, '<', "$filename") ||
+			die "$P: $filename: open failed - $!\n";
+	}
+	if ($filename eq '-') {
+		$vname = 'Your patch';
+	} else {
+		$vname = $filename;
+	}
+	while (<$FILE>) {
+		chomp;
+		push(@rawlines, $_);
+	}
+	close($FILE);
+	if (!process($filename)) {
+		$exit = 1;
+	}
+	@rawlines = ();
+	@lines = ();
+}
+
+exit($exit);
+
+sub top_of_librecmc_tree {
+	my ($root) = @_;
+
+	my @tree_check = (
+		"BSDmakefile", "Config.in", "LICENSE", "Makefile", "README",
+		"docs", "feeds.conf.default", "include", "package", "rules.mk",
+		"scripts", "target", "toolchain", "tools"
+	);
+
+	foreach my $check (@tree_check) {
+		if (! -e $root . '/' . $check) {
+			return 0;
+		}
+	}
+	return 1;
+    }
+
+sub parse_email {
+	my ($formatted_email) = @_;
+
+	my $name = "";
+	my $address = "";
+	my $comment = "";
+
+	if ($formatted_email =~ /^(.*)<(\S+\@\S+)>(.*)$/) {
+		$name = $1;
+		$address = $2;
+		$comment = $3 if defined $3;
+	} elsif ($formatted_email =~ /^\s*<(\S+\@\S+)>(.*)$/) {
+		$address = $1;
+		$comment = $2 if defined $2;
+	} elsif ($formatted_email =~ /(\S+\@\S+)(.*)$/) {
+		$address = $1;
+		$comment = $2 if defined $2;
+		$formatted_email =~ s/$address.*$//;
+		$name = $formatted_email;
+		$name =~ s/^\s+|\s+$//g;
+		$name =~ s/^\"|\"$//g;
+		# If there's a name left after stripping spaces and
+		# leading quotes, and the address doesn't have both
+		# leading and trailing angle brackets, the address
+		# is invalid. ie:
+		#   "joe smith joe@smith.com" bad
+		#   "joe smith <joe@smith.com" bad
+		if ($name ne "" && $address !~ /^<[^>]+>$/) {
+			$name = "";
+			$address = "";
+			$comment = "";
+		}
+	}
+
+	$name =~ s/^\s+|\s+$//g;
+	$name =~ s/^\"|\"$//g;
+	$address =~ s/^\s+|\s+$//g;
+	$address =~ s/^\<|\>$//g;
+
+	if ($name =~ /[^\w \-]/i) { ##has "must quote" chars
+		$name =~ s/(?<!\\)"/\\"/g; ##escape quotes
+		$name = "\"$name\"";
+	}
+
+	return ($name, $address, $comment);
+}
+
+sub format_email {
+	my ($name, $address) = @_;
+
+	my $formatted_email;
+
+	$name =~ s/^\s+|\s+$//g;
+	$name =~ s/^\"|\"$//g;
+	$address =~ s/^\s+|\s+$//g;
+
+	if ($name =~ /[^\w \-]/i) { ##has "must quote" chars
+		$name =~ s/(?<!\\)"/\\"/g; ##escape quotes
+		$name = "\"$name\"";
+	}
+
+	if ("$name" eq "") {
+		$formatted_email = "$address";
+	} else {
+		$formatted_email = "$name <$address>";
+	}
+
+	return $formatted_email;
+}
+
+sub which_conf {
+	my ($conf) = @_;
+
+	foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) {
+		if (-e "$path/$conf") {
+			return "$path/$conf";
+		}
+	}
+
+	return "";
+}
+
+sub expand_tabs {
+	my ($str) = @_;
+
+	my $res = '';
+	my $n = 0;
+	for my $c (split(//, $str)) {
+		if ($c eq "\t") {
+			$res .= ' ';
+			$n++;
+			for (; ($n % 8) != 0; $n++) {
+				$res .= ' ';
+			}
+			next;
+		}
+		$res .= $c;
+		$n++;
+	}
+
+	return $res;
+}
+sub copy_spacing {
+	(my $res = shift) =~ tr/\t/ /c;
+	return $res;
+}
+
+sub line_stats {
+	my ($line) = @_;
+
+	# Drop the diff line leader and expand tabs
+	$line =~ s/^.//;
+	$line = expand_tabs($line);
+
+	# Pick the indent from the front of the line.
+	my ($white) = ($line =~ /^(\s*)/);
+
+	return (length($line), length($white));
+}
+
+my $sanitise_quote = '';
+
+sub sanitise_line_reset {
+	my ($in_comment) = @_;
+
+	if ($in_comment) {
+		$sanitise_quote = '*/';
+	} else {
+		$sanitise_quote = '';
+	}
+}
+sub sanitise_line {
+	my ($line) = @_;
+
+	my $res = '';
+	my $l = '';
+
+	my $qlen = 0;
+	my $off = 0;
+	my $c;
+
+	# Always copy over the diff marker.
+	$res = substr($line, 0, 1);
+
+	for ($off = 1; $off < length($line); $off++) {
+		$c = substr($line, $off, 1);
+
+		# Comments we are wacking completly including the begin
+		# and end, all to $;.
+		if ($sanitise_quote eq '' && substr($line, $off, 2) eq '/*') {
+			$sanitise_quote = '*/';
+
+			substr($res, $off, 2, "$;$;");
+			$off++;
+			next;
+		}
+		if ($sanitise_quote eq '*/' && substr($line, $off, 2) eq '*/') {
+			$sanitise_quote = '';
+			substr($res, $off, 2, "$;$;");
+			$off++;
+			next;
+		}
+		if ($sanitise_quote eq '' && substr($line, $off, 2) eq '//') {
+			$sanitise_quote = '//';
+
+			substr($res, $off, 2, $sanitise_quote);
+			$off++;
+			next;
+		}
+
+		# A \ in a string means ignore the next character.
+		if (($sanitise_quote eq "'" || $sanitise_quote eq '"') &&
+		    $c eq "\\") {
+			substr($res, $off, 2, 'XX');
+			$off++;
+			next;
+		}
+		# Regular quotes.
+		if ($c eq "'" || $c eq '"') {
+			if ($sanitise_quote eq '') {
+				$sanitise_quote = $c;
+
+				substr($res, $off, 1, $c);
+				next;
+			} elsif ($sanitise_quote eq $c) {
+				$sanitise_quote = '';
+			}
+		}
+
+		#print "c<$c> SQ<$sanitise_quote>\n";
+		if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
+			substr($res, $off, 1, $;);
+		} elsif ($off != 0 && $sanitise_quote eq '//' && $c ne "\t") {
+			substr($res, $off, 1, $;);
+		} elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
+			substr($res, $off, 1, 'X');
+		} else {
+			substr($res, $off, 1, $c);
+		}
+	}
+
+	if ($sanitise_quote eq '//') {
+		$sanitise_quote = '';
+	}
+
+	# The pathname on a #include may be surrounded by '<' and '>'.
+	if ($res =~ /^.\s*\#\s*include\s+\<(.*)\>/) {
+		my $clean = 'X' x length($1);
+		$res =~ s@\<.*\>@<$clean>@;
+
+	# The whole of a #error is a string.
+	} elsif ($res =~ /^.\s*\#\s*(?:error|warning)\s+(.*)\b/) {
+		my $clean = 'X' x length($1);
+		$res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@;
+	}
+
+	return $res;
+}
+
+sub ctx_statement_block {
+	my ($linenr, $remain, $off) = @_;
+	my $line = $linenr - 1;
+	my $blk = '';
+	my $soff = $off;
+	my $coff = $off - 1;
+	my $coff_set = 0;
+
+	my $loff = 0;
+
+	my $type = '';
+	my $level = 0;
+	my @stack = ();
+	my $p;
+	my $c;
+	my $len = 0;
+
+	my $remainder;
+	while (1) {
+		@stack = (['', 0]) if ($#stack == -1);
+
+		#warn "CSB: blk<$blk> remain<$remain>\n";
+		# If we are about to drop off the end, pull in more
+		# context.
+		if ($off >= $len) {
+			for (; $remain > 0; $line++) {
+				last if (!defined $lines[$line]);
+				next if ($lines[$line] =~ /^-/);
+				$remain--;
+				$loff = $len;
+				$blk .= $lines[$line] . "\n";
+				$len = length($blk);
+				$line++;
+				last;
+			}
+			# Bail if there is no further context.
+			#warn "CSB: blk<$blk> off<$off> len<$len>\n";
+			if ($off >= $len) {
+				last;
+			}
+			if ($level == 0 && substr($blk, $off) =~ /^.\s*#\s*define/) {
+				$level++;
+				$type = '#';
+			}
+		}
+		$p = $c;
+		$c = substr($blk, $off, 1);
+		$remainder = substr($blk, $off);
+
+		#warn "CSB: c<$c> type<$type> level<$level> remainder<$remainder> coff_set<$coff_set>\n";
+
+		# Handle nested #if/#else.
+		if ($remainder =~ /^#\s*(?:ifndef|ifdef|if)\s/) {
+			push(@stack, [ $type, $level ]);
+		} elsif ($remainder =~ /^#\s*(?:else|elif)\b/) {
+			($type, $level) = @{$stack[$#stack - 1]};
+		} elsif ($remainder =~ /^#\s*endif\b/) {
+			($type, $level) = @{pop(@stack)};
+		}
+
+		# Statement ends at the ';' or a close '}' at the
+		# outermost level.
+		if ($level == 0 && $c eq ';') {
+			last;
+		}
+
+		# An else is really a conditional as long as its not else if
+		if ($level == 0 && $coff_set == 0 &&
+				(!defined($p) || $p =~ /(?:\s|\}|\+)/) &&
+				$remainder =~ /^(else)(?:\s|{)/ &&
+				$remainder !~ /^else\s+if\b/) {
+			$coff = $off + length($1) - 1;
+			$coff_set = 1;
+			#warn "CSB: mark coff<$coff> soff<$soff> 1<$1>\n";
+			#warn "[" . substr($blk, $soff, $coff - $soff + 1) . "]\n";
+		}
+
+		if (($type eq '' || $type eq '(') && $c eq '(') {
+			$level++;
+			$type = '(';
+		}
+		if ($type eq '(' && $c eq ')') {
+			$level--;
+			$type = ($level != 0)? '(' : '';
+
+			if ($level == 0 && $coff < $soff) {
+				$coff = $off;
+				$coff_set = 1;
+				#warn "CSB: mark coff<$coff>\n";
+			}
+		}
+		if (($type eq '' || $type eq '{') && $c eq '{') {
+			$level++;
+			$type = '{';
+		}
+		if ($type eq '{' && $c eq '}') {
+			$level--;
+			$type = ($level != 0)? '{' : '';
+
+			if ($level == 0) {
+				if (substr($blk, $off + 1, 1) eq ';') {
+					$off++;
+				}
+				last;
+			}
+		}
+		# Preprocessor commands end at the newline unless escaped.
+		if ($type eq '#' && $c eq "\n" && $p ne "\\") {
+			$level--;
+			$type = '';
+			$off++;
+			last;
+		}
+		$off++;
+	}
+	# We are truly at the end, so shuffle to the next line.
+	if ($off == $len) {
+		$loff = $len + 1;
+		$line++;
+		$remain--;
+	}
+
+	my $statement = substr($blk, $soff, $off - $soff + 1);
+	my $condition = substr($blk, $soff, $coff - $soff + 1);
+
+	#warn "STATEMENT<$statement>\n";
+	#warn "CONDITION<$condition>\n";
+
+	#print "coff<$coff> soff<$off> loff<$loff>\n";
+
+	return ($statement, $condition,
+			$line, $remain + 1, $off - $loff + 1, $level);
+}
+
+sub statement_lines {
+	my ($stmt) = @_;
+
+	# Strip the diff line prefixes and rip blank lines at start and end.
+	$stmt =~ s/(^|\n)./$1/g;
+	$stmt =~ s/^\s*//;
+	$stmt =~ s/\s*$//;
+
+	my @stmt_lines = ($stmt =~ /\n/g);
+
+	return $#stmt_lines + 2;
+}
+
+sub statement_rawlines {
+	my ($stmt) = @_;
+
+	my @stmt_lines = ($stmt =~ /\n/g);
+
+	return $#stmt_lines + 2;
+}
+
+sub statement_block_size {
+	my ($stmt) = @_;
+
+	$stmt =~ s/(^|\n)./$1/g;
+	$stmt =~ s/^\s*{//;
+	$stmt =~ s/}\s*$//;
+	$stmt =~ s/^\s*//;
+	$stmt =~ s/\s*$//;
+
+	my @stmt_lines = ($stmt =~ /\n/g);
+	my @stmt_statements = ($stmt =~ /;/g);
+
+	my $stmt_lines = $#stmt_lines + 2;
+	my $stmt_statements = $#stmt_statements + 1;
+
+	if ($stmt_lines > $stmt_statements) {
+		return $stmt_lines;
+	} else {
+		return $stmt_statements;
+	}
+}
+
+sub ctx_statement_full {
+	my ($linenr, $remain, $off) = @_;
+	my ($statement, $condition, $level);
+
+	my (@chunks);
+
+	# Grab the first conditional/block pair.
+	($statement, $condition, $linenr, $remain, $off, $level) =
+				ctx_statement_block($linenr, $remain, $off);
+	#print "F: c<$condition> s<$statement> remain<$remain>\n";
+	push(@chunks, [ $condition, $statement ]);
+	if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:if|else|do)\b/s)) {
+		return ($level, $linenr, @chunks);
+	}
+
+	# Pull in the following conditional/block pairs and see if they
+	# could continue the statement.
+	for (;;) {
+		($statement, $condition, $linenr, $remain, $off, $level) =
+				ctx_statement_block($linenr, $remain, $off);
+		#print "C: c<$condition> s<$statement> remain<$remain>\n";
+		last if (!($remain > 0 && $condition =~ /^(?:\s*\n[+-])*\s*(?:else|do)\b/s));
+		#print "C: push\n";
+		push(@chunks, [ $condition, $statement ]);
+	}
+
+	return ($level, $linenr, @chunks);
+}
+
+sub ctx_block_get {
+	my ($linenr, $remain, $outer, $open, $close, $off) = @_;
+	my $line;
+	my $start = $linenr - 1;
+	my $blk = '';
+	my @o;
+	my @c;
+	my @res = ();
+
+	my $level = 0;
+	my @stack = ($level);
+	for ($line = $start; $remain > 0; $line++) {
+		next if ($rawlines[$line] =~ /^-/);
+		$remain--;
+
+		$blk .= $rawlines[$line];
+
+		# Handle nested #if/#else.
+		if ($lines[$line] =~ /^.\s*#\s*(?:ifndef|ifdef|if)\s/) {
+			push(@stack, $level);
+		} elsif ($lines[$line] =~ /^.\s*#\s*(?:else|elif)\b/) {
+			$level = $stack[$#stack - 1];
+		} elsif ($lines[$line] =~ /^.\s*#\s*endif\b/) {
+			$level = pop(@stack);
+		}
+
+		foreach my $c (split(//, $lines[$line])) {
+			##print "C<$c>L<$level><$open$close>O<$off>\n";
+			if ($off > 0) {
+				$off--;
+				next;
+			}
+
+			if ($c eq $close && $level > 0) {
+				$level--;
+				last if ($level == 0);
+			} elsif ($c eq $open) {
+				$level++;
+			}
+		}
+
+		if (!$outer || $level <= 1) {
+			push(@res, $rawlines[$line]);
+		}
+
+		last if ($level == 0);
+	}
+
+	return ($level, @res);
+}
+sub ctx_block_outer {
+	my ($linenr, $remain) = @_;
+
+	my ($level, @r) = ctx_block_get($linenr, $remain, 1, '{', '}', 0);
+	return @r;
+}
+sub ctx_block {
+	my ($linenr, $remain) = @_;
+
+	my ($level, @r) = ctx_block_get($linenr, $remain, 0, '{', '}', 0);
+	return @r;
+}
+sub ctx_statement {
+	my ($linenr, $remain, $off) = @_;
+
+	my ($level, @r) = ctx_block_get($linenr, $remain, 0, '(', ')', $off);
+	return @r;
+}
+sub ctx_block_level {
+	my ($linenr, $remain) = @_;
+
+	return ctx_block_get($linenr, $remain, 0, '{', '}', 0);
+}
+sub ctx_statement_level {
+	my ($linenr, $remain, $off) = @_;
+
+	return ctx_block_get($linenr, $remain, 0, '(', ')', $off);
+}
+
+sub ctx_locate_comment {
+	my ($first_line, $end_line) = @_;
+
+	# Catch a comment on the end of the line itself.
+	my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*(?:\\\s*)?$@);
+	return $current_comment if (defined $current_comment);
+
+	# Look through the context and try and figure out if there is a
+	# comment.
+	my $in_comment = 0;
+	$current_comment = '';
+	for (my $linenr = $first_line; $linenr < $end_line; $linenr++) {
+		my $line = $rawlines[$linenr - 1];
+		#warn "           $line\n";
+		if ($linenr == $first_line and $line =~ m@^.\s*\*@) {
+			$in_comment = 1;
+		}
+		if ($line =~ m@/\*@) {
+			$in_comment = 1;
+		}
+		if (!$in_comment && $current_comment ne '') {
+			$current_comment = '';
+		}
+		$current_comment .= $line . "\n" if ($in_comment);
+		if ($line =~ m@\*/@) {
+			$in_comment = 0;
+		}
+	}
+
+	chomp($current_comment);
+	return($current_comment);
+}
+sub ctx_has_comment {
+	my ($first_line, $end_line) = @_;
+	my $cmt = ctx_locate_comment($first_line, $end_line);
+
+	##print "LINE: $rawlines[$end_line - 1 ]\n";
+	##print "CMMT: $cmt\n";
+
+	return ($cmt ne '');
+}
+
+sub raw_line {
+	my ($linenr, $cnt) = @_;
+
+	my $offset = $linenr - 1;
+	$cnt++;
+
+	my $line;
+	while ($cnt) {
+		$line = $rawlines[$offset++];
+		next if (defined($line) && $line =~ /^-/);
+		$cnt--;
+	}
+
+	return $line;
+}
+
+sub cat_vet {
+	my ($vet) = @_;
+	my ($res, $coded);
+
+	$res = '';
+	while ($vet =~ /([^[:cntrl:]]*)([[:cntrl:]]|$)/g) {
+		$res .= $1;
+		if ($2 ne '') {
+			$coded = sprintf("^%c", unpack('C', $2) + 64);
+			$res .= $coded;
+		}
+	}
+	$res =~ s/$/\$/;
+
+	return $res;
+}
+
+my $av_preprocessor = 0;
+my $av_pending;
+my @av_paren_type;
+my $av_pend_colon;
+
+sub annotate_reset {
+	$av_preprocessor = 0;
+	$av_pending = '_';
+	@av_paren_type = ('E');
+	$av_pend_colon = 'O';
+}
+
+sub annotate_values {
+	my ($stream, $type) = @_;
+
+	my $res;
+	my $var = '_' x length($stream);
+	my $cur = $stream;
+
+	print "$stream\n" if ($dbg_values > 1);
+
+	while (length($cur)) {
+		@av_paren_type = ('E') if ($#av_paren_type < 0);
+		print " <" . join('', @av_paren_type) .
+				"> <$type> <$av_pending>" if ($dbg_values > 1);
+		if ($cur =~ /^(\s+)/o) {
+			print "WS($1)\n" if ($dbg_values > 1);
+			if ($1 =~ /\n/ && $av_preprocessor) {
+				$type = pop(@av_paren_type);
+				$av_preprocessor = 0;
+			}
+
+		} elsif ($cur =~ /^(\(\s*$Type\s*)\)/ && $av_pending eq '_') {
+			print "CAST($1)\n" if ($dbg_values > 1);
+			push(@av_paren_type, $type);
+			$type = 'c';
+
+		} elsif ($cur =~ /^($Type)\s*(?:$Ident|,|\)|\(|\s*$)/) {
+			print "DECLARE($1)\n" if ($dbg_values > 1);
+			$type = 'T';
+
+		} elsif ($cur =~ /^($Modifier)\s*/) {
+			print "MODIFIER($1)\n" if ($dbg_values > 1);
+			$type = 'T';
+
+		} elsif ($cur =~ /^(\#\s*define\s*$Ident)(\(?)/o) {
+			print "DEFINE($1,$2)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+			push(@av_paren_type, $type);
+			if ($2 ne '') {
+				$av_pending = 'N';
+			}
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\#\s*(?:undef\s*$Ident|include\b))/o) {
+			print "UNDEF($1)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+			push(@av_paren_type, $type);
+
+		} elsif ($cur =~ /^(\#\s*(?:ifdef|ifndef|if))/o) {
+			print "PRE_START($1)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+
+			push(@av_paren_type, $type);
+			push(@av_paren_type, $type);
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\#\s*(?:else|elif))/o) {
+			print "PRE_RESTART($1)\n" if ($dbg_values > 1);
+			$av_preprocessor = 1;
+
+			push(@av_paren_type, $av_paren_type[$#av_paren_type]);
+
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\#\s*(?:endif))/o) {
+			print "PRE_END($1)\n" if ($dbg_values > 1);
+
+			$av_preprocessor = 1;
+
+			# Assume all arms of the conditional end as this
+			# one does, and continue as if the #endif was not here.
+			pop(@av_paren_type);
+			push(@av_paren_type, $type);
+			$type = 'E';
+
+		} elsif ($cur =~ /^(\\\n)/o) {
+			print "PRECONT($1)\n" if ($dbg_values > 1);
+
+		} elsif ($cur =~ /^(__attribute__)\s*\(?/o) {
+			print "ATTR($1)\n" if ($dbg_values > 1);
+			$av_pending = $type;
+			$type = 'N';
+
+		} elsif ($cur =~ /^(sizeof)\s*(\()?/o) {
+			print "SIZEOF($1)\n" if ($dbg_values > 1);
+			if (defined $2) {
+				$av_pending = 'V';
+			}
+			$type = 'N';
+
+		} elsif ($cur =~ /^(if|while|for)\b/o) {
+			print "COND($1)\n" if ($dbg_values > 1);
+			$av_pending = 'E';
+			$type = 'N';
+
+		} elsif ($cur =~/^(case)/o) {
+			print "CASE($1)\n" if ($dbg_values > 1);
+			$av_pend_colon = 'C';
+			$type = 'N';
+
+		} elsif ($cur =~/^(return|else|goto|typeof|__typeof__)\b/o) {
+			print "KEYWORD($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~ /^(\()/o) {
+			print "PAREN('$1')\n" if ($dbg_values > 1);
+			push(@av_paren_type, $av_pending);
+			$av_pending = '_';
+			$type = 'N';
+
+		} elsif ($cur =~ /^(\))/o) {
+			my $new_type = pop(@av_paren_type);
+			if ($new_type ne '_') {
+				$type = $new_type;
+				print "PAREN('$1') -> $type\n"
+							if ($dbg_values > 1);
+			} else {
+				print "PAREN('$1')\n" if ($dbg_values > 1);
+			}
+
+		} elsif ($cur =~ /^($Ident)\s*\(/o) {
+			print "FUNC($1)\n" if ($dbg_values > 1);
+			$type = 'V';
+			$av_pending = 'V';
+
+		} elsif ($cur =~ /^($Ident\s*):(?:\s*\d+\s*(,|=|;))?/) {
+			if (defined $2 && $type eq 'C' || $type eq 'T') {
+				$av_pend_colon = 'B';
+			} elsif ($type eq 'E') {
+				$av_pend_colon = 'L';
+			}
+			print "IDENT_COLON($1,$type>$av_pend_colon)\n" if ($dbg_values > 1);
+			$type = 'V';
+
+		} elsif ($cur =~ /^($Ident|$Constant)/o) {
+			print "IDENT($1)\n" if ($dbg_values > 1);
+			$type = 'V';
+
+		} elsif ($cur =~ /^($Assignment)/o) {
+			print "ASSIGN($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~/^(;|{|})/) {
+			print "END($1)\n" if ($dbg_values > 1);
+			$type = 'E';
+			$av_pend_colon = 'O';
+
+		} elsif ($cur =~/^(,)/) {
+			print "COMMA($1)\n" if ($dbg_values > 1);
+			$type = 'C';
+
+		} elsif ($cur =~ /^(\?)/o) {
+			print "QUESTION($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~ /^(:)/o) {
+			print "COLON($1,$av_pend_colon)\n" if ($dbg_values > 1);
+
+			substr($var, length($res), 1, $av_pend_colon);
+			if ($av_pend_colon eq 'C' || $av_pend_colon eq 'L') {
+				$type = 'E';
+			} else {
+				$type = 'N';
+			}
+			$av_pend_colon = 'O';
+
+		} elsif ($cur =~ /^(\[)/o) {
+			print "CLOSE($1)\n" if ($dbg_values > 1);
+			$type = 'N';
+
+		} elsif ($cur =~ /^(-(?![->])|\+(?!\+)|\*|\&\&|\&)/o) {
+			my $variant;
+
+			print "OPV($1)\n" if ($dbg_values > 1);
+			if ($type eq 'V') {
+				$variant = 'B';
+			} else {
+				$variant = 'U';
+			}
+
+			substr($var, length($res), 1, $variant);
+			$type = 'N';
+
+		} elsif ($cur =~ /^($Operators)/o) {
+			print "OP($1)\n" if ($dbg_values > 1);
+			if ($1 ne '++' && $1 ne '--') {
+				$type = 'N';
+			}
+
+		} elsif ($cur =~ /(^.)/o) {
+			print "C($1)\n" if ($dbg_values > 1);
+		}
+		if (defined $1) {
+			$cur = substr($cur, length($1));
+			$res .= $type x length($1);
+		}
+	}
+
+	return ($res, $var);
+}
+
+sub possible {
+	my ($possible, $line) = @_;
+	my $notPermitted = qr{(?:
+		^(?:
+			$Modifier|
+			$Storage|
+			$Type|
+			DEFINE_\S+
+		)$|
+		^(?:
+			goto|
+			return|
+			case|
+			else|
+			asm|__asm__|
+			do|
+			\#|
+			\#\#|
+		)(?:\s|$)|
+		^(?:typedef|struct|enum)\b
+	    )}x;
+	warn "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
+	if ($possible !~ $notPermitted) {
+		# Check for modifiers.
+		$possible =~ s/\s*$Storage\s*//g;
+		$possible =~ s/\s*$Sparse\s*//g;
+		if ($possible =~ /^\s*$/) {
+
+		} elsif ($possible =~ /\s/) {
+			$possible =~ s/\s*$Type\s*//g;
+			for my $modifier (split(' ', $possible)) {
+				if ($modifier !~ $notPermitted) {
+					warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);
+					push(@modifierList, $modifier);
+				}
+			}
+
+		} else {
+			warn "POSSIBLE: $possible ($line)\n" if ($dbg_possible);
+			push(@typeList, $possible);
+		}
+		build_types();
+	} else {
+		warn "NOTPOSS: $possible ($line)\n" if ($dbg_possible > 1);
+	}
+}
+
+my $prefix = '';
+
+sub show_type {
+       return !defined $ignore_type{$_[0]};
+}
+
+sub report {
+	if (!show_type($_[1]) ||
+	    (defined $tst_only && $_[2] !~ /\Q$tst_only\E/)) {
+		return 0;
+	}
+	my $line;
+	if ($show_types) {
+		$line = "$prefix$_[0]:$_[1]: $_[2]\n";
+	} else {
+		$line = "$prefix$_[0]: $_[2]\n";
+	}
+	$line = (split('\n', $line))[0] . "\n" if ($terse);
+
+	push(our @report, $line);
+
+	return 1;
+}
+sub report_dump {
+	our @report;
+}
+
+sub ERROR {
+	if (report("ERROR", $_[0], $_[1])) {
+		our $clean = 0;
+		our $cnt_error++;
+	}
+}
+sub WARN {
+	if (report("WARNING", $_[0], $_[1])) {
+		our $clean = 0;
+		our $cnt_warn++;
+	}
+}
+sub CHK {
+	if ($check && report("CHECK", $_[0], $_[1])) {
+		our $clean = 0;
+		our $cnt_chk++;
+	}
+}
+
+sub check_absolute_file {
+	my ($absolute, $herecurr) = @_;
+	my $file = $absolute;
+
+	##print "absolute<$absolute>\n";
+
+	# See if any suffix of this path is a path within the tree.
+	while ($file =~ s@^[^/]*/@@) {
+		if (-f "$root/$file") {
+			##print "file<$file>\n";
+			last;
+		}
+	}
+	if (! -f _)  {
+		return 0;
+	}
+
+	# It is, so see if the prefix is acceptable.
+	my $prefix = $absolute;
+	substr($prefix, -length($file)) = '';
+
+	##print "prefix<$prefix>\n";
+	if ($prefix ne ".../") {
+		WARN("USE_RELATIVE_PATH",
+		     "use relative pathname instead of absolute in changelog text\n" . $herecurr);
+	}
+}
+
+sub pos_last_openparen {
+	my ($line) = @_;
+
+	my $pos = 0;
+
+	my $opens = $line =~ tr/\(/\(/;
+	my $closes = $line =~ tr/\)/\)/;
+
+	my $last_openparen = 0;
+
+	if (($opens == 0) || ($closes >= $opens)) {
+		return -1;
+	}
+
+	my $len = length($line);
+
+	for ($pos = 0; $pos < $len; $pos++) {
+		my $string = substr($line, $pos);
+		if ($string =~ /^($FuncArg|$balanced_parens)/) {
+			$pos += length($1) - 1;
+		} elsif (substr($line, $pos, 1) eq '(') {
+			$last_openparen = $pos;
+		} elsif (index($string, '(') == -1) {
+			last;
+		}
+	}
+
+	return $last_openparen + 1;
+}
+
+sub process {
+	my $filename = shift;
+
+	my $linenr=0;
+	my $prevline="";
+	my $prevrawline="";
+	my $stashline="";
+	my $stashrawline="";
+
+	my $length;
+	my $indent;
+	my $previndent=0;
+	my $stashindent=0;
+
+	our $clean = 1;
+	my $signoff = 0;
+	my $is_patch = 0;
+
+	my $in_header_lines = 1;
+	my $in_commit_log = 0;		#Scanning lines before patch
+
+	our @report = ();
+	our $cnt_lines = 0;
+	our $cnt_error = 0;
+	our $cnt_warn = 0;
+	our $cnt_chk = 0;
+
+	# Trace the real file/line as we go.
+	my $realfile = '';
+	my $realline = 0;
+	my $realcnt = 0;
+	my $here = '';
+	my $in_comment = 0;
+	my $comment_edge = 0;
+	my $first_line = 0;
+	my $p1_prefix = '';
+
+	my $prev_values = 'E';
+
+	# suppression flags
+	my %suppress_ifbraces;
+	my %suppress_whiletrailers;
+	my %suppress_export;
+	my $suppress_statement = 0;
+
+	# Pre-scan the patch sanitizing the lines.
+	sanitise_line_reset();
+	my $line;
+	foreach my $rawline (@rawlines) {
+		$linenr++;
+		$line = $rawline;
+
+		if ($rawline=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
+			$realline=$1-1;
+			if (defined $2) {
+				$realcnt=$3+1;
+			} else {
+				$realcnt=1+1;
+			}
+			$in_comment = 0;
+
+			# Guestimate if this is a continuing comment.  Run
+			# the context looking for a comment "edge".  If this
+			# edge is a close comment then we must be in a comment
+			# at context start.
+			my $edge;
+			my $cnt = $realcnt;
+			for (my $ln = $linenr + 1; $cnt > 0; $ln++) {
+				next if (defined $rawlines[$ln - 1] &&
+					 $rawlines[$ln - 1] =~ /^-/);
+				$cnt--;
+				#print "RAW<$rawlines[$ln - 1]>\n";
+				last if (!defined $rawlines[$ln - 1]);
+				if ($rawlines[$ln - 1] =~ m@(/\*|\*/)@ &&
+				    $rawlines[$ln - 1] !~ m@"[^"]*(?:/\*|\*/)[^"]*"@) {
+					($edge) = $1;
+					last;
+				}
+			}
+			if (defined $edge && $edge eq '*/') {
+				$in_comment = 1;
+			}
+
+			# Guestimate if this is a continuing comment.  If this
+			# is the start of a diff block and this line starts
+			# ' *' then it is very likely a comment.
+			if (!defined $edge &&
+			    $rawlines[$linenr] =~ m@^.\s*(?:\*\*+| \*)(?:\s|$)@)
+			{
+				$in_comment = 1;
+			}
+
+			##print "COMMENT:$in_comment edge<$edge> $rawline\n";
+			sanitise_line_reset($in_comment);
+
+		} elsif ($realcnt && $rawline =~ /^(?:\+| |$)/) {
+			# Standardise the strings and chars within the input to
+			# simplify matching -- only bother with positive lines.
+			$line = sanitise_line($rawline);
+		}
+		push(@lines, $line);
+
+		if ($realcnt > 1) {
+			$realcnt-- if ($line =~ /^(?:\+| |$)/);
+		} else {
+			$realcnt = 0;
+		}
+
+		#print "==>$rawline\n";
+		#print "-->$line\n";
+	}
+
+	$prefix = '';
+
+	$realcnt = 0;
+	$linenr = 0;
+	foreach my $line (@lines) {
+		$linenr++;
+
+		my $rawline = $rawlines[$linenr - 1];
+
+#extract the line range in the file after the patch is applied
+		if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
+			$is_patch = 1;
+			$first_line = $linenr + 1;
+			$realline=$1-1;
+			if (defined $2) {
+				$realcnt=$3+1;
+			} else {
+				$realcnt=1+1;
+			}
+			annotate_reset();
+			$prev_values = 'E';
+
+			%suppress_ifbraces = ();
+			%suppress_whiletrailers = ();
+			%suppress_export = ();
+			$suppress_statement = 0;
+			next;
+
+# track the line number as we move through the hunk, note that
+# new versions of GNU diff omit the leading space on completely
+# blank context lines so we need to count that too.
+		} elsif ($line =~ /^( |\+|$)/) {
+			$realline++;
+			$realcnt-- if ($realcnt != 0);
+
+			# Measure the line length and indent.
+			($length, $indent) = line_stats($rawline);
+
+			# Track the previous line.
+			($prevline, $stashline) = ($stashline, $line);
+			($previndent, $stashindent) = ($stashindent, $indent);
+			($prevrawline, $stashrawline) = ($stashrawline, $rawline);
+
+			#warn "line<$line>\n";
+
+		} elsif ($realcnt == 1) {
+			$realcnt--;
+		}
+
+		my $hunk_line = ($realcnt != 0);
+
+#make up the handle for any error we report on this line
+		$prefix = "$filename:$realline: " if ($emacs && $file);
+		$prefix = "$filename:$linenr: " if ($emacs && !$file);
+
+		$here = "#$linenr: " if (!$file);
+		$here = "#$realline: " if ($file);
+
+		# extract the filename as it passes
+		if ($line =~ /^diff --git.*?(\S+)$/) {
+			$realfile = $1;
+			$realfile =~ s@^([^/]*)/@@;
+			$in_commit_log = 0;
+		} elsif ($line =~ /^\+\+\+\s+(\S+)/) {
+			$realfile = $1;
+			$realfile =~ s@^([^/]*)/@@;
+			$in_commit_log = 0;
+
+			$p1_prefix = $1;
+			if (!$file && $tree && $p1_prefix ne '' &&
+			    -e "$root/$p1_prefix") {
+				WARN("PATCH_PREFIX",
+				     "patch prefix '$p1_prefix' exists, appears to be a -p0 patch\n");
+			}
+
+			if ($realfile =~ m@^include/asm/@) {
+				ERROR("MODIFIED_INCLUDE_ASM",
+				      "do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
+			}
+			next;
+		}
+
+		$here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
+
+		my $hereline = "$here\n$rawline\n";
+		my $herecurr = "$here\n$rawline\n";
+		my $hereprev = "$here\n$prevrawline\n$rawline\n";
+
+		$cnt_lines++ if ($realcnt != 0);
+
+# Check for incorrect file permissions
+		if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) {
+			my $permhere = $here . "FILE: $realfile\n";
+			if ($realfile =~ /(Makefile|Kconfig|\.c|\.h|\.S|\.tmpl)$/) {
+				ERROR("EXECUTE_PERMISSIONS",
+				      "do not set execute permissions for source files\n" . $permhere);
+			}
+		}
+
+# Check the patch for a signoff:
+		if ($line =~ /^\s*signed-off-by:/i) {
+			$signoff++;
+			$in_commit_log = 0;
+		}
+
+# Check signature styles
+		if (!$in_header_lines &&
+		    $line =~ /^(\s*)($signature_tags)(\s*)(.*)/) {
+			my $space_before = $1;
+			my $sign_off = $2;
+			my $space_after = $3;
+			my $email = $4;
+			my $ucfirst_sign_off = ucfirst(lc($sign_off));
+
+			if (defined $space_before && $space_before ne "") {
+				WARN("BAD_SIGN_OFF",
+				     "Do not use whitespace before $ucfirst_sign_off\n" . $herecurr);
+			}
+			if ($sign_off =~ /-by:$/i && $sign_off ne $ucfirst_sign_off) {
+				WARN("BAD_SIGN_OFF",
+				     "'$ucfirst_sign_off' is the preferred signature form\n" . $herecurr);
+			}
+			if (!defined $space_after || $space_after ne " ") {
+				WARN("BAD_SIGN_OFF",
+				     "Use a single space after $ucfirst_sign_off\n" . $herecurr);
+			}
+
+			my ($email_name, $email_address, $comment) = parse_email($email);
+			my $suggested_email = format_email(($email_name, $email_address));
+			if ($suggested_email eq "") {
+				ERROR("BAD_SIGN_OFF",
+				      "Unrecognized email address: '$email'\n" . $herecurr);
+			} else {
+				my $dequoted = $suggested_email;
+				$dequoted =~ s/^"//;
+				$dequoted =~ s/" </ </;
+				# Don't force email to have quotes
+				# Allow just an angle bracketed address
+				if ("$dequoted$comment" ne $email &&
+				    "<$email_address>$comment" ne $email &&
+				    "$suggested_email$comment" ne $email) {
+					WARN("BAD_SIGN_OFF",
+					     "email address '$email' might be better as '$suggested_email$comment'\n" . $herecurr);
+				}
+			}
+		}
+
+# Check for wrappage within a valid hunk of the file
+		if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
+			ERROR("CORRUPTED_PATCH",
+			      "patch seems to be corrupt (line wrapped?)\n" .
+				$herecurr) if (!$emitted_corrupt++);
+		}
+
+# Check for absolute kernel paths.
+		if ($tree) {
+			while ($line =~ m{(?:^|\s)(/\S*)}g) {
+				my $file = $1;
+
+				if ($file =~ m{^(.*?)(?::\d+)+:?$} &&
+				    check_absolute_file($1, $herecurr)) {
+					#
+				} else {
+					check_absolute_file($file, $herecurr);
+				}
+			}
+		}
+
+# UTF-8 regex found at http://www.w3.org/International/questions/qa-forms-utf-8.en.php
+		if (($realfile =~ /^$/ || $line =~ /^\+/) &&
+		    $rawline !~ m/^$UTF8*$/) {
+			my ($utf8_prefix) = ($rawline =~ /^($UTF8*)/);
+
+			my $blank = copy_spacing($rawline);
+			my $ptr = substr($blank, 0, length($utf8_prefix)) . "^";
+			my $hereptr = "$hereline$ptr\n";
+
+			CHK("INVALID_UTF8",
+			    "Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
+		}
+
+# Check if it's the start of a commit log
+# (not a header line and we haven't seen the patch filename)
+		if ($in_header_lines && $realfile =~ /^$/ &&
+		    $rawline !~ /^(commit\b|from\b|[\w-]+:).+$/i) {
+			$in_header_lines = 0;
+			$in_commit_log = 1;
+		}
+
+# Still not yet in a patch, check for any UTF-8
+		if ($in_commit_log && $realfile =~ /^$/ &&
+		    $rawline =~ /$NON_ASCII_UTF8/) {
+			CHK("UTF8_BEFORE_PATCH",
+			    "8-bit UTF-8 used in possible commit log\n" . $herecurr);
+		}
+
+# ignore non-hunk lines and lines being removed
+		next if (!$hunk_line || $line =~ /^-/);
+
+#trailing whitespace
+		if ($line =~ /^\+.*\015/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			ERROR("DOS_LINE_ENDINGS",
+			      "DOS line endings\n" . $herevet);
+
+		} elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			ERROR("TRAILING_WHITESPACE",
+			      "trailing whitespace\n" . $herevet);
+			$rpt_cleaners = 1;
+		}
+
+# check for Kconfig help text having a real description
+# Only applies when adding the entry originally, after that we do not have
+# sufficient context to determine whether it is indeed long enough.
+		if ($realfile =~ /Kconfig/ &&
+		    $line =~ /.\s*config\s+/) {
+			my $length = 0;
+			my $cnt = $realcnt;
+			my $ln = $linenr + 1;
+			my $f;
+			my $is_start = 0;
+			my $is_end = 0;
+			for (; $cnt > 0 && defined $lines[$ln - 1]; $ln++) {
+				$f = $lines[$ln - 1];
+				$cnt-- if ($lines[$ln - 1] !~ /^-/);
+				$is_end = $lines[$ln - 1] =~ /^\+/;
+
+				next if ($f =~ /^-/);
+
+				if ($lines[$ln - 1] =~ /.\s*(?:bool|tristate)\s*\"/) {
+					$is_start = 1;
+				} elsif ($lines[$ln - 1] =~ /.\s*(?:---)?help(?:---)?$/) {
+					$length = -1;
+				}
+
+				$f =~ s/^.//;
+				$f =~ s/#.*//;
+				$f =~ s/^\s+//;
+				next if ($f =~ /^$/);
+				if ($f =~ /^\s*config\s/) {
+					$is_end = 1;
+					last;
+				}
+				$length++;
+			}
+			WARN("CONFIG_DESCRIPTION",
+			     "please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_start && $is_end && $length < 4);
+			#print "is_start<$is_start> is_end<$is_end> length<$length>\n";
+		}
+
+		if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
+		    ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {
+			my $flag = $1;
+			my $replacement = {
+				'EXTRA_AFLAGS' =>   'asflags-y',
+				'EXTRA_CFLAGS' =>   'ccflags-y',
+				'EXTRA_CPPFLAGS' => 'cppflags-y',
+				'EXTRA_LDFLAGS' =>  'ldflags-y',
+			};
+
+			WARN("DEPRECATED_VARIABLE",
+			     "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
+		}
+
+# check we are in a valid source file if not then ignore this hunk
+		next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
+
+#80 column limit
+		if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
+		    $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
+		    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
+		    $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
+		    $length > 80)
+		{
+			WARN("LONG_LINE",
+			     "line over 80 characters\n" . $herecurr);
+		}
+
+# Check for user-visible strings broken across lines, which breaks the ability
+# to grep for the string.  Limited to strings used as parameters (those
+# following an open parenthesis), which almost completely eliminates false
+# positives, as well as warning only once per parameter rather than once per
+# line of the string.  Make an exception when the previous string ends in a
+# newline (multiple lines in one string constant) or \n\t (common in inline
+# assembly to indent the instruction on the following line).
+		if ($line =~ /^\+\s*"/ &&
+		    $prevline =~ /"\s*$/ &&
+		    $prevline =~ /\(/ &&
+		    $prevrawline !~ /\\n(?:\\t)*"\s*$/) {
+			WARN("SPLIT_STRING",
+			     "quoted string split across lines\n" . $hereprev);
+		}
+
+# check for spaces before a quoted newline
+		if ($rawline =~ /^.*\".*\s\\n/) {
+			WARN("QUOTED_WHITESPACE_BEFORE_NEWLINE",
+			     "unnecessary whitespace before a quoted newline\n" . $herecurr);
+		}
+
+# check for adding lines without a newline.
+		if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) {
+			WARN("MISSING_EOF_NEWLINE",
+			     "adding a line without newline at end of file\n" . $herecurr);
+		}
+
+# Blackfin: use hi/lo macros
+		if ($realfile =~ m@arch/blackfin/.*\.S$@) {
+			if ($line =~ /\.[lL][[:space:]]*=.*&[[:space:]]*0x[fF][fF][fF][fF]/) {
+				my $herevet = "$here\n" . cat_vet($line) . "\n";
+				ERROR("LO_MACRO",
+				      "use the LO() macro, not (... & 0xFFFF)\n" . $herevet);
+			}
+			if ($line =~ /\.[hH][[:space:]]*=.*>>[[:space:]]*16/) {
+				my $herevet = "$here\n" . cat_vet($line) . "\n";
+				ERROR("HI_MACRO",
+				      "use the HI() macro, not (... >> 16)\n" . $herevet);
+			}
+		}
+
+# check we are in a valid source file C or perl if not then ignore this hunk
+		next if ($realfile !~ /\.(h|c|pl)$/);
+
+# at the beginning of a line any tabs must come first and anything
+# more than 8 must use tabs.
+		if ($rawline =~ /^\+\s* \t\s*\S/ ||
+		    $rawline =~ /^\+\s*        \s*/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			ERROR("CODE_INDENT",
+			      "code indent should use tabs where possible\n" . $herevet);
+			$rpt_cleaners = 1;
+		}
+
+# check for space before tabs.
+		if ($rawline =~ /^\+/ && $rawline =~ / \t/) {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			WARN("SPACE_BEFORE_TAB",
+			     "please, no space before tabs\n" . $herevet);
+		}
+
+# check for && or || at the start of a line
+		if ($rawline =~ /^\+\s*(&&|\|\|)/) {
+			CHK("LOGICAL_CONTINUATIONS",
+			    "Logical continuations should be on the previous line\n" . $hereprev);
+		}
+
+# check multi-line statement indentation matches previous line
+		if ($^V && $^V ge 5.10.0 &&
+		    $prevline =~ /^\+(\t*)(if \(|$Ident\().*(\&\&|\|\||,)\s*$/) {
+			$prevline =~ /^\+(\t*)(.*)$/;
+			my $oldindent = $1;
+			my $rest = $2;
+
+			my $pos = pos_last_openparen($rest);
+			if ($pos >= 0) {
+				$line =~ /^\+([ \t]*)/;
+				my $newindent = $1;
+
+				my $goodtabindent = $oldindent .
+					"\t" x ($pos / 8) .
+					" "  x ($pos % 8);
+				my $goodspaceindent = $oldindent . " "  x $pos;
+
+				if ($newindent ne $goodtabindent &&
+				    $newindent ne $goodspaceindent) {
+					CHK("PARENTHESIS_ALIGNMENT",
+					    "Alignment should match open parenthesis\n" . $hereprev);
+				}
+			}
+		}
+
+		if ($line =~ /^\+.*\*[ \t]*\)[ \t]+/) {
+			CHK("SPACING",
+			    "No space is necessary after a cast\n" . $hereprev);
+		}
+
+		if ($rawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
+		    $prevrawline =~ /^\+[ \t]*$/) {
+			CHK("BLOCK_COMMENT_STYLE",
+			    "Don't begin block comments with only a /* line, use /* comment...\n" . $hereprev);
+		}
+
+# check for spaces at the beginning of a line.
+# Exceptions:
+#  1) within comments
+#  2) indented preprocessor commands
+#  3) hanging labels
+		if ($rawline =~ /^\+ / && $line !~ /\+ *(?:$;|#|$Ident:)/)  {
+			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+			WARN("LEADING_SPACE",
+			     "please, no spaces at the start of a line\n" . $herevet);
+		}
+
+# check we are in a valid C source file if not then ignore this hunk
+		next if ($realfile !~ /\.(h|c)$/);
+
+# check for RCS/CVS revision markers
+		if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|)/) {
+			WARN("CVS_KEYWORD",
+			     "CVS style keyword markers, these will _not_ be updated\n". $herecurr);
+		}
+
+# Blackfin: don't use __builtin_bfin_[cs]sync
+		if ($line =~ /__builtin_bfin_csync/) {
+			my $herevet = "$here\n" . cat_vet($line) . "\n";
+			ERROR("CSYNC",
+			      "use the CSYNC() macro in asm/blackfin.h\n" . $herevet);
+		}
+		if ($line =~ /__builtin_bfin_ssync/) {
+			my $herevet = "$here\n" . cat_vet($line) . "\n";
+			ERROR("SSYNC",
+			      "use the SSYNC() macro in asm/blackfin.h\n" . $herevet);
+		}
+
+# Check for potential 'bare' types
+		my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
+		    $realline_next);
+#print "LINE<$line>\n";
+		if ($linenr >= $suppress_statement &&
+		    $realcnt && $line =~ /.\s*\S/) {
+			($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+				ctx_statement_block($linenr, $realcnt, 0);
+			$stat =~ s/\n./\n /g;
+			$cond =~ s/\n./\n /g;
+
+#print "linenr<$linenr> <$stat>\n";
+			# If this statement has no statement boundaries within
+			# it there is no point in retrying a statement scan
+			# until we hit end of it.
+			my $frag = $stat; $frag =~ s/;+\s*$//;
+			if ($frag !~ /(?:{|;)/) {
+#print "skip<$line_nr_next>\n";
+				$suppress_statement = $line_nr_next;
+			}
+
+			# Find the real next line.
+			$realline_next = $line_nr_next;
+			if (defined $realline_next &&
+			    (!defined $lines[$realline_next - 1] ||
+			     substr($lines[$realline_next - 1], $off_next) =~ /^\s*$/)) {
+				$realline_next++;
+			}
+
+			my $s = $stat;
+			$s =~ s/{.*$//s;
+
+			# Ignore goto labels.
+			if ($s =~ /$Ident:\*$/s) {
+
+			# Ignore functions being called
+			} elsif ($s =~ /^.\s*$Ident\s*\(/s) {
+
+			} elsif ($s =~ /^.\s*else\b/s) {
+
+			# declarations always start with types
+			} elsif ($prev_values eq 'E' && $s =~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?((?:\s*$Ident)+?)\b(?:\s+$Sparse)?\s*\**\s*(?:$Ident|\(\*[^\)]*\))(?:\s*$Modifier)?\s*(?:;|=|,|\()/s) {
+				my $type = $1;
+				$type =~ s/\s+/ /g;
+				possible($type, "A:" . $s);
+
+			# definitions in global scope can only start with types
+			} elsif ($s =~ /^.(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?($Ident)\b\s*(?!:)/s) {
+				possible($1, "B:" . $s);
+			}
+
+			# any (foo ... *) is a pointer cast, and foo is a type
+			while ($s =~ /\(($Ident)(?:\s+$Sparse)*[\s\*]+\s*\)/sg) {
+				possible($1, "C:" . $s);
+			}
+
+			# Check for any sort of function declaration.
+			# int foo(something bar, other baz);
+			# void (*store_gdt)(x86_descr_ptr *);
+			if ($prev_values eq 'E' && $s =~ /^(.(?:typedef\s*)?(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*(?:\b$Ident|\(\*\s*$Ident\))\s*)\(/s) {
+				my ($name_len) = length($1);
+
+				my $ctx = $s;
+				substr($ctx, 0, $name_len + 1, '');
+				$ctx =~ s/\)[^\)]*$//;
+
+				for my $arg (split(/\s*,\s*/, $ctx)) {
+					if ($arg =~ /^(?:const\s+)?($Ident)(?:\s+$Sparse)*\s*\**\s*(:?\b$Ident)?$/s || $arg =~ /^($Ident)$/s) {
+
+						possible($1, "D:" . $s);
+					}
+				}
+			}
+
+		}
+
+#
+# Checks which may be anchored in the context.
+#
+
+# Check for switch () and associated case and default
+# statements should be at the same indent.
+		if ($line=~/\bswitch\s*\(.*\)/) {
+			my $err = '';
+			my $sep = '';
+			my @ctx = ctx_block_outer($linenr, $realcnt);
+			shift(@ctx);
+			for my $ctx (@ctx) {
+				my ($clen, $cindent) = line_stats($ctx);
+				if ($ctx =~ /^\+\s*(case\s+|default:)/ &&
+							$indent != $cindent) {
+					$err .= "$sep$ctx\n";
+					$sep = '';
+				} else {
+					$sep = "[...]\n";
+				}
+			}
+			if ($err ne '') {
+				ERROR("SWITCH_CASE_INDENT_LEVEL",
+				      "switch and case should be at the same indent\n$hereline$err");
+			}
+		}
+
+# if/while/etc brace do not go on next line, unless defining a do while loop,
+# or if that brace on the next line is for something else
+		if ($line =~ /(.*)\b((?:if|while|for|switch)\s*\(|do\b|else\b)/ && $line !~ /^.\s*\#/) {
+			my $pre_ctx = "$1$2";
+
+			my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0);
+
+			if ($line =~ /^\+\t{6,}/) {
+				WARN("DEEP_INDENTATION",
+				     "Too many leading tabs - consider code refactoring\n" . $herecurr);
+			}
+
+			my $ctx_cnt = $realcnt - $#ctx - 1;
+			my $ctx = join("\n", @ctx);
+
+			my $ctx_ln = $linenr;
+			my $ctx_skip = $realcnt;
+
+			while ($ctx_skip > $ctx_cnt || ($ctx_skip == $ctx_cnt &&
+					defined $lines[$ctx_ln - 1] &&
+					$lines[$ctx_ln - 1] =~ /^-/)) {
+				##print "SKIP<$ctx_skip> CNT<$ctx_cnt>\n";
+				$ctx_skip-- if (!defined $lines[$ctx_ln - 1] || $lines[$ctx_ln - 1] !~ /^-/);
+				$ctx_ln++;
+			}
+
+			#print "realcnt<$realcnt> ctx_cnt<$ctx_cnt>\n";
+			#print "pre<$pre_ctx>\nline<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>\n";
+
+			if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln -1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) {
+				ERROR("OPEN_BRACE",
+				      "that open brace { should be on the previous line\n" .
+					"$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
+			}
+			if ($level == 0 && $pre_ctx !~ /}\s*while\s*\($/ &&
+			    $ctx =~ /\)\s*\;\s*$/ &&
+			    defined $lines[$ctx_ln - 1])
+			{
+				my ($nlength, $nindent) = line_stats($lines[$ctx_ln - 1]);
+				if ($nindent > $indent) {
+					WARN("TRAILING_SEMICOLON",
+					     "trailing semicolon indicates no statements, indent implies otherwise\n" .
+						"$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
+				}
+			}
+		}
+
+# Check relative indent for conditionals and blocks.
+		if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
+			($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+				ctx_statement_block($linenr, $realcnt, 0)
+					if (!defined $stat);
+			my ($s, $c) = ($stat, $cond);
+
+			substr($s, 0, length($c), '');
+
+			# Make sure we remove the line prefixes as we have
+			# none on the first line, and are going to readd them
+			# where necessary.
+			$s =~ s/\n./\n/gs;
+
+			# Find out how long the conditional actually is.
+			my @newlines = ($c =~ /\n/gs);
+			my $cond_lines = 1 + $#newlines;
+
+			# We want to check the first line inside the block
+			# starting at the end of the conditional, so remove:
+			#  1) any blank line termination
+			#  2) any opening brace { on end of the line
+			#  3) any do (...) {
+			my $continuation = 0;
+			my $check = 0;
+			$s =~ s/^.*\bdo\b//;
+			$s =~ s/^\s*{//;
+			if ($s =~ s/^\s*\\//) {
+				$continuation = 1;
+			}
+			if ($s =~ s/^\s*?\n//) {
+				$check = 1;
+				$cond_lines++;
+			}
+
+			# Also ignore a loop construct at the end of a
+			# preprocessor statement.
+			if (($prevline =~ /^.\s*#\s*define\s/ ||
+			    $prevline =~ /\\\s*$/) && $continuation == 0) {
+				$check = 0;
+			}
+
+			my $cond_ptr = -1;
+			$continuation = 0;
+			while ($cond_ptr != $cond_lines) {
+				$cond_ptr = $cond_lines;
+
+				# If we see an #else/#elif then the code
+				# is not linear.
+				if ($s =~ /^\s*\#\s*(?:else|elif)/) {
+					$check = 0;
+				}
+
+				# Ignore:
+				#  1) blank lines, they should be at 0,
+				#  2) preprocessor lines, and
+				#  3) labels.
+				if ($continuation ||
+				    $s =~ /^\s*?\n/ ||
+				    $s =~ /^\s*#\s*?/ ||
+				    $s =~ /^\s*$Ident\s*:/) {
+					$continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
+					if ($s =~ s/^.*?\n//) {
+						$cond_lines++;
+					}
+				}
+			}
+
+			my (undef, $sindent) = line_stats("+" . $s);
+			my $stat_real = raw_line($linenr, $cond_lines);
+
+			# Check if either of these lines are modified, else
+			# this is not this patch's fault.
+			if (!defined($stat_real) ||
+			    $stat !~ /^\+/ && $stat_real !~ /^\+/) {
+				$check = 0;
+			}
+			if (defined($stat_real) && $cond_lines > 1) {
+				$stat_real = "[...]\n$stat_real";
+			}
+
+			#print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";
+
+			if ($check && (($sindent % 8) != 0 ||
+			    ($sindent <= $indent && $s ne ''))) {
+				WARN("SUSPECT_CODE_INDENT",
+				     "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");
+			}
+		}
+
+		# Track the 'values' across context and added lines.
+		my $opline = $line; $opline =~ s/^./ /;
+		my ($curr_values, $curr_vars) =
+				annotate_values($opline . "\n", $prev_values);
+		$curr_values = $prev_values . $curr_values;
+		if ($dbg_values) {
+			my $outline = $opline; $outline =~ s/\t/ /g;
+			print "$linenr > .$outline\n";
+			print "$linenr > $curr_values\n";
+			print "$linenr >  $curr_vars\n";
+		}
+		$prev_values = substr($curr_values, -1);
+
+#ignore lines not being added
+		if ($line=~/^[^\+]/) {next;}
+
+# TEST: allow direct testing of the type matcher.
+		if ($dbg_type) {
+			if ($line =~ /^.\s*$Declare\s*$/) {
+				ERROR("TEST_TYPE",
+				      "TEST: is type\n" . $herecurr);
+			} elsif ($dbg_type > 1 && $line =~ /^.+($Declare)/) {
+				ERROR("TEST_NOT_TYPE",
+				      "TEST: is not type ($1 is)\n". $herecurr);
+			}
+			next;
+		}
+# TEST: allow direct testing of the attribute matcher.
+		if ($dbg_attr) {
+			if ($line =~ /^.\s*$Modifier\s*$/) {
+				ERROR("TEST_ATTR",
+				      "TEST: is attr\n" . $herecurr);
+			} elsif ($dbg_attr > 1 && $line =~ /^.+($Modifier)/) {
+				ERROR("TEST_NOT_ATTR",
+				      "TEST: is not attr ($1 is)\n". $herecurr);
+			}
+			next;
+		}
+
+# check for initialisation to aggregates open brace on the next line
+		if ($line =~ /^.\s*{/ &&
+		    $prevline =~ /(?:^|[^=])=\s*$/) {
+			ERROR("OPEN_BRACE",
+			      "that open brace { should be on the previous line\n" . $hereprev);
+		}
+
+#
+# Checks which are anchored on the added line.
+#
+
+# check for malformed paths in #include statements (uses RAW line)
+		if ($rawline =~ m{^.\s*\#\s*include\s+[<"](.*)[">]}) {
+			my $path = $1;
+			if ($path =~ m{//}) {
+				ERROR("MALFORMED_INCLUDE",
+				      "malformed #include filename\n" .
+					$herecurr);
+			}
+		}
+
+# no C99 // comments
+		if ($line =~ m{//}) {
+			ERROR("C99_COMMENTS",
+			      "do not use C99 // comments\n" . $herecurr);
+		}
+		# Remove C99 comments.
+		$line =~ s@//.*@@;
+		$opline =~ s@//.*@@;
+
+# EXPORT_SYMBOL should immediately follow the thing it is exporting, consider
+# the whole statement.
+#print "APW <$lines[$realline_next - 1]>\n";
+		if (defined $realline_next &&
+		    exists $lines[$realline_next - 1] &&
+		    !defined $suppress_export{$realline_next} &&
+		    ($lines[$realline_next - 1] =~ /EXPORT_SYMBOL.*\((.*)\)/ ||
+		     $lines[$realline_next - 1] =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
+			# Handle definitions which produce identifiers with
+			# a prefix:
+			#   XXX(foo);
+			#   EXPORT_SYMBOL(something_foo);
+			my $name = $1;
+			if ($stat =~ /^(?:.\s*}\s*\n)?.([A-Z_]+)\s*\(\s*($Ident)/ &&
+			    $name =~ /^${Ident}_$2/) {
+#print "FOO C name<$name>\n";
+				$suppress_export{$realline_next} = 1;
+
+			} elsif ($stat !~ /(?:
+				\n.}\s*$|
+				^.DEFINE_$Ident\(\Q$name\E\)|
+				^.DECLARE_$Ident\(\Q$name\E\)|
+				^.LIST_HEAD\(\Q$name\E\)|
+				^.(?:$Storage\s+)?$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(|
+				\b\Q$name\E(?:\s+$Attribute)*\s*(?:;|=|\[|\()
+			    )/x) {
+#print "FOO A<$lines[$realline_next - 1]> stat<$stat> name<$name>\n";
+				$suppress_export{$realline_next} = 2;
+			} else {
+				$suppress_export{$realline_next} = 1;
+			}
+		}
+		if (!defined $suppress_export{$linenr} &&
+		    $prevline =~ /^.\s*$/ &&
+		    ($line =~ /EXPORT_SYMBOL.*\((.*)\)/ ||
+		     $line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
+#print "FOO B <$lines[$linenr - 1]>\n";
+			$suppress_export{$linenr} = 2;
+		}
+		if (defined $suppress_export{$linenr} &&
+		    $suppress_export{$linenr} == 2) {
+			WARN("EXPORT_SYMBOL",
+			     "EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
+		}
+
+# check for global initialisers.
+		if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) {
+			ERROR("GLOBAL_INITIALISERS",
+			      "do not initialise globals to 0 or NULL\n" .
+				$herecurr);
+		}
+# check for static initialisers.
+		if ($line =~ /\bstatic\s.*=\s*(0|NULL|false)\s*;/) {
+			ERROR("INITIALISED_STATIC",
+			      "do not initialise statics to 0 or NULL\n" .
+				$herecurr);
+		}
+
+# check for static const char * arrays.
+		if ($line =~ /\bstatic\s+const\s+char\s*\*\s*(\w+)\s*\[\s*\]\s*=\s*/) {
+			WARN("STATIC_CONST_CHAR_ARRAY",
+			     "static const char * array should probably be static const char * const\n" .
+				$herecurr);
+               }
+
+# check for static char foo[] = "bar" declarations.
+		if ($line =~ /\bstatic\s+char\s+(\w+)\s*\[\s*\]\s*=\s*"/) {
+			WARN("STATIC_CONST_CHAR_ARRAY",
+			     "static char array declaration should probably be static const char\n" .
+				$herecurr);
+               }
+
+# check for declarations of struct pci_device_id
+		if ($line =~ /\bstruct\s+pci_device_id\s+\w+\s*\[\s*\]\s*\=\s*\{/) {
+			WARN("DEFINE_PCI_DEVICE_TABLE",
+			     "Use DEFINE_PCI_DEVICE_TABLE for struct pci_device_id\n" . $herecurr);
+		}
+
+# check for new typedefs, only function parameters and sparse annotations
+# make sense.
+		if ($line =~ /\btypedef\s/ &&
+		    $line !~ /\btypedef\s+$Type\s*\(\s*\*?$Ident\s*\)\s*\(/ &&
+		    $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ &&
+		    $line !~ /\b$typeTypedefs\b/ &&
+		    $line !~ /\b__bitwise(?:__|)\b/) {
+			WARN("NEW_TYPEDEFS",
+			     "do not add new typedefs\n" . $herecurr);
+		}
+
+# * goes on variable not on type
+		# (char*[ const])
+		while ($line =~ m{(\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\))}g) {
+			#print "AA<$1>\n";
+			my ($from, $to) = ($2, $2);
+
+			# Should start with a space.
+			$to =~ s/^(\S)/ $1/;
+			# Should not end with a space.
+			$to =~ s/\s+$//;
+			# '*'s should not have spaces between.
+			while ($to =~ s/\*\s+\*/\*\*/) {
+			}
+
+			#print "from<$from> to<$to>\n";
+			if ($from ne $to) {
+				ERROR("POINTER_LOCATION",
+				      "\"(foo$from)\" should be \"(foo$to)\"\n" .  $herecurr);
+			}
+		}
+		while ($line =~ m{(\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident))}g) {
+			#print "BB<$1>\n";
+			my ($from, $to, $ident) = ($2, $2, $3);
+
+			# Should start with a space.
+			$to =~ s/^(\S)/ $1/;
+			# Should not end with a space.
+			$to =~ s/\s+$//;
+			# '*'s should not have spaces between.
+			while ($to =~ s/\*\s+\*/\*\*/) {
+			}
+			# Modifiers should have spaces.
+			$to =~ s/(\b$Modifier$)/$1 /;
+
+			#print "from<$from> to<$to> ident<$ident>\n";
+			if ($from ne $to && $ident !~ /^$Modifier$/) {
+				ERROR("POINTER_LOCATION",
+				      "\"foo${from}bar\" should be \"foo${to}bar\"\n" .  $herecurr);
+			}
+		}
+
+# # no BUG() or BUG_ON()
+#		if ($line =~ /\b(BUG|BUG_ON)\b/) {
+#			print "Try to use WARN_ON & Recovery code rather than BUG() or BUG_ON()\n";
+#			print "$herecurr";
+#			$clean = 0;
+#		}
+
+		if ($line =~ /\bLINUX_VERSION_CODE\b/) {
+			WARN("LINUX_VERSION_CODE",
+			     "LINUX_VERSION_CODE should be avoided, code should be for the version to which it is merged\n" . $herecurr);
+		}
+
+# check for uses of printk_ratelimit
+		if ($line =~ /\bprintk_ratelimit\s*\(/) {
+			WARN("PRINTK_RATELIMITED",
+"Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);
+		}
+
+# printk should use KERN_* levels.  Note that follow on printk's on the
+# same line do not need a level, so we use the current block context
+# to try and find and validate the current printk.  In summary the current
+# printk includes all preceding printk's which have no newline on the end.
+# we assume the first bad printk is the one to report.
+		if ($line =~ /\bprintk\((?!KERN_)\s*"/) {
+			my $ok = 0;
+			for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) {
+				#print "CHECK<$lines[$ln - 1]\n";
+				# we have a preceding printk if it ends
+				# with "\n" ignore it, else it is to blame
+				if ($lines[$ln - 1] =~ m{\bprintk\(}) {
+					if ($rawlines[$ln - 1] !~ m{\\n"}) {
+						$ok = 1;
+					}
+					last;
+				}
+			}
+			if ($ok == 0) {
+				WARN("PRINTK_WITHOUT_KERN_LEVEL",
+				     "printk() should include KERN_ facility level\n" . $herecurr);
+			}
+		}
+
+# function brace can't be on same line, except for #defines of do while,
+# or if closed on same line
+		if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
+		    !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {
+			ERROR("OPEN_BRACE",
+			      "open brace '{' following function declarations go on the next line\n" . $herecurr);
+		}
+
+# open braces for enum, union and struct go on the same line.
+		if ($line =~ /^.\s*{/ &&
+		    $prevline =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?\s*$/) {
+			ERROR("OPEN_BRACE",
+			      "open brace '{' following $1 go on the same line\n" . $hereprev);
+		}
+
+# missing space after union, struct or enum definition
+		if ($line =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?(?:\s+$Ident)?[=\{]/) {
+		    WARN("SPACING",
+			 "missing space after $1 definition\n" . $herecurr);
+		}
+
+# check for spacing round square brackets; allowed:
+#  1. with a type on the left -- int [] a;
+#  2. at the beginning of a line for slice initialisers -- [0...10] = 5,
+#  3. inside a curly brace -- = { [0...10] = 5 }
+		while ($line =~ /(.*?\s)\[/g) {
+			my ($where, $prefix) = ($-[1], $1);
+			if ($prefix !~ /$Type\s+$/ &&
+			    ($where != 0 || $prefix !~ /^.\s+$/) &&
+			    $prefix !~ /[{,]\s+$/) {
+				ERROR("BRACKET_SPACE",
+				      "space prohibited before open square bracket '['\n" . $herecurr);
+			}
+		}
+
+# check for spaces between functions and their parentheses.
+		while ($line =~ /($Ident)\s+\(/g) {
+			my $name = $1;
+			my $ctx_before = substr($line, 0, $-[1]);
+			my $ctx = "$ctx_before$name";
+
+			# Ignore those directives where spaces _are_ permitted.
+			if ($name =~ /^(?:
+				if|for|while|switch|return|case|
+				volatile|__volatile__|
+				__attribute__|format|__extension__|
+				asm|__asm__)$/x)
+			{
+
+			# cpp #define statements have non-optional spaces, ie
+			# if there is a space between the name and the open
+			# parenthesis it is simply not a parameter group.
+			} elsif ($ctx_before =~ /^.\s*\#\s*define\s*$/) {
+
+			# cpp #elif statement condition may start with a (
+			} elsif ($ctx =~ /^.\s*\#\s*elif\s*$/) {
+
+			# If this whole things ends with a type its most
+			# likely a typedef for a function.
+			} elsif ($ctx =~ /$Type$/) {
+
+			} else {
+				WARN("SPACING",
+				     "space prohibited between function name and open parenthesis '('\n" . $herecurr);
+			}
+		}
+# Check operator spacing.
+		if (!($line=~/\#\s*include/)) {
+			my $ops = qr{
+				<<=|>>=|<=|>=|==|!=|
+				\+=|-=|\*=|\/=|%=|\^=|\|=|&=|
+				=>|->|<<|>>|<|>|=|!|~|
+				&&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%|
+				\?|:
+			}x;
+			my @elements = split(/($ops|;)/, $opline);
+			my $off = 0;
+
+			my $blank = copy_spacing($opline);
+
+			for (my $n = 0; $n < $#elements; $n += 2) {
+				$off += length($elements[$n]);
+
+				# Pick up the preceding and succeeding characters.
+				my $ca = substr($opline, 0, $off);
+				my $cc = '';
+				if (length($opline) >= ($off + length($elements[$n + 1]))) {
+					$cc = substr($opline, $off + length($elements[$n + 1]));
+				}
+				my $cb = "$ca$;$cc";
+
+				my $a = '';
+				$a = 'V' if ($elements[$n] ne '');
+				$a = 'W' if ($elements[$n] =~ /\s$/);
+				$a = 'C' if ($elements[$n] =~ /$;$/);
+				$a = 'B' if ($elements[$n] =~ /(\[|\()$/);
+				$a = 'O' if ($elements[$n] eq '');
+				$a = 'E' if ($ca =~ /^\s*$/);
+
+				my $op = $elements[$n + 1];
+
+				my $c = '';
+				if (defined $elements[$n + 2]) {
+					$c = 'V' if ($elements[$n + 2] ne '');
+					$c = 'W' if ($elements[$n + 2] =~ /^\s/);
+					$c = 'C' if ($elements[$n + 2] =~ /^$;/);
+					$c = 'B' if ($elements[$n + 2] =~ /^(\)|\]|;)/);
+					$c = 'O' if ($elements[$n + 2] eq '');
+					$c = 'E' if ($elements[$n + 2] =~ /^\s*\\$/);
+				} else {
+					$c = 'E';
+				}
+
+				my $ctx = "${a}x${c}";
+
+				my $at = "(ctx:$ctx)";
+
+				my $ptr = substr($blank, 0, $off) . "^";
+				my $hereptr = "$hereline$ptr\n";
+
+				# Pull out the value of this operator.
+				my $op_type = substr($curr_values, $off + 1, 1);
+
+				# Get the full operator variant.
+				my $opv = $op . substr($curr_vars, $off, 1);
+
+				# Ignore operators passed as parameters.
+				if ($op_type ne 'V' &&
+				    $ca =~ /\s$/ && $cc =~ /^\s*,/) {
+
+#				# Ignore comments
+#				} elsif ($op =~ /^$;+$/) {
+
+				# ; should have either the end of line or a space or \ after it
+				} elsif ($op eq ';') {
+					if ($ctx !~ /.x[WEBC]/ &&
+					    $cc !~ /^\\/ && $cc !~ /^;/) {
+						ERROR("SPACING",
+						      "space required after that '$op' $at\n" . $hereptr);
+					}
+
+				# // is a comment
+				} elsif ($op eq '//') {
+
+				# No spaces for:
+				#   ->
+				#   :   when part of a bitfield
+				} elsif ($op eq '->' || $opv eq ':B') {
+					if ($ctx =~ /Wx.|.xW/) {
+						ERROR("SPACING",
+						      "spaces prohibited around that '$op' $at\n" . $hereptr);
+					}
+
+				# , must have a space on the right.
+				} elsif ($op eq ',') {
+					if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) {
+						ERROR("SPACING",
+						      "space required after that '$op' $at\n" . $hereptr);
+					}
+
+				# '*' as part of a type definition -- reported already.
+				} elsif ($opv eq '*_') {
+					#warn "'*' is part of type\n";
+
+				# unary operators should have a space before and
+				# none after.  May be left adjacent to another
+				# unary operator, or a cast
+				} elsif ($op eq '!' || $op eq '~' ||
+					 $opv eq '*U' || $opv eq '-U' ||
+					 $opv eq '&U' || $opv eq '&&U') {
+					if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) {
+						ERROR("SPACING",
+						      "space required before that '$op' $at\n" . $hereptr);
+					}
+					if ($op eq '*' && $cc =~/\s*$Modifier\b/) {
+						# A unary '*' may be const
+
+					} elsif ($ctx =~ /.xW/) {
+						ERROR("SPACING",
+						      "space prohibited after that '$op' $at\n" . $hereptr);
+					}
+
+				# unary ++ and unary -- are allowed no space on one side.
+				} elsif ($op eq '++' or $op eq '--') {
+					if ($ctx !~ /[WEOBC]x[^W]/ && $ctx !~ /[^W]x[WOBEC]/) {
+						ERROR("SPACING",
+						      "space required one side of that '$op' $at\n" . $hereptr);
+					}
+					if ($ctx =~ /Wx[BE]/ ||
+					    ($ctx =~ /Wx./ && $cc =~ /^;/)) {
+						ERROR("SPACING",
+						      "space prohibited before that '$op' $at\n" . $hereptr);
+					}
+					if ($ctx =~ /ExW/) {
+						ERROR("SPACING",
+						      "space prohibited after that '$op' $at\n" . $hereptr);
+					}
+
+
+				# << and >> may either have or not have spaces both sides
+				} elsif ($op eq '<<' or $op eq '>>' or
+					 $op eq '&' or $op eq '^' or $op eq '|' or
+					 $op eq '+' or $op eq '-' or
+					 $op eq '*' or $op eq '/' or
+					 $op eq '%')
+				{
+					if ($ctx =~ /Wx[^WCE]|[^WCE]xW/) {
+						ERROR("SPACING",
+						      "need consistent spacing around '$op' $at\n" .
+							$hereptr);
+					}
+
+				# A colon needs no spaces before when it is
+				# terminating a case value or a label.
+				} elsif ($opv eq ':C' || $opv eq ':L') {
+					if ($ctx =~ /Wx./) {
+						ERROR("SPACING",
+						      "space prohibited before that '$op' $at\n" . $hereptr);
+					}
+
+				# All the others need spaces both sides.
+				} elsif ($ctx !~ /[EWC]x[CWE]/) {
+					my $ok = 0;
+
+					# Ignore email addresses <foo@bar>
+					if (($op eq '<' &&
+					     $cc =~ /^\S+\@\S+>/) ||
+					    ($op eq '>' &&
+					     $ca =~ /<\S+\@\S+$/))
+					{
+						$ok = 1;
+					}
+
+					# Ignore ?:
+					if (($opv eq ':O' && $ca =~ /\?$/) ||
+					    ($op eq '?' && $cc =~ /^:/)) {
+						$ok = 1;
+					}
+
+					if ($ok == 0) {
+						ERROR("SPACING",
+						      "spaces required around that '$op' $at\n" . $hereptr);
+					}
+				}
+				$off += length($elements[$n + 1]);
+			}
+		}
+
+# check for multiple assignments
+		if ($line =~ /^.\s*$Lval\s*=\s*$Lval\s*=(?!=)/) {
+			CHK("MULTIPLE_ASSIGNMENTS",
+			    "multiple assignments should be avoided\n" . $herecurr);
+		}
+
+## # check for multiple declarations, allowing for a function declaration
+## # continuation.
+##		if ($line =~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Ident.*/ &&
+##		    $line !~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Type\s*$Ident.*/) {
+##
+##			# Remove any bracketed sections to ensure we do not
+##			# falsly report the parameters of functions.
+##			my $ln = $line;
+##			while ($ln =~ s/\([^\(\)]*\)//g) {
+##			}
+##			if ($ln =~ /,/) {
+##				WARN("MULTIPLE_DECLARATION",
+##				     "declaring multiple variables together should be avoided\n" . $herecurr);
+##			}
+##		}
+
+#need space before brace following if, while, etc
+		if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
+		    $line =~ /do{/) {
+			ERROR("SPACING",
+			      "space required before the open brace '{'\n" . $herecurr);
+		}
+
+# closing brace should have a space following it when it has anything
+# on the line
+		if ($line =~ /}(?!(?:,|;|\)))\S/) {
+			ERROR("SPACING",
+			      "space required after that close brace '}'\n" . $herecurr);
+		}
+
+# check spacing on square brackets
+		if ($line =~ /\[\s/ && $line !~ /\[\s*$/) {
+			ERROR("SPACING",
+			      "space prohibited after that open square bracket '['\n" . $herecurr);
+		}
+		if ($line =~ /\s\]/) {
+			ERROR("SPACING",
+			      "space prohibited before that close square bracket ']'\n" . $herecurr);
+		}
+
+# check spacing on parentheses
+		if ($line =~ /\(\s/ && $line !~ /\(\s*(?:\\)?$/ &&
+		    $line !~ /for\s*\(\s+;/) {
+			ERROR("SPACING",
+			      "space prohibited after that open parenthesis '('\n" . $herecurr);
+		}
+		if ($line =~ /(\s+)\)/ && $line !~ /^.\s*\)/ &&
+		    $line !~ /for\s*\(.*;\s+\)/ &&
+		    $line !~ /:\s+\)/) {
+			ERROR("SPACING",
+			      "space prohibited before that close parenthesis ')'\n" . $herecurr);
+		}
+
+#goto labels aren't indented, allow a single space however
+		if ($line=~/^.\s+[A-Za-z\d_]+:(?![0-9]+)/ and
+		   !($line=~/^. [A-Za-z\d_]+:/) and !($line=~/^.\s+default:/)) {
+			WARN("INDENTED_LABEL",
+			     "labels should not be indented\n" . $herecurr);
+		}
+
+# Return is not a function.
+		if (defined($stat) && $stat =~ /^.\s*return(\s*)(\(.*);/s) {
+			my $spacing = $1;
+			my $value = $2;
+
+			# Flatten any parentheses
+			$value =~ s/\(/ \(/g;
+			$value =~ s/\)/\) /g;
+			while ($value =~ s/\[[^\[\]]*\]/1/ ||
+			       $value !~ /(?:$Ident|-?$Constant)\s*
+					     $Compare\s*
+					     (?:$Ident|-?$Constant)/x &&
+			       $value =~ s/\([^\(\)]*\)/1/) {
+			}
+#print "value<$value>\n";
+			if ($value =~ /^\s*(?:$Ident|-?$Constant)\s*$/) {
+				ERROR("RETURN_PARENTHESES",
+				      "return is not a function, parentheses are not required\n" . $herecurr);
+
+			} elsif ($spacing !~ /\s+/) {
+				ERROR("SPACING",
+				      "space required before the open parenthesis '('\n" . $herecurr);
+			}
+		}
+# Return of what appears to be an errno should normally be -'ve
+		if ($line =~ /^.\s*return\s*(E[A-Z]*)\s*;/) {
+			my $name = $1;
+			if ($name ne 'EOF' && $name ne 'ERROR') {
+				WARN("USE_NEGATIVE_ERRNO",
+				     "return of an errno should typically be -ve (return -$1)\n" . $herecurr);
+			}
+		}
+
+# Need a space before open parenthesis after if, while etc
+		if ($line=~/\b(if|while|for|switch)\(/) {
+			ERROR("SPACING", "space required before the open parenthesis '('\n" . $herecurr);
+		}
+
+# Check for illegal assignment in if conditional -- and check for trailing
+# statements after the conditional.
+		if ($line =~ /do\s*(?!{)/) {
+			($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+				ctx_statement_block($linenr, $realcnt, 0)
+					if (!defined $stat);
+			my ($stat_next) = ctx_statement_block($line_nr_next,
+						$remain_next, $off_next);
+			$stat_next =~ s/\n./\n /g;
+			##print "stat<$stat> stat_next<$stat_next>\n";
+
+			if ($stat_next =~ /^\s*while\b/) {
+				# If the statement carries leading newlines,
+				# then count those as offsets.
+				my ($whitespace) =
+					($stat_next =~ /^((?:\s*\n[+-])*\s*)/s);
+				my $offset =
+					statement_rawlines($whitespace) - 1;
+
+				$suppress_whiletrailers{$line_nr_next +
+								$offset} = 1;
+			}
+		}
+		if (!defined $suppress_whiletrailers{$linenr} &&
+		    $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
+			my ($s, $c) = ($stat, $cond);
+
+			if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s) {
+				ERROR("ASSIGN_IN_IF",
+				      "do not use assignment in if condition\n" . $herecurr);
+			}
+
+			# Find out what is on the end of the line after the
+			# conditional.
+			substr($s, 0, length($c), '');
+			$s =~ s/\n.*//g;
+			$s =~ s/$;//g;	# Remove any comments
+			if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
+			    $c !~ /}\s*while\s*/)
+			{
+				# Find out how long the conditional actually is.
+				my @newlines = ($c =~ /\n/gs);
+				my $cond_lines = 1 + $#newlines;
+				my $stat_real = '';
+
+				$stat_real = raw_line($linenr, $cond_lines)
+							. "\n" if ($cond_lines);
+				if (defined($stat_real) && $cond_lines > 1) {
+					$stat_real = "[...]\n$stat_real";
+				}
+
+				ERROR("TRAILING_STATEMENTS",
+				      "trailing statements should be on next line\n" . $herecurr . $stat_real);
+			}
+		}
+
+# Check for bitwise tests written as boolean
+		if ($line =~ /
+			(?:
+				(?:\[|\(|\&\&|\|\|)
+				\s*0[xX][0-9]+\s*
+				(?:\&\&|\|\|)
+			|
+				(?:\&\&|\|\|)
+				\s*0[xX][0-9]+\s*
+				(?:\&\&|\|\||\)|\])
+			)/x)
+		{
+			WARN("HEXADECIMAL_BOOLEAN_TEST",
+			     "boolean test with hexadecimal, perhaps just 1 \& or \|?\n" . $herecurr);
+		}
+
+# if and else should not have general statements after it
+		if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) {
+			my $s = $1;
+			$s =~ s/$;//g;	# Remove any comments
+			if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) {
+				ERROR("TRAILING_STATEMENTS",
+				      "trailing statements should be on next line\n" . $herecurr);
+			}
+		}
+# if should not continue a brace
+		if ($line =~ /}\s*if\b/) {
+			ERROR("TRAILING_STATEMENTS",
+			      "trailing statements should be on next line\n" .
+				$herecurr);
+		}
+# case and default should not have general statements after them
+		if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
+		    $line !~ /\G(?:
+			(?:\s*$;*)(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
+			\s*return\s+
+		    )/xg)
+		{
+			ERROR("TRAILING_STATEMENTS",
+			      "trailing statements should be on next line\n" . $herecurr);
+		}
+
+		# Check for }<nl>else {, these must be at the same
+		# indent level to be relevant to each other.
+		if ($prevline=~/}\s*$/ and $line=~/^.\s*else\s*/ and
+						$previndent == $indent) {
+			ERROR("ELSE_AFTER_BRACE",
+			      "else should follow close brace '}'\n" . $hereprev);
+		}
+
+		if ($prevline=~/}\s*$/ and $line=~/^.\s*while\s*/ and
+						$previndent == $indent) {
+			my ($s, $c) = ctx_statement_block($linenr, $realcnt, 0);
+
+			# Find out what is on the end of the line after the
+			# conditional.
+			substr($s, 0, length($c), '');
+			$s =~ s/\n.*//g;
+
+			if ($s =~ /^\s*;/) {
+				ERROR("WHILE_AFTER_BRACE",
+				      "while should follow close brace '}'\n" . $hereprev);
+			}
+		}
+
+#studly caps, commented out until figure out how to distinguish between use of existing and adding new
+#		if (($line=~/[\w_][a-z\d]+[A-Z]/) and !($line=~/print/)) {
+#		    print "No studly caps, use _\n";
+#		    print "$herecurr";
+#		    $clean = 0;
+#		}
+
+#no spaces allowed after \ in define
+		if ($line=~/\#\s*define.*\\\s$/) {
+			WARN("WHITESPACE_AFTER_LINE_CONTINUATION",
+			     "Whitepspace after \\ makes next lines useless\n" . $herecurr);
+		}
+
+#warn if <asm/foo.h> is #included and <linux/foo.h> is available (uses RAW line)
+		if ($tree && $rawline =~ m{^.\s*\#\s*include\s*\<asm\/(.*)\.h\>}) {
+			my $file = "$1.h";
+			my $checkfile = "include/linux/$file";
+			if (-f "$root/$checkfile" &&
+			    $realfile ne $checkfile &&
+			    $1 !~ /$allowed_asm_includes/)
+			{
+				if ($realfile =~ m{^arch/}) {
+					CHK("ARCH_INCLUDE_LINUX",
+					    "Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+				} else {
+					WARN("INCLUDE_LINUX",
+					     "Use #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+				}
+			}
+		}
+
+# multi-statement macros should be enclosed in a do while loop, grab the
+# first statement and ensure its the whole macro if its not enclosed
+# in a known good container
+		if ($realfile !~ m@/vmlinux.lds.h$@ &&
+		    $line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
+			my $ln = $linenr;
+			my $cnt = $realcnt;
+			my ($off, $dstat, $dcond, $rest);
+			my $ctx = '';
+			($dstat, $dcond, $ln, $cnt, $off) =
+				ctx_statement_block($linenr, $realcnt, 0);
+			$ctx = $dstat;
+			#print "dstat<$dstat> dcond<$dcond> cnt<$cnt> off<$off>\n";
+			#print "LINE<$lines[$ln-1]> len<" . length($lines[$ln-1]) . "\n";
+
+			$dstat =~ s/^.\s*\#\s*define\s+$Ident(?:\([^\)]*\))?\s*//;
+			$dstat =~ s/$;//g;
+			$dstat =~ s/\\\n.//g;
+			$dstat =~ s/^\s*//s;
+			$dstat =~ s/\s*$//s;
+
+			# Flatten any parentheses and braces
+			while ($dstat =~ s/\([^\(\)]*\)/1/ ||
+			       $dstat =~ s/\{[^\{\}]*\}/1/ ||
+			       $dstat =~ s/\[[^\[\]]*\]/1/)
+			{
+			}
+
+			# Flatten any obvious string concatentation.
+			while ($dstat =~ s/("X*")\s*$Ident/$1/ ||
+			       $dstat =~ s/$Ident\s*("X*")/$1/)
+			{
+			}
+
+			my $exceptions = qr{
+				$Declare|
+				module_param_named|
+				MODULE_PARAM_DESC|
+				DECLARE_PER_CPU|
+				DEFINE_PER_CPU|
+				__typeof__\(|
+				union|
+				struct|
+				\.$Ident\s*=\s*|
+				^\"|\"$
+			}x;
+			#print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
+			if ($dstat ne '' &&
+			    $dstat !~ /^(?:$Ident|-?$Constant),$/ &&			# 10, // foo(),
+			    $dstat !~ /^(?:$Ident|-?$Constant);$/ &&			# foo();
+			    $dstat !~ /^[!~-]?(?:$Ident|$Constant)$/ &&		# 10 // foo() // !foo // ~foo // -foo
+			    $dstat !~ /^'X'$/ &&					# character constants
+			    $dstat !~ /$exceptions/ &&
+			    $dstat !~ /^\.$Ident\s*=/ &&				# .foo =
+			    $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ &&	# do {...} while (...); // do {...} while (...)
+			    $dstat !~ /^for\s*$Constant$/ &&				# for (...)
+			    $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&	# for (...) bar()
+			    $dstat !~ /^do\s*{/ &&					# do {...
+			    $dstat !~ /^\({/)						# ({...
+			{
+				$ctx =~ s/\n*$//;
+				my $herectx = $here . "\n";
+				my $cnt = statement_rawlines($ctx);
+
+				for (my $n = 0; $n < $cnt; $n++) {
+					$herectx .= raw_line($linenr, $n) . "\n";
+				}
+
+				if ($dstat =~ /;/) {
+					ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
+					      "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx");
+				} else {
+					ERROR("COMPLEX_MACRO",
+					      "Macros with complex values should be enclosed in parenthesis\n" . "$herectx");
+				}
+			}
+		}
+
+# make sure symbols are always wrapped with VMLINUX_SYMBOL() ...
+# all assignments may have only one of the following with an assignment:
+#	.
+#	ALIGN(...)
+#	VMLINUX_SYMBOL(...)
+		if ($realfile eq 'vmlinux.lds.h' && $line =~ /(?:(?:^|\s)$Ident\s*=|=\s*$Ident(?:\s|$))/) {
+			WARN("MISSING_VMLINUX_SYMBOL",
+			     "vmlinux.lds.h needs VMLINUX_SYMBOL() around C-visible symbols\n" . $herecurr);
+		}
+
+# check for redundant bracing round if etc
+		if ($line =~ /(^.*)\bif\b/ && $1 !~ /else\s*$/) {
+			my ($level, $endln, @chunks) =
+				ctx_statement_full($linenr, $realcnt, 1);
+			#print "chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n";
+			#print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n";
+			if ($#chunks > 0 && $level == 0) {
+				my @allowed = ();
+				my $allow = 0;
+				my $seen = 0;
+				my $herectx = $here . "\n";
+				my $ln = $linenr - 1;
+				for my $chunk (@chunks) {
+					my ($cond, $block) = @{$chunk};
+
+					# If the condition carries leading newlines, then count those as offsets.
+					my ($whitespace) = ($cond =~ /^((?:\s*\n[+-])*\s*)/s);
+					my $offset = statement_rawlines($whitespace) - 1;
+
+					$allowed[$allow] = 0;
+					#print "COND<$cond> whitespace<$whitespace> offset<$offset>\n";
+
+					# We have looked at and allowed this specific line.
+					$suppress_ifbraces{$ln + $offset} = 1;
+
+					$herectx .= "$rawlines[$ln + $offset]\n[...]\n";
+					$ln += statement_rawlines($block) - 1;
+
+					substr($block, 0, length($cond), '');
+
+					$seen++ if ($block =~ /^\s*{/);
+
+					#print "cond<$cond> block<$block> allowed<$allowed[$allow]>\n";
+					if (statement_lines($cond) > 1) {
+						#print "APW: ALLOWED: cond<$cond>\n";
+						$allowed[$allow] = 1;
+					}
+					if ($block =~/\b(?:if|for|while)\b/) {
+						#print "APW: ALLOWED: block<$block>\n";
+						$allowed[$allow] = 1;
+					}
+					if (statement_block_size($block) > 1) {
+						#print "APW: ALLOWED: lines block<$block>\n";
+						$allowed[$allow] = 1;
+					}
+					$allow++;
+				}
+				if ($seen) {
+					my $sum_allowed = 0;
+					foreach (@allowed) {
+						$sum_allowed += $_;
+					}
+					if ($sum_allowed == 0) {
+						WARN("BRACES",
+						     "braces {} are not necessary for any arm of this statement\n" . $herectx);
+					} elsif ($sum_allowed != $allow &&
+						 $seen != $allow) {
+						CHK("BRACES",
+						    "braces {} should be used on all arms of this statement\n" . $herectx);
+					}
+				}
+			}
+		}
+		if (!defined $suppress_ifbraces{$linenr - 1} &&
+					$line =~ /\b(if|while|for|else)\b/) {
+			my $allowed = 0;
+
+			# Check the pre-context.
+			if (substr($line, 0, $-[0]) =~ /(\}\s*)$/) {
+				#print "APW: ALLOWED: pre<$1>\n";
+				$allowed = 1;
+			}
+
+			my ($level, $endln, @chunks) =
+				ctx_statement_full($linenr, $realcnt, $-[0]);
+
+			# Check the condition.
+			my ($cond, $block) = @{$chunks[0]};
+			#print "CHECKING<$linenr> cond<$cond> block<$block>\n";
+			if (defined $cond) {
+				substr($block, 0, length($cond), '');
+			}
+			if (statement_lines($cond) > 1) {
+				#print "APW: ALLOWED: cond<$cond>\n";
+				$allowed = 1;
+			}
+			if ($block =~/\b(?:if|for|while)\b/) {
+				#print "APW: ALLOWED: block<$block>\n";
+				$allowed = 1;
+			}
+			if (statement_block_size($block) > 1) {
+				#print "APW: ALLOWED: lines block<$block>\n";
+				$allowed = 1;
+			}
+			# Check the post-context.
+			if (defined $chunks[1]) {
+				my ($cond, $block) = @{$chunks[1]};
+				if (defined $cond) {
+					substr($block, 0, length($cond), '');
+				}
+				if ($block =~ /^\s*\{/) {
+					#print "APW: ALLOWED: chunk-1 block<$block>\n";
+					$allowed = 1;
+				}
+			}
+			if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
+				my $herectx = $here . "\n";
+				my $cnt = statement_rawlines($block);
+
+				for (my $n = 0; $n < $cnt; $n++) {
+					$herectx .= raw_line($linenr, $n) . "\n";
+				}
+
+				WARN("BRACES",
+				     "braces {} are not necessary for single statement blocks\n" . $herectx);
+			}
+		}
+
+# no volatiles please
+		my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
+		if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
+			WARN("VOLATILE",
+			     "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
+		}
+
+# warn about #if 0
+		if ($line =~ /^.\s*\#\s*if\s+0\b/) {
+			CHK("REDUNDANT_CODE",
+			    "if this code is redundant consider removing it\n" .
+				$herecurr);
+		}
+
+# check for needless kfree() checks
+		if ($prevline =~ /\bif\s*\(([^\)]*)\)/) {
+			my $expr = $1;
+			if ($line =~ /\bkfree\(\Q$expr\E\);/) {
+				WARN("NEEDLESS_KFREE",
+				     "kfree(NULL) is safe this check is probably not required\n" . $hereprev);
+			}
+		}
+# check for needless usb_free_urb() checks
+		if ($prevline =~ /\bif\s*\(([^\)]*)\)/) {
+			my $expr = $1;
+			if ($line =~ /\busb_free_urb\(\Q$expr\E\);/) {
+				WARN("NEEDLESS_USB_FREE_URB",
+				     "usb_free_urb(NULL) is safe this check is probably not required\n" . $hereprev);
+			}
+		}
+
+# prefer usleep_range over udelay
+		if ($line =~ /\budelay\s*\(\s*(\w+)\s*\)/) {
+			# ignore udelay's < 10, however
+			if (! (($1 =~ /(\d+)/) && ($1 < 10)) ) {
+				CHK("USLEEP_RANGE",
+				    "usleep_range is preferred over udelay; see Documentation/timers/timers-howto.txt\n" . $line);
+			}
+		}
+
+# warn about unexpectedly long msleep's
+		if ($line =~ /\bmsleep\s*\((\d+)\);/) {
+			if ($1 < 20) {
+				WARN("MSLEEP",
+				     "msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt\n" . $line);
+			}
+		}
+
+# warn about #ifdefs in C files
+#		if ($line =~ /^.\s*\#\s*if(|n)def/ && ($realfile =~ /\.c$/)) {
+#			print "#ifdef in C files should be avoided\n";
+#			print "$herecurr";
+#			$clean = 0;
+#		}
+
+# warn about spacing in #ifdefs
+		if ($line =~ /^.\s*\#\s*(ifdef|ifndef|elif)\s\s+/) {
+			ERROR("SPACING",
+			      "exactly one space required after that #$1\n" . $herecurr);
+		}
+
+# check for spinlock_t definitions without a comment.
+		if ($line =~ /^.\s*(struct\s+mutex|spinlock_t)\s+\S+;/ ||
+		    $line =~ /^.\s*(DEFINE_MUTEX)\s*\(/) {
+			my $which = $1;
+			if (!ctx_has_comment($first_line, $linenr)) {
+				CHK("UNCOMMENTED_DEFINITION",
+				    "$1 definition without comment\n" . $herecurr);
+			}
+		}
+# check for memory barriers without a comment.
+		if ($line =~ /\b(mb|rmb|wmb|read_barrier_depends|smp_mb|smp_rmb|smp_wmb|smp_read_barrier_depends)\(/) {
+			if (!ctx_has_comment($first_line, $linenr)) {
+				CHK("MEMORY_BARRIER",
+				    "memory barrier without comment\n" . $herecurr);
+			}
+		}
+# check of hardware specific defines
+		if ($line =~ m@^.\s*\#\s*if.*\b(__i386__|__powerpc64__|__sun__|__s390x__)\b@ && $realfile !~ m@include/asm-@) {
+			CHK("ARCH_DEFINES",
+			    "architecture specific defines should be avoided\n" .  $herecurr);
+		}
+
+# Check that the storage class is at the beginning of a declaration
+		if ($line =~ /\b$Storage\b/ && $line !~ /^.\s*$Storage\b/) {
+			WARN("STORAGE_CLASS",
+			     "storage class should be at the beginning of the declaration\n" . $herecurr)
+		}
+
+# check the location of the inline attribute, that it is between
+# storage class and type.
+		if ($line =~ /\b$Type\s+$Inline\b/ ||
+		    $line =~ /\b$Inline\s+$Storage\b/) {
+			ERROR("INLINE_LOCATION",
+			      "inline keyword should sit between storage class and type\n" . $herecurr);
+		}
+
+# Check for __inline__ and __inline, prefer inline
+		if ($line =~ /\b(__inline__|__inline)\b/) {
+			WARN("INLINE",
+			     "plain inline is preferred over $1\n" . $herecurr);
+		}
+
+# Check for __attribute__ packed, prefer __packed
+		if ($line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) {
+			WARN("PREFER_PACKED",
+			     "__packed is preferred over __attribute__((packed))\n" . $herecurr);
+		}
+
+# Check for __attribute__ aligned, prefer __aligned
+		if ($line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
+			WARN("PREFER_ALIGNED",
+			     "__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr);
+		}
+
+# Check for __attribute__ format(printf, prefer __printf
+		if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) {
+			WARN("PREFER_PRINTF",
+			     "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr);
+		}
+
+# Check for __attribute__ format(scanf, prefer __scanf
+		if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
+			WARN("PREFER_SCANF",
+			     "__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr);
+		}
+
+# check for sizeof(&)
+		if ($line =~ /\bsizeof\s*\(\s*\&/) {
+			WARN("SIZEOF_ADDRESS",
+			     "sizeof(& should be avoided\n" . $herecurr);
+		}
+
+# check for line continuations in quoted strings with odd counts of "
+		if ($rawline =~ /\\$/ && $rawline =~ tr/"/"/ % 2) {
+			WARN("LINE_CONTINUATIONS",
+			     "Avoid line continuations in quoted strings\n" . $herecurr);
+		}
+
+# Check for misused memsets
+		if ($^V && $^V ge 5.10.0 &&
+		    defined $stat &&
+		    $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/s) {
+
+			my $ms_addr = $2;
+			my $ms_val = $7;
+			my $ms_size = $12;
+
+			if ($ms_size =~ /^(0x|)0$/i) {
+				ERROR("MEMSET",
+				      "memset to 0's uses 0 as the 2nd argument, not the 3rd\n" . "$here\n$stat\n");
+			} elsif ($ms_size =~ /^(0x|)1$/i) {
+				WARN("MEMSET",
+				     "single byte memset is suspicious. Swapped 2nd/3rd argument?\n" . "$here\n$stat\n");
+			}
+		}
+
+# typecasts on min/max could be min_t/max_t
+		if ($^V && $^V ge 5.10.0 &&
+		    defined $stat &&
+		    $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
+			if (defined $2 || defined $7) {
+				my $call = $1;
+				my $cast1 = deparenthesize($2);
+				my $arg1 = $3;
+				my $cast2 = deparenthesize($7);
+				my $arg2 = $8;
+				my $cast;
+
+				if ($cast1 ne "" && $cast2 ne "" && $cast1 ne $cast2) {
+					$cast = "$cast1 or $cast2";
+				} elsif ($cast1 ne "") {
+					$cast = $cast1;
+				} else {
+					$cast = $cast2;
+				}
+				WARN("MINMAX",
+				     "$call() should probably be ${call}_t($cast, $arg1, $arg2)\n" . "$here\n$stat\n");
+			}
+		}
+
+# check for new externs in .c files.
+		if ($realfile =~ /\.c$/ && defined $stat &&
+		    $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
+		{
+			my $function_name = $1;
+			my $paren_space = $2;
+
+			my $s = $stat;
+			if (defined $cond) {
+				substr($s, 0, length($cond), '');
+			}
+			if ($s =~ /^\s*;/ &&
+			    $function_name ne 'uninitialized_var')
+			{
+				WARN("AVOID_EXTERNS",
+				     "externs should be avoided in .c files\n" .  $herecurr);
+			}
+
+			if ($paren_space =~ /\n/) {
+				WARN("FUNCTION_ARGUMENTS",
+				     "arguments for function declarations should follow identifier\n" . $herecurr);
+			}
+
+		} elsif ($realfile =~ /\.c$/ && defined $stat &&
+		    $stat =~ /^.\s*extern\s+/)
+		{
+			WARN("AVOID_EXTERNS",
+			     "externs should be avoided in .c files\n" .  $herecurr);
+		}
+
+# check for pointless casting of kmalloc return
+		if ($line =~ /\*\s*\)\s*[kv][czm]alloc(_node){0,1}\b/) {
+			WARN("UNNECESSARY_CASTS",
+			     "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
+		}
+
+# check for multiple semicolons
+		if ($line =~ /;\s*;\s*$/) {
+		    WARN("ONE_SEMICOLON",
+			 "Statements terminations use 1 semicolon\n" . $herecurr);
+		}
+
+# check for gcc specific __FUNCTION__
+		if ($line =~ /__FUNCTION__/) {
+			WARN("USE_FUNC",
+			     "__func__ should be used instead of gcc specific __FUNCTION__\n"  . $herecurr);
+		}
+
+# check for use of yield()
+		if ($line =~ /\byield\s*\(\s*\)/) {
+			WARN("YIELD",
+			     "Using yield() is generally wrong. See yield() kernel-doc (sched/core.c)\n"  . $herecurr);
+		}
+
+# check for semaphores initialized locked
+		if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
+			WARN("CONSIDER_COMPLETION",
+			     "consider using a completion\n" . $herecurr);
+		}
+
+# recommend kstrto* over simple_strto* and strict_strto*
+		if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
+			WARN("CONSIDER_KSTRTO",
+			     "$1 is obsolete, use k$3 instead\n" . $herecurr);
+		}
+
+# check for __initcall(), use device_initcall() explicitly please
+		if ($line =~ /^.\s*__initcall\s*\(/) {
+			WARN("USE_DEVICE_INITCALL",
+			     "please use device_initcall() instead of __initcall()\n" . $herecurr);
+		}
+
+# check for various ops structs, ensure they are const.
+		my $struct_ops = qr{acpi_dock_ops|
+				address_space_operations|
+				backlight_ops|
+				block_device_operations|
+				dentry_operations|
+				dev_pm_ops|
+				dma_map_ops|
+				extent_io_ops|
+				file_lock_operations|
+				file_operations|
+				hv_ops|
+				ide_dma_ops|
+				intel_dvo_dev_ops|
+				item_operations|
+				iwl_ops|
+				kgdb_arch|
+				kgdb_io|
+				kset_uevent_ops|
+				lock_manager_operations|
+				microcode_ops|
+				mtrr_ops|
+				neigh_ops|
+				nlmsvc_binding|
+				pci_raw_ops|
+				pipe_buf_operations|
+				platform_hibernation_ops|
+				platform_suspend_ops|
+				proto_ops|
+				rpc_pipe_ops|
+				seq_operations|
+				snd_ac97_build_ops|
+				soc_pcmcia_socket_ops|
+				stacktrace_ops|
+				sysfs_ops|
+				tty_operations|
+				usb_mon_operations|
+				wd_ops}x;
+		if ($line !~ /\bconst\b/ &&
+		    $line =~ /\bstruct\s+($struct_ops)\b/) {
+			WARN("CONST_STRUCT",
+			     "struct $1 should normally be const\n" .
+				$herecurr);
+		}
+
+# use of NR_CPUS is usually wrong
+# ignore definitions of NR_CPUS and usage to define arrays as likely right
+		if ($line =~ /\bNR_CPUS\b/ &&
+		    $line !~ /^.\s*\s*#\s*if\b.*\bNR_CPUS\b/ &&
+		    $line !~ /^.\s*\s*#\s*define\b.*\bNR_CPUS\b/ &&
+		    $line !~ /^.\s*$Declare\s.*\[[^\]]*NR_CPUS[^\]]*\]/ &&
+		    $line !~ /\[[^\]]*\.\.\.[^\]]*NR_CPUS[^\]]*\]/ &&
+		    $line !~ /\[[^\]]*NR_CPUS[^\]]*\.\.\.[^\]]*\]/)
+		{
+			WARN("NR_CPUS",
+			     "usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr);
+		}
+
+# check for %L{u,d,i} in strings
+		my $string;
+		while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
+			$string = substr($rawline, $-[1], $+[1] - $-[1]);
+			$string =~ s/%%/__/g;
+			if ($string =~ /(?<!%)%L[udi]/) {
+				WARN("PRINTF_L",
+				     "\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
+				last;
+			}
+		}
+
+# whine mightly about in_atomic
+		if ($line =~ /\bin_atomic\s*\(/) {
+			if ($realfile =~ m@^drivers/@) {
+				ERROR("IN_ATOMIC",
+				      "do not use in_atomic in drivers\n" . $herecurr);
+			} elsif ($realfile !~ m@^kernel/@) {
+				WARN("IN_ATOMIC",
+				     "use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
+			}
+		}
+
+# check for lockdep_set_novalidate_class
+		if ($line =~ /^.\s*lockdep_set_novalidate_class\s*\(/ ||
+		    $line =~ /__lockdep_no_validate__\s*\)/ ) {
+			if ($realfile !~ m@^kernel/lockdep@ &&
+			    $realfile !~ m@^include/linux/lockdep@ &&
+			    $realfile !~ m@^drivers/base/core@) {
+				ERROR("LOCKDEP",
+				      "lockdep_no_validate class is reserved for device->mutex.\n" . $herecurr);
+			}
+		}
+
+		if ($line =~ /debugfs_create_file.*S_IWUGO/ ||
+		    $line =~ /DEVICE_ATTR.*S_IWUGO/ ) {
+			WARN("EXPORTED_WORLD_WRITABLE",
+			     "Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
+		}
+	}
+
+	# If we have no input at all, then there is nothing to report on
+	# so just keep quiet.
+	if ($#rawlines == -1) {
+		exit(0);
+	}
+
+	# In mailback mode only produce a report in the negative, for
+	# things that appear to be patches.
+	if ($mailback && ($clean == 1 || !$is_patch)) {
+		exit(0);
+	}
+
+	# This is not a patch, and we are are in 'no-patch' mode so
+	# just keep quiet.
+	if (!$chk_patch && !$is_patch) {
+		exit(0);
+	}
+
+	if (!$is_patch) {
+		ERROR("NOT_UNIFIED_DIFF",
+		      "Does not appear to be a unified-diff format patch\n");
+	}
+	if ($is_patch && $chk_signoff && $signoff == 0) {
+		ERROR("MISSING_SIGN_OFF",
+		      "Missing Signed-off-by: line(s)\n");
+	}
+
+	print report_dump();
+	if ($summary && !($clean == 1 && $quiet == 1)) {
+		print "$filename " if ($summary_file);
+		print "total: $cnt_error errors, $cnt_warn warnings, " .
+			(($check)? "$cnt_chk checks, " : "") .
+			"$cnt_lines lines checked\n";
+		print "\n" if ($quiet == 0);
+	}
+
+	if ($quiet == 0) {
+
+		if ($^V lt 5.10.0) {
+			print("NOTE: perl $^V is not modern enough to detect all possible issues.\n");
+			print("An upgrade to at least perl v5.10.0 is suggested.\n\n");
+		}
+
+		# If there were whitespace errors which cleanpatch can fix
+		# then suggest that.
+		if ($rpt_cleaners) {
+			print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n";
+			print "      scripts/cleanfile\n\n";
+			$rpt_cleaners = 0;
+		}
+	}
+
+	if ($quiet == 0 && keys %ignore_type) {
+	    print "NOTE: Ignored message types:";
+	    foreach my $ignore (sort keys %ignore_type) {
+		print " $ignore";
+	    }
+	    print "\n\n";
+	}
+
+	if ($clean == 1 && $quiet == 0) {
+		print "$vname has no obvious style problems and is ready for submission.\n"
+	}
+	if ($clean == 0 && $quiet == 0) {
+		print << "EOM";
+$vname has style problems, please review.
+
+If any of these errors are false positives, please report
+them to the maintainer, see CHECKPATCH in MAINTAINERS.
+EOM
+	}
+
+	return $clean;
+}
diff --git a/trunk/scripts/clang-gcc-wrapper b/trunk/scripts/clang-gcc-wrapper
new file mode 100755
index 00000000..9e668418
--- /dev/null
+++ b/trunk/scripts/clang-gcc-wrapper
@@ -0,0 +1,12 @@
+#!/bin/sh
+_cc="${HOSTCC_REAL:-gcc}"
+case "$1" in
+	-print-file-name=*)
+		dirs="$($_cc -print-search-dirs | grep -m1 libraries | sed -e 's,:, ,' -e 's,.* =,,')"
+		dirs="$dirs /usr/lib /usr/local/lib"
+		find $dirs -name "${1#*=}" | head -n1
+	;;
+	*)
+		exec $_cc "$@"
+	;;
+esac
diff --git a/trunk/scripts/clean-package.sh b/trunk/scripts/clean-package.sh
new file mode 100755
index 00000000..d1a25788
--- /dev/null
+++ b/trunk/scripts/clean-package.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+[ -n "$1" -a -n "$2" ] || {
+	echo "Usage: $0 <file> <directory>"
+	exit 1
+}
+[ -f "$1" -a -d "$2" ] || {
+	echo "File/directory not found"
+	exit 1
+}
+cat "$1" | (
+	cd "$2"
+	while read entry; do
+		[ -n "$entry" ] || break
+		[ -f "$entry" ] && rm -f $entry
+	done
+)
+cat "$1" | (
+	cd "$2"
+	while read entry; do
+		[ -n "$entry" ] || break
+		[ -d "$entry" ] && rmdir "$entry" > /dev/null 2>&1
+	done
+)
+true
diff --git a/trunk/scripts/cleanfile b/trunk/scripts/cleanfile
new file mode 100755
index 00000000..cefd29e5
--- /dev/null
+++ b/trunk/scripts/cleanfile
@@ -0,0 +1,176 @@
+#!/usr/bin/perl -w
+#
+# Clean a text file -- or directory of text files -- of stealth whitespace.
+# WARNING: this can be a highly destructive operation.  Use with caution.
+#
+
+use bytes;
+use File::Basename;
+
+# Default options
+$max_width = 79;
+
+# Clean up space-tab sequences, either by removing spaces or
+# replacing them with tabs.
+sub clean_space_tabs($)
+{
+    no bytes;			# Tab alignment depends on characters
+
+    my($li) = @_;
+    my($lo) = '';
+    my $pos = 0;
+    my $nsp = 0;
+    my($i, $c);
+
+    for ($i = 0; $i < length($li); $i++) {
+	$c = substr($li, $i, 1);
+	if ($c eq "\t") {
+	    my $npos = ($pos+$nsp+8) & ~7;
+	    my $ntab = ($npos >> 3) - ($pos >> 3);
+	    $lo .= "\t" x $ntab;
+	    $pos = $npos;
+	    $nsp = 0;
+	} elsif ($c eq "\n" || $c eq "\r") {
+	    $lo .= " " x $nsp;
+	    $pos += $nsp;
+	    $nsp = 0;
+	    $lo .= $c;
+	    $pos = 0;
+	} elsif ($c eq " ") {
+	    $nsp++;
+	} else {
+	    $lo .= " " x $nsp;
+	    $pos += $nsp;
+	    $nsp = 0;
+	    $lo .= $c;
+	    $pos++;
+	}
+    }
+    $lo .= " " x $nsp;
+    return $lo;
+}
+
+# Compute the visual width of a string
+sub strwidth($) {
+    no bytes;			# Tab alignment depends on characters
+
+    my($li) = @_;
+    my($c, $i);
+    my $pos = 0;
+    my $mlen = 0;
+
+    for ($i = 0; $i < length($li); $i++) {
+	$c = substr($li,$i,1);
+	if ($c eq "\t") {
+	    $pos = ($pos+8) & ~7;
+	} elsif ($c eq "\n") {
+	    $mlen = $pos if ($pos > $mlen);
+	    $pos = 0;
+	} else {
+	    $pos++;
+	}
+    }
+
+    $mlen = $pos if ($pos > $mlen);
+    return $mlen;
+}
+
+$name = basename($0);
+
+@files = ();
+
+while (defined($a = shift(@ARGV))) {
+    if ($a =~ /^-/) {
+	if ($a eq '-width' || $a eq '-w') {
+	    $max_width = shift(@ARGV)+0;
+	} else {
+	    print STDERR "Usage: $name [-width #] files...\n";
+	    exit 1;
+	}
+    } else {
+	push(@files, $a);
+    }
+}
+
+foreach $f ( @files ) {
+    print STDERR "$name: $f\n";
+
+    if (! -f $f) {
+	print STDERR "$f: not a file\n";
+	next;
+    }
+
+    if (!open(FILE, '+<', $f)) {
+	print STDERR "$name: Cannot open file: $f: $!\n";
+	next;
+    }
+
+    binmode FILE;
+
+    # First, verify that it is not a binary file; consider any file
+    # with a zero byte to be a binary file.  Is there any better, or
+    # additional, heuristic that should be applied?
+    $is_binary = 0;
+
+    while (read(FILE, $data, 65536) > 0) {
+	if ($data =~ /\0/) {
+	    $is_binary = 1;
+	    last;
+	}
+    }
+
+    if ($is_binary) {
+	print STDERR "$name: $f: binary file\n";
+	next;
+    }
+
+    seek(FILE, 0, 0);
+
+    $in_bytes = 0;
+    $out_bytes = 0;
+    $blank_bytes = 0;
+
+    @blanks = ();
+    @lines  = ();
+    $lineno = 0;
+
+    while ( defined($line = <FILE>) ) {
+	$lineno++;
+	$in_bytes += length($line);
+	$line =~ s/[ \t\r]*$//;		# Remove trailing spaces
+	$line = clean_space_tabs($line);
+
+	if ( $line eq "\n" ) {
+	    push(@blanks, $line);
+	    $blank_bytes += length($line);
+	} else {
+	    push(@lines, @blanks);
+	    $out_bytes += $blank_bytes;
+	    push(@lines, $line);
+	    $out_bytes += length($line);
+	    @blanks = ();
+	    $blank_bytes = 0;
+	}
+
+	$l_width = strwidth($line);
+	if ($max_width && $l_width > $max_width) {
+	    print STDERR
+		"$f:$lineno: line exceeds $max_width characters ($l_width)\n";
+	}
+    }
+
+    # Any blanks at the end of the file are discarded
+
+    if ($in_bytes != $out_bytes) {
+	# Only write to the file if changed
+	seek(FILE, 0, 0);
+	print FILE @lines;
+
+	if ( !defined($where = tell(FILE)) ||
+	     !truncate(FILE, $where) ) {
+	    die "$name: Failed to truncate modified file: $f: $!\n";
+	}
+    }
+
+    close(FILE);
+}
diff --git a/trunk/scripts/cleanpatch b/trunk/scripts/cleanpatch
new file mode 100755
index 00000000..9680d03a
--- /dev/null
+++ b/trunk/scripts/cleanpatch
@@ -0,0 +1,258 @@
+#!/usr/bin/perl -w
+#
+# Clean a patch file -- or directory of patch files -- of stealth whitespace.
+# WARNING: this can be a highly destructive operation.  Use with caution.
+#
+
+use bytes;
+use File::Basename;
+
+# Default options
+$max_width = 79;
+
+# Clean up space-tab sequences, either by removing spaces or
+# replacing them with tabs.
+sub clean_space_tabs($)
+{
+    no bytes;			# Tab alignment depends on characters
+
+    my($li) = @_;
+    my($lo) = '';
+    my $pos = 0;
+    my $nsp = 0;
+    my($i, $c);
+
+    for ($i = 0; $i < length($li); $i++) {
+	$c = substr($li, $i, 1);
+	if ($c eq "\t") {
+	    my $npos = ($pos+$nsp+8) & ~7;
+	    my $ntab = ($npos >> 3) - ($pos >> 3);
+	    $lo .= "\t" x $ntab;
+	    $pos = $npos;
+	    $nsp = 0;
+	} elsif ($c eq "\n" || $c eq "\r") {
+	    $lo .= " " x $nsp;
+	    $pos += $nsp;
+	    $nsp = 0;
+	    $lo .= $c;
+	    $pos = 0;
+	} elsif ($c eq " ") {
+	    $nsp++;
+	} else {
+	    $lo .= " " x $nsp;
+	    $pos += $nsp;
+	    $nsp = 0;
+	    $lo .= $c;
+	    $pos++;
+	}
+    }
+    $lo .= " " x $nsp;
+    return $lo;
+}
+
+# Compute the visual width of a string
+sub strwidth($) {
+    no bytes;			# Tab alignment depends on characters
+
+    my($li) = @_;
+    my($c, $i);
+    my $pos = 0;
+    my $mlen = 0;
+
+    for ($i = 0; $i < length($li); $i++) {
+	$c = substr($li,$i,1);
+	if ($c eq "\t") {
+	    $pos = ($pos+8) & ~7;
+	} elsif ($c eq "\n") {
+	    $mlen = $pos if ($pos > $mlen);
+	    $pos = 0;
+	} else {
+	    $pos++;
+	}
+    }
+
+    $mlen = $pos if ($pos > $mlen);
+    return $mlen;
+}
+
+$name = basename($0);
+
+@files = ();
+
+while (defined($a = shift(@ARGV))) {
+    if ($a =~ /^-/) {
+	if ($a eq '-width' || $a eq '-w') {
+	    $max_width = shift(@ARGV)+0;
+	} else {
+	    print STDERR "Usage: $name [-width #] files...\n";
+	    exit 1;
+	}
+    } else {
+	push(@files, $a);
+    }
+}
+
+foreach $f ( @files ) {
+    print STDERR "$name: $f\n";
+
+    if (! -f $f) {
+	print STDERR "$f: not a file\n";
+	next;
+    }
+
+    if (!open(FILE, '+<', $f)) {
+	print STDERR "$name: Cannot open file: $f: $!\n";
+	next;
+    }
+
+    binmode FILE;
+
+    # First, verify that it is not a binary file; consider any file
+    # with a zero byte to be a binary file.  Is there any better, or
+    # additional, heuristic that should be applied?
+    $is_binary = 0;
+
+    while (read(FILE, $data, 65536) > 0) {
+	if ($data =~ /\0/) {
+	    $is_binary = 1;
+	    last;
+	}
+    }
+
+    if ($is_binary) {
+	print STDERR "$name: $f: binary file\n";
+	next;
+    }
+
+    seek(FILE, 0, 0);
+
+    $in_bytes = 0;
+    $out_bytes = 0;
+    $lineno = 0;
+
+    @lines  = ();
+
+    $in_hunk = 0;
+    $err = 0;
+
+    while ( defined($line = <FILE>) ) {
+	$lineno++;
+	$in_bytes += length($line);
+
+	if (!$in_hunk) {
+	    if ($line =~
+		/^\@\@\s+\-([0-9]+),([0-9]+)\s+\+([0-9]+),([0-9]+)\s\@\@/) {
+		$minus_lines = $2;
+		$plus_lines = $4;
+		if ($minus_lines || $plus_lines) {
+		    $in_hunk = 1;
+		    @hunk_lines = ($line);
+		}
+	    } else {
+		push(@lines, $line);
+		$out_bytes += length($line);
+	    }
+	} else {
+	    # We're in a hunk
+
+	    if ($line =~ /^\+/) {
+		$plus_lines--;
+
+		$text = substr($line, 1);
+		$text =~ s/[ \t\r]*$//;		# Remove trailing spaces
+		$text = clean_space_tabs($text);
+
+		$l_width = strwidth($text);
+		if ($max_width && $l_width > $max_width) {
+		    print STDERR
+			"$f:$lineno: adds line exceeds $max_width ",
+			"characters ($l_width)\n";
+		}
+
+		push(@hunk_lines, '+'.$text);
+	    } elsif ($line =~ /^\-/) {
+		$minus_lines--;
+		push(@hunk_lines, $line);
+	    } elsif ($line =~ /^ /) {
+		$plus_lines--;
+		$minus_lines--;
+		push(@hunk_lines, $line);
+	    } else {
+		print STDERR "$name: $f: malformed patch\n";
+		$err = 1;
+		last;
+	    }
+
+	    if ($plus_lines < 0 || $minus_lines < 0) {
+		print STDERR "$name: $f: malformed patch\n";
+		$err = 1;
+		last;
+	    } elsif ($plus_lines == 0 && $minus_lines == 0) {
+		# End of a hunk.  Process this hunk.
+		my $i;
+		my $l;
+		my @h = ();
+		my $adj = 0;
+		my $done = 0;
+
+		for ($i = scalar(@hunk_lines)-1; $i > 0; $i--) {
+		    $l = $hunk_lines[$i];
+		    if (!$done && $l eq "+\n") {
+			$adj++; # Skip this line
+		    } elsif ($l =~ /^[ +]/) {
+			$done = 1;
+			unshift(@h, $l);
+		    } else {
+			unshift(@h, $l);
+		    }
+		}
+
+		$l = $hunk_lines[0];  # Hunk header
+		undef @hunk_lines;    # Free memory
+
+		if ($adj) {
+		    die unless
+			($l =~ /^\@\@\s+\-([0-9]+),([0-9]+)\s+\+([0-9]+),([0-9]+)\s\@\@(.*)$/);
+		    my $mstart = $1;
+		    my $mlin = $2;
+		    my $pstart = $3;
+		    my $plin = $4;
+		    my $tail = $5; # doesn't include the final newline
+
+		    $l = sprintf("@@ -%d,%d +%d,%d @@%s\n",
+				 $mstart, $mlin, $pstart, $plin-$adj,
+				 $tail);
+		}
+		unshift(@h, $l);
+
+		# Transfer to the output array
+		foreach $l (@h) {
+		    $out_bytes += length($l);
+		    push(@lines, $l);
+		}
+
+		$in_hunk = 0;
+	    }
+	}
+    }
+
+    if ($in_hunk) {
+	print STDERR "$name: $f: malformed patch\n";
+	$err = 1;
+    }
+
+    if (!$err) {
+	if ($in_bytes != $out_bytes) {
+	    # Only write to the file if changed
+	    seek(FILE, 0, 0);
+	    print FILE @lines;
+
+	    if ( !defined($where = tell(FILE)) ||
+		 !truncate(FILE, $where) ) {
+		die "$name: Failed to truncate modified file: $f: $!\n";
+	    }
+	}
+    }
+
+    close(FILE);
+}
diff --git a/trunk/scripts/combined-ext-image.sh b/trunk/scripts/combined-ext-image.sh
new file mode 100755
index 00000000..374fe6e3
--- /dev/null
+++ b/trunk/scripts/combined-ext-image.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# Write image header followed by all specified files
+# The header is padded to 64k, format is:
+#  CE               magic word ("Combined Extended Image") (2 bytes)
+#  <CE_VERSION>     file format version field (2 bytes) 
+#  <TYPE>           short description of the target device (32 bytes)
+#  <NUM FILES>      number of files following the header (2 byte)
+#  <file1_name>     name of the first file (32 bytes)
+#  <file1_length>   length of the first file encoded as zero padded 8 digit hex (8 bytes)
+#  <file1_md5>      md5 checksum of the first file (32 bytes)
+#  <fileN_name>     name of the Nth file (32 bytes)
+#  <fileN_length>   length of the Nth file encoded as zero padded 8 digit hex (8 bytes)
+#  <fileN_md5>      md5 checksum of the Nth file (32 bytes)
+
+## version history
+# * version 1: initial file format with num files / name / length / md5 checksum 
+
+ME="${0##*/}"
+
+usage() {
+	echo "Usage: $ME <type> <ext filename> <file1> <filename1> [<file2> <filename2> <fileN> <filenameN>]"
+	[ "$IMG_OUT" ] && rm -f "$IMG_OUT"
+	exit 1
+}
+
+[ "$#" -lt 4 ] && usage
+
+CE_VERSION=1
+IMG_TYPE=$1; shift
+IMG_OUT=$1; shift
+FILE_NUM=$(($# / 2))
+FILES=""
+
+printf "CE%02x%-32s%02x" $CE_VERSION "$IMG_TYPE" $FILE_NUM > $IMG_OUT
+
+while [ "$#" -gt 1 ]
+   do
+      file=$1
+      filename=$2
+
+      [ ! -f "$file" ] && echo "$ME: Not a valid file: $file" && usage
+      FILES="$FILES $file"
+      md5=$(cat "$file" | md5sum -)
+      printf "%-32s%08x%32s" "$filename" $(stat -c "%s" "$file") "${md5%% *}" >> $IMG_OUT
+      shift 2
+   done
+
+[ "$#" -eq 1 ] && echo "$ME: Filename not specified: $1" && usage
+
+mv $IMG_OUT $IMG_OUT.tmp
+dd if="$IMG_OUT.tmp" of="$IMG_OUT" bs=65536 conv=sync 2>/dev/null
+rm $IMG_OUT.tmp
+
+cat $FILES >> $IMG_OUT
diff --git a/trunk/scripts/combined-image.sh b/trunk/scripts/combined-image.sh
new file mode 100644
index 00000000..929ece64
--- /dev/null
+++ b/trunk/scripts/combined-image.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+BLKSZ=65536
+
+[ -f "$1" -a -f "$2" ] || {
+	echo "Usage: $0 <kernel image> <rootfs image> [output file]"
+	exit 1
+}
+
+IMAGE=${3:-librecmc-combined.img}
+
+# Make sure provided images are 64k aligned.
+kern="${IMAGE}.kernel"
+root="${IMAGE}.rootfs"
+dd if="$1" of="$kern" bs=$BLKSZ conv=sync 2>/dev/null
+dd if="$2" of="$root" bs=$BLKSZ conv=sync 2>/dev/null
+
+# Calculate md5sum over combined kernel and rootfs image.
+md5=$(cat "$kern" "$root" | md5sum -)
+
+# Write image header followed by kernel and rootfs image.
+# The header is padded to 64k, format is:
+#  CI               magic word ("Combined Image")
+#  <kernel length>  length of kernel encoded as zero padded 8 digit hex
+#  <rootfs length>  length of rootfs encoded as zero padded 8 digit hex
+#  <md5sum>         checksum of the combined kernel and rootfs image
+( printf "CI%08x%08x%32s" \
+	$(stat -c "%s" "$kern") $(stat -c "%s" "$root") "${md5%% *}" | \
+	dd bs=$BLKSZ conv=sync;
+  cat "$kern" "$root"
+) > ${IMAGE} 2>/dev/null
+
+# Clean up.
+rm -f "$kern" "$root"
diff --git a/trunk/scripts/config.guess b/trunk/scripts/config.guess
new file mode 100755
index 00000000..d622a44e
--- /dev/null
+++ b/trunk/scripts/config.guess
@@ -0,0 +1,1530 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/trunk/scripts/config.rpath b/trunk/scripts/config.rpath
new file mode 100755
index 00000000..c547c688
--- /dev/null
+++ b/trunk/scripts/config.rpath
@@ -0,0 +1,666 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2007 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | cygwin* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix4* | aix5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    library_names_spec='$libname.a'
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd1*)
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  nto-qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/trunk/scripts/config.sub b/trunk/scripts/config.sub
new file mode 100755
index 00000000..74111be5
--- /dev/null
+++ b/trunk/scripts/config.sub
@@ -0,0 +1,1773 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova* | linux-musl*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| open8 \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* | -linux-musl* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/trunk/scripts/config/Makefile b/trunk/scripts/config/Makefile
new file mode 100644
index 00000000..685c067a
--- /dev/null
+++ b/trunk/scripts/config/Makefile
@@ -0,0 +1,52 @@
+# ===========================================================================
+# libreCMC configuration targets
+# These targets are used from top-level makefile
+
+# ===========================================================================
+# Shared Makefile for the various kconfig executables:
+# conf:	  Used for defconfig, oldconfig and related targets
+# mconf:  Used for the mconfig target.
+#         Utilizes the lxdialog package
+# object files used by all kconfig flavours
+
+
+# Platform specific fixes
+#
+# FreeBSD
+
+check_lxdialog = $(shell $(SHELL) $(CURDIR)/lxdialog/check-lxdialog.sh -$(1))
+export CFLAGS += -DKBUILD_NO_NLS -I. $(call check_lxdialog,ccflags)
+
+conf-objs	:= conf.o zconf.tab.o
+mconf-objs	:= mconf.o zconf.tab.o
+lxdialog-objs := \
+	lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o \
+	lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
+
+clean-files	:= zconf.tab.c lex.zconf.c zconf.hash.c
+
+all: conf mconf
+
+conf: $(conf-objs)
+mconf: $(mconf-objs) $(lxdialog-objs)
+	$(CC) -o $@ $^ $(call check_lxdialog,ldflags $(CC))
+
+clean:
+	rm -f *.o lxdialog/*.o $(clean-files) conf mconf
+
+zconf.tab.o: zconf.lex.c zconf.hash.c confdata.c
+
+kconfig_load.o: lkc_defs.h
+
+zconf.tab.c: zconf.y
+zconf.lex.c: zconf.l
+zconf.hash.c: zconf.gperf
+
+%.tab.c: %.y
+	cp $@_shipped $@ || bison -l -b $* -p $(notdir $*) $<
+
+%.lex.c: %.l
+	cp $@_shipped $@ || flex -L -P$(notdir $*) -o$@ $<
+
+%.hash.c: %.gperf
+	cp $@_shipped $@ || gperf < $< > $@
diff --git a/trunk/scripts/config/README b/trunk/scripts/config/README
new file mode 100644
index 00000000..a6f88c2a
--- /dev/null
+++ b/trunk/scripts/config/README
@@ -0,0 +1,2 @@
+These files were taken from the Linux 3.9 Kernel
+Configuration System and modified for the libreCMC Buildroot.
diff --git a/trunk/scripts/config/conf.c b/trunk/scripts/config/conf.c
new file mode 100644
index 00000000..b769654a
--- /dev/null
+++ b/trunk/scripts/config/conf.c
@@ -0,0 +1,686 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <locale.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include "lkc.h"
+
+static void conf(struct menu *menu);
+static void check_conf(struct menu *menu);
+static void xfgets(char *str, int size, FILE *in);
+
+enum input_mode {
+	oldaskconfig,
+	silentoldconfig,
+	oldconfig,
+	allnoconfig,
+	allyesconfig,
+	allmodconfig,
+	alldefconfig,
+	randconfig,
+	defconfig,
+	savedefconfig,
+	listnewconfig,
+	olddefconfig,
+} input_mode = oldaskconfig;
+
+static int indent = 1;
+static int tty_stdio;
+static int valid_stdin = 1;
+static int sync_kconfig;
+static int conf_cnt;
+static char line[128];
+static struct menu *rootEntry;
+
+static void print_help(struct menu *menu)
+{
+	struct gstr help = str_new();
+
+	menu_get_ext_help(menu, &help);
+
+	printf("\n%s\n", str_get(&help));
+	str_free(&help);
+}
+
+static void strip(char *str)
+{
+	char *p = str;
+	int l;
+
+	while ((isspace(*p)))
+		p++;
+	l = strlen(p);
+	if (p != str)
+		memmove(str, p, l + 1);
+	if (!l)
+		return;
+	p = str + l - 1;
+	while ((isspace(*p)))
+		*p-- = 0;
+}
+
+static void check_stdin(void)
+{
+	if (!valid_stdin) {
+		printf(_("aborted!\n\n"));
+		printf(_("Console input/output is redirected. "));
+		printf(_("Run 'make oldconfig' to update configuration.\n\n"));
+		exit(1);
+	}
+}
+
+static int conf_askvalue(struct symbol *sym, const char *def)
+{
+	enum symbol_type type = sym_get_type(sym);
+
+	if (!sym_has_value(sym))
+		printf(_("(NEW) "));
+
+	line[0] = '\n';
+	line[1] = 0;
+
+	if (!sym_is_changable(sym)) {
+		printf("%s\n", def);
+		line[0] = '\n';
+		line[1] = 0;
+		return 0;
+	}
+
+	switch (input_mode) {
+	case oldconfig:
+	case silentoldconfig:
+		if (sym_has_value(sym)) {
+			printf("%s\n", def);
+			return 0;
+		}
+		check_stdin();
+		/* fall through */
+	case oldaskconfig:
+		fflush(stdout);
+		xfgets(line, 128, stdin);
+		if (!tty_stdio)
+			printf("\n");
+		return 1;
+	default:
+		break;
+	}
+
+	switch (type) {
+	case S_INT:
+	case S_HEX:
+	case S_STRING:
+		printf("%s\n", def);
+		return 1;
+	default:
+		;
+	}
+	printf("%s", line);
+	return 1;
+}
+
+static int conf_string(struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	const char *def;
+
+	while (1) {
+		printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+		printf("(%s) ", sym->name);
+		def = sym_get_string_value(sym);
+		if (sym_get_string_value(sym))
+			printf("[%s] ", def);
+		if (!conf_askvalue(sym, def))
+			return 0;
+		switch (line[0]) {
+		case '\n':
+			break;
+		case '?':
+			/* print help */
+			if (line[1] == '\n') {
+				print_help(menu);
+				def = NULL;
+				break;
+			}
+			/* fall through */
+		default:
+			line[strlen(line)-1] = 0;
+			def = line;
+		}
+		if (def && sym_set_string_value(sym, def))
+			return 0;
+	}
+}
+
+static int conf_sym(struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	tristate oldval, newval;
+
+	while (1) {
+		printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+		if (sym->name)
+			printf("(%s) ", sym->name);
+		putchar('[');
+		oldval = sym_get_tristate_value(sym);
+		switch (oldval) {
+		case no:
+			putchar('N');
+			break;
+		case mod:
+			putchar('M');
+			break;
+		case yes:
+			putchar('Y');
+			break;
+		}
+		if (oldval != no && sym_tristate_within_range(sym, no))
+			printf("/n");
+		if (oldval != mod && sym_tristate_within_range(sym, mod))
+			printf("/m");
+		if (oldval != yes && sym_tristate_within_range(sym, yes))
+			printf("/y");
+		if (menu_has_help(menu))
+			printf("/?");
+		printf("] ");
+		if (!conf_askvalue(sym, sym_get_string_value(sym)))
+			return 0;
+		strip(line);
+
+		switch (line[0]) {
+		case 'n':
+		case 'N':
+			newval = no;
+			if (!line[1] || !strcmp(&line[1], "o"))
+				break;
+			continue;
+		case 'm':
+		case 'M':
+			newval = mod;
+			if (!line[1])
+				break;
+			continue;
+		case 'y':
+		case 'Y':
+			newval = yes;
+			if (!line[1] || !strcmp(&line[1], "es"))
+				break;
+			continue;
+		case 0:
+			newval = oldval;
+			break;
+		case '?':
+			goto help;
+		default:
+			continue;
+		}
+		if (sym_set_tristate_value(sym, newval))
+			return 0;
+help:
+		print_help(menu);
+	}
+}
+
+static int conf_choice(struct menu *menu)
+{
+	struct symbol *sym, *def_sym;
+	struct menu *child;
+	bool is_new;
+
+	sym = menu->sym;
+	is_new = !sym_has_value(sym);
+	if (sym_is_changable(sym)) {
+		conf_sym(menu);
+		sym_calc_value(sym);
+		switch (sym_get_tristate_value(sym)) {
+		case no:
+			return 1;
+		case mod:
+			return 0;
+		case yes:
+			break;
+		}
+	} else {
+		switch (sym_get_tristate_value(sym)) {
+		case no:
+			return 1;
+		case mod:
+			printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+			return 0;
+		case yes:
+			break;
+		}
+	}
+
+	while (1) {
+		int cnt, def;
+
+		printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+		def_sym = sym_get_choice_value(sym);
+		cnt = def = 0;
+		line[0] = 0;
+		for (child = menu->list; child; child = child->next) {
+			if (!menu_is_visible(child))
+				continue;
+			if (!child->sym) {
+				printf("%*c %s\n", indent, '*', _(menu_get_prompt(child)));
+				continue;
+			}
+			cnt++;
+			if (child->sym == def_sym) {
+				def = cnt;
+				printf("%*c", indent, '>');
+			} else
+				printf("%*c", indent, ' ');
+			printf(" %d. %s", cnt, _(menu_get_prompt(child)));
+			if (child->sym->name)
+				printf(" (%s)", child->sym->name);
+			if (!sym_has_value(child->sym))
+				printf(_(" (NEW)"));
+			printf("\n");
+		}
+		printf(_("%*schoice"), indent - 1, "");
+		if (cnt == 1) {
+			printf("[1]: 1\n");
+			goto conf_childs;
+		}
+		printf("[1-%d", cnt);
+		if (menu_has_help(menu))
+			printf("?");
+		printf("]: ");
+		switch (input_mode) {
+		case oldconfig:
+		case silentoldconfig:
+			if (!is_new) {
+				cnt = def;
+				printf("%d\n", cnt);
+				break;
+			}
+			check_stdin();
+			/* fall through */
+		case oldaskconfig:
+			fflush(stdout);
+			xfgets(line, 128, stdin);
+			strip(line);
+			if (line[0] == '?') {
+				print_help(menu);
+				continue;
+			}
+			if (!line[0])
+				cnt = def;
+			else if (isdigit(line[0]))
+				cnt = atoi(line);
+			else
+				continue;
+			break;
+		default:
+			break;
+		}
+
+	conf_childs:
+		for (child = menu->list; child; child = child->next) {
+			if (!child->sym || !menu_is_visible(child))
+				continue;
+			if (!--cnt)
+				break;
+		}
+		if (!child)
+			continue;
+		if (line[0] && line[strlen(line) - 1] == '?') {
+			print_help(child);
+			continue;
+		}
+		sym_set_choice_value(sym, child->sym);
+		for (child = child->list; child; child = child->next) {
+			indent += 2;
+			conf(child);
+			indent -= 2;
+		}
+		return 1;
+	}
+}
+
+static void conf(struct menu *menu)
+{
+	struct symbol *sym;
+	struct property *prop;
+	struct menu *child;
+
+	if (!menu_is_visible(menu))
+		return;
+
+	sym = menu->sym;
+	prop = menu->prompt;
+	if (prop) {
+		const char *prompt;
+
+		switch (prop->type) {
+		case P_MENU:
+			if ((input_mode == silentoldconfig ||
+			     input_mode == listnewconfig ||
+			     input_mode == olddefconfig) &&
+			    rootEntry != menu) {
+				check_conf(menu);
+				return;
+			}
+			/* fall through */
+		case P_COMMENT:
+			prompt = menu_get_prompt(menu);
+			if (prompt)
+				printf("%*c\n%*c %s\n%*c\n",
+					indent, '*',
+					indent, '*', _(prompt),
+					indent, '*');
+		default:
+			;
+		}
+	}
+
+	if (!sym)
+		goto conf_childs;
+
+	if (sym_is_choice(sym)) {
+		conf_choice(menu);
+		if (sym->curr.tri != mod)
+			return;
+		goto conf_childs;
+	}
+
+	switch (sym->type) {
+	case S_INT:
+	case S_HEX:
+	case S_STRING:
+		conf_string(menu);
+		break;
+	default:
+		conf_sym(menu);
+		break;
+	}
+
+conf_childs:
+	if (sym)
+		indent += 2;
+	for (child = menu->list; child; child = child->next)
+		conf(child);
+	if (sym)
+		indent -= 2;
+}
+
+static void check_conf(struct menu *menu)
+{
+	struct symbol *sym;
+	struct menu *child;
+
+	if (!menu_is_visible(menu))
+		return;
+
+	sym = menu->sym;
+	if (sym && !sym_has_value(sym)) {
+		if (sym_is_changable(sym) ||
+		    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
+			if (input_mode == listnewconfig) {
+				if (sym->name && !sym_is_choice_value(sym)) {
+					printf("%s%s\n", CONFIG_, sym->name);
+				}
+			} else if (input_mode != olddefconfig) {
+				if (!conf_cnt++)
+					printf(_("*\n* Restart config...\n*\n"));
+				rootEntry = menu_get_parent_menu(menu);
+				conf(rootEntry);
+			}
+		}
+	}
+
+	for (child = menu->list; child; child = child->next)
+		check_conf(child);
+}
+
+static struct option long_opts[] = {
+	{"oldaskconfig",    no_argument,       NULL, oldaskconfig},
+	{"oldconfig",       no_argument,       NULL, oldconfig},
+	{"silentoldconfig", no_argument,       NULL, silentoldconfig},
+	{"defconfig",       optional_argument, NULL, defconfig},
+	{"savedefconfig",   required_argument, NULL, savedefconfig},
+	{"allnoconfig",     no_argument,       NULL, allnoconfig},
+	{"allyesconfig",    no_argument,       NULL, allyesconfig},
+	{"allmodconfig",    no_argument,       NULL, allmodconfig},
+	{"alldefconfig",    no_argument,       NULL, alldefconfig},
+	{"randconfig",      no_argument,       NULL, randconfig},
+	{"listnewconfig",   no_argument,       NULL, listnewconfig},
+	{"olddefconfig",    no_argument,       NULL, olddefconfig},
+	/*
+	 * oldnoconfig is an alias of olddefconfig, because people already
+	 * are dependent on its behavior(sets new symbols to their default
+	 * value but not 'n') with the counter-intuitive name.
+	 */
+	{"oldnoconfig",     no_argument,       NULL, olddefconfig},
+	{NULL, 0, NULL, 0}
+};
+
+static void conf_usage(const char *progname)
+{
+
+	printf("Usage: %s [option] <kconfig-file>\n", progname);
+	printf("[option] is _one_ of the following:\n");
+	printf("  --listnewconfig         List new options\n");
+	printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
+	printf("  --oldconfig             Update a configuration using a provided .config as base\n");
+	printf("  --silentoldconfig       Same as oldconfig, but quietly, additionally update deps\n");
+	printf("  --olddefconfig          Same as silentoldconfig but sets new symbols to their default value\n");
+	printf("  --oldnoconfig           An alias of olddefconfig\n");
+	printf("  --defconfig <file>      New config with default defined in <file>\n");
+	printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
+	printf("  --allnoconfig           New config where all options are answered with no\n");
+	printf("  --allyesconfig          New config where all options are answered with yes\n");
+	printf("  --allmodconfig          New config where all options are answered with mod\n");
+	printf("  --alldefconfig          New config with all symbols set to default\n");
+	printf("  --randconfig            New config with random answer to all options\n");
+}
+
+int main(int ac, char **av)
+{
+	const char *progname = av[0];
+	int opt;
+	const char *name, *defconfig_file = NULL /* gcc uninit */;
+	struct stat tmpstat;
+	const char *input_file = NULL, *output_file = NULL;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	tty_stdio = isatty(0) && isatty(1) && isatty(2);
+
+	while ((opt = getopt_long(ac, av, "r:w:", long_opts, NULL)) != -1) {
+		switch (opt) {
+		case silentoldconfig:
+			sync_kconfig = 1;
+			break;
+		case defconfig:
+		case savedefconfig:
+			defconfig_file = optarg;
+			break;
+		case randconfig:
+		{
+			struct timeval now;
+			unsigned int seed;
+
+			/*
+			 * Use microseconds derived seed,
+			 * compensate for systems where it may be zero
+			 */
+			gettimeofday(&now, NULL);
+
+			seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
+			srand(seed);
+			break;
+		}
+		case oldaskconfig:
+		case oldconfig:
+		case allnoconfig:
+		case allyesconfig:
+		case allmodconfig:
+		case alldefconfig:
+		case listnewconfig:
+		case olddefconfig:
+			break;
+		case 'r':
+			input_file = optarg;
+			continue;
+		case 'w':
+			output_file = optarg;
+			continue;
+		case '?':
+			conf_usage(progname);
+			exit(1);
+			break;
+		}
+		input_mode = (enum input_mode)opt;
+	}
+	if (ac == optind) {
+		printf(_("%s: Kconfig file missing\n"), av[0]);
+		conf_usage(progname);
+		exit(1);
+	}
+	name = av[optind];
+	conf_parse(name);
+	//zconfdump(stdout);
+	if (sync_kconfig) {
+		name = conf_get_configname();
+		if (stat(name, &tmpstat)) {
+			fprintf(stderr, _("***\n"
+				"*** Configuration file \"%s\" not found!\n"
+				"***\n"
+				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
+				"*** \"make menuconfig\" or \"make xconfig\").\n"
+				"***\n"), name);
+			exit(1);
+		}
+	}
+
+	switch (input_mode) {
+	case defconfig:
+		if (!defconfig_file)
+			defconfig_file = conf_get_default_confname();
+		if (conf_read(defconfig_file)) {
+			printf(_("***\n"
+				"*** Can't find default configuration \"%s\"!\n"
+				"***\n"), defconfig_file);
+			exit(1);
+		}
+		break;
+	case savedefconfig:
+	case silentoldconfig:
+	case oldaskconfig:
+	case oldconfig:
+	case listnewconfig:
+	case olddefconfig:
+	case allnoconfig:
+	case allyesconfig:
+	case allmodconfig:
+	case alldefconfig:
+	case randconfig:
+		conf_read(input_file);
+		break;
+	default:
+		break;
+	}
+
+	if (sync_kconfig) {
+		if (conf_get_changed()) {
+			name = getenv("KCONFIG_NOSILENTUPDATE");
+			if (name && *name) {
+				fprintf(stderr,
+					_("\n*** The configuration requires explicit update.\n\n"));
+				return 1;
+			}
+		}
+		valid_stdin = tty_stdio;
+	}
+
+	switch (input_mode) {
+	case allnoconfig:
+		conf_set_all_new_symbols(def_no);
+		break;
+	case allyesconfig:
+		conf_set_all_new_symbols(def_yes);
+		break;
+	case allmodconfig:
+		conf_set_all_new_symbols(def_mod);
+		break;
+	case alldefconfig:
+		conf_set_all_new_symbols(def_default);
+		break;
+	case randconfig:
+		conf_set_all_new_symbols(def_random);
+		break;
+	case defconfig:
+		conf_set_all_new_symbols(def_default);
+		break;
+	case savedefconfig:
+		break;
+	case oldaskconfig:
+		rootEntry = &rootmenu;
+		conf(&rootmenu);
+		input_mode = silentoldconfig;
+		/* fall through */
+	case oldconfig:
+	case listnewconfig:
+	case olddefconfig:
+	case silentoldconfig:
+		/* Update until a loop caused no more changes */
+		do {
+			conf_cnt = 0;
+			check_conf(&rootmenu);
+		} while (conf_cnt &&
+			 (input_mode != listnewconfig &&
+			  input_mode != olddefconfig));
+		break;
+	}
+
+	if (sync_kconfig) {
+		/* silentoldconfig is used during the build so we shall update autoconf.
+		 * All other commands are only used to generate a config.
+		 */
+		if ((output_file || conf_get_changed()) &&
+		    conf_write(output_file)) {
+			fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
+			exit(1);
+		}
+		if (conf_write_autoconf()) {
+			fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));
+			return 1;
+		}
+	} else if (input_mode == savedefconfig) {
+		if (conf_write_defconfig(defconfig_file)) {
+			fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
+			        defconfig_file);
+			return 1;
+		}
+	} else if (input_mode != listnewconfig) {
+		if (conf_write(output_file)) {
+			fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
+			exit(1);
+		}
+	}
+	return 0;
+}
+
+/*
+ * Helper function to facilitate fgets() by Jean Sacren.
+ */
+void xfgets(char *str, int size, FILE *in)
+{
+	if (fgets(str, size, in) == NULL)
+		fprintf(stderr, "\nError in reading or end of file.\n");
+}
diff --git a/trunk/scripts/config/confdata.c b/trunk/scripts/config/confdata.c
new file mode 100644
index 00000000..cdc9736d
--- /dev/null
+++ b/trunk/scripts/config/confdata.c
@@ -0,0 +1,1167 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <sys/stat.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "lkc.h"
+
+static void conf_warning(const char *fmt, ...)
+	__attribute__ ((format (printf, 1, 2)));
+
+static void conf_message(const char *fmt, ...)
+	__attribute__ ((format (printf, 1, 2)));
+
+static const char *conf_filename;
+static int conf_lineno, conf_warnings, conf_unsaved;
+
+const char conf_defname[] = "arch/$ARCH/defconfig";
+
+static void conf_warning(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	fprintf(stderr, "%s:%d:warning: ", conf_filename, conf_lineno);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "\n");
+	va_end(ap);
+	conf_warnings++;
+}
+
+static void conf_default_message_callback(const char *fmt, va_list ap)
+{
+	printf("#\n# ");
+	vprintf(fmt, ap);
+	printf("\n#\n");
+}
+
+static void (*conf_message_callback) (const char *fmt, va_list ap) =
+	conf_default_message_callback;
+void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap))
+{
+	conf_message_callback = fn;
+}
+
+static void conf_message(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	if (conf_message_callback)
+		conf_message_callback(fmt, ap);
+}
+
+const char *conf_get_configname(void)
+{
+	char *name = getenv("KCONFIG_CONFIG");
+
+	return name ? name : ".config";
+}
+
+const char *conf_get_autoconfig_name(void)
+{
+	char *name = getenv("KCONFIG_AUTOCONFIG");
+
+	return name ? name : "include/config/auto.conf";
+}
+
+static char *conf_expand_value(const char *in)
+{
+	struct symbol *sym;
+	const char *src;
+	static char res_value[SYMBOL_MAXLENGTH];
+	char *dst, name[SYMBOL_MAXLENGTH];
+
+	res_value[0] = 0;
+	dst = name;
+	while ((src = strchr(in, '$'))) {
+		strncat(res_value, in, src - in);
+		src++;
+		dst = name;
+		while (isalnum(*src) || *src == '_')
+			*dst++ = *src++;
+		*dst = 0;
+		sym = sym_lookup(name, 0);
+		sym_calc_value(sym);
+		strcat(res_value, sym_get_string_value(sym));
+		in = src;
+	}
+	strcat(res_value, in);
+
+	return res_value;
+}
+
+char *conf_get_default_confname(void)
+{
+	struct stat buf;
+	static char fullname[PATH_MAX+1];
+	char *env, *name;
+
+	name = conf_expand_value(conf_defname);
+	env = getenv(SRCTREE);
+	if (env) {
+		sprintf(fullname, "%s/%s", env, name);
+		if (!stat(fullname, &buf))
+			return fullname;
+	}
+	return name;
+}
+
+static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
+{
+	char *p2;
+
+	switch (sym->type) {
+	case S_TRISTATE:
+		if (p[0] == 'm') {
+			sym->def[def].tri = mod;
+			sym->flags |= def_flags;
+			break;
+		}
+		/* fall through */
+	case S_BOOLEAN:
+		if (p[0] == 'y') {
+			sym->def[def].tri = yes;
+			sym->flags |= def_flags;
+			break;
+		}
+		if (p[0] == 'n') {
+			sym->def[def].tri = no;
+			sym->flags |= def_flags;
+			break;
+		}
+		conf_warning("symbol value '%s' invalid for %s", p, sym->name);
+		return 1;
+	case S_OTHER:
+		if (*p != '"') {
+			for (p2 = p; *p2 && !isspace(*p2); p2++)
+				;
+			sym->type = S_STRING;
+			goto done;
+		}
+		/* fall through */
+	case S_STRING:
+		if (*p++ != '"')
+			break;
+		for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) {
+			if (*p2 == '"') {
+				*p2 = 0;
+				break;
+			}
+			memmove(p2, p2 + 1, strlen(p2));
+		}
+		if (!p2) {
+			conf_warning("invalid string found");
+			return 1;
+		}
+		/* fall through */
+	case S_INT:
+	case S_HEX:
+	done:
+		if (sym_string_valid(sym, p)) {
+			sym->def[def].val = strdup(p);
+			sym->flags |= def_flags;
+		} else {
+			conf_warning("symbol value '%s' invalid for %s", p, sym->name);
+			return 1;
+		}
+		break;
+	default:
+		;
+	}
+	return 0;
+}
+
+#define LINE_GROWTH 16
+static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
+{
+	char *nline;
+	size_t new_size = slen + 1;
+	if (new_size > *n) {
+		new_size += LINE_GROWTH - 1;
+		new_size *= 2;
+		nline = realloc(*lineptr, new_size);
+		if (!nline)
+			return -1;
+
+		*lineptr = nline;
+		*n = new_size;
+	}
+
+	(*lineptr)[slen] = c;
+
+	return 0;
+}
+
+static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream)
+{
+	char *line = *lineptr;
+	size_t slen = 0;
+
+	for (;;) {
+		int c = getc(stream);
+
+		switch (c) {
+		case '\n':
+			if (add_byte(c, &line, slen, n) < 0)
+				goto e_out;
+			slen++;
+			/* fall through */
+		case EOF:
+			if (add_byte('\0', &line, slen, n) < 0)
+				goto e_out;
+			*lineptr = line;
+			if (slen == 0)
+				return -1;
+			return slen;
+		default:
+			if (add_byte(c, &line, slen, n) < 0)
+				goto e_out;
+			slen++;
+		}
+	}
+
+e_out:
+	line[slen-1] = '\0';
+	*lineptr = line;
+	return -1;
+}
+
+void conf_reset(int def)
+{
+	struct symbol *sym;
+	int i, def_flags;
+
+	def_flags = SYMBOL_DEF << def;
+	for_all_symbols(i, sym) {
+		sym->flags |= SYMBOL_CHANGED;
+		sym->flags &= ~(def_flags|SYMBOL_VALID);
+		if (sym_is_choice(sym))
+			sym->flags |= def_flags;
+		switch (sym->type) {
+		case S_INT:
+		case S_HEX:
+		case S_STRING:
+			if (sym->def[def].val)
+				free(sym->def[def].val);
+			/* fall through */
+		default:
+			sym->def[def].val = NULL;
+			sym->def[def].tri = no;
+		}
+	}
+}
+
+int conf_read_simple(const char *name, int def)
+{
+	FILE *in = NULL;
+	char   *line = NULL;
+	size_t  line_asize = 0;
+	char *p, *p2;
+	struct symbol *sym;
+	int def_flags;
+
+	if (name) {
+		in = zconf_fopen(name);
+	} else {
+		struct property *prop;
+
+		name = conf_get_configname();
+		in = zconf_fopen(name);
+		if (in)
+			goto load;
+		sym_add_change_count(1);
+		if (!sym_defconfig_list) {
+			if (modules_sym)
+				sym_calc_value(modules_sym);
+			return 1;
+		}
+
+		for_all_defaults(sym_defconfig_list, prop) {
+			if (expr_calc_value(prop->visible.expr) == no ||
+			    prop->expr->type != E_SYMBOL)
+				continue;
+			name = conf_expand_value(prop->expr->left.sym->name);
+			in = zconf_fopen(name);
+			if (in) {
+				conf_message(_("using defaults found in %s"),
+					 name);
+				goto load;
+			}
+		}
+	}
+	if (!in)
+		return 1;
+
+load:
+	conf_filename = name;
+	conf_lineno = 0;
+	conf_warnings = 0;
+	conf_unsaved = 0;
+
+	def_flags = SYMBOL_DEF << def;
+	conf_reset(def);
+
+	while (compat_getline(&line, &line_asize, in) != -1) {
+		conf_lineno++;
+		sym = NULL;
+		if (line[0] == '#') {
+			if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))
+				continue;
+			p = strchr(line + 2 + strlen(CONFIG_), ' ');
+			if (!p)
+				continue;
+			*p++ = 0;
+			if (strncmp(p, "is not set", 10))
+				continue;
+			if (def == S_DEF_USER) {
+				sym = sym_find(line + 2 + strlen(CONFIG_));
+				if (!sym) {
+					sym_add_change_count(1);
+					goto setsym;
+				}
+			} else {
+				sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
+				if (sym->type == S_UNKNOWN)
+					sym->type = S_BOOLEAN;
+			}
+			switch (sym->type) {
+			case S_BOOLEAN:
+			case S_TRISTATE:
+				sym->def[def].tri = no;
+				sym->flags |= def_flags;
+				break;
+			default:
+				;
+			}
+		} else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
+			p = strchr(line + strlen(CONFIG_), '=');
+			if (!p)
+				continue;
+			*p++ = 0;
+			p2 = strchr(p, '\n');
+			if (p2) {
+				*p2-- = 0;
+				if (*p2 == '\r')
+					*p2 = 0;
+			}
+			if (def == S_DEF_USER) {
+				sym = sym_find(line + strlen(CONFIG_));
+				if (!sym) {
+					sym_add_change_count(1);
+					goto setsym;
+				}
+			} else {
+				sym = sym_lookup(line + strlen(CONFIG_), 0);
+				if (sym->type == S_UNKNOWN)
+					sym->type = S_OTHER;
+			}
+			if (conf_set_sym_val(sym, def, def_flags, p))
+				continue;
+		} else {
+			if (line[0] != '\r' && line[0] != '\n')
+				conf_warning("unexpected data");
+			continue;
+		}
+setsym:
+		if (sym && sym_is_choice_value(sym)) {
+			struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+			switch (sym->def[def].tri) {
+			case no:
+				break;
+			case mod:
+				if (cs->def[def].tri == yes) {
+					conf_warning("%s creates inconsistent choice state", sym->name);
+					cs->flags &= ~def_flags;
+				}
+				break;
+			case yes:
+				if (cs->def[def].tri != no)
+					conf_warning("override: %s changes choice state", sym->name);
+				cs->def[def].val = sym;
+				break;
+			}
+			cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
+		}
+	}
+	free(line);
+	fclose(in);
+
+	if (modules_sym)
+		sym_calc_value(modules_sym);
+	return 0;
+}
+
+int conf_read(const char *name)
+{
+	struct symbol *sym;
+	int i;
+
+	sym_set_change_count(0);
+
+	if (conf_read_simple(name, S_DEF_USER))
+		return 1;
+
+	for_all_symbols(i, sym) {
+		sym_calc_value(sym);
+		if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO))
+			continue;
+		if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
+			/* check that calculated value agrees with saved value */
+			switch (sym->type) {
+			case S_BOOLEAN:
+			case S_TRISTATE:
+				if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym))
+					break;
+				if (!sym_is_choice(sym))
+					continue;
+				/* fall through */
+			default:
+				if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
+					continue;
+				break;
+			}
+		} else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE))
+			/* no previous value and not saved */
+			continue;
+		conf_unsaved++;
+		/* maybe print value in verbose mode... */
+	}
+
+	for_all_symbols(i, sym) {
+		if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
+			/* Reset values of generates values, so they'll appear
+			 * as new, if they should become visible, but that
+			 * doesn't quite work if the Kconfig and the saved
+			 * configuration disagree.
+			 */
+			if (sym->visible == no && !conf_unsaved)
+				sym->flags &= ~SYMBOL_DEF_USER;
+			switch (sym->type) {
+			case S_STRING:
+			case S_INT:
+			case S_HEX:
+				/* Reset a string value if it's out of range */
+				if (sym_string_within_range(sym, sym->def[S_DEF_USER].val))
+					break;
+				sym->flags &= ~(SYMBOL_VALID|SYMBOL_DEF_USER);
+				conf_unsaved++;
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	sym_add_change_count(conf_warnings || conf_unsaved);
+
+	return 0;
+}
+
+/*
+ * Kconfig configuration printer
+ *
+ * This printer is used when generating the resulting configuration after
+ * kconfig invocation and `defconfig' files. Unset symbol might be omitted by
+ * passing a non-NULL argument to the printer.
+ *
+ */
+static void
+kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
+{
+
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		if (*value == 'n') {
+			bool skip_unset = (arg != NULL);
+
+			if (!skip_unset)
+				fprintf(fp, "# %s%s is not set\n",
+				    CONFIG_, sym->name);
+			return;
+		}
+		break;
+	default:
+		break;
+	}
+
+	fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value);
+}
+
+static void
+kconfig_print_comment(FILE *fp, const char *value, void *arg)
+{
+	const char *p = value;
+	size_t l;
+
+	for (;;) {
+		l = strcspn(p, "\n");
+		fprintf(fp, "#");
+		if (l) {
+			fprintf(fp, " ");
+			xfwrite(p, l, 1, fp);
+			p += l;
+		}
+		fprintf(fp, "\n");
+		if (*p++ == '\0')
+			break;
+	}
+}
+
+static struct conf_printer kconfig_printer_cb =
+{
+	.print_symbol = kconfig_print_symbol,
+	.print_comment = kconfig_print_comment,
+};
+
+/*
+ * Header printer
+ *
+ * This printer is used when generating the `include/generated/autoconf.h' file.
+ */
+static void
+header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
+{
+
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE: {
+		const char *suffix = "";
+
+		switch (*value) {
+		case 'n':
+			break;
+		case 'm':
+			suffix = "_MODULE";
+			/* fall through */
+		default:
+			fprintf(fp, "#define %s%s%s 1\n",
+			    CONFIG_, sym->name, suffix);
+		}
+		break;
+	}
+	case S_HEX: {
+		const char *prefix = "";
+
+		if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))
+			prefix = "0x";
+		fprintf(fp, "#define %s%s %s%s\n",
+		    CONFIG_, sym->name, prefix, value);
+		break;
+	}
+	case S_STRING:
+	case S_INT:
+		fprintf(fp, "#define %s%s %s\n",
+		    CONFIG_, sym->name, value);
+		break;
+	default:
+		break;
+	}
+
+}
+
+static void
+header_print_comment(FILE *fp, const char *value, void *arg)
+{
+	const char *p = value;
+	size_t l;
+
+	fprintf(fp, "/*\n");
+	for (;;) {
+		l = strcspn(p, "\n");
+		fprintf(fp, " *");
+		if (l) {
+			fprintf(fp, " ");
+			xfwrite(p, l, 1, fp);
+			p += l;
+		}
+		fprintf(fp, "\n");
+		if (*p++ == '\0')
+			break;
+	}
+	fprintf(fp, " */\n");
+}
+
+static struct conf_printer header_printer_cb =
+{
+	.print_symbol = header_print_symbol,
+	.print_comment = header_print_comment,
+};
+
+/*
+ * Tristate printer
+ *
+ * This printer is used when generating the `include/config/tristate.conf' file.
+ */
+static void
+tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
+{
+
+	if (sym->type == S_TRISTATE && *value != 'n')
+		fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value));
+}
+
+static struct conf_printer tristate_printer_cb =
+{
+	.print_symbol = tristate_print_symbol,
+	.print_comment = kconfig_print_comment,
+};
+
+static void conf_write_symbol(FILE *fp, struct symbol *sym,
+			      struct conf_printer *printer, void *printer_arg)
+{
+	const char *str;
+
+	switch (sym->type) {
+	case S_OTHER:
+	case S_UNKNOWN:
+		break;
+	case S_STRING:
+		str = sym_get_string_value(sym);
+		str = sym_escape_string_value(str);
+		printer->print_symbol(fp, sym, str, printer_arg);
+		free((void *)str);
+		break;
+	default:
+		str = sym_get_string_value(sym);
+		printer->print_symbol(fp, sym, str, printer_arg);
+	}
+}
+
+static void
+conf_write_heading(FILE *fp, struct conf_printer *printer, void *printer_arg)
+{
+	char buf[256];
+
+	snprintf(buf, sizeof(buf),
+	    "\n"
+	    "Automatically generated file; DO NOT EDIT.\n"
+	    "%s\n",
+	    rootmenu.prompt->text);
+
+	printer->print_comment(fp, buf, printer_arg);
+}
+
+/*
+ * Write out a minimal config.
+ * All values that has default values are skipped as this is redundant.
+ */
+int conf_write_defconfig(const char *filename)
+{
+	struct symbol *sym;
+	struct menu *menu;
+	FILE *out;
+
+	out = fopen(filename, "w");
+	if (!out)
+		return 1;
+
+	sym_clear_all_valid();
+
+	/* Traverse all menus to find all relevant symbols */
+	menu = rootmenu.list;
+
+	while (menu != NULL)
+	{
+		sym = menu->sym;
+		if (sym == NULL) {
+			if (!menu_is_visible(menu))
+				goto next_menu;
+		} else if (!sym_is_choice(sym)) {
+			sym_calc_value(sym);
+			if (!(sym->flags & SYMBOL_WRITE))
+				goto next_menu;
+			sym->flags &= ~SYMBOL_WRITE;
+			/* If we cannot change the symbol - skip */
+			if (!sym_is_changable(sym))
+				goto next_menu;
+			/* If symbol equals to default value - skip */
+			if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
+				goto next_menu;
+
+			/*
+			 * If symbol is a choice value and equals to the
+			 * default for a choice - skip.
+			 * But only if value is bool and equal to "y" and
+			 * choice is not "optional".
+			 * (If choice is "optional" then all values can be "n")
+			 */
+			if (sym_is_choice_value(sym)) {
+				struct symbol *cs;
+				struct symbol *ds;
+
+				cs = prop_get_symbol(sym_get_choice_prop(sym));
+				ds = sym_choice_default(cs);
+				if (!sym_is_optional(cs) && sym == ds) {
+					if ((sym->type == S_BOOLEAN) &&
+					    sym_get_tristate_value(sym) == yes)
+						goto next_menu;
+				}
+			}
+			conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
+		}
+next_menu:
+		if (menu->list != NULL) {
+			menu = menu->list;
+		}
+		else if (menu->next != NULL) {
+			menu = menu->next;
+		} else {
+			while ((menu = menu->parent)) {
+				if (menu->next != NULL) {
+					menu = menu->next;
+					break;
+				}
+			}
+		}
+	}
+	fclose(out);
+	return 0;
+}
+
+int conf_write(const char *name)
+{
+	FILE *out;
+	struct symbol *sym;
+	struct menu *menu;
+	const char *basename;
+	const char *str;
+	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
+	char *env;
+
+	dirname[0] = 0;
+	if (name && name[0]) {
+		struct stat st;
+		char *slash;
+
+		if (!stat(name, &st) && S_ISDIR(st.st_mode)) {
+			strcpy(dirname, name);
+			strcat(dirname, "/");
+			basename = conf_get_configname();
+		} else if ((slash = strrchr(name, '/'))) {
+			int size = slash - name + 1;
+			memcpy(dirname, name, size);
+			dirname[size] = 0;
+			if (slash[1])
+				basename = slash + 1;
+			else
+				basename = conf_get_configname();
+		} else
+			basename = name;
+	} else
+		basename = conf_get_configname();
+
+	sprintf(newname, "%s%s", dirname, basename);
+	env = getenv("KCONFIG_OVERWRITECONFIG");
+	if (!env || !*env) {
+		sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid());
+		out = fopen(tmpname, "w");
+	} else {
+		*tmpname = 0;
+		out = fopen(newname, "w");
+	}
+	if (!out)
+		return 1;
+
+	conf_write_heading(out, &kconfig_printer_cb, NULL);
+
+	if (!conf_get_changed())
+		sym_clear_all_valid();
+
+	menu = rootmenu.list;
+	while (menu) {
+		sym = menu->sym;
+		if (!sym) {
+			if (!menu_is_visible(menu))
+				goto next;
+			str = menu_get_prompt(menu);
+			fprintf(out, "\n"
+				     "#\n"
+				     "# %s\n"
+				     "#\n", str);
+		} else if (!(sym->flags & SYMBOL_CHOICE)) {
+			sym_calc_value(sym);
+			if (!(sym->flags & SYMBOL_WRITE))
+				goto next;
+			sym->flags &= ~SYMBOL_WRITE;
+
+			conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
+		}
+
+next:
+		if (menu->list) {
+			menu = menu->list;
+			continue;
+		}
+		if (menu->next)
+			menu = menu->next;
+		else while ((menu = menu->parent)) {
+			if (menu->next) {
+				menu = menu->next;
+				break;
+			}
+		}
+	}
+	fclose(out);
+
+	if (*tmpname) {
+		strcat(dirname, basename);
+		strcat(dirname, ".old");
+		rename(newname, dirname);
+		if (rename(tmpname, newname))
+			return 1;
+	}
+
+	conf_message(_("configuration written to %s"), newname);
+
+	sym_set_change_count(0);
+
+	return 0;
+}
+
+static int conf_split_config(void)
+{
+	const char *name;
+	char path[PATH_MAX+1];
+	char *s, *d, c;
+	struct symbol *sym;
+	struct stat sb;
+	int res, i, fd;
+
+	name = conf_get_autoconfig_name();
+	conf_read_simple(name, S_DEF_AUTO);
+
+	if (chdir("include/config"))
+		return 1;
+
+	res = 0;
+	for_all_symbols(i, sym) {
+		sym_calc_value(sym);
+		if ((sym->flags & SYMBOL_AUTO) || !sym->name)
+			continue;
+		if (sym->flags & SYMBOL_WRITE) {
+			if (sym->flags & SYMBOL_DEF_AUTO) {
+				/*
+				 * symbol has old and new value,
+				 * so compare them...
+				 */
+				switch (sym->type) {
+				case S_BOOLEAN:
+				case S_TRISTATE:
+					if (sym_get_tristate_value(sym) ==
+					    sym->def[S_DEF_AUTO].tri)
+						continue;
+					break;
+				case S_STRING:
+				case S_HEX:
+				case S_INT:
+					if (!strcmp(sym_get_string_value(sym),
+						    sym->def[S_DEF_AUTO].val))
+						continue;
+					break;
+				default:
+					break;
+				}
+			} else {
+				/*
+				 * If there is no old value, only 'no' (unset)
+				 * is allowed as new value.
+				 */
+				switch (sym->type) {
+				case S_BOOLEAN:
+				case S_TRISTATE:
+					if (sym_get_tristate_value(sym) == no)
+						continue;
+					break;
+				default:
+					break;
+				}
+			}
+		} else if (!(sym->flags & SYMBOL_DEF_AUTO))
+			/* There is neither an old nor a new value. */
+			continue;
+		/* else
+		 *	There is an old value, but no new value ('no' (unset)
+		 *	isn't saved in auto.conf, so the old value is always
+		 *	different from 'no').
+		 */
+
+		/* Replace all '_' and append ".h" */
+		s = sym->name;
+		d = path;
+		while ((c = *s++)) {
+			c = tolower(c);
+			*d++ = (c == '_') ? '/' : c;
+		}
+		strcpy(d, ".h");
+
+		/* Assume directory path already exists. */
+		fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+		if (fd == -1) {
+			if (errno != ENOENT) {
+				res = 1;
+				break;
+			}
+			/*
+			 * Create directory components,
+			 * unless they exist already.
+			 */
+			d = path;
+			while ((d = strchr(d, '/'))) {
+				*d = 0;
+				if (stat(path, &sb) && mkdir(path, 0755)) {
+					res = 1;
+					goto out;
+				}
+				*d++ = '/';
+			}
+			/* Try it again. */
+			fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+			if (fd == -1) {
+				res = 1;
+				break;
+			}
+		}
+		close(fd);
+	}
+out:
+	if (chdir("../.."))
+		return 1;
+
+	return res;
+}
+
+int conf_write_autoconf(void)
+{
+	struct symbol *sym;
+	const char *name;
+	FILE *out, *tristate, *out_h;
+	int i;
+
+	sym_clear_all_valid();
+
+	file_write_dep("include/config/auto.conf.cmd");
+
+	if (conf_split_config())
+		return 1;
+
+	out = fopen(".tmpconfig", "w");
+	if (!out)
+		return 1;
+
+	tristate = fopen(".tmpconfig_tristate", "w");
+	if (!tristate) {
+		fclose(out);
+		return 1;
+	}
+
+	out_h = fopen(".tmpconfig.h", "w");
+	if (!out_h) {
+		fclose(out);
+		fclose(tristate);
+		return 1;
+	}
+
+	conf_write_heading(out, &kconfig_printer_cb, NULL);
+
+	conf_write_heading(tristate, &tristate_printer_cb, NULL);
+
+	conf_write_heading(out_h, &header_printer_cb, NULL);
+
+	for_all_symbols(i, sym) {
+		sym_calc_value(sym);
+		if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
+			continue;
+
+		/* write symbol to auto.conf, tristate and header files */
+		conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);
+
+		conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
+
+		conf_write_symbol(out_h, sym, &header_printer_cb, NULL);
+	}
+	fclose(out);
+	fclose(tristate);
+	fclose(out_h);
+
+	name = getenv("KCONFIG_AUTOHEADER");
+	if (!name)
+		name = "include/generated/autoconf.h";
+	if (rename(".tmpconfig.h", name))
+		return 1;
+	name = getenv("KCONFIG_TRISTATE");
+	if (!name)
+		name = "include/config/tristate.conf";
+	if (rename(".tmpconfig_tristate", name))
+		return 1;
+	name = conf_get_autoconfig_name();
+	/*
+	 * This must be the last step, kbuild has a dependency on auto.conf
+	 * and this marks the successful completion of the previous steps.
+	 */
+	if (rename(".tmpconfig", name))
+		return 1;
+
+	return 0;
+}
+
+static int sym_change_count;
+static void (*conf_changed_callback)(void);
+
+void sym_set_change_count(int count)
+{
+	int _sym_change_count = sym_change_count;
+	sym_change_count = count;
+	if (conf_changed_callback &&
+	    (bool)_sym_change_count != (bool)count)
+		conf_changed_callback();
+}
+
+void sym_add_change_count(int count)
+{
+	sym_set_change_count(count + sym_change_count);
+}
+
+bool conf_get_changed(void)
+{
+	return sym_change_count;
+}
+
+void conf_set_changed_callback(void (*fn)(void))
+{
+	conf_changed_callback = fn;
+}
+
+static void randomize_choice_values(struct symbol *csym)
+{
+	struct property *prop;
+	struct symbol *sym;
+	struct expr *e;
+	int cnt, def;
+
+	/*
+	 * If choice is mod then we may have more items selected
+	 * and if no then no-one.
+	 * In both cases stop.
+	 */
+	if (csym->curr.tri != yes)
+		return;
+
+	prop = sym_get_choice_prop(csym);
+
+	/* count entries in choice block */
+	cnt = 0;
+	expr_list_for_each_sym(prop->expr, e, sym)
+		cnt++;
+
+	/*
+	 * find a random value and set it to yes,
+	 * set the rest to no so we have only one set
+	 */
+	def = (rand() % cnt);
+
+	cnt = 0;
+	expr_list_for_each_sym(prop->expr, e, sym) {
+		if (def == cnt++) {
+			sym->def[S_DEF_USER].tri = yes;
+			csym->def[S_DEF_USER].val = sym;
+		}
+		else {
+			sym->def[S_DEF_USER].tri = no;
+		}
+	}
+	csym->flags |= SYMBOL_DEF_USER;
+	/* clear VALID to get value calculated */
+	csym->flags &= ~(SYMBOL_VALID);
+}
+
+static void set_all_choice_values(struct symbol *csym)
+{
+	struct property *prop;
+	struct symbol *sym;
+	struct expr *e;
+
+	prop = sym_get_choice_prop(csym);
+
+	/*
+	 * Set all non-assinged choice values to no
+	 */
+	expr_list_for_each_sym(prop->expr, e, sym) {
+		if (!sym_has_value(sym))
+			sym->def[S_DEF_USER].tri = no;
+	}
+	csym->flags |= SYMBOL_DEF_USER;
+	/* clear VALID to get value calculated */
+	csym->flags &= ~(SYMBOL_VALID);
+}
+
+void conf_set_all_new_symbols(enum conf_def_mode mode)
+{
+	struct symbol *sym, *csym;
+	int i, cnt;
+
+	for_all_symbols(i, sym) {
+		if (sym_has_value(sym))
+			continue;
+		switch (sym_get_type(sym)) {
+		case S_BOOLEAN:
+		case S_TRISTATE:
+			switch (mode) {
+			case def_yes:
+				sym->def[S_DEF_USER].tri = yes;
+				break;
+			case def_mod:
+				sym->def[S_DEF_USER].tri = mod;
+				break;
+			case def_no:
+				sym->def[S_DEF_USER].tri = no;
+				break;
+			case def_random:
+				cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2;
+				sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt);
+				break;
+			default:
+				continue;
+			}
+			if (!(sym_is_choice(sym) && mode == def_random))
+				sym->flags |= SYMBOL_DEF_USER;
+			break;
+		default:
+			break;
+		}
+
+	}
+
+	sym_clear_all_valid();
+
+	/*
+	 * We have different type of choice blocks.
+	 * If curr.tri equals to mod then we can select several
+	 * choice symbols in one block.
+	 * In this case we do nothing.
+	 * If curr.tri equals yes then only one symbol can be
+	 * selected in a choice block and we set it to yes,
+	 * and the rest to no.
+	 */
+	for_all_symbols(i, csym) {
+		if (sym_has_value(csym) || !sym_is_choice(csym))
+			continue;
+
+		sym_calc_value(csym);
+		if (mode == def_random)
+			randomize_choice_values(csym);
+		else
+			set_all_choice_values(csym);
+	}
+}
diff --git a/trunk/scripts/config/expr.c b/trunk/scripts/config/expr.c
new file mode 100644
index 00000000..d6626521
--- /dev/null
+++ b/trunk/scripts/config/expr.c
@@ -0,0 +1,1168 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lkc.h"
+
+#define DEBUG_EXPR	0
+
+struct expr *expr_alloc_symbol(struct symbol *sym)
+{
+	struct expr *e = xcalloc(1, sizeof(*e));
+	e->type = E_SYMBOL;
+	e->left.sym = sym;
+	return e;
+}
+
+struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)
+{
+	struct expr *e = xcalloc(1, sizeof(*e));
+	e->type = type;
+	e->left.expr = ce;
+	return e;
+}
+
+struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2)
+{
+	struct expr *e = xcalloc(1, sizeof(*e));
+	e->type = type;
+	e->left.expr = e1;
+	e->right.expr = e2;
+	return e;
+}
+
+struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2)
+{
+	struct expr *e = xcalloc(1, sizeof(*e));
+	e->type = type;
+	e->left.sym = s1;
+	e->right.sym = s2;
+	return e;
+}
+
+struct expr *expr_alloc_and(struct expr *e1, struct expr *e2)
+{
+	if (!e1)
+		return e2;
+	return e2 ? expr_alloc_two(E_AND, e1, e2) : e1;
+}
+
+struct expr *expr_alloc_or(struct expr *e1, struct expr *e2)
+{
+	if (!e1)
+		return e2;
+	return e2 ? expr_alloc_two(E_OR, e1, e2) : e1;
+}
+
+struct expr *expr_copy(const struct expr *org)
+{
+	struct expr *e;
+
+	if (!org)
+		return NULL;
+
+	e = xmalloc(sizeof(*org));
+	memcpy(e, org, sizeof(*org));
+	switch (org->type) {
+	case E_SYMBOL:
+		e->left = org->left;
+		break;
+	case E_NOT:
+		e->left.expr = expr_copy(org->left.expr);
+		break;
+	case E_EQUAL:
+	case E_UNEQUAL:
+		e->left.sym = org->left.sym;
+		e->right.sym = org->right.sym;
+		break;
+	case E_AND:
+	case E_OR:
+	case E_LIST:
+		e->left.expr = expr_copy(org->left.expr);
+		e->right.expr = expr_copy(org->right.expr);
+		break;
+	default:
+		printf("can't copy type %d\n", e->type);
+		free(e);
+		e = NULL;
+		break;
+	}
+
+	return e;
+}
+
+void expr_free(struct expr *e)
+{
+	if (!e)
+		return;
+
+	switch (e->type) {
+	case E_SYMBOL:
+		break;
+	case E_NOT:
+		expr_free(e->left.expr);
+		return;
+	case E_EQUAL:
+	case E_UNEQUAL:
+		break;
+	case E_OR:
+	case E_AND:
+		expr_free(e->left.expr);
+		expr_free(e->right.expr);
+		break;
+	default:
+		printf("how to free type %d?\n", e->type);
+		break;
+	}
+	free(e);
+}
+
+static int trans_count;
+
+#define e1 (*ep1)
+#define e2 (*ep2)
+
+static void __expr_eliminate_eq(enum expr_type type, struct expr **ep1, struct expr **ep2)
+{
+	if (e1->type == type) {
+		__expr_eliminate_eq(type, &e1->left.expr, &e2);
+		__expr_eliminate_eq(type, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		__expr_eliminate_eq(type, &e1, &e2->left.expr);
+		__expr_eliminate_eq(type, &e1, &e2->right.expr);
+		return;
+	}
+	if (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&
+	    e1->left.sym == e2->left.sym &&
+	    (e1->left.sym == &symbol_yes || e1->left.sym == &symbol_no))
+		return;
+	if (!expr_eq(e1, e2))
+		return;
+	trans_count++;
+	expr_free(e1); expr_free(e2);
+	switch (type) {
+	case E_OR:
+		e1 = expr_alloc_symbol(&symbol_no);
+		e2 = expr_alloc_symbol(&symbol_no);
+		break;
+	case E_AND:
+		e1 = expr_alloc_symbol(&symbol_yes);
+		e2 = expr_alloc_symbol(&symbol_yes);
+		break;
+	default:
+		;
+	}
+}
+
+void expr_eliminate_eq(struct expr **ep1, struct expr **ep2)
+{
+	if (!e1 || !e2)
+		return;
+	switch (e1->type) {
+	case E_OR:
+	case E_AND:
+		__expr_eliminate_eq(e1->type, ep1, ep2);
+	default:
+		;
+	}
+	if (e1->type != e2->type) switch (e2->type) {
+	case E_OR:
+	case E_AND:
+		__expr_eliminate_eq(e2->type, ep1, ep2);
+	default:
+		;
+	}
+	e1 = expr_eliminate_yn(e1);
+	e2 = expr_eliminate_yn(e2);
+}
+
+#undef e1
+#undef e2
+
+int expr_eq(struct expr *e1, struct expr *e2)
+{
+	int res, old_count;
+
+	if (e1->type != e2->type)
+		return 0;
+	switch (e1->type) {
+	case E_EQUAL:
+	case E_UNEQUAL:
+		return e1->left.sym == e2->left.sym && e1->right.sym == e2->right.sym;
+	case E_SYMBOL:
+		return e1->left.sym == e2->left.sym;
+	case E_NOT:
+		return expr_eq(e1->left.expr, e2->left.expr);
+	case E_AND:
+	case E_OR:
+		e1 = expr_copy(e1);
+		e2 = expr_copy(e2);
+		old_count = trans_count;
+		expr_eliminate_eq(&e1, &e2);
+		res = (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&
+		       e1->left.sym == e2->left.sym);
+		expr_free(e1);
+		expr_free(e2);
+		trans_count = old_count;
+		return res;
+	case E_LIST:
+	case E_RANGE:
+	case E_NONE:
+		/* panic */;
+	}
+
+	if (DEBUG_EXPR) {
+		expr_fprint(e1, stdout);
+		printf(" = ");
+		expr_fprint(e2, stdout);
+		printf(" ?\n");
+	}
+
+	return 0;
+}
+
+struct expr *expr_eliminate_yn(struct expr *e)
+{
+	struct expr *tmp;
+
+	if (e) switch (e->type) {
+	case E_AND:
+		e->left.expr = expr_eliminate_yn(e->left.expr);
+		e->right.expr = expr_eliminate_yn(e->right.expr);
+		if (e->left.expr->type == E_SYMBOL) {
+			if (e->left.expr->left.sym == &symbol_no) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_no;
+				e->right.expr = NULL;
+				return e;
+			} else if (e->left.expr->left.sym == &symbol_yes) {
+				free(e->left.expr);
+				tmp = e->right.expr;
+				*e = *(e->right.expr);
+				free(tmp);
+				return e;
+			}
+		}
+		if (e->right.expr->type == E_SYMBOL) {
+			if (e->right.expr->left.sym == &symbol_no) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_no;
+				e->right.expr = NULL;
+				return e;
+			} else if (e->right.expr->left.sym == &symbol_yes) {
+				free(e->right.expr);
+				tmp = e->left.expr;
+				*e = *(e->left.expr);
+				free(tmp);
+				return e;
+			}
+		}
+		break;
+	case E_OR:
+		e->left.expr = expr_eliminate_yn(e->left.expr);
+		e->right.expr = expr_eliminate_yn(e->right.expr);
+		if (e->left.expr->type == E_SYMBOL) {
+			if (e->left.expr->left.sym == &symbol_no) {
+				free(e->left.expr);
+				tmp = e->right.expr;
+				*e = *(e->right.expr);
+				free(tmp);
+				return e;
+			} else if (e->left.expr->left.sym == &symbol_yes) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_yes;
+				e->right.expr = NULL;
+				return e;
+			}
+		}
+		if (e->right.expr->type == E_SYMBOL) {
+			if (e->right.expr->left.sym == &symbol_no) {
+				free(e->right.expr);
+				tmp = e->left.expr;
+				*e = *(e->left.expr);
+				free(tmp);
+				return e;
+			} else if (e->right.expr->left.sym == &symbol_yes) {
+				expr_free(e->left.expr);
+				expr_free(e->right.expr);
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_yes;
+				e->right.expr = NULL;
+				return e;
+			}
+		}
+		break;
+	default:
+		;
+	}
+	return e;
+}
+
+/*
+ * bool FOO!=n => FOO
+ */
+struct expr *expr_trans_bool(struct expr *e)
+{
+	if (!e)
+		return NULL;
+	switch (e->type) {
+	case E_AND:
+	case E_OR:
+	case E_NOT:
+		e->left.expr = expr_trans_bool(e->left.expr);
+		e->right.expr = expr_trans_bool(e->right.expr);
+		break;
+	case E_UNEQUAL:
+		// FOO!=n -> FOO
+		if (e->left.sym->type == S_TRISTATE) {
+			if (e->right.sym == &symbol_no) {
+				e->type = E_SYMBOL;
+				e->right.sym = NULL;
+			}
+		}
+		break;
+	default:
+		;
+	}
+	return e;
+}
+
+/*
+ * e1 || e2 -> ?
+ */
+static struct expr *expr_join_or(struct expr *e1, struct expr *e2)
+{
+	struct expr *tmp;
+	struct symbol *sym1, *sym2;
+
+	if (expr_eq(e1, e2))
+		return expr_copy(e1);
+	if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT)
+		return NULL;
+	if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT)
+		return NULL;
+	if (e1->type == E_NOT) {
+		tmp = e1->left.expr;
+		if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL)
+			return NULL;
+		sym1 = tmp->left.sym;
+	} else
+		sym1 = e1->left.sym;
+	if (e2->type == E_NOT) {
+		if (e2->left.expr->type != E_SYMBOL)
+			return NULL;
+		sym2 = e2->left.expr->left.sym;
+	} else
+		sym2 = e2->left.sym;
+	if (sym1 != sym2)
+		return NULL;
+	if (sym1->type != S_BOOLEAN && sym1->type != S_TRISTATE)
+		return NULL;
+	if (sym1->type == S_TRISTATE) {
+		if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+		    ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+		     (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
+			// (a='y') || (a='m') -> (a!='n')
+			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no);
+		}
+		if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+		    ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+		     (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) {
+			// (a='y') || (a='n') -> (a!='m')
+			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod);
+		}
+		if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
+		    ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+		     (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) {
+			// (a='m') || (a='n') -> (a!='y')
+			return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
+		}
+	}
+	if (sym1->type == S_BOOLEAN && sym1 == sym2) {
+		if ((e1->type == E_NOT && e1->left.expr->type == E_SYMBOL && e2->type == E_SYMBOL) ||
+		    (e2->type == E_NOT && e2->left.expr->type == E_SYMBOL && e1->type == E_SYMBOL))
+			return expr_alloc_symbol(&symbol_yes);
+	}
+
+	if (DEBUG_EXPR) {
+		printf("optimize (");
+		expr_fprint(e1, stdout);
+		printf(") || (");
+		expr_fprint(e2, stdout);
+		printf(")?\n");
+	}
+	return NULL;
+}
+
+static struct expr *expr_join_and(struct expr *e1, struct expr *e2)
+{
+	struct expr *tmp;
+	struct symbol *sym1, *sym2;
+
+	if (expr_eq(e1, e2))
+		return expr_copy(e1);
+	if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT)
+		return NULL;
+	if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT)
+		return NULL;
+	if (e1->type == E_NOT) {
+		tmp = e1->left.expr;
+		if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL)
+			return NULL;
+		sym1 = tmp->left.sym;
+	} else
+		sym1 = e1->left.sym;
+	if (e2->type == E_NOT) {
+		if (e2->left.expr->type != E_SYMBOL)
+			return NULL;
+		sym2 = e2->left.expr->left.sym;
+	} else
+		sym2 = e2->left.sym;
+	if (sym1 != sym2)
+		return NULL;
+	if (sym1->type != S_BOOLEAN && sym1->type != S_TRISTATE)
+		return NULL;
+
+	if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
+	    (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
+		// (a) && (a='y') -> (a='y')
+		return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+	if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) ||
+	    (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no))
+		// (a) && (a!='n') -> (a)
+		return expr_alloc_symbol(sym1);
+
+	if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
+	    (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
+		// (a) && (a!='m') -> (a='y')
+		return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+	if (sym1->type == S_TRISTATE) {
+		if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
+			// (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
+			sym2 = e1->right.sym;
+			if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+				return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+							     : expr_alloc_symbol(&symbol_no);
+		}
+		if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
+			// (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
+			sym2 = e2->right.sym;
+			if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
+				return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
+							     : expr_alloc_symbol(&symbol_no);
+		}
+		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+			   ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
+			    (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
+			// (a!='y') && (a!='n') -> (a='m')
+			return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod);
+
+		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+			   ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
+			    (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes)))
+			// (a!='y') && (a!='m') -> (a='n')
+			return expr_alloc_comp(E_EQUAL, sym1, &symbol_no);
+
+		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
+			   ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
+			    (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
+			// (a!='m') && (a!='n') -> (a='m')
+			return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
+
+		if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
+		    (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_mod) ||
+		    (e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_yes) ||
+		    (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_yes))
+			return NULL;
+	}
+
+	if (DEBUG_EXPR) {
+		printf("optimize (");
+		expr_fprint(e1, stdout);
+		printf(") && (");
+		expr_fprint(e2, stdout);
+		printf(")?\n");
+	}
+	return NULL;
+}
+
+static void expr_eliminate_dups1(enum expr_type type, struct expr **ep1, struct expr **ep2)
+{
+#define e1 (*ep1)
+#define e2 (*ep2)
+	struct expr *tmp;
+
+	if (e1->type == type) {
+		expr_eliminate_dups1(type, &e1->left.expr, &e2);
+		expr_eliminate_dups1(type, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		expr_eliminate_dups1(type, &e1, &e2->left.expr);
+		expr_eliminate_dups1(type, &e1, &e2->right.expr);
+		return;
+	}
+	if (e1 == e2)
+		return;
+
+	switch (e1->type) {
+	case E_OR: case E_AND:
+		expr_eliminate_dups1(e1->type, &e1, &e1);
+	default:
+		;
+	}
+
+	switch (type) {
+	case E_OR:
+		tmp = expr_join_or(e1, e2);
+		if (tmp) {
+			expr_free(e1); expr_free(e2);
+			e1 = expr_alloc_symbol(&symbol_no);
+			e2 = tmp;
+			trans_count++;
+		}
+		break;
+	case E_AND:
+		tmp = expr_join_and(e1, e2);
+		if (tmp) {
+			expr_free(e1); expr_free(e2);
+			e1 = expr_alloc_symbol(&symbol_yes);
+			e2 = tmp;
+			trans_count++;
+		}
+		break;
+	default:
+		;
+	}
+#undef e1
+#undef e2
+}
+
+static void expr_eliminate_dups2(enum expr_type type, struct expr **ep1, struct expr **ep2)
+{
+#define e1 (*ep1)
+#define e2 (*ep2)
+	struct expr *tmp, *tmp1, *tmp2;
+
+	if (e1->type == type) {
+		expr_eliminate_dups2(type, &e1->left.expr, &e2);
+		expr_eliminate_dups2(type, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		expr_eliminate_dups2(type, &e1, &e2->left.expr);
+		expr_eliminate_dups2(type, &e1, &e2->right.expr);
+	}
+	if (e1 == e2)
+		return;
+
+	switch (e1->type) {
+	case E_OR:
+		expr_eliminate_dups2(e1->type, &e1, &e1);
+		// (FOO || BAR) && (!FOO && !BAR) -> n
+		tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+		tmp2 = expr_copy(e2);
+		tmp = expr_extract_eq_and(&tmp1, &tmp2);
+		if (expr_is_yes(tmp1)) {
+			expr_free(e1);
+			e1 = expr_alloc_symbol(&symbol_no);
+			trans_count++;
+		}
+		expr_free(tmp2);
+		expr_free(tmp1);
+		expr_free(tmp);
+		break;
+	case E_AND:
+		expr_eliminate_dups2(e1->type, &e1, &e1);
+		// (FOO && BAR) || (!FOO || !BAR) -> y
+		tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
+		tmp2 = expr_copy(e2);
+		tmp = expr_extract_eq_or(&tmp1, &tmp2);
+		if (expr_is_no(tmp1)) {
+			expr_free(e1);
+			e1 = expr_alloc_symbol(&symbol_yes);
+			trans_count++;
+		}
+		expr_free(tmp2);
+		expr_free(tmp1);
+		expr_free(tmp);
+		break;
+	default:
+		;
+	}
+#undef e1
+#undef e2
+}
+
+struct expr *expr_eliminate_dups(struct expr *e)
+{
+	int oldcount;
+	if (!e)
+		return e;
+
+	oldcount = trans_count;
+	while (1) {
+		trans_count = 0;
+		switch (e->type) {
+		case E_OR: case E_AND:
+			expr_eliminate_dups1(e->type, &e, &e);
+			expr_eliminate_dups2(e->type, &e, &e);
+		default:
+			;
+		}
+		if (!trans_count)
+			break;
+		e = expr_eliminate_yn(e);
+	}
+	trans_count = oldcount;
+	return e;
+}
+
+struct expr *expr_transform(struct expr *e)
+{
+	struct expr *tmp;
+
+	if (!e)
+		return NULL;
+	switch (e->type) {
+	case E_EQUAL:
+	case E_UNEQUAL:
+	case E_SYMBOL:
+	case E_LIST:
+		break;
+	default:
+		e->left.expr = expr_transform(e->left.expr);
+		e->right.expr = expr_transform(e->right.expr);
+	}
+
+	switch (e->type) {
+	case E_EQUAL:
+		if (e->left.sym->type != S_BOOLEAN)
+			break;
+		if (e->right.sym == &symbol_no) {
+			e->type = E_NOT;
+			e->left.expr = expr_alloc_symbol(e->left.sym);
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_mod) {
+			printf("boolean symbol %s tested for 'm'? test forced to 'n'\n", e->left.sym->name);
+			e->type = E_SYMBOL;
+			e->left.sym = &symbol_no;
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_yes) {
+			e->type = E_SYMBOL;
+			e->right.sym = NULL;
+			break;
+		}
+		break;
+	case E_UNEQUAL:
+		if (e->left.sym->type != S_BOOLEAN)
+			break;
+		if (e->right.sym == &symbol_no) {
+			e->type = E_SYMBOL;
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_mod) {
+			printf("boolean symbol %s tested for 'm'? test forced to 'y'\n", e->left.sym->name);
+			e->type = E_SYMBOL;
+			e->left.sym = &symbol_yes;
+			e->right.sym = NULL;
+			break;
+		}
+		if (e->right.sym == &symbol_yes) {
+			e->type = E_NOT;
+			e->left.expr = expr_alloc_symbol(e->left.sym);
+			e->right.sym = NULL;
+			break;
+		}
+		break;
+	case E_NOT:
+		switch (e->left.expr->type) {
+		case E_NOT:
+			// !!a -> a
+			tmp = e->left.expr->left.expr;
+			free(e->left.expr);
+			free(e);
+			e = tmp;
+			e = expr_transform(e);
+			break;
+		case E_EQUAL:
+		case E_UNEQUAL:
+			// !a='x' -> a!='x'
+			tmp = e->left.expr;
+			free(e);
+			e = tmp;
+			e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
+			break;
+		case E_OR:
+			// !(a || b) -> !a && !b
+			tmp = e->left.expr;
+			e->type = E_AND;
+			e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+			tmp->type = E_NOT;
+			tmp->right.expr = NULL;
+			e = expr_transform(e);
+			break;
+		case E_AND:
+			// !(a && b) -> !a || !b
+			tmp = e->left.expr;
+			e->type = E_OR;
+			e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
+			tmp->type = E_NOT;
+			tmp->right.expr = NULL;
+			e = expr_transform(e);
+			break;
+		case E_SYMBOL:
+			if (e->left.expr->left.sym == &symbol_yes) {
+				// !'y' -> 'n'
+				tmp = e->left.expr;
+				free(e);
+				e = tmp;
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_no;
+				break;
+			}
+			if (e->left.expr->left.sym == &symbol_mod) {
+				// !'m' -> 'm'
+				tmp = e->left.expr;
+				free(e);
+				e = tmp;
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_mod;
+				break;
+			}
+			if (e->left.expr->left.sym == &symbol_no) {
+				// !'n' -> 'y'
+				tmp = e->left.expr;
+				free(e);
+				e = tmp;
+				e->type = E_SYMBOL;
+				e->left.sym = &symbol_yes;
+				break;
+			}
+			break;
+		default:
+			;
+		}
+		break;
+	default:
+		;
+	}
+	return e;
+}
+
+int expr_contains_symbol(struct expr *dep, struct symbol *sym)
+{
+	if (!dep)
+		return 0;
+
+	switch (dep->type) {
+	case E_AND:
+	case E_OR:
+		return expr_contains_symbol(dep->left.expr, sym) ||
+		       expr_contains_symbol(dep->right.expr, sym);
+	case E_SYMBOL:
+		return dep->left.sym == sym;
+	case E_EQUAL:
+	case E_UNEQUAL:
+		return dep->left.sym == sym ||
+		       dep->right.sym == sym;
+	case E_NOT:
+		return expr_contains_symbol(dep->left.expr, sym);
+	default:
+		;
+	}
+	return 0;
+}
+
+bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
+{
+	if (!dep)
+		return false;
+
+	switch (dep->type) {
+	case E_AND:
+		return expr_depends_symbol(dep->left.expr, sym) ||
+		       expr_depends_symbol(dep->right.expr, sym);
+	case E_SYMBOL:
+		return dep->left.sym == sym;
+	case E_EQUAL:
+		if (dep->left.sym == sym) {
+			if (dep->right.sym == &symbol_yes || dep->right.sym == &symbol_mod)
+				return true;
+		}
+		break;
+	case E_UNEQUAL:
+		if (dep->left.sym == sym) {
+			if (dep->right.sym == &symbol_no)
+				return true;
+		}
+		break;
+	default:
+		;
+	}
+ 	return false;
+}
+
+struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
+{
+	struct expr *tmp = NULL;
+	expr_extract_eq(E_AND, &tmp, ep1, ep2);
+	if (tmp) {
+		*ep1 = expr_eliminate_yn(*ep1);
+		*ep2 = expr_eliminate_yn(*ep2);
+	}
+	return tmp;
+}
+
+struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
+{
+	struct expr *tmp = NULL;
+	expr_extract_eq(E_OR, &tmp, ep1, ep2);
+	if (tmp) {
+		*ep1 = expr_eliminate_yn(*ep1);
+		*ep2 = expr_eliminate_yn(*ep2);
+	}
+	return tmp;
+}
+
+void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)
+{
+#define e1 (*ep1)
+#define e2 (*ep2)
+	if (e1->type == type) {
+		expr_extract_eq(type, ep, &e1->left.expr, &e2);
+		expr_extract_eq(type, ep, &e1->right.expr, &e2);
+		return;
+	}
+	if (e2->type == type) {
+		expr_extract_eq(type, ep, ep1, &e2->left.expr);
+		expr_extract_eq(type, ep, ep1, &e2->right.expr);
+		return;
+	}
+	if (expr_eq(e1, e2)) {
+		*ep = *ep ? expr_alloc_two(type, *ep, e1) : e1;
+		expr_free(e2);
+		if (type == E_AND) {
+			e1 = expr_alloc_symbol(&symbol_yes);
+			e2 = expr_alloc_symbol(&symbol_yes);
+		} else if (type == E_OR) {
+			e1 = expr_alloc_symbol(&symbol_no);
+			e2 = expr_alloc_symbol(&symbol_no);
+		}
+	}
+#undef e1
+#undef e2
+}
+
+struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym)
+{
+	struct expr *e1, *e2;
+
+	if (!e) {
+		e = expr_alloc_symbol(sym);
+		if (type == E_UNEQUAL)
+			e = expr_alloc_one(E_NOT, e);
+		return e;
+	}
+	switch (e->type) {
+	case E_AND:
+		e1 = expr_trans_compare(e->left.expr, E_EQUAL, sym);
+		e2 = expr_trans_compare(e->right.expr, E_EQUAL, sym);
+		if (sym == &symbol_yes)
+			e = expr_alloc_two(E_AND, e1, e2);
+		if (sym == &symbol_no)
+			e = expr_alloc_two(E_OR, e1, e2);
+		if (type == E_UNEQUAL)
+			e = expr_alloc_one(E_NOT, e);
+		return e;
+	case E_OR:
+		e1 = expr_trans_compare(e->left.expr, E_EQUAL, sym);
+		e2 = expr_trans_compare(e->right.expr, E_EQUAL, sym);
+		if (sym == &symbol_yes)
+			e = expr_alloc_two(E_OR, e1, e2);
+		if (sym == &symbol_no)
+			e = expr_alloc_two(E_AND, e1, e2);
+		if (type == E_UNEQUAL)
+			e = expr_alloc_one(E_NOT, e);
+		return e;
+	case E_NOT:
+		return expr_trans_compare(e->left.expr, type == E_EQUAL ? E_UNEQUAL : E_EQUAL, sym);
+	case E_UNEQUAL:
+	case E_EQUAL:
+		if (type == E_EQUAL) {
+			if (sym == &symbol_yes)
+				return expr_copy(e);
+			if (sym == &symbol_mod)
+				return expr_alloc_symbol(&symbol_no);
+			if (sym == &symbol_no)
+				return expr_alloc_one(E_NOT, expr_copy(e));
+		} else {
+			if (sym == &symbol_yes)
+				return expr_alloc_one(E_NOT, expr_copy(e));
+			if (sym == &symbol_mod)
+				return expr_alloc_symbol(&symbol_yes);
+			if (sym == &symbol_no)
+				return expr_copy(e);
+		}
+		break;
+	case E_SYMBOL:
+		return expr_alloc_comp(type, e->left.sym, sym);
+	case E_LIST:
+	case E_RANGE:
+	case E_NONE:
+		/* panic */;
+	}
+	return NULL;
+}
+
+tristate expr_calc_value(struct expr *e)
+{
+	tristate val1, val2;
+	const char *str1, *str2;
+
+	if (!e)
+		return yes;
+
+	switch (e->type) {
+	case E_SYMBOL:
+		sym_calc_value(e->left.sym);
+		return e->left.sym->curr.tri;
+	case E_AND:
+		val1 = expr_calc_value(e->left.expr);
+		val2 = expr_calc_value(e->right.expr);
+		return EXPR_AND(val1, val2);
+	case E_OR:
+		val1 = expr_calc_value(e->left.expr);
+		val2 = expr_calc_value(e->right.expr);
+		return EXPR_OR(val1, val2);
+	case E_NOT:
+		val1 = expr_calc_value(e->left.expr);
+		return EXPR_NOT(val1);
+	case E_EQUAL:
+		sym_calc_value(e->left.sym);
+		sym_calc_value(e->right.sym);
+		str1 = sym_get_string_value(e->left.sym);
+		str2 = sym_get_string_value(e->right.sym);
+		return !strcmp(str1, str2) ? yes : no;
+	case E_UNEQUAL:
+		sym_calc_value(e->left.sym);
+		sym_calc_value(e->right.sym);
+		str1 = sym_get_string_value(e->left.sym);
+		str2 = sym_get_string_value(e->right.sym);
+		return !strcmp(str1, str2) ? no : yes;
+	default:
+		printf("expr_calc_value: %d?\n", e->type);
+		return no;
+	}
+}
+
+int expr_compare_type(enum expr_type t1, enum expr_type t2)
+{
+#if 0
+	return 1;
+#else
+	if (t1 == t2)
+		return 0;
+	switch (t1) {
+	case E_EQUAL:
+	case E_UNEQUAL:
+		if (t2 == E_NOT)
+			return 1;
+	case E_NOT:
+		if (t2 == E_AND)
+			return 1;
+	case E_AND:
+		if (t2 == E_OR)
+			return 1;
+	case E_OR:
+		if (t2 == E_LIST)
+			return 1;
+	case E_LIST:
+		if (t2 == 0)
+			return 1;
+	default:
+		return -1;
+	}
+	printf("[%dgt%d?]", t1, t2);
+	return 0;
+#endif
+}
+
+static inline struct expr *
+expr_get_leftmost_symbol(const struct expr *e)
+{
+
+	if (e == NULL)
+		return NULL;
+
+	while (e->type != E_SYMBOL)
+		e = e->left.expr;
+
+	return expr_copy(e);
+}
+
+/*
+ * Given expression `e1' and `e2', returns the leaf of the longest
+ * sub-expression of `e1' not containing 'e2.
+ */
+struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2)
+{
+	struct expr *ret;
+
+	switch (e1->type) {
+	case E_OR:
+		return expr_alloc_and(
+		    expr_simplify_unmet_dep(e1->left.expr, e2),
+		    expr_simplify_unmet_dep(e1->right.expr, e2));
+	case E_AND: {
+		struct expr *e;
+		e = expr_alloc_and(expr_copy(e1), expr_copy(e2));
+		e = expr_eliminate_dups(e);
+		ret = (!expr_eq(e, e1)) ? e1 : NULL;
+		expr_free(e);
+		break;
+		}
+	default:
+		ret = e1;
+		break;
+	}
+
+	return expr_get_leftmost_symbol(ret);
+}
+
+void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)
+{
+	if (!e) {
+		fn(data, NULL, "y");
+		return;
+	}
+
+	if (expr_compare_type(prevtoken, e->type) > 0)
+		fn(data, NULL, "(");
+	switch (e->type) {
+	case E_SYMBOL:
+		if (e->left.sym->name)
+			fn(data, e->left.sym, e->left.sym->name);
+		else
+			fn(data, NULL, "<choice>");
+		break;
+	case E_NOT:
+		fn(data, NULL, "!");
+		expr_print(e->left.expr, fn, data, E_NOT);
+		break;
+	case E_EQUAL:
+		if (e->left.sym->name)
+			fn(data, e->left.sym, e->left.sym->name);
+		else
+			fn(data, NULL, "<choice>");
+		fn(data, NULL, "=");
+		fn(data, e->right.sym, e->right.sym->name);
+		break;
+	case E_UNEQUAL:
+		if (e->left.sym->name)
+			fn(data, e->left.sym, e->left.sym->name);
+		else
+			fn(data, NULL, "<choice>");
+		fn(data, NULL, "!=");
+		fn(data, e->right.sym, e->right.sym->name);
+		break;
+	case E_OR:
+		expr_print(e->left.expr, fn, data, E_OR);
+		fn(data, NULL, " || ");
+		expr_print(e->right.expr, fn, data, E_OR);
+		break;
+	case E_AND:
+		expr_print(e->left.expr, fn, data, E_AND);
+		fn(data, NULL, " && ");
+		expr_print(e->right.expr, fn, data, E_AND);
+		break;
+	case E_LIST:
+		fn(data, e->right.sym, e->right.sym->name);
+		if (e->left.expr) {
+			fn(data, NULL, " ^ ");
+			expr_print(e->left.expr, fn, data, E_LIST);
+		}
+		break;
+	case E_RANGE:
+		fn(data, NULL, "[");
+		fn(data, e->left.sym, e->left.sym->name);
+		fn(data, NULL, " ");
+		fn(data, e->right.sym, e->right.sym->name);
+		fn(data, NULL, "]");
+		break;
+	default:
+	  {
+		char buf[32];
+		sprintf(buf, "<unknown type %d>", e->type);
+		fn(data, NULL, buf);
+		break;
+	  }
+	}
+	if (expr_compare_type(prevtoken, e->type) > 0)
+		fn(data, NULL, ")");
+}
+
+static void expr_print_file_helper(void *data, struct symbol *sym, const char *str)
+{
+	xfwrite(str, strlen(str), 1, data);
+}
+
+void expr_fprint(struct expr *e, FILE *out)
+{
+	expr_print(e, expr_print_file_helper, out, E_NONE);
+}
+
+static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str)
+{
+	struct gstr *gs = (struct gstr*)data;
+	const char *sym_str = NULL;
+
+	if (sym)
+		sym_str = sym_get_string_value(sym);
+
+	if (gs->max_width) {
+		unsigned extra_length = strlen(str);
+		const char *last_cr = strrchr(gs->s, '\n');
+		unsigned last_line_length;
+
+		if (sym_str)
+			extra_length += 4 + strlen(sym_str);
+
+		if (!last_cr)
+			last_cr = gs->s;
+
+		last_line_length = strlen(gs->s) - (last_cr - gs->s);
+
+		if ((last_line_length + extra_length) > gs->max_width)
+			str_append(gs, "\\\n");
+	}
+
+	str_append(gs, str);
+	if (sym && sym->type != S_UNKNOWN)
+		str_printf(gs, " [=%s]", sym_str);
+}
+
+void expr_gstr_print(struct expr *e, struct gstr *gs)
+{
+	expr_print(e, expr_print_gstr_helper, gs, E_NONE);
+}
diff --git a/trunk/scripts/config/expr.h b/trunk/scripts/config/expr.h
new file mode 100644
index 00000000..691cb2b4
--- /dev/null
+++ b/trunk/scripts/config/expr.h
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#ifndef EXPR_H
+#define EXPR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include "list.h"
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+struct file {
+	struct file *next;
+	struct file *parent;
+	const char *name;
+	int lineno;
+};
+
+typedef enum tristate {
+	no, mod, yes
+} tristate;
+
+enum expr_type {
+	E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_LIST, E_SYMBOL, E_RANGE
+};
+
+union expr_data {
+	struct expr *expr;
+	struct symbol *sym;
+};
+
+struct expr {
+	enum expr_type type;
+	union expr_data left, right;
+};
+
+#define EXPR_OR(dep1, dep2)	(((dep1)>(dep2))?(dep1):(dep2))
+#define EXPR_AND(dep1, dep2)	(((dep1)<(dep2))?(dep1):(dep2))
+#define EXPR_NOT(dep)		(2-(dep))
+
+#define expr_list_for_each_sym(l, e, s) \
+	for (e = (l); e && (s = e->right.sym); e = e->left.expr)
+
+struct expr_value {
+	struct expr *expr;
+	tristate tri;
+};
+
+struct symbol_value {
+	void *val;
+	tristate tri;
+};
+
+enum symbol_type {
+	S_UNKNOWN, S_BOOLEAN, S_TRISTATE, S_INT, S_HEX, S_STRING, S_OTHER
+};
+
+/* enum values are used as index to symbol.def[] */
+enum {
+	S_DEF_USER,		/* main user value */
+	S_DEF_AUTO,		/* values read from auto.conf */
+	S_DEF_DEF3,		/* Reserved for UI usage */
+	S_DEF_DEF4,		/* Reserved for UI usage */
+	S_DEF_COUNT
+};
+
+struct symbol {
+	struct symbol *next;
+	char *name;
+	enum symbol_type type;
+	struct symbol_value curr;
+	struct symbol_value def[S_DEF_COUNT];
+	tristate visible;
+	int flags;
+	struct property *prop;
+	struct expr_value dir_dep;
+	struct expr_value rev_dep;
+};
+
+#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
+
+#define SYMBOL_CONST      0x0001  /* symbol is const */
+#define SYMBOL_CHECK      0x0008  /* used during dependency checking */
+#define SYMBOL_CHOICE     0x0010  /* start of a choice block (null name) */
+#define SYMBOL_CHOICEVAL  0x0020  /* used as a value in a choice block */
+#define SYMBOL_VALID      0x0080  /* set when symbol.curr is calculated */
+#define SYMBOL_OPTIONAL   0x0100  /* choice is optional - values can be 'n' */
+#define SYMBOL_WRITE      0x0200  /* ? */
+#define SYMBOL_CHANGED    0x0400  /* ? */
+#define SYMBOL_AUTO       0x1000  /* value from environment variable */
+#define SYMBOL_CHECKED    0x2000  /* used during dependency checking */
+#define SYMBOL_WARNED     0x8000  /* warning has been issued */
+
+/* Set when symbol.def[] is used */
+#define SYMBOL_DEF        0x10000  /* First bit of SYMBOL_DEF */
+#define SYMBOL_DEF_USER   0x10000  /* symbol.def[S_DEF_USER] is valid */
+#define SYMBOL_DEF_AUTO   0x20000  /* symbol.def[S_DEF_AUTO] is valid */
+#define SYMBOL_DEF3       0x40000  /* symbol.def[S_DEF_3] is valid */
+#define SYMBOL_DEF4       0x80000  /* symbol.def[S_DEF_4] is valid */
+
+#define SYMBOL_MAXLENGTH	256
+#define SYMBOL_HASHSIZE		9973
+
+/* A property represent the config options that can be associated
+ * with a config "symbol".
+ * Sample:
+ * config FOO
+ *         default y
+ *         prompt "foo prompt"
+ *         select BAR
+ * config BAZ
+ *         int "BAZ Value"
+ *         range 1..255
+ */
+enum prop_type {
+	P_UNKNOWN,
+	P_PROMPT,   /* prompt "foo prompt" or "BAZ Value" */
+	P_COMMENT,  /* text associated with a comment */
+	P_MENU,     /* prompt associated with a menuconfig option */
+	P_DEFAULT,  /* default y */
+	P_CHOICE,   /* choice value */
+	P_SELECT,   /* select BAR */
+	P_RANGE,    /* range 7..100 (for a symbol) */
+	P_ENV,      /* value from environment variable */
+	P_SYMBOL,   /* where a symbol is defined */
+	P_RESET,	/* reset to defaults condition */
+};
+
+struct property {
+	struct property *next;     /* next property - null if last */
+	struct symbol *sym;        /* the symbol for which the property is associated */
+	enum prop_type type;       /* type of property */
+	const char *text;          /* the prompt value - P_PROMPT, P_MENU, P_COMMENT */
+	struct expr_value visible;
+	struct expr *expr;         /* the optional conditional part of the property */
+	struct menu *menu;         /* the menu the property are associated with
+	                            * valid for: P_SELECT, P_RANGE, P_CHOICE,
+	                            * P_PROMPT, P_DEFAULT, P_MENU, P_COMMENT */
+	struct file *file;         /* what file was this property defined */
+	int lineno;                /* what lineno was this property defined */
+};
+
+#define for_all_properties(sym, st, tok) \
+	for (st = sym->prop; st; st = st->next) \
+		if (st->type == (tok))
+#define for_all_defaults(sym, st) for_all_properties(sym, st, P_DEFAULT)
+#define for_all_choices(sym, st) for_all_properties(sym, st, P_CHOICE)
+#define for_all_prompts(sym, st) \
+	for (st = sym->prop; st; st = st->next) \
+		if (st->text)
+
+struct menu {
+	struct menu *next;
+	struct menu *parent;
+	struct menu *list;
+	struct symbol *sym;
+	struct property *prompt;
+	struct expr *visibility;
+	struct expr *dep;
+	unsigned int flags;
+	char *help;
+	struct file *file;
+	int lineno;
+	void *data;
+};
+
+#define MENU_CHANGED		0x0001
+#define MENU_ROOT		0x0002
+
+struct jump_key {
+	struct list_head entries;
+	size_t offset;
+	struct menu *target;
+	int index;
+};
+
+#define JUMP_NB			9
+
+extern struct file *file_list;
+extern struct file *current_file;
+struct file *lookup_file(const char *name);
+
+extern struct symbol symbol_yes, symbol_no, symbol_mod;
+extern struct symbol *modules_sym;
+extern struct symbol *sym_defconfig_list;
+extern int cdebug;
+struct expr *expr_alloc_symbol(struct symbol *sym);
+struct expr *expr_alloc_one(enum expr_type type, struct expr *ce);
+struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2);
+struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2);
+struct expr *expr_alloc_and(struct expr *e1, struct expr *e2);
+struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);
+struct expr *expr_copy(const struct expr *org);
+void expr_free(struct expr *e);
+int expr_eq(struct expr *e1, struct expr *e2);
+void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);
+tristate expr_calc_value(struct expr *e);
+struct expr *expr_eliminate_yn(struct expr *e);
+struct expr *expr_trans_bool(struct expr *e);
+struct expr *expr_eliminate_dups(struct expr *e);
+struct expr *expr_transform(struct expr *e);
+int expr_contains_symbol(struct expr *dep, struct symbol *sym);
+bool expr_depends_symbol(struct expr *dep, struct symbol *sym);
+struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
+struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
+void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
+struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);
+struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2);
+
+void expr_fprint(struct expr *e, FILE *out);
+struct gstr; /* forward */
+void expr_gstr_print(struct expr *e, struct gstr *gs);
+
+static inline int expr_is_yes(struct expr *e)
+{
+	return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes);
+}
+
+static inline int expr_is_no(struct expr *e)
+{
+	return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EXPR_H */
diff --git a/trunk/scripts/config/list.h b/trunk/scripts/config/list.h
new file mode 100644
index 00000000..0ae730be
--- /dev/null
+++ b/trunk/scripts/config/list.h
@@ -0,0 +1,91 @@
+#ifndef LIST_H
+#define LIST_H
+
+/*
+ * Copied from include/linux/...
+ */
+
+#undef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:        the pointer to the member.
+ * @type:       the type of the container struct this is embedded in.
+ * @member:     the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({                      \
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
+	     &pos->member != (head); 	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+static inline int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add(struct list_head *_new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = _new;
+	_new->next = next;
+	_new->prev = prev;
+	prev->next = _new;
+}
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *_new, struct list_head *head)
+{
+	__list_add(_new, head->prev, head);
+}
+
+#endif
diff --git a/trunk/scripts/config/lkc.h b/trunk/scripts/config/lkc.h
new file mode 100644
index 00000000..f8aee5fc
--- /dev/null
+++ b/trunk/scripts/config/lkc.h
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#ifndef LKC_H
+#define LKC_H
+
+#include "expr.h"
+
+#ifndef KBUILD_NO_NLS
+# include <libintl.h>
+#else
+static inline const char *gettext(const char *txt) { return txt; }
+static inline void textdomain(const char *domainname) {}
+static inline void bindtextdomain(const char *name, const char *dir) {}
+static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define P(name,type,arg)	extern type name arg
+#include "lkc_proto.h"
+#undef P
+
+#define SRCTREE "srctree"
+
+#ifndef PACKAGE
+#define PACKAGE "linux"
+#endif
+
+#define LOCALEDIR "/usr/share/locale"
+
+#define _(text) gettext(text)
+#define N_(text) (text)
+
+#ifndef CONFIG_
+#define CONFIG_ "CONFIG_"
+#endif
+static inline const char *CONFIG_prefix(void)
+{
+	return getenv( "CONFIG_" ) ?: CONFIG_;
+}
+#undef CONFIG_
+#define CONFIG_ CONFIG_prefix()
+
+#define TF_COMMAND	0x0001
+#define TF_PARAM	0x0002
+#define TF_OPTION	0x0004
+
+enum conf_def_mode {
+	def_default,
+	def_yes,
+	def_mod,
+	def_no,
+	def_random
+};
+
+#define T_OPT_MODULES		1
+#define T_OPT_DEFCONFIG_LIST	2
+#define T_OPT_ENV		3
+
+struct kconf_id {
+	int name;
+	int token;
+	unsigned int flags;
+	enum symbol_type stype;
+};
+
+extern int zconfdebug;
+
+int zconfparse(void);
+void zconfdump(FILE *out);
+void zconf_starthelp(void);
+FILE *zconf_fopen(const char *name);
+void zconf_initscan(const char *name);
+void zconf_nextfile(const char *name);
+int zconf_lineno(void);
+const char *zconf_curname(void);
+
+/* confdata.c */
+const char *conf_get_configname(void);
+const char *conf_get_autoconfig_name(void);
+char *conf_get_default_confname(void);
+void sym_set_change_count(int count);
+void sym_add_change_count(int count);
+void conf_set_all_new_symbols(enum conf_def_mode mode);
+
+struct conf_printer {
+	void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
+	void (*print_comment)(FILE *, const char *, void *);
+};
+
+/* confdata.c and expr.c */
+static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
+{
+	assert(len != 0);
+
+	if (fwrite(str, len, count, out) != count)
+		fprintf(stderr, "Error in writing or end of file.\n");
+}
+
+/* menu.c */
+void _menu_init(void);
+void menu_warn(struct menu *menu, const char *fmt, ...);
+struct menu *menu_add_menu(void);
+void menu_end_menu(void);
+void menu_add_entry(struct symbol *sym);
+void menu_end_entry(void);
+void menu_add_dep(struct expr *dep);
+void menu_add_visibility(struct expr *dep);
+struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep);
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
+void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
+void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
+void menu_add_option(int token, char *arg);
+void menu_finalize(struct menu *parent);
+void menu_set_type(int type);
+
+/* util.c */
+struct file *file_lookup(const char *name);
+int file_write_dep(const char *name);
+void *xmalloc(size_t size);
+void *xcalloc(size_t nmemb, size_t size);
+
+struct gstr {
+	size_t len;
+	char  *s;
+	/*
+	* when max_width is not zero long lines in string s (if any) get
+	* wrapped not to exceed the max_width value
+	*/
+	int max_width;
+};
+struct gstr str_new(void);
+struct gstr str_assign(const char *s);
+void str_free(struct gstr *gs);
+void str_append(struct gstr *gs, const char *s);
+void str_printf(struct gstr *gs, const char *fmt, ...);
+const char *str_get(struct gstr *gs);
+
+/* symbol.c */
+extern struct expr *sym_env_list;
+
+void sym_init(void);
+void sym_clear_all_valid(void);
+void sym_set_all_changed(void);
+void sym_set_changed(struct symbol *sym);
+struct symbol *sym_choice_default(struct symbol *sym);
+const char *sym_get_string_default(struct symbol *sym);
+struct symbol *sym_check_deps(struct symbol *sym);
+struct property *prop_alloc(enum prop_type type, struct symbol *sym);
+struct symbol *prop_get_symbol(struct property *prop);
+struct property *sym_get_env_prop(struct symbol *sym);
+
+static inline tristate sym_get_tristate_value(struct symbol *sym)
+{
+	return sym->curr.tri;
+}
+
+
+static inline struct symbol *sym_get_choice_value(struct symbol *sym)
+{
+	return (struct symbol *)sym->curr.val;
+}
+
+static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval)
+{
+	return sym_set_tristate_value(chval, yes);
+}
+
+static inline bool sym_is_choice(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_CHOICE ? true : false;
+}
+
+static inline bool sym_is_choice_value(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_CHOICEVAL ? true : false;
+}
+
+static inline bool sym_is_optional(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_OPTIONAL ? true : false;
+}
+
+static inline bool sym_has_value(struct symbol *sym)
+{
+	return sym->flags & SYMBOL_DEF_USER ? true : false;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LKC_H */
diff --git a/trunk/scripts/config/lkc_proto.h b/trunk/scripts/config/lkc_proto.h
new file mode 100644
index 00000000..ec5498fa
--- /dev/null
+++ b/trunk/scripts/config/lkc_proto.h
@@ -0,0 +1,57 @@
+#include <stdarg.h>
+
+/* confdata.c */
+P(conf_parse,void,(const char *name));
+P(conf_read,int,(const char *name));
+P(conf_read_simple,int,(const char *name, int));
+P(conf_reset,void,(int));
+P(conf_write_defconfig,int,(const char *name));
+P(conf_write,int,(const char *name));
+P(conf_write_autoconf,int,(void));
+P(conf_get_changed,bool,(void));
+P(conf_set_changed_callback, void,(void (*fn)(void)));
+P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap)));
+
+/* menu.c */
+P(rootmenu,struct menu,);
+
+P(menu_is_visible, bool, (struct menu *menu));
+P(menu_has_prompt, bool, (struct menu *menu));
+P(menu_get_prompt,const char *,(struct menu *menu));
+P(menu_get_root_menu,struct menu *,(struct menu *menu));
+P(menu_get_parent_menu,struct menu *,(struct menu *menu));
+P(menu_has_help,bool,(struct menu *menu));
+P(menu_get_help,const char *,(struct menu *menu));
+P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head
+			 *head));
+P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head
+				   *head));
+P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
+
+/* symbol.c */
+P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
+
+P(sym_lookup,struct symbol *,(const char *name, int flags));
+P(sym_find,struct symbol *,(const char *name));
+P(sym_expand_string_value,const char *,(const char *in));
+P(sym_escape_string_value, const char *,(const char *in));
+P(sym_re_search,struct symbol **,(const char *pattern));
+P(sym_type_name,const char *,(enum symbol_type type));
+P(sym_calc_value,void,(struct symbol *sym));
+P(sym_get_type,enum symbol_type,(struct symbol *sym));
+P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri));
+P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri));
+P(sym_toggle_tristate_value,tristate,(struct symbol *sym));
+P(sym_string_valid,bool,(struct symbol *sym, const char *newval));
+P(sym_string_within_range,bool,(struct symbol *sym, const char *str));
+P(sym_set_string_value,bool,(struct symbol *sym, const char *newval));
+P(sym_is_changable,bool,(struct symbol *sym));
+P(sym_get_choice_prop,struct property *,(struct symbol *sym));
+P(sym_get_default_prop,struct property *,(struct symbol *sym));
+P(sym_get_string_value,const char *,(struct symbol *sym));
+
+P(prop_get_type_name,const char *,(enum prop_type type));
+
+/* expr.c */
+P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2));
+P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken));
diff --git a/trunk/scripts/config/lxdialog/check-lxdialog.sh b/trunk/scripts/config/lxdialog/check-lxdialog.sh
new file mode 100644
index 00000000..80788137
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/check-lxdialog.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+# Check ncurses compatibility
+
+# What library to link
+ldflags()
+{
+	for ext in so a dll.a dylib ; do
+		for lib in ncursesw ncurses curses ; do
+			$cc -print-file-name=lib${lib}.${ext} | grep -q /
+			if [ $? -eq 0 ]; then
+				echo "-l${lib}"
+				exit
+			fi
+		done
+	done
+	exit 1
+}
+
+# Where is ncurses.h?
+ccflags()
+{
+	if [ -f /usr/include/ncursesw/curses.h ]; then
+		echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+		echo ' -DNCURSES_WIDECHAR=1'
+	elif [ -f /usr/include/ncurses/ncurses.h ]; then
+		echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
+	elif [ -f /usr/include/ncurses/curses.h ]; then
+		echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
+	elif [ -f /usr/include/ncurses.h ]; then
+		echo '-DCURSES_LOC="<ncurses.h>"'
+	else
+		echo '-DCURSES_LOC="<curses.h>"'
+	fi
+}
+
+# Temp file, try to clean up after us
+tmp=.lxdialog.tmp
+trap "rm -f $tmp" 0 1 2 3 15
+
+# Check if we can link to ncurses
+check() {
+        $cc -x c - -o $tmp 2>/dev/null <<'EOF'
+#include CURSES_LOC
+main() {}
+EOF
+	if [ $? != 0 ]; then
+	    echo " *** Unable to find the ncurses libraries or the"       1>&2
+	    echo " *** required header files."                            1>&2
+	    echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
+	    echo " *** "                                                  1>&2
+	    echo " *** Install ncurses (ncurses-devel) and try again."    1>&2
+	    echo " *** "                                                  1>&2
+	    exit 1
+	fi
+}
+
+usage() {
+	printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
+}
+
+if [ $# -eq 0 ]; then
+	usage
+	exit 1
+fi
+
+cc=""
+case "$1" in
+	"-check")
+		shift
+		cc="$@"
+		check
+		;;
+	"-ccflags")
+		ccflags
+		;;
+	"-ldflags")
+		shift
+		cc="$@"
+		ldflags
+		;;
+	"*")
+		usage
+		exit 1
+		;;
+esac
diff --git a/trunk/scripts/config/lxdialog/checklist.c b/trunk/scripts/config/lxdialog/checklist.c
new file mode 100644
index 00000000..a2eb80fb
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/checklist.c
@@ -0,0 +1,332 @@
+/*
+ *  checklist.c -- implements the checklist box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *     Stuart Herbert - S.Herbert@sheffield.ac.uk: radiolist extension
+ *     Alessandro Rubini - rubini@ipvvis.unipv.it: merged the two
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+static int list_width, check_x, item_x;
+
+/*
+ * Print list item
+ */
+static void print_item(WINDOW * win, int choice, int selected)
+{
+	int i;
+	char *list_item = malloc(list_width + 1);
+
+	strncpy(list_item, item_str(), list_width - item_x);
+	list_item[list_width - item_x] = '\0';
+
+	/* Clear 'residue' of last item */
+	wattrset(win, dlg.menubox.atr);
+	wmove(win, choice, 0);
+	for (i = 0; i < list_width; i++)
+		waddch(win, ' ');
+
+	wmove(win, choice, check_x);
+	wattrset(win, selected ? dlg.check_selected.atr
+		 : dlg.check.atr);
+	if (!item_is_tag(':'))
+		wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
+
+	wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
+	mvwaddch(win, choice, item_x, list_item[0]);
+	wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
+	waddstr(win, list_item + 1);
+	if (selected) {
+		wmove(win, choice, check_x + 1);
+		wrefresh(win);
+	}
+	free(list_item);
+}
+
+/*
+ * Print the scroll indicators.
+ */
+static void print_arrows(WINDOW * win, int choice, int item_no, int scroll,
+	     int y, int x, int height)
+{
+	wmove(win, y, x);
+
+	if (scroll > 0) {
+		wattrset(win, dlg.uarrow.atr);
+		waddch(win, ACS_UARROW);
+		waddstr(win, "(-)");
+	} else {
+		wattrset(win, dlg.menubox.atr);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+	}
+
+	y = y + height + 1;
+	wmove(win, y, x);
+
+	if ((height < item_no) && (scroll + choice < item_no - 1)) {
+		wattrset(win, dlg.darrow.atr);
+		waddch(win, ACS_DARROW);
+		waddstr(win, "(+)");
+	} else {
+		wattrset(win, dlg.menubox_border.atr);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+	}
+}
+
+/*
+ *  Display the termination buttons
+ */
+static void print_buttons(WINDOW * dialog, int height, int width, int selected)
+{
+	int x = width / 2 - 11;
+	int y = height - 2;
+
+	print_button(dialog, gettext("Select"), y, x, selected == 0);
+	print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
+
+	wmove(dialog, y, x + 1 + 14 * selected);
+	wrefresh(dialog);
+}
+
+/*
+ * Display a dialog box with a list of options that can be turned on or off
+ * in the style of radiolist (only one option turned on at a time).
+ */
+int dialog_checklist(const char *title, const char *prompt, int height,
+		     int width, int list_height)
+{
+	int i, x, y, box_x, box_y;
+	int key = 0, button = 0, choice = 0, scroll = 0, max_choice;
+	WINDOW *dialog, *list;
+
+	/* which item to highlight */
+	item_foreach() {
+		if (item_is_tag('X'))
+			choice = item_n();
+		if (item_is_selected()) {
+			choice = item_n();
+			break;
+		}
+	}
+
+do_resize:
+	if (getmaxy(stdscr) < (height + 6))
+		return -ERRDISPLAYTOOSMALL;
+	if (getmaxx(stdscr) < (width + 6))
+		return -ERRDISPLAYTOOSMALL;
+
+	max_choice = MIN(list_height, item_count());
+
+	/* center dialog box on screen */
+	x = (COLS - width) / 2;
+	y = (LINES - height) / 2;
+
+	draw_shadow(stdscr, y, x, height, width);
+
+	dialog = newwin(height, width, y, x);
+	keypad(dialog, TRUE);
+
+	draw_box(dialog, 0, 0, height, width,
+		 dlg.dialog.atr, dlg.border.atr);
+	wattrset(dialog, dlg.border.atr);
+	mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+	for (i = 0; i < width - 2; i++)
+		waddch(dialog, ACS_HLINE);
+	wattrset(dialog, dlg.dialog.atr);
+	waddch(dialog, ACS_RTEE);
+
+	print_title(dialog, title, width);
+
+	wattrset(dialog, dlg.dialog.atr);
+	print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+	list_width = width - 6;
+	box_y = height - list_height - 5;
+	box_x = (width - list_width) / 2 - 1;
+
+	/* create new window for the list */
+	list = subwin(dialog, list_height, list_width, y + box_y + 1,
+	              x + box_x + 1);
+
+	keypad(list, TRUE);
+
+	/* draw a box around the list items */
+	draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
+	         dlg.menubox_border.atr, dlg.menubox.atr);
+
+	/* Find length of longest item in order to center checklist */
+	check_x = 0;
+	item_foreach()
+		check_x = MAX(check_x, strlen(item_str()) + 4);
+	check_x = MIN(check_x, list_width);
+
+	check_x = (list_width - check_x) / 2;
+	item_x = check_x + 4;
+
+	if (choice >= list_height) {
+		scroll = choice - list_height + 1;
+		choice -= scroll;
+	}
+
+	/* Print the list */
+	for (i = 0; i < max_choice; i++) {
+		item_set(scroll + i);
+		print_item(list, i, i == choice);
+	}
+
+	print_arrows(dialog, choice, item_count(), scroll,
+		     box_y, box_x + check_x + 5, list_height);
+
+	print_buttons(dialog, height, width, 0);
+
+	wnoutrefresh(dialog);
+	wnoutrefresh(list);
+	doupdate();
+
+	while (key != KEY_ESC) {
+		key = wgetch(dialog);
+
+		for (i = 0; i < max_choice; i++) {
+			item_set(i + scroll);
+			if (toupper(key) == toupper(item_str()[0]))
+				break;
+		}
+
+		if (i < max_choice || key == KEY_UP || key == KEY_DOWN ||
+		    key == '+' || key == '-') {
+			if (key == KEY_UP || key == '-') {
+				if (!choice) {
+					if (!scroll)
+						continue;
+					/* Scroll list down */
+					if (list_height > 1) {
+						/* De-highlight current first item */
+						item_set(scroll);
+						print_item(list, 0, FALSE);
+						scrollok(list, TRUE);
+						wscrl(list, -1);
+						scrollok(list, FALSE);
+					}
+					scroll--;
+					item_set(scroll);
+					print_item(list, 0, TRUE);
+					print_arrows(dialog, choice, item_count(),
+						     scroll, box_y, box_x + check_x + 5, list_height);
+
+					wnoutrefresh(dialog);
+					wrefresh(list);
+
+					continue;	/* wait for another key press */
+				} else
+					i = choice - 1;
+			} else if (key == KEY_DOWN || key == '+') {
+				if (choice == max_choice - 1) {
+					if (scroll + choice >= item_count() - 1)
+						continue;
+					/* Scroll list up */
+					if (list_height > 1) {
+						/* De-highlight current last item before scrolling up */
+						item_set(scroll + max_choice - 1);
+						print_item(list,
+							    max_choice - 1,
+							    FALSE);
+						scrollok(list, TRUE);
+						wscrl(list, 1);
+						scrollok(list, FALSE);
+					}
+					scroll++;
+					item_set(scroll + max_choice - 1);
+					print_item(list, max_choice - 1, TRUE);
+
+					print_arrows(dialog, choice, item_count(),
+						     scroll, box_y, box_x + check_x + 5, list_height);
+
+					wnoutrefresh(dialog);
+					wrefresh(list);
+
+					continue;	/* wait for another key press */
+				} else
+					i = choice + 1;
+			}
+			if (i != choice) {
+				/* De-highlight current item */
+				item_set(scroll + choice);
+				print_item(list, choice, FALSE);
+				/* Highlight new item */
+				choice = i;
+				item_set(scroll + choice);
+				print_item(list, choice, TRUE);
+				wnoutrefresh(dialog);
+				wrefresh(list);
+			}
+			continue;	/* wait for another key press */
+		}
+		switch (key) {
+		case 'H':
+		case 'h':
+		case '?':
+			button = 1;
+			/* fall-through */
+		case 'S':
+		case 's':
+		case ' ':
+		case '\n':
+			item_foreach()
+				item_set_selected(0);
+			item_set(scroll + choice);
+			item_set_selected(1);
+			delwin(list);
+			delwin(dialog);
+			return button;
+		case TAB:
+		case KEY_LEFT:
+		case KEY_RIGHT:
+			button = ((key == KEY_LEFT ? --button : ++button) < 0)
+			    ? 1 : (button > 1 ? 0 : button);
+
+			print_buttons(dialog, height, width, button);
+			wrefresh(dialog);
+			break;
+		case 'X':
+		case 'x':
+			key = KEY_ESC;
+			break;
+		case KEY_ESC:
+			key = on_key_esc(dialog);
+			break;
+		case KEY_RESIZE:
+			delwin(list);
+			delwin(dialog);
+			on_key_resize();
+			goto do_resize;
+		}
+
+		/* Now, update everything... */
+		doupdate();
+	}
+	delwin(list);
+	delwin(dialog);
+	return key;		/* ESC pressed */
+}
diff --git a/trunk/scripts/config/lxdialog/dialog.h b/trunk/scripts/config/lxdialog/dialog.h
new file mode 100644
index 00000000..307022a8
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/dialog.h
@@ -0,0 +1,236 @@
+/*
+ *  dialog.h -- common declarations for all dialog modules
+ *
+ *  AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+
+#ifndef KBUILD_NO_NLS
+# include <libintl.h>
+#else
+# define gettext(Msgid) ((const char *) (Msgid))
+#endif
+
+#ifdef __sun__
+#define CURS_MACROS
+#endif
+#include CURSES_LOC
+
+/*
+ * Colors in ncurses 1.9.9e do not work properly since foreground and
+ * background colors are OR'd rather than separately masked.  This version
+ * of dialog was hacked to work with ncurses 1.9.9e, making it incompatible
+ * with standard curses.  The simplest fix (to make this work with standard
+ * curses) uses the wbkgdset() function, not used in the original hack.
+ * Turn it off if we're building with 1.9.9e, since it just confuses things.
+ */
+#if defined(NCURSES_VERSION) && defined(_NEED_WRAP) && !defined(GCC_PRINTFLIKE)
+#define OLD_NCURSES 1
+#undef  wbkgdset
+#define wbkgdset(w,p)		/*nothing */
+#else
+#define OLD_NCURSES 0
+#endif
+
+#define TR(params) _tracef params
+
+#define KEY_ESC 27
+#define TAB 9
+#define MAX_LEN 2048
+#define BUF_SIZE (10*1024)
+#define MIN(x,y) (x < y ? x : y)
+#define MAX(x,y) (x > y ? x : y)
+
+#ifndef ACS_ULCORNER
+#define ACS_ULCORNER '+'
+#endif
+#ifndef ACS_LLCORNER
+#define ACS_LLCORNER '+'
+#endif
+#ifndef ACS_URCORNER
+#define ACS_URCORNER '+'
+#endif
+#ifndef ACS_LRCORNER
+#define ACS_LRCORNER '+'
+#endif
+#ifndef ACS_HLINE
+#define ACS_HLINE '-'
+#endif
+#ifndef ACS_VLINE
+#define ACS_VLINE '|'
+#endif
+#ifndef ACS_LTEE
+#define ACS_LTEE '+'
+#endif
+#ifndef ACS_RTEE
+#define ACS_RTEE '+'
+#endif
+#ifndef ACS_UARROW
+#define ACS_UARROW '^'
+#endif
+#ifndef ACS_DARROW
+#define ACS_DARROW 'v'
+#endif
+
+/* error return codes */
+#define ERRDISPLAYTOOSMALL (KEY_MAX + 1)
+
+/*
+ *   Color definitions
+ */
+struct dialog_color {
+	chtype atr;	/* Color attribute */
+	int fg;		/* foreground */
+	int bg;		/* background */
+	int hl;		/* highlight this item */
+};
+
+struct dialog_info {
+	const char *backtitle;
+	struct dialog_color screen;
+	struct dialog_color shadow;
+	struct dialog_color dialog;
+	struct dialog_color title;
+	struct dialog_color border;
+	struct dialog_color button_active;
+	struct dialog_color button_inactive;
+	struct dialog_color button_key_active;
+	struct dialog_color button_key_inactive;
+	struct dialog_color button_label_active;
+	struct dialog_color button_label_inactive;
+	struct dialog_color inputbox;
+	struct dialog_color inputbox_border;
+	struct dialog_color searchbox;
+	struct dialog_color searchbox_title;
+	struct dialog_color searchbox_border;
+	struct dialog_color position_indicator;
+	struct dialog_color menubox;
+	struct dialog_color menubox_border;
+	struct dialog_color item;
+	struct dialog_color item_selected;
+	struct dialog_color tag;
+	struct dialog_color tag_selected;
+	struct dialog_color tag_key;
+	struct dialog_color tag_key_selected;
+	struct dialog_color check;
+	struct dialog_color check_selected;
+	struct dialog_color uarrow;
+	struct dialog_color darrow;
+};
+
+/*
+ * Global variables
+ */
+extern struct dialog_info dlg;
+extern char dialog_input_result[];
+extern int saved_x, saved_y;		/* Needed in signal handler in mconf.c */
+
+/*
+ * Function prototypes
+ */
+
+/* item list as used by checklist and menubox */
+void item_reset(void);
+void item_make(const char *fmt, ...);
+void item_add_str(const char *fmt, ...);
+void item_set_tag(char tag);
+void item_set_data(void *p);
+void item_set_selected(int val);
+int item_activate_selected(void);
+void *item_data(void);
+char item_tag(void);
+
+/* item list manipulation for lxdialog use */
+#define MAXITEMSTR 200
+struct dialog_item {
+	char str[MAXITEMSTR];	/* promtp displayed */
+	char tag;
+	void *data;	/* pointer to menu item - used by menubox+checklist */
+	int selected;	/* Set to 1 by dialog_*() function if selected. */
+};
+
+/* list of lialog_items */
+struct dialog_list {
+	struct dialog_item node;
+	struct dialog_list *next;
+};
+
+extern struct dialog_list *item_cur;
+extern struct dialog_list item_nil;
+extern struct dialog_list *item_head;
+
+int item_count(void);
+void item_set(int n);
+int item_n(void);
+const char *item_str(void);
+int item_is_selected(void);
+int item_is_tag(char tag);
+#define item_foreach() \
+	for (item_cur = item_head ? item_head: item_cur; \
+	     item_cur && (item_cur != &item_nil); item_cur = item_cur->next)
+
+/* generic key handlers */
+int on_key_esc(WINDOW *win);
+int on_key_resize(void);
+
+int init_dialog(const char *backtitle);
+void set_dialog_backtitle(const char *backtitle);
+void end_dialog(int x, int y);
+void attr_clear(WINDOW * win, int height, int width, chtype attr);
+void dialog_clear(void);
+void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x);
+void print_button(WINDOW * win, const char *label, int y, int x, int selected);
+void print_title(WINDOW *dialog, const char *title, int width);
+void draw_box(WINDOW * win, int y, int x, int height, int width, chtype box,
+	      chtype border);
+void draw_shadow(WINDOW * win, int y, int x, int height, int width);
+
+int first_alpha(const char *string, const char *exempt);
+int dialog_yesno(const char *title, const char *prompt, int height, int width);
+int dialog_msgbox(const char *title, const char *prompt, int height,
+		  int width, int pause);
+
+
+typedef void (*update_text_fn)(char *buf, size_t start, size_t end, void
+			       *_data);
+int dialog_textbox(const char *title, char *tbuf, int initial_height,
+		   int initial_width, int *keys, int *_vscroll, int *_hscroll,
+		   update_text_fn update_text, void *data);
+int dialog_menu(const char *title, const char *prompt,
+		const void *selected, int *s_scroll);
+int dialog_checklist(const char *title, const char *prompt, int height,
+		     int width, int list_height);
+int dialog_inputbox(const char *title, const char *prompt, int height,
+		    int width, const char *init);
+
+/*
+ * This is the base for fictitious keys, which activate
+ * the buttons.
+ *
+ * Mouse-generated keys are the following:
+ *   -- the first 32 are used as numbers, in addition to '0'-'9'
+ *   -- the lowercase are used to signal mouse-enter events (M_EVENT + 'o')
+ *   -- uppercase chars are used to invoke the button (M_EVENT + 'O')
+ */
+#define M_EVENT (KEY_MAX+1)
diff --git a/trunk/scripts/config/lxdialog/inputbox.c b/trunk/scripts/config/lxdialog/inputbox.c
new file mode 100644
index 00000000..21404a04
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/inputbox.c
@@ -0,0 +1,301 @@
+/*
+ *  inputbox.c -- implements the input box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+char dialog_input_result[MAX_LEN + 1];
+
+/*
+ *  Print the termination buttons
+ */
+static void print_buttons(WINDOW * dialog, int height, int width, int selected)
+{
+	int x = width / 2 - 11;
+	int y = height - 2;
+
+	print_button(dialog, gettext("  Ok  "), y, x, selected == 0);
+	print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
+
+	wmove(dialog, y, x + 1 + 14 * selected);
+	wrefresh(dialog);
+}
+
+/*
+ * Display a dialog box for inputing a string
+ */
+int dialog_inputbox(const char *title, const char *prompt, int height, int width,
+                    const char *init)
+{
+	int i, x, y, box_y, box_x, box_width;
+	int input_x = 0, key = 0, button = -1;
+	int show_x, len, pos;
+	char *instr = dialog_input_result;
+	WINDOW *dialog;
+
+	if (!init)
+		instr[0] = '\0';
+	else
+		strcpy(instr, init);
+
+do_resize:
+	if (getmaxy(stdscr) <= (height - 2))
+		return -ERRDISPLAYTOOSMALL;
+	if (getmaxx(stdscr) <= (width - 2))
+		return -ERRDISPLAYTOOSMALL;
+
+	/* center dialog box on screen */
+	x = (COLS - width) / 2;
+	y = (LINES - height) / 2;
+
+	draw_shadow(stdscr, y, x, height, width);
+
+	dialog = newwin(height, width, y, x);
+	keypad(dialog, TRUE);
+
+	draw_box(dialog, 0, 0, height, width,
+		 dlg.dialog.atr, dlg.border.atr);
+	wattrset(dialog, dlg.border.atr);
+	mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+	for (i = 0; i < width - 2; i++)
+		waddch(dialog, ACS_HLINE);
+	wattrset(dialog, dlg.dialog.atr);
+	waddch(dialog, ACS_RTEE);
+
+	print_title(dialog, title, width);
+
+	wattrset(dialog, dlg.dialog.atr);
+	print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+	/* Draw the input field box */
+	box_width = width - 6;
+	getyx(dialog, y, x);
+	box_y = y + 2;
+	box_x = (width - box_width) / 2;
+	draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2,
+		 dlg.dialog.atr, dlg.border.atr);
+
+	print_buttons(dialog, height, width, 0);
+
+	/* Set up the initial value */
+	wmove(dialog, box_y, box_x);
+	wattrset(dialog, dlg.inputbox.atr);
+
+	len = strlen(instr);
+	pos = len;
+
+	if (len >= box_width) {
+		show_x = len - box_width + 1;
+		input_x = box_width - 1;
+		for (i = 0; i < box_width - 1; i++)
+			waddch(dialog, instr[show_x + i]);
+	} else {
+		show_x = 0;
+		input_x = len;
+		waddstr(dialog, instr);
+	}
+
+	wmove(dialog, box_y, box_x + input_x);
+
+	wrefresh(dialog);
+
+	while (key != KEY_ESC) {
+		key = wgetch(dialog);
+
+		if (button == -1) {	/* Input box selected */
+			switch (key) {
+			case TAB:
+			case KEY_UP:
+			case KEY_DOWN:
+				break;
+			case KEY_BACKSPACE:
+			case 127:
+				if (pos) {
+					wattrset(dialog, dlg.inputbox.atr);
+					if (input_x == 0) {
+						show_x--;
+					} else
+						input_x--;
+
+					if (pos < len) {
+						for (i = pos - 1; i < len; i++) {
+							instr[i] = instr[i+1];
+						}
+					}
+
+					pos--;
+					len--;
+					instr[len] = '\0';
+					wmove(dialog, box_y, box_x);
+					for (i = 0; i < box_width; i++) {
+						if (!instr[show_x + i]) {
+							waddch(dialog, ' ');
+							break;
+						}
+						waddch(dialog, instr[show_x + i]);
+					}
+					wmove(dialog, box_y, input_x + box_x);
+					wrefresh(dialog);
+				}
+				continue;
+			case KEY_LEFT:
+				if (pos > 0) {
+					if (input_x > 0) {
+						wmove(dialog, box_y, --input_x + box_x);
+					} else if (input_x == 0) {
+						show_x--;
+						wmove(dialog, box_y, box_x);
+						for (i = 0; i < box_width; i++) {
+							if (!instr[show_x + i]) {
+								waddch(dialog, ' ');
+								break;
+							}
+							waddch(dialog, instr[show_x + i]);
+						}
+						wmove(dialog, box_y, box_x);
+					}
+					pos--;
+				}
+				continue;
+			case KEY_RIGHT:
+				if (pos < len) {
+					if (input_x < box_width - 1) {
+						wmove(dialog, box_y, ++input_x + box_x);
+					} else if (input_x == box_width - 1) {
+						show_x++;
+						wmove(dialog, box_y, box_x);
+						for (i = 0; i < box_width; i++) {
+							if (!instr[show_x + i]) {
+								waddch(dialog, ' ');
+								break;
+							}
+							waddch(dialog, instr[show_x + i]);
+						}
+						wmove(dialog, box_y, input_x + box_x);
+					}
+					pos++;
+				}
+				continue;
+			default:
+				if (key < 0x100 && isprint(key)) {
+					if (len < MAX_LEN) {
+						wattrset(dialog, dlg.inputbox.atr);
+						if (pos < len) {
+							for (i = len; i > pos; i--)
+								instr[i] = instr[i-1];
+							instr[pos] = key;
+						} else {
+							instr[len] = key;
+						}
+						pos++;
+						len++;
+						instr[len] = '\0';
+
+						if (input_x == box_width - 1) {
+							show_x++;
+						} else {
+							input_x++;
+						}
+
+						wmove(dialog, box_y, box_x);
+						for (i = 0; i < box_width; i++) {
+							if (!instr[show_x + i]) {
+								waddch(dialog, ' ');
+								break;
+							}
+							waddch(dialog, instr[show_x + i]);
+						}
+						wmove(dialog, box_y, input_x + box_x);
+						wrefresh(dialog);
+					} else
+						flash();	/* Alarm user about overflow */
+					continue;
+				}
+			}
+		}
+		switch (key) {
+		case 'O':
+		case 'o':
+			delwin(dialog);
+			return 0;
+		case 'H':
+		case 'h':
+			delwin(dialog);
+			return 1;
+		case KEY_UP:
+		case KEY_LEFT:
+			switch (button) {
+			case -1:
+				button = 1;	/* Indicates "Help" button is selected */
+				print_buttons(dialog, height, width, 1);
+				break;
+			case 0:
+				button = -1;	/* Indicates input box is selected */
+				print_buttons(dialog, height, width, 0);
+				wmove(dialog, box_y, box_x + input_x);
+				wrefresh(dialog);
+				break;
+			case 1:
+				button = 0;	/* Indicates "OK" button is selected */
+				print_buttons(dialog, height, width, 0);
+				break;
+			}
+			break;
+		case TAB:
+		case KEY_DOWN:
+		case KEY_RIGHT:
+			switch (button) {
+			case -1:
+				button = 0;	/* Indicates "OK" button is selected */
+				print_buttons(dialog, height, width, 0);
+				break;
+			case 0:
+				button = 1;	/* Indicates "Help" button is selected */
+				print_buttons(dialog, height, width, 1);
+				break;
+			case 1:
+				button = -1;	/* Indicates input box is selected */
+				print_buttons(dialog, height, width, 0);
+				wmove(dialog, box_y, box_x + input_x);
+				wrefresh(dialog);
+				break;
+			}
+			break;
+		case ' ':
+		case '\n':
+			delwin(dialog);
+			return (button == -1 ? 0 : button);
+		case 'X':
+		case 'x':
+			key = KEY_ESC;
+			break;
+		case KEY_ESC:
+			key = on_key_esc(dialog);
+			break;
+		case KEY_RESIZE:
+			delwin(dialog);
+			on_key_resize();
+			goto do_resize;
+		}
+	}
+
+	delwin(dialog);
+	return KEY_ESC;		/* ESC pressed */
+}
diff --git a/trunk/scripts/config/lxdialog/menubox.c b/trunk/scripts/config/lxdialog/menubox.c
new file mode 100644
index 00000000..48d382e7
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/menubox.c
@@ -0,0 +1,436 @@
+/*
+ *  menubox.c -- implements the menu box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ *  Changes by Clifford Wolf (god@clifford.at)
+ *
+ *  [ 1998-06-13 ]
+ *
+ *    *)  A bugfix for the Page-Down problem
+ *
+ *    *)  Formerly when I used Page Down and Page Up, the cursor would be set
+ *        to the first position in the menu box.  Now lxdialog is a bit
+ *        smarter and works more like other menu systems (just have a look at
+ *        it).
+ *
+ *    *)  Formerly if I selected something my scrolling would be broken because
+ *        lxdialog is re-invoked by the Menuconfig shell script, can't
+ *        remember the last scrolling position, and just sets it so that the
+ *        cursor is at the bottom of the box.  Now it writes the temporary file
+ *        lxdialog.scrltmp which contains this information. The file is
+ *        deleted by lxdialog if the user leaves a submenu or enters a new
+ *        one, but it would be nice if Menuconfig could make another "rm -f"
+ *        just to be sure.  Just try it out - you will recognise a difference!
+ *
+ *  [ 1998-06-14 ]
+ *
+ *    *)  Now lxdialog is crash-safe against broken "lxdialog.scrltmp" files
+ *        and menus change their size on the fly.
+ *
+ *    *)  If for some reason the last scrolling position is not saved by
+ *        lxdialog, it sets the scrolling so that the selected item is in the
+ *        middle of the menu box, not at the bottom.
+ *
+ * 02 January 1999, Michael Elizabeth Chastain (mec@shout.net)
+ * Reset 'scroll' to 0 if the value from lxdialog.scrltmp is bogus.
+ * This fixes a bug in Menuconfig where using ' ' to descend into menus
+ * would leave mis-synchronized lxdialog.scrltmp files lying around,
+ * fscanf would read in 'scroll', and eventually that value would get used.
+ */
+
+#include "dialog.h"
+
+static int menu_width, item_x;
+
+/*
+ * Print menu item
+ */
+static void do_print_item(WINDOW * win, const char *item, int line_y,
+                          int selected, int hotkey)
+{
+	int j;
+	char *menu_item = malloc(menu_width + 1);
+
+	strncpy(menu_item, item, menu_width - item_x);
+	menu_item[menu_width - item_x] = '\0';
+	j = first_alpha(menu_item, "YyNnMmHh");
+
+	/* Clear 'residue' of last item */
+	wattrset(win, dlg.menubox.atr);
+	wmove(win, line_y, 0);
+#if OLD_NCURSES
+	{
+		int i;
+		for (i = 0; i < menu_width; i++)
+			waddch(win, ' ');
+	}
+#else
+	wclrtoeol(win);
+#endif
+	wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
+	mvwaddstr(win, line_y, item_x, menu_item);
+	if (hotkey) {
+		wattrset(win, selected ? dlg.tag_key_selected.atr
+			 : dlg.tag_key.atr);
+		mvwaddch(win, line_y, item_x + j, menu_item[j]);
+	}
+	if (selected) {
+		wmove(win, line_y, item_x + 1);
+	}
+	free(menu_item);
+	wrefresh(win);
+}
+
+#define print_item(index, choice, selected)				\
+do {									\
+	item_set(index);						\
+	do_print_item(menu, item_str(), choice, selected, !item_is_tag(':')); \
+} while (0)
+
+/*
+ * Print the scroll indicators.
+ */
+static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
+			 int height)
+{
+	int cur_y, cur_x;
+
+	getyx(win, cur_y, cur_x);
+
+	wmove(win, y, x);
+
+	if (scroll > 0) {
+		wattrset(win, dlg.uarrow.atr);
+		waddch(win, ACS_UARROW);
+		waddstr(win, "(-)");
+	} else {
+		wattrset(win, dlg.menubox.atr);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+	}
+
+	y = y + height + 1;
+	wmove(win, y, x);
+	wrefresh(win);
+
+	if ((height < item_no) && (scroll + height < item_no)) {
+		wattrset(win, dlg.darrow.atr);
+		waddch(win, ACS_DARROW);
+		waddstr(win, "(+)");
+	} else {
+		wattrset(win, dlg.menubox_border.atr);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+		waddch(win, ACS_HLINE);
+	}
+
+	wmove(win, cur_y, cur_x);
+	wrefresh(win);
+}
+
+/*
+ * Display the termination buttons.
+ */
+static void print_buttons(WINDOW * win, int height, int width, int selected)
+{
+	int x = width / 2 - 28;
+	int y = height - 2;
+
+	print_button(win, gettext("Select"), y, x, selected == 0);
+	print_button(win, gettext(" Exit "), y, x + 12, selected == 1);
+	print_button(win, gettext(" Help "), y, x + 24, selected == 2);
+	print_button(win, gettext(" Save "), y, x + 36, selected == 3);
+	print_button(win, gettext(" Load "), y, x + 48, selected == 4);
+
+	wmove(win, y, x + 1 + 12 * selected);
+	wrefresh(win);
+}
+
+/* scroll up n lines (n may be negative) */
+static void do_scroll(WINDOW *win, int *scroll, int n)
+{
+	/* Scroll menu up */
+	scrollok(win, TRUE);
+	wscrl(win, n);
+	scrollok(win, FALSE);
+	*scroll = *scroll + n;
+	wrefresh(win);
+}
+
+/*
+ * Display a menu for choosing among a number of options
+ */
+int dialog_menu(const char *title, const char *prompt,
+                const void *selected, int *s_scroll)
+{
+	int i, j, x, y, box_x, box_y;
+	int height, width, menu_height;
+	int key = 0, button = 0, scroll = 0, choice = 0;
+	int first_item =  0, max_choice;
+	WINDOW *dialog, *menu;
+
+do_resize:
+	height = getmaxy(stdscr);
+	width = getmaxx(stdscr);
+	if (height < 15 || width < 65)
+		return -ERRDISPLAYTOOSMALL;
+
+	height -= 4;
+	width  -= 5;
+	menu_height = height - 10;
+
+	max_choice = MIN(menu_height, item_count());
+
+	/* center dialog box on screen */
+	x = (COLS - width) / 2;
+	y = (LINES - height) / 2;
+
+	draw_shadow(stdscr, y, x, height, width);
+
+	dialog = newwin(height, width, y, x);
+	keypad(dialog, TRUE);
+
+	draw_box(dialog, 0, 0, height, width,
+		 dlg.dialog.atr, dlg.border.atr);
+	wattrset(dialog, dlg.border.atr);
+	mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+	for (i = 0; i < width - 2; i++)
+		waddch(dialog, ACS_HLINE);
+	wattrset(dialog, dlg.dialog.atr);
+	wbkgdset(dialog, dlg.dialog.atr & A_COLOR);
+	waddch(dialog, ACS_RTEE);
+
+	print_title(dialog, title, width);
+
+	wattrset(dialog, dlg.dialog.atr);
+	print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+	menu_width = width - 6;
+	box_y = height - menu_height - 5;
+	box_x = (width - menu_width) / 2 - 1;
+
+	/* create new window for the menu */
+	menu = subwin(dialog, menu_height, menu_width,
+		      y + box_y + 1, x + box_x + 1);
+	keypad(menu, TRUE);
+
+	/* draw a box around the menu items */
+	draw_box(dialog, box_y, box_x, menu_height + 2, menu_width + 2,
+		 dlg.menubox_border.atr, dlg.menubox.atr);
+
+	if (menu_width >= 80)
+		item_x = (menu_width - 70) / 2;
+	else
+		item_x = 4;
+
+	/* Set choice to default item */
+	item_foreach()
+		if (selected && (selected == item_data()))
+			choice = item_n();
+	/* get the saved scroll info */
+	scroll = *s_scroll;
+	if ((scroll <= choice) && (scroll + max_choice > choice) &&
+	   (scroll >= 0) && (scroll + max_choice <= item_count())) {
+		first_item = scroll;
+		choice = choice - scroll;
+	} else {
+		scroll = 0;
+	}
+	if ((choice >= max_choice)) {
+		if (choice >= item_count() - max_choice / 2)
+			scroll = first_item = item_count() - max_choice;
+		else
+			scroll = first_item = choice - max_choice / 2;
+		choice = choice - scroll;
+	}
+
+	/* Print the menu */
+	for (i = 0; i < max_choice; i++) {
+		print_item(first_item + i, i, i == choice);
+	}
+
+	wnoutrefresh(menu);
+
+	print_arrows(dialog, item_count(), scroll,
+		     box_y, box_x + item_x + 1, menu_height);
+
+	print_buttons(dialog, height, width, 0);
+	wmove(menu, choice, item_x + 1);
+	wrefresh(menu);
+
+	while (key != KEY_ESC) {
+		key = wgetch(menu);
+
+		if (key < 256 && isalpha(key))
+			key = tolower(key);
+
+		if (strchr("ynmh", key))
+			i = max_choice;
+		else {
+			for (i = choice + 1; i < max_choice; i++) {
+				item_set(scroll + i);
+				j = first_alpha(item_str(), "YyNnMmHh");
+				if (key == tolower(item_str()[j]))
+					break;
+			}
+			if (i == max_choice)
+				for (i = 0; i < max_choice; i++) {
+					item_set(scroll + i);
+					j = first_alpha(item_str(), "YyNnMmHh");
+					if (key == tolower(item_str()[j]))
+						break;
+				}
+		}
+
+		if (i < max_choice ||
+		    key == KEY_UP || key == KEY_DOWN ||
+		    key == '-' || key == '+' ||
+		    key == KEY_PPAGE || key == KEY_NPAGE) {
+			/* Remove highligt of current item */
+			print_item(scroll + choice, choice, FALSE);
+
+			if (key == KEY_UP || key == '-') {
+				if (choice < 2 && scroll) {
+					/* Scroll menu down */
+					do_scroll(menu, &scroll, -1);
+
+					print_item(scroll, 0, FALSE);
+				} else
+					choice = MAX(choice - 1, 0);
+
+			} else if (key == KEY_DOWN || key == '+') {
+				print_item(scroll+choice, choice, FALSE);
+
+				if ((choice > max_choice - 3) &&
+				    (scroll + max_choice < item_count())) {
+					/* Scroll menu up */
+					do_scroll(menu, &scroll, 1);
+
+					print_item(scroll+max_choice - 1,
+						   max_choice - 1, FALSE);
+				} else
+					choice = MIN(choice + 1, max_choice - 1);
+
+			} else if (key == KEY_PPAGE) {
+				scrollok(menu, TRUE);
+				for (i = 0; (i < max_choice); i++) {
+					if (scroll > 0) {
+						do_scroll(menu, &scroll, -1);
+						print_item(scroll, 0, FALSE);
+					} else {
+						if (choice > 0)
+							choice--;
+					}
+				}
+
+			} else if (key == KEY_NPAGE) {
+				for (i = 0; (i < max_choice); i++) {
+					if (scroll + max_choice < item_count()) {
+						do_scroll(menu, &scroll, 1);
+						print_item(scroll+max_choice-1,
+							   max_choice - 1, FALSE);
+					} else {
+						if (choice + 1 < max_choice)
+							choice++;
+					}
+				}
+			} else
+				choice = i;
+
+			print_item(scroll + choice, choice, TRUE);
+
+			print_arrows(dialog, item_count(), scroll,
+				     box_y, box_x + item_x + 1, menu_height);
+
+			wnoutrefresh(dialog);
+			wrefresh(menu);
+
+			continue;	/* wait for another key press */
+		}
+
+		switch (key) {
+		case KEY_LEFT:
+		case TAB:
+		case KEY_RIGHT:
+			button = ((key == KEY_LEFT ? --button : ++button) < 0)
+			    ? 4 : (button > 4 ? 0 : button);
+
+			print_buttons(dialog, height, width, button);
+			wrefresh(menu);
+			break;
+		case ' ':
+		case 's':
+		case 'y':
+		case 'n':
+		case 'm':
+		case '/':
+		case 'h':
+		case '?':
+		case 'z':
+		case '\n':
+			/* save scroll info */
+			*s_scroll = scroll;
+			delwin(menu);
+			delwin(dialog);
+			item_set(scroll + choice);
+			item_set_selected(1);
+			switch (key) {
+			case 'h':
+			case '?':
+				return 2;
+			case 's':
+			case 'y':
+				return 5;
+			case 'n':
+				return 6;
+			case 'm':
+				return 7;
+			case ' ':
+				return 8;
+			case '/':
+				return 9;
+			case 'z':
+				return 10;
+			case '\n':
+				return button;
+			}
+			return 0;
+		case 'e':
+		case 'x':
+			key = KEY_ESC;
+			break;
+		case KEY_ESC:
+			key = on_key_esc(menu);
+			break;
+		case KEY_RESIZE:
+			on_key_resize();
+			delwin(menu);
+			delwin(dialog);
+			goto do_resize;
+		}
+	}
+	delwin(menu);
+	delwin(dialog);
+	return key;		/* ESC pressed */
+}
diff --git a/trunk/scripts/config/lxdialog/textbox.c b/trunk/scripts/config/lxdialog/textbox.c
new file mode 100644
index 00000000..a48bb93e
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/textbox.c
@@ -0,0 +1,408 @@
+/*
+ *  textbox.c -- implements the text box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+static void back_lines(int n);
+static void print_page(WINDOW *win, int height, int width, update_text_fn
+		       update_text, void *data);
+static void print_line(WINDOW *win, int row, int width);
+static char *get_line(void);
+static void print_position(WINDOW * win);
+
+static int hscroll;
+static int begin_reached, end_reached, page_length;
+static char *buf;
+static char *page;
+
+/*
+ * refresh window content
+ */
+static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
+			     int cur_y, int cur_x, update_text_fn update_text,
+			     void *data)
+{
+	print_page(box, boxh, boxw, update_text, data);
+	print_position(dialog);
+	wmove(dialog, cur_y, cur_x);	/* Restore cursor position */
+	wrefresh(dialog);
+}
+
+
+/*
+ * Display text from a file in a dialog box.
+ *
+ * keys is a null-terminated array
+ * update_text() may not add or remove any '\n' or '\0' in tbuf
+ */
+int dialog_textbox(const char *title, char *tbuf, int initial_height,
+		   int initial_width, int *keys, int *_vscroll, int *_hscroll,
+		   update_text_fn update_text, void *data)
+{
+	int i, x, y, cur_x, cur_y, key = 0;
+	int height, width, boxh, boxw;
+	WINDOW *dialog, *box;
+	bool done = false;
+
+	begin_reached = 1;
+	end_reached = 0;
+	page_length = 0;
+	hscroll = 0;
+	buf = tbuf;
+	page = buf;	/* page is pointer to start of page to be displayed */
+
+	if (_vscroll && *_vscroll) {
+		begin_reached = 0;
+
+		for (i = 0; i < *_vscroll; i++)
+			get_line();
+	}
+	if (_hscroll)
+		hscroll = *_hscroll;
+
+do_resize:
+	getmaxyx(stdscr, height, width);
+	if (height < 8 || width < 8)
+		return -ERRDISPLAYTOOSMALL;
+	if (initial_height != 0)
+		height = initial_height;
+	else
+		if (height > 4)
+			height -= 4;
+		else
+			height = 0;
+	if (initial_width != 0)
+		width = initial_width;
+	else
+		if (width > 5)
+			width -= 5;
+		else
+			width = 0;
+
+	/* center dialog box on screen */
+	x = (COLS - width) / 2;
+	y = (LINES - height) / 2;
+
+	draw_shadow(stdscr, y, x, height, width);
+
+	dialog = newwin(height, width, y, x);
+	keypad(dialog, TRUE);
+
+	/* Create window for box region, used for scrolling text */
+	boxh = height - 4;
+	boxw = width - 2;
+	box = subwin(dialog, boxh, boxw, y + 1, x + 1);
+	wattrset(box, dlg.dialog.atr);
+	wbkgdset(box, dlg.dialog.atr & A_COLOR);
+
+	keypad(box, TRUE);
+
+	/* register the new window, along with its borders */
+	draw_box(dialog, 0, 0, height, width,
+		 dlg.dialog.atr, dlg.border.atr);
+
+	wattrset(dialog, dlg.border.atr);
+	mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+	for (i = 0; i < width - 2; i++)
+		waddch(dialog, ACS_HLINE);
+	wattrset(dialog, dlg.dialog.atr);
+	wbkgdset(dialog, dlg.dialog.atr & A_COLOR);
+	waddch(dialog, ACS_RTEE);
+
+	print_title(dialog, title, width);
+
+	print_button(dialog, gettext(" Exit "), height - 2, width / 2 - 4, TRUE);
+	wnoutrefresh(dialog);
+	getyx(dialog, cur_y, cur_x);	/* Save cursor position */
+
+	/* Print first page of text */
+	attr_clear(box, boxh, boxw, dlg.dialog.atr);
+	refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x, update_text,
+			 data);
+
+	while (!done) {
+		key = wgetch(dialog);
+		switch (key) {
+		case 'E':	/* Exit */
+		case 'e':
+		case 'X':
+		case 'x':
+		case 'q':
+		case '\n':
+			done = true;
+			break;
+		case 'g':	/* First page */
+		case KEY_HOME:
+			if (!begin_reached) {
+				begin_reached = 1;
+				page = buf;
+				refresh_text_box(dialog, box, boxh, boxw,
+						 cur_y, cur_x, update_text,
+						 data);
+			}
+			break;
+		case 'G':	/* Last page */
+		case KEY_END:
+
+			end_reached = 1;
+			/* point to last char in buf */
+			page = buf + strlen(buf);
+			back_lines(boxh);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
+			break;
+		case 'K':	/* Previous line */
+		case 'k':
+		case KEY_UP:
+			if (begin_reached)
+				break;
+
+			back_lines(page_length + 1);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
+			break;
+		case 'B':	/* Previous page */
+		case 'b':
+		case 'u':
+		case KEY_PPAGE:
+			if (begin_reached)
+				break;
+			back_lines(page_length + boxh);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
+			break;
+		case 'J':	/* Next line */
+		case 'j':
+		case KEY_DOWN:
+			if (end_reached)
+				break;
+
+			back_lines(page_length - 1);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
+			break;
+		case KEY_NPAGE:	/* Next page */
+		case ' ':
+		case 'd':
+			if (end_reached)
+				break;
+
+			begin_reached = 0;
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
+			break;
+		case '0':	/* Beginning of line */
+		case 'H':	/* Scroll left */
+		case 'h':
+		case KEY_LEFT:
+			if (hscroll <= 0)
+				break;
+
+			if (key == '0')
+				hscroll = 0;
+			else
+				hscroll--;
+			/* Reprint current page to scroll horizontally */
+			back_lines(page_length);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
+			break;
+		case 'L':	/* Scroll right */
+		case 'l':
+		case KEY_RIGHT:
+			if (hscroll >= MAX_LEN)
+				break;
+			hscroll++;
+			/* Reprint current page to scroll horizontally */
+			back_lines(page_length);
+			refresh_text_box(dialog, box, boxh, boxw, cur_y,
+					 cur_x, update_text, data);
+			break;
+		case KEY_ESC:
+			if (on_key_esc(dialog) == KEY_ESC)
+				done = true;
+			break;
+		case KEY_RESIZE:
+			back_lines(height);
+			delwin(box);
+			delwin(dialog);
+			on_key_resize();
+			goto do_resize;
+		default:
+			for (i = 0; keys[i]; i++) {
+				if (key == keys[i]) {
+					done = true;
+					break;
+				}
+			}
+		}
+	}
+	delwin(box);
+	delwin(dialog);
+	if (_vscroll) {
+		const char *s;
+
+		s = buf;
+		*_vscroll = 0;
+		back_lines(page_length);
+		while (s < page && (s = strchr(s, '\n'))) {
+			(*_vscroll)++;
+			s++;
+		}
+	}
+	if (_hscroll)
+		*_hscroll = hscroll;
+	return key;
+}
+
+/*
+ * Go back 'n' lines in text. Called by dialog_textbox().
+ * 'page' will be updated to point to the desired line in 'buf'.
+ */
+static void back_lines(int n)
+{
+	int i;
+
+	begin_reached = 0;
+	/* Go back 'n' lines */
+	for (i = 0; i < n; i++) {
+		if (*page == '\0') {
+			if (end_reached) {
+				end_reached = 0;
+				continue;
+			}
+		}
+		if (page == buf) {
+			begin_reached = 1;
+			return;
+		}
+		page--;
+		do {
+			if (page == buf) {
+				begin_reached = 1;
+				return;
+			}
+			page--;
+		} while (*page != '\n');
+		page++;
+	}
+}
+
+/*
+ * Print a new page of text.
+ */
+static void print_page(WINDOW *win, int height, int width, update_text_fn
+		       update_text, void *data)
+{
+	int i, passed_end = 0;
+
+	if (update_text) {
+		char *end;
+
+		for (i = 0; i < height; i++)
+			get_line();
+		end = page;
+		back_lines(height);
+		update_text(buf, page - buf, end - buf, data);
+	}
+
+	page_length = 0;
+	for (i = 0; i < height; i++) {
+		print_line(win, i, width);
+		if (!passed_end)
+			page_length++;
+		if (end_reached && !passed_end)
+			passed_end = 1;
+	}
+	wnoutrefresh(win);
+}
+
+/*
+ * Print a new line of text.
+ */
+static void print_line(WINDOW * win, int row, int width)
+{
+	char *line;
+
+	line = get_line();
+	line += MIN(strlen(line), hscroll);	/* Scroll horizontally */
+	wmove(win, row, 0);	/* move cursor to correct line */
+	waddch(win, ' ');
+	waddnstr(win, line, MIN(strlen(line), width - 2));
+
+	/* Clear 'residue' of previous line */
+#if OLD_NCURSES
+	{
+		int x = getcurx(win);
+		int i;
+		for (i = 0; i < width - x; i++)
+			waddch(win, ' ');
+	}
+#else
+	wclrtoeol(win);
+#endif
+}
+
+/*
+ * Return current line of text. Called by dialog_textbox() and print_line().
+ * 'page' should point to start of current line before calling, and will be
+ * updated to point to start of next line.
+ */
+static char *get_line(void)
+{
+	int i = 0;
+	static char line[MAX_LEN + 1];
+
+	end_reached = 0;
+	while (*page != '\n') {
+		if (*page == '\0') {
+			end_reached = 1;
+			break;
+		} else if (i < MAX_LEN)
+			line[i++] = *(page++);
+		else {
+			/* Truncate lines longer than MAX_LEN characters */
+			if (i == MAX_LEN)
+				line[i++] = '\0';
+			page++;
+		}
+	}
+	if (i <= MAX_LEN)
+		line[i] = '\0';
+	if (!end_reached)
+		page++;		/* move past '\n' */
+
+	return line;
+}
+
+/*
+ * Print current position
+ */
+static void print_position(WINDOW * win)
+{
+	int percent;
+
+	wattrset(win, dlg.position_indicator.atr);
+	wbkgdset(win, dlg.position_indicator.atr & A_COLOR);
+	percent = (page - buf) * 100 / strlen(buf);
+	wmove(win, getmaxy(win) - 3, getmaxx(win) - 9);
+	wprintw(win, "(%3d%%)", percent);
+}
diff --git a/trunk/scripts/config/lxdialog/util.c b/trunk/scripts/config/lxdialog/util.c
new file mode 100644
index 00000000..109d5311
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/util.c
@@ -0,0 +1,664 @@
+/*
+ *  util.c
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdarg.h>
+
+#include "dialog.h"
+
+/* Needed in signal handler in mconf.c */
+int saved_x, saved_y;
+
+struct dialog_info dlg;
+
+static void set_mono_theme(void)
+{
+	dlg.screen.atr = A_NORMAL;
+	dlg.shadow.atr = A_NORMAL;
+	dlg.dialog.atr = A_NORMAL;
+	dlg.title.atr = A_BOLD;
+	dlg.border.atr = A_NORMAL;
+	dlg.button_active.atr = A_REVERSE;
+	dlg.button_inactive.atr = A_DIM;
+	dlg.button_key_active.atr = A_REVERSE;
+	dlg.button_key_inactive.atr = A_BOLD;
+	dlg.button_label_active.atr = A_REVERSE;
+	dlg.button_label_inactive.atr = A_NORMAL;
+	dlg.inputbox.atr = A_NORMAL;
+	dlg.inputbox_border.atr = A_NORMAL;
+	dlg.searchbox.atr = A_NORMAL;
+	dlg.searchbox_title.atr = A_BOLD;
+	dlg.searchbox_border.atr = A_NORMAL;
+	dlg.position_indicator.atr = A_BOLD;
+	dlg.menubox.atr = A_NORMAL;
+	dlg.menubox_border.atr = A_NORMAL;
+	dlg.item.atr = A_NORMAL;
+	dlg.item_selected.atr = A_REVERSE;
+	dlg.tag.atr = A_BOLD;
+	dlg.tag_selected.atr = A_REVERSE;
+	dlg.tag_key.atr = A_BOLD;
+	dlg.tag_key_selected.atr = A_REVERSE;
+	dlg.check.atr = A_BOLD;
+	dlg.check_selected.atr = A_REVERSE;
+	dlg.uarrow.atr = A_BOLD;
+	dlg.darrow.atr = A_BOLD;
+}
+
+#define DLG_COLOR(dialog, f, b, h) \
+do {                               \
+	dlg.dialog.fg = (f);       \
+	dlg.dialog.bg = (b);       \
+	dlg.dialog.hl = (h);       \
+} while (0)
+
+static void set_classic_theme(void)
+{
+	DLG_COLOR(screen,                COLOR_CYAN,   COLOR_BLUE,   true);
+	DLG_COLOR(shadow,                COLOR_BLACK,  COLOR_BLACK,  true);
+	DLG_COLOR(dialog,                COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(title,                 COLOR_YELLOW, COLOR_WHITE,  true);
+	DLG_COLOR(border,                COLOR_WHITE,  COLOR_WHITE,  true);
+	DLG_COLOR(button_active,         COLOR_WHITE,  COLOR_BLUE,   true);
+	DLG_COLOR(button_inactive,       COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(button_key_active,     COLOR_WHITE,  COLOR_BLUE,   true);
+	DLG_COLOR(button_key_inactive,   COLOR_RED,    COLOR_WHITE,  false);
+	DLG_COLOR(button_label_active,   COLOR_YELLOW, COLOR_BLUE,   true);
+	DLG_COLOR(button_label_inactive, COLOR_BLACK,  COLOR_WHITE,  true);
+	DLG_COLOR(inputbox,              COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(inputbox_border,       COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(searchbox,             COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(searchbox_title,       COLOR_YELLOW, COLOR_WHITE,  true);
+	DLG_COLOR(searchbox_border,      COLOR_WHITE,  COLOR_WHITE,  true);
+	DLG_COLOR(position_indicator,    COLOR_YELLOW, COLOR_WHITE,  true);
+	DLG_COLOR(menubox,               COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(menubox_border,        COLOR_WHITE,  COLOR_WHITE,  true);
+	DLG_COLOR(item,                  COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(item_selected,         COLOR_WHITE,  COLOR_BLUE,   true);
+	DLG_COLOR(tag,                   COLOR_YELLOW, COLOR_WHITE,  true);
+	DLG_COLOR(tag_selected,          COLOR_YELLOW, COLOR_BLUE,   true);
+	DLG_COLOR(tag_key,               COLOR_YELLOW, COLOR_WHITE,  true);
+	DLG_COLOR(tag_key_selected,      COLOR_YELLOW, COLOR_BLUE,   true);
+	DLG_COLOR(check,                 COLOR_BLACK,  COLOR_WHITE,  false);
+	DLG_COLOR(check_selected,        COLOR_WHITE,  COLOR_BLUE,   true);
+	DLG_COLOR(uarrow,                COLOR_GREEN,  COLOR_WHITE,  true);
+	DLG_COLOR(darrow,                COLOR_GREEN,  COLOR_WHITE,  true);
+}
+
+static void set_blackbg_theme(void)
+{
+	DLG_COLOR(screen, COLOR_RED,   COLOR_BLACK, true);
+	DLG_COLOR(shadow, COLOR_BLACK, COLOR_BLACK, false);
+	DLG_COLOR(dialog, COLOR_WHITE, COLOR_BLACK, false);
+	DLG_COLOR(title,  COLOR_RED,   COLOR_BLACK, false);
+	DLG_COLOR(border, COLOR_BLACK, COLOR_BLACK, true);
+
+	DLG_COLOR(button_active,         COLOR_YELLOW, COLOR_RED,   false);
+	DLG_COLOR(button_inactive,       COLOR_YELLOW, COLOR_BLACK, false);
+	DLG_COLOR(button_key_active,     COLOR_YELLOW, COLOR_RED,   true);
+	DLG_COLOR(button_key_inactive,   COLOR_RED,    COLOR_BLACK, false);
+	DLG_COLOR(button_label_active,   COLOR_WHITE,  COLOR_RED,   false);
+	DLG_COLOR(button_label_inactive, COLOR_BLACK,  COLOR_BLACK, true);
+
+	DLG_COLOR(inputbox,         COLOR_YELLOW, COLOR_BLACK, false);
+	DLG_COLOR(inputbox_border,  COLOR_YELLOW, COLOR_BLACK, false);
+
+	DLG_COLOR(searchbox,        COLOR_YELLOW, COLOR_BLACK, false);
+	DLG_COLOR(searchbox_title,  COLOR_YELLOW, COLOR_BLACK, true);
+	DLG_COLOR(searchbox_border, COLOR_BLACK,  COLOR_BLACK, true);
+
+	DLG_COLOR(position_indicator, COLOR_RED, COLOR_BLACK,  false);
+
+	DLG_COLOR(menubox,          COLOR_YELLOW, COLOR_BLACK, false);
+	DLG_COLOR(menubox_border,   COLOR_BLACK,  COLOR_BLACK, true);
+
+	DLG_COLOR(item,             COLOR_WHITE, COLOR_BLACK, false);
+	DLG_COLOR(item_selected,    COLOR_WHITE, COLOR_RED,   false);
+
+	DLG_COLOR(tag,              COLOR_RED,    COLOR_BLACK, false);
+	DLG_COLOR(tag_selected,     COLOR_YELLOW, COLOR_RED,   true);
+	DLG_COLOR(tag_key,          COLOR_RED,    COLOR_BLACK, false);
+	DLG_COLOR(tag_key_selected, COLOR_YELLOW, COLOR_RED,   true);
+
+	DLG_COLOR(check,            COLOR_YELLOW, COLOR_BLACK, false);
+	DLG_COLOR(check_selected,   COLOR_YELLOW, COLOR_RED,   true);
+
+	DLG_COLOR(uarrow, COLOR_RED, COLOR_BLACK, false);
+	DLG_COLOR(darrow, COLOR_RED, COLOR_BLACK, false);
+}
+
+static void set_bluetitle_theme(void)
+{
+	set_classic_theme();
+	DLG_COLOR(title,               COLOR_BLUE,   COLOR_WHITE, true);
+	DLG_COLOR(button_key_active,   COLOR_YELLOW, COLOR_BLUE,  true);
+	DLG_COLOR(button_label_active, COLOR_WHITE,  COLOR_BLUE,  true);
+	DLG_COLOR(searchbox_title,     COLOR_BLUE,   COLOR_WHITE, true);
+	DLG_COLOR(position_indicator,  COLOR_BLUE,   COLOR_WHITE, true);
+	DLG_COLOR(tag,                 COLOR_BLUE,   COLOR_WHITE, true);
+	DLG_COLOR(tag_key,             COLOR_BLUE,   COLOR_WHITE, true);
+
+}
+
+/*
+ * Select color theme
+ */
+static int set_theme(const char *theme)
+{
+	int use_color = 1;
+	if (!theme)
+		set_bluetitle_theme();
+	else if (strcmp(theme, "classic") == 0)
+		set_classic_theme();
+	else if (strcmp(theme, "bluetitle") == 0)
+		set_bluetitle_theme();
+	else if (strcmp(theme, "blackbg") == 0)
+		set_blackbg_theme();
+	else if (strcmp(theme, "mono") == 0)
+		use_color = 0;
+
+	return use_color;
+}
+
+static void init_one_color(struct dialog_color *color)
+{
+	static int pair = 0;
+
+	pair++;
+	init_pair(pair, color->fg, color->bg);
+	if (color->hl)
+		color->atr = A_BOLD | COLOR_PAIR(pair);
+	else
+		color->atr = COLOR_PAIR(pair);
+}
+
+static void init_dialog_colors(void)
+{
+	init_one_color(&dlg.screen);
+	init_one_color(&dlg.shadow);
+	init_one_color(&dlg.dialog);
+	init_one_color(&dlg.title);
+	init_one_color(&dlg.border);
+	init_one_color(&dlg.button_active);
+	init_one_color(&dlg.button_inactive);
+	init_one_color(&dlg.button_key_active);
+	init_one_color(&dlg.button_key_inactive);
+	init_one_color(&dlg.button_label_active);
+	init_one_color(&dlg.button_label_inactive);
+	init_one_color(&dlg.inputbox);
+	init_one_color(&dlg.inputbox_border);
+	init_one_color(&dlg.searchbox);
+	init_one_color(&dlg.searchbox_title);
+	init_one_color(&dlg.searchbox_border);
+	init_one_color(&dlg.position_indicator);
+	init_one_color(&dlg.menubox);
+	init_one_color(&dlg.menubox_border);
+	init_one_color(&dlg.item);
+	init_one_color(&dlg.item_selected);
+	init_one_color(&dlg.tag);
+	init_one_color(&dlg.tag_selected);
+	init_one_color(&dlg.tag_key);
+	init_one_color(&dlg.tag_key_selected);
+	init_one_color(&dlg.check);
+	init_one_color(&dlg.check_selected);
+	init_one_color(&dlg.uarrow);
+	init_one_color(&dlg.darrow);
+}
+
+/*
+ * Setup for color display
+ */
+static void color_setup(const char *theme)
+{
+	int use_color;
+
+	use_color = set_theme(theme);
+	if (use_color && has_colors()) {
+		start_color();
+		init_dialog_colors();
+	} else
+		set_mono_theme();
+}
+
+/*
+ * Set window to attribute 'attr'
+ */
+void attr_clear(WINDOW * win, int height, int width, chtype attr)
+{
+	int i, j;
+
+	wattrset(win, attr);
+	for (i = 0; i < height; i++) {
+		wmove(win, i, 0);
+		for (j = 0; j < width; j++)
+			waddch(win, ' ');
+	}
+	touchwin(win);
+}
+
+void dialog_clear(void)
+{
+	attr_clear(stdscr, LINES, COLS, dlg.screen.atr);
+	/* Display background title if it exists ... - SLH */
+	if (dlg.backtitle != NULL) {
+		int i;
+
+		wattrset(stdscr, dlg.screen.atr);
+		mvwaddstr(stdscr, 0, 1, (char *)dlg.backtitle);
+		wmove(stdscr, 1, 1);
+		for (i = 1; i < COLS - 1; i++)
+			waddch(stdscr, ACS_HLINE);
+	}
+	wnoutrefresh(stdscr);
+}
+
+/*
+ * Do some initialization for dialog
+ */
+int init_dialog(const char *backtitle)
+{
+	int height, width;
+
+	initscr();		/* Init curses */
+
+	/* Get current cursor position for signal handler in mconf.c */
+	getyx(stdscr, saved_y, saved_x);
+
+	getmaxyx(stdscr, height, width);
+	if (height < 19 || width < 80) {
+		endwin();
+		return -ERRDISPLAYTOOSMALL;
+	}
+
+	dlg.backtitle = backtitle;
+	color_setup(getenv("MENUCONFIG_COLOR"));
+
+	keypad(stdscr, TRUE);
+	cbreak();
+	noecho();
+	dialog_clear();
+
+	return 0;
+}
+
+void set_dialog_backtitle(const char *backtitle)
+{
+	dlg.backtitle = backtitle;
+}
+
+/*
+ * End using dialog functions.
+ */
+void end_dialog(int x, int y)
+{
+	/* move cursor back to original position */
+	move(y, x);
+	refresh();
+	endwin();
+}
+
+/* Print the title of the dialog. Center the title and truncate
+ * tile if wider than dialog (- 2 chars).
+ **/
+void print_title(WINDOW *dialog, const char *title, int width)
+{
+	if (title) {
+		int tlen = MIN(width - 2, strlen(title));
+		wattrset(dialog, dlg.title.atr);
+		mvwaddch(dialog, 0, (width - tlen) / 2 - 1, ' ');
+		mvwaddnstr(dialog, 0, (width - tlen)/2, title, tlen);
+		waddch(dialog, ' ');
+	}
+}
+
+/*
+ * Print a string of text in a window, automatically wrap around to the
+ * next line if the string is too long to fit on one line. Newline
+ * characters '\n' are replaced by spaces.  We start on a new line
+ * if there is no room for at least 4 nonblanks following a double-space.
+ */
+void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x)
+{
+	int newl, cur_x, cur_y;
+	int i, prompt_len, room, wlen;
+	char tempstr[MAX_LEN + 1], *word, *sp, *sp2;
+
+	strcpy(tempstr, prompt);
+
+	prompt_len = strlen(tempstr);
+
+	/*
+	 * Remove newlines
+	 */
+	for (i = 0; i < prompt_len; i++) {
+		if (tempstr[i] == '\n')
+			tempstr[i] = ' ';
+	}
+
+	if (prompt_len <= width - x * 2) {	/* If prompt is short */
+		wmove(win, y, (width - prompt_len) / 2);
+		waddstr(win, tempstr);
+	} else {
+		cur_x = x;
+		cur_y = y;
+		newl = 1;
+		word = tempstr;
+		while (word && *word) {
+			sp = strchr(word, ' ');
+			if (sp)
+				*sp++ = 0;
+
+			/* Wrap to next line if either the word does not fit,
+			   or it is the first word of a new sentence, and it is
+			   short, and the next word does not fit. */
+			room = width - cur_x;
+			wlen = strlen(word);
+			if (wlen > room ||
+			    (newl && wlen < 4 && sp
+			     && wlen + 1 + strlen(sp) > room
+			     && (!(sp2 = strchr(sp, ' '))
+				 || wlen + 1 + (sp2 - sp) > room))) {
+				cur_y++;
+				cur_x = x;
+			}
+			wmove(win, cur_y, cur_x);
+			waddstr(win, word);
+			getyx(win, cur_y, cur_x);
+			cur_x++;
+			if (sp && *sp == ' ') {
+				cur_x++;	/* double space */
+				while (*++sp == ' ') ;
+				newl = 1;
+			} else
+				newl = 0;
+			word = sp;
+		}
+	}
+}
+
+/*
+ * Print a button
+ */
+void print_button(WINDOW * win, const char *label, int y, int x, int selected)
+{
+	int i, temp;
+
+	wmove(win, y, x);
+	wattrset(win, selected ? dlg.button_active.atr
+		 : dlg.button_inactive.atr);
+	waddstr(win, "<");
+	temp = strspn(label, " ");
+	label += temp;
+	wattrset(win, selected ? dlg.button_label_active.atr
+		 : dlg.button_label_inactive.atr);
+	for (i = 0; i < temp; i++)
+		waddch(win, ' ');
+	wattrset(win, selected ? dlg.button_key_active.atr
+		 : dlg.button_key_inactive.atr);
+	waddch(win, label[0]);
+	wattrset(win, selected ? dlg.button_label_active.atr
+		 : dlg.button_label_inactive.atr);
+	waddstr(win, (char *)label + 1);
+	wattrset(win, selected ? dlg.button_active.atr
+		 : dlg.button_inactive.atr);
+	waddstr(win, ">");
+	wmove(win, y, x + temp + 1);
+}
+
+/*
+ * Draw a rectangular box with line drawing characters
+ */
+void
+draw_box(WINDOW * win, int y, int x, int height, int width,
+	 chtype box, chtype border)
+{
+	int i, j;
+
+	wattrset(win, 0);
+	for (i = 0; i < height; i++) {
+		wmove(win, y + i, x);
+		for (j = 0; j < width; j++)
+			if (!i && !j)
+				waddch(win, border | ACS_ULCORNER);
+			else if (i == height - 1 && !j)
+				waddch(win, border | ACS_LLCORNER);
+			else if (!i && j == width - 1)
+				waddch(win, box | ACS_URCORNER);
+			else if (i == height - 1 && j == width - 1)
+				waddch(win, box | ACS_LRCORNER);
+			else if (!i)
+				waddch(win, border | ACS_HLINE);
+			else if (i == height - 1)
+				waddch(win, box | ACS_HLINE);
+			else if (!j)
+				waddch(win, border | ACS_VLINE);
+			else if (j == width - 1)
+				waddch(win, box | ACS_VLINE);
+			else
+				waddch(win, box | ' ');
+	}
+}
+
+/*
+ * Draw shadows along the right and bottom edge to give a more 3D look
+ * to the boxes
+ */
+void draw_shadow(WINDOW * win, int y, int x, int height, int width)
+{
+	int i;
+
+	if (has_colors()) {	/* Whether terminal supports color? */
+		wattrset(win, dlg.shadow.atr);
+		wmove(win, y + height, x + 2);
+		for (i = 0; i < width; i++)
+			waddch(win, winch(win) & A_CHARTEXT);
+		for (i = y + 1; i < y + height + 1; i++) {
+			wmove(win, i, x + width);
+			waddch(win, winch(win) & A_CHARTEXT);
+			waddch(win, winch(win) & A_CHARTEXT);
+		}
+		wnoutrefresh(win);
+	}
+}
+
+/*
+ *  Return the position of the first alphabetic character in a string.
+ */
+int first_alpha(const char *string, const char *exempt)
+{
+	int i, in_paren = 0, c;
+
+	for (i = 0; i < strlen(string); i++) {
+		c = tolower(string[i]);
+
+		if (strchr("<[(", c))
+			++in_paren;
+		if (strchr(">])", c) && in_paren > 0)
+			--in_paren;
+
+		if ((!in_paren) && isalpha(c) && strchr(exempt, c) == 0)
+			return i;
+	}
+
+	return 0;
+}
+
+/*
+ * ncurses uses ESC to detect escaped char sequences. This resutl in
+ * a small timeout before ESC is actually delivered to the application.
+ * lxdialog suggest <ESC> <ESC> which is correctly translated to two
+ * times esc. But then we need to ignore the second esc to avoid stepping
+ * out one menu too much. Filter away all escaped key sequences since
+ * keypad(FALSE) turn off ncurses support for escape sequences - and thats
+ * needed to make notimeout() do as expected.
+ */
+int on_key_esc(WINDOW *win)
+{
+	int key;
+	int key2;
+	int key3;
+
+	nodelay(win, TRUE);
+	keypad(win, FALSE);
+	key = wgetch(win);
+	key2 = wgetch(win);
+	do {
+		key3 = wgetch(win);
+	} while (key3 != ERR);
+	nodelay(win, FALSE);
+	keypad(win, TRUE);
+	if (key == KEY_ESC && key2 == ERR)
+		return KEY_ESC;
+	else if (key != ERR && key != KEY_ESC && key2 == ERR)
+		ungetch(key);
+
+	return -1;
+}
+
+/* redraw screen in new size */
+int on_key_resize(void)
+{
+	dialog_clear();
+	return KEY_RESIZE;
+}
+
+struct dialog_list *item_cur;
+struct dialog_list item_nil;
+struct dialog_list *item_head;
+
+void item_reset(void)
+{
+	struct dialog_list *p, *next;
+
+	for (p = item_head; p; p = next) {
+		next = p->next;
+		free(p);
+	}
+	item_head = NULL;
+	item_cur = &item_nil;
+}
+
+void item_make(const char *fmt, ...)
+{
+	va_list ap;
+	struct dialog_list *p = malloc(sizeof(*p));
+
+	if (item_head)
+		item_cur->next = p;
+	else
+		item_head = p;
+	item_cur = p;
+	memset(p, 0, sizeof(*p));
+
+	va_start(ap, fmt);
+	vsnprintf(item_cur->node.str, sizeof(item_cur->node.str), fmt, ap);
+	va_end(ap);
+}
+
+void item_add_str(const char *fmt, ...)
+{
+	va_list ap;
+        size_t avail;
+
+	avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str);
+
+	va_start(ap, fmt);
+	vsnprintf(item_cur->node.str + strlen(item_cur->node.str),
+		  avail, fmt, ap);
+	item_cur->node.str[sizeof(item_cur->node.str) - 1] = '\0';
+	va_end(ap);
+}
+
+void item_set_tag(char tag)
+{
+	item_cur->node.tag = tag;
+}
+void item_set_data(void *ptr)
+{
+	item_cur->node.data = ptr;
+}
+
+void item_set_selected(int val)
+{
+	item_cur->node.selected = val;
+}
+
+int item_activate_selected(void)
+{
+	item_foreach()
+		if (item_is_selected())
+			return 1;
+	return 0;
+}
+
+void *item_data(void)
+{
+	return item_cur->node.data;
+}
+
+char item_tag(void)
+{
+	return item_cur->node.tag;
+}
+
+int item_count(void)
+{
+	int n = 0;
+	struct dialog_list *p;
+
+	for (p = item_head; p; p = p->next)
+		n++;
+	return n;
+}
+
+void item_set(int n)
+{
+	int i = 0;
+	item_foreach()
+		if (i++ == n)
+			return;
+}
+
+int item_n(void)
+{
+	int n = 0;
+	struct dialog_list *p;
+
+	for (p = item_head; p; p = p->next) {
+		if (p == item_cur)
+			return n;
+		n++;
+	}
+	return 0;
+}
+
+const char *item_str(void)
+{
+	return item_cur->node.str;
+}
+
+int item_is_selected(void)
+{
+	return (item_cur->node.selected != 0);
+}
+
+int item_is_tag(char tag)
+{
+	return (item_cur->node.tag == tag);
+}
diff --git a/trunk/scripts/config/lxdialog/yesno.c b/trunk/scripts/config/lxdialog/yesno.c
new file mode 100644
index 00000000..4e6e8090
--- /dev/null
+++ b/trunk/scripts/config/lxdialog/yesno.c
@@ -0,0 +1,114 @@
+/*
+ *  yesno.c -- implements the yes/no box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+/*
+ * Display termination buttons
+ */
+static void print_buttons(WINDOW * dialog, int height, int width, int selected)
+{
+	int x = width / 2 - 10;
+	int y = height - 2;
+
+	print_button(dialog, gettext(" Yes "), y, x, selected == 0);
+	print_button(dialog, gettext("  No  "), y, x + 13, selected == 1);
+
+	wmove(dialog, y, x + 1 + 13 * selected);
+	wrefresh(dialog);
+}
+
+/*
+ * Display a dialog box with two buttons - Yes and No
+ */
+int dialog_yesno(const char *title, const char *prompt, int height, int width)
+{
+	int i, x, y, key = 0, button = 0;
+	WINDOW *dialog;
+
+do_resize:
+	if (getmaxy(stdscr) < (height + 4))
+		return -ERRDISPLAYTOOSMALL;
+	if (getmaxx(stdscr) < (width + 4))
+		return -ERRDISPLAYTOOSMALL;
+
+	/* center dialog box on screen */
+	x = (COLS - width) / 2;
+	y = (LINES - height) / 2;
+
+	draw_shadow(stdscr, y, x, height, width);
+
+	dialog = newwin(height, width, y, x);
+	keypad(dialog, TRUE);
+
+	draw_box(dialog, 0, 0, height, width,
+		 dlg.dialog.atr, dlg.border.atr);
+	wattrset(dialog, dlg.border.atr);
+	mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+	for (i = 0; i < width - 2; i++)
+		waddch(dialog, ACS_HLINE);
+	wattrset(dialog, dlg.dialog.atr);
+	waddch(dialog, ACS_RTEE);
+
+	print_title(dialog, title, width);
+
+	wattrset(dialog, dlg.dialog.atr);
+	print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+	print_buttons(dialog, height, width, 0);
+
+	while (key != KEY_ESC) {
+		key = wgetch(dialog);
+		switch (key) {
+		case 'Y':
+		case 'y':
+			delwin(dialog);
+			return 0;
+		case 'N':
+		case 'n':
+			delwin(dialog);
+			return 1;
+
+		case TAB:
+		case KEY_LEFT:
+		case KEY_RIGHT:
+			button = ((key == KEY_LEFT ? --button : ++button) < 0) ? 1 : (button > 1 ? 0 : button);
+
+			print_buttons(dialog, height, width, button);
+			wrefresh(dialog);
+			break;
+		case ' ':
+		case '\n':
+			delwin(dialog);
+			return button;
+		case KEY_ESC:
+			key = on_key_esc(dialog);
+			break;
+		case KEY_RESIZE:
+			delwin(dialog);
+			on_key_resize();
+			goto do_resize;
+		}
+	}
+
+	delwin(dialog);
+	return key;		/* ESC pressed */
+}
diff --git a/trunk/scripts/config/mconf.c b/trunk/scripts/config/mconf.c
new file mode 100644
index 00000000..fd50fabb
--- /dev/null
+++ b/trunk/scripts/config/mconf.c
@@ -0,0 +1,969 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ *
+ * Introduced single menu mode (show all sub-menus in one large tree).
+ * 2002-11-06 Petr Baudis <pasky@ucw.cz>
+ *
+ * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ */
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+#include <locale.h>
+
+#include "lkc.h"
+#include "lxdialog/dialog.h"
+
+static const char mconf_readme[] = N_(
+"Overview\n"
+"--------\n"
+"Some libreCMC features may be built directly into the image.\n"
+"Some may be made into installable ipkg packages. Some features\n"
+"may be completely removed altogether.\n"
+"\n"
+"Menu items beginning with [*], <M> or [ ] represent features\n"
+"configured to be included, built as package or removed respectively.\n"
+"Pointed brackets <> represent packaging capable features.\n"
+"\n"
+"To change any of these features, highlight it with the cursor\n"
+"keys and press <Y> to build it in, <M> to make it a module or\n"
+"<N> to removed it.  You may also press the <Space Bar> to cycle\n"
+"through the available options (ie. Y->N->M->Y).\n"
+"\n"
+"Some additional keyboard hints:\n"
+"\n"
+"Menus\n"
+"----------\n"
+"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
+"   you wish to change or submenu wish to select and press <Enter>.\n"
+"   Submenus are designated by \"--->\".\n"
+"\n"
+"   Shortcut: Press the option's highlighted letter (hotkey).\n"
+"             Pressing a hotkey more than once will sequence\n"
+"             through all visible items which use that hotkey.\n"
+"\n"
+"   You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n"
+"   unseen options into view.\n"
+"\n"
+"o  To exit a menu use the cursor keys to highlight the <Exit> button\n"
+"   and press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <ESC><ESC> or <E> or <X> if there is no hotkey\n"
+"             using those letters.  You may press a single <ESC>, but\n"
+"             there is a delayed response which you may find annoying.\n"
+"\n"
+"   Also, the <TAB> and cursor keys will cycle between <Select>,\n"
+"   <Exit> and <Help>.\n"
+"\n"
+"o  To get help with an item, use the cursor keys to highlight <Help>\n"
+"   and press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <H> or <?>.\n"
+"\n"
+"o  To toggle the display of hidden options, press <Z>.\n"
+"\n"
+"\n"
+"Radiolists  (Choice lists)\n"
+"-----------\n"
+"o  Use the cursor keys to select the option you wish to set and press\n"
+"   <S> or the <SPACE BAR>.\n"
+"\n"
+"   Shortcut: Press the first letter of the option you wish to set then\n"
+"             press <S> or <SPACE BAR>.\n"
+"\n"
+"o  To see available help for the item, use the cursor keys to highlight\n"
+"   <Help> and Press <ENTER>.\n"
+"\n"
+"   Shortcut: Press <H> or <?>.\n"
+"\n"
+"   Also, the <TAB> and cursor keys will cycle between <Select> and\n"
+"   <Help>\n"
+"\n"
+"\n"
+"Data Entry\n"
+"-----------\n"
+"o  Enter the requested information and press <ENTER>\n"
+"   If you are entering hexadecimal values, it is not necessary to\n"
+"   add the '0x' prefix to the entry.\n"
+"\n"
+"o  For help, use the <TAB> or cursor keys to highlight the help option\n"
+"   and press <ENTER>.  You can try <TAB><H> as well.\n"
+"\n"
+"\n"
+"Text Box    (Help Window)\n"
+"--------\n"
+"o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
+"   keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for \n"
+"   those who are familiar with less and lynx.\n"
+"\n"
+"o  Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n"
+"\n"
+"\n"
+"Alternate Configuration Files\n"
+"-----------------------------\n"
+"Menuconfig supports the use of alternate configuration files for\n"
+"those who, for various reasons, find it necessary to switch\n"
+"between different configurations.\n"
+"\n"
+"At the end of the main menu you will find two options.  One is\n"
+"for saving the current configuration to a file of your choosing.\n"
+"The other option is for loading a previously saved alternate\n"
+"configuration.\n"
+"\n"
+"Even if you don't use alternate configuration files, but you\n"
+"find during a Menuconfig session that you have completely messed\n"
+"up your settings, you may use the \"Load Alternate...\" option to\n"
+"restore your previously saved settings from \".config\" without\n"
+"restarting Menuconfig.\n"
+"\n"
+"Other information\n"
+"-----------------\n"
+"If you use Menuconfig in an XTERM window make sure you have your\n"
+"$TERM variable set to point to a xterm definition which supports color.\n"
+"Otherwise, Menuconfig will look rather bad.  Menuconfig will not\n"
+"display correctly in a RXVT window because rxvt displays only one\n"
+"intensity of color, bright.\n"
+"\n"
+"Menuconfig will display larger menus on screens or xterms which are\n"
+"set to display more than the standard 25 row by 80 column geometry.\n"
+"In order for this to work, the \"stty size\" command must be able to\n"
+"display the screen's current row and column geometry.  I STRONGLY\n"
+"RECOMMEND that you make sure you do NOT have the shell variables\n"
+"LINES and COLUMNS exported into your environment.  Some distributions\n"
+"export those variables via /etc/profile.  Some ncurses programs can\n"
+"become confused when those variables (LINES & COLUMNS) don't reflect\n"
+"the true screen size.\n"
+"\n"
+"Optional personality available\n"
+"------------------------------\n"
+"If you prefer to have all of the options listed in a single menu, rather\n"
+"than the default multimenu hierarchy, run the menuconfig with\n"
+"MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
+"\n"
+"make MENUCONFIG_MODE=single_menu menuconfig\n"
+"\n"
+"<Enter> will then unroll the appropriate category, or enfold it if it\n"
+"is already unrolled.\n"
+"\n"
+"Note that this mode can eventually be a little more CPU expensive\n"
+"(especially with a larger number of unrolled categories) than the\n"
+"default mode.\n"
+"\n"
+"Different color themes available\n"
+"--------------------------------\n"
+"It is possible to select different color themes using the variable\n"
+"MENUCONFIG_COLOR. To select a theme use:\n"
+"\n"
+"make MENUCONFIG_COLOR=<theme> menuconfig\n"
+"\n"
+"Available themes are\n"
+" mono       => selects colors suitable for monochrome displays\n"
+" blackbg    => selects a color scheme with black background\n"
+" classic    => theme with blue background. The classic look\n"
+" bluetitle  => a LCD friendly version of classic. (default)\n"
+"\n"),
+menu_instructions[] = N_(
+	"Arrow keys navigate the menu.  "
+	"<Enter> selects submenus --->.  "
+	"Highlighted letters are hotkeys.  "
+	"Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
+	"Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
+	"Legend: [*] built-in  [ ] excluded  <M> module  < > module capable"),
+radiolist_instructions[] = N_(
+	"Use the arrow keys to navigate this window or "
+	"press the hotkey of the item you wish to select "
+	"followed by the <SPACE BAR>. "
+	"Press <?> for additional information about this option."),
+inputbox_instructions_int[] = N_(
+	"Please enter a decimal value. "
+	"Fractions will not be accepted.  "
+	"Use the <TAB> key to move from the input field to the buttons below it."),
+inputbox_instructions_hex[] = N_(
+	"Please enter a hexadecimal value. "
+	"Use the <TAB> key to move from the input field to the buttons below it."),
+inputbox_instructions_string[] = N_(
+	"Please enter a string value. "
+	"Use the <TAB> key to move from the input field to the buttons below it."),
+setmod_text[] = N_(
+	"This feature depends on another which has been configured as a module.\n"
+	"As a result, this feature will be built as a module."),
+load_config_text[] = N_(
+	"Enter the name of the configuration file you wish to load.  "
+	"Accept the name shown to restore the configuration you "
+	"last retrieved.  Leave blank to abort."),
+load_config_help[] = N_(
+	"\n"
+	"For various reasons, one may wish to keep several different\n"
+	"configurations available on a single machine.\n"
+	"\n"
+	"If you have saved a previous configuration in a file other than the\n"
+	"default one, entering its name here will allow you to modify that\n"
+	"configuration.\n"
+	"\n"
+	"If you are uncertain, then you have probably never used alternate\n"
+	"configuration files. You should therefore leave this blank to abort.\n"),
+save_config_text[] = N_(
+	"Enter a filename to which this configuration should be saved "
+	"as an alternate.  Leave blank to abort."),
+save_config_help[] = N_(
+	"\n"
+	"For various reasons, one may wish to keep different configurations\n"
+	"available on a single machine.\n"
+	"\n"
+	"Entering a file name here will allow you to later retrieve, modify\n"
+	"and use the current configuration as an alternate to whatever\n"
+	"configuration options you have selected at that time.\n"
+	"\n"
+	"If you are uncertain what all this means then you should probably\n"
+	"leave this blank.\n"),
+search_help[] = N_(
+	"\n"
+	"Search for symbols and display their relations.\n"
+	"Regular expressions are allowed.\n"
+	"Example: search for \"^FOO\"\n"
+	"Result:\n"
+	"-----------------------------------------------------------------\n"
+	"Symbol: FOO [=m]\n"
+	"Type  : tristate\n"
+	"Prompt: Foo bus is used to drive the bar HW\n"
+	"  Defined at drivers/pci/Kconfig:47\n"
+	"  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
+	"  Location:\n"
+	"    -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
+	"      -> PCI support (PCI [=y])\n"
+	"(1)     -> PCI access mode (<choice> [=y])\n"
+	"  Selects: LIBCRC32\n"
+	"  Selected by: BAR\n"
+	"-----------------------------------------------------------------\n"
+	"o The line 'Type:' shows the type of the configuration option for\n"
+	"  this symbol (boolean, tristate, string, ...)\n"
+	"o The line 'Prompt:' shows the text used in the menu structure for\n"
+	"  this symbol\n"
+	"o The 'Defined at' line tell at what file / line number the symbol\n"
+	"  is defined\n"
+	"o The 'Depends on:' line tell what symbols needs to be defined for\n"
+	"  this symbol to be visible in the menu (selectable)\n"
+	"o The 'Location:' lines tell where in the menu structure this symbol\n"
+	"  is located\n"
+	"    A location followed by a [=y] indicates that this is a\n"
+	"    selectable menu item - and the current value is displayed inside\n"
+	"    brackets.\n"
+	"    Press the key in the (#) prefix to jump directly to that\n"
+	"    location. You will be returned to the current search results\n"
+	"    after exiting this new menu.\n"
+	"o The 'Selects:' line tell what symbol will be automatically\n"
+	"  selected if this symbol is selected (y or m)\n"
+	"o The 'Selected by' line tell what symbol has selected this symbol\n"
+	"\n"
+	"Only relevant lines are shown.\n"
+	"\n\n"
+	"Search examples:\n"
+	"Examples: USB	=> find all symbols containing USB\n"
+	"          ^USB => find all symbols starting with USB\n"
+	"          USB$ => find all symbols ending with USB\n"
+	"\n");
+
+static int indent;
+static struct menu *current_menu;
+static int child_count;
+static int single_menu_mode;
+static int show_all_options;
+static int save_and_exit;
+
+static void conf(struct menu *menu, struct menu *active_menu);
+static void conf_choice(struct menu *menu);
+static void conf_string(struct menu *menu);
+static void conf_load(void);
+static void conf_save(void);
+static int show_textbox_ext(const char *title, char *text, int r, int c,
+			    int *keys, int *vscroll, int *hscroll,
+			    update_text_fn update_text, void *data);
+static void show_textbox(const char *title, const char *text, int r, int c);
+static void show_helptext(const char *title, const char *text);
+static void show_help(struct menu *menu);
+
+static char filename[PATH_MAX+1];
+static void set_config_filename(const char *config_filename)
+{
+	static char menu_backtitle[PATH_MAX+128];
+	int size;
+
+	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
+	                "%s - %s", config_filename, rootmenu.prompt->text);
+	if (size >= sizeof(menu_backtitle))
+		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
+	set_dialog_backtitle(menu_backtitle);
+
+	size = snprintf(filename, sizeof(filename), "%s", config_filename);
+	if (size >= sizeof(filename))
+		filename[sizeof(filename)-1] = '\0';
+}
+
+
+struct search_data {
+	struct list_head *head;
+	struct menu **targets;
+	int *keys;
+};
+
+static void update_text(char *buf, size_t start, size_t end, void *_data)
+{
+	struct search_data *data = _data;
+	struct jump_key *pos;
+	int k = 0;
+
+	list_for_each_entry(pos, data->head, entries) {
+		if (pos->offset >= start && pos->offset < end) {
+			char header[4];
+
+			if (k < JUMP_NB) {
+				int key = '0' + (pos->index % JUMP_NB) + 1;
+
+				sprintf(header, "(%c)", key);
+				data->keys[k] = key;
+				data->targets[k] = pos->target;
+				k++;
+			} else {
+				sprintf(header, "   ");
+			}
+
+			memcpy(buf + pos->offset, header, sizeof(header) - 1);
+		}
+	}
+	data->keys[k] = 0;
+}
+
+static void search_conf(void)
+{
+	struct symbol **sym_arr;
+	struct gstr res;
+	struct gstr title;
+	char *dialog_input;
+	int dres, vscroll = 0, hscroll = 0;
+	bool again;
+
+	title = str_new();
+	str_printf( &title, _("Enter %s (sub)string to search for "
+			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
+
+again:
+	dialog_clear();
+	dres = dialog_inputbox(_("Search Configuration Parameter"),
+			      str_get(&title),
+			      10, 75, "");
+	switch (dres) {
+	case 0:
+		break;
+	case 1:
+		show_helptext(_("Search Configuration"), search_help);
+		goto again;
+	default:
+		str_free(&title);
+		return;
+	}
+
+	/* strip the prefix if necessary */
+	dialog_input = dialog_input_result;
+	if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0)
+		dialog_input += strlen(CONFIG_);
+
+	sym_arr = sym_re_search(dialog_input);
+	do {
+		LIST_HEAD(head);
+		struct menu *targets[JUMP_NB];
+		int keys[JUMP_NB + 1], i;
+		struct search_data data = {
+			.head = &head,
+			.targets = targets,
+			.keys = keys,
+		};
+
+		res = get_relations_str(sym_arr, &head);
+		dres = show_textbox_ext(_("Search Results"), (char *)
+					str_get(&res), 0, 0, keys, &vscroll,
+					&hscroll, &update_text, (void *)
+					&data);
+		again = false;
+		for (i = 0; i < JUMP_NB && keys[i]; i++)
+			if (dres == keys[i]) {
+				conf(targets[i]->parent, targets[i]);
+				again = true;
+			}
+		str_free(&res);
+	} while (again);
+	free(sym_arr);
+	str_free(&title);
+}
+
+static void build_conf(struct menu *menu)
+{
+	struct symbol *sym;
+	struct property *prop;
+	struct menu *child;
+	int type, tmp, doint = 2;
+	tristate val;
+	char ch;
+	bool visible;
+
+	/*
+	 * note: menu_is_visible() has side effect that it will
+	 * recalc the value of the symbol.
+	 */
+	visible = menu_is_visible(menu);
+	if (show_all_options && !menu_has_prompt(menu))
+		return;
+	else if (!show_all_options && !visible)
+		return;
+
+	sym = menu->sym;
+	prop = menu->prompt;
+	if (!sym) {
+		if (prop && menu != current_menu) {
+			const char *prompt = menu_get_prompt(menu);
+			switch (prop->type) {
+			case P_MENU:
+				child_count++;
+				prompt = _(prompt);
+				if (single_menu_mode) {
+					item_make("%s%*c%s",
+						  menu->data ? "-->" : "++>",
+						  indent + 1, ' ', prompt);
+				} else
+					item_make("   %*c%s  --->", indent + 1, ' ', prompt);
+
+				item_set_tag('m');
+				item_set_data(menu);
+				if (single_menu_mode && menu->data)
+					goto conf_childs;
+				return;
+			case P_COMMENT:
+				if (prompt) {
+					child_count++;
+					item_make("   %*c*** %s ***", indent + 1, ' ', _(prompt));
+					item_set_tag(':');
+					item_set_data(menu);
+				}
+				break;
+			default:
+				if (prompt) {
+					child_count++;
+					item_make("---%*c%s", indent + 1, ' ', _(prompt));
+					item_set_tag(':');
+					item_set_data(menu);
+				}
+			}
+		} else
+			doint = 0;
+		goto conf_childs;
+	}
+
+	type = sym_get_type(sym);
+	if (sym_is_choice(sym)) {
+		struct symbol *def_sym = sym_get_choice_value(sym);
+		struct menu *def_menu = NULL;
+
+		child_count++;
+		for (child = menu->list; child; child = child->next) {
+			if (menu_is_visible(child) && child->sym == def_sym)
+				def_menu = child;
+		}
+
+		val = sym_get_tristate_value(sym);
+		if (sym_is_changable(sym)) {
+			switch (type) {
+			case S_BOOLEAN:
+				item_make("[%c]", val == no ? ' ' : '*');
+				break;
+			case S_TRISTATE:
+				switch (val) {
+				case yes: ch = '*'; break;
+				case mod: ch = 'M'; break;
+				default:  ch = ' '; break;
+				}
+				item_make("<%c>", ch);
+				break;
+			}
+			item_set_tag('t');
+			item_set_data(menu);
+		} else {
+			item_make("   ");
+			item_set_tag(def_menu ? 't' : ':');
+			item_set_data(menu);
+		}
+
+		item_add_str("%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
+		if (val == yes) {
+			if (def_menu) {
+				item_add_str(" (%s)", _(menu_get_prompt(def_menu)));
+				item_add_str("  --->");
+				if (def_menu->list) {
+					indent += 2;
+					build_conf(def_menu);
+					indent -= 2;
+				}
+			}
+			return;
+		}
+	} else {
+		if (menu == current_menu) {
+			item_make("---%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
+			item_set_tag(':');
+			item_set_data(menu);
+			goto conf_childs;
+		}
+		child_count++;
+		val = sym_get_tristate_value(sym);
+		if (sym_is_choice_value(sym) && val == yes) {
+			item_make("   ");
+			item_set_tag(':');
+			item_set_data(menu);
+		} else {
+			switch (type) {
+			case S_BOOLEAN:
+				if (sym_is_changable(sym))
+					item_make("[%c]", val == no ? ' ' : '*');
+				else
+					item_make("-%c-", val == no ? ' ' : '*');
+				item_set_tag('t');
+				item_set_data(menu);
+				break;
+			case S_TRISTATE:
+				switch (val) {
+				case yes: ch = '*'; break;
+				case mod: ch = 'M'; break;
+				default:  ch = ' '; break;
+				}
+				if (sym_is_changable(sym)) {
+					if (sym->rev_dep.tri == mod)
+						item_make("{%c}", ch);
+					else
+						item_make("<%c>", ch);
+				} else
+					item_make("-%c-", ch);
+				item_set_tag('t');
+				item_set_data(menu);
+				break;
+			default:
+				tmp = 2 + strlen(sym_get_string_value(sym)); /* () = 2 */
+				item_make("(%s)", sym_get_string_value(sym));
+				tmp = indent - tmp + 4;
+				if (tmp < 0)
+					tmp = 0;
+				item_add_str("%*c%s%s", tmp, ' ', _(menu_get_prompt(menu)),
+					     (sym_has_value(sym) || !sym_is_changable(sym)) ?
+					     "" : _(" (NEW)"));
+				item_set_tag('s');
+				item_set_data(menu);
+				goto conf_childs;
+			}
+		}
+		item_add_str("%*c%s%s", indent + 1, ' ', _(menu_get_prompt(menu)),
+			  (sym_has_value(sym) || !sym_is_changable(sym)) ?
+			  "" : _(" (NEW)"));
+		if (menu->prompt->type == P_MENU) {
+			item_add_str("  --->");
+			return;
+		}
+	}
+
+conf_childs:
+	indent += doint;
+	for (child = menu->list; child; child = child->next)
+		build_conf(child);
+	indent -= doint;
+}
+
+static void conf(struct menu *menu, struct menu *active_menu)
+{
+	struct menu *submenu;
+	const char *prompt = menu_get_prompt(menu);
+	struct symbol *sym;
+	int res;
+	int s_scroll = 0;
+
+	while (1) {
+		item_reset();
+		current_menu = menu;
+		build_conf(menu);
+		if (!child_count)
+			break;
+		dialog_clear();
+		res = dialog_menu(prompt ? _(prompt) : _("Main Menu"),
+				  _(menu_instructions),
+				  active_menu, &s_scroll);
+		if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
+			break;
+		if (!item_activate_selected())
+			continue;
+		if (!item_tag())
+			continue;
+
+		submenu = item_data();
+		active_menu = item_data();
+		if (submenu)
+			sym = submenu->sym;
+		else
+			sym = NULL;
+
+		switch (res) {
+		case 0:
+			switch (item_tag()) {
+			case 'm':
+				if (single_menu_mode)
+					submenu->data = (void *) (long) !submenu->data;
+				else
+					conf(submenu, NULL);
+				break;
+			case 't':
+				if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)
+					conf_choice(submenu);
+				else if (submenu->prompt->type == P_MENU)
+					conf(submenu, NULL);
+				break;
+			case 's':
+				conf_string(submenu);
+				break;
+			}
+			break;
+		case 2:
+			if (sym)
+				show_help(submenu);
+			else
+				show_helptext(_("README"), _(mconf_readme));
+			break;
+		case 3:
+			conf_save();
+			break;
+		case 4:
+			conf_load();
+			break;
+		case 5:
+			if (item_is_tag('t')) {
+				if (sym_set_tristate_value(sym, yes))
+					break;
+				if (sym_set_tristate_value(sym, mod))
+					show_textbox(NULL, setmod_text, 6, 74);
+			}
+			break;
+		case 6:
+			if (item_is_tag('t'))
+				sym_set_tristate_value(sym, no);
+			break;
+		case 7:
+			if (item_is_tag('t'))
+				sym_set_tristate_value(sym, mod);
+			break;
+		case 8:
+			if (item_is_tag('t'))
+				sym_toggle_tristate_value(sym);
+			else if (item_is_tag('m'))
+				conf(submenu, NULL);
+			break;
+		case 9:
+			search_conf();
+			break;
+		case 10:
+			show_all_options = !show_all_options;
+			break;
+		}
+	}
+}
+
+static int show_textbox_ext(const char *title, char *text, int r, int c, int
+			    *keys, int *vscroll, int *hscroll, update_text_fn
+			    update_text, void *data)
+{
+	dialog_clear();
+	return dialog_textbox(title, text, r, c, keys, vscroll, hscroll,
+			      update_text, data);
+}
+
+static void show_textbox(const char *title, const char *text, int r, int c)
+{
+	show_textbox_ext(title, (char *) text, r, c, (int []) {0}, NULL, NULL,
+			 NULL, NULL);
+}
+
+static void show_helptext(const char *title, const char *text)
+{
+	show_textbox(title, text, 0, 0);
+}
+
+static void conf_message_callback(const char *fmt, va_list ap)
+{
+	char buf[PATH_MAX+1];
+
+	vsnprintf(buf, sizeof(buf), fmt, ap);
+	if (save_and_exit)
+		printf("%s", buf);
+	else
+		show_textbox(NULL, buf, 6, 60);
+}
+
+static void show_help(struct menu *menu)
+{
+	struct gstr help = str_new();
+
+	help.max_width = getmaxx(stdscr) - 10;
+	menu_get_ext_help(menu, &help);
+
+	show_helptext(_(menu_get_prompt(menu)), str_get(&help));
+	str_free(&help);
+}
+
+static void conf_choice(struct menu *menu)
+{
+	const char *prompt = _(menu_get_prompt(menu));
+	struct menu *child;
+	struct symbol *active;
+	struct property *prop;
+
+	active = sym_get_choice_value(menu->sym);
+	while (1) {
+		int res;
+		int selected;
+		item_reset();
+
+		current_menu = menu;
+		for (child = menu->list; child; child = child->next) {
+			if (!menu_is_visible(child))
+				continue;
+			if (child->sym)
+				item_make("%s", _(menu_get_prompt(child)));
+			else {
+				item_make("*** %s ***", _(menu_get_prompt(child)));
+				item_set_tag(':');
+			}
+			item_set_data(child);
+			if (child->sym == active)
+				item_set_selected(1);
+			if (child->sym == sym_get_choice_value(menu->sym))
+				item_set_tag('X');
+		}
+		dialog_clear();
+		res = dialog_checklist(prompt ? _(prompt) : _("Main Menu"),
+					_(radiolist_instructions),
+					 15, 70, 6);
+		selected = item_activate_selected();
+		switch (res) {
+		case 0:
+			if (selected) {
+				child = item_data();
+				if (!child->sym)
+					break;
+
+				if (sym_get_tristate_value(child->sym) != yes) {
+					for_all_properties(menu->sym, prop, P_RESET) {
+						if (expr_calc_value(prop->visible.expr) == no)
+							continue;
+
+						conf_reset(S_DEF_USER);
+						break;
+					}
+				}
+				sym_set_tristate_value(child->sym, yes);
+			}
+			return;
+		case 1:
+			if (selected) {
+				child = item_data();
+				show_help(child);
+				active = child->sym;
+			} else
+				show_help(menu);
+			break;
+		case KEY_ESC:
+			return;
+		case -ERRDISPLAYTOOSMALL:
+			return;
+		}
+	}
+}
+
+static void conf_string(struct menu *menu)
+{
+	const char *prompt = menu_get_prompt(menu);
+
+	while (1) {
+		int res;
+		const char *heading;
+
+		switch (sym_get_type(menu->sym)) {
+		case S_INT:
+			heading = _(inputbox_instructions_int);
+			break;
+		case S_HEX:
+			heading = _(inputbox_instructions_hex);
+			break;
+		case S_STRING:
+			heading = _(inputbox_instructions_string);
+			break;
+		default:
+			heading = _("Internal mconf error!");
+		}
+		dialog_clear();
+		res = dialog_inputbox(prompt ? _(prompt) : _("Main Menu"),
+				      heading, 10, 75,
+				      sym_get_string_value(menu->sym));
+		switch (res) {
+		case 0:
+			if (sym_set_string_value(menu->sym, dialog_input_result))
+				return;
+			show_textbox(NULL, _("You have made an invalid entry."), 5, 43);
+			break;
+		case 1:
+			show_help(menu);
+			break;
+		case KEY_ESC:
+			return;
+		}
+	}
+}
+
+static void conf_load(void)
+{
+
+	while (1) {
+		int res;
+		dialog_clear();
+		res = dialog_inputbox(NULL, load_config_text,
+				      11, 55, filename);
+		switch(res) {
+		case 0:
+			if (!dialog_input_result[0])
+				return;
+			if (!conf_read(dialog_input_result)) {
+				set_config_filename(dialog_input_result);
+				sym_set_change_count(1);
+				return;
+			}
+			show_textbox(NULL, _("File does not exist!"), 5, 38);
+			break;
+		case 1:
+			show_helptext(_("Load Alternate Configuration"), load_config_help);
+			break;
+		case KEY_ESC:
+			return;
+		}
+	}
+}
+
+static void conf_save(void)
+{
+	while (1) {
+		int res;
+		dialog_clear();
+		res = dialog_inputbox(NULL, save_config_text,
+				      11, 55, filename);
+		switch(res) {
+		case 0:
+			if (!dialog_input_result[0])
+				return;
+			if (!conf_write(dialog_input_result)) {
+				set_config_filename(dialog_input_result);
+				return;
+			}
+			show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60);
+			break;
+		case 1:
+			show_helptext(_("Save Alternate Configuration"), save_config_help);
+			break;
+		case KEY_ESC:
+			return;
+		}
+	}
+}
+
+static int handle_exit(void)
+{
+	int res;
+
+	save_and_exit = 1;
+	dialog_clear();
+	if (conf_get_changed())
+		res = dialog_yesno(NULL,
+				   _("Do you wish to save your new configuration ?\n"
+				     "<ESC><ESC> to continue."),
+				   6, 60);
+	else
+		res = -1;
+
+	end_dialog(saved_x, saved_y);
+
+	switch (res) {
+	case 0:
+		if (conf_write(filename)) {
+			fprintf(stderr, _("\n\n"
+					  "Error while writing of the configuration.\n"
+					  "Your configuration changes were NOT saved."
+					  "\n\n"));
+			return 1;
+		}
+		/* fall through */
+	case -1:
+		printf(_("\n\n"
+			 "*** End of the configuration.\n"
+			 "*** Execute 'make' to start the build or try 'make help'."
+			 "\n\n"));
+		res = 0;
+		break;
+	default:
+		fprintf(stderr, _("\n\n"
+				  "Your configuration changes were NOT saved."
+				  "\n\n"));
+		if (res != KEY_ESC)
+			res = 0;
+	}
+
+	return res;
+}
+
+static void sig_handler(int signo)
+{
+	exit(handle_exit());
+}
+
+int main(int ac, char **av)
+{
+	char *mode;
+	int res;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	signal(SIGINT, sig_handler);
+
+	conf_parse(av[1]);
+	conf_read(NULL);
+
+	mode = getenv("MENUCONFIG_MODE");
+	if (mode) {
+		if (!strcasecmp(mode, "single_menu"))
+			single_menu_mode = 1;
+	}
+
+	if (init_dialog(NULL)) {
+		fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
+		fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
+		return 1;
+	}
+
+	set_config_filename(conf_get_configname());
+	conf_set_message_callback(conf_message_callback);
+	do {
+		conf(&rootmenu, NULL);
+		res = handle_exit();
+	} while (res == KEY_ESC);
+
+	return res;
+}
+
diff --git a/trunk/scripts/config/mconf_check b/trunk/scripts/config/mconf_check
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/scripts/config/menu.c b/trunk/scripts/config/menu.c
new file mode 100644
index 00000000..f3bffa30
--- /dev/null
+++ b/trunk/scripts/config/menu.c
@@ -0,0 +1,644 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lkc.h"
+
+static const char nohelp_text[] = "There is no help available for this option.";
+
+struct menu rootmenu;
+static struct menu **last_entry_ptr;
+
+struct file *file_list;
+struct file *current_file;
+
+void menu_warn(struct menu *menu, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	fprintf(stderr, "%s:%d:warning: ", menu->file->name, menu->lineno);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "\n");
+	va_end(ap);
+}
+
+static void prop_warn(struct property *prop, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	fprintf(stderr, "%s:%d:warning: ", prop->file->name, prop->lineno);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "\n");
+	va_end(ap);
+}
+
+void _menu_init(void)
+{
+	current_entry = current_menu = &rootmenu;
+	last_entry_ptr = &rootmenu.list;
+}
+
+void menu_add_entry(struct symbol *sym)
+{
+	struct menu *menu;
+
+	menu = xmalloc(sizeof(*menu));
+	memset(menu, 0, sizeof(*menu));
+	menu->sym = sym;
+	menu->parent = current_menu;
+	menu->file = current_file;
+	menu->lineno = zconf_lineno();
+
+	*last_entry_ptr = menu;
+	last_entry_ptr = &menu->next;
+	current_entry = menu;
+	if (sym)
+		menu_add_symbol(P_SYMBOL, sym, NULL);
+}
+
+void menu_end_entry(void)
+{
+}
+
+struct menu *menu_add_menu(void)
+{
+	menu_end_entry();
+	last_entry_ptr = &current_entry->list;
+	return current_menu = current_entry;
+}
+
+void menu_end_menu(void)
+{
+	last_entry_ptr = &current_menu->next;
+	current_menu = current_menu->parent;
+}
+
+static struct expr *menu_check_dep(struct expr *e)
+{
+	if (!e)
+		return e;
+
+	switch (e->type) {
+	case E_NOT:
+		e->left.expr = menu_check_dep(e->left.expr);
+		break;
+	case E_OR:
+	case E_AND:
+		e->left.expr = menu_check_dep(e->left.expr);
+		e->right.expr = menu_check_dep(e->right.expr);
+		break;
+	case E_SYMBOL:
+		/* change 'm' into 'm' && MODULES */
+		if (e->left.sym == &symbol_mod)
+			return expr_alloc_and(e, expr_alloc_symbol(modules_sym));
+		break;
+	default:
+		break;
+	}
+	return e;
+}
+
+void menu_add_dep(struct expr *dep)
+{
+	current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));
+}
+
+void menu_set_type(int type)
+{
+	struct symbol *sym = current_entry->sym;
+
+	if (sym->type == type)
+		return;
+	if (sym->type == S_UNKNOWN) {
+		sym->type = type;
+		return;
+	}
+	menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'",
+	    sym->name ? sym->name : "<choice>",
+	    sym_type_name(sym->type), sym_type_name(type));
+}
+
+struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep)
+{
+	struct property *prop = prop_alloc(type, current_entry->sym);
+
+	prop->menu = current_entry;
+	prop->expr = expr;
+	prop->visible.expr = menu_check_dep(dep);
+
+	if (prompt) {
+		if (isspace(*prompt)) {
+			prop_warn(prop, "leading whitespace ignored");
+			while (isspace(*prompt))
+				prompt++;
+		}
+		if (current_entry->prompt && current_entry != &rootmenu)
+			prop_warn(prop, "prompt redefined");
+
+		/* Apply all upper menus' visibilities to actual prompts. */
+		if(type == P_PROMPT) {
+			struct menu *menu = current_entry;
+
+			while ((menu = menu->parent) != NULL) {
+				if (!menu->visibility)
+					continue;
+				prop->visible.expr
+					= expr_alloc_and(prop->visible.expr,
+							 menu->visibility);
+			}
+		}
+
+		current_entry->prompt = prop;
+	}
+	prop->text = prompt;
+
+	return prop;
+}
+
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
+{
+	return menu_add_prop(type, prompt, NULL, dep);
+}
+
+void menu_add_visibility(struct expr *expr)
+{
+	current_entry->visibility = expr_alloc_and(current_entry->visibility,
+	    expr);
+}
+
+void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep)
+{
+	menu_add_prop(type, NULL, expr, dep);
+}
+
+void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
+{
+	menu_add_prop(type, NULL, expr_alloc_symbol(sym), dep);
+}
+
+void menu_add_option(int token, char *arg)
+{
+	struct property *prop;
+
+	switch (token) {
+	case T_OPT_MODULES:
+		prop = prop_alloc(P_DEFAULT, modules_sym);
+		prop->expr = expr_alloc_symbol(current_entry->sym);
+		break;
+	case T_OPT_DEFCONFIG_LIST:
+		if (!sym_defconfig_list)
+			sym_defconfig_list = current_entry->sym;
+		else if (sym_defconfig_list != current_entry->sym)
+			zconf_error("trying to redefine defconfig symbol");
+		break;
+	case T_OPT_ENV:
+		prop_add_env(arg);
+		break;
+	}
+}
+
+static int menu_validate_number(struct symbol *sym, struct symbol *sym2)
+{
+	return sym2->type == S_INT || sym2->type == S_HEX ||
+	       (sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name));
+}
+
+static void sym_check_prop(struct symbol *sym)
+{
+	struct property *prop;
+	struct symbol *sym2;
+	for (prop = sym->prop; prop; prop = prop->next) {
+		switch (prop->type) {
+		case P_DEFAULT:
+			if ((sym->type == S_STRING || sym->type == S_INT || sym->type == S_HEX) &&
+			    prop->expr->type != E_SYMBOL)
+				prop_warn(prop,
+				    "default for config symbol '%s'"
+				    " must be a single symbol", sym->name);
+			if (prop->expr->type != E_SYMBOL)
+				break;
+			sym2 = prop_get_symbol(prop);
+			if (sym->type == S_HEX || sym->type == S_INT) {
+				if (!menu_validate_number(sym, sym2))
+					prop_warn(prop,
+					    "'%s': number is invalid",
+					    sym->name);
+			}
+			break;
+		case P_SELECT:
+			sym2 = prop_get_symbol(prop);
+			if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE)
+				prop_warn(prop,
+				    "config symbol '%s' uses select, but is "
+				    "not boolean or tristate", sym->name);
+			else if (sym2->type != S_UNKNOWN &&
+			         sym2->type != S_BOOLEAN &&
+			         sym2->type != S_TRISTATE)
+				prop_warn(prop,
+				    "'%s' has wrong type. 'select' only "
+				    "accept arguments of boolean and "
+				    "tristate type", sym2->name);
+			break;
+		case P_RANGE:
+			if (sym->type != S_INT && sym->type != S_HEX)
+				prop_warn(prop, "range is only allowed "
+				                "for int or hex symbols");
+			if (!menu_validate_number(sym, prop->expr->left.sym) ||
+			    !menu_validate_number(sym, prop->expr->right.sym))
+				prop_warn(prop, "range is invalid");
+			break;
+		default:
+			;
+		}
+	}
+}
+
+void menu_finalize(struct menu *parent)
+{
+	struct menu *menu, *last_menu;
+	struct symbol *sym;
+	struct property *prop;
+	struct expr *parentdep, *basedep, *dep, *dep2, **ep;
+
+	sym = parent->sym;
+	if (parent->list) {
+		if (sym && sym_is_choice(sym)) {
+			if (sym->type == S_UNKNOWN) {
+				/* find the first choice value to find out choice type */
+				current_entry = parent;
+				for (menu = parent->list; menu; menu = menu->next) {
+					if (menu->sym && menu->sym->type != S_UNKNOWN) {
+						menu_set_type(menu->sym->type);
+						break;
+					}
+				}
+			}
+			/* set the type of the remaining choice values */
+			for (menu = parent->list; menu; menu = menu->next) {
+				current_entry = menu;
+				if (menu->sym && menu->sym->type == S_UNKNOWN)
+					menu_set_type(sym->type);
+			}
+			parentdep = expr_alloc_symbol(sym);
+		} else if (parent->prompt)
+			parentdep = parent->prompt->visible.expr;
+		else
+			parentdep = parent->dep;
+
+		for (menu = parent->list; menu; menu = menu->next) {
+			basedep = expr_transform(menu->dep);
+			basedep = expr_alloc_and(expr_copy(parentdep), basedep);
+			basedep = expr_eliminate_dups(basedep);
+			menu->dep = basedep;
+			if (menu->sym)
+				prop = menu->sym->prop;
+			else
+				prop = menu->prompt;
+			for (; prop; prop = prop->next) {
+				if (prop->menu != menu)
+					continue;
+				dep = expr_transform(prop->visible.expr);
+				dep = expr_alloc_and(expr_copy(basedep), dep);
+				dep = expr_eliminate_dups(dep);
+				if (menu->sym && menu->sym->type != S_TRISTATE)
+					dep = expr_trans_bool(dep);
+				prop->visible.expr = dep;
+				if (prop->type == P_SELECT) {
+					struct symbol *es = prop_get_symbol(prop);
+					es->rev_dep.expr = expr_alloc_or(es->rev_dep.expr,
+							expr_alloc_and(expr_alloc_symbol(menu->sym), expr_copy(dep)));
+				}
+			}
+		}
+		for (menu = parent->list; menu; menu = menu->next)
+			menu_finalize(menu);
+	} else if (sym) {
+		basedep = parent->prompt ? parent->prompt->visible.expr : NULL;
+		basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);
+		basedep = expr_eliminate_dups(expr_transform(basedep));
+		last_menu = NULL;
+		for (menu = parent->next; menu; menu = menu->next) {
+			dep = menu->prompt ? menu->prompt->visible.expr : menu->dep;
+			if (!expr_contains_symbol(dep, sym))
+				break;
+			if (expr_depends_symbol(dep, sym))
+				goto next;
+			dep = expr_trans_compare(dep, E_UNEQUAL, &symbol_no);
+			dep = expr_eliminate_dups(expr_transform(dep));
+			dep2 = expr_copy(basedep);
+			expr_eliminate_eq(&dep, &dep2);
+			expr_free(dep);
+			if (!expr_is_yes(dep2)) {
+				expr_free(dep2);
+				break;
+			}
+			expr_free(dep2);
+		next:
+			menu_finalize(menu);
+			menu->parent = parent;
+			last_menu = menu;
+		}
+		if (last_menu) {
+			parent->list = parent->next;
+			parent->next = last_menu->next;
+			last_menu->next = NULL;
+		}
+
+		sym->dir_dep.expr = expr_alloc_or(sym->dir_dep.expr, parent->dep);
+	}
+	for (menu = parent->list; menu; menu = menu->next) {
+		if (sym && sym_is_choice(sym) &&
+		    menu->sym && !sym_is_choice_value(menu->sym)) {
+			current_entry = menu;
+			menu->sym->flags |= SYMBOL_CHOICEVAL;
+			if (!menu->prompt)
+				menu_warn(menu, "choice value must have a prompt");
+			for (prop = menu->sym->prop; prop; prop = prop->next) {
+				if (prop->type == P_DEFAULT)
+					prop_warn(prop, "defaults for choice "
+						  "values not supported");
+				if (prop->menu == menu)
+					continue;
+				if (prop->type == P_PROMPT &&
+				    prop->menu->parent->sym != sym)
+					prop_warn(prop, "choice value used outside its choice group");
+			}
+			/* Non-tristate choice values of tristate choices must
+			 * depend on the choice being set to Y. The choice
+			 * values' dependencies were propagated to their
+			 * properties above, so the change here must be re-
+			 * propagated.
+			 */
+			if (sym->type == S_TRISTATE && menu->sym->type != S_TRISTATE) {
+				basedep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes);
+				menu->dep = expr_alloc_and(basedep, menu->dep);
+				for (prop = menu->sym->prop; prop; prop = prop->next) {
+					if (prop->menu != menu)
+						continue;
+					prop->visible.expr = expr_alloc_and(expr_copy(basedep),
+									    prop->visible.expr);
+				}
+			}
+			menu_add_symbol(P_CHOICE, sym, NULL);
+			prop = sym_get_choice_prop(sym);
+			for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)
+				;
+			*ep = expr_alloc_one(E_LIST, NULL);
+			(*ep)->right.sym = menu->sym;
+		}
+		if (menu->list && (!menu->prompt || !menu->prompt->text)) {
+			for (last_menu = menu->list; ; last_menu = last_menu->next) {
+				last_menu->parent = parent;
+				if (!last_menu->next)
+					break;
+			}
+			last_menu->next = menu->next;
+			menu->next = menu->list;
+			menu->list = NULL;
+		}
+	}
+
+	if (sym && !(sym->flags & SYMBOL_WARNED)) {
+		if (sym->type == S_UNKNOWN)
+			menu_warn(parent, "config symbol defined without type");
+
+		if (sym_is_choice(sym) && !parent->prompt)
+			menu_warn(parent, "choice must have a prompt");
+
+		/* Check properties connected to this symbol */
+		sym_check_prop(sym);
+		sym->flags |= SYMBOL_WARNED;
+	}
+
+	if (sym && !sym_is_optional(sym) && parent->prompt) {
+		sym->rev_dep.expr = expr_alloc_or(sym->rev_dep.expr,
+				expr_alloc_and(parent->prompt->visible.expr,
+					expr_alloc_symbol(&symbol_mod)));
+	}
+}
+
+bool menu_has_prompt(struct menu *menu)
+{
+	if (!menu->prompt)
+		return false;
+	return true;
+}
+
+bool menu_is_visible(struct menu *menu)
+{
+	struct menu *child;
+	struct symbol *sym;
+	tristate visible;
+
+	if (!menu->prompt)
+		return false;
+
+	if (menu->visibility) {
+		if (expr_calc_value(menu->visibility) == no)
+			return no;
+	}
+
+	sym = menu->sym;
+	if (sym) {
+		sym_calc_value(sym);
+		visible = menu->prompt->visible.tri;
+	} else
+		visible = menu->prompt->visible.tri = expr_calc_value(menu->prompt->visible.expr);
+
+	if (visible != no)
+		return true;
+
+	if (!sym || sym_get_tristate_value(menu->sym) == no)
+		return false;
+
+	for (child = menu->list; child; child = child->next) {
+		if (menu_is_visible(child)) {
+			if (sym)
+				sym->flags |= SYMBOL_DEF_USER;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+const char *menu_get_prompt(struct menu *menu)
+{
+	if (menu->prompt)
+		return menu->prompt->text;
+	else if (menu->sym)
+		return menu->sym->name;
+	return NULL;
+}
+
+struct menu *menu_get_root_menu(struct menu *menu)
+{
+	return &rootmenu;
+}
+
+struct menu *menu_get_parent_menu(struct menu *menu)
+{
+	enum prop_type type;
+
+	for (; menu != &rootmenu; menu = menu->parent) {
+		type = menu->prompt ? menu->prompt->type : 0;
+		if (type == P_MENU)
+			break;
+	}
+	return menu;
+}
+
+bool menu_has_help(struct menu *menu)
+{
+	return menu->help != NULL;
+}
+
+const char *menu_get_help(struct menu *menu)
+{
+	if (menu->help)
+		return menu->help;
+	else
+		return "";
+}
+
+static void get_prompt_str(struct gstr *r, struct property *prop,
+			   struct list_head *head)
+{
+	int i, j;
+	struct menu *submenu[8], *menu, *location = NULL;
+	struct jump_key *jump;
+
+	str_printf(r, _("Prompt: %s\n"), _(prop->text));
+	str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
+		prop->menu->lineno);
+	if (!expr_is_yes(prop->visible.expr)) {
+		str_append(r, _("  Depends on: "));
+		expr_gstr_print(prop->visible.expr, r);
+		str_append(r, "\n");
+	}
+	menu = prop->menu->parent;
+	for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
+		bool accessible = menu_is_visible(menu);
+
+		submenu[i++] = menu;
+		if (location == NULL && accessible)
+			location = menu;
+	}
+	if (head && location) {
+		jump = xmalloc(sizeof(struct jump_key));
+
+		if (menu_is_visible(prop->menu)) {
+			/*
+			 * There is not enough room to put the hint at the
+			 * beginning of the "Prompt" line. Put the hint on the
+			 * last "Location" line even when it would belong on
+			 * the former.
+			 */
+			jump->target = prop->menu;
+		} else
+			jump->target = location;
+
+		if (list_empty(head))
+			jump->index = 0;
+		else
+			jump->index = list_entry(head->prev, struct jump_key,
+						 entries)->index + 1;
+
+		list_add_tail(&jump->entries, head);
+	}
+
+	if (i > 0) {
+		str_printf(r, _("  Location:\n"));
+		for (j = 4; --i >= 0; j += 2) {
+			menu = submenu[i];
+			if (head && location && menu == location)
+				jump->offset = r->len - 1;
+			str_printf(r, "%*c-> %s", j, ' ',
+				   _(menu_get_prompt(menu)));
+			if (menu->sym) {
+				str_printf(r, " (%s [=%s])", menu->sym->name ?
+					menu->sym->name : _("<choice>"),
+					sym_get_string_value(menu->sym));
+			}
+			str_append(r, "\n");
+		}
+	}
+}
+
+/*
+ * head is optional and may be NULL
+ */
+void get_symbol_str(struct gstr *r, struct symbol *sym,
+		    struct list_head *head)
+{
+	bool hit;
+	struct property *prop;
+
+	if (sym && sym->name) {
+		str_printf(r, "Symbol: %s [=%s]\n", sym->name,
+			   sym_get_string_value(sym));
+		str_printf(r, "Type  : %s\n", sym_type_name(sym->type));
+		if (sym->type == S_INT || sym->type == S_HEX) {
+			prop = sym_get_range_prop(sym);
+			if (prop) {
+				str_printf(r, "Range : ");
+				expr_gstr_print(prop->expr, r);
+				str_append(r, "\n");
+			}
+		}
+	}
+	for_all_prompts(sym, prop)
+		get_prompt_str(r, prop, head);
+	hit = false;
+	for_all_properties(sym, prop, P_SELECT) {
+		if (!hit) {
+			str_append(r, "  Selects: ");
+			hit = true;
+		} else
+			str_printf(r, " && ");
+		expr_gstr_print(prop->expr, r);
+	}
+	if (hit)
+		str_append(r, "\n");
+	if (sym->rev_dep.expr) {
+		str_append(r, _("  Selected by: "));
+		expr_gstr_print(sym->rev_dep.expr, r);
+		str_append(r, "\n");
+	}
+	str_append(r, "\n\n");
+}
+
+struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
+{
+	struct symbol *sym;
+	struct gstr res = str_new();
+	int i;
+
+	for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
+		get_symbol_str(&res, sym, head);
+	if (!i)
+		str_append(&res, _("No matches found.\n"));
+	return res;
+}
+
+
+void menu_get_ext_help(struct menu *menu, struct gstr *help)
+{
+	struct symbol *sym = menu->sym;
+	const char *help_text = nohelp_text;
+
+	if (menu_has_help(menu)) {
+		if (sym->name)
+			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
+		help_text = menu_get_help(menu);
+	}
+	str_printf(help, "%s\n", _(help_text));
+	if (sym)
+		get_symbol_str(help, sym, NULL);
+}
diff --git a/trunk/scripts/config/symbol.c b/trunk/scripts/config/symbol.c
new file mode 100644
index 00000000..ecc5aa5f
--- /dev/null
+++ b/trunk/scripts/config/symbol.c
@@ -0,0 +1,1310 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <regex.h>
+#include <sys/utsname.h>
+
+#include "lkc.h"
+
+struct symbol symbol_yes = {
+	.name = "y",
+	.curr = { "y", yes },
+	.flags = SYMBOL_CONST|SYMBOL_VALID,
+}, symbol_mod = {
+	.name = "m",
+	.curr = { "m", mod },
+	.flags = SYMBOL_CONST|SYMBOL_VALID,
+}, symbol_no = {
+	.name = "n",
+	.curr = { "n", no },
+	.flags = SYMBOL_CONST|SYMBOL_VALID,
+}, symbol_empty = {
+	.name = "",
+	.curr = { "", no },
+	.flags = SYMBOL_VALID,
+};
+
+struct symbol *sym_defconfig_list;
+struct symbol *modules_sym;
+tristate modules_val;
+
+struct expr *sym_env_list;
+
+static void sym_add_default(struct symbol *sym, const char *def)
+{
+	struct property *prop = prop_alloc(P_DEFAULT, sym);
+
+	prop->expr = expr_alloc_symbol(sym_lookup(def, SYMBOL_CONST));
+}
+
+void sym_init(void)
+{
+	struct symbol *sym;
+	struct utsname uts;
+	static bool inited = false;
+
+	if (inited)
+		return;
+	inited = true;
+
+	uname(&uts);
+
+	sym = sym_lookup("UNAME_RELEASE", 0);
+	sym->type = S_STRING;
+	sym->flags |= SYMBOL_AUTO;
+	sym_add_default(sym, uts.release);
+}
+
+enum symbol_type sym_get_type(struct symbol *sym)
+{
+	enum symbol_type type = sym->type;
+
+	if (type == S_TRISTATE) {
+		if (sym_is_choice_value(sym) && sym->visible == yes)
+			type = S_BOOLEAN;
+		else if (modules_val == no)
+			type = S_BOOLEAN;
+	}
+	return type;
+}
+
+const char *sym_type_name(enum symbol_type type)
+{
+	switch (type) {
+	case S_BOOLEAN:
+		return "boolean";
+	case S_TRISTATE:
+		return "tristate";
+	case S_INT:
+		return "integer";
+	case S_HEX:
+		return "hex";
+	case S_STRING:
+		return "string";
+	case S_UNKNOWN:
+		return "unknown";
+	case S_OTHER:
+		break;
+	}
+	return "???";
+}
+
+struct property *sym_get_choice_prop(struct symbol *sym)
+{
+	struct property *prop;
+
+	for_all_choices(sym, prop)
+		return prop;
+	return NULL;
+}
+
+struct property *sym_get_env_prop(struct symbol *sym)
+{
+	struct property *prop;
+
+	for_all_properties(sym, prop, P_ENV)
+		return prop;
+	return NULL;
+}
+
+struct property *sym_get_default_prop(struct symbol *sym)
+{
+	struct property *prop;
+
+	for_all_defaults(sym, prop) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		if (prop->visible.tri != no)
+			return prop;
+	}
+	return NULL;
+}
+
+static struct property *sym_get_range_prop(struct symbol *sym)
+{
+	struct property *prop;
+
+	for_all_properties(sym, prop, P_RANGE) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		if (prop->visible.tri != no)
+			return prop;
+	}
+	return NULL;
+}
+
+static int sym_get_range_val(struct symbol *sym, int base)
+{
+	sym_calc_value(sym);
+	switch (sym->type) {
+	case S_INT:
+		base = 10;
+		break;
+	case S_HEX:
+		base = 16;
+		break;
+	default:
+		break;
+	}
+	return strtol(sym->curr.val, NULL, base);
+}
+
+static void sym_validate_range(struct symbol *sym)
+{
+	struct property *prop;
+	int base, val, val2;
+	char str[64];
+
+	switch (sym->type) {
+	case S_INT:
+		base = 10;
+		break;
+	case S_HEX:
+		base = 16;
+		break;
+	default:
+		return;
+	}
+	prop = sym_get_range_prop(sym);
+	if (!prop)
+		return;
+	val = strtol(sym->curr.val, NULL, base);
+	val2 = sym_get_range_val(prop->expr->left.sym, base);
+	if (val >= val2) {
+		val2 = sym_get_range_val(prop->expr->right.sym, base);
+		if (val <= val2)
+			return;
+	}
+	if (sym->type == S_INT)
+		sprintf(str, "%d", val2);
+	else
+		sprintf(str, "0x%x", val2);
+	sym->curr.val = strdup(str);
+}
+
+static void sym_calc_visibility(struct symbol *sym)
+{
+	struct property *prop;
+	tristate tri;
+
+	/* any prompt visible? */
+	tri = no;
+	for_all_prompts(sym, prop) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		tri = EXPR_OR(tri, prop->visible.tri);
+	}
+	if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))
+		tri = yes;
+	if (sym->visible != tri) {
+		sym->visible = tri;
+		sym_set_changed(sym);
+	}
+	if (sym_is_choice_value(sym))
+		return;
+	/* defaulting to "yes" if no explicit "depends on" are given */
+	tri = yes;
+	if (sym->dir_dep.expr)
+		tri = expr_calc_value(sym->dir_dep.expr);
+	if (tri == mod)
+		tri = yes;
+	if (sym->dir_dep.tri != tri) {
+		sym->dir_dep.tri = tri;
+		sym_set_changed(sym);
+	}
+	tri = no;
+	if (sym->rev_dep.expr)
+		tri = expr_calc_value(sym->rev_dep.expr);
+	if (tri == mod && sym_get_type(sym) == S_BOOLEAN)
+		tri = yes;
+	if (sym->rev_dep.tri != tri) {
+		sym->rev_dep.tri = tri;
+		sym_set_changed(sym);
+	}
+}
+
+/*
+ * Find the default symbol for a choice.
+ * First try the default values for the choice symbol
+ * Next locate the first visible choice value
+ * Return NULL if none was found
+ */
+struct symbol *sym_choice_default(struct symbol *sym)
+{
+	struct symbol *def_sym;
+	struct property *prop;
+	struct expr *e;
+
+	/* any of the defaults visible? */
+	for_all_defaults(sym, prop) {
+		prop->visible.tri = expr_calc_value(prop->visible.expr);
+		if (prop->visible.tri == no)
+			continue;
+		def_sym = prop_get_symbol(prop);
+		if (def_sym->visible != no)
+			return def_sym;
+	}
+
+	/* just get the first visible value */
+	prop = sym_get_choice_prop(sym);
+	expr_list_for_each_sym(prop->expr, e, def_sym)
+		if (def_sym->visible != no)
+			return def_sym;
+
+	/* failed to locate any defaults */
+	return NULL;
+}
+
+static struct symbol *sym_calc_choice(struct symbol *sym)
+{
+	struct symbol *def_sym;
+	struct property *prop;
+	struct expr *e;
+	int flags;
+
+	/* first calculate all choice values' visibilities */
+	flags = sym->flags;
+	prop = sym_get_choice_prop(sym);
+	expr_list_for_each_sym(prop->expr, e, def_sym) {
+		sym_calc_visibility(def_sym);
+		if (def_sym->visible != no)
+			flags &= def_sym->flags;
+	}
+
+	sym->flags &= flags | ~SYMBOL_DEF_USER;
+
+	/* is the user choice visible? */
+	def_sym = sym->def[S_DEF_USER].val;
+	if (def_sym && def_sym->visible != no)
+		return def_sym;
+
+	def_sym = sym_choice_default(sym);
+
+	if (def_sym == NULL)
+		/* no choice? reset tristate value */
+		sym->curr.tri = no;
+
+	return def_sym;
+}
+
+void sym_calc_value(struct symbol *sym)
+{
+	struct symbol_value newval, oldval;
+	struct property *prop;
+	struct expr *e;
+
+	if (!sym)
+		return;
+
+	if (sym->flags & SYMBOL_VALID)
+		return;
+	sym->flags |= SYMBOL_VALID;
+
+	oldval = sym->curr;
+
+	switch (sym->type) {
+	case S_INT:
+	case S_HEX:
+	case S_STRING:
+		newval = symbol_empty.curr;
+		break;
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		newval = symbol_no.curr;
+		break;
+	default:
+		sym->curr.val = sym->name;
+		sym->curr.tri = no;
+		return;
+	}
+	if (!sym_is_choice_value(sym))
+		sym->flags &= ~SYMBOL_WRITE;
+
+	sym_calc_visibility(sym);
+
+	/* set default if recursively called */
+	sym->curr = newval;
+
+	switch (sym_get_type(sym)) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		if (sym_is_choice_value(sym) && sym->visible == yes) {
+			prop = sym_get_choice_prop(sym);
+			newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no;
+		} else {
+			if (sym->visible != no) {
+				/* if the symbol is visible use the user value
+				 * if available, otherwise try the default value
+				 */
+				sym->flags |= SYMBOL_WRITE;
+				if (sym_has_value(sym)) {
+					newval.tri = EXPR_AND(sym->def[S_DEF_USER].tri,
+							      sym->visible);
+					goto calc_newval;
+				}
+			}
+			if (sym->rev_dep.tri != no)
+				sym->flags |= SYMBOL_WRITE;
+			if (!sym_is_choice(sym)) {
+				prop = sym_get_default_prop(sym);
+				if (prop) {
+					sym->flags |= SYMBOL_WRITE;
+					newval.tri = EXPR_AND(expr_calc_value(prop->expr),
+							      prop->visible.tri);
+				}
+			}
+		calc_newval:
+			if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
+				struct expr *e;
+				e = expr_simplify_unmet_dep(sym->rev_dep.expr,
+				    sym->dir_dep.expr);
+				fprintf(stderr, "warning: (");
+				expr_fprint(e, stderr);
+				fprintf(stderr, ") selects %s which has unmet direct dependencies (",
+					sym->name);
+				expr_fprint(sym->dir_dep.expr, stderr);
+				fprintf(stderr, ")\n");
+				expr_free(e);
+			}
+			newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
+		}
+		if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
+			newval.tri = yes;
+		break;
+	case S_STRING:
+	case S_HEX:
+	case S_INT:
+		if (sym->visible != no) {
+			sym->flags |= SYMBOL_WRITE;
+			if (sym_has_value(sym)) {
+				newval.val = sym->def[S_DEF_USER].val;
+				break;
+			}
+		}
+		prop = sym_get_default_prop(sym);
+		if (prop) {
+			struct symbol *ds = prop_get_symbol(prop);
+			if (ds) {
+				sym->flags |= SYMBOL_WRITE;
+				sym_calc_value(ds);
+				newval.val = ds->curr.val;
+			}
+		}
+		break;
+	default:
+		;
+	}
+
+	sym->curr = newval;
+	if (sym_is_choice(sym) && newval.tri == yes)
+		sym->curr.val = sym_calc_choice(sym);
+	sym_validate_range(sym);
+
+	if (memcmp(&oldval, &sym->curr, sizeof(oldval))) {
+		sym_set_changed(sym);
+		if (modules_sym == sym) {
+			sym_set_all_changed();
+			modules_val = modules_sym->curr.tri;
+		}
+	}
+
+	if (sym_is_choice(sym)) {
+		struct symbol *choice_sym;
+
+		prop = sym_get_choice_prop(sym);
+		expr_list_for_each_sym(prop->expr, e, choice_sym) {
+			if ((sym->flags & SYMBOL_WRITE) &&
+			    choice_sym->visible != no)
+				choice_sym->flags |= SYMBOL_WRITE;
+			if (sym->flags & SYMBOL_CHANGED)
+				sym_set_changed(choice_sym);
+		}
+	}
+
+	if (sym->flags & SYMBOL_AUTO)
+		sym->flags &= ~SYMBOL_WRITE;
+}
+
+void sym_clear_all_valid(void)
+{
+	struct symbol *sym;
+	int i;
+
+	for_all_symbols(i, sym)
+		sym->flags &= ~SYMBOL_VALID;
+	sym_add_change_count(1);
+	if (modules_sym)
+		sym_calc_value(modules_sym);
+}
+
+void sym_set_changed(struct symbol *sym)
+{
+	struct property *prop;
+
+	sym->flags |= SYMBOL_CHANGED;
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu)
+			prop->menu->flags |= MENU_CHANGED;
+	}
+}
+
+void sym_set_all_changed(void)
+{
+	struct symbol *sym;
+	int i;
+
+	for_all_symbols(i, sym)
+		sym_set_changed(sym);
+}
+
+bool sym_tristate_within_range(struct symbol *sym, tristate val)
+{
+	int type = sym_get_type(sym);
+
+	if (sym->visible == no)
+		return false;
+
+	if (type != S_BOOLEAN && type != S_TRISTATE)
+		return false;
+
+	if (type == S_BOOLEAN && val == mod)
+		return false;
+	if (sym->visible <= sym->rev_dep.tri)
+		return false;
+	if (sym_is_choice_value(sym) && sym->visible == yes)
+		return val == yes;
+	return val >= sym->rev_dep.tri && val <= sym->visible;
+}
+
+bool sym_set_tristate_value(struct symbol *sym, tristate val)
+{
+	tristate oldval = sym_get_tristate_value(sym);
+
+	if (oldval != val && !sym_tristate_within_range(sym, val))
+		return false;
+
+	if (!(sym->flags & SYMBOL_DEF_USER)) {
+		sym->flags |= SYMBOL_DEF_USER;
+		sym_set_changed(sym);
+	}
+	/*
+	 * setting a choice value also resets the new flag of the choice
+	 * symbol and all other choice values.
+	 */
+	if (sym_is_choice_value(sym) && val == yes) {
+		struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+		struct property *prop;
+		struct expr *e;
+
+		cs->def[S_DEF_USER].val = sym;
+		cs->flags |= SYMBOL_DEF_USER;
+		prop = sym_get_choice_prop(cs);
+		for (e = prop->expr; e; e = e->left.expr) {
+			if (e->right.sym->visible != no)
+				e->right.sym->flags |= SYMBOL_DEF_USER;
+		}
+	}
+
+	sym->def[S_DEF_USER].tri = val;
+	if (oldval != val)
+		sym_clear_all_valid();
+
+	return true;
+}
+
+tristate sym_toggle_tristate_value(struct symbol *sym)
+{
+	tristate oldval, newval;
+
+	oldval = newval = sym_get_tristate_value(sym);
+	do {
+		switch (newval) {
+		case no:
+			newval = mod;
+			break;
+		case mod:
+			newval = yes;
+			break;
+		case yes:
+			newval = no;
+			break;
+		}
+		if (sym_set_tristate_value(sym, newval))
+			break;
+	} while (oldval != newval);
+	return newval;
+}
+
+bool sym_string_valid(struct symbol *sym, const char *str)
+{
+	signed char ch;
+
+	switch (sym->type) {
+	case S_STRING:
+		return true;
+	case S_INT:
+		ch = *str++;
+		if (ch == '-')
+			ch = *str++;
+		if (!isdigit(ch))
+			return false;
+		if (ch == '0' && *str != 0)
+			return false;
+		while ((ch = *str++)) {
+			if (!isdigit(ch))
+				return false;
+		}
+		return true;
+	case S_HEX:
+		if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
+			str += 2;
+		ch = *str++;
+		do {
+			if (!isxdigit(ch))
+				return false;
+		} while ((ch = *str++));
+		return true;
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		switch (str[0]) {
+		case 'y': case 'Y':
+		case 'm': case 'M':
+		case 'n': case 'N':
+			return true;
+		}
+		return false;
+	default:
+		return false;
+	}
+}
+
+bool sym_string_within_range(struct symbol *sym, const char *str)
+{
+	struct property *prop;
+	int val;
+
+	switch (sym->type) {
+	case S_STRING:
+		return sym_string_valid(sym, str);
+	case S_INT:
+		if (!sym_string_valid(sym, str))
+			return false;
+		prop = sym_get_range_prop(sym);
+		if (!prop)
+			return true;
+		val = strtol(str, NULL, 10);
+		return val >= sym_get_range_val(prop->expr->left.sym, 10) &&
+		       val <= sym_get_range_val(prop->expr->right.sym, 10);
+	case S_HEX:
+		if (!sym_string_valid(sym, str))
+			return false;
+		prop = sym_get_range_prop(sym);
+		if (!prop)
+			return true;
+		val = strtol(str, NULL, 16);
+		return val >= sym_get_range_val(prop->expr->left.sym, 16) &&
+		       val <= sym_get_range_val(prop->expr->right.sym, 16);
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		switch (str[0]) {
+		case 'y': case 'Y':
+			return sym_tristate_within_range(sym, yes);
+		case 'm': case 'M':
+			return sym_tristate_within_range(sym, mod);
+		case 'n': case 'N':
+			return sym_tristate_within_range(sym, no);
+		}
+		return false;
+	default:
+		return false;
+	}
+}
+
+bool sym_set_string_value(struct symbol *sym, const char *newval)
+{
+	const char *oldval;
+	char *val;
+	int size;
+
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		switch (newval[0]) {
+		case 'y': case 'Y':
+			return sym_set_tristate_value(sym, yes);
+		case 'm': case 'M':
+			return sym_set_tristate_value(sym, mod);
+		case 'n': case 'N':
+			return sym_set_tristate_value(sym, no);
+		}
+		return false;
+	default:
+		;
+	}
+
+	if (!sym_string_within_range(sym, newval))
+		return false;
+
+	if (!(sym->flags & SYMBOL_DEF_USER)) {
+		sym->flags |= SYMBOL_DEF_USER;
+		sym_set_changed(sym);
+	}
+
+	oldval = sym->def[S_DEF_USER].val;
+	size = strlen(newval) + 1;
+	if (sym->type == S_HEX && (newval[0] != '0' || (newval[1] != 'x' && newval[1] != 'X'))) {
+		size += 2;
+		sym->def[S_DEF_USER].val = val = xmalloc(size);
+		*val++ = '0';
+		*val++ = 'x';
+	} else if (!oldval || strcmp(oldval, newval))
+		sym->def[S_DEF_USER].val = val = xmalloc(size);
+	else
+		return true;
+
+	strcpy(val, newval);
+	free((void *)oldval);
+	sym_clear_all_valid();
+
+	return true;
+}
+
+/*
+ * Find the default value associated to a symbol.
+ * For tristate symbol handle the modules=n case
+ * in which case "m" becomes "y".
+ * If the symbol does not have any default then fallback
+ * to the fixed default values.
+ */
+const char *sym_get_string_default(struct symbol *sym)
+{
+	struct property *prop;
+	struct symbol *ds;
+	const char *str;
+	tristate val;
+
+	sym_calc_visibility(sym);
+	sym_calc_value(modules_sym);
+	val = symbol_no.curr.tri;
+	str = symbol_empty.curr.val;
+
+	/* If symbol has a default value look it up */
+	prop = sym_get_default_prop(sym);
+	if (prop != NULL) {
+		switch (sym->type) {
+		case S_BOOLEAN:
+		case S_TRISTATE:
+			/* The visibility may limit the value from yes => mod */
+			val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri);
+			break;
+		default:
+			/*
+			 * The following fails to handle the situation
+			 * where a default value is further limited by
+			 * the valid range.
+			 */
+			ds = prop_get_symbol(prop);
+			if (ds != NULL) {
+				sym_calc_value(ds);
+				str = (const char *)ds->curr.val;
+			}
+		}
+	}
+
+	/* Handle select statements */
+	val = EXPR_OR(val, sym->rev_dep.tri);
+
+	/* transpose mod to yes if modules are not enabled */
+	if (val == mod)
+		if (!sym_is_choice_value(sym) && modules_sym->curr.tri == no)
+			val = yes;
+
+	/* transpose mod to yes if type is bool */
+	if (sym->type == S_BOOLEAN && val == mod)
+		val = yes;
+
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		switch (val) {
+		case no: return "n";
+		case mod: return "m";
+		case yes: return "y";
+		}
+	case S_INT:
+	case S_HEX:
+		return str;
+	case S_STRING:
+		return str;
+	case S_OTHER:
+	case S_UNKNOWN:
+		break;
+	}
+	return "";
+}
+
+const char *sym_get_string_value(struct symbol *sym)
+{
+	tristate val;
+
+	switch (sym->type) {
+	case S_BOOLEAN:
+	case S_TRISTATE:
+		val = sym_get_tristate_value(sym);
+		switch (val) {
+		case no:
+			return "n";
+		case mod:
+			sym_calc_value(modules_sym);
+			return (modules_sym->curr.tri == no) ? "n" : "m";
+		case yes:
+			return "y";
+		}
+		break;
+	default:
+		;
+	}
+	return (const char *)sym->curr.val;
+}
+
+bool sym_is_changable(struct symbol *sym)
+{
+	return sym->visible > sym->rev_dep.tri;
+}
+
+static unsigned strhash(const char *s)
+{
+	/* fnv32 hash */
+	unsigned hash = 2166136261U;
+	for (; *s; s++)
+		hash = (hash ^ *s) * 0x01000193;
+	return hash;
+}
+
+struct symbol *sym_lookup(const char *name, int flags)
+{
+	struct symbol *symbol;
+	char *new_name;
+	int hash;
+
+	if (name) {
+		if (name[0] && !name[1]) {
+			switch (name[0]) {
+			case 'y': return &symbol_yes;
+			case 'm': return &symbol_mod;
+			case 'n': return &symbol_no;
+			}
+		}
+		hash = strhash(name) % SYMBOL_HASHSIZE;
+
+		for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
+			if (symbol->name &&
+			    !strcmp(symbol->name, name) &&
+			    (flags ? symbol->flags & flags
+				   : !(symbol->flags & (SYMBOL_CONST|SYMBOL_CHOICE))))
+				return symbol;
+		}
+		new_name = strdup(name);
+	} else {
+		new_name = NULL;
+		hash = 0;
+	}
+
+	symbol = xmalloc(sizeof(*symbol));
+	memset(symbol, 0, sizeof(*symbol));
+	symbol->name = new_name;
+	symbol->type = S_UNKNOWN;
+	symbol->flags |= flags;
+
+	symbol->next = symbol_hash[hash];
+	symbol_hash[hash] = symbol;
+
+	return symbol;
+}
+
+struct symbol *sym_find(const char *name)
+{
+	struct symbol *symbol = NULL;
+	int hash = 0;
+
+	if (!name)
+		return NULL;
+
+	if (name[0] && !name[1]) {
+		switch (name[0]) {
+		case 'y': return &symbol_yes;
+		case 'm': return &symbol_mod;
+		case 'n': return &symbol_no;
+		}
+	}
+	hash = strhash(name) % SYMBOL_HASHSIZE;
+
+	for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
+		if (symbol->name &&
+		    !strcmp(symbol->name, name) &&
+		    !(symbol->flags & SYMBOL_CONST))
+				break;
+	}
+
+	return symbol;
+}
+
+/*
+ * Expand symbol's names embedded in the string given in argument. Symbols'
+ * name to be expanded shall be prefixed by a '$'. Unknown symbol expands to
+ * the empty string.
+ */
+const char *sym_expand_string_value(const char *in)
+{
+	const char *src;
+	char *res;
+	size_t reslen;
+
+	reslen = strlen(in) + 1;
+	res = xmalloc(reslen);
+	res[0] = '\0';
+
+	while ((src = strchr(in, '$'))) {
+		char *p, name[SYMBOL_MAXLENGTH];
+		const char *symval = "";
+		struct symbol *sym;
+		size_t newlen;
+
+		strncat(res, in, src - in);
+		src++;
+
+		p = name;
+		while (isalnum(*src) || *src == '_')
+			*p++ = *src++;
+		*p = '\0';
+
+		sym = sym_find(name);
+		if (sym != NULL) {
+			sym_calc_value(sym);
+			symval = sym_get_string_value(sym);
+		}
+
+		newlen = strlen(res) + strlen(symval) + strlen(src) + 1;
+		if (newlen > reslen) {
+			reslen = newlen;
+			res = realloc(res, reslen);
+		}
+
+		strcat(res, symval);
+		in = src;
+	}
+	strcat(res, in);
+
+	return res;
+}
+
+const char *sym_escape_string_value(const char *in)
+{
+	const char *p;
+	size_t reslen;
+	char *res;
+	size_t l;
+
+	reslen = strlen(in) + strlen("\"\"") + 1;
+
+	p = in;
+	for (;;) {
+		l = strcspn(p, "\"\\");
+		p += l;
+
+		if (p[0] == '\0')
+			break;
+
+		reslen++;
+		p++;
+	}
+
+	res = xmalloc(reslen);
+	res[0] = '\0';
+
+	strcat(res, "\"");
+
+	p = in;
+	for (;;) {
+		l = strcspn(p, "\"\\");
+		strncat(res, p, l);
+		p += l;
+
+		if (p[0] == '\0')
+			break;
+
+		strcat(res, "\\");
+		strncat(res, p++, 1);
+	}
+
+	strcat(res, "\"");
+	return res;
+}
+
+struct symbol **sym_re_search(const char *pattern)
+{
+	struct symbol *sym, **sym_arr = NULL;
+	int i, cnt, size;
+	regex_t re;
+
+	cnt = size = 0;
+	/* Skip if empty */
+	if (strlen(pattern) == 0)
+		return NULL;
+	if (regcomp(&re, pattern, REG_EXTENDED|REG_NOSUB|REG_ICASE))
+		return NULL;
+
+	for_all_symbols(i, sym) {
+		if (sym->flags & SYMBOL_CONST || !sym->name)
+			continue;
+		if (regexec(&re, sym->name, 0, NULL, 0))
+			continue;
+		if (cnt + 1 >= size) {
+			void *tmp = sym_arr;
+			size += 16;
+			sym_arr = realloc(sym_arr, size * sizeof(struct symbol *));
+			if (!sym_arr) {
+				free(tmp);
+				return NULL;
+			}
+		}
+		sym_calc_value(sym);
+		sym_arr[cnt++] = sym;
+	}
+	if (sym_arr)
+		sym_arr[cnt] = NULL;
+	regfree(&re);
+
+	return sym_arr;
+}
+
+/*
+ * When we check for recursive dependencies we use a stack to save
+ * current state so we can print out relevant info to user.
+ * The entries are located on the call stack so no need to free memory.
+ * Note inser() remove() must always match to properly clear the stack.
+ */
+static struct dep_stack {
+	struct dep_stack *prev, *next;
+	struct symbol *sym;
+	struct property *prop;
+	struct expr *expr;
+} *check_top;
+
+static void dep_stack_insert(struct dep_stack *stack, struct symbol *sym)
+{
+	memset(stack, 0, sizeof(*stack));
+	if (check_top)
+		check_top->next = stack;
+	stack->prev = check_top;
+	stack->sym = sym;
+	check_top = stack;
+}
+
+static void dep_stack_remove(void)
+{
+	check_top = check_top->prev;
+	if (check_top)
+		check_top->next = NULL;
+}
+
+/*
+ * Called when we have detected a recursive dependency.
+ * check_top point to the top of the stact so we use
+ * the ->prev pointer to locate the bottom of the stack.
+ */
+static void sym_check_print_recursive(struct symbol *last_sym)
+{
+	struct dep_stack *stack;
+	struct symbol *sym, *next_sym;
+	struct menu *menu = NULL;
+	struct property *prop;
+	struct dep_stack cv_stack;
+
+	if (sym_is_choice_value(last_sym)) {
+		dep_stack_insert(&cv_stack, last_sym);
+		last_sym = prop_get_symbol(sym_get_choice_prop(last_sym));
+	}
+
+	for (stack = check_top; stack != NULL; stack = stack->prev)
+		if (stack->sym == last_sym)
+			break;
+	if (!stack) {
+		fprintf(stderr, "unexpected recursive dependency error\n");
+		return;
+	}
+
+	for (; stack; stack = stack->next) {
+		sym = stack->sym;
+		next_sym = stack->next ? stack->next->sym : last_sym;
+		prop = stack->prop;
+		if (prop == NULL)
+			prop = stack->sym->prop;
+
+		/* for choice values find the menu entry (used below) */
+		if (sym_is_choice(sym) || sym_is_choice_value(sym)) {
+			for (prop = sym->prop; prop; prop = prop->next) {
+				menu = prop->menu;
+				if (prop->menu)
+					break;
+			}
+		}
+		if (stack->sym == last_sym)
+			fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
+				prop->file->name, prop->lineno);
+		if (stack->expr) {
+			fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
+				prop->file->name, prop->lineno,
+				sym->name ? sym->name : "<choice>",
+				prop_get_type_name(prop->type),
+				next_sym->name ? next_sym->name : "<choice>");
+		} else if (stack->prop) {
+			fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n",
+				prop->file->name, prop->lineno,
+				sym->name ? sym->name : "<choice>",
+				next_sym->name ? next_sym->name : "<choice>");
+		} else if (sym_is_choice(sym)) {
+			fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
+				menu->file->name, menu->lineno,
+				sym->name ? sym->name : "<choice>",
+				next_sym->name ? next_sym->name : "<choice>");
+		} else if (sym_is_choice_value(sym)) {
+			fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
+				menu->file->name, menu->lineno,
+				sym->name ? sym->name : "<choice>",
+				next_sym->name ? next_sym->name : "<choice>");
+		} else {
+			fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
+				prop->file->name, prop->lineno,
+				sym->name ? sym->name : "<choice>",
+				next_sym->name ? next_sym->name : "<choice>");
+		}
+	}
+
+	if (check_top == &cv_stack)
+		dep_stack_remove();
+}
+
+static struct symbol *sym_check_expr_deps(struct expr *e)
+{
+	struct symbol *sym;
+
+	if (!e)
+		return NULL;
+	switch (e->type) {
+	case E_OR:
+	case E_AND:
+		sym = sym_check_expr_deps(e->left.expr);
+		if (sym)
+			return sym;
+		return sym_check_expr_deps(e->right.expr);
+	case E_NOT:
+		return sym_check_expr_deps(e->left.expr);
+	case E_EQUAL:
+	case E_UNEQUAL:
+		sym = sym_check_deps(e->left.sym);
+		if (sym)
+			return sym;
+		return sym_check_deps(e->right.sym);
+	case E_SYMBOL:
+		return sym_check_deps(e->left.sym);
+	default:
+		break;
+	}
+	printf("Oops! How to check %d?\n", e->type);
+	return NULL;
+}
+
+/* return NULL when dependencies are OK */
+static struct symbol *sym_check_sym_deps(struct symbol *sym)
+{
+	struct symbol *sym2;
+	struct property *prop;
+	struct dep_stack stack;
+
+	dep_stack_insert(&stack, sym);
+
+	sym2 = sym_check_expr_deps(sym->rev_dep.expr);
+	if (sym2)
+		goto out;
+
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->type == P_CHOICE || prop->type == P_SELECT)
+			continue;
+		stack.prop = prop;
+		sym2 = sym_check_expr_deps(prop->visible.expr);
+		if (sym2)
+			break;
+		if (prop->type != P_DEFAULT || sym_is_choice(sym))
+			continue;
+		stack.expr = prop->expr;
+		sym2 = sym_check_expr_deps(prop->expr);
+		if (sym2)
+			break;
+		stack.expr = NULL;
+	}
+
+out:
+	dep_stack_remove();
+
+	return sym2;
+}
+
+static struct symbol *sym_check_choice_deps(struct symbol *choice)
+{
+	struct symbol *sym, *sym2;
+	struct property *prop;
+	struct expr *e;
+	struct dep_stack stack;
+
+	dep_stack_insert(&stack, choice);
+
+	prop = sym_get_choice_prop(choice);
+	expr_list_for_each_sym(prop->expr, e, sym)
+		sym->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED);
+
+	choice->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED);
+	sym2 = sym_check_sym_deps(choice);
+	choice->flags &= ~SYMBOL_CHECK;
+	if (sym2)
+		goto out;
+
+	expr_list_for_each_sym(prop->expr, e, sym) {
+		sym2 = sym_check_sym_deps(sym);
+		if (sym2)
+			break;
+	}
+out:
+	expr_list_for_each_sym(prop->expr, e, sym)
+		sym->flags &= ~SYMBOL_CHECK;
+
+	if (sym2 && sym_is_choice_value(sym2) &&
+	    prop_get_symbol(sym_get_choice_prop(sym2)) == choice)
+		sym2 = choice;
+
+	dep_stack_remove();
+
+	return sym2;
+}
+
+struct symbol *sym_check_deps(struct symbol *sym)
+{
+	struct symbol *sym2;
+	struct property *prop;
+
+	if (sym->flags & SYMBOL_CHECK) {
+		sym_check_print_recursive(sym);
+		return sym;
+	}
+	if (sym->flags & SYMBOL_CHECKED)
+		return NULL;
+
+	if (sym_is_choice_value(sym)) {
+		struct dep_stack stack;
+
+		/* for choice groups start the check with main choice symbol */
+		dep_stack_insert(&stack, sym);
+		prop = sym_get_choice_prop(sym);
+		sym2 = sym_check_deps(prop_get_symbol(prop));
+		dep_stack_remove();
+	} else if (sym_is_choice(sym)) {
+		sym2 = sym_check_choice_deps(sym);
+	} else {
+		sym->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED);
+		sym2 = sym_check_sym_deps(sym);
+		sym->flags &= ~SYMBOL_CHECK;
+	}
+
+	if (sym2 && sym2 == sym)
+		sym2 = NULL;
+
+	return sym2;
+}
+
+struct property *prop_alloc(enum prop_type type, struct symbol *sym)
+{
+	struct property *prop;
+	struct property **propp;
+
+	prop = xmalloc(sizeof(*prop));
+	memset(prop, 0, sizeof(*prop));
+	prop->type = type;
+	prop->sym = sym;
+	prop->file = current_file;
+	prop->lineno = zconf_lineno();
+
+	/* append property to the prop list of symbol */
+	if (sym) {
+		for (propp = &sym->prop; *propp; propp = &(*propp)->next)
+			;
+		*propp = prop;
+	}
+
+	return prop;
+}
+
+struct symbol *prop_get_symbol(struct property *prop)
+{
+	if (prop->expr && (prop->expr->type == E_SYMBOL ||
+			   prop->expr->type == E_LIST))
+		return prop->expr->left.sym;
+	return NULL;
+}
+
+const char *prop_get_type_name(enum prop_type type)
+{
+	switch (type) {
+	case P_PROMPT:
+		return "prompt";
+	case P_ENV:
+		return "env";
+	case P_COMMENT:
+		return "comment";
+	case P_MENU:
+		return "menu";
+	case P_DEFAULT:
+		return "default";
+	case P_CHOICE:
+		return "choice";
+	case P_SELECT:
+		return "select";
+	case P_RANGE:
+		return "range";
+	case P_SYMBOL:
+		return "symbol";
+	case P_UNKNOWN:
+		break;
+	}
+	return "unknown";
+}
+
+static void prop_add_env(const char *env)
+{
+	struct symbol *sym, *sym2;
+	struct property *prop;
+	char *p;
+
+	sym = current_entry->sym;
+	sym->flags |= SYMBOL_AUTO;
+	for_all_properties(sym, prop, P_ENV) {
+		sym2 = prop_get_symbol(prop);
+		if (strcmp(sym2->name, env))
+			menu_warn(current_entry, "redefining environment symbol from %s",
+				  sym2->name);
+		return;
+	}
+
+	prop = prop_alloc(P_ENV, sym);
+	prop->expr = expr_alloc_symbol(sym_lookup(env, SYMBOL_CONST));
+
+	sym_env_list = expr_alloc_one(E_LIST, sym_env_list);
+	sym_env_list->right.sym = sym;
+
+	p = getenv(env);
+	if (p)
+		sym_add_default(sym, p);
+	else
+		menu_warn(current_entry, "environment variable %s undefined", env);
+}
diff --git a/trunk/scripts/config/util.c b/trunk/scripts/config/util.c
new file mode 100644
index 00000000..6e7fbf19
--- /dev/null
+++ b/trunk/scripts/config/util.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org>
+ * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>
+ *
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include "lkc.h"
+
+/* file already present in list? If not add it */
+struct file *file_lookup(const char *name)
+{
+	struct file *file;
+	const char *file_name = sym_expand_string_value(name);
+
+	for (file = file_list; file; file = file->next) {
+		if (!strcmp(name, file->name)) {
+			free((void *)file_name);
+			return file;
+		}
+	}
+
+	file = xmalloc(sizeof(*file));
+	memset(file, 0, sizeof(*file));
+	file->name = file_name;
+	file->next = file_list;
+	file_list = file;
+	return file;
+}
+
+/* write a dependency file as used by kbuild to track dependencies */
+int file_write_dep(const char *name)
+{
+	struct symbol *sym, *env_sym;
+	struct expr *e;
+	struct file *file;
+	FILE *out;
+
+	if (!name)
+		name = ".kconfig.d";
+	out = fopen("..config.tmp", "w");
+	if (!out)
+		return 1;
+	fprintf(out, "deps_config := \\\n");
+	for (file = file_list; file; file = file->next) {
+		if (file->next)
+			fprintf(out, "\t%s \\\n", file->name);
+		else
+			fprintf(out, "\t%s\n", file->name);
+	}
+	fprintf(out, "\n%s: \\\n"
+		     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
+
+	expr_list_for_each_sym(sym_env_list, e, sym) {
+		struct property *prop;
+		const char *value;
+
+		prop = sym_get_env_prop(sym);
+		env_sym = prop_get_symbol(prop);
+		if (!env_sym)
+			continue;
+		value = getenv(env_sym->name);
+		if (!value)
+			value = "";
+		fprintf(out, "ifneq \"$(%s)\" \"%s\"\n", env_sym->name, value);
+		fprintf(out, "%s: FORCE\n", conf_get_autoconfig_name());
+		fprintf(out, "endif\n");
+	}
+
+	fprintf(out, "\n$(deps_config): ;\n");
+	fclose(out);
+	rename("..config.tmp", name);
+	return 0;
+}
+
+
+/* Allocate initial growable string */
+struct gstr str_new(void)
+{
+	struct gstr gs;
+	gs.s = xmalloc(sizeof(char) * 64);
+	gs.len = 64;
+	gs.max_width = 0;
+	strcpy(gs.s, "\0");
+	return gs;
+}
+
+/* Allocate and assign growable string */
+struct gstr str_assign(const char *s)
+{
+	struct gstr gs;
+	gs.s = strdup(s);
+	gs.len = strlen(s) + 1;
+	gs.max_width = 0;
+	return gs;
+}
+
+/* Free storage for growable string */
+void str_free(struct gstr *gs)
+{
+	if (gs->s)
+		free(gs->s);
+	gs->s = NULL;
+	gs->len = 0;
+}
+
+/* Append to growable string */
+void str_append(struct gstr *gs, const char *s)
+{
+	size_t l;
+	if (s) {
+		l = strlen(gs->s) + strlen(s) + 1;
+		if (l > gs->len) {
+			gs->s   = realloc(gs->s, l);
+			gs->len = l;
+		}
+		strcat(gs->s, s);
+	}
+}
+
+/* Append printf formatted string to growable string */
+void str_printf(struct gstr *gs, const char *fmt, ...)
+{
+	va_list ap;
+	char s[10000]; /* big enough... */
+	va_start(ap, fmt);
+	vsnprintf(s, sizeof(s), fmt, ap);
+	str_append(gs, s);
+	va_end(ap);
+}
+
+/* Retrieve value of growable string */
+const char *str_get(struct gstr *gs)
+{
+	return gs->s;
+}
+
+void *xmalloc(size_t size)
+{
+	void *p = malloc(size);
+	if (p)
+		return p;
+	fprintf(stderr, "Out of memory.\n");
+	exit(1);
+}
+
+void *xcalloc(size_t nmemb, size_t size)
+{
+	void *p = calloc(nmemb, size);
+	if (p)
+		return p;
+	fprintf(stderr, "Out of memory.\n");
+	exit(1);
+}
+
+
diff --git a/trunk/scripts/config/zconf.gperf b/trunk/scripts/config/zconf.gperf
new file mode 100644
index 00000000..22b6d6f8
--- /dev/null
+++ b/trunk/scripts/config/zconf.gperf
@@ -0,0 +1,47 @@
+%language=ANSI-C
+%define hash-function-name kconf_id_hash
+%define lookup-function-name kconf_id_lookup
+%define string-pool-name kconf_id_strings
+%compare-strncmp
+%enum
+%pic
+%struct-type
+
+struct kconf_id;
+
+
+%%
+mainmenu,	T_MAINMENU,	TF_COMMAND
+menu,		T_MENU,		TF_COMMAND
+endmenu,	T_ENDMENU,	TF_COMMAND
+source,		T_SOURCE,	TF_COMMAND
+choice,		T_CHOICE,	TF_COMMAND
+endchoice,	T_ENDCHOICE,	TF_COMMAND
+comment,	T_COMMENT,	TF_COMMAND
+config,		T_CONFIG,	TF_COMMAND
+menuconfig,	T_MENUCONFIG,	TF_COMMAND
+help,		T_HELP,		TF_COMMAND
+if,		T_IF,		TF_COMMAND|TF_PARAM
+endif,		T_ENDIF,	TF_COMMAND
+depends,	T_DEPENDS,	TF_COMMAND
+optional,	T_OPTIONAL,	TF_COMMAND
+default,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN
+prompt,		T_PROMPT,	TF_COMMAND
+tristate,	T_TYPE,		TF_COMMAND, S_TRISTATE
+def_tristate,	T_DEFAULT,	TF_COMMAND, S_TRISTATE
+bool,		T_TYPE,		TF_COMMAND, S_BOOLEAN
+boolean,	T_TYPE,		TF_COMMAND, S_BOOLEAN
+def_bool,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN
+int,		T_TYPE,		TF_COMMAND, S_INT
+hex,		T_TYPE,		TF_COMMAND, S_HEX
+string,		T_TYPE,		TF_COMMAND, S_STRING
+select,		T_SELECT,	TF_COMMAND
+range,		T_RANGE,	TF_COMMAND
+visible,	T_VISIBLE,	TF_COMMAND
+option,		T_OPTION,	TF_COMMAND
+on,		T_ON,		TF_PARAM
+modules,	T_OPT_MODULES,	TF_OPTION
+defconfig_list,	T_OPT_DEFCONFIG_LIST,TF_OPTION
+env,		T_OPT_ENV,	TF_OPTION
+reset,		T_RESET,	TF_COMMAND
+%%
diff --git a/trunk/scripts/config/zconf.hash.c b/trunk/scripts/config/zconf.hash.c
new file mode 100644
index 00000000..dda47f13
--- /dev/null
+++ b/trunk/scripts/config/zconf.hash.c
@@ -0,0 +1,243 @@
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf  */
+/* Computed positions: -k'1,3' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+struct kconf_id;
+/* maximum key range = 47, duplicates = 0 */
+
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
+inline
+#elif defined(__GNUC__)
+__inline
+#endif
+static unsigned int
+kconf_id_hash (register const char *str, register unsigned int len)
+{
+  static unsigned char asso_values[] =
+    {
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 40,  5,
+       0,  0,  5, 49,  5, 20, 49, 49,  5, 20,
+       5,  0, 35, 49,  0, 15,  0, 10, 15, 49,
+      25, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval;
+}
+
+struct kconf_id_strings_t
+  {
+    char kconf_id_strings_str2[sizeof("on")];
+    char kconf_id_strings_str5[sizeof("endif")];
+    char kconf_id_strings_str6[sizeof("option")];
+    char kconf_id_strings_str7[sizeof("endmenu")];
+    char kconf_id_strings_str8[sizeof("optional")];
+    char kconf_id_strings_str9[sizeof("endchoice")];
+    char kconf_id_strings_str10[sizeof("range")];
+    char kconf_id_strings_str11[sizeof("choice")];
+    char kconf_id_strings_str12[sizeof("default")];
+    char kconf_id_strings_str13[sizeof("def_bool")];
+    char kconf_id_strings_str14[sizeof("help")];
+    char kconf_id_strings_str16[sizeof("config")];
+    char kconf_id_strings_str17[sizeof("def_tristate")];
+    char kconf_id_strings_str18[sizeof("env")];
+    char kconf_id_strings_str19[sizeof("defconfig_list")];
+    char kconf_id_strings_str20[sizeof("reset")];
+    char kconf_id_strings_str21[sizeof("string")];
+    char kconf_id_strings_str22[sizeof("if")];
+    char kconf_id_strings_str23[sizeof("int")];
+    char kconf_id_strings_str26[sizeof("select")];
+    char kconf_id_strings_str27[sizeof("modules")];
+    char kconf_id_strings_str28[sizeof("tristate")];
+    char kconf_id_strings_str29[sizeof("menu")];
+    char kconf_id_strings_str31[sizeof("source")];
+    char kconf_id_strings_str32[sizeof("comment")];
+    char kconf_id_strings_str33[sizeof("hex")];
+    char kconf_id_strings_str35[sizeof("menuconfig")];
+    char kconf_id_strings_str37[sizeof("visible")];
+    char kconf_id_strings_str41[sizeof("prompt")];
+    char kconf_id_strings_str42[sizeof("depends")];
+    char kconf_id_strings_str44[sizeof("bool")];
+    char kconf_id_strings_str47[sizeof("boolean")];
+    char kconf_id_strings_str48[sizeof("mainmenu")];
+  };
+static struct kconf_id_strings_t kconf_id_strings_contents =
+  {
+    "on",
+    "endif",
+    "option",
+    "endmenu",
+    "optional",
+    "endchoice",
+    "range",
+    "choice",
+    "default",
+    "def_bool",
+    "help",
+    "config",
+    "def_tristate",
+    "env",
+    "defconfig_list",
+    "reset",
+    "string",
+    "if",
+    "int",
+    "select",
+    "modules",
+    "tristate",
+    "menu",
+    "source",
+    "comment",
+    "hex",
+    "menuconfig",
+    "visible",
+    "prompt",
+    "depends",
+    "bool",
+    "boolean",
+    "mainmenu"
+  };
+#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+struct kconf_id *
+kconf_id_lookup (register const char *str, register unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 33,
+      MIN_WORD_LENGTH = 2,
+      MAX_WORD_LENGTH = 14,
+      MIN_HASH_VALUE = 2,
+      MAX_HASH_VALUE = 48
+    };
+
+  static struct kconf_id wordlist[] =
+    {
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,		T_ON,		TF_PARAM},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,		T_ENDIF,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,		T_OPTION,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_ENDMENU,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_OPTIONAL,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,	T_ENDCHOICE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,		T_RANGE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,		T_CHOICE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,		T_HELP,		TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,		T_CONFIG,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,		T_OPT_ENV,	TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19,	T_OPT_DEFCONFIG_LIST,TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20,		T_RESET,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_TYPE,		TF_COMMAND, S_STRING},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,		T_IF,		TF_COMMAND|TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,		T_TYPE,		TF_COMMAND, S_INT},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,		T_SELECT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,	T_OPT_MODULES,	TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,	T_TYPE,		TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,		T_MENU,		TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_SOURCE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,	T_COMMENT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,		T_TYPE,		TF_COMMAND, S_HEX},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,	T_MENUCONFIG,	TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,	T_VISIBLE,	TF_COMMAND},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_PROMPT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,	T_DEPENDS,	TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str44,		T_TYPE,		TF_COMMAND, S_BOOLEAN},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47,	T_TYPE,		TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48,	T_MAINMENU,	TF_COMMAND}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = kconf_id_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + kconf_id_strings;
+
+              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+
diff --git a/trunk/scripts/config/zconf.hash.c_shipped b/trunk/scripts/config/zconf.hash.c_shipped
new file mode 100644
index 00000000..dda47f13
--- /dev/null
+++ b/trunk/scripts/config/zconf.hash.c_shipped
@@ -0,0 +1,243 @@
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf  */
+/* Computed positions: -k'1,3' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+struct kconf_id;
+/* maximum key range = 47, duplicates = 0 */
+
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
+inline
+#elif defined(__GNUC__)
+__inline
+#endif
+static unsigned int
+kconf_id_hash (register const char *str, register unsigned int len)
+{
+  static unsigned char asso_values[] =
+    {
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 40,  5,
+       0,  0,  5, 49,  5, 20, 49, 49,  5, 20,
+       5,  0, 35, 49,  0, 15,  0, 10, 15, 49,
+      25, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval;
+}
+
+struct kconf_id_strings_t
+  {
+    char kconf_id_strings_str2[sizeof("on")];
+    char kconf_id_strings_str5[sizeof("endif")];
+    char kconf_id_strings_str6[sizeof("option")];
+    char kconf_id_strings_str7[sizeof("endmenu")];
+    char kconf_id_strings_str8[sizeof("optional")];
+    char kconf_id_strings_str9[sizeof("endchoice")];
+    char kconf_id_strings_str10[sizeof("range")];
+    char kconf_id_strings_str11[sizeof("choice")];
+    char kconf_id_strings_str12[sizeof("default")];
+    char kconf_id_strings_str13[sizeof("def_bool")];
+    char kconf_id_strings_str14[sizeof("help")];
+    char kconf_id_strings_str16[sizeof("config")];
+    char kconf_id_strings_str17[sizeof("def_tristate")];
+    char kconf_id_strings_str18[sizeof("env")];
+    char kconf_id_strings_str19[sizeof("defconfig_list")];
+    char kconf_id_strings_str20[sizeof("reset")];
+    char kconf_id_strings_str21[sizeof("string")];
+    char kconf_id_strings_str22[sizeof("if")];
+    char kconf_id_strings_str23[sizeof("int")];
+    char kconf_id_strings_str26[sizeof("select")];
+    char kconf_id_strings_str27[sizeof("modules")];
+    char kconf_id_strings_str28[sizeof("tristate")];
+    char kconf_id_strings_str29[sizeof("menu")];
+    char kconf_id_strings_str31[sizeof("source")];
+    char kconf_id_strings_str32[sizeof("comment")];
+    char kconf_id_strings_str33[sizeof("hex")];
+    char kconf_id_strings_str35[sizeof("menuconfig")];
+    char kconf_id_strings_str37[sizeof("visible")];
+    char kconf_id_strings_str41[sizeof("prompt")];
+    char kconf_id_strings_str42[sizeof("depends")];
+    char kconf_id_strings_str44[sizeof("bool")];
+    char kconf_id_strings_str47[sizeof("boolean")];
+    char kconf_id_strings_str48[sizeof("mainmenu")];
+  };
+static struct kconf_id_strings_t kconf_id_strings_contents =
+  {
+    "on",
+    "endif",
+    "option",
+    "endmenu",
+    "optional",
+    "endchoice",
+    "range",
+    "choice",
+    "default",
+    "def_bool",
+    "help",
+    "config",
+    "def_tristate",
+    "env",
+    "defconfig_list",
+    "reset",
+    "string",
+    "if",
+    "int",
+    "select",
+    "modules",
+    "tristate",
+    "menu",
+    "source",
+    "comment",
+    "hex",
+    "menuconfig",
+    "visible",
+    "prompt",
+    "depends",
+    "bool",
+    "boolean",
+    "mainmenu"
+  };
+#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+struct kconf_id *
+kconf_id_lookup (register const char *str, register unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 33,
+      MIN_WORD_LENGTH = 2,
+      MAX_WORD_LENGTH = 14,
+      MIN_HASH_VALUE = 2,
+      MAX_HASH_VALUE = 48
+    };
+
+  static struct kconf_id wordlist[] =
+    {
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,		T_ON,		TF_PARAM},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,		T_ENDIF,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,		T_OPTION,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_ENDMENU,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_OPTIONAL,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,	T_ENDCHOICE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,		T_RANGE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,		T_CHOICE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,		T_HELP,		TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,		T_CONFIG,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,		T_OPT_ENV,	TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19,	T_OPT_DEFCONFIG_LIST,TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20,		T_RESET,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_TYPE,		TF_COMMAND, S_STRING},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,		T_IF,		TF_COMMAND|TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,		T_TYPE,		TF_COMMAND, S_INT},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,		T_SELECT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,	T_OPT_MODULES,	TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,	T_TYPE,		TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,		T_MENU,		TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_SOURCE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,	T_COMMENT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,		T_TYPE,		TF_COMMAND, S_HEX},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,	T_MENUCONFIG,	TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,	T_VISIBLE,	TF_COMMAND},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_PROMPT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,	T_DEPENDS,	TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str44,		T_TYPE,		TF_COMMAND, S_BOOLEAN},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47,	T_TYPE,		TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48,	T_MAINMENU,	TF_COMMAND}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = kconf_id_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + kconf_id_strings;
+
+              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+
diff --git a/trunk/scripts/config/zconf.l b/trunk/scripts/config/zconf.l
new file mode 100644
index 00000000..3aef4598
--- /dev/null
+++ b/trunk/scripts/config/zconf.l
@@ -0,0 +1,406 @@
+%option nostdinit noyywrap never-interactive full ecs
+%option 8bit nodefault perf-report perf-report
+%option noinput
+%x COMMAND HELP STRING PARAM
+%{
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <glob.h>
+
+#include "lkc.h"
+
+#define START_STRSIZE	16
+
+static struct {
+	struct file *file;
+	int lineno;
+} current_pos;
+
+static char *text;
+static int text_size, text_asize;
+
+struct buffer {
+        struct buffer *parent;
+        YY_BUFFER_STATE state;
+};
+
+struct buffer *current_buf;
+
+static int last_ts, first_ts;
+
+static void zconf_endhelp(void);
+static void zconf_endfile(void);
+
+static void new_string(void)
+{
+	text = xmalloc(START_STRSIZE);
+	text_asize = START_STRSIZE;
+	text_size = 0;
+	*text = 0;
+}
+
+static void append_string(const char *str, int size)
+{
+	int new_size = text_size + size + 1;
+	if (new_size > text_asize) {
+		new_size += START_STRSIZE - 1;
+		new_size &= -START_STRSIZE;
+		text = realloc(text, new_size);
+		text_asize = new_size;
+	}
+	memcpy(text + text_size, str, size);
+	text_size += size;
+	text[text_size] = 0;
+}
+
+static void alloc_string(const char *str, int size)
+{
+	text = xmalloc(size + 1);
+	memcpy(text, str, size);
+	text[size] = 0;
+}
+%}
+
+ws	[ \n\t]
+n	[A-Za-z0-9_]
+
+%%
+	int str = 0;
+	int ts, i;
+
+[ \t]*#.*\n	|
+[ \t]*\n	{
+	current_file->lineno++;
+	return T_EOL;
+}
+[ \t]*#.*
+
+
+[ \t]+	{
+	BEGIN(COMMAND);
+}
+
+.	{
+	unput(yytext[0]);
+	BEGIN(COMMAND);
+}
+
+
+<COMMAND>{
+	{n}+	{
+		const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+		BEGIN(PARAM);
+		current_pos.file = current_file;
+		current_pos.lineno = current_file->lineno;
+		if (id && id->flags & TF_COMMAND) {
+			zconflval.id = id;
+			return id->token;
+		}
+		alloc_string(yytext, yyleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	.
+	\n	{
+		BEGIN(INITIAL);
+		current_file->lineno++;
+		return T_EOL;
+	}
+}
+
+<PARAM>{
+	"&&"	return T_AND;
+	"||"	return T_OR;
+	"("	return T_OPEN_PAREN;
+	")"	return T_CLOSE_PAREN;
+	"!"	return T_NOT;
+	"="	return T_EQUAL;
+	"!="	return T_UNEQUAL;
+	\"|\'	{
+		str = yytext[0];
+		new_string();
+		BEGIN(STRING);
+	}
+	\n	BEGIN(INITIAL); current_file->lineno++; return T_EOL;
+	---	/* ignore */
+	({n}|[-/.])+	{
+		const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+		if (id && id->flags & TF_PARAM) {
+			zconflval.id = id;
+			return id->token;
+		}
+		alloc_string(yytext, yyleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	#.*	/* comment */
+	\\\n	current_file->lineno++;
+	.
+	<<EOF>> {
+		BEGIN(INITIAL);
+	}
+}
+
+<STRING>{
+	[^'"\\\n]+/\n	{
+		append_string(yytext, yyleng);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	[^'"\\\n]+	{
+		append_string(yytext, yyleng);
+	}
+	\\.?/\n	{
+		append_string(yytext + 1, yyleng - 1);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	\\.?	{
+		append_string(yytext + 1, yyleng - 1);
+	}
+	\'|\"	{
+		if (str == yytext[0]) {
+			BEGIN(PARAM);
+			zconflval.string = text;
+			return T_WORD_QUOTE;
+		} else
+			append_string(yytext, 1);
+	}
+	\n	{
+		printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+		current_file->lineno++;
+		BEGIN(INITIAL);
+		return T_EOL;
+	}
+	<<EOF>>	{
+		BEGIN(INITIAL);
+	}
+}
+
+<HELP>{
+	[ \t]+	{
+		ts = 0;
+		for (i = 0; i < yyleng; i++) {
+			if (yytext[i] == '\t')
+				ts = (ts & ~7) + 8;
+			else
+				ts++;
+		}
+		last_ts = ts;
+		if (first_ts) {
+			if (ts < first_ts) {
+				zconf_endhelp();
+				return T_HELPTEXT;
+			}
+			ts -= first_ts;
+			while (ts > 8) {
+				append_string("        ", 8);
+				ts -= 8;
+			}
+			append_string("        ", ts);
+		}
+	}
+	[ \t]*\n/[^ \t\n] {
+		current_file->lineno++;
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	[ \t]*\n	{
+		current_file->lineno++;
+		append_string("\n", 1);
+	}
+	[^ \t\n].* {
+		while (yyleng) {
+			if ((yytext[yyleng-1] != ' ') && (yytext[yyleng-1] != '\t'))
+				break;
+			yyleng--;
+		}
+		append_string(yytext, yyleng);
+		if (!first_ts)
+			first_ts = last_ts;
+	}
+	<<EOF>>	{
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+}
+
+<<EOF>>	{
+	if (current_file) {
+		zconf_endfile();
+		return T_EOL;
+	}
+	fclose(yyin);
+	yyterminate();
+}
+
+%%
+void zconf_starthelp(void)
+{
+	new_string();
+	last_ts = first_ts = 0;
+	BEGIN(HELP);
+}
+
+static void zconf_endhelp(void)
+{
+	zconflval.string = text;
+	BEGIN(INITIAL);
+}
+
+
+/*
+ * Try to open specified file with following names:
+ * ./name
+ * $(srctree)/name
+ * The latter is used when srctree is separate from objtree
+ * when compiling the kernel.
+ * Return NULL if file is not found.
+ */
+FILE *zconf_fopen(const char *name)
+{
+	char *env, fullname[PATH_MAX+1];
+	FILE *f;
+
+	f = fopen(name, "r");
+	if (!f && name != NULL && name[0] != '/') {
+		env = getenv(SRCTREE);
+		if (env) {
+			sprintf(fullname, "%s/%s", env, name);
+			f = fopen(fullname, "r");
+		}
+	}
+	return f;
+}
+
+void zconf_initscan(const char *name)
+{
+	yyin = zconf_fopen(name);
+	if (!yyin) {
+		printf("can't find file %s\n", name);
+		exit(1);
+	}
+
+	current_buf = xmalloc(sizeof(*current_buf));
+	memset(current_buf, 0, sizeof(*current_buf));
+
+	current_file = file_lookup(name);
+	current_file->lineno = 1;
+}
+
+static void __zconf_nextfile(const char *name)
+{
+	struct file *iter;
+	struct file *file = file_lookup(name);
+	struct buffer *buf = xmalloc(sizeof(*buf));
+	memset(buf, 0, sizeof(*buf));
+
+	current_buf->state = YY_CURRENT_BUFFER;
+	yyin = zconf_fopen(file->name);
+	if (!yyin) {
+		printf("%s:%d: can't open file \"%s\"\n",
+		    zconf_curname(), zconf_lineno(), file->name);
+		exit(1);
+	}
+	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
+	buf->parent = current_buf;
+	current_buf = buf;
+
+	for (iter = current_file->parent; iter; iter = iter->parent ) {
+		if (!strcmp(current_file->name,iter->name) ) {
+			printf("%s:%d: recursive inclusion detected. "
+			       "Inclusion path:\n  current file : '%s'\n",
+			       zconf_curname(), zconf_lineno(),
+			       zconf_curname());
+			iter = current_file->parent;
+			while (iter && \
+			       strcmp(iter->name,current_file->name)) {
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno-1);
+				iter = iter->parent;
+			}
+			if (iter)
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno+1);
+			exit(1);
+		}
+	}
+	file->lineno = 1;
+	file->parent = current_file;
+	current_file = file;
+}
+
+void zconf_nextfile(const char *name)
+{
+	glob_t gl;
+	int err;
+	int i;
+
+	err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
+
+	/* ignore wildcard patterns that return no result */
+	if (err == GLOB_NOMATCH && strchr(name, '*')) {
+		err = 0;
+		gl.gl_pathc = 0;
+	}
+
+	if (err) {
+		const char *reason = "unknown error";
+
+		switch (err) {
+		case GLOB_NOSPACE:
+			reason = "out of memory";
+			break;
+		case GLOB_ABORTED:
+			reason = "read error";
+			break;
+		case GLOB_NOMATCH:
+			reason = "No files found";
+			break;
+		default:
+			break;
+		}
+
+		printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
+			reason, name);
+
+		exit(1);
+	}
+
+	for (i = 0; i < gl.gl_pathc; i++)
+		__zconf_nextfile(gl.gl_pathv[i]);
+}
+
+static void zconf_endfile(void)
+{
+	struct buffer *parent;
+
+	current_file = current_file->parent;
+
+	parent = current_buf->parent;
+	if (parent) {
+		fclose(yyin);
+		yy_delete_buffer(YY_CURRENT_BUFFER);
+		yy_switch_to_buffer(parent->state);
+	}
+	free(current_buf);
+	current_buf = parent;
+}
+
+int zconf_lineno(void)
+{
+	return current_pos.lineno;
+}
+
+const char *zconf_curname(void)
+{
+	return current_pos.file ? current_pos.file->name : "<none>";
+}
diff --git a/trunk/scripts/config/zconf.lex.c b/trunk/scripts/config/zconf.lex.c
new file mode 100644
index 00000000..766549fb
--- /dev/null
+++ b/trunk/scripts/config/zconf.lex.c
@@ -0,0 +1,2463 @@
+
+#line 3 "zconf.lex.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer zconf_create_buffer
+#define yy_delete_buffer zconf_delete_buffer
+#define yy_flex_debug zconf_flex_debug
+#define yy_init_buffer zconf_init_buffer
+#define yy_flush_buffer zconf_flush_buffer
+#define yy_load_buffer_state zconf_load_buffer_state
+#define yy_switch_to_buffer zconf_switch_to_buffer
+#define yyin zconfin
+#define yyleng zconfleng
+#define yylex zconflex
+#define yylineno zconflineno
+#define yyout zconfout
+#define yyrestart zconfrestart
+#define yytext zconftext
+#define yywrap zconfwrap
+#define yyalloc zconfalloc
+#define yyrealloc zconfrealloc
+#define yyfree zconffree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE zconfrestart(zconfin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t zconfleng;
+
+extern FILE *zconfin, *zconfout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up zconftext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via zconfrestart()), so that the user can continue scanning by
+	 * just pointing zconfin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when zconftext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t zconfleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow zconfwrap()'s to do buffer switches
+ * instead of setting up a fresh zconfin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void zconfrestart (FILE *input_file  );
+void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE zconf_create_buffer (FILE *file,int size  );
+void zconf_delete_buffer (YY_BUFFER_STATE b  );
+void zconf_flush_buffer (YY_BUFFER_STATE b  );
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void zconfpop_buffer_state (void );
+
+static void zconfensure_buffer_stack (void );
+static void zconf_load_buffer_state (void );
+static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER zconf_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *zconfalloc (yy_size_t  );
+void *zconfrealloc (void *,yy_size_t  );
+void zconffree (void *  );
+
+#define yy_new_buffer zconf_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        zconfensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        zconfensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define zconfwrap() 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *zconfin = (FILE *) 0, *zconfout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int zconflineno;
+
+int zconflineno = 1;
+
+extern char *zconftext;
+#define yytext_ptr zconftext
+static yyconst flex_int16_t yy_nxt[][17] =
+    {
+    {
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   16
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   16
+
+    },
+
+    {
+       11,   19,   20,   21,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   19
+    },
+
+    {
+       11,   19,   20,   21,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   19
+    },
+
+    {
+       11,   22,   22,   23,   22,   24,   22,   22,   24,   22,
+       22,   22,   22,   22,   22,   25,   22
+    },
+
+    {
+       11,   22,   22,   23,   22,   24,   22,   22,   24,   22,
+       22,   22,   22,   22,   22,   25,   22
+    },
+
+    {
+       11,   26,   26,   27,   28,   29,   30,   31,   29,   32,
+       33,   34,   35,   35,   36,   37,   38
+
+    },
+
+    {
+       11,   26,   26,   27,   28,   29,   30,   31,   29,   32,
+       33,   34,   35,   35,   36,   37,   38
+    },
+
+    {
+      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
+      -11,  -11,  -11,  -11,  -11,  -11,  -11
+    },
+
+    {
+       11,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
+      -12,  -12,  -12,  -12,  -12,  -12,  -12
+    },
+
+    {
+       11,  -13,   39,   40,  -13,  -13,   41,  -13,  -13,  -13,
+      -13,  -13,  -13,  -13,  -13,  -13,  -13
+    },
+
+    {
+       11,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
+      -14,  -14,  -14,  -14,  -14,  -14,  -14
+
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
+      -16,  -16,  -16,  -16,  -16,  -16,  -16
+    },
+
+    {
+       11,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17
+    },
+
+    {
+       11,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,   44,  -18,  -18,  -18
+    },
+
+    {
+       11,   45,   45,  -19,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45
+
+    },
+
+    {
+       11,  -20,   46,   47,  -20,  -20,  -20,  -20,  -20,  -20,
+      -20,  -20,  -20,  -20,  -20,  -20,  -20
+    },
+
+    {
+       11,   48,  -21,  -21,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48
+    },
+
+    {
+       11,   49,   49,   50,   49,  -22,   49,   49,  -22,   49,
+       49,   49,   49,   49,   49,  -22,   49
+    },
+
+    {
+       11,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
+      -23,  -23,  -23,  -23,  -23,  -23,  -23
+    },
+
+    {
+       11,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
+      -24,  -24,  -24,  -24,  -24,  -24,  -24
+
+    },
+
+    {
+       11,   51,   51,   52,   51,   51,   51,   51,   51,   51,
+       51,   51,   51,   51,   51,   51,   51
+    },
+
+    {
+       11,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
+      -26,  -26,  -26,  -26,  -26,  -26,  -26
+    },
+
+    {
+       11,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
+      -27,  -27,  -27,  -27,  -27,  -27,  -27
+    },
+
+    {
+       11,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
+      -28,  -28,  -28,  -28,   53,  -28,  -28
+    },
+
+    {
+       11,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29
+
+    },
+
+    {
+       11,   54,   54,  -30,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54
+    },
+
+    {
+       11,  -31,  -31,  -31,  -31,  -31,  -31,   55,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31
+    },
+
+    {
+       11,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
+      -32,  -32,  -32,  -32,  -32,  -32,  -32
+    },
+
+    {
+       11,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
+      -33,  -33,  -33,  -33,  -33,  -33,  -33
+    },
+
+    {
+       11,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
+      -34,   56,   57,   57,  -34,  -34,  -34
+
+    },
+
+    {
+       11,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,   57,   57,   57,  -35,  -35,  -35
+    },
+
+    {
+       11,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36
+    },
+
+    {
+       11,  -37,  -37,   58,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37
+    },
+
+    {
+       11,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,   59
+    },
+
+    {
+       11,  -39,   39,   40,  -39,  -39,   41,  -39,  -39,  -39,
+      -39,  -39,  -39,  -39,  -39,  -39,  -39
+
+    },
+
+    {
+       11,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,
+      -40,  -40,  -40,  -40,  -40,  -40,  -40
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,
+      -43,  -43,  -43,  -43,  -43,  -43,  -43
+    },
+
+    {
+       11,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
+      -44,  -44,  -44,   44,  -44,  -44,  -44
+
+    },
+
+    {
+       11,   45,   45,  -45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45
+    },
+
+    {
+       11,  -46,   46,   47,  -46,  -46,  -46,  -46,  -46,  -46,
+      -46,  -46,  -46,  -46,  -46,  -46,  -46
+    },
+
+    {
+       11,   48,  -47,  -47,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48
+    },
+
+    {
+       11,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  -48,  -48
+    },
+
+    {
+       11,   49,   49,   50,   49,  -49,   49,   49,  -49,   49,
+       49,   49,   49,   49,   49,  -49,   49
+
+    },
+
+    {
+       11,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
+      -50,  -50,  -50,  -50,  -50,  -50,  -50
+    },
+
+    {
+       11,  -51,  -51,   52,  -51,  -51,  -51,  -51,  -51,  -51,
+      -51,  -51,  -51,  -51,  -51,  -51,  -51
+    },
+
+    {
+       11,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
+      -52,  -52,  -52,  -52,  -52,  -52,  -52
+    },
+
+    {
+       11,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
+      -53,  -53,  -53,  -53,  -53,  -53,  -53
+    },
+
+    {
+       11,   54,   54,  -54,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54
+
+    },
+
+    {
+       11,  -55,  -55,  -55,  -55,  -55,  -55,  -55,  -55,  -55,
+      -55,  -55,  -55,  -55,  -55,  -55,  -55
+    },
+
+    {
+       11,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
+      -56,   60,   57,   57,  -56,  -56,  -56
+    },
+
+    {
+       11,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
+      -57,   57,   57,   57,  -57,  -57,  -57
+    },
+
+    {
+       11,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
+      -58,  -58,  -58,  -58,  -58,  -58,  -58
+    },
+
+    {
+       11,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,
+      -59,  -59,  -59,  -59,  -59,  -59,  -59
+
+    },
+
+    {
+       11,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,
+      -60,   57,   57,   57,  -60,  -60,  -60
+    },
+
+    } ;
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up zconftext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	zconfleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 33
+#define YY_END_OF_BUFFER 34
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[61] =
+    {   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       34,    5,    4,    2,    3,    7,    8,    6,   32,   29,
+       31,   24,   28,   27,   26,   22,   17,   13,   16,   20,
+       22,   11,   12,   19,   19,   14,   22,   22,    4,    2,
+        3,    3,    1,    6,   32,   29,   31,   30,   24,   23,
+       26,   25,   15,   20,    9,   19,   19,   21,   10,   18
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    6,    1,    1,    7,    8,    9,
+       10,    1,    1,    1,   11,   12,   12,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
+       14,    1,    1,    1,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+        1,   15,    1,    1,   13,    1,   13,   13,   13,   13,
+
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,    1,   16,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+extern int zconf_flex_debug;
+int zconf_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *zconftext;
+#define YY_NO_INPUT 1
+
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <glob.h>
+
+#include "lkc.h"
+
+#define START_STRSIZE	16
+
+static struct {
+	struct file *file;
+	int lineno;
+} current_pos;
+
+static char *text;
+static int text_size, text_asize;
+
+struct buffer {
+        struct buffer *parent;
+        YY_BUFFER_STATE state;
+};
+
+struct buffer *current_buf;
+
+static int last_ts, first_ts;
+
+static void zconf_endhelp(void);
+static void zconf_endfile(void);
+
+static void new_string(void)
+{
+	text = xmalloc(START_STRSIZE);
+	text_asize = START_STRSIZE;
+	text_size = 0;
+	*text = 0;
+}
+
+static void append_string(const char *str, int size)
+{
+	int new_size = text_size + size + 1;
+	if (new_size > text_asize) {
+		new_size += START_STRSIZE - 1;
+		new_size &= -START_STRSIZE;
+		text = realloc(text, new_size);
+		text_asize = new_size;
+	}
+	memcpy(text + text_size, str, size);
+	text_size += size;
+	text[text_size] = 0;
+}
+
+static void alloc_string(const char *str, int size)
+{
+	text = xmalloc(size + 1);
+	memcpy(text, str, size);
+	text[size] = 0;
+}
+
+#define INITIAL 0
+#define COMMAND 1
+#define HELP 2
+#define STRING 3
+#define PARAM 4
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int zconflex_destroy (void );
+
+int zconfget_debug (void );
+
+void zconfset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE zconfget_extra (void );
+
+void zconfset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *zconfget_in (void );
+
+void zconfset_in  (FILE * in_str  );
+
+FILE *zconfget_out (void );
+
+void zconfset_out  (FILE * out_str  );
+
+yy_size_t zconfget_leng (void );
+
+char *zconfget_text (void );
+
+int zconfget_lineno (void );
+
+void zconfset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int zconfwrap (void );
+#else
+extern int zconfwrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( zconftext, zconfleng, 1, zconfout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	errno=0; \
+	while ( (result = read( fileno(zconfin), (char *) buf, max_size )) < 0 ) \
+	{ \
+		if( errno != EINTR) \
+		{ \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+			break; \
+		} \
+		errno=0; \
+		clearerr(zconfin); \
+	}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int zconflex (void);
+
+#define YY_DECL int zconflex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after zconftext and zconfleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+	int str = 0;
+	int ts, i;
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! zconfin )
+			zconfin = stdin;
+
+		if ( ! zconfout )
+			zconfout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			zconfensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				zconf_create_buffer(zconfin,YY_BUF_SIZE );
+		}
+
+		zconf_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of zconftext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		while ( (yy_current_state = yy_nxt[yy_current_state][ yy_ec[YY_SC_TO_UI(*yy_cp)]  ]) > 0 )
+			++yy_cp;
+
+		yy_current_state = -yy_current_state;
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+case 1:
+/* rule 1 can match eol */
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+{
+	current_file->lineno++;
+	return T_EOL;
+}
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+{
+	BEGIN(COMMAND);
+}
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+{
+	unput(zconftext[0]);
+	BEGIN(COMMAND);
+}
+	YY_BREAK
+
+case 6:
+YY_RULE_SETUP
+{
+		const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+		BEGIN(PARAM);
+		current_pos.file = current_file;
+		current_pos.lineno = current_file->lineno;
+		if (id && id->flags & TF_COMMAND) {
+			zconflval.id = id;
+			return id->token;
+		}
+		alloc_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+
+	YY_BREAK
+case 8:
+/* rule 8 can match eol */
+YY_RULE_SETUP
+{
+		BEGIN(INITIAL);
+		current_file->lineno++;
+		return T_EOL;
+	}
+	YY_BREAK
+
+case 9:
+YY_RULE_SETUP
+return T_AND;
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+return T_OR;
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+return T_OPEN_PAREN;
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+return T_CLOSE_PAREN;
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+return T_NOT;
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+return T_EQUAL;
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+return T_UNEQUAL;
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+{
+		str = zconftext[0];
+		new_string();
+		BEGIN(STRING);
+	}
+	YY_BREAK
+case 17:
+/* rule 17 can match eol */
+YY_RULE_SETUP
+BEGIN(INITIAL); current_file->lineno++; return T_EOL;
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+/* ignore */
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+{
+		const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+		if (id && id->flags & TF_PARAM) {
+			zconflval.id = id;
+			return id->token;
+		}
+		alloc_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+/* comment */
+	YY_BREAK
+case 21:
+/* rule 21 can match eol */
+YY_RULE_SETUP
+current_file->lineno++;
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+
+	YY_BREAK
+case YY_STATE_EOF(PARAM):
+{
+		BEGIN(INITIAL);
+	}
+	YY_BREAK
+
+case 23:
+/* rule 23 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		append_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+{
+		append_string(zconftext, zconfleng);
+	}
+	YY_BREAK
+case 25:
+/* rule 25 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		append_string(zconftext + 1, zconfleng - 1);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+{
+		append_string(zconftext + 1, zconfleng - 1);
+	}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+{
+		if (str == zconftext[0]) {
+			BEGIN(PARAM);
+			zconflval.string = text;
+			return T_WORD_QUOTE;
+		} else
+			append_string(zconftext, 1);
+	}
+	YY_BREAK
+case 28:
+/* rule 28 can match eol */
+YY_RULE_SETUP
+{
+		printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+		current_file->lineno++;
+		BEGIN(INITIAL);
+		return T_EOL;
+	}
+	YY_BREAK
+case YY_STATE_EOF(STRING):
+{
+		BEGIN(INITIAL);
+	}
+	YY_BREAK
+
+case 29:
+YY_RULE_SETUP
+{
+		ts = 0;
+		for (i = 0; i < zconfleng; i++) {
+			if (zconftext[i] == '\t')
+				ts = (ts & ~7) + 8;
+			else
+				ts++;
+		}
+		last_ts = ts;
+		if (first_ts) {
+			if (ts < first_ts) {
+				zconf_endhelp();
+				return T_HELPTEXT;
+			}
+			ts -= first_ts;
+			while (ts > 8) {
+				append_string("        ", 8);
+				ts -= 8;
+			}
+			append_string("        ", ts);
+		}
+	}
+	YY_BREAK
+case 30:
+/* rule 30 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		current_file->lineno++;
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	YY_BREAK
+case 31:
+/* rule 31 can match eol */
+YY_RULE_SETUP
+{
+		current_file->lineno++;
+		append_string("\n", 1);
+	}
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+{
+		while (zconfleng) {
+			if ((zconftext[zconfleng-1] != ' ') && (zconftext[zconfleng-1] != '\t'))
+				break;
+			zconfleng--;
+		}
+		append_string(zconftext, zconfleng);
+		if (!first_ts)
+			first_ts = last_ts;
+	}
+	YY_BREAK
+case YY_STATE_EOF(HELP):
+{
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	YY_BREAK
+
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(COMMAND):
+{
+	if (current_file) {
+		zconf_endfile();
+		return T_EOL;
+	}
+	fclose(zconfin);
+	yyterminate();
+}
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+YY_FATAL_ERROR( "flex scanner jammed" );
+	YY_BREAK
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed zconfin at a new source and called
+			 * zconflex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = zconfin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( zconfwrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * zconftext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of zconflex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					zconfrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			zconfrestart(zconfin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		yy_current_state = yy_nxt[yy_current_state][(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1)];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    
+	yy_current_state = yy_nxt[yy_current_state][1];
+	yy_is_jam = (yy_current_state <= 0);
+
+		return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up zconftext */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					zconfrestart(zconfin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( zconfwrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve zconftext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void zconfrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        zconfensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            zconf_create_buffer(zconfin,YY_BUF_SIZE );
+	}
+
+	zconf_init_buffer(YY_CURRENT_BUFFER,input_file );
+	zconf_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void zconf_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		zconfpop_buffer_state();
+	 *		zconfpush_buffer_state(new_buffer);
+     */
+	zconfensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	zconf_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (zconfwrap()) processing, but the only time this flag
+	 * is looked at is after zconfwrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void zconf_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	zconfin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE zconf_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) zconfalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	zconf_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with zconf_create_buffer()
+ * 
+ */
+    void zconf_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		zconffree((void *) b->yy_ch_buf  );
+
+	zconffree((void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a zconfrestart() or at EOF.
+ */
+    static void zconf_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	zconf_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then zconf_init_buffer was _probably_
+     * called from zconfrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void zconf_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		zconf_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	zconfensure_buffer_stack();
+
+	/* This block is copied from zconf_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from zconf_switch_to_buffer. */
+	zconf_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void zconfpop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	zconf_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		zconf_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void zconfensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)zconfrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	zconf_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to zconflex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       zconf_scan_bytes() instead.
+ */
+YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr )
+{
+    
+	return zconf_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to zconflex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE zconf_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) zconfalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = zconf_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in zconf_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		zconftext[zconfleng] = (yy_hold_char); \
+		(yy_c_buf_p) = zconftext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		zconfleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int zconfget_lineno  (void)
+{
+        
+    return zconflineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *zconfget_in  (void)
+{
+        return zconfin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *zconfget_out  (void)
+{
+        return zconfout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t zconfget_leng  (void)
+{
+        return zconfleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *zconfget_text  (void)
+{
+        return zconftext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void zconfset_lineno (int  line_number )
+{
+    
+    zconflineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see zconf_switch_to_buffer
+ */
+void zconfset_in (FILE *  in_str )
+{
+        zconfin = in_str ;
+}
+
+void zconfset_out (FILE *  out_str )
+{
+        zconfout = out_str ;
+}
+
+int zconfget_debug  (void)
+{
+        return zconf_flex_debug;
+}
+
+void zconfset_debug (int  bdebug )
+{
+        zconf_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from zconflex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    zconfin = stdin;
+    zconfout = stdout;
+#else
+    zconfin = (FILE *) 0;
+    zconfout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * zconflex_init()
+     */
+    return 0;
+}
+
+/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
+int zconflex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		zconf_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		zconfpop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	zconffree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * zconflex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *zconfalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *zconfrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void zconffree (void * ptr )
+{
+	free( (char *) ptr );	/* see zconfrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+void zconf_starthelp(void)
+{
+	new_string();
+	last_ts = first_ts = 0;
+	BEGIN(HELP);
+}
+
+static void zconf_endhelp(void)
+{
+	zconflval.string = text;
+	BEGIN(INITIAL);
+}
+
+/*
+ * Try to open specified file with following names:
+ * ./name
+ * $(srctree)/name
+ * The latter is used when srctree is separate from objtree
+ * when compiling the kernel.
+ * Return NULL if file is not found.
+ */
+FILE *zconf_fopen(const char *name)
+{
+	char *env, fullname[PATH_MAX+1];
+	FILE *f;
+
+	f = fopen(name, "r");
+	if (!f && name != NULL && name[0] != '/') {
+		env = getenv(SRCTREE);
+		if (env) {
+			sprintf(fullname, "%s/%s", env, name);
+			f = fopen(fullname, "r");
+		}
+	}
+	return f;
+}
+
+void zconf_initscan(const char *name)
+{
+	zconfin = zconf_fopen(name);
+	if (!zconfin) {
+		printf("can't find file %s\n", name);
+		exit(1);
+	}
+
+	current_buf = xmalloc(sizeof(*current_buf));
+	memset(current_buf, 0, sizeof(*current_buf));
+
+	current_file = file_lookup(name);
+	current_file->lineno = 1;
+}
+
+static void __zconf_nextfile(const char *name)
+{
+	struct file *iter;
+	struct file *file = file_lookup(name);
+	struct buffer *buf = xmalloc(sizeof(*buf));
+	memset(buf, 0, sizeof(*buf));
+
+	current_buf->state = YY_CURRENT_BUFFER;
+	zconfin = zconf_fopen(file->name);
+	if (!zconfin) {
+		printf("%s:%d: can't open file \"%s\"\n",
+		    zconf_curname(), zconf_lineno(), file->name);
+		exit(1);
+	}
+	zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
+	buf->parent = current_buf;
+	current_buf = buf;
+
+	for (iter = current_file->parent; iter; iter = iter->parent ) {
+		if (!strcmp(current_file->name,iter->name) ) {
+			printf("%s:%d: recursive inclusion detected. "
+			       "Inclusion path:\n  current file : '%s'\n",
+			       zconf_curname(), zconf_lineno(),
+			       zconf_curname());
+			iter = current_file->parent;
+			while (iter && \
+			       strcmp(iter->name,current_file->name)) {
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno-1);
+				iter = iter->parent;
+			}
+			if (iter)
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno+1);
+			exit(1);
+		}
+	}
+	file->lineno = 1;
+	file->parent = current_file;
+	current_file = file;
+}
+
+void zconf_nextfile(const char *name)
+{
+	glob_t gl;
+	int err;
+	int i;
+
+	err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
+
+	/* ignore wildcard patterns that return no result */
+	if (err == GLOB_NOMATCH && strchr(name, '*')) {
+		err = 0;
+		gl.gl_pathc = 0;
+	}
+
+	if (err) {
+		const char *reason = "unknown error";
+
+		switch (err) {
+		case GLOB_NOSPACE:
+			reason = "out of memory";
+			break;
+		case GLOB_ABORTED:
+			reason = "read error";
+			break;
+		case GLOB_NOMATCH:
+			reason = "No files found";
+			break;
+		default:
+			break;
+		}
+
+		printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
+			reason, name);
+
+		exit(1);
+	}
+
+	for (i = 0; i < gl.gl_pathc; i++)
+		__zconf_nextfile(gl.gl_pathv[i]);
+}
+
+static void zconf_endfile(void)
+{
+	struct buffer *parent;
+
+	current_file = current_file->parent;
+
+	parent = current_buf->parent;
+	if (parent) {
+		fclose(zconfin);
+		zconf_delete_buffer(YY_CURRENT_BUFFER);
+		zconf_switch_to_buffer(parent->state);
+	}
+	free(current_buf);
+	current_buf = parent;
+}
+
+int zconf_lineno(void)
+{
+	return current_pos.lineno;
+}
+
+const char *zconf_curname(void)
+{
+	return current_pos.file ? current_pos.file->name : "<none>";
+}
+
diff --git a/trunk/scripts/config/zconf.lex.c_shipped b/trunk/scripts/config/zconf.lex.c_shipped
new file mode 100644
index 00000000..766549fb
--- /dev/null
+++ b/trunk/scripts/config/zconf.lex.c_shipped
@@ -0,0 +1,2463 @@
+
+#line 3 "zconf.lex.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer zconf_create_buffer
+#define yy_delete_buffer zconf_delete_buffer
+#define yy_flex_debug zconf_flex_debug
+#define yy_init_buffer zconf_init_buffer
+#define yy_flush_buffer zconf_flush_buffer
+#define yy_load_buffer_state zconf_load_buffer_state
+#define yy_switch_to_buffer zconf_switch_to_buffer
+#define yyin zconfin
+#define yyleng zconfleng
+#define yylex zconflex
+#define yylineno zconflineno
+#define yyout zconfout
+#define yyrestart zconfrestart
+#define yytext zconftext
+#define yywrap zconfwrap
+#define yyalloc zconfalloc
+#define yyrealloc zconfrealloc
+#define yyfree zconffree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 37
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE zconfrestart(zconfin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t zconfleng;
+
+extern FILE *zconfin, *zconfout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up zconftext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via zconfrestart()), so that the user can continue scanning by
+	 * just pointing zconfin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when zconftext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t zconfleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow zconfwrap()'s to do buffer switches
+ * instead of setting up a fresh zconfin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void zconfrestart (FILE *input_file  );
+void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE zconf_create_buffer (FILE *file,int size  );
+void zconf_delete_buffer (YY_BUFFER_STATE b  );
+void zconf_flush_buffer (YY_BUFFER_STATE b  );
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void zconfpop_buffer_state (void );
+
+static void zconfensure_buffer_stack (void );
+static void zconf_load_buffer_state (void );
+static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER zconf_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *zconfalloc (yy_size_t  );
+void *zconfrealloc (void *,yy_size_t  );
+void zconffree (void *  );
+
+#define yy_new_buffer zconf_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        zconfensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        zconfensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define zconfwrap() 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *zconfin = (FILE *) 0, *zconfout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int zconflineno;
+
+int zconflineno = 1;
+
+extern char *zconftext;
+#define yytext_ptr zconftext
+static yyconst flex_int16_t yy_nxt[][17] =
+    {
+    {
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   16
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   16
+
+    },
+
+    {
+       11,   19,   20,   21,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   19
+    },
+
+    {
+       11,   19,   20,   21,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   19
+    },
+
+    {
+       11,   22,   22,   23,   22,   24,   22,   22,   24,   22,
+       22,   22,   22,   22,   22,   25,   22
+    },
+
+    {
+       11,   22,   22,   23,   22,   24,   22,   22,   24,   22,
+       22,   22,   22,   22,   22,   25,   22
+    },
+
+    {
+       11,   26,   26,   27,   28,   29,   30,   31,   29,   32,
+       33,   34,   35,   35,   36,   37,   38
+
+    },
+
+    {
+       11,   26,   26,   27,   28,   29,   30,   31,   29,   32,
+       33,   34,   35,   35,   36,   37,   38
+    },
+
+    {
+      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
+      -11,  -11,  -11,  -11,  -11,  -11,  -11
+    },
+
+    {
+       11,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
+      -12,  -12,  -12,  -12,  -12,  -12,  -12
+    },
+
+    {
+       11,  -13,   39,   40,  -13,  -13,   41,  -13,  -13,  -13,
+      -13,  -13,  -13,  -13,  -13,  -13,  -13
+    },
+
+    {
+       11,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
+      -14,  -14,  -14,  -14,  -14,  -14,  -14
+
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
+      -16,  -16,  -16,  -16,  -16,  -16,  -16
+    },
+
+    {
+       11,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17
+    },
+
+    {
+       11,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,   44,  -18,  -18,  -18
+    },
+
+    {
+       11,   45,   45,  -19,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45
+
+    },
+
+    {
+       11,  -20,   46,   47,  -20,  -20,  -20,  -20,  -20,  -20,
+      -20,  -20,  -20,  -20,  -20,  -20,  -20
+    },
+
+    {
+       11,   48,  -21,  -21,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48
+    },
+
+    {
+       11,   49,   49,   50,   49,  -22,   49,   49,  -22,   49,
+       49,   49,   49,   49,   49,  -22,   49
+    },
+
+    {
+       11,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
+      -23,  -23,  -23,  -23,  -23,  -23,  -23
+    },
+
+    {
+       11,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
+      -24,  -24,  -24,  -24,  -24,  -24,  -24
+
+    },
+
+    {
+       11,   51,   51,   52,   51,   51,   51,   51,   51,   51,
+       51,   51,   51,   51,   51,   51,   51
+    },
+
+    {
+       11,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
+      -26,  -26,  -26,  -26,  -26,  -26,  -26
+    },
+
+    {
+       11,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
+      -27,  -27,  -27,  -27,  -27,  -27,  -27
+    },
+
+    {
+       11,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
+      -28,  -28,  -28,  -28,   53,  -28,  -28
+    },
+
+    {
+       11,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29
+
+    },
+
+    {
+       11,   54,   54,  -30,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54
+    },
+
+    {
+       11,  -31,  -31,  -31,  -31,  -31,  -31,   55,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31
+    },
+
+    {
+       11,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
+      -32,  -32,  -32,  -32,  -32,  -32,  -32
+    },
+
+    {
+       11,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
+      -33,  -33,  -33,  -33,  -33,  -33,  -33
+    },
+
+    {
+       11,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
+      -34,   56,   57,   57,  -34,  -34,  -34
+
+    },
+
+    {
+       11,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,   57,   57,   57,  -35,  -35,  -35
+    },
+
+    {
+       11,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36
+    },
+
+    {
+       11,  -37,  -37,   58,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37
+    },
+
+    {
+       11,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,   59
+    },
+
+    {
+       11,  -39,   39,   40,  -39,  -39,   41,  -39,  -39,  -39,
+      -39,  -39,  -39,  -39,  -39,  -39,  -39
+
+    },
+
+    {
+       11,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,
+      -40,  -40,  -40,  -40,  -40,  -40,  -40
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,
+      -43,  -43,  -43,  -43,  -43,  -43,  -43
+    },
+
+    {
+       11,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
+      -44,  -44,  -44,   44,  -44,  -44,  -44
+
+    },
+
+    {
+       11,   45,   45,  -45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45
+    },
+
+    {
+       11,  -46,   46,   47,  -46,  -46,  -46,  -46,  -46,  -46,
+      -46,  -46,  -46,  -46,  -46,  -46,  -46
+    },
+
+    {
+       11,   48,  -47,  -47,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48
+    },
+
+    {
+       11,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  -48,  -48
+    },
+
+    {
+       11,   49,   49,   50,   49,  -49,   49,   49,  -49,   49,
+       49,   49,   49,   49,   49,  -49,   49
+
+    },
+
+    {
+       11,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
+      -50,  -50,  -50,  -50,  -50,  -50,  -50
+    },
+
+    {
+       11,  -51,  -51,   52,  -51,  -51,  -51,  -51,  -51,  -51,
+      -51,  -51,  -51,  -51,  -51,  -51,  -51
+    },
+
+    {
+       11,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
+      -52,  -52,  -52,  -52,  -52,  -52,  -52
+    },
+
+    {
+       11,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
+      -53,  -53,  -53,  -53,  -53,  -53,  -53
+    },
+
+    {
+       11,   54,   54,  -54,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54
+
+    },
+
+    {
+       11,  -55,  -55,  -55,  -55,  -55,  -55,  -55,  -55,  -55,
+      -55,  -55,  -55,  -55,  -55,  -55,  -55
+    },
+
+    {
+       11,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
+      -56,   60,   57,   57,  -56,  -56,  -56
+    },
+
+    {
+       11,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
+      -57,   57,   57,   57,  -57,  -57,  -57
+    },
+
+    {
+       11,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
+      -58,  -58,  -58,  -58,  -58,  -58,  -58
+    },
+
+    {
+       11,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,
+      -59,  -59,  -59,  -59,  -59,  -59,  -59
+
+    },
+
+    {
+       11,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,
+      -60,   57,   57,   57,  -60,  -60,  -60
+    },
+
+    } ;
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up zconftext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	zconfleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 33
+#define YY_END_OF_BUFFER 34
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[61] =
+    {   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       34,    5,    4,    2,    3,    7,    8,    6,   32,   29,
+       31,   24,   28,   27,   26,   22,   17,   13,   16,   20,
+       22,   11,   12,   19,   19,   14,   22,   22,    4,    2,
+        3,    3,    1,    6,   32,   29,   31,   30,   24,   23,
+       26,   25,   15,   20,    9,   19,   19,   21,   10,   18
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    6,    1,    1,    7,    8,    9,
+       10,    1,    1,    1,   11,   12,   12,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
+       14,    1,    1,    1,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+        1,   15,    1,    1,   13,    1,   13,   13,   13,   13,
+
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,    1,   16,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+extern int zconf_flex_debug;
+int zconf_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *zconftext;
+#define YY_NO_INPUT 1
+
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <glob.h>
+
+#include "lkc.h"
+
+#define START_STRSIZE	16
+
+static struct {
+	struct file *file;
+	int lineno;
+} current_pos;
+
+static char *text;
+static int text_size, text_asize;
+
+struct buffer {
+        struct buffer *parent;
+        YY_BUFFER_STATE state;
+};
+
+struct buffer *current_buf;
+
+static int last_ts, first_ts;
+
+static void zconf_endhelp(void);
+static void zconf_endfile(void);
+
+static void new_string(void)
+{
+	text = xmalloc(START_STRSIZE);
+	text_asize = START_STRSIZE;
+	text_size = 0;
+	*text = 0;
+}
+
+static void append_string(const char *str, int size)
+{
+	int new_size = text_size + size + 1;
+	if (new_size > text_asize) {
+		new_size += START_STRSIZE - 1;
+		new_size &= -START_STRSIZE;
+		text = realloc(text, new_size);
+		text_asize = new_size;
+	}
+	memcpy(text + text_size, str, size);
+	text_size += size;
+	text[text_size] = 0;
+}
+
+static void alloc_string(const char *str, int size)
+{
+	text = xmalloc(size + 1);
+	memcpy(text, str, size);
+	text[size] = 0;
+}
+
+#define INITIAL 0
+#define COMMAND 1
+#define HELP 2
+#define STRING 3
+#define PARAM 4
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int zconflex_destroy (void );
+
+int zconfget_debug (void );
+
+void zconfset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE zconfget_extra (void );
+
+void zconfset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *zconfget_in (void );
+
+void zconfset_in  (FILE * in_str  );
+
+FILE *zconfget_out (void );
+
+void zconfset_out  (FILE * out_str  );
+
+yy_size_t zconfget_leng (void );
+
+char *zconfget_text (void );
+
+int zconfget_lineno (void );
+
+void zconfset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int zconfwrap (void );
+#else
+extern int zconfwrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( zconftext, zconfleng, 1, zconfout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	errno=0; \
+	while ( (result = read( fileno(zconfin), (char *) buf, max_size )) < 0 ) \
+	{ \
+		if( errno != EINTR) \
+		{ \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+			break; \
+		} \
+		errno=0; \
+		clearerr(zconfin); \
+	}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int zconflex (void);
+
+#define YY_DECL int zconflex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after zconftext and zconfleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+	int str = 0;
+	int ts, i;
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! zconfin )
+			zconfin = stdin;
+
+		if ( ! zconfout )
+			zconfout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			zconfensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				zconf_create_buffer(zconfin,YY_BUF_SIZE );
+		}
+
+		zconf_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of zconftext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		while ( (yy_current_state = yy_nxt[yy_current_state][ yy_ec[YY_SC_TO_UI(*yy_cp)]  ]) > 0 )
+			++yy_cp;
+
+		yy_current_state = -yy_current_state;
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+case 1:
+/* rule 1 can match eol */
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+{
+	current_file->lineno++;
+	return T_EOL;
+}
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+{
+	BEGIN(COMMAND);
+}
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+{
+	unput(zconftext[0]);
+	BEGIN(COMMAND);
+}
+	YY_BREAK
+
+case 6:
+YY_RULE_SETUP
+{
+		const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+		BEGIN(PARAM);
+		current_pos.file = current_file;
+		current_pos.lineno = current_file->lineno;
+		if (id && id->flags & TF_COMMAND) {
+			zconflval.id = id;
+			return id->token;
+		}
+		alloc_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+
+	YY_BREAK
+case 8:
+/* rule 8 can match eol */
+YY_RULE_SETUP
+{
+		BEGIN(INITIAL);
+		current_file->lineno++;
+		return T_EOL;
+	}
+	YY_BREAK
+
+case 9:
+YY_RULE_SETUP
+return T_AND;
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+return T_OR;
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+return T_OPEN_PAREN;
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+return T_CLOSE_PAREN;
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+return T_NOT;
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+return T_EQUAL;
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+return T_UNEQUAL;
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+{
+		str = zconftext[0];
+		new_string();
+		BEGIN(STRING);
+	}
+	YY_BREAK
+case 17:
+/* rule 17 can match eol */
+YY_RULE_SETUP
+BEGIN(INITIAL); current_file->lineno++; return T_EOL;
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+/* ignore */
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+{
+		const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+		if (id && id->flags & TF_PARAM) {
+			zconflval.id = id;
+			return id->token;
+		}
+		alloc_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD;
+	}
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+/* comment */
+	YY_BREAK
+case 21:
+/* rule 21 can match eol */
+YY_RULE_SETUP
+current_file->lineno++;
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+
+	YY_BREAK
+case YY_STATE_EOF(PARAM):
+{
+		BEGIN(INITIAL);
+	}
+	YY_BREAK
+
+case 23:
+/* rule 23 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		append_string(zconftext, zconfleng);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+{
+		append_string(zconftext, zconfleng);
+	}
+	YY_BREAK
+case 25:
+/* rule 25 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		append_string(zconftext + 1, zconfleng - 1);
+		zconflval.string = text;
+		return T_WORD_QUOTE;
+	}
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+{
+		append_string(zconftext + 1, zconfleng - 1);
+	}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+{
+		if (str == zconftext[0]) {
+			BEGIN(PARAM);
+			zconflval.string = text;
+			return T_WORD_QUOTE;
+		} else
+			append_string(zconftext, 1);
+	}
+	YY_BREAK
+case 28:
+/* rule 28 can match eol */
+YY_RULE_SETUP
+{
+		printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+		current_file->lineno++;
+		BEGIN(INITIAL);
+		return T_EOL;
+	}
+	YY_BREAK
+case YY_STATE_EOF(STRING):
+{
+		BEGIN(INITIAL);
+	}
+	YY_BREAK
+
+case 29:
+YY_RULE_SETUP
+{
+		ts = 0;
+		for (i = 0; i < zconfleng; i++) {
+			if (zconftext[i] == '\t')
+				ts = (ts & ~7) + 8;
+			else
+				ts++;
+		}
+		last_ts = ts;
+		if (first_ts) {
+			if (ts < first_ts) {
+				zconf_endhelp();
+				return T_HELPTEXT;
+			}
+			ts -= first_ts;
+			while (ts > 8) {
+				append_string("        ", 8);
+				ts -= 8;
+			}
+			append_string("        ", ts);
+		}
+	}
+	YY_BREAK
+case 30:
+/* rule 30 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+		current_file->lineno++;
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	YY_BREAK
+case 31:
+/* rule 31 can match eol */
+YY_RULE_SETUP
+{
+		current_file->lineno++;
+		append_string("\n", 1);
+	}
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+{
+		while (zconfleng) {
+			if ((zconftext[zconfleng-1] != ' ') && (zconftext[zconfleng-1] != '\t'))
+				break;
+			zconfleng--;
+		}
+		append_string(zconftext, zconfleng);
+		if (!first_ts)
+			first_ts = last_ts;
+	}
+	YY_BREAK
+case YY_STATE_EOF(HELP):
+{
+		zconf_endhelp();
+		return T_HELPTEXT;
+	}
+	YY_BREAK
+
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(COMMAND):
+{
+	if (current_file) {
+		zconf_endfile();
+		return T_EOL;
+	}
+	fclose(zconfin);
+	yyterminate();
+}
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+YY_FATAL_ERROR( "flex scanner jammed" );
+	YY_BREAK
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed zconfin at a new source and called
+			 * zconflex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = zconfin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( zconfwrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * zconftext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of zconflex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					zconfrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			zconfrestart(zconfin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		yy_current_state = yy_nxt[yy_current_state][(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1)];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    
+	yy_current_state = yy_nxt[yy_current_state][1];
+	yy_is_jam = (yy_current_state <= 0);
+
+		return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up zconftext */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					zconfrestart(zconfin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( zconfwrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve zconftext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void zconfrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        zconfensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            zconf_create_buffer(zconfin,YY_BUF_SIZE );
+	}
+
+	zconf_init_buffer(YY_CURRENT_BUFFER,input_file );
+	zconf_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void zconf_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		zconfpop_buffer_state();
+	 *		zconfpush_buffer_state(new_buffer);
+     */
+	zconfensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	zconf_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (zconfwrap()) processing, but the only time this flag
+	 * is looked at is after zconfwrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void zconf_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	zconfin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE zconf_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) zconfalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	zconf_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with zconf_create_buffer()
+ * 
+ */
+    void zconf_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		zconffree((void *) b->yy_ch_buf  );
+
+	zconffree((void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a zconfrestart() or at EOF.
+ */
+    static void zconf_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	zconf_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then zconf_init_buffer was _probably_
+     * called from zconfrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void zconf_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		zconf_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	zconfensure_buffer_stack();
+
+	/* This block is copied from zconf_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from zconf_switch_to_buffer. */
+	zconf_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void zconfpop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	zconf_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		zconf_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void zconfensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)zconfrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	zconf_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to zconflex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       zconf_scan_bytes() instead.
+ */
+YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr )
+{
+    
+	return zconf_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to zconflex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE zconf_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) zconfalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = zconf_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in zconf_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		zconftext[zconfleng] = (yy_hold_char); \
+		(yy_c_buf_p) = zconftext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		zconfleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int zconfget_lineno  (void)
+{
+        
+    return zconflineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *zconfget_in  (void)
+{
+        return zconfin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *zconfget_out  (void)
+{
+        return zconfout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t zconfget_leng  (void)
+{
+        return zconfleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *zconfget_text  (void)
+{
+        return zconftext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void zconfset_lineno (int  line_number )
+{
+    
+    zconflineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see zconf_switch_to_buffer
+ */
+void zconfset_in (FILE *  in_str )
+{
+        zconfin = in_str ;
+}
+
+void zconfset_out (FILE *  out_str )
+{
+        zconfout = out_str ;
+}
+
+int zconfget_debug  (void)
+{
+        return zconf_flex_debug;
+}
+
+void zconfset_debug (int  bdebug )
+{
+        zconf_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from zconflex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    zconfin = stdin;
+    zconfout = stdout;
+#else
+    zconfin = (FILE *) 0;
+    zconfout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * zconflex_init()
+     */
+    return 0;
+}
+
+/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
+int zconflex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		zconf_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		zconfpop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	zconffree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * zconflex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *zconfalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *zconfrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void zconffree (void * ptr )
+{
+	free( (char *) ptr );	/* see zconfrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+void zconf_starthelp(void)
+{
+	new_string();
+	last_ts = first_ts = 0;
+	BEGIN(HELP);
+}
+
+static void zconf_endhelp(void)
+{
+	zconflval.string = text;
+	BEGIN(INITIAL);
+}
+
+/*
+ * Try to open specified file with following names:
+ * ./name
+ * $(srctree)/name
+ * The latter is used when srctree is separate from objtree
+ * when compiling the kernel.
+ * Return NULL if file is not found.
+ */
+FILE *zconf_fopen(const char *name)
+{
+	char *env, fullname[PATH_MAX+1];
+	FILE *f;
+
+	f = fopen(name, "r");
+	if (!f && name != NULL && name[0] != '/') {
+		env = getenv(SRCTREE);
+		if (env) {
+			sprintf(fullname, "%s/%s", env, name);
+			f = fopen(fullname, "r");
+		}
+	}
+	return f;
+}
+
+void zconf_initscan(const char *name)
+{
+	zconfin = zconf_fopen(name);
+	if (!zconfin) {
+		printf("can't find file %s\n", name);
+		exit(1);
+	}
+
+	current_buf = xmalloc(sizeof(*current_buf));
+	memset(current_buf, 0, sizeof(*current_buf));
+
+	current_file = file_lookup(name);
+	current_file->lineno = 1;
+}
+
+static void __zconf_nextfile(const char *name)
+{
+	struct file *iter;
+	struct file *file = file_lookup(name);
+	struct buffer *buf = xmalloc(sizeof(*buf));
+	memset(buf, 0, sizeof(*buf));
+
+	current_buf->state = YY_CURRENT_BUFFER;
+	zconfin = zconf_fopen(file->name);
+	if (!zconfin) {
+		printf("%s:%d: can't open file \"%s\"\n",
+		    zconf_curname(), zconf_lineno(), file->name);
+		exit(1);
+	}
+	zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
+	buf->parent = current_buf;
+	current_buf = buf;
+
+	for (iter = current_file->parent; iter; iter = iter->parent ) {
+		if (!strcmp(current_file->name,iter->name) ) {
+			printf("%s:%d: recursive inclusion detected. "
+			       "Inclusion path:\n  current file : '%s'\n",
+			       zconf_curname(), zconf_lineno(),
+			       zconf_curname());
+			iter = current_file->parent;
+			while (iter && \
+			       strcmp(iter->name,current_file->name)) {
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno-1);
+				iter = iter->parent;
+			}
+			if (iter)
+				printf("  included from: '%s:%d'\n",
+				       iter->name, iter->lineno+1);
+			exit(1);
+		}
+	}
+	file->lineno = 1;
+	file->parent = current_file;
+	current_file = file;
+}
+
+void zconf_nextfile(const char *name)
+{
+	glob_t gl;
+	int err;
+	int i;
+
+	err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
+
+	/* ignore wildcard patterns that return no result */
+	if (err == GLOB_NOMATCH && strchr(name, '*')) {
+		err = 0;
+		gl.gl_pathc = 0;
+	}
+
+	if (err) {
+		const char *reason = "unknown error";
+
+		switch (err) {
+		case GLOB_NOSPACE:
+			reason = "out of memory";
+			break;
+		case GLOB_ABORTED:
+			reason = "read error";
+			break;
+		case GLOB_NOMATCH:
+			reason = "No files found";
+			break;
+		default:
+			break;
+		}
+
+		printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
+			reason, name);
+
+		exit(1);
+	}
+
+	for (i = 0; i < gl.gl_pathc; i++)
+		__zconf_nextfile(gl.gl_pathv[i]);
+}
+
+static void zconf_endfile(void)
+{
+	struct buffer *parent;
+
+	current_file = current_file->parent;
+
+	parent = current_buf->parent;
+	if (parent) {
+		fclose(zconfin);
+		zconf_delete_buffer(YY_CURRENT_BUFFER);
+		zconf_switch_to_buffer(parent->state);
+	}
+	free(current_buf);
+	current_buf = parent;
+}
+
+int zconf_lineno(void)
+{
+	return current_pos.lineno;
+}
+
+const char *zconf_curname(void)
+{
+	return current_pos.file ? current_pos.file->name : "<none>";
+}
+
diff --git a/trunk/scripts/config/zconf.tab.c b/trunk/scripts/config/zconf.tab.c
new file mode 100644
index 00000000..90441d97
--- /dev/null
+++ b/trunk/scripts/config/zconf.tab.c
@@ -0,0 +1,2561 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+/* Substitute the variable and function names.  */
+#define yyparse zconfparse
+#define yylex   zconflex
+#define yyerror zconferror
+#define yylval  zconflval
+#define yychar  zconfchar
+#define yydebug zconfdebug
+#define yynerrs zconfnerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_MAINMENU = 258,
+     T_MENU = 259,
+     T_ENDMENU = 260,
+     T_SOURCE = 261,
+     T_CHOICE = 262,
+     T_ENDCHOICE = 263,
+     T_COMMENT = 264,
+     T_CONFIG = 265,
+     T_MENUCONFIG = 266,
+     T_HELP = 267,
+     T_HELPTEXT = 268,
+     T_IF = 269,
+     T_ENDIF = 270,
+     T_DEPENDS = 271,
+     T_OPTIONAL = 272,
+     T_PROMPT = 273,
+     T_TYPE = 274,
+     T_DEFAULT = 275,
+     T_SELECT = 276,
+     T_RANGE = 277,
+     T_VISIBLE = 278,
+     T_OPTION = 279,
+     T_ON = 280,
+     T_RESET = 281,
+     T_WORD = 282,
+     T_WORD_QUOTE = 283,
+     T_UNEQUAL = 284,
+     T_CLOSE_PAREN = 285,
+     T_OPEN_PAREN = 286,
+     T_EOL = 287,
+     T_OR = 288,
+     T_AND = 289,
+     T_EQUAL = 290,
+     T_NOT = 291
+   };
+#endif
+/* Tokens.  */
+#define T_MAINMENU 258
+#define T_MENU 259
+#define T_ENDMENU 260
+#define T_SOURCE 261
+#define T_CHOICE 262
+#define T_ENDCHOICE 263
+#define T_COMMENT 264
+#define T_CONFIG 265
+#define T_MENUCONFIG 266
+#define T_HELP 267
+#define T_HELPTEXT 268
+#define T_IF 269
+#define T_ENDIF 270
+#define T_DEPENDS 271
+#define T_OPTIONAL 272
+#define T_PROMPT 273
+#define T_TYPE 274
+#define T_DEFAULT 275
+#define T_SELECT 276
+#define T_RANGE 277
+#define T_VISIBLE 278
+#define T_OPTION 279
+#define T_ON 280
+#define T_RESET 281
+#define T_WORD 282
+#define T_WORD_QUOTE 283
+#define T_UNEQUAL 284
+#define T_CLOSE_PAREN 285
+#define T_OPEN_PAREN 286
+#define T_EOL 287
+#define T_OR 288
+#define T_AND 289
+#define T_EQUAL 290
+#define T_NOT 291
+
+
+
+
+/* Copy the first part of user declarations.  */
+
+
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+
+#include "lkc.h"
+
+#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
+
+#define PRINTD		0x0001
+#define DEBUG_PARSE	0x0002
+
+int cdebug = PRINTD;
+
+extern int zconflex(void);
+static void zconfprint(const char *err, ...);
+static void zconf_error(const char *err, ...);
+static void zconferror(const char *err);
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
+
+struct symbol *symbol_hash[SYMBOL_HASHSIZE];
+
+static struct menu *current_menu, *current_entry;
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+
+{
+	char *string;
+	struct file *file;
+	struct symbol *symbol;
+	struct expr *expr;
+	struct menu *menu;
+	const struct kconf_id *id;
+}
+/* Line 193 of yacc.c.  */
+
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Include zconf.hash.c here so it can see the token constants. */
+#include "zconf.hash.c"
+
+
+/* Line 216 of yacc.c.  */
+
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  11
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   308
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  37
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  50
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  121
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  197
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   291
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     6,     8,    11,    13,    14,    17,    20,
+      23,    26,    31,    36,    40,    42,    44,    46,    48,    50,
+      52,    54,    56,    58,    60,    62,    64,    66,    68,    70,
+      74,    77,    81,    84,    88,    91,    92,    95,    98,   101,
+     104,   107,   110,   114,   119,   124,   129,   135,   139,   140,
+     144,   145,   148,   152,   155,   157,   161,   162,   165,   168,
+     171,   174,   177,   182,   186,   189,   193,   198,   199,   202,
+     206,   208,   212,   213,   216,   219,   222,   226,   230,   234,
+     236,   240,   241,   244,   247,   250,   254,   258,   261,   264,
+     267,   268,   271,   274,   277,   282,   286,   287,   290,   293,
+     296,   297,   300,   302,   304,   307,   310,   313,   315,   318,
+     319,   322,   324,   328,   332,   336,   339,   343,   347,   349,
+     351,   352
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      38,     0,    -1,    82,    39,    -1,    39,    -1,    64,    40,
+      -1,    40,    -1,    -1,    40,    42,    -1,    40,    56,    -1,
+      40,    68,    -1,    40,    81,    -1,    40,    27,     1,    32,
+      -1,    40,    41,     1,    32,    -1,    40,     1,    32,    -1,
+      16,    -1,    18,    -1,    19,    -1,    21,    -1,    17,    -1,
+      22,    -1,    20,    -1,    23,    -1,    26,    -1,    32,    -1,
+      62,    -1,    72,    -1,    45,    -1,    47,    -1,    70,    -1,
+      27,     1,    32,    -1,     1,    32,    -1,    10,    27,    32,
+      -1,    44,    48,    -1,    11,    27,    32,    -1,    46,    48,
+      -1,    -1,    48,    49,    -1,    48,    50,    -1,    48,    76,
+      -1,    48,    74,    -1,    48,    43,    -1,    48,    32,    -1,
+      19,    79,    32,    -1,    18,    80,    83,    32,    -1,    20,
+      84,    83,    32,    -1,    21,    27,    83,    32,    -1,    22,
+      85,    85,    83,    32,    -1,    24,    51,    32,    -1,    -1,
+      51,    27,    52,    -1,    -1,    35,    80,    -1,     7,    86,
+      32,    -1,    53,    57,    -1,    81,    -1,    54,    59,    55,
+      -1,    -1,    57,    58,    -1,    57,    76,    -1,    57,    74,
+      -1,    57,    32,    -1,    57,    43,    -1,    18,    80,    83,
+      32,    -1,    19,    79,    32,    -1,    17,    32,    -1,    26,
+      83,    32,    -1,    20,    27,    83,    32,    -1,    -1,    59,
+      42,    -1,    14,    84,    82,    -1,    81,    -1,    60,    63,
+      61,    -1,    -1,    63,    42,    -1,    63,    68,    -1,    63,
+      56,    -1,     3,    80,    82,    -1,     4,    80,    32,    -1,
+      65,    77,    75,    -1,    81,    -1,    66,    69,    67,    -1,
+      -1,    69,    42,    -1,    69,    68,    -1,    69,    56,    -1,
+       6,    80,    32,    -1,     9,    80,    32,    -1,    71,    75,
+      -1,    12,    32,    -1,    73,    13,    -1,    -1,    75,    76,
+      -1,    75,    32,    -1,    75,    43,    -1,    16,    25,    84,
+      32,    -1,    16,    84,    32,    -1,    -1,    77,    78,    -1,
+      77,    32,    -1,    23,    83,    -1,    -1,    80,    83,    -1,
+      27,    -1,    28,    -1,     5,    32,    -1,     8,    32,    -1,
+      15,    32,    -1,    32,    -1,    82,    32,    -1,    -1,    14,
+      84,    -1,    85,    -1,    85,    35,    85,    -1,    85,    29,
+      85,    -1,    31,    84,    30,    -1,    36,    84,    -1,    84,
+      33,    84,    -1,    84,    34,    84,    -1,    27,    -1,    28,
+      -1,    -1,    27,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   104,   104,   104,   106,   106,   108,   110,   111,   112,
+     113,   114,   115,   119,   123,   123,   123,   123,   123,   123,
+     123,   123,   123,   127,   128,   129,   130,   131,   132,   136,
+     137,   143,   151,   157,   165,   175,   177,   178,   179,   180,
+     181,   182,   185,   193,   199,   209,   215,   221,   224,   226,
+     237,   238,   243,   252,   257,   265,   268,   270,   271,   272,
+     273,   274,   277,   283,   294,   300,   305,   315,   317,   322,
+     330,   338,   341,   343,   344,   345,   350,   357,   364,   369,
+     377,   380,   382,   383,   384,   387,   395,   402,   409,   415,
+     422,   424,   425,   426,   429,   433,   441,   443,   444,   447,
+     454,   456,   461,   462,   465,   466,   467,   471,   472,   475,
+     476,   479,   480,   481,   482,   483,   484,   485,   488,   489,
+     492,   493
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU",
+  "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG",
+  "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS",
+  "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE",
+  "T_VISIBLE", "T_OPTION", "T_ON", "T_RESET", "T_WORD", "T_WORD_QUOTE",
+  "T_UNEQUAL", "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND",
+  "T_EQUAL", "T_NOT", "$accept", "input", "start", "stmt_list",
+  "option_name", "common_stmt", "option_error", "config_entry_start",
+  "config_stmt", "menuconfig_entry_start", "menuconfig_stmt",
+  "config_option_list", "config_option", "symbol_option",
+  "symbol_option_list", "symbol_option_arg", "choice", "choice_entry",
+  "choice_end", "choice_stmt", "choice_option_list", "choice_option",
+  "choice_block", "if_entry", "if_end", "if_stmt", "if_block",
+  "mainmenu_stmt", "menu", "menu_entry", "menu_end", "menu_stmt",
+  "menu_block", "source_stmt", "comment", "comment_stmt", "help_start",
+  "help", "depends_list", "depends", "visibility_list", "visible",
+  "prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol",
+  "word_opt", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    37,    38,    38,    39,    39,    40,    40,    40,    40,
+      40,    40,    40,    40,    41,    41,    41,    41,    41,    41,
+      41,    41,    41,    42,    42,    42,    42,    42,    42,    43,
+      43,    44,    45,    46,    47,    48,    48,    48,    48,    48,
+      48,    48,    49,    49,    49,    49,    49,    50,    51,    51,
+      52,    52,    53,    54,    55,    56,    57,    57,    57,    57,
+      57,    57,    58,    58,    58,    58,    58,    59,    59,    60,
+      61,    62,    63,    63,    63,    63,    64,    65,    66,    67,
+      68,    69,    69,    69,    69,    70,    71,    72,    73,    74,
+      75,    75,    75,    75,    76,    76,    77,    77,    77,    78,
+      79,    79,    80,    80,    81,    81,    81,    82,    82,    83,
+      83,    84,    84,    84,    84,    84,    84,    84,    85,    85,
+      86,    86
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     2,     1,     2,     1,     0,     2,     2,     2,
+       2,     4,     4,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+       2,     3,     2,     3,     2,     0,     2,     2,     2,     2,
+       2,     2,     3,     4,     4,     4,     5,     3,     0,     3,
+       0,     2,     3,     2,     1,     3,     0,     2,     2,     2,
+       2,     2,     4,     3,     2,     3,     4,     0,     2,     3,
+       1,     3,     0,     2,     2,     2,     3,     3,     3,     1,
+       3,     0,     2,     2,     2,     3,     3,     2,     2,     2,
+       0,     2,     2,     2,     4,     3,     0,     2,     2,     2,
+       0,     2,     1,     1,     2,     2,     2,     1,     2,     0,
+       2,     1,     3,     3,     3,     2,     3,     3,     1,     1,
+       0,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       6,     0,   107,     0,     3,     0,     6,     6,   102,   103,
+       0,     1,     0,     0,     0,     0,   120,     0,     0,     0,
+       0,     0,     0,    14,    18,    15,    16,    20,    17,    19,
+      21,    22,     0,    23,     0,     7,    35,    26,    35,    27,
+      56,    67,     8,    72,    24,    96,    81,     9,    28,    90,
+      25,    10,     0,   108,     2,    76,    13,     0,   104,     0,
+     121,     0,   105,     0,     0,     0,   118,   119,     0,     0,
+       0,   111,   106,     0,     0,     0,     0,     0,     0,     0,
+      90,     0,     0,    77,    85,    52,    86,    31,    33,     0,
+     115,     0,     0,    69,     0,     0,    11,    12,     0,     0,
+       0,     0,   100,     0,     0,     0,    48,     0,    41,    40,
+      36,    37,     0,    39,    38,     0,     0,   100,     0,   109,
+      60,    61,    57,    59,    58,    68,    55,    54,    73,    75,
+      71,    74,    70,   109,    98,     0,    97,    82,    84,    80,
+      83,    79,    92,    93,    91,   114,   116,   117,   113,   112,
+      30,    88,     0,     0,   109,     0,   109,   109,   109,     0,
+       0,     0,    89,    64,   109,     0,   109,     0,     0,    99,
+       0,    95,     0,    42,   101,     0,     0,   109,    50,    47,
+      29,     0,    63,     0,   110,    65,    94,    43,    44,    45,
+       0,     0,    49,    62,    66,    46,    51
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     3,     4,     5,    34,    35,   109,    36,    37,    38,
+      39,    75,   110,   111,   160,   192,    40,    41,   126,    42,
+      77,   122,    78,    43,   130,    44,    79,     6,    45,    46,
+     139,    47,    81,    48,    49,    50,   112,   113,    82,   114,
+      80,   136,   155,   156,    51,     7,   168,    70,    71,    61
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -127
+static const yytype_int16 yypact[] =
+{
+       7,    30,  -127,     9,  -127,   160,  -127,    13,  -127,  -127,
+     -13,  -127,    14,    30,    17,    30,    -4,    21,    30,    35,
+      38,    16,    43,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,    82,  -127,    91,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,   193,  -127,  -127,    72,  -127,    73,  -127,    95,
+    -127,    98,  -127,   101,   112,   124,  -127,  -127,    16,    16,
+      63,    19,  -127,   127,   130,   102,   131,    62,   276,   265,
+       4,   265,   222,  -127,  -127,  -127,  -127,  -127,  -127,    26,
+    -127,    16,    16,    72,    71,    71,  -127,  -127,   152,   153,
+      -7,    30,    30,    16,   161,    71,  -127,   194,  -127,  -127,
+    -127,  -127,   183,  -127,  -127,   173,    30,    30,   179,   203,
+    -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,  -127,   203,  -127,   251,  -127,  -127,  -127,  -127,
+    -127,  -127,  -127,  -127,  -127,  -127,   184,  -127,  -127,  -127,
+    -127,  -127,    16,   260,   203,   189,   203,     8,   203,    71,
+      23,   192,  -127,  -127,   203,   202,   203,    16,   214,  -127,
+     266,  -127,   215,  -127,  -127,   218,   219,   203,   200,  -127,
+    -127,   221,  -127,   231,   139,  -127,  -127,  -127,  -127,  -127,
+     232,    30,  -127,  -127,  -127,  -127,  -127
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -127,  -127,   261,   271,  -127,     6,   -71,  -127,  -127,  -127,
+    -127,   250,  -127,  -127,  -127,  -127,  -127,  -127,  -127,   -46,
+    -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,   110,  -127,  -127,  -127,  -127,  -127,   212,   216,   -69,
+    -127,  -127,   178,    -1,    12,    -9,  -126,   -66,   -90,  -127
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -88
+static const yytype_int16 yytable[] =
+{
+      10,    55,    89,    90,   148,   149,   121,   169,   124,    11,
+       1,   143,    57,   144,    59,   159,     1,    63,   152,     2,
+      66,    67,   167,    60,    68,   146,   147,   133,   172,    69,
+     174,   175,   176,   129,   153,   138,   134,   157,   181,     2,
+     183,    91,    92,    66,    67,    53,    56,    68,    94,    58,
+     178,   190,    69,    62,    95,   179,   145,     8,     9,    91,
+      92,    93,    64,    98,   143,    65,   144,   -53,   -53,   177,
+     -53,   -53,   -53,   -53,    99,    72,   -53,   -53,   100,   115,
+     116,   117,   118,    73,   125,   128,   170,   137,   119,   107,
+     127,   132,    74,   141,   120,     2,    91,    92,    66,    67,
+     154,   184,   -32,    98,    53,    83,   -32,   -32,   -32,   -32,
+     -32,   -32,   -32,   -32,    99,   164,   -32,   -32,   100,   -32,
+     101,   102,   103,   104,   105,   -32,   106,    84,   -32,   107,
+      85,   -34,    98,    86,   108,   -34,   -34,   -34,   -34,   -34,
+     -34,   -34,   -34,    99,    87,   -34,   -34,   100,   -34,   101,
+     102,   103,   104,   105,   -34,   106,    88,   -34,   107,    96,
+      -5,    12,    97,   108,    13,    14,    15,    16,    17,    18,
+      19,    20,    91,    92,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,   150,   151,    31,    32,   158,   131,
+     196,   140,    33,    -4,    12,   161,   162,    13,    14,    15,
+      16,    17,    18,    19,    20,   163,   166,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,   167,    92,    31,
+      32,   173,   -87,    98,   180,    33,   -87,   -87,   -87,   -87,
+     -87,   -87,   -87,   -87,   182,   191,   -87,   -87,   100,   -87,
+     -87,   -87,   -87,   -87,   -87,   -87,   185,   187,   -87,   107,
+     188,   189,    98,   193,   142,   -78,   -78,   -78,   -78,   -78,
+     -78,   -78,   -78,   194,   195,   -78,   -78,   100,    54,    13,
+      14,    15,    16,    17,    18,    19,    20,    52,   107,    21,
+      22,    14,    15,   142,    17,    18,    19,    20,    76,   123,
+      21,    22,   171,    91,    92,   165,   135,    33,   186,    91,
+      92,     0,     0,     0,     0,     0,     0,     0,    33
+};
+
+static const yytype_int16 yycheck[] =
+{
+       1,    10,    68,    69,    94,    95,    77,   133,    77,     0,
+       3,    82,    13,    82,    15,   105,     3,    18,    25,    32,
+      27,    28,    14,    27,    31,    91,    92,    23,   154,    36,
+     156,   157,   158,    79,   100,    81,    32,   103,   164,    32,
+     166,    33,    34,    27,    28,    32,    32,    31,    29,    32,
+      27,   177,    36,    32,    35,    32,    30,    27,    28,    33,
+      34,    70,    27,     1,   135,    27,   135,     5,     6,   159,
+       8,     9,    10,    11,    12,    32,    14,    15,    16,    17,
+      18,    19,    20,     1,    78,    79,   152,    81,    26,    27,
+      78,    79,     1,    81,    32,    32,    33,    34,    27,    28,
+     101,   167,     0,     1,    32,    32,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,   116,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    32,    26,    27,
+      32,     0,     1,    32,    32,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    32,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    32,    26,    27,    32,
+       0,     1,    32,    32,     4,     5,     6,     7,     8,     9,
+      10,    11,    33,    34,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    32,    32,    26,    27,    27,    79,
+     191,    81,    32,     0,     1,     1,    13,     4,     5,     6,
+       7,     8,     9,    10,    11,    32,    27,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    14,    34,    26,
+      27,    32,     0,     1,    32,    32,     4,     5,     6,     7,
+       8,     9,    10,    11,    32,    35,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    32,    32,    26,    27,
+      32,    32,     1,    32,    32,     4,     5,     6,     7,     8,
+       9,    10,    11,    32,    32,    14,    15,    16,     7,     4,
+       5,     6,     7,     8,     9,    10,    11,     6,    27,    14,
+      15,     5,     6,    32,     8,     9,    10,    11,    38,    77,
+      14,    15,    32,    33,    34,   117,    80,    32,    32,    33,
+      34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     3,    32,    38,    39,    40,    64,    82,    27,    28,
+      80,     0,     1,     4,     5,     6,     7,     8,     9,    10,
+      11,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    26,    27,    32,    41,    42,    44,    45,    46,    47,
+      53,    54,    56,    60,    62,    65,    66,    68,    70,    71,
+      72,    81,    40,    32,    39,    82,    32,    80,    32,    80,
+      27,    86,    32,    80,    27,    27,    27,    28,    31,    36,
+      84,    85,    32,     1,     1,    48,    48,    57,    59,    63,
+      77,    69,    75,    32,    32,    32,    32,    32,    32,    84,
+      84,    33,    34,    82,    29,    35,    32,    32,     1,    12,
+      16,    18,    19,    20,    21,    22,    24,    27,    32,    43,
+      49,    50,    73,    74,    76,    17,    18,    19,    20,    26,
+      32,    43,    58,    74,    76,    42,    55,    81,    42,    56,
+      61,    68,    81,    23,    32,    75,    78,    42,    56,    67,
+      68,    81,    32,    43,    76,    30,    84,    84,    85,    85,
+      32,    32,    25,    84,    80,    79,    80,    84,    27,    85,
+      51,     1,    13,    32,    80,    79,    27,    14,    83,    83,
+      84,    32,    83,    32,    83,    83,    83,    85,    27,    32,
+      32,    83,    32,    83,    84,    32,    32,    32,    32,    32,
+      83,    35,    52,    32,    32,    32,    80
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+      case 54: /* "choice_entry" */
+
+	{
+	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+		(yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+	if (current_menu == (yyvaluep->menu))
+		menu_end_menu();
+};
+
+	break;
+      case 60: /* "if_entry" */
+
+	{
+	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+		(yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+	if (current_menu == (yyvaluep->menu))
+		menu_end_menu();
+};
+
+	break;
+      case 66: /* "menu_entry" */
+
+	{
+	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+		(yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+	if (current_menu == (yyvaluep->menu))
+		menu_end_menu();
+};
+
+	break;
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 10:
+
+    { zconf_error("unexpected end statement"); ;}
+    break;
+
+  case 11:
+
+    { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;}
+    break;
+
+  case 12:
+
+    {
+	zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name);
+;}
+    break;
+
+  case 13:
+
+    { zconf_error("invalid statement"); ;}
+    break;
+
+  case 29:
+
+    { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;}
+    break;
+
+  case 30:
+
+    { zconf_error("invalid option"); ;}
+    break;
+
+  case 31:
+
+    {
+	struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 32:
+
+    {
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 33:
+
+    {
+	struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 34:
+
+    {
+	if (current_entry->prompt)
+		current_entry->prompt->type = P_MENU;
+	else
+		zconfprint("warning: menuconfig statement without prompt");
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 42:
+
+    {
+	menu_set_type((yyvsp[(1) - (3)].id)->stype);
+	printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+		zconf_curname(), zconf_lineno(),
+		(yyvsp[(1) - (3)].id)->stype);
+;}
+    break;
+
+  case 43:
+
+    {
+	menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 44:
+
+    {
+	menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) - (4)].expr));
+	if ((yyvsp[(1) - (4)].id)->stype != S_UNKNOWN)
+		menu_set_type((yyvsp[(1) - (4)].id)->stype);
+	printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
+		zconf_curname(), zconf_lineno(),
+		(yyvsp[(1) - (4)].id)->stype);
+;}
+    break;
+
+  case 45:
+
+    {
+	menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 46:
+
+    {
+	menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr));
+	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 49:
+
+    {
+	const struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string)));
+	if (id && id->flags & TF_OPTION)
+		menu_add_option(id->token, (yyvsp[(3) - (3)].string));
+	else
+		zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string));
+	free((yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 50:
+
+    { (yyval.string) = NULL; ;}
+    break;
+
+  case 51:
+
+    { (yyval.string) = (yyvsp[(2) - (2)].string); ;}
+    break;
+
+  case 52:
+
+    {
+	struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE);
+	sym->flags |= SYMBOL_AUTO;
+	menu_add_entry(sym);
+	menu_add_expr(P_CHOICE, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 53:
+
+    {
+	(yyval.menu) = menu_add_menu();
+;}
+    break;
+
+  case 54:
+
+    {
+	if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 62:
+
+    {
+	menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 63:
+
+    {
+	if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) - (3)].id)->stype == S_TRISTATE) {
+		menu_set_type((yyvsp[(1) - (3)].id)->stype);
+		printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+			zconf_curname(), zconf_lineno(),
+			(yyvsp[(1) - (3)].id)->stype);
+	} else
+		YYERROR;
+;}
+    break;
+
+  case 64:
+
+    {
+	current_entry->sym->flags |= SYMBOL_OPTIONAL;
+	printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 65:
+
+    {
+	menu_add_prop(P_RESET, NULL, NULL, (yyvsp[(2) - (3)].expr));
+;}
+    break;
+
+  case 66:
+
+    {
+	if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) {
+		menu_add_symbol(P_DEFAULT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
+		printd(DEBUG_PARSE, "%s:%d:default\n",
+			zconf_curname(), zconf_lineno());
+	} else
+		YYERROR;
+;}
+    break;
+
+  case 69:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
+	menu_add_entry(NULL);
+	menu_add_dep((yyvsp[(2) - (3)].expr));
+	(yyval.menu) = menu_add_menu();
+;}
+    break;
+
+  case 70:
+
+    {
+	if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 76:
+
+    {
+	menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
+;}
+    break;
+
+  case 77:
+
+    {
+	menu_add_entry(NULL);
+	menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
+	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 78:
+
+    {
+	(yyval.menu) = menu_add_menu();
+;}
+    break;
+
+  case 79:
+
+    {
+	if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 85:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+	zconf_nextfile((yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 86:
+
+    {
+	menu_add_entry(NULL);
+	menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL);
+	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 87:
+
+    {
+	menu_end_entry();
+;}
+    break;
+
+  case 88:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
+	zconf_starthelp();
+;}
+    break;
+
+  case 89:
+
+    {
+	current_entry->help = (yyvsp[(2) - (2)].string);
+;}
+    break;
+
+  case 94:
+
+    {
+	menu_add_dep((yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 95:
+
+    {
+	menu_add_dep((yyvsp[(2) - (3)].expr));
+	zconfprint("warning: deprecated 'depends' syntax, use 'depends on' instead.");
+;}
+    break;
+
+  case 99:
+
+    {
+	menu_add_visibility((yyvsp[(2) - (2)].expr));
+;}
+    break;
+
+  case 101:
+
+    {
+	menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr));
+;}
+    break;
+
+  case 104:
+
+    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    break;
+
+  case 105:
+
+    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    break;
+
+  case 106:
+
+    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    break;
+
+  case 109:
+
+    { (yyval.expr) = NULL; ;}
+    break;
+
+  case 110:
+
+    { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
+    break;
+
+  case 111:
+
+    { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;}
+    break;
+
+  case 112:
+
+    { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
+    break;
+
+  case 113:
+
+    { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
+    break;
+
+  case 114:
+
+    { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;}
+    break;
+
+  case 115:
+
+    { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;}
+    break;
+
+  case 116:
+
+    { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
+    break;
+
+  case 117:
+
+    { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
+    break;
+
+  case 118:
+
+    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;}
+    break;
+
+  case 119:
+
+    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
+    break;
+
+  case 120:
+
+    { (yyval.string) = NULL; ;}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+
+
+
+void conf_parse(const char *name)
+{
+	struct symbol *sym;
+	int i;
+
+	zconf_initscan(name);
+
+	sym_init();
+	_menu_init();
+	modules_sym = sym_lookup(NULL, 0);
+	modules_sym->type = S_BOOLEAN;
+	modules_sym->flags |= SYMBOL_AUTO;
+	rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
+
+#if YYDEBUG
+	if (getenv("ZCONF_DEBUG"))
+		zconfdebug = 1;
+#endif
+	zconfparse();
+	if (zconfnerrs)
+		exit(1);
+	if (!modules_sym->prop) {
+		struct property *prop;
+
+		prop = prop_alloc(P_DEFAULT, modules_sym);
+		prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
+	}
+
+	rootmenu.prompt->text = _(rootmenu.prompt->text);
+	rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
+
+	menu_finalize(&rootmenu);
+	for_all_symbols(i, sym) {
+		if (sym_check_deps(sym))
+			zconfnerrs++;
+        }
+	if (zconfnerrs)
+		exit(1);
+	sym_set_change_count(1);
+}
+
+static const char *zconf_tokenname(int token)
+{
+	switch (token) {
+	case T_MENU:		return "menu";
+	case T_ENDMENU:		return "endmenu";
+	case T_CHOICE:		return "choice";
+	case T_ENDCHOICE:	return "endchoice";
+	case T_IF:		return "if";
+	case T_ENDIF:		return "endif";
+	case T_DEPENDS:		return "depends";
+	case T_VISIBLE:		return "visible";
+	}
+	return "<token>";
+}
+
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
+{
+	if (id->token != endtoken) {
+		zconf_error("unexpected '%s' within %s block",
+			kconf_id_strings + id->name, zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	if (current_menu->file != current_file) {
+		zconf_error("'%s' in different file than '%s'",
+			kconf_id_strings + id->name, zconf_tokenname(starttoken));
+		fprintf(stderr, "%s:%d: location of the '%s'\n",
+			current_menu->file->name, current_menu->lineno,
+			zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	return true;
+}
+
+static void zconfprint(const char *err, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconf_error(const char *err, ...)
+{
+	va_list ap;
+
+	zconfnerrs++;
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconferror(const char *err)
+{
+	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+}
+
+static void print_quoted_string(FILE *out, const char *str)
+{
+	const char *p;
+	int len;
+
+	putc('"', out);
+	while ((p = strchr(str, '"'))) {
+		len = p - str;
+		if (len)
+			fprintf(out, "%.*s", len, str);
+		fputs("\\\"", out);
+		str = p + 1;
+	}
+	fputs(str, out);
+	putc('"', out);
+}
+
+static void print_symbol(FILE *out, struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	struct property *prop;
+
+	if (sym_is_choice(sym))
+		fprintf(out, "\nchoice\n");
+	else
+		fprintf(out, "\nconfig %s\n", sym->name);
+	switch (sym->type) {
+	case S_BOOLEAN:
+		fputs("  boolean\n", out);
+		break;
+	case S_TRISTATE:
+		fputs("  tristate\n", out);
+		break;
+	case S_STRING:
+		fputs("  string\n", out);
+		break;
+	case S_INT:
+		fputs("  integer\n", out);
+		break;
+	case S_HEX:
+		fputs("  hex\n", out);
+		break;
+	default:
+		fputs("  ???\n", out);
+		break;
+	}
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu != menu)
+			continue;
+		switch (prop->type) {
+		case P_PROMPT:
+			fputs("  prompt ", out);
+			print_quoted_string(out, prop->text);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_DEFAULT:
+			fputs( "  default ", out);
+			expr_fprint(prop->expr, out);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_CHOICE:
+			fputs("  #choice value\n", out);
+			break;
+		case P_SELECT:
+			fputs( "  select ", out);
+			expr_fprint(prop->expr, out);
+			fputc('\n', out);
+			break;
+		case P_RANGE:
+			fputs( "  range ", out);
+			expr_fprint(prop->expr, out);
+			fputc('\n', out);
+			break;
+		case P_MENU:
+			fputs( "  menu ", out);
+			print_quoted_string(out, prop->text);
+			fputc('\n', out);
+			break;
+		default:
+			fprintf(out, "  unknown prop %d!\n", prop->type);
+			break;
+		}
+	}
+	if (menu->help) {
+		int len = strlen(menu->help);
+		while (menu->help[--len] == '\n')
+			menu->help[len] = 0;
+		fprintf(out, "  help\n%s\n", menu->help);
+	}
+}
+
+void zconfdump(FILE *out)
+{
+	struct property *prop;
+	struct symbol *sym;
+	struct menu *menu;
+
+	menu = rootmenu.list;
+	while (menu) {
+		if ((sym = menu->sym))
+			print_symbol(out, menu);
+		else if ((prop = menu->prompt)) {
+			switch (prop->type) {
+			case P_COMMENT:
+				fputs("\ncomment ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			case P_MENU:
+				fputs("\nmenu ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			default:
+				;
+			}
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs("  depends ", out);
+				expr_fprint(prop->visible.expr, out);
+				fputc('\n', out);
+			}
+		}
+
+		if (menu->list)
+			menu = menu->list;
+		else if (menu->next)
+			menu = menu->next;
+		else while ((menu = menu->parent)) {
+			if (menu->prompt && menu->prompt->type == P_MENU)
+				fputs("\nendmenu\n", out);
+			if (menu->next) {
+				menu = menu->next;
+				break;
+			}
+		}
+	}
+}
+
+#include "zconf.lex.c"
+#include "util.c"
+#include "confdata.c"
+#include "expr.c"
+#include "symbol.c"
+#include "menu.c"
+
diff --git a/trunk/scripts/config/zconf.tab.c_shipped b/trunk/scripts/config/zconf.tab.c_shipped
new file mode 100644
index 00000000..90441d97
--- /dev/null
+++ b/trunk/scripts/config/zconf.tab.c_shipped
@@ -0,0 +1,2561 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+/* Substitute the variable and function names.  */
+#define yyparse zconfparse
+#define yylex   zconflex
+#define yyerror zconferror
+#define yylval  zconflval
+#define yychar  zconfchar
+#define yydebug zconfdebug
+#define yynerrs zconfnerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_MAINMENU = 258,
+     T_MENU = 259,
+     T_ENDMENU = 260,
+     T_SOURCE = 261,
+     T_CHOICE = 262,
+     T_ENDCHOICE = 263,
+     T_COMMENT = 264,
+     T_CONFIG = 265,
+     T_MENUCONFIG = 266,
+     T_HELP = 267,
+     T_HELPTEXT = 268,
+     T_IF = 269,
+     T_ENDIF = 270,
+     T_DEPENDS = 271,
+     T_OPTIONAL = 272,
+     T_PROMPT = 273,
+     T_TYPE = 274,
+     T_DEFAULT = 275,
+     T_SELECT = 276,
+     T_RANGE = 277,
+     T_VISIBLE = 278,
+     T_OPTION = 279,
+     T_ON = 280,
+     T_RESET = 281,
+     T_WORD = 282,
+     T_WORD_QUOTE = 283,
+     T_UNEQUAL = 284,
+     T_CLOSE_PAREN = 285,
+     T_OPEN_PAREN = 286,
+     T_EOL = 287,
+     T_OR = 288,
+     T_AND = 289,
+     T_EQUAL = 290,
+     T_NOT = 291
+   };
+#endif
+/* Tokens.  */
+#define T_MAINMENU 258
+#define T_MENU 259
+#define T_ENDMENU 260
+#define T_SOURCE 261
+#define T_CHOICE 262
+#define T_ENDCHOICE 263
+#define T_COMMENT 264
+#define T_CONFIG 265
+#define T_MENUCONFIG 266
+#define T_HELP 267
+#define T_HELPTEXT 268
+#define T_IF 269
+#define T_ENDIF 270
+#define T_DEPENDS 271
+#define T_OPTIONAL 272
+#define T_PROMPT 273
+#define T_TYPE 274
+#define T_DEFAULT 275
+#define T_SELECT 276
+#define T_RANGE 277
+#define T_VISIBLE 278
+#define T_OPTION 279
+#define T_ON 280
+#define T_RESET 281
+#define T_WORD 282
+#define T_WORD_QUOTE 283
+#define T_UNEQUAL 284
+#define T_CLOSE_PAREN 285
+#define T_OPEN_PAREN 286
+#define T_EOL 287
+#define T_OR 288
+#define T_AND 289
+#define T_EQUAL 290
+#define T_NOT 291
+
+
+
+
+/* Copy the first part of user declarations.  */
+
+
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+
+#include "lkc.h"
+
+#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
+
+#define PRINTD		0x0001
+#define DEBUG_PARSE	0x0002
+
+int cdebug = PRINTD;
+
+extern int zconflex(void);
+static void zconfprint(const char *err, ...);
+static void zconf_error(const char *err, ...);
+static void zconferror(const char *err);
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
+
+struct symbol *symbol_hash[SYMBOL_HASHSIZE];
+
+static struct menu *current_menu, *current_entry;
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+
+{
+	char *string;
+	struct file *file;
+	struct symbol *symbol;
+	struct expr *expr;
+	struct menu *menu;
+	const struct kconf_id *id;
+}
+/* Line 193 of yacc.c.  */
+
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Include zconf.hash.c here so it can see the token constants. */
+#include "zconf.hash.c"
+
+
+/* Line 216 of yacc.c.  */
+
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  11
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   308
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  37
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  50
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  121
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  197
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   291
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     6,     8,    11,    13,    14,    17,    20,
+      23,    26,    31,    36,    40,    42,    44,    46,    48,    50,
+      52,    54,    56,    58,    60,    62,    64,    66,    68,    70,
+      74,    77,    81,    84,    88,    91,    92,    95,    98,   101,
+     104,   107,   110,   114,   119,   124,   129,   135,   139,   140,
+     144,   145,   148,   152,   155,   157,   161,   162,   165,   168,
+     171,   174,   177,   182,   186,   189,   193,   198,   199,   202,
+     206,   208,   212,   213,   216,   219,   222,   226,   230,   234,
+     236,   240,   241,   244,   247,   250,   254,   258,   261,   264,
+     267,   268,   271,   274,   277,   282,   286,   287,   290,   293,
+     296,   297,   300,   302,   304,   307,   310,   313,   315,   318,
+     319,   322,   324,   328,   332,   336,   339,   343,   347,   349,
+     351,   352
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      38,     0,    -1,    82,    39,    -1,    39,    -1,    64,    40,
+      -1,    40,    -1,    -1,    40,    42,    -1,    40,    56,    -1,
+      40,    68,    -1,    40,    81,    -1,    40,    27,     1,    32,
+      -1,    40,    41,     1,    32,    -1,    40,     1,    32,    -1,
+      16,    -1,    18,    -1,    19,    -1,    21,    -1,    17,    -1,
+      22,    -1,    20,    -1,    23,    -1,    26,    -1,    32,    -1,
+      62,    -1,    72,    -1,    45,    -1,    47,    -1,    70,    -1,
+      27,     1,    32,    -1,     1,    32,    -1,    10,    27,    32,
+      -1,    44,    48,    -1,    11,    27,    32,    -1,    46,    48,
+      -1,    -1,    48,    49,    -1,    48,    50,    -1,    48,    76,
+      -1,    48,    74,    -1,    48,    43,    -1,    48,    32,    -1,
+      19,    79,    32,    -1,    18,    80,    83,    32,    -1,    20,
+      84,    83,    32,    -1,    21,    27,    83,    32,    -1,    22,
+      85,    85,    83,    32,    -1,    24,    51,    32,    -1,    -1,
+      51,    27,    52,    -1,    -1,    35,    80,    -1,     7,    86,
+      32,    -1,    53,    57,    -1,    81,    -1,    54,    59,    55,
+      -1,    -1,    57,    58,    -1,    57,    76,    -1,    57,    74,
+      -1,    57,    32,    -1,    57,    43,    -1,    18,    80,    83,
+      32,    -1,    19,    79,    32,    -1,    17,    32,    -1,    26,
+      83,    32,    -1,    20,    27,    83,    32,    -1,    -1,    59,
+      42,    -1,    14,    84,    82,    -1,    81,    -1,    60,    63,
+      61,    -1,    -1,    63,    42,    -1,    63,    68,    -1,    63,
+      56,    -1,     3,    80,    82,    -1,     4,    80,    32,    -1,
+      65,    77,    75,    -1,    81,    -1,    66,    69,    67,    -1,
+      -1,    69,    42,    -1,    69,    68,    -1,    69,    56,    -1,
+       6,    80,    32,    -1,     9,    80,    32,    -1,    71,    75,
+      -1,    12,    32,    -1,    73,    13,    -1,    -1,    75,    76,
+      -1,    75,    32,    -1,    75,    43,    -1,    16,    25,    84,
+      32,    -1,    16,    84,    32,    -1,    -1,    77,    78,    -1,
+      77,    32,    -1,    23,    83,    -1,    -1,    80,    83,    -1,
+      27,    -1,    28,    -1,     5,    32,    -1,     8,    32,    -1,
+      15,    32,    -1,    32,    -1,    82,    32,    -1,    -1,    14,
+      84,    -1,    85,    -1,    85,    35,    85,    -1,    85,    29,
+      85,    -1,    31,    84,    30,    -1,    36,    84,    -1,    84,
+      33,    84,    -1,    84,    34,    84,    -1,    27,    -1,    28,
+      -1,    -1,    27,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   104,   104,   104,   106,   106,   108,   110,   111,   112,
+     113,   114,   115,   119,   123,   123,   123,   123,   123,   123,
+     123,   123,   123,   127,   128,   129,   130,   131,   132,   136,
+     137,   143,   151,   157,   165,   175,   177,   178,   179,   180,
+     181,   182,   185,   193,   199,   209,   215,   221,   224,   226,
+     237,   238,   243,   252,   257,   265,   268,   270,   271,   272,
+     273,   274,   277,   283,   294,   300,   305,   315,   317,   322,
+     330,   338,   341,   343,   344,   345,   350,   357,   364,   369,
+     377,   380,   382,   383,   384,   387,   395,   402,   409,   415,
+     422,   424,   425,   426,   429,   433,   441,   443,   444,   447,
+     454,   456,   461,   462,   465,   466,   467,   471,   472,   475,
+     476,   479,   480,   481,   482,   483,   484,   485,   488,   489,
+     492,   493
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU",
+  "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG",
+  "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS",
+  "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE",
+  "T_VISIBLE", "T_OPTION", "T_ON", "T_RESET", "T_WORD", "T_WORD_QUOTE",
+  "T_UNEQUAL", "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND",
+  "T_EQUAL", "T_NOT", "$accept", "input", "start", "stmt_list",
+  "option_name", "common_stmt", "option_error", "config_entry_start",
+  "config_stmt", "menuconfig_entry_start", "menuconfig_stmt",
+  "config_option_list", "config_option", "symbol_option",
+  "symbol_option_list", "symbol_option_arg", "choice", "choice_entry",
+  "choice_end", "choice_stmt", "choice_option_list", "choice_option",
+  "choice_block", "if_entry", "if_end", "if_stmt", "if_block",
+  "mainmenu_stmt", "menu", "menu_entry", "menu_end", "menu_stmt",
+  "menu_block", "source_stmt", "comment", "comment_stmt", "help_start",
+  "help", "depends_list", "depends", "visibility_list", "visible",
+  "prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol",
+  "word_opt", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    37,    38,    38,    39,    39,    40,    40,    40,    40,
+      40,    40,    40,    40,    41,    41,    41,    41,    41,    41,
+      41,    41,    41,    42,    42,    42,    42,    42,    42,    43,
+      43,    44,    45,    46,    47,    48,    48,    48,    48,    48,
+      48,    48,    49,    49,    49,    49,    49,    50,    51,    51,
+      52,    52,    53,    54,    55,    56,    57,    57,    57,    57,
+      57,    57,    58,    58,    58,    58,    58,    59,    59,    60,
+      61,    62,    63,    63,    63,    63,    64,    65,    66,    67,
+      68,    69,    69,    69,    69,    70,    71,    72,    73,    74,
+      75,    75,    75,    75,    76,    76,    77,    77,    77,    78,
+      79,    79,    80,    80,    81,    81,    81,    82,    82,    83,
+      83,    84,    84,    84,    84,    84,    84,    84,    85,    85,
+      86,    86
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     2,     1,     2,     1,     0,     2,     2,     2,
+       2,     4,     4,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+       2,     3,     2,     3,     2,     0,     2,     2,     2,     2,
+       2,     2,     3,     4,     4,     4,     5,     3,     0,     3,
+       0,     2,     3,     2,     1,     3,     0,     2,     2,     2,
+       2,     2,     4,     3,     2,     3,     4,     0,     2,     3,
+       1,     3,     0,     2,     2,     2,     3,     3,     3,     1,
+       3,     0,     2,     2,     2,     3,     3,     2,     2,     2,
+       0,     2,     2,     2,     4,     3,     0,     2,     2,     2,
+       0,     2,     1,     1,     2,     2,     2,     1,     2,     0,
+       2,     1,     3,     3,     3,     2,     3,     3,     1,     1,
+       0,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       6,     0,   107,     0,     3,     0,     6,     6,   102,   103,
+       0,     1,     0,     0,     0,     0,   120,     0,     0,     0,
+       0,     0,     0,    14,    18,    15,    16,    20,    17,    19,
+      21,    22,     0,    23,     0,     7,    35,    26,    35,    27,
+      56,    67,     8,    72,    24,    96,    81,     9,    28,    90,
+      25,    10,     0,   108,     2,    76,    13,     0,   104,     0,
+     121,     0,   105,     0,     0,     0,   118,   119,     0,     0,
+       0,   111,   106,     0,     0,     0,     0,     0,     0,     0,
+      90,     0,     0,    77,    85,    52,    86,    31,    33,     0,
+     115,     0,     0,    69,     0,     0,    11,    12,     0,     0,
+       0,     0,   100,     0,     0,     0,    48,     0,    41,    40,
+      36,    37,     0,    39,    38,     0,     0,   100,     0,   109,
+      60,    61,    57,    59,    58,    68,    55,    54,    73,    75,
+      71,    74,    70,   109,    98,     0,    97,    82,    84,    80,
+      83,    79,    92,    93,    91,   114,   116,   117,   113,   112,
+      30,    88,     0,     0,   109,     0,   109,   109,   109,     0,
+       0,     0,    89,    64,   109,     0,   109,     0,     0,    99,
+       0,    95,     0,    42,   101,     0,     0,   109,    50,    47,
+      29,     0,    63,     0,   110,    65,    94,    43,    44,    45,
+       0,     0,    49,    62,    66,    46,    51
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     3,     4,     5,    34,    35,   109,    36,    37,    38,
+      39,    75,   110,   111,   160,   192,    40,    41,   126,    42,
+      77,   122,    78,    43,   130,    44,    79,     6,    45,    46,
+     139,    47,    81,    48,    49,    50,   112,   113,    82,   114,
+      80,   136,   155,   156,    51,     7,   168,    70,    71,    61
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -127
+static const yytype_int16 yypact[] =
+{
+       7,    30,  -127,     9,  -127,   160,  -127,    13,  -127,  -127,
+     -13,  -127,    14,    30,    17,    30,    -4,    21,    30,    35,
+      38,    16,    43,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,    82,  -127,    91,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,   193,  -127,  -127,    72,  -127,    73,  -127,    95,
+    -127,    98,  -127,   101,   112,   124,  -127,  -127,    16,    16,
+      63,    19,  -127,   127,   130,   102,   131,    62,   276,   265,
+       4,   265,   222,  -127,  -127,  -127,  -127,  -127,  -127,    26,
+    -127,    16,    16,    72,    71,    71,  -127,  -127,   152,   153,
+      -7,    30,    30,    16,   161,    71,  -127,   194,  -127,  -127,
+    -127,  -127,   183,  -127,  -127,   173,    30,    30,   179,   203,
+    -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,  -127,  -127,   203,  -127,   251,  -127,  -127,  -127,  -127,
+    -127,  -127,  -127,  -127,  -127,  -127,   184,  -127,  -127,  -127,
+    -127,  -127,    16,   260,   203,   189,   203,     8,   203,    71,
+      23,   192,  -127,  -127,   203,   202,   203,    16,   214,  -127,
+     266,  -127,   215,  -127,  -127,   218,   219,   203,   200,  -127,
+    -127,   221,  -127,   231,   139,  -127,  -127,  -127,  -127,  -127,
+     232,    30,  -127,  -127,  -127,  -127,  -127
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -127,  -127,   261,   271,  -127,     6,   -71,  -127,  -127,  -127,
+    -127,   250,  -127,  -127,  -127,  -127,  -127,  -127,  -127,   -46,
+    -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,  -127,
+    -127,   110,  -127,  -127,  -127,  -127,  -127,   212,   216,   -69,
+    -127,  -127,   178,    -1,    12,    -9,  -126,   -66,   -90,  -127
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -88
+static const yytype_int16 yytable[] =
+{
+      10,    55,    89,    90,   148,   149,   121,   169,   124,    11,
+       1,   143,    57,   144,    59,   159,     1,    63,   152,     2,
+      66,    67,   167,    60,    68,   146,   147,   133,   172,    69,
+     174,   175,   176,   129,   153,   138,   134,   157,   181,     2,
+     183,    91,    92,    66,    67,    53,    56,    68,    94,    58,
+     178,   190,    69,    62,    95,   179,   145,     8,     9,    91,
+      92,    93,    64,    98,   143,    65,   144,   -53,   -53,   177,
+     -53,   -53,   -53,   -53,    99,    72,   -53,   -53,   100,   115,
+     116,   117,   118,    73,   125,   128,   170,   137,   119,   107,
+     127,   132,    74,   141,   120,     2,    91,    92,    66,    67,
+     154,   184,   -32,    98,    53,    83,   -32,   -32,   -32,   -32,
+     -32,   -32,   -32,   -32,    99,   164,   -32,   -32,   100,   -32,
+     101,   102,   103,   104,   105,   -32,   106,    84,   -32,   107,
+      85,   -34,    98,    86,   108,   -34,   -34,   -34,   -34,   -34,
+     -34,   -34,   -34,    99,    87,   -34,   -34,   100,   -34,   101,
+     102,   103,   104,   105,   -34,   106,    88,   -34,   107,    96,
+      -5,    12,    97,   108,    13,    14,    15,    16,    17,    18,
+      19,    20,    91,    92,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,   150,   151,    31,    32,   158,   131,
+     196,   140,    33,    -4,    12,   161,   162,    13,    14,    15,
+      16,    17,    18,    19,    20,   163,   166,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,   167,    92,    31,
+      32,   173,   -87,    98,   180,    33,   -87,   -87,   -87,   -87,
+     -87,   -87,   -87,   -87,   182,   191,   -87,   -87,   100,   -87,
+     -87,   -87,   -87,   -87,   -87,   -87,   185,   187,   -87,   107,
+     188,   189,    98,   193,   142,   -78,   -78,   -78,   -78,   -78,
+     -78,   -78,   -78,   194,   195,   -78,   -78,   100,    54,    13,
+      14,    15,    16,    17,    18,    19,    20,    52,   107,    21,
+      22,    14,    15,   142,    17,    18,    19,    20,    76,   123,
+      21,    22,   171,    91,    92,   165,   135,    33,   186,    91,
+      92,     0,     0,     0,     0,     0,     0,     0,    33
+};
+
+static const yytype_int16 yycheck[] =
+{
+       1,    10,    68,    69,    94,    95,    77,   133,    77,     0,
+       3,    82,    13,    82,    15,   105,     3,    18,    25,    32,
+      27,    28,    14,    27,    31,    91,    92,    23,   154,    36,
+     156,   157,   158,    79,   100,    81,    32,   103,   164,    32,
+     166,    33,    34,    27,    28,    32,    32,    31,    29,    32,
+      27,   177,    36,    32,    35,    32,    30,    27,    28,    33,
+      34,    70,    27,     1,   135,    27,   135,     5,     6,   159,
+       8,     9,    10,    11,    12,    32,    14,    15,    16,    17,
+      18,    19,    20,     1,    78,    79,   152,    81,    26,    27,
+      78,    79,     1,    81,    32,    32,    33,    34,    27,    28,
+     101,   167,     0,     1,    32,    32,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,   116,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    32,    26,    27,
+      32,     0,     1,    32,    32,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    32,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    32,    26,    27,    32,
+       0,     1,    32,    32,     4,     5,     6,     7,     8,     9,
+      10,    11,    33,    34,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    32,    32,    26,    27,    27,    79,
+     191,    81,    32,     0,     1,     1,    13,     4,     5,     6,
+       7,     8,     9,    10,    11,    32,    27,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    14,    34,    26,
+      27,    32,     0,     1,    32,    32,     4,     5,     6,     7,
+       8,     9,    10,    11,    32,    35,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    32,    32,    26,    27,
+      32,    32,     1,    32,    32,     4,     5,     6,     7,     8,
+       9,    10,    11,    32,    32,    14,    15,    16,     7,     4,
+       5,     6,     7,     8,     9,    10,    11,     6,    27,    14,
+      15,     5,     6,    32,     8,     9,    10,    11,    38,    77,
+      14,    15,    32,    33,    34,   117,    80,    32,    32,    33,
+      34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     3,    32,    38,    39,    40,    64,    82,    27,    28,
+      80,     0,     1,     4,     5,     6,     7,     8,     9,    10,
+      11,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    26,    27,    32,    41,    42,    44,    45,    46,    47,
+      53,    54,    56,    60,    62,    65,    66,    68,    70,    71,
+      72,    81,    40,    32,    39,    82,    32,    80,    32,    80,
+      27,    86,    32,    80,    27,    27,    27,    28,    31,    36,
+      84,    85,    32,     1,     1,    48,    48,    57,    59,    63,
+      77,    69,    75,    32,    32,    32,    32,    32,    32,    84,
+      84,    33,    34,    82,    29,    35,    32,    32,     1,    12,
+      16,    18,    19,    20,    21,    22,    24,    27,    32,    43,
+      49,    50,    73,    74,    76,    17,    18,    19,    20,    26,
+      32,    43,    58,    74,    76,    42,    55,    81,    42,    56,
+      61,    68,    81,    23,    32,    75,    78,    42,    56,    67,
+      68,    81,    32,    43,    76,    30,    84,    84,    85,    85,
+      32,    32,    25,    84,    80,    79,    80,    84,    27,    85,
+      51,     1,    13,    32,    80,    79,    27,    14,    83,    83,
+      84,    32,    83,    32,    83,    83,    83,    85,    27,    32,
+      32,    83,    32,    83,    84,    32,    32,    32,    32,    32,
+      83,    35,    52,    32,    32,    32,    80
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+      case 54: /* "choice_entry" */
+
+	{
+	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+		(yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+	if (current_menu == (yyvaluep->menu))
+		menu_end_menu();
+};
+
+	break;
+      case 60: /* "if_entry" */
+
+	{
+	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+		(yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+	if (current_menu == (yyvaluep->menu))
+		menu_end_menu();
+};
+
+	break;
+      case 66: /* "menu_entry" */
+
+	{
+	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+		(yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+	if (current_menu == (yyvaluep->menu))
+		menu_end_menu();
+};
+
+	break;
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 10:
+
+    { zconf_error("unexpected end statement"); ;}
+    break;
+
+  case 11:
+
+    { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;}
+    break;
+
+  case 12:
+
+    {
+	zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name);
+;}
+    break;
+
+  case 13:
+
+    { zconf_error("invalid statement"); ;}
+    break;
+
+  case 29:
+
+    { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;}
+    break;
+
+  case 30:
+
+    { zconf_error("invalid option"); ;}
+    break;
+
+  case 31:
+
+    {
+	struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 32:
+
+    {
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 33:
+
+    {
+	struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 34:
+
+    {
+	if (current_entry->prompt)
+		current_entry->prompt->type = P_MENU;
+	else
+		zconfprint("warning: menuconfig statement without prompt");
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 42:
+
+    {
+	menu_set_type((yyvsp[(1) - (3)].id)->stype);
+	printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+		zconf_curname(), zconf_lineno(),
+		(yyvsp[(1) - (3)].id)->stype);
+;}
+    break;
+
+  case 43:
+
+    {
+	menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 44:
+
+    {
+	menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) - (4)].expr));
+	if ((yyvsp[(1) - (4)].id)->stype != S_UNKNOWN)
+		menu_set_type((yyvsp[(1) - (4)].id)->stype);
+	printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
+		zconf_curname(), zconf_lineno(),
+		(yyvsp[(1) - (4)].id)->stype);
+;}
+    break;
+
+  case 45:
+
+    {
+	menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 46:
+
+    {
+	menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr));
+	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 49:
+
+    {
+	const struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string)));
+	if (id && id->flags & TF_OPTION)
+		menu_add_option(id->token, (yyvsp[(3) - (3)].string));
+	else
+		zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string));
+	free((yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 50:
+
+    { (yyval.string) = NULL; ;}
+    break;
+
+  case 51:
+
+    { (yyval.string) = (yyvsp[(2) - (2)].string); ;}
+    break;
+
+  case 52:
+
+    {
+	struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE);
+	sym->flags |= SYMBOL_AUTO;
+	menu_add_entry(sym);
+	menu_add_expr(P_CHOICE, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 53:
+
+    {
+	(yyval.menu) = menu_add_menu();
+;}
+    break;
+
+  case 54:
+
+    {
+	if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 62:
+
+    {
+	menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 63:
+
+    {
+	if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) - (3)].id)->stype == S_TRISTATE) {
+		menu_set_type((yyvsp[(1) - (3)].id)->stype);
+		printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+			zconf_curname(), zconf_lineno(),
+			(yyvsp[(1) - (3)].id)->stype);
+	} else
+		YYERROR;
+;}
+    break;
+
+  case 64:
+
+    {
+	current_entry->sym->flags |= SYMBOL_OPTIONAL;
+	printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 65:
+
+    {
+	menu_add_prop(P_RESET, NULL, NULL, (yyvsp[(2) - (3)].expr));
+;}
+    break;
+
+  case 66:
+
+    {
+	if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) {
+		menu_add_symbol(P_DEFAULT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
+		printd(DEBUG_PARSE, "%s:%d:default\n",
+			zconf_curname(), zconf_lineno());
+	} else
+		YYERROR;
+;}
+    break;
+
+  case 69:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
+	menu_add_entry(NULL);
+	menu_add_dep((yyvsp[(2) - (3)].expr));
+	(yyval.menu) = menu_add_menu();
+;}
+    break;
+
+  case 70:
+
+    {
+	if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 76:
+
+    {
+	menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
+;}
+    break;
+
+  case 77:
+
+    {
+	menu_add_entry(NULL);
+	menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
+	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 78:
+
+    {
+	(yyval.menu) = menu_add_menu();
+;}
+    break;
+
+  case 79:
+
+    {
+	if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
+	}
+;}
+    break;
+
+  case 85:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+	zconf_nextfile((yyvsp[(2) - (3)].string));
+;}
+    break;
+
+  case 86:
+
+    {
+	menu_add_entry(NULL);
+	menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL);
+	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 87:
+
+    {
+	menu_end_entry();
+;}
+    break;
+
+  case 88:
+
+    {
+	printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
+	zconf_starthelp();
+;}
+    break;
+
+  case 89:
+
+    {
+	current_entry->help = (yyvsp[(2) - (2)].string);
+;}
+    break;
+
+  case 94:
+
+    {
+	menu_add_dep((yyvsp[(3) - (4)].expr));
+	printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
+;}
+    break;
+
+  case 95:
+
+    {
+	menu_add_dep((yyvsp[(2) - (3)].expr));
+	zconfprint("warning: deprecated 'depends' syntax, use 'depends on' instead.");
+;}
+    break;
+
+  case 99:
+
+    {
+	menu_add_visibility((yyvsp[(2) - (2)].expr));
+;}
+    break;
+
+  case 101:
+
+    {
+	menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr));
+;}
+    break;
+
+  case 104:
+
+    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    break;
+
+  case 105:
+
+    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    break;
+
+  case 106:
+
+    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    break;
+
+  case 109:
+
+    { (yyval.expr) = NULL; ;}
+    break;
+
+  case 110:
+
+    { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
+    break;
+
+  case 111:
+
+    { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;}
+    break;
+
+  case 112:
+
+    { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
+    break;
+
+  case 113:
+
+    { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
+    break;
+
+  case 114:
+
+    { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;}
+    break;
+
+  case 115:
+
+    { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;}
+    break;
+
+  case 116:
+
+    { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
+    break;
+
+  case 117:
+
+    { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
+    break;
+
+  case 118:
+
+    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;}
+    break;
+
+  case 119:
+
+    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
+    break;
+
+  case 120:
+
+    { (yyval.string) = NULL; ;}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+
+
+
+void conf_parse(const char *name)
+{
+	struct symbol *sym;
+	int i;
+
+	zconf_initscan(name);
+
+	sym_init();
+	_menu_init();
+	modules_sym = sym_lookup(NULL, 0);
+	modules_sym->type = S_BOOLEAN;
+	modules_sym->flags |= SYMBOL_AUTO;
+	rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
+
+#if YYDEBUG
+	if (getenv("ZCONF_DEBUG"))
+		zconfdebug = 1;
+#endif
+	zconfparse();
+	if (zconfnerrs)
+		exit(1);
+	if (!modules_sym->prop) {
+		struct property *prop;
+
+		prop = prop_alloc(P_DEFAULT, modules_sym);
+		prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
+	}
+
+	rootmenu.prompt->text = _(rootmenu.prompt->text);
+	rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
+
+	menu_finalize(&rootmenu);
+	for_all_symbols(i, sym) {
+		if (sym_check_deps(sym))
+			zconfnerrs++;
+        }
+	if (zconfnerrs)
+		exit(1);
+	sym_set_change_count(1);
+}
+
+static const char *zconf_tokenname(int token)
+{
+	switch (token) {
+	case T_MENU:		return "menu";
+	case T_ENDMENU:		return "endmenu";
+	case T_CHOICE:		return "choice";
+	case T_ENDCHOICE:	return "endchoice";
+	case T_IF:		return "if";
+	case T_ENDIF:		return "endif";
+	case T_DEPENDS:		return "depends";
+	case T_VISIBLE:		return "visible";
+	}
+	return "<token>";
+}
+
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
+{
+	if (id->token != endtoken) {
+		zconf_error("unexpected '%s' within %s block",
+			kconf_id_strings + id->name, zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	if (current_menu->file != current_file) {
+		zconf_error("'%s' in different file than '%s'",
+			kconf_id_strings + id->name, zconf_tokenname(starttoken));
+		fprintf(stderr, "%s:%d: location of the '%s'\n",
+			current_menu->file->name, current_menu->lineno,
+			zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	return true;
+}
+
+static void zconfprint(const char *err, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconf_error(const char *err, ...)
+{
+	va_list ap;
+
+	zconfnerrs++;
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconferror(const char *err)
+{
+	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+}
+
+static void print_quoted_string(FILE *out, const char *str)
+{
+	const char *p;
+	int len;
+
+	putc('"', out);
+	while ((p = strchr(str, '"'))) {
+		len = p - str;
+		if (len)
+			fprintf(out, "%.*s", len, str);
+		fputs("\\\"", out);
+		str = p + 1;
+	}
+	fputs(str, out);
+	putc('"', out);
+}
+
+static void print_symbol(FILE *out, struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	struct property *prop;
+
+	if (sym_is_choice(sym))
+		fprintf(out, "\nchoice\n");
+	else
+		fprintf(out, "\nconfig %s\n", sym->name);
+	switch (sym->type) {
+	case S_BOOLEAN:
+		fputs("  boolean\n", out);
+		break;
+	case S_TRISTATE:
+		fputs("  tristate\n", out);
+		break;
+	case S_STRING:
+		fputs("  string\n", out);
+		break;
+	case S_INT:
+		fputs("  integer\n", out);
+		break;
+	case S_HEX:
+		fputs("  hex\n", out);
+		break;
+	default:
+		fputs("  ???\n", out);
+		break;
+	}
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu != menu)
+			continue;
+		switch (prop->type) {
+		case P_PROMPT:
+			fputs("  prompt ", out);
+			print_quoted_string(out, prop->text);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_DEFAULT:
+			fputs( "  default ", out);
+			expr_fprint(prop->expr, out);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_CHOICE:
+			fputs("  #choice value\n", out);
+			break;
+		case P_SELECT:
+			fputs( "  select ", out);
+			expr_fprint(prop->expr, out);
+			fputc('\n', out);
+			break;
+		case P_RANGE:
+			fputs( "  range ", out);
+			expr_fprint(prop->expr, out);
+			fputc('\n', out);
+			break;
+		case P_MENU:
+			fputs( "  menu ", out);
+			print_quoted_string(out, prop->text);
+			fputc('\n', out);
+			break;
+		default:
+			fprintf(out, "  unknown prop %d!\n", prop->type);
+			break;
+		}
+	}
+	if (menu->help) {
+		int len = strlen(menu->help);
+		while (menu->help[--len] == '\n')
+			menu->help[len] = 0;
+		fprintf(out, "  help\n%s\n", menu->help);
+	}
+}
+
+void zconfdump(FILE *out)
+{
+	struct property *prop;
+	struct symbol *sym;
+	struct menu *menu;
+
+	menu = rootmenu.list;
+	while (menu) {
+		if ((sym = menu->sym))
+			print_symbol(out, menu);
+		else if ((prop = menu->prompt)) {
+			switch (prop->type) {
+			case P_COMMENT:
+				fputs("\ncomment ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			case P_MENU:
+				fputs("\nmenu ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			default:
+				;
+			}
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs("  depends ", out);
+				expr_fprint(prop->visible.expr, out);
+				fputc('\n', out);
+			}
+		}
+
+		if (menu->list)
+			menu = menu->list;
+		else if (menu->next)
+			menu = menu->next;
+		else while ((menu = menu->parent)) {
+			if (menu->prompt && menu->prompt->type == P_MENU)
+				fputs("\nendmenu\n", out);
+			if (menu->next) {
+				menu = menu->next;
+				break;
+			}
+		}
+	}
+}
+
+#include "zconf.lex.c"
+#include "util.c"
+#include "confdata.c"
+#include "expr.c"
+#include "symbol.c"
+#include "menu.c"
+
diff --git a/trunk/scripts/config/zconf.y b/trunk/scripts/config/zconf.y
new file mode 100644
index 00000000..d9a9f62c
--- /dev/null
+++ b/trunk/scripts/config/zconf.y
@@ -0,0 +1,752 @@
+%{
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+
+#include "lkc.h"
+
+#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
+
+#define PRINTD		0x0001
+#define DEBUG_PARSE	0x0002
+
+int cdebug = PRINTD;
+
+extern int zconflex(void);
+static void zconfprint(const char *err, ...);
+static void zconf_error(const char *err, ...);
+static void zconferror(const char *err);
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
+
+struct symbol *symbol_hash[SYMBOL_HASHSIZE];
+
+static struct menu *current_menu, *current_entry;
+
+%}
+%expect 30
+
+%union
+{
+	char *string;
+	struct file *file;
+	struct symbol *symbol;
+	struct expr *expr;
+	struct menu *menu;
+	const struct kconf_id *id;
+}
+
+%token <id>T_MAINMENU
+%token <id>T_MENU
+%token <id>T_ENDMENU
+%token <id>T_SOURCE
+%token <id>T_CHOICE
+%token <id>T_ENDCHOICE
+%token <id>T_COMMENT
+%token <id>T_CONFIG
+%token <id>T_MENUCONFIG
+%token <id>T_HELP
+%token <string> T_HELPTEXT
+%token <id>T_IF
+%token <id>T_ENDIF
+%token <id>T_DEPENDS
+%token <id>T_OPTIONAL
+%token <id>T_PROMPT
+%token <id>T_TYPE
+%token <id>T_DEFAULT
+%token <id>T_SELECT
+%token <id>T_RANGE
+%token <id>T_VISIBLE
+%token <id>T_OPTION
+%token <id>T_ON
+%token <id>T_RESET
+%token <string> T_WORD
+%token <string> T_WORD_QUOTE
+%token T_UNEQUAL
+%token T_CLOSE_PAREN
+%token T_OPEN_PAREN
+%token T_EOL
+
+%left T_OR
+%left T_AND
+%left T_EQUAL T_UNEQUAL
+%nonassoc T_NOT
+
+%type <string> prompt
+%type <symbol> symbol
+%type <expr> expr
+%type <expr> if_expr
+%type <id> end
+%type <id> option_name
+%type <menu> if_entry menu_entry choice_entry
+%type <string> symbol_option_arg word_opt
+
+%destructor {
+	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+		$$->file->name, $$->lineno);
+	if (current_menu == $$)
+		menu_end_menu();
+} if_entry menu_entry choice_entry
+
+%{
+/* Include zconf.hash.c here so it can see the token constants. */
+#include "zconf.hash.c"
+%}
+
+%%
+input: nl start | start;
+
+start: mainmenu_stmt stmt_list | stmt_list;
+
+stmt_list:
+	  /* empty */
+	| stmt_list common_stmt
+	| stmt_list choice_stmt
+	| stmt_list menu_stmt
+	| stmt_list end			{ zconf_error("unexpected end statement"); }
+	| stmt_list T_WORD error T_EOL	{ zconf_error("unknown statement \"%s\"", $2); }
+	| stmt_list option_name error T_EOL
+{
+	zconf_error("unexpected option \"%s\"", kconf_id_strings + $2->name);
+}
+	| stmt_list error T_EOL		{ zconf_error("invalid statement"); }
+;
+
+option_name:
+	T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_OPTIONAL | T_RANGE | T_DEFAULT | T_VISIBLE | T_RESET
+;
+
+common_stmt:
+	  T_EOL
+	| if_stmt
+	| comment_stmt
+	| config_stmt
+	| menuconfig_stmt
+	| source_stmt
+;
+
+option_error:
+	  T_WORD error T_EOL		{ zconf_error("unknown option \"%s\"", $1); }
+	| error T_EOL			{ zconf_error("invalid option"); }
+;
+
+
+/* config/menuconfig entry */
+
+config_entry_start: T_CONFIG T_WORD T_EOL
+{
+	struct symbol *sym = sym_lookup($2, 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2);
+};
+
+config_stmt: config_entry_start config_option_list
+{
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+};
+
+menuconfig_entry_start: T_MENUCONFIG T_WORD T_EOL
+{
+	struct symbol *sym = sym_lookup($2, 0);
+	sym->flags |= SYMBOL_OPTIONAL;
+	menu_add_entry(sym);
+	printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), $2);
+};
+
+menuconfig_stmt: menuconfig_entry_start config_option_list
+{
+	if (current_entry->prompt)
+		current_entry->prompt->type = P_MENU;
+	else
+		zconfprint("warning: menuconfig statement without prompt");
+	menu_end_entry();
+	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
+};
+
+config_option_list:
+	  /* empty */
+	| config_option_list config_option
+	| config_option_list symbol_option
+	| config_option_list depends
+	| config_option_list help
+	| config_option_list option_error
+	| config_option_list T_EOL
+;
+
+config_option: T_TYPE prompt_stmt_opt T_EOL
+{
+	menu_set_type($1->stype);
+	printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+		zconf_curname(), zconf_lineno(),
+		$1->stype);
+};
+
+config_option: T_PROMPT prompt if_expr T_EOL
+{
+	menu_add_prompt(P_PROMPT, $2, $3);
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_DEFAULT expr if_expr T_EOL
+{
+	menu_add_expr(P_DEFAULT, $2, $3);
+	if ($1->stype != S_UNKNOWN)
+		menu_set_type($1->stype);
+	printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
+		zconf_curname(), zconf_lineno(),
+		$1->stype);
+};
+
+config_option: T_SELECT T_WORD if_expr T_EOL
+{
+	menu_add_symbol(P_SELECT, sym_lookup($2, 0), $3);
+	printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
+};
+
+config_option: T_RANGE symbol symbol if_expr T_EOL
+{
+	menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,$2, $3), $4);
+	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
+};
+
+symbol_option: T_OPTION symbol_option_list T_EOL
+;
+
+symbol_option_list:
+	  /* empty */
+	| symbol_option_list T_WORD symbol_option_arg
+{
+	const struct kconf_id *id = kconf_id_lookup($2, strlen($2));
+	if (id && id->flags & TF_OPTION)
+		menu_add_option(id->token, $3);
+	else
+		zconfprint("warning: ignoring unknown option %s", $2);
+	free($2);
+};
+
+symbol_option_arg:
+	  /* empty */		{ $$ = NULL; }
+	| T_EQUAL prompt	{ $$ = $2; }
+;
+
+/* choice entry */
+
+choice: T_CHOICE word_opt T_EOL
+{
+	struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE);
+	sym->flags |= SYMBOL_AUTO;
+	menu_add_entry(sym);
+	menu_add_expr(P_CHOICE, NULL, NULL);
+	printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
+};
+
+choice_entry: choice choice_option_list
+{
+	$$ = menu_add_menu();
+};
+
+choice_end: end
+{
+	if (zconf_endtoken($1, T_CHOICE, T_ENDCHOICE)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
+	}
+};
+
+choice_stmt: choice_entry choice_block choice_end
+;
+
+choice_option_list:
+	  /* empty */
+	| choice_option_list choice_option
+	| choice_option_list depends
+	| choice_option_list help
+	| choice_option_list T_EOL
+	| choice_option_list option_error
+;
+
+choice_option: T_PROMPT prompt if_expr T_EOL
+{
+	menu_add_prompt(P_PROMPT, $2, $3);
+	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
+};
+
+choice_option: T_TYPE prompt_stmt_opt T_EOL
+{
+	if ($1->stype == S_BOOLEAN || $1->stype == S_TRISTATE) {
+		menu_set_type($1->stype);
+		printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+			zconf_curname(), zconf_lineno(),
+			$1->stype);
+	} else
+		YYERROR;
+};
+
+choice_option: T_OPTIONAL T_EOL
+{
+	current_entry->sym->flags |= SYMBOL_OPTIONAL;
+	printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
+};
+
+choice_option: T_RESET if_expr T_EOL
+{
+	menu_add_prop(P_RESET, NULL, NULL, $2);
+};
+
+choice_option: T_DEFAULT T_WORD if_expr T_EOL
+{
+	if ($1->stype == S_UNKNOWN) {
+		menu_add_symbol(P_DEFAULT, sym_lookup($2, 0), $3);
+		printd(DEBUG_PARSE, "%s:%d:default\n",
+			zconf_curname(), zconf_lineno());
+	} else
+		YYERROR;
+};
+
+choice_block:
+	  /* empty */
+	| choice_block common_stmt
+;
+
+/* if entry */
+
+if_entry: T_IF expr nl
+{
+	printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
+	menu_add_entry(NULL);
+	menu_add_dep($2);
+	$$ = menu_add_menu();
+};
+
+if_end: end
+{
+	if (zconf_endtoken($1, T_IF, T_ENDIF)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
+	}
+};
+
+if_stmt: if_entry if_block if_end
+;
+
+if_block:
+	  /* empty */
+	| if_block common_stmt
+	| if_block menu_stmt
+	| if_block choice_stmt
+;
+
+/* mainmenu entry */
+
+mainmenu_stmt: T_MAINMENU prompt nl
+{
+	menu_add_prompt(P_MENU, $2, NULL);
+};
+
+/* menu entry */
+
+menu: T_MENU prompt T_EOL
+{
+	menu_add_entry(NULL);
+	menu_add_prompt(P_MENU, $2, NULL);
+	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
+};
+
+menu_entry: menu visibility_list depends_list
+{
+	$$ = menu_add_menu();
+};
+
+menu_end: end
+{
+	if (zconf_endtoken($1, T_MENU, T_ENDMENU)) {
+		menu_end_menu();
+		printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
+	}
+};
+
+menu_stmt: menu_entry menu_block menu_end
+;
+
+menu_block:
+	  /* empty */
+	| menu_block common_stmt
+	| menu_block menu_stmt
+	| menu_block choice_stmt
+;
+
+source_stmt: T_SOURCE prompt T_EOL
+{
+	printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
+	zconf_nextfile($2);
+};
+
+/* comment entry */
+
+comment: T_COMMENT prompt T_EOL
+{
+	menu_add_entry(NULL);
+	menu_add_prompt(P_COMMENT, $2, NULL);
+	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
+};
+
+comment_stmt: comment depends_list
+{
+	menu_end_entry();
+};
+
+/* help option */
+
+help_start: T_HELP T_EOL
+{
+	printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
+	zconf_starthelp();
+};
+
+help: help_start T_HELPTEXT
+{
+	current_entry->help = $2;
+};
+
+/* depends option */
+
+depends_list:
+	  /* empty */
+	| depends_list depends
+	| depends_list T_EOL
+	| depends_list option_error
+;
+
+depends: T_DEPENDS T_ON expr T_EOL
+{
+	menu_add_dep($3);
+	printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
+} | T_DEPENDS expr T_EOL
+{
+	menu_add_dep($2);
+	zconfprint("warning: deprecated 'depends' syntax, use 'depends on' instead.");
+};
+
+/* visibility option */
+
+visibility_list:
+	  /* empty */
+	| visibility_list visible
+	| visibility_list T_EOL
+;
+
+visible: T_VISIBLE if_expr
+{
+	menu_add_visibility($2);
+};
+
+/* prompt statement */
+
+prompt_stmt_opt:
+	  /* empty */
+	| prompt if_expr
+{
+	menu_add_prompt(P_PROMPT, $1, $2);
+};
+
+prompt:	  T_WORD
+	| T_WORD_QUOTE
+;
+
+end:	  T_ENDMENU T_EOL	{ $$ = $1; }
+	| T_ENDCHOICE T_EOL	{ $$ = $1; }
+	| T_ENDIF T_EOL		{ $$ = $1; }
+;
+
+nl:
+	  T_EOL
+	| nl T_EOL
+;
+
+if_expr:  /* empty */			{ $$ = NULL; }
+	| T_IF expr			{ $$ = $2; }
+;
+
+expr:	  symbol				{ $$ = expr_alloc_symbol($1); }
+	| symbol T_EQUAL symbol			{ $$ = expr_alloc_comp(E_EQUAL, $1, $3); }
+	| symbol T_UNEQUAL symbol		{ $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); }
+	| T_OPEN_PAREN expr T_CLOSE_PAREN	{ $$ = $2; }
+	| T_NOT expr				{ $$ = expr_alloc_one(E_NOT, $2); }
+	| expr T_OR expr			{ $$ = expr_alloc_two(E_OR, $1, $3); }
+	| expr T_AND expr			{ $$ = expr_alloc_two(E_AND, $1, $3); }
+;
+
+symbol:	  T_WORD	{ $$ = sym_lookup($1, 0); free($1); }
+	| T_WORD_QUOTE	{ $$ = sym_lookup($1, SYMBOL_CONST); free($1); }
+;
+
+word_opt: /* empty */			{ $$ = NULL; }
+	| T_WORD
+
+%%
+
+void conf_parse(const char *name)
+{
+	struct symbol *sym;
+	int i;
+
+	zconf_initscan(name);
+
+	sym_init();
+	_menu_init();
+	modules_sym = sym_lookup(NULL, 0);
+	modules_sym->type = S_BOOLEAN;
+	modules_sym->flags |= SYMBOL_AUTO;
+	rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
+
+#if YYDEBUG
+	if (getenv("ZCONF_DEBUG"))
+		zconfdebug = 1;
+#endif
+	zconfparse();
+	if (zconfnerrs)
+		exit(1);
+	if (!modules_sym->prop) {
+		struct property *prop;
+
+		prop = prop_alloc(P_DEFAULT, modules_sym);
+		prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
+	}
+
+	rootmenu.prompt->text = _(rootmenu.prompt->text);
+	rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
+
+	menu_finalize(&rootmenu);
+	for_all_symbols(i, sym) {
+		if (sym_check_deps(sym))
+			zconfnerrs++;
+        }
+	if (zconfnerrs)
+		exit(1);
+	sym_set_change_count(1);
+}
+
+static const char *zconf_tokenname(int token)
+{
+	switch (token) {
+	case T_MENU:		return "menu";
+	case T_ENDMENU:		return "endmenu";
+	case T_CHOICE:		return "choice";
+	case T_ENDCHOICE:	return "endchoice";
+	case T_IF:		return "if";
+	case T_ENDIF:		return "endif";
+	case T_DEPENDS:		return "depends";
+	case T_VISIBLE:		return "visible";
+	}
+	return "<token>";
+}
+
+static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
+{
+	if (id->token != endtoken) {
+		zconf_error("unexpected '%s' within %s block",
+			kconf_id_strings + id->name, zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	if (current_menu->file != current_file) {
+		zconf_error("'%s' in different file than '%s'",
+			kconf_id_strings + id->name, zconf_tokenname(starttoken));
+		fprintf(stderr, "%s:%d: location of the '%s'\n",
+			current_menu->file->name, current_menu->lineno,
+			zconf_tokenname(starttoken));
+		zconfnerrs++;
+		return false;
+	}
+	return true;
+}
+
+static void zconfprint(const char *err, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconf_error(const char *err, ...)
+{
+	va_list ap;
+
+	zconfnerrs++;
+	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+	va_start(ap, err);
+	vfprintf(stderr, err, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}
+
+static void zconferror(const char *err)
+{
+	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+}
+
+static void print_quoted_string(FILE *out, const char *str)
+{
+	const char *p;
+	int len;
+
+	putc('"', out);
+	while ((p = strchr(str, '"'))) {
+		len = p - str;
+		if (len)
+			fprintf(out, "%.*s", len, str);
+		fputs("\\\"", out);
+		str = p + 1;
+	}
+	fputs(str, out);
+	putc('"', out);
+}
+
+static void print_symbol(FILE *out, struct menu *menu)
+{
+	struct symbol *sym = menu->sym;
+	struct property *prop;
+
+	if (sym_is_choice(sym))
+		fprintf(out, "\nchoice\n");
+	else
+		fprintf(out, "\nconfig %s\n", sym->name);
+	switch (sym->type) {
+	case S_BOOLEAN:
+		fputs("  boolean\n", out);
+		break;
+	case S_TRISTATE:
+		fputs("  tristate\n", out);
+		break;
+	case S_STRING:
+		fputs("  string\n", out);
+		break;
+	case S_INT:
+		fputs("  integer\n", out);
+		break;
+	case S_HEX:
+		fputs("  hex\n", out);
+		break;
+	default:
+		fputs("  ???\n", out);
+		break;
+	}
+	for (prop = sym->prop; prop; prop = prop->next) {
+		if (prop->menu != menu)
+			continue;
+		switch (prop->type) {
+		case P_PROMPT:
+			fputs("  prompt ", out);
+			print_quoted_string(out, prop->text);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_DEFAULT:
+			fputs( "  default ", out);
+			expr_fprint(prop->expr, out);
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs(" if ", out);
+				expr_fprint(prop->visible.expr, out);
+			}
+			fputc('\n', out);
+			break;
+		case P_CHOICE:
+			fputs("  #choice value\n", out);
+			break;
+		case P_SELECT:
+			fputs( "  select ", out);
+			expr_fprint(prop->expr, out);
+			fputc('\n', out);
+			break;
+		case P_RANGE:
+			fputs( "  range ", out);
+			expr_fprint(prop->expr, out);
+			fputc('\n', out);
+			break;
+		case P_MENU:
+			fputs( "  menu ", out);
+			print_quoted_string(out, prop->text);
+			fputc('\n', out);
+			break;
+		default:
+			fprintf(out, "  unknown prop %d!\n", prop->type);
+			break;
+		}
+	}
+	if (menu->help) {
+		int len = strlen(menu->help);
+		while (menu->help[--len] == '\n')
+			menu->help[len] = 0;
+		fprintf(out, "  help\n%s\n", menu->help);
+	}
+}
+
+void zconfdump(FILE *out)
+{
+	struct property *prop;
+	struct symbol *sym;
+	struct menu *menu;
+
+	menu = rootmenu.list;
+	while (menu) {
+		if ((sym = menu->sym))
+			print_symbol(out, menu);
+		else if ((prop = menu->prompt)) {
+			switch (prop->type) {
+			case P_COMMENT:
+				fputs("\ncomment ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			case P_MENU:
+				fputs("\nmenu ", out);
+				print_quoted_string(out, prop->text);
+				fputs("\n", out);
+				break;
+			default:
+				;
+			}
+			if (!expr_is_yes(prop->visible.expr)) {
+				fputs("  depends ", out);
+				expr_fprint(prop->visible.expr, out);
+				fputc('\n', out);
+			}
+		}
+
+		if (menu->list)
+			menu = menu->list;
+		else if (menu->next)
+			menu = menu->next;
+		else while ((menu = menu->parent)) {
+			if (menu->prompt && menu->prompt->type == P_MENU)
+				fputs("\nendmenu\n", out);
+			if (menu->next) {
+				menu = menu->next;
+				break;
+			}
+		}
+	}
+}
+
+#include "zconf.lex.c"
+#include "util.c"
+#include "confdata.c"
+#include "expr.c"
+#include "symbol.c"
+#include "menu.c"
diff --git a/trunk/scripts/deptest.sh b/trunk/scripts/deptest.sh
new file mode 100755
index 00000000..b8e867cb
--- /dev/null
+++ b/trunk/scripts/deptest.sh
@@ -0,0 +1,211 @@
+#!/bin/bash
+#
+# Automated libreCMC package dependency checker
+#
+# Copyright (C) 2009-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+SCRIPTDIR="$(dirname "$0")"
+[ "${SCRIPTDIR:0:1}" = "/" ] || SCRIPTDIR="$PWD/$SCRIPTDIR"
+BASEDIR="$SCRIPTDIR/.."
+
+DIR="$BASEDIR/tmp/deptest"
+STAMP_DIR_SUCCESS="$DIR/stamp-success"
+STAMP_DIR_FAILED="$DIR/stamp-failed"
+STAMP_DIR_BLACKLIST="$DIR/stamp-blacklist"
+BUILD_DIR="$DIR/build_dir/target"
+BUILD_DIR_HOST="$DIR/build_dir/host"
+KERNEL_BUILD_DIR="$DIR/build_dir/linux"
+STAGING_DIR="$DIR/staging_dir/target"
+STAGING_DIR_HOST="$DIR/staging_dir/host"
+STAGING_DIR_HOST_TMPL="$DIR/staging_dir_host_tmpl"
+BIN_DIR="$DIR/staging_dir/bin_dir"
+LOG_DIR_NAME="logs"
+LOG_DIR="$DIR/$LOG_DIR_NAME"
+
+die()
+{
+	echo "$@"
+	exit 1
+}
+
+usage()
+{
+	echo "deptest.sh [OPTIONS] [PACKAGES]"
+	echo
+	echo "OPTIONS:"
+	echo "  --lean       Run a lean test. Do not clean the build directory for each"
+	echo "               package test."
+	echo "  --force      Force a test, even if a success/blacklist stamp is available"
+	echo "  -j X         Number of make jobs"
+	echo
+	echo "PACKAGES are packages to test. If not specified, all installed packages"
+	echo "will be tested."
+}
+
+deptest_make()
+{
+	local target="$1"
+	shift
+	local logfile="$1"
+	shift
+	make -j$nrjobs "$target" \
+		BUILD_DIR="$BUILD_DIR" \
+		BUILD_DIR_HOST="$BUILD_DIR_HOST" \
+		KERNEL_BUILD_DIR="$KERNEL_BUILD_DIR" \
+		BIN_DIR="$BIN_DIR" \
+		STAGING_DIR="$STAGING_DIR" \
+		STAGING_DIR_HOST="$STAGING_DIR_HOST" \
+		FORCE_HOST_INSTALL=1 \
+		V=99 "$@" >"$LOG_DIR/$logfile" 2>&1
+}
+
+clean_kernel_build_dir()
+{
+	# delete everything, except the kernel build dir "linux-X.X.X"
+	(
+		cd "$KERNEL_BUILD_DIR" || die "Failed to enter kernel build dir"
+		for entry in *; do
+			[ -z "$(echo "$entry" | egrep -e '^linux-*.*.*$')" ] || continue
+			rm -rf "$entry" || die "Failed to clean kernel build dir"
+		done
+	)
+}
+
+stamp_exists() # $1=stamp
+{
+	[ -e "$1" -o -L "$1" ]
+}
+
+test_package() # $1=pkgname
+{
+	local pkg="$1"
+	[ -n "$pkg" -a -z "$(echo "$pkg" | grep -e '/')" -a "$pkg" != "." -a "$pkg" != ".." ] || \
+		die "Package name \"$pkg\" contains illegal characters"
+	local SELECTED=
+	for conf in `grep CONFIG_PACKAGE tmp/.packagedeps | grep -E "[ /]$pkg\$" | sed -e 's,package-$(\(CONFIG_PACKAGE_.*\)).*,\1,'`; do
+		grep "$conf=" .config > /dev/null && SELECTED=1 && break
+	done
+	local STAMP_SUCCESS="$STAMP_DIR_SUCCESS/$pkg"
+	local STAMP_FAILED="$STAMP_DIR_FAILED/$pkg"
+	local STAMP_BLACKLIST="$STAMP_DIR_BLACKLIST/$pkg"
+	rm -f "$STAMP_FAILED"
+	stamp_exists "$STAMP_SUCCESS" && [ $force -eq 0 ] && return
+	rm -f "$STAMP_SUCCESS"
+	[ -n "$SELECTED" ] || {
+		echo "Package $pkg is not selected"
+		return
+	}
+	stamp_exists "$STAMP_BLACKLIST" && [ $force -eq 0 ] && {
+		echo "Package $pkg is blacklisted"
+		return
+	}
+	echo "Testing package $pkg..."
+	rm -rf "$STAGING_DIR" "$STAGING_DIR_HOST"
+	mkdir -p "$STAGING_DIR"
+	cp -al "$STAGING_DIR_HOST_TMPL" "$STAGING_DIR_HOST"
+	[ $lean_test -eq 0 ] && {
+		rm -rf "$BUILD_DIR" "$BUILD_DIR_HOST"
+		clean_kernel_build_dir
+	}
+	mkdir -p "$BUILD_DIR" "$BUILD_DIR_HOST"
+	local logfile="$(basename $pkg).log"
+	deptest_make "package/$pkg/compile" "$logfile"
+	if [ $? -eq 0 ]; then
+		( cd "$STAMP_DIR_SUCCESS"; ln -s "../$LOG_DIR_NAME/$logfile" "./$pkg" )
+	else
+		( cd "$STAMP_DIR_FAILED"; ln -s "../$LOG_DIR_NAME/$logfile" "./$pkg" )
+		echo "Building package $pkg FAILED"
+	fi
+}
+
+# parse commandline options
+packages=
+lean_test=0
+force=0
+nrjobs=1
+while [ $# -ne 0 ]; do
+	case "$1" in
+	--help|-h)
+		usage
+		exit 0
+		;;
+	--lean)
+		lean_test=1
+		;;
+	--force)
+		force=1
+		;;
+	-j*)
+		if [ -n "${1:2}" ]; then
+			nrjobs="${1:2}"
+		else
+			shift
+			nrjobs="$1"
+		fi
+		;;
+	*)
+		packages="$packages $1"
+		;;
+	esac
+	shift
+done
+
+[ -f "$BASEDIR/include/toplevel.mk" ] || \
+	die "Error: Could not find buildsystem base directory"
+[ -f "$BASEDIR/.config" ] || \
+	die "The buildsystem is not configured. Please run make menuconfig."
+cd "$BASEDIR" || die "Failed to enter base directory"
+
+mkdir -p "$STAMP_DIR_SUCCESS" "$STAMP_DIR_FAILED" "$STAMP_DIR_BLACKLIST" \
+	"$BIN_DIR" "$LOG_DIR"
+
+bootstrap_deptest_make()
+{
+	local target="$1"
+	shift
+	local logfile="bootstrap-deptest-$(echo "$target" | tr / -).log"
+	echo "deptest-make $target"
+	deptest_make "$target" "$logfile" "$@" || \
+		die "make $target failed, please check $logfile"
+}
+
+bootstrap_native_make()
+{
+	local target="$1"
+	shift
+	local logfile="bootstrap-native-$(echo "$target" | tr / -).log"
+	echo "make $target"
+	make -j$nrjobs "$target" \
+		V=99 "$@" >"$LOG_DIR/$logfile" 2>&1 || \
+		die "make $target failed, please check $logfile"
+}
+
+[ -d "$STAGING_DIR_HOST_TMPL" ] || {
+	echo "Bootstrapping build environment..."
+	rm -rf "$STAGING_DIR" "$STAGING_DIR_HOST" "$BUILD_DIR" "$BUILD_DIR_HOST" "$KERNEL_BUILD_DIR"
+	mkdir -p "$STAGING_DIR" "$STAGING_DIR_HOST" \
+		"$BUILD_DIR" "$BUILD_DIR_HOST" "$KERNEL_BUILD_DIR"
+	bootstrap_native_make tools/install
+	bootstrap_native_make toolchain/install
+	bootstrap_deptest_make tools/install
+	bootstrap_deptest_make target/linux/install
+	cp -al "$STAGING_DIR_HOST" "$STAGING_DIR_HOST_TMPL"
+	rm -rf "$STAGING_DIR" "$STAGING_DIR_HOST" "$BUILD_DIR" "$BUILD_DIR_HOST"
+	echo "Build environment OK."
+}
+
+if [ -z "$packages" ]; then
+	# iterate over all packages
+	for pkg in `cat tmp/.packagedeps  | grep CONFIG_PACKAGE | grep -v curdir | sed -e 's,.*[/=]\s*,,' | sort -u`; do
+		test_package "$pkg"
+	done
+else
+	# only check the specified packages
+	for pkg in $packages; do
+		test_package "$pkg"
+	done
+fi
diff --git a/trunk/scripts/diffconfig.sh b/trunk/scripts/diffconfig.sh
new file mode 100755
index 00000000..350886bf
--- /dev/null
+++ b/trunk/scripts/diffconfig.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head
+grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head
+grep '^CONFIG_DEVEL=y' .config >> tmp/.diffconfig.head
+grep '^CONFIG_TOOLCHAINOPTS=y' .config >> tmp/.diffconfig.head
+./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage1 Config.in >/dev/null
+./scripts/kconfig.pl '>+' tmp/.diffconfig.stage1 .config >> tmp/.diffconfig.head
+./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage2 Config.in >/dev/null
+./scripts/kconfig.pl '>' tmp/.diffconfig.stage2 .config >> tmp/.diffconfig.head
+cat tmp/.diffconfig.head
+rm -f tmp/.diffconfig tmp/.diffconfig.head
diff --git a/trunk/scripts/dl_cleanup.py b/trunk/scripts/dl_cleanup.py
new file mode 100755
index 00000000..88303791
--- /dev/null
+++ b/trunk/scripts/dl_cleanup.py
@@ -0,0 +1,231 @@
+#!/usr/bin/env python
+"""
+# libreCMC download directory cleanup utility.
+# Delete all but the very last version of the program tarballs.
+#
+# Copyright (C) 2010 Michael Buesch <mb@bu3sch.de>
+# Copyright (C) 2013 OpenWrt.org
+"""
+
+import sys
+import os
+import re
+import getopt
+
+# Commandline options
+opt_dryrun = False
+
+
+def parseVer_1234(match, filepath):
+	progname = match.group(1)
+	progversion = (int(match.group(2)) << 64) |\
+		      (int(match.group(3)) << 48) |\
+		      (int(match.group(4)) << 32) |\
+		      (int(match.group(5)) << 16)
+	return (progname, progversion)
+
+def parseVer_123(match, filepath):
+	progname = match.group(1)
+	try:
+		patchlevel = match.group(5)
+	except (IndexError), e:
+		patchlevel = None
+	if patchlevel:
+		patchlevel = ord(patchlevel[0])
+	else:
+		patchlevel = 0
+	progversion = (int(match.group(2)) << 64) |\
+		      (int(match.group(3)) << 48) |\
+		      (int(match.group(4)) << 32) |\
+		      patchlevel
+	return (progname, progversion)
+
+def parseVer_12(match, filepath):
+	progname = match.group(1)
+	try:
+		patchlevel = match.group(4)
+	except (IndexError), e:
+		patchlevel = None
+	if patchlevel:
+		patchlevel = ord(patchlevel[0])
+	else:
+		patchlevel = 0
+	progversion = (int(match.group(2)) << 64) |\
+		      (int(match.group(3)) << 48) |\
+		      patchlevel
+	return (progname, progversion)
+
+def parseVer_r(match, filepath):
+	progname = match.group(1)
+	progversion = (int(match.group(2)) << 64)
+	return (progname, progversion)
+
+def parseVer_ymd(match, filepath):
+	progname = match.group(1)
+	progversion = (int(match.group(2)) << 64) |\
+		      (int(match.group(3)) << 48) |\
+		      (int(match.group(4)) << 32)
+	return (progname, progversion)
+
+def parseVer_GIT(match, filepath):
+	progname = match.group(1)
+	st = os.stat(filepath)
+	progversion = int(st.st_mtime) << 64
+	return (progname, progversion)
+
+extensions = (
+	".tar.gz",
+	".tar.bz2",
+	".tar.xz",
+	".orig.tar.gz",
+	".orig.tar.bz2",
+	".orig.tar.xz",
+	".zip",
+	".tgz",
+	".tbz",
+	".txz",
+)
+
+versionRegex = (
+	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)\.(\d+)"), parseVer_1234),	# xxx-1.2.3.4
+	(re.compile(r"(.+)[-_](\d\d\d\d)-?(\d\d)-?(\d\d)"), parseVer_ymd),	# xxx-YYYY-MM-DD
+	(re.compile(r"(.+)[-_]([0-9a-fA-F]{40,40})"), parseVer_GIT),		# xxx-GIT_SHASUM
+	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)(\w?)"), parseVer_123),	# xxx-1.2.3a
+	(re.compile(r"(.+)[-_](\d+)_(\d+)_(\d+)"), parseVer_123),		# xxx-1_2_3
+	(re.compile(r"(.+)[-_](\d+)\.(\d+)(\w?)"), parseVer_12),		# xxx-1.2a
+	(re.compile(r"(.+)[-_]r?(\d+)"), parseVer_r),				# xxx-r1111
+)
+
+blacklist = [
+	("linux",		re.compile(r"linux-.*")),
+	("gcc",			re.compile(r"gcc-.*")),
+	("wl_apsta",		re.compile(r"wl_apsta.*")),
+	(".fw",			re.compile(r".*\.fw")),
+	(".arm",		re.compile(r".*\.arm")),
+	(".bin",		re.compile(r".*\.bin")),
+	("rt-firmware",		re.compile(r"RT[\d\w]+_Firmware.*")),
+]
+
+class EntryParseError(Exception): pass
+
+class Entry:
+	def __init__(self, directory, filename):
+		self.directory = directory
+		self.filename = filename
+		self.progname = ""
+		self.fileext = ""
+
+		for ext in extensions:
+			if filename.endswith(ext):
+				filename = filename[0:0-len(ext)]
+				self.fileext = ext
+				break
+		else:
+			print self.filename, "has an unknown file-extension"
+			raise EntryParseError("ext")
+		for (regex, parseVersion) in versionRegex:
+			match = regex.match(filename)
+			if match:
+				(self.progname, self.version) = parseVersion(
+					match, directory + "/" + filename + self.fileext)
+				break
+		else:
+			print self.filename, "has an unknown version pattern"
+			raise EntryParseError("ver")
+
+	def deleteFile(self):
+		path = (self.directory + "/" + self.filename).replace("//", "/")
+		print "Deleting", path
+		if not opt_dryrun:
+			os.unlink(path)
+
+	def __eq__(self, y):
+		return self.filename == y.filename
+
+	def __ge__(self, y):
+		return self.version >= y.version
+
+def usage():
+	print "libreCMC download directory cleanup utility"
+	print "Usage: " + sys.argv[0] + " [OPTIONS] <path/to/dl>"
+	print ""
+	print " -d|--dry-run            Do a dry-run. Don't delete any files"
+	print " -B|--show-blacklist     Show the blacklist and exit"
+	print " -w|--whitelist ITEM     Remove ITEM from blacklist"
+
+def main(argv):
+	global opt_dryrun
+
+	try:
+		(opts, args) = getopt.getopt(argv[1:],
+			"hdBw:",
+			[ "help", "dry-run", "show-blacklist", "whitelist=", ])
+		if len(args) != 1:
+			usage()
+			return 1
+	except getopt.GetoptError:
+		usage()
+		return 1
+	directory = args[0]
+	for (o, v) in opts:
+		if o in ("-h", "--help"):
+			usage()
+			return 0
+		if o in ("-d", "--dry-run"):
+			opt_dryrun = True
+		if o in ("-w", "--whitelist"):
+			for i in range(0, len(blacklist)):
+				(name, regex) = blacklist[i]
+				if name == v:
+					del blacklist[i]
+					break
+			else:
+				print "Whitelist error: Item", v,\
+				      "is not in blacklist"
+				return 1
+		if o in ("-B", "--show-blacklist"):
+			for (name, regex) in blacklist:
+				print name
+			return 0
+
+	# Create a directory listing and parse the file names.
+	entries = []
+	for filename in os.listdir(directory):
+		if filename == "." or filename == "..":
+			continue
+		for (name, regex) in blacklist:
+			if regex.match(filename):
+				if opt_dryrun:
+					print filename, "is blacklisted"
+				break
+		else:
+			try:
+				entries.append(Entry(directory, filename))
+			except (EntryParseError), e: pass
+
+	# Create a map of programs
+	progmap = {}
+	for entry in entries:
+		if entry.progname in progmap.keys():
+			progmap[entry.progname].append(entry)
+		else:
+			progmap[entry.progname] = [entry,]
+
+	# Traverse the program map and delete everything but the last version
+	for prog in progmap:
+		lastVersion = None
+		versions = progmap[prog]
+		for version in versions:
+			if lastVersion is None or version >= lastVersion:
+				lastVersion = version
+		if lastVersion:
+			for version in versions:
+				if version != lastVersion:
+					version.deleteFile()
+			if opt_dryrun:
+				print "Keeping", lastVersion.filename
+
+	return 0
+
+if __name__ == "__main__":
+	sys.exit(main(sys.argv))
diff --git a/trunk/scripts/download.pl b/trunk/scripts/download.pl
new file mode 100755
index 00000000..8f3f1d3a
--- /dev/null
+++ b/trunk/scripts/download.pl
@@ -0,0 +1,195 @@
+#!/usr/bin/env perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+use strict;
+use warnings;
+use File::Basename;
+use File::Copy;
+
+@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> [<mirror> ...]\n";
+
+my $target = shift @ARGV;
+my $filename = shift @ARGV;
+my $md5sum = shift @ARGV;
+my $scriptdir = dirname($0);
+my @mirrors;
+my $ok;
+
+sub localmirrors {
+	my @mlist;
+	open LM, "$scriptdir/localmirrors" and do {
+	    while (<LM>) {
+			chomp $_;
+			push @mlist, $_ if $_;
+		}
+		close LM;
+	};
+	open CONFIG, "<".$ENV{'TOPDIR'}."/.config" and do {
+		while (<CONFIG>) {
+			/^CONFIG_LOCALMIRROR="(.+)"/ and do {
+				chomp;
+				my @local_mirrors = split(/;/, $1);
+				push @mlist, @local_mirrors;
+			};
+		}
+		close CONFIG;
+	};
+
+	return @mlist;
+}
+
+sub which($) {
+	my $prog = shift;
+	my $res = `which $prog`;
+	$res or return undef;
+	$res =~ /^no / and return undef;
+	$res =~ /not found/ and return undef;
+	return $res;
+}
+
+my $md5cmd = which("md5sum") || which("md5") || die 'no md5 checksum program found, please install md5 or md5sum';
+chomp $md5cmd;
+
+sub download
+{
+	my $mirror = shift;
+	my $options = $ENV{WGET_OPTIONS} || "";
+
+	$mirror =~ s!/$!!;
+
+	if ($mirror =~ s!^file://!!) {
+		if (! -d "$mirror") {
+			print STDERR "Wrong local cache directory -$mirror-.\n";
+			cleanup();
+			return;
+		}
+
+		if (! -d "$target") {
+			system("mkdir", "-p", "$target/");
+		}
+
+		if (! open TMPDLS, "find $mirror -follow -name $filename 2>/dev/null |") {
+			print("Failed to search for $filename in $mirror\n");
+			return;
+		}
+
+		my $link;
+
+		while (defined(my $line = readline TMPDLS)) {
+			chomp ($link = $line);
+			if ($. > 1) {
+				print("$. or more instances of $filename in $mirror found . Only one instance allowed.\n");
+				return;
+			}
+		}
+
+		close TMPDLS;
+
+		if (! $link) {
+			print("No instances of $filename found in $mirror.\n");
+			return;
+		}
+
+		print("Copying $filename from $link\n");
+		copy($link, "$target/$filename.dl");
+
+		if (system("$md5cmd '$target/$filename.dl' > '$target/$filename.md5sum'")) {
+			print("Failed to generate md5 sum for $filename\n");
+			return;
+		}
+	} else {
+		open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- '$mirror/$filename' |" or die "Cannot launch wget.\n";
+		open MD5SUM, "| $md5cmd > '$target/$filename.md5sum'" or die "Cannot launch md5sum.\n";
+		open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
+		my $buffer;
+		while (read WGET, $buffer, 1048576) {
+			print MD5SUM $buffer;
+			print OUTPUT $buffer;
+		}
+		close MD5SUM;
+		close WGET;
+		close OUTPUT;
+
+		if ($? >> 8) {
+			print STDERR "Download failed.\n";
+			cleanup();
+			return;
+		}
+	}
+
+	my $sum = `cat "$target/$filename.md5sum"`;
+	$sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";
+	$sum = $1;
+
+	if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
+		print STDERR "MD5 sum of the downloaded file does not match (file: $sum, requested: $md5sum) - deleting download.\n";
+		cleanup();
+		return;
+	}
+
+	unlink "$target/$filename";
+	system("mv", "$target/$filename.dl", "$target/$filename");
+	cleanup();
+}
+
+sub cleanup
+{
+	unlink "$target/$filename.dl";
+	unlink "$target/$filename.md5sum";
+}
+
+@mirrors = localmirrors();
+
+foreach my $mirror (@ARGV) {
+	if ($mirror =~ /^\@SF\/(.+)$/) {
+		# give sourceforge a few more tries, because it redirects to different mirrors
+		for (1 .. 5) {
+			push @mirrors, "http://downloads.sourceforge.net/$1";
+		}
+	} elsif ($mirror =~ /^\@GNU\/(.+)$/) {
+		push @mirrors, "http://ftpmirror.gnu.org/$1";
+		push @mirrors, "http://ftp.gnu.org/pub/gnu/$1";
+		push @mirrors, "ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/$1";
+		push @mirrors, "ftp://ftp.mirror.nl/pub/mirror/gnu/$1";
+		push @mirrors, "http://mirror.switch.ch/ftp/mirror/gnu/$1";
+	} elsif ($mirror =~ /^\@SAVANNAH\/(.+)$/) {
+		push @mirrors, "http://download.savannah.gnu.org/releases/$1";
+		push @mirrors, "http://nongnu.uib.no/$1";
+		push @mirrors, "http://ftp.igh.cnrs.fr/pub/nongnu/$1";
+		push @mirrors, "http://download-mirror.savannah.gnu.org/releases/$1";
+	} elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
+		push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";
+		push @mirrors, "http://ftp.unina.it/pub/linux/GNOME/sources/$1";
+		push @mirrors, "http://fr2.rpmfind.net/linux/gnome.org/sources/$1";
+		push @mirrors, "ftp://ftp.dit.upm.es/pub/GNOME/sources/$1";
+		push @mirrors, "ftp://ftp.no.gnome.org/pub/GNOME/sources/$1";
+		push @mirrors, "http://ftp.acc.umu.se/pub/GNOME/sources/$1";
+		push @mirrors, "http://ftp.belnet.be/mirror/ftp.gnome.org/sources/$1";
+		push @mirrors, "http://linorg.usp.br/gnome/sources/$1";
+		push @mirrors, "http://mirror.aarnet.edu.au/pub/GNOME/sources/$1";
+		push @mirrors, "http://mirrors.ibiblio.org/pub/mirrors/gnome/sources/$1";
+		push @mirrors, "ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/$1";
+		push @mirrors, "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1";
+    }
+    else {
+		push @mirrors, $mirror;
+	}
+}
+
+push @mirrors, 'http://downloads.librecmc.org/sources/v1.3';
+
+while (!$ok) {
+	my $mirror = shift @mirrors;
+	$mirror or die "No more mirrors to try - giving up.\n";
+
+	download($mirror);
+	-f "$target/$filename" and $ok = 1;
+}
+
+$SIG{INT} = \&cleanup;
+
diff --git a/trunk/scripts/env b/trunk/scripts/env
new file mode 100755
index 00000000..5542b201
--- /dev/null
+++ b/trunk/scripts/env
@@ -0,0 +1,225 @@
+#!/usr/bin/env bash
+BASEDIR="$PWD"
+ENVDIR="$PWD/env"
+export GREP_OPTIONS=
+
+usage() {
+	cat <<EOF
+Usage: $0 [options] <command> [arguments]
+Commands:
+	help              This help text
+	list              List environments
+	clear             Delete all environment and revert to flat config/files
+	new <name>        Create a new environment
+	switch <name>     Switch to a different environment
+	delete <name>     Delete an environment
+	rename <newname>  Rename the current environment
+	diff              Show differences between current state and environment
+	save              Save your changes to the environment
+	revert            Revert your changes since last save
+
+Options:
+
+EOF
+	exit ${1:-1}
+}
+
+error() {
+	echo "$0: $*"
+	exit 1
+}
+
+ask_bool() {
+	local DEFAULT="$1"; shift
+	local def defstr val
+	case "$DEFAULT" in
+		1) def=0; defstr="Y/n";;
+		0) def=1; defstr="y/N";;
+		*) def=;  defstr="y/n";;
+	esac
+	while [ -z "$val" ]; do
+		local VAL
+
+		echo -n "$* ($defstr): "
+		read VAL
+		case "$VAL" in
+			y*|Y*) val=0;;
+			n*|N*) val=1;;
+			*) val="$def";;
+		esac
+	done
+	return "$val"
+}
+
+env_init() {
+	local CREATE="$1"
+	if [ -z "$CREATE" ]; then
+		[ -d "$ENVDIR" ] || exit 0
+	fi
+	[ -x "$(which git 2>/dev/null)" ] || error "Git is not installed"
+	mkdir -p "$ENVDIR" || error "Failed to create the environment directory"
+	cd "$ENVDIR" || error "Failed to switch to the environment directory"
+	[ -d .git ] || { 
+		git init &&
+		touch .config &&
+		mkdir files &&
+		git add . && 
+		git commit -q -m "Initial import"
+	} || {
+		rm -rf .git
+		error "Failed to initialize the environment directory"
+	}
+}
+
+env_sync_data() {
+	[ \! -L "$BASEDIR/.config" -a -f "$BASEDIR/.config" ] && mv "$BASEDIR/.config" "$ENVDIR"
+	git add .
+	git add -u
+}
+
+env_sync() {
+	local STR="$1"
+	env_sync_data
+	git commit -m "${STR:-Update} at $(date)"
+}
+
+env_link_config() {
+	rm -f "$BASEDIR/.config"
+	ln -s env/.config "$BASEDIR/.config"
+	mkdir -p "$ENVDIR/files"
+	[ -L "$BASEDIR/files" ] || ln -s env/files "$BASEDIR/files"
+}
+
+env_do_reset() {
+	git reset --hard HEAD
+	git clean -d -f
+}
+
+env_list() {
+	env_init
+	git branch --color | grep -vE '^. master$'
+}
+
+env_diff() {
+	env_init
+	env_sync_data
+	git diff --cached --color
+	env_link_config
+}
+
+env_save() {
+	env_init
+	env_sync
+	env_link_config
+}
+
+env_revert() {
+	env_init
+	env_do_reset
+	env_link_config
+}
+
+env_ask_sync() {
+	env_sync_data
+	LINES="$(env_diff | wc -l)" # implies env_init
+	[ "$LINES" -gt 0 ] && {
+		if ask_bool 1 "Do you want to save your changes"; then
+			env_sync
+		else
+			env_do_reset
+		fi
+	}
+}
+
+env_clear() {
+	env_init
+	[ -L "$BASEDIR/.config" ] && rm -f "$BASEDIR/.config"
+	[ -L "$BASEDIR/files" ] && rm -f "$BASEDIR/files"
+	[ -f "$ENVDIR/.config" ] || ( cd "$ENVDIR/files" && find | grep -vE '^\.$' > /dev/null )
+	env_sync_data
+	if ask_bool 1 "Do you want to keep your current config and files"; then
+		mkdir -p "$BASEDIR/files"
+		shopt -s dotglob
+		cp -a "$ENVDIR/files/"* "$BASEDIR/files" 2>/dev/null >/dev/null
+		shopt -u dotglob
+		cp "$ENVDIR/.config" "$BASEDIR/"
+	else
+		rm -rf "$BASEDIR/files" "$BASEDIR/.config"
+	fi
+	cd "$BASEDIR"
+	rm -rf "$ENVDIR"
+}
+
+env_delete() {
+	local name="${1##*/}"
+	env_init
+	[ -z "$name" ] && usage
+	branch="$(git branch | grep '^\* ' | awk '{print $2}')"
+	[ "$name" = "$branch" ] && error "cannot delete the currently selected environment"
+	git branch -D "$name"
+}
+
+env_switch() {
+	local name="${1##*/}"
+	[ -z "$name" ] && usage
+
+	env_init
+	env_ask_sync
+	git checkout "$name" || error "environment '$name' not found"
+	env_link_config
+}
+
+env_rename() {
+	local NAME="${1##*/}"
+	env_init
+	git branch -m "$NAME"
+}
+
+env_new() {
+	local NAME="$1"
+	local branch
+	local from="master"
+
+	[ -z "$NAME" ] && usage
+	env_init 1
+	
+	branch="$(git branch | grep '^\* ' | awk '{print $2}')"
+	if [ -n "$branch" -a "$branch" != "master" ]; then
+		env_ask_sync
+		if ask_bool 0 "Do you want to clone the current environment?"; then
+			from="$branch"
+		fi
+		rm -f "$BASEDIR/.config" "$BASEDIR/files"
+	fi
+	git checkout -b "$1" "$from"
+	if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then
+		if ask_bool 1 "Do you want to start your configuration repository with the current configuration?"; then
+			[ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {
+				mkdir -p "$ENVDIR/files"
+				shopt -s dotglob
+				mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null
+				shopt -u dotglob
+				rmdir "$BASEDIR/files"
+			}
+			env_sync
+		else
+			rm -rf "$BASEDIR/.config" "$BASEDIR/files"
+		fi
+	fi
+	env_link_config
+}
+
+COMMAND="$1"; shift
+case "$COMMAND" in
+	help) usage 0;;
+	new) env_new "$@";;
+	list) env_list "$@";;
+	clear) env_clear "$@";;
+	switch) env_switch "$@";;
+	delete) env_delete "$@";;
+	rename) env_rename "$@";;
+	diff) env_diff "$@";;
+	save) env_save "$@";;
+	revert) env_revert "$@";;
+	*) usage;;
+esac
diff --git a/trunk/scripts/ext-toolchain.sh b/trunk/scripts/ext-toolchain.sh
new file mode 100755
index 00000000..6470f47b
--- /dev/null
+++ b/trunk/scripts/ext-toolchain.sh
@@ -0,0 +1,581 @@
+#!/usr/bin/env bash
+#
+#   Script for various external toolchain tasks, refer to
+#   the --help output for more information.
+#
+#   Copyright (C) 2012 Jo-Philipp Wich <jow@openwrt.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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
+
+CC=""
+CXX=""
+CPP=""
+
+CFLAGS=""
+TOOLCHAIN="."
+
+LIBC_TYPE=""
+
+
+# Library specs
+LIB_SPECS="
+	c:        ld-* lib{anl,c,cidn,crypt,dl,m,nsl,nss_dns,nss_files,resolv,util}
+	rt:       librt-* librt
+	pthread:  libpthread-* libpthread
+	stdcpp:   libstdc++
+	gcc:      libgcc_s
+	ssp:      libssp
+	gfortran: libgfortran
+"
+
+# Binary specs
+BIN_SPECS="
+	ldd:       ldd
+	ldconfig:  ldconfig
+	gdb:       gdb
+	gdbserver: gdbserver
+"
+
+
+test_c() {
+	cat <<-EOT | "${CC:-false}" $CFLAGS -o /dev/null -x c - 2>/dev/null
+		#include <stdio.h>
+
+		int main(int argc, char **argv)
+		{
+			printf("Hello, world!\n");
+			return 0;
+		}
+	EOT
+}
+
+test_cxx() {
+	cat <<-EOT | "${CXX:-false}" $CFLAGS -o /dev/null -x c++ - 2>/dev/null
+		#include <iostream>
+
+		using namespace std;
+
+		int main()
+		{
+			cout << "Hello, world!" << endl;
+			return 0;
+		}
+	EOT
+}
+
+test_softfloat() {
+	cat <<-EOT | "$CC" $CFLAGS -msoft-float -o /dev/null -x c - 2>/dev/null
+		int main(int argc, char **argv)
+		{
+			double a = 0.1;
+			double b = 0.2;
+			double c = (a + b) / (a * b);
+			return 1;
+		}
+	EOT
+}
+
+test_uclibc() {
+	local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)"
+	if [ -d "${sysroot:-$TOOLCHAIN}" ]; then
+		local lib
+		for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld-uClibc*.so*; do
+			if [ -f "$lib" ] && [ ! -h "$lib" ]; then
+				return 0
+			fi
+		done
+	fi
+	return 1
+}
+
+test_feature() {
+	local feature="$1"; shift
+
+	# find compilers, libc type
+	probe_cc
+	probe_cxx
+	probe_libc
+
+	# common toolchain feature tests
+	case "$feature" in
+		c)     test_c;         return $? ;;
+		c++)   test_cxx;       return $? ;;
+		soft*) test_softfloat; return $? ;;
+	esac
+
+	# assume eglibc/glibc supports all libc features
+	if [ "$LIBC_TYPE" != "uclibc" ]; then
+		return 0
+	fi
+
+	# uclibc feature tests
+	local inc
+	local sysroot="$("$CC" "$@" -muclibc -print-sysroot 2>/dev/null)"
+	for inc in "include" "usr/include" "usr/local/include"; do
+		local conf="${sysroot:-$TOOLCHAIN}/$inc/bits/uClibc_config.h"
+		if [ -f "$conf" ]; then
+			case "$feature" in
+				lfs)     grep -q '__UCLIBC_HAS_LFS__ 1'     "$conf"; return $?;;
+				ipv6)    grep -q '__UCLIBC_HAS_IPV6__ 1'    "$conf"; return $?;;
+				rpc)     grep -q '__UCLIBC_HAS_RPC__ 1'     "$conf"; return $?;;
+				locale)  grep -q '__UCLIBC_HAS_LOCALE__ 1'  "$conf"; return $?;;
+				wchar)   grep -q '__UCLIBC_HAS_WCHAR__ 1'   "$conf"; return $?;;
+				threads) grep -q '__UCLIBC_HAS_THREADS__ 1' "$conf"; return $?;;
+			esac
+		fi
+	done
+
+	return 1
+}
+
+
+find_libs() {
+	local spec="$(echo "$LIB_SPECS" | sed -ne "s#^[[:space:]]*$1:##ip")"
+
+	if [ -n "$spec" ] && probe_cpp; then
+		local libdir libdirs
+		for libdir in $(
+			"$CPP" $CFLAGS -v -x c /dev/null 2>&1 | \
+				sed -ne 's#:# #g; s#^LIBRARY_PATH=##p'
+		); do
+			if [ -d "$libdir" ]; then
+				libdirs="$libdirs $(cd "$libdir"; pwd)/"
+			fi
+		done
+
+		local pattern
+		for pattern in $(eval echo $spec); do
+			find $libdirs -name "$pattern.so*" | sort -u
+		done
+
+		return 0
+	fi
+
+	return 1
+}
+
+find_bins() {
+	local spec="$(echo "$BIN_SPECS" | sed -ne "s#^[[:space:]]*$1:##ip")"
+
+	if [ -n "$spec" ] && probe_cpp; then
+		local sysroot="$("$CPP" -print-sysroot)"
+
+		local bindir bindirs
+		for bindir in $(
+			echo "${sysroot:-$TOOLCHAIN}/bin";
+			echo "${sysroot:-$TOOLCHAIN}/usr/bin";
+			echo "${sysroot:-$TOOLCHAIN}/usr/local/bin";
+ 			"$CPP" $CFLAGS -v -x c /dev/null 2>&1 | \
+				sed -ne 's#:# #g; s#^COMPILER_PATH=##p'
+		); do
+			if [ -d "$bindir" ]; then
+				bindirs="$bindirs $(cd "$bindir"; pwd)/"
+			fi
+		done
+
+		local pattern
+		for pattern in $(eval echo $spec); do
+			find $bindirs -name "$pattern" | sort -u
+		done
+
+		return 0
+	fi
+
+	return 1
+}
+
+
+wrap_bin_cc() {
+	local out="$1"
+	local bin="$2"
+
+	echo    '#!/bin/sh'                                                > "$out"
+	echo    'for arg in "$@"; do'                                     >> "$out"
+	echo    ' case "$arg" in -l*|-L*|-shared|-static)'                >> "$out"
+	echo -n '  exec "'"$bin"'" '"$CFLAGS"' ${STAGING_DIR:+'           >> "$out"
+	echo -n '-idirafter "$STAGING_DIR/usr/include" '                  >> "$out"
+	echo -n '-L "$STAGING_DIR/usr/lib" '                              >> "$out"
+	echo    '-Wl,-rpath-link,"$STAGING_DIR/usr/lib"} "$@" ;;'         >> "$out"
+	echo    ' esac'                                                   >> "$out"
+	echo    'done'                                                    >> "$out"
+	echo -n 'exec "'"$bin"'" '"$CFLAGS"' ${STAGING_DIR:+'             >> "$out"
+	echo    '-idirafter "$STAGING_DIR/usr/include"} "$@"'             >> "$out"
+
+	chmod +x "$out"
+}
+
+wrap_bin_ld() {
+	local out="$1"
+	local bin="$2"
+
+	echo    '#!/bin/sh'                                                > "$out"
+	echo -n 'exec "'"$bin"'" ${STAGING_DIR:+'                         >> "$out"
+	echo -n '-L "$STAGING_DIR/usr/lib" '                              >> "$out"
+	echo    '-rpath-link "$STAGING_DIR/usr/lib"} "$@"'                >> "$out"
+
+	chmod +x "$out"
+}
+
+wrap_bin_other() {
+	local out="$1"
+	local bin="$2"
+
+	echo    '#!/bin/sh'                                                > "$out"
+	echo    'exec "'"$bin"'" "$@"'                                    >> "$out"
+
+	chmod +x "$out"
+}
+
+wrap_bins() {
+	if probe_cc; then
+		mkdir -p "$1" || return 1
+
+		local cmd
+		for cmd in "${CC%-*}-"*; do
+			if [ -x "$cmd" ]; then
+				local out="$1/${cmd##*/}"
+				local bin="$cmd"
+
+				if [ -x "$out" ] && ! grep -q STAGING_DIR "$out"; then
+					mv "$out" "$out.bin"
+					bin='$(dirname "$0")/'"${out##*/}"'.bin'
+				fi
+
+				case "${cmd##*/}" in
+					*-*cc|*-*cc-*|*-*++|*-*++-*|*-cpp)
+						wrap_bin_cc "$out" "$bin"
+					;;
+					*-ld)
+						wrap_bin_ld "$out" "$bin"
+					;;
+					*)
+						wrap_bin_other "$out" "$bin"
+					;;
+				esac
+			fi
+		done
+
+		return 0
+	fi
+
+	return 1
+}
+
+
+print_config() {
+	local mktarget="$1"
+	local mksubtarget
+
+	local target="$("$CC" $CFLAGS -dumpmachine)"
+	local cpuarch="${target%%-*}"
+	local prefix="${CC##*/}"; prefix="${prefix%-*}-"
+	local config="${0%/scripts/*}/.config"
+
+	# if no target specified, print choice list and exit
+	if [ -z "$mktarget" ]; then
+		# prepare metadata
+		if [ ! -f "${0%/scripts/*}/tmp/.targetinfo" ]; then
+			"${0%/*}/scripts/config/mconf" prepare-tmpinfo
+		fi
+
+		local mktargets=$(
+			sed -ne "
+				/^Target: / { h };
+				/^Target-Arch: $cpuarch\$/ { x; s#^Target: ##p }
+			" "${0%/scripts/*}/tmp/.targetinfo" | sort -u
+		)
+
+		for mktarget in $mktargets; do
+			case "$mktarget" in */*)
+				mktargets=$(echo "$mktargets" | sed -e "/^${mktarget%/*}\$/d")
+			esac
+		done
+
+		if [ -n "$mktargets" ]; then
+			echo "Available targets:"                               >&2
+			echo $mktargets                                         >&2
+		else
+			echo -e "Could not find a suitable libreCMC target for " >&2
+			echo -e "CPU architecture '$cpuarch' - you need to "    >&2
+			echo -e "define one first!"                             >&2
+		fi
+		return 1
+	fi
+
+	# bail out if there is a .config already
+	if [ -f "${0%/scripts/*}/.config" ]; then
+		echo "There already is a .config file, refusing to overwrite!" >&2
+		return 1
+	fi
+
+	case "$mktarget" in */*)
+		mksubtarget="${mktarget#*/}"
+		mktarget="${mktarget%/*}"
+	;; esac
+
+
+	echo "CONFIG_TARGET_${mktarget}=y" > "$config"
+
+	if [ -n "$mksubtarget" ]; then
+		echo "CONFIG_TARGET_${mktarget}_${mksubtarget}=y" >> "$config"
+	fi
+
+	if test_feature "softfloat"; then
+		echo "CONFIG_SOFT_FLOAT=y" >> "$config"
+	else
+		echo "# CONFIG_SOFT_FLOAT is not set" >> "$config"
+	fi
+
+	if test_feature "ipv6"; then
+		echo "CONFIG_IPV6=y" >> "$config"
+	else
+		echo "# CONFIG_IPV6 is not set" >> "$config"
+	fi
+
+	if test_feature "locale"; then
+		echo "CONFIG_BUILD_NLS=y" >> "$config"
+	else
+		echo "# CONFIG_BUILD_NLS is not set" >> "$config"
+	fi
+
+	echo "CONFIG_DEVEL=y" >> "$config"
+	echo "CONFIG_EXTERNAL_TOOLCHAIN=y" >> "$config"
+	echo "CONFIG_TOOLCHAIN_ROOT=\"$TOOLCHAIN\"" >> "$config"
+	echo "CONFIG_TOOLCHAIN_PREFIX=\"$prefix\"" >> "$config"
+	echo "CONFIG_TARGET_NAME=\"$target\"" >> "$config"
+
+	if [ "$LIBC_TYPE" != glibc ]; then
+		echo "CONFIG_TOOLCHAIN_LIBC=\"$LIBC_TYPE\"" >> "$config"
+	fi
+
+	local lib
+	for lib in C RT PTHREAD GCC STDCPP SSP GFORTRAN; do
+		local file
+		local spec=""
+		local llib="$(echo "$lib" | sed -e 's#.*#\L&#')"
+		for file in $(find_libs "$lib"); do
+			spec="${spec:+$spec }$(echo "$file" | sed -e "s#^$TOOLCHAIN#.#")"
+		done
+		if [ -n "$spec" ]; then
+			echo "CONFIG_PACKAGE_lib${llib}=y" >> "$config"
+			echo "CONFIG_LIB${lib}_FILE_SPEC=\"$spec\"" >> "$config"
+		else
+			echo "# CONFIG_PACKAGE_lib${llib} is not set" >> "$config"
+		fi
+	done
+
+	local bin
+	for bin in LDD LDCONFIG; do
+		local file
+		local spec=""
+		local lbin="$(echo "$bin" | sed -e 's#.*#\L&#')"
+		for file in $(find_bins "$bin"); do
+			spec="${spec:+$spec }$(echo "$file" | sed -e "s#^$TOOLCHAIN#.#")"
+		done
+		if [ -n "$spec" ]; then
+			echo "CONFIG_PACKAGE_${lbin}=y" >> "$config"
+			echo "CONFIG_${bin}_FILE_SPEC=\"$spec\"" >> "$config"
+		else
+			echo "# CONFIG_PACKAGE_${lbin} is not set" >> "$config"
+		fi
+	done
+
+	# inflate
+	make -C "${0%/scripts/*}" defconfig
+	return 0
+}
+
+
+probe_cc() {
+	if [ -z "$CC" ]; then
+		local bin
+		for bin in "bin" "usr/bin" "usr/local/bin"; do
+			local cmd
+			for cmd in "$TOOLCHAIN/$bin/"*-*cc*; do
+				if [ -x "$cmd" ] && [ ! -h "$cmd" ]; then
+					CC="$(cd "${cmd%/*}"; pwd)/${cmd##*/}"
+					return 0
+				fi
+			done
+		done
+		return 1
+	fi
+	return 0
+}
+
+probe_cxx() {
+	if [ -z "$CXX" ]; then
+		local bin
+		for bin in "bin" "usr/bin" "usr/local/bin"; do
+			local cmd
+			for cmd in "$TOOLCHAIN/$bin/"*-*++*; do
+				if [ -x "$cmd" ] && [ ! -h "$cmd" ]; then
+					CXX="$(cd "${cmd%/*}"; pwd)/${cmd##*/}"
+					return 0
+				fi
+			done
+		done
+		return 1
+	fi
+	return 0
+}
+
+probe_cpp() {
+	if [ -z "$CPP" ]; then
+		local bin
+		for bin in "bin" "usr/bin" "usr/local/bin"; do
+			local cmd
+			for cmd in "$TOOLCHAIN/$bin/"*-cpp*; do
+				if [ -x "$cmd" ] && [ ! -h "$cmd" ]; then
+					CPP="$(cd "${cmd%/*}"; pwd)/${cmd##*/}"
+					return 0
+				fi
+			done
+		done
+		return 1
+	fi
+	return 0
+}
+
+probe_libc() {
+	if [ -z "$LIBC_TYPE" ]; then
+		if test_uclibc; then
+			LIBC_TYPE="uclibc"
+		else
+			LIBC_TYPE="glibc"
+		fi
+	fi
+	return 0
+}
+
+
+while [ -n "$1" ]; do
+	arg="$1"; shift
+	case "$arg" in
+		--toolchain)
+			[ -d "$1" ] || {
+				echo "Toolchain directory '$1' does not exist." >&2
+				exit 1
+			}
+			TOOLCHAIN="$(cd "$1"; pwd)"; shift
+		;;
+
+		--cflags)
+			CFLAGS="${CFLAGS:+$CFLAGS }$1"; shift
+		;;
+
+		--print-libc)
+			if probe_cc; then
+				probe_libc
+				echo "$LIBC_TYPE"
+				exit 0
+			fi
+			echo "No C compiler found in '$TOOLCHAIN'." >&2
+			exit 1
+		;;
+
+		--print-target)
+			if probe_cc; then
+				exec "$CC" $CFLAGS -dumpmachine
+			fi
+			echo "No C compiler found in '$TOOLCHAIN'." >&2
+			exit 1
+		;;
+
+		--print-bin)
+			if [ -z "$1" ]; then
+				echo "Available programs:"                      >&2
+				echo $(echo "$BIN_SPECS" | sed -ne 's#:.*$##p') >&2
+				exit 1
+			fi
+
+			find_bins "$1" || exec "$0" --toolchain "$TOOLCHAIN" --print-bin
+			exit 0
+		;;
+
+		--print-libs)
+			if [ -z "$1" ]; then
+				echo "Available libraries:"                     >&2
+				echo $(echo "$LIB_SPECS" | sed -ne 's#:.*$##p') >&2
+				exit 1
+			fi
+
+			find_libs "$1" || exec "$0" --toolchain "$TOOLCHAIN" --print-libs
+			exit 0
+		;;
+
+		--test)
+			test_feature "$1"
+			exit $?
+		;;
+
+		--wrap)
+			[ -n "$1" ] || exec "$0" --help
+			wrap_bins "$1"
+			exit $?
+		;;
+
+		--config)
+			if probe_cc; then
+				print_config "$1"
+				exit $?
+			fi
+			echo "No C compiler found in '$TOOLCHAIN'." >&2
+			exit 1
+		;;
+
+		-h|--help)
+			me="$(basename "$0")"
+			echo -e "\nUsage:\n"                                            >&2
+			echo -e "  $me --toolchain {directory} --print-libc"            >&2
+			echo -e "    Print the libc implementation and exit.\n"         >&2
+			echo -e "  $me --toolchain {directory} --print-target"          >&2
+			echo -e "    Print the GNU target name and exit.\n"             >&2
+			echo -e "  $me --toolchain {directory} --print-bin {program}"   >&2
+			echo -e "    Print executables belonging to given program,"     >&2
+			echo -e "    omit program argument to get a list of names.\n"   >&2
+			echo -e "  $me --toolchain {directory} --print-libs {library}"  >&2
+			echo -e "    Print shared objects belonging to given library,"  >&2
+			echo -e "    omit library argument to get a list of names.\n"   >&2
+			echo -e "  $me --toolchain {directory} --test {feature}"        >&2
+			echo -e "    Test given feature, exit code indicates success."  >&2
+			echo -e "    Possible features are 'c', 'c++', 'softfloat',"    >&2
+			echo -e "    'lfs', 'rpc', 'ipv6', 'wchar', 'locale' and "      >&2
+			echo -e "    'threads'.\n"                                      >&2
+			echo -e "  $me --toolchain {directory} --wrap {directory}"      >&2
+			echo -e "    Create wrapper scripts for C and C++ compiler, "   >&2
+			echo -e "    linker, assembler and other key executables in "   >&2
+			echo -e "    the directory given with --wrap.\n"                >&2
+			echo -e "  $me --toolchain {directory} --config {target}"       >&2
+			echo -e "    Analyze the given toolchain and print a suitable"  >&2
+			echo -e "    .config for the given target. Omit target "        >&2
+			echo -e "    argument to get a list of names.\n"                >&2
+			echo -e "  $me --help"                                          >&2
+			echo -e "    Display this help text and exit.\n\n"              >&2
+			echo -e "  Most commands also take a --cflags parameter which " >&2
+			echo -e "  is used to specify C flags to be passed to the "     >&2
+			echo -e "  cross compiler when performing tests."               >&2
+			echo -e "  This paremter may be repeated multiple times."       >&2
+			exit 1
+		;;
+
+		*)
+			echo "Unknown argument '$arg'" >&2
+			exec $0 --help
+		;;
+	esac
+done
+
+exec $0 --help
diff --git a/trunk/scripts/feeds b/trunk/scripts/feeds
new file mode 100755
index 00000000..31ad5449
--- /dev/null
+++ b/trunk/scripts/feeds
@@ -0,0 +1,681 @@
+#!/usr/bin/perl
+use Getopt::Std;
+use FindBin;
+use Cwd;
+use lib "$FindBin::Bin";
+use metadata;
+use warnings;
+use strict;
+use Cwd 'abs_path';
+
+chdir "$FindBin::Bin/..";
+$ENV{TOPDIR}=getcwd();
+$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
+$ENV{GREP_OPTIONS}="";
+
+my $mk=`which gmake 2>/dev/null`;	# select the right 'make' program
+chomp($mk);		# trim trailing newline
+$mk or $mk = "make";	# default to 'make'
+
+# check version of make
+my @mkver = split /\s+/, `$mk -v`, 4;
+my $valid_mk = 1;
+$mkver[0] =~ /^GNU/ or $valid_mk = 0;
+$mkver[1] =~ /^Make/ or $valid_mk = 0;
+$mkver[2] >= "3.81" or $valid_mk = 0;
+$valid_mk or die "Unsupported version of make found: $mk\n";
+
+my @feeds;
+my %build_packages;
+my %installed;
+my %feed_cache;
+
+my $feed_package = {};
+my $feed_src = {};
+
+sub parse_config() {
+	my $line = 0;
+	my %name;
+
+	open FEEDS, "feeds.conf" or
+		open FEEDS, "feeds.conf.default" or
+		die "Unable to open feeds configuration";
+	while (<FEEDS>) {
+		chomp;
+		s/#.+$//;
+		next unless /\S/;
+		my @line = split /\s+/, $_, 3;
+		my @src;
+		$line++;
+
+		my $valid = 1;
+		$line[0] =~ /^src-\w+$/ or $valid = 0;
+		$line[1] =~ /^\w+$/ or $valid = 0;
+		@src = split /\s+/, $line[2];
+		$valid or die "Syntax error in feeds.conf, line: $line\n";
+
+		$name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
+		$name{$line[1]} = 1;
+
+		push @feeds, [$line[0], $line[1], \@src];
+	}
+	close FEEDS;
+}
+
+sub update_location($$)
+{
+	my $name = shift;
+	my $url  = shift;
+	my $old_url;
+
+	-d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
+
+	if( open LOC, "< ./feeds/$name.tmp/location" )
+	{
+		chomp($old_url = readline LOC);
+		close LOC;
+	}
+
+	if( !$old_url || $old_url ne $url )
+	{
+		if( open LOC, "> ./feeds/$name.tmp/location" )
+		{
+			print LOC $url, "\n";
+			close LOC;
+		}
+		return $old_url ? 1 : 0;
+	}
+
+	return 0;
+}
+
+sub update_index($)
+{
+	my $name = shift;
+
+	-d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
+	-d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1;
+
+	system("$mk -s prepare-mk OPENWRT_BUILD= TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+	system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+	system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
+
+	return 0;
+}
+
+my %update_method = (
+	'src-svn' => {
+		'init'		=> "svn checkout '%s' '%s'",
+		'update'	=> "svn update",
+		'controldir'	=> ".svn",
+		'revision'	=> "svn info | grep 'Revision' | cut -d ' ' -f 2 | tr -d '\n'"},
+	'src-cpy' => {
+		'init'		=> "cp -Rf '%s' '%s'",
+		'update'	=> "",
+		'revision'	=> "echo -n 'local'"},
+	'src-link' => {
+		'init'		=> "ln -s '%s' '%s'",
+		'update'	=> "",
+		'revision'	=> "echo -n 'local'"},
+	'src-git' => {
+		'init'          => "git clone --depth 1 '%s' '%s'",
+		'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
+		'init_commit'   => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
+		'update'	=> "git pull --ff",
+		'controldir'	=> ".git",
+		'revision'	=> "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
+	'src-gitsvn' => {
+		'init'	=> "git svn clone -r HEAD '%s' '%s'",
+		'update'	=> "git svn rebase",
+		'controldir'	=> ".git",
+		'revision'	=> "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
+	'src-bzr' => {
+		'init'		=> "bzr checkout --lightweight '%s' '%s'",
+		'update'	=> "bzr update",
+		'controldir'	=> ".bzr"},
+	'src-hg' => {
+		'init'		=> "hg clone '%s' '%s'",
+		'update'	=> "hg pull --update",
+		'controldir'	=> ".hg"},
+	'src-darcs' => {
+		'init'    => "darcs get '%s' '%s'",
+		'update'  => "darcs pull -a",
+		'controldir' => "_darcs"},
+);
+
+# src-git: pull broken
+# src-cpy: broken if `basename $src` != $name
+
+sub update_feed_via($$$$) {
+	my $type = shift;
+	my $name = shift;
+	my $src = shift;
+	my $relocate = shift;
+	
+	my $m = $update_method{$type};
+	my $localpath = "./feeds/$name";
+	my $safepath = $localpath;
+	$safepath =~ s/'/'\\''/;
+	my ($base_branch, $branch) = split(/;/, $src, 2);
+	my ($base_commit, $commit) = split(/\^/, $src, 2);
+
+	if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
+		system("rm -rf '$safepath'");
+		if ($m->{'init_branch'} and $branch) {
+			system(sprintf($m->{'init_branch'}, $branch, $base_branch, $safepath)) == 0 or return 1;
+		} elsif ($m->{'init_commit'} and $commit) {
+			system(sprintf($m->{'init_commit'}, $base_commit, $safepath, $safepath, $commit, $commit)) == 0 or return 1;
+		} else {
+			system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+		}
+	} elsif ($m->{'init_commit'} and $commit) {
+		# in case git hash has been provided don't update the feed
+	} else {
+		system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
+	}
+	
+	return 0;
+}
+
+sub get_feed($) {
+	my $feed = shift;
+
+	if (!defined($feed_cache{$feed})) {
+		my $file = "./feeds/$feed.index";
+
+		clear_packages();
+		-f $file or do {
+			print "Ignoring feed '$feed' - index missing\n";
+			return;
+		};
+		parse_package_metadata($file) or return;
+		$feed_cache{$feed} = [ { %package }, { %srcpackage } ];
+	}
+
+	$feed_package = $feed_cache{$feed}->[0];
+	$feed_src = $feed_cache{$feed}->[1];
+	return $feed_cache{$feed}->[0];
+}
+
+sub get_installed() {
+	system("$mk -s prepare-tmpinfo OPENWRT_BUILD=");
+	clear_packages();
+	parse_package_metadata("./tmp/.packageinfo");
+	%installed = %package;
+}
+
+sub search_feed {
+	my $feed = shift;
+	my @substr = @_;
+	my $display;
+
+	return unless @substr > 0;
+	get_feed($feed);
+	foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
+		my $pkg = $feed_package->{$name};
+		my $substr;
+		my $pkgmatch = 1;
+
+		next if $pkg->{vdepends};
+		foreach my $substr (@substr) {
+			my $match;
+			foreach my $key (qw(name title description src)) {
+				$pkg->{$key} and $substr and $pkg->{$key} =~ m/$substr/i and $match = 1;
+			}
+			$match or undef $pkgmatch;
+		};
+		$pkgmatch and do {
+			$display or do {
+				print "Search results in feed '$feed':\n";
+				$display = 1;
+			};
+			printf "\%-25s\t\%s\n", $pkg->{name}, $pkg->{title};
+		};
+	}
+	return 0;
+}
+
+sub search {
+	my %opts;
+
+	getopt('r:', \%opts);
+	foreach my $feed (@feeds) {
+		search_feed($feed->[1], @ARGV) if (!defined($opts{r}) or $opts{r} eq $feed->[1]);
+	}
+}
+
+sub list_feed {
+	my $feed = shift;
+
+	get_feed($feed);
+	foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
+		my $pkg = $feed_package->{$name};
+		next if $pkg->{vdepends};
+		if($pkg->{name}) {
+			printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
+		}
+	}
+
+	return 0;
+}
+
+sub list {
+	my %opts;
+
+	getopts('r:d:nsh', \%opts);
+	if ($opts{h}) {
+		usage();
+		return 0;
+	}
+	if ($opts{n}) {
+		foreach my $feed (@feeds) {
+			printf "%s\n", $feed->[1];
+		}
+		return 0;
+	}
+	if ($opts{s}) {
+		foreach my $feed (@feeds) {
+			my $localpath = "./feeds/$feed->[1]";
+			my $m = $update_method{$feed->[0]};
+			my $revision;
+			if( !$m->{'revision'} ) {
+				$revision = "X";
+			}
+			elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {
+				$revision = `cd '$localpath'; $m->{'revision'}`;
+			}
+			else {
+				$revision = "local";
+			}
+			if ($opts{d}) {
+				printf "%s%s%s%s%s%s%s\n", $feed->[1], $opts{d}, $feed->[0], $opts{d}, $revision, $opts{d}, join(", ", @{$feed->[2]});
+			}
+			else {
+				printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
+			}
+		}
+		return 0;
+	}
+	foreach my $feed (@feeds) {
+		list_feed($feed->[1], @ARGV) if (!defined($opts{r}) or $opts{r} eq $feed->[1]);
+	}
+	return 0;
+}
+
+sub install_generic() {
+	my $feed = shift;
+	my $pkg = shift;
+	my $path = $pkg->{makefile};
+
+	if($path) {
+		$path =~ s/\/Makefile$//;
+
+		-d "./package/feeds" or mkdir "./package/feeds";
+		-d "./package/feeds/$feed->[1]" or mkdir "./package/feeds/$feed->[1]";
+		system("ln -sf ../../../$path ./package/feeds/$feed->[1]/");
+	} else {
+		warn "Package is not valid\n";
+		return 1;
+	}
+
+	return 0;
+}
+
+my %install_method = (
+	'src-svn' => \&install_generic,
+	'src-cpy' => \&install_generic,
+	'src-link' => \&install_generic,
+	'src-git' => \&install_generic,
+	'src-gitsvn' => \&install_generic,
+	'src-bzr' => \&install_generic,
+	'src-hg' => \&install_generic,
+	'src-darcs' => \&install_generic,
+);
+
+my %feed;
+
+sub lookup_package($$) {
+	my $feed = shift;
+	my $package = shift;
+
+	foreach my $feed ($feed, @feeds) {
+		next unless $feed->[1];
+		next unless $feed{$feed->[1]};
+		$feed{$feed->[1]}->{$package} and return $feed;
+	}
+	return;
+}
+
+sub is_core_package($) {
+	my $package = shift;
+	foreach my $file ("tmp/info/.packageinfo-$package", glob("tmp/info/.packageinfo-*_$package")) {
+		next unless index($file, "tmp/info/.packageinfo-feeds_");
+		return 1 if -s $file;
+	}
+	return 0;
+}
+
+sub install_package {
+	my $feed = shift;
+	my $name = shift;
+	my $ret = 0;
+
+	$feed = lookup_package($feed, $name);
+	$feed or do {
+		$installed{$name} and return 0;
+		# TODO: check if it's already installed within ./package directory
+		$feed_src->{$name} or is_core_package($name) or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
+		return 0;
+	};
+
+	# switch to the metadata for the selected feed
+	get_feed($feed->[1]);
+
+	my $pkg = $feed{$feed->[1]}->{$name} or return 1;
+	$pkg->{name} or do {
+		$installed{$name} and return 0;
+		# TODO: check if this is an alias package, maybe it's known by another name
+		warn "WARNING: Package '$name' is not available in feed $feed->[1].\n";
+		return 0;
+	};
+	my $src = $pkg->{src};
+	my $type = $feed->[0];
+	$src or $src = $name;
+
+	# previously installed packages set the runtime package
+	# newly installed packages set the source package
+	$installed{$src} and return 0;
+
+	# check previously installed packages
+	$installed{$name} and return 0;
+	$installed{$src} = 1;
+	warn "Installing package '$src'\n";
+
+	$install_method{$type} or do {
+		warn "Unknown installation method: '$type'\n";
+		return 1;
+	};
+
+	&{$install_method{$type}}($feed, $pkg) == 0 or do {
+		warn "failed.\n";
+		return 1;
+	};
+
+	# install all dependencies referenced from the source package
+	foreach my $vpkg (@{$feed_src->{$src}}) {
+		foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
+			next if $dep =~ /@/;
+			$dep =~ s/^\+//;
+			$dep =~ s/^.+://;
+			$dep =~ s/\/.+$//;
+			next unless $dep;
+			install_package($feed, $dep) == 0 or $ret = 1;
+		}
+	}
+
+	return $ret;
+}
+
+sub refresh_config {
+	my $default = shift;
+
+	# workaround for timestamp check
+	system("rm -f tmp/.packageinfo");
+
+	# refresh the config
+	if ($default) {
+		system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
+	} else {
+		system("$mk defconfig Config.in >/dev/null 2>/dev/null");
+	}
+}
+
+sub install {
+	my $name;
+	my %opts;
+	my $feed;
+	my $ret = 0;
+
+	getopts('ap:d:h', \%opts);
+
+	if ($opts{h}) {
+		usage();
+		return 0;
+	}
+
+	get_installed();
+
+	foreach my $f (@feeds) {
+		# index all feeds
+		$feed{$f->[1]} = get_feed($f->[1]);
+
+		# look up the preferred feed
+		$opts{p} and $f->[1] eq $opts{p} and $feed = $f;
+	}
+
+	if($opts{a}) {
+		foreach my $f (@feeds) {
+			if (!defined($opts{p}) or $opts{p} eq $f->[1]) {
+				printf "Installing all packages from feed %s.\n", $f->[1];
+				get_feed($f->[1]);
+				foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
+					my $p = $feed_package->{$name};
+					next if $p->{vdepends};
+					if( $p->{name} ) {
+						install_package($feed, $p->{name}) == 0 or $ret = 1;
+						get_feed($f->[1]);
+					}
+				}
+			}
+		}
+	} else {
+		while ($name = shift @ARGV) {
+			install_package($feed, $name) == 0 or $ret = 1;
+		}
+	}
+
+	# workaround for timestamp check
+
+	# set the defaults
+	if ($opts{d} and $opts{d} =~ /^[ymn]$/) {
+		refresh_config($opts{d});
+	}
+
+	return $ret;
+}
+
+sub uninstall {
+	my %opts;
+	my $name;
+	my $uninstall;
+
+	getopts('ah', \%opts);
+
+	if ($opts{h}) {
+		usage();
+		return 0;
+	}
+
+	if ($opts{a}) {
+		system("rm -rvf ./package/feeds");
+		$uninstall = 1;
+	} else {
+		if($#ARGV == -1) {
+			warn "WARNING: no package to uninstall\n";
+			return 0;
+		}
+		get_installed();
+		while ($name = shift @ARGV) {
+			my $pkg = $installed{$name};
+			$pkg or do {
+				warn "WARNING: $name not installed\n";
+				next;
+			};
+			$pkg->{src} and $name = $pkg->{src};
+			warn "Uninstalling package '$name'\n";
+			system("rm -f ./package/feeds/*/$name");
+			$uninstall = 1;
+		}
+	}
+	$uninstall and refresh_config();
+	return 0;
+}
+
+sub update_feed($$$$)
+{
+	my $type=shift;
+	my $name=shift;
+	my $src=shift;
+	my $perform_update=shift;
+	my $force_relocate=update_location( $name, "@$src" );
+
+	if( $force_relocate ) {
+		warn "Source of feed $name has changed, replacing copy\n";
+	}
+	$update_method{$type} or do {
+		warn "Unknown type '$type' in feed $name\n";
+		return 1;
+	};
+	$perform_update and do {
+		my $failed = 1;
+		foreach my $feedsrc (@$src) {
+			warn "Updating feed '$name' from '$feedsrc' ...\n";
+			next unless update_feed_via($type, $name, $feedsrc, $force_relocate) == 0;
+			$failed = 0;
+			last;
+		}
+		$failed and do {
+			warn "failed.\n";
+			return 1;
+		};
+	};
+	warn "Create index file './feeds/$name.index' \n";
+	update_index($name) == 0 or do {
+		warn "failed.\n";
+		return 1;
+	};
+	return 0;
+}
+
+sub update {
+	my %opts;
+	my $feed_name;
+	my $perform_update=1;
+
+	$ENV{SCAN_COOKIE} = $$;
+	$ENV{OPENWRT_VERBOSE} = 's';
+
+	getopts('ahi', \%opts);
+
+	if ($opts{h}) {
+		usage();
+		return 0;
+	}
+
+	if ($opts{i}) {
+		# don't update from (remote) repository
+		# only re-create index information
+		$perform_update=0;
+	}
+
+	-d "feeds" or do {
+			mkdir "feeds" or die "Unable to create the feeds directory";
+		};
+
+	if ( ($#ARGV == -1) or $opts{a}) {
+		foreach my $feed (@feeds) {
+			my ($type, $name, $src) = @$feed;
+			next unless update_feed($type, $name, $src, $perform_update) == 1;
+			last;
+		}
+	} else {
+		while ($feed_name = shift @ARGV) {
+			foreach my $feed (@feeds) {
+				my ($type, $name, $src) = @$feed;
+				if($feed_name ne $name) {
+					next;
+				}
+				update_feed($type, $name, $src, $perform_update);
+			}
+		}
+	}
+
+	refresh_config();
+
+	return 0;
+}
+
+sub feed_config() {
+	foreach my $feed (@feeds) {
+		my $installed = (-f "feeds/$feed->[1].index");
+
+		printf "\tconfig FEED_%s\n", $feed->[1];
+		printf "\t\tbool \"Enable feed %s\"\n", $feed->[1];
+		printf "\t\tdepends on PER_FEED_REPO\n";
+		printf "\t\tdefault y\n" if $installed;
+		printf "\t\thelp\n";
+		printf "\t\t Enable the \\\"%s\\\" feed at %s.\n", $feed->[1], $feed->[2][0];
+		printf "\n";
+	}
+
+	return 0;
+}
+
+sub usage() {
+	print <<EOF;
+Usage: $0 <command> [options]
+
+Commands:
+	list [options]: List feeds, their content and revisions (if installed)
+	Options:
+	    -n :            List of feed names.
+	    -s :            List of feed names and their URL.
+	    -r <feedname>:  List packages of specified feed.
+	    -d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)
+
+	install [options] <package>: Install a package
+	Options:
+	    -a :           Install all packages from all feeds or from the specified feed using the -p option.
+	    -p <feedname>: Prefer this feed when installing packages.
+	    -d <y|m|n>:    Set default for newly installed packages.
+
+	search [options] <substring>: Search for a package
+	Options:
+	    -r <feedname>: Only search in this feed
+
+	uninstall -a|<package>: Uninstall a package
+	Options:
+	    -a :           Uninstalls all packages.
+
+	update -a|<feedname(s)>: Update packages and lists of feeds in feeds.conf .
+	Options:
+	    -a :           Update all feeds listed within feeds.conf. Otherwise the specified feeds will be updated.
+	    -i :           Recreate the index only. No feed update from repository is performed.
+
+	clean:             Remove downloaded/generated files.
+
+EOF
+	exit(1);
+}
+
+my %commands = (
+	'list' => \&list,
+	'update' => \&update,
+	'install' => \&install,
+	'search' => \&search,
+	'uninstall' => \&uninstall,
+	'feed_config' => \&feed_config,
+	'clean' => sub {
+		system("rm -rf feeds");
+	}
+);
+
+my $arg = shift @ARGV;
+$arg or usage();
+parse_config;
+foreach my $cmd (keys %commands) {
+	$arg eq $cmd and do {
+		exit(&{$commands{$cmd}}());
+	};
+}
+usage();
diff --git a/trunk/scripts/flashing/adam2flash-502T.pl b/trunk/scripts/flashing/adam2flash-502T.pl
new file mode 100755
index 00000000..6c6d5d27
--- /dev/null
+++ b/trunk/scripts/flashing/adam2flash-502T.pl
@@ -0,0 +1,342 @@
+#!/usr/bin/env perl
+#
+#   D-Link DSL-502T flash utility
+#
+#   Copyright (c) 2007 Oliver Jowett <oliver@opencloud.com>
+#
+#   Based on adam2flash.pl for the D-Link DSL-G6x4T, which is:
+#   Copyright (C) 2005 Felix Fietkau <mailto@nbd.name>
+#   based on fbox recovery util by Enrik Berkhan
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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
+#
+
+# The default DSL-502T mtd map looks like this:
+#
+# mtd0 0x90091000,0x903f0000    # filesystem
+# mtd1 0x90010090,0x90091000    # kernel
+# mtd2 0x90000000,0x90010000    # bootloader - DO NOT MODIFY
+# mtd3 0x903f0000,0x90400000    # config space - DO NOT MODIFY
+# mtd4 0x90010000,0x903f0000    # firmware signature + kernel + filesystem, used to flash new firmware
+#
+# i.e. the flash layout is:
+#
+# 90000000-9000FFFF mtd2 bootloader
+# 90010000-9001008F ---- firmware signature )
+# 90010090-90090FFF mtd1 kernel             ) mtd4 spans these three regions
+# 90091000-903EFFFF mtd0 filesystem         )
+# 903F0000-903FFFFF mtd3 config space
+#
+# The ADAM2 bootloader uses the mtd1 settings to find the start of the image to boot.
+# The image to load contains information about the loadable size of the image. If ADAM2 sees
+# that the image appears to extend beyond the end of mtd1, it will refuse to load it. On
+# the DSL-502T, this manifests as the USB light blinking rapidly on boot.
+#
+# The libreCMC kernel does not follow quite the same layout:
+#  (a) it does not have a 0x90-byte firmware signature prefix
+#  (b) it is larger than the default mtd1 size
+#
+# (a) would be avoidable (build a custom image with a 0x90-byte prefix) but (b) is unavoidable.
+# So we *have* to change mtd1. The simplest thing to do seems to make it span all of
+# the flashable area, producing this layout:
+#
+# mtd0 0x90091000,0x903f0000    # filesystem
+# mtd1 0x90010000,0x903f0000    # kernel (CHANGED)
+# mtd2 0x90000000,0x90010000    # bootloader - DO NOT MODIFY
+# mtd3 0x903f0000,0x90400000    # config space - DO NOT MODIFY
+# mtd4 0x90010000,0x903f0000    # kernel + filesystem, used to flash new firmware
+#
+# *** NOTE NOTE NOTE NOTE ***
+#
+# /dev/mtd0 .. /dev/mtd4 when using libreCMC do **NOT** correspond to the ADAM2 mtd0-4 settings!
+# Instead, libreCMC scans the MTD itself and determines its own boundaries which are arranged
+# quite differently to ADAM2. It will look something like this, see dmsg on boot:
+#
+# (/dev/mtd0) 0x00000000-0x00010000 : "loader"        # Bootloader, read-only
+# (/dev/mtd1) 0x003f0000-0x00400000 : "config"        # Config space
+# (/dev/mtd2) 0x00010000-0x003f0000 : "linux"         # Firmware area (kernel + root fs + JFFS area)
+# (/dev/mtd3) 0x000d0d58-0x003f0000 : "rootfs"        # Root FS, starts immediately after kernel
+# (/dev/mtd4) 0x00280000-0x003f0000 : "rootfs_data"   # If rootfs is squashfs, start of JFFS area.
+#
+# All of those boundaries are autodetected by examining the data in flash.
+#
+# *** NOTE NOTE NOTE NOTE ***
+
+use IO::Socket::INET;
+use Socket;
+use strict;
+use warnings;
+
+sub usage() {
+	print STDERR "Usage: $0 <ip> [-setmtd1] [-noflash] [firmware.bin]\n\n";
+	print STDERR "Acquires the ADAM2 bootloader of a D-Link DSL-504T at <ip>\n";
+	print STDERR "Power off the device, start this script, then power it on.\n";
+	print STDERR "<ip> may be any spare address on the local subnet.\n\n";
+	print STDERR "If a firmware file is specified, MTD settings are verified and\n";
+	print STDERR "then the firmware is written to the router's flash.\n";
+	print STDERR "The firmware type (D-Link or libreCMC) is automatically detected.\n\n";
+	print STDERR "  -setmtd1  update mtd1 if it is not the appropriate value for this firmware\n";
+	print STDERR "  -noflash  does normal checks, updates mtd1 if requested, but does not actually write firmware\n\n";
+	exit 0;
+}
+
+my $ip = shift @ARGV;
+$ip and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ or usage();
+
+my $probe = IO::Socket::INET->new(Proto => 'udp',
+                                  Broadcast => 1,
+                                  LocalPort => 5035) or die "socket: $!";
+my $setip = unpack("N", inet_aton($ip));
+$setip > 0 or usage();
+
+my @packets;
+foreach my $ver ([18, 1], [22, 2]) {
+	push @packets, pack("vCCVNV", 0, @$ver, 1, $setip, 0);
+}
+print STDERR "Looking for device: ";
+my $broadcast = sockaddr_in(5035, INADDR_BROADCAST);
+my $scanning;
+my $box;
+
+$SIG{"ALRM"} = sub {
+	return if --$scanning <= 0;
+	foreach my $packet (@packets) {
+		$probe->send($packet, 0, $broadcast);
+	}
+	print STDERR ".";
+};
+
+$scanning = 15;
+foreach my $packet (@packets) {
+	$probe->send($packet, 0, $broadcast);
+}
+print STDERR ".";
+
+while($scanning) {
+	my $reply;
+
+	alarm(1);
+	if (my $peer = $probe->recv($reply, 16)) {
+		next if (length($reply) < 16);
+		my ($port, $addr) = sockaddr_in($peer);
+		my ($major, $minor1, $minor2, $code, $addr2) = unpack("vCCVV", $reply);
+		$addr2 = pack("N", $addr2);
+		if ($code == 2) {
+			$scanning = 0;
+			printf STDERR " found!\nADAM2 version $major.$minor1.$minor2 at %s (%s)\n", inet_ntoa($addr), inet_ntoa($addr2);
+			$box = inet_ntoa($addr);
+		}
+	}
+}
+
+$box or die " not found!\n";
+
+alarm(0);
+
+{
+	package ADAM2FTP;
+	use base qw(Net::FTP);
+	
+	# ADAM2 requires upper case commands, some brain dead firewall doesn't ;-)
+	sub _USER {
+		shift->command("USER",@_)->response()
+	}
+	
+	sub _GETENV {
+		my $ftp = shift;
+		my ($ok, $name, $value);
+		
+		$ftp->command("GETENV",@_);
+			while(length($ok = $ftp->response()) < 1) {
+			my $line = $ftp->getline();
+			unless (defined($value)) {
+				chomp($line);
+				($name, $value) = split(/\s+/, $line, 2);
+			}
+		}
+		$ftp->debug_print(0, "getenv: $value\n")
+		if $ftp->debug();
+		return $value;
+	}
+	
+	sub getenv {
+		my $ftp = shift;
+		my $name = shift;
+		return $ftp->_GETENV($name);
+	}
+	
+	sub _REBOOT {
+		shift->command("REBOOT")->response() == Net::FTP::CMD_OK
+	}
+	
+	sub reboot {
+		my $ftp = shift;
+		$ftp->_REBOOT;
+		$ftp->close;
+	}
+}
+
+my $file;
+my $arg;
+my $noflash = 0;
+my $setmtd1 = 0;
+while ($arg = shift @ARGV) {
+  if ($arg eq "-noflash") { $noflash = 1; }
+  elsif ($arg eq "-setmtd1") { $setmtd1 = 1; }
+  else { $file = $arg; }
+}
+
+if (!$file) {
+  print STDERR "No firmware file specified, exiting.\n";
+  exit 0;
+}
+
+#
+# Firmware checks
+#
+
+open FILE, "<$file" or die "can't open firmware file\n";
+
+# D-Link firmware starts with "MTD4" little-endian, then has an image header at 0x90
+# libreCMC firmware just starts with an image header at 0x00
+
+my $signature;
+my $sbytes = read FILE, $signature, 4;
+($sbytes == 4) or die "can't read firmware signature: $!";
+
+my $expectedmtd4 = "0x90010000,0x903f0000";
+my $fwtype;
+my $expectedmtd1;
+
+if ($signature eq "4DTM") {
+  seek FILE, 0x90, 0 or die "can't read firmware signature: $!";
+  $sbytes = read FILE, $signature, 4;
+  ($sbytes == 4) or die "can't read firmware signature: $!";
+  if ($signature eq "\x42\xfa\xed\xfe") {
+    $fwtype = "D-Link (little-endian)";
+    $expectedmtd1 = "0x90010090,0x90091000";
+  } elsif ($signature eq "\xde\xad\xbe\x42") {
+    $fwtype = "D-Link (big-endian)";
+    $expectedmtd1 = "0x90010090,0x90091000";
+  }
+} elsif ($signature eq "\x42\xfa\xed\xfe") {
+  $fwtype = "libreCMC (little-endian)";
+  $expectedmtd1 = "0x90010000,0x903f0000";
+} elsif ($signature eq "\xde\xad\xbe\x42") {
+  $fwtype = "libreCMC (big-endian)";
+  $expectedmtd1 = "0x90010000,0x903f0000";
+}
+
+$fwtype or die "Unknown firmware signature (are you sure that's the right firmware?)";
+print STDERR "Firmware type: $fwtype\n";
+
+#
+# Bootloader login
+#
+
+print STDERR "logging into ADAM2 bootloader.. ";
+my $ftp = ADAM2FTP->new($box, Debug => 0, Timeout => 600) or die "can't open control connection\n";
+$ftp->login("adam2", "adam2") or die "can't login\n";
+print STDERR "ok.\n";
+
+#
+# Hardware checks
+#
+
+print STDERR "checking hardware.. ";
+my $prd = $ftp->getenv("ProductID");
+my $usb = $ftp->getenv("usb_prod");
+print STDERR "$prd / $usb.\n";
+($prd eq "AR7RD" || $prd eq "AR7DB") or die "doesn't look like a DSL-502T?";
+($usb eq "DSL-502T") or die "doesn't look like a DSL-502T?";
+
+#
+# MTD checks and update
+#
+
+print STDERR "checking MTD settings.. ";
+
+my $mtd4 = $ftp->getenv("mtd4");
+($mtd4 eq $expectedmtd4) or die "MTD4 was not as expected (should be '$expectedmtd4', was '$mtd4'). Cowardly refusing to do anything about it!";
+
+# check MTD1 setting and update if needed
+my $mtd1 = $ftp->getenv("mtd1");
+if ($mtd1 ne $expectedmtd1) {
+  die "MTD1 was not as expected (should be '$expectedmtd1', was '$mtd1'). Run with -setmtd1 to reset mtd1" unless ($setmtd1);
+  print STDERR "Setting mtd1.. ";
+  ($ftp->command("SETENV","mtd1,$expectedmtd1")->response() == Net::FTP::CMD_OK) or die "can't set mtd1";
+  $file = shift @ARGV;
+}
+
+print STDERR "ok.\n";
+
+#
+# Firmware size check
+#
+
+my $fwsize = (stat(FILE))[7];
+printf STDERR "Firmware size: 0x%08x\n", $fwsize;
+my $flashsize;
+$mtd4 =~ /^(0x\w+),(0x\w+)$/ and $flashsize = hex($2) - hex($1);
+printf STDERR "Available flash space: 0x%08x\n", $flashsize;
+die "firmware is too large" if ($flashsize < $fwsize);
+
+#
+# Flash it!
+#
+
+if ($noflash) {
+  print STDERR "Not flashing firmware as -noflash was specified.\n";
+  exit 0;
+}
+
+seek FILE, 0, 0, or die "can't seek in firmware: $!";
+
+print STDERR "Preparing to flash.. ";
+($ftp->command("MEDIA FLSH")->response() == Net::FTP::CMD_OK) or die "can't set MEDIA FLSH";
+$ftp->binary() or die "can't set binary mode";
+print STDERR "ok.\n";
+print STDERR "Erasing flash and establishing data connection (this may take a while): ";
+
+my $dc = $ftp->stor("fs mtd4");
+$dc or die "can't open data connection: $!\n";
+print STDERR "ok.\n";
+
+print STDERR "Writing firmware: ";
+while ($fwsize > 0) {
+	my $buffer;
+	my $len = ($fwsize > 1024 ? 1024 : $fwsize);
+
+	my $rbytes = read FILE, $buffer, $len;
+	($rbytes < 0) and die "read error on firmware file: $!";
+	($rbytes == $len) or die "short read on firmware file ($rbytes < $len)";
+
+	my $wbytes = $dc->write($buffer, $len, 600);
+	($wbytes < 0) and die "write error on FTP data connection: $!";
+	($rbytes == $wbytes) or die "short write on FTP data connection ($wbytes < $rbytes)";
+
+	$fwsize -= $len;
+	print STDERR ".";
+}
+
+$dc->close();
+print STDERR " done.\n";
+
+#
+# Reboot
+#
+
+print STDERR "Rebooting device.\n";
+$ftp->reboot();
diff --git a/trunk/scripts/flashing/adam2flash-fritzbox.pl b/trunk/scripts/flashing/adam2flash-fritzbox.pl
new file mode 100755
index 00000000..f8d745f6
--- /dev/null
+++ b/trunk/scripts/flashing/adam2flash-fritzbox.pl
@@ -0,0 +1,209 @@
+#!/usr/bin/env perl
+#
+#   D-Link DSL-G6x4T flash utility
+#
+#   Copyright (C) 2005 Felix Fietkau <mailto@nbd.name>
+#   based on fbox recovery util by Enrik Berkhan
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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
+#
+
+use IO::Socket::INET;
+use IO::Select;
+use Socket;
+use strict;
+use warnings;
+
+sub usage() {
+	print STDERR "Usage: $0 <ip> [firmware.bin]\n\n";
+	exit 0;
+}
+
+my $ip = shift @ARGV;
+$ip and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ or usage();
+
+my $setip = unpack("N", inet_aton($ip));
+$setip > 0 or usage();
+
+my @packets;
+foreach my $ver ([18, 1], [22, 2]) {
+	push @packets, pack("vCCVNV", 0, @$ver, 1, $setip, 0);
+}
+print STDERR "Looking for device: ";
+my $scanning;
+my $box;
+
+my $probe = IO::Socket::INET->new(Proto => 'udp',
+                                  Broadcast => 1,
+                                  LocalAddr => $ip,
+                                  LocalPort => 5035) or die "socket: $!";
+my $sel = IO::Select->new($probe);
+my $packet = pack("vCCVNV", 0, 18, 1, 1, 0, 0);
+my $broadcast = sockaddr_in(5035, INADDR_BROADCAST);
+
+$probe->send($packet, 0, $broadcast);
+
+
+scan_again:
+print "Looking for Fritz!Box ";
+my @boxes = ();
+my $peer;
+$scanning = 100;
+print "o";
+while($scanning) {
+  my $reply;
+  my @ready;
+
+  if (@ready = $sel->can_read(0.2)) {
+    $peer = $probe->recv($reply, 16);
+    next if (length($reply) < 16);
+    my ($port, $addr) = sockaddr_in($peer);
+    my ($major, $minor1, $minor2, $code, $addr2) = unpack("vCCVV", $reply);
+    $addr2 = pack("N", $addr2);
+    if ($code == 2) {
+      print "O";
+      push @boxes, [$major, $minor1, $minor2, $addr, $addr2];
+      $scanning = 2 if ($scanning > 2);
+    }
+  } else {
+    $scanning--;
+    if (scalar @boxes == 0) {
+      $probe->send($packet, 0, $broadcast);
+      print "o";
+    } else {
+      print ".";
+    }
+  }
+}
+
+if (scalar @boxes == 0) {
+  print " none found, giving up.\n";
+  exit 1;
+} else {
+  print " found!\n";
+}
+
+{
+  package ADAM2FTP;
+  use base qw(Net::FTP);
+  # ADAM2 requires upper case commands, some brain dead firewall doesn't ;-)
+  sub _USER { shift->command("USER",@_)->response() }
+  sub _PASV { shift->command("P\@SW")->response() == Net::FTP::CMD_OK }
+  sub _GETENV {
+    my $ftp = shift;
+    my ($ok, $name, $value);
+
+    $ftp->command("GETENV",@_);
+    while(length($ok = $ftp->response()) < 1) {
+      my $line = $ftp->getline();
+      unless (defined($value)) {
+        chomp($line);
+        ($name, $value) = split(/\s+/, $line, 2);
+      }
+    }
+    $ftp->debug_print(0, "getenv: $value\n")
+      if $ftp->debug();
+    return $value;
+  }
+  sub getenv {
+    my $ftp = shift;
+    my $name = shift;
+    return $ftp->_GETENV($name);
+  }
+  sub _REBOOT { shift->command("REBOOT")->response() == Net::FTP::CMD_OK }
+  sub reboot {
+    my $ftp = shift;
+    $ftp->_REBOOT;
+    $ftp->close;
+  }
+  sub check {
+    my $ftp = shift;
+    
+    delete ${*$ftp}{'net_ftp_port'};
+    delete ${*$ftp}{'net_ftp_pasv'};
+
+    my $data = $ftp->_data_cmd('CHECK' ,@_) or return undef;
+    my $sum;
+    if (${${*$ftp}{'net_cmd_resp'}}[0] =~ /^Flash check 0x([0-9A-F]{8})/) {
+      $sum = hex($1);
+    }
+    $data->_close();
+    return $sum;
+  }
+}
+
+# passive mode geht mit Net::FTP nicht, connected zu spaet fuer ADAM2!
+my $ftp = ADAM2FTP->new($ip, Passive => 0, Debug => 0, Timeout => 600)
+  or die "can't FTP ADAM2";
+$ftp->login("adam2", "adam2") or die "can't login adam2";
+$ftp->binary();
+my $pid   = $ftp->getenv('ProductID');
+my $hwrev = $ftp->getenv('HWRevision');
+my $fwrev = $ftp->getenv('firmware_info');
+my $ulrev = $ftp->getenv('urlader-version');
+
+print "Product ID: $pid\n";
+print "Hardware Revision: $hwrev\n";
+print "Urlader  Revision: $ulrev\n";
+print "Firmware Revision: $fwrev\n";
+
+$ftp->hash(\*STDOUT, 64 * 1024);
+
+my $file = shift @ARGV;
+$file || exit 0;
+
+open FILE, "<$file" or die "can't open firmware file\n";
+
+my $mtd0 = $ftp->getenv("mtd0");
+my $mtd1 = $ftp->getenv("mtd1");
+my ($ksize, $fssize);
+
+$mtd1 =~ /^(0x\w+),(0x\w+)$/ and $ksize = hex($2) - hex($1);
+$mtd0 =~ /^(0x\w+),(0x\w+)$/ and $fssize = hex($2) - hex($1);
+$ksize and $fssize or die 'cannot read partition offsets';
+printf STDERR "Available flash space: 0x%08x (0x%08x + 0x%08x)\n", $ksize + $fssize, $ksize, $fssize;
+
+$ftp->command("MEDIA FLSH")->response();
+$ftp->binary();
+print STDERR "Writing to mtd1...\n";
+
+my $dc = $ftp->stor("fs mtd1");
+$dc or die "can't open data connection\n";
+my $rbytes = 1;
+
+while (($ksize > 0) and ($rbytes > 0)) {
+	my $buffer;
+	my $len = ($ksize > 1024 ? 1024 : $ksize);
+	$rbytes = read FILE, $buffer, $len;
+	$rbytes and $ksize -= $dc->write($buffer, $rbytes, 600);
+}
+
+$dc->close();
+$rbytes or die "no more data left to write\n";
+
+print STDERR "Writing to mtd0...\n";
+
+$dc = $ftp->stor("fs mtd0");
+$dc or die "can't open data connection\n";
+
+while (($fssize > 0) and ($rbytes > 0)) {
+	my $buffer;
+	my $len = ($fssize > 1024 ? 1024 : $fssize);
+	$rbytes = read FILE, $buffer, $len;
+	$rbytes and $fssize -= $dc->write($buffer, $rbytes, 600);
+}
+
+$dc->close();
+$ftp->reboot();
diff --git a/trunk/scripts/flashing/adam2flash.pl b/trunk/scripts/flashing/adam2flash.pl
new file mode 100755
index 00000000..8550f80a
--- /dev/null
+++ b/trunk/scripts/flashing/adam2flash.pl
@@ -0,0 +1,174 @@
+#!/usr/bin/env perl
+#
+#   D-Link DSL-G6x4T flash utility
+#
+#   Copyright (C) 2005 Felix Fietkau <mailto@nbd.name>
+#   based on fbox recovery util by Enrik Berkhan
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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
+#
+
+use IO::Socket::INET;
+use Socket;
+use strict;
+use warnings;
+
+sub usage() {
+	print STDERR "Usage: $0 <ip> [firmware.bin]\n\n";
+	exit 0;
+}
+
+my $ip = shift @ARGV;
+$ip and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ or usage();
+
+my $probe = IO::Socket::INET->new(Proto => 'udp',
+                                  Broadcast => 1,
+                                  LocalPort => 5035) or die "socket: $!";
+my $setip = unpack("N", inet_aton($ip));
+$setip > 0 or usage();
+
+my @packets;
+foreach my $ver ([18, 1], [22, 2]) {
+	push @packets, pack("vCCVNV", 0, @$ver, 1, $setip, 0);
+}
+print STDERR "Looking for device: ";
+my $broadcast = sockaddr_in(5035, INADDR_BROADCAST);
+my $scanning;
+my $box;
+
+$SIG{"ALRM"} = sub {
+	return if --$scanning <= 0;
+	foreach my $packet (@packets) {
+		$probe->send($packet, 0, $broadcast);
+	}
+	print STDERR ".";
+};
+
+$scanning = 10;
+foreach my $packet (@packets) {
+	$probe->send($packet, 0, $broadcast);
+}
+print STDERR ".";
+
+while($scanning) {
+	my $reply;
+
+	alarm(1);
+	if (my $peer = $probe->recv($reply, 16)) {
+		next if (length($reply) < 16);
+		my ($port, $addr) = sockaddr_in($peer);
+		my ($major, $minor1, $minor2, $code, $addr2) = unpack("vCCVV", $reply);
+		$addr2 = pack("N", $addr2);
+		if ($code == 2) {
+			$scanning = 0;
+			printf STDERR " found!\nADAM2 version $major.$minor1.$minor2 at %s (%s)\n", inet_ntoa($addr), inet_ntoa($addr2);
+			$box = inet_ntoa($addr);
+		}
+	}
+}
+
+$box or die " not found!\n";
+
+{
+	package ADAM2FTP;
+	use base qw(Net::FTP);
+	
+	# ADAM2 requires upper case commands, some brain dead firewall doesn't ;-)
+	sub _USER {
+		shift->command("USER",@_)->response()
+	}
+	
+	sub _GETENV {
+		my $ftp = shift;
+		my ($ok, $name, $value);
+		
+		$ftp->command("GETENV",@_);
+			while(length($ok = $ftp->response()) < 1) {
+			my $line = $ftp->getline();
+			unless (defined($value)) {
+				chomp($line);
+				($name, $value) = split(/\s+/, $line, 2);
+			}
+		}
+		$ftp->debug_print(0, "getenv: $value\n")
+		if $ftp->debug();
+		return $value;
+	}
+	
+	sub getenv {
+		my $ftp = shift;
+		my $name = shift;
+		return $ftp->_GETENV($name);
+	}
+	
+	sub _REBOOT {
+		shift->command("REBOOT")->response() == Net::FTP::CMD_OK
+	}
+	
+	sub reboot {
+		my $ftp = shift;
+		$ftp->_REBOOT;
+		$ftp->close;
+	}
+}
+
+my $file = shift @ARGV;
+$file || exit 0;
+
+open FILE, "<$file" or die "can't open firmware file\n";
+my $ftp = ADAM2FTP->new($box, Debug => 0, Timeout => 600) or die "can't open control connection\n";
+$ftp->login("adam2", "adam2") or die "can't login\n";
+
+my $mtd0 = $ftp->getenv("mtd0");
+my $mtd1 = $ftp->getenv("mtd1");
+my ($ksize, $fssize);
+
+$mtd1 =~ /^(0x\w+),(0x\w+)$/ and $ksize = hex($2) - hex($1);
+$mtd0 =~ /^(0x\w+),(0x\w+)$/ and $fssize = hex($2) - hex($1);
+$ksize and $fssize or die 'cannot read partition offsets';
+printf STDERR "Available flash space: 0x%08x (0x%08x + 0x%08x)\n", $ksize + $fssize, $ksize, $fssize;
+
+$ftp->command("MEDIA FLSH")->response();
+$ftp->binary();
+print STDERR "Writing to mtd1...\n";
+
+my $dc = $ftp->stor("fs mtd1");
+$dc or die "can't open data connection\n";
+my $rbytes = 1;
+
+while (($ksize > 0) and ($rbytes > 0)) {
+	my $buffer;
+	my $len = ($ksize > 1024 ? 1024 : $ksize);
+	$rbytes = read FILE, $buffer, $len;
+	$rbytes and $ksize -= $dc->write($buffer, $rbytes, 600);
+}
+
+$dc->close();
+$rbytes or die "no more data left to write\n";
+
+print STDERR "Writing to mtd0...\n";
+
+$dc = $ftp->stor("fs mtd0");
+$dc or die "can't open data connection\n";
+
+while (($fssize > 0) and ($rbytes > 0)) {
+	my $buffer;
+	my $len = ($fssize > 1024 ? 1024 : $fssize);
+	$rbytes = read FILE, $buffer, $len;
+	$rbytes and $fssize -= $dc->write($buffer, $rbytes, 600);
+}
+
+$dc->close();
+$ftp->reboot();
diff --git a/trunk/scripts/flashing/adsl2mue_flash.pl b/trunk/scripts/flashing/adsl2mue_flash.pl
new file mode 100755
index 00000000..c206c471
--- /dev/null
+++ b/trunk/scripts/flashing/adsl2mue_flash.pl
@@ -0,0 +1,170 @@
+#!/usr/bin/perl
+#
+#   Linksys ADSL2MUE Flash utility.
+#
+#   Copyright (C) 2008 Alexandre Lissy <alexandrelissy@free.fr>
+#   based on D-Link DSL-G6x4T flash utility by Felix Fietkau <mailto@nbd.name>
+#   based on fbox recovery util by Enrik Berkhan
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that 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
+#
+
+use IO::Socket::INET;
+use Socket;
+use strict;
+use warnings;
+
+sub usage() {
+	print STDERR "Usage: $0 <ip> [firmware.bin] [partition]\n\n";
+	exit 0;
+}
+
+my $ip = shift @ARGV;
+$ip and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ or usage();
+
+my $probe = IO::Socket::INET->new(Proto => 'udp',
+                                  Broadcast => 1,
+                                  LocalPort => 5035) or die "socket: $!";
+my $setip = unpack("N", inet_aton($ip));
+$setip > 0 or usage();
+
+my @packets;
+foreach my $ver ([18, 1], [22, 2]) {
+	push @packets, pack("vCCVNV", 0, @$ver, 1, $setip, 0);
+}
+print STDERR "Looking for device: ";
+my $broadcast = sockaddr_in(5035, INADDR_BROADCAST);
+my $scanning;
+my $box;
+
+$SIG{"ALRM"} = sub {
+	return if --$scanning <= 0;
+	foreach my $packet (@packets) {
+		$probe->send($packet, 0, $broadcast);
+	}
+	print STDERR ".";
+};
+
+$scanning = 10;
+foreach my $packet (@packets) {
+	$probe->send($packet, 0, $broadcast);
+}
+print STDERR ".";
+
+while($scanning) {
+	my $reply;
+
+	alarm(1);
+	if (my $peer = $probe->recv($reply, 16)) {
+		next if (length($reply) < 16);
+		my ($port, $addr) = sockaddr_in($peer);
+		my ($major, $minor1, $minor2, $code, $addr2) = unpack("vCCVN", $reply);
+		$addr2 = pack("N", $addr2);
+		if ($code == 1) {
+			$scanning = 0;
+			printf STDERR " found!\nADAM2 version $major.$minor1.$minor2 at %s (%s)\n", inet_ntoa($addr2), inet_ntoa($addr);
+			$box = inet_ntoa($addr2);
+		}
+	}
+}
+
+$box or die " not found!\n";
+
+{
+	package ADAM2FTP;
+	use base qw(Net::FTP);
+	
+	# ADAM2 requires upper case commands, some brain dead firewall doesn't ;-)
+	sub _USER {
+		shift->command("USER",@_)->response()
+	}
+	
+	sub _GETENV {
+		my $ftp = shift;
+		my ($ok, $name, $value);
+		
+		$ftp->command("GETENV",@_);
+			while(length($ok = $ftp->response()) < 1) {
+			my $line = $ftp->getline();
+			unless (defined($value)) {
+				chomp($line);
+				($name, $value) = split(/\s+/, $line, 2);
+			}
+		}
+		$ftp->debug_print(0, "getenv: $value\n")
+		if $ftp->debug();
+		return $value;
+	}
+	
+	sub getenv {
+		my $ftp = shift;
+		my $name = shift;
+		return $ftp->_GETENV($name);
+	}
+	
+	sub _REBOOT {
+		shift->command("REBOOT")->response() == Net::FTP::CMD_OK
+	}
+	
+	sub reboot {
+		my $ftp = shift;
+		$ftp->_REBOOT;
+		$ftp->close;
+	}
+}
+
+my $file = shift @ARGV;
+my $part = shift @ARGV;
+$file || exit 0;
+$part || exit 0;
+
+open FILE, "<$file" or die "can't open firmware file\n";
+my $ftp = ADAM2FTP->new($box, Debug => 0, Timeout => 600) or die "can't open control connection\n";
+$ftp->login("adam2", "adam2") or die "can't login\n";
+
+# my $mtd0 = $ftp->getenv("mtd0");
+# my $mtd1 = $ftp->getenv("mtd1");
+my $mtd4 = $ftp->getenv($part);
+# my ($ksize, $fssize);
+my ($ossize, $mtd_start, $mtd_end);
+
+# $mtd1 =~ /^(0x\w+),(0x\w+)$/ and $ksize = hex($2) - hex($1);
+# $mtd0 =~ /^(0x\w+),(0x\w+)$/ and $fssize = hex($2) - hex($1);
+$mtd4 =~ /^(0x\w+),(0x\w+)$/;
+$ossize = hex($2) - hex($1);
+$mtd_start = hex($1);
+$mtd_end = hex($2);
+$ossize and $mtd_start and $mtd_end or die 'cannot read partition offsets';
+printf STDERR "Available flash space: 0x%08x ($part: 0x%08x to 0x%08x)\n", $ossize, $mtd_start, $mtd_end;
+
+$ftp->command("MEDIA FLSH")->response();
+$ftp->binary();
+
+print STDERR "Writing to $part ...\n";
+my $dc = $ftp->stor("data $part");
+$dc or die "can't open data connection\n";
+my $rbytes = 1;
+
+while (($ossize > 0) and ($rbytes > 0)) {
+	my $buffer;
+	my $len = ($ossize > 1024 ? 1024 : $ossize);
+	$rbytes = read FILE, $buffer, $len;
+	printf STDERR ".";
+	$rbytes and $ossize -= $dc->write($buffer, $rbytes, 600);
+}
+
+printf STDERR "\nDone.\n";
+
+$dc->close();
diff --git a/trunk/scripts/flashing/flash.sh b/trunk/scripts/flashing/flash.sh
new file mode 100755
index 00000000..3499581e
--- /dev/null
+++ b/trunk/scripts/flashing/flash.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# tftp flash script for wireless routers 
+#
+# Copyright (C) 2004 by Oleg I. Vdovikin <oleg@cs.msu.su>
+# Copyright (C) 2005 by Waldemar Brodkorb <wbx@openwrt.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that 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
+#
+
+if [ -z "$1" ] || [ ! -f $1 ] || [ -z $2 ]; then
+    echo Usage: $0 firmware vendor
+cat << EOF
+IMPORTANT:
+Notes for Linksys / Asus WL500gx router: 
+   be sure you have set boot_wait to yes. Power on your router
+   after executing this script.
+ 
+Notes for Asus WL500g router:
+   be sure POWER led is flashing (If this is not the case
+   poweroff the device, push the reset button & power on
+   it again, then release button)
+
+1) connect your pc to the LAN port
+2) be sure your link is up and has an address in the
+   192.168.1.0/24 address range (and not the 192.168.1.1)
+
+Notes for Toshiba router:
+   boot_wait is enabled by default on these units.
+
+1) connect your pc to any of the four LAN ports
+2) be sure your link is up and has an address in the
+   192.168.10.1/24 address range (and not the 192.168.10.1)
+3) run this script (unit will only accept .trx images)
+4) Turn unit power on.
+
+EOF
+    exit 0
+fi
+if [ "$2" = "asus" ]; then
+echo Confirming IP address setting...
+echo -en "get ASUSSPACELINK\x01\x01\xa8\xc0 /dev/null\nquit\n" | tftp 192.168.1.1
+echo Flashing 192.168.1.1 using $1...
+echo -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1
+echo Please wait until leds stops flashing. 
+elif [ "$2" = "linksys" ]; then
+echo Flashing 192.168.1.1 using $1...
+echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.1.1
+echo Please wait until power led stops flashing. Do not poweroff! Then you can login via telnet 192.168.1.1.
+elif [ "$2" = "toshiba" ]; then
+echo Flashing 192.168.10.1 using $1...
+echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.10.1
+echo Unit will automatically reboot within 5 minutes.  Do not power off.  Then you can login via telnet 192.168.10.1.
+fi
diff --git a/trunk/scripts/flashing/jungo-image.py b/trunk/scripts/flashing/jungo-image.py
new file mode 100755
index 00000000..9947e7c7
--- /dev/null
+++ b/trunk/scripts/flashing/jungo-image.py
@@ -0,0 +1,283 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, 2009 (C) Jose Vasconcellos <jvasco@verizon.net>
+#
+# A script that can communicate with jungo-based routers
+# (such as MI424-WR, USR8200 and WRV54G) to backup the installed
+# firmware and replace the boot loader.
+#
+# Tested with Python 2.5 on Linux and Windows
+#
+"""Usage: %s [options] <IP_address> [image.bin | url]
+Valid options:
+\t-h | --help: usage statement
+\t-d | --dump: create a flash dump
+\t-f | --file: use <filename> to store dump contents
+\t-u | --user: provide username (default admin)
+\t-p | --pass: provide password (default password1)
+\t     --port: set port for http (default 8080)
+\t-q | --quiet: don't display unnecessary information
+\t-r | --reboot: reboot target on successful transfer
+\t-V | --version: display version information
+
+If no image (or url) is given, a flash dump is created.
+A built-in http server is used when an image file is provided.
+"""
+
+import os
+import sys
+import getopt
+import getpass
+import telnetlib
+import string
+import binascii
+import socket
+import thread
+import SocketServer
+import SimpleHTTPServer
+
+reboot = 0
+HOST = "192.168.1.1"
+PORT = 8080
+user = "admin"
+#password = getpass.getpass()
+password = "password1"
+proto = "http"
+url = ""
+imagefile = ""
+dumpfile = ""
+verbose = 1
+do_dump = 0
+dumplen = 0x10000
+flashsize=4*1024*1024
+#device="br0"
+device="ixp0"
+
+####################
+
+def start_server(server):
+    httpd = SocketServer.TCPServer((server,PORT),SimpleHTTPServer.SimpleHTTPRequestHandler)
+    thread.start_new_thread(httpd.serve_forever,())
+
+####################
+
+def get_flash_size():
+    # make sure we don't have an A0 stepping
+    tn.write("cat /proc/cpuinfo\n")
+    buf = tn.read_until("Returned 0", 3)
+    if not buf:
+        print "Unable to obtain CPU information; make sure to not use A0 stepping!"
+    elif buf.find('rev 0') > 0:
+        print "Warning: IXP42x stepping A0 detected!"
+        if imagefile or url:
+            print "Error: No linux support for A0 stepping!"
+            sys.exit(2)
+
+    # now get flash size
+    tn.write("cat /proc/mtd\n")
+    buf = tn.read_until("Returned 0", 3)
+    if buf:
+        i = buf.find('mtd0:')
+        if i > 0:
+            return int(buf[i+6:].split()[0],16)
+        # use different command
+        tn.write("flash_layout\n")
+        buf = tn.read_until("Returned 0", 3)
+        i = buf.rfind('Range ')
+        if i > 0:
+            return int(buf[i+17:].split()[0],16)
+        print "Can't determine flash size!"
+    else:
+        print "Unable to obtain flash size!"
+    sys.exit(2)
+
+def image_dump(tn, dumpfile):
+    if not dumpfile:
+        tn.write("ver\n");
+        buf = tn.read_until("Returned 0",2)
+        i = buf.find("Platform:")
+        if i < 0:
+	    platform="jungo"
+	else:
+	    line=buf[i+9:]
+	    i=line.find('\n')
+	    platform=line[:i].split()[-1]
+
+        tn.write("rg_conf_print /dev/%s/mac\n" % device);
+        buf = tn.read_until("Returned 0",3)
+
+	i = buf.find("mac(")
+	if i > 0:
+	    i += 4
+	else:
+	    print "No MAC address found! (use -f option)"
+	    sys.exit(1)
+        dumpfile = "%s-%s.bin" % (platform, buf[i:i+17].replace(':',''))
+    else:
+        tn.write("\n")
+
+    print "Dumping flash contents (%dMB) to %s" % (flashsize/1048576, dumpfile)
+    f = open(dumpfile, "wb")
+
+    t=flashsize/dumplen
+    for addr in range(t):
+	if verbose:
+	    sys.stdout.write('\r%d%%'%(100*addr/t))
+	    sys.stdout.flush()
+
+        tn.write("flash_dump -r 0x%x -l %d -4\n" % (addr*dumplen, dumplen))
+	tn.read_until("\n")
+
+	count = addr*dumplen
+        while 1:
+            buf = tn.read_until("\n")
+            if buf.strip() == "Returned 0":
+                break
+            s = buf.split()
+            if s and s[0][-1] == ':':
+		a=int(s[0][:-1],16)
+		if a != count:
+		    print "Format error: %x != %x"%(a,count)
+		    sys.exit(2)
+	    	count += 16
+		f.write(binascii.a2b_hex(string.join(s[1:],'')))
+	tn.read_until(">",1)
+
+    f.close()
+    if verbose:
+	print ""
+
+def telnet_option(sock,cmd,option):
+    #print "Option: %d %d" % (ord(cmd), ord(option))
+    if cmd == telnetlib.DO:
+        c=telnetlib.WILL
+    elif cmd == telnetlib.WILL:
+        c=telnetlib.DO
+    sock.sendall(telnetlib.IAC + c + option)
+
+def telnet_timeout():
+    print "Fatal error: telnet timeout!"
+    sys.exit(1)
+
+def usage():
+    print __doc__ % os.path.basename(sys.argv[0])
+
+####################
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "hdf:qp:P:rvV", \
+	["help", "dump", "file=", "user=", "pass=", "port=",
+	 "quiet=", "reboot", "verbose", "version"])
+except getopt.GetoptError:
+    # print help information and exit:
+    usage()
+    sys.exit(1)
+
+for o, a in opts:
+    if o in ("-h", "--help"):
+	usage()
+	sys.exit(1)
+    elif o in ("-V", "--version"):
+	print "%s: 0.11" % sys.argv[0]
+	sys.exit(1)
+    elif o in ("-d", "--no-dump"):
+	do_dump = 1
+    elif o in ("-f", "--file"):
+	dumpfile = a
+    elif o in ("-u", "--user"):
+	user = a
+    elif o in ("-p", "--pass"):
+	password = a
+    elif o == "--port":
+	PORT = int(a)
+    elif o in ("-q", "--quiet"):
+	verbose = 0
+    elif o in ("-r", "--reboot"):
+	reboot = 1
+    elif o in ("-v", "--verbose"):
+	verbose = 1
+
+# make sure we have enough arguments
+if len(args) > 0:
+    HOST = args[0]
+
+if len(args) == 2:
+    if args[1].split(':')[0] in ("tftp", "http", "ftp"):
+        url = args[1]
+    else:
+        imagefile = args[1]
+else:
+    do_dump = 1;
+
+####################
+# create a telnet session to the router
+try:
+    tn = telnetlib.Telnet(HOST)
+except socket.error, msg:
+    print "Unable to establish telnet session to %s: %s" % (HOST, msg)
+    sys.exit(1)
+
+tn.set_option_negotiation_callback(telnet_option)
+
+buf = tn.read_until("Username: ", 3)
+if not buf:
+    telnet_timeout()
+tn.write(user+"\n")
+if password:
+    buf = tn.read_until("Password: ", 3)
+    if not buf:
+        telnet_timeout()
+    tn.write(password+"\n")
+
+# wait for prompt
+buf = tn.read_until("> ", 3)
+if not buf:
+    telnet_timeout()
+
+flashsize = get_flash_size()
+
+if do_dump:
+    image_dump(tn, dumpfile)
+
+if imagefile or url:
+    splitpath = os.path.split(imagefile)
+
+    # create load command
+    if url:
+        cmd = "load -u %s -r 0\n" % (url)
+    else:
+        server = tn.get_socket().getsockname()[0]
+        cmd = "load -u http://%s:%d/%s -r 0\n" % (server, PORT, splitpath[1])
+
+        if not os.access(imagefile, os.R_OK):
+            print "File access error: %s" % (imagefile)
+            sys.exit(3)
+
+        # make sure we're in the directory where the image is located
+        if splitpath[0]:
+            os.chdir(splitpath[0])
+
+        start_server(server)
+
+    if verbose:
+	print "Unlocking flash..."
+    tn.write("unlock 0 0x%x\n" % flashsize)
+    buf = tn.read_until("Returned 0",5)
+
+    if verbose:
+	print "Writing new image..."
+    print cmd,
+    tn.write(cmd)
+    buf = tn.read_until("Returned 0",10)
+
+    # wait till the transfer completed
+    buf = tn.read_until("Download completed successfully",20)
+    if buf:
+	print "Flash update complete!"
+        if reboot:
+            tn.write("reboot\n")
+            print "Rebooting..."
+
+tn.write("exit\n")
+tn.close()
+
diff --git a/trunk/scripts/freebsd.sh b/trunk/scripts/freebsd.sh
new file mode 100644
index 00000000..3107861f
--- /dev/null
+++ b/trunk/scripts/freebsd.sh
@@ -0,0 +1 @@
+env PACKAGESITE=ftp://ftp.freebsd.org/pub/FreeBSD/ports/amd64/packages-9.0-release/All/ pkg_add -r gmake-3.82.tbz bash-4.1.11.tbz python27-2.7.2_3.tbz gtar-1.26.tbz findutils-4.5.10_2.tbz coreutils-8.12.tbz getopt-1.1.4_2.tbz wget-1.13.4_1.tbz gnugrep-2.9.tbz gawk-4.0.0.tbz
diff --git a/trunk/scripts/gen-dependencies.sh b/trunk/scripts/gen-dependencies.sh
new file mode 100755
index 00000000..85962e74
--- /dev/null
+++ b/trunk/scripts/gen-dependencies.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+SELF=${0##*/}
+
+READELF="${READELF:-readelf}"
+OBJCOPY="${OBJCOPY:-objcopy}"
+TARGETS=$*
+XARGS="${XARGS:-xargs -r}"
+
+[ -z "$TARGETS" ] && {
+  echo "$SELF: no directories / files specified"
+  echo "usage: $SELF [PATH...]"
+  exit 1
+}
+
+find $TARGETS -type f -a -exec file {} \; | \
+  sed -n -e 's/^\(.*\):.*ELF.*\(executable\|shared object\).*,.* stripped/\1/p' | \
+  $XARGS -n1 $READELF -d | \
+  awk '$2 ~ /NEEDED/ && $NF !~ /interpreter/ && $NF ~ /^\[?lib.*\.so/ { gsub(/[\[\]]/, "", $NF); print $NF }' | \
+  sort -u
+
+tmp=`mktemp $TMP_DIR/dep.XXXXXXXX`
+for kmod in `find $TARGETS -type f -name \*.ko`; do
+	$OBJCOPY -O binary -j .modinfo $kmod $tmp
+	sed -e 's,\x00,\n,g' $tmp | \
+		egrep -a '^depends=' | \
+		sed -e 's,^depends=,,' -e 's/,/\n/g' | \
+		awk '{ print $1 ".ko" }'
+done | sort -u
+rm -f $tmp
diff --git a/trunk/scripts/getver.sh b/trunk/scripts/getver.sh
new file mode 100755
index 00000000..8bb384bd
--- /dev/null
+++ b/trunk/scripts/getver.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+export LANG=C
+export LC_ALL=C
+[ -n "$TOPDIR" ] && cd $TOPDIR
+
+try_version() {
+	[ -f version ] || return 1
+	REV="$(cat version)"
+	[ -n "$REV" ]
+}
+
+try_svn() {
+	[ -d .svn ] || return 1
+	REV="$(svn info | awk '/^Last Changed Rev:/ { print $4 }')"
+	REV="${REV:+r$REV}"
+	[ -n "$REV" ]
+}
+
+try_git() {
+	[ -d .git ] || return 1
+	REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
+	REV="${REV:+r$REV}"
+	[ -n "$REV" ]
+}
+
+try_hg() {
+	[ -d .hg ] || return 1
+	REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
+	REV="${REV:+$REV}"
+	[ -n "$REV" ]
+}
+
+try_version || try_svn || try_git || try_hg || REV="unknown"
+echo "$REV"
diff --git a/trunk/scripts/ipkg b/trunk/scripts/ipkg
new file mode 100755
index 00000000..57fe9dde
--- /dev/null
+++ b/trunk/scripts/ipkg
@@ -0,0 +1,1183 @@
+#!/bin/sh
+# ipkg - the itsy package management system
+#
+# Copyright (C) 2001 Carl D. Worth
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that 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.
+
+set -e
+
+# By default do not do globbing. Any command wanting globbing should
+# explicitly enable it first and disable it afterwards.
+set -o noglob
+
+ipkg_is_upgrade () {
+  local A B a b     
+  A=$(echo $1 | sed -r "s/([0-9]+)[^[:alnum:]]*/ \1 /g").
+  B=$(echo $2 | sed -r "s/([0-9]+)[^[:alnum:]]*/ \1 /g").
+  while [ \! -z "$A" ] && [ \! -z "$B" ]; do {        
+    set $A; a=$1; shift; A=$*
+    set $B; b=$1; shift; B=$*
+      [ "$a" -lt "$b" ] 2>&- && return 1
+    { [ "$a" -gt "$b" ] 2>&- || [ "$a" ">" "$b" ]; } && return
+  }; done                                                     
+  return 1
+}         
+
+which md5sum 2>&1 >/dev/null || alias md5sum=md5
+
+ipkg_srcs() {
+	local srcre="$1"
+	sed -ne "s/^src[[:space:]]\+$srcre[[:space:]]\+//p" < $IPKG_CONF
+}
+
+ipkg_src_names() {
+	sed -ne "s/^src[[:space:]]\+\([^[:space:]]\+\).*/\1/p" < $IPKG_CONF
+}
+
+ipkg_src_byname() {
+	local src="$1"
+	ipkg_srcs $src | head -n 1
+}
+
+ipkg_dests() {
+	local destre="`echo $1 | ipkg_protect_slashes`"
+	sed -ne "/^dest[[:space:]]\+$destre/{
+s/^dest[[:space:]]\+[^[:space:]]\+[[:space:]]\+//
+s/^/`echo $IPKG_OFFLINE_ROOT | ipkg_protect_slashes`/
+p
+}" < $IPKG_CONF
+}
+
+ipkg_dest_names() {
+	sed -ne "s/^dest[[:space:]]\+\([^[:space:]]\+\).*/\1/p" < $IPKG_CONF
+}
+
+ipkg_dests_all() {
+	ipkg_dests '.*'
+}
+
+ipkg_state_dirs() {
+	ipkg_dests_all | sed "s|\$|/$IPKG_DIR_PREFIX|"
+}
+
+ipkg_dest_default() {
+	ipkg_dests_all | head -n 1
+}
+
+ipkg_dest_default_name() {
+	ipkg_dest_names | head -n 1
+}
+
+ipkg_dest_byname() {
+	local dest="$1"
+	ipkg_dests $dest | head -n 1
+}
+
+ipkg_option() {
+	local option="$1"
+	sed -ne "s/^option[[:space:]]\+$option[[:space:]]\+//p" < $IPKG_CONF
+}
+
+ipkg_load_configuration() {
+	if [ -z "$IPKG_CONF_DIR" ]; then
+		IPKG_CONF_DIR=/etc
+	fi
+
+	IPKG_CONF="$IPKG_CONF_DIR/ipkg.conf"
+
+	if [ -z "$IPKG_OFFLINE_ROOT" ]; then
+	    IPKG_OFFLINE_ROOT="`ipkg_option offline_root`"
+	fi
+	# Export IPKG_OFFLINE_ROOT for use by update-alternatives
+	export IPKG_OFFLINE_ROOT
+	if [ -n "$DEST_NAME" ]; then
+		IPKG_ROOT="`ipkg_dest_byname $DEST_NAME`"
+		if [ -z "$IPKG_ROOT" ]; then
+			if [ -d "$IPKG_OFFLINE_ROOT$DEST_NAME" ]; then
+				IPKG_ROOT="$IPKG_OFFLINE_ROOT$DEST_NAME";
+			else
+				echo "ipkg: invalid destination specification: $DEST_NAME
+Valid destinations are directories or one of the dest names from $IPKG_CONF:" >&2
+				ipkg_dest_names >&2
+				return 1
+			fi
+		fi
+	else
+		IPKG_ROOT="`ipkg_dest_default`"
+	fi
+
+	# Global ipkg state directories
+	IPKG_DIR_PREFIX=usr/lib/opkg
+	IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists
+	IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending
+	if [ -z "$IPKG_TMP" ]; then
+		IPKG_TMP=$IPKG_ROOT/tmp/ipkg
+	fi
+
+	[ -e "$IPKG_TMP" ] || mkdir -p $IPKG_TMP
+
+	# Destination specific ipkg meta-data directory
+	IPKG_STATE_DIR=$IPKG_ROOT/$IPKG_DIR_PREFIX
+
+	# Proxy Support
+	IPKG_PROXY_USERNAME="`ipkg_option proxy_username`"
+	IPKG_PROXY_PASSWORD="`ipkg_option proxy_password`"
+	IPKG_HTTP_PROXY="`ipkg_option http_proxy`"
+	IPKG_FTP_PROXY="`ipkg_option ftp_proxy`"
+	IPKG_NO_PROXY="`ipkg_option no_proxy`"
+	if [ -n "$IPKG_HTTP_PROXY" ]; then 
+		export http_proxy="$IPKG_HTTP_PROXY"
+	fi
+
+	if [ -n "$IPKG_FTP_PROXY" ]; then 
+		export ftp_proxy="$IPKG_FTP_PROXY"
+	fi
+
+	if [ -n "$IPKG_NO_PROXY" ]; then 
+		export no_proxy="$IPKG_NO_PROXY"
+	fi
+
+	IPKG_STATUS_FIELDS='\(Package\|Status\|Essential\|Version\|Conffiles\|Root\|Architecture\)'
+}
+
+ipkg_usage() {
+	[ $# -gt 0 ] && echo "ipkg: $*"
+	echo "
+usage: ipkg [options...] sub-command [arguments...]
+where sub-command is one of:
+
+Package Manipulation:
+	update  		Update list of available packages
+	upgrade			Upgrade all installed packages to latest version
+	install <pkg>		Download and install <pkg> (and dependencies)
+	install <file.ipk>	Install package <file.ipk>
+	install <file.deb>	Install package <file.deb>
+	remove <pkg>		Remove package <pkg>
+
+Informational Commands:
+	list    		List available packages and descriptions
+	files <pkg>		List all files belonging to <pkg>
+	search <file>		Search for a packaging providing <file>
+	info [pkg [<field>]]	Display all/some info fields for <pkg> or all
+	status [pkg [<field>]]	Display all/some status fields for <pkg> or all
+	depends <pkg>		Print uninstalled package dependencies for <pkg>
+
+Options:
+	-d <dest_name>          Use <dest_name> as the the root directory for
+	-dest <dest_name>	package installation, removal, upgrading.
+				<dest_name> should be a defined dest name from the
+				configuration file, (but can also be a directory
+				name in a pinch).
+        -o <offline_root>       Use <offline_root> as the root for offline installation.
+        -offline <offline_root> 				
+
+Force Options (use when ipkg is too smart for its own good):
+	-force-depends          Make dependency checks warnings instead of errors
+	-force-defaults         Use default options for questions asked by ipkg.
+                                (no prompts). Note that this will not prevent
+                                package installation scripts from prompting.
+" >&2
+	exit 1
+}
+
+ipkg_dir_part() {
+	local dir="`echo $1 | sed -ne 's/\(.*\/\).*/\1/p'`"
+	if [ -z "$dir" ]; then
+		dir="./"
+	fi
+	echo $dir
+}
+
+ipkg_file_part() {
+	echo $1 | sed 's/.*\///'
+}
+
+ipkg_protect_slashes() {
+	sed -e 's/\//\\\//g'
+}
+
+ipkg_download() {
+	local src="$1"
+	local dest="$2"
+
+	local src_file="`ipkg_file_part $src`"
+	local dest_dir="`ipkg_dir_part $dest`"
+	if [ -z "$dest_dir" ]; then
+		dest_dir="$IPKG_TMP"
+	fi
+
+	local dest_file="`ipkg_file_part $dest`"
+	if [ -z "$dest_file" ]; then
+		dest_file="$src_file"
+	fi
+
+	# Proxy support
+	local proxyuser=""
+	local proxypassword=""
+	local proxyoption=""
+		
+	if [ -n "$IPKG_PROXY_USERNAME" ]; then
+		proxyuser="--proxy-user=\"$IPKG_PROXY_USERNAME\""
+		proxypassword="--proxy-passwd=\"$IPKG_PROXY_PASSWORD\""
+	fi
+
+	if [ -n "$IPKG_PROXY_HTTP" -o -n "$IPKG_PROXY_FTP" ]; then
+		proxyoption="--proxy=on"
+	fi
+
+	rm -f $IPKG_TMP/$src_file
+	case "$src" in
+	http://* | ftp://*)
+		if ! wget --passive-ftp $proxyoption $proxyuser $proxypassword -P $IPKG_TMP $src; then
+			echo "ipkg_download: ERROR: Failed to retrieve $src, returning $err" >&2
+			return 1
+		fi
+		mv $IPKG_TMP/$src_file $dest_dir/$dest_file 2>/dev/null
+		;;
+	file:/* )
+		ln -s `echo $src | sed 's/^file://'` $dest_dir/$dest_file 2>/dev/null
+		;;
+	*)
+	echo "DEBUG: $src"
+		;;
+	esac
+
+	return 0
+}
+
+ipkg_update() {
+	if [ ! -e "$IPKG_LISTS_DIR" ]; then
+		mkdir -p $IPKG_LISTS_DIR
+	fi
+
+	local err=
+	for src_name in `ipkg_src_names`; do
+		local src="`ipkg_src_byname $src_name`"
+		if ! ipkg_download $src/Packages $IPKG_LISTS_DIR/$src_name; then
+			echo "ipkg_update: Error downloading $src/Packages to $IPKG_LISTS_DIR/$src_name" >&2
+			err=t
+		else
+			echo "Updated list of available packages in $IPKG_LISTS_DIR/$src_name"
+		fi
+	done
+
+	[ -n "$err" ] && return 1
+
+	return 0
+}
+
+ipkg_list() {
+	for src in `ipkg_src_names`; do
+		if ipkg_require_list $src; then 
+# black magic...
+sed -ne "
+/^Package:/{
+s/^Package:[[:space:]]*\<\([a-z0-9.+-]*$1[a-z0-9.+-]*\).*/\1/
+h
+}
+/^Description:/{
+s/^Description:[[:space:]]*\(.*\)/\1/
+H
+g
+s/\\
+/ - /
+p
+}
+" $IPKG_LISTS_DIR/$src
+		fi
+	done
+}
+
+ipkg_extract_paragraph() {
+	local pkg="$1"
+	sed -ne "/Package:[[:space:]]*$pkg[[:space:]]*\$/,/^\$/p"
+}
+
+ipkg_extract_field() {
+	local field="$1"
+# blacker magic...
+	sed -ne "
+: TOP
+/^$field:/{
+p
+n
+b FIELD
+}
+d
+: FIELD
+/^$/b TOP
+/^[^[:space:]]/b TOP
+p
+n
+b FIELD
+"
+}
+
+ipkg_extract_value() {
+	sed -e "s/^[^:]*:[[:space:]]*//"
+}
+
+ipkg_require_list() {
+	[ $# -lt 1 ] && return 1
+	local src="$1"
+	if [ ! -f "$IPKG_LISTS_DIR/$src" ]; then
+		echo "ERROR: File not found: $IPKG_LISTS_DIR/$src" >&2
+		echo "       You probably want to run \`ipkg update'" >&2
+		return 1
+	fi
+	return 0
+}
+
+ipkg_info() {
+	for src in `ipkg_src_names`; do
+		if ipkg_require_list $src; then
+			case $# in
+			0)
+				cat $IPKG_LISTS_DIR/$src
+				;;	
+			1)
+				ipkg_extract_paragraph $1 < $IPKG_LISTS_DIR/$src
+				;;
+			*)
+				ipkg_extract_paragraph $1 < $IPKG_LISTS_DIR/$src | ipkg_extract_field $2
+				;;
+			esac
+		fi
+	done
+}
+
+ipkg_status_sd() {
+	[ $# -lt 1 ] && return 0
+	sd="$1"
+	shift
+	if [ -f $sd/status ]; then
+		case $# in
+		0)
+			cat $sd/status
+			;;
+		1)
+			ipkg_extract_paragraph $1 < $sd/status
+			;;
+		*)
+			ipkg_extract_paragraph $1 < $sd/status | ipkg_extract_field $2
+			;;
+		esac
+	fi
+	return 0
+}
+
+ipkg_status_all() {
+	for sd in `ipkg_state_dirs`; do
+		ipkg_status_sd $sd $*
+	done
+}
+
+ipkg_status() {
+	if [ -n "$DEST_NAME" ]; then
+		ipkg_status_sd $IPKG_STATE_DIR $*
+	else
+		ipkg_status_all $*
+	fi
+}
+
+ipkg_status_matching_sd() {
+	local sd="$1"
+	local re="$2"
+	if [ -f $sd/status ]; then
+		sed -ne "
+: TOP
+/^Package:/{
+s/^Package:[[:space:]]*//
+s/[[:space:]]*$//
+h
+}
+/$re/{
+g
+p
+b NEXT
+}
+d
+: NEXT
+/^$/b TOP
+n
+b NEXT
+" < $sd/status
+	fi
+	return 0
+}
+
+ipkg_status_matching_all() {
+	for sd in `ipkg_state_dirs`; do
+		ipkg_status_matching_sd $sd $*
+	done
+}
+
+ipkg_status_matching() {
+	if [ -n "$DEST_NAME" ]; then
+		ipkg_status_matching_sd $IPKG_STATE_DIR $*
+	else
+		ipkg_status_matching_all $*
+	fi
+}
+
+ipkg_status_installed_sd() {
+	local sd="$1"
+	local pkg="$2"
+	ipkg_status_sd $sd $pkg Status | grep -q "Status: install ok installed"
+}
+
+ipkg_status_installed_all() {
+	local ret=1
+	for sd in `ipkg_state_dirs`; do
+		if `ipkg_status_installed_sd $sd $*`; then
+			ret=0
+		fi
+	done
+	return $ret
+}
+
+ipkg_status_mentioned_sd() {
+	local sd="$1"
+	local pkg="$2"
+	[ -n "`ipkg_status_sd $sd $pkg Status`" ]
+}
+
+ipkg_files() {
+	local pkg="$1"
+	if [ -n "$DEST_NAME" ]; then
+		dests=$IPKG_ROOT
+	else
+		dests="`ipkg_dests_all`"
+	fi
+	for dest in $dests; do
+		if [ -f $dest/$IPKG_DIR_PREFIX/info/$pkg.list ]; then
+			dest_sed="`echo $dest | ipkg_protect_slashes`"
+			sed -e "s/^/$dest_sed/" < $dest/$IPKG_DIR_PREFIX/info/$pkg.list
+		fi
+	done
+}
+
+ipkg_search() {
+	local pattern="$1"
+
+	for dest_name in `ipkg_dest_names`; do
+		dest="`ipkg_dest_byname $dest_name`"
+		dest_sed="`echo $dest | ipkg_protect_slashes`"
+
+		set +o noglob
+		local list_files="`ls -1 $dest/$IPKG_DIR_PREFIX/info/*.list 2>/dev/null`"
+		set -o noglob
+		for file in $list_files; do
+			if sed "s/^/$dest_sed/" $file | grep -q $pattern; then
+				local pkg="`echo $file | sed "s/^.*\/\(.*\)\.list/\1/"`"
+				[ "$dest_name" != `ipkg_dest_default_name` ] && pkg="$pkg ($dest_name)"
+				sed "s/^/$dest_sed/" $file | grep $pattern | sed "s/^/$pkg: /"
+			fi
+		done
+	done
+}
+
+ipkg_status_remove_sd() {
+	local sd="$1"
+	local pkg="$2"
+
+	if [ ! -f $sd/status ]; then
+		mkdir -p $sd
+		touch $sd/status
+	fi
+	sed -ne "/Package:[[:space:]]*$pkg[[:space:]]*\$/,/^\$/!p" < $sd/status > $sd/status.new
+	mv $sd/status.new $sd/status
+}
+
+ipkg_status_remove_all() {
+	for sd in `ipkg_state_dirs`; do
+		ipkg_status_remove_sd $sd $*
+	done
+}
+
+ipkg_status_remove() {
+	if [ -n "$DEST_NAME" ]; then
+		ipkg_status_remove_sd $IPKG_STATE_DIR $*
+	else
+		ipkg_status_remove_all $*
+	fi
+}
+
+ipkg_status_update_sd() {
+	local sd="$1"
+	local pkg="$2"
+
+	ipkg_status_remove_sd $sd $pkg
+	ipkg_extract_field "$IPKG_STATUS_FIELDS" >> $sd/status
+	echo "" >> $sd/status
+}
+
+ipkg_status_update() {
+	ipkg_status_update_sd $IPKG_STATE_DIR $*
+}
+
+ipkg_unsatisfied_dependences() {
+    local pkg=$1
+    local deps="`ipkg_get_depends $pkg`"
+    local remaining_deps=
+    for dep in $deps; do
+	local installed="`ipkg_get_installed $dep`"
+	if [ "$installed" != "installed" ] ; then
+	    remaining_deps="$remaining_deps $dep"
+	fi
+    done
+    ## echo "ipkg_unsatisfied_dependences pkg=$pkg $remaining_deps" > /dev/console
+    echo $remaining_deps
+}
+
+ipkg_safe_pkg_name() {
+	local pkg=$1
+	local spkg="`echo pkg_$pkg | sed -e y/-+./___/`"
+	echo $spkg
+}
+
+ipkg_set_depends() {
+	local pkg=$1; shift 
+	local new_deps="$*"
+	pkg="`ipkg_safe_pkg_name $pkg`"
+	## setvar ${pkg}_depends "$new_deps"
+	echo $new_deps > $IPKG_TMP/${pkg}.depends
+}
+
+ipkg_get_depends() {
+	local pkg=$1
+	pkg="`ipkg_safe_pkg_name $pkg`"
+	cat $IPKG_TMP/${pkg}.depends
+	## eval "echo \$${pkg}_depends"
+}
+
+ipkg_set_installed() {
+	local pkg=$1
+	pkg="`ipkg_safe_pkg_name $pkg`"
+	echo installed > $IPKG_TMP/${pkg}.installed
+	## setvar ${pkg}_installed "installed"
+}
+
+ipkg_set_uninstalled() {
+	local pkg=$1
+	pkg="`ipkg_safe_pkg_name $pkg`"
+	### echo ipkg_set_uninstalled $pkg > /dev/console
+	echo uninstalled > $IPKG_TMP/${pkg}.installed
+	## setvar ${pkg}_installed "uninstalled"
+}
+
+ipkg_get_installed() {
+	local pkg=$1
+	pkg="`ipkg_safe_pkg_name $pkg`"
+	if [ -f $IPKG_TMP/${pkg}.installed ]; then
+		cat $IPKG_TMP/${pkg}.installed
+	fi
+	## eval "echo \$${pkg}_installed"
+}
+
+ipkg_depends() {
+	local new_pkgs="$*"
+	local all_deps=
+	local installed_pkgs="`ipkg_status_matching_all 'Status:.*[[:space:]]installed'`"
+	for pkg in $installed_pkgs; do
+	    ipkg_set_installed $pkg
+	done
+	while [ -n "$new_pkgs" ]; do
+		all_deps="$all_deps $new_pkgs"
+		local new_deps=
+		for pkg in $new_pkgs; do
+			if echo $pkg | grep -q '[^A-Za-z0-9.+-]'; then
+				echo "ipkg_depends: ERROR: Package name $pkg contains illegal characters (should be [A-Za-z0-9.+-])" >&2
+				return 1
+			fi
+			# TODO: Fix this. For now I am ignoring versions and alternations in dependencies.
+			new_deps="$new_deps "`ipkg_info $pkg '\(Pre-\)\?Depends' | ipkg_extract_value | sed -e 's/([^)]*)//g
+s/\(|[[:space:]]*[a-z0-9.+-]\+[[:space:]]*\)\+//g
+s/,/ /g
+s/ \+/ /g'`
+			ipkg_set_depends $pkg $new_deps
+		done
+
+		new_deps=`echo $new_deps | sed -e 's/[[:space:]]\+/\n/g' | sort | uniq`
+
+		local maybe_new_pkgs=
+		for pkg in $new_deps; do
+			if ! echo $installed_pkgs | grep -q "\<$pkg\>"; then
+				maybe_new_pkgs="$maybe_new_pkgs $pkg"
+			fi
+		done
+
+		new_pkgs=
+		for pkg in $maybe_new_pkgs; do
+			if ! echo $all_deps | grep -q "\<$pkg\>"; then
+				if [ -z "`ipkg_info $pkg`" ]; then
+					echo "ipkg_depends: Warning: $pkg mentioned in dependency but no package found in $IPKG_LISTS_DIR" >&2
+					ipkg_set_installed $pkg
+				else
+					new_pkgs="$new_pkgs $pkg"
+					ipkg_set_uninstalled $pkg
+				fi
+			else
+				ipkg_set_uninstalled $pkg
+			fi
+		done
+	done
+
+	echo $all_deps
+}
+
+ipkg_get_install_dest() {
+	local dest="$1"
+	shift
+	local sd=$dest/$IPKG_DIR_PREFIX
+	local info_dir=$sd/info
+
+        local requested_pkgs="$*"
+	local pkgs="`ipkg_depends $*`"
+
+	mkdir -p $info_dir
+	for pkg in $pkgs; do
+		if ! ipkg_status_mentioned_sd $sd $pkg; then
+			echo "Package: $pkg
+Status: install ok not-installed" | ipkg_status_update_sd $sd $pkg
+		fi
+	done
+        ## mark the packages that we were directly requested to install as uninstalled
+        for pkg in $requested_pkgs; do ipkg_set_uninstalled $pkg; done
+
+	local new_pkgs=
+	local pkgs_installed=0
+	while [ -n "pkgs" ]; do
+		curcheck=0
+		## echo "pkgs to install: {$pkgs}" > /dev/console
+		for pkg in $pkgs; do
+			curcheck="`expr $curcheck + 1`"
+			local is_installed="`ipkg_get_installed $pkg`"
+			if [ "$is_installed" = "installed" ]; then
+				echo "$pkg is installed"
+				continue
+			fi
+
+			local remaining_deps="`ipkg_unsatisfied_dependences $pkg`"
+			if [ -n "$remaining_deps" ]; then
+				new_pkgs="$new_pkgs $pkg"
+				### echo "Dependences not satisfied for $pkg: $remaining_deps"
+				if [ $curcheck -ne `echo  $pkgs|wc -w` ]; then
+			        	continue
+				fi
+			fi
+
+			local filename=
+			for src in `ipkg_src_names`; do
+				if ipkg_require_list $src; then
+					filename="`ipkg_extract_paragraph $pkg < $IPKG_LISTS_DIR/$src | ipkg_extract_field Filename | ipkg_extract_value`"
+					[ -n "$filename" ] && break
+				fi
+			done
+
+			if [ -z "$filename" ]; then
+				echo "ipkg_get_install: ERROR: Cannot find package $pkg in $IPKG_LISTS_DIR" >&2
+				echo "ipkg_get_install:        Check the spelling and maybe run \`ipkg update'." >&2
+				ipkg_status_remove_sd $sd $pkg
+				return 1;
+			fi
+
+			local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $filename`
+			if ! ipkg_download `ipkg_src_byname $src`/$filename $tmp_pkg_file; then
+				echo "ipkg_get_install: Perhaps you need to run \`ipkg update'?"
+				return 1
+			fi
+
+			if ! ipkg_install_file_dest $dest $tmp_pkg_file; then
+				echo "ipkg_get_install: ERROR: Failed to install $tmp_pkg_file" >&2
+				echo "ipkg_get_install: I'll leave it there for you to try a manual installation" >&2
+				return 1
+			fi
+
+			ipkg_set_installed $pkg
+			pkgs_installed="`expr $pkgs_installed + 1`"
+			rm $tmp_pkg_file
+		done
+		### echo "Installed $pkgs_installed package(s) this round"
+		if [ $pkgs_installed -eq 0 ]; then
+			if [ -z "$new_pkgs" ]; then
+			    break
+			fi
+		fi
+		pkgs_installed=0
+		pkgs="$new_pkgs"
+		new_pkgs=
+		curcheck=0
+        done
+}
+
+ipkg_get_install() {
+	ipkg_get_install_dest $IPKG_ROOT $*
+}
+
+ipkg_install_file_dest() {
+	local dest="$1"
+	local filename="$2"
+	local sd=$dest/$IPKG_DIR_PREFIX
+	local info_dir=$sd/info
+
+	if [ ! -f "$filename" ]; then
+		echo "ipkg_install_file: ERROR: File $filename not found" >&2
+		return 1
+	fi
+
+	local pkg="`ipkg_file_part $filename | sed 's/\([a-z0-9.+-]\+\)_.*/\1/'`"
+	local ext="`echo $filename | sed 's/.*\.//'`"
+	local pkg_extract_stdout
+	if [ "$ext" = "ipk" ]; then
+		pkg_extract_stdout="tar -xzOf"
+	elif [ "$ext" = "deb" ]; then
+		pkg_extract_stdout="ar p"
+	else
+		echo "ipkg_install_file: ERROR: File $filename has unknown extension $ext (not .ipk or .deb)" >&2
+		return 1
+	fi
+
+	# Check dependencies
+	local depends="`ipkg_depends $pkg | sed -e "s/\<$pkg\>//"`"
+
+	# Don't worry about deps that are scheduled for installation
+	local missing_deps=
+	for dep in $depends; do
+		if ! ipkg_status_all $dep | grep -q 'Status:[[:space:]]install'; then
+			missing_deps="$missing_deps $dep"
+		fi
+	done
+
+	if [ ! -z "$missing_deps" ]; then
+		if [ -n "$FORCE_DEPENDS" ]; then
+			echo "ipkg_install_file: Warning: $pkg depends on the following uninstalled programs: $missing_deps" >&2
+		else
+			echo "ipkg_install_file: ERROR: $pkg depends on the following uninstalled programs:
+	$missing_deps" >&2
+			echo "ipkg_install_file: You may want to use \`ipkg install' to install these." >&2
+			return 1
+		fi
+	fi
+
+	mkdir -p $IPKG_TMP/$pkg/control
+	mkdir -p $IPKG_TMP/$pkg/data
+	mkdir -p $info_dir
+
+	if ! $pkg_extract_stdout $filename ./control.tar.gz | (cd $IPKG_TMP/$pkg/control; zcat | tar -xf - ) ; then
+		echo "ipkg_install_file: ERROR unpacking control.tar.gz from $filename" >&2
+		return 1
+	fi
+
+	if [ -n "$IPKG_OFFLINE_ROOT" ]; then
+		if grep -q '^InstallsOffline:[[:space:]]*no' $IPKG_TMP/$pkg/control/control; then
+			echo "*** Warning: Package $pkg may not be installed in offline mode" >&2
+			echo "*** Warning: Scheduling $filename for pending installation (installing into $IPKG_PENDING_DIR)" >&2
+			echo "Package: $pkg
+Status: install ok pending" | ipkg_status_update_sd $sd $pkg
+			mkdir -p $IPKG_PENDING_DIR
+			cp -f $filename $IPKG_PENDING_DIR
+			rm -r $IPKG_TMP/$pkg/control
+			rm -r $IPKG_TMP/$pkg/data
+			rmdir $IPKG_TMP/$pkg
+			return 0
+		fi
+	fi
+
+
+	printf "Unpacking $pkg..."
+	set +o noglob
+	for file in $IPKG_TMP/$pkg/control/*; do
+		local base_file="`ipkg_file_part $file`"
+		mv $file $info_dir/$pkg.$base_file
+	done
+	set -o noglob
+	rm -r $IPKG_TMP/$pkg/control
+
+	if ! $pkg_extract_stdout $filename ./data.tar.gz | (cd $IPKG_TMP/$pkg/data; zcat | tar -xf - ) ; then
+		echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename" >&2
+		return 1
+	fi
+	echo "Done."
+
+	printf "Configuring $pkg..."
+	export PKG_ROOT=$dest
+	if [ -x "$info_dir/$pkg.preinst" ]; then
+		if ! $info_dir/$pkg.preinst install; then
+			echo "$info_dir/$pkg.preinst failed. Aborting installation of $pkg"
+			rm -rf $IPKG_TMP/$pkg/data
+			rmdir $IPKG_TMP/$pkg
+			return 1
+		fi
+	fi
+
+	local old_conffiles="`ipkg_status_sd $sd $pkg Conffiles | ipkg_extract_value`"
+	local new_conffiles=
+	if [ -f "$info_dir/$pkg.conffiles" ]; then
+		for conffile in `cat $info_dir/$pkg.conffiles`; do
+			if [ -f "$dest/$conffile" ] && ! echo " $old_conffiles " | grep -q " $conffile "`md5sum $dest/$conffile | sed 's/ .*//'`; then
+				local use_maintainers_conffile=
+				if [ -z "$FORCE_DEFAULTS" ]; then
+					while true; do
+						printf "Configuration file \`$conffile'
+ ==> File on system created by you or by a script.
+ ==> File also in package provided by package maintainer.
+   What would you like to do about it ?  Your options are:
+    Y or I  : install the package maintainer's version
+    N or O  : keep your currently-installed version
+      D     : show the differences between the versions (if diff is installed)
+ The default action is to keep your current version.
+*** `ipkg_file_part $conffile` (Y/I/N/O/D) [default=N] ? "
+						read response
+						case "$response" in
+						[YyIi] | [Yy][Ee][Ss])
+							use_maintainers_conffile=t
+							break
+						;;
+						[Dd])
+							echo "
+diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
+							diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile || true
+							echo "[Press ENTER to continue]"
+							read junk
+						;;
+						*)
+							break
+						;;
+						esac
+					done
+				fi
+				if [ -n "$use_maintainers_conffile" ]; then
+					local md5sum="`md5sum $IPKG_TMP/$pkg/data/$conffile | sed 's/ .*//'`"
+					new_conffiles="$new_conffiles $conffile $md5sum"
+				else
+					new_conffiles="$new_conffiles $conffile <custom>"
+					rm $IPKG_TMP/$pkg/data/$conffile
+				fi
+			else
+				md5sum="`md5sum $IPKG_TMP/$pkg/data/$conffile | sed 's/ .*//'`"
+				new_conffiles="$new_conffiles $conffile $md5sum"
+			fi
+		done
+	fi
+
+	local owd="`pwd`"
+	(cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -))
+	rm -rf $IPKG_TMP/$pkg/data
+	rmdir $IPKG_TMP/$pkg
+	rm -f $info_dir/$pkg.list
+	$pkg_extract_stdout $filename ./data.tar.gz | zcat | tar tf - | sed -e '/\/$/d; s/^\.//' > $info_dir/$pkg.list
+
+	if [ -x "$info_dir/$pkg.postinst" ]; then
+		$info_dir/$pkg.postinst configure
+	fi
+
+	if [ -n "$new_conffiles" ]; then
+		new_conffiles='Conffiles: '`echo $new_conffiles | ipkg_protect_slashes`
+	fi
+	local sed_safe_offline_root="`echo ${IPKG_OFFLINE_ROOT} | ipkg_protect_slashes`"
+	local sed_safe_root="`echo $dest | sed -e "s/^${sed_safe_offline_root}//" | ipkg_protect_slashes`"
+	sed -e "s/\(Package:.*\)/\1\\
+Status: install ok installed\\
+Root: ${sed_safe_root}\\
+${new_conffiles}/" $info_dir/$pkg.control | ipkg_status_update_sd $sd $pkg
+
+	rm -f $info_dir/$pkg.control
+	rm -f $info_dir/$pkg.conffiles
+	rm -f $info_dir/$pkg.preinst
+	rm -f $info_dir/$pkg.postinst
+
+	echo "Done."
+}
+
+ipkg_install_file() {
+	ipkg_install_file_dest $IPKG_ROOT $*
+}
+
+ipkg_install() {
+	while [ $# -gt 0 ]; do
+		local pkg="$1"
+		shift
+	
+		case "$pkg" in
+		http://* | ftp://*)
+			local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $pkg`
+			if ipkg_download $pkg $tmp_pkg_file; then
+				ipkg_install_file $tmp_pkg_file
+				rm $tmp_pkg_file
+			fi
+			;;
+		file:/*.ipk  | file://*.deb)
+				local ipkg_filename="`echo $pkg|sed 's/^file://'`"
+				ipkg_install_file $ipkg_filename
+			;;
+		*.ipk  | *.deb)
+				ipkg_install_file $pkg
+			;;
+		*)
+			ipkg_get_install $pkg || true
+			;;
+		esac
+	done
+}
+
+ipkg_install_pending() {
+	[ -n "$IPKG_OFFLINE_ROOT" ] && return 0
+
+	if [ -d "$IPKG_PENDING_DIR" ]; then
+		set +o noglob
+		local pending="`ls -1d $IPKG_PENDING_DIR/*.ipk 2> /dev/null`" || true
+		set -o noglob
+		if [ -n "$pending" ]; then
+			echo "The following packages in $IPKG_PENDING_DIR will now be installed:"
+			echo $pending
+			for filename in $pending; do
+				if ipkg_install_file $filename; then
+					rm $filename
+				fi
+			done
+		fi
+	fi
+	return 0
+}
+
+ipkg_install_wanted() {
+	local wanted="`ipkg_status_matching 'Status:[[:space:]]*install.*not-installed'`"
+
+	if [ -n "$wanted" ]; then
+		echo "The following package were previously requested but have not been installed:"
+		echo $wanted
+
+		if [ -n "$FORCE_DEFAULTS" ]; then
+			echo "Installing them now."
+		else
+			printf "Install them now [Y/n] ? "
+			read response
+			case "$response" in
+			[Nn] | [Nn][Oo])
+				return 0
+				;;
+			esac
+		fi
+
+		ipkg_install $wanted
+	fi
+
+	return 0
+}
+
+ipkg_upgrade_pkg() {
+	local pkg="$1"
+	local avail_ver="`ipkg_info $pkg Version | ipkg_extract_value | head -n 1`"
+
+	is_installed=
+	for dest_name in `ipkg_dest_names`; do
+		local dest="`ipkg_dest_byname $dest_name`"
+		local sd=$dest/$IPKG_DIR_PREFIX
+		local inst_ver="`ipkg_status_sd $sd $pkg Version | ipkg_extract_value`"
+		if [ -n "$inst_ver" ]; then
+			is_installed=t
+
+			if [ -z "$avail_ver" ]; then
+				echo "Assuming locally installed package $pkg ($inst_ver) is up to date"
+				return 0
+			fi
+
+			if [ "$avail_ver" = "$inst_ver" ]; then 
+				echo "Package $pkg ($inst_ver) installed in $dest_name is up to date"
+			elif ipkg_is_upgrade "$avail_ver" "$inst_ver"; then
+				echo "Upgrading $pkg ($dest_name) from $inst_ver to $avail_ver"
+				ipkg_get_install_dest $dest $pkg
+			else
+				echo "Not downgrading package $pkg from $inst_ver to $avail_ver"
+			fi
+		fi
+	done
+
+	if [ -z "$is_installed" ]; then
+		echo "Package $pkg does not appear to be installed"
+		return 0
+	fi
+
+}
+
+ipkg_upgrade() {
+	if [ $# -lt 1 ]; then
+		local pkgs="`ipkg_status_matching 'Status:.*[[:space:]]installed'`"
+	else
+		pkgs="$*"
+	fi
+	
+	for pkg in $pkgs; do
+		ipkg_upgrade_pkg $pkg
+	done
+}
+
+ipkg_remove_pkg_dest() {
+	local dest="$1"
+	local pkg="$2"
+	local sd=$dest/$IPKG_DIR_PREFIX
+	local info_dir=$sd/info
+
+	if ! ipkg_status_installed_sd $sd $pkg; then
+		echo "ipkg_remove: Package $pkg does not appear to be installed in $dest"
+		if ipkg_status_mentioned_sd $sd $pkg; then
+			echo "Purging mention of $pkg from the ipkg database"
+			ipkg_status_remove_sd $sd $pkg
+		fi
+		return 1
+	fi
+
+	echo "ipkg_remove: Removing $pkg... "
+
+	local files="`cat $info_dir/$pkg.list`"
+
+	export PKG_ROOT=$dest
+	if [ -x "$info_dir/$pkg.prerm" ]; then
+		$info_dir/$pkg.prerm remove
+	fi
+
+	local conffiles="`ipkg_status_sd $sd $pkg Conffiles | ipkg_extract_value`"
+
+	local dirs_to_remove=
+	for file in $files; do
+		if [ -d "$dest/$file" ]; then
+			dirs_to_remove="$dirs_to_remove $dest/$file"
+		else
+			if echo " $conffiles " | grep -q " $file "; then
+				if echo " $conffiles " | grep -q " $file "`md5sum $dest/$file | sed 's/ .*//'`; then
+					rm -f $dest/$file
+				fi
+			else
+				rm -f $dest/$file
+			fi
+		fi
+	done
+
+	local removed_a_dir=t
+	while [ -n "$removed_a_dir" ]; do
+		removed_a_dir=
+		local new_dirs_to_remove=
+		for dir in $dirs_to_remove; do
+			if rmdir $dir >/dev/null 2>&1; then
+				removed_a_dir=t
+			else
+				new_dirs_to_remove="$new_dirs_to_remove $dir"
+			fi
+		done
+		dirs_to_remove="$new_dirs_to_remove"
+	done
+
+	if [ -n "$dirs_to_remove" ]; then
+		echo "ipkg_remove: Warning: Not removing the following directories since they are not empty:" >&2
+		echo "$dirs_to_remove" | sed -e 's/\/[/]\+/\//g' >&2
+	fi
+
+	if [ -x "$info_dir/$pkg.postrm" ]; then
+		$info_dir/$pkg.postrm remove
+	fi
+
+	ipkg_status_remove_sd $sd $pkg
+	set +o noglob
+	rm -f $info_dir/$pkg.*
+	set -o noglob
+
+	echo "Done."
+}
+
+ipkg_remove_pkg() {
+	local pkg="$1"
+	for dest in `ipkg_dests_all`; do
+		local sd=$dest/$IPKG_DIR_PREFIX
+		if ipkg_status_mentioned_sd $sd $pkg; then
+			ipkg_remove_pkg_dest $dest $pkg
+		fi
+	done
+}
+
+ipkg_remove() {
+	while [ $# -gt 0 ]; do
+		local pkg="$1"
+		shift
+		if [ -n "$DEST_NAME" ]; then
+			ipkg_remove_pkg_dest $IPKG_ROOT $pkg
+		else
+			ipkg_remove_pkg $pkg
+		fi
+	done
+}
+
+###########
+# ipkg main
+###########
+
+# Parse options
+while [ $# -gt 0 ]; do
+	arg="$1"
+	case $arg in
+	-d | -dest)
+		[ $# -gt 1 ] || ipkg_usage "option $arg requires an argument"
+		DEST_NAME="$2"
+		shift
+		;;
+	-o | -offline)
+		[ $# -gt 1 ] || ipkg_usage "option $arg requires an argument"
+		IPKG_OFFLINE_ROOT="$2"
+		shift
+		;;
+	-force-depends)
+		FORCE_DEPENDS=t
+		;;
+	-force-defaults)
+		FORCE_DEFAULTS=t
+		;;
+	-*)
+		ipkg_usage "unknown option $arg"
+		;;
+	*)
+		break
+		;;
+	esac
+	shift
+done
+
+[ $# -lt 1 ] && ipkg_usage "ipkg must have one sub-command argument"
+cmd="$1"
+shift
+
+ipkg_load_configuration
+mkdir -p /tmp/ipkg
+
+case "$cmd" in
+update|upgrade|list|info|status|install_pending)
+	;;
+install|depends|remove|files|search)
+	[ $# -lt 1 ] && ipkg_usage "ERROR: the \`\`$cmd'' command requires an argument" >&2
+	;;
+*)
+	echo "ERROR: unknown sub-command \`$cmd'" >&2
+	ipkg_usage
+	;;
+esac
+
+# Only install pending if we have an interactive sub-command
+case "$cmd" in
+upgrade|install)
+	ipkg_install_pending
+	ipkg_install_wanted
+	;;
+esac
+
+ipkg_$cmd $*
+for a in `ls $IPKG_TMP`; do
+	rm -rf $IPKG_TMP/$a
+done
diff --git a/trunk/scripts/ipkg-make-index.sh b/trunk/scripts/ipkg-make-index.sh
new file mode 100755
index 00000000..a398559b
--- /dev/null
+++ b/trunk/scripts/ipkg-make-index.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -e
+
+pkg_dir=$1
+
+if [ -z $pkg_dir ] || [ ! -d $pkg_dir ]; then
+	echo "Usage: ipkg-make-index <package_directory>" >&2
+	exit 1
+fi
+
+which md5sum >/dev/null 2>&1 || alias md5sum=md5
+
+for pkg in `find $pkg_dir -name '*.ipk' | sort`; do
+	name="${pkg##*/}"
+	name="${name%%_*}"
+	[[ "$name" = "kernel" ]] && continue
+	[[ "$name" = "libc" ]] && continue
+	echo "Generating index for package $pkg" >&2
+	file_size=$(ls -l $pkg | awk '{print $5}')
+	md5sum=$(md5sum $pkg | awk '{print $1}')
+	sha256sum=$(openssl dgst -sha256 $pkg | awk '{print $2}')
+	# Take pains to make variable value sed-safe
+	sed_safe_pkg=`echo $pkg | sed -e 's/^\.\///g' -e 's/\\//\\\\\\//g'`
+	tar -xzOf $pkg ./control.tar.gz | tar xzOf - ./control | sed -e "s/^Description:/Filename: $sed_safe_pkg\\
+Size: $file_size\\
+MD5Sum: $md5sum\\
+SHA256sum: $sha256sum\\
+Description:/"
+	echo ""
+done
diff --git a/trunk/scripts/kconfig.pl b/trunk/scripts/kconfig.pl
new file mode 100755
index 00000000..45c565e7
--- /dev/null
+++ b/trunk/scripts/kconfig.pl
@@ -0,0 +1,182 @@
+#!/usr/bin/env perl
+# 
+# Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+use warnings;
+use strict;
+
+my @arg;
+my $PREFIX = "CONFIG_";
+
+sub set_config($$$$) {
+	my $config = shift;
+	my $idx = shift;
+	my $newval = shift;
+	my $mod_plus = shift;
+
+	if (!defined($config->{$idx}) or !$mod_plus or
+	    $config->{$idx} eq '#undef' or $newval eq 'y') {
+		$config->{$idx} = $newval;
+	}
+}
+
+sub load_config($$) {
+	my $file = shift;
+	my $mod_plus = shift;
+	my %config;
+
+	open FILE, "$file" or die "can't open file '$file'";
+	while (<FILE>) {
+		chomp;
+		/^$PREFIX(.+?)=(.+)/ and do {
+			set_config(\%config, $1, $2, $mod_plus);
+			next;
+		};
+		/^# $PREFIX(.+?) is not set/ and do {
+			set_config(\%config, $1, "#undef", $mod_plus);
+			next;
+		};
+		/^#/ and next;
+		/^(.+)$/ and warn "WARNING: can't parse line: $1\n";
+	}
+	return \%config;
+}
+
+
+sub config_and($$) {
+	my $cfg1 = shift;
+	my $cfg2 = shift;
+	my %config;
+
+	foreach my $config (keys %$cfg1) {
+		my $val1 = $cfg1->{$config};
+		my $val2 = $cfg2->{$config};
+		$val2 and ($val1 eq $val2) and do {
+			$config{$config} = $val1;
+		};
+	}
+	return \%config;
+}
+
+
+sub config_add($$$) {
+	my $cfg1 = shift;
+	my $cfg2 = shift;
+	my $mod_plus = shift;
+	my %config;
+	
+	for ($cfg1, $cfg2) {
+		my %cfg = %$_;
+		
+		foreach my $config (keys %cfg) {
+			if ($mod_plus and $config{$config}) {
+				next if $config{$config} eq "y";
+				next if $cfg{$config} eq '#undef';
+			}
+			$config{$config} = $cfg{$config};
+		}
+	}
+	return \%config;
+}
+
+sub config_diff($$$) {
+	my $cfg1 = shift;
+	my $cfg2 = shift;
+	my $new_only = shift;
+	my %config;
+	
+	foreach my $config (keys %$cfg2) {
+		if (!defined($cfg1->{$config}) or $cfg1->{$config} ne $cfg2->{$config}) {
+			next if $new_only and !defined($cfg1->{$config}) and $cfg2->{$config} eq '#undef';
+			$config{$config} = $cfg2->{$config};
+		}
+	}
+	return \%config
+}
+
+sub config_sub($$) {
+	my $cfg1 = shift;
+	my $cfg2 = shift;
+	my %config = %{$cfg1};
+	
+	foreach my $config (keys %$cfg2) {
+		delete $config{$config};
+	}
+	return \%config;
+}
+
+sub print_cfgline($$) {
+	my $name = shift;
+	my $val = shift;
+	if ($val eq '#undef' or $val eq 'n') {
+		print "# $PREFIX$name is not set\n";
+	} else {
+		print "$PREFIX$name=$val\n";
+	}
+}
+
+
+sub dump_config($) {
+	my $cfg = shift;
+	die "argument error in dump_config" unless ($cfg);
+	my %config = %$cfg;
+	foreach my $config (sort keys %config) {
+		print_cfgline($config, $config{$config});
+	}
+}
+
+sub parse_expr {
+	my $pos = shift;
+	my $mod_plus = shift;
+	my $arg = $arg[$$pos++];
+
+	die "Parse error" if (!$arg);
+
+	if ($arg eq '&') {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos);
+		return config_and($arg1, $arg2);
+	} elsif ($arg =~ /^\+/) {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos);
+		return config_add($arg1, $arg2, 0);
+	} elsif ($arg =~ /^m\+/) {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos, 1);
+		return config_add($arg1, $arg2, 1);
+	} elsif ($arg eq '>') {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos);
+		return config_diff($arg1, $arg2, 0);
+	} elsif ($arg eq '>+') {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos);
+		return config_diff($arg1, $arg2, 1);
+	} elsif ($arg eq '-') {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos);
+		return config_sub($arg1, $arg2);
+	} else {
+		return load_config($arg, $mod_plus);
+	}
+}
+
+while (@ARGV > 0 and $ARGV[0] =~ /^-\w+$/) {
+	my $cmd = shift @ARGV;
+	if ($cmd =~ /^-n$/) {
+		$PREFIX = "";
+	} elsif ($cmd =~ /^-p$/) {
+		$PREFIX = shift @ARGV;
+	} else {
+		die "Invalid option: $cmd\n";
+	}
+}
+@arg = @ARGV;
+
+my $pos = 0;
+dump_config(parse_expr(\$pos));
+die "Parse error" if ($arg[$pos]);
diff --git a/trunk/scripts/make-ipkg-dir.sh b/trunk/scripts/make-ipkg-dir.sh
new file mode 100755
index 00000000..03b0207d
--- /dev/null
+++ b/trunk/scripts/make-ipkg-dir.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+BASE=http://svn.openwrt.org/librecmc/trunk/librecmc
+TARGET=$1
+CONTROL=$2
+VERSION=$3
+ARCH=$4
+
+WD=$(pwd)
+
+mkdir -p "$TARGET/CONTROL"
+grep '^[^(Version|Architecture)]' "$CONTROL" > "$TARGET/CONTROL/control"
+grep '^Maintainer' "$CONTROL" 2>&1 >/dev/null || \
+        echo "Maintainer: libreCMC Developers Team <librecmc-devel@openwrt.org>" >> "$TARGET/CONTROL/control"
+grep '^Source' "$CONTROL" 2>&1 >/dev/null || {
+        pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g")
+        [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase"
+        echo "Source: $src" >> "$TARGET/CONTROL/control"
+}
+echo "Version: $VERSION" >> "$TARGET/CONTROL/control"
+echo "Architecture: $ARCH" >> "$TARGET/CONTROL/control"
+chmod 644 "$TARGET/CONTROL/control"
diff --git a/trunk/scripts/md5sum b/trunk/scripts/md5sum
new file mode 100755
index 00000000..a5779c42
--- /dev/null
+++ b/trunk/scripts/md5sum
@@ -0,0 +1,2 @@
+#!/bin/sh
+cat "$@" | md5
diff --git a/trunk/scripts/metadata.pl b/trunk/scripts/metadata.pl
new file mode 100755
index 00000000..f3d04dba
--- /dev/null
+++ b/trunk/scripts/metadata.pl
@@ -0,0 +1,922 @@
+#!/usr/bin/env perl
+use FindBin;
+use lib "$FindBin::Bin";
+use strict;
+use metadata;
+
+my %board;
+
+sub confstr($) {
+	my $conf = shift;
+	$conf =~ tr#/\.\-/#___#;
+	return $conf;
+}
+
+sub parse_target_metadata() {
+	my $file = shift @ARGV;
+	my ($target, @target, $profile);
+	my %target;
+
+	open FILE, "<$file" or do {
+		warn "Can't open file '$file': $!\n";
+		return;
+	};
+	while (<FILE>) {
+		chomp;
+		/^Target:\s*(.+)\s*$/ and do {
+			my $name = $1;
+			$target = {
+				id => $name,
+				board => $name,
+				boardconf => confstr($name),
+				conf => confstr($name),
+				profiles => [],
+				features => [],
+				depends => [],
+				subtargets => []
+			};
+			push @target, $target;
+			$target{$name} = $target;
+			if ($name =~ /([^\/]+)\/([^\/]+)/) {
+				push @{$target{$1}->{subtargets}}, $2;
+				$target->{board} = $1;
+				$target->{boardconf} = confstr($1);
+				$target->{subtarget} = 1;
+				$target->{parent} = $target{$1};
+			}
+		};
+		/^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
+		/^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
+		/^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
+		/^Target-Arch-Packages:\s*(.+)\s*$/ and $target->{arch_packages} = $1;
+		/^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ];
+		/^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ];
+		/^Target-Description:/ and $target->{desc} = get_multiline(*FILE);
+		/^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1;
+		/^CPU-Type:\s*(.+)\s*$/ and $target->{cputype} = $1;
+		/^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1;
+		/^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1;
+		/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1;
+		/^Default-Subtarget:\s*(.+)\s*$/ and $target->{def_subtarget} = $1;
+		/^Default-Packages:\s*(.+)\s*$/ and $target->{packages} = [ split(/\s+/, $1) ];
+		/^Target-Profile:\s*(.+)\s*$/ and do {
+			$profile = {
+				id => $1,
+				name => $1,
+				packages => []
+			};
+			push @{$target->{profiles}}, $profile;
+		};
+		/^Target-Profile-Name:\s*(.+)\s*$/ and $profile->{name} = $1;
+		/^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ];
+		/^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE);
+		/^Target-Profile-Config:/ and $profile->{config} = get_multiline(*FILE, "\t");
+		/^Target-Profile-Kconfig:/ and $profile->{kconfig} = 1;
+	}
+	close FILE;
+	foreach my $target (@target) {
+		if (@{$target->{subtargets}} > 0) {
+			$target->{profiles} = [];
+			next;
+		}
+		@{$target->{profiles}} > 0 or $target->{profiles} = [
+			{
+				id => 'Default',
+				name => 'Default',
+				packages => []
+			}
+		];
+	}
+	return @target;
+}
+
+sub gen_kconfig_overrides() {
+	my %config;
+	my %kconfig;
+	my $package;
+	my $pkginfo = shift @ARGV;
+	my $cfgfile = shift @ARGV;
+
+	# parameter 2: build system config
+	open FILE, "<$cfgfile" or return;
+	while (<FILE>) {
+		/^(CONFIG_.+?)=(.+)$/ and $config{$1} = 1;
+	}
+	close FILE;
+
+	# parameter 1: package metadata
+	open FILE, "<$pkginfo" or return;
+	while (<FILE>) {
+		/^Package:\s*(.+?)\s*$/ and $package = $1;
+		/^Kernel-Config:\s*(.+?)\s*$/ and do {
+			my @config = split /\s+/, $1;
+			foreach my $config (@config) {
+				my $val = 'm';
+				my $override;
+				if ($config =~ /^(.+?)=(.+)$/) {
+					$config = $1;
+					$override = 1;
+					$val = $2;
+				}
+				if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
+					next if $kconfig{$config} eq 'y';
+					$kconfig{$config} = $val;
+				} elsif (!$override) {
+					$kconfig{$config} or $kconfig{$config} = 'n';
+				}
+			}
+		};
+	};
+	close FILE;
+
+	foreach my $kconfig (sort keys %kconfig) {
+		if ($kconfig{$kconfig} eq 'n') {
+			print "# $kconfig is not set\n";
+		} else {
+			print "$kconfig=$kconfig{$kconfig}\n";
+		}
+	}
+}
+
+sub merge_package_lists($$) {
+	my $list1 = shift;
+	my $list2 = shift;
+	my @l = ();
+	my %pkgs;
+
+	foreach my $pkg (@$list1, @$list2) {
+		$pkgs{$pkg} = 1;
+	}
+	foreach my $pkg (keys %pkgs) {
+		push @l, $pkg unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
+	}
+	return sort(@l);
+}
+
+sub target_config_features(@) {
+	my $ret;
+
+	while ($_ = shift @_) {
+		/arm_v(\w+)/ and $ret .= "\tselect arm_v$1\n";
+		/broken/ and $ret .= "\tdepends on BROKEN\n";
+		/audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
+		/display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
+		/dt/ and $ret .= "\tselect USES_DEVICETREE\n";
+		/gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
+		/pci/ and $ret .= "\tselect PCI_SUPPORT\n";
+		/pcie/ and $ret .= "\tselect PCIE_SUPPORT\n";
+		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
+		/usbgadget/ and $ret .= "\tselect USB_GADGET_SUPPORT\n";
+		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
+		/rtc/ and $ret .= "\tselect RTC_SUPPORT\n";
+		/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
+		/jffs2$/ and $ret .= "\tselect USES_JFFS2\n";
+		/jffs2_nand/ and $ret .= "\tselect USES_JFFS2_NAND\n";
+		/ext4/ and $ret .= "\tselect USES_EXT4\n";
+		/targz/ and $ret .= "\tselect USES_TARGZ\n";
+		/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
+		/ubifs/ and $ret .= "\tselect USES_UBIFS\n";
+		/fpu/ and $ret .= "\tselect HAS_FPU\n";
+		/spe_fpu/ and $ret .= "\tselect HAS_SPE_FPU\n";
+		/ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
+		/powerpc64/ and $ret .= "\tselect powerpc64\n";
+		/nommu/ and $ret .= "\tselect NOMMU\n";
+		/mips16/ and $ret .= "\tselect HAS_MIPS16\n";
+		/rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
+		/low_mem/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n";
+		/nand/ and $ret .= "\tselect NAND_SUPPORT\n";
+	}
+	return $ret;
+}
+
+sub target_name($) {
+	my $target = shift;
+	my $parent = $target->{parent};
+	if ($parent) {
+		return $target->{parent}->{name}." - ".$target->{name};
+	} else {
+		return $target->{name};
+	}
+}
+
+sub kver($) {
+	my $v = shift;
+	$v =~ tr/\./_/;
+	if (substr($v,0,2) eq "2_") {
+		$v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1;
+	} else {
+		$v =~ /(\d+_\d+)(_\d+)?/ and $v = $1;
+	}
+	return $v;
+}
+
+sub print_target($) {
+	my $target = shift;
+	my $features = target_config_features(@{$target->{features}});
+	my $help = $target->{desc};
+	my $confstr;
+
+	chomp $features;
+	$features .= "\n";
+	if ($help =~ /\w+/) {
+		$help =~ s/^\s*/\t  /mg;
+		$help = "\thelp\n$help";
+	} else {
+		undef $help;
+	}
+
+	my $v = kver($target->{version});
+	if (@{$target->{subtargets}} == 0) {
+	$confstr = <<EOF;
+config TARGET_$target->{conf}
+	bool "$target->{name}"
+	select LINUX_$v
+EOF
+	}
+	else {
+		$confstr = <<EOF;
+config TARGET_$target->{conf}
+	bool "$target->{name}"
+EOF
+	}
+	if ($target->{subtarget}) {
+		$confstr .= "\tdepends on TARGET_$target->{boardconf}\n";
+	}
+	if (@{$target->{subtargets}} > 0) {
+		$confstr .= "\tselect HAS_SUBTARGETS\n";
+		grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends on BROKEN\n";
+	} else {
+		$confstr .= $features;
+	}
+
+	if ($target->{arch} =~ /\w/) {
+		$confstr .= "\tselect $target->{arch}\n";
+	}
+	foreach my $dep (@{$target->{depends}}) {
+		my $mode = "depends on";
+		my $flags;
+		my $name;
+
+		$dep =~ /^([@\+\-]+)(.+)$/;
+		$flags = $1;
+		$name = $2;
+
+		next if $name =~ /:/;
+		$flags =~ /-/ and $mode = "deselect";
+		$flags =~ /\+/ and $mode = "select";
+		$flags =~ /@/ and $confstr .= "\t$mode $name\n";
+	}
+	$confstr .= "$help\n\n";
+	print $confstr;
+}
+
+sub gen_target_config() {
+	my @target = parse_target_metadata();
+	my %defaults;
+
+	my @target_sort = sort {
+		target_name($a) cmp target_name($b);
+	} @target;
+
+
+	print <<EOF;
+choice
+	prompt "Target System"
+	default TARGET_ar71xx
+	reset if !DEVEL
+	
+EOF
+
+	foreach my $target (@target_sort) {
+		next if $target->{subtarget};
+		print_target($target);
+	}
+
+	print <<EOF;
+endchoice
+
+choice
+	prompt "Subtarget" if HAS_SUBTARGETS
+EOF
+	foreach my $target (@target) {
+		next unless $target->{def_subtarget};
+		print <<EOF;
+	default TARGET_$target->{conf}_$target->{def_subtarget} if TARGET_$target->{conf}
+EOF
+	}
+	print <<EOF;
+
+EOF
+	foreach my $target (@target) {
+		next unless $target->{subtarget};
+		print_target($target);
+	}
+
+print <<EOF;
+endchoice
+
+choice
+	prompt "Target Profile"
+
+EOF
+
+	foreach my $target (@target) {
+		my $profiles = $target->{profiles};
+
+		foreach my $profile (@$profiles) {
+			print <<EOF;
+config TARGET_$target->{conf}_$profile->{id}
+	bool "$profile->{name}"
+	depends on TARGET_$target->{conf}
+$profile->{config}
+EOF
+			$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
+			my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
+			foreach my $pkg (@pkglist) {
+				print "\tselect DEFAULT_$pkg\n";
+				$defaults{$pkg} = 1;
+			}
+			my $help = $profile->{desc};
+			if ($help =~ /\w+/) {
+				$help =~ s/^\s*/\t  /mg;
+				$help = "\thelp\n$help";
+			} else {
+				undef $help;
+			}
+			print "$help\n";
+		}
+	}
+
+	print <<EOF;
+endchoice
+
+config HAS_SUBTARGETS
+	bool
+
+config TARGET_BOARD
+	string
+
+EOF
+	foreach my $target (@target) {
+		$target->{subtarget} or	print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n";
+	}
+	print <<EOF;
+config TARGET_ARCH_PACKAGES
+	string
+	
+EOF
+	foreach my $target (@target) {
+		next if @{$target->{subtargets}} > 0;
+		print "\t\tdefault \"".($target->{arch_packages} || $target->{board})."\" if TARGET_".$target->{conf}."\n";
+	}
+	print <<EOF;
+
+config DEFAULT_TARGET_OPTIMIZATION
+	string
+EOF
+	foreach my $target (@target) {
+		next if @{$target->{subtargets}} > 0;
+		print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n";
+	}
+	print "\tdefault \"-Os -pipe -funit-at-a-time\"\n";
+	print <<EOF;
+
+config CPU_TYPE
+	string
+EOF
+	foreach my $target (@target) {
+		next if @{$target->{subtargets}} > 0;
+		print "\tdefault \"".$target->{cputype}."\" if TARGET_".$target->{conf}."\n";
+	}
+	print "\tdefault \"\"\n";
+
+	my %kver;
+	foreach my $target (@target) {
+		my $v = kver($target->{version});
+		next if $kver{$v};
+		$kver{$v} = 1;
+		print <<EOF;
+
+config LINUX_$v
+	bool
+
+EOF
+	}
+	foreach my $def (sort keys %defaults) {
+		print "\tconfig DEFAULT_".$def."\n";
+		print "\t\tbool\n\n";
+	}
+}
+
+my %dep_check;
+sub __find_package_dep($$) {
+	my $pkg = shift;
+	my $name = shift;
+	my $deps = ($pkg->{vdepends} or $pkg->{depends});
+
+	return 0 unless defined $deps;
+	foreach my $dep (@{$deps}) {
+		next if $dep_check{$dep};
+		$dep_check{$dep} = 1;
+		return 1 if $dep eq $name;
+		return 1 if ($package{$dep} and (__find_package_dep($package{$dep},$name) == 1));
+	}
+	return 0;
+}
+
+# wrapper to avoid infinite recursion
+sub find_package_dep($$) {
+	my $pkg = shift;
+	my $name = shift;
+
+	%dep_check = ();
+	return __find_package_dep($pkg, $name);
+}
+
+sub package_depends($$) {
+	my $a = shift;
+	my $b = shift;
+	my $ret;
+
+	return 0 if ($a->{submenu} ne $b->{submenu});
+	if (find_package_dep($a, $b->{name}) == 1) {
+		$ret = 1;
+	} elsif (find_package_dep($b, $a->{name}) == 1) {
+		$ret = -1;
+	} else {
+		return 0;
+	}
+	return $ret;
+}
+
+sub mconf_depends {
+	my $pkgname = shift;
+	my $depends = shift;
+	my $only_dep = shift;
+	my $res;
+	my $dep = shift;
+	my $seen = shift;
+	my $parent_condition = shift;
+	$dep or $dep = {};
+	$seen or $seen = {};
+	my @t_depends;
+
+	$depends or return;
+	my @depends = @$depends;
+	foreach my $depend (@depends) {
+		my $m = "depends on";
+		my $flags = "";
+		$depend =~ s/^([@\+]+)// and $flags = $1;
+		my $vdep;
+		my $condition = $parent_condition;
+
+		next if $condition eq $depend;
+		next if $seen->{"$parent_condition:$depend"};
+		next if $seen->{":$depend"};
+		$seen->{"$parent_condition:$depend"} = 1;
+		if ($depend =~ /^(.+):(.+)$/) {
+			if ($1 ne "PACKAGE_$pkgname") {
+				if ($condition) {
+					$condition = "$condition && $1";
+				} else {
+					$condition = $1;
+				}
+			}
+			$depend = $2;
+		}
+		next if $package{$depend} and $package{$depend}->{buildonly};
+		if ($vdep = $package{$depend}->{vdepends}) {
+			$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
+		} else {
+			$flags =~ /\+/ and do {
+				# Menuconfig will not treat 'select FOO' as a real dependency
+				# thus if FOO depends on other config options, these dependencies
+				# will not be checked. To fix this, we simply emit all of FOO's
+				# depends here as well.
+				$package{$depend} and push @t_depends, [ $package{$depend}->{depends}, $condition ];
+
+				$m = "select";
+				next if $only_dep;
+			};
+			$flags =~ /@/ or $depend = "PACKAGE_$depend";
+			if ($condition) {
+				if ($m =~ /select/) {
+					next if $depend eq $condition;
+					$depend = "$depend if $condition";
+				} else {
+					$depend = "!($condition) || $depend" unless $dep->{$condition} eq 'select';
+				}
+			}
+		}
+		$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
+	}
+
+	foreach my $tdep (@t_depends) {
+		mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]);
+	}
+
+	foreach my $depend (keys %$dep) {
+		my $m = $dep->{$depend};
+		$res .= "\t\t$m $depend\n";
+	}
+	return $res;
+}
+
+sub mconf_conflicts {
+	my $pkgname = shift;
+	my $depends = shift;
+	my $res = "";
+
+	foreach my $depend (@$depends) {
+		next unless $package{$depend};
+		$res .= "\t\tdepends on m || (PACKAGE_$depend != y)\n";
+	}
+	return $res;
+}
+
+sub print_package_config_category($) {
+	my $cat = shift;
+	my %menus;
+	my %menu_dep;
+
+	return unless $category{$cat};
+
+	print "menu \"$cat\"\n\n";
+	my %spkg = %{$category{$cat}};
+
+	foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
+		foreach my $pkg (@{$spkg{$spkg}}) {
+			next if $pkg->{buildonly};
+			my $menu = $pkg->{submenu};
+			if ($menu) {
+				$menu_dep{$menu} or $menu_dep{$menu} = $pkg->{submenudep};
+			} else {
+				$menu = 'undef';
+			}
+			$menus{$menu} or $menus{$menu} = [];
+			push @{$menus{$menu}}, $pkg;
+		}
+	}
+	my @menus = sort {
+		($a eq 'undef' ?  1 : 0) or
+		($b eq 'undef' ? -1 : 0) or
+		($a cmp $b)
+	} keys %menus;
+
+	foreach my $menu (@menus) {
+		my @pkgs = sort {
+			package_depends($a, $b) or
+			($a->{name} cmp $b->{name})
+		} @{$menus{$menu}};
+		if ($menu ne 'undef') {
+			$menu_dep{$menu} and print "if $menu_dep{$menu}\n";
+			print "menu \"$menu\"\n";
+		}
+		foreach my $pkg (@pkgs) {
+			my $title = $pkg->{name};
+			my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
+			if ($c > 0) {
+				$title .= ("." x $c). " ". $pkg->{title};
+			}
+			$title = "\"$title\"";
+			print "\t";
+			$pkg->{menu} and print "menu";
+			print "config PACKAGE_".$pkg->{name}."\n";
+			$pkg->{hidden} and $title = "";
+			print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
+			print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
+			unless ($pkg->{hidden}) {
+				$pkg->{default} ||= "m if ALL";
+			}
+			if ($pkg->{default}) {
+				foreach my $default (split /\s*,\s*/, $pkg->{default}) {
+					print "\t\tdefault $default\n";
+				}
+			}
+			print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
+			print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0);
+			print mconf_conflicts($pkg->{name}, $pkg->{conflicts});
+			print "\t\thelp\n";
+			print $pkg->{description};
+			print "\n";
+
+			$pkg->{config} and print $pkg->{config}."\n";
+		}
+		if ($menu ne 'undef') {
+			print "endmenu\n";
+			$menu_dep{$menu} and print "endif\n";
+		}
+	}
+	print "endmenu\n\n";
+
+	undef $category{$cat};
+}
+
+sub print_package_features() {
+	keys %features > 0 or return;
+	print "menu \"Package features\"\n";
+	foreach my $n (keys %features) {
+		my @features = sort { $b->{priority} <=> $a->{priority} or $a->{title} cmp $b->{title} } @{$features{$n}};
+		print <<EOF;
+choice
+	prompt "$features[0]->{target_title}"
+	default FEATURE_$features[0]->{name}
+EOF
+
+		foreach my $feature (@features) {
+			print <<EOF;
+	config FEATURE_$feature->{name}
+		bool "$feature->{title}"
+EOF
+			$feature->{description} =~ /\w/ and do {
+				print "\t\thelp\n".$feature->{description}."\n";
+			};
+		}
+		print "endchoice\n"
+	}
+	print "endmenu\n\n";
+}
+
+sub gen_package_config() {
+	parse_package_metadata($ARGV[0]) or exit 1;
+	print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault n\n";
+	foreach my $preconfig (keys %preconfig) {
+		foreach my $cfg (keys %{$preconfig{$preconfig}}) {
+			my $conf = $preconfig{$preconfig}->{$cfg}->{id};
+			$conf =~ tr/\.-/__/;
+			print <<EOF
+	config UCI_PRECONFIG_$conf
+		string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
+		depends on PACKAGE_$preconfig
+		default "$preconfig{$preconfig}->{$cfg}->{default}"
+
+EOF
+		}
+	}
+	print "source \"package/*/image-config.in\"\n";
+	if (scalar glob "package/feeds/*/*/image-config.in") {
+	    print "source \"package/feeds/*/*/image-config.in\"\n";
+	}
+	print_package_features();
+	print_package_config_category 'Base system';
+	foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
+		print_package_config_category $cat;
+	}
+}
+
+sub get_conditional_dep($$) {
+	my $condition = shift;
+	my $depstr = shift;
+	if ($condition) {
+		if ($condition =~ /^!(.+)/) {
+			return "\$(if \$(CONFIG_$1),,$depstr)";
+		} else {
+			return "\$(if \$(CONFIG_$condition),$depstr)";
+		}
+	} else {
+		return $depstr;
+	}
+}
+
+sub gen_package_mk() {
+	my %conf;
+	my %dep;
+	my %done;
+	my $line;
+
+	parse_package_metadata($ARGV[0]) or exit 1;
+	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
+		my $config;
+		my $pkg = $package{$name};
+		my @srcdeps;
+
+		next if defined $pkg->{vdepends};
+
+		$config = "\$(CONFIG_PACKAGE_$name)";
+		if ($config) {
+			$pkg->{buildonly} and $config = "";
+			print "package-$config += $pkg->{subdir}$pkg->{src}\n";
+			if ($pkg->{variant}) {
+				if (!defined($done{$pkg->{src}}) or $pkg->{variant_default}) {
+					print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
+				}
+				print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
+			}
+			$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
+		}
+
+		next if $done{$pkg->{src}};
+		$done{$pkg->{src}} = 1;
+
+		if (@{$pkg->{buildtypes}} > 0) {
+			print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
+		}
+
+		foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
+			foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
+				$dep =~ /@/ or do {
+					$dep =~ s/\+//g;
+					push @srcdeps, $dep;
+				};
+			}
+		}
+		foreach my $type (@{$pkg->{buildtypes}}) {
+			my @extra_deps;
+			my %deplines;
+
+			next unless $pkg->{"builddepends/$type"};
+			foreach my $dep (@{$pkg->{"builddepends/$type"}}) {
+				my $suffix = "";
+				my $condition;
+
+				if ($dep =~ /^(.+):(.+)/) {
+					$condition = $1;
+					$dep = $2;
+				}
+				if ($dep =~ /^(.+)(\/.+)/) {
+					$dep = $1;
+					$suffix = $2;
+				}
+
+				my $idx = "";
+				my $pkg_dep = $package{$dep};
+				if (defined($pkg_dep) && defined($pkg_dep->{src})) {
+					$idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+				} elsif (defined($srcpackage{$dep})) {
+					$idx = $subdir{$dep}.$dep;
+				} else {
+					next;
+				}
+				my $depstr = "\$(curdir)/$idx$suffix/compile";
+				my $depline = get_conditional_dep($condition, $depstr);
+				if ($depline) {
+					$deplines{$depline}++;
+				}
+			}
+			my $depline = join(" ", sort keys %deplines);
+			if ($depline) {
+				$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n";
+			}
+		}
+
+		my $hasdeps = 0;
+		my %deplines;
+		foreach my $deps (@srcdeps) {
+			my $idx;
+			my $condition;
+			my $prefix = "";
+			my $suffix = "";
+
+			if ($deps =~ /^(.+):(.+)/) {
+				$condition = $1;
+				$deps = $2;
+			}
+			if ($deps =~ /^(.+)(\/.+)/) {
+				$deps = $1;
+				$suffix = $2;
+			}
+
+			my $pkg_dep = $package{$deps};
+			my @deps;
+
+			if ($pkg_dep->{vdepends}) {
+				@deps = @{$pkg_dep->{vdepends}};
+			} else {
+				@deps = ($deps);
+			}
+
+			foreach my $dep (@deps) {
+				$pkg_dep = $package{$deps};
+				if (defined $pkg_dep->{src}) {
+					($pkg->{src} ne $pkg_dep->{src}.$suffix) and $idx = $pkg_dep->{subdir}.$pkg_dep->{src};
+				} elsif (defined($srcpackage{$dep})) {
+					$idx = $subdir{$dep}.$dep;
+				}
+				undef $idx if $idx eq 'base-files';
+				if ($idx) {
+					$idx .= $suffix;
+
+					my $depline;
+					next if $pkg->{src} eq $pkg_dep->{src}.$suffix;
+					next if $dep{$condition.":".$pkg->{src}."->".$idx};
+					next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends};
+					my $depstr;
+
+					if ($pkg_dep->{vdepends}) {
+						$depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
+						$dep{$pkg->{src}."->($dep)".$idx} = 1;
+					} else {
+						$depstr = "\$(curdir)/$idx/compile";
+						$dep{$pkg->{src}."->".$idx} = 1;
+					}
+					$depline = get_conditional_dep($condition, $depstr);
+					if ($depline) {
+						$deplines{$depline}++;
+					}
+				}
+			}
+		}
+		my $depline = join(" ", sort keys %deplines);
+		if ($depline) {
+			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
+		}
+	}
+
+	if ($line ne "") {
+		print "\n$line";
+	}
+	foreach my $preconfig (keys %preconfig) {
+		my $cmds;
+		foreach my $cfg (keys %{$preconfig{$preconfig}}) {
+			my $conf = $preconfig{$preconfig}->{$cfg}->{id};
+			$conf =~ tr/\.-/__/;
+			$cmds .= "\techo \"uci set '$preconfig{$preconfig}->{$cfg}->{id}=\$(subst \",,\$(CONFIG_UCI_PRECONFIG_$conf))'\"; \\\n";
+		}
+		next unless $cmds;
+		print <<EOF
+
+ifndef DUMP_TARGET_DB
+\$(TARGET_DIR)/etc/uci-defaults/$preconfig: FORCE
+	( \\
+$cmds \\
+	) > \$@
+	
+ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),)
+  package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig
+endif
+endif
+
+EOF
+	}
+}
+
+sub gen_package_source() {
+	parse_package_metadata($ARGV[0]) or exit 1;
+	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
+		my $pkg = $package{$name};
+		if ($pkg->{name} && $pkg->{source}) {
+			print "$pkg->{name}: ";
+			print "$pkg->{source}\n";
+		}
+	}
+}
+
+sub gen_package_feeds() {
+	parse_package_metadata($ARGV[0]) or exit 1;
+	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
+		my $pkg = $package{$name};
+		if ($pkg->{name} && $pkg->{feed}) {
+			print "Package/$name/feed = $pkg->{feed}\n";
+		}
+	}
+}
+
+sub gen_package_license($) {
+	my $level = shift;
+	parse_package_metadata($ARGV[0]) or exit 1;
+	foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
+		my $pkg = $package{$name};
+		if ($pkg->{name}) {
+			if ($pkg->{license}) {
+				print "$pkg->{name}: ";
+				print "$pkg->{license}\n";
+				if ($pkg->{licensefiles} && $level == 0) {
+					print "\tFiles: $pkg->{licensefiles}\n";
+				}
+			} else {
+				if ($level == 1) {
+					print "$pkg->{name}: Missing license! ";
+					print "Please fix $pkg->{makefile}\n";
+				}
+			}
+		}
+	}
+}
+
+sub parse_command() {
+	my $cmd = shift @ARGV;
+	for ($cmd) {
+		/^target_config$/ and return gen_target_config();
+		/^package_mk$/ and return gen_package_mk();
+		/^package_config$/ and return gen_package_config();
+		/^kconfig/ and return gen_kconfig_overrides();
+		/^package_source$/ and return gen_package_source();
+		/^package_feeds$/ and return gen_package_feeds();
+		/^package_license$/ and return gen_package_license(0);
+		/^package_licensefull$/ and return gen_package_license(1);
+	}
+	print <<EOF
+Available Commands:
+	$0 target_config [file] 	Target metadata in Kconfig format
+	$0 package_mk [file]		Package metadata in makefile format
+	$0 package_config [file] 	Package metadata in Kconfig format
+	$0 kconfig [file] [config]	Kernel config overrides
+	$0 package_source [file] 	Package source file information
+	$0 package_feeds [file]		Package feed information in makefile format
+	$0 package_license [file] 	Package license information
+	$0 package_licensefull [file] 	Package license information (full list)
+
+EOF
+}
+
+parse_command();
diff --git a/trunk/scripts/metadata.pm b/trunk/scripts/metadata.pm
new file mode 100644
index 00000000..fc865732
--- /dev/null
+++ b/trunk/scripts/metadata.pm
@@ -0,0 +1,163 @@
+package metadata;
+use base 'Exporter';
+use strict;
+use warnings;
+our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig %features clear_packages parse_package_metadata get_multiline);
+
+our %package;
+our %preconfig;
+our %srcpackage;
+our %category;
+our %subdir;
+our %features;
+
+sub get_multiline {
+	my $fh = shift;
+	my $prefix = shift;
+	my $str;
+	while (<$fh>) {
+		last if /^@@/;
+		$str .= (($_ and $prefix) ? $prefix . $_ : $_);
+	}
+
+	return $str ? $str : "";
+}
+
+sub clear_packages() {
+	%subdir = ();
+	%preconfig = ();
+	%package = ();
+	%srcpackage = ();
+	%category = ();
+	%features = ();
+}
+
+sub parse_package_metadata($) {
+	my $file = shift;
+	my $pkg;
+	my $feature;
+	my $makefile;
+	my $preconfig;
+	my $subdir;
+	my $src;
+
+	open FILE, "<$file" or do {
+		warn "Cannot open '$file': $!\n";
+		return undef;
+	};
+	while (<FILE>) {
+		chomp;
+		/^Source-Makefile: \s*((.+\/)([^\/]+)\/Makefile)\s*$/ and do {
+			$makefile = $1;
+			$subdir = $2;
+			$src = $3;
+			$subdir =~ s/^package\///;
+			$subdir{$src} = $subdir;
+			$srcpackage{$src} = [];
+			undef $pkg;
+		};
+		next unless $src;
+		/^Package:\s*(.+?)\s*$/ and do {
+			undef $feature;
+			$pkg = {};
+			$pkg->{src} = $src;
+			$pkg->{makefile} = $makefile;
+			$pkg->{name} = $1;
+			$pkg->{title} = "";
+			$pkg->{depends} = [];
+			$pkg->{mdepends} = [];
+			$pkg->{builddepends} = [];
+			$pkg->{buildtypes} = [];
+			$pkg->{subdir} = $subdir;
+			$pkg->{tristate} = 1;
+			$package{$1} = $pkg;
+			push @{$srcpackage{$src}}, $pkg;
+		};
+		/^Feature:\s*(.+?)\s*$/ and do {
+			undef $pkg;
+			$feature = {};
+			$feature->{name} = $1;
+			$feature->{priority} = 0;
+		};
+		$feature and do {
+			/^Target-Name:\s*(.+?)\s*$/ and do {
+				$features{$1} or $features{$1} = [];
+				push @{$features{$1}}, $feature;
+			};
+			/^Target-Title:\s*(.+?)\s*$/ and $feature->{target_title} = $1;
+			/^Feature-Priority:\s*(\d+)\s*$/ and $feature->{priority} = $1;
+			/^Feature-Name:\s*(.+?)\s*$/ and $feature->{title} = $1;
+			/^Feature-Description:/ and $feature->{description} = get_multiline(\*FILE, "\t\t\t");
+			next;
+		};
+		next unless $pkg;
+		/^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
+		/^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
+		/^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
+		/^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
+		/^Submenu-Depends: \s*(.+)\s*$/ and $pkg->{submenudep} = $1;
+		/^Source: \s*(.+)\s*$/ and $pkg->{source} = $1;
+		/^License: \s*(.+)\s*$/ and $pkg->{license} = $1;
+		/^LicenseFiles: \s*(.+)\s*$/ and $pkg->{licensefiles} = $1;
+		/^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
+		/^Provides: \s*(.+)\s*$/ and do {
+			my @vpkg = split /\s+/, $1;
+			foreach my $vpkg (@vpkg) {
+				$package{$vpkg} or $package{$vpkg} = {
+					name => $vpkg,
+					vdepends => [],
+					src => $src,
+					subdir => $subdir,
+					makefile => $makefile
+				};
+				push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
+			}
+		};
+		/^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ];
+		/^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ];
+		/^Conflicts: \s*(.+)\s*$/ and $pkg->{conflicts} = [ split /\s+/, $1 ];
+		/^Hidden: \s*(.+)\s*$/ and $pkg->{hidden} = 1;
+		/^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1;
+		/^Default-Variant: .*/ and $pkg->{variant_default} = 1;
+		/^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
+		/^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ];
+		/^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];
+		/^Build-Types:\s*(.+)\s*$/ and $pkg->{buildtypes} = [ split /\s+/, $1 ];
+		/^Feed:\s*(.+?)\s*$/ and $pkg->{feed} = $1;
+		/^Category: \s*(.+)\s*$/ and do {
+			$pkg->{category} = $1;
+			defined $category{$1} or $category{$1} = {};
+			defined $category{$1}->{$src} or $category{$1}->{$src} = [];
+			push @{$category{$1}->{$src}}, $pkg;
+		};
+		/^Description: \s*(.*)\s*$/ and $pkg->{description} = "\t\t $1\n". get_multiline(*FILE, "\t\t ");
+		/^Type: \s*(.+)\s*$/ and do {
+			$pkg->{type} = [ split /\s+/, $1 ];
+			undef $pkg->{tristate};
+			foreach my $type (@{$pkg->{type}}) {
+				$type =~ /ipkg/ and $pkg->{tristate} = 1;
+			}
+		};
+		/^Config:\s*(.*)\s*$/ and $pkg->{config} = "$1\n".get_multiline(*FILE, "\t");
+		/^Prereq-Check:/ and $pkg->{prereq} = 1;
+		/^Preconfig:\s*(.+)\s*$/ and do {
+			my $pkgname = $pkg->{name};
+			$preconfig{$pkgname} or $preconfig{$pkgname} = {};
+			if (exists $preconfig{$pkgname}->{$1}) {
+				$preconfig = $preconfig{$pkgname}->{$1};
+			} else {
+				$preconfig = {
+					id => $1
+				};
+				$preconfig{$pkgname}->{$1} = $preconfig;
+			}
+		};
+		/^Preconfig-Type:\s*(.*?)\s*$/ and $preconfig->{type} = $1;
+		/^Preconfig-Label:\s*(.*?)\s*$/ and $preconfig->{label} = $1;
+		/^Preconfig-Default:\s*(.*?)\s*$/ and $preconfig->{default} = $1;
+	}
+	close FILE;
+	return 1;
+}
+
+1;
diff --git a/trunk/scripts/mkits.sh b/trunk/scripts/mkits.sh
new file mode 100755
index 00000000..18fca41a
--- /dev/null
+++ b/trunk/scripts/mkits.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+#
+# Licensed under the terms of the GNU GPL License version 2 or later.
+#
+# Author: Peter Tyser <ptyser@xes-inc.com>
+#
+# U-Boot firmware supports the booting of images in the Flattened Image
+# Tree (FIT) format.  The FIT format uses a device tree structure to
+# describe a kernel image, device tree blob, ramdisk, etc.  This script
+# creates an Image Tree Source (.its file) which can be passed to the
+# 'mkimage' utility to generate an Image Tree Blob (.itb file).  The .itb
+# file can then be booted by U-Boot (or other bootloaders which support
+# FIT images).  See doc/uImage.FIT/howto.txt in U-Boot source code for
+# additional information on FIT images.
+#
+
+usage() {
+	echo "Usage: `basename $0` -A arch -C comp -a addr -e entry" \
+		"-v version -k kernel [-D name -d dtb] -o its_file"
+	echo -e "\t-A ==> set architecture to 'arch'"
+	echo -e "\t-C ==> set compression type 'comp'"
+	echo -e "\t-a ==> set load address to 'addr' (hex)"
+	echo -e "\t-e ==> set entry point to 'entry' (hex)"
+	echo -e "\t-v ==> set kernel version to 'version'"
+	echo -e "\t-k ==> include kernel image 'kernel'"
+	echo -e "\t-D ==> human friendly Device Tree Blob 'name'"
+	echo -e "\t-d ==> include Device Tree Blob 'dtb'"
+	echo -e "\t-o ==> create output file 'its_file'"
+	exit 1
+}
+
+while getopts ":A:a:C:D:d:e:k:o:v:" OPTION
+do
+	case $OPTION in
+		A ) ARCH=$OPTARG;;
+		a ) LOAD_ADDR=$OPTARG;;
+		C ) COMPRESS=$OPTARG;;
+		D ) DEVICE=$OPTARG;;
+		d ) DTB=$OPTARG;;
+		e ) ENTRY_ADDR=$OPTARG;;
+		k ) KERNEL=$OPTARG;;
+		o ) OUTPUT=$OPTARG;;
+		v ) VERSION=$OPTARG;;
+		* ) echo "Invalid option passed to '$0' (options:$@)"
+		usage;;
+	esac
+done
+
+# Make sure user entered all required parameters
+if [ -z "${ARCH}" ] || [ -z "${COMPRESS}" ] || [ -z "${LOAD_ADDR}" ] || \
+	[ -z "${ENTRY_ADDR}" ] || [ -z "${VERSION}" ] || [ -z "${KERNEL}" ] || \
+	[ -z "${OUTPUT}" ]; then
+	usage
+fi
+
+ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
+
+# Create a default, fully populated DTS file
+DATA="/dts-v1/;
+
+/ {
+	description = \"${ARCH_UPPER} libreCMC FIT (Flattened Image Tree)\";
+	#address-cells = <1>;
+
+	images {
+		kernel@1 {
+			description = \"${ARCH_UPPER} libreCMC Linux-${VERSION}\";
+			data = /incbin/(\"${KERNEL}\");
+			type = \"kernel\";
+			arch = \"${ARCH}\";
+			os = \"linux\";
+			compression = \"${COMPRESS}\";
+			load = <${LOAD_ADDR}>;
+			entry = <${ENTRY_ADDR}>;
+			hash@1 {
+				algo = \"crc32\";
+			};
+			hash@2 {
+				algo = \"sha1\";
+			};
+		};
+
+		fdt@1 {
+			description = \"${ARCH_UPPER} libreCMC ${DEVICE} device tree blob\";
+			data = /incbin/(\"${DTB}\");
+			type = \"flat_dt\";
+			arch = \"${ARCH}\";
+			compression = \"none\";
+			hash@1 {
+				algo = \"crc32\";
+			};
+			hash@2 {
+				algo = \"sha1\";
+			};
+		};
+	};
+
+	configurations {
+		default = \"config@1\";
+		config@1 {
+			description = \"libreCMC\";
+			kernel = \"kernel@1\";
+			fdt = \"fdt@1\";
+		};
+	};
+};"
+
+# Conditionally strip fdt information out of tree
+if [ -z "${DTB}" ]; then
+	DATA=`echo "$DATA" | sed '/start fdt/,/end fdt/d'`
+	DATA=`echo "$DATA" | sed '/fdt/d'`
+fi
+
+# Write .its file to disk
+echo "$DATA" > ${OUTPUT}
diff --git a/trunk/scripts/om-fwupgradecfg-gen.sh b/trunk/scripts/om-fwupgradecfg-gen.sh
new file mode 100644
index 00000000..e1329549
--- /dev/null
+++ b/trunk/scripts/om-fwupgradecfg-gen.sh
@@ -0,0 +1,70 @@
+#/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+usage() {
+	echo "Usage: $0 <OM2P|OM5P|MR600|MR900> <out file path> <kernel path> <rootfs path>"
+	rm -f $CFG_OUT
+	exit 1
+}
+
+[ "$#" -lt 4 ] && usage
+
+CE_TYPE=$1
+CFG_OUT=$2
+KERNEL_PATH=$3
+ROOTFS_PATH=$4
+
+case $CE_TYPE in
+	OM2P)
+		MAX_PART_SIZE=7168
+		KERNEL_FLASH_ADDR=0x1c0000
+		FLASH_BS=262144
+		MD5_SKIP_BLOCKS=1
+		;;
+	OM5P|MR600|MR900)
+		MAX_PART_SIZE=7808
+		KERNEL_FLASH_ADDR=0xb0000
+		FLASH_BS=65536
+		MD5_SKIP_BLOCKS=4
+		;;
+	*)
+		echo "Error - unsupported ce type: $CE_TYPE"
+		exit 1
+		;;
+esac
+
+CHECK_BS=65536
+
+KERNEL_SIZE=$(stat -c%s "$KERNEL_PATH")
+KERNEL_MD5=$(md5=$(md5sum $KERNEL_PATH); echo ${md5%% *})
+KERNEL_PART_SIZE=$(size=$(($KERNEL_SIZE / $FLASH_BS)); [ $(($size * $FLASH_BS)) -lt $KERNEL_SIZE ] && size=$(($size + 1)); echo $(($size * $FLASH_BS / 1024)))
+
+ROOTFS_FLASH_ADDR=$(addr=$(($KERNEL_FLASH_ADDR + ($KERNEL_PART_SIZE * 1024))); printf "0x%x" $addr)
+ROOTFS_SIZE=$(stat -c%s "$ROOTFS_PATH")
+ROOTFS_CHECK_BLOCKS=$((($ROOTFS_SIZE / $CHECK_BS) - $MD5_SKIP_BLOCKS))
+ROOTFS_MD5=$(md5=$(dd if=$ROOTFS_PATH bs=$CHECK_BS count=$ROOTFS_CHECK_BLOCKS 2>&- | md5sum); echo ${md5%% *})
+ROOTFS_CHECK_SIZE=$(printf '0x%x' $(($ROOTFS_CHECK_BLOCKS * $CHECK_BS)))
+ROOTFS_PART_SIZE=$(($MAX_PART_SIZE - $KERNEL_PART_SIZE))
+
+cat << EOF > $CFG_OUT
+[vmlinux]
+filename=kernel
+md5sum=$KERNEL_MD5
+flashaddr=$KERNEL_FLASH_ADDR
+checksize=0x0
+cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; saveenv
+cmd_fail=reset
+
+[rootfs]
+filename=rootfs
+md5sum=$ROOTFS_MD5
+flashaddr=$ROOTFS_FLASH_ADDR
+checksize=$ROOTFS_CHECK_SIZE
+cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; setenv rootfs_size_1 $ROOTFS_PART_SIZE; saveenv
+cmd_fail=reset
+EOF
diff --git a/trunk/scripts/openbsd.sh b/trunk/scripts/openbsd.sh
new file mode 100644
index 00000000..814f645c
--- /dev/null
+++ b/trunk/scripts/openbsd.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+ver=$(uname -r)
+arch=$(uname -m)
+echo "Preparing OpenBSD $arch $ver for libreCMC"
+PKG_PATH="http://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
+export PKG_PATH
+pkg_add -v gmake
+pkg_add -v findutils
+pkg_add -v coreutils
+pkg_add -v gdiff
+pkg_add -v rsync--
+pkg_add -v git
+pkg_add -v bash
+pkg_add -v unzip
+pkg_add -v wget
+pkg_add -v gtar--
+pkg_add -v ggrep
+pkg_add -v gawk
+pkg_add -v gsed
+pkg_add -v xz
+pkg_add -v apr-util--
+pkg_add -v cyrus-sasl--
+pkg_add -v subversion
+pkg_add -v gnugetopt
diff --git a/trunk/scripts/pad_image b/trunk/scripts/pad_image
new file mode 100755
index 00000000..14f14990
--- /dev/null
+++ b/trunk/scripts/pad_image
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+function usage {
+  echo "Usage: prepare_image image_type kernel_image rootfs_image header_size"
+  echo "Padd root and kernel image to the correct size and append the jffs2 start marker as needed"
+  exit 1
+}
+
+function pad_file {
+	echo "Padding $1 to size $2"
+	dd if=$1 of=$1.paddingtempfile bs=$2 count=1 conv=sync &> /dev/null
+	mv $1.paddingtempfile $1
+}
+
+#filesize filestart padding
+function calc_pad {
+	[  $((($1 + $2) & ($3 - 1))) == 0 ] && {
+		echo $1
+		return 0
+        }
+	echo $(((($1 + $2) | ($3 - 1)) + 1 - $2))
+}
+
+function prep_squash {
+	echo "kernel_size: $kernel_size"
+	echo "header_size: $header_size"
+	kernel_pad_size=$(calc_pad $kernel_size $header_size 32)
+	kernel_end=$(($header_size + $kernel_pad_size))
+	pad_file $kernel_image $kernel_pad_size
+
+	#4k
+	rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 4096)
+	pad_file $rootfs_image $rootfs_pad_size
+	echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+	
+	#8k
+	rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 8192)
+	[ $rootfs_pad_size == rootfs_old_padsize ] || {
+		pad_file $rootfs_image $rootfs_pad_size
+		rootfs_old_padsize=$rootfs_pad_size
+		echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+	}
+
+	#64k
+	rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 65536)
+	[ $rootfs_pad_size == rootfs_old_padsize ] || {
+		pad_file $rootfs_image $rootfs_pad_size
+		rootfs_old_padsize=$rootfs_pad_size
+		echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+	}
+
+	#128k
+	rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 131072)
+	[ $rootfs_pad_size == rootfs_old_padsize ] || {
+		pad_file $rootfs_image $rootfs_pad_size
+		rootfs_old_padsize=$rootfs_pad_size
+		echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+	}
+	
+}
+
+function prep_jffs2 {
+	kernel_pad_size=$(calc_pad $kernel_size $header_size $1)
+	pad_file $kernel_image $kernel_pad_size
+}
+
+image_type=$1
+kernel_image=$2
+rootfs_image=$3
+header_size=$4
+
+if [ -z "$image_type" ] || [ -z "$rootfs_image" ] || [ -z "$kernel_image" ] || [ -z "$header_size" ]; then
+	usage
+fi
+
+if [ ! -e "$rootfs_image" ] || [ -z "$kernel_image" ]; then
+	echo "input file not found"
+	exit 1
+fi
+
+kernel_size=$(stat -c "%s" "$kernel_image")
+rootfs_size=$(stat -c "%s" "$rootfs_image")
+
+if [ $kernel_size == 0 ] || [ $rootfs_size == 0 ]; then
+	echo "kernel or rootfs empty"
+	exit 1
+fi
+
+case $image_type in
+	squashfs )
+		prep_squash ;;
+	jffs2-64k )
+		prep_jffs2 65536 ;;
+	jffs2-128k )
+		prep_jffs2 131072 ;;
+	* )
+		echo "Unknown image type"
+		exit 1 ;;
+esac
+
diff --git a/trunk/scripts/patch-kernel.sh b/trunk/scripts/patch-kernel.sh
new file mode 100755
index 00000000..91753ba2
--- /dev/null
+++ b/trunk/scripts/patch-kernel.sh
@@ -0,0 +1,54 @@
+#! /bin/sh
+# A little script I whipped up to make it easy to
+# patch source trees and have sane error handling
+# -Erik
+#
+# (c) 2002 Erik Andersen <andersen@codepoet.org>
+
+# Set directories from arguments, or use defaults.
+targetdir=${1-.}
+patchdir=${2-../kernel-patches}
+patchpattern=${3-*}
+
+if [ ! -d "${targetdir}" ] ; then
+    echo "Aborting.  '${targetdir}' is not a directory."
+    exit 1
+fi
+if [ ! -d "${patchdir}" ] ; then
+    echo "Aborting.  '${patchdir}' is not a directory."
+    exit 1
+fi
+    
+for i in ${patchdir}/${patchpattern} ; do 
+    case "$i" in
+	*.gz)
+	type="gzip"; uncomp="gunzip -dc"; ;; 
+	*.bz)
+	type="bzip"; uncomp="bunzip -dc"; ;; 
+	*.bz2)
+	type="bzip2"; uncomp="bunzip2 -dc"; ;; 
+	*.zip)
+	type="zip"; uncomp="unzip -d"; ;; 
+	*.Z)
+	type="compress"; uncomp="uncompress -c"; ;; 
+	*)
+	type="plaintext"; uncomp="cat"; ;; 
+    esac
+    [ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue	
+    echo ""
+    echo "Applying ${i} using ${type}: " 
+    ${uncomp} ${i} | ${PATCH:-patch} -f -p1 -E -d ${targetdir} 
+    if [ $? != 0 ] ; then
+        echo "Patch failed!  Please fix $i!"
+	exit 1
+    fi
+done
+
+# Check for rejects...
+if [ "`find $targetdir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
+    echo "Aborting.  Reject files found."
+    exit 1
+fi
+
+# Remove backup files
+find $targetdir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;
diff --git a/trunk/scripts/patch-specs.sh b/trunk/scripts/patch-specs.sh
new file mode 100755
index 00000000..3307b6b0
--- /dev/null
+++ b/trunk/scripts/patch-specs.sh
@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+
+DIR="$1"
+
+if [ -d "$DIR" ]; then
+	DIR="$(cd "$DIR"; pwd)"
+else
+	echo "Usage: $0 toolchain-dir"
+	exit 1
+fi
+
+echo -n "Locating cpp ... "
+for bin in bin usr/bin usr/local/bin; do
+	for cmd in "$DIR/$bin/"*-cpp; do
+		if [ -x "$cmd" ]; then
+			echo "$cmd"
+			CPP="$cmd"
+			break
+		fi
+	done
+done
+
+if [ ! -x "$CPP" ]; then
+	echo "Can't locate a cpp executable in '$DIR' !"
+	exit 1
+fi
+
+patch_specs() {
+	local found=0
+
+	for lib in $(STAGING_DIR="$DIR" "$CPP" -x c -v /dev/null 2>&1 | sed -ne 's#:# #g; s#^LIBRARY_PATH=##p'); do
+		if [ -d "$lib" ]; then
+			grep -qs "STAGING_DIR" "$lib/specs" && rm -f "$lib/specs"
+			if [ $found -lt 1 ]; then
+				echo -n "Patching specs ... "
+				STAGING_DIR="$DIR" "$CPP" -dumpspecs | awk '
+					mode ~ "link" {
+						sub("%{L.}", "%{L*} -L %:getenv(STAGING_DIR /usr/lib) -rpath-link %:getenv(STAGING_DIR /usr/lib)")
+					}
+					mode ~ "cpp" {
+						$0 = $0 " -idirafter %:getenv(STAGING_DIR /usr/include)"
+					}
+					{
+						print $0
+						mode = ""
+					}
+					/^\*cpp:/ {
+						mode = "cpp"
+					}
+					/^\*link.*:/ {
+						mode = "link"
+					}
+				' > "$lib/specs"
+				echo "ok"
+				found=1
+			fi
+		fi
+	done
+
+	[ $found -gt 0 ]
+	return $?
+}
+
+
+VERSION="$(STAGING_DIR="$DIR" "$CPP" --version | sed -ne 's/^.* (.*) //; s/ .*$//; 1p')"
+VERSION="${VERSION:-unknown}"
+
+case "${VERSION##* }" in
+	2.*|3.*|4.0.*|4.1.*|4.2.*)
+		echo "The compiler version does not support getenv() in spec files."
+		echo -n "Wrapping binaries instead ... "
+
+		if "${0%/*}/ext-toolchain.sh" --toolchain "$DIR" --wrap "${CPP%/*}"; then
+			echo "ok"
+			exit 0
+		else
+			echo "failed"
+			exit $?
+		fi
+	;;
+	*)
+		if patch_specs; then
+			echo "Toolchain successfully patched."
+			exit 0
+		else
+			echo "Failed to locate library directory!"
+			exit 1
+		fi
+	;;
+esac
diff --git a/trunk/scripts/relink-lib.sh b/trunk/scripts/relink-lib.sh
new file mode 100755
index 00000000..5367b709
--- /dev/null
+++ b/trunk/scripts/relink-lib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+[ $# -lt 4 -o -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" ] && {
+	echo "Usage: $0 <cross> <reference> <pic .a> <destination>"
+	exit 1
+}
+
+cross="$1"; shift
+ref="$1"; shift
+pic="$1"; shift
+dest="$1"; shift
+
+SYMBOLS="$(${cross}nm "$ref" | grep -E '........ [TW] ' | awk '$3 {printf "-u%s ", $3}')"
+set -x
+${cross}gcc -nostdlib -nostartfiles -shared -Wl,--gc-sections -o "$dest" $SYMBOLS "$pic" "$@"
diff --git a/trunk/scripts/remote-gdb b/trunk/scripts/remote-gdb
new file mode 100755
index 00000000..98ec768f
--- /dev/null
+++ b/trunk/scripts/remote-gdb
@@ -0,0 +1,89 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use FindBin '$Bin';
+use File::Temp 'tempfile';
+
+@ARGV == 2 || do {
+	die "Usage: $0 <corefile|host:port> <executable>\n";
+	exit 1;
+};
+
+if( opendir SD, "$Bin/../staging_dir" )
+{
+	my ( $tid, $arch, $libc, @arches );
+
+	if( $ARGV[1] =~ m!\btarget-(.+?)_(([^_]+libc|musl)[^/]+)\b!i )
+	{
+		print("Using target $1 ($2)\n");
+		($arch, $libc) = ($1, $2);
+	}
+	else
+	{
+		# Find arches
+		print("Choose target:\n");
+
+		while( defined( my $e = readdir SD ) )
+		{
+			if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-(.+?)_(([^_]+.libc|musl)+)/i )
+			{
+				push @arches, [ $1, $2 ];
+				printf(" %2d) %s (%s)\n", @arches + 0, $1, $2);
+			}
+		}
+
+		if( @arches > 1 )
+		{
+			# Query arch
+			do {
+				print("Target? > ");
+				chomp($tid = <STDIN>);
+			} while( !defined($tid) || $tid !~ /^\d+$/ || $tid < 1 || $tid > @arches );
+
+			($arch, $libc) = @{$arches[$tid-1]};
+		}
+		else
+		{
+			($arch, $libc) = @{$arches[0]};
+		}
+	}
+
+	closedir SD;
+
+	# Find gdb
+	my ($gdb) = glob("$Bin/../staging_dir/toolchain-${arch}_*_${libc}*/bin/*-gdb");
+	if( defined($gdb) && -x $gdb )
+	{
+		my ( $fh, $fp ) = tempfile();
+
+		# Find sysroot
+		my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/");
+
+		print $fh "set sysroot $sysroot\n" if $sysroot;
+		my $cmd = "target remote";
+		-f $ARGV[0] and $cmd = "core-file";
+		print $fh "$cmd $ARGV[0]\n";
+
+		# History settings
+		print $fh "set history filename $Bin/../tmp/.gdb_history\n";
+		print $fh "set history size 100000000\n";
+		print $fh "set history save on\n";
+
+		my $file = -f "$sysroot/$ARGV[1]" ? "$sysroot/$ARGV[1]" : $ARGV[1];
+		system($gdb, '-x', $fp, $file);
+
+		close($fh);
+		unlink($fp);
+	}
+	else
+	{
+		print("No gdb found! Make sure that CONFIG_GDB is set!\n");
+		exit(1);
+	}
+}
+else
+{
+	print("No staging_dir found! You need to compile at least once!\n");
+	exit(1);
+}
diff --git a/trunk/scripts/rstrip.sh b/trunk/scripts/rstrip.sh
new file mode 100755
index 00000000..4665ff55
--- /dev/null
+++ b/trunk/scripts/rstrip.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+SELF=${0##*/}
+
+[ -z "$STRIP" ] && {
+  echo "$SELF: strip command not defined (STRIP variable not set)"
+  exit 1
+}
+
+TARGETS=$*
+
+[ -z "$TARGETS" ] && {
+  echo "$SELF: no directories / files specified"
+  echo "usage: $SELF [PATH...]"
+  exit 1
+}
+
+find $TARGETS -type f -a -exec file {} \; | \
+  sed -n -e 's/^\(.*\):.*ELF.*\(executable\|relocatable\|shared object\).*,.* stripped/\1:\2/p' | \
+(
+  IFS=":"
+  while read F S; do
+    echo "$SELF: $F:$S"
+	[ "${S}" = "relocatable" ] && {
+		eval "$STRIP_KMOD $F"
+	} || {
+		b=$(stat -c '%a' $F)
+		eval "$STRIP $F"
+		a=$(stat -c '%a' $F)
+		[ "$a" = "$b" ] || chmod $b $F
+	}
+  done
+  true
+)
diff --git a/trunk/scripts/slugimage.pl b/trunk/scripts/slugimage.pl
new file mode 100755
index 00000000..deac6ac6
--- /dev/null
+++ b/trunk/scripts/slugimage.pl
@@ -0,0 +1,1217 @@
+#!/usr/bin/env perl
+# 
+# SlugImage : Manipulate NSLU2 firmware images
+#             Dwayne Fontenot (jacques)
+#             Rod Whitby (rwhitby)
+#	      www.nslu2-linux.org
+#
+# Copyright (c) 2004, 2006, Dwayne Fontenot & Rod Whitby
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# Neither the name of the NSLU2-Linux Development Team nor the names
+# of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written
+# permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+use strict;
+use warnings;
+
+use Getopt::Long qw(:config no_ignore_case);
+use POSIX qw(tmpnam);
+
+my($debug) = 0;
+my($quiet) = 0;
+my($flash_start)    = 0x50000000;
+my($flash_len)      = 0x00800000;
+my($block_size)     = 0x00020000;
+my($kernel_offset)  = 0x00060000;
+my($kernel_size)    = 0x00100000;
+my($ramdisk_offset) = 0x00160000;
+my(@cleanup);
+
+# The last 70 bytes of the SercommRedBootTrailer (i.e. excluding MAC
+# address).  Needed to create an image with an empty RedBoot partition
+# since the Sercomm upgrade tool checks for this trailer.
+# http://www.nslu2-linux.org/wiki/Info/SercommRedBootTrailer
+my @sercomm_redboot_trailer = (0x4573, 0x4372, 0x4d6f, 0x006d, 0x0001,
+       0x0400, 0x3170, 0x5895, 0x0010, 0x0000, 0x0000, 0x0000, 0x0000,
+       0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+       0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0003, 0x2300,
+       0x0063, 0x0000, 0x7320, 0x7245, 0x6f43, 0x6d4d);
+
+# There's a 16 byte Sercomm trailer at the end of the flash. It is used
+# by RedBoot to detect a Sercomm flash layout and to configure the
+# Sercomm upgrade system.
+# http://www.nslu2-linux.org/wiki/Info/SercommFlashTrailer
+my @sercomm_flash_trailer = (0x0100, 0x0000, 0x6323, 0xf790, 0x5265,
+                             0x4f63, 0x4d6d, 0xb400);
+
+# Take $data, and pad it out to $total_len bytes, appending 0xff's.
+sub padBytes {
+    my($data,$total_len) = @_;
+
+    # 0xFF is used to pad, as it's the erase value of the flash.
+    my($pad_char) = pack("C",0xff);
+    my($pad_len) = $total_len - length($data);
+
+    # A request for negative padding is indicative of a logic error ...
+    if (length($data) > $total_len) {
+	die sprintf("padBytes error: data (%d) is longer than total_len (%d)", length($data), $total_len);
+    }
+
+    return $data . ($pad_char x $pad_len);
+}
+
+# Return the next multiple of block_size larger than or equal to $data_len.
+sub paddedSize {
+    my($data_len) = @_;
+
+    use integer;
+    return (($data_len - 1) / $block_size) * $block_size + $block_size;
+}
+
+# Return the number of block_size blocks required to hold $data_len.
+sub numBlocks {
+    my($data_len) = @_;
+
+    use integer;
+    return (($data_len - 1) / $block_size) + 1;
+}
+
+# Pack the name, address, size and optional skip regions of a partition entry into binary form.
+sub createPartitionEntry {
+    my($name, $flash_base, $size, $skips) = @_;
+    my $entry;
+
+    my($zero_long) = 0x0000;
+
+    # Pack the partition entry according to the format that RedBoot (and the MTD partition parsing code) requires.
+    $entry = pack("a16N5x212N2",$name,$flash_base,$zero_long,$size,$zero_long,$zero_long,$zero_long,$zero_long);
+
+    # Optionally put a skip header into the padding area.
+    if (defined $skips) {
+	my $i = scalar(@$skips);
+	foreach my $region (@$skips) {
+	    substr($entry, -8 - 12*$i, 12) =
+		pack("a4N2", "skip", $region->{'offset'}, $region->{'size'});
+	    $i--;
+	}
+    }
+
+    return $entry;
+}
+
+# Parse partition entry and return anon array ref [$name, $offset, $size, $skip] or return 0 on partition terminator.
+sub parsePartitionEntry {
+    my($partition_entry) = @_;
+
+    my($entry_len) = 0x100;
+    length($partition_entry) eq $entry_len or die "parsePartitionEntry: partition entry length is not $entry_len!\n";
+
+    # Unpack the partition table entry, saving those values in which we are interested.
+    my($name, $flash_base, $size, $dummy_long, $padding, $skips);
+    ($name, $flash_base, $dummy_long, $size, $dummy_long, $dummy_long, $padding, $dummy_long, $dummy_long) =
+	unpack("a16N5a212N2",$partition_entry);
+
+    # A partition entry starting with 0xFF terminates the table.
+    if (unpack("C", $name) eq 0xff) {
+	# %%% FIXME: This should only skip, not terminate. %%%
+	$debug and print "Found terminator for <FIS directory>\n";
+	return 0;
+    }
+
+    # Remove trailing nulls from the partition name.
+    $name =~ s/\000+//;
+
+    # Extract the skip regions out of the padding area.
+    $padding =~ s/^\000+//;
+    $padding =~ s/\000*skip(........)\000*/$1/g;
+    $padding =~ s/\000+$//;
+
+    # Store the skip regions in an array for later use.
+    while (length($padding)) {
+	my $region = {};
+	($region->{'offset'}, $region->{'size'}) =
+	    unpack("N2", $padding);
+	$debug and printf("Found skip region at 0x%05X, size 0x%05X\n",
+			  $region->{'offset'}, $region->{'size'});
+	push(@$skips, $region);
+	$padding = substr($padding,8);
+    }
+
+    return [$name, $flash_base - $flash_start, $size, $skips];
+}
+
+# Return partition table from data is one exists, otherwise return 0.
+sub findPartitionTable {
+    my($data_buf) = @_;
+
+    unpack("a7", $data_buf) eq 'RedBoot' or return 0;
+    return substr($data_buf, 0, 0x1000)
+}
+
+# Parse partition table and return array of anonymous array references ([$name, $offset, $size, $skips], ...).
+sub parsePartitionTable {
+    my($partition_table) = @_;
+
+    my(@partitions, $fields_ref);
+    my($entry_len) = 0x100;
+    my($partition_count) = 0;
+
+    # Loop through the fixed size partition table entries, and store the entries in @partitions.
+    # %%% FIXME: This doesn't handle the case of a completely full partition table. %%%
+    while ($fields_ref = parsePartitionEntry(substr($partition_table, $partition_count * $entry_len, $entry_len))) {
+	$debug and printf("Found <%s> at 0x%08X (%s)%s\n", $fields_ref->[0], $fields_ref->[1],
+			  ($fields_ref->[2] >= $block_size ?
+			   sprintf("%d blocks", numBlocks($fields_ref->[2])) :
+			   sprintf("0x%05X bytes", $fields_ref->[2])),
+			  (defined $fields_ref->[3] ?
+			   sprintf(" [%s]",
+				   join(", ",
+					map { sprintf("0x%05X/0x%05X", $_->{'offset'},$_->{'size'}) }
+					@{$fields_ref->[3]})) :
+			   ""));
+	$partitions[$partition_count++] = $fields_ref;
+    }
+    return(@partitions);
+}
+
+# Create an empty jffs2 block.
+sub jffs2Block {
+    return padBytes(pack("N3", 0x19852003, 0x0000000c, 0xf060dc98), $block_size);
+}
+
+# Write out $data to $filename,
+sub writeOut {
+    my($data, $filename) = @_;
+
+    open FILE,">$filename" or die "Can't open file \"$filename\": $!\n";
+
+    if (defined($data)) { print FILE $data;}
+
+    close FILE or die "Can't close file \"$filename\": $!\n";
+}
+
+# Not used at the moment.
+sub trailerData {
+    my($product_id)       = 0x0001;
+    my($protocol_id)      = 0x0000;
+    my($firmware_version) = 0x2325;
+    my($unknown1)         = 0x90f7;
+    my($magic_number)     = 'eRcOmM';
+    my($unknown2)         = 0x00b9;
+
+    return pack("n4a6n",$product_id,$protocol_id,$firmware_version,$unknown1,$magic_number,$unknown2);
+}
+
+# Print the contents of the Sercomm RedBoot trailer.
+sub printRedbootTrailer {
+    my($redboot_data) = @_;
+
+    my($correct_redboot_len) = 0x40000;
+    my($redboot_data_len) = length($redboot_data);
+
+    if ($redboot_data_len != $correct_redboot_len) {
+	printf("Redboot length (0x%08X) is not 0x%08X\n", $redboot_data_len, $correct_redboot_len);
+	return;
+    }
+
+    # The trailer is the last 80 bytes of the redboot partition.
+    my($redboot_trailer) = substr($redboot_data, -80);
+
+    writeOut($redboot_trailer, 'RedbootTrailer');
+
+    my($mac_addr0, $mac_addr1, $mac_addr2, $unknown, $prefix, $ver_ctrl, $down_ctrl, $hid, $hver, $prodid, $prodidmask,
+       $protid, $protidmask, $funcid, $funcidmask, $fver, $cseg, $csize, $postfix) =
+	   unpack("n3Na7n2a32n10a7",$redboot_trailer);
+
+    printf("MAC address is %04X%04X%04X\n", $mac_addr0, $mac_addr1, $mac_addr2);
+    printf("unknown: %08X\n", $unknown);
+    printf("%s:%04X:%04X:%s\n", $prefix, $ver_ctrl, $down_ctrl, $postfix);
+    printf("VerControl: %04X\nDownControl: %04X\n", $ver_ctrl, $down_ctrl);
+    printf("hid: %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X %04X\n", unpack("n16", $hid));
+    printf("Hver: %04X\nProdID: %04X\nProtID: %04X\nFuncID: %04X\nFver: %04X\nCseg: %04X\nCsize: %04X\n",
+	   $hver, $prodid, $protid, $funcid, $fver, $cseg, $csize);
+}
+
+# remove the optional Loader partition
+sub removeOptionalLoader {
+    my($partitions_ref) = @_;
+
+    my $index;
+    my $count = 0;
+    map {
+	if (not defined $index) {
+	    if ($_->{'name'} eq "Loader") {
+		$index = $count;
+	    }
+	    $count++;
+	}
+    } @$partitions_ref;
+    
+    defined $index or die "Cannot find the Loader partition\n";
+
+    splice(@$partitions_ref, $index, 1);
+
+    # Set fixed offsets and sizes for Kernel and Ramdisk
+    map {
+	if ($_->{'name'} eq 'Kernel') {
+	    $_->{'offset'}   = $kernel_offset;
+	    $_->{'size'}     = $kernel_size;
+	    $_->{'variable'} = 0;
+	}
+	if ($_->{'name'} eq 'Ramdisk') {
+	    $_->{'offset'}   = $ramdisk_offset;
+	}
+    } @$partitions_ref;
+
+    return;
+}
+
+
+# populate @partitions based on the firmware's partition table
+sub spliceFirmwarePartitions {
+    my($firmware_buf, $partitions_ref) = @_;
+
+    # we know that partition table, if it exists, begins at start of 'FIS directory' and has max length 0x1000
+    my($partition_table);
+    map {
+	$_->{'name'} eq 'FIS directory' and
+	    $partition_table = findPartitionTable(substr($firmware_buf, $_->{'offset'}, $_->{'size'}));
+    } @$partitions_ref;
+
+    # return 0 here if no partition table in FIS directory
+    return if not $partition_table;
+
+    my @new_partitions = parsePartitionTable($partition_table);
+
+    # Remove the optional second stage bootloader if it is not found in the FIS directory.
+    if (not grep { $_->[0] eq 'Loader' } @new_partitions) {
+	removeOptionalLoader($partitions_ref);
+    }
+
+    my($partition_count) = 0;
+    my($splice) = 0;
+    map {
+
+	# Skip pseudo partitions.
+	while (($partition_count < scalar(@$partitions_ref)) and
+	       $partitions_ref->[$partition_count]->{'pseudo'}) {
+	    $debug and printf("Skipped <%s> (pseudo partition)\n", $partitions_ref->[$partition_count]->{'name'});
+	    $partition_count++;
+	}
+
+	# If we are in a variable area, and we haven't reached the end of it,
+	# then splice in another partition for use by the later code.
+	if ($splice and ($partitions_ref->[$partition_count]->{'name'} ne $_->[0])) {
+	    $debug and printf("Splicing new partition <%s> before <%s>\n",
+			      $_->[0], $partitions_ref->[$partition_count]->{'name'});
+	    splice(@{$partitions_ref}, $partition_count, 0, ({'name' => "",'variable'=>1,'header'=>0}));
+	}
+
+	my $partition = $partitions_ref->[$partition_count];
+
+	# Variable partitions can be overridden by the real FIS directory
+	if ($partition->{'variable'}) {
+
+	    # Only override the filename if the partition name is not set or doesn't match
+	    if ($partition->{'name'} ne $_->[0]) {
+
+		if (length($partition->{'name'})) {
+		    $debug and printf("Overwriting <%s> with <%s>\n",
+				      $partitions_ref->[$partition_count]->{'name'}, $_->[0]);
+		}
+
+		$partition->{'name'} = $_->[0];
+		$partition->{'file'} = $_->[0];
+	    }
+
+	    # Set the offset, size and skips based on the real partition table
+	    $partition->{'offset'} = $_->[1];
+	    $partition->{'size'}   = $_->[2];
+	    $partition->{'skips'}  = $_->[3];
+
+	    $debug and printf("Locating <%s> at 0x%08X (%s)\n",
+			      $partition->{'name'}, $partition->{'offset'},
+			      ($partition->{'size'} >= $block_size ?
+			       sprintf("%d blocks", numBlocks($partition->{'size'})) :
+			       sprintf("0x%05X bytes", $partition->{'size'})));
+
+	    $splice = 1;
+	}
+
+	# Fixed partitions cannot be overridden
+	else {
+	    ($partition->{'name'} eq $_->[0]) or
+		die "Unexpected partition <",$_->[0],"> (expecting <",$partition->{'name'},">)\n";
+
+	    $debug and printf("Locating <%s> at 0x%08X (%s)\n",
+			      $partition->{'name'}, $partition->{'offset'},
+			      ($partition->{'size'} >= $block_size ?
+			       sprintf("%d blocks", numBlocks($partition->{'size'})) :
+			       sprintf("0x%05X bytes", $partition->{'size'})));
+	    
+	    $splice = 0;
+	}
+	
+	$partition_count++;
+
+    } @new_partitions;
+
+    return;
+}
+
+# Read in an 8MB firmware file, and store the data into @partitions.
+# Note that the data is only stored in a partition if 'offset' and 'size' are defined,
+# and it does not already have data stored in it.
+sub readInFirmware {
+    my($filename, $partitions_ref) = @_;
+
+    my($firmware_buf);
+
+    open FILE,$filename or die "Can't find firmware image \"$filename\": $!\n";
+    read FILE,$firmware_buf,$flash_len or die "Can't read $flash_len bytes from \"$filename\": $!\n";
+    close FILE or die "Can't close \"$filename\": $!\n";
+
+    $debug and printf("Read 0x%08X bytes from \"%s\"\n", length($firmware_buf), $filename);
+
+    spliceFirmwarePartitions($firmware_buf, $partitions_ref);
+
+    # Read the parts of the firmware file into the partitions table.
+    map {
+	if (defined $_->{'offset'} and defined $_->{'size'}) {
+
+	    if (defined $_->{'data'}) {
+		$debug and printf("Not overwriting data in <%s>\n", $_->{'name'});
+	    }
+	    else {
+
+		# Slurp up the data, based on whether a header and/or data is present or not
+		if ($_->{'header'}) {
+
+		    # Read the length, and grab the data based on the length.
+		    my($data_len) = unpack("N", substr($firmware_buf, $_->{'offset'}));
+
+		    # A length of 0xFFFFFFFF means that the area is not initialised
+		    if ($data_len != 0xFFFFFFFF) {
+			$debug and printf("Found header size of 0x%08X bytes for <%s>\n", $data_len, $_->{'name'});
+			$_->{'data'} = substr($firmware_buf, $_->{'offset'} + $_->{'header'}, $data_len);
+		    }
+		}
+		elsif ($_->{'pseudo'} and not defined $_->{'file'} and
+		       (substr($firmware_buf, $_->{'offset'}, $_->{'size'}) eq
+			(pack("C", 0xff) x $_->{'size'}))) {
+		    $debug and printf("Skipping empty pseudo partition <%s>\n", $_->{'name'});
+		}
+		else {
+
+		    # Grab the whole partition, using the maximum size.
+		    $_->{'data'} = substr($firmware_buf, $_->{'offset'}, $_->{'size'});
+		}
+
+		# If skip regions are defined, remove them from the data.
+		if (defined $_->{'skips'}) {
+		    my $removed = 0;
+		    foreach my $region (@{$_->{'skips'}}) {
+			if (($region->{'offset'} > 0) or
+			    not ($_->{'header'} > 0)) {
+			    $debug and printf("Removing 0x%05X bytes from offset 0x%05X\n",
+					      $region->{'size'}, $region->{'offset'});
+			    $region->{'data'} = substr($_->{'data'}, $region->{'offset'} - $removed, $region->{'size'}, '');
+			}
+			$removed += $region->{'size'};
+		    }
+		}
+
+		$quiet or defined $_->{'data'} and printf("Read %s into <%s>\n",
+							  (length($_->{'data'}) >= $block_size ?
+							   sprintf("%d blocks", numBlocks(length($_->{'data'}))) :
+							   sprintf("0x%05X bytes", length($_->{'data'}))), $_->{'name'});
+	    }
+	}
+    } @$partitions_ref;
+}
+
+# Write the partition data stored in memory out into the files associated with each.
+sub writeOutFirmwareParts {
+    my(@partitions) = @_;
+
+    # Write out the parts of the firmware file.
+    map {
+
+	# We can only write if 'data' and 'file' are defined.
+	if (defined $_->{'file'} and defined $_->{'data'} and length($_->{'data'})) {
+	    writeOut($_->{'data'}, $_->{'file'});
+	    $quiet or printf("Wrote 0x%08X bytes from <%s> into \"%s\"\n",
+			      length($_->{'data'}), $_->{'name'}, $_->{'file'});
+	}
+	else {
+	    $debug and printf("Skipping <%s> (%s)\n", $_->{'name'},
+			      (not defined $_->{'file'}) ?
+			      "no filename specified" :
+			      "no data to write");
+	}
+
+    } @partitions;
+
+    return;
+}
+
+# Read in the partition data from the files associated with each and store in memory.
+sub readInFirmwareParts {
+    my(@partitions) = (@_);
+    
+    undef $/; # we want to slurp
+
+    map {
+
+	my $file = $_->{'file'};
+	if (defined $file) {
+	    open FILE,$file or die "Can't find firmware part \"$file\": $!\n";
+
+	    # Slurp in the data
+	    $_->{'data'} = <FILE>;
+
+	    # close the file
+	    close FILE or die "Can't close file \"$file\": $!\n";
+
+	    # Optionally byteswap the data
+	    if ($_->{'byteswap'}) {
+		# Byte swap the data (which has to be padded to a multiple of 4 bytes).
+		$_->{'data'} = pack("N*", unpack("V*", $_->{'data'}.pack("CCC", 0)));
+	    }
+
+	    # Keep track of the actual size.
+	    my $size;
+
+	    if ($_->{'header'}) {
+		if ($_->{'pseudo'}) {
+		    $size = $_->{'header'} + length($_->{'data'});
+		}
+		else {
+		    $size = paddedSize($_->{'header'} + length($_->{'data'}));
+		}
+	    }
+	    elsif (not $_->{'pseudo'}) {
+		$size = paddedSize(length($_->{'data'}));
+	    }
+	    else {
+		$size = length($_->{'data'});
+	    }
+
+	    # Check to make sure the file contents are not too large.
+	    if (defined $_->{'size'} and ($size > $_->{'size'})) {
+		die sprintf("Ran out of flash space in <%s> - %s too large.\n", $_->{'name'},
+			    sprintf("0x%05X bytes", ($size - $_->{'size'})));
+	    }
+
+	    # If the partition does not have a fixed size, the calculate the size.
+	    if (not defined $_->{'size'}) {
+		$_->{'size'} = $size;
+	    }
+
+	    # Keep the user appraised ...
+	    $quiet or printf("Read 0x%08X bytes from \"%s\" into <%s> (%s / %s)%s\n",
+			     length($_->{'data'}), $_->{'file'}, $_->{'name'},
+			     ($size >= $block_size ?
+			      sprintf("%d blocks", numBlocks($size)) :
+			      sprintf("0x%05X bytes", $size)),
+			     ($_->{'size'} >= $block_size ?
+			      sprintf("%d blocks", numBlocks($_->{'size'})) :
+			      sprintf("0x%05X bytes", $_->{'size'})),
+			     ($_->{'byteswap'} ? " (byte-swapped)" : ""));
+	}
+
+    } @partitions;
+
+    return;
+}
+
+# layoutPartitions : this function must be ugly - it needs to verify RedBoot, SysConf, Kernel, Ramdisk, and
+#     FIS directory partitions exist, are in the correct order, and do not have more data than can fit in
+#     their lengths (fixed for all but Ramdisk, which has a minimum length of one block).
+#     If Rootdisk and/or Userdisk exist, it must also verify that their block padded lengths are not
+#     too great for the available space.
+# input : an array of hashes, some of which are populated with data
+# output: same reference with start and size (partition not data) also populated. this populated structure
+#         can then be passed to buildPartitionTable() to generate the actual partition table data
+sub layoutPartitions {
+    my(@partitions) = @_;
+
+    # Find the kernel partition, and save a pointer to it for later use
+    my $kernel;
+    map { ($_->{'name'} eq "Kernel") && ($kernel = $_); } @partitions;
+    $kernel or die "Couldn't find the kernel partition\n";
+
+    # Find the last variable size partition, and save a pointer to it for later use
+    my $lastdisk;
+    my $directory_offset;
+    my $curdisk = $partitions[0];
+    map {
+	if (not defined $lastdisk) {
+	    if ($_->{'name'} eq "FIS directory") {
+		$lastdisk = $curdisk;
+		$directory_offset = $_->{'offset'};
+	    }
+	    else {
+		$curdisk = $_;
+	    }
+	}
+    } @partitions;
+
+    $lastdisk or die "Couldn't find the last variable size partition\n";
+
+    $debug and printf("Last variable size partition is <%s>\n", $lastdisk->{'name'});
+
+    #
+    # here we go through the $partitions array ref and fill in all the values
+    #
+
+    # This points to where the next partition should be placed.
+    my $pointer = $flash_start;
+
+    map {
+
+	$debug and printf("Pointer is 0x%08X\n", $pointer);
+
+	# Determine the start and offset of the current partition.
+	if (defined $_->{'offset'}) {
+	    $_->{'start'} = $flash_start + $_->{'offset'};
+	    # Check for running past the defined start of the partition.
+	    if (($pointer > $_->{'start'}) and not $_->{'pseudo'}) {
+		die sprintf("Ran out of flash space before <%s> - %s too large.\n", $_->{'name'},
+			    sprintf("0x%05X bytes", ($pointer - $_->{'start'})));
+	    }
+	}
+
+	# If offset is not defined, then calculate it.
+	else {
+	    $_->{'start'} = $pointer;
+	    $_->{'offset'} = $_->{'start'} - $flash_start;
+	}
+
+	my $size = defined $_->{'data'} ? length($_->{'data'}) : 0;
+
+	# Add skip regions for the partitions with headers.
+	if ($_->{'header'} > 0) {
+	    # Define the skip region for the initial Sercomm header.
+	    push(@{$_->{'skips'}},
+		 { 'offset' => 0, 'size' => $_->{'header'}, 'data' => undef });
+	    # Allow for the Sercomm header to be prepended to the data.
+	    $size += $_->{'header'};
+
+	    # Determine if the partition overlaps the ramdisk boundary.
+	    if (($_->{'offset'} < $ramdisk_offset) and
+		(($_->{'offset'} + $size) > $ramdisk_offset)) {
+		# Define the skip region for the inline Sercomm header.
+		push(@{$_->{'skips'}},
+		     { 'offset' => ($ramdisk_offset - $_->{'offset'}), 'size' => 16,
+		       'data' => pack("N4", $block_size) });
+		# Allow for the Sercomm header to be inserted in the data.
+		$size += 16;
+	    }
+	}
+
+	# Partitions without headers cannot have skip regions.
+	elsif (($_->{'offset'} <= $ramdisk_offset) and
+	       (($_->{'offset'} + $size) > $ramdisk_offset)) {
+	    # Pad the kernel until it extends past the ramdisk offset.
+	    push(@{$kernel->{'skips'}},
+		 { 'offset' => ($ramdisk_offset - $kernel->{'offset'}), 'size' => 16,
+		   'data' => pack("N4", $block_size) });
+	    $kernel->{'size'} = $ramdisk_offset - $kernel->{'offset'} + $block_size;
+	    $kernel->{'data'} = padBytes($kernel->{'data'},
+					 $kernel->{'size'} - $kernel->{'header'} - 16);
+	    $_->{'offset'} = $ramdisk_offset + $block_size;
+	    $_->{'start'} = $flash_start + $_->{'offset'};
+	    $pointer = $_->{'start'};
+	    $debug and printf("Extending kernel partition past ramdisk offset.\n");
+	}
+
+	# If this is the last variable size partition, then fill the rest of the space.
+	if ($_->{'name'} eq $lastdisk->{'name'}) {
+	    $_->{'size'} = paddedSize($directory_offset + $flash_start - $pointer);
+	    $debug and printf("Padding last variable partition <%s> to 0x%08X bytes\n", $_->{'name'}, $_->{'size'});
+	}
+
+	die sprintf("Partition size not defined in <%s>.\n", $_->{'name'})
+	    unless defined $_->{'size'};
+
+	# Extend to another block if required.
+	if ($size > $_->{'size'}) {
+	    if ($_->{'name'} eq $lastdisk->{'name'}) {
+		die sprintf("Ran out of flash space in <%s> - %s too large.\n", $_->{'name'},
+			    sprintf("0x%05X bytes", ($size - $_->{'size'})));
+	    }
+	    $_->{'size'} = $size;
+	    printf("Extending partition <%s> to 0x%08X bytes\n", $_->{'name'}, $_->{'size'});
+	}
+
+	# Keep the user appraised ...
+	$debug and printf("Allocated <%s> from 0x%08X to 0x%08X (%s / %s)\n",
+			  $_->{'name'}, $_->{'start'}, $_->{'start'} + $_->{'size'},
+			  ($size >= $block_size ?
+			   sprintf("%d blocks", numBlocks($size)) :
+			   sprintf("0x%05X bytes", $size)),
+			  ($_->{'size'} >= $block_size ?
+			   sprintf("%d blocks", numBlocks($_->{'size'})) :
+			   sprintf("0x%05X bytes", $_->{'size'})));
+
+	# Check to make sure we have not run out of room.
+	if (($_->{'start'} + $_->{'size'}) > ($flash_start + $flash_len)) {
+	    die "Ran out of flash space in <", $_->{'name'}, ">\n";
+	}
+
+	$debug and printf("Moving pointer from 0x%08X to 0x%08X (0x%08X + 0x%08X)\n",
+			  $pointer, paddedSize($_->{'start'} + $_->{'size'}),
+			  $_->{'start'}, $_->{'size'});
+
+	# Move the pointer up, in preparation for the next partition.
+	$pointer = paddedSize($_->{'start'} + $_->{'size'});
+
+    } @partitions;
+
+    return;
+}
+
+sub buildPartitionTable {
+    my(@partitions) = @_;
+
+    my($flash_start) = 0x50000000;
+    my($partition_data) = '';
+
+    map {
+
+	# Collate the partition data for all known partitions.
+	if (not $_->{'pseudo'} and defined $_->{'offset'} and defined $_->{'size'}) {
+
+	    # Pack and append the binary table entry for this partition.
+	    $partition_data .= createPartitionEntry($_->{'name'}, $_->{'offset'} + $flash_start,
+						    $_->{'size'}, $_->{'skips'});
+
+	    # If this is the FIS directory, then write the partition table data into it.
+	    if ($_->{'name'} eq "FIS directory") {
+		# Explicitly terminate the partition data.
+		$partition_data .= pack("C",0xff) x 0x100;
+		$_->{'data'} = padBytes($partition_data, $_->{'size'});
+	    }
+
+	    my $size = length($_->{'data'});
+
+	    # Keep the user appraised ...
+	    $debug and printf("Table entry <%s> from 0x%08X to 0x%08X (%s / %s)%s\n",
+			      $_->{'name'}, $_->{'start'}, $_->{'start'} + $_->{'size'},
+			      ($size >= $block_size ?
+			       sprintf("%d blocks", numBlocks($size)) :
+			       sprintf("0x%05X bytes", $size)),
+			      ($_->{'size'} >= $block_size ?
+			       sprintf("%d blocks", numBlocks($_->{'size'})) :
+			       sprintf("0x%05X bytes", $_->{'size'})),
+			      (defined $_->{'skips'} ?
+			       sprintf("\nTable entry <%s> skip %s", $_->{'name'},
+				       join(", ",
+					    map { sprintf("0x%08X to 0x%08X", $_->{'offset'},
+							  $_->{'offset'} + $_->{'size'} - 1) }
+					    @{$_->{'skips'}})) :
+			       "")
+			      );
+	}
+	else {
+	    $debug and print "No table entry required for <", $_->{'name'}, ">\n";
+	}
+
+    } @partitions;
+
+    return;
+}
+
+sub writeOutFirmware {
+    my($filename, @partitions) = @_;
+
+    # Clear the image to start.
+    my $image_buf = "";
+
+    map {
+
+	# We can only write a partition if it has an offset, a size, and some data to write.
+	if (defined $_->{'offset'} and defined $_->{'size'} and defined $_->{'data'}) {
+
+	    # Keep track of the end of the image.
+	    my $end_point = length($image_buf);
+
+	    # If the next partition is well past the end of the current image, then pad it.
+	    if ($_->{'offset'} > $end_point) {
+		$image_buf .= padBytes("", $_->{'offset'} - $end_point);
+		$quiet or printf("Padded %s before <%s> in \"%s\"\n",
+				 ((length($image_buf) - $end_point) >= $block_size ?
+				  sprintf("%d blocks", numBlocks(length($image_buf) - $end_point)) :
+				  sprintf("0x%05X bytes", length($image_buf) - $end_point)),
+				 $_->{'name'}, $filename);
+	    }
+
+	    # If the next parition is before the end of the current image, then rewind.
+	    elsif ($_->{'offset'} < $end_point) {
+		$debug and printf("Rewound %s before <%s> in \"%s\"\n",
+				  (($end_point - $_->{'offset'}) >= $block_size ?
+				   sprintf("%d blocks", numBlocks($end_point - $_->{'offset'})) :
+				   sprintf("0x%05X bytes", $end_point - $_->{'offset'})),
+				  $_->{'name'}, $filename);
+# 		if (($end_point - $_->{'offset'}) >= $block_size) {
+# 		    die "Allocation error: rewound a full block or more ...\n";
+# 		}
+	    }
+
+	    # If skip regions are defined, add them to the data.
+	    if (defined $_->{'skips'}) {
+		my $added = 0;
+		foreach my $region (@{$_->{'skips'}}) {
+		    if (($region->{'offset'} > 0) or
+			not ($_->{'header'} > 0)) {
+			$debug and printf("Inserted 0x%05X bytes (at offset 0x%05X) into <%s>\n",
+					  $region->{'size'}, $region->{'offset'}, $_->{'name'});
+			substr($_->{'data'},
+			       $region->{'offset'} + $added - $_->{'header'},
+			       0, $region->{'data'});
+			$added += $region->{'size'};
+		    }
+		}
+	    }
+
+	    # Splice the data into the image at the appropriate place, padding as required.
+	    substr($image_buf, $_->{'offset'}, $_->{'size'},
+		   $_->{'header'} ?
+		   padBytes(pack("N4",length($_->{'data'})).$_->{'data'}, $_->{'size'}) :
+		   padBytes($_->{'data'}, $_->{'size'}));
+	    
+	    # Keep the user appraised ...
+	    $quiet or printf("Wrote %s (0x%08X to 0x%08X) from <%s> into \"%s\"\n",
+			     ($_->{'size'} >= $block_size ?
+			      sprintf("%2d blocks", numBlocks($_->{'size'})) :
+			      sprintf("0x%05X bytes", $_->{'size'})),
+			     $_->{'offset'}, $_->{'offset'}+$_->{'size'}, $_->{'name'}, $filename);
+	}
+
+	# If we are not able to write a partition, then give debug information about why.
+	else {
+	    $debug and printf("Skipping <%s> (%s)\n", $_->{'name'},
+			      (not defined $_->{'offset'}) ? "no offset defined" :
+			      ((not defined $_->{'size'}) ? "no size defined" :
+			       "no data available"));
+	}
+
+    } @partitions;
+
+    # Write the image to the specified file.
+    writeOut($image_buf, $filename);
+
+    return;
+}
+
+# checkPartitionTable: sanity check partition table - for testing but might evolve into setting @partitions
+#    so that we can write out jffs2 partitions from a read image
+#    currently not nearly paranoid enough
+sub checkPartitionTable {
+    my($data) = @_;
+
+    my($pointer) = 0;
+    my($entry);
+
+    my($name, $flash_base, $size, $done, $dummy_long, $padding);
+    do {
+	$entry = substr($data, $pointer, 0x100);
+
+	($name,$flash_base,$dummy_long,$size,$dummy_long,$dummy_long,$padding,$dummy_long,$dummy_long) = unpack("a16N5x212N2",$entry);
+	$name =~ s/\0//g;
+	$debug and printf("pointer: %d\tname: %s%sflash_base: 0x%08X\tsize: 0x%08X\n",
+			  $pointer, $name, (" " x (16 - length($name))), $flash_base, $size);
+	$pointer += 0x100;
+	$debug and printf("terminator: 0x%08X\n", unpack("C", substr($data, $pointer, 1)));
+	if (unpack("C", substr($data, $pointer, 1)) eq 0xff) {
+	    $done = 1;
+	}
+    } until $done;
+}
+
+sub printPartitions {
+    my(@partitions) = @_;
+
+    my($offset, $size, $skips);
+    map {
+#	defined $_->{'size'} ? $size = $_->{'size'} : $size = undef;
+
+	if (defined  $_->{'size'}) {
+	    $size = $_->{'size'};
+	}
+	else {
+	    $size = undef;
+	}
+	if (defined  $_->{'offset'}) {
+	    $offset = $_->{'offset'};
+	}
+	else {
+	    $offset = undef;
+	}
+	if (defined  $_->{'skips'}) {
+	    $skips = $_->{'skips'};
+	}
+	else {
+	    $skips = undef;
+	}
+	printf("%s%s", $_->{'name'}, (" " x (16 - length($_->{'name'}))));
+	if (defined $offset) { printf("0x%08X\t", $offset); } else { printf("(undefined)\t");   };
+	if (defined $size)   { printf("0x%08X", $size); } else { printf("(undefined)"); };
+	if (defined $skips) {
+	    printf("\t[%s]",
+		   join(", ",
+			map { sprintf("0x%05X/0x%05X", $_->{'offset'}, $_->{'size'}); }
+			@$skips));
+	}
+	printf("\n");
+    } @partitions;
+}
+
+sub defaultPartitions {
+
+    return ({'name'=>'RedBoot',          'file'=>'RedBoot',
+	     'offset'=>0x00000000,        'size'=>0x00040000,
+	     'variable'=>0, 'header'=>0,  'pseudo'=>0, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'EthAddr',           'file'=>undef,
+	     'offset'=>0x0003ffb0,        'size'=>0x00000006,
+	     'variable'=>0, 'header'=>0,  'pseudo'=>1, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'SysConf',           'file'=>'SysConf',
+	     'offset'=>0x00040000,        'size'=>0x00020000,
+	     'variable'=>0, 'header'=>0,  'pseudo'=>0, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'Loader',            'file'=>'apex.bin',
+	     'offset'=>undef,             'size'=>undef,
+	     'variable'=>1, 'header'=>16, 'pseudo'=>0, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'Kernel',            'file'=>'vmlinuz',
+	     'offset'=>undef,             'size'=>undef,
+	     'variable'=>1, 'header'=>16, 'pseudo'=>0, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'Ramdisk',           'file'=>'ramdisk.gz',
+	     'offset'=>undef,             'size'=>undef,
+	     'variable'=>1, 'header'=>16, 'pseudo'=>0, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'FIS directory',     'file'=>undef,
+	     'offset'=>0x007e0000,        'size'=>0x00020000,
+	     'variable'=>0, 'header'=>0,  'pseudo'=>0, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'Loader config',	  'file'=>undef,
+	     'offset'=>0x007f8000,        'size'=>0x00004000,
+	     'variable'=>0, 'header'=>0,  'pseudo'=>1, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'Microcode',	  'file'=>'NPE-B',
+	     'offset'=>0x007fc000,        'size'=>0x00003fe0,
+	     'variable'=>0, 'header'=>16, 'pseudo'=>1, 'data'=>undef, 'byteswap'=>0},
+	    {'name'=>'Trailer',           'file'=>'Trailer',
+	     'offset'=>0x007ffff0,        'size'=>0x00000010,
+	     'variable'=>0, 'header'=>0,  'pseudo'=>1, 'data'=>undef, 'byteswap'=>0});
+}
+
+# Main routine starts here ...
+
+my($unpack, $pack, $little, $fatflash, $input, $output, $redboot);
+my($kernel, $sysconf, $ramdisk, $fisdir);
+my($microcode, $trailer, $ethaddr, $loader);
+
+END {
+    # Remove temporary files
+    for my $file (@cleanup) {
+	unlink $file;
+    }
+}
+
+if (!GetOptions("d|debug"       => \$debug,
+		"q|quiet"       => \$quiet,
+		"u|unpack"      => \$unpack,
+		"p|pack"        => \$pack,
+		"l|little"      => \$little,
+		"F|fatflash"    => \$fatflash,
+		"i|input=s"     => \$input,
+		"o|output=s"    => \$output,
+		"b|redboot=s"   => \$redboot,
+		"k|kernel=s"    => \$kernel,
+		"s|sysconf=s"   => \$sysconf,
+		"r|ramdisk=s"   => \$ramdisk,
+		"f|fisdir=s"    => \$fisdir,
+		"m|microcode=s" => \$microcode,
+		"t|trailer=s"   => \$trailer,
+		"e|ethaddr=s"   => \$ethaddr,
+		"L|loader=s"    => \$loader,
+		) or (not defined $pack and not defined $unpack)) {
+    print "Usage: slugimage <options>\n";
+    print "\n";
+    print "  [-d|--debug]			Turn on debugging output\n";
+    print "  [-q|--quiet]			Turn off status messages\n";
+    print "  [-u|--unpack]			Unpack a firmware image\n";
+    print "  [-p|--pack]			Pack a firmware image\n";
+    print "  [-l|--little]			Convert Kernel and Ramdisk to little-endian\n";
+    print "  [-F|--fatflash]			Generate an image for 16MB flash\n";
+    print "  [-i|--input]     <file>		Input firmware image filename\n";
+    print "  [-o|--output]    <file>		Output firmware image filename\n";
+    print "  [-b|--redboot]   <file>		Input/Output RedBoot filename\n";
+    print "  [-s|--sysconf]   <file>		Input/Output SysConf filename\n";
+    print "  [-L|--loader]    <file>		Second stage boot loader filename\n";
+    print "  [-k|--kernel]    <file>		Input/Ouptut Kernel filename\n";
+    print "  [-r|--ramdisk]   <file>		Input/Output Ramdisk filename(s)\n";
+    print "  [-f|--fisdir]    <file>		Input/Output FIS directory filename\n";
+    print "  [-m|--microcode] <file>		Input/Output Microcode filename\n";
+    print "  [-t|--trailer]   <file>		Input/Output Trailer filename\n";
+    print "  [-e|--ethaddr]   <AABBCCDDEEFF>	Set the Ethernet address\n";
+
+    # %%% TODO %%% Document --ramdisk syntax
+
+    exit 1;
+}
+
+my(@partitions) = defaultPartitions();
+
+if ($pack) {
+    die "Output filename must be specified\n" unless defined $output;
+
+    # If we're creating an image and no RedBoot, SysConf partition is
+    # explicitly specified, simply write an empty one as the upgrade tools
+    # don't touch RedBoot and SysConf anyway.  If no Trailer is specified,
+    # put in one.
+    if (not defined $redboot and not -e "RedBoot") {
+	$redboot = tmpnam();
+	open TMP, ">$redboot" or die "Cannot open file $redboot: $!";
+	push @cleanup, $redboot;
+	# The RedBoot partition is 256 * 1024 = 262144; the trailer we add
+	# is 70 bytes.
+	print TMP "\0"x(262144-70);
+	# Upgrade tools check for an appropriate Sercomm trailer.
+	for my $i (@sercomm_redboot_trailer) {
+	    print TMP pack "S", $i;
+	}
+	close TMP;
+    }
+    if (not defined $sysconf and not -e "SysConf") {
+	$sysconf = tmpnam();
+	open TMP, ">$sysconf" or die "Cannot open file $sysconf: $!";
+	push @cleanup, $sysconf;
+	# The SysConf partition is 128 * 1024 = 131072
+	print TMP "\0"x131072;
+	close TMP;
+    }
+    if (not defined $trailer and not -e "Trailer") {
+	$trailer = tmpnam();
+	open TMP, ">$trailer" or die "Cannot open file $trailer: $!";
+	push @cleanup, $trailer;
+	for my $i (@sercomm_flash_trailer) {
+	    print TMP pack "S", $i;
+	}
+	close TMP;
+    }
+
+    # If the microcode was not specified, then don't complain that it's missing.
+    if (not defined $microcode and not -e "NPE-B") {
+	map { ($_->{'name'} eq 'Microcode') && ($_->{'file'} = undef);   } @partitions;
+    }
+}
+
+# Go through the partition options, and set the names and files in @partitions
+if (defined $redboot)   { map { ($_->{'name'} eq 'RedBoot')	  && ($_->{'file'} = $redboot);   } @partitions; }
+if (defined $sysconf)   { map { ($_->{'name'} eq 'SysConf')	  && ($_->{'file'} = $sysconf);   } @partitions; }
+if (defined $loader)    { map { ($_->{'name'} eq 'Loader')	  && ($_->{'file'} = $loader);    } @partitions; }
+if (defined $kernel)    { map { ($_->{'name'} eq 'Kernel')	  && ($_->{'file'} = $kernel);    } @partitions; }
+if (defined $fisdir)    { map { ($_->{'name'} eq 'FIS directory') && ($_->{'file'} = $fisdir);    } @partitions; }
+if (defined $microcode) { map { ($_->{'name'} eq 'Microcode')	  && ($_->{'file'} = $microcode); } @partitions; }
+if (defined $trailer)   { map { ($_->{'name'} eq 'Trailer')	  && ($_->{'file'} = $trailer);   } @partitions; }
+
+if (defined $little)  {
+    map {
+	if (($_->{'name'} eq 'Loader') or
+	    ($_->{'name'} eq 'Kernel') or
+	    ($_->{'name'} eq 'Ramdisk')) {
+	    $_->{'byteswap'} = 1;
+	}
+    } @partitions;
+}
+
+if (defined $fatflash)  {
+    $flash_len = 0x01000000;
+    map {
+	if (($_->{'name'} eq 'FIS directory') or
+	    ($_->{'name'} eq 'Loader config') or
+	    ($_->{'name'} eq 'Microcode') or
+	    ($_->{'name'} eq 'Trailer')) {
+	    $_->{'offset'} += 0x00800000;
+	}
+    } @partitions;
+}
+
+if (defined $ethaddr) {
+    map {
+	if ($_->{'name'} eq 'EthAddr') {
+	    $ethaddr =~ s/://g;
+	    if (($ethaddr !~ m/^[0-9A-Fa-f]+$/) or (length($ethaddr) != 12)) {
+		die "Invalid ethernet address specification: '".$ethaddr."'\n";
+	    }
+	    $_->{'data'} = pack("H12", $ethaddr);
+	}
+    } @partitions;
+}
+
+if (defined $ramdisk) {
+
+    # A single filename is used for the ramdisk filename
+    if ($ramdisk !~ m/[:,]/) {
+	map { ($_->{'name'} eq 'Ramdisk') && ($_->{'file'} = $ramdisk); } @partitions;
+    }
+
+    # otherwise, it's a list of name:file mappings
+    else {
+	my @mappings = split(',', $ramdisk);
+
+	# Find the index of the Ramdisk entry
+	my $index;
+	my $count = 0;
+	map {
+	    if (not defined $index) {
+		if ($_->{'name'} eq "Ramdisk") {
+		    $index = $count;
+		}
+		$count++;
+	    }
+	} @partitions;
+
+	defined $index or die "Cannot find the Ramdisk partition\n";
+
+	# Replace the Ramdisk entry with the new mappings
+	splice(@partitions, $index, 1, map {
+
+	    # Preserve the information from the ramdisk entry
+	    my %entry = %{$partitions[$index]};
+
+	    # Parse the mapping
+	    ($_ =~ m/^([^:]+):([^:]+)(:([^:]+))?$/) or die "Invalid syntax in --ramdisk\n";
+	    $entry{'name'} = $1; $entry{'file'} = $2; my $size = $4;
+
+	    # If the mapping is not for the ramdisk, then undefine its attributes
+	    if ($entry{'name'} ne 'Ramdisk') {
+		$entry{'offset'} = undef;
+		$entry{'size'} = undef;
+		$entry{'variable'} = 1;
+		$entry{'header'} = 0;
+		$entry{'pseudo'} = 0;
+		$entry{'data'} = undef;
+		$entry{'byteswap'} = 0;
+	    }
+
+	    # Support specification of the number of blocks for empty jffs2
+	    if ($entry{'file'} =~ m/^[0-9]+$/) {
+		$size = $entry{'file'};
+		$entry{'file'} = undef;
+	    }
+
+	    # If the user has specified a size, then respect their wishes
+	    if (defined $size) {
+		$entry{'size'} = $size * $block_size;
+		# Create an empty partition of the requested size.
+		$entry{'data'} = padBytes("", $entry{'size'} - $entry{'header'});
+	    }
+
+	    \%entry;
+
+	} @mappings);
+    }
+}
+
+# Read in the firmware image
+if ($input) {
+    if ($debug) {
+	print "Initial partition map:\n";
+	printPartitions(@partitions);
+    }
+    
+    my $result = readInFirmware($input, \@partitions);
+
+    if ($debug) {
+	print "After reading firmware:\n";
+	printPartitions(@partitions);
+    }
+}
+
+# Unpack the firmware if requested
+if ($unpack) {
+    die "Input filename must be specified\n" unless defined $input;
+
+#    map {
+#	($_->{'name'} eq 'FIS directory') and @partitions = checkPartitionTable($_->{'data'});
+#    } @partitions;
+
+    writeOutFirmwareParts(@partitions);
+
+}
+
+# Pack the firmware if requested
+if ($pack) {
+
+    if (!defined $loader) {
+	removeOptionalLoader(\@partitions);
+    }
+
+    if ($debug) {
+	print "Initial partition map:\n";
+	printPartitions(@partitions);
+    }
+    
+    my $result = readInFirmwareParts(@partitions);
+
+    if ($debug) {
+	print "after readInFirmwareParts():\n";
+	printPartitions(@partitions);
+# 	map {
+# 	    ($_->{'name'} eq 'RedBoot') && (printRedbootTrailer($_->{'data'}));
+# 	} @partitions;
+    }
+    
+    layoutPartitions(@partitions);
+
+    if ($debug) {
+ 	print "after layoutPartitions():\n";
+ 	printPartitions(@partitions);
+    }
+    
+    buildPartitionTable(@partitions);
+
+    if ($debug) {
+ 	print "after buildPartitionTable():\n";
+ 	printPartitions(@partitions);
+
+#  	my($lastblock);
+#  	map {
+#  	    if ($_->{'name'} eq 'FIS directory') {
+#  		$lastblock = $_->{'data'};
+#  	    }
+#  	} @partitions;
+
+#  	print "checkPartitionTable():\n";
+#  	checkPartitionTable($lastblock);
+    }
+    
+    writeOutFirmware($output, @partitions);
+
+}
+
+exit 0;
diff --git a/trunk/scripts/strip-kmod.sh b/trunk/scripts/strip-kmod.sh
new file mode 100755
index 00000000..13e6b580
--- /dev/null
+++ b/trunk/scripts/strip-kmod.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+[ -n "$CROSS" ] || {
+	echo "The variable CROSS must be set to point to the cross-compiler prefix"
+	exit 1
+}
+
+MODULE="$1"
+
+[ "$#" -ne 1 ] && {
+	echo "Usage: $0 <module>"
+	exit 1
+}
+
+ARGS=
+if [ -n "$KEEP_SYMBOLS" ]; then
+	ARGS="-X --strip-debug"
+else
+	ARGS="-x -G __this_module --strip-unneeded"
+fi
+
+${CROSS}objcopy \
+	-R .comment \
+	-R .pdr \
+	-R .mdebug.abi32 \
+	-R .note.gnu.build-id \
+	-R .gnu.attributes \
+	-R .reginfo \
+	$ARGS \
+	"$MODULE" "$MODULE.tmp"
+
+[ -n "$NO_RENAME" ] && {
+	mv "${MODULE}.tmp" "$MODULE"
+	exit 0
+}
+
+${CROSS}nm "$MODULE.tmp" | awk '
+BEGIN {
+	n = 0
+}
+
+$3 && $2 ~ /[brtd]/ && $3 !~ /\$LC/ && !def[$3] {
+	print "--redefine-sym "$3"=_"n;
+	n = n + 1
+	def[$3] = 1
+}
+' > "$MODULE.tmp1"
+
+${CROSS}objcopy `cat ${MODULE}.tmp1` ${MODULE}.tmp ${MODULE}.out
+mv "${MODULE}.out" "${MODULE}"
+rm -f "${MODULE}".t*
diff --git a/trunk/scripts/symlink-tree.sh b/trunk/scripts/symlink-tree.sh
new file mode 100755
index 00000000..50d5a285
--- /dev/null
+++ b/trunk/scripts/symlink-tree.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# Create a new librecmc tree with symlinks pointing at the current tree
+# Usage: ./scripts/symlink-tree.sh <destination>
+
+FILES="
+	BSDmakefile
+	Config.in
+	LICENSE
+	Makefile
+	README
+	dl
+	docs
+	feeds.conf.default
+	include
+	package
+	rules.mk
+	scripts
+	target
+	toolchain
+	tools"
+
+if [ -f feeds.conf ] ; then
+	FILES="$FILES feeds.conf"
+fi
+
+if [ -z "$1" ]; then
+	echo "Syntax: $0 <destination>" >&2
+	exit 1
+fi
+
+if [ -e "$1" ]; then
+	echo "Error: $1 already exists" >&2
+	exit 1
+fi
+
+set -e # fail if any commands fails
+mkdir -p dl "$1"
+for file in $FILES; do
+	[ -e "$PWD/$file" ] || {
+		echo "ERROR: $file does not exist in the current tree" >&2
+		exit 1
+	}
+	ln -s "$PWD/$file" "$1/"
+done
+exit 0
diff --git a/trunk/scripts/timestamp.pl b/trunk/scripts/timestamp.pl
new file mode 100755
index 00000000..e24d8149
--- /dev/null
+++ b/trunk/scripts/timestamp.pl
@@ -0,0 +1,69 @@
+#!/usr/bin/env perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+use strict;
+
+sub get_ts($$) {
+	my $path = shift;
+	my $options = shift;
+	my $ts = 0;
+	my $fn = "";
+	$path .= "/" if( -d $path);
+	open FIND, "find $path -type f -and -not -path \\*/.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
+	while (<FIND>) {
+		chomp;
+		my $file = $_;
+		next if -l $file;
+		my $mt = (stat $file)[9];
+		if ($mt > $ts) {
+			$ts = $mt;
+			$fn = $file;
+		}
+	}
+	close FIND;
+	return ($ts, $fn);
+}
+
+(@ARGV > 0) or push @ARGV, ".";
+my $ts = 0;
+my $n = ".";
+my %options;
+while (@ARGV > 0) {
+	my $path = shift @ARGV;
+	if ($path =~ /^-x/) {
+		my $str = shift @ARGV;
+		$options{"findopts"} .= " -and -not -path '".$str."'"
+	} elsif ($path =~ /^-f/) {
+		$options{"findopts"} .= " -follow";
+	} elsif ($path =~ /^-n/) {
+		my $arg = $ARGV[0];
+		$options{$path} = $arg;
+	} elsif ($path =~ /^-/) {
+		$options{$path} = 1;
+	} else {
+		my ($tmp, $fname) = get_ts($path, $options{"findopts"});
+		if ($tmp > $ts) {
+			if ($options{'-F'}) {
+				$n = $fname;
+			} else {
+				$n = $path;
+			}
+			$ts = $tmp;
+		}
+	}
+}
+
+if ($options{"-n"}) {
+	exit ($n eq $options{"-n"} ? 0 : 1);
+} elsif ($options{"-p"}) {
+	print "$n\n";
+} elsif ($options{"-t"}) {
+	print "$ts\n";
+} else {
+	print "$n\t$ts\n";
+}
diff --git a/trunk/scripts/ubinize-image.sh b/trunk/scripts/ubinize-image.sh
new file mode 100755
index 00000000..6762c22b
--- /dev/null
+++ b/trunk/scripts/ubinize-image.sh
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+ubootenv=""
+ubinize_param=""
+kernel=""
+rootfs=""
+outfile=""
+err=""
+
+get_magic_word() {
+	dd if=$1 bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
+}
+
+is_ubifs() {
+	if [ "$( get_magic_word $1 )" = "3118" ]; then
+		echo "1"
+	fi
+}
+
+ubivol() {
+	volid=$1
+	name=$2
+	image=$3
+	autoresize=$4
+	echo "[$name]"
+	echo "mode=ubi"
+	echo "vol_id=$volid"
+	echo "vol_type=dynamic"
+	echo "vol_name=$name"
+	if [ "$image" ]; then
+		echo "image=$image"
+	else
+		echo "vol_size=1MiB"
+	fi
+	if [ "$autoresize" ]; then
+		echo "vol_flags=autoresize"
+	fi
+}
+
+ubilayout() {
+	local vol_id=0
+	local root_is_ubifs="$( is_ubifs "$2" )"
+	if [ "$1" = "ubootenv" ]; then
+		ubivol $vol_id ubootenv
+		vol_id=$(( $vol_id + 1 ))
+		ubivol $vol_id ubootenv2
+		vol_id=$(( $vol_id + 1 ))
+	fi
+	if [ "$3" ]; then
+		ubivol $vol_id kernel "$3"
+		vol_id=$(( $vol_id + 1 ))
+	fi
+	ubivol $vol_id rootfs "$2" $root_is_ubifs
+	vol_id=$(( $vol_id + 1 ))
+	[ "$root_is_ubifs" ] || ubivol $vol_id rootfs_data "" 1
+}
+
+while [ "$1" ]; do
+	case "$1" in
+	"--uboot-env")
+		ubootenv="ubootenv"
+		shift
+		continue
+		;;
+	"--kernel")
+		kernel="$2"
+		shift
+		shift
+		continue
+		;;
+	"-"*)
+		ubinize_param="$@"
+		break
+		;;
+	*)
+		if [ ! "$rootfs" ]; then
+			rootfs=$1
+			shift
+			continue
+		fi
+		if [ ! "$outfile" ]; then
+			outfile=$1
+			shift
+			continue
+		fi
+		;;
+	esac
+done
+
+if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$outfile" ]; then
+	echo "syntax: $0 [--uboot-env] [--kernel kernelimage] rootfs out [ubinize opts]"
+	exit 1
+fi
+
+ubinize="$( which ubinize )"
+if [ ! -x "$ubinize" ]; then
+	echo "ubinize tool not found or not usable"
+	exit 1
+fi
+
+ubinizecfg="$( mktemp )"
+ubilayout "$ubootenv" "$rootfs" "$kernel" > "$ubinizecfg"
+
+cat "$ubinizecfg"
+ubinize -o "$outfile" $ubinize_param "$ubinizecfg"
+err="$?"
+[ ! -e "$outfile" ] && err=2
+rm "$ubinizecfg"
+
+exit $err
+
diff --git a/trunk/scripts/update-package-md5sum b/trunk/scripts/update-package-md5sum
new file mode 100755
index 00000000..6317f1ab
--- /dev/null
+++ b/trunk/scripts/update-package-md5sum
@@ -0,0 +1,38 @@
+#!/usr/bin/env sh
+#
+# update-package-md5sum - Updates md5sum of libreCMC packages
+#
+# update-package-md5sum will update the md5sum for all recusivly found libreCMC packages
+# in a given directory.
+#
+# Usage: scripts/update-package-md5sum <package directory>
+#
+# Example: `scripts/update-package-md5sum feeds/packages/python`
+
+DL_FOLDER=`grep -Eo '^CONFIG_DOWNLOAD_FOLDER=".*"$' .config | \
+    sed 's,^CONFIG_DOWNLOAD_FOLDER="\(.*\)"$,\1,'`
+if test -z ${DL_FOLDER}; then
+    DL_FOLDER=./dl
+fi
+
+if test -z "$1"; then
+	echo "Usage: $0 <package directory>"
+	exit
+fi
+
+for file in `find $1 -name Makefile`; do
+    if grep BuildPackage ${file} > /dev/null; then
+        source=`DUMP=1 TOPDIR=\`pwd\` make -f ${file} | grep -m 1 Source | cut -f 2 -d ' '`
+        if test -n "${source}"; then
+			if test ! -f "${DL_FOLDER}/${source}"; then
+				make package/`basename \`dirname ${file}\``/download
+			fi
+            sum=`md5sum ${DL_FOLDER}/${source} 2> /dev/null` || continue
+            echo Updating ${file}...
+            sum=`echo ${sum} | cut -d ' ' -f 1`
+            sed -i "s,^PKG_MD5SUM:=.*,PKG_MD5SUM:=${sum}," ${file}
+        else
+            echo No source for ${file}
+        fi
+    fi
+done
diff --git a/trunk/target/Config.in b/trunk/target/Config.in
new file mode 100644
index 00000000..7380773d
--- /dev/null
+++ b/trunk/target/Config.in
@@ -0,0 +1,207 @@
+source "tmp/.config-target.in"
+
+# Kernel/Hardware features
+
+config HAS_SPE_FPU
+	depends on powerpc
+	select HAS_FPU
+	bool
+
+config HAS_FPU
+	bool
+
+config AUDIO_SUPPORT
+	bool
+
+config GPIO_SUPPORT
+	bool
+
+config PCI_SUPPORT
+	select AUDIO_SUPPORT
+	bool
+
+config PCIE_SUPPORT
+	bool
+
+config PCMCIA_SUPPORT
+	bool
+
+config USB_SUPPORT
+	select AUDIO_SUPPORT
+	bool
+
+config USB_GADGET_SUPPORT
+	bool
+
+config RTC_SUPPORT
+	bool
+
+config BIG_ENDIAN
+	bool
+
+config USES_DEVICETREE
+	bool
+
+config USES_INITRAMFS
+	bool
+
+config USES_SQUASHFS
+	bool
+
+config USES_JFFS2
+	bool
+
+config USES_JFFS2_NAND
+	bool
+
+config USES_EXT4
+	bool
+
+config USES_TARGZ
+	bool
+
+config USES_CPIOGZ
+	bool
+
+config USES_UBIFS
+	bool
+	select NAND_SUPPORT
+
+config PROFILE_KCONFIG
+	bool
+
+config LOW_MEMORY_FOOTPRINT
+	bool
+
+config NOMMU
+	bool
+
+config HAS_MIPS16
+	depends on (mips || mipsel || mips64 || mips64el)
+	bool
+
+config RFKILL_SUPPORT
+	bool
+
+config NAND_SUPPORT
+	bool
+
+config ARCH_64BIT
+	bool
+
+# Architecture selection
+
+config aarch64
+	select ARCH_64BIT
+	bool
+
+config aarch64_be
+	select ARCH_64BIT
+	select BIG_ENDIAN
+	bool
+
+config arm
+	bool
+
+config armeb
+	select BIG_ENDIAN
+	bool
+
+config arm_v4
+	bool
+
+config arm_v5
+	bool
+
+config arm_v6
+	bool
+
+config arm_v7
+	bool
+
+config avr32
+	select BIG_ENDIAN
+	bool
+
+config cris
+	bool
+
+config i386
+	bool
+
+config i686
+	bool 
+
+config m68k
+	bool
+
+config mips
+	select BIG_ENDIAN
+	bool
+
+config mipsel
+	bool
+
+config mips64
+	select BIG_ENDIAN
+	select ARCH_64BIT
+	bool
+
+config mips64el
+	select ARCH_64BIT
+	bool
+
+config powerpc
+	select BIG_ENDIAN
+	bool
+
+config powerpc64
+	select BIG_ENDIAN
+	select ARCH_64BIT
+	bool
+
+config sh3
+	bool
+
+config sh3eb
+	select BIG_ENDIAN
+	bool
+
+config sh4
+	bool
+
+config sh4eb
+	select BIG_ENDIAN
+	bool
+
+config sparc
+	select BIG_ENDIAN
+	bool
+
+config x86_64
+	select ARCH_64BIT
+	bool
+
+config ARCH
+	string
+	default "aarch64"   if aarch64
+	default "aarch64_be" if aarch64_be
+	default "arm"       if arm
+	default "armeb"     if armeb
+	default "avr32"     if avr32
+	default "cris"      if cris
+	default "i386"      if i386
+	default "i686"      if i686
+	default "m68k"      if m68k
+	default "mips"      if mips
+	default "mipsel"    if mipsel
+	default "mips64"    if mips64
+	default "mips64el"  if mips64el
+	default "powerpc"   if powerpc
+	default "sh3"       if sh3
+	default "sh3eb"     if sh3eb
+	default "sh4"       if sh4
+	default "sh4eb"     if sh4eb
+	default "sparc"     if sparc
+	default "x86_64"    if x86_64
+
diff --git a/trunk/target/Makefile b/trunk/target/Makefile
new file mode 100644
index 00000000..cb68454c
--- /dev/null
+++ b/trunk/target/Makefile
@@ -0,0 +1,21 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+curdir:=target
+
+$(curdir)/builddirs:=linux sdk imagebuilder toolchain
+$(curdir)/builddirs-default:=linux
+$(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder) $(if $(CONFIG_MAKE_TOOLCHAIN),toolchain)
+
+$(curdir)/imagebuilder/install:=$(curdir)/linux/install
+
+$(eval $(call stampfile,$(curdir),target,prereq,.config))
+$(eval $(call stampfile,$(curdir),target,compile,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),target,install,$(TMP_DIR)/.build))
+
+$($(curdir)/stamp-install): $($(curdir)/stamp-compile) 
+
+$(eval $(call subdir,$(curdir)))
diff --git a/trunk/target/imagebuilder/Config.in b/trunk/target/imagebuilder/Config.in
new file mode 100644
index 00000000..501c588f
--- /dev/null
+++ b/trunk/target/imagebuilder/Config.in
@@ -0,0 +1,10 @@
+config IB
+	bool "Build the libreCMC Image Builder"
+	depends on !PROFILE_KCONFIG
+	depends on !EXTERNAL_TOOLCHAIN
+	help
+	  This is essentially a stripped-down version of the buildroot
+	  with precompiled packages, kernel image and image building tools.
+	  You can use it to generate custom images without compiling anything
+
+
diff --git a/trunk/target/imagebuilder/Makefile b/trunk/target/imagebuilder/Makefile
new file mode 100644
index 00000000..9d93da47
--- /dev/null
+++ b/trunk/target/imagebuilder/Makefile
@@ -0,0 +1,69 @@
+# 
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/version.mk
+
+override MAKEFLAGS=
+
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+
+IB_NAME:=libreCMC-ImageBuilder-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))-for-$(PKG_OS)-$(PKG_CPU)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
+IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR))
+IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))
+IB_DTSDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))/arch/$(ARCH)/boot/dts/
+
+all: compile
+
+$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
+	rm -rf $(PKG_BUILD_DIR)
+	mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \
+		$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR)
+	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
+	$(CP) \
+		$(INCLUDE_DIR) $(SCRIPT_DIR) \
+		$(TOPDIR)/rules.mk \
+		./files/Makefile \
+		./files/repositories.conf \
+		$(TMP_DIR)/.targetinfo \
+		$(TMP_DIR)/.packageinfo \
+		$(PKG_BUILD_DIR)/
+	$(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf
+	$(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
+	$(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
+	if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \
+		$(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \
+	fi
+	rm -rf \
+		$(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
+		$(PKG_BUILD_DIR)/target/linux/*/patches{,-*}
+	-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
+	-cp $(LINUX_DIR)/.config $(IB_LDIR)/
+	-$(SCRIPT_DIR)/bundle-libraries.sh $(IB_LDIR)/scripts/dtc \
+	  $(LINUX_DIR)/scripts/dtc/dtc
+	if [ -d $(LINUX_DIR)/arch/$(ARCH)/boot/dts ]; then \
+		$(CP) $(LINUX_DIR)/arch/$(ARCH)/boot/dts/* $(IB_DTSDIR); \
+	fi
+	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk
+	find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
+	  | $(XARGS) rm -rf
+	find $(STAGING_DIR_HOST)/bin -maxdepth 1 -type f -perm -u=x \
+	  | $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(PKG_BUILD_DIR)/staging_dir/host/bin
+	$(MAKE) -C $(PKG_BUILD_DIR) package_index
+	$(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@
+
+download:
+prepare:
+compile: $(BIN_DIR)/$(IB_NAME).tar.bz2
+install: compile
+
+clean: FORCE
+	rm -rf $(PKG_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2
diff --git a/trunk/target/imagebuilder/files/Makefile b/trunk/target/imagebuilder/files/Makefile
new file mode 100644
index 00000000..87188120
--- /dev/null
+++ b/trunk/target/imagebuilder/files/Makefile
@@ -0,0 +1,178 @@
+# Makefile for libreCMC
+#
+# Copyright (C) 2007-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+export TOPDIR LC_ALL LANG
+export LIBRECMC_VERBOSE=s
+all: help
+
+include $(TOPDIR)/include/host.mk
+
+ifneq ($(LIBRECMC_BUILD),1)
+  override LIBRECMC_BUILD=1
+  export LIBRECMC_BUILD
+endif
+
+include rules.mk
+include $(INCLUDE_DIR)/debug.mk
+include $(INCLUDE_DIR)/depends.mk
+
+include $(INCLUDE_DIR)/version.mk
+export REVISION
+
+define Helptext
+Available Commands:
+	help:	This help text
+	info:	Show a list of available target profiles
+	clean:	Remove images and temporary build files
+	image:	Build an image (see below for more information).
+
+Building images:
+	By default 'make image' will create an image with the default
+	target profile and package set. You can use the following parameters
+	to change that:
+
+	make image PROFILE="<profilename>" # override the default target profile
+	make image PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages
+	make image FILES="<path>" # include extra files from <path>
+	make image BIN_DIR="<path>" # alternative output directory for the images
+
+endef
+$(eval $(call shexport,Helptext))
+
+help: FORCE
+	echo "$$$(call shvar,Helptext)"
+
+
+# override variables from rules.mk
+PACKAGE_DIR:=$(TOPDIR)/packages
+OPKG:= \
+  IPKG_NO_SCRIPT=1 \
+  IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \
+  IPKG_INSTROOT="$(TARGET_DIR)" \
+  IPKG_CONF_DIR="$(TOPDIR)/tmp" \
+  IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \
+  $(STAGING_DIR_HOST)/bin/opkg \
+	-f $(TOPDIR)/repositories.conf \
+	--force-depends \
+	--force-overwrite \
+	--force-postinstall \
+	--cache $(TOPDIR)/dl \
+	--offline-root $(TARGET_DIR) \
+	--add-dest root:/ \
+	--add-arch all:100 \
+	--add-arch $(ARCH_PACKAGES):200
+
+define Profile
+  $(eval $(call Profile/Default))
+  $(eval $(call Profile/$(1)))
+  ifeq ($(USER_PROFILE),)
+    USER_PROFILE:=$(1)
+  endif
+  $(1)_NAME:=$(NAME)
+  $(1)_PACKAGES:=$(PACKAGES)
+  PROFILE_LIST += \
+  	echo '$(1):'; [ -z '$(NAME)' ] || echo '	$(NAME)'; echo '	Packages: $(PACKAGES)';
+endef
+
+include $(INCLUDE_DIR)/target.mk
+
+_call_info: FORCE
+	echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"'
+	echo 'Default Packages: $(DEFAULT_PACKAGES)'
+	echo 'Available Profiles:'
+	echo; $(PROFILE_LIST)
+
+BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
+# "-pkgname" in the package list means remove "pkgname" from the package list
+BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
+PACKAGES:=
+
+_call_image:
+	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
+	echo 'Packages: $(BUILD_PACKAGES)'
+	echo
+	rm -rf $(TARGET_DIR)
+	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR)
+	if [ ! -f "$(PACKAGE_DIR)/Packages" ] || [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ]; then \
+		echo "Package list missing or not up-to-date, generating it.";\
+		$(MAKE) package_index; \
+	else \
+		mkdir -p $(TARGET_DIR)/tmp; \
+		$(OPKG) update; \
+	fi
+	$(MAKE) package_install
+ifneq ($(USER_FILES),)
+	$(MAKE) copy_files
+endif
+	$(MAKE) package_postinst
+	$(MAKE) build_image
+
+package_index: FORCE
+	@echo
+	@echo Building package index...
+	@mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp
+	(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
+		gzip -9c Packages > Packages.gz \
+	) >/dev/null 2>/dev/null
+	$(OPKG) update
+
+package_install: FORCE
+	@echo
+	@echo Installing packages...
+	$(OPKG) install $(firstword $(wildcard $(PACKAGE_DIR)/libc_*.ipk $(PACKAGE_DIR)/base/libc_*.ipk))
+	$(OPKG) install $(firstword $(wildcard $(PACKAGE_DIR)/kernel_*.ipk $(PACKAGE_DIR)/base/kernel_*.ipk))
+	$(OPKG) install $(BUILD_PACKAGES)
+	rm -f $(TARGET_DIR)/usr/lib/opkg/lists/*
+
+copy_files: FORCE
+	@echo
+	@echo Copying extra files
+	@$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/)
+
+package_postinst: FORCE
+	@echo
+	@echo Cleaning up
+	@rm -f $(TARGET_DIR)/tmp/opkg.lock
+	@echo
+	@echo Activating init scripts
+	@mkdir -p $(TARGET_DIR)/etc/rc.d
+	@( \
+		cd $(TARGET_DIR); \
+		for script in ./usr/lib/opkg/info/*.postinst; do \
+			IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \
+		done || true \
+	)
+	rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst
+	$(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
+
+build_image: FORCE
+	@echo
+	@echo Building images...
+	$(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 \
+		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
+
+clean:
+	rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR)
+
+
+info:
+	(unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info)
+
+image:
+	(unset PROFILE FILES PACKAGES MAKEFLAGS; \
+	$(MAKE) _call_image \
+		$(if $(PROFILE),USER_PROFILE="$(PROFILE)") \
+		$(if $(FILES),USER_FILES="$(FILES)") \
+		$(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \
+		$(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)"))
+
+.SILENT: help info image
+
diff --git a/trunk/target/imagebuilder/files/repositories.conf b/trunk/target/imagebuilder/files/repositories.conf
new file mode 100644
index 00000000..91d2daf8
--- /dev/null
+++ b/trunk/target/imagebuilder/files/repositories.conf
@@ -0,0 +1,6 @@
+## Place your custom repositories here, they must match the architecture and version.
+# src/gz %n %U
+# src custom file:///usr/src/librecmc/bin/%T/packages
+
+## This is the local package repository, do not remove!
+src imagebuilder file:packages
diff --git a/trunk/target/linux/Makefile b/trunk/target/linux/Makefile
new file mode 100644
index 00000000..f7bbdffb
--- /dev/null
+++ b/trunk/target/linux/Makefile
@@ -0,0 +1,13 @@
+# 
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
+
+export TARGET_BUILD=1
+
+prereq clean download prepare compile install menuconfig nconfig oldconfig update refresh: FORCE
+	@+$(NO_TRACE_MAKE) -C $(BOARD) $@
diff --git a/trunk/target/linux/ar71xx/Makefile b/trunk/target/linux/ar71xx/Makefile
new file mode 100644
index 00000000..bb364141
--- /dev/null
+++ b/trunk/target/linux/ar71xx/Makefile
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2008-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+ARCH:=mips
+BOARD:=ar71xx
+BOARDNAME:=Atheros AR7xxx/AR9xxx
+FEATURES:=mips16
+CPU_TYPE=34kc
+SUBTARGETS:=generic luci nand mikrotik
+
+KERNEL_PATCHVER:=3.14
+
+include $(INCLUDE_DIR)/target.mk
+
+DEFAULT_PACKAGES += \
+	kmod-gpio-button-hotplug swconfig \
+	kmod-ath9k wpad-mini
+
+$(eval $(call BuildTarget))
diff --git a/trunk/target/linux/ar71xx/base-files.mk b/trunk/target/linux/ar71xx/base-files.mk
new file mode 100644
index 00000000..fdd2c714
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files.mk
@@ -0,0 +1,3 @@
+define Package/base-files/install-target
+	rm -f $(1)/etc/config/network
+endef
diff --git a/trunk/target/linux/ar71xx/base-files/etc/diag.sh b/trunk/target/linux/ar71xx/base-files/etc/diag.sh
new file mode 100755
index 00000000..c022013f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/diag.sh
@@ -0,0 +1,318 @@
+#!/bin/sh
+# Copyright (C) 2009-2013 OpenWrt.org
+
+. /lib/functions/leds.sh
+. /lib/ar71xx.sh
+
+get_status_led() {
+	case $(ar71xx_board_name) in
+	alfa-nx)
+		status_led="alfa:green:led_8"
+		;;
+	all0305)
+		status_led="eap7660d:green:ds4"
+		;;
+	ap132)
+		status_led="ap132:green:status"
+		;;
+	ap136-010|\
+	ap136-020)
+		status_led="ap136:green:status"
+		;;
+	ap135-020)
+		status_led="ap135:green:status"
+		;;
+	ap81)
+		status_led="ap81:green:status"
+		;;
+	ap83)
+		status_led="ap83:green:power"
+		;;
+	ap96)
+		status_led="ap96:green:led2"
+		;;
+	aw-nr580)
+		status_led="aw-nr580:green:ready"
+		;;
+	bullet-m | rocket-m | nano-m | nanostation-m | nanostation-m-xw | loco-m-xw)
+		status_led="ubnt:green:link4"
+		;;
+	bxu2000n-2-a1)
+		status_led="bhu:green:status"
+		;;
+	cap4200ag)
+		status_led="senao:green:pwr"
+		;;
+	cpe510)
+		status_led="tp-link:green:link4"
+		;;
+	db120)
+		status_led="db120:green:status"
+		;;
+	dgl-5500-a1 |\
+	dhp-1565-a1|\
+	dir-505-a1 |\
+	dir-600-a1 |\
+	dir-615-e1 |\
+	dir-615-e4)
+		status_led="d-link:green:power"
+		;;
+	dir-615-c1)
+		status_led="d-link:green:status"
+		;;
+	dir-825-b1)
+		status_led="d-link:orange:power"
+		;;
+	dir-825-c1 |\
+	dir-835-a1)
+		status_led="d-link:amber:power"
+		;;
+	dragino2)
+		status_led="dragino2:red:system"
+		;;
+	eap300v2)
+		status_led="engenius:blue:power"
+		;;
+	eap7660d)
+		status_led="eap7660d:green:ds4"
+		;;
+	el-mini | \
+	el-m150)
+		status_led="easylink:green:system"
+		;;
+	gl-inet)
+		status_led="gl-connect:green:lan"
+		;;
+	esr1750)
+		status_led="esr1750:amber:power"
+		;;
+	esr900)
+		status_led="engenius:amber:power"
+		;;
+	hiwifi-hc6361)
+		status_led="hiwifi:blue:system"
+		;;
+	hornet-ub)
+		status_led="alfa:blue:wps"
+		;;
+	ja76pf | \
+	ja76pf2)
+		status_led="jjplus:green:led1"
+		;;
+	ls-sr71)
+		status_led="ubnt:green:d22"
+		;;
+	mr600)
+		status_led="mr600:orange:power"
+		;;
+	mr600v2)
+		status_led="mr600:blue:power"
+		;;
+	mr900 | \
+	mr900v2)
+		status_led="mr900:blue:power"
+		;;
+	mynet-n600 | \
+	mynet-n750)
+		status_led="wd:blue:power"
+		;;
+	mynet-rext)
+		status_led="wd:blue:power"
+		;;
+	mzk-w04nu | \
+	mzk-w300nh)
+		status_led="planex:green:status"
+		;;
+	nbg460n_550n_550nh)
+		status_led="nbg460n:green:power"
+		;;
+	nbg6716)
+		status_led="nbg6716:white:power"
+		;;
+	om2p | \
+	om2pv2 | \
+	om2p-hs | \
+	om2p-hsv2 | \
+	om2p-lc)
+		status_led="om2p:blue:power"
+		;;
+	om5p)
+		status_led="om5p:blue:power"
+		;;
+	pb44)
+		status_led="pb44:amber:jump1"
+		;;
+	rb-2011l|\
+	rb-2011uas|\
+	rb-2011uas-2hnd)
+		status_led="rb:green:usr"
+		;;
+	rb-411 | rb-411u | rb-433 | rb-433u | rb-450 | rb-450g | rb-493)
+		status_led="rb4xx:yellow:user"
+		;;
+	rb-750)
+		status_led="rb750:green:act"
+		;;
+	rb-911g-2hpnd|\
+	rb-911g-5hpnd|\
+	rb-912uag-2hpnd|\
+	rb-912uag-5hpnd)
+		status_led="rb:green:user"
+		;;
+	rb-951ui-2hnd)
+		status_led="rb:green:act"
+		;;
+	rb-sxt2n|\
+	rb-sxt5n)
+		status_led="rb:green:power"
+		;;
+	routerstation | routerstation-pro)
+		status_led="ubnt:green:rf"
+		;;
+	rw2458n)
+		status_led="rw2458n:green:d3"
+		;;
+	smart-300)
+		status_led="nc-link:green:system"
+		;;
+	oolite)
+		status_led="oolite:red:system"
+		;;
+	qihoo-c301)
+		status_led="qihoo:green:status"
+		;;
+	tew-632brp)
+		status_led="tew-632brp:green:status"
+		;;
+	tew-673gru)
+		status_led="trendnet:blue:wps"
+		;;
+	tew-712br|\
+	tew-732br)
+		status_led="trendnet:green:power"
+		;;
+	tl-mr3020)
+		status_led="tp-link:green:wps"
+		;;
+	tl-wa750re)
+		status_led="tp-link:orange:re"
+		;;
+	tl-wa850re)
+		status_led="tp-link:blue:re"
+		;;
+	tl-wa860re)
+		status_led="tp-link:green:power"
+		;;
+	tl-mr3220 | \
+	tl-mr3220-v2 | \
+	tl-mr3420 | \
+	tl-mr3420-v2 | \
+	tl-wa801nd-v2 | \
+	tl-wa901nd | \
+	tl-wa901nd-v2 | \
+	tl-wa901nd-v3 | \
+	tl-wdr3500 | \
+	tl-wr1041n-v2 | \
+	tl-wr1043nd | \
+	tl-wr1043nd-v2 | \
+	tl-wr741nd | \
+	tl-wr741nd-v4 | \
+	tl-wr841n-v1 | \
+	tl-wr841n-v7 | \
+	tl-wr841n-v8 | \
+	tl-wa830re-v2 | \
+	tl-wr842n-v2 | \
+	tl-wr941nd)
+		status_led="tp-link:green:system"
+		;;
+	archer-c5 | \
+	archer-c7 | \
+	tl-wdr4900-v2 | \
+	tl-mr10u | \
+	tl-mr13u | \
+	tl-wdr4300 | \
+	tl-wr703n | \
+	tl-wr710n | \
+	tl-wr720n-v3)
+		status_led="tp-link:blue:system"
+		;;
+	tl-wr841n-v9)
+		status_led="tp-link:green:qss"
+		;;
+	tl-wr2543n)
+		status_led="tp-link:green:wps"
+		;;
+	tube2h)
+		status_led="alfa:green:signal4"
+		;;
+	unifi)
+		status_led="ubnt:green:dome"
+		;;
+	uap-pro)
+		status_led="ubnt:white:dome"
+		;;
+	airgateway)
+		status_led="ubnt:white:status"
+		;;
+	whr-g301n | \
+	whr-hp-g300n | \
+	whr-hp-gn | \
+	wzr-hp-g300nh)
+		status_led="buffalo:green:router"
+		;;
+	wlae-ag300n)
+		status_led="buffalo:green:status"
+		;;
+	wzr-hp-ag300h | \
+	wzr-hp-g300nh2)
+		status_led="buffalo:red:diag"
+		;;
+	r6100 | \
+	wndap360 | \
+	wndr3700 | \
+	wndr3700v4 | \
+	wndr4300 | \
+	wnr2000 | \
+	wnr2200 |\
+	wnr612-v2)
+		status_led="netgear:green:power"
+		;;
+	wp543)
+		status_led="wp543:green:diag"
+		;;
+	wrt400n)
+		status_led="wrt400n:blue:wps"
+		;;
+	wrt160nl)
+		status_led="wrt160nl:blue:wps"
+		;;
+	zcn-1523h-2 | zcn-1523h-5)
+		status_led="zcn-1523h:amber:init"
+		;;
+	wlr8100)
+		status_led="sitecom:amber:status"
+		;;
+	esac
+}
+
+set_state() {
+	get_status_led
+
+	case "$1" in
+	preinit)
+		status_led_blink_preinit
+		;;
+	failsafe)
+		status_led_blink_failsafe
+		;;
+	done)
+		status_led_on
+		case $(ar71xx_board_name) in
+		qihoo-c301)
+			local n=$(fw_printenv activeregion | cut -d = -f 2)
+			fw_setenv "image${n}trynum" 0
+			;;
+		esac
+		;;
+	esac
+}
diff --git a/trunk/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/trunk/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
new file mode 100644
index 00000000..b5f05888
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+ath9k_eeprom_die() {
+	echo "ath9k eeprom: " "$*"
+	exit 1
+}
+
+ath9k_eeprom_extract() {
+	local part=$1
+	local offset=$2
+	local count=$3
+	local mtd
+
+	mtd=$(find_mtd_chardev $part)
+	[ -n "$mtd" ] || \
+		ath9k_eeprom_die "no mtd device found for partition $part"
+
+	dd if=$mtd of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count 2>/dev/null || \
+		ath9k_eeprom_die "failed to extract from $mtd"
+}
+
+ath9k_patch_firmware_mac() {
+	local mac=$1
+
+	[ -z "$mac" ] && return
+
+	macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
+}
+
+[ -e /lib/firmware/$FIRMWARE ] && exit 0
+
+. /lib/ar71xx.sh
+. /lib/functions.sh
+. /lib/functions/system.sh
+
+board=$(ar71xx_board_name)
+
+case "$FIRMWARE" in
+"soc_wmac.eeprom")
+	case $board in
+	r6100 | \
+	wndr3700v4 | \
+	wndr4300)
+		ath9k_eeprom_extract "caldata" 4096 2048
+		ath9k_patch_firmware_mac $(mtd_get_mac_binary caldata 0)
+		;;
+	*)
+		ath9k_eeprom_die "board $board is not supported yet"
+		;;
+	esac
+	;;
+
+"pci_wmac0.eeprom")
+	case $board in
+	wndr3700v4 | \
+	wndr4300)
+		ath9k_eeprom_extract "caldata" 20480 2048
+		ath9k_patch_firmware_mac $(mtd_get_mac_binary caldata 12)
+		;;
+	*)
+		ath9k_eeprom_die "board $board is not supported yet"
+		;;
+	esac
+	;;
+esac
diff --git a/trunk/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix b/trunk/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
new file mode 100644
index 00000000..10241500
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# For AR9220 and AR9223, GPIO JTAG must explicit be disabled
+# before LEDs start working. Do this when wifi device is
+# detected.
+
+#
+# $DEVPATH is not valid for some boards (including WZR-HP-AG300H).
+# Manipulate the $DEVPATH to reach the corresponding phyN.
+#
+
+devdir=`dirname $DEVPATH`
+devdir=`dirname $devdir`
+phydir=/sys$devdir/ieee80211
+phyname=`cat $phydir/phy*/name`
+
+if [ -z $phyname -o $ACTION != "add" ]; then exit 0; fi
+
+#
+# ar922x_disable_gpio_jtag():
+#
+# Emulate
+#       REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
+# for AR9220 and AR9223.
+#
+
+ar922x_disable_gpio_jtag()                 
+{                                          
+        local regidx=0x4054               
+        
+	[ -f /sys/kernel/debug/ieee80211/$1/ath9k/regidx ] && {
+		echo $regidx > /sys/kernel/debug/ieee80211/$1/ath9k/regidx
+        	regval=`cat /sys/kernel/debug/ieee80211/$1/ath9k/regval`
+        	regval=$((regval | 0x20000))
+        	echo regval $regval
+    		echo $regval > /sys/kernel/debug/ieee80211/$1/ath9k/regval
+        }
+}
+
+if [ $phyname -a $ACTION = "add" ]; then
+
+	. /lib/ar71xx.sh
+	
+	case $(ar71xx_board_name) in
+		wzr-hp-ag300h)
+			ar922x_disable_gpio_jtag $phyname
+			;;
+	esac;
+fi
+
+exit 0
diff --git a/trunk/target/linux/ar71xx/base-files/etc/inittab b/trunk/target/linux/ar71xx/base-files/etc/inittab
new file mode 100644
index 00000000..78171859
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/inittab
@@ -0,0 +1,3 @@
+::sysinit:/etc/init.d/rcS S boot
+::shutdown:/etc/init.d/rcS K shutdown
+::askconsole:/bin/ash --login
diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
new file mode 100755
index 00000000..9517b97e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -0,0 +1,496 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults.sh
+. /lib/ar71xx.sh
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+airgateway)
+	ucidef_set_led_wlan "wlan" "WLAN" "ubnt:blue:wlan" "phy0tpt"
+	;;
+alfa-nx)
+	ucidef_set_led_netdev "wan" "WAN" "alfa:green:led_2" "eth0"
+	ucidef_set_led_netdev "lan" "LAN" "alfa:green:led_3" "eth1"
+	;;
+
+all0258n)
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "all0258n:red:rssilow" "wlan0" "1" "40" "0" "6"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0258n:yellow:rssimedium" "wlan0" "30" "80" "-29" "5"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0258n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
+	;;
+
+all0315n)
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "all0315n:red:rssilow" "wlan0" "1" "40" "0" "6"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0315n:yellow:rssimedium" "wlan0" "30" "80" "-29" "5"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0315n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
+	;;
+
+ap113)
+	ucidef_set_led_usbdev "usb" "USB" "ap113:green:usb" "1-1"
+	;;
+
+bullet-m | \
+nanostation-m | \
+rocket-m | \
+nanostation-m-xw | \
+loco-m-xw)
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:red:link1" "wlan0" "1" "100" "0" "13"
+	ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:orange:link2" "wlan0" "26" "100" "-25" "13"
+	ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "ubnt:green:link3" "wlan0" "51" "100" "-50" "13"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "ubnt:green:link4" "wlan0" "76" "100" "-75" "13"
+	;;
+
+bxu2000n-2-a1)
+	ucidef_set_led_wlan "wlan" "WLAN" "bhu:green:wlan" "phy0tpt"
+	;;
+
+cap4200ag)
+	ucidef_set_led_default "lan_green" "LAN_GREEN" "senao:green:lan" "1"
+	ucidef_set_led_wlan "wlan_amber" "WLAN_AMBER" "senao:amber:wlan" "phy0tpt"
+	ucidef_set_led_wlan "wlan_green" "WLAN_GREEN" "senao:green:wlan" "phy1tpt"
+	;;
+
+carambola2)
+	ucidef_set_led_netdev "lan" "LAN" "carambola2:orange:eth0" "eth0"
+	ucidef_set_led_netdev "wan" "WAN" "carambola2:orange:eth1" "eth1"
+	ucidef_set_led_wlan "wlan" "WLAN" "carambola2:green:wlan" "phy0tpt"
+	;;
+
+cpe510)
+	ucidef_set_led_switch "lan0" "LAN0" "tp-link:green:lan0" "switch0" "0x20"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:green:link1" "wlan0" "1" "100" "0" "13"
+	ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:green:link2" "wlan0" "26" "100" "-25" "13"
+	ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:link3" "wlan0" "51" "100" "-50" "13"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:link4" "wlan0" "76" "100" "-75" "13"
+	;;
+
+db120)
+	ucidef_set_led_usbdev "usb" "USB" "db120:green:usb" "1-1"
+	;;
+
+dragino2)
+	ucidef_set_led_wlan "wlan" "WLAN" "dragino2:red:wlan" "phy0tpt"
+	ucidef_set_led_netdev "lan" "LAN" "dragino2:red:lan" "eth0"
+	ucidef_set_led_netdev "wan" "WAN" "dragino2:red:wan" "eth1"
+	;;
+
+eap300v2)
+	ucidef_set_led_netdev "lan" "LAN" "engenius:blue:lan" "eth0"
+	ucidef_set_led_wlan "wlan" "WLAN" "engenius:blue:wlan" "phy0tpt"
+	;;
+
+rb-750)
+	ucidef_set_led_default "act" "act" "rb750:green:act" "1"
+	ucidef_set_led_netdev "port1" "port1" "rb750:green:port1" "eth1"
+	ucidef_set_led_switch "port2" "port2" "rb750:green:port2" "switch0" "0x10"
+	ucidef_set_led_switch "port3" "port3" "rb750:green:port3" "switch0" "0x08"
+	ucidef_set_led_switch "port4" "port4" "rb750:green:port4" "switch0" "0x04"
+	ucidef_set_led_switch "port5" "port5" "rb750:green:port5" "switch0" "0x02"
+	;;
+
+rb-2011l|\
+rb-2011uas|\
+rb-2011uias|\
+rb-2011uas-2hnd|\
+rb-2011uias-2hnd)
+	ucidef_set_led_switch "eth6" "ETH6" "rb:green:eth6" "switch1" "0x20"
+	ucidef_set_led_switch "eth7" "ETH7" "rb:green:eth7" "switch1" "0x10"
+	ucidef_set_led_switch "eth8" "ETH8" "rb:green:eth8" "switch1" "0x08"
+	ucidef_set_led_switch "eth9" "ETH9" "rb:green:eth9" "switch1" "0x04"
+	ucidef_set_led_switch "eth10" "ETH10" "rb:green:eth10" "switch1" "0x02"
+	;;
+
+dhp-1565-a1)
+	ucidef_set_led_switch "wan" "WAN" "d-link:green:planet" "switch0" "0x20"
+	;;
+
+dir-505-a1)
+	ucidef_set_led_netdev "lan" "LAN" "d-link:green:power" "eth1"
+	;;
+
+dir-600-a1|\
+dir-615-e1|\
+dir-615-e4)
+	ucidef_set_led_netdev "wan" "WAN" "d-link:green:wan" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "d-link:green:lan1" "switch0" "0x02"
+	ucidef_set_led_switch "lan2" "LAN2" "d-link:green:lan2" "switch0" "0x04"
+	ucidef_set_led_switch "lan3" "LAN3" "d-link:green:lan3" "switch0" "0x08"
+	ucidef_set_led_switch "lan4" "LAN4" "d-link:green:lan4" "switch0" "0x10"
+	;;
+
+dir-825-b1)
+	ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1"
+	;;
+
+dir-825-c1)
+	ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1"
+	ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "d-link:blue:wlan2g" "phy0tpt"
+	;;
+
+gl-inet)
+	ucidef_set_led_netdev "lan" "LAN" "gl-connect:green:lan" "eth1"
+	ucidef_set_led_wlan "wlan" "WLAN" "gl-connect:red:wlan" "phy0tpt"
+	;;
+
+esr900)
+	ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "engenius:blue:wlan-2g" "phy0tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN 5 GHz" "engenius:blue:wlan-5g" "phy1tpt"
+	;;
+
+esr1750)
+	ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "esr1750:blue:wlan-2g" "phy0tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN 5 GHz" "esr1750:blue:wlan-5g" "phy1tpt"
+	;;
+
+hiwifi-hc6361)
+	ucidef_set_led_netdev "inet" "INET" "hiwifi:blue:internet" "eth1"
+	ucidef_set_led_wlan "wlan" "WLAN" "hiwifi:blue:wlan-2p4" "phy0tpt"
+	;;
+
+hornet-ub)
+	ucidef_set_led_netdev "lan" "LAN" "alfa:blue:lan" "eth0"
+	ucidef_set_led_netdev "wan" "WAN" "alfa:blue:wan" "eth1"
+	ucidef_set_led_wlan "wlan" "WLAN" "alfa:blue:wlan" "phy0tpt"
+	ucidef_set_led_usbdev "usb" "USB" "alfa:blue:usb" "1-1"
+	;;
+
+mr600)
+	ucidef_set_led_wlan "wlan58" "WLAN58" "mr600:green:wlan58" "phy0tpt"
+	;;
+
+mr900 | \
+mr900v2)
+	ucidef_set_led_netdev "lan" "LAN" "mr900:blue:wan" "eth0"
+	ucidef_set_led_wlan "wlan24" "WLAN24" "mr900:blue:wlan24" "phy0tpt"
+	ucidef_set_led_wlan "wlan58" "WLAN58" "mr900:blue:wlan58" "phy1tpt"
+	;;
+
+mynet-n600)
+	ucidef_set_led_netdev "wan" "WAN" "wd:blue:internet" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "wd:green:lan1" "switch0" "0x02"
+	ucidef_set_led_switch "lan2" "LAN2" "wd:green:lan2" "switch0" "0x10"
+	ucidef_set_led_switch "lan3" "LAN3" "wd:green:lan3" "switch0" "0x08"
+	ucidef_set_led_switch "lan4" "LAN4" "wd:green:lan4" "switch0" "0x04"
+	;;
+
+mynet-rext)
+	ucidef_set_led_netdev "lan" "LAN" "wd:blue:ethernet" "eth0"
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "wd:blue:quality1" "wlan0" "1" "40" "0" "6"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "wd:blue:quality2" "wlan0" "30" "80" "-29" "5"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "wd:blue:quality3" "wlan0" "70" "100" "-69" "8"
+	ucidef_set_led_wlan "wlan" "WLAN" "wd:blue:wireless" "phy0tpt"
+	;;
+
+mzk-w04u)
+	ucidef_set_led_usbdev "usb" "USB" "planex:green:usb" "1-1"
+	;;
+
+mzk-w300nh)
+	ucidef_set_led_wlan "wlan" "WLAN" "planex:green:wlan" "phy0tpt"
+	;;
+
+nbg460n_550n_550nh)
+	ucidef_set_led_wlan "wlan" "WLAN" "nbg460n:green:wlan" "phy0tpt"
+	;;
+
+nbg6716)
+	ucidef_set_led_netdev "wan" "WAN" "zyxel:white:internet" "eth1"
+	ucidef_set_led_wlan "wlan" "WLAN" "zyxel:white:wifi2g" "phy1tpt"
+	ucidef_set_led_wlan "wlan5" "WLAN5" "zyxel:white:wifi5g" "phy0tpt"
+	ucidef_set_led_usbdev "usb1" "USB1" "zyxel:white:usb0" "1-1"
+	ucidef_set_led_usbdev "usb2" "USB2" "zyxel:white:usb1" "2-1"
+	;;
+
+om2p | \
+om2pv2 | \
+om2p-hs | \
+om2p-hsv2 | \
+om2p-lc)
+	ucidef_set_led_netdev "port1" "port1" "om2p:blue:wan" "eth0"
+	ucidef_set_led_netdev "port2" "port2" "om2p:blue:lan" "eth1"
+	;;
+
+om5p)
+	ucidef_set_led_netdev "port1" "port1" "om5p:blue:wan" "eth0"
+	ucidef_set_led_netdev "port2" "port2" "om5p:blue:lan" "eth1"
+	;;
+
+qihoo-c301)
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "qihoo:red:status" "phy1tpt"
+	;;
+
+smart-300)
+	ucidef_set_led_netdev "wan" "WAN" "nc-link:green:wan" "eth0"
+	ucidef_set_led_switch "lan1" "LAN1" "nc-link:green:lan1" "switch0" "0x04"
+	ucidef_set_led_switch "lan2" "LAN2" "nc-link:green:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "nc-link:green:lan3" "switch0" "0x10"
+	ucidef_set_led_switch "lan4" "LAN4" "nc-link:green:lan4" "switch0" "0x02"
+	ucidef_set_led_wlan "wlan" "WLAN" "nc-link:green:wlan" "phy0tpt"
+	;;
+
+tew-712br)
+	ucidef_set_led_netdev "wan" "WAN" "trendnet:green:wan" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "trendnet:green:lan1" "switch0" "0x02"
+	ucidef_set_led_switch "lan2" "LAN2" "trendnet:green:lan2" "switch0" "0x04"
+	ucidef_set_led_switch "lan3" "LAN3" "trendnet:green:lan3" "switch0" "0x08"
+	ucidef_set_led_switch "lan4" "LAN4" "trendnet:green:lan4" "switch0" "0x10"
+	ucidef_set_led_wlan "wlan" "WLAN" "trendnet:green:wlan" "phy0tpt"
+	;;
+
+tew-732br)
+	ucidef_set_led_netdev "wan" "WAN" "trendnet:green:wan" "eth1"
+	;;
+
+tl-mr11u | \
+tl-mr3020 | \
+tl-mr3040 | \
+tl-mr3040-v2)
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan"  "eth0"
+	;;
+
+tl-mr3220 | \
+tl-mr3420 )
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
+	;;
+
+tl-mr3220-v2)
+	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
+	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
+	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
+	;;
+
+tl-mr3420-v2)
+	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
+	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
+	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
+	;;
+
+tl-wa750re)
+	ucidef_set_led_netdev "lan" "LAN" "tp-link:orange:lan" "eth0"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:orange:wlan" "phy0tpt"
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:orange:signal1" "wlan0" "1" "100" "0" "13"
+	ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:orange:signal2" "wlan0" "20" "100" "-19" "13"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "tp-link:orange:signal3" "wlan0" "40" "100" "-39" "13"
+	ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:orange:signal4" "wlan0" "60" "100" "-59" "13"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:orange:signal5" "wlan0" "80" "100" "-79" "13"
+	;;
+
+tl-wa850re)
+	ucidef_set_led_netdev "lan" "LAN" "tp-link:blue:lan" "eth0"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:blue:wlan" "phy0tpt"
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:blue:signal1" "wlan0" "1" "100" "0" "13"
+	ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:blue:signal2" "wlan0" "20" "100" "-19" "13"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "tp-link:blue:signal3" "wlan0" "40" "100" "-39" "13"
+	ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:blue:signal4" "wlan0" "60" "100" "-59" "13"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:blue:signal5" "wlan0" "80" "100" "-79" "13"
+	;;
+
+tl-wa860re)
+	ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wa901nd)
+	ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+	;;
+
+tl-wa901nd-v2)
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wdr3500)
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:green:wlan2g" "phy0tpt"
+	;;
+
+tl-wdr4300)
+	ucidef_set_led_usbdev "usb1" "USB1" "tp-link:green:usb1" "1-1.1"
+	ucidef_set_led_usbdev "usb2" "USB2" "tp-link:green:usb2" "1-1.2"
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy0tpt"
+	;;
+
+archer-c5|\
+archer-c7|\
+tl-wdr4900-v2)
+	ucidef_set_led_usbdev "usb1" "USB1" "tp-link:green:usb1" "1-1"
+	ucidef_set_led_usbdev "usb2" "USB2" "tp-link:green:usb2" "2-1"
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy0tpt"
+	;;
+
+tl-wr741nd)
+	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x02"
+	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x04"
+	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x08"
+	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x10"
+	;;
+
+tl-wr741nd-v4)
+	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
+	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
+	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wr841n-v8)
+	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
+	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
+	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wa830re-v2)
+	ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wr841n-v9)
+	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
+	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
+	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wr842n-v2)
+	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0"
+	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
+	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
+	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
+	;;
+
+tl-wa801nd-v2 | \
+tl-wa901nd-v3)
+	ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wr941nd | \
+tl-wr1041n-v2)
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wr1043nd | \
+tl-wr1043nd-v2)
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
+	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+	;;
+
+tl-wr2543n)
+	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
+	;;
+
+tube2h)
+	ucidef_set_led_netdev "lan" "LAN" "alfa:blue:lan" "eth0"
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "signal1" "SIGNAL1" "alfa:red:signal1" "wlan0" "1" "100" "0" "13"
+	ucidef_set_led_rssi "signal2" "SIGNAL2" "alfa:orange:signal2" "wlan0" "26" "100" "-25" "13"
+	ucidef_set_led_rssi "signal3" "SIGNAL3" "alfa:green:signal3" "wlan0" "51" "100" "-50" "13"
+	ucidef_set_led_rssi "signal4" "SIGNAL4" "alfa:green:signal4" "wlan0" "76" "100" "-75" "13"
+	;;
+
+wrt160nl)
+	ucidef_set_led_wlan "wlan" "WLAN" "wrt160nl:blue:wlan" "phy0tpt"
+	;;
+
+wndap360)
+        ucidef_set_led_power "power" "POWER GREEN" "netgear:green:power" "1"
+        ;;
+
+wndr3700)
+	ucidef_set_led_default "wan" "WAN LED (green)" "netgear:green:wan" "0"
+	ucidef_set_led_usbdev "usb" "USB" "netgear:green:usb" "1-1"
+	;;
+
+r6100)
+	ucidef_set_led_netdev "wan" "WAN (green)" "netgear:green:wan" "eth0"
+	ucidef_set_led_usbdev "usb" "USB" "netgear:blue:usb" "1-1"
+	ucidef_set_led_wlan "wlan" "WLAN" "netgear:blue:wlan" "phy1tpt"
+	;;
+
+wndr3700v4 | \
+wndr4300)
+	ucidef_set_led_netdev "wan" "WAN (green)" "netgear:green:wan" "eth0.2"
+	ucidef_set_led_usbdev "usb" "USB" "netgear:green:usb" "1-1"
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "netgear:green:wlan2g" "phy0tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "netgear:blue:wlan5g" "phy1tpt"
+	;;
+
+whr-g301n |\
+whr-hp-g300n |\
+whr-hp-gn)
+	ucidef_set_led_netdev "wan" "WAN" "buffalo:green:wan" "eth1"
+	ucidef_set_led_switch "lan1" "LAN1" "buffalo:green:lan1" "switch0" "0x02"
+	ucidef_set_led_switch "lan2" "LAN2" "buffalo:green:lan2" "switch0" "0x04"
+	ucidef_set_led_switch "lan3" "LAN3" "buffalo:green:lan3" "switch0" "0x08"
+	ucidef_set_led_switch "lan4" "LAN4" "buffalo:green:lan4" "switch0" "0x10"
+	;;
+
+wlae-ag300n)
+	ucidef_set_led_netdev "wireless" "WIRELESS" "buffalo:green:wireless" "wlan0"
+	;;
+
+wnr2000-v4)
+	ucidef_set_led_netdev "wan" "WAN" "wnr2000-v4:green:wan" "eth1"
+	ucidef_set_led_netdev "wlan" "WLAN" "wnr2000-v4:blue:wlan" "wlan0"
+	ucidef_set_led_switch "lan1" "LAN1" "wnr2000-v4:amber:lan1" "switch0" "0x04"
+	ucidef_set_led_switch "lan2" "LAN2" "wnr2000-v4:amber:lan2" "switch0" "0x08"
+	ucidef_set_led_switch "lan3" "LAN3" "wnr2000-v4:amber:lan3" "switch0" "0x10"
+	ucidef_set_led_switch "lan4" "LAN4" "wnr2000-v4:amber:lan4" "switch0" "0x02"
+	ucidef_set_led_usbdev "usb" "USB" "wnr2000-v4:amber:status" "1-1"
+    ;;
+
+wzr-hp-ag300h)
+	ucidef_set_led_default "diag" "DIAG" "buffalo:red:diag" "0"
+	ucidef_set_led_netdev "router" "ROUTER" "buffalo:green:router" "eth1"
+	ucidef_set_led_usbdev "usb" "USB" "buffalo:green:usb" "1-1"
+	;;
+
+wzr-hp-g300nh)
+	ucidef_set_led_wlan "wlan" "Wireless" "buffalo:green:wireless" "phy0tpt"
+	ucidef_set_led_netdev "router" "Router" "buffalo:green:router" "eth1"
+	ucidef_set_led_usbdev "usb" "USB" "buffalo:blue:usb" "1-1"
+	;;
+
+zcn-1523h-2)
+	ucidef_set_led_netdev "lan1" "lan1" "zcn-1523h:green:lan1" "eth0"
+	;;
+
+zcn-1523h-5)
+	ucidef_set_led_netdev "lan1" "lan1" "zcn-1523h:green:lan1" "eth0"
+	ucidef_set_led_netdev "lan2" "lan2" "zcn-1523h:green:lan2" "eth1"
+	;;
+esac
+
+ucidef_commit_leds
+
+exit 0
diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
new file mode 100755
index 00000000..e205fd51
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -0,0 +1,454 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
+
+. /lib/functions/uci-defaults.sh
+. /lib/ar71xx.sh
+
+ucidef_set_interface_loopback
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+all0315n |\
+all0258n |\
+ja76pf2|\
+ubnt-unifi-outdoor)
+	ucidef_set_interface_lan "eth0 eth1"
+	;;
+
+ap132 |\
+wlr8100)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	;;
+
+esr1750)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	;;
+
+ap136-010)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "5 6"
+	;;
+
+ap136-020 |\
+ap135-020 |\
+tl-wr1043nd-v2 |\
+wzr-450hp2)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "5 6"
+	;;
+
+archer-c5 |\
+archer-c7 |\
+tl-wdr4900-v2)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "1 6"
+	;;
+
+cpe510)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 4"
+	;;
+
+db120 |\
+rb-2011l | \
+rb-2011uas |\
+rb-2011uias |\
+rb-2011uas-2hnd|\
+rb-2011uias-2hnd)
+	ucidef_set_interfaces_lan_wan "eth0.1 eth1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	ucidef_add_switch "switch1" "1" "1"
+	ucidef_add_switch_vlan "switch1" "1" "0 1 2 3 4 5"
+
+	case "$board" in
+	rb-2011uas* | rb-2011uias | rb-2011uias-2hnd)
+		ucidef_set_interface_raw "sfp" "eth0.3"
+		ucidef_add_switch_vlan "switch0" "3" "0t 6"
+		;;
+	esac
+	;;
+
+dir-825-b1|\
+tew-673gru)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+	;;
+
+nbg460n_550n_550nh)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "0" "0 1 2 3 5"
+	;;
+
+nbg6716)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "5 6"
+	;;
+
+rb-433 |\
+rb-433u)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "1 2 5"
+	;;
+
+rb-435g)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2"
+	;;
+
+rb-450)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
+	;;
+
+rb-450g |\
+routerstation-pro)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
+	;;
+
+ap136 |\
+rb-750gl |\
+rb-751g |\
+rb-951g-2hnd |\
+wzr-hp-g450h)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	;;
+
+rb-951ui-2hnd)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	;;
+
+rb-493g)
+	ucidef_set_interfaces_lan_wan "eth0 eth1.1" "eth1.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
+	ucidef_add_switch "switch1" "1" "1"
+	ucidef_add_switch_vlan "switch1" "1" "0t 1 2 3 4"
+	ucidef_add_switch_vlan "switch1" "2" "0t 5"
+	;;
+
+wzr-hp-g300nh2 |\
+pb92 |\
+ap113)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 2"
+	;;
+
+el-m150)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 3"
+	;;
+
+el-mini)
+	ucidef_set_interface_lan "eth0"
+	;;
+
+tl-wdr4300|\
+tl-wr1041n-v2)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	;;
+
+tl-wr1043nd)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
+	ucidef_add_switch_vlan "switch0" "2" "0 5t"
+	;;
+
+tl-wr2543n)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 9t"
+	ucidef_add_switch_vlan "switch0" "2" "0 9t"
+	;;
+
+tl-wr841n-v1|\
+tl-wr941nd)
+	ucidef_set_interface_raw "eth" "eth0"
+	ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
+	;;
+
+r6100 |\
+smart-300 |\
+tl-mr3420-v2 |\
+tl-wr841n-v8 |\
+tl-wr842n-v2 |\
+wnr2000-v3 |\
+wnr2000-v4 |\
+wnr2200 |\
+wnr612-v2)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
+	;;
+
+uap-pro)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1"
+	ucidef_add_switch_vlan "switch0" "2" "0t 2"
+	;;
+
+nanostation-m-xw)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	;;
+
+wrt160nl)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 5"
+	;;
+
+wzr-hp-g300nh)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+	;;
+
+dgl-5500-a1 |\
+dir-825-c1)
+	local mac
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "0t 5"
+	mac=$(mtd_get_mac_ascii nvram "wan_mac")
+	[ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
+	;;
+
+mynet-n750)
+	local mac
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "0t 5"
+	mac=$(mtd_get_mac_ascii devdata "wanmac")
+	[ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
+	;;
+
+dhp-1565-a1 |\
+dir-835-a1 |\
+wndr3700v4 | \
+wndr4300)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "0t 5"
+	mac_lan=$(mtd_get_mac_binary caldata 0)
+	[ -n "$mac_lan" ] && ucidef_set_interface_macaddr "lan" "$mac_lan"
+	mac_wan=$(mtd_get_mac_binary caldata 6)
+	[ -n "$mac_wan" ] && ucidef_set_interface_macaddr "wan" "$mac_wan"
+	;;
+
+esr900)
+	local mac
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "0t 5"
+	mac=$(mtd_get_mac_ascii u-boot-env "wanaddr")
+	[ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
+	;;
+
+all0305 |\
+aw-nr580 |\
+bullet-m |\
+cap4200ag |\
+eap300v2 |\
+eap7660d |\
+loco-m-xw |\
+mr600 |\
+mr600v2 |\
+mr900 |\
+mr900v2 |\
+rb-411 |\
+rb-911g-2hpnd |\
+rb-911g-5hpnd |\
+rb-912uag-2hpnd |\
+rb-912uag-5hpnd |\
+rb-sxt2n |\
+rb-sxt5n |\
+tl-mr10u |\
+tl-mr11u |\
+tl-mr13u |\
+tl-mr3020 |\
+tl-mr3040 |\
+tl-mr3040-v2 |\
+tl-wa750re |\
+tl-wa850re |\
+tl-wa830re-v2 |\
+tl-wa801nd-v2 |\
+tl-wa901nd |\
+tl-wa901nd-v2 |\
+tl-wa901nd-v3 |\
+tl-wr703n |\
+tube2h |\
+wndap360 |\
+mynet-rext |\
+wp543)
+	ucidef_set_interface_lan "eth0"
+	;;
+
+dir-505-a1)
+	ucidef_set_interface_lan "eth1"
+	;;
+
+alfa-ap96 |\
+alfa-nx |\
+ap83 |\
+gl-inet |\
+jwap003 |\
+pb42 |\
+pb44 |\
+routerstation|\
+tl-wr710n |\
+tl-wr720n-v3|\
+wpe72)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	;;
+
+ap121 |\
+ap121-mini |\
+ap96 |\
+airrouter |\
+dir-600-a1 |\
+dir-615-c1 |\
+dir-615-e1 |\
+dir-615-e4 |\
+hiwifi-hc6361 |\
+ja76pf |\
+mynet-n600 |\
+oolite |\
+qihoo-c301 |\
+rb-750 |\
+rb-751 |\
+tew-632brp |\
+tew-712br |\
+tl-mr3220 |\
+tl-mr3220-v2 |\
+tl-mr3420 |\
+tl-wdr3500 |\
+tl-wr741nd |\
+tl-wr741nd-v4 |\
+tl-wr841n-v7 |\
+tl-wr841n-v9 |\
+whr-g301n |\
+whr-hp-g300n |\
+whr-hp-gn |\
+wzr-hp-ag300h)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
+	;;
+
+wzr-hp-g450h)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	;;
+
+ew-dorin)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 1 2"
+	ucidef_add_switch_vlan "switch0" "2" "0t 3"
+	;;
+
+ew-dorin-router)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 2 3"
+	;;
+
+wndr3700)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+	# Blinkrate: 0=43ms; 1=84ms; 2=120ms; 3=170ms; 4=340ms; 5=670ms
+	uci set network.@switch[-1].blinkrate='2'
+
+	ucidef_add_switch_port "switch0" "1"
+	# Port 1 controls the GREEN configuration of LEDs for
+	# the switch and the section does not correspond to a real
+	# switch port.
+	#
+	# 0=LED off; 1=Collision/FDX; 2=Link/activity; 3=1000 Mb/s;
+	# 4=100 Mb/s; 5=10 Mb/s; 6=1000 Mb/s+activity; 7=100 Mb/s+activity;
+	# 8=10 Mb/s+activity; 9=10/100 Mb/s+activity; 10: Fiber;
+	# 11: Fault; 12: Link/activity(tx); 13: Link/activity(rx);
+	# 14: Link (master); 15: separate register
+	uci set network.@switch_port[-1].led='6'
+
+	ucidef_add_switch_port "switch0" "2"
+	# Port 2 controls the ORANGE configuration of LEDs for
+	# the switch and the section does not correspond to a real
+	# switch port.
+	#
+	# See the key above for switch port 1 for the meaning of the
+	# 'led' setting below.
+	uci set network.@switch_port[-1].led='9'
+
+	ucidef_add_switch_port "switch0" "5"
+	# Port 5 controls the configuration of the WAN LED and the
+	# section does not correspond to a real switch port.
+	#
+	# To toggle the use of green or orange LEDs for the WAN port,
+	# see the LED setting for wndr3700:green:wan in /etc/config/system.
+	#
+	# See the key above for switch port 1 for the meaning of the
+	# 'led' setting below.
+	uci set network.@switch_port[-1].led='2'
+	;;
+
+*)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	;;
+esac
+
+uci commit network
+
+exit 0
diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
new file mode 100755
index 00000000..d9aa5198
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
@@ -0,0 +1,108 @@
+#!/bin/sh
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+
+SWITCH_NAME_CHANGED=
+
+do_change_switch_name() {
+	local config="$1"
+	local option=$2
+	local oldname=$3
+	local newname=$4
+	local val
+
+	config_get val "$config" $option
+	[ "$val" != "$oldname" ] && return 0
+
+	uci_set network "$config" $option $newname
+	SWITCH_NAME_CHANGED=1
+
+	return 0
+}
+
+migrate_switch_name() {
+	local oldname=$1
+	local newname=$2
+
+	. /lib/functions.sh
+
+	config_load network
+
+	logger -t migrate-switchX "Updating switch names in network configuration"
+
+	config_foreach do_change_switch_name switch name $oldname $newname
+	config_foreach do_change_switch_name switch_vlan device $oldname $newname
+
+	[ "$SWITCH_NAME_CHANGED" = "1" ] && {
+		logger -t migrate-switchX "Switch names updated, saving network configuration"
+		uci commit network
+	}
+}
+
+. /lib/ar71xx.sh
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+dir-825-c1|\
+wzr-hp-g300nh2|\
+pb92|\
+ap113|\
+tl-wdr4300|\
+tl-wr1041n-v2|\
+wrt160nl|\
+ap121|\
+ap121-mini|\
+ap96|\
+airrouter|\
+dir-600-a1|\
+dir-615-c1|\
+dir-615-e1|\
+dir-615-e4|\
+ja76pf|\
+rb-750|\
+rb-751|\
+tew-632brp|\
+tew-712br|\
+tl-mr3220|\
+tl-mr3220-v2 |\
+tl-mr3420|\
+tl-wr741nd|\
+tl-wr741nd-v4|\
+tl-wr841n-v7|\
+whr-g301n|\
+whr-hp-g300n|\
+whr-hp-gn|\
+wzr-hp-ag300h|\
+wzr-hp-g450h|\
+ew-dorin|\
+ew-dorin-router)
+	migrate_switch_name "eth0" "switch0"
+	;;
+
+el-m150|\
+rb-450)
+	migrate_switch_name "eth1" "switch0"
+	;;
+
+db120 |\
+rb-2011l | \
+rb-2011uas-2hnd)
+	migrate_switch_name "eth0" "switch0"
+	migrate_switch_name "eth1" "switch1"
+	;;
+
+dir-825-b1|\
+tew-673gru|\
+nbg460n_550n_550nh)
+	migrate_switch_name "rtl8366s" "switch0"
+	;;
+
+tl-wr1043nd)
+	migrate_switch_name "rtl8366rb" "switch0"
+	;;
+
+esac
+
+exit 0
diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration
new file mode 100755
index 00000000..bea9493c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-vlan-migration
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+
+local dev="$(uci -q get network.@switch_vlan[0].device)"
+local vlan="$(uci -q get network.@switch_vlan[0].vlan)"
+
+if [ "$dev" = "rtl8366s" ] && [ "$vlan" = 0 ]; then
+	logger -t vlan-migration "VLAN 0 is invalid for RTL8366s, changing to 1"
+	uci set network.@switch_vlan[0].vlan=1
+	uci commit network
+fi
diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
new file mode 100755
index 00000000..1cef8b99
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+
+LED_OPTIONS_CHANGED=0
+
+. /lib/functions.sh
+
+do_led_update_sysfs()
+{
+	local cfg=$1; shift
+	local tuples="$@"
+	local sysfs
+	local name
+
+	config_get sysfs $cfg sysfs
+	config_get name $cfg name
+
+	[ -z "$sysfs" ] && return
+
+	for tuple in $tuples; do
+		local old=${tuple%=*}
+		local new=${tuple#*=}
+		local new_sysfs
+
+		new_sysfs=$(echo ${sysfs} | sed "s/${old}/${new}/")
+
+		[ "$new_sysfs" = "$sysfs" ] && continue
+
+		uci set system.${cfg}.sysfs="${new_sysfs}"
+		LED_OPTIONS_CHANGED=1
+
+		logger -t led-migration "sysfs option of LED \"${name}\" updated to ${new_sysfs}"
+	done;
+}
+
+migrate_leds()
+{
+	config_load system
+	config_foreach do_led_update_sysfs led "$@"
+}
+
+. /lib/ar71xx.sh
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+dhp-1565-a1|\
+dir-825-c1|\
+dir-835-a1)
+	migrate_leds ":orange:=:amber:" ":wifi_bgn=:wlan2g"
+	;;
+
+wndap360)
+	migrate_leds "wndap360:=netgear:"
+	;;
+
+wndr3700)
+	migrate_leds "wndr3700:=netgear:"
+	;;
+
+wndr3700v4 | \
+wndr4300)
+	migrate_leds ":orange:=:amber:"
+	;;
+
+wnr2000)
+	migrate_leds "wnr2000:=netgear:"
+	;;
+
+wnr2200)
+	migrate_leds "wnr2200:=netgear:"
+	;;
+
+wnr612-v2)
+	migrate_leds "wnr612v2:=netgear:"
+	;;
+
+*)
+	;;
+esac
+
+[ "$LED_OPTIONS_CHANGED" = "1" ] && uci commit system
+
+exit 0
diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header
new file mode 100755
index 00000000..000b773e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+fix_seama_header() {
+	local part=$1
+
+	mtd fixseama $part
+}
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+mynet-n600 | \
+mynet-n750)
+	fix_seama_header kernel
+	;;
+esac
diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-trx-header b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-trx-header
new file mode 100644
index 00000000..1bfd5253
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-trx-header
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+board=$(ar71xx_board_name)
+
+fixtrx() {
+	mtd -o 32 fixtrx firmware
+}
+
+case "$board" in
+mynet-rext |\
+wrt160nl)
+	fixtrx
+	;;
+esac
diff --git a/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh b/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh
new file mode 100755
index 00000000..483a8ded
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -0,0 +1,839 @@
+#!/bin/sh
+#
+# Copyright (C) 2009-2011 OpenWrt.org
+#
+
+AR71XX_BOARD_NAME=
+AR71XX_MODEL=
+
+ar71xx_get_mtd_offset_size_format() {
+	local mtd="$1"
+	local offset="$2"
+	local size="$3"
+	local format="$4"
+	local dev
+
+	dev=$(find_mtd_part $mtd)
+	[ -z "$dev" ] && return
+
+	dd if=$dev bs=1 skip=$offset count=$size 2>/dev/null | hexdump -v -e "1/1 \"$format\""
+}
+
+ar71xx_get_mtd_part_magic() {
+	local mtd="$1"
+	ar71xx_get_mtd_offset_size_format "$mtd" 0 4 %02x
+}
+
+wndr3700_board_detect() {
+	local machine="$1"
+	local magic
+	local name
+
+	name="wndr3700"
+
+	magic="$(ar71xx_get_mtd_part_magic firmware)"
+	case $magic in
+	"33373030")
+		machine="NETGEAR WNDR3700"
+		;;
+	"33373031")
+		local model
+		model=$(ar71xx_get_mtd_offset_size_format art 56 10 %c)
+		if [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff' ]; then
+			machine="NETGEAR WNDR3700v2"
+		elif [ -z "$model" ] || [ "$model" = $'\xff\xff\xff\xff\xff\xff\xff\xff\xffN' ]; then
+			machine="NETGEAR WNDRMAC"
+		else
+			machine="NETGEAR $model"
+		fi
+		;;
+	esac
+
+	AR71XX_BOARD_NAME="$name"
+	AR71XX_MODEL="$machine"
+}
+
+cybertan_get_hw_magic() {
+	local part
+
+	part=$(find_mtd_part firmware)
+	[ -z "$part" ] && return 1
+
+	dd bs=8 count=1 skip=0 if=$part 2>/dev/null | hexdump -v -n 8 -e '1/1 "%02x"'
+}
+
+tplink_get_hwid() {
+	local part
+
+	part=$(find_mtd_part firmware)
+	[ -z "$part" ] && return 1
+
+	dd if=$part bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+tplink_get_mid() {
+	local part
+
+	part=$(find_mtd_part firmware)
+	[ -z "$part" ] && return 1
+
+	dd if=$part bs=4 count=1 skip=17 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+tplink_board_detect() {
+	local model="$1"
+	local hwid
+	local hwver
+
+	hwid=$(tplink_get_hwid)
+	mid=$(tplink_get_mid)
+	hwver=${hwid:6:2}
+	hwver="v${hwver#0}"
+
+	case "$hwid" in
+	"015000"*)
+		model="EasyLink EL-M150"
+		;;
+	"015300"*)
+		model="EasyLink EL-MINI"
+		;;
+	"3C0001"*)
+		model="OOLITE"
+		;;
+	"070300"*)
+		model="TP-Link TL-WR703N"
+		;;
+	"071000"*)
+		model="TP-Link TL-WR710N"
+		;;
+	"072001"*)
+		model="TP-Link TL-WR720N"
+		;;
+	"070100"*)
+		model="TP-Link TL-WA701N/ND"
+		;;
+	"073000"*)
+		model="TP-Link TL-WA730RE"
+		;;
+	"074000"*)
+		model="TP-Link TL-WR740N/ND"
+		;;
+	"074100"*)
+		model="TP-Link TL-WR741N/ND"
+		;;
+	"074300"*)
+		model="TP-Link TL-WR743N/ND"
+		;;
+	"075000"*)
+		model="TP-Link TL-WA750RE"
+		;;
+	"751000"*)
+		model="TP-Link TL-WA7510N"
+		;;
+	"080100"*)
+		model="TP-Link TL-WA801N/ND"
+		;;
+	"083000"*)
+		model="TP-Link TL-WA830RE"
+		;;
+	"084100"*)
+		model="TP-Link TL-WR841N/ND"
+		;;
+	"084200"*)
+		model="TP-Link TL-WR842N/ND"
+		;;
+	"085000"*)
+		model="TP-Link TL-WA850RE"
+		;;
+	"086000"*)
+		model="TP-Link TL-WA860RE"
+		;;
+	"090100"*)
+		model="TP-Link TL-WA901N/ND"
+		;;
+	"094100"*)
+		if [ "$hwid" = "09410002" -a "$mid" = "00420001" ]; then
+			model="Rosewill RNX-N360RT"
+			hwver=""
+		else
+			model="TP-Link TL-WR941N/ND"
+		fi
+		;;
+	"104100"*)
+		model="TP-Link TL-WR1041N/ND"
+		;;
+	"104300"*)
+		model="TP-Link TL-WR1043N/ND"
+		;;
+	"254300"*)
+		model="TP-Link TL-WR2543N/ND"
+		;;
+	"001001"*)
+		model="TP-Link TL-MR10U"
+		;;
+	"001101"*)
+		model="TP-Link TL-MR11U"
+		;;
+	"001301"*)
+		model="TP-Link TL-MR13U"
+		;;
+	"302000"*)
+		model="TP-Link TL-MR3020"
+		;;
+	"304000"*)
+		model="TP-Link TL-MR3040"
+		;;
+	"322000"*)
+		model="TP-Link TL-MR3220"
+		;;
+	"342000"*)
+		model="TP-Link TL-MR3420"
+		;;
+	"350000"*)
+		model="TP-Link TL-WDR3500"
+		;;
+	"360000"*)
+		model="TP-Link TL-WDR3600"
+		;;
+	"430000"*)
+		model="TP-Link TL-WDR4300"
+		;;
+	"430080"*)
+		iw reg set IL
+		model="TP-Link TL-WDR4300 (IL)"
+		;;
+	"431000"*)
+		model="TP-Link TL-WDR4310"
+		;;
+	"49000002")
+		model="TP-Link TL-WDR4900"
+		;;
+	"453000"*)
+		model="MERCURY MW4530R"
+		;;
+	"934100"*)
+		model="NC-LINK SMART-300"
+		;;
+	"c50000"*)
+		model="TP-Link Archer C5"
+		;;
+	"750000"*|\
+	"c70000"*)
+		model="TP-Link Archer C7"
+		;;
+	*)
+		hwver=""
+		;;
+	esac
+
+	AR71XX_MODEL="$model $hwver"
+}
+
+tplink_pharos_get_model_string() {
+	local part
+	part=$(find_mtd_part 'product-info')
+	[ -z "$part" ] && return 1
+
+	# The returned string will end with \r\n, but we don't remove it here
+	# to simplify matching against it in the sysupgrade image check
+	dd if=$part bs=1 skip=4360 2>/dev/null | head -n 1
+}
+
+tplink_pharos_board_detect() {
+	local model_string="$(tplink_pharos_get_model_string | tr -d '\r')"
+	local oIFS="$IFS"; IFS=":"; set -- $model_string; IFS="$oIFS"
+	local model
+
+	case "$1" in
+	'CPE210(TP-LINK|UN|N300-2)')
+		model='TP-Link CPE210'
+		;;
+	'CPE220(TP-LINK|UN|N300-2)')
+		model='TP-Link CPE220'
+		;;
+	'CPE510(TP-LINK|UN|N300-5)')
+		model='TP-Link CPE510'
+		;;
+	'CPE520(TP-LINK|UN|N300-5)')
+		model='TP-Link CPE520'
+		;;
+	esac
+
+	[ -n "$model" ] && AR71XX_MODEL="$model v$2"
+}
+
+ar71xx_board_detect() {
+	local machine
+	local name
+
+	machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo)
+
+	case "$machine" in
+	*"Oolite V1.0")
+		name="oolite"
+		;;
+	*"AirGateway")
+		name="airgateway"
+		;;
+	*"AirRouter")
+		name="airrouter"
+		;;
+	*"ALFA Network AP96")
+		name="alfa-ap96"
+		;;
+	*"ALFA Network N2/N5")
+		name="alfa-nx"
+		;;
+	*ALL0258N)
+		name="all0258n"
+		;;
+	*ALL0305)
+		name="all0305"
+		;;
+	*ALL0315N)
+		name="all0315n"
+		;;
+	*AP113)
+		name="ap113"
+		;;
+	*AP121)
+		name="ap121"
+		;;
+	*AP121-MINI)
+		name="ap121-mini"
+		;;
+	*"AP132 reference board")
+		name="ap132"
+		;;
+	*"AP136-010 reference board")
+		name="ap136-010"
+		;;
+	*"AP136-020 reference board")
+		name="ap136-020"
+		;;
+	*"AP135-020 reference board")
+		name="ap135-020"
+		;;
+	*AP81)
+		name="ap81"
+		;;
+	*AP83)
+		name="ap83"
+		;;
+	*"Archer C5")
+		name="archer-c5"
+		;;
+	*"Archer C7")
+		name="archer-c7"
+		;;
+	*"Atheros AP96")
+		name="ap96"
+		;;
+	*AW-NR580)
+		name="aw-nr580"
+		;;
+	*CAP4200AG)
+		name="cap4200ag"
+		;;
+	*"CPE210/220/510/520")
+		name="cpe510"
+		tplink_pharos_board_detect
+		;;
+	*"DB120 reference board")
+		name="db120"
+		;;
+	*"DGL-5500 rev. A1")
+		name="dgl-5500-a1"
+		;;
+	*"DHP-1565 rev. A1")
+		name="dhp-1565-a1"
+		;;
+	*"DIR-505 rev. A1")
+		name="dir-505-a1"
+		;;
+	*"DIR-600 rev. A1")
+		name="dir-600-a1"
+		;;
+	*"DIR-615 rev. E1")
+		name="dir-615-e1"
+		;;
+	*"DIR-615 rev. E4")
+		name="dir-615-e4"
+		;;
+	*"DIR-825 rev. B1")
+		name="dir-825-b1"
+		;;
+	*"DIR-825 rev. C1")
+		name="dir-825-c1"
+		;;
+	*"DIR-835 rev. A1")
+		name="dir-835-a1"
+		;;
+	*"Dragino v2")
+		name="dragino2"
+		;;
+	*"EAP300 v2")
+		name="eap300v2"
+		;;
+	*EAP7660D)
+		name="eap7660d"
+		;;
+	*EL-M150)
+		name="el-m150"
+		;;
+	*EL-MINI)
+		name="el-mini"
+		;;
+	*"GL-CONNECT INET v1")
+		name="gl-inet"
+		;;
+	*"EnGenius ESR1750")
+		name="esr1750"
+		;;
+	*"EnGenius ESR900")
+		name="esr900"
+		;;
+	*JA76PF)
+		name="ja76pf"
+		;;
+	*JA76PF2)
+		name="ja76pf2"
+		;;
+	*"Bullet M")
+		name="bullet-m"
+		;;
+	*"Loco M XW")
+		name="loco-m-xw"
+		;;
+	*"Nanostation M")
+		name="nanostation-m"
+		;;
+	*"Nanostation M XW")
+		name="nanostation-m-xw"
+		;;
+	*JWAP003)
+		name="jwap003"
+		;;
+	*"Hornet-UB")
+		local size
+		size=$(awk '/firmware/ { print $2 }' /proc/mtd)
+
+		if [ "x$size" = "x00790000" ]; then
+			name="hornet-ub"
+		fi
+
+		if [ "x$size" = "x00f90000" ]; then
+			name="hornet-ub-x2"
+		fi
+		;;
+	*LS-SR71)
+		name="ls-sr71"
+		;;
+	*MR600v2)
+		name="mr600v2"
+		;;
+	*MR600)
+		name="mr600"
+		;;
+	*MR900)
+		name="mr900"
+		;;
+	*MR900v2)
+		name="mr900v2"
+		;;
+	*"My Net N600")
+		name="mynet-n600"
+		;;
+	*"My Net N750")
+		name="mynet-n750"
+		;;
+	*"WD My Net Wi-Fi Range Extender")
+		name="mynet-rext"
+		;;
+	*MZK-W04NU)
+		name="mzk-w04nu"
+		;;
+	*MZK-W300NH)
+		name="mzk-w300nh"
+		;;
+	*"NBG460N/550N/550NH")
+		name="nbg460n_550n_550nh"
+		;;
+	*"Zyxel NBG6716")
+		name="nbg6716"
+		;;
+	*OM2P)
+		name="om2p"
+		;;
+	*OM2Pv2)
+		name="om2pv2"
+		;;
+	*"OM2P HS")
+		name="om2p-hs"
+		;;
+	*"OM2P HSv2")
+		name="om2p-hsv2"
+		;;
+	*"OM2P LC")
+		name="om2p-lc"
+		;;
+	*OM5P)
+		name="om5p"
+		;;
+	*PB42)
+		name="pb42"
+		;;
+	*"PB44 reference board")
+		name="pb44"
+		;;
+	*PB92)
+		name="pb92"
+		;;
+	*"Qihoo 360 C301")
+		name="qihoo-c301"
+		;;
+	*"RouterBOARD 411/A/AH")
+		name="rb-411"
+		;;
+	*"RouterBOARD 411U")
+		name="rb-411u"
+		;;
+	*"RouterBOARD 433/AH")
+		name="rb-433"
+		;;
+	*"RouterBOARD 433UAH")
+		name="rb-433u"
+		;;
+	*"RouterBOARD 435G")
+		name="rb-435g"
+		;;
+	*"RouterBOARD 450")
+		name="rb-450"
+		;;
+	*"RouterBOARD 450G")
+		name="rb-450g"
+		;;
+	*"RouterBOARD 493/AH")
+		name="rb-493"
+		;;
+	*"RouterBOARD 493G")
+		name="rb-493g"
+		;;
+	*"RouterBOARD 750")
+		name="rb-750"
+		;;
+	*"RouterBOARD 750GL")
+		name="rb-750gl"
+		;;
+	*"RouterBOARD 751")
+		name="rb-751"
+		;;
+	*"RouterBOARD 751G")
+		name="rb-751g"
+		;;
+	*"RouterBOARD 911G-2HPnD")
+		name="rb-911g-2hpnd"
+		;;
+	*"RouterBOARD 911G-5HPnD")
+		name="rb-911g-5hpnd"
+		;;
+	*"RouterBOARD 912UAG-2HPnD")
+		name="rb-912uag-2hpnd"
+		;;
+	*"RouterBOARD 912UAG-5HPnD")
+		name="rb-912uag-5hpnd"
+		;;
+	*"RouterBOARD 951G-2HnD")
+		name="rb-951g-2hnd"
+		;;
+	*"RouterBOARD 951Ui-2HnD")
+		name="rb-951ui-2hnd"
+		;;
+	*"RouterBOARD 2011L")
+		name="rb-2011l"
+		;;
+	*"RouterBOARD 2011UAS")
+		name="rb-2011uas"
+		;;
+	*"RouterBOARD 2011UiAS")
+		name="rb-2011uias"
+		;;
+	*"RouterBOARD 2011UAS-2HnD")
+		name="rb-2011uas-2hnd"
+		;;
+	*"RouterBOARD 2011UiAS-2HnD")
+		name="rb-2011uias-2hnd"
+		;;
+	*"RouterBOARD SXT Lite2")
+		name="rb-sxt2n"
+		;;
+	*"RouterBOARD SXT Lite5")
+		name="rb-sxt5n"
+		;;
+	*"Rocket M")
+		name="rocket-m"
+		;;
+	*RouterStation)
+		name="routerstation"
+		;;
+	*"RouterStation Pro")
+		name="routerstation-pro"
+		;;
+	*RW2458N)
+		name="rw2458n"
+		;;
+	*"SMART-300")
+		name="smart-300"
+		;;
+	*TEW-632BRP)
+		name="tew-632brp"
+		;;
+	*TEW-673GRU)
+		name="tew-673gru"
+		;;
+	*TEW-712BR)
+		name="tew-712br"
+		;;
+	*TEW-732BR)
+		name="tew-732br"
+		;;
+	*"TL-WR1041N v2")
+		name="tl-wr1041n-v2"
+		;;
+	*TL-WR1043ND)
+		name="tl-wr1043nd"
+		;;
+	*"TL-WR1043ND v2")
+		name="tl-wr1043nd-v2"
+		;;
+	*TL-WR2543N*)
+		name="tl-wr2543n"
+		;;
+	*"DIR-615 rev. C1")
+		name="dir-615-c1"
+		;;
+	*TL-MR3020)
+		name="tl-mr3020"
+		;;
+	*TL-MR3040)
+		name="tl-mr3040"
+		;;
+	*"TL-MR3040 v2")
+		name="tl-mr3040-v2"
+		;;
+	*TL-MR3220)
+		name="tl-mr3220"
+		;;
+	*"TL-MR3220 v2")
+		name="tl-mr3220-v2"
+		;;
+	*TL-MR3420)
+		name="tl-mr3420"
+		;;
+	*"TL-MR3420 v2")
+		name="tl-mr3420-v2"
+		;;
+	*TL-WA750RE)
+		name="tl-wa750re"
+		;;
+	*"TL-WA7510N v1")
+		name="tl-wa7510n"
+		;;
+	*TL-WA850RE)
+		name="tl-wa850re"
+		;;
+	*"TL-WA830RE v2")
+		name="tl-wa830re-v2"
+		;;
+	*"TL-WA801ND v2")
+		name="tl-wa801nd-v2"
+		;;
+	*TL-WA901ND)
+		name="tl-wa901nd"
+		;;
+	*"TL-WA901ND v2")
+		name="tl-wa901nd-v2"
+		;;
+	*"TL-WA901ND v3")
+		name="tl-wa901nd-v3"
+		;;
+	*"TL-WDR3500")
+		name="tl-wdr3500"
+		;;
+	*"TL-WDR3600/4300/4310")
+		name="tl-wdr4300"
+		;;
+	*"TL-WDR4900 v2")
+		name="tl-wdr4900-v2"
+		;;
+	*TL-WR741ND)
+		name="tl-wr741nd"
+		;;
+	*"TL-WR741ND v4")
+		name="tl-wr741nd-v4"
+		;;
+	*"TL-WR841N v1")
+		name="tl-wr841n-v1"
+		;;
+	*"TL-WR841N/ND v7")
+		name="tl-wr841n-v7"
+		;;
+	*"TL-WR841N/ND v8")
+		name="tl-wr841n-v8"
+		;;
+	*"TL-WR841N/ND v9")
+		name="tl-wr841n-v9"
+		;;
+	*"TL-WR842N/ND v2")
+		name="tl-wr842n-v2"
+		;;
+	*TL-WR941ND)
+		name="tl-wr941nd"
+		;;
+	*"TL-WR703N v1")
+		name="tl-wr703n"
+		;;
+	*"TL-WR710N v1")
+		name="tl-wr710n"
+		;;
+	*"TL-WR720N v3")
+		name="tl-wr720n-v3"
+		;;
+	*"TL-MR10U")
+		name="tl-mr10u"
+		;;
+	*"TL-MR11U")
+		name="tl-mr11u"
+		;;
+	*"TL-MR13U")
+		name="tl-mr13u"
+		;;
+	*"Tube2H")
+		name="tube2h"
+		;;
+	*UniFi)
+		name="unifi"
+		;;
+	*"UniFi AP Pro")
+		name="uap-pro"
+		;;
+	*WHR-G301N)
+		name="whr-g301n"
+		;;
+	*WHR-HP-GN)
+		name="whr-hp-gn"
+		;;
+	*WLAE-AG300N)
+		name="wlae-ag300n"
+		;;
+	*"UniFiAP Outdoor")
+		name="unifi-outdoor"
+		;;
+	*WP543)
+		name="wp543"
+		;;
+	*WPE72)
+		name="wpe72"
+		;;
+	*WNDAP360)
+		name="wndap360"
+		;;
+	*"WNDR3700/WNDR3800/WNDRMAC")
+		wndr3700_board_detect "$machine"
+		;;
+	*"R6100")
+		name="r6100"
+		;;
+	*"WNDR3700v4")
+		name="wndr3700v4"
+		;;
+	*"WNDR4300")
+		name="wndr4300"
+		;;
+	*"WNR2000 V4")
+		name="wnr2000-v4"
+		;;
+	*"WNR2000 V3")
+		name="wnr2000-v3"
+		;;
+	*WNR2000)
+		name="wnr2000"
+		;;
+	*WNR2200)
+		name="wnr2200"
+		;;
+	*"WNR612 V2")
+		name="wnr612-v2"
+		;;
+	*WRT160NL)
+		name="wrt160nl"
+		;;
+	*WRT400N)
+		name="wrt400n"
+		;;
+	*"WZR-450HP2")
+		name="wzr-450hp2"
+		;;
+	*"WZR-HP-AG300H/WZR-600DHP")
+		name="wzr-hp-ag300h"
+		;;
+	*WZR-HP-G300NH)
+		name="wzr-hp-g300nh"
+		;;
+	*WZR-HP-G450H)
+		name="wzr-hp-g450h"
+		;;
+	*WZR-HP-G300NH2)
+		name="wzr-hp-g300nh2"
+		;;
+	*WHR-HP-G300N)
+		name="whr-hp-g300n"
+		;;
+	*ZCN-1523H-2)
+		name="zcn-1523h-2"
+		;;
+	*ZCN-1523H-5)
+		name="zcn-1523h-5"
+		;;
+	*EmbWir-Dorin)
+		name="ew-dorin"
+		;;
+	*EmbWir-Dorin-Router)
+		name="ew-dorin-router"
+		;;
+	"8devices Carambola2"*)
+		name="carambola2"
+		;;
+	*"Sitecom WLR-8100")
+		name="wlr8100"
+		;;
+	*"BHU BXU2000n-2 rev. A1")
+		name="bxu2000n-2-a1"
+		;;
+	*"HiWiFi HC6361")
+		name="hiwifi-hc6361"
+		;;
+	esac
+
+	[ -z "$AR71XX_MODEL" ] && [ "${machine:0:8}" = 'TP-LINK ' ] && \
+		tplink_board_detect "$machine"
+
+	[ -z "$name" ] && name="unknown"
+
+	[ -z "$AR71XX_BOARD_NAME" ] && AR71XX_BOARD_NAME="$name"
+	[ -z "$AR71XX_MODEL" ] && AR71XX_MODEL="$machine"
+
+	[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+
+	echo "$AR71XX_BOARD_NAME" > /tmp/sysinfo/board_name
+	echo "$AR71XX_MODEL" > /tmp/sysinfo/model
+}
+
+ar71xx_board_name() {
+	local name
+
+	[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
+	[ -z "$name" ] && name="unknown"
+
+	echo "$name"
+}
diff --git a/trunk/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh b/trunk/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh
new file mode 100644
index 00000000..ff5407a0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_ar71xx() {
+	. /lib/ar71xx.sh
+
+	ar71xx_board_detect
+}
+
+boot_hook_add preinit_main do_ar71xx
diff --git a/trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx b/trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
new file mode 100644
index 00000000..b40dff5d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+fetch_mac_from_mtd() {
+	local mtd_part=$1
+	local lan_env=$2
+	local wan_env=$3
+	local mtd mac
+
+	mtd=$(grep $mtd_part /proc/mtd | cut -d: -f1)
+	[ -z $mtd ] && return
+
+	mac=$(grep $lan_env /dev/$mtd | cut -d= -f2)
+	[ ! -z $mac ] && ifconfig eth0 hw ether $mac 2>/dev/null
+
+	mac=$(grep $wan_env /dev/$mtd | cut -d= -f2)
+	[ ! -z $mac ] && ifconfig eth1 hw ether $mac 2>/dev/null
+}
+
+preinit_set_mac_address() {
+	case $(ar71xx_board_name) in
+		tew-632brp)
+			fetch_mac_from_mtd config lan_mac wan_mac
+			;;
+		dir-615-c1)
+			fetch_mac_from_mtd config lan_mac wan_mac
+			echo 1 > /sys/class/leds/dir-615-c1:green:wancpu/brightness
+			;;
+		r6100)
+			mac_lan=$(mtd_get_mac_binary caldata 0)
+			[ -n "$mac_lan" ] && ifconfig eth1 hw ether "$mac_lan"
+			mac_wan=$(mtd_get_mac_binary caldata 6)
+			[ -n "$mac_wan" ] && ifconfig eth0 hw ether "$mac_wan"
+			;;
+		wrt160nl)
+			fetch_mac_from_mtd nvram lan_hwaddr wan_hwaddr
+			;;
+	esac
+}
+
+boot_hook_add preinit_main preinit_set_mac_address
+
diff --git a/trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx b/trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
new file mode 100644
index 00000000..a9a8794c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+. /lib/ar71xx.sh
+
+set_preinit_iface() {
+	case $(ar71xx_board_name) in
+	alfa-ap96 |\
+	alfa-nx |\
+	ap135-020 |\
+	ap136-020 |\
+	ap83 |\
+	archer-c5 |\
+	archer-c7 |\
+	dir-505-a1 |\
+	gl-inet |\
+	jwap003 |\
+	pb42 |\
+	pb44 |\
+	rb-433 |\
+	rb-433u |\
+	rb-435g |\
+	rb-450 |\
+	rb-450g |\
+	routerstation |\
+	routerstation-pro |\
+	smart-300 |\
+	tl-mr3420-v2 |\
+	tl-wdr4900-v2 |\
+	tl-wr1043nd-v2 |\
+	tl-wr710n |\
+	tl-wr720n-v3 |\
+	tl-wr841n-v8 |\
+	tl-wr842n-v2 |\
+	wnr2000-v3 |\
+	wnr2200 |\
+	wnr612-v2 |\
+	wpe72)
+		ifname=eth1
+		;;
+	*)
+		ifname=eth0
+		;;
+	esac
+}
+
+boot_hook_add preinit_main set_preinit_iface
+
+
+
diff --git a/trunk/target/linux/ar71xx/base-files/lib/preinit/81_load_ath10k_board_bin b/trunk/target/linux/ar71xx/base-files/lib/preinit/81_load_ath10k_board_bin
new file mode 100644
index 00000000..71908208
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/preinit/81_load_ath10k_board_bin
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+. /lib/functions/system.sh
+. /lib/ar71xx.sh
+
+do_load_ath10k_board_bin() {
+	# load board.bin
+	case $(ar71xx_board_name) in
+		nbg6716)
+			dd if=/dev/mtdblock2 \
+				bs=1 skip=20480 count=2116 \
+				of=/tmp/ath10k-board.bin
+		;;
+		archer-c5 | \
+		archer-c7)
+			local mac
+			mac=$(macaddr_add $(cat /sys/class/net/eth1/address) -2)
+
+			dd if=/dev/mtdblock4 \
+				bs=1 skip=20480 count=6 \
+				of=/tmp/ath10k-board.bin
+			macaddr_2bin $mac >> /tmp/ath10k-board.bin
+			dd if=/dev/mtdblock4 \
+				bs=1 skip=20492 count=2104 >> /tmp/ath10k-board.bin
+		;;
+		r6100)
+			local mac
+			mac=$(macaddr_add $(cat /sys/class/net/eth1/address) +2)
+
+			dd if=/dev/mtdblock2 \
+				bs=1 skip=20480 count=6 \
+				of=/tmp/ath10k-board.bin
+			macaddr_2bin $mac >> /tmp/ath10k-board.bin
+			dd if=/dev/mtdblock2 \
+				bs=1 skip=20492 count=2104 >> /tmp/ath10k-board.bin
+		;;
+		qihoo-c301)
+			local mac
+
+			mac=$(mtd_get_mac_ascii devdata wlan5mac)
+
+			if [ -z "$mac" ]; then
+				mac=$(macaddr_add $(cat /sys/class/net/eth0/address) -2)
+			fi
+
+			dd if=/dev/mtdblock10 \
+				bs=1 skip=20480 count=6 \
+				of=/tmp/ath10k-board.bin
+			macaddr_2bin $mac >> /tmp/ath10k-board.bin
+			dd if=/dev/mtdblock10 \
+				bs=1 skip=20492 count=2104 >> /tmp/ath10k-board.bin
+
+		;;
+	esac
+	[ -f /tmp/ath10k-board.bin ] || {
+		return
+	}
+	cmp -s /tmp/ath10k-board.bin /lib/firmware/ath10k/QCA988X/hw2.0/board.bin || {
+		cp /tmp/ath10k-board.bin /lib/firmware/ath10k/QCA988X/hw2.0/board.bin
+		rm /tmp/ath10k-board.bin
+	}
+}
+
+boot_hook_add preinit_main do_load_ath10k_board_bin
diff --git a/trunk/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k b/trunk/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k
new file mode 100644
index 00000000..c5c60efd
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+. /lib/functions/system.sh
+. /lib/ar71xx.sh
+
+firmware_file="/lib/firmware/ath10k/QCA988X/hw2.0/firmware-3.bin"
+firmware_md5_orig="5163aa8de591f80b06c77f22e9777473"
+firmware_md5_current="$(md5sum $firmware_file)"
+firmware_md5_current="${firmware_md5_current%% *}"
+
+
+do_patch_ath10k_firmware() {
+	# verify md5sum before patching
+	[ "firmware_md5_orig" != "firmware_md5_current" ] || {
+		return
+	}
+
+	# some boards have bogus mac in otp, patch the default mac in the firmware
+	case $(ar71xx_board_name) in
+		dgl-5500-a1)
+			local mac
+			mac=$(mtd_get_mac_ascii nvram wlan1_mac)
+
+			cp $firmware_file /tmp/ath10k-firmware.bin
+			macaddr_2bin $mac | dd of=/tmp/ath10k-firmware.bin \
+				conv=notrunc bs=1 seek=280 count=6
+
+		;;
+	esac
+	[ -f /tmp/ath10k-firmware.bin ] || {
+		return
+	}
+	cp /tmp/ath10k-firmware.bin $firmware_file
+	rm /tmp/ath10k-firmware.bin
+}
+
+boot_hook_add preinit_main do_patch_ath10k_firmware
diff --git a/trunk/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh b/trunk/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
new file mode 100644
index 00000000..98b368d1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
@@ -0,0 +1,162 @@
+# The U-Boot loader of the some Allnet devices requires image sizes and
+# checksums to be provided in the U-Boot environment.
+# In case the check fails during boot, a failsafe-system is started to provide
+# a minimal web-interface for flashing a new firmware.
+
+# make sure we got uboot-envtools and fw_env.config copied over to the ramfs
+# create /var/lock for the lock "fw_setenv.lock" of fw_setenv
+platform_add_ramfs_ubootenv() {
+	[ -e /usr/sbin/fw_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv
+	[ -e /etc/fw_env.config ] && install_file /etc/fw_env.config
+	mkdir -p $RAM_ROOT/var/lock
+}
+append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv
+
+# determine size of the main firmware partition
+platform_get_firmware_size() {
+	local dev size erasesize name
+	while read dev size erasesize name; do
+		name=${name#'"'}; name=${name%'"'}
+		case "$name" in
+			firmware)
+				printf "%d" "0x$size"
+				break
+			;;
+		esac
+	done < /proc/mtd
+}
+
+# get the first 4 bytes (magic) of a given file starting at offset in hex format
+get_magic_long_at() {
+	dd if="$1" skip=$(( $CI_BLKSZ / 4 * $2 )) bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+get_filesize() {
+	wc -c "$1" | while read image_size _n ; do echo $image_size ; break; done
+}
+
+# scan through the update image pages until matching a magic
+platform_get_offset() {
+	offsetcount=0
+	magiclong="x"
+	if [ -n "$3" ]; then
+		offsetcount=$3
+	fi
+	while magiclong=$( get_magic_long_at "$1" "$offsetcount" ) && [ -n "$magiclong" ]; do
+		case "$magiclong" in
+			"2705"*)
+				# U-Boot image magic
+				if [ "$2" = "uImage" ]; then
+					echo $offsetcount
+					return
+				fi
+			;;
+			"68737173"|"73717368")
+				# SquashFS
+				if [ "$2" = "rootfs" ]; then
+					echo $offsetcount
+					return
+				fi
+			;;
+			"deadc0de"|"19852003")
+				# JFFS2 empty page
+				if [ "$2" = "rootfs-data" ]; then
+					echo $offsetcount
+					return
+				fi
+			;;
+		esac
+		offsetcount=$(( $offsetcount + 1 ))
+	done
+}
+
+platform_check_image_allnet() {
+	local fw_printenv=/usr/sbin/fw_printenv
+	[ ! -n "$fw_printenv" -o ! -x "$fw_printenv" ] && {
+		echo "Please install uboot-envtools!"
+		return 1
+	}
+
+	[ ! -r "/etc/fw_env.config" ] && {
+		echo "/etc/fw_env.config is missing"
+		return 1
+	}
+
+	local image_size=$( get_filesize "$1" )
+	local firmware_size=$( platform_get_firmware_size )
+	[ $image_size -ge $firmware_size ] &&
+	{
+		echo "upgrade image is too big (${image_size}b > ${firmware_size}b)"
+	}
+
+	local vmlinux_blockoffset=$( platform_get_offset "$1" uImage )
+	[ -z $vmlinux_blockoffset ] && {
+		echo "vmlinux-uImage not found"
+		return 1
+	}
+
+	local rootfs_blockoffset=$( platform_get_offset "$1" rootfs "$vmlinux_blockoffset" )
+	[ -z $rootfs_blockoffset ] && {
+		echo "missing rootfs"
+		return 1
+	}
+
+	local data_blockoffset=$( platform_get_offset "$1" rootfs-data "$rootfs_blockoffset" )
+	[ -z $data_blockoffset ] && {
+		echo "rootfs doesn't have JFFS2 end marker"
+		return 1
+	}
+
+	return 0
+}
+
+platform_do_upgrade_allnet() {
+	local firmware_base_addr=$( printf "%d" "$1" )
+	local vmlinux_blockoffset=$( platform_get_offset "$2" uImage )
+	if [ ! -n "$vmlinux_blockoffset" ]; then
+		echo "can't determine uImage offset"
+		return 1
+	fi
+	local rootfs_blockoffset=$( platform_get_offset "$2" rootfs $(( $vmlinux_blockoffset + 1 )) )
+	local vmlinux_offset=$(( $vmlinux_blockoffset * $CI_BLKSZ ))
+	local vmlinux_addr=$(( $firmware_base_addr + $vmlinux_offset ))
+	local vmlinux_hexaddr=0x$( printf "%08x" "$vmlinux_addr" )
+	if [ ! -n "$rootfs_blockoffset" ]; then
+		echo "can't determine rootfs offset"
+		return 1
+	fi
+	local rootfs_offset=$(( $rootfs_blockoffset * $CI_BLKSZ ))
+	local rootfs_addr=$(( $firmware_base_addr + $rootfs_offset ))
+	local rootfs_hexaddr=0x$( printf "%08x" "$rootfs_addr" )
+	local vmlinux_blockcount=$(( $rootfs_blockoffset - $vmlinux_blockoffset ))
+	local vmlinux_size=$(( $rootfs_offset - $vmlinux_offset ))
+	local vmlinux_hexsize=0x$( printf "%08x" "$vmlinux_size" )
+	local data_blockoffset=$( platform_get_offset "$2" rootfs-data $(( $rootfs_blockoffset + 1 )) )
+	if [ ! -n "$data_blockoffset" ]; then
+		echo "can't determine rootfs size"
+		return 1
+	fi
+	local data_offset=$(( $data_blockoffset * $CI_BLKSZ ))
+	local rootfs_blockcount=$(( $data_blockoffset - $rootfs_blockoffset ))
+	local rootfs_size=$(( $data_offset - $rootfs_offset ))
+	local rootfs_hexsize=0x$( printf "%08x" "$rootfs_size" )
+
+	local rootfs_md5=$( dd if="$2" bs=$CI_BLKSZ skip=$rootfs_blockoffset count=$rootfs_blockcount 2>/dev/null | md5sum -); rootfs_md5="${rootfs_md5%% *}"
+	local vmlinux_md5=$( dd if="$2" bs=$CI_BLKSZ skip=$vmlinux_blockoffset count=$vmlinux_blockcount 2>/dev/null | md5sum -); vmlinux_md5="${vmlinux_md5%% *}"
+	# this needs a recent version of uboot-envtools!
+	cat >/tmp/fw_env_upgrade <<EOF
+vmlinux_start_addr $vmlinux_hexaddr
+vmlinux_size $vmlinux_hexsize
+vmlinux_checksum $vmlinux_md5
+rootfs_start_addr $rootfs_hexaddr
+rootfs_size $rootfs_hexsize
+rootfs_checksum $rootfs_md5
+bootcmd bootm $vmlinux_hexaddr
+EOF
+	fw_setenv -s /tmp/fw_env_upgrade || {
+		echo "failed to update U-Boot environment"
+		return 1
+	}
+	shift
+	default_do_upgrade "$@"
+}
diff --git a/trunk/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh b/trunk/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
new file mode 100644
index 00000000..7ad3dd8e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
@@ -0,0 +1,165 @@
+#!/bin/sh
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+
+. /lib/functions.sh
+. /lib/ar71xx.sh
+
+get_magic_at() {
+	local mtddev=$1
+	local pos=$2
+	dd bs=1 count=2 skip=$pos if=$mtddev 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+dir825b_is_caldata_valid() {
+	local mtddev=$1
+	local magic
+
+	magic=$(get_magic_at $mtddev 4096)
+	[ "$magic" != "a55a" ] && return 0
+
+	magic=$(get_magic_at $mtddev 20480)
+	[ "$magic" != "a55a" ] && return 0
+
+	return 1
+}
+
+dir825b_copy_caldata() {
+	local cal_src=$1
+	local cal_dst=$2
+	local mtd_src
+	local mtd_dst
+	local md5_src
+	local md5_dst
+
+	mtd_src=$(find_mtd_part $cal_src)
+	[ -z "$mtd_src" ] && {
+		echo "no $cal_src partition found"
+		return 1
+	}
+
+	mtd_dst=$(find_mtd_part $cal_dst)
+	[ -z "$mtd_dst" ] && {
+		echo "no $cal_dst partition found"
+		return 1
+	}
+
+	dir825b_is_caldata_valid "$mtd_src" && {
+		echo "no valid calibration data found in $cal_src"
+		return 1
+	}
+
+	dir825b_is_caldata_valid "$mtd_dst" && {
+		echo "Copying calibration data from $cal_src to $cal_dst..."
+		dd if="$mtd_src" 2>/dev/null | mtd -q -q write - "$cal_dst"
+	}
+
+        md5_src=$(md5sum "$mtd_src") && md5_src="${md5_src%% *}"
+        md5_dst=$(md5sum "$mtd_dst") && md5_dst="${md5_dst%% *}"
+
+	[ "$md5_src" != "$md5_dst" ] && {
+		echo "calibration data mismatch $cal_src:$md5_src $cal_dst:$md5_dst"
+		return 1
+	}
+
+	return 0
+}
+
+dir825b_do_upgrade_combined() {
+	local fw_part=$1
+	local fw_file=$2
+	local fw_mtd=$(find_mtd_part $fw_part)
+	local fw_length=0x$(dd if="$fw_file" bs=2 skip=1 count=4 2>/dev/null)
+	local fw_blocks=$(($fw_length / 65536))
+
+	if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
+		local append=""
+		[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+
+		sync
+		dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
+			mtd $append write - "$fw_part"
+	fi
+}
+
+dir825b_check_image() {
+	local magic="$(get_magic_long "$1")"
+	local fw_mtd=$(find_mtd_part "firmware_orig")
+
+	case "$magic" in
+	"27051956")
+		;;
+	"43493030")
+		local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null)
+		local md5_chk=$(dd if="$1" bs=64k skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"
+		local fw_len=$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null)
+		local fw_part_len=$(mtd_get_part_size "firmware")
+
+		if [ -z "$fw_mtd" ]; then
+			ask_bool 0 "Do you have a backup of the caldata partition?" || {
+				echo "Warning, please make sure that you have a backup of the caldata partition."
+				echo "Once you have that, use 'sysupgrade -i' for upgrading to the 'fat' firmware."
+				return 1
+			}
+		fi
+
+		if [ -z "$md5_img" -o -z "$md5_chk" ]; then
+			echo "Unable to get image checksums. Maybe you are using a streamed image?"
+			return 1
+		fi
+
+		if [ "$md5_img" != "$md5_chk" ]; then
+			echo "Invalid image. Contents do not match checksum (image:$md5_img calculated:$md5_chk)"
+			return 1
+		fi
+
+		fw_len=$((0x$fw_len))
+		fw_part_len=${fw_part_len:-0}
+
+		if [ $fw_part_len -lt $fw_len ]; then
+			echo "The upgrade image is too big (size:$fw_len available:$fw_part_len)"
+			return 1
+		fi
+		;;
+	*)
+		echo "Unsupported image format."
+		return 1
+		;;
+	esac
+
+	return 0
+}
+
+platform_do_upgrade_dir825b() {
+	local magic="$(get_magic_long "$1")"
+	local fw_mtd=$(find_mtd_part "firmware_orig")
+
+	case "$magic" in
+	"27051956")
+		if [ -n "$fw_mtd" ]; then
+			# restore calibration data before downgrading to
+			# the normal image
+			dir825b_copy_caldata "caldata" "caldata_orig" || {
+				echo "unable to restore calibration data"
+				exit 1
+			}
+			PART_NAME="firmware_orig"
+		else
+			PART_NAME="firmware"
+		fi
+		default_do_upgrade "$ARGV"
+		;;
+	"43493030")
+		if [ -z "$fw_mtd" ]; then
+			# backup calibration data before upgrading to the
+			# fat image
+			dir825b_copy_caldata "caldata" "caldata_copy" || {
+				echo "unable to backup calibration data"
+				exit 1
+			}
+		fi
+		dir825b_do_upgrade_combined "firmware" "$ARGV"
+		;;
+	esac
+}
diff --git a/trunk/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/trunk/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
new file mode 100644
index 00000000..a897dca0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
@@ -0,0 +1,212 @@
+# The U-Boot loader of the OpenMesh devices requires image sizes and
+# checksums to be provided in the U-Boot environment.
+# The OpenMesh devices come with 2 main partitions - while one is active
+# sysupgrade will flash the other. The boot order is changed to boot the
+# newly flashed partition. If the new partition can't be booted due to
+# upgrade failures the previously used partition is loaded.
+
+trim()
+{
+	echo $1
+}
+
+cfg_value_get()
+{
+	local cfg=$1 cfg_opt
+	local section=$2 our_section=0
+	local param=$3 our_param=
+
+	for cfg_opt in $cfg
+		do
+			[ "$cfg_opt" = "[$section]" ] && our_section=1 && continue
+			[ "$our_section" = "1" ] || continue
+
+			our_param=$(echo ${cfg_opt%%=*})
+			[ "$param" = "$our_param" ] && echo ${cfg_opt##*=} && break
+		done
+}
+
+# make sure we got uboot-envtools and fw_env.config copied over to the ramfs
+# create /var/lock for the lock "fw_setenv.lock" of fw_setenv
+platform_add_ramfs_ubootenv()
+{
+	[ -e /usr/sbin/fw_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv
+	[ -e /etc/fw_env.config ] && install_file /etc/fw_env.config
+	mkdir -p $RAM_ROOT/var/lock
+}
+append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv
+
+platform_check_image_openmesh()
+{
+	local img_magic=$1
+	local img_path=$2
+	local fw_printenv=/usr/sbin/fw_printenv
+	local img_board_target= img_num_files= i=0
+	local cfg_name= kernel_name= rootfs_name=
+
+	case "$img_magic" in
+		# Combined Extended Image v1
+		43453031)
+			img_board_target=$(trim $(dd if="$img_path" bs=4 skip=1 count=8 2>/dev/null))
+			img_num_files=$(trim $(dd if="$img_path" bs=2 skip=18 count=1 2>/dev/null))
+			;;
+		*)
+			echo "Invalid image ($img_magic). Use combined extended images on this platform"
+			return 1
+			;;
+	esac
+
+	case "$img_board_target" in
+		OM2P)
+			[ "$board" = "om2p" ] && break
+			[ "$board" = "om2pv2" ] && break
+			[ "$board" = "om2p-lc" ] && break
+			[ "$board" = "om2p-hs" ] && break
+			[ "$board" = "om2p-hsv2" ] && break
+			echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
+			return 1
+			;;
+		OM5P)
+			[ "$board" = "om5p" ] && break
+			echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
+			return 1
+			;;
+		MR600)
+			[ "$board" = "mr600" ] && break
+			[ "$board" = "mr600v2" ] && break
+			echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
+			return 1
+			;;
+		MR900)
+			[ "$board" = "mr900" ] && break
+			[ "$board" = "mr900v2" ] && break
+			echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
+			return 1
+			;;
+		*)
+			echo "Invalid board target ($img_board_target). Use the correct image for this platform"
+			return 1
+			;;
+	esac
+
+	[ $img_num_files -ne 3 ] && {
+		echo "Invalid number of embedded images ($img_num_files). Use the correct image for this platform"
+		return 1
+	}
+
+	cfg_name=$(trim $(dd if="$img_path" bs=2 skip=19 count=16 2>/dev/null))
+
+	[ "$cfg_name" != "fwupgrade.cfg" ] && {
+		echo "Invalid embedded config file ($cfg_name). Use the correct image for this platform"
+		return 1
+	}
+
+	kernel_name=$(trim $(dd if="$img_path" bs=2 skip=55 count=16 2>/dev/null))
+
+	[ "$kernel_name" != "kernel" ] && {
+		echo "Invalid embedded kernel file ($kernel_name). Use the correct image for this platform"
+		return 1
+	}
+
+	rootfs_name=$(trim $(dd if="$img_path" bs=2 skip=91 count=16 2>/dev/null))
+
+	[ "$rootfs_name" != "rootfs" ] && {
+		echo "Invalid embedded kernel file ($rootfs_name). Use the correct image for this platform"
+		return 1
+	}
+
+	[ ! -x "$fw_printenv" ] && {
+		echo "Please install uboot-envtools!"
+		return 1
+	}
+
+	[ ! -r "/etc/fw_env.config" ] && {
+		echo "/etc/fw_env.config is missing"
+		return 1
+	}
+
+	return 0
+}
+
+platform_do_upgrade_openmesh()
+{
+	local img_path=$1 img_board_target=
+	local kernel_start_addr= kernel_start_addr1= kernel_start_addr2=
+	local kernel_size= kernel_md5=
+	local rootfs_size= rootfs_checksize= rootfs_md5=
+	local kernel_bsize= total_size=
+	local data_offset=$((64 * 1024)) block_size= offset=
+	local uboot_env_upgrade="/tmp/fw_env_upgrade"
+	local cfg_size= kernel_size= rootfs_size=
+	local append=""
+
+	[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+
+	cfg_size=$(dd if="$img_path" bs=2 skip=35 count=4 2>/dev/null)
+	kernel_size=$(dd if="$img_path" bs=2 skip=71 count=4 2>/dev/null)
+	rootfs_size=$(dd if="$img_path" bs=2 skip=107 count=4 2>/dev/null)
+
+	img_board_target=$(trim $(dd if="$img_path" bs=4 skip=1 count=8 2>/dev/null))
+	cfg_content=$(dd if="$img_path" bs=1 skip=$data_offset count=$(echo $((0x$cfg_size))) 2>/dev/null)
+
+	case $img_board_target in
+		OM2P)
+			block_size=$((256 * 1024))
+			total_size=7340032
+			kernel_start_addr1=0x9f1c0000
+			kernel_start_addr2=0x9f8c0000
+			;;
+		OM5P|MR600|MR900)
+			block_size=$((64 * 1024))
+			total_size=7995392
+			kernel_start_addr1=0x9f0b0000
+			kernel_start_addr2=0x9f850000
+			;;
+	esac
+
+	kernel_md5=$(cfg_value_get "$cfg_content" "vmlinux" "md5sum")
+	rootfs_md5=$(cfg_value_get "$cfg_content" "rootfs" "md5sum")
+	rootfs_checksize=$(cfg_value_get "$cfg_content" "rootfs" "checksize")
+
+	if [ "$((0x$kernel_size % $block_size))" = "0" ]
+		then
+			kernel_bsize=$(echo $((0x$kernel_size)))
+		else
+			kernel_bsize=$((0x$kernel_size + ($block_size - (0x$kernel_size % $block_size))))
+	fi
+
+	mtd -q erase inactive
+
+	offset=$(echo $(($data_offset + 0x$cfg_size + 0x$kernel_size)))
+	dd if="$img_path" bs=1 skip=$offset count=$(echo $((0x$rootfs_size))) 2>&- | mtd -n -p $kernel_bsize $append write - "inactive"
+
+	offset=$(echo $(($data_offset + 0x$cfg_size)))
+	dd if="$img_path" bs=1 skip=$offset count=$(echo $((0x$kernel_size))) 2>&- | mtd -n write - "inactive"
+
+	rm $uboot_env_upgrade 2>&-
+
+	if [ "$(grep 'mtd3:.*inactive' /proc/mtd)" ]
+		then
+			printf "kernel_size_1 %u\n" $(($kernel_bsize / 1024)) >> $uboot_env_upgrade
+			printf "rootfs_size_1 %u\n" $((($total_size - $kernel_bsize) / 1024)) >> $uboot_env_upgrade
+			printf "bootseq 1,2\n" >> $uboot_env_upgrade
+			kernel_start_addr=$kernel_start_addr1
+		else
+			printf "kernel_size_2 %u\n" $(($kernel_bsize / 1024)) >> $uboot_env_upgrade
+			printf "rootfs_size_2 %u\n" $((($total_size - $kernel_bsize) / 1024)) >> $uboot_env_upgrade
+			printf "bootseq 2,1\n" >> $uboot_env_upgrade
+			kernel_start_addr=$kernel_start_addr2
+	fi
+
+	printf "vmlinux_start_addr %s\n" $kernel_start_addr >> $uboot_env_upgrade
+	printf "vmlinux_size 0x%s\n" $kernel_size >> $uboot_env_upgrade
+	printf "vmlinux_checksum %s\n" $kernel_md5 >> $uboot_env_upgrade
+	printf "rootfs_start_addr 0x%x\n" $(($kernel_start_addr + $kernel_bsize)) >> $uboot_env_upgrade
+	printf "rootfs_size %s\n" $rootfs_checksize >> $uboot_env_upgrade
+	printf "rootfs_checksum %s\n" $rootfs_md5 >> $uboot_env_upgrade
+
+	fw_setenv -s $uboot_env_upgrade || {
+		echo "failed to update U-Boot environment"
+		return 1
+	}
+}
diff --git a/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
new file mode 100755
index 00000000..2e5b0dd9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,503 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+
+. /lib/functions/system.sh
+. /lib/ar71xx.sh
+
+PART_NAME=firmware
+RAMFS_COPY_DATA=/lib/ar71xx.sh
+
+CI_BLKSZ=65536
+CI_LDADR=0x80060000
+
+platform_find_partitions() {
+	local first dev size erasesize name
+	while read dev size erasesize name; do
+		name=${name#'"'}; name=${name%'"'}
+		case "$name" in
+			vmlinux.bin.l7|vmlinux|kernel|linux|linux.bin|rootfs|filesystem)
+				if [ -z "$first" ]; then
+					first="$name"
+				else
+					echo "$erasesize:$first:$name"
+					break
+				fi
+			;;
+		esac
+	done < /proc/mtd
+}
+
+platform_find_kernelpart() {
+	local part
+	for part in "${1%:*}" "${1#*:}"; do
+		case "$part" in
+			vmlinux.bin.l7|vmlinux|kernel|linux|linux.bin)
+				echo "$part"
+				break
+			;;
+		esac
+	done
+}
+
+platform_do_upgrade_combined() {
+	local partitions=$(platform_find_partitions)
+	local kernelpart=$(platform_find_kernelpart "${partitions#*:}")
+	local erase_size=$((0x${partitions%%:*})); partitions="${partitions#*:}"
+	local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null)
+	local kern_blocks=$(($kern_length / $CI_BLKSZ))
+	local root_blocks=$((0x$(dd if="$1" bs=2 skip=5 count=4 2>/dev/null) / $CI_BLKSZ))
+
+	if [ -n "$partitions" ] && [ -n "$kernelpart" ] && \
+	   [ ${kern_blocks:-0} -gt 0 ] && \
+	   [ ${root_blocks:-0} -gt 0 ] && \
+	   [ ${erase_size:-0} -gt 0 ];
+	then
+		local append=""
+		[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+
+		( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \
+		  dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null ) | \
+			mtd -r $append -F$kernelpart:$kern_length:$CI_LDADR,rootfs write - $partitions
+	fi
+}
+
+tplink_get_image_hwid() {
+	get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+tplink_get_image_boot_size() {
+	get_image "$@" | dd bs=4 count=1 skip=37 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+tplink_pharos_check_image() {
+	local magic_long="$(get_magic_long "$1")"
+	[ "$magic_long" != "7f454c46" ] && {
+		echo "Invalid image magic '$magic_long'"
+		return 1
+	}
+
+	local model_string="$(tplink_pharos_get_model_string)"
+	local line
+
+	# Here $1 is given to dd directly instead of get_image as otherwise the skip
+	# will take almost a second (as dd can't seek then)
+	#
+	# This will fail if the image isn't local, but that's fine: as the
+	# read loop won't be executed at all, it will return true, so the image
+	# is accepted (loading the first 1.5M of a remote image for this check seems
+	# a bit extreme)
+	dd if="$1" bs=1 skip=1511432 count=1024 2>/dev/null | while read line; do
+		[ "$line" == "$model_string" ] && break
+	done || {
+		echo "Unsupported image (model not in support-list)"
+		return 1
+	}
+
+	return 0
+}
+
+seama_get_type_magic() {
+	get_image "$@" | dd bs=1 count=4 skip=53 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+cybertan_get_image_magic() {
+	get_image "$@" | dd bs=8 count=1 skip=0  2>/dev/null | hexdump -v -n 8 -e '1/1 "%02x"'
+}
+
+cybertan_check_image() {
+	local magic="$(cybertan_get_image_magic "$1")"
+	local fw_magic="$(cybertan_get_hw_magic)"
+
+	[ "$fw_magic" != "$magic" ] && {
+		echo "Invalid image, ID mismatch, got:$magic, but need:$fw_magic"
+		return 1
+	}
+
+	return 0
+}
+
+platform_do_upgrade_compex() {
+	local fw_file=$1
+	local fw_part=$PART_NAME
+	local fw_mtd=$(find_mtd_part $fw_part)
+	local fw_length=0x$(dd if="$fw_file" bs=2 skip=1 count=4 2>/dev/null)
+	local fw_blocks=$(($fw_length / 65536))
+
+	if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
+		local append=""
+		[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+
+		sync
+		dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
+			mtd $append write - "$fw_part"
+	fi
+}
+
+alfa_check_image() {
+	local magic_long="$(get_magic_long "$1")"
+	local fw_part_size=$(mtd_get_part_size firmware)
+
+	case "$magic_long" in
+	"27051956")
+		[ "$fw_part_size" != "16318464" ] && {
+			echo "Invalid image magic \"$magic_long\" for $fw_part_size bytes"
+			return 1
+		}
+		;;
+
+	"68737173")
+		[ "$fw_part_size" != "7929856" ] && {
+			echo "Invalid image magic \"$magic_long\" for $fw_part_size bytes"
+			return 1
+		}
+		;;
+	esac
+
+	return 0
+}
+
+platform_check_image() {
+	local board=$(ar71xx_board_name)
+	local magic="$(get_magic_word "$1")"
+	local magic_long="$(get_magic_long "$1")"
+
+	[ "$#" -gt 1 ] && return 1
+
+	case "$board" in
+	all0315n | \
+	all0258n | \
+	cap4200ag)
+		platform_check_image_allnet "$1" && return 0
+		return 1
+		;;
+	alfa-ap96 | \
+	alfa-nx | \
+	ap113 | \
+	ap121 | \
+	ap121-mini | \
+	ap136-010 | \
+	ap136-020 | \
+	ap135-020 | \
+	ap96 | \
+	db120 | \
+	hornet-ub | \
+	bxu2000n-2-a1 | \
+	zcn-1523h-2 | \
+	zcn-1523h-5)
+		[ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	ap81 | \
+	ap83 | \
+	ap132 | \
+	dgl-5500-a1 |\
+	dhp-1565-a1 |\
+	dir-505-a1 | \
+	dir-600-a1 | \
+	dir-615-c1 | \
+	dir-615-e1 | \
+	dir-615-e4 | \
+	dir-825-c1 | \
+	dir-835-a1 | \
+	dragino2 | \
+	esr1750 | \
+	esr900 | \
+	ew-dorin | \
+	ew-dorin-router | \
+	hiwifi-hc6361 | \
+	hornet-ub-x2 | \
+	mzk-w04nu | \
+	mzk-w300nh | \
+	tew-632brp | \
+	tew-712br | \
+	tew-732br | \
+	wrt400n | \
+	airgateway | \
+	airrouter | \
+	bullet-m | \
+	loco-m-xw | \
+	nanostation-m | \
+	rocket-m | \
+	nanostation-m-xw | \
+	rw2458n | \
+	wndap360 | \
+	wzr-hp-g300nh2 | \
+	wzr-hp-g300nh | \
+	wzr-hp-g450h | \
+	wzr-hp-ag300h | \
+	wzr-450hp2 | \
+	whr-g301n | \
+	whr-hp-g300n | \
+	whr-hp-gn | \
+	wlae-ag300n | \
+	nbg460n_550n_550nh | \
+	unifi | \
+	unifi-outdoor | \
+	carambola2 )
+		[ "$magic" != "2705" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+
+	cpe510)
+		tplink_pharos_check_image "$1" && return 0
+		return 1
+		;;
+
+	dir-825-b1 | \
+	tew-673gru)
+		dir825b_check_image "$1" && return 0
+		;;
+
+	mynet-rext|\
+	wrt160nl)
+		cybertan_check_image "$1" && return 0
+		return 1
+		;;
+
+	qihoo-c301 | \
+	mynet-n600 | \
+	mynet-n750)
+		[ "$magic_long" != "5ea3a417" ] && {
+			echo "Invalid image, bad magic: $magic_long"
+			return 1
+		}
+
+		local typemagic=$(seama_get_type_magic "$1")
+		[ "$typemagic" != "6669726d" ] && {
+			echo "Invalid image, bad type: $typemagic"
+			return 1
+		}
+
+		return 0;
+		;;
+	mr600 | \
+	mr600v2 | \
+	mr900 | \
+	mr900v2 | \
+	om2p | \
+	om2pv2 | \
+	om2p-hs | \
+	om2p-hsv2 | \
+	om2p-lc | \
+	om5p)
+		platform_check_image_openmesh "$magic_long" "$1" && return 0
+		return 1
+		;;
+
+	archer-c5 | \
+	archer-c7 | \
+	el-m150 | \
+	el-mini | \
+	gl-inet | \
+	oolite | \
+	smart-300 | \
+	tl-mr10u | \
+	tl-mr11u | \
+	tl-mr13u | \
+	tl-mr3020 | \
+	tl-mr3040 | \
+	tl-mr3040-v2 | \
+	tl-mr3220 | \
+	tl-mr3220-v2 | \
+	tl-mr3420 | \
+	tl-mr3420-v2 | \
+	tl-wa7510n | \
+	tl-wa750re | \
+	tl-wa850re | \
+	tl-wa860re | \
+	tl-wa801nd-v2 | \
+	tl-wa901nd | \
+	tl-wa901nd-v2 | \
+	tl-wa901nd-v3 | \
+	tl-wdr3500 | \
+	tl-wdr4300 | \
+	tl-wdr4900-v2 | \
+	tl-wr703n | \
+	tl-wr710n | \
+	tl-wr720n-v3 | \
+	tl-wr741nd | \
+	tl-wr741nd-v4 | \
+	tl-wr841n-v1 | \
+	tl-wa830re-v2 | \
+	tl-wr841n-v7 | \
+	tl-wr841n-v8 | \
+	tl-wr841n-v9 | \
+	tl-wr842n-v2 | \
+	tl-wr941nd | \
+	tl-wr1041n-v2 | \
+	tl-wr1043nd | \
+	tl-wr1043nd-v2 | \
+	tl-wr2543n)
+		[ "$magic" != "0100" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+
+		local hwid
+		local imageid
+
+		hwid=$(tplink_get_hwid)
+		imageid=$(tplink_get_image_hwid "$1")
+
+		[ "$hwid" != "$imageid" ] && {
+			echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid."
+			return 1
+		}
+
+		local boot_size
+
+		boot_size=$(tplink_get_image_boot_size "$1")
+		[ "$boot_size" != "00000000" ] && {
+			echo "Invalid image, it contains a bootloader."
+			return 1
+		}
+
+		return 0
+		;;
+
+	tube2h)
+		alfa_check_image "$1" && return 0
+		return 1
+		;;
+
+	uap-pro)
+		[ "$magic_long" != "19852003" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+	wndr3700 | \
+	wnr2000-v3 | \
+	wnr612-v2)
+		local hw_magic
+
+		hw_magic="$(ar71xx_get_mtd_part_magic firmware)"
+		[ "$magic_long" != "$hw_magic" ] && {
+			echo "Invalid image, hardware ID mismatch, hw:$hw_magic image:$magic_long."
+			return 1
+		}
+		return 0
+		;;
+	nbg6716 | \
+	r6100 | \
+	wndr3700v4 | \
+	wndr4300 )
+		nand_do_platform_check $board $1
+		return $?;
+		;;
+	routerstation | \
+	routerstation-pro | \
+	ls-sr71 | \
+	pb42 | \
+	pb44 | \
+	all0305 | \
+	eap300v2 | \
+	eap7660d | \
+	ja76pf | \
+	ja76pf2 | \
+	jwap003 | \
+	wp543 | \
+	wpe72)
+		[ "$magic" != "4349" ] && {
+			echo "Invalid image. Use *-sysupgrade.bin files on this board"
+			return 1
+		}
+
+		local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null)
+		local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"
+
+		if [ -n "$md5_img" -a -n "$md5_chk" ] && [ "$md5_img" = "$md5_chk" ]; then
+			return 0
+		else
+			echo "Invalid image. Contents do not match checksum (image:$md5_img calculated:$md5_chk)"
+			return 1
+		fi
+		return 0
+		;;
+    wnr2000-v4)
+		[ "$magic_long" != "32303034" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+
+	esac
+
+	echo "Sysupgrade is not yet supported on $board."
+	return 1
+}
+
+platform_do_upgrade() {
+	local board=$(ar71xx_board_name)
+
+	case "$board" in
+	routerstation | \
+	routerstation-pro | \
+	ls-sr71 | \
+	all0305 | \
+	eap7660d | \
+	pb42 | \
+	pb44 | \
+	ja76pf | \
+	ja76pf2 | \
+	jwap003)
+		platform_do_upgrade_combined "$ARGV"
+		;;
+	wp543|\
+	wpe72)
+		platform_do_upgrade_compex "$ARGV"
+		;;
+	all0258n )
+		platform_do_upgrade_allnet "0x9f050000" "$ARGV"
+		;;
+	all0315n )
+		platform_do_upgrade_allnet "0x9f080000" "$ARGV"
+		;;
+	eap300v2 |\
+	cap4200ag)
+		platform_do_upgrade_allnet "0xbf0a0000" "$ARGV"
+		;;
+	dir-825-b1 |\
+	tew-673gru)
+		platform_do_upgrade_dir825b "$ARGV"
+		;;
+	mr600 | \
+	mr600v2 | \
+	mr900 | \
+	mr900v2 | \
+	om2p | \
+	om2pv2 | \
+	om2p-hs | \
+	om2p-hsv2 | \
+	om2p-lc | \
+	om5p)
+		platform_do_upgrade_openmesh "$ARGV"
+		;;
+	uap-pro)
+		MTD_CONFIG_ARGS="-s 0x180000"
+		default_do_upgrade "$ARGV"
+		;;
+	*)
+		default_do_upgrade "$ARGV"
+		;;
+	esac
+}
+
+disable_watchdog() {
+	killall watchdog
+	( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
+		echo 'Could not disable watchdog'
+		return 1
+	}
+}
+
+append sysupgrade_pre_upgrade disable_watchdog
diff --git a/trunk/target/linux/ar71xx/base-files/sbin/wget2nand b/trunk/target/linux/ar71xx/base-files/sbin/wget2nand
new file mode 100755
index 00000000..f9013b56
--- /dev/null
+++ b/trunk/target/linux/ar71xx/base-files/sbin/wget2nand
@@ -0,0 +1,85 @@
+#!/bin/sh
+# wget2nand
+# This script can be used to download a TGZ file from your build system which
+# contains the files to be installed on the NAND flash on your RB1xx card.
+# The one parameter is the URL of the TGZ file to be downloaded.
+# Licence GPL V2
+# Author david.goodenough@linkchoose.co.uk
+# Based on cf2nand from RB532 support
+. /lib/functions.sh
+
+wget2nand_dir=/tmp/wget2nand
+mnt_kernel=$wget2nand_dir/mnt_kernel
+mnt_rootfs=$wget2nand_dir/mnt_rootfs
+src_rootfs=$wget2nand_dir/rootfs.tgz
+src_kernel=$wget2nand_dir/kernel
+
+[ -d "$wget2nand_dir" ] && {
+	echo "$wget2nand_dir already exists"
+	exit 1
+}
+
+# need to find the wget server from the command line
+url=$1
+[ -z "$url" ] && {
+        echo "No URL specified for image TGZ"
+        echo "Usage : $0 URL"
+        exit 1
+}
+
+url_kernel=$url/librecmc-ar71xx-mikrotik-vmlinux-lzma.elf
+url_rootfs=$url/librecmc-ar71xx-mikrotik-rootfs.tar.gz
+
+mtd_kernel="$(find_mtd_part 'kernel')"
+mtd_rootfs="$(find_mtd_part 'rootfs')"
+[ -z "$mtd_kernel" -o -z "$mtd_rootfs" ] && {
+	echo "Cannot find NAND Flash partitions"
+	exit 1
+}
+
+mkdir "$wget2nand_dir"
+wget $url_kernel -O "$src_kernel" || {
+	echo "Unable to download $url_kernel"
+	exit 1
+}
+
+wget $url_rootfs -O "$src_rootfs" || {
+	echo "Unable to download $url_rootfs"
+	exit 1
+}
+
+echo "Erasing filesystem..."
+mtd erase kernel 2>/dev/null >/dev/null
+mtd erase rootfs 2>/dev/null >/dev/null
+
+echo "Mounting $mtd_rootfs as new root and $mtd_kernel as kernel partition"
+
+mkdir "$mnt_kernel"
+mkdir "$mnt_rootfs"
+mount -t yaffs2 "$mtd_kernel" "$mnt_kernel"
+mount -t yaffs2 "$mtd_rootfs" "$mnt_rootfs"
+
+echo "Copying kernel..."
+cp $src_kernel $mnt_kernel/kernel || {
+       echo "Error occured while copying the kernel"
+       exit 1
+}
+chmod +x $mnt_kernel/kernel
+
+echo "Preparing filesystem..."
+( cd "$mnt_rootfs"; tar xvz -f "$src_rootfs" )
+
+# make sure everything is written before we unmount the partitions
+echo "chmod ugo+x /" > $mnt_rootfs/etc/uci-defaults/set_root_permission
+sync
+ls $mnt_kernel >/dev/null
+ls $mnt_rootfs >/dev/null
+
+echo "Cleaning up..."
+# unmount the partitions and remove the directories into which they were mounted
+umount $mnt_kernel
+umount $mnt_rootfs
+rm -rf $wget2nand_dir
+
+# all done
+echo "Image written, you can now reboot.  Remember to change the boot source to Boot from Nand"
diff --git a/trunk/target/linux/ar71xx/config-3.14 b/trunk/target/linux/ar71xx/config-3.14
new file mode 100644
index 00000000..6c8d1f97
--- /dev/null
+++ b/trunk/target/linux/ar71xx/config-3.14
@@ -0,0 +1,308 @@
+CONFIG_AG71XX=y
+CONFIG_AG71XX_AR8216_SUPPORT=y
+# CONFIG_AG71XX_DEBUG is not set
+# CONFIG_AG71XX_DEBUG_FS is not set
+CONFIG_AR8216_PHY=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_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ATH79=y
+CONFIG_ATH79_DEV_AP9X_PCI=y
+CONFIG_ATH79_DEV_DSA=y
+CONFIG_ATH79_DEV_ETH=y
+CONFIG_ATH79_DEV_GPIO_BUTTONS=y
+CONFIG_ATH79_DEV_LEDS_GPIO=y
+CONFIG_ATH79_DEV_M25P80=y
+CONFIG_ATH79_DEV_NFC=y
+CONFIG_ATH79_DEV_SPI=y
+CONFIG_ATH79_DEV_USB=y
+CONFIG_ATH79_DEV_WMAC=y
+CONFIG_ATH79_MACH_ALFA_AP96=y
+CONFIG_ATH79_MACH_ALFA_NX=y
+CONFIG_ATH79_MACH_ALL0258N=y
+CONFIG_ATH79_MACH_ALL0315N=y
+CONFIG_ATH79_MACH_AP113=y
+CONFIG_ATH79_MACH_AP121=y
+CONFIG_ATH79_MACH_AP132=y
+CONFIG_ATH79_MACH_AP136=y
+CONFIG_ATH79_MACH_AP81=y
+CONFIG_ATH79_MACH_AP83=y
+CONFIG_ATH79_MACH_AP96=y
+CONFIG_ATH79_MACH_ARCHER_C7=y
+CONFIG_ATH79_MACH_AW_NR580=y
+CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y
+CONFIG_ATH79_MACH_CAP4200AG=y
+CONFIG_ATH79_MACH_CARAMBOLA2=y
+CONFIG_ATH79_MACH_CPE510=y
+CONFIG_ATH79_MACH_DB120=y
+CONFIG_ATH79_MACH_DGL_5500_A1=y
+CONFIG_ATH79_MACH_DHP_1565_A1=y
+CONFIG_ATH79_MACH_DIR_505_A1=y
+CONFIG_ATH79_MACH_DIR_600_A1=y
+CONFIG_ATH79_MACH_DIR_615_C1=y
+CONFIG_ATH79_MACH_DIR_825_B1=y
+CONFIG_ATH79_MACH_DIR_825_C1=y
+CONFIG_ATH79_MACH_DRAGINO2=y
+CONFIG_ATH79_MACH_EAP300V2=y
+CONFIG_ATH79_MACH_EAP7660D=y
+CONFIG_ATH79_MACH_EL_M150=y
+CONFIG_ATH79_MACH_EL_MINI=y
+CONFIG_ATH79_MACH_ESR1750=y
+CONFIG_ATH79_MACH_ESR900=y
+CONFIG_ATH79_MACH_EW_DORIN=y
+CONFIG_ATH79_MACH_GL_INET=y
+CONFIG_ATH79_MACH_GS_OOLITE=y
+CONFIG_ATH79_MACH_HIWIFI_HC6361=y
+CONFIG_ATH79_MACH_HORNET_UB=y
+CONFIG_ATH79_MACH_JA76PF=y
+CONFIG_ATH79_MACH_JWAP003=y
+CONFIG_ATH79_MACH_MR600=y
+CONFIG_ATH79_MACH_MR900=y
+CONFIG_ATH79_MACH_MYNET_N600=y
+CONFIG_ATH79_MACH_MYNET_N750=y
+CONFIG_ATH79_MACH_MYNET_REXT=y
+CONFIG_ATH79_MACH_MZK_W04NU=y
+CONFIG_ATH79_MACH_MZK_W300NH=y
+CONFIG_ATH79_MACH_NBG460N=y
+CONFIG_ATH79_MACH_NBG6716=y
+CONFIG_ATH79_MACH_OM2P=y
+CONFIG_ATH79_MACH_OM5P=y
+CONFIG_ATH79_MACH_PB42=y
+CONFIG_ATH79_MACH_PB44=y
+CONFIG_ATH79_MACH_PB92=y
+CONFIG_ATH79_MACH_QIHOO_C301=y
+CONFIG_ATH79_MACH_R6100=y
+# CONFIG_ATH79_MACH_RB2011 is not set
+# CONFIG_ATH79_MACH_RB4XX is not set
+# CONFIG_ATH79_MACH_RB750 is not set
+# CONFIG_ATH79_MACH_RB91X is not set
+# CONFIG_ATH79_MACH_RB95X is not set
+# CONFIG_ATH79_MACH_RBSXTLITE is not set
+CONFIG_ATH79_MACH_RW2458N=y
+CONFIG_ATH79_MACH_SMART_300=y
+CONFIG_ATH79_MACH_TEW_632BRP=y
+CONFIG_ATH79_MACH_TEW_673GRU=y
+CONFIG_ATH79_MACH_TEW_712BR=y
+CONFIG_ATH79_MACH_TEW_732BR=y
+CONFIG_ATH79_MACH_TL_MR11U=y
+CONFIG_ATH79_MACH_TL_MR13U=y
+CONFIG_ATH79_MACH_TL_MR3020=y
+CONFIG_ATH79_MACH_TL_MR3X20=y
+CONFIG_ATH79_MACH_TL_WA830RE_V2=y
+CONFIG_ATH79_MACH_TL_WA901ND=y
+CONFIG_ATH79_MACH_TL_WA901ND_V2=y
+CONFIG_ATH79_MACH_TL_WAX50RE=y
+CONFIG_ATH79_MACH_TL_WDR3500=y
+CONFIG_ATH79_MACH_TL_WDR4300=y
+CONFIG_ATH79_MACH_TL_WR1041N_V2=y
+CONFIG_ATH79_MACH_TL_WR1043ND=y
+CONFIG_ATH79_MACH_TL_WR1043ND_V2=y
+CONFIG_ATH79_MACH_TL_WR2543N=y
+CONFIG_ATH79_MACH_TL_WR703N=y
+CONFIG_ATH79_MACH_TL_WR720N_V3=y
+CONFIG_ATH79_MACH_TL_WR741ND=y
+CONFIG_ATH79_MACH_TL_WR741ND_V4=y
+CONFIG_ATH79_MACH_TL_WR841N_V1=y
+CONFIG_ATH79_MACH_TL_WR841N_V8=y
+CONFIG_ATH79_MACH_TL_WR841N_V9=y
+CONFIG_ATH79_MACH_TL_WR941ND=y
+CONFIG_ATH79_MACH_TUBE2H=y
+CONFIG_ATH79_MACH_UBNT=y
+CONFIG_ATH79_MACH_UBNT_XM=y
+CONFIG_ATH79_MACH_WHR_HP_G300N=y
+CONFIG_ATH79_MACH_WLAE_AG300N=y
+CONFIG_ATH79_MACH_WLR8100=y
+CONFIG_ATH79_MACH_WNDAP360=y
+CONFIG_ATH79_MACH_WNDR3700=y
+CONFIG_ATH79_MACH_WNDR4300=y
+CONFIG_ATH79_MACH_WNR2000=y
+CONFIG_ATH79_MACH_WNR2000_V3=y
+CONFIG_ATH79_MACH_WNR2000_V4=y
+CONFIG_ATH79_MACH_WNR2200=y
+CONFIG_ATH79_MACH_WP543=y
+CONFIG_ATH79_MACH_WPE72=y
+CONFIG_ATH79_MACH_WRT160NL=y
+CONFIG_ATH79_MACH_WRT400N=y
+CONFIG_ATH79_MACH_WZR_450HP2=y
+CONFIG_ATH79_MACH_WZR_HP_AG300H=y
+CONFIG_ATH79_MACH_WZR_HP_G300NH=y
+CONFIG_ATH79_MACH_WZR_HP_G300NH2=y
+CONFIG_ATH79_MACH_WZR_HP_G450H=y
+CONFIG_ATH79_MACH_ZCN_1523H=y
+CONFIG_ATH79_NVRAM=y
+CONFIG_ATH79_PCI_ATH9K_FIXUP=y
+# CONFIG_ATH79_ROUTERBOOT is not set
+CONFIG_ATH79_WDT=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CEVT_R4K=y
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd"
+CONFIG_CMDLINE_BOOL=y
+# CONFIG_CMDLINE_OVERRIDE is not set
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_CPU_GENERIC_DUMP_TLB=y
+CONFIG_CPU_HAS_PREFETCH=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPS32_R2=y
+CONFIG_CPU_MIPSR2=y
+CONFIG_CPU_R4K_CACHE_TLB=y
+CONFIG_CPU_R4K_FPU=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_CSRC_R4K=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_ETHERNET_PACKET_MANGLE=y
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CMOS_UPDATE=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_DEVRES=y
+# CONFIG_GPIO_LATCH is not set
+CONFIG_GPIO_NXP_74HC153=y
+CONFIG_GPIO_PCF857X=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_HARDWARE_WATCHPOINTS=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_KVM=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_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HW_HAS_PCI=y
+CONFIG_HZ_PERIODIC=y
+CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_GPIO=y
+CONFIG_IMAGE_CMDLINE_HACK=y
+CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_SOURCE="../../root"
+CONFIG_IP17XX_PHY=y
+CONFIG_IRQ_CPU=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_WNDR3700_USB is not set
+CONFIG_MARVELL_PHY=y
+CONFIG_MDIO_BOARDINFO=y
+CONFIG_MICREL_PHY=y
+CONFIG_MIPS=y
+# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+CONFIG_MIPS_MACHINE=y
+CONFIG_MIPS_MT_DISABLED=y
+# CONFIG_MIPS_O32_FP64_SUPPORT is not set
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_CFI_I2 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_M25P80=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+CONFIG_MTD_MYLOADER_PARTS=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_LZMA_FW=y
+CONFIG_MTD_SPLIT_SEAMA_FW=y
+CONFIG_MTD_SPLIT_UIMAGE_FW=y
+CONFIG_MTD_TPLINK_PARTS=y
+CONFIG_MTD_WRT160NL_PARTS=y
+CONFIG_MYLOADER=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6063=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
+CONFIG_PCI_AR724X=y
+CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PHYLIB=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RTL8306_PHY=y
+CONFIG_RTL8366RB_PHY=y
+CONFIG_RTL8366S_PHY=y
+CONFIG_RTL8366_SMI=y
+CONFIG_RTL8367_PHY=y
+# CONFIG_SCSI_DMA is not set
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
+CONFIG_SERIAL_AR933X=y
+CONFIG_SERIAL_AR933X_CONSOLE=y
+CONFIG_SERIAL_AR933X_NR_UARTS=2
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SOC_AR71XX=y
+CONFIG_SOC_AR724X=y
+CONFIG_SOC_AR913X=y
+CONFIG_SOC_AR933X=y
+CONFIG_SOC_AR934X=y
+CONFIG_SOC_QCA953X=y
+CONFIG_SOC_QCA955X=y
+CONFIG_SPI=y
+CONFIG_SPI_AP83=y
+CONFIG_SPI_ATH79=y
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_MASTER=y
+# CONFIG_SPI_VSC7385 is not set
+CONFIG_SWCONFIG=y
+CONFIG_SWCONFIG_LEDS=y
+CONFIG_SYS_HAS_CPU_MIPS32_R2=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_USB_SUPPORT=y
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
new file mode 100644
index 00000000..d382453b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
@@ -0,0 +1,159 @@
+/*
+ *  Atheros AP9X reference board PCI initialization
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/ath9k_platform.h>
+#include <linux/delay.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "pci-ath9k-fixup.h"
+#include "pci.h"
+
+static struct ath9k_platform_data ap9x_wmac0_data = {
+	.led_pin = -1,
+};
+static struct ath9k_platform_data ap9x_wmac1_data = {
+	.led_pin = -1,
+};
+static char ap9x_wmac0_mac[6];
+static char ap9x_wmac1_mac[6];
+
+__init void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin)
+{
+	switch (wmac) {
+	case 0:
+		ap9x_wmac0_data.led_pin = pin;
+		break;
+	case 1:
+		ap9x_wmac1_data.led_pin = pin;
+		break;
+	}
+}
+
+__init struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
+{
+	switch (wmac) {
+	case 0:
+		return &ap9x_wmac0_data;
+
+	case 1:
+		return &ap9x_wmac1_data;
+	}
+
+	return NULL;
+}
+
+__init void ap9x_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val)
+{
+	switch (wmac) {
+	case 0:
+		ap9x_wmac0_data.gpio_mask = mask;
+		ap9x_wmac0_data.gpio_val = val;
+		break;
+	case 1:
+		ap9x_wmac1_data.gpio_mask = mask;
+		ap9x_wmac1_data.gpio_val = val;
+		break;
+	}
+}
+
+__init void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
+				     int num_leds)
+{
+	switch (wmac) {
+	case 0:
+		ap9x_wmac0_data.leds = leds;
+		ap9x_wmac0_data.num_leds = num_leds;
+		break;
+	case 1:
+		ap9x_wmac1_data.leds = leds;
+		ap9x_wmac1_data.num_leds = num_leds;
+		break;
+	}
+}
+
+static int ap91_pci_plat_dev_init(struct pci_dev *dev)
+{
+	switch (PCI_SLOT(dev->devfn)) {
+	case 0:
+		dev->dev.platform_data = &ap9x_wmac0_data;
+		break;
+	}
+
+	return 0;
+}
+
+__init void ap91_pci_init(u8 *cal_data, u8 *mac_addr)
+{
+	if (cal_data)
+		memcpy(ap9x_wmac0_data.eeprom_data, cal_data,
+		       sizeof(ap9x_wmac0_data.eeprom_data));
+
+	if (mac_addr) {
+		memcpy(ap9x_wmac0_mac, mac_addr, sizeof(ap9x_wmac0_mac));
+		ap9x_wmac0_data.macaddr = ap9x_wmac0_mac;
+	}
+
+	ath79_pci_set_plat_dev_init(ap91_pci_plat_dev_init);
+	ath79_register_pci();
+
+	pci_enable_ath9k_fixup(0, ap9x_wmac0_data.eeprom_data);
+}
+
+__init void ap91_pci_init_simple(void)
+{
+	ap91_pci_init(NULL, NULL);
+	ap9x_wmac0_data.eeprom_name = "pci_wmac0.eeprom";
+}
+
+static int ap94_pci_plat_dev_init(struct pci_dev *dev)
+{
+	switch (PCI_SLOT(dev->devfn)) {
+	case 17:
+		dev->dev.platform_data = &ap9x_wmac0_data;
+		break;
+
+	case 18:
+		dev->dev.platform_data = &ap9x_wmac1_data;
+		break;
+	}
+
+	return 0;
+}
+
+__init void ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
+			  u8 *cal_data1, u8 *mac_addr1)
+{
+	if (cal_data0)
+		memcpy(ap9x_wmac0_data.eeprom_data, cal_data0,
+		       sizeof(ap9x_wmac0_data.eeprom_data));
+
+	if (cal_data1)
+		memcpy(ap9x_wmac1_data.eeprom_data, cal_data1,
+		       sizeof(ap9x_wmac1_data.eeprom_data));
+
+	if (mac_addr0) {
+		memcpy(ap9x_wmac0_mac, mac_addr0, sizeof(ap9x_wmac0_mac));
+		ap9x_wmac0_data.macaddr = ap9x_wmac0_mac;
+	}
+
+	if (mac_addr1) {
+		memcpy(ap9x_wmac1_mac, mac_addr1, sizeof(ap9x_wmac1_mac));
+		ap9x_wmac1_data.macaddr = ap9x_wmac1_mac;
+	}
+
+	ath79_pci_set_plat_dev_init(ap94_pci_plat_dev_init);
+	ath79_register_pci();
+
+	pci_enable_ath9k_fixup(17, ap9x_wmac0_data.eeprom_data);
+	pci_enable_ath9k_fixup(18, ap9x_wmac1_data.eeprom_data);
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
new file mode 100644
index 00000000..ad288cbd
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
@@ -0,0 +1,48 @@
+/*
+ *  Atheros AP9X reference board PCI initialization
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _ATH79_DEV_AP9X_PCI_H
+#define _ATH79_DEV_AP9X_PCI_H
+
+struct gpio_led;
+struct ath9k_platform_data;
+
+#if defined(CONFIG_ATH79_DEV_AP9X_PCI)
+void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin);
+void ap9x_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val);
+void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
+			      int num_leds);
+struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac);
+
+void ap91_pci_init(u8 *cal_data, u8 *mac_addr);
+void ap91_pci_init_simple(void);
+void ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
+		   u8 *cal_data1, u8 *mac_addr1);
+
+#else
+static inline void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin) {}
+static inline void ap9x_pci_setup_wmac_gpio(unsigned wmac,
+					    u32 mask, u32 val) {}
+static inline void ap9x_pci_setup_wmac_leds(unsigned wmac,
+					    struct gpio_led *leds,
+					    int num_leds) {}
+static inline struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
+{
+	return NULL;
+}
+
+static inline void ap91_pci_init(u8 *cal_data, u8 *mac_addr) {}
+static inline void ap91_pci_init_simple(void) {}
+static inline void ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
+				 u8 *cal_data1, u8 *mac_addr1) {}
+#endif
+
+#endif /* _ATH79_DEV_AP9X_PCI_H */
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c
new file mode 100644
index 00000000..17641473
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.c
@@ -0,0 +1,36 @@
+/*
+ *  Atheros AR71xx DSA switch device support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-dsa.h"
+
+static struct platform_device ar71xx_dsa_switch_device = {
+	.name		= "dsa",
+	.id		= 0,
+};
+
+void __init ath79_register_dsa(struct device *netdev,
+			       struct device *miidev,
+			       struct dsa_platform_data *d)
+{
+	int i;
+
+	d->netdev = netdev;
+	for (i = 0; i < d->nr_chips; i++)
+		d->chip[i].mii_bus = miidev;
+
+	ar71xx_dsa_switch_device.dev.platform_data = d;
+	platform_device_register(&ar71xx_dsa_switch_device);
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.h
new file mode 100644
index 00000000..3730202e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-dsa.h
@@ -0,0 +1,21 @@
+/*
+ *  Atheros AR71xx DSA switch device support
+ *
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _ATH79_DEV_DSA_H
+#define _ATH79_DEV_DSA_H
+
+#include <net/dsa.h>
+
+void ath79_register_dsa(struct device *netdev,
+			struct device *miidev,
+			struct dsa_platform_data *d);
+
+#endif /* _ATH79_DEV_DSA_H */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
new file mode 100644
index 00000000..c6842aad
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
@@ -0,0 +1,1209 @@
+/*
+ *  Atheros AR71xx SoC platform devices
+ *
+ *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Parts of this file are based on Atheros 2.6.15 BSP
+ *  Parts of this file are based on Atheros 2.6.31 BSP
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
+#include <linux/clk.h>
+#include <linux/sizes.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/irq.h>
+
+#include "common.h"
+#include "dev-eth.h"
+
+unsigned char ath79_mac_base[ETH_ALEN] __initdata;
+
+static struct resource ath79_mdio0_resources[] = {
+	{
+		.name	= "mdio_base",
+		.flags	= IORESOURCE_MEM,
+		.start	= AR71XX_GE0_BASE,
+		.end	= AR71XX_GE0_BASE + 0x200 - 1,
+	}
+};
+
+struct ag71xx_mdio_platform_data ath79_mdio0_data;
+
+struct platform_device ath79_mdio0_device = {
+	.name		= "ag71xx-mdio",
+	.id		= 0,
+	.resource	= ath79_mdio0_resources,
+	.num_resources	= ARRAY_SIZE(ath79_mdio0_resources),
+	.dev = {
+		.platform_data = &ath79_mdio0_data,
+	},
+};
+
+static struct resource ath79_mdio1_resources[] = {
+	{
+		.name	= "mdio_base",
+		.flags	= IORESOURCE_MEM,
+		.start	= AR71XX_GE1_BASE,
+		.end	= AR71XX_GE1_BASE + 0x200 - 1,
+	}
+};
+
+struct ag71xx_mdio_platform_data ath79_mdio1_data;
+
+struct platform_device ath79_mdio1_device = {
+	.name		= "ag71xx-mdio",
+	.id		= 1,
+	.resource	= ath79_mdio1_resources,
+	.num_resources	= ARRAY_SIZE(ath79_mdio1_resources),
+	.dev = {
+		.platform_data = &ath79_mdio1_data,
+	},
+};
+
+static void ath79_set_pll(u32 cfg_reg, u32 pll_reg, u32 pll_val, u32 shift)
+{
+	void __iomem *base;
+	u32 t;
+
+	base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
+
+	t = __raw_readl(base + cfg_reg);
+	t &= ~(3 << shift);
+	t |=  (2 << shift);
+	__raw_writel(t, base + cfg_reg);
+	udelay(100);
+
+	__raw_writel(pll_val, base + pll_reg);
+
+	t |= (3 << shift);
+	__raw_writel(t, base + cfg_reg);
+	udelay(100);
+
+	t &= ~(3 << shift);
+	__raw_writel(t, base + cfg_reg);
+	udelay(100);
+
+	printk(KERN_DEBUG "ar71xx: pll_reg %#x: %#x\n",
+		(unsigned int)(base + pll_reg), __raw_readl(base + pll_reg));
+
+	iounmap(base);
+}
+
+static void __init ath79_mii_ctrl_set_if(unsigned int reg,
+					  unsigned int mii_if)
+{
+	void __iomem *base;
+	u32 t;
+
+	base = ioremap(AR71XX_MII_BASE, AR71XX_MII_SIZE);
+
+	t = __raw_readl(base + reg);
+	t &= ~(AR71XX_MII_CTRL_IF_MASK);
+	t |= (mii_if & AR71XX_MII_CTRL_IF_MASK);
+	__raw_writel(t, base + reg);
+
+	iounmap(base);
+}
+
+static void ath79_mii_ctrl_set_speed(unsigned int reg, unsigned int speed)
+{
+	void __iomem *base;
+	unsigned int mii_speed;
+	u32 t;
+
+	switch (speed) {
+	case SPEED_10:
+		mii_speed =  AR71XX_MII_CTRL_SPEED_10;
+		break;
+	case SPEED_100:
+		mii_speed =  AR71XX_MII_CTRL_SPEED_100;
+		break;
+	case SPEED_1000:
+		mii_speed =  AR71XX_MII_CTRL_SPEED_1000;
+		break;
+	default:
+		BUG();
+	}
+
+	base = ioremap(AR71XX_MII_BASE, AR71XX_MII_SIZE);
+
+	t = __raw_readl(base + reg);
+	t &= ~(AR71XX_MII_CTRL_SPEED_MASK << AR71XX_MII_CTRL_SPEED_SHIFT);
+	t |= mii_speed  << AR71XX_MII_CTRL_SPEED_SHIFT;
+	__raw_writel(t, base + reg);
+
+	iounmap(base);
+}
+
+static unsigned long ar934x_get_mdio_ref_clock(void)
+{
+	void __iomem *base;
+	unsigned long ret;
+	u32 t;
+
+	base = ioremap(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
+
+	ret = 0;
+	t = __raw_readl(base + AR934X_PLL_SWITCH_CLOCK_CONTROL_REG);
+	if (t & AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL) {
+		ret = 100 * 1000 * 1000;
+	} else {
+		struct clk *clk;
+
+		clk = clk_get(NULL, "ref");
+		if (!IS_ERR(clk))
+			ret = clk_get_rate(clk);
+	}
+
+	iounmap(base);
+
+	return ret;
+}
+
+void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
+{
+	struct platform_device *mdio_dev;
+	struct ag71xx_mdio_platform_data *mdio_data;
+	unsigned int max_id;
+
+	if (ath79_soc == ATH79_SOC_AR9341 ||
+	    ath79_soc == ATH79_SOC_AR9342 ||
+	    ath79_soc == ATH79_SOC_AR9344 ||
+	    ath79_soc == ATH79_SOC_QCA9556 ||
+	    ath79_soc == ATH79_SOC_QCA9558)
+		max_id = 1;
+	else
+		max_id = 0;
+
+	if (id > max_id) {
+		printk(KERN_ERR "ar71xx: invalid MDIO id %u\n", id);
+		return;
+	}
+
+	switch (ath79_soc) {
+	case ATH79_SOC_AR7241:
+	case ATH79_SOC_AR9330:
+	case ATH79_SOC_AR9331:
+	case ATH79_SOC_QCA9533:
+		mdio_dev = &ath79_mdio1_device;
+		mdio_data = &ath79_mdio1_data;
+		break;
+
+	case ATH79_SOC_AR9341:
+	case ATH79_SOC_AR9342:
+	case ATH79_SOC_AR9344:
+	case ATH79_SOC_QCA9556:
+	case ATH79_SOC_QCA9558:
+		if (id == 0) {
+			mdio_dev = &ath79_mdio0_device;
+			mdio_data = &ath79_mdio0_data;
+		} else {
+			mdio_dev = &ath79_mdio1_device;
+			mdio_data = &ath79_mdio1_data;
+		}
+		break;
+
+	case ATH79_SOC_AR7242:
+		ath79_set_pll(AR71XX_PLL_REG_SEC_CONFIG,
+			       AR7242_PLL_REG_ETH0_INT_CLOCK, 0x62000000,
+			       AR71XX_ETH0_PLL_SHIFT);
+		/* fall through */
+	default:
+		mdio_dev = &ath79_mdio0_device;
+		mdio_data = &ath79_mdio0_data;
+		break;
+	}
+
+	mdio_data->phy_mask = phy_mask;
+
+	switch (ath79_soc) {
+	case ATH79_SOC_AR7240:
+		mdio_data->is_ar7240 = 1;
+		/* fall through */
+	case ATH79_SOC_AR7241:
+		mdio_data->builtin_switch = 1;
+		break;
+
+	case ATH79_SOC_AR9330:
+		mdio_data->is_ar9330 = 1;
+		/* fall through */
+	case ATH79_SOC_AR9331:
+		mdio_data->builtin_switch = 1;
+		break;
+
+	case ATH79_SOC_AR9341:
+	case ATH79_SOC_AR9342:
+	case ATH79_SOC_AR9344:
+		if (id == 1) {
+			mdio_data->builtin_switch = 1;
+			mdio_data->ref_clock = ar934x_get_mdio_ref_clock();
+			mdio_data->mdio_clock = 6250000;
+		}
+		mdio_data->is_ar934x = 1;
+		break;
+
+	case ATH79_SOC_QCA9533:
+		mdio_data->builtin_switch = 1;
+		break;
+
+	case ATH79_SOC_QCA9556:
+	case ATH79_SOC_QCA9558:
+		mdio_data->is_ar934x = 1;
+		break;
+
+	default:
+		break;
+	}
+
+	platform_device_register(mdio_dev);
+}
+
+struct ath79_eth_pll_data ath79_eth0_pll_data;
+struct ath79_eth_pll_data ath79_eth1_pll_data;
+
+static u32 ath79_get_eth_pll(unsigned int mac, int speed)
+{
+	struct ath79_eth_pll_data *pll_data;
+	u32 pll_val;
+
+	switch (mac) {
+	case 0:
+		pll_data = &ath79_eth0_pll_data;
+		break;
+	case 1:
+		pll_data = &ath79_eth1_pll_data;
+		break;
+	default:
+		BUG();
+	}
+
+	switch (speed) {
+	case SPEED_10:
+		pll_val = pll_data->pll_10;
+		break;
+	case SPEED_100:
+		pll_val = pll_data->pll_100;
+		break;
+	case SPEED_1000:
+		pll_val = pll_data->pll_1000;
+		break;
+	default:
+		BUG();
+	}
+
+	return pll_val;
+}
+
+static void ath79_set_speed_ge0(int speed)
+{
+	u32 val = ath79_get_eth_pll(0, speed);
+
+	ath79_set_pll(AR71XX_PLL_REG_SEC_CONFIG, AR71XX_PLL_REG_ETH0_INT_CLOCK,
+			val, AR71XX_ETH0_PLL_SHIFT);
+	ath79_mii_ctrl_set_speed(AR71XX_MII_REG_MII0_CTRL, speed);
+}
+
+static void ath79_set_speed_ge1(int speed)
+{
+	u32 val = ath79_get_eth_pll(1, speed);
+
+	ath79_set_pll(AR71XX_PLL_REG_SEC_CONFIG, AR71XX_PLL_REG_ETH1_INT_CLOCK,
+			 val, AR71XX_ETH1_PLL_SHIFT);
+	ath79_mii_ctrl_set_speed(AR71XX_MII_REG_MII1_CTRL, speed);
+}
+
+static void ar7242_set_speed_ge0(int speed)
+{
+	u32 val = ath79_get_eth_pll(0, speed);
+	void __iomem *base;
+
+	base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
+	__raw_writel(val, base + AR7242_PLL_REG_ETH0_INT_CLOCK);
+	iounmap(base);
+}
+
+static void ar91xx_set_speed_ge0(int speed)
+{
+	u32 val = ath79_get_eth_pll(0, speed);
+
+	ath79_set_pll(AR913X_PLL_REG_ETH_CONFIG, AR913X_PLL_REG_ETH0_INT_CLOCK,
+			 val, AR913X_ETH0_PLL_SHIFT);
+	ath79_mii_ctrl_set_speed(AR71XX_MII_REG_MII0_CTRL, speed);
+}
+
+static void ar91xx_set_speed_ge1(int speed)
+{
+	u32 val = ath79_get_eth_pll(1, speed);
+
+	ath79_set_pll(AR913X_PLL_REG_ETH_CONFIG, AR913X_PLL_REG_ETH1_INT_CLOCK,
+			 val, AR913X_ETH1_PLL_SHIFT);
+	ath79_mii_ctrl_set_speed(AR71XX_MII_REG_MII1_CTRL, speed);
+}
+
+static void ar934x_set_speed_ge0(int speed)
+{
+	void __iomem *base;
+	u32 val = ath79_get_eth_pll(0, speed);
+
+	base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
+	__raw_writel(val, base + AR934X_PLL_ETH_XMII_CONTROL_REG);
+	iounmap(base);
+}
+
+static void qca955x_set_speed_xmii(int speed)
+{
+	void __iomem *base;
+	u32 val = ath79_get_eth_pll(0, speed);
+
+	base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
+	__raw_writel(val, base + QCA955X_PLL_ETH_XMII_CONTROL_REG);
+	iounmap(base);
+}
+
+static void qca955x_set_speed_sgmii(int speed)
+{
+	void __iomem *base;
+	u32 val = ath79_get_eth_pll(1, speed);
+
+	base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
+	__raw_writel(val, base + QCA955X_PLL_ETH_SGMII_CONTROL_REG);
+	iounmap(base);
+}
+
+static void ath79_set_speed_dummy(int speed)
+{
+}
+
+static void ath79_ddr_no_flush(void)
+{
+}
+
+static void ath79_ddr_flush_ge0(void)
+{
+	ath79_ddr_wb_flush(AR71XX_DDR_REG_FLUSH_GE0);
+}
+
+static void ath79_ddr_flush_ge1(void)
+{
+	ath79_ddr_wb_flush(AR71XX_DDR_REG_FLUSH_GE1);
+}
+
+static void ar724x_ddr_flush_ge0(void)
+{
+	ath79_ddr_wb_flush(AR724X_DDR_REG_FLUSH_GE0);
+}
+
+static void ar724x_ddr_flush_ge1(void)
+{
+	ath79_ddr_wb_flush(AR724X_DDR_REG_FLUSH_GE1);
+}
+
+static void ar91xx_ddr_flush_ge0(void)
+{
+	ath79_ddr_wb_flush(AR913X_DDR_REG_FLUSH_GE0);
+}
+
+static void ar91xx_ddr_flush_ge1(void)
+{
+	ath79_ddr_wb_flush(AR913X_DDR_REG_FLUSH_GE1);
+}
+
+static void ar933x_ddr_flush_ge0(void)
+{
+	ath79_ddr_wb_flush(AR933X_DDR_REG_FLUSH_GE0);
+}
+
+static void ar933x_ddr_flush_ge1(void)
+{
+	ath79_ddr_wb_flush(AR933X_DDR_REG_FLUSH_GE1);
+}
+
+static struct resource ath79_eth0_resources[] = {
+	{
+		.name	= "mac_base",
+		.flags	= IORESOURCE_MEM,
+		.start	= AR71XX_GE0_BASE,
+		.end	= AR71XX_GE0_BASE + 0x200 - 1,
+	}, {
+		.name	= "mac_irq",
+		.flags	= IORESOURCE_IRQ,
+		.start	= ATH79_CPU_IRQ(4),
+		.end	= ATH79_CPU_IRQ(4),
+	},
+};
+
+struct ag71xx_platform_data ath79_eth0_data = {
+	.reset_bit	= AR71XX_RESET_GE0_MAC,
+};
+
+struct platform_device ath79_eth0_device = {
+	.name		= "ag71xx",
+	.id		= 0,
+	.resource	= ath79_eth0_resources,
+	.num_resources	= ARRAY_SIZE(ath79_eth0_resources),
+	.dev = {
+		.platform_data = &ath79_eth0_data,
+	},
+};
+
+static struct resource ath79_eth1_resources[] = {
+	{
+		.name	= "mac_base",
+		.flags	= IORESOURCE_MEM,
+		.start	= AR71XX_GE1_BASE,
+		.end	= AR71XX_GE1_BASE + 0x200 - 1,
+	}, {
+		.name	= "mac_irq",
+		.flags	= IORESOURCE_IRQ,
+		.start	= ATH79_CPU_IRQ(5),
+		.end	= ATH79_CPU_IRQ(5),
+	},
+};
+
+struct ag71xx_platform_data ath79_eth1_data = {
+	.reset_bit	= AR71XX_RESET_GE1_MAC,
+};
+
+struct platform_device ath79_eth1_device = {
+	.name		= "ag71xx",
+	.id		= 1,
+	.resource	= ath79_eth1_resources,
+	.num_resources	= ARRAY_SIZE(ath79_eth1_resources),
+	.dev = {
+		.platform_data = &ath79_eth1_data,
+	},
+};
+
+struct ag71xx_switch_platform_data ath79_switch_data;
+
+#define AR71XX_PLL_VAL_1000	0x00110000
+#define AR71XX_PLL_VAL_100	0x00001099
+#define AR71XX_PLL_VAL_10	0x00991099
+
+#define AR724X_PLL_VAL_1000	0x00110000
+#define AR724X_PLL_VAL_100	0x00001099
+#define AR724X_PLL_VAL_10	0x00991099
+
+#define AR7242_PLL_VAL_1000	0x16000000
+#define AR7242_PLL_VAL_100	0x00000101
+#define AR7242_PLL_VAL_10	0x00001616
+
+#define AR913X_PLL_VAL_1000	0x1a000000
+#define AR913X_PLL_VAL_100	0x13000a44
+#define AR913X_PLL_VAL_10	0x00441099
+
+#define AR933X_PLL_VAL_1000	0x00110000
+#define AR933X_PLL_VAL_100	0x00001099
+#define AR933X_PLL_VAL_10	0x00991099
+
+#define AR934X_PLL_VAL_1000	0x16000000
+#define AR934X_PLL_VAL_100	0x00000101
+#define AR934X_PLL_VAL_10	0x00001616
+
+static void __init ath79_init_eth_pll_data(unsigned int id)
+{
+	struct ath79_eth_pll_data *pll_data;
+	u32 pll_10, pll_100, pll_1000;
+
+	switch (id) {
+	case 0:
+		pll_data = &ath79_eth0_pll_data;
+		break;
+	case 1:
+		pll_data = &ath79_eth1_pll_data;
+		break;
+	default:
+		BUG();
+	}
+
+	switch (ath79_soc) {
+	case ATH79_SOC_AR7130:
+	case ATH79_SOC_AR7141:
+	case ATH79_SOC_AR7161:
+		pll_10 = AR71XX_PLL_VAL_10;
+		pll_100 = AR71XX_PLL_VAL_100;
+		pll_1000 = AR71XX_PLL_VAL_1000;
+		break;
+
+	case ATH79_SOC_AR7240:
+	case ATH79_SOC_AR7241:
+		pll_10 = AR724X_PLL_VAL_10;
+		pll_100 = AR724X_PLL_VAL_100;
+		pll_1000 = AR724X_PLL_VAL_1000;
+		break;
+
+	case ATH79_SOC_AR7242:
+		pll_10 = AR7242_PLL_VAL_10;
+		pll_100 = AR7242_PLL_VAL_100;
+		pll_1000 = AR7242_PLL_VAL_1000;
+		break;
+
+	case ATH79_SOC_AR9130:
+	case ATH79_SOC_AR9132:
+		pll_10 = AR913X_PLL_VAL_10;
+		pll_100 = AR913X_PLL_VAL_100;
+		pll_1000 = AR913X_PLL_VAL_1000;
+		break;
+
+	case ATH79_SOC_AR9330:
+	case ATH79_SOC_AR9331:
+		pll_10 = AR933X_PLL_VAL_10;
+		pll_100 = AR933X_PLL_VAL_100;
+		pll_1000 = AR933X_PLL_VAL_1000;
+		break;
+
+	case ATH79_SOC_AR9341:
+	case ATH79_SOC_AR9342:
+	case ATH79_SOC_AR9344:
+	case ATH79_SOC_QCA9533:
+	case ATH79_SOC_QCA9556:
+	case ATH79_SOC_QCA9558:
+		pll_10 = AR934X_PLL_VAL_10;
+		pll_100 = AR934X_PLL_VAL_100;
+		pll_1000 = AR934X_PLL_VAL_1000;
+		break;
+
+	default:
+		BUG();
+	}
+
+	if (!pll_data->pll_10)
+		pll_data->pll_10 = pll_10;
+
+	if (!pll_data->pll_100)
+		pll_data->pll_100 = pll_100;
+
+	if (!pll_data->pll_1000)
+		pll_data->pll_1000 = pll_1000;
+}
+
+static int __init ath79_setup_phy_if_mode(unsigned int id,
+					   struct ag71xx_platform_data *pdata)
+{
+	unsigned int mii_if;
+
+	switch (id) {
+	case 0:
+		switch (ath79_soc) {
+		case ATH79_SOC_AR7130:
+		case ATH79_SOC_AR7141:
+		case ATH79_SOC_AR7161:
+		case ATH79_SOC_AR9130:
+		case ATH79_SOC_AR9132:
+			switch (pdata->phy_if_mode) {
+			case PHY_INTERFACE_MODE_MII:
+				mii_if = AR71XX_MII0_CTRL_IF_MII;
+				break;
+			case PHY_INTERFACE_MODE_GMII:
+				mii_if = AR71XX_MII0_CTRL_IF_GMII;
+				break;
+			case PHY_INTERFACE_MODE_RGMII:
+				mii_if = AR71XX_MII0_CTRL_IF_RGMII;
+				break;
+			case PHY_INTERFACE_MODE_RMII:
+				mii_if = AR71XX_MII0_CTRL_IF_RMII;
+				break;
+			default:
+				return -EINVAL;
+			}
+			ath79_mii_ctrl_set_if(AR71XX_MII_REG_MII0_CTRL, mii_if);
+			break;
+
+		case ATH79_SOC_AR7240:
+		case ATH79_SOC_AR7241:
+		case ATH79_SOC_AR9330:
+		case ATH79_SOC_AR9331:
+		case ATH79_SOC_QCA9533:
+			pdata->phy_if_mode = PHY_INTERFACE_MODE_MII;
+			break;
+
+		case ATH79_SOC_AR7242:
+			/* FIXME */
+
+		case ATH79_SOC_AR9341:
+		case ATH79_SOC_AR9342:
+		case ATH79_SOC_AR9344:
+			switch (pdata->phy_if_mode) {
+			case PHY_INTERFACE_MODE_MII:
+			case PHY_INTERFACE_MODE_GMII:
+			case PHY_INTERFACE_MODE_RGMII:
+			case PHY_INTERFACE_MODE_RMII:
+				break;
+			default:
+				return -EINVAL;
+			}
+			break;
+
+		case ATH79_SOC_QCA9556:
+		case ATH79_SOC_QCA9558:
+			switch (pdata->phy_if_mode) {
+			case PHY_INTERFACE_MODE_MII:
+			case PHY_INTERFACE_MODE_RGMII:
+			case PHY_INTERFACE_MODE_SGMII:
+				break;
+			default:
+				return -EINVAL;
+			}
+			break;
+
+		default:
+			BUG();
+		}
+		break;
+	case 1:
+		switch (ath79_soc) {
+		case ATH79_SOC_AR7130:
+		case ATH79_SOC_AR7141:
+		case ATH79_SOC_AR7161:
+		case ATH79_SOC_AR9130:
+		case ATH79_SOC_AR9132:
+			switch (pdata->phy_if_mode) {
+			case PHY_INTERFACE_MODE_RMII:
+				mii_if = AR71XX_MII1_CTRL_IF_RMII;
+				break;
+			case PHY_INTERFACE_MODE_RGMII:
+				mii_if = AR71XX_MII1_CTRL_IF_RGMII;
+				break;
+			default:
+				return -EINVAL;
+			}
+			ath79_mii_ctrl_set_if(AR71XX_MII_REG_MII1_CTRL, mii_if);
+			break;
+
+		case ATH79_SOC_AR7240:
+		case ATH79_SOC_AR7241:
+		case ATH79_SOC_AR9330:
+		case ATH79_SOC_AR9331:
+		case ATH79_SOC_QCA9533:
+			pdata->phy_if_mode = PHY_INTERFACE_MODE_GMII;
+			break;
+
+		case ATH79_SOC_AR7242:
+			/* FIXME */
+
+		case ATH79_SOC_AR9341:
+		case ATH79_SOC_AR9342:
+		case ATH79_SOC_AR9344:
+			switch (pdata->phy_if_mode) {
+			case PHY_INTERFACE_MODE_MII:
+			case PHY_INTERFACE_MODE_GMII:
+				break;
+			default:
+				return -EINVAL;
+			}
+			break;
+
+		case ATH79_SOC_QCA9556:
+		case ATH79_SOC_QCA9558:
+			switch (pdata->phy_if_mode) {
+			case PHY_INTERFACE_MODE_MII:
+			case PHY_INTERFACE_MODE_RGMII:
+			case PHY_INTERFACE_MODE_SGMII:
+				break;
+			default:
+				return -EINVAL;
+			}
+			break;
+
+		default:
+			BUG();
+		}
+		break;
+	}
+
+	return 0;
+}
+
+void __init ath79_setup_ar933x_phy4_switch(bool mac, bool mdio)
+{
+	void __iomem *base;
+	u32 t;
+
+	base = ioremap(AR933X_GMAC_BASE, AR933X_GMAC_SIZE);
+
+	t = __raw_readl(base + AR933X_GMAC_REG_ETH_CFG);
+	t &= ~(AR933X_ETH_CFG_SW_PHY_SWAP | AR933X_ETH_CFG_SW_PHY_ADDR_SWAP);
+	if (mac)
+		t |= AR933X_ETH_CFG_SW_PHY_SWAP;
+	if (mdio)
+		t |= AR933X_ETH_CFG_SW_PHY_ADDR_SWAP;
+	__raw_writel(t, base + AR933X_GMAC_REG_ETH_CFG);
+
+	iounmap(base);
+}
+
+void __init ath79_setup_ar934x_eth_cfg(u32 mask)
+{
+	void __iomem *base;
+	u32 t;
+
+	base = ioremap(AR934X_GMAC_BASE, AR934X_GMAC_SIZE);
+
+	t = __raw_readl(base + AR934X_GMAC_REG_ETH_CFG);
+
+	t &= ~(AR934X_ETH_CFG_RGMII_GMAC0 |
+	       AR934X_ETH_CFG_MII_GMAC0 |
+	       AR934X_ETH_CFG_GMII_GMAC0 |
+	       AR934X_ETH_CFG_SW_ONLY_MODE |
+	       AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	t |= mask;
+
+	__raw_writel(t, base + AR934X_GMAC_REG_ETH_CFG);
+	/* flush write */
+	__raw_readl(base + AR934X_GMAC_REG_ETH_CFG);
+
+	iounmap(base);
+}
+
+void __init ath79_setup_qca955x_eth_cfg(u32 mask)
+{
+	void __iomem *base;
+	u32 t;
+
+	base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
+
+	t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
+
+	t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
+
+	t |= mask;
+
+	__raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
+
+	iounmap(base);
+}
+
+static int ath79_eth_instance __initdata;
+void __init ath79_register_eth(unsigned int id)
+{
+	struct platform_device *pdev;
+	struct ag71xx_platform_data *pdata;
+	int err;
+
+	if (id > 1) {
+		printk(KERN_ERR "ar71xx: invalid ethernet id %d\n", id);
+		return;
+	}
+
+	ath79_init_eth_pll_data(id);
+
+	if (id == 0)
+		pdev = &ath79_eth0_device;
+	else
+		pdev = &ath79_eth1_device;
+
+	pdata = pdev->dev.platform_data;
+
+	pdata->max_frame_len = 1540;
+	pdata->desc_pktlen_mask = 0xfff;
+
+	err = ath79_setup_phy_if_mode(id, pdata);
+	if (err) {
+		printk(KERN_ERR
+		       "ar71xx: invalid PHY interface mode for GE%u\n", id);
+		return;
+	}
+
+	switch (ath79_soc) {
+	case ATH79_SOC_AR7130:
+		if (id == 0) {
+			pdata->ddr_flush = ath79_ddr_flush_ge0;
+			pdata->set_speed = ath79_set_speed_ge0;
+		} else {
+			pdata->ddr_flush = ath79_ddr_flush_ge1;
+			pdata->set_speed = ath79_set_speed_ge1;
+		}
+		break;
+
+	case ATH79_SOC_AR7141:
+	case ATH79_SOC_AR7161:
+		if (id == 0) {
+			pdata->ddr_flush = ath79_ddr_flush_ge0;
+			pdata->set_speed = ath79_set_speed_ge0;
+		} else {
+			pdata->ddr_flush = ath79_ddr_flush_ge1;
+			pdata->set_speed = ath79_set_speed_ge1;
+		}
+		pdata->has_gbit = 1;
+		break;
+
+	case ATH79_SOC_AR7242:
+		if (id == 0) {
+			pdata->reset_bit |= AR724X_RESET_GE0_MDIO |
+					    AR71XX_RESET_GE0_PHY;
+			pdata->ddr_flush = ar724x_ddr_flush_ge0;
+			pdata->set_speed = ar7242_set_speed_ge0;
+		} else {
+			pdata->reset_bit |= AR724X_RESET_GE1_MDIO |
+					    AR71XX_RESET_GE1_PHY;
+			pdata->ddr_flush = ar724x_ddr_flush_ge1;
+			pdata->set_speed = ath79_set_speed_dummy;
+		}
+		pdata->has_gbit = 1;
+		pdata->is_ar724x = 1;
+
+		if (!pdata->fifo_cfg1)
+			pdata->fifo_cfg1 = 0x0010ffff;
+		if (!pdata->fifo_cfg2)
+			pdata->fifo_cfg2 = 0x015500aa;
+		if (!pdata->fifo_cfg3)
+			pdata->fifo_cfg3 = 0x01f00140;
+		break;
+
+	case ATH79_SOC_AR7241:
+		if (id == 0)
+			pdata->reset_bit |= AR724X_RESET_GE0_MDIO;
+		else
+			pdata->reset_bit |= AR724X_RESET_GE1_MDIO;
+		/* fall through */
+	case ATH79_SOC_AR7240:
+		if (id == 0) {
+			pdata->reset_bit |= AR71XX_RESET_GE0_PHY;
+			pdata->ddr_flush = ar724x_ddr_flush_ge0;
+			pdata->set_speed = ath79_set_speed_dummy;
+
+			pdata->phy_mask = BIT(4);
+		} else {
+			pdata->reset_bit |= AR71XX_RESET_GE1_PHY;
+			pdata->ddr_flush = ar724x_ddr_flush_ge1;
+			pdata->set_speed = ath79_set_speed_dummy;
+
+			pdata->speed = SPEED_1000;
+			pdata->duplex = DUPLEX_FULL;
+			pdata->switch_data = &ath79_switch_data;
+
+			ath79_switch_data.phy_poll_mask |= BIT(4);
+		}
+		pdata->has_gbit = 1;
+		pdata->is_ar724x = 1;
+		if (ath79_soc == ATH79_SOC_AR7240)
+			pdata->is_ar7240 = 1;
+
+		if (!pdata->fifo_cfg1)
+			pdata->fifo_cfg1 = 0x0010ffff;
+		if (!pdata->fifo_cfg2)
+			pdata->fifo_cfg2 = 0x015500aa;
+		if (!pdata->fifo_cfg3)
+			pdata->fifo_cfg3 = 0x01f00140;
+		break;
+
+	case ATH79_SOC_AR9130:
+		if (id == 0) {
+			pdata->ddr_flush = ar91xx_ddr_flush_ge0;
+			pdata->set_speed = ar91xx_set_speed_ge0;
+		} else {
+			pdata->ddr_flush = ar91xx_ddr_flush_ge1;
+			pdata->set_speed = ar91xx_set_speed_ge1;
+		}
+		pdata->is_ar91xx = 1;
+		break;
+
+	case ATH79_SOC_AR9132:
+		if (id == 0) {
+			pdata->ddr_flush = ar91xx_ddr_flush_ge0;
+			pdata->set_speed = ar91xx_set_speed_ge0;
+		} else {
+			pdata->ddr_flush = ar91xx_ddr_flush_ge1;
+			pdata->set_speed = ar91xx_set_speed_ge1;
+		}
+		pdata->is_ar91xx = 1;
+		pdata->has_gbit = 1;
+		break;
+
+	case ATH79_SOC_AR9330:
+	case ATH79_SOC_AR9331:
+		if (id == 0) {
+			pdata->reset_bit = AR933X_RESET_GE0_MAC |
+					   AR933X_RESET_GE0_MDIO;
+			pdata->ddr_flush = ar933x_ddr_flush_ge0;
+			pdata->set_speed = ath79_set_speed_dummy;
+
+			pdata->phy_mask = BIT(4);
+		} else {
+			pdata->reset_bit = AR933X_RESET_GE1_MAC |
+					   AR933X_RESET_GE1_MDIO;
+			pdata->ddr_flush = ar933x_ddr_flush_ge1;
+			pdata->set_speed = ath79_set_speed_dummy;
+
+			pdata->speed = SPEED_1000;
+			pdata->has_gbit = 1;
+			pdata->duplex = DUPLEX_FULL;
+			pdata->switch_data = &ath79_switch_data;
+
+			ath79_switch_data.phy_poll_mask |= BIT(4);
+		}
+
+		pdata->is_ar724x = 1;
+
+		if (!pdata->fifo_cfg1)
+			pdata->fifo_cfg1 = 0x0010ffff;
+		if (!pdata->fifo_cfg2)
+			pdata->fifo_cfg2 = 0x015500aa;
+		if (!pdata->fifo_cfg3)
+			pdata->fifo_cfg3 = 0x01f00140;
+		break;
+
+	case ATH79_SOC_AR9341:
+	case ATH79_SOC_AR9342:
+	case ATH79_SOC_AR9344:
+		if (id == 0) {
+			pdata->reset_bit = AR934X_RESET_GE0_MAC |
+					   AR934X_RESET_GE0_MDIO;
+			pdata->set_speed = ar934x_set_speed_ge0;
+		} else {
+			pdata->reset_bit = AR934X_RESET_GE1_MAC |
+					   AR934X_RESET_GE1_MDIO;
+			pdata->set_speed = ath79_set_speed_dummy;
+
+			pdata->switch_data = &ath79_switch_data;
+
+			/* reset the built-in switch */
+			ath79_device_reset_set(AR934X_RESET_ETH_SWITCH);
+			ath79_device_reset_clear(AR934X_RESET_ETH_SWITCH);
+		}
+
+		pdata->ddr_flush = ath79_ddr_no_flush;
+		pdata->has_gbit = 1;
+		pdata->is_ar724x = 1;
+
+		pdata->max_frame_len = SZ_16K - 1;
+		pdata->desc_pktlen_mask = SZ_16K - 1;
+
+		if (!pdata->fifo_cfg1)
+			pdata->fifo_cfg1 = 0x0010ffff;
+		if (!pdata->fifo_cfg2)
+			pdata->fifo_cfg2 = 0x015500aa;
+		if (!pdata->fifo_cfg3)
+			pdata->fifo_cfg3 = 0x01f00140;
+		break;
+
+	case ATH79_SOC_QCA9533:
+		if (id == 0) {
+			pdata->reset_bit = AR933X_RESET_GE0_MAC |
+					   AR933X_RESET_GE0_MDIO;
+			pdata->set_speed = ath79_set_speed_dummy;
+
+			pdata->phy_mask = BIT(4);
+		} else {
+			pdata->reset_bit = AR933X_RESET_GE1_MAC |
+					   AR933X_RESET_GE1_MDIO;
+			pdata->set_speed = ath79_set_speed_dummy;
+
+			pdata->speed = SPEED_1000;
+			pdata->duplex = DUPLEX_FULL;
+			pdata->switch_data = &ath79_switch_data;
+
+			ath79_switch_data.phy_poll_mask |= BIT(4);
+		}
+
+		pdata->ddr_flush = ath79_ddr_no_flush;
+		pdata->has_gbit = 1;
+		pdata->is_ar724x = 1;
+
+		if (!pdata->fifo_cfg1)
+			pdata->fifo_cfg1 = 0x0010ffff;
+		if (!pdata->fifo_cfg2)
+			pdata->fifo_cfg2 = 0x015500aa;
+		if (!pdata->fifo_cfg3)
+			pdata->fifo_cfg3 = 0x01f00140;
+		break;
+
+	case ATH79_SOC_QCA9556:
+	case ATH79_SOC_QCA9558:
+		if (id == 0) {
+			pdata->reset_bit = QCA955X_RESET_GE0_MAC |
+					   QCA955X_RESET_GE0_MDIO;
+			pdata->set_speed = qca955x_set_speed_xmii;
+		} else {
+			pdata->reset_bit = QCA955X_RESET_GE1_MAC |
+					   QCA955X_RESET_GE1_MDIO;
+			pdata->set_speed = qca955x_set_speed_sgmii;
+		}
+
+		pdata->ddr_flush = ath79_ddr_no_flush;
+		pdata->has_gbit = 1;
+		pdata->is_ar724x = 1;
+
+		/*
+		 * Limit the maximum frame length to 4095 bytes.
+		 * Although the documentation says that the hardware
+		 * limit is 16383 bytes but that does not work in
+		 * practice. It seems that the hardware only updates
+		 * the lowest 12 bits of the packet length field
+		 * in the RX descriptor.
+		 */
+		pdata->max_frame_len = SZ_4K - 1;
+		pdata->desc_pktlen_mask = SZ_16K - 1;
+
+		if (!pdata->fifo_cfg1)
+			pdata->fifo_cfg1 = 0x0010ffff;
+		if (!pdata->fifo_cfg2)
+			pdata->fifo_cfg2 = 0x015500aa;
+		if (!pdata->fifo_cfg3)
+			pdata->fifo_cfg3 = 0x01f00140;
+		break;
+
+	default:
+		BUG();
+	}
+
+	switch (pdata->phy_if_mode) {
+	case PHY_INTERFACE_MODE_GMII:
+	case PHY_INTERFACE_MODE_RGMII:
+	case PHY_INTERFACE_MODE_SGMII:
+		if (!pdata->has_gbit) {
+			printk(KERN_ERR "ar71xx: no gbit available on eth%d\n",
+					id);
+			return;
+		}
+		/* fallthrough */
+	default:
+		break;
+	}
+
+	if (!is_valid_ether_addr(pdata->mac_addr)) {
+		random_ether_addr(pdata->mac_addr);
+		printk(KERN_DEBUG
+			"ar71xx: using random MAC address for eth%d\n",
+			ath79_eth_instance);
+	}
+
+	if (pdata->mii_bus_dev == NULL) {
+		switch (ath79_soc) {
+		case ATH79_SOC_AR9341:
+		case ATH79_SOC_AR9342:
+		case ATH79_SOC_AR9344:
+			if (id == 0)
+				pdata->mii_bus_dev = &ath79_mdio0_device.dev;
+			else
+				pdata->mii_bus_dev = &ath79_mdio1_device.dev;
+			break;
+
+		case ATH79_SOC_AR7241:
+		case ATH79_SOC_AR9330:
+		case ATH79_SOC_AR9331:
+		case ATH79_SOC_QCA9533:
+			pdata->mii_bus_dev = &ath79_mdio1_device.dev;
+			break;
+
+		case ATH79_SOC_QCA9556:
+		case ATH79_SOC_QCA9558:
+			/* don't assign any MDIO device by default */
+			break;
+
+		default:
+			pdata->mii_bus_dev = &ath79_mdio0_device.dev;
+			break;
+		}
+	}
+
+	/* Reset the device */
+	ath79_device_reset_set(pdata->reset_bit);
+	msleep(100);
+
+	ath79_device_reset_clear(pdata->reset_bit);
+	msleep(100);
+
+	platform_device_register(pdev);
+	ath79_eth_instance++;
+}
+
+void __init ath79_set_mac_base(unsigned char *mac)
+{
+	memcpy(ath79_mac_base, mac, ETH_ALEN);
+}
+
+void __init ath79_parse_ascii_mac(char *mac_str, u8 *mac)
+{
+	int t;
+
+	t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+		   &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]);
+
+	if (t != ETH_ALEN)
+		t = sscanf(mac_str, "%02hhx.%02hhx.%02hhx.%02hhx.%02hhx.%02hhx",
+			&mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]);
+
+	if (t != ETH_ALEN || !is_valid_ether_addr(mac)) {
+		memset(mac, 0, ETH_ALEN);
+		printk(KERN_DEBUG "ar71xx: invalid mac address \"%s\"\n",
+		       mac_str);
+	}
+}
+
+static void __init ath79_set_mac_base_ascii(char *str)
+{
+	u8 mac[ETH_ALEN];
+
+	ath79_parse_ascii_mac(str, mac);
+	ath79_set_mac_base(mac);
+}
+
+static int __init ath79_ethaddr_setup(char *str)
+{
+	ath79_set_mac_base_ascii(str);
+	return 1;
+}
+__setup("ethaddr=", ath79_ethaddr_setup);
+
+static int __init ath79_kmac_setup(char *str)
+{
+	ath79_set_mac_base_ascii(str);
+	return 1;
+}
+__setup("kmac=", ath79_kmac_setup);
+
+void __init ath79_init_mac(unsigned char *dst, const unsigned char *src,
+			    int offset)
+{
+	int t;
+
+	if (!dst)
+		return;
+
+	if (!src || !is_valid_ether_addr(src)) {
+		memset(dst, '\0', ETH_ALEN);
+		return;
+	}
+
+	t = (((u32) src[3]) << 16) + (((u32) src[4]) << 8) + ((u32) src[5]);
+	t += offset;
+
+	dst[0] = src[0];
+	dst[1] = src[1];
+	dst[2] = src[2];
+	dst[3] = (t >> 16) & 0xff;
+	dst[4] = (t >> 8) & 0xff;
+	dst[5] = t & 0xff;
+}
+
+void __init ath79_init_local_mac(unsigned char *dst, const unsigned char *src)
+{
+	int i;
+
+	if (!dst)
+		return;
+
+	if (!src || !is_valid_ether_addr(src)) {
+		memset(dst, '\0', ETH_ALEN);
+		return;
+	}
+
+	for (i = 0; i < ETH_ALEN; i++)
+		dst[i] = src[i];
+	dst[0] |= 0x02;
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h
new file mode 100644
index 00000000..e1517b7a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h
@@ -0,0 +1,52 @@
+/*
+ *  Atheros AR71xx SoC device definitions
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _ATH79_DEV_ETH_H
+#define _ATH79_DEV_ETH_H
+
+#include <asm/mach-ath79/ag71xx_platform.h>
+
+struct platform_device;
+
+extern unsigned char ath79_mac_base[] __initdata;
+void ath79_parse_ascii_mac(char *mac_str, u8 *mac);
+void ath79_init_mac(unsigned char *dst, const unsigned char *src,
+		    int offset);
+void ath79_init_local_mac(unsigned char *dst, const unsigned char *src);
+
+struct ath79_eth_pll_data {
+	u32	pll_10;
+	u32	pll_100;
+	u32	pll_1000;
+};
+
+extern struct ath79_eth_pll_data ath79_eth0_pll_data;
+extern struct ath79_eth_pll_data ath79_eth1_pll_data;
+
+extern struct ag71xx_platform_data ath79_eth0_data;
+extern struct ag71xx_platform_data ath79_eth1_data;
+extern struct platform_device ath79_eth0_device;
+extern struct platform_device ath79_eth1_device;
+void ath79_register_eth(unsigned int id);
+
+extern struct ag71xx_switch_platform_data ath79_switch_data;
+
+extern struct ag71xx_mdio_platform_data ath79_mdio0_data;
+extern struct ag71xx_mdio_platform_data ath79_mdio1_data;
+extern struct platform_device ath79_mdio0_device;
+extern struct platform_device ath79_mdio1_device;
+void ath79_register_mdio(unsigned int id, u32 phy_mask);
+
+void ath79_setup_ar933x_phy4_switch(bool mac, bool mdio);
+void ath79_setup_ar934x_eth_cfg(u32 mask);
+void ath79_setup_qca955x_eth_cfg(u32 mask);
+
+#endif /* _ATH79_DEV_ETH_H */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.c
new file mode 100644
index 00000000..9323b312
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.c
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/concat.h>
+
+#include "dev-spi.h"
+#include "dev-m25p80.h"
+
+static struct ath79_spi_controller_data ath79_spi0_cdata =
+{
+	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+	.cs_line = 0,
+};
+
+static struct ath79_spi_controller_data ath79_spi1_cdata =
+{
+	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+	.cs_line = 1,
+};
+
+static struct spi_board_info ath79_spi_info[] = {
+	{
+		.bus_num	= 0,
+		.chip_select	= 0,
+		.max_speed_hz	= 25000000,
+		.modalias	= "m25p80",
+		.controller_data = &ath79_spi0_cdata,
+	},
+	{
+		.bus_num	= 0,
+		.chip_select	= 1,
+		.max_speed_hz   = 25000000,
+		.modalias	= "m25p80",
+		.controller_data = &ath79_spi1_cdata,
+	}
+};
+
+static struct ath79_spi_platform_data ath79_spi_data;
+
+void __init ath79_register_m25p80(struct flash_platform_data *pdata)
+{
+	ath79_spi_data.bus_num = 0;
+	ath79_spi_data.num_chipselect = 1;
+	ath79_spi0_cdata.is_flash = true;
+	ath79_spi_info[0].platform_data = pdata;
+	ath79_register_spi(&ath79_spi_data, ath79_spi_info, 1);
+}
+
+static struct flash_platform_data *multi_pdata;
+
+static struct mtd_info *concat_devs[2] = { NULL, NULL };
+static struct work_struct mtd_concat_work;
+
+static void mtd_concat_add_work(struct work_struct *work)
+{
+	struct mtd_info *mtd;
+
+	mtd = mtd_concat_create(concat_devs, ARRAY_SIZE(concat_devs), "flash");
+
+	mtd_device_register(mtd, multi_pdata->parts, multi_pdata->nr_parts);
+}
+
+static void mtd_concat_add(struct mtd_info *mtd)
+{
+	static bool registered = false;
+
+	if (registered)
+		return;
+
+	if (!strcmp(mtd->name, "spi0.0"))
+		concat_devs[0] = mtd;
+	else if (!strcmp(mtd->name, "spi0.1"))
+		concat_devs[1] = mtd;
+	else
+		return;
+
+	if (!concat_devs[0] || !concat_devs[1])
+		return;
+
+	registered = true;
+	INIT_WORK(&mtd_concat_work, mtd_concat_add_work);
+	schedule_work(&mtd_concat_work);
+}
+
+static void mtd_concat_remove(struct mtd_info *mtd)
+{
+}
+
+static void add_mtd_concat_notifier(void)
+{
+	static struct mtd_notifier not = {
+		.add = mtd_concat_add,
+		.remove = mtd_concat_remove,
+	};
+
+	register_mtd_user(&not);
+}
+
+
+void __init ath79_register_m25p80_multi(struct flash_platform_data *pdata)
+{
+	multi_pdata = pdata;
+	add_mtd_concat_notifier();
+	ath79_spi_data.bus_num = 0;
+	ath79_spi_data.num_chipselect = 2;
+	ath79_spi0_cdata.is_flash = true;
+	ath79_register_spi(&ath79_spi_data, ath79_spi_info, 2);
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.h
new file mode 100644
index 00000000..637b41a7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-m25p80.h
@@ -0,0 +1,17 @@
+/*
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _ATH79_DEV_M25P80_H
+#define _ATH79_DEV_M25P80_H
+
+#include <linux/spi/flash.h>
+
+void ath79_register_m25p80(struct flash_platform_data *pdata) __init;
+void ath79_register_m25p80_multi(struct flash_platform_data *pdata) __init;
+
+#endif /* _ATH79_DEV_M25P80_H */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.c
new file mode 100644
index 00000000..9b5256ec
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.c
@@ -0,0 +1,141 @@
+/*
+ *  Atheros AR934X SoCs built-in NAND flash controller support
+ *
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/dma-mapping.h>
+#include <linux/etherdevice.h>
+#include <linux/platform_device.h>
+#include <linux/platform/ar934x_nfc.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "dev-nfc.h"
+
+static struct resource ath79_nfc_resources[2];
+static u64 ar934x_nfc_dmamask = DMA_BIT_MASK(32);
+static struct ar934x_nfc_platform_data ath79_nfc_data;
+
+static struct platform_device ath79_nfc_device = {
+	.name		= AR934X_NFC_DRIVER_NAME,
+	.id		= -1,
+	.resource	= ath79_nfc_resources,
+	.num_resources	= ARRAY_SIZE(ath79_nfc_resources),
+	.dev = {
+		.dma_mask = &ar934x_nfc_dmamask,
+		.coherent_dma_mask = DMA_BIT_MASK(32),
+		.platform_data = &ath79_nfc_data,
+	},
+};
+
+static void __init ath79_nfc_init_resource(struct resource res[2],
+					   unsigned long base,
+					   unsigned long size,
+					   int irq)
+{
+	memset(res, 0, sizeof(struct resource) * 2);
+
+	res[0].flags = IORESOURCE_MEM;
+	res[0].start = base;
+	res[0].end = base + size - 1;
+
+	res[1].flags = IORESOURCE_IRQ;
+	res[1].start = irq;
+	res[1].end = irq;
+}
+
+static void ar934x_nfc_hw_reset(bool active)
+{
+	if (active) {
+		ath79_device_reset_set(AR934X_RESET_NANDF);
+		udelay(100);
+
+		ath79_device_reset_set(AR934X_RESET_ETH_SWITCH_ANALOG);
+		udelay(250);
+	} else {
+		ath79_device_reset_clear(AR934X_RESET_ETH_SWITCH_ANALOG);
+		udelay(250);
+
+		ath79_device_reset_clear(AR934X_RESET_NANDF);
+		udelay(100);
+	}
+}
+
+static void ar934x_nfc_setup(void)
+{
+	ath79_nfc_data.hw_reset = ar934x_nfc_hw_reset;
+
+	ath79_nfc_init_resource(ath79_nfc_resources,
+				AR934X_NFC_BASE, AR934X_NFC_SIZE,
+				ATH79_MISC_IRQ(21));
+
+	platform_device_register(&ath79_nfc_device);
+}
+
+static void qca955x_nfc_hw_reset(bool active)
+{
+	if (active) {
+		ath79_device_reset_set(QCA955X_RESET_NANDF);
+		udelay(250);
+	} else {
+		ath79_device_reset_clear(QCA955X_RESET_NANDF);
+		udelay(100);
+	}
+}
+
+static void qca955x_nfc_setup(void)
+{
+	ath79_nfc_data.hw_reset = qca955x_nfc_hw_reset;
+
+	ath79_nfc_init_resource(ath79_nfc_resources,
+				QCA955X_NFC_BASE, QCA955X_NFC_SIZE,
+				ATH79_MISC_IRQ(21));
+
+	platform_device_register(&ath79_nfc_device);
+}
+
+void __init ath79_nfc_set_select_chip(void (*f)(int chip_no))
+{
+	ath79_nfc_data.select_chip = f;
+}
+
+void __init ath79_nfc_set_scan_fixup(int (*f)(struct mtd_info *mtd))
+{
+	ath79_nfc_data.scan_fixup = f;
+}
+
+void __init ath79_nfc_set_swap_dma(bool enable)
+{
+	ath79_nfc_data.swap_dma = enable;
+}
+
+void __init ath79_nfc_set_ecc_mode(enum ar934x_nfc_ecc_mode mode)
+{
+	ath79_nfc_data.ecc_mode = mode;
+}
+
+void __init ath79_nfc_set_parts(struct mtd_partition *parts, int nr_parts)
+{
+	ath79_nfc_data.parts = parts;
+	ath79_nfc_data.nr_parts = nr_parts;
+}
+
+void __init ath79_register_nfc(void)
+{
+	if (soc_is_ar934x())
+		ar934x_nfc_setup();
+	else if (soc_is_qca955x())
+		qca955x_nfc_setup();
+	else
+		BUG();
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.h
new file mode 100644
index 00000000..3a1c88fe
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/dev-nfc.h
@@ -0,0 +1,34 @@
+/*
+ *  Atheros AR934X SoCs built-in NAND Flash Controller support
+ *
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _ATH79_DEV_NFC_H
+#define _ATH79_DEV_NFC_H
+
+struct mtd_partition;
+enum ar934x_nfc_ecc_mode;
+
+#ifdef CONFIG_ATH79_DEV_NFC
+void ath79_nfc_set_parts(struct mtd_partition *parts, int nr_parts);
+void ath79_nfc_set_select_chip(void (*f)(int chip_no));
+void ath79_nfc_set_scan_fixup(int (*f)(struct mtd_info *mtd));
+void ath79_nfc_set_swap_dma(bool enable);
+void ath79_nfc_set_ecc_mode(enum ar934x_nfc_ecc_mode mode);
+void ath79_register_nfc(void);
+#else
+static inline void ath79_nfc_set_parts(struct mtd_partition *parts,
+				       int nr_parts) {}
+static inline void ath79_nfc_set_select_chip(void (*f)(int chip_no)) {}
+static inline void ath79_nfc_set_scan_fixup(int (*f)(struct mtd_info *mtd)) {}
+static inline void ath79_nfc_set_swap_dma(bool enable) {}
+static inline void ath79_nfc_set_ecc_mode(enum ar934x_nfc_ecc_mode mode) {}
+static inline void ath79_register_nfc(void) {}
+#endif
+
+#endif /* _ATH79_DEV_NFC_H */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap96.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap96.c
new file mode 100644
index 00000000..f7cd6aed
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap96.c
@@ -0,0 +1,151 @@
+/*
+ *  ALFA Network AP96 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/mmc/host.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/mmc_spi.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define ALFA_AP96_GPIO_PCIE_RESET	2
+#define ALFA_AP96_GPIO_SIM_DETECT	3
+#define ALFA_AP96_GPIO_MICROSD_CD	4
+#define ALFA_AP96_GPIO_PCIE_W_DISABLE	5
+
+#define ALFA_AP96_GPIO_BUTTON_RESET	11
+
+#define ALFA_AP96_KEYS_POLL_INTERVAL		20	/* msecs */
+#define ALFA_AP96_KEYS_DEBOUNCE_INTERVAL	(3 * ALFA_AP96_KEYS_POLL_INTERVAL)
+
+static struct gpio_keys_button alfa_ap96_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = ALFA_AP96_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ALFA_AP96_GPIO_BUTTON_RESET,
+		.active_low	= 1,
+	}
+};
+
+static struct mmc_spi_platform_data alfa_ap96_mmc_data = {
+	.flags		= MMC_SPI_USE_CD_GPIO,
+	.cd_gpio	= ALFA_AP96_GPIO_MICROSD_CD,
+	.cd_debounce	= 1,
+	.caps		= MMC_CAP_NEEDS_POLL,
+	.ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,
+};
+
+static struct ath79_spi_controller_data ap96_spi0_cdata = {
+	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+	.cs_line = 0,
+	.is_flash = true,
+};
+
+static struct ath79_spi_controller_data ap96_spi1_cdata = {
+	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+	.cs_line = 1,
+};
+
+static struct ath79_spi_controller_data ap96_spi2_cdata = {
+	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+	.cs_line = 2,
+};
+
+static struct spi_board_info alfa_ap96_spi_info[] = {
+	{
+		.bus_num	= 0,
+		.chip_select	= 0,
+		.max_speed_hz	= 25000000,
+		.modalias	= "m25p80",
+		.controller_data = &ap96_spi0_cdata
+	}, {
+		.bus_num	= 0,
+		.chip_select	= 1,
+		.max_speed_hz	= 25000000,
+		.modalias	= "mmc_spi",
+		.platform_data	= &alfa_ap96_mmc_data,
+		.controller_data = &ap96_spi1_cdata
+	}, {
+		.bus_num	= 0,
+		.chip_select	= 2,
+		.max_speed_hz	= 6250000,
+		.modalias	= "rtc-pcf2123",
+		.controller_data = &ap96_spi2_cdata
+	},
+};
+
+static struct ath79_spi_platform_data alfa_ap96_spi_data = {
+	.bus_num		= 0,
+	.num_chipselect		= 3,
+};
+
+static void __init alfa_ap96_gpio_setup(void)
+{
+	ath79_gpio_function_enable(AR71XX_GPIO_FUNC_SPI_CS1_EN |
+				   AR71XX_GPIO_FUNC_SPI_CS2_EN);
+
+	gpio_request(ALFA_AP96_GPIO_MICROSD_CD, "microSD CD");
+	gpio_direction_input(ALFA_AP96_GPIO_MICROSD_CD);
+	gpio_request(ALFA_AP96_GPIO_PCIE_RESET, "PCIe reset");
+	gpio_direction_output(ALFA_AP96_GPIO_PCIE_RESET, 1);
+	gpio_request(ALFA_AP96_GPIO_PCIE_W_DISABLE, "PCIe write disable");
+	gpio_direction_output(ALFA_AP96_GPIO_PCIE_W_DISABLE, 1);
+}
+
+#define ALFA_AP96_WAN_PHYMASK	BIT(4)
+#define ALFA_AP96_LAN_PHYMASK	BIT(5)
+#define ALFA_AP96_MDIO_PHYMASK	(ALFA_AP96_LAN_PHYMASK | ALFA_AP96_WAN_PHYMASK)
+
+static void __init alfa_ap96_init(void)
+{
+	alfa_ap96_gpio_setup();
+
+	ath79_register_mdio(0, ~ALFA_AP96_MDIO_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = ALFA_AP96_WAN_PHYMASK;
+	ath79_eth1_pll_data.pll_1000 = 0x110000;
+
+	ath79_register_eth(0);
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = ALFA_AP96_LAN_PHYMASK;
+	ath79_eth1_pll_data.pll_1000 = 0x110000;
+
+	ath79_register_eth(1);
+
+	ath79_register_pci();
+	ath79_register_spi(&alfa_ap96_spi_data, alfa_ap96_spi_info,
+			   ARRAY_SIZE(alfa_ap96_spi_info));
+
+	ath79_register_gpio_keys_polled(-1, ALFA_AP96_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(alfa_ap96_gpio_keys),
+					 alfa_ap96_gpio_keys);
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_ALFA_AP96, "ALFA-AP96", "ALFA Network AP96",
+	     alfa_ap96_init);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c
new file mode 100644
index 00000000..a515f4f5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-nx.c
@@ -0,0 +1,113 @@
+/*
+ *  ALFA Network N2/N5 board support
+ *
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+
+#define ALFA_NX_GPIO_LED_2		17
+#define ALFA_NX_GPIO_LED_3		16
+#define ALFA_NX_GPIO_LED_5		12
+#define ALFA_NX_GPIO_LED_6		8
+#define ALFA_NX_GPIO_LED_7		6
+#define ALFA_NX_GPIO_LED_8		7
+
+#define ALFA_NX_GPIO_BTN_RESET		11
+
+#define ALFA_NX_KEYS_POLL_INTERVAL	20	/* msecs */
+#define ALFA_NX_KEYS_DEBOUNCE_INTERVAL (3 * ALFA_NX_KEYS_POLL_INTERVAL)
+
+#define ALFA_NX_MAC0_OFFSET		0
+#define ALFA_NX_MAC1_OFFSET		6
+#define ALFA_NX_CALDATA_OFFSET		0x1000
+
+static struct gpio_keys_button alfa_nx_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = ALFA_NX_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ALFA_NX_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_led alfa_nx_leds_gpio[] __initdata = {
+	{
+		.name		= "alfa:green:led_2",
+		.gpio		= ALFA_NX_GPIO_LED_2,
+		.active_low	= 1,
+	}, {
+		.name		= "alfa:green:led_3",
+		.gpio		= ALFA_NX_GPIO_LED_3,
+		.active_low	= 1,
+	}, {
+		.name		= "alfa:red:led_5",
+		.gpio		= ALFA_NX_GPIO_LED_5,
+		.active_low	= 1,
+	}, {
+		.name		= "alfa:amber:led_6",
+		.gpio		= ALFA_NX_GPIO_LED_6,
+		.active_low	= 1,
+	}, {
+		.name		= "alfa:green:led_7",
+		.gpio		= ALFA_NX_GPIO_LED_7,
+		.active_low	= 1,
+	}, {
+		.name		= "alfa:green:led_8",
+		.gpio		= ALFA_NX_GPIO_LED_8,
+		.active_low	= 1,
+	}
+};
+
+static void __init alfa_nx_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE,
+				  AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				  AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				  AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				  AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				  AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(0, ARRAY_SIZE(alfa_nx_leds_gpio),
+				 alfa_nx_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, ALFA_NX_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(alfa_nx_gpio_keys),
+					alfa_nx_gpio_keys);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+		       art + ALFA_NX_MAC0_OFFSET, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr,
+		       art + ALFA_NX_MAC1_OFFSET, 0);
+
+	/* WAN port */
+	ath79_register_eth(0);
+	/* LAN port */
+	ath79_register_eth(1);
+
+	ap91_pci_init(art + ALFA_NX_CALDATA_OFFSET, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_ALFA_NX, "ALFA-NX", "ALFA Network N2/N5",
+	     alfa_nx_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0258n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0258n.c
new file mode 100644
index 00000000..2495bcba
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0258n.c
@@ -0,0 +1,88 @@
+/*
+ *  Allnet ALL0258N support
+ *
+ *  Copyright (C) 2011 Daniel Golle <dgolle@allnet.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+
+/* found via /sys/gpio/... try and error */
+#define ALL0258N_GPIO_BTN_RESET		1
+#define ALL0258N_GPIO_LED_RSSIHIGH	13
+#define ALL0258N_GPIO_LED_RSSIMEDIUM	15
+#define ALL0258N_GPIO_LED_RSSILOW	14
+
+/* defaults taken from others machs */
+#define ALL0258N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define ALL0258N_KEYS_DEBOUNCE_INTERVAL (3 * ALL0258N_KEYS_POLL_INTERVAL)
+
+/* showed up in the original firmware's bootlog */
+#define ALL0258N_SEC_PHYMASK BIT(3)
+
+static struct gpio_led all0258n_leds_gpio[] __initdata = {
+	{
+		.name		= "all0258n:green:rssihigh",
+		.gpio		= ALL0258N_GPIO_LED_RSSIHIGH,
+		.active_low	= 1,
+	}, {
+		.name		= "all0258n:yellow:rssimedium",
+		.gpio		= ALL0258N_GPIO_LED_RSSIMEDIUM,
+		.active_low	= 1,
+	}, {
+		.name		= "all0258n:red:rssilow",
+		.gpio		= ALL0258N_GPIO_LED_RSSILOW,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button all0258n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = ALL0258N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ALL0258N_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static void __init all0258n_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f7f0000);
+	u8 *ee =  (u8 *) KSEG1ADDR(0x1f7f1000);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(all0258n_leds_gpio),
+				 all0258n_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, ALL0258N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(all0258n_gpio_keys),
+					all0258n_gpio_keys);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+
+	ath79_eth1_data.phy_mask = ALL0258N_SEC_PHYMASK;
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ap91_pci_init(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_ALL0258N, "ALL0258N", "Allnet ALL0258N",
+	     all0258n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0315n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0315n.c
new file mode 100644
index 00000000..387ee7f9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-all0315n.c
@@ -0,0 +1,85 @@
+/*
+ *  Allnet ALL0315N support
+ *
+ *  Copyright (C) 2012 Daniel Golle <dgolle@allnet.de>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-m25p80.h"
+#include "dev-leds-gpio.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define ALL0315N_GPIO_BTN_RESET		0
+#define ALL0315N_GPIO_LED_RSSIHIGH	14
+#define ALL0315N_GPIO_LED_RSSIMEDIUM	15
+#define ALL0315N_GPIO_LED_RSSILOW	16
+
+#define ALL0315N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define ALL0315N_KEYS_DEBOUNCE_INTERVAL	(3 * ALL0315N_KEYS_POLL_INTERVAL)
+
+static struct gpio_led all0315n_leds_gpio[] __initdata = {
+	{
+		.name		= "all0315n:green:rssihigh",
+		.gpio		= ALL0315N_GPIO_LED_RSSIHIGH,
+		.active_low	= 1,
+	}, {
+		.name		= "all0315n:yellow:rssimedium",
+		.gpio		= ALL0315N_GPIO_LED_RSSIMEDIUM,
+		.active_low	= 1,
+	}, {
+		.name		= "all0315n:red:rssilow",
+		.gpio		= ALL0315N_GPIO_LED_RSSILOW,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button all0315n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = ALL0315N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ALL0315N_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static void __init all0315n_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1ffc0000);
+	u8 *ee =  (u8 *) KSEG1ADDR(0x1ffc1000);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(all0315n_leds_gpio),
+					all0315n_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, ALL0315N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(all0315n_gpio_keys),
+					all0315n_gpio_keys);
+
+	ap9x_pci_setup_wmac_led_pin(0, 1);
+	ap91_pci_init(ee, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_ALL0315N, "ALL0315N", "Allnet ALL0315N",
+	     all0315n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap113.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap113.c
new file mode 100644
index 00000000..9b38faa4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap113.c
@@ -0,0 +1,84 @@
+/*
+ *  Atheros AP113 board support
+ *
+ *  Copyright (C) 2011 Florian Fainelli <florian@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "pci.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define AP113_GPIO_LED_USB		0
+#define AP113_GPIO_LED_STATUS		1
+#define AP113_GPIO_LED_ST		11
+
+#define AP113_GPIO_BTN_JUMPSTART	12
+
+#define AP113_KEYS_POLL_INTERVAL	20	/* msecs */
+#define AP113_KEYS_DEBOUNCE_INTERVAL	(3 * AP113_KEYS_POLL_INTERVAL)
+
+static struct gpio_led ap113_leds_gpio[] __initdata = {
+	{
+		.name		= "ap113:green:usb",
+		.gpio		= AP113_GPIO_LED_USB,
+		.active_low	= 1,
+	},
+	{
+		.name		= "ap113:green:status",
+		.gpio		= AP113_GPIO_LED_STATUS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "ap113:green:st",
+		.gpio		= AP113_GPIO_LED_ST,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button ap113_gpio_keys[] __initdata = {
+	{
+		.desc		= "jumpstart button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = AP113_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AP113_GPIO_BTN_JUMPSTART,
+		.active_low	= 1,
+	},
+};
+
+static void __init ap113_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_mdio(0, ~BIT(0));
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_register_eth(0);
+
+	ath79_register_gpio_keys_polled(-1, AP113_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(ap113_gpio_keys),
+					 ap113_gpio_keys);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap113_leds_gpio),
+					ap113_leds_gpio);
+
+	ath79_register_pci();
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_AP113, "AP113", "Atheros AP113",
+	     ap113_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c
new file mode 100644
index 00000000..86fd8bd7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c
@@ -0,0 +1,189 @@
+/*
+ * Atheros AP132 reference board support
+ *
+ * Copyright (c) 2012 Qualcomm Atheros
+ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (c) 2013 Embedded Wireless GmbH <info@embeddedwireless.de>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define AP132_GPIO_LED_USB		4
+#define AP132_GPIO_LED_WLAN_5G		12
+#define AP132_GPIO_LED_WLAN_2G		13
+#define AP132_GPIO_LED_STATUS_RED	14
+#define AP132_GPIO_LED_WPS_RED		15
+
+#define AP132_GPIO_BTN_WPS		16
+
+#define AP132_KEYS_POLL_INTERVAL	20	/* msecs */
+#define AP132_KEYS_DEBOUNCE_INTERVAL	(3 * AP132_KEYS_POLL_INTERVAL)
+
+#define AP132_MAC0_OFFSET		0
+#define AP132_WMAC_CALDATA_OFFSET	0x1000
+
+static struct gpio_led ap132_leds_gpio[] __initdata = {
+	{
+		.name		= "ap132:red:status",
+		.gpio		= AP132_GPIO_LED_STATUS_RED,
+		.active_low	= 1,
+	},
+	{
+		.name		= "ap132:red:wps",
+		.gpio		= AP132_GPIO_LED_WPS_RED,
+		.active_low	= 1,
+	},
+	{
+		.name		= "ap132:red:wlan-2g",
+		.gpio		= AP132_GPIO_LED_WLAN_2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "ap132:red:usb",
+		.gpio		= AP132_GPIO_LED_USB,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button ap132_gpio_keys[] __initdata = {
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = AP132_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AP132_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg ap132_ar8327_pad0_cfg;
+
+static struct ar8327_platform_data ap132_ar8327_data = {
+	.pad0_cfg = &ap132_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+};
+
+static struct mdio_board_info ap132_mdio1_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.1",
+		.phy_addr = 0,
+		.platform_data = &ap132_ar8327_data,
+	},
+};
+
+static void __init ap132_mdio_setup(void)
+{
+	void __iomem *base;
+	u32 t;
+
+#define GPIO_IN_ENABLE3_ADDRESS                                      0x0050
+#define GPIO_IN_ENABLE3_MII_GE1_MDI_MASK                             0x00ff0000
+#define GPIO_IN_ENABLE3_MII_GE1_MDI_LSB                              16
+#define GPIO_IN_ENABLE3_MII_GE1_MDI_SET(x)                           (((x) << GPIO_IN_ENABLE3_MII_GE1_MDI_LSB) & GPIO_IN_ENABLE3_MII_GE1_MDI_MASK)
+#define GPIO_OUT_FUNCTION4_ADDRESS                                   0x003c
+#define GPIO_OUT_FUNCTION4_ENABLE_GPIO_19_MASK                       0xff000000
+#define GPIO_OUT_FUNCTION4_ENABLE_GPIO_19_LSB                        24
+#define GPIO_OUT_FUNCTION4_ENABLE_GPIO_19_SET(x)                     (((x) << GPIO_OUT_FUNCTION4_ENABLE_GPIO_19_LSB) & GPIO_OUT_FUNCTION4_ENABLE_GPIO_19_MASK)
+#define GPIO_OUT_FUNCTION4_ENABLE_GPIO_17_MASK                       0x0000ff00
+#define GPIO_OUT_FUNCTION4_ENABLE_GPIO_17_LSB                        8
+#define GPIO_OUT_FUNCTION4_ENABLE_GPIO_17_SET(x)                     (((x) << GPIO_OUT_FUNCTION4_ENABLE_GPIO_17_LSB) & GPIO_OUT_FUNCTION4_ENABLE_GPIO_17_MASK)
+
+	base = ioremap(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE);
+
+	t = __raw_readl(base + GPIO_IN_ENABLE3_ADDRESS);
+	t &= ~GPIO_IN_ENABLE3_MII_GE1_MDI_MASK;
+	t |= GPIO_IN_ENABLE3_MII_GE1_MDI_SET(19);
+	__raw_writel(t, base + GPIO_IN_ENABLE3_ADDRESS);
+
+
+	__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) & ~(1 << 19), base + AR71XX_GPIO_REG_OE);
+
+	__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) & ~(1 << 17), base + AR71XX_GPIO_REG_OE);
+
+
+	t = __raw_readl(base + GPIO_OUT_FUNCTION4_ADDRESS);
+	t &= ~(GPIO_OUT_FUNCTION4_ENABLE_GPIO_19_MASK | GPIO_OUT_FUNCTION4_ENABLE_GPIO_17_MASK);
+	t |= GPIO_OUT_FUNCTION4_ENABLE_GPIO_19_SET(0x20) | GPIO_OUT_FUNCTION4_ENABLE_GPIO_17_SET(0x21);
+	__raw_writel(t, base + GPIO_OUT_FUNCTION4_ADDRESS);
+
+	iounmap(base);
+
+}
+
+static void __init ap132_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap132_leds_gpio),
+				 ap132_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, AP132_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(ap132_gpio_keys),
+					ap132_gpio_keys);
+
+	ath79_register_usb();
+
+	ath79_register_wmac(art + AP132_WMAC_CALDATA_OFFSET, NULL);
+
+	/* GMAC0 of the AR8327 switch is connected to GMAC1 via SGMII */
+	ap132_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_SGMII;
+	ap132_ar8327_pad0_cfg.sgmii_delay_en = true;
+
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+	ap132_mdio_setup();
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, art + AP132_MAC0_OFFSET, 0);
+
+	mdiobus_register_board_info(ap132_mdio1_info,
+				    ARRAY_SIZE(ap132_mdio1_info));
+
+	/* GMAC1 is connected to the SGMII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+	ath79_eth1_data.phy_mask = BIT(0);
+	ath79_eth1_data.mii_bus_dev = &ath79_mdio1_device.dev;
+
+	ath79_register_eth(1);
+}
+
+MIPS_MACHINE(ATH79_MACH_AP132, "AP132",
+	     "Atheros AP132 reference board",
+	     ap132_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap83.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap83.c
new file mode 100644
index 00000000..8519a9d9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap83.c
@@ -0,0 +1,275 @@
+/*
+ *  Atheros AP83 board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
+#include <linux/spi/vsc7385.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define AP83_GPIO_LED_WLAN	6
+#define AP83_GPIO_LED_POWER	14
+#define AP83_GPIO_LED_JUMPSTART	15
+#define AP83_GPIO_BTN_JUMPSTART	12
+#define AP83_GPIO_BTN_RESET	21
+
+#define AP83_050_GPIO_VSC7385_CS	1
+#define AP83_050_GPIO_VSC7385_MISO	3
+#define AP83_050_GPIO_VSC7385_MOSI	16
+#define AP83_050_GPIO_VSC7385_SCK	17
+
+#define AP83_KEYS_POLL_INTERVAL		20	/* msecs */
+#define AP83_KEYS_DEBOUNCE_INTERVAL	(3 * AP83_KEYS_POLL_INTERVAL)
+
+static struct mtd_partition ap83_flash_partitions[] = {
+	{
+		.name		= "u-boot",
+		.offset		= 0,
+		.size		= 0x040000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "u-boot-env",
+		.offset		= 0x040000,
+		.size		= 0x020000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "kernel",
+		.offset		= 0x060000,
+		.size		= 0x140000,
+	}, {
+		.name		= "rootfs",
+		.offset		= 0x1a0000,
+		.size		= 0x650000,
+	}, {
+		.name		= "art",
+		.offset		= 0x7f0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x060000,
+		.size		= 0x790000,
+	}
+};
+
+static struct physmap_flash_data ap83_flash_data = {
+	.width		= 2,
+	.parts		= ap83_flash_partitions,
+	.nr_parts	= ARRAY_SIZE(ap83_flash_partitions),
+};
+
+static struct resource ap83_flash_resources[] = {
+	[0] = {
+		.start	= AR71XX_SPI_BASE,
+		.end	= AR71XX_SPI_BASE + AR71XX_SPI_SIZE - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device ap83_flash_device = {
+	.name		= "ar91xx-flash",
+	.id		= -1,
+	.resource	= ap83_flash_resources,
+	.num_resources	= ARRAY_SIZE(ap83_flash_resources),
+	.dev		= {
+		.platform_data = &ap83_flash_data,
+	}
+};
+
+static struct gpio_led ap83_leds_gpio[] __initdata = {
+	{
+		.name		= "ap83:green:jumpstart",
+		.gpio		= AP83_GPIO_LED_JUMPSTART,
+		.active_low	= 0,
+	}, {
+		.name		= "ap83:green:power",
+		.gpio		= AP83_GPIO_LED_POWER,
+		.active_low	= 0,
+	}, {
+		.name		= "ap83:green:wlan",
+		.gpio		= AP83_GPIO_LED_WLAN,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button ap83_gpio_keys[] __initdata = {
+	{
+		.desc		= "soft_reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = AP83_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AP83_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "jumpstart",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = AP83_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AP83_GPIO_BTN_JUMPSTART,
+		.active_low	= 1,
+	}
+};
+
+static struct resource ap83_040_spi_resources[] = {
+	[0] = {
+		.start	= AR71XX_SPI_BASE,
+		.end	= AR71XX_SPI_BASE + AR71XX_SPI_SIZE - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device ap83_040_spi_device = {
+	.name		= "ap83-spi",
+	.id		= 0,
+	.resource	= ap83_040_spi_resources,
+	.num_resources	= ARRAY_SIZE(ap83_040_spi_resources),
+};
+
+static struct spi_gpio_platform_data ap83_050_spi_data = {
+	.miso	= AP83_050_GPIO_VSC7385_MISO,
+	.mosi	= AP83_050_GPIO_VSC7385_MOSI,
+	.sck	= AP83_050_GPIO_VSC7385_SCK,
+	.num_chipselect = 1,
+};
+
+static struct platform_device ap83_050_spi_device = {
+	.name		= "spi_gpio",
+	.id		= 0,
+	.dev		= {
+		.platform_data = &ap83_050_spi_data,
+	}
+};
+
+static void ap83_vsc7385_reset(void)
+{
+	ath79_device_reset_set(AR71XX_RESET_GE1_PHY);
+	udelay(10);
+	ath79_device_reset_clear(AR71XX_RESET_GE1_PHY);
+	mdelay(50);
+}
+
+static struct vsc7385_platform_data ap83_vsc7385_data = {
+	.reset		= ap83_vsc7385_reset,
+	.ucode_name	= "vsc7385_ucode_ap83.bin",
+	.mac_cfg = {
+		.tx_ipg		= 6,
+		.bit2		= 0,
+		.clk_sel	= 3,
+	},
+};
+
+static struct spi_board_info ap83_spi_info[] = {
+	{
+		.bus_num	= 0,
+		.chip_select	= 0,
+		.max_speed_hz	= 25000000,
+		.modalias	= "spi-vsc7385",
+		.platform_data	= &ap83_vsc7385_data,
+		.controller_data = (void *) AP83_050_GPIO_VSC7385_CS,
+	}
+};
+
+static void __init ap83_generic_setup(void)
+{
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_mdio(0, 0xfffffffe);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, eeprom, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = 0x1;
+
+	ath79_register_eth(0);
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, eeprom, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_eth1_pll_data.pll_1000 = 0x1f000000;
+
+	ath79_register_eth(1);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap83_leds_gpio),
+					ap83_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, AP83_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(ap83_gpio_keys),
+					 ap83_gpio_keys);
+
+	ath79_register_usb();
+
+	ath79_register_wmac(eeprom, NULL);
+
+	platform_device_register(&ap83_flash_device);
+
+	spi_register_board_info(ap83_spi_info, ARRAY_SIZE(ap83_spi_info));
+}
+
+static void ap83_040_flash_lock(struct platform_device *pdev)
+{
+	ath79_flash_acquire();
+}
+
+static void ap83_040_flash_unlock(struct platform_device *pdev)
+{
+	ath79_flash_release();
+}
+
+static void __init ap83_040_setup(void)
+{
+	ap83_flash_data.lock = ap83_040_flash_lock;
+	ap83_flash_data.unlock = ap83_040_flash_unlock;
+	ap83_generic_setup();
+	platform_device_register(&ap83_040_spi_device);
+}
+
+static void __init ap83_050_setup(void)
+{
+	ap83_generic_setup();
+	platform_device_register(&ap83_050_spi_device);
+}
+
+static void __init ap83_setup(void)
+{
+	u8 *board_id = (u8 *) KSEG1ADDR(0x1fff1244);
+	unsigned int board_version;
+
+	board_version = (unsigned int)(board_id[0] - '0');
+	board_version += ((unsigned int)(board_id[1] - '0')) * 10;
+
+	switch (board_version) {
+	case 40:
+		ap83_040_setup();
+		break;
+	case 50:
+		ap83_050_setup();
+		break;
+	default:
+		printk(KERN_WARNING "AP83-%03u board is not yet supported\n",
+		       board_version);
+	}
+}
+
+MIPS_MACHINE(ATH79_MACH_AP83, "AP83", "Atheros AP83", ap83_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c
new file mode 100644
index 00000000..35120d3e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ap96.c
@@ -0,0 +1,142 @@
+/*
+ *  Atheros AP96 board support
+ *
+ *  Copyright (C) 2009 Marco Porsch
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2010 Atheros Communications
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define AP96_GPIO_LED_12_GREEN		0
+#define AP96_GPIO_LED_3_GREEN		1
+#define AP96_GPIO_LED_2_GREEN		2
+#define AP96_GPIO_LED_WPS_GREEN		4
+#define AP96_GPIO_LED_5_GREEN		5
+#define AP96_GPIO_LED_4_ORANGE		6
+
+/* Reset button - next to the power connector */
+#define AP96_GPIO_BTN_RESET		3
+/* WPS button - next to a led on right */
+#define AP96_GPIO_BTN_WPS		8
+
+#define AP96_KEYS_POLL_INTERVAL		20	/* msecs */
+#define AP96_KEYS_DEBOUNCE_INTERVAL	(3 * AP96_KEYS_POLL_INTERVAL)
+
+#define AP96_WMAC0_MAC_OFFSET		0x120c
+#define AP96_WMAC1_MAC_OFFSET		0x520c
+#define AP96_CALDATA0_OFFSET		0x1000
+#define AP96_CALDATA1_OFFSET		0x5000
+
+/*
+ * AP96 has 12 unlabeled leds in the front; these are numbered from 1 to 12
+ * below (from left to right on the board). Led 1 seems to be on whenever the
+ * board is powered. Led 11 shows LAN link activity actity. Led 3 is orange;
+ * others are green.
+ *
+ * In addition, there is one led next to a button on the right side for WPS.
+ */
+static struct gpio_led ap96_leds_gpio[] __initdata = {
+	{
+		.name		= "ap96:green:led2",
+		.gpio		= AP96_GPIO_LED_2_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "ap96:green:led3",
+		.gpio		= AP96_GPIO_LED_3_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "ap96:orange:led4",
+		.gpio		= AP96_GPIO_LED_4_ORANGE,
+		.active_low	= 1,
+	}, {
+		.name		= "ap96:green:led5",
+		.gpio		= AP96_GPIO_LED_5_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "ap96:green:led12",
+		.gpio		= AP96_GPIO_LED_12_GREEN,
+		.active_low	= 1,
+	}, { /* next to a button on right */
+		.name		= "ap96:green:wps",
+		.gpio		= AP96_GPIO_LED_WPS_GREEN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button ap96_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = AP96_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AP96_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = AP96_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AP96_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+#define AP96_WAN_PHYMASK 0x10
+#define AP96_LAN_PHYMASK 0x0f
+
+static void __init ap96_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_mdio(0, ~(AP96_WAN_PHYMASK | AP96_LAN_PHYMASK));
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = AP96_LAN_PHYMASK;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, art, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = AP96_WAN_PHYMASK;
+
+	ath79_eth1_pll_data.pll_1000 = 0x1f000000;
+
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap96_leds_gpio),
+					ap96_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, AP96_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(ap96_gpio_keys),
+					 ap96_gpio_keys);
+
+	ap94_pci_init(art + AP96_CALDATA0_OFFSET,
+		      art + AP96_WMAC0_MAC_OFFSET,
+		      art + AP96_CALDATA1_OFFSET,
+		      art + AP96_WMAC1_MAC_OFFSET);
+}
+
+MIPS_MACHINE(ATH79_MACH_AP96, "AP96", "Atheros AP96", ap96_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
new file mode 100644
index 00000000..fc125130
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
@@ -0,0 +1,266 @@
+/*
+ * TP-LINK Archer C5/C7/TL-WDR4900 v2 board support
+ *
+ * Copyright (c) 2013 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (c) 2014 施康成 <tenninjas@tenninjas.ca>
+ * Copyright (c) 2014 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Based on the Qualcomm Atheros AP135/AP136 reference board support code
+ *   Copyright (c) 2012 Qualcomm Atheros
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define ARCHER_C7_GPIO_LED_WLAN2G	12
+#define ARCHER_C7_GPIO_LED_SYSTEM	14
+#define ARCHER_C7_GPIO_LED_QSS		15
+#define ARCHER_C7_GPIO_LED_WLAN5G	17
+#define ARCHER_C7_GPIO_LED_USB1		18
+#define ARCHER_C7_GPIO_LED_USB2		19
+
+#define ARCHER_C7_GPIO_BTN_RFKILL	13
+#define ARCHER_C7_GPIO_BTN_RESET	16
+
+#define ARCHER_C7_GPIO_USB1_POWER	22
+#define ARCHER_C7_GPIO_USB2_POWER	21
+
+#define ARCHER_C7_KEYS_POLL_INTERVAL	20	/* msecs */
+#define ARCHER_C7_KEYS_DEBOUNCE_INTERVAL (3 * ARCHER_C7_KEYS_POLL_INTERVAL)
+
+#define ARCHER_C7_WMAC_CALDATA_OFFSET	0x1000
+#define ARCHER_C7_PCIE_CALDATA_OFFSET	0x5000
+
+static const char *archer_c7_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data archer_c7_flash_data = {
+	.part_probes	= archer_c7_part_probes,
+};
+
+static struct gpio_led archer_c7_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:blue:qss",
+		.gpio		= ARCHER_C7_GPIO_LED_QSS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:blue:system",
+		.gpio		= ARCHER_C7_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:blue:wlan2g",
+		.gpio		= ARCHER_C7_GPIO_LED_WLAN2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:blue:wlan5g",
+		.gpio		= ARCHER_C7_GPIO_LED_WLAN5G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:usb1",
+		.gpio		= ARCHER_C7_GPIO_LED_USB1,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:usb2",
+		.gpio		= ARCHER_C7_GPIO_LED_USB2,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button archer_c7_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ARCHER_C7_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "RFKILL switch",
+		.type		= EV_SW,
+		.code		= KEY_RFKILL,
+		.debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ARCHER_C7_GPIO_BTN_RFKILL,
+	},
+};
+
+static const struct ar8327_led_info archer_c7_leds_ar8327[] __initconst = {
+	AR8327_LED_INFO(PHY0_0, HW, "tp-link:blue:wan"),
+	AR8327_LED_INFO(PHY1_0, HW, "tp-link:blue:lan1"),
+	AR8327_LED_INFO(PHY2_0, HW, "tp-link:blue:lan2"),
+	AR8327_LED_INFO(PHY3_0, HW, "tp-link:blue:lan3"),
+	AR8327_LED_INFO(PHY4_0, HW, "tp-link:blue:lan4"),
+};
+
+/* GMAC0 of the AR8327 switch is connected to the QCA9558 SoC via SGMII */
+static struct ar8327_pad_cfg archer_c7_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_SGMII,
+	.sgmii_delay_en = true,
+};
+
+/* GMAC6 of the AR8327 switch is connected to the QCA9558 SoC via RGMII */
+static struct ar8327_pad_cfg archer_c7_ar8327_pad6_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_led_cfg archer_c7_ar8327_led_cfg = {
+	.led_ctrl0 = 0xc737c737,
+	.led_ctrl1 = 0x00000000,
+	.led_ctrl2 = 0x00000000,
+	.led_ctrl3 = 0x0030c300,
+	.open_drain = false,
+};
+
+static struct ar8327_platform_data archer_c7_ar8327_data = {
+	.pad0_cfg = &archer_c7_ar8327_pad0_cfg,
+	.pad6_cfg = &archer_c7_ar8327_pad6_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.port6_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &archer_c7_ar8327_led_cfg,
+	.num_leds = ARRAY_SIZE(archer_c7_leds_ar8327),
+	.leds = archer_c7_leds_ar8327,
+};
+
+static struct mdio_board_info archer_c7_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &archer_c7_ar8327_data,
+	},
+};
+
+static void __init common_setup(bool pcie_slot)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(&archer_c7_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c7_leds_gpio),
+				 archer_c7_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, ARCHER_C7_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(archer_c7_gpio_keys),
+					archer_c7_gpio_keys);
+
+	ath79_init_mac(tmpmac, mac, -1);
+	ath79_register_wmac(art + ARCHER_C7_WMAC_CALDATA_OFFSET, tmpmac);
+
+	if (pcie_slot) {
+		ath79_register_pci();
+	} else {
+		ath79_init_mac(tmpmac, mac, -1);
+		ap9x_pci_setup_wmac_led_pin(0, 0);
+		ap91_pci_init(art + ARCHER_C7_PCIE_CALDATA_OFFSET, tmpmac);
+	}
+
+	mdiobus_register_board_info(archer_c7_mdio0_info,
+				    ARRAY_SIZE(archer_c7_mdio0_info));
+	ath79_register_mdio(0, 0x0);
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+	/* GMAC0 is connected to the RMGII interface */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x56000000;
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the SGMII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+	ath79_register_eth(1);
+
+	gpio_request_one(ARCHER_C7_GPIO_USB1_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB1 power");
+	gpio_request_one(ARCHER_C7_GPIO_USB2_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB2 power");
+	ath79_register_usb();
+}
+
+static void __init archer_c5_setup(void)
+{
+	common_setup(true);
+}
+
+MIPS_MACHINE(ATH79_MACH_ARCHER_C5, "ARCHER-C5", "TP-LINK Archer C5",
+	     archer_c5_setup);
+
+static void __init archer_c7_setup(void)
+{
+	common_setup(true);
+}
+
+MIPS_MACHINE(ATH79_MACH_ARCHER_C7, "ARCHER-C7", "TP-LINK Archer C7",
+	     archer_c7_setup);
+
+static void __init tl_wdr4900_v2_setup(void)
+{
+	common_setup(false);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WDR4900_V2, "TL-WDR4900-v2", "TP-LINK TL-WDR4900 v2",
+	     tl_wdr4900_v2_setup)
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-aw-nr580.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-aw-nr580.c
new file mode 100644
index 00000000..281129b7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-aw-nr580.c
@@ -0,0 +1,107 @@
+/*
+ *  AzureWave AW-NR580 board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define AW_NR580_GPIO_LED_READY_RED	0
+#define AW_NR580_GPIO_LED_WLAN		1
+#define AW_NR580_GPIO_LED_READY_GREEN	2
+#define AW_NR580_GPIO_LED_WPS_GREEN	4
+#define AW_NR580_GPIO_LED_WPS_AMBER	5
+
+#define AW_NR580_GPIO_BTN_WPS		3
+#define AW_NR580_GPIO_BTN_RESET		11
+
+#define AW_NR580_KEYS_POLL_INTERVAL	20	/* msecs */
+#define AW_NR580_KEYS_DEBOUNCE_INTERVAL	(3 * AW_NR580_KEYS_POLL_INTERVAL)
+
+static struct gpio_led aw_nr580_leds_gpio[] __initdata = {
+	{
+		.name		= "aw-nr580:red:ready",
+		.gpio		= AW_NR580_GPIO_LED_READY_RED,
+		.active_low	= 0,
+	}, {
+		.name		= "aw-nr580:green:ready",
+		.gpio		= AW_NR580_GPIO_LED_READY_GREEN,
+		.active_low	= 0,
+	}, {
+		.name		= "aw-nr580:green:wps",
+		.gpio		= AW_NR580_GPIO_LED_WPS_GREEN,
+		.active_low	= 0,
+	}, {
+		.name		= "aw-nr580:amber:wps",
+		.gpio		= AW_NR580_GPIO_LED_WPS_AMBER,
+		.active_low	= 0,
+	}, {
+		.name		= "aw-nr580:green:wlan",
+		.gpio		= AW_NR580_GPIO_LED_WLAN,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button aw_nr580_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = AW_NR580_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AW_NR580_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = AW_NR580_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= AW_NR580_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static const char *aw_nr580_part_probes[] = {
+	"RedBoot",
+	NULL,
+};
+
+static struct flash_platform_data aw_nr580_flash_data = {
+	.part_probes	= aw_nr580_part_probes,
+};
+
+static void __init aw_nr580_setup(void)
+{
+	ath79_register_mdio(0, 0x0);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+
+	ath79_register_pci();
+
+	ath79_register_m25p80(&aw_nr580_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(aw_nr580_leds_gpio),
+				 aw_nr580_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, AW_NR580_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(aw_nr580_gpio_keys),
+					aw_nr580_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_AW_NR580, "AW-NR580", "AzureWave AW-NR580",
+	     aw_nr580_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-bhu-bxu2000n2-a.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-bhu-bxu2000n2-a.c
new file mode 100644
index 00000000..8d7c6112
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-bhu-bxu2000n2-a.c
@@ -0,0 +1,120 @@
+/*
+ *  BHU BXU2000n-2 A1 board support
+ *
+ *  Copyright (C) 2013 Terry Yang <yangbo@bhunetworks.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define BHU_BXU2000N2_A1_GPIO_LED_WLAN		13
+#define BHU_BXU2000N2_A1_GPIO_LED_WAN		19
+#define BHU_BXU2000N2_A1_GPIO_LED_LAN		21
+#define BHU_BXU2000N2_A1_GPIO_LED_SYSTEM	14
+
+#define BHU_BXU2000N2_A1_GPIO_BTN_RESET		17
+
+#define BHU_BXU2000N2_KEYS_POLL_INTERVAL	20	/* msecs */
+#define BHU_BXU2000N2_KEYS_DEBOUNCE_INTERVAL	\
+	(3 * BHU_BXU2000N2_KEYS_POLL_INTERVAL)
+
+static const char *bhu_bxu2000n2_part_probes[] = {
+	"cmdlinepart",
+	NULL,
+};
+
+static struct flash_platform_data bhu_bxu2000n2_flash_data = {
+	.part_probes	= bhu_bxu2000n2_part_probes,
+};
+
+static struct gpio_led bhu_bxu2000n2_a1_leds_gpio[] __initdata = {
+	{
+		.name		= "bhu:green:status",
+		.gpio		= BHU_BXU2000N2_A1_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "bhu:green:lan",
+		.gpio		= BHU_BXU2000N2_A1_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "bhu:green:wan",
+		.gpio		= BHU_BXU2000N2_A1_GPIO_LED_WAN,
+		.active_low	= 1,
+	}, {
+		.name		= "bhu:green:wlan",
+		.gpio		= BHU_BXU2000N2_A1_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button bhu_bxu2000n2_a1_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = BHU_BXU2000N2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= BHU_BXU2000N2_A1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static void __init bhu_ap123_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&bhu_bxu2000n2_flash_data);
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+
+	/* GMAC0 is connected to the PHY4 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(4);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(4);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the internal switch. Only use PHY3 */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_eth1_data.phy_mask = BIT(3);
+	ath79_register_eth(1);
+
+	ath79_register_wmac(ee, ee+2);
+}
+
+static void __init bhu_bxu2000n2_a1_setup(void)
+{
+	bhu_ap123_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(bhu_bxu2000n2_a1_leds_gpio),
+				 bhu_bxu2000n2_a1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, BHU_BXU2000N2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(bhu_bxu2000n2_a1_gpio_keys),
+					bhu_bxu2000n2_a1_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_BHU_BXU2000N2_A1, "BXU2000n-2-A1",
+	     "BHU BXU2000n-2 rev. A1",
+	     bhu_bxu2000n2_a1_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cap4200ag.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cap4200ag.c
new file mode 100644
index 00000000..18944c40
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cap4200ag.c
@@ -0,0 +1,131 @@
+/*
+ *  Senao CAP4200AG board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define CAP4200AG_GPIO_LED_PWR_GREEN	12
+#define CAP4200AG_GPIO_LED_PWR_AMBER	13
+#define CAP4200AG_GPIO_LED_LAN_GREEN	14
+#define CAP4200AG_GPIO_LED_LAN_AMBER	15
+#define CAP4200AG_GPIO_LED_WLAN_GREEN	18
+#define CAP4200AG_GPIO_LED_WLAN_AMBER	19
+
+#define CAP4200AG_GPIO_BTN_RESET	17
+
+#define CAP4200AG_KEYS_POLL_INTERVAL	20	/* msecs */
+#define CAP4200AG_KEYS_DEBOUNCE_INTERVAL (3 * CAP4200AG_KEYS_POLL_INTERVAL)
+
+#define CAP4200AG_MAC_OFFSET		0
+#define CAP4200AG_WMAC_CALDATA_OFFSET	0x1000
+#define CAP4200AG_PCIE_CALDATA_OFFSET	0x5000
+
+static struct gpio_led cap4200ag_leds_gpio[] __initdata = {
+	{
+		.name		= "senao:green:pwr",
+		.gpio		= CAP4200AG_GPIO_LED_PWR_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "senao:amber:pwr",
+		.gpio		= CAP4200AG_GPIO_LED_PWR_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "senao:green:lan",
+		.gpio		= CAP4200AG_GPIO_LED_LAN_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "senao:amber:lan",
+		.gpio		= CAP4200AG_GPIO_LED_LAN_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "senao:green:wlan",
+		.gpio		= CAP4200AG_GPIO_LED_WLAN_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "senao:amber:wlan",
+		.gpio		= CAP4200AG_GPIO_LED_WLAN_AMBER,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button cap4200ag_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = CAP4200AG_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= CAP4200AG_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+static void __init cap4200ag_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 mac[6];
+
+	ath79_gpio_output_select(CAP4200AG_GPIO_LED_LAN_GREEN,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(CAP4200AG_GPIO_LED_LAN_AMBER,
+				 AR934X_GPIO_OUT_GPIO);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(cap4200ag_leds_gpio),
+				 cap4200ag_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, CAP4200AG_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(cap4200ag_gpio_keys),
+					cap4200ag_gpio_keys);
+
+	ath79_init_mac(mac, art + CAP4200AG_MAC_OFFSET, -1);
+	ath79_wmac_disable_2ghz();
+	ath79_register_wmac(art + CAP4200AG_WMAC_CALDATA_OFFSET, mac);
+
+	ath79_init_mac(mac, art + CAP4200AG_MAC_OFFSET, -2);
+	ap91_pci_init(art + CAP4200AG_PCIE_CALDATA_OFFSET, mac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+				   AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+		       art + CAP4200AG_MAC_OFFSET, -2);
+
+	/* GMAC0 is connected to an external PHY */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_CAP4200AG, "CAP4200AG", "Senao CAP4200AG",
+	     cap4200ag_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
new file mode 100644
index 00000000..babe1011
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
@@ -0,0 +1,105 @@
+/*
+ *  8devices Carambola2 board support
+ *
+ *  Copyright (C) 2013 Darius Augulis <darius@8devices.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define CARAMBOLA2_GPIO_LED_WLAN		0
+#define CARAMBOLA2_GPIO_LED_ETH0		14
+#define CARAMBOLA2_GPIO_LED_ETH1		13
+
+#define CARAMBOLA2_GPIO_BTN_JUMPSTART		11
+
+#define CARAMBOLA2_KEYS_POLL_INTERVAL		20	/* msecs */
+#define CARAMBOLA2_KEYS_DEBOUNCE_INTERVAL	(3 * CARAMBOLA2_KEYS_POLL_INTERVAL)
+
+#define CARAMBOLA2_MAC0_OFFSET			0x0000
+#define CARAMBOLA2_MAC1_OFFSET			0x0006
+#define CARAMBOLA2_CALDATA_OFFSET		0x1000
+#define CARAMBOLA2_WMAC_MAC_OFFSET		0x1002
+
+static struct gpio_led carambola2_leds_gpio[] __initdata = {
+	{
+		.name		= "carambola2:green:wlan",
+		.gpio		= CARAMBOLA2_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "carambola2:orange:eth0",
+		.gpio		= CARAMBOLA2_GPIO_LED_ETH0,
+		.active_low	= 0,
+	}, {
+		.name		= "carambola2:orange:eth1",
+		.gpio		= CARAMBOLA2_GPIO_LED_ETH1,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button carambola2_gpio_keys[] __initdata = {
+	{
+		.desc		= "jumpstart button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = CARAMBOLA2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= CARAMBOLA2_GPIO_BTN_JUMPSTART,
+		.active_low	= 1,
+	},
+};
+
+static void __init carambola2_common_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_m25p80(NULL);
+	ath79_register_wmac(art + CARAMBOLA2_CALDATA_OFFSET,
+			    art + CARAMBOLA2_WMAC_MAC_OFFSET);
+
+	ath79_setup_ar933x_phy4_switch(true, true);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art + CARAMBOLA2_MAC0_OFFSET, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, art + CARAMBOLA2_MAC1_OFFSET, 0);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+
+	/* WAN port */
+	ath79_register_eth(0);
+}
+
+static void __init carambola2_setup(void)
+{
+	carambola2_common_setup();
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(carambola2_leds_gpio),
+				 carambola2_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, CARAMBOLA2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(carambola2_gpio_keys),
+					carambola2_gpio_keys);
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_CARAMBOLA2, "CARAMBOLA2", "8devices Carambola2 board",
+		carambola2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
new file mode 100644
index 00000000..8bf5c0f6
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
@@ -0,0 +1,107 @@
+/*
+ *  TP-LINK CPE210/220/510/520 board support
+ *
+ *  Copyright (C) 2014 Matthias Schiffer <mschiffer@universe-factory.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+
+#define CPE510_GPIO_LED_LAN0	11
+#define CPE510_GPIO_LED_LAN1	12
+#define CPE510_GPIO_LED_L1	13
+#define CPE510_GPIO_LED_L2	14
+#define CPE510_GPIO_LED_L3	15
+#define CPE510_GPIO_LED_L4	16
+
+#define CPE510_GPIO_BTN_RESET	4
+
+#define CPE510_KEYS_POLL_INTERVAL	20 /* msecs */
+#define CPE510_KEYS_DEBOUNCE_INTERVAL	(3 * CPE510_KEYS_POLL_INTERVAL)
+
+
+static struct gpio_led cpe510_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan0",
+		.gpio		= CPE510_GPIO_LED_LAN0,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan1",
+		.gpio		= CPE510_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:link1",
+		.gpio		= CPE510_GPIO_LED_L1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:link2",
+		.gpio		= CPE510_GPIO_LED_L2,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:link3",
+		.gpio		= CPE510_GPIO_LED_L3,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:link4",
+		.gpio		= CPE510_GPIO_LED_L4,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button cpe510_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = CPE510_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= CPE510_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+
+static void __init cpe510_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* Disable JTAG, enabling GPIOs 0-3 */
+	/* Configure OBS4 line, for GPIO 4*/
+	ath79_gpio_function_setup(AR934X_GPIO_FUNC_JTAG_DISABLE,
+				  AR934X_GPIO_FUNC_CLK_OBS4_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(cpe510_leds_gpio),
+				 cpe510_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, CPE510_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(cpe510_gpio_keys),
+					cpe510_gpio_keys);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_mdio(1, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_CPE510, "CPE510", "TP-LINK CPE210/220/510/520",
+	     cpe510_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c
new file mode 100644
index 00000000..91b554e5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c
@@ -0,0 +1,150 @@
+/*
+ *  D-Link DGL-5500 board support
+ *
+ *  Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define DGL_5500_A1_GPIO_LED_POWER_ORANGE	14
+#define DGL_5500_A1_GPIO_LED_POWER_GREEN	19
+#define DGL_5500_A1_GPIO_LED_PLANET_GREEN	22
+#define DGL_5500_A1_GPIO_LED_PLANET_ORANGE	23
+
+#define DGL_5500_A1_GPIO_BTN_WPS		16
+#define DGL_5500_A1_GPIO_BTN_RESET		17
+
+#define DGL_5500_A1_KEYS_POLL_INTERVAL		20	/* msecs */
+#define DGL_5500_A1_KEYS_DEBOUNCE_INTERVAL	\
+					(3 * DGL_5500_A1_KEYS_POLL_INTERVAL)
+
+#define DGL_5500_A1_WMAC_CALDATA_OFFSET		0x1000
+
+#define DGL_5500_A1_LAN_MAC_OFFSET	0x04
+#define DGL_5500_A1_WAN_MAC_OFFSET	0x16
+
+static struct gpio_led dgl_5500_a1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:green:power",
+		.gpio		= DGL_5500_A1_GPIO_LED_POWER_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:orange:power",
+		.gpio		= DGL_5500_A1_GPIO_LED_POWER_ORANGE,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:green:planet",
+		.gpio		= DGL_5500_A1_GPIO_LED_PLANET_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:orange:planet",
+		.gpio		= DGL_5500_A1_GPIO_LED_PLANET_ORANGE,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button dgl_5500_a1_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DGL_5500_A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DGL_5500_A1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DGL_5500_A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DGL_5500_A1_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg dgl_5500_a1_ar8327_pad0_cfg = {
+	/* Use the SGMII interface for the GMAC0 of the AR8327 switch */
+	.mode = AR8327_PAD_MAC_SGMII,
+	.sgmii_delay_en = true,
+};
+
+static struct ar8327_platform_data dgl_5500_a1_ar8327_data = {
+	.pad0_cfg = &dgl_5500_a1_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+};
+
+static struct mdio_board_info dgl_5500_a1_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &dgl_5500_a1_ar8327_data,
+	},
+};
+
+static void __init dgl_5500_a1_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1ffe0000);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 lan_mac[ETH_ALEN];
+
+	ath79_parse_ascii_mac(mac + DGL_5500_A1_LAN_MAC_OFFSET, lan_mac);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dgl_5500_a1_leds_gpio),
+				 dgl_5500_a1_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, DGL_5500_A1_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dgl_5500_a1_gpio_keys),
+					dgl_5500_a1_gpio_keys);
+
+	ath79_register_wmac(art + DGL_5500_A1_WMAC_CALDATA_OFFSET, lan_mac);
+
+	ath79_register_mdio(0, 0x0);
+	mdiobus_register_board_info(dgl_5500_a1_mdio0_info,
+				    ARRAY_SIZE(dgl_5500_a1_mdio0_info));
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, lan_mac, 0);
+
+	/* GMAC1 is connected to an AR8327N switch via the SMGII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.phy_mask = BIT(0);
+	ath79_eth1_data.mii_bus_dev = &ath79_mdio0_device.dev;
+
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_DGL_5500_A1, "DGL-5500-A1", "D-Link DGL-5500 rev. A1",
+	     dgl_5500_a1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
new file mode 100644
index 00000000..ae477642
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
@@ -0,0 +1,170 @@
+/*
+ *  D-Link DHP-1565 rev. A1 board support
+ *
+ *  Copyright (C) 2014 Jacek Kikiewicz
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define DHP1565A1_GPIO_LED_BLUE_USB		11
+#define DHP1565A1_GPIO_LED_AMBER_POWER		14
+#define DHP1565A1_GPIO_LED_BLUE_POWER		22
+#define DHP1565A1_GPIO_LED_BLUE_WPS		15
+#define DHP1565A1_GPIO_LED_AMBER_PLANET		19
+#define DHP1565A1_GPIO_LED_BLUE_PLANET		18
+#define DHP1565A1_GPIO_LED_WLAN_2G		13
+
+#define DHP1565A1_GPIO_WAN_LED_ENABLE		20
+
+#define DHP1565A1_GPIO_BTN_RESET			17
+#define DHP1565A1_GPIO_BTN_WPS			16
+
+#define DHP1565A1_KEYS_POLL_INTERVAL		20	/* msecs */
+#define DHP1565A1_KEYS_DEBOUNCE_INTERVAL		(3 * DHP1565A1_KEYS_POLL_INTERVAL)
+
+#define DHP1565A1_MAC0_OFFSET			0xFFA0
+#define DHP1565A1_MAC1_OFFSET			0xFFB4
+#define DHP1565A1_WMAC0_OFFSET			0x5
+#define DHP1565A1_WMAC_CALDATA_OFFSET		0x1000
+#define DHP1565A1_PCIE_CALDATA_OFFSET		0x5000
+
+static struct gpio_led dhp1565a1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:amber:power",
+		.gpio		= DHP1565A1_GPIO_LED_AMBER_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:green:power",
+		.gpio		= DHP1565A1_GPIO_LED_BLUE_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:amber:planet",
+		.gpio		= DHP1565A1_GPIO_LED_AMBER_PLANET,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:green:planet",
+		.gpio		= DHP1565A1_GPIO_LED_BLUE_PLANET,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button dhp1565a1_gpio_keys[] __initdata = {
+	{
+		.desc		= "Soft reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DHP1565A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DHP1565A1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DHP1565A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DHP1565A1_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg dhp1565a1_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_platform_data dhp1565a1_ar8327_data = {
+	.pad0_cfg = &dhp1565a1_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+};
+
+static struct mdio_board_info dhp1565a1_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &dhp1565a1_ar8327_data,
+	},
+};
+
+static void __init dhp1565a1_generic_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1ffe0000);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 mac0[ETH_ALEN], mac1[ETH_ALEN];
+	u8 wmac0[ETH_ALEN];
+
+	ath79_parse_ascii_mac(mac + DHP1565A1_MAC0_OFFSET, mac0);
+	ath79_parse_ascii_mac(mac + DHP1565A1_MAC1_OFFSET, mac1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_gpio_keys_polled(-1, DHP1565A1_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dhp1565a1_gpio_keys),
+					dhp1565a1_gpio_keys);
+
+	ath79_init_mac(wmac0, mac0, 0);
+	ath79_register_wmac(art + DHP1565A1_WMAC_CALDATA_OFFSET, wmac0);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
+
+	mdiobus_register_board_info(dhp1565a1_mdio0_info,
+				    ARRAY_SIZE(dhp1565a1_mdio0_info));
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 1);
+
+	/* GMAC0 is connected to an AR8327N switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+}
+
+static void __init dhp1565a1_setup(void)
+{
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dhp1565a1_leds_gpio),
+				 dhp1565a1_leds_gpio);
+
+	dhp1565a1_generic_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_DHP_1565_A1, "DHP-1565-A1",
+	     "D-Link DHP-1565 rev. A1",
+	     dhp1565a1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-505-a1.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-505-a1.c
new file mode 100644
index 00000000..d3914659
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-505-a1.c
@@ -0,0 +1,116 @@
+/*
+ *  DLink DIR-505 A1 board support
+ *
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define DIR_505A1_GPIO_BTN_WPS         11 /* verify */
+#define DIR_505A1_GPIO_BTN_RESET       12 /* verify */
+
+#define DIR_505A1_GPIO_LED_RED         26 /* unused, fyi */
+#define DIR_505A1_GPIO_LED_GREEN       27
+
+#define DIR_505A1_GPIO_WAN_LED_ENABLE  1
+
+#define DIR_505A1_KEYS_POLL_INTERVAL   20      /* msecs */
+#define DIR_505A1_KEYS_DEBOUNCE_INTERVAL (3 * DIR_505A1_KEYS_POLL_INTERVAL)
+
+#define DIR_505A1_ART_ADDRESS          0x1f010000
+#define DIR_505A1_CALDATA_OFFSET       0x1000
+
+#define DIR_505A1_MAC_PART_ADDRESS	0x1f020000
+#define DIR_505A1_LAN_MAC_OFFSET	0x04
+#define DIR_505A1_WAN_MAC_OFFSET	0x16
+
+static struct gpio_led dir_505_a1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:green:power",
+		.gpio		= DIR_505A1_GPIO_LED_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:red:status",
+		.gpio		= DIR_505A1_GPIO_LED_RED,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button dir_505_a1_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DIR_505A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR_505A1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DIR_505A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR_505A1_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static void __init dir_505_a1_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(DIR_505A1_ART_ADDRESS);
+	u8 *mac = (u8 *) KSEG1ADDR(DIR_505A1_MAC_PART_ADDRESS);
+	u8 lan_mac[ETH_ALEN];
+	u8 wan_mac[ETH_ALEN];
+
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+		AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+		AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+		AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+		AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	gpio_request_one(DIR_505A1_GPIO_WAN_LED_ENABLE,
+		GPIOF_OUT_INIT_LOW, "WAN LED enable");
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir_505_a1_leds_gpio),
+		dir_505_a1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, DIR_505A1_KEYS_POLL_INTERVAL,
+		ARRAY_SIZE(dir_505_a1_gpio_keys),
+		dir_505_a1_gpio_keys);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_usb();
+
+	ath79_parse_ascii_mac(mac + DIR_505A1_LAN_MAC_OFFSET, lan_mac);
+	ath79_parse_ascii_mac(mac + DIR_505A1_WAN_MAC_OFFSET, wan_mac);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, wan_mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, lan_mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(art + DIR_505A1_CALDATA_OFFSET, lan_mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_505_A1, "DIR-505-A1",
+		"D-Link DIR-505 rev. A1", dir_505_a1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c
new file mode 100644
index 00000000..321fdce7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c
@@ -0,0 +1,159 @@
+/*
+ *  D-Link DIR-600 rev. A1 board support
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2012 Vadim Girlin <vadimgirlin@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define DIR_600_A1_GPIO_LED_WPS			0
+#define DIR_600_A1_GPIO_LED_POWER_AMBER		1
+#define DIR_600_A1_GPIO_LED_POWER_GREEN		6
+#define DIR_600_A1_GPIO_LED_LAN1		13
+#define DIR_600_A1_GPIO_LED_LAN2		14
+#define DIR_600_A1_GPIO_LED_LAN3		15
+#define DIR_600_A1_GPIO_LED_LAN4		16
+#define DIR_600_A1_GPIO_LED_WAN_AMBER		7
+#define DIR_600_A1_GPIO_LED_WAN_GREEN		17
+
+#define DIR_600_A1_GPIO_BTN_RESET		8
+#define DIR_600_A1_GPIO_BTN_WPS			12
+
+#define DIR_600_A1_KEYS_POLL_INTERVAL		20	/* msecs */
+#define DIR_600_A1_KEYS_DEBOUNCE_INTERVAL (3 * DIR_600_A1_KEYS_POLL_INTERVAL)
+
+#define DIR_600_A1_NVRAM_ADDR	0x1f030000
+#define DIR_600_A1_NVRAM_SIZE	0x10000
+
+static struct gpio_led dir_600_a1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:green:power",
+		.gpio		= DIR_600_A1_GPIO_LED_POWER_GREEN,
+	}, {
+		.name		= "d-link:amber:power",
+		.gpio		= DIR_600_A1_GPIO_LED_POWER_AMBER,
+	}, {
+		.name		= "d-link:amber:wan",
+		.gpio		= DIR_600_A1_GPIO_LED_WAN_AMBER,
+	}, {
+		.name		= "d-link:green:wan",
+		.gpio		= DIR_600_A1_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:lan1",
+		.gpio		= DIR_600_A1_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:lan2",
+		.gpio		= DIR_600_A1_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:lan3",
+		.gpio		= DIR_600_A1_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:lan4",
+		.gpio		= DIR_600_A1_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:blue:wps",
+		.gpio		= DIR_600_A1_GPIO_LED_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button dir_600_a1_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DIR_600_A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR_600_A1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DIR_600_A1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR_600_A1_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static void __init dir_600_a1_setup(void)
+{
+	const char *nvram = (char *) KSEG1ADDR(DIR_600_A1_NVRAM_ADDR);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 mac_buff[6];
+	u8 *mac = NULL;
+
+	if (ath79_nvram_parse_mac_addr(nvram, DIR_600_A1_NVRAM_SIZE,
+				       "lan_mac=", mac_buff) == 0) {
+		ath79_init_mac(ath79_eth0_data.mac_addr, mac_buff, 0);
+		ath79_init_mac(ath79_eth1_data.mac_addr, mac_buff, 1);
+		mac = mac_buff;
+	}
+
+	ath79_register_m25p80(NULL);
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir_600_a1_leds_gpio),
+				 dir_600_a1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, DIR_600_A1_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dir_600_a1_gpio_keys),
+					dir_600_a1_gpio_keys);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+
+	/* WAN port */
+	ath79_register_eth(0);
+
+	ap91_pci_init(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1",
+	     dir_600_a1_setup);
+
+static void __init dir_615_e1_setup(void)
+{
+	dir_600_a1_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_615_E1, "DIR-615-E1", "D-Link DIR-615 rev. E1",
+	     dir_615_e1_setup);
+
+static void __init dir_615_e4_setup(void)
+{
+	dir_600_a1_setup();
+	ap9x_pci_setup_wmac_led_pin(0, 1);
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_615_E4, "DIR-615-E4", "D-Link DIR-615 rev. E4",
+	     dir_615_e4_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c
new file mode 100644
index 00000000..425be301
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c
@@ -0,0 +1,133 @@
+/*
+ *  D-Link DIR-615 rev C1 board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define DIR_615C1_GPIO_LED_ORANGE_STATUS 1	/* ORANGE:STATUS:TRICOLOR */
+#define DIR_615C1_GPIO_LED_BLUE_WPS	3	/* BLUE:WPS */
+#define DIR_615C1_GPIO_LED_GREEN_WAN	4       /* GREEN:WAN:TRICOLOR */
+#define DIR_615C1_GPIO_LED_GREEN_WANCPU	5       /* GREEN:WAN:CPU:TRICOLOR */
+#define DIR_615C1_GPIO_LED_GREEN_WLAN	6	/* GREEN:WLAN */
+#define DIR_615C1_GPIO_LED_GREEN_STATUS	14	/* GREEN:STATUS:TRICOLOR */
+#define DIR_615C1_GPIO_LED_ORANGE_WAN	15	/* ORANGE:WAN:TRICOLOR */
+
+/* buttons may need refinement */
+
+#define DIR_615C1_GPIO_BTN_WPS		12
+#define DIR_615C1_GPIO_BTN_RESET	21
+
+#define DIR_615C1_KEYS_POLL_INTERVAL	20	/* msecs */
+#define DIR_615C1_KEYS_DEBOUNCE_INTERVAL (3 * DIR_615C1_KEYS_POLL_INTERVAL)
+
+#define DIR_615C1_CONFIG_ADDR		0x1f020000
+#define DIR_615C1_CONFIG_SIZE		0x10000
+
+static struct gpio_led dir_615c1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:orange:status",
+		.gpio		= DIR_615C1_GPIO_LED_ORANGE_STATUS,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:blue:wps",
+		.gpio		= DIR_615C1_GPIO_LED_BLUE_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:wan",
+		.gpio		= DIR_615C1_GPIO_LED_GREEN_WAN,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:wancpu",
+		.gpio		= DIR_615C1_GPIO_LED_GREEN_WANCPU,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:wlan",
+		.gpio		= DIR_615C1_GPIO_LED_GREEN_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:green:status",
+		.gpio		= DIR_615C1_GPIO_LED_GREEN_STATUS,
+		.active_low     = 1,
+	}, {
+		.name		= "d-link:orange:wan",
+		.gpio		= DIR_615C1_GPIO_LED_ORANGE_WAN,
+		.active_low	= 1,
+	}
+
+};
+
+static struct gpio_keys_button dir_615c1_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DIR_615C1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR_615C1_GPIO_BTN_RESET,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DIR_615C1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR_615C1_GPIO_BTN_WPS,
+	}
+};
+
+#define DIR_615C1_LAN_PHYMASK	BIT(0)
+#define DIR_615C1_WAN_PHYMASK	BIT(4)
+#define DIR_615C1_MDIO_MASK	(~(DIR_615C1_LAN_PHYMASK | \
+				   DIR_615C1_WAN_PHYMASK))
+
+static void __init dir_615c1_setup(void)
+{
+	const char *config = (char *) KSEG1ADDR(DIR_615C1_CONFIG_ADDR);
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 mac[6];
+	u8 *wlan_mac = NULL;
+
+	if (ath79_nvram_parse_mac_addr(config, DIR_615C1_CONFIG_SIZE,
+				       "lan_mac=", mac) == 0) {
+		ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+		ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+		wlan_mac = mac;
+	}
+
+	ath79_register_mdio(0, DIR_615C1_MDIO_MASK);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.phy_mask = DIR_615C1_LAN_PHYMASK;
+
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = DIR_615C1_WAN_PHYMASK;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir_615c1_leds_gpio),
+				 dir_615c1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, DIR_615C1_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dir_615c1_gpio_keys),
+					dir_615c1_gpio_keys);
+
+	ath79_register_wmac(eeprom, wlan_mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_615_C1, "DIR-615-C1", "D-Link DIR-615 rev. C1",
+	     dir_615c1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c
new file mode 100644
index 00000000..9b82990b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c
@@ -0,0 +1,191 @@
+/*
+ *  D-Link DIR-825 rev. B1 board support
+ *
+ *  Copyright (C) 2009-2011 Lukas Kuna, Evkanet, s.r.o.
+ *
+ *  based on mach-wndr3700.c
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/rtl8366.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define DIR825B1_GPIO_LED_BLUE_USB		0
+#define DIR825B1_GPIO_LED_ORANGE_POWER		1
+#define DIR825B1_GPIO_LED_BLUE_POWER		2
+#define DIR825B1_GPIO_LED_BLUE_WPS		4
+#define DIR825B1_GPIO_LED_ORANGE_PLANET		6
+#define DIR825B1_GPIO_LED_BLUE_PLANET		11
+
+#define DIR825B1_GPIO_BTN_RESET			3
+#define DIR825B1_GPIO_BTN_WPS			8
+
+#define DIR825B1_GPIO_RTL8366_SDA		5
+#define DIR825B1_GPIO_RTL8366_SCK		7
+
+#define DIR825B1_KEYS_POLL_INTERVAL		20	/* msecs */
+#define DIR825B1_KEYS_DEBOUNCE_INTERVAL		(3 * DIR825B1_KEYS_POLL_INTERVAL)
+
+#define DIR825B1_CAL0_OFFSET			0x1000
+#define DIR825B1_CAL1_OFFSET			0x5000
+#define DIR825B1_MAC0_OFFSET			0xffa0
+#define DIR825B1_MAC1_OFFSET			0xffb4
+
+#define DIR825B1_CAL_LOCATION_0			0x1f660000
+#define DIR825B1_CAL_LOCATION_1			0x1f7f0000
+
+static struct gpio_led dir825b1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:blue:usb",
+		.gpio		= DIR825B1_GPIO_LED_BLUE_USB,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:orange:power",
+		.gpio		= DIR825B1_GPIO_LED_ORANGE_POWER,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:blue:power",
+		.gpio		= DIR825B1_GPIO_LED_BLUE_POWER,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:blue:wps",
+		.gpio		= DIR825B1_GPIO_LED_BLUE_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:orange:planet",
+		.gpio		= DIR825B1_GPIO_LED_ORANGE_PLANET,
+		.active_low	= 1,
+	}, {
+		.name		= "d-link:blue:planet",
+		.gpio		= DIR825B1_GPIO_LED_BLUE_PLANET,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button dir825b1_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DIR825B1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR825B1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DIR825B1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR825B1_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct rtl8366_initval dir825b1_rtl8366s_initvals[] = {
+	{ .reg = 0x06, .val = 0x0108 },
+};
+
+static struct rtl8366_platform_data dir825b1_rtl8366s_data = {
+	.gpio_sda	= DIR825B1_GPIO_RTL8366_SDA,
+	.gpio_sck	= DIR825B1_GPIO_RTL8366_SCK,
+	.num_initvals	= ARRAY_SIZE(dir825b1_rtl8366s_initvals),
+	.initvals	= dir825b1_rtl8366s_initvals,
+};
+
+static struct platform_device dir825b1_rtl8366s_device = {
+	.name		= RTL8366S_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &dir825b1_rtl8366s_data,
+	}
+};
+
+static bool __init dir825b1_is_caldata_valid(u8 *p)
+{
+	u16 *magic0, *magic1;
+
+	magic0 = (u16 *)(p + DIR825B1_CAL0_OFFSET);
+	magic1 = (u16 *)(p + DIR825B1_CAL1_OFFSET);
+
+	return (*magic0 == 0xa55a && *magic1 == 0xa55a);
+}
+
+static void __init dir825b1_wlan_init(void)
+{
+	u8 *caldata;
+	u8 mac0[ETH_ALEN], mac1[ETH_ALEN];
+	u8 wmac0[ETH_ALEN], wmac1[ETH_ALEN];
+
+	caldata = (u8 *) KSEG1ADDR(DIR825B1_CAL_LOCATION_0);
+	if (!dir825b1_is_caldata_valid(caldata)) {
+		caldata = (u8 *)KSEG1ADDR(DIR825B1_CAL_LOCATION_1);
+		if (!dir825b1_is_caldata_valid(caldata)) {
+			pr_err("no calibration data found\n");
+			return;
+		}
+	}
+
+	ath79_parse_ascii_mac(caldata + DIR825B1_MAC0_OFFSET, mac0);
+	ath79_parse_ascii_mac(caldata + DIR825B1_MAC1_OFFSET, mac1);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac1, 0);
+	ath79_init_mac(wmac0, mac0, 0);
+	ath79_init_mac(wmac1, mac1, 1);
+
+	ap9x_pci_setup_wmac_led_pin(0, 5);
+	ap9x_pci_setup_wmac_led_pin(1, 5);
+
+	ap94_pci_init(caldata + DIR825B1_CAL0_OFFSET, wmac0,
+		      caldata + DIR825B1_CAL1_OFFSET, wmac1);
+}
+
+static void __init dir825b1_setup(void)
+{
+	dir825b1_wlan_init();
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_eth0_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_pll_data.pll_1000 = 0x11110000;
+
+	ath79_eth1_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = 0x10;
+	ath79_eth1_pll_data.pll_1000 = 0x11110000;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir825b1_leds_gpio),
+				 dir825b1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, DIR825B1_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dir825b1_gpio_keys),
+					dir825b1_gpio_keys);
+
+	ath79_register_usb();
+
+	platform_device_register(&dir825b1_rtl8366s_device);
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_825_B1, "DIR-825-B1", "D-Link DIR-825 rev. B1",
+	     dir825b1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
new file mode 100644
index 00000000..9c4c1a8b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
@@ -0,0 +1,241 @@
+/*
+ *  D-Link DIR-825 rev. C1 board support
+ *
+ *  Copyright (C) 2013 Alexander Stadler
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define DIR825C1_GPIO_LED_BLUE_USB		11
+#define DIR825C1_GPIO_LED_AMBER_POWER		14
+#define DIR825C1_GPIO_LED_BLUE_POWER		22
+#define DIR825C1_GPIO_LED_BLUE_WPS		15
+#define DIR825C1_GPIO_LED_AMBER_PLANET		19
+#define DIR825C1_GPIO_LED_BLUE_PLANET		18
+#define DIR825C1_GPIO_LED_WLAN_2G		13
+
+#define DIR825C1_GPIO_WAN_LED_ENABLE		20
+
+#define DIR825C1_GPIO_BTN_RESET			17
+#define DIR825C1_GPIO_BTN_WPS			16
+
+#define DIR825C1_KEYS_POLL_INTERVAL		20	/* msecs */
+#define DIR825C1_KEYS_DEBOUNCE_INTERVAL		(3 * DIR825C1_KEYS_POLL_INTERVAL)
+
+#define DIR825C1_MAC0_OFFSET			0x4
+#define DIR825C1_MAC1_OFFSET			0x18
+#define DIR825C1_WMAC_CALDATA_OFFSET		0x1000
+#define DIR825C1_PCIE_CALDATA_OFFSET		0x5000
+
+static struct gpio_led dir825c1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:blue:usb",
+		.gpio		= DIR825C1_GPIO_LED_BLUE_USB,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:amber:power",
+		.gpio		= DIR825C1_GPIO_LED_AMBER_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:blue:power",
+		.gpio		= DIR825C1_GPIO_LED_BLUE_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:blue:wps",
+		.gpio		= DIR825C1_GPIO_LED_BLUE_WPS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:amber:planet",
+		.gpio		= DIR825C1_GPIO_LED_AMBER_PLANET,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:blue:wlan2g",
+		.gpio		= DIR825C1_GPIO_LED_WLAN_2G,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_led dir835a1_leds_gpio[] __initdata = {
+	{
+		.name		= "d-link:amber:power",
+		.gpio		= DIR825C1_GPIO_LED_AMBER_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:green:power",
+		.gpio		= DIR825C1_GPIO_LED_BLUE_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:blue:wps",
+		.gpio		= DIR825C1_GPIO_LED_BLUE_WPS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:amber:planet",
+		.gpio		= DIR825C1_GPIO_LED_AMBER_PLANET,
+		.active_low	= 1,
+	},
+	{
+		.name		= "d-link:green:planet",
+		.gpio		= DIR825C1_GPIO_LED_BLUE_PLANET,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button dir825c1_gpio_keys[] __initdata = {
+	{
+		.desc		= "Soft reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DIR825C1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR825C1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DIR825C1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DIR825C1_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg dir825c1_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_led_cfg dir825c1_ar8327_led_cfg = {
+	.led_ctrl0 = 0x00000000,
+	.led_ctrl1 = 0xc737c737,
+	.led_ctrl2 = 0x00000000,
+	.led_ctrl3 = 0x00c30c00,
+	.open_drain = true,
+};
+
+static struct ar8327_platform_data dir825c1_ar8327_data = {
+	.pad0_cfg = &dir825c1_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &dir825c1_ar8327_led_cfg,
+};
+
+static struct mdio_board_info dir825c1_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &dir825c1_ar8327_data,
+	},
+};
+
+static void __init dir825c1_generic_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1ffe0000);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 mac0[ETH_ALEN], mac1[ETH_ALEN];
+	u8 wmac0[ETH_ALEN], wmac1[ETH_ALEN];
+
+	ath79_parse_ascii_mac(mac + DIR825C1_MAC0_OFFSET, mac0);
+	ath79_parse_ascii_mac(mac + DIR825C1_MAC1_OFFSET, mac1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_gpio_keys_polled(-1, DIR825C1_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dir825c1_gpio_keys),
+					dir825c1_gpio_keys);
+
+	ath79_init_mac(wmac0, mac0, 0);
+	ath79_register_wmac(art + DIR825C1_WMAC_CALDATA_OFFSET, wmac0);
+
+	ath79_init_mac(wmac1, mac1, 1);
+	ap91_pci_init(art + DIR825C1_PCIE_CALDATA_OFFSET, wmac1);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
+
+	mdiobus_register_board_info(dir825c1_mdio0_info,
+				    ARRAY_SIZE(dir825c1_mdio0_info));
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 0);
+
+	/* GMAC0 is connected to an AR8327N switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+}
+
+static void __init dir825c1_setup(void)
+{
+	ath79_gpio_output_select(DIR825C1_GPIO_LED_BLUE_USB,
+				 AR934X_GPIO_OUT_GPIO);
+
+	gpio_request_one(DIR825C1_GPIO_WAN_LED_ENABLE,
+			 GPIOF_OUT_INIT_LOW, "WAN LED enable");
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir825c1_leds_gpio),
+				 dir825c1_leds_gpio);
+
+	ap9x_pci_setup_wmac_led_pin(0, 0);
+
+	dir825c1_generic_setup();
+}
+
+static void __init dir835a1_setup(void)
+{
+	dir825c1_ar8327_data.led_cfg = NULL;
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dir835a1_leds_gpio),
+				 dir835a1_leds_gpio);
+
+	dir825c1_generic_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_825_C1, "DIR-825-C1",
+	     "D-Link DIR-825 rev. C1",
+	     dir825c1_setup);
+
+MIPS_MACHINE(ATH79_MACH_DIR_835_A1, "DIR-835-A1",
+	     "D-Link DIR-835 rev. A1",
+	     dir835a1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
new file mode 100644
index 00000000..3c7a5a8a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
@@ -0,0 +1,136 @@
+/*
+ *  DRAGINO V2 board support, based on Atheros AP121 board support
+ *
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2012 Elektra Wagenrad <elektra@villagetelco.org>
+ *  Copyright (C) 2014 Vittorio Gambaletta <librecmc@vittgam.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define DRAGINO2_GPIO_LED_WLAN		0
+#define DRAGINO2_GPIO_LED_LAN		13
+#define DRAGINO2_GPIO_LED_WAN		17
+
+/*
+ * The following GPIO is named "SYS" on newer revisions of the the board.
+ * It was previously used to indicate USB activity, even though it was
+ * named "Router".
+ */
+
+#define DRAGINO2_GPIO_LED_SYS		28
+#define DRAGINO2_GPIO_BTN_JUMPSTART	11
+#define DRAGINO2_GPIO_BTN_RESET		12
+
+#define DRAGINO2_KEYS_POLL_INTERVAL	20	/* msecs */
+#define DRAGINO2_KEYS_DEBOUNCE_INTERVAL	(3 * DRAGINO2_KEYS_POLL_INTERVAL)
+
+#define DRAGINO2_MAC0_OFFSET		0x0000
+#define DRAGINO2_MAC1_OFFSET		0x0006
+#define DRAGINO2_CALDATA_OFFSET		0x1000
+#define DRAGINO2_WMAC_MAC_OFFSET	0x1002
+
+static struct gpio_led dragino2_leds_gpio[] __initdata = {
+	{
+		.name		= "dragino2:red:wlan",
+		.gpio		= DRAGINO2_GPIO_LED_WLAN,
+		.active_low	= 0,
+	},
+	{
+		.name		= "dragino2:red:wan",
+		.gpio		= DRAGINO2_GPIO_LED_WAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "dragino2:red:lan",
+		.gpio		= DRAGINO2_GPIO_LED_LAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "dragino2:red:system",
+		.gpio		= DRAGINO2_GPIO_LED_SYS,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button dragino2_gpio_keys[] __initdata = {
+	{
+		.desc		= "jumpstart button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DRAGINO2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DRAGINO2_GPIO_BTN_JUMPSTART,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DRAGINO2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DRAGINO2_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static void __init dragino2_common_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_m25p80(NULL);
+	ath79_register_wmac(art + DRAGINO2_CALDATA_OFFSET,
+			    art + DRAGINO2_WMAC_MAC_OFFSET);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art + DRAGINO2_MAC0_OFFSET, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, art + DRAGINO2_MAC1_OFFSET, 0);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* Enable GPIO13, GPIO14, GPIO15, GPIO16 and GPIO17 */
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	/* LAN port */
+	ath79_register_eth(1);
+
+	/* WAN port */
+	ath79_register_eth(0);
+
+	/* Enable GPIO26 and GPIO27 */
+	ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP,
+		       ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP) |
+		       AR933X_BOOTSTRAP_MDIO_GPIO_EN);
+}
+
+static void __init dragino2_setup(void)
+{
+	dragino2_common_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dragino2_leds_gpio),
+				 dragino2_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, DRAGINO2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dragino2_gpio_keys),
+					dragino2_gpio_keys);
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_DRAGINO2, "DRAGINO2", "Dragino Dragino v2",
+	     dragino2_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap300v2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap300v2.c
new file mode 100644
index 00000000..ba577e25
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap300v2.c
@@ -0,0 +1,101 @@
+/*
+ * EnGenius EAP300 v2 board support
+ *
+ * Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define EAP300V2_GPIO_LED_POWER		0
+#define EAP300V2_GPIO_LED_LAN		16
+#define EAP300V2_GPIO_LED_WLAN		17
+
+#define EAP300V2_GPIO_BTN_RESET		1
+
+#define EAP300V2_KEYS_POLL_INTERVAL	20	/* msecs */
+#define EAP300V2_KEYS_DEBOUNCE_INTERVAL	(3 * EAP300V2_KEYS_POLL_INTERVAL)
+
+static struct gpio_led eap300v2_leds_gpio[] __initdata = {
+	{
+		.name		= "engenius:blue:power",
+		.gpio		= EAP300V2_GPIO_LED_POWER,
+		.active_low	= 1,
+	}, {
+		.name		= "engenius:blue:lan",
+		.gpio		= EAP300V2_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "engenius:blue:wlan",
+		.gpio		= EAP300V2_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button eap300v2_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = EAP300V2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= EAP300V2_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+#define EAP300V2_ART_MAC_OFFSET		2
+
+#define EAP300V2_LAN_PHYMASK		BIT(0)
+
+static void __init eap300v2_setup(void)
+{
+	u8 *art = (u8 *)KSEG1ADDR(0x1fff1000);
+
+	ath79_gpio_function_enable(AR934X_GPIO_FUNC_JTAG_DISABLE);
+
+	ath79_gpio_output_select(EAP300V2_GPIO_LED_POWER, AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(EAP300V2_GPIO_LED_LAN, AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(EAP300V2_GPIO_LED_WLAN, AR934X_GPIO_OUT_GPIO);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(eap300v2_leds_gpio),
+				 eap300v2_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, EAP300V2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(eap300v2_gpio_keys),
+					eap300v2_gpio_keys);
+
+	ath79_register_m25p80(NULL);
+	ath79_register_wmac(art, NULL);
+	ath79_register_mdio(1, 0x0);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+		       art + EAP300V2_ART_MAC_OFFSET, 0);
+
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = EAP300V2_LAN_PHYMASK;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = EAP300V2_LAN_PHYMASK;
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_EAP300V2, "EAP300V2", "EnGenius EAP300 v2",
+	     eap300v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap7660d.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap7660d.c
new file mode 100644
index 00000000..787e6275
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-eap7660d.c
@@ -0,0 +1,181 @@
+/*
+ *  Senao EAP7660D board support
+ *
+ *  Copyright (C) 2010 Daniel Golle <daniel.golle@gmail.com>
+ *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/ath5k_platform.h>
+#include <linux/delay.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define EAP7660D_KEYS_POLL_INTERVAL	20	/* msecs */
+#define EAP7660D_KEYS_DEBOUNCE_INTERVAL	(3 * EAP7660D_KEYS_POLL_INTERVAL)
+
+#define EAP7660D_GPIO_DS4		7
+#define EAP7660D_GPIO_DS5		2
+#define EAP7660D_GPIO_DS7		0
+#define EAP7660D_GPIO_DS8		4
+#define EAP7660D_GPIO_SW1		3
+#define EAP7660D_GPIO_SW3		8
+#define EAP7660D_PHYMASK		BIT(20)
+#define EAP7660D_BOARDCONFIG		0x1F7F0000
+#define EAP7660D_GBIC_MAC_OFFSET	0x1000
+#define EAP7660D_WMAC0_MAC_OFFSET	0x1010
+#define EAP7660D_WMAC1_MAC_OFFSET	0x1016
+#define EAP7660D_WMAC0_CALDATA_OFFSET	0x2000
+#define EAP7660D_WMAC1_CALDATA_OFFSET	0x3000
+
+#ifdef CONFIG_PCI
+static struct ath5k_platform_data eap7660d_wmac0_data;
+static struct ath5k_platform_data eap7660d_wmac1_data;
+static char eap7660d_wmac0_mac[6];
+static char eap7660d_wmac1_mac[6];
+static u16 eap7660d_wmac0_eeprom[ATH5K_PLAT_EEP_MAX_WORDS];
+static u16 eap7660d_wmac1_eeprom[ATH5K_PLAT_EEP_MAX_WORDS];
+
+static int eap7660d_pci_plat_dev_init(struct pci_dev *dev)
+{
+	switch (PCI_SLOT(dev->devfn)) {
+	case 17:
+		dev->dev.platform_data = &eap7660d_wmac0_data;
+		break;
+
+	case 18:
+		dev->dev.platform_data = &eap7660d_wmac1_data;
+		break;
+	}
+
+	return 0;
+}
+
+void __init eap7660d_pci_init(u8 *cal_data0, u8 *mac_addr0,
+			      u8 *cal_data1, u8 *mac_addr1)
+{
+	if (cal_data0 && *cal_data0 == 0xa55a) {
+		memcpy(eap7660d_wmac0_eeprom, cal_data0,
+			ATH5K_PLAT_EEP_MAX_WORDS);
+		eap7660d_wmac0_data.eeprom_data = eap7660d_wmac0_eeprom;
+	}
+
+	if (cal_data1 && *cal_data1 == 0xa55a) {
+		memcpy(eap7660d_wmac1_eeprom, cal_data1,
+			ATH5K_PLAT_EEP_MAX_WORDS);
+		eap7660d_wmac1_data.eeprom_data = eap7660d_wmac1_eeprom;
+	}
+
+	if (mac_addr0) {
+		memcpy(eap7660d_wmac0_mac, mac_addr0,
+			sizeof(eap7660d_wmac0_mac));
+		eap7660d_wmac0_data.macaddr = eap7660d_wmac0_mac;
+	}
+
+	if (mac_addr1) {
+		memcpy(eap7660d_wmac1_mac, mac_addr1,
+			sizeof(eap7660d_wmac1_mac));
+		eap7660d_wmac1_data.macaddr = eap7660d_wmac1_mac;
+	}
+
+	ath79_pci_set_plat_dev_init(eap7660d_pci_plat_dev_init);
+	ath79_register_pci();
+}
+#else
+static inline void eap7660d_pci_init(u8 *cal_data0, u8 *mac_addr0,
+				     u8 *cal_data1, u8 *mac_addr1)
+{
+}
+#endif /* CONFIG_PCI */
+
+static struct gpio_led eap7660d_leds_gpio[] __initdata = {
+	{
+		.name		= "eap7660d:green:ds8",
+		.gpio		= EAP7660D_GPIO_DS8,
+		.active_low	= 0,
+	},
+	{
+		.name		= "eap7660d:green:ds5",
+		.gpio		= EAP7660D_GPIO_DS5,
+		.active_low	= 0,
+	},
+	{
+		.name		= "eap7660d:green:ds7",
+		.gpio		= EAP7660D_GPIO_DS7,
+		.active_low	= 0,
+	},
+	{
+		.name		= "eap7660d:green:ds4",
+		.gpio		= EAP7660D_GPIO_DS4,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button eap7660d_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = EAP7660D_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= EAP7660D_GPIO_SW1,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = EAP7660D_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= EAP7660D_GPIO_SW3,
+		.active_low	= 1,
+	}
+};
+
+static const char *eap7660d_part_probes[] = {
+	"RedBoot",
+	NULL,
+};
+
+static struct flash_platform_data eap7660d_flash_data = {
+	.part_probes	= eap7660d_part_probes,
+};
+
+static void __init eap7660d_setup(void)
+{
+	u8 *boardconfig = (u8 *) KSEG1ADDR(EAP7660D_BOARDCONFIG);
+
+	ath79_register_mdio(0, ~EAP7660D_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+			boardconfig + EAP7660D_GBIC_MAC_OFFSET, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = EAP7660D_PHYMASK;
+	ath79_register_eth(0);
+	ath79_register_m25p80(&eap7660d_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(eap7660d_leds_gpio),
+					eap7660d_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, EAP7660D_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(eap7660d_gpio_keys),
+					 eap7660d_gpio_keys);
+	eap7660d_pci_init(boardconfig + EAP7660D_WMAC0_CALDATA_OFFSET,
+			  boardconfig + EAP7660D_WMAC0_MAC_OFFSET,
+			  boardconfig + EAP7660D_WMAC1_CALDATA_OFFSET,
+			  boardconfig + EAP7660D_WMAC1_MAC_OFFSET);
+};
+
+MIPS_MACHINE(ATH79_MACH_EAP7660D, "EAP7660D", "Senao EAP7660D",
+	     eap7660d_setup);
+
+MIPS_MACHINE(ATH79_MACH_ALL0305, "ALL0305", "Allnet ALL0305",
+	     eap7660d_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-m150.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-m150.c
new file mode 100644
index 00000000..b95d6c2f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-m150.c
@@ -0,0 +1,112 @@
+/*
+ *  Easy-Link EL-M150 board support
+ *
+ *  Copyright (C) 2012 huangfc <huangfangcheng@163.com>
+ *  Copyright (C) 2012 HYS <550663898@qq.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "dev-usb.h"
+
+#define EL_M150_GPIO_BTN6		6
+#define EL_M150_GPIO_BTN7		7
+#define EL_M150_GPIO_BTN_RESET		11
+
+#define EL_M150_GPIO_LED_SYSTEM		27
+#define EL_M150_GPIO_USB_POWER		8
+
+#define EL_M150_KEYS_POLL_INTERVAL	20	/* msecs */
+#define EL_M150_KEYS_DEBOUNCE_INTERVAL (3 * EL_M150_KEYS_POLL_INTERVAL)
+
+static const char *EL_M150_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data EL_M150_flash_data = {
+	.part_probes	= EL_M150_part_probes,
+};
+
+static struct gpio_led EL_M150_leds_gpio[] __initdata = {
+	{
+		.name		= "easylink:green:system",
+		.gpio		= EL_M150_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button EL_M150_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = EL_M150_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= EL_M150_GPIO_BTN_RESET,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "BTN_6",
+		.type		= EV_KEY,
+		.code		= BTN_6,
+		.debounce_interval = EL_M150_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= EL_M150_GPIO_BTN6,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "BTN_7",
+		.type		= EV_KEY,
+		.code		= BTN_7,
+		.debounce_interval = EL_M150_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= EL_M150_GPIO_BTN7,
+		.active_low	= 1,
+	},
+};
+
+static void __init el_m150_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(EL_M150_leds_gpio),
+				 EL_M150_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, EL_M150_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(EL_M150_gpio_keys),
+					EL_M150_gpio_keys);
+
+	gpio_request_one(EL_M150_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_register_m25p80(&EL_M150_flash_data);
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_EL_M150, "EL-M150",
+	     "EasyLink EL-M150", el_m150_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-mini.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-mini.c
new file mode 100644
index 00000000..9879b18f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-el-mini.c
@@ -0,0 +1,86 @@
+/*
+ *  Easy-Link EL-MINI board support
+ *
+ *  Copyright (C) 2012 huangfc <huangfangcheng@163.com>
+ *  Copyright (C) 2011 hys <550663898@qq.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define MINI_GPIO_LED_SYSTEM	27
+#define MINI_GPIO_BTN_RESET	11
+
+#define MINI_GPIO_USB_POWER	8
+
+#define MINI_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MINI_KEYS_DEBOUNCE_INTERVAL	(3 * MINI_KEYS_POLL_INTERVAL)
+
+static const char *mini_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data mini_flash_data = {
+	.part_probes	= mini_part_probes,
+};
+
+static struct gpio_led mini_leds_gpio[] __initdata = {
+	{
+		.name		= "easylink:green:system",
+		.gpio		= MINI_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button mini_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MINI_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MINI_GPIO_BTN_RESET,
+		.active_low	= 0,
+	}
+};
+
+static void __init el_mini_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&mini_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(mini_leds_gpio),
+				 mini_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, MINI_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mini_gpio_keys),
+					mini_gpio_keys);
+
+	gpio_request_one(MINI_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, -1);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_EL_MINI, "EL-MINI", "EasyLink EL-MINI",
+	     el_mini_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c
new file mode 100644
index 00000000..2a34b3a2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c
@@ -0,0 +1,176 @@
+/*
+ *  EnGenius ESR1750 board support
+ *
+ *  Copyright (c) 2014 Jon Suphammer <jon@suphammer.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define ESR1750_GPIO_LED_WLAN_5G	23
+#define ESR1750_GPIO_LED_WLAN_2G	13
+#define ESR1750_GPIO_LED_POWER_AMBER	2
+#define ESR1750_GPIO_LED_WPS_AMBER	22
+#define ESR1750_GPIO_LED_WPS_BLUE	19
+
+#define ESR1750_GPIO_BTN_WPS		16
+#define ESR1750_GPIO_BTN_RESET		17
+
+#define ESR1750_KEYS_POLL_INTERVAL	20	/* msecs */
+#define ESR1750_KEYS_DEBOUNCE_INTERVAL	(3 * ESR1750_KEYS_POLL_INTERVAL)
+
+#define ESR1750_CALDATA_ADDR 0x1fff0000
+#define ESR1750_WMAC_CALDATA_OFFSET	0x1000
+#define ESR1750_PCIE_CALDATA_OFFSET	0x5000
+
+#define ESR1750_NVRAM_ADDR	0x1f030000
+#define ESR1750_NVRAM_SIZE	0x10000
+
+static struct gpio_led esr1750_leds_gpio[] __initdata = {
+	{
+		.name		= "esr1750:amber:power",
+		.gpio		= ESR1750_GPIO_LED_POWER_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "esr1750:blue:wps",
+		.gpio		= ESR1750_GPIO_LED_WPS_BLUE,
+		.active_low	= 1,
+	},
+	{
+		.name		= "esr1750:amber:wps",
+		.gpio		= ESR1750_GPIO_LED_WPS_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "esr1750:blue:wlan-2g",
+		.gpio		= ESR1750_GPIO_LED_WLAN_2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "esr1750:blue:wlan-5g",
+		.gpio		= ESR1750_GPIO_LED_WLAN_5G,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button esr1750_gpio_keys[] __initdata = {
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = ESR1750_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ESR1750_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = ESR1750_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ESR1750_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg esr1750_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_platform_data esr1750_ar8327_data = {
+	.pad0_cfg = &esr1750_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+};
+
+static struct mdio_board_info esr1750_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &esr1750_ar8327_data,
+	},
+};
+
+static int esr1750_get_mac(const char *name, char *mac)
+{
+	u8 *nvram = (u8 *) KSEG1ADDR(ESR1750_NVRAM_ADDR);
+	int err;
+
+	err = ath79_nvram_parse_mac_addr(nvram, ESR1750_NVRAM_SIZE,
+					 name, mac);
+	if (err) {
+		pr_err("no MAC address found for %s\n", name);
+		return false;
+	}
+
+	return true;
+}
+
+static void __init esr1750_setup(void)
+{
+	u8 *caldata = (u8 *) KSEG1ADDR(ESR1750_CALDATA_ADDR);
+	u8 mac1[ETH_ALEN];
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(esr1750_leds_gpio),
+					esr1750_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, ESR1750_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(esr1750_gpio_keys),
+					esr1750_gpio_keys);
+
+	ath79_register_usb();
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+	ath79_register_mdio(0, 0x0);
+
+	mdiobus_register_board_info(esr1750_mdio0_info,
+					ARRAY_SIZE(esr1750_mdio0_info));
+
+	/* GMAC0 is connected to an QCA8327N switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+
+	if (esr1750_get_mac("ethaddr=", mac1))
+		ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
+
+	ath79_eth0_pll_data.pll_1000 = 0xa6000000;
+	ath79_register_eth(0);
+
+	ath79_register_wmac(caldata + ESR1750_WMAC_CALDATA_OFFSET, mac1);
+
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_ESR1750, "ESR1750",
+	     "EnGenius ESR1750",
+	     esr1750_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
new file mode 100644
index 00000000..aa2e7f7f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
@@ -0,0 +1,200 @@
+/*
+ *  EnGenius ESR900 board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "esr900: " fmt
+
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define ESR900_GPIO_LED_POWER           2
+#define ESR900_GPIO_LED_WLAN_2G         13
+#define ESR900_GPIO_LED_WPS_BLUE        19
+#define ESR900_GPIO_LED_WPS_AMBER       22
+#define ESR900_GPIO_LED_WLAN_5G         23
+
+#define ESR900_GPIO_BTN_WPS             16
+#define ESR900_GPIO_BTN_RESET           17
+
+#define ESR900_KEYS_POLL_INTERVAL       20 /* msecs */
+#define ESR900_KEYS_DEBOUNCE_INTERVAL   (3 * ESR900_KEYS_POLL_INTERVAL)
+
+#define ESR900_CALDATA_ADDR             0x1fff0000
+#define ESR900_WMAC_CALDATA_OFFSET      0x1000
+#define ESR900_PCIE_CALDATA_OFFSET      0x5000
+
+#define ESR900_CONFIG_ADDR              0x1f030000
+#define ESR900_CONFIG_SIZE              0x10000
+
+#define ESR900_LAN_PHYMASK              BIT(0)
+#define ESR900_WAN_PHYMASK              BIT(5)
+#define ESR900_MDIO_MASK                (~(ESR900_LAN_PHYMASK | ESR900_WAN_PHYMASK))
+
+static struct gpio_led esr900_leds_gpio[] __initdata = {
+	{
+		.name		= "engenius:amber:power",
+		.gpio		= ESR900_GPIO_LED_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "engenius:blue:wlan-2g",
+		.gpio		= ESR900_GPIO_LED_WLAN_2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "engenius:blue:wps",
+		.gpio		= ESR900_GPIO_LED_WPS_BLUE,
+		.active_low	= 1,
+	},
+	{
+		.name		= "engenius:amber:wps",
+		.gpio		= ESR900_GPIO_LED_WPS_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "engenius:blue:wlan-5g",
+		.gpio		= ESR900_GPIO_LED_WLAN_5G,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button esr900_gpio_keys[] __initdata = {
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = ESR900_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ESR900_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = ESR900_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ESR900_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg esr900_ar8327_pad0_cfg = {
+	/* GMAC0 of the AR8337 switch is connected to GMAC0 via RGMII */
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_pad_cfg esr900_ar8327_pad6_cfg = {
+	/* GMAC6 of the AR8337 switch is connected to GMAC1 via SGMII */
+	.mode = AR8327_PAD_MAC_SGMII,
+	.rxclk_delay_en = true,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL0,
+};
+
+static struct ar8327_platform_data esr900_ar8327_data = {
+	.pad0_cfg = &esr900_ar8327_pad0_cfg,
+	.pad6_cfg = &esr900_ar8327_pad6_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.port6_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+};
+
+static struct mdio_board_info esr900_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &esr900_ar8327_data,
+	},
+};
+
+static void __init esr900_setup(void)
+{
+	const char *config = (char *) KSEG1ADDR(ESR900_CONFIG_ADDR);
+	u8 *art = (u8 *) KSEG1ADDR(ESR900_CALDATA_ADDR);
+	u8 lan_mac[ETH_ALEN];
+	u8 wlan0_mac[ETH_ALEN];
+	u8 wlan1_mac[ETH_ALEN];
+
+	if (ath79_nvram_parse_mac_addr(config, ESR900_CONFIG_SIZE,
+				       "ethaddr=", lan_mac) == 0) {
+		ath79_init_local_mac(ath79_eth0_data.mac_addr, lan_mac);
+		ath79_init_mac(wlan0_mac, lan_mac, 0);
+		ath79_init_mac(wlan1_mac, lan_mac, 1);
+	} else {
+		pr_err("could not find ethaddr in u-boot environment\n");
+	}
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(esr900_leds_gpio),
+					esr900_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, ESR900_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(esr900_gpio_keys),
+					esr900_gpio_keys);
+
+	ath79_register_usb();
+
+	ath79_register_wmac(art + ESR900_WMAC_CALDATA_OFFSET, wlan0_mac);
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+	ath79_register_mdio(0, 0x0);
+
+	mdiobus_register_board_info(esr900_mdio0_info,
+				    ARRAY_SIZE(esr900_mdio0_info));
+
+	/* GMAC0 is connected to the RMGII interface */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = ESR900_LAN_PHYMASK;
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+
+	ath79_eth0_pll_data.pll_1000 = 0xa6000000;
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the SGMII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+	ath79_register_eth(1);
+
+	ap91_pci_init(art + ESR900_PCIE_CALDATA_OFFSET, wlan1_mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_ESR900, "ESR900", "EnGenius ESR900", esr900_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c
new file mode 100644
index 00000000..47ed51b5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-dorin.c
@@ -0,0 +1,144 @@
+/*
+ *  EW Dorin board support
+ *  (based on Atheros Ref. Design AP121)
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2012 Embedded Wireless GmbH    www.80211.de
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define DORIN_KEYS_POLL_INTERVAL	20	/* msecs */
+#define DORIN_KEYS_DEBOUNCE_INTERVAL	(3 * DORIN_KEYS_POLL_INTERVAL)
+
+#define DORIN_CALDATA_OFFSET		0x1000
+#define DORIN_WMAC_MAC_OFFSET		0x1002
+
+#define DORIN_GPIO_LED_21		21
+#define DORIN_GPIO_LED_22		22
+
+#define DORIN_GPIO_BTN_JUMPSTART	11
+#define DORIN_GPIO_BTN_RESET		6
+
+static struct gpio_led dorin_leds_gpio[] __initdata = {
+	{
+		.name		= "dorin:green:led21",
+		.gpio		= DORIN_GPIO_LED_21,
+		.active_low	= 1,
+	},
+	{
+		.name		= "dorin:green:led22",
+		.gpio		= DORIN_GPIO_LED_22,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button dorin_gpio_keys[] __initdata = {
+	{
+		.desc		= "jumpstart button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = DORIN_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DORIN_GPIO_BTN_JUMPSTART,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = DORIN_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= DORIN_GPIO_BTN_RESET,
+		.active_low	= 0,
+	}
+};
+
+static void __init ew_dorin_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	static u8 mac[6];
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_usb();
+
+	if (ar93xx_wmac_read_mac_address(mac)) {
+		ath79_register_wmac(NULL, NULL);
+	} else {
+		ath79_register_wmac(art + DORIN_CALDATA_OFFSET,
+				    art + DORIN_WMAC_MAC_OFFSET);
+		memcpy(mac, art + DORIN_WMAC_MAC_OFFSET, sizeof(mac));
+	}
+
+	mac[3] |= 0x40;
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dorin_leds_gpio),
+				 dorin_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, DORIN_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dorin_gpio_keys),
+					dorin_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_EW_DORIN, "EW-DORIN", "EmbWir-Dorin",
+	     ew_dorin_setup);
+
+
+static void __init ew_dorin_router_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	static u8 mac[6];
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_usb();
+
+	if (ar93xx_wmac_read_mac_address(mac)) {
+		ath79_register_wmac(NULL, NULL);
+	} else {
+		ath79_register_wmac(art + DORIN_CALDATA_OFFSET,
+				    art + DORIN_WMAC_MAC_OFFSET);
+		memcpy(mac, art + DORIN_WMAC_MAC_OFFSET, sizeof(mac));
+	}
+
+	mac[3] |= 0x40;
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+
+	mac[3] &= 0x3F;
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_setup_ar933x_phy4_switch(true, true);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+
+	/* WAN port */
+	ath79_register_eth(0);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(dorin_leds_gpio),
+				 dorin_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, DORIN_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(dorin_gpio_keys),
+					dorin_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_EW_DORIN_ROUTER, "EW-DORIN-ROUTER",
+	     "EmbWir-Dorin-Router", ew_dorin_router_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c
new file mode 100644
index 00000000..0713f140
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c
@@ -0,0 +1,104 @@
+/*
+ *  GL-CONNECT iNet board support
+ *
+ *  Copyright (C) 2011 dongyuqi <729650915@qq.com>
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2013 alzhao <alzhao@gmail.com>
+ *  Copyright (C) 2014 Michel Stempin <michel.stempin@wanadoo.fr>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define GL_INET_GPIO_LED_WLAN		0
+#define GL_INET_GPIO_LED_LAN		13
+#define GL_INET_GPIO_BTN_RESET		11
+
+#define GL_INET_KEYS_POLL_INTERVAL	20	/* msecs */
+#define GL_INET_KEYS_DEBOUNCE_INTERVAL	(3 * GL_INET_KEYS_POLL_INTERVAL)
+
+static const char * gl_inet_part_probes[] = {
+	"tp-link", /* dont change, this will use tplink parser */
+	NULL ,
+};
+
+static struct flash_platform_data gl_inet_flash_data = {
+	.part_probes = gl_inet_part_probes,
+};
+
+static struct gpio_led gl_inet_leds_gpio[] __initdata = {
+	{
+		.name = "gl-connect:red:wlan",
+		.gpio = GL_INET_GPIO_LED_WLAN,
+		.active_low = 0,
+	},
+	{
+		.name = "gl-connect:green:lan",
+		.gpio = GL_INET_GPIO_LED_LAN,
+		.active_low = 0,
+		.default_state = 1,
+	},
+};
+
+static struct gpio_keys_button gl_inet_gpio_keys[] __initdata = {
+	{
+		.desc = "reset",
+		.type = EV_KEY,
+		.code = KEY_RESTART,
+		.debounce_interval = GL_INET_KEYS_DEBOUNCE_INTERVAL,
+		.gpio = GL_INET_GPIO_BTN_RESET,
+		.active_low = 0,
+	}
+};
+
+static void __init gl_inet_setup(void)
+{
+	/* get the mac address which is stored in the 1st 64k uboot MTD */
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+
+	/* get the art address, which is the last 64K. By using
+	   0x1fff1000, it doesn't matter it is 4M, 8M or 16M flash */
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	/* register flash. MTD will use tp-link parser to parser MTD */
+	ath79_register_m25p80(&gl_inet_flash_data);
+
+	/* register gpio LEDs and keys */
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(gl_inet_leds_gpio),
+				 gl_inet_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, GL_INET_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(gl_inet_gpio_keys),
+					gl_inet_gpio_keys);
+
+	/* enable usb */
+	ath79_register_usb();
+
+	/* register eth0 as WAN, eth1 as LAN */
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+	ath79_register_eth(1);
+
+	/* register wireless mac with cal data */
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_GL_INET, "GL-INET", "GL-CONNECT INET v1",
+	     gl_inet_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c
new file mode 100644
index 00000000..c6cb61c3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c
@@ -0,0 +1,103 @@
+/*
+ *  Oolite board support
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "dev-usb.h"
+
+#define GS_OOLITE_GPIO_BTN6		6
+#define GS_OOLITE_GPIO_BTN7		7
+#define GS_OOLITE_GPIO_BTN_RESET	11
+
+#define GS_OOLITE_GPIO_LED_SYSTEM	27
+
+#define GS_OOLITE_KEYS_POLL_INTERVAL	20	/* msecs */
+#define GS_OOLITE_KEYS_DEBOUNCE_INTERVAL (3 * GS_OOLITE_KEYS_POLL_INTERVAL)
+
+static const char *gs_oolite_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data gs_oolite_flash_data = {
+	.part_probes	= gs_oolite_part_probes,
+};
+
+static struct gpio_led gs_oolite_leds_gpio[] __initdata = {
+	{
+		.name		= "oolite:red:system",
+		.gpio		= GS_OOLITE_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button gs_oolite_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= GS_OOLITE_GPIO_BTN_RESET,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "BTN_6",
+		.type		= EV_KEY,
+		.code		= BTN_6,
+		.debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= GS_OOLITE_GPIO_BTN6,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "BTN_7",
+		.type		= EV_KEY,
+		.code		= BTN_7,
+		.debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= GS_OOLITE_GPIO_BTN7,
+		.active_low	= 0,
+	},
+};
+
+static void __init gs_oolite_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_oolite_leds_gpio),
+				 gs_oolite_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, GS_OOLITE_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(gs_oolite_gpio_keys),
+					gs_oolite_gpio_keys);
+
+	ath79_register_usb();
+
+	ath79_register_m25p80(&gs_oolite_flash_data);
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_GS_OOLITE, "GS-OOLITE",
+	     "Oolite V1.0", gs_oolite_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hiwifi-hc6361.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hiwifi-hc6361.c
new file mode 100644
index 00000000..6600595c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hiwifi-hc6361.c
@@ -0,0 +1,115 @@
+/*
+ *  HiWiFi HC6361 board support
+ *
+ *  Copyright (C) 2012-2013 eric
+ *  Copyright (C) 2014 Yousong Zhou <yszhou4tech@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/proc_fs.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define HIWIFI_HC6361_GPIO_LED_WLAN_2P4		0	/* 2.4G WLAN LED */
+#define HIWIFI_HC6361_GPIO_LED_SYSTEM		1	/* System LED */
+#define HIWIFI_HC6361_GPIO_LED_INTERNET		27	/* Internet LED */
+
+#define HIWIFI_HC6361_GPIO_USBPOWER		20	/* USB power control */
+#define HIWIFI_HC6361_GPIO_BTN_RST		11	/* Reset button */
+
+#define HIWIFI_HC6361_KEYS_POLL_INTERVAL	20	/* msecs */
+#define HIWIFI_HC6361_KEYS_DEBOUNCE_INTERVAL	\
+	(3 * HIWIFI_HC6361_KEYS_POLL_INTERVAL)
+
+static struct gpio_led hiwifi_leds_gpio[] __initdata = {
+	{
+		.name		= "hiwifi:blue:wlan-2p4",
+		.gpio		= HIWIFI_HC6361_GPIO_LED_WLAN_2P4,
+		.active_low	= 1,
+	}, {
+		.name		= "hiwifi:blue:system",
+		.gpio		= HIWIFI_HC6361_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "hiwifi:blue:internet",
+		.gpio		= HIWIFI_HC6361_GPIO_LED_INTERNET,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button hiwifi_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = HIWIFI_HC6361_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= HIWIFI_HC6361_GPIO_BTN_RST,
+		.active_low	= 1,
+	}
+};
+
+static void __init get_mac_from_bdinfo(u8 *mac, void *bdinfo)
+{
+	if (sscanf(bdinfo, "fac_mac = %2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx",
+				&mac[0], &mac[1], &mac[2], &mac[3],
+				&mac[4], &mac[5]) == 6) {
+		return;
+	}
+
+	printk(KERN_WARNING "Parsing MAC address failed.\n");
+	memcpy(mac, "\x00\xba\xbe\x00\x00\x00", 6);
+}
+
+static void __init hiwifi_hc6361_setup(void)
+{
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 mac[6];
+
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_m25p80(NULL);
+	ath79_gpio_function_enable(
+			AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+			AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+			AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+			AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+			AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(hiwifi_leds_gpio),
+			hiwifi_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, HIWIFI_HC6361_KEYS_POLL_INTERVAL,
+			ARRAY_SIZE(hiwifi_gpio_keys),
+			hiwifi_gpio_keys);
+	gpio_request_one(HIWIFI_HC6361_GPIO_USBPOWER,
+			GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			"USB power");
+	ath79_register_usb();
+
+	get_mac_from_bdinfo(mac, (void *) KSEG1ADDR(0x1f010180));
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_HIWIFI_HC6361, "HiWiFi-HC6361",
+		"HiWiFi HC6361", hiwifi_hc6361_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c
new file mode 100644
index 00000000..22b1e091
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c
@@ -0,0 +1,137 @@
+/*
+ *  ALFA NETWORK Hornet-UB board support
+ *
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define HORNET_UB_GPIO_LED_WLAN		0
+#define HORNET_UB_GPIO_LED_USB		1
+#define HORNET_UB_GPIO_LED_LAN		13
+#define HORNET_UB_GPIO_LED_WAN		17
+#define HORNET_UB_GPIO_LED_WPS		27
+
+#define HORNET_UB_GPIO_BTN_RESET	11
+#define HORNET_UB_GPIO_BTN_WPS		12
+
+#define HORNET_UB_GPIO_USB_POWER	26
+
+#define HORNET_UB_KEYS_POLL_INTERVAL	20	/* msecs */
+#define HORNET_UB_KEYS_DEBOUNCE_INTERVAL	(3 * HORNET_UB_KEYS_POLL_INTERVAL)
+
+#define HORNET_UB_MAC0_OFFSET		0x0000
+#define HORNET_UB_MAC1_OFFSET		0x0006
+#define HORNET_UB_CALDATA_OFFSET	0x1000
+
+static struct gpio_led hornet_ub_leds_gpio[] __initdata = {
+	{
+		.name		= "alfa:blue:lan",
+		.gpio		= HORNET_UB_GPIO_LED_LAN,
+		.active_low	= 0,
+	},
+	{
+		.name		= "alfa:blue:usb",
+		.gpio		= HORNET_UB_GPIO_LED_USB,
+		.active_low	= 0,
+	},
+	{
+		.name		= "alfa:blue:wan",
+		.gpio		= HORNET_UB_GPIO_LED_WAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "alfa:blue:wlan",
+		.gpio		= HORNET_UB_GPIO_LED_WLAN,
+		.active_low	= 0,
+	},
+	{
+		.name		= "alfa:blue:wps",
+		.gpio		= HORNET_UB_GPIO_LED_WPS,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button hornet_ub_gpio_keys[] __initdata = {
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = HORNET_UB_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= HORNET_UB_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = HORNET_UB_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= HORNET_UB_GPIO_BTN_RESET,
+		.active_low	= 0,
+	}
+};
+
+static void __init hornet_ub_gpio_setup(void)
+{
+	u32 t;
+
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				     AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				     AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				     AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				     AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
+	t |= AR933X_BOOTSTRAP_MDIO_GPIO_EN;
+	ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP, t);
+
+	gpio_request_one(HORNET_UB_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+}
+
+static void __init hornet_ub_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	hornet_ub_gpio_setup();
+
+	ath79_register_m25p80(NULL);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(hornet_ub_leds_gpio),
+					hornet_ub_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, HORNET_UB_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(hornet_ub_gpio_keys),
+					 hornet_ub_gpio_keys);
+
+	ath79_init_mac(ath79_eth1_data.mac_addr,
+			art + HORNET_UB_MAC0_OFFSET, 0);
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+			art + HORNET_UB_MAC1_OFFSET, 0);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(art + HORNET_UB_CALDATA_OFFSET, NULL);
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_HORNET_UB, "HORNET-UB", "ALFA NETWORK Hornet-UB",
+	     hornet_ub_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ja76pf.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ja76pf.c
new file mode 100644
index 00000000..d1fe0f8a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ja76pf.c
@@ -0,0 +1,190 @@
+/*
+ *  jjPlus JA76PF board support
+ */
+
+#include <linux/i2c.h>
+#include <linux/i2c-gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define JA76PF_KEYS_POLL_INTERVAL	20	/* msecs */
+#define JA76PF_KEYS_DEBOUNCE_INTERVAL	(3 * JA76PF_KEYS_POLL_INTERVAL)
+
+#define JA76PF_GPIO_I2C_SCL		0
+#define JA76PF_GPIO_I2C_SDA		1
+#define JA76PF_GPIO_LED_1		5
+#define JA76PF_GPIO_LED_2		4
+#define JA76PF_GPIO_LED_3		3
+#define JA76PF_GPIO_BTN_RESET		11
+
+static struct gpio_led ja76pf_leds_gpio[] __initdata = {
+	{
+		.name		= "jjplus:green:led1",
+		.gpio		= JA76PF_GPIO_LED_1,
+		.active_low	= 1,
+	}, {
+		.name		= "jjplus:green:led2",
+		.gpio		= JA76PF_GPIO_LED_2,
+		.active_low	= 1,
+	}, {
+		.name		= "jjplus:green:led3",
+		.gpio		= JA76PF_GPIO_LED_3,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button ja76pf_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = JA76PF_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= JA76PF_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static struct i2c_gpio_platform_data ja76pf_i2c_gpio_data = {
+	.sda_pin	= JA76PF_GPIO_I2C_SDA,
+	.scl_pin	= JA76PF_GPIO_I2C_SCL,
+};
+
+static struct platform_device ja76pf_i2c_gpio_device = {
+	.name		= "i2c-gpio",
+	.id		= 0,
+	.dev = {
+		.platform_data  = &ja76pf_i2c_gpio_data,
+	}
+};
+
+static const char *ja76pf_part_probes[] = {
+	"RedBoot",
+	NULL,
+};
+
+static struct flash_platform_data ja76pf_flash_data = {
+	.part_probes	= ja76pf_part_probes,
+};
+
+#define JA76PF_WAN_PHYMASK	(1 << 4)
+#define JA76PF_LAN_PHYMASK	((1 << 0) | (1 << 1) | (1 << 2) | (1 < 3))
+#define JA76PF_MDIO_PHYMASK	(JA76PF_LAN_PHYMASK | JA76PF_WAN_PHYMASK)
+
+static void __init ja76pf_init(void)
+{
+	ath79_register_m25p80(&ja76pf_flash_data);
+
+	ath79_register_mdio(0, ~JA76PF_MDIO_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = JA76PF_LAN_PHYMASK;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = JA76PF_WAN_PHYMASK;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	platform_device_register(&ja76pf_i2c_gpio_device);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ja76pf_leds_gpio),
+					ja76pf_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, JA76PF_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(ja76pf_gpio_keys),
+					 ja76pf_gpio_keys);
+
+	ath79_register_usb();
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_JA76PF, "JA76PF", "jjPlus JA76PF", ja76pf_init);
+
+#define JA76PF2_GPIO_LED_D2		5
+#define JA76PF2_GPIO_LED_D3		4
+#define JA76PF2_GPIO_LED_D4		3
+#define JA76PF2_GPIO_BTN_RESET		7
+#define JA76PF2_GPIO_BTN_WPS		8
+
+static struct gpio_led ja76pf2_leds_gpio[] __initdata = {
+	{
+		.name		= "jjplus:green:led1",
+		.gpio		= JA76PF2_GPIO_LED_D2,
+		.active_low	= 1,
+	}, {
+		.name		= "jjplus:green:led2",
+		.gpio		= JA76PF2_GPIO_LED_D3,
+		.active_low	= 0,
+	}, {
+		.name		= "jjplus:green:led3",
+		.gpio		= JA76PF2_GPIO_LED_D4,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button ja76pf2_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = JA76PF_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= JA76PF2_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = JA76PF_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= JA76PF2_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+#define JA76PF2_LAN_PHYMASK	BIT(0)
+#define JA76PF2_WAN_PHYMASK	BIT(4)
+#define JA76PF2_MDIO_PHYMASK	(JA76PF2_LAN_PHYMASK | JA76PF2_WAN_PHYMASK)
+
+static void __init ja76pf2_init(void)
+{
+	ath79_register_m25p80(&ja76pf_flash_data);
+
+	ath79_register_mdio(0, ~JA76PF2_MDIO_PHYMASK);
+
+	/* MAC0 is connected to the CPU port of the AR8316 switch */
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	/* MAC1 is connected to the PHY4 of the AR8316 switch */
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = BIT(4);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ja76pf2_leds_gpio),
+				 ja76pf2_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, JA76PF_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(ja76pf2_gpio_keys),
+					ja76pf2_gpio_keys);
+
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_JA76PF2, "JA76PF2", "jjPlus JA76PF2", ja76pf2_init);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap003.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap003.c
new file mode 100644
index 00000000..a3c93ccd
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap003.c
@@ -0,0 +1,95 @@
+/*
+ *  jjPlus JWAP003 board support
+ *
+ */
+
+#include <linux/i2c.h>
+#include <linux/i2c-gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-gpio-buttons.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define JWAP003_KEYS_POLL_INTERVAL	20	/* msecs */
+#define JWAP003_KEYS_DEBOUNCE_INTERVAL	(3 * JWAP003_KEYS_POLL_INTERVAL)
+
+#define JWAP003_GPIO_WPS	11
+#define JWAP003_GPIO_I2C_SCL	0
+#define JWAP003_GPIO_I2C_SDA	1
+
+static struct gpio_keys_button jwap003_gpio_keys[] __initdata = {
+	{
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = JWAP003_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= JWAP003_GPIO_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct i2c_gpio_platform_data jwap003_i2c_gpio_data = {
+	.sda_pin	= JWAP003_GPIO_I2C_SDA,
+	.scl_pin	= JWAP003_GPIO_I2C_SCL,
+};
+
+static struct platform_device jwap003_i2c_gpio_device = {
+	.name		= "i2c-gpio",
+	.id		= 0,
+	.dev = {
+		.platform_data  = &jwap003_i2c_gpio_data,
+	}
+};
+
+static const char *jwap003_part_probes[] = {
+	"RedBoot",
+	NULL,
+};
+
+static struct flash_platform_data jwap003_flash_data = {
+	.part_probes	= jwap003_part_probes,
+};
+
+#define JWAP003_WAN_PHYMASK	BIT(0)
+#define JWAP003_LAN_PHYMASK	BIT(4)
+
+static void __init jwap003_init(void)
+{
+	ath79_register_m25p80(&jwap003_flash_data);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.phy_mask = JWAP003_WAN_PHYMASK;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.has_ar8216 = 1;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = JWAP003_LAN_PHYMASK;
+	ath79_eth1_data.speed = SPEED_100;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	platform_device_register(&jwap003_i2c_gpio_device);
+
+	ath79_register_usb();
+
+	ath79_register_gpio_keys_polled(-1, JWAP003_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(jwap003_gpio_keys),
+					 jwap003_gpio_keys);
+
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_JWAP003, "JWAP003", "jjPlus JWAP003", jwap003_init);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr600.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr600.c
new file mode 100644
index 00000000..701330ce
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr600.c
@@ -0,0 +1,177 @@
+/*
+ * OpenMesh OM2P board support
+ *
+ * Copyright (C) 2012 Marek Lindner <marek@open-mesh.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define MR600_GPIO_LED_WLAN58		12
+#define MR600_GPIO_LED_WPS			13
+#define MR600_GPIO_LED_POWER			14
+
+#define MR600V2_GPIO_LED_WLAN58_RED		12
+#define MR600V2_GPIO_LED_WPS			13
+#define MR600V2_GPIO_LED_POWER			14
+#define MR600V2_GPIO_LED_WLAN24_GREEN		18
+#define MR600V2_GPIO_LED_WLAN24_YELLOW		19
+#define MR600V2_GPIO_LED_WLAN24_RED		20
+#define MR600V2_GPIO_LED_WLAN58_GREEN		21
+#define MR600V2_GPIO_LED_WLAN58_YELLOW		22
+
+#define MR600_GPIO_BTN_RESET		17
+
+#define MR600_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MR600_KEYS_DEBOUNCE_INTERVAL (3 * MR600_KEYS_POLL_INTERVAL)
+
+#define MR600_MAC_OFFSET		0
+#define MR600_WMAC_CALDATA_OFFSET	0x1000
+#define MR600_PCIE_CALDATA_OFFSET	0x5000
+
+static struct gpio_led mr600_leds_gpio[] __initdata = {
+	{
+		.name		= "mr600:orange:power",
+		.gpio		= MR600_GPIO_LED_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:blue:wps",
+		.gpio		= MR600_GPIO_LED_WPS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:green:wlan58",
+		.gpio		= MR600_GPIO_LED_WLAN58,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_led mr600v2_leds_gpio[] __initdata = {
+	{
+		.name		= "mr600:blue:power",
+		.gpio		= MR600V2_GPIO_LED_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:blue:wps",
+		.gpio		= MR600V2_GPIO_LED_WPS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:red:wlan24",
+		.gpio		= MR600V2_GPIO_LED_WLAN24_RED,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:yellow:wlan24",
+		.gpio		= MR600V2_GPIO_LED_WLAN24_YELLOW,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:green:wlan24",
+		.gpio		= MR600V2_GPIO_LED_WLAN24_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:red:wlan58",
+		.gpio		= MR600V2_GPIO_LED_WLAN58_RED,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:yellow:wlan58",
+		.gpio		= MR600V2_GPIO_LED_WLAN58_YELLOW,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr600:green:wlan58",
+		.gpio		= MR600V2_GPIO_LED_WLAN58_GREEN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button mr600_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MR600_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MR600_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+static void __init mr600_base_setup(unsigned num_leds, struct gpio_led *leds)
+{
+	u8 *art = (u8 *)KSEG1ADDR(0x1fff0000);
+	u8 mac[6];
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, num_leds, leds);
+	ath79_register_gpio_keys_polled(-1, MR600_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mr600_gpio_keys),
+					mr600_gpio_keys);
+
+	ath79_init_mac(mac, art + MR600_MAC_OFFSET, 1);
+	ath79_register_wmac(art + MR600_WMAC_CALDATA_OFFSET, mac);
+
+	ath79_init_mac(mac, art + MR600_MAC_OFFSET, 8);
+	ap91_pci_init(art + MR600_PCIE_CALDATA_OFFSET, mac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+				   AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art + MR600_MAC_OFFSET, 0);
+
+	/* GMAC0 is connected to an external PHY */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+}
+
+static void __init mr600_setup(void)
+{
+	mr600_base_setup(ARRAY_SIZE(mr600_leds_gpio), mr600_leds_gpio);
+	ap9x_pci_setup_wmac_led_pin(0, 0);
+}
+
+MIPS_MACHINE(ATH79_MACH_MR600, "MR600", "OpenMesh MR600", mr600_setup);
+
+static void __init mr600v2_setup(void)
+{
+	mr600_base_setup(ARRAY_SIZE(mr600v2_leds_gpio), mr600v2_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_MR600V2, "MR600v2", "OpenMesh MR600v2", mr600v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
new file mode 100644
index 00000000..fe3e1fad
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
@@ -0,0 +1,159 @@
+/*
+ * MR900 board support
+ *
+ * Copyright (c) 2012 Qualcomm Atheros
+ * Copyright (c) 2012-2013 Marek Lindner <marek@open-mesh.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+#include <linux/ath9k_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define MR900_GPIO_LED_LAN		12
+#define MR900_GPIO_LED_WLAN_2G		13
+#define MR900_GPIO_LED_STATUS_GREEN	19
+#define MR900_GPIO_LED_STATUS_RED	21
+#define MR900_GPIO_LED_POWER		22
+#define MR900_GPIO_LED_WLAN_5G		23
+
+#define MR900_GPIO_BTN_RESET		17
+
+#define MR900_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MR900_KEYS_DEBOUNCE_INTERVAL	(3 * MR900_KEYS_POLL_INTERVAL)
+
+#define MR900_MAC0_OFFSET		0
+#define MR900_WMAC_CALDATA_OFFSET	0x1000
+#define MR900_PCIE_CALDATA_OFFSET	0x5000
+
+static struct gpio_led mr900_leds_gpio[] __initdata = {
+	{
+		.name		= "mr900:blue:power",
+		.gpio		= MR900_GPIO_LED_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr900:blue:wan",
+		.gpio		= MR900_GPIO_LED_LAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr900:blue:wlan24",
+		.gpio		= MR900_GPIO_LED_WLAN_2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr900:blue:wlan58",
+		.gpio		= MR900_GPIO_LED_WLAN_5G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr900:green:status",
+		.gpio		= MR900_GPIO_LED_STATUS_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "mr900:red:status",
+		.gpio		= MR900_GPIO_LED_STATUS_RED,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button mr900_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MR900_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MR900_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+
+static void __init mr900_gmac_setup(void)
+{
+	void __iomem *base;
+	u32 t;
+
+	base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
+
+	t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
+
+	t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
+	t |= QCA955X_ETH_CFG_RGMII_EN;
+
+	__raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
+
+	iounmap(base);
+}
+
+static void __init mr900_setup(void)
+{
+	u8 *art = (u8 *)KSEG1ADDR(0x1fff0000);
+	u8 mac[6], pcie_mac[6];
+	struct ath9k_platform_data *pdata;
+
+	ath79_eth0_pll_data.pll_1000 = 0xbe000101;
+	ath79_eth0_pll_data.pll_100 = 0x80000101;
+	ath79_eth0_pll_data.pll_10 = 0x80001313;
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(mr900_leds_gpio),
+				 mr900_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, MR900_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mr900_gpio_keys),
+					mr900_gpio_keys);
+
+	ath79_init_mac(mac, art + MR900_MAC0_OFFSET, 1);
+	ath79_register_wmac(art + MR900_WMAC_CALDATA_OFFSET, mac);
+	ath79_init_mac(pcie_mac, art + MR900_MAC0_OFFSET, 16);
+	ap91_pci_init(art + MR900_PCIE_CALDATA_OFFSET, pcie_mac);
+	pdata = ap9x_pci_get_wmac_data(0);
+	if (!pdata) {
+		pr_err("mr900: unable to get address of wlan data\n");
+		return;
+	}
+	pdata->use_eeprom = true;
+
+	mr900_gmac_setup();
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art + MR900_MAC0_OFFSET, 0);
+
+	/* GMAC0 is connected to the RMGII interface */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(5);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+
+	ath79_register_eth(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_MR900, "MR900", "OpenMesh MR900", mr900_setup);
+MIPS_MACHINE(ATH79_MACH_MR900v2, "MR900v2", "OpenMesh MR900v2", mr900_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n600.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n600.c
new file mode 100644
index 00000000..a87413d2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n600.c
@@ -0,0 +1,202 @@
+/*
+ *  WD My Net N600 board support
+ *
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define MYNET_N600_GPIO_LED_WIFI	0
+#define MYNET_N600_GPIO_LED_POWER	11
+#define MYNET_N600_GPIO_LED_INTERNET	12
+#define MYNET_N600_GPIO_LED_WPS		13
+
+#define MYNET_N600_GPIO_LED_LAN1	4
+#define MYNET_N600_GPIO_LED_LAN2	3
+#define MYNET_N600_GPIO_LED_LAN3	2
+#define MYNET_N600_GPIO_LED_LAN4	1
+
+#define MYNET_N600_GPIO_BTN_RESET	16
+#define MYNET_N600_GPIO_BTN_WPS		17
+
+#define MYNET_N600_GPIO_EXTERNAL_LNA0	14
+#define MYNET_N600_GPIO_EXTERNAL_LNA1	15
+
+#define MYNET_N600_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MYNET_N600_KEYS_DEBOUNCE_INTERVAL (3 * MYNET_N600_KEYS_POLL_INTERVAL)
+
+#define MYNET_N600_MAC0_OFFSET		0
+#define MYNET_N600_MAC1_OFFSET		6
+#define MYNET_N600_WMAC_CALDATA_OFFSET	0x1000
+#define MYNET_N600_PCIE_CALDATA_OFFSET	0x5000
+
+#define MYNET_N600_NVRAM_ADDR		0x1f058010
+#define MYNET_N600_NVRAM_SIZE		0x7ff0
+
+static struct gpio_led mynet_n600_leds_gpio[] __initdata = {
+	{
+		.name		= "wd:blue:power",
+		.gpio		= MYNET_N600_GPIO_LED_POWER,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:blue:wps",
+		.gpio		= MYNET_N600_GPIO_LED_WPS,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:blue:wireless",
+		.gpio		= MYNET_N600_GPIO_LED_WIFI,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:blue:internet",
+		.gpio		= MYNET_N600_GPIO_LED_INTERNET,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:green:lan1",
+		.gpio		= MYNET_N600_GPIO_LED_LAN1,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wd:green:lan2",
+		.gpio		= MYNET_N600_GPIO_LED_LAN2,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wd:green:lan3",
+		.gpio		= MYNET_N600_GPIO_LED_LAN3,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wd:green:lan4",
+		.gpio		= MYNET_N600_GPIO_LED_LAN4,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button mynet_n600_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MYNET_N600_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MYNET_N600_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = MYNET_N600_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MYNET_N600_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static void mynet_n600_get_mac(const char *name, char *mac)
+{
+	u8 *nvram = (u8 *) KSEG1ADDR(MYNET_N600_NVRAM_ADDR);
+	int err;
+
+	err = ath79_nvram_parse_mac_addr(nvram, MYNET_N600_NVRAM_SIZE,
+					 name, mac);
+	if (err)
+		pr_err("no MAC address found for %s\n", name);
+}
+
+#define MYNET_N600_WAN_PHY_MASK	BIT(0)
+
+static void __init mynet_n600_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(NULL);
+
+	ath79_gpio_output_select(MYNET_N600_GPIO_LED_LAN1,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_N600_GPIO_LED_LAN2,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_N600_GPIO_LED_LAN3,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_N600_GPIO_LED_LAN4,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_N600_GPIO_LED_INTERNET,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(mynet_n600_leds_gpio),
+				 mynet_n600_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, MYNET_N600_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mynet_n600_gpio_keys),
+					mynet_n600_gpio_keys);
+
+	/*
+	 * Control signal for external LNAs 0 and 1
+	 * Taken from GPL bootloader source:
+	 *   board/ar7240/db12x/alpha_gpio.c
+	 */
+	ath79_wmac_set_ext_lna_gpio(0, MYNET_N600_GPIO_EXTERNAL_LNA0);
+	ath79_wmac_set_ext_lna_gpio(1, MYNET_N600_GPIO_EXTERNAL_LNA1);
+
+	mynet_n600_get_mac("wlan24mac=", tmpmac);
+	ath79_register_wmac(art + MYNET_N600_WMAC_CALDATA_OFFSET, tmpmac);
+
+	mynet_n600_get_mac("wlan5mac=", tmpmac);
+	ap91_pci_init(art + MYNET_N600_PCIE_CALDATA_OFFSET, tmpmac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE |
+				   AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_register_mdio(1, 0x0);
+
+	/* LAN */
+	mynet_n600_get_mac("lanmac=", ath79_eth1_data.mac_addr);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+
+	ath79_register_eth(1);
+
+	/* WAN */
+	mynet_n600_get_mac("wanmac=", ath79_eth0_data.mac_addr);
+
+	/* GMAC0 is connected to the PHY4 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = MYNET_N600_WAN_PHY_MASK;
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = MYNET_N600_WAN_PHY_MASK;
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_MYNET_N600, "MYNET-N600", "WD My Net N600",
+	     mynet_n600_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c
new file mode 100644
index 00000000..9d69dc53
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c
@@ -0,0 +1,226 @@
+/*
+ *  WD My Net N750 board support
+ *
+ *  Copyright (C) 2013 Felix Kaechele <felix@fetzig.org>
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+
+/*
+ * Taken from GPL bootloader source:
+ *   board/ar7240/db12x/alpha_gpio.c
+ */
+#define MYNET_N750_GPIO_LED_WIFI	11
+#define MYNET_N750_GPIO_LED_INTERNET	12
+#define MYNET_N750_GPIO_LED_WPS		13
+#define MYNET_N750_GPIO_LED_POWER	14
+
+#define MYNET_N750_GPIO_BTN_RESET	17
+#define MYNET_N750_GPIO_BTN_WPS		19
+
+#define MYNET_N750_GPIO_EXTERNAL_LNA0	15
+#define MYNET_N750_GPIO_EXTERNAL_LNA1	18
+
+#define MYNET_N750_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MYNET_N750_KEYS_DEBOUNCE_INTERVAL (3 * MYNET_N750_KEYS_POLL_INTERVAL)
+
+#define MYNET_N750_WMAC_CALDATA_OFFSET	0x1000
+#define MYNET_N750_PCIE_CALDATA_OFFSET	0x5000
+
+#define MYNET_N750_NVRAM_ADDR		0x1f058010
+#define MYNET_N750_NVRAM_SIZE		0x7ff0
+
+static struct gpio_led mynet_n750_leds_gpio[] __initdata = {
+	{
+		.name		= "wd:blue:power",
+		.gpio		= MYNET_N750_GPIO_LED_POWER,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:blue:wps",
+		.gpio		= MYNET_N750_GPIO_LED_WPS,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:blue:wireless",
+		.gpio		= MYNET_N750_GPIO_LED_WIFI,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:blue:internet",
+		.gpio		= MYNET_N750_GPIO_LED_INTERNET,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button mynet_n750_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MYNET_N750_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MYNET_N750_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = MYNET_N750_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MYNET_N750_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static const struct ar8327_led_info mynet_n750_leds_ar8327[] __initconst = {
+	AR8327_LED_INFO(PHY0_0, HW, "wd:green:lan1"),
+	AR8327_LED_INFO(PHY1_0, HW, "wd:green:lan2"),
+	AR8327_LED_INFO(PHY2_0, HW, "wd:green:lan3"),
+	AR8327_LED_INFO(PHY3_0, HW, "wd:green:lan4"),
+	AR8327_LED_INFO(PHY4_0, HW, "wd:green:wan"),
+	AR8327_LED_INFO(PHY0_1, HW, "wd:yellow:lan1"),
+	AR8327_LED_INFO(PHY1_1, HW, "wd:yellow:lan2"),
+	AR8327_LED_INFO(PHY2_1, HW, "wd:yellow:lan3"),
+	AR8327_LED_INFO(PHY3_1, HW, "wd:yellow:lan4"),
+	AR8327_LED_INFO(PHY4_1, HW, "wd:yellow:wan"),
+};
+
+static struct ar8327_pad_cfg mynet_n750_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_led_cfg mynet_n750_ar8327_led_cfg = {
+	.led_ctrl0 = 0xcc35cc35,
+	.led_ctrl1 = 0xca35ca35,
+	.led_ctrl2 = 0xc935c935,
+	.led_ctrl3 = 0x03ffff00,
+	.open_drain = false,
+};
+
+static struct ar8327_platform_data mynet_n750_ar8327_data = {
+	.pad0_cfg = &mynet_n750_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &mynet_n750_ar8327_led_cfg,
+	.num_leds = ARRAY_SIZE(mynet_n750_leds_ar8327),
+	.leds = mynet_n750_leds_ar8327,
+};
+
+static struct mdio_board_info mynet_n750_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &mynet_n750_ar8327_data,
+	},
+};
+
+static void mynet_n750_get_mac(const char *name, char *mac)
+{
+	u8 *nvram = (u8 *) KSEG1ADDR(MYNET_N750_NVRAM_ADDR);
+	int err;
+
+	err = ath79_nvram_parse_mac_addr(nvram, MYNET_N750_NVRAM_SIZE,
+					 name, mac);
+	if (err)
+		pr_err("no MAC address found for %s\n", name);
+}
+
+/*
+ * The bootloader on this board powers down all PHYs on the switch
+ * before booting the kernel. We bring all PHYs back up so that they are
+ * discoverable by the mdio bus scan and the switch is detected
+ * correctly.
+ */
+static void mynet_n750_mdio_fixup(struct mii_bus *bus)
+{
+	int i;
+
+	for (i = 0; i < 5; i++)
+		bus->write(bus, i, MII_BMCR,
+			   (BMCR_RESET | BMCR_ANENABLE | BMCR_SPEED1000));
+
+	mdelay(1000);
+}
+
+static void __init mynet_n750_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(NULL);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(mynet_n750_leds_gpio),
+				 mynet_n750_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, MYNET_N750_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mynet_n750_gpio_keys),
+					mynet_n750_gpio_keys);
+	/*
+	 * Control signal for external LNAs 0 and 1
+	 * Taken from GPL bootloader source:
+	 *   board/ar7240/db12x/alpha_gpio.c
+	 */
+	ath79_wmac_set_ext_lna_gpio(0, MYNET_N750_GPIO_EXTERNAL_LNA0);
+	ath79_wmac_set_ext_lna_gpio(1, MYNET_N750_GPIO_EXTERNAL_LNA1);
+
+	mynet_n750_get_mac("wlan24mac=", tmpmac);
+	ath79_register_wmac(art + MYNET_N750_WMAC_CALDATA_OFFSET, tmpmac);
+
+	mynet_n750_get_mac("wlan5mac=", tmpmac);
+	ap91_pci_init(art + MYNET_N750_PCIE_CALDATA_OFFSET, tmpmac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
+
+	mdiobus_register_board_info(mynet_n750_mdio0_info,
+				    ARRAY_SIZE(mynet_n750_mdio0_info));
+
+	ath79_mdio0_data.reset = mynet_n750_mdio_fixup;
+	ath79_register_mdio(0, 0x0);
+
+	mynet_n750_get_mac("lanmac=", ath79_eth0_data.mac_addr);
+
+	/* GMAC0 is connected to an AR8327N switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_MYNET_N750, "MYNET-N750", "WD My Net N750",
+	     mynet_n750_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c
new file mode 100644
index 00000000..a3deed5b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c
@@ -0,0 +1,178 @@
+/*
+ *  WD My Net WI-FI Range Extender (Codename:Starfish db12x) board support
+ *
+ *  Copyright (C) 2013 Christian Lamparter <chunkeey@googlemail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define MYNET_REXT_GPIO_LED_POWER	11
+#define MYNET_REXT_GPIO_LED_ETHERNET	12
+#define MYNET_REXT_GPIO_LED_WIFI	19
+
+#define MYNET_REXT_GPIO_LED_RF_QTY1	20
+#define MYNET_REXT_GPIO_LED_RF_QTY2	21
+#define MYNET_REXT_GPIO_LED_RF_QTY3	22
+
+#define MYNET_REXT_GPIO_BTN_RESET	13
+#define MYNET_REXT_GPIO_BTN_WPS		15
+#define MYNET_REXT_GPIO_SW_RF		14
+
+#define MYNET_REXT_GPIO_PHY_SWRST	16	/* disables Ethernet PHY */
+#define MYNET_REXT_GPIO_PHY_INT		17
+#define MYNET_REXT_GPIO_18		18
+
+#define MYNET_REXT_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MYNET_REXT_KEYS_DEBOUNCE_INTERVAL (3 * MYNET_REXT_KEYS_POLL_INTERVAL)
+
+#define MYNET_REXT_WMAC_CALDATA_OFFSET	0x1000
+
+#define MYNET_REXT_NVRAM_ADDR		0x1f7e0010
+#define MYNET_REXT_NVRAM_SIZE		0xfff0
+
+#define MYNET_REXT_ART_ADDR		0x1f7f0000
+
+static struct gpio_led mynet_rext_leds_gpio[] __initdata = {
+	{
+		.name		= "wd:blue:power",
+		.gpio		= MYNET_REXT_GPIO_LED_POWER,
+		.active_low	= 0,
+	},
+	{
+		.name		= "wd:blue:wireless",
+		.gpio		= MYNET_REXT_GPIO_LED_WIFI,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wd:blue:ethernet",
+		.gpio		= MYNET_REXT_GPIO_LED_ETHERNET,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wd:blue:quality1",
+		.gpio		= MYNET_REXT_GPIO_LED_RF_QTY1,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wd:blue:quality2",
+		.gpio		= MYNET_REXT_GPIO_LED_RF_QTY2,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wd:blue:quality3",
+		.gpio		= MYNET_REXT_GPIO_LED_RF_QTY3,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button mynet_rext_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MYNET_REXT_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MYNET_REXT_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = MYNET_REXT_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MYNET_REXT_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc           = "RF Band switch",
+		.type           = EV_SW,
+		.code           = BTN_1,
+		.debounce_interval = MYNET_REXT_KEYS_DEBOUNCE_INTERVAL,
+		.gpio           = MYNET_REXT_GPIO_SW_RF,
+	},
+};
+
+static void mynet_rext_get_mac(const char *name, char *mac)
+{
+	u8 *nvram = (u8 *) KSEG1ADDR(MYNET_REXT_NVRAM_ADDR);
+	int err;
+
+	err = ath79_nvram_parse_mac_addr(nvram, MYNET_REXT_NVRAM_SIZE,
+					 name, mac);
+	if (err)
+		pr_err("no MAC address found for %s\n", name);
+}
+
+static void __init mynet_rext_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(MYNET_REXT_ART_ADDR);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(NULL);
+
+	/* GPIO configuration from drivers/char/GPIO8.c */
+
+	ath79_gpio_output_select(MYNET_REXT_GPIO_LED_POWER,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_REXT_GPIO_LED_WIFI,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_REXT_GPIO_LED_RF_QTY1,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_REXT_GPIO_LED_RF_QTY2,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_REXT_GPIO_LED_RF_QTY3,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(MYNET_REXT_GPIO_LED_ETHERNET,
+				 AR934X_GPIO_OUT_GPIO);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(mynet_rext_leds_gpio),
+				 mynet_rext_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, MYNET_REXT_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mynet_rext_gpio_keys),
+					mynet_rext_gpio_keys);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+				   AR934X_ETH_CFG_RXD_DELAY |
+				   AR934X_ETH_CFG_RDV_DELAY);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN */
+	mynet_rext_get_mac("et0macaddr=", ath79_eth0_data.mac_addr);
+
+	/* GMAC0 is connected to an external PHY on Port 4 */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(4);
+	ath79_eth0_pll_data.pll_1000 = 0x0e000000; /* athrs_mac.c */
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_register_eth(0);
+
+	/* WLAN */
+	mynet_rext_get_mac("wl0_hwaddr=", tmpmac);
+	ap91_pci_init(art + MYNET_REXT_WMAC_CALDATA_OFFSET, tmpmac);
+}
+
+MIPS_MACHINE(ATH79_MACH_MYNET_REXT, "MYNET-REXT",
+	     "WD My Net Wi-Fi Range Extender", mynet_rext_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w04nu.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w04nu.c
new file mode 100644
index 00000000..c2460ce3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w04nu.c
@@ -0,0 +1,124 @@
+/*
+ *  Planex MZK-W04NU board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define MZK_W04NU_GPIO_LED_USB		0
+#define MZK_W04NU_GPIO_LED_STATUS	1
+#define MZK_W04NU_GPIO_LED_WPS		3
+#define MZK_W04NU_GPIO_LED_WLAN		6
+#define MZK_W04NU_GPIO_LED_AP		15
+#define MZK_W04NU_GPIO_LED_ROUTER	16
+
+#define MZK_W04NU_GPIO_BTN_APROUTER	5
+#define MZK_W04NU_GPIO_BTN_WPS		12
+#define MZK_W04NU_GPIO_BTN_RESET	21
+
+#define MZK_W04NU_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MZK_W04NU_KEYS_DEBOUNCE_INTERVAL (3 * MZK_W04NU_KEYS_POLL_INTERVAL)
+
+static struct gpio_led mzk_w04nu_leds_gpio[] __initdata = {
+	{
+		.name		= "planex:green:status",
+		.gpio		= MZK_W04NU_GPIO_LED_STATUS,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:blue:wps",
+		.gpio		= MZK_W04NU_GPIO_LED_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:green:wlan",
+		.gpio		= MZK_W04NU_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:green:usb",
+		.gpio		= MZK_W04NU_GPIO_LED_USB,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:green:ap",
+		.gpio		= MZK_W04NU_GPIO_LED_AP,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:green:router",
+		.gpio		= MZK_W04NU_GPIO_LED_ROUTER,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button mzk_w04nu_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MZK_W04NU_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MZK_W04NU_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = MZK_W04NU_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MZK_W04NU_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}, {
+		.desc		= "aprouter",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = MZK_W04NU_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MZK_W04NU_GPIO_BTN_APROUTER,
+		.active_low	= 0,
+	}
+};
+
+#define MZK_W04NU_WAN_PHYMASK	BIT(4)
+#define MZK_W04NU_MDIO_MASK	(~MZK_W04NU_WAN_PHYMASK)
+
+static void __init mzk_w04nu_setup(void)
+{
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_mdio(0, MZK_W04NU_MDIO_MASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, eeprom, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.has_ar8216 = 1;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, eeprom, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = MZK_W04NU_WAN_PHYMASK;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(mzk_w04nu_leds_gpio),
+				 mzk_w04nu_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, MZK_W04NU_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mzk_w04nu_gpio_keys),
+					mzk_w04nu_gpio_keys);
+	ath79_register_usb();
+
+	ath79_register_wmac(eeprom, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_MZK_W04NU, "MZK-W04NU", "Planex MZK-W04NU",
+	     mzk_w04nu_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w300nh.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w300nh.c
new file mode 100644
index 00000000..8c403652
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-mzk-w300nh.c
@@ -0,0 +1,115 @@
+/*
+ *  Planex MZK-W300NH board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define MZK_W300NH_GPIO_LED_STATUS	1
+#define MZK_W300NH_GPIO_LED_WPS		3
+#define MZK_W300NH_GPIO_LED_WLAN	6
+#define MZK_W300NH_GPIO_LED_AP_GREEN	15
+#define MZK_W300NH_GPIO_LED_AP_AMBER	16
+
+#define MZK_W300NH_GPIO_BTN_APROUTER	5
+#define MZK_W300NH_GPIO_BTN_WPS		12
+#define MZK_W300NH_GPIO_BTN_RESET	21
+
+#define MZK_W300NH_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MZK_W300NH_KEYS_DEBOUNCE_INTERVAL (3 * MZK_W300NH_KEYS_POLL_INTERVAL)
+
+static struct gpio_led mzk_w300nh_leds_gpio[] __initdata = {
+	{
+		.name		= "planex:green:status",
+		.gpio		= MZK_W300NH_GPIO_LED_STATUS,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:blue:wps",
+		.gpio		= MZK_W300NH_GPIO_LED_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:green:wlan",
+		.gpio		= MZK_W300NH_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "planex:green:aprouter",
+		.gpio		= MZK_W300NH_GPIO_LED_AP_GREEN,
+	}, {
+		.name		= "planex:amber:aprouter",
+		.gpio		= MZK_W300NH_GPIO_LED_AP_AMBER,
+	}
+};
+
+static struct gpio_keys_button mzk_w300nh_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MZK_W300NH_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MZK_W300NH_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}, {
+		.desc		= "aprouter",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= MZK_W300NH_GPIO_BTN_APROUTER,
+		.active_low	= 0,
+	}
+};
+
+#define MZK_W300NH_WAN_PHYMASK	BIT(4)
+#define MZK_W300NH_MDIO_MASK	(~MZK_W300NH_WAN_PHYMASK)
+
+static void __init mzk_w300nh_setup(void)
+{
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_mdio(0, MZK_W300NH_MDIO_MASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, eeprom, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.has_ar8216 = 1;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, eeprom, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = MZK_W300NH_WAN_PHYMASK;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(mzk_w300nh_leds_gpio),
+				 mzk_w300nh_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, MZK_W300NH_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(mzk_w300nh_gpio_keys),
+					mzk_w300nh_gpio_keys);
+	ath79_register_wmac(eeprom, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_MZK_W300NH, "MZK-W300NH", "Planex MZK-W300NH",
+	     mzk_w300nh_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c
new file mode 100644
index 00000000..ca007779
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg460n.c
@@ -0,0 +1,220 @@
+/*
+ *  Zyxel NBG 460N/550N/550NH board support
+ *
+ *  Copyright (C) 2010 Michael Kurz <michi.kurz@googlemail.com>
+ *
+ *  based on mach-tl-wr1043nd.c
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+#include <linux/i2c-gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+#include <linux/rtl8366.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+/* LEDs */
+#define NBG460N_GPIO_LED_WPS		3
+#define NBG460N_GPIO_LED_WAN		6
+#define NBG460N_GPIO_LED_POWER		14
+#define NBG460N_GPIO_LED_WLAN		15
+
+/* Buttons */
+#define NBG460N_GPIO_BTN_WPS		12
+#define NBG460N_GPIO_BTN_RESET		21
+
+#define NBG460N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define NBG460N_KEYS_DEBOUNCE_INTERVAL	(3 * NBG460N_KEYS_POLL_INTERVAL)
+
+/* RTC chip PCF8563 I2C interface */
+#define NBG460N_GPIO_PCF8563_SDA	8
+#define NBG460N_GPIO_PCF8563_SCK	7
+
+/* Switch configuration I2C interface */
+#define NBG460N_GPIO_RTL8366_SDA	16
+#define NBG460N_GPIO_RTL8366_SCK	18
+
+static struct mtd_partition nbg460n_partitions[] = {
+	{
+		.name		= "Bootbase",
+		.offset		= 0,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "U-Boot Config",
+		.offset		= 0x010000,
+		.size		= 0x030000,
+	}, {
+		.name		= "U-Boot",
+		.offset		= 0x040000,
+		.size		= 0x030000,
+	}, {
+		.name		= "linux",
+		.offset		= 0x070000,
+		.size		= 0x0e0000,
+	}, {
+		.name		= "rootfs",
+		.offset		= 0x150000,
+		.size		= 0x2a0000,
+	}, {
+		.name		= "CalibData",
+		.offset		= 0x3f0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x070000,
+		.size		= 0x380000,
+	}
+};
+
+static struct flash_platform_data nbg460n_flash_data = {
+	.parts		= nbg460n_partitions,
+	.nr_parts       = ARRAY_SIZE(nbg460n_partitions),
+};
+
+static struct gpio_led nbg460n_leds_gpio[] __initdata = {
+	{
+		.name		= "nbg460n:green:power",
+		.gpio		= NBG460N_GPIO_LED_POWER,
+		.active_low	= 0,
+		.default_trigger = "default-on",
+	}, {
+		.name		= "nbg460n:green:wps",
+		.gpio		= NBG460N_GPIO_LED_WPS,
+		.active_low	= 0,
+	}, {
+		.name		= "nbg460n:green:wlan",
+		.gpio		= NBG460N_GPIO_LED_WLAN,
+		.active_low	= 0,
+	}, {
+		/* Not really for controlling the LED,
+		   when set low the LED blinks uncontrollable  */
+		.name		= "nbg460n:green:wan",
+		.gpio		= NBG460N_GPIO_LED_WAN,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button nbg460n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = NBG460N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG460N_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = NBG460N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG460N_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct i2c_gpio_platform_data nbg460n_i2c_device_platdata = {
+	.sda_pin	= NBG460N_GPIO_PCF8563_SDA,
+	.scl_pin	= NBG460N_GPIO_PCF8563_SCK,
+	.udelay		= 10,
+};
+
+static struct platform_device nbg460n_i2c_device = {
+	.name		= "i2c-gpio",
+	.id		= -1,
+	.num_resources	= 0,
+	.resource	= NULL,
+	.dev		= {
+		.platform_data	= &nbg460n_i2c_device_platdata,
+	},
+};
+
+static struct i2c_board_info nbg460n_i2c_devs[] __initdata = {
+	{
+		I2C_BOARD_INFO("pcf8563", 0x51),
+	},
+};
+
+static void nbg460n_i2c_init(void)
+{
+	/* The gpio interface */
+	platform_device_register(&nbg460n_i2c_device);
+	/* I2C devices */
+	i2c_register_board_info(0, nbg460n_i2c_devs,
+				ARRAY_SIZE(nbg460n_i2c_devs));
+}
+
+
+static struct rtl8366_platform_data nbg460n_rtl8366s_data = {
+	.gpio_sda	= NBG460N_GPIO_RTL8366_SDA,
+	.gpio_sck	= NBG460N_GPIO_RTL8366_SCK,
+};
+
+static struct platform_device nbg460n_rtl8366s_device = {
+	.name		= RTL8366S_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &nbg460n_rtl8366s_data,
+	}
+};
+
+static void __init nbg460n_setup(void)
+{
+	/* end of bootloader sector contains mac address */
+	u8 *mac = (u8 *) KSEG1ADDR(0x1fc0fff8);
+	/* last sector contains wlan calib data */
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* LAN Port */
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.mii_bus_dev = &nbg460n_rtl8366s_device.dev;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	/* WAN Port */
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+	ath79_eth1_data.mii_bus_dev = &nbg460n_rtl8366s_device.dev;
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	/* register the switch phy */
+	platform_device_register(&nbg460n_rtl8366s_device);
+
+	/* register flash */
+	ath79_register_m25p80(&nbg460n_flash_data);
+
+	ath79_register_wmac(eeprom, mac);
+
+	/* register RTC chip */
+	nbg460n_i2c_init();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(nbg460n_leds_gpio),
+				 nbg460n_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, NBG460N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(nbg460n_gpio_keys),
+					nbg460n_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_NBG460N, "NBG460N", "Zyxel NBG460N/550N/550NH",
+	     nbg460n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
new file mode 100644
index 00000000..e102f2c8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
@@ -0,0 +1,268 @@
+/*
+ * ZyXEL NBG6716 board support
+ *
+ * Based on the Qualcomm Atheros AP135/AP136 reference board support code
+ * Copyright (c) 2012 Qualcomm Atheros
+ * Copyright (c) 2012-2013 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (c) 2013 Andre Valentin <avalentin@marcant.net>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/platform/ar934x_nfc.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-nfc.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define NBG6716_GPIO_LED_INTERNET	18
+#define NBG6716_GPIO_LED_POWER		15
+#define NBG6716_GPIO_LED_USB0		4
+#define NBG6716_GPIO_LED_USB1		13
+#define NBG6716_GPIO_LED_WIFI2G		19
+#define NBG6716_GPIO_LED_WIFI5G		17
+#define NBG6716_GPIO_LED_WPS		21
+
+#define NBG6716_GPIO_BTN_RESET		23
+#define NBG6716_GPIO_BTN_RFKILL		1
+#define NBG6716_GPIO_BTN_USB0		14
+#define NBG6716_GPIO_BTN_USB1		0
+#define NBG6716_GPIO_BTN_WPS		22
+
+#define NBG6716_KEYS_POLL_INTERVAL	20	/* msecs */
+#define NBG6716_KEYS_DEBOUNCE_INTERVAL	(3 * NBG6716_KEYS_POLL_INTERVAL)
+
+#define NBG6716_MAC0_OFFSET		0
+#define NBG6716_MAC1_OFFSET		6
+#define NBG6716_WMAC_CALDATA_OFFSET	0x1000
+#define NBG6716_PCIE_CALDATA_OFFSET	0x5000
+
+static struct gpio_led nbg6716_leds_gpio[] __initdata = {
+	{
+		.name		= "zyxel:white:internet",
+		.gpio		= NBG6716_GPIO_LED_INTERNET,
+		.active_low	= 1,
+	},
+	{
+		.name		= "zyxel:white:power",
+		.gpio		= NBG6716_GPIO_LED_POWER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "zyxel:white:usb0",
+		.gpio		= NBG6716_GPIO_LED_USB0,
+		.active_low	= 1,
+	},
+	{
+		.name		= "zyxel:white:usb1",
+		.gpio		= NBG6716_GPIO_LED_USB1,
+		.active_low	= 1,
+	},
+	{
+		.name		= "zyxel:white:wifi2g",
+		.gpio		= NBG6716_GPIO_LED_WIFI2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "zyxel:white:wifi5g",
+		.gpio		= NBG6716_GPIO_LED_WIFI5G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "zyxel:white:wps",
+		.gpio		= NBG6716_GPIO_LED_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button nbg6716_gpio_keys[] __initdata = {
+	{
+		.desc		= "RESET button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG6716_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "RFKILL button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG6716_GPIO_BTN_RFKILL,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "USB0 eject button",
+		.type		= EV_KEY,
+		.code		= BTN_0,
+		.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG6716_GPIO_BTN_USB0,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "USB1 eject button",
+		.type		= EV_KEY,
+		.code		= BTN_1,
+		.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG6716_GPIO_BTN_USB1,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG6716_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg nbg6716_ar8327_pad0_cfg;
+static struct ar8327_pad_cfg nbg6716_ar8327_pad6_cfg;
+static struct ar8327_led_cfg nbg6716_ar8327_led_cfg;
+
+static struct ar8327_platform_data nbg6716_ar8327_data = {
+	.pad0_cfg = &nbg6716_ar8327_pad0_cfg,
+	.pad6_cfg = &nbg6716_ar8327_pad6_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.port6_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &nbg6716_ar8327_led_cfg
+};
+
+static struct mdio_board_info nbg6716_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &nbg6716_ar8327_data,
+	},
+};
+
+static void nbg6716_get_mac(const char *name, char *mac)
+{
+	u8 *nvram = (u8 *) KSEG1ADDR(0x1f040000);
+	int err;
+
+	err = ath79_nvram_parse_mac_addr(nvram, 0x10000,
+					 name, mac);
+	if (err)
+		pr_err("no MAC address found for %s\n", name);
+}
+
+static void __init nbg6716_common_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1f050000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(nbg6716_leds_gpio),
+				 nbg6716_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, NBG6716_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(nbg6716_gpio_keys),
+					nbg6716_gpio_keys);
+
+	ath79_nfc_set_ecc_mode(AR934X_NFC_ECC_HW);
+	ath79_register_nfc();
+
+	ath79_register_usb();
+
+	nbg6716_get_mac("ethaddr=", tmpmac);
+
+	ath79_register_pci();
+
+	ath79_register_wmac(art + NBG6716_WMAC_CALDATA_OFFSET, tmpmac);
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, tmpmac, 2);
+	ath79_init_mac(ath79_eth1_data.mac_addr, tmpmac, 3);
+
+	mdiobus_register_board_info(nbg6716_mdio0_info,
+				    ARRAY_SIZE(nbg6716_mdio0_info));
+
+	/* GMAC0 is connected to the RMGII interface */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the SGMII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(1);
+}
+
+static void __init nbg6716_010_setup(void)
+{
+	/* GMAC0 of the AR8337 switch is connected to GMAC0 via RGMII */
+	nbg6716_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_RGMII;
+	nbg6716_ar8327_pad0_cfg.txclk_delay_en = true;
+	nbg6716_ar8327_pad0_cfg.rxclk_delay_en = true;
+	nbg6716_ar8327_pad0_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
+	nbg6716_ar8327_pad0_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
+
+	/* GMAC6 of the AR8337 switch is connected to GMAC1 via SGMII */
+	nbg6716_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_SGMII;
+	nbg6716_ar8327_pad6_cfg.rxclk_delay_en = true;
+	nbg6716_ar8327_pad6_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL0;
+
+	ath79_eth0_pll_data.pll_1000 = 0xa6000000;
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+	nbg6716_ar8327_led_cfg.open_drain = 0;
+	nbg6716_ar8327_led_cfg.led_ctrl0 = 0xffb7ffb7;
+	nbg6716_ar8327_led_cfg.led_ctrl1 = 0xffb7ffb7;
+	nbg6716_ar8327_led_cfg.led_ctrl2 = 0xffb7ffb7;
+	nbg6716_ar8327_led_cfg.led_ctrl3 = 0x03ffff00;
+
+	nbg6716_common_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_NBG6716, "NBG6716",
+	     "Zyxel NBG6716",
+	     nbg6716_010_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c
new file mode 100644
index 00000000..6b0bdc3d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c
@@ -0,0 +1,225 @@
+/*
+ *  OpenMesh OM2P support
+ *
+ *  Copyright (C) 2011 Marek Lindner <marek@open-mesh.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define OM2P_GPIO_LED_POWER	0
+#define OM2P_GPIO_LED_GREEN	13
+#define OM2P_GPIO_LED_RED	14
+#define OM2P_GPIO_LED_YELLOW	15
+#define OM2P_GPIO_LED_LAN	16
+#define OM2P_GPIO_LED_WAN	17
+#define OM2P_GPIO_BTN_RESET	1
+
+#define OM2P_KEYS_POLL_INTERVAL		20	/* msecs */
+#define OM2P_KEYS_DEBOUNCE_INTERVAL	(3 * OM2P_KEYS_POLL_INTERVAL)
+
+#define OM2P_WAN_PHYMASK	BIT(4)
+
+#define OM2P_LC_GPIO_LED_POWER	1
+#define OM2P_LC_GPIO_LED_GREEN	15
+#define OM2P_LC_GPIO_LED_RED	16
+#define OM2P_LC_GPIO_LED_YELLOW	0
+#define OM2P_LC_GPIO_LED_LAN	13
+#define OM2P_LC_GPIO_LED_WAN	17
+#define OM2P_LC_GPIO_BTN_RESET	12
+
+static struct flash_platform_data om2p_flash_data = {
+	.type = "s25sl12800",
+	.name = "ar7240-nor0",
+};
+
+static struct gpio_led om2p_leds_gpio[] __initdata = {
+	{
+		.name		= "om2p:blue:power",
+		.gpio		= OM2P_GPIO_LED_POWER,
+		.active_low	= 1,
+	}, {
+		.name		= "om2p:red:wifi",
+		.gpio		= OM2P_GPIO_LED_RED,
+		.active_low	= 1,
+	}, {
+		.name		= "om2p:yellow:wifi",
+		.gpio		= OM2P_GPIO_LED_YELLOW,
+		.active_low	= 1,
+	}, {
+		.name		= "om2p:green:wifi",
+		.gpio		= OM2P_GPIO_LED_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "om2p:blue:lan",
+		.gpio		= OM2P_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "om2p:blue:wan",
+		.gpio		= OM2P_GPIO_LED_WAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button om2p_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = OM2P_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= OM2P_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static void __init om2p_setup(void)
+{
+	u8 *mac1 = (u8 *)KSEG1ADDR(0x1ffc0000);
+	u8 *mac2 = (u8 *)KSEG1ADDR(0x1ffc0000 + ETH_ALEN);
+	u8 *ee = (u8 *)KSEG1ADDR(0x1ffc1000);
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_m25p80(&om2p_flash_data);
+
+	ath79_register_mdio(0, ~OM2P_WAN_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ap91_pci_init(ee, NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(om2p_leds_gpio),
+				 om2p_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, OM2P_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(om2p_gpio_keys),
+					om2p_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_OM2P, "OM2P", "OpenMesh OM2P", om2p_setup);
+
+
+static struct flash_platform_data om2p_lc_flash_data = {
+	.type = "s25sl12800",
+};
+
+static void __init om2p_lc_setup(void)
+{
+	u8 *mac1 = (u8 *)KSEG1ADDR(0x1ffc0000);
+	u8 *mac2 = (u8 *)KSEG1ADDR(0x1ffc0000 + ETH_ALEN);
+	u8 *art = (u8 *)KSEG1ADDR(0x1ffc1000);
+	u32 t;
+
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
+	t |= AR933X_BOOTSTRAP_MDIO_GPIO_EN;
+	ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP, t);
+
+	ath79_register_m25p80(&om2p_lc_flash_data);
+
+	om2p_leds_gpio[0].gpio = OM2P_LC_GPIO_LED_POWER;
+	om2p_leds_gpio[1].gpio = OM2P_LC_GPIO_LED_RED;
+	om2p_leds_gpio[2].gpio = OM2P_LC_GPIO_LED_YELLOW;
+	om2p_leds_gpio[3].gpio = OM2P_LC_GPIO_LED_GREEN;
+	om2p_leds_gpio[4].gpio = OM2P_LC_GPIO_LED_LAN;
+	om2p_leds_gpio[5].gpio = OM2P_LC_GPIO_LED_WAN;
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(om2p_leds_gpio),
+				 om2p_leds_gpio);
+
+	om2p_gpio_keys[0].gpio = OM2P_LC_GPIO_BTN_RESET;
+	ath79_register_gpio_keys_polled(-1, OM2P_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(om2p_gpio_keys),
+					om2p_gpio_keys);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_wmac(art, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_OM2P_LC, "OM2P-LC", "OpenMesh OM2P LC", om2p_lc_setup);
+MIPS_MACHINE(ATH79_MACH_OM2Pv2, "OM2Pv2", "OpenMesh OM2Pv2", om2p_lc_setup);
+
+static void __init om2p_hs_setup(void)
+{
+	u8 *mac1 = (u8 *)KSEG1ADDR(0x1ffc0000);
+	u8 *mac2 = (u8 *)KSEG1ADDR(0x1ffc0000 + ETH_ALEN);
+	u8 *art = (u8 *)KSEG1ADDR(0x1ffc1000);
+
+	/* make lan / wan leds software controllable */
+	ath79_gpio_output_select(OM2P_GPIO_LED_LAN, AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(OM2P_GPIO_LED_WAN, AR934X_GPIO_OUT_GPIO);
+
+	/* enable reset button */
+	ath79_gpio_output_select(OM2P_GPIO_BTN_RESET, AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_function_enable(AR934X_GPIO_FUNC_JTAG_DISABLE);
+
+	om2p_leds_gpio[4].gpio = OM2P_GPIO_LED_WAN;
+	om2p_leds_gpio[5].gpio = OM2P_GPIO_LED_LAN;
+
+	ath79_register_m25p80(&om2p_lc_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(om2p_leds_gpio),
+				 om2p_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, OM2P_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(om2p_gpio_keys),
+					om2p_gpio_keys);
+
+	ath79_register_wmac(art, NULL);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
+
+	/* GMAC0 is connected to the PHY0 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+}
+
+MIPS_MACHINE(ATH79_MACH_OM2P_HS, "OM2P-HS", "OpenMesh OM2P HS", om2p_hs_setup);
+MIPS_MACHINE(ATH79_MACH_OM2P_HSv2, "OM2P-HSv2", "OpenMesh OM2P HSv2", om2p_hs_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c
new file mode 100644
index 00000000..c1cfa180
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c
@@ -0,0 +1,122 @@
+/*
+ *  OpenMesh OM5P support
+ *
+ *  Copyright (C) 2013 Marek Lindner <marek@open-mesh.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define OM5P_GPIO_LED_POWER	13
+#define OM5P_GPIO_LED_GREEN	16
+#define OM5P_GPIO_LED_RED	19
+#define OM5P_GPIO_LED_YELLOW	17
+#define OM5P_GPIO_LED_LAN	14
+#define OM5P_GPIO_LED_WAN	15
+#define OM5P_GPIO_BTN_RESET	4
+
+#define OM5P_KEYS_POLL_INTERVAL		20	/* msecs */
+#define OM5P_KEYS_DEBOUNCE_INTERVAL	(3 * OM5P_KEYS_POLL_INTERVAL)
+
+#define OM5P_WMAC_CALDATA_OFFSET	0x1000
+
+static struct gpio_led om5p_leds_gpio[] __initdata = {
+	{
+		.name		= "om5p:blue:power",
+		.gpio		= OM5P_GPIO_LED_POWER,
+		.active_low	= 1,
+	}, {
+		.name		= "om5p:red:wifi",
+		.gpio		= OM5P_GPIO_LED_RED,
+		.active_low	= 1,
+	}, {
+		.name		= "om5p:yellow:wifi",
+		.gpio		= OM5P_GPIO_LED_YELLOW,
+		.active_low	= 1,
+	}, {
+		.name		= "om5p:green:wifi",
+		.gpio		= OM5P_GPIO_LED_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "om5p:blue:lan",
+		.gpio		= OM5P_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "om5p:blue:wan",
+		.gpio		= OM5P_GPIO_LED_WAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button om5p_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = OM5P_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= OM5P_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static struct flash_platform_data om5p_flash_data = {
+	.type = "mx25l12805d",
+};
+
+static void __init om5p_setup(void)
+{
+	u8 *art = (u8 *)KSEG1ADDR(0x1fff0000);
+	u8 mac[6];
+
+	/* make lan / wan leds software controllable */
+	ath79_gpio_output_select(OM5P_GPIO_LED_LAN, AR934X_GPIO_OUT_GPIO);
+	ath79_gpio_output_select(OM5P_GPIO_LED_WAN, AR934X_GPIO_OUT_GPIO);
+
+	ath79_register_m25p80(&om5p_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(om5p_leds_gpio),
+				 om5p_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, OM5P_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(om5p_gpio_keys),
+					om5p_gpio_keys);
+
+	ath79_init_mac(mac, art, 2);
+	ath79_register_wmac(art + OM5P_WMAC_CALDATA_OFFSET, mac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, art, 1);
+
+	/* GMAC0 is connected to the PHY0 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+}
+
+MIPS_MACHINE(ATH79_MACH_OM5P, "OM5P", "OpenMesh OM5P", om5p_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb42.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb42.c
new file mode 100644
index 00000000..3a350e90
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb42.c
@@ -0,0 +1,83 @@
+/*
+ *  Atheros PB42 board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define PB42_KEYS_POLL_INTERVAL		20	/* msecs */
+#define PB42_KEYS_DEBOUNCE_INTERVAL	(3 * PB42_KEYS_POLL_INTERVAL)
+
+#define PB42_GPIO_BTN_SW4	8
+#define PB42_GPIO_BTN_SW5	3
+
+static struct gpio_keys_button pb42_gpio_keys[] __initdata = {
+	{
+		.desc		= "sw4",
+		.type		= EV_KEY,
+		.code		= BTN_0,
+		.debounce_interval = PB42_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= PB42_GPIO_BTN_SW4,
+		.active_low	= 1,
+	}, {
+		.desc		= "sw5",
+		.type		= EV_KEY,
+		.code		= BTN_1,
+		.debounce_interval = PB42_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= PB42_GPIO_BTN_SW5,
+		.active_low	= 1,
+	}
+};
+
+static const char *pb42_part_probes[] = {
+	"RedBoot",
+	NULL,
+};
+
+static struct flash_platform_data pb42_flash_data = {
+	.part_probes	= pb42_part_probes,
+};
+
+#define PB42_WAN_PHYMASK	BIT(20)
+#define PB42_LAN_PHYMASK	(BIT(16) | BIT(17) | BIT(18) | BIT(19))
+#define PB42_MDIO_PHYMASK	(PB42_LAN_PHYMASK | PB42_WAN_PHYMASK)
+
+static void __init pb42_init(void)
+{
+	ath79_register_m25p80(&pb42_flash_data);
+
+	ath79_register_mdio(0, ~PB42_MDIO_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = PB42_WAN_PHYMASK;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.speed = SPEED_100;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_gpio_keys_polled(-1, PB42_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(pb42_gpio_keys),
+					pb42_gpio_keys);
+
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_PB42, "PB42", "Atheros PB42", pb42_init);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
new file mode 100644
index 00000000..76715a51
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
@@ -0,0 +1,70 @@
+/*
+ *  Atheros PB92 board support
+ *
+ *  Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define PB92_KEYS_POLL_INTERVAL		20	/* msecs */
+#define PB92_KEYS_DEBOUNCE_INTERVAL	(3 * PB92_KEYS_POLL_INTERVAL)
+
+#define PB92_GPIO_BTN_SW4	8
+#define PB92_GPIO_BTN_SW5	3
+
+static struct gpio_keys_button pb92_gpio_keys[] __initdata = {
+	{
+		.desc		= "sw4",
+		.type		= EV_KEY,
+		.code		= BTN_0,
+		.debounce_interval = PB92_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= PB92_GPIO_BTN_SW4,
+		.active_low	= 1,
+	}, {
+		.desc		= "sw5",
+		.type		= EV_KEY,
+		.code		= BTN_1,
+		.debounce_interval = PB92_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= PB92_GPIO_BTN_SW5,
+		.active_low	= 1,
+	}
+};
+
+static void __init pb92_init(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_mdio(0, ~BIT(0));
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_register_eth(0);
+
+	ath79_register_gpio_keys_polled(-1, PB92_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(pb92_gpio_keys),
+					 pb92_gpio_keys);
+
+	ath79_register_usb();
+
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_PB92, "PB92", "Atheros PB92", pb92_init);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-qihoo-c301.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-qihoo-c301.c
new file mode 100644
index 00000000..08a602f7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-qihoo-c301.c
@@ -0,0 +1,166 @@
+/*
+ *  Qihoo 360 C301 board support
+ *
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2014 Weijie Gao <hackpascal@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define QIHOO_C301_GPIO_LED_STATUS_GREEN	0
+#define QIHOO_C301_GPIO_LED_STATUS_RED		11
+
+#define QIHOO_C301_GPIO_LED_WAN			1
+#define QIHOO_C301_GPIO_LED_LAN1		2
+#define QIHOO_C301_GPIO_LED_LAN2		3
+#define QIHOO_C301_GPIO_ETH_LEN_EN		18
+
+#define QIHOO_C301_GPIO_BTN_RESET		16
+
+#define QIHOO_C301_GPIO_USB_POWER		19
+
+#define QIHOO_C301_GPIO_SPI_CS1			12
+
+#define QIHOO_C301_GPIO_EXTERNAL_LNA0		14
+#define QIHOO_C301_GPIO_EXTERNAL_LNA1		15
+
+#define QIHOO_C301_KEYS_POLL_INTERVAL		20	/* msecs */
+#define QIHOO_C301_KEYS_DEBOUNCE_INTERVAL	\
+	(3 * QIHOO_C301_KEYS_POLL_INTERVAL)
+
+#define QIHOO_C301_WMAC_CALDATA_OFFSET		0x1000
+
+#define QIHOO_C301_NVRAM_ADDR			0x1f058010
+#define QIHOO_C301_NVRAM_SIZE			0x7ff0
+
+static struct gpio_led qihoo_c301_leds_gpio[] __initdata = {
+	{
+		.name		= "qihoo:green:status",
+		.gpio		= QIHOO_C301_GPIO_LED_STATUS_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "qihoo:red:status",
+		.gpio		= QIHOO_C301_GPIO_LED_STATUS_RED,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button qihoo_c301_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = QIHOO_C301_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= QIHOO_C301_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+struct flash_platform_data flash __initdata = {NULL, NULL, 0};
+
+static void qihoo_c301_get_mac(const char *name, char *mac)
+{
+	u8 *nvram = (u8 *) KSEG1ADDR(QIHOO_C301_NVRAM_ADDR);
+	int err;
+
+	err = ath79_nvram_parse_mac_addr(nvram, QIHOO_C301_NVRAM_SIZE,
+					 name, mac);
+	if (err)
+		pr_err("no MAC address found for %s\n", name);
+}
+
+static void __init qihoo_c301_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80_multi(&flash);
+
+	ath79_gpio_function_enable(AR934X_GPIO_FUNC_JTAG_DISABLE);
+
+	ath79_gpio_output_select(QIHOO_C301_GPIO_LED_WAN,
+				 AR934X_GPIO_OUT_LED_LINK4);
+	ath79_gpio_output_select(QIHOO_C301_GPIO_LED_LAN1,
+				 AR934X_GPIO_OUT_LED_LINK1);
+	ath79_gpio_output_select(QIHOO_C301_GPIO_LED_LAN2,
+				 AR934X_GPIO_OUT_LED_LINK2);
+
+	ath79_gpio_output_select(QIHOO_C301_GPIO_SPI_CS1,
+				 AR934X_GPIO_OUT_SPI_CS1);
+
+	gpio_request_one(QIHOO_C301_GPIO_ETH_LEN_EN,
+			 GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED,
+			 "Ethernet LED enable");
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(qihoo_c301_leds_gpio),
+				 qihoo_c301_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, QIHOO_C301_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(qihoo_c301_gpio_keys),
+					qihoo_c301_gpio_keys);
+
+	ath79_wmac_set_ext_lna_gpio(0, QIHOO_C301_GPIO_EXTERNAL_LNA0);
+	ath79_wmac_set_ext_lna_gpio(1, QIHOO_C301_GPIO_EXTERNAL_LNA1);
+
+	qihoo_c301_get_mac("wlan24mac=", tmpmac);
+	ath79_register_wmac(art + QIHOO_C301_WMAC_CALDATA_OFFSET, tmpmac);
+
+	ath79_register_pci();
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE |
+				   AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_register_mdio(1, 0x0);
+
+	/* LAN */
+	qihoo_c301_get_mac("lanmac=", ath79_eth1_data.mac_addr);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+
+	ath79_register_eth(1);
+
+	/* WAN */
+	qihoo_c301_get_mac("wanmac=", ath79_eth0_data.mac_addr);
+
+	/* GMAC0 is connected to the PHY4 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(0);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+
+	ath79_register_eth(0);
+
+	gpio_request_one(QIHOO_C301_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_QIHOO_C301, "QIHOO-C301", "Qihoo 360 C301",
+	     qihoo_c301_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-r6100.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-r6100.c
new file mode 100644
index 00000000..c1f0e2c4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-r6100.c
@@ -0,0 +1,146 @@
+/*
+ *  NETGEAR R6100 board support
+ *
+ *  Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/platform/ar934x_nfc.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-nfc.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define R6100_GPIO_LED_WLAN		0
+#define R6100_GPIO_LED_USB		11
+#define R6100_GPIO_LED_WAN_GREEN	13
+#define R6100_GPIO_LED_POWER_AMBER	14
+#define R6100_GPIO_LED_WAN_AMBER	15
+#define R6100_GPIO_LED_POWER_GREEN	17
+
+#define R6100_GPIO_BTN_WIRELESS		1
+#define R6100_GPIO_BTN_WPS		3
+#define R6100_GPIO_BTN_RESET		12
+
+#define R6100_GPIO_USB_POWER		16
+
+#define R6100_KEYS_POLL_INTERVAL	20	/* msecs */
+#define R6100_KEYS_DEBOUNCE_INTERVAL	(3 * R6100_KEYS_POLL_INTERVAL)
+
+static struct gpio_led r6100_leds_gpio[] __initdata = {
+	{
+		.name		= "netgear:green:power",
+		.gpio		= R6100_GPIO_LED_POWER_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:amber:power",
+		.gpio		= R6100_GPIO_LED_POWER_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:green:wan",
+		.gpio		= R6100_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:amber:wan",
+		.gpio		= R6100_GPIO_LED_WAN_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:blue:usb",
+		.gpio		= R6100_GPIO_LED_USB,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:blue:wlan",
+		.gpio		= R6100_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button r6100_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = R6100_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= R6100_GPIO_BTN_RESET,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = R6100_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= R6100_GPIO_BTN_WPS,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "RFKILL switch",
+		.type		= EV_SW,
+		.code		= KEY_RFKILL,
+		.debounce_interval = R6100_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= R6100_GPIO_BTN_WIRELESS,
+		.active_low	= 0,
+	},
+};
+
+static void __init r6100_setup(void)
+{
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(r6100_leds_gpio),
+				 r6100_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, R6100_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(r6100_gpio_keys),
+					r6100_gpio_keys);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_register_mdio(1, 0x0);
+
+	/* GMAC0 is connected to the PHY0 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+
+	gpio_request_one(R6100_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+
+	ath79_nfc_set_ecc_mode(AR934X_NFC_ECC_HW);
+	ath79_register_nfc();
+
+	ath79_register_usb();
+
+	ath79_register_wmac_simple();
+
+	ap91_pci_init_simple();
+}
+
+MIPS_MACHINE(ATH79_MACH_R6100, "R6100", "NETGEAR R6100",
+	     r6100_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
new file mode 100644
index 00000000..b73fae63
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
@@ -0,0 +1,331 @@
+/*
+ *  MikroTik RouterBOARD 2011 support
+ *
+ *  Copyright (C) 2012 Stijn Tintel <stijn@linux-ipv6.be>
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "rb2011: " fmt
+
+#include <linux/phy.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/routerboot.h>
+#include <linux/gpio.h>
+
+#include <asm/prom.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-nfc.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "routerboot.h"
+
+#define RB2011_GPIO_NAND_NCE	14
+#define RB2011_GPIO_SFP_LOS	21
+
+#define RB_ROUTERBOOT_OFFSET	0x0000
+#define RB_ROUTERBOOT_MIN_SIZE	0xb000
+#define RB_HARD_CFG_SIZE	0x1000
+#define RB_BIOS_OFFSET		0xd000
+#define RB_BIOS_SIZE		0x1000
+#define RB_SOFT_CFG_OFFSET	0xf000
+#define RB_SOFT_CFG_SIZE	0x1000
+
+#define RB_ART_SIZE		0x10000
+
+#define RB2011_FLAG_SFP		BIT(0)
+#define RB2011_FLAG_USB		BIT(1)
+#define RB2011_FLAG_WLAN	BIT(2)
+
+static struct mtd_partition rb2011_spi_partitions[] = {
+	{
+		.name		= "routerboot",
+		.offset		= RB_ROUTERBOOT_OFFSET,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "hard_config",
+		.size		= RB_HARD_CFG_SIZE,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "bios",
+		.offset		= RB_BIOS_OFFSET,
+		.size		= RB_BIOS_SIZE,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "soft_config",
+		.size		= RB_SOFT_CFG_SIZE,
+	}
+};
+
+static void __init rb2011_init_partitions(const struct rb_info *info)
+{
+	rb2011_spi_partitions[0].size = info->hard_cfg_offs;
+	rb2011_spi_partitions[1].offset = info->hard_cfg_offs;
+	rb2011_spi_partitions[3].offset = info->soft_cfg_offs;
+}
+
+static struct mtd_partition rb2011_nand_partitions[] = {
+	{
+		.name	= "booter",
+		.offset	= 0,
+		.size	= (256 * 1024),
+		.mask_flags = MTD_WRITEABLE,
+	},
+	{
+		.name	= "kernel",
+		.offset	= (256 * 1024),
+		.size	= (4 * 1024 * 1024) - (256 * 1024),
+	},
+	{
+		.name	= "rootfs",
+		.offset	= MTDPART_OFS_NXTBLK,
+		.size	= MTDPART_SIZ_FULL,
+	},
+};
+
+static struct flash_platform_data rb2011_spi_flash_data = {
+	.parts		= rb2011_spi_partitions,
+	.nr_parts	= ARRAY_SIZE(rb2011_spi_partitions),
+};
+
+static struct ar8327_pad_cfg rb2011_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL3,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL0,
+};
+
+static struct ar8327_pad_cfg rb2011_ar8327_pad6_cfg;
+static struct ar8327_sgmii_cfg rb2011_ar8327_sgmii_cfg;
+
+static struct ar8327_led_cfg rb2011_ar8327_led_cfg = {
+	.led_ctrl0 = 0xc731c731,
+	.led_ctrl1 = 0x00000000,
+	.led_ctrl2 = 0x00000000,
+	.led_ctrl3 = 0x0030c300,
+	.open_drain = false,
+};
+
+static const struct ar8327_led_info rb2011_ar8327_leds[] __initconst = {
+	AR8327_LED_INFO(PHY0_0, HW, "rb:green:eth1"),
+	AR8327_LED_INFO(PHY1_0, HW, "rb:green:eth2"),
+	AR8327_LED_INFO(PHY2_0, HW, "rb:green:eth3"),
+	AR8327_LED_INFO(PHY3_0, HW, "rb:green:eth4"),
+	AR8327_LED_INFO(PHY4_0, HW, "rb:green:eth5"),
+	AR8327_LED_INFO(PHY0_1, SW, "rb:green:eth6"),
+	AR8327_LED_INFO(PHY1_1, SW, "rb:green:eth7"),
+	AR8327_LED_INFO(PHY2_1, SW, "rb:green:eth8"),
+	AR8327_LED_INFO(PHY3_1, SW, "rb:green:eth9"),
+	AR8327_LED_INFO(PHY4_1, SW, "rb:green:eth10"),
+	AR8327_LED_INFO(PHY4_2, SW, "rb:green:usr"),
+};
+
+static struct ar8327_platform_data rb2011_ar8327_data = {
+	.pad0_cfg = &rb2011_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &rb2011_ar8327_led_cfg,
+	.num_leds = ARRAY_SIZE(rb2011_ar8327_leds),
+	.leds = rb2011_ar8327_leds,
+};
+
+static struct mdio_board_info rb2011_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &rb2011_ar8327_data,
+	},
+};
+
+static void __init rb2011_wlan_init(void)
+{
+	char *art_buf;
+	u8 wlan_mac[ETH_ALEN];
+
+	art_buf = rb_get_wlan_data();
+	if (art_buf == NULL)
+		return;
+
+	ath79_init_mac(wlan_mac, ath79_mac_base, 11);
+	ath79_register_wmac(art_buf + 0x1000, wlan_mac);
+
+	kfree(art_buf);
+}
+
+static void rb2011_nand_select_chip(int chip_no)
+{
+	switch (chip_no) {
+	case 0:
+		gpio_set_value(RB2011_GPIO_NAND_NCE, 0);
+		break;
+	default:
+		gpio_set_value(RB2011_GPIO_NAND_NCE, 1);
+		break;
+	}
+	ndelay(500);
+}
+
+static struct nand_ecclayout rb2011_nand_ecclayout = {
+	.eccbytes	= 6,
+	.eccpos		= { 8, 9, 10, 13, 14, 15 },
+	.oobavail	= 9,
+	.oobfree	= { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
+};
+
+static int rb2011_nand_scan_fixup(struct mtd_info *mtd)
+{
+	struct nand_chip *chip = mtd->priv;
+
+	if (mtd->writesize == 512) {
+		/*
+		 * Use the OLD Yaffs-1 OOB layout, otherwise RouterBoot
+		 * will not be able to find the kernel that we load.
+		 */
+		chip->ecc.layout = &rb2011_nand_ecclayout;
+	}
+
+	return 0;
+}
+
+static void __init rb2011_nand_init(void)
+{
+	gpio_request_one(RB2011_GPIO_NAND_NCE, GPIOF_OUT_INIT_HIGH, "NAND nCE");
+
+	ath79_nfc_set_scan_fixup(rb2011_nand_scan_fixup);
+	ath79_nfc_set_parts(rb2011_nand_partitions,
+			    ARRAY_SIZE(rb2011_nand_partitions));
+	ath79_nfc_set_select_chip(rb2011_nand_select_chip);
+	ath79_nfc_set_swap_dma(true);
+	ath79_register_nfc();
+}
+
+static int rb2011_get_port_link(unsigned port)
+{
+	if (port != 6)
+		return -EINVAL;
+
+	/* The Loss of signal line is active low */
+	return !gpio_get_value(RB2011_GPIO_SFP_LOS);
+}
+
+static void __init rb2011_sfp_init(void)
+{
+	gpio_request_one(RB2011_GPIO_SFP_LOS, GPIOF_IN, "SFP LOS");
+
+	rb2011_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_SGMII;
+
+	rb2011_ar8327_data.pad6_cfg = &rb2011_ar8327_pad6_cfg;
+
+	rb2011_ar8327_sgmii_cfg.sgmii_ctrl = 0xc70167d0;
+	rb2011_ar8327_sgmii_cfg.serdes_aen = true;
+
+	rb2011_ar8327_data.sgmii_cfg = &rb2011_ar8327_sgmii_cfg;
+
+	rb2011_ar8327_data.port6_cfg.force_link = 1;
+	rb2011_ar8327_data.port6_cfg.speed = AR8327_PORT_SPEED_1000;
+	rb2011_ar8327_data.port6_cfg.duplex = 1;
+
+	rb2011_ar8327_data.get_port_link = rb2011_get_port_link;
+}
+
+static int __init rb2011_setup(u32 flags)
+{
+	const struct rb_info *info;
+	char buf[64];
+
+	info = rb_init_info((void *) KSEG1ADDR(0x1f000000), 0x10000);
+	if (!info)
+		return -ENODEV;
+
+	scnprintf(buf, sizeof(buf), "Mikrotik RouterBOARD %s",
+		  (info->board_name) ? info->board_name : "");
+	mips_set_machine_name(buf);
+
+	rb2011_init_partitions(info);
+
+	ath79_register_m25p80(&rb2011_spi_flash_data);
+	rb2011_nand_init();
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+				   AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(1, 0x0);
+	ath79_register_mdio(0, 0x0);
+
+	mdiobus_register_board_info(rb2011_mdio0_info,
+				    ARRAY_SIZE(rb2011_mdio0_info));
+
+	/* GMAC0 is connected to an ar8327 switch */
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 5);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(1);
+
+	if (flags & RB2011_FLAG_SFP)
+		rb2011_sfp_init();
+
+	if (flags & RB2011_FLAG_WLAN)
+		rb2011_wlan_init();
+
+	if (flags & RB2011_FLAG_USB)
+		ath79_register_usb();
+
+	return 0;
+}
+
+static void __init rb2011l_setup(void)
+{
+	rb2011_setup(0);
+}
+
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011L, "2011L", rb2011l_setup);
+
+static void __init rb2011us_setup(void)
+{
+	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB);
+}
+
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US, "2011US", rb2011us_setup);
+
+static void __init rb2011g_setup(void)
+{
+	rb2011_setup(RB2011_FLAG_SFP |
+		     RB2011_FLAG_USB |
+		     RB2011_FLAG_WLAN);
+}
+
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011G, "2011G", rb2011g_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb4xx.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb4xx.c
new file mode 100644
index 00000000..1a61b458
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb4xx.c
@@ -0,0 +1,465 @@
+/*
+ *  MikroTik RouterBOARD 4xx series support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/irq.h>
+#include <linux/mdio-gpio.h>
+#include <linux/mmc/host.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/mmc_spi.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/rb4xx_cpld.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define RB4XX_GPIO_USER_LED	4
+#define RB4XX_GPIO_RESET_SWITCH	7
+
+#define RB4XX_GPIO_CPLD_BASE	32
+#define RB4XX_GPIO_CPLD_LED1	(RB4XX_GPIO_CPLD_BASE + CPLD_GPIO_nLED1)
+#define RB4XX_GPIO_CPLD_LED2	(RB4XX_GPIO_CPLD_BASE + CPLD_GPIO_nLED2)
+#define RB4XX_GPIO_CPLD_LED3	(RB4XX_GPIO_CPLD_BASE + CPLD_GPIO_nLED3)
+#define RB4XX_GPIO_CPLD_LED4	(RB4XX_GPIO_CPLD_BASE + CPLD_GPIO_nLED4)
+#define RB4XX_GPIO_CPLD_LED5	(RB4XX_GPIO_CPLD_BASE + CPLD_GPIO_nLED5)
+
+#define RB4XX_KEYS_POLL_INTERVAL	20	/* msecs */
+#define RB4XX_KEYS_DEBOUNCE_INTERVAL	(3 * RB4XX_KEYS_POLL_INTERVAL)
+
+static struct gpio_led rb4xx_leds_gpio[] __initdata = {
+	{
+		.name		= "rb4xx:yellow:user",
+		.gpio		= RB4XX_GPIO_USER_LED,
+		.active_low	= 0,
+	}, {
+		.name		= "rb4xx:green:led1",
+		.gpio		= RB4XX_GPIO_CPLD_LED1,
+		.active_low	= 1,
+	}, {
+		.name		= "rb4xx:green:led2",
+		.gpio		= RB4XX_GPIO_CPLD_LED2,
+		.active_low	= 1,
+	}, {
+		.name		= "rb4xx:green:led3",
+		.gpio		= RB4XX_GPIO_CPLD_LED3,
+		.active_low	= 1,
+	}, {
+		.name		= "rb4xx:green:led4",
+		.gpio		= RB4XX_GPIO_CPLD_LED4,
+		.active_low	= 1,
+	}, {
+		.name		= "rb4xx:green:led5",
+		.gpio		= RB4XX_GPIO_CPLD_LED5,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button rb4xx_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset_switch",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = RB4XX_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= RB4XX_GPIO_RESET_SWITCH,
+		.active_low	= 1,
+	}
+};
+
+static struct platform_device rb4xx_nand_device = {
+	.name	= "rb4xx-nand",
+	.id	= -1,
+};
+
+static struct ath79_pci_irq rb4xx_pci_irqs[] __initdata = {
+	{
+		.slot	= 17,
+		.pin	= 1,
+		.irq	= ATH79_PCI_IRQ(2),
+	}, {
+		.slot	= 18,
+		.pin	= 1,
+		.irq	= ATH79_PCI_IRQ(0),
+	}, {
+		.slot	= 18,
+		.pin	= 2,
+		.irq	= ATH79_PCI_IRQ(1),
+	}, {
+		.slot	= 19,
+		.pin	= 1,
+		.irq	= ATH79_PCI_IRQ(1),
+	}, {
+		.slot	= 19,
+		.pin	= 2,
+		.irq	= ATH79_PCI_IRQ(2),
+	}, {
+		.slot	= 20,
+		.pin	= 1,
+		.irq	= ATH79_PCI_IRQ(2),
+	}, {
+		.slot	= 20,
+		.pin	= 2,
+		.irq	= ATH79_PCI_IRQ(0),
+	}, {
+		.slot	= 21,
+		.pin	= 1,
+		.irq	= ATH79_PCI_IRQ(0),
+	}, {
+		.slot	= 22,
+		.pin	= 1,
+		.irq	= ATH79_PCI_IRQ(1),
+	}, {
+		.slot	= 22,
+		.pin	= 2,
+		.irq	= ATH79_PCI_IRQ(2),
+	}, {
+		.slot	= 23,
+		.pin	= 1,
+		.irq	= ATH79_PCI_IRQ(2),
+	}, {
+		.slot	= 23,
+		.pin	= 2,
+		.irq	= ATH79_PCI_IRQ(0),
+	}
+};
+
+static struct mtd_partition rb4xx_partitions[] = {
+	{
+		.name		= "routerboot",
+		.offset		= 0,
+		.size		= 0x0b000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "hard_config",
+		.offset		= 0x0b000,
+		.size		= 0x01000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "bios",
+		.offset		= 0x0d000,
+		.size		= 0x02000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "soft_config",
+		.offset		= 0x0f000,
+		.size		= 0x01000,
+	}
+};
+
+static struct flash_platform_data rb4xx_flash_data = {
+	.type		= "pm25lv512",
+	.parts		= rb4xx_partitions,
+	.nr_parts	= ARRAY_SIZE(rb4xx_partitions),
+};
+
+static struct rb4xx_cpld_platform_data rb4xx_cpld_data = {
+	.gpio_base	= RB4XX_GPIO_CPLD_BASE,
+};
+
+static struct mmc_spi_platform_data rb4xx_mmc_data = {
+	.ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,
+};
+
+static struct spi_board_info rb4xx_spi_info[] = {
+	{
+		.bus_num	= 0,
+		.chip_select	= 0,
+		.max_speed_hz	= 25000000,
+		.modalias	= "m25p80",
+		.platform_data	= &rb4xx_flash_data,
+	}, {
+		.bus_num	= 0,
+		.chip_select	= 1,
+		.max_speed_hz	= 25000000,
+		.modalias	= "spi-rb4xx-cpld",
+		.platform_data	= &rb4xx_cpld_data,
+	}
+};
+
+static struct spi_board_info rb4xx_microsd_info[] = {
+	{
+		.bus_num	= 0,
+		.chip_select	= 2,
+		.max_speed_hz	= 25000000,
+		.modalias	= "mmc_spi",
+		.platform_data	= &rb4xx_mmc_data,
+	}
+};
+
+
+static struct resource rb4xx_spi_resources[] = {
+	{
+		.start	= AR71XX_SPI_BASE,
+		.end	= AR71XX_SPI_BASE + AR71XX_SPI_SIZE - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device rb4xx_spi_device = {
+	.name		= "rb4xx-spi",
+	.id		= -1,
+	.resource	= rb4xx_spi_resources,
+	.num_resources	= ARRAY_SIZE(rb4xx_spi_resources),
+};
+
+static void __init rb4xx_generic_setup(void)
+{
+	ath79_gpio_function_enable(AR71XX_GPIO_FUNC_SPI_CS1_EN |
+				   AR71XX_GPIO_FUNC_SPI_CS2_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(rb4xx_leds_gpio),
+					rb4xx_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, RB4XX_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(rb4xx_gpio_keys),
+					rb4xx_gpio_keys);
+
+	spi_register_board_info(rb4xx_spi_info, ARRAY_SIZE(rb4xx_spi_info));
+	platform_device_register(&rb4xx_spi_device);
+	platform_device_register(&rb4xx_nand_device);
+}
+
+static void __init rb411_setup(void)
+{
+	rb4xx_generic_setup();
+	spi_register_board_info(rb4xx_microsd_info,
+				ARRAY_SIZE(rb4xx_microsd_info));
+
+	ath79_register_mdio(0, 0xfffffffc);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = 0x00000003;
+
+	ath79_register_eth(0);
+
+	ath79_pci_set_irq_map(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_411, "411", "MikroTik RouterBOARD 411/A/AH",
+	     rb411_setup);
+
+static void __init rb411u_setup(void)
+{
+	rb411_setup();
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_411U, "411U", "MikroTik RouterBOARD 411U",
+	     rb411u_setup);
+
+#define RB433_LAN_PHYMASK	BIT(0)
+#define RB433_WAN_PHYMASK	BIT(4)
+#define RB433_MDIO_PHYMASK	(RB433_LAN_PHYMASK | RB433_WAN_PHYMASK)
+
+static void __init rb433_setup(void)
+{
+	rb4xx_generic_setup();
+	spi_register_board_info(rb4xx_microsd_info,
+				ARRAY_SIZE(rb4xx_microsd_info));
+
+	ath79_register_mdio(0, ~RB433_MDIO_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = RB433_LAN_PHYMASK;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = RB433_WAN_PHYMASK;
+
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_pci_set_irq_map(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_433, "433", "MikroTik RouterBOARD 433/AH",
+	     rb433_setup);
+
+static void __init rb433u_setup(void)
+{
+	rb433_setup();
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_433U, "433U", "MikroTik RouterBOARD 433UAH",
+	     rb433u_setup);
+
+static void __init rb435g_setup(void)
+{
+	rb4xx_generic_setup();
+
+	spi_register_board_info(rb4xx_microsd_info,
+				ARRAY_SIZE(rb4xx_microsd_info));
+
+	ath79_register_mdio(0, ~RB433_MDIO_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = RB433_LAN_PHYMASK;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = RB433_WAN_PHYMASK;
+
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_pci_set_irq_map(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
+	ath79_register_pci();
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_435G, "435G", "MikroTik RouterBOARD 435G",
+	     rb435g_setup);
+
+#define RB450_LAN_PHYMASK	BIT(0)
+#define RB450_WAN_PHYMASK	BIT(4)
+#define RB450_MDIO_PHYMASK	(RB450_LAN_PHYMASK | RB450_WAN_PHYMASK)
+
+static void __init rb450_generic_setup(int gige)
+{
+	rb4xx_generic_setup();
+	ath79_register_mdio(0, ~RB450_MDIO_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth0_data.phy_if_mode = (gige) ?
+		PHY_INTERFACE_MODE_RGMII : PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = RB450_LAN_PHYMASK;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth1_data.phy_if_mode = (gige) ?
+		PHY_INTERFACE_MODE_RGMII : PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = RB450_WAN_PHYMASK;
+
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+}
+
+static void __init rb450_setup(void)
+{
+	rb450_generic_setup(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_450, "450", "MikroTik RouterBOARD 450",
+	     rb450_setup);
+
+static void __init rb450g_setup(void)
+{
+	rb450_generic_setup(1);
+	spi_register_board_info(rb4xx_microsd_info,
+				ARRAY_SIZE(rb4xx_microsd_info));
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_450G, "450G", "MikroTik RouterBOARD 450G",
+	     rb450g_setup);
+
+static void __init rb493_setup(void)
+{
+	rb4xx_generic_setup();
+
+	ath79_register_mdio(0, 0x3fffff00);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = 0x00000001;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_pci_set_irq_map(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_493, "493", "MikroTik RouterBOARD 493/AH",
+	     rb493_setup);
+
+#define RB493G_GPIO_MDIO_MDC		7
+#define RB493G_GPIO_MDIO_DATA		8
+
+#define RB493G_MDIO_PHYMASK		BIT(0)
+
+static struct mdio_gpio_platform_data rb493g_mdio_data = {
+	.mdc		= RB493G_GPIO_MDIO_MDC,
+	.mdio		= RB493G_GPIO_MDIO_DATA,
+
+	.phy_mask	= ~RB493G_MDIO_PHYMASK,
+};
+
+static struct platform_device rb493g_mdio_device = {
+	.name 		= "mdio-gpio",
+	.id 		= -1,
+	.dev 		= {
+		.platform_data	= &rb493g_mdio_data,
+	},
+};
+
+static void __init rb493g_setup(void)
+{
+	ath79_gpio_function_enable(AR71XX_GPIO_FUNC_SPI_CS1_EN |
+				    AR71XX_GPIO_FUNC_SPI_CS2_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(rb4xx_leds_gpio),
+				    rb4xx_leds_gpio);
+
+	spi_register_board_info(rb4xx_spi_info, ARRAY_SIZE(rb4xx_spi_info));
+	spi_register_board_info(rb4xx_microsd_info,
+				ARRAY_SIZE(rb4xx_microsd_info));
+
+	platform_device_register(&rb4xx_spi_device);
+	platform_device_register(&rb4xx_nand_device);
+
+	ath79_register_mdio(0, ~RB493G_MDIO_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = RB493G_MDIO_PHYMASK;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.mii_bus_dev = &rb493g_mdio_device.dev;
+	ath79_eth1_data.phy_mask = RB493G_MDIO_PHYMASK;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	platform_device_register(&rb493g_mdio_device);
+
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+
+	ath79_pci_set_irq_map(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_493G, "493G", "MikroTik RouterBOARD 493G",
+	     rb493g_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
new file mode 100644
index 00000000..5656d3c1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
@@ -0,0 +1,346 @@
+/*
+ *  MikroTik RouterBOARD 750/750GL support
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/export.h>
+#include <linux/pci.h>
+#include <linux/ath9k_platform.h>
+#include <linux/platform_device.h>
+#include <linux/phy.h>
+#include <linux/ar8216_platform.h>
+#include <linux/rle.h>
+#include <linux/routerboot.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/irq.h>
+#include <asm/mach-ath79/mach-rb750.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-usb.h"
+#include "dev-eth.h"
+#include "machtypes.h"
+#include "routerboot.h"
+
+static struct rb750_led_data rb750_leds[] = {
+	{
+		.name		= "rb750:green:act",
+		.mask		= RB750_LED_ACT,
+		.active_low	= 1,
+	}, {
+		.name		= "rb750:green:port1",
+		.mask		= RB750_LED_PORT5,
+		.active_low	= 1,
+	}, {
+		.name		= "rb750:green:port2",
+		.mask		= RB750_LED_PORT4,
+		.active_low	= 1,
+	}, {
+		.name		= "rb750:green:port3",
+		.mask		= RB750_LED_PORT3,
+		.active_low	= 1,
+	}, {
+		.name		= "rb750:green:port4",
+		.mask		= RB750_LED_PORT2,
+		.active_low	= 1,
+	}, {
+		.name		= "rb750:green:port5",
+		.mask		= RB750_LED_PORT1,
+		.active_low	= 1,
+	}
+};
+
+static struct rb750_led_data rb750gr3_leds[] = {
+	{
+		.name		= "rb750:green:act",
+		.mask		= RB7XX_LED_ACT,
+		.active_low	= 1,
+	},
+};
+
+static struct rb750_led_platform_data rb750_leds_data;
+static struct platform_device rb750_leds_device = {
+	.name	= "leds-rb750",
+	.dev	= {
+		.platform_data = &rb750_leds_data,
+	}
+};
+
+static struct rb7xx_nand_platform_data rb750_nand_data;
+static struct platform_device rb750_nand_device = {
+	.name	= "rb750-nand",
+	.id	= -1,
+	.dev	= {
+		.platform_data = &rb750_nand_data,
+	}
+};
+
+static void rb750_latch_change(u32 mask_clr, u32 mask_set)
+{
+	static DEFINE_SPINLOCK(lock);
+	static u32 latch_set = RB750_LED_BITS | RB750_LVC573_LE;
+	static u32 latch_oe;
+	static u32 latch_clr;
+	unsigned long flags;
+	u32 t;
+
+	spin_lock_irqsave(&lock, flags);
+
+	if ((mask_clr & BIT(31)) != 0 &&
+	    (latch_set & RB750_LVC573_LE) == 0) {
+		goto unlock;
+	}
+
+	latch_set = (latch_set | mask_set) & ~mask_clr;
+	latch_clr = (latch_clr | mask_clr) & ~mask_set;
+
+	if (latch_oe == 0)
+		latch_oe = __raw_readl(ath79_gpio_base + AR71XX_GPIO_REG_OE);
+
+	if (likely(latch_set & RB750_LVC573_LE)) {
+		void __iomem *base = ath79_gpio_base;
+
+		t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+		t |= mask_clr | latch_oe | mask_set;
+
+		__raw_writel(t, base + AR71XX_GPIO_REG_OE);
+		__raw_writel(latch_clr, base + AR71XX_GPIO_REG_CLEAR);
+		__raw_writel(latch_set, base + AR71XX_GPIO_REG_SET);
+	} else if (mask_clr & RB750_LVC573_LE) {
+		void __iomem *base = ath79_gpio_base;
+
+		latch_oe = __raw_readl(base + AR71XX_GPIO_REG_OE);
+		__raw_writel(RB750_LVC573_LE, base + AR71XX_GPIO_REG_CLEAR);
+		/* flush write */
+		__raw_readl(base + AR71XX_GPIO_REG_CLEAR);
+	}
+
+unlock:
+	spin_unlock_irqrestore(&lock, flags);
+}
+
+static void rb750_nand_enable_pins(void)
+{
+	rb750_latch_change(RB750_LVC573_LE, 0);
+	ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE,
+				  AR724X_GPIO_FUNC_SPI_EN);
+}
+
+static void rb750_nand_disable_pins(void)
+{
+	ath79_gpio_function_setup(AR724X_GPIO_FUNC_SPI_EN,
+				  AR724X_GPIO_FUNC_JTAG_DISABLE);
+	rb750_latch_change(0, RB750_LVC573_LE);
+}
+
+static void __init rb750_setup(void)
+{
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				     AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				     AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				     AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				     AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+
+	/* WAN port */
+	ath79_register_eth(0);
+
+	rb750_leds_data.num_leds = ARRAY_SIZE(rb750_leds);
+	rb750_leds_data.leds = rb750_leds;
+	rb750_leds_data.latch_change = rb750_latch_change;
+	platform_device_register(&rb750_leds_device);
+
+	rb750_nand_data.nce_line = RB750_NAND_NCE;
+	rb750_nand_data.enable_pins = rb750_nand_enable_pins;
+	rb750_nand_data.disable_pins = rb750_nand_disable_pins;
+	rb750_nand_data.latch_change = rb750_latch_change;
+	platform_device_register(&rb750_nand_device);
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_750, "750i", "MikroTik RouterBOARD 750",
+	     rb750_setup);
+
+static struct ar8327_pad_cfg rb750gr3_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_platform_data rb750gr3_ar8327_data = {
+	.pad0_cfg = &rb750gr3_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	}
+};
+
+static struct mdio_board_info rb750g3_mdio_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &rb750gr3_ar8327_data,
+	},
+};
+
+static void rb750gr3_nand_enable_pins(void)
+{
+	ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE,
+				  AR724X_GPIO_FUNC_SPI_EN |
+				  AR724X_GPIO_FUNC_SPI_CS_EN2);
+}
+
+static void rb750gr3_nand_disable_pins(void)
+{
+	ath79_gpio_function_setup(AR724X_GPIO_FUNC_SPI_EN |
+				  AR724X_GPIO_FUNC_SPI_CS_EN2,
+				  AR724X_GPIO_FUNC_JTAG_DISABLE);
+}
+
+static void rb750gr3_latch_change(u32 mask_clr, u32 mask_set)
+{
+	static DEFINE_SPINLOCK(lock);
+	static u32 latch_set = RB7XX_LED_ACT;
+	static u32 latch_clr;
+	void __iomem *base = ath79_gpio_base;
+	unsigned long flags;
+	u32 t;
+
+	spin_lock_irqsave(&lock, flags);
+
+	latch_set = (latch_set | mask_set) & ~mask_clr;
+	latch_clr = (latch_clr | mask_clr) & ~mask_set;
+
+	mask_set = latch_set & (RB7XX_USB_POWERON | RB7XX_MONITOR);
+	mask_clr = latch_clr & (RB7XX_USB_POWERON | RB7XX_MONITOR);
+
+	if ((latch_set ^ RB7XX_LED_ACT) & RB7XX_LED_ACT) {
+		/* enable output mode */
+		t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+		t |= RB7XX_LED_ACT;
+		__raw_writel(t, base + AR71XX_GPIO_REG_OE);
+
+		mask_clr |= RB7XX_LED_ACT;
+	} else {
+		/* disable output mode */
+		t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+		t &= ~RB7XX_LED_ACT;
+		__raw_writel(t, base + AR71XX_GPIO_REG_OE);
+	}
+
+	__raw_writel(mask_set, base + AR71XX_GPIO_REG_SET);
+	__raw_writel(mask_clr, base + AR71XX_GPIO_REG_CLEAR);
+
+	spin_unlock_irqrestore(&lock, flags);
+}
+
+static void __init rb750gr3_setup(void)
+{
+	ath79_register_mdio(0, 0x0);
+	mdiobus_register_board_info(rb750g3_mdio_info,
+				    ARRAY_SIZE(rb750g3_mdio_info));
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_pll_data.pll_1000 = 0x62000000;
+
+	ath79_register_eth(0);
+
+	rb750_leds_data.num_leds = ARRAY_SIZE(rb750gr3_leds);
+	rb750_leds_data.leds = rb750gr3_leds;
+	rb750_leds_data.latch_change = rb750gr3_latch_change;
+	platform_device_register(&rb750_leds_device);
+
+	rb750_nand_data.nce_line = RB7XX_NAND_NCE;
+	rb750_nand_data.enable_pins = rb750gr3_nand_enable_pins;
+	rb750_nand_data.disable_pins = rb750gr3_nand_disable_pins;
+	rb750_nand_data.latch_change = rb750gr3_latch_change;
+	platform_device_register(&rb750_nand_device);
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_750G_R3, "750Gr3", "MikroTik RouterBOARD 750GL",
+	     rb750gr3_setup);
+
+#define RB751_HARDCONFIG	0x1f00b000
+#define RB751_HARDCONFIG_SIZE	0x1000
+
+static void __init rb751_wlan_setup(void)
+{
+	u8 *hardconfig = (u8 *) KSEG1ADDR(RB751_HARDCONFIG);
+	struct ath9k_platform_data *wmac_data;
+	u16 tag_len;
+	u8 *tag;
+	u16 mac_len;
+	u8 *mac;
+	int err;
+
+	wmac_data = ap9x_pci_get_wmac_data(0);
+	if (!wmac_data) {
+		pr_err("rb75x: unable to get address of wlan data\n");
+		return;
+	}
+
+	ap9x_pci_setup_wmac_led_pin(0, 9);
+
+	err = routerboot_find_tag(hardconfig, RB751_HARDCONFIG_SIZE,
+				  RB_ID_WLAN_DATA, &tag, &tag_len);
+	if (err) {
+		pr_err("rb75x: no calibration data found\n");
+		return;
+	}
+
+	err = rle_decode(tag, tag_len, (unsigned char *) wmac_data->eeprom_data,
+			 sizeof(wmac_data->eeprom_data), NULL, NULL);
+	if (err) {
+		pr_err("rb75x: unable to decode wlan eeprom data\n");
+		return;
+	}
+
+	err = routerboot_find_tag(hardconfig, RB751_HARDCONFIG_SIZE,
+                                 RB_ID_MAC_ADDRESS_PACK, &mac, &mac_len);
+	if (err) {
+		pr_err("rb75x: no mac address found\n");
+		return;
+	}
+
+	ap91_pci_init(NULL, mac);
+}
+
+static void __init rb751_setup(void)
+{
+	rb750_setup();
+	ath79_register_usb();
+	rb751_wlan_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_751, "751", "MikroTik RouterBOARD 751",
+	     rb751_setup);
+
+static void __init rb751g_setup(void)
+{
+	rb750gr3_setup();
+	ath79_register_usb();
+	rb751_wlan_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_751G, "751g", "MikroTik RouterBOARD 751G",
+	     rb751g_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
new file mode 100644
index 00000000..9ef5c445
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
@@ -0,0 +1,349 @@
+/*
+ *  MikroTik RouterBOARD 91X support
+ *
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "rb91x: " fmt
+
+#include <linux/phy.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/74x164.h>
+#include <linux/spi/flash.h>
+#include <linux/routerboot.h>
+#include <linux/gpio.h>
+#include <linux/platform_data/gpio-latch.h>
+#include <linux/platform_data/rb91x_nand.h>
+#include <linux/platform_data/phy-at803x.h>
+
+#include <asm/prom.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ath79_spi_platform.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-nfc.h"
+#include "dev-usb.h"
+#include "dev-spi.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "pci.h"
+#include "routerboot.h"
+
+#define RB_ROUTERBOOT_OFFSET	0x0000
+#define RB_ROUTERBOOT_MIN_SIZE	0xb000
+#define RB_HARD_CFG_SIZE	0x1000
+#define RB_BIOS_OFFSET		0xd000
+#define RB_BIOS_SIZE		0x1000
+#define RB_SOFT_CFG_OFFSET	0xf000
+#define RB_SOFT_CFG_SIZE	0x1000
+
+#define RB91X_FLAG_USB		BIT(0)
+#define RB91X_FLAG_PCIE		BIT(1)
+
+#define RB91X_LATCH_GPIO_BASE	AR934X_GPIO_COUNT
+#define RB91X_LATCH_GPIO(_x)	(RB91X_LATCH_GPIO_BASE + (_x))
+
+#define RB91X_SSR_GPIO_BASE	(RB91X_LATCH_GPIO_BASE + AR934X_GPIO_COUNT)
+#define RB91X_SSR_GPIO(_x)	(RB91X_SSR_GPIO_BASE + (_x))
+
+#define RB91X_SSR_BIT_LED1		0
+#define RB91X_SSR_BIT_LED2		1
+#define RB91X_SSR_BIT_LED3		2
+#define RB91X_SSR_BIT_LED4		3
+#define RB91X_SSR_BIT_LED5		4
+#define RB91X_SSR_BIT_5			5
+#define RB91X_SSR_BIT_USB_POWER		6
+#define RB91X_SSR_BIT_PCIE_POWER	7
+
+#define RB91X_GPIO_SSR_STROBE	RB91X_LATCH_GPIO(0)
+#define RB91X_GPIO_LED_POWER	RB91X_LATCH_GPIO(1)
+#define RB91X_GPIO_LED_USER	RB91X_LATCH_GPIO(2)
+#define RB91X_GPIO_NAND_READ	RB91X_LATCH_GPIO(3)
+#define RB91X_GPIO_NAND_RDY	RB91X_LATCH_GPIO(4)
+#define RB91X_GPIO_NLE		RB91X_LATCH_GPIO(11)
+#define RB91X_GPIO_NAND_NRW	RB91X_LATCH_GPIO(12)
+#define RB91X_GPIO_NAND_NCE	RB91X_LATCH_GPIO(13)
+#define RB91X_GPIO_NAND_CLE	RB91X_LATCH_GPIO(14)
+#define RB91X_GPIO_NAND_ALE	RB91X_LATCH_GPIO(15)
+
+#define RB91X_GPIO_LED_1	RB91X_SSR_GPIO(RB91X_SSR_BIT_LED1)
+#define RB91X_GPIO_LED_2	RB91X_SSR_GPIO(RB91X_SSR_BIT_LED2)
+#define RB91X_GPIO_LED_3	RB91X_SSR_GPIO(RB91X_SSR_BIT_LED3)
+#define RB91X_GPIO_LED_4	RB91X_SSR_GPIO(RB91X_SSR_BIT_LED4)
+#define RB91X_GPIO_LED_5	RB91X_SSR_GPIO(RB91X_SSR_BIT_LED5)
+#define RB91X_GPIO_USB_POWER	RB91X_SSR_GPIO(RB91X_SSR_BIT_USB_POWER)
+#define RB91X_GPIO_PCIE_POWER	RB91X_SSR_GPIO(RB91X_SSR_BIT_PCIE_POWER)
+
+struct rb_board_info {
+	const char *name;
+	u32 flags;
+};
+
+static struct mtd_partition rb711gr100_spi_partitions[] = {
+	{
+		.name		= "routerboot",
+		.offset		= RB_ROUTERBOOT_OFFSET,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "hard_config",
+		.size		= RB_HARD_CFG_SIZE,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "bios",
+		.offset		= RB_BIOS_OFFSET,
+		.size		= RB_BIOS_SIZE,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "soft_config",
+		.size		= RB_SOFT_CFG_SIZE,
+	}
+};
+
+static struct flash_platform_data rb711gr100_spi_flash_data = {
+	.parts		= rb711gr100_spi_partitions,
+	.nr_parts	= ARRAY_SIZE(rb711gr100_spi_partitions),
+};
+
+static int rb711gr100_gpio_latch_gpios[AR934X_GPIO_COUNT] __initdata = {
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22
+};
+
+static struct gpio_latch_platform_data rb711gr100_gpio_latch_data __initdata = {
+	.base = RB91X_LATCH_GPIO_BASE,
+	.num_gpios = ARRAY_SIZE(rb711gr100_gpio_latch_gpios),
+	.gpios = rb711gr100_gpio_latch_gpios,
+	.le_gpio_index = 11,
+	.le_active_low = true,
+};
+
+static struct rb91x_nand_platform_data rb711gr100_nand_data __initdata = {
+	.gpio_nce = RB91X_GPIO_NAND_NCE,
+	.gpio_ale = RB91X_GPIO_NAND_ALE,
+	.gpio_cle = RB91X_GPIO_NAND_CLE,
+	.gpio_rdy = RB91X_GPIO_NAND_RDY,
+	.gpio_read = RB91X_GPIO_NAND_READ,
+	.gpio_nrw = RB91X_GPIO_NAND_NRW,
+	.gpio_nle = RB91X_GPIO_NLE,
+};
+
+static u8 rb711gr100_ssr_initdata[] __initdata = {
+	BIT(RB91X_SSR_BIT_PCIE_POWER) |
+	BIT(RB91X_SSR_BIT_USB_POWER) |
+	BIT(RB91X_SSR_BIT_5)
+};
+
+static struct gen_74x164_chip_platform_data rb711gr100_ssr_data = {
+	.base = RB91X_SSR_GPIO_BASE,
+	.num_registers = ARRAY_SIZE(rb711gr100_ssr_initdata),
+	.init_data = rb711gr100_ssr_initdata,
+};
+
+static struct ath79_spi_controller_data rb711gr100_spi0_cdata = {
+	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+	.cs_line = 0,
+	.is_flash = true,
+};
+
+static struct ath79_spi_controller_data rb711gr100_spi1_cdata = {
+	.cs_type = ATH79_SPI_CS_TYPE_GPIO,
+	.cs_line = RB91X_GPIO_SSR_STROBE,
+};
+
+static struct spi_board_info rb711gr100_spi_info[] = {
+	{
+		.bus_num	= 0,
+		.chip_select	= 0,
+		.max_speed_hz	= 25000000,
+		.modalias	= "m25p80",
+		.platform_data  = &rb711gr100_spi_flash_data,
+		.controller_data = &rb711gr100_spi0_cdata
+	}, {
+		.bus_num	= 0,
+		.chip_select	= 1,
+		.max_speed_hz	= 10000000,
+		.modalias	= "74x164",
+		.platform_data	= &rb711gr100_ssr_data,
+		.controller_data = &rb711gr100_spi1_cdata
+	}
+};
+
+static struct ath79_spi_platform_data rb711gr100_spi_data __initdata = {
+	.bus_num = 0,
+	.num_chipselect = 2,
+};
+
+static struct gpio_led rb711gr100_leds[] __initdata = {
+	{
+		.name		= "rb:green:led1",
+		.gpio		= RB91X_GPIO_LED_1,
+		.active_low	= 0,
+	},
+	{
+		.name		= "rb:green:led2",
+		.gpio		= RB91X_GPIO_LED_2,
+		.active_low	= 0,
+	},
+	{
+		.name		= "rb:green:led3",
+		.gpio		= RB91X_GPIO_LED_3,
+		.active_low	= 0,
+	},
+	{
+		.name		= "rb:green:led4",
+		.gpio		= RB91X_GPIO_LED_4,
+		.active_low	= 0,
+	},
+	{
+		.name		= "rb:green:led5",
+		.gpio		= RB91X_GPIO_LED_5,
+		.active_low	= 0,
+	},
+	{
+		.name		= "rb:green:user",
+		.gpio		= RB91X_GPIO_LED_USER,
+		.active_low	= 0,
+	},
+	{
+		.name		= "rb:green:power",
+		.gpio		= RB91X_GPIO_LED_POWER,
+		.active_low	= 0,
+	},
+};
+
+static struct at803x_platform_data rb91x_at803x_data = {
+	.disable_smarteee = 1,
+	.enable_rgmii_rx_delay = 1,
+	.enable_rgmii_tx_delay = 1,
+};
+
+static struct mdio_board_info rb91x_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &rb91x_at803x_data,
+	},
+};
+
+static void __init rb711gr100_init_partitions(const struct rb_info *info)
+{
+	rb711gr100_spi_partitions[0].size = info->hard_cfg_offs;
+	rb711gr100_spi_partitions[1].offset = info->hard_cfg_offs;
+
+	rb711gr100_spi_partitions[3].offset = info->soft_cfg_offs;
+}
+
+void __init rb711gr100_wlan_init(void)
+{
+	char *caldata;
+	u8 wlan_mac[ETH_ALEN];
+
+	caldata = rb_get_wlan_data();
+	if (caldata == NULL)
+		return;
+
+	ath79_init_mac(wlan_mac, ath79_mac_base, 1);
+	ath79_register_wmac(caldata + 0x1000, wlan_mac);
+
+	kfree(caldata);
+}
+
+#define RB_BOARD_INFO(_name, _flags)	\
+	{				\
+		.name = (_name),	\
+		.flags = (_flags),	\
+	}
+
+static const struct rb_board_info rb711gr100_boards[] __initconst = {
+	RB_BOARD_INFO("911G-2HPnD", 0),
+	RB_BOARD_INFO("911G-5HPnD", 0),
+	RB_BOARD_INFO("912UAG-2HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
+	RB_BOARD_INFO("912UAG-5HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
+};
+
+static u32 rb711gr100_get_flags(const struct rb_info *info)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(rb711gr100_boards); i++) {
+		const struct rb_board_info *bi;
+
+		bi = &rb711gr100_boards[i];
+		if (strcmp(info->board_name, bi->name) == 0)
+			return bi->flags;
+	}
+
+	return 0;
+}
+
+static void __init rb711gr100_setup(void)
+{
+	const struct rb_info *info;
+	char buf[64];
+	u32 flags;
+
+	info = rb_init_info((void *) KSEG1ADDR(0x1f000000), 0x10000);
+	if (!info)
+		return;
+
+	scnprintf(buf, sizeof(buf), "Mikrotik RouterBOARD %s",
+		  (info->board_name) ? info->board_name : "");
+	mips_set_machine_name(buf);
+
+	rb711gr100_init_partitions(info);
+	ath79_register_spi(&rb711gr100_spi_data, rb711gr100_spi_info,
+			   ARRAY_SIZE(rb711gr100_spi_info));
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+				   AR934X_ETH_CFG_RXD_DELAY |
+				   AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(0, 0x0);
+
+	mdiobus_register_board_info(rb91x_mdio0_info,
+				    ARRAY_SIZE(rb91x_mdio0_info));
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_pll_data.pll_1000 = 0x02000000;
+
+	ath79_register_eth(0);
+
+	rb711gr100_wlan_init();
+
+	platform_device_register_data(NULL, "rb91x-nand", -1,
+				      &rb711gr100_nand_data,
+				      sizeof(rb711gr100_nand_data));
+
+	platform_device_register_data(NULL, "gpio-latch", -1,
+				      &rb711gr100_gpio_latch_data,
+				      sizeof(rb711gr100_gpio_latch_data));
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(rb711gr100_leds),
+				 rb711gr100_leds);
+
+	flags = rb711gr100_get_flags(info);
+
+	if (flags & RB91X_FLAG_USB)
+		ath79_register_usb();
+
+	if (flags & RB91X_FLAG_PCIE)
+		ath79_register_pci();
+
+}
+
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_711GR100, "711Gr100", rb711gr100_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c
new file mode 100644
index 00000000..c2261ab9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c
@@ -0,0 +1,258 @@
+/*
+ *  MikroTik RouterBOARD 95X support
+ *
+ *  Copyright (C) 2012 Stijn Tintel <stijn@linux-ipv6.be>
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2013 Kamil Trzcinski <ayufan@ayufan.eu>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "rb95x: " fmt
+
+#include <linux/phy.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/routerboot.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-nfc.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "routerboot.h"
+#include "dev-leds-gpio.h"
+
+#define RB95X_GPIO_NAND_NCE	14
+
+static struct mtd_partition rb95x_nand_partitions[] = {
+	{
+		.name	= "booter",
+		.offset	= 0,
+		.size	= (256 * 1024),
+		.mask_flags = MTD_WRITEABLE,
+	},
+	{
+		.name	= "kernel",
+		.offset	= (256 * 1024),
+		.size	= (4 * 1024 * 1024) - (256 * 1024),
+	},
+	{
+		.name	= "rootfs",
+		.offset	= MTDPART_OFS_NXTBLK,
+		.size	= MTDPART_SIZ_FULL,
+	},
+};
+
+static struct gpio_led rb951ui_leds_gpio[] __initdata = {
+	{
+		.name		= "rb:green:wlan",
+		.gpio		= 11,
+		.active_low	= 1,
+	}, {
+		.name		= "rb:green:act",
+		.gpio		= 3,
+		.active_low	= 1,
+	}, {
+		.name		= "rb:green:port1",
+		.gpio		= 13,
+		.active_low	= 1,
+	}, {
+		.name		= "rb:green:port2",
+		.gpio		= 12,
+		.active_low	= 1,
+	}, {
+		.name		= "rb:green:port3",
+		.gpio		= 4,
+		.active_low	= 1,
+	}, {
+		.name		= "rb:green:port4",
+		.gpio		= 21,
+		.active_low	= 1,
+	}, {
+		.name		= "rb:green:port5",
+		.gpio		= 16,
+		.active_low	= 1,
+	}
+};
+
+static struct ar8327_pad_cfg rb95x_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_platform_data rb95x_ar8327_data = {
+	.pad0_cfg = &rb95x_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	}
+};
+
+static struct mdio_board_info rb95x_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &rb95x_ar8327_data,
+	},
+};
+
+void __init rb95x_wlan_init(void)
+{
+	char *art_buf;
+	u8 wlan_mac[ETH_ALEN];
+
+	art_buf = rb_get_wlan_data();
+	if (art_buf == NULL)
+		return;
+
+	ath79_init_mac(wlan_mac, ath79_mac_base, 11);
+	ath79_register_wmac(art_buf + 0x1000, wlan_mac);
+
+	kfree(art_buf);
+}
+
+static void rb95x_nand_select_chip(int chip_no)
+{
+	switch (chip_no) {
+	case 0:
+		gpio_set_value(RB95X_GPIO_NAND_NCE, 0);
+		break;
+	default:
+		gpio_set_value(RB95X_GPIO_NAND_NCE, 1);
+		break;
+	}
+	ndelay(500);
+}
+
+static struct nand_ecclayout rb95x_nand_ecclayout = {
+	.eccbytes	= 6,
+	.eccpos		= { 8, 9, 10, 13, 14, 15 },
+	.oobavail	= 9,
+	.oobfree	= { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
+};
+
+static int rb95x_nand_scan_fixup(struct mtd_info *mtd)
+{
+	struct nand_chip *chip = mtd->priv;
+
+	if (mtd->writesize == 512) {
+		/*
+		 * Use the OLD Yaffs-1 OOB layout, otherwise RouterBoot
+		 * will not be able to find the kernel that we load.
+		 */
+		chip->ecc.layout = &rb95x_nand_ecclayout;
+	}
+
+	return 0;
+}
+
+void __init rb95x_nand_init(void)
+{
+	gpio_request_one(RB95X_GPIO_NAND_NCE, GPIOF_OUT_INIT_HIGH, "NAND nCE");
+
+	ath79_nfc_set_scan_fixup(rb95x_nand_scan_fixup);
+	ath79_nfc_set_parts(rb95x_nand_partitions,
+			    ARRAY_SIZE(rb95x_nand_partitions));
+	ath79_nfc_set_select_chip(rb95x_nand_select_chip);
+	ath79_nfc_set_swap_dma(true);
+	ath79_register_nfc();
+}
+
+static int __init rb95x_setup(void)
+{
+	const struct rb_info *info;
+
+	info = rb_init_info((void *)(KSEG1ADDR(AR71XX_SPI_BASE)), 0x10000);
+	if (!info)
+		return -EINVAL;
+
+	rb95x_nand_init();
+
+	return 0;
+}
+
+static void __init rb951g_setup(void)
+{
+	if (rb95x_setup())
+		return;
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+				   AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(0, 0x0);
+
+	mdiobus_register_board_info(rb95x_mdio0_info,
+				    ARRAY_SIZE(rb95x_mdio0_info));
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_register_eth(0);
+
+	rb95x_wlan_init();
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_951G, "951G", "MikroTik RouterBOARD 951G-2HnD",
+	     rb951g_setup);
+
+static void __init rb951ui_setup(void)
+{
+	if (rb95x_setup())
+		return;
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(4);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(4);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+
+	gpio_request_one(20, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+
+	gpio_request_one(2, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "POE power");
+
+	rb95x_wlan_init();
+	ath79_register_usb();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(rb951ui_leds_gpio),
+				 rb951ui_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_951U, "951HnD", "MikroTik RouterBOARD 951Ui-2HnD",
+	     rb951ui_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c
new file mode 100644
index 00000000..94e0b448
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c
@@ -0,0 +1,238 @@
+/*
+ *  MikroTik RouterBOARD SXT Lite support
+ *
+ *  Copyright (C) 2012 Stijn Tintel <stijn@linux-ipv6.be>
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2013 Vyacheslav Adamanov <adamanov@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "sxtlite: " fmt
+
+#include <linux/phy.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/rle.h>
+#include <linux/routerboot.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-nfc.h"
+#include "dev-wmac.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "routerboot.h"
+#include <linux/ar8216_platform.h>
+
+#define SXTLITE_GPIO_NAND_NCE  14
+#define SXTLITE_GPIO_LED_USER 3
+#define SXTLITE_GPIO_LED_1 13
+#define SXTLITE_GPIO_LED_2 12
+#define SXTLITE_GPIO_LED_3 4
+#define SXTLITE_GPIO_LED_4 21
+#define SXTLITE_GPIO_LED_5 18
+#define SXTLITE_GPIO_LED_POWER 11
+
+#define SXTLITE_GPIO_BUZZER 19
+
+#define SXTLITE_GPIO_BTN_RESET 15
+
+#define SXTLITE_KEYS_POLL_INTERVAL 20
+#define SXTLITE_KEYS_DEBOUNCE_INTERVAL (3 * SXTLITE_KEYS_POLL_INTERVAL)
+
+static struct mtd_partition rbsxtlite_nand_partitions[] = {
+	{
+		.name   = "booter",
+		.offset = 0,
+		.size   = (256 * 1024),
+		.mask_flags = MTD_WRITEABLE,
+	},
+	{
+		.name   = "kernel",
+		.offset = (256 * 1024),
+		.size   = (4 * 1024 * 1024) - (256 * 1024),
+	},
+	{
+		.name   = "rootfs",
+		.offset = MTDPART_OFS_NXTBLK,
+		.size   = MTDPART_SIZ_FULL,
+	},
+};
+
+static struct gpio_led rbsxtlite_leds_gpio[] __initdata = {
+	{
+		.name		=	"rb:green:user",
+		.gpio		=	SXTLITE_GPIO_LED_USER,
+		.active_low	=	1,
+	},
+	{
+		.name		=	"rb:green:led1",
+		.gpio		=	SXTLITE_GPIO_LED_1,
+		.active_low	=	1,
+	},
+	{
+		.name		=	"rb:green:led2",
+		.gpio		=	SXTLITE_GPIO_LED_2,
+		.active_low	=	1,
+	},
+	{
+		.name		=	"rb:green:led3",
+		.gpio		=	SXTLITE_GPIO_LED_3,
+		.active_low	=	1,
+	},
+	{
+		.name		=	"rb:green:led4",
+		.gpio		=	SXTLITE_GPIO_LED_4,
+		.active_low	=	1,
+	},
+	{
+		.name		=	"rb:green:led5",
+		.gpio		=	SXTLITE_GPIO_LED_5,
+		.active_low	=	1,
+	},
+	{
+		.name		=	"rb:green:power",
+		.gpio		=	SXTLITE_GPIO_LED_POWER,
+	},
+};
+
+static struct gpio_keys_button rbsxtlite_gpio_keys[] __initdata = {
+	{
+		.desc		=	"Reset button",
+		.type		=	EV_KEY,
+		.code		=	KEY_RESTART,
+		.debounce_interval	=	SXTLITE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		=	SXTLITE_GPIO_BTN_RESET,
+		.active_low	=	0,
+	},
+};
+
+static int __init rbsxtlite_rbinfo_init(void)
+{
+	const struct rb_info *info;
+
+	info = rb_init_info((void *)(KSEG1ADDR(AR71XX_SPI_BASE)), 0x10000);
+	if (!info)
+		return -EINVAL;
+	return 0;
+
+}
+
+void __init rbsxtlite_wlan_init(void)
+{
+	char *art_buf;
+	u8 wlan_mac[ETH_ALEN];
+
+	art_buf = rb_get_wlan_data();
+	if (art_buf == NULL)
+		return;
+
+	ath79_init_mac(wlan_mac, ath79_mac_base, 1);
+	ath79_register_wmac(art_buf + 0x1000, wlan_mac);
+
+	kfree(art_buf);
+}
+
+static void rbsxtlite_nand_select_chip(int chip_no)
+{
+	switch (chip_no) {
+	case 0:
+		gpio_set_value(SXTLITE_GPIO_NAND_NCE, 0);
+		break;
+	default:
+		gpio_set_value(SXTLITE_GPIO_NAND_NCE, 1);
+		break;
+	}
+	ndelay(500);
+}
+
+static struct nand_ecclayout rbsxtlite_nand_ecclayout = {
+	.eccbytes	= 6,
+	.eccpos	 = { 8, 9, 10, 13, 14, 15 },
+	.oobavail	= 9,
+	.oobfree	= { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
+};
+
+static int rbsxtlite_nand_scan_fixup(struct mtd_info *mtd)
+{
+	struct nand_chip *chip = mtd->priv;
+
+	if (mtd->writesize == 512) {
+		/*
+		* Use the OLD Yaffs-1 OOB layout, otherwise RouterBoot
+		* will not be able to find the kernel that we load.
+		*/
+		chip->ecc.layout = &rbsxtlite_nand_ecclayout;
+	}
+
+	return 0;
+}
+
+void __init rbsxtlite_gpio_init(void)
+{
+	gpio_request_one(SXTLITE_GPIO_NAND_NCE, GPIOF_OUT_INIT_HIGH, "NAND nCE");
+}
+
+void __init rbsxtlite_nand_init(void)
+{
+	ath79_nfc_set_scan_fixup(rbsxtlite_nand_scan_fixup);
+	ath79_nfc_set_parts(rbsxtlite_nand_partitions,
+			   ARRAY_SIZE(rbsxtlite_nand_partitions));
+	ath79_nfc_set_select_chip(rbsxtlite_nand_select_chip);
+	ath79_nfc_set_swap_dma(true);
+	ath79_register_nfc();
+}
+
+
+static void __init rbsxtlite_setup(void)
+{
+	if(rbsxtlite_rbinfo_init())
+		return;
+	rbsxtlite_nand_init();
+	rbsxtlite_wlan_init();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(rbsxtlite_leds_gpio),
+				 rbsxtlite_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, SXTLITE_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(rbsxtlite_gpio_keys),
+					rbsxtlite_gpio_keys);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(1, 0x0);
+
+	/* GMAC0 is left unused */
+
+	/* GMAC1 is connected to MAC0 on the internal switch */
+	/* The ethernet port connects to PHY P0, which connects to MAC1
+	   on the internal switch */
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+
+
+}
+
+
+MIPS_MACHINE(ATH79_MACH_RB_SXTLITE2ND, "sxt2n", "Mikrotik RouterBOARD SXT Lite2",
+	    rbsxtlite_setup);
+
+MIPS_MACHINE(ATH79_MACH_RB_SXTLITE5ND, "sxt5n", "Mikrotik RouterBOARD SXT Lite5",
+	    rbsxtlite_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rw2458n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rw2458n.c
new file mode 100644
index 00000000..bb7c2475
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-rw2458n.c
@@ -0,0 +1,91 @@
+/*
+ *  Redwave RW2458N support
+ *
+ *  Copyright (C) 2011-2013 Cezary Jackiewicz <cezary@eko.one.pl>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define RW2458N_GPIO_LED_D3	1
+#define RW2458N_GPIO_LED_D4	0
+#define RW2458N_GPIO_LED_D5	11
+#define RW2458N_GPIO_LED_D6	7
+#define RW2458N_GPIO_BTN_RESET	12
+
+#define RW2458N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define RW2458N_KEYS_DEBOUNCE_INTERVAL	(3 * RW2458N_KEYS_POLL_INTERVAL)
+
+static struct gpio_keys_button rw2458n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = RW2458N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= RW2458N_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+#define RW2458N_WAN_PHYMASK	BIT(4)
+
+static struct gpio_led rw2458n_leds_gpio[] __initdata = {
+	{
+		.name		= "rw2458n:green:d3",
+		.gpio		= RW2458N_GPIO_LED_D3,
+		.active_low	= 1,
+	}, {
+		.name		= "rw2458n:green:d4",
+		.gpio		= RW2458N_GPIO_LED_D4,
+		.active_low	= 1,
+	}, {
+		.name		= "rw2458n:green:d5",
+		.gpio		= RW2458N_GPIO_LED_D5,
+		.active_low	= 1,
+	}, {
+		.name		= "rw2458n:green:d6",
+		.gpio		= RW2458N_GPIO_LED_D6,
+		.active_low	= 1,
+	}
+};
+
+static void __init rw2458n_setup(void)
+{
+	u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_mdio(0, ~RW2458N_WAN_PHYMASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(rw2458n_leds_gpio),
+				 rw2458n_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, RW2458N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(rw2458n_gpio_keys),
+					rw2458n_gpio_keys);
+	ath79_register_usb();
+
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_RW2458N, "RW2458N", "Redwave RW2458N",
+	    rw2458n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-smart-300.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-smart-300.c
new file mode 100644
index 00000000..2520e960
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-smart-300.c
@@ -0,0 +1,135 @@
+/*
+ *  NC-LINK SMART-300 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ag71xx_platform.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define SMART_300_GPIO_LED_WLAN		13
+#define SMART_300_GPIO_LED_WAN		18
+#define SMART_300_GPIO_LED_LAN4		19
+#define SMART_300_GPIO_LED_LAN3		12
+#define SMART_300_GPIO_LED_LAN2		21
+#define SMART_300_GPIO_LED_LAN1		20
+#define SMART_300_GPIO_LED_SYSTEM	15
+#define SMART_300_GPIO_LED_POWER	14
+
+#define SMART_300_GPIO_BTN_RESET	17
+#define SMART_300_GPIO_SW_RFKILL	16
+
+#define SMART_300_KEYS_POLL_INTERVAL	20	/* msecs */
+#define SMART_300_KEYS_DEBOUNCE_INTERVAL (3 * SMART_300_KEYS_POLL_INTERVAL)
+
+#define SMART_300_GPIO_MASK        0x007fffff
+
+static const char *smart_300_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data smart_300_flash_data = {
+	.part_probes	= smart_300_part_probes,
+};
+
+static struct gpio_led smart_300_leds_gpio[] __initdata = {
+	{
+		.name		= "nc-link:green:lan1",
+		.gpio		= SMART_300_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "nc-link:green:lan2",
+		.gpio		= SMART_300_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "nc-link:green:lan3",
+		.gpio		= SMART_300_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "nc-link:green:lan4",
+		.gpio		= SMART_300_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}, {
+		.name		= "nc-link:green:system",
+		.gpio		= SMART_300_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "nc-link:green:wan",
+		.gpio		= SMART_300_GPIO_LED_WAN,
+		.active_low	= 1,
+	}, {
+		.name		= "nc-link:green:wlan",
+		.gpio		= SMART_300_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button smart_300_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = SMART_300_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= SMART_300_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static void __init smart_300_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(smart_300_leds_gpio),
+				 smart_300_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, SMART_300_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(smart_300_gpio_keys),
+					smart_300_gpio_keys);
+
+	ath79_register_m25p80(&smart_300_flash_data);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, -1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+
+	/* GMAC0 is connected to the PHY0 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(4);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(4);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+
+	ath79_register_wmac(ee, mac);
+
+	gpio_request(SMART_300_GPIO_LED_POWER, "power");
+	gpio_direction_output(SMART_300_GPIO_LED_POWER, GPIOF_OUT_INIT_LOW);
+}
+
+MIPS_MACHINE(ATH79_MACH_SMART_300, "SMART-300", "NC-LINK SMART-300",
+	     smart_300_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-632brp.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-632brp.c
new file mode 100644
index 00000000..855664e5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-632brp.c
@@ -0,0 +1,111 @@
+/*
+ *  TrendNET TEW-632BRP board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "nvram.h"
+
+#define TEW_632BRP_GPIO_LED_STATUS	1
+#define TEW_632BRP_GPIO_LED_WPS		3
+#define TEW_632BRP_GPIO_LED_WLAN	6
+#define TEW_632BRP_GPIO_BTN_WPS		12
+#define TEW_632BRP_GPIO_BTN_RESET	21
+
+#define TEW_632BRP_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TEW_632BRP_KEYS_DEBOUNCE_INTERVAL (3 * TEW_632BRP_KEYS_POLL_INTERVAL)
+
+#define TEW_632BRP_CONFIG_ADDR	0x1f020000
+#define TEW_632BRP_CONFIG_SIZE	0x10000
+
+static struct gpio_led tew_632brp_leds_gpio[] __initdata = {
+	{
+		.name		= "tew-632brp:green:status",
+		.gpio		= TEW_632BRP_GPIO_LED_STATUS,
+		.active_low	= 1,
+	}, {
+		.name		= "tew-632brp:blue:wps",
+		.gpio		= TEW_632BRP_GPIO_LED_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "tew-632brp:green:wlan",
+		.gpio		= TEW_632BRP_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tew_632brp_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW_632BRP_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW_632BRP_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+#define TEW_632BRP_LAN_PHYMASK	BIT(0)
+#define TEW_632BRP_WAN_PHYMASK	BIT(4)
+#define TEW_632BRP_MDIO_MASK	(~(TEW_632BRP_LAN_PHYMASK | \
+				   TEW_632BRP_WAN_PHYMASK))
+
+static void __init tew_632brp_setup(void)
+{
+	const char *config = (char *) KSEG1ADDR(TEW_632BRP_CONFIG_ADDR);
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 mac[6];
+	u8 *wlan_mac = NULL;
+
+	if (ath79_nvram_parse_mac_addr(config, TEW_632BRP_CONFIG_SIZE,
+				       "lan_mac=", mac) == 0) {
+		ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+		ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+		wlan_mac = mac;
+	}
+
+	ath79_register_mdio(0, TEW_632BRP_MDIO_MASK);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.phy_mask = TEW_632BRP_LAN_PHYMASK;
+
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = TEW_632BRP_WAN_PHYMASK;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tew_632brp_leds_gpio),
+				 tew_632brp_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TEW_632BRP_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tew_632brp_gpio_keys),
+					tew_632brp_gpio_keys);
+
+	ath79_register_wmac(eeprom, wlan_mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TEW_632BRP, "TEW-632BRP", "TRENDnet TEW-632BRP",
+	     tew_632brp_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-673gru.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-673gru.c
new file mode 100644
index 00000000..80a5443c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-673gru.c
@@ -0,0 +1,198 @@
+/*
+ *  TRENDnet TEW-673GRU board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/rtl8366.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define TEW673GRU_GPIO_LCD_SCK		0
+#define TEW673GRU_GPIO_LCD_MOSI		1
+#define TEW673GRU_GPIO_LCD_MISO		2
+#define TEW673GRU_GPIO_LCD_CS		6
+
+#define TEW673GRU_GPIO_LED_WPS		9
+
+#define TEW673GRU_GPIO_BTN_RESET	3
+#define TEW673GRU_GPIO_BTN_WPS		8
+
+#define TEW673GRU_GPIO_RTL8366_SDA	5
+#define TEW673GRU_GPIO_RTL8366_SCK	7
+
+#define TEW673GRU_KEYS_POLL_INTERVAL	20 /* msecs */
+#define TEW673GRU_KEYS_DEBOUNCE_INTERVAL (3 * TEW673GRU_KEYS_POLL_INTERVAL)
+
+#define TEW673GRU_CAL0_OFFSET		0x1000
+#define TEW673GRU_CAL1_OFFSET		0x5000
+#define TEW673GRU_MAC0_OFFSET		0xffa0
+#define TEW673GRU_MAC1_OFFSET		0xffb4
+
+#define TEW673GRU_CAL_LOCATION_0	0x1f660000
+#define TEW673GRU_CAL_LOCATION_1	0x1f7f0000
+
+static struct gpio_led tew673gru_leds_gpio[] __initdata = {
+	{
+		.name		= "trendnet:blue:wps",
+		.gpio		= TEW673GRU_GPIO_LED_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tew673gru_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TEW673GRU_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW673GRU_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TEW673GRU_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW673GRU_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct rtl8366_initval tew673gru_rtl8366s_initvals[] = {
+	{ .reg = 0x06, .val = 0x0108 },
+};
+
+static struct rtl8366_platform_data tew673gru_rtl8366s_data = {
+	.gpio_sda	= TEW673GRU_GPIO_RTL8366_SDA,
+	.gpio_sck	= TEW673GRU_GPIO_RTL8366_SCK,
+	.num_initvals	= ARRAY_SIZE(tew673gru_rtl8366s_initvals),
+	.initvals	= tew673gru_rtl8366s_initvals,
+};
+
+static struct platform_device tew673gru_rtl8366s_device = {
+	.name		= RTL8366S_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &tew673gru_rtl8366s_data,
+	}
+};
+
+static struct spi_board_info tew673gru_spi_info[] = {
+	{
+		.bus_num	= 1,
+		.chip_select	= 0,
+		.max_speed_hz	= 400000,
+		.modalias	= "spidev",
+		.mode		= SPI_MODE_2,
+		.controller_data = (void *) TEW673GRU_GPIO_LCD_CS,
+	},
+};
+
+static struct spi_gpio_platform_data tew673gru_spi_data = {
+	.sck		= TEW673GRU_GPIO_LCD_SCK,
+	.miso		= TEW673GRU_GPIO_LCD_MISO,
+	.mosi		= TEW673GRU_GPIO_LCD_MOSI,
+	.num_chipselect = 1,
+};
+
+static struct platform_device tew673gru_spi_device = {
+	.name		= "spi_gpio",
+	.id		= 1,
+	.dev = {
+		.platform_data = &tew673gru_spi_data,
+	},
+};
+
+static bool __init tew673gru_is_caldata_valid(u8 *p)
+{
+	u16 *magic0, *magic1;
+
+	magic0 = (u16 *)(p + TEW673GRU_CAL0_OFFSET);
+	magic1 = (u16 *)(p + TEW673GRU_CAL1_OFFSET);
+
+	return (*magic0 == 0xa55a && *magic1 == 0xa55a);
+}
+
+static void __init tew673gru_wlan_init(void)
+{
+	u8 mac1[ETH_ALEN], mac2[ETH_ALEN];
+	u8 *caldata;
+
+	caldata = (u8 *) KSEG1ADDR(TEW673GRU_CAL_LOCATION_0);
+	if (!tew673gru_is_caldata_valid(caldata)) {
+		caldata = (u8 *)KSEG1ADDR(TEW673GRU_CAL_LOCATION_1);
+		if (!tew673gru_is_caldata_valid(caldata)) {
+			pr_err("no calibration data found\n");
+			return;
+		}
+	}
+
+	ath79_parse_ascii_mac(caldata + TEW673GRU_MAC0_OFFSET, mac1);
+	ath79_parse_ascii_mac(caldata + TEW673GRU_MAC1_OFFSET, mac2);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 2);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac1, 3);
+
+	ap9x_pci_setup_wmac_led_pin(0, 5);
+	ap9x_pci_setup_wmac_led_pin(1, 5);
+
+	ap94_pci_init(caldata + TEW673GRU_CAL0_OFFSET, mac1,
+		      caldata + TEW673GRU_CAL1_OFFSET, mac2);
+}
+
+static void __init tew673gru_setup(void)
+{
+	tew673gru_wlan_init();
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_eth0_data.mii_bus_dev = &tew673gru_rtl8366s_device.dev;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_pll_data.pll_1000 = 0x11110000;
+
+	ath79_eth1_data.mii_bus_dev = &tew673gru_rtl8366s_device.dev;
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = 0x10;
+	ath79_eth1_pll_data.pll_1000 = 0x11110000;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tew673gru_leds_gpio),
+				 tew673gru_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TEW673GRU_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tew673gru_gpio_keys),
+					tew673gru_gpio_keys);
+
+	ath79_register_usb();
+
+	platform_device_register(&tew673gru_rtl8366s_device);
+
+	spi_register_board_info(tew673gru_spi_info,
+				ARRAY_SIZE(tew673gru_spi_info));
+	platform_device_register(&tew673gru_spi_device);
+}
+
+MIPS_MACHINE(ATH79_MACH_TEW_673GRU, "TEW-673GRU", "TRENDnet TEW-673GRU",
+	     tew673gru_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c
new file mode 100644
index 00000000..304b9948
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c
@@ -0,0 +1,153 @@
+/*
+ *  TRENDnet TEW-712BR board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TEW_712BR_GPIO_BTN_WPS		11
+#define TEW_712BR_GPIO_BTN_RESET	12
+
+#define TEW_712BR_GPIO_LED_LAN1		13
+#define TEW_712BR_GPIO_LED_LAN2		14
+#define TEW_712BR_GPIO_LED_LAN3		15
+#define TEW_712BR_GPIO_LED_LAN4		16
+#define TEW_712BR_GPIO_LED_POWER_GREEN	20
+#define TEW_712BR_GPIO_LED_POWER_ORANGE	27
+#define TEW_712BR_GPIO_LED_WAN_GREEN	17
+#define TEW_712BR_GPIO_LED_WAN_ORANGE	23
+#define TEW_712BR_GPIO_LED_WLAN		0
+#define TEW_712BR_GPIO_LED_WPS		26
+
+#define TEW_712BR_GPIO_WAN_LED_ENABLE	1
+
+#define TEW_712BR_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TEW_712BR_KEYS_DEBOUNCE_INTERVAL (3 * TEW_712BR_KEYS_POLL_INTERVAL)
+
+#define TEW_712BR_ART_ADDRESS		0x1f010000
+#define TEW_712BR_CALDATA_OFFSET	0x1000
+
+#define TEW_712BR_MAC_PART_ADDRESS	0x1f020000
+#define TEW_712BR_LAN_MAC_OFFSET	0x04
+#define TEW_712BR_WAN_MAC_OFFSET	0x16
+
+static struct gpio_led tew_712br_leds_gpio[] __initdata = {
+	{
+		.name		= "trendnet:green:lan1",
+		.gpio		= TEW_712BR_GPIO_LED_LAN1,
+		.active_low	= 0,
+	}, {
+		.name		= "trendnet:green:lan2",
+		.gpio		= TEW_712BR_GPIO_LED_LAN2,
+		.active_low	= 0,
+	}, {
+		.name		= "trendnet:green:lan3",
+		.gpio		= TEW_712BR_GPIO_LED_LAN3,
+		.active_low	= 0,
+	}, {
+		.name		= "trendnet:green:lan4",
+		.gpio		= TEW_712BR_GPIO_LED_LAN4,
+		.active_low	= 0,
+	}, {
+		.name		= "trendnet:blue:wps",
+		.gpio		= TEW_712BR_GPIO_LED_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "trendnet:green:power",
+		.gpio		= TEW_712BR_GPIO_LED_POWER_GREEN,
+		.active_low	= 0,
+	}, {
+		.name		= "trendnet:orange:power",
+		.gpio		= TEW_712BR_GPIO_LED_POWER_ORANGE,
+		.active_low	= 0,
+	}, {
+		.name		= "trendnet:green:wan",
+		.gpio		= TEW_712BR_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "trendnet:orange:wan",
+		.gpio		= TEW_712BR_GPIO_LED_WAN_ORANGE,
+		.active_low	= 0,
+	}, {
+		.name		= "trendnet:green:wlan",
+		.gpio		= TEW_712BR_GPIO_LED_WLAN,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button tew_712br_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TEW_712BR_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW_712BR_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TEW_712BR_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW_712BR_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static void __init tew_712br_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(TEW_712BR_ART_ADDRESS);
+	u8 *mac = (u8 *) KSEG1ADDR(TEW_712BR_MAC_PART_ADDRESS);
+	u8 lan_mac[ETH_ALEN];
+	u8 wan_mac[ETH_ALEN];
+
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	gpio_request_one(TEW_712BR_GPIO_WAN_LED_ENABLE,
+			 GPIOF_OUT_INIT_LOW, "WAN LED enable");
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tew_712br_leds_gpio),
+				 tew_712br_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TEW_712BR_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tew_712br_gpio_keys),
+					tew_712br_gpio_keys);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_parse_ascii_mac(mac + TEW_712BR_LAN_MAC_OFFSET, lan_mac);
+	ath79_parse_ascii_mac(mac + TEW_712BR_WAN_MAC_OFFSET, wan_mac);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, wan_mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, lan_mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(art + TEW_712BR_CALDATA_OFFSET, wan_mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TEW_712BR, "TEW-712BR",
+	     "TRENDnet TEW-712BR", tew_712br_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-732br.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-732br.c
new file mode 100644
index 00000000..1f26f6f4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-732br.c
@@ -0,0 +1,127 @@
+/*
+ *  TRENDnet TEW-732BR board support
+ *
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TEW_732BR_GPIO_BTN_WPS		16
+#define TEW_732BR_GPIO_BTN_RESET	17
+
+#define TEW_732BR_GPIO_LED_POWER_GREEN	4
+#define TEW_732BR_GPIO_LED_POWER_AMBER	14
+#define TEW_732BR_GPIO_LED_PLANET_GREEN	12
+#define TEW_732BR_GPIO_LED_PLANET_AMBER 22
+
+#define TEW_732BR_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TEW_732BR_KEYS_DEBOUNCE_INTERVAL (3 * TEW_732BR_KEYS_POLL_INTERVAL)
+
+#define TEW_732BR_ART_ADDRESS		0x1fff0000
+#define TEW_732BR_CALDATA_OFFSET	0x1000
+#define TEW_732BR_LAN_MAC_OFFSET	0xffa0
+#define TEW_732BR_WAN_MAC_OFFSET	0xffb4
+
+static struct gpio_led tew_732br_leds_gpio[] __initdata = {
+	{
+		.name		= "trendnet:green:power",
+		.gpio		= TEW_732BR_GPIO_LED_POWER_GREEN,
+		.active_low	= 0,
+	},
+	{
+		.name		= "trendnet:amber:power",
+		.gpio		= TEW_732BR_GPIO_LED_POWER_AMBER,
+		.active_low	= 0,
+	},
+	{
+		.name		= "trendnet:green:wan",
+		.gpio		= TEW_732BR_GPIO_LED_PLANET_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "trendnet:amber:wan",
+		.gpio		= TEW_732BR_GPIO_LED_PLANET_AMBER,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button tew_732br_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TEW_732BR_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW_732BR_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TEW_732BR_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TEW_732BR_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+};
+
+static void __init tew_732br_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(TEW_732BR_ART_ADDRESS);
+	u8 lan_mac[ETH_ALEN];
+	u8 wan_mac[ETH_ALEN];
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tew_732br_leds_gpio),
+				 tew_732br_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TEW_732BR_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tew_732br_gpio_keys),
+					tew_732br_gpio_keys);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_parse_ascii_mac(art + TEW_732BR_LAN_MAC_OFFSET, lan_mac);
+	ath79_parse_ascii_mac(art + TEW_732BR_WAN_MAC_OFFSET, wan_mac);
+
+	ath79_register_wmac(art + TEW_732BR_CALDATA_OFFSET, lan_mac);
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	/* LAN: GMAC1 is connected to the internal switch */
+	ath79_init_mac(ath79_eth1_data.mac_addr, lan_mac, 0);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+
+	ath79_register_eth(1);
+
+	/* WAN: GMAC0 is connected to the PHY4 of the internal switch */
+	ath79_init_mac(ath79_eth0_data.mac_addr, wan_mac, 0);
+
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(4);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(4);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+
+	ath79_register_eth(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_TEW_732BR, "TEW-732BR", "TRENDnet TEW-732BR",
+	     tew_732br_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
new file mode 100644
index 00000000..74ccf639
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
@@ -0,0 +1,183 @@
+/*
+ *  TP-LINK TL-MR11U/TL-MR3040 board support
+ *
+ *  Copyright (C) 2011 dongyuqi <729650915@qq.com>
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_MR11U_GPIO_LED_3G		27
+#define TL_MR11U_GPIO_LED_WLAN		26
+#define TL_MR11U_GPIO_LED_LAN		17
+
+#define TL_MR11U_GPIO_BTN_WPS		20
+#define TL_MR11U_GPIO_BTN_RESET		11
+
+#define TL_MR11U_GPIO_USB_POWER		8
+#define TL_MR3040_GPIO_USB_POWER	18
+
+#define TL_MR3040_V2_GPIO_BTN_SW1	19
+#define TL_MR3040_V2_GPIO_BTN_SW2	20
+
+#define TL_MR11U_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_MR11U_KEYS_DEBOUNCE_INTERVAL	(3 * TL_MR11U_KEYS_POLL_INTERVAL)
+
+static const char *tl_mr11u_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_mr11u_flash_data = {
+	.part_probes	= tl_mr11u_part_probes,
+};
+
+static struct gpio_led tl_mr11u_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:3g",
+		.gpio		= TL_MR11U_GPIO_LED_3G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_MR11U_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:lan",
+		.gpio		= TL_MR11U_GPIO_LED_LAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tl_mr11u_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_MR11U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR11U_GPIO_BTN_RESET,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_MR11U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR11U_GPIO_BTN_WPS,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button tl_mr3040_v2_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_MR11U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR11U_GPIO_BTN_RESET,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "sw1",
+		.type		= EV_SW,
+		.code		= BTN_0,
+		.debounce_interval = TL_MR11U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3040_V2_GPIO_BTN_SW1,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "sw2",
+		.type		= EV_SW,
+		.code		= BTN_1,
+		.debounce_interval = TL_MR11U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3040_V2_GPIO_BTN_SW2,
+		.active_low	= 0,
+	}
+};
+
+static void __init common_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* Disable hardware control LAN1 and LAN2 LEDs, enabling GPIO14 and GPIO15 */
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN);
+
+	/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_m25p80(&tl_mr11u_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr11u_leds_gpio),
+				 tl_mr11u_leds_gpio);
+
+	ath79_register_usb();
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(ee, mac);
+}
+
+static void __init tl_mr11u_setup(void)
+{
+	common_setup();
+
+	ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_mr11u_gpio_keys),
+					tl_mr11u_gpio_keys);
+	gpio_request_one(TL_MR11U_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR11U, "TL-MR11U", "TP-LINK TL-MR11U",
+	     tl_mr11u_setup);
+
+static void __init tl_mr3040_setup(void)
+{
+	common_setup();
+
+	ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL,
+					1, tl_mr11u_gpio_keys);
+	gpio_request_one(TL_MR3040_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR3040, "TL-MR3040", "TP-LINK TL-MR3040",
+	     tl_mr3040_setup);
+
+static void __init tl_mr3040_v2_setup(void)
+{
+	common_setup();
+
+	ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_mr3040_v2_gpio_keys),
+					tl_mr3040_v2_gpio_keys);
+	gpio_request_one(TL_MR3040_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR3040_V2, "TL-MR3040-v2", "TP-LINK TL-MR3040 v2",
+	     tl_mr3040_v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr13u.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr13u.c
new file mode 100644
index 00000000..8b036457
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr13u.c
@@ -0,0 +1,107 @@
+/*
+ *  TP-LINK TL-MR13U board support
+ *
+ *  Copyright (C) 2011 dongyuqi <729650915@qq.com>
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_MR13U_GPIO_LED_SYSTEM	27
+
+#define TL_MR13U_GPIO_BTN_RESET		11
+#define TL_MR13U_GPIO_BTN_SW1		6
+#define TL_MR13U_GPIO_BTN_SW2		7
+
+#define TL_MR13U_GPIO_USB_POWER		18
+
+#define TL_MR13U_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_MR13U_KEYS_DEBOUNCE_INTERVAL	(3 * TL_MR13U_KEYS_POLL_INTERVAL)
+
+static const char *tl_mr13u_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_mr13u_flash_data = {
+	.part_probes	= tl_mr13u_part_probes,
+};
+
+static struct gpio_led tl_mr13u_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:blue:system",
+		.gpio		= TL_MR13U_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_mr13u_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_MR13U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR13U_GPIO_BTN_RESET,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "sw1",
+		.type		= EV_KEY,
+		.code		= BTN_0,
+		.debounce_interval = TL_MR13U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR13U_GPIO_BTN_SW1,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "sw2",
+		.type		= EV_KEY,
+		.code		= BTN_1,
+		.debounce_interval = TL_MR13U_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR13U_GPIO_BTN_SW2,
+		.active_low	= 0,
+	},
+};
+
+static void __init tl_mr13u_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_m25p80(&tl_mr13u_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr13u_leds_gpio),
+				 tl_mr13u_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TL_MR13U_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_mr13u_gpio_keys),
+					tl_mr13u_gpio_keys);
+
+	gpio_request_one(TL_MR13U_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR13U, "TL-MR13U", "TP-LINK TL-MR13U v1",
+	     tl_mr13u_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
new file mode 100644
index 00000000..0a9dfbc8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
@@ -0,0 +1,126 @@
+/*
+ *  TP-LINK TL-MR3020 board support
+ *
+ *  Copyright (C) 2011 dongyuqi <729650915@qq.com>
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_MR3020_GPIO_LED_3G		27
+#define TL_MR3020_GPIO_LED_WLAN		0
+#define TL_MR3020_GPIO_LED_LAN		17
+#define TL_MR3020_GPIO_LED_WPS		26
+
+#define TL_MR3020_GPIO_BTN_WPS		11
+#define TL_MR3020_GPIO_BTN_SW1		18
+#define TL_MR3020_GPIO_BTN_SW2		20
+
+#define TL_MR3020_GPIO_USB_POWER	8
+
+#define TL_MR3020_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_MR3020_KEYS_DEBOUNCE_INTERVAL	(3 * TL_MR3020_KEYS_POLL_INTERVAL)
+
+static const char *tl_mr3020_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_mr3020_flash_data = {
+	.part_probes	= tl_mr3020_part_probes,
+};
+
+static struct gpio_led tl_mr3020_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:3g",
+		.gpio		= TL_MR3020_GPIO_LED_3G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_MR3020_GPIO_LED_WLAN,
+		.active_low	= 0,
+	},
+	{
+		.name		= "tp-link:green:lan",
+		.gpio		= TL_MR3020_GPIO_LED_LAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:wps",
+		.gpio		= TL_MR3020_GPIO_LED_WPS,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_mr3020_gpio_keys[] __initdata = {
+	{
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_MR3020_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3020_GPIO_BTN_WPS,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "sw1",
+		.type		= EV_KEY,
+		.code		= BTN_0,
+		.debounce_interval = TL_MR3020_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3020_GPIO_BTN_SW1,
+		.active_low	= 0,
+	},
+	{
+		.desc		= "sw2",
+		.type		= EV_KEY,
+		.code		= BTN_1,
+		.debounce_interval = TL_MR3020_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3020_GPIO_BTN_SW2,
+		.active_low	= 0,
+	}
+};
+
+static void __init tl_mr3020_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_m25p80(&tl_mr3020_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr3020_leds_gpio),
+				 tl_mr3020_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TL_MR3020_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_mr3020_gpio_keys),
+					tl_mr3020_gpio_keys);
+
+	gpio_request_one(TL_MR3020_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR3020, "TL-MR3020", "TP-LINK TL-MR3020",
+	     tl_mr3020_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c
new file mode 100644
index 00000000..5924ac50
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c
@@ -0,0 +1,147 @@
+/*
+ *  TP-LINK TL-MR3220/3420 board support
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define TL_MR3X20_GPIO_LED_QSS		0
+#define TL_MR3X20_GPIO_LED_SYSTEM	1
+#define TL_MR3X20_GPIO_LED_3G		8
+
+#define TL_MR3X20_GPIO_BTN_RESET	11
+#define TL_MR3X20_GPIO_BTN_QSS		12
+
+#define TL_MR3X20_GPIO_USB_POWER	6
+
+#define TL_MR3X20_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_MR3X20_KEYS_DEBOUNCE_INTERVAL (3 * TL_MR3X20_KEYS_POLL_INTERVAL)
+
+static const char *tl_mr3x20_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_mr3x20_flash_data = {
+	.part_probes	= tl_mr3x20_part_probes,
+};
+
+static struct gpio_led tl_mr3x20_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= TL_MR3X20_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_MR3X20_GPIO_LED_QSS,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:3g",
+		.gpio		= TL_MR3X20_GPIO_LED_3G,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tl_mr3x20_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_MR3X20_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3X20_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "qss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_MR3X20_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3X20_GPIO_BTN_QSS,
+		.active_low	= 1,
+	}
+};
+
+static void __init tl_ap99_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&tl_mr3x20_flash_data);
+
+	ath79_register_gpio_keys_polled(-1, TL_MR3X20_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(tl_mr3x20_gpio_keys),
+					 tl_mr3x20_gpio_keys);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+	/* WAN port */
+	ath79_register_eth(0);
+
+	ap91_pci_init(ee, mac);
+}
+
+static void __init tl_mr3x20_usb_setup(void)
+{
+	/* enable power for the USB port */
+	gpio_request_one(TL_MR3X20_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+}
+
+static void __init tl_mr3220_setup(void)
+{
+	tl_ap99_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr3x20_leds_gpio),
+				 tl_mr3x20_leds_gpio);
+	ap9x_pci_setup_wmac_led_pin(0, 1);
+	tl_mr3x20_usb_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR3220, "TL-MR3220", "TP-LINK TL-MR3220",
+	     tl_mr3220_setup);
+
+static void __init tl_mr3420_setup(void)
+{
+	tl_ap99_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr3x20_leds_gpio),
+				 tl_mr3x20_leds_gpio);
+	ap9x_pci_setup_wmac_led_pin(0, 0);
+	tl_mr3x20_usb_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR3420, "TL-MR3420", "TP-LINK TL-MR3420",
+	     tl_mr3420_setup);
+
+static void __init tl_wr841n_v7_setup(void)
+{
+	tl_ap99_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr3x20_leds_gpio) - 1,
+				 tl_mr3x20_leds_gpio);
+	ap9x_pci_setup_wmac_led_pin(0, 0);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR841N_V7, "TL-WR841N-v7",
+	     "TP-LINK TL-WR841N/ND v7", tl_wr841n_v7_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa830re-v2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa830re-v2.c
new file mode 100644
index 00000000..1c74fed9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa830re-v2.c
@@ -0,0 +1,132 @@
+/*
+ *  TP-LINK TL-WA830RE v2 board support
+ *
+ *  Copyright (C) 2014 Fredrik Jonson <fredrik@famjonson.se>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WA830REV2_GPIO_LED_WLAN	13
+#define TL_WA830REV2_GPIO_LED_QSS	15
+#define TL_WA830REV2_GPIO_LED_LAN	18
+#define TL_WA830REV2_GPIO_LED_SYSTEM	14
+
+#define TL_WA830REV2_GPIO_BTN_RESET	17
+#define TL_WA830REV2_GPIO_SW_RFKILL	16	/* WPS for MR3420 v2 */
+
+#define TL_WA830REV2_GPIO_USB_POWER	4
+
+#define TL_WA830REV2_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WA830REV2_KEYS_DEBOUNCE_INTERVAL (3 * TL_WA830REV2_KEYS_POLL_INTERVAL)
+
+static const char *tl_wa830re_v2_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wa830re_v2_flash_data = {
+	.part_probes	= tl_wa830re_v2_part_probes,
+};
+
+static struct gpio_led tl_wa830re_v2_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WA830REV2_GPIO_LED_QSS,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WA830REV2_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan",
+		.gpio		= TL_WA830REV2_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WA830REV2_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wa830re_v2_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WA830REV2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WA830REV2_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "RFKILL switch",
+		.type		= EV_SW,
+		.code		= KEY_RFKILL,
+		.debounce_interval = TL_WA830REV2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WA830REV2_GPIO_SW_RFKILL,
+		.active_low	= 0,
+	}
+};
+
+static void __init tl_ap123_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* Disable JTAG, enabling GPIOs 0-3 */
+	/* Configure OBS4 line, for GPIO 4*/
+	ath79_gpio_function_setup(AR934X_GPIO_FUNC_JTAG_DISABLE,
+				 AR934X_GPIO_FUNC_CLK_OBS4_EN);
+
+	/* config gpio4 as normal gpio function */
+	ath79_gpio_output_select(TL_WA830REV2_GPIO_USB_POWER,
+				 AR934X_GPIO_OUT_GPIO);
+
+	ath79_register_m25p80(&tl_wa830re_v2_flash_data);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	/* GMAC0 is connected to the PHY0 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	ath79_register_wmac(ee, mac);
+}
+
+static void __init tl_wa830re_v2_setup(void)
+{
+	tl_ap123_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa830re_v2_leds_gpio) - 1,
+				 tl_wa830re_v2_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TL_WA830REV2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wa830re_v2_gpio_keys),
+					tl_wa830re_v2_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA830RE_V2, "TL-WA830RE-v2", "TP-LINK TL-WA830RE v2",
+	     tl_wa830re_v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v2.c
new file mode 100644
index 00000000..b4fb2a9f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v2.c
@@ -0,0 +1,104 @@
+/*
+ *  TP-LINK TL-WA901N/ND v2 board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2010 Pieter Hollants <pieter@hollants.com>
+ *  Copyright (C) 2011 Jonathan Bennett <jbscience87@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WA901ND_V2_GPIO_LED_QSS		4
+#define TL_WA901ND_V2_GPIO_LED_SYSTEM		2
+#define TL_WA901ND_V2_GPIO_LED_WLAN		9
+
+#define TL_WA901ND_V2_GPIO_BTN_RESET		3
+#define TL_WA901ND_V2_GPIO_BTN_QSS		7
+
+#define TL_WA901ND_V2_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL	\
+					(3 * TL_WA901ND_V2_KEYS_POLL_INTERVAL)
+
+static const char *tl_wa901nd_v2_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wa901nd_v2_flash_data = {
+	.part_probes	= tl_wa901nd_v2_part_probes,
+};
+
+static struct gpio_led tl_wa901nd_v2_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WA901ND_V2_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WA901ND_V2_GPIO_LED_QSS,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WA901ND_V2_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tl_wa901nd_v2_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WA901ND_V2_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "qss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WA901ND_V2_GPIO_BTN_QSS,
+		.active_low	= 1,
+	}
+};
+
+static void __init tl_wa901nd_v2_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *eeprom  = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = 0x00001000;
+	ath79_register_mdio(0, 0x0);
+
+	ath79_eth0_data.reset_bit = AR71XX_RESET_GE0_MAC |
+				    AR71XX_RESET_GE0_PHY;
+	ath79_register_eth(0);
+
+	ath79_register_m25p80(&tl_wa901nd_v2_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa901nd_v2_leds_gpio),
+				 tl_wa901nd_v2_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WA901ND_V2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wa901nd_v2_gpio_keys),
+					tl_wa901nd_v2_gpio_keys);
+
+	ath79_register_wmac(eeprom, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA901ND_V2, "TL-WA901ND-v2",
+	     "TP-LINK TL-WA901ND v2", tl_wa901nd_v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd.c
new file mode 100644
index 00000000..957b92cb
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd.c
@@ -0,0 +1,127 @@
+/*
+ *  TP-LINK TL-WA901N/ND v1, TL-WA7510N v1 board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2010 Pieter Hollants <pieter@hollants.com>
+ *  Copyright (C) 2012 Stefan Helmert <helst_listen@aol.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define TL_WA901ND_GPIO_LED_QSS		0
+#define TL_WA901ND_GPIO_LED_SYSTEM	1
+#define TL_WA901ND_GPIO_LED_LAN		13
+
+#define TL_WA901ND_GPIO_BTN_RESET	11
+#define TL_WA901ND_GPIO_BTN_QSS		12
+
+#define TL_WA901ND_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WA901ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WA901ND_KEYS_POLL_INTERVAL)
+
+static const char *tl_wa901nd_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wa901nd_flash_data = {
+	.part_probes	= tl_wa901nd_part_probes,
+};
+
+static struct gpio_led tl_wa901nd_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan",
+		.gpio		= TL_WA901ND_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WA901ND_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WA901ND_GPIO_LED_QSS,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tl_wa901nd_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WA901ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WA901ND_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "qss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WA901ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WA901ND_GPIO_BTN_QSS,
+		.active_low	= 1,
+	}
+};
+
+static void __init common_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+
+	/*
+	 * ath79_eth0 would be the WAN port, but is not connected.
+	 * ath79_eth1 connects to the internal switch chip, however
+	 * we have a single LAN port only.
+	 */
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(&tl_wa901nd_flash_data);
+}
+
+static void __init tl_wa901nd_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee  = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	common_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa901nd_leds_gpio),
+				 tl_wa901nd_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WA901ND_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wa901nd_gpio_keys),
+					tl_wa901nd_gpio_keys);
+
+	ap91_pci_init(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA901ND, "TL-WA901ND", "TP-LINK TL-WA901ND",
+	     tl_wa901nd_setup);
+
+static void __init tl_wa7510n_v1_setup(void)
+{
+	common_setup();
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA7510N_V1, "TL-WA7510N", "TP-LINK TL-WA7510N v1",
+	     tl_wa7510n_v1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wax50re.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wax50re.c
new file mode 100644
index 00000000..965b1cd3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wax50re.c
@@ -0,0 +1,313 @@
+/*
+ *  TP-LINK TL-WA750RE v1/TL-WA801ND v2/TL-WA850RE v1/TL-WA901ND v3
+ *  board support
+ *
+ *  Copyright (C) 2013 Martijn Zilverschoon <thefriedzombie@gmail.com>
+ *  Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WAX50RE_GPIO_LED_LAN		20
+#define TL_WAX50RE_GPIO_LED_WLAN	13
+#define TL_WAX50RE_GPIO_LED_RE		15
+#define TL_WAX50RE_GPIO_LED_SIGNAL1	0
+#define TL_WAX50RE_GPIO_LED_SIGNAL2	1
+#define TL_WAX50RE_GPIO_LED_SIGNAL3	2
+#define TL_WAX50RE_GPIO_LED_SIGNAL4	3
+#define TL_WAX50RE_GPIO_LED_SIGNAL5	4
+
+#define TL_WA860RE_GPIO_LED_WLAN_ORANGE	0
+#define TL_WA860RE_GPIO_LED_WLAN_GREEN	2
+#define TL_WA860RE_GPIO_LED_POWER_ORANGE	12
+#define TL_WA860RE_GPIO_LED_POWER_GREEN	14
+#define TL_WA860RE_GPIO_LED_LAN		20
+
+#define TL_WA801ND_V2_GPIO_LED_LAN	18
+#define TL_WA801ND_V2_GPIO_LED_SYSTEM	14
+
+#define TL_WAX50RE_GPIO_BTN_RESET	17
+#define TL_WAX50RE_GPIO_BTN_WPS		16
+
+#define TL_WA860RE_GPIO_BTN_RESET	17
+#define TL_WA860RE_GPIO_BTN_WPS		16
+#define TL_WA860RE_GPIO_BTN_ONOFF	11
+
+#define TL_WAX50RE_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WAX50RE_KEYS_DEBOUNCE_INTERVAL (3 * TL_WAX50RE_KEYS_POLL_INTERVAL)
+
+static const char *tl_wax50re_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wax50re_flash_data = {
+	.part_probes	= tl_wax50re_part_probes,
+};
+
+static struct gpio_led tl_wa750re_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:orange:lan",
+		.gpio		= TL_WAX50RE_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:wlan",
+		.gpio		= TL_WAX50RE_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:re",
+		.gpio		= TL_WAX50RE_GPIO_LED_RE,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:signal1",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:signal2",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL2,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:signal3",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL3,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:signal4",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL4,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:signal5",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL5,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_led tl_wa850re_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:blue:lan",
+		.gpio		= TL_WAX50RE_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:blue:wlan",
+		.gpio		= TL_WAX50RE_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:blue:re",
+		.gpio		= TL_WAX50RE_GPIO_LED_RE,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:blue:signal1",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:blue:signal2",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL2,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:blue:signal3",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL3,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:blue:signal4",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL4,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:blue:signal5",
+		.gpio		= TL_WAX50RE_GPIO_LED_SIGNAL5,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_led tl_wa860re_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan",
+		.gpio		= TL_WA860RE_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:power",
+		.gpio		= TL_WA860RE_GPIO_LED_POWER_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:power",
+		.gpio		= TL_WA860RE_GPIO_LED_POWER_ORANGE,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WA860RE_GPIO_LED_WLAN_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:wlan",
+		.gpio		= TL_WA860RE_GPIO_LED_WLAN_ORANGE,
+		.active_low	= 1,
+	},
+};
+
+
+static struct gpio_keys_button tl_wax50re_gpio_keys[] __initdata = {
+	{
+		.desc		   = "Reset button",
+		.type		   = EV_KEY,
+		.code		   = KEY_RESTART,
+		.debounce_interval = TL_WAX50RE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		   = TL_WAX50RE_GPIO_BTN_RESET,
+		.active_low	   = 1,
+	}, {
+		.desc		   = "WPS",
+		.type		   = EV_KEY,
+		.code		   = KEY_WPS_BUTTON,
+		.debounce_interval = TL_WAX50RE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		   = TL_WAX50RE_GPIO_BTN_WPS,
+		.active_low	   = 1,
+	},
+};
+
+static struct gpio_keys_button tl_wa860re_gpio_keys[] __initdata = {
+	{
+		.desc		   = "Reset button",
+		.type		   = EV_KEY,
+		.code		   = KEY_RESTART,
+		.debounce_interval = TL_WAX50RE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		   = TL_WA860RE_GPIO_BTN_RESET,
+		.active_low	   = 1,
+	}, {
+		.desc		   = "WPS",
+		.type		   = EV_KEY,
+		.code		   = KEY_WPS_BUTTON,
+		.debounce_interval = TL_WAX50RE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		   = TL_WA860RE_GPIO_BTN_WPS,
+		.active_low	   = 1,
+	}, {
+		.desc		   = "ONOFF",
+		.type		   = EV_KEY,
+		.code		   = BTN_1,
+		.debounce_interval = TL_WAX50RE_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		   = TL_WA860RE_GPIO_BTN_ONOFF,
+		.active_low	   = 1,
+	},
+};
+
+static struct gpio_led tl_wa801nd_v2_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan",
+		.gpio		= TL_WA801ND_V2_GPIO_LED_LAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WAX50RE_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WAX50RE_GPIO_LED_RE,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WA801ND_V2_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static void __init tl_ap123_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&tl_wax50re_flash_data);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	ath79_register_wmac(ee, mac);
+}
+
+static void  __init tl_wa750re_setup(void)
+{
+	tl_ap123_setup();
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa750re_leds_gpio),
+				 tl_wa750re_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WAX50RE_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wax50re_gpio_keys),
+					tl_wax50re_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA750RE, "TL-WA750RE", "TP-LINK TL-WA750RE",
+	     tl_wa750re_setup);
+
+static void __init tl_wa801nd_v2_setup(void)
+{
+	tl_ap123_setup();
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa801nd_v2_leds_gpio),
+			tl_wa801nd_v2_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WAX50RE_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wax50re_gpio_keys),
+					tl_wax50re_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA801ND_V2, "TL-WA801ND-v2", "TP-LINK TL-WA801ND v2",
+	     tl_wa801nd_v2_setup);
+
+static void  __init tl_wa850re_setup(void)
+{
+	tl_ap123_setup();
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa850re_leds_gpio),
+				 tl_wa850re_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WAX50RE_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wax50re_gpio_keys),
+					tl_wax50re_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA850RE, "TL-WA850RE", "TP-LINK TL-WA850RE",
+	     tl_wa850re_setup);
+
+static void  __init tl_wa860re_setup(void)
+{
+	tl_ap123_setup();
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa860re_leds_gpio),
+				 tl_wa860re_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WAX50RE_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wa860re_gpio_keys),
+					tl_wa860re_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA860RE, "TL-WA860RE", "TP-LINK TL-WA860RE",
+	     tl_wa860re_setup);
+
+static void __init tl_wa901nd_v3_setup(void)
+{
+	tl_ap123_setup();
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa801nd_v2_leds_gpio),
+			tl_wa801nd_v2_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WAX50RE_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wax50re_gpio_keys) - 1,
+					tl_wax50re_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WA901ND_V3, "TL-WA901ND-v3", "TP-LINK TL-WA901ND v3",
+	     tl_wa901nd_v3_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c
new file mode 100644
index 00000000..452c20b7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3500.c
@@ -0,0 +1,169 @@
+/*
+ *  TP-LINK TL-WDR3500 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2013 Gui Iribarren <gui@altermundi.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WDR3500_GPIO_LED_USB		11
+#define WDR3500_GPIO_LED_WLAN2G		13
+#define WDR3500_GPIO_LED_SYSTEM		14
+#define WDR3500_GPIO_LED_QSS		15
+#define WDR3500_GPIO_LED_WAN		18
+#define WDR3500_GPIO_LED_LAN1		19
+#define WDR3500_GPIO_LED_LAN2		20
+#define WDR3500_GPIO_LED_LAN3		21
+#define WDR3500_GPIO_LED_LAN4		22
+
+#define WDR3500_GPIO_BTN_WPS		16
+#define WDR3500_GPIO_BTN_RFKILL		17
+
+#define WDR3500_GPIO_USB_POWER		12
+
+#define WDR3500_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WDR3500_KEYS_DEBOUNCE_INTERVAL	(3 * WDR3500_KEYS_POLL_INTERVAL)
+
+#define WDR3500_MAC0_OFFSET		0
+#define WDR3500_MAC1_OFFSET		6
+#define WDR3500_WMAC_CALDATA_OFFSET	0x1000
+#define WDR3500_PCIE_CALDATA_OFFSET	0x5000
+
+static const char *wdr3500_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data wdr3500_flash_data = {
+	.part_probes	= wdr3500_part_probes,
+};
+
+static struct gpio_led wdr3500_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:qss",
+		.gpio		= WDR3500_GPIO_LED_QSS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= WDR3500_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:usb",
+		.gpio		= WDR3500_GPIO_LED_USB,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:wlan2g",
+		.gpio		= WDR3500_GPIO_LED_WLAN2G,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button wdr3500_gpio_keys[] __initdata = {
+	{
+		.desc		= "QSS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WDR3500_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WDR3500_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "RFKILL switch",
+		.type		= EV_SW,
+		.code		= KEY_RFKILL,
+		.debounce_interval = WDR3500_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WDR3500_GPIO_BTN_RFKILL,
+	},
+};
+
+
+static void __init wdr3500_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(&wdr3500_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wdr3500_leds_gpio),
+				 wdr3500_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WDR3500_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wdr3500_gpio_keys),
+					wdr3500_gpio_keys);
+
+	ath79_init_mac(tmpmac, mac, 0);
+	ath79_register_wmac(art + WDR3500_WMAC_CALDATA_OFFSET, tmpmac);
+
+	ath79_init_mac(tmpmac, mac, 1);
+	ap9x_pci_setup_wmac_led_pin(0, 0);
+	ap91_pci_init(art + WDR3500_PCIE_CALDATA_OFFSET, tmpmac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(1, 0x0);
+
+	/* LAN */
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+
+	ath79_register_eth(1);
+
+	/* WAN */
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 2);
+
+	/* GMAC0 is connected to the PHY4 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(4);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(4);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+
+	ath79_register_eth(0);
+
+	gpio_request_one(WDR3500_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_gpio_output_select(WDR3500_GPIO_LED_LAN1,
+				 AR934X_GPIO_OUT_LED_LINK3);
+	ath79_gpio_output_select(WDR3500_GPIO_LED_LAN2,
+				 AR934X_GPIO_OUT_LED_LINK2);
+	ath79_gpio_output_select(WDR3500_GPIO_LED_LAN3,
+				 AR934X_GPIO_OUT_LED_LINK1);
+	ath79_gpio_output_select(WDR3500_GPIO_LED_LAN4,
+				 AR934X_GPIO_OUT_LED_LINK0);
+	ath79_gpio_output_select(WDR3500_GPIO_LED_WAN,
+				 AR934X_GPIO_OUT_LED_LINK4);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WDR3500, "TL-WDR3500",
+	     "TP-LINK TL-WDR3500",
+	     wdr3500_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
new file mode 100644
index 00000000..99ae80df
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
@@ -0,0 +1,205 @@
+/*
+ *  TP-LINK TL-WDR4300 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WDR4300_GPIO_LED_USB1		11
+#define WDR4300_GPIO_LED_USB2		12
+#define WDR4300_GPIO_LED_WLAN2G		13
+#define WDR4300_GPIO_LED_SYSTEM		14
+#define WDR4300_GPIO_LED_QSS		15
+
+#define WDR4300_GPIO_BTN_WPS		16
+#define WDR4300_GPIO_BTN_RFKILL		17
+
+#define WDR4300_GPIO_EXTERNAL_LNA0	18
+#define WDR4300_GPIO_EXTERNAL_LNA1	19
+
+#define WDR4300_GPIO_USB1_POWER		22
+#define WDR4300_GPIO_USB2_POWER		21
+
+#define WDR4300_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WDR4300_KEYS_DEBOUNCE_INTERVAL	(3 * WDR4300_KEYS_POLL_INTERVAL)
+
+#define WDR4300_MAC0_OFFSET		0
+#define WDR4300_MAC1_OFFSET		6
+#define WDR4300_WMAC_CALDATA_OFFSET	0x1000
+#define WDR4300_PCIE_CALDATA_OFFSET	0x5000
+
+static const char *wdr4300_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data wdr4300_flash_data = {
+	.part_probes	= wdr4300_part_probes,
+};
+
+static struct gpio_led wdr4300_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:blue:qss",
+		.gpio		= WDR4300_GPIO_LED_QSS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:blue:system",
+		.gpio		= WDR4300_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:usb1",
+		.gpio		= WDR4300_GPIO_LED_USB1,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:usb2",
+		.gpio		= WDR4300_GPIO_LED_USB2,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:blue:wlan2g",
+		.gpio		= WDR4300_GPIO_LED_WLAN2G,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button wdr4300_gpio_keys[] __initdata = {
+	{
+		.desc		= "QSS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WDR4300_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WDR4300_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "RFKILL switch",
+		.type		= EV_SW,
+		.code		= KEY_RFKILL,
+		.debounce_interval = WDR4300_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WDR4300_GPIO_BTN_RFKILL,
+	},
+};
+
+static const struct ar8327_led_info wdr4300_leds_ar8327[] __initconst = {
+	AR8327_LED_INFO(PHY0_0, HW, "tp-link:blue:wan"),
+	AR8327_LED_INFO(PHY1_0, HW, "tp-link:blue:lan1"),
+	AR8327_LED_INFO(PHY2_0, HW, "tp-link:blue:lan2"),
+	AR8327_LED_INFO(PHY3_0, HW, "tp-link:blue:lan3"),
+	AR8327_LED_INFO(PHY4_0, HW, "tp-link:blue:lan4"),
+};
+
+static struct ar8327_pad_cfg wdr4300_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_led_cfg wdr4300_ar8327_led_cfg = {
+	.led_ctrl0 = 0xc737c737,
+	.led_ctrl1 = 0x00000000,
+	.led_ctrl2 = 0x00000000,
+	.led_ctrl3 = 0x0030c300,
+	.open_drain = false,
+};
+
+static struct ar8327_platform_data wdr4300_ar8327_data = {
+	.pad0_cfg = &wdr4300_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &wdr4300_ar8327_led_cfg,
+	.num_leds = ARRAY_SIZE(wdr4300_leds_ar8327),
+	.leds = wdr4300_leds_ar8327,
+};
+
+static struct mdio_board_info wdr4300_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &wdr4300_ar8327_data,
+	},
+};
+
+static void __init wdr4300_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(&wdr4300_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wdr4300_leds_gpio),
+				 wdr4300_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WDR4300_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wdr4300_gpio_keys),
+					wdr4300_gpio_keys);
+
+	ath79_wmac_set_ext_lna_gpio(0, WDR4300_GPIO_EXTERNAL_LNA0);
+	ath79_wmac_set_ext_lna_gpio(1, WDR4300_GPIO_EXTERNAL_LNA1);
+
+	ath79_init_mac(tmpmac, mac, -1);
+	ath79_register_wmac(art + WDR4300_WMAC_CALDATA_OFFSET, tmpmac);
+
+	ath79_init_mac(tmpmac, mac, 0);
+	ap9x_pci_setup_wmac_led_pin(0, 0);
+	ap91_pci_init(art + WDR4300_PCIE_CALDATA_OFFSET, tmpmac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
+
+	mdiobus_register_board_info(wdr4300_mdio0_info,
+				    ARRAY_SIZE(wdr4300_mdio0_info));
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, -2);
+
+	/* GMAC0 is connected to an AR8327N switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+
+	gpio_request_one(WDR4300_GPIO_USB1_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB1 power");
+	gpio_request_one(WDR4300_GPIO_USB2_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB2 power");
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WDR4300, "TL-WDR4300",
+	     "TP-LINK TL-WDR3600/4300/4310",
+	     wdr4300_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c
new file mode 100644
index 00000000..fa8c4749
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c
@@ -0,0 +1,138 @@
+/*
+ *  TP-LINK TL-WR1041 v2 board support
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2011-2012 Anan Huang <axishero@foxmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR1041NV2_GPIO_BTN_RESET	14
+#define TL_WR1041NV2_GPIO_LED_WPS	13
+#define TL_WR1041NV2_GPIO_LED_WLAN	11
+
+#define TL_WR1041NV2_GPIO_LED_SYSTEM	12
+
+#define TL_WR1041NV2_KEYS_POLL_INTERVAL		20	/* msecs */
+#define TL_WR1041NV2_KEYS_DEBOUNCE_INTERVAL	(3 * TL_WR1041NV2_KEYS_POLL_INTERVAL)
+
+#define TL_WR1041NV2_PCIE_CALDATA_OFFSET	0x5000
+
+static const char *tl_wr1041nv2_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr1041nv2_flash_data = {
+	.part_probes	= tl_wr1041nv2_part_probes,
+};
+
+static struct gpio_led tl_wr1041nv2_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR1041NV2_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wps",
+		.gpio		= TL_WR1041NV2_GPIO_LED_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR1041NV2_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tl_wr1041nv2_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR1041NV2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR1041NV2_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static struct ar8327_pad_cfg db120_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_platform_data db120_ar8327_data = {
+	.pad0_cfg = &db120_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	}
+};
+
+static struct mdio_board_info db120_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &db120_ar8327_data,
+	},
+};
+
+static void __init tl_wr1041nv2_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&tl_wr1041nv2_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr1041nv2_leds_gpio),
+				 tl_wr1041nv2_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TL_WR1041NV2_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(tl_wr1041nv2_gpio_keys),
+					 tl_wr1041nv2_gpio_keys);
+	ath79_register_wmac(ee, mac);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+				   AR934X_ETH_CFG_SW_ONLY_MODE);
+
+	ath79_register_mdio(1, 0x0);
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+
+	mdiobus_register_board_info(db120_mdio0_info,
+				    ARRAY_SIZE(db120_mdio0_info));
+
+	/* GMAC0 is connected to an AR8327 switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR1041N_V2, "TL-WR1041N-v2",
+	     "TP-LINK TL-WR1041N v2", tl_wr1041nv2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
new file mode 100644
index 00000000..abdbde08
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
@@ -0,0 +1,215 @@
+/*
+ * TP-LINK TL-WR1043ND v2 board support
+ *
+ * Copyright (c) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Based on the Qualcomm Atheros AP135/AP136 reference board support code
+ *   Copyright (c) 2012 Qualcomm Atheros
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR1043_V2_GPIO_LED_WLAN	12
+#define TL_WR1043_V2_GPIO_LED_USB	15
+#define TL_WR1043_V2_GPIO_LED_WPS	18
+#define TL_WR1043_V2_GPIO_LED_SYSTEM	19
+
+#define TL_WR1043_V2_GPIO_BTN_RESET	16
+#define TL_WR1043_V2_GPIO_BTN_RFKILL	17
+
+#define TL_WR1043_V2_GPIO_USB_POWER	21
+
+#define TL_WR1043_V2_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR1043_V2_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR1043_V2_KEYS_POLL_INTERVAL)
+
+#define TL_WR1043_V2_WMAC_CALDATA_OFFSET	0x1000
+
+static const char *wr1043nd_v2_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data wr1043nd_v2_flash_data = {
+	.part_probes	= wr1043nd_v2_part_probes,
+};
+
+static struct gpio_led tl_wr1043_v2_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:wps",
+		.gpio		= TL_WR1043_V2_GPIO_LED_WPS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR1043_V2_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR1043_V2_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:usb",
+		.gpio		= TL_WR1043_V2_GPIO_LED_USB,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr1043_v2_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR1043_V2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR1043_V2_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "RFKILL button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = TL_WR1043_V2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR1043_V2_GPIO_BTN_RFKILL,
+		.active_low	= 1,
+	},
+};
+
+static const struct ar8327_led_info tl_wr1043_leds_ar8327[] = {
+	AR8327_LED_INFO(PHY0_0, HW, "tp-link:green:lan4"),
+	AR8327_LED_INFO(PHY1_0, HW, "tp-link:green:lan3"),
+	AR8327_LED_INFO(PHY2_0, HW, "tp-link:green:lan2"),
+	AR8327_LED_INFO(PHY3_0, HW, "tp-link:green:lan1"),
+	AR8327_LED_INFO(PHY4_0, HW, "tp-link:green:wan"),
+};
+
+/* GMAC0 of the AR8327 switch is connected to the QCA9558 SoC via SGMII */
+static struct ar8327_pad_cfg wr1043nd_v2_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_SGMII,
+	.sgmii_delay_en = true,
+};
+
+/* GMAC6 of the AR8327 switch is connected to the QCA9558 SoC via RGMII */
+static struct ar8327_pad_cfg wr1043nd_v2_ar8327_pad6_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_led_cfg wr1043nd_v2_ar8327_led_cfg = {
+	.led_ctrl0 = 0xcc35cc35,
+	.led_ctrl1 = 0xca35ca35,
+	.led_ctrl2 = 0xc935c935,
+	.led_ctrl3 = 0x03ffff00,
+	.open_drain = true,
+};
+
+static struct ar8327_platform_data wr1043nd_v2_ar8327_data = {
+	.pad0_cfg = &wr1043nd_v2_ar8327_pad0_cfg,
+	.pad6_cfg = &wr1043nd_v2_ar8327_pad6_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.port6_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &wr1043nd_v2_ar8327_led_cfg,
+	.num_leds = ARRAY_SIZE(tl_wr1043_leds_ar8327),
+	.leds = tl_wr1043_leds_ar8327,
+};
+
+static struct mdio_board_info wr1043nd_v2_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &wr1043nd_v2_ar8327_data,
+	},
+};
+
+static void __init tl_wr1043nd_v2_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_m25p80(&wr1043nd_v2_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr1043_v2_leds_gpio),
+				 tl_wr1043_v2_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TL_WR1043_V2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr1043_v2_gpio_keys),
+					tl_wr1043_v2_gpio_keys);
+
+	ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, mac);
+
+	mdiobus_register_board_info(wr1043nd_v2_mdio0_info,
+				    ARRAY_SIZE(wr1043nd_v2_mdio0_info));
+	ath79_register_mdio(0, 0x0);
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+	/* GMAC0 is connected to the RMGII interface */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x56000000;
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the SGMII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+
+	gpio_request_one(TL_WR1043_V2_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR1043ND_V2, "TL-WR1043ND-v2",
+	     "TP-LINK TL-WR1043ND v2", tl_wr1043nd_v2_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd.c
new file mode 100644
index 00000000..61aeb52d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd.c
@@ -0,0 +1,141 @@
+/*
+ *  TP-LINK TL-WR1043N/ND board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/rtl8366.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR1043ND_GPIO_LED_USB        1
+#define TL_WR1043ND_GPIO_LED_SYSTEM     2
+#define TL_WR1043ND_GPIO_LED_QSS        5
+#define TL_WR1043ND_GPIO_LED_WLAN       9
+
+#define TL_WR1043ND_GPIO_BTN_RESET      3
+#define TL_WR1043ND_GPIO_BTN_QSS        7
+
+#define TL_WR1043ND_GPIO_RTL8366_SDA	18
+#define TL_WR1043ND_GPIO_RTL8366_SCK	19
+
+#define TL_WR1043ND_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR1043ND_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr1043nd_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr1043nd_flash_data = {
+	.part_probes	= tl_wr1043nd_part_probes,
+};
+
+static struct gpio_led tl_wr1043nd_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:usb",
+		.gpio		= TL_WR1043ND_GPIO_LED_USB,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR1043ND_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR1043ND_GPIO_LED_QSS,
+		.active_low	= 0,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR1043ND_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tl_wr1043nd_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR1043ND_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "qss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR1043ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR1043ND_GPIO_BTN_QSS,
+		.active_low	= 1,
+	}
+};
+
+static void tl_wr1043nd_rtl8366rb_hw_reset(bool active)
+{
+	if (active)
+		ath79_device_reset_set(AR71XX_RESET_GE0_PHY);
+	else
+		ath79_device_reset_clear(AR71XX_RESET_GE0_PHY);
+}
+
+static struct rtl8366_platform_data tl_wr1043nd_rtl8366rb_data = {
+	.gpio_sda	= TL_WR1043ND_GPIO_RTL8366_SDA,
+	.gpio_sck	= TL_WR1043ND_GPIO_RTL8366_SCK,
+	.hw_reset	= tl_wr1043nd_rtl8366rb_hw_reset,
+};
+
+static struct platform_device tl_wr1043nd_rtl8366rb_device = {
+	.name		= RTL8366RB_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &tl_wr1043nd_rtl8366rb_data,
+	}
+};
+
+static void __init tl_wr1043nd_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	tl_wr1043nd_rtl8366rb_hw_reset(true);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.mii_bus_dev = &tl_wr1043nd_rtl8366rb_device.dev;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_pll_data.pll_1000 = 0x1a000000;
+
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+
+	ath79_register_m25p80(&tl_wr1043nd_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr1043nd_leds_gpio),
+				 tl_wr1043nd_leds_gpio);
+
+	platform_device_register(&tl_wr1043nd_rtl8366rb_device);
+
+	ath79_register_gpio_keys_polled(-1, TL_WR1043ND_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr1043nd_gpio_keys),
+					tl_wr1043nd_gpio_keys);
+
+	ath79_register_wmac(eeprom, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR1043ND, "TL-WR1043ND", "TP-LINK TL-WR1043ND",
+	     tl_wr1043nd_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr2543n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr2543n.c
new file mode 100644
index 00000000..8f6db5ed
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr2543n.c
@@ -0,0 +1,156 @@
+/*
+ *  TP-LINK TL-WR2543N/ND board support
+ *
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/rtl8367.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define TL_WR2543N_GPIO_LED_WPS        0
+#define TL_WR2543N_GPIO_LED_USB        8
+
+/* The WLAN LEDs use GPIOs on the discrete AR9380 wmac */
+#define TL_WR2543N_GPIO_WMAC_LED_WLAN2G 0
+#define TL_WR2543N_GPIO_WMAC_LED_WLAN5G 1
+
+#define TL_WR2543N_GPIO_BTN_RESET      11
+#define TL_WR2543N_GPIO_BTN_WPS        12
+
+#define TL_WR2543N_GPIO_RTL8367_SDA	1
+#define TL_WR2543N_GPIO_RTL8367_SCK	6
+
+#define TL_WR2543N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR2543N_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR2543N_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr2543n_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr2543n_flash_data = {
+	.part_probes	= tl_wr2543n_part_probes,
+};
+
+static struct gpio_led tl_wr2543n_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:usb",
+		.gpio		= TL_WR2543N_GPIO_LED_USB,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wps",
+		.gpio		= TL_WR2543N_GPIO_LED_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_led tl_wr2543n_wmac_leds_gpio[] = {
+	{
+		.name		= "tp-link:green:wlan5g",
+		.gpio		= TL_WR2543N_GPIO_WMAC_LED_WLAN5G,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr2543n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR2543N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR2543N_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR2543N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR2543N_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static struct rtl8367_extif_config tl_wr2543n_rtl8367_extif0_cfg = {
+	.mode = RTL8367_EXTIF_MODE_RGMII,
+	.txdelay = 1,
+	.rxdelay = 0,
+	.ability = {
+		.force_mode = 1,
+		.txpause = 1,
+		.rxpause = 1,
+		.link = 1,
+		.duplex = 1,
+		.speed = RTL8367_PORT_SPEED_1000,
+	},
+};
+
+static struct rtl8367_platform_data tl_wr2543n_rtl8367_data = {
+	.gpio_sda	= TL_WR2543N_GPIO_RTL8367_SDA,
+	.gpio_sck	= TL_WR2543N_GPIO_RTL8367_SCK,
+	.extif0_cfg	= &tl_wr2543n_rtl8367_extif0_cfg,
+};
+
+static struct platform_device tl_wr2543n_rtl8367_device = {
+	.name		= RTL8367_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &tl_wr2543n_rtl8367_data,
+	}
+};
+
+static void __init tl_wr2543n_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&tl_wr2543n_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr2543n_leds_gpio),
+				 tl_wr2543n_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TL_WR2543N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr2543n_gpio_keys),
+					tl_wr2543n_gpio_keys);
+	ath79_register_usb();
+
+	/*
+	 * The ath9k driver uses this pin for its default led device, which is
+	 * named ath9k-phy0, and reflects activity on either the 2 GHz or 5 GHz
+	 * bands. This pin is connected to the WR2543's 2GHz WLAN LED.
+	 */
+	ap9x_pci_setup_wmac_led_pin(0, TL_WR2543N_GPIO_WMAC_LED_WLAN2G);
+
+	/*
+	 * We also have the driver set up an led device for the WR2543's
+	 * separate 5 GHz WLAN LED in case the user wants it.
+	 */
+	ap9x_pci_setup_wmac_leds(0, tl_wr2543n_wmac_leds_gpio,
+				 ARRAY_SIZE(tl_wr2543n_wmac_leds_gpio));
+	ap91_pci_init(eeprom, mac);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, -1);
+	ath79_eth0_data.mii_bus_dev = &tl_wr2543n_rtl8367_device.dev;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_pll_data.pll_1000 = 0x1a000000;
+
+	ath79_register_eth(0);
+
+	platform_device_register(&tl_wr2543n_rtl8367_device);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR2543N, "TL-WR2543N", "TP-LINK TL-WR2543N/ND",
+	     tl_wr2543n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c
new file mode 100644
index 00000000..1d8d01cc
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c
@@ -0,0 +1,118 @@
+/*
+ *  TP-LINK TL-WR703N/TL-MR10U board support
+ *
+ *  Copyright (C) 2011 dongyuqi <729650915@qq.com>
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR703N_GPIO_LED_SYSTEM	27
+#define TL_WR703N_GPIO_BTN_RESET	11
+
+#define TL_WR703N_GPIO_USB_POWER	8
+
+#define TL_MR10U_GPIO_USB_POWER		18
+
+#define TL_WR703N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR703N_KEYS_DEBOUNCE_INTERVAL	(3 * TL_WR703N_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr703n_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr703n_flash_data = {
+	.part_probes	= tl_wr703n_part_probes,
+};
+
+static struct gpio_led tl_wr703n_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:blue:system",
+		.gpio		= TL_WR703N_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr703n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR703N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR703N_GPIO_BTN_RESET,
+		.active_low	= 0,
+	}
+};
+
+static void __init common_setup(unsigned usb_power_gpio, bool sec_ethernet)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_m25p80(&tl_wr703n_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr703n_leds_gpio),
+				 tl_wr703n_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TL_WR703N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr703n_gpio_keys),
+					tl_wr703n_gpio_keys);
+
+	gpio_request_one(usb_power_gpio,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+
+	if (sec_ethernet)
+	{
+		ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+		ath79_register_eth(1);
+	}
+
+	ath79_register_wmac(ee, mac);
+}
+
+static void __init tl_mr10u_setup(void)
+{
+	common_setup(TL_MR10U_GPIO_USB_POWER, false);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR10U, "TL-MR10U", "TP-LINK TL-MR10U",
+	     tl_mr10u_setup);
+
+static void __init tl_wr703n_setup(void)
+{
+	common_setup(TL_WR703N_GPIO_USB_POWER, false);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR703N, "TL-WR703N", "TP-LINK TL-WR703N v1",
+	     tl_wr703n_setup);
+
+static void __init tl_wr710n_setup(void)
+{
+	common_setup(TL_WR703N_GPIO_USB_POWER, true);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR710N, "TL-WR710N", "TP-LINK TL-WR710N v1",
+	     tl_wr710n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr720n-v3.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr720n-v3.c
new file mode 100644
index 00000000..80e8df68
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr720n-v3.c
@@ -0,0 +1,109 @@
+/*
+ *  TP-LINK TL-WR720N board support
+ *
+ *  Copyright (C) 2011 dongyuqi <729650915@qq.com>
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2013 yousong <yszhou4tech@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR720N_GPIO_LED_SYSTEM	27
+#define TL_WR720N_GPIO_BTN_RESET	11
+#define TL_WR720N_GPIO_BTN_SW1		18
+#define TL_WR720N_GPIO_BTN_SW2		20
+
+#define TL_WR720N_GPIO_USB_POWER	8
+
+#define TL_WR720N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR720N_KEYS_DEBOUNCE_INTERVAL	(3 * TL_WR720N_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr720n_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr720n_flash_data = {
+	.part_probes	= tl_wr720n_part_probes,
+};
+
+static struct gpio_led tl_wr720n_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:blue:system",
+		.gpio		= TL_WR720N_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr720n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR720N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR720N_GPIO_BTN_RESET,
+		.active_low	= 0,
+	}, {
+		.desc		= "sw1",
+		.type		= EV_KEY,
+		.code		= BTN_0,
+		.debounce_interval = TL_WR720N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR720N_GPIO_BTN_SW1,
+		.active_low = 0,
+	}, {
+		.desc		= "sw2",
+		.type		= EV_KEY,
+		.code		= BTN_1,
+		.debounce_interval = TL_WR720N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR720N_GPIO_BTN_SW2,
+		.active_low = 0,
+	}
+};
+
+static void __init tl_wr720n_v3_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_m25p80(&tl_wr720n_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr720n_leds_gpio),
+					tl_wr720n_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TL_WR720N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr720n_gpio_keys),
+					tl_wr720n_gpio_keys);
+
+	gpio_request_one(TL_WR720N_GPIO_USB_POWER,
+			GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			"USB power");
+	ath79_register_usb();
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 2);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_wmac(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR720N_V3, "TL-WR720N-v3", "TP-LINK TL-WR720N v3",
+		tl_wr720n_v3_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd-v4.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd-v4.c
new file mode 100644
index 00000000..851b7624
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd-v4.c
@@ -0,0 +1,187 @@
+/*
+ *  TP-LINK TL-WR741ND v4/TL-MR3220 v2 board support
+ *
+ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR741NDV4_GPIO_BTN_RESET	11
+#define TL_WR741NDV4_GPIO_BTN_WPS	26
+
+#define TL_WR741NDV4_GPIO_LED_WLAN	0
+#define TL_WR741NDV4_GPIO_LED_QSS	1
+#define TL_WR741NDV4_GPIO_LED_WAN	13
+#define TL_WR741NDV4_GPIO_LED_LAN1	14
+#define TL_WR741NDV4_GPIO_LED_LAN2	15
+#define TL_WR741NDV4_GPIO_LED_LAN3	16
+#define TL_WR741NDV4_GPIO_LED_LAN4	17
+#define TL_WR741NDV4_GPIO_LED_SYSTEM	27
+
+#define TL_MR3220V2_GPIO_BTN_WPS	11
+#define TL_MR3220V2_GPIO_BTN_WIFI	24
+
+#define TL_MR3220V2_GPIO_LED_3G		26
+#define TL_MR3220V2_GPIO_USB_POWER	8
+
+#define TL_WR741NDV4_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR741NDV4_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR741NDV4_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr741ndv4_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr741ndv4_flash_data = {
+	.part_probes	= tl_wr741ndv4_part_probes,
+};
+
+static struct gpio_led tl_wr741ndv4_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan1",
+		.gpio		= TL_WR741NDV4_GPIO_LED_LAN1,
+		.active_low	= 0,
+	}, {
+		.name		= "tp-link:green:lan2",
+		.gpio		= TL_WR741NDV4_GPIO_LED_LAN2,
+		.active_low	= 0,
+	}, {
+		.name		= "tp-link:green:lan3",
+		.gpio		= TL_WR741NDV4_GPIO_LED_LAN3,
+		.active_low	= 0,
+	}, {
+		.name		= "tp-link:green:lan4",
+		.gpio		= TL_WR741NDV4_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR741NDV4_GPIO_LED_QSS,
+		.active_low	= 0,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR741NDV4_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wan",
+		.gpio		= TL_WR741NDV4_GPIO_LED_WAN,
+		.active_low	= 0,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR741NDV4_GPIO_LED_WLAN,
+		.active_low	= 0,
+	}, {
+		/* the 3G LED is only present on the MR3220 v2 */
+		.name		= "tp-link:green:3g",
+		.gpio		= TL_MR3220V2_GPIO_LED_3G,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button tl_wr741ndv4_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR741NDV4_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR741NDV4_GPIO_BTN_RESET,
+		.active_low	= 0,
+	}, {
+		.desc		= "WPS",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR741NDV4_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR741NDV4_GPIO_BTN_WPS,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button tl_mr3220v2_gpio_keys[] __initdata = {
+	{
+		.desc		= "WPS",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR741NDV4_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3220V2_GPIO_BTN_WPS,
+		.active_low	= 0,
+	}, {
+		.desc		= "WIFI button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = TL_WR741NDV4_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_MR3220V2_GPIO_BTN_WIFI,
+		.active_low	= 0,
+	}
+};
+
+static void __init tl_ap121_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_setup_ar933x_phy4_switch(true, true);
+
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_m25p80(&tl_wr741ndv4_flash_data);
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(ee, mac);
+}
+
+static void __init tl_wr741ndv4_setup(void)
+{
+	tl_ap121_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr741ndv4_leds_gpio) - 1,
+				 tl_wr741ndv4_leds_gpio);
+	ath79_register_gpio_keys_polled(1, TL_WR741NDV4_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr741ndv4_gpio_keys),
+					tl_wr741ndv4_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR741ND_V4, "TL-WR741ND-v4",
+	     "TP-LINK TL-WR741ND v4", tl_wr741ndv4_setup);
+
+static void __init tl_mr3220v2_setup(void)
+{
+	tl_ap121_setup();
+
+	gpio_request_one(TL_MR3220V2_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr741ndv4_leds_gpio),
+				 tl_wr741ndv4_leds_gpio);
+	ath79_register_gpio_keys_polled(1, TL_WR741NDV4_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_mr3220v2_gpio_keys),
+					tl_mr3220v2_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR3220_V2, "TL-MR3220-v2",
+	     "TP-LINK TL-MR3220 v2", tl_mr3220v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd.c
new file mode 100644
index 00000000..5931654b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr741nd.c
@@ -0,0 +1,130 @@
+/*
+ *  TP-LINK TL-WR741ND board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+
+#define TL_WR741ND_GPIO_LED_QSS		0
+#define TL_WR741ND_GPIO_LED_SYSTEM	1
+#define TL_WR741ND_GPIO_LED_LAN1	13
+#define TL_WR741ND_GPIO_LED_LAN2	14
+#define TL_WR741ND_GPIO_LED_LAN3	15
+#define TL_WR741ND_GPIO_LED_LAN4	16
+#define TL_WR741ND_GPIO_LED_WAN		17
+
+#define TL_WR741ND_GPIO_BTN_RESET	11
+#define TL_WR741ND_GPIO_BTN_QSS		12
+
+#define TL_WR741ND_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR741ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR741ND_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr741nd_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr741nd_flash_data = {
+	.part_probes	= tl_wr741nd_part_probes,
+};
+
+static struct gpio_led tl_wr741nd_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan1",
+		.gpio		= TL_WR741ND_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan2",
+		.gpio		= TL_WR741ND_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan3",
+		.gpio		= TL_WR741ND_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan4",
+		.gpio		= TL_WR741ND_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR741ND_GPIO_LED_QSS,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR741ND_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wan",
+		.gpio		= TL_WR741ND_GPIO_LED_WAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr741nd_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR741ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR741ND_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "qss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR741ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR741ND_GPIO_BTN_QSS,
+		.active_low	= 1,
+	}
+};
+
+static void __init tl_wr741nd_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&tl_wr741nd_flash_data);
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr741nd_leds_gpio),
+				 tl_wr741nd_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WR741ND_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr741nd_gpio_keys),
+					tl_wr741nd_gpio_keys);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+
+	/* WAN port */
+	ath79_register_eth(0);
+
+	ap9x_pci_setup_wmac_led_pin(0, 1);
+	ap91_pci_init(ee, mac);
+}
+MIPS_MACHINE(ATH79_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND",
+	     tl_wr741nd_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c
new file mode 100644
index 00000000..0099b15b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v8.c
@@ -0,0 +1,225 @@
+/*
+ *  TP-LINK TL-WR841N/ND v8/TL-MR3420 v2 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR841NV8_GPIO_LED_WLAN	13
+#define TL_WR841NV8_GPIO_LED_QSS	15
+#define TL_WR841NV8_GPIO_LED_WAN	18
+#define TL_WR841NV8_GPIO_LED_LAN1	19
+#define TL_WR841NV8_GPIO_LED_LAN2	20
+#define TL_WR841NV8_GPIO_LED_LAN3	21
+#define TL_WR841NV8_GPIO_LED_LAN4	12
+#define TL_WR841NV8_GPIO_LED_SYSTEM	14
+
+#define TL_WR841NV8_GPIO_BTN_RESET	17
+#define TL_WR841NV8_GPIO_SW_RFKILL	16	/* WPS for MR3420 v2 */
+
+#define TL_MR3420V2_GPIO_LED_3G	11
+#define TL_MR3420V2_GPIO_USB_POWER	4
+
+#define TL_WR841NV8_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV8_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr841n_v8_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr841n_v8_flash_data = {
+	.part_probes	= tl_wr841n_v8_part_probes,
+};
+
+static struct gpio_led tl_wr841n_v8_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan1",
+		.gpio		= TL_WR841NV8_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan2",
+		.gpio		= TL_WR841NV8_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan3",
+		.gpio		= TL_WR841NV8_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan4",
+		.gpio		= TL_WR841NV8_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR841NV8_GPIO_LED_QSS,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR841NV8_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wan",
+		.gpio		= TL_WR841NV8_GPIO_LED_WAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR841NV8_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		/* the 3G LED is only present on the MR3420 v2 */
+		.name		= "tp-link:green:3g",
+		.gpio		= TL_MR3420V2_GPIO_LED_3G,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr841n_v8_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841NV8_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "RFKILL switch",
+		.type		= EV_SW,
+		.code		= KEY_RFKILL,
+		.debounce_interval = TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841NV8_GPIO_SW_RFKILL,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button tl_mr3420v2_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841NV8_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "WPS",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR841NV8_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841NV8_GPIO_SW_RFKILL,
+		.active_low	= 0,
+	}
+};
+
+static void __init tl_ap123_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	/* Disable JTAG, enabling GPIOs 0-3 */
+	/* Configure OBS4 line, for GPIO 4*/
+	ath79_gpio_function_setup(AR934X_GPIO_FUNC_JTAG_DISABLE,
+				 AR934X_GPIO_FUNC_CLK_OBS4_EN);
+
+	/* config gpio4 as normal gpio function */
+	ath79_gpio_output_select(TL_MR3420V2_GPIO_USB_POWER,
+				 AR934X_GPIO_OUT_GPIO);
+
+	ath79_register_m25p80(&tl_wr841n_v8_flash_data);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_register_mdio(1, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, -1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+
+	/* GMAC0 is connected to the PHY0 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+
+	ath79_register_wmac(ee, mac);
+}
+
+static void __init tl_wr841n_v8_setup(void)
+{
+	tl_ap123_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v8_leds_gpio) - 1,
+				 tl_wr841n_v8_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TL_WR841NV8_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr841n_v8_gpio_keys),
+					tl_wr841n_v8_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR841N_V8, "TL-WR841N-v8", "TP-LINK TL-WR841N/ND v8",
+	     tl_wr841n_v8_setup);
+
+
+static void __init tl_wr842n_v2_setup(void)
+{
+	tl_ap123_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v8_leds_gpio),
+				 tl_wr841n_v8_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TL_WR841NV8_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr841n_v8_gpio_keys),
+					tl_wr841n_v8_gpio_keys);
+
+	gpio_request_one(TL_MR3420V2_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR842N_V2, "TL-WR842N-v2", "TP-LINK TL-WR842N/ND v2",
+	     tl_wr842n_v2_setup);
+
+static void __init tl_mr3420v2_setup(void)
+{
+	tl_ap123_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v8_leds_gpio),
+				tl_wr841n_v8_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TL_WR841NV8_KEYS_POLL_INTERVAL,
+				ARRAY_SIZE(tl_mr3420v2_gpio_keys),
+				tl_mr3420v2_gpio_keys);
+
+	/* enable power for the USB port */
+	gpio_request_one(TL_MR3420V2_GPIO_USB_POWER,
+			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_MR3420_V2, "TL-MR3420-v2", "TP-LINK TL-MR3420 v2",
+	     tl_mr3420v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
new file mode 100644
index 00000000..c28afc6c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
@@ -0,0 +1,138 @@
+/*
+ *  TP-LINK TL-WR841N/ND v9
+ *
+ *  Copyright (C) 2014 Matthias Schiffer <mschiffer@universe-factory.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR841NV9_GPIO_LED_WLAN	13
+#define TL_WR841NV9_GPIO_LED_QSS	3
+#define TL_WR841NV9_GPIO_LED_WAN	4
+#define TL_WR841NV9_GPIO_LED_LAN1	16
+#define TL_WR841NV9_GPIO_LED_LAN2	15
+#define TL_WR841NV9_GPIO_LED_LAN3	14
+#define TL_WR841NV9_GPIO_LED_LAN4	11
+
+#define TL_WR841NV9_GPIO_BTN_RESET	12
+#define TL_WR841NV9_GPIO_BTN_WIFI	17
+
+#define TL_WR841NV9_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV9_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr841n_v9_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr841n_v9_flash_data = {
+	.part_probes	= tl_wr841n_v9_part_probes,
+};
+
+static struct gpio_led tl_wr841n_v9_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan1",
+		.gpio		= TL_WR841NV9_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan2",
+		.gpio		= TL_WR841NV9_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan3",
+		.gpio		= TL_WR841NV9_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan4",
+		.gpio		= TL_WR841NV9_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR841NV9_GPIO_LED_QSS,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wan",
+		.gpio		= TL_WR841NV9_GPIO_LED_WAN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR841NV9_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr841n_v9_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841NV9_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "WIFI button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841NV9_GPIO_BTN_WIFI,
+		.active_low	= 1,
+	}
+};
+
+
+static void __init tl_ap143_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 tmpmac[ETH_ALEN];
+
+	ath79_register_m25p80(&tl_wr841n_v9_flash_data);
+
+	ath79_setup_ar933x_phy4_switch(false, false);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN */
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
+	ath79_register_eth(1);
+
+	/* WAN */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_register_eth(0);
+
+	ath79_init_mac(tmpmac, mac, 0);
+	ath79_register_wmac(ee, tmpmac);
+}
+
+static void __init tl_wr841n_v9_setup(void)
+{
+	tl_ap143_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v9_leds_gpio),
+				 tl_wr841n_v9_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr841n_v9_gpio_keys),
+					tl_wr841n_v9_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR841N_V9, "TL-WR841N-v9", "TP-LINK TL-WR841N/ND v9",
+	     tl_wr841n_v9_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n.c
new file mode 100644
index 00000000..11f853f0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n.c
@@ -0,0 +1,140 @@
+/*
+ *  TP-LINK TL-WR841N/ND v1 board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-dsa.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define TL_WR841ND_V1_GPIO_LED_SYSTEM		2
+#define TL_WR841ND_V1_GPIO_LED_QSS_GREEN	4
+#define TL_WR841ND_V1_GPIO_LED_QSS_RED		5
+
+#define TL_WR841ND_V1_GPIO_BTN_RESET		3
+#define TL_WR841ND_V1_GPIO_BTN_QSS		7
+
+#define TL_WR841ND_V1_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR841ND_V1_KEYS_DEBOUNCE_INTERVAL \
+				(3 * TL_WR841ND_V1_KEYS_POLL_INTERVAL)
+
+static struct mtd_partition tl_wr841n_v1_partitions[] = {
+	{
+		.name		= "redboot",
+		.offset		= 0,
+		.size		= 0x020000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "kernel",
+		.offset		= 0x020000,
+		.size		= 0x140000,
+	}, {
+		.name		= "rootfs",
+		.offset		= 0x160000,
+		.size		= 0x280000,
+	}, {
+		.name		= "config",
+		.offset		= 0x3e0000,
+		.size		= 0x020000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x020000,
+		.size		= 0x3c0000,
+	}
+};
+
+static struct flash_platform_data tl_wr841n_v1_flash_data = {
+	.parts		= tl_wr841n_v1_partitions,
+	.nr_parts	= ARRAY_SIZE(tl_wr841n_v1_partitions),
+};
+
+static struct gpio_led tl_wr841n_v1_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR841ND_V1_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:red:qss",
+		.gpio		= TL_WR841ND_V1_GPIO_LED_QSS_RED,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR841ND_V1_GPIO_LED_QSS_GREEN,
+	}
+};
+
+static struct gpio_keys_button tl_wr841n_v1_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR841ND_V1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841ND_V1_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "qss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR841ND_V1_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR841ND_V1_GPIO_BTN_QSS,
+		.active_low	= 1,
+	}
+};
+
+static struct dsa_chip_data tl_wr841n_v1_dsa_chip = {
+	.port_names[0]  = "wan",
+	.port_names[1]  = "lan1",
+	.port_names[2]  = "lan2",
+	.port_names[3]  = "lan3",
+	.port_names[4]  = "lan4",
+	.port_names[5]  = "cpu",
+};
+
+static struct dsa_platform_data tl_wr841n_v1_dsa_data = {
+	.nr_chips	= 1,
+	.chip		= &tl_wr841n_v1_dsa_chip,
+};
+
+static void __init tl_wr841n_v1_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+	ath79_register_dsa(&ath79_eth0_device.dev, &ath79_mdio0_device.dev,
+			   &tl_wr841n_v1_dsa_data);
+
+	ath79_register_m25p80(&tl_wr841n_v1_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v1_leds_gpio),
+				 tl_wr841n_v1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WR841ND_V1_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr841n_v1_gpio_keys),
+					tl_wr841n_v1_gpio_keys);
+	ath79_register_pci();
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR841N_V1, "TL-WR841N-v1.5", "TP-LINK TL-WR841N v1",
+	     tl_wr841n_v1_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd.c
new file mode 100644
index 00000000..1ddeec73
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd.c
@@ -0,0 +1,121 @@
+/*
+ *  TP-LINK TL-WR941ND board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-dsa.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TL_WR941ND_GPIO_LED_SYSTEM	2
+#define TL_WR941ND_GPIO_LED_QSS_RED	4
+#define TL_WR941ND_GPIO_LED_QSS_GREEN	5
+#define TL_WR941ND_GPIO_LED_WLAN	9
+
+#define TL_WR941ND_GPIO_BTN_RESET	3
+#define TL_WR941ND_GPIO_BTN_QSS		7
+
+#define TL_WR941ND_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TL_WR941ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR941ND_KEYS_POLL_INTERVAL)
+
+static const char *tl_wr941nd_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data tl_wr941nd_flash_data = {
+	.part_probes	= tl_wr941nd_part_probes,
+};
+
+static struct gpio_led tl_wr941nd_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR941ND_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:red:qss",
+		.gpio		= TL_WR941ND_GPIO_LED_QSS_RED,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR941ND_GPIO_LED_QSS_GREEN,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR941ND_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button tl_wr941nd_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR941ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR941ND_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "qss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TL_WR941ND_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR941ND_GPIO_BTN_QSS,
+		.active_low	= 1,
+	}
+};
+
+static struct dsa_chip_data tl_wr941nd_dsa_chip = {
+	.port_names[0]  = "wan",
+	.port_names[1]  = "lan1",
+	.port_names[2]  = "lan2",
+	.port_names[3]  = "lan3",
+	.port_names[4]  = "lan4",
+	.port_names[5]  = "cpu",
+};
+
+static struct dsa_platform_data tl_wr941nd_dsa_data = {
+	.nr_chips	= 1,
+	.chip		= &tl_wr941nd_dsa_chip,
+};
+
+static void __init tl_wr941nd_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+	ath79_register_dsa(&ath79_eth0_device.dev, &ath79_mdio0_device.dev,
+			   &tl_wr941nd_dsa_data);
+
+	ath79_register_m25p80(&tl_wr941nd_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr941nd_leds_gpio),
+				 tl_wr941nd_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, TL_WR941ND_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr941nd_gpio_keys),
+					tl_wr941nd_gpio_keys);
+	ath79_register_wmac(eeprom, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR941ND, "TL-WR941ND", "TP-LINK TL-WR941ND",
+	     tl_wr941nd_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tube2h.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tube2h.c
new file mode 100644
index 00000000..b8addad3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tube2h.c
@@ -0,0 +1,113 @@
+/*
+ *  ALFA NETWORK Tube2H board support
+ *
+ *  Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define TUBE2H_GPIO_LED_SIGNAL4		0
+#define TUBE2H_GPIO_LED_SIGNAL3		1
+#define TUBE2H_GPIO_LED_SIGNAL2		13
+#define TUBE2H_GPIO_LED_LAN		17
+#define TUBE2H_GPIO_LED_SIGNAL1		27
+
+#define TUBE2H_GPIO_BTN_RESET		12
+
+#define TUBE2H_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TUBE2H_KEYS_DEBOUNCE_INTERVAL	(3 * TUBE2H_KEYS_POLL_INTERVAL)
+
+#define TUBE2H_ART_ADDRESS		0x1f7f0000
+#define TUBE2H_LAN_MAC_OFFSET		0x06
+#define TUBE2H_CALDATA_OFFSET		0x1000
+
+static struct gpio_led tube2h_leds_gpio[] __initdata = {
+	{
+		.name		= "alfa:blue:lan",
+		.gpio		= TUBE2H_GPIO_LED_LAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "alfa:red:signal1",
+		.gpio		= TUBE2H_GPIO_LED_SIGNAL1,
+		.active_low	= 1,
+	},
+	{
+		.name		= "alfa:orange:signal2",
+		.gpio		= TUBE2H_GPIO_LED_SIGNAL2,
+		.active_low	= 0,
+	},
+	{
+		.name		= "alfa:green:signal3",
+		.gpio		= TUBE2H_GPIO_LED_SIGNAL3,
+		.active_low	= 0,
+	},
+	{
+		.name		= "alfa:green:signal4",
+		.gpio		= TUBE2H_GPIO_LED_SIGNAL4,
+		.active_low	= 0,
+	},
+};
+
+static struct gpio_keys_button tube2h_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TUBE2H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TUBE2H_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+static void __init tube2h_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(TUBE2H_ART_ADDRESS);
+	u32 t;
+
+	ath79_gpio_function_disable(AR933X_GPIO_FUNC_JTAG_DISABLE |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	/* Ensure that GPIO26 and GPIO27 are controllable by software */
+	t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
+	t |= AR933X_BOOTSTRAP_MDIO_GPIO_EN;
+	ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP, t);
+
+	ath79_register_wmac(art + TUBE2H_CALDATA_OFFSET, NULL);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tube2h_leds_gpio),
+				 tube2h_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, TUBE2H_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tube2h_gpio_keys),
+					tube2h_gpio_keys);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+		       art + TUBE2H_LAN_MAC_OFFSET, 0);
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_TUBE2H, "TUBE2H", "ALFA NETWORK Tube2H",
+	     tube2h_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt.c
new file mode 100644
index 00000000..e49ac23f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt.c
@@ -0,0 +1,205 @@
+/*
+ *  Ubiquiti RouterStation support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *  Copyright (C) 2008 Ubiquiti <support@ubnt.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define UBNT_RS_GPIO_LED_RF	2
+#define UBNT_RS_GPIO_SW4	8
+
+#define UBNT_LS_SR71_GPIO_LED_D25	0
+#define UBNT_LS_SR71_GPIO_LED_D26	1
+#define UBNT_LS_SR71_GPIO_LED_D24	2
+#define UBNT_LS_SR71_GPIO_LED_D23	4
+#define UBNT_LS_SR71_GPIO_LED_D22	5
+#define UBNT_LS_SR71_GPIO_LED_D27	6
+#define UBNT_LS_SR71_GPIO_LED_D28	7
+
+#define UBNT_KEYS_POLL_INTERVAL		20	/* msecs */
+#define UBNT_KEYS_DEBOUNCE_INTERVAL	(3 * UBNT_KEYS_POLL_INTERVAL)
+
+static struct gpio_led ubnt_rs_leds_gpio[] __initdata = {
+	{
+		.name		= "ubnt:green:rf",
+		.gpio		= UBNT_RS_GPIO_LED_RF,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_led ubnt_ls_sr71_leds_gpio[] __initdata = {
+	{
+		.name		= "ubnt:green:d22",
+		.gpio		= UBNT_LS_SR71_GPIO_LED_D22,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:green:d23",
+		.gpio		= UBNT_LS_SR71_GPIO_LED_D23,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:green:d24",
+		.gpio		= UBNT_LS_SR71_GPIO_LED_D24,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:red:d25",
+		.gpio		= UBNT_LS_SR71_GPIO_LED_D25,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:red:d26",
+		.gpio		= UBNT_LS_SR71_GPIO_LED_D26,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:green:d27",
+		.gpio		= UBNT_LS_SR71_GPIO_LED_D27,
+		.active_low	= 0,
+	}, {
+		.name		= "ubnt:green:d28",
+		.gpio		= UBNT_LS_SR71_GPIO_LED_D28,
+		.active_low	= 0,
+	}
+};
+
+static struct gpio_keys_button ubnt_gpio_keys[] __initdata = {
+	{
+		.desc		= "sw4",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = UBNT_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= UBNT_RS_GPIO_SW4,
+		.active_low	= 1,
+	}
+};
+
+static const char *ubnt_part_probes[] = {
+	"RedBoot",
+	NULL,
+};
+
+static struct flash_platform_data ubnt_flash_data = {
+	.part_probes	= ubnt_part_probes,
+};
+
+static void __init ubnt_generic_setup(void)
+{
+	ath79_register_m25p80(&ubnt_flash_data);
+
+	ath79_register_gpio_keys_polled(-1, UBNT_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(ubnt_gpio_keys),
+					ubnt_gpio_keys);
+	ath79_register_pci();
+}
+
+#define UBNT_RS_WAN_PHYMASK	BIT(20)
+#define UBNT_RS_LAN_PHYMASK	(BIT(16) | BIT(17) | BIT(18) | BIT(19))
+
+static void __init ubnt_rs_setup(void)
+{
+	ubnt_generic_setup();
+
+	ath79_register_mdio(0, ~(UBNT_RS_WAN_PHYMASK | UBNT_RS_LAN_PHYMASK));
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = UBNT_RS_WAN_PHYMASK;
+
+	/*
+	 * There is Secondary MAC address duplicate problem with some
+	 * UBNT HW batches.  Do not increase Secondary MAC address by 1
+	 * but do workaround with 'Locally Administrated' bit.
+	 */
+	ath79_init_local_mac(ath79_eth1_data.mac_addr, ath79_mac_base);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.speed = SPEED_100;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_rs_leds_gpio),
+				 ubnt_rs_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_UBNT_RS, "UBNT-RS", "Ubiquiti RouterStation",
+	     ubnt_rs_setup);
+
+#define UBNT_RSPRO_WAN_PHYMASK	BIT(4)
+#define UBNT_RSPRO_LAN_PHYMASK	(BIT(0) | BIT(1) | BIT(2) | BIT(3))
+
+static void __init ubnt_rspro_setup(void)
+{
+	ubnt_generic_setup();
+
+	ath79_register_mdio(0, ~(UBNT_RSPRO_WAN_PHYMASK |
+				 UBNT_RSPRO_LAN_PHYMASK));
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = UBNT_RSPRO_WAN_PHYMASK;
+
+	/*
+	 * There is Secondary MAC address duplicate problem with some
+	 * UBNT HW batches.  Do not increase Secondary MAC address by 1
+	 * but do workaround with 'Locally Administrated' bit.
+	 */
+	ath79_init_local_mac(ath79_eth1_data.mac_addr, ath79_mac_base);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = UBNT_RSPRO_LAN_PHYMASK;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_rs_leds_gpio),
+				 ubnt_rs_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_UBNT_RSPRO, "UBNT-RSPRO", "Ubiquiti RouterStation Pro",
+	     ubnt_rspro_setup);
+
+static void __init ubnt_lsx_setup(void)
+{
+	ubnt_generic_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_UBNT_LSX, "UBNT-LSX", "Ubiquiti LSX", ubnt_lsx_setup);
+
+#define UBNT_LSSR71_PHY_MASK	BIT(1)
+
+static void __init ubnt_lssr71_setup(void)
+{
+	ubnt_generic_setup();
+
+	ath79_register_mdio(0, ~UBNT_LSSR71_PHY_MASK);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = UBNT_LSSR71_PHY_MASK;
+
+	ath79_register_eth(0);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_ls_sr71_leds_gpio),
+				 ubnt_ls_sr71_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_UBNT_LSSR71, "UBNT-LS-SR71", "Ubiquiti LS-SR71",
+	     ubnt_lssr71_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
new file mode 100644
index 00000000..48f49ad0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-whr-hp-g300n.c
@@ -0,0 +1,155 @@
+/*
+ *  Buffalo WHR-HP-G300N board support
+ *
+ *  based on ...
+ *
+ *  TP-LINK TL-WR741ND board support
+ *
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+
+#define WHRHPG300N_GPIO_LED_SECURITY		0
+#define WHRHPG300N_GPIO_LED_DIAG		1
+#define WHRHPG300N_GPIO_LED_ROUTER		6
+
+#define WHRHPG300N_GPIO_BTN_ROUTER_ON		7
+#define WHRHPG300N_GPIO_BTN_ROUTER_AUTO		8
+#define WHRHPG300N_GPIO_BTN_RESET		11
+#define WHRHPG300N_GPIO_BTN_AOSS		12
+#define WHRHPG300N_GPIO_LED_LAN1		13
+#define WHRHPG300N_GPIO_LED_LAN2		14
+#define WHRHPG300N_GPIO_LED_LAN3		15
+#define WHRHPG300N_GPIO_LED_LAN4		16
+#define WHRHPG300N_GPIO_LED_WAN			17
+
+#define	WHRHPG300N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WHRHPG300N_KEYS_DEBOUNCE_INTERVAL (3 * WHRHPG300N_KEYS_POLL_INTERVAL)
+
+#define WHRHPG300N_MAC_OFFSET		0x20c
+
+static struct gpio_led whrhpg300n_leds_gpio[] __initdata = {
+	{
+		.name		= "buffalo:orange:security",
+		.gpio		= WHRHPG300N_GPIO_LED_SECURITY,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:red:diag",
+		.gpio		= WHRHPG300N_GPIO_LED_DIAG,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:router",
+		.gpio		= WHRHPG300N_GPIO_LED_ROUTER,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:wan",
+		.gpio		= WHRHPG300N_GPIO_LED_WAN,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:lan1",
+		.gpio		= WHRHPG300N_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:lan2",
+		.gpio		= WHRHPG300N_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:lan3",
+		.gpio		= WHRHPG300N_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:lan4",
+		.gpio		= WHRHPG300N_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button whrhpg300n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WHRHPG300N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WHRHPG300N_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "aoss/wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.gpio		= WHRHPG300N_GPIO_BTN_AOSS,
+		.debounce_interval = WHRHPG300N_KEYS_DEBOUNCE_INTERVAL,
+		.active_low	= 1,
+	}, {
+		.desc		= "router_on",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.gpio		= WHRHPG300N_GPIO_BTN_ROUTER_ON,
+		.debounce_interval = WHRHPG300N_KEYS_DEBOUNCE_INTERVAL,
+		.active_low	= 1,
+	}, {
+		.desc		= "router_auto",
+		.type		= EV_KEY,
+		.code		= BTN_3,
+		.gpio		= WHRHPG300N_GPIO_BTN_ROUTER_AUTO,
+		.debounce_interval = WHRHPG300N_KEYS_DEBOUNCE_INTERVAL,
+		.active_low	= 1,
+	}
+};
+
+static void __init whrhpg300n_setup(void)
+{
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 *mac = (u8 *) KSEG1ADDR(ee + WHRHPG300N_MAC_OFFSET);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(whrhpg300n_leds_gpio),
+				 whrhpg300n_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WHRHPG300N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(whrhpg300n_gpio_keys),
+					whrhpg300n_gpio_keys);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN ports */
+	ath79_register_eth(1);
+	/* WAN port */
+	ath79_register_eth(0);
+
+	ap9x_pci_setup_wmac_led_pin(0, 1);
+
+	ap91_pci_init(ee, mac);
+}
+
+MIPS_MACHINE(ATH79_MACH_WHR_HP_G300N, "WHR-HP-G300N", "Buffalo WHR-HP-G300N",
+	     whrhpg300n_setup);
+
+MIPS_MACHINE(ATH79_MACH_WHR_G301N, "WHR-G301N", "Buffalo WHR-G301N",
+	     whrhpg300n_setup);
+
+MIPS_MACHINE(ATH79_MACH_WHR_HP_GN, "WHR-HP-GN", "Buffalo WHR-HP-GN",
+	     whrhpg300n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlae-ag300n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlae-ag300n.c
new file mode 100644
index 00000000..11006fd1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlae-ag300n.c
@@ -0,0 +1,114 @@
+/*
+ *  Buffalo WLAE-AG300N board support
+ */
+
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define WLAEAG300N_MAC_OFFSET		0x20c
+#define WLAEAG300N_KEYS_POLL_INTERVAL	20      /* msecs */
+#define WLAEAG300N_KEYS_DEBOUNCE_INTERVAL (3 * WLAEAG300N_KEYS_POLL_INTERVAL)
+
+
+static struct gpio_led wlaeag300n_leds_gpio[] __initdata = {
+	/*
+	 * Note: Writing 1 into GPIO 13 will power down the device.
+	 */
+	{
+		.name		= "buffalo:green:wireless",
+		.gpio		= 14,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:red:wireless",
+		.gpio		= 15,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:status",
+		.gpio		= 16,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:red:status",
+		.gpio		= 17,
+		.active_low	= 1,
+	}
+};
+
+
+static struct gpio_keys_button wlaeag300n_gpio_keys[] __initdata = {
+	{
+		.desc		= "function",
+		.type		= EV_KEY,
+		.code		= KEY_MODE,
+		.debounce_interval = WLAEAG300N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 0,
+		.active_low	= 1,
+	}, {
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WLAEAG300N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 1,
+		.active_low	= 1,
+	}, {
+		.desc		= "power",
+		.type		= EV_KEY,
+		.code		= KEY_POWER,
+		.debounce_interval = WLAEAG300N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 11,
+		.active_low	= 1,
+	}, {
+		.desc		= "aoss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WLAEAG300N_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 12,
+		.active_low	= 1,
+	}
+};
+
+static void __init wlaeag300n_setup(void)
+{
+	u8 *eeprom1 = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 *mac1 = eeprom1 + WLAEAG300N_MAC_OFFSET;
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac1, 1);
+
+	ath79_register_mdio(0, ~(BIT(0) | BIT(4)));
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = BIT(4);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wlaeag300n_leds_gpio),
+					wlaeag300n_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WLAEAG300N_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(wlaeag300n_gpio_keys),
+					 wlaeag300n_gpio_keys);
+
+	ath79_register_m25p80(NULL);
+
+	ap91_pci_init(eeprom1, mac1);
+}
+
+MIPS_MACHINE(ATH79_MACH_WLAE_AG300N, "WLAE-AG300N",
+	     "Buffalo WLAE-AG300N", wlaeag300n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
new file mode 100644
index 00000000..88022e75
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
@@ -0,0 +1,205 @@
+/*
+ * Sitecom X8 AC1750 WLR-8100 board support
+ *
+ * Based on the Qualcomm Atheros AP135/AP136 reference board support code
+ * Copyright (c) 2012 Qualcomm Atheros
+ * Copyright (c) 2012-2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WLR8100_GPIO_LED_USB		4
+#define WLR8100_GPIO_LED_WLAN_5G	12
+#define WLR8100_GPIO_LED_WLAN_2G	13
+#define WLR8100_GPIO_LED_STATUS_RED	14
+#define WLR8100_GPIO_LED_WPS_RED	15
+#define WLR8100_GPIO_LED_STATUS_AMBER	19
+#define WLR8100_GPIO_LED_WPS_GREEN	20
+
+#define WLR8100_GPIO_BTN_WPS		16
+#define WLR8100_GPIO_BTN_RFKILL		21
+
+#define WLR8100_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WLR8100_KEYS_DEBOUNCE_INTERVAL	(3 * WLR8100_KEYS_POLL_INTERVAL)
+
+#define WLR8100_MAC0_OFFSET		0
+#define WLR8100_MAC1_OFFSET		6
+#define WLR8100_WMAC_CALDATA_OFFSET	0x1000
+#define WLR8100_PCIE_CALDATA_OFFSET	0x5000
+
+static struct gpio_led wlr8100_leds_gpio[] __initdata = {
+	{
+		.name		= "wlr8100:amber:status",
+		.gpio		= WLR8100_GPIO_LED_STATUS_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wlr8100:red:status",
+		.gpio		= WLR8100_GPIO_LED_STATUS_RED,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wlr8100:green:wps",
+		.gpio		= WLR8100_GPIO_LED_WPS_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wlr8100:red:wps",
+		.gpio		= WLR8100_GPIO_LED_WPS_RED,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wlr8100:red:wlan-2g",
+		.gpio		= WLR8100_GPIO_LED_WLAN_2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wlr8100:red:usb",
+		.gpio		= WLR8100_GPIO_LED_USB,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wlr8100_gpio_keys[] __initdata = {
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WLR8100_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WLR8100_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "RFKILL button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = WLR8100_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WLR8100_GPIO_BTN_RFKILL,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg wlr8100_ar8327_pad0_cfg;
+static struct ar8327_pad_cfg wlr8100_ar8327_pad6_cfg;
+
+static struct ar8327_platform_data wlr8100_ar8327_data = {
+	.pad0_cfg = &wlr8100_ar8327_pad0_cfg,
+	.pad6_cfg = &wlr8100_ar8327_pad6_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.port6_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+};
+
+static struct mdio_board_info wlr8100_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &wlr8100_ar8327_data,
+	},
+};
+
+static void __init wlr8100_common_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wlr8100_leds_gpio),
+				 wlr8100_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WLR8100_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wlr8100_gpio_keys),
+					wlr8100_gpio_keys);
+
+	ath79_register_usb();
+
+	ath79_register_wmac(art + WLR8100_WMAC_CALDATA_OFFSET, NULL);
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art + WLR8100_MAC0_OFFSET, 0);
+
+	mdiobus_register_board_info(wlr8100_mdio0_info,
+				    ARRAY_SIZE(wlr8100_mdio0_info));
+
+	/* GMAC0 is connected to the RMGII interface */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected tot eh SGMII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(1);
+}
+
+static void __init wlr8100_010_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	/* GMAC0 of the AR8337 switch is connected to GMAC0 via RGMII */
+	wlr8100_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_RGMII;
+	wlr8100_ar8327_pad0_cfg.txclk_delay_en = true;
+	wlr8100_ar8327_pad0_cfg.rxclk_delay_en = true;
+	wlr8100_ar8327_pad0_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
+	wlr8100_ar8327_pad0_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
+
+	/* GMAC6 of the AR8337 switch is connected to GMAC1 via SGMII */
+	wlr8100_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_SGMII;
+	wlr8100_ar8327_pad6_cfg.rxclk_delay_en = true;
+	wlr8100_ar8327_pad6_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL0;
+
+	ath79_eth0_pll_data.pll_1000 = 0xa6000000;
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+	wlr8100_common_setup();
+	ap91_pci_init(art + WLR8100_PCIE_CALDATA_OFFSET, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_WLR8100, "WLR8100",
+	     "Sitecom WLR-8100",
+	     wlr8100_010_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
new file mode 100644
index 00000000..e70d88b4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
@@ -0,0 +1,105 @@
+/*
+ *  Netgear WNDAP360 board support (proper leds / button support missing)
+ *
+ *  Based on AP96
+ *  Copyright (C) 2013 Jacek Kikiewicz
+ *  Copyright (C) 2009 Marco Porsch
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2010 Atheros Communications
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+
+#define WNDAP360_GPIO_LED_POWER_ORANGE		0
+#define WNDAP360_GPIO_LED_POWER_GREEN		2
+
+/* Reset button - next to the power connector */
+#define WNDAP360_GPIO_BTN_RESET			8
+
+#define WNDAP360_KEYS_POLL_INTERVAL		20	/* msecs */
+#define WNDAP360_KEYS_DEBOUNCE_INTERVAL	(3 * WNDAP360_KEYS_POLL_INTERVAL)
+
+#define WNDAP360_WMAC0_MAC_OFFSET		0x120c
+#define WNDAP360_WMAC1_MAC_OFFSET		0x520c
+#define WNDAP360_CALDATA0_OFFSET		0x1000
+#define WNDAP360_CALDATA1_OFFSET		0x5000
+
+/*
+ * WNDAP360 this still uses leds definitions from AP96
+ *
+ */
+static struct gpio_led wndap360_leds_gpio[] __initdata = {
+	{
+		.name		= "netgear:green:power",
+		.gpio		= WNDAP360_GPIO_LED_POWER_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:orange:power",
+		.gpio		= WNDAP360_GPIO_LED_POWER_ORANGE,
+		.active_low	= 1,
+        }
+};
+
+static struct gpio_keys_button wndap360_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WNDAP360_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNDAP360_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+#define WNDAP360_LAN_PHYMASK 0x0f
+
+static void __init wndap360_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_mdio(0, ~(WNDAP360_LAN_PHYMASK));
+
+	/* Reusing wifi MAC with offset of 1 as eth0 MAC */
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+		       art + WNDAP360_WMAC0_MAC_OFFSET, 1);
+	ath79_eth0_pll_data.pll_1000 = 0x11110000;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = WNDAP360_LAN_PHYMASK;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wndap360_leds_gpio),
+					wndap360_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WNDAP360_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(wndap360_gpio_keys),
+					 wndap360_gpio_keys);
+
+	ap9x_pci_setup_wmac_led_pin(0, 5);
+	ap9x_pci_setup_wmac_led_pin(1, 5);
+
+	ap94_pci_init(art + WNDAP360_CALDATA0_OFFSET,
+		      art + WNDAP360_WMAC0_MAC_OFFSET,
+		      art + WNDAP360_CALDATA1_OFFSET,
+		      art + WNDAP360_WMAC1_MAC_OFFSET);
+}
+
+MIPS_MACHINE(ATH79_MACH_WNDAP360, "WNDAP360", "Netgear WNDAP360", wndap360_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
new file mode 100644
index 00000000..1315bab0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
@@ -0,0 +1,172 @@
+/*
+ *  Netgear WNDR3700 board support
+ *
+ *  Copyright (C) 2009 Marco Porsch
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/delay.h>
+#include <linux/rtl8366.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define WNDR3700_GPIO_LED_WPS_ORANGE	0
+#define WNDR3700_GPIO_LED_POWER_ORANGE	1
+#define WNDR3700_GPIO_LED_POWER_GREEN	2
+#define WNDR3700_GPIO_LED_WPS_GREEN	4
+#define WNDR3700_GPIO_LED_WAN_GREEN	6
+
+#define WNDR3700_GPIO_BTN_WPS		3
+#define WNDR3700_GPIO_BTN_RESET		8
+#define WNDR3700_GPIO_BTN_WIFI		11
+
+#define WNDR3700_GPIO_RTL8366_SDA	5
+#define WNDR3700_GPIO_RTL8366_SCK	7
+
+#define WNDR3700_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WNDR3700_KEYS_DEBOUNCE_INTERVAL (3 * WNDR3700_KEYS_POLL_INTERVAL)
+
+#define WNDR3700_ETH0_MAC_OFFSET	0
+#define WNDR3700_ETH1_MAC_OFFSET	0x6
+
+#define WNDR3700_WMAC0_MAC_OFFSET	0
+#define WNDR3700_WMAC1_MAC_OFFSET	0xc
+#define WNDR3700_CALDATA0_OFFSET	0x1000
+#define WNDR3700_CALDATA1_OFFSET	0x5000
+
+static struct gpio_led wndr3700_leds_gpio[] __initdata = {
+	{
+		.name		= "netgear:green:power",
+		.gpio		= WNDR3700_GPIO_LED_POWER_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:orange:power",
+		.gpio		= WNDR3700_GPIO_LED_POWER_ORANGE,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:wps",
+		.gpio		= WNDR3700_GPIO_LED_WPS_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:orange:wps",
+		.gpio		= WNDR3700_GPIO_LED_WPS_ORANGE,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:wan",
+		.gpio		= WNDR3700_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wndr3700_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WNDR3700_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNDR3700_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WNDR3700_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNDR3700_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}, {
+		.desc		= "wifi",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = WNDR3700_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNDR3700_GPIO_BTN_WIFI,
+		.active_low	= 1,
+	}
+};
+
+static struct rtl8366_platform_data wndr3700_rtl8366s_data = {
+	.gpio_sda	= WNDR3700_GPIO_RTL8366_SDA,
+	.gpio_sck	= WNDR3700_GPIO_RTL8366_SCK,
+};
+
+static struct platform_device wndr3700_rtl8366s_device = {
+	.name		= RTL8366S_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &wndr3700_rtl8366s_data,
+	}
+};
+
+static void __init wndr3700_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	/*
+	 * The eth0 and wmac0 interfaces share the same MAC address which
+	 * can lead to problems if operated unbridged. Set the locally
+	 * administered bit on the eth0 MAC to make it unique.
+	 */
+	ath79_init_local_mac(ath79_eth0_data.mac_addr,
+			     art + WNDR3700_ETH0_MAC_OFFSET);
+	ath79_eth0_pll_data.pll_1000 = 0x11110000;
+	ath79_eth0_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev;
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr,
+			art + WNDR3700_ETH1_MAC_OFFSET, 0);
+	ath79_eth1_pll_data.pll_1000 = 0x11110000;
+	ath79_eth1_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev;
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wndr3700_leds_gpio),
+				 wndr3700_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WNDR3700_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wndr3700_gpio_keys),
+					wndr3700_gpio_keys);
+
+	platform_device_register(&wndr3700_rtl8366s_device);
+	platform_device_register_simple("wndr3700-led-usb", -1, NULL, 0);
+
+	ap9x_pci_setup_wmac_led_pin(0, 5);
+	ap9x_pci_setup_wmac_led_pin(1, 5);
+
+	/* 2.4 GHz uses the first fixed antenna group (1, 0, 1, 0) */
+	ap9x_pci_setup_wmac_gpio(0, (0xf << 6), (0xa << 6));
+
+	/* 5 GHz uses the second fixed antenna group (0, 1, 1, 0) */
+	ap9x_pci_setup_wmac_gpio(1, (0xf << 6), (0x6 << 6));
+
+	ap94_pci_init(art + WNDR3700_CALDATA0_OFFSET,
+		      art + WNDR3700_WMAC0_MAC_OFFSET,
+		      art + WNDR3700_CALDATA1_OFFSET,
+		      art + WNDR3700_WMAC1_MAC_OFFSET);
+}
+
+MIPS_MACHINE(ATH79_MACH_WNDR3700, "WNDR3700",
+	     "NETGEAR WNDR3700/WNDR3800/WNDRMAC",
+	     wndr3700_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
new file mode 100644
index 00000000..2884c6c8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
@@ -0,0 +1,210 @@
+/*
+ *  NETGEAR WNDR3700v4/WNDR4300 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2014 Ralph Perlich <rpsoft@arcor.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/platform/ar934x_nfc.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-nfc.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+/* AR9344 GPIOs */
+#define WNDR4300_GPIO_LED_POWER_GREEN	0
+#define WNDR4300_GPIO_LED_POWER_AMBER	2
+#define WNDR4300_GPIO_LED_USB		13
+#define WNDR4300_GPIO_LED_WAN_GREEN	1
+#define WNDR4300_GPIO_LED_WAN_AMBER	3
+#define WNDR4300_GPIO_LED_WLAN2G	11
+#define WNDR4300_GPIO_LED_WLAN5G	14
+#define WNDR4300_GPIO_LED_WPS_GREEN	16
+#define WNDR4300_GPIO_LED_WPS_AMBER	17
+
+#define WNDR4300_GPIO_BTN_RESET		21
+#define WNDR4300_GPIO_BTN_WIRELESS	15
+#define WNDR4300_GPIO_BTN_WPS		12
+
+/* AR9580 GPIOs */
+#define WNDR4300_GPIO_USB_5V		0
+
+#define WNDR4300_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WNDR4300_KEYS_DEBOUNCE_INTERVAL	(3 * WNDR4300_KEYS_POLL_INTERVAL)
+
+static struct gpio_led wndr4300_leds_gpio[] __initdata = {
+	{
+		.name		= "netgear:green:power",
+		.gpio		= WNDR4300_GPIO_LED_POWER_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:amber:power",
+		.gpio		= WNDR4300_GPIO_LED_POWER_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:green:wan",
+		.gpio		= WNDR4300_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:amber:wan",
+		.gpio		= WNDR4300_GPIO_LED_WAN_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:green:usb",
+		.gpio		= WNDR4300_GPIO_LED_USB,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:green:wps",
+		.gpio		= WNDR4300_GPIO_LED_WPS_GREEN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:amber:wps",
+		.gpio		= WNDR4300_GPIO_LED_WPS_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:green:wlan2g",
+		.gpio		= WNDR4300_GPIO_LED_WLAN2G,
+		.active_low	= 1,
+	},
+	{
+		.name		= "netgear:blue:wlan5g",
+		.gpio		= WNDR4300_GPIO_LED_WLAN5G,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNDR4300_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNDR4300_GPIO_BTN_WPS,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "Wireless button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNDR4300_GPIO_BTN_WIRELESS,
+		.active_low	= 1,
+	},
+};
+
+static struct ar8327_pad_cfg wndr4300_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_led_cfg wndr4300_ar8327_led_cfg = {
+	.led_ctrl0 = 0xc737c737,
+	.led_ctrl1 = 0x00000000,
+	.led_ctrl2 = 0x00000000,
+	.led_ctrl3 = 0x0030c300,
+	.open_drain = false,
+};
+
+static struct ar8327_platform_data wndr4300_ar8327_data = {
+	.pad0_cfg = &wndr4300_ar8327_pad0_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &wndr4300_ar8327_led_cfg,
+};
+
+static struct mdio_board_info wndr4300_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &wndr4300_ar8327_data,
+	},
+};
+
+static void __init wndr4300_setup(void)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(wndr4300_leds_gpio); i++)
+		ath79_gpio_output_select(wndr4300_leds_gpio[i].gpio,
+					 AR934X_GPIO_OUT_GPIO);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wndr4300_leds_gpio),
+				 wndr4300_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WNDR4300_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wndr4300_gpio_keys),
+					wndr4300_gpio_keys);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
+
+	mdiobus_register_board_info(wndr4300_mdio0_info,
+				    ARRAY_SIZE(wndr4300_mdio0_info));
+
+	ath79_register_mdio(0, 0x0);
+
+	/* GMAC0 is connected to an AR8327N switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x06000000;
+	ath79_register_eth(0);
+
+	ath79_nfc_set_ecc_mode(AR934X_NFC_ECC_HW);
+	ath79_register_nfc();
+	ath79_register_usb();
+
+	ath79_register_wmac_simple();
+
+	/* enable power for the USB port */
+	ap9x_pci_setup_wmac_gpio(0, BIT(WNDR4300_GPIO_USB_5V),
+				 BIT(WNDR4300_GPIO_USB_5V));
+
+	ap91_pci_init_simple();
+}
+
+MIPS_MACHINE(ATH79_MACH_WNDR3700_V4, "WNDR3700_V4", "NETGEAR WNDR3700v4",
+	     wndr4300_setup);
+MIPS_MACHINE(ATH79_MACH_WNDR4300, "WNDR4300", "NETGEAR WNDR4300",
+	     wndr4300_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c
new file mode 100644
index 00000000..6acd991e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c
@@ -0,0 +1,115 @@
+/*
+ *  NETGEAR WNR2000v3 board support
+ *
+ *  Copytight (C) 2013 Mathieu Olivari <mathieu.olivari@gmail.com>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *  Copyright (C) 2008-2009 Andy Boyett <agb@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+
+#define WNR2000V3_GPIO_LED_WAN_GREEN	0
+#define WNR2000V3_GPIO_LED_LAN1_AMBER	1
+#define WNR2000V3_GPIO_LED_LAN4_AMBER	12
+#define WNR2000V3_GPIO_LED_PWR_GREEN	14
+#define WNR2000V3_GPIO_BTN_WPS		11
+
+#define WNR612V2_GPIO_LED_PWR_GREEN	11
+
+#define WNR2000V3_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WNR2000V3_KEYS_DEBOUNCE_INTERVAL	(3 * WNR2000V3_KEYS_POLL_INTERVAL)
+
+#define WNR2000V3_MAC0_OFFSET		0
+#define WNR2000V3_MAC1_OFFSET		6
+#define WNR2000V3_PCIE_CALDATA_OFFSET	0x1000
+
+static struct gpio_led wnr2000v3_leds_gpio[] __initdata = {
+	{
+		.name		= "wnr2000v3:green:power",
+		.gpio		= WNR2000V3_GPIO_LED_PWR_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "wnr2000v3:green:wan",
+		.gpio		= WNR2000V3_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_led wnr612v2_leds_gpio[] __initdata = {
+	{
+		.name		= "netgear:green:power",
+		.gpio		= WNR612V2_GPIO_LED_PWR_GREEN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wnr2000v3_gpio_keys[] __initdata = {
+	{
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WNR2000V3_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNR2000V3_GPIO_BTN_WPS,
+	}
+};
+
+static void __init wnr_common_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art+WNR2000V3_MAC0_OFFSET, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, art+WNR2000V3_MAC1_OFFSET, 0);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+	ap91_pci_init(art + WNR2000V3_PCIE_CALDATA_OFFSET, NULL);
+}
+
+static void __init wnr2000v3_setup(void)
+{
+	wnr_common_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2000v3_leds_gpio),
+				 wnr2000v3_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WNR2000V3_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wnr2000v3_gpio_keys),
+					wnr2000v3_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_WNR2000_V3, "WNR2000V3", "NETGEAR WNR2000 V3", wnr2000v3_setup);
+
+static void __init wnr612v2_setup(void)
+{
+	wnr_common_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr612v2_leds_gpio),
+				 wnr612v2_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_WNR612_V2, "WNR612V2", "NETGEAR WNR612 V2", wnr612v2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c
new file mode 100644
index 00000000..d8437dce
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c
@@ -0,0 +1,175 @@
+/*
+ *  NETGEAR WNR2000v4 board support
+ *
+ *  Copytight (C) 2014 Michaël Burtin <mburtin@gmail.com>
+ *  Copytight (C) 2013 Mathieu Olivari <mathieu.olivari@gmail.com>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *  Copyright (C) 2008-2009 Andy Boyett <agb@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+/* AR9341 GPIOs */
+#define WNR2000V4_GPIO_LED_WAN_AMBER   22
+#define WNR2000V4_GPIO_LED_WAN_GREEN   17
+#define WNR2000V4_GPIO_LED_WPS 2
+#define WNR2000V4_GPIO_LED_WLAN 12
+#define WNR2000V4_GPIO_LED_LAN1 18
+#define WNR2000V4_GPIO_LED_LAN2 19
+#define WNR2000V4_GPIO_LED_LAN3 20
+#define WNR2000V4_GPIO_LED_LAN4 21
+#define STATUS_LED_GPIO         1
+#define WNR2000V4_GPIO_LED_PWR_GREEN    0
+
+#define WNR2000V4_GPIO_BTN_WPS      3
+#define WNR2000V4_GPIO_BTN_RESET    4
+#define WNR2000V4_GPIO_BTN_WLAN     11
+
+#define WNR2000V4_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WNR2000V4_KEYS_DEBOUNCE_INTERVAL	(3 * WNR2000V4_KEYS_POLL_INTERVAL)
+
+#define WNR2000V4_MAC0_OFFSET		0
+#define WNR2000V4_MAC1_OFFSET		6
+
+static struct gpio_led wnr2000v4_leds_gpio[] __initdata = {
+	{
+		.name		= "wnr2000-v4:green:power",
+		.gpio		= WNR2000V4_GPIO_LED_PWR_GREEN,
+		.active_low	= 1,
+        .default_trigger = "default-on",
+	}, {
+		.name		= "wnr2000-v4:green:wan",
+		.gpio		= WNR2000V4_GPIO_LED_WAN_AMBER,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wnr2000-v4:green:wps",
+		.gpio		= WNR2000V4_GPIO_LED_WPS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wnr2000-v4:amber:status",
+		.gpio		= STATUS_LED_GPIO,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wnr2000-v4:blue:wlan",
+		.gpio		= WNR2000V4_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+	{
+		.name		= "wnr2000-v4:amber:lan1",
+		.gpio		= WNR2000V4_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "wnr2000-v4:amber:lan2",
+		.gpio		= WNR2000V4_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "wnr2000-v4:amber:lan3",
+		.gpio		= WNR2000V4_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "wnr2000-v4:amber:lan4",
+		.gpio		= WNR2000V4_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wnr2000v4_gpio_keys[] __initdata = {
+	{
+		.desc		= "WPS button",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WNR2000V4_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNR2000V4_GPIO_BTN_WPS,
+	},
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WNR2000V4_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNR2000V4_GPIO_BTN_RESET,
+	},
+	{
+		.desc		= "WLAN button",
+		.type		= EV_KEY,
+		.code		= KEY_WLAN,
+		.debounce_interval = WNR2000V4_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNR2000V4_GPIO_BTN_WLAN,
+	},
+};
+
+static void __init wnr_common_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE |
+				   AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	ath79_register_mdio(1, 0x0);
+
+	/* LAN */
+	ath79_init_mac(ath79_eth1_data.mac_addr, art+WNR2000V4_MAC0_OFFSET, 0);
+
+	/* GMAC1 is connected to the internal switch */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+	ath79_register_eth(1);
+
+	/* WAN */
+	ath79_init_mac(ath79_eth0_data.mac_addr, art+WNR2000V4_MAC1_OFFSET, 0);
+
+	/* GMAC0 is connected to the PHY0 of the internal switch */
+	ath79_switch_data.phy4_mii_en = 1;
+	ath79_switch_data.phy_poll_mask = BIT(4);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = BIT(4);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
+
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_register_eth(0);
+
+	/* WLAN */
+	ath79_register_wmac(ee, art+WNR2000V4_MAC0_OFFSET);
+
+	/* USB */
+	ath79_register_usb();
+}
+
+static void __init wnr2000v4_setup(void)
+{
+	wnr_common_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2000v4_leds_gpio),
+				 wnr2000v4_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WNR2000V4_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wnr2000v4_gpio_keys),
+					wnr2000v4_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_WNR2000_V4, "WNR2000V4", "NETGEAR WNR2000 V4", wnr2000v4_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000.c
new file mode 100644
index 00000000..b4da7ece
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000.c
@@ -0,0 +1,145 @@
+/*
+ *  NETGEAR WNR2000 board support
+ *
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *  Copyright (C) 2008-2009 Andy Boyett <agb@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WNR2000_GPIO_LED_PWR_GREEN	14
+#define WNR2000_GPIO_LED_PWR_AMBER	7
+#define WNR2000_GPIO_LED_WPS		4
+#define WNR2000_GPIO_LED_WLAN		6
+#define WNR2000_GPIO_BTN_RESET		21
+#define WNR2000_GPIO_BTN_WPS		8
+
+#define WNR2000_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WNR2000_KEYS_DEBOUNCE_INTERVAL	(3 * WNR2000_KEYS_POLL_INTERVAL)
+
+static struct mtd_partition wnr2000_partitions[] = {
+	{
+		.name		= "u-boot",
+		.offset		= 0,
+		.size		= 0x040000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "u-boot-env",
+		.offset		= 0x040000,
+		.size		= 0x010000,
+	}, {
+		.name		= "rootfs",
+		.offset		= 0x050000,
+		.size		= 0x240000,
+	}, {
+		.name		= "user-config",
+		.offset		= 0x290000,
+		.size		= 0x010000,
+	}, {
+		.name		= "uImage",
+		.offset		= 0x2a0000,
+		.size		= 0x120000,
+	}, {
+		.name		= "language_table",
+		.offset		= 0x3c0000,
+		.size		= 0x020000,
+	}, {
+		.name		= "rootfs_checksum",
+		.offset		= 0x3e0000,
+		.size		= 0x010000,
+	}, {
+		.name		= "art",
+		.offset		= 0x3f0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}
+};
+
+static struct flash_platform_data wnr2000_flash_data = {
+	.parts		= wnr2000_partitions,
+	.nr_parts	= ARRAY_SIZE(wnr2000_partitions),
+};
+
+static struct gpio_led wnr2000_leds_gpio[] __initdata = {
+	{
+		.name		= "netgear:green:power",
+		.gpio		= WNR2000_GPIO_LED_PWR_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:amber:power",
+		.gpio		= WNR2000_GPIO_LED_PWR_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:wps",
+		.gpio		= WNR2000_GPIO_LED_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:blue:wlan",
+		.gpio		= WNR2000_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wnr2000_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WNR2000_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNR2000_GPIO_BTN_RESET,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WNR2000_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WNR2000_GPIO_BTN_WPS,
+	}
+};
+
+static void __init wnr2000_setup(void)
+{
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, eeprom, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.has_ar8216 = 1;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, eeprom, 1);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(&wnr2000_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2000_leds_gpio),
+				 wnr2000_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WNR2000_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wnr2000_gpio_keys),
+					wnr2000_gpio_keys);
+
+	ath79_register_wmac(eeprom, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_WNR2000, "WNR2000", "NETGEAR WNR2000", wnr2000_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
new file mode 100644
index 00000000..bf7f9ee6
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
@@ -0,0 +1,137 @@
+/*
+ *  NETGEAR WNR2200 board support
+ *
+ *  Copyright (C) 2013 Aidan Kissane <aidankissane at googlemail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define WNR2200_GPIO_LED_LAN2_AMBER	0
+#define WNR2200_GPIO_LED_LAN4_AMBER	1
+#define WNR2200_GPIO_LED_WPS		5
+#define WNR2200_GPIO_LED_WAN_GREEN	7
+#define WNR2200_GPIO_LED_USB		8
+#define WNR2200_GPIO_LED_LAN3_AMBER	11
+#define WNR2200_GPIO_LED_WAN_AMBER	12
+#define WNR2200_GPIO_LED_LAN1_GREEN	13
+#define WNR2200_GPIO_LED_LAN2_GREEN	14
+#define WNR2200_GPIO_LED_LAN3_GREEN	15
+#define WNR2200_GPIO_LED_LAN4_GREEN	16
+#define WNR2200_GPIO_LED_PWR_AMBER	21
+#define WNR2200_GPIO_LED_PWR_GREEN	22
+
+#define WNR2200_GPIO_USB_POWER		24
+
+#define WNR2200_KEYS_POLL_INTERVAL	20 /* msecs */
+#define WNR2200_KEYS_DEBOUNCE_INTERVAL	(3 * WNR2200_KEYS_POLL_INTERVAL)
+
+#define WNR2200_MAC0_OFFSET		0
+#define WNR2200_MAC1_OFFSET		6
+#define WNR2200_PCIE_CALDATA_OFFSET	0x1000
+
+static struct gpio_led wnr2200_leds_gpio[] __initdata = {
+	{
+		.name		= "netgear:amber:lan2",
+		.gpio		= WNR2200_GPIO_LED_LAN2_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:amber:lan4",
+		.gpio		= WNR2200_GPIO_LED_LAN4_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:wps",
+		.gpio		= WNR2200_GPIO_LED_WPS,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:wan",
+		.gpio		= WNR2200_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:usb",
+		.gpio		= WNR2200_GPIO_LED_USB,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:amber:lan3",
+		.gpio		= WNR2200_GPIO_LED_LAN3_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:amber:wan",
+		.gpio		= WNR2200_GPIO_LED_WAN_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:lan1",
+		.gpio		= WNR2200_GPIO_LED_LAN1_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:lan2",
+		.gpio		= WNR2200_GPIO_LED_LAN2_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:lan3",
+		.gpio		= WNR2200_GPIO_LED_LAN3_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:lan4",
+		.gpio		= WNR2200_GPIO_LED_LAN4_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:amber:power",
+		.gpio		= WNR2200_GPIO_LED_PWR_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "netgear:green:power",
+		.gpio		= WNR2200_GPIO_LED_PWR_GREEN,
+		.active_low	= 1,
+	}
+};
+
+static void __init wnr2200_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, art+WNR2200_MAC0_OFFSET, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, art+WNR2200_MAC1_OFFSET, 0);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(NULL);
+	ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET, NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2200_leds_gpio),
+					wnr2200_leds_gpio);
+
+	/* enable power for the USB port */
+	gpio_request_one(WNR2200_GPIO_USB_POWER,
+			GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			"USB power");
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_WNR2200, "WNR2200", "NETGEAR WNR2200", wnr2200_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wp543.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wp543.c
new file mode 100644
index 00000000..dc4aee0c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wp543.c
@@ -0,0 +1,109 @@
+/*
+ *  Compex WP543/WPJ543 board support
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define WP543_GPIO_SW6		2
+#define WP543_GPIO_LED_1	3
+#define WP543_GPIO_LED_2	4
+#define WP543_GPIO_LED_WLAN	5
+#define WP543_GPIO_LED_CONN	6
+#define WP543_GPIO_LED_DIAG	7
+#define WP543_GPIO_SW4		8
+
+#define WP543_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WP543_KEYS_DEBOUNCE_INTERVAL	(3 * WP543_KEYS_POLL_INTERVAL)
+
+static struct gpio_led wp543_leds_gpio[] __initdata = {
+	{
+		.name		= "wp543:green:led1",
+		.gpio		= WP543_GPIO_LED_1,
+		.active_low	= 1,
+	}, {
+		.name		= "wp543:green:led2",
+		.gpio		= WP543_GPIO_LED_2,
+		.active_low	= 1,
+	}, {
+		.name		= "wp543:green:wlan",
+		.gpio		= WP543_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "wp543:green:conn",
+		.gpio		= WP543_GPIO_LED_CONN,
+		.active_low	= 1,
+	}, {
+		.name		= "wp543:green:diag",
+		.gpio		= WP543_GPIO_LED_DIAG,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wp543_gpio_keys[] __initdata = {
+	{
+		.desc		= "sw6",
+		.type		= EV_KEY,
+		.code		= BTN_0,
+		.debounce_interval = WP543_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WP543_GPIO_SW6,
+		.active_low	= 1,
+	}, {
+		.desc		= "sw4",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WP543_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WP543_GPIO_SW4,
+		.active_low	= 1,
+	}
+};
+
+static const char *wp543_part_probes[] = {
+	"MyLoader",
+	NULL,
+};
+
+static struct flash_platform_data wp543_flash_data = {
+	.part_probes	= wp543_part_probes,
+};
+
+static void __init wp543_setup(void)
+{
+	ath79_register_m25p80(&wp543_flash_data);
+
+	ath79_register_mdio(0, 0xfffffff0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.phy_mask = 0x0f;
+	ath79_eth0_data.reset_bit = AR71XX_RESET_GE0_MAC |
+				    AR71XX_RESET_GE0_PHY;
+	ath79_register_eth(0);
+
+	ath79_register_usb();
+	ath79_register_pci();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wp543_leds_gpio),
+					wp543_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WP543_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(wp543_gpio_keys),
+					 wp543_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_WP543, "WP543", "Compex WP543", wp543_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wpe72.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wpe72.c
new file mode 100644
index 00000000..70bf7db0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wpe72.c
@@ -0,0 +1,97 @@
+/*
+ *  Compex WPE72 board support
+ *
+ *  Copyright (C) 2012 Johnathan Boyce<jon.boyce@globalreach.eu.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include<asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define WPE72_GPIO_RESET	12
+#define WPE72_GPIO_LED_DIAG	13
+#define WPE72_GPIO_LED_1	14
+#define WPE72_GPIO_LED_2	15
+#define WPE72_GPIO_LED_3	16
+#define WPE72_GPIO_LED_4	17
+
+#define WPE72_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WPE72_KEYS_DEBOUNCE_INTERVAL	(3 * WPE72_KEYS_POLL_INTERVAL)
+
+static struct gpio_led wpe72_leds_gpio[] __initdata = {
+	{
+		.name		= "wpe72:green:led1",
+		.gpio		= WPE72_GPIO_LED_1,
+		.active_low	= 1,
+	}, {
+		.name		= "wpe72:green:led2",
+		.gpio		= WPE72_GPIO_LED_2,
+		.active_low	= 1,
+	}, {
+		.name		= "wpe72:green:led3",
+		.gpio		= WPE72_GPIO_LED_3,
+		.active_low	= 1,
+	}, {
+		.name		= "wpe72:green:led4",
+		.gpio		= WPE72_GPIO_LED_4,
+		.active_low	= 1,
+	}, {
+		.name		= "wpe72:green:diag",
+		.gpio		= WPE72_GPIO_LED_DIAG,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wpe72_gpio_keys[] __initdata = {
+	{
+		.desc           = "reset",
+		.type           = EV_KEY,
+		.code           = KEY_RESTART,
+		.debounce_interval = WPE72_KEYS_DEBOUNCE_INTERVAL,
+		.gpio           = WPE72_GPIO_RESET,
+		.active_low	= 1,
+	}
+};
+
+static const char *wpe72_part_probes[] = {
+	"MyLoader",
+	NULL,
+};
+
+static struct flash_platform_data wpe72_flash_data = {
+	.part_probes	= wpe72_part_probes,
+};
+
+static void __init wpe72_setup(void)
+{
+	ath79_register_m25p80(&wpe72_flash_data);
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+	ath79_register_pci();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wpe72_leds_gpio),
+				 wpe72_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WPE72_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wpe72_gpio_keys),
+					wpe72_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_WPE72, "WPE72", "Compex WPE72", wpe72_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c
new file mode 100644
index 00000000..21aefe00
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt160nl.c
@@ -0,0 +1,126 @@
+/*
+ *  Linksys WRT160NL board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "nvram.h"
+#include "machtypes.h"
+
+#define WRT160NL_GPIO_LED_POWER		14
+#define WRT160NL_GPIO_LED_WPS_AMBER	9
+#define WRT160NL_GPIO_LED_WPS_BLUE	8
+#define WRT160NL_GPIO_LED_WLAN		6
+
+#define WRT160NL_GPIO_BTN_WPS		7
+#define WRT160NL_GPIO_BTN_RESET		21
+
+#define WRT160NL_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WRT160NL_KEYS_DEBOUNCE_INTERVAL	(3 * WRT160NL_KEYS_POLL_INTERVAL)
+
+#define WRT160NL_NVRAM_ADDR	0x1f7e0000
+#define WRT160NL_NVRAM_SIZE	0x10000
+
+static const char *wrt160nl_part_probes[] = {
+	"wrt160nl",
+	NULL,
+};
+
+static struct flash_platform_data wrt160nl_flash_data = {
+	.part_probes	= wrt160nl_part_probes,
+};
+
+static struct gpio_led wrt160nl_leds_gpio[] __initdata = {
+	{
+		.name		= "wrt160nl:blue:power",
+		.gpio		= WRT160NL_GPIO_LED_POWER,
+		.active_low	= 1,
+		.default_trigger = "default-on",
+	}, {
+		.name		= "wrt160nl:amber:wps",
+		.gpio		= WRT160NL_GPIO_LED_WPS_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "wrt160nl:blue:wps",
+		.gpio		= WRT160NL_GPIO_LED_WPS_BLUE,
+		.active_low	= 1,
+	}, {
+		.name		= "wrt160nl:blue:wlan",
+		.gpio		= WRT160NL_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wrt160nl_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WRT160NL_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WRT160NL_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wps",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WRT160NL_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WRT160NL_GPIO_BTN_WPS,
+		.active_low	= 1,
+	}
+};
+
+static void __init wrt160nl_setup(void)
+{
+	const char *nvram = (char *) KSEG1ADDR(WRT160NL_NVRAM_ADDR);
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 mac[6];
+
+	if (ath79_nvram_parse_mac_addr(nvram, WRT160NL_NVRAM_SIZE,
+				       "lan_hwaddr=", mac) == 0) {
+		ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+		ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+	}
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.phy_mask = 0x01;
+
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(&wrt160nl_flash_data);
+
+	ath79_register_usb();
+
+	if (ath79_nvram_parse_mac_addr(nvram, WRT160NL_NVRAM_SIZE,
+				       "wl0_hwaddr=", mac) == 0)
+		ath79_register_wmac(eeprom, mac);
+	else
+		ath79_register_wmac(eeprom, NULL);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wrt160nl_leds_gpio),
+				 wrt160nl_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WRT160NL_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wrt160nl_gpio_keys),
+					wrt160nl_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_WRT160NL, "WRT160NL", "Linksys WRT160NL",
+	     wrt160nl_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt400n.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt400n.c
new file mode 100644
index 00000000..6c4c1cb0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wrt400n.c
@@ -0,0 +1,161 @@
+/*
+ *  Linksys WRT400N board support
+ *
+ *  Copyright (C) 2009-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "machtypes.h"
+
+#define WRT400N_GPIO_LED_POWER		1
+#define WRT400N_GPIO_LED_WPS_BLUE	4
+#define WRT400N_GPIO_LED_WPS_AMBER	5
+#define WRT400N_GPIO_LED_WLAN		6
+
+#define WRT400N_GPIO_BTN_RESET		8
+#define WRT400N_GPIO_BTN_WLSEC		3
+
+#define WRT400N_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WRT400N_KEYS_DEBOUNE_INTERVAL	(3 * WRT400N_KEYS_POLL_INTERVAL)
+
+#define WRT400N_MAC_ADDR_OFFSET		0x120c
+#define WRT400N_CALDATA0_OFFSET		0x1000
+#define WRT400N_CALDATA1_OFFSET		0x5000
+
+static struct mtd_partition wrt400n_partitions[] = {
+	{
+		.name		= "uboot",
+		.offset		= 0,
+		.size		= 0x030000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "env",
+		.offset		= 0x030000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "linux",
+		.offset		= 0x040000,
+		.size		= 0x140000,
+	}, {
+		.name		= "rootfs",
+		.offset		= 0x180000,
+		.size		= 0x630000,
+	}, {
+		.name		= "nvram",
+		.offset		= 0x7b0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "factory",
+		.offset		= 0x7c0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "language",
+		.offset		= 0x7d0000,
+		.size		= 0x020000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "caldata",
+		.offset		= 0x7f0000,
+		.size		= 0x010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x040000,
+		.size		= 0x770000,
+	}
+};
+
+static struct flash_platform_data wrt400n_flash_data = {
+	.parts		= wrt400n_partitions,
+	.nr_parts	= ARRAY_SIZE(wrt400n_partitions),
+};
+
+static struct gpio_led wrt400n_leds_gpio[] __initdata = {
+	{
+		.name		= "wrt400n:blue:wps",
+		.gpio		= WRT400N_GPIO_LED_WPS_BLUE,
+		.active_low	= 1,
+	}, {
+		.name		= "wrt400n:amber:wps",
+		.gpio		= WRT400N_GPIO_LED_WPS_AMBER,
+		.active_low	= 1,
+	}, {
+		.name		= "wrt400n:blue:wlan",
+		.gpio		= WRT400N_GPIO_LED_WLAN,
+		.active_low	= 1,
+	}, {
+		.name		= "wrt400n:blue:power",
+		.gpio		= WRT400N_GPIO_LED_POWER,
+		.active_low	= 0,
+		.default_trigger = "default-on",
+	}
+};
+
+static struct gpio_keys_button wrt400n_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WRT400N_KEYS_DEBOUNE_INTERVAL,
+		.gpio		= WRT400N_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "wlsec",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WRT400N_KEYS_DEBOUNE_INTERVAL,
+		.gpio		= WRT400N_GPIO_BTN_WLSEC,
+		.active_low	= 1,
+	}
+};
+
+static void __init wrt400n_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 *mac = art + WRT400N_MAC_ADDR_OFFSET;
+
+	ath79_register_mdio(0, 0x0);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 2);
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_m25p80(&wrt400n_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wrt400n_leds_gpio),
+				 wrt400n_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WRT400N_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wrt400n_gpio_keys),
+					wrt400n_gpio_keys);
+
+	ap94_pci_init(art + WRT400N_CALDATA0_OFFSET, NULL,
+		      art + WRT400N_CALDATA1_OFFSET, NULL);
+}
+
+MIPS_MACHINE(ATH79_MACH_WRT400N, "WRT400N", "Linksys WRT400N", wrt400n_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c
new file mode 100644
index 00000000..428876fc
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c
@@ -0,0 +1,221 @@
+/*
+ * Buffalo WZR-450HP2 board support
+ *
+ * Copyright (c) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Based on the Qualcomm Atheros AP135/AP136 reference board support code
+ *   Copyright (c) 2012 Qualcomm Atheros
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WZR_450HP2_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WZR_450HP2_KEYS_DEBOUNCE_INTERVAL (3 * WZR_450HP2_KEYS_POLL_INTERVAL)
+
+#define WZR_450HP2_WMAC_CALDATA_OFFSET	0x1000
+
+static struct mtd_partition wzrhpg450h_partitions[] = {
+	{
+		.name		= "u-boot",
+		.offset		= 0,
+		.size		= 0x0040000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "u-boot-env",
+		.offset		= 0x0040000,
+		.size		= 0x0010000,
+	}, {
+		.name		= "ART",
+		.offset		= 0x0ff0000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x0050000,
+		.size		= 0x0f90000,
+	}, {
+		.name		= "user_property",
+		.offset		= 0x0fe0000,
+		.size		= 0x0010000,
+	}
+};
+
+static struct flash_platform_data wzr_450hp2_flash_data = {
+	.parts		= wzrhpg450h_partitions,
+	.nr_parts	= ARRAY_SIZE(wzrhpg450h_partitions),
+};
+
+static struct gpio_led wzr_450hp2_leds_gpio[] __initdata = {
+	{
+		.name		= "buffalo:green:wps",
+		.gpio		= 3,
+		.active_low	= 1,
+	},
+	{
+		.name		= "buffalo:green:system",
+		.gpio		= 20,
+		.active_low	= 1,
+	},
+	{
+		.name		= "buffalo:green:wlan",
+		.gpio		= 18,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button wzr_450hp2_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WZR_450HP2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 17,
+		.active_low	= 1,
+	},
+	{
+		.desc		= "RFKILL button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = WZR_450HP2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 21,
+		.active_low	= 1,
+	},
+};
+
+static const struct ar8327_led_info wzr_450hp2_leds_ar8327[] = {
+	AR8327_LED_INFO(PHY0_0, HW, "buffalo:green:lan1"),
+	AR8327_LED_INFO(PHY1_0, HW, "buffalo:green:lan2"),
+	AR8327_LED_INFO(PHY2_0, HW, "buffalo:green:lan3"),
+	AR8327_LED_INFO(PHY3_0, HW, "buffalo:green:lan4"),
+	AR8327_LED_INFO(PHY4_0, HW, "buffalo:green:wan"),
+};
+
+/* GMAC0 of the AR8327 switch is connected to the QCA9558 SoC via SGMII */
+static struct ar8327_pad_cfg wzr_450hp2_ar8327_pad0_cfg = {
+	.mode = AR8327_PAD_MAC_SGMII,
+	.sgmii_delay_en = true,
+};
+
+/* GMAC6 of the AR8327 switch is connected to the QCA9558 SoC via RGMII */
+static struct ar8327_pad_cfg wzr_450hp2_ar8327_pad6_cfg = {
+	.mode = AR8327_PAD_MAC_RGMII,
+	.txclk_delay_en = true,
+	.rxclk_delay_en = true,
+	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_led_cfg wzr_450hp2_ar8327_led_cfg = {
+	.led_ctrl0 = 0xcc35cc35,
+	.led_ctrl1 = 0xca35ca35,
+	.led_ctrl2 = 0xc935c935,
+	.led_ctrl3 = 0x03ffff00,
+	.open_drain = true,
+};
+
+static struct ar8327_platform_data wzr_450hp2_ar8327_data = {
+	.pad0_cfg = &wzr_450hp2_ar8327_pad0_cfg,
+	.pad6_cfg = &wzr_450hp2_ar8327_pad6_cfg,
+	.port0_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.port6_cfg = {
+		.force_link = 1,
+		.speed = AR8327_PORT_SPEED_1000,
+		.duplex = 1,
+		.txpause = 1,
+		.rxpause = 1,
+	},
+	.led_cfg = &wzr_450hp2_ar8327_led_cfg,
+	.num_leds = ARRAY_SIZE(wzr_450hp2_leds_ar8327),
+	.leds = wzr_450hp2_leds_ar8327,
+};
+
+static struct mdio_board_info wzr_450hp2_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = &wzr_450hp2_ar8327_data,
+	},
+};
+
+static void __init wzr_450hp2_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+	u8 *mac_wan = art;
+	u8 *mac_lan = mac_wan + ETH_ALEN;
+
+	ath79_register_m25p80(&wzr_450hp2_flash_data);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wzr_450hp2_leds_gpio),
+				 wzr_450hp2_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WZR_450HP2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wzr_450hp2_gpio_keys),
+					wzr_450hp2_gpio_keys);
+
+	ath79_register_wmac(art + WZR_450HP2_WMAC_CALDATA_OFFSET, mac_lan);
+
+	mdiobus_register_board_info(wzr_450hp2_mdio0_info,
+				    ARRAY_SIZE(wzr_450hp2_mdio0_info));
+	ath79_register_mdio(0, 0x0);
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+
+	/* GMAC0 is connected to the RMGII interface */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_eth0_pll_data.pll_1000 = 0x56000000;
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac_wan, 0);
+	ath79_register_eth(0);
+
+	/* GMAC1 is connected to the SGMII interface */
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
+	ath79_eth1_data.speed = SPEED_1000;
+	ath79_eth1_data.duplex = DUPLEX_FULL;
+	ath79_eth1_pll_data.pll_1000 = 0x03000101;
+
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac_lan, 0);
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+}
+
+MIPS_MACHINE(ATH79_MACH_WZR_450HP2, "WZR-450HP2",
+	     "Buffalo WZR-450HP2", wzr_450hp2_setup);
+
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
new file mode 100644
index 00000000..edd48f2a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
@@ -0,0 +1,205 @@
+/*
+ *  Buffalo WZR-HP-AG300H board support
+ *
+ *  Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define WZRHPAG300H_MAC_OFFSET		0x20c
+#define WZRHPAG300H_KEYS_POLL_INTERVAL	20      /* msecs */
+#define WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPAG300H_KEYS_POLL_INTERVAL)
+
+static struct mtd_partition wzrhpag300h_flash_partitions[] = {
+	{
+		.name		= "u-boot",
+		.offset		= 0,
+		.size		= 0x0040000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "u-boot-env",
+		.offset		= 0x0040000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "art",
+		.offset		= 0x0050000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x0060000,
+		.size		= 0x1f90000,
+	}, {
+		.name		= "user_property",
+		.offset		= 0x1ff0000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}
+};
+
+static struct flash_platform_data wzrhpag300h_flash_data = {
+	.parts      = wzrhpag300h_flash_partitions,
+	.nr_parts   = ARRAY_SIZE(wzrhpag300h_flash_partitions),
+};
+
+static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = {
+	{
+		.name		= "buffalo:red:diag",
+		.gpio		= 1,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_led wzrhpag300h_wmac0_leds_gpio[] = {
+        {
+                .name           = "buffalo:amber:band2g",
+                .gpio           = 1,
+                .active_low     = 1,
+	},
+        {
+                .name           = "buffalo:green:usb",
+                .gpio           = 3,
+                .active_low     = 1,
+	},
+        {
+                .name           = "buffalo:green:band2g",
+                .gpio           = 5,
+                .active_low     = 1,
+	},
+};
+
+static struct gpio_led wzrhpag300h_wmac1_leds_gpio[] = {
+        {
+                .name           = "buffalo:green:band5g",
+                .gpio           = 1,
+                .active_low     = 1,
+	},
+        {
+                .name           = "buffalo:green:router",
+                .gpio           = 3,
+                .active_low     = 1,
+	},
+        {
+                .name           = "buffalo:blue:movie_engine",
+                .gpio           = 4,
+                .active_low     = 1,
+	},
+        {
+                .name           = "buffalo:amber:band5g",
+                .gpio           = 5,
+                .active_low     = 1,
+	},
+};
+
+static struct gpio_keys_button wzrhpag300h_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 11,
+		.active_low	= 1,
+	}, {
+		.desc		= "usb",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 3,
+		.active_low	= 1,
+	}, {
+		.desc		= "aoss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 5,
+		.active_low	= 1,
+	}, {
+		.desc		= "router_auto",
+		.type		= EV_SW,
+		.code		= BTN_6,
+		.debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 6,
+		.active_low	= 1,
+	}, {
+		.desc		= "router_off",
+		.type		= EV_SW,
+		.code		= BTN_5,
+		.debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 7,
+		.active_low	= 1,
+	}, {
+		.desc		= "movie_engine",
+		.type		= EV_SW,
+		.code		= BTN_7,
+		.debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 8,
+		.active_low	= 1,
+	}
+};
+
+static void __init wzrhpag300h_setup(void)
+{
+	u8 *eeprom1 = (u8 *) KSEG1ADDR(0x1f051000);
+	u8 *eeprom2 = (u8 *) KSEG1ADDR(0x1f055000);
+	u8 *mac1 = eeprom1 + WZRHPAG300H_MAC_OFFSET;
+	u8 *mac2 = eeprom2 + WZRHPAG300H_MAC_OFFSET;
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 1);
+
+	ath79_register_mdio(0, ~(BIT(0) | BIT(4)));
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = BIT(4);
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	gpio_request_one(2, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpag300h_leds_gpio),
+					wzrhpag300h_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WZRHPAG300H_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(wzrhpag300h_gpio_keys),
+					 wzrhpag300h_gpio_keys);
+
+	ath79_register_m25p80_multi(&wzrhpag300h_flash_data);
+
+	ap94_pci_init(eeprom1, mac1, eeprom2, mac2);
+
+	ap9x_pci_setup_wmac_led_pin(0, 1);
+	ap9x_pci_setup_wmac_led_pin(1, 5);
+
+	ap9x_pci_setup_wmac_leds(0, wzrhpag300h_wmac0_leds_gpio,
+				ARRAY_SIZE(wzrhpag300h_wmac0_leds_gpio));
+	ap9x_pci_setup_wmac_leds(1, wzrhpag300h_wmac1_leds_gpio,
+				ARRAY_SIZE(wzrhpag300h_wmac1_leds_gpio));
+}
+
+MIPS_MACHINE(ATH79_MACH_WZR_HP_AG300H, "WZR-HP-AG300H",
+	     "Buffalo WZR-HP-AG300H/WZR-600DHP", wzrhpag300h_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh.c
new file mode 100644
index 00000000..0a3eba9f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh.c
@@ -0,0 +1,279 @@
+/*
+ *  Buffalo WZR-HP-G300NH board support
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/nxp_74hc153.h>
+#include <linux/rtl8366.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WZRHPG300NH_GPIO_LED_USB	0
+#define WZRHPG300NH_GPIO_LED_DIAG	1
+#define WZRHPG300NH_GPIO_LED_WIRELESS	6
+#define WZRHPG300NH_GPIO_LED_SECURITY	17
+#define WZRHPG300NH_GPIO_LED_ROUTER	18
+
+#define WZRHPG300NH_GPIO_RTL8366_SDA	19
+#define WZRHPG300NH_GPIO_RTL8366_SCK	20
+
+#define WZRHPG300NH_GPIO_74HC153_S0	9
+#define WZRHPG300NH_GPIO_74HC153_S1	11
+#define WZRHPG300NH_GPIO_74HC153_1Y	12
+#define WZRHPG300NH_GPIO_74HC153_2Y	14
+
+#define WZRHPG300NH_GPIO_EXP_BASE	32
+#define WZRHPG300NH_GPIO_BTN_AOSS	(WZRHPG300NH_GPIO_EXP_BASE + 0)
+#define WZRHPG300NH_GPIO_BTN_RESET	(WZRHPG300NH_GPIO_EXP_BASE + 1)
+#define WZRHPG300NH_GPIO_BTN_ROUTER_ON	(WZRHPG300NH_GPIO_EXP_BASE + 2)
+#define WZRHPG300NH_GPIO_BTN_QOS_ON	(WZRHPG300NH_GPIO_EXP_BASE + 3)
+#define WZRHPG300NH_GPIO_BTN_USB	(WZRHPG300NH_GPIO_EXP_BASE + 5)
+#define WZRHPG300NH_GPIO_BTN_ROUTER_AUTO (WZRHPG300NH_GPIO_EXP_BASE + 6)
+#define WZRHPG300NH_GPIO_BTN_QOS_OFF	(WZRHPG300NH_GPIO_EXP_BASE + 7)
+
+#define WZRHPG300NH_KEYS_POLL_INTERVAL	20	/* msecs */
+#define WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPG300NH_KEYS_POLL_INTERVAL)
+
+#define WZRHPG300NH_MAC_OFFSET		0x20c
+
+static struct mtd_partition wzrhpg300nh_flash_partitions[] = {
+	{
+		.name		= "u-boot",
+		.offset		= 0,
+		.size		= 0x0040000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "u-boot-env",
+		.offset		= 0x0040000,
+		.size		= 0x0020000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x0060000,
+		.size		= 0x1f60000,
+	}, {
+		.name		= "user_property",
+		.offset		= 0x1fc0000,
+		.size		= 0x0020000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "art",
+		.offset		= 0x1fe0000,
+		.size		= 0x0020000,
+		.mask_flags	= MTD_WRITEABLE,
+	}
+};
+
+static struct physmap_flash_data wzrhpg300nh_flash_data = {
+	.width		= 2,
+	.parts		= wzrhpg300nh_flash_partitions,
+	.nr_parts	= ARRAY_SIZE(wzrhpg300nh_flash_partitions),
+};
+
+#define WZRHPG300NH_FLASH_BASE	0x1e000000
+#define WZRHPG300NH_FLASH_SIZE	(32 * 1024 * 1024)
+
+static struct resource wzrhpg300nh_flash_resources[] = {
+	[0] = {
+		.start	= WZRHPG300NH_FLASH_BASE,
+		.end	= WZRHPG300NH_FLASH_BASE + WZRHPG300NH_FLASH_SIZE - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device wzrhpg300nh_flash_device = {
+	.name		= "physmap-flash",
+	.id		= -1,
+	.resource	= wzrhpg300nh_flash_resources,
+	.num_resources	= ARRAY_SIZE(wzrhpg300nh_flash_resources),
+	.dev		= {
+		.platform_data = &wzrhpg300nh_flash_data,
+	}
+};
+
+static struct gpio_led wzrhpg300nh_leds_gpio[] __initdata = {
+	{
+		.name		= "buffalo:orange:security",
+		.gpio		= WZRHPG300NH_GPIO_LED_SECURITY,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:wireless",
+		.gpio		= WZRHPG300NH_GPIO_LED_WIRELESS,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:green:router",
+		.gpio		= WZRHPG300NH_GPIO_LED_ROUTER,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:red:diag",
+		.gpio		= WZRHPG300NH_GPIO_LED_DIAG,
+		.active_low	= 1,
+	}, {
+		.name		= "buffalo:blue:usb",
+		.gpio		= WZRHPG300NH_GPIO_LED_USB,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_button wzrhpg300nh_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WZRHPG300NH_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "aoss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WZRHPG300NH_GPIO_BTN_AOSS,
+		.active_low	= 1,
+	}, {
+		.desc		= "usb",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WZRHPG300NH_GPIO_BTN_USB,
+		.active_low	= 1,
+	}, {
+		.desc		= "qos_on",
+		.type		= EV_KEY,
+		.code		= BTN_3,
+		.debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WZRHPG300NH_GPIO_BTN_QOS_ON,
+		.active_low	= 0,
+	}, {
+		.desc		= "qos_off",
+		.type		= EV_KEY,
+		.code		= BTN_4,
+		.debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WZRHPG300NH_GPIO_BTN_QOS_OFF,
+		.active_low	= 0,
+	}, {
+		.desc		= "router_on",
+		.type		= EV_KEY,
+		.code		= BTN_5,
+		.debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WZRHPG300NH_GPIO_BTN_ROUTER_ON,
+		.active_low	= 0,
+	}, {
+		.desc		= "router_auto",
+		.type		= EV_KEY,
+		.code		= BTN_6,
+		.debounce_interval = WZRHPG300NH_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WZRHPG300NH_GPIO_BTN_ROUTER_AUTO,
+		.active_low	= 0,
+	}
+};
+
+static struct nxp_74hc153_platform_data wzrhpg300nh_74hc153_data = {
+	.gpio_base	= WZRHPG300NH_GPIO_EXP_BASE,
+	.gpio_pin_s0	= WZRHPG300NH_GPIO_74HC153_S0,
+	.gpio_pin_s1	= WZRHPG300NH_GPIO_74HC153_S1,
+	.gpio_pin_1y	= WZRHPG300NH_GPIO_74HC153_1Y,
+	.gpio_pin_2y	= WZRHPG300NH_GPIO_74HC153_2Y,
+};
+
+static struct platform_device wzrhpg300nh_74hc153_device = {
+	.name		= NXP_74HC153_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &wzrhpg300nh_74hc153_data,
+	}
+};
+
+static struct rtl8366_platform_data wzrhpg300nh_rtl8366_data = {
+	.gpio_sda	= WZRHPG300NH_GPIO_RTL8366_SDA,
+	.gpio_sck	= WZRHPG300NH_GPIO_RTL8366_SCK,
+};
+
+static struct platform_device wzrhpg300nh_rtl8366s_device = {
+	.name		= RTL8366S_DRIVER_NAME,
+	.id		= -1,
+	.dev = {
+		.platform_data	= &wzrhpg300nh_rtl8366_data,
+	}
+};
+
+static struct platform_device wzrhpg300nh_rtl8366rb_device = {
+	.name           = RTL8366RB_DRIVER_NAME,
+	.id             = -1,
+	.dev = {
+		.platform_data  = &wzrhpg300nh_rtl8366_data,
+	}
+};
+
+static void __init wzrhpg300nh_setup(void)
+{
+	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 *mac = eeprom + WZRHPG300NH_MAC_OFFSET;
+	bool hasrtl8366rb = false;
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+
+	if (rtl8366_smi_detect(&wzrhpg300nh_rtl8366_data) == RTL8366_TYPE_RB)
+		hasrtl8366rb = true;
+
+	if (hasrtl8366rb) {
+		ath79_eth0_pll_data.pll_1000 = 0x1f000000;
+		ath79_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev;
+		ath79_eth1_pll_data.pll_1000 = 0x100;
+		ath79_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev;
+	} else {
+		ath79_eth0_pll_data.pll_1000 = 0x1e000100;
+		ath79_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
+		ath79_eth1_pll_data.pll_1000 = 0x1e000100;
+		ath79_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
+	}
+
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+
+	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth1_data.phy_mask = 0x10;
+
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_register_usb();
+	ath79_register_wmac(eeprom, NULL);
+
+	platform_device_register(&wzrhpg300nh_74hc153_device);
+	platform_device_register(&wzrhpg300nh_flash_device);
+
+	if (hasrtl8366rb)
+		platform_device_register(&wzrhpg300nh_rtl8366rb_device);
+	else
+		platform_device_register(&wzrhpg300nh_rtl8366s_device);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh_leds_gpio),
+					wzrhpg300nh_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WZRHPG300NH_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(wzrhpg300nh_gpio_keys),
+					 wzrhpg300nh_gpio_keys);
+
+}
+
+MIPS_MACHINE(ATH79_MACH_WZR_HP_G300NH, "WZR-HP-G300NH",
+	     "Buffalo WZR-HP-G300NH", wzrhpg300nh_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
new file mode 100644
index 00000000..733d996e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
@@ -0,0 +1,170 @@
+/*
+ *  Buffalo WZR-HP-G300NH2 board support
+ *
+ *  Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2011 Mark Deneen <mdeneen@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define WZRHPG300NH2_MAC_OFFSET		0x20c
+#define WZRHPG300NH2_KEYS_POLL_INTERVAL     20      /* msecs */
+#define WZRHPG300NH2_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPG300NH2_KEYS_POLL_INTERVAL)
+
+static struct mtd_partition wzrhpg300nh2_flash_partitions[] = {
+	{
+		.name		= "u-boot",
+		.offset		= 0,
+		.size		= 0x0040000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "u-boot-env",
+		.offset		= 0x0040000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "art",
+		.offset		= 0x0050000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x0060000,
+		.size		= 0x1f90000,
+	}, {
+		.name		= "user_property",
+		.offset		= 0x1ff0000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}
+};
+
+static struct flash_platform_data wzrhpg300nh2_flash_data = {
+	.parts          = wzrhpg300nh2_flash_partitions,
+	.nr_parts       = ARRAY_SIZE(wzrhpg300nh2_flash_partitions),
+};
+
+static struct gpio_led wzrhpg300nh2_leds_gpio[] __initdata = {
+	{
+		.name		= "buffalo:red:diag",
+		.gpio		= 16,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_led wzrhpg300nh2_wmac_leds_gpio[] = {
+	{
+		.name           = "buffalo:blue:usb",
+		.gpio           = 4,
+		.active_low     = 1,
+	},
+	{
+		.name           = "buffalo:orange:security",
+		.gpio           = 6,
+		.active_low     = 1,
+	},
+	{
+		.name           = "buffalo:green:router",
+		.gpio           = 7,
+		.active_low     = 1,
+	},
+	{
+		.name           = "buffalo:blue:movie_engine_on",
+		.gpio           = 8,
+		.active_low     = 1,
+	},
+	{
+		.name           = "buffalo:blue:movie_engine_off",
+		.gpio           = 9,
+		.active_low     = 1,
+	},
+};
+
+/* The AOSS button is wmac gpio 12 */
+static struct gpio_keys_button wzrhpg300nh2_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WZRHPG300NH2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 1,
+		.active_low	= 1,
+	}, {
+		.desc		= "usb",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = WZRHPG300NH2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 7,
+		.active_low	= 1,
+	}, {
+		.desc		= "qos",
+		.type		= EV_KEY,
+		.code		= BTN_3,
+		.debounce_interval = WZRHPG300NH2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 11,
+		.active_low	= 0,
+	}, {
+		.desc		= "router_on",
+		.type		= EV_KEY,
+		.code		= BTN_5,
+		.debounce_interval = WZRHPG300NH2_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 8,
+		.active_low	= 0,
+	},
+};
+
+static void __init wzrhpg300nh2_setup(void)
+{
+
+	u8 *eeprom = (u8 *)   KSEG1ADDR(0x1f051000);
+	u8 *mac0   = eeprom + WZRHPG300NH2_MAC_OFFSET;
+	/* There is an eth1 but it is not connected to the switch */
+
+	ath79_register_m25p80_multi(&wzrhpg300nh2_flash_data);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 0);
+	ath79_register_mdio(0, ~(BIT(0)));
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_register_eth(0);
+
+	/* gpio13 is usb power.  Turn it on. */
+	gpio_request_one(13, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh2_leds_gpio),
+				 wzrhpg300nh2_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WZRHPG300NH2_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wzrhpg300nh2_gpio_keys),
+					wzrhpg300nh2_gpio_keys);
+	ap9x_pci_setup_wmac_led_pin(0, 5);
+	ap9x_pci_setup_wmac_leds(0, wzrhpg300nh2_wmac_leds_gpio,
+				ARRAY_SIZE(wzrhpg300nh2_wmac_leds_gpio));
+
+	ap91_pci_init(eeprom, mac0);
+}
+
+MIPS_MACHINE(ATH79_MACH_WZR_HP_G300NH2, "WZR-HP-G300NH2",
+	     "Buffalo WZR-HP-G300NH2", wzrhpg300nh2_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
new file mode 100644
index 00000000..a559d732
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
@@ -0,0 +1,165 @@
+/*
+ *  Buffalo WZR-HP-G450G board support
+ *
+ *  Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/ath9k_platform.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
+#include "machtypes.h"
+
+#define WZRHPG450H_KEYS_POLL_INTERVAL     20      /* msecs */
+#define WZRHPG450H_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPG450H_KEYS_POLL_INTERVAL)
+
+static struct mtd_partition wzrhpg450h_partitions[] = {
+	{
+		.name		= "u-boot",
+		.offset		= 0,
+		.size		= 0x0040000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "u-boot-env",
+		.offset		= 0x0040000,
+		.size		= 0x0010000,
+	}, {
+		.name		= "ART",
+		.offset		= 0x0050000,
+		.size		= 0x0010000,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "firmware",
+		.offset		= 0x0060000,
+		.size		= 0x1f80000,
+	}, {
+		.name		= "user_property",
+		.offset		= 0x1fe0000,
+		.size		= 0x0020000,
+	}
+};
+
+static struct flash_platform_data wzrhpg450h_flash_data = {
+	.parts		= wzrhpg450h_partitions,
+	.nr_parts	= ARRAY_SIZE(wzrhpg450h_partitions),
+};
+
+static struct gpio_led wzrhpg450h_leds_gpio[] __initdata = {
+	{
+		.name		= "buffalo:red:diag",
+		.gpio		= 14,
+		.active_low	= 1,
+	},
+	{
+		.name		= "buffalo:orange:security",
+		.gpio		= 13,
+		.active_low	= 1,
+	},
+};
+
+
+static struct gpio_led wzrhpg450h_wmac_leds_gpio[] = {
+	{
+		.name		= "buffalo:blue:movie_engine",
+		.gpio		= 13,
+		.active_low	= 1,
+	},
+	{
+		.name		= "buffalo:green:router",
+		.gpio		= 14,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button wzrhpg450h_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WZRHPG450H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 6,
+		.active_low	= 1,
+	}, {
+		.desc		= "usb",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = WZRHPG450H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 1,
+		.active_low	= 1,
+	}, {
+		.desc		= "aoss",
+		.type		= EV_KEY,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = WZRHPG450H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 8,
+		.active_low	= 1,
+	}, {
+		.desc		= "movie_engine",
+		.type		= EV_KEY,
+		.code		= BTN_6,
+		.debounce_interval = WZRHPG450H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 7,
+		.active_low	= 0,
+	}, {
+		.desc		= "router_off",
+		.type		= EV_KEY,
+		.code		= BTN_5,
+		.debounce_interval = WZRHPG450H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= 12,
+		.active_low	= 0,
+	}
+};
+
+
+static void __init wzrhpg450h_init(void)
+{
+	u8 *ee = (u8 *) KSEG1ADDR(0x1f051000);
+	u8 *mac = (u8 *) ee + 2;
+
+	ath79_register_m25p80_multi(&wzrhpg450h_flash_data);
+
+	ath79_register_mdio(0, ~BIT(0));
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+	ath79_eth0_data.speed = SPEED_1000;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpg450h_leds_gpio),
+				 wzrhpg450h_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, WZRHPG450H_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wzrhpg450h_gpio_keys),
+					wzrhpg450h_gpio_keys);
+
+	ath79_register_eth(0);
+
+	gpio_request_one(16, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+			 "USB power");
+	ath79_register_usb();
+
+	ap91_pci_init(ee, NULL);
+	ap9x_pci_get_wmac_data(0)->tx_gain_buffalo = true;
+	ap9x_pci_get_wmac_data(1)->tx_gain_buffalo = true;
+	ap9x_pci_setup_wmac_led_pin(0, 15);
+	ap9x_pci_setup_wmac_leds(0, wzrhpg450h_wmac_leds_gpio,
+				 ARRAY_SIZE(wzrhpg450h_wmac_leds_gpio));
+}
+
+MIPS_MACHINE(ATH79_MACH_WZR_HP_G450H, "WZR-HP-G450H", "Buffalo WZR-HP-G450H",
+	     wzrhpg450h_init);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
new file mode 100644
index 00000000..bc79ab99
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-zcn-1523h.c
@@ -0,0 +1,154 @@
+/*
+ *  Zcomax ZCN-1523H-2-8/5-16 board support
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-eth.h"
+#include "dev-m25p80.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "machtypes.h"
+
+#define ZCN_1523H_GPIO_BTN_RESET	0
+#define ZCN_1523H_GPIO_LED_INIT		11
+#define ZCN_1523H_GPIO_LED_LAN1		17
+
+#define ZCN_1523H_2_GPIO_LED_WEAK	13
+#define ZCN_1523H_2_GPIO_LED_MEDIUM	14
+#define ZCN_1523H_2_GPIO_LED_STRONG	15
+
+#define ZCN_1523H_5_GPIO_LAN2_POWER	1
+#define ZCN_1523H_5_GPIO_LED_LAN2	13
+#define ZCN_1523H_5_GPIO_LED_WEAK	14
+#define ZCN_1523H_5_GPIO_LED_MEDIUM	15
+#define ZCN_1523H_5_GPIO_LED_STRONG	16
+
+#define ZCN_1523H_KEYS_POLL_INTERVAL	20	/* msecs */
+#define ZCN_1523H_KEYS_DEBOUNCE_INTERVAL (3 * ZCN_1523H_KEYS_POLL_INTERVAL)
+
+static struct gpio_keys_button zcn_1523h_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = ZCN_1523H_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= ZCN_1523H_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_led zcn_1523h_leds_gpio[] __initdata = {
+	{
+		.name		= "zcn-1523h:amber:init",
+		.gpio		= ZCN_1523H_GPIO_LED_INIT,
+		.active_low	= 1,
+	}, {
+		.name		= "zcn-1523h:green:lan1",
+		.gpio		= ZCN_1523H_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_led zcn_1523h_2_leds_gpio[] __initdata = {
+	{
+		.name		= "zcn-1523h:red:weak",
+		.gpio		= ZCN_1523H_2_GPIO_LED_WEAK,
+		.active_low	= 1,
+	}, {
+		.name		= "zcn-1523h:amber:medium",
+		.gpio		= ZCN_1523H_2_GPIO_LED_MEDIUM,
+		.active_low	= 1,
+	}, {
+		.name		= "zcn-1523h:green:strong",
+		.gpio		= ZCN_1523H_2_GPIO_LED_STRONG,
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_led zcn_1523h_5_leds_gpio[] __initdata = {
+	{
+		.name		= "zcn-1523h:red:weak",
+		.gpio		= ZCN_1523H_5_GPIO_LED_WEAK,
+		.active_low	= 1,
+	}, {
+		.name		= "zcn-1523h:amber:medium",
+		.gpio		= ZCN_1523H_5_GPIO_LED_MEDIUM,
+		.active_low	= 1,
+	}, {
+		.name		= "zcn-1523h:green:strong",
+		.gpio		= ZCN_1523H_5_GPIO_LED_STRONG,
+		.active_low	= 1,
+	}, {
+		.name		= "zcn-1523h:green:lan2",
+		.gpio		= ZCN_1523H_5_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}
+};
+
+static void __init zcn_1523h_generic_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f7e0004);
+	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				    AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_m25p80(NULL);
+
+	ath79_register_leds_gpio(0, ARRAY_SIZE(zcn_1523h_leds_gpio),
+					zcn_1523h_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, ZCN_1523H_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(zcn_1523h_gpio_keys),
+					zcn_1523h_gpio_keys);
+
+	ap91_pci_init(ee, mac);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
+
+	ath79_register_mdio(0, 0x0);
+
+	/* LAN1 port */
+	ath79_register_eth(0);
+}
+
+static void __init zcn_1523h_2_setup(void)
+{
+	zcn_1523h_generic_setup();
+	ap9x_pci_setup_wmac_gpio(0, BIT(9), 0);
+
+	ath79_register_leds_gpio(1, ARRAY_SIZE(zcn_1523h_2_leds_gpio),
+				 zcn_1523h_2_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_ZCN_1523H_2, "ZCN-1523H-2", "Zcomax ZCN-1523H-2",
+	     zcn_1523h_2_setup);
+
+static void __init zcn_1523h_5_setup(void)
+{
+	zcn_1523h_generic_setup();
+	ap9x_pci_setup_wmac_gpio(0, BIT(8), 0);
+
+	ath79_register_leds_gpio(1, ARRAY_SIZE(zcn_1523h_5_leds_gpio),
+				 zcn_1523h_5_leds_gpio);
+
+	/* LAN2 port */
+	ath79_register_eth(1);
+}
+
+MIPS_MACHINE(ATH79_MACH_ZCN_1523H_5, "ZCN-1523H-5", "Zcomax ZCN-1523H-5",
+	     zcn_1523h_5_setup);
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.c
new file mode 100644
index 00000000..e55af5ab
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.c
@@ -0,0 +1,80 @@
+/*
+ *  Atheros AR71xx minimal nvram support
+ *
+ *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/vmalloc.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/string.h>
+
+#include "nvram.h"
+
+char *ath79_nvram_find_var(const char *name, const char *buf, unsigned buf_len)
+{
+	unsigned len = strlen(name);
+	char *cur, *last;
+
+	if (buf_len == 0 || len == 0)
+		return NULL;
+
+	if (buf_len < len)
+		return NULL;
+
+	if (len == 1)
+		return memchr(buf, (int) *name, buf_len);
+
+	last = (char *) buf + buf_len - len;
+	for (cur = (char *) buf; cur <= last; cur++)
+		if (cur[0] == name[0] && memcmp(cur, name, len) == 0)
+			return cur + len;
+
+	return NULL;
+}
+
+int ath79_nvram_parse_mac_addr(const char *nvram, unsigned nvram_len,
+			       const char *name, char *mac)
+{
+	char *buf;
+	char *mac_str;
+	int ret;
+	int t;
+
+	buf = vmalloc(nvram_len);
+	if (!buf)
+		return -ENOMEM;
+
+	memcpy(buf, nvram, nvram_len);
+	buf[nvram_len - 1] = '\0';
+
+	mac_str = ath79_nvram_find_var(name, buf, nvram_len);
+	if (!mac_str) {
+		ret = -EINVAL;
+		goto free;
+	}
+
+	if (strlen(mac_str) == 19 && mac_str[0] == '"' && mac_str[18] == '"') {
+		mac_str[18] = 0;
+		mac_str++;
+	}
+
+	t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+		   &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]);
+
+	if (t != 6) {
+		ret = -EINVAL;
+		goto free;
+	}
+
+	ret = 0;
+
+free:
+	vfree(buf);
+	return ret;
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.h
new file mode 100644
index 00000000..75151d4a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/nvram.h
@@ -0,0 +1,19 @@
+/*
+ *  Atheros AR71xx minimal nvram support
+ *
+ *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _ATH79_NVRAM_H
+#define _ATH79_NVRAM_H
+
+char *ath79_nvram_find_var(const char *name, const char *buf,
+			   unsigned buf_len);
+int ath79_nvram_parse_mac_addr(const char *nvram, unsigned nvram_len,
+			       const char *name, char *mac);
+
+#endif /* _ATH79_NVRAM_H */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.c
new file mode 100644
index 00000000..fcca1d2e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.c
@@ -0,0 +1,123 @@
+/*
+ *  Atheros AP94 reference board PCI initialization
+ *
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+struct ath9k_fixup {
+	u16		*cal_data;
+	unsigned	slot;
+};
+
+static int ath9k_num_fixups;
+static struct ath9k_fixup ath9k_fixups[2];
+
+static void ath9k_pci_fixup(struct pci_dev *dev)
+{
+	void __iomem *mem;
+	u16 *cal_data = NULL;
+	u16 cmd;
+	u32 bar0;
+	u32 val;
+	unsigned i;
+
+	for (i = 0; i < ath9k_num_fixups; i++) {
+		if (ath9k_fixups[i].cal_data == NULL)
+			continue;
+
+		if (ath9k_fixups[i].slot != PCI_SLOT(dev->devfn))
+			continue;
+
+		cal_data = ath9k_fixups[i].cal_data;
+		break;
+	}
+
+	if (cal_data == NULL)
+		return;
+
+	if (*cal_data != 0xa55a) {
+		pr_err("pci %s: invalid calibration data\n", pci_name(dev));
+		return;
+	}
+
+	pr_info("pci %s: fixup device configuration\n", pci_name(dev));
+
+	mem = ioremap(AR71XX_PCI_MEM_BASE, 0x10000);
+	if (!mem) {
+		pr_err("pci %s: ioremap error\n", pci_name(dev));
+		return;
+	}
+
+	pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0);
+
+	switch (ath79_soc) {
+	case ATH79_SOC_AR7161:
+		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0,
+				       AR71XX_PCI_MEM_BASE);
+		break;
+	case ATH79_SOC_AR7240:
+		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, 0xffff);
+		break;
+
+	case ATH79_SOC_AR7241:
+	case ATH79_SOC_AR7242:
+		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, 0x1000ffff);
+		break;
+
+	default:
+		BUG();
+	}
+
+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
+	cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+	pci_write_config_word(dev, PCI_COMMAND, cmd);
+
+	/* set pointer to first reg address */
+	cal_data += 3;
+	while (*cal_data != 0xffff) {
+		u32 reg;
+		reg = *cal_data++;
+		val = *cal_data++;
+		val |= (*cal_data++) << 16;
+
+		__raw_writel(val, mem + reg);
+		udelay(100);
+	}
+
+	pci_read_config_dword(dev, PCI_VENDOR_ID, &val);
+	dev->vendor = val & 0xffff;
+	dev->device = (val >> 16) & 0xffff;
+
+	pci_read_config_dword(dev, PCI_CLASS_REVISION, &val);
+	dev->revision = val & 0xff;
+	dev->class = val >> 8; /* upper 3 bytes */
+
+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
+	cmd &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
+	pci_write_config_word(dev, PCI_COMMAND, cmd);
+
+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0);
+
+	iounmap(mem);
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup);
+
+void __init pci_enable_ath9k_fixup(unsigned slot, u16 *cal_data)
+{
+	if (ath9k_num_fixups >= ARRAY_SIZE(ath9k_fixups))
+		return;
+
+	ath9k_fixups[ath9k_num_fixups].slot = slot;
+	ath9k_fixups[ath9k_num_fixups].cal_data = cal_data;
+	ath9k_num_fixups++;
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.h
new file mode 100644
index 00000000..5794941f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/pci-ath9k-fixup.h
@@ -0,0 +1,6 @@
+#ifndef _PCI_ATH9K_FIXUP
+#define _PCI_ATH9K_FIXUP
+
+void pci_enable_ath9k_fixup(unsigned slot, u16 *cal_data) __init;
+
+#endif /* _PCI_ATH9K_FIXUP */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c
new file mode 100644
index 00000000..dbdec020
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c
@@ -0,0 +1,249 @@
+/*
+ *  RouterBoot helper routines
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "rb: " fmt
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/routerboot.h>
+#include <linux/rle.h>
+
+#include "routerboot.h"
+
+#define RB_BLOCK_SIZE		0x1000
+#define RB_ART_SIZE		0x10000
+
+static struct rb_info rb_info;
+
+static u32 get_u32(void *buf)
+{
+	u8 *p = buf;
+
+	return ((u32) p[3] + ((u32) p[2] << 8) + ((u32) p[1] << 16) +
+	       ((u32) p[0] << 24));
+}
+
+static u16 get_u16(void *buf)
+{
+	u8 *p = buf;
+
+	return (u16) p[1] + ((u16) p[0] << 8);
+}
+
+__init int
+routerboot_find_magic(u8 *buf, unsigned int buflen, u32 *offset, bool hard)
+{
+	u32 magic_ref = hard ? RB_MAGIC_HARD : RB_MAGIC_SOFT;
+	u32 magic;
+	u32 cur = *offset;
+
+	while (cur < buflen) {
+		magic = get_u32(buf + cur);
+		if (magic == magic_ref) {
+			*offset = cur;
+			return 0;
+		}
+
+		cur += 0x1000;
+	}
+
+	return -ENOENT;
+}
+
+__init int
+routerboot_find_tag(u8 *buf, unsigned int buflen, u16 tag_id,
+		    u8 **tag_data, u16 *tag_len)
+{
+	uint32_t magic;
+	int ret;
+
+	if (buflen < 4)
+		return -EINVAL;
+
+	magic = get_u32(buf);
+	switch (magic) {
+	case RB_MAGIC_HARD:
+		/* skip magic value */
+		buf += 4;
+		buflen -= 4;
+		break;
+
+	case RB_MAGIC_SOFT:
+		if (buflen < 8)
+			return -EINVAL;
+
+		/* skip magic and CRC value */
+		buf += 8;
+		buflen -= 8;
+
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	ret = -ENOENT;
+	while (buflen > 2) {
+		u16 id;
+		u16 len;
+
+		len = get_u16(buf);
+		buf += 2;
+		buflen -= 2;
+
+		if (buflen < 2)
+			break;
+
+		id = get_u16(buf);
+		buf += 2;
+		buflen -= 2;
+
+		if (id == RB_ID_TERMINATOR)
+			break;
+
+		if (buflen < len)
+			break;
+
+		if (id == tag_id) {
+			if (tag_len)
+				*tag_len = len;
+			if (tag_data)
+				*tag_data = buf;
+			ret = 0;
+			break;
+		}
+
+		buf += len;
+		buflen -= len;
+	}
+
+	return ret;
+}
+
+static inline int
+rb_find_hard_cfg_tag(u16 tag_id, u8 **tag_data, u16 *tag_len)
+{
+	if (!rb_info.hard_cfg_data ||
+	    !rb_info.hard_cfg_size)
+		return -ENOENT;
+
+	return routerboot_find_tag(rb_info.hard_cfg_data,
+				   rb_info.hard_cfg_size,
+				   tag_id, tag_data, tag_len);
+}
+
+__init const char *
+rb_get_board_name(void)
+{
+	u16 tag_len;
+	u8 *tag;
+	int err;
+
+	err = rb_find_hard_cfg_tag(RB_ID_BOARD_NAME, &tag, &tag_len);
+	if (err)
+		return NULL;
+
+	return tag;
+}
+
+__init u32
+rb_get_hw_options(void)
+{
+	u16 tag_len;
+	u8 *tag;
+	int err;
+
+	err = rb_find_hard_cfg_tag(RB_ID_HW_OPTIONS, &tag, &tag_len);
+	if (err)
+		return 0;
+
+	return get_u32(tag);
+}
+
+__init void *
+rb_get_wlan_data(void)
+{
+	u16 tag_len;
+	u8 *tag;
+	void *buf;
+	int err;
+
+	err = rb_find_hard_cfg_tag(RB_ID_WLAN_DATA, &tag, &tag_len);
+	if (err) {
+		pr_err("no calibration data found\n");
+		goto err;
+	}
+
+	buf = kmalloc(RB_ART_SIZE, GFP_KERNEL);
+	if (buf == NULL) {
+		pr_err("no memory for calibration data\n");
+		goto err;
+	}
+
+	err = rle_decode((char *) tag, tag_len, buf, RB_ART_SIZE,
+			 NULL, NULL);
+	if (err) {
+		pr_err("unable to decode calibration data\n");
+		goto err_free;
+	}
+
+	return buf;
+
+err_free:
+	kfree(buf);
+err:
+	return NULL;
+}
+
+__init const struct rb_info *
+rb_init_info(void *data, unsigned int size)
+{
+	unsigned int offset;
+
+	if (size == 0 || (size % RB_BLOCK_SIZE) != 0)
+		return NULL;
+
+	for (offset = 0; offset < size; offset += RB_BLOCK_SIZE) {
+		u32 magic;
+
+		magic = get_u32(data + offset);
+		switch (magic) {
+		case RB_MAGIC_HARD:
+			rb_info.hard_cfg_offs = offset;
+			break;
+
+		case RB_MAGIC_SOFT:
+			rb_info.soft_cfg_offs = offset;
+			break;
+		}
+	}
+
+	if (!rb_info.hard_cfg_offs) {
+		pr_err("could not find a valid RouterBOOT hard config\n");
+		return NULL;
+	}
+
+	if (!rb_info.soft_cfg_offs) {
+		pr_err("could not find a valid RouterBOOT soft config\n");
+		return NULL;
+	}
+
+	rb_info.hard_cfg_size = RB_BLOCK_SIZE;
+	rb_info.hard_cfg_data = kmemdup(data + rb_info.hard_cfg_offs,
+					RB_BLOCK_SIZE, GFP_KERNEL);
+	if (!rb_info.hard_cfg_data)
+		return NULL;
+
+	rb_info.board_name = rb_get_board_name();
+	rb_info.hw_options = rb_get_hw_options();
+
+	return &rb_info;
+}
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h b/trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h
new file mode 100644
index 00000000..6ec296af
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h
@@ -0,0 +1,57 @@
+/*
+ *  RouterBoot definitions
+ *
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef _ATH79_ROUTERBOOT_H_
+#define _ATH79_ROUTERBOOT_H_
+
+struct rb_info {
+	unsigned int hard_cfg_offs;
+	unsigned int hard_cfg_size;
+	void *hard_cfg_data;
+	unsigned int soft_cfg_offs;
+
+	const char *board_name;
+	u32 hw_options;
+};
+
+#ifdef CONFIG_ATH79_ROUTERBOOT
+const struct rb_info *rb_init_info(void *data, unsigned int size);
+void *rb_get_wlan_data(void);
+
+int routerboot_find_tag(u8 *buf, unsigned int buflen, u16 tag_id,
+			u8 **tag_data, u16 *tag_len);
+int routerboot_find_magic(u8 *buf, unsigned int buflen, u32 *offset, bool hard);
+#else
+static inline const struct rb_info *
+rb_init_info(void *data, unsigned int size)
+{
+	return NULL;
+}
+
+static inline void *rb_get_wlan_data(void)
+{
+	return NULL;
+}
+
+static inline int
+routerboot_find_tag(u8 *buf, unsigned int buflen, u16 tag_id,
+		    u8 **tag_data, u16 *tag_len)
+{
+	return -ENOENT;
+}
+
+static inline int
+routerboot_find_magic(u8 *buf, unsigned int buflen, u32 *offset, bool hard)
+{
+	return -ENOENT;
+}
+#endif
+
+#endif /* _ATH79_ROUTERBOOT_H_ */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/include/asm/fw/myloader/myloader.h b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/fw/myloader/myloader.h
new file mode 100644
index 00000000..8a99d566
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/fw/myloader/myloader.h
@@ -0,0 +1,34 @@
+/*
+ *  Compex's MyLoader specific definitions
+ *
+ *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#ifndef _ASM_MIPS_FW_MYLOADER_H
+#define _ASM_MIPS_FW_MYLOADER_H
+
+#include <linux/myloader.h>
+
+struct myloader_info {
+	uint32_t	vid;
+	uint32_t	did;
+	uint32_t	svid;
+	uint32_t	sdid;
+	uint8_t		macs[MYLO_ETHADDR_COUNT][6];
+};
+
+#ifdef CONFIG_MYLOADER
+extern struct myloader_info *myloader_get_info(void) __init;
+#else
+static inline struct myloader_info *myloader_get_info(void)
+{
+	return NULL;
+}
+#endif /* CONFIG_MYLOADER */
+
+#endif /* _ASM_MIPS_FW_MYLOADER_H */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
new file mode 100644
index 00000000..d46dc4e3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
@@ -0,0 +1,65 @@
+/*
+ *  Atheros AR71xx SoC specific platform data definitions
+ *
+ *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef __ASM_MACH_ATH79_PLATFORM_H
+#define __ASM_MACH_ATH79_PLATFORM_H
+
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/phy.h>
+#include <linux/spi/spi.h>
+
+struct ag71xx_switch_platform_data {
+	u8		phy4_mii_en:1;
+	u8		phy_poll_mask;
+};
+
+struct ag71xx_platform_data {
+	phy_interface_t	phy_if_mode;
+	u32		phy_mask;
+	int		speed;
+	int		duplex;
+	u32		reset_bit;
+	u8		mac_addr[ETH_ALEN];
+	struct device	*mii_bus_dev;
+
+	u8		has_gbit:1;
+	u8		is_ar91xx:1;
+	u8		is_ar7240:1;
+	u8		is_ar724x:1;
+	u8		has_ar8216:1;
+
+	struct ag71xx_switch_platform_data *switch_data;
+
+	void		(*ddr_flush)(void);
+	void		(*set_speed)(int speed);
+
+	u32		fifo_cfg1;
+	u32		fifo_cfg2;
+	u32		fifo_cfg3;
+
+	unsigned int	max_frame_len;
+	unsigned int	desc_pktlen_mask;
+};
+
+struct ag71xx_mdio_platform_data {
+	u32		phy_mask;
+	u8		builtin_switch:1;
+	u8		is_ar7240:1;
+	u8		is_ar9330:1;
+	u8		is_ar934x:1;
+	unsigned long	mdio_clock;
+	unsigned long	ref_clock;
+
+	void		(*reset)(struct mii_bus *bus);
+};
+
+#endif /* __ASM_MACH_ATH79_PLATFORM_H */
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h
new file mode 100644
index 00000000..50d5a209
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/mach-rb750.h
@@ -0,0 +1,84 @@
+/*
+ *  MikroTik RouterBOARD 750 definitions
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+#ifndef _MACH_RB750_H
+#define _MACH_RB750_H
+
+#include <linux/bitops.h>
+
+#define RB750_GPIO_LVC573_LE	0	/* Latch enable on LVC573 */
+#define RB750_GPIO_NAND_IO0	1	/* NAND I/O 0 */
+#define RB750_GPIO_NAND_IO1	2	/* NAND I/O 1 */
+#define RB750_GPIO_NAND_IO2	3	/* NAND I/O 2 */
+#define RB750_GPIO_NAND_IO3	4	/* NAND I/O 3 */
+#define RB750_GPIO_NAND_IO4	5	/* NAND I/O 4 */
+#define RB750_GPIO_NAND_IO5	6	/* NAND I/O 5 */
+#define RB750_GPIO_NAND_IO6	7	/* NAND I/O 6 */
+#define RB750_GPIO_NAND_IO7	8	/* NAND I/O 7 */
+#define RB750_GPIO_NAND_NCE	11	/* NAND Chip Enable (active low) */
+#define RB750_GPIO_NAND_RDY	12	/* NAND Ready */
+#define RB750_GPIO_NAND_CLE	14	/* NAND Command Latch Enable */
+#define RB750_GPIO_NAND_ALE	15	/* NAND Address Latch Enable */
+#define RB750_GPIO_NAND_NRE	16	/* NAND Read Enable (active low) */
+#define RB750_GPIO_NAND_NWE	17	/* NAND Write Enable (active low) */
+
+#define RB750_GPIO_BTN_RESET	1
+#define RB750_GPIO_SPI_CS0	2
+#define RB750_GPIO_LED_ACT	12
+#define RB750_GPIO_LED_PORT1	13
+#define RB750_GPIO_LED_PORT2	14
+#define RB750_GPIO_LED_PORT3	15
+#define RB750_GPIO_LED_PORT4	16
+#define RB750_GPIO_LED_PORT5	17
+
+#define RB750_LED_ACT		BIT(RB750_GPIO_LED_ACT)
+#define RB750_LED_PORT1		BIT(RB750_GPIO_LED_PORT1)
+#define RB750_LED_PORT2		BIT(RB750_GPIO_LED_PORT2)
+#define RB750_LED_PORT3		BIT(RB750_GPIO_LED_PORT3)
+#define RB750_LED_PORT4		BIT(RB750_GPIO_LED_PORT4)
+#define RB750_LED_PORT5		BIT(RB750_GPIO_LED_PORT5)
+#define RB750_NAND_NCE		BIT(RB750_GPIO_NAND_NCE)
+
+#define RB750_LVC573_LE		BIT(RB750_GPIO_LVC573_LE)
+
+#define RB750_LED_BITS	(RB750_LED_PORT1 | RB750_LED_PORT2 | RB750_LED_PORT3 | \
+			 RB750_LED_PORT4 | RB750_LED_PORT5 | RB750_LED_ACT)
+
+#define RB7XX_GPIO_NAND_NCE	0
+#define RB7XX_GPIO_MON		9
+#define RB7XX_GPIO_LED_ACT	11
+#define RB7XX_GPIO_USB_POWERON	13
+
+#define RB7XX_NAND_NCE		BIT(RB7XX_GPIO_NAND_NCE)
+#define RB7XX_LED_ACT		BIT(RB7XX_GPIO_LED_ACT)
+#define RB7XX_MONITOR		BIT(RB7XX_GPIO_MON)
+#define RB7XX_USB_POWERON	BIT(RB7XX_GPIO_USB_POWERON)
+
+struct rb750_led_data {
+	char	*name;
+	char	*default_trigger;
+	u32	mask;
+	int	active_low;
+};
+
+struct rb750_led_platform_data {
+	int			num_leds;
+	struct rb750_led_data	*leds;
+	void			(*latch_change)(u32 clear, u32 set);
+};
+
+struct rb7xx_nand_platform_data {
+	u32 nce_line;
+
+	void (*enable_pins)(void);
+	void (*disable_pins)(void);
+	void (*latch_change)(u32, u32);
+};
+
+#endif /* _MACH_RB750_H */
\ No newline at end of file
diff --git a/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/rb4xx_cpld.h b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/rb4xx_cpld.h
new file mode 100644
index 00000000..5b17e94b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/rb4xx_cpld.h
@@ -0,0 +1,48 @@
+/*
+ * SPI driver definitions for the CPLD chip on the Mikrotik RB4xx boards
+ *
+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This file was based on the patches for Linux 2.6.27.39 published by
+ * MikroTik for their RouterBoard 4xx series devices.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#define CPLD_GPIO_nLED1		0
+#define CPLD_GPIO_nLED2		1
+#define CPLD_GPIO_nLED3		2
+#define CPLD_GPIO_nLED4		3
+#define CPLD_GPIO_FAN		4
+#define CPLD_GPIO_ALE		5
+#define CPLD_GPIO_CLE		6
+#define CPLD_GPIO_nCE		7
+#define CPLD_GPIO_nLED5		8
+
+#define CPLD_NUM_GPIOS		9
+
+#define CPLD_CFG_nLED1		BIT(CPLD_GPIO_nLED1)
+#define CPLD_CFG_nLED2		BIT(CPLD_GPIO_nLED2)
+#define CPLD_CFG_nLED3		BIT(CPLD_GPIO_nLED3)
+#define CPLD_CFG_nLED4		BIT(CPLD_GPIO_nLED4)
+#define CPLD_CFG_FAN		BIT(CPLD_GPIO_FAN)
+#define CPLD_CFG_ALE		BIT(CPLD_GPIO_ALE)
+#define CPLD_CFG_CLE		BIT(CPLD_GPIO_CLE)
+#define CPLD_CFG_nCE		BIT(CPLD_GPIO_nCE)
+#define CPLD_CFG_nLED5		BIT(CPLD_GPIO_nLED5)
+
+struct rb4xx_cpld_platform_data {
+	unsigned	gpio_base;
+};
+
+extern int rb4xx_cpld_change_cfg(unsigned mask, unsigned value);
+extern int rb4xx_cpld_read(unsigned char *rx_buf,
+			   const unsigned char *verify_buf,
+			   unsigned cnt);
+extern int rb4xx_cpld_read_from(unsigned addr,
+				unsigned char *rx_buf,
+				const unsigned char *verify_buf,
+				unsigned cnt);
+extern int rb4xx_cpld_write(const unsigned char *buf, unsigned count);
diff --git a/trunk/target/linux/ar71xx/files/drivers/gpio/gpio-latch.c b/trunk/target/linux/ar71xx/files/drivers/gpio/gpio-latch.c
new file mode 100644
index 00000000..1efa1a1e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/gpio/gpio-latch.c
@@ -0,0 +1,219 @@
+/*
+ *  GPIO latch driver
+ *
+ *  Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+
+#include <linux/platform_data/gpio-latch.h>
+
+struct gpio_latch_chip {
+	struct gpio_chip gc;
+
+	struct mutex mutex;
+	struct mutex latch_mutex;
+	bool latch_enabled;
+	int le_gpio;
+	bool le_active_low;
+	int *gpios;
+};
+
+static inline struct gpio_latch_chip *to_gpio_latch_chip(struct gpio_chip *gc)
+{
+	return container_of(gc, struct gpio_latch_chip, gc);
+}
+
+static void gpio_latch_lock(struct gpio_latch_chip *glc, bool enable)
+{
+	mutex_lock(&glc->mutex);
+
+	if (enable)
+		glc->latch_enabled = true;
+
+	if (glc->latch_enabled)
+		mutex_lock(&glc->latch_mutex);
+}
+
+static void gpio_latch_unlock(struct gpio_latch_chip *glc, bool disable)
+{
+	if (glc->latch_enabled)
+		mutex_unlock(&glc->latch_mutex);
+
+	if (disable)
+		glc->latch_enabled = true;
+
+	mutex_unlock(&glc->mutex);
+}
+
+static int
+gpio_latch_get(struct gpio_chip *gc, unsigned offset)
+{
+	struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
+	int ret;
+
+	gpio_latch_lock(glc, false);
+	ret = gpio_get_value(glc->gpios[offset]);
+	gpio_latch_unlock(glc, false);
+
+	return ret;
+}
+
+static void
+gpio_latch_set(struct gpio_chip *gc, unsigned offset, int value)
+{
+	struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
+	bool enable_latch = false;
+	bool disable_latch = false;
+	int gpio;
+
+	gpio = glc->gpios[offset];
+
+	if (gpio == glc->le_gpio) {
+		enable_latch = value ^ glc->le_active_low;
+		disable_latch = !enable_latch;
+	}
+
+	gpio_latch_lock(glc, enable_latch);
+	gpio_set_value(gpio, value);
+	gpio_latch_unlock(glc, disable_latch);
+}
+
+static int
+gpio_latch_direction_input(struct gpio_chip *gc, unsigned offset)
+{
+	struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
+	int ret;
+
+	gpio_latch_lock(glc, false);
+	ret = gpio_direction_input(glc->gpios[offset]);
+	gpio_latch_unlock(glc, false);
+
+	return ret;
+}
+
+static int
+gpio_latch_direction_output(struct gpio_chip *gc, unsigned offset, int value)
+{
+	struct gpio_latch_chip *glc = to_gpio_latch_chip(gc);
+	bool enable_latch = false;
+	bool disable_latch = false;
+	int gpio;
+	int ret;
+
+	gpio = glc->gpios[offset];
+
+	if (gpio == glc->le_gpio) {
+		enable_latch = value ^ glc->le_active_low;
+		disable_latch = !enable_latch;
+	}
+
+	gpio_latch_lock(glc, enable_latch);
+	ret = gpio_direction_output(gpio, value);
+	gpio_latch_unlock(glc, disable_latch);
+
+	return ret;
+}
+
+static int gpio_latch_probe(struct platform_device *pdev)
+{
+	struct gpio_latch_chip *glc;
+	struct gpio_latch_platform_data *pdata;
+	struct gpio_chip *gc;
+	int size;
+	int ret;
+	int i;
+
+	pdata = dev_get_platdata(&pdev->dev);
+	if (!pdata)
+		return -EINVAL;
+
+	if (pdata->le_gpio_index >= pdata->num_gpios ||
+	    !pdata->num_gpios ||
+	    !pdata->gpios)
+		return -EINVAL;
+
+	for (i = 0; i < pdata->num_gpios; i++) {
+		int gpio = pdata->gpios[i];
+
+		ret = devm_gpio_request(&pdev->dev, gpio,
+					GPIO_LATCH_DRIVER_NAME);
+		if (ret)
+			return ret;
+	}
+
+	glc = devm_kzalloc(&pdev->dev, sizeof(*glc), GFP_KERNEL);
+	if (!glc)
+		return -ENOMEM;
+
+	mutex_init(&glc->mutex);
+	mutex_init(&glc->latch_mutex);
+
+	size = pdata->num_gpios * sizeof(glc->gpios[0]);
+	glc->gpios = devm_kzalloc(&pdev->dev, size , GFP_KERNEL);
+	if (!glc->gpios)
+		return -ENOMEM;
+
+	memcpy(glc->gpios, pdata->gpios, size);
+
+	glc->le_gpio = glc->gpios[pdata->le_gpio_index];
+	glc->le_active_low = pdata->le_active_low;
+
+	gc = &glc->gc;
+
+	gc->label = GPIO_LATCH_DRIVER_NAME;
+	gc->base = pdata->base;
+	gc->can_sleep = true;
+	gc->ngpio = pdata->num_gpios;
+	gc->get = gpio_latch_get;
+	gc->set = gpio_latch_set;
+	gc->direction_input = gpio_latch_direction_input,
+	gc->direction_output = gpio_latch_direction_output;
+
+	platform_set_drvdata(pdev, glc);
+
+	ret = gpiochip_add(&glc->gc);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int gpio_latch_remove(struct platform_device *pdev)
+{
+	struct gpio_latch_chip *glc = platform_get_drvdata(pdev);
+
+	return gpiochip_remove(&glc->gc);;
+}
+
+
+static struct platform_driver gpio_latch_driver = {
+	.probe = gpio_latch_probe,
+	.remove = gpio_latch_remove,
+	.driver = {
+		.name = GPIO_LATCH_DRIVER_NAME,
+		.owner = THIS_MODULE,
+	},
+};
+
+static int __init gpio_latch_init(void)
+{
+	return platform_driver_register(&gpio_latch_driver);
+}
+
+postcore_initcall(gpio_latch_init);
+
+MODULE_DESCRIPTION("GPIO latch driver");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" GPIO_LATCH_DRIVER_NAME);
diff --git a/trunk/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c b/trunk/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c
new file mode 100644
index 00000000..5bdeb3d5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/gpio/gpio-nxp-74hc153.c
@@ -0,0 +1,247 @@
+/*
+ *  NXP 74HC153 - Dual 4-input multiplexer GPIO driver
+ *
+ *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/nxp_74hc153.h>
+
+#define NXP_74HC153_NUM_GPIOS	8
+#define NXP_74HC153_S0_MASK	0x1
+#define NXP_74HC153_S1_MASK	0x2
+#define NXP_74HC153_BANK_MASK	0x4
+
+struct nxp_74hc153_chip {
+	struct device		*parent;
+	struct gpio_chip	gpio_chip;
+	struct mutex		lock;
+};
+
+static struct nxp_74hc153_chip *gpio_to_nxp(struct gpio_chip *gc)
+{
+	return container_of(gc, struct nxp_74hc153_chip, gpio_chip);
+}
+
+static int nxp_74hc153_direction_input(struct gpio_chip *gc, unsigned offset)
+{
+	return 0;
+}
+
+static int nxp_74hc153_direction_output(struct gpio_chip *gc,
+					unsigned offset, int val)
+{
+	return -EINVAL;
+}
+
+static int nxp_74hc153_get_value(struct gpio_chip *gc, unsigned offset)
+{
+	struct nxp_74hc153_chip *nxp;
+	struct nxp_74hc153_platform_data *pdata;
+	unsigned s0;
+	unsigned s1;
+	unsigned pin;
+	int ret;
+
+	nxp = gpio_to_nxp(gc);
+	pdata = nxp->parent->platform_data;
+
+	s0 = !!(offset & NXP_74HC153_S0_MASK);
+	s1 = !!(offset & NXP_74HC153_S1_MASK);
+	pin = (offset & NXP_74HC153_BANK_MASK) ? pdata->gpio_pin_2y
+					       : pdata->gpio_pin_1y;
+
+	mutex_lock(&nxp->lock);
+	gpio_set_value(pdata->gpio_pin_s0, s0);
+	gpio_set_value(pdata->gpio_pin_s1, s1);
+	ret = gpio_get_value(pin);
+	mutex_unlock(&nxp->lock);
+
+	return ret;
+}
+
+static void nxp_74hc153_set_value(struct gpio_chip *gc,
+				  unsigned offset, int val)
+{
+	/* not supported */
+}
+
+static int nxp_74hc153_probe(struct platform_device *pdev)
+{
+	struct nxp_74hc153_platform_data *pdata;
+	struct nxp_74hc153_chip *nxp;
+	struct gpio_chip *gc;
+	int err;
+
+	pdata = pdev->dev.platform_data;
+	if (pdata == NULL) {
+		dev_dbg(&pdev->dev, "no platform data specified\n");
+		return -EINVAL;
+	}
+
+	nxp = kzalloc(sizeof(struct nxp_74hc153_chip), GFP_KERNEL);
+	if (nxp == NULL) {
+		dev_err(&pdev->dev, "no memory for private data\n");
+		return -ENOMEM;
+	}
+
+	err = gpio_request(pdata->gpio_pin_s0, dev_name(&pdev->dev));
+	if (err) {
+		dev_err(&pdev->dev, "unable to claim gpio %u, err=%d\n",
+			pdata->gpio_pin_s0, err);
+		goto err_free_nxp;
+	}
+
+	err = gpio_request(pdata->gpio_pin_s1, dev_name(&pdev->dev));
+	if (err) {
+		dev_err(&pdev->dev, "unable to claim gpio %u, err=%d\n",
+			pdata->gpio_pin_s1, err);
+		goto err_free_s0;
+	}
+
+	err = gpio_request(pdata->gpio_pin_1y, dev_name(&pdev->dev));
+	if (err) {
+		dev_err(&pdev->dev, "unable to claim gpio %u, err=%d\n",
+			pdata->gpio_pin_1y, err);
+		goto err_free_s1;
+	}
+
+	err = gpio_request(pdata->gpio_pin_2y, dev_name(&pdev->dev));
+	if (err) {
+		dev_err(&pdev->dev, "unable to claim gpio %u, err=%d\n",
+			pdata->gpio_pin_2y, err);
+		goto err_free_1y;
+	}
+
+	err = gpio_direction_output(pdata->gpio_pin_s0, 0);
+	if (err) {
+		dev_err(&pdev->dev,
+			"unable to set direction of gpio %u, err=%d\n",
+			pdata->gpio_pin_s0, err);
+		goto err_free_2y;
+	}
+
+	err = gpio_direction_output(pdata->gpio_pin_s1, 0);
+	if (err) {
+		dev_err(&pdev->dev,
+			"unable to set direction of gpio %u, err=%d\n",
+			pdata->gpio_pin_s1, err);
+		goto err_free_2y;
+	}
+
+	err = gpio_direction_input(pdata->gpio_pin_1y);
+	if (err) {
+		dev_err(&pdev->dev,
+			"unable to set direction of gpio %u, err=%d\n",
+			pdata->gpio_pin_1y, err);
+		goto err_free_2y;
+	}
+
+	err = gpio_direction_input(pdata->gpio_pin_2y);
+	if (err) {
+		dev_err(&pdev->dev,
+			"unable to set direction of gpio %u, err=%d\n",
+			pdata->gpio_pin_2y, err);
+		goto err_free_2y;
+	}
+
+	nxp->parent = &pdev->dev;
+	mutex_init(&nxp->lock);
+
+	gc = &nxp->gpio_chip;
+
+	gc->direction_input  = nxp_74hc153_direction_input;
+	gc->direction_output = nxp_74hc153_direction_output;
+	gc->get = nxp_74hc153_get_value;
+	gc->set = nxp_74hc153_set_value;
+	gc->can_sleep = 1;
+
+	gc->base = pdata->gpio_base;
+	gc->ngpio = NXP_74HC153_NUM_GPIOS;
+	gc->label = dev_name(nxp->parent);
+	gc->dev = nxp->parent;
+	gc->owner = THIS_MODULE;
+
+	err = gpiochip_add(&nxp->gpio_chip);
+	if (err) {
+		dev_err(&pdev->dev, "unable to add gpio chip, err=%d\n", err);
+		goto err_free_2y;
+	}
+
+	platform_set_drvdata(pdev, nxp);
+	return 0;
+
+err_free_2y:
+	gpio_free(pdata->gpio_pin_2y);
+err_free_1y:
+	gpio_free(pdata->gpio_pin_1y);
+err_free_s1:
+	gpio_free(pdata->gpio_pin_s1);
+err_free_s0:
+	gpio_free(pdata->gpio_pin_s0);
+err_free_nxp:
+	kfree(nxp);
+	return err;
+}
+
+static int nxp_74hc153_remove(struct platform_device *pdev)
+{
+	struct nxp_74hc153_chip *nxp = platform_get_drvdata(pdev);
+	struct nxp_74hc153_platform_data *pdata = pdev->dev.platform_data;
+
+	if (nxp) {
+		int err;
+
+		err = gpiochip_remove(&nxp->gpio_chip);
+		if (err) {
+			dev_err(&pdev->dev,
+				"unable to remove gpio chip, err=%d\n",
+				err);
+			return err;
+		}
+
+		gpio_free(pdata->gpio_pin_2y);
+		gpio_free(pdata->gpio_pin_1y);
+		gpio_free(pdata->gpio_pin_s1);
+		gpio_free(pdata->gpio_pin_s0);
+
+		kfree(nxp);
+		platform_set_drvdata(pdev, NULL);
+	}
+
+	return 0;
+}
+
+static struct platform_driver nxp_74hc153_driver = {
+	.probe		= nxp_74hc153_probe,
+	.remove		= nxp_74hc153_remove,
+	.driver = {
+		.name	= NXP_74HC153_DRIVER_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init nxp_74hc153_init(void)
+{
+	return platform_driver_register(&nxp_74hc153_driver);
+}
+subsys_initcall(nxp_74hc153_init);
+
+static void __exit nxp_74hc153_exit(void)
+{
+	platform_driver_unregister(&nxp_74hc153_driver);
+}
+module_exit(nxp_74hc153_exit);
+
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("GPIO expander driver for NXP 74HC153");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" NXP_74HC153_DRIVER_NAME);
diff --git a/trunk/target/linux/ar71xx/files/drivers/leds/leds-rb750.c b/trunk/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
new file mode 100644
index 00000000..79e98b48
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
@@ -0,0 +1,144 @@
+/*
+ * LED driver for the RouterBOARD 750
+ *
+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/slab.h>
+
+#include <asm/mach-ath79/mach-rb750.h>
+
+#define DRV_NAME	"leds-rb750"
+
+struct rb750_led_dev {
+	struct led_classdev	cdev;
+	u32			mask;
+	int			active_low;
+	void			(*latch_change)(u32 clear, u32 set);
+};
+
+struct rb750_led_drvdata {
+	struct rb750_led_dev	*led_devs;
+	int			num_leds;
+};
+
+static inline struct rb750_led_dev *to_rbled(struct led_classdev *led_cdev)
+{
+	return (struct rb750_led_dev *)container_of(led_cdev,
+		struct rb750_led_dev, cdev);
+}
+
+static void rb750_led_brightness_set(struct led_classdev *led_cdev,
+				     enum led_brightness value)
+{
+	struct rb750_led_dev *rbled = to_rbled(led_cdev);
+	int level;
+
+	level = (value == LED_OFF) ? 0 : 1;
+	level ^= rbled->active_low;
+
+	if (level)
+		rbled->latch_change(0, rbled->mask);
+	else
+		rbled->latch_change(rbled->mask, 0);
+}
+
+static int rb750_led_probe(struct platform_device *pdev)
+{
+	struct rb750_led_platform_data *pdata;
+	struct rb750_led_drvdata *drvdata;
+	int ret = 0;
+	int i;
+
+	pdata = pdev->dev.platform_data;
+	if (!pdata)
+		return -EINVAL;
+
+	drvdata = kzalloc(sizeof(struct rb750_led_drvdata) +
+			  sizeof(struct rb750_led_dev) * pdata->num_leds,
+			  GFP_KERNEL);
+	if (!drvdata)
+		return -ENOMEM;
+
+	drvdata->num_leds = pdata->num_leds;
+	drvdata->led_devs = (struct rb750_led_dev *) &drvdata[1];
+
+	for (i = 0; i < drvdata->num_leds; i++) {
+		struct rb750_led_dev *rbled = &drvdata->led_devs[i];
+		struct rb750_led_data *led_data = &pdata->leds[i];
+
+		rbled->cdev.name = led_data->name;
+		rbled->cdev.default_trigger = led_data->default_trigger;
+		rbled->cdev.brightness_set = rb750_led_brightness_set;
+		rbled->cdev.brightness = LED_OFF;
+
+		rbled->mask = led_data->mask;
+		rbled->active_low = !!led_data->active_low;
+		rbled->latch_change = pdata->latch_change;
+
+		ret = led_classdev_register(&pdev->dev, &rbled->cdev);
+		if (ret)
+			goto err;
+	}
+
+	platform_set_drvdata(pdev, drvdata);
+	return 0;
+
+err:
+	for (i = i - 1; i >= 0; i--)
+		led_classdev_unregister(&drvdata->led_devs[i].cdev);
+
+	kfree(drvdata);
+	return ret;
+}
+
+static int rb750_led_remove(struct platform_device *pdev)
+{
+	struct rb750_led_drvdata *drvdata;
+	int i;
+
+	drvdata = platform_get_drvdata(pdev);
+	for (i = 0; i < drvdata->num_leds; i++)
+		led_classdev_unregister(&drvdata->led_devs[i].cdev);
+
+	kfree(drvdata);
+	return 0;
+}
+
+static struct platform_driver rb750_led_driver = {
+	.probe		= rb750_led_probe,
+	.remove		= rb750_led_remove,
+	.driver		= {
+		.name	= DRV_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+MODULE_ALIAS("platform:leds-rb750");
+
+static int __init rb750_led_init(void)
+{
+	return platform_driver_register(&rb750_led_driver);
+}
+
+static void __exit rb750_led_exit(void)
+{
+	platform_driver_unregister(&rb750_led_driver);
+}
+
+module_init(rb750_led_init);
+module_exit(rb750_led_exit);
+
+MODULE_DESCRIPTION(DRV_NAME);
+MODULE_DESCRIPTION("LED driver for the RouterBOARD 750");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c b/trunk/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
new file mode 100644
index 00000000..6425b055
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
@@ -0,0 +1,76 @@
+/*
+ *  USB LED driver for the NETGEAR WNDR3700
+ *
+ *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/leds.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#define DRIVER_NAME	"wndr3700-led-usb"
+
+static void wndr3700_usb_led_set(struct led_classdev *cdev,
+				 enum led_brightness brightness)
+{
+	if (brightness)
+		ath79_device_reset_clear(AR71XX_RESET_GE1_PHY);
+	else
+		ath79_device_reset_set(AR71XX_RESET_GE1_PHY);
+}
+
+static enum led_brightness wndr3700_usb_led_get(struct led_classdev *cdev)
+{
+	return ath79_device_reset_get(AR71XX_RESET_GE1_PHY) ? LED_OFF : LED_FULL;
+}
+
+static struct led_classdev wndr3700_usb_led = {
+	.name = "netgear:green:usb",
+	.brightness_set = wndr3700_usb_led_set,
+	.brightness_get = wndr3700_usb_led_get,
+};
+
+static int wndr3700_usb_led_probe(struct platform_device *pdev)
+{
+	return led_classdev_register(&pdev->dev, &wndr3700_usb_led);
+}
+
+static int wndr3700_usb_led_remove(struct platform_device *pdev)
+{
+	led_classdev_unregister(&wndr3700_usb_led);
+	return 0;
+}
+
+static struct platform_driver wndr3700_usb_led_driver = {
+	.probe = wndr3700_usb_led_probe,
+	.remove = wndr3700_usb_led_remove,
+	.driver = {
+		.name = DRIVER_NAME,
+		.owner = THIS_MODULE,
+	},
+};
+
+static int __init wndr3700_usb_led_init(void)
+{
+	return platform_driver_register(&wndr3700_usb_led_driver);
+}
+
+static void __exit wndr3700_usb_led_exit(void)
+{
+	platform_driver_unregister(&wndr3700_usb_led_driver);
+}
+
+module_init(wndr3700_usb_led_init);
+module_exit(wndr3700_usb_led_exit);
+
+MODULE_DESCRIPTION("USB LED driver for the NETGEAR WNDR3700");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/trunk/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
new file mode 100644
index 00000000..92312515
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
@@ -0,0 +1,1504 @@
+/*
+ * Driver for the built-in NAND controller of the Atheros AR934x SoCs
+ *
+ * Copyright (C) 2011-2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/dma-mapping.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+
+#include <linux/platform/ar934x_nfc.h>
+
+#define AR934X_NFC_REG_CMD		0x00
+#define AR934X_NFC_REG_CTRL		0x04
+#define AR934X_NFC_REG_STATUS		0x08
+#define AR934X_NFC_REG_INT_MASK		0x0c
+#define AR934X_NFC_REG_INT_STATUS	0x10
+#define AR934X_NFC_REG_ECC_CTRL		0x14
+#define AR934X_NFC_REG_ECC_OFFSET	0x18
+#define AR934X_NFC_REG_ADDR0_0		0x1c
+#define AR934X_NFC_REG_ADDR0_1		0x24
+#define AR934X_NFC_REG_ADDR1_0		0x20
+#define AR934X_NFC_REG_ADDR1_1		0x28
+#define AR934X_NFC_REG_SPARE_SIZE	0x30
+#define AR934X_NFC_REG_PROTECT		0x38
+#define AR934X_NFC_REG_LOOKUP_EN	0x40
+#define AR934X_NFC_REG_LOOKUP(_x)	(0x44 + (_i) * 4)
+#define AR934X_NFC_REG_DMA_ADDR		0x64
+#define AR934X_NFC_REG_DMA_COUNT	0x68
+#define AR934X_NFC_REG_DMA_CTRL		0x6c
+#define AR934X_NFC_REG_MEM_CTRL		0x80
+#define AR934X_NFC_REG_DATA_SIZE	0x84
+#define AR934X_NFC_REG_READ_STATUS	0x88
+#define AR934X_NFC_REG_TIME_SEQ		0x8c
+#define AR934X_NFC_REG_TIMINGS_ASYN	0x90
+#define AR934X_NFC_REG_TIMINGS_SYN	0x94
+#define AR934X_NFC_REG_FIFO_DATA	0x98
+#define AR934X_NFC_REG_TIME_MODE	0x9c
+#define AR934X_NFC_REG_DMA_ADDR_OFFS	0xa0
+#define AR934X_NFC_REG_FIFO_INIT	0xb0
+#define AR934X_NFC_REG_GEN_SEQ_CTRL	0xb4
+
+#define AR934X_NFC_CMD_CMD_SEQ_S		0
+#define AR934X_NFC_CMD_CMD_SEQ_M		0x3f
+#define   AR934X_NFC_CMD_SEQ_1C			0x00
+#define   AR934X_NFC_CMD_SEQ_ERASE		0x0e
+#define   AR934X_NFC_CMD_SEQ_12			0x0c
+#define   AR934X_NFC_CMD_SEQ_1C1AXR		0x21
+#define   AR934X_NFC_CMD_SEQ_S			0x24
+#define   AR934X_NFC_CMD_SEQ_1C3AXR		0x27
+#define   AR934X_NFC_CMD_SEQ_1C5A1CXR		0x2a
+#define   AR934X_NFC_CMD_SEQ_18			0x32
+#define AR934X_NFC_CMD_INPUT_SEL_SIU		0
+#define AR934X_NFC_CMD_INPUT_SEL_DMA		BIT(6)
+#define AR934X_NFC_CMD_ADDR_SEL_0		0
+#define AR934X_NFC_CMD_ADDR_SEL_1		BIT(7)
+#define AR934X_NFC_CMD_CMD0_S			8
+#define AR934X_NFC_CMD_CMD0_M			0xff
+#define AR934X_NFC_CMD_CMD1_S			16
+#define AR934X_NFC_CMD_CMD1_M			0xff
+#define AR934X_NFC_CMD_CMD2_S			24
+#define AR934X_NFC_CMD_CMD2_M			0xff
+
+#define AR934X_NFC_CTRL_ADDR_CYCLE0_M		0x7
+#define AR934X_NFC_CTRL_ADDR_CYCLE0_S		0
+#define AR934X_NFC_CTRL_SPARE_EN		BIT(3)
+#define AR934X_NFC_CTRL_INT_EN			BIT(4)
+#define AR934X_NFC_CTRL_ECC_EN			BIT(5)
+#define AR934X_NFC_CTRL_BLOCK_SIZE_S		6
+#define AR934X_NFC_CTRL_BLOCK_SIZE_M		0x3
+#define   AR934X_NFC_CTRL_BLOCK_SIZE_32		0
+#define   AR934X_NFC_CTRL_BLOCK_SIZE_64		1
+#define   AR934X_NFC_CTRL_BLOCK_SIZE_128	2
+#define   AR934X_NFC_CTRL_BLOCK_SIZE_256	3
+#define AR934X_NFC_CTRL_PAGE_SIZE_S		8
+#define AR934X_NFC_CTRL_PAGE_SIZE_M		0x7
+#define   AR934X_NFC_CTRL_PAGE_SIZE_256		0
+#define   AR934X_NFC_CTRL_PAGE_SIZE_512		1
+#define   AR934X_NFC_CTRL_PAGE_SIZE_1024	2
+#define   AR934X_NFC_CTRL_PAGE_SIZE_2048	3
+#define   AR934X_NFC_CTRL_PAGE_SIZE_4096	4
+#define   AR934X_NFC_CTRL_PAGE_SIZE_8192	5
+#define   AR934X_NFC_CTRL_PAGE_SIZE_16384	6
+#define AR934X_NFC_CTRL_CUSTOM_SIZE_EN		BIT(11)
+#define AR934X_NFC_CTRL_IO_WIDTH_8BITS		0
+#define AR934X_NFC_CTRL_IO_WIDTH_16BITS		BIT(12)
+#define AR934X_NFC_CTRL_LOOKUP_EN		BIT(13)
+#define AR934X_NFC_CTRL_PROT_EN			BIT(14)
+#define AR934X_NFC_CTRL_WORK_MODE_ASYNC		0
+#define AR934X_NFC_CTRL_WORK_MODE_SYNC		BIT(15)
+#define AR934X_NFC_CTRL_ADDR0_AUTO_INC		BIT(16)
+#define AR934X_NFC_CTRL_ADDR1_AUTO_INC		BIT(17)
+#define AR934X_NFC_CTRL_ADDR_CYCLE1_M		0x7
+#define AR934X_NFC_CTRL_ADDR_CYCLE1_S		18
+#define AR934X_NFC_CTRL_SMALL_PAGE		BIT(21)
+
+#define AR934X_NFC_DMA_CTRL_DMA_START		BIT(7)
+#define AR934X_NFC_DMA_CTRL_DMA_DIR_WRITE	0
+#define AR934X_NFC_DMA_CTRL_DMA_DIR_READ	BIT(6)
+#define AR934X_NFC_DMA_CTRL_DMA_MODE_SG		BIT(5)
+#define AR934X_NFC_DMA_CTRL_DMA_BURST_S		2
+#define AR934X_NFC_DMA_CTRL_DMA_BURST_0		0
+#define AR934X_NFC_DMA_CTRL_DMA_BURST_1		1
+#define AR934X_NFC_DMA_CTRL_DMA_BURST_2		2
+#define AR934X_NFC_DMA_CTRL_DMA_BURST_3		3
+#define AR934X_NFC_DMA_CTRL_DMA_BURST_4		4
+#define AR934X_NFC_DMA_CTRL_DMA_BURST_5		5
+#define AR934X_NFC_DMA_CTRL_ERR_FLAG		BIT(1)
+#define AR934X_NFC_DMA_CTRL_DMA_READY		BIT(0)
+
+#define AR934X_NFC_INT_DEV_RDY(_x)		BIT(4 + (_x))
+#define AR934X_NFC_INT_CMD_END			BIT(1)
+
+#define AR934X_NFC_ECC_CTRL_ERR_THRES_S		8
+#define AR934X_NFC_ECC_CTRL_ERR_THRES_M		0x1f
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_S		5
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_M		0x7
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_2		0
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_4		1
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_6		2
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_8		3
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_10		4
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_12		5
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_14		6
+#define AR934X_NFC_ECC_CTRL_ECC_CAP_16		7
+#define AR934X_NFC_ECC_CTRL_ERR_OVER		BIT(2)
+#define AR934X_NFC_ECC_CTRL_ERR_UNCORRECT	BIT(1)
+#define AR934X_NFC_ECC_CTRL_ERR_CORRECT		BIT(0)
+
+#define AR934X_NFC_ECC_OFFS_OFSET_M		0xffff
+
+/* default timing values */
+#define AR934X_NFC_TIME_SEQ_DEFAULT	0x7fff
+#define AR934X_NFC_TIMINGS_ASYN_DEFAULT	0x22
+#define AR934X_NFC_TIMINGS_SYN_DEFAULT	0xf
+
+#define AR934X_NFC_ID_BUF_SIZE		8
+#define AR934X_NFC_DEV_READY_TIMEOUT	25 /* msecs */
+#define AR934X_NFC_DMA_READY_TIMEOUT	25 /* msecs */
+#define AR934X_NFC_DONE_TIMEOUT		1000
+#define AR934X_NFC_DMA_RETRIES		20
+
+#define AR934X_NFC_USE_IRQ		true
+#define AR934X_NFC_IRQ_MASK		AR934X_NFC_INT_DEV_RDY(0)
+
+#define  AR934X_NFC_GENSEQ_SMALL_PAGE_READ	0x30043
+
+#undef AR934X_NFC_DEBUG_DATA
+#undef AR934X_NFC_DEBUG
+
+struct ar934x_nfc;
+
+static inline  __attribute__ ((format (printf, 2, 3)))
+void _nfc_dbg(struct ar934x_nfc *nfc, const char *fmt, ...)
+{
+}
+
+#ifdef AR934X_NFC_DEBUG
+#define nfc_dbg(_nfc, fmt, ...) \
+	dev_info((_nfc)->parent, fmt, ##__VA_ARGS__)
+#else
+#define nfc_dbg(_nfc, fmt, ...) \
+	_nfc_dbg((_nfc), fmt, ##__VA_ARGS__)
+#endif /* AR934X_NFC_DEBUG */
+
+#ifdef AR934X_NFC_DEBUG_DATA
+static void
+nfc_debug_data(const char *label, void *data, int len)
+{
+	print_hex_dump(KERN_WARNING, label, DUMP_PREFIX_OFFSET, 16, 1,
+		       data, len, 0);
+}
+#else
+static inline void
+nfc_debug_data(const char *label, void *data, int len) {}
+#endif /* AR934X_NFC_DEBUG_DATA */
+
+struct ar934x_nfc {
+	struct mtd_info mtd;
+	struct nand_chip nand_chip;
+	struct device *parent;
+	void __iomem *base;
+	void (*select_chip)(int chip_no);
+	bool swap_dma;
+	int irq;
+	wait_queue_head_t irq_waitq;
+
+	bool spurious_irq_expected;
+	u32 irq_status;
+
+	u32 ctrl_reg;
+	u32 ecc_ctrl_reg;
+	u32 ecc_offset_reg;
+	u32 ecc_thres;
+	u32 ecc_oob_pos;
+
+	bool small_page;
+	unsigned int addr_count0;
+	unsigned int addr_count1;
+
+	u8 *buf;
+	dma_addr_t buf_dma;
+	unsigned int buf_size;
+	int buf_index;
+
+	bool read_id;
+
+	int erase1_page_addr;
+
+	int rndout_page_addr;
+	int rndout_read_cmd;
+
+	int seqin_page_addr;
+	int seqin_column;
+	int seqin_read_cmd;
+};
+
+static void ar934x_nfc_restart(struct ar934x_nfc *nfc);
+
+static inline bool
+is_all_ff(u8 *buf, int len)
+{
+	while (len--)
+		if (buf[len] != 0xff)
+			return false;
+
+	return true;
+}
+
+static inline void
+ar934x_nfc_wr(struct ar934x_nfc *nfc, unsigned reg, u32 val)
+{
+	__raw_writel(val, nfc->base + reg);
+}
+
+static inline u32
+ar934x_nfc_rr(struct ar934x_nfc *nfc, unsigned reg)
+{
+	return __raw_readl(nfc->base + reg);
+}
+
+static inline struct ar934x_nfc_platform_data *
+ar934x_nfc_get_platform_data(struct ar934x_nfc *nfc)
+{
+	return nfc->parent->platform_data;
+}
+
+static inline struct
+ar934x_nfc *mtd_to_ar934x_nfc(struct mtd_info *mtd)
+{
+	return container_of(mtd, struct ar934x_nfc, mtd);
+}
+
+static inline bool ar934x_nfc_use_irq(struct ar934x_nfc *nfc)
+{
+	return AR934X_NFC_USE_IRQ;
+}
+
+static inline void ar934x_nfc_write_cmd_reg(struct ar934x_nfc *nfc, u32 cmd_reg)
+{
+	wmb();
+
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_CMD, cmd_reg);
+	/* flush write */
+	ar934x_nfc_rr(nfc, AR934X_NFC_REG_CMD);
+}
+
+static bool
+__ar934x_nfc_dev_ready(struct ar934x_nfc *nfc)
+{
+	u32 status;
+
+	status = ar934x_nfc_rr(nfc, AR934X_NFC_REG_STATUS);
+	return (status & 0xff) == 0xff;
+}
+
+static inline bool
+__ar934x_nfc_is_dma_ready(struct ar934x_nfc *nfc)
+{
+	u32 status;
+
+	status = ar934x_nfc_rr(nfc, AR934X_NFC_REG_DMA_CTRL);
+	return (status & AR934X_NFC_DMA_CTRL_DMA_READY) != 0;
+}
+
+static int
+ar934x_nfc_wait_dev_ready(struct ar934x_nfc *nfc)
+{
+	unsigned long timeout;
+
+	timeout = jiffies + msecs_to_jiffies(AR934X_NFC_DEV_READY_TIMEOUT);
+	do {
+		if (__ar934x_nfc_dev_ready(nfc))
+			return 0;
+	} while time_before(jiffies, timeout);
+
+	nfc_dbg(nfc, "timeout waiting for device ready, status:%08x int:%08x\n",
+		ar934x_nfc_rr(nfc, AR934X_NFC_REG_STATUS),
+		ar934x_nfc_rr(nfc, AR934X_NFC_REG_INT_STATUS));
+	return -ETIMEDOUT;
+}
+
+static int
+ar934x_nfc_wait_dma_ready(struct ar934x_nfc *nfc)
+{
+	unsigned long timeout;
+
+	timeout = jiffies + msecs_to_jiffies(AR934X_NFC_DMA_READY_TIMEOUT);
+	do {
+		if (__ar934x_nfc_is_dma_ready(nfc))
+			return 0;
+	} while time_before(jiffies, timeout);
+
+	nfc_dbg(nfc, "timeout waiting for DMA ready, dma_ctrl:%08x\n",
+		ar934x_nfc_rr(nfc, AR934X_NFC_REG_DMA_CTRL));
+	return -ETIMEDOUT;
+}
+
+static int
+ar934x_nfc_wait_irq(struct ar934x_nfc *nfc)
+{
+	long timeout;
+	int ret;
+
+	timeout = wait_event_timeout(nfc->irq_waitq,
+				(nfc->irq_status & AR934X_NFC_IRQ_MASK) != 0,
+				msecs_to_jiffies(AR934X_NFC_DEV_READY_TIMEOUT));
+
+	ret = 0;
+	if (!timeout) {
+		ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_MASK, 0);
+		ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_STATUS, 0);
+		/* flush write */
+		ar934x_nfc_rr(nfc, AR934X_NFC_REG_INT_STATUS);
+
+		nfc_dbg(nfc,
+			"timeout waiting for interrupt, status:%08x\n",
+			nfc->irq_status);
+		ret = -ETIMEDOUT;
+	}
+
+	nfc->irq_status = 0;
+	return ret;
+}
+
+static int
+ar934x_nfc_wait_done(struct ar934x_nfc *nfc)
+{
+	int ret;
+
+	if (ar934x_nfc_use_irq(nfc))
+		ret = ar934x_nfc_wait_irq(nfc);
+	else
+		ret = ar934x_nfc_wait_dev_ready(nfc);
+
+	if (ret)
+		return ret;
+
+	return ar934x_nfc_wait_dma_ready(nfc);
+}
+
+static int
+ar934x_nfc_alloc_buf(struct ar934x_nfc *nfc, unsigned size)
+{
+	nfc->buf = dma_alloc_coherent(nfc->parent, size,
+				      &nfc->buf_dma, GFP_KERNEL);
+	if (nfc->buf == NULL) {
+		dev_err(nfc->parent, "no memory for DMA buffer\n");
+		return -ENOMEM;
+	}
+
+	nfc->buf_size = size;
+	nfc_dbg(nfc, "buf:%p size:%u\n", nfc->buf, nfc->buf_size);
+
+	return 0;
+}
+
+static void
+ar934x_nfc_free_buf(struct ar934x_nfc *nfc)
+{
+	dma_free_coherent(nfc->parent, nfc->buf_size, nfc->buf, nfc->buf_dma);
+}
+
+static void
+ar934x_nfc_get_addr(struct ar934x_nfc *nfc, int column, int page_addr,
+		    u32 *addr0, u32 *addr1)
+{
+	u32 a0, a1;
+
+	a0 = 0;
+	a1 = 0;
+
+	if (column == -1) {
+		/* ERASE1 */
+		a0 = (page_addr & 0xffff) << 16;
+		a1 = (page_addr >> 16) & 0xf;
+	} else if (page_addr != -1) {
+		/* SEQIN, READ0, etc.. */
+
+		/* TODO: handle 16bit bus width */
+		if (nfc->small_page) {
+			a0 = column & 0xff;
+			a0 |= (page_addr & 0xff) << 8;
+			a0 |= ((page_addr >> 8) & 0xff) << 16;
+			a0 |= ((page_addr >> 16) & 0xff) << 24;
+		} else {
+			a0 = column & 0x0FFF;
+			a0 |= (page_addr & 0xffff) << 16;
+
+			if (nfc->addr_count0 > 4)
+				a1 = (page_addr >> 16) & 0xf;
+		}
+	}
+
+	*addr0 = a0;
+	*addr1 = a1;
+}
+
+static void
+ar934x_nfc_send_cmd(struct ar934x_nfc *nfc, unsigned command)
+{
+	u32 cmd_reg;
+
+	cmd_reg = AR934X_NFC_CMD_INPUT_SEL_SIU | AR934X_NFC_CMD_ADDR_SEL_0 |
+		  AR934X_NFC_CMD_SEQ_1C;
+	cmd_reg |= (command & AR934X_NFC_CMD_CMD0_M) << AR934X_NFC_CMD_CMD0_S;
+
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_STATUS, 0);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_CTRL, nfc->ctrl_reg);
+
+	ar934x_nfc_write_cmd_reg(nfc, cmd_reg);
+	ar934x_nfc_wait_dev_ready(nfc);
+}
+
+static int
+ar934x_nfc_do_rw_command(struct ar934x_nfc *nfc, int column, int page_addr,
+			 int len, u32 cmd_reg, u32 ctrl_reg, bool write)
+{
+	u32 addr0, addr1;
+	u32 dma_ctrl;
+	int dir;
+	int err;
+	int retries = 0;
+
+	WARN_ON(len & 3);
+
+	if (WARN_ON(len > nfc->buf_size))
+		dev_err(nfc->parent, "len=%d > buf_size=%d", len, nfc->buf_size);
+
+	if (write) {
+		dma_ctrl = AR934X_NFC_DMA_CTRL_DMA_DIR_WRITE;
+		dir = DMA_TO_DEVICE;
+	} else {
+		dma_ctrl = AR934X_NFC_DMA_CTRL_DMA_DIR_READ;
+		dir = DMA_FROM_DEVICE;
+	}
+
+	ar934x_nfc_get_addr(nfc, column, page_addr, &addr0, &addr1);
+
+	dma_ctrl |= AR934X_NFC_DMA_CTRL_DMA_START |
+		    (AR934X_NFC_DMA_CTRL_DMA_BURST_3 <<
+		     AR934X_NFC_DMA_CTRL_DMA_BURST_S);
+
+	cmd_reg |= AR934X_NFC_CMD_INPUT_SEL_DMA | AR934X_NFC_CMD_ADDR_SEL_0;
+	ctrl_reg |= AR934X_NFC_CTRL_INT_EN;
+
+	nfc_dbg(nfc, "%s a0:%08x a1:%08x len:%x cmd:%08x dma:%08x ctrl:%08x\n",
+		(write) ? "write" : "read",
+		addr0, addr1, len, cmd_reg, dma_ctrl, ctrl_reg);
+
+retry:
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_STATUS, 0);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_ADDR0_0, addr0);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_ADDR0_1, addr1);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_DMA_ADDR, nfc->buf_dma);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_DMA_COUNT, len);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_DATA_SIZE, len);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_CTRL, ctrl_reg);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_DMA_CTRL, dma_ctrl);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_ECC_CTRL, nfc->ecc_ctrl_reg);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_ECC_OFFSET, nfc->ecc_offset_reg);
+
+	if (ar934x_nfc_use_irq(nfc)) {
+		ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_MASK, AR934X_NFC_IRQ_MASK);
+		/* flush write */
+		ar934x_nfc_rr(nfc, AR934X_NFC_REG_INT_MASK);
+	}
+
+	ar934x_nfc_write_cmd_reg(nfc, cmd_reg);
+	err = ar934x_nfc_wait_done(nfc);
+	if (err) {
+		dev_dbg(nfc->parent, "%s operation stuck at page %d\n",
+			(write) ? "write" : "read", page_addr);
+
+		ar934x_nfc_restart(nfc);
+		if (retries++ < AR934X_NFC_DMA_RETRIES)
+			goto retry;
+
+		dev_err(nfc->parent, "%s operation failed on page %d\n",
+			(write) ? "write" : "read", page_addr);
+	}
+
+	return err;
+}
+
+static int
+ar934x_nfc_send_readid(struct ar934x_nfc *nfc, unsigned command)
+{
+	u32 cmd_reg;
+	int err;
+
+	nfc_dbg(nfc, "readid, cmd:%02x\n", command);
+
+	cmd_reg = AR934X_NFC_CMD_SEQ_1C1AXR;
+	cmd_reg |= (command & AR934X_NFC_CMD_CMD0_M) << AR934X_NFC_CMD_CMD0_S;
+
+	err = ar934x_nfc_do_rw_command(nfc, -1, -1, AR934X_NFC_ID_BUF_SIZE,
+				       cmd_reg, nfc->ctrl_reg, false);
+
+	nfc_debug_data("[id] ", nfc->buf, AR934X_NFC_ID_BUF_SIZE);
+
+	return err;
+}
+
+static int
+ar934x_nfc_send_read(struct ar934x_nfc *nfc, unsigned command, int column,
+		     int page_addr, int len)
+{
+	u32 cmd_reg;
+	int err;
+
+	nfc_dbg(nfc, "read, column=%d page=%d len=%d\n",
+		column, page_addr, len);
+
+	cmd_reg = (command & AR934X_NFC_CMD_CMD0_M) << AR934X_NFC_CMD_CMD0_S;
+
+	if (nfc->small_page) {
+		cmd_reg |= AR934X_NFC_CMD_SEQ_18;
+	} else {
+		cmd_reg |= NAND_CMD_READSTART << AR934X_NFC_CMD_CMD1_S;
+		cmd_reg |= AR934X_NFC_CMD_SEQ_1C5A1CXR;
+	}
+
+	err = ar934x_nfc_do_rw_command(nfc, column, page_addr, len,
+				       cmd_reg, nfc->ctrl_reg, false);
+
+	nfc_debug_data("[data] ", nfc->buf, len);
+
+	return err;
+}
+
+static void
+ar934x_nfc_send_erase(struct ar934x_nfc *nfc, unsigned command, int column,
+		      int page_addr)
+{
+	u32 addr0, addr1;
+	u32 ctrl_reg;
+	u32 cmd_reg;
+
+	ar934x_nfc_get_addr(nfc, column, page_addr, &addr0, &addr1);
+
+	ctrl_reg = nfc->ctrl_reg;
+	if (nfc->small_page) {
+		/* override number of address cycles for the erase command */
+		ctrl_reg &= ~(AR934X_NFC_CTRL_ADDR_CYCLE0_M <<
+			      AR934X_NFC_CTRL_ADDR_CYCLE0_S);
+		ctrl_reg &= ~(AR934X_NFC_CTRL_ADDR_CYCLE1_M <<
+			      AR934X_NFC_CTRL_ADDR_CYCLE1_S);
+		ctrl_reg &= ~(AR934X_NFC_CTRL_SMALL_PAGE);
+		ctrl_reg |= (nfc->addr_count0 + 1) <<
+			    AR934X_NFC_CTRL_ADDR_CYCLE0_S;
+	}
+
+	cmd_reg = NAND_CMD_ERASE1 << AR934X_NFC_CMD_CMD0_S;
+	cmd_reg |= command << AR934X_NFC_CMD_CMD1_S;
+	cmd_reg |= AR934X_NFC_CMD_SEQ_ERASE;
+
+	nfc_dbg(nfc, "erase page %d, a0:%08x a1:%08x cmd:%08x ctrl:%08x\n",
+		page_addr, addr0, addr1, cmd_reg, ctrl_reg);
+
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_STATUS, 0);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_CTRL, ctrl_reg);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_ADDR0_0, addr0);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_ADDR0_1, addr1);
+
+	ar934x_nfc_write_cmd_reg(nfc, cmd_reg);
+	ar934x_nfc_wait_dev_ready(nfc);
+}
+
+static int
+ar934x_nfc_send_write(struct ar934x_nfc *nfc, unsigned command, int column,
+		     int page_addr, int len)
+{
+	u32 cmd_reg;
+
+	nfc_dbg(nfc, "write, column=%d page=%d len=%d\n",
+		column, page_addr, len);
+
+	nfc_debug_data("[data] ", nfc->buf, len);
+
+	cmd_reg = NAND_CMD_SEQIN << AR934X_NFC_CMD_CMD0_S;
+	cmd_reg |= command << AR934X_NFC_CMD_CMD1_S;
+	cmd_reg |= AR934X_NFC_CMD_SEQ_12;
+
+	return ar934x_nfc_do_rw_command(nfc, column, page_addr, len,
+					cmd_reg, nfc->ctrl_reg, true);
+}
+
+static void
+ar934x_nfc_read_status(struct ar934x_nfc *nfc)
+{
+	u32 cmd_reg;
+	u32 status;
+
+	cmd_reg = NAND_CMD_STATUS << AR934X_NFC_CMD_CMD0_S;
+	cmd_reg |= AR934X_NFC_CMD_SEQ_S;
+
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_STATUS, 0);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_CTRL, nfc->ctrl_reg);
+
+	ar934x_nfc_write_cmd_reg(nfc, cmd_reg);
+	ar934x_nfc_wait_dev_ready(nfc);
+
+	status = ar934x_nfc_rr(nfc, AR934X_NFC_REG_READ_STATUS);
+
+	nfc_dbg(nfc, "read status, cmd:%08x status:%02x\n",
+		cmd_reg, (status & 0xff));
+
+	if (nfc->swap_dma)
+		nfc->buf[0 ^ 3] = status;
+	else
+		nfc->buf[0] = status;
+}
+
+static void
+ar934x_nfc_cmdfunc(struct mtd_info *mtd, unsigned int command, int column,
+		   int page_addr)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	struct nand_chip *nand = mtd->priv;
+
+	nfc->read_id = false;
+	if (command != NAND_CMD_PAGEPROG)
+		nfc->buf_index = 0;
+
+	switch (command) {
+	case NAND_CMD_RESET:
+		ar934x_nfc_send_cmd(nfc, command);
+		break;
+
+	case NAND_CMD_READID:
+		nfc->read_id = true;
+		ar934x_nfc_send_readid(nfc, command);
+		break;
+
+	case NAND_CMD_READ0:
+	case NAND_CMD_READ1:
+		if (nfc->small_page) {
+			ar934x_nfc_send_read(nfc, command, column, page_addr,
+					     mtd->writesize + mtd->oobsize);
+		} else {
+			ar934x_nfc_send_read(nfc, command, 0, page_addr,
+					     mtd->writesize + mtd->oobsize);
+			nfc->buf_index = column;
+			nfc->rndout_page_addr = page_addr;
+			nfc->rndout_read_cmd = command;
+		}
+		break;
+
+	case NAND_CMD_READOOB:
+		if (nfc->small_page)
+			ar934x_nfc_send_read(nfc, NAND_CMD_READOOB,
+					     column, page_addr,
+					     mtd->oobsize);
+		else
+			ar934x_nfc_send_read(nfc, NAND_CMD_READ0,
+					     mtd->writesize, page_addr,
+					     mtd->oobsize);
+		break;
+
+	case NAND_CMD_RNDOUT:
+		if (WARN_ON(nfc->small_page))
+			break;
+
+		/* emulate subpage read */
+		ar934x_nfc_send_read(nfc, nfc->rndout_read_cmd, 0,
+				     nfc->rndout_page_addr,
+				     mtd->writesize + mtd->oobsize);
+		nfc->buf_index = column;
+		break;
+
+	case NAND_CMD_ERASE1:
+		nfc->erase1_page_addr = page_addr;
+		break;
+
+	case NAND_CMD_ERASE2:
+		ar934x_nfc_send_erase(nfc, command, -1, nfc->erase1_page_addr);
+		break;
+
+	case NAND_CMD_STATUS:
+		ar934x_nfc_read_status(nfc);
+		break;
+
+	case NAND_CMD_SEQIN:
+		if (nfc->small_page) {
+			/* output read command */
+			if (column >= mtd->writesize) {
+				column -= mtd->writesize;
+				nfc->seqin_read_cmd = NAND_CMD_READOOB;
+			} else if (column < 256) {
+				nfc->seqin_read_cmd = NAND_CMD_READ0;
+			} else {
+				column -= 256;
+				nfc->seqin_read_cmd = NAND_CMD_READ1;
+			}
+		} else {
+			nfc->seqin_read_cmd = NAND_CMD_READ0;
+		}
+		nfc->seqin_column = column;
+		nfc->seqin_page_addr = page_addr;
+		break;
+
+	case NAND_CMD_PAGEPROG:
+		if (nand->ecc.mode == NAND_ECC_HW) {
+			/* the data is already written */
+			break;
+		}
+
+		if (nfc->small_page)
+			ar934x_nfc_send_cmd(nfc, nfc->seqin_read_cmd);
+
+		ar934x_nfc_send_write(nfc, command, nfc->seqin_column,
+				      nfc->seqin_page_addr,
+				      nfc->buf_index);
+		break;
+
+	default:
+		dev_err(nfc->parent,
+			"unsupported command: %x, column:%d page_addr=%d\n",
+			command, column, page_addr);
+		break;
+	}
+}
+
+static int
+ar934x_nfc_dev_ready(struct mtd_info *mtd)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+
+	return __ar934x_nfc_dev_ready(nfc);
+}
+
+static void
+ar934x_nfc_select_chip(struct mtd_info *mtd, int chip_no)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+
+	if (nfc->select_chip)
+		nfc->select_chip(chip_no);
+}
+
+static u8
+ar934x_nfc_read_byte(struct mtd_info *mtd)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	u8 data;
+
+	WARN_ON(nfc->buf_index >= nfc->buf_size);
+
+	if (nfc->swap_dma || nfc->read_id)
+		data = nfc->buf[nfc->buf_index ^ 3];
+	else
+		data = nfc->buf[nfc->buf_index];
+
+	nfc->buf_index++;
+
+	return data;
+}
+
+static void
+ar934x_nfc_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	int i;
+
+	WARN_ON(nfc->buf_index + len > nfc->buf_size);
+
+	if (nfc->swap_dma) {
+		for (i = 0; i < len; i++) {
+			nfc->buf[nfc->buf_index ^ 3] = buf[i];
+			nfc->buf_index++;
+		}
+	} else {
+		for (i = 0; i < len; i++) {
+			nfc->buf[nfc->buf_index] = buf[i];
+			nfc->buf_index++;
+		}
+	}
+}
+
+static void
+ar934x_nfc_read_buf(struct mtd_info *mtd, u8 *buf, int len)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	int buf_index;
+	int i;
+
+	WARN_ON(nfc->buf_index + len > nfc->buf_size);
+
+	buf_index = nfc->buf_index;
+
+	if (nfc->swap_dma || nfc->read_id) {
+		for (i = 0; i < len; i++) {
+			buf[i] = nfc->buf[buf_index ^ 3];
+			buf_index++;
+		}
+	} else {
+		for (i = 0; i < len; i++) {
+			buf[i] = nfc->buf[buf_index];
+			buf_index++;
+		}
+	}
+
+	nfc->buf_index = buf_index;
+}
+
+static inline void
+ar934x_nfc_enable_hwecc(struct ar934x_nfc *nfc)
+{
+	nfc->ctrl_reg |= AR934X_NFC_CTRL_ECC_EN;
+	nfc->ctrl_reg &= ~AR934X_NFC_CTRL_CUSTOM_SIZE_EN;
+}
+
+static inline void
+ar934x_nfc_disable_hwecc(struct ar934x_nfc *nfc)
+{
+	nfc->ctrl_reg &= ~AR934X_NFC_CTRL_ECC_EN;
+	nfc->ctrl_reg |= AR934X_NFC_CTRL_CUSTOM_SIZE_EN;
+}
+
+static int
+ar934x_nfc_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
+		    int page)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	int err;
+
+	nfc_dbg(nfc, "read_oob: page:%d\n", page);
+
+	err = ar934x_nfc_send_read(nfc, NAND_CMD_READ0, mtd->writesize, page,
+				   mtd->oobsize);
+	if (err)
+		return err;
+
+	memcpy(chip->oob_poi, nfc->buf, mtd->oobsize);
+
+	return 0;
+}
+
+static int
+ar934x_nfc_write_oob(struct mtd_info *mtd, struct nand_chip *chip,
+		     int page)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+
+	nfc_dbg(nfc, "write_oob: page:%d\n", page);
+
+	memcpy(nfc->buf, chip->oob_poi, mtd->oobsize);
+
+	return ar934x_nfc_send_write(nfc, NAND_CMD_PAGEPROG, mtd->writesize,
+				     page, mtd->oobsize);
+}
+
+static int
+ar934x_nfc_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+			 u8 *buf, int oob_required, int page)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	int len;
+	int err;
+
+	nfc_dbg(nfc, "read_page_raw: page:%d oob:%d\n", page, oob_required);
+
+	len = mtd->writesize;
+	if (oob_required)
+		len += mtd->oobsize;
+
+	err = ar934x_nfc_send_read(nfc, NAND_CMD_READ0, 0, page, len);
+	if (err)
+		return err;
+
+	memcpy(buf, nfc->buf, mtd->writesize);
+
+	if (oob_required)
+		memcpy(chip->oob_poi, &nfc->buf[mtd->writesize], mtd->oobsize);
+
+	return 0;
+}
+
+static int
+ar934x_nfc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+		     u8 *buf, int oob_required, int page)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	u32 ecc_ctrl;
+	int max_bitflips = 0;
+	bool ecc_failed;
+	bool ecc_corrected;
+	int err;
+
+	nfc_dbg(nfc, "read_page: page:%d oob:%d\n", page, oob_required);
+
+	ar934x_nfc_enable_hwecc(nfc);
+	err = ar934x_nfc_send_read(nfc, NAND_CMD_READ0, 0, page,
+				   mtd->writesize);
+	ar934x_nfc_disable_hwecc(nfc);
+
+	if (err)
+		return err;
+
+	/* TODO: optimize to avoid memcpy */
+	memcpy(buf, nfc->buf, mtd->writesize);
+
+	/* read the ECC status */
+	ecc_ctrl = ar934x_nfc_rr(nfc, AR934X_NFC_REG_ECC_CTRL);
+	ecc_failed = ecc_ctrl & AR934X_NFC_ECC_CTRL_ERR_UNCORRECT;
+	ecc_corrected = ecc_ctrl & AR934X_NFC_ECC_CTRL_ERR_CORRECT;
+
+	if (oob_required || ecc_failed) {
+		err = ar934x_nfc_send_read(nfc, NAND_CMD_READ0, mtd->writesize,
+					   page, mtd->oobsize);
+		if (err)
+			return err;
+
+		if (oob_required)
+			memcpy(chip->oob_poi, nfc->buf, mtd->oobsize);
+	}
+
+	if (ecc_failed) {
+		/*
+		 * The hardware ECC engine reports uncorrectable errors
+		 * on empty pages. Check the ECC bytes and the data. If
+		 * both contains 0xff bytes only, dont report a failure.
+		 *
+		 * TODO: prebuild a buffer with 0xff bytes and use memcmp
+		 * for better performance?
+		 */
+		if (!is_all_ff(&nfc->buf[nfc->ecc_oob_pos], chip->ecc.total) ||
+		    !is_all_ff(buf, mtd->writesize))
+				mtd->ecc_stats.failed++;
+	} else if (ecc_corrected) {
+		/*
+		 * The hardware does not report the exact count of the
+		 * corrected bitflips, use assumptions based on the
+		 * threshold.
+		 */
+		if (ecc_ctrl & AR934X_NFC_ECC_CTRL_ERR_OVER) {
+			/*
+			 * The number of corrected bitflips exceeds the
+			 * threshold. Assume the maximum.
+			 */
+			max_bitflips = chip->ecc.strength * chip->ecc.steps;
+		} else {
+			max_bitflips = nfc->ecc_thres * chip->ecc.steps;
+		}
+
+		mtd->ecc_stats.corrected += max_bitflips;
+	}
+
+	return max_bitflips;
+}
+
+static int
+ar934x_nfc_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+			  const u8 *buf, int oob_required)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	int page;
+	int len;
+
+	page = nfc->seqin_page_addr;
+
+	nfc_dbg(nfc, "write_page_raw: page:%d oob:%d\n", page, oob_required);
+
+	memcpy(nfc->buf, buf, mtd->writesize);
+	len = mtd->writesize;
+
+	if (oob_required) {
+		memcpy(&nfc->buf[mtd->writesize], chip->oob_poi, mtd->oobsize);
+		len += mtd->oobsize;
+	}
+
+	return ar934x_nfc_send_write(nfc, NAND_CMD_PAGEPROG, 0, page, len);
+}
+
+static int
+ar934x_nfc_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+		      const u8 *buf, int oob_required)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	int page;
+	int err;
+
+	page = nfc->seqin_page_addr;
+
+	nfc_dbg(nfc, "write_page: page:%d oob:%d\n", page, oob_required);
+
+	/* write OOB first */
+	if (oob_required &&
+	    !is_all_ff(chip->oob_poi, mtd->oobsize)) {
+		err = ar934x_nfc_write_oob(mtd, chip, page);
+		if (err)
+			return err;
+	}
+
+	/* TODO: optimize to avoid memcopy */
+	memcpy(nfc->buf, buf, mtd->writesize);
+
+	ar934x_nfc_enable_hwecc(nfc);
+	err = ar934x_nfc_send_write(nfc, NAND_CMD_PAGEPROG, 0, page,
+				    mtd->writesize);
+	ar934x_nfc_disable_hwecc(nfc);
+
+	return err;
+}
+
+static void
+ar934x_nfc_hw_init(struct ar934x_nfc *nfc)
+{
+	struct ar934x_nfc_platform_data *pdata;
+
+	pdata = ar934x_nfc_get_platform_data(nfc);
+	if (pdata->hw_reset) {
+		pdata->hw_reset(true);
+		pdata->hw_reset(false);
+	}
+
+	/*
+	 * setup timings
+	 * TODO: make it configurable via platform data
+	 */
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_TIME_SEQ,
+		      AR934X_NFC_TIME_SEQ_DEFAULT);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_TIMINGS_ASYN,
+		      AR934X_NFC_TIMINGS_ASYN_DEFAULT);
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_TIMINGS_SYN,
+		      AR934X_NFC_TIMINGS_SYN_DEFAULT);
+
+	/* disable WP on all chips, and select chip 0 */
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_MEM_CTRL, 0xff00);
+
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_DMA_ADDR_OFFS, 0);
+
+	/* initialize Control register */
+	nfc->ctrl_reg = AR934X_NFC_CTRL_CUSTOM_SIZE_EN;
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_CTRL, nfc->ctrl_reg);
+
+	if (nfc->small_page) {
+		/*  Setup generic sequence register for small page reads. */
+		ar934x_nfc_wr(nfc, AR934X_NFC_REG_GEN_SEQ_CTRL,
+			      AR934X_NFC_GENSEQ_SMALL_PAGE_READ);
+	}
+}
+
+static void
+ar934x_nfc_restart(struct ar934x_nfc *nfc)
+{
+	u32 ctrl_reg;
+
+	if (nfc->select_chip)
+		nfc->select_chip(-1);
+
+	ctrl_reg = nfc->ctrl_reg;
+	ar934x_nfc_hw_init(nfc);
+	nfc->ctrl_reg = ctrl_reg;
+
+	if (nfc->select_chip)
+		nfc->select_chip(0);
+
+	ar934x_nfc_send_cmd(nfc, NAND_CMD_RESET);
+}
+
+static irqreturn_t
+ar934x_nfc_irq_handler(int irq, void *data)
+{
+	struct ar934x_nfc *nfc = data;
+	u32 status;
+
+	status = ar934x_nfc_rr(nfc, AR934X_NFC_REG_INT_STATUS);
+
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_INT_STATUS, 0);
+	/* flush write */
+	ar934x_nfc_rr(nfc, AR934X_NFC_REG_INT_STATUS);
+
+	status &= ar934x_nfc_rr(nfc, AR934X_NFC_REG_INT_MASK);
+	if (status) {
+		nfc_dbg(nfc, "got IRQ, status:%08x\n", status);
+
+		nfc->irq_status = status;
+		nfc->spurious_irq_expected = true;
+		wake_up(&nfc->irq_waitq);
+	} else {
+		if (nfc->spurious_irq_expected) {
+			nfc->spurious_irq_expected = false;
+		} else {
+			dev_warn(nfc->parent, "spurious interrupt\n");
+		}
+	}
+
+	return IRQ_HANDLED;
+}
+
+static int
+ar934x_nfc_init_tail(struct mtd_info *mtd)
+{
+	struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
+	struct nand_chip *chip = &nfc->nand_chip;
+	u32 ctrl;
+	u32 t;
+	int err;
+
+	switch (mtd->oobsize) {
+	case 16:
+	case 64:
+	case 128:
+		ar934x_nfc_wr(nfc, AR934X_NFC_REG_SPARE_SIZE, mtd->oobsize);
+		break;
+
+	default:
+		dev_err(nfc->parent, "unsupported OOB size: %d bytes\n",
+			mtd->oobsize);
+		return -ENXIO;
+	}
+
+	ctrl = AR934X_NFC_CTRL_CUSTOM_SIZE_EN;
+
+	switch (mtd->erasesize / mtd->writesize) {
+	case 32:
+		t = AR934X_NFC_CTRL_BLOCK_SIZE_32;
+		break;
+
+	case 64:
+		t = AR934X_NFC_CTRL_BLOCK_SIZE_64;
+		break;
+
+	case 128:
+		t = AR934X_NFC_CTRL_BLOCK_SIZE_128;
+		break;
+
+	case 256:
+		t = AR934X_NFC_CTRL_BLOCK_SIZE_256;
+		break;
+
+	default:
+		dev_err(nfc->parent, "unsupported block size: %u\n",
+			mtd->erasesize / mtd->writesize);
+		return -ENXIO;
+	}
+
+	ctrl |= t << AR934X_NFC_CTRL_BLOCK_SIZE_S;
+
+	switch (mtd->writesize) {
+	case 256:
+		nfc->small_page = 1;
+		t = AR934X_NFC_CTRL_PAGE_SIZE_256;
+		break;
+
+	case 512:
+		nfc->small_page = 1;
+		t = AR934X_NFC_CTRL_PAGE_SIZE_512;
+		break;
+
+	case 1024:
+		t = AR934X_NFC_CTRL_PAGE_SIZE_1024;
+		break;
+
+	case 2048:
+		t = AR934X_NFC_CTRL_PAGE_SIZE_2048;
+		break;
+
+	case 4096:
+		t = AR934X_NFC_CTRL_PAGE_SIZE_4096;
+		break;
+
+	case 8192:
+		t = AR934X_NFC_CTRL_PAGE_SIZE_8192;
+		break;
+
+	case 16384:
+		t = AR934X_NFC_CTRL_PAGE_SIZE_16384;
+		break;
+
+	default:
+		dev_err(nfc->parent, "unsupported write size: %d bytes\n",
+			mtd->writesize);
+		return -ENXIO;
+	}
+
+	ctrl |= t << AR934X_NFC_CTRL_PAGE_SIZE_S;
+
+	if (nfc->small_page) {
+		ctrl |= AR934X_NFC_CTRL_SMALL_PAGE;
+
+		if (chip->chipsize > (32 << 20)) {
+			nfc->addr_count0 = 4;
+			nfc->addr_count1 = 3;
+		} else if (chip->chipsize > (2 << 16)) {
+			nfc->addr_count0 = 3;
+			nfc->addr_count1 = 2;
+		} else {
+			nfc->addr_count0 = 2;
+			nfc->addr_count1 = 1;
+		}
+	} else {
+		if (chip->chipsize > (128 << 20)) {
+			nfc->addr_count0 = 5;
+			nfc->addr_count1 = 3;
+		} else if (chip->chipsize > (8 << 16)) {
+			nfc->addr_count0 = 4;
+			nfc->addr_count1 = 2;
+		} else {
+			nfc->addr_count0 = 3;
+			nfc->addr_count1 = 1;
+		}
+	}
+
+	ctrl |= nfc->addr_count0 << AR934X_NFC_CTRL_ADDR_CYCLE0_S;
+	ctrl |= nfc->addr_count1 << AR934X_NFC_CTRL_ADDR_CYCLE1_S;
+
+	nfc->ctrl_reg = ctrl;
+	ar934x_nfc_wr(nfc, AR934X_NFC_REG_CTRL, nfc->ctrl_reg);
+
+	ar934x_nfc_free_buf(nfc);
+	err = ar934x_nfc_alloc_buf(nfc, mtd->writesize + mtd->oobsize);
+
+	return err;
+}
+
+static struct nand_ecclayout ar934x_nfc_oob_64_hwecc = {
+	.eccbytes = 28,
+	.eccpos = {
+		20, 21, 22, 23, 24, 25, 26,
+		27, 28, 29, 30, 31, 32, 33,
+		34, 35, 36, 37, 38, 39, 40,
+		41, 42, 43, 44, 45, 46, 47,
+	},
+	.oobfree = {
+		{
+			.offset = 4,
+			.length = 16,
+		},
+		{
+			.offset = 48,
+			.length = 16,
+		},
+	},
+};
+
+static int
+ar934x_nfc_setup_hwecc(struct ar934x_nfc *nfc)
+{
+	struct nand_chip *nand = &nfc->nand_chip;
+	u32 ecc_cap;
+	u32 ecc_thres;
+
+	if (!config_enabled(CONFIG_MTD_NAND_AR934X_HW_ECC)) {
+		dev_err(nfc->parent, "hardware ECC support is disabled\n");
+		return -EINVAL;
+	}
+
+	switch (nfc->mtd.writesize) {
+	case 2048:
+		/*
+		 * Writing a subpage separately is not supported, because
+		 * the controller only does ECC on full-page accesses.
+		 */
+		nand->options = NAND_NO_SUBPAGE_WRITE;
+
+		nand->ecc.size = 512;
+		nand->ecc.bytes = 7;
+		nand->ecc.strength = 4;
+		nand->ecc.layout = &ar934x_nfc_oob_64_hwecc;
+		break;
+
+	default:
+		dev_err(nfc->parent,
+			"hardware ECC is not available for %d byte pages\n",
+			nfc->mtd.writesize);
+		return -EINVAL;
+	}
+
+	BUG_ON(!nand->ecc.layout);
+
+	switch (nand->ecc.strength) {
+	case 4:
+		ecc_cap = AR934X_NFC_ECC_CTRL_ECC_CAP_4;
+		ecc_thres = 4;
+		break;
+
+	default:
+		dev_err(nfc->parent, "unsupported ECC strength %u\n",
+			nand->ecc.strength);
+		return -EINVAL;
+	}
+
+	nfc->ecc_thres = ecc_thres;
+	nfc->ecc_oob_pos = nand->ecc.layout->eccpos[0];
+
+	nfc->ecc_ctrl_reg = ecc_cap << AR934X_NFC_ECC_CTRL_ECC_CAP_S;
+	nfc->ecc_ctrl_reg |= ecc_thres << AR934X_NFC_ECC_CTRL_ERR_THRES_S;
+
+	nfc->ecc_offset_reg = nfc->mtd.writesize + nfc->ecc_oob_pos;
+
+	nand->ecc.mode = NAND_ECC_HW;
+	nand->ecc.read_page = ar934x_nfc_read_page;
+	nand->ecc.read_page_raw = ar934x_nfc_read_page_raw;
+	nand->ecc.write_page = ar934x_nfc_write_page;
+	nand->ecc.write_page_raw = ar934x_nfc_write_page_raw;
+	nand->ecc.read_oob = ar934x_nfc_read_oob;
+	nand->ecc.write_oob = ar934x_nfc_write_oob;
+
+	return 0;
+}
+
+static int
+ar934x_nfc_probe(struct platform_device *pdev)
+{
+	static const char *part_probes[] = { "cmdlinepart", NULL, };
+	struct ar934x_nfc_platform_data *pdata;
+	struct ar934x_nfc *nfc;
+	struct resource *res;
+	struct mtd_info *mtd;
+	struct nand_chip *nand;
+	struct mtd_part_parser_data ppdata;
+	int ret;
+
+	pdata = pdev->dev.platform_data;
+	if (pdata == NULL) {
+		dev_err(&pdev->dev, "no platform data defined\n");
+		return -EINVAL;
+	}
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "failed to get I/O memory\n");
+		return -EINVAL;
+	}
+
+	nfc = devm_kzalloc(&pdev->dev, sizeof(struct ar934x_nfc), GFP_KERNEL);
+	if (!nfc) {
+		dev_err(&pdev->dev, "failed to allocate driver data\n");
+		return -ENOMEM;
+	}
+
+	nfc->base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(nfc->base)) {
+		dev_err(&pdev->dev, "failed to remap I/O memory\n");
+		return PTR_ERR(nfc->base);
+	}
+
+	nfc->irq = platform_get_irq(pdev, 0);
+	if (nfc->irq < 0) {
+		dev_err(&pdev->dev, "no IRQ resource specified\n");
+		return -EINVAL;
+	}
+
+	init_waitqueue_head(&nfc->irq_waitq);
+	ret = request_irq(nfc->irq, ar934x_nfc_irq_handler, IRQF_DISABLED,
+			  dev_name(&pdev->dev), nfc);
+	if (ret) {
+		dev_err(&pdev->dev, "requast_irq failed, err:%d\n", ret);
+		return ret;
+	}
+
+	nfc->parent = &pdev->dev;
+	nfc->select_chip = pdata->select_chip;
+	nfc->swap_dma = pdata->swap_dma;
+
+	nand = &nfc->nand_chip;
+	mtd = &nfc->mtd;
+
+	mtd->priv = nand;
+	mtd->owner = THIS_MODULE;
+	if (pdata->name)
+		mtd->name = pdata->name;
+	else
+		mtd->name = dev_name(&pdev->dev);
+
+	nand->chip_delay = 25;
+
+	nand->dev_ready = ar934x_nfc_dev_ready;
+	nand->cmdfunc = ar934x_nfc_cmdfunc;
+	nand->read_byte = ar934x_nfc_read_byte;
+	nand->write_buf = ar934x_nfc_write_buf;
+	nand->read_buf = ar934x_nfc_read_buf;
+	nand->select_chip = ar934x_nfc_select_chip;
+
+	ret = ar934x_nfc_alloc_buf(nfc, AR934X_NFC_ID_BUF_SIZE);
+	if (ret)
+		goto err_free_irq;
+
+	platform_set_drvdata(pdev, nfc);
+
+	ar934x_nfc_hw_init(nfc);
+
+	ret = nand_scan_ident(mtd, 1, NULL);
+	if (ret) {
+		dev_err(&pdev->dev, "nand_scan_ident failed, err:%d\n", ret);
+		goto err_free_buf;
+	}
+
+	ret = ar934x_nfc_init_tail(mtd);
+	if (ret) {
+		dev_err(&pdev->dev, "init tail failed, err:%d\n", ret);
+		goto err_free_buf;
+	}
+
+	if (pdata->scan_fixup) {
+		ret = pdata->scan_fixup(mtd);
+		if (ret)
+			goto err_free_buf;
+	}
+
+	switch (pdata->ecc_mode) {
+	case AR934X_NFC_ECC_SOFT:
+		nand->ecc.mode = NAND_ECC_SOFT;
+		break;
+
+	case AR934X_NFC_ECC_HW:
+		ret = ar934x_nfc_setup_hwecc(nfc);
+		if (ret)
+			goto err_free_buf;
+
+		break;
+
+	default:
+		dev_err(nfc->parent, "unknown ECC mode %d\n", pdata->ecc_mode);
+		return -EINVAL;
+	}
+
+	ret = nand_scan_tail(mtd);
+	if (ret) {
+		dev_err(&pdev->dev, "scan tail failed, err:%d\n", ret);
+		goto err_free_buf;
+	}
+
+	memset(&ppdata, '\0', sizeof(ppdata));
+	ret = mtd_device_parse_register(mtd, part_probes, &ppdata,
+					pdata->parts, pdata->nr_parts);
+	if (ret) {
+		dev_err(&pdev->dev, "unable to register mtd, err:%d\n", ret);
+		goto err_free_buf;
+	}
+
+	return 0;
+
+err_free_buf:
+	ar934x_nfc_free_buf(nfc);
+err_free_irq:
+	free_irq(nfc->irq, nfc);
+	return ret;
+}
+
+static int
+ar934x_nfc_remove(struct platform_device *pdev)
+{
+	struct ar934x_nfc *nfc;
+
+	nfc = platform_get_drvdata(pdev);
+	if (nfc) {
+		nand_release(&nfc->mtd);
+		ar934x_nfc_free_buf(nfc);
+		free_irq(nfc->irq, nfc);
+	}
+
+	return 0;
+}
+
+static struct platform_driver ar934x_nfc_driver = {
+	.probe		= ar934x_nfc_probe,
+	.remove		= ar934x_nfc_remove,
+	.driver = {
+		.name	= AR934X_NFC_DRIVER_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+module_platform_driver(ar934x_nfc_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("Atheros AR934x NAND Flash Controller driver");
+MODULE_ALIAS("platform:" AR934X_NFC_DRIVER_NAME);
diff --git a/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
new file mode 100644
index 00000000..5b9841b7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
@@ -0,0 +1,305 @@
+/*
+ *  NAND flash driver for the MikroTik RouterBoard 4xx series
+ *
+ *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This file was based on the driver for Linux 2.6.22 published by
+ *  MikroTik for their RouterBoard 4xx series devices.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/rb4xx_cpld.h>
+
+#define DRV_NAME        "rb4xx-nand"
+#define DRV_VERSION     "0.2.0"
+#define DRV_DESC        "NAND flash driver for RouterBoard 4xx series"
+
+#define RB4XX_NAND_GPIO_READY	5
+#define RB4XX_NAND_GPIO_ALE	37
+#define RB4XX_NAND_GPIO_CLE	38
+#define RB4XX_NAND_GPIO_NCE	39
+
+struct rb4xx_nand_info {
+	struct nand_chip	chip;
+	struct mtd_info		mtd;
+};
+
+/*
+ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
+ * will not be able to find the kernel that we load.
+ */
+static struct nand_ecclayout rb4xx_nand_ecclayout = {
+	.eccbytes	= 6,
+	.eccpos		= { 8, 9, 10, 13, 14, 15 },
+	.oobavail	= 9,
+	.oobfree	= { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
+};
+
+static struct mtd_partition rb4xx_nand_partitions[] = {
+	{
+		.name	= "booter",
+		.offset	= 0,
+		.size	= (256 * 1024),
+		.mask_flags = MTD_WRITEABLE,
+	},
+	{
+		.name	= "kernel",
+		.offset	= (256 * 1024),
+		.size	= (4 * 1024 * 1024) - (256 * 1024),
+	},
+	{
+		.name	= "rootfs",
+		.offset	= MTDPART_OFS_NXTBLK,
+		.size	= MTDPART_SIZ_FULL,
+	},
+};
+
+static int rb4xx_nand_dev_ready(struct mtd_info *mtd)
+{
+	return gpio_get_value_cansleep(RB4XX_NAND_GPIO_READY);
+}
+
+static void rb4xx_nand_write_cmd(unsigned char cmd)
+{
+	unsigned char data = cmd;
+	int err;
+
+	err = rb4xx_cpld_write(&data, 1);
+	if (err)
+		pr_err("rb4xx_nand: write cmd failed, err=%d\n", err);
+}
+
+static void rb4xx_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
+				unsigned int ctrl)
+{
+	if (ctrl & NAND_CTRL_CHANGE) {
+		gpio_set_value_cansleep(RB4XX_NAND_GPIO_CLE,
+					(ctrl & NAND_CLE) ? 1 : 0);
+		gpio_set_value_cansleep(RB4XX_NAND_GPIO_ALE,
+					(ctrl & NAND_ALE) ? 1 : 0);
+		gpio_set_value_cansleep(RB4XX_NAND_GPIO_NCE,
+					(ctrl & NAND_NCE) ? 0 : 1);
+	}
+
+	if (cmd != NAND_CMD_NONE)
+		rb4xx_nand_write_cmd(cmd);
+}
+
+static unsigned char rb4xx_nand_read_byte(struct mtd_info *mtd)
+{
+	unsigned char data = 0;
+	int err;
+
+	err = rb4xx_cpld_read(&data, NULL, 1);
+	if (err) {
+		pr_err("rb4xx_nand: read data failed, err=%d\n", err);
+		data = 0xff;
+	}
+
+	return data;
+}
+
+static void rb4xx_nand_write_buf(struct mtd_info *mtd, const unsigned char *buf,
+				 int len)
+{
+	int err;
+
+	err = rb4xx_cpld_write(buf, len);
+	if (err)
+		pr_err("rb4xx_nand: write buf failed, err=%d\n", err);
+}
+
+static void rb4xx_nand_read_buf(struct mtd_info *mtd, unsigned char *buf,
+				int len)
+{
+	int err;
+
+	err = rb4xx_cpld_read(buf, NULL, len);
+	if (err)
+		pr_err("rb4xx_nand: read buf failed, err=%d\n", err);
+}
+
+static int rb4xx_nand_probe(struct platform_device *pdev)
+{
+	struct rb4xx_nand_info	*info;
+	int ret;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+
+	ret = gpio_request(RB4XX_NAND_GPIO_READY, "NAND RDY");
+	if (ret) {
+		dev_err(&pdev->dev, "unable to request gpio %d\n",
+			RB4XX_NAND_GPIO_READY);
+		goto err;
+	}
+
+	ret = gpio_direction_input(RB4XX_NAND_GPIO_READY);
+	if (ret) {
+		dev_err(&pdev->dev, "unable to set input mode on gpio %d\n",
+			RB4XX_NAND_GPIO_READY);
+		goto err_free_gpio_ready;
+	}
+
+	ret = gpio_request(RB4XX_NAND_GPIO_ALE, "NAND ALE");
+	if (ret) {
+		dev_err(&pdev->dev, "unable to request gpio %d\n",
+			RB4XX_NAND_GPIO_ALE);
+		goto err_free_gpio_ready;
+	}
+
+	ret = gpio_direction_output(RB4XX_NAND_GPIO_ALE, 0);
+	if (ret) {
+		dev_err(&pdev->dev, "unable to set output mode on gpio %d\n",
+			RB4XX_NAND_GPIO_ALE);
+		goto err_free_gpio_ale;
+	}
+
+	ret = gpio_request(RB4XX_NAND_GPIO_CLE, "NAND CLE");
+	if (ret) {
+		dev_err(&pdev->dev, "unable to request gpio %d\n",
+			RB4XX_NAND_GPIO_CLE);
+		goto err_free_gpio_ale;
+	}
+
+	ret = gpio_direction_output(RB4XX_NAND_GPIO_CLE, 0);
+	if (ret) {
+		dev_err(&pdev->dev, "unable to set output mode on gpio %d\n",
+			RB4XX_NAND_GPIO_CLE);
+		goto err_free_gpio_cle;
+	}
+
+	ret = gpio_request(RB4XX_NAND_GPIO_NCE, "NAND NCE");
+	if (ret) {
+		dev_err(&pdev->dev, "unable to request gpio %d\n",
+			RB4XX_NAND_GPIO_NCE);
+		goto err_free_gpio_cle;
+	}
+
+	ret = gpio_direction_output(RB4XX_NAND_GPIO_NCE, 1);
+	if (ret) {
+		dev_err(&pdev->dev, "unable to set output mode on gpio %d\n",
+			RB4XX_NAND_GPIO_ALE);
+		goto err_free_gpio_nce;
+	}
+
+	info = kzalloc(sizeof(*info), GFP_KERNEL);
+	if (!info) {
+		dev_err(&pdev->dev, "rb4xx-nand: no memory for private data\n");
+		ret = -ENOMEM;
+		goto err_free_gpio_nce;
+	}
+
+	info->chip.priv	= &info;
+	info->mtd.priv	= &info->chip;
+	info->mtd.owner	= THIS_MODULE;
+
+	info->chip.cmd_ctrl	= rb4xx_nand_cmd_ctrl;
+	info->chip.dev_ready	= rb4xx_nand_dev_ready;
+	info->chip.read_byte	= rb4xx_nand_read_byte;
+	info->chip.write_buf	= rb4xx_nand_write_buf;
+	info->chip.read_buf	= rb4xx_nand_read_buf;
+
+	info->chip.chip_delay	= 25;
+	info->chip.ecc.mode	= NAND_ECC_SOFT;
+
+	platform_set_drvdata(pdev, info);
+
+	ret = nand_scan_ident(&info->mtd, 1, NULL);
+	if (ret) {
+		ret = -ENXIO;
+		goto err_free_info;
+	}
+
+	if (info->mtd.writesize == 512)
+		info->chip.ecc.layout = &rb4xx_nand_ecclayout;
+
+	ret = nand_scan_tail(&info->mtd);
+	if (ret) {
+		return -ENXIO;
+		goto err_set_drvdata;
+	}
+
+	mtd_device_register(&info->mtd, rb4xx_nand_partitions,
+				ARRAY_SIZE(rb4xx_nand_partitions));
+	if (ret)
+		goto err_release_nand;
+
+	return 0;
+
+err_release_nand:
+	nand_release(&info->mtd);
+err_set_drvdata:
+	platform_set_drvdata(pdev, NULL);
+err_free_info:
+	kfree(info);
+err_free_gpio_nce:
+	gpio_free(RB4XX_NAND_GPIO_NCE);
+err_free_gpio_cle:
+	gpio_free(RB4XX_NAND_GPIO_CLE);
+err_free_gpio_ale:
+	gpio_free(RB4XX_NAND_GPIO_ALE);
+err_free_gpio_ready:
+	gpio_free(RB4XX_NAND_GPIO_READY);
+err:
+	return ret;
+}
+
+static int rb4xx_nand_remove(struct platform_device *pdev)
+{
+	struct rb4xx_nand_info *info = platform_get_drvdata(pdev);
+
+	nand_release(&info->mtd);
+	platform_set_drvdata(pdev, NULL);
+	kfree(info);
+	gpio_free(RB4XX_NAND_GPIO_NCE);
+	gpio_free(RB4XX_NAND_GPIO_CLE);
+	gpio_free(RB4XX_NAND_GPIO_ALE);
+	gpio_free(RB4XX_NAND_GPIO_READY);
+
+	return 0;
+}
+
+static struct platform_driver rb4xx_nand_driver = {
+	.probe	= rb4xx_nand_probe,
+	.remove	= rb4xx_nand_remove,
+	.driver	= {
+		.name	= DRV_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init rb4xx_nand_init(void)
+{
+	return platform_driver_register(&rb4xx_nand_driver);
+}
+
+static void __exit rb4xx_nand_exit(void)
+{
+	platform_driver_unregister(&rb4xx_nand_driver);
+}
+
+module_init(rb4xx_nand_init);
+module_exit(rb4xx_nand_exit);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
new file mode 100644
index 00000000..a20409b1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
@@ -0,0 +1,354 @@
+/*
+ *  NAND flash driver for the MikroTik RouterBOARD 750
+ *
+ *  Copyright (C) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/mach-rb750.h>
+
+#define DRV_NAME	"rb750-nand"
+#define DRV_VERSION	"0.1.0"
+#define DRV_DESC	"NAND flash driver for the RouterBOARD 750"
+
+#define RB750_NAND_IO0		BIT(RB750_GPIO_NAND_IO0)
+#define RB750_NAND_ALE		BIT(RB750_GPIO_NAND_ALE)
+#define RB750_NAND_CLE		BIT(RB750_GPIO_NAND_CLE)
+#define RB750_NAND_NRE		BIT(RB750_GPIO_NAND_NRE)
+#define RB750_NAND_NWE		BIT(RB750_GPIO_NAND_NWE)
+#define RB750_NAND_RDY		BIT(RB750_GPIO_NAND_RDY)
+
+#define RB750_NAND_DATA_SHIFT	1
+#define RB750_NAND_DATA_BITS	(0xff << RB750_NAND_DATA_SHIFT)
+#define RB750_NAND_INPUT_BITS	(RB750_NAND_DATA_BITS | RB750_NAND_RDY)
+#define RB750_NAND_OUTPUT_BITS	(RB750_NAND_ALE | RB750_NAND_CLE | \
+				 RB750_NAND_NRE | RB750_NAND_NWE)
+
+struct rb750_nand_info {
+	struct nand_chip	chip;
+	struct mtd_info		mtd;
+	struct rb7xx_nand_platform_data *pdata;
+};
+
+static inline struct rb750_nand_info *mtd_to_rbinfo(struct mtd_info *mtd)
+{
+	return container_of(mtd, struct rb750_nand_info, mtd);
+}
+
+/*
+ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
+ * will not be able to find the kernel that we load.
+ */
+static struct nand_ecclayout rb750_nand_ecclayout = {
+	.eccbytes	= 6,
+	.eccpos		= { 8, 9, 10, 13, 14, 15 },
+	.oobavail	= 9,
+	.oobfree	= { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
+};
+
+static struct mtd_partition rb750_nand_partitions[] = {
+	{
+		.name	= "booter",
+		.offset	= 0,
+		.size	= (256 * 1024),
+		.mask_flags = MTD_WRITEABLE,
+	}, {
+		.name	= "kernel",
+		.offset	= (256 * 1024),
+		.size	= (4 * 1024 * 1024) - (256 * 1024),
+	}, {
+		.name	= "rootfs",
+		.offset	= MTDPART_OFS_NXTBLK,
+		.size	= MTDPART_SIZ_FULL,
+	},
+};
+
+static void rb750_nand_write(const u8 *buf, unsigned len)
+{
+	void __iomem *base = ath79_gpio_base;
+	u32 out;
+	u32 t;
+	unsigned i;
+
+	/* set data lines to output mode */
+	t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+	__raw_writel(t | RB750_NAND_DATA_BITS, base + AR71XX_GPIO_REG_OE);
+
+	out = __raw_readl(base + AR71XX_GPIO_REG_OUT);
+	out &= ~(RB750_NAND_DATA_BITS | RB750_NAND_NWE);
+	for (i = 0; i != len; i++) {
+		u32 data;
+
+		data = buf[i];
+		data <<= RB750_NAND_DATA_SHIFT;
+		data |= out;
+		__raw_writel(data, base + AR71XX_GPIO_REG_OUT);
+
+		__raw_writel(data | RB750_NAND_NWE, base + AR71XX_GPIO_REG_OUT);
+		/* flush write */
+		__raw_readl(base + AR71XX_GPIO_REG_OUT);
+	}
+
+	/* set data lines to input mode */
+	t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+	__raw_writel(t & ~RB750_NAND_DATA_BITS, base + AR71XX_GPIO_REG_OE);
+	/* flush write */
+	__raw_readl(base + AR71XX_GPIO_REG_OE);
+}
+
+static void rb750_nand_read(u8 *read_buf, unsigned len)
+{
+	void __iomem *base = ath79_gpio_base;
+	unsigned i;
+
+	for (i = 0; i < len; i++) {
+		u8 data;
+
+		/* activate RE line */
+		__raw_writel(RB750_NAND_NRE, base + AR71XX_GPIO_REG_CLEAR);
+		/* flush write */
+		__raw_readl(base + AR71XX_GPIO_REG_CLEAR);
+
+		/* read input lines */
+		data = __raw_readl(base + AR71XX_GPIO_REG_IN) >>
+		       RB750_NAND_DATA_SHIFT;
+
+		/* deactivate RE line */
+		__raw_writel(RB750_NAND_NRE, base + AR71XX_GPIO_REG_SET);
+
+		read_buf[i] = data;
+	}
+}
+
+static void rb750_nand_select_chip(struct mtd_info *mtd, int chip)
+{
+	struct rb750_nand_info *rbinfo = mtd_to_rbinfo(mtd);
+	void __iomem *base = ath79_gpio_base;
+	u32 t;
+
+	if (chip >= 0) {
+		rbinfo->pdata->enable_pins();
+
+		/* set input mode for data lines */
+		t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+		__raw_writel(t & ~RB750_NAND_INPUT_BITS,
+			     base + AR71XX_GPIO_REG_OE);
+
+		/* deactivate RE and WE lines */
+		__raw_writel(RB750_NAND_NRE | RB750_NAND_NWE,
+			     base + AR71XX_GPIO_REG_SET);
+		/* flush write */
+		(void) __raw_readl(base + AR71XX_GPIO_REG_SET);
+
+		/* activate CE line */
+		__raw_writel(rbinfo->pdata->nce_line,
+			     base + AR71XX_GPIO_REG_CLEAR);
+	} else {
+		/* deactivate CE line */
+		__raw_writel(rbinfo->pdata->nce_line,
+			     base + AR71XX_GPIO_REG_SET);
+		/* flush write */
+		(void) __raw_readl(base + AR71XX_GPIO_REG_SET);
+
+		t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+		__raw_writel(t | RB750_NAND_IO0 | RB750_NAND_RDY,
+			     base + AR71XX_GPIO_REG_OE);
+
+		rbinfo->pdata->disable_pins();
+	}
+}
+
+static int rb750_nand_dev_ready(struct mtd_info *mtd)
+{
+	void __iomem *base = ath79_gpio_base;
+
+	return !!(__raw_readl(base + AR71XX_GPIO_REG_IN) & RB750_NAND_RDY);
+}
+
+static void rb750_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
+				unsigned int ctrl)
+{
+	if (ctrl & NAND_CTRL_CHANGE) {
+		void __iomem *base = ath79_gpio_base;
+		u32 t;
+
+		t = __raw_readl(base + AR71XX_GPIO_REG_OUT);
+
+		t &= ~(RB750_NAND_CLE | RB750_NAND_ALE);
+		t |= (ctrl & NAND_CLE) ? RB750_NAND_CLE : 0;
+		t |= (ctrl & NAND_ALE) ? RB750_NAND_ALE : 0;
+
+		__raw_writel(t, base + AR71XX_GPIO_REG_OUT);
+		/* flush write */
+		__raw_readl(base + AR71XX_GPIO_REG_OUT);
+	}
+
+	if (cmd != NAND_CMD_NONE) {
+		u8 t = cmd;
+		rb750_nand_write(&t, 1);
+	}
+}
+
+static u8 rb750_nand_read_byte(struct mtd_info *mtd)
+{
+	u8 data = 0;
+	rb750_nand_read(&data, 1);
+	return data;
+}
+
+static void rb750_nand_read_buf(struct mtd_info *mtd, u8 *buf, int len)
+{
+	rb750_nand_read(buf, len);
+}
+
+static void rb750_nand_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
+{
+	rb750_nand_write(buf, len);
+}
+
+static void __init rb750_nand_gpio_init(struct rb750_nand_info *info)
+{
+	void __iomem *base = ath79_gpio_base;
+	u32 out;
+	u32 t;
+
+	out = __raw_readl(base + AR71XX_GPIO_REG_OUT);
+
+	/* setup output levels */
+	__raw_writel(RB750_NAND_NCE | RB750_NAND_NRE | RB750_NAND_NWE,
+		     base + AR71XX_GPIO_REG_SET);
+
+	__raw_writel(RB750_NAND_ALE | RB750_NAND_CLE,
+		     base + AR71XX_GPIO_REG_CLEAR);
+
+	/* setup input lines */
+	t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+	__raw_writel(t & ~(RB750_NAND_INPUT_BITS), base + AR71XX_GPIO_REG_OE);
+
+	/* setup output lines */
+	t = __raw_readl(base + AR71XX_GPIO_REG_OE);
+	t |= RB750_NAND_OUTPUT_BITS;
+	t |= info->pdata->nce_line;
+	__raw_writel(t, base + AR71XX_GPIO_REG_OE);
+
+	info->pdata->latch_change(~out & RB750_NAND_IO0, out & RB750_NAND_IO0);
+}
+
+static int rb750_nand_probe(struct platform_device *pdev)
+{
+	struct rb750_nand_info	*info;
+	struct rb7xx_nand_platform_data *pdata;
+	int ret;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+
+	pdata = pdev->dev.platform_data;
+	if (!pdata)
+		return -EINVAL;
+
+	info = kzalloc(sizeof(*info), GFP_KERNEL);
+	if (!info)
+		return -ENOMEM;
+
+	info->chip.priv	= &info;
+	info->mtd.priv	= &info->chip;
+	info->mtd.owner	= THIS_MODULE;
+
+	info->chip.select_chip	= rb750_nand_select_chip;
+	info->chip.cmd_ctrl	= rb750_nand_cmd_ctrl;
+	info->chip.dev_ready	= rb750_nand_dev_ready;
+	info->chip.read_byte	= rb750_nand_read_byte;
+	info->chip.write_buf	= rb750_nand_write_buf;
+	info->chip.read_buf	= rb750_nand_read_buf;
+
+	info->chip.chip_delay	= 25;
+	info->chip.ecc.mode	= NAND_ECC_SOFT;
+
+	info->pdata = pdata;
+
+	platform_set_drvdata(pdev, info);
+
+	rb750_nand_gpio_init(info);
+
+	ret = nand_scan_ident(&info->mtd, 1, NULL);
+	if (ret) {
+		ret = -ENXIO;
+		goto err_free_info;
+	}
+
+	if (info->mtd.writesize == 512)
+		info->chip.ecc.layout = &rb750_nand_ecclayout;
+
+	ret = nand_scan_tail(&info->mtd);
+	if (ret) {
+		return -ENXIO;
+		goto err_set_drvdata;
+	}
+
+	ret = mtd_device_register(&info->mtd, rb750_nand_partitions,
+				 ARRAY_SIZE(rb750_nand_partitions));
+	if (ret)
+		goto err_release_nand;
+
+	return 0;
+
+err_release_nand:
+	nand_release(&info->mtd);
+err_set_drvdata:
+	platform_set_drvdata(pdev, NULL);
+err_free_info:
+	kfree(info);
+	return ret;
+}
+
+static int rb750_nand_remove(struct platform_device *pdev)
+{
+	struct rb750_nand_info *info = platform_get_drvdata(pdev);
+
+	nand_release(&info->mtd);
+	platform_set_drvdata(pdev, NULL);
+	kfree(info);
+
+	return 0;
+}
+
+static struct platform_driver rb750_nand_driver = {
+	.probe	= rb750_nand_probe,
+	.remove	= rb750_nand_remove,
+	.driver	= {
+		.name	= DRV_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init rb750_nand_init(void)
+{
+	return platform_driver_register(&rb750_nand_driver);
+}
+
+static void __exit rb750_nand_exit(void)
+{
+	platform_driver_unregister(&rb750_nand_driver);
+}
+
+module_init(rb750_nand_init);
+module_exit(rb750_nand_exit);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
new file mode 100644
index 00000000..f0aa3c3e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
@@ -0,0 +1,377 @@
+/*
+ *  NAND flash driver for the MikroTik RouterBOARD 91x series
+ *
+ *  Copyright (C) 2013-2014 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/platform_data/rb91x_nand.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#define DRV_DESC	"NAND flash driver for the RouterBOARD 91x series"
+
+#define RB91X_NAND_NRWE		BIT(12)
+
+#define RB91X_NAND_DATA_BITS	(BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) |\
+				 BIT(13) | BIT(14) | BIT(15))
+
+#define RB91X_NAND_INPUT_BITS	(RB91X_NAND_DATA_BITS | RB91X_NAND_RDY)
+#define RB91X_NAND_OUTPUT_BITS	(RB91X_NAND_DATA_BITS | RB91X_NAND_NRWE)
+
+#define RB91X_NAND_LOW_DATA_MASK	0x1f
+#define RB91X_NAND_HIGH_DATA_MASK	0xe0
+#define RB91X_NAND_HIGH_DATA_SHIFT	8
+
+struct rb91x_nand_info {
+	struct nand_chip chip;
+	struct mtd_info mtd;
+	struct device *dev;
+
+	int gpio_nce;
+	int gpio_ale;
+	int gpio_cle;
+	int gpio_rdy;
+	int gpio_read;
+	int gpio_nrw;
+	int gpio_nle;
+};
+
+static inline struct rb91x_nand_info *mtd_to_rbinfo(struct mtd_info *mtd)
+{
+	return container_of(mtd, struct rb91x_nand_info, mtd);
+}
+
+/*
+ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
+ * will not be able to find the kernel that we load.
+ */
+static struct nand_ecclayout rb91x_nand_ecclayout = {
+	.eccbytes	= 6,
+	.eccpos		= { 8, 9, 10, 13, 14, 15 },
+	.oobavail	= 9,
+	.oobfree	= { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
+};
+
+static struct mtd_partition rb91x_nand_partitions[] = {
+	{
+		.name	= "booter",
+		.offset	= 0,
+		.size	= (256 * 1024),
+		.mask_flags = MTD_WRITEABLE,
+	}, {
+		.name	= "kernel",
+		.offset	= (256 * 1024),
+		.size	= (4 * 1024 * 1024) - (256 * 1024),
+	}, {
+		.name	= "rootfs",
+		.offset	= MTDPART_OFS_NXTBLK,
+		.size	= MTDPART_SIZ_FULL,
+	},
+};
+
+static void rb91x_nand_write(struct rb91x_nand_info *rbni,
+			     const u8 *buf,
+			     unsigned len)
+{
+	void __iomem *base = ath79_gpio_base;
+	u32 oe_reg;
+	u32 out_reg;
+	u32 out;
+	unsigned i;
+
+	/* enable the latch */
+	gpio_set_value_cansleep(rbni->gpio_nle, 0);
+
+	oe_reg = __raw_readl(base + AR71XX_GPIO_REG_OE);
+	out_reg = __raw_readl(base + AR71XX_GPIO_REG_OUT);
+
+	/* set data lines to output mode */
+	__raw_writel(oe_reg & ~(RB91X_NAND_DATA_BITS | RB91X_NAND_NRWE),
+		     base + AR71XX_GPIO_REG_OE);
+
+	out = out_reg & ~(RB91X_NAND_DATA_BITS | RB91X_NAND_NRWE);
+	for (i = 0; i != len; i++) {
+		u32 data;
+
+		data = (buf[i] & RB91X_NAND_HIGH_DATA_MASK) <<
+			RB91X_NAND_HIGH_DATA_SHIFT;
+		data |= buf[i] & RB91X_NAND_LOW_DATA_MASK;
+		data |= out;
+		__raw_writel(data, base + AR71XX_GPIO_REG_OUT);
+
+		/* deactivate WE line */
+		data |= RB91X_NAND_NRWE;
+		__raw_writel(data, base + AR71XX_GPIO_REG_OUT);
+		/* flush write */
+		__raw_readl(base + AR71XX_GPIO_REG_OUT);
+	}
+
+	/* restore  registers */
+	__raw_writel(out_reg, base + AR71XX_GPIO_REG_OUT);
+	__raw_writel(oe_reg, base + AR71XX_GPIO_REG_OE);
+	/* flush write */
+	__raw_readl(base + AR71XX_GPIO_REG_OUT);
+
+	/* disable the latch */
+	gpio_set_value_cansleep(rbni->gpio_nle, 1);
+}
+
+static void rb91x_nand_read(struct rb91x_nand_info *rbni,
+			    u8 *read_buf,
+			    unsigned len)
+{
+	void __iomem *base = ath79_gpio_base;
+	u32 oe_reg;
+	u32 out_reg;
+	unsigned i;
+
+	/* enable read mode */
+	gpio_set_value_cansleep(rbni->gpio_read, 1);
+
+	/* enable latch */
+	gpio_set_value_cansleep(rbni->gpio_nle, 0);
+
+	/* save registers */
+	oe_reg = __raw_readl(base + AR71XX_GPIO_REG_OE);
+	out_reg = __raw_readl(base + AR71XX_GPIO_REG_OUT);
+
+	/* set data lines to input mode */
+	__raw_writel(oe_reg | RB91X_NAND_DATA_BITS,
+		     base + AR71XX_GPIO_REG_OE);
+
+	for (i = 0; i < len; i++) {
+		u32 in;
+		u8 data;
+
+		/* activate RE line */
+		__raw_writel(RB91X_NAND_NRWE, base + AR71XX_GPIO_REG_CLEAR);
+		/* flush write */
+		__raw_readl(base + AR71XX_GPIO_REG_CLEAR);
+
+		/* read input lines */
+		in = __raw_readl(base + AR71XX_GPIO_REG_IN);
+
+		/* deactivate RE line */
+		__raw_writel(RB91X_NAND_NRWE, base + AR71XX_GPIO_REG_SET);
+
+		data = (in & RB91X_NAND_LOW_DATA_MASK);
+		data |= (in >> RB91X_NAND_HIGH_DATA_SHIFT) &
+			RB91X_NAND_HIGH_DATA_MASK;
+
+		read_buf[i] = data;
+	}
+
+	/* restore  registers */
+	__raw_writel(out_reg, base + AR71XX_GPIO_REG_OUT);
+	__raw_writel(oe_reg, base + AR71XX_GPIO_REG_OE);
+	/* flush write */
+	__raw_readl(base + AR71XX_GPIO_REG_OUT);
+
+	/* disable latch */
+	gpio_set_value_cansleep(rbni->gpio_nle, 1);
+
+	/* disable read mode */
+	gpio_set_value_cansleep(rbni->gpio_read, 0);
+}
+
+static int rb91x_nand_dev_ready(struct mtd_info *mtd)
+{
+	struct rb91x_nand_info *rbni = mtd_to_rbinfo(mtd);
+
+	return gpio_get_value_cansleep(rbni->gpio_rdy);
+}
+
+static void rb91x_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
+				unsigned int ctrl)
+{
+	struct rb91x_nand_info *rbni = mtd_to_rbinfo(mtd);
+
+	if (ctrl & NAND_CTRL_CHANGE) {
+		gpio_set_value_cansleep(rbni->gpio_cle,
+					(ctrl & NAND_CLE) ? 1 : 0);
+		gpio_set_value_cansleep(rbni->gpio_ale,
+					(ctrl & NAND_ALE) ? 1 : 0);
+		gpio_set_value_cansleep(rbni->gpio_nce,
+					(ctrl & NAND_NCE) ? 0 : 1);
+	}
+
+	if (cmd != NAND_CMD_NONE) {
+		u8 t = cmd;
+
+		rb91x_nand_write(rbni, &t, 1);
+	}
+}
+
+static u8 rb91x_nand_read_byte(struct mtd_info *mtd)
+{
+	struct rb91x_nand_info *rbni = mtd_to_rbinfo(mtd);
+	u8 data = 0xff;
+
+	rb91x_nand_read(rbni, &data, 1);
+
+	return data;
+}
+
+static void rb91x_nand_read_buf(struct mtd_info *mtd, u8 *buf, int len)
+{
+	struct rb91x_nand_info *rbni = mtd_to_rbinfo(mtd);
+
+	rb91x_nand_read(rbni, buf, len);
+}
+
+static void rb91x_nand_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
+{
+	struct rb91x_nand_info *rbni = mtd_to_rbinfo(mtd);
+
+	rb91x_nand_write(rbni, buf, len);
+}
+
+static int rb91x_nand_gpio_init(struct rb91x_nand_info *info)
+{
+	int ret;
+
+	/*
+	 * Ensure that the LATCH is disabled before initializing
+	 * control lines.
+	 */
+	ret = devm_gpio_request_one(info->dev, info->gpio_nle,
+				    GPIOF_OUT_INIT_HIGH, "LATCH enable");
+	if (ret)
+		return ret;
+
+	ret = devm_gpio_request_one(info->dev, info->gpio_nce,
+				    GPIOF_OUT_INIT_HIGH, "NAND nCE");
+	if (ret)
+		return ret;
+
+	ret = devm_gpio_request_one(info->dev, info->gpio_nrw,
+				    GPIOF_OUT_INIT_HIGH, "NAND nRW");
+	if (ret)
+		return ret;
+
+	ret = devm_gpio_request_one(info->dev, info->gpio_cle,
+				    GPIOF_OUT_INIT_LOW, "NAND CLE");
+	if (ret)
+		return ret;
+
+	ret = devm_gpio_request_one(info->dev, info->gpio_ale,
+				    GPIOF_OUT_INIT_LOW, "NAND ALE");
+	if (ret)
+		return ret;
+
+	ret = devm_gpio_request_one(info->dev, info->gpio_read,
+				    GPIOF_OUT_INIT_LOW, "NAND READ");
+	if (ret)
+		return ret;
+
+	ret = devm_gpio_request_one(info->dev, info->gpio_rdy,
+				    GPIOF_IN, "NAND RDY");
+	return ret;
+}
+
+static int rb91x_nand_probe(struct platform_device *pdev)
+{
+	struct rb91x_nand_info	*rbni;
+	struct rb91x_nand_platform_data *pdata;
+	int ret;
+
+	pr_info(DRV_DESC "\n");
+
+	pdata = dev_get_platdata(&pdev->dev);
+	if (!pdata)
+		return -EINVAL;
+
+	rbni = devm_kzalloc(&pdev->dev, sizeof(*rbni), GFP_KERNEL);
+	if (!rbni)
+		return -ENOMEM;
+
+	rbni->dev = &pdev->dev;
+	rbni->gpio_nce = pdata->gpio_nce;
+	rbni->gpio_ale = pdata->gpio_ale;
+	rbni->gpio_cle = pdata->gpio_cle;
+	rbni->gpio_read = pdata->gpio_read;
+	rbni->gpio_nrw = pdata->gpio_nrw;
+	rbni->gpio_rdy = pdata->gpio_rdy;
+	rbni->gpio_nle = pdata->gpio_nle;
+
+	rbni->chip.priv	= &rbni;
+	rbni->mtd.priv	= &rbni->chip;
+	rbni->mtd.owner	= THIS_MODULE;
+
+	rbni->chip.cmd_ctrl	= rb91x_nand_cmd_ctrl;
+	rbni->chip.dev_ready	= rb91x_nand_dev_ready;
+	rbni->chip.read_byte	= rb91x_nand_read_byte;
+	rbni->chip.write_buf	= rb91x_nand_write_buf;
+	rbni->chip.read_buf	= rb91x_nand_read_buf;
+
+	rbni->chip.chip_delay	= 25;
+	rbni->chip.ecc.mode	= NAND_ECC_SOFT;
+
+	platform_set_drvdata(pdev, rbni);
+
+	ret = rb91x_nand_gpio_init(rbni);
+	if (ret)
+		return ret;
+
+	ret = nand_scan_ident(&rbni->mtd, 1, NULL);
+	if (ret)
+		return ret;
+
+	if (rbni->mtd.writesize == 512)
+		rbni->chip.ecc.layout = &rb91x_nand_ecclayout;
+
+	ret = nand_scan_tail(&rbni->mtd);
+	if (ret)
+		return ret;
+
+	ret = mtd_device_register(&rbni->mtd, rb91x_nand_partitions,
+				 ARRAY_SIZE(rb91x_nand_partitions));
+	if (ret)
+		goto err_release_nand;
+
+	return 0;
+
+err_release_nand:
+	nand_release(&rbni->mtd);
+	return ret;
+}
+
+static int rb91x_nand_remove(struct platform_device *pdev)
+{
+	struct rb91x_nand_info *info = platform_get_drvdata(pdev);
+
+	nand_release(&info->mtd);
+
+	return 0;
+}
+
+static struct platform_driver rb91x_nand_driver = {
+	.probe	= rb91x_nand_probe,
+	.remove	= rb91x_nand_remove,
+	.driver	= {
+		.name	= RB91X_NAND_DRIVER_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+module_platform_driver(rb91x_nand_driver);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c b/trunk/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
new file mode 100644
index 00000000..ab952b63
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/magic.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#define TPLINK_NUM_PARTS	5
+#define TPLINK_HEADER_V1	0x01000000
+#define MD5SUM_LEN		16
+
+#define TPLINK_ART_LEN		0x10000
+#define TPLINK_KERNEL_OFFS	0x20000
+
+struct tplink_fw_header {
+	uint32_t	version;	/* header version */
+	char		vendor_name[24];
+	char		fw_version[36];
+	uint32_t	hw_id;		/* hardware id */
+	uint32_t	hw_rev;		/* hardware revision */
+	uint32_t	unk1;
+	uint8_t		md5sum1[MD5SUM_LEN];
+	uint32_t	unk2;
+	uint8_t		md5sum2[MD5SUM_LEN];
+	uint32_t	unk3;
+	uint32_t	kernel_la;	/* kernel load address */
+	uint32_t	kernel_ep;	/* kernel entry point */
+	uint32_t	fw_length;	/* total length of the firmware */
+	uint32_t	kernel_ofs;	/* kernel data offset */
+	uint32_t	kernel_len;	/* kernel data length */
+	uint32_t	rootfs_ofs;	/* rootfs data offset */
+	uint32_t	rootfs_len;	/* rootfs data length */
+	uint32_t	boot_ofs;	/* bootloader data offset */
+	uint32_t	boot_len;	/* bootloader data length */
+	uint8_t		pad[360];
+} __attribute__ ((packed));
+
+static struct tplink_fw_header *
+tplink_read_header(struct mtd_info *mtd, size_t offset)
+{
+	struct tplink_fw_header *header;
+	size_t header_len;
+	size_t retlen;
+	int ret;
+	u32 t;
+
+	header = vmalloc(sizeof(*header));
+	if (!header)
+		goto err;
+
+	header_len = sizeof(struct tplink_fw_header);
+	ret = mtd_read(mtd, offset, header_len, &retlen,
+		       (unsigned char *) header);
+	if (ret)
+		goto err_free_header;
+
+	if (retlen != header_len)
+		goto err_free_header;
+
+	/* sanity checks */
+	t = be32_to_cpu(header->version);
+	if (t != TPLINK_HEADER_V1)
+		goto err_free_header;
+
+	t = be32_to_cpu(header->kernel_ofs);
+	if (t != header_len)
+		goto err_free_header;
+
+	return header;
+
+err_free_header:
+	vfree(header);
+err:
+	return NULL;
+}
+
+static int tplink_check_rootfs_magic(struct mtd_info *mtd, size_t offset)
+{
+	u32 magic;
+	size_t retlen;
+	int ret;
+
+	ret = mtd_read(mtd, offset, sizeof(magic), &retlen,
+		       (unsigned char *) &magic);
+	if (ret)
+		return ret;
+
+	if (retlen != sizeof(magic))
+		return -EIO;
+
+	if (le32_to_cpu(magic) != SQUASHFS_MAGIC &&
+	    magic != 0x19852003)
+		return -EINVAL;
+
+	return 0;
+}
+
+static int tplink_parse_partitions(struct mtd_info *master,
+				   struct mtd_partition **pparts,
+				   struct mtd_part_parser_data *data)
+{
+	struct mtd_partition *parts;
+	struct tplink_fw_header *header;
+	int nr_parts;
+	size_t offset;
+	size_t art_offset;
+	size_t rootfs_offset;
+	size_t squashfs_offset;
+	int ret;
+
+	nr_parts = TPLINK_NUM_PARTS;
+	parts = kzalloc(nr_parts * sizeof(struct mtd_partition), GFP_KERNEL);
+	if (!parts) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	offset = TPLINK_KERNEL_OFFS;
+
+	header = tplink_read_header(master, offset);
+	if (!header) {
+		pr_notice("%s: no TP-Link header found\n", master->name);
+		ret = -ENODEV;
+		goto err_free_parts;
+	}
+
+	squashfs_offset = offset + sizeof(struct tplink_fw_header) +
+			  be32_to_cpu(header->kernel_len);
+
+	ret = tplink_check_rootfs_magic(master, squashfs_offset);
+	if (ret == 0)
+		rootfs_offset = squashfs_offset;
+	else
+		rootfs_offset = offset + be32_to_cpu(header->rootfs_ofs);
+
+	art_offset = master->size - TPLINK_ART_LEN;
+
+	parts[0].name = "u-boot";
+	parts[0].offset = 0;
+	parts[0].size = offset;
+	parts[0].mask_flags = MTD_WRITEABLE;
+
+	parts[1].name = "kernel";
+	parts[1].offset = offset;
+	parts[1].size = rootfs_offset - offset;
+
+	parts[2].name = "rootfs";
+	parts[2].offset = rootfs_offset;
+	parts[2].size = art_offset - rootfs_offset;
+
+	parts[3].name = "art";
+	parts[3].offset = art_offset;
+	parts[3].size = TPLINK_ART_LEN;
+	parts[3].mask_flags = MTD_WRITEABLE;
+
+	parts[4].name = "firmware";
+	parts[4].offset = offset;
+	parts[4].size = art_offset - offset;
+
+	vfree(header);
+
+	*pparts = parts;
+	return nr_parts;
+
+err_free_parts:
+	kfree(parts);
+err:
+	*pparts = NULL;
+	return ret;
+}
+
+static struct mtd_part_parser tplink_parser = {
+	.owner		= THIS_MODULE,
+	.parse_fn	= tplink_parse_partitions,
+	.name		= "tp-link",
+};
+
+static int __init tplink_parser_init(void)
+{
+	register_mtd_parser(&tplink_parser);
+
+	return 0;
+}
+
+module_init(tplink_parser_init);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/trunk/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/trunk/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
new file mode 100644
index 00000000..698bba87
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2009 Christian Daniel <cd@maintech.de>
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * TRX flash partition table.
+ * Based on ar7 map by Felix Fietkau <nbd@openwrt.org>
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+struct cybertan_header {
+	char	magic[4];
+	u8	res1[4];
+	char	fw_date[3];
+	char	fw_ver[3];
+	char	id[4];
+	char	hw_ver;
+	char	unused;
+	u8	flags[2];
+	u8	res2[10];
+};
+
+#define TRX_PARTS	6
+#define TRX_MAGIC	0x30524448
+#define TRX_MAX_OFFSET	3
+
+struct trx_header {
+	uint32_t magic;           /* "HDR0" */
+	uint32_t len;             /* Length of file including header */
+	uint32_t crc32;           /* 32-bit CRC from flag_version to end of file */
+	uint32_t flag_version;    /* 0:15 flags, 16:31 version */
+	uint32_t offsets[TRX_MAX_OFFSET]; /* Offsets of partitions from start of header */
+};
+
+#define IH_MAGIC	0x27051956	/* Image Magic Number */
+#define IH_NMLEN	32		/* Image Name Length */
+
+struct uimage_header {
+	uint32_t	ih_magic;	/* Image Header Magic Number */
+	uint32_t	ih_hcrc;	/* Image Header CRC Checksum */
+	uint32_t	ih_time;	/* Image Creation Timestamp */
+	uint32_t	ih_size;	/* Image Data Size */
+	uint32_t	ih_load;	/* Data» Load  Address */
+	uint32_t	ih_ep;		/* Entry Point Address */
+	uint32_t	ih_dcrc;	/* Image Data CRC Checksum */
+	uint8_t		ih_os;		/* Operating System */
+	uint8_t		ih_arch;	/* CPU architecture */
+	uint8_t		ih_type;	/* Image Type */
+	uint8_t		ih_comp;	/* Compression Type */
+	uint8_t		ih_name[IH_NMLEN];	/* Image Name */
+};
+
+struct wrt160nl_header {
+	struct cybertan_header	cybertan;
+	struct trx_header	trx;
+	struct uimage_header	uimage;
+} __attribute__ ((packed));
+
+#define WRT160NL_UBOOT_LEN	0x40000
+#define WRT160NL_ART_LEN	0x10000
+#define WRT160NL_NVRAM_LEN	0x10000
+
+static int wrt160nl_parse_partitions(struct mtd_info *master,
+				     struct mtd_partition **pparts,
+				     struct mtd_part_parser_data *data)
+{
+	struct wrt160nl_header *header;
+	struct trx_header *theader;
+	struct uimage_header *uheader;
+	struct mtd_partition *trx_parts;
+	size_t retlen;
+	unsigned int kernel_len;
+	unsigned int uboot_len;
+	unsigned int nvram_len;
+	unsigned int art_len;
+	int ret;
+
+	uboot_len = max_t(unsigned int, master->erasesize, WRT160NL_UBOOT_LEN);
+	nvram_len = max_t(unsigned int, master->erasesize, WRT160NL_NVRAM_LEN);
+	art_len = max_t(unsigned int, master->erasesize, WRT160NL_ART_LEN);
+
+	trx_parts = kzalloc(TRX_PARTS * sizeof(struct mtd_partition),
+			    GFP_KERNEL);
+	if (!trx_parts) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
+	header = vmalloc(sizeof(*header));
+	if (!header) {
+		return -ENOMEM;
+		goto free_parts;
+	}
+
+	ret = mtd_read(master, uboot_len, sizeof(*header),
+		       &retlen, (void *) header);
+	if (ret)
+		goto free_hdr;
+
+	if (retlen != sizeof(*header)) {
+		ret = -EIO;
+		goto free_hdr;
+	}
+
+	if (strncmp(header->cybertan.magic, "NL16", 4) != 0) {
+		printk(KERN_NOTICE "%s: no WRT160NL signature found\n",
+			master->name);
+		goto free_hdr;
+	}
+
+	theader = &header->trx;
+	if (le32_to_cpu(theader->magic) != TRX_MAGIC) {
+		printk(KERN_NOTICE "%s: no TRX header found\n", master->name);
+		goto free_hdr;
+	}
+
+	uheader = &header->uimage;
+	if (uheader->ih_magic != IH_MAGIC) {
+		printk(KERN_NOTICE "%s: no uImage found\n", master->name);
+		goto free_hdr;
+	}
+
+	kernel_len = le32_to_cpu(theader->offsets[1]) +
+		sizeof(struct cybertan_header);
+
+	trx_parts[0].name = "u-boot";
+	trx_parts[0].offset = 0;
+	trx_parts[0].size = uboot_len;
+	trx_parts[0].mask_flags = MTD_WRITEABLE;
+
+	trx_parts[1].name = "kernel";
+	trx_parts[1].offset = trx_parts[0].offset + trx_parts[0].size;
+	trx_parts[1].size = kernel_len;
+	trx_parts[1].mask_flags = 0;
+
+	trx_parts[2].name = "rootfs";
+	trx_parts[2].offset = trx_parts[1].offset + trx_parts[1].size;
+	trx_parts[2].size = master->size - uboot_len - nvram_len - art_len -
+		trx_parts[1].size;
+	trx_parts[2].mask_flags = 0;
+
+	trx_parts[3].name = "nvram";
+	trx_parts[3].offset = master->size - nvram_len - art_len;
+	trx_parts[3].size = nvram_len;
+	trx_parts[3].mask_flags = MTD_WRITEABLE;
+
+	trx_parts[4].name = "art";
+	trx_parts[4].offset = master->size - art_len;
+	trx_parts[4].size = art_len;
+	trx_parts[4].mask_flags = MTD_WRITEABLE;
+
+	trx_parts[5].name = "firmware";
+	trx_parts[5].offset = uboot_len;
+	trx_parts[5].size = master->size - uboot_len - nvram_len - art_len;
+	trx_parts[5].mask_flags = 0;
+
+	vfree(header);
+
+	*pparts = trx_parts;
+	return TRX_PARTS;
+
+free_hdr:
+	vfree(header);
+free_parts:
+	kfree(trx_parts);
+out:
+	return ret;
+}
+
+static struct mtd_part_parser wrt160nl_parser = {
+	.owner		= THIS_MODULE,
+	.parse_fn	= wrt160nl_parse_partitions,
+	.name		= "wrt160nl",
+};
+
+static int __init wrt160nl_parser_init(void)
+{
+	register_mtd_parser(&wrt160nl_parser);
+
+	return 0;
+}
+
+module_init(wrt160nl_parser_init);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Daniel <cd@maintech.de>");
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c b/trunk/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
new file mode 100644
index 00000000..b41eb548
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
@@ -0,0 +1,294 @@
+/*
+ * net/dsa/mv88e6063.c - Driver for Marvell 88e6063 switch chips
+ * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This driver was base on: net/dsa/mv88e6060.c
+ *   net/dsa/mv88e6063.c - Driver for Marvell 88e6060 switch chips
+ *   Copyright (c) 2008-2009 Marvell Semiconductor
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/list.h>
+#include <linux/netdevice.h>
+#include <linux/phy.h>
+#include <net/dsa.h>
+
+#define REG_BASE		0x10
+#define REG_PHY(p)		(REG_BASE + (p))
+#define REG_PORT(p)		(REG_BASE + 8 + (p))
+#define REG_GLOBAL		(REG_BASE + 0x0f)
+#define NUM_PORTS		7
+
+static int reg_read(struct dsa_switch *ds, int addr, int reg)
+{
+	return mdiobus_read(ds->master_mii_bus, addr, reg);
+}
+
+#define REG_READ(addr, reg)					\
+	({							\
+		int __ret;					\
+								\
+		__ret = reg_read(ds, addr, reg);		\
+		if (__ret < 0)					\
+			return __ret;				\
+		__ret;						\
+	})
+
+
+static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)
+{
+	return mdiobus_write(ds->master_mii_bus, addr, reg, val);
+}
+
+#define REG_WRITE(addr, reg, val)				\
+	({							\
+		int __ret;					\
+								\
+		__ret = reg_write(ds, addr, reg, val);		\
+		if (__ret < 0)					\
+			return __ret;				\
+	})
+
+static char *mv88e6063_probe(struct mii_bus *bus, int sw_addr)
+{
+	int ret;
+
+	ret = mdiobus_read(bus, REG_PORT(0), 0x03);
+	if (ret >= 0) {
+		ret &= 0xfff0;
+		if (ret == 0x1530)
+			return "Marvell 88E6063";
+	}
+
+	return NULL;
+}
+
+static int mv88e6063_switch_reset(struct dsa_switch *ds)
+{
+	int i;
+	int ret;
+
+	/*
+	 * Set all ports to the disabled state.
+	 */
+	for (i = 0; i < NUM_PORTS; i++) {
+		ret = REG_READ(REG_PORT(i), 0x04);
+		REG_WRITE(REG_PORT(i), 0x04, ret & 0xfffc);
+	}
+
+	/*
+	 * Wait for transmit queues to drain.
+	 */
+	msleep(2);
+
+	/*
+	 * Reset the switch.
+	 */
+	REG_WRITE(REG_GLOBAL, 0x0a, 0xa130);
+
+	/*
+	 * Wait up to one second for reset to complete.
+	 */
+	for (i = 0; i < 1000; i++) {
+		ret = REG_READ(REG_GLOBAL, 0x00);
+		if ((ret & 0x8000) == 0x0000)
+			break;
+
+		msleep(1);
+	}
+	if (i == 1000)
+		return -ETIMEDOUT;
+
+	return 0;
+}
+
+static int mv88e6063_setup_global(struct dsa_switch *ds)
+{
+	/*
+	 * Disable discarding of frames with excessive collisions,
+	 * set the maximum frame size to 1536 bytes, and mask all
+	 * interrupt sources.
+	 */
+	REG_WRITE(REG_GLOBAL, 0x04, 0x0800);
+
+	/*
+	 * Enable automatic address learning, set the address
+	 * database size to 1024 entries, and set the default aging
+	 * time to 5 minutes.
+	 */
+	REG_WRITE(REG_GLOBAL, 0x0a, 0x2130);
+
+	return 0;
+}
+
+static int mv88e6063_setup_port(struct dsa_switch *ds, int p)
+{
+	int addr = REG_PORT(p);
+
+	/*
+	 * Do not force flow control, disable Ingress and Egress
+	 * Header tagging, disable VLAN tunneling, and set the port
+	 * state to Forwarding.  Additionally, if this is the CPU
+	 * port, enable Ingress and Egress Trailer tagging mode.
+	 */
+	REG_WRITE(addr, 0x04, dsa_is_cpu_port(ds, p) ?  0x4103 : 0x0003);
+
+	/*
+	 * Port based VLAN map: give each port its own address
+	 * database, allow the CPU port to talk to each of the 'real'
+	 * ports, and allow each of the 'real' ports to only talk to
+	 * the CPU port.
+	 */
+	REG_WRITE(addr, 0x06,
+			((p & 0xf) << 12) |
+			 (dsa_is_cpu_port(ds, p) ?
+				ds->phys_port_mask :
+				(1 << ds->dst->cpu_port)));
+
+	/*
+	 * Port Association Vector: when learning source addresses
+	 * of packets, add the address to the address database using
+	 * a port bitmap that has only the bit for this port set and
+	 * the other bits clear.
+	 */
+	REG_WRITE(addr, 0x0b, 1 << p);
+
+	return 0;
+}
+
+static int mv88e6063_setup(struct dsa_switch *ds)
+{
+	int i;
+	int ret;
+
+	ret = mv88e6063_switch_reset(ds);
+	if (ret < 0)
+		return ret;
+
+	/* @@@ initialise atu */
+
+	ret = mv88e6063_setup_global(ds);
+	if (ret < 0)
+		return ret;
+
+	for (i = 0; i < NUM_PORTS; i++) {
+		ret = mv88e6063_setup_port(ds, i);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+static int mv88e6063_set_addr(struct dsa_switch *ds, u8 *addr)
+{
+	REG_WRITE(REG_GLOBAL, 0x01, (addr[0] << 8) | addr[1]);
+	REG_WRITE(REG_GLOBAL, 0x02, (addr[2] << 8) | addr[3]);
+	REG_WRITE(REG_GLOBAL, 0x03, (addr[4] << 8) | addr[5]);
+
+	return 0;
+}
+
+static int mv88e6063_port_to_phy_addr(int port)
+{
+	if (port >= 0 && port <= NUM_PORTS)
+		return REG_PHY(port);
+	return -1;
+}
+
+static int mv88e6063_phy_read(struct dsa_switch *ds, int port, int regnum)
+{
+	int addr;
+
+	addr = mv88e6063_port_to_phy_addr(port);
+	if (addr == -1)
+		return 0xffff;
+
+	return reg_read(ds, addr, regnum);
+}
+
+static int
+mv88e6063_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val)
+{
+	int addr;
+
+	addr = mv88e6063_port_to_phy_addr(port);
+	if (addr == -1)
+		return 0xffff;
+
+	return reg_write(ds, addr, regnum, val);
+}
+
+static void mv88e6063_poll_link(struct dsa_switch *ds)
+{
+	int i;
+
+	for (i = 0; i < DSA_MAX_PORTS; i++) {
+		struct net_device *dev;
+		int uninitialized_var(port_status);
+		int link;
+		int speed;
+		int duplex;
+		int fc;
+
+		dev = ds->ports[i];
+		if (dev == NULL)
+			continue;
+
+		link = 0;
+		if (dev->flags & IFF_UP) {
+			port_status = reg_read(ds, REG_PORT(i), 0x00);
+			if (port_status < 0)
+				continue;
+
+			link = !!(port_status & 0x1000);
+		}
+
+		if (!link) {
+			if (netif_carrier_ok(dev)) {
+				printk(KERN_INFO "%s: link down\n", dev->name);
+				netif_carrier_off(dev);
+			}
+			continue;
+		}
+
+		speed = (port_status & 0x0100) ? 100 : 10;
+		duplex = (port_status & 0x0200) ? 1 : 0;
+		fc = ((port_status & 0xc000) == 0xc000) ? 1 : 0;
+
+		if (!netif_carrier_ok(dev)) {
+			printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, "
+					 "flow control %sabled\n", dev->name,
+					 speed, duplex ? "full" : "half",
+					 fc ? "en" : "dis");
+			netif_carrier_on(dev);
+		}
+	}
+}
+
+static struct dsa_switch_driver mv88e6063_switch_driver = {
+	.tag_protocol	= htons(ETH_P_TRAILER),
+	.probe		= mv88e6063_probe,
+	.setup		= mv88e6063_setup,
+	.set_addr	= mv88e6063_set_addr,
+	.phy_read	= mv88e6063_phy_read,
+	.phy_write	= mv88e6063_phy_write,
+	.poll_link	= mv88e6063_poll_link,
+};
+
+static int __init mv88e6063_init(void)
+{
+	register_switch_driver(&mv88e6063_switch_driver);
+	return 0;
+}
+module_init(mv88e6063_init);
+
+static void __exit mv88e6063_cleanup(void)
+{
+	unregister_switch_driver(&mv88e6063_switch_driver);
+}
+module_exit(mv88e6063_cleanup);
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig
new file mode 100644
index 00000000..42d544f7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig
@@ -0,0 +1,33 @@
+config AG71XX
+	tristate "Atheros AR7XXX/AR9XXX built-in ethernet mac support"
+	depends on ATH79
+	select PHYLIB
+	help
+	  If you wish to compile a kernel for AR7XXX/91XXX and enable
+	  ethernet support, then you should always answer Y to this.
+
+if AG71XX
+
+config AG71XX_DEBUG
+	bool "Atheros AR71xx built-in ethernet driver debugging"
+	default n
+	help
+	  Atheros AR71xx built-in ethernet driver debugging messages.
+
+config AG71XX_DEBUG_FS
+	bool "Atheros AR71xx built-in ethernet driver debugfs support"
+	depends on DEBUG_FS
+	default n
+	help
+	  Say Y, if you need access to various statistics provided by
+	  the ag71xx driver.
+
+config AG71XX_AR8216_SUPPORT
+	bool "special support for the Atheros AR8216 switch"
+	default n
+	default y if ATH79_MACH_WNR2000 || ATH79_MACH_MZK_W04NU
+	help
+	  Say 'y' here if you want to enable special support for the
+	  Atheros AR8216 switch found on some boards.
+
+endif
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Makefile b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Makefile
new file mode 100644
index 00000000..b3ec4084
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for the Atheros AR71xx built-in ethernet macs
+#
+
+ag71xx-y	+= ag71xx_main.o
+ag71xx-y	+= ag71xx_ethtool.o
+ag71xx-y	+= ag71xx_phy.o
+ag71xx-y	+= ag71xx_mdio.o
+ag71xx-y	+= ag71xx_ar7240.o
+
+ag71xx-$(CONFIG_AG71XX_DEBUG_FS)	+= ag71xx_debugfs.o
+ag71xx-$(CONFIG_AG71XX_AR8216_SUPPORT)	+= ag71xx_ar8216.o
+
+obj-$(CONFIG_AG71XX)	+= ag71xx.o
+
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h
new file mode 100644
index 00000000..b18c20b6
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h
@@ -0,0 +1,485 @@
+/*
+ *  Atheros AR71xx built-in ethernet mac driver
+ *
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Based on Atheros' AG7100 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef __AG71XX_H
+#define __AG71XX_H
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/random.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/ethtool.h>
+#include <linux/etherdevice.h>
+#include <linux/if_vlan.h>
+#include <linux/phy.h>
+#include <linux/skbuff.h>
+#include <linux/dma-mapping.h>
+#include <linux/workqueue.h>
+
+#include <linux/bitops.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ag71xx_platform.h>
+
+#define AG71XX_DRV_NAME		"ag71xx"
+#define AG71XX_DRV_VERSION	"0.5.35"
+
+#define AG71XX_NAPI_WEIGHT	64
+#define AG71XX_OOM_REFILL	(1 + HZ/10)
+
+#define AG71XX_INT_ERR	(AG71XX_INT_RX_BE | AG71XX_INT_TX_BE)
+#define AG71XX_INT_TX	(AG71XX_INT_TX_PS)
+#define AG71XX_INT_RX	(AG71XX_INT_RX_PR | AG71XX_INT_RX_OF)
+
+#define AG71XX_INT_POLL	(AG71XX_INT_RX | AG71XX_INT_TX)
+#define AG71XX_INT_INIT	(AG71XX_INT_ERR | AG71XX_INT_POLL)
+
+#define AG71XX_TX_MTU_LEN	1540
+
+#define AG71XX_TX_RING_SPLIT		512
+#define AG71XX_TX_RING_DS_PER_PKT	DIV_ROUND_UP(AG71XX_TX_MTU_LEN, \
+						     AG71XX_TX_RING_SPLIT)
+#define AG71XX_TX_RING_SIZE_DEFAULT	48
+#define AG71XX_RX_RING_SIZE_DEFAULT	128
+
+#define AG71XX_TX_RING_SIZE_MAX		48
+#define AG71XX_RX_RING_SIZE_MAX		128
+
+#ifdef CONFIG_AG71XX_DEBUG
+#define DBG(fmt, args...)	pr_debug(fmt, ## args)
+#else
+#define DBG(fmt, args...)	do {} while (0)
+#endif
+
+#define ag71xx_assert(_cond)						\
+do {									\
+	if (_cond)							\
+		break;							\
+	printk("%s,%d: assertion failed\n", __FILE__, __LINE__);	\
+	BUG();								\
+} while (0)
+
+struct ag71xx_desc {
+	u32	data;
+	u32	ctrl;
+#define DESC_EMPTY	BIT(31)
+#define DESC_MORE	BIT(24)
+#define DESC_PKTLEN_M	0xfff
+	u32	next;
+	u32	pad;
+} __attribute__((aligned(4)));
+
+struct ag71xx_buf {
+	union {
+		struct sk_buff	*skb;
+		void		*rx_buf;
+	};
+	union {
+		dma_addr_t	dma_addr;
+		unsigned long	timestamp;
+	};
+	unsigned int		len;
+};
+
+struct ag71xx_ring {
+	struct ag71xx_buf	*buf;
+	u8			*descs_cpu;
+	dma_addr_t		descs_dma;
+	u16			desc_split;
+	u16			desc_size;
+	unsigned int		curr;
+	unsigned int		dirty;
+	unsigned int		size;
+};
+
+struct ag71xx_mdio {
+	struct mii_bus		*mii_bus;
+	int			mii_irq[PHY_MAX_ADDR];
+	void __iomem		*mdio_base;
+	struct ag71xx_mdio_platform_data *pdata;
+};
+
+struct ag71xx_int_stats {
+	unsigned long		rx_pr;
+	unsigned long		rx_be;
+	unsigned long		rx_of;
+	unsigned long		tx_ps;
+	unsigned long		tx_be;
+	unsigned long		tx_ur;
+	unsigned long		total;
+};
+
+struct ag71xx_napi_stats {
+	unsigned long		napi_calls;
+	unsigned long		rx_count;
+	unsigned long		rx_packets;
+	unsigned long		rx_packets_max;
+	unsigned long		tx_count;
+	unsigned long		tx_packets;
+	unsigned long		tx_packets_max;
+
+	unsigned long		rx[AG71XX_NAPI_WEIGHT + 1];
+	unsigned long		tx[AG71XX_NAPI_WEIGHT + 1];
+};
+
+struct ag71xx_debug {
+	struct dentry		*debugfs_dir;
+
+	struct ag71xx_int_stats int_stats;
+	struct ag71xx_napi_stats napi_stats;
+};
+
+struct ag71xx {
+	void __iomem		*mac_base;
+
+	spinlock_t		lock;
+	struct platform_device	*pdev;
+	struct net_device	*dev;
+	struct napi_struct	napi;
+	u32			msg_enable;
+
+	struct ag71xx_desc	*stop_desc;
+	dma_addr_t		stop_desc_dma;
+
+	struct ag71xx_ring	rx_ring;
+	struct ag71xx_ring	tx_ring;
+
+	struct mii_bus		*mii_bus;
+	struct phy_device	*phy_dev;
+	void			*phy_priv;
+
+	unsigned int		link;
+	unsigned int		speed;
+	int			duplex;
+
+	unsigned int		max_frame_len;
+	unsigned int		desc_pktlen_mask;
+	unsigned int		rx_buf_size;
+
+	struct work_struct	restart_work;
+	struct delayed_work	link_work;
+	struct timer_list	oom_timer;
+
+#ifdef CONFIG_AG71XX_DEBUG_FS
+	struct ag71xx_debug	debug;
+#endif
+};
+
+extern struct ethtool_ops ag71xx_ethtool_ops;
+void ag71xx_link_adjust(struct ag71xx *ag);
+
+int ag71xx_mdio_driver_init(void) __init;
+void ag71xx_mdio_driver_exit(void);
+
+int ag71xx_phy_connect(struct ag71xx *ag);
+void ag71xx_phy_disconnect(struct ag71xx *ag);
+void ag71xx_phy_start(struct ag71xx *ag);
+void ag71xx_phy_stop(struct ag71xx *ag);
+
+static inline struct ag71xx_platform_data *ag71xx_get_pdata(struct ag71xx *ag)
+{
+	return ag->pdev->dev.platform_data;
+}
+
+static inline int ag71xx_desc_empty(struct ag71xx_desc *desc)
+{
+	return (desc->ctrl & DESC_EMPTY) != 0;
+}
+
+static inline struct ag71xx_desc *
+ag71xx_ring_desc(struct ag71xx_ring *ring, int idx)
+{
+	return (struct ag71xx_desc *) &ring->descs_cpu[idx * ring->desc_size];
+}
+
+/* Register offsets */
+#define AG71XX_REG_MAC_CFG1	0x0000
+#define AG71XX_REG_MAC_CFG2	0x0004
+#define AG71XX_REG_MAC_IPG	0x0008
+#define AG71XX_REG_MAC_HDX	0x000c
+#define AG71XX_REG_MAC_MFL	0x0010
+#define AG71XX_REG_MII_CFG	0x0020
+#define AG71XX_REG_MII_CMD	0x0024
+#define AG71XX_REG_MII_ADDR	0x0028
+#define AG71XX_REG_MII_CTRL	0x002c
+#define AG71XX_REG_MII_STATUS	0x0030
+#define AG71XX_REG_MII_IND	0x0034
+#define AG71XX_REG_MAC_IFCTL	0x0038
+#define AG71XX_REG_MAC_ADDR1	0x0040
+#define AG71XX_REG_MAC_ADDR2	0x0044
+#define AG71XX_REG_FIFO_CFG0	0x0048
+#define AG71XX_REG_FIFO_CFG1	0x004c
+#define AG71XX_REG_FIFO_CFG2	0x0050
+#define AG71XX_REG_FIFO_CFG3	0x0054
+#define AG71XX_REG_FIFO_CFG4	0x0058
+#define AG71XX_REG_FIFO_CFG5	0x005c
+#define AG71XX_REG_FIFO_RAM0	0x0060
+#define AG71XX_REG_FIFO_RAM1	0x0064
+#define AG71XX_REG_FIFO_RAM2	0x0068
+#define AG71XX_REG_FIFO_RAM3	0x006c
+#define AG71XX_REG_FIFO_RAM4	0x0070
+#define AG71XX_REG_FIFO_RAM5	0x0074
+#define AG71XX_REG_FIFO_RAM6	0x0078
+#define AG71XX_REG_FIFO_RAM7	0x007c
+
+#define AG71XX_REG_TX_CTRL	0x0180
+#define AG71XX_REG_TX_DESC	0x0184
+#define AG71XX_REG_TX_STATUS	0x0188
+#define AG71XX_REG_RX_CTRL	0x018c
+#define AG71XX_REG_RX_DESC	0x0190
+#define AG71XX_REG_RX_STATUS	0x0194
+#define AG71XX_REG_INT_ENABLE	0x0198
+#define AG71XX_REG_INT_STATUS	0x019c
+
+#define AG71XX_REG_FIFO_DEPTH	0x01a8
+#define AG71XX_REG_RX_SM	0x01b0
+#define AG71XX_REG_TX_SM	0x01b4
+
+#define MAC_CFG1_TXE		BIT(0)	/* Tx Enable */
+#define MAC_CFG1_STX		BIT(1)	/* Synchronize Tx Enable */
+#define MAC_CFG1_RXE		BIT(2)	/* Rx Enable */
+#define MAC_CFG1_SRX		BIT(3)	/* Synchronize Rx Enable */
+#define MAC_CFG1_TFC		BIT(4)	/* Tx Flow Control Enable */
+#define MAC_CFG1_RFC		BIT(5)	/* Rx Flow Control Enable */
+#define MAC_CFG1_LB		BIT(8)	/* Loopback mode */
+#define MAC_CFG1_SR		BIT(31)	/* Soft Reset */
+
+#define MAC_CFG2_FDX		BIT(0)
+#define MAC_CFG2_CRC_EN		BIT(1)
+#define MAC_CFG2_PAD_CRC_EN	BIT(2)
+#define MAC_CFG2_LEN_CHECK	BIT(4)
+#define MAC_CFG2_HUGE_FRAME_EN	BIT(5)
+#define MAC_CFG2_IF_1000	BIT(9)
+#define MAC_CFG2_IF_10_100	BIT(8)
+
+#define FIFO_CFG0_WTM		BIT(0)	/* Watermark Module */
+#define FIFO_CFG0_RXS		BIT(1)	/* Rx System Module */
+#define FIFO_CFG0_RXF		BIT(2)	/* Rx Fabric Module */
+#define FIFO_CFG0_TXS		BIT(3)	/* Tx System Module */
+#define FIFO_CFG0_TXF		BIT(4)	/* Tx Fabric Module */
+#define FIFO_CFG0_ALL	(FIFO_CFG0_WTM | FIFO_CFG0_RXS | FIFO_CFG0_RXF \
+			| FIFO_CFG0_TXS | FIFO_CFG0_TXF)
+
+#define FIFO_CFG0_ENABLE_SHIFT	8
+
+#define FIFO_CFG4_DE		BIT(0)	/* Drop Event */
+#define FIFO_CFG4_DV		BIT(1)	/* RX_DV Event */
+#define FIFO_CFG4_FC		BIT(2)	/* False Carrier */
+#define FIFO_CFG4_CE		BIT(3)	/* Code Error */
+#define FIFO_CFG4_CR		BIT(4)	/* CRC error */
+#define FIFO_CFG4_LM		BIT(5)	/* Length Mismatch */
+#define FIFO_CFG4_LO		BIT(6)	/* Length out of range */
+#define FIFO_CFG4_OK		BIT(7)	/* Packet is OK */
+#define FIFO_CFG4_MC		BIT(8)	/* Multicast Packet */
+#define FIFO_CFG4_BC		BIT(9)	/* Broadcast Packet */
+#define FIFO_CFG4_DR		BIT(10)	/* Dribble */
+#define FIFO_CFG4_LE		BIT(11)	/* Long Event */
+#define FIFO_CFG4_CF		BIT(12)	/* Control Frame */
+#define FIFO_CFG4_PF		BIT(13)	/* Pause Frame */
+#define FIFO_CFG4_UO		BIT(14)	/* Unsupported Opcode */
+#define FIFO_CFG4_VT		BIT(15)	/* VLAN tag detected */
+#define FIFO_CFG4_FT		BIT(16)	/* Frame Truncated */
+#define FIFO_CFG4_UC		BIT(17)	/* Unicast Packet */
+
+#define FIFO_CFG5_DE		BIT(0)	/* Drop Event */
+#define FIFO_CFG5_DV		BIT(1)	/* RX_DV Event */
+#define FIFO_CFG5_FC		BIT(2)	/* False Carrier */
+#define FIFO_CFG5_CE		BIT(3)	/* Code Error */
+#define FIFO_CFG5_LM		BIT(4)	/* Length Mismatch */
+#define FIFO_CFG5_LO		BIT(5)	/* Length Out of Range */
+#define FIFO_CFG5_OK		BIT(6)	/* Packet is OK */
+#define FIFO_CFG5_MC		BIT(7)	/* Multicast Packet */
+#define FIFO_CFG5_BC		BIT(8)	/* Broadcast Packet */
+#define FIFO_CFG5_DR		BIT(9)	/* Dribble */
+#define FIFO_CFG5_CF		BIT(10)	/* Control Frame */
+#define FIFO_CFG5_PF		BIT(11)	/* Pause Frame */
+#define FIFO_CFG5_UO		BIT(12)	/* Unsupported Opcode */
+#define FIFO_CFG5_VT		BIT(13)	/* VLAN tag detected */
+#define FIFO_CFG5_LE		BIT(14)	/* Long Event */
+#define FIFO_CFG5_FT		BIT(15)	/* Frame Truncated */
+#define FIFO_CFG5_16		BIT(16)	/* unknown */
+#define FIFO_CFG5_17		BIT(17)	/* unknown */
+#define FIFO_CFG5_SF		BIT(18)	/* Short Frame */
+#define FIFO_CFG5_BM		BIT(19)	/* Byte Mode */
+
+#define AG71XX_INT_TX_PS	BIT(0)
+#define AG71XX_INT_TX_UR	BIT(1)
+#define AG71XX_INT_TX_BE	BIT(3)
+#define AG71XX_INT_RX_PR	BIT(4)
+#define AG71XX_INT_RX_OF	BIT(6)
+#define AG71XX_INT_RX_BE	BIT(7)
+
+#define MAC_IFCTL_SPEED		BIT(16)
+
+#define MII_CFG_CLK_DIV_4	0
+#define MII_CFG_CLK_DIV_6	2
+#define MII_CFG_CLK_DIV_8	3
+#define MII_CFG_CLK_DIV_10	4
+#define MII_CFG_CLK_DIV_14	5
+#define MII_CFG_CLK_DIV_20	6
+#define MII_CFG_CLK_DIV_28	7
+#define MII_CFG_CLK_DIV_34	8
+#define MII_CFG_CLK_DIV_42	9
+#define MII_CFG_CLK_DIV_50	10
+#define MII_CFG_CLK_DIV_58	11
+#define MII_CFG_CLK_DIV_66	12
+#define MII_CFG_CLK_DIV_74	13
+#define MII_CFG_CLK_DIV_82	14
+#define MII_CFG_CLK_DIV_98	15
+#define MII_CFG_RESET		BIT(31)
+
+#define MII_CMD_WRITE		0x0
+#define MII_CMD_READ		0x1
+#define MII_ADDR_SHIFT		8
+#define MII_IND_BUSY		BIT(0)
+#define MII_IND_INVALID		BIT(2)
+
+#define TX_CTRL_TXE		BIT(0)	/* Tx Enable */
+
+#define TX_STATUS_PS		BIT(0)	/* Packet Sent */
+#define TX_STATUS_UR		BIT(1)	/* Tx Underrun */
+#define TX_STATUS_BE		BIT(3)	/* Bus Error */
+
+#define RX_CTRL_RXE		BIT(0)	/* Rx Enable */
+
+#define RX_STATUS_PR		BIT(0)	/* Packet Received */
+#define RX_STATUS_OF		BIT(2)	/* Rx Overflow */
+#define RX_STATUS_BE		BIT(3)	/* Bus Error */
+
+static inline void ag71xx_check_reg_offset(struct ag71xx *ag, unsigned reg)
+{
+	switch (reg) {
+	case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
+	case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_TX_SM:
+	case AG71XX_REG_MII_CFG:
+		break;
+
+	default:
+		BUG();
+	}
+}
+
+static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value)
+{
+	ag71xx_check_reg_offset(ag, reg);
+
+	__raw_writel(value, ag->mac_base + reg);
+	/* flush write */
+	(void) __raw_readl(ag->mac_base + reg);
+}
+
+static inline u32 ag71xx_rr(struct ag71xx *ag, unsigned reg)
+{
+	ag71xx_check_reg_offset(ag, reg);
+
+	return __raw_readl(ag->mac_base + reg);
+}
+
+static inline void ag71xx_sb(struct ag71xx *ag, unsigned reg, u32 mask)
+{
+	void __iomem *r;
+
+	ag71xx_check_reg_offset(ag, reg);
+
+	r = ag->mac_base + reg;
+	__raw_writel(__raw_readl(r) | mask, r);
+	/* flush write */
+	(void)__raw_readl(r);
+}
+
+static inline void ag71xx_cb(struct ag71xx *ag, unsigned reg, u32 mask)
+{
+	void __iomem *r;
+
+	ag71xx_check_reg_offset(ag, reg);
+
+	r = ag->mac_base + reg;
+	__raw_writel(__raw_readl(r) & ~mask, r);
+	/* flush write */
+	(void) __raw_readl(r);
+}
+
+static inline void ag71xx_int_enable(struct ag71xx *ag, u32 ints)
+{
+	ag71xx_sb(ag, AG71XX_REG_INT_ENABLE, ints);
+}
+
+static inline void ag71xx_int_disable(struct ag71xx *ag, u32 ints)
+{
+	ag71xx_cb(ag, AG71XX_REG_INT_ENABLE, ints);
+}
+
+#ifdef CONFIG_AG71XX_AR8216_SUPPORT
+void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb);
+int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb,
+				int pktlen);
+static inline int ag71xx_has_ar8216(struct ag71xx *ag)
+{
+	return ag71xx_get_pdata(ag)->has_ar8216;
+}
+#else
+static inline void ag71xx_add_ar8216_header(struct ag71xx *ag,
+					   struct sk_buff *skb)
+{
+}
+
+static inline int ag71xx_remove_ar8216_header(struct ag71xx *ag,
+					      struct sk_buff *skb,
+					      int pktlen)
+{
+	return 0;
+}
+static inline int ag71xx_has_ar8216(struct ag71xx *ag)
+{
+	return 0;
+}
+#endif
+
+#ifdef CONFIG_AG71XX_DEBUG_FS
+int ag71xx_debugfs_root_init(void);
+void ag71xx_debugfs_root_exit(void);
+int ag71xx_debugfs_init(struct ag71xx *ag);
+void ag71xx_debugfs_exit(struct ag71xx *ag);
+void ag71xx_debugfs_update_int_stats(struct ag71xx *ag, u32 status);
+void ag71xx_debugfs_update_napi_stats(struct ag71xx *ag, int rx, int tx);
+#else
+static inline int ag71xx_debugfs_root_init(void) { return 0; }
+static inline void ag71xx_debugfs_root_exit(void) {}
+static inline int ag71xx_debugfs_init(struct ag71xx *ag) { return 0; }
+static inline void ag71xx_debugfs_exit(struct ag71xx *ag) {}
+static inline void ag71xx_debugfs_update_int_stats(struct ag71xx *ag,
+						   u32 status) {}
+static inline void ag71xx_debugfs_update_napi_stats(struct ag71xx *ag,
+						    int rx, int tx) {}
+#endif /* CONFIG_AG71XX_DEBUG_FS */
+
+void ag71xx_ar7240_start(struct ag71xx *ag);
+void ag71xx_ar7240_stop(struct ag71xx *ag);
+int ag71xx_ar7240_init(struct ag71xx *ag);
+void ag71xx_ar7240_cleanup(struct ag71xx *ag);
+
+int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg);
+void ag71xx_mdio_mii_write(struct ag71xx_mdio *am, int addr, int reg, u16 val);
+
+u16 ar7240sw_phy_read(struct mii_bus *mii, unsigned phy_addr,
+		      unsigned reg_addr);
+int ar7240sw_phy_write(struct mii_bus *mii, unsigned phy_addr,
+		       unsigned reg_addr, u16 reg_val);
+
+#endif /* _AG71XX_H */
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
new file mode 100644
index 00000000..8dfff3b6
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
@@ -0,0 +1,1229 @@
+/*
+ *  Driver for the built-in ethernet switch of the Atheros AR7240 SoC
+ *  Copyright (c) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (c) 2010 Felix Fietkau <nbd@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/etherdevice.h>
+#include <linux/list.h>
+#include <linux/netdevice.h>
+#include <linux/phy.h>
+#include <linux/mii.h>
+#include <linux/bitops.h>
+#include <linux/switch.h>
+#include "ag71xx.h"
+
+#define BITM(_count)	(BIT(_count) - 1)
+#define BITS(_shift, _count)	(BITM(_count) << _shift)
+
+#define AR7240_REG_MASK_CTRL		0x00
+#define AR7240_MASK_CTRL_REVISION_M	BITM(8)
+#define AR7240_MASK_CTRL_VERSION_M	BITM(8)
+#define AR7240_MASK_CTRL_VERSION_S	8
+#define   AR7240_MASK_CTRL_VERSION_AR7240 0x01
+#define   AR7240_MASK_CTRL_VERSION_AR934X 0x02
+#define AR7240_MASK_CTRL_SOFT_RESET	BIT(31)
+
+#define AR7240_REG_MAC_ADDR0		0x20
+#define AR7240_REG_MAC_ADDR1		0x24
+
+#define AR7240_REG_FLOOD_MASK		0x2c
+#define AR7240_FLOOD_MASK_BROAD_TO_CPU	BIT(26)
+
+#define AR7240_REG_GLOBAL_CTRL		0x30
+#define AR7240_GLOBAL_CTRL_MTU_M	BITM(11)
+#define AR9340_GLOBAL_CTRL_MTU_M	BITM(14)
+
+#define AR7240_REG_VTU			0x0040
+#define   AR7240_VTU_OP			BITM(3)
+#define   AR7240_VTU_OP_NOOP		0x0
+#define   AR7240_VTU_OP_FLUSH		0x1
+#define   AR7240_VTU_OP_LOAD		0x2
+#define   AR7240_VTU_OP_PURGE		0x3
+#define   AR7240_VTU_OP_REMOVE_PORT	0x4
+#define   AR7240_VTU_ACTIVE		BIT(3)
+#define   AR7240_VTU_FULL		BIT(4)
+#define   AR7240_VTU_PORT		BITS(8, 4)
+#define   AR7240_VTU_PORT_S		8
+#define   AR7240_VTU_VID		BITS(16, 12)
+#define   AR7240_VTU_VID_S		16
+#define   AR7240_VTU_PRIO		BITS(28, 3)
+#define   AR7240_VTU_PRIO_S		28
+#define   AR7240_VTU_PRIO_EN		BIT(31)
+
+#define AR7240_REG_VTU_DATA		0x0044
+#define   AR7240_VTUDATA_MEMBER		BITS(0, 10)
+#define   AR7240_VTUDATA_VALID		BIT(11)
+
+#define AR7240_REG_ATU			0x50
+#define AR7240_ATU_FLUSH_ALL		0x1
+
+#define AR7240_REG_AT_CTRL		0x5c
+#define AR7240_AT_CTRL_AGE_TIME		BITS(0, 15)
+#define AR7240_AT_CTRL_AGE_EN		BIT(17)
+#define AR7240_AT_CTRL_LEARN_CHANGE	BIT(18)
+#define AR7240_AT_CTRL_RESERVED		BIT(19)
+#define AR7240_AT_CTRL_ARP_EN		BIT(20)
+
+#define AR7240_REG_TAG_PRIORITY		0x70
+
+#define AR7240_REG_SERVICE_TAG		0x74
+#define AR7240_SERVICE_TAG_M		BITM(16)
+
+#define AR7240_REG_CPU_PORT		0x78
+#define AR7240_MIRROR_PORT_S		4
+#define AR7240_CPU_PORT_EN		BIT(8)
+
+#define AR7240_REG_MIB_FUNCTION0	0x80
+#define AR7240_MIB_TIMER_M		BITM(16)
+#define AR7240_MIB_AT_HALF_EN		BIT(16)
+#define AR7240_MIB_BUSY			BIT(17)
+#define AR7240_MIB_FUNC_S		24
+#define AR7240_MIB_FUNC_M		BITM(3)
+#define AR7240_MIB_FUNC_NO_OP		0x0
+#define AR7240_MIB_FUNC_FLUSH		0x1
+#define AR7240_MIB_FUNC_CAPTURE		0x3
+
+#define AR7240_REG_MDIO_CTRL		0x98
+#define AR7240_MDIO_CTRL_DATA_M		BITM(16)
+#define AR7240_MDIO_CTRL_REG_ADDR_S	16
+#define AR7240_MDIO_CTRL_PHY_ADDR_S	21
+#define AR7240_MDIO_CTRL_CMD_WRITE	0
+#define AR7240_MDIO_CTRL_CMD_READ	BIT(27)
+#define AR7240_MDIO_CTRL_MASTER_EN	BIT(30)
+#define AR7240_MDIO_CTRL_BUSY		BIT(31)
+
+#define AR7240_REG_PORT_BASE(_port)	(0x100 + (_port) * 0x100)
+
+#define AR7240_REG_PORT_STATUS(_port)	(AR7240_REG_PORT_BASE((_port)) + 0x00)
+#define AR7240_PORT_STATUS_SPEED_S	0
+#define AR7240_PORT_STATUS_SPEED_M	BITM(2)
+#define AR7240_PORT_STATUS_SPEED_10	0
+#define AR7240_PORT_STATUS_SPEED_100	1
+#define AR7240_PORT_STATUS_SPEED_1000	2
+#define AR7240_PORT_STATUS_TXMAC	BIT(2)
+#define AR7240_PORT_STATUS_RXMAC	BIT(3)
+#define AR7240_PORT_STATUS_TXFLOW	BIT(4)
+#define AR7240_PORT_STATUS_RXFLOW	BIT(5)
+#define AR7240_PORT_STATUS_DUPLEX	BIT(6)
+#define AR7240_PORT_STATUS_LINK_UP	BIT(8)
+#define AR7240_PORT_STATUS_LINK_AUTO	BIT(9)
+#define AR7240_PORT_STATUS_LINK_PAUSE	BIT(10)
+
+#define AR7240_REG_PORT_CTRL(_port)	(AR7240_REG_PORT_BASE((_port)) + 0x04)
+#define AR7240_PORT_CTRL_STATE_M	BITM(3)
+#define	AR7240_PORT_CTRL_STATE_DISABLED	0
+#define AR7240_PORT_CTRL_STATE_BLOCK	1
+#define AR7240_PORT_CTRL_STATE_LISTEN	2
+#define AR7240_PORT_CTRL_STATE_LEARN	3
+#define AR7240_PORT_CTRL_STATE_FORWARD	4
+#define AR7240_PORT_CTRL_LEARN_LOCK	BIT(7)
+#define AR7240_PORT_CTRL_VLAN_MODE_S	8
+#define AR7240_PORT_CTRL_VLAN_MODE_KEEP	0
+#define AR7240_PORT_CTRL_VLAN_MODE_STRIP 1
+#define AR7240_PORT_CTRL_VLAN_MODE_ADD	2
+#define AR7240_PORT_CTRL_VLAN_MODE_DOUBLE_TAG 3
+#define AR7240_PORT_CTRL_IGMP_SNOOP	BIT(10)
+#define AR7240_PORT_CTRL_HEADER		BIT(11)
+#define AR7240_PORT_CTRL_MAC_LOOP	BIT(12)
+#define AR7240_PORT_CTRL_SINGLE_VLAN	BIT(13)
+#define AR7240_PORT_CTRL_LEARN		BIT(14)
+#define AR7240_PORT_CTRL_DOUBLE_TAG	BIT(15)
+#define AR7240_PORT_CTRL_MIRROR_TX	BIT(16)
+#define AR7240_PORT_CTRL_MIRROR_RX	BIT(17)
+
+#define AR7240_REG_PORT_VLAN(_port)	(AR7240_REG_PORT_BASE((_port)) + 0x08)
+
+#define AR7240_PORT_VLAN_DEFAULT_ID_S	0
+#define AR7240_PORT_VLAN_DEST_PORTS_S	16
+#define AR7240_PORT_VLAN_MODE_S		30
+#define AR7240_PORT_VLAN_MODE_PORT_ONLY	0
+#define AR7240_PORT_VLAN_MODE_PORT_FALLBACK	1
+#define AR7240_PORT_VLAN_MODE_VLAN_ONLY	2
+#define AR7240_PORT_VLAN_MODE_SECURE	3
+
+
+#define AR7240_REG_STATS_BASE(_port)	(0x20000 + (_port) * 0x100)
+
+#define AR7240_STATS_RXBROAD		0x00
+#define AR7240_STATS_RXPAUSE		0x04
+#define AR7240_STATS_RXMULTI		0x08
+#define AR7240_STATS_RXFCSERR		0x0c
+#define AR7240_STATS_RXALIGNERR		0x10
+#define AR7240_STATS_RXRUNT		0x14
+#define AR7240_STATS_RXFRAGMENT		0x18
+#define AR7240_STATS_RX64BYTE		0x1c
+#define AR7240_STATS_RX128BYTE		0x20
+#define AR7240_STATS_RX256BYTE		0x24
+#define AR7240_STATS_RX512BYTE		0x28
+#define AR7240_STATS_RX1024BYTE		0x2c
+#define AR7240_STATS_RX1518BYTE		0x30
+#define AR7240_STATS_RXMAXBYTE		0x34
+#define AR7240_STATS_RXTOOLONG		0x38
+#define AR7240_STATS_RXGOODBYTE		0x3c
+#define AR7240_STATS_RXBADBYTE		0x44
+#define AR7240_STATS_RXOVERFLOW		0x4c
+#define AR7240_STATS_FILTERED		0x50
+#define AR7240_STATS_TXBROAD		0x54
+#define AR7240_STATS_TXPAUSE		0x58
+#define AR7240_STATS_TXMULTI		0x5c
+#define AR7240_STATS_TXUNDERRUN		0x60
+#define AR7240_STATS_TX64BYTE		0x64
+#define AR7240_STATS_TX128BYTE		0x68
+#define AR7240_STATS_TX256BYTE		0x6c
+#define AR7240_STATS_TX512BYTE		0x70
+#define AR7240_STATS_TX1024BYTE		0x74
+#define AR7240_STATS_TX1518BYTE		0x78
+#define AR7240_STATS_TXMAXBYTE		0x7c
+#define AR7240_STATS_TXOVERSIZE		0x80
+#define AR7240_STATS_TXBYTE		0x84
+#define AR7240_STATS_TXCOLLISION	0x8c
+#define AR7240_STATS_TXABORTCOL		0x90
+#define AR7240_STATS_TXMULTICOL		0x94
+#define AR7240_STATS_TXSINGLECOL	0x98
+#define AR7240_STATS_TXEXCDEFER		0x9c
+#define AR7240_STATS_TXDEFER		0xa0
+#define AR7240_STATS_TXLATECOL		0xa4
+
+#define AR7240_PORT_CPU		0
+#define AR7240_NUM_PORTS	6
+#define AR7240_NUM_PHYS		5
+
+#define AR7240_PHY_ID1		0x004d
+#define AR7240_PHY_ID2		0xd041
+
+#define AR934X_PHY_ID1		0x004d
+#define AR934X_PHY_ID2		0xd042
+
+#define AR7240_MAX_VLANS	16
+
+#define AR934X_REG_OPER_MODE0		0x04
+#define   AR934X_OPER_MODE0_MAC_GMII_EN	BIT(6)
+#define   AR934X_OPER_MODE0_PHY_MII_EN	BIT(10)
+
+#define AR934X_REG_OPER_MODE1		0x08
+#define   AR934X_REG_OPER_MODE1_PHY4_MII_EN	BIT(28)
+
+#define AR934X_REG_FLOOD_MASK		0x2c
+#define   AR934X_FLOOD_MASK_MC_DP(_p)	BIT(16 + (_p))
+#define   AR934X_FLOOD_MASK_BC_DP(_p)	BIT(25 + (_p))
+
+#define AR934X_REG_QM_CTRL		0x3c
+#define   AR934X_QM_CTRL_ARP_EN		BIT(15)
+
+#define AR934X_REG_AT_CTRL		0x5c
+#define   AR934X_AT_CTRL_AGE_TIME	BITS(0, 15)
+#define   AR934X_AT_CTRL_AGE_EN		BIT(17)
+#define   AR934X_AT_CTRL_LEARN_CHANGE	BIT(18)
+
+#define AR934X_MIB_ENABLE		BIT(30)
+
+#define AR934X_REG_PORT_BASE(_port)	(0x100 + (_port) * 0x100)
+
+#define AR934X_REG_PORT_VLAN1(_port)	(AR934X_REG_PORT_BASE((_port)) + 0x08)
+#define   AR934X_PORT_VLAN1_DEFAULT_SVID_S		0
+#define   AR934X_PORT_VLAN1_FORCE_DEFAULT_VID_EN 	BIT(12)
+#define   AR934X_PORT_VLAN1_PORT_TLS_MODE		BIT(13)
+#define   AR934X_PORT_VLAN1_PORT_VLAN_PROP_EN		BIT(14)
+#define   AR934X_PORT_VLAN1_PORT_CLONE_EN		BIT(15)
+#define   AR934X_PORT_VLAN1_DEFAULT_CVID_S		16
+#define   AR934X_PORT_VLAN1_FORCE_PORT_VLAN_EN		BIT(28)
+#define   AR934X_PORT_VLAN1_ING_PORT_PRI_S		29
+
+#define AR934X_REG_PORT_VLAN2(_port)	(AR934X_REG_PORT_BASE((_port)) + 0x0c)
+#define   AR934X_PORT_VLAN2_PORT_VID_MEM_S		16
+#define   AR934X_PORT_VLAN2_8021Q_MODE_S		30
+#define   AR934X_PORT_VLAN2_8021Q_MODE_PORT_ONLY	0
+#define   AR934X_PORT_VLAN2_8021Q_MODE_PORT_FALLBACK	1
+#define   AR934X_PORT_VLAN2_8021Q_MODE_VLAN_ONLY	2
+#define   AR934X_PORT_VLAN2_8021Q_MODE_SECURE		3
+
+#define sw_to_ar7240(_dev) container_of(_dev, struct ar7240sw, swdev)
+
+struct ar7240sw_port_stat {
+	unsigned long rx_broadcast;
+	unsigned long rx_pause;
+	unsigned long rx_multicast;
+	unsigned long rx_fcs_error;
+	unsigned long rx_align_error;
+	unsigned long rx_runt;
+	unsigned long rx_fragments;
+	unsigned long rx_64byte;
+	unsigned long rx_128byte;
+	unsigned long rx_256byte;
+	unsigned long rx_512byte;
+	unsigned long rx_1024byte;
+	unsigned long rx_1518byte;
+	unsigned long rx_maxbyte;
+	unsigned long rx_toolong;
+	unsigned long rx_good_byte;
+	unsigned long rx_bad_byte;
+	unsigned long rx_overflow;
+	unsigned long filtered;
+
+	unsigned long tx_broadcast;
+	unsigned long tx_pause;
+	unsigned long tx_multicast;
+	unsigned long tx_underrun;
+	unsigned long tx_64byte;
+	unsigned long tx_128byte;
+	unsigned long tx_256byte;
+	unsigned long tx_512byte;
+	unsigned long tx_1024byte;
+	unsigned long tx_1518byte;
+	unsigned long tx_maxbyte;
+	unsigned long tx_oversize;
+	unsigned long tx_byte;
+	unsigned long tx_collision;
+	unsigned long tx_abortcol;
+	unsigned long tx_multicol;
+	unsigned long tx_singlecol;
+	unsigned long tx_excdefer;
+	unsigned long tx_defer;
+	unsigned long tx_xlatecol;
+};
+
+struct ar7240sw {
+	struct mii_bus	*mii_bus;
+	struct ag71xx_switch_platform_data *swdata;
+	struct switch_dev swdev;
+	int num_ports;
+	u8 ver;
+	bool vlan;
+	u16 vlan_id[AR7240_MAX_VLANS];
+	u8 vlan_table[AR7240_MAX_VLANS];
+	u8 vlan_tagged;
+	u16 pvid[AR7240_NUM_PORTS];
+	char buf[80];
+
+	rwlock_t stats_lock;
+	struct ar7240sw_port_stat port_stats[AR7240_NUM_PORTS];
+};
+
+struct ar7240sw_hw_stat {
+	char string[ETH_GSTRING_LEN];
+	int sizeof_stat;
+	int reg;
+};
+
+static DEFINE_MUTEX(reg_mutex);
+
+static inline int sw_is_ar7240(struct ar7240sw *as)
+{
+	return as->ver == AR7240_MASK_CTRL_VERSION_AR7240;
+}
+
+static inline int sw_is_ar934x(struct ar7240sw *as)
+{
+	return as->ver == AR7240_MASK_CTRL_VERSION_AR934X;
+}
+
+static inline u32 ar7240sw_port_mask(struct ar7240sw *as, int port)
+{
+	return BIT(port);
+}
+
+static inline u32 ar7240sw_port_mask_all(struct ar7240sw *as)
+{
+	return BIT(as->swdev.ports) - 1;
+}
+
+static inline u32 ar7240sw_port_mask_but(struct ar7240sw *as, int port)
+{
+	return ar7240sw_port_mask_all(as) & ~BIT(port);
+}
+
+static inline u16 mk_phy_addr(u32 reg)
+{
+	return 0x17 & ((reg >> 4) | 0x10);
+}
+
+static inline u16 mk_phy_reg(u32 reg)
+{
+	return (reg << 1) & 0x1e;
+}
+
+static inline u16 mk_high_addr(u32 reg)
+{
+	return (reg >> 7) & 0x1ff;
+}
+
+static u32 __ar7240sw_reg_read(struct mii_bus *mii, u32 reg)
+{
+	unsigned long flags;
+	u16 phy_addr;
+	u16 phy_reg;
+	u32 hi, lo;
+
+	reg = (reg & 0xfffffffc) >> 2;
+	phy_addr = mk_phy_addr(reg);
+	phy_reg = mk_phy_reg(reg);
+
+	local_irq_save(flags);
+	ag71xx_mdio_mii_write(mii->priv, 0x1f, 0x10, mk_high_addr(reg));
+	lo = (u32) ag71xx_mdio_mii_read(mii->priv, phy_addr, phy_reg);
+	hi = (u32) ag71xx_mdio_mii_read(mii->priv, phy_addr, phy_reg + 1);
+	local_irq_restore(flags);
+
+	return (hi << 16) | lo;
+}
+
+static void __ar7240sw_reg_write(struct mii_bus *mii, u32 reg, u32 val)
+{
+	unsigned long flags;
+	u16 phy_addr;
+	u16 phy_reg;
+
+	reg = (reg & 0xfffffffc) >> 2;
+	phy_addr = mk_phy_addr(reg);
+	phy_reg = mk_phy_reg(reg);
+
+	local_irq_save(flags);
+	ag71xx_mdio_mii_write(mii->priv, 0x1f, 0x10, mk_high_addr(reg));
+	ag71xx_mdio_mii_write(mii->priv, phy_addr, phy_reg + 1, (val >> 16));
+	ag71xx_mdio_mii_write(mii->priv, phy_addr, phy_reg, (val & 0xffff));
+	local_irq_restore(flags);
+}
+
+static u32 ar7240sw_reg_read(struct mii_bus *mii, u32 reg_addr)
+{
+	u32 ret;
+
+	mutex_lock(&reg_mutex);
+	ret = __ar7240sw_reg_read(mii, reg_addr);
+	mutex_unlock(&reg_mutex);
+
+	return ret;
+}
+
+static void ar7240sw_reg_write(struct mii_bus *mii, u32 reg_addr, u32 reg_val)
+{
+	mutex_lock(&reg_mutex);
+	__ar7240sw_reg_write(mii, reg_addr, reg_val);
+	mutex_unlock(&reg_mutex);
+}
+
+static u32 ar7240sw_reg_rmw(struct mii_bus *mii, u32 reg, u32 mask, u32 val)
+{
+	u32 t;
+
+	mutex_lock(&reg_mutex);
+	t = __ar7240sw_reg_read(mii, reg);
+	t &= ~mask;
+	t |= val;
+	__ar7240sw_reg_write(mii, reg, t);
+	mutex_unlock(&reg_mutex);
+
+	return t;
+}
+
+static void ar7240sw_reg_set(struct mii_bus *mii, u32 reg, u32 val)
+{
+	u32 t;
+
+	mutex_lock(&reg_mutex);
+	t = __ar7240sw_reg_read(mii, reg);
+	t |= val;
+	__ar7240sw_reg_write(mii, reg, t);
+	mutex_unlock(&reg_mutex);
+}
+
+static int __ar7240sw_reg_wait(struct mii_bus *mii, u32 reg, u32 mask, u32 val,
+			       unsigned timeout)
+{
+	int i;
+
+	for (i = 0; i < timeout; i++) {
+		u32 t;
+
+		t = __ar7240sw_reg_read(mii, reg);
+		if ((t & mask) == val)
+			return 0;
+
+		usleep_range(1000, 2000);
+	}
+
+	return -ETIMEDOUT;
+}
+
+static int ar7240sw_reg_wait(struct mii_bus *mii, u32 reg, u32 mask, u32 val,
+			     unsigned timeout)
+{
+	int ret;
+
+	mutex_lock(&reg_mutex);
+	ret = __ar7240sw_reg_wait(mii, reg, mask, val, timeout);
+	mutex_unlock(&reg_mutex);
+	return ret;
+}
+
+u16 ar7240sw_phy_read(struct mii_bus *mii, unsigned phy_addr,
+		      unsigned reg_addr)
+{
+	u32 t, val = 0xffff;
+	int err;
+
+	if (phy_addr >= AR7240_NUM_PHYS)
+		return 0xffff;
+
+	mutex_lock(&reg_mutex);
+	t = (reg_addr << AR7240_MDIO_CTRL_REG_ADDR_S) |
+	    (phy_addr << AR7240_MDIO_CTRL_PHY_ADDR_S) |
+	    AR7240_MDIO_CTRL_MASTER_EN |
+	    AR7240_MDIO_CTRL_BUSY |
+	    AR7240_MDIO_CTRL_CMD_READ;
+
+	__ar7240sw_reg_write(mii, AR7240_REG_MDIO_CTRL, t);
+	err = __ar7240sw_reg_wait(mii, AR7240_REG_MDIO_CTRL,
+				  AR7240_MDIO_CTRL_BUSY, 0, 5);
+	if (!err)
+		val = __ar7240sw_reg_read(mii, AR7240_REG_MDIO_CTRL);
+	mutex_unlock(&reg_mutex);
+
+	return val & AR7240_MDIO_CTRL_DATA_M;
+}
+
+int ar7240sw_phy_write(struct mii_bus *mii, unsigned phy_addr,
+		       unsigned reg_addr, u16 reg_val)
+{
+	u32 t;
+	int ret;
+
+	if (phy_addr >= AR7240_NUM_PHYS)
+		return -EINVAL;
+
+	mutex_lock(&reg_mutex);
+	t = (phy_addr << AR7240_MDIO_CTRL_PHY_ADDR_S) |
+	    (reg_addr << AR7240_MDIO_CTRL_REG_ADDR_S) |
+	    AR7240_MDIO_CTRL_MASTER_EN |
+	    AR7240_MDIO_CTRL_BUSY |
+	    AR7240_MDIO_CTRL_CMD_WRITE |
+	    reg_val;
+
+	__ar7240sw_reg_write(mii, AR7240_REG_MDIO_CTRL, t);
+	ret = __ar7240sw_reg_wait(mii, AR7240_REG_MDIO_CTRL,
+				  AR7240_MDIO_CTRL_BUSY, 0, 5);
+	mutex_unlock(&reg_mutex);
+
+	return ret;
+}
+
+static int ar7240sw_capture_stats(struct ar7240sw *as)
+{
+	struct mii_bus *mii = as->mii_bus;
+	int port;
+	int ret;
+
+	write_lock(&as->stats_lock);
+
+	/* Capture the hardware statistics for all ports */
+	ar7240sw_reg_rmw(mii, AR7240_REG_MIB_FUNCTION0,
+			 (AR7240_MIB_FUNC_M << AR7240_MIB_FUNC_S),
+			 (AR7240_MIB_FUNC_CAPTURE << AR7240_MIB_FUNC_S));
+
+	/* Wait for the capturing to complete. */
+	ret = ar7240sw_reg_wait(mii, AR7240_REG_MIB_FUNCTION0,
+				AR7240_MIB_BUSY, 0, 10);
+
+	if (ret)
+		goto unlock;
+
+	for (port = 0; port < AR7240_NUM_PORTS; port++) {
+		unsigned int base;
+		struct ar7240sw_port_stat *stats;
+
+		base = AR7240_REG_STATS_BASE(port);
+		stats = &as->port_stats[port];
+
+#define READ_STAT(_r) ar7240sw_reg_read(mii, base + AR7240_STATS_ ## _r)
+
+		stats->rx_good_byte += READ_STAT(RXGOODBYTE);
+		stats->tx_byte += READ_STAT(TXBYTE);
+
+#undef READ_STAT
+	}
+
+	ret = 0;
+
+unlock:
+	write_unlock(&as->stats_lock);
+	return ret;
+}
+
+static void ar7240sw_disable_port(struct ar7240sw *as, unsigned port)
+{
+	ar7240sw_reg_write(as->mii_bus, AR7240_REG_PORT_CTRL(port),
+			   AR7240_PORT_CTRL_STATE_DISABLED);
+}
+
+static void ar7240sw_setup(struct ar7240sw *as)
+{
+	struct mii_bus *mii = as->mii_bus;
+
+	/* Enable CPU port, and disable mirror port */
+	ar7240sw_reg_write(mii, AR7240_REG_CPU_PORT,
+			   AR7240_CPU_PORT_EN |
+			   (15 << AR7240_MIRROR_PORT_S));
+
+	/* Setup TAG priority mapping */
+	ar7240sw_reg_write(mii, AR7240_REG_TAG_PRIORITY, 0xfa50);
+
+	if (sw_is_ar934x(as)) {
+		/* Enable aging, MAC replacing */
+		ar7240sw_reg_write(mii, AR934X_REG_AT_CTRL,
+			0x2b /* 5 min age time */ |
+			AR934X_AT_CTRL_AGE_EN |
+			AR934X_AT_CTRL_LEARN_CHANGE);
+		/* Enable ARP frame acknowledge */
+		ar7240sw_reg_set(mii, AR934X_REG_QM_CTRL,
+				 AR934X_QM_CTRL_ARP_EN);
+		/* Enable Broadcast/Multicast frames transmitted to the CPU */
+		ar7240sw_reg_set(mii, AR934X_REG_FLOOD_MASK,
+				 AR934X_FLOOD_MASK_BC_DP(0) |
+				 AR934X_FLOOD_MASK_MC_DP(0));
+
+		/* setup MTU */
+		ar7240sw_reg_rmw(mii, AR7240_REG_GLOBAL_CTRL,
+				 AR9340_GLOBAL_CTRL_MTU_M,
+				 AR9340_GLOBAL_CTRL_MTU_M);
+
+		/* Enable MIB counters */
+		ar7240sw_reg_set(mii, AR7240_REG_MIB_FUNCTION0,
+				 AR934X_MIB_ENABLE);
+
+	} else {
+		/* Enable ARP frame acknowledge, aging, MAC replacing */
+		ar7240sw_reg_write(mii, AR7240_REG_AT_CTRL,
+			AR7240_AT_CTRL_RESERVED |
+			0x2b /* 5 min age time */ |
+			AR7240_AT_CTRL_AGE_EN |
+			AR7240_AT_CTRL_ARP_EN |
+			AR7240_AT_CTRL_LEARN_CHANGE);
+		/* Enable Broadcast frames transmitted to the CPU */
+		ar7240sw_reg_set(mii, AR7240_REG_FLOOD_MASK,
+				 AR7240_FLOOD_MASK_BROAD_TO_CPU);
+
+		/* setup MTU */
+		ar7240sw_reg_rmw(mii, AR7240_REG_GLOBAL_CTRL,
+				 AR7240_GLOBAL_CTRL_MTU_M,
+				 AR7240_GLOBAL_CTRL_MTU_M);
+	}
+
+	/* setup Service TAG */
+	ar7240sw_reg_rmw(mii, AR7240_REG_SERVICE_TAG, AR7240_SERVICE_TAG_M, 0);
+}
+
+/* inspired by phy_poll_reset in drivers/net/phy/phy_device.c */
+static int
+ar7240sw_phy_poll_reset(struct mii_bus *bus)
+{
+	const unsigned int sleep_msecs = 20;
+	int ret, elapsed, i;
+
+	for (elapsed = sleep_msecs; elapsed <= 600;
+	     elapsed += sleep_msecs) {
+		msleep(sleep_msecs);
+		for (i = 0; i < AR7240_NUM_PHYS; i++) {
+			ret = ar7240sw_phy_read(bus, i, MII_BMCR);
+			if (ret < 0)
+				return ret;
+			if (ret & BMCR_RESET)
+				break;
+			if (i == AR7240_NUM_PHYS - 1) {
+				usleep_range(1000, 2000);
+				return 0;
+			}
+		}
+	}
+	return -ETIMEDOUT;
+}
+
+static int ar7240sw_reset(struct ar7240sw *as)
+{
+	struct mii_bus *mii = as->mii_bus;
+	int ret;
+	int i;
+
+	/* Set all ports to disabled state. */
+	for (i = 0; i < AR7240_NUM_PORTS; i++)
+		ar7240sw_disable_port(as, i);
+
+	/* Wait for transmit queues to drain. */
+	usleep_range(2000, 3000);
+
+	/* Reset the switch. */
+	ar7240sw_reg_write(mii, AR7240_REG_MASK_CTRL,
+			   AR7240_MASK_CTRL_SOFT_RESET);
+
+	ret = ar7240sw_reg_wait(mii, AR7240_REG_MASK_CTRL,
+				AR7240_MASK_CTRL_SOFT_RESET, 0, 1000);
+
+	/* setup PHYs */
+	for (i = 0; i < AR7240_NUM_PHYS; i++) {
+		ar7240sw_phy_write(mii, i, MII_ADVERTISE,
+				   ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
+				   ADVERTISE_PAUSE_ASYM);
+		ar7240sw_phy_write(mii, i, MII_BMCR,
+				   BMCR_RESET | BMCR_ANENABLE);
+	}
+	ret = ar7240sw_phy_poll_reset(mii);
+	if (ret)
+		return ret;
+
+	ar7240sw_setup(as);
+	return ret;
+}
+
+static void ar7240sw_setup_port(struct ar7240sw *as, unsigned port, u8 portmask)
+{
+	struct mii_bus *mii = as->mii_bus;
+	u32 ctrl;
+	u32 vid, mode;
+
+	ctrl = AR7240_PORT_CTRL_STATE_FORWARD | AR7240_PORT_CTRL_LEARN |
+		AR7240_PORT_CTRL_SINGLE_VLAN;
+
+	if (port == AR7240_PORT_CPU) {
+		ar7240sw_reg_write(mii, AR7240_REG_PORT_STATUS(port),
+				   AR7240_PORT_STATUS_SPEED_1000 |
+				   AR7240_PORT_STATUS_TXFLOW |
+				   AR7240_PORT_STATUS_RXFLOW |
+				   AR7240_PORT_STATUS_TXMAC |
+				   AR7240_PORT_STATUS_RXMAC |
+				   AR7240_PORT_STATUS_DUPLEX);
+	} else {
+		ar7240sw_reg_write(mii, AR7240_REG_PORT_STATUS(port),
+				   AR7240_PORT_STATUS_LINK_AUTO);
+	}
+
+	/* Set the default VID for this port */
+	if (as->vlan) {
+		vid = as->vlan_id[as->pvid[port]];
+		mode = AR7240_PORT_VLAN_MODE_SECURE;
+	} else {
+		vid = port;
+		mode = AR7240_PORT_VLAN_MODE_PORT_ONLY;
+	}
+
+	if (as->vlan) {
+		if (as->vlan_tagged & BIT(port))
+			ctrl |= AR7240_PORT_CTRL_VLAN_MODE_ADD <<
+				AR7240_PORT_CTRL_VLAN_MODE_S;
+		else
+			ctrl |= AR7240_PORT_CTRL_VLAN_MODE_STRIP <<
+				AR7240_PORT_CTRL_VLAN_MODE_S;
+	} else {
+		ctrl |= AR7240_PORT_CTRL_VLAN_MODE_KEEP <<
+			AR7240_PORT_CTRL_VLAN_MODE_S;
+	}
+
+	if (!portmask) {
+		if (port == AR7240_PORT_CPU)
+			portmask = ar7240sw_port_mask_but(as, AR7240_PORT_CPU);
+		else
+			portmask = ar7240sw_port_mask(as, AR7240_PORT_CPU);
+	}
+
+	/* allow the port to talk to all other ports, but exclude its
+	 * own ID to prevent frames from being reflected back to the
+	 * port that they came from */
+	portmask &= ar7240sw_port_mask_but(as, port);
+
+	ar7240sw_reg_write(mii, AR7240_REG_PORT_CTRL(port), ctrl);
+	if (sw_is_ar934x(as)) {
+		u32 vlan1, vlan2;
+
+		vlan1 = (vid << AR934X_PORT_VLAN1_DEFAULT_CVID_S);
+		vlan2 = (portmask << AR934X_PORT_VLAN2_PORT_VID_MEM_S) |
+			(mode << AR934X_PORT_VLAN2_8021Q_MODE_S);
+		ar7240sw_reg_write(mii, AR934X_REG_PORT_VLAN1(port), vlan1);
+		ar7240sw_reg_write(mii, AR934X_REG_PORT_VLAN2(port), vlan2);
+	} else {
+		u32 vlan;
+
+		vlan = vid | (mode << AR7240_PORT_VLAN_MODE_S) |
+		       (portmask << AR7240_PORT_VLAN_DEST_PORTS_S);
+
+		ar7240sw_reg_write(mii, AR7240_REG_PORT_VLAN(port), vlan);
+	}
+}
+
+static int ar7240_set_addr(struct ar7240sw *as, u8 *addr)
+{
+	struct mii_bus *mii = as->mii_bus;
+	u32 t;
+
+	t = (addr[4] << 8) | addr[5];
+	ar7240sw_reg_write(mii, AR7240_REG_MAC_ADDR0, t);
+
+	t = (addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) | addr[3];
+	ar7240sw_reg_write(mii, AR7240_REG_MAC_ADDR1, t);
+
+	return 0;
+}
+
+static int
+ar7240_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	as->vlan_id[val->port_vlan] = val->value.i;
+	return 0;
+}
+
+static int
+ar7240_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	val->value.i = as->vlan_id[val->port_vlan];
+	return 0;
+}
+
+static int
+ar7240_set_pvid(struct switch_dev *dev, int port, int vlan)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+
+	/* make sure no invalid PVIDs get set */
+
+	if (vlan >= dev->vlans)
+		return -EINVAL;
+
+	as->pvid[port] = vlan;
+	return 0;
+}
+
+static int
+ar7240_get_pvid(struct switch_dev *dev, int port, int *vlan)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	*vlan = as->pvid[port];
+	return 0;
+}
+
+static int
+ar7240_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	u8 ports = as->vlan_table[val->port_vlan];
+	int i;
+
+	val->len = 0;
+	for (i = 0; i < as->swdev.ports; i++) {
+		struct switch_port *p;
+
+		if (!(ports & (1 << i)))
+			continue;
+
+		p = &val->value.ports[val->len++];
+		p->id = i;
+		if (as->vlan_tagged & (1 << i))
+			p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+		else
+			p->flags = 0;
+	}
+	return 0;
+}
+
+static int
+ar7240_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	u8 *vt = &as->vlan_table[val->port_vlan];
+	int i, j;
+
+	*vt = 0;
+	for (i = 0; i < val->len; i++) {
+		struct switch_port *p = &val->value.ports[i];
+
+		if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED))
+			as->vlan_tagged |= (1 << p->id);
+		else {
+			as->vlan_tagged &= ~(1 << p->id);
+			as->pvid[p->id] = val->port_vlan;
+
+			/* make sure that an untagged port does not
+			 * appear in other vlans */
+			for (j = 0; j < AR7240_MAX_VLANS; j++) {
+				if (j == val->port_vlan)
+					continue;
+				as->vlan_table[j] &= ~(1 << p->id);
+			}
+		}
+
+		*vt |= 1 << p->id;
+	}
+	return 0;
+}
+
+static int
+ar7240_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	as->vlan = !!val->value.i;
+	return 0;
+}
+
+static int
+ar7240_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	val->value.i = as->vlan;
+	return 0;
+}
+
+static void
+ar7240_vtu_op(struct ar7240sw *as, u32 op, u32 val)
+{
+	struct mii_bus *mii = as->mii_bus;
+
+	if (ar7240sw_reg_wait(mii, AR7240_REG_VTU, AR7240_VTU_ACTIVE, 0, 5))
+		return;
+
+	if ((op & AR7240_VTU_OP) == AR7240_VTU_OP_LOAD) {
+		val &= AR7240_VTUDATA_MEMBER;
+		val |= AR7240_VTUDATA_VALID;
+		ar7240sw_reg_write(mii, AR7240_REG_VTU_DATA, val);
+	}
+	op |= AR7240_VTU_ACTIVE;
+	ar7240sw_reg_write(mii, AR7240_REG_VTU, op);
+}
+
+static int
+ar7240_hw_apply(struct switch_dev *dev)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	u8 portmask[AR7240_NUM_PORTS];
+	int i, j;
+
+	/* flush all vlan translation unit entries */
+	ar7240_vtu_op(as, AR7240_VTU_OP_FLUSH, 0);
+
+	memset(portmask, 0, sizeof(portmask));
+	if (as->vlan) {
+		/* calculate the port destination masks and load vlans
+		 * into the vlan translation unit */
+		for (j = 0; j < AR7240_MAX_VLANS; j++) {
+			u8 vp = as->vlan_table[j];
+
+			if (!vp)
+				continue;
+
+			for (i = 0; i < as->swdev.ports; i++) {
+				u8 mask = (1 << i);
+				if (vp & mask)
+					portmask[i] |= vp & ~mask;
+			}
+
+			ar7240_vtu_op(as,
+				AR7240_VTU_OP_LOAD |
+				(as->vlan_id[j] << AR7240_VTU_VID_S),
+				as->vlan_table[j]);
+		}
+	} else {
+		/* vlan disabled:
+		 * isolate all ports, but connect them to the cpu port */
+		for (i = 0; i < as->swdev.ports; i++) {
+			if (i == AR7240_PORT_CPU)
+				continue;
+
+			portmask[i] = 1 << AR7240_PORT_CPU;
+			portmask[AR7240_PORT_CPU] |= (1 << i);
+		}
+	}
+
+	/* update the port destination mask registers and tag settings */
+	for (i = 0; i < as->swdev.ports; i++)
+		ar7240sw_setup_port(as, i, portmask[i]);
+
+	return 0;
+}
+
+static int
+ar7240_reset_switch(struct switch_dev *dev)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	ar7240sw_reset(as);
+	return 0;
+}
+
+static int
+ar7240_get_port_link(struct switch_dev *dev, int port,
+		     struct switch_port_link *link)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+	struct mii_bus *mii = as->mii_bus;
+	u32 status;
+
+	if (port > AR7240_NUM_PORTS)
+		return -EINVAL;
+
+	status = ar7240sw_reg_read(mii, AR7240_REG_PORT_STATUS(port));
+	link->aneg = !!(status & AR7240_PORT_STATUS_LINK_AUTO);
+	if (link->aneg) {
+		link->link = !!(status & AR7240_PORT_STATUS_LINK_UP);
+		if (!link->link)
+			return 0;
+	} else {
+		link->link = true;
+	}
+
+	link->duplex = !!(status & AR7240_PORT_STATUS_DUPLEX);
+	link->tx_flow = !!(status & AR7240_PORT_STATUS_TXFLOW);
+	link->rx_flow = !!(status & AR7240_PORT_STATUS_RXFLOW);
+	switch (status & AR7240_PORT_STATUS_SPEED_M) {
+	case AR7240_PORT_STATUS_SPEED_10:
+		link->speed = SWITCH_PORT_SPEED_10;
+		break;
+	case AR7240_PORT_STATUS_SPEED_100:
+		link->speed = SWITCH_PORT_SPEED_100;
+		break;
+	case AR7240_PORT_STATUS_SPEED_1000:
+		link->speed = SWITCH_PORT_SPEED_1000;
+		break;
+	}
+
+	return 0;
+}
+
+static int
+ar7240_get_port_stats(struct switch_dev *dev, int port,
+		      struct switch_port_stats *stats)
+{
+	struct ar7240sw *as = sw_to_ar7240(dev);
+
+	if (port > AR7240_NUM_PORTS)
+		return -EINVAL;
+
+	ar7240sw_capture_stats(as);
+
+	read_lock(&as->stats_lock);
+	stats->rx_bytes = as->port_stats[port].rx_good_byte;
+	stats->tx_bytes = as->port_stats[port].tx_byte;
+	read_unlock(&as->stats_lock);
+
+	return 0;
+}
+
+static struct switch_attr ar7240_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = ar7240_set_vlan,
+		.get = ar7240_get_vlan,
+		.max = 1
+	},
+};
+
+static struct switch_attr ar7240_port[] = {
+};
+
+static struct switch_attr ar7240_vlan[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "vid",
+		.description = "VLAN ID",
+		.set = ar7240_set_vid,
+		.get = ar7240_get_vid,
+		.max = 4094,
+	},
+};
+
+static const struct switch_dev_ops ar7240_ops = {
+	.attr_global = {
+		.attr = ar7240_globals,
+		.n_attr = ARRAY_SIZE(ar7240_globals),
+	},
+	.attr_port = {
+		.attr = ar7240_port,
+		.n_attr = ARRAY_SIZE(ar7240_port),
+	},
+	.attr_vlan = {
+		.attr = ar7240_vlan,
+		.n_attr = ARRAY_SIZE(ar7240_vlan),
+	},
+	.get_port_pvid = ar7240_get_pvid,
+	.set_port_pvid = ar7240_set_pvid,
+	.get_vlan_ports = ar7240_get_ports,
+	.set_vlan_ports = ar7240_set_ports,
+	.apply_config = ar7240_hw_apply,
+	.reset_switch = ar7240_reset_switch,
+	.get_port_link = ar7240_get_port_link,
+	.get_port_stats = ar7240_get_port_stats,
+};
+
+static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	struct mii_bus *mii = ag->mii_bus;
+	struct ar7240sw *as;
+	struct switch_dev *swdev;
+	u32 ctrl;
+	u16 phy_id1;
+	u16 phy_id2;
+	int i;
+
+	phy_id1 = ar7240sw_phy_read(mii, 0, MII_PHYSID1);
+	phy_id2 = ar7240sw_phy_read(mii, 0, MII_PHYSID2);
+	if ((phy_id1 != AR7240_PHY_ID1 || phy_id2 != AR7240_PHY_ID2) &&
+	    (phy_id1 != AR934X_PHY_ID1 || phy_id2 != AR934X_PHY_ID2)) {
+		pr_err("%s: unknown phy id '%04x:%04x'\n",
+		       dev_name(&mii->dev), phy_id1, phy_id2);
+		return NULL;
+	}
+
+	as = kzalloc(sizeof(*as), GFP_KERNEL);
+	if (!as)
+		return NULL;
+
+	as->mii_bus = mii;
+	as->swdata = pdata->switch_data;
+
+	swdev = &as->swdev;
+
+	ctrl = ar7240sw_reg_read(mii, AR7240_REG_MASK_CTRL);
+	as->ver = (ctrl >> AR7240_MASK_CTRL_VERSION_S) &
+		  AR7240_MASK_CTRL_VERSION_M;
+
+	if (sw_is_ar7240(as)) {
+		swdev->name = "AR7240/AR9330 built-in switch";
+		swdev->ports = AR7240_NUM_PORTS - 1;
+	} else if (sw_is_ar934x(as)) {
+		swdev->name = "AR934X built-in switch";
+
+		if (pdata->phy_if_mode == PHY_INTERFACE_MODE_GMII) {
+			ar7240sw_reg_set(mii, AR934X_REG_OPER_MODE0,
+					 AR934X_OPER_MODE0_MAC_GMII_EN);
+		} else if (pdata->phy_if_mode == PHY_INTERFACE_MODE_MII) {
+			ar7240sw_reg_set(mii, AR934X_REG_OPER_MODE0,
+					 AR934X_OPER_MODE0_PHY_MII_EN);
+		} else {
+			pr_err("%s: invalid PHY interface mode\n",
+			       dev_name(&mii->dev));
+			goto err_free;
+		}
+
+		if (as->swdata->phy4_mii_en) {
+			ar7240sw_reg_set(mii, AR934X_REG_OPER_MODE1,
+					 AR934X_REG_OPER_MODE1_PHY4_MII_EN);
+			swdev->ports = AR7240_NUM_PORTS - 1;
+		} else {
+			swdev->ports = AR7240_NUM_PORTS;
+		}
+	} else {
+		pr_err("%s: unsupported chip, ctrl=%08x\n",
+			dev_name(&mii->dev), ctrl);
+		goto err_free;
+	}
+
+	swdev->cpu_port = AR7240_PORT_CPU;
+	swdev->vlans = AR7240_MAX_VLANS;
+	swdev->ops = &ar7240_ops;
+
+	if (register_switch(&as->swdev, ag->dev) < 0)
+		goto err_free;
+
+	pr_info("%s: Found an %s\n", dev_name(&mii->dev), swdev->name);
+
+	/* initialize defaults */
+	for (i = 0; i < AR7240_MAX_VLANS; i++)
+		as->vlan_id[i] = i;
+
+	as->vlan_table[0] = ar7240sw_port_mask_all(as);
+
+	return as;
+
+err_free:
+	kfree(as);
+	return NULL;
+}
+
+static void link_function(struct work_struct *work) {
+	struct ag71xx *ag = container_of(work, struct ag71xx, link_work.work);
+	struct ar7240sw *as = ag->phy_priv;
+	unsigned long flags;
+	u8 mask;
+	int i;
+	int status = 0;
+
+	mask = ~as->swdata->phy_poll_mask;
+	for (i = 0; i < AR7240_NUM_PHYS; i++) {
+		int link;
+
+		if (!(mask & BIT(i)))
+			continue;
+
+		link = ar7240sw_phy_read(ag->mii_bus, i, MII_BMSR);
+		if (link & BMSR_LSTATUS) {
+			status = 1;
+			break;
+		}
+	}
+
+	spin_lock_irqsave(&ag->lock, flags);
+	if (status != ag->link) {
+		ag->link = status;
+		ag71xx_link_adjust(ag);
+	}
+	spin_unlock_irqrestore(&ag->lock, flags);
+
+	schedule_delayed_work(&ag->link_work, HZ / 2);
+}
+
+void ag71xx_ar7240_start(struct ag71xx *ag)
+{
+	struct ar7240sw *as = ag->phy_priv;
+
+	ar7240sw_reset(as);
+
+	ag->speed = SPEED_1000;
+	ag->duplex = 1;
+
+	ar7240_set_addr(as, ag->dev->dev_addr);
+	ar7240_hw_apply(&as->swdev);
+
+	schedule_delayed_work(&ag->link_work, HZ / 10);
+}
+
+void ag71xx_ar7240_stop(struct ag71xx *ag)
+{
+	cancel_delayed_work_sync(&ag->link_work);
+}
+
+int ag71xx_ar7240_init(struct ag71xx *ag)
+{
+	struct ar7240sw *as;
+
+	as = ar7240_probe(ag);
+	if (!as)
+		return -ENODEV;
+
+	ag->phy_priv = as;
+	ar7240sw_reset(as);
+
+	rwlock_init(&as->stats_lock);
+	INIT_DELAYED_WORK(&ag->link_work, link_function);
+
+	return 0;
+}
+
+void ag71xx_ar7240_cleanup(struct ag71xx *ag)
+{
+	struct ar7240sw *as = ag->phy_priv;
+
+	if (!as)
+		return;
+
+	unregister_switch(&as->swdev);
+	kfree(as);
+	ag->phy_priv = NULL;
+}
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar8216.c b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar8216.c
new file mode 100644
index 00000000..7ec43b72
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar8216.c
@@ -0,0 +1,44 @@
+/*
+ *  Atheros AR71xx built-in ethernet mac driver
+ *  Special support for the Atheros ar8216 switch chip
+ *
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  Based on Atheros' AG7100 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include "ag71xx.h"
+
+#define AR8216_PACKET_TYPE_MASK		0xf
+#define AR8216_PACKET_TYPE_NORMAL	0
+
+#define AR8216_HEADER_LEN	2
+
+void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb)
+{
+	skb_push(skb, AR8216_HEADER_LEN);
+	skb->data[0] = 0x10;
+	skb->data[1] = 0x80;
+}
+
+int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb,
+				int pktlen)
+{
+	u8 type;
+
+	type = skb->data[1] & AR8216_PACKET_TYPE_MASK;
+	switch (type) {
+	case AR8216_PACKET_TYPE_NORMAL:
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	skb_pull(skb, AR8216_HEADER_LEN);
+	return 0;
+}
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c
new file mode 100644
index 00000000..c4801210
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c
@@ -0,0 +1,285 @@
+/*
+ *  Atheros AR71xx built-in ethernet mac driver
+ *
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Based on Atheros' AG7100 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/debugfs.h>
+
+#include "ag71xx.h"
+
+static struct dentry *ag71xx_debugfs_root;
+
+static int ag71xx_debugfs_generic_open(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private;
+	return 0;
+}
+
+void ag71xx_debugfs_update_int_stats(struct ag71xx *ag, u32 status)
+{
+	if (status)
+		ag->debug.int_stats.total++;
+	if (status & AG71XX_INT_TX_PS)
+		ag->debug.int_stats.tx_ps++;
+	if (status & AG71XX_INT_TX_UR)
+		ag->debug.int_stats.tx_ur++;
+	if (status & AG71XX_INT_TX_BE)
+		ag->debug.int_stats.tx_be++;
+	if (status & AG71XX_INT_RX_PR)
+		ag->debug.int_stats.rx_pr++;
+	if (status & AG71XX_INT_RX_OF)
+		ag->debug.int_stats.rx_of++;
+	if (status & AG71XX_INT_RX_BE)
+		ag->debug.int_stats.rx_be++;
+}
+
+static ssize_t read_file_int_stats(struct file *file, char __user *user_buf,
+				   size_t count, loff_t *ppos)
+{
+#define PR_INT_STAT(_label, _field)					\
+	len += snprintf(buf + len, sizeof(buf) - len,			\
+		"%20s: %10lu\n", _label, ag->debug.int_stats._field);
+
+	struct ag71xx *ag = file->private_data;
+	char buf[256];
+	unsigned int len = 0;
+
+	PR_INT_STAT("TX Packet Sent", tx_ps);
+	PR_INT_STAT("TX Underrun", tx_ur);
+	PR_INT_STAT("TX Bus Error", tx_be);
+	PR_INT_STAT("RX Packet Received", rx_pr);
+	PR_INT_STAT("RX Overflow", rx_of);
+	PR_INT_STAT("RX Bus Error", rx_be);
+	len += snprintf(buf + len, sizeof(buf) - len, "\n");
+	PR_INT_STAT("Total", total);
+
+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+#undef PR_INT_STAT
+}
+
+static const struct file_operations ag71xx_fops_int_stats = {
+	.open	= ag71xx_debugfs_generic_open,
+	.read	= read_file_int_stats,
+	.owner	= THIS_MODULE
+};
+
+void ag71xx_debugfs_update_napi_stats(struct ag71xx *ag, int rx, int tx)
+{
+	struct ag71xx_napi_stats *stats = &ag->debug.napi_stats;
+
+	if (rx) {
+		stats->rx_count++;
+		stats->rx_packets += rx;
+		if (rx <= AG71XX_NAPI_WEIGHT)
+			stats->rx[rx]++;
+		if (rx > stats->rx_packets_max)
+			stats->rx_packets_max = rx;
+	}
+
+	if (tx) {
+		stats->tx_count++;
+		stats->tx_packets += tx;
+		if (tx <= AG71XX_NAPI_WEIGHT)
+			stats->tx[tx]++;
+		if (tx > stats->tx_packets_max)
+			stats->tx_packets_max = tx;
+	}
+}
+
+static ssize_t read_file_napi_stats(struct file *file, char __user *user_buf,
+				    size_t count, loff_t *ppos)
+{
+	struct ag71xx *ag = file->private_data;
+	struct ag71xx_napi_stats *stats = &ag->debug.napi_stats;
+	char *buf;
+	unsigned int buflen;
+	unsigned int len = 0;
+	unsigned long rx_avg = 0;
+	unsigned long tx_avg = 0;
+	int ret;
+	int i;
+
+	buflen = 2048;
+	buf = kmalloc(buflen, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
+
+	if (stats->rx_count)
+		rx_avg = stats->rx_packets / stats->rx_count;
+
+	if (stats->tx_count)
+		tx_avg = stats->tx_packets / stats->tx_count;
+
+	len += snprintf(buf + len, buflen - len, "%3s  %10s %10s\n",
+			"len", "rx", "tx");
+
+	for (i = 1; i <= AG71XX_NAPI_WEIGHT; i++)
+		len += snprintf(buf + len, buflen - len,
+				"%3d: %10lu %10lu\n",
+				i, stats->rx[i], stats->tx[i]);
+
+	len += snprintf(buf + len, buflen - len, "\n");
+
+	len += snprintf(buf + len, buflen - len, "%3s: %10lu %10lu\n",
+			"sum", stats->rx_count, stats->tx_count);
+	len += snprintf(buf + len, buflen - len, "%3s: %10lu %10lu\n",
+			"avg", rx_avg, tx_avg);
+	len += snprintf(buf + len, buflen - len, "%3s: %10lu %10lu\n",
+			"max", stats->rx_packets_max, stats->tx_packets_max);
+	len += snprintf(buf + len, buflen - len, "%3s: %10lu %10lu\n",
+			"pkt", stats->rx_packets, stats->tx_packets);
+
+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+	kfree(buf);
+
+	return ret;
+}
+
+static const struct file_operations ag71xx_fops_napi_stats = {
+	.open	= ag71xx_debugfs_generic_open,
+	.read	= read_file_napi_stats,
+	.owner	= THIS_MODULE
+};
+
+#define DESC_PRINT_LEN	64
+
+static ssize_t read_file_ring(struct file *file, char __user *user_buf,
+			      size_t count, loff_t *ppos,
+			      struct ag71xx *ag,
+			      struct ag71xx_ring *ring,
+			      unsigned desc_reg)
+{
+	char *buf;
+	unsigned int buflen;
+	unsigned int len = 0;
+	unsigned long flags;
+	ssize_t ret;
+	int curr;
+	int dirty;
+	u32 desc_hw;
+	int i;
+
+	buflen = (ring->size * DESC_PRINT_LEN);
+	buf = kmalloc(buflen, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
+
+	len += snprintf(buf + len, buflen - len,
+			"Idx ... %-8s %-8s %-8s %-8s . %-10s\n",
+			"desc", "next", "data", "ctrl", "timestamp");
+
+	spin_lock_irqsave(&ag->lock, flags);
+
+	curr = (ring->curr % ring->size);
+	dirty = (ring->dirty % ring->size);
+	desc_hw = ag71xx_rr(ag, desc_reg);
+	for (i = 0; i < ring->size; i++) {
+		struct ag71xx_buf *ab = &ring->buf[i];
+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+		u32 desc_dma = ((u32) ring->descs_dma) + i * ring->desc_size;
+
+		len += snprintf(buf + len, buflen - len,
+			"%3d %c%c%c %08x %08x %08x %08x %c %10lu\n",
+			i,
+			(i == curr) ? 'C' : ' ',
+			(i == dirty) ? 'D' : ' ',
+			(desc_hw == desc_dma) ? 'H' : ' ',
+			desc_dma,
+			desc->next,
+			desc->data,
+			desc->ctrl,
+			(desc->ctrl & DESC_EMPTY) ? 'E' : '*',
+			ab->timestamp);
+	}
+
+	spin_unlock_irqrestore(&ag->lock, flags);
+
+	ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+	kfree(buf);
+
+	return ret;
+}
+
+static ssize_t read_file_tx_ring(struct file *file, char __user *user_buf,
+				 size_t count, loff_t *ppos)
+{
+	struct ag71xx *ag = file->private_data;
+
+	return read_file_ring(file, user_buf, count, ppos, ag, &ag->tx_ring,
+			      AG71XX_REG_TX_DESC);
+}
+
+static const struct file_operations ag71xx_fops_tx_ring = {
+	.open	= ag71xx_debugfs_generic_open,
+	.read	= read_file_tx_ring,
+	.owner	= THIS_MODULE
+};
+
+static ssize_t read_file_rx_ring(struct file *file, char __user *user_buf,
+				 size_t count, loff_t *ppos)
+{
+	struct ag71xx *ag = file->private_data;
+
+	return read_file_ring(file, user_buf, count, ppos, ag, &ag->rx_ring,
+			      AG71XX_REG_RX_DESC);
+}
+
+static const struct file_operations ag71xx_fops_rx_ring = {
+	.open	= ag71xx_debugfs_generic_open,
+	.read	= read_file_rx_ring,
+	.owner	= THIS_MODULE
+};
+
+void ag71xx_debugfs_exit(struct ag71xx *ag)
+{
+	debugfs_remove_recursive(ag->debug.debugfs_dir);
+}
+
+int ag71xx_debugfs_init(struct ag71xx *ag)
+{
+	struct device *dev = &ag->pdev->dev;
+
+	ag->debug.debugfs_dir = debugfs_create_dir(dev_name(dev),
+						   ag71xx_debugfs_root);
+	if (!ag->debug.debugfs_dir) {
+		dev_err(dev, "unable to create debugfs directory\n");
+		return -ENOENT;
+	}
+
+	debugfs_create_file("int_stats", S_IRUGO, ag->debug.debugfs_dir,
+			    ag, &ag71xx_fops_int_stats);
+	debugfs_create_file("napi_stats", S_IRUGO, ag->debug.debugfs_dir,
+			    ag, &ag71xx_fops_napi_stats);
+	debugfs_create_file("tx_ring", S_IRUGO, ag->debug.debugfs_dir,
+			    ag, &ag71xx_fops_tx_ring);
+	debugfs_create_file("rx_ring", S_IRUGO, ag->debug.debugfs_dir,
+			    ag, &ag71xx_fops_rx_ring);
+
+	return 0;
+}
+
+int ag71xx_debugfs_root_init(void)
+{
+	if (ag71xx_debugfs_root)
+		return -EBUSY;
+
+	ag71xx_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
+	if (!ag71xx_debugfs_root)
+		return -ENOENT;
+
+	return 0;
+}
+
+void ag71xx_debugfs_root_exit(void)
+{
+	debugfs_remove(ag71xx_debugfs_root);
+	ag71xx_debugfs_root = NULL;
+}
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
new file mode 100644
index 00000000..cad9f2ff
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
@@ -0,0 +1,130 @@
+/*
+ *  Atheros AR71xx built-in ethernet mac driver
+ *
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Based on Atheros' AG7100 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include "ag71xx.h"
+
+static int ag71xx_ethtool_get_settings(struct net_device *dev,
+				       struct ethtool_cmd *cmd)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	struct phy_device *phydev = ag->phy_dev;
+
+	if (!phydev)
+		return -ENODEV;
+
+	return phy_ethtool_gset(phydev, cmd);
+}
+
+static int ag71xx_ethtool_set_settings(struct net_device *dev,
+				       struct ethtool_cmd *cmd)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	struct phy_device *phydev = ag->phy_dev;
+
+	if (!phydev)
+		return -ENODEV;
+
+	return phy_ethtool_sset(phydev, cmd);
+}
+
+static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,
+				       struct ethtool_drvinfo *info)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+
+	strcpy(info->driver, ag->pdev->dev.driver->name);
+	strcpy(info->version, AG71XX_DRV_VERSION);
+	strcpy(info->bus_info, dev_name(&ag->pdev->dev));
+}
+
+static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+
+	return ag->msg_enable;
+}
+
+static void ag71xx_ethtool_set_msglevel(struct net_device *dev, u32 msg_level)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+
+	ag->msg_enable = msg_level;
+}
+
+static void ag71xx_ethtool_get_ringparam(struct net_device *dev,
+					 struct ethtool_ringparam *er)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+
+	er->tx_max_pending = AG71XX_TX_RING_SIZE_MAX;
+	er->rx_max_pending = AG71XX_RX_RING_SIZE_MAX;
+	er->rx_mini_max_pending = 0;
+	er->rx_jumbo_max_pending = 0;
+
+	er->tx_pending = ag->tx_ring.size;
+	er->rx_pending = ag->rx_ring.size;
+	er->rx_mini_pending = 0;
+	er->rx_jumbo_pending = 0;
+
+	if (ag->tx_ring.desc_split)
+		er->tx_pending /= AG71XX_TX_RING_DS_PER_PKT;
+}
+
+static int ag71xx_ethtool_set_ringparam(struct net_device *dev,
+					struct ethtool_ringparam *er)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	unsigned tx_size;
+	unsigned rx_size;
+	int err;
+
+	if (er->rx_mini_pending != 0||
+	    er->rx_jumbo_pending != 0 ||
+	    er->rx_pending == 0 ||
+	    er->tx_pending == 0)
+		return -EINVAL;
+
+	tx_size = er->tx_pending < AG71XX_TX_RING_SIZE_MAX ?
+		  er->tx_pending : AG71XX_TX_RING_SIZE_MAX;
+
+	rx_size = er->rx_pending < AG71XX_RX_RING_SIZE_MAX ?
+		  er->rx_pending : AG71XX_RX_RING_SIZE_MAX;
+
+	if (netif_running(dev)) {
+		err = dev->netdev_ops->ndo_stop(dev);
+		if (err)
+			return err;
+	}
+
+	if (ag->tx_ring.desc_split)
+		tx_size *= AG71XX_TX_RING_DS_PER_PKT;
+
+	ag->tx_ring.size = tx_size;
+	ag->rx_ring.size = rx_size;
+
+	if (netif_running(dev))
+		err = dev->netdev_ops->ndo_open(dev);
+
+	return err;
+}
+
+struct ethtool_ops ag71xx_ethtool_ops = {
+	.set_settings	= ag71xx_ethtool_set_settings,
+	.get_settings	= ag71xx_ethtool_get_settings,
+	.get_drvinfo	= ag71xx_ethtool_get_drvinfo,
+	.get_msglevel	= ag71xx_ethtool_get_msglevel,
+	.set_msglevel	= ag71xx_ethtool_set_msglevel,
+	.get_ringparam	= ag71xx_ethtool_get_ringparam,
+	.set_ringparam	= ag71xx_ethtool_set_ringparam,
+	.get_link	= ethtool_op_get_link,
+};
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
new file mode 100644
index 00000000..5ef324e8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -0,0 +1,1406 @@
+/*
+ *  Atheros AR71xx built-in ethernet mac driver
+ *
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Based on Atheros' AG7100 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include "ag71xx.h"
+
+#define AG71XX_DEFAULT_MSG_ENABLE	\
+	(NETIF_MSG_DRV			\
+	| NETIF_MSG_PROBE		\
+	| NETIF_MSG_LINK		\
+	| NETIF_MSG_TIMER		\
+	| NETIF_MSG_IFDOWN		\
+	| NETIF_MSG_IFUP		\
+	| NETIF_MSG_RX_ERR		\
+	| NETIF_MSG_TX_ERR)
+
+static int ag71xx_msg_level = -1;
+
+module_param_named(msg_level, ag71xx_msg_level, int, 0);
+MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)");
+
+#define ETH_SWITCH_HEADER_LEN	2
+
+static inline unsigned int ag71xx_max_frame_len(unsigned int mtu)
+{
+	return ETH_SWITCH_HEADER_LEN + ETH_HLEN + VLAN_HLEN + mtu + ETH_FCS_LEN;
+}
+
+static void ag71xx_dump_dma_regs(struct ag71xx *ag)
+{
+	DBG("%s: dma_tx_ctrl=%08x, dma_tx_desc=%08x, dma_tx_status=%08x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_TX_CTRL),
+		ag71xx_rr(ag, AG71XX_REG_TX_DESC),
+		ag71xx_rr(ag, AG71XX_REG_TX_STATUS));
+
+	DBG("%s: dma_rx_ctrl=%08x, dma_rx_desc=%08x, dma_rx_status=%08x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_RX_CTRL),
+		ag71xx_rr(ag, AG71XX_REG_RX_DESC),
+		ag71xx_rr(ag, AG71XX_REG_RX_STATUS));
+}
+
+static void ag71xx_dump_regs(struct ag71xx *ag)
+{
+	DBG("%s: mac_cfg1=%08x, mac_cfg2=%08x, ipg=%08x, hdx=%08x, mfl=%08x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_MAC_CFG1),
+		ag71xx_rr(ag, AG71XX_REG_MAC_CFG2),
+		ag71xx_rr(ag, AG71XX_REG_MAC_IPG),
+		ag71xx_rr(ag, AG71XX_REG_MAC_HDX),
+		ag71xx_rr(ag, AG71XX_REG_MAC_MFL));
+	DBG("%s: mac_ifctl=%08x, mac_addr1=%08x, mac_addr2=%08x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL),
+		ag71xx_rr(ag, AG71XX_REG_MAC_ADDR1),
+		ag71xx_rr(ag, AG71XX_REG_MAC_ADDR2));
+	DBG("%s: fifo_cfg0=%08x, fifo_cfg1=%08x, fifo_cfg2=%08x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
+	DBG("%s: fifo_cfg3=%08x, fifo_cfg4=%08x, fifo_cfg5=%08x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
+}
+
+static inline void ag71xx_dump_intr(struct ag71xx *ag, char *label, u32 intr)
+{
+	DBG("%s: %s intr=%08x %s%s%s%s%s%s\n",
+		ag->dev->name, label, intr,
+		(intr & AG71XX_INT_TX_PS) ? "TXPS " : "",
+		(intr & AG71XX_INT_TX_UR) ? "TXUR " : "",
+		(intr & AG71XX_INT_TX_BE) ? "TXBE " : "",
+		(intr & AG71XX_INT_RX_PR) ? "RXPR " : "",
+		(intr & AG71XX_INT_RX_OF) ? "RXOF " : "",
+		(intr & AG71XX_INT_RX_BE) ? "RXBE " : "");
+}
+
+static void ag71xx_ring_free(struct ag71xx_ring *ring)
+{
+	kfree(ring->buf);
+
+	if (ring->descs_cpu)
+		dma_free_coherent(NULL, ring->size * ring->desc_size,
+				  ring->descs_cpu, ring->descs_dma);
+}
+
+static int ag71xx_ring_alloc(struct ag71xx_ring *ring)
+{
+	int err;
+
+	ring->desc_size = sizeof(struct ag71xx_desc);
+	if (ring->desc_size % cache_line_size()) {
+		DBG("ag71xx: ring %p, desc size %u rounded to %u\n",
+			ring, ring->desc_size,
+			roundup(ring->desc_size, cache_line_size()));
+		ring->desc_size = roundup(ring->desc_size, cache_line_size());
+	}
+
+	ring->descs_cpu = dma_alloc_coherent(NULL, ring->size * ring->desc_size,
+					     &ring->descs_dma, GFP_ATOMIC);
+	if (!ring->descs_cpu) {
+		err = -ENOMEM;
+		goto err;
+	}
+
+
+	ring->buf = kzalloc(ring->size * sizeof(*ring->buf), GFP_KERNEL);
+	if (!ring->buf) {
+		err = -ENOMEM;
+		goto err;
+	}
+
+	return 0;
+
+err:
+	return err;
+}
+
+static void ag71xx_ring_tx_clean(struct ag71xx *ag)
+{
+	struct ag71xx_ring *ring = &ag->tx_ring;
+	struct net_device *dev = ag->dev;
+	u32 bytes_compl = 0, pkts_compl = 0;
+
+	while (ring->curr != ring->dirty) {
+		struct ag71xx_desc *desc;
+		u32 i = ring->dirty % ring->size;
+
+		desc = ag71xx_ring_desc(ring, i);
+		if (!ag71xx_desc_empty(desc)) {
+			desc->ctrl = 0;
+			dev->stats.tx_errors++;
+		}
+
+		if (ring->buf[i].skb) {
+			bytes_compl += ring->buf[i].len;
+			pkts_compl++;
+			dev_kfree_skb_any(ring->buf[i].skb);
+		}
+		ring->buf[i].skb = NULL;
+		ring->dirty++;
+	}
+
+	/* flush descriptors */
+	wmb();
+
+	netdev_completed_queue(dev, pkts_compl, bytes_compl);
+}
+
+static void ag71xx_ring_tx_init(struct ag71xx *ag)
+{
+	struct ag71xx_ring *ring = &ag->tx_ring;
+	int i;
+
+	for (i = 0; i < ring->size; i++) {
+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+
+		desc->next = (u32) (ring->descs_dma +
+			ring->desc_size * ((i + 1) % ring->size));
+
+		desc->ctrl = DESC_EMPTY;
+		ring->buf[i].skb = NULL;
+	}
+
+	/* flush descriptors */
+	wmb();
+
+	ring->curr = 0;
+	ring->dirty = 0;
+	netdev_reset_queue(ag->dev);
+}
+
+static void ag71xx_ring_rx_clean(struct ag71xx *ag)
+{
+	struct ag71xx_ring *ring = &ag->rx_ring;
+	int i;
+
+	if (!ring->buf)
+		return;
+
+	for (i = 0; i < ring->size; i++)
+		if (ring->buf[i].rx_buf) {
+			dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr,
+					 ag->rx_buf_size, DMA_FROM_DEVICE);
+			kfree(ring->buf[i].rx_buf);
+		}
+}
+
+static int ag71xx_buffer_offset(struct ag71xx *ag)
+{
+	int offset = NET_SKB_PAD;
+
+	/*
+	 * On AR71xx/AR91xx packets must be 4-byte aligned.
+	 *
+	 * When using builtin AR8216 support, hardware adds a 2-byte header,
+	 * so we don't need any extra alignment in that case.
+	 */
+	if (!ag71xx_get_pdata(ag)->is_ar724x || ag71xx_has_ar8216(ag))
+		return offset;
+
+	return offset + NET_IP_ALIGN;
+}
+
+static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf,
+			       int offset)
+{
+	struct ag71xx_ring *ring = &ag->rx_ring;
+	struct ag71xx_desc *desc = ag71xx_ring_desc(ring, buf - &ring->buf[0]);
+	void *data;
+
+	data = kmalloc(ag->rx_buf_size +
+		       SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
+		       GFP_ATOMIC);
+	if (!data)
+		return false;
+
+	buf->rx_buf = data;
+	buf->dma_addr = dma_map_single(&ag->dev->dev, data, ag->rx_buf_size,
+				       DMA_FROM_DEVICE);
+	desc->data = (u32) buf->dma_addr + offset;
+	return true;
+}
+
+static int ag71xx_ring_rx_init(struct ag71xx *ag)
+{
+	struct ag71xx_ring *ring = &ag->rx_ring;
+	unsigned int i;
+	int ret;
+	int offset = ag71xx_buffer_offset(ag);
+
+	ret = 0;
+	for (i = 0; i < ring->size; i++) {
+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+
+		desc->next = (u32) (ring->descs_dma +
+			ring->desc_size * ((i + 1) % ring->size));
+
+		DBG("ag71xx: RX desc at %p, next is %08x\n",
+			desc, desc->next);
+	}
+
+	for (i = 0; i < ring->size; i++) {
+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+
+		if (!ag71xx_fill_rx_buf(ag, &ring->buf[i], offset)) {
+			ret = -ENOMEM;
+			break;
+		}
+
+		desc->ctrl = DESC_EMPTY;
+	}
+
+	/* flush descriptors */
+	wmb();
+
+	ring->curr = 0;
+	ring->dirty = 0;
+
+	return ret;
+}
+
+static int ag71xx_ring_rx_refill(struct ag71xx *ag)
+{
+	struct ag71xx_ring *ring = &ag->rx_ring;
+	unsigned int count;
+	int offset = ag71xx_buffer_offset(ag);
+
+	count = 0;
+	for (; ring->curr - ring->dirty > 0; ring->dirty++) {
+		struct ag71xx_desc *desc;
+		unsigned int i;
+
+		i = ring->dirty % ring->size;
+		desc = ag71xx_ring_desc(ring, i);
+
+		if (!ring->buf[i].rx_buf &&
+		    !ag71xx_fill_rx_buf(ag, &ring->buf[i], offset))
+			break;
+
+		desc->ctrl = DESC_EMPTY;
+		count++;
+	}
+
+	/* flush descriptors */
+	wmb();
+
+	DBG("%s: %u rx descriptors refilled\n", ag->dev->name, count);
+
+	return count;
+}
+
+static int ag71xx_rings_init(struct ag71xx *ag)
+{
+	int ret;
+
+	ret = ag71xx_ring_alloc(&ag->tx_ring);
+	if (ret)
+		return ret;
+
+	ag71xx_ring_tx_init(ag);
+
+	ret = ag71xx_ring_alloc(&ag->rx_ring);
+	if (ret)
+		return ret;
+
+	ret = ag71xx_ring_rx_init(ag);
+	return ret;
+}
+
+static void ag71xx_rings_cleanup(struct ag71xx *ag)
+{
+	ag71xx_ring_rx_clean(ag);
+	ag71xx_ring_free(&ag->rx_ring);
+
+	ag71xx_ring_tx_clean(ag);
+	netdev_reset_queue(ag->dev);
+	ag71xx_ring_free(&ag->tx_ring);
+}
+
+static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
+{
+	switch (ag->speed) {
+	case SPEED_1000:
+		return "1000";
+	case SPEED_100:
+		return "100";
+	case SPEED_10:
+		return "10";
+	}
+
+	return "?";
+}
+
+static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
+{
+	u32 t;
+
+	t = (((u32) mac[5]) << 24) | (((u32) mac[4]) << 16)
+	  | (((u32) mac[3]) << 8) | ((u32) mac[2]);
+
+	ag71xx_wr(ag, AG71XX_REG_MAC_ADDR1, t);
+
+	t = (((u32) mac[1]) << 24) | (((u32) mac[0]) << 16);
+	ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t);
+}
+
+static void ag71xx_dma_reset(struct ag71xx *ag)
+{
+	u32 val;
+	int i;
+
+	ag71xx_dump_dma_regs(ag);
+
+	/* stop RX and TX */
+	ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
+	ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
+
+	/*
+	 * give the hardware some time to really stop all rx/tx activity
+	 * clearing the descriptors too early causes random memory corruption
+	 */
+	mdelay(1);
+
+	/* clear descriptor addresses */
+	ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->stop_desc_dma);
+	ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag->stop_desc_dma);
+
+	/* clear pending RX/TX interrupts */
+	for (i = 0; i < 256; i++) {
+		ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR);
+		ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);
+	}
+
+	/* clear pending errors */
+	ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_BE | RX_STATUS_OF);
+	ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_BE | TX_STATUS_UR);
+
+	val = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
+	if (val)
+		pr_alert("%s: unable to clear DMA Rx status: %08x\n",
+			 ag->dev->name, val);
+
+	val = ag71xx_rr(ag, AG71XX_REG_TX_STATUS);
+
+	/* mask out reserved bits */
+	val &= ~0xff000000;
+
+	if (val)
+		pr_alert("%s: unable to clear DMA Tx status: %08x\n",
+			 ag->dev->name, val);
+
+	ag71xx_dump_dma_regs(ag);
+}
+
+#define MAC_CFG1_INIT	(MAC_CFG1_RXE | MAC_CFG1_TXE | \
+			 MAC_CFG1_SRX | MAC_CFG1_STX)
+
+#define FIFO_CFG0_INIT	(FIFO_CFG0_ALL << FIFO_CFG0_ENABLE_SHIFT)
+
+#define FIFO_CFG4_INIT	(FIFO_CFG4_DE | FIFO_CFG4_DV | FIFO_CFG4_FC | \
+			 FIFO_CFG4_CE | FIFO_CFG4_CR | FIFO_CFG4_LM | \
+			 FIFO_CFG4_LO | FIFO_CFG4_OK | FIFO_CFG4_MC | \
+			 FIFO_CFG4_BC | FIFO_CFG4_DR | FIFO_CFG4_LE | \
+			 FIFO_CFG4_CF | FIFO_CFG4_PF | FIFO_CFG4_UO | \
+			 FIFO_CFG4_VT)
+
+#define FIFO_CFG5_INIT	(FIFO_CFG5_DE | FIFO_CFG5_DV | FIFO_CFG5_FC | \
+			 FIFO_CFG5_CE | FIFO_CFG5_LO | FIFO_CFG5_OK | \
+			 FIFO_CFG5_MC | FIFO_CFG5_BC | FIFO_CFG5_DR | \
+			 FIFO_CFG5_CF | FIFO_CFG5_PF | FIFO_CFG5_VT | \
+			 FIFO_CFG5_LE | FIFO_CFG5_FT | FIFO_CFG5_16 | \
+			 FIFO_CFG5_17 | FIFO_CFG5_SF)
+
+static void ag71xx_hw_stop(struct ag71xx *ag)
+{
+	/* disable all interrupts and stop the rx/tx engine */
+	ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
+	ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
+	ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
+}
+
+static void ag71xx_hw_setup(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
+	/* setup MAC configuration registers */
+	ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+
+	ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,
+		  MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
+
+	/* setup max frame length to zero */
+	ag71xx_wr(ag, AG71XX_REG_MAC_MFL, 0);
+
+	/* setup FIFO configuration registers */
+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
+	if (pdata->is_ar724x) {
+		ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, pdata->fifo_cfg1);
+		ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, pdata->fifo_cfg2);
+	} else {
+		ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, 0x0fff0000);
+		ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, 0x00001fff);
+	}
+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT);
+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT);
+}
+
+static void ag71xx_hw_init(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	u32 reset_mask = pdata->reset_bit;
+
+	ag71xx_hw_stop(ag);
+
+	if (pdata->is_ar724x) {
+		u32 reset_phy = reset_mask;
+
+		reset_phy &= AR71XX_RESET_GE0_PHY | AR71XX_RESET_GE1_PHY;
+		reset_mask &= ~(AR71XX_RESET_GE0_PHY | AR71XX_RESET_GE1_PHY);
+
+		ath79_device_reset_set(reset_phy);
+		msleep(50);
+		ath79_device_reset_clear(reset_phy);
+		msleep(200);
+	}
+
+	ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
+	udelay(20);
+
+	ath79_device_reset_set(reset_mask);
+	msleep(100);
+	ath79_device_reset_clear(reset_mask);
+	msleep(200);
+
+	ag71xx_hw_setup(ag);
+
+	ag71xx_dma_reset(ag);
+}
+
+static void ag71xx_fast_reset(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	struct net_device *dev = ag->dev;
+	u32 reset_mask = pdata->reset_bit;
+	u32 rx_ds, tx_ds;
+	u32 mii_reg;
+
+	reset_mask &= AR71XX_RESET_GE0_MAC | AR71XX_RESET_GE1_MAC;
+
+	mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG);
+	rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC);
+	tx_ds = ag71xx_rr(ag, AG71XX_REG_TX_DESC);
+
+	ath79_device_reset_set(reset_mask);
+	udelay(10);
+	ath79_device_reset_clear(reset_mask);
+	udelay(10);
+
+	ag71xx_dma_reset(ag);
+	ag71xx_hw_setup(ag);
+
+	/* setup max frame length */
+	ag71xx_wr(ag, AG71XX_REG_MAC_MFL,
+		  ag71xx_max_frame_len(ag->dev->mtu));
+
+	ag71xx_wr(ag, AG71XX_REG_RX_DESC, rx_ds);
+	ag71xx_wr(ag, AG71XX_REG_TX_DESC, tx_ds);
+	ag71xx_wr(ag, AG71XX_REG_MII_CFG, mii_reg);
+
+	ag71xx_hw_set_macaddr(ag, dev->dev_addr);
+}
+
+static void ag71xx_hw_start(struct ag71xx *ag)
+{
+	/* start RX engine */
+	ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);
+
+	/* enable interrupts */
+	ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, AG71XX_INT_INIT);
+}
+
+void ag71xx_link_adjust(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	u32 cfg2;
+	u32 ifctl;
+	u32 fifo5;
+	u32 fifo3;
+
+	if (!ag->link) {
+		ag71xx_hw_stop(ag);
+		netif_carrier_off(ag->dev);
+		if (netif_msg_link(ag))
+			pr_info("%s: link down\n", ag->dev->name);
+		return;
+	}
+
+	if (pdata->is_ar724x)
+		ag71xx_fast_reset(ag);
+
+	cfg2 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG2);
+	cfg2 &= ~(MAC_CFG2_IF_1000 | MAC_CFG2_IF_10_100 | MAC_CFG2_FDX);
+	cfg2 |= (ag->duplex) ? MAC_CFG2_FDX : 0;
+
+	ifctl = ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL);
+	ifctl &= ~(MAC_IFCTL_SPEED);
+
+	fifo5 = ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5);
+	fifo5 &= ~FIFO_CFG5_BM;
+
+	switch (ag->speed) {
+	case SPEED_1000:
+		cfg2 |= MAC_CFG2_IF_1000;
+		fifo5 |= FIFO_CFG5_BM;
+		break;
+	case SPEED_100:
+		cfg2 |= MAC_CFG2_IF_10_100;
+		ifctl |= MAC_IFCTL_SPEED;
+		break;
+	case SPEED_10:
+		cfg2 |= MAC_CFG2_IF_10_100;
+		break;
+	default:
+		BUG();
+		return;
+	}
+
+	if (pdata->is_ar91xx)
+		fifo3 = 0x00780fff;
+	else if (pdata->is_ar724x)
+		fifo3 = pdata->fifo_cfg3;
+	else
+		fifo3 = 0x008001ff;
+
+	if (ag->tx_ring.desc_split) {
+		fifo3 &= 0xffff;
+		fifo3 |= ((2048 - ag->tx_ring.desc_split) / 4) << 16;
+	}
+
+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, fifo3);
+
+	if (pdata->set_speed)
+		pdata->set_speed(ag->speed);
+
+	ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
+	ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
+	ag71xx_hw_start(ag);
+
+	netif_carrier_on(ag->dev);
+	if (netif_msg_link(ag))
+		pr_info("%s: link up (%sMbps/%s duplex)\n",
+			ag->dev->name,
+			ag71xx_speed_str(ag),
+			(DUPLEX_FULL == ag->duplex) ? "Full" : "Half");
+
+	DBG("%s: fifo_cfg0=%#x, fifo_cfg1=%#x, fifo_cfg2=%#x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
+
+	DBG("%s: fifo_cfg3=%#x, fifo_cfg4=%#x, fifo_cfg5=%#x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
+		ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
+
+	DBG("%s: mac_cfg2=%#x, mac_ifctl=%#x\n",
+		ag->dev->name,
+		ag71xx_rr(ag, AG71XX_REG_MAC_CFG2),
+		ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL));
+}
+
+static int ag71xx_open(struct net_device *dev)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	unsigned int max_frame_len;
+	int ret;
+
+	max_frame_len = ag71xx_max_frame_len(dev->mtu);
+	ag->rx_buf_size = max_frame_len + NET_SKB_PAD + NET_IP_ALIGN;
+
+	/* setup max frame length */
+	ag71xx_wr(ag, AG71XX_REG_MAC_MFL, max_frame_len);
+
+	ret = ag71xx_rings_init(ag);
+	if (ret)
+		goto err;
+
+	napi_enable(&ag->napi);
+
+	netif_carrier_off(dev);
+	ag71xx_phy_start(ag);
+
+	ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->tx_ring.descs_dma);
+	ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag->rx_ring.descs_dma);
+
+	ag71xx_hw_set_macaddr(ag, dev->dev_addr);
+
+	netif_start_queue(dev);
+
+	return 0;
+
+err:
+	ag71xx_rings_cleanup(ag);
+	return ret;
+}
+
+static int ag71xx_stop(struct net_device *dev)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	unsigned long flags;
+
+	netif_carrier_off(dev);
+	ag71xx_phy_stop(ag);
+
+	spin_lock_irqsave(&ag->lock, flags);
+
+	netif_stop_queue(dev);
+
+	ag71xx_hw_stop(ag);
+	ag71xx_dma_reset(ag);
+
+	napi_disable(&ag->napi);
+	del_timer_sync(&ag->oom_timer);
+
+	spin_unlock_irqrestore(&ag->lock, flags);
+
+	ag71xx_rings_cleanup(ag);
+
+	return 0;
+}
+
+static int ag71xx_fill_dma_desc(struct ag71xx_ring *ring, u32 addr, int len)
+{
+	int i;
+	struct ag71xx_desc *desc;
+	int ndesc = 0;
+	int split = ring->desc_split;
+
+	if (!split)
+		split = len;
+
+	while (len > 0) {
+		unsigned int cur_len = len;
+
+		i = (ring->curr + ndesc) % ring->size;
+		desc = ag71xx_ring_desc(ring, i);
+
+		if (!ag71xx_desc_empty(desc))
+			return -1;
+
+		if (cur_len > split) {
+			cur_len = split;
+
+			/*
+			 * TX will hang if DMA transfers <= 4 bytes,
+			 * make sure next segment is more than 4 bytes long.
+			 */
+			if (len <= split + 4)
+				cur_len -= 4;
+		}
+
+		desc->data = addr;
+		addr += cur_len;
+		len -= cur_len;
+
+		if (len > 0)
+			cur_len |= DESC_MORE;
+
+		/* prevent early tx attempt of this descriptor */
+		if (!ndesc)
+			cur_len |= DESC_EMPTY;
+
+		desc->ctrl = cur_len;
+		ndesc++;
+	}
+
+	return ndesc;
+}
+
+static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
+					  struct net_device *dev)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	struct ag71xx_ring *ring = &ag->tx_ring;
+	struct ag71xx_desc *desc;
+	dma_addr_t dma_addr;
+	int i, n, ring_min;
+
+	if (ag71xx_has_ar8216(ag))
+		ag71xx_add_ar8216_header(ag, skb);
+
+	if (skb->len <= 4) {
+		DBG("%s: packet len is too small\n", ag->dev->name);
+		goto err_drop;
+	}
+
+	dma_addr = dma_map_single(&dev->dev, skb->data, skb->len,
+				  DMA_TO_DEVICE);
+
+	i = ring->curr % ring->size;
+	desc = ag71xx_ring_desc(ring, i);
+
+	/* setup descriptor fields */
+	n = ag71xx_fill_dma_desc(ring, (u32) dma_addr, skb->len & ag->desc_pktlen_mask);
+	if (n < 0)
+		goto err_drop_unmap;
+
+	i = (ring->curr + n - 1) % ring->size;
+	ring->buf[i].len = skb->len;
+	ring->buf[i].skb = skb;
+	ring->buf[i].timestamp = jiffies;
+
+	netdev_sent_queue(dev, skb->len);
+
+	desc->ctrl &= ~DESC_EMPTY;
+	ring->curr += n;
+
+	/* flush descriptor */
+	wmb();
+
+	ring_min = 2;
+	if (ring->desc_split)
+	    ring_min *= AG71XX_TX_RING_DS_PER_PKT;
+
+	if (ring->curr - ring->dirty >= ring->size - ring_min) {
+		DBG("%s: tx queue full\n", dev->name);
+		netif_stop_queue(dev);
+	}
+
+	DBG("%s: packet injected into TX queue\n", ag->dev->name);
+
+	/* enable TX engine */
+	ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);
+
+	return NETDEV_TX_OK;
+
+err_drop_unmap:
+	dma_unmap_single(&dev->dev, dma_addr, skb->len, DMA_TO_DEVICE);
+
+err_drop:
+	dev->stats.tx_dropped++;
+
+	dev_kfree_skb(skb);
+	return NETDEV_TX_OK;
+}
+
+static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	int ret;
+
+	switch (cmd) {
+	case SIOCETHTOOL:
+		if (ag->phy_dev == NULL)
+			break;
+
+		spin_lock_irq(&ag->lock);
+		ret = phy_ethtool_ioctl(ag->phy_dev, (void *) ifr->ifr_data);
+		spin_unlock_irq(&ag->lock);
+		return ret;
+
+	case SIOCSIFHWADDR:
+		if (copy_from_user
+			(dev->dev_addr, ifr->ifr_data, sizeof(dev->dev_addr)))
+			return -EFAULT;
+		return 0;
+
+	case SIOCGIFHWADDR:
+		if (copy_to_user
+			(ifr->ifr_data, dev->dev_addr, sizeof(dev->dev_addr)))
+			return -EFAULT;
+		return 0;
+
+	case SIOCGMIIPHY:
+	case SIOCGMIIREG:
+	case SIOCSMIIREG:
+		if (ag->phy_dev == NULL)
+			break;
+
+		return phy_mii_ioctl(ag->phy_dev, ifr, cmd);
+
+	default:
+		break;
+	}
+
+	return -EOPNOTSUPP;
+}
+
+static void ag71xx_oom_timer_handler(unsigned long data)
+{
+	struct net_device *dev = (struct net_device *) data;
+	struct ag71xx *ag = netdev_priv(dev);
+
+	napi_schedule(&ag->napi);
+}
+
+static void ag71xx_tx_timeout(struct net_device *dev)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+
+	if (netif_msg_tx_err(ag))
+		pr_info("%s: tx timeout\n", ag->dev->name);
+
+	schedule_work(&ag->restart_work);
+}
+
+static void ag71xx_restart_work_func(struct work_struct *work)
+{
+	struct ag71xx *ag = container_of(work, struct ag71xx, restart_work);
+
+	if (ag71xx_get_pdata(ag)->is_ar724x) {
+		ag->link = 0;
+		ag71xx_link_adjust(ag);
+		return;
+	}
+
+	ag71xx_stop(ag->dev);
+	ag71xx_open(ag->dev);
+}
+
+static bool ag71xx_check_dma_stuck(struct ag71xx *ag, unsigned long timestamp)
+{
+	u32 rx_sm, tx_sm, rx_fd;
+
+	if (likely(time_before(jiffies, timestamp + HZ/10)))
+		return false;
+
+	if (!netif_carrier_ok(ag->dev))
+		return false;
+
+	rx_sm = ag71xx_rr(ag, AG71XX_REG_RX_SM);
+	if ((rx_sm & 0x7) == 0x3 && ((rx_sm >> 4) & 0x7) == 0x6)
+		return true;
+
+	tx_sm = ag71xx_rr(ag, AG71XX_REG_TX_SM);
+	rx_fd = ag71xx_rr(ag, AG71XX_REG_FIFO_DEPTH);
+	if (((tx_sm >> 4) & 0x7) == 0 && ((rx_sm & 0x7) == 0) &&
+	    ((rx_sm >> 4) & 0x7) == 0 && rx_fd == 0)
+		return true;
+
+	return false;
+}
+
+static int ag71xx_tx_packets(struct ag71xx *ag)
+{
+	struct ag71xx_ring *ring = &ag->tx_ring;
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	int sent = 0;
+	int bytes_compl = 0;
+	int n = 0;
+
+	DBG("%s: processing TX ring\n", ag->dev->name);
+
+	while (ring->dirty + n != ring->curr) {
+		unsigned int i = (ring->dirty + n) % ring->size;
+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+		struct sk_buff *skb = ring->buf[i].skb;
+
+		if (!ag71xx_desc_empty(desc)) {
+			if (pdata->is_ar7240 &&
+			    ag71xx_check_dma_stuck(ag, ring->buf[i].timestamp))
+				schedule_work(&ag->restart_work);
+			break;
+		}
+
+		n++;
+		if (!skb)
+			continue;
+
+		dev_kfree_skb_any(skb);
+		ring->buf[i].skb = NULL;
+
+		bytes_compl += ring->buf[i].len;
+
+		sent++;
+		ring->dirty += n;
+
+		while (n > 0) {
+			ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);
+			n--;
+		}
+	}
+
+	DBG("%s: %d packets sent out\n", ag->dev->name, sent);
+
+	ag->dev->stats.tx_bytes += bytes_compl;
+	ag->dev->stats.tx_packets += sent;
+
+	if (!sent)
+		return 0;
+
+	netdev_completed_queue(ag->dev, sent, bytes_compl);
+	if ((ring->curr - ring->dirty) < (ring->size * 3) / 4)
+		netif_wake_queue(ag->dev);
+
+	return sent;
+}
+
+static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
+{
+	struct net_device *dev = ag->dev;
+	struct ag71xx_ring *ring = &ag->rx_ring;
+	int offset = ag71xx_buffer_offset(ag);
+	unsigned int pktlen_mask = ag->desc_pktlen_mask;
+	int done = 0;
+
+	DBG("%s: rx packets, limit=%d, curr=%u, dirty=%u\n",
+			dev->name, limit, ring->curr, ring->dirty);
+
+	while (done < limit) {
+		unsigned int i = ring->curr % ring->size;
+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+		struct sk_buff *skb;
+		int pktlen;
+		int err = 0;
+
+		if (ag71xx_desc_empty(desc))
+			break;
+
+		if ((ring->dirty + ring->size) == ring->curr) {
+			ag71xx_assert(0);
+			break;
+		}
+
+		ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR);
+
+		pktlen = desc->ctrl & pktlen_mask;
+		pktlen -= ETH_FCS_LEN;
+
+		dma_unmap_single(&dev->dev, ring->buf[i].dma_addr,
+				 ag->rx_buf_size, DMA_FROM_DEVICE);
+
+		dev->stats.rx_packets++;
+		dev->stats.rx_bytes += pktlen;
+
+		skb = build_skb(ring->buf[i].rx_buf, 0);
+		if (!skb) {
+			kfree(ring->buf[i].rx_buf);
+			goto next;
+		}
+
+		skb_reserve(skb, offset);
+		skb_put(skb, pktlen);
+
+		if (ag71xx_has_ar8216(ag))
+			err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
+
+		if (err) {
+			dev->stats.rx_dropped++;
+			kfree_skb(skb);
+		} else {
+			skb->dev = dev;
+			skb->ip_summed = CHECKSUM_NONE;
+			skb->protocol = eth_type_trans(skb, dev);
+			netif_receive_skb(skb);
+		}
+
+next:
+		ring->buf[i].rx_buf = NULL;
+		done++;
+
+		ring->curr++;
+	}
+
+	ag71xx_ring_rx_refill(ag);
+
+	DBG("%s: rx finish, curr=%u, dirty=%u, done=%d\n",
+		dev->name, ring->curr, ring->dirty, done);
+
+	return done;
+}
+
+static int ag71xx_poll(struct napi_struct *napi, int limit)
+{
+	struct ag71xx *ag = container_of(napi, struct ag71xx, napi);
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	struct net_device *dev = ag->dev;
+	struct ag71xx_ring *rx_ring;
+	unsigned long flags;
+	u32 status;
+	int tx_done;
+	int rx_done;
+
+	pdata->ddr_flush();
+	tx_done = ag71xx_tx_packets(ag);
+
+	DBG("%s: processing RX ring\n", dev->name);
+	rx_done = ag71xx_rx_packets(ag, limit);
+
+	ag71xx_debugfs_update_napi_stats(ag, rx_done, tx_done);
+
+	rx_ring = &ag->rx_ring;
+	if (rx_ring->buf[rx_ring->dirty % rx_ring->size].rx_buf == NULL)
+		goto oom;
+
+	status = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
+	if (unlikely(status & RX_STATUS_OF)) {
+		ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_OF);
+		dev->stats.rx_fifo_errors++;
+
+		/* restart RX */
+		ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);
+	}
+
+	if (rx_done < limit) {
+		if (status & RX_STATUS_PR)
+			goto more;
+
+		status = ag71xx_rr(ag, AG71XX_REG_TX_STATUS);
+		if (status & TX_STATUS_PS)
+			goto more;
+
+		DBG("%s: disable polling mode, rx=%d, tx=%d,limit=%d\n",
+			dev->name, rx_done, tx_done, limit);
+
+		napi_complete(napi);
+
+		/* enable interrupts */
+		spin_lock_irqsave(&ag->lock, flags);
+		ag71xx_int_enable(ag, AG71XX_INT_POLL);
+		spin_unlock_irqrestore(&ag->lock, flags);
+		return rx_done;
+	}
+
+more:
+	DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
+			dev->name, rx_done, tx_done, limit);
+	return rx_done;
+
+oom:
+	if (netif_msg_rx_err(ag))
+		pr_info("%s: out of memory\n", dev->name);
+
+	mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
+	napi_complete(napi);
+	return 0;
+}
+
+static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
+{
+	struct net_device *dev = dev_id;
+	struct ag71xx *ag = netdev_priv(dev);
+	u32 status;
+
+	status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS);
+	ag71xx_dump_intr(ag, "raw", status);
+
+	if (unlikely(!status))
+		return IRQ_NONE;
+
+	if (unlikely(status & AG71XX_INT_ERR)) {
+		if (status & AG71XX_INT_TX_BE) {
+			ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_BE);
+			dev_err(&dev->dev, "TX BUS error\n");
+		}
+		if (status & AG71XX_INT_RX_BE) {
+			ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_BE);
+			dev_err(&dev->dev, "RX BUS error\n");
+		}
+	}
+
+	if (likely(status & AG71XX_INT_POLL)) {
+		ag71xx_int_disable(ag, AG71XX_INT_POLL);
+		DBG("%s: enable polling mode\n", dev->name);
+		napi_schedule(&ag->napi);
+	}
+
+	ag71xx_debugfs_update_int_stats(ag, status);
+
+	return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void ag71xx_netpoll(struct net_device *dev)
+{
+	disable_irq(dev->irq);
+	ag71xx_interrupt(dev->irq, dev);
+	enable_irq(dev->irq);
+}
+#endif
+
+static int ag71xx_change_mtu(struct net_device *dev, int new_mtu)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	unsigned int max_frame_len;
+
+	max_frame_len = ag71xx_max_frame_len(new_mtu);
+	if (new_mtu < 68 || max_frame_len > ag->max_frame_len)
+		return -EINVAL;
+
+	if (netif_running(dev))
+		return -EBUSY;
+
+	dev->mtu = new_mtu;
+	return 0;
+}
+
+static const struct net_device_ops ag71xx_netdev_ops = {
+	.ndo_open		= ag71xx_open,
+	.ndo_stop		= ag71xx_stop,
+	.ndo_start_xmit		= ag71xx_hard_start_xmit,
+	.ndo_do_ioctl		= ag71xx_do_ioctl,
+	.ndo_tx_timeout		= ag71xx_tx_timeout,
+	.ndo_change_mtu		= ag71xx_change_mtu,
+	.ndo_set_mac_address	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller	= ag71xx_netpoll,
+#endif
+};
+
+static const char *ag71xx_get_phy_if_mode_name(phy_interface_t mode)
+{
+	switch (mode) {
+	case PHY_INTERFACE_MODE_MII:
+		return "MII";
+	case PHY_INTERFACE_MODE_GMII:
+		return "GMII";
+	case PHY_INTERFACE_MODE_RMII:
+		return "RMII";
+	case PHY_INTERFACE_MODE_RGMII:
+		return "RGMII";
+	case PHY_INTERFACE_MODE_SGMII:
+		return "SGMII";
+	default:
+		break;
+	}
+
+	return "unknown";
+}
+
+
+static int ag71xx_probe(struct platform_device *pdev)
+{
+	struct net_device *dev;
+	struct resource *res;
+	struct ag71xx *ag;
+	struct ag71xx_platform_data *pdata;
+	int err;
+
+	pdata = pdev->dev.platform_data;
+	if (!pdata) {
+		dev_err(&pdev->dev, "no platform data specified\n");
+		err = -ENXIO;
+		goto err_out;
+	}
+
+	if (pdata->mii_bus_dev == NULL && pdata->phy_mask) {
+		dev_err(&pdev->dev, "no MII bus device specified\n");
+		err = -EINVAL;
+		goto err_out;
+	}
+
+	dev = alloc_etherdev(sizeof(*ag));
+	if (!dev) {
+		dev_err(&pdev->dev, "alloc_etherdev failed\n");
+		err = -ENOMEM;
+		goto err_out;
+	}
+
+	if (!pdata->max_frame_len || !pdata->desc_pktlen_mask)
+		return -EINVAL;
+
+	SET_NETDEV_DEV(dev, &pdev->dev);
+
+	ag = netdev_priv(dev);
+	ag->pdev = pdev;
+	ag->dev = dev;
+	ag->msg_enable = netif_msg_init(ag71xx_msg_level,
+					AG71XX_DEFAULT_MSG_ENABLE);
+	spin_lock_init(&ag->lock);
+
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac_base");
+	if (!res) {
+		dev_err(&pdev->dev, "no mac_base resource found\n");
+		err = -ENXIO;
+		goto err_out;
+	}
+
+	ag->mac_base = ioremap_nocache(res->start, res->end - res->start + 1);
+	if (!ag->mac_base) {
+		dev_err(&pdev->dev, "unable to ioremap mac_base\n");
+		err = -ENOMEM;
+		goto err_free_dev;
+	}
+
+	dev->irq = platform_get_irq(pdev, 0);
+	err = request_irq(dev->irq, ag71xx_interrupt,
+			  IRQF_DISABLED,
+			  dev->name, dev);
+	if (err) {
+		dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
+		goto err_unmap_base;
+	}
+
+	dev->base_addr = (unsigned long)ag->mac_base;
+	dev->netdev_ops = &ag71xx_netdev_ops;
+	dev->ethtool_ops = &ag71xx_ethtool_ops;
+
+	INIT_WORK(&ag->restart_work, ag71xx_restart_work_func);
+
+	init_timer(&ag->oom_timer);
+	ag->oom_timer.data = (unsigned long) dev;
+	ag->oom_timer.function = ag71xx_oom_timer_handler;
+
+	ag->tx_ring.size = AG71XX_TX_RING_SIZE_DEFAULT;
+	ag->rx_ring.size = AG71XX_RX_RING_SIZE_DEFAULT;
+
+	ag->max_frame_len = pdata->max_frame_len;
+	ag->desc_pktlen_mask = pdata->desc_pktlen_mask;
+
+	if (!pdata->is_ar724x && !pdata->is_ar91xx) {
+		ag->tx_ring.desc_split = AG71XX_TX_RING_SPLIT;
+		ag->tx_ring.size *= AG71XX_TX_RING_DS_PER_PKT;
+	}
+
+	ag->stop_desc = dma_alloc_coherent(NULL,
+		sizeof(struct ag71xx_desc), &ag->stop_desc_dma, GFP_KERNEL);
+
+	if (!ag->stop_desc)
+		goto err_free_irq;
+
+	ag->stop_desc->data = 0;
+	ag->stop_desc->ctrl = 0;
+	ag->stop_desc->next = (u32) ag->stop_desc_dma;
+
+	memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
+
+	netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
+
+	ag71xx_dump_regs(ag);
+
+	ag71xx_hw_init(ag);
+
+	ag71xx_dump_regs(ag);
+
+	err = ag71xx_phy_connect(ag);
+	if (err)
+		goto err_free_desc;
+
+	err = ag71xx_debugfs_init(ag);
+	if (err)
+		goto err_phy_disconnect;
+
+	platform_set_drvdata(pdev, dev);
+
+	err = register_netdev(dev);
+	if (err) {
+		dev_err(&pdev->dev, "unable to register net device\n");
+		goto err_debugfs_exit;
+	}
+
+	pr_info("%s: Atheros AG71xx at 0x%08lx, irq %d, mode:%s\n",
+		dev->name, dev->base_addr, dev->irq,
+		ag71xx_get_phy_if_mode_name(pdata->phy_if_mode));
+
+	return 0;
+
+err_debugfs_exit:
+	ag71xx_debugfs_exit(ag);
+err_phy_disconnect:
+	ag71xx_phy_disconnect(ag);
+err_free_desc:
+	dma_free_coherent(NULL, sizeof(struct ag71xx_desc), ag->stop_desc,
+			  ag->stop_desc_dma);
+err_free_irq:
+	free_irq(dev->irq, dev);
+err_unmap_base:
+	iounmap(ag->mac_base);
+err_free_dev:
+	kfree(dev);
+err_out:
+	platform_set_drvdata(pdev, NULL);
+	return err;
+}
+
+static int ag71xx_remove(struct platform_device *pdev)
+{
+	struct net_device *dev = platform_get_drvdata(pdev);
+
+	if (dev) {
+		struct ag71xx *ag = netdev_priv(dev);
+
+		ag71xx_debugfs_exit(ag);
+		ag71xx_phy_disconnect(ag);
+		unregister_netdev(dev);
+		free_irq(dev->irq, dev);
+		iounmap(ag->mac_base);
+		kfree(dev);
+		platform_set_drvdata(pdev, NULL);
+	}
+
+	return 0;
+}
+
+static struct platform_driver ag71xx_driver = {
+	.probe		= ag71xx_probe,
+	.remove		= ag71xx_remove,
+	.driver = {
+		.name	= AG71XX_DRV_NAME,
+	}
+};
+
+static int __init ag71xx_module_init(void)
+{
+	int ret;
+
+	ret = ag71xx_debugfs_root_init();
+	if (ret)
+		goto err_out;
+
+	ret = ag71xx_mdio_driver_init();
+	if (ret)
+		goto err_debugfs_exit;
+
+	ret = platform_driver_register(&ag71xx_driver);
+	if (ret)
+		goto err_mdio_exit;
+
+	return 0;
+
+err_mdio_exit:
+	ag71xx_mdio_driver_exit();
+err_debugfs_exit:
+	ag71xx_debugfs_root_exit();
+err_out:
+	return ret;
+}
+
+static void __exit ag71xx_module_exit(void)
+{
+	platform_driver_unregister(&ag71xx_driver);
+	ag71xx_mdio_driver_exit();
+	ag71xx_debugfs_root_exit();
+}
+
+module_init(ag71xx_module_init);
+module_exit(ag71xx_module_exit);
+
+MODULE_VERSION(AG71XX_DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" AG71XX_DRV_NAME);
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c
new file mode 100644
index 00000000..71ae8258
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c
@@ -0,0 +1,318 @@
+/*
+ *  Atheros AR71xx built-in ethernet mac driver
+ *
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Based on Atheros' AG7100 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include "ag71xx.h"
+
+#define AG71XX_MDIO_RETRY	1000
+#define AG71XX_MDIO_DELAY	5
+
+static inline void ag71xx_mdio_wr(struct ag71xx_mdio *am, unsigned reg,
+				  u32 value)
+{
+	void __iomem *r;
+
+	r = am->mdio_base + reg;
+	__raw_writel(value, r);
+
+	/* flush write */
+	(void) __raw_readl(r);
+}
+
+static inline u32 ag71xx_mdio_rr(struct ag71xx_mdio *am, unsigned reg)
+{
+	return __raw_readl(am->mdio_base + reg);
+}
+
+static void ag71xx_mdio_dump_regs(struct ag71xx_mdio *am)
+{
+	DBG("%s: mii_cfg=%08x, mii_cmd=%08x, mii_addr=%08x\n",
+		am->mii_bus->name,
+		ag71xx_mdio_rr(am, AG71XX_REG_MII_CFG),
+		ag71xx_mdio_rr(am, AG71XX_REG_MII_CMD),
+		ag71xx_mdio_rr(am, AG71XX_REG_MII_ADDR));
+	DBG("%s: mii_ctrl=%08x, mii_status=%08x, mii_ind=%08x\n",
+		am->mii_bus->name,
+		ag71xx_mdio_rr(am, AG71XX_REG_MII_CTRL),
+		ag71xx_mdio_rr(am, AG71XX_REG_MII_STATUS),
+		ag71xx_mdio_rr(am, AG71XX_REG_MII_IND));
+}
+
+static int ag71xx_mdio_wait_busy(struct ag71xx_mdio *am)
+{
+	int i;
+
+	for (i = 0; i < AG71XX_MDIO_RETRY; i++) {
+		u32 busy;
+
+		udelay(AG71XX_MDIO_DELAY);
+
+		busy = ag71xx_mdio_rr(am, AG71XX_REG_MII_IND);
+		if (!busy)
+			return 0;
+
+		udelay(AG71XX_MDIO_DELAY);
+	}
+
+	pr_err("%s: MDIO operation timed out\n", am->mii_bus->name);
+
+	return -ETIMEDOUT;
+}
+
+int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg)
+{
+	int err;
+	int ret;
+
+	err = ag71xx_mdio_wait_busy(am);
+	if (err)
+		return 0xffff;
+
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CMD, MII_CMD_WRITE);
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_ADDR,
+			((addr & 0xff) << MII_ADDR_SHIFT) | (reg & 0xff));
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CMD, MII_CMD_READ);
+
+	err = ag71xx_mdio_wait_busy(am);
+	if (err)
+		return 0xffff;
+
+	ret = ag71xx_mdio_rr(am, AG71XX_REG_MII_STATUS) & 0xffff;
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CMD, MII_CMD_WRITE);
+
+	DBG("mii_read: addr=%04x, reg=%04x, value=%04x\n", addr, reg, ret);
+
+	return ret;
+}
+
+void ag71xx_mdio_mii_write(struct ag71xx_mdio *am, int addr, int reg, u16 val)
+{
+	DBG("mii_write: addr=%04x, reg=%04x, value=%04x\n", addr, reg, val);
+
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_ADDR,
+			((addr & 0xff) << MII_ADDR_SHIFT) | (reg & 0xff));
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CTRL, val);
+
+	ag71xx_mdio_wait_busy(am);
+}
+
+static const u32 ar71xx_mdio_div_table[] = {
+	4, 4, 6, 8, 10, 14, 20, 28,
+};
+
+static const u32 ar7240_mdio_div_table[] = {
+	2, 2, 4, 6, 8, 12, 18, 26, 32, 40, 48, 56, 62, 70, 78, 96,
+};
+
+static const u32 ar933x_mdio_div_table[] = {
+	4, 4, 6, 8, 10, 14, 20, 28, 34, 42, 50, 58, 66, 74, 82, 98,
+};
+
+static int ag71xx_mdio_get_divider(struct ag71xx_mdio *am, u32 *div)
+{
+	unsigned long ref_clock, mdio_clock;
+	const u32 *table;
+	int ndivs;
+	int i;
+
+	ref_clock = am->pdata->ref_clock;
+	mdio_clock = am->pdata->mdio_clock;
+
+	if (!ref_clock || !mdio_clock)
+		return -EINVAL;
+
+	if (am->pdata->is_ar9330 || am->pdata->is_ar934x) {
+		table = ar933x_mdio_div_table;
+		ndivs = ARRAY_SIZE(ar933x_mdio_div_table);
+	} else if (am->pdata->is_ar7240) {
+		table = ar7240_mdio_div_table;
+		ndivs = ARRAY_SIZE(ar7240_mdio_div_table);
+	} else {
+		table = ar71xx_mdio_div_table;
+		ndivs = ARRAY_SIZE(ar71xx_mdio_div_table);
+	}
+
+	for (i = 0; i < ndivs; i++) {
+		unsigned long t;
+
+		t = ref_clock / table[i];
+		if (t <= mdio_clock) {
+			*div = i;
+			return 0;
+		}
+	}
+
+	dev_err(&am->mii_bus->dev, "no divider found for %lu/%lu\n",
+		ref_clock, mdio_clock);
+	return -ENOENT;
+}
+
+static int ag71xx_mdio_reset(struct mii_bus *bus)
+{
+	struct ag71xx_mdio *am = bus->priv;
+	u32 t;
+	int err;
+
+	err = ag71xx_mdio_get_divider(am, &t);
+	if (err) {
+		/* fallback */
+		if (am->pdata->is_ar7240)
+			t = MII_CFG_CLK_DIV_6;
+		else if (am->pdata->builtin_switch && !am->pdata->is_ar934x)
+			t = MII_CFG_CLK_DIV_10;
+		else if (!am->pdata->builtin_switch && am->pdata->is_ar934x)
+			t = MII_CFG_CLK_DIV_58;
+		else
+			t = MII_CFG_CLK_DIV_28;
+	}
+
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CFG, t | MII_CFG_RESET);
+	udelay(100);
+
+	ag71xx_mdio_wr(am, AG71XX_REG_MII_CFG, t);
+	udelay(100);
+
+	if (am->pdata->reset)
+		am->pdata->reset(bus);
+
+	return 0;
+}
+
+static int ag71xx_mdio_read(struct mii_bus *bus, int addr, int reg)
+{
+	struct ag71xx_mdio *am = bus->priv;
+
+	if (am->pdata->builtin_switch)
+		return ar7240sw_phy_read(bus, addr, reg);
+	else
+		return ag71xx_mdio_mii_read(am, addr, reg);
+}
+
+static int ag71xx_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+	struct ag71xx_mdio *am = bus->priv;
+
+	if (am->pdata->builtin_switch)
+		ar7240sw_phy_write(bus, addr, reg, val);
+	else
+		ag71xx_mdio_mii_write(am, addr, reg, val);
+	return 0;
+}
+
+static int ag71xx_mdio_probe(struct platform_device *pdev)
+{
+	struct ag71xx_mdio_platform_data *pdata;
+	struct ag71xx_mdio *am;
+	struct resource *res;
+	int i;
+	int err;
+
+	pdata = pdev->dev.platform_data;
+	if (!pdata) {
+		dev_err(&pdev->dev, "no platform data specified\n");
+		return -EINVAL;
+	}
+
+	am = kzalloc(sizeof(*am), GFP_KERNEL);
+	if (!am) {
+		err = -ENOMEM;
+		goto err_out;
+	}
+
+	am->pdata = pdata;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "no iomem resource found\n");
+		err = -ENXIO;
+		goto err_out;
+	}
+
+	am->mdio_base = ioremap_nocache(res->start, res->end - res->start + 1);
+	if (!am->mdio_base) {
+		dev_err(&pdev->dev, "unable to ioremap registers\n");
+		err = -ENOMEM;
+		goto err_free_mdio;
+	}
+
+	am->mii_bus = mdiobus_alloc();
+	if (am->mii_bus == NULL) {
+		err = -ENOMEM;
+		goto err_iounmap;
+	}
+
+	am->mii_bus->name = "ag71xx_mdio";
+	am->mii_bus->read = ag71xx_mdio_read;
+	am->mii_bus->write = ag71xx_mdio_write;
+	am->mii_bus->reset = ag71xx_mdio_reset;
+	am->mii_bus->irq = am->mii_irq;
+	am->mii_bus->priv = am;
+	am->mii_bus->parent = &pdev->dev;
+	snprintf(am->mii_bus->id, MII_BUS_ID_SIZE, "%s", dev_name(&pdev->dev));
+	am->mii_bus->phy_mask = pdata->phy_mask;
+
+	for (i = 0; i < PHY_MAX_ADDR; i++)
+		am->mii_irq[i] = PHY_POLL;
+
+	ag71xx_mdio_wr(am, AG71XX_REG_MAC_CFG1, 0);
+
+	err = mdiobus_register(am->mii_bus);
+	if (err)
+		goto err_free_bus;
+
+	ag71xx_mdio_dump_regs(am);
+
+	platform_set_drvdata(pdev, am);
+	return 0;
+
+err_free_bus:
+	mdiobus_free(am->mii_bus);
+err_iounmap:
+	iounmap(am->mdio_base);
+err_free_mdio:
+	kfree(am);
+err_out:
+	return err;
+}
+
+static int ag71xx_mdio_remove(struct platform_device *pdev)
+{
+	struct ag71xx_mdio *am = platform_get_drvdata(pdev);
+
+	if (am) {
+		mdiobus_unregister(am->mii_bus);
+		mdiobus_free(am->mii_bus);
+		iounmap(am->mdio_base);
+		kfree(am);
+		platform_set_drvdata(pdev, NULL);
+	}
+
+	return 0;
+}
+
+static struct platform_driver ag71xx_mdio_driver = {
+	.probe		= ag71xx_mdio_probe,
+	.remove		= ag71xx_mdio_remove,
+	.driver = {
+		.name	= "ag71xx-mdio",
+	}
+};
+
+int __init ag71xx_mdio_driver_init(void)
+{
+	return platform_driver_register(&ag71xx_mdio_driver);
+}
+
+void ag71xx_mdio_driver_exit(void)
+{
+	platform_driver_unregister(&ag71xx_mdio_driver);
+}
diff --git a/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
new file mode 100644
index 00000000..9de77e92
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
@@ -0,0 +1,235 @@
+/*
+ *  Atheros AR71xx built-in ethernet mac driver
+ *
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Based on Atheros' AG7100 driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include "ag71xx.h"
+
+static void ag71xx_phy_link_adjust(struct net_device *dev)
+{
+	struct ag71xx *ag = netdev_priv(dev);
+	struct phy_device *phydev = ag->phy_dev;
+	unsigned long flags;
+	int status_change = 0;
+
+	spin_lock_irqsave(&ag->lock, flags);
+
+	if (phydev->link) {
+		if (ag->duplex != phydev->duplex
+		    || ag->speed != phydev->speed) {
+			status_change = 1;
+		}
+	}
+
+	if (phydev->link != ag->link)
+		status_change = 1;
+
+	ag->link = phydev->link;
+	ag->duplex = phydev->duplex;
+	ag->speed = phydev->speed;
+
+	if (status_change)
+		ag71xx_link_adjust(ag);
+
+	spin_unlock_irqrestore(&ag->lock, flags);
+}
+
+void ag71xx_phy_start(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
+	if (ag->phy_dev) {
+		phy_start(ag->phy_dev);
+	} else if (pdata->mii_bus_dev && pdata->switch_data) {
+		ag71xx_ar7240_start(ag);
+	} else {
+		ag->link = 1;
+		ag71xx_link_adjust(ag);
+	}
+}
+
+void ag71xx_phy_stop(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	unsigned long flags;
+
+	if (ag->phy_dev)
+		phy_stop(ag->phy_dev);
+	else if (pdata->mii_bus_dev && pdata->switch_data)
+		ag71xx_ar7240_stop(ag);
+
+	spin_lock_irqsave(&ag->lock, flags);
+	if (ag->link) {
+		ag->link = 0;
+		ag71xx_link_adjust(ag);
+	}
+	spin_unlock_irqrestore(&ag->lock, flags);
+}
+
+static int ag71xx_phy_connect_fixed(struct ag71xx *ag)
+{
+	struct device *dev = &ag->pdev->dev;
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	int ret = 0;
+
+	/* use fixed settings */
+	switch (pdata->speed) {
+	case SPEED_10:
+	case SPEED_100:
+	case SPEED_1000:
+		break;
+	default:
+		dev_err(dev, "invalid speed specified\n");
+		ret = -EINVAL;
+		break;
+	}
+
+	dev_dbg(dev, "using fixed link parameters\n");
+
+	ag->duplex = pdata->duplex;
+	ag->speed = pdata->speed;
+
+	return ret;
+}
+
+static int ag71xx_phy_connect_multi(struct ag71xx *ag)
+{
+	struct device *dev = &ag->pdev->dev;
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	struct phy_device *phydev = NULL;
+	int phy_addr;
+	int ret = 0;
+
+	for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
+		if (!(pdata->phy_mask & (1 << phy_addr)))
+			continue;
+
+		if (ag->mii_bus->phy_map[phy_addr] == NULL)
+			continue;
+
+		DBG("%s: PHY found at %s, uid=%08x\n",
+			dev_name(dev),
+			dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
+			ag->mii_bus->phy_map[phy_addr]->phy_id);
+
+		if (phydev == NULL)
+			phydev = ag->mii_bus->phy_map[phy_addr];
+	}
+
+	if (!phydev) {
+		dev_err(dev, "no PHY found with phy_mask=%08x\n",
+			   pdata->phy_mask);
+		return -ENODEV;
+	}
+
+	ag->phy_dev = phy_connect(ag->dev, dev_name(&phydev->dev),
+				  &ag71xx_phy_link_adjust,
+				  pdata->phy_if_mode);
+
+	if (IS_ERR(ag->phy_dev)) {
+		dev_err(dev, "could not connect to PHY at %s\n",
+			   dev_name(&phydev->dev));
+		return PTR_ERR(ag->phy_dev);
+	}
+
+	/* mask with MAC supported features */
+	if (pdata->has_gbit)
+		phydev->supported &= PHY_GBIT_FEATURES;
+	else
+		phydev->supported &= PHY_BASIC_FEATURES;
+
+	phydev->advertising = phydev->supported;
+
+	dev_info(dev, "connected to PHY at %s [uid=%08x, driver=%s]\n",
+		    dev_name(&phydev->dev), phydev->phy_id, phydev->drv->name);
+
+	ag->link = 0;
+	ag->speed = 0;
+	ag->duplex = -1;
+
+	return ret;
+}
+
+static int dev_is_class(struct device *dev, void *class)
+{
+	if (dev->class != NULL && !strcmp(dev->class->name, class))
+		return 1;
+
+	return 0;
+}
+
+static struct device *dev_find_class(struct device *parent, char *class)
+{
+	if (dev_is_class(parent, class)) {
+		get_device(parent);
+		return parent;
+	}
+
+	return device_find_child(parent, class, dev_is_class);
+}
+
+static struct mii_bus *dev_to_mii_bus(struct device *dev)
+{
+	struct device *d;
+
+	d = dev_find_class(dev, "mdio_bus");
+	if (d != NULL) {
+		struct mii_bus *bus;
+
+		bus = to_mii_bus(d);
+		put_device(d);
+
+		return bus;
+	}
+
+	return NULL;
+}
+
+int ag71xx_phy_connect(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
+	if (pdata->mii_bus_dev == NULL ||
+	    pdata->mii_bus_dev->bus == NULL )
+		return ag71xx_phy_connect_fixed(ag);
+
+	ag->mii_bus = dev_to_mii_bus(pdata->mii_bus_dev);
+	if (ag->mii_bus == NULL) {
+		dev_err(&ag->pdev->dev, "unable to find MII bus on device '%s'\n",
+			   dev_name(pdata->mii_bus_dev));
+		return -ENODEV;
+	}
+
+	/* Reset the mdio bus explicitly */
+	if (ag->mii_bus->reset) {
+		mutex_lock(&ag->mii_bus->mdio_lock);
+		ag->mii_bus->reset(ag->mii_bus);
+		mutex_unlock(&ag->mii_bus->mdio_lock);
+	}
+
+	if (pdata->switch_data)
+		return ag71xx_ar7240_init(ag);
+
+	if (pdata->phy_mask)
+		return ag71xx_phy_connect_multi(ag);
+
+	return ag71xx_phy_connect_fixed(ag);
+}
+
+void ag71xx_phy_disconnect(struct ag71xx *ag)
+{
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
+	if (pdata->switch_data)
+		ag71xx_ar7240_cleanup(ag);
+	else if (ag->phy_dev)
+		phy_disconnect(ag->phy_dev);
+}
diff --git a/trunk/target/linux/ar71xx/files/drivers/spi/spi-ap83.c b/trunk/target/linux/ar71xx/files/drivers/spi/spi-ap83.c
new file mode 100644
index 00000000..33843a6d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/spi/spi-ap83.c
@@ -0,0 +1,283 @@
+/*
+ * Atheros AP83 board specific SPI Controller driver
+ *
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/bitops.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ath79.h>
+
+#define DRV_DESC	"Atheros AP83 board SPI Controller driver"
+#define DRV_VERSION	"0.1.0"
+#define DRV_NAME	"ap83-spi"
+
+#define AP83_SPI_CLK_HIGH	(1 << 23)
+#define AP83_SPI_CLK_LOW	0
+#define AP83_SPI_MOSI_HIGH	(1 << 22)
+#define AP83_SPI_MOSI_LOW	0
+
+#define AP83_SPI_GPIO_CS	1
+#define AP83_SPI_GPIO_MISO	3
+
+struct ap83_spi {
+	struct	spi_bitbang	bitbang;
+	void __iomem		*base;
+	u32			addr;
+
+	struct platform_device	*pdev;
+};
+
+static inline u32 ap83_spi_rr(struct ap83_spi *sp, u32 reg)
+{
+	return __raw_readl(sp->base + reg);
+}
+
+static inline struct ap83_spi *spidev_to_sp(struct spi_device *spi)
+{
+	return spi_master_get_devdata(spi->master);
+}
+
+static inline void setsck(struct spi_device *spi, int val)
+{
+	struct ap83_spi *sp = spidev_to_sp(spi);
+
+	if (val)
+		sp->addr |= AP83_SPI_CLK_HIGH;
+	else
+		sp->addr &= ~AP83_SPI_CLK_HIGH;
+
+	dev_dbg(&spi->dev, "addr=%08x,  SCK set to %s\n",
+		sp->addr, (val) ? "HIGH" : "LOW");
+
+	ap83_spi_rr(sp, sp->addr);
+}
+
+static inline void setmosi(struct spi_device *spi, int val)
+{
+	struct ap83_spi *sp = spidev_to_sp(spi);
+
+	if (val)
+		sp->addr |= AP83_SPI_MOSI_HIGH;
+	else
+		sp->addr &= ~AP83_SPI_MOSI_HIGH;
+
+	dev_dbg(&spi->dev, "addr=%08x, MOSI set to %s\n",
+		sp->addr, (val) ? "HIGH" : "LOW");
+
+	ap83_spi_rr(sp, sp->addr);
+}
+
+static inline u32 getmiso(struct spi_device *spi)
+{
+	u32 ret;
+
+	ret = gpio_get_value(AP83_SPI_GPIO_MISO) ? 1 : 0;
+	dev_dbg(&spi->dev, "get MISO: %d\n", ret);
+
+	return ret;
+}
+
+static inline void do_spidelay(struct spi_device *spi, unsigned nsecs)
+{
+	ndelay(nsecs);
+}
+
+static void ap83_spi_chipselect(struct spi_device *spi, int on)
+{
+	struct ap83_spi *sp = spidev_to_sp(spi);
+
+	dev_dbg(&spi->dev, "set CS to %d\n", (on) ? 0 : 1);
+
+	if (on) {
+		ath79_flash_acquire();
+
+		sp->addr = 0;
+		ap83_spi_rr(sp, sp->addr);
+
+		gpio_set_value(AP83_SPI_GPIO_CS, 0);
+	} else {
+		gpio_set_value(AP83_SPI_GPIO_CS, 1);
+		ath79_flash_release();
+	}
+}
+
+#define spidelay(nsecs)							\
+	do {								\
+		/* Steal the spi_device pointer from our caller.	\
+		 * The bitbang-API should probably get fixed here... */	\
+		do_spidelay(spi, nsecs);				\
+	} while (0)
+
+#define EXPAND_BITBANG_TXRX
+#include <linux/spi/spi_bitbang.h>
+#include "spi-bitbang-txrx.h"
+
+static u32 ap83_spi_txrx_mode0(struct spi_device *spi,
+			       unsigned nsecs, u32 word, u8 bits)
+{
+	dev_dbg(&spi->dev, "TXRX0 word=%08x, bits=%u\n", word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
+}
+
+static u32 ap83_spi_txrx_mode1(struct spi_device *spi,
+			       unsigned nsecs, u32 word, u8 bits)
+{
+	dev_dbg(&spi->dev, "TXRX1 word=%08x, bits=%u\n", word, bits);
+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
+}
+
+static u32 ap83_spi_txrx_mode2(struct spi_device *spi,
+			       unsigned nsecs, u32 word, u8 bits)
+{
+	dev_dbg(&spi->dev, "TXRX2 word=%08x, bits=%u\n", word, bits);
+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
+}
+
+static u32 ap83_spi_txrx_mode3(struct spi_device *spi,
+			       unsigned nsecs, u32 word, u8 bits)
+{
+	dev_dbg(&spi->dev, "TXRX3 word=%08x, bits=%u\n", word, bits);
+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
+}
+
+static int ap83_spi_probe(struct platform_device *pdev)
+{
+	struct spi_master *master;
+	struct ap83_spi *sp;
+	struct ap83_spi_platform_data *pdata;
+	struct resource	*r;
+	int ret;
+
+	ret = gpio_request(AP83_SPI_GPIO_MISO, "spi-miso");
+	if (ret) {
+		dev_err(&pdev->dev, "gpio request failed for MISO\n");
+		return ret;
+	}
+
+	ret = gpio_request(AP83_SPI_GPIO_CS, "spi-cs");
+	if (ret) {
+		dev_err(&pdev->dev, "gpio request failed for CS\n");
+		goto err_free_miso;
+	}
+
+	ret = gpio_direction_input(AP83_SPI_GPIO_MISO);
+	if (ret) {
+		dev_err(&pdev->dev, "unable to set direction of MISO\n");
+		goto err_free_cs;
+	}
+
+	ret = gpio_direction_output(AP83_SPI_GPIO_CS, 0);
+	if (ret) {
+		dev_err(&pdev->dev, "unable to set direction of CS\n");
+		goto err_free_cs;
+	}
+
+	master = spi_alloc_master(&pdev->dev, sizeof(*sp));
+	if (master == NULL) {
+		dev_err(&pdev->dev, "failed to allocate spi master\n");
+		return -ENOMEM;
+	}
+
+	sp = spi_master_get_devdata(master);
+	platform_set_drvdata(pdev, sp);
+
+	pdata = pdev->dev.platform_data;
+
+	sp->bitbang.master = spi_master_get(master);
+	sp->bitbang.chipselect = ap83_spi_chipselect;
+	sp->bitbang.txrx_word[SPI_MODE_0] = ap83_spi_txrx_mode0;
+	sp->bitbang.txrx_word[SPI_MODE_1] = ap83_spi_txrx_mode1;
+	sp->bitbang.txrx_word[SPI_MODE_2] = ap83_spi_txrx_mode2;
+	sp->bitbang.txrx_word[SPI_MODE_3] = ap83_spi_txrx_mode3;
+
+	sp->bitbang.master->bus_num = pdev->id;
+	sp->bitbang.master->num_chipselect = 1;
+
+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (r == NULL) {
+		ret = -ENOENT;
+		goto err_spi_put;
+	}
+
+	sp->base = ioremap_nocache(r->start, r->end - r->start + 1);
+	if (!sp->base) {
+		ret = -ENXIO;
+		goto err_spi_put;
+	}
+
+	ret = spi_bitbang_start(&sp->bitbang);
+	if (!ret)
+		goto err_unmap;
+
+	dev_info(&pdev->dev, "AP83 SPI adapter at %08x\n", r->start);
+
+	return 0;
+
+err_unmap:
+	iounmap(sp->base);
+err_spi_put:
+	platform_set_drvdata(pdev, NULL);
+	spi_master_put(sp->bitbang.master);
+
+err_free_cs:
+	gpio_free(AP83_SPI_GPIO_CS);
+err_free_miso:
+	gpio_free(AP83_SPI_GPIO_MISO);
+	return ret;
+}
+
+static int ap83_spi_remove(struct platform_device *pdev)
+{
+	struct ap83_spi *sp = platform_get_drvdata(pdev);
+
+	spi_bitbang_stop(&sp->bitbang);
+	iounmap(sp->base);
+	platform_set_drvdata(pdev, NULL);
+	spi_master_put(sp->bitbang.master);
+
+	return 0;
+}
+
+static struct platform_driver ap83_spi_drv = {
+	.probe		= ap83_spi_probe,
+	.remove		= ap83_spi_remove,
+	.driver		= {
+		.name	= DRV_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init ap83_spi_init(void)
+{
+	return platform_driver_register(&ap83_spi_drv);
+}
+module_init(ap83_spi_init);
+
+static void __exit ap83_spi_exit(void)
+{
+	platform_driver_unregister(&ap83_spi_drv);
+}
+module_exit(ap83_spi_exit);
+
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c b/trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
new file mode 100644
index 00000000..a8d52825
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
@@ -0,0 +1,441 @@
+/*
+ * SPI driver for the CPLD chip on the Mikrotik RB4xx boards
+ *
+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This file was based on the patches for Linux 2.6.27.39 published by
+ * MikroTik for their RouterBoard 4xx series devices.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/bitops.h>
+#include <linux/spi/spi.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+
+#include <asm/mach-ath79/rb4xx_cpld.h>
+
+#define DRV_NAME	"spi-rb4xx-cpld"
+#define DRV_DESC	"RB4xx CPLD driver"
+#define DRV_VERSION	"0.1.0"
+
+#define CPLD_CMD_WRITE_NAND	0x08 /* send cmd, n x send data, send indle */
+#define CPLD_CMD_WRITE_CFG	0x09 /* send cmd, n x send cfg */
+#define CPLD_CMD_READ_NAND	0x0a /* send cmd, send idle, n x read data */
+#define CPLD_CMD_READ_FAST	0x0b /* send cmd, 4 x idle, n x read data */
+#define CPLD_CMD_LED5_ON	0x0c /* send cmd */
+#define CPLD_CMD_LED5_OFF	0x0d /* send cmd */
+
+struct rb4xx_cpld {
+	struct spi_device	*spi;
+	struct mutex		lock;
+	struct gpio_chip	chip;
+	unsigned int		config;
+};
+
+static struct rb4xx_cpld *rb4xx_cpld;
+
+static inline struct rb4xx_cpld *gpio_to_cpld(struct gpio_chip *chip)
+{
+	return container_of(chip, struct rb4xx_cpld, chip);
+}
+
+static int rb4xx_cpld_write_cmd(struct rb4xx_cpld *cpld, unsigned char cmd)
+{
+	struct spi_transfer t[1];
+	struct spi_message m;
+	unsigned char tx_buf[1];
+	int err;
+
+	spi_message_init(&m);
+	memset(&t, 0, sizeof(t));
+
+	t[0].tx_buf = tx_buf;
+	t[0].len = sizeof(tx_buf);
+	spi_message_add_tail(&t[0], &m);
+
+	tx_buf[0] = cmd;
+
+	err = spi_sync(cpld->spi, &m);
+	return err;
+}
+
+static int rb4xx_cpld_write_cfg(struct rb4xx_cpld *cpld, unsigned char config)
+{
+	struct spi_transfer t[1];
+	struct spi_message m;
+	unsigned char cmd[2];
+	int err;
+
+	spi_message_init(&m);
+	memset(&t, 0, sizeof(t));
+
+	t[0].tx_buf = cmd;
+	t[0].len = sizeof(cmd);
+	spi_message_add_tail(&t[0], &m);
+
+	cmd[0] = CPLD_CMD_WRITE_CFG;
+	cmd[1] = config;
+
+	err = spi_sync(cpld->spi, &m);
+	return err;
+}
+
+static int __rb4xx_cpld_change_cfg(struct rb4xx_cpld *cpld, unsigned mask,
+				   unsigned value)
+{
+	unsigned int config;
+	int err;
+
+	config = cpld->config & ~mask;
+	config |= value;
+
+	if ((cpld->config ^ config) & 0xff) {
+		err = rb4xx_cpld_write_cfg(cpld, config);
+		if (err)
+			return err;
+	}
+
+	if ((cpld->config ^ config) & CPLD_CFG_nLED5) {
+		err = rb4xx_cpld_write_cmd(cpld, (value) ? CPLD_CMD_LED5_ON :
+							   CPLD_CMD_LED5_OFF);
+		if (err)
+			return err;
+	}
+
+	cpld->config = config;
+	return 0;
+}
+
+int rb4xx_cpld_change_cfg(unsigned mask, unsigned value)
+{
+	int ret;
+
+	if (rb4xx_cpld == NULL)
+		return -ENODEV;
+
+	mutex_lock(&rb4xx_cpld->lock);
+	ret = __rb4xx_cpld_change_cfg(rb4xx_cpld, mask, value);
+	mutex_unlock(&rb4xx_cpld->lock);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(rb4xx_cpld_change_cfg);
+
+int rb4xx_cpld_read_from(unsigned addr, unsigned char *rx_buf,
+			 const unsigned char *verify_buf, unsigned count)
+{
+	const unsigned char cmd[5] = {
+		CPLD_CMD_READ_FAST,
+		(addr >> 16) & 0xff,
+		(addr >> 8) & 0xff,
+		 addr & 0xff,
+		 0
+	};
+	struct spi_transfer t[2] = {
+		{
+			.tx_buf = &cmd,
+			.len = 5,
+		},
+		{
+			.tx_buf = verify_buf,
+			.rx_buf = rx_buf,
+			.len = count,
+			.verify = (verify_buf != NULL),
+		},
+	};
+	struct spi_message m;
+
+	if (rb4xx_cpld == NULL)
+		return -ENODEV;
+
+	spi_message_init(&m);
+	m.fast_read = 1;
+	spi_message_add_tail(&t[0], &m);
+	spi_message_add_tail(&t[1], &m);
+	return spi_sync(rb4xx_cpld->spi, &m);
+}
+EXPORT_SYMBOL_GPL(rb4xx_cpld_read_from);
+
+#if 0
+int rb4xx_cpld_read(unsigned char *buf, unsigned char *verify_buf,
+		    unsigned count)
+{
+	struct spi_transfer t[2];
+	struct spi_message m;
+	unsigned char cmd[2];
+
+	if (rb4xx_cpld == NULL)
+		return -ENODEV;
+
+	spi_message_init(&m);
+	memset(&t, 0, sizeof(t));
+
+	/* send command */
+	t[0].tx_buf = cmd;
+	t[0].len = sizeof(cmd);
+	spi_message_add_tail(&t[0], &m);
+
+	cmd[0] = CPLD_CMD_READ_NAND;
+	cmd[1] = 0;
+
+	/* read data */
+	t[1].rx_buf = buf;
+	t[1].len = count;
+	spi_message_add_tail(&t[1], &m);
+
+	return spi_sync(rb4xx_cpld->spi, &m);
+}
+#else
+int rb4xx_cpld_read(unsigned char *rx_buf, const unsigned char *verify_buf,
+		    unsigned count)
+{
+	static const unsigned char cmd[2] = { CPLD_CMD_READ_NAND, 0 };
+	struct spi_transfer t[2] = {
+		{
+			.tx_buf = &cmd,
+			.len = 2,
+		}, {
+			.tx_buf = verify_buf,
+			.rx_buf = rx_buf,
+			.len = count,
+			.verify = (verify_buf != NULL),
+		},
+	};
+	struct spi_message m;
+
+	if (rb4xx_cpld == NULL)
+		return -ENODEV;
+
+	spi_message_init(&m);
+	spi_message_add_tail(&t[0], &m);
+	spi_message_add_tail(&t[1], &m);
+	return spi_sync(rb4xx_cpld->spi, &m);
+}
+#endif
+EXPORT_SYMBOL_GPL(rb4xx_cpld_read);
+
+int rb4xx_cpld_write(const unsigned char *buf, unsigned count)
+{
+#if 0
+	struct spi_transfer t[3];
+	struct spi_message m;
+	unsigned char cmd[1];
+
+	if (rb4xx_cpld == NULL)
+		return -ENODEV;
+
+	memset(&t, 0, sizeof(t));
+	spi_message_init(&m);
+
+	/* send command */
+	t[0].tx_buf = cmd;
+	t[0].len = sizeof(cmd);
+	spi_message_add_tail(&t[0], &m);
+
+	cmd[0] = CPLD_CMD_WRITE_NAND;
+
+	/* write data */
+	t[1].tx_buf = buf;
+	t[1].len = count;
+	spi_message_add_tail(&t[1], &m);
+
+	/* send idle */
+	t[2].len = 1;
+	spi_message_add_tail(&t[2], &m);
+
+	return spi_sync(rb4xx_cpld->spi, &m);
+#else
+	static const unsigned char cmd = CPLD_CMD_WRITE_NAND;
+	struct spi_transfer t[3] = {
+		{
+			.tx_buf = &cmd,
+			.len = 1,
+		}, {
+			.tx_buf = buf,
+			.len = count,
+			.fast_write = 1,
+		}, {
+			.len = 1,
+			.fast_write = 1,
+		},
+	};
+	struct spi_message m;
+
+	if (rb4xx_cpld == NULL)
+		return -ENODEV;
+
+	spi_message_init(&m);
+	spi_message_add_tail(&t[0], &m);
+	spi_message_add_tail(&t[1], &m);
+	spi_message_add_tail(&t[2], &m);
+	return spi_sync(rb4xx_cpld->spi, &m);
+#endif
+}
+EXPORT_SYMBOL_GPL(rb4xx_cpld_write);
+
+static int rb4xx_cpld_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+	struct rb4xx_cpld *cpld = gpio_to_cpld(chip);
+	int ret;
+
+	mutex_lock(&cpld->lock);
+	ret = (cpld->config >> offset) & 1;
+	mutex_unlock(&cpld->lock);
+
+	return ret;
+}
+
+static void rb4xx_cpld_gpio_set(struct gpio_chip *chip, unsigned offset,
+				int value)
+{
+	struct rb4xx_cpld *cpld = gpio_to_cpld(chip);
+
+	mutex_lock(&cpld->lock);
+	__rb4xx_cpld_change_cfg(cpld, (1 << offset), !!value << offset);
+	mutex_unlock(&cpld->lock);
+}
+
+static int rb4xx_cpld_gpio_direction_input(struct gpio_chip *chip,
+					   unsigned offset)
+{
+	return -EOPNOTSUPP;
+}
+
+static int rb4xx_cpld_gpio_direction_output(struct gpio_chip *chip,
+					    unsigned offset,
+					    int value)
+{
+	struct rb4xx_cpld *cpld = gpio_to_cpld(chip);
+	int ret;
+
+	mutex_lock(&cpld->lock);
+	ret = __rb4xx_cpld_change_cfg(cpld, (1 << offset), !!value << offset);
+	mutex_unlock(&cpld->lock);
+
+	return ret;
+}
+
+static int rb4xx_cpld_gpio_init(struct rb4xx_cpld *cpld, unsigned int base)
+{
+	int err;
+
+	/* init config */
+	cpld->config = CPLD_CFG_nLED1 | CPLD_CFG_nLED2 | CPLD_CFG_nLED3 |
+		       CPLD_CFG_nLED4 | CPLD_CFG_nCE;
+	rb4xx_cpld_write_cfg(cpld, cpld->config);
+
+	/* setup GPIO chip */
+	cpld->chip.label = DRV_NAME;
+
+	cpld->chip.get = rb4xx_cpld_gpio_get;
+	cpld->chip.set = rb4xx_cpld_gpio_set;
+	cpld->chip.direction_input = rb4xx_cpld_gpio_direction_input;
+	cpld->chip.direction_output = rb4xx_cpld_gpio_direction_output;
+
+	cpld->chip.base = base;
+	cpld->chip.ngpio = CPLD_NUM_GPIOS;
+	cpld->chip.can_sleep = 1;
+	cpld->chip.dev = &cpld->spi->dev;
+	cpld->chip.owner = THIS_MODULE;
+
+	err = gpiochip_add(&cpld->chip);
+	if (err)
+		dev_err(&cpld->spi->dev, "adding GPIO chip failed, err=%d\n",
+			err);
+
+	return err;
+}
+
+static int rb4xx_cpld_probe(struct spi_device *spi)
+{
+	struct rb4xx_cpld *cpld;
+	struct rb4xx_cpld_platform_data *pdata;
+	int err;
+
+	pdata = spi->dev.platform_data;
+	if (!pdata) {
+		dev_dbg(&spi->dev, "no platform data\n");
+		return -EINVAL;
+	}
+
+	cpld = kzalloc(sizeof(*cpld), GFP_KERNEL);
+	if (!cpld) {
+		dev_err(&spi->dev, "no memory for private data\n");
+		return -ENOMEM;
+	}
+
+	mutex_init(&cpld->lock);
+	cpld->spi = spi_dev_get(spi);
+	dev_set_drvdata(&spi->dev, cpld);
+
+	spi->mode = SPI_MODE_0;
+	spi->bits_per_word = 8;
+	err = spi_setup(spi);
+	if (err) {
+		dev_err(&spi->dev, "spi_setup failed, err=%d\n", err);
+		goto err_drvdata;
+	}
+
+	err = rb4xx_cpld_gpio_init(cpld, pdata->gpio_base);
+	if (err)
+		goto err_drvdata;
+
+	rb4xx_cpld = cpld;
+
+	return 0;
+
+err_drvdata:
+	dev_set_drvdata(&spi->dev, NULL);
+	kfree(cpld);
+
+	return err;
+}
+
+static int rb4xx_cpld_remove(struct spi_device *spi)
+{
+	struct rb4xx_cpld *cpld;
+
+	rb4xx_cpld = NULL;
+	cpld = dev_get_drvdata(&spi->dev);
+	dev_set_drvdata(&spi->dev, NULL);
+	kfree(cpld);
+
+	return 0;
+}
+
+static struct spi_driver rb4xx_cpld_driver = {
+	.driver = {
+		.name		= DRV_NAME,
+		.bus		= &spi_bus_type,
+		.owner		= THIS_MODULE,
+	},
+	.probe		= rb4xx_cpld_probe,
+	.remove		= rb4xx_cpld_remove,
+};
+
+static int __init rb4xx_cpld_init(void)
+{
+	return spi_register_driver(&rb4xx_cpld_driver);
+}
+module_init(rb4xx_cpld_init);
+
+static void __exit rb4xx_cpld_exit(void)
+{
+	spi_unregister_driver(&rb4xx_cpld_driver);
+}
+module_exit(rb4xx_cpld_exit);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c b/trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c
new file mode 100644
index 00000000..56260ffc
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c
@@ -0,0 +1,507 @@
+/*
+ * SPI controller driver for the Mikrotik RB4xx boards
+ *
+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This file was based on the patches for Linux 2.6.27.39 published by
+ * MikroTik for their RouterBoard 4xx series devices.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79.h>
+
+#define DRV_NAME	"rb4xx-spi"
+#define DRV_DESC	"Mikrotik RB4xx SPI controller driver"
+#define DRV_VERSION	"0.1.0"
+
+#define SPI_CTRL_FASTEST	0x40
+#define SPI_FLASH_HZ		33333334
+#define SPI_CPLD_HZ		33333334
+
+#define CPLD_CMD_READ_FAST	0x0b
+
+#undef RB4XX_SPI_DEBUG
+
+struct rb4xx_spi {
+	void __iomem		*base;
+	struct spi_master	*master;
+
+	unsigned		spi_ctrl_flash;
+	unsigned		spi_ctrl_fread;
+
+	struct clk		*ahb_clk;
+	unsigned long		ahb_freq;
+
+	spinlock_t		lock;
+	struct list_head	queue;
+	int			busy:1;
+	int			cs_wait;
+};
+
+static unsigned spi_clk_low = AR71XX_SPI_IOC_CS1;
+
+#ifdef RB4XX_SPI_DEBUG
+static inline void do_spi_delay(void)
+{
+	ndelay(20000);
+}
+#else
+static inline void do_spi_delay(void) { }
+#endif
+
+static inline void do_spi_init(struct spi_device *spi)
+{
+	unsigned cs = AR71XX_SPI_IOC_CS0 | AR71XX_SPI_IOC_CS1;
+
+	if (!(spi->mode & SPI_CS_HIGH))
+		cs ^= (spi->chip_select == 2) ? AR71XX_SPI_IOC_CS1 :
+						AR71XX_SPI_IOC_CS0;
+
+	spi_clk_low = cs;
+}
+
+static inline void do_spi_finish(void __iomem *base)
+{
+	do_spi_delay();
+	__raw_writel(AR71XX_SPI_IOC_CS0 | AR71XX_SPI_IOC_CS1,
+		     base + AR71XX_SPI_REG_IOC);
+}
+
+static inline void do_spi_clk(void __iomem *base, int bit)
+{
+	unsigned bval = spi_clk_low | ((bit & 1) ? AR71XX_SPI_IOC_DO : 0);
+
+	do_spi_delay();
+	__raw_writel(bval, base + AR71XX_SPI_REG_IOC);
+	do_spi_delay();
+	__raw_writel(bval | AR71XX_SPI_IOC_CLK, base + AR71XX_SPI_REG_IOC);
+}
+
+static void do_spi_byte(void __iomem *base, unsigned char byte)
+{
+	do_spi_clk(base, byte >> 7);
+	do_spi_clk(base, byte >> 6);
+	do_spi_clk(base, byte >> 5);
+	do_spi_clk(base, byte >> 4);
+	do_spi_clk(base, byte >> 3);
+	do_spi_clk(base, byte >> 2);
+	do_spi_clk(base, byte >> 1);
+	do_spi_clk(base, byte);
+
+	pr_debug("spi_byte sent 0x%02x got 0x%02x\n",
+	       (unsigned)byte,
+	       (unsigned char)__raw_readl(base + AR71XX_SPI_REG_RDS));
+}
+
+static inline void do_spi_clk_fast(void __iomem *base, unsigned bit1,
+				   unsigned bit2)
+{
+	unsigned bval = (spi_clk_low |
+			 ((bit1 & 1) ? AR71XX_SPI_IOC_DO : 0) |
+			 ((bit2 & 1) ? AR71XX_SPI_IOC_CS2 : 0));
+	do_spi_delay();
+	__raw_writel(bval, base + AR71XX_SPI_REG_IOC);
+	do_spi_delay();
+	__raw_writel(bval | AR71XX_SPI_IOC_CLK, base + AR71XX_SPI_REG_IOC);
+}
+
+static void do_spi_byte_fast(void __iomem *base, unsigned char byte)
+{
+	do_spi_clk_fast(base, byte >> 7, byte >> 6);
+	do_spi_clk_fast(base, byte >> 5, byte >> 4);
+	do_spi_clk_fast(base, byte >> 3, byte >> 2);
+	do_spi_clk_fast(base, byte >> 1, byte >> 0);
+
+	pr_debug("spi_byte_fast sent 0x%02x got 0x%02x\n",
+	       (unsigned)byte,
+	       (unsigned char) __raw_readl(base + AR71XX_SPI_REG_RDS));
+}
+
+static int rb4xx_spi_txrx(void __iomem *base, struct spi_transfer *t)
+{
+	const unsigned char *rxv_ptr = NULL;
+	const unsigned char *tx_ptr = t->tx_buf;
+	unsigned char *rx_ptr = t->rx_buf;
+	unsigned i;
+
+	pr_debug("spi_txrx len %u tx %u rx %u\n",
+	       t->len,
+	       (t->tx_buf ? 1 : 0),
+	       (t->rx_buf ? 1 : 0));
+
+	if (t->verify) {
+		rxv_ptr = tx_ptr;
+		tx_ptr = NULL;
+	}
+
+	for (i = 0; i < t->len; ++i) {
+		unsigned char sdata = tx_ptr ? tx_ptr[i] : 0;
+
+		if (t->fast_write)
+			do_spi_byte_fast(base, sdata);
+		else
+			do_spi_byte(base, sdata);
+
+		if (rx_ptr) {
+			rx_ptr[i] = __raw_readl(base + AR71XX_SPI_REG_RDS) & 0xff;
+		} else if (rxv_ptr) {
+			unsigned char c = __raw_readl(base + AR71XX_SPI_REG_RDS);
+			if (rxv_ptr[i] != c)
+				return i;
+		}
+	}
+
+	return i;
+}
+
+static int rb4xx_spi_read_fast(struct rb4xx_spi *rbspi,
+			       struct spi_message *m)
+{
+	struct spi_transfer *t;
+	const unsigned char *tx_ptr;
+	unsigned addr;
+	void __iomem *base = rbspi->base;
+
+	/* check for exactly two transfers */
+	if (list_empty(&m->transfers) ||
+	    list_is_last(m->transfers.next, &m->transfers) ||
+	    !list_is_last(m->transfers.next->next, &m->transfers)) {
+		return -1;
+	}
+
+	/* first transfer contains command and address  */
+	t = list_entry(m->transfers.next,
+		       struct spi_transfer, transfer_list);
+
+	if (t->len != 5 || t->tx_buf == NULL)
+		return -1;
+
+	tx_ptr = t->tx_buf;
+	if (tx_ptr[0] != CPLD_CMD_READ_FAST)
+		return -1;
+
+	addr = tx_ptr[1];
+	addr = tx_ptr[2] | (addr << 8);
+	addr = tx_ptr[3] | (addr << 8);
+	addr += (unsigned) base;
+
+	m->actual_length += t->len;
+
+	/* second transfer contains data itself */
+	t = list_entry(m->transfers.next->next,
+		       struct spi_transfer, transfer_list);
+
+	if (t->tx_buf && !t->verify)
+		return -1;
+
+	__raw_writel(AR71XX_SPI_FS_GPIO, base + AR71XX_SPI_REG_FS);
+	__raw_writel(rbspi->spi_ctrl_fread, base + AR71XX_SPI_REG_CTRL);
+	__raw_writel(0, base + AR71XX_SPI_REG_FS);
+
+	if (t->rx_buf) {
+		memcpy(t->rx_buf, (const void *)addr, t->len);
+	} else if (t->tx_buf) {
+		unsigned char buf[t->len];
+		memcpy(buf, (const void *)addr, t->len);
+		if (memcmp(t->tx_buf, buf, t->len) != 0)
+			m->status = -EMSGSIZE;
+	}
+	m->actual_length += t->len;
+
+	if (rbspi->spi_ctrl_flash != rbspi->spi_ctrl_fread) {
+		__raw_writel(AR71XX_SPI_FS_GPIO, base + AR71XX_SPI_REG_FS);
+		__raw_writel(rbspi->spi_ctrl_flash, base + AR71XX_SPI_REG_CTRL);
+		__raw_writel(0, base + AR71XX_SPI_REG_FS);
+	}
+
+	return 0;
+}
+
+static int rb4xx_spi_msg(struct rb4xx_spi *rbspi, struct spi_message *m)
+{
+	struct spi_transfer *t = NULL;
+	void __iomem *base = rbspi->base;
+
+	m->status = 0;
+	if (list_empty(&m->transfers))
+		return -1;
+
+	if (m->fast_read)
+		if (rb4xx_spi_read_fast(rbspi, m) == 0)
+			return -1;
+
+	__raw_writel(AR71XX_SPI_FS_GPIO, base + AR71XX_SPI_REG_FS);
+	__raw_writel(SPI_CTRL_FASTEST, base + AR71XX_SPI_REG_CTRL);
+	do_spi_init(m->spi);
+
+	list_for_each_entry(t, &m->transfers, transfer_list) {
+		int len;
+
+		len = rb4xx_spi_txrx(base, t);
+		if (len != t->len) {
+			m->status = -EMSGSIZE;
+			break;
+		}
+		m->actual_length += len;
+
+		if (t->cs_change) {
+			if (list_is_last(&t->transfer_list, &m->transfers)) {
+				/* wait for continuation */
+				return m->spi->chip_select;
+			}
+			do_spi_finish(base);
+			ndelay(100);
+		}
+	}
+
+	do_spi_finish(base);
+	__raw_writel(rbspi->spi_ctrl_flash, base + AR71XX_SPI_REG_CTRL);
+	__raw_writel(0, base + AR71XX_SPI_REG_FS);
+	return -1;
+}
+
+static void rb4xx_spi_process_queue_locked(struct rb4xx_spi *rbspi,
+					   unsigned long *flags)
+{
+	int cs = rbspi->cs_wait;
+
+	rbspi->busy = 1;
+	while (!list_empty(&rbspi->queue)) {
+		struct spi_message *m;
+
+		list_for_each_entry(m, &rbspi->queue, queue)
+			if (cs < 0 || cs == m->spi->chip_select)
+				break;
+
+		if (&m->queue == &rbspi->queue)
+			break;
+
+		list_del_init(&m->queue);
+		spin_unlock_irqrestore(&rbspi->lock, *flags);
+
+		cs = rb4xx_spi_msg(rbspi, m);
+		m->complete(m->context);
+
+		spin_lock_irqsave(&rbspi->lock, *flags);
+	}
+
+	rbspi->cs_wait = cs;
+	rbspi->busy = 0;
+
+	if (cs >= 0) {
+		/* TODO: add timer to unlock cs after 1s inactivity */
+	}
+}
+
+static int rb4xx_spi_transfer(struct spi_device *spi,
+			      struct spi_message *m)
+{
+	struct rb4xx_spi *rbspi = spi_master_get_devdata(spi->master);
+	unsigned long flags;
+
+	m->actual_length = 0;
+	m->status = -EINPROGRESS;
+
+	spin_lock_irqsave(&rbspi->lock, flags);
+	list_add_tail(&m->queue, &rbspi->queue);
+	if (rbspi->busy ||
+	    (rbspi->cs_wait >= 0 && rbspi->cs_wait != m->spi->chip_select)) {
+		/* job will be done later */
+		spin_unlock_irqrestore(&rbspi->lock, flags);
+		return 0;
+	}
+
+	/* process job in current context */
+	rb4xx_spi_process_queue_locked(rbspi, &flags);
+	spin_unlock_irqrestore(&rbspi->lock, flags);
+
+	return 0;
+}
+
+static int rb4xx_spi_setup(struct spi_device *spi)
+{
+	struct rb4xx_spi *rbspi = spi_master_get_devdata(spi->master);
+	unsigned long flags;
+
+	if (spi->mode & ~(SPI_CS_HIGH)) {
+		dev_err(&spi->dev, "mode %x not supported\n",
+			(unsigned) spi->mode);
+		return -EINVAL;
+	}
+
+	if (spi->bits_per_word != 8 && spi->bits_per_word != 0) {
+		dev_err(&spi->dev, "bits_per_word %u not supported\n",
+			(unsigned) spi->bits_per_word);
+		return -EINVAL;
+	}
+
+	spin_lock_irqsave(&rbspi->lock, flags);
+	if (rbspi->cs_wait == spi->chip_select && !rbspi->busy) {
+		rbspi->cs_wait = -1;
+		rb4xx_spi_process_queue_locked(rbspi, &flags);
+	}
+	spin_unlock_irqrestore(&rbspi->lock, flags);
+
+	return 0;
+}
+
+static unsigned get_spi_ctrl(struct rb4xx_spi *rbspi, unsigned hz_max,
+			     const char *name)
+{
+	unsigned div;
+
+	div = (rbspi->ahb_freq - 1) / (2 * hz_max);
+
+	/*
+	 * CPU has a bug at (div == 0) - first bit read is random
+	 */
+	if (div == 0)
+		++div;
+
+	if (name) {
+		unsigned ahb_khz = (rbspi->ahb_freq + 500) / 1000;
+		unsigned div_real = 2 * (div + 1);
+		pr_debug("rb4xx: %s SPI clock %u kHz (AHB %u kHz / %u)\n",
+		       name,
+		       ahb_khz / div_real,
+		       ahb_khz, div_real);
+	}
+
+	return SPI_CTRL_FASTEST + div;
+}
+
+static int rb4xx_spi_probe(struct platform_device *pdev)
+{
+	struct spi_master *master;
+	struct rb4xx_spi *rbspi;
+	struct resource *r;
+	int err = 0;
+
+	master = spi_alloc_master(&pdev->dev, sizeof(*rbspi));
+	if (master == NULL) {
+		dev_err(&pdev->dev, "no memory for spi_master\n");
+		err = -ENOMEM;
+		goto err_out;
+	}
+
+	master->bus_num = 0;
+	master->num_chipselect = 3;
+	master->setup = rb4xx_spi_setup;
+	master->transfer = rb4xx_spi_transfer;
+
+	rbspi = spi_master_get_devdata(master);
+
+	rbspi->ahb_clk = clk_get(&pdev->dev, "ahb");
+	if (IS_ERR(rbspi->ahb_clk)) {
+		err = PTR_ERR(rbspi->ahb_clk);
+		goto err_put_master;
+	}
+
+	err = clk_enable(rbspi->ahb_clk);
+	if (err)
+		goto err_clk_put;
+
+	rbspi->ahb_freq = clk_get_rate(rbspi->ahb_clk);
+	if (!rbspi->ahb_freq) {
+		err = -EINVAL;
+		goto err_clk_disable;
+	}
+
+	platform_set_drvdata(pdev, rbspi);
+
+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (r == NULL) {
+		err = -ENOENT;
+		goto err_clk_disable;
+	}
+
+	rbspi->base = ioremap(r->start, r->end - r->start + 1);
+	if (!rbspi->base) {
+		err = -ENXIO;
+		goto err_clk_disable;
+	}
+
+	rbspi->master = master;
+	rbspi->spi_ctrl_flash = get_spi_ctrl(rbspi, SPI_FLASH_HZ, "FLASH");
+	rbspi->spi_ctrl_fread = get_spi_ctrl(rbspi, SPI_CPLD_HZ, "CPLD");
+	rbspi->cs_wait = -1;
+
+	spin_lock_init(&rbspi->lock);
+	INIT_LIST_HEAD(&rbspi->queue);
+
+	err = spi_register_master(master);
+	if (err) {
+		dev_err(&pdev->dev, "failed to register SPI master\n");
+		goto err_iounmap;
+	}
+
+	return 0;
+
+err_iounmap:
+	iounmap(rbspi->base);
+err_clk_disable:
+	clk_disable(rbspi->ahb_clk);
+err_clk_put:
+	clk_put(rbspi->ahb_clk);
+err_put_master:
+	platform_set_drvdata(pdev, NULL);
+	spi_master_put(master);
+err_out:
+	return err;
+}
+
+static int rb4xx_spi_remove(struct platform_device *pdev)
+{
+	struct rb4xx_spi *rbspi = platform_get_drvdata(pdev);
+
+	iounmap(rbspi->base);
+	clk_disable(rbspi->ahb_clk);
+	clk_put(rbspi->ahb_clk);
+	platform_set_drvdata(pdev, NULL);
+	spi_master_put(rbspi->master);
+
+	return 0;
+}
+
+static struct platform_driver rb4xx_spi_drv = {
+	.probe		= rb4xx_spi_probe,
+	.remove		= rb4xx_spi_remove,
+	.driver		= {
+		.name	= DRV_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init rb4xx_spi_init(void)
+{
+	return platform_driver_register(&rb4xx_spi_drv);
+}
+subsys_initcall(rb4xx_spi_init);
+
+static void __exit rb4xx_spi_exit(void)
+{
+	platform_driver_unregister(&rb4xx_spi_drv);
+}
+
+module_exit(rb4xx_spi_exit);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c b/trunk/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c
new file mode 100644
index 00000000..b712e718
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/drivers/spi/spi-vsc7385.c
@@ -0,0 +1,621 @@
+/*
+ * SPI driver for the Vitesse VSC7385 ethernet switch
+ *
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/bitops.h>
+#include <linux/firmware.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/vsc7385.h>
+
+#define DRV_NAME	"spi-vsc7385"
+#define DRV_DESC	"Vitesse VSC7385 Gbit ethernet switch driver"
+#define DRV_VERSION	"0.1.0"
+
+#define VSC73XX_BLOCK_MAC	0x1
+#define VSC73XX_BLOCK_2		0x2
+#define VSC73XX_BLOCK_MII	0x3
+#define VSC73XX_BLOCK_4		0x4
+#define VSC73XX_BLOCK_5		0x5
+#define VSC73XX_BLOCK_SYSTEM	0x7
+
+#define VSC73XX_SUBBLOCK_PORT_0		0
+#define VSC73XX_SUBBLOCK_PORT_1		1
+#define VSC73XX_SUBBLOCK_PORT_2		2
+#define VSC73XX_SUBBLOCK_PORT_3		3
+#define VSC73XX_SUBBLOCK_PORT_4		4
+#define VSC73XX_SUBBLOCK_PORT_MAC	6
+
+/* MAC Block registers */
+#define VSC73XX_MAC_CFG		0x0
+#define VSC73XX_ADVPORTM	0x19
+#define VSC73XX_RXOCT		0x50
+#define VSC73XX_TXOCT		0x51
+#define VSC73XX_C_RX0		0x52
+#define VSC73XX_C_RX1		0x53
+#define VSC73XX_C_RX2		0x54
+#define VSC73XX_C_TX0		0x55
+#define VSC73XX_C_TX1		0x56
+#define VSC73XX_C_TX2		0x57
+#define VSC73XX_C_CFG		0x58
+
+/* MAC_CFG register bits */
+#define VSC73XX_MAC_CFG_WEXC_DIS	(1 << 31)
+#define VSC73XX_MAC_CFG_PORT_RST	(1 << 29)
+#define VSC73XX_MAC_CFG_TX_EN		(1 << 28)
+#define VSC73XX_MAC_CFG_SEED_LOAD	(1 << 27)
+#define VSC73XX_MAC_CFG_FDX		(1 << 18)
+#define VSC73XX_MAC_CFG_GIGE		(1 << 17)
+#define VSC73XX_MAC_CFG_RX_EN		(1 << 16)
+#define VSC73XX_MAC_CFG_VLAN_DBLAWR	(1 << 15)
+#define VSC73XX_MAC_CFG_VLAN_AWR	(1 << 14)
+#define VSC73XX_MAC_CFG_100_BASE_T	(1 << 13)
+#define VSC73XX_MAC_CFG_TX_IPG(x)	(((x) & 0x1f) << 6)
+#define VSC73XX_MAC_CFG_MAC_RX_RST	(1 << 5)
+#define VSC73XX_MAC_CFG_MAC_TX_RST	(1 << 4)
+#define VSC73XX_MAC_CFG_BIT2		(1 << 2)
+#define VSC73XX_MAC_CFG_CLK_SEL(x)	((x) & 0x3)
+
+/* ADVPORTM register bits */
+#define VSC73XX_ADVPORTM_IFG_PPM	(1 << 7)
+#define VSC73XX_ADVPORTM_EXC_COL_CONT	(1 << 6)
+#define VSC73XX_ADVPORTM_EXT_PORT	(1 << 5)
+#define VSC73XX_ADVPORTM_INV_GTX	(1 << 4)
+#define VSC73XX_ADVPORTM_ENA_GTX	(1 << 3)
+#define VSC73XX_ADVPORTM_DDR_MODE	(1 << 2)
+#define VSC73XX_ADVPORTM_IO_LOOPBACK	(1 << 1)
+#define VSC73XX_ADVPORTM_HOST_LOOPBACK	(1 << 0)
+
+/* MII Block registers */
+#define VSC73XX_MII_STAT	0x0
+#define VSC73XX_MII_CMD		0x1
+#define VSC73XX_MII_DATA	0x2
+
+/* System Block registers */
+#define VSC73XX_ICPU_SIPAD		0x01
+#define VSC73XX_ICPU_CLOCK_DELAY	0x05
+#define VSC73XX_ICPU_CTRL		0x10
+#define VSC73XX_ICPU_ADDR		0x11
+#define VSC73XX_ICPU_SRAM		0x12
+#define VSC73XX_ICPU_MBOX_VAL		0x15
+#define VSC73XX_ICPU_MBOX_SET		0x16
+#define VSC73XX_ICPU_MBOX_CLR		0x17
+#define VSC73XX_ICPU_CHIPID		0x18
+#define VSC73XX_ICPU_GPIO		0x34
+
+#define VSC73XX_ICPU_CTRL_CLK_DIV	(1 << 8)
+#define VSC73XX_ICPU_CTRL_SRST_HOLD	(1 << 7)
+#define VSC73XX_ICPU_CTRL_BOOT_EN	(1 << 3)
+#define VSC73XX_ICPU_CTRL_EXT_ACC_EN	(1 << 2)
+#define VSC73XX_ICPU_CTRL_CLK_EN	(1 << 1)
+#define VSC73XX_ICPU_CTRL_SRST		(1 << 0)
+
+#define VSC73XX_ICPU_CHIPID_ID_SHIFT	12
+#define VSC73XX_ICPU_CHIPID_ID_MASK	0xffff
+#define VSC73XX_ICPU_CHIPID_REV_SHIFT	28
+#define VSC73XX_ICPU_CHIPID_REV_MASK	0xf
+#define VSC73XX_ICPU_CHIPID_ID_7385	0x7385
+#define VSC73XX_ICPU_CHIPID_ID_7395	0x7395
+
+#define VSC73XX_CMD_MODE_READ		0
+#define VSC73XX_CMD_MODE_WRITE		1
+#define VSC73XX_CMD_MODE_SHIFT		4
+#define VSC73XX_CMD_BLOCK_SHIFT		5
+#define VSC73XX_CMD_BLOCK_MASK		0x7
+#define VSC73XX_CMD_SUBBLOCK_MASK	0xf
+
+#define VSC7385_CLOCK_DELAY		((3 << 4) | 3)
+#define VSC7385_CLOCK_DELAY_MASK	((3 << 4) | 3)
+
+#define VSC73XX_ICPU_CTRL_STOP	(VSC73XX_ICPU_CTRL_SRST_HOLD | \
+				 VSC73XX_ICPU_CTRL_BOOT_EN | \
+				 VSC73XX_ICPU_CTRL_EXT_ACC_EN)
+
+#define VSC73XX_ICPU_CTRL_START	(VSC73XX_ICPU_CTRL_CLK_DIV | \
+				 VSC73XX_ICPU_CTRL_BOOT_EN | \
+				 VSC73XX_ICPU_CTRL_CLK_EN | \
+				 VSC73XX_ICPU_CTRL_SRST)
+
+#define VSC7385_ADVPORTM_MASK	(VSC73XX_ADVPORTM_IFG_PPM | \
+				 VSC73XX_ADVPORTM_EXC_COL_CONT | \
+				 VSC73XX_ADVPORTM_EXT_PORT | \
+				 VSC73XX_ADVPORTM_INV_GTX | \
+				 VSC73XX_ADVPORTM_ENA_GTX | \
+				 VSC73XX_ADVPORTM_DDR_MODE | \
+				 VSC73XX_ADVPORTM_IO_LOOPBACK | \
+				 VSC73XX_ADVPORTM_HOST_LOOPBACK)
+
+#define VSC7385_ADVPORTM_INIT	(VSC73XX_ADVPORTM_EXT_PORT | \
+				 VSC73XX_ADVPORTM_ENA_GTX | \
+				 VSC73XX_ADVPORTM_DDR_MODE)
+
+#define VSC7385_MAC_CFG_RESET	(VSC73XX_MAC_CFG_PORT_RST | \
+				 VSC73XX_MAC_CFG_MAC_RX_RST | \
+				 VSC73XX_MAC_CFG_MAC_TX_RST)
+
+#define VSC73XX_MAC_CFG_INIT	(VSC73XX_MAC_CFG_TX_EN | \
+				 VSC73XX_MAC_CFG_FDX | \
+				 VSC73XX_MAC_CFG_GIGE | \
+				 VSC73XX_MAC_CFG_RX_EN)
+
+#define VSC73XX_RESET_DELAY	100
+
+struct vsc7385 {
+	struct spi_device		*spi;
+	struct mutex			lock;
+	struct vsc7385_platform_data	*pdata;
+};
+
+static int vsc7385_is_addr_valid(u8 block, u8 subblock)
+{
+	switch (block) {
+	case VSC73XX_BLOCK_MAC:
+		switch (subblock) {
+		case 0 ... 4:
+		case 6:
+			return 1;
+		}
+		break;
+
+	case VSC73XX_BLOCK_2:
+	case VSC73XX_BLOCK_SYSTEM:
+		switch (subblock) {
+		case 0:
+			return 1;
+		}
+		break;
+
+	case VSC73XX_BLOCK_MII:
+	case VSC73XX_BLOCK_4:
+	case VSC73XX_BLOCK_5:
+		switch (subblock) {
+		case 0 ... 1:
+			return 1;
+		}
+		break;
+	}
+
+	return 0;
+}
+
+static inline u8 vsc7385_make_addr(u8 mode, u8 block, u8 subblock)
+{
+	u8 ret;
+
+	ret = (block & VSC73XX_CMD_BLOCK_MASK) << VSC73XX_CMD_BLOCK_SHIFT;
+	ret |= (mode & 1) << VSC73XX_CMD_MODE_SHIFT;
+	ret |= subblock & VSC73XX_CMD_SUBBLOCK_MASK;
+
+	return ret;
+}
+
+static int vsc7385_read(struct vsc7385 *vsc, u8 block, u8 subblock, u8 reg,
+			u32 *value)
+{
+	u8 cmd[4];
+	u8 buf[4];
+	struct spi_transfer t[2];
+	struct spi_message m;
+	int err;
+
+	if (!vsc7385_is_addr_valid(block, subblock))
+		return -EINVAL;
+
+	spi_message_init(&m);
+
+	memset(&t, 0, sizeof(t));
+
+	t[0].tx_buf = cmd;
+	t[0].len = sizeof(cmd);
+	spi_message_add_tail(&t[0], &m);
+
+	t[1].rx_buf = buf;
+	t[1].len = sizeof(buf);
+	spi_message_add_tail(&t[1], &m);
+
+	cmd[0] = vsc7385_make_addr(VSC73XX_CMD_MODE_READ, block, subblock);
+	cmd[1] = reg;
+	cmd[2] = 0;
+	cmd[3] = 0;
+
+	mutex_lock(&vsc->lock);
+	err = spi_sync(vsc->spi, &m);
+	mutex_unlock(&vsc->lock);
+
+	if (err)
+		return err;
+
+	*value = (((u32) buf[0]) << 24) | (((u32) buf[1]) << 16) |
+		 (((u32) buf[2]) << 8) | ((u32) buf[3]);
+
+	return 0;
+}
+
+
+static int vsc7385_write(struct vsc7385 *vsc, u8 block, u8 subblock, u8 reg,
+			 u32 value)
+{
+	u8 cmd[2];
+	u8 buf[4];
+	struct spi_transfer t[2];
+	struct spi_message m;
+	int err;
+
+	if (!vsc7385_is_addr_valid(block, subblock))
+		return -EINVAL;
+
+	spi_message_init(&m);
+
+	memset(&t, 0, sizeof(t));
+
+	t[0].tx_buf = cmd;
+	t[0].len = sizeof(cmd);
+	spi_message_add_tail(&t[0], &m);
+
+	t[1].tx_buf = buf;
+	t[1].len = sizeof(buf);
+	spi_message_add_tail(&t[1], &m);
+
+	cmd[0] = vsc7385_make_addr(VSC73XX_CMD_MODE_WRITE, block, subblock);
+	cmd[1] = reg;
+
+	buf[0] = (value >> 24) & 0xff;
+	buf[1] = (value >> 16) & 0xff;
+	buf[2] = (value >> 8) & 0xff;
+	buf[3] = value & 0xff;
+
+	mutex_lock(&vsc->lock);
+	err = spi_sync(vsc->spi, &m);
+	mutex_unlock(&vsc->lock);
+
+	return err;
+}
+
+static inline int vsc7385_write_verify(struct vsc7385 *vsc, u8 block,
+				       u8 subblock, u8 reg, u32 value,
+				       u32 read_mask, u32 read_val)
+{
+	struct spi_device *spi = vsc->spi;
+	u32 t;
+	int err;
+
+	err = vsc7385_write(vsc, block, subblock, reg, value);
+	if (err)
+		return err;
+
+	err = vsc7385_read(vsc, block, subblock, reg, &t);
+	if (err)
+		return err;
+
+	if ((t & read_mask) != read_val) {
+		dev_err(&spi->dev, "register write error\n");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static inline int vsc7385_set_clock_delay(struct vsc7385 *vsc, u32 val)
+{
+	return vsc7385_write(vsc, VSC73XX_BLOCK_SYSTEM, 0,
+			     VSC73XX_ICPU_CLOCK_DELAY, val);
+}
+
+static inline int vsc7385_get_clock_delay(struct vsc7385 *vsc, u32 *val)
+{
+	return vsc7385_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
+			    VSC73XX_ICPU_CLOCK_DELAY, val);
+}
+
+static inline int vsc7385_icpu_stop(struct vsc7385 *vsc)
+{
+	return vsc7385_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_ICPU_CTRL,
+			     VSC73XX_ICPU_CTRL_STOP);
+}
+
+static inline int vsc7385_icpu_start(struct vsc7385 *vsc)
+{
+	return vsc7385_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_ICPU_CTRL,
+			     VSC73XX_ICPU_CTRL_START);
+}
+
+static inline int vsc7385_icpu_reset(struct vsc7385 *vsc)
+{
+	int rc;
+
+	rc = vsc7385_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_ICPU_ADDR,
+			   0x0000);
+	if (rc)
+		dev_err(&vsc->spi->dev,
+			"could not reset microcode, err=%d\n", rc);
+
+	return rc;
+}
+
+static int vsc7385_upload_ucode(struct vsc7385 *vsc)
+{
+	struct spi_device *spi = vsc->spi;
+	const struct firmware *firmware;
+	char *ucode_name;
+	unsigned char *dp;
+	unsigned int curVal;
+	int i;
+	int diffs;
+	int rc;
+
+	ucode_name = (vsc->pdata->ucode_name) ? vsc->pdata->ucode_name
+					      : "vsc7385_ucode.bin";
+	rc = request_firmware(&firmware, ucode_name, &spi->dev);
+	if (rc) {
+		dev_err(&spi->dev, "request_firmware failed, err=%d\n",
+			rc);
+		return rc;
+	}
+
+	rc = vsc7385_icpu_stop(vsc);
+	if (rc)
+		goto out;
+
+	rc = vsc7385_icpu_reset(vsc);
+	if (rc)
+		goto out;
+
+	dev_info(&spi->dev, "uploading microcode...\n");
+
+	dp = (unsigned char *) firmware->data;
+	for (i = 0; i < firmware->size; i++) {
+		rc = vsc7385_write(vsc, VSC73XX_BLOCK_SYSTEM, 0,
+				   VSC73XX_ICPU_SRAM, *dp++);
+		if (rc) {
+			dev_err(&spi->dev, "could not load microcode, err=%d\n",
+				rc);
+			goto out;
+		}
+	}
+
+	rc = vsc7385_icpu_reset(vsc);
+	if (rc)
+		goto out;
+
+	dev_info(&spi->dev, "verifying microcode...\n");
+
+	dp = (unsigned char *) firmware->data;
+	diffs = 0;
+	for (i = 0; i < firmware->size; i++) {
+		rc = vsc7385_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
+				  VSC73XX_ICPU_SRAM, &curVal);
+		if (rc) {
+			dev_err(&spi->dev, "could not read microcode %d\n",
+				rc);
+			goto out;
+		}
+
+		if (curVal > 0xff) {
+			dev_err(&spi->dev, "bad val read: %04x : %02x  %02x\n",
+				i, *dp, curVal);
+			rc = -EIO;
+			goto out;
+		}
+
+		if ((curVal & 0xff) != *dp) {
+			diffs++;
+			dev_err(&spi->dev, "verify error: %04x : %02x  %02x\n",
+				i, *dp, curVal);
+
+			if (diffs > 4)
+				break;
+			}
+		dp++;
+	}
+
+	if (diffs) {
+		dev_err(&spi->dev, "microcode verification failed\n");
+		rc = -EIO;
+		goto out;
+	}
+
+	dev_info(&spi->dev, "microcode uploaded\n");
+
+	rc = vsc7385_icpu_start(vsc);
+
+out:
+	release_firmware(firmware);
+	return rc;
+}
+
+static int vsc7385_setup(struct vsc7385 *vsc)
+{
+	struct vsc7385_platform_data *pdata = vsc->pdata;
+	u32 t;
+	int err;
+
+	err = vsc7385_write_verify(vsc, VSC73XX_BLOCK_SYSTEM, 0,
+				   VSC73XX_ICPU_CLOCK_DELAY,
+				   VSC7385_CLOCK_DELAY,
+				   VSC7385_CLOCK_DELAY_MASK,
+				   VSC7385_CLOCK_DELAY);
+	if (err)
+		goto err;
+
+	err = vsc7385_write_verify(vsc, VSC73XX_BLOCK_MAC,
+				   VSC73XX_SUBBLOCK_PORT_MAC, VSC73XX_ADVPORTM,
+				   VSC7385_ADVPORTM_INIT,
+				   VSC7385_ADVPORTM_MASK,
+				   VSC7385_ADVPORTM_INIT);
+	if (err)
+		goto err;
+
+	err = vsc7385_write(vsc, VSC73XX_BLOCK_MAC, VSC73XX_SUBBLOCK_PORT_MAC,
+			    VSC73XX_MAC_CFG, VSC7385_MAC_CFG_RESET);
+	if (err)
+		goto err;
+
+	t = VSC73XX_MAC_CFG_INIT;
+	t |= VSC73XX_MAC_CFG_TX_IPG(pdata->mac_cfg.tx_ipg);
+	t |= VSC73XX_MAC_CFG_CLK_SEL(pdata->mac_cfg.clk_sel);
+	if (pdata->mac_cfg.bit2)
+		t |= VSC73XX_MAC_CFG_BIT2;
+
+	err = vsc7385_write(vsc, VSC73XX_BLOCK_MAC, VSC73XX_SUBBLOCK_PORT_MAC,
+			    VSC73XX_MAC_CFG, t);
+	if (err)
+		goto err;
+
+	return 0;
+
+err:
+	return err;
+}
+
+static int vsc7385_detect(struct vsc7385 *vsc)
+{
+	struct spi_device *spi = vsc->spi;
+	u32 t;
+	u32 id;
+	u32 rev;
+	int err;
+
+	err = vsc7385_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
+				VSC73XX_ICPU_MBOX_VAL, &t);
+	if (err) {
+		dev_err(&spi->dev, "unable to read mailbox, err=%d\n", err);
+		return err;
+	}
+
+	if (t == 0xffffffff) {
+		dev_dbg(&spi->dev, "assert chip reset\n");
+		if (vsc->pdata->reset)
+			vsc->pdata->reset();
+
+	}
+
+	err = vsc7385_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
+				VSC73XX_ICPU_CHIPID, &t);
+	if (err) {
+		dev_err(&spi->dev, "unable to read chip id, err=%d\n", err);
+		return err;
+	}
+
+	id = (t >> VSC73XX_ICPU_CHIPID_ID_SHIFT) & VSC73XX_ICPU_CHIPID_ID_MASK;
+	switch (id) {
+	case VSC73XX_ICPU_CHIPID_ID_7385:
+	case VSC73XX_ICPU_CHIPID_ID_7395:
+		break;
+	default:
+		dev_err(&spi->dev, "unsupported chip, id=%04x\n", id);
+		return -ENODEV;
+	}
+
+	rev = (t >> VSC73XX_ICPU_CHIPID_REV_SHIFT) &
+	      VSC73XX_ICPU_CHIPID_REV_MASK;
+	dev_info(&spi->dev, "VSC%04X (rev. %d) switch found\n", id, rev);
+
+	return 0;
+}
+
+static int vsc7385_probe(struct spi_device *spi)
+{
+	struct vsc7385 *vsc;
+	struct vsc7385_platform_data *pdata;
+	int	err;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION"\n");
+
+	pdata = spi->dev.platform_data;
+	if (!pdata) {
+		dev_err(&spi->dev, "no platform data specified\n");
+		return -ENODEV;
+	}
+
+	vsc = kzalloc(sizeof(*vsc), GFP_KERNEL);
+	if (!vsc) {
+		dev_err(&spi->dev, "no memory for private data\n");
+		return -ENOMEM;
+	}
+
+	mutex_init(&vsc->lock);
+	vsc->pdata = pdata;
+	vsc->spi = spi_dev_get(spi);
+	dev_set_drvdata(&spi->dev, vsc);
+
+	spi->mode = SPI_MODE_0;
+	spi->bits_per_word = 8;
+	err = spi_setup(spi);
+	if (err) {
+		dev_err(&spi->dev, "spi_setup failed, err=%d\n", err);
+		goto err_drvdata;
+	}
+
+	err = vsc7385_detect(vsc);
+	if (err) {
+		dev_err(&spi->dev, "no chip found, err=%d\n", err);
+		goto err_drvdata;
+	}
+
+	err = vsc7385_upload_ucode(vsc);
+	if (err)
+		goto err_drvdata;
+
+	err = vsc7385_setup(vsc);
+	if (err)
+		goto err_drvdata;
+
+	return 0;
+
+err_drvdata:
+	dev_set_drvdata(&spi->dev, NULL);
+	kfree(vsc);
+	return err;
+}
+
+static int vsc7385_remove(struct spi_device *spi)
+{
+	struct vsc7385_data	*vsc;
+
+	vsc = dev_get_drvdata(&spi->dev);
+	dev_set_drvdata(&spi->dev, NULL);
+	kfree(vsc);
+
+	return 0;
+}
+
+static struct spi_driver vsc7385_driver = {
+	.driver = {
+		.name		= DRV_NAME,
+		.bus		= &spi_bus_type,
+		.owner		= THIS_MODULE,
+	},
+	.probe		= vsc7385_probe,
+	.remove		= vsc7385_remove,
+};
+
+static int __init vsc7385_init(void)
+{
+	return spi_register_driver(&vsc7385_driver);
+}
+module_init(vsc7385_init);
+
+static void __exit vsc7385_exit(void)
+{
+	spi_unregister_driver(&vsc7385_driver);
+}
+module_exit(vsc7385_exit);
+
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+
diff --git a/trunk/target/linux/ar71xx/files/include/linux/nxp_74hc153.h b/trunk/target/linux/ar71xx/files/include/linux/nxp_74hc153.h
new file mode 100644
index 00000000..20b8845e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/include/linux/nxp_74hc153.h
@@ -0,0 +1,24 @@
+/*
+ *  NXP 74HC153 - Dual 4-input multiplexer defines
+ *
+ *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef _NXP_74HC153_H
+#define _NXP_74HC153_H
+
+#define NXP_74HC153_DRIVER_NAME "nxp-74hc153"
+
+struct nxp_74hc153_platform_data {
+	unsigned	gpio_base;
+	unsigned	gpio_pin_s0;
+	unsigned	gpio_pin_s1;
+	unsigned	gpio_pin_1y;
+	unsigned	gpio_pin_2y;
+};
+
+#endif /* _NXP_74HC153_H */
diff --git a/trunk/target/linux/ar71xx/files/include/linux/platform/ar934x_nfc.h b/trunk/target/linux/ar71xx/files/include/linux/platform/ar934x_nfc.h
new file mode 100644
index 00000000..4a4e751d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/include/linux/platform/ar934x_nfc.h
@@ -0,0 +1,38 @@
+/*
+ * Platform data definition for the built-in NAND controller of the
+ * Atheros AR934x SoCs
+ *
+ * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _AR934X_NFC_PLATFORM_H
+#define _AR934X_NFC_PLATFORM_H
+
+#define AR934X_NFC_DRIVER_NAME		"ar934x-nfc"
+
+struct mtd_info;
+struct mtd_partition;
+
+enum ar934x_nfc_ecc_mode {
+	AR934X_NFC_ECC_SOFT = 0,
+	AR934X_NFC_ECC_HW,
+};
+
+struct ar934x_nfc_platform_data {
+	const char *name;
+	struct mtd_partition *parts;
+	int nr_parts;
+
+	bool swap_dma;
+	enum ar934x_nfc_ecc_mode ecc_mode;
+
+	void (*hw_reset)(bool active);
+	void (*select_chip)(int chip_no);
+	int (*scan_fixup)(struct mtd_info *mtd);
+};
+
+#endif /* _AR934X_NFC_PLATFORM_H */
diff --git a/trunk/target/linux/ar71xx/files/include/linux/platform_data/gpio-latch.h b/trunk/target/linux/ar71xx/files/include/linux/platform_data/gpio-latch.h
new file mode 100644
index 00000000..0450e679
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/include/linux/platform_data/gpio-latch.h
@@ -0,0 +1,14 @@
+#ifndef _GPIO_LATCH_H_
+#define _GPIO_LATCH_H_
+
+#define GPIO_LATCH_DRIVER_NAME	"gpio-latch"
+
+struct gpio_latch_platform_data {
+	int base;
+	int num_gpios;
+	int *gpios;
+	int le_gpio_index;
+	bool le_active_low;
+};
+
+#endif /* _GPIO_LATCH_H_ */
diff --git a/trunk/target/linux/ar71xx/files/include/linux/platform_data/rb91x_nand.h b/trunk/target/linux/ar71xx/files/include/linux/platform_data/rb91x_nand.h
new file mode 100644
index 00000000..5f17fb81
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/include/linux/platform_data/rb91x_nand.h
@@ -0,0 +1,16 @@
+#ifndef _RB91X_NAND_H_
+#define _RB91X_NAND_H_
+
+#define RB91X_NAND_DRIVER_NAME	"rb91x-nand"
+
+struct rb91x_nand_platform_data {
+	int gpio_nce;	/* chip enable, active low */
+	int gpio_ale;	/* address latch enable */
+	int gpio_cle;   /* command latch enable */
+	int gpio_rdy;
+	int gpio_read;
+	int gpio_nrw;	/* read/write enable, active low */
+	int gpio_nle;	/* latch enable, active low */
+};
+
+#endif /* _RB91X_NAND_H_ */
\ No newline at end of file
diff --git a/trunk/target/linux/ar71xx/files/include/linux/spi/vsc7385.h b/trunk/target/linux/ar71xx/files/include/linux/spi/vsc7385.h
new file mode 100644
index 00000000..1072ad79
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/include/linux/spi/vsc7385.h
@@ -0,0 +1,19 @@
+/*
+ * Platform data definition for the Vitesse VSC7385 ethernet switch driver
+ *
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+struct vsc7385_platform_data {
+	void		(*reset)(void);
+	char		*ucode_name;
+	struct {
+		u32	tx_ipg:5;
+		u32	bit2:1;
+		u32	clk_sel:3;
+	} mac_cfg;
+};
diff --git a/trunk/target/linux/ar71xx/files/net/dsa/mv88e6063.c b/trunk/target/linux/ar71xx/files/net/dsa/mv88e6063.c
new file mode 100644
index 00000000..5638a9fe
--- /dev/null
+++ b/trunk/target/linux/ar71xx/files/net/dsa/mv88e6063.c
@@ -0,0 +1,294 @@
+/*
+ * net/dsa/mv88e6063.c - Driver for Marvell 88e6063 switch chips
+ * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This driver was base on: net/dsa/mv88e6060.c
+ *   net/dsa/mv88e6063.c - Driver for Marvell 88e6060 switch chips
+ *   Copyright (c) 2008-2009 Marvell Semiconductor
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/list.h>
+#include <linux/netdevice.h>
+#include <linux/phy.h>
+#include "dsa_priv.h"
+
+#define REG_BASE		0x10
+#define REG_PHY(p)		(REG_BASE + (p))
+#define REG_PORT(p)		(REG_BASE + 8 + (p))
+#define REG_GLOBAL		(REG_BASE + 0x0f)
+#define NUM_PORTS		7
+
+static int reg_read(struct dsa_switch *ds, int addr, int reg)
+{
+	return mdiobus_read(ds->master_mii_bus, addr, reg);
+}
+
+#define REG_READ(addr, reg)					\
+	({							\
+		int __ret;					\
+								\
+		__ret = reg_read(ds, addr, reg);		\
+		if (__ret < 0)					\
+			return __ret;				\
+		__ret;						\
+	})
+
+
+static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)
+{
+	return mdiobus_write(ds->master_mii_bus, addr, reg, val);
+}
+
+#define REG_WRITE(addr, reg, val)				\
+	({							\
+		int __ret;					\
+								\
+		__ret = reg_write(ds, addr, reg, val);		\
+		if (__ret < 0)					\
+			return __ret;				\
+	})
+
+static char *mv88e6063_probe(struct mii_bus *bus, int sw_addr)
+{
+	int ret;
+
+	ret = mdiobus_read(bus, REG_PORT(0), 0x03);
+	if (ret >= 0) {
+		ret &= 0xfff0;
+		if (ret == 0x1530)
+			return "Marvell 88E6063";
+	}
+
+	return NULL;
+}
+
+static int mv88e6063_switch_reset(struct dsa_switch *ds)
+{
+	int i;
+	int ret;
+
+	/*
+	 * Set all ports to the disabled state.
+	 */
+	for (i = 0; i < NUM_PORTS; i++) {
+		ret = REG_READ(REG_PORT(i), 0x04);
+		REG_WRITE(REG_PORT(i), 0x04, ret & 0xfffc);
+	}
+
+	/*
+	 * Wait for transmit queues to drain.
+	 */
+	msleep(2);
+
+	/*
+	 * Reset the switch.
+	 */
+	REG_WRITE(REG_GLOBAL, 0x0a, 0xa130);
+
+	/*
+	 * Wait up to one second for reset to complete.
+	 */
+	for (i = 0; i < 1000; i++) {
+		ret = REG_READ(REG_GLOBAL, 0x00);
+		if ((ret & 0x8000) == 0x0000)
+			break;
+
+		msleep(1);
+	}
+	if (i == 1000)
+		return -ETIMEDOUT;
+
+	return 0;
+}
+
+static int mv88e6063_setup_global(struct dsa_switch *ds)
+{
+	/*
+	 * Disable discarding of frames with excessive collisions,
+	 * set the maximum frame size to 1536 bytes, and mask all
+	 * interrupt sources.
+	 */
+	REG_WRITE(REG_GLOBAL, 0x04, 0x0800);
+
+	/*
+	 * Enable automatic address learning, set the address
+	 * database size to 1024 entries, and set the default aging
+	 * time to 5 minutes.
+	 */
+	REG_WRITE(REG_GLOBAL, 0x0a, 0x2130);
+
+	return 0;
+}
+
+static int mv88e6063_setup_port(struct dsa_switch *ds, int p)
+{
+	int addr = REG_PORT(p);
+
+	/*
+	 * Do not force flow control, disable Ingress and Egress
+	 * Header tagging, disable VLAN tunneling, and set the port
+	 * state to Forwarding.  Additionally, if this is the CPU
+	 * port, enable Ingress and Egress Trailer tagging mode.
+	 */
+	REG_WRITE(addr, 0x04, dsa_is_cpu_port(ds, p) ?  0x4103 : 0x0003);
+
+	/*
+	 * Port based VLAN map: give each port its own address
+	 * database, allow the CPU port to talk to each of the 'real'
+	 * ports, and allow each of the 'real' ports to only talk to
+	 * the CPU port.
+	 */
+	REG_WRITE(addr, 0x06,
+			((p & 0xf) << 12) |
+			 (dsa_is_cpu_port(ds, p) ?
+				ds->phys_port_mask :
+				(1 << ds->dst->cpu_port)));
+
+	/*
+	 * Port Association Vector: when learning source addresses
+	 * of packets, add the address to the address database using
+	 * a port bitmap that has only the bit for this port set and
+	 * the other bits clear.
+	 */
+	REG_WRITE(addr, 0x0b, 1 << p);
+
+	return 0;
+}
+
+static int mv88e6063_setup(struct dsa_switch *ds)
+{
+	int i;
+	int ret;
+
+	ret = mv88e6063_switch_reset(ds);
+	if (ret < 0)
+		return ret;
+
+	/* @@@ initialise atu */
+
+	ret = mv88e6063_setup_global(ds);
+	if (ret < 0)
+		return ret;
+
+	for (i = 0; i < NUM_PORTS; i++) {
+		ret = mv88e6063_setup_port(ds, i);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+static int mv88e6063_set_addr(struct dsa_switch *ds, u8 *addr)
+{
+	REG_WRITE(REG_GLOBAL, 0x01, (addr[0] << 8) | addr[1]);
+	REG_WRITE(REG_GLOBAL, 0x02, (addr[2] << 8) | addr[3]);
+	REG_WRITE(REG_GLOBAL, 0x03, (addr[4] << 8) | addr[5]);
+
+	return 0;
+}
+
+static int mv88e6063_port_to_phy_addr(int port)
+{
+	if (port >= 0 && port <= NUM_PORTS)
+		return REG_PHY(port);
+	return -1;
+}
+
+static int mv88e6063_phy_read(struct dsa_switch *ds, int port, int regnum)
+{
+	int addr;
+
+	addr = mv88e6063_port_to_phy_addr(port);
+	if (addr == -1)
+		return 0xffff;
+
+	return reg_read(ds, addr, regnum);
+}
+
+static int
+mv88e6063_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val)
+{
+	int addr;
+
+	addr = mv88e6063_port_to_phy_addr(port);
+	if (addr == -1)
+		return 0xffff;
+
+	return reg_write(ds, addr, regnum, val);
+}
+
+static void mv88e6063_poll_link(struct dsa_switch *ds)
+{
+	int i;
+
+	for (i = 0; i < DSA_MAX_PORTS; i++) {
+		struct net_device *dev;
+		int uninitialized_var(port_status);
+		int link;
+		int speed;
+		int duplex;
+		int fc;
+
+		dev = ds->ports[i];
+		if (dev == NULL)
+			continue;
+
+		link = 0;
+		if (dev->flags & IFF_UP) {
+			port_status = reg_read(ds, REG_PORT(i), 0x00);
+			if (port_status < 0)
+				continue;
+
+			link = !!(port_status & 0x1000);
+		}
+
+		if (!link) {
+			if (netif_carrier_ok(dev)) {
+				printk(KERN_INFO "%s: link down\n", dev->name);
+				netif_carrier_off(dev);
+			}
+			continue;
+		}
+
+		speed = (port_status & 0x0100) ? 100 : 10;
+		duplex = (port_status & 0x0200) ? 1 : 0;
+		fc = ((port_status & 0xc000) == 0xc000) ? 1 : 0;
+
+		if (!netif_carrier_ok(dev)) {
+			printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, "
+					 "flow control %sabled\n", dev->name,
+					 speed, duplex ? "full" : "half",
+					 fc ? "en" : "dis");
+			netif_carrier_on(dev);
+		}
+	}
+}
+
+static struct dsa_switch_driver mv88e6063_switch_driver = {
+	.tag_protocol	= htons(ETH_P_TRAILER),
+	.probe		= mv88e6063_probe,
+	.setup		= mv88e6063_setup,
+	.set_addr	= mv88e6063_set_addr,
+	.phy_read	= mv88e6063_phy_read,
+	.phy_write	= mv88e6063_phy_write,
+	.poll_link	= mv88e6063_poll_link,
+};
+
+static int __init mv88e6063_init(void)
+{
+	register_switch_driver(&mv88e6063_switch_driver);
+	return 0;
+}
+module_init(mv88e6063_init);
+
+static void __exit mv88e6063_cleanup(void)
+{
+	unregister_switch_driver(&mv88e6063_switch_driver);
+}
+module_exit(mv88e6063_cleanup);
diff --git a/trunk/target/linux/ar71xx/generic/config-default b/trunk/target/linux/ar71xx/generic/config-default
new file mode 100644
index 00000000..45169689
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/config-default
@@ -0,0 +1 @@
+CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd"
diff --git a/trunk/target/linux/ar71xx/generic/profiles/00-default.mk b/trunk/target/linux/ar71xx/generic/profiles/00-default.mk
new file mode 100644
index 00000000..36c4aa61
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/00-default.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Default
+	NAME:=Default Profile (all drivers)
+	PACKAGES:= \
+		kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/Default/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,Default))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/01-minimal.mk b/trunk/target/linux/ar71xx/generic/profiles/01-minimal.mk
new file mode 100644
index 00000000..dfaa3b0b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/01-minimal.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Minimal
+	NAME:=Minimal Profile (no drivers)
+	PACKAGES:=-kmod-ath9k -wpad-mini
+endef
+
+define Profile/Minimal/Description
+	Minimal package set compatible with most boards.
+endef
+$(eval $(call Profile,Minimal))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/8devices.mk b/trunk/target/linux/ar71xx/generic/profiles/8devices.mk
new file mode 100644
index 00000000..209403ae
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/8devices.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/CARAMBOLA2
+        NAME:=Carambola2 board from 8Devices
+        PACKAGES:=kmod-usb-core kmod-usb2
+endef
+
+define Profile/CARAMBOLA2/Description
+        Package set optimized for the 8devices Carambola2 board.
+endef
+
+$(eval $(call Profile,CARAMBOLA2))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/nclink.mk b/trunk/target/linux/ar71xx/generic/profiles/nclink.mk
new file mode 100644
index 00000000..04eb9ec5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/nclink.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/SMART-300
+        NAME:=NC-LINK SMART-300
+endef
+
+define Profile/SMART-300/Description
+        Package set optimized for the NC-LINK SMART-300.
+endef
+$(eval $(call Profile,SMART-300))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/netgear.mk b/trunk/target/linux/ar71xx/generic/profiles/netgear.mk
new file mode 100644
index 00000000..751dbb66
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/netgear.mk
@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WNDAP360
+        NAME:=NETGEAR WNDAP360
+        PACKAGES:=
+endef
+
+define Profile/WNDAP360/Description
+        Package set optimized for the NETGEAR WNDAP360
+endef
+
+$(eval $(call Profile,WNDAP360))
+
+define Profile/WNDR3700
+	NAME:=NETGEAR WNDR3700/WNDR3800/WNDRMAC
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev kmod-leds-wndr3700-usb
+endef
+
+define Profile/WNDR3700/Description
+	Package set optimized for the NETGEAR WNDR3700/WNDR3800/WNDRMAC
+endef
+
+$(eval $(call Profile,WNDR3700))
+
+define Profile/WNR2000V3
+	NAME:=NETGEAR WNR2000V3
+endef
+
+define Profile/WNR2000V3/Description
+	Package set optimized for the NETGEAR WNR2000V3
+endef
+
+$(eval $(call Profile,WNR2000V3))
+
+
+define Profile/WNR2000V4
+	NAME:=NETGEAR WNR2000V4
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/WNR2000V4/Description
+	Package set optimized for the NETGEAR WNR2000V4
+endef
+
+$(eval $(call Profile,WNR2000V4))
+
+
+define Profile/WNR612V2
+	NAME:=NETGEAR WNR612V2 / On Networks N150
+endef
+
+define Profile/WNR612V2/Description
+	Package set optimized for the NETGEAR WNR612V2 / On Networks N150
+endef
+
+$(eval $(call Profile,WNR612V2))
+
+
+define Profile/WNR2200
+	NAME:=NETGEAR WNR2200
+endef
+
+define Profile/WNR2200/Description
+	Package set optimized for the NETGEAR WNR2200
+endef
+
+$(eval $(call Profile,WNR2200))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/planex.mk b/trunk/target/linux/ar71xx/generic/profiles/planex.mk
new file mode 100644
index 00000000..3d192ba7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/planex.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/MZKW04NU
+	NAME:=Planex MZK-W04NU
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/MZKW04NU/Description
+	Package set optimized for the Planex MZK-W04NU.
+endef
+
+$(eval $(call Profile,MZKW04NU))
+
+define Profile/MZKW300NH
+	NAME:=Planex MZK-W300NH
+	PACKAGES:=
+endef
+
+define Profile/MZKW300NH/Description
+	Package set optimized for the Planex MZK-W300NH.
+endef
+
+$(eval $(call Profile,MZKW300NH))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/rosewill.mk b/trunk/target/linux/ar71xx/generic/profiles/rosewill.mk
new file mode 100644
index 00000000..00c1d7d1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/rosewill.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/RNXN360RT
+	NAME:=Rosewill RNX-N360RT
+	PACKAGES:=
+endef
+
+define Profile/RNXN360RT/Description
+	Package set optimized for the Rosewill RNX-N360RT.
+endef
+$(eval $(call Profile,RNXN360RT))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/senao.mk b/trunk/target/linux/ar71xx/generic/profiles/senao.mk
new file mode 100644
index 00000000..20a79e98
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/senao.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/CAP4200AG
+	NAME:=Senao CAP4200AG
+	PACKAGES:=kmod-ath9k
+endef
+
+define Profile/CAP4200AG/Description
+	Package set optimized for the Senao CAP4200AG.
+endef
+
+$(eval $(call Profile,CAP4200AG))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/sitecom.mk b/trunk/target/linux/ar71xx/generic/profiles/sitecom.mk
new file mode 100644
index 00000000..3dd8e435
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/sitecom.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+define Profile/WLR8100
+        NAME:=Sitecom WLR-8100
+        PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-usb3
+endef
+
+define Profile/WLR8100/Description
+        Package set optimized for the Sitecom WLR-8100
+endef
+
+$(eval $(call Profile,WLR8100))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/tp-link.mk b/trunk/target/linux/ar71xx/generic/profiles/tp-link.mk
new file mode 100644
index 00000000..cded1a0d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/tp-link.mk
@@ -0,0 +1,355 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+
+define Profile/CPE510
+	NAME:=TP-LINK CPE210/220/510/520
+	PACKAGES:=rssileds
+endef
+
+define Profile/CPE510/Description
+	Package set optimized for the TP-LINK CPE210/220/510/520.
+endef
+$(eval $(call Profile,CPE510))
+
+
+define Profile/TLMR10U
+	NAME:=TP-LINK TL-MR10U
+	PACKAGES:=kmod-usb-core kmod-usb2
+endef
+
+define Profile/TLMR10U/Description
+	Package set optimized for the TP-LINK TL-MR10U.
+endef
+$(eval $(call Profile,TLMR10U))
+
+
+define Profile/TLMR11U
+	NAME:=TP-LINK TL-MR11U
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR11U/Description
+	Package set optimized for the TP-LINK TL-MR11U.
+endef
+$(eval $(call Profile,TLMR11U))
+
+
+define Profile/TLMR13U
+	NAME:=TP-LINK TL-MR13U
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR13U/Description
+	Package set optimized for the TP-LINK TL-MR13U.
+endef
+$(eval $(call Profile,TLMR13U))
+
+
+define Profile/TLMR3020
+	NAME:=TP-LINK TL-MR3020
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3020/Description
+	Package set optimized for the TP-LINK TL-MR3020.
+endef
+$(eval $(call Profile,TLMR3020))
+
+
+define Profile/TLMR3040
+	NAME:=TP-LINK TL-MR3040
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3040/Description
+	Package set optimized for the TP-LINK TL-MR3040.
+endef
+$(eval $(call Profile,TLMR3040))
+
+
+define Profile/TLMR3220
+	NAME:=TP-LINK TL-MR3220
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3220/Description
+	Package set optimized for the TP-LINK TL-MR3220.
+endef
+$(eval $(call Profile,TLMR3220))
+
+
+define Profile/TLMR3420
+	NAME:=TP-LINK TL-MR3420
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3420/Description
+	Package set optimized for the TP-LINK TL-MR3420.
+endef
+$(eval $(call Profile,TLMR3420))
+
+
+define Profile/TLWR703
+	NAME:=TP-LINK TL-WR703N
+	PACKAGES:=kmod-usb-core kmod-usb2
+endef
+
+
+define Profile/TLWR703/Description
+	Package set optimized for the TP-LINK TL-WR703N.
+endef
+$(eval $(call Profile,TLWR703))
+
+
+define Profile/TLWR710
+	NAME:=TP-LINK TL-WR710N
+	PACKAGES:=kmod-usb-core kmod-usb2
+endef
+
+
+define Profile/TLWR710/Description
+	Package set optimized for the TP-LINK TL-WR710N.
+endef
+$(eval $(call Profile,TLWR710))
+
+
+define Profile/TLWR720
+	NAME:=TP-LINK TL-WR720N
+	PACKAGES:=kmod-usb-core kmod-usb2
+endef
+
+
+define Profile/TLWR720/Description
+	Package set optimized for the TP-LINK TL-WR720N.
+endef
+$(eval $(call Profile,TLWR720))
+
+
+define Profile/TLWA701
+	NAME:=TP-LINK TL-WA701N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWA701/Description
+	Package set optimized for the TP-LINK TL-WA701N/ND.
+endef
+$(eval $(call Profile,TLWA701))
+
+define Profile/TLWA730RE
+	NAME:=TP-LINK TL-WA730RE
+	PACKAGES:=
+endef
+
+define Profile/TLWA730RE/Description
+	Package set optimized for the TP-LINK TL-WA730RE.
+endef
+$(eval $(call Profile,TLWA730RE))
+
+define Profile/TLWA750
+	NAME:=TP-LINK TL-WA750RE
+	PACKAGES:=rssileds
+endef
+
+define Profile/TLWA750/Description
+	Package set optimized for the TP-LINK TL-WA750RE.
+endef
+$(eval $(call Profile,TLWA750))
+
+
+define Profile/TLWA7510
+	NAME:=TP-LINK TL-WA7510N
+	PACKAGES:=
+endef
+
+define Profile/TLWA7510/Description
+	Package set optimized for the TP-LINK TL-WA7510N.
+endef
+$(eval $(call Profile,TLWA7510))
+
+define Profile/TLWA801
+	NAME:=TP-LINK TL-WA801N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWA801/Description
+	Package set optimized for the TP-LINK TL-WA801N/ND.
+endef
+$(eval $(call Profile,TLWA801))
+
+define Profile/TLWA830
+	NAME:=TP-LINK TL-WA830RE
+	PACKAGES:=
+endef
+
+define Profile/TLWA830/Description
+	Package set optimized for the TP-LINK TL-WA830RE.
+endef
+$(eval $(call Profile,TLWA830))
+
+
+define Profile/TLWA850
+	NAME:=TP-LINK TL-WA850RE
+	PACKAGES:=rssileds
+endef
+
+define Profile/TLWA850/Description
+	Package set optimized for the TP-LINK TL-WA850RE.
+endef
+$(eval $(call Profile,TLWA850))
+
+
+define Profile/TLWA860
+	NAME:=TP-LINK TL-WA860RE
+	PACKAGES:=
+endef
+
+define Profile/TLWA860/Description
+	Package set optimized for the TP-LINK TL-WA860RE.
+endef
+$(eval $(call Profile,TLWA860))
+
+
+define Profile/TLWA901
+	NAME:=TP-LINK TL-WA901N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWA901/Description
+	Package set optimized for the TP-LINK TL-WA901N/ND.
+endef
+$(eval $(call Profile,TLWA901))
+
+
+define Profile/TLWDR4300
+	NAME:=TP-LINK TL-WDR3500/3600/4300/4310/MW4350R
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWDR4300/Description
+	Package set optimized for the TP-LINK TL-WDR3500/3600/4300/4310/MW4350R.
+endef
+$(eval $(call Profile,TLWDR4300))
+
+
+define Profile/TLWDR4900V2
+	NAME:=TP-LINK TL-WDR4900v2
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWDR4900V2/Description
+	Package set optimized for the TP-LINK TL-WDR4900v2.
+endef
+$(eval $(call Profile,TLWDR4900V2))
+
+
+define Profile/TLWR740
+	NAME:=TP-LINK TL-WR740N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWR740/Description
+	Package set optimized for the TP-LINK TL-WR740N/ND.
+endef
+$(eval $(call Profile,TLWR740))
+
+
+define Profile/TLWR741
+	NAME:=TP-LINK TL-WR741N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWR741/Description
+	Package set optimized for the TP-LINK TL-WR741N/ND.
+endef
+$(eval $(call Profile,TLWR741))
+
+define Profile/TLWR741-luci
+        NAME:=TP-LINK TL-WR741N/ND Luci
+        PACKAGES:=luci luci-proto-relay
+endef
+
+define Profile/TLWR741-luci/Description
+        Package set optimized for the TP-LINK TL-WR741N/ND with the luci web-ui.
+endef
+$(eval $(call Profile,TLWR741-luci))
+
+define Profile/TLWR743
+	NAME:=TP-LINK TL-WR743N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWR743/Description
+	Package set optimized for the TP-LINK TL-WR743N/ND.
+endef
+$(eval $(call Profile,TLWR743))
+
+
+define Profile/TLWR841
+	NAME:=TP-LINK TL-WR841N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWR841/Description
+	Package set optimized for the TP-LINK TL-WR841N/ND.
+endef
+$(eval $(call Profile,TLWR841))
+
+
+define Profile/TLWR842
+	NAME:=TP-LINK TL-WR842N/ND
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWR842/Description
+	Package set optimized for the TP-LINK TL-WR842N/ND.
+endef
+$(eval $(call Profile,TLWR842))
+
+
+define Profile/TLWR941
+	NAME:=TP-LINK TL-WR941N/ND
+	PACKAGES:=
+endef
+
+define Profile/TLWR941/Description
+	Package set optimized for the TP-LINK TL-WR941N/ND.
+endef
+$(eval $(call Profile,TLWR941))
+
+
+define Profile/TLWR1041
+	NAME:=TP-LINK TL-WR1041N
+	PACKAGES:=
+endef
+
+define Profile/TLWR1041/Description
+	Package set optimized for the TP-LINK TL-WR1041N/ND.
+endef
+$(eval $(call Profile,TLWR1041))
+
+
+define Profile/TLWR1043
+	NAME:=TP-LINK TL-WR1043N/ND
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWR1043/Description
+	Package set optimized for the TP-LINK TL-WR1043N/ND.
+endef
+$(eval $(call Profile,TLWR1043))
+
+
+define Profile/TLWR2543
+	NAME:=TP-LINK TL-WR2543N/ND
+	PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWR2543/Description
+	Package set optimized for the TP-LINK TL-WR2543N/ND.
+endef
+$(eval $(call Profile,TLWR2543))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/trendnet.mk b/trunk/target/linux/ar71xx/generic/profiles/trendnet.mk
new file mode 100644
index 00000000..42d05b60
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/trendnet.mk
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/TEW632BRP
+	NAME:=TRENDNet TEW-632BRP
+	PACKAGES:=
+endef
+
+define Profile/TEW632BRP/Description
+	Package set optimized for the TRENDNet TEW-632BRP.
+endef
+
+$(eval $(call Profile,TEW632BRP))
+
+define Profile/TEW652BRP
+	NAME:=TRENDNet TEW-652BRP
+	PACKAGES:=
+endef
+
+define Profile/TEW652BRP/Description
+	Package set optimized for the TRENDNet TEW-652BRP.
+endef
+
+$(eval $(call Profile,TEW652BRP))
+
+define Profile/TEW673GRU
+	NAME:=TRENDNet TEW-673GRU
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+
+define Profile/TEW673GRU/Description
+	Package set optimized for the TRENDNet TEW-673GRU.
+endef
+
+$(eval $(call Profile,TEW673GRU))
+
+define Profile/TEW712BR
+	NAME:=TRENDNet TEW-712BR
+	PACKAGES:=
+endef
+
+define Profile/TEW712BR/Description
+	Package set optimized for the TRENDNet TEW-712BR.
+endef
+
+$(eval $(call Profile,TEW712BR))
+
+
+define Profile/TEW732BR
+	NAME:=TRENDNet TEW-732BR
+	PACKAGES:=
+endef
+
+define Profile/TEW732BR/Description
+	Package set optimized for the TRENDNet TEW-732BR.
+endef
+
+$(eval $(call Profile,TEW732BR))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/ubnt.mk b/trunk/target/linux/ar71xx/generic/profiles/ubnt.mk
new file mode 100644
index 00000000..d8e24d00
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/ubnt.mk
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/UBNTRS
+	NAME:=Ubiquiti RouterStation
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+
+define Profile/UBNTRS/Description
+	Package set optimized for the Ubiquiti RouterStation.
+endef
+
+$(eval $(call Profile,UBNTRS))
+
+define Profile/UBNTRSPRO
+	NAME:=Ubiquiti RouterStation Pro
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+
+define Profile/UBNTRSPRO/Description
+	Package set optimized for the Ubiquiti RouterStation Pro.
+endef
+
+$(eval $(call Profile,UBNTRSPRO))
+
+define Profile/UBNTUNIFI
+	NAME:=Ubiquiti UniFi AP
+	PACKAGES:=
+endef
+
+define Profile/UBNTUNIFI/Description
+	Package set optimized for the Ubiquiti UniFi AP.
+endef
+
+$(eval $(call Profile,UBNTUNIFI))
+
+define Profile/UBNTUNIFIOUTDOOR
+	NAME:=Ubiquiti UniFiAP Outdoor
+	PACKAGES:=
+endef
+
+define Profile/UBNTUNIFIOUTDOOR/Description
+	Package set optimized for the Ubiquiti UniFiAP Outdoor.
+endef
+
+$(eval $(call Profile,UBNTUNIFIOUTDOOR))
+
+define Profile/UAPPRO
+	NAME:=Ubiquiti UniFi AP Pro
+	PACKAGES:=
+endef
+
+define Profile/UAPPRO/Description
+	Package set optimized for the Ubiquiti UniFi AP Pro.
+endef
+
+$(eval $(call Profile,UAPPRO))
+
+
+define Profile/UBNT
+	NAME:=Ubiquiti Products
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+
+define Profile/UBNT/Description
+	Build images for all Ubiquiti products (including LS-SR71, RouterStation and RouterStation Pro)
+endef
+
+$(eval $(call Profile,UBNT))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/wd.mk b/trunk/target/linux/ar71xx/generic/profiles/wd.mk
new file mode 100644
index 00000000..b8cb99b9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/wd.mk
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/MYNETN600
+	NAME:=WD My Net N600
+	PACKAGES:=kmod-usb-core kmod-usb2
+endef
+
+define Profile/MYNETN600/Description
+  Package set optimized for the WD My Net N600 device.
+endef
+$(eval $(call Profile,MYNETN600))
+
+define Profile/MYNETN750
+	NAME:=WD My Net N750
+	PACKAGES:=kmod-usb-core kmod-usb2
+endef
+define Profile/MYNETN750/Description
+  Package set optimized for the WD My Net N750 device.
+endef
+
+$(eval $(call Profile,MYNETN750))
+
+define Profile/MYNETREXT
+	NAME:=WD My Net Wi-Fi Range Extender
+	PACKAGES:=rssileds
+endef
+
+define Profile/MYNETREXT/Description
+  Package set optimized for the WD My Net Wi-Fi Range Extender device.
+endef
+$(eval $(call Profile,MYNETREXT))
diff --git a/trunk/target/linux/ar71xx/generic/profiles/zcomax.mk b/trunk/target/linux/ar71xx/generic/profiles/zcomax.mk
new file mode 100644
index 00000000..b9ab77e8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/profiles/zcomax.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/ZCN1523H28
+	NAME:=Zcomax ZCN-1523H-2-8
+	PACKAGES:=
+endef
+
+define Profile/ZCN1523H28/Description
+	Package set optimized for the Zcomax ZCN-1523H-2-8 board.
+endef
+
+$(eval $(call Profile,ZCN1523H28))
+
+define Profile/ZCN1523H516
+	NAME:=Zcomax ZCN-1523H-5-16
+	PACKAGES:=
+endef
+
+define Profile/ZCN1523H516/Description
+	Package set optimized for the Zcomax ZCN-1523H-5-16 board.
+endef
+
+$(eval $(call Profile,ZCN1523H516))
diff --git a/trunk/target/linux/ar71xx/generic/target.mk b/trunk/target/linux/ar71xx/generic/target.mk
new file mode 100644
index 00000000..64eb205e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/generic/target.mk
@@ -0,0 +1,8 @@
+BOARDNAME:=Generic
+FEATURES += squashfs
+
+define Target/Description
+	Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards.
+endef
+
+
diff --git a/trunk/target/linux/ar71xx/image/Makefile b/trunk/target/linux/ar71xx/image/Makefile
new file mode 100644
index 00000000..da88b4dc
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/Makefile
@@ -0,0 +1,1234 @@
+#
+# Copyright (C) 2008-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+
+IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default)
+
+JFFS2_BLOCKSIZE = 64k 128k 256k
+
+rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
+
+# $(1): rootfs type.
+# $(2): board name.
+define imgname
+$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(call rootfs_type,$(1))
+endef
+
+define rootfs_align
+$(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1))))))
+endef
+
+define sysupname
+$(call imgname,$(1),$(2))-sysupgrade.bin
+endef
+
+define factoryname
+$(call imgname,$(1),$(2))-factory.bin
+endef
+
+COMMA:=,
+
+define mkcmdline
+$(if $(1),board=$(1) )$(if $(2),console=$(2)$(COMMA)$(3))
+endef
+
+define mtdpartsize
+$(shell sz=`echo '$(2)' | sed -ne 's/.*[:$(COMMA)]\([0-9]*\)k[@]*[0-9a-zx]*($(1)).*/\1/p'`; [ -n "$$sz" ] && echo $$(($$sz * 1024)))
+endef
+
+SINGLE_PROFILES:=
+
+# $(1)      : name of image build method to be used, e.g., TPLINK-LZMA, AthLzma.
+# $(2)      : name of the build template to be used, e.g. 64k, 64kraw, 128k, etc.
+# $(3)      : name of the profile to be defined.
+# $(4)      : board name.
+# $(5)~$(7) : arguments for $(mkcmdline)
+#		board=$(1) console=$(2),$(3)
+# $(8)~$(14): extra arguments.
+define SingleProfile
+  # $(1): action name, e.g. loader, buildkernel, squashfs, etc.
+  define Image/Build/Profile/$(3)
+	$$(call Image/Build/Template/$(2)/$$(1),$(1),$(4),$$(call mkcmdline,$(5),$(6),$(7)),$(8),$(9),$(10),$(11),$(12),$(13),$(14))
+  endef
+  SINGLE_PROFILES += $(3)
+endef
+
+# $(1), name of the MultiProfile to be added.
+# $(2), name of Profiles to be included in the MultiProfile.
+define MultiProfile
+  define Image/Build/Profile/$(1)
+	$(foreach p,$(2),
+		$$(call Image/Build/Profile/$p,$$(1))
+	)
+  endef
+endef
+
+LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
+
+KDIR_TMP:=$(KDIR)/tmp
+VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
+UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
+
+# $(1): input file.
+# $(2): output file.
+# $(3): extra arguments for lzma.
+define CompressLzma
+  $(STAGING_DIR_HOST)/bin/lzma e $(1) -lc1 -lp2 -pb2 $(3) $(2)
+endef
+
+define PatchKernel
+	cp $(KDIR)/vmlinux$(3) $(KDIR_TMP)/vmlinux$(3)-$(1)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux$(3)-$(1) "$(strip $(2))"
+endef
+
+define PatchKernel/initramfs
+	$(call PatchKernel,$(1),$(2),-initramfs)
+	cp $(KDIR_TMP)/vmlinux-initramfs-$(1) $(call imgname,initramfs,$(1)).bin
+endef
+
+# $(1): board name.
+# $(2): kernel command line.
+# $(3): extra argumetns for lzma.
+# $(4): name suffix, e.g. "-initramfs".
+define PatchKernelLzma
+	cp $(KDIR)/vmlinux$(4) $(KDIR_TMP)/vmlinux$(4)-$(1)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux$(4)-$(1) "$(strip $(2))"
+	$(call CompressLzma,$(KDIR_TMP)/vmlinux$(4)-$(1),$(KDIR_TMP)/vmlinux$(4)-$(1).bin.lzma,$(3))
+endef
+
+define PatchKernelGzip
+	cp $(KDIR)/vmlinux$(3) $(KDIR_TMP)/vmlinux$(3)-$(1)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux$(3)-$(1) "$(strip $(2))"
+	gzip -9 -c $(KDIR_TMP)/vmlinux$(3)-$(1) > $(KDIR_TMP)/vmlinux$(3)-$(1).bin.gz
+endef
+
+ifneq ($(SUBTARGET),mikrotik)
+# $(1): compression method of the data.
+# $(2): extra arguments.
+# $(3): input data file.
+# $(4): output file.
+define MkuImage
+	mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) $(2) \
+		-e 0x80060000 -n 'MIPS libreCMC Linux-$(LINUX_VERSION)' \
+		-d $(3) $(4)
+endef
+
+# $(1): board name.
+# $(2): kernel command line.
+# $(3): extra arguments for lzma.
+# $(4): name suffix, e.g. "-initramfs".
+# $(5): extra arguments for mkimage.
+define MkuImageLzma
+	$(call PatchKernelLzma,$(1),$(2),$(3),$(4))
+	$(call MkuImage,lzma,$(5),$(KDIR_TMP)/vmlinux$(4)-$(1).bin.lzma,$(KDIR_TMP)/vmlinux$(4)-$(1).uImage)
+endef
+
+define MkuImageLzma/initramfs
+	$(call PatchKernelLzma,$(1),$(2),$(3),-initramfs)
+	$(call MkuImage,lzma,$(4),$(KDIR_TMP)/vmlinux-initramfs-$(1).bin.lzma,$(call imgname,initramfs,$(1))-uImage.bin)
+endef
+
+define MkuImageGzip
+	$(call PatchKernelGzip,$(1),$(2))
+	$(call MkuImage,gzip,,$(KDIR_TMP)/vmlinux-$(1).bin.gz,$(KDIR_TMP)/vmlinux-$(1).uImage)
+endef
+
+define MkuImageGzip/initramfs
+	$(call PatchKernelGzip,$(1),$(2),-initramfs)
+	$(call MkuImage,gzip,,$(KDIR_TMP)/vmlinux-initramfs-$(1).bin.gz,$(call imgname,initramfs,$(1))-uImage.bin)
+endef
+
+define MkuImageOKLI
+	$(call MkuImage,lzma,-M 0x4f4b4c49,$(KDIR)/vmlinux.bin.lzma,$(KDIR_TMP)/vmlinux-$(1).okli)
+endef
+endif
+
+# $(1): name of the 1st file.
+# $(2): size limit of the 1st file if it is greater than 262144, or
+#       the erase size of the flash if it is greater than zero and less
+#       than 262144
+# $(3): name of the 2nd file.
+# $(4): size limit of the 2nd file if $(2) is greater than 262144, otherwise
+#       it is the size limit of the output file
+# $(5): name of the output file.
+# $(6): padding size.
+define CatFiles
+	if [ $(2) -eq 0 ]; then \
+		filename="$(3)"; fstype=$$$${filename##*\.}; \
+		case "$$$${fstype}" in \
+		"jffs2-64k") bs=65536;; \
+		"jffs2-128k") bs=131072;; \
+		"jffs2-256k") bs=262144;; \
+		*) bs=`stat -c%s $(1)`;; \
+		esac; \
+		( dd if=$(1) bs=$$$${bs} conv=sync;  cat $(3) ) > $(5); \
+		if [ -n "$(6)" ]; then \
+			case "$$$${fstype}" in \
+			squashfs*) \
+				padjffs2 $(5) $(6); \
+				;; \
+			esac; \
+		fi; \
+		if [ `stat -c%s $(5)` -gt $(4) ]; then \
+			echo "Warning: $(5) is too big (> $(4) bytes)" >&2; \
+			rm -f $(5); \
+		fi; \
+	else if [ $(2) -gt 262144 ]; then \
+		if [ `stat -c%s "$(1)"` -gt $(2) ]; then \
+			echo "Warning: $(1) is too big (> $(2) bytes)" >&2; \
+		else if [ `stat -c%s $(3)` -gt $(4) ]; then \
+			echo "Warning: $(3) is too big (> $(4) bytes)" >&2; \
+		else \
+			( dd if=$(1) bs=$(2) conv=sync; dd if=$(3) ) > $(5); \
+		fi; fi; \
+	else \
+		( dd if=$(1) bs=$(2) conv=sync; dd if=$(3) ) > $(5); \
+		if [ `stat -c%s $(5)` -gt $(4) ]; then \
+			echo "Warning: $(5) is too big (> $(4) bytes)" >&2; \
+			rm -f $(5); \
+		fi; \
+	fi; fi
+endef
+
+# $(1): rootfs type.
+# $(2): board name.
+# $(3): kernel image size limit.
+# $(4): rootfs image size limit.
+# $(5): padding argument for padjffs2.
+Sysupgrade/KR=$(call CatFiles,$(2),$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(5)))
+Sysupgrade/KRuImage=$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2).uImage,$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(2)),$(5))
+Sysupgrade/RKuImage=$(call CatFiles,$(KDIR)/root.$(1),$(4),$(KDIR_TMP)/vmlinux-$(2).uImage,$(3),$(call sysupname,$(1),$(2)))
+
+# $(1): ubinize ini file
+# $(2): working directory
+# $(3): output file
+# $(4): physical erase block size
+# $(5): minimum I/O unit size
+# $(6): custom options
+define ubinize
+	$(CP) $(1) $(2)
+	( cd $(2); $(STAGING_DIR_HOST)/bin/ubinize -o $(3) -p $(4) -m $(5) $(6) $(1))
+endef
+
+#
+# Embed lzma-compressed kernel inside lzma-loader.
+#
+# $(1), suffix of output filename, e.g. generic, lowercase board name, etc.
+# $(2), suffix of target file to build, e.g. bin, gz, elf
+# $(3), kernel command line to pass from lzma-loader to kernel
+# $(4), unused here
+# $(5), suffix of kernel filename, e.g. -initramfs, or empty
+define Image/BuildLoader
+	-rm -rf $(KDIR)/lzma-loader
+	$(LOADER_MAKE) LOADER=loader-$(1).$(2) KERNEL_CMDLINE="$(3)"\
+		LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \
+		LOADER_DATA="$(KDIR)/vmlinux$(5).bin.lzma" BOARD="$(1)" \
+		compile loader.$(2)
+	-$(CP) $(KDIR)/loader-$(1).$(2) $(KDIR)/loader-$(1)$(5).$(2)
+endef
+
+#
+# Build lzma-loader alone which will search for lzma-compressed kernel identified by
+# uImage header with magic "OKLI" at boot time.
+#
+# $(4), offset into the flash space to start searching uImage magic "OKLI".
+# $(5), size of search range starting at $(4).  With 0 as the value, uImage
+#	header is expected to be at precisely $(4)
+define Image/BuildLoaderAlone
+	-rm -rf $(KDIR)/lzma-loader
+	$(LOADER_MAKE) LOADER=loader-$(1).$(2) KERNEL_CMDLINE="$(3)" \
+		LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \
+		BOARD="$(1)" FLASH_OFFS=$(4) FLASH_MAX=$(5) \
+		compile loader.$(2)
+endef
+
+define Build/Clean
+	$(LOADER_MAKE) clean
+endef
+
+
+alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware)
+alfa_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)
+alfa_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15936k(firmware),64k(nvram),64k(art)ro
+all0258n_mtdlayout=mtdparts=spi0.0:256k(u-boot),64k(u-boot-env),6272k(firmware),1536k(failsafe),64k(art)
+all0315n_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env),13568k(firmware),2048k(failsafe),256k(art)ro
+ap81_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,5120k(rootfs),2688k(kernel),64k(art)ro,7808k@0x50000(firmware)
+ap83_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,4096k(rootfs),3648k(kernel),64k(art)ro,7744k@0x60000(firmware)
+ap96_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1728k(kernel),64k(art)ro,7872k@0x40000(firmware)
+ap113_mtd_layout=mtdparts=spi0.0:64k(u-boot),3008k(rootfs),896k(uImage),64k(NVRAM),64k(ART),3904k@0x10000(firmware)
+ap121_mtdlayout_2M=mtdparts=spi0.0:64k(u-boot)ro,1216k(rootfs),704k(kernel),64k(art)ro,1920k@0x10000(firmware)
+ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware)
+carambola2_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
+ap132_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),6400k(rootfs),64k(art),7808k@0x50000(firmware)
+ap135_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware)
+ap136_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(mib0),64k(art)ro,7744k@0x50000(firmware)
+bxu2000n2_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),8448k(rootfs),6016k(user),64k(cfg),64k(oem),64k(art)ro
+cameo_ap81_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,3840k(firmware),64k(art)ro
+cameo_ap91_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(nvram)ro,3712k(firmware),64k(mac)ro,64k(art)ro
+cameo_ap99_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(nvram)ro,3520k(firmware),64k(mac)ro,192k(lp)ro,64k(art)ro
+cameo_ap121_mtdlayout=mtdparts=spi0.0:64k(u-boot)ro,64k(art)ro,64k(mac)ro,64k(nvram)ro,192k(language)ro,3648k(firmware)
+cameo_ap121_mtdlayout_8M=mtdparts=spi0.0:64k(u-boot)ro,64k(art)ro,64k(mac)ro,64k(nvram)ro,256k(language)ro,7680k@0x80000(firmware)
+cameo_db120_mtdlayout=mtdparts=spi0.0:64k(uboot)ro,64k(nvram)ro,15936k(firmware),192k(lang)ro,64k(mac)ro,64k(art)ro
+cameo_db120_mtdlayout_8M=mtdparts=spi0.0:64k(uboot)ro,64k(nvram)ro,7872k(firmware),128k(lang)ro,64k(art)ro
+cap4200ag_mtdlayout=mtdparts=spi0.0:256k(u-boot),64k(u-boot-env),320k(custom)ro,1536k(kernel),12096k(rootfs),2048k(failsafe),64k(art),13632k@0xa0000(firmware)
+cpe510_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(pation-table)ro,64k(product-info)ro,1536k(kernel),6144k(rootfs),192k(config)ro,64k(ART)ro,7680k@0x40000(firmware)
+eap300v2_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),320k(custom),13632k(firmware),2048k(failsafe),64k(art)ro
+db120_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)
+dgl_5500_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(nvram)ro,15296k(firmware),192k(lang)ro,512k(my-dlink)ro,64k(mac)ro,64k(art)ro
+cameo_ap94_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,6208k(firmware),64k(caldata)ro,1600k(unknown)ro,64k@0x7f0000(caldata_copy)
+cameo_ap94_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,7808k(firmware),64k(caldata)ro,64k@0x660000(caldata_orig),6208k@0x50000(firmware_orig)
+esr900_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),13248k(rootfs),1024k(manufacture)ro,64k(backup)ro,320k(storage)ro,64k(caldata)ro,14656k@0x40000(firmware)
+esr1750_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),13248k(rootfs),1024k(manufacture)ro,64k(backup)ro,320k(storage)ro,64k(caldata)ro,14656k@0x40000(firmware)
+ew-dorin_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),3712k(firmware),64k(art)
+ew-dorin_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)
+dlrtdev_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,6208k(firmware),64k(caldata)ro,640k(certs),960k(unknown)ro,64k@0x7f0000(caldata_copy)
+dlrtdev_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,7168k(firmware),640k(certs),64k(caldata)ro,64k@0x660000(caldata_orig),6208k@0x50000(firmware_orig)
+dragino2_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,16000k(firmware),64k(config)ro,64k(art)ro
+hiwifi_hc6361_mtdlayout=mtdparts=spi0.0:64k(u-boot)ro,64k(bdinfo)ro,1280k(kernel),14848k(rootfs),64k(backup)ro,64k(art)ro,16128k@0x20000(firmware)
+pb92_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware)
+planex_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),128k(art)ro
+ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro
+uap_pro_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1536k(kernel),14208k(rootfs),256k(cfg)ro,64k(EEPROM)ro,15744k@0x50000(firmware)
+ubdev_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7488k(firmware),64k(certs),256k(cfg)ro,64k(EEPROM)ro
+whrhpg300n_mtdlayout=mtdparts=spi0.0:248k(u-boot)ro,8k(u-boot-env)ro,3712k(firmware),64k(art)ro
+wlr8100_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),14080k(rootfs),192k(unknown)ro,64k(art)ro,384k(unknown2)ro,15488k@0x40000(firmware)
+wndap360_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1728k(kernel),6016k(rootfs),64k(nvram)ro,64k(art)ro,7744k@0x50000(firmware)
+wnr2200_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro
+wnr2000v3_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,3712k(firmware),64k(art)ro
+wnr2000v4_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,3776k(firmware),64k(art)ro
+wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,7680k(firmware),64k(art)ro
+wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,15872k(firmware),64k(art)ro
+r6100_mtdlayout=mtdparts=ar934x-nfc:128k(u-boot)ro,256k(caldata),256k(caldata-backup),512k(config),512k(pot),2048k(kernel),122240k(ubi),25600k@0x1a0000(firmware),2048k(language),3072k(traffic_meter)
+wndr4300_mtdlayout=mtdparts=ar934x-nfc:256k(u-boot)ro,256k(u-boot-env)ro,256k(caldata),512k(pot),2048k(language),512k(config),3072k(traffic_meter),2048k(kernel),23552k(ubi),25600k@0x6c0000(firmware),256k(caldata_backup),-(reserved)
+zcn1523h_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6208k(rootfs),1472k(kernel),64k(configure)ro,64k(mfg)ro,64k(art)ro,7680k@0x50000(firmware)
+mynet_n600_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro
+mynet_rext_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,7808k(firmware),64k(nvram)ro,64k(ART)ro,6848k@0x130000(filesystem)
+zyx_nbg6716_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(env)ro,64k(RFdata)ro,-(nbu);ar934x-nfc:2048k(zyxel_rfsd),2048k(romd),1024k(header),2048k(kernel),-(ubi)
+qihoo_c301_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata)
+
+
+define Image/BuildKernel
+	cp $(KDIR)/vmlinux.elf $(VMLINUX).elf
+	cp $(KDIR)/vmlinux $(VMLINUX).bin
+	dd if=$(KDIR)/vmlinux.bin.lzma of=$(VMLINUX).lzma bs=65536 conv=sync
+	dd if=$(KDIR)/vmlinux.bin.gz of=$(VMLINUX).gz bs=65536 conv=sync
+	$(call MkuImage,gzip,,$(KDIR)/vmlinux.bin.gz,$(UIMAGE)-gzip.bin)
+	$(call MkuImage,lzma,,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin)
+	cp $(KDIR)/loader-generic.elf $(VMLINUX)-lzma.elf
+	-mkdir -p $(KDIR_TMP)
+	$(call Image/Build/Profile/$(IMAGE_PROFILE),buildkernel)
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+	cp $(KDIR)/vmlinux-initramfs.elf $(VMLINUX)-initramfs.elf
+	cp $(KDIR)/vmlinux-initramfs $(VMLINUX)-initramfs.bin
+	dd if=$(KDIR)/vmlinux-initramfs.bin.lzma of=$(VMLINUX)-initramfs.lzma bs=65536 conv=sync
+	dd if=$(KDIR)/vmlinux-initramfs.bin.gz of=$(VMLINUX)-initramfs.gz bs=65536 conv=sync
+	$(call MkuImage,gzip,,$(KDIR)/vmlinux-initramfs.bin.gz,$(UIMAGE)-initramfs-gzip.bin)
+	$(call MkuImage,lzma,,$(KDIR)/vmlinux-initramfs.bin.lzma,$(UIMAGE)-initramfs-lzma.bin)
+	cp $(KDIR)/loader-generic-initramfs.elf $(VMLINUX)-initramfs-lzma.elf
+	$(call Image/Build/Initramfs)
+endif
+endef
+
+Image/Build/WRT400N/buildkernel=$(call MkuImageLzma,$(2),$(3))
+
+define Image/Build/WRT400N
+	$(call Sysupgrade/KRuImage,$(1),$(2),1310720,6488064)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		wrt400n $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+
+define Image/Build/CameoAP94/buildkernel
+	$(call MkuImageLzma,$(2),$(3) $(4))
+	$(call MkuImageLzma,$(2)-fat,$(3) $(5))
+endef
+
+define Image/Build/CameoAP94
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(eval fwsize_fat=$(call mtdpartsize,firmware,$(5)))
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		( \
+			dd if=$(call sysupname,$(1),$(2)); \
+			echo -n "$(6)"; \
+		) > $(call imgname,$(1),$(2))-backup-loader.bin; \
+		if [ `stat -c%s $(call sysupname,$(1),$(2))` -gt 4194304 ]; then \
+			echo "Warning: $(call sysupname,$(1),$(2)) is too big" >&2; \
+		else \
+			( \
+				dd if=$(call sysupname,$(1),$(2)) bs=4096k conv=sync; \
+				echo -n "$(7)"; \
+			) > $(call factoryname,$(1),$(2)); \
+		fi; \
+	fi
+	$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2)-fat.uImage,0,$(KDIR)/root.$(1),$$$$(($(fwsize_fat)-4*64*1024)),$(KDIR_TMP)/$(2)-fat.bin,64)
+	if [ -e "$(KDIR_TMP)/$(2)-fat.bin" ]; then \
+		echo -n "" > $(KDIR_TMP)/$(2)-fat.dummy; \
+		sh $(TOPDIR)/scripts/combined-image.sh \
+			"$(KDIR_TMP)/$(2)-fat.bin" \
+			"$(KDIR_TMP)/$(2)-fat.dummy" \
+			$(call sysupname,$(1),$(2)-fat); \
+	fi
+endef
+
+define Image/Build/WZRHP
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(3)-4*$(4)*1024)),$(4))
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		( \
+			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
+			dd if=$(call sysupname,$(1),$(2)); \
+		) > $(call imgname,$(1),$(2))-tftp.bin; \
+		buffalo-enc -p $(5) -v 1.99 \
+			-i $(call sysupname,$(1),$(2)) \
+			-o $(KDIR_TMP)/$(2).enc; \
+		buffalo-tag -b $(5) -p $(5) -a ath -v 1.99 -m 1.01 -l mlang8 \
+			-w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
+			-i $(KDIR_TMP)/$(2).enc \
+			-o $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+Image/Build/WZRHP64K/buildkernel=$(call MkuImageLzma,$(2),$(3))
+Image/Build/WZRHP64K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+Image/Build/WZRHP64K=$(call Image/Build/WZRHP,$(1),$(2),33095680,64,$(4))
+
+Image/Build/WZRHP128K/buildkernel=$(call MkuImageLzma,$(2),$(3))
+Image/Build/WZRHP128K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+Image/Build/WZRHP128K=$(call Image/Build/WZRHP,$(1),$(2),33030144,128,$(4))
+
+
+Image/Build/WHRHPG300N/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/WHRHPG300N/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+define Image/Build/WHRHPG300N
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		( \
+			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
+			dd if=$(call sysupname,$(1),$(2)); \
+		) > $(call imgname,$(1),$(2))-tftp.bin; \
+		buffalo-enc -p $(5) -v 1.99 \
+			-i $(call sysupname,$(1),$(2)) \
+			-o $(KDIR_TMP)/$(2).enc; \
+		buffalo-tag -b $(5) -p $(5) -a ath -v 1.99 -m 1.01 -l mlang8 \
+			-w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
+			-i $(KDIR_TMP)/$(2).enc \
+			-o $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+
+define Image/Build/Cameo
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		factory_size=$$$$(($(fwsize) - $(6))); \
+		( \
+			dd if=$(call sysupname,$(1),$(2)) bs=$$$${factory_size} conv=sync; \
+			echo -n $(5); \
+		) > $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+Image/Build/CameoAP81/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_ap81_mtdlayout))
+Image/Build/CameoAP81=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo_ap81_mtdlayout),$(4),65536)
+Image/Build/CameoAP81/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_ap81_mtdlayout))
+
+Image/Build/CameoAP91/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_ap91_mtdlayout))
+Image/Build/CameoAP91=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo_ap91_mtdlayout),$(4),65536)
+Image/Build/CameoAP91/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_ap91_mtdlayout))
+
+Image/Build/CameoAP99/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_ap99_mtdlayout))
+Image/Build/CameoAP99=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo_ap99_mtdlayout),$(4),65536)
+Image/Build/CameoAP99/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_ap99_mtdlayout))
+
+Image/Build/CameoAP135/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/CameoAP135=$(call Image/Build/Cameo,$(1),$(2),$(3),$(4),$(5),26)
+Image/Build/CameoAP135/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+Image/Build/CameoDB120/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_db120_mtdlayout))
+Image/Build/CameoDB120=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo_db120_mtdlayout),$(4),26)
+Image/Build/CameoDB120/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_db120_mtdlayout))
+
+Image/Build/CameoDB120_8M/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_db120_mtdlayout_8M))
+Image/Build/CameoDB120_8M=$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo_db120_mtdlayout_8M),$(4),26)
+Image/Build/CameoDB120_8M/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_db120_mtdlayout_8M))
+
+define Image/Build/CameoHornet
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		for r in $(7); do \
+			[ -n "$$$$r" ] && dashr="-$$$$r" || dashr=; \
+			[ -z "$$$$r" ] && r="DEF"; \
+			mkcameofw -M HORNET -R "$$$$r" -S $(5) -V $(6) -c \
+				-K $(8) -I $(fwsize) \
+				-k "$(call sysupname,$(1),$(2))" \
+				-o $(call imgname,$(1),$(2))-factory$$$$dashr.bin; \
+			true; \
+		done; \
+	fi
+endef
+
+Image/Build/CameoAP121/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_ap121_mtdlayout))
+Image/Build/CameoAP121=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo_ap121_mtdlayout),$(4),$(5),$(6),0xe0000)
+Image/Build/CameoAP121/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_ap121_mtdlayout))
+
+Image/Build/CameoAP121_8M/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_ap121_mtdlayout_8M))
+Image/Build/CameoAP121_8M=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo_ap121_mtdlayout_8M),$(4),$(5),$(6),0x100000)
+Image/Build/CameoAP121_8M/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_ap121_mtdlayout_8M))
+
+
+define Image/Build/Ath
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
+	$(eval kernsize=$(call mtdpartsize,kernel,$(4)))
+	$(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize)))
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		dd if=$(KDIR_TMP)/vmlinux-$(2).uImage \
+			of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
+		dd if=$(KDIR)/root.$(1) \
+			of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
+	fi
+endef
+
+Image/Build/AthGzip/buildkernel=$(call MkuImageGzip,$(2),$(3) $(4))
+Image/Build/AthGzip=$(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7))
+Image/Build/AthGzip/initramfs=$(call MkuImageGzip/initramfs,$(2),$(3) $(4))
+
+Image/Build/AthLzma/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/AthLzma=$(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7))
+Image/Build/AthLzma/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+
+define Image/Build/EnGenius
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
+	$(eval kernsize=$(call mtdpartsize,kernel,$(4)))
+	$(call Sysupgrade/$(5),$(1),$(2),$(if $(6),$(6),$(kernsize)),$(if $(rootsize),$(rootsize),$(fwsize)))
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		dd if=$(KDIR_TMP)/vmlinux-$(2).uImage \
+			of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
+		dd if=$(KDIR)/root.$(1) \
+			of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
+		mksenaofw -e $(call sysupname,$(1),$(2)) \
+			-o $(call imgname,$(1),$(2))-factory.dlf \
+			-r 0x101 -p $(7) -t 2; \
+	fi
+endef
+
+Image/Build/EnGenius/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/EnGenius/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+
+define MkuImageHiWiFi
+	# Field ih_name needs to start with "tw150v1"
+	mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) $(2) \
+		-e 0x80060000 -n 'tw150v1 MIPS libreCMC Linux-$(LINUX_VERSION)' \
+		-d $(3) $(4)
+endef
+
+define MkuImageLzmaHiWiFi
+	$(call PatchKernelLzma,$(1),$(2),$(3),$(4))
+	$(call MkuImageHiWiFi,lzma,$(5),$(KDIR_TMP)/vmlinux$(4)-$(1).bin.lzma,$(KDIR_TMP)/vmlinux$(4)-$(1).uImage)
+endef
+
+Image/Build/HiWiFi/buildkernel=$(call MkuImageLzmaHiWiFi,$(2),$(3) $(4))
+Image/Build/HiWiFi=$(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7))
+Image/Build/HiWiFi/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+Image/Build/PB4X/buildkernel=$(call PatchKernelLzma,$(2),$(3))
+
+define Image/Build/PB4X
+	dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma \
+	   of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync
+	dd if=$(KDIR)/root.$(1) \
+	   of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync
+	-sh $(TOPDIR)/scripts/combined-image.sh \
+		"$(call imgname,kernel,$(2)).bin" \
+		"$(call imgname,$(1),$(2)-rootfs).bin" \
+		$(call sysupname,$(1),$(2))
+endef
+
+
+Image/Build/MyLoader/buildkernel=$(call PatchKernelLzma,$(2),$(3))
+Image/Build/MyLoader/initramfs=$(call PatchKernel/initramfs,$(2),$(3))
+
+define Image/Build/MyLoader
+	$(eval fwsize=$(shell echo $$(($(4)-0x30000-4*64*1024))))
+	$(eval fwimage=$(KDIR_TMP)/$(2)-$(5)-firmware.bin)
+	$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2).bin.lzma,65536,$(KDIR)/root.$(1),$(fwsize),$(fwimage))
+	if [ -e "$(fwimage)" ]; then \
+		$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s $(4) -v \
+			-p0x00030000:0:al:0x80060000:firmware:$(fwimage) \
+			$(call imgname,$(1),$(2))-$(5)-factory.img; \
+		echo -n "" > $(KDIR_TMP)/empty.bin; \
+		sh $(TOPDIR)/scripts/combined-image.sh \
+			$(fwimage) $(KDIR_TMP)/empty.bin \
+			$(call imgname,$(1),$(2))-$(5)-sysupgrade.bin; \
+	fi
+endef
+
+
+Image/Build/UAPPRO/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(uap_pro_mtdlayout))
+
+define Image/Build/UAPPRO/buildkernel
+	$(call MkuImageLzma,$(2),$(3) $(uap_pro_mtdlayout))
+	-rm -rf $(KDIR_TMP)/$(2)
+	mkdir -p $(KDIR_TMP)/$(2)/image
+	cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR_TMP)/$(2)/image/kernel0
+	$(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
+		--pad --big-endian --squash-uids -v -e 64KiB \
+		-o $(KDIR_TMP)/$(2)-kernel.jffs2 \
+		-d $(KDIR_TMP)/$(2)/image \
+		2>&1 1>/dev/null | awk '/^.+$$$$/'
+	-rm -rf $(KDIR_TMP)/$(2)
+	$(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR_TMP)/$(2)-kernel.jffs2 -J 64
+endef
+
+define Image/Build/UAPPRO
+	$(call CatFiles,$(KDIR_TMP)/$(2)-kernel.jffs2,1572864,$(KDIR)/root.$(1),14548992,$(call sysupname,$(1),$(2)))
+	-$(STAGING_DIR_HOST)/bin/mkfwimage2 -f 0x9f000000 \
+		-v $(5).$(6).v6.0.0-libreCMC-$(REVISION) \
+		-p jffs2:0x50000:0xf60000:0:0:$(call sysupname,$(1),$(2)) \
+		-o $(call factoryname,$(1),$(2))
+endef
+
+# $(4) = board (XS2, XS5, RS, XM)
+# $(5) = series (BZ, XM, XW)
+# $(6) = chip (ar7240, ar934x)
+define Image/Build/UBNT2
+	$(eval fwsize=$(call mtdpartsize,firmware,$(3)))
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		dd if=$(call sysupname,$(1),$(2)) of=$(KDIR_TMP)/$(2)-mtdpart-kernel.bin bs=1024k count=1; \
+		dd if=$(call sysupname,$(1),$(2)) of=$(KDIR_TMP)/$(2)-mtdpart-rootfs.bin bs=1024k skip=1; \
+		$(STAGING_DIR_HOST)/bin/mkfwimage \
+			-B $(4) -v $(5).$(6).v6.0.0-libreCMC-$(REVISION) \
+			-k $(KDIR_TMP)/$(2)-mtdpart-kernel.bin \
+			-r $(KDIR_TMP)/$(2)-mtdpart-rootfs.bin \
+			-o $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+Image/Build/UBNTXM/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(ubntxm_mtdlayout))
+Image/Build/UBNTXM/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout))
+Image/Build/UBNTXM=$(call Image/Build/UBNT2,$(1),$(2),$(ubntxm_mtdlayout),$(4),$(5),$(6),$(7))
+
+Image/Build/UBDEV/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubdev_mtdlayout))
+Image/Build/UBDEV=$(call Image/Build/UBNT2,$(1),$(2),$(ubdev_mtdlayout),$(4),$(5),$(6),$(7))
+
+
+Image/Build/UBNT/buildkernel=$(call PatchKernelLzma,$(2),$(3))
+
+define Image/Build/UBNT
+	dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma of=$(KDIR_TMP)/vmlinux-$(2).lzma bs=64k conv=sync
+	-$(STAGING_DIR_HOST)/bin/mkfwimage \
+		-B $(4) -v $(5).$(6).libreCMC.$(REVISION) \
+		-k $(KDIR_TMP)/vmlinux-$(2).lzma \
+		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+		-o $(call factoryname,$(1),$(2))
+	-sh $(TOPDIR)/scripts/combined-image.sh \
+		"$(KDIR_TMP)/vmlinux-$(2).lzma" \
+		"$(BIN_DIR)/$(IMG_PREFIX)-root.$(1)" \
+  $(call sysupname,$(1),$(2))
+endef
+
+
+Image/Build/Planex/initramfs=$(call MkuImageGzip/initramfs,$(2),$(3) $(planex_mtdlayout))
+Image/Build/Planex/loader=$(call Image/BuildLoaderAlone,$(1),gz,$(2) $(planex_mtdlayout),0x52000,0)
+
+define Image/Build/Planex/buildkernel
+	[ -e "$(KDIR)/loader-$(2).gz" ]
+	$(call MkuImageOKLI,$(2))
+	( \
+		dd if=$(KDIR)/loader-$(2).gz bs=8128 count=1 conv=sync; \
+		dd if=$(KDIR_TMP)/vmlinux-$(2).okli; \
+	) > $(KDIR_TMP)/kernel-$(2).bin
+	$(call MkuImage,gzip,,$(KDIR_TMP)/kernel-$(2).bin,$(KDIR_TMP)/vmlinux-$(2).uImage)
+endef
+
+define Image/Build/Planex
+	$(eval fwsize=$(call mtdpartsize,firmware,$(planex_mtdlayout)))
+	$(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		$(STAGING_DIR_HOST)/bin/mkplanexfw \
+			-B $(2) \
+			-v 2.00.00 \
+			-i $(call sysupname,$(1),$(2)) \
+			-o $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+
+Image/Build/ALFA/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/ALFA/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+define Image/Build/ALFA
+	$(call Sysupgrade/RKuImage,$(1),$(2),$(5),$(6))
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		rm -rf $(KDIR)/$(1); \
+		mkdir -p $(KDIR)/$(1); \
+		cd $(KDIR)/$(1); \
+		cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(7); \
+		cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(8); \
+		$(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(7) $(8); \
+		( \
+			echo WRM7222C | dd bs=32 count=1 conv=sync; \
+			echo -ne '\xfe'; \
+		) >> $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+
+Image/Build/Seama/loader=$(call Image/BuildLoader,$(1),bin,$(2) $(3),0x80060000)
+
+define Image/Build/Seama
+	[ -e "$(KDIR)/loader-$(2).bin" ]
+	$(call CompressLzma,$(KDIR)/loader-$(2).bin,$(KDIR_TMP)/loader-$(2).bin.lzma)
+	-rm -f $(KDIR_TMP)/image-$(2).tmp
+	$(call CatFiles,$(KDIR_TMP)/loader-$(2).bin.lzma,$$$$(($(6) - 64)),$(KDIR)/root.$(1),$(7),$(KDIR_TMP)/image-$(2).tmp)
+	[ -e "$(KDIR_TMP)/image-$(2).tmp" ] && { \
+		head -c -4 "$(KDIR_TMP)/image-$(2).tmp" > "$(KDIR_TMP)/image-$(2).no-jffs2mark.tmp"; \
+		$(STAGING_DIR_HOST)/bin/seama \
+		-i $(KDIR_TMP)/image-$(2).no-jffs2mark.tmp \
+		-m "dev=/dev/mtdblock/1" -m "type=firmware"; \
+		$(STAGING_DIR_HOST)/bin/seama \
+			-s $(call imgname,$(1),$(2))-factory.bin \
+			-m "signature=$(5)" \
+			-i $(KDIR_TMP)/image-$(2).no-jffs2mark.tmp.seama; \
+		tail -c 4 "$(KDIR_TMP)/image-$(2).tmp" >> $(call imgname,$(1),$(2))-factory.bin; \
+	}
+	cat $(KDIR_TMP)/loader-$(2).bin.lzma > $(KDIR_TMP)/image-$(2)-sysupgrade.tmp
+	$(STAGING_DIR_HOST)/bin/seama \
+		-i $(KDIR_TMP)/image-$(2)-sysupgrade.tmp \
+		-m "dev=/dev/mtdblock/1" -m "type=firmware"
+	$(call CatFiles,$(KDIR_TMP)/image-$(2)-sysupgrade.tmp.seama,$(6),$(KDIR)/root.$(1),$(7),$(call sysupname,$(1),$(2)))
+endef
+
+define Image/Build/Seama/initramfs
+	$(call PatchKernelLzma,$(2),$(3) $(4),,-initramfs)
+	$(STAGING_DIR_HOST)/bin/seama \
+		-i $(KDIR_TMP)/vmlinux-initramfs-$(2).bin.lzma \
+		-m "dev=/dev/mtdblock/1" -m "type=firmware"
+	cat $(KDIR_TMP)/vmlinux-initramfs-$(2).bin.lzma.seama > $(call imgname,initramfs,$(2))-seama.bin
+endef
+
+Image/Build/Senao/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/Senao/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+define Image/Build/Senao
+	mkdir -p $(KDIR_TMP)/$(2)/
+	touch $(KDIR_TMP)/$(2)/FWINFO-libreCMC-$(REVISION)-$(2)
+	-$(CP) ./$(2)/* $(KDIR_TMP)/$(2)/
+	dd if=$(KDIR_TMP)/vmlinux-$(2).uImage \
+		of=$(KDIR_TMP)/$(2)/librecmc-senao-$(2)-uImage-lzma.bin bs=64k conv=sync
+	dd if=$(KDIR)/root.$(1) \
+		of=$(KDIR_TMP)/$(2)/librecmc-senao-$(2)-root.$(1) bs=64k conv=sync
+	( \
+		cd $(KDIR_TMP)/$(2)/;  \
+		$(TAR) -cz -f $(call factoryname,$(1),$(2)) * \
+	)
+	-rm -rf $(KDIR_TMP)/$(2)/
+	-sh $(TOPDIR)/scripts/combined-image.sh \
+		$(KDIR_TMP)/vmlinux-$(2).uImage \
+		$(KDIR)/root.$(1) \
+		$(call sysupname,$(1),$(2))
+endef
+
+Image/Build/TPLINKOLD/loader=$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+
+define Image/Build/TPLINKOLD
+	[ -e "$(KDIR)/loader-$(2).gz" ]
+	$(call MkuImageOKLI,$(2))
+	( \
+		dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
+		dd if=$(KDIR_TMP)/vmlinux-$(2).okli conv=sync; \
+	) > $(KDIR_TMP)/kernel-$(2).bin
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION)\
+		-X 0x40000 \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
+		-r $(KDIR)/root.$(1) \
+		-o $(call factoryname,$(1),$(2))
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION) -s\
+		-X 0x40000 \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
+		-r $(KDIR)/root.$(1) \
+		-o $(call sysupname,$(1),$(2))
+endef
+
+define Image/Build/TPLINKOLD/initramfs
+	$(call Image/BuildLoader,$(2),gz,$(3),0x80060000,-initramfs)
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw -c \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION) -s\
+		-k $(KDIR)/loader-$(2)-initramfs.gz \
+		-o $(call imgname,$(1),$(2))-initramfs-uImage.bin
+endef
+
+
+Image/Build/TPLINK/loader=$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+
+define Image/Build/TPLINK
+	[ -e "$(KDIR)/loader-$(2).gz" ]
+	$(call MkuImageOKLI,$(2))
+	( \
+		dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
+		dd if=$(KDIR_TMP)/vmlinux-$(2).okli conv=sync; \
+	) > $(KDIR_TMP)/kernel-$(2).bin
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION)\
+		-X 0x40000 \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
+		-r $(KDIR)/root.$(1) \
+		-a $(call rootfs_align,$(1)) -j \
+		-o $(call factoryname,$(1),$(2))
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION) -s\
+		-X 0x40000 \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
+		-r $(KDIR)/root.$(1) \
+		-a $(call rootfs_align,$(1)) -j \
+		-o $(call sysupname,$(1),$(2))
+endef
+
+define Image/Build/TPLINK/initramfs
+	$(call Image/BuildLoader,$(2),gz,$(3),0x80060000,-initramfs)
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw -c \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION) -s\
+		-k $(KDIR)/loader-$(2)-initramfs.gz \
+		-o $(call imgname,$(1),$(2))-uImage.bin
+endef
+
+
+Image/Build/TPLINK-LZMA/buildkernel=$(call PatchKernelLzma,$(2),$(3))
+
+define Image/Build/TPLINK-LZMA
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION) $(7) \
+		-X 0x40000 \
+		-k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
+		-r $(KDIR)/root.$(1) \
+		-a $(call rootfs_align,$(1)) -j \
+		-o $(call factoryname,$(1),$(2))
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION) $(7) -s \
+		-X 0x40000 \
+		-k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
+		-r $(KDIR)/root.$(1) \
+		-a $(call rootfs_align,$(1)) -j \
+		-o $(call sysupname,$(1),$(2))
+endef
+
+define Image/Build/TPLINK-LZMA/initramfs
+	$(call PatchKernelLzma,$(2),$(3),,-initramfs)
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw -c \
+		-H $(4) -W $(5) -F $(6) -N libreCMC -V $(REVISION) $(7) -s \
+		-k $(KDIR_TMP)/vmlinux-initramfs-$(2).bin.lzma \
+		-o $(call imgname,$(1),$(2))-uImage.bin
+endef
+
+
+Image/Build/TPLINK-SAFELOADER/buildkernel=$(call PatchKernelLzma,$(2),$(3) $(4))
+
+define Image/Build/TPLINK-SAFELOADER
+	-rm -rf $(KDIR)/lzma-loader
+	$(LOADER_MAKE) LOADER=loader-$(2).elf\
+		LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \
+		LOADER_DATA="$(KDIR_TMP)/vmlinux-$(2).bin.lzma" BOARD="$(2)" \
+		compile loader.elf
+
+	-$(STAGING_DIR_HOST)/bin/tplink-safeloader \
+		-B $(5) \
+		-k $(KDIR)/loader-$(2).elf \
+		-r $(KDIR)/root.$(1) \
+		-V $(REVISION) \
+		-j \
+		-o $(call factoryname,$(1),$(2))
+	-$(STAGING_DIR_HOST)/bin/tplink-safeloader \
+		-B $(5) \
+		-k $(KDIR)/loader-$(2).elf \
+		-r $(KDIR)/root.$(1) \
+		-V $(REVISION) \
+		-j -S \
+		-o $(call sysupname,$(1),$(2))
+endef
+
+
+define Image/Build/CyberTAN
+	echo -n '' > $(KDIR_TMP)/empty.bin
+	$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp \
+		-f $(KDIR_TMP)/vmlinux-$(2).uImage -F $(KDIR_TMP)/empty.bin \
+		-x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
+	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) \
+		-i $(KDIR)/image.tmp \
+		-o $(call sysupname,$(1),$(2))
+	$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR_TMP)/vmlinux-$(2).uImage \
+		-x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
+	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) -g \
+		-i $(KDIR)/image.tmp \
+		-o $(call factoryname,$(1),$(2))
+	rm $(KDIR)/image.tmp
+endef
+
+Image/Build/CyberTANGZIP/loader=$(call Image/BuildLoader,$(1),gz,$(2),0x80060000)
+Image/Build/CyberTANGZIP/buildkernel=$(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
+Image/Build/CyberTANGZIP=$(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4),$(5))
+
+Image/Build/CyberTANLZMA/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/CyberTANLZMA=$(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4),$(5))
+
+
+Image/Build/Netgear/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4),,-M $(5))
+
+define Image/Build/Netgear/buildkernel
+	$(call MkuImageLzma,$(2),$(3) $(4),-d20,,-M $(5))
+	-rm -rf $(KDIR_TMP)/$(2)
+	mkdir -p $(KDIR_TMP)/$(2)/image
+	cat $(KDIR_TMP)/vmlinux-$(2).uImage > $(KDIR_TMP)/$(2)/image/uImage
+	$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
+		$(KDIR_TMP)/$(2) $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp1 \
+		-noappend -root-owned -be -b 65536
+	( \
+		cat $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp1; \
+		dd if=/dev/zero bs=1k count=1 \
+	) > $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2
+	mkimage -A mips -O linux -T filesystem -C none -M $(5) \
+		-a 0xbf070000 -e 0xbf070000 \
+		-n 'MIPS libreCMC Linux-$(LINUX_VERSION)' \
+		-d $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2 \
+		$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs
+endef
+
+define Image/Build/Netgear
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs,0,$(KDIR)/root.$(1),$(fwsize),$(call sysupname,$(1),$(2)),64)
+	if [ -e $(call sysupname,$(1),$(2)) ]; then \
+		for r in $(7) ; do \
+			[ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
+			$(STAGING_DIR_HOST)/bin/mkdniimg \
+				-B $(6) -v libreCMC.$(REVISION) -r "$$$$r" $(8) \
+				-i $(call sysupname,$(1),$(2)) \
+				-o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
+		done; \
+	fi
+endef
+
+
+Image/Build/NetgearLzma/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4),,-M $(5))
+Image/Build/NetgearLzma/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4),-d20,,-M $(5))
+
+define Image/Build/NetgearLzma
+	$(eval fwsize=$(call mtdpartsize,firmware,$(4)))
+	$(call CatFiles,$(KDIR_TMP)/vmlinux-$(2).uImage,0,$(KDIR)/root.$(1),$(fwsize),$(call sysupname,$(1),$(2)),64)
+endef
+
+
+Image/Build/NetgearNAND/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4),,-M $(5))
+
+# $(1): (empty)
+# $(2): Board name (small caps)
+# $(3): Kernel board specific cmdline
+# $(4): Kernel mtdparts definition
+# $(5): U-Boot magic
+define Image/Build/NetgearNAND/buildkernel
+	$(eval kernelsize=$(call mtdpartsize,kernel,$(4)))
+	$(call PatchKernelLzma,$(2),$(3) $(4),-d20)
+	dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma \
+		of=$(KDIR_TMP)/vmlinux-$(2).bin.tmp \
+		bs=$$$$(($(kernelsize)-131072-2*64-1)) \
+		count=1 conv=sync
+	$(call MkuImage,lzma,-M $(5),$(KDIR_TMP)/vmlinux-$(2).bin.tmp,$(KDIR_TMP)/vmlinux-$(2).uImage)
+	echo -ne '\xff' >> $(KDIR_TMP)/vmlinux-$(2).uImage
+	# create a fake rootfs image
+	dd if=/dev/zero of=$(KDIR_TMP)/fakeroot-$(2) bs=131072 count=1
+	mkimage -A mips -O linux -T filesystem -C none \
+		-a 0xbf070000 -e 0xbf070000 \
+		-n 'MIPS libreCMC fakeroot' \
+		-d $(KDIR_TMP)/fakeroot-$(2) \
+		-M $(5) \
+		$(KDIR_TMP)/fakeroot-$(2).uImage
+	# append the fake rootfs image to the kernel, it will reside in the last
+	# erase block of the kernel partition
+	cat $(KDIR_TMP)/fakeroot-$(2).uImage >> $(KDIR_TMP)/vmlinux-$(2).uImage
+endef
+
+
+# $(1): rootfs image suffix
+# $(2): Board name (small caps)
+# $(3): Kernel board specific cmdline
+# $(4): Kernel mtdparts definition
+# $(5): U-Boot magic
+# $(6): Board name (upper caps)
+# $(7): firmware region code (not used yet)
+# $(8): DNI Hardware version
+# $(9): suffix of the configuration file for ubinize
+define Image/Build/NetgearNAND
+	$(eval firmwaresize=$(call mtdpartsize,firmware,$(4)))
+	$(eval kernelsize=$(call mtdpartsize,kernel,$(4)))
+	$(eval imageraw=$(KDIR_TMP)/$(2)-raw.img)
+	$(CP) $(KDIR)/root.squashfs-raw $(KDIR_TMP)/root.squashfs
+	echo -ne '\xde\xad\xc0\xde' > $(KDIR_TMP)/jffs2.eof
+	$(call ubinize,ubinize-$(9).ini,$(KDIR_TMP),$(KDIR_TMP)/$(2)-root.ubi,128KiB,2048,-E 5)
+	( \
+		dd if=$(KDIR_TMP)/vmlinux-$(2).uImage; \
+		dd if=$(KDIR_TMP)/$(2)-root.ubi \
+	) > $(imageraw)
+	$(STAGING_DIR_HOST)/bin/mkdniimg \
+		-B $(6) -v libreCMC.$(REVISION) -r "$$$$r" $(8) \
+		-i $(imageraw) \
+		-o $(call imgname,ubi,$(2))-factory.img
+
+	$(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/vmlinux-$(2).uImage)
+endef
+
+
+ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
+  Image/Build/ZyXEL/buildkernel=$(call MkuImageLzma,$(2),$(3))
+
+  define Image/Build/ZyXEL
+	$(call Sysupgrade/KRuImage,$(1),$(2),917504,2752512)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \
+			echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found" >&2; \
+		else \
+			$(STAGING_DIR_HOST)/bin/mkzynfw \
+				-B $(4) \
+				-b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \
+				-r $(call sysupname,$(1),$(2)):0x10000 \
+				-o $(call factoryname,$(1),$(2)); \
+	fi; fi
+  endef
+endif
+
+
+define	Image/Build/ZyXELNAND/buildkernel
+	$(eval kernelsize=$(call mtdpartsize,kernel,$(5)))
+	$(call MkuImageLzma,$(2),$(3) $(5) $(6))
+	mkdir -p $(KDIR_TMP)/$(2)/image/boot
+	cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR_TMP)/$(2)/image/boot/vmlinux.lzma.uImage
+	$(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
+		--pad=$(kernelsize) --big-endian --squash-uids -v -e 128KiB \
+		-o $(KDIR_TMP)/$(2)-kernel.jffs2 \
+		-d $(KDIR_TMP)/$(2)/image \
+		2>&1 1>/dev/null | awk '/^.+$$$$/'
+	-rm -rf $(KDIR_TMP)/$(2)
+endef
+
+define Image/Build/ZyXELNAND
+	if [ "$(1)" != "squashfs" ]; then \
+		echo Only squashfs is supported; \
+		return 0; \
+	fi
+	$(eval firmwaresize=$(call mtdpartsize,firmware,$(4)))
+	$(eval kernelsize=$(call mtdpartsize,kernel,$(4)))
+	$(eval imageraw=$(KDIR_TMP)/$(2)-raw.img)
+	$(CP) $(KDIR)/root.$(1) $(KDIR_TMP)/ubi_root.img
+	$(call ubinize,ubinize-$(2).ini,$(KDIR_TMP),$(KDIR_TMP)/$(2)-root.ubi,128KiB,2048,-E 5)
+	( \
+		dd if=$(KDIR_TMP)/$(2)-kernel.jffs2; \
+		dd if=$(KDIR_TMP)/$(2)-root.ubi \
+	) > $(imageraw)
+	dd if=$(imageraw) of=$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-factory.bin \
+		bs=128k conv=sync
+	$(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/$(2)-kernel.jffs2)
+endef
+
+
+Image/Build/OpenMesh/buildkernel=$(call MkuImageLzma,$(2))
+
+define Image/Build/OpenMesh
+	-sh $(TOPDIR)/scripts/om-fwupgradecfg-gen.sh \
+		"$(4)" \
+		"$(BUILD_DIR)/fwupgrade.cfg-$(4)" \
+		"$(KDIR_TMP)/vmlinux-$(2).uImage" \
+		"$(KDIR)/root.$(1)"
+	-sh $(TOPDIR)/scripts/combined-ext-image.sh \
+		"$(4)" "$(call factoryname,$(1),$(2))" \
+		"$(BUILD_DIR)/fwupgrade.cfg-$(4)" "fwupgrade.cfg" \
+		"$(KDIR_TMP)/vmlinux-$(2).uImage" "kernel" \
+		"$(KDIR)/root.$(1)" "rootfs"
+endef
+
+
+Image/Build/Zcomax/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/Zcomax/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
+
+define Image/Build/Zcomax
+	$(call Sysupgrade/RKuImage,$(1),$(2),1507328,6356992)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		$(STAGING_DIR_HOST)/bin/mkzcfw \
+			-B $(2) \
+			-k $(KDIR_TMP)/vmlinux-$(2).uImage \
+			-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+			-o $(call imgname,$(1),$(2))-factory.img; \
+	fi
+endef
+
+
+# $(1): template name to be defined, etc. squashfs-only, 64k, 64kraw, etc.
+# $(2): jffs2 blocksize.
+define Jffs2Template
+  define Image/Build/Template/$(1)/jffs2-$(2)
+    $$(call Image/Build/$$(1),jffs2-$(2),$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10))
+  endef
+endef
+
+# $(1): template name to be defined.
+# $(2): squashfs suffix to be used.
+# $(3): jffs2 suffix to be used.
+define BuildTemplate
+  # $(1)     : name of build method.
+  # $(2)     : board name.
+  # $(3)     : kernel command line.
+  # $(4)~$(8): extra arguments.
+  define Image/Build/Template/$(1)/initramfs
+    $$(call Image/Build/$$(1)/initramfs,initramfs,$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10))
+  endef
+  define Image/Build/Template/$(1)/loader
+    $$(call Image/Build/$$(1)/loader,$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10))
+  endef
+  define Image/Build/Template/$(1)/buildkernel
+    $$(call Image/Build/$$(1)/buildkernel,,$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10))
+  endef
+  define Image/Build/Template/$(1)/squashfs
+    $$(call Image/Build/$$(1),squashfs$(2),$$(2),$$(3),$$(4),$$(5),$$(6),$$(7),$$(8),$$(9),$$(10))
+  endef
+  $(if $(3),$(foreach bs,$(3),$(eval $(call Jffs2Template,$(1),$(bs)))))
+endef
+
+$(eval $(call BuildTemplate,squashfs-only))
+$(eval $(call BuildTemplate,64k,-64k,64k))
+$(eval $(call BuildTemplate,64kraw,-raw,64k))
+$(eval $(call BuildTemplate,64kraw-nojffs,-raw))
+$(eval $(call BuildTemplate,128k,,128k))
+$(eval $(call BuildTemplate,128kraw,-raw,128k))
+$(eval $(call BuildTemplate,256k,,256k))
+$(eval $(call BuildTemplate,all,,64k 128k 256k))
+
+ifeq ($(SUBTARGET),luci)
+#NETGEAR
+$(eval $(call SingleProfile,Netgear,64kraw,WNR2200,wnr2200,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout),0x32323030,WNR2200,"" NA,))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V1,wndr3700,WNDR3700,ttyS0,115200,$$(wndr3700_mtdlayout),0x33373030,WNDR3700,"" NA,,7 864 320))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V2,wndr3700v2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3700v2,"",-H 29763654+16+64))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3800,wndr3800,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3800,"",-H 29763654+16+128))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3800CH,wndr3800ch,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3800CH,"",-H 29763654+16+128))
+
+#TP-Link
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLMR3020,tl-mr3020-v1,TL-MR3020,ttyATH0,115200,0x30200001,1,4Mlzma))
+
+$(eval $(call SingleProfile,TPLINKOLD,squashfs-only,TLWR841NV15,tl-wr841nd-v1.5,TL-WR841N-v1.5,ttyS0,115200,0x08410002,2,4M))
+
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR741NV1,tl-wr741nd-v1,TL-WR741ND,ttyS0,115200,0x07410001,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR741NV2,tl-wr741nd-v2,TL-WR741ND,ttyS0,115200,0x07410001,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR741NV2,tl-wr741nd-v2,TL-WR741ND-luci,ttyS0,115200,0x07410001,1,4M))
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR741NV4,tl-wr741nd-v4,TL-WR741ND-v4,ttyATH0,115200,0x07410004,1,4Mlzma))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR743NV1,tl-wr743nd-v1,TL-WR741ND-luci,ttyS0,115200,0x07430001,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR743NV1,tl-wr743nd-v1,TL-WR741ND,ttyS0,115200,0x07430001,1,4M))
+
+
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR841NV3,tl-wr841nd-v3,TL-WR941ND,ttyS0,115200,0x08410003,3,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR841NV5,tl-wr841nd-v5,TL-WR741ND,ttyS0,115200,0x08410005,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR841NV7,tl-wr841nd-v7,TL-WR841N-v7,ttyS0,115200,0x08410007,1,4M))
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR841NV8,tl-wr841n-v8,TL-WR841N-v8,ttyS0,115200,0x08410008,1,4Mlzma))
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR841NV9,tl-wr841n-v9,TL-WR841N-v9,ttyS0,115200,0x08410009,1,4Mlzma))
+
+$(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2 TLWR741NV4))
+$(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5 TLWR841NV7 TLWR841NV8 TLWR841NV9 TLWR847NV8))
+$(eval $(call MultiProfile,WNDR3700-luci,WNDR3700V1 WNDR3700V2 WNDR3800 WNDR3800CH WNDRMAC WNDRMACV2))
+
+endif # ifeq ($(SUBTARGET),luci)
+
+
+
+
+ifeq ($(SUBTARGET),generic)
+#NETGEAR
+$(eval $(call SingleProfile,Netgear,64kraw,WNR2200,wnr2200,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout),0x32323030,WNR2200,"" NA,))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V1,wndr3700,WNDR3700,ttyS0,115200,$$(wndr3700_mtdlayout),0x33373030,WNDR3700,"" NA,,7 864 320))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V2,wndr3700v2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3700v2,"",-H 29763654+16+64))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3800,wndr3800,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3800,"",-H 29763654+16+128))
+$(eval $(call SingleProfile,Netgear,64kraw,WNDR3800CH,wndr3800ch,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3800CH,"",-H 29763654+16+128))
+
+#TP-Link
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLMR3020,tl-mr3020-v1,TL-MR3020,ttyATH0,115200,0x30200001,1,4Mlzma))
+
+$(eval $(call SingleProfile,TPLINKOLD,squashfs-only,TLWR841NV15,tl-wr841nd-v1.5,TL-WR841N-v1.5,ttyS0,115200,0x08410002,2,4M))
+
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR741NV1,tl-wr741nd-v1,TL-WR741ND,ttyS0,115200,0x07410001,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR741NV2,tl-wr741nd-v2,TL-WR741ND,ttyS0,115200,0x07410001,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR741NV2,tl-wr741nd-v2,TL-WR741ND-luci,ttyS0,115200,0x07410001,1,4M))
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR741NV4,tl-wr741nd-v4,TL-WR741ND-v4,ttyATH0,115200,0x07410004,1,4Mlzma))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR743NV1,tl-wr743nd-v1,TL-WR741ND-luci,ttyS0,115200,0x07430001,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR743NV1,tl-wr743nd-v1,TL-WR741ND,ttyS0,115200,0x07430001,1,4M))
+
+
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR841NV3,tl-wr841nd-v3,TL-WR941ND,ttyS0,115200,0x08410003,3,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR841NV5,tl-wr841nd-v5,TL-WR741ND,ttyS0,115200,0x08410005,1,4M))
+$(eval $(call SingleProfile,TPLINK,64kraw,TLWR841NV7,tl-wr841nd-v7,TL-WR841N-v7,ttyS0,115200,0x08410007,1,4M))
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR841NV8,tl-wr841n-v8,TL-WR841N-v8,ttyS0,115200,0x08410008,1,4Mlzma))
+$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR841NV9,tl-wr841n-v9,TL-WR841N-v9,ttyS0,115200,0x08410009,1,4Mlzma))
+
+$(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2 TLWR741NV4))
+$(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5 TLWR841NV7 TLWR841NV8 TLWR841NV9 TLWR847NV8))
+$(eval $(call MultiProfile,WNDR3700,WNDR3700V1 WNDR3700V2 WNDR3800 WNDR3800CH WNDRMAC WNDRMACV2))
+
+endif # ifeq ($(SUBTARGET),generic)
+
+ifeq ($(SUBTARGET),nand)
+$(eval $(call SingleProfile,NetgearNAND,64k,WNDR3700V4,wndr3700v4,WNDR3700_V4,ttyS0,115200,$$(wndr4300_mtdlayout),0x33373033,WNDR3700v4,"",-H 29763948+128+128,wndr4300))
+$(eval $(call SingleProfile,NetgearNAND,64k,WNDR4300V1,wndr4300,WNDR4300,ttyS0,115200,$$(wndr4300_mtdlayout),0x33373033,WNDR4300,"",-H 29763948+0+128+128+2x2+3x3,wndr4300))
+$(eval $(call SingleProfile,NetgearNAND,64k,R6100,r6100,R6100,ttyS0,115200,$$(r6100_mtdlayout),0x36303030,R6100,"",-H 29764434+0+128+128+2x2+2x2,wndr4300))
+
+$(eval $(call SingleProfile,ZyXELNAND,128k,NBG6716,nbg6716,NBG6716,ttyS0,115200,NBG6716,$$(zyx_nbg6716_mtdlayout),mem=256M))
+
+$(eval $(call MultiProfile,WNDR4300,WNDR3700V4 WNDR4300V1))
+endif # ifeq ($(SUBTARGET),nand)
+
+
+$(eval $(call MultiProfile,Default,$(SINGLE_PROFILES)))
+
+define Image/Build/squashfs
+	cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-raw
+	cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-64k
+	$(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 64
+	cp $(KDIR)/root.squashfs-64k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-64k
+	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
+endef
+
+define Image/Build/jffs2
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
+endef
+
+define Image/Build/Initramfs
+	$(call Image/Build/Profile/$(IMAGE_PROFILE),initramfs)
+endef
+
+define Image/Prepare
+	gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
+	$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+	gzip -9 -c $(KDIR)/vmlinux-initramfs > $(KDIR)/vmlinux-initramfs.bin.gz
+	$(call CompressLzma,$(KDIR)/vmlinux-initramfs,$(KDIR)/vmlinux-initramfs.bin.lzma)
+	$(call Image/BuildLoader,generic,elf,,,-initramfs)
+endif
+	$(call Image/BuildLoader,generic,elf)
+	$(call Image/Build/Profile/$(if $(CONFIG_IB),Default,$(IMAGE_PROFILE)),loader)
+endef
+
+# $(1): filesystem type.
+define Image/Build
+	$(call Image/Build/$(call rootfs_type,$(1)),$(1))
+	$(call Image/Build/Profile/$(IMAGE_PROFILE),$(1))
+endef
+
+$(eval $(call BuildImage))
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/Makefile b/trunk/target/linux/ar71xx/image/lzma-loader/Makefile
new file mode 100644
index 00000000..2e0b9111
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/Makefile
@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+LZMA_TEXT_START	:= 0x80a00000
+LOADER		:= loader.bin
+LOADER_NAME	:= $(basename $(notdir $(LOADER)))
+LOADER_DATA 	:=
+TARGET_DIR	:=
+FLASH_OFFS	:=
+FLASH_MAX	:=
+BOARD		:=
+
+ifeq ($(TARGET_DIR),)
+TARGET_DIR	:= $(KDIR)
+endif
+
+LOADER_BIN	:= $(TARGET_DIR)/$(LOADER_NAME).bin
+LOADER_GZ	:= $(TARGET_DIR)/$(LOADER_NAME).gz
+LOADER_ELF	:= $(TARGET_DIR)/$(LOADER_NAME).elf
+
+PKG_NAME := lzma-loader
+PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)
+
+.PHONY : loader-compile loader.bin loader.elf loader.gz
+
+$(PKG_BUILD_DIR)/.prepared:
+	mkdir $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+	touch $@
+
+loader-compile: $(PKG_BUILD_DIR)/.prepared
+	$(MAKE) -C $(PKG_BUILD_DIR) CROSS_COMPILE="$(TARGET_CROSS)" \
+		LZMA_TEXT_START=$(LZMA_TEXT_START) \
+		LOADER_DATA=$(LOADER_DATA) \
+		FLASH_OFFS=$(FLASH_OFFS) \
+		FLASH_MAX=$(FLASH_MAX) \
+		BOARD="$(BOARD)" \
+		clean all
+
+loader.gz: $(PKG_BUILD_DIR)/loader.bin
+	gzip -nc9 $< > $(LOADER_GZ)
+
+loader.elf: $(PKG_BUILD_DIR)/loader.elf
+	$(CP) $< $(LOADER_ELF)
+
+loader.bin: $(PKG_BUILD_DIR)/loader.bin
+	$(CP) $< $(LOADER_BIN)
+
+download:
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: loader-compile
+
+install:
+
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.c b/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.c
new file mode 100644
index 00000000..cb834537
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.c
@@ -0,0 +1,584 @@
+/*
+  LzmaDecode.c
+  LZMA Decoder (optimized for Speed version)
+  
+  LZMA SDK 4.40 Copyright (c) 1999-2006 Igor Pavlov (2006-05-01)
+  http://www.7-zip.org/
+
+  LZMA SDK is licensed under two licenses:
+  1) GNU Lesser General Public License (GNU LGPL)
+  2) Common Public License (CPL)
+  It means that you can select one of these two licenses and 
+  follow rules of that license.
+
+  SPECIAL EXCEPTION:
+  Igor Pavlov, as the author of this Code, expressly permits you to 
+  statically or dynamically link your Code (or bind by name) to the 
+  interfaces of this file without subjecting your linked Code to the 
+  terms of the CPL or GNU LGPL. Any modifications or additions 
+  to this file, however, are subject to the LGPL or CPL terms.
+*/
+
+#include "LzmaDecode.h"
+
+#define kNumTopBits 24
+#define kTopValue ((UInt32)1 << kNumTopBits)
+
+#define kNumBitModelTotalBits 11
+#define kBitModelTotal (1 << kNumBitModelTotalBits)
+#define kNumMoveBits 5
+
+#define RC_READ_BYTE (*Buffer++)
+
+#define RC_INIT2 Code = 0; Range = 0xFFFFFFFF; \
+  { int i; for(i = 0; i < 5; i++) { RC_TEST; Code = (Code << 8) | RC_READ_BYTE; }}
+
+#ifdef _LZMA_IN_CB
+
+#define RC_TEST { if (Buffer == BufferLim) \
+  { SizeT size; int result = InCallback->Read(InCallback, &Buffer, &size); if (result != LZMA_RESULT_OK) return result; \
+  BufferLim = Buffer + size; if (size == 0) return LZMA_RESULT_DATA_ERROR; }}
+
+#define RC_INIT Buffer = BufferLim = 0; RC_INIT2
+
+#else
+
+#define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; }
+
+#define RC_INIT(buffer, bufferSize) Buffer = buffer; BufferLim = buffer + bufferSize; RC_INIT2
+ 
+#endif
+
+#define RC_NORMALIZE if (Range < kTopValue) { RC_TEST; Range <<= 8; Code = (Code << 8) | RC_READ_BYTE; }
+
+#define IfBit0(p) RC_NORMALIZE; bound = (Range >> kNumBitModelTotalBits) * *(p); if (Code < bound)
+#define UpdateBit0(p) Range = bound; *(p) += (kBitModelTotal - *(p)) >> kNumMoveBits;
+#define UpdateBit1(p) Range -= bound; Code -= bound; *(p) -= (*(p)) >> kNumMoveBits;
+
+#define RC_GET_BIT2(p, mi, A0, A1) IfBit0(p) \
+  { UpdateBit0(p); mi <<= 1; A0; } else \
+  { UpdateBit1(p); mi = (mi + mi) + 1; A1; } 
+  
+#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;)               
+
+#define RangeDecoderBitTreeDecode(probs, numLevels, res) \
+  { int i = numLevels; res = 1; \
+  do { CProb *p = probs + res; RC_GET_BIT(p, res) } while(--i != 0); \
+  res -= (1 << numLevels); }
+
+
+#define kNumPosBitsMax 4
+#define kNumPosStatesMax (1 << kNumPosBitsMax)
+
+#define kLenNumLowBits 3
+#define kLenNumLowSymbols (1 << kLenNumLowBits)
+#define kLenNumMidBits 3
+#define kLenNumMidSymbols (1 << kLenNumMidBits)
+#define kLenNumHighBits 8
+#define kLenNumHighSymbols (1 << kLenNumHighBits)
+
+#define LenChoice 0
+#define LenChoice2 (LenChoice + 1)
+#define LenLow (LenChoice2 + 1)
+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
+#define kNumLenProbs (LenHigh + kLenNumHighSymbols) 
+
+
+#define kNumStates 12
+#define kNumLitStates 7
+
+#define kStartPosModelIndex 4
+#define kEndPosModelIndex 14
+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
+
+#define kNumPosSlotBits 6
+#define kNumLenToPosStates 4
+
+#define kNumAlignBits 4
+#define kAlignTableSize (1 << kNumAlignBits)
+
+#define kMatchMinLen 2
+
+#define IsMatch 0
+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
+#define IsRepG0 (IsRep + kNumStates)
+#define IsRepG1 (IsRepG0 + kNumStates)
+#define IsRepG2 (IsRepG1 + kNumStates)
+#define IsRep0Long (IsRepG2 + kNumStates)
+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
+#define LenCoder (Align + kAlignTableSize)
+#define RepLenCoder (LenCoder + kNumLenProbs)
+#define Literal (RepLenCoder + kNumLenProbs)
+
+#if Literal != LZMA_BASE_SIZE
+StopCompilingDueBUG
+#endif
+
+int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size)
+{
+  unsigned char prop0;
+  if (size < LZMA_PROPERTIES_SIZE)
+    return LZMA_RESULT_DATA_ERROR;
+  prop0 = propsData[0];
+  if (prop0 >= (9 * 5 * 5))
+    return LZMA_RESULT_DATA_ERROR;
+  {
+    for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 5));
+    for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9);
+    propsRes->lc = prop0;
+    /*
+    unsigned char remainder = (unsigned char)(prop0 / 9);
+    propsRes->lc = prop0 % 9;
+    propsRes->pb = remainder / 5;
+    propsRes->lp = remainder % 5;
+    */
+  }
+
+  #ifdef _LZMA_OUT_READ
+  {
+    int i;
+    propsRes->DictionarySize = 0;
+    for (i = 0; i < 4; i++)
+      propsRes->DictionarySize += (UInt32)(propsData[1 + i]) << (i * 8);
+    if (propsRes->DictionarySize == 0)
+      propsRes->DictionarySize = 1;
+  }
+  #endif
+  return LZMA_RESULT_OK;
+}
+
+#define kLzmaStreamWasFinishedId (-1)
+
+int LzmaDecode(CLzmaDecoderState *vs,
+    #ifdef _LZMA_IN_CB
+    ILzmaInCallback *InCallback,
+    #else
+    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
+    #endif
+    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed)
+{
+  CProb *p = vs->Probs;
+  SizeT nowPos = 0;
+  Byte previousByte = 0;
+  UInt32 posStateMask = (1 << (vs->Properties.pb)) - 1;
+  UInt32 literalPosMask = (1 << (vs->Properties.lp)) - 1;
+  int lc = vs->Properties.lc;
+
+  #ifdef _LZMA_OUT_READ
+  
+  UInt32 Range = vs->Range;
+  UInt32 Code = vs->Code;
+  #ifdef _LZMA_IN_CB
+  const Byte *Buffer = vs->Buffer;
+  const Byte *BufferLim = vs->BufferLim;
+  #else
+  const Byte *Buffer = inStream;
+  const Byte *BufferLim = inStream + inSize;
+  #endif
+  int state = vs->State;
+  UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3];
+  int len = vs->RemainLen;
+  UInt32 globalPos = vs->GlobalPos;
+  UInt32 distanceLimit = vs->DistanceLimit;
+
+  Byte *dictionary = vs->Dictionary;
+  UInt32 dictionarySize = vs->Properties.DictionarySize;
+  UInt32 dictionaryPos = vs->DictionaryPos;
+
+  Byte tempDictionary[4];
+
+  #ifndef _LZMA_IN_CB
+  *inSizeProcessed = 0;
+  #endif
+  *outSizeProcessed = 0;
+  if (len == kLzmaStreamWasFinishedId)
+    return LZMA_RESULT_OK;
+
+  if (dictionarySize == 0)
+  {
+    dictionary = tempDictionary;
+    dictionarySize = 1;
+    tempDictionary[0] = vs->TempDictionary[0];
+  }
+
+  if (len == kLzmaNeedInitId)
+  {
+    {
+      UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
+      UInt32 i;
+      for (i = 0; i < numProbs; i++)
+        p[i] = kBitModelTotal >> 1; 
+      rep0 = rep1 = rep2 = rep3 = 1;
+      state = 0;
+      globalPos = 0;
+      distanceLimit = 0;
+      dictionaryPos = 0;
+      dictionary[dictionarySize - 1] = 0;
+      #ifdef _LZMA_IN_CB
+      RC_INIT;
+      #else
+      RC_INIT(inStream, inSize);
+      #endif
+    }
+    len = 0;
+  }
+  while(len != 0 && nowPos < outSize)
+  {
+    UInt32 pos = dictionaryPos - rep0;
+    if (pos >= dictionarySize)
+      pos += dictionarySize;
+    outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos];
+    if (++dictionaryPos == dictionarySize)
+      dictionaryPos = 0;
+    len--;
+  }
+  if (dictionaryPos == 0)
+    previousByte = dictionary[dictionarySize - 1];
+  else
+    previousByte = dictionary[dictionaryPos - 1];
+
+  #else /* if !_LZMA_OUT_READ */
+
+  int state = 0;
+  UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
+  int len = 0;
+  const Byte *Buffer;
+  const Byte *BufferLim;
+  UInt32 Range;
+  UInt32 Code;
+
+  #ifndef _LZMA_IN_CB
+  *inSizeProcessed = 0;
+  #endif
+  *outSizeProcessed = 0;
+
+  {
+    UInt32 i;
+    UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
+    for (i = 0; i < numProbs; i++)
+      p[i] = kBitModelTotal >> 1;
+  }
+  
+  #ifdef _LZMA_IN_CB
+  RC_INIT;
+  #else
+  RC_INIT(inStream, inSize);
+  #endif
+
+  #endif /* _LZMA_OUT_READ */
+
+  while(nowPos < outSize)
+  {
+    CProb *prob;
+    UInt32 bound;
+    int posState = (int)(
+        (nowPos 
+        #ifdef _LZMA_OUT_READ
+        + globalPos
+        #endif
+        )
+        & posStateMask);
+
+    prob = p + IsMatch + (state << kNumPosBitsMax) + posState;
+    IfBit0(prob)
+    {
+      int symbol = 1;
+      UpdateBit0(prob)
+      prob = p + Literal + (LZMA_LIT_SIZE * 
+        (((
+        (nowPos 
+        #ifdef _LZMA_OUT_READ
+        + globalPos
+        #endif
+        )
+        & literalPosMask) << lc) + (previousByte >> (8 - lc))));
+
+      if (state >= kNumLitStates)
+      {
+        int matchByte;
+        #ifdef _LZMA_OUT_READ
+        UInt32 pos = dictionaryPos - rep0;
+        if (pos >= dictionarySize)
+          pos += dictionarySize;
+        matchByte = dictionary[pos];
+        #else
+        matchByte = outStream[nowPos - rep0];
+        #endif
+        do
+        {
+          int bit;
+          CProb *probLit;
+          matchByte <<= 1;
+          bit = (matchByte & 0x100);
+          probLit = prob + 0x100 + bit + symbol;
+          RC_GET_BIT2(probLit, symbol, if (bit != 0) break, if (bit == 0) break)
+        }
+        while (symbol < 0x100);
+      }
+      while (symbol < 0x100)
+      {
+        CProb *probLit = prob + symbol;
+        RC_GET_BIT(probLit, symbol)
+      }
+      previousByte = (Byte)symbol;
+
+      outStream[nowPos++] = previousByte;
+      #ifdef _LZMA_OUT_READ
+      if (distanceLimit < dictionarySize)
+        distanceLimit++;
+
+      dictionary[dictionaryPos] = previousByte;
+      if (++dictionaryPos == dictionarySize)
+        dictionaryPos = 0;
+      #endif
+      if (state < 4) state = 0;
+      else if (state < 10) state -= 3;
+      else state -= 6;
+    }
+    else             
+    {
+      UpdateBit1(prob);
+      prob = p + IsRep + state;
+      IfBit0(prob)
+      {
+        UpdateBit0(prob);
+        rep3 = rep2;
+        rep2 = rep1;
+        rep1 = rep0;
+        state = state < kNumLitStates ? 0 : 3;
+        prob = p + LenCoder;
+      }
+      else
+      {
+        UpdateBit1(prob);
+        prob = p + IsRepG0 + state;
+        IfBit0(prob)
+        {
+          UpdateBit0(prob);
+          prob = p + IsRep0Long + (state << kNumPosBitsMax) + posState;
+          IfBit0(prob)
+          {
+            #ifdef _LZMA_OUT_READ
+            UInt32 pos;
+            #endif
+            UpdateBit0(prob);
+            
+            #ifdef _LZMA_OUT_READ
+            if (distanceLimit == 0)
+            #else
+            if (nowPos == 0)
+            #endif
+              return LZMA_RESULT_DATA_ERROR;
+            
+            state = state < kNumLitStates ? 9 : 11;
+            #ifdef _LZMA_OUT_READ
+            pos = dictionaryPos - rep0;
+            if (pos >= dictionarySize)
+              pos += dictionarySize;
+            previousByte = dictionary[pos];
+            dictionary[dictionaryPos] = previousByte;
+            if (++dictionaryPos == dictionarySize)
+              dictionaryPos = 0;
+            #else
+            previousByte = outStream[nowPos - rep0];
+            #endif
+            outStream[nowPos++] = previousByte;
+            #ifdef _LZMA_OUT_READ
+            if (distanceLimit < dictionarySize)
+              distanceLimit++;
+            #endif
+
+            continue;
+          }
+          else
+          {
+            UpdateBit1(prob);
+          }
+        }
+        else
+        {
+          UInt32 distance;
+          UpdateBit1(prob);
+          prob = p + IsRepG1 + state;
+          IfBit0(prob)
+          {
+            UpdateBit0(prob);
+            distance = rep1;
+          }
+          else 
+          {
+            UpdateBit1(prob);
+            prob = p + IsRepG2 + state;
+            IfBit0(prob)
+            {
+              UpdateBit0(prob);
+              distance = rep2;
+            }
+            else
+            {
+              UpdateBit1(prob);
+              distance = rep3;
+              rep3 = rep2;
+            }
+            rep2 = rep1;
+          }
+          rep1 = rep0;
+          rep0 = distance;
+        }
+        state = state < kNumLitStates ? 8 : 11;
+        prob = p + RepLenCoder;
+      }
+      {
+        int numBits, offset;
+        CProb *probLen = prob + LenChoice;
+        IfBit0(probLen)
+        {
+          UpdateBit0(probLen);
+          probLen = prob + LenLow + (posState << kLenNumLowBits);
+          offset = 0;
+          numBits = kLenNumLowBits;
+        }
+        else
+        {
+          UpdateBit1(probLen);
+          probLen = prob + LenChoice2;
+          IfBit0(probLen)
+          {
+            UpdateBit0(probLen);
+            probLen = prob + LenMid + (posState << kLenNumMidBits);
+            offset = kLenNumLowSymbols;
+            numBits = kLenNumMidBits;
+          }
+          else
+          {
+            UpdateBit1(probLen);
+            probLen = prob + LenHigh;
+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
+            numBits = kLenNumHighBits;
+          }
+        }
+        RangeDecoderBitTreeDecode(probLen, numBits, len);
+        len += offset;
+      }
+
+      if (state < 4)
+      {
+        int posSlot;
+        state += kNumLitStates;
+        prob = p + PosSlot +
+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << 
+            kNumPosSlotBits);
+        RangeDecoderBitTreeDecode(prob, kNumPosSlotBits, posSlot);
+        if (posSlot >= kStartPosModelIndex)
+        {
+          int numDirectBits = ((posSlot >> 1) - 1);
+          rep0 = (2 | ((UInt32)posSlot & 1));
+          if (posSlot < kEndPosModelIndex)
+          {
+            rep0 <<= numDirectBits;
+            prob = p + SpecPos + rep0 - posSlot - 1;
+          }
+          else
+          {
+            numDirectBits -= kNumAlignBits;
+            do
+            {
+              RC_NORMALIZE
+              Range >>= 1;
+              rep0 <<= 1;
+              if (Code >= Range)
+              {
+                Code -= Range;
+                rep0 |= 1;
+              }
+            }
+            while (--numDirectBits != 0);
+            prob = p + Align;
+            rep0 <<= kNumAlignBits;
+            numDirectBits = kNumAlignBits;
+          }
+          {
+            int i = 1;
+            int mi = 1;
+            do
+            {
+              CProb *prob3 = prob + mi;
+              RC_GET_BIT2(prob3, mi, ; , rep0 |= i);
+              i <<= 1;
+            }
+            while(--numDirectBits != 0);
+          }
+        }
+        else
+          rep0 = posSlot;
+        if (++rep0 == (UInt32)(0))
+        {
+          /* it's for stream version */
+          len = kLzmaStreamWasFinishedId;
+          break;
+        }
+      }
+
+      len += kMatchMinLen;
+      #ifdef _LZMA_OUT_READ
+      if (rep0 > distanceLimit) 
+      #else
+      if (rep0 > nowPos)
+      #endif
+        return LZMA_RESULT_DATA_ERROR;
+
+      #ifdef _LZMA_OUT_READ
+      if (dictionarySize - distanceLimit > (UInt32)len)
+        distanceLimit += len;
+      else
+        distanceLimit = dictionarySize;
+      #endif
+
+      do
+      {
+        #ifdef _LZMA_OUT_READ
+        UInt32 pos = dictionaryPos - rep0;
+        if (pos >= dictionarySize)
+          pos += dictionarySize;
+        previousByte = dictionary[pos];
+        dictionary[dictionaryPos] = previousByte;
+        if (++dictionaryPos == dictionarySize)
+          dictionaryPos = 0;
+        #else
+        previousByte = outStream[nowPos - rep0];
+        #endif
+        len--;
+        outStream[nowPos++] = previousByte;
+      }
+      while(len != 0 && nowPos < outSize);
+    }
+  }
+  RC_NORMALIZE;
+
+  #ifdef _LZMA_OUT_READ
+  vs->Range = Range;
+  vs->Code = Code;
+  vs->DictionaryPos = dictionaryPos;
+  vs->GlobalPos = globalPos + (UInt32)nowPos;
+  vs->DistanceLimit = distanceLimit;
+  vs->Reps[0] = rep0;
+  vs->Reps[1] = rep1;
+  vs->Reps[2] = rep2;
+  vs->Reps[3] = rep3;
+  vs->State = state;
+  vs->RemainLen = len;
+  vs->TempDictionary[0] = tempDictionary[0];
+  #endif
+
+  #ifdef _LZMA_IN_CB
+  vs->Buffer = Buffer;
+  vs->BufferLim = BufferLim;
+  #else
+  *inSizeProcessed = (SizeT)(Buffer - inStream);
+  #endif
+  *outSizeProcessed = nowPos;
+  return LZMA_RESULT_OK;
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.h
new file mode 100644
index 00000000..2870eeb9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaDecode.h
@@ -0,0 +1,113 @@
+/* 
+  LzmaDecode.h
+  LZMA Decoder interface
+
+  LZMA SDK 4.40 Copyright (c) 1999-2006 Igor Pavlov (2006-05-01)
+  http://www.7-zip.org/
+
+  LZMA SDK is licensed under two licenses:
+  1) GNU Lesser General Public License (GNU LGPL)
+  2) Common Public License (CPL)
+  It means that you can select one of these two licenses and 
+  follow rules of that license.
+
+  SPECIAL EXCEPTION:
+  Igor Pavlov, as the author of this code, expressly permits you to 
+  statically or dynamically link your code (or bind by name) to the 
+  interfaces of this file without subjecting your linked code to the 
+  terms of the CPL or GNU LGPL. Any modifications or additions 
+  to this file, however, are subject to the LGPL or CPL terms.
+*/
+
+#ifndef __LZMADECODE_H
+#define __LZMADECODE_H
+
+#include "LzmaTypes.h"
+
+/* #define _LZMA_IN_CB */
+/* Use callback for input data */
+
+/* #define _LZMA_OUT_READ */
+/* Use read function for output data */
+
+/* #define _LZMA_PROB32 */
+/* It can increase speed on some 32-bit CPUs, 
+   but memory usage will be doubled in that case */
+
+/* #define _LZMA_LOC_OPT */
+/* Enable local speed optimizations inside code */
+
+#ifdef _LZMA_PROB32
+#define CProb UInt32
+#else
+#define CProb UInt16
+#endif
+
+#define LZMA_RESULT_OK 0
+#define LZMA_RESULT_DATA_ERROR 1
+
+#ifdef _LZMA_IN_CB
+typedef struct _ILzmaInCallback
+{
+  int (*Read)(void *object, const unsigned char **buffer, SizeT *bufferSize);
+} ILzmaInCallback;
+#endif
+
+#define LZMA_BASE_SIZE 1846
+#define LZMA_LIT_SIZE 768
+
+#define LZMA_PROPERTIES_SIZE 5
+
+typedef struct _CLzmaProperties
+{
+  int lc;
+  int lp;
+  int pb;
+  #ifdef _LZMA_OUT_READ
+  UInt32 DictionarySize;
+  #endif
+}CLzmaProperties;
+
+int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size);
+
+#define LzmaGetNumProbs(Properties) (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((Properties)->lc + (Properties)->lp)))
+
+#define kLzmaNeedInitId (-2)
+
+typedef struct _CLzmaDecoderState
+{
+  CLzmaProperties Properties;
+  CProb *Probs;
+
+  #ifdef _LZMA_IN_CB
+  const unsigned char *Buffer;
+  const unsigned char *BufferLim;
+  #endif
+
+  #ifdef _LZMA_OUT_READ
+  unsigned char *Dictionary;
+  UInt32 Range;
+  UInt32 Code;
+  UInt32 DictionaryPos;
+  UInt32 GlobalPos;
+  UInt32 DistanceLimit;
+  UInt32 Reps[4];
+  int State;
+  int RemainLen;
+  unsigned char TempDictionary[4];
+  #endif
+} CLzmaDecoderState;
+
+#ifdef _LZMA_OUT_READ
+#define LzmaDecoderInit(vs) { (vs)->RemainLen = kLzmaNeedInitId; }
+#endif
+
+int LzmaDecode(CLzmaDecoderState *vs,
+    #ifdef _LZMA_IN_CB
+    ILzmaInCallback *inCallback,
+    #else
+    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
+    #endif
+    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed);
+
+#endif
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaTypes.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaTypes.h
new file mode 100644
index 00000000..9c272907
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/LzmaTypes.h
@@ -0,0 +1,45 @@
+/* 
+LzmaTypes.h 
+
+Types for LZMA Decoder
+
+This file written and distributed to public domain by Igor Pavlov.
+This file is part of LZMA SDK 4.40 (2006-05-01)
+*/
+
+#ifndef __LZMATYPES_H
+#define __LZMATYPES_H
+
+#ifndef _7ZIP_BYTE_DEFINED
+#define _7ZIP_BYTE_DEFINED
+typedef unsigned char Byte;
+#endif 
+
+#ifndef _7ZIP_UINT16_DEFINED
+#define _7ZIP_UINT16_DEFINED
+typedef unsigned short UInt16;
+#endif 
+
+#ifndef _7ZIP_UINT32_DEFINED
+#define _7ZIP_UINT32_DEFINED
+#ifdef _LZMA_UINT32_IS_ULONG
+typedef unsigned long UInt32;
+#else
+typedef unsigned int UInt32;
+#endif
+#endif 
+
+/* #define _LZMA_NO_SYSTEM_SIZE_T */
+/* You can use it, if you don't want <stddef.h> */
+
+#ifndef _7ZIP_SIZET_DEFINED
+#define _7ZIP_SIZET_DEFINED
+#ifdef _LZMA_NO_SYSTEM_SIZE_T
+typedef UInt32 SizeT;
+#else
+#include <stddef.h>
+typedef size_t SizeT;
+#endif
+#endif
+
+#endif
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile b/trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile
new file mode 100644
index 00000000..d5d891bd
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile
@@ -0,0 +1,105 @@
+#
+# Makefile for the LZMA compressed kernel loader for
+# Atheros AR7XXX/AR9XXX based boards
+#
+# Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+#
+# Some parts of this file was based on the libreCMC specific lzma-loader
+# for the BCM47xx and ADM5120 based boards:
+#	Copyright (C) 2004 Manuel Novoa III (mjn3@codepoet.org)
+#	Copyright (C) 2005 Mineharu Takahara <mtakahar@yahoo.com>
+#	Copyright (C) 2005 by Oleg I. Vdovikin <oleg@cs.msu.su>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
+#
+
+LOADADDR	:=
+LZMA_TEXT_START	:= 0x80a00000
+LOADER_DATA	:=
+BOARD		:=
+FLASH_OFFS	:=
+FLASH_MAX	:=
+
+CC		:= $(CROSS_COMPILE)gcc
+LD		:= $(CROSS_COMPILE)ld
+OBJCOPY		:= $(CROSS_COMPILE)objcopy
+OBJDUMP		:= $(CROSS_COMPILE)objdump
+
+BIN_FLAGS	:= -O binary -R .reginfo -R .note -R .comment -R .mdebug -S
+
+CFLAGS		= -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
+		  -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \
+		  -mno-abicalls -fno-pic -ffunction-sections -pipe -mlong-calls \
+		  -fno-common -ffreestanding -fhonour-copts \
+		  -mabi=32 -march=mips32r2 \
+		  -Wa,-32 -Wa,-march=mips32r2 -Wa,-mips32r2 -Wa,--trap
+CFLAGS		+= -D_LZMA_PROB32
+
+ASFLAGS		= $(CFLAGS) -D__ASSEMBLY__
+
+LDFLAGS		= -static --gc-sections -no-warn-mismatch
+LDFLAGS		+= -e startup -T loader.lds -Ttext $(LZMA_TEXT_START)
+
+O_FORMAT 	= $(shell $(OBJDUMP) -i | head -2 | grep elf32)
+
+OBJECTS		:= head.o loader.o cache.o board.o printf.o LzmaDecode.o
+
+ifneq ($(strip $(LOADER_DATA)),)
+OBJECTS		+= data.o
+CFLAGS		+= -DLZMA_WRAPPER=1 -DLOADADDR=$(LOADADDR)
+endif
+
+ifneq ($(strip $(KERNEL_CMDLINE)),)
+CFLAGS		+= -DCONFIG_KERNEL_CMDLINE='"$(KERNEL_CMDLINE)"'
+endif
+
+ifneq ($(strip $(FLASH_OFFS)),)
+CFLAGS		+= -DCONFIG_FLASH_OFFS=$(FLASH_OFFS)
+endif
+
+ifneq ($(strip $(FLASH_MAX)),)
+CFLAGS		+= -DCONFIG_FLASH_MAX=$(FLASH_MAX)
+endif
+
+BOARD_DEF := $(shell echo $(strip $(BOARD)) | tr a-z A-Z | tr - _)
+ifneq ($(BOARD_DEF),)
+CFLAGS		+= -DCONFIG_BOARD_$(BOARD_DEF)
+endif
+
+all: loader.elf
+
+# Don't build dependencies, this may die if $(CC) isn't gcc
+dep:
+
+install:
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+%.o : %.S
+	$(CC) $(ASFLAGS) -c -o $@ $<
+
+data.o: $(LOADER_DATA)
+	$(LD) -r -b binary --oformat $(O_FORMAT) -T lzma-data.lds -o $@ $<
+
+loader: $(OBJECTS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJECTS)
+
+loader.bin: loader
+	$(OBJCOPY) $(BIN_FLAGS) $< $@
+
+loader2.o: loader.bin
+	$(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
+
+loader.elf: loader2.o
+	$(LD) -e startup -T loader2.lds -Ttext $(LOADADDR) -o $@ $<
+
+mrproper: clean
+
+clean:
+	rm -f loader *.elf *.bin *.o
+
+
+
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/ar71xx_regs.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/ar71xx_regs.h
new file mode 100644
index 00000000..19a4785b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/ar71xx_regs.h
@@ -0,0 +1,725 @@
+/*
+ *  Atheros AR71XX/AR724X/AR913X SoC register definitions
+ *
+ *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#ifndef __ASM_MACH_AR71XX_REGS_H
+#define __ASM_MACH_AR71XX_REGS_H
+
+#define BIT(_x)			(1UL << (_x))
+
+#define AR71XX_APB_BASE		0x18000000
+#define AR71XX_GE0_BASE		0x19000000
+#define AR71XX_GE0_SIZE		0x10000
+#define AR71XX_GE1_BASE		0x1a000000
+#define AR71XX_GE1_SIZE		0x10000
+#define AR71XX_EHCI_BASE	0x1b000000
+#define AR71XX_EHCI_SIZE	0x1000
+#define AR71XX_OHCI_BASE	0x1c000000
+#define AR71XX_OHCI_SIZE	0x1000
+#define AR71XX_SPI_BASE		0x1f000000
+#define AR71XX_SPI_SIZE		0x01000000
+
+#define AR71XX_DDR_CTRL_BASE	(AR71XX_APB_BASE + 0x00000000)
+#define AR71XX_DDR_CTRL_SIZE	0x100
+#define AR71XX_UART_BASE	(AR71XX_APB_BASE + 0x00020000)
+#define AR71XX_UART_SIZE	0x100
+#define AR71XX_USB_CTRL_BASE	(AR71XX_APB_BASE + 0x00030000)
+#define AR71XX_USB_CTRL_SIZE	0x100
+#define AR71XX_GPIO_BASE        (AR71XX_APB_BASE + 0x00040000)
+#define AR71XX_GPIO_SIZE        0x100
+#define AR71XX_PLL_BASE		(AR71XX_APB_BASE + 0x00050000)
+#define AR71XX_PLL_SIZE		0x100
+#define AR71XX_RESET_BASE	(AR71XX_APB_BASE + 0x00060000)
+#define AR71XX_RESET_SIZE	0x100
+#define AR71XX_MII_BASE		(AR71XX_APB_BASE + 0x00070000)
+#define AR71XX_MII_SIZE		0x100
+
+#define AR71XX_PCI_MEM_BASE	0x10000000
+#define AR71XX_PCI_MEM_SIZE	0x07000000
+
+#define AR71XX_PCI_WIN0_OFFS	0x10000000
+#define AR71XX_PCI_WIN1_OFFS	0x11000000
+#define AR71XX_PCI_WIN2_OFFS	0x12000000
+#define AR71XX_PCI_WIN3_OFFS	0x13000000
+#define AR71XX_PCI_WIN4_OFFS	0x14000000
+#define AR71XX_PCI_WIN5_OFFS	0x15000000
+#define AR71XX_PCI_WIN6_OFFS	0x16000000
+#define AR71XX_PCI_WIN7_OFFS	0x07000000
+
+#define AR71XX_PCI_CFG_BASE	\
+	(AR71XX_PCI_MEM_BASE + AR71XX_PCI_WIN7_OFFS + 0x10000)
+#define AR71XX_PCI_CFG_SIZE	0x100
+
+#define AR7240_USB_CTRL_BASE	(AR71XX_APB_BASE + 0x00030000)
+#define AR7240_USB_CTRL_SIZE	0x100
+#define AR7240_OHCI_BASE	0x1b000000
+#define AR7240_OHCI_SIZE	0x1000
+
+#define AR724X_PCI_MEM_BASE	0x10000000
+#define AR724X_PCI_MEM_SIZE	0x04000000
+
+#define AR724X_PCI_CFG_BASE	0x14000000
+#define AR724X_PCI_CFG_SIZE	0x1000
+#define AR724X_PCI_CRP_BASE	(AR71XX_APB_BASE + 0x000c0000)
+#define AR724X_PCI_CRP_SIZE	0x1000
+#define AR724X_PCI_CTRL_BASE	(AR71XX_APB_BASE + 0x000f0000)
+#define AR724X_PCI_CTRL_SIZE	0x100
+
+#define AR724X_EHCI_BASE	0x1b000000
+#define AR724X_EHCI_SIZE	0x1000
+
+#define AR913X_EHCI_BASE	0x1b000000
+#define AR913X_EHCI_SIZE	0x1000
+#define AR913X_WMAC_BASE	(AR71XX_APB_BASE + 0x000C0000)
+#define AR913X_WMAC_SIZE	0x30000
+
+#define AR933X_UART_BASE	(AR71XX_APB_BASE + 0x00020000)
+#define AR933X_UART_SIZE	0x14
+#define AR933X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
+#define AR933X_GMAC_SIZE	0x04
+#define AR933X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
+#define AR933X_WMAC_SIZE	0x20000
+#define AR933X_EHCI_BASE	0x1b000000
+#define AR933X_EHCI_SIZE	0x1000
+
+#define AR934X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
+#define AR934X_GMAC_SIZE	0x14
+#define AR934X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
+#define AR934X_WMAC_SIZE	0x20000
+#define AR934X_EHCI_BASE	0x1b000000
+#define AR934X_EHCI_SIZE	0x200
+
+#define QCA955X_PCI_MEM_BASE0	0x10000000
+#define QCA955X_PCI_MEM_BASE1	0x12000000
+#define QCA955X_PCI_MEM_SIZE	0x02000000
+#define QCA955X_PCI_CFG_BASE0	0x14000000
+#define QCA955X_PCI_CFG_BASE1	0x16000000
+#define QCA955X_PCI_CFG_SIZE	0x1000
+#define QCA955X_PCI_CRP_BASE0	(AR71XX_APB_BASE + 0x000c0000)
+#define QCA955X_PCI_CRP_BASE1	(AR71XX_APB_BASE + 0x00250000)
+#define QCA955X_PCI_CRP_SIZE	0x1000
+#define QCA955X_PCI_CTRL_BASE0	(AR71XX_APB_BASE + 0x000f0000)
+#define QCA955X_PCI_CTRL_BASE1	(AR71XX_APB_BASE + 0x00280000)
+#define QCA955X_PCI_CTRL_SIZE	0x100
+
+#define QCA955X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
+#define QCA955X_WMAC_SIZE	0x20000
+#define QCA955X_EHCI0_BASE	0x1b000000
+#define QCA955X_EHCI1_BASE	0x1b400000
+#define QCA955X_EHCI_SIZE	0x1000
+#define QCA955X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
+#define QCA955X_GMAC_SIZE	0x40
+
+#define AR9300_OTP_BASE		0x14000
+#define AR9300_OTP_STATUS	0x15f18
+#define AR9300_OTP_STATUS_TYPE		0x7
+#define AR9300_OTP_STATUS_VALID		0x4
+#define AR9300_OTP_STATUS_ACCESS_BUSY	0x2
+#define AR9300_OTP_STATUS_SM_BUSY	0x1
+#define AR9300_OTP_READ_DATA	0x15f1c
+
+/*
+ * DDR_CTRL block
+ */
+#define AR71XX_DDR_REG_PCI_WIN0		0x7c
+#define AR71XX_DDR_REG_PCI_WIN1		0x80
+#define AR71XX_DDR_REG_PCI_WIN2		0x84
+#define AR71XX_DDR_REG_PCI_WIN3		0x88
+#define AR71XX_DDR_REG_PCI_WIN4		0x8c
+#define AR71XX_DDR_REG_PCI_WIN5		0x90
+#define AR71XX_DDR_REG_PCI_WIN6		0x94
+#define AR71XX_DDR_REG_PCI_WIN7		0x98
+#define AR71XX_DDR_REG_FLUSH_GE0	0x9c
+#define AR71XX_DDR_REG_FLUSH_GE1	0xa0
+#define AR71XX_DDR_REG_FLUSH_USB	0xa4
+#define AR71XX_DDR_REG_FLUSH_PCI	0xa8
+
+#define AR724X_DDR_REG_FLUSH_GE0	0x7c
+#define AR724X_DDR_REG_FLUSH_GE1	0x80
+#define AR724X_DDR_REG_FLUSH_USB	0x84
+#define AR724X_DDR_REG_FLUSH_PCIE	0x88
+
+#define AR913X_DDR_REG_FLUSH_GE0	0x7c
+#define AR913X_DDR_REG_FLUSH_GE1	0x80
+#define AR913X_DDR_REG_FLUSH_USB	0x84
+#define AR913X_DDR_REG_FLUSH_WMAC	0x88
+
+#define AR933X_DDR_REG_FLUSH_GE0	0x7c
+#define AR933X_DDR_REG_FLUSH_GE1	0x80
+#define AR933X_DDR_REG_FLUSH_USB	0x84
+#define AR933X_DDR_REG_FLUSH_WMAC	0x88
+
+#define AR934X_DDR_REG_FLUSH_GE0	0x9c
+#define AR934X_DDR_REG_FLUSH_GE1	0xa0
+#define AR934X_DDR_REG_FLUSH_USB	0xa4
+#define AR934X_DDR_REG_FLUSH_PCIE	0xa8
+#define AR934X_DDR_REG_FLUSH_WMAC	0xac
+
+/*
+ * PLL block
+ */
+#define AR71XX_PLL_REG_CPU_CONFIG	0x00
+#define AR71XX_PLL_REG_SEC_CONFIG	0x04
+#define AR71XX_PLL_REG_ETH0_INT_CLOCK	0x10
+#define AR71XX_PLL_REG_ETH1_INT_CLOCK	0x14
+
+#define AR71XX_PLL_DIV_SHIFT		3
+#define AR71XX_PLL_DIV_MASK		0x1f
+#define AR71XX_CPU_DIV_SHIFT		16
+#define AR71XX_CPU_DIV_MASK		0x3
+#define AR71XX_DDR_DIV_SHIFT		18
+#define AR71XX_DDR_DIV_MASK		0x3
+#define AR71XX_AHB_DIV_SHIFT		20
+#define AR71XX_AHB_DIV_MASK		0x7
+
+#define AR71XX_ETH0_PLL_SHIFT		17
+#define AR71XX_ETH1_PLL_SHIFT		19
+
+#define AR724X_PLL_REG_CPU_CONFIG	0x00
+#define AR724X_PLL_REG_PCIE_CONFIG	0x18
+
+#define AR724X_PLL_DIV_SHIFT		0
+#define AR724X_PLL_DIV_MASK		0x3ff
+#define AR724X_PLL_REF_DIV_SHIFT	10
+#define AR724X_PLL_REF_DIV_MASK		0xf
+#define AR724X_AHB_DIV_SHIFT		19
+#define AR724X_AHB_DIV_MASK		0x1
+#define AR724X_DDR_DIV_SHIFT		22
+#define AR724X_DDR_DIV_MASK		0x3
+
+#define AR7242_PLL_REG_ETH0_INT_CLOCK	0x2c
+
+#define AR913X_PLL_REG_CPU_CONFIG	0x00
+#define AR913X_PLL_REG_ETH_CONFIG	0x04
+#define AR913X_PLL_REG_ETH0_INT_CLOCK	0x14
+#define AR913X_PLL_REG_ETH1_INT_CLOCK	0x18
+
+#define AR913X_PLL_DIV_SHIFT		0
+#define AR913X_PLL_DIV_MASK		0x3ff
+#define AR913X_DDR_DIV_SHIFT		22
+#define AR913X_DDR_DIV_MASK		0x3
+#define AR913X_AHB_DIV_SHIFT		19
+#define AR913X_AHB_DIV_MASK		0x1
+
+#define AR913X_ETH0_PLL_SHIFT		20
+#define AR913X_ETH1_PLL_SHIFT		22
+
+#define AR933X_PLL_CPU_CONFIG_REG	0x00
+#define AR933X_PLL_CLOCK_CTRL_REG	0x08
+
+#define AR933X_PLL_CPU_CONFIG_NINT_SHIFT	10
+#define AR933X_PLL_CPU_CONFIG_NINT_MASK		0x3f
+#define AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT	16
+#define AR933X_PLL_CPU_CONFIG_REFDIV_MASK	0x1f
+#define AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT	23
+#define AR933X_PLL_CPU_CONFIG_OUTDIV_MASK	0x7
+
+#define AR933X_PLL_CLOCK_CTRL_BYPASS		BIT(2)
+#define AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT	5
+#define AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK	0x3
+#define AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT	10
+#define AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK	0x3
+#define AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT	15
+#define AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK	0x7
+
+#define AR934X_PLL_CPU_CONFIG_REG		0x00
+#define AR934X_PLL_DDR_CONFIG_REG		0x04
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_REG		0x08
+#define AR934X_PLL_ETH_XMII_CONTROL_REG		0x2c
+
+#define AR934X_PLL_CPU_CONFIG_NFRAC_SHIFT	0
+#define AR934X_PLL_CPU_CONFIG_NFRAC_MASK	0x3f
+#define AR934X_PLL_CPU_CONFIG_NINT_SHIFT	6
+#define AR934X_PLL_CPU_CONFIG_NINT_MASK		0x3f
+#define AR934X_PLL_CPU_CONFIG_REFDIV_SHIFT	12
+#define AR934X_PLL_CPU_CONFIG_REFDIV_MASK	0x1f
+#define AR934X_PLL_CPU_CONFIG_OUTDIV_SHIFT	19
+#define AR934X_PLL_CPU_CONFIG_OUTDIV_MASK	0x3
+
+#define AR934X_PLL_DDR_CONFIG_NFRAC_SHIFT	0
+#define AR934X_PLL_DDR_CONFIG_NFRAC_MASK	0x3ff
+#define AR934X_PLL_DDR_CONFIG_NINT_SHIFT	10
+#define AR934X_PLL_DDR_CONFIG_NINT_MASK		0x3f
+#define AR934X_PLL_DDR_CONFIG_REFDIV_SHIFT	16
+#define AR934X_PLL_DDR_CONFIG_REFDIV_MASK	0x1f
+#define AR934X_PLL_DDR_CONFIG_OUTDIV_SHIFT	23
+#define AR934X_PLL_DDR_CONFIG_OUTDIV_MASK	0x7
+
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_PLL_BYPASS	BIT(2)
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_DDR_PLL_BYPASS	BIT(3)
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_AHB_PLL_BYPASS	BIT(4)
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_SHIFT	5
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_MASK	0x1f
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_DDR_POST_DIV_SHIFT	10
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_DDR_POST_DIV_MASK	0x1f
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_AHB_POST_DIV_SHIFT	15
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_AHB_POST_DIV_MASK	0x1f
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_CPUCLK_FROM_CPUPLL	BIT(20)
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_DDRCLK_FROM_DDRPLL	BIT(21)
+#define AR934X_PLL_CPU_DDR_CLK_CTRL_AHBCLK_FROM_DDRPLL	BIT(24)
+
+#define QCA955X_PLL_CPU_CONFIG_REG		0x00
+#define QCA955X_PLL_DDR_CONFIG_REG		0x04
+#define QCA955X_PLL_CLK_CTRL_REG		0x08
+
+#define QCA955X_PLL_CPU_CONFIG_NFRAC_SHIFT	0
+#define QCA955X_PLL_CPU_CONFIG_NFRAC_MASK	0x3f
+#define QCA955X_PLL_CPU_CONFIG_NINT_SHIFT	6
+#define QCA955X_PLL_CPU_CONFIG_NINT_MASK	0x3f
+#define QCA955X_PLL_CPU_CONFIG_REFDIV_SHIFT	12
+#define QCA955X_PLL_CPU_CONFIG_REFDIV_MASK	0x1f
+#define QCA955X_PLL_CPU_CONFIG_OUTDIV_SHIFT	19
+#define QCA955X_PLL_CPU_CONFIG_OUTDIV_MASK	0x3
+
+#define QCA955X_PLL_DDR_CONFIG_NFRAC_SHIFT	0
+#define QCA955X_PLL_DDR_CONFIG_NFRAC_MASK	0x3ff
+#define QCA955X_PLL_DDR_CONFIG_NINT_SHIFT	10
+#define QCA955X_PLL_DDR_CONFIG_NINT_MASK	0x3f
+#define QCA955X_PLL_DDR_CONFIG_REFDIV_SHIFT	16
+#define QCA955X_PLL_DDR_CONFIG_REFDIV_MASK	0x1f
+#define QCA955X_PLL_DDR_CONFIG_OUTDIV_SHIFT	23
+#define QCA955X_PLL_DDR_CONFIG_OUTDIV_MASK	0x7
+
+#define QCA955X_PLL_CLK_CTRL_CPU_PLL_BYPASS		BIT(2)
+#define QCA955X_PLL_CLK_CTRL_DDR_PLL_BYPASS		BIT(3)
+#define QCA955X_PLL_CLK_CTRL_AHB_PLL_BYPASS		BIT(4)
+#define QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT		5
+#define QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_MASK		0x1f
+#define QCA955X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT		10
+#define QCA955X_PLL_CLK_CTRL_DDR_POST_DIV_MASK		0x1f
+#define QCA955X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT		15
+#define QCA955X_PLL_CLK_CTRL_AHB_POST_DIV_MASK		0x1f
+#define QCA955X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL		BIT(20)
+#define QCA955X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL		BIT(21)
+#define QCA955X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL		BIT(24)
+
+/*
+ * USB_CONFIG block
+ */
+#define AR71XX_USB_CTRL_REG_FLADJ	0x00
+#define AR71XX_USB_CTRL_REG_CONFIG	0x04
+
+/*
+ * RESET block
+ */
+#define AR71XX_RESET_REG_TIMER			0x00
+#define AR71XX_RESET_REG_TIMER_RELOAD		0x04
+#define AR71XX_RESET_REG_WDOG_CTRL		0x08
+#define AR71XX_RESET_REG_WDOG			0x0c
+#define AR71XX_RESET_REG_MISC_INT_STATUS	0x10
+#define AR71XX_RESET_REG_MISC_INT_ENABLE	0x14
+#define AR71XX_RESET_REG_PCI_INT_STATUS		0x18
+#define AR71XX_RESET_REG_PCI_INT_ENABLE		0x1c
+#define AR71XX_RESET_REG_GLOBAL_INT_STATUS	0x20
+#define AR71XX_RESET_REG_RESET_MODULE		0x24
+#define AR71XX_RESET_REG_PERFC_CTRL		0x2c
+#define AR71XX_RESET_REG_PERFC0			0x30
+#define AR71XX_RESET_REG_PERFC1			0x34
+#define AR71XX_RESET_REG_REV_ID			0x90
+
+#define AR913X_RESET_REG_GLOBAL_INT_STATUS	0x18
+#define AR913X_RESET_REG_RESET_MODULE		0x1c
+#define AR913X_RESET_REG_PERF_CTRL		0x20
+#define AR913X_RESET_REG_PERFC0			0x24
+#define AR913X_RESET_REG_PERFC1			0x28
+
+#define AR724X_RESET_REG_RESET_MODULE		0x1c
+
+#define AR933X_RESET_REG_RESET_MODULE		0x1c
+#define AR933X_RESET_REG_BOOTSTRAP		0xac
+
+#define AR934X_RESET_REG_RESET_MODULE		0x1c
+#define AR934X_RESET_REG_BOOTSTRAP		0xb0
+#define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS	0xac
+
+#define QCA955X_RESET_REG_BOOTSTRAP		0xb0
+#define QCA955X_RESET_REG_EXT_INT_STATUS	0xac
+
+#define MISC_INT_ETHSW			BIT(12)
+#define MISC_INT_TIMER4			BIT(10)
+#define MISC_INT_TIMER3			BIT(9)
+#define MISC_INT_TIMER2			BIT(8)
+#define MISC_INT_DMA			BIT(7)
+#define MISC_INT_OHCI			BIT(6)
+#define MISC_INT_PERFC			BIT(5)
+#define MISC_INT_WDOG			BIT(4)
+#define MISC_INT_UART			BIT(3)
+#define MISC_INT_GPIO			BIT(2)
+#define MISC_INT_ERROR			BIT(1)
+#define MISC_INT_TIMER			BIT(0)
+
+#define AR71XX_RESET_EXTERNAL		BIT(28)
+#define AR71XX_RESET_FULL_CHIP		BIT(24)
+#define AR71XX_RESET_CPU_NMI		BIT(21)
+#define AR71XX_RESET_CPU_COLD		BIT(20)
+#define AR71XX_RESET_DMA		BIT(19)
+#define AR71XX_RESET_SLIC		BIT(18)
+#define AR71XX_RESET_STEREO		BIT(17)
+#define AR71XX_RESET_DDR		BIT(16)
+#define AR71XX_RESET_GE1_MAC		BIT(13)
+#define AR71XX_RESET_GE1_PHY		BIT(12)
+#define AR71XX_RESET_USBSUS_OVERRIDE	BIT(10)
+#define AR71XX_RESET_GE0_MAC		BIT(9)
+#define AR71XX_RESET_GE0_PHY		BIT(8)
+#define AR71XX_RESET_USB_OHCI_DLL	BIT(6)
+#define AR71XX_RESET_USB_HOST		BIT(5)
+#define AR71XX_RESET_USB_PHY		BIT(4)
+#define AR71XX_RESET_PCI_BUS		BIT(1)
+#define AR71XX_RESET_PCI_CORE		BIT(0)
+
+#define AR7240_RESET_USB_HOST		BIT(5)
+#define AR7240_RESET_OHCI_DLL		BIT(3)
+
+#define AR724X_RESET_GE1_MDIO		BIT(23)
+#define AR724X_RESET_GE0_MDIO		BIT(22)
+#define AR724X_RESET_PCIE_PHY_SERIAL	BIT(10)
+#define AR724X_RESET_PCIE_PHY		BIT(7)
+#define AR724X_RESET_PCIE		BIT(6)
+#define AR724X_RESET_USB_HOST		BIT(5)
+#define AR724X_RESET_USB_PHY		BIT(4)
+#define AR724X_RESET_USBSUS_OVERRIDE	BIT(3)
+
+#define AR913X_RESET_AMBA2WMAC		BIT(22)
+#define AR913X_RESET_USBSUS_OVERRIDE	BIT(10)
+#define AR913X_RESET_USB_HOST		BIT(5)
+#define AR913X_RESET_USB_PHY		BIT(4)
+
+#define AR933X_RESET_GE1_MDIO		BIT(23)
+#define AR933X_RESET_GE0_MDIO		BIT(22)
+#define AR933X_RESET_GE1_MAC		BIT(13)
+#define AR933X_RESET_WMAC		BIT(11)
+#define AR933X_RESET_GE0_MAC		BIT(9)
+#define AR933X_RESET_USB_HOST		BIT(5)
+#define AR933X_RESET_USB_PHY		BIT(4)
+#define AR933X_RESET_USBSUS_OVERRIDE	BIT(3)
+
+#define AR934X_RESET_HOST		BIT(31)
+#define AR934X_RESET_SLIC		BIT(30)
+#define AR934X_RESET_HDMA		BIT(29)
+#define AR934X_RESET_EXTERNAL		BIT(28)
+#define AR934X_RESET_RTC		BIT(27)
+#define AR934X_RESET_PCIE_EP_INT	BIT(26)
+#define AR934X_RESET_CHKSUM_ACC		BIT(25)
+#define AR934X_RESET_FULL_CHIP		BIT(24)
+#define AR934X_RESET_GE1_MDIO		BIT(23)
+#define AR934X_RESET_GE0_MDIO		BIT(22)
+#define AR934X_RESET_CPU_NMI		BIT(21)
+#define AR934X_RESET_CPU_COLD		BIT(20)
+#define AR934X_RESET_HOST_RESET_INT	BIT(19)
+#define AR934X_RESET_PCIE_EP		BIT(18)
+#define AR934X_RESET_UART1		BIT(17)
+#define AR934X_RESET_DDR		BIT(16)
+#define AR934X_RESET_USB_PHY_PLL_PWD_EXT BIT(15)
+#define AR934X_RESET_NANDF		BIT(14)
+#define AR934X_RESET_GE1_MAC		BIT(13)
+#define AR934X_RESET_ETH_SWITCH_ANALOG	BIT(12)
+#define AR934X_RESET_USB_PHY_ANALOG	BIT(11)
+#define AR934X_RESET_HOST_DMA_INT	BIT(10)
+#define AR934X_RESET_GE0_MAC		BIT(9)
+#define AR934X_RESET_ETH_SWITCH		BIT(8)
+#define AR934X_RESET_PCIE_PHY		BIT(7)
+#define AR934X_RESET_PCIE		BIT(6)
+#define AR934X_RESET_USB_HOST		BIT(5)
+#define AR934X_RESET_USB_PHY		BIT(4)
+#define AR934X_RESET_USBSUS_OVERRIDE	BIT(3)
+#define AR934X_RESET_LUT		BIT(2)
+#define AR934X_RESET_MBOX		BIT(1)
+#define AR934X_RESET_I2S		BIT(0)
+
+#define AR933X_BOOTSTRAP_MDIO_GPIO_EN	BIT(18)
+#define AR933X_BOOTSTRAP_EEPBUSY	BIT(4)
+#define AR933X_BOOTSTRAP_REF_CLK_40	BIT(0)
+
+#define AR934X_BOOTSTRAP_SW_OPTION8	BIT(23)
+#define AR934X_BOOTSTRAP_SW_OPTION7	BIT(22)
+#define AR934X_BOOTSTRAP_SW_OPTION6	BIT(21)
+#define AR934X_BOOTSTRAP_SW_OPTION5	BIT(20)
+#define AR934X_BOOTSTRAP_SW_OPTION4	BIT(19)
+#define AR934X_BOOTSTRAP_SW_OPTION3	BIT(18)
+#define AR934X_BOOTSTRAP_SW_OPTION2	BIT(17)
+#define AR934X_BOOTSTRAP_SW_OPTION1	BIT(16)
+#define AR934X_BOOTSTRAP_USB_MODE_DEVICE BIT(7)
+#define AR934X_BOOTSTRAP_PCIE_RC	BIT(6)
+#define AR934X_BOOTSTRAP_EJTAG_MODE	BIT(5)
+#define AR934X_BOOTSTRAP_REF_CLK_40	BIT(4)
+#define AR934X_BOOTSTRAP_BOOT_FROM_SPI	BIT(2)
+#define AR934X_BOOTSTRAP_SDRAM_DISABLED	BIT(1)
+#define AR934X_BOOTSTRAP_DDR1		BIT(0)
+
+#define QCA955X_BOOTSTRAP_REF_CLK_40	BIT(4)
+
+#define AR934X_PCIE_WMAC_INT_WMAC_MISC		BIT(0)
+#define AR934X_PCIE_WMAC_INT_WMAC_TX		BIT(1)
+#define AR934X_PCIE_WMAC_INT_WMAC_RXLP		BIT(2)
+#define AR934X_PCIE_WMAC_INT_WMAC_RXHP		BIT(3)
+#define AR934X_PCIE_WMAC_INT_PCIE_RC		BIT(4)
+#define AR934X_PCIE_WMAC_INT_PCIE_RC0		BIT(5)
+#define AR934X_PCIE_WMAC_INT_PCIE_RC1		BIT(6)
+#define AR934X_PCIE_WMAC_INT_PCIE_RC2		BIT(7)
+#define AR934X_PCIE_WMAC_INT_PCIE_RC3		BIT(8)
+#define AR934X_PCIE_WMAC_INT_WMAC_ALL \
+	(AR934X_PCIE_WMAC_INT_WMAC_MISC | AR934X_PCIE_WMAC_INT_WMAC_TX | \
+	 AR934X_PCIE_WMAC_INT_WMAC_RXLP | AR934X_PCIE_WMAC_INT_WMAC_RXHP)
+
+#define AR934X_PCIE_WMAC_INT_PCIE_ALL \
+	(AR934X_PCIE_WMAC_INT_PCIE_RC | AR934X_PCIE_WMAC_INT_PCIE_RC0 | \
+	 AR934X_PCIE_WMAC_INT_PCIE_RC1 | AR934X_PCIE_WMAC_INT_PCIE_RC2 | \
+	 AR934X_PCIE_WMAC_INT_PCIE_RC3)
+
+#define QCA955X_EXT_INT_WMAC_MISC		BIT(0)
+#define QCA955X_EXT_INT_WMAC_TX			BIT(1)
+#define QCA955X_EXT_INT_WMAC_RXLP		BIT(2)
+#define QCA955X_EXT_INT_WMAC_RXHP		BIT(3)
+#define QCA955X_EXT_INT_PCIE_RC1		BIT(4)
+#define QCA955X_EXT_INT_PCIE_RC1_INT0		BIT(5)
+#define QCA955X_EXT_INT_PCIE_RC1_INT1		BIT(6)
+#define QCA955X_EXT_INT_PCIE_RC1_INT2		BIT(7)
+#define QCA955X_EXT_INT_PCIE_RC1_INT3		BIT(8)
+#define QCA955X_EXT_INT_PCIE_RC2		BIT(12)
+#define QCA955X_EXT_INT_PCIE_RC2_INT0		BIT(13)
+#define QCA955X_EXT_INT_PCIE_RC2_INT1		BIT(14)
+#define QCA955X_EXT_INT_PCIE_RC2_INT2		BIT(15)
+#define QCA955X_EXT_INT_PCIE_RC2_INT3		BIT(16)
+#define QCA955X_EXT_INT_USB1			BIT(24)
+#define QCA955X_EXT_INT_USB2			BIT(28)
+
+#define QCA955X_EXT_INT_WMAC_ALL \
+	(QCA955X_EXT_INT_WMAC_MISC | QCA955X_EXT_INT_WMAC_TX | \
+	 QCA955X_EXT_INT_WMAC_RXLP | QCA955X_EXT_INT_WMAC_RXHP)
+
+#define QCA955X_EXT_INT_PCIE_RC1_ALL \
+	(QCA955X_EXT_INT_PCIE_RC1 | QCA955X_EXT_INT_PCIE_RC1_INT0 | \
+	 QCA955X_EXT_INT_PCIE_RC1_INT1 | QCA955X_EXT_INT_PCIE_RC1_INT2 | \
+	 QCA955X_EXT_INT_PCIE_RC1_INT3)
+
+#define QCA955X_EXT_INT_PCIE_RC2_ALL \
+	(QCA955X_EXT_INT_PCIE_RC2 | QCA955X_EXT_INT_PCIE_RC2_INT0 | \
+	 QCA955X_EXT_INT_PCIE_RC2_INT1 | QCA955X_EXT_INT_PCIE_RC2_INT2 | \
+	 QCA955X_EXT_INT_PCIE_RC2_INT3)
+
+#define REV_ID_MAJOR_MASK		0xfff0
+#define REV_ID_MAJOR_AR71XX		0x00a0
+#define REV_ID_MAJOR_AR913X		0x00b0
+#define REV_ID_MAJOR_AR7240		0x00c0
+#define REV_ID_MAJOR_AR7241		0x0100
+#define REV_ID_MAJOR_AR7242		0x1100
+#define REV_ID_MAJOR_AR9330		0x0110
+#define REV_ID_MAJOR_AR9331		0x1110
+#define REV_ID_MAJOR_AR9341		0x0120
+#define REV_ID_MAJOR_AR9342		0x1120
+#define REV_ID_MAJOR_AR9344		0x2120
+#define REV_ID_MAJOR_QCA9558		0x1130
+
+#define AR71XX_REV_ID_MINOR_MASK	0x3
+#define AR71XX_REV_ID_MINOR_AR7130	0x0
+#define AR71XX_REV_ID_MINOR_AR7141	0x1
+#define AR71XX_REV_ID_MINOR_AR7161	0x2
+#define AR71XX_REV_ID_REVISION_MASK	0x3
+#define AR71XX_REV_ID_REVISION_SHIFT	2
+
+#define AR913X_REV_ID_MINOR_MASK	0x3
+#define AR913X_REV_ID_MINOR_AR9130	0x0
+#define AR913X_REV_ID_MINOR_AR9132	0x1
+#define AR913X_REV_ID_REVISION_MASK	0x3
+#define AR913X_REV_ID_REVISION_SHIFT	2
+
+#define AR933X_REV_ID_REVISION_MASK	0x3
+
+#define AR724X_REV_ID_REVISION_MASK	0x3
+
+#define AR934X_REV_ID_REVISION_MASK     0xf
+
+#define AR944X_REV_ID_REVISION_MASK	0xf
+
+/*
+ * SPI block
+ */
+#define AR71XX_SPI_REG_FS	0x00	/* Function Select */
+#define AR71XX_SPI_REG_CTRL	0x04	/* SPI Control */
+#define AR71XX_SPI_REG_IOC	0x08	/* SPI I/O Control */
+#define AR71XX_SPI_REG_RDS	0x0c	/* Read Data Shift */
+
+#define AR71XX_SPI_FS_GPIO	BIT(0)	/* Enable GPIO mode */
+
+#define AR71XX_SPI_CTRL_RD	BIT(6)	/* Remap Disable */
+#define AR71XX_SPI_CTRL_DIV_MASK 0x3f
+
+#define AR71XX_SPI_IOC_DO	BIT(0)	/* Data Out pin */
+#define AR71XX_SPI_IOC_CLK	BIT(8)	/* CLK pin */
+#define AR71XX_SPI_IOC_CS(n)	BIT(16 + (n))
+#define AR71XX_SPI_IOC_CS0	AR71XX_SPI_IOC_CS(0)
+#define AR71XX_SPI_IOC_CS1	AR71XX_SPI_IOC_CS(1)
+#define AR71XX_SPI_IOC_CS2	AR71XX_SPI_IOC_CS(2)
+#define AR71XX_SPI_IOC_CS_ALL	(AR71XX_SPI_IOC_CS0 | AR71XX_SPI_IOC_CS1 | \
+				 AR71XX_SPI_IOC_CS2)
+
+/*
+ * GPIO block
+ */
+#define AR71XX_GPIO_REG_OE		0x00
+#define AR71XX_GPIO_REG_IN		0x04
+#define AR71XX_GPIO_REG_OUT		0x08
+#define AR71XX_GPIO_REG_SET		0x0c
+#define AR71XX_GPIO_REG_CLEAR		0x10
+#define AR71XX_GPIO_REG_INT_MODE	0x14
+#define AR71XX_GPIO_REG_INT_TYPE	0x18
+#define AR71XX_GPIO_REG_INT_POLARITY	0x1c
+#define AR71XX_GPIO_REG_INT_PENDING	0x20
+#define AR71XX_GPIO_REG_INT_ENABLE	0x24
+#define AR71XX_GPIO_REG_FUNC		0x28
+
+#define AR934X_GPIO_REG_OUT_FUNC0	0x2c
+#define AR934X_GPIO_REG_OUT_FUNC1	0x30
+#define AR934X_GPIO_REG_OUT_FUNC2	0x34
+#define AR934X_GPIO_REG_OUT_FUNC3	0x38
+#define AR934X_GPIO_REG_OUT_FUNC4	0x3c
+#define AR934X_GPIO_REG_OUT_FUNC5	0x40
+#define AR934X_GPIO_REG_FUNC		0x6c
+
+#define AR71XX_GPIO_COUNT		16
+#define AR724X_GPIO_COUNT		18
+#define AR913X_GPIO_COUNT		22
+#define AR933X_GPIO_COUNT		30
+#define AR934X_GPIO_COUNT		23
+#define QCA955X_GPIO_COUNT		24
+
+#define AR71XX_GPIO_FUNC_STEREO_EN		BIT(17)
+#define AR71XX_GPIO_FUNC_SLIC_EN		BIT(16)
+#define AR71XX_GPIO_FUNC_SPI_CS2_EN		BIT(13)
+#define AR71XX_GPIO_FUNC_SPI_CS1_EN		BIT(12)
+#define AR71XX_GPIO_FUNC_UART_EN		BIT(8)
+#define AR71XX_GPIO_FUNC_USB_OC_EN		BIT(4)
+#define AR71XX_GPIO_FUNC_USB_CLK_EN		BIT(0)
+
+#define AR724X_GPIO_FUNC_GE0_MII_CLK_EN		BIT(19)
+#define AR724X_GPIO_FUNC_SPI_EN			BIT(18)
+#define AR724X_GPIO_FUNC_SPI_CS_EN2		BIT(14)
+#define AR724X_GPIO_FUNC_SPI_CS_EN1		BIT(13)
+#define AR724X_GPIO_FUNC_CLK_OBS5_EN		BIT(12)
+#define AR724X_GPIO_FUNC_CLK_OBS4_EN		BIT(11)
+#define AR724X_GPIO_FUNC_CLK_OBS3_EN		BIT(10)
+#define AR724X_GPIO_FUNC_CLK_OBS2_EN		BIT(9)
+#define AR724X_GPIO_FUNC_CLK_OBS1_EN		BIT(8)
+#define AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN	BIT(7)
+#define AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN	BIT(6)
+#define AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN	BIT(5)
+#define AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN	BIT(4)
+#define AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN	BIT(3)
+#define AR724X_GPIO_FUNC_UART_RTS_CTS_EN	BIT(2)
+#define AR724X_GPIO_FUNC_UART_EN		BIT(1)
+#define AR724X_GPIO_FUNC_JTAG_DISABLE		BIT(0)
+
+#define AR913X_GPIO_FUNC_WMAC_LED_EN		BIT(22)
+#define AR913X_GPIO_FUNC_EXP_PORT_CS_EN		BIT(21)
+#define AR913X_GPIO_FUNC_I2S_REFCLKEN		BIT(20)
+#define AR913X_GPIO_FUNC_I2S_MCKEN		BIT(19)
+#define AR913X_GPIO_FUNC_I2S1_EN		BIT(18)
+#define AR913X_GPIO_FUNC_I2S0_EN		BIT(17)
+#define AR913X_GPIO_FUNC_SLIC_EN		BIT(16)
+#define AR913X_GPIO_FUNC_UART_RTSCTS_EN		BIT(9)
+#define AR913X_GPIO_FUNC_UART_EN		BIT(8)
+#define AR913X_GPIO_FUNC_USB_CLK_EN		BIT(4)
+
+#define AR933X_GPIO_FUNC_SPDIF2TCK		BIT(31)
+#define AR933X_GPIO_FUNC_SPDIF_EN		BIT(30)
+#define AR933X_GPIO_FUNC_I2SO_22_18_EN		BIT(29)
+#define AR933X_GPIO_FUNC_I2S_MCK_EN		BIT(27)
+#define AR933X_GPIO_FUNC_I2SO_EN		BIT(26)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED_DUPL	BIT(25)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED_COLL	BIT(24)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED_ACT	BIT(23)
+#define AR933X_GPIO_FUNC_SPI_EN			BIT(18)
+#define AR933X_GPIO_FUNC_SPI_CS_EN2		BIT(14)
+#define AR933X_GPIO_FUNC_SPI_CS_EN1		BIT(13)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN	BIT(7)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN	BIT(6)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN	BIT(5)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN	BIT(4)
+#define AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN	BIT(3)
+#define AR933X_GPIO_FUNC_UART_RTS_CTS_EN	BIT(2)
+#define AR933X_GPIO_FUNC_UART_EN		BIT(1)
+#define AR933X_GPIO_FUNC_JTAG_DISABLE		BIT(0)
+
+#define AR934X_GPIO_FUNC_DDR_DQOE_EN	BIT(17)
+#define AR934X_GPIO_FUNC_SPI_CS_1_EN	BIT(14)
+#define AR934X_GPIO_FUNC_SPI_CS_0_EN	BIT(13)
+
+#define AR934X_GPIO_OUT_GPIO		0x00
+
+/*
+ * MII_CTRL block
+ */
+#define AR71XX_MII_REG_MII0_CTRL	0x00
+#define AR71XX_MII_REG_MII1_CTRL	0x04
+
+#define AR71XX_MII_CTRL_IF_MASK		3
+#define AR71XX_MII_CTRL_SPEED_SHIFT	4
+#define AR71XX_MII_CTRL_SPEED_MASK	3
+#define AR71XX_MII_CTRL_SPEED_10	0
+#define AR71XX_MII_CTRL_SPEED_100	1
+#define AR71XX_MII_CTRL_SPEED_1000	2
+
+#define AR71XX_MII0_CTRL_IF_GMII	0
+#define AR71XX_MII0_CTRL_IF_MII		1
+#define AR71XX_MII0_CTRL_IF_RGMII	2
+#define AR71XX_MII0_CTRL_IF_RMII	3
+
+#define AR71XX_MII1_CTRL_IF_RGMII	0
+#define AR71XX_MII1_CTRL_IF_RMII	1
+
+/*
+ * AR933X GMAC interface
+ */
+#define AR933X_GMAC_REG_ETH_CFG		0x00
+
+#define AR933X_ETH_CFG_RGMII_GE0	BIT(0)
+#define AR933X_ETH_CFG_MII_GE0		BIT(1)
+#define AR933X_ETH_CFG_GMII_GE0		BIT(2)
+#define AR933X_ETH_CFG_MII_GE0_MASTER	BIT(3)
+#define AR933X_ETH_CFG_MII_GE0_SLAVE	BIT(4)
+#define AR933X_ETH_CFG_MII_GE0_ERR_EN	BIT(5)
+#define AR933X_ETH_CFG_SW_PHY_SWAP	BIT(7)
+#define AR933X_ETH_CFG_SW_PHY_ADDR_SWAP	BIT(8)
+#define AR933X_ETH_CFG_RMII_GE0		BIT(9)
+#define AR933X_ETH_CFG_RMII_GE0_SPD_10	0
+#define AR933X_ETH_CFG_RMII_GE0_SPD_100	BIT(10)
+
+/*
+ * AR934X GMAC Interface
+ */
+#define AR934X_GMAC_REG_ETH_CFG		0x00
+
+#define AR934X_ETH_CFG_RGMII_GMAC0	BIT(0)
+#define AR934X_ETH_CFG_MII_GMAC0	BIT(1)
+#define AR934X_ETH_CFG_GMII_GMAC0	BIT(2)
+#define AR934X_ETH_CFG_MII_GMAC0_MASTER	BIT(3)
+#define AR934X_ETH_CFG_MII_GMAC0_SLAVE	BIT(4)
+#define AR934X_ETH_CFG_MII_GMAC0_ERR_EN	BIT(5)
+#define AR934X_ETH_CFG_SW_ONLY_MODE	BIT(6)
+#define AR934X_ETH_CFG_SW_PHY_SWAP	BIT(7)
+#define AR934X_ETH_CFG_SW_APB_ACCESS	BIT(9)
+#define AR934X_ETH_CFG_RMII_GMAC0	BIT(10)
+#define AR933X_ETH_CFG_MII_CNTL_SPEED	BIT(11)
+#define AR934X_ETH_CFG_RMII_GMAC0_MASTER BIT(12)
+#define AR933X_ETH_CFG_SW_ACC_MSB_FIRST	BIT(13)
+
+/*
+ * QCA955X GMAC Interface
+ */
+
+#define QCA955X_GMAC_REG_ETH_CFG	0x00
+
+#define QCA955X_ETH_CFG_RGMII_GMAC0	BIT(0)
+#define QCA955X_ETH_CFG_SGMII_GMAC0	BIT(6)
+
+#endif /* __ASM_MACH_AR71XX_REGS_H */
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/board.c b/trunk/target/linux/ar71xx/image/lzma-loader/src/board.c
new file mode 100644
index 00000000..2f4dd6b1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/board.c
@@ -0,0 +1,56 @@
+/*
+ * LZMA compressed kernel loader for Atheros AR7XXX/AR9XXX based boards
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <stddef.h>
+#include "config.h"
+#include "ar71xx_regs.h"
+
+#define READREG(r)	*(volatile unsigned int *)(r)
+#define WRITEREG(r,v)	*(volatile unsigned int *)(r) = v
+
+#define KSEG1ADDR(_x)	(((_x) & 0x1fffffff) | 0xa0000000)
+
+#define UART_BASE	0xb8020000
+
+#define UART_TX		0
+#define UART_LSR	5
+
+#define UART_LSR_THRE   0x20
+
+#define UART_READ(r)		READREG(UART_BASE + 4 * (r))
+#define UART_WRITE(r,v)		WRITEREG(UART_BASE + 4 * (r), (v))
+
+void board_putc(int ch)
+{
+	while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0);
+	UART_WRITE(UART_TX, ch);
+	while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0);
+}
+
+#ifdef CONFIG_BOARD_TL_WR1043ND_V1
+static void tlwr1043nd_init(void)
+{
+	unsigned int reg = KSEG1ADDR(AR71XX_RESET_BASE);
+	unsigned int t;
+
+	t = READREG(reg + AR913X_RESET_REG_RESET_MODULE);
+	t |= AR71XX_RESET_GE0_PHY;
+	WRITEREG(reg + AR913X_RESET_REG_RESET_MODULE, t);
+	/* flush write */
+	t = READREG(reg + AR913X_RESET_REG_RESET_MODULE);
+}
+#else
+static inline void tlwr1043nd_init(void) {}
+#endif
+
+void board_init(void)
+{
+	tlwr1043nd_init();
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/cache.c b/trunk/target/linux/ar71xx/image/lzma-loader/src/cache.c
new file mode 100644
index 00000000..28cc8483
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/cache.c
@@ -0,0 +1,43 @@
+/*
+ * LZMA compressed kernel loader for Atheros AR7XXX/AR9XXX based boards
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * The cache manipulation routine has been taken from the U-Boot project.
+ *	(C) Copyright 2003
+ *	Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include "cache.h"
+#include "cacheops.h"
+#include "config.h"
+
+#define cache_op(op,addr)						\
+	__asm__ __volatile__(						\
+	"	.set	push					\n"	\
+	"	.set	noreorder				\n"	\
+	"	.set	mips3\n\t				\n"	\
+	"	cache	%0, %1					\n"	\
+	"	.set	pop					\n"	\
+	:								\
+	: "i" (op), "R" (*(unsigned char *)(addr)))
+
+void flush_cache(unsigned long start_addr, unsigned long size)
+{
+	unsigned long lsize = CONFIG_CACHELINE_SIZE;
+	unsigned long addr = start_addr & ~(lsize - 1);
+	unsigned long aend = (start_addr + size - 1) & ~(lsize - 1);
+
+	while (1) {
+		cache_op(Hit_Writeback_Inv_D, addr);
+		cache_op(Hit_Invalidate_I, addr);
+		if (addr == aend)
+			break;
+		addr += lsize;
+	}
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/cache.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/cache.h
new file mode 100644
index 00000000..506a2358
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/cache.h
@@ -0,0 +1,17 @@
+/*
+ * LZMA compressed kernel loader for Atheros AR7XXX/AR9XXX based boards
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#ifndef __CACHE_H
+#define __CACHE_H
+
+void flush_cache(unsigned long start_addr, unsigned long size);
+
+#endif /* __CACHE_H */
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/cacheops.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/cacheops.h
new file mode 100644
index 00000000..70bcad76
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/cacheops.h
@@ -0,0 +1,85 @@
+/*
+ * Cache operations for the cache instruction.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * (C) Copyright 1996, 97, 99, 2002, 03 Ralf Baechle
+ * (C) Copyright 1999 Silicon Graphics, Inc.
+ */
+#ifndef	__ASM_CACHEOPS_H
+#define	__ASM_CACHEOPS_H
+
+/*
+ * Cache Operations available on all MIPS processors with R4000-style caches
+ */
+#define Index_Invalidate_I      0x00
+#define Index_Writeback_Inv_D   0x01
+#define Index_Load_Tag_I	0x04
+#define Index_Load_Tag_D	0x05
+#define Index_Store_Tag_I	0x08
+#define Index_Store_Tag_D	0x09
+#if defined(CONFIG_CPU_LOONGSON2)
+#define Hit_Invalidate_I	0x00
+#else
+#define Hit_Invalidate_I	0x10
+#endif
+#define Hit_Invalidate_D	0x11
+#define Hit_Writeback_Inv_D	0x15
+
+/*
+ * R4000-specific cacheops
+ */
+#define Create_Dirty_Excl_D	0x0d
+#define Fill			0x14
+#define Hit_Writeback_I		0x18
+#define Hit_Writeback_D		0x19
+
+/*
+ * R4000SC and R4400SC-specific cacheops
+ */
+#define Index_Invalidate_SI     0x02
+#define Index_Writeback_Inv_SD  0x03
+#define Index_Load_Tag_SI	0x06
+#define Index_Load_Tag_SD	0x07
+#define Index_Store_Tag_SI	0x0A
+#define Index_Store_Tag_SD	0x0B
+#define Create_Dirty_Excl_SD	0x0f
+#define Hit_Invalidate_SI	0x12
+#define Hit_Invalidate_SD	0x13
+#define Hit_Writeback_Inv_SD	0x17
+#define Hit_Writeback_SD	0x1b
+#define Hit_Set_Virtual_SI	0x1e
+#define Hit_Set_Virtual_SD	0x1f
+
+/*
+ * R5000-specific cacheops
+ */
+#define R5K_Page_Invalidate_S	0x17
+
+/*
+ * RM7000-specific cacheops
+ */
+#define Page_Invalidate_T	0x16
+
+/*
+ * R10000-specific cacheops
+ *
+ * Cacheops 0x02, 0x06, 0x0a, 0x0c-0x0e, 0x16, 0x1a and 0x1e are unused.
+ * Most of the _S cacheops are identical to the R4000SC _SD cacheops.
+ */
+#define Index_Writeback_Inv_S	0x03
+#define Index_Load_Tag_S	0x07
+#define Index_Store_Tag_S	0x0B
+#define Hit_Invalidate_S	0x13
+#define Cache_Barrier		0x14
+#define Hit_Writeback_Inv_S	0x17
+#define Index_Load_Data_I	0x18
+#define Index_Load_Data_D	0x19
+#define Index_Load_Data_S	0x1b
+#define Index_Store_Data_I	0x1c
+#define Index_Store_Data_D	0x1d
+#define Index_Store_Data_S	0x1f
+
+#endif	/* __ASM_CACHEOPS_H */
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/config.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/config.h
new file mode 100644
index 00000000..287392b3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/config.h
@@ -0,0 +1,31 @@
+/*
+ * LZMA compressed kernel loader for Atheros AR7XXX/AR9XXX based boards
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+#define CONFIG_ICACHE_SIZE	(32 * 1024)
+#define CONFIG_DCACHE_SIZE	(64 * 1024)
+#define CONFIG_CACHELINE_SIZE	32
+
+#ifndef CONFIG_FLASH_OFFS
+#define CONFIG_FLASH_OFFS	0
+#endif
+
+#ifndef CONFIG_FLASH_MAX
+#define CONFIG_FLASH_MAX	0
+#endif
+
+#ifndef CONFIG_FLASH_STEP
+#define CONFIG_FLASH_STEP	0x1000
+#endif
+
+#endif /* _CONFIG_H_ */
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/cp0regdef.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/cp0regdef.h
new file mode 100644
index 00000000..c1188ad8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/cp0regdef.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001 by Ralf Baechle
+ *
+ * Copyright (C) 2001, Monta Vista Software
+ * Author: jsun@mvista.com or jsun@junsun.net
+ */
+#ifndef _cp0regdef_h_
+#define _cp0regdef_h_
+
+#define CP0_INDEX $0
+#define CP0_RANDOM $1
+#define CP0_ENTRYLO0 $2
+#define CP0_ENTRYLO1 $3
+#define CP0_CONTEXT $4
+#define CP0_PAGEMASK $5
+#define CP0_WIRED $6
+#define CP0_BADVADDR $8
+#define CP0_COUNT $9
+#define CP0_ENTRYHI $10
+#define CP0_COMPARE $11
+#define CP0_STATUS $12
+#define CP0_CAUSE $13
+#define CP0_EPC $14
+#define CP0_PRID $15
+#define CP0_CONFIG $16
+#define CP0_LLADDR $17
+#define CP0_WATCHLO $18
+#define CP0_WATCHHI $19
+#define CP0_XCONTEXT $20
+#define CP0_FRAMEMASK $21
+#define CP0_DIAGNOSTIC $22
+#define CP0_PERFORMANCE $25
+#define CP0_ECC $26
+#define CP0_CACHEERR $27
+#define CP0_TAGLO $28
+#define CP0_TAGHI $29
+#define CP0_ERROREPC $30
+
+#endif
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/head.S b/trunk/target/linux/ar71xx/image/lzma-loader/src/head.S
new file mode 100644
index 00000000..e895e958
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/head.S
@@ -0,0 +1,118 @@
+/*
+ * LZMA compressed kernel loader for Atheros AR7XXX/AR9XXX based boards
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Some parts of this code was based on the libreCMC specific lzma-loader
+ * for the BCM47xx and ADM5120 based boards:
+ *	Copyright (C) 2004 Manuel Novoa III (mjn3@codepoet.org)
+ *	Copyright (C) 2005 by Oleg I. Vdovikin <oleg@cs.msu.su>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <asm/asm.h>
+#include <asm/regdef.h>
+#include "cp0regdef.h"
+#include "cacheops.h"
+#include "config.h"
+
+#define KSEG0		0x80000000
+
+	.macro	ehb
+	sll     zero, 3
+	.endm
+
+	.text
+
+LEAF(startup)
+	.set noreorder
+	.set mips32
+
+	mtc0	zero, CP0_WATCHLO	# clear watch registers
+	mtc0	zero, CP0_WATCHHI
+	mtc0	zero, CP0_CAUSE		# clear before writing status register
+
+	mfc0	t0, CP0_STATUS
+	li	t1, 0x1000001f
+	or	t0, t1
+	xori	t0, 0x1f
+	mtc0	t0, CP0_STATUS
+	ehb
+
+	mtc0	zero, CP0_COUNT
+	mtc0	zero, CP0_COMPARE
+	ehb
+
+	la	t0, __reloc_label	# get linked address of label
+	bal	__reloc_label		# branch and link to label to
+	nop				# get actual address
+__reloc_label:
+	subu	t0, ra, t0		# get reloc_delta
+
+	beqz	t0, __reloc_done         # if delta is 0 we are in the right place
+	nop
+
+	/* Copy our code to the right place */
+	la	t1, _code_start		# get linked address of _code_start
+	la	t2, _code_end		# get linked address of _code_end
+	addu	t0, t0, t1		# calculate actual address of _code_start
+
+__reloc_copy:
+	lw	t3, 0(t0)
+	sw	t3, 0(t1)
+	add	t1, 4
+	blt	t1, t2, __reloc_copy
+	add	t0, 4
+
+	/* flush cache */
+	la	t0, _code_start
+	la	t1, _code_end
+
+	li	t2, ~(CONFIG_CACHELINE_SIZE - 1)
+	and	t0, t2
+	and	t1, t2
+	li	t2, CONFIG_CACHELINE_SIZE
+
+	b	__flush_check
+	nop
+
+__flush_line:
+	cache	Hit_Writeback_Inv_D, 0(t0)
+	cache	Hit_Invalidate_I, 0(t0)
+	add	t0, t2
+
+__flush_check:
+	bne	t0, t1, __flush_line
+	nop
+
+	sync
+
+__reloc_done:
+
+	/* clear bss */
+	la	t0, _bss_start
+	la	t1, _bss_end
+	b	__bss_check
+	nop
+
+__bss_fill:
+	sw	zero, 0(t0)
+	addi	t0, 4
+
+__bss_check:
+	bne	t0, t1, __bss_fill
+	nop
+
+	/* Setup new "C" stack */
+	la	sp, _stack
+
+	/* jump to the decompressor routine */
+	la	t0, loader_main
+	jr	t0
+	nop
+
+	.set reorder
+END(startup)
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c
new file mode 100644
index 00000000..2b8956a3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c
@@ -0,0 +1,263 @@
+/*
+ * LZMA compressed kernel loader for Atheros AR7XXX/AR9XXX based boards
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Some parts of this code was based on the libreCMC specific lzma-loader
+ * for the BCM47xx and ADM5120 based boards:
+ *	Copyright (C) 2004 Manuel Novoa III (mjn3@codepoet.org)
+ *	Copyright (C) 2005 Mineharu Takahara <mtakahar@yahoo.com>
+ *	Copyright (C) 2005 by Oleg I. Vdovikin <oleg@cs.msu.su>
+ *
+ * The image_header structure has been taken from the U-Boot project.
+ *	(C) Copyright 2008 Semihalf
+ *	(C) Copyright 2000-2005
+ *	Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "config.h"
+#include "cache.h"
+#include "printf.h"
+#include "LzmaDecode.h"
+
+#define AR71XX_FLASH_START	0x1f000000
+#define AR71XX_FLASH_END	0x1fe00000
+
+#define KSEG0			0x80000000
+#define KSEG1			0xa0000000
+
+#define KSEG1ADDR(a)		((((unsigned)(a)) & 0x1fffffffU) | KSEG1)
+
+#undef LZMA_DEBUG
+
+#ifdef LZMA_DEBUG
+#  define DBG(f, a...)	printf(f, ## a)
+#else
+#  define DBG(f, a...)	do {} while (0)
+#endif
+
+#define IH_MAGIC_OKLI		0x4f4b4c49	/* 'OKLI' */
+
+#define IH_NMLEN		32	/* Image Name Length		*/
+
+typedef struct image_header {
+	uint32_t	ih_magic;	/* Image Header Magic Number	*/
+	uint32_t	ih_hcrc;	/* Image Header CRC Checksum	*/
+	uint32_t	ih_time;	/* Image Creation Timestamp	*/
+	uint32_t	ih_size;	/* Image Data Size		*/
+	uint32_t	ih_load;	/* Data	 Load  Address		*/
+	uint32_t	ih_ep;		/* Entry Point Address		*/
+	uint32_t	ih_dcrc;	/* Image Data CRC Checksum	*/
+	uint8_t		ih_os;		/* Operating System		*/
+	uint8_t		ih_arch;	/* CPU architecture		*/
+	uint8_t		ih_type;	/* Image Type			*/
+	uint8_t		ih_comp;	/* Compression Type		*/
+	uint8_t		ih_name[IH_NMLEN];	/* Image Name		*/
+} image_header_t;
+
+/* beyond the image end, size not known in advance */
+extern unsigned char workspace[];
+extern void board_init(void);
+
+static CLzmaDecoderState lzma_state;
+static unsigned char *lzma_data;
+static unsigned long lzma_datasize;
+static unsigned long lzma_outsize;
+static unsigned long kernel_la;
+
+#ifdef CONFIG_KERNEL_CMDLINE
+#define kernel_argc	1
+static const char kernel_cmdline[] = CONFIG_KERNEL_CMDLINE;
+static const char *kernel_argv[] = {
+	kernel_cmdline,
+	NULL,
+};
+#endif /* CONFIG_KERNEL_CMDLINE */
+
+static void halt(void)
+{
+	printf("\nSystem halted!\n");
+	for(;;);
+}
+
+static __inline__ unsigned long get_be32(void *buf)
+{
+	unsigned char *p = buf;
+
+	return (((unsigned long) p[0] << 24) +
+	        ((unsigned long) p[1] << 16) +
+	        ((unsigned long) p[2] << 8) +
+	        (unsigned long) p[3]);
+}
+
+static __inline__ unsigned char lzma_get_byte(void)
+{
+	unsigned char c;
+
+	lzma_datasize--;
+	c = *lzma_data++;
+
+	return c;
+}
+
+static int lzma_init_props(void)
+{
+	unsigned char props[LZMA_PROPERTIES_SIZE];
+	int res;
+	int i;
+
+	/* read lzma properties */
+	for (i = 0; i < LZMA_PROPERTIES_SIZE; i++)
+		props[i] = lzma_get_byte();
+
+	/* read the lower half of uncompressed size in the header */
+	lzma_outsize = ((SizeT) lzma_get_byte()) +
+		       ((SizeT) lzma_get_byte() << 8) +
+		       ((SizeT) lzma_get_byte() << 16) +
+		       ((SizeT) lzma_get_byte() << 24);
+
+	/* skip rest of the header (upper half of uncompressed size) */
+	for (i = 0; i < 4; i++)
+		lzma_get_byte();
+
+	res = LzmaDecodeProperties(&lzma_state.Properties, props,
+					LZMA_PROPERTIES_SIZE);
+	return res;
+}
+
+static int lzma_decompress(unsigned char *outStream)
+{
+	SizeT ip, op;
+	int ret;
+
+	lzma_state.Probs = (CProb *) workspace;
+
+	ret = LzmaDecode(&lzma_state, lzma_data, lzma_datasize, &ip, outStream,
+			 lzma_outsize, &op);
+
+	if (ret != LZMA_RESULT_OK) {
+		int i;
+
+		DBG("LzmaDecode error %d at %08x, osize:%d ip:%d op:%d\n",
+		    ret, lzma_data + ip, lzma_outsize, ip, op);
+
+		for (i = 0; i < 16; i++)
+			DBG("%02x ", lzma_data[ip + i]);
+
+		DBG("\n");
+	}
+
+	return ret;
+}
+
+#if (LZMA_WRAPPER)
+static void lzma_init_data(void)
+{
+	extern unsigned char _lzma_data_start[];
+	extern unsigned char _lzma_data_end[];
+
+	kernel_la = LOADADDR;
+	lzma_data = _lzma_data_start;
+	lzma_datasize = _lzma_data_end - _lzma_data_start;
+}
+#else
+static void lzma_init_data(void)
+{
+	struct image_header *hdr = NULL;
+	unsigned char *flash_base;
+	unsigned long flash_ofs;
+	unsigned long kernel_ofs;
+	unsigned long kernel_size;
+
+	flash_base = (unsigned char *) KSEG1ADDR(AR71XX_FLASH_START);
+
+	printf("Looking for libreCMC image... ");
+
+	for (flash_ofs = CONFIG_FLASH_OFFS;
+	     flash_ofs <= (CONFIG_FLASH_OFFS + CONFIG_FLASH_MAX);
+	     flash_ofs += CONFIG_FLASH_STEP) {
+		unsigned long magic;
+		unsigned char *p;
+
+		p = flash_base + flash_ofs;
+		magic = get_be32(p);
+		if (magic == IH_MAGIC_OKLI) {
+			hdr = (struct image_header *) p;
+			break;
+		}
+	}
+
+	if (hdr == NULL) {
+		printf("not found!\n");
+		halt();
+	}
+
+	printf("found at 0x%08x\n", flash_base + flash_ofs);
+
+	kernel_ofs = sizeof(struct image_header);
+	kernel_size = get_be32(&hdr->ih_size);
+	kernel_la = get_be32(&hdr->ih_load);
+
+	lzma_data = flash_base + flash_ofs + kernel_ofs;
+	lzma_datasize = kernel_size;
+}
+#endif /* (LZMA_WRAPPER) */
+
+void loader_main(unsigned long reg_a0, unsigned long reg_a1,
+		 unsigned long reg_a2, unsigned long reg_a3)
+{
+	void (*kernel_entry) (unsigned long, unsigned long, unsigned long,
+			      unsigned long);
+	int res;
+
+	board_init();
+
+	printf("\n\nlibreCMC kernel loader for AR7XXX/AR9XXX\n");
+	printf("Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>\n");
+
+	lzma_init_data();
+
+	res = lzma_init_props();
+	if (res != LZMA_RESULT_OK) {
+		printf("Incorrect LZMA stream properties!\n");
+		halt();
+	}
+
+	printf("Decompressing kernel... ");
+
+	res = lzma_decompress((unsigned char *) kernel_la);
+	if (res != LZMA_RESULT_OK) {
+		printf("failed, ");
+		switch (res) {
+		case LZMA_RESULT_DATA_ERROR:
+			printf("data error!\n");
+			break;
+		default:
+			printf("unknown error %d!\n", res);
+		}
+		halt();
+	} else {
+		printf("done!\n");
+	}
+
+	flush_cache(kernel_la, lzma_outsize);
+
+	printf("Starting kernel at %08x...\n\n", kernel_la);
+
+#ifdef CONFIG_KERNEL_CMDLINE
+	reg_a0 = kernel_argc;
+	reg_a1 = (unsigned long) kernel_argv;
+	reg_a2 = 0;
+	reg_a3 = 0;
+#endif
+
+	kernel_entry = (void *) kernel_la;
+	kernel_entry(reg_a0, reg_a1, reg_a2, reg_a3);
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.lds b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.lds
new file mode 100644
index 00000000..80cc7ca3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.lds
@@ -0,0 +1,35 @@
+OUTPUT_ARCH(mips)
+SECTIONS {
+	.text : {
+		_code_start = .;
+		*(.text)
+		*(.text.*)
+		*(.rodata)
+		*(.rodata.*)
+		*(.data.lzma)
+	}
+
+	. = ALIGN(32);
+	.data : {
+		*(.data)
+		*(.data.*)
+		. = . + 524288;		/* workaround for buggy bootloaders */
+	}
+
+	. = ALIGN(32);
+	_code_end = .;
+
+	_bss_start = .;
+	.bss : {
+		*(.bss)
+		*(.bss.*)
+	}
+
+	. = ALIGN(32);
+	_bss_end = .;
+
+	. = . + 8192;
+	_stack = .;
+
+	workspace = .;
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/loader2.lds b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader2.lds
new file mode 100644
index 00000000..db0bb464
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader2.lds
@@ -0,0 +1,10 @@
+OUTPUT_ARCH(mips)
+SECTIONS {
+	.text : {
+		startup = .;
+		*(.text)
+		*(.text.*)
+		*(.data)
+		*(.data.*)
+	}
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/lzma-data.lds b/trunk/target/linux/ar71xx/image/lzma-loader/src/lzma-data.lds
new file mode 100644
index 00000000..abf756ba
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/lzma-data.lds
@@ -0,0 +1,8 @@
+OUTPUT_ARCH(mips)
+SECTIONS {
+	.data.lzma : {
+		_lzma_data_start = .;
+		*(.data)
+		_lzma_data_end = .;
+	}
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/printf.c b/trunk/target/linux/ar71xx/image/lzma-loader/src/printf.c
new file mode 100644
index 00000000..7bb5a86e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/printf.c
@@ -0,0 +1,350 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include	"printf.h"
+
+extern void board_putc(int ch);
+
+/* this is the maximum width for a variable */
+#define		LP_MAX_BUF	256
+
+/* macros */
+#define		IsDigit(x)	( ((x) >= '0') && ((x) <= '9') )
+#define		Ctod(x)		( (x) - '0')
+
+/* forward declaration */
+static int PrintChar(char *, char, int, int);
+static int PrintString(char *, char *, int, int);
+static int PrintNum(char *, unsigned long, int, int, int, int, char, int);
+
+/* private variable */
+static const char theFatalMsg[] = "fatal error in lp_Print!";
+
+/* -*-
+ * A low level printf() function.
+ */
+static void
+lp_Print(void (*output)(void *, char *, int),
+	 void * arg,
+	 char *fmt,
+	 va_list ap)
+{
+
+#define 	OUTPUT(arg, s, l)  \
+  { if (((l) < 0) || ((l) > LP_MAX_BUF)) { \
+       (*output)(arg, (char*)theFatalMsg, sizeof(theFatalMsg)-1); for(;;); \
+    } else { \
+      (*output)(arg, s, l); \
+    } \
+  }
+
+    char buf[LP_MAX_BUF];
+
+    char c;
+    char *s;
+    long int num;
+
+    int longFlag;
+    int negFlag;
+    int width;
+    int prec;
+    int ladjust;
+    char padc;
+
+    int length;
+
+    for(;;) {
+	{
+	    /* scan for the next '%' */
+	    char *fmtStart = fmt;
+	    while ( (*fmt != '\0') && (*fmt != '%')) {
+		fmt ++;
+	    }
+
+	    /* flush the string found so far */
+	    OUTPUT(arg, fmtStart, fmt-fmtStart);
+
+	    /* are we hitting the end? */
+	    if (*fmt == '\0') break;
+	}
+
+	/* we found a '%' */
+	fmt ++;
+
+	/* check for long */
+	if (*fmt == 'l') {
+	    longFlag = 1;
+	    fmt ++;
+	} else {
+	    longFlag = 0;
+	}
+
+	/* check for other prefixes */
+	width = 0;
+	prec = -1;
+	ladjust = 0;
+	padc = ' ';
+
+	if (*fmt == '-') {
+	    ladjust = 1;
+	    fmt ++;
+	}
+
+	if (*fmt == '0') {
+	    padc = '0';
+	    fmt++;
+	}
+
+	if (IsDigit(*fmt)) {
+	    while (IsDigit(*fmt)) {
+		width = 10 * width + Ctod(*fmt++);
+	    }
+	}
+
+	if (*fmt == '.') {
+	    fmt ++;
+	    if (IsDigit(*fmt)) {
+		prec = 0;
+		while (IsDigit(*fmt)) {
+		    prec = prec*10 + Ctod(*fmt++);
+		}
+	    }
+	}
+
+
+	/* check format flag */
+	negFlag = 0;
+	switch (*fmt) {
+	 case 'b':
+	    if (longFlag) {
+		num = va_arg(ap, long int);
+	    } else {
+		num = va_arg(ap, int);
+	    }
+	    length = PrintNum(buf, num, 2, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'd':
+	 case 'D':
+	    if (longFlag) {
+		num = va_arg(ap, long int);
+	    } else {
+		num = va_arg(ap, int);
+	    }
+	    if (num < 0) {
+		num = - num;
+		negFlag = 1;
+	    }
+	    length = PrintNum(buf, num, 10, negFlag, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'o':
+	 case 'O':
+	    if (longFlag) {
+		num = va_arg(ap, long int);
+	    } else {
+		num = va_arg(ap, int);
+	    }
+	    length = PrintNum(buf, num, 8, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'u':
+	 case 'U':
+	    if (longFlag) {
+		num = va_arg(ap, long int);
+	    } else {
+		num = va_arg(ap, int);
+	    }
+	    length = PrintNum(buf, num, 10, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'x':
+	    if (longFlag) {
+		num = va_arg(ap, long int);
+	    } else {
+		num = va_arg(ap, int);
+	    }
+	    length = PrintNum(buf, num, 16, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'X':
+	    if (longFlag) {
+		num = va_arg(ap, long int);
+	    } else {
+		num = va_arg(ap, int);
+	    }
+	    length = PrintNum(buf, num, 16, 0, width, ladjust, padc, 1);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'c':
+	    c = (char)va_arg(ap, int);
+	    length = PrintChar(buf, c, width, ladjust);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 's':
+	    s = (char*)va_arg(ap, char *);
+	    length = PrintString(buf, s, width, ladjust);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case '\0':
+	    fmt --;
+	    break;
+
+	 default:
+	    /* output this char as it is */
+	    OUTPUT(arg, fmt, 1);
+	}	/* switch (*fmt) */
+
+	fmt ++;
+    }		/* for(;;) */
+
+    /* special termination call */
+    OUTPUT(arg, "\0", 1);
+}
+
+
+/* --------------- local help functions --------------------- */
+static int
+PrintChar(char * buf, char c, int length, int ladjust)
+{
+    int i;
+
+    if (length < 1) length = 1;
+    if (ladjust) {
+	*buf = c;
+	for (i=1; i< length; i++) buf[i] = ' ';
+    } else {
+	for (i=0; i< length-1; i++) buf[i] = ' ';
+	buf[length - 1] = c;
+    }
+    return length;
+}
+
+static int
+PrintString(char * buf, char* s, int length, int ladjust)
+{
+    int i;
+    int len=0;
+    char* s1 = s;
+    while (*s1++) len++;
+    if (length < len) length = len;
+
+    if (ladjust) {
+	for (i=0; i< len; i++) buf[i] = s[i];
+	for (i=len; i< length; i++) buf[i] = ' ';
+    } else {
+	for (i=0; i< length-len; i++) buf[i] = ' ';
+	for (i=length-len; i < length; i++) buf[i] = s[i-length+len];
+    }
+    return length;
+}
+
+static int
+PrintNum(char * buf, unsigned long u, int base, int negFlag,
+	 int length, int ladjust, char padc, int upcase)
+{
+    /* algorithm :
+     *  1. prints the number from left to right in reverse form.
+     *  2. fill the remaining spaces with padc if length is longer than
+     *     the actual length
+     *     TRICKY : if left adjusted, no "0" padding.
+     *		    if negtive, insert  "0" padding between "0" and number.
+     *  3. if (!ladjust) we reverse the whole string including paddings
+     *  4. otherwise we only reverse the actual string representing the num.
+     */
+
+    int actualLength =0;
+    char *p = buf;
+    int i;
+
+    do {
+	int tmp = u %base;
+	if (tmp <= 9) {
+	    *p++ = '0' + tmp;
+	} else if (upcase) {
+	    *p++ = 'A' + tmp - 10;
+	} else {
+	    *p++ = 'a' + tmp - 10;
+	}
+	u /= base;
+    } while (u != 0);
+
+    if (negFlag) {
+	*p++ = '-';
+    }
+
+    /* figure out actual length and adjust the maximum length */
+    actualLength = p - buf;
+    if (length < actualLength) length = actualLength;
+
+    /* add padding */
+    if (ladjust) {
+	padc = ' ';
+    }
+    if (negFlag && !ladjust && (padc == '0')) {
+	for (i = actualLength-1; i< length-1; i++) buf[i] = padc;
+	buf[length -1] = '-';
+    } else {
+	for (i = actualLength; i< length; i++) buf[i] = padc;
+    }
+
+
+    /* prepare to reverse the string */
+    {
+	int begin = 0;
+	int end;
+	if (ladjust) {
+	    end = actualLength - 1;
+	} else {
+	    end = length -1;
+	}
+
+	while (end > begin) {
+	    char tmp = buf[begin];
+	    buf[begin] = buf[end];
+	    buf[end] = tmp;
+	    begin ++;
+	    end --;
+	}
+    }
+
+    /* adjust the string pointer */
+    return length;
+}
+
+static void printf_output(void *arg, char *s, int l)
+{
+    int i;
+
+    // special termination call
+    if ((l==1) && (s[0] == '\0')) return;
+
+    for (i=0; i< l; i++) {
+	board_putc(s[i]);
+	if (s[i] == '\n') board_putc('\r');
+    }
+}
+
+void printf(char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    lp_Print(printf_output, 0, fmt, ap);
+    va_end(ap);
+}
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/printf.h b/trunk/target/linux/ar71xx/image/lzma-loader/src/printf.h
new file mode 100644
index 00000000..9b1c1df2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/printf.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#ifndef _printf_h_
+#define _printf_h_
+
+#include <stdarg.h>
+void printf(char *fmt, ...);
+
+#endif /* _printf_h_ */
diff --git a/trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini b/trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini
new file mode 100644
index 00000000..814b0fbc
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/ubinize-nbg6716.ini
@@ -0,0 +1,24 @@
+[rootfs]
+# Volume mode (other option is static)
+mode=ubi
+# Source image
+image=ubi_root.img
+# Volume ID in UBI image
+vol_id=0
+# Allow for dynamic resize
+vol_type=dynamic
+# Volume name
+vol_name=rootfs
+
+[rootfs_data]
+# Volume mode (other option is static)
+mode=ubi
+# Volume ID in UBI image
+vol_id=1
+# Allow for dynamic resize
+vol_type=dynamic
+# Volume name
+vol_name=rootfs_data
+# Autoresize volume at first mount
+vol_size=1MiB
+vol_flags=autoresize
diff --git a/trunk/target/linux/ar71xx/image/ubinize-wndr4300.ini b/trunk/target/linux/ar71xx/image/ubinize-wndr4300.ini
new file mode 100644
index 00000000..5bff906a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/image/ubinize-wndr4300.ini
@@ -0,0 +1,26 @@
+[rootfs]
+# Volume mode (other option is static)
+mode=ubi
+# Source image
+image=root.squashfs
+# Volume ID in UBI image
+vol_id=0
+# Allow for dynamic resize
+vol_type=dynamic
+# Volume name
+vol_name=rootfs
+# Autoresize volume at first mount
+# vol_flags=autoresize
+
+[rootfs_data]
+# Volume mode (other option is static)
+mode=ubi
+# Volume ID in UBI image
+vol_id=1
+# Allow for dynamic resize
+vol_type=dynamic
+# Volume name
+vol_name=rootfs_data
+# Autoresize volume at first mount
+vol_flags=autoresize
+vol_size=1MiB
diff --git a/trunk/target/linux/ar71xx/luci/config-default b/trunk/target/linux/ar71xx/luci/config-default
new file mode 100644
index 00000000..45169689
--- /dev/null
+++ b/trunk/target/linux/ar71xx/luci/config-default
@@ -0,0 +1 @@
+CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd"
diff --git a/trunk/target/linux/ar71xx/luci/profiles/00-default.mk b/trunk/target/linux/ar71xx/luci/profiles/00-default.mk
new file mode 100644
index 00000000..8f867fe8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/luci/profiles/00-default.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Default
+	NAME:=Default Profile (all drivers)
+	PACKAGES:= \
+		kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev luci luci-proto-relay luci-proto-ipv6
+endef
+
+define Profile/Default/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,Default))
diff --git a/trunk/target/linux/ar71xx/luci/profiles/netgear.mk b/trunk/target/linux/ar71xx/luci/profiles/netgear.mk
new file mode 100644
index 00000000..2a511cae
--- /dev/null
+++ b/trunk/target/linux/ar71xx/luci/profiles/netgear.mk
@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WNDAP360
+        NAME:=NETGEAR WNDAP360
+        PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/WNDAP360/Description
+        Package set optimized for the NETGEAR WNDAP360
+endef
+
+$(eval $(call Profile,WNDAP360))
+
+define Profile/WNDR3700
+	NAME:=NETGEAR WNDR3700/WNDR3800/WNDRMAC
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev kmod-leds-wndr3700-usb
+endef
+
+define Profile/WNDR3700/Description
+	Package set optimized for the NETGEAR WNDR3700/WNDR3800/WNDRMAC
+endef
+
+$(eval $(call Profile,WNDR3700))
+
+define Profile/WNR2000V3
+	NAME:=NETGEAR WNR2000V3
+endef
+
+define Profile/WNR2000V3/Description
+	Package set optimized for the NETGEAR WNR2000V3
+endef
+
+$(eval $(call Profile,WNR2000V3))
+
+
+define Profile/WNR2000V4
+	NAME:=NETGEAR WNR2000V4
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/WNR2000V4/Description
+	Package set optimized for the NETGEAR WNR2000V4
+endef
+
+$(eval $(call Profile,WNR2000V4))
+
+
+define Profile/WNR612V2
+	NAME:=NETGEAR WNR612V2 / On Networks N150
+endef
+
+define Profile/WNR612V2/Description
+	Package set optimized for the NETGEAR WNR612V2 / On Networks N150
+endef
+
+$(eval $(call Profile,WNR612V2))
+
+
+define Profile/WNR2200
+	NAME:=NETGEAR WNR2200
+endef
+
+define Profile/WNR2200/Description
+	Package set optimized for the NETGEAR WNR2200
+endef
+
+$(eval $(call Profile,WNR2200))
diff --git a/trunk/target/linux/ar71xx/luci/profiles/planex.mk b/trunk/target/linux/ar71xx/luci/profiles/planex.mk
new file mode 100644
index 00000000..1a7cace6
--- /dev/null
+++ b/trunk/target/linux/ar71xx/luci/profiles/planex.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/MZKW04NU
+	NAME:=Planex MZK-W04NU
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/MZKW04NU/Description
+	Package set optimized for the Planex MZK-W04NU.
+endef
+
+$(eval $(call Profile,MZKW04NU))
+
+define Profile/MZKW300NH
+	NAME:=Planex MZK-W300NH
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/MZKW300NH/Description
+	Package set optimized for the Planex MZK-W300NH.
+endef
+
+$(eval $(call Profile,MZKW300NH))
diff --git a/trunk/target/linux/ar71xx/luci/profiles/tp-link.mk b/trunk/target/linux/ar71xx/luci/profiles/tp-link.mk
new file mode 100644
index 00000000..0c6a46bb
--- /dev/null
+++ b/trunk/target/linux/ar71xx/luci/profiles/tp-link.mk
@@ -0,0 +1,355 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+
+define Profile/CPE510
+	NAME:=TP-LINK CPE210/220/510/520
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 rssileds
+endef
+
+define Profile/CPE510/Description
+	Package set optimized for the TP-LINK CPE210/220/510/520.
+endef
+$(eval $(call Profile,CPE510))
+
+
+define Profile/TLMR10U
+	NAME:=TP-LINK TL-MR10U
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2
+endef
+
+define Profile/TLMR10U/Description
+	Package set optimized for the TP-LINK TL-MR10U.
+endef
+$(eval $(call Profile,TLMR10U))
+
+
+define Profile/TLMR11U
+	NAME:=TP-LINK TL-MR11U
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR11U/Description
+	Package set optimized for the TP-LINK TL-MR11U.
+endef
+$(eval $(call Profile,TLMR11U))
+
+
+define Profile/TLMR13U
+	NAME:=TP-LINK TL-MR13U
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR13U/Description
+	Package set optimized for the TP-LINK TL-MR13U.
+endef
+$(eval $(call Profile,TLMR13U))
+
+
+define Profile/TLMR3020
+	NAME:=TP-LINK TL-MR3020
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3020/Description
+	Package set optimized for the TP-LINK TL-MR3020.
+endef
+$(eval $(call Profile,TLMR3020))
+
+
+define Profile/TLMR3040
+	NAME:=TP-LINK TL-MR3040
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3040/Description
+	Package set optimized for the TP-LINK TL-MR3040.
+endef
+$(eval $(call Profile,TLMR3040))
+
+
+define Profile/TLMR3220
+	NAME:=TP-LINK TL-MR3220
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3220/Description
+	Package set optimized for the TP-LINK TL-MR3220.
+endef
+$(eval $(call Profile,TLMR3220))
+
+
+define Profile/TLMR3420
+	NAME:=TP-LINK TL-MR3420
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLMR3420/Description
+	Package set optimized for the TP-LINK TL-MR3420.
+endef
+$(eval $(call Profile,TLMR3420))
+
+
+define Profile/TLWR703
+	NAME:=TP-LINK TL-WR703N
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2
+endef
+
+
+define Profile/TLWR703/Description
+	Package set optimized for the TP-LINK TL-WR703N.
+endef
+$(eval $(call Profile,TLWR703))
+
+
+define Profile/TLWR710
+	NAME:=TP-LINK TL-WR710N
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2
+endef
+
+
+define Profile/TLWR710/Description
+	Package set optimized for the TP-LINK TL-WR710N.
+endef
+$(eval $(call Profile,TLWR710))
+
+
+define Profile/TLWR720
+	NAME:=TP-LINK TL-WR720N
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2
+endef
+
+
+define Profile/TLWR720/Description
+	Package set optimized for the TP-LINK TL-WR720N.
+endef
+$(eval $(call Profile,TLWR720))
+
+
+define Profile/TLWA701
+	NAME:=TP-LINK TL-WA701N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWA701/Description
+	Package set optimized for the TP-LINK TL-WA701N/ND.
+endef
+$(eval $(call Profile,TLWA701))
+
+define Profile/TLWA730RE
+	NAME:=TP-LINK TL-WA730RE
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWA730RE/Description
+	Package set optimized for the TP-LINK TL-WA730RE.
+endef
+$(eval $(call Profile,TLWA730RE))
+
+define Profile/TLWA750
+	NAME:=TP-LINK TL-WA750RE
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 rssileds
+endef
+
+define Profile/TLWA750/Description
+	Package set optimized for the TP-LINK TL-WA750RE.
+endef
+$(eval $(call Profile,TLWA750))
+
+
+define Profile/TLWA7510
+	NAME:=TP-LINK TL-WA7510N
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWA7510/Description
+	Package set optimized for the TP-LINK TL-WA7510N.
+endef
+$(eval $(call Profile,TLWA7510))
+
+define Profile/TLWA801
+	NAME:=TP-LINK TL-WA801N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWA801/Description
+	Package set optimized for the TP-LINK TL-WA801N/ND.
+endef
+$(eval $(call Profile,TLWA801))
+
+define Profile/TLWA830
+	NAME:=TP-LINK TL-WA830RE
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWA830/Description
+	Package set optimized for the TP-LINK TL-WA830RE.
+endef
+$(eval $(call Profile,TLWA830))
+
+
+define Profile/TLWA850
+	NAME:=TP-LINK TL-WA850RE
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 rssileds
+endef
+
+define Profile/TLWA850/Description
+	Package set optimized for the TP-LINK TL-WA850RE.
+endef
+$(eval $(call Profile,TLWA850))
+
+
+define Profile/TLWA860
+	NAME:=TP-LINK TL-WA860RE
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWA860/Description
+	Package set optimized for the TP-LINK TL-WA860RE.
+endef
+$(eval $(call Profile,TLWA860))
+
+
+define Profile/TLWA901
+	NAME:=TP-LINK TL-WA901N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWA901/Description
+	Package set optimized for the TP-LINK TL-WA901N/ND.
+endef
+$(eval $(call Profile,TLWA901))
+
+
+define Profile/TLWDR4300
+	NAME:=TP-LINK TL-WDR3500/3600/4300/4310/MW4350R
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWDR4300/Description
+	Package set optimized for the TP-LINK TL-WDR3500/3600/4300/4310/MW4350R.
+endef
+$(eval $(call Profile,TLWDR4300))
+
+
+define Profile/TLWDR4900V2
+	NAME:=TP-LINK TL-WDR4900v2
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWDR4900V2/Description
+	Package set optimized for the TP-LINK TL-WDR4900v2.
+endef
+$(eval $(call Profile,TLWDR4900V2))
+
+
+define Profile/TLWR740
+	NAME:=TP-LINK TL-WR740N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWR740/Description
+	Package set optimized for the TP-LINK TL-WR740N/ND.
+endef
+$(eval $(call Profile,TLWR740))
+
+
+define Profile/TLWR741
+	NAME:=TP-LINK TL-WR741N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWR741/Description
+	Package set optimized for the TP-LINK TL-WR741N/ND.
+endef
+$(eval $(call Profile,TLWR741))
+
+define Profile/TLWR741-luci
+        NAME:=TP-LINK TL-WR741N/ND Luci
+        PACKAGES:=luci luci-proto-relay luci-proto-ipv6 luci luci-proto-relay
+endef
+
+define Profile/TLWR741-luci/Description
+        Package set optimized for the TP-LINK TL-WR741N/ND with the luci web-ui.
+endef
+$(eval $(call Profile,TLWR741-luci))
+
+define Profile/TLWR743
+	NAME:=TP-LINK TL-WR743N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWR743/Description
+	Package set optimized for the TP-LINK TL-WR743N/ND.
+endef
+$(eval $(call Profile,TLWR743))
+
+
+define Profile/TLWR841
+	NAME:=TP-LINK TL-WR841N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWR841/Description
+	Package set optimized for the TP-LINK TL-WR841N/ND.
+endef
+$(eval $(call Profile,TLWR841))
+
+
+define Profile/TLWR842
+	NAME:=TP-LINK TL-WR842N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWR842/Description
+	Package set optimized for the TP-LINK TL-WR842N/ND.
+endef
+$(eval $(call Profile,TLWR842))
+
+
+define Profile/TLWR941
+	NAME:=TP-LINK TL-WR941N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWR941/Description
+	Package set optimized for the TP-LINK TL-WR941N/ND.
+endef
+$(eval $(call Profile,TLWR941))
+
+
+define Profile/TLWR1041
+	NAME:=TP-LINK TL-WR1041N
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 
+endef
+
+define Profile/TLWR1041/Description
+	Package set optimized for the TP-LINK TL-WR1041N/ND.
+endef
+$(eval $(call Profile,TLWR1041))
+
+
+define Profile/TLWR1043
+	NAME:=TP-LINK TL-WR1043N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWR1043/Description
+	Package set optimized for the TP-LINK TL-WR1043N/ND.
+endef
+$(eval $(call Profile,TLWR1043))
+
+
+define Profile/TLWR2543
+	NAME:=TP-LINK TL-WR2543N/ND
+	PACKAGES:=luci luci-proto-relay luci-proto-ipv6 kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/TLWR2543/Description
+	Package set optimized for the TP-LINK TL-WR2543N/ND.
+endef
+$(eval $(call Profile,TLWR2543))
diff --git a/trunk/target/linux/ar71xx/luci/target.mk b/trunk/target/linux/ar71xx/luci/target.mk
new file mode 100644
index 00000000..b544f248
--- /dev/null
+++ b/trunk/target/linux/ar71xx/luci/target.mk
@@ -0,0 +1,8 @@
+BOARDNAME:=luci
+FEATURES += squashfs
+
+define Target/Description
+	Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards.
+endef
+
+
diff --git a/trunk/target/linux/ar71xx/mikrotik/config-default b/trunk/target/linux/ar71xx/mikrotik/config-default
new file mode 100644
index 00000000..89230159
--- /dev/null
+++ b/trunk/target/linux/ar71xx/mikrotik/config-default
@@ -0,0 +1,129 @@
+CONFIG_AT803X_PHY=y
+# CONFIG_ATH79_DEV_DSA is not set
+# CONFIG_ATH79_MACH_ALFA_AP96 is not set
+# CONFIG_ATH79_MACH_ALFA_NX is not set
+# CONFIG_ATH79_MACH_ALL0258N is not set
+# CONFIG_ATH79_MACH_ALL0315N is not set
+# CONFIG_ATH79_MACH_AP113 is not set
+# CONFIG_ATH79_MACH_AP121 is not set
+# CONFIG_ATH79_MACH_AP132 is not set
+# CONFIG_ATH79_MACH_AP136 is not set
+# CONFIG_ATH79_MACH_AP81 is not set
+# CONFIG_ATH79_MACH_AP83 is not set
+# CONFIG_ATH79_MACH_AP96 is not set
+# CONFIG_ATH79_MACH_ARCHER_C7 is not set
+# CONFIG_ATH79_MACH_AW_NR580 is not set
+# CONFIG_ATH79_MACH_CAP4200AG is not set
+# CONFIG_ATH79_MACH_CARAMBOLA2 is not set
+# CONFIG_ATH79_MACH_DB120 is not set
+# CONFIG_ATH79_MACH_DIR_505_A1 is not set
+# CONFIG_ATH79_MACH_DIR_600_A1 is not set
+# CONFIG_ATH79_MACH_DIR_615_C1 is not set
+# CONFIG_ATH79_MACH_DIR_825_B1 is not set
+# CONFIG_ATH79_MACH_DIR_825_C1 is not set
+# CONFIG_ATH79_MACH_EAP7660D is not set
+# CONFIG_ATH79_MACH_EW_DORIN is not set
+# CONFIG_ATH79_MACH_HORNET_UB is not set
+# CONFIG_ATH79_MACH_JA76PF is not set
+# CONFIG_ATH79_MACH_JWAP003 is not set
+# CONFIG_ATH79_MACH_MR600 is not set
+# CONFIG_ATH79_MACH_MYNET_N600 is not set
+# CONFIG_ATH79_MACH_MZK_W04NU is not set
+# CONFIG_ATH79_MACH_MZK_W300NH is not set
+# CONFIG_ATH79_MACH_NBG460N is not set
+# CONFIG_ATH79_MACH_OM2P is not set
+# CONFIG_ATH79_MACH_PB42 is not set
+# CONFIG_ATH79_MACH_PB44 is not set
+# CONFIG_ATH79_MACH_PB92 is not set
+CONFIG_ATH79_MACH_RB2011=y
+CONFIG_ATH79_MACH_RB4XX=y
+CONFIG_ATH79_MACH_RB750=y
+CONFIG_ATH79_MACH_RB91X=y
+CONFIG_ATH79_MACH_RB95X=y
+CONFIG_ATH79_MACH_RBSXTLITE=y
+# CONFIG_ATH79_MACH_RW2458N is not set
+# CONFIG_ATH79_MACH_TEW_632BRP is not set
+# CONFIG_ATH79_MACH_TEW_673GRU is not set
+# CONFIG_ATH79_MACH_TEW_712BR is not set
+# CONFIG_ATH79_MACH_TEW_732BR is not set
+# CONFIG_ATH79_MACH_TL_MR11U is not set
+# CONFIG_ATH79_MACH_TL_MR13U is not set
+# CONFIG_ATH79_MACH_TL_MR3020 is not set
+# CONFIG_ATH79_MACH_TL_MR3X20 is not set
+# CONFIG_ATH79_MACH_TL_WA830RE_V2 is not set
+# CONFIG_ATH79_MACH_TL_WA901ND is not set
+# CONFIG_ATH79_MACH_TL_WA901ND_V2 is not set
+# CONFIG_ATH79_MACH_TL_WDR3500 is not set
+# CONFIG_ATH79_MACH_TL_WDR4300 is not set
+# CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
+# CONFIG_ATH79_MACH_TL_WR1043ND is not set
+# CONFIG_ATH79_MACH_TL_WR2543N is not set
+# CONFIG_ATH79_MACH_TL_WR703N is not set
+# CONFIG_ATH79_MACH_TL_WR720N_V3 is not set
+# CONFIG_ATH79_MACH_TL_WR741ND is not set
+# CONFIG_ATH79_MACH_TL_WR741ND_V4 is not set
+# CONFIG_ATH79_MACH_TL_WR841N_V1 is not set
+# CONFIG_ATH79_MACH_TL_WR841N_V8 is not set
+# CONFIG_ATH79_MACH_TL_WR941ND is not set
+# CONFIG_ATH79_MACH_UBNT is not set
+# CONFIG_ATH79_MACH_UBNT_XM is not set
+# CONFIG_ATH79_MACH_WHR_HP_G300N is not set
+# CONFIG_ATH79_MACH_WLAE_AG300N is not set
+# CONFIG_ATH79_MACH_WNDAP360 is not set
+# CONFIG_ATH79_MACH_WNDR3700 is not set
+# CONFIG_ATH79_MACH_WNDR4300 is not set
+# CONFIG_ATH79_MACH_WNR2000 is not set
+# CONFIG_ATH79_MACH_WNR2000_V3 is not set
+# CONFIG_ATH79_MACH_WNR2200 is not set
+# CONFIG_ATH79_MACH_WP543 is not set
+# CONFIG_ATH79_MACH_WPE72 is not set
+# CONFIG_ATH79_MACH_WRT160NL is not set
+# CONFIG_ATH79_MACH_WRT400N is not set
+# CONFIG_ATH79_MACH_WZR_HP_AG300H is not set
+# CONFIG_ATH79_MACH_WZR_HP_G300NH is not set
+# CONFIG_ATH79_MACH_WZR_HP_G300NH2 is not set
+# CONFIG_ATH79_MACH_WZR_HP_G450H is not set
+# CONFIG_ATH79_MACH_ZCN_1523H is not set
+# CONFIG_ATH79_NVRAM is not set
+CONFIG_ATH79_ROUTERBOOT=y
+CONFIG_CMDLINE="rootfstype=yaffs noinitrd"
+CONFIG_GPIO_74X164=y
+CONFIG_GPIO_LATCH=y
+# CONFIG_JFFS2_FS is not set
+CONFIG_LEDS_RB750=y
+CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE=y
+CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_GPIO=y
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MYLOADER_PARTS is not set
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_AR934X=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_RB4XX=y
+CONFIG_MTD_NAND_RB750=y
+CONFIG_MTD_NAND_RB91X=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_TPLINK_PARTS is not set
+# CONFIG_OVERLAYFS_FS is not set
+CONFIG_RLE_DECOMPRESS=y
+# CONFIG_SOC_AR913X is not set
+# CONFIG_SOC_AR933X is not set
+# CONFIG_SOC_QCA955X is not set
+CONFIG_SPI_RB4XX=y
+CONFIG_SPI_RB4XX_CPLD=y
+# CONFIG_SQUASHFS is not set
+CONFIG_YAFFS_9BYTE_TAGS=y
+CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
+CONFIG_YAFFS_AUTO_YAFFS2=y
+# CONFIG_YAFFS_DISABLE_BACKGROUND is not set
+# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set
+# CONFIG_YAFFS_DISABLE_TAGS_ECC is not set
+# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
+CONFIG_YAFFS_FS=y
+CONFIG_YAFFS_XATTR=y
+CONFIG_YAFFS_YAFFS1=y
+CONFIG_YAFFS_YAFFS2=y
diff --git a/trunk/target/linux/ar71xx/mikrotik/profiles/01-minimal.mk b/trunk/target/linux/ar71xx/mikrotik/profiles/01-minimal.mk
new file mode 100644
index 00000000..3651c88a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/mikrotik/profiles/01-minimal.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/DefaultNoWifi
+	NAME:=Default Profile (no WiFi)
+	PACKAGES:=
+endef
+
+define Profile/DefaultNoWifi/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,DefaultNoWifi))
diff --git a/trunk/target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk b/trunk/target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk
new file mode 100644
index 00000000..a291ff68
--- /dev/null
+++ b/trunk/target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Ath5k
+	NAME:=Atheros WiFi (ath5k)
+	PACKAGES:=kmod-ath5k -kmod-ath9k
+endef
+
+define Profile/Ath5k/Description
+	Package set compatible with hardware using Atheros WiFi cards.
+endef
+$(eval $(call Profile,Ath5k))
diff --git a/trunk/target/linux/ar71xx/mikrotik/target.mk b/trunk/target/linux/ar71xx/mikrotik/target.mk
new file mode 100644
index 00000000..a2a41ed2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/mikrotik/target.mk
@@ -0,0 +1,9 @@
+BOARDNAME:=Mikrotik devices with NAND flash
+FEATURES += targz
+
+define Target/Description
+	Build firmware images for Atheros AR71xx/AR913x based Mikrotik boards.
+	e.g. MikroTik RB-4xx or RB-750
+endef
+
+
diff --git a/trunk/target/linux/ar71xx/modules.mk b/trunk/target/linux/ar71xx/modules.mk
new file mode 100644
index 00000000..4530708d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/modules.mk
@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define KernelPackage/leds-rb750
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=RouterBOARD 750 LED support
+  DEPENDS:=@TARGET_ar71xx
+  KCONFIG:=CONFIG_LEDS_RB750
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-rb750.ko
+  AUTOLOAD:=$(call AutoLoad,60,leds-rb750)
+endef
+
+define KernelPackage/leds-rb750/description
+ Kernel module for the LEDs on the MikroTik RouterBOARD 750.
+endef
+
+$(eval $(call KernelPackage,leds-rb750))
+
+
+define KernelPackage/leds-wndr3700-usb
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=WNDR3700 USB LED support
+  DEPENDS:=@TARGET_ar71xx
+  KCONFIG:=CONFIG_LEDS_WNDR3700_USB
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wndr3700-usb.ko
+  AUTOLOAD:=$(call AutoLoad,60,leds-wndr3700-usb)
+endef
+
+define KernelPackage/leds-wndr3700-usb/description
+ Kernel module for the USB LED on the NETGEAR WNDR3700 board.
+endef
+
+$(eval $(call KernelPackage,leds-wndr3700-usb))
+
+
+define KernelPackage/nand-ar934x
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Atheros AR934x NAND flash controller driver
+  KCONFIG:=\
+    CONFIG_MTD_NAND_AR934X \
+    CONFIG_MTD_NAND_AR934X_HW_ECC=y
+  DEPENDS:=@TARGET_ar71xx +kmod-nand
+  FILES:=$(LINUX_DIR)/drivers/mtd/nand/ar934x_nfc.ko
+  AUTOLOAD:=$(call AutoLoad,25,ar934x_nfc)
+endef
+
+define KernelPackage/nand-ar934x/description
+  Atheros AR934x NAND flash controller driver.
+endef
+
+$(eval $(call KernelPackage,nand-ar934x))
+
+
+define KernelPackage/spi-vsc7385
+  SUBMENU:=$(SPI_MENU)
+  TITLE:=Vitesse VSC7385 ethernet switch driver
+  DEPENDS:=@TARGET_ar71xx
+  KCONFIG:=CONFIG_SPI_VSC7385
+  FILES:=$(LINUX_DIR)/drivers/spi/spi-vsc7385.ko
+  AUTOLOAD:=$(call AutoLoad,93,spi-vsc7385)
+endef
+
+define KernelPackage/spi-vsc7385/description
+  This package contains the SPI driver for the Vitesse VSC7385 ethernet switch.
+endef
+
+$(eval $(call KernelPackage,spi-vsc7385))
diff --git a/trunk/target/linux/ar71xx/nand/config-default b/trunk/target/linux/ar71xx/nand/config-default
new file mode 100644
index 00000000..626d676c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/nand/config-default
@@ -0,0 +1,111 @@
+# CONFIG_ATH79_DEV_DSA is not set
+# CONFIG_ATH79_MACH_ALFA_AP96 is not set
+# CONFIG_ATH79_MACH_ALFA_NX is not set
+# CONFIG_ATH79_MACH_ALL0258N is not set
+# CONFIG_ATH79_MACH_ALL0315N is not set
+# CONFIG_ATH79_MACH_AP113 is not set
+# CONFIG_ATH79_MACH_AP121 is not set
+# CONFIG_ATH79_MACH_AP132 is not set
+# CONFIG_ATH79_MACH_AP136 is not set
+# CONFIG_ATH79_MACH_AP81 is not set
+# CONFIG_ATH79_MACH_AP83 is not set
+# CONFIG_ATH79_MACH_AP96 is not set
+# CONFIG_ATH79_MACH_ARCHER_C7 is not set
+# CONFIG_ATH79_MACH_AW_NR580 is not set
+# CONFIG_ATH79_MACH_CAP4200AG is not set
+# CONFIG_ATH79_MACH_CARAMBOLA2 is not set
+# CONFIG_ATH79_MACH_DB120 is not set
+# CONFIG_ATH79_MACH_DIR_505_A1 is not set
+# CONFIG_ATH79_MACH_DIR_600_A1 is not set
+# CONFIG_ATH79_MACH_DIR_615_C1 is not set
+# CONFIG_ATH79_MACH_DIR_825_B1 is not set
+# CONFIG_ATH79_MACH_DIR_825_C1 is not set
+# CONFIG_ATH79_MACH_EAP7660D is not set
+# CONFIG_ATH79_MACH_EW_DORIN is not set
+# CONFIG_ATH79_MACH_HORNET_UB is not set
+# CONFIG_ATH79_MACH_JA76PF is not set
+# CONFIG_ATH79_MACH_JWAP003 is not set
+# CONFIG_ATH79_MACH_MR600 is not set
+# CONFIG_ATH79_MACH_MYNET_N600 is not set
+# CONFIG_ATH79_MACH_MZK_W04NU is not set
+# CONFIG_ATH79_MACH_MZK_W300NH is not set
+# CONFIG_ATH79_MACH_NBG460N is not set
+# CONFIG_ATH79_MACH_OM2P is not set
+# CONFIG_ATH79_MACH_PB42 is not set
+# CONFIG_ATH79_MACH_PB44 is not set
+# CONFIG_ATH79_MACH_PB92 is not set
+# CONFIG_ATH79_MACH_RW2458N is not set
+# CONFIG_ATH79_MACH_TEW_632BRP is not set
+# CONFIG_ATH79_MACH_TEW_673GRU is not set
+# CONFIG_ATH79_MACH_TEW_712BR is not set
+# CONFIG_ATH79_MACH_TEW_732BR is not set
+# CONFIG_ATH79_MACH_TL_MR11U is not set
+# CONFIG_ATH79_MACH_TL_MR13U is not set
+# CONFIG_ATH79_MACH_TL_MR3020 is not set
+# CONFIG_ATH79_MACH_TL_MR3X20 is not set
+# CONFIG_ATH79_MACH_TL_WA901ND is not set
+# CONFIG_ATH79_MACH_TL_WA901ND_V2 is not set
+# CONFIG_ATH79_MACH_TL_WDR3500 is not set
+# CONFIG_ATH79_MACH_TL_WDR4300 is not set
+# CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
+# CONFIG_ATH79_MACH_TL_WR1043ND is not set
+# CONFIG_ATH79_MACH_TL_WR2543N is not set
+# CONFIG_ATH79_MACH_TL_WR703N is not set
+# CONFIG_ATH79_MACH_TL_WR720N_V3 is not set
+# CONFIG_ATH79_MACH_TL_WR741ND is not set
+# CONFIG_ATH79_MACH_TL_WR741ND_V4 is not set
+# CONFIG_ATH79_MACH_TL_WR841N_V1 is not set
+# CONFIG_ATH79_MACH_TL_WR841N_V8 is not set
+# CONFIG_ATH79_MACH_TL_WR941ND is not set
+# CONFIG_ATH79_MACH_UBNT is not set
+# CONFIG_ATH79_MACH_UBNT_XM is not set
+# CONFIG_ATH79_MACH_WHR_HP_G300N is not set
+# CONFIG_ATH79_MACH_WLAE_AG300N is not set
+# CONFIG_ATH79_MACH_WNDAP360 is not set
+# CONFIG_ATH79_MACH_WNDR3700 is not set
+# CONFIG_ATH79_MACH_WNR2000 is not set
+# CONFIG_ATH79_MACH_WNR2000_V3 is not set
+# CONFIG_ATH79_MACH_WNR2200 is not set
+# CONFIG_ATH79_MACH_WP543 is not set
+# CONFIG_ATH79_MACH_WPE72 is not set
+# CONFIG_ATH79_MACH_WRT160NL is not set
+# CONFIG_ATH79_MACH_WRT400N is not set
+# CONFIG_ATH79_MACH_WZR_HP_AG300H is not set
+# CONFIG_ATH79_MACH_WZR_HP_G300NH is not set
+# CONFIG_ATH79_MACH_WZR_HP_G300NH2 is not set
+# CONFIG_ATH79_MACH_WZR_HP_G450H is not set
+# CONFIG_ATH79_MACH_ZCN_1523H is not set
+# CONFIG_ATH79_NVRAM is not set
+CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
+# CONFIG_IP17XX_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MYLOADER_PARTS is not set
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_AR934X=y
+CONFIG_MTD_NAND_AR934X_HW_ECC=y
+CONFIG_MTD_NAND_ECC=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_SPLIT_SEAMA_FW is not set
+# CONFIG_MTD_TPLINK_PARTS is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_SOC_AR71XX is not set
+# CONFIG_SOC_AR724X is not set
+# CONFIG_SOC_AR913X is not set
+CONFIG_SPI_ATH79=y
+# CONFIG_SPI_BITBANG is not set
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
diff --git a/trunk/target/linux/ar71xx/nand/profiles/netgear.mk b/trunk/target/linux/ar71xx/nand/profiles/netgear.mk
new file mode 100644
index 00000000..738aaba2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/nand/profiles/netgear.mk
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2009-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/R6100
+	NAME:=NETGEAR R6100
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/R6100/Description
+	Package set optimized for the NETGEAR R6100
+endef
+
+$(eval $(call Profile,R6100))
+
+
+define Profile/WNDR4300
+	NAME:=NETGEAR WNDR3700v4/WNDR4300
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/WNDR4300/Description
+	Package set optimized for the NETGEAR WNDR3700v4/WNDR4300
+endef
+
+$(eval $(call Profile,WNDR4300))
diff --git a/trunk/target/linux/ar71xx/nand/profiles/zyxel.mk b/trunk/target/linux/ar71xx/nand/profiles/zyxel.mk
new file mode 100644
index 00000000..ec813e54
--- /dev/null
+++ b/trunk/target/linux/ar71xx/nand/profiles/zyxel.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/NBG6716
+	NAME:=Zyxel NBG 6716
+	PACKAGES:=kmod-rtc-pcf8563 kmod-ath10k
+endef
+
+define Profile/NBG6716/Description
+	Package set optimized for the Zyxel NBG 6716 Routers.
+endef
+
+$(eval $(call Profile,NBG6716))
+
diff --git a/trunk/target/linux/ar71xx/nand/target.mk b/trunk/target/linux/ar71xx/nand/target.mk
new file mode 100644
index 00000000..7532ec69
--- /dev/null
+++ b/trunk/target/linux/ar71xx/nand/target.mk
@@ -0,0 +1,7 @@
+BOARDNAME := Generic devices with NAND flash
+FEATURES += squashfs nand rtc
+
+define Target/Description
+	Build firmware images for Atheros AR71xx/AR913x based boards with
+	NAND flash, e.g. Netgear WNDR4300.
+endef
diff --git a/trunk/target/linux/ar71xx/patches-3.14/102-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch b/trunk/target/linux/ar71xx/patches-3.14/102-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch
new file mode 100644
index 00000000..79c7ab01
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/102-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch
@@ -0,0 +1,42 @@
+From 8b7a76e72fc819753878cd5684e243f33f847c79 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Wed, 21 Aug 2013 11:47:22 +0100
+Subject: [PATCH] MIPS: ath79: Avoid using unitialized 'reg' variable
+
+Fixes the following build error:
+arch/mips/include/asm/mach-ath79/ath79.h:139:20: error: 'reg' may be used
+uninitialized in this function [-Werror=maybe-uninitialized]
+arch/mips/ath79/common.c:62:6: note: 'reg' was declared here
+In file included from arch/mips/ath79/common.c:20:0:
+arch/mips/ath79/common.c: In function 'ath79_device_reset_clear':
+arch/mips/include/asm/mach-ath79/ath79.h:139:20:
+error: 'reg' may be used uninitialized in this function
+[-Werror=maybe-uninitialized]
+arch/mips/ath79/common.c:90:6: note: 'reg' was declared here
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Acked-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ arch/mips/ath79/common.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/mips/ath79/common.c
++++ b/arch/mips/ath79/common.c
+@@ -75,7 +75,7 @@ void ath79_device_reset_set(u32 mask)
+ 	else if (soc_is_qca955x())
+ 		reg = QCA955X_RESET_REG_RESET_MODULE;
+ 	else
+-		BUG();
++		panic("Reset register not defined for this SOC");
+ 
+ 	spin_lock_irqsave(&ath79_device_reset_lock, flags);
+ 	t = ath79_reset_rr(reg);
+@@ -103,7 +103,7 @@ void ath79_device_reset_clear(u32 mask)
+ 	else if (soc_is_qca955x())
+ 		reg = QCA955X_RESET_REG_RESET_MODULE;
+ 	else
+-		BUG();
++		panic("Reset register not defined for this SOC");
+ 
+ 	spin_lock_irqsave(&ath79_device_reset_lock, flags);
+ 	t = ath79_reset_rr(reg);
diff --git a/trunk/target/linux/ar71xx/patches-3.14/206-spi-ath79-make-chipselect-logic-more-flexible.patch b/trunk/target/linux/ar71xx/patches-3.14/206-spi-ath79-make-chipselect-logic-more-flexible.patch
new file mode 100644
index 00000000..25698095
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/206-spi-ath79-make-chipselect-logic-more-flexible.patch
@@ -0,0 +1,301 @@
+From 7008284716403237f6bc7d7590b3ed073555bd56 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Wed, 11 Jan 2012 22:25:11 +0100
+Subject: [PATCH 34/34] spi/ath79: make chipselect logic more flexible
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ arch/mips/ath79/mach-ap121.c                       |    6 ++
+ arch/mips/ath79/mach-ap136.c                       |    6 ++
+ arch/mips/ath79/mach-ap81.c                        |    6 ++
+ arch/mips/ath79/mach-db120.c                       |    6 ++
+ arch/mips/ath79/mach-pb44.c                        |    6 ++
+ arch/mips/ath79/mach-ubnt-xm.c                     |    6 ++
+ .../include/asm/mach-ath79/ath79_spi_platform.h    |    8 ++-
+ drivers/spi/spi-ath79.c                            |   67 +++++++++++++-------
+ 8 files changed, 88 insertions(+), 23 deletions(-)
+
+--- a/arch/mips/ath79/mach-ap121.c
++++ b/arch/mips/ath79/mach-ap121.c
+@@ -58,12 +58,18 @@ static struct gpio_keys_button ap121_gpi
+ 	}
+ };
+ 
++static struct ath79_spi_controller_data ap121_spi0_data = {
++	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
++	.cs_line = 0,
++};
++
+ static struct spi_board_info ap121_spi_info[] = {
+ 	{
+ 		.bus_num	= 0,
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 25000000,
+ 		.modalias	= "mx25l1606e",
++		.controller_data = &ap121_spi0_data,
+ 	}
+ };
+ 
+--- a/arch/mips/ath79/mach-ap136.c
++++ b/arch/mips/ath79/mach-ap136.c
+@@ -98,12 +98,18 @@ static struct gpio_keys_button ap136_gpi
+ 	},
+ };
+ 
++static struct ath79_spi_controller_data ap136_spi0_data = {
++	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
++	.cs_line = 0,
++};
++
+ static struct spi_board_info ap136_spi_info[] = {
+ 	{
+ 		.bus_num	= 0,
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 25000000,
+ 		.modalias	= "mx25l6405d",
++		.controller_data = &ap136_spi0_data,
+ 	}
+ };
+ 
+--- a/arch/mips/ath79/mach-ap81.c
++++ b/arch/mips/ath79/mach-ap81.c
+@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio
+ 	}
+ };
+ 
++static struct ath79_spi_controller_data ap81_spi0_data = {
++	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
++	.cs_line = 0,
++};
++
+ static struct spi_board_info ap81_spi_info[] = {
+ 	{
+ 		.bus_num	= 0,
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 25000000,
+ 		.modalias	= "m25p64",
++		.controller_data = &ap81_spi0_data,
+ 	}
+ };
+ 
+--- a/arch/mips/ath79/mach-db120.c
++++ b/arch/mips/ath79/mach-db120.c
+@@ -76,12 +76,18 @@ static struct gpio_keys_button db120_gpi
+ 	},
+ };
+ 
++static struct ath79_spi_controller_data db120_spi0_data = {
++	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
++	.cs_line = 0,
++};
++
+ static struct spi_board_info db120_spi_info[] = {
+ 	{
+ 		.bus_num	= 0,
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 25000000,
+ 		.modalias	= "s25sl064a",
++		.controller_data = &db120_spi0_data,
+ 	}
+ };
+ 
+--- a/arch/mips/ath79/mach-pb44.c
++++ b/arch/mips/ath79/mach-pb44.c
+@@ -87,12 +87,18 @@ static struct gpio_keys_button pb44_gpio
+ 	}
+ };
+ 
++static struct ath79_spi_controller_data pb44_spi0_data = {
++	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
++	.cs_line = 0,
++};
++
+ static struct spi_board_info pb44_spi_info[] = {
+ 	{
+ 		.bus_num	= 0,
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 25000000,
+ 		.modalias	= "m25p64",
++		.controller_data = &pb44_spi0_data,
+ 	},
+ };
+ 
+--- a/arch/mips/ath79/mach-ubnt-xm.c
++++ b/arch/mips/ath79/mach-ubnt-xm.c
+@@ -65,12 +65,18 @@ static struct gpio_keys_button ubnt_xm_g
+ 	}
+ };
+ 
++static struct ath79_spi_controller_data ubnt_xm_spi0_data = {
++	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
++	.cs_line = 0,
++};
++
+ static struct spi_board_info ubnt_xm_spi_info[] = {
+ 	{
+ 		.bus_num	= 0,
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 25000000,
+ 		.modalias	= "mx25l6405d",
++		.controller_data = &ubnt_xm_spi0_data,
+ 	}
+ };
+ 
+--- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
++++ b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
+@@ -16,8 +16,14 @@ struct ath79_spi_platform_data {
+ 	unsigned	num_chipselect;
+ };
+ 
++enum ath79_spi_cs_type {
++	ATH79_SPI_CS_TYPE_INTERNAL,
++	ATH79_SPI_CS_TYPE_GPIO,
++};
++
+ struct ath79_spi_controller_data {
+-	unsigned	gpio;
++	enum ath79_spi_cs_type cs_type;
++	unsigned cs_line;
+ };
+ 
+ #endif /* _ATH79_SPI_PLATFORM_H */
+--- a/drivers/spi/spi-ath79.c
++++ b/drivers/spi/spi-ath79.c
+@@ -35,6 +35,8 @@
+ #define ATH79_SPI_RRW_DELAY_FACTOR	12000
+ #define MHZ				(1000 * 1000)
+ 
++#define ATH79_SPI_CS_LINE_MAX		2
++
+ struct ath79_spi {
+ 	struct spi_bitbang	bitbang;
+ 	u32			ioc_base;
+@@ -69,6 +71,7 @@ static void ath79_spi_chipselect(struct 
+ {
+ 	struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+ 	int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
++	struct ath79_spi_controller_data *cdata = spi->controller_data;
+ 
+ 	if (is_active) {
+ 		/* set initial clock polarity */
+@@ -80,20 +83,24 @@ static void ath79_spi_chipselect(struct 
+ 		ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+ 	}
+ 
+-	if (spi->chip_select) {
+-		struct ath79_spi_controller_data *cdata = spi->controller_data;
+-
+-		/* SPI is normally active-low */
+-		gpio_set_value(cdata->gpio, cs_high);
+-	} else {
++	switch (cdata->cs_type) {
++	case ATH79_SPI_CS_TYPE_INTERNAL:
+ 		if (cs_high)
+-			sp->ioc_base |= AR71XX_SPI_IOC_CS0;
++			sp->ioc_base |= AR71XX_SPI_IOC_CS(cdata->cs_line);
+ 		else
+-			sp->ioc_base &= ~AR71XX_SPI_IOC_CS0;
++			sp->ioc_base &= ~AR71XX_SPI_IOC_CS(cdata->cs_line);
+ 
+ 		ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+-	}
++		break;
+ 
++	case ATH79_SPI_CS_TYPE_GPIO:
++		/* SPI is normally active-low */
++		if (gpio_cansleep(cdata->cs_line))
++			gpio_set_value_cansleep(cdata->cs_line, cs_high);
++		else
++			gpio_set_value(cdata->cs_line, cs_high);
++		break;
++	}
+ }
+ 
+ static void ath79_spi_enable(struct ath79_spi *sp)
+@@ -120,24 +127,30 @@ static void ath79_spi_disable(struct ath
+ static int ath79_spi_setup_cs(struct spi_device *spi)
+ {
+ 	struct ath79_spi_controller_data *cdata;
++	unsigned long flags;
+ 	int status;
+ 
+ 	cdata = spi->controller_data;
+-	if (spi->chip_select && !cdata)
++	if (!cdata)
+ 		return -EINVAL;
+ 
+ 	status = 0;
+-	if (spi->chip_select) {
+-		unsigned long flags;
++	switch (cdata->cs_type) {
++	case ATH79_SPI_CS_TYPE_INTERNAL:
++		if (cdata->cs_line > ATH79_SPI_CS_LINE_MAX)
++			status = -EINVAL;
++		break;
+ 
++	case ATH79_SPI_CS_TYPE_GPIO:
+ 		flags = GPIOF_DIR_OUT;
+ 		if (spi->mode & SPI_CS_HIGH)
+ 			flags |= GPIOF_INIT_LOW;
+ 		else
+ 			flags |= GPIOF_INIT_HIGH;
+ 
+-		status = gpio_request_one(cdata->gpio, flags,
++		status = gpio_request_one(cdata->cs_line, flags,
+ 					  dev_name(&spi->dev));
++		break;
+ 	}
+ 
+ 	return status;
+@@ -145,9 +158,19 @@ static int ath79_spi_setup_cs(struct spi
+ 
+ static void ath79_spi_cleanup_cs(struct spi_device *spi)
+ {
+-	if (spi->chip_select) {
+-		struct ath79_spi_controller_data *cdata = spi->controller_data;
+-		gpio_free(cdata->gpio);
++	struct ath79_spi_controller_data *cdata;
++
++	cdata = spi->controller_data;
++	if (!cdata)
++		return;
++
++	switch (cdata->cs_type) {
++	case ATH79_SPI_CS_TYPE_INTERNAL:
++		/* nothing to do */
++		break;
++	case ATH79_SPI_CS_TYPE_GPIO:
++		gpio_free(cdata->cs_line);
++		break;
+ 	}
+ }
+ 
+@@ -212,6 +235,10 @@ static int ath79_spi_probe(struct platfo
+ 	unsigned long rate;
+ 	int ret;
+ 
++	pdata = pdev->dev.platform_data;
++	if (!pdata)
++		return -EINVAL;
++
+ 	master = spi_alloc_master(&pdev->dev, sizeof(*sp));
+ 	if (master == NULL) {
+ 		dev_err(&pdev->dev, "failed to allocate spi master\n");
+@@ -221,15 +248,11 @@ static int ath79_spi_probe(struct platfo
+ 	sp = spi_master_get_devdata(master);
+ 	platform_set_drvdata(pdev, sp);
+ 
+-	pdata = dev_get_platdata(&pdev->dev);
+-
+ 	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
+ 	master->setup = ath79_spi_setup;
+ 	master->cleanup = ath79_spi_cleanup;
+-	if (pdata) {
+-		master->bus_num = pdata->bus_num;
+-		master->num_chipselect = pdata->num_chipselect;
+-	}
++	master->bus_num = pdata->bus_num;
++	master->num_chipselect = pdata->num_chipselect;
+ 
+ 	sp->bitbang.master = master;
+ 	sp->bitbang.chipselect = ath79_spi_chipselect;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/213-MIPS-ath79-fix-ar933x-wmac-reset.patch b/trunk/target/linux/ar71xx/patches-3.14/213-MIPS-ath79-fix-ar933x-wmac-reset.patch
new file mode 100644
index 00000000..e0821a77
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/213-MIPS-ath79-fix-ar933x-wmac-reset.patch
@@ -0,0 +1,31 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -62,10 +62,27 @@ static void __init ar913x_wmac_setup(voi
+ 
+ static int ar933x_wmac_reset(void)
+ {
++	int retries = 20;
++
+ 	ath79_device_reset_set(AR933X_RESET_WMAC);
+ 	ath79_device_reset_clear(AR933X_RESET_WMAC);
+ 
+-	return 0;
++	while (1) {
++		u32 bootstrap;
++
++		bootstrap = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
++		if ((bootstrap & AR933X_BOOTSTRAP_EEPBUSY) == 0)
++			return 0;
++
++		if (retries-- == 0)
++			break;
++
++		udelay(10000);
++		retries++;
++	}
++
++	pr_err("ar933x: WMAC reset timed out");
++	return -ETIMEDOUT;
+ }
+ 
+ static int ar933x_r1_get_wmac_revision(void)
diff --git a/trunk/target/linux/ar71xx/patches-3.14/220-add_cpu_feature_overrides.patch b/trunk/target/linux/ar71xx/patches-3.14/220-add_cpu_feature_overrides.patch
new file mode 100644
index 00000000..d925f926
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/220-add_cpu_feature_overrides.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
++++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
+@@ -36,6 +36,7 @@
+ #define cpu_has_mdmx		0
+ #define cpu_has_mips3d		0
+ #define cpu_has_smartmips	0
++#define cpu_has_rixi		0
+ 
+ #define cpu_has_mips32r1	1
+ #define cpu_has_mips32r2	1
+@@ -43,6 +44,7 @@
+ #define cpu_has_mips64r2	0
+ 
+ #define cpu_has_mipsmt		0
++#define cpu_has_userlocal	0
+ 
+ #define cpu_has_64bits		0
+ #define cpu_has_64bit_zero_reg	0
+@@ -51,5 +53,9 @@
+ 
+ #define cpu_dcache_line_size()	32
+ #define cpu_icache_line_size()	32
++#define cpu_has_vtag_icache	0
++#define cpu_has_dc_aliases	1
++#define cpu_has_ic_fills_f_dc	0
++#define cpu_has_pindexed_dcache	0
+ 
+ #endif /* __ASM_MACH_ATH79_CPU_FEATURE_OVERRIDES_H */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/300-MIPS-add-MIPS_MACHINE_NONAME-macro.patch b/trunk/target/linux/ar71xx/patches-3.14/300-MIPS-add-MIPS_MACHINE_NONAME-macro.patch
new file mode 100644
index 00000000..0bc64b7a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/300-MIPS-add-MIPS_MACHINE_NONAME-macro.patch
@@ -0,0 +1,21 @@
+--- a/arch/mips/include/asm/mips_machine.h
++++ b/arch/mips/include/asm/mips_machine.h
+@@ -36,6 +36,18 @@ static struct mips_machine machine_##_ty
+ 	.mach_setup	= _setup,				\
+ };
+ 
++#define MIPS_MACHINE_NONAME(_type, _id, _setup)		\
++static const char machine_id_##_type[] __initconst		\
++			__aligned(1) = _id;			\
++static struct mips_machine machine_##_type			\
++		__used __section(.mips.machines.init) =		\
++{								\
++	.mach_type	= _type,				\
++	.mach_id	= machine_id_##_type,			\
++	.mach_name	= NULL,					\
++	.mach_setup	= _setup,				\
++};
++
+ extern long __mips_machines_start;
+ extern long __mips_machines_end;
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/310-lib-add-rle-decompression.patch b/trunk/target/linux/ar71xx/patches-3.14/310-lib-add-rle-decompression.patch
new file mode 100644
index 00000000..5b58743b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/310-lib-add-rle-decompression.patch
@@ -0,0 +1,124 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -221,6 +221,9 @@ config LZMA_COMPRESS
+ config LZMA_DECOMPRESS
+     tristate
+ 
++config RLE_DECOMPRESS
++	tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -94,6 +94,7 @@ obj-$(CONFIG_XZ_DEC) += xz/
+ obj-$(CONFIG_RAID6_PQ) += raid6/
+ obj-$(CONFIG_LZMA_COMPRESS) += lzma/
+ obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
++obj-$(CONFIG_RLE_DECOMPRESS) += rle.o
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/include/linux/rle.h
+@@ -0,0 +1,18 @@
++#ifndef _RLE_H_
++#define _RLE_H_
++
++#ifdef CONFIG_RLE_DECOMPRESS
++int rle_decode(const unsigned char *src, size_t srclen,
++	       unsigned char *dst, size_t dstlen,
++	       size_t *src_done, size_t *dst_done);
++#else
++static inline int
++rle_decode(const unsigned char *src, size_t srclen,
++	   unsigned char *dst, size_t dstlen,
++	   size_t *src_done, size_t *dst_done)
++{
++	return -ENOTSUPP;
++}
++#endif /* CONFIG_RLE_DECOMPRESS */
++
++#endif /* _RLE_H_ */
+--- /dev/null
++++ b/lib/rle.c
+@@ -0,0 +1,78 @@
++/*
++ *  RLE decoding routine
++ *
++ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ *  This program is free software; you can redistribute it and/or modify it
++ *  under the terms of the GNU General Public License version 2 as published
++ *  by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/rle.h>
++
++int rle_decode(const unsigned char *src, size_t srclen,
++	       unsigned char *dst, size_t dstlen,
++	       size_t *src_done, size_t *dst_done)
++{
++	size_t srcpos, dstpos;
++	int ret;
++
++	srcpos = 0;
++	dstpos = 0;
++	ret = -EINVAL;
++
++	/* sanity checks */
++	if (!src || !srclen || !dst || !dstlen)
++		goto out;
++
++	while (1) {
++		char count;
++
++		if (srcpos >= srclen)
++			break;
++
++		count = (char) src[srcpos++];
++		if (count == 0) {
++			ret = 0;
++			break;
++		}
++
++		if (count > 0) {
++			unsigned char c;
++
++			if (srcpos >= srclen)
++				break;
++
++			c = src[srcpos++];
++
++			while (count--) {
++				if (dstpos >= dstlen)
++					break;
++
++				dst[dstpos++] = c;
++			}
++		} else {
++			count *= -1;
++
++			while (count--) {
++				if (srcpos >= srclen)
++					break;
++				if (dstpos >= dstlen)
++					break;
++				dst[dstpos++] = src[srcpos++];
++			}
++		}
++	}
++
++out:
++	if (src_done)
++		*src_done = srcpos;
++	if (dst_done)
++		*dst_done = dstpos;
++
++	return ret;
++}
++
++EXPORT_SYMBOL_GPL(rle_decode);
diff --git a/trunk/target/linux/ar71xx/patches-3.14/401-mtd-physmap-add-lock-unlock.patch b/trunk/target/linux/ar71xx/patches-3.14/401-mtd-physmap-add-lock-unlock.patch
new file mode 100644
index 00000000..db7b3ca8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/401-mtd-physmap-add-lock-unlock.patch
@@ -0,0 +1,94 @@
+--- a/drivers/mtd/maps/physmap.c
++++ b/drivers/mtd/maps/physmap.c
+@@ -31,6 +31,66 @@ struct physmap_flash_info {
+ 	int			vpp_refcnt;
+ };
+ 
++static struct platform_device *physmap_map2pdev(struct map_info *map)
++{
++	return (struct platform_device *) map->map_priv_1;
++}
++
++static void physmap_lock(struct map_info *map)
++{
++	struct platform_device *pdev;
++	struct physmap_flash_data *physmap_data;
++
++	pdev = physmap_map2pdev(map);
++	physmap_data = pdev->dev.platform_data;
++	physmap_data->lock(pdev);
++}
++
++static void physmap_unlock(struct map_info *map)
++{
++	struct platform_device *pdev;
++	struct physmap_flash_data *physmap_data;
++
++	pdev = physmap_map2pdev(map);
++	physmap_data = pdev->dev.platform_data;
++	physmap_data->unlock(pdev);
++}
++
++static map_word physmap_flash_read_lock(struct map_info *map, unsigned long ofs)
++{
++	map_word ret;
++
++	physmap_lock(map);
++	ret = inline_map_read(map, ofs);
++	physmap_unlock(map);
++
++	return ret;
++}
++
++static void physmap_flash_write_lock(struct map_info *map, map_word d,
++				     unsigned long ofs)
++{
++	physmap_lock(map);
++	inline_map_write(map, d, ofs);
++	physmap_unlock(map);
++}
++
++static void physmap_flash_copy_from_lock(struct map_info *map, void *to,
++					 unsigned long from, ssize_t len)
++{
++	physmap_lock(map);
++	inline_map_copy_from(map, to, from, len);
++	physmap_unlock(map);
++}
++
++static void physmap_flash_copy_to_lock(struct map_info *map, unsigned long to,
++				       const void *from, ssize_t len)
++{
++	physmap_lock(map);
++	inline_map_copy_to(map, to, from, len);
++	physmap_unlock(map);
++}
++
+ static int physmap_flash_remove(struct platform_device *dev)
+ {
+ 	struct physmap_flash_info *info;
+@@ -153,6 +213,13 @@ static int physmap_flash_probe(struct pl
+ 
+ 		simple_map_init(&info->map[i]);
+ 
++		if (physmap_data->lock && physmap_data->unlock) {
++			info->map[i].read = physmap_flash_read_lock;
++			info->map[i].write = physmap_flash_write_lock;
++			info->map[i].copy_from = physmap_flash_copy_from_lock;
++			info->map[i].copy_to = physmap_flash_copy_to_lock;
++		}
++
+ 		probe_type = rom_probe_types;
+ 		if (physmap_data->probe_type == NULL) {
+ 			for (; info->mtd[i] == NULL && *probe_type != NULL; probe_type++)
+--- a/include/linux/mtd/physmap.h
++++ b/include/linux/mtd/physmap.h
+@@ -25,6 +25,8 @@ struct physmap_flash_data {
+ 	unsigned int		width;
+ 	int			(*init)(struct platform_device *);
+ 	void			(*exit)(struct platform_device *);
++	void			(*lock)(struct platform_device *);
++	void			(*unlock)(struct platform_device *);
+ 	void			(*set_vpp)(struct platform_device *, int);
+ 	unsigned int		nr_parts;
+ 	unsigned int		pfow_base;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/402-mtd-SST39VF6401B-support.patch b/trunk/target/linux/ar71xx/patches-3.14/402-mtd-SST39VF6401B-support.patch
new file mode 100644
index 00000000..0d483ab1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/402-mtd-SST39VF6401B-support.patch
@@ -0,0 +1,29 @@
+--- a/drivers/mtd/chips/jedec_probe.c
++++ b/drivers/mtd/chips/jedec_probe.c
+@@ -148,6 +148,7 @@
+ #define SST39LF160	0x2782
+ #define SST39VF1601	0x234b
+ #define SST39VF3201	0x235b
++#define SST39VF6401B	0x236d
+ #define SST39WF1601	0x274b
+ #define SST39WF1602	0x274a
+ #define SST39LF512	0x00D4
+@@ -1569,6 +1570,18 @@ static const struct amd_flash_info jedec
+ 			ERASEINFO(0x10000,64),
+ 		}
+ 	}, {
++		.mfr_id         = CFI_MFR_SST,
++		.dev_id         = SST39VF6401B,
++		.name           = "SST 39VF6401B",
++		.devtypes       = CFI_DEVICETYPE_X16,
++		.uaddr          = MTD_UADDR_0xAAAA_0x5555,
++		.dev_size       = SIZE_8MiB,
++		.cmd_set        = P_ID_AMD_STD,
++		.nr_regions     = 1,
++		.regions        = {
++			ERASEINFO(0x10000,128)
++		}
++	}, {
+ 		.mfr_id		= CFI_MFR_ST,
+ 		.dev_id		= M29F800AB,
+ 		.name		= "ST M29F800AB",
diff --git a/trunk/target/linux/ar71xx/patches-3.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/trunk/target/linux/ar71xx/patches-3.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch
new file mode 100644
index 00000000..88d3ab74
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch
@@ -0,0 +1,69 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1306,8 +1306,8 @@ static int __xipram do_write_oneword(str
+ 			break;
+ 		}
+ 
+-		if (chip_ready(map, adr))
+-			break;
++		if (chip_good(map, adr, datum))
++			goto enable_xip;
+ 
+ 		/* Latency issues. Drop the lock, wait a while and retry */
+ 		UDELAY(map, chip, adr, 1);
+@@ -1323,6 +1323,8 @@ static int __xipram do_write_oneword(str
+ 
+ 		ret = -EIO;
+ 	}
++
++ enable_xip:
+ 	xip_enable(map, chip, adr);
+  op_done:
+ 	chip->state = FL_READY;
+@@ -1893,7 +1895,6 @@ static int cfi_amdstd_panic_write(struct
+ 	return 0;
+ }
+ 
+-
+ /*
+  * Handle devices with one erase region, that only implement
+  * the chip erase command.
+@@ -1957,8 +1958,8 @@ static int __xipram do_erase_chip(struct
+ 			chip->erase_suspended = 0;
+ 		}
+ 
+-		if (chip_ready(map, adr))
+-			break;
++		if (chip_good(map, adr, map_word_ff(map)))
++			goto op_done;
+ 
+ 		if (time_after(jiffies, timeo)) {
+ 			printk(KERN_WARNING "MTD %s(): software timeout\n",
+@@ -1978,6 +1979,7 @@ static int __xipram do_erase_chip(struct
+ 		ret = -EIO;
+ 	}
+ 
++ op_done:
+ 	chip->state = FL_READY;
+ 	xip_enable(map, chip, adr);
+ 	DISABLE_VPP(map);
+@@ -2046,9 +2048,9 @@ static int __xipram do_erase_oneblock(st
+ 			chip->erase_suspended = 0;
+ 		}
+ 
+-		if (chip_ready(map, adr)) {
++		if (chip_good(map, adr, map_word_ff(map))) {
+ 			xip_enable(map, chip, adr);
+-			break;
++			goto op_done;
+ 		}
+ 
+ 		if (time_after(jiffies, timeo)) {
+@@ -2070,6 +2072,7 @@ static int __xipram do_erase_oneblock(st
+ 		ret = -EIO;
+ 	}
+ 
++ op_done:
+ 	chip->state = FL_READY;
+ 	DISABLE_VPP(map);
+ 	put_chip(map, chip, adr);
diff --git a/trunk/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch b/trunk/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
new file mode 100644
index 00000000..78adf4f8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/404-mtd-wrt160nl-trx-parser.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -189,6 +189,12 @@ config MTD_BCM47XX_PARTS
+ 	  This provides partitions parser for devices based on BCM47xx
+ 	  boards.
+ 
++config MTD_WRT160NL_PARTS
++	tristate "Linksys WRT160NL partitioning support"
++	depends on MTD_PARTITIONS && ATH79_MACH_WRT160NL
++	---help---
++	   Linksys WRT160NL partitioning support
++
+ config MTD_MYLOADER_PARTS
+ 	tristate "MyLoader partition parsing"
+ 	depends on ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX || ATH79
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
+ obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
++obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_BLKDEVS)	+= mtd_blkdevs.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch b/trunk/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
new file mode 100644
index 00000000..fb60245b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/405-mtd-tp-link-partition-parser.patch
@@ -0,0 +1,34 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -191,7 +191,7 @@ config MTD_BCM47XX_PARTS
+ 
+ config MTD_WRT160NL_PARTS
+ 	tristate "Linksys WRT160NL partitioning support"
+-	depends on MTD_PARTITIONS && ATH79_MACH_WRT160NL
++	depends on ATH79_MACH_WRT160NL
+ 	---help---
+ 	   Linksys WRT160NL partitioning support
+ 
+@@ -211,6 +211,12 @@ config MTD_MYLOADER_PARTS
+ 	  You will still need the parsing functions to be called by the driver
+ 	  for your particular device. It won't happen automatically.
+ 
++config MTD_TPLINK_PARTS
++	tristate "TP-Link AR7XXX/AR9XXX partitioning support"
++	depends on ATH79
++	---help---
++	  TBD.
++
+ comment "User Modules And Translation Layers"
+ 
+ #
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
+ obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
++obj-$(CONFIG_MTD_TPLINK_PARTS)	+= tplinkpart.o
+ obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
+ 
+ # 'Users' - code which presents functionality to userspace.
diff --git a/trunk/target/linux/ar71xx/patches-3.14/406-mtd-m25p80-allow-to-specify-max-read-size.patch b/trunk/target/linux/ar71xx/patches-3.14/406-mtd-m25p80-allow-to-specify-max-read-size.patch
new file mode 100644
index 00000000..194b8bec
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/406-mtd-m25p80-allow-to-specify-max-read-size.patch
@@ -0,0 +1,106 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -115,6 +115,7 @@ struct m25p {
+ 	u8			program_opcode;
+ 	u8			*command;
+ 	enum read_type		flash_read;
++	size_t			max_read_len;
+ };
+ 
+ static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
+@@ -517,6 +518,7 @@ static int m25p80_read(struct mtd_info *
+ 	struct spi_message m;
+ 	uint8_t opcode;
+ 	int dummy;
++	loff_t ofs;
+ 
+ 	pr_debug("%s: %s from 0x%08x, len %zd\n", dev_name(&flash->spi->dev),
+ 			__func__, (u32)from, len);
+@@ -534,29 +536,51 @@ static int m25p80_read(struct mtd_info *
+ 	t[0].len = m25p_cmdsz(flash) + dummy;
+ 	spi_message_add_tail(&t[0], &m);
+ 
+-	t[1].rx_buf = buf;
+-	t[1].rx_nbits = m25p80_rx_nbits(flash);
+-	t[1].len = len;
+ 	spi_message_add_tail(&t[1], &m);
+ 
+ 	mutex_lock(&flash->lock);
+ 
+-	/* Wait till previous write/erase is done. */
+-	if (wait_till_ready(flash)) {
+-		/* REVISIT status return?? */
+-		mutex_unlock(&flash->lock);
+-		return 1;
+-	}
+-
+ 	/* Set up the write data buffer. */
+ 	opcode = flash->read_opcode;
+ 	flash->command[0] = opcode;
+-	m25p_addr2cmd(flash, from, flash->command);
++	ofs = 0;
++	while (len) {
++		size_t readlen;
++		size_t done;
++		int ret;
+ 
+-	spi_sync(flash->spi, &m);
++		ret = wait_till_ready(flash);
++		if (ret) {
++			mutex_unlock(&flash->lock);
++			return 1;
++		}
++
++		if (flash->max_read_len > 0 &&
++		    flash->max_read_len < len)
++			readlen = flash->max_read_len;
++		else
++			readlen = len;
+ 
+-	*retlen = m.actual_length - m25p_cmdsz(flash) - dummy;
++		t[1].rx_buf = buf + ofs;
++		t[1].rx_nbits = m25p80_rx_nbits(flash);
++		t[1].len = readlen;
+ 
++		m25p_addr2cmd(flash, from + ofs, flash->command);
++
++		spi_sync(flash->spi, &m);
++
++		done = m.actual_length - m25p_cmdsz(flash) -
++		       dummy;
++		if (done != readlen) {
++			mutex_unlock(&flash->lock);
++			return 1;
++		}
++
++		ofs += done;
++		len -= done;
++	}
++
++	*retlen = ofs;
+ 	mutex_unlock(&flash->lock);
+ 
+ 	return 0;
+@@ -1193,6 +1217,12 @@ static int m25p_probe(struct spi_device 
+ 		flash->mtd._unlock = m25p80_unlock;
+ 	}
+ 
++	if (data && data->max_read_len) {
++		flash->max_read_len = data->max_read_len;
++		dev_warn(&spi->dev, "max_read_len set to %d bytes\n",
++			flash->max_read_len);
++	}
++
+ 	/* sst flash chips use AAI word program */
+ 	if (info->flags & SST_WRITE)
+ 		flash->mtd._write = sst_write;
+--- a/include/linux/spi/flash.h
++++ b/include/linux/spi/flash.h
+@@ -25,6 +25,7 @@ struct flash_platform_data {
+ 
+ 	char		*type;
+ 
++	size_t		max_read_len;
+ 	/* we'll likely add more ... use JEDEC IDs, etc */
+ };
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/trunk/target/linux/ar71xx/patches-3.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
new file mode 100644
index 00000000..f1604661
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -1344,7 +1344,9 @@ static int m25p_probe(struct spi_device 
+ 	/* partitions should match sector boundaries; and it may be good to
+ 	 * use readonly partitions for writeprotected sectors (BP2..BP0).
+ 	 */
+-	return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
++	return mtd_device_parse_register(&flash->mtd,
++			data ? data->part_probes : NULL,
++			&ppdata,
+ 			data ? data->parts : NULL,
+ 			data ? data->nr_parts : 0);
+ }
+--- a/include/linux/spi/flash.h
++++ b/include/linux/spi/flash.h
+@@ -24,6 +24,7 @@ struct flash_platform_data {
+ 	unsigned int	nr_parts;
+ 
+ 	char		*type;
++	const char	**part_probes;
+ 
+ 	size_t		max_read_len;
+ 	/* we'll likely add more ... use JEDEC IDs, etc */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/408-mtd-redboot_partition_scan.patch b/trunk/target/linux/ar71xx/patches-3.14/408-mtd-redboot_partition_scan.patch
new file mode 100644
index 00000000..cd41e7ce
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/408-mtd-redboot_partition_scan.patch
@@ -0,0 +1,44 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -76,12 +76,18 @@ static int parse_redboot_partitions(stru
+ 	static char nullstring[] = "unallocated";
+ #endif
+ 
++	buf = vmalloc(master->erasesize);
++	if (!buf)
++		return -ENOMEM;
++
++ restart:
+ 	if ( directory < 0 ) {
+ 		offset = master->size + directory * master->erasesize;
+ 		while (mtd_block_isbad(master, offset)) {
+ 			if (!offset) {
+ 			nogood:
+ 				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
++				vfree(buf);
+ 				return -EIO;
+ 			}
+ 			offset -= master->erasesize;
+@@ -94,10 +100,6 @@ static int parse_redboot_partitions(stru
+ 				goto nogood;
+ 		}
+ 	}
+-	buf = vmalloc(master->erasesize);
+-
+-	if (!buf)
+-		return -ENOMEM;
+ 
+ 	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
+ 	       master->name, offset);
+@@ -170,6 +172,11 @@ static int parse_redboot_partitions(stru
+ 	}
+ 	if (i == numslots) {
+ 		/* Didn't find it */
++		if (offset + master->erasesize < master->size) {
++			/* not at the end of the flash yet, maybe next block :) */
++			directory++;
++			goto restart;
++		}
+ 		printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
+ 		       master->name);
+ 		ret = 0;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/409-mtd-rb4xx_nand_driver.patch b/trunk/target/linux/ar71xx/patches-3.14/409-mtd-rb4xx_nand_driver.patch
new file mode 100644
index 00000000..2c5b6d5f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/409-mtd-rb4xx_nand_driver.patch
@@ -0,0 +1,21 @@
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -510,4 +510,8 @@ config MTD_NAND_XWAY
+ 	  Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
+ 	  to the External Bus Unit (EBU).
+ 
++config MTD_NAND_RB4XX
++	tristate "NAND flash driver for RouterBoard 4xx series"
++	depends on MTD_NAND && ATH79_MACH_RB4XX
++
+ endif # MTD_NAND
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx27
+ obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
+ obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
+ obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
++obj-$(CONFIG_MTD_NAND_RB4XX)		+= rb4xx_nand.o
+ obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
+ obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
+ obj-$(CONFIG_MTD_NAND_FSL_ELBC)		+= fsl_elbc_nand.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/410-mtd-rb750-nand-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/410-mtd-rb750-nand-driver.patch
new file mode 100644
index 00000000..a031f4b1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/410-mtd-rb750-nand-driver.patch
@@ -0,0 +1,21 @@
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -514,4 +514,8 @@ config MTD_NAND_RB4XX
+ 	tristate "NAND flash driver for RouterBoard 4xx series"
+ 	depends on MTD_NAND && ATH79_MACH_RB4XX
+ 
++config MTD_NAND_RB750
++	tristate "NAND flash driver for the RouterBoard 750"
++	depends on MTD_NAND && ATH79_MACH_RB750
++
+ endif # MTD_NAND
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -32,6 +32,7 @@ obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx
+ obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
+ obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
+ obj-$(CONFIG_MTD_NAND_RB4XX)		+= rb4xx_nand.o
++obj-$(CONFIG_MTD_NAND_RB750)		+= rb750_nand.o
+ obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
+ obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
+ obj-$(CONFIG_MTD_NAND_FSL_ELBC)		+= fsl_elbc_nand.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/411-mtd-cfi_cmdset_0002-force-word-write.patch b/trunk/target/linux/ar71xx/patches-3.14/411-mtd-cfi_cmdset_0002-force-word-write.patch
new file mode 100644
index 00000000..58485d04
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/411-mtd-cfi_cmdset_0002-force-word-write.patch
@@ -0,0 +1,61 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -41,7 +41,7 @@
+ #include <linux/mtd/xip.h>
+ 
+ #define AMD_BOOTLOC_BUG
+-#define FORCE_WORD_WRITE 0
++#define FORCE_WORD_WRITE 1
+ 
+ #define MAX_WORD_RETRIES 3
+ 
+@@ -52,7 +52,9 @@
+ 
+ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
+ static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
++#if !FORCE_WORD_WRITE
+ static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
++#endif
+ static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
+ static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
+ static void cfi_amdstd_sync (struct mtd_info *);
+@@ -192,6 +194,7 @@ static void fixup_amd_bootblock(struct m
+ }
+ #endif
+ 
++#if !FORCE_WORD_WRITE
+ static void fixup_use_write_buffers(struct mtd_info *mtd)
+ {
+ 	struct map_info *map = mtd->priv;
+@@ -201,6 +204,7 @@ static void fixup_use_write_buffers(stru
+ 		mtd->_write = cfi_amdstd_write_buffers;
+ 	}
+ }
++#endif /* !FORCE_WORD_WRITE */
+ 
+ /* Atmel chips don't use the same PRI format as AMD chips */
+ static void fixup_convert_atmel_pri(struct mtd_info *mtd)
+@@ -1463,6 +1467,7 @@ static int cfi_amdstd_write_words(struct
+ /*
+  * FIXME: interleaved mode not tested, and probably not supported!
+  */
++#if !FORCE_WORD_WRITE
+ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
+ 				    unsigned long adr, const u_char *buf,
+ 				    int len)
+@@ -1587,7 +1592,6 @@ static int __xipram do_write_buffer(stru
+ 	return ret;
+ }
+ 
+-
+ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
+ 				    size_t *retlen, const u_char *buf)
+ {
+@@ -1662,6 +1666,7 @@ static int cfi_amdstd_write_buffers(stru
+ 
+ 	return 0;
+ }
++#endif /* !FORCE_WORD_WRITE */
+ 
+ /*
+  * Wait for the flash chip to become ready to write data
diff --git a/trunk/target/linux/ar71xx/patches-3.14/412-mtd-m25p80-zero-partition-parser-data.patch b/trunk/target/linux/ar71xx/patches-3.14/412-mtd-m25p80-zero-partition-parser-data.patch
new file mode 100644
index 00000000..fea21f83
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/412-mtd-m25p80-zero-partition-parser-data.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -1244,6 +1244,7 @@ static int m25p_probe(struct spi_device 
+ 	if (info->flags & M25P_NO_ERASE)
+ 		flash->mtd.flags |= MTD_NO_ERASE;
+ 
++	memset(&ppdata, '\0', sizeof(ppdata));
+ 	ppdata.of_node = spi->dev.of_node;
+ 	flash->mtd.dev.parent = &spi->dev;
+ 	flash->page_size = info->page_size;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/413-mtd-ar934x-nand-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/413-mtd-ar934x-nand-driver.patch
new file mode 100644
index 00000000..3f8baa92
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/413-mtd-ar934x-nand-driver.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -518,4 +518,12 @@ config MTD_NAND_RB750
+ 	tristate "NAND flash driver for the RouterBoard 750"
+ 	depends on MTD_NAND && ATH79_MACH_RB750
+ 
++config MTD_NAND_AR934X
++	tristate "NAND flash driver for the Qualcomm Atheros AR934x/QCA955x SoCs"
++	depends on (SOC_AR934X || SOC_QCA955X)
++
++config MTD_NAND_AR934X_HW_ECC
++	bool "Hardware ECC support for the AR934X NAND Controller (EXPERIMENTAL)"
++	depends on MTD_NAND_AR934X
++
+ endif # MTD_NAND
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_NAND_AMS_DELTA)	+= ams-
+ obj-$(CONFIG_MTD_NAND_DENALI)		+= denali.o
+ obj-$(CONFIG_MTD_NAND_DENALI_PCI)	+= denali_pci.o
+ obj-$(CONFIG_MTD_NAND_DENALI_DT)	+= denali_dt.o
++obj-$(CONFIG_MTD_NAND_AR934X)		+= ar934x_nfc.o
+ obj-$(CONFIG_MTD_NAND_AU1550)		+= au1550nd.o
+ obj-$(CONFIG_MTD_NAND_BF5XX)		+= bf5xx_nand.o
+ obj-$(CONFIG_MTD_NAND_S3C2410)		+= s3c2410.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/414-mtd-rb91x-nand-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/414-mtd-rb91x-nand-driver.patch
new file mode 100644
index 00000000..d5935249
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/414-mtd-rb91x-nand-driver.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -518,6 +518,10 @@ config MTD_NAND_RB750
+ 	tristate "NAND flash driver for the RouterBoard 750"
+ 	depends on MTD_NAND && ATH79_MACH_RB750
+ 
++config MTD_NAND_RB91X
++	tristate "NAND flash driver for the RouterBOARD 91x series"
++	depends on MTD_NAND && ATH79_MACH_RB91X
++
+ config MTD_NAND_AR934X
+ 	tristate "NAND flash driver for the Qualcomm Atheros AR934x/QCA955x SoCs"
+ 	depends on (SOC_AR934X || SOC_QCA955X)
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -34,6 +34,7 @@ obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nan
+ obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
+ obj-$(CONFIG_MTD_NAND_RB4XX)		+= rb4xx_nand.o
+ obj-$(CONFIG_MTD_NAND_RB750)		+= rb750_nand.o
++obj-$(CONFIG_MTD_NAND_RB91X)		+= rb91x_nand.o
+ obj-$(CONFIG_MTD_NAND_PASEMI)		+= pasemi_nand.o
+ obj-$(CONFIG_MTD_NAND_ORION)		+= orion_nand.o
+ obj-$(CONFIG_MTD_NAND_FSL_ELBC)		+= fsl_elbc_nand.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/420-net-ar71xx_mac_driver.patch b/trunk/target/linux/ar71xx/patches-3.14/420-net-ar71xx_mac_driver.patch
new file mode 100644
index 00000000..5da869a1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/420-net-ar71xx_mac_driver.patch
@@ -0,0 +1,28 @@
+--- a/drivers/net/ethernet/atheros/Kconfig
++++ b/drivers/net/ethernet/atheros/Kconfig
+@@ -5,7 +5,7 @@
+ config NET_VENDOR_ATHEROS
+ 	bool "Atheros devices"
+ 	default y
+-	depends on PCI
++	depends on (PCI || ATH79)
+ 	---help---
+ 	  If you have a network (Ethernet) card belonging to this class, say Y
+ 	  and read the Ethernet-HOWTO, available from
+@@ -80,4 +80,6 @@ config ALX
+ 	  To compile this driver as a module, choose M here.  The module
+ 	  will be called alx.
+ 
++source drivers/net/ethernet/atheros/ag71xx/Kconfig
++
+ endif # NET_VENDOR_ATHEROS
+--- a/drivers/net/ethernet/atheros/Makefile
++++ b/drivers/net/ethernet/atheros/Makefile
+@@ -2,6 +2,7 @@
+ # Makefile for the Atheros network device drivers.
+ #
+ 
++obj-$(CONFIG_AG71XX) += ag71xx/
+ obj-$(CONFIG_ATL1) += atlx/
+ obj-$(CONFIG_ATL2) += atlx/
+ obj-$(CONFIG_ATL1E) += atl1e/
diff --git a/trunk/target/linux/ar71xx/patches-3.14/422-dsa-trailer-tag-validation-fix.patch b/trunk/target/linux/ar71xx/patches-3.14/422-dsa-trailer-tag-validation-fix.patch
new file mode 100644
index 00000000..3e3902ba
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/422-dsa-trailer-tag-validation-fix.patch
@@ -0,0 +1,11 @@
+--- a/net/dsa/tag_trailer.c
++++ b/net/dsa/tag_trailer.c
+@@ -87,7 +87,7 @@ static int trailer_rcv(struct sk_buff *s
+ 
+ 	trailer = skb_tail_pointer(skb) - 4;
+ 	if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 ||
+-	    (trailer[3] & 0xef) != 0x00 || trailer[3] != 0x00)
++	    (trailer[2] & 0xef) != 0x00 || (trailer[3] & 0xfe) != 0x00)
+ 		goto out_drop;
+ 
+ 	source_port = trailer[1] & 7;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/423-dsa-add-88e6063-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/423-dsa-add-88e6063-driver.patch
new file mode 100644
index 00000000..1348cd9b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/423-dsa-add-88e6063-driver.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/dsa/Kconfig
++++ b/drivers/net/dsa/Kconfig
+@@ -13,6 +13,13 @@ config NET_DSA_MV88E6060
+ 	  This enables support for the Marvell 88E6060 ethernet switch
+ 	  chip.
+ 
++config NET_DSA_MV88E6063
++	bool "Marvell 88E6063 ethernet switch chip support"
++	select NET_DSA_TAG_TRAILER
++	---help---
++	  This enables support for the Marvell 88E6063 ethernet switch
++	  chip
++
+ config NET_DSA_MV88E6XXX_NEED_PPU
+ 	bool
+ 	default n
+--- a/drivers/net/dsa/Makefile
++++ b/drivers/net/dsa/Makefile
+@@ -1,4 +1,5 @@
+ obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
++obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
+ obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx_drv.o
+ mv88e6xxx_drv-y += mv88e6xxx.o
+ ifdef CONFIG_NET_DSA_MV88E6123_61_65
diff --git a/trunk/target/linux/ar71xx/patches-3.14/425-net-phy-at803x-allow-to-configure-via-pdata.patch b/trunk/target/linux/ar71xx/patches-3.14/425-net-phy-at803x-allow-to-configure-via-pdata.patch
new file mode 100644
index 00000000..ffaceca5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/425-net-phy-at803x-allow-to-configure-via-pdata.patch
@@ -0,0 +1,134 @@
+--- a/drivers/net/phy/at803x.c
++++ b/drivers/net/phy/at803x.c
+@@ -12,10 +12,12 @@
+  */
+ 
+ #include <linux/phy.h>
++#include <linux/mdio.h>
+ #include <linux/module.h>
+ #include <linux/string.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
++#include <linux/platform_data/phy-at803x.h>
+ 
+ #define AT803X_INTR_ENABLE			0x12
+ #define AT803X_INTR_STATUS			0x13
+@@ -32,10 +34,61 @@
+ #define AT803X_DEBUG_SYSTEM_MODE_CTRL		0x05
+ #define AT803X_DEBUG_RGMII_TX_CLK_DLY		BIT(8)
+ 
++#define AT803X_PCS_SMART_EEE_CTRL3		0x805D
++
++#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK   0x3
++#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT  12
++#define AT803X_SMART_EEE_CTRL3_LPI_EN                  BIT(8)
++
++#define AT803X_DEBUG_PORT_ACCESS_OFFSET		0x1D
++#define AT803X_DEBUG_PORT_ACCESS_DATA		0x1E
++
++#define AT803X_DBG0_REG				0x00
++#define AT803X_DBG0_RGMII_RX_CLK_DELAY_EN	BIT(8)
++
++#define AT803X_DBG5_REG				0x05
++#define AT803X_DBG5_RGMII_TX_CLK_DELAY_EN	BIT(8)
++
+ MODULE_DESCRIPTION("Atheros 803x PHY driver");
+ MODULE_AUTHOR("Matus Ujhelyi");
+ MODULE_LICENSE("GPL");
+ 
++static u16
++at803x_dbg_reg_rmw(struct phy_device *phydev, u16 reg, u16 clear, u16 set)
++{
++	struct mii_bus *bus = phydev->bus;
++	int val;
++
++	mutex_lock(&bus->mdio_lock);
++
++	bus->write(bus, phydev->addr, AT803X_DEBUG_PORT_ACCESS_OFFSET, reg);
++	val = bus->read(bus, phydev->addr, AT803X_DEBUG_PORT_ACCESS_DATA);
++	if (val < 0) {
++		val = 0xffff;
++		goto out;
++	}
++
++	val &= ~clear;
++	val |= set;
++	bus->write(bus, phydev->addr, AT803X_DEBUG_PORT_ACCESS_DATA, val);
++
++out:
++	mutex_unlock(&bus->mdio_lock);
++	return val;
++}
++
++static inline void
++at803x_dbg_reg_set(struct phy_device *phydev, u16 reg, u16 set)
++{
++	at803x_dbg_reg_rmw(phydev, reg, 0, set);
++}
++
++static inline void
++at803x_dbg_reg_clr(struct phy_device *phydev, u16 reg, u16 clear)
++{
++	at803x_dbg_reg_rmw(phydev, reg, clear, 0);
++}
++
+ static int at803x_set_wol(struct phy_device *phydev,
+ 			  struct ethtool_wolinfo *wol)
+ {
+@@ -139,8 +192,16 @@ static int at803x_resume(struct phy_devi
+ 	return 0;
+ }
+ 
++static void at803x_disable_smarteee(struct phy_device *phydev)
++{
++	phy_write_mmd(phydev, MDIO_MMD_PCS, AT803X_PCS_SMART_EEE_CTRL3,
++		      1 << AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT);
++	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);
++}
++
+ static int at803x_config_init(struct phy_device *phydev)
+ {
++	struct at803x_platform_data *pdata;
+ 	int val;
+ 	int ret;
+ 	u32 features;
+@@ -188,6 +249,26 @@ static int at803x_config_init(struct phy
+ 			return ret;
+ 	}
+ 
++	pdata = dev_get_platdata(&phydev->dev);
++	if (pdata) {
++		if (pdata->disable_smarteee)
++			at803x_disable_smarteee(phydev);
++
++		if (pdata->enable_rgmii_rx_delay)
++			at803x_dbg_reg_set(phydev, AT803X_DBG0_REG,
++					   AT803X_DBG0_RGMII_RX_CLK_DELAY_EN);
++		else
++			at803x_dbg_reg_clr(phydev, AT803X_DBG0_REG,
++					   AT803X_DBG0_RGMII_RX_CLK_DELAY_EN);
++
++		if (pdata->enable_rgmii_tx_delay)
++			at803x_dbg_reg_set(phydev, AT803X_DBG5_REG,
++					   AT803X_DBG5_RGMII_TX_CLK_DELAY_EN);
++		else
++			at803x_dbg_reg_clr(phydev, AT803X_DBG5_REG,
++					   AT803X_DBG5_RGMII_TX_CLK_DELAY_EN);
++	}
++
+ 	return 0;
+ }
+ 
+--- /dev/null
++++ b/include/linux/platform_data/phy-at803x.h
+@@ -0,0 +1,10 @@
++#ifndef _PHY_AT803X_PDATA_H
++#define _PHY_AT803X_PDATA_H
++
++struct at803x_platform_data {
++	int disable_smarteee:1;
++	int enable_rgmii_tx_delay:1;
++	int enable_rgmii_rx_delay:1;
++};
++
++#endif /* _PHY_AT803X_PDATA_H */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/430-drivers-link-spi-before-mtd.patch b/trunk/target/linux/ar71xx/patches-3.14/430-drivers-link-spi-before-mtd.patch
new file mode 100644
index 00000000..477c1d68
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/430-drivers-link-spi-before-mtd.patch
@@ -0,0 +1,12 @@
+--- a/drivers/Makefile
++++ b/drivers/Makefile
+@@ -64,8 +64,8 @@ obj-$(CONFIG_IDE)		+= ide/
+ obj-$(CONFIG_SCSI)		+= scsi/
+ obj-$(CONFIG_ATA)		+= ata/
+ obj-$(CONFIG_TARGET_CORE)	+= target/
+-obj-$(CONFIG_MTD)		+= mtd/
+ obj-$(CONFIG_SPI)		+= spi/
++obj-$(CONFIG_MTD)		+= mtd/
+ obj-y				+= hsi/
+ obj-y				+= net/
+ obj-$(CONFIG_ATM)		+= atm/
diff --git a/trunk/target/linux/ar71xx/patches-3.14/431-spi-add-various-flags.patch b/trunk/target/linux/ar71xx/patches-3.14/431-spi-add-various-flags.patch
new file mode 100644
index 00000000..2c1bc8eb
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/431-spi-add-various-flags.patch
@@ -0,0 +1,19 @@
+--- a/include/linux/spi/spi.h
++++ b/include/linux/spi/spi.h
+@@ -583,6 +583,8 @@ struct spi_transfer {
+ 	unsigned	cs_change:1;
+ 	unsigned	tx_nbits:3;
+ 	unsigned	rx_nbits:3;
++	unsigned	verify:1;
++	unsigned	fast_write:1;
+ #define	SPI_NBITS_SINGLE	0x01 /* 1bit transfer */
+ #define	SPI_NBITS_DUAL		0x02 /* 2bits transfer */
+ #define	SPI_NBITS_QUAD		0x04 /* 4bits transfer */
+@@ -627,6 +629,7 @@ struct spi_message {
+ 	struct spi_device	*spi;
+ 
+ 	unsigned		is_dma_mapped:1;
++	unsigned		fast_read:1;
+ 
+ 	/* REVISIT:  we might want a flag affecting the behavior of the
+ 	 * last transfer ... allowing things like "read 16 bit length L"
diff --git a/trunk/target/linux/ar71xx/patches-3.14/432-spi-rb4xx-spi-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/432-spi-rb4xx-spi-driver.patch
new file mode 100644
index 00000000..b29f645d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/432-spi-rb4xx-spi-driver.patch
@@ -0,0 +1,25 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -390,6 +390,12 @@ config SPI_RSPI
+ 	help
+ 	  SPI driver for Renesas RSPI and QSPI blocks.
+ 
++config SPI_RB4XX
++	tristate "Mikrotik RB4XX SPI master"
++	depends on SPI_MASTER && ATH79_MACH_RB4XX
++	help
++	  SPI controller driver for the Mikrotik RB4xx series boards.
++
+ config SPI_S3C24XX
+ 	tristate "Samsung S3C24XX series SPI"
+ 	depends on ARCH_S3C24XX
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -60,6 +60,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_
+ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA)	+= spi-pxa2xx-dma.o
+ obj-$(CONFIG_SPI_PXA2XX)		+= spi-pxa2xx-platform.o
+ obj-$(CONFIG_SPI_PXA2XX_PCI)		+= spi-pxa2xx-pci.o
++obj-$(CONFIG_SPI_RB4XX)			+= spi-rb4xx.o
+ obj-$(CONFIG_SPI_RSPI)			+= spi-rspi.o
+ obj-$(CONFIG_SPI_S3C24XX)		+= spi-s3c24xx-hw.o
+ spi-s3c24xx-hw-y			:= spi-s3c24xx.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/433-spi-rb4xx-cpld-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/433-spi-rb4xx-cpld-driver.patch
new file mode 100644
index 00000000..c75b942f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/433-spi-rb4xx-cpld-driver.patch
@@ -0,0 +1,26 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -586,6 +586,13 @@ config SPI_TLE62X0
+ 	  sysfs interface, with each line presented as a kind of GPIO
+ 	  exposing both switch control and diagnostic feedback.
+ 
++config SPI_RB4XX_CPLD
++	tristate "MikroTik RB4XX CPLD driver"
++	depends on ATH79_MACH_RB4XX
++	help
++	  SPI driver for the Xilinx CPLD chip present on the
++	  MikroTik RB4xx boards.
++
+ #
+ # Add new SPI protocol masters in alphabetical order above this line
+ #
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -61,6 +61,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_
+ obj-$(CONFIG_SPI_PXA2XX)		+= spi-pxa2xx-platform.o
+ obj-$(CONFIG_SPI_PXA2XX_PCI)		+= spi-pxa2xx-pci.o
+ obj-$(CONFIG_SPI_RB4XX)			+= spi-rb4xx.o
++obj-$(CONFIG_SPI_RB4XX_CPLD)		+= spi-rb4xx-cpld.o
+ obj-$(CONFIG_SPI_RSPI)			+= spi-rspi.o
+ obj-$(CONFIG_SPI_S3C24XX)		+= spi-s3c24xx-hw.o
+ spi-s3c24xx-hw-y			:= spi-s3c24xx.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/434-spi-ap83_spi_controller.patch b/trunk/target/linux/ar71xx/patches-3.14/434-spi-ap83_spi_controller.patch
new file mode 100644
index 00000000..a67e8084
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/434-spi-ap83_spi_controller.patch
@@ -0,0 +1,27 @@
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_SPI_SPIDEV)		+= spidev.o
+ # SPI master controller drivers (bus)
+ obj-$(CONFIG_SPI_ALTERA)		+= spi-altera.o
+ obj-$(CONFIG_SPI_ATMEL)			+= spi-atmel.o
++obj-$(CONFIG_SPI_AP83)			+= spi-ap83.o
+ obj-$(CONFIG_SPI_ATH79)			+= spi-ath79.o
+ obj-$(CONFIG_SPI_AU1550)		+= spi-au1550.o
+ obj-$(CONFIG_SPI_BCM2835)		+= spi-bcm2835.o
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -59,6 +59,14 @@ config SPI_ALTERA
+ 	help
+ 	  This is the driver for the Altera SPI Controller.
+ 
++config SPI_AP83
++	tristate "Atheros AP83 specific SPI Controller"
++	depends on SPI_MASTER && ATH79_MACH_AP83
++	select SPI_BITBANG
++	help
++	  This is a specific SPI controller driver for the Atheros AP83
++	  reference board.
++
+ config SPI_ATH79
+ 	tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
+ 	depends on ATH79 && GPIOLIB
diff --git a/trunk/target/linux/ar71xx/patches-3.14/435-spi-vsc7385_driver.patch b/trunk/target/linux/ar71xx/patches-3.14/435-spi-vsc7385_driver.patch
new file mode 100644
index 00000000..9c153e92
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/435-spi-vsc7385_driver.patch
@@ -0,0 +1,23 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -601,6 +601,11 @@ config SPI_RB4XX_CPLD
+ 	  SPI driver for the Xilinx CPLD chip present on the
+ 	  MikroTik RB4xx boards.
+ 
++config SPI_VSC7385
++	tristate "Vitesse VSC7385 ethernet switch driver"
++	help
++	  SPI driver for the Vitesse VSC7385 ethernet switch.
++
+ #
+ # Add new SPI protocol masters in alphabetical order above this line
+ #
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -81,5 +81,6 @@ obj-$(CONFIG_SPI_TI_SSP)		+= spi-ti-ssp.
+ obj-$(CONFIG_SPI_TLE62X0)		+= spi-tle62x0.o
+ obj-$(CONFIG_SPI_TOPCLIFF_PCH)		+= spi-topcliff-pch.o
+ obj-$(CONFIG_SPI_TXX9)			+= spi-txx9.o
++obj-$(CONFIG_SPI_VSC7385)		+= spi-vsc7385.o
+ obj-$(CONFIG_SPI_XCOMM)		+= spi-xcomm.o
+ obj-$(CONFIG_SPI_XILINX)		+= spi-xilinx.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/440-leds-wndr3700-usb-led-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/440-leds-wndr3700-usb-led-driver.patch
new file mode 100644
index 00000000..bc929982
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/440-leds-wndr3700-usb-led-driver.patch
@@ -0,0 +1,26 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -487,6 +487,13 @@ config LEDS_BLINKM
+ 	  This option enables support for the BlinkM RGB LED connected
+ 	  through I2C. Say Y to enable support for the BlinkM LED.
+ 
++config LEDS_WNDR3700_USB
++	tristate "NETGEAR WNDR3700 USB LED driver"
++	depends on LEDS_CLASS && ATH79_MACH_WNDR3700
++	help
++	  This option enables support for the USB LED found on the
++	  NETGEAR WNDR3700 board.
++
+ comment "LED Triggers"
+ source "drivers/leds/trigger/Kconfig"
+ 
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -42,6 +42,7 @@ obj-$(CONFIG_LEDS_DA9052)		+= leds-da905
+ obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o
+ obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o
+ obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o
++obj-${CONFIG_LEDS_WNDR3700_USB}		+= leds-wndr3700-usb.o
+ obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o
+ obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o
+ obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/441-leds-rb750-led-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/441-leds-rb750-led-driver.patch
new file mode 100644
index 00000000..b3fadb91
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/441-leds-rb750-led-driver.patch
@@ -0,0 +1,23 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -494,6 +494,10 @@ config LEDS_WNDR3700_USB
+ 	  This option enables support for the USB LED found on the
+ 	  NETGEAR WNDR3700 board.
+ 
++config LEDS_RB750
++	tristate "LED driver for the Mikrotik RouterBOARD 750"
++	depends on LEDS_CLASS && ATH79_MACH_RB750
++
+ comment "LED Triggers"
+ source "drivers/leds/trigger/Kconfig"
+ 
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -49,6 +49,7 @@ obj-$(CONFIG_LEDS_LT3593)		+= leds-lt359
+ obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o
+ obj-$(CONFIG_LEDS_DELL_NETBOOKS)	+= dell-led.o
+ obj-$(CONFIG_LEDS_MC13783)		+= leds-mc13783.o
++obj-$(CONFIG_LEDS_RB750)		+= leds-rb750.o
+ obj-$(CONFIG_LEDS_NS2)			+= leds-ns2.o
+ obj-$(CONFIG_LEDS_NETXBIG)		+= leds-netxbig.o
+ obj-$(CONFIG_LEDS_ASIC3)		+= leds-asic3.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/450-gpio-nxp-74hc153-gpio-chip-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/450-gpio-nxp-74hc153-gpio-chip-driver.patch
new file mode 100644
index 00000000..54db1e86
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/450-gpio-nxp-74hc153-gpio-chip-driver.patch
@@ -0,0 +1,25 @@
+--- a/drivers/gpio/Kconfig
++++ b/drivers/gpio/Kconfig
+@@ -834,4 +834,12 @@ config GPIO_VIPERBOARD
+           River Tech's viperboard.h for detailed meaning
+           of the module parameters.
+ 
++comment "Other GPIO expanders"
++
++config GPIO_NXP_74HC153
++	tristate "NXP 74HC153 Dual 4-input multiplexer"
++	help
++	  Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
++	  provides a GPIO interface supporting input mode only.
++
+ endif
+--- a/drivers/gpio/Makefile
++++ b/drivers/gpio/Makefile
+@@ -56,6 +56,7 @@ obj-$(CONFIG_GPIO_MSM_V2)	+= gpio-msm-v2
+ obj-$(CONFIG_GPIO_MVEBU)        += gpio-mvebu.o
+ obj-$(CONFIG_GPIO_MXC)		+= gpio-mxc.o
+ obj-$(CONFIG_GPIO_MXS)		+= gpio-mxs.o
++obj-$(CONFIG_GPIO_NXP_74HC153)	+= gpio-nxp-74hc153.o
+ obj-$(CONFIG_GPIO_OCTEON)	+= gpio-octeon.o
+ obj-$(CONFIG_ARCH_OMAP)		+= gpio-omap.o
+ obj-$(CONFIG_GPIO_PCA953X)	+= gpio-pca953x.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/451-gpio-74x164-improve-platform-device-support.patch b/trunk/target/linux/ar71xx/patches-3.14/451-gpio-74x164-improve-platform-device-support.patch
new file mode 100644
index 00000000..ed95f5e2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/451-gpio-74x164-improve-platform-device-support.patch
@@ -0,0 +1,70 @@
+--- a/drivers/gpio/gpio-74x164.c
++++ b/drivers/gpio/gpio-74x164.c
+@@ -107,8 +107,18 @@ static int gen_74x164_direction_output(s
+ static int gen_74x164_probe(struct spi_device *spi)
+ {
+ 	struct gen_74x164_chip *chip;
++	struct gen_74x164_chip_platform_data *pdata;
++	struct device_node *np;
+ 	int ret;
+ 
++	pdata = spi->dev.platform_data;
++	np = spi->dev.of_node;
++
++	if (!np && !pdata) {
++		dev_err(&spi->dev, "No configuration data available.\n");
++		return -EINVAL;
++	}
++
+ 	/*
+ 	 * bits_per_word cannot be configured in platform data
+ 	 */
+@@ -130,18 +140,27 @@ static int gen_74x164_probe(struct spi_d
+ 	chip->gpio_chip.set = gen_74x164_set_value;
+ 	chip->gpio_chip.base = -1;
+ 
+-	if (of_property_read_u32(spi->dev.of_node, "registers-number",
+-				 &chip->registers)) {
+-		dev_err(&spi->dev,
+-			"Missing registers-number property in the DT.\n");
+-		return -EINVAL;
++	if (np) {
++		if (of_property_read_u32(spi->dev.of_node, "registers-number", &chip->registers)) {
++			dev_err(&spi->dev, "Missing registers-number property in the DT.\n");
++			ret = -EINVAL;
++			goto exit_destroy;
++		}
++	} else if (pdata) {
++		chip->registers = pdata->num_registers;
+ 	}
+ 
++	if (!chip->registers)
++		chip->registers = 1;
++
+ 	chip->gpio_chip.ngpio = GEN_74X164_NUMBER_GPIOS * chip->registers;
+ 	chip->buffer = devm_kzalloc(&spi->dev, chip->registers, GFP_KERNEL);
+ 	if (!chip->buffer)
+ 		return -ENOMEM;
+ 
++	if (pdata && pdata->init_data)
++		memcpy(chip->buffer, pdata->init_data, chip->registers);
++
+ 	chip->gpio_chip.can_sleep = true;
+ 	chip->gpio_chip.dev = &spi->dev;
+ 	chip->gpio_chip.owner = THIS_MODULE;
+--- /dev/null
++++ b/include/linux/spi/74x164.h
+@@ -0,0 +1,13 @@
++#ifndef LINUX_SPI_74X164_H
++#define LINUX_SPI_74X164_H
++
++struct gen_74x164_chip_platform_data {
++	/* number assigned to the first GPIO */
++	unsigned        base;
++	/* number of chained registers */
++	unsigned	num_registers;
++	/* address of a buffer containing initial data */
++	u8		*init_data;
++};
++
++#endif
diff --git a/trunk/target/linux/ar71xx/patches-3.14/452-gpio-add-gpio-latch-driver.patch b/trunk/target/linux/ar71xx/patches-3.14/452-gpio-add-gpio-latch-driver.patch
new file mode 100644
index 00000000..3029874d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/452-gpio-add-gpio-latch-driver.patch
@@ -0,0 +1,22 @@
+--- a/drivers/gpio/Kconfig
++++ b/drivers/gpio/Kconfig
+@@ -842,4 +842,9 @@ config GPIO_NXP_74HC153
+ 	  Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
+ 	  provides a GPIO interface supporting input mode only.
+ 
++config GPIO_LATCH
++	tristate "GPIO latch driver"
++	help
++	  Say yes here to enable a GPIO latch driver.
++
+ endif
+--- a/drivers/gpio/Makefile
++++ b/drivers/gpio/Makefile
+@@ -35,6 +35,7 @@ obj-$(CONFIG_GPIO_JANZ_TTL)	+= gpio-janz
+ obj-$(CONFIG_GPIO_KEMPLD)	+= gpio-kempld.o
+ obj-$(CONFIG_ARCH_KS8695)	+= gpio-ks8695.o
+ obj-$(CONFIG_GPIO_INTEL_MID)	+= gpio-intel-mid.o
++obj-$(CONFIG_GPIO_LATCH)	+= gpio-latch.o
+ obj-$(CONFIG_GPIO_LP3943)	+= gpio-lp3943.o
+ obj-$(CONFIG_ARCH_LPC32XX)	+= gpio-lpc32xx.o
+ obj-$(CONFIG_GPIO_LYNXPOINT)	+= gpio-lynxpoint.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/460-spi-bitbang-export-spi_bitbang_bufs.patch b/trunk/target/linux/ar71xx/patches-3.14/460-spi-bitbang-export-spi_bitbang_bufs.patch
new file mode 100644
index 00000000..802034a6
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/460-spi-bitbang-export-spi_bitbang_bufs.patch
@@ -0,0 +1,28 @@
+--- a/drivers/spi/spi-bitbang.c
++++ b/drivers/spi/spi-bitbang.c
+@@ -234,13 +234,14 @@ void spi_bitbang_cleanup(struct spi_devi
+ }
+ EXPORT_SYMBOL_GPL(spi_bitbang_cleanup);
+ 
+-static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
++int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
+ {
+ 	struct spi_bitbang_cs	*cs = spi->controller_state;
+ 	unsigned		nsecs = cs->nsecs;
+ 
+ 	return cs->txrx_bufs(spi, cs->txrx_word, nsecs, t);
+ }
++EXPORT_SYMBOL_GPL(spi_bitbang_bufs);
+ 
+ /*----------------------------------------------------------------------*/
+ 
+--- a/include/linux/spi/spi_bitbang.h
++++ b/include/linux/spi/spi_bitbang.h
+@@ -39,6 +39,7 @@ extern int spi_bitbang_setup(struct spi_
+ extern void spi_bitbang_cleanup(struct spi_device *spi);
+ extern int spi_bitbang_setup_transfer(struct spi_device *spi,
+ 				      struct spi_transfer *t);
++extern int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t);
+ 
+ /* start or stop queue processing */
+ extern int spi_bitbang_start(struct spi_bitbang *spi);
diff --git a/trunk/target/linux/ar71xx/patches-3.14/461-spi-add-type-field-to-spi_transfer.patch b/trunk/target/linux/ar71xx/patches-3.14/461-spi-add-type-field-to-spi_transfer.patch
new file mode 100644
index 00000000..ac7359b2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/461-spi-add-type-field-to-spi_transfer.patch
@@ -0,0 +1,23 @@
+--- a/include/linux/spi/spi.h
++++ b/include/linux/spi/spi.h
+@@ -475,6 +475,12 @@ extern struct spi_master *spi_busnum_to_
+ 
+ /*---------------------------------------------------------------------------*/
+ 
++enum spi_transfer_type {
++	SPI_TRANSFER_GENERIC = 0,
++	SPI_TRANSFER_FLASH_READ_CMD,
++	SPI_TRANSFER_FLASH_READ_DATA,
++};
++
+ /*
+  * I/O INTERFACE between SPI controller and protocol drivers
+  *
+@@ -591,6 +597,7 @@ struct spi_transfer {
+ 	u8		bits_per_word;
+ 	u16		delay_usecs;
+ 	u32		speed_hz;
++	enum spi_transfer_type type;
+ 
+ 	struct list_head transfer_list;
+ };
diff --git a/trunk/target/linux/ar71xx/patches-3.14/462-mtd-m25p80-set-spi-transfer-type.patch b/trunk/target/linux/ar71xx/patches-3.14/462-mtd-m25p80-set-spi-transfer-type.patch
new file mode 100644
index 00000000..39ca0130
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/462-mtd-m25p80-set-spi-transfer-type.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -532,6 +532,7 @@ static int m25p80_read(struct mtd_info *
+ 		return -EINVAL;
+ 	}
+ 
++	t[0].type = SPI_TRANSFER_FLASH_READ_CMD;
+ 	t[0].tx_buf = flash->command;
+ 	t[0].len = m25p_cmdsz(flash) + dummy;
+ 	spi_message_add_tail(&t[0], &m);
+@@ -561,6 +562,7 @@ static int m25p80_read(struct mtd_info *
+ 		else
+ 			readlen = len;
+ 
++		t[1].type = SPI_TRANSFER_FLASH_READ_DATA;
+ 		t[1].rx_buf = buf + ofs;
+ 		t[1].rx_nbits = m25p80_rx_nbits(flash);
+ 		t[1].len = readlen;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch b/trunk/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch
new file mode 100644
index 00000000..62d52d23
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/463-spi-ath79-add-fast-flash-read.patch
@@ -0,0 +1,185 @@
+--- a/drivers/spi/spi-ath79.c
++++ b/drivers/spi/spi-ath79.c
+@@ -37,6 +37,11 @@
+ 
+ #define ATH79_SPI_CS_LINE_MAX		2
+ 
++enum ath79_spi_state {
++	ATH79_SPI_STATE_WAIT_CMD = 0,
++	ATH79_SPI_STATE_WAIT_READ,
++};
++
+ struct ath79_spi {
+ 	struct spi_bitbang	bitbang;
+ 	u32			ioc_base;
+@@ -44,6 +49,11 @@ struct ath79_spi {
+ 	void __iomem		*base;
+ 	struct clk		*clk;
+ 	unsigned		rrw_delay;
++
++	enum ath79_spi_state	state;
++	u32			clk_div;
++	unsigned long 		read_addr;
++	unsigned long		ahb_rate;
+ };
+ 
+ static inline u32 ath79_spi_rr(struct ath79_spi *sp, unsigned reg)
+@@ -111,9 +121,6 @@ static void ath79_spi_enable(struct ath7
+ 	/* save CTRL register */
+ 	sp->reg_ctrl = ath79_spi_rr(sp, AR71XX_SPI_REG_CTRL);
+ 	sp->ioc_base = ath79_spi_rr(sp, AR71XX_SPI_REG_IOC);
+-
+-	/* TODO: setup speed? */
+-	ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
+ }
+ 
+ static void ath79_spi_disable(struct ath79_spi *sp)
+@@ -226,6 +233,110 @@ static u32 ath79_spi_txrx_mode0(struct s
+ 	return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
+ }
+ 
++static int ath79_spi_do_read_flash_data(struct spi_device *spi,
++					struct spi_transfer *t)
++{
++	struct ath79_spi *sp = ath79_spidev_to_sp(spi);
++
++	/* disable GPIO mode */
++	ath79_spi_wr(sp, AR71XX_SPI_REG_FS, 0);
++
++	memcpy_fromio(t->rx_buf, sp->base + sp->read_addr, t->len);
++
++	/* enable GPIO mode */
++	ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
++
++	/* restore IOC register */
++	ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
++
++	return t->len;
++}
++
++static int ath79_spi_do_read_flash_cmd(struct spi_device *spi,
++				       struct spi_transfer *t)
++{
++	struct ath79_spi *sp = ath79_spidev_to_sp(spi);
++	int len;
++	const u8 *p;
++
++	sp->read_addr = 0;
++
++	len = t->len - 1;
++	p = t->tx_buf;
++
++	while (len--) {
++		p++;
++		sp->read_addr <<= 8;
++		sp->read_addr |= *p;
++	}
++
++	return t->len;
++}
++
++static bool ath79_spi_is_read_cmd(struct spi_device *spi,
++				 struct spi_transfer *t)
++{
++	return t->type == SPI_TRANSFER_FLASH_READ_CMD;
++}
++
++static bool ath79_spi_is_data_read(struct spi_device *spi,
++				  struct spi_transfer *t)
++{
++	return t->type == SPI_TRANSFER_FLASH_READ_DATA;
++}
++
++static int ath79_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
++{
++	struct ath79_spi *sp = ath79_spidev_to_sp(spi);
++	int ret;
++
++	switch (sp->state) {
++	case ATH79_SPI_STATE_WAIT_CMD:
++		if (ath79_spi_is_read_cmd(spi, t)) {
++			ret = ath79_spi_do_read_flash_cmd(spi, t);
++			sp->state = ATH79_SPI_STATE_WAIT_READ;
++		} else {
++			ret = spi_bitbang_bufs(spi, t);
++		}
++		break;
++
++	case ATH79_SPI_STATE_WAIT_READ:
++		if (ath79_spi_is_data_read(spi, t)) {
++			ret = ath79_spi_do_read_flash_data(spi, t);
++		} else {
++			dev_warn(&spi->dev, "flash data read expected\n");
++			ret = -EIO;
++		}
++		sp->state = ATH79_SPI_STATE_WAIT_CMD;
++		break;
++
++	default:
++		BUG();
++	}
++
++	return ret;
++}
++
++static int ath79_spi_setup_transfer(struct spi_device *spi,
++				    struct spi_transfer *t)
++{
++	struct ath79_spi *sp = ath79_spidev_to_sp(spi);
++	struct ath79_spi_controller_data *cdata;
++	int ret;
++
++	ret = spi_bitbang_setup_transfer(spi, t);
++	if (ret)
++		return ret;
++
++	cdata = spi->controller_data;
++	if (cdata->is_flash)
++		sp->bitbang.txrx_bufs = ath79_spi_txrx_bufs;
++	else
++		sp->bitbang.txrx_bufs = spi_bitbang_bufs;
++
++	return ret;
++}
++
+ static int ath79_spi_probe(struct platform_device *pdev)
+ {
+ 	struct spi_master *master;
+@@ -248,6 +359,8 @@ static int ath79_spi_probe(struct platfo
+ 	sp = spi_master_get_devdata(master);
+ 	platform_set_drvdata(pdev, sp);
+ 
++	sp->state = ATH79_SPI_STATE_WAIT_CMD;
++
+ 	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
+ 	master->setup = ath79_spi_setup;
+ 	master->cleanup = ath79_spi_cleanup;
+@@ -257,7 +370,7 @@ static int ath79_spi_probe(struct platfo
+ 	sp->bitbang.master = master;
+ 	sp->bitbang.chipselect = ath79_spi_chipselect;
+ 	sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;
+-	sp->bitbang.setup_transfer = spi_bitbang_setup_transfer;
++	sp->bitbang.setup_transfer = ath79_spi_setup_transfer;
+ 	sp->bitbang.flags = SPI_CS_HIGH;
+ 
+ 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+@@ -282,7 +395,8 @@ static int ath79_spi_probe(struct platfo
+ 	if (ret)
+ 		goto err_put_master;
+ 
+-	rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ);
++	sp->ahb_rate = clk_get_rate(sp->clk);
++	rate = DIV_ROUND_UP(sp->ahb_rate, MHZ);
+ 	if (!rate) {
+ 		ret = -EINVAL;
+ 		goto err_clk_disable;
+--- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
++++ b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
+@@ -24,6 +24,7 @@ enum ath79_spi_cs_type {
+ struct ath79_spi_controller_data {
+ 	enum ath79_spi_cs_type cs_type;
+ 	unsigned cs_line;
++	bool is_flash;
+ };
+ 
+ #endif /* _ATH79_SPI_PLATFORM_H */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/464-spi-ath79-fix-fast-flash-read.patch b/trunk/target/linux/ar71xx/patches-3.14/464-spi-ath79-fix-fast-flash-read.patch
new file mode 100644
index 00000000..9c7b93ed
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/464-spi-ath79-fix-fast-flash-read.patch
@@ -0,0 +1,34 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -530,6 +530,8 @@ static int m25p80_read(struct mtd_info *
+ 	if (dummy < 0) {
+ 		dev_err(&flash->spi->dev, "No valid read command supported\n");
+ 		return -EINVAL;
++	} else if (dummy == 1) {
++		t[0].dummy = true;
+ 	}
+ 
+ 	t[0].type = SPI_TRANSFER_FLASH_READ_CMD;
+--- a/drivers/spi/spi-ath79.c
++++ b/drivers/spi/spi-ath79.c
+@@ -262,6 +262,10 @@ static int ath79_spi_do_read_flash_cmd(s
+ 	sp->read_addr = 0;
+ 
+ 	len = t->len - 1;
++
++	if (t->dummy)
++		len -= 1;
++
+ 	p = t->tx_buf;
+ 
+ 	while (len--) {
+--- a/include/linux/spi/spi.h
++++ b/include/linux/spi/spi.h
+@@ -598,6 +598,7 @@ struct spi_transfer {
+ 	u16		delay_usecs;
+ 	u32		speed_hz;
+ 	enum spi_transfer_type type;
++	bool dummy;
+ 
+ 	struct list_head transfer_list;
+ };
diff --git a/trunk/target/linux/ar71xx/patches-3.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch b/trunk/target/linux/ar71xx/patches-3.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch
new file mode 100644
index 00000000..520c6520
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch
@@ -0,0 +1,111 @@
+--- /dev/null
++++ b/arch/mips/include/asm/mach-ath79/mangle-port.h
+@@ -0,0 +1,37 @@
++/*
++ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ *  This file was derived from: inlude/asm-mips/mach-generic/mangle-port.h
++ *      Copyright (C) 2003, 2004 Ralf Baechle
++ *
++ *  This program is free software; you can redistribute it and/or modify it
++ *  under the terms of the GNU General Public License version 2 as published
++ *  by the Free Software Foundation.
++ */
++
++#ifndef __ASM_MACH_ATH79_MANGLE_PORT_H
++#define __ASM_MACH_ATH79_MANGLE_PORT_H
++
++#ifdef CONFIG_PCI
++extern unsigned long (ath79_pci_swizzle_b)(unsigned long port);
++extern unsigned long (ath79_pci_swizzle_w)(unsigned long port);
++#else
++#define ath79_pci_swizzle_b(port) (port)
++#define ath79_pci_swizzle_w(port) (port)
++#endif
++
++#define __swizzle_addr_b(port)	ath79_pci_swizzle_b(port)
++#define __swizzle_addr_w(port)	ath79_pci_swizzle_w(port)
++#define __swizzle_addr_l(port)	(port)
++#define __swizzle_addr_q(port)	(port)
++
++# define ioswabb(a, x)           (x)
++# define __mem_ioswabb(a, x)     (x)
++# define ioswabw(a, x)           (x)
++# define __mem_ioswabw(a, x)     cpu_to_le16(x)
++# define ioswabl(a, x)           (x)
++# define __mem_ioswabl(a, x)     cpu_to_le32(x)
++# define ioswabq(a, x)           (x)
++# define __mem_ioswabq(a, x)     cpu_to_le64(x)
++
++#endif /* __ASM_MACH_ATH79_MANGLE_PORT_H */
+--- a/arch/mips/ath79/pci.c
++++ b/arch/mips/ath79/pci.c
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include <linux/init.h>
++#include <linux/export.h>
+ #include <linux/pci.h>
+ #include <linux/resource.h>
+ #include <linux/platform_device.h>
+@@ -25,6 +26,9 @@ static int (*ath79_pci_plat_dev_init)(st
+ static const struct ath79_pci_irq *ath79_pci_irq_map __initdata;
+ static unsigned ath79_pci_nr_irqs __initdata;
+ 
++static unsigned long (*__ath79_pci_swizzle_b)(unsigned long port);
++static unsigned long (*__ath79_pci_swizzle_w)(unsigned long port);
++
+ static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = {
+ 	{
+ 		.slot	= 17,
+@@ -212,12 +216,50 @@ ath79_register_pci_ar724x(int id,
+ 	return pdev;
+ }
+ 
++static inline bool ar71xx_is_pci_addr(unsigned long port)
++{
++	unsigned long phys = CPHYSADDR(port);
++
++	return (phys >= AR71XX_PCI_MEM_BASE &&
++		phys < AR71XX_PCI_MEM_BASE + AR71XX_PCI_MEM_SIZE);
++}
++
++static unsigned long ar71xx_pci_swizzle_b(unsigned long port)
++{
++	return ar71xx_is_pci_addr(port) ? port ^ 3 : port;
++}
++
++static unsigned long ar71xx_pci_swizzle_w(unsigned long port)
++{
++	return ar71xx_is_pci_addr(port) ? port ^ 2 : port;
++}
++
++unsigned long ath79_pci_swizzle_b(unsigned long port)
++{
++	if (__ath79_pci_swizzle_b)
++		return __ath79_pci_swizzle_b(port);
++
++	return port;
++}
++EXPORT_SYMBOL(ath79_pci_swizzle_b);
++
++unsigned long ath79_pci_swizzle_w(unsigned long port)
++{
++	if (__ath79_pci_swizzle_w)
++		return __ath79_pci_swizzle_w(port);
++
++	return port;
++}
++EXPORT_SYMBOL(ath79_pci_swizzle_w);
++
+ int __init ath79_register_pci(void)
+ {
+ 	struct platform_device *pdev = NULL;
+ 
+ 	if (soc_is_ar71xx()) {
+ 		pdev = ath79_register_pci_ar71xx();
++		__ath79_pci_swizzle_b = ar71xx_pci_swizzle_b;
++		__ath79_pci_swizzle_w = ar71xx_pci_swizzle_w;
+ 	} else if (soc_is_ar724x()) {
+ 		pdev = ath79_register_pci_ar724x(-1,
+ 						 AR724X_PCI_CFG_BASE,
diff --git a/trunk/target/linux/ar71xx/patches-3.14/480-ar913x_wmac_external_reset.patch b/trunk/target/linux/ar71xx/patches-3.14/480-ar913x_wmac_external_reset.patch
new file mode 100644
index 00000000..9b704a3c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/480-ar913x_wmac_external_reset.patch
@@ -0,0 +1,31 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -44,7 +44,7 @@ static struct platform_device ath79_wmac
+ 	},
+ };
+ 
+-static void __init ar913x_wmac_setup(void)
++static int ar913x_wmac_reset(void)
+ {
+ 	/* reset the WMAC */
+ 	ath79_device_reset_set(AR913X_RESET_AMBA2WMAC);
+@@ -53,10 +53,19 @@ static void __init ar913x_wmac_setup(voi
+ 	ath79_device_reset_clear(AR913X_RESET_AMBA2WMAC);
+ 	mdelay(10);
+ 
++	return 0;
++}
++
++static void __init ar913x_wmac_setup(void)
++{
++	ar913x_wmac_reset();
++
+ 	ath79_wmac_resources[0].start = AR913X_WMAC_BASE;
+ 	ath79_wmac_resources[0].end = AR913X_WMAC_BASE + AR913X_WMAC_SIZE - 1;
+ 	ath79_wmac_resources[1].start = ATH79_CPU_IRQ(2);
+ 	ath79_wmac_resources[1].end = ATH79_CPU_IRQ(2);
++
++	ath79_wmac_data.external_reset = ar913x_wmac_reset;
+ }
+ 
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch b/trunk/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch
new file mode 100644
index 00000000..0e89b5f5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/490-usb-ehci-add-quirks-for-qca-socs.patch
@@ -0,0 +1,101 @@
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -252,6 +252,37 @@ static int ehci_reset (struct ehci_hcd *
+ 	command |= CMD_RESET;
+ 	dbg_cmd (ehci, "reset", command);
+ 	ehci_writel(ehci, command, &ehci->regs->command);
++
++	if (ehci->qca_force_host_mode) {
++		u32 usbmode;
++
++		udelay(1000);
++
++		usbmode = ehci_readl(ehci, &ehci->regs->usbmode);
++		usbmode |= USBMODE_CM_HC | (1 << 4);
++		ehci_writel(ehci, usbmode, &ehci->regs->usbmode);
++
++		ehci_dbg(ehci, "forced host mode, usbmode: %08x\n",
++			 ehci_readl(ehci, &ehci->regs->usbmode));
++	}
++
++	if (ehci->qca_force_16bit_ptw) {
++		u32 port_status;
++
++		udelay(1000);
++
++		/* enable 16-bit UTMI interface */
++		port_status = ehci_readl(ehci, &ehci->regs->port_status[0]);
++		port_status |= BIT(28);
++		ehci_writel(ehci, port_status, &ehci->regs->port_status[0]);
++
++		ehci_dbg(ehci, "16-bit UTMI interface enabled, status: %08x\n",
++			 ehci_readl(ehci, &ehci->regs->port_status[0]));
++	}
++
++	if (ehci->reset_notifier)
++		ehci->reset_notifier(ehci_to_hcd(ehci));
++
+ 	ehci->rh_state = EHCI_RH_HALTED;
+ 	ehci->next_statechange = jiffies;
+ 	retval = ehci_handshake(ehci, &ehci->regs->command,
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -227,6 +227,10 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */
+ 	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */
+ 	unsigned		ignore_oc:1;
++	unsigned		qca_force_host_mode:1;
++	unsigned		qca_force_16bit_ptw:1; /* force 16 bit UTMI */
++
++	void (*reset_notifier)(struct usb_hcd *hcd);
+ 
+ 	/* required for usb32 quirk */
+ 	#define OHCI_CTRL_HCFS          (3 << 6)
+--- a/include/linux/usb/ehci_pdriver.h
++++ b/include/linux/usb/ehci_pdriver.h
+@@ -46,6 +46,8 @@ struct usb_ehci_pdata {
+ 	unsigned	big_endian_mmio:1;
+ 	unsigned	no_io_watchdog:1;
+ 	unsigned	ignore_oc:1;
++	unsigned	qca_force_host_mode:1;
++	unsigned	qca_force_16bit_ptw:1;
+ 
+ 	/* Turn on all power and clocks */
+ 	int (*power_on)(struct platform_device *pdev);
+@@ -55,6 +57,7 @@ struct usb_ehci_pdata {
+ 	 * turn off everything else */
+ 	void (*power_suspend)(struct platform_device *pdev);
+ 	int (*pre_setup)(struct usb_hcd *hcd);
++	void (*reset_notifier)(struct platform_device *pdev);
+ };
+ 
+ #endif /* __USB_CORE_EHCI_PDRIVER_H */
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -36,6 +36,14 @@
+ 
+ static const char hcd_name[] = "ehci-platform";
+ 
++static void ehci_platform_reset_notifier(struct usb_hcd *hcd)
++{
++	struct platform_device *pdev = to_platform_device(hcd->self.controller);
++	struct usb_ehci_pdata *pdata = pdev->dev.platform_data;
++
++	pdata->reset_notifier(pdev);
++}
++
+ static int ehci_platform_reset(struct usb_hcd *hcd)
+ {
+ 	struct platform_device *pdev = to_platform_device(hcd->self.controller);
+@@ -48,6 +56,11 @@ static int ehci_platform_reset(struct us
+ 	ehci->big_endian_desc = pdata->big_endian_desc;
+ 	ehci->big_endian_mmio = pdata->big_endian_mmio;
+ 	ehci->ignore_oc = pdata->ignore_oc;
++	ehci->qca_force_host_mode = pdata->qca_force_host_mode;
++	ehci->qca_force_16bit_ptw = pdata->qca_force_16bit_ptw;
++
++	if (pdata->reset_notifier)
++		ehci->reset_notifier = ehci_platform_reset_notifier;
+ 
+ 	if (pdata->pre_setup) {
+ 		retval = pdata->pre_setup(hcd);
diff --git a/trunk/target/linux/ar71xx/patches-3.14/500-MIPS-fw-myloader.patch b/trunk/target/linux/ar71xx/patches-3.14/500-MIPS-fw-myloader.patch
new file mode 100644
index 00000000..f62363a4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/500-MIPS-fw-myloader.patch
@@ -0,0 +1,22 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -183,6 +183,7 @@ endif
+ #
+ libs-$(CONFIG_FW_ARC)		+= arch/mips/fw/arc/
+ libs-$(CONFIG_FW_CFE)		+= arch/mips/fw/cfe/
++libs-$(CONFIG_MYLOADER)		+= arch/mips/fw/myloader/
+ libs-$(CONFIG_FW_SNIPROM)	+= arch/mips/fw/sni/
+ libs-y				+= arch/mips/fw/lib/
+ 
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -951,6 +951,9 @@ config MIPS_MSC
+ config MIPS_NILE4
+ 	bool
+ 
++config MYLOADER
++	bool
++
+ config SYNC_R4K
+ 	bool
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch b/trunk/target/linux/ar71xx/patches-3.14/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch
new file mode 100644
index 00000000..d9b8682f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch
@@ -0,0 +1,81 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -15,6 +15,7 @@
+ #include <linux/init.h>
+ #include <linux/delay.h>
+ #include <linux/irq.h>
++#include <linux/etherdevice.h>
+ #include <linux/platform_device.h>
+ #include <linux/ath9k_platform.h>
+ 
+@@ -22,6 +23,7 @@
+ #include <asm/mach-ath79/ar71xx_regs.h>
+ #include "dev-wmac.h"
+ 
++static u8 ath79_wmac_mac[ETH_ALEN];
+ static struct ath9k_platform_data ath79_wmac_data;
+ 
+ static struct resource ath79_wmac_resources[] = {
+@@ -160,7 +162,7 @@ static void qca955x_wmac_setup(void)
+ 		ath79_wmac_data.is_clk_25mhz = true;
+ }
+ 
+-void __init ath79_register_wmac(u8 *cal_data)
++void __init ath79_register_wmac(u8 *cal_data, u8 *mac_addr)
+ {
+ 	if (soc_is_ar913x())
+ 		ar913x_wmac_setup();
+@@ -177,5 +179,10 @@ void __init ath79_register_wmac(u8 *cal_
+ 		memcpy(ath79_wmac_data.eeprom_data, cal_data,
+ 		       sizeof(ath79_wmac_data.eeprom_data));
+ 
++	if (mac_addr) {
++		memcpy(ath79_wmac_mac, mac_addr, sizeof(ath79_wmac_mac));
++		ath79_wmac_data.macaddr = ath79_wmac_mac;
++	}
++
+ 	platform_device_register(&ath79_wmac_device);
+ }
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -12,6 +12,6 @@
+ #ifndef _ATH79_DEV_WMAC_H
+ #define _ATH79_DEV_WMAC_H
+ 
+-void ath79_register_wmac(u8 *cal_data);
++void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
+ 
+ #endif /* _ATH79_DEV_WMAC_H */
+--- a/arch/mips/ath79/mach-ap81.c
++++ b/arch/mips/ath79/mach-ap81.c
+@@ -98,7 +98,7 @@ static void __init ap81_setup(void)
+ 					ap81_gpio_keys);
+ 	ath79_register_spi(&ap81_spi_data, ap81_spi_info,
+ 			   ARRAY_SIZE(ap81_spi_info));
+-	ath79_register_wmac(cal_data);
++	ath79_register_wmac(cal_data, NULL);
+ 	ath79_register_usb();
+ }
+ 
+--- a/arch/mips/ath79/mach-db120.c
++++ b/arch/mips/ath79/mach-db120.c
+@@ -134,7 +134,7 @@ static void __init db120_setup(void)
+ 	ath79_register_spi(&db120_spi_data, db120_spi_info,
+ 			   ARRAY_SIZE(db120_spi_info));
+ 	ath79_register_usb();
+-	ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET);
++	ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET, NULL);
+ 	db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET);
+ }
+ 
+--- a/arch/mips/ath79/mach-ap121.c
++++ b/arch/mips/ath79/mach-ap121.c
+@@ -91,7 +91,7 @@ static void __init ap121_setup(void)
+ 	ath79_register_spi(&ap121_spi_data, ap121_spi_info,
+ 			   ARRAY_SIZE(ap121_spi_info));
+ 	ath79_register_usb();
+-	ath79_register_wmac(cal_data);
++	ath79_register_wmac(cal_data, NULL);
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",
diff --git a/trunk/target/linux/ar71xx/patches-3.14/502-MIPS-ath79-export-ath79_gpio_base.patch b/trunk/target/linux/ar71xx/patches-3.14/502-MIPS-ath79-export-ath79_gpio_base.patch
new file mode 100644
index 00000000..73eb8e10
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/502-MIPS-ath79-export-ath79_gpio_base.patch
@@ -0,0 +1,23 @@
+--- a/arch/mips/ath79/gpio.c
++++ b/arch/mips/ath79/gpio.c
+@@ -25,7 +25,9 @@
+ #include <asm/mach-ath79/ath79.h>
+ #include "common.h"
+ 
+-static void __iomem *ath79_gpio_base;
++void __iomem *ath79_gpio_base;
++EXPORT_SYMBOL_GPL(ath79_gpio_base);
++
+ static unsigned long ath79_gpio_count;
+ static DEFINE_SPINLOCK(ath79_gpio_lock);
+ 
+--- a/arch/mips/include/asm/mach-ath79/ath79.h
++++ b/arch/mips/include/asm/mach-ath79/ath79.h
+@@ -116,6 +116,7 @@ static inline int soc_is_qca955x(void)
+ }
+ 
+ extern void __iomem *ath79_ddr_base;
++extern void __iomem *ath79_gpio_base;
+ extern void __iomem *ath79_pll_base;
+ extern void __iomem *ath79_reset_base;
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/503-MIPS-ath79-add-flash-acquire-release.patch b/trunk/target/linux/ar71xx/patches-3.14/503-MIPS-ath79-add-flash-acquire-release.patch
new file mode 100644
index 00000000..06f79029
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/503-MIPS-ath79-add-flash-acquire-release.patch
@@ -0,0 +1,37 @@
+--- a/arch/mips/ath79/common.c
++++ b/arch/mips/ath79/common.c
+@@ -22,6 +22,7 @@
+ #include "common.h"
+ 
+ static DEFINE_SPINLOCK(ath79_device_reset_lock);
++static DEFINE_MUTEX(ath79_flash_mutex);
+ 
+ u32 ath79_cpu_freq;
+ EXPORT_SYMBOL_GPL(ath79_cpu_freq);
+@@ -111,3 +112,16 @@ void ath79_device_reset_clear(u32 mask)
+ 	spin_unlock_irqrestore(&ath79_device_reset_lock, flags);
+ }
+ EXPORT_SYMBOL_GPL(ath79_device_reset_clear);
++
++void ath79_flash_acquire(void)
++{
++	mutex_lock(&ath79_flash_mutex);
++}
++EXPORT_SYMBOL_GPL(ath79_flash_acquire);
++
++void ath79_flash_release(void)
++{
++	mutex_unlock(&ath79_flash_mutex);
++}
++EXPORT_SYMBOL_GPL(ath79_flash_release);
++
+--- a/arch/mips/include/asm/mach-ath79/ath79.h
++++ b/arch/mips/include/asm/mach-ath79/ath79.h
+@@ -143,4 +143,7 @@ static inline u32 ath79_reset_rr(unsigne
+ void ath79_device_reset_set(u32 mask);
+ void ath79_device_reset_clear(u32 mask);
+ 
++void ath79_flash_acquire(void);
++void ath79_flash_release(void);
++
+ #endif /* __ASM_MACH_ATH79_H */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/504-MIPS-ath79-add-ath79_device_reset_get.patch b/trunk/target/linux/ar71xx/patches-3.14/504-MIPS-ath79-add-ath79_device_reset_get.patch
new file mode 100644
index 00000000..024a85d0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/504-MIPS-ath79-add-ath79_device_reset_get.patch
@@ -0,0 +1,45 @@
+--- a/arch/mips/include/asm/mach-ath79/ath79.h
++++ b/arch/mips/include/asm/mach-ath79/ath79.h
+@@ -142,6 +142,7 @@ static inline u32 ath79_reset_rr(unsigne
+ 
+ void ath79_device_reset_set(u32 mask);
+ void ath79_device_reset_clear(u32 mask);
++u32 ath79_device_reset_get(u32 mask);
+ 
+ void ath79_flash_acquire(void);
+ void ath79_flash_release(void);
+--- a/arch/mips/ath79/common.c
++++ b/arch/mips/ath79/common.c
+@@ -113,6 +113,32 @@ void ath79_device_reset_clear(u32 mask)
+ }
+ EXPORT_SYMBOL_GPL(ath79_device_reset_clear);
+ 
++u32 ath79_device_reset_get(u32 mask)
++{
++	unsigned long flags;
++	u32 reg;
++	u32 ret;
++
++	if (soc_is_ar71xx())
++		reg = AR71XX_RESET_REG_RESET_MODULE;
++	else if (soc_is_ar724x())
++		reg = AR724X_RESET_REG_RESET_MODULE;
++	else if (soc_is_ar913x())
++		reg = AR913X_RESET_REG_RESET_MODULE;
++	else if (soc_is_ar933x())
++		reg = AR933X_RESET_REG_RESET_MODULE;
++	else if (soc_is_ar934x())
++		reg = AR934X_RESET_REG_RESET_MODULE;
++	else
++		BUG();
++
++	spin_lock_irqsave(&ath79_device_reset_lock, flags);
++	ret = ath79_reset_rr(reg);
++	spin_unlock_irqrestore(&ath79_device_reset_lock, flags);
++	return ret;
++}
++EXPORT_SYMBOL_GPL(ath79_device_reset_get);
++
+ void ath79_flash_acquire(void)
+ {
+ 	mutex_lock(&ath79_flash_mutex);
diff --git a/trunk/target/linux/ar71xx/patches-3.14/505-MIPS-ath79-add-ath79_gpio_function_select.patch b/trunk/target/linux/ar71xx/patches-3.14/505-MIPS-ath79-add-ath79_gpio_function_select.patch
new file mode 100644
index 00000000..4c4c8914
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/505-MIPS-ath79-add-ath79_gpio_function_select.patch
@@ -0,0 +1,47 @@
+--- a/arch/mips/ath79/common.h
++++ b/arch/mips/ath79/common.h
+@@ -27,6 +27,7 @@ void ath79_ddr_wb_flush(unsigned int reg
+ void ath79_gpio_function_enable(u32 mask);
+ void ath79_gpio_function_disable(u32 mask);
+ void ath79_gpio_function_setup(u32 set, u32 clear);
++void ath79_gpio_output_select(unsigned gpio, u8 val);
+ void ath79_gpio_init(void);
+ 
+ #endif /* __ATH79_COMMON_H */
+--- a/arch/mips/ath79/gpio.c
++++ b/arch/mips/ath79/gpio.c
+@@ -180,6 +180,34 @@ void ath79_gpio_function_disable(u32 mas
+ 	ath79_gpio_function_setup(0, mask);
+ }
+ 
++void __init ath79_gpio_output_select(unsigned gpio, u8 val)
++{
++	void __iomem *base = ath79_gpio_base;
++	unsigned long flags;
++	unsigned int reg;
++	u32 t, s;
++
++	BUG_ON(!soc_is_ar934x());
++
++	if (gpio >= AR934X_GPIO_COUNT)
++		return;
++
++	reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
++	s = 8 * (gpio % 4);
++
++	spin_lock_irqsave(&ath79_gpio_lock, flags);
++
++	t = __raw_readl(base + reg);
++	t &= ~(0xff << s);
++	t |= val << s;
++	__raw_writel(t, base + reg);
++
++	/* flush write */
++	(void) __raw_readl(base + reg);
++
++	spin_unlock_irqrestore(&ath79_gpio_lock, flags);
++}
++
+ void __init ath79_gpio_init(void)
+ {
+ 	int err;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/506-MIPS-ath79-prom-parse-redboot-args.patch b/trunk/target/linux/ar71xx/patches-3.14/506-MIPS-ath79-prom-parse-redboot-args.patch
new file mode 100644
index 00000000..aab959b9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/506-MIPS-ath79-prom-parse-redboot-args.patch
@@ -0,0 +1,86 @@
+--- a/arch/mips/ath79/prom.c
++++ b/arch/mips/ath79/prom.c
+@@ -19,6 +19,8 @@
+ 
+ #include "common.h"
+ 
++static char ath79_cmdline_buf[COMMAND_LINE_SIZE] __initdata;
++
+ static inline int is_valid_ram_addr(void *addr)
+ {
+ 	if (((u32) addr > KSEG0) &&
+@@ -32,6 +34,41 @@ static inline int is_valid_ram_addr(void
+ 	return 0;
+ }
+ 
++static void __init ath79_prom_append_cmdline(const char *name,
++					      const char *value)
++{
++	snprintf(ath79_cmdline_buf, sizeof(ath79_cmdline_buf),
++		 " %s=%s", name, value);
++	strlcat(arcs_cmdline, ath79_cmdline_buf, sizeof(arcs_cmdline));
++}
++
++static const char * __init ath79_prom_find_env(char **envp, const char *name)
++{
++	const char *ret = NULL;
++	int len;
++	char **p;
++
++	if (!is_valid_ram_addr(envp))
++		return NULL;
++
++	len = strlen(name);
++	for (p = envp; is_valid_ram_addr(*p); p++) {
++		if (strncmp(name, *p, len) == 0 && (*p)[len] == '=') {
++			ret = *p + len + 1;
++			break;
++		}
++
++		/* RedBoot env comes in pointer pairs - key, value */
++		if (strncmp(name, *p, len) == 0 && (*p)[len] == 0)
++			if (is_valid_ram_addr(*(++p))) {
++				ret = *p;
++				break;
++			}
++	}
++
++	return ret;
++}
++
+ static __init void ath79_prom_init_cmdline(int argc, char **argv)
+ {
+ 	int i;
+@@ -48,7 +85,32 @@ static __init void ath79_prom_init_cmdli
+ 
+ void __init prom_init(void)
+ {
++	const char *env;
++	char **envp;
++
+ 	ath79_prom_init_cmdline(fw_arg0, (char **)fw_arg1);
++
++	envp = (char **)fw_arg2;
++	if (!strstr(arcs_cmdline, "ethaddr=")) {
++		env = ath79_prom_find_env(envp, "ethaddr");
++		if (env)
++			ath79_prom_append_cmdline("ethaddr", env);
++	}
++
++	if (!strstr(arcs_cmdline, "board=")) {
++		env = ath79_prom_find_env(envp, "board");
++		if (env) {
++			/* Workaround for buggy bootloaders */
++			if (strcmp(env, "RouterStation") == 0 ||
++			    strcmp(env, "Ubiquiti AR71xx-based board") == 0)
++				env = "UBNT-RS";
++
++			if (strcmp(env, "RouterStation PRO") == 0)
++				env = "UBNT-RSPRO";
++
++			ath79_prom_append_cmdline("board", env);
++		}
++	}
+ }
+ 
+ void __init prom_free_prom_memory(void)
diff --git a/trunk/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch b/trunk/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch
new file mode 100644
index 00000000..67c1faf9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/507-MIPS-ath79-prom-add-myloader-support.patch
@@ -0,0 +1,58 @@
+--- a/arch/mips/ath79/prom.c
++++ b/arch/mips/ath79/prom.c
+@@ -16,6 +16,7 @@
+ 
+ #include <asm/bootinfo.h>
+ #include <asm/addrspace.h>
++#include <asm/fw/myloader/myloader.h>
+ 
+ #include "common.h"
+ 
+@@ -69,6 +70,37 @@ static const char * __init ath79_prom_fi
+ 	return ret;
+ }
+ 
++static int __init ath79_prom_init_myloader(void)
++{
++	struct myloader_info *mylo;
++	char mac_buf[32];
++	unsigned char *mac;
++
++	mylo = myloader_get_info();
++	if (!mylo)
++		return 0;
++
++	switch (mylo->did) {
++	case DEVID_COMPEX_WP543:
++		ath79_prom_append_cmdline("board", "WP543");
++		break;
++	case DEVID_COMPEX_WPE72:
++		ath79_prom_append_cmdline("board", "WPE72");
++		break;
++	default:
++		pr_warn("prom: unknown device id: %x\n", mylo->did);
++		return 0;
++	}
++
++	mac = mylo->macs[0];
++	snprintf(mac_buf, sizeof(mac_buf), "%02x:%02x:%02x:%02x:%02x:%02x",
++		 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
++
++	ath79_prom_append_cmdline("ethaddr", mac_buf);
++
++	return 1;
++}
++
+ static __init void ath79_prom_init_cmdline(int argc, char **argv)
+ {
+ 	int i;
+@@ -88,6 +120,9 @@ void __init prom_init(void)
+ 	const char *env;
+ 	char **envp;
+ 
++	if (ath79_prom_init_myloader())
++		return;
++
+ 	ath79_prom_init_cmdline(fw_arg0, (char **)fw_arg1);
+ 
+ 	envp = (char **)fw_arg2;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/508-MIPS-ath79-prom-image-command-line-hack.patch b/trunk/target/linux/ar71xx/patches-3.14/508-MIPS-ath79-prom-image-command-line-hack.patch
new file mode 100644
index 00000000..72a3b566
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/508-MIPS-ath79-prom-image-command-line-hack.patch
@@ -0,0 +1,57 @@
+--- a/arch/mips/ath79/prom.c
++++ b/arch/mips/ath79/prom.c
+@@ -70,6 +70,35 @@ static const char * __init ath79_prom_fi
+ 	return ret;
+ }
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++extern char __image_cmdline[];
++
++static int __init ath79_use_image_cmdline(void)
++{
++	char *p = __image_cmdline;
++	int replace = 0;
++
++	if (*p == '-') {
++		replace = 1;
++		p++;
++	}
++
++	if (*p == '\0')
++		return 0;
++
++	if (replace) {
++		strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
++	} else {
++		strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
++		strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
++	}
++
++	return 1;
++}
++#else
++static inline int ath79_use_image_cmdline(void) { return 0; }
++#endif
++
+ static int __init ath79_prom_init_myloader(void)
+ {
+ 	struct myloader_info *mylo;
+@@ -98,6 +127,8 @@ static int __init ath79_prom_init_myload
+ 
+ 	ath79_prom_append_cmdline("ethaddr", mac_buf);
+ 
++	ath79_use_image_cmdline();
++
+ 	return 1;
+ }
+ 
+@@ -105,6 +136,9 @@ static __init void ath79_prom_init_cmdli
+ {
+ 	int i;
+ 
++	if (ath79_use_image_cmdline())
++		return;
++
+ 	if (!is_valid_ram_addr(argv))
+ 		return;
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/509-MIPS-ath79-process-board-kernel-option.patch b/trunk/target/linux/ar71xx/patches-3.14/509-MIPS-ath79-process-board-kernel-option.patch
new file mode 100644
index 00000000..42f6b77e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/509-MIPS-ath79-process-board-kernel-option.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/ath79/setup.c
++++ b/arch/mips/ath79/setup.c
+@@ -229,6 +229,8 @@ void __init plat_time_init(void)
+ 	mips_hpt_frequency = cpu_clk_rate / 2;
+ }
+ 
++__setup("board=", mips_machtype_setup);
++
+ static int __init ath79_setup(void)
+ {
+ 	ath79_gpio_init();
diff --git a/trunk/target/linux/ar71xx/patches-3.14/510-MIPS-ath79-init-gpio-pin-of-wmac-device.patch b/trunk/target/linux/ar71xx/patches-3.14/510-MIPS-ath79-init-gpio-pin-of-wmac-device.patch
new file mode 100644
index 00000000..2d2235e2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/510-MIPS-ath79-init-gpio-pin-of-wmac-device.patch
@@ -0,0 +1,14 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -24,7 +24,10 @@
+ #include "dev-wmac.h"
+ 
+ static u8 ath79_wmac_mac[ETH_ALEN];
+-static struct ath9k_platform_data ath79_wmac_data;
++
++static struct ath9k_platform_data ath79_wmac_data = {
++	.led_pin = -1,
++};
+ 
+ static struct resource ath79_wmac_resources[] = {
+ 	{
diff --git a/trunk/target/linux/ar71xx/patches-3.14/520-MIPS-ath79-enable-UART-function.patch b/trunk/target/linux/ar71xx/patches-3.14/520-MIPS-ath79-enable-UART-function.patch
new file mode 100644
index 00000000..019e558a
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/520-MIPS-ath79-enable-UART-function.patch
@@ -0,0 +1,18 @@
+--- a/arch/mips/ath79/dev-common.c
++++ b/arch/mips/ath79/dev-common.c
+@@ -80,6 +80,15 @@ void __init ath79_register_uart(void)
+ 
+ 	uart_clk_rate = ath79_get_sys_clk_rate("uart");
+ 
++	if (soc_is_ar71xx())
++		ath79_gpio_function_enable(AR71XX_GPIO_FUNC_UART_EN);
++	else if (soc_is_ar724x())
++		ath79_gpio_function_enable(AR724X_GPIO_FUNC_UART_EN);
++	else if (soc_is_ar913x())
++		ath79_gpio_function_enable(AR913X_GPIO_FUNC_UART_EN);
++	else if (soc_is_ar933x())
++		ath79_gpio_function_enable(AR933X_GPIO_FUNC_UART_EN);
++
+ 	if (soc_is_ar71xx() ||
+ 	    soc_is_ar724x() ||
+ 	    soc_is_ar913x() ||
diff --git a/trunk/target/linux/ar71xx/patches-3.14/521-MIPS-ath79-enable-UART-for-early_serial.patch b/trunk/target/linux/ar71xx/patches-3.14/521-MIPS-ath79-enable-UART-for-early_serial.patch
new file mode 100644
index 00000000..a6e84c5c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/521-MIPS-ath79-enable-UART-for-early_serial.patch
@@ -0,0 +1,61 @@
+--- a/arch/mips/ath79/early_printk.c
++++ b/arch/mips/ath79/early_printk.c
+@@ -56,6 +56,46 @@ static void prom_putchar_dummy(unsigned 
+ 	/* nothing to do */
+ }
+ 
++static void prom_enable_uart(u32 id)
++{
++	void __iomem *gpio_base;
++	u32 uart_en;
++	u32 t;
++
++	switch (id) {
++	case REV_ID_MAJOR_AR71XX:
++		uart_en = AR71XX_GPIO_FUNC_UART_EN;
++		break;
++
++	case REV_ID_MAJOR_AR7240:
++	case REV_ID_MAJOR_AR7241:
++	case REV_ID_MAJOR_AR7242:
++		uart_en = AR724X_GPIO_FUNC_UART_EN;
++		break;
++
++	case REV_ID_MAJOR_AR913X:
++		uart_en = AR913X_GPIO_FUNC_UART_EN;
++		break;
++
++	case REV_ID_MAJOR_AR9330:
++	case REV_ID_MAJOR_AR9331:
++		uart_en = AR933X_GPIO_FUNC_UART_EN;
++		break;
++
++	case REV_ID_MAJOR_AR9341:
++	case REV_ID_MAJOR_AR9342:
++	case REV_ID_MAJOR_AR9344:
++		/* TODO */
++	default:
++		return;
++	}
++
++	gpio_base = (void __iomem *)(KSEG1ADDR(AR71XX_GPIO_BASE));
++	t = __raw_readl(gpio_base + AR71XX_GPIO_REG_FUNC);
++	t |= uart_en;
++	__raw_writel(t, gpio_base + AR71XX_GPIO_REG_FUNC);
++}
++
+ static void prom_putchar_init(void)
+ {
+ 	void __iomem *base;
+@@ -86,8 +126,10 @@ static void prom_putchar_init(void)
+ 
+ 	default:
+ 		_prom_putchar = prom_putchar_dummy;
+-		break;
++		return;
+ 	}
++
++	prom_enable_uart(id);
+ }
+ 
+ void prom_putchar(unsigned char ch)
diff --git a/trunk/target/linux/ar71xx/patches-3.14/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch b/trunk/target/linux/ar71xx/patches-3.14/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch
new file mode 100644
index 00000000..74928e68
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch
@@ -0,0 +1,21 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -189,3 +189,9 @@ void __init ath79_register_wmac(u8 *cal_
+ 
+ 	platform_device_register(&ath79_wmac_device);
+ }
++
++void __init ath79_register_wmac_simple(void)
++{
++	ath79_register_wmac(NULL, NULL);
++	ath79_wmac_data.eeprom_name = "soc_wmac.eeprom";
++}
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -13,5 +13,6 @@
+ #define _ATH79_DEV_WMAC_H
+ 
+ void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
++void ath79_register_wmac_simple(void);
+ 
+ #endif /* _ATH79_DEV_WMAC_H */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/523-MIPS-ath79-OTP-support.patch b/trunk/target/linux/ar71xx/patches-3.14/523-MIPS-ath79-OTP-support.patch
new file mode 100644
index 00000000..5ff1cb83
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/523-MIPS-ath79-OTP-support.patch
@@ -0,0 +1,166 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -165,6 +165,137 @@ static void qca955x_wmac_setup(void)
+ 		ath79_wmac_data.is_clk_25mhz = true;
+ }
+ 
++static bool __init
++ar93xx_wmac_otp_read_word(void __iomem *base, int addr, u32 *data)
++{
++	int timeout = 1000;
++	u32 val;
++
++	__raw_readl(base + AR9300_OTP_BASE + (4 * addr));
++	while (timeout--) {
++		val = __raw_readl(base + AR9300_OTP_STATUS);
++		if ((val & AR9300_OTP_STATUS_TYPE) == AR9300_OTP_STATUS_VALID)
++			break;
++
++		udelay(10);
++	}
++
++	if (!timeout)
++		return false;
++
++	*data = __raw_readl(base + AR9300_OTP_READ_DATA);
++	return true;
++}
++
++static bool __init
++ar93xx_wmac_otp_read(void __iomem *base, int addr, u8 *dest, int len)
++{
++	u32 data;
++	int i;
++
++	for (i = 0; i < len; i++) {
++		int offset = 8 * ((addr - i) % 4);
++
++		if (!ar93xx_wmac_otp_read_word(base, (addr - i) / 4, &data))
++			return false;
++
++		dest[i] = (data >> offset) & 0xff;
++	}
++
++	return true;
++}
++
++static bool __init
++ar93xx_wmac_otp_uncompress(void __iomem *base, int addr, int len, u8 *dest,
++			   int dest_start, int dest_len)
++{
++	int dest_bytes = 0;
++	int offset = 0;
++	int end = addr - len;
++	u8 hdr[2];
++
++	while (addr > end) {
++		if (!ar93xx_wmac_otp_read(base, addr, hdr, 2))
++			return false;
++
++		addr -= 2;
++		offset += hdr[0];
++
++		if (offset <= dest_start + dest_len &&
++		    offset + len >= dest_start) {
++			int data_offset = 0;
++			int dest_offset = 0;
++			int copy_len;
++
++			if (offset < dest_start)
++				data_offset = dest_start - offset;
++			else
++				dest_offset = offset - dest_start;
++
++			copy_len = len - data_offset;
++			if (copy_len > dest_len - dest_offset)
++				copy_len = dest_len - dest_offset;
++
++			ar93xx_wmac_otp_read(base, addr - data_offset,
++					     dest + dest_offset,
++					     copy_len);
++
++			dest_bytes += copy_len;
++		}
++		addr -= hdr[1];
++	}
++	return !!dest_bytes;
++}
++
++bool __init ar93xx_wmac_read_mac_address(u8 *dest)
++{
++	void __iomem *base;
++	bool ret = false;
++	int addr = 0x1ff;
++	unsigned int len;
++	u32 hdr_u32;
++	u8 *hdr = (u8 *) &hdr_u32;
++	u8 mac[6] = { 0x00, 0x02, 0x03, 0x04, 0x05, 0x06 };
++	int mac_start = 2, mac_end = 8;
++
++	BUG_ON(!soc_is_ar933x() && !soc_is_ar934x());
++	base = ioremap_nocache(AR933X_WMAC_BASE, AR933X_WMAC_SIZE);
++	while (addr > sizeof(hdr)) {
++		if (!ar93xx_wmac_otp_read(base, addr, hdr, sizeof(hdr)))
++			break;
++
++		if (hdr_u32 == 0 || hdr_u32 == ~0)
++			break;
++
++		len = (hdr[1] << 4) | (hdr[2] >> 4);
++		addr -= 4;
++
++		switch (hdr[0] >> 5) {
++		case 0:
++			if (len < mac_end)
++				break;
++
++			ar93xx_wmac_otp_read(base, addr - mac_start, mac, 6);
++			ret = true;
++			break;
++		case 3:
++			ret |= ar93xx_wmac_otp_uncompress(base, addr, len, mac,
++							  mac_start, 6);
++			break;
++		default:
++			break;
++		}
++
++		addr -= len + 2;
++	}
++
++	iounmap(base);
++	if (ret)
++		memcpy(dest, mac, 6);
++
++	return ret;
++}
++
+ void __init ath79_register_wmac(u8 *cal_data, u8 *mac_addr)
+ {
+ 	if (soc_is_ar913x())
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -14,5 +14,6 @@
+ 
+ void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
+ void ath79_register_wmac_simple(void);
++bool ar93xx_wmac_read_mac_address(u8 *dest);
+ 
+ #endif /* _ATH79_DEV_WMAC_H */
+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+@@ -112,6 +112,14 @@
+ #define QCA955X_EHCI1_BASE	0x1b400000
+ #define QCA955X_EHCI_SIZE	0x1000
+ 
++#define AR9300_OTP_BASE		0x14000
++#define AR9300_OTP_STATUS	0x15f18
++#define AR9300_OTP_STATUS_TYPE		0x7
++#define AR9300_OTP_STATUS_VALID		0x4
++#define AR9300_OTP_STATUS_ACCESS_BUSY	0x2
++#define AR9300_OTP_STATUS_SM_BUSY	0x1
++#define AR9300_OTP_READ_DATA	0x15f1c
++
+ /*
+  * DDR_CTRL block
+  */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch b/trunk/target/linux/ar71xx/patches-3.14/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
new file mode 100644
index 00000000..7b4b6ef2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
@@ -0,0 +1,31 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -296,6 +296,16 @@ bool __init ar93xx_wmac_read_mac_address
+ 	return ret;
+ }
+ 
++void __init ath79_wmac_disable_2ghz(void)
++{
++	ath79_wmac_data.disable_2ghz = true;
++}
++
++void __init ath79_wmac_disable_5ghz(void)
++{
++	ath79_wmac_data.disable_5ghz = true;
++}
++
+ void __init ath79_register_wmac(u8 *cal_data, u8 *mac_addr)
+ {
+ 	if (soc_is_ar913x())
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -14,6 +14,9 @@
+ 
+ void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
+ void ath79_register_wmac_simple(void);
++void ath79_wmac_disable_2ghz(void);
++void ath79_wmac_disable_5ghz(void);
++
+ bool ar93xx_wmac_read_mac_address(u8 *dest);
+ 
+ #endif /* _ATH79_DEV_WMAC_H */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/525-MIPS-ath79-enable-qca-usb-quirks.patch b/trunk/target/linux/ar71xx/patches-3.14/525-MIPS-ath79-enable-qca-usb-quirks.patch
new file mode 100644
index 00000000..696ad335
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/525-MIPS-ath79-enable-qca-usb-quirks.patch
@@ -0,0 +1,101 @@
+--- a/arch/mips/ath79/dev-usb.c
++++ b/arch/mips/ath79/dev-usb.c
+@@ -37,6 +37,8 @@ static struct usb_ehci_pdata ath79_ehci_
+ static struct usb_ehci_pdata ath79_ehci_pdata_v2 = {
+ 	.caps_offset		= 0x100,
+ 	.has_tt			= 1,
++	.qca_force_host_mode	= 1,
++	.qca_force_16bit_ptw	= 1,
+ };
+ 
+ static void __init ath79_usb_register(const char *name, int id,
+@@ -159,6 +161,9 @@ static void __init ar913x_usb_setup(void
+ 	ath79_device_reset_clear(AR913X_RESET_USB_PHY);
+ 	mdelay(10);
+ 
++	ath79_ehci_pdata_v2.qca_force_host_mode	= 0;
++	ath79_ehci_pdata_v2.qca_force_16bit_ptw	= 0;
++
+ 	ath79_usb_register("ehci-platform", -1,
+ 			   AR913X_EHCI_BASE, AR913X_EHCI_SIZE,
+ 			   ATH79_CPU_IRQ(3),
+@@ -182,14 +187,34 @@ static void __init ar933x_usb_setup(void
+ 			   &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
+ }
+ 
+-static void __init ar934x_usb_setup(void)
++static void enable_tx_tx_idp_violation_fix(unsigned base)
+ {
+-	u32 bootstrap;
++	void __iomem *phy_reg;
++	u32 t;
+ 
+-	bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
+-	if (bootstrap & AR934X_BOOTSTRAP_USB_MODE_DEVICE)
++	phy_reg = ioremap(base, 4);
++	if (!phy_reg)
+ 		return;
+ 
++	t = ioread32(phy_reg);
++	t &= ~0xff;
++	t |= 0x58;
++	iowrite32(t, phy_reg);
++
++	iounmap(phy_reg);
++}
++
++static void ar934x_usb_reset_notifier(struct platform_device *pdev)
++{
++	if (pdev->id != -1)
++		return;
++
++	enable_tx_tx_idp_violation_fix(0x18116c94);
++	dev_info(&pdev->dev, "TX-TX IDP fix enabled\n");
++}
++
++static void __init ar934x_usb_setup(void)
++{
+ 	ath79_device_reset_set(AR934X_RESET_USBSUS_OVERRIDE);
+ 	udelay(1000);
+ 
+@@ -202,14 +227,40 @@ static void __init ar934x_usb_setup(void
+ 	ath79_device_reset_clear(AR934X_RESET_USB_HOST);
+ 	udelay(1000);
+ 
++	if (ath79_soc_rev >= 3)
++		ath79_ehci_pdata_v2.reset_notifier = ar934x_usb_reset_notifier;
++
+ 	ath79_usb_register("ehci-platform", -1,
+ 			   AR934X_EHCI_BASE, AR934X_EHCI_SIZE,
+ 			   ATH79_CPU_IRQ(3),
+ 			   &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2));
+ }
+ 
++static void qca955x_usb_reset_notifier(struct platform_device *pdev)
++{
++	u32 base;
++
++	switch (pdev->id) {
++	case 0:
++		base = 0x18116c94;
++		break;
++
++	case 1:
++		base = 0x18116e54;
++		break;
++
++	default:
++		return;
++	}
++
++	enable_tx_tx_idp_violation_fix(base);
++	dev_info(&pdev->dev, "TX-TX IDP fix enabled\n");
++}
++
+ static void __init qca955x_usb_setup(void)
+ {
++	ath79_ehci_pdata_v2.reset_notifier = qca955x_usb_reset_notifier;
++
+ 	ath79_usb_register("ehci-platform", 0,
+ 			   QCA955X_EHCI0_BASE, QCA955X_EHCI_SIZE,
+ 			   ATH79_IP3_IRQ(0),
diff --git a/trunk/target/linux/ar71xx/patches-3.14/601-MIPS-ath79-add-more-register-defines.patch b/trunk/target/linux/ar71xx/patches-3.14/601-MIPS-ath79-add-more-register-defines.patch
new file mode 100644
index 00000000..2dec0209
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/601-MIPS-ath79-add-more-register-defines.patch
@@ -0,0 +1,359 @@
+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+@@ -20,6 +20,10 @@
+ #include <linux/bitops.h>
+ 
+ #define AR71XX_APB_BASE		0x18000000
++#define AR71XX_GE0_BASE		0x19000000
++#define AR71XX_GE0_SIZE		0x10000
++#define AR71XX_GE1_BASE		0x1a000000
++#define AR71XX_GE1_SIZE		0x10000
+ #define AR71XX_EHCI_BASE	0x1b000000
+ #define AR71XX_EHCI_SIZE	0x1000
+ #define AR71XX_OHCI_BASE	0x1c000000
+@@ -39,6 +43,8 @@
+ #define AR71XX_PLL_SIZE		0x100
+ #define AR71XX_RESET_BASE	(AR71XX_APB_BASE + 0x00060000)
+ #define AR71XX_RESET_SIZE	0x100
++#define AR71XX_MII_BASE		(AR71XX_APB_BASE + 0x00070000)
++#define AR71XX_MII_SIZE		0x100
+ 
+ #define AR71XX_PCI_MEM_BASE	0x10000000
+ #define AR71XX_PCI_MEM_SIZE	0x07000000
+@@ -81,15 +87,21 @@
+ 
+ #define AR933X_UART_BASE	(AR71XX_APB_BASE + 0x00020000)
+ #define AR933X_UART_SIZE	0x14
++#define AR933X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
++#define AR933X_GMAC_SIZE	0x04
+ #define AR933X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
+ #define AR933X_WMAC_SIZE	0x20000
+ #define AR933X_EHCI_BASE	0x1b000000
+ #define AR933X_EHCI_SIZE	0x1000
+ 
++#define AR934X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
++#define AR934X_GMAC_SIZE	0x14
+ #define AR934X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
+ #define AR934X_WMAC_SIZE	0x20000
+ #define AR934X_EHCI_BASE	0x1b000000
+ #define AR934X_EHCI_SIZE	0x200
++#define AR934X_NFC_BASE		0x1b000200
++#define AR934X_NFC_SIZE		0xb8
+ #define AR934X_SRIF_BASE	(AR71XX_APB_BASE + 0x00116000)
+ #define AR934X_SRIF_SIZE	0x1000
+ 
+@@ -106,11 +118,15 @@
+ #define QCA955X_PCI_CTRL_BASE1	(AR71XX_APB_BASE + 0x00280000)
+ #define QCA955X_PCI_CTRL_SIZE	0x100
+ 
++#define QCA955X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
++#define QCA955X_GMAC_SIZE	0x40
+ #define QCA955X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
+ #define QCA955X_WMAC_SIZE	0x20000
+ #define QCA955X_EHCI0_BASE	0x1b000000
+ #define QCA955X_EHCI1_BASE	0x1b400000
+ #define QCA955X_EHCI_SIZE	0x1000
++#define QCA955X_NFC_BASE	0x1b800200
++#define QCA955X_NFC_SIZE	0xb8
+ 
+ #define AR9300_OTP_BASE		0x14000
+ #define AR9300_OTP_STATUS	0x15f18
+@@ -174,6 +190,9 @@
+ #define AR71XX_AHB_DIV_SHIFT		20
+ #define AR71XX_AHB_DIV_MASK		0x7
+ 
++#define AR71XX_ETH0_PLL_SHIFT		17
++#define AR71XX_ETH1_PLL_SHIFT		19
++
+ #define AR724X_PLL_REG_CPU_CONFIG	0x00
+ #define AR724X_PLL_REG_PCIE_CONFIG	0x18
+ 
+@@ -186,6 +205,8 @@
+ #define AR724X_DDR_DIV_SHIFT		22
+ #define AR724X_DDR_DIV_MASK		0x3
+ 
++#define AR7242_PLL_REG_ETH0_INT_CLOCK	0x2c
++
+ #define AR913X_PLL_REG_CPU_CONFIG	0x00
+ #define AR913X_PLL_REG_ETH_CONFIG	0x04
+ #define AR913X_PLL_REG_ETH0_INT_CLOCK	0x14
+@@ -198,6 +219,9 @@
+ #define AR913X_AHB_DIV_SHIFT		19
+ #define AR913X_AHB_DIV_MASK		0x1
+ 
++#define AR913X_ETH0_PLL_SHIFT		20
++#define AR913X_ETH1_PLL_SHIFT		22
++
+ #define AR933X_PLL_CPU_CONFIG_REG	0x00
+ #define AR933X_PLL_CLOCK_CTRL_REG	0x08
+ 
+@@ -219,6 +243,8 @@
+ #define AR934X_PLL_CPU_CONFIG_REG		0x00
+ #define AR934X_PLL_DDR_CONFIG_REG		0x04
+ #define AR934X_PLL_CPU_DDR_CLK_CTRL_REG		0x08
++#define AR934X_PLL_SWITCH_CLOCK_CONTROL_REG	0x24
++#define AR934X_PLL_ETH_XMII_CONTROL_REG		0x2c
+ 
+ #define AR934X_PLL_CPU_CONFIG_NFRAC_SHIFT	0
+ #define AR934X_PLL_CPU_CONFIG_NFRAC_MASK	0x3f
+@@ -251,9 +277,13 @@
+ #define AR934X_PLL_CPU_DDR_CLK_CTRL_DDRCLK_FROM_DDRPLL	BIT(21)
+ #define AR934X_PLL_CPU_DDR_CLK_CTRL_AHBCLK_FROM_DDRPLL	BIT(24)
+ 
++#define AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL	BIT(6)
++
+ #define QCA955X_PLL_CPU_CONFIG_REG		0x00
+ #define QCA955X_PLL_DDR_CONFIG_REG		0x04
+ #define QCA955X_PLL_CLK_CTRL_REG		0x08
++#define QCA955X_PLL_ETH_XMII_CONTROL_REG	0x28
++#define QCA955X_PLL_ETH_SGMII_CONTROL_REG	0x48
+ 
+ #define QCA955X_PLL_CPU_CONFIG_NFRAC_SHIFT	0
+ #define QCA955X_PLL_CPU_CONFIG_NFRAC_MASK	0x3f
+@@ -378,16 +408,83 @@
+ #define AR913X_RESET_USB_HOST		BIT(5)
+ #define AR913X_RESET_USB_PHY		BIT(4)
+ 
++#define AR933X_RESET_GE1_MDIO		BIT(23)
++#define AR933X_RESET_GE0_MDIO		BIT(22)
++#define AR933X_RESET_GE1_MAC		BIT(13)
+ #define AR933X_RESET_WMAC		BIT(11)
++#define AR933X_RESET_GE0_MAC		BIT(9)
+ #define AR933X_RESET_USB_HOST		BIT(5)
+ #define AR933X_RESET_USB_PHY		BIT(4)
+ #define AR933X_RESET_USBSUS_OVERRIDE	BIT(3)
+ 
++#define AR934X_RESET_HOST		BIT(31)
++#define AR934X_RESET_SLIC		BIT(30)
++#define AR934X_RESET_HDMA		BIT(29)
++#define AR934X_RESET_EXTERNAL		BIT(28)
++#define AR934X_RESET_RTC		BIT(27)
++#define AR934X_RESET_PCIE_EP_INT	BIT(26)
++#define AR934X_RESET_CHKSUM_ACC		BIT(25)
++#define AR934X_RESET_FULL_CHIP		BIT(24)
++#define AR934X_RESET_GE1_MDIO		BIT(23)
++#define AR934X_RESET_GE0_MDIO		BIT(22)
++#define AR934X_RESET_CPU_NMI		BIT(21)
++#define AR934X_RESET_CPU_COLD		BIT(20)
++#define AR934X_RESET_HOST_RESET_INT	BIT(19)
++#define AR934X_RESET_PCIE_EP		BIT(18)
++#define AR934X_RESET_UART1		BIT(17)
++#define AR934X_RESET_DDR		BIT(16)
++#define AR934X_RESET_USB_PHY_PLL_PWD_EXT BIT(15)
++#define AR934X_RESET_NANDF		BIT(14)
++#define AR934X_RESET_GE1_MAC		BIT(13)
++#define AR934X_RESET_ETH_SWITCH_ANALOG	BIT(12)
+ #define AR934X_RESET_USB_PHY_ANALOG	BIT(11)
++#define AR934X_RESET_HOST_DMA_INT	BIT(10)
++#define AR934X_RESET_GE0_MAC		BIT(9)
++#define AR934X_RESET_ETH_SWITCH		BIT(8)
++#define AR934X_RESET_PCIE_PHY		BIT(7)
++#define AR934X_RESET_PCIE		BIT(6)
+ #define AR934X_RESET_USB_HOST		BIT(5)
+ #define AR934X_RESET_USB_PHY		BIT(4)
+ #define AR934X_RESET_USBSUS_OVERRIDE	BIT(3)
++#define AR934X_RESET_LUT		BIT(2)
++#define AR934X_RESET_MBOX		BIT(1)
++#define AR934X_RESET_I2S		BIT(0)
++
++#define QCA955X_RESET_HOST		BIT(31)
++#define QCA955X_RESET_SLIC		BIT(30)
++#define QCA955X_RESET_HDMA		BIT(29)
++#define QCA955X_RESET_EXTERNAL		BIT(28)
++#define QCA955X_RESET_RTC		BIT(27)
++#define QCA955X_RESET_PCIE_EP_INT	BIT(26)
++#define QCA955X_RESET_CHKSUM_ACC	BIT(25)
++#define QCA955X_RESET_FULL_CHIP		BIT(24)
++#define QCA955X_RESET_GE1_MDIO		BIT(23)
++#define QCA955X_RESET_GE0_MDIO		BIT(22)
++#define QCA955X_RESET_CPU_NMI		BIT(21)
++#define QCA955X_RESET_CPU_COLD		BIT(20)
++#define QCA955X_RESET_HOST_RESET_INT	BIT(19)
++#define QCA955X_RESET_PCIE_EP		BIT(18)
++#define QCA955X_RESET_UART1		BIT(17)
++#define QCA955X_RESET_DDR		BIT(16)
++#define QCA955X_RESET_USB_PHY_PLL_PWD_EXT BIT(15)
++#define QCA955X_RESET_NANDF		BIT(14)
++#define QCA955X_RESET_GE1_MAC		BIT(13)
++#define QCA955X_RESET_SGMII_ANALOG	BIT(12)
++#define QCA955X_RESET_USB_PHY_ANALOG	BIT(11)
++#define QCA955X_RESET_HOST_DMA_INT	BIT(10)
++#define QCA955X_RESET_GE0_MAC		BIT(9)
++#define QCA955X_RESET_SGMII		BIT(8)
++#define QCA955X_RESET_PCIE_PHY		BIT(7)
++#define QCA955X_RESET_PCIE		BIT(6)
++#define QCA955X_RESET_USB_HOST		BIT(5)
++#define QCA955X_RESET_USB_PHY		BIT(4)
++#define QCA955X_RESET_USBSUS_OVERRIDE	BIT(3)
++#define QCA955X_RESET_LUT		BIT(2)
++#define QCA955X_RESET_MBOX		BIT(1)
++#define QCA955X_RESET_I2S		BIT(0)
+ 
++#define AR933X_BOOTSTRAP_MDIO_GPIO_EN	BIT(18)
++#define AR933X_BOOTSTRAP_EEPBUSY	BIT(4)
+ #define AR933X_BOOTSTRAP_REF_CLK_40	BIT(0)
+ 
+ #define AR934X_BOOTSTRAP_SW_OPTION8	BIT(23)
+@@ -529,6 +626,12 @@
+ #define AR71XX_GPIO_REG_INT_ENABLE	0x24
+ #define AR71XX_GPIO_REG_FUNC		0x28
+ 
++#define AR934X_GPIO_REG_OUT_FUNC0	0x2c
++#define AR934X_GPIO_REG_OUT_FUNC1	0x30
++#define AR934X_GPIO_REG_OUT_FUNC2	0x34
++#define AR934X_GPIO_REG_OUT_FUNC3	0x38
++#define AR934X_GPIO_REG_OUT_FUNC4	0x3c
++#define AR934X_GPIO_REG_OUT_FUNC5	0x40
+ #define AR934X_GPIO_REG_FUNC		0x6c
+ 
+ #define AR71XX_GPIO_COUNT		16
+@@ -560,4 +663,149 @@
+ #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT	13
+ #define AR934X_SRIF_DPLL2_OUTDIV_MASK	0x7
+ 
++#define AR71XX_GPIO_FUNC_STEREO_EN		BIT(17)
++#define AR71XX_GPIO_FUNC_SLIC_EN		BIT(16)
++#define AR71XX_GPIO_FUNC_SPI_CS2_EN		BIT(13)
++#define AR71XX_GPIO_FUNC_SPI_CS1_EN		BIT(12)
++#define AR71XX_GPIO_FUNC_UART_EN		BIT(8)
++#define AR71XX_GPIO_FUNC_USB_OC_EN		BIT(4)
++#define AR71XX_GPIO_FUNC_USB_CLK_EN		BIT(0)
++
++#define AR724X_GPIO_FUNC_GE0_MII_CLK_EN		BIT(19)
++#define AR724X_GPIO_FUNC_SPI_EN			BIT(18)
++#define AR724X_GPIO_FUNC_SPI_CS_EN2		BIT(14)
++#define AR724X_GPIO_FUNC_SPI_CS_EN1		BIT(13)
++#define AR724X_GPIO_FUNC_CLK_OBS5_EN		BIT(12)
++#define AR724X_GPIO_FUNC_CLK_OBS4_EN		BIT(11)
++#define AR724X_GPIO_FUNC_CLK_OBS3_EN		BIT(10)
++#define AR724X_GPIO_FUNC_CLK_OBS2_EN		BIT(9)
++#define AR724X_GPIO_FUNC_CLK_OBS1_EN		BIT(8)
++#define AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN	BIT(7)
++#define AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN	BIT(6)
++#define AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN	BIT(5)
++#define AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN	BIT(4)
++#define AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN	BIT(3)
++#define AR724X_GPIO_FUNC_UART_RTS_CTS_EN	BIT(2)
++#define AR724X_GPIO_FUNC_UART_EN		BIT(1)
++#define AR724X_GPIO_FUNC_JTAG_DISABLE		BIT(0)
++
++#define AR913X_GPIO_FUNC_WMAC_LED_EN		BIT(22)
++#define AR913X_GPIO_FUNC_EXP_PORT_CS_EN		BIT(21)
++#define AR913X_GPIO_FUNC_I2S_REFCLKEN		BIT(20)
++#define AR913X_GPIO_FUNC_I2S_MCKEN		BIT(19)
++#define AR913X_GPIO_FUNC_I2S1_EN		BIT(18)
++#define AR913X_GPIO_FUNC_I2S0_EN		BIT(17)
++#define AR913X_GPIO_FUNC_SLIC_EN		BIT(16)
++#define AR913X_GPIO_FUNC_UART_RTSCTS_EN		BIT(9)
++#define AR913X_GPIO_FUNC_UART_EN		BIT(8)
++#define AR913X_GPIO_FUNC_USB_CLK_EN		BIT(4)
++
++#define AR933X_GPIO_FUNC_SPDIF2TCK		BIT(31)
++#define AR933X_GPIO_FUNC_SPDIF_EN		BIT(30)
++#define AR933X_GPIO_FUNC_I2SO_22_18_EN		BIT(29)
++#define AR933X_GPIO_FUNC_I2S_MCK_EN		BIT(27)
++#define AR933X_GPIO_FUNC_I2SO_EN		BIT(26)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED_DUPL	BIT(25)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED_COLL	BIT(24)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED_ACT	BIT(23)
++#define AR933X_GPIO_FUNC_SPI_EN			BIT(18)
++#define AR933X_GPIO_FUNC_SPI_CS_EN2		BIT(14)
++#define AR933X_GPIO_FUNC_SPI_CS_EN1		BIT(13)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN	BIT(7)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN	BIT(6)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN	BIT(5)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN	BIT(4)
++#define AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN	BIT(3)
++#define AR933X_GPIO_FUNC_UART_RTS_CTS_EN	BIT(2)
++#define AR933X_GPIO_FUNC_UART_EN		BIT(1)
++#define AR933X_GPIO_FUNC_JTAG_DISABLE		BIT(0)
++
++#define AR934X_GPIO_FUNC_CLK_OBS7_EN		BIT(9)
++#define AR934X_GPIO_FUNC_CLK_OBS6_EN		BIT(8)
++#define AR934X_GPIO_FUNC_CLK_OBS5_EN		BIT(7)
++#define AR934X_GPIO_FUNC_CLK_OBS4_EN		BIT(6)
++#define AR934X_GPIO_FUNC_CLK_OBS3_EN		BIT(5)
++#define AR934X_GPIO_FUNC_CLK_OBS2_EN		BIT(4)
++#define AR934X_GPIO_FUNC_CLK_OBS1_EN		BIT(3)
++#define AR934X_GPIO_FUNC_CLK_OBS0_EN		BIT(2)
++#define AR934X_GPIO_FUNC_JTAG_DISABLE		BIT(1)
++
++#define AR934X_GPIO_OUT_GPIO		0
++#define AR934X_GPIO_OUT_SPI_CS1	7
++#define AR934X_GPIO_OUT_LED_LINK0	41
++#define AR934X_GPIO_OUT_LED_LINK1	42
++#define AR934X_GPIO_OUT_LED_LINK2	43
++#define AR934X_GPIO_OUT_LED_LINK3	44
++#define AR934X_GPIO_OUT_LED_LINK4	45
++#define AR934X_GPIO_OUT_EXT_LNA0	46
++#define AR934X_GPIO_OUT_EXT_LNA1	47
++
++/*
++ * MII_CTRL block
++ */
++#define AR71XX_MII_REG_MII0_CTRL	0x00
++#define AR71XX_MII_REG_MII1_CTRL	0x04
++
++#define AR71XX_MII_CTRL_IF_MASK		3
++#define AR71XX_MII_CTRL_SPEED_SHIFT	4
++#define AR71XX_MII_CTRL_SPEED_MASK	3
++#define AR71XX_MII_CTRL_SPEED_10	0
++#define AR71XX_MII_CTRL_SPEED_100	1
++#define AR71XX_MII_CTRL_SPEED_1000	2
++
++#define AR71XX_MII0_CTRL_IF_GMII	0
++#define AR71XX_MII0_CTRL_IF_MII		1
++#define AR71XX_MII0_CTRL_IF_RGMII	2
++#define AR71XX_MII0_CTRL_IF_RMII	3
++
++#define AR71XX_MII1_CTRL_IF_RGMII	0
++#define AR71XX_MII1_CTRL_IF_RMII	1
++
++/*
++ * AR933X GMAC interface
++ */
++#define AR933X_GMAC_REG_ETH_CFG		0x00
++
++#define AR933X_ETH_CFG_RGMII_GE0	BIT(0)
++#define AR933X_ETH_CFG_MII_GE0		BIT(1)
++#define AR933X_ETH_CFG_GMII_GE0		BIT(2)
++#define AR933X_ETH_CFG_MII_GE0_MASTER	BIT(3)
++#define AR933X_ETH_CFG_MII_GE0_SLAVE	BIT(4)
++#define AR933X_ETH_CFG_MII_GE0_ERR_EN	BIT(5)
++#define AR933X_ETH_CFG_SW_PHY_SWAP	BIT(7)
++#define AR933X_ETH_CFG_SW_PHY_ADDR_SWAP	BIT(8)
++#define AR933X_ETH_CFG_RMII_GE0		BIT(9)
++#define AR933X_ETH_CFG_RMII_GE0_SPD_10	0
++#define AR933X_ETH_CFG_RMII_GE0_SPD_100	BIT(10)
++
++/*
++ * AR934X GMAC Interface
++ */
++#define AR934X_GMAC_REG_ETH_CFG		0x00
++
++#define AR934X_ETH_CFG_RGMII_GMAC0	BIT(0)
++#define AR934X_ETH_CFG_MII_GMAC0	BIT(1)
++#define AR934X_ETH_CFG_GMII_GMAC0	BIT(2)
++#define AR934X_ETH_CFG_MII_GMAC0_MASTER	BIT(3)
++#define AR934X_ETH_CFG_MII_GMAC0_SLAVE	BIT(4)
++#define AR934X_ETH_CFG_MII_GMAC0_ERR_EN	BIT(5)
++#define AR934X_ETH_CFG_SW_ONLY_MODE	BIT(6)
++#define AR934X_ETH_CFG_SW_PHY_SWAP	BIT(7)
++#define AR934X_ETH_CFG_SW_APB_ACCESS	BIT(9)
++#define AR934X_ETH_CFG_RMII_GMAC0	BIT(10)
++#define AR933X_ETH_CFG_MII_CNTL_SPEED	BIT(11)
++#define AR934X_ETH_CFG_RMII_GMAC0_MASTER BIT(12)
++#define AR933X_ETH_CFG_SW_ACC_MSB_FIRST	BIT(13)
++#define AR934X_ETH_CFG_RXD_DELAY        BIT(14)
++#define AR934X_ETH_CFG_RDV_DELAY        BIT(16)
++
++/*
++ * QCA955X GMAC Interface
++ */
++
++#define QCA955X_GMAC_REG_ETH_CFG	0x00
++
++#define QCA955X_ETH_CFG_RGMII_EN	BIT(0)
++#define QCA955X_ETH_CFG_GE0_SGMII	BIT(6)
++
+ #endif /* __ASM_MACH_AR71XX_REGS_H */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/602-MIPS-ath79-add-openwrt-stuff.patch b/trunk/target/linux/ar71xx/patches-3.14/602-MIPS-ath79-add-openwrt-stuff.patch
new file mode 100644
index 00000000..da284e2b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/602-MIPS-ath79-add-openwrt-stuff.patch
@@ -0,0 +1,76 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -106,6 +106,20 @@ config SOC_QCA955X
+ 	select PCI_AR724X if PCI
+ 	def_bool n
+ 
++config ATH79_DEV_M25P80
++	select ATH79_DEV_SPI
++	def_bool n
++
++config ATH79_DEV_AP9X_PCI
++	select ATH79_PCI_ATH9K_FIXUP
++	def_bool n
++
++config ATH79_DEV_DSA
++	def_bool n
++
++config ATH79_DEV_ETH
++	def_bool n
++
+ config PCI_AR724X
+ 	def_bool n
+ 
+@@ -115,6 +129,10 @@ config ATH79_DEV_GPIO_BUTTONS
+ config ATH79_DEV_LEDS_GPIO
+ 	def_bool n
+ 
++config ATH79_DEV_NFC
++	depends on (SOC_AR934X || SOC_QCA955X)
++	def_bool n
++
+ config ATH79_DEV_SPI
+ 	def_bool n
+ 
+@@ -125,4 +143,13 @@ config ATH79_DEV_WMAC
+ 	depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA955X)
+ 	def_bool n
+ 
++config ATH79_NVRAM
++	def_bool n
++
++config ATH79_PCI_ATH9K_FIXUP
++	def_bool n
++
++config ATH79_ROUTERBOOT
++	def_bool n
++
+ endif
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -17,13 +17,25 @@ obj-$(CONFIG_PCI)			+= pci.o
+ # Devices
+ #
+ obj-y					+= dev-common.o
++obj-$(CONFIG_ATH79_DEV_AP9X_PCI)	+= dev-ap9x-pci.o
++obj-$(CONFIG_ATH79_DEV_DSA)		+= dev-dsa.o
++obj-$(CONFIG_ATH79_DEV_ETH)		+= dev-eth.o
+ obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o
+ obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)	+= dev-leds-gpio.o
++obj-$(CONFIG_ATH79_DEV_M25P80)		+= dev-m25p80.o
++obj-$(CONFIG_ATH79_DEV_NFC)		+= dev-nfc.o
+ obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o
+ obj-$(CONFIG_ATH79_DEV_USB)		+= dev-usb.o
+ obj-$(CONFIG_ATH79_DEV_WMAC)		+= dev-wmac.o
+ 
+ #
++# Miscellaneous objects
++#
++obj-$(CONFIG_ATH79_NVRAM)		+= nvram.o
++obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP)	+= pci-ath9k-fixup.o
++obj-$(CONFIG_ATH79_ROUTERBOOT)		+= routerboot.o
++
++#
+ # Machines
+ #
+ obj-$(CONFIG_ATH79_MACH_AP121)		+= mach-ap121.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/603-MIPS-ath79-ap121-fixes.patch b/trunk/target/linux/ar71xx/patches-3.14/603-MIPS-ath79-ap121-fixes.patch
new file mode 100644
index 00000000..b385b9e0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/603-MIPS-ath79-ap121-fixes.patch
@@ -0,0 +1,163 @@
+--- a/arch/mips/ath79/mach-ap121.c
++++ b/arch/mips/ath79/mach-ap121.c
+@@ -1,19 +1,21 @@
+ /*
+  *  Atheros AP121 board support
+  *
+- *  Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
++ *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify it
+  *  under the terms of the GNU General Public License version 2 as published
+  *  by the Free Software Foundation.
+  */
+ 
+-#include "machtypes.h"
++#include "dev-eth.h"
+ #include "dev-gpio-buttons.h"
+ #include "dev-leds-gpio.h"
++#include "dev-m25p80.h"
+ #include "dev-spi.h"
+ #include "dev-usb.h"
+ #include "dev-wmac.h"
++#include "machtypes.h"
+ 
+ #define AP121_GPIO_LED_WLAN		0
+ #define AP121_GPIO_LED_USB		1
+@@ -24,7 +26,14 @@
+ #define AP121_KEYS_POLL_INTERVAL	20	/* msecs */
+ #define AP121_KEYS_DEBOUNCE_INTERVAL	(3 * AP121_KEYS_POLL_INTERVAL)
+ 
+-#define AP121_CAL_DATA_ADDR	0x1fff1000
++#define AP121_MAC0_OFFSET		0x0000
++#define AP121_MAC1_OFFSET		0x0006
++#define AP121_CALDATA_OFFSET		0x1000
++#define AP121_WMAC_MAC_OFFSET		0x1002
++
++#define AP121_MINI_GPIO_LED_WLAN	0
++#define AP121_MINI_GPIO_BTN_JUMPSTART	12
++#define AP121_MINI_GPIO_BTN_RESET	11
+ 
+ static struct gpio_led ap121_leds_gpio[] __initdata = {
+ 	{
+@@ -58,41 +67,78 @@ static struct gpio_keys_button ap121_gpi
+ 	}
+ };
+ 
+-static struct ath79_spi_controller_data ap121_spi0_data = {
+-	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+-	.cs_line = 0,
++static struct gpio_led ap121_mini_leds_gpio[] __initdata = {
++	{
++		.name		= "ap121:green:wlan",
++		.gpio		= AP121_MINI_GPIO_LED_WLAN,
++		.active_low	= 0,
++	},
+ };
+ 
+-static struct spi_board_info ap121_spi_info[] = {
++static struct gpio_keys_button ap121_mini_gpio_keys[] __initdata = {
+ 	{
+-		.bus_num	= 0,
+-		.chip_select	= 0,
+-		.max_speed_hz	= 25000000,
+-		.modalias	= "mx25l1606e",
+-		.controller_data = &ap121_spi0_data,
++		.desc		= "jumpstart button",
++		.type		= EV_KEY,
++		.code		= KEY_WPS_BUTTON,
++		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
++		.gpio		= AP121_MINI_GPIO_BTN_JUMPSTART,
++		.active_low	= 1,
++	},
++	{
++		.desc		= "reset button",
++		.type		= EV_KEY,
++		.code		= KEY_RESTART,
++		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
++		.gpio		= AP121_MINI_GPIO_BTN_RESET,
++		.active_low	= 1,
+ 	}
+ };
+ 
+-static struct ath79_spi_platform_data ap121_spi_data = {
+-	.bus_num	= 0,
+-	.num_chipselect = 1,
+-};
++static void __init ap121_common_setup(void)
++{
++	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
++
++	ath79_register_m25p80(NULL);
++	ath79_register_wmac(art + AP121_CALDATA_OFFSET,
++			    art + AP121_WMAC_MAC_OFFSET);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, art + AP121_MAC0_OFFSET, 0);
++	ath79_init_mac(ath79_eth1_data.mac_addr, art + AP121_MAC1_OFFSET, 0);
++
++	ath79_register_mdio(0, 0x0);
++
++	/* LAN ports */
++	ath79_register_eth(1);
++
++	/* WAN port */
++	ath79_register_eth(0);
++}
+ 
+ static void __init ap121_setup(void)
+ {
+-	u8 *cal_data = (u8 *) KSEG1ADDR(AP121_CAL_DATA_ADDR);
++	ap121_common_setup();
+ 
+ 	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_leds_gpio),
+ 				 ap121_leds_gpio);
+ 	ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,
+ 					ARRAY_SIZE(ap121_gpio_keys),
+ 					ap121_gpio_keys);
+-
+-	ath79_register_spi(&ap121_spi_data, ap121_spi_info,
+-			   ARRAY_SIZE(ap121_spi_info));
+ 	ath79_register_usb();
+-	ath79_register_wmac(cal_data, NULL);
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",
+ 	     ap121_setup);
++
++static void __init ap121_mini_setup(void)
++{
++	ap121_common_setup();
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_mini_leds_gpio),
++				 ap121_mini_leds_gpio);
++	ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,
++					ARRAY_SIZE(ap121_mini_gpio_keys),
++					ap121_mini_gpio_keys);
++}
++
++MIPS_MACHINE(ATH79_MACH_AP121_MINI, "AP121-MINI", "Atheros AP121-MINI",
++	     ap121_mini_setup);
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -5,9 +5,10 @@ menu "Atheros AR71XX/AR724X/AR913X machi
+ config ATH79_MACH_AP121
+ 	bool "Atheros AP121 reference board"
+ 	select SOC_AR933X
++	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+-	select ATH79_DEV_SPI
++	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 	help
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -17,6 +17,7 @@
+ enum ath79_mach_type {
+ 	ATH79_MACH_GENERIC = 0,
+ 	ATH79_MACH_AP121,		/* Atheros AP121 reference board */
++	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */
+ 	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */
+ 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */
+ 	ATH79_MACH_DB120,		/* Atheros DB120 reference board */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/604-MIPS-ath79-ap81-fixes.patch b/trunk/target/linux/ar71xx/patches-3.14/604-MIPS-ath79-ap81-fixes.patch
new file mode 100644
index 00000000..bbfdd49d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/604-MIPS-ath79-ap81-fixes.patch
@@ -0,0 +1,128 @@
+--- a/arch/mips/ath79/mach-ap81.c
++++ b/arch/mips/ath79/mach-ap81.c
+@@ -9,12 +9,16 @@
+  *  by the Free Software Foundation.
+  */
+ 
+-#include "machtypes.h"
+-#include "dev-wmac.h"
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
++
++#include "dev-eth.h"
+ #include "dev-gpio-buttons.h"
+ #include "dev-leds-gpio.h"
+-#include "dev-spi.h"
++#include "dev-m25p80.h"
+ #include "dev-usb.h"
++#include "dev-wmac.h"
++#include "machtypes.h"
+ 
+ #define AP81_GPIO_LED_STATUS	1
+ #define AP81_GPIO_LED_AOSS	3
+@@ -29,6 +33,37 @@
+ 
+ #define AP81_CAL_DATA_ADDR	0x1fff1000
+ 
++static struct mtd_partition ap81_partitions[] = {
++	{
++		.name		= "u-boot",
++		.offset		= 0,
++		.size		= 0x040000,
++		.mask_flags	= MTD_WRITEABLE,
++	}, {
++		.name		= "u-boot-env",
++		.offset		= 0x040000,
++		.size		= 0x010000,
++	}, {
++		.name		= "rootfs",
++		.offset		= 0x050000,
++		.size		= 0x500000,
++	}, {
++		.name		= "uImage",
++		.offset		= 0x550000,
++		.size		= 0x100000,
++	}, {
++		.name		= "ART",
++		.offset		= 0x650000,
++		.size		= 0x1b0000,
++		.mask_flags	= MTD_WRITEABLE,
++	}
++};
++
++static struct flash_platform_data ap81_flash_data = {
++	.parts		= ap81_partitions,
++	.nr_parts	= ARRAY_SIZE(ap81_partitions),
++};
++
+ static struct gpio_led ap81_leds_gpio[] __initdata = {
+ 	{
+ 		.name		= "ap81:green:status",
+@@ -67,26 +102,6 @@ static struct gpio_keys_button ap81_gpio
+ 	}
+ };
+ 
+-static struct ath79_spi_controller_data ap81_spi0_data = {
+-	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+-	.cs_line = 0,
+-};
+-
+-static struct spi_board_info ap81_spi_info[] = {
+-	{
+-		.bus_num	= 0,
+-		.chip_select	= 0,
+-		.max_speed_hz	= 25000000,
+-		.modalias	= "m25p64",
+-		.controller_data = &ap81_spi0_data,
+-	}
+-};
+-
+-static struct ath79_spi_platform_data ap81_spi_data = {
+-	.bus_num	= 0,
+-	.num_chipselect = 1,
+-};
+-
+ static void __init ap81_setup(void)
+ {
+ 	u8 *cal_data = (u8 *) KSEG1ADDR(AP81_CAL_DATA_ADDR);
+@@ -96,10 +111,24 @@ static void __init ap81_setup(void)
+ 	ath79_register_gpio_keys_polled(-1, AP81_KEYS_POLL_INTERVAL,
+ 					ARRAY_SIZE(ap81_gpio_keys),
+ 					ap81_gpio_keys);
+-	ath79_register_spi(&ap81_spi_data, ap81_spi_info,
+-			   ARRAY_SIZE(ap81_spi_info));
++	ath79_register_m25p80(&ap81_flash_data);
+ 	ath79_register_wmac(cal_data, NULL);
+ 	ath79_register_usb();
++
++	ath79_register_mdio(0, 0x0);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, cal_data, 0);
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
++	ath79_eth0_data.speed = SPEED_100;
++	ath79_eth0_data.duplex = DUPLEX_FULL;
++	ath79_eth0_data.has_ar8216 = 1;
++
++	ath79_init_mac(ath79_eth1_data.mac_addr, cal_data, 1);
++	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
++	ath79_eth1_data.phy_mask = 0x10;
++
++	ath79_register_eth(0);
++	ath79_register_eth(1);
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board",
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -30,9 +30,10 @@ config ATH79_MACH_AP136
+ config ATH79_MACH_AP81
+ 	bool "Atheros AP81 reference board"
+ 	select SOC_AR913X
++	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+-	select ATH79_DEV_SPI
++	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 	help
diff --git a/trunk/target/linux/ar71xx/patches-3.14/605-MIPS-ath79-db120-fixes.patch b/trunk/target/linux/ar71xx/patches-3.14/605-MIPS-ath79-db120-fixes.patch
new file mode 100644
index 00000000..44f2b037
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/605-MIPS-ath79-db120-fixes.patch
@@ -0,0 +1,209 @@
+--- a/arch/mips/ath79/mach-db120.c
++++ b/arch/mips/ath79/mach-db120.c
+@@ -2,7 +2,7 @@
+  * Atheros DB120 reference board support
+  *
+  * Copyright (c) 2011 Qualcomm Atheros
+- * Copyright (c) 2011 Gabor Juhos <juhosg@openwrt.org>
++ * Copyright (c) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -19,16 +19,26 @@
+  */
+ 
+ #include <linux/pci.h>
++#include <linux/phy.h>
++#include <linux/platform_device.h>
+ #include <linux/ath9k_platform.h>
++#include <linux/ar8216_platform.h>
+ 
+-#include "machtypes.h"
++#include <asm/mach-ath79/ar71xx_regs.h>
++
++#include "common.h"
++#include "dev-ap9x-pci.h"
++#include "dev-eth.h"
+ #include "dev-gpio-buttons.h"
+ #include "dev-leds-gpio.h"
++#include "dev-m25p80.h"
++#include "dev-nfc.h"
+ #include "dev-spi.h"
+ #include "dev-usb.h"
+ #include "dev-wmac.h"
+-#include "pci.h"
++#include "machtypes.h"
+ 
++#define DB120_GPIO_LED_USB		11
+ #define DB120_GPIO_LED_WLAN_5G		12
+ #define DB120_GPIO_LED_WLAN_2G		13
+ #define DB120_GPIO_LED_STATUS		14
+@@ -39,8 +49,10 @@
+ #define DB120_KEYS_POLL_INTERVAL	20	/* msecs */
+ #define DB120_KEYS_DEBOUNCE_INTERVAL	(3 * DB120_KEYS_POLL_INTERVAL)
+ 
+-#define DB120_WMAC_CALDATA_OFFSET 0x1000
+-#define DB120_PCIE_CALDATA_OFFSET 0x5000
++#define DB120_MAC0_OFFSET		0
++#define DB120_MAC1_OFFSET		6
++#define DB120_WMAC_CALDATA_OFFSET	0x1000
++#define DB120_PCIE_CALDATA_OFFSET	0x5000
+ 
+ static struct gpio_led db120_leds_gpio[] __initdata = {
+ 	{
+@@ -63,6 +75,11 @@ static struct gpio_led db120_leds_gpio[]
+ 		.gpio		= DB120_GPIO_LED_WLAN_2G,
+ 		.active_low	= 1,
+ 	},
++	{
++		.name		= "db120:green:usb",
++		.gpio		= DB120_GPIO_LED_USB,
++		.active_low	= 1,
++	}
+ };
+ 
+ static struct gpio_keys_button db120_gpio_keys[] __initdata = {
+@@ -76,66 +93,85 @@ static struct gpio_keys_button db120_gpi
+ 	},
+ };
+ 
+-static struct ath79_spi_controller_data db120_spi0_data = {
+-	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+-	.cs_line = 0,
++static struct ar8327_pad_cfg db120_ar8327_pad0_cfg = {
++	.mode = AR8327_PAD_MAC_RGMII,
++	.txclk_delay_en = true,
++	.rxclk_delay_en = true,
++	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
++	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+ };
+ 
+-static struct spi_board_info db120_spi_info[] = {
+-	{
+-		.bus_num	= 0,
+-		.chip_select	= 0,
+-		.max_speed_hz	= 25000000,
+-		.modalias	= "s25sl064a",
+-		.controller_data = &db120_spi0_data,
+-	}
++static struct ar8327_led_cfg db120_ar8327_led_cfg = {
++	.led_ctrl0 = 0x00000000,
++	.led_ctrl1 = 0xc737c737,
++	.led_ctrl2 = 0x00000000,
++	.led_ctrl3 = 0x00c30c00,
++	.open_drain = true,
+ };
+ 
+-static struct ath79_spi_platform_data db120_spi_data = {
+-	.bus_num	= 0,
+-	.num_chipselect = 1,
++static struct ar8327_platform_data db120_ar8327_data = {
++	.pad0_cfg = &db120_ar8327_pad0_cfg,
++	.port0_cfg = {
++		.force_link = 1,
++		.speed = AR8327_PORT_SPEED_1000,
++		.duplex = 1,
++		.txpause = 1,
++		.rxpause = 1,
++	},
++	.led_cfg = &db120_ar8327_led_cfg,
+ };
+ 
+-#ifdef CONFIG_PCI
+-static struct ath9k_platform_data db120_ath9k_data;
+-
+-static int db120_pci_plat_dev_init(struct pci_dev *dev)
+-{
+-	switch (PCI_SLOT(dev->devfn)) {
+-	case 0:
+-		dev->dev.platform_data = &db120_ath9k_data;
+-		break;
+-	}
+-
+-	return 0;
+-}
+-
+-static void __init db120_pci_init(u8 *eeprom)
+-{
+-	memcpy(db120_ath9k_data.eeprom_data, eeprom,
+-	       sizeof(db120_ath9k_data.eeprom_data));
+-
+-	ath79_pci_set_plat_dev_init(db120_pci_plat_dev_init);
+-	ath79_register_pci();
+-}
+-#else
+-static inline void db120_pci_init(void) {}
+-#endif /* CONFIG_PCI */
++static struct mdio_board_info db120_mdio0_info[] = {
++	{
++		.bus_id = "ag71xx-mdio.0",
++		.phy_addr = 0,
++		.platform_data = &db120_ar8327_data,
++	},
++};
+ 
+ static void __init db120_setup(void)
+ {
+ 	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+ 
++	ath79_gpio_output_select(DB120_GPIO_LED_USB, AR934X_GPIO_OUT_GPIO);
++	ath79_register_m25p80(NULL);
++
+ 	ath79_register_leds_gpio(-1, ARRAY_SIZE(db120_leds_gpio),
+ 				 db120_leds_gpio);
+ 	ath79_register_gpio_keys_polled(-1, DB120_KEYS_POLL_INTERVAL,
+ 					ARRAY_SIZE(db120_gpio_keys),
+ 					db120_gpio_keys);
+-	ath79_register_spi(&db120_spi_data, db120_spi_info,
+-			   ARRAY_SIZE(db120_spi_info));
+ 	ath79_register_usb();
+ 	ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET, NULL);
+-	db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET);
++	ap91_pci_init(art + DB120_PCIE_CALDATA_OFFSET, NULL);
++
++	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
++				   AR934X_ETH_CFG_SW_ONLY_MODE);
++
++	ath79_register_mdio(1, 0x0);
++	ath79_register_mdio(0, 0x0);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, art + DB120_MAC0_OFFSET, 0);
++
++	mdiobus_register_board_info(db120_mdio0_info,
++				    ARRAY_SIZE(db120_mdio0_info));
++
++	/* GMAC0 is connected to an AR8327 switch */
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
++	ath79_eth0_data.phy_mask = BIT(0);
++	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
++	ath79_eth0_pll_data.pll_1000 = 0x06000000;
++	ath79_register_eth(0);
++
++	/* GMAC1 is connected to the internal switch */
++	ath79_init_mac(ath79_eth1_data.mac_addr, art + DB120_MAC1_OFFSET, 0);
++	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
++	ath79_eth1_data.speed = SPEED_1000;
++	ath79_eth1_data.duplex = DUPLEX_FULL;
++
++	ath79_register_eth(1);
++
++	ath79_register_nfc();
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_DB120, "DB120", "Atheros DB120 reference board",
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -43,9 +43,12 @@ config ATH79_MACH_AP81
+ config ATH79_MACH_DB120
+ 	bool "Atheros DB120 reference board"
+ 	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+-	select ATH79_DEV_SPI
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_NFC
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 	help
diff --git a/trunk/target/linux/ar71xx/patches-3.14/606-MIPS-ath79-pb44-fixes.patch b/trunk/target/linux/ar71xx/patches-3.14/606-MIPS-ath79-pb44-fixes.patch
new file mode 100644
index 00000000..b38b4612
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/606-MIPS-ath79-pb44-fixes.patch
@@ -0,0 +1,153 @@
+--- a/arch/mips/ath79/mach-pb44.c
++++ b/arch/mips/ath79/mach-pb44.c
+@@ -8,23 +8,48 @@
+  *  by the Free Software Foundation.
+  */
+ 
++#include <linux/delay.h>
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/i2c.h>
+ #include <linux/i2c-gpio.h>
+ #include <linux/i2c/pcf857x.h>
++#include <linux/i2c/pcf857x.h>
++#include <linux/spi/flash.h>
++#include <linux/spi/vsc7385.h>
+ 
+-#include "machtypes.h"
++#include <asm/mach-ath79/ar71xx_regs.h>
++#include <asm/mach-ath79/ath79.h>
++
++#include "dev-eth.h"
+ #include "dev-gpio-buttons.h"
+ #include "dev-leds-gpio.h"
+ #include "dev-spi.h"
+ #include "dev-usb.h"
++#include "machtypes.h"
+ #include "pci.h"
+ 
+ #define PB44_GPIO_I2C_SCL	0
+ #define PB44_GPIO_I2C_SDA	1
+ 
++#define PB44_PCF8757_VSC7395_CS	0
++#define PB44_PCF8757_STEREO_CS	1
++#define PB44_PCF8757_SLIC_CS0	2
++#define PB44_PCF8757_SLIC_TEST	3
++#define PB44_PCF8757_SLIC_INT0	4
++#define PB44_PCF8757_SLIC_INT1	5
++#define PB44_PCF8757_SW_RESET	6
++#define PB44_PCF8757_SW_JUMP	8
++#define PB44_PCF8757_LED_JUMP1	9
++#define PB44_PCF8757_LED_JUMP2	10
++#define PB44_PCF8757_TP24	11
++#define PB44_PCF8757_TP25	12
++#define PB44_PCF8757_TP26	13
++#define PB44_PCF8757_TP27	14
++#define PB44_PCF8757_TP28	15
++
+ #define PB44_GPIO_EXP_BASE	16
++#define PB44_GPIO_VSC7395_CS	(PB44_GPIO_EXP_BASE + PB44_PCF8757_VSC7395_CS)
+ #define PB44_GPIO_SW_RESET	(PB44_GPIO_EXP_BASE + 6)
+ #define PB44_GPIO_SW_JUMP	(PB44_GPIO_EXP_BASE + 8)
+ #define PB44_GPIO_LED_JUMP1	(PB44_GPIO_EXP_BASE + 9)
+@@ -92,21 +117,66 @@ static struct ath79_spi_controller_data 
+ 	.cs_line = 0,
+ };
+ 
++static struct ath79_spi_controller_data pb44_spi1_data = {
++	.cs_type = ATH79_SPI_CS_TYPE_GPIO,
++	.cs_line = PB44_GPIO_VSC7395_CS,
++};
++
++static void pb44_vsc7395_reset(void)
++{
++	ath79_device_reset_set(AR71XX_RESET_GE1_PHY);
++	udelay(10);
++	ath79_device_reset_clear(AR71XX_RESET_GE1_PHY);
++	mdelay(50);
++}
++
++static struct vsc7385_platform_data pb44_vsc7395_data = {
++	.reset		= pb44_vsc7395_reset,
++	.ucode_name	= "vsc7395_ucode_pb44.bin",
++	.mac_cfg = {
++		.tx_ipg		= 6,
++		.bit2		= 1,
++		.clk_sel	= 0,
++	},
++};
++
++static const char *pb44_part_probes[] = {
++	"RedBoot",
++	NULL,
++};
++
++static struct flash_platform_data pb44_flash_data = {
++	.part_probes	= pb44_part_probes,
++};
++
+ static struct spi_board_info pb44_spi_info[] = {
+ 	{
+ 		.bus_num	= 0,
+ 		.chip_select	= 0,
+ 		.max_speed_hz	= 25000000,
+ 		.modalias	= "m25p64",
++		.platform_data	= &pb44_flash_data,
+ 		.controller_data = &pb44_spi0_data,
+ 	},
++	{
++		.bus_num	= 0,
++		.chip_select	= 1,
++		.max_speed_hz	= 25000000,
++		.modalias	= "spi-vsc7385",
++		.platform_data	= &pb44_vsc7395_data,
++		.controller_data = &pb44_spi1_data,
++	}
+ };
+ 
+ static struct ath79_spi_platform_data pb44_spi_data = {
+ 	.bus_num		= 0,
+-	.num_chipselect		= 1,
++	.num_chipselect		= 2,
+ };
+ 
++#define PB44_WAN_PHYMASK	BIT(0)
++#define PB44_LAN_PHYMASK	0
++#define PB44_MDIO_PHYMASK	(PB44_LAN_PHYMASK | PB44_WAN_PHYMASK)
++
+ static void __init pb44_init(void)
+ {
+ 	i2c_register_board_info(0, pb44_i2c_board_info,
+@@ -122,6 +192,22 @@ static void __init pb44_init(void)
+ 			   ARRAY_SIZE(pb44_spi_info));
+ 	ath79_register_usb();
+ 	ath79_register_pci();
++
++	ath79_register_mdio(0, ~PB44_MDIO_PHYMASK);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
++	ath79_eth0_data.phy_mask = PB44_WAN_PHYMASK;
++
++	ath79_register_eth(0);
++
++	ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1);
++	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
++	ath79_eth1_data.speed = SPEED_1000;
++	ath79_eth1_data.duplex = DUPLEX_FULL;
++	ath79_eth1_pll_data.pll_1000 = 0x110000;
++
++	ath79_register_eth(1);
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_PB44, "PB44", "Atheros PB44 reference board",
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -58,6 +58,7 @@ config ATH79_MACH_DB120
+ config ATH79_MACH_PB44
+ 	bool "Atheros PB44 reference board"
+ 	select SOC_AR71XX
++	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+ 	select ATH79_DEV_SPI
diff --git a/trunk/target/linux/ar71xx/patches-3.14/607-MIPS-ath79-ubnt-xm-fixes.patch b/trunk/target/linux/ar71xx/patches-3.14/607-MIPS-ath79-ubnt-xm-fixes.patch
new file mode 100644
index 00000000..cbbe20b4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/607-MIPS-ath79-ubnt-xm-fixes.patch
@@ -0,0 +1,109 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -70,9 +70,10 @@ config ATH79_MACH_PB44
+ config ATH79_MACH_UBNT_XM
+ 	bool "Ubiquiti Networks XM (rev 1.0) board"
+ 	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+-	select ATH79_DEV_SPI
++	select ATH79_DEV_M25P80
+ 	help
+ 	  Say 'Y' here if you want your kernel to support the
+ 	  Ubiquiti Networks XM (rev 1.0) board.
+--- a/arch/mips/ath79/mach-ubnt-xm.c
++++ b/arch/mips/ath79/mach-ubnt-xm.c
+@@ -16,10 +16,11 @@
+ 
+ #include <asm/mach-ath79/irq.h>
+ 
+-#include "machtypes.h"
++#include "dev-ap9x-pci.h"
+ #include "dev-gpio-buttons.h"
+ #include "dev-leds-gpio.h"
+-#include "dev-spi.h"
++#include "dev-m25p80.h"
++#include "machtypes.h"
+ #include "pci.h"
+ 
+ #define UBNT_XM_GPIO_LED_L1		0
+@@ -32,7 +33,7 @@
+ #define UBNT_XM_KEYS_POLL_INTERVAL	20
+ #define UBNT_XM_KEYS_DEBOUNCE_INTERVAL	(3 * UBNT_XM_KEYS_POLL_INTERVAL)
+ 
+-#define UBNT_XM_EEPROM_ADDR		(u8 *) KSEG1ADDR(0x1fff1000)
++#define UBNT_XM_EEPROM_ADDR		0x1fff1000
+ 
+ static struct gpio_led ubnt_xm_leds_gpio[] __initdata = {
+ 	{
+@@ -65,54 +66,10 @@ static struct gpio_keys_button ubnt_xm_g
+ 	}
+ };
+ 
+-static struct ath79_spi_controller_data ubnt_xm_spi0_data = {
+-	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+-	.cs_line = 0,
+-};
+-
+-static struct spi_board_info ubnt_xm_spi_info[] = {
+-	{
+-		.bus_num	= 0,
+-		.chip_select	= 0,
+-		.max_speed_hz	= 25000000,
+-		.modalias	= "mx25l6405d",
+-		.controller_data = &ubnt_xm_spi0_data,
+-	}
+-};
+-
+-static struct ath79_spi_platform_data ubnt_xm_spi_data = {
+-	.bus_num		= 0,
+-	.num_chipselect		= 1,
+-};
+-
+-#ifdef CONFIG_PCI
+-static struct ath9k_platform_data ubnt_xm_eeprom_data;
+-
+-static int ubnt_xm_pci_plat_dev_init(struct pci_dev *dev)
+-{
+-	switch (PCI_SLOT(dev->devfn)) {
+-	case 0:
+-		dev->dev.platform_data = &ubnt_xm_eeprom_data;
+-		break;
+-	}
+-
+-	return 0;
+-}
+-
+-static void __init ubnt_xm_pci_init(void)
+-{
+-	memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,
+-	       sizeof(ubnt_xm_eeprom_data.eeprom_data));
+-
+-	ath79_pci_set_plat_dev_init(ubnt_xm_pci_plat_dev_init);
+-	ath79_register_pci();
+-}
+-#else
+-static inline void ubnt_xm_pci_init(void) {}
+-#endif /* CONFIG_PCI */
+-
+ static void __init ubnt_xm_init(void)
+ {
++	u8 *eeprom = (u8 *) KSEG1ADDR(UBNT_XM_EEPROM_ADDR);
++
+ 	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xm_leds_gpio),
+ 				 ubnt_xm_leds_gpio);
+ 
+@@ -120,10 +77,8 @@ static void __init ubnt_xm_init(void)
+ 					ARRAY_SIZE(ubnt_xm_gpio_keys),
+ 					ubnt_xm_gpio_keys);
+ 
+-	ath79_register_spi(&ubnt_xm_spi_data, ubnt_xm_spi_info,
+-			   ARRAY_SIZE(ubnt_xm_spi_info));
+-
+-	ubnt_xm_pci_init();
++	ath79_register_m25p80(NULL);
++	ap91_pci_init(eeprom, NULL);
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_UBNT_XM,
diff --git a/trunk/target/linux/ar71xx/patches-3.14/608-MIPS-ath79-ubnt-xm-add-more-boards.patch b/trunk/target/linux/ar71xx/patches-3.14/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
new file mode 100644
index 00000000..d8d48f58
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
@@ -0,0 +1,347 @@
+--- a/arch/mips/ath79/mach-ubnt-xm.c
++++ b/arch/mips/ath79/mach-ubnt-xm.c
+@@ -12,16 +12,22 @@
+ 
+ #include <linux/init.h>
+ #include <linux/pci.h>
++#include <linux/platform_device.h>
+ #include <linux/ath9k_platform.h>
++#include <linux/etherdevice.h>
++#include <linux/ar8216_platform.h>
+ 
+ #include <asm/mach-ath79/irq.h>
++#include <asm/mach-ath79/ar71xx_regs.h>
+ 
+ #include "dev-ap9x-pci.h"
++#include "dev-eth.h"
+ #include "dev-gpio-buttons.h"
+ #include "dev-leds-gpio.h"
+ #include "dev-m25p80.h"
++#include "dev-usb.h"
++#include "dev-wmac.h"
+ #include "machtypes.h"
+-#include "pci.h"
+ 
+ #define UBNT_XM_GPIO_LED_L1		0
+ #define UBNT_XM_GPIO_LED_L2		1
+@@ -37,19 +43,19 @@
+ 
+ static struct gpio_led ubnt_xm_leds_gpio[] __initdata = {
+ 	{
+-		.name		= "ubnt-xm:red:link1",
++		.name		= "ubnt:red:link1",
+ 		.gpio		= UBNT_XM_GPIO_LED_L1,
+ 		.active_low	= 0,
+ 	}, {
+-		.name		= "ubnt-xm:orange:link2",
++		.name		= "ubnt:orange:link2",
+ 		.gpio		= UBNT_XM_GPIO_LED_L2,
+ 		.active_low	= 0,
+ 	}, {
+-		.name		= "ubnt-xm:green:link3",
++		.name		= "ubnt:green:link3",
+ 		.gpio		= UBNT_XM_GPIO_LED_L3,
+ 		.active_low	= 0,
+ 	}, {
+-		.name		= "ubnt-xm:green:link4",
++		.name		= "ubnt:green:link4",
+ 		.gpio		= UBNT_XM_GPIO_LED_L4,
+ 		.active_low	= 0,
+ 	},
+@@ -66,9 +72,13 @@ static struct gpio_keys_button ubnt_xm_g
+ 	}
+ };
+ 
++#define UBNT_M_WAN_PHYMASK	BIT(4)
++
+ static void __init ubnt_xm_init(void)
+ {
+ 	u8 *eeprom = (u8 *) KSEG1ADDR(UBNT_XM_EEPROM_ADDR);
++	u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
++	u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
+ 
+ 	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xm_leds_gpio),
+ 				 ubnt_xm_leds_gpio);
+@@ -79,9 +89,246 @@ static void __init ubnt_xm_init(void)
+ 
+ 	ath79_register_m25p80(NULL);
+ 	ap91_pci_init(eeprom, NULL);
++
++	ath79_register_mdio(0, ~UBNT_M_WAN_PHYMASK);
++	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
++	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
++	ath79_register_eth(0);
+ }
+ 
+ MIPS_MACHINE(ATH79_MACH_UBNT_XM,
+ 	     "UBNT-XM",
+ 	     "Ubiquiti Networks XM (rev 1.0) board",
+ 	     ubnt_xm_init);
++
++MIPS_MACHINE(ATH79_MACH_UBNT_BULLET_M, "UBNT-BM", "Ubiquiti Bullet M",
++	     ubnt_xm_init);
++
++static void __init ubnt_rocket_m_setup(void)
++{
++	ubnt_xm_init();
++	ath79_register_usb();
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_ROCKET_M, "UBNT-RM", "Ubiquiti Rocket M",
++	     ubnt_rocket_m_setup);
++
++static void __init ubnt_nano_m_setup(void)
++{
++	ubnt_xm_init();
++	ath79_register_eth(1);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M",
++	     ubnt_nano_m_setup);
++
++static struct gpio_led ubnt_airrouter_leds_gpio[] __initdata = {
++	{
++		.name		= "ubnt:green:globe",
++		.gpio		= 0,
++		.active_low	= 1,
++	}, {
++	        .name		= "ubnt:green:power",
++		.gpio		= 11,
++		.active_low	= 1,
++		.default_state  = LEDS_GPIO_DEFSTATE_ON,
++	}
++};
++
++static void __init ubnt_airrouter_setup(void)
++{
++	u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
++	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
++
++	ath79_register_m25p80(NULL);
++	ath79_register_mdio(0, ~UBNT_M_WAN_PHYMASK);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
++	ath79_init_local_mac(ath79_eth1_data.mac_addr, mac1);
++
++	ath79_register_eth(1);
++	ath79_register_eth(0);
++	ath79_register_usb();
++
++	ap91_pci_init(ee, NULL);
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_airrouter_leds_gpio),
++				 ubnt_airrouter_leds_gpio);
++
++	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++                                        ARRAY_SIZE(ubnt_xm_gpio_keys),
++                                        ubnt_xm_gpio_keys);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_AIRROUTER, "UBNT-AR", "Ubiquiti AirRouter",
++	     ubnt_airrouter_setup);
++
++static struct gpio_led ubnt_unifi_leds_gpio[] __initdata = {
++	{
++		.name		= "ubnt:orange:dome",
++		.gpio		= 1,
++		.active_low	= 0,
++	}, {
++		.name		= "ubnt:green:dome",
++		.gpio		= 0,
++		.active_low	= 0,
++	}
++};
++
++static struct gpio_led ubnt_unifi_outdoor_leds_gpio[] __initdata = {
++	{
++		.name		= "ubnt:orange:front",
++		.gpio		= 1,
++		.active_low	= 0,
++	}, {
++		.name		= "ubnt:green:front",
++		.gpio		= 0,
++		.active_low	= 0,
++	}
++};
++
++static void __init ubnt_unifi_setup(void)
++{
++	u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
++	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
++
++	ath79_register_m25p80(NULL);
++
++	ath79_register_mdio(0, ~UBNT_M_WAN_PHYMASK);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
++	ath79_register_eth(0);
++
++	ap91_pci_init(ee, NULL);
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_leds_gpio),
++				 ubnt_unifi_leds_gpio);
++
++	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++                                        ARRAY_SIZE(ubnt_xm_gpio_keys),
++                                        ubnt_xm_gpio_keys);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI, "UBNT-UF", "Ubiquiti UniFi",
++	     ubnt_unifi_setup);
++
++
++#define UBNT_UNIFIOD_PRI_PHYMASK	BIT(4)
++#define UBNT_UNIFIOD_2ND_PHYMASK	(BIT(0) | BIT(1) | BIT(2) | BIT(3))
++
++static void __init ubnt_unifi_outdoor_setup(void)
++{
++	u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
++	u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
++	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
++
++	ath79_register_m25p80(NULL);
++
++	ath79_register_mdio(0, ~(UBNT_UNIFIOD_PRI_PHYMASK |
++				 UBNT_UNIFIOD_2ND_PHYMASK));
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
++	ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0);
++	ath79_register_eth(0);
++	ath79_register_eth(1);
++
++	ap91_pci_init(ee, NULL);
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_leds_gpio),
++				 ubnt_unifi_outdoor_leds_gpio);
++
++	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++                                        ARRAY_SIZE(ubnt_xm_gpio_keys),
++                                        ubnt_xm_gpio_keys);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDOOR, "UBNT-U20",
++	     "Ubiquiti UniFiAP Outdoor",
++	     ubnt_unifi_outdoor_setup);
++
++static struct gpio_led ubnt_uap_pro_gpio_leds[] __initdata = {
++	{
++		.name		= "ubnt:white:dome",
++		.gpio		= 12,
++	}, {
++		.name		= "ubnt:blue:dome",
++		.gpio		= 13,
++	}
++};
++
++static struct gpio_keys_button uap_pro_gpio_keys[] __initdata = {
++	{
++		.desc			= "reset",
++		.type			= EV_KEY,
++		.code			= KEY_RESTART,
++		.debounce_interval	= UBNT_XM_KEYS_DEBOUNCE_INTERVAL,
++		.gpio			= 17,
++		.active_low		= 1,
++	}
++};
++
++static struct ar8327_pad_cfg uap_pro_ar8327_pad0_cfg = {
++	.mode = AR8327_PAD_MAC_RGMII,
++	.txclk_delay_en = true,
++	.rxclk_delay_en = true,
++	.txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
++	.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
++};
++
++static struct ar8327_platform_data uap_pro_ar8327_data = {
++	.pad0_cfg = &uap_pro_ar8327_pad0_cfg,
++	.port0_cfg = {
++		.force_link = 1,
++		.speed = AR8327_PORT_SPEED_1000,
++		.duplex = 1,
++		.txpause = 1,
++		.rxpause = 1,
++	},
++};
++
++static struct mdio_board_info uap_pro_mdio0_info[] = {
++	{
++		.bus_id = "ag71xx-mdio.0",
++		.phy_addr = 0,
++		.platform_data = &uap_pro_ar8327_data,
++	},
++};
++
++#define UAP_PRO_MAC0_OFFSET		0x0000
++#define UAP_PRO_MAC1_OFFSET		0x0006
++#define UAP_PRO_WMAC_CALDATA_OFFSET	0x1000
++#define UAP_PRO_PCI_CALDATA_OFFSET	0x5000
++
++static void __init ubnt_uap_pro_setup(void)
++{
++	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
++
++	ath79_register_m25p80(NULL);
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_uap_pro_gpio_leds),
++				 ubnt_uap_pro_gpio_leds);
++	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++                                        ARRAY_SIZE(uap_pro_gpio_keys),
++                                        uap_pro_gpio_keys);
++
++	ath79_register_wmac(eeprom + UAP_PRO_WMAC_CALDATA_OFFSET, NULL);
++	ap91_pci_init(eeprom + UAP_PRO_PCI_CALDATA_OFFSET, NULL);
++
++	ath79_register_mdio(0, 0x0);
++	mdiobus_register_board_info(uap_pro_mdio0_info,
++				    ARRAY_SIZE(uap_pro_mdio0_info));
++
++	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
++	ath79_init_mac(ath79_eth0_data.mac_addr,
++		       eeprom + UAP_PRO_MAC0_OFFSET, 0);
++
++	/* GMAC0 is connected to an AR8327 switch */
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
++	ath79_eth0_data.phy_mask = BIT(0);
++	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
++	ath79_eth0_pll_data.pll_1000 = 0x06000000;
++	ath79_register_eth(0);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_UAP_PRO, "UAP-PRO", "Ubiquiti UniFi AP Pro",
++	     ubnt_uap_pro_setup);
++
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -68,12 +68,16 @@ config ATH79_MACH_PB44
+ 	  Atheros PB44 reference board.
+ 
+ config ATH79_MACH_UBNT_XM
+-	bool "Ubiquiti Networks XM (rev 1.0) board"
++	bool "Ubiquiti Networks XM/UniFi boards"
+ 	select SOC_AR724X
++	select SOC_AR934X
+ 	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+ 	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
+ 	help
+ 	  Say 'Y' here if you want your kernel to support the
+ 	  Ubiquiti Networks XM (rev 1.0) board.
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -22,6 +22,13 @@ enum ath79_mach_type {
+ 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */
+ 	ATH79_MACH_DB120,		/* Atheros DB120 reference board */
+ 	ATH79_MACH_PB44,		/* Atheros PB44 reference board */
++	ATH79_MACH_UBNT_AIRROUTER,	/* Ubiquiti AirRouter */
++	ATH79_MACH_UBNT_BULLET_M,	/* Ubiquiti Bullet M */
++	ATH79_MACH_UBNT_NANO_M, 	/* Ubiquiti NanoStation M */
++	ATH79_MACH_UBNT_ROCKET_M,	/* Ubiquiti Rocket M */
++	ATH79_MACH_UBNT_UAP_PRO,	/* Ubiquiti UniFi AP Pro */
++	ATH79_MACH_UBNT_UNIFI, 		/* Ubiquiti Unifi */
++	ATH79_MACH_UBNT_UNIFI_OUTDOOR,	/* Ubiquiti UnifiAP Outdoor */
+ 	ATH79_MACH_UBNT_XM,		/* Ubiquiti Networks XM board rev 1.0 */
+ };
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/609-MIPS-ath79-ap136-fixes.patch b/trunk/target/linux/ar71xx/patches-3.14/609-MIPS-ath79-ap136-fixes.patch
new file mode 100644
index 00000000..ef0ae9a3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/609-MIPS-ath79-ap136-fixes.patch
@@ -0,0 +1,316 @@
+--- a/arch/mips/ath79/mach-ap136.c
++++ b/arch/mips/ath79/mach-ap136.c
+@@ -18,23 +18,29 @@
+  *
+  */
+ 
+-#include <linux/pci.h>
+-#include <linux/ath9k_platform.h>
++#include <linux/platform_device.h>
++#include <linux/ar8216_platform.h>
+ 
+-#include "machtypes.h"
++#include <asm/mach-ath79/ar71xx_regs.h>
++
++#include "common.h"
++#include "pci.h"
++#include "dev-ap9x-pci.h"
+ #include "dev-gpio-buttons.h"
++#include "dev-eth.h"
+ #include "dev-leds-gpio.h"
+-#include "dev-spi.h"
++#include "dev-m25p80.h"
++#include "dev-nfc.h"
+ #include "dev-usb.h"
+ #include "dev-wmac.h"
+-#include "pci.h"
++#include "machtypes.h"
+ 
+-#define AP136_GPIO_LED_STATUS_RED	14
+-#define AP136_GPIO_LED_STATUS_GREEN	19
+ #define AP136_GPIO_LED_USB		4
+-#define AP136_GPIO_LED_WLAN_2G		13
+ #define AP136_GPIO_LED_WLAN_5G		12
++#define AP136_GPIO_LED_WLAN_2G		13
++#define AP136_GPIO_LED_STATUS_RED	14
+ #define AP136_GPIO_LED_WPS_RED		15
++#define AP136_GPIO_LED_STATUS_GREEN	19
+ #define AP136_GPIO_LED_WPS_GREEN	20
+ 
+ #define AP136_GPIO_BTN_WPS		16
+@@ -43,37 +49,39 @@
+ #define AP136_KEYS_POLL_INTERVAL	20	/* msecs */
+ #define AP136_KEYS_DEBOUNCE_INTERVAL	(3 * AP136_KEYS_POLL_INTERVAL)
+ 
+-#define AP136_WMAC_CALDATA_OFFSET 0x1000
+-#define AP136_PCIE_CALDATA_OFFSET 0x5000
++#define AP136_MAC0_OFFSET		0
++#define AP136_MAC1_OFFSET		6
++#define AP136_WMAC_CALDATA_OFFSET	0x1000
++#define AP136_PCIE_CALDATA_OFFSET	0x5000
+ 
+ static struct gpio_led ap136_leds_gpio[] __initdata = {
+ 	{
+-		.name		= "qca:green:status",
++		.name		= "ap136:green:status",
+ 		.gpio		= AP136_GPIO_LED_STATUS_GREEN,
+ 		.active_low	= 1,
+ 	},
+ 	{
+-		.name		= "qca:red:status",
++		.name		= "ap136:red:status",
+ 		.gpio		= AP136_GPIO_LED_STATUS_RED,
+ 		.active_low	= 1,
+ 	},
+ 	{
+-		.name		= "qca:green:wps",
++		.name		= "ap136:green:wps",
+ 		.gpio		= AP136_GPIO_LED_WPS_GREEN,
+ 		.active_low	= 1,
+ 	},
+ 	{
+-		.name		= "qca:red:wps",
++		.name		= "ap136:red:wps",
+ 		.gpio		= AP136_GPIO_LED_WPS_RED,
+ 		.active_low	= 1,
+ 	},
+ 	{
+-		.name		= "qca:red:wlan-2g",
++		.name		= "ap136:red:wlan-2g",
+ 		.gpio		= AP136_GPIO_LED_WLAN_2G,
+ 		.active_low	= 1,
+ 	},
+ 	{
+-		.name		= "qca:red:usb",
++		.name		= "ap136:red:usb",
+ 		.gpio		= AP136_GPIO_LED_USB,
+ 		.active_low	= 1,
+ 	}
+@@ -98,65 +106,151 @@ static struct gpio_keys_button ap136_gpi
+ 	},
+ };
+ 
+-static struct ath79_spi_controller_data ap136_spi0_data = {
+-	.cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+-	.cs_line = 0,
++static struct ar8327_pad_cfg ap136_ar8327_pad0_cfg;
++static struct ar8327_pad_cfg ap136_ar8327_pad6_cfg;
++
++static struct ar8327_platform_data ap136_ar8327_data = {
++	.pad0_cfg = &ap136_ar8327_pad0_cfg,
++	.pad6_cfg = &ap136_ar8327_pad6_cfg,
++	.port0_cfg = {
++		.force_link = 1,
++		.speed = AR8327_PORT_SPEED_1000,
++		.duplex = 1,
++		.txpause = 1,
++		.rxpause = 1,
++	},
++	.port6_cfg = {
++		.force_link = 1,
++		.speed = AR8327_PORT_SPEED_1000,
++		.duplex = 1,
++		.txpause = 1,
++		.rxpause = 1,
++	},
+ };
+ 
+-static struct spi_board_info ap136_spi_info[] = {
++static struct mdio_board_info ap136_mdio0_info[] = {
+ 	{
+-		.bus_num	= 0,
+-		.chip_select	= 0,
+-		.max_speed_hz	= 25000000,
+-		.modalias	= "mx25l6405d",
+-		.controller_data = &ap136_spi0_data,
+-	}
++		.bus_id = "ag71xx-mdio.0",
++		.phy_addr = 0,
++		.platform_data = &ap136_ar8327_data,
++	},
+ };
+ 
+-static struct ath79_spi_platform_data ap136_spi_data = {
+-	.bus_num	= 0,
+-	.num_chipselect	= 1,
+-};
++static void __init ap136_common_setup(void)
++{
++	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
++
++	ath79_register_m25p80(NULL);
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap136_leds_gpio),
++				 ap136_leds_gpio);
++	ath79_register_gpio_keys_polled(-1, AP136_KEYS_POLL_INTERVAL,
++					ARRAY_SIZE(ap136_gpio_keys),
++					ap136_gpio_keys);
++
++	ath79_register_usb();
++	ath79_register_nfc();
++
++	ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET, NULL);
++
++	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+ 
+-#ifdef CONFIG_PCI
+-static struct ath9k_platform_data ap136_ath9k_data;
++	ath79_register_mdio(0, 0x0);
++	ath79_init_mac(ath79_eth0_data.mac_addr, art + AP136_MAC0_OFFSET, 0);
+ 
+-static int ap136_pci_plat_dev_init(struct pci_dev *dev)
++	mdiobus_register_board_info(ap136_mdio0_info,
++				    ARRAY_SIZE(ap136_mdio0_info));
++
++	/* GMAC0 is connected to the RMGII interface */
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
++	ath79_eth0_data.phy_mask = BIT(0);
++	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
++
++	ath79_register_eth(0);
++
++	/* GMAC1 is connected tot eh SGMII interface */
++	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
++	ath79_eth1_data.speed = SPEED_1000;
++	ath79_eth1_data.duplex = DUPLEX_FULL;
++
++	ath79_register_eth(1);
++}
++
++static void __init ap136_010_setup(void)
+ {
+-	if (dev->bus->number == 1 && (PCI_SLOT(dev->devfn)) == 0)
+-		dev->dev.platform_data = &ap136_ath9k_data;
++	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+ 
+-	return 0;
++	/* GMAC0 of the AR8327 switch is connected to GMAC0 via RGMII */
++	ap136_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_RGMII;
++	ap136_ar8327_pad0_cfg.txclk_delay_en = true;
++	ap136_ar8327_pad0_cfg.rxclk_delay_en = true;
++	ap136_ar8327_pad0_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
++	ap136_ar8327_pad0_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
++
++	/* GMAC6 of the AR8327 switch is connected to GMAC1 via SGMII */
++	ap136_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_SGMII;
++	ap136_ar8327_pad6_cfg.rxclk_delay_en = true;
++	ap136_ar8327_pad6_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL0;
++
++	ath79_eth0_pll_data.pll_1000 = 0xa6000000;
++	ath79_eth1_pll_data.pll_1000 = 0x03000101;
++
++	ap136_common_setup();
++	ap91_pci_init(art + AP136_PCIE_CALDATA_OFFSET, NULL);
+ }
+ 
+-static void __init ap136_pci_init(u8 *eeprom)
++MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
++	     "Atheros AP136-010 reference board",
++	     ap136_010_setup);
++
++static void __init ap136_020_common_setup(void)
+ {
+-	memcpy(ap136_ath9k_data.eeprom_data, eeprom,
+-	       sizeof(ap136_ath9k_data.eeprom_data));
++	/* GMAC0 of the AR8327 switch is connected to GMAC1 via SGMII */
++	ap136_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_SGMII;
++	ap136_ar8327_pad0_cfg.sgmii_delay_en = true;
++
++	/* GMAC6 of the AR8327 switch is connected to GMAC0 via RGMII */
++	ap136_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_RGMII;
++	ap136_ar8327_pad6_cfg.txclk_delay_en = true;
++	ap136_ar8327_pad6_cfg.rxclk_delay_en = true;
++	ap136_ar8327_pad6_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
++	ap136_ar8327_pad6_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
+ 
+-	ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init);
+-	ath79_register_pci();
++	ath79_eth0_pll_data.pll_1000 = 0x56000000;
++	ath79_eth1_pll_data.pll_1000 = 0x03000101;
++
++	ap136_common_setup();
+ }
+-#else
+-static inline void ap136_pci_init(u8 *eeprom) {}
+-#endif /* CONFIG_PCI */
+ 
+-static void __init ap136_setup(void)
++static void __init ap136_020_setup(void)
+ {
+ 	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+ 
+-	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap136_leds_gpio),
+-				 ap136_leds_gpio);
+-	ath79_register_gpio_keys_polled(-1, AP136_KEYS_POLL_INTERVAL,
+-					ARRAY_SIZE(ap136_gpio_keys),
+-					ap136_gpio_keys);
+-	ath79_register_spi(&ap136_spi_data, ap136_spi_info,
+-			   ARRAY_SIZE(ap136_spi_info));
+-	ath79_register_usb();
+-	ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET);
+-	ap136_pci_init(art + AP136_PCIE_CALDATA_OFFSET);
++	ap136_020_common_setup();
++	ap91_pci_init(art + AP136_PCIE_CALDATA_OFFSET, NULL);
+ }
+ 
+-MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
+-	     "Atheros AP136-010 reference board",
+-	     ap136_setup);
++MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020",
++	     "Atheros AP136-020 reference board",
++	     ap136_020_setup);
++
++/*
++ * AP135-020 is similar to AP136-020, any future AP135 specific init
++ * code can be added here.
++ */
++static void __init ap135_020_setup(void)
++{
++	ap136_leds_gpio[0].name = "ap135:green:status";
++	ap136_leds_gpio[1].name = "ap135:red:status";
++	ap136_leds_gpio[2].name = "ap135:green:wps";
++	ap136_leds_gpio[3].name = "ap135:red:wps";
++	ap136_leds_gpio[4].name = "ap135:red:wlan-2g";
++	ap136_leds_gpio[5].name = "ap135:red:usb";
++
++	ap136_020_common_setup();
++	ath79_register_pci();
++}
++
++MIPS_MACHINE(ATH79_MACH_AP135_020, "AP135-020",
++	     "Atheros AP135-020 reference board",
++	     ap135_020_setup);
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -18,7 +18,9 @@ enum ath79_mach_type {
+ 	ATH79_MACH_GENERIC = 0,
+ 	ATH79_MACH_AP121,		/* Atheros AP121 reference board */
+ 	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */
++	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */
+ 	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */
++	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */
+ 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */
+ 	ATH79_MACH_DB120,		/* Atheros DB120 reference board */
+ 	ATH79_MACH_PB44,		/* Atheros PB44 reference board */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -16,16 +16,17 @@ config ATH79_MACH_AP121
+ 	  Atheros AP121 reference board.
+ 
+ config ATH79_MACH_AP136
+-	bool "Atheros AP136 reference board"
++	bool "Atheros AP136/AP135 reference board"
+ 	select SOC_QCA955X
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_NFC
+ 	select ATH79_DEV_SPI
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 	help
+ 	  Say 'Y' here if you want your kernel to support the
+-	  Atheros AP136 reference board.
++	  Atheros AP136 or AP135 reference boards.
+ 
+ config ATH79_MACH_AP81
+ 	bool "Atheros AP81 reference board"
diff --git a/trunk/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch b/trunk/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
new file mode 100644
index 00000000..4ce92680
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
@@ -0,0 +1,1179 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -16,22 +16,145 @@
+ 
+ enum ath79_mach_type {
+ 	ATH79_MACH_GENERIC = 0,
++	ATH79_MACH_ALFA_AP96,		/* ALFA Network AP96 board */
++	ATH79_MACH_ALFA_NX,		/* ALFA Network N2/N5 board */
++	ATH79_MACH_ALL0258N,		/* Allnet ALL0258N */
++	ATH79_MACH_ALL0305,		/* Allnet ALL0305 */
++	ATH79_MACH_ALL0315N,		/* Allnet ALL0315N */
++	ATH79_MACH_AP113,		/* Atheros AP113 reference board */
+ 	ATH79_MACH_AP121,		/* Atheros AP121 reference board */
+ 	ATH79_MACH_AP121_MINI,		/* Atheros AP121-MINI reference board */
++	ATH79_MACH_AP132,		/* Atheros AP132 reference board */
+ 	ATH79_MACH_AP135_020,		/* Atheros AP135-020 reference board */
+ 	ATH79_MACH_AP136_010,		/* Atheros AP136-010 reference board */
+ 	ATH79_MACH_AP136_020,		/* Atheros AP136-020 reference board */
+ 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */
++	ATH79_MACH_AP83,		/* Atheros AP83 */
++	ATH79_MACH_AP96,		/* Atheros AP96 */
++	ATH79_MACH_ARCHER_C7,		/* TP-LINK Archer C7 board */
++	ATH79_MACH_AW_NR580,		/* AzureWave AW-NR580 */
++	ATH79_MACH_BHU_BXU2000N2_A1,	/* BHU BXU2000n-2 A1 */
++	ATH79_MACH_CAP4200AG,		/* Senao CAP4200AG */
++	ATH79_MACH_CARAMBOLA2,		/* 8devices Carambola2 */
++	ATH79_MACH_CPE510,		/* TP-LINK CPE510 */
+ 	ATH79_MACH_DB120,		/* Atheros DB120 reference board */
+ 	ATH79_MACH_PB44,		/* Atheros PB44 reference board */
++	ATH79_MACH_DIR_505_A1,		/* D-Link DIR-505 rev. A1 */
++	ATH79_MACH_DIR_600_A1,		/* D-Link DIR-600 rev. A1 */
++	ATH79_MACH_DIR_615_C1,		/* D-Link DIR-615 rev. C1 */
++	ATH79_MACH_DIR_615_E1,		/* D-Link DIR-615 rev. E1 */
++	ATH79_MACH_DIR_615_E4,		/* D-Link DIR-615 rev. E4 */
++	ATH79_MACH_DIR_825_B1,		/* D-Link DIR-825 rev. B1 */
++	ATH79_MACH_DIR_825_C1,		/* D-Link DIR-825 rev. C1 */
++	ATH79_MACH_DIR_835_A1,		/* D-Link DIR-835 rev. A1 */
++	ATH79_MACH_DRAGINO2,		/* Dragino Version 2 */
++	ATH79_MACH_EW_DORIN,		/* embedded wireless Dorin Platform */
++	ATH79_MACH_EW_DORIN_ROUTER,	/* embedded wireless Dorin Router Platform */
++	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
++	ATH79_MACH_JA76PF,		/* jjPlus JA76PF */
++	ATH79_MACH_JA76PF2,		/* jjPlus JA76PF2 */
++	ATH79_MACH_JWAP003,		/* jjPlus JWAP003 */
++	ATH79_MACH_HORNET_UB,		/* ALFA Networks Hornet-UB */
++	ATH79_MACH_MR600V2,		/* OpenMesh MR600v2 */
++	ATH79_MACH_MR600,		/* OpenMesh MR600 */
++	ATH79_MACH_MYNET_N600,		/* WD My Net N600 */
++	ATH79_MACH_MYNET_REXT,		/* WD My Net Wi-Fi Range Extender */
++	ATH79_MACH_MZK_W04NU,		/* Planex MZK-W04NU */
++	ATH79_MACH_MZK_W300NH,		/* Planex MZK-W300NH */
++	ATH79_MACH_NBG460N,		/* Zyxel NBG460N/550N/550NH */
++	ATH79_MACH_OM2P_HS,		/* OpenMesh OM2P-HS */
++	ATH79_MACH_OM2P_LC,		/* OpenMesh OM2P-LC */
++	ATH79_MACH_OM2P,		/* OpenMesh OM2P */
++	ATH79_MACH_PB42,		/* Atheros PB42 */
++	ATH79_MACH_PB92,		/* Atheros PB92 */
++	ATH79_MACH_RB_411,		/* MikroTik RouterBOARD 411/411A/411AH */
++	ATH79_MACH_RB_411U,		/* MikroTik RouterBOARD 411U */
++	ATH79_MACH_RB_433,		/* MikroTik RouterBOARD 433/433AH */
++	ATH79_MACH_RB_433U,		/* MikroTik RouterBOARD 433UAH */
++	ATH79_MACH_RB_435G,		/* MikroTik RouterBOARD 435G */
++	ATH79_MACH_RB_450G,		/* MikroTik RouterBOARD 450G */
++	ATH79_MACH_RB_450,		/* MikroTik RouterBOARD 450 */
++	ATH79_MACH_RB_493,		/* Mikrotik RouterBOARD 493/493AH */
++	ATH79_MACH_RB_493G,		/* Mikrotik RouterBOARD 493G */
++	ATH79_MACH_RB_750,		/* MikroTik RouterBOARD 750 */
++	ATH79_MACH_RB_750G_R3,		/* MikroTik RouterBOARD 750GL */
++	ATH79_MACH_RB_751,		/* MikroTik RouterBOARD 751 */
++	ATH79_MACH_RB_751G,		/* Mikrotik RouterBOARD 751G */
++	ATH79_MACH_RB_951G,		/* Mikrotik RouterBOARD 951G */
++	ATH79_MACH_RB_2011G,		/* Mikrotik RouterBOARD 2011UAS-2HnD */
++	ATH79_MACH_RB_2011L,		/* Mikrotik RouterBOARD 2011L */
++	ATH79_MACH_RB_2011US,		/* Mikrotik RouterBOARD 2011UAS */
++	ATH79_MACH_RW2458N,		/* Redwave RW2458N */
++	ATH79_MACH_TEW_632BRP,		/* TRENDnet TEW-632BRP */
++	ATH79_MACH_TEW_673GRU,		/* TRENDnet TEW-673GRU */
++	ATH79_MACH_TEW_712BR,		/* TRENDnet TEW-712BR */
++	ATH79_MACH_TEW_732BR,		/* TRENDnet TEW-732BR */
++	ATH79_MACH_TL_MR10U,		/* TP-LINK TL-MR10U */
++	ATH79_MACH_TL_MR11U,		/* TP-LINK TL-MR11U */
++	ATH79_MACH_TL_MR13U,		/* TP-LINK TL-MR13U */
++	ATH79_MACH_TL_MR3020,		/* TP-LINK TL-MR3020 */
++	ATH79_MACH_TL_MR3040,		/* TP-LINK TL-MR3040 */
++	ATH79_MACH_TL_MR3040_V2,	/* TP-LINK TL-MR3040 v2 */
++	ATH79_MACH_TL_MR3220,		/* TP-LINK TL-MR3220 */
++	ATH79_MACH_TL_MR3220_V2,	/* TP-LINK TL-MR3220 v2 */
++	ATH79_MACH_TL_MR3420,		/* TP-LINK TL-MR3420 */
++	ATH79_MACH_TL_MR3420_V2,	/* TP-LINK TL-MR3420 v2 */
++	ATH79_MACH_TL_WA750RE,		/* TP-LINK TL-WA750RE */
++	ATH79_MACH_TL_WA7510N_V1,	/* TP-LINK TL-WA7510N v1*/
++	ATH79_MACH_TL_WA850RE,		/* TP-LINK TL-WA850RE */
++	ATH79_MACH_TL_WA901ND,		/* TP-LINK TL-WA901ND */
++	ATH79_MACH_TL_WA901ND_V2,	/* TP-LINK TL-WA901ND v2 */
++	ATH79_MACH_TL_WDR3500,		/* TP-LINK TL-WDR3500 */
++	ATH79_MACH_TL_WDR4300,		/* TP-LINK TL-WDR4300 */
++	ATH79_MACH_TL_WR1041N_V2,	/* TP-LINK TL-WR1041N v2 */
++	ATH79_MACH_TL_WR1043ND,		/* TP-LINK TL-WR1043ND */
++	ATH79_MACH_TL_WR1043ND_V2,	/* TP-LINK TL-WR1043ND v2 */
++	ATH79_MACH_TL_WR2543N,		/* TP-LINK TL-WR2543N/ND */
++	ATH79_MACH_TL_WR703N,		/* TP-LINK TL-WR703N */
++	ATH79_MACH_TL_WR710N,		/* TP-LINK TL-WR710N */
++	ATH79_MACH_TL_WR720N_V3,	/* TP-LINK TL-WR720N v3 */
++	ATH79_MACH_TL_WR741ND,		/* TP-LINK TL-WR741ND */
++	ATH79_MACH_TL_WR741ND_V4,	/* TP-LINK TL-WR741ND  v4*/
++	ATH79_MACH_TL_WR841N_V1,	/* TP-LINK TL-WR841N v1 */
++	ATH79_MACH_TL_WR841N_V7,	/* TP-LINK TL-WR841N/ND v7 */
++	ATH79_MACH_TL_WR841N_V8,	/* TP-LINK TL-WR841N/ND v8 */
++	ATH79_MACH_TL_WR842N_V2,	/* TP-LINK TL-WR842N/ND v2 */
++	ATH79_MACH_TL_WR941ND,		/* TP-LINK TL-WR941ND */
+ 	ATH79_MACH_UBNT_AIRROUTER,	/* Ubiquiti AirRouter */
+ 	ATH79_MACH_UBNT_BULLET_M,	/* Ubiquiti Bullet M */
++	ATH79_MACH_UBNT_LSSR71,		/* Ubiquiti LS-SR71 */
++	ATH79_MACH_UBNT_LSX,		/* Ubiquiti LSX */
+ 	ATH79_MACH_UBNT_NANO_M, 	/* Ubiquiti NanoStation M */
+ 	ATH79_MACH_UBNT_ROCKET_M,	/* Ubiquiti Rocket M */
++	ATH79_MACH_UBNT_RSPRO,		/* Ubiquiti RouterStation Pro */
++	ATH79_MACH_UBNT_RS,		/* Ubiquiti RouterStation */
+ 	ATH79_MACH_UBNT_UAP_PRO,	/* Ubiquiti UniFi AP Pro */
+ 	ATH79_MACH_UBNT_UNIFI, 		/* Ubiquiti Unifi */
+ 	ATH79_MACH_UBNT_UNIFI_OUTDOOR,	/* Ubiquiti UnifiAP Outdoor */
+ 	ATH79_MACH_UBNT_XM,		/* Ubiquiti Networks XM board rev 1.0 */
++	ATH79_MACH_WHR_G301N,		/* Buffalo WHR-G301N */
++	ATH79_MACH_WHR_HP_G300N,	/* Buffalo WHR-HP-G300N */
++	ATH79_MACH_WHR_HP_GN,		/* Buffalo WHR-HP-GN */
++	ATH79_MACH_WLAE_AG300N,		/* Buffalo WLAE-AG300N */
++	ATH79_MACH_WLR8100,		/* SITECOM WLR-8100 */
++	ATH79_MACH_WNDAP360,		/* NETGEAR WNDAP360 */
++	ATH79_MACH_WNDR3700,		/* NETGEAR WNDR3700/WNDR3800/WNDRMAC */
++	ATH79_MACH_WNDR3700_V4,		/* NETGEAR WNDR3700v4 */
++	ATH79_MACH_WNDR4300,		/* NETGEAR WNDR4300 */
++	ATH79_MACH_WNR2000,		/* NETGEAR WNR2000 */
++	ATH79_MACH_WNR2000_V3,		/* NETGEAR WNR2000 v3 */
++	ATH79_MACH_WNR2200,		/* NETGEAR WNR2200 */
++	ATH79_MACH_WNR612_V2,		/* NETGEAR WNR612 v2 */
++	ATH79_MACH_WP543,		/* Compex WP543 */
++	ATH79_MACH_WPE72,		/* Compex WPE72 */
++	ATH79_MACH_WRT160NL,		/* Linksys WRT160NL */
++	ATH79_MACH_WRT400N,		/* Linksys WRT400N */
++	ATH79_MACH_WZR_HP_AG300H,	/* Buffalo WZR-HP-AG300H */
++	ATH79_MACH_WZR_HP_G300NH,	/* Buffalo WZR-HP-G300NH */
++	ATH79_MACH_WZR_HP_G300NH2,	/* Buffalo WZR-HP-G300NH2 */
++	ATH79_MACH_WZR_HP_G450H,	/* Buffalo WZR-HP-G450H */
++	ATH79_MACH_ZCN_1523H_2,		/* Zcomax ZCN-1523H-2-xx */
++	ATH79_MACH_ZCN_1523H_5,		/* Zcomax ZCN-1523H-5-xx */
+ };
+ 
+ #endif /* _ATH79_MACHTYPE_H */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -2,6 +2,61 @@ if ATH79
+ 
+ menu "Atheros AR71XX/AR724X/AR913X machine selection"
+ 
++config ATH79_MACH_ALFA_AP96
++	bool "ALFA Network AP96 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_HORNET_UB
++	bool "ALFA Network Hornet-UB board support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_ALFA_NX
++	bool "ALFA Network N2/N5 board support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_ALL0258N
++	bool "Allnet ALL0258N support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_ALL0315N
++	bool "Allnet ALL0315N support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_AP113
++	bool "Atheros AP113 board support"
++	select SOC_AR724X
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_PB9X_PCI if PCI
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_USB
++	select ATH79_DEV_ETH
++
+ config ATH79_MACH_AP121
+ 	bool "Atheros AP121 reference board"
+ 	select SOC_AR933X
+@@ -11,62 +66,743 @@ config ATH79_MACH_AP121
+ 	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+-	help
+-	  Say 'Y' here if you want your kernel to support the
+-	  Atheros AP121 reference board.
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Atheros AP121 reference board.
++
++config ATH79_MACH_AP132
++	bool "Atheros AP132 reference board"
++	select SOC_QCA955X
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Atheros AP132 reference boards.
++
++config ATH79_MACH_AP136
++	bool "Atheros AP136/AP135 reference board"
++	select SOC_QCA955X
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_NFC
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Atheros AP136 or AP135 reference boards.
++
++config ATH79_MACH_AP81
++	bool "Atheros AP81 reference board"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Atheros AP81 reference board.
++
++config ATH79_MACH_AP83
++	bool "Atheros AP83 board support"
++	select SOC_AR913X
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_AP96
++	bool "Atheros AP96 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_DB120
++	bool "Atheros DB120 reference board"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_NFC
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Atheros DB120 reference board.
++
++config ATH79_MACH_PB42
++	bool "Atheros PB42 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_PB44
++	bool "Atheros PB44 reference board"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_SPI
++	select ATH79_DEV_USB
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Atheros PB44 reference board.
++
++config ATH79_MACH_PB92
++	bool "Atheros PB92 board support"
++	select SOC_AR724X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_PB9X_PCI if PCI
++	select ATH79_DEV_USB
++
++config ATH79_MACH_AW_NR580
++	bool "AzureWave AW-NR580 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_WHR_HP_G300N
++	bool "Buffalo WHR-HP-G300N board support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_WLAE_AG300N
++	bool "Buffalo WLAE-AG300N board support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_WLR8100
++	bool "Sitecom WLR-8100 board support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_WZR_HP_AG300H
++	bool "Buffalo WZR-HP-AG300H board support"
++	select SOC_AR71XX
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_WZR_HP_G300NH
++	bool "Buffalo WZR-HP-G300NH board support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++	select RTL8366_SMI
++
++config ATH79_MACH_WZR_HP_G300NH2
++	bool "Buffalo WZR-HP-G300NH2 board support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_WZR_HP_G450H
++	bool "Buffalo WZR-HP-G450H board support"
++	select SOC_AR724X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_WP543
++	bool "Compex WP543/WPJ543 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select MYLOADER
++
++config ATH79_MACH_WPE72
++	bool "Compex WPE72/WPE72NX board support"
++	select SOC_AR724X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select MYLOADER
++
++config ATH79_MACH_DIR_505_A1
++	bool "D-Link DIR-505-A1 support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
++config ATH79_MACH_DIR_600_A1
++	bool "D-Link DIR-600 A1/DIR-615 E1/DIR-615 E4 support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_NVRAM
++
++config ATH79_MACH_DIR_615_C1
++	bool "D-Link DIR-615 rev. C1 support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
++config ATH79_MACH_DIR_825_B1
++	bool "D-Link DIR-825 rev. B1 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_DIR_825_C1
++	bool "D-Link DIR-825 rev. C1/DIR-835 rev. A1 board support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_DRAGINO2
++	bool "DRAGINO V2 support"
++	select SOC_AR933X
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_WMAC
++	select ATH79_DEV_ETH
++	select ATH79_DEV_USB
++
++config ATH79_MACH_EW_DORIN
++	bool "embedded wireless Dorin Platform support"
++	select SOC_AR933X
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_WMAC
++	select ATH79_DEV_ETH
++	help
++	  Say 'Y' here if you want your kernel to support the
++	  Dorin Platform from www.80211.de .
++
++config ATH79_MACH_JA76PF
++	bool "jjPlus JA76PF board support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_JWAP003
++	bool "jjPlus JWAP003 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_WRT160NL
++	bool "Linksys WRT160NL board support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
++config ATH79_MACH_WRT400N
++	bool "Linksys WRT400N board support"
++	select SOC_AR71XX
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_RB4XX
++	bool "MikroTik RouterBOARD 4xx series support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_USB
++
++config ATH79_MACH_RB750
++	bool "MikroTik RouterBOARD 750 support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_USB
++	select ATH79_ROUTERBOOT
++	select RLE_DECOMPRESS
++
++config ATH79_MACH_RB95X
++       bool "MikroTik RouterBOARD 95X support"
++       select SOC_AR934X
++       select ATH79_DEV_ETH
++       select ATH79_DEV_NFC
++       select ATH79_DEV_WMAC
++       select ATH79_DEV_USB
++       select ATH79_ROUTERBOOT
++       select RLE_DECOMPRESS
++
++config ATH79_MACH_RB2011
++	bool "MikroTik RouterBOARD 2011 support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_NFC
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++	select ATH79_ROUTERBOOT
++	select RLE_DECOMPRESS
++
++config ATH79_MACH_WNDAP360
++	bool "NETGEAR WNDAP360 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_WNDR3700
++	bool "NETGEAR WNDR3700 board support"
++	select SOC_AR71XX
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_WNDR4300
++	bool "NETGEAR WNDR3700v4/WNDR4300 board support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_NFC
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_WNR2000
++	bool "NETGEAR WNR2000 board support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_WNR2000_V3
++	bool "NETGEAR WNR2000 V3/WNR612 v2 board support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++	config ATH79_MACH_WNR2200
++	bool "NETGEAR WNR2200 board support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_OM2P
++	bool "OpenMesh OM2P board support"
++	select SOC_AR724X
++	select SOC_AR933X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_MR600
++	bool "OpenMesh MR600 board support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_MZK_W04NU
++	bool "Planex MZK-W04NU board support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_MZK_W300NH
++	bool "Planex MZK-W300NH board support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_RW2458N
++	bool "Redwave RW2458N board support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_CAP4200AG
++	bool "Senao CAP4200AG support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_EAP7660D
++	bool "Senao EAP7660D support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_ARCHER_C7
++	bool "TP-LINK Archer C7 board support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_CPE510
++	bool "TP-LINK CPE510 support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_MR11U
++	bool "TP-LINK TL-MR11U/TL-MR3040 support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
+ 
+-config ATH79_MACH_AP136
+-	bool "Atheros AP136/AP135 reference board"
+-	select SOC_QCA955X
++config ATH79_MACH_TL_MR13U
++	bool "TP-LINK TL-MR13U support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+-	select ATH79_DEV_NFC
+-	select ATH79_DEV_SPI
++	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+-	help
+-	  Say 'Y' here if you want your kernel to support the
+-	  Atheros AP136 or AP135 reference boards.
+ 
+-config ATH79_MACH_AP81
+-	bool "Atheros AP81 reference board"
++config ATH79_MACH_TL_MR3020
++	bool "TP-LINK TL-MR3020 support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_MR3X20
++	bool "TP-LINK TL-MR3220/3420 support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_TL_WAX50RE
++	bool "TP-LINK TL-WA750/850RE support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WA901ND
++	bool "TP-LINK TL-WA901ND/TL-WA7510N support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_TL_WA901ND_V2
++	bool "TP-LINK TL-WA901ND v2 support"
+ 	select SOC_AR913X
+ 	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+ 	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WDR3500
++	bool "TP-LINK TL-WDR3500 board support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+-	help
+-	  Say 'Y' here if you want your kernel to support the
+-	  Atheros AP81 reference board.
+ 
+-config ATH79_MACH_DB120
+-	bool "Atheros DB120 reference board"
++config ATH79_MACH_TL_WDR4300
++	bool "TP-LINK TL-WDR3600/4300/4310 board support"
+ 	select SOC_AR934X
+ 	select ATH79_DEV_AP9X_PCI if PCI
+ 	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+ 	select ATH79_DEV_M25P80
+-	select ATH79_DEV_NFC
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+-	help
+-	  Say 'Y' here if you want your kernel to support the
+-	  Atheros DB120 reference board.
+ 
+-config ATH79_MACH_PB44
+-	bool "Atheros PB44 reference board"
++config ATH79_MACH_TL_WR703N
++	bool "TP-LINK TL-WR703N/TL-WR710N/TL-MR10U support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR720N_V3
++	bool "TP-LINK TL-WR720N v3 support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR741ND
++	bool "TP-LINK TL-WR741ND support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_TL_WR741ND_V4
++	bool "TP-LINK TL-WR741ND v4/TL-MR3220 v2 support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR841N_V1
++	bool "TP-LINK TL-WR841N v1 support"
+ 	select SOC_AR71XX
++	select ATH79_DEV_DSA
+ 	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
+-	select ATH79_DEV_SPI
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_TL_WR841N_V8
++	bool "TP-LINK TL-WR841N/ND v8/TL-MR3420 v2 support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR941ND
++	bool "TP-LINK TL-WR941ND support"
++	select SOC_AR913X
++	select ATH79_DEV_DSA
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR1041N_V2
++	bool "TP-LINK TL-WR1041N v2 support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR1043ND
++	bool "TP-LINK TL-WR1043ND support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR1043ND_V2
++	bool "TP-LINK TL-WR1043ND v2 support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_TL_WR2543N
++	bool "TP-LINK TL-WR2543N/ND support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++
++config ATH79_MACH_TEW_632BRP
++	bool "TRENDnet TEW-632BRP support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
++config ATH79_MACH_TEW_673GRU
++	bool "TRENDnet TEW-673GRU support"
++	select SOC_AR71XX
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_NVRAM
++
++config ATH79_MACH_TEW_712BR
++	bool "TRENDnet TEW-712BR support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
++config ATH79_MACH_TEW_732BR
++	bool "TRENDnet TEW-732BR support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_UBNT
++	bool "Ubiquiti AR71xx based boards support"
++	select SOC_AR71XX
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+-	help
+-	  Say 'Y' here if you want your kernel to support the
+-	  Atheros PB44 reference board.
+ 
+ config ATH79_MACH_UBNT_XM
+ 	bool "Ubiquiti Networks XM/UniFi boards"
+@@ -83,6 +819,65 @@ config ATH79_MACH_UBNT_XM
+ 	  Say 'Y' here if you want your kernel to support the
+ 	  Ubiquiti Networks XM (rev 1.0) board.
+ 
++config ATH79_MACH_MYNET_N600
++	bool "WD My Net N600 board support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
++config ATH79_MACH_MYNET_REXT
++	bool "WD My Net Wi-Fi Range Extender board support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
++config ATH79_MACH_ZCN_1523H
++	bool "Zcomax ZCN-1523H support"
++	select SOC_AR724X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++
++config ATH79_MACH_NBG460N
++	bool "Zyxel NBG460N/550N/550NH board support"
++	select SOC_AR913X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_CARAMBOLA2
++	bool "8devices Carambola2 board"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_BHU_BXU2000N2_A
++	bool "BHU BXU2000n-2 rev. A support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ endmenu
+ 
+ config SOC_AR71XX
+@@ -132,7 +927,10 @@ config ATH79_DEV_DSA
+ config ATH79_DEV_ETH
+ 	def_bool n
+ 
+-config PCI_AR724X
++config ATH79_DEV_DSA
++	def_bool n
++
++config ATH79_DEV_ETH
+ 	def_bool n
+ 
+ config ATH79_DEV_GPIO_BUTTONS
+@@ -164,4 +962,7 @@ config ATH79_PCI_ATH9K_FIXUP
+ config ATH79_ROUTERBOOT
+ 	def_bool n
+ 
++config PCI_AR724X
++	def_bool n
++
+ endif
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -38,9 +38,91 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)		+= route
+ #
+ # Machines
+ #
++obj-$(CONFIG_ATH79_MACH_ALFA_AP96)	+= mach-alfa-ap96.o
++obj-$(CONFIG_ATH79_MACH_ALFA_NX)	+= mach-alfa-nx.o
++obj-$(CONFIG_ATH79_MACH_ALL0258N)	+= mach-all0258n.o
++obj-$(CONFIG_ATH79_MACH_ALL0315N)	+= mach-all0315n.o
++obj-$(CONFIG_ATH79_MACH_AP113)		+= mach-ap113.o
+ obj-$(CONFIG_ATH79_MACH_AP121)		+= mach-ap121.o
++obj-$(CONFIG_ATH79_MACH_AP132)		+= mach-ap132.o
+ obj-$(CONFIG_ATH79_MACH_AP136)		+= mach-ap136.o
+ obj-$(CONFIG_ATH79_MACH_AP81)		+= mach-ap81.o
++obj-$(CONFIG_ATH79_MACH_AP83)		+= mach-ap83.o
++obj-$(CONFIG_ATH79_MACH_AP96)		+= mach-ap96.o
++obj-$(CONFIG_ATH79_MACH_ARCHER_C7)	+= mach-archer-c7.o
++obj-$(CONFIG_ATH79_MACH_AW_NR580)	+= mach-aw-nr580.o
++obj-$(CONFIG_ATH79_MACH_BHU_BXU2000N2_A)+= mach-bhu-bxu2000n2-a.o
++obj-$(CONFIG_ATH79_MACH_CAP4200AG)	+= mach-cap4200ag.o
++obj-$(CONFIG_ATH79_MACH_CPE510)		+= mach-cpe510.o
+ obj-$(CONFIG_ATH79_MACH_DB120)		+= mach-db120.o
++obj-$(CONFIG_ATH79_MACH_DIR_505_A1)	+= mach-dir-505-a1.o
++obj-$(CONFIG_ATH79_MACH_DIR_600_A1)	+= mach-dir-600-a1.o
++obj-$(CONFIG_ATH79_MACH_DIR_615_C1)	+= mach-dir-615-c1.o
++obj-$(CONFIG_ATH79_MACH_DIR_825_B1)	+= mach-dir-825-b1.o
++obj-$(CONFIG_ATH79_MACH_DIR_825_C1)	+= mach-dir-825-c1.o
++obj-$(CONFIG_ATH79_MACH_DRAGINO2)	+= mach-dragino2.o
++obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mach-ew-dorin.o
++obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
++obj-$(CONFIG_ATH79_MACH_JA76PF)		+= mach-ja76pf.o
++obj-$(CONFIG_ATH79_MACH_JWAP003)	+= mach-jwap003.o
++obj-$(CONFIG_ATH79_MACH_HORNET_UB)	+= mach-hornet-ub.o
++obj-$(CONFIG_ATH79_MACH_MR600)		+= mach-mr600.o
++obj-$(CONFIG_ATH79_MACH_MYNET_N600)	+= mach-mynet-n600.o
++obj-$(CONFIG_ATH79_MACH_MYNET_REXT)	+= mach-mynet-rext.o
++obj-$(CONFIG_ATH79_MACH_MZK_W04NU)	+= mach-mzk-w04nu.o
++obj-$(CONFIG_ATH79_MACH_MZK_W300NH)	+= mach-mzk-w300nh.o
++obj-$(CONFIG_ATH79_MACH_NBG460N)	+= mach-nbg460n.o
++obj-$(CONFIG_ATH79_MACH_OM2P)		+= mach-om2p.o
++obj-$(CONFIG_ATH79_MACH_PB42)		+= mach-pb42.o
+ obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-pb44.o
++obj-$(CONFIG_ATH79_MACH_PB92)		+= mach-pb92.o
++obj-$(CONFIG_ATH79_MACH_RB4XX)		+= mach-rb4xx.o
++obj-$(CONFIG_ATH79_MACH_RB750)		+= mach-rb750.o
++obj-$(CONFIG_ATH79_MACH_RB95X)		+= mach-rb95x.o
++obj-$(CONFIG_ATH79_MACH_RB2011)		+= mach-rb2011.o
++obj-$(CONFIG_ATH79_MACH_RW2458N)	+= mach-rw2458n.o
++obj-$(CONFIG_ATH79_MACH_TEW_632BRP)	+= mach-tew-632brp.o
++obj-$(CONFIG_ATH79_MACH_TEW_673GRU)	+= mach-tew-673gru.o
++obj-$(CONFIG_ATH79_MACH_TEW_712BR)	+= mach-tew-712br.o
++obj-$(CONFIG_ATH79_MACH_TEW_732BR)	+= mach-tew-732br.o
++obj-$(CONFIG_ATH79_MACH_TL_MR11U)	+= mach-tl-mr11u.o
++obj-$(CONFIG_ATH79_MACH_TL_MR13U)	+= mach-tl-mr13u.o
++obj-$(CONFIG_ATH79_MACH_TL_MR3020)	+= mach-tl-mr3020.o
++obj-$(CONFIG_ATH79_MACH_TL_MR3X20)	+= mach-tl-mr3x20.o
++obj-$(CONFIG_ATH79_MACH_TL_WAX50RE)     += mach-tl-wax50re.o
++obj-$(CONFIG_ATH79_MACH_TL_WA901ND)	+= mach-tl-wa901nd.o
++obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2)	+= mach-tl-wa901nd-v2.o
++obj-$(CONFIG_ATH79_MACH_TL_WDR3500)     += mach-tl-wdr3500.o
++obj-$(CONFIG_ATH79_MACH_TL_WDR4300)     += mach-tl-wdr4300.o
++obj-$(CONFIG_ATH79_MACH_TL_WR741ND)	+= mach-tl-wr741nd.o
++obj-$(CONFIG_ATH79_MACH_TL_WR741ND_V4)	+= mach-tl-wr741nd-v4.o
++obj-$(CONFIG_ATH79_MACH_TL_WR841N_V1)	+= mach-tl-wr841n.o
++obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8)	+= mach-tl-wr841n-v8.o
++obj-$(CONFIG_ATH79_MACH_TL_WR941ND)	+= mach-tl-wr941nd.o
++obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2)	+= mach-tl-wr1041n-v2.o
++obj-$(CONFIG_ATH79_MACH_TL_WR1043ND)	+= mach-tl-wr1043nd.o
++obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V2)	+= mach-tl-wr1043nd-v2.o
++obj-$(CONFIG_ATH79_MACH_TL_WR2543N)	+= mach-tl-wr2543n.o
++obj-$(CONFIG_ATH79_MACH_TL_WR703N)	+= mach-tl-wr703n.o
++obj-$(CONFIG_ATH79_MACH_TL_WR720N_V3)	+= mach-tl-wr720n-v3.o
++obj-$(CONFIG_ATH79_MACH_UBNT)		+= mach-ubnt.o
+ obj-$(CONFIG_ATH79_MACH_UBNT_XM)	+= mach-ubnt-xm.o
++obj-$(CONFIG_ATH79_MACH_WHR_HP_G300N)	+= mach-whr-hp-g300n.o
++obj-$(CONFIG_ATH79_MACH_WLAE_AG300N)	+= mach-wlae-ag300n.o
++obj-$(CONFIG_ATH79_MACH_WLR8100)	+= mach-wlr8100.o
++obj-$(CONFIG_ATH79_MACH_WNDAP360)	+= mach-wndap360.o
++obj-$(CONFIG_ATH79_MACH_WNDR3700)	+= mach-wndr3700.o
++obj-$(CONFIG_ATH79_MACH_WNDR4300)	+= mach-wndr4300.o
++obj-$(CONFIG_ATH79_MACH_WNR2000)	+= mach-wnr2000.o
++obj-$(CONFIG_ATH79_MACH_WNR2000_V3)	+= mach-wnr2000-v3.o
++obj-$(CONFIG_ATH79_MACH_WNR2200)	+= mach-wnr2200.o
++obj-$(CONFIG_ATH79_MACH_WP543)		+= mach-wp543.o
++obj-$(CONFIG_ATH79_MACH_WPE72)		+= mach-wpe72.o
++obj-$(CONFIG_ATH79_MACH_WRT160NL)	+= mach-wrt160nl.o
++obj-$(CONFIG_ATH79_MACH_WRT400N)	+= mach-wrt400n.o
++obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH)	+= mach-wzr-hp-g300nh.o
++obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH2)	+= mach-wzr-hp-g300nh2.o
++obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H)	+= mach-wzr-hp-ag300h.o
++obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H)	+= mach-wzr-hp-g450h.o
++obj-$(CONFIG_ATH79_MACH_ZCN_1523H)	+= mach-zcn-1523h.o
++obj-$(CONFIG_ATH79_MACH_CARAMBOLA2)	+= mach-carambola2.o
+--- a/arch/mips/ath79/prom.c
++++ b/arch/mips/ath79/prom.c
+@@ -180,6 +180,12 @@ void __init prom_init(void)
+ 			ath79_prom_append_cmdline("board", env);
+ 		}
+ 	}
++
++	if (strstr(arcs_cmdline, "board=750Gr3") ||
++	    strstr(arcs_cmdline, "board=951G") ||
++	    strstr(arcs_cmdline, "board=2011L") ||
++	    strstr(arcs_cmdline, "board=711Gr100"))
++		ath79_prom_append_cmdline("console", "ttyS0,115200");
+ }
+ 
+ void __init prom_free_prom_memory(void)
diff --git a/trunk/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch b/trunk/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch
new file mode 100644
index 00000000..0927d5a9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/611-MIPS-ath79-wdt-timeout.patch
@@ -0,0 +1,25 @@
+MIPS: ath79: fix maximum timeout
+
+If the userland tries to set a timeout higher than the max_timeout, then we should fallback to max_timeout.
+
+Signed-off-by: John Crispin <blogic@openwrt.org>
+
+--- a/drivers/watchdog/ath79_wdt.c
++++ b/drivers/watchdog/ath79_wdt.c
+@@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(voi
+ 
+ static int ath79_wdt_set_timeout(int val)
+ {
+-	if (val < 1 || val > max_timeout)
++	if (val < 1)
+ 		return -EINVAL;
+ 
+-	timeout = val;
++	if (val > max_timeout)
++		timeout = max_timeout;
++	else
++		timeout = val;
++
+ 	ath79_wdt_keepalive();
+ 
+ 	return 0;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/612-MIPS-ath79-set-buffalo-txgain.patch b/trunk/target/linux/ar71xx/patches-3.14/612-MIPS-ath79-set-buffalo-txgain.patch
new file mode 100644
index 00000000..fdef854f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/612-MIPS-ath79-set-buffalo-txgain.patch
@@ -0,0 +1,24 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -306,6 +306,11 @@ void __init ath79_wmac_disable_5ghz(void
+ 	ath79_wmac_data.disable_5ghz = true;
+ }
+ 
++void __init ath79_wmac_set_tx_gain_buffalo(void)
++{
++	ath79_wmac_data.tx_gain_buffalo = true;
++}
++
+ void __init ath79_register_wmac(u8 *cal_data, u8 *mac_addr)
+ {
+ 	if (soc_is_ar913x())
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -16,6 +16,7 @@ void ath79_register_wmac(u8 *cal_data, u
+ void ath79_register_wmac_simple(void);
+ void ath79_wmac_disable_2ghz(void);
+ void ath79_wmac_disable_5ghz(void);
++void ath79_wmac_set_tx_gain_buffalo(void);
+ 
+ bool ar93xx_wmac_read_mac_address(u8 *dest);
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/613-MIPS-ath79-add-ath79_wmac_setup_ext_lna_gpio-helper.patch b/trunk/target/linux/ar71xx/patches-3.14/613-MIPS-ath79-add-ath79_wmac_setup_ext_lna_gpio-helper.patch
new file mode 100644
index 00000000..83de7b12
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/613-MIPS-ath79-add-ath79_wmac_setup_ext_lna_gpio-helper.patch
@@ -0,0 +1,76 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -18,9 +18,11 @@
+ #include <linux/etherdevice.h>
+ #include <linux/platform_device.h>
+ #include <linux/ath9k_platform.h>
++#include <linux/gpio.h>
+ 
+ #include <asm/mach-ath79/ath79.h>
+ #include <asm/mach-ath79/ar71xx_regs.h>
++#include "common.h"
+ #include "dev-wmac.h"
+ 
+ static u8 ath79_wmac_mac[ETH_ALEN];
+@@ -311,6 +313,51 @@ void __init ath79_wmac_set_tx_gain_buffa
+ 	ath79_wmac_data.tx_gain_buffalo = true;
+ }
+ 
++static int ath79_request_ext_lna_gpio(unsigned chain, int gpio)
++{
++	char buf[32];
++	char *label;
++	int err;
++
++	scnprintf(buf, sizeof(buf), "external LNA%u", chain);
++	label = kstrdup(buf, GFP_KERNEL);
++
++	err = gpio_request_one(gpio, GPIOF_DIR_OUT | GPIOF_INIT_LOW, label);
++	if (err) {
++		pr_err("unable to request GPIO%d for external LNA%u\n",
++			gpio, chain);
++		kfree(label);
++	}
++
++	return err;
++}
++
++static void ar934x_set_ext_lna_gpio(unsigned chain, int gpio)
++{
++	unsigned int sel;
++	int err;
++
++	if (WARN_ON(chain > 1))
++		return;
++
++	err = ath79_request_ext_lna_gpio(chain, gpio);
++	if (err)
++		return;
++
++	if (chain == 0)
++		sel = AR934X_GPIO_OUT_EXT_LNA0;
++	else
++		sel = AR934X_GPIO_OUT_EXT_LNA1;
++
++	ath79_gpio_output_select(gpio, sel);
++}
++
++void __init ath79_wmac_set_ext_lna_gpio(unsigned chain, int gpio)
++{
++	if (soc_is_ar934x())
++		ar934x_set_ext_lna_gpio(chain, gpio);
++}
++
+ void __init ath79_register_wmac(u8 *cal_data, u8 *mac_addr)
+ {
+ 	if (soc_is_ar913x())
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -17,6 +17,7 @@ void ath79_register_wmac_simple(void);
+ void ath79_wmac_disable_2ghz(void);
+ void ath79_wmac_disable_5ghz(void);
+ void ath79_wmac_set_tx_gain_buffalo(void);
++void ath79_wmac_set_ext_lna_gpio(unsigned chain, int gpio);
+ 
+ bool ar93xx_wmac_read_mac_address(u8 *dest);
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/614-MIPS-ath79-ap81-remove-mtd-partitions.patch b/trunk/target/linux/ar71xx/patches-3.14/614-MIPS-ath79-ap81-remove-mtd-partitions.patch
new file mode 100644
index 00000000..6d403abd
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/614-MIPS-ath79-ap81-remove-mtd-partitions.patch
@@ -0,0 +1,49 @@
+--- a/arch/mips/ath79/mach-ap81.c
++++ b/arch/mips/ath79/mach-ap81.c
+@@ -33,37 +33,6 @@
+ 
+ #define AP81_CAL_DATA_ADDR	0x1fff1000
+ 
+-static struct mtd_partition ap81_partitions[] = {
+-	{
+-		.name		= "u-boot",
+-		.offset		= 0,
+-		.size		= 0x040000,
+-		.mask_flags	= MTD_WRITEABLE,
+-	}, {
+-		.name		= "u-boot-env",
+-		.offset		= 0x040000,
+-		.size		= 0x010000,
+-	}, {
+-		.name		= "rootfs",
+-		.offset		= 0x050000,
+-		.size		= 0x500000,
+-	}, {
+-		.name		= "uImage",
+-		.offset		= 0x550000,
+-		.size		= 0x100000,
+-	}, {
+-		.name		= "ART",
+-		.offset		= 0x650000,
+-		.size		= 0x1b0000,
+-		.mask_flags	= MTD_WRITEABLE,
+-	}
+-};
+-
+-static struct flash_platform_data ap81_flash_data = {
+-	.parts		= ap81_partitions,
+-	.nr_parts	= ARRAY_SIZE(ap81_partitions),
+-};
+-
+ static struct gpio_led ap81_leds_gpio[] __initdata = {
+ 	{
+ 		.name		= "ap81:green:status",
+@@ -111,7 +80,7 @@ static void __init ap81_setup(void)
+ 	ath79_register_gpio_keys_polled(-1, AP81_KEYS_POLL_INTERVAL,
+ 					ARRAY_SIZE(ap81_gpio_keys),
+ 					ap81_gpio_keys);
+-	ath79_register_m25p80(&ap81_flash_data);
++	ath79_register_m25p80(NULL);
+ 	ath79_register_wmac(cal_data, NULL);
+ 	ath79_register_usb();
+ 
diff --git a/trunk/target/linux/ar71xx/patches-3.14/615-MIPS-ath79-ap83-remove-mtd-partitions.patch b/trunk/target/linux/ar71xx/patches-3.14/615-MIPS-ath79-ap83-remove-mtd-partitions.patch
new file mode 100644
index 00000000..60872ae0
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/615-MIPS-ath79-ap83-remove-mtd-partitions.patch
@@ -0,0 +1,44 @@
+--- a/arch/mips/ath79/mach-ap83.c
++++ b/arch/mips/ath79/mach-ap83.c
+@@ -42,41 +42,8 @@
+ #define AP83_KEYS_POLL_INTERVAL		20	/* msecs */
+ #define AP83_KEYS_DEBOUNCE_INTERVAL	(3 * AP83_KEYS_POLL_INTERVAL)
+ 
+-static struct mtd_partition ap83_flash_partitions[] = {
+-	{
+-		.name		= "u-boot",
+-		.offset		= 0,
+-		.size		= 0x040000,
+-		.mask_flags	= MTD_WRITEABLE,
+-	}, {
+-		.name		= "u-boot-env",
+-		.offset		= 0x040000,
+-		.size		= 0x020000,
+-		.mask_flags	= MTD_WRITEABLE,
+-	}, {
+-		.name		= "kernel",
+-		.offset		= 0x060000,
+-		.size		= 0x140000,
+-	}, {
+-		.name		= "rootfs",
+-		.offset		= 0x1a0000,
+-		.size		= 0x650000,
+-	}, {
+-		.name		= "art",
+-		.offset		= 0x7f0000,
+-		.size		= 0x010000,
+-		.mask_flags	= MTD_WRITEABLE,
+-	}, {
+-		.name		= "firmware",
+-		.offset		= 0x060000,
+-		.size		= 0x790000,
+-	}
+-};
+-
+ static struct physmap_flash_data ap83_flash_data = {
+ 	.width		= 2,
+-	.parts		= ap83_flash_partitions,
+-	.nr_parts	= ARRAY_SIZE(ap83_flash_partitions),
+ };
+ 
+ static struct resource ap83_flash_resources[] = {
diff --git a/trunk/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch b/trunk/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch
new file mode 100644
index 00000000..3675518f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch
@@ -0,0 +1,95 @@
+--- a/arch/mips/ath79/mach-ubnt-xm.c
++++ b/arch/mips/ath79/mach-ubnt-xm.c
+@@ -332,3 +332,78 @@ static void __init ubnt_uap_pro_setup(vo
+ MIPS_MACHINE(ATH79_MACH_UBNT_UAP_PRO, "UAP-PRO", "Ubiquiti UniFi AP Pro",
+ 	     ubnt_uap_pro_setup);
+ 
++#define UBNT_XW_GPIO_LED_L1		11
++#define UBNT_XW_GPIO_LED_L2		16
++#define UBNT_XW_GPIO_LED_L3		13
++#define UBNT_XW_GPIO_LED_L4		14
++
++static struct gpio_led ubnt_xw_leds_gpio[] __initdata = {
++	{
++		.name		= "ubnt:red:link1",
++		.gpio		= UBNT_XW_GPIO_LED_L1,
++		.active_low	= 1,
++	}, {
++		.name		= "ubnt:orange:link2",
++		.gpio		= UBNT_XW_GPIO_LED_L2,
++		.active_low	= 1,
++	}, {
++		.name		= "ubnt:green:link3",
++		.gpio		= UBNT_XW_GPIO_LED_L3,
++		.active_low	= 1,
++	}, {
++		.name		= "ubnt:green:link4",
++		.gpio		= UBNT_XW_GPIO_LED_L4,
++		.active_low	= 1,
++	},
++};
++
++static void __init ubnt_xw_init(void)
++{
++	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
++
++	ath79_register_m25p80(NULL);
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_xw_leds_gpio),
++				 ubnt_xw_leds_gpio);
++	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++                                        ARRAY_SIZE(ubnt_xm_gpio_keys),
++                                        ubnt_xm_gpio_keys);
++
++	ath79_register_wmac(eeprom + UAP_PRO_WMAC_CALDATA_OFFSET, NULL);
++	ap91_pci_init(eeprom + UAP_PRO_PCI_CALDATA_OFFSET, NULL);
++
++
++	ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_MII_GMAC0 | AR934X_ETH_CFG_MII_GMAC0_SLAVE);
++	ath79_init_mac(ath79_eth0_data.mac_addr,
++		       eeprom + UAP_PRO_MAC0_OFFSET, 0);
++
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
++	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
++}
++
++static void __init ubnt_nano_m_xw_setup(void)
++{
++	ubnt_xw_init();
++
++	/* GMAC0 is connected to an AR8326 switch */
++	ath79_register_mdio(0, ~(BIT(0) | BIT(1) | BIT(5)));
++	ath79_eth0_data.phy_mask = (BIT(0) | BIT(1) | BIT(5));
++	ath79_eth0_data.speed = SPEED_100;
++	ath79_eth0_data.duplex = DUPLEX_FULL;
++	ath79_register_eth(0);
++}
++
++static void __init ubnt_loco_m_xw_setup(void)
++{
++	ubnt_xw_init();
++
++	ath79_register_mdio(0, ~BIT(1));
++	ath79_eth0_data.phy_mask = BIT(1);
++	ath79_register_eth(0);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M_XW, "UBNT-NM-XW", "Ubiquiti Nanostation M XW",
++	     ubnt_nano_m_xw_setup);
++
++MIPS_MACHINE(ATH79_MACH_UBNT_LOCO_M_XW, "UBNT-LOCO-XW", "Ubiquiti Loco M XW",
++	     ubnt_loco_m_xw_setup);
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -122,9 +122,11 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WR941ND,		/* TP-LINK TL-WR941ND */
+ 	ATH79_MACH_UBNT_AIRROUTER,	/* Ubiquiti AirRouter */
+ 	ATH79_MACH_UBNT_BULLET_M,	/* Ubiquiti Bullet M */
++	ATH79_MACH_UBNT_LOCO_M_XW, 	/* Ubiquiti Loco M XW */
+ 	ATH79_MACH_UBNT_LSSR71,		/* Ubiquiti LS-SR71 */
+ 	ATH79_MACH_UBNT_LSX,		/* Ubiquiti LSX */
+ 	ATH79_MACH_UBNT_NANO_M, 	/* Ubiquiti NanoStation M */
++	ATH79_MACH_UBNT_NANO_M_XW, 	/* Ubiquiti NanoStation M XW */
+ 	ATH79_MACH_UBNT_ROCKET_M,	/* Ubiquiti Rocket M */
+ 	ATH79_MACH_UBNT_RSPRO,		/* Ubiquiti RouterStation Pro */
+ 	ATH79_MACH_UBNT_RS,		/* Ubiquiti RouterStation */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/634-MIPS-ath79-WNR2000V4-support.patch b/trunk/target/linux/ar71xx/patches-3.14/634-MIPS-ath79-WNR2000V4-support.patch
new file mode 100644
index 00000000..76c326e7
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/634-MIPS-ath79-WNR2000V4-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -470,6 +470,16 @@ config ATH79_MACH_WNR2000_V3
+ 	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+ 
++config ATH79_MACH_WNR2000_V4
++	bool "NETGEAR WNR2000 V4"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_OM2P
+ 	bool "OpenMesh OM2P board support"
+ 	select SOC_AR724X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -115,6 +115,7 @@ obj-$(CONFIG_ATH79_MACH_WNDR3700)	+= mac
+ obj-$(CONFIG_ATH79_MACH_WNDR4300)	+= mach-wndr4300.o
+ obj-$(CONFIG_ATH79_MACH_WNR2000)	+= mach-wnr2000.o
+ obj-$(CONFIG_ATH79_MACH_WNR2000_V3)	+= mach-wnr2000-v3.o
++obj-$(CONFIG_ATH79_MACH_WNR2000_V4)	+= mach-wnr2000-v4.o
+ obj-$(CONFIG_ATH79_MACH_WNR2200)	+= mach-wnr2200.o
+ obj-$(CONFIG_ATH79_MACH_WP543)		+= mach-wp543.o
+ obj-$(CONFIG_ATH79_MACH_WPE72)		+= mach-wpe72.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -145,6 +145,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_WNDR4300,		/* NETGEAR WNDR4300 */
+ 	ATH79_MACH_WNR2000,		/* NETGEAR WNR2000 */
+ 	ATH79_MACH_WNR2000_V3,		/* NETGEAR WNR2000 v3 */
++	ATH79_MACH_WNR2000_V4,		/* NETGEAR WNR2000 v4 */
+ 	ATH79_MACH_WNR2200,		/* NETGEAR WNR2200 */
+ 	ATH79_MACH_WNR612_V2,		/* NETGEAR WNR612 v2 */
+ 	ATH79_MACH_WP543,		/* Compex WP543 */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/700-MIPS-ath79-add-TL-WA801NDv2-suport.patch b/trunk/target/linux/ar71xx/patches-3.14/700-MIPS-ath79-add-TL-WA801NDv2-suport.patch
new file mode 100644
index 00000000..610882e4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/700-MIPS-ath79-add-TL-WA801NDv2-suport.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -102,6 +102,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WA750RE,		/* TP-LINK TL-WA750RE */
+ 	ATH79_MACH_TL_WA7510N_V1,	/* TP-LINK TL-WA7510N v1*/
+ 	ATH79_MACH_TL_WA850RE,		/* TP-LINK TL-WA850RE */
++	ATH79_MACH_TL_WA801ND_V2,	/* TP-LINK TL-WA801ND v2 */
+ 	ATH79_MACH_TL_WA901ND,		/* TP-LINK TL-WA901ND */
+ 	ATH79_MACH_TL_WA901ND_V2,	/* TP-LINK TL-WA901ND v2 */
+ 	ATH79_MACH_TL_WDR3500,		/* TP-LINK TL-WDR3500 */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/701-MIPS-ath79-add-TL-WA901ND-v3-support.patch b/trunk/target/linux/ar71xx/patches-3.14/701-MIPS-ath79-add-TL-WA901ND-v3-support.patch
new file mode 100644
index 00000000..3d43e315
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/701-MIPS-ath79-add-TL-WA901ND-v3-support.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -105,6 +105,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WA801ND_V2,	/* TP-LINK TL-WA801ND v2 */
+ 	ATH79_MACH_TL_WA901ND,		/* TP-LINK TL-WA901ND */
+ 	ATH79_MACH_TL_WA901ND_V2,	/* TP-LINK TL-WA901ND v2 */
++	ATH79_MACH_TL_WA901ND_V3,	/* TP-LINK TL-WA901ND v3 */
+ 	ATH79_MACH_TL_WDR3500,		/* TP-LINK TL-WDR3500 */
+ 	ATH79_MACH_TL_WDR4300,		/* TP-LINK TL-WDR4300 */
+ 	ATH79_MACH_TL_WR1041N_V2,	/* TP-LINK TL-WR1041N v2 */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/702-MIPS-ath79-add-MyNet-N750-support.patch b/trunk/target/linux/ar71xx/patches-3.14/702-MIPS-ath79-add-MyNet-N750-support.patch
new file mode 100644
index 00000000..fed48a1f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/702-MIPS-ath79-add-MyNet-N750-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -58,6 +58,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_MR600V2,		/* OpenMesh MR600v2 */
+ 	ATH79_MACH_MR600,		/* OpenMesh MR600 */
+ 	ATH79_MACH_MYNET_N600,		/* WD My Net N600 */
++	ATH79_MACH_MYNET_N750,		/* WD My Net N750 */
+ 	ATH79_MACH_MYNET_REXT,		/* WD My Net Wi-Fi Range Extender */
+ 	ATH79_MACH_MZK_W04NU,		/* Planex MZK-W04NU */
+ 	ATH79_MACH_MZK_W300NH,		/* Planex MZK-W300NH */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -839,6 +839,16 @@ config ATH79_MACH_MYNET_N600
+ 	select ATH79_DEV_WMAC
+ 	select ATH79_NVRAM
+ 
++config ATH79_MACH_MYNET_N750
++	bool "WD My Net N750 board support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_NVRAM
++
+ config ATH79_MACH_MYNET_REXT
+ 	bool "WD My Net Wi-Fi Range Extender board support"
+ 	select SOC_AR934X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -68,6 +68,7 @@ obj-$(CONFIG_ATH79_MACH_JWAP003)	+= mach
+ obj-$(CONFIG_ATH79_MACH_HORNET_UB)	+= mach-hornet-ub.o
+ obj-$(CONFIG_ATH79_MACH_MR600)		+= mach-mr600.o
+ obj-$(CONFIG_ATH79_MACH_MYNET_N600)	+= mach-mynet-n600.o
++obj-$(CONFIG_ATH79_MACH_MYNET_N750)	+= mach-mynet-n750.o
+ obj-$(CONFIG_ATH79_MACH_MYNET_REXT)	+= mach-mynet-rext.o
+ obj-$(CONFIG_ATH79_MACH_MZK_W04NU)	+= mach-mzk-w04nu.o
+ obj-$(CONFIG_ATH79_MACH_MZK_W300NH)	+= mach-mzk-w300nh.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/703-MIPS-ath79-add-RB91x-support.patch b/trunk/target/linux/ar71xx/patches-3.14/703-MIPS-ath79-add-RB91x-support.patch
new file mode 100644
index 00000000..e95eabb5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/703-MIPS-ath79-add-RB91x-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -77,6 +77,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_RB_450,		/* MikroTik RouterBOARD 450 */
+ 	ATH79_MACH_RB_493,		/* Mikrotik RouterBOARD 493/493AH */
+ 	ATH79_MACH_RB_493G,		/* Mikrotik RouterBOARD 493G */
++	ATH79_MACH_RB_711GR100,		/* Mikrotik RouterBOARD 911/912 boards */
+ 	ATH79_MACH_RB_750,		/* MikroTik RouterBOARD 750 */
+ 	ATH79_MACH_RB_750G_R3,		/* MikroTik RouterBOARD 750GL */
+ 	ATH79_MACH_RB_751,		/* MikroTik RouterBOARD 751 */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -391,6 +391,16 @@ config ATH79_MACH_RB750
+ 	select ATH79_ROUTERBOOT
+ 	select RLE_DECOMPRESS
+ 
++config ATH79_MACH_RB91X
++	bool "MikroTik RouterBOARD 91X support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_SPI
++	select ATH79_DEV_WMAC
++	select ATH79_DEV_USB
++	select ATH79_ROUTERBOOT
++	select RLE_DECOMPRESS
++
+ config ATH79_MACH_RB95X
+        bool "MikroTik RouterBOARD 95X support"
+        select SOC_AR934X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -79,6 +79,7 @@ obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-p
+ obj-$(CONFIG_ATH79_MACH_PB92)		+= mach-pb92.o
+ obj-$(CONFIG_ATH79_MACH_RB4XX)		+= mach-rb4xx.o
+ obj-$(CONFIG_ATH79_MACH_RB750)		+= mach-rb750.o
++obj-$(CONFIG_ATH79_MACH_RB91X)		+= mach-rb91x.o
+ obj-$(CONFIG_ATH79_MACH_RB95X)		+= mach-rb95x.o
+ obj-$(CONFIG_ATH79_MACH_RB2011)		+= mach-rb2011.o
+ obj-$(CONFIG_ATH79_MACH_RW2458N)	+= mach-rw2458n.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/704-MIPS-ath79-TL-WDR4900v2-support.patch b/trunk/target/linux/ar71xx/patches-3.14/704-MIPS-ath79-TL-WDR4900v2-support.patch
new file mode 100644
index 00000000..3de922a9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/704-MIPS-ath79-TL-WDR4900v2-support.patch
@@ -0,0 +1,23 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -110,6 +110,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WA901ND_V3,	/* TP-LINK TL-WA901ND v3 */
+ 	ATH79_MACH_TL_WDR3500,		/* TP-LINK TL-WDR3500 */
+ 	ATH79_MACH_TL_WDR4300,		/* TP-LINK TL-WDR4300 */
++	ATH79_MACH_TL_WDR4900_V2,	/* TP-LINK TL-WDR4900 v2 */
+ 	ATH79_MACH_TL_WR1041N_V2,	/* TP-LINK TL-WR1041N v2 */
+ 	ATH79_MACH_TL_WR1043ND,		/* TP-LINK TL-WR1043ND */
+ 	ATH79_MACH_TL_WR1043ND_V2,	/* TP-LINK TL-WR1043ND v2 */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -559,8 +559,9 @@ config ATH79_MACH_EAP7660D
+ 	select ATH79_DEV_M25P80
+ 
+ config ATH79_MACH_ARCHER_C7
+-	bool "TP-LINK Archer C7 board support"
++	bool "TP-LINK Archer C7/TL-WDR4900 v2 board support"
+ 	select SOC_QCA955X
++	select ATH79_DEV_AP9X_PCI if PCI
+ 	select ATH79_DEV_ETH
+ 	select ATH79_DEV_GPIO_BUTTONS
+ 	select ATH79_DEV_LEDS_GPIO
diff --git a/trunk/target/linux/ar71xx/patches-3.14/705-MIPS-ath79-add-RB951Ui-2HnD-support.patch b/trunk/target/linux/ar71xx/patches-3.14/705-MIPS-ath79-add-RB951Ui-2HnD-support.patch
new file mode 100644
index 00000000..614659e4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/705-MIPS-ath79-add-RB951Ui-2HnD-support.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -83,6 +83,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_RB_751,		/* MikroTik RouterBOARD 751 */
+ 	ATH79_MACH_RB_751G,		/* Mikrotik RouterBOARD 751G */
+ 	ATH79_MACH_RB_951G,		/* Mikrotik RouterBOARD 951G */
++	ATH79_MACH_RB_951U,		/* Mikrotik RouterBOARD 951Ui-2HnD */
+ 	ATH79_MACH_RB_2011G,		/* Mikrotik RouterBOARD 2011UAS-2HnD */
+ 	ATH79_MACH_RB_2011L,		/* Mikrotik RouterBOARD 2011L */
+ 	ATH79_MACH_RB_2011US,		/* Mikrotik RouterBOARD 2011UAS */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/706-MIPS-ath79-oolite-v1-support.patch b/trunk/target/linux/ar71xx/patches-3.14/706-MIPS-ath79-oolite-v1-support.patch
new file mode 100644
index 00000000..43ef3465
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/706-MIPS-ath79-oolite-v1-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -51,6 +51,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_EW_DORIN,		/* embedded wireless Dorin Platform */
+ 	ATH79_MACH_EW_DORIN_ROUTER,	/* embedded wireless Dorin Router Platform */
+ 	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
++	ATH79_MACH_GS_OOLITE,           /* GS OOLITE V1.0 */
+ 	ATH79_MACH_JA76PF,		/* jjPlus JA76PF */
+ 	ATH79_MACH_JA76PF2,		/* jjPlus JA76PF2 */
+ 	ATH79_MACH_JWAP003,		/* jjPlus JWAP003 */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -337,6 +337,16 @@ config ATH79_MACH_EW_DORIN
+ 	  Say 'Y' here if you want your kernel to support the
+ 	  Dorin Platform from www.80211.de .
+ 
++config ATH79_MACH_GS_OOLITE
++       bool "GS Oolite V1 support"
++       select SOC_AR933X
++       select ARH79_DEV_ETH
++       select ARH79_DEV_GPIO_BUTTONS
++       select ATH79_DEV_LEDS_GPIO
++       select ATH79_DEV_M25P80
++       select ATH79_DEV_USB
++       select ATH79_DEV_WMAC
++
+ config ATH79_MACH_JA76PF
+ 	bool "jjPlus JA76PF board support"
+ 	select SOC_AR71XX
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -63,6 +63,7 @@ obj-$(CONFIG_ATH79_MACH_DIR_825_C1)	+= m
+ obj-$(CONFIG_ATH79_MACH_DRAGINO2)	+= mach-dragino2.o
+ obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mach-ew-dorin.o
+ obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
++obj-$(CONFIG_ATH79_MACH_GS_OOLITE)	+= mach-gs-oolite.o
+ obj-$(CONFIG_ATH79_MACH_JA76PF)		+= mach-ja76pf.o
+ obj-$(CONFIG_ATH79_MACH_JWAP003)	+= mach-jwap003.o
+ obj-$(CONFIG_ATH79_MACH_HORNET_UB)	+= mach-hornet-ub.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/trunk/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
new file mode 100644
index 00000000..fdfd7f8c
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
@@ -0,0 +1,435 @@
+From 5300a7cd7ed2f88488ddba62947b9c6bb9663777 Mon Sep 17 00:00:00 2001
+Message-Id: <5300a7cd7ed2f88488ddba62947b9c6bb9663777.1396122227.git.mschiffer@universe-factory.net>
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 29 Mar 2014 20:26:08 +0100
+Subject: [PATCH 1/2] MIPS: ath79: add support for QCA953x SoC
+
+Note that the clock calculation looks very similar to the QCA955x, but the
+meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
+---
+ arch/mips/ath79/Kconfig                        |  6 +-
+ arch/mips/ath79/clock.c                        | 78 ++++++++++++++++++++++++++
+ arch/mips/ath79/common.c                       |  4 ++
+ arch/mips/ath79/dev-common.c                   |  1 +
+ arch/mips/ath79/dev-wmac.c                     | 20 +++++++
+ arch/mips/ath79/early_printk.c                 |  1 +
+ arch/mips/ath79/gpio.c                         |  4 +-
+ arch/mips/ath79/irq.c                          |  4 ++
+ arch/mips/ath79/setup.c                        |  8 ++-
+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 48 ++++++++++++++++
+ arch/mips/include/asm/mach-ath79/ath79.h       | 11 ++++
+ 11 files changed, 182 insertions(+), 3 deletions(-)
+
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -948,6 +948,10 @@ config SOC_AR934X
+ 	select PCI_AR724X if PCI
+ 	def_bool n
+ 
++config SOC_QCA953X
++	select USB_ARCH_HAS_EHCI
++	def_bool n
++
+ config SOC_QCA955X
+ 	select USB_ARCH_HAS_EHCI
+ 	select HW_HAS_PCI
+@@ -991,7 +995,7 @@ config ATH79_DEV_USB
+ 	def_bool n
+ 
+ config ATH79_DEV_WMAC
+-	depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA955X)
++	depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA953X || SOC_QCA955X)
+ 	def_bool n
+ 
+ config ATH79_NVRAM
+--- a/arch/mips/ath79/clock.c
++++ b/arch/mips/ath79/clock.c
+@@ -350,6 +350,91 @@ static void __init ar934x_clocks_init(vo
+ 	iounmap(dpll_base);
+ }
+ 
++static void __init qca953x_clocks_init(void)
++{
++	unsigned long ref_rate;
++	unsigned long cpu_rate;
++	unsigned long ddr_rate;
++	unsigned long ahb_rate;
++	u32 pll, out_div, ref_div, nint, frac, clk_ctrl, postdiv;
++	u32 cpu_pll, ddr_pll;
++	u32 bootstrap;
++
++	bootstrap = ath79_reset_rr(QCA953X_RESET_REG_BOOTSTRAP);
++	if (bootstrap &	QCA953X_BOOTSTRAP_REF_CLK_40)
++		ref_rate = 40 * 1000 * 1000;
++	else
++		ref_rate = 25 * 1000 * 1000;
++
++	pll = ath79_pll_rr(QCA953X_PLL_CPU_CONFIG_REG);
++	out_div = (pll >> QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
++		  QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK;
++	ref_div = (pll >> QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
++		  QCA953X_PLL_CPU_CONFIG_REFDIV_MASK;
++	nint = (pll >> QCA953X_PLL_CPU_CONFIG_NINT_SHIFT) &
++	       QCA953X_PLL_CPU_CONFIG_NINT_MASK;
++	frac = (pll >> QCA953X_PLL_CPU_CONFIG_NFRAC_SHIFT) &
++	       QCA953X_PLL_CPU_CONFIG_NFRAC_MASK;
++
++	cpu_pll = nint * ref_rate / ref_div;
++	cpu_pll += frac * (ref_rate >> 6) / ref_div;
++	cpu_pll /= (1 << out_div);
++
++	pll = ath79_pll_rr(QCA953X_PLL_DDR_CONFIG_REG);
++	out_div = (pll >> QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
++		  QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK;
++	ref_div = (pll >> QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
++		  QCA953X_PLL_DDR_CONFIG_REFDIV_MASK;
++	nint = (pll >> QCA953X_PLL_DDR_CONFIG_NINT_SHIFT) &
++	       QCA953X_PLL_DDR_CONFIG_NINT_MASK;
++	frac = (pll >> QCA953X_PLL_DDR_CONFIG_NFRAC_SHIFT) &
++	       QCA953X_PLL_DDR_CONFIG_NFRAC_MASK;
++
++	ddr_pll = nint * ref_rate / ref_div;
++	ddr_pll += frac * (ref_rate >> 6) / (ref_div << 4);
++	ddr_pll /= (1 << out_div);
++
++	clk_ctrl = ath79_pll_rr(QCA953X_PLL_CLK_CTRL_REG);
++
++	postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
++		  QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
++
++	if (clk_ctrl & QCA953X_PLL_CLK_CTRL_CPU_PLL_BYPASS)
++		cpu_rate = ref_rate;
++	else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL)
++		cpu_rate = cpu_pll / (postdiv + 1);
++	else
++		cpu_rate = ddr_pll / (postdiv + 1);
++
++	postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT) &
++		  QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_MASK;
++
++	if (clk_ctrl & QCA953X_PLL_CLK_CTRL_DDR_PLL_BYPASS)
++		ddr_rate = ref_rate;
++	else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL)
++		ddr_rate = ddr_pll / (postdiv + 1);
++	else
++		ddr_rate = cpu_pll / (postdiv + 1);
++
++	postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT) &
++		  QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_MASK;
++
++	if (clk_ctrl & QCA953X_PLL_CLK_CTRL_AHB_PLL_BYPASS)
++		ahb_rate = ref_rate;
++	else if (clk_ctrl & QCA953X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL)
++		ahb_rate = ddr_pll / (postdiv + 1);
++	else
++		ahb_rate = cpu_pll / (postdiv + 1);
++
++	ath79_add_sys_clkdev("ref", ref_rate);
++	ath79_add_sys_clkdev("cpu", cpu_rate);
++	ath79_add_sys_clkdev("ddr", ddr_rate);
++	ath79_add_sys_clkdev("ahb", ahb_rate);
++
++	clk_add_alias("wdt", NULL, "ref", NULL);
++	clk_add_alias("uart", NULL, "ref", NULL);
++}
++
+ static void __init qca955x_clocks_init(void)
+ {
+ 	unsigned long ref_rate;
+@@ -447,6 +532,8 @@ void __init ath79_clocks_init(void)
+ 		ar933x_clocks_init();
+ 	else if (soc_is_ar934x())
+ 		ar934x_clocks_init();
++	else if (soc_is_qca953x())
++		qca953x_clocks_init();
+ 	else if (soc_is_qca955x())
+ 		qca955x_clocks_init();
+ 	else
+--- a/arch/mips/ath79/common.c
++++ b/arch/mips/ath79/common.c
+@@ -73,6 +73,8 @@ void ath79_device_reset_set(u32 mask)
+ 		reg = AR933X_RESET_REG_RESET_MODULE;
+ 	else if (soc_is_ar934x())
+ 		reg = AR934X_RESET_REG_RESET_MODULE;
++	else if (soc_is_qca953x())
++		reg = QCA953X_RESET_REG_RESET_MODULE;
+ 	else if (soc_is_qca955x())
+ 		reg = QCA955X_RESET_REG_RESET_MODULE;
+ 	else
+@@ -101,6 +103,8 @@ void ath79_device_reset_clear(u32 mask)
+ 		reg = AR933X_RESET_REG_RESET_MODULE;
+ 	else if (soc_is_ar934x())
+ 		reg = AR934X_RESET_REG_RESET_MODULE;
++	else if (soc_is_qca953x())
++		reg = QCA953X_RESET_REG_RESET_MODULE;
+ 	else if (soc_is_qca955x())
+ 		reg = QCA955X_RESET_REG_RESET_MODULE;
+ 	else
+--- a/arch/mips/ath79/dev-common.c
++++ b/arch/mips/ath79/dev-common.c
+@@ -93,6 +93,7 @@ void __init ath79_register_uart(void)
+ 	    soc_is_ar724x() ||
+ 	    soc_is_ar913x() ||
+ 	    soc_is_ar934x() ||
++	    soc_is_qca953x() ||
+ 	    soc_is_qca955x()) {
+ 		ath79_uart_data[0].uartclk = uart_clk_rate;
+ 		platform_device_register(&ath79_uart_device);
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -101,7 +101,7 @@ static int ar933x_wmac_reset(void)
+ 	return -ETIMEDOUT;
+ }
+ 
+-static int ar933x_r1_get_wmac_revision(void)
++static int ar93xx_get_soc_revision(void)
+ {
+ 	return ath79_soc_rev;
+ }
+@@ -126,7 +126,7 @@ static void __init ar933x_wmac_setup(voi
+ 		ath79_wmac_data.is_clk_25mhz = true;
+ 
+ 	if (ath79_soc_rev == 1)
+-		ath79_wmac_data.get_mac_revision = ar933x_r1_get_wmac_revision;
++		ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision;
+ 
+ 	ath79_wmac_data.external_reset = ar933x_wmac_reset;
+ }
+@@ -149,6 +149,26 @@ static void ar934x_wmac_setup(void)
+ 		ath79_wmac_data.is_clk_25mhz = true;
+ }
+ 
++static void qca953x_wmac_setup(void)
++{
++	u32 t;
++
++	ath79_wmac_device.name = "qca953x_wmac";
++
++	ath79_wmac_resources[0].start = QCA953X_WMAC_BASE;
++	ath79_wmac_resources[0].end = QCA953X_WMAC_BASE + QCA953X_WMAC_SIZE - 1;
++	ath79_wmac_resources[1].start = ATH79_CPU_IRQ(2);
++	ath79_wmac_resources[1].end = ATH79_CPU_IRQ(2);
++
++	t = ath79_reset_rr(QCA953X_RESET_REG_BOOTSTRAP);
++	if (t & QCA953X_BOOTSTRAP_REF_CLK_40)
++		ath79_wmac_data.is_clk_25mhz = false;
++	else
++		ath79_wmac_data.is_clk_25mhz = true;
++
++	ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision;
++}
++
+ static void qca955x_wmac_setup(void)
+ {
+ 	u32 t;
+@@ -366,6 +386,8 @@ void __init ath79_register_wmac(u8 *cal_
+ 		ar933x_wmac_setup();
+ 	else if (soc_is_ar934x())
+ 		ar934x_wmac_setup();
++	else if (soc_is_qca953x())
++		qca953x_wmac_setup();
+ 	else if (soc_is_qca955x())
+ 		qca955x_wmac_setup();
+ 	else
+--- a/arch/mips/ath79/early_printk.c
++++ b/arch/mips/ath79/early_printk.c
+@@ -114,6 +114,7 @@ static void prom_putchar_init(void)
+ 	case REV_ID_MAJOR_AR9341:
+ 	case REV_ID_MAJOR_AR9342:
+ 	case REV_ID_MAJOR_AR9344:
++	case REV_ID_MAJOR_QCA9533:
+ 	case REV_ID_MAJOR_QCA9556:
+ 	case REV_ID_MAJOR_QCA9558:
+ 		_prom_putchar = prom_putchar_ar71xx;
+--- a/arch/mips/ath79/gpio.c
++++ b/arch/mips/ath79/gpio.c
+@@ -224,6 +224,8 @@ void __init ath79_gpio_init(void)
+ 		ath79_gpio_count = AR933X_GPIO_COUNT;
+ 	else if (soc_is_ar934x())
+ 		ath79_gpio_count = AR934X_GPIO_COUNT;
++	else if (soc_is_qca953x())
++		ath79_gpio_count = QCA953X_GPIO_COUNT;
+ 	else if (soc_is_qca955x())
+ 		ath79_gpio_count = QCA955X_GPIO_COUNT;
+ 	else
+@@ -231,7 +233,7 @@ void __init ath79_gpio_init(void)
+ 
+ 	ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE);
+ 	ath79_gpio_chip.ngpio = ath79_gpio_count;
+-	if (soc_is_ar934x() || soc_is_qca955x()) {
++	if (soc_is_ar934x() || soc_is_qca953x() || soc_is_qca955x()) {
+ 		ath79_gpio_chip.direction_input = ar934x_gpio_direction_input;
+ 		ath79_gpio_chip.direction_output = ar934x_gpio_direction_output;
+ 	}
+--- a/arch/mips/ath79/irq.c
++++ b/arch/mips/ath79/irq.c
+@@ -106,6 +106,7 @@ static void __init ath79_misc_irq_init(v
+ 	else if (soc_is_ar724x() ||
+ 		 soc_is_ar933x() ||
+ 		 soc_is_ar934x() ||
++		 soc_is_qca953x() ||
+ 		 soc_is_qca955x())
+ 		ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;
+ 	else
+@@ -352,6 +353,9 @@ void __init arch_init_irq(void)
+ 	} else if (soc_is_ar934x()) {
+ 		ath79_ip2_handler = ath79_default_ip2_handler;
+ 		ath79_ip3_handler = ar934x_ip3_handler;
++	} else if (soc_is_qca953x()) {
++		ath79_ip2_handler = ath79_default_ip2_handler;
++		ath79_ip3_handler = ath79_default_ip3_handler;
+ 	} else if (soc_is_qca955x()) {
+ 		ath79_ip2_handler = ath79_default_ip2_handler;
+ 		ath79_ip3_handler = ath79_default_ip3_handler;
+--- a/arch/mips/ath79/setup.c
++++ b/arch/mips/ath79/setup.c
+@@ -151,6 +151,12 @@ static void __init ath79_detect_sys_type
+ 		rev = id & AR934X_REV_ID_REVISION_MASK;
+ 		break;
+ 
++	case REV_ID_MAJOR_QCA9533:
++		ath79_soc = ATH79_SOC_QCA9533;
++		chip = "9533";
++		rev = id & QCA953X_REV_ID_REVISION_MASK;
++		break;
++
+ 	case REV_ID_MAJOR_QCA9556:
+ 		ath79_soc = ATH79_SOC_QCA9556;
+ 		chip = "9556";
+@@ -169,7 +175,7 @@ static void __init ath79_detect_sys_type
+ 
+ 	ath79_soc_rev = rev;
+ 
+-	if (soc_is_qca955x())
++	if (soc_is_qca953x() || soc_is_qca955x())
+ 		sprintf(ath79_sys_type, "Qualcomm Atheros QCA%s rev %u",
+ 			chip, rev);
+ 	else
+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+@@ -105,6 +105,9 @@
+ #define AR934X_SRIF_BASE	(AR71XX_APB_BASE + 0x00116000)
+ #define AR934X_SRIF_SIZE	0x1000
+ 
++#define QCA953X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
++#define QCA953X_WMAC_SIZE	0x20000
++
+ #define QCA955X_PCI_MEM_BASE0	0x10000000
+ #define QCA955X_PCI_MEM_BASE1	0x12000000
+ #define QCA955X_PCI_MEM_SIZE	0x02000000
+@@ -279,6 +282,43 @@
+ 
+ #define AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL	BIT(6)
+ 
++#define QCA953X_PLL_CPU_CONFIG_REG		0x00
++#define QCA953X_PLL_DDR_CONFIG_REG		0x04
++#define QCA953X_PLL_CLK_CTRL_REG		0x08
++#define QCA953X_PLL_ETH_XMII_CONTROL_REG	0x2c
++#define QCA953X_PLL_ETH_SGMII_CONTROL_REG	0x48
++
++#define QCA953X_PLL_CPU_CONFIG_NFRAC_SHIFT	0
++#define QCA953X_PLL_CPU_CONFIG_NFRAC_MASK	0x3f
++#define QCA953X_PLL_CPU_CONFIG_NINT_SHIFT	6
++#define QCA953X_PLL_CPU_CONFIG_NINT_MASK	0x3f
++#define QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT	12
++#define QCA953X_PLL_CPU_CONFIG_REFDIV_MASK	0x1f
++#define QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT	19
++#define QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK	0x3
++
++#define QCA953X_PLL_DDR_CONFIG_NFRAC_SHIFT	0
++#define QCA953X_PLL_DDR_CONFIG_NFRAC_MASK	0x3ff
++#define QCA953X_PLL_DDR_CONFIG_NINT_SHIFT	10
++#define QCA953X_PLL_DDR_CONFIG_NINT_MASK	0x3f
++#define QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT	16
++#define QCA953X_PLL_DDR_CONFIG_REFDIV_MASK	0x1f
++#define QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT	23
++#define QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK	0x7
++
++#define QCA953X_PLL_CLK_CTRL_CPU_PLL_BYPASS		BIT(2)
++#define QCA953X_PLL_CLK_CTRL_DDR_PLL_BYPASS		BIT(3)
++#define QCA953X_PLL_CLK_CTRL_AHB_PLL_BYPASS		BIT(4)
++#define QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT		5
++#define QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK		0x1f
++#define QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT		10
++#define QCA953X_PLL_CLK_CTRL_DDR_POST_DIV_MASK		0x1f
++#define QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT		15
++#define QCA953X_PLL_CLK_CTRL_AHB_POST_DIV_MASK		0x1f
++#define QCA953X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL		BIT(20)
++#define QCA953X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL		BIT(21)
++#define QCA953X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL		BIT(24)
++
+ #define QCA955X_PLL_CPU_CONFIG_REG		0x00
+ #define QCA955X_PLL_DDR_CONFIG_REG		0x04
+ #define QCA955X_PLL_CLK_CTRL_REG		0x08
+@@ -355,6 +395,10 @@
+ #define AR934X_RESET_REG_BOOTSTRAP		0xb0
+ #define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS	0xac
+ 
++#define QCA953X_RESET_REG_RESET_MODULE		0x1c
++#define QCA953X_RESET_REG_BOOTSTRAP		0xb0
++#define QCA953X_RESET_REG_EXT_INT_STATUS	0xac
++
+ #define QCA955X_RESET_REG_RESET_MODULE		0x1c
+ #define QCA955X_RESET_REG_BOOTSTRAP		0xb0
+ #define QCA955X_RESET_REG_EXT_INT_STATUS	0xac
+@@ -503,6 +547,8 @@
+ #define AR934X_BOOTSTRAP_SDRAM_DISABLED BIT(1)
+ #define AR934X_BOOTSTRAP_DDR1		BIT(0)
+ 
++#define QCA953X_BOOTSTRAP_REF_CLK_40	BIT(4)
++
+ #define QCA955X_BOOTSTRAP_REF_CLK_40	BIT(4)
+ 
+ #define AR934X_PCIE_WMAC_INT_WMAC_MISC		BIT(0)
+@@ -565,6 +611,7 @@
+ #define REV_ID_MAJOR_AR9341		0x0120
+ #define REV_ID_MAJOR_AR9342		0x1120
+ #define REV_ID_MAJOR_AR9344		0x2120
++#define REV_ID_MAJOR_QCA9533		0x0140
+ #define REV_ID_MAJOR_QCA9556		0x0130
+ #define REV_ID_MAJOR_QCA9558		0x1130
+ 
+@@ -587,6 +634,8 @@
+ 
+ #define AR934X_REV_ID_REVISION_MASK	0xf
+ 
++#define QCA953X_REV_ID_REVISION_MASK	0xf
++
+ #define QCA955X_REV_ID_REVISION_MASK	0xf
+ 
+ /*
+@@ -640,6 +689,7 @@
+ #define AR913X_GPIO_COUNT		22
+ #define AR933X_GPIO_COUNT		30
+ #define AR934X_GPIO_COUNT		23
++#define QCA953X_GPIO_COUNT		24
+ #define QCA955X_GPIO_COUNT		24
+ 
+ /*
+--- a/arch/mips/include/asm/mach-ath79/ath79.h
++++ b/arch/mips/include/asm/mach-ath79/ath79.h
+@@ -32,6 +32,7 @@ enum ath79_soc_type {
+ 	ATH79_SOC_AR9341,
+ 	ATH79_SOC_AR9342,
+ 	ATH79_SOC_AR9344,
++	ATH79_SOC_QCA9533,
+ 	ATH79_SOC_QCA9556,
+ 	ATH79_SOC_QCA9558,
+ };
+@@ -100,6 +101,16 @@ static inline int soc_is_ar934x(void)
+ 	return soc_is_ar9341() || soc_is_ar9342() || soc_is_ar9344();
+ }
+ 
++static inline int soc_is_qca9533(void)
++{
++	return ath79_soc == ATH79_SOC_QCA9533;
++}
++
++static inline int soc_is_qca953x(void)
++{
++	return soc_is_qca9533();
++}
++
+ static inline int soc_is_qca9556(void)
+ {
+ 	return ath79_soc == ATH79_SOC_QCA9556;
diff --git a/trunk/target/linux/ar71xx/patches-3.14/708-MIPS-ath79-TL-WR841v9-support.patch b/trunk/target/linux/ar71xx/patches-3.14/708-MIPS-ath79-TL-WR841v9-support.patch
new file mode 100644
index 00000000..ffb13696
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/708-MIPS-ath79-TL-WR841v9-support.patch
@@ -0,0 +1,38 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -735,6 +735,15 @@ config ATH79_MACH_TL_WR841N_V8
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_TL_WR841N_V9
++       bool "TP-LINK TL-WR841N/ND v9 support"
++       select SOC_QCA953X
++       select ATH79_DEV_ETH
++       select ATH79_DEV_GPIO_BUTTONS
++       select ATH79_DEV_LEDS_GPIO
++       select ATH79_DEV_M25P80
++       select ATH79_DEV_WMAC
++
+ config ATH79_MACH_TL_WR941ND
+ 	bool "TP-LINK TL-WR941ND support"
+ 	select SOC_AR913X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -101,6 +101,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WR741ND)	+= m
+ obj-$(CONFIG_ATH79_MACH_TL_WR741ND_V4)	+= mach-tl-wr741nd-v4.o
+ obj-$(CONFIG_ATH79_MACH_TL_WR841N_V1)	+= mach-tl-wr841n.o
+ obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8)	+= mach-tl-wr841n-v8.o
++obj-$(CONFIG_ATH79_MACH_TL_WR841N_V9)	+= mach-tl-wr841n-v9.o
+ obj-$(CONFIG_ATH79_MACH_TL_WR941ND)	+= mach-tl-wr941nd.o
+ obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2)	+= mach-tl-wr1041n-v2.o
+ obj-$(CONFIG_ATH79_MACH_TL_WR1043ND)	+= mach-tl-wr1043nd.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -125,6 +125,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WR841N_V1,	/* TP-LINK TL-WR841N v1 */
+ 	ATH79_MACH_TL_WR841N_V7,	/* TP-LINK TL-WR841N/ND v7 */
+ 	ATH79_MACH_TL_WR841N_V8,	/* TP-LINK TL-WR841N/ND v8 */
++	ATH79_MACH_TL_WR841N_V9,	/* TP-LINK TL-WR841N/ND v9 */
+ 	ATH79_MACH_TL_WR842N_V2,	/* TP-LINK TL-WR842N/ND v2 */
+ 	ATH79_MACH_TL_WR941ND,		/* TP-LINK TL-WR941ND */
+ 	ATH79_MACH_UBNT_AIRROUTER,	/* Ubiquiti AirRouter */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-HiWiFi-HC6361-support.patch b/trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-HiWiFi-HC6361-support.patch
new file mode 100644
index 00000000..98f404e3
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-HiWiFi-HC6361-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -64,6 +64,7 @@ obj-$(CONFIG_ATH79_MACH_DRAGINO2)	+= mac
+ obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mach-ew-dorin.o
+ obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
+ obj-$(CONFIG_ATH79_MACH_GS_OOLITE)	+= mach-gs-oolite.o
++obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361)	+= mach-hiwifi-hc6361.o
+ obj-$(CONFIG_ATH79_MACH_JA76PF)		+= mach-ja76pf.o
+ obj-$(CONFIG_ATH79_MACH_JWAP003)	+= mach-jwap003.o
+ obj-$(CONFIG_ATH79_MACH_HORNET_UB)	+= mach-hornet-ub.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -52,6 +52,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_EW_DORIN_ROUTER,	/* embedded wireless Dorin Router Platform */
+ 	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
+ 	ATH79_MACH_GS_OOLITE,           /* GS OOLITE V1.0 */
++	ATH79_MACH_HIWIFI_HC6361,	/* HiWiFi HC6361 */
+ 	ATH79_MACH_JA76PF,		/* jjPlus JA76PF */
+ 	ATH79_MACH_JA76PF2,		/* jjPlus JA76PF2 */
+ 	ATH79_MACH_JWAP003,		/* jjPlus JWAP003 */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -347,6 +347,16 @@ config ATH79_MACH_GS_OOLITE
+        select ATH79_DEV_USB
+        select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_HIWIFI_HC6361
++	bool "HiWiFi HC6361 board support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_JA76PF
+ 	bool "jjPlus JA76PF board support"
+ 	select SOC_AR71XX
diff --git a/trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch b/trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
new file mode 100644
index 00000000..9be54830
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
@@ -0,0 +1,37 @@
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -132,3 +132,4 @@ obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H)	+
+ obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H)	+= mach-wzr-hp-g450h.o
+ obj-$(CONFIG_ATH79_MACH_ZCN_1523H)	+= mach-zcn-1523h.o
+ obj-$(CONFIG_ATH79_MACH_CARAMBOLA2)	+= mach-carambola2.o
++obj-$(CONFIG_ATH79_MACH_NBG6716)	+= mach-nbg6716.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -65,6 +65,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_MZK_W04NU,		/* Planex MZK-W04NU */
+ 	ATH79_MACH_MZK_W300NH,		/* Planex MZK-W300NH */
+ 	ATH79_MACH_NBG460N,		/* Zyxel NBG460N/550N/550NH */
++	ATH79_MACH_NBG6716,		/* Zyxel NBG6716 */
+ 	ATH79_MACH_OM2P_HS,		/* OpenMesh OM2P-HS */
+ 	ATH79_MACH_OM2P_LC,		/* OpenMesh OM2P-LC */
+ 	ATH79_MACH_OM2P,		/* OpenMesh OM2P */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -918,6 +918,17 @@ config ATH79_MACH_NBG460N
+ 	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_NBG6716
++	bool "Zyxel NBG6716 board support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_NFC
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_CARAMBOLA2
+ 	bool "8devices Carambola2 board"
+ 	select SOC_AR933X
diff --git a/trunk/target/linux/ar71xx/patches-3.14/710-MIPS-ath79-add-OM2Pv2.patch b/trunk/target/linux/ar71xx/patches-3.14/710-MIPS-ath79-add-OM2Pv2.patch
new file mode 100644
index 00000000..b6acfd61
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/710-MIPS-ath79-add-OM2Pv2.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -68,6 +68,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_NBG6716,		/* Zyxel NBG6716 */
+ 	ATH79_MACH_OM2P_HS,		/* OpenMesh OM2P-HS */
+ 	ATH79_MACH_OM2P_LC,		/* OpenMesh OM2P-LC */
++	ATH79_MACH_OM2Pv2,		/* OpenMesh OM2Pv2 */
+ 	ATH79_MACH_OM2P,		/* OpenMesh OM2P */
+ 	ATH79_MACH_PB42,		/* Atheros PB42 */
+ 	ATH79_MACH_PB92,		/* Atheros PB92 */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/711-MIPS-ath79-add-OM2P-HSv2.patch b/trunk/target/linux/ar71xx/patches-3.14/711-MIPS-ath79-add-OM2P-HSv2.patch
new file mode 100644
index 00000000..74fd6834
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/711-MIPS-ath79-add-OM2P-HSv2.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -66,6 +66,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_MZK_W300NH,		/* Planex MZK-W300NH */
+ 	ATH79_MACH_NBG460N,		/* Zyxel NBG460N/550N/550NH */
+ 	ATH79_MACH_NBG6716,		/* Zyxel NBG6716 */
++	ATH79_MACH_OM2P_HSv2,		/* OpenMesh OM2P-HSv2 */
+ 	ATH79_MACH_OM2P_HS,		/* OpenMesh OM2P-HS */
+ 	ATH79_MACH_OM2P_LC,		/* OpenMesh OM2P-LC */
+ 	ATH79_MACH_OM2Pv2,		/* OpenMesh OM2Pv2 */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/712-MIPS-ath79-add-EasyLink-support.patch b/trunk/target/linux/ar71xx/patches-3.14/712-MIPS-ath79-add-EasyLink-support.patch
new file mode 100644
index 00000000..412b1df9
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/712-MIPS-ath79-add-EasyLink-support.patch
@@ -0,0 +1,51 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -51,6 +51,8 @@ enum ath79_mach_type {
+ 	ATH79_MACH_EW_DORIN,		/* embedded wireless Dorin Platform */
+ 	ATH79_MACH_EW_DORIN_ROUTER,	/* embedded wireless Dorin Router Platform */
+ 	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
++	ATH79_MACH_EL_M150,		/* EasyLink EL-M150 */
++	ATH79_MACH_EL_MINI,		/* EasyLink EL-MINI */
+ 	ATH79_MACH_GS_OOLITE,           /* GS OOLITE V1.0 */
+ 	ATH79_MACH_HIWIFI_HC6361,	/* HiWiFi HC6361 */
+ 	ATH79_MACH_JA76PF,		/* jjPlus JA76PF */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -337,6 +337,26 @@ config ATH79_MACH_EW_DORIN
+ 	  Say 'Y' here if you want your kernel to support the
+ 	  Dorin Platform from www.80211.de .
+ 
++config ATH79_MACH_EL_M150
++	bool "EasyLink EL-M150 support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
++config ATH79_MACH_EL_MINI
++	bool "EasyLink EL-MINI support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_GS_OOLITE
+        bool "GS Oolite V1 support"
+        select SOC_AR933X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -63,6 +63,8 @@ obj-$(CONFIG_ATH79_MACH_DIR_825_C1)	+= m
+ obj-$(CONFIG_ATH79_MACH_DRAGINO2)	+= mach-dragino2.o
+ obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mach-ew-dorin.o
+ obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
++obj-$(CONFIG_ATH79_MACH_EL_M150)	+= mach-el-m150.o
++obj-$(CONFIG_ATH79_MACH_EL_MINI)	+= mach-el-mini.o
+ obj-$(CONFIG_ATH79_MACH_GS_OOLITE)	+= mach-gs-oolite.o
+ obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361)	+= mach-hiwifi-hc6361.o
+ obj-$(CONFIG_ATH79_MACH_JA76PF)		+= mach-ja76pf.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/713-MIPS-ath79-add-RBSXTLite-support.patch b/trunk/target/linux/ar71xx/patches-3.14/713-MIPS-ath79-add-RBSXTLite-support.patch
new file mode 100644
index 00000000..390b57db
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/713-MIPS-ath79-add-RBSXTLite-support.patch
@@ -0,0 +1,38 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -462,6 +462,14 @@ config ATH79_MACH_RB2011
+ 	select ATH79_ROUTERBOOT
+ 	select RLE_DECOMPRESS
+ 
++config ATH79_MACH_RBSXTLITE
++	bool "MikroTik RouterBOARD SXT Lite"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_NFC
++	select ATH79_DEV_WMAC
++	select ATH79_ROUTERBOOT
++
+ config ATH79_MACH_WNDAP360
+ 	bool "NETGEAR WNDAP360 board support"
+ 	select SOC_AR71XX
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -94,6 +94,8 @@ enum ath79_mach_type {
+ 	ATH79_MACH_RB_2011G,		/* Mikrotik RouterBOARD 2011UAS-2HnD */
+ 	ATH79_MACH_RB_2011L,		/* Mikrotik RouterBOARD 2011L */
+ 	ATH79_MACH_RB_2011US,		/* Mikrotik RouterBOARD 2011UAS */
++	ATH79_MACH_RB_SXTLITE2ND,	/* Mikrotik RouterBOARD SXT Lite 2nD */
++	ATH79_MACH_RB_SXTLITE5ND,	/* Mikrotik RouterBOARD SXT Lite 5nD */
+ 	ATH79_MACH_RW2458N,		/* Redwave RW2458N */
+ 	ATH79_MACH_TEW_632BRP,		/* TRENDnet TEW-632BRP */
+ 	ATH79_MACH_TEW_673GRU,		/* TRENDnet TEW-673GRU */
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -86,6 +86,7 @@ obj-$(CONFIG_ATH79_MACH_RB750)		+= mach-
+ obj-$(CONFIG_ATH79_MACH_RB91X)		+= mach-rb91x.o
+ obj-$(CONFIG_ATH79_MACH_RB95X)		+= mach-rb95x.o
+ obj-$(CONFIG_ATH79_MACH_RB2011)		+= mach-rb2011.o
++obj-$(CONFIG_ATH79_MACH_RBSXTLITE)	+= mach-rbsxtlite.o
+ obj-$(CONFIG_ATH79_MACH_RW2458N)	+= mach-rw2458n.o
+ obj-$(CONFIG_ATH79_MACH_TEW_632BRP)	+= mach-tew-632brp.o
+ obj-$(CONFIG_ATH79_MACH_TEW_673GRU)	+= mach-tew-673gru.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/714-MIPS-ath79-add-TL-WA830REv2-support.patch b/trunk/target/linux/ar71xx/patches-3.14/714-MIPS-ath79-add-TL-WA830REv2-support.patch
new file mode 100644
index 00000000..0316579f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/714-MIPS-ath79-add-TL-WA830REv2-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -675,6 +675,16 @@ config ATH79_MACH_TL_WAX50RE
+ 	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_TL_WA830RE_V2
++	bool "TP-LINK TL-WA830RE v2 support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_TL_WA901ND
+ 	bool "TP-LINK TL-WA901ND/TL-WA7510N support"
+ 	select SOC_AR724X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -97,6 +97,7 @@ obj-$(CONFIG_ATH79_MACH_TL_MR13U)	+= mac
+ obj-$(CONFIG_ATH79_MACH_TL_MR3020)	+= mach-tl-mr3020.o
+ obj-$(CONFIG_ATH79_MACH_TL_MR3X20)	+= mach-tl-mr3x20.o
+ obj-$(CONFIG_ATH79_MACH_TL_WAX50RE)     += mach-tl-wax50re.o
++obj-$(CONFIG_ATH79_MACH_TL_WA830RE_V2)	+= mach-tl-wa830re-v2.o
+ obj-$(CONFIG_ATH79_MACH_TL_WA901ND)	+= mach-tl-wa901nd.o
+ obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2)	+= mach-tl-wa901nd-v2.o
+ obj-$(CONFIG_ATH79_MACH_TL_WDR3500)     += mach-tl-wdr3500.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -115,6 +115,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WA7510N_V1,	/* TP-LINK TL-WA7510N v1*/
+ 	ATH79_MACH_TL_WA850RE,		/* TP-LINK TL-WA850RE */
+ 	ATH79_MACH_TL_WA801ND_V2,	/* TP-LINK TL-WA801ND v2 */
++	ATH79_MACH_TL_WA830RE_V2,	/* TP-LINK TL-WA830RE v2 */
+ 	ATH79_MACH_TL_WA901ND,		/* TP-LINK TL-WA901ND */
+ 	ATH79_MACH_TL_WA901ND_V2,	/* TP-LINK TL-WA901ND v2 */
+ 	ATH79_MACH_TL_WA901ND_V3,	/* TP-LINK TL-WA901ND v3 */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/715-MIPS-ath79-add-TL-WA860RE-support.patch b/trunk/target/linux/ar71xx/patches-3.14/715-MIPS-ath79-add-TL-WA860RE-support.patch
new file mode 100644
index 00000000..b2945b0d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/715-MIPS-ath79-add-TL-WA860RE-support.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -114,6 +114,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WA750RE,		/* TP-LINK TL-WA750RE */
+ 	ATH79_MACH_TL_WA7510N_V1,	/* TP-LINK TL-WA7510N v1*/
+ 	ATH79_MACH_TL_WA850RE,		/* TP-LINK TL-WA850RE */
++	ATH79_MACH_TL_WA860RE,		/* TP-LINK TL-WA860RE */
+ 	ATH79_MACH_TL_WA801ND_V2,	/* TP-LINK TL-WA801ND v2 */
+ 	ATH79_MACH_TL_WA830RE_V2,	/* TP-LINK TL-WA830RE v2 */
+ 	ATH79_MACH_TL_WA901ND,		/* TP-LINK TL-WA901ND */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch b/trunk/target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch
new file mode 100644
index 00000000..a876c378
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch
@@ -0,0 +1,26 @@
+--- a/arch/mips/ath79/mach-rb2011.c
++++ b/arch/mips/ath79/mach-rb2011.c
+@@ -321,6 +321,13 @@ static void __init rb2011us_setup(void)
+ 
+ MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US, "2011US", rb2011us_setup);
+ 
++static void __init rb2011r5_setup(void)
++{
++	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB);
++}
++
++MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup);
++
+ static void __init rb2011g_setup(void)
+ {
+ 	rb2011_setup(RB2011_FLAG_SFP |
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -94,6 +94,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_RB_2011G,		/* Mikrotik RouterBOARD 2011UAS-2HnD */
+ 	ATH79_MACH_RB_2011L,		/* Mikrotik RouterBOARD 2011L */
+ 	ATH79_MACH_RB_2011US,		/* Mikrotik RouterBOARD 2011UAS */
++	ATH79_MACH_RB_2011R5,		/* Mikrotik RouterBOARD 2011UiAS */
+ 	ATH79_MACH_RB_SXTLITE2ND,	/* Mikrotik RouterBOARD SXT Lite 2nD */
+ 	ATH79_MACH_RB_SXTLITE5ND,	/* Mikrotik RouterBOARD SXT Lite 5nD */
+ 	ATH79_MACH_RW2458N,		/* Redwave RW2458N */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/717-MIPS-ath79-add-gl-inet-v1-support.patch b/trunk/target/linux/ar71xx/patches-3.14/717-MIPS-ath79-add-gl-inet-v1-support.patch
new file mode 100644
index 00000000..5d22712f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/717-MIPS-ath79-add-gl-inet-v1-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -357,6 +357,16 @@ config ATH79_MACH_EL_MINI
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_GL_INET
++	bool "GL-INET support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_GS_OOLITE
+        bool "GS Oolite V1 support"
+        select SOC_AR933X
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -53,6 +53,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
+ 	ATH79_MACH_EL_M150,		/* EasyLink EL-M150 */
+ 	ATH79_MACH_EL_MINI,		/* EasyLink EL-MINI */
++	ATH79_MACH_GL_INET,		/* GL-CONNECT GL-INET */
+ 	ATH79_MACH_GS_OOLITE,           /* GS OOLITE V1.0 */
+ 	ATH79_MACH_HIWIFI_HC6361,	/* HiWiFi HC6361 */
+ 	ATH79_MACH_JA76PF,		/* jjPlus JA76PF */
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -65,6 +65,7 @@ obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mac
+ obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
+ obj-$(CONFIG_ATH79_MACH_EL_M150)	+= mach-el-m150.o
+ obj-$(CONFIG_ATH79_MACH_EL_MINI)	+= mach-el-mini.o
++obj-$(CONFIG_ATH79_MACH_GL_INET)	+= mach-gl-inet.o
+ obj-$(CONFIG_ATH79_MACH_GS_OOLITE)	+= mach-gs-oolite.o
+ obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361)	+= mach-hiwifi-hc6361.o
+ obj-$(CONFIG_ATH79_MACH_JA76PF)		+= mach-ja76pf.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch b/trunk/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
new file mode 100644
index 00000000..d47391ce
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -177,6 +177,16 @@ config ATH79_MACH_AW_NR580
+ 	select ATH79_DEV_LEDS_GPIO
+ 	select ATH79_DEV_M25P80
+ 
++config ATH79_MACH_ESR1750
++	bool "EnGenius ESR1750 board support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_WHR_HP_G300N
+ 	bool "Buffalo WHR-HP-G300N board support"
+ 	select SOC_AR724X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -65,6 +65,7 @@ obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mac
+ obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
+ obj-$(CONFIG_ATH79_MACH_EL_M150)	+= mach-el-m150.o
+ obj-$(CONFIG_ATH79_MACH_EL_MINI)	+= mach-el-mini.o
++obj-$(CONFIG_ATH79_MACH_ESR1750)	+= mach-esr1750.o
+ obj-$(CONFIG_ATH79_MACH_GL_INET)	+= mach-gl-inet.o
+ obj-$(CONFIG_ATH79_MACH_GS_OOLITE)	+= mach-gs-oolite.o
+ obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361)	+= mach-hiwifi-hc6361.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -53,6 +53,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
+ 	ATH79_MACH_EL_M150,		/* EasyLink EL-M150 */
+ 	ATH79_MACH_EL_MINI,		/* EasyLink EL-MINI */
++	ATH79_MACH_ESR1750,		/* EnGenius ESR1750 */
+ 	ATH79_MACH_GL_INET,		/* GL-CONNECT GL-INET */
+ 	ATH79_MACH_GS_OOLITE,           /* GS OOLITE V1.0 */
+ 	ATH79_MACH_HIWIFI_HC6361,	/* HiWiFi HC6361 */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch b/trunk/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
new file mode 100644
index 00000000..9ba3337f
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -48,6 +48,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_DIR_825_C1,		/* D-Link DIR-825 rev. C1 */
+ 	ATH79_MACH_DIR_835_A1,		/* D-Link DIR-835 rev. A1 */
+ 	ATH79_MACH_DRAGINO2,		/* Dragino Version 2 */
++	ATH79_MACH_ESR900,		/* EnGenius ESR900 */
+ 	ATH79_MACH_EW_DORIN,		/* embedded wireless Dorin Platform */
+ 	ATH79_MACH_EW_DORIN_ROUTER,	/* embedded wireless Dorin Router Platform */
+ 	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -335,6 +335,16 @@ config ATH79_MACH_DRAGINO2
+ 	select ATH79_DEV_ETH
+ 	select ATH79_DEV_USB
+ 
++config ATH79_MACH_ESR900
++	bool "EnGenius ESR900 board support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_EW_DORIN
+ 	bool "embedded wireless Dorin Platform support"
+ 	select SOC_AR933X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -61,6 +61,7 @@ obj-$(CONFIG_ATH79_MACH_DIR_615_C1)	+= m
+ obj-$(CONFIG_ATH79_MACH_DIR_825_B1)	+= mach-dir-825-b1.o
+ obj-$(CONFIG_ATH79_MACH_DIR_825_C1)	+= mach-dir-825-c1.o
+ obj-$(CONFIG_ATH79_MACH_DRAGINO2)	+= mach-dragino2.o
++obj-$(CONFIG_ATH79_MACH_ESR900)	+= mach-esr900.o
+ obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mach-ew-dorin.o
+ obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
+ obj-$(CONFIG_ATH79_MACH_EL_M150)	+= mach-el-m150.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/720-MIPS-ath79-add-Tube2H-support.patch b/trunk/target/linux/ar71xx/patches-3.14/720-MIPS-ath79-add-Tube2H-support.patch
new file mode 100644
index 00000000..2c948426
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/720-MIPS-ath79-add-Tube2H-support.patch
@@ -0,0 +1,38 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -142,6 +142,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WR841N_V9,	/* TP-LINK TL-WR841N/ND v9 */
+ 	ATH79_MACH_TL_WR842N_V2,	/* TP-LINK TL-WR842N/ND v2 */
+ 	ATH79_MACH_TL_WR941ND,		/* TP-LINK TL-WR941ND */
++	ATH79_MACH_TUBE2H,		/* Alfa Network Tube2H */
+ 	ATH79_MACH_UBNT_AIRROUTER,	/* Ubiquiti AirRouter */
+ 	ATH79_MACH_UBNT_BULLET_M,	/* Ubiquiti Bullet M */
+ 	ATH79_MACH_UBNT_LOCO_M_XW, 	/* Ubiquiti Loco M XW */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -29,6 +29,15 @@ config ATH79_MACH_ALFA_NX
+ 	select ATH79_DEV_LEDS_GPIO
+ 	select ATH79_DEV_M25P80
+ 
++config ATH79_MACH_TUBE2H
++	bool "ALFA Network Tube2H board support"
++	select SOC_AR933X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_ALL0258N
+ 	bool "Allnet ALL0258N support"
+ 	select SOC_AR724X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -117,6 +117,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V2)	
+ obj-$(CONFIG_ATH79_MACH_TL_WR2543N)	+= mach-tl-wr2543n.o
+ obj-$(CONFIG_ATH79_MACH_TL_WR703N)	+= mach-tl-wr703n.o
+ obj-$(CONFIG_ATH79_MACH_TL_WR720N_V3)	+= mach-tl-wr720n-v3.o
++obj-$(CONFIG_ATH79_MACH_TUBE2H)		+= mach-tube2h.o
+ obj-$(CONFIG_ATH79_MACH_UBNT)		+= mach-ubnt.o
+ obj-$(CONFIG_ATH79_MACH_UBNT_XM)	+= mach-ubnt-xm.o
+ obj-$(CONFIG_ATH79_MACH_WHR_HP_G300N)	+= mach-whr-hp-g300n.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/721-MIPS-ath79-add-EAP300v2-support.patch b/trunk/target/linux/ar71xx/patches-3.14/721-MIPS-ath79-add-EAP300v2-support.patch
new file mode 100644
index 00000000..8d0dffbb
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/721-MIPS-ath79-add-EAP300v2-support.patch
@@ -0,0 +1,38 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -51,6 +51,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_ESR900,		/* EnGenius ESR900 */
+ 	ATH79_MACH_EW_DORIN,		/* embedded wireless Dorin Platform */
+ 	ATH79_MACH_EW_DORIN_ROUTER,	/* embedded wireless Dorin Router Platform */
++	ATH79_MACH_EAP300V2,		/* EnGenius EAP300 v2 */
+ 	ATH79_MACH_EAP7660D,		/* Senao EAP7660D */
+ 	ATH79_MACH_EL_M150,		/* EasyLink EL-M150 */
+ 	ATH79_MACH_EL_MINI,		/* EasyLink EL-MINI */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -396,6 +396,15 @@ config ATH79_MACH_GL_INET
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_EAP300V2
++	bool "EnGenius EAP300 v2 support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_GS_OOLITE
+        bool "GS Oolite V1 support"
+        select SOC_AR933X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -63,6 +63,7 @@ obj-$(CONFIG_ATH79_MACH_DIR_825_C1)	+= m
+ obj-$(CONFIG_ATH79_MACH_DRAGINO2)	+= mach-dragino2.o
+ obj-$(CONFIG_ATH79_MACH_ESR900)	+= mach-esr900.o
+ obj-$(CONFIG_ATH79_MACH_EW_DORIN)	+= mach-ew-dorin.o
++obj-$(CONFIG_ATH79_MACH_EAP300V2)	+= mach-eap300v2.o
+ obj-$(CONFIG_ATH79_MACH_EAP7660D)	+= mach-eap7660d.o
+ obj-$(CONFIG_ATH79_MACH_EL_M150)	+= mach-el-m150.o
+ obj-$(CONFIG_ATH79_MACH_EL_MINI)	+= mach-el-mini.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/722-MIPS-ath79-add-airGateway-support.patch b/trunk/target/linux/ar71xx/patches-3.14/722-MIPS-ath79-add-airGateway-support.patch
new file mode 100644
index 00000000..6b17c025
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/722-MIPS-ath79-add-airGateway-support.patch
@@ -0,0 +1,90 @@
+--- a/arch/mips/ath79/mach-ubnt-xm.c
++++ b/arch/mips/ath79/mach-ubnt-xm.c
+@@ -17,9 +17,11 @@
+ #include <linux/etherdevice.h>
+ #include <linux/ar8216_platform.h>
+ 
++#include <asm/mach-ath79/ath79.h>
+ #include <asm/mach-ath79/irq.h>
+ #include <asm/mach-ath79/ar71xx_regs.h>
+ 
++#include "common.h"
+ #include "dev-ap9x-pci.h"
+ #include "dev-eth.h"
+ #include "dev-gpio-buttons.h"
+@@ -407,3 +409,65 @@ MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M_XW, 
+ 
+ MIPS_MACHINE(ATH79_MACH_UBNT_LOCO_M_XW, "UBNT-LOCO-XW", "Ubiquiti Loco M XW",
+ 	     ubnt_loco_m_xw_setup);
++
++static struct gpio_led ubnt_airgateway_gpio_leds[] __initdata = {
++	{
++		.name	   = "ubnt:blue:wlan",
++		.gpio	   = 0,
++	}, {
++		.name	   = "ubnt:white:status",
++		.gpio	   = 1,
++	},
++};
++
++static struct gpio_keys_button airgateway_gpio_keys[] __initdata = {
++	{
++		.desc		= "reset",
++		.type		= EV_KEY,
++		.code		= KEY_RESTART,
++		.debounce_interval	= UBNT_XM_KEYS_DEBOUNCE_INTERVAL,
++		.gpio		= 12,
++		.active_low	= 1,
++	}
++};
++
++static void __init ubnt_airgateway_setup(void)
++{
++	u32 t;
++	u8 *mac0 = (u8 *) KSEG1ADDR(0x1fff0000);
++	u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN);
++	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
++
++
++	ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
++				     AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
++				     AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
++				     AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
++				     AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
++
++	t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
++	t |= AR933X_BOOTSTRAP_MDIO_GPIO_EN;
++	ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP, t);
++
++	ath79_register_m25p80(NULL);
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_airgateway_gpio_leds),
++				 ubnt_airgateway_gpio_leds);
++
++	ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL,
++					ARRAY_SIZE(airgateway_gpio_keys),
++					airgateway_gpio_keys);
++
++	ath79_init_mac(ath79_eth1_data.mac_addr, mac0, 0);
++	ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0);
++
++	ath79_register_mdio(0, 0x0);
++
++	ath79_register_eth(1);
++	ath79_register_eth(0);
++
++	ath79_register_wmac(ee, NULL);
++}
++
++MIPS_MACHINE(ATH79_MACH_UBNT_AIRGW, "UBNT-AGW", "Ubiquiti AirGateway",
++	     ubnt_airgateway_setup);
++
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -144,6 +144,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WR842N_V2,	/* TP-LINK TL-WR842N/ND v2 */
+ 	ATH79_MACH_TL_WR941ND,		/* TP-LINK TL-WR941ND */
+ 	ATH79_MACH_TUBE2H,		/* Alfa Network Tube2H */
++	ATH79_MACH_UBNT_AIRGW,		/* Ubiquiti AirGateway */
+ 	ATH79_MACH_UBNT_AIRROUTER,	/* Ubiquiti AirRouter */
+ 	ATH79_MACH_UBNT_BULLET_M,	/* Ubiquiti Bullet M */
+ 	ATH79_MACH_UBNT_LOCO_M_XW, 	/* Ubiquiti Loco M XW */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/723-MIPS-ath79-add-om5p-support.patch b/trunk/target/linux/ar71xx/patches-3.14/723-MIPS-ath79-add-om5p-support.patch
new file mode 100644
index 00000000..fa908ca5
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/723-MIPS-ath79-add-om5p-support.patch
@@ -0,0 +1,38 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -77,6 +77,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_OM2P_LC,		/* OpenMesh OM2P-LC */
+ 	ATH79_MACH_OM2Pv2,		/* OpenMesh OM2Pv2 */
+ 	ATH79_MACH_OM2P,		/* OpenMesh OM2P */
++	ATH79_MACH_OM5P,		/* OpenMesh OM5P */
+ 	ATH79_MACH_PB42,		/* Atheros PB42 */
+ 	ATH79_MACH_PB92,		/* Atheros PB92 */
+ 	ATH79_MACH_RB_411,		/* MikroTik RouterBOARD 411/411A/411AH */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -597,6 +597,15 @@ config ATH79_MACH_OM2P
+ 	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_OM5P
++	bool "OpenMesh OM5P board support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_MR600
+ 	bool "OpenMesh MR600 board support"
+ 	select SOC_AR934X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -82,6 +82,7 @@ obj-$(CONFIG_ATH79_MACH_MZK_W04NU)	+= ma
+ obj-$(CONFIG_ATH79_MACH_MZK_W300NH)	+= mach-mzk-w300nh.o
+ obj-$(CONFIG_ATH79_MACH_NBG460N)	+= mach-nbg460n.o
+ obj-$(CONFIG_ATH79_MACH_OM2P)		+= mach-om2p.o
++obj-$(CONFIG_ATH79_MACH_OM5P)		+= mach-om5p.o
+ obj-$(CONFIG_ATH79_MACH_PB42)		+= mach-pb42.o
+ obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-pb44.o
+ obj-$(CONFIG_ATH79_MACH_PB92)		+= mach-pb92.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/724-MIPS-ath79-archer_c5-support.patch b/trunk/target/linux/ar71xx/patches-3.14/724-MIPS-ath79-archer_c5-support.patch
new file mode 100644
index 00000000..568f72bd
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/724-MIPS-ath79-archer_c5-support.patch
@@ -0,0 +1,21 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -31,6 +31,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_AP81,		/* Atheros AP81 reference board */
+ 	ATH79_MACH_AP83,		/* Atheros AP83 */
+ 	ATH79_MACH_AP96,		/* Atheros AP96 */
++	ATH79_MACH_ARCHER_C5,		/* TP-LINK Archer C5 board */
+ 	ATH79_MACH_ARCHER_C7,		/* TP-LINK Archer C7 board */
+ 	ATH79_MACH_AW_NR580,		/* AzureWave AW-NR580 */
+ 	ATH79_MACH_BHU_BXU2000N2_A1,	/* BHU BXU2000n-2 A1 */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -664,7 +664,7 @@ config ATH79_MACH_EAP7660D
+ 	select ATH79_DEV_M25P80
+ 
+ config ATH79_MACH_ARCHER_C7
+-	bool "TP-LINK Archer C7/TL-WDR4900 v2 board support"
++	bool "TP-LINK Archer C5/C7/TL-WDR4900 v2 board support"
+ 	select SOC_QCA955X
+ 	select ATH79_DEV_AP9X_PCI if PCI
+ 	select ATH79_DEV_ETH
diff --git a/trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add-smart-300-support.patch b/trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add-smart-300-support.patch
new file mode 100644
index 00000000..6b22d4f1
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add-smart-300-support.patch
@@ -0,0 +1,38 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -104,6 +104,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_RB_SXTLITE2ND,	/* Mikrotik RouterBOARD SXT Lite 2nD */
+ 	ATH79_MACH_RB_SXTLITE5ND,	/* Mikrotik RouterBOARD SXT Lite 5nD */
+ 	ATH79_MACH_RW2458N,		/* Redwave RW2458N */
++	ATH79_MACH_SMART_300,		/* NC-LINK SMART-300 */
+ 	ATH79_MACH_TEW_632BRP,		/* TRENDnet TEW-632BRP */
+ 	ATH79_MACH_TEW_673GRU,		/* TRENDnet TEW-673GRU */
+ 	ATH79_MACH_TEW_712BR,		/* TRENDnet TEW-712BR */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -518,6 +518,15 @@ config ATH79_MACH_RBSXTLITE
+ 	select ATH79_DEV_WMAC
+ 	select ATH79_ROUTERBOOT
+ 
++config ATH79_MACH_SMART_300
++	bool "NC-LINK SMART-300 board support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_WNDAP360
+ 	bool "NETGEAR WNDAP360 board support"
+ 	select SOC_AR71XX
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -93,6 +93,7 @@ obj-$(CONFIG_ATH79_MACH_RB95X)		+= mach-
+ obj-$(CONFIG_ATH79_MACH_RB2011)		+= mach-rb2011.o
+ obj-$(CONFIG_ATH79_MACH_RBSXTLITE)	+= mach-rbsxtlite.o
+ obj-$(CONFIG_ATH79_MACH_RW2458N)	+= mach-rw2458n.o
++obj-$(CONFIG_ATH79_MACH_SMART_300)	+= mach-smart-300.o
+ obj-$(CONFIG_ATH79_MACH_TEW_632BRP)	+= mach-tew-632brp.o
+ obj-$(CONFIG_ATH79_MACH_TEW_673GRU)	+= mach-tew-673gru.o
+ obj-$(CONFIG_ATH79_MACH_TEW_712BR)	+= mach-tew-712br.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch b/trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch
new file mode 100644
index 00000000..cc12cdb2
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch
@@ -0,0 +1,22 @@
+--- a/arch/mips/ath79/mach-rb2011.c
++++ b/arch/mips/ath79/mach-rb2011.c
+@@ -323,7 +323,7 @@ MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US
+ 
+ static void __init rb2011r5_setup(void)
+ {
+-	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB);
++	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB | RB2011_FLAG_WLAN);
+ }
+ 
+ MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup);
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -100,7 +100,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_RB_2011G,		/* Mikrotik RouterBOARD 2011UAS-2HnD */
+ 	ATH79_MACH_RB_2011L,		/* Mikrotik RouterBOARD 2011L */
+ 	ATH79_MACH_RB_2011US,		/* Mikrotik RouterBOARD 2011UAS */
+-	ATH79_MACH_RB_2011R5,		/* Mikrotik RouterBOARD 2011UiAS */
++	ATH79_MACH_RB_2011R5,		/* Mikrotik RouterBOARD 2011UiAS(-2Hnd) */
+ 	ATH79_MACH_RB_SXTLITE2ND,	/* Mikrotik RouterBOARD SXT Lite 2nD */
+ 	ATH79_MACH_RB_SXTLITE5ND,	/* Mikrotik RouterBOARD SXT Lite 5nD */
+ 	ATH79_MACH_RW2458N,		/* Redwave RW2458N */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch b/trunk/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch
new file mode 100644
index 00000000..9f6fda48
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/726-MIPS-ath79-add-qihoo-360-c301-support.patch
@@ -0,0 +1,40 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -1053,6 +1053,17 @@ config ATH79_MACH_BHU_BXU2000N2_A
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_QIHOO_C301
++	bool "Qihoo 360 C301 board support"
++	select SOC_AR934X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_DEV_USB
++	select ATH79_NVRAM
++
+ endmenu
+ 
+ config SOC_AR71XX
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -81,6 +81,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_OM5P,		/* OpenMesh OM5P */
+ 	ATH79_MACH_PB42,		/* Atheros PB42 */
+ 	ATH79_MACH_PB92,		/* Atheros PB92 */
++	ATH79_MACH_QIHOO_C301,		/* Qihoo 360 C301 */
+ 	ATH79_MACH_RB_411,		/* MikroTik RouterBOARD 411/411A/411AH */
+ 	ATH79_MACH_RB_411U,		/* MikroTik RouterBOARD 411U */
+ 	ATH79_MACH_RB_433,		/* MikroTik RouterBOARD 433/433AH */
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -86,6 +86,7 @@ obj-$(CONFIG_ATH79_MACH_OM5P)		+= mach-o
+ obj-$(CONFIG_ATH79_MACH_PB42)		+= mach-pb42.o
+ obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-pb44.o
+ obj-$(CONFIG_ATH79_MACH_PB92)		+= mach-pb92.o
++obj-$(CONFIG_ATH79_MACH_QIHOO_C301)	+= mach-qihoo-c301.o
+ obj-$(CONFIG_ATH79_MACH_RB4XX)		+= mach-rb4xx.o
+ obj-$(CONFIG_ATH79_MACH_RB750)		+= mach-rb750.o
+ obj-$(CONFIG_ATH79_MACH_RB91X)		+= mach-rb91x.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/727-MIPS-ath79-ar934x-wmac-revision.patch b/trunk/target/linux/ar71xx/patches-3.14/727-MIPS-ath79-ar934x-wmac-revision.patch
new file mode 100644
index 00000000..b1b4946e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/727-MIPS-ath79-ar934x-wmac-revision.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -147,6 +147,8 @@ static void ar934x_wmac_setup(void)
+ 		ath79_wmac_data.is_clk_25mhz = false;
+ 	else
+ 		ath79_wmac_data.is_clk_25mhz = true;
++
++	ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision;
+ }
+ 
+ static void qca953x_wmac_setup(void)
diff --git a/trunk/target/linux/ar71xx/patches-3.14/728-MIPS-ath79-fix-restart.patch b/trunk/target/linux/ar71xx/patches-3.14/728-MIPS-ath79-fix-restart.patch
new file mode 100644
index 00000000..0027c596
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/728-MIPS-ath79-fix-restart.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/setup.c
++++ b/arch/mips/ath79/setup.c
+@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYP
+ 
+ static void ath79_restart(char *command)
+ {
++	local_irq_disable();
+ 	ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
+ 	for (;;)
+ 		if (cpu_wait)
diff --git a/trunk/target/linux/ar71xx/patches-3.14/729-MIPS-ath79-add-WZR-450HP2.patch b/trunk/target/linux/ar71xx/patches-3.14/729-MIPS-ath79-add-WZR-450HP2.patch
new file mode 100644
index 00000000..f541b803
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/729-MIPS-ath79-add-WZR-450HP2.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -185,6 +185,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_WZR_HP_G300NH,	/* Buffalo WZR-HP-G300NH */
+ 	ATH79_MACH_WZR_HP_G300NH2,	/* Buffalo WZR-HP-G300NH2 */
+ 	ATH79_MACH_WZR_HP_G450H,	/* Buffalo WZR-HP-G450H */
++	ATH79_MACH_WZR_450HP2,		/* Buffalo WZR-450HP2 */
+ 	ATH79_MACH_ZCN_1523H_2,		/* Zcomax ZCN-1523H-2-xx */
+ 	ATH79_MACH_ZCN_1523H_5,		/* Zcomax ZCN-1523H-5-xx */
+ };
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -263,6 +263,16 @@ config ATH79_MACH_WZR_HP_G450H
+ 	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_USB
+ 
++config ATH79_MACH_WZR_450HP2
++	bool "Buffalo WZR-450HP2 board support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_WP543
+ 	bool "Compex WP543/WPJ543 board support"
+ 	select SOC_AR71XX
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -142,6 +142,7 @@ obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH)	+
+ obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH2)	+= mach-wzr-hp-g300nh2.o
+ obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H)	+= mach-wzr-hp-ag300h.o
+ obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H)	+= mach-wzr-hp-g450h.o
++obj-$(CONFIG_ATH79_MACH_WZR_450HP2)	+= mach-wzr-450hp2.o
+ obj-$(CONFIG_ATH79_MACH_ZCN_1523H)	+= mach-zcn-1523h.o
+ obj-$(CONFIG_ATH79_MACH_CARAMBOLA2)	+= mach-carambola2.o
+ obj-$(CONFIG_ATH79_MACH_NBG6716)	+= mach-nbg6716.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-DHP-1565A1.patch b/trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-DHP-1565A1.patch
new file mode 100644
index 00000000..1a10a7a8
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-DHP-1565A1.patch
@@ -0,0 +1,40 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -40,6 +40,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_CPE510,		/* TP-LINK CPE510 */
+ 	ATH79_MACH_DB120,		/* Atheros DB120 reference board */
+ 	ATH79_MACH_PB44,		/* Atheros PB44 reference board */
++	ATH79_MACH_DHP_1565_A1,		/* D-Link DHP-1565 rev. A1 */
+ 	ATH79_MACH_DIR_505_A1,		/* D-Link DIR-505 rev. A1 */
+ 	ATH79_MACH_DIR_600_A1,		/* D-Link DIR-600 rev. A1 */
+ 	ATH79_MACH_DIR_615_C1,		/* D-Link DIR-615 rev. C1 */
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -293,6 +293,17 @@ config ATH79_MACH_WPE72
+ 	select ATH79_DEV_USB
+ 	select MYLOADER
+ 
++config ATH79_MACH_DHP_1565_A1
++	bool "D-Link DHP-1565 rev. A1 board support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_DIR_505_A1
+ 	bool "D-Link DIR-505-A1 support"
+ 	select SOC_AR933X
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -55,6 +55,7 @@ obj-$(CONFIG_ATH79_MACH_BHU_BXU2000N2_A)
+ obj-$(CONFIG_ATH79_MACH_CAP4200AG)	+= mach-cap4200ag.o
+ obj-$(CONFIG_ATH79_MACH_CPE510)		+= mach-cpe510.o
+ obj-$(CONFIG_ATH79_MACH_DB120)		+= mach-db120.o
++obj-$(CONFIG_ATH79_MACH_DHP_1565_A1)	+= mach-dhp-1565-a1.o
+ obj-$(CONFIG_ATH79_MACH_DIR_505_A1)	+= mach-dir-505-a1.o
+ obj-$(CONFIG_ATH79_MACH_DIR_600_A1)	+= mach-dir-600-a1.o
+ obj-$(CONFIG_ATH79_MACH_DIR_615_C1)	+= mach-dir-615-c1.o
diff --git a/trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch b/trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch
new file mode 100644
index 00000000..464870c4
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/730-MIPS-ath79-add-mr900-support.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -685,6 +685,16 @@ config ATH79_MACH_CAP4200AG
+ 	select ATH79_DEV_M25P80
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_MR900
++	bool "OpenMesh MR900 board support"
++	select SOC_QCA955X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_EAP7660D
+ 	bool "Senao EAP7660D support"
+ 	select SOC_AR71XX
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -76,6 +76,7 @@ obj-$(CONFIG_ATH79_MACH_JA76PF)		+= mach
+ obj-$(CONFIG_ATH79_MACH_JWAP003)	+= mach-jwap003.o
+ obj-$(CONFIG_ATH79_MACH_HORNET_UB)	+= mach-hornet-ub.o
+ obj-$(CONFIG_ATH79_MACH_MR600)		+= mach-mr600.o
++obj-$(CONFIG_ATH79_MACH_MR900)		+= mach-mr900.o
+ obj-$(CONFIG_ATH79_MACH_MYNET_N600)	+= mach-mynet-n600.o
+ obj-$(CONFIG_ATH79_MACH_MYNET_N750)	+= mach-mynet-n750.o
+ obj-$(CONFIG_ATH79_MACH_MYNET_REXT)	+= mach-mynet-rext.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -67,6 +67,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_HORNET_UB,		/* ALFA Networks Hornet-UB */
+ 	ATH79_MACH_MR600V2,		/* OpenMesh MR600v2 */
+ 	ATH79_MACH_MR600,		/* OpenMesh MR600 */
++	ATH79_MACH_MR900,		/* OpenMesh MR900 */
+ 	ATH79_MACH_MYNET_N600,		/* WD My Net N600 */
+ 	ATH79_MACH_MYNET_N750,		/* WD My Net N750 */
+ 	ATH79_MACH_MYNET_REXT,		/* WD My Net Wi-Fi Range Extender */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/731-MIPS-ath79-add-mr900v2-support.patch b/trunk/target/linux/ar71xx/patches-3.14/731-MIPS-ath79-add-mr900v2-support.patch
new file mode 100644
index 00000000..08c6af3b
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/731-MIPS-ath79-add-mr900v2-support.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -68,6 +68,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_MR600V2,		/* OpenMesh MR600v2 */
+ 	ATH79_MACH_MR600,		/* OpenMesh MR600 */
+ 	ATH79_MACH_MR900,		/* OpenMesh MR900 */
++	ATH79_MACH_MR900v2,		/* OpenMesh MR900v2 */
+ 	ATH79_MACH_MYNET_N600,		/* WD My Net N600 */
+ 	ATH79_MACH_MYNET_N750,		/* WD My Net N750 */
+ 	ATH79_MACH_MYNET_REXT,		/* WD My Net Wi-Fi Range Extender */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/732-MIPS-ath79-add-R6100-support.patch b/trunk/target/linux/ar71xx/patches-3.14/732-MIPS-ath79-add-R6100-support.patch
new file mode 100644
index 00000000..57cf4bab
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/732-MIPS-ath79-add-R6100-support.patch
@@ -0,0 +1,40 @@
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -483,6 +483,17 @@ config ATH79_MACH_WRT400N
+ 	select ATH79_DEV_LEDS_GPIO
+ 	select ATH79_DEV_M25P80
+ 
++config ATH79_MACH_R6100
++	bool "NETGEAR R6100 board support"
++	select SOC_AR934X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_NFC
++	select ATH79_DEV_USB
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_RB4XX
+ 	bool "MikroTik RouterBOARD 4xx series support"
+ 	select SOC_AR71XX
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -89,6 +89,7 @@ obj-$(CONFIG_ATH79_MACH_PB42)		+= mach-p
+ obj-$(CONFIG_ATH79_MACH_PB44)		+= mach-pb44.o
+ obj-$(CONFIG_ATH79_MACH_PB92)		+= mach-pb92.o
+ obj-$(CONFIG_ATH79_MACH_QIHOO_C301)	+= mach-qihoo-c301.o
++obj-$(CONFIG_ATH79_MACH_R6100)		+= mach-r6100.o
+ obj-$(CONFIG_ATH79_MACH_RB4XX)		+= mach-rb4xx.o
+ obj-$(CONFIG_ATH79_MACH_RB750)		+= mach-rb750.o
+ obj-$(CONFIG_ATH79_MACH_RB91X)		+= mach-rb91x.o
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -85,6 +85,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_PB42,		/* Atheros PB42 */
+ 	ATH79_MACH_PB92,		/* Atheros PB92 */
+ 	ATH79_MACH_QIHOO_C301,		/* Qihoo 360 C301 */
++	ATH79_MACH_R6100,		/* NETGEAR R6100 */
+ 	ATH79_MACH_RB_411,		/* MikroTik RouterBOARD 411/411A/411AH */
+ 	ATH79_MACH_RB_411U,		/* MikroTik RouterBOARD 411U */
+ 	ATH79_MACH_RB_433,		/* MikroTik RouterBOARD 433/433AH */
diff --git a/trunk/target/linux/ar71xx/patches-3.14/733-MIPS-ath79-add-DGL-5500-A1.patch b/trunk/target/linux/ar71xx/patches-3.14/733-MIPS-ath79-add-DGL-5500-A1.patch
new file mode 100644
index 00000000..714d9e6e
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/733-MIPS-ath79-add-DGL-5500-A1.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -40,6 +40,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_CPE510,		/* TP-LINK CPE510 */
+ 	ATH79_MACH_DB120,		/* Atheros DB120 reference board */
+ 	ATH79_MACH_PB44,		/* Atheros PB44 reference board */
++	ATH79_MACH_DGL_5500_A1,		/* D-link DGL-5500 rev. A1 */
+ 	ATH79_MACH_DHP_1565_A1,		/* D-Link DHP-1565 rev. A1 */
+ 	ATH79_MACH_DIR_505_A1,		/* D-Link DIR-505 rev. A1 */
+ 	ATH79_MACH_DIR_600_A1,		/* D-Link DIR-600 rev. A1 */
+--- a/arch/mips/ath79/Makefile
++++ b/arch/mips/ath79/Makefile
+@@ -55,6 +55,7 @@ obj-$(CONFIG_ATH79_MACH_BHU_BXU2000N2_A)
+ obj-$(CONFIG_ATH79_MACH_CAP4200AG)	+= mach-cap4200ag.o
+ obj-$(CONFIG_ATH79_MACH_CPE510)		+= mach-cpe510.o
+ obj-$(CONFIG_ATH79_MACH_DB120)		+= mach-db120.o
++obj-$(CONFIG_ATH79_MACH_DGL_5500_A1)	+= mach-dgl-5500-a1.o
+ obj-$(CONFIG_ATH79_MACH_DHP_1565_A1)	+= mach-dhp-1565-a1.o
+ obj-$(CONFIG_ATH79_MACH_DIR_505_A1)	+= mach-dir-505-a1.o
+ obj-$(CONFIG_ATH79_MACH_DIR_600_A1)	+= mach-dir-600-a1.o
+--- a/arch/mips/ath79/Kconfig
++++ b/arch/mips/ath79/Kconfig
+@@ -293,6 +293,16 @@ config ATH79_MACH_WPE72
+ 	select ATH79_DEV_USB
+ 	select MYLOADER
+ 
++config ATH79_MACH_DGL_5500_A1
++	bool "D-Link DGL-5500 A1 support"
++	select SOC_QCA955X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++	select ATH79_DEV_USB
++
+ config ATH79_MACH_DHP_1565_A1
+ 	bool "D-Link DHP-1565 rev. A1 board support"
+ 	select SOC_AR934X
diff --git a/trunk/target/linux/ar71xx/patches-3.14/901-mdio_bitbang_ignore_ta_value.patch b/trunk/target/linux/ar71xx/patches-3.14/901-mdio_bitbang_ignore_ta_value.patch
new file mode 100644
index 00000000..39584aab
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/901-mdio_bitbang_ignore_ta_value.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/phy/mdio-bitbang.c
++++ b/drivers/net/phy/mdio-bitbang.c
+@@ -165,16 +165,7 @@ static int mdiobb_read(struct mii_bus *b
+ 
+ 	ctrl->ops->set_mdio_dir(ctrl, 0);
+ 
+-	/* check the turnaround bit: the PHY should be driving it to zero */
+-	if (mdiobb_get_bit(ctrl) != 0) {
+-		/* PHY didn't drive TA low -- flush any bits it
+-		 * may be trying to send.
+-		 */
+-		for (i = 0; i < 32; i++)
+-			mdiobb_get_bit(ctrl);
+-
+-		return 0xffff;
+-	}
++	mdiobb_get_bit(ctrl);
+ 
+ 	ret = mdiobb_get_num(ctrl, 16);
+ 	mdiobb_get_bit(ctrl);
diff --git a/trunk/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch b/trunk/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch
new file mode 100644
index 00000000..c4d0005d
--- /dev/null
+++ b/trunk/target/linux/ar71xx/patches-3.14/902-unaligned_access_hacks.patch
@@ -0,0 +1,883 @@
+--- a/arch/mips/include/asm/checksum.h
++++ b/arch/mips/include/asm/checksum.h
+@@ -104,26 +104,30 @@ static inline __sum16 ip_fast_csum(const
+ 	const unsigned int *stop = word + ihl;
+ 	unsigned int csum;
+ 	int carry;
++	unsigned int w;
+ 
+-	csum = word[0];
+-	csum += word[1];
+-	carry = (csum < word[1]);
++	csum = net_hdr_word(word++);
++
++	w = net_hdr_word(word++);
++	csum += w;
++	carry = (csum < w);
+ 	csum += carry;
+ 
+-	csum += word[2];
+-	carry = (csum < word[2]);
++	w = net_hdr_word(word++);
++	csum += w;
++	carry = (csum < w);
+ 	csum += carry;
+ 
+-	csum += word[3];
+-	carry = (csum < word[3]);
++	w = net_hdr_word(word++);
++	csum += w;
++	carry = (csum < w);
+ 	csum += carry;
+ 
+-	word += 4;
+ 	do {
+-		csum += *word;
+-		carry = (csum < *word);
++		w = net_hdr_word(word++);
++		csum += w;
++		carry = (csum < w);
+ 		csum += carry;
+-		word++;
+ 	} while (word != stop);
+ 
+ 	return csum_fold(csum);
+@@ -192,69 +196,4 @@ static inline __sum16 ip_compute_csum(co
+ 	return csum_fold(csum_partial(buff, len, 0));
+ }
+ 
+-#define _HAVE_ARCH_IPV6_CSUM
+-static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
+-					  const struct in6_addr *daddr,
+-					  __u32 len, unsigned short proto,
+-					  __wsum sum)
+-{
+-	__asm__(
+-	"	.set	push		# csum_ipv6_magic\n"
+-	"	.set	noreorder	\n"
+-	"	.set	noat		\n"
+-	"	addu	%0, %5		# proto (long in network byte order)\n"
+-	"	sltu	$1, %0, %5	\n"
+-	"	addu	%0, $1		\n"
+-
+-	"	addu	%0, %6		# csum\n"
+-	"	sltu	$1, %0, %6	\n"
+-	"	lw	%1, 0(%2)	# four words source address\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	lw	%1, 4(%2)	\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	lw	%1, 8(%2)	\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	lw	%1, 12(%2)	\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	lw	%1, 0(%3)	\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	lw	%1, 4(%3)	\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	lw	%1, 8(%3)	\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	lw	%1, 12(%3)	\n"
+-	"	addu	%0, $1		\n"
+-	"	addu	%0, %1		\n"
+-	"	sltu	$1, %0, %1	\n"
+-
+-	"	addu	%0, $1		# Add final carry\n"
+-	"	.set	pop"
+-	: "=r" (sum), "=r" (proto)
+-	: "r" (saddr), "r" (daddr),
+-	  "0" (htonl(len)), "1" (htonl(proto)), "r" (sum));
+-
+-	return csum_fold(sum);
+-}
+-
+ #endif /* _ASM_CHECKSUM_H */
+--- a/include/uapi/linux/ip.h
++++ b/include/uapi/linux/ip.h
+@@ -102,7 +102,7 @@ struct iphdr {
+ 	__be32	saddr;
+ 	__be32	daddr;
+ 	/*The options start here. */
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ 
+ struct ip_auth_hdr {
+--- a/include/uapi/linux/ipv6.h
++++ b/include/uapi/linux/ipv6.h
+@@ -125,7 +125,7 @@ struct ipv6hdr {
+ 
+ 	struct	in6_addr	saddr;
+ 	struct	in6_addr	daddr;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ 
+ /* index values for the variables in ipv6_devconf */
+--- a/include/uapi/linux/tcp.h
++++ b/include/uapi/linux/tcp.h
+@@ -54,7 +54,7 @@ struct tcphdr {
+ 	__be16	window;
+ 	__sum16	check;
+ 	__be16	urg_ptr;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ /*
+  *	The union cast uses a gcc extension to avoid aliasing problems
+@@ -64,7 +64,7 @@ struct tcphdr {
+ union tcp_word_hdr { 
+ 	struct tcphdr hdr;
+ 	__be32 		  words[5];
+-}; 
++} __attribute__((packed, aligned(2)));
+ 
+ #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
+ 
+--- a/include/uapi/linux/udp.h
++++ b/include/uapi/linux/udp.h
+@@ -24,7 +24,7 @@ struct udphdr {
+ 	__be16	dest;
+ 	__be16	len;
+ 	__sum16	check;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ /* UDP socket options */
+ #define UDP_CORK	1	/* Never send partially complete segments */
+--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
++++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+@@ -41,8 +41,8 @@ static bool ipv4_pkt_to_tuple(const stru
+ 	if (ap == NULL)
+ 		return false;
+ 
+-	tuple->src.u3.ip = ap[0];
+-	tuple->dst.u3.ip = ap[1];
++	tuple->src.u3.ip = net_hdr_word(ap++);
++	tuple->dst.u3.ip = net_hdr_word(ap);
+ 
+ 	return true;
+ }
+--- a/include/uapi/linux/icmp.h
++++ b/include/uapi/linux/icmp.h
+@@ -80,7 +80,7 @@ struct icmphdr {
+ 		__be16	mtu;
+ 	} frag;
+   } un;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ 
+ /*
+--- a/include/uapi/linux/in6.h
++++ b/include/uapi/linux/in6.h
+@@ -42,7 +42,7 @@ struct in6_addr {
+ #define s6_addr16		in6_u.u6_addr16
+ #define s6_addr32		in6_u.u6_addr32
+ #endif
+-};
++} __attribute__((packed, aligned(2)));
+ #endif /* __UAPI_DEF_IN6_ADDR */
+ 
+ #if __UAPI_DEF_SOCKADDR_IN6
+--- a/net/ipv6/tcp_ipv6.c
++++ b/net/ipv6/tcp_ipv6.c
+@@ -65,6 +65,7 @@
+ #include <net/tcp_memcontrol.h>
+ #include <net/busy_poll.h>
+ 
++#include <asm/unaligned.h>
+ #include <asm/uaccess.h>
+ 
+ #include <linux/proc_fs.h>
+@@ -771,10 +772,10 @@ static void tcp_v6_send_response(struct 
+ 	topt = (__be32 *)(t1 + 1);
+ 
+ 	if (tsecr) {
+-		*topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
+-				(TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP);
+-		*topt++ = htonl(tsval);
+-		*topt++ = htonl(tsecr);
++		put_unaligned_be32((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
++				(TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP, topt++);
++		put_unaligned_be32(tsval, topt++);
++		put_unaligned_be32(tsecr, topt++);
+ 	}
+ 
+ #ifdef CONFIG_TCP_MD5SIG
+--- a/include/linux/ipv6.h
++++ b/include/linux/ipv6.h
+@@ -5,6 +5,7 @@
+ 
+ #define ipv6_optlen(p)  (((p)->hdrlen+1) << 3)
+ #define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
++
+ /*
+  * This structure contains configuration options per IPv6 link.
+  */
+--- a/net/ipv6/datagram.c
++++ b/net/ipv6/datagram.c
+@@ -373,7 +373,7 @@ int ipv6_recv_error(struct sock *sk, str
+ 				ipv6_iface_scope_id(&sin->sin6_addr,
+ 						    IP6CB(skb)->iif);
+ 		} else {
+-			ipv6_addr_set_v4mapped(*(__be32 *)(nh + serr->addr_offset),
++			ipv6_addr_set_v4mapped(net_hdr_word(nh + serr->addr_offset),
+ 					       &sin->sin6_addr);
+ 			sin->sin6_scope_id = 0;
+ 		}
+@@ -722,12 +722,12 @@ int ip6_datagram_send_ctl(struct net *ne
+ 			}
+ 
+ 			if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
+-				if ((fl6->flowlabel^*(__be32 *)CMSG_DATA(cmsg))&~IPV6_FLOWINFO_MASK) {
++				if ((fl6->flowlabel^net_hdr_word(CMSG_DATA(cmsg)))&~IPV6_FLOWINFO_MASK) {
+ 					err = -EINVAL;
+ 					goto exit_f;
+ 				}
+ 			}
+-			fl6->flowlabel = IPV6_FLOWINFO_MASK & *(__be32 *)CMSG_DATA(cmsg);
++			fl6->flowlabel = IPV6_FLOWINFO_MASK & net_hdr_word(CMSG_DATA(cmsg));
+ 			break;
+ 
+ 		case IPV6_2292HOPOPTS:
+--- a/net/ipv6/ip6_gre.c
++++ b/net/ipv6/ip6_gre.c
+@@ -389,7 +389,7 @@ static void ip6gre_err(struct sk_buff *s
+ 
+ 	t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
+ 				flags & GRE_KEY ?
+-				*(((__be32 *)p) + (grehlen / 4) - 1) : 0,
++				net_hdr_word(((__be32 *)p) + (grehlen / 4) - 1) : 0,
+ 				p[1]);
+ 	if (t == NULL)
+ 		return;
+@@ -481,11 +481,11 @@ static int ip6gre_rcv(struct sk_buff *sk
+ 			offset += 4;
+ 		}
+ 		if (flags&GRE_KEY) {
+-			key = *(__be32 *)(h + offset);
++			key = net_hdr_word(h + offset);
+ 			offset += 4;
+ 		}
+ 		if (flags&GRE_SEQ) {
+-			seqno = ntohl(*(__be32 *)(h + offset));
++			seqno = ntohl(net_hdr_word(h + offset));
+ 			offset += 4;
+ 		}
+ 	}
+@@ -747,7 +747,7 @@ static netdev_tx_t ip6gre_xmit2(struct s
+ 
+ 		if (tunnel->parms.o_flags&GRE_SEQ) {
+ 			++tunnel->o_seqno;
+-			*ptr = htonl(tunnel->o_seqno);
++			net_hdr_word(ptr) = htonl(tunnel->o_seqno);
+ 			ptr--;
+ 		}
+ 		if (tunnel->parms.o_flags&GRE_KEY) {
+@@ -841,7 +841,7 @@ static inline int ip6gre_xmit_ipv6(struc
+ 
+ 	dsfield = ipv6_get_dsfield(ipv6h);
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
+-		fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
++		fl6.flowlabel |= net_hdr_word(ipv6h) & IPV6_TCLASS_MASK;
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)
+ 		fl6.flowlabel |= ip6_flowlabel(ipv6h);
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
+--- a/net/ipv6/ip6_tunnel.c
++++ b/net/ipv6/ip6_tunnel.c
+@@ -1285,7 +1285,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+ 
+ 	dsfield = ipv6_get_dsfield(ipv6h);
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
+-		fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
++		fl6.flowlabel |= net_hdr_word(ipv6h) & IPV6_TCLASS_MASK;
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)
+ 		fl6.flowlabel |= ip6_flowlabel(ipv6h);
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
+--- a/net/ipv6/exthdrs.c
++++ b/net/ipv6/exthdrs.c
+@@ -573,7 +573,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
+ 		goto drop;
+ 	}
+ 
+-	pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));
++	pkt_len = ntohl(net_hdr_word(nh + optoff + 2));
+ 	if (pkt_len <= IPV6_MAXPLEN) {
+ 		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),
+ 				 IPSTATS_MIB_INHDRERRORS);
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -212,5 +212,11 @@ struct callback_head {
+ };
+ #define rcu_head callback_head
+ 
++struct net_hdr_word {
++       u32 words[1];
++} __attribute__((packed, aligned(2)));
++
++#define net_hdr_word(_p) (((struct net_hdr_word *) (_p))->words[0])
++
+ #endif /*  __ASSEMBLY__ */
+ #endif /* _LINUX_TYPES_H */
+--- a/net/ipv4/af_inet.c
++++ b/net/ipv4/af_inet.c
+@@ -1367,8 +1367,8 @@ static struct sk_buff **inet_gro_receive
+ 	if (unlikely(ip_fast_csum((u8 *)iph, 5)))
+ 		goto out_unlock;
+ 
+-	id = ntohl(*(__be32 *)&iph->id);
+-	flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF));
++	id = ntohl(net_hdr_word(&iph->id));
++	flush = (u16)((ntohl(net_hdr_word(iph)) ^ skb_gro_len(skb)) | (id & ~IP_DF));
+ 	id >>= 16;
+ 
+ 	for (p = *head; p; p = p->next) {
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -460,7 +460,7 @@ static struct neighbour *ipv4_neigh_look
+ 	else if (skb)
+ 		pkey = &ip_hdr(skb)->daddr;
+ 
+-	n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey);
++	n = __ipv4_neigh_lookup(dev, net_hdr_word(pkey));
+ 	if (n)
+ 		return n;
+ 	return neigh_create(&arp_tbl, pkey, dev);
+--- a/net/ipv4/tcp_output.c
++++ b/net/ipv4/tcp_output.c
+@@ -422,48 +422,53 @@ static void tcp_options_write(__be32 *pt
+ 	u16 options = opts->options;	/* mungable copy */
+ 
+ 	if (unlikely(OPTION_MD5 & options)) {
+-		*ptr++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
+-			       (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
++		net_hdr_word(ptr++) =
++			htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
++			      (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
+ 		/* overload cookie hash location */
+ 		opts->hash_location = (__u8 *)ptr;
+ 		ptr += 4;
+ 	}
+ 
+ 	if (unlikely(opts->mss)) {
+-		*ptr++ = htonl((TCPOPT_MSS << 24) |
+-			       (TCPOLEN_MSS << 16) |
+-			       opts->mss);
++		net_hdr_word(ptr++) =
++			htonl((TCPOPT_MSS << 24) | (TCPOLEN_MSS << 16) |
++			      opts->mss);
+ 	}
+ 
+ 	if (likely(OPTION_TS & options)) {
+ 		if (unlikely(OPTION_SACK_ADVERTISE & options)) {
+-			*ptr++ = htonl((TCPOPT_SACK_PERM << 24) |
+-				       (TCPOLEN_SACK_PERM << 16) |
+-				       (TCPOPT_TIMESTAMP << 8) |
+-				       TCPOLEN_TIMESTAMP);
++			net_hdr_word(ptr++) =
++				htonl((TCPOPT_SACK_PERM << 24) |
++				      (TCPOLEN_SACK_PERM << 16) |
++				      (TCPOPT_TIMESTAMP << 8) |
++				      TCPOLEN_TIMESTAMP);
+ 			options &= ~OPTION_SACK_ADVERTISE;
+ 		} else {
+-			*ptr++ = htonl((TCPOPT_NOP << 24) |
+-				       (TCPOPT_NOP << 16) |
+-				       (TCPOPT_TIMESTAMP << 8) |
+-				       TCPOLEN_TIMESTAMP);
++			net_hdr_word(ptr++) =
++				htonl((TCPOPT_NOP << 24) |
++				      (TCPOPT_NOP << 16) |
++				      (TCPOPT_TIMESTAMP << 8) |
++				      TCPOLEN_TIMESTAMP);
+ 		}
+-		*ptr++ = htonl(opts->tsval);
+-		*ptr++ = htonl(opts->tsecr);
++		net_hdr_word(ptr++) = htonl(opts->tsval);
++		net_hdr_word(ptr++) = htonl(opts->tsecr);
+ 	}
+ 
+ 	if (unlikely(OPTION_SACK_ADVERTISE & options)) {
+-		*ptr++ = htonl((TCPOPT_NOP << 24) |
+-			       (TCPOPT_NOP << 16) |
+-			       (TCPOPT_SACK_PERM << 8) |
+-			       TCPOLEN_SACK_PERM);
++		net_hdr_word(ptr++) =
++			htonl((TCPOPT_NOP << 24) |
++			      (TCPOPT_NOP << 16) |
++			      (TCPOPT_SACK_PERM << 8) |
++			      TCPOLEN_SACK_PERM);
+ 	}
+ 
+ 	if (unlikely(OPTION_WSCALE & options)) {
+-		*ptr++ = htonl((TCPOPT_NOP << 24) |
+-			       (TCPOPT_WINDOW << 16) |
+-			       (TCPOLEN_WINDOW << 8) |
+-			       opts->ws);
++		net_hdr_word(ptr++) =
++			htonl((TCPOPT_NOP << 24) |
++			      (TCPOPT_WINDOW << 16) |
++			      (TCPOLEN_WINDOW << 8) |
++			      opts->ws);
+ 	}
+ 
+ 	if (unlikely(opts->num_sack_blocks)) {
+@@ -471,16 +476,17 @@ static void tcp_options_write(__be32 *pt
+ 			tp->duplicate_sack : tp->selective_acks;
+ 		int this_sack;
+ 
+-		*ptr++ = htonl((TCPOPT_NOP  << 24) |
+-			       (TCPOPT_NOP  << 16) |
+-			       (TCPOPT_SACK <<  8) |
+-			       (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
++		net_hdr_word(ptr++) =
++			htonl((TCPOPT_NOP << 24) |
++			      (TCPOPT_NOP << 16) |
++			      (TCPOPT_SACK << 8) |
++			      (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
+ 						     TCPOLEN_SACK_PERBLOCK)));
+ 
+ 		for (this_sack = 0; this_sack < opts->num_sack_blocks;
+ 		     ++this_sack) {
+-			*ptr++ = htonl(sp[this_sack].start_seq);
+-			*ptr++ = htonl(sp[this_sack].end_seq);
++			net_hdr_word(ptr++) = htonl(sp[this_sack].start_seq);
++			net_hdr_word(ptr++) = htonl(sp[this_sack].end_seq);
+ 		}
+ 
+ 		tp->rx_opt.dsack = 0;
+@@ -489,9 +495,10 @@ static void tcp_options_write(__be32 *pt
+ 	if (unlikely(OPTION_FAST_OPEN_COOKIE & options)) {
+ 		struct tcp_fastopen_cookie *foc = opts->fastopen_cookie;
+ 
+-		*ptr++ = htonl((TCPOPT_EXP << 24) |
+-			       ((TCPOLEN_EXP_FASTOPEN_BASE + foc->len) << 16) |
+-			       TCPOPT_FASTOPEN_MAGIC);
++		net_hdr_word(ptr++) =
++			htonl((TCPOPT_EXP << 24) |
++			      ((TCPOLEN_EXP_FASTOPEN_BASE + foc->len) << 16) |
++			      TCPOPT_FASTOPEN_MAGIC);
+ 
+ 		memcpy(ptr, foc->val, foc->len);
+ 		if ((foc->len & 3) == 2) {
+--- a/net/ipv4/igmp.c
++++ b/net/ipv4/igmp.c
+@@ -496,7 +496,7 @@ static struct sk_buff *add_grec(struct s
+ 		if (!skb)
+ 			return NULL;
+ 		psrc = (__be32 *)skb_put(skb, sizeof(__be32));
+-		*psrc = psf->sf_inaddr;
++		net_hdr_word(psrc) = psf->sf_inaddr;
+ 		scount++; stotal++;
+ 		if ((type == IGMPV3_ALLOW_NEW_SOURCES ||
+ 		     type == IGMPV3_BLOCK_OLD_SOURCES) && psf->sf_crcount) {
+--- a/include/uapi/linux/igmp.h
++++ b/include/uapi/linux/igmp.h
+@@ -32,7 +32,7 @@ struct igmphdr {
+ 	__u8 code;		/* For newer IGMP */
+ 	__sum16 csum;
+ 	__be32 group;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ /* V3 group record types [grec_type] */
+ #define IGMPV3_MODE_IS_INCLUDE		1
+@@ -48,7 +48,7 @@ struct igmpv3_grec {
+ 	__be16	grec_nsrcs;
+ 	__be32	grec_mca;
+ 	__be32	grec_src[0];
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ struct igmpv3_report {
+ 	__u8 type;
+@@ -57,7 +57,7 @@ struct igmpv3_report {
+ 	__be16 resv2;
+ 	__be16 ngrec;
+ 	struct igmpv3_grec grec[0];
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ struct igmpv3_query {
+ 	__u8 type;
+@@ -78,7 +78,7 @@ struct igmpv3_query {
+ 	__u8 qqic;
+ 	__be16 nsrcs;
+ 	__be32 srcs[0];
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ #define IGMP_HOST_MEMBERSHIP_QUERY	0x11	/* From RFC1112 */
+ #define IGMP_HOST_MEMBERSHIP_REPORT	0x12	/* Ditto */
+--- a/net/core/flow_dissector.c
++++ b/net/core/flow_dissector.c
+@@ -44,7 +44,7 @@ __be32 skb_flow_get_ports(const struct s
+ 		ports = skb_header_pointer(skb, thoff + poff,
+ 					   sizeof(_ports), &_ports);
+ 		if (ports)
+-			return *ports;
++			return (__be32)net_hdr_word(ports);
+ 	}
+ 
+ 	return 0;
+--- a/include/uapi/linux/icmpv6.h
++++ b/include/uapi/linux/icmpv6.h
+@@ -76,7 +76,7 @@ struct icmp6hdr {
+ #define icmp6_addrconf_other	icmp6_dataun.u_nd_ra.other
+ #define icmp6_rt_lifetime	icmp6_dataun.u_nd_ra.rt_lifetime
+ #define icmp6_router_pref	icmp6_dataun.u_nd_ra.router_pref
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ 
+ #define ICMPV6_ROUTER_PREF_LOW		0x3
+--- a/include/net/ndisc.h
++++ b/include/net/ndisc.h
+@@ -76,7 +76,7 @@ struct ra_msg {
+         struct icmp6hdr		icmph;
+ 	__be32			reachable_time;
+ 	__be32			retrans_timer;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ struct rd_msg {
+ 	struct icmp6hdr icmph;
+@@ -148,10 +148,10 @@ static inline u32 ndisc_hashfn(const voi
+ {
+ 	const u32 *p32 = pkey;
+ 
+-	return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) +
+-		(p32[1] * hash_rnd[1]) +
+-		(p32[2] * hash_rnd[2]) +
+-		(p32[3] * hash_rnd[3]));
++	return (((net_hdr_word(&p32[0]) ^ hash32_ptr(dev)) * hash_rnd[0]) +
++		(net_hdr_word(&p32[1]) * hash_rnd[1]) +
++		(net_hdr_word(&p32[2]) * hash_rnd[2]) +
++		(net_hdr_word(&p32[3]) * hash_rnd[3]));
+ }
+ 
+ static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
+@@ -168,8 +168,10 @@ static inline struct neighbour *__ipv6_n
+ 	     n = rcu_dereference_bh(n->next)) {
+ 		u32 *n32 = (u32 *) n->primary_key;
+ 		if (n->dev == dev &&
+-		    ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
+-		     (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0)
++		    ((n32[0] ^ net_hdr_word(&p32[0])) |
++			 (n32[1] ^ net_hdr_word(&p32[1])) |
++		     (n32[2] ^ net_hdr_word(&p32[2])) |
++			 (n32[3] ^ net_hdr_word(&p32[3]))) == 0)
+ 			return n;
+ 	}
+ 
+--- a/net/sched/cls_u32.c
++++ b/net/sched/cls_u32.c
+@@ -137,7 +137,7 @@ next_knode:
+ 			data = skb_header_pointer(skb, toff, 4, &hdata);
+ 			if (!data)
+ 				goto out;
+-			if ((*data ^ key->val) & key->mask) {
++			if ((net_hdr_word(data) ^ key->val) & key->mask) {
+ 				n = n->next;
+ 				goto next_knode;
+ 			}
+@@ -188,8 +188,8 @@ check_terminal:
+ 						  &hdata);
+ 			if (!data)
+ 				goto out;
+-			sel = ht->divisor & u32_hash_fold(*data, &n->sel,
+-							  n->fshift);
++			sel = ht->divisor & u32_hash_fold(net_hdr_word(data),
++							  &n->sel, n->fshift);
+ 		}
+ 		if (!(n->sel.flags & (TC_U32_VAROFFSET | TC_U32_OFFSET | TC_U32_EAT)))
+ 			goto next_ht;
+--- a/net/ipv6/ip6_offload.c
++++ b/net/ipv6/ip6_offload.c
+@@ -242,7 +242,7 @@ static struct sk_buff **ipv6_gro_receive
+ 			continue;
+ 
+ 		iph2 = (struct ipv6hdr *)(p->data + off);
+-		first_word = *(__be32 *)iph ^ *(__be32 *)iph2 ;
++		first_word = net_hdr_word(iph) ^ net_hdr_word(iph2);
+ 
+ 		/* All fields must match except length and Traffic Class.
+ 		 * XXX skbs on the gro_list have all been parsed and pulled
+--- a/include/net/addrconf.h
++++ b/include/net/addrconf.h
+@@ -43,7 +43,7 @@ struct prefix_info {
+ 	__be32			reserved2;
+ 
+ 	struct in6_addr		prefix;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ 
+ #include <linux/netdevice.h>
+--- a/include/net/inet_ecn.h
++++ b/include/net/inet_ecn.h
+@@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct 
+ {
+ 	if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
+ 		return 0;
+-	*(__be32*)iph |= htonl(INET_ECN_CE << 20);
++	net_hdr_word(iph) |= htonl(INET_ECN_CE << 20);
+ 	return 1;
+ }
+ 
+ static inline void IP6_ECN_clear(struct ipv6hdr *iph)
+ {
+-	*(__be32*)iph &= ~htonl(INET_ECN_MASK << 20);
++	net_hdr_word(iph) &= ~htonl(INET_ECN_MASK << 20);
+ }
+ 
+ static inline void ipv6_copy_dscp(unsigned int dscp, struct ipv6hdr *inner)
+--- a/include/net/ipv6.h
++++ b/include/net/ipv6.h
+@@ -108,7 +108,7 @@ struct frag_hdr {
+ 	__u8	reserved;
+ 	__be16	frag_off;
+ 	__be32	identification;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ #define	IP6_MF		0x0001
+ #define	IP6_OFFSET	0xFFF8
+@@ -397,8 +397,8 @@ static inline void __ipv6_addr_set_half(
+ 	}
+ #endif
+ #endif
+-	addr[0] = wh;
+-	addr[1] = wl;
++	net_hdr_word(&addr[0]) = wh;
++	net_hdr_word(&addr[1]) = wl;
+ }
+ 
+ static inline void ipv6_addr_set(struct in6_addr *addr, 
+@@ -457,6 +457,8 @@ static inline bool ipv6_prefix_equal(con
+ 	const __be32 *a1 = addr1->s6_addr32;
+ 	const __be32 *a2 = addr2->s6_addr32;
+ 	unsigned int pdw, pbi;
++	/* Used for last <32-bit fraction of prefix */
++	u32 pbia1, pbia2;
+ 
+ 	/* check complete u32 in prefix */
+ 	pdw = prefixlen >> 5;
+@@ -465,7 +467,9 @@ static inline bool ipv6_prefix_equal(con
+ 
+ 	/* check incomplete u32 in prefix */
+ 	pbi = prefixlen & 0x1f;
+-	if (pbi && ((a1[pdw] ^ a2[pdw]) & htonl((0xffffffff) << (32 - pbi))))
++	pbia1 = net_hdr_word(&a1[pdw]);
++	pbia2 = net_hdr_word(&a2[pdw]);
++	if (pbi && ((pbia1 ^ pbia2) & htonl((0xffffffff) << (32 - pbi))))
+ 		return false;
+ 
+ 	return true;
+@@ -598,13 +602,13 @@ static inline void ipv6_addr_set_v4mappe
+  */
+ static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
+ {
+-	const __be32 *a1 = token1, *a2 = token2;
++	const struct in6_addr *a1 = token1, *a2 = token2;
+ 	int i;
+ 
+ 	addrlen >>= 2;
+ 
+ 	for (i = 0; i < addrlen; i++) {
+-		__be32 xb = a1[i] ^ a2[i];
++		__be32 xb = a1->s6_addr32[i] ^ a2->s6_addr32[i];
+ 		if (xb)
+ 			return i * 32 + 31 - __fls(ntohl(xb));
+ 	}
+@@ -670,17 +674,18 @@ int ip6_dst_hoplimit(struct dst_entry *d
+ static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
+ 				__be32 flowlabel)
+ {
+-	*(__be32 *)hdr = htonl(0x60000000 | (tclass << 20)) | flowlabel;
++	net_hdr_word((__be32 *)hdr) =
++		htonl(0x60000000 | (tclass << 20)) | flowlabel;
+ }
+ 
+ static inline __be32 ip6_flowinfo(const struct ipv6hdr *hdr)
+ {
+-	return *(__be32 *)hdr & IPV6_FLOWINFO_MASK;
++	return net_hdr_word((__be32 *)hdr) & IPV6_FLOWINFO_MASK;
+ }
+ 
+ static inline __be32 ip6_flowlabel(const struct ipv6hdr *hdr)
+ {
+-	return *(__be32 *)hdr & IPV6_FLOWLABEL_MASK;
++	return net_hdr_word((__be32 *)hdr) & IPV6_FLOWLABEL_MASK;
+ }
+ 
+ static inline u8 ip6_tclass(__be32 flowinfo)
+--- a/include/net/secure_seq.h
++++ b/include/net/secure_seq.h
+@@ -2,6 +2,7 @@
+ #define _NET_SECURE_SEQ
+ 
+ #include <linux/types.h>
++#include <linux/in6.h>
+ 
+ u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
+ u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
+--- a/include/uapi/linux/in.h
++++ b/include/uapi/linux/in.h
+@@ -78,7 +78,7 @@ enum {
+ /* Internet address. */
+ struct in_addr {
+ 	__be32	s_addr;
+-};
++} __attribute__((packed, aligned(2)));
+ 
+ #define IP_TOS		1
+ #define IP_TTL		2
+--- a/net/core/secure_seq.c
++++ b/net/core/secure_seq.c
+@@ -46,11 +46,12 @@ __u32 secure_tcpv6_sequence_number(const
+ 	u32 secret[MD5_MESSAGE_BYTES / 4];
+ 	u32 hash[MD5_DIGEST_WORDS];
+ 	u32 i;
++	const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
+ 
+ 	net_secret_init();
+ 	memcpy(hash, saddr, 16);
+ 	for (i = 0; i < 4; i++)
+-		secret[i] = net_secret[i] + (__force u32)daddr[i];
++		secret[i] = net_secret[i] + (__force u32)daddr6->s6_addr32[i];
+ 	secret[4] = net_secret[4] +
+ 		(((__force u16)sport << 16) + (__force u16)dport);
+ 	for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
+@@ -68,11 +69,12 @@ u32 secure_ipv6_port_ephemeral(const __b
+ 	u32 secret[MD5_MESSAGE_BYTES / 4];
+ 	u32 hash[MD5_DIGEST_WORDS];
+ 	u32 i;
++	const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
+ 
+ 	net_secret_init();
+ 	memcpy(hash, saddr, 16);
+ 	for (i = 0; i < 4; i++)
+-		secret[i] = net_secret[i] + (__force u32) daddr[i];
++		secret[i] = net_secret[i] + (__force u32) daddr6->s6_addr32[i];
+ 	secret[4] = net_secret[4] + (__force u32)dport;
+ 	for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
+ 		secret[i] = net_secret[i];
+@@ -150,11 +152,12 @@ u64 secure_dccpv6_sequence_number(__be32
+ 	u32 hash[MD5_DIGEST_WORDS];
+ 	u64 seq;
+ 	u32 i;
++	const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
+ 
+ 	net_secret_init();
+ 	memcpy(hash, saddr, 16);
+ 	for (i = 0; i < 4; i++)
+-		secret[i] = net_secret[i] + daddr[i];
++		secret[i] = net_secret[i] +  daddr6->s6_addr32[i];
+ 	secret[4] = net_secret[4] +
+ 		(((__force u16)sport << 16) + (__force u16)dport);
+ 	for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
+--- a/net/ipv6/ip6_fib.c
++++ b/net/ipv6/ip6_fib.c
+@@ -144,7 +144,7 @@ static __inline__ __be32 addr_bit_set(co
+ 	 * See include/asm-generic/bitops/le.h.
+ 	 */
+ 	return (__force __be32)(1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)) &
+-	       addr[fn_bit >> 5];
++	       net_hdr_word(&addr[fn_bit >> 5]);
+ }
+ 
+ static __inline__ struct fib6_node * node_alloc(void)
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -456,7 +456,7 @@ static void tcp_sack(const struct sk_buf
+ 
+ 	/* Fast path for timestamp-only option */
+ 	if (length == TCPOLEN_TSTAMP_ALIGNED
+-	    && *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
++	    && net_hdr_word(ptr) == htonl((TCPOPT_NOP << 24)
+ 				       | (TCPOPT_NOP << 16)
+ 				       | (TCPOPT_TIMESTAMP << 8)
+ 				       | TCPOLEN_TIMESTAMP))
+--- a/net/netfilter/xt_LOG.c
++++ b/net/netfilter/xt_LOG.c
+@@ -528,9 +528,9 @@ static void dump_ipv6_packet(struct sbuf
+ 	/* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
+ 	sb_add(m, "LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
+ 	       ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
+-	       (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
++	       (ntohl(net_hdr_word(ih)) & 0x0ff00000) >> 20,
+ 	       ih->hop_limit,
+-	       (ntohl(*(__be32 *)ih) & 0x000fffff));
++	       (ntohl(net_hdr_word(ih)) & 0x000fffff));
+ 
+ 	fragment = 0;
+ 	ptr = ip6hoff + sizeof(struct ipv6hdr);
+--- a/net/xfrm/xfrm_input.c
++++ b/net/xfrm/xfrm_input.c
+@@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb, 
+ 	if (!pskb_may_pull(skb, hlen))
+ 		return -EINVAL;
+ 
+-	*spi = *(__be32 *)(skb_transport_header(skb) + offset);
+-	*seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
++	*spi = net_hdr_word(skb_transport_header(skb) + offset);
++	*seq = net_hdr_word(skb_transport_header(skb) + offset_seq);
+ 	return 0;
+ }
+ 
+--- a/net/ipv4/tcp_input.c
++++ b/net/ipv4/tcp_input.c
+@@ -3629,14 +3629,16 @@ static bool tcp_parse_aligned_timestamp(
+ {
+ 	const __be32 *ptr = (const __be32 *)(th + 1);
+ 
+-	if (*ptr == htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16)
+-			  | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
++	if (net_hdr_word(ptr) ==
++	    htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
++		  (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
+ 		tp->rx_opt.saw_tstamp = 1;
+ 		++ptr;
+-		tp->rx_opt.rcv_tsval = ntohl(*ptr);
++		tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr);
+ 		++ptr;
+-		if (*ptr)
+-			tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset;
++		if (net_hdr_word(ptr))
++			tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) -
++					       tp->tsoffset;
+ 		else
+ 			tp->rx_opt.rcv_tsecr = 0;
+ 		return true;
+--- a/include/uapi/linux/if_pppox.h
++++ b/include/uapi/linux/if_pppox.h
+@@ -47,6 +47,7 @@ struct pppoe_addr {
+  */
+ struct pptp_addr {
+ 	__u16		call_id;
++	__u16		pad;
+ 	struct in_addr	sin_addr;
+ };
+ 
diff --git a/trunk/target/linux/generic/PATCHES b/trunk/target/linux/generic/PATCHES
new file mode 100644
index 00000000..84291bed
--- /dev/null
+++ b/trunk/target/linux/generic/PATCHES
@@ -0,0 +1,20 @@
+The patches-* subdirectories contain the kernel patches applied for every
+libreCMC target. All patches should be named 'NNN-lowercase_shortname.patch'
+and sorted into the following categories:
+
+0xx - upstream backports
+1xx - code awaiting upstream merge
+2xx - kernel build / config / header patches
+3xx - architecture specific patches
+4xx - mtd related patches (subsystem and drivers)
+5xx - filesystem related patches
+6xx - generic network patches
+7xx - network / phy driver patches
+8xx - other drivers
+9xx - uncategorized other patches
+
+ALL patches must be in a way that they are potentially upstreamable, meaning:
+
+- they must contain a proper subject
+- they must contain a proper commit message explaining what they change
+- they must contain a valid Signed-off-by line
diff --git a/trunk/target/linux/generic/base-files/init b/trunk/target/linux/generic/base-files/init
new file mode 100755
index 00000000..514be57e
--- /dev/null
+++ b/trunk/target/linux/generic/base-files/init
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+export INITRAMFS=1
+exec /sbin/init
diff --git a/trunk/target/linux/generic/config-3.10 b/trunk/target/linux/generic/config-3.10
new file mode 100644
index 00000000..5df8901b
--- /dev/null
+++ b/trunk/target/linux/generic/config-3.10
@@ -0,0 +1,4040 @@
+CONFIG_32BIT=y
+# CONFIG_6PACK is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_AB8500_CORE is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_ACENIC is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
+# CONFIG_AD2S90 is not set
+# CONFIG_AD5064 is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686 is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD5930 is not set
+# CONFIG_AD5933 is not set
+# CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606 is not set
+# CONFIG_AD7746 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD799X is not set
+# CONFIG_AD8366 is not set
+# CONFIG_AD9523 is not set
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# CONFIG_AD9850 is not set
+# CONFIG_AD9852 is not set
+# CONFIG_AD9910 is not set
+# CONFIG_AD9951 is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADE7753 is not set
+# CONFIG_ADE7754 is not set
+# CONFIG_ADE7758 is not set
+# CONFIG_ADE7759 is not set
+# CONFIG_ADE7854 is not set
+# CONFIG_ADF4350 is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADIS16060 is not set
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16204 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADIS16220 is not set
+# CONFIG_ADIS16240 is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_ADT7316 is not set
+# CONFIG_ADXRS450 is not set
+CONFIG_AEABI=y
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AGP is not set
+CONFIG_AIO=y
+# CONFIG_AIRO is not set
+# CONFIG_AIRO_CS is not set
+# CONFIG_AK8975 is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_ALX is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_AMD_PHY is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_ANDROID is not set
+CONFIG_ANON_INODES=y
+# CONFIG_APDS9802ALS is not set
+# CONFIG_APM8018X is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AR7 is not set
+# CONFIG_AR8216_PHY is not set
+# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_EXYNOS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=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_HIGHBANK 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_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_MULTIPLATFORM is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_OMAP1 is not set
+# CONFIG_ARCH_OMAP2PLUS is not set
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PRIMA2 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ARCH_TCC_926 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ARM_ARCH_TIMER is not set
+# CONFIG_ARM_AT91_ETHER is not set
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+# CONFIG_ARM_ERRATA_326103 is not set
+# CONFIG_ARM_ERRATA_364296 is not set
+# CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_643719 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
+# CONFIG_ARM_ERRATA_798181 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_ARM_PSCI is not set
+# CONFIG_ARM_UNWIND is not set
+# CONFIG_ARM_VIRT_EXT is not set
+CONFIG_ARPD=y
+# CONFIG_ARTHUR is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_ATA is not set
+CONFIG_ATAGS_PROC=y
+# CONFIG_ATALK is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_ACPI is not set
+CONFIG_ATA_BMDMA=y
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_SFF=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH6K_LEGACY is not set
+# CONFIG_ATH79 is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL2 is not set
+# CONFIG_ATM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_BR2684 is not set
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_ATM_CLIP is not set
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_MPOA is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
+# CONFIG_AUDIT is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTO_ZRELADDR is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AVERAGE is not set
+# CONFIG_AX25 is not set
+# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_B44 is not set
+# CONFIG_B53 is not set
+# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BCACHE is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
+# CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_BCMA is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BE2NET is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BGMAC is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BITREVERSE=y
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_CPQ_DA is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_BLOCK=y
+# CONFIG_BMP085 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_BNA is not set
+# CONFIG_BNX2 is not set
+# CONFIG_BNX2X is not set
+# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_RAW=y
+# CONFIG_BPCTL is not set
+# CONFIG_BPF_JIT is not set
+# CONFIG_BPQETHER is not set
+CONFIG_BQL=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_EBT_802_3 is not set
+# CONFIG_BRIDGE_EBT_AMONG is not set
+# CONFIG_BRIDGE_EBT_ARP is not set
+# CONFIG_BRIDGE_EBT_ARPREPLY is not set
+# CONFIG_BRIDGE_EBT_BROUTE is not set
+# CONFIG_BRIDGE_EBT_DNAT is not set
+# CONFIG_BRIDGE_EBT_IP is not set
+# CONFIG_BRIDGE_EBT_IP6 is not set
+# CONFIG_BRIDGE_EBT_LIMIT is not set
+# CONFIG_BRIDGE_EBT_LOG is not set
+# CONFIG_BRIDGE_EBT_MARK is not set
+# CONFIG_BRIDGE_EBT_MARK_T is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_BRIDGE_EBT_PKTTYPE is not set
+# CONFIG_BRIDGE_EBT_REDIRECT is not set
+# CONFIG_BRIDGE_EBT_SNAT is not set
+# CONFIG_BRIDGE_EBT_STP is not set
+# CONFIG_BRIDGE_EBT_T_FILTER is not set
+# CONFIG_BRIDGE_EBT_T_NAT is not set
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_VLAN is not set
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BRIDGE_VLAN_FILTERING is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_BT is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_3WIRE is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_HIDP is not set
+CONFIG_BT_L2CAP=y
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_RFCOMM is not set
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_SCO=y
+CONFIG_BUG=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+# CONFIG_C2PORT is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_CARMA_FPGA is not set
+# CONFIG_CARMA_FPGA_PROGRAM is not set
+# CONFIG_CASSINI is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CED1401 is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
+# CONFIG_CIFS_DEBUG is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CIFS_NFSD_EXPORT is not set
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CLEANCACHE is not set
+CONFIG_CLS_U32_MARK=y
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CMA is not set
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+# CONFIG_CNIC is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_COMEDI is not set
+# CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_CONSTRUCTORS=y
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
+# CONFIG_CORDIC is not set
+# CONFIG_COREDUMP is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRASHLOG=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC32_SARWATE=y
+# CONFIG_CRC32_SELFTEST is not set
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SLICEBY8 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_CRC8 is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CROSS_COMPILE=""
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_AEAD is not set
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_ARM is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_BLKCIPHER is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CMAC is not set
+# CONFIG_CRYPTO_CRC32 is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
+# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
+# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_HASH is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA1_ARM is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_COMMON is not set
+# CONFIG_CRYPTO_USER is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_XZ is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CS5535_MFGPT is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_CUSE is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_CYPRESS_FIRMWARE is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DCB is not set
+# CONFIG_DDR is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO_REDUCED=y
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKDEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_ZBOOT is not set
+# CONFIG_DECNET is not set
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_DEVPORT=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DEVTMPFS is not set
+# CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DGRP is not set
+# CONFIG_DIRECT_IO is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DL2K is not set
+# CONFIG_DLM is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMASCC is not set
+# CONFIG_DMATEST is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_ENGINE is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DM_CACHE is not set
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_VERITY is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DNET is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_DNS_RESOLVER is not set
+CONFIG_DQL=y
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
+# CONFIG_DTLK is not set
+# CONFIG_DUMMY is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E2100 is not set
+# CONFIG_EASYCAP is not set
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_EDAC is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_EFS_FS is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_ENIC is not set
+# CONFIG_EPAPR_PARAVIRT is not set
+# CONFIG_EPIC100 is not set
+CONFIG_EPOLL=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
+# CONFIG_ETH16I is not set
+CONFIG_ETHERNET=y
+# CONFIG_ETHOC is not set
+CONFIG_EVENTFD=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+# CONFIG_EWRK3 is not set
+CONFIG_EXPERIMENTAL=y
+CONFIG_EXPERT=y
+# CONFIG_EXPORTFS is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXTCON is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_EXYNOS_ADC is not set
+# CONFIG_EXYNOS_VIDEO is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_F2FS_FS is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FANOTIFY is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_FS is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FB is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMX is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_PS3 is not set
+# CONFIG_FB_PXA is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_FCOE is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_FDDI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_FHANDLE is not set
+CONFIG_FIB_RULES=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_FLATMEM=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FORCEDETH is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_FSCACHE is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_FT1000 is not set
+# CONFIG_FTGMAC100 is not set
+# CONFIG_FTL is not set
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_FUSE_FS is not set
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+# CONFIG_FUSION_SPI is not set
+CONFIG_FUTEX=y
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_GACT_PROB=y
+# CONFIG_GADGET_UAC1 is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_GCOV is not set
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_TIME=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_ICH is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
+# CONFIG_GPIO_RDC321X is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_WDT is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HAMACHI is not set
+CONFIG_HAMRADIO=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_HAVE_ARM_ARCH_TIMER is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HCALL_STATS is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HDQ_MASTER_OMAP is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HERMES is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_HID is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GENERIC is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_PS3REMOTE is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIPPI is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_CS is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
+CONFIG_HOTPLUG=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HP100 is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_HSI is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HW_PERF_EVENTS=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_PPC4XX is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_PERIODIC is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_AU1550 is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_CHARDEV is not set
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_HID is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_ISMT is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_MUX is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_OCTEON is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_SCMI is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2O is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_ZMII is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_IDE is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_IFB is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IIO is not set
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_GPIO_TRIGGER is not set
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
+CONFIG_INET=y
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_TCP_DIAG is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFTL is not set
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_MATRIXKMAP is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_INTEL_OAKTRAIL is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_INV_MPU6050_IIO is not set
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
+# CONFIG_IP17XX_PHY is not set
+# CONFIG_IP6_NF_FILTER is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IPACK_BUS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPV6 is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_ROUTE_INFO is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_SIT_6RD is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_PROMISCUOUS is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_IP_PNP is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_LIRC_CODEC is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_NEC_DECODER is not set
+# CONFIG_IR_RC5_DECODER is not set
+# CONFIG_IR_RC5_SZ_DECODER is not set
+# CONFIG_IR_RC6_DECODER is not set
+# CONFIG_IR_SONY_DECODER is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_ISCSI_TCP is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_ISS4xx is not set
+# CONFIG_ITG3200 is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWMC3200TOP is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD2_DEBUG is not set
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_FS_POSIX_ACL is not set
+# CONFIG_JFFS2_FS_SECURITY is not set
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_LZMA=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_ZLIB is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JME is not set
+CONFIG_JOLIET=y
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_UNCOMPRESSED is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_KGDB is not set
+# CONFIG_KMEMCHECK is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
+CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_GUEST is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_L2TP is not set
+# CONFIG_L2TP_ETH is not set
+# CONFIG_L2TP_IP is not set
+# CONFIG_L2TP_V3 is not set
+# CONFIG_LANMEDIA is not set
+# CONFIG_LANTIQ is not set
+# CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_LBDAF=y
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_ATMEL_PWM is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO_OF=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3556 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_NET5501 is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_USBDEV is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_LIB80211_CRYPT_CCMP is not set
+# CONFIG_LIB80211_CRYPT_TKIP is not set
+# CONFIG_LIB80211_CRYPT_WEP is not set
+# CONFIG_LIB80211_DEBUG is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_LIRC_STAGING is not set
+# CONFIG_LIS3L02DQ is not set
+# CONFIG_LKDTM is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_LOCKD is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_LOCKD_V4=y
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_LOGFS is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_LOONGSON_MC146818 is not set
+# CONFIG_LP486E is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+# CONFIG_LZO_COMPRESS is not set
+# CONFIG_LZO_DECOMPRESS is not set
+# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_MACB is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_LOONGSON1 is not set
+# CONFIG_MACH_NO_WESTBRIDGE is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MAILBOX is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCPM is not set
+# CONFIG_MD is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_CONTROLLER is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEDIA_USB_SUPPORT is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEMORY is not set
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_OMAP_USB_HOST is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MIGRATION is not set
+CONFIG_MII=y
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD3 is not set
+# CONFIG_MIPS_SIM is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_NETJET is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MKISS is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MMC is not set
+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AU1X is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_BLOCK_MINORS=8
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+CONFIG_MMU=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_STRIPPED=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_MSI_LAPTOP is not set
+CONFIG_MTD=y
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LATCH_ADDR is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_AMS_DELTA is not set
+# CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
+# CONFIG_MTD_NAND_ATMEL is not set
+# CONFIG_MTD_NAND_AU1550 is not set
+# CONFIG_MTD_NAND_AUTCPU12 is not set
+# CONFIG_MTD_NAND_BCH is not set
+# CONFIG_MTD_NAND_BCM_UMI is not set
+# CONFIG_MTD_NAND_BF5XX is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CM_X270 is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_MTD_NAND_DAVINCI is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_ECC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+# CONFIG_MTD_NAND_FSL_IFC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
+# CONFIG_MTD_NAND_FSMC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_GPMI_NAND is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_JZ4740 is not set
+# CONFIG_MTD_NAND_MPC5121_NFC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_NDFC is not set
+# CONFIG_MTD_NAND_NOMADIK is not set
+# CONFIG_MTD_NAND_NUC900 is not set
+# CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_ORION is not set
+# CONFIG_MTD_NAND_PASEMI is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_PPCHAMELEONEVB is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
+# CONFIG_MTD_NAND_RB4XX is not set
+# CONFIG_MTD_NAND_RB750 is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_RTC_FROM4 is not set
+# CONFIG_MTD_NAND_S3C2410 is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_SH_FLCTL is not set
+# CONFIG_MTD_NAND_SOCRATES is not set
+# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_NAND_TMIO is not set
+# CONFIG_MTD_NAND_TXX9NDFMC is not set
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_SPLIT=y
+# CONFIG_MTD_SPLIT_FIRMWARE is not set
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+# CONFIG_MTD_SPLIT_LZMA_FW is not set
+# CONFIG_MTD_SPLIT_SEAMA_FW is not set
+# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
+# CONFIG_MTD_SPLIT_UIMAGE_FW is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MTD_UIMAGE_SPLIT is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_MVMDIO is not set
+# CONFIG_MVSWITCH_PHY is not set
+# CONFIG_MWAVE is not set
+# CONFIG_MWL8K is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NE2000 is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
+CONFIG_NET=y
+# CONFIG_NETCONSOLE is not set
+CONFIG_NETDEVICES=y
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+# CONFIG_NETFILTER_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETLINK_DIAG is not set
+# CONFIG_NETLINK_MMAP is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETROM is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_U32 is not set
+CONFIG_NET_CORE=y
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_EMATCH_CMP is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_NBYTE is not set
+CONFIG_NET_EMATCH_STACK=32
+# CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_U32 is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_FC is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPVTI is not set
+# CONFIG_NET_IP_TUNNEL is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POCKET is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_ATM is not set
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_ESFQ is not set
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_NET_SCH_FQ_CODEL=y
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_NET_TULIP is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_NEW_LEDS=y
+# CONFIG_NFC is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_DEPRECATED is not set
+# CONFIG_NFSD_V2_ACL is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFS_ACL_SUPPORT is not set
+CONFIG_NFS_COMMON=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V2 is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFTL is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+# CONFIG_NF_CONNTRACK_RTSP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_GRE is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_NAT is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_IPV4=m
+# CONFIG_NF_NAT_IPV6 is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_NEEDED is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
+# CONFIG_NF_NAT_RTSP is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_NIU is not set
+CONFIG_NLATTR=y
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
+# CONFIG_NLS is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_NO_BOOTMEM is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_NTP_PPS is not set
+# CONFIG_NVRAM is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_N_GSM is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OBS600 is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_OCP2SCP is not set
+# CONFIG_OMAP_USB2 is not set
+# CONFIG_OMAP_USB3 is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_ORION_WATCHDOG is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_OVERLAYFS_FS=y
+# CONFIG_P54_COMMON is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PANEL is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_1284 is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OCTEON_CF is not set
+# CONFIG_PATA_OF_PLATFORM is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PC300TOO is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCMCIA is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_XIRCOM is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PD6729 is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_PID_NS is not set
+# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_EXYNOS is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_PLIP is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PM is not set
+# CONFIG_PMBUS is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWERTV is not set
+# CONFIG_POWER_AVS is not set
+# CONFIG_POWER_RESET is not set
+# CONFIG_POWER_RESET_RESTART is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PPC4xx_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPP is not set
+# CONFIG_PPPOATM is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_PARPORT is not set
+# CONFIG_PPS_DEBUG is not set
+# CONFIG_PPTP is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_PRINTK=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
+# CONFIG_PROC_DEVICETREE is not set
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_STRIPPED=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILING is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_PSB6970_PHY is not set
+# CONFIG_PSTORE is not set
+# CONFIG_PTP_1588_CLOCK is not set
+# CONFIG_PTP_1588_CLOCK_IXP46X is not set
+# CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_PWM is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_R3964 is not set
+# CONFIG_R6040 is not set
+# CONFIG_R8169 is not set
+# CONFIG_R8187SE is not set
+# CONFIG_R8712U is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RALINK is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RAPIDIO is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_RCU_NOCB_CPU is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_USER_QS is not set
+# CONFIG_RC_CORE is not set
+# CONFIG_RC_MAP is not set
+# CONFIG_RDS is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_REDWOOD is not set
+# CONFIG_REGMAP is not set
+# CONFIG_REGMAP_I2C is not set
+# CONFIG_REGMAP_SPI is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_RELAY is not set
+# CONFIG_RESET_CONTROLLER is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_ROSE is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_GENERIC is not set
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_PS3 is not set
+# CONFIG_RTC_DRV_PT7C4338 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_SYSTOHC=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+# CONFIG_RTL8367B_PHY is not set
+# CONFIG_RTL8367_PHY is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_RTS_PSTOR is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_RUNTIME_DEBUG is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_S2IO is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_FSL is not set
+# CONFIG_SATA_HIGHBANK is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_SBE_2T3E3 is not set
+# CONFIG_SBYPASS is not set
+# CONFIG_SC92031 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCC is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHED_MC is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SCHED_SMT is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_ISCI is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_MOD=y
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SDIO_UART is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SEEQ8005 is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ACPI_POWER is not set
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_GSC is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HMC5843 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95234 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_ACCENT is not set
+# CONFIG_SERIAL_8250_BOCA is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_DMA=y
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_FOURPORT is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_PCI is not set
+# CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_SYSRQ is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SFC is not set
+# CONFIG_SFI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SGI_PARTITION is not set
+CONFIG_SHMEM=y
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIGMA is not set
+CONFIG_SIGNALFD=y
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC9194 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_SND is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_HWDEP is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_MIPS is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_MXS_SOC is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_OXYGEN is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_PCM is not set
+# CONFIG_SND_PCMCIA is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_POWERPC_SOC is not set
+# CONFIG_SND_PPC is not set
+# CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
+# CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TIMER is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_SOLO6X10 is not set
+# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_SOUND is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_SP5100_TCO is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_SPARSE_IRQ is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_SPEAKUP is not set
+# CONFIG_SPI is not set
+# CONFIG_SPINLOCK_TEST is not set
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_ESPI is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_OCTEON is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PPC4xx is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_RAMIPS is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZLIB is not set
+# CONFIG_SRAM is not set
+# CONFIG_SSB is not set
+# CONFIG_SSBI is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSFDC is not set
+CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STACK_TRACER is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
+CONFIG_STANDALONE=y
+CONFIG_STDBINUTILS=y
+# CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_STMMAC_ETH is not set
+CONFIG_STP=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_SUSPEND is not set
+CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_LEDS is not set
+# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_SYSCTL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TC35815 is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEXTSEARCH=y
+# CONFIG_TEXTSEARCH_BM is not set
+# CONFIG_TEXTSEARCH_FSM is not set
+# CONFIG_TEXTSEARCH_KMP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_TIFM_CORE is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_TIMB_DMA is not set
+CONFIG_TIMERFD=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_TINY_RCU=y
+# CONFIG_TIPC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_TI_ST is not set
+# CONFIG_TLAN is not set
+# CONFIG_TMD_HERMES is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TR is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_TRACE_SINK is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_TRAD_SIGNALS=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2x7x is not set
+CONFIG_TTY=y
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_TYPHOON is not set
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UDF_NLS=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_UFS_FS is not set
+# CONFIG_UHID is not set
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
+# CONFIG_UIO is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_UNIX=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_ALI_M5632=y
+# CONFIG_USB_AMD5536UDC is not set
+CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATM is not set
+CONFIG_USB_BELKIN=y
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC_OTG_LPM is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_HCD_AT91 is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_USB_EZUSB=y
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_JL2005BCD is not set
+# CONFIG_USB_GSPCA_KINECT is not set
+# CONFIG_USB_GSPCA_KONICA is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_NW80X is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SE401 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ930X is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TOPRO is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_VICAM is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_INPUT_IMS_PCU is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_NET_AX88179_178A is not set
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PCI is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PHY is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RCAR_PHY is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_RTL8152 is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_METRO is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_WISHBONE is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_XSENS_MT is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_ZTE is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_USE_OF is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VETH is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VGA_ARB is not set
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_UDA1342 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_VITESSE_PHY is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_VMSPLIT_1G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMWARE_PVSCSI is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VORTEX is not set
+# CONFIG_VSOCKETS is not set
+# CONFIG_VT is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_VXGE is not set
+# CONFIG_VXLAN is not set
+# CONFIG_W1 is not set
+# CONFIG_W1_CON is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W35UND is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_WAN is not set
+# CONFIG_WANXL is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_WDTPCI is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+# CONFIG_WIMAX is not set
+# CONFIG_WIMAX_GDM72XX is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+CONFIG_WLAN=y
+# CONFIG_WL_TI is not set
+# CONFIG_WR_PPMC is not set
+# CONFIG_X25 is not set
+# CONFIG_X86_16BIT is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_IPCOMP is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XILINX_AXI_EMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_XMON is not set
+# CONFIG_XVMALLOC is not set
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_BCJ is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_YAM is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_YENTA is not set
+# CONFIG_YENTA_O2 is not set
+# CONFIG_YENTA_RICOH is not set
+# CONFIG_YENTA_TI is not set
+# CONFIG_YENTA_TOSHIBA is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_ZLIB_DEFLATE is not set
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZNET is not set
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZRAM is not set
+# CONFIG_ZSMALLOC is not set
diff --git a/trunk/target/linux/generic/config-3.13 b/trunk/target/linux/generic/config-3.13
new file mode 100644
index 00000000..79261d84
--- /dev/null
+++ b/trunk/target/linux/generic/config-3.13
@@ -0,0 +1,4265 @@
+CONFIG_32BIT=y
+# CONFIG_6PACK is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_AB8500_CORE is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_ACENIC is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_EXTLOG is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
+# CONFIG_AD2S90 is not set
+# CONFIG_AD5064 is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686 is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD5930 is not set
+# CONFIG_AD5933 is not set
+# CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606 is not set
+# CONFIG_AD7746 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD799X is not set
+# CONFIG_AD8366 is not set
+# CONFIG_AD9523 is not set
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# CONFIG_AD9850 is not set
+# CONFIG_AD9852 is not set
+# CONFIG_AD9910 is not set
+# CONFIG_AD9951 is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADE7753 is not set
+# CONFIG_ADE7754 is not set
+# CONFIG_ADE7758 is not set
+# CONFIG_ADE7759 is not set
+# CONFIG_ADE7854 is not set
+# CONFIG_ADF4350 is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADIS16060 is not set
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16204 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADIS16220 is not set
+# CONFIG_ADIS16240 is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_ADT7316 is not set
+# CONFIG_ADXRS450 is not set
+CONFIG_AEABI=y
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AGP is not set
+CONFIG_AIO=y
+# CONFIG_AIRO is not set
+# CONFIG_AIRO_CS is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_AK8975 is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_ALX is not set
+# CONFIG_AM335X_PHY_USB is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_AMD_PHY is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_ANDROID is not set
+CONFIG_ANON_INODES=y
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_APM8018X is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AR5523 is not set
+# CONFIG_AR7 is not set
+# CONFIG_AR8216_PHY is not set
+# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_EXYNOS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=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_HIGHBANK 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_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_MULTIPLATFORM is not set
+# CONFIG_ARCH_MULTI_V6 is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_OMAP1 is not set
+# CONFIG_ARCH_OMAP2PLUS is not set
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PRIMA2 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_SUNXI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ARCH_TCC_926 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_WM8850 is not set
+# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ARC_EMAC is not set
+# CONFIG_ARM_APPENDED_DTB is not set
+# CONFIG_ARM_ARCH_TIMER is not set
+# CONFIG_ARM_AT91_ETHER is not set
+# CONFIG_ARM_CCI is not set
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+# CONFIG_ARM_ERRATA_326103 is not set
+# CONFIG_ARM_ERRATA_364296 is not set
+# CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_643719 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_ERRATA_773022 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
+# CONFIG_ARM_ERRATA_798181 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_ARM_PSCI is not set
+# CONFIG_ARM_UNWIND is not set
+# CONFIG_ARM_VIRT_EXT is not set
+CONFIG_ARPD=y
+# CONFIG_ARTHUR is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_ATA is not set
+# CONFIG_ATAGS is not set
+CONFIG_ATAGS_PROC=y
+# CONFIG_ATALK is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_ACPI is not set
+CONFIG_ATA_BMDMA=y
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_SFF=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_ATH10K is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_ATH6K_LEGACY is not set
+# CONFIG_ATH79 is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL2 is not set
+# CONFIG_ATM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_BR2684 is not set
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_ATM_CLIP is not set
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_MPOA is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
+# CONFIG_AUDIT is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTO_ZRELADDR is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AVERAGE is not set
+# CONFIG_AX25 is not set
+# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_B44 is not set
+# CONFIG_B53 is not set
+# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BCACHE is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
+# CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_BCMA is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BE2NET is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BGMAC is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_BIG_LITTLE is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BITREVERSE=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_CPQ_DA is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_NULL_BLK is not set
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SKD is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_BLOCK=y
+# CONFIG_BMA180 is not set
+# CONFIG_BMP085 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_BNA is not set
+# CONFIG_BNX2 is not set
+# CONFIG_BNX2X is not set
+# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_RAW=y
+# CONFIG_BPCTL is not set
+# CONFIG_BPF_JIT is not set
+# CONFIG_BPQETHER is not set
+CONFIG_BQL=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_EBT_802_3 is not set
+# CONFIG_BRIDGE_EBT_AMONG is not set
+# CONFIG_BRIDGE_EBT_ARP is not set
+# CONFIG_BRIDGE_EBT_ARPREPLY is not set
+# CONFIG_BRIDGE_EBT_BROUTE is not set
+# CONFIG_BRIDGE_EBT_DNAT is not set
+# CONFIG_BRIDGE_EBT_IP is not set
+# CONFIG_BRIDGE_EBT_IP6 is not set
+# CONFIG_BRIDGE_EBT_LIMIT is not set
+# CONFIG_BRIDGE_EBT_LOG is not set
+# CONFIG_BRIDGE_EBT_MARK is not set
+# CONFIG_BRIDGE_EBT_MARK_T is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_BRIDGE_EBT_PKTTYPE is not set
+# CONFIG_BRIDGE_EBT_REDIRECT is not set
+# CONFIG_BRIDGE_EBT_SNAT is not set
+# CONFIG_BRIDGE_EBT_STP is not set
+# CONFIG_BRIDGE_EBT_T_FILTER is not set
+# CONFIG_BRIDGE_EBT_T_NAT is not set
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_VLAN is not set
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BRIDGE_VLAN_FILTERING is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_BT is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_3WIRE is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_HIDP is not set
+CONFIG_BT_L2CAP=y
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_RFCOMM is not set
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_SCO=y
+CONFIG_BUG=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+# CONFIG_C2PORT is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_CARMA_FPGA is not set
+# CONFIG_CARMA_FPGA_PROGRAM is not set
+# CONFIG_CASSINI is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CAVIUM_OCTEON_SOC is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CED1401 is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+# CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
+# CONFIG_CIFS_DEBUG is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CIFS_NFSD_EXPORT is not set
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CLEANCACHE is not set
+CONFIG_CLS_U32_MARK=y
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CM36651 is not set
+# CONFIG_CMA is not set
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# CONFIG_CNIC is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_COMEDI is not set
+# CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_CONSTRUCTORS=y
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
+# CONFIG_CORDIC is not set
+# CONFIG_COREDUMP is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CPU_IDLE_GOV_MENU is not set
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRASHLOG=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC32_SARWATE=y
+# CONFIG_CRC32_SELFTEST is not set
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SLICEBY8 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_CRC8 is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CROSS_COMPILE=""
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_AEAD is not set
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_ARM is not set
+# CONFIG_CRYPTO_AES_ARM_BS is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_BLKCIPHER is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CMAC is not set
+# CONFIG_CRYPTO_CRC32 is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRCT10DIF is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
+# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
+# CONFIG_CRYPTO_DEV_SAHARA is not set
+# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_HASH is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA1_ARM is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_COMMON is not set
+# CONFIG_CRYPTO_USER is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_XZ is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CS5535_MFGPT is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_CUSE is not set
+# CONFIG_CW1200 is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_CYPRESS_FIRMWARE is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DCB is not set
+# CONFIG_DDR is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO_REDUCED=y
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_KOBJECT_RELEASE is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKDEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_ZBOOT is not set
+# CONFIG_DECNET is not set
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_DEVPORT=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DEVTMPFS is not set
+# CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DGAP is not set
+# CONFIG_DGNC is not set
+# CONFIG_DGRP is not set
+# CONFIG_DIRECT_IO is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
+# CONFIG_DISPLAY_CONNECTOR_DVI is not set
+# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
+# CONFIG_DISPLAY_ENCODER_TFP410 is not set
+# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
+# CONFIG_DISPLAY_PANEL_DPI is not set
+# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DL2K is not set
+# CONFIG_DLM is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMASCC is not set
+# CONFIG_DMATEST is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_ENGINE is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DM_CACHE is not set
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_SWITCH is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_VERITY is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DNET is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_DNS_RESOLVER is not set
+CONFIG_DOUBLEFAULT=y
+CONFIG_DQL=y
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
+# CONFIG_DTLK is not set
+# CONFIG_DUMMY is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E2100 is not set
+# CONFIG_EASYCAP is not set
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_EDAC is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_EFS_FS is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_ENIC is not set
+# CONFIG_EPAPR_PARAVIRT is not set
+# CONFIG_EPIC100 is not set
+CONFIG_EPOLL=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
+# CONFIG_ETH16I is not set
+CONFIG_ETHERNET=y
+# CONFIG_ETHOC is not set
+CONFIG_EVENTFD=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+# CONFIG_EWRK3 is not set
+CONFIG_EXPERIMENTAL=y
+CONFIG_EXPERT=y
+# CONFIG_EXPORTFS is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXTCON is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_EXYNOS_ADC is not set
+# CONFIG_EXYNOS_VIDEO is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_F2FS_FS is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FANOTIFY is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_FS is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FB is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_DA8XX is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMX is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_PS3 is not set
+# CONFIG_FB_PXA is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_FCOE is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_FDDI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_FHANDLE is not set
+CONFIG_FIB_RULES=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_FLATMEM=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FMC is not set
+# CONFIG_FORCEDETH is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_FSCACHE is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_FT1000 is not set
+# CONFIG_FTGMAC100 is not set
+# CONFIG_FTL is not set
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_FUSE_FS is not set
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+# CONFIG_FUSION_SPI is not set
+CONFIG_FUTEX=y
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_GACT_PROB=y
+# CONFIG_GADGET_UAC1 is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_GCOV is not set
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_IRQ_PROBE=y
+# CONFIG_GENERIC_PHY is not set
+CONFIG_GENERIC_TIME=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_BCM_KONA is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_ICH is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
+# CONFIG_GPIO_RDC321X is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_WDT is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HAMACHI is not set
+CONFIG_HAMRADIO=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_HAVE_ARM_ARCH_TIMER is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HCALL_STATS is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HDQ_MASTER_OMAP is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HERMES is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_HID is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GENERIC is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_HUION is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_LOGITECH_DJ is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_PS3REMOTE is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIPPI is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_CS is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
+CONFIG_HOTPLUG=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HP100 is not set
+CONFIG_HPET_MMAP_DEFAULT=y
+# CONFIG_HPFS_FS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_HSI is not set
+# CONFIG_HSR is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HW_PERF_EVENTS=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_OMAP3_ROM is not set
+# CONFIG_HW_RANDOM_PPC4XX is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_500 is not set
+# CONFIG_HZ_PERIODIC is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_AU1550 is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_CHARDEV is not set
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_HID is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_ISMT is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_MUX is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_OCTEON is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_RCAR is not set
+# CONFIG_I2C_SCMI is not set
+# CONFIG_I2C_SH_MOBILE is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2O is not set
+# CONFIG_I40E is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_ZMII is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_IDE is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_IFB is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IIO is not set
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_GPIO_TRIGGER is not set
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
+CONFIG_INET=y
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_TCP_DIAG is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFTL is not set
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_MATRIXKMAP is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MIC_CARD is not set
+# CONFIG_INTEL_MIC_HOST is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_INTEL_OAKTRAIL is not set
+# CONFIG_INTEL_RST is not set
+# CONFIG_INTEL_SMARTCONNECT is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_INV_MPU6050_IIO is not set
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
+# CONFIG_IP17XX_PHY is not set
+# CONFIG_IP6_NF_FILTER is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
+# CONFIG_IPACK_BUS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPV6 is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_ROUTE_INFO is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_SIT_6RD is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_VTI is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_PROMISCUOUS is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_IP_PNP is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_LIRC_CODEC is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_NEC_DECODER is not set
+# CONFIG_IR_RC5_DECODER is not set
+# CONFIG_IR_RC5_SZ_DECODER is not set
+# CONFIG_IR_RC6_DECODER is not set
+# CONFIG_IR_SONY_DECODER is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_ISCSI_TCP is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_ISS4xx is not set
+# CONFIG_ITG3200 is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWMC3200TOP is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD2_DEBUG is not set
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_FS_POSIX_ACL is not set
+# CONFIG_JFFS2_FS_SECURITY is not set
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_LZMA=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_ZLIB is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JME is not set
+CONFIG_JOLIET=y
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_UNCOMPRESSED is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_KERNEL_XZ=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SH_KEYSC is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_KGDB is not set
+# CONFIG_KMEMCHECK is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
+CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_GUEST is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_L2TP is not set
+# CONFIG_L2TP_ETH is not set
+# CONFIG_L2TP_IP is not set
+# CONFIG_L2TP_V3 is not set
+# CONFIG_LANMEDIA is not set
+# CONFIG_LANTIQ is not set
+# CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_LBDAF=y
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_ATMEL_PWM is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO_OF=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3556 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_NET5501 is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA9685 is not set
+# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_USBDEV is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_LIB80211_CRYPT_CCMP is not set
+# CONFIG_LIB80211_CRYPT_TKIP is not set
+# CONFIG_LIB80211_CRYPT_WEP is not set
+# CONFIG_LIB80211_DEBUG is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_LIRC_STAGING is not set
+# CONFIG_LIS3L02DQ is not set
+# CONFIG_LKDTM is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_LOCKD is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_LOCKD_V4=y
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_LOGFS is not set
+# CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIWHEELS_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_LOONGSON_MC146818 is not set
+# CONFIG_LP486E is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTPC is not set
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+# CONFIG_LZO_COMPRESS is not set
+# CONFIG_LZO_DECOMPRESS is not set
+# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MACB is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_LOONGSON1 is not set
+# CONFIG_MACH_NO_WESTBRIDGE is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+# CONFIG_MAILBOX is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCPM is not set
+# CONFIG_MD is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_CONTROLLER is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEDIA_USB_SUPPORT is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEMORY is not set
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MEN_A21_WDT is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_OMAP_USB_HOST is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MIGRATION is not set
+CONFIG_MII=y
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD3 is not set
+# CONFIG_MIPS_SIM is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_NETJET is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MKISS is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MMC is not set
+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AU1X is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_BLOCK_MINORS=8
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+CONFIG_MMU=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_STRIPPED=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_MSI_LAPTOP is not set
+CONFIG_MTD=y
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LATCH_ADDR is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_AMS_DELTA is not set
+# CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
+# CONFIG_MTD_NAND_ATMEL is not set
+# CONFIG_MTD_NAND_AU1550 is not set
+# CONFIG_MTD_NAND_AUTCPU12 is not set
+# CONFIG_MTD_NAND_BCH is not set
+# CONFIG_MTD_NAND_BCM_UMI is not set
+# CONFIG_MTD_NAND_BF5XX is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CM_X270 is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_MTD_NAND_DAVINCI is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_ECC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+# CONFIG_MTD_NAND_FSL_IFC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
+# CONFIG_MTD_NAND_FSMC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_GPMI_NAND is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_JZ4740 is not set
+# CONFIG_MTD_NAND_MPC5121_NFC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_NDFC is not set
+# CONFIG_MTD_NAND_NOMADIK is not set
+# CONFIG_MTD_NAND_NUC900 is not set
+# CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_ORION is not set
+# CONFIG_MTD_NAND_PASEMI is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_PPCHAMELEONEVB is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
+# CONFIG_MTD_NAND_RB4XX is not set
+# CONFIG_MTD_NAND_RB750 is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_RTC_FROM4 is not set
+# CONFIG_MTD_NAND_S3C2410 is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_SH_FLCTL is not set
+# CONFIG_MTD_NAND_SOCRATES is not set
+# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_NAND_TMIO is not set
+# CONFIG_MTD_NAND_TXX9NDFMC is not set
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_SPINAND_MT29F is not set
+CONFIG_MTD_SPLIT=y
+# CONFIG_MTD_SPLIT_FIRMWARE is not set
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+# CONFIG_MTD_SPLIT_LZMA_FW is not set
+# CONFIG_MTD_SPLIT_SEAMA_FW is not set
+# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
+# CONFIG_MTD_SPLIT_UIMAGE_FW is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MTD_UIMAGE_SPLIT is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_MVMDIO is not set
+# CONFIG_MVSWITCH_PHY is not set
+# CONFIG_MWAVE is not set
+# CONFIG_MWL8K is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NE2000 is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
+CONFIG_NET=y
+# CONFIG_NETCONSOLE is not set
+CONFIG_NETDEVICES=y
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+# CONFIG_NETFILTER_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETLINK_DIAG is not set
+# CONFIG_NETLINK_MMAP is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETROM is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_BPF is not set
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_U32 is not set
+CONFIG_NET_CORE=y
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_EMATCH_CMP is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_NBYTE is not set
+CONFIG_NET_EMATCH_STACK=32
+# CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_U32 is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_FC is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPVTI is not set
+# CONFIG_NET_IP_TUNNEL is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_NET_MPLS_GSO is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POCKET is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_ATM is not set
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_ESFQ is not set
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_NET_SCH_FQ is not set
+CONFIG_NET_SCH_FQ_CODEL=y
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_NET_TULIP is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_NEW_LEDS=y
+# CONFIG_NFC is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_DEPRECATED is not set
+# CONFIG_NFSD_V2_ACL is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFS_ACL_SUPPORT is not set
+CONFIG_NFS_COMMON=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V2 is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFTL is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+# CONFIG_NF_CONNTRACK_RTSP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_GRE is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_NAT is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_IPV4=m
+# CONFIG_NF_NAT_IPV6 is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_NEEDED is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
+# CONFIG_NF_NAT_RTSP is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_TABLES is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_NIU is not set
+CONFIG_NLATTR=y
+# CONFIG_NLMON is not set
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
+# CONFIG_NLS is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_NO_BOOTMEM is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_NTP_PPS is not set
+# CONFIG_NVRAM is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_N_GSM is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OBS600 is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
+# CONFIG_OMAP2_DSS_SDI is not set
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_OCP2SCP is not set
+# CONFIG_OMAP_USB2 is not set
+# CONFIG_OMAP_USB3 is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_ORION_WATCHDOG is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_OVERLAYFS_FS=y
+# CONFIG_P54_COMMON is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PANEL is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_1284 is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OCTEON_CF is not set
+# CONFIG_PATA_OF_PLATFORM is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PC300TOO is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCMCIA is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_XIRCOM is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PD6729 is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
+# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_PID_NS is not set
+CONFIG_PINCONF=y
+# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_EXYNOS is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINMUX=y
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_PLIP is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PM is not set
+# CONFIG_PMBUS is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWERCAP is not set
+# CONFIG_POWERTV is not set
+# CONFIG_POWER_AVS is not set
+# CONFIG_POWER_RESET is not set
+# CONFIG_POWER_RESET_RESTART is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PPC4xx_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPP is not set
+# CONFIG_PPPOATM is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_PARPORT is not set
+# CONFIG_PPS_DEBUG is not set
+# CONFIG_PPTP is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_PRINTK=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
+# CONFIG_PROC_DEVICETREE is not set
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_STRIPPED=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILING is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_PSB6970_PHY is not set
+# CONFIG_PSTORE is not set
+# CONFIG_PTP_1588_CLOCK is not set
+# CONFIG_PTP_1588_CLOCK_IXP46X is not set
+# CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_PWM is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_R3964 is not set
+# CONFIG_R6040 is not set
+# CONFIG_R8169 is not set
+# CONFIG_R8187SE is not set
+# CONFIG_R8188EU is not set
+# CONFIG_R8712U is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RALINK is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RANDOM32_SELFTEST is not set
+# CONFIG_RAPIDIO is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_RCU_NOCB_CPU is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_USER_QS is not set
+# CONFIG_RC_CORE is not set
+# CONFIG_RC_MAP is not set
+# CONFIG_RDS is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_LZ4 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_REDWOOD is not set
+# CONFIG_REGMAP is not set
+# CONFIG_REGMAP_I2C is not set
+# CONFIG_REGMAP_SPI is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_TI_ABB is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_RELAY is not set
+# CONFIG_RESET_CONTROLLER is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_ROSE is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_GENERIC is not set
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MOXART is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_OMAP is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_PS3 is not set
+# CONFIG_RTC_DRV_PT7C4338 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_SYSTOHC=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+# CONFIG_RTL8367B_PHY is not set
+# CONFIG_RTL8367_PHY is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL_CARDS is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_RTS_PSTOR is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_RUNTIME_DEBUG is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_S2IO is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_FSL is not set
+# CONFIG_SATA_HIGHBANK is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_RCAR is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_SBE_2T3E3 is not set
+# CONFIG_SBYPASS is not set
+# CONFIG_SC92031 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCC is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHED_MC is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SCHED_SMT is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_ESAS2R is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_ISCI is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_MOD=y
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SDIO_UART is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SEEQ8005 is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ACPI_POWER is not set
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_GSC is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HMC5843 is not set
+# CONFIG_SENSORS_HTU21 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95234 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_ACCENT is not set
+# CONFIG_SERIAL_8250_BOCA is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_DMA=y
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_FOURPORT is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_PCI is not set
+# CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_SYSRQ is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SH_SCI is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SFC is not set
+# CONFIG_SFI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SGI_PARTITION is not set
+CONFIG_SHMEM=y
+# CONFIG_SH_ETH is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIGMA is not set
+CONFIG_SIGNALFD=y
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC9194 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_SND is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_HWDEP is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_MIPS is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_MXS_SOC is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_OXYGEN is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_PCM is not set
+# CONFIG_SND_PCMCIA is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_POWERPC_SOC is not set
+# CONFIG_SND_PPC is not set
+# CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
+# CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_IMX_SPDIF is not set
+# CONFIG_SND_SOC_IMX_WM8962 is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TIMER is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_HIFACE is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_SOC_AM33XX is not set
+# CONFIG_SOC_AM43XX is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOC_DRA7XX is not set
+# CONFIG_SOC_HAS_OMAP2_SDRC is not set
+# CONFIG_SOC_OMAP5 is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_SOLO6X10 is not set
+# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_SOUND is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_SP5100_TCO is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_SPARSE_IRQ is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_SPEAKUP is not set
+# CONFIG_SPI is not set
+# CONFIG_SPINLOCK_TEST is not set
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_FSL_ESPI is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_OCTEON is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PPC4xx is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_RAMIPS is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TI_QSPI is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZLIB is not set
+# CONFIG_SRAM is not set
+# CONFIG_SSB is not set
+# CONFIG_SSBI is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSFDC is not set
+CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STACK_TRACER is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
+CONFIG_STANDALONE=y
+CONFIG_STDBINUTILS=y
+# CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_STMMAC_ETH is not set
+CONFIG_STP=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_SUSPEND is not set
+CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_LEDS is not set
+# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_SYSCTL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TC35815 is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_TEGRA_HOST1X is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEXTSEARCH=y
+# CONFIG_TEXTSEARCH_BM is not set
+# CONFIG_TEXTSEARCH_FSM is not set
+# CONFIG_TEXTSEARCH_KMP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_TIFM_CORE is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_TIMB_DMA is not set
+CONFIG_TIMERFD=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_TINY_RCU=y
+# CONFIG_TIPC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_AM335X_ADC is not set
+# CONFIG_TI_CPSW is not set
+# CONFIG_TI_CPTS is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_TI_DAVINCI_CPDMA is not set
+# CONFIG_TI_DAVINCI_MDIO is not set
+# CONFIG_TI_ST is not set
+# CONFIG_TLAN is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_TMP006 is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_SUR40 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TR is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_TRACE_SINK is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_TRAD_SIGNALS=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2x7x is not set
+# CONFIG_TSL4531 is not set
+CONFIG_TTY=y
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6030_GPADC is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_TYPHOON is not set
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UDF_NLS=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_UFS_FS is not set
+# CONFIG_UHID is not set
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
+# CONFIG_UIO is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_UNIX=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_ALI_M5632=y
+# CONFIG_USB_AMD5536UDC is not set
+CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATM is not set
+CONFIG_USB_BELKIN=y
+# CONFIG_USB_BTMTK is not set
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_CONFIGFS is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC_OTG_LPM is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_HCD_AT91 is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_USB_EZUSB=y
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_FUSBH200_HCD is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_JL2005BCD is not set
+# CONFIG_USB_GSPCA_KINECT is not set
+# CONFIG_USB_GSPCA_KONICA is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_NW80X is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SE401 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ930X is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STK1135 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TOPRO is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_VICAM is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_INPUT_IMS_PCU is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_NET_AX88179_178A is not set
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_SR9700 is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PCI is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PHY is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RCAR_PHY is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_RTL8152 is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_METRO is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SIMPLE is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_WISHBONE is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_XSENS_MT is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_ZTE is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_USE_OF is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VETH is not set
+# CONFIG_VEXPRESS_CONFIG is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VGA_ARB is not set
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OMAP2_VOUT is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_THS8200 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_UDA1342 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_USBTV is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_VITESSE_PHY is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_VMSPLIT_1G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMWARE_PVSCSI is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VORTEX is not set
+# CONFIG_VSOCKETS is not set
+# CONFIG_VT is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_VXGE is not set
+# CONFIG_VXLAN is not set
+# CONFIG_W1 is not set
+# CONFIG_W1_CON is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W35UND is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_WAN is not set
+# CONFIG_WANXL is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_WDTPCI is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WILINK_PLATFORM_DATA=y
+# CONFIG_WIMAX is not set
+# CONFIG_WIMAX_GDM72XX is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX is not set
+# CONFIG_WL18XX is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+CONFIG_WLAN=y
+# CONFIG_WLCORE is not set
+CONFIG_WL_TI=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_WR_PPMC is not set
+# CONFIG_X25 is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+# CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_X86_SYSFB=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_IPCOMP is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XILINX_AXI_EMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XILLYBUS is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_XMON is not set
+# CONFIG_XVMALLOC is not set
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_BCJ is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_YAM is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_YENTA is not set
+# CONFIG_YENTA_O2 is not set
+# CONFIG_YENTA_RICOH is not set
+# CONFIG_YENTA_TI is not set
+# CONFIG_YENTA_TOSHIBA is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_ZLIB_DEFLATE is not set
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZNET is not set
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZRAM is not set
+# CONFIG_ZSMALLOC is not set
diff --git a/trunk/target/linux/generic/config-3.14 b/trunk/target/linux/generic/config-3.14
new file mode 100644
index 00000000..9485ea1e
--- /dev/null
+++ b/trunk/target/linux/generic/config-3.14
@@ -0,0 +1,4324 @@
+CONFIG_32BIT=y
+# CONFIG_6PACK is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_AB8500_CORE is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_ACENIC is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_EXTLOG is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_INT3403_THERMAL is not set
+# CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
+# CONFIG_AD2S90 is not set
+# CONFIG_AD5064 is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686 is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD5930 is not set
+# CONFIG_AD5933 is not set
+# CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606 is not set
+# CONFIG_AD7746 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD799X is not set
+# CONFIG_AD8366 is not set
+# CONFIG_AD9523 is not set
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# CONFIG_AD9850 is not set
+# CONFIG_AD9852 is not set
+# CONFIG_AD9910 is not set
+# CONFIG_AD9951 is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADE7753 is not set
+# CONFIG_ADE7754 is not set
+# CONFIG_ADE7758 is not set
+# CONFIG_ADE7759 is not set
+# CONFIG_ADE7854 is not set
+# CONFIG_ADF4350 is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADIS16060 is not set
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16204 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADIS16220 is not set
+# CONFIG_ADIS16240 is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_ADT7316 is not set
+# CONFIG_ADXRS450 is not set
+CONFIG_AEABI=y
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AGP is not set
+CONFIG_AIO=y
+# CONFIG_AIRO is not set
+# CONFIG_AIRO_CS is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_AK8975 is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_ALX is not set
+# CONFIG_AM335X_PHY_USB is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_AMD_PHY is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_ANDROID is not set
+CONFIG_ANON_INODES=y
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_APM8018X is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AR5523 is not set
+# CONFIG_AR7 is not set
+# CONFIG_AR8216_PHY is not set
+# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_EXYNOS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=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_HI3xxx is not set
+# CONFIG_ARCH_HIGHBANK 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_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MSM_DT is not set
+# CONFIG_ARCH_MSM_NODT is not set
+# CONFIG_ARCH_MULTIPLATFORM is not set
+# CONFIG_ARCH_MULTI_V6 is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_OMAP1 is not set
+# CONFIG_ARCH_OMAP2PLUS is not set
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PRIMA2 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SHMOBILE_LEGACY is not set
+# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_SUNXI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ARCH_TCC_926 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_WM8850 is not set
+# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ARC_EMAC is not set
+# CONFIG_ARM_APPENDED_DTB is not set
+# CONFIG_ARM_ARCH_TIMER is not set
+# CONFIG_ARM_AT91_ETHER is not set
+# CONFIG_ARM_CCI is not set
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+# CONFIG_ARM_ERRATA_326103 is not set
+# CONFIG_ARM_ERRATA_364296 is not set
+# CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_643719 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_ERRATA_773022 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
+# CONFIG_ARM_ERRATA_798181 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_ARM_PSCI is not set
+# CONFIG_ARM_PTDUMP is not set
+# CONFIG_ARM_UNWIND is not set
+# CONFIG_ARM_VIRT_EXT is not set
+CONFIG_ARPD=y
+# CONFIG_ARTHUR is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_ATA is not set
+# CONFIG_ATAGS is not set
+CONFIG_ATAGS_PROC=y
+# CONFIG_ATALK is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_ACPI is not set
+CONFIG_ATA_BMDMA=y
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_SFF=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_ATH10K is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_ATH6K_LEGACY is not set
+# CONFIG_ATH79 is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL2 is not set
+# CONFIG_ATM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_BR2684 is not set
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_ATM_CLIP is not set
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_MPOA is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
+# CONFIG_AUDIT is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTO_ZRELADDR is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AVERAGE is not set
+# CONFIG_AX25 is not set
+# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_B44 is not set
+# CONFIG_B53 is not set
+# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BCACHE is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
+# CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_BCMA is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BE2NET is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BGMAC is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_BIG_LITTLE is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BITREVERSE=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_CPQ_DA is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_NULL_BLK is not set
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SKD is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_BLOCK=y
+# CONFIG_BMA180 is not set
+# CONFIG_BMP085 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_BNA is not set
+# CONFIG_BNX2 is not set
+# CONFIG_BNX2X is not set
+# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_RAW=y
+# CONFIG_BPCTL is not set
+# CONFIG_BPF_JIT is not set
+# CONFIG_BPQETHER is not set
+CONFIG_BQL=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMSMAC is not set
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_EBT_802_3 is not set
+# CONFIG_BRIDGE_EBT_AMONG is not set
+# CONFIG_BRIDGE_EBT_ARP is not set
+# CONFIG_BRIDGE_EBT_ARPREPLY is not set
+# CONFIG_BRIDGE_EBT_BROUTE is not set
+# CONFIG_BRIDGE_EBT_DNAT is not set
+# CONFIG_BRIDGE_EBT_IP is not set
+# CONFIG_BRIDGE_EBT_IP6 is not set
+# CONFIG_BRIDGE_EBT_LIMIT is not set
+# CONFIG_BRIDGE_EBT_LOG is not set
+# CONFIG_BRIDGE_EBT_MARK is not set
+# CONFIG_BRIDGE_EBT_MARK_T is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_BRIDGE_EBT_PKTTYPE is not set
+# CONFIG_BRIDGE_EBT_REDIRECT is not set
+# CONFIG_BRIDGE_EBT_SNAT is not set
+# CONFIG_BRIDGE_EBT_STP is not set
+# CONFIG_BRIDGE_EBT_T_FILTER is not set
+# CONFIG_BRIDGE_EBT_T_NAT is not set
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_VLAN is not set
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BRIDGE_VLAN_FILTERING is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_BT is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_3WIRE is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_HIDP is not set
+CONFIG_BT_L2CAP=y
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_RFCOMM is not set
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_SCO=y
+CONFIG_BUG=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+# CONFIG_C2PORT is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_CARMA_FPGA is not set
+# CONFIG_CARMA_FPGA_PROGRAM is not set
+# CONFIG_CASSINI is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CAVIUM_OCTEON_SOC is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR_NONE=y
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CED1401 is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CGROUP_NET_PRIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_CHARGER_TWL4030 is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+# CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
+# CONFIG_CIFS_DEBUG is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CIFS_NFSD_EXPORT is not set
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CLEANCACHE is not set
+CONFIG_CLS_U32_MARK=y
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CM32181 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_CMA is not set
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# CONFIG_CNIC is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_COMEDI is not set
+# CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_COMMON_CLK_QCOM is not set
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_CONSTRUCTORS=y
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
+# CONFIG_CORDIC is not set
+# CONFIG_COREDUMP is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CPU_IDLE_GOV_MENU is not set
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRASHLOG=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC32_SARWATE=y
+# CONFIG_CRC32_SELFTEST is not set
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SLICEBY8 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_CRC8 is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CROSS_COMPILE=""
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_AEAD is not set
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_ARM is not set
+# CONFIG_CRYPTO_AES_ARM_BS is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_BLKCIPHER is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CMAC is not set
+# CONFIG_CRYPTO_CRC32 is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRCT10DIF is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
+# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
+# CONFIG_CRYPTO_DEV_CCP is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
+# CONFIG_CRYPTO_DEV_SAHARA is not set
+# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_HASH is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA1_ARM is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_COMMON is not set
+# CONFIG_CRYPTO_USER is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_XZ is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CS5535_MFGPT is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_CUSE is not set
+# CONFIG_CW1200 is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_CYPRESS_FIRMWARE is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DCB is not set
+# CONFIG_DDR is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO_REDUCED=y
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_KOBJECT_RELEASE is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKDEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_ZBOOT is not set
+# CONFIG_DECNET is not set
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_DEVPORT=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DEVTMPFS is not set
+# CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DGAP is not set
+# CONFIG_DGNC is not set
+# CONFIG_DGRP is not set
+# CONFIG_DHT11 is not set
+# CONFIG_DIRECT_IO is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
+# CONFIG_DISPLAY_CONNECTOR_DVI is not set
+# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
+# CONFIG_DISPLAY_ENCODER_TFP410 is not set
+# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
+# CONFIG_DISPLAY_PANEL_DPI is not set
+# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DL2K is not set
+# CONFIG_DLM is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMASCC is not set
+# CONFIG_DMATEST is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_ENGINE is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DM_CACHE is not set
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_SWITCH is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_VERITY is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DNET is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_DNS_RESOLVER is not set
+CONFIG_DOUBLEFAULT=y
+CONFIG_DQL=y
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
+# CONFIG_DTLK is not set
+# CONFIG_DUMMY is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E2100 is not set
+# CONFIG_EARLY_PRINTK_8250 is not set
+# CONFIG_EASYCAP is not set
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_EDAC is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_EFS_FS is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_ENIC is not set
+# CONFIG_EPAPR_PARAVIRT is not set
+# CONFIG_EPIC100 is not set
+CONFIG_EPOLL=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
+# CONFIG_GATEWORKS_GW16083 is not set
+# CONFIG_ETH16I is not set
+CONFIG_ETHERNET=y
+# CONFIG_ETHOC is not set
+CONFIG_EVENTFD=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+# CONFIG_EWRK3 is not set
+CONFIG_EXPERIMENTAL=y
+CONFIG_EXPERT=y
+# CONFIG_EXPORTFS is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXTCON is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_EXYNOS_ADC is not set
+# CONFIG_EXYNOS_VIDEO is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_F2FS_FS is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FANOTIFY is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_FS is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FB is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_DA8XX is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMX is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_PS3 is not set
+# CONFIG_FB_PXA is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_FCOE is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_FDDI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_FHANDLE is not set
+CONFIG_FIB_RULES=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_FLATMEM=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FMC is not set
+# CONFIG_FORCEDETH is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_FSCACHE is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_FT1000 is not set
+# CONFIG_FTGMAC100 is not set
+# CONFIG_FTL is not set
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_FUSE_FS is not set
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+# CONFIG_FUSION_SPI is not set
+CONFIG_FUTEX=y
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_GACT_PROB=y
+# CONFIG_GADGET_UAC1 is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_GCOV is not set
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_NET_UTILS=y
+# CONFIG_GENERIC_PHY is not set
+CONFIG_GENERIC_TIME=y
+# CONFIG_GENWQE is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_BCM_KONA is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_ICH is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
+# CONFIG_GPIO_RDC321X is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SCH311X is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_GPIO_WDT is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HAMACHI is not set
+CONFIG_HAMRADIO=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_HAVE_ARM_ARCH_TIMER is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HCALL_STATS is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HDQ_MASTER_OMAP is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HERMES is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_HID is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GENERIC is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_HUION is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_LOGITECH_DJ is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_PS3REMOTE is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIPPI is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_CS is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
+CONFIG_HOTPLUG=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HP100 is not set
+CONFIG_HPET_MMAP_DEFAULT=y
+# CONFIG_HPFS_FS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_HP_WIRELESS is not set
+# CONFIG_HSI is not set
+# CONFIG_HSR is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HW_PERF_EVENTS=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_OMAP3_ROM is not set
+# CONFIG_HW_RANDOM_PPC4XX is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_500 is not set
+# CONFIG_HZ_PERIODIC is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_AU1550 is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_CHARDEV is not set
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_HID is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_ISMT is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_MUX is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_OCTEON is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_RCAR is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
+# CONFIG_I2C_SCMI is not set
+# CONFIG_I2C_SH_MOBILE is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2O is not set
+# CONFIG_I40E is not set
+# CONFIG_I40EVF is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_ZMII is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_IDE is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_IFB is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IIO is not set
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_GPIO_TRIGGER is not set
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
+CONFIG_INET=y
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_TCP_DIAG is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFTL is not set
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_MATRIXKMAP is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MIC_CARD is not set
+# CONFIG_INTEL_MIC_HOST is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_INTEL_OAKTRAIL is not set
+# CONFIG_INTEL_RST is not set
+# CONFIG_INTEL_SMARTCONNECT is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_INV_MPU6050_IIO is not set
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
+# CONFIG_IP17XX_PHY is not set
+# CONFIG_IP6_NF_FILTER is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
+# CONFIG_IPACK_BUS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPV6 is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_ROUTE_INFO is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_SIT_6RD is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_VTI is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_PROMISCUOUS is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_IP_PNP is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_IR_GPIO_CIR is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_LIRC_CODEC is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_NEC_DECODER is not set
+# CONFIG_IR_RC5_DECODER is not set
+# CONFIG_IR_RC5_SZ_DECODER is not set
+# CONFIG_IR_RC6_DECODER is not set
+# CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_SONY_DECODER is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_TTUSBIR is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_ISCSI_TCP is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_ISS4xx is not set
+# CONFIG_ITG3200 is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWMC3200TOP is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD2_DEBUG is not set
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_FS_POSIX_ACL is not set
+# CONFIG_JFFS2_FS_SECURITY is not set
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_LZMA=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_ZLIB is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JME is not set
+CONFIG_JOLIET=y
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_UNCOMPRESSED is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_KERNEL_XZ=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SH_KEYSC is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_KGDB is not set
+# CONFIG_KMEMCHECK is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
+CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_GUEST is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_L2TP is not set
+# CONFIG_L2TP_ETH is not set
+# CONFIG_L2TP_IP is not set
+# CONFIG_L2TP_V3 is not set
+# CONFIG_LANMEDIA is not set
+# CONFIG_LANTIQ is not set
+# CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_LBDAF=y
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_ATMEL_PWM is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO_OF=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3556 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_NET5501 is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA9685 is not set
+# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_USBDEV is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_LIB80211_CRYPT_CCMP is not set
+# CONFIG_LIB80211_CRYPT_TKIP is not set
+# CONFIG_LIB80211_CRYPT_WEP is not set
+# CONFIG_LIB80211_DEBUG is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_LIRC_STAGING is not set
+# CONFIG_LIS3L02DQ is not set
+# CONFIG_LKDTM is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_LOCKD is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_LOCKD_V4=y
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_LOGFS is not set
+# CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIWHEELS_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_LOONGSON_MC146818 is not set
+# CONFIG_LP486E is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTPC is not set
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+# CONFIG_LZO_COMPRESS is not set
+# CONFIG_LZO_DECOMPRESS is not set
+# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MACB is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_LOONGSON1 is not set
+# CONFIG_MACH_NO_WESTBRIDGE is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+# CONFIG_MAILBOX is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCPM is not set
+# CONFIG_MD is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_CONTROLLER is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEDIA_USB_SUPPORT is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEMORY is not set
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MEN_A21_WDT is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_OMAP_USB_HOST is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MIGRATION is not set
+CONFIG_MII=y
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD3 is not set
+# CONFIG_MIPS_SIM is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_NETJET is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MKISS is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX5_CORE is not set
+# CONFIG_MMC is not set
+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AU1X is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_BLOCK_MINORS=8
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+# CONFIG_MMC_SDHCI_BCM_KONA is not set
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+CONFIG_MMU=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_STRIPPED=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_MSI_LAPTOP is not set
+CONFIG_MTD=y
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LATCH_ADDR is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_AMS_DELTA is not set
+# CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
+# CONFIG_MTD_NAND_ATMEL is not set
+# CONFIG_MTD_NAND_AU1550 is not set
+# CONFIG_MTD_NAND_AUTCPU12 is not set
+# CONFIG_MTD_NAND_BCH is not set
+# CONFIG_MTD_NAND_BCM_UMI is not set
+# CONFIG_MTD_NAND_BF5XX is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CM_X270 is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_MTD_NAND_DAVINCI is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_ECC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+# CONFIG_MTD_NAND_FSL_IFC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
+# CONFIG_MTD_NAND_FSMC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_GPMI_NAND is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_JZ4740 is not set
+# CONFIG_MTD_NAND_MPC5121_NFC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_NDFC is not set
+# CONFIG_MTD_NAND_NOMADIK is not set
+# CONFIG_MTD_NAND_NUC900 is not set
+# CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_ORION is not set
+# CONFIG_MTD_NAND_PASEMI is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_PPCHAMELEONEVB is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
+# CONFIG_MTD_NAND_RB4XX is not set
+# CONFIG_MTD_NAND_RB750 is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_RTC_FROM4 is not set
+# CONFIG_MTD_NAND_S3C2410 is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_SH_FLCTL is not set
+# CONFIG_MTD_NAND_SOCRATES is not set
+# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_NAND_TMIO is not set
+# CONFIG_MTD_NAND_TXX9NDFMC is not set
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_SPINAND_MT29F is not set
+CONFIG_MTD_SPLIT=y
+# CONFIG_MTD_SPLIT_FIRMWARE is not set
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+# CONFIG_MTD_SPLIT_LZMA_FW is not set
+# CONFIG_MTD_SPLIT_SEAMA_FW is not set
+CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
+# CONFIG_MTD_SPLIT_UIMAGE_FW is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MTD_UIMAGE_SPLIT is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_MVMDIO is not set
+# CONFIG_MVSW6171_PHY is not set
+# CONFIG_MVSWITCH_PHY is not set
+# CONFIG_MWAVE is not set
+# CONFIG_MWL8K is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NE2000 is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
+CONFIG_NET=y
+# CONFIG_NETCONSOLE is not set
+CONFIG_NETDEVICES=y
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+# CONFIG_NETFILTER_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETLINK_DIAG is not set
+# CONFIG_NETLINK_MMAP is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETROM is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_BPF is not set
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_U32 is not set
+CONFIG_NET_CORE=y
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_EMATCH_CMP is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_NBYTE is not set
+CONFIG_NET_EMATCH_STACK=32
+# CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_U32 is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_FC is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPVTI is not set
+# CONFIG_NET_IP_TUNNEL is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_NET_MPLS_GSO is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POCKET is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_NET_RX_BUSY_POLL=y
+# CONFIG_NET_SB1000 is not set
+CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_ATM is not set
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_ESFQ is not set
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_NET_SCH_FQ is not set
+CONFIG_NET_SCH_FQ_CODEL=y
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_HHF is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_PIE is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_NET_TULIP is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_NEW_LEDS=y
+# CONFIG_NFC is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_DEPRECATED is not set
+# CONFIG_NFSD_V2_ACL is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFS_ACL_SUPPORT is not set
+CONFIG_NFS_COMMON=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V2 is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFTL is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+# CONFIG_NF_CONNTRACK_RTSP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_GRE is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_NAT is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_IPV4=m
+# CONFIG_NF_NAT_IPV6 is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_NEEDED is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
+# CONFIG_NF_NAT_RTSP is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_TABLES is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_NIU is not set
+CONFIG_NLATTR=y
+# CONFIG_NLMON is not set
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
+# CONFIG_NLS is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_NO_BOOTMEM is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_NTP_PPS is not set
+# CONFIG_NVRAM is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_N_GSM is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OBS600 is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
+# CONFIG_OMAP2_DSS_SDI is not set
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_OCP2SCP is not set
+# CONFIG_OMAP_USB2 is not set
+# CONFIG_OMAP_USB3 is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_ORION_WATCHDOG is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_OVERLAYFS_FS=y
+# CONFIG_P54_COMMON is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PANEL is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_1284 is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OCTEON_CF is not set
+# CONFIG_PATA_OF_PLATFORM is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PC300TOO is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCMCIA is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_XIRCOM is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PD6729 is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
+# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_PID_NS is not set
+CONFIG_PINCONF=y
+# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_CAPRI is not set
+# CONFIG_PINCTRL_EXYNOS is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINMUX=y
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_PLIP is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PM is not set
+# CONFIG_PMBUS is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWERCAP is not set
+# CONFIG_POWERTV is not set
+# CONFIG_POWER_AVS is not set
+# CONFIG_POWER_RESET is not set
+# CONFIG_POWER_RESET_RESTART is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PPC4xx_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPP is not set
+# CONFIG_PPPOATM is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_PARPORT is not set
+# CONFIG_PPS_DEBUG is not set
+# CONFIG_PPTP is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_PRINTK=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
+# CONFIG_PROC_DEVICETREE is not set
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_STRIPPED=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILING is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_PSB6970_PHY is not set
+# CONFIG_PSTORE is not set
+# CONFIG_PTP_1588_CLOCK is not set
+# CONFIG_PTP_1588_CLOCK_IXP46X is not set
+# CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_PWM is not set
+# CONFIG_PWM_PCA9685 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_R3964 is not set
+# CONFIG_R6040 is not set
+# CONFIG_R8169 is not set
+# CONFIG_R8187SE is not set
+# CONFIG_R8188EU is not set
+# CONFIG_R8712U is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RALINK is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RANDOM32_SELFTEST is not set
+# CONFIG_RAPIDIO is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_RCU_NOCB_CPU is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_USER_QS is not set
+# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_RC_CORE is not set
+# CONFIG_RC_DECODERS is not set
+# CONFIG_RC_LOOPBACK is not set
+# CONFIG_RC_MAP is not set
+# CONFIG_RDS is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_LZ4 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_REDWOOD is not set
+# CONFIG_REGMAP is not set
+# CONFIG_REGMAP_I2C is not set
+# CONFIG_REGMAP_SPI is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_TI_ABB is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_RELAY is not set
+# CONFIG_RESET_CONTROLLER is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_ROSE is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_GENERIC is not set
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12057 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MOXART is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_OMAP is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_PS3 is not set
+# CONFIG_RTC_DRV_PT7C4338 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_SYSTOHC=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+# CONFIG_RTL8367B_PHY is not set
+# CONFIG_RTL8367_PHY is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL_CARDS is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_RTS5208 is not set
+# CONFIG_RTS_PSTOR is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_RUNTIME_DEBUG is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_S2IO is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_FSL is not set
+# CONFIG_SATA_HIGHBANK is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_RCAR is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_SBE_2T3E3 is not set
+# CONFIG_SBYPASS is not set
+# CONFIG_SC92031 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCC is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHED_MC is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SCHED_SMT is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_ESAS2R is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_ISCI is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_MOD=y
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SDIO_UART is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SEEQ8005 is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ACPI_POWER is not set
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_GSC is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HMC5843 is not set
+# CONFIG_SENSORS_HTU21 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95234 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_SENSORS_VEXPRESS is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_ACCENT is not set
+# CONFIG_SERIAL_8250_BOCA is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_DMA=y
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_FOURPORT is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_PCI is not set
+# CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_SYSRQ is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SH_SCI is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SFC is not set
+# CONFIG_SFI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SGI_PARTITION is not set
+CONFIG_SHMEM=y
+# CONFIG_SH_ETH is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIGMA is not set
+CONFIG_SIGNALFD=y
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC9194 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_SND is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_HWDEP is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_MIPS is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_MXS_SOC is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_OXYGEN is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_PCM is not set
+# CONFIG_SND_PCMCIA is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_POWERPC_SOC is not set
+# CONFIG_SND_PPC is not set
+# CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
+# CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_IMX_SPDIF is not set
+# CONFIG_SND_SOC_IMX_WM8962 is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TIMER is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_HIFACE is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_SOC_AM33XX is not set
+# CONFIG_SOC_AM43XX is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOC_DRA7XX is not set
+# CONFIG_SOC_HAS_OMAP2_SDRC is not set
+# CONFIG_SOC_OMAP5 is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_SOLO6X10 is not set
+# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_SOUND is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_SP5100_TCO is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_SPARSE_IRQ is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_SPEAKUP is not set
+# CONFIG_SPI is not set
+# CONFIG_SPINLOCK_TEST is not set
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_FSL_ESPI is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_OCTEON is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PPC4xx is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_RAMIPS is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TI_QSPI is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZLIB is not set
+# CONFIG_SRAM is not set
+# CONFIG_SSB is not set
+# CONFIG_SSBI is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSFDC is not set
+CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STACK_TRACER is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
+CONFIG_STANDALONE=y
+CONFIG_STDBINUTILS=y
+# CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_STMMAC_ETH is not set
+CONFIG_STP=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_SUSPEND is not set
+CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_LEDS is not set
+# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_SYSCTL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TC35815 is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_TEGRA_HOST1X is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_MODULE is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_USER_COPY is not set
+CONFIG_TEXTSEARCH=y
+# CONFIG_TEXTSEARCH_BM is not set
+# CONFIG_TEXTSEARCH_FSM is not set
+# CONFIG_TEXTSEARCH_KMP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_TIFM_CORE is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_TIMB_DMA is not set
+CONFIG_TIMERFD=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_TINY_RCU=y
+# CONFIG_TIPC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_AM335X_ADC is not set
+# CONFIG_TI_CPSW is not set
+# CONFIG_TI_CPTS is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_TI_DAVINCI_CPDMA is not set
+# CONFIG_TI_DAVINCI_MDIO is not set
+# CONFIG_TI_ST is not set
+# CONFIG_TLAN is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_TMP006 is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_SUR40 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TR is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_TRACE_SINK is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_TRAD_SIGNALS=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2x7x is not set
+# CONFIG_TSL4531 is not set
+CONFIG_TTY=y
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6030_GPADC is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_TYPHOON is not set
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UDF_NLS=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_UFS_FS is not set
+# CONFIG_UHID is not set
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
+# CONFIG_UIO is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_UNIX=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_ALI_M5632=y
+# CONFIG_USB_AMD5536UDC is not set
+CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATM is not set
+CONFIG_USB_BELKIN=y
+# CONFIG_USB_BTMTK is not set
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_CONFIGFS is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC_OTG_LPM is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_HCD_AT91 is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_USB_EZUSB=y
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_FUSBH200_HCD is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_JL2005BCD is not set
+# CONFIG_USB_GSPCA_KINECT is not set
+# CONFIG_USB_GSPCA_KONICA is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_NW80X is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SE401 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ930X is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STK1135 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TOPRO is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_VICAM is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_INPUT_IMS_PCU is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_NET_AX88179_178A is not set
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_SR9700 is not set
+# CONFIG_USB_NET_SR9800 is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PCI is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PHY is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RCAR_PHY is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_RTL8152 is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_USB_S3C_HSOTG is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_METRO is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_MXUPORT is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SIMPLE is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_WISHBONE is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_XSENS_MT is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_ZTE is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_USE_OF is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VETH is not set
+# CONFIG_VEXPRESS_CONFIG is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VGA_ARB is not set
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OMAP2_VOUT is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA6752HS is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_THS8200 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_UDA1342 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_USBTV is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_VITESSE_PHY is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_VMSPLIT_1G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMWARE_PVSCSI is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VORTEX is not set
+# CONFIG_VSOCKETS is not set
+# CONFIG_VT is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_VXGE is not set
+# CONFIG_VXLAN is not set
+# CONFIG_W1 is not set
+# CONFIG_W1_CON is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W35UND is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_WAN is not set
+# CONFIG_WANXL is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_WDTPCI is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WILINK_PLATFORM_DATA=y
+# CONFIG_WIMAX is not set
+# CONFIG_WIMAX_GDM72XX is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX is not set
+# CONFIG_WL18XX is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+CONFIG_WLAN=y
+# CONFIG_WLCORE is not set
+CONFIG_WL_TI=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_WR_PPMC is not set
+# CONFIG_X25 is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+# CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_X86_SYSFB=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_IPCOMP is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XILINX_AXI_EMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XILLYBUS is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_XMON is not set
+# CONFIG_XVMALLOC is not set
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_BCJ is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_YAM is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_YENTA is not set
+# CONFIG_YENTA_O2 is not set
+# CONFIG_YENTA_RICOH is not set
+# CONFIG_YENTA_TI is not set
+# CONFIG_YENTA_TOSHIBA is not set
+# CONFIG_ZBUD is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_ZLIB_DEFLATE is not set
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZNET is not set
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZRAM is not set
+# CONFIG_ZSMALLOC is not set
diff --git a/trunk/target/linux/generic/config-3.18 b/trunk/target/linux/generic/config-3.18
new file mode 100644
index 00000000..e0e2a0b5
--- /dev/null
+++ b/trunk/target/linux/generic/config-3.18
@@ -0,0 +1,4500 @@
+CONFIG_32BIT=y
+# CONFIG_6LOWPAN is not set
+# CONFIG_6PACK is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_AB8500_CORE is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_ACENIC is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_EXTLOG is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_INT3403_THERMAL is not set
+# CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
+# CONFIG_AD2S90 is not set
+# CONFIG_AD5064 is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686 is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD5930 is not set
+# CONFIG_AD5933 is not set
+# CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606 is not set
+# CONFIG_AD7746 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD799X is not set
+# CONFIG_AD8366 is not set
+# CONFIG_AD9523 is not set
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# CONFIG_AD9850 is not set
+# CONFIG_AD9852 is not set
+# CONFIG_AD9910 is not set
+# CONFIG_AD9951 is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADE7753 is not set
+# CONFIG_ADE7754 is not set
+# CONFIG_ADE7758 is not set
+# CONFIG_ADE7759 is not set
+# CONFIG_ADE7854 is not set
+# CONFIG_ADF4350 is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADIS16060 is not set
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16204 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADIS16220 is not set
+# CONFIG_ADIS16240 is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_ADT7316 is not set
+# CONFIG_ADVISE_SYSCALLS is not set
+# CONFIG_ADXRS450 is not set
+CONFIG_AEABI=y
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AGP is not set
+# CONFIG_AHCI_MVEBU is not set
+CONFIG_AIO=y
+# CONFIG_AIRO is not set
+# CONFIG_AIRO_CS is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_AK09911 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+# CONFIG_ALIM7101_WDT is not set
+CONFIG_ALLOW_DEV_COREDUMP=y
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_ALTERA_TSE is not set
+# CONFIG_ALX is not set
+# CONFIG_AM335X_PHY_USB is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_AMD_XGBE is not set
+# CONFIG_AMD_XGBE_PHY is not set
+# CONFIG_AMD_PHY is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_ANDROID is not set
+CONFIG_ANON_INODES=y
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_APM8018X is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AR5523 is not set
+# CONFIG_AR7 is not set
+# CONFIG_AR8216_PHY is not set
+# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_EXYNOS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=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_HI3xxx is not set
+# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_HISI 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_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_MSM_DT is not set
+# CONFIG_ARCH_MSM_NODT is not set
+# CONFIG_ARCH_MULTIPLATFORM is not set
+# CONFIG_ARCH_MULTI_V6 is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_OMAP1 is not set
+# CONFIG_ARCH_OMAP2PLUS is not set
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PRIMA2 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SHMOBILE_LEGACY is not set
+# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_SUNXI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ARCH_TCC_926 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_WM8850 is not set
+# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ARC_EMAC is not set
+# CONFIG_ARM_APPENDED_DTB is not set
+# CONFIG_ARM_ARCH_TIMER is not set
+# CONFIG_ARM_AT91_ETHER is not set
+# CONFIG_ARM_CCI is not set
+# CONFIG_ARM_CCN is not set
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+# CONFIG_ARM_ERRATA_326103 is not set
+# CONFIG_ARM_ERRATA_364296 is not set
+# CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_643719 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_ERRATA_773022 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
+# CONFIG_ARM_ERRATA_798181 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_ARM_PSCI is not set
+# CONFIG_ARM_PTDUMP is not set
+# CONFIG_ARM_UNWIND is not set
+# CONFIG_ARM_VIRT_EXT is not set
+CONFIG_ARPD=y
+# CONFIG_ARTHUR is not set
+# CONFIG_AS3935 is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_ATA is not set
+# CONFIG_ATAGS is not set
+CONFIG_ATAGS_PROC=y
+# CONFIG_ATALK is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_ACPI is not set
+CONFIG_ATA_BMDMA=y
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_SFF=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_ATH10K is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_ATH6K_LEGACY is not set
+# CONFIG_ATH79 is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL2 is not set
+# CONFIG_ATM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_ATMEL_PIT is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_BR2684 is not set
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_ATM_CLIP is not set
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_MPOA is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
+# CONFIG_AUDIT is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTO_ZRELADDR is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AVERAGE is not set
+# CONFIG_AX25 is not set
+# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_B44 is not set
+# CONFIG_B53 is not set
+# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BCACHE is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
+# CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCM7XXX_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_BCMA is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCMGENET is not set
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BE2NET is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BGMAC is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_BIG_LITTLE is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BITREVERSE=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_CPQ_DA is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_NULL_BLK is not set
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SKD is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_BLOCK=y
+# CONFIG_BMA180 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_BMG160 is not set
+# CONFIG_BMP085 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_BNA is not set
+# CONFIG_BNX2 is not set
+# CONFIG_BNX2X is not set
+# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_RAW=y
+# CONFIG_BPCTL is not set
+CONFIG_BPF=y
+# CONFIG_BPF_JIT is not set
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPQETHER is not set
+CONFIG_BQL=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMSMAC is not set
+# CONFIG_BRCMSTB_GISB_ARB is not set
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_EBT_802_3 is not set
+# CONFIG_BRIDGE_EBT_AMONG is not set
+# CONFIG_BRIDGE_EBT_ARP is not set
+# CONFIG_BRIDGE_EBT_ARPREPLY is not set
+# CONFIG_BRIDGE_EBT_BROUTE is not set
+# CONFIG_BRIDGE_EBT_DNAT is not set
+# CONFIG_BRIDGE_EBT_IP is not set
+# CONFIG_BRIDGE_EBT_IP6 is not set
+# CONFIG_BRIDGE_EBT_LIMIT is not set
+# CONFIG_BRIDGE_EBT_LOG is not set
+# CONFIG_BRIDGE_EBT_MARK is not set
+# CONFIG_BRIDGE_EBT_MARK_T is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_BRIDGE_EBT_PKTTYPE is not set
+# CONFIG_BRIDGE_EBT_REDIRECT is not set
+# CONFIG_BRIDGE_EBT_SNAT is not set
+# CONFIG_BRIDGE_EBT_STP is not set
+# CONFIG_BRIDGE_EBT_T_FILTER is not set
+# CONFIG_BRIDGE_EBT_T_NAT is not set
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_VLAN is not set
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BRIDGE_VLAN_FILTERING is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_BT is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_3WIRE is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_HIDP is not set
+CONFIG_BT_L2CAP=y
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BUILD_BIN2C is not set
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_SCO=y
+CONFIG_BUG=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+# CONFIG_C2PORT is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+# CONFIG_CAN_GS_USB is not set
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_RCAR is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_CARMA_FPGA is not set
+# CONFIG_CARMA_FPGA_PROGRAM is not set
+# CONFIG_CASSINI is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CAVIUM_OCTEON_SOC is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR_NONE=y
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CED1401 is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CGROUP_NET_PRIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_CHARGER_TWL4030 is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+# CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
+# CONFIG_CIFS_DEBUG is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CIFS_NFSD_EXPORT is not set
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CLEANCACHE is not set
+# CONFIG_CLKSRC_VERSATILE is not set
+CONFIG_CLS_U32_MARK=y
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CM32181 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_CMA is not set
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# CONFIG_CNIC is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_COMEDI is not set
+# CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_COMMON_CLK_QCOM is not set
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_CONSTRUCTORS=y
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
+# CONFIG_CORDIC is not set
+# CONFIG_COREDUMP is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CPU_IDLE_GOV_MENU is not set
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRASHLOG=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC32_SARWATE=y
+# CONFIG_CRC32_SELFTEST is not set
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SLICEBY8 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_CRC8 is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CROSS_COMPILE=""
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_AEAD is not set
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_ARM is not set
+# CONFIG_CRYPTO_AES_ARM_BS is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_BLKCIPHER is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CMAC is not set
+# CONFIG_CRYPTO_CRC32 is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRCT10DIF is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_AES is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA is not set
+# CONFIG_CRYPTO_DEV_ATMEL_TDES is not set
+# CONFIG_CRYPTO_DEV_CCP is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
+# CONFIG_CRYPTO_DEV_SAHARA is not set
+# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_DRBG_MENU is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_HASH is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MCRYPTD is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA1_ARM is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_COMMON is not set
+# CONFIG_CRYPTO_USER is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_XZ is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CS5535_MFGPT is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_CUSE is not set
+# CONFIG_CW1200 is not set
+# CONFIG_CXL_BASE is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_CYPRESS_FIRMWARE is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DCB is not set
+# CONFIG_DDR is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_REDUCED=y
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_KOBJECT_RELEASE is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKDEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_ZBOOT is not set
+# CONFIG_DECNET is not set
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_DEVPORT=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DEVTMPFS is not set
+# CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DGAP is not set
+# CONFIG_DGNC is not set
+# CONFIG_DGRP is not set
+# CONFIG_DHT11 is not set
+# CONFIG_DIRECT_IO is not set
+CONFIG_DISABLE_DEV_COREDUMP=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
+# CONFIG_DISPLAY_CONNECTOR_DVI is not set
+# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
+# CONFIG_DISPLAY_ENCODER_TFP410 is not set
+# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
+# CONFIG_DISPLAY_PANEL_DPI is not set
+# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DL2K is not set
+# CONFIG_DLM is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMASCC is not set
+# CONFIG_DMATEST is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_ENGINE is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DM_CACHE is not set
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_ERA is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_SWITCH is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_VERITY is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DNET is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_DNS_RESOLVER is not set
+CONFIG_DOUBLEFAULT=y
+CONFIG_DQL=y
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
+# CONFIG_DTLK is not set
+# CONFIG_DUMMY is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E2100 is not set
+# CONFIG_EARLY_PRINTK_8250 is not set
+# CONFIG_EASYCAP is not set
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_EDAC is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_EFS_FS is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_EM_TIMER_STI is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_ENIC is not set
+# CONFIG_EPAPR_PARAVIRT is not set
+# CONFIG_EPIC100 is not set
+CONFIG_EPOLL=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
+# CONFIG_GATEWORKS_GW16083 is not set
+# CONFIG_GLOB_SELFTEST is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_ETH16I is not set
+CONFIG_ETHERNET=y
+# CONFIG_ETHOC is not set
+CONFIG_EVENTFD=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+# CONFIG_EWRK3 is not set
+CONFIG_EXPERIMENTAL=y
+CONFIG_EXPERT=y
+# CONFIG_EXPORTFS is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXTCON is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_EXYNOS_ADC is not set
+# CONFIG_EXYNOS_VIDEO is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_F2FS_FS is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FANOTIFY is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_FS is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FB is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_DA8XX is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMX is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_PS3 is not set
+# CONFIG_FB_PXA is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_FCOE is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_FDDI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_FENCE_TRACE is not set
+# CONFIG_FHANDLE is not set
+CONFIG_FIB_RULES=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_FLATMEM=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FM10K is not set
+# CONFIG_FMC is not set
+# CONFIG_FORCEDETH is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_FSCACHE is not set
+# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_FT1000 is not set
+# CONFIG_FTGMAC100 is not set
+# CONFIG_FTL is not set
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_FUSE_FS is not set
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+# CONFIG_FUSION_SPI is not set
+CONFIG_FUTEX=y
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_GACT_PROB=y
+# CONFIG_GADGET_UAC1 is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_GCOV is not set
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_GENEVE is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_NET_UTILS=y
+# CONFIG_GENERIC_PHY is not set
+CONFIG_GENERIC_TIME=y
+# CONFIG_GENWQE is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_BCM_KONA is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_ICH is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
+# CONFIG_GPIO_RDC321X is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SCH311X is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_GPIO_WDT is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HAMACHI is not set
+CONFIG_HAMRADIO=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_HAVE_ARM_ARCH_TIMER is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HCALL_STATS is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HDQ_MASTER_OMAP is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HERMES is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_HID is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CP2112 is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GENERIC is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GT683R is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_HUION is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_LOGITECH_DJ is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_PS3REMOTE is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_RMI is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIPPI is not set
+# CONFIG_HIX5HD2_GMAC is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_CS is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
+CONFIG_HOTPLUG=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HP100 is not set
+CONFIG_HPET_MMAP_DEFAULT=y
+# CONFIG_HPFS_FS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_HP_WIRELESS is not set
+# CONFIG_HSI is not set
+# CONFIG_HSR is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HW_PERF_EVENTS=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_OMAP3_ROM is not set
+# CONFIG_HW_RANDOM_PPC4XX is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_500 is not set
+# CONFIG_HZ_PERIODIC is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_AU1550 is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_CHARDEV is not set
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_HID is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_ISMT is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_MUX is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_OCTEON is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_RCAR is not set
+# CONFIG_I2C_RK3X is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
+# CONFIG_I2C_SCMI is not set
+# CONFIG_I2C_SH_MOBILE is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2O is not set
+# CONFIG_I40E is not set
+# CONFIG_I40EVF is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_ZMII is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_IDE is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_IFB is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IIO is not set
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_GPIO_TRIGGER is not set
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
+CONFIG_INET=y
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_TCP_DIAG is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFTL is not set
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_MATRIXKMAP is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MIC_CARD is not set
+# CONFIG_INTEL_MIC_HOST is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_INTEL_OAKTRAIL is not set
+# CONFIG_INTEL_RST is not set
+# CONFIG_INTEL_SMARTCONNECT is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_INV_MPU6050_IIO is not set
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
+# CONFIG_IP17XX_PHY is not set
+# CONFIG_IP6_NF_FILTER is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_NAT is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
+# CONFIG_IPACK_BUS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPV6 is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_ROUTE_INFO is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_SIT_6RD is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_VTI is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_PROMISCUOUS is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_IP_PNP is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_IR_GPIO_CIR is not set
+# CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_IMG is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_LIRC_CODEC is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_NEC_DECODER is not set
+# CONFIG_IR_RC5_DECODER is not set
+# CONFIG_IR_RC5_SZ_DECODER is not set
+# CONFIG_IR_RC6_DECODER is not set
+# CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_SONY_DECODER is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_TTUSBIR is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_ISCSI_TCP is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_ISL29125 is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_ISS4xx is not set
+# CONFIG_ITG3200 is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWMC3200TOP is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD2_DEBUG is not set
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_FS_POSIX_ACL is not set
+# CONFIG_JFFS2_FS_SECURITY is not set
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_LZMA=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_ZLIB is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JME is not set
+CONFIG_JOLIET=y
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_UNCOMPRESSED is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_KERNEL_XZ=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_CAP1106 is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SH_KEYSC is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_KGDB is not set
+# CONFIG_KMEMCHECK is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
+CONFIG_KUSER_HELPERS=y
+# CONFIG_KVM_GUEST is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_L2TP is not set
+# CONFIG_L2TP_ETH is not set
+# CONFIG_L2TP_IP is not set
+# CONFIG_L2TP_V3 is not set
+# CONFIG_LANMEDIA is not set
+# CONFIG_LANTIQ is not set
+# CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_LBDAF=y
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_ATMEL_PWM is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO_OF=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3556 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_NET5501 is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA9685 is not set
+# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_USBDEV is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_LIB80211_CRYPT_CCMP is not set
+# CONFIG_LIB80211_CRYPT_TKIP is not set
+# CONFIG_LIB80211_CRYPT_WEP is not set
+# CONFIG_LIB80211_DEBUG is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_LIRC_STAGING is not set
+# CONFIG_LIS3L02DQ is not set
+# CONFIG_LKDTM is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_LOCKD is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_LOCKD_V4=y
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_LOGFS is not set
+# CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIWHEELS_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+# CONFIG_LOONGSON_MC146818 is not set
+# CONFIG_LP486E is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LTPC is not set
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+# CONFIG_LZO_COMPRESS is not set
+# CONFIG_LZO_DECOMPRESS is not set
+# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MACB is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_LOONGSON1 is not set
+# CONFIG_MACH_NO_WESTBRIDGE is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+# CONFIG_MAILBOX is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MCB is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_MCPM is not set
+# CONFIG_MD is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_CONTROLLER is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+# CONFIG_MEDIA_SDR_SUPPORT is not set
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEDIA_USB_SUPPORT is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEMORY is not set
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MEN_A21_WDT is not set
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_MFD_OMAP_USB_HOST is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_RK808 is not set
+# CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_RTSX_USB is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MIGRATION is not set
+CONFIG_MII=y
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMULATOR is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD3 is not set
+# CONFIG_MIPS_SIM is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_NETJET is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MKISS is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX5_CORE is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMC is not set
+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AU1X is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_BLOCK_MINORS=8
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+# CONFIG_MMC_SDHCI_BCM_KONA is not set
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_USDHI6ROL0 is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+CONFIG_MMU=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_STRIPPED=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_MPL115 is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_MSI_LAPTOP is not set
+CONFIG_MTD=y
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LATCH_ADDR is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_LPDDR2_NVM is not set
+# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_AMS_DELTA is not set
+# CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
+# CONFIG_MTD_NAND_ATMEL is not set
+# CONFIG_MTD_NAND_AU1550 is not set
+# CONFIG_MTD_NAND_AUTCPU12 is not set
+# CONFIG_MTD_NAND_BCH is not set
+# CONFIG_MTD_NAND_BCM_UMI is not set
+# CONFIG_MTD_NAND_BF5XX is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CM_X270 is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_MTD_NAND_DAVINCI is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_ECC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+# CONFIG_MTD_NAND_FSL_IFC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
+# CONFIG_MTD_NAND_FSMC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_GPMI_NAND is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_JZ4740 is not set
+# CONFIG_MTD_NAND_MPC5121_NFC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_NDFC is not set
+# CONFIG_MTD_NAND_NOMADIK is not set
+# CONFIG_MTD_NAND_NUC900 is not set
+# CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
+# CONFIG_MTD_NAND_ORION is not set
+# CONFIG_MTD_NAND_PASEMI is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_PPCHAMELEONEVB is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
+# CONFIG_MTD_NAND_RB4XX is not set
+# CONFIG_MTD_NAND_RB750 is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_RTC_FROM4 is not set
+# CONFIG_MTD_NAND_S3C2410 is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_SH_FLCTL is not set
+# CONFIG_MTD_NAND_SOCRATES is not set
+# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_NAND_TMIO is not set
+# CONFIG_MTD_NAND_TXX9NDFMC is not set
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+# CONFIG_MTD_SPI_NOR is not set
+# CONFIG_MTD_SPINAND_MT29F is not set
+CONFIG_MTD_SPLIT=y
+# CONFIG_MTD_SPLIT_FIRMWARE is not set
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+# CONFIG_MTD_SPLIT_LZMA_FW is not set
+# CONFIG_MTD_SPLIT_SEAMA_FW is not set
+CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
+# CONFIG_MTD_SPLIT_UIMAGE_FW is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MTD_UIMAGE_SPLIT is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_MVMDIO is not set
+# CONFIG_MVSW6171_PHY is not set
+# CONFIG_MVSWITCH_PHY is not set
+# CONFIG_MWAVE is not set
+# CONFIG_MWL8K is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_NBPFAXI_DMA is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NE2000 is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
+CONFIG_NET=y
+# CONFIG_NETCONSOLE is not set
+CONFIG_NETDEVICES=y
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+# CONFIG_NETFILTER_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETLINK_DIAG is not set
+# CONFIG_NETLINK_MMAP is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETROM is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_BPF is not set
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_U32 is not set
+CONFIG_NET_CORE=y
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6171 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_EMATCH_CMP is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_NBYTE is not set
+CONFIG_NET_EMATCH_STACK=32
+# CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_U32 is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_FC is not set
+# CONFIG_NET_FOU is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPVTI is not set
+# CONFIG_NET_IP_TUNNEL is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_NET_MPLS_GSO is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POCKET is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NET_PTP_CLASSIFY is not set
+CONFIG_NET_RX_BUSY_POLL=y
+# CONFIG_NET_SB1000 is not set
+CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_ATM is not set
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_ESFQ is not set
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_NET_SCH_FQ is not set
+CONFIG_NET_SCH_FQ_CODEL=y
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_HHF is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_PIE is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_NET_UDP_TUNNEL is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_HISILICON=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_NET_VENDOR_XIRCOM=y
+# CONFIG_NET_XGENE is not set
+CONFIG_NEW_LEDS=y
+# CONFIG_NFC is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_DEPRECATED is not set
+# CONFIG_NFSD_V2_ACL is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFS_ACL_SUPPORT is not set
+CONFIG_NFS_COMMON=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V2 is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFTL is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+# CONFIG_NF_CONNTRACK_RTSP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_GRE is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_LOG_ARP is not set
+CONFIG_NF_LOG_IPV4=m
+# CONFIG_NF_NAT is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_IPV4=m
+# CONFIG_NF_NAT_IPV6 is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_MASQUERADE_IPV4 is not set
+# CONFIG_NF_NAT_MASQUERADE_IPV6 is not set
+# CONFIG_NF_NAT_NEEDED is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
+# CONFIG_NF_NAT_RTSP is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_TFTP is not set
+CONFIG_NF_REJECT_IPV4=m
+# CONFIG_NF_TABLES is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_NIU is not set
+CONFIG_NLATTR=y
+# CONFIG_NLMON is not set
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
+# CONFIG_NLS is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_NO_BOOTMEM is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_NTP_PPS is not set
+# CONFIG_NVRAM is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_N_GSM is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OBS600 is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
+# CONFIG_OMAP2_DSS_SDI is not set
+# CONFIG_OMAP_CONTROL_USB is not set
+# CONFIG_OMAP_OCP2SCP is not set
+# CONFIG_OMAP_USB2 is not set
+# CONFIG_OMAP_USB3 is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_ORION_WATCHDOG is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_OVERLAY_FS=y
+# CONFIG_P54_COMMON is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PANEL is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_1284 is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OCTEON_CF is not set
+# CONFIG_PATA_OF_PLATFORM is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PC300TOO is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCMCIA is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_XIRCOM is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PD6729 is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
+# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_PID_NS is not set
+CONFIG_PINCONF=y
+# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_CAPRI is not set
+# CONFIG_PINCTRL_EXYNOS is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINMUX=y
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_PLIP is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PM is not set
+# CONFIG_PMBUS is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWERCAP is not set
+# CONFIG_POWERTV is not set
+# CONFIG_POWER_AVS is not set
+# CONFIG_POWER_RESET is not set
+# CONFIG_POWER_RESET_RESTART is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PPC4xx_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPP is not set
+# CONFIG_PPPOATM is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_PARPORT is not set
+# CONFIG_PPS_DEBUG is not set
+# CONFIG_PPTP is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_PRINTK=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
+# CONFIG_PROC_DEVICETREE is not set
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_STRIPPED=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILING is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_PSB6970_PHY is not set
+# CONFIG_PSTORE is not set
+# CONFIG_PTP_1588_CLOCK is not set
+# CONFIG_PTP_1588_CLOCK_IXP46X is not set
+# CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_PWM is not set
+# CONFIG_PWM_PCA9685 is not set
+# CONFIG_QCA7000 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_R3964 is not set
+# CONFIG_R6040 is not set
+# CONFIG_R8169 is not set
+# CONFIG_R8187SE is not set
+# CONFIG_R8188EU is not set
+# CONFIG_R8712U is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RALINK is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RANDOM32_SELFTEST is not set
+# CONFIG_RAPIDIO is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_RCU_NOCB_CPU is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_USER_QS is not set
+# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_RC_CORE is not set
+# CONFIG_RC_DECODERS is not set
+# CONFIG_RC_LOOPBACK is not set
+# CONFIG_RC_MAP is not set
+# CONFIG_RDS is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_LZ4 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_REDWOOD is not set
+# CONFIG_REGMAP is not set
+# CONFIG_REGMAP_I2C is not set
+# CONFIG_REGMAP_SPI is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_TI_ABB is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_RELAY is not set
+# CONFIG_RESET_CONTROLLER is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_ROSE is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_GENERIC is not set
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12057 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+# CONFIG_RTC_DRV_MOXART is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_OMAP is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_PS3 is not set
+# CONFIG_RTC_DRV_PT7C4338 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_SUN6I is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_XGENE is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_SYSTOHC=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+# CONFIG_RTL8367B_PHY is not set
+# CONFIG_RTL8367_PHY is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL_CARDS is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_RTS5208 is not set
+# CONFIG_RTS_PSTOR is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_RUNTIME_DEBUG is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_S2IO is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_FSL is not set
+# CONFIG_SATA_HIGHBANK is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_RCAR is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_SBE_2T3E3 is not set
+# CONFIG_SBYPASS is not set
+# CONFIG_SC92031 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCC is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHED_MC is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SCHED_SMT is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_ESAS2R is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_ISCI is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_MOD=y
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SDIO_UART is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SEEQ8005 is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ACPI_POWER is not set
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADC128D818 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_GSC is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HMC5843 is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_HTU21 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95234 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4222 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4260 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_NCT6683 is not set
+# CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_POWR1220 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_SENSORS_VEXPRESS is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_ACCENT is not set
+# CONFIG_SERIAL_8250_BOCA is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_DMA=y
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_FOURPORT is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_PCI is not set
+# CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_SYSRQ is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SH_SCI is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SFC is not set
+# CONFIG_SFI is not set
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SGI_PARTITION is not set
+CONFIG_SHMEM=y
+# CONFIG_SH_ETH is not set
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIGMA is not set
+CONFIG_SIGNALFD=y
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC9194 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_SND is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BCD2000 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_HWDEP is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_MIPS is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_MXS_SOC is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_OXYGEN is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_PCM is not set
+# CONFIG_SND_PCMCIA is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_POWERPC_SOC is not set
+# CONFIG_SND_PPC is not set
+# CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
+# CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_IMX_SPDIF is not set
+# CONFIG_SND_SOC_IMX_WM8962 is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TIMER is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_HIFACE is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_SOC_AM33XX is not set
+# CONFIG_SOC_AM43XX is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOC_DRA7XX is not set
+# CONFIG_SOC_HAS_OMAP2_SDRC is not set
+# CONFIG_SOC_OMAP5 is not set
+# CONFIG_SOC_TI is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_SOLO6X10 is not set
+# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_SOUND is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_SP5100_TCO is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_SPARSE_IRQ is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_SPEAKUP is not set
+# CONFIG_SPI is not set
+# CONFIG_SPINLOCK_TEST is not set
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_FSL_ESPI is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_OCTEON is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PPC4xx is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_RAMIPS is not set
+# CONFIG_SPI_ROCKCHIP is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TI_QSPI is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
+# CONFIG_SPMI is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZLIB is not set
+# CONFIG_SRAM is not set
+# CONFIG_SSB is not set
+# CONFIG_SSBI is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSFDC is not set
+CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STACKTRACE is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
+CONFIG_STANDALONE=y
+CONFIG_STDBINUTILS=y
+# CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_STMMAC_ETH is not set
+CONFIG_STP=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_SUSPEND is not set
+CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_LEDS is not set
+# CONFIG_SXGBE_ETH is not set
+# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_SYSCTL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_T5403 is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TASKS_RCU is not set
+# CONFIG_TC35815 is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_TCP_CONG_DCTCP is not set
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_TEGRA_HOST1X is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_UDELAY is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_MODULE is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_USER_COPY is not set
+CONFIG_TEXTSEARCH=y
+# CONFIG_TEXTSEARCH_BM is not set
+# CONFIG_TEXTSEARCH_FSM is not set
+# CONFIG_TEXTSEARCH_KMP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_THUNDERBOLT is not set
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_TIFM_CORE is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_TIMB_DMA is not set
+CONFIG_TIMERFD=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_TINY_RCU=y
+# CONFIG_TIPC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_AM335X_ADC is not set
+# CONFIG_TI_CPSW is not set
+# CONFIG_TI_CPTS is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_TI_DAVINCI_CPDMA is not set
+# CONFIG_TI_DAVINCI_MDIO is not set
+# CONFIG_TI_ST is not set
+# CONFIG_TLAN is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_TMP006 is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TORTURE_TEST is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_SUR40 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TR is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_TRACE_SINK is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_TRAD_SIGNALS=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2x7x is not set
+# CONFIG_TSL4531 is not set
+CONFIG_TTY=y
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6030_GPADC is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_TYPHOON is not set
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UDF_NLS=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_UFS_FS is not set
+# CONFIG_UHID is not set
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
+# CONFIG_UIO is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_UNIX=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_UPROBES is not set
+# CONFIG_USB is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_ALI_M5632=y
+# CONFIG_USB_AMD5536UDC is not set
+CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATM is not set
+CONFIG_USB_BELKIN=y
+# CONFIG_USB_BTMTK is not set
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_CONFIGFS is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC_OTG_LPM is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_HCD_AT91 is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_USB_EZUSB=y
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_FUSBH200_HCD is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_DTCS033 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_JL2005BCD is not set
+# CONFIG_USB_GSPCA_KINECT is not set
+# CONFIG_USB_GSPCA_KONICA is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_NW80X is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SE401 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ930X is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STK1135 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TOPRO is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_VICAM is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_INPUT_IMS_PCU is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_MAX3421_HCD is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_NET_AX88179_178A is not set
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_SR9700 is not set
+# CONFIG_USB_NET_SR9800 is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PCI is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PHY is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RCAR_PHY is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_RTL8152 is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_USB_S3C_HSOTG is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_METRO is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_MXUPORT is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SIMPLE is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_WISHBONE is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_XSENS_MT is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_ZTE is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USELIB is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_USE_OF is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VETH is not set
+# CONFIG_VEXPRESS_CONFIG is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VGA_ARB is not set
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OMAP2_VOUT is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA6752HS is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_THS8200 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_UDA1342 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_USBTV is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_VITESSE_PHY is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_VMSPLIT_1G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMWARE_PVSCSI is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VORTEX is not set
+# CONFIG_VSOCKETS is not set
+# CONFIG_VT is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_VXGE is not set
+# CONFIG_VXLAN is not set
+# CONFIG_W1 is not set
+# CONFIG_W1_CON is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2406 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W35UND is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_WAN is not set
+# CONFIG_WANXL is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_WDTPCI is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WILINK_PLATFORM_DATA=y
+# CONFIG_WIMAX is not set
+# CONFIG_WIMAX_GDM72XX is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX is not set
+# CONFIG_WL18XX is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+CONFIG_WLAN=y
+# CONFIG_WLCORE is not set
+CONFIG_WL_TI=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_WR_PPMC is not set
+# CONFIG_X25 is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+# CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_X86_SYSFB=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_IPCOMP is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XILINX_AXI_EMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILLYBUS is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_XMON is not set
+# CONFIG_XVMALLOC is not set
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_BCJ is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_YAM is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_YENTA is not set
+# CONFIG_YENTA_O2 is not set
+# CONFIG_YENTA_RICOH is not set
+# CONFIG_YENTA_TI is not set
+# CONFIG_YENTA_TOSHIBA is not set
+# CONFIG_ZBUD is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_ZLIB_DEFLATE is not set
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZNET is not set
+# CONFIG_ZPOOL is not set
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZRAM is not set
+# CONFIG_ZSMALLOC is not set
diff --git a/trunk/target/linux/generic/config-3.3 b/trunk/target/linux/generic/config-3.3
new file mode 100644
index 00000000..70330e0b
--- /dev/null
+++ b/trunk/target/linux/generic/config-3.3
@@ -0,0 +1,3529 @@
+CONFIG_32BIT=y
+# CONFIG_6PACK is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_AB8500_CORE is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_ACENIC is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
+CONFIG_AEABI=y
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AGP is not set
+CONFIG_AIO=y
+# CONFIG_AIRO is not set
+# CONFIG_AIRO_CS is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_ANDROID is not set
+CONFIG_ANON_INODES=y
+# CONFIG_APDS9802ALS is not set
+# CONFIG_APM8018X is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AR7 is not set
+# CONFIG_AR8216_PHY is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_EXYNOS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=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_HIGHBANK 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_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_LPC32XX 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_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PRIMA2 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ARCH_TCC_926 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_ARCNET is not set
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+# CONFIG_ARM_ERRATA_326103 is not set
+# CONFIG_ARM_ERRATA_364296 is not set
+# CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_ARM_UNWIND is not set
+CONFIG_ARPD=y
+# CONFIG_ARTHUR is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_ATA is not set
+CONFIG_ATAGS_PROC=y
+# CONFIG_ATALK is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_ACPI is not set
+CONFIG_ATA_BMDMA=y
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_SFF=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH6K_LEGACY is not set
+# CONFIG_ATH79 is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL2 is not set
+# CONFIG_ATM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_BR2684 is not set
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_ATM_CLIP is not set
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_MPOA is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
+# CONFIG_AUDIT is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTO_ZRELADDR is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AVERAGE is not set
+# CONFIG_AX25 is not set
+# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_B44 is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
+# CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCMA is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BE2NET is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_BITREVERSE=y
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_CPQ_DA is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_BLOCK=y
+# CONFIG_BMP085 is not set
+# CONFIG_BNA is not set
+# CONFIG_BNX2 is not set
+# CONFIG_BNX2X is not set
+# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_RAW=y
+# CONFIG_BPQETHER is not set
+CONFIG_BQL=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_EBT_802_3 is not set
+# CONFIG_BRIDGE_EBT_AMONG is not set
+# CONFIG_BRIDGE_EBT_ARP is not set
+# CONFIG_BRIDGE_EBT_ARPREPLY is not set
+# CONFIG_BRIDGE_EBT_BROUTE is not set
+# CONFIG_BRIDGE_EBT_DNAT is not set
+# CONFIG_BRIDGE_EBT_IP is not set
+# CONFIG_BRIDGE_EBT_IP6 is not set
+# CONFIG_BRIDGE_EBT_LIMIT is not set
+# CONFIG_BRIDGE_EBT_LOG is not set
+# CONFIG_BRIDGE_EBT_MARK is not set
+# CONFIG_BRIDGE_EBT_MARK_T is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_BRIDGE_EBT_PKTTYPE is not set
+# CONFIG_BRIDGE_EBT_REDIRECT is not set
+# CONFIG_BRIDGE_EBT_SNAT is not set
+# CONFIG_BRIDGE_EBT_STP is not set
+# CONFIG_BRIDGE_EBT_T_FILTER is not set
+# CONFIG_BRIDGE_EBT_T_NAT is not set
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_VLAN is not set
+# CONFIG_BRIDGE_IGMP_SNOOPING is not set
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_BT is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_HIDP is not set
+CONFIG_BT_L2CAP=y
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_RFCOMM is not set
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_SCO=y
+CONFIG_BUG=y
+# CONFIG_C2PORT is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_CARMA_FPGA is not set
+# CONFIG_CARMA_FPGA_PROGRAM is not set
+# CONFIG_CASSINI is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CIFS_NFSD_EXPORT is not set
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CLEANCACHE is not set
+CONFIG_CLS_U32_MARK=y
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+# CONFIG_CNIC is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_COMEDI is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_CONSTRUCTORS=y
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
+# CONFIG_CORDIC is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRASHLOG=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_CRC8 is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CROSS_COMPILE=""
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_AEAD is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+# CONFIG_CRYPTO_ALGAPI is not set
+# CONFIG_CRYPTO_ALGAPI2 is not set
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_BLKCIPHER is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
+# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_HASH is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_COMMON is not set
+# CONFIG_CRYPTO_USER is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_XZ is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CS5535_MFGPT is not set
+# CONFIG_CUSE is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DCB is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO_REDUCED=y
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKDEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DECNET is not set
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_DEVPORT=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DEVTMPFS is not set
+# CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DL2K is not set
+# CONFIG_DLM is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMASCC is not set
+# CONFIG_DMATEST is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_ENGINE is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DNET is not set
+# CONFIG_DNOTIFY is not set
+CONFIG_DQL=y
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
+# CONFIG_DTLK is not set
+# CONFIG_DUMMY is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E2100 is not set
+# CONFIG_EASYCAP is not set
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_EDAC is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_EFS_FS is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_ENIC is not set
+# CONFIG_EPIC100 is not set
+CONFIG_EPOLL=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
+# CONFIG_ETH16I is not set
+CONFIG_ETHERNET=y
+# CONFIG_ETHOC is not set
+CONFIG_EVENTFD=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+# CONFIG_EWRK3 is not set
+CONFIG_EXPERIMENTAL=y
+CONFIG_EXPERT=y
+# CONFIG_EXPORTFS is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_EZX_PCAP is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FANOTIFY is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_FS is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FB is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_PS3 is not set
+# CONFIG_FB_PXA is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_FCOE is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_FDDI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_FHANDLE is not set
+CONFIG_FIB_RULES=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_FLATMEM=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FORCEDETH is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_FSCACHE is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_FT1000 is not set
+# CONFIG_FTGMAC100 is not set
+# CONFIG_FTL is not set
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_FUSE_FS is not set
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+# CONFIG_FUSION_SPI is not set
+CONFIG_FUTEX=y
+CONFIG_FW_LOADER=y
+CONFIG_GACT_PROB=y
+# CONFIG_GAMEPORT is not set
+# CONFIG_GCOV is not set
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_TIME=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RDC321X is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HAMACHI is not set
+CONFIG_HAMRADIO=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HCALL_STATS is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HERMES is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_HID is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIPPI is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_CS is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
+CONFIG_HOTPLUG=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HP100 is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HW_PERF_EVENTS=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_PPC4XX is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_CHARDEV is not set
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_MUX is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_SCMI is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2O is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_ZMII is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_IDE is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_IFB is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IIO is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
+CONFIG_INET=y
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_TCP_DIAG is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFTL is not set
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_INTEL_OAKTRAIL is not set
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
+# CONFIG_IP17XX_PHY is not set
+# CONFIG_IP6_NF_FILTER is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPV6 is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_ROUTE_INFO is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_SIT_6RD is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_PROMISCUOUS is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_IP_PNP is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_LIRC_CODEC is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_NEC_DECODER is not set
+# CONFIG_IR_RC5_DECODER is not set
+# CONFIG_IR_RC5_SZ_DECODER is not set
+# CONFIG_IR_RC6_DECODER is not set
+# CONFIG_IR_SONY_DECODER is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_ISCSI_TCP is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_ISS4xx is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWMC3200TOP is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD2_DEBUG is not set
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_FS_POSIX_ACL is not set
+# CONFIG_JFFS2_FS_SECURITY is not set
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_LZMA=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_ZLIB is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JME is not set
+CONFIG_JOLIET=y
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_KGDB is not set
+# CONFIG_KMEMCHECK is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
+# CONFIG_KVM_GUEST is not set
+# CONFIG_L2TP is not set
+# CONFIG_L2TP_ETH is not set
+# CONFIG_L2TP_IP is not set
+# CONFIG_L2TP_V3 is not set
+# CONFIG_LANMEDIA is not set
+# CONFIG_LANTIQ is not set
+# CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_LBDAF=y
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_BD2802 is not set
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO_OF=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_NET5501 is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_USBDEV is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_LIB80211_CRYPT_CCMP is not set
+# CONFIG_LIB80211_CRYPT_TKIP is not set
+# CONFIG_LIB80211_CRYPT_WEP is not set
+# CONFIG_LIB80211_DEBUG is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_LIRC_STAGING is not set
+# CONFIG_LKDTM is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_LOCKD is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_LOCKD_V4=y
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_LOGFS is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_LOONGSON_MC146818 is not set
+# CONFIG_LP486E is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+# CONFIG_LZO_COMPRESS is not set
+# CONFIG_LZO_DECOMPRESS is not set
+# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_NO_WESTBRIDGE is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MD is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_MEDIA_CONTROLLER is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MIGRATION is not set
+CONFIG_MII=y
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SIM is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_NETJET is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MKISS is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MMC is not set
+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AU1X is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_BLOCK_MINORS=8
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+CONFIG_MMU=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_MSI_LAPTOP is not set
+CONFIG_MTD=y
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LATCH_ADDR is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_AMS_DELTA is not set
+# CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_ATMEL is not set
+# CONFIG_MTD_NAND_AU1550 is not set
+# CONFIG_MTD_NAND_AUTCPU12 is not set
+# CONFIG_MTD_NAND_BCH is not set
+# CONFIG_MTD_NAND_BCM_UMI is not set
+# CONFIG_MTD_NAND_BF5XX is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CM_X270 is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_MTD_NAND_DAVINCI is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_ECC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
+# CONFIG_MTD_NAND_FSMC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_GPMI_NAND is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_JZ4740 is not set
+# CONFIG_MTD_NAND_MPC5121_NFC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_NDFC is not set
+# CONFIG_MTD_NAND_NOMADIK is not set
+# CONFIG_MTD_NAND_NUC900 is not set
+# CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_ORION is not set
+# CONFIG_MTD_NAND_PASEMI is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_PPCHAMELEONEVB is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
+# CONFIG_MTD_NAND_RB4XX is not set
+# CONFIG_MTD_NAND_RB750 is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_RTC_FROM4 is not set
+# CONFIG_MTD_NAND_S3C2410 is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_SH_FLCTL is not set
+# CONFIG_MTD_NAND_SOCRATES is not set
+# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_NAND_TMIO is not set
+# CONFIG_MTD_NAND_TXX9NDFMC is not set
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_MVSWITCH_PHY is not set
+# CONFIG_MWAVE is not set
+# CONFIG_MWL8K is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NE2000 is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
+CONFIG_NET=y
+# CONFIG_NETCONSOLE is not set
+CONFIG_NETDEVICES=y
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETROM is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_U32 is not set
+CONFIG_NET_CORE=y
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_EMATCH_CMP is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_NBYTE is not set
+CONFIG_NET_EMATCH_STACK=32
+# CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_U32 is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_FC is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POCKET is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_ATM is not set
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_ESFQ is not set
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_NET_SCH_FQ_CODEL is not set
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_NET_TULIP is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_NEW_LEDS=y
+# CONFIG_NFC is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_DEPRECATED is not set
+# CONFIG_NFSD_V2_ACL is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFS_ACL_SUPPORT is not set
+CONFIG_NFS_COMMON=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFTL is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+# CONFIG_NF_CONNTRACK_RTSP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_GRE is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_NAT is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_H323 is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_NEEDED is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
+# CONFIG_NF_NAT_RTSP is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_NIU is not set
+CONFIG_NLATTR=y
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
+# CONFIG_NLS is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_NO_BOOTMEM is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_NTP_PPS is not set
+# CONFIG_NVRAM is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_N_GSM is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OBS600 is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_ORION_WATCHDOG is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_OVERLAYFS_FS=y
+# CONFIG_P54_COMMON is not set
+CONFIG_PACKET=y
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PANEL is not set
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_1284 is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PC300TOO is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCMCIA is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_XIRCOM is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PD6729 is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PID_NS is not set
+# CONFIG_PINCTRL is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_PLIP is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PM is not set
+# CONFIG_PMBUS is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWERTV is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PPC4xx_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPP is not set
+# CONFIG_PPPOATM is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_PARPORT is not set
+# CONFIG_PPS_DEBUG is not set
+# CONFIG_PPTP is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_PRINTK=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILING is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
+# CONFIG_PSB6970_PHY is not set
+# CONFIG_PSTORE is not set
+# CONFIG_PTP_1588_CLOCK_IXP46X is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_R3964 is not set
+# CONFIG_R6040 is not set
+# CONFIG_R8169 is not set
+# CONFIG_R8187SE is not set
+# CONFIG_R8712U is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RAPIDIO is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_RAW_DRIVER is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RC_CORE is not set
+# CONFIG_RC_MAP is not set
+# CONFIG_RDS is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_REDWOOD is not set
+# CONFIG_REGMAP is not set
+# CONFIG_REGMAP_I2C is not set
+# CONFIG_REGMAP_SPI is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_RELAY is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_ROSE is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_GENERIC is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_PS3 is not set
+# CONFIG_RTC_DRV_PT7C4338 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+# CONFIG_RTL8367B_PHY is not set
+# CONFIG_RTL8367_PHY is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_RTS_PSTOR is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_RUNTIME_DEBUG is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_S2IO is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_FSL is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_SBE_2T3E3 is not set
+# CONFIG_SC92031 is not set
+# CONFIG_SCC is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHED_MC is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SCHED_SMT is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_ISCI is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_MOD=y
+# CONFIG_SCSI_MPT2SAS is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SDIO_UART is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SEEQ8005 is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ACPI_POWER is not set
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_GSC is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_ACCENT is not set
+# CONFIG_SERIAL_8250_BOCA is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_FOURPORT is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_PCI is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SFC is not set
+# CONFIG_SFI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SGI_PARTITION is not set
+CONFIG_SHMEM=y
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIGMA is not set
+CONFIG_SIGNALFD=y
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC9194 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_SND is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_HWDEP is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_MIPS is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_OXYGEN is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_PCM is not set
+# CONFIG_SND_PCMCIA is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_PPC is not set
+# CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
+# CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TIMER is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_SOLO6X10 is not set
+# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_SOUND is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_SP5100_TCO is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_SPARSE_IRQ is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_SPEAKUP is not set
+# CONFIG_SPI is not set
+# CONFIG_SPINLOCK_TEST is not set
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_ESPI is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PPC4xx is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_RAMIPS is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZLIB is not set
+# CONFIG_SSB is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSFDC is not set
+CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STACK_TRACER is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
+CONFIG_STANDALONE=y
+CONFIG_STDBINUTILS=y
+# CONFIG_STE10XP is not set
+# CONFIG_STMMAC_ETH is not set
+CONFIG_STP=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_SUSPEND is not set
+CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_LEDS is not set
+# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_SYSCTL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TC35815 is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_POWER is not set
+CONFIG_TEXTSEARCH=y
+# CONFIG_TEXTSEARCH_BM is not set
+# CONFIG_TEXTSEARCH_FSM is not set
+# CONFIG_TEXTSEARCH_KMP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_TIFM_CORE is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_TIMB_DMA is not set
+CONFIG_TIMERFD=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_TINY_RCU=y
+# CONFIG_TIPC is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_TI_ST is not set
+# CONFIG_TLAN is not set
+# CONFIG_TMD_HERMES is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TR is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_TRACE_SINK is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_TRAD_SIGNALS=y
+# CONFIG_TRANZPORT is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TYPHOON is not set
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UDF_NLS=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_UFS_FS is not set
+# CONFIG_UIO is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_UNIX=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_ALI_M5632=y
+# CONFIG_USB_AMD5536UDC is not set
+CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATM is not set
+CONFIG_USB_BELKIN=y
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC_OTG_LPM is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_USB_EZUSB=y
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_JL2005BCD is not set
+# CONFIG_USB_GSPCA_KINECT is not set
+# CONFIG_USB_GSPCA_KONICA is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_NW80X is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SE401 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ930X is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TOPRO is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_VICAM is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PCI is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_USE_OF is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_VETH is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VGA_ARB is not set
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_VITESSE_PHY is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_VMSPLIT_1G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMWARE_PVSCSI is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VORTEX is not set
+# CONFIG_VT is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_VXGE is not set
+# CONFIG_W1 is not set
+# CONFIG_W1_CON is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_WAN is not set
+# CONFIG_WANXL is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_WDTPCI is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+# CONFIG_WIMAX is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+CONFIG_WLAN=y
+# CONFIG_WR_PPMC is not set
+# CONFIG_X25 is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_IPCOMP is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_XMON is not set
+# CONFIG_XVMALLOC is not set
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_BCJ is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAM is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_YENTA is not set
+# CONFIG_YENTA_O2 is not set
+# CONFIG_YENTA_RICOH is not set
+# CONFIG_YENTA_TI is not set
+# CONFIG_YENTA_TOSHIBA is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_ZLIB_DEFLATE is not set
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZNET is not set
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZRAM is not set
diff --git a/trunk/target/linux/generic/config-3.8 b/trunk/target/linux/generic/config-3.8
new file mode 100644
index 00000000..c27493fd
--- /dev/null
+++ b/trunk/target/linux/generic/config-3.8
@@ -0,0 +1,3892 @@
+CONFIG_32BIT=y
+# CONFIG_6PACK is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_AB8500_CORE is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_ACENIC is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_ACPI_APEI is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_POWER_METER is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
+# CONFIG_AD2S90 is not set
+# CONFIG_AD5064 is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686 is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD5930 is not set
+# CONFIG_AD5933 is not set
+# CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7280 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606 is not set
+# CONFIG_AD7746 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_AD7877 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD8366 is not set
+# CONFIG_AD9523 is not set
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# CONFIG_AD9850 is not set
+# CONFIG_AD9852 is not set
+# CONFIG_AD9910 is not set
+# CONFIG_AD9951 is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADE7753 is not set
+# CONFIG_ADE7754 is not set
+# CONFIG_ADE7758 is not set
+# CONFIG_ADE7759 is not set
+# CONFIG_ADE7854 is not set
+# CONFIG_ADF4350 is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADIS16060 is not set
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16204 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADIS16220 is not set
+# CONFIG_ADIS16240 is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_ADM6996_PHY is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_ADT7316 is not set
+# CONFIG_ADT7410 is not set
+# CONFIG_ADXRS450 is not set
+CONFIG_AEABI=y
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AGP is not set
+CONFIG_AIO=y
+# CONFIG_AIRO is not set
+# CONFIG_AIRO_CS is not set
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_AMD_PHY is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_ANDROID is not set
+CONFIG_ANON_INODES=y
+# CONFIG_APDS9802ALS is not set
+# CONFIG_APM8018X is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AR7 is not set
+# CONFIG_AR8216_PHY is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_EXYNOS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=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_HIGHBANK 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_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_MULTIPLATFORM is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_NUC93X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PRIMA2 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_ARCH_TCC_926 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ARM_ARCH_TIMER is not set
+# CONFIG_ARM_AT91_ETHER is not set
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+# CONFIG_ARM_ERRATA_326103 is not set
+# CONFIG_ARM_ERRATA_364296 is not set
+# CONFIG_ARM_ERRATA_411920 is not set
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_643719 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
+# CONFIG_ARM_ERRATA_798181 is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_ARM_UNWIND is not set
+# CONFIG_ARM_VIRT_EXT is not set
+CONFIG_ARPD=y
+# CONFIG_ARTHUR is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_AT76C50X_USB is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_ATA is not set
+CONFIG_ATAGS_PROC=y
+# CONFIG_ATALK is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_ACPI is not set
+CONFIG_ATA_BMDMA=y
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_SFF=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH6K_LEGACY is not set
+# CONFIG_ATH79 is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL2 is not set
+# CONFIG_ATM is not set
+# CONFIG_ATMEL is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_BR2684 is not set
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_ATM_CLIP is not set
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_LANE is not set
+# CONFIG_ATM_MPOA is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_SOLOS is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
+# CONFIG_AUDIT is not set
+# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTO_ZRELADDR is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AVERAGE is not set
+# CONFIG_AX25 is not set
+# CONFIG_AX25_DAMA_SLAVE is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_B44 is not set
+# CONFIG_B53 is not set
+# CONFIG_B53_SPI_DRIVER is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BCM47XX is not set
+# CONFIG_BCM63XX is not set
+# CONFIG_BCM63XX_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_BCMA is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BE2NET is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BGMAC is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_BITREVERSE=y
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_CPQ_DA is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_BLOCK=y
+# CONFIG_BMP085 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_BNA is not set
+# CONFIG_BNX2 is not set
+# CONFIG_BNX2X is not set
+# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_RAW=y
+# CONFIG_BPCTL is not set
+# CONFIG_BPF_JIT is not set
+# CONFIG_BPQETHER is not set
+CONFIG_BQL=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_BRCMFMAC is not set
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_EBT_802_3 is not set
+# CONFIG_BRIDGE_EBT_AMONG is not set
+# CONFIG_BRIDGE_EBT_ARP is not set
+# CONFIG_BRIDGE_EBT_ARPREPLY is not set
+# CONFIG_BRIDGE_EBT_BROUTE is not set
+# CONFIG_BRIDGE_EBT_DNAT is not set
+# CONFIG_BRIDGE_EBT_IP is not set
+# CONFIG_BRIDGE_EBT_IP6 is not set
+# CONFIG_BRIDGE_EBT_LIMIT is not set
+# CONFIG_BRIDGE_EBT_LOG is not set
+# CONFIG_BRIDGE_EBT_MARK is not set
+# CONFIG_BRIDGE_EBT_MARK_T is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_BRIDGE_EBT_PKTTYPE is not set
+# CONFIG_BRIDGE_EBT_REDIRECT is not set
+# CONFIG_BRIDGE_EBT_SNAT is not set
+# CONFIG_BRIDGE_EBT_STP is not set
+# CONFIG_BRIDGE_EBT_T_FILTER is not set
+# CONFIG_BRIDGE_EBT_T_NAT is not set
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_VLAN is not set
+# CONFIG_BRIDGE_IGMP_SNOOPING is not set
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BROADCOM_PHY is not set
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_BT is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_3WIRE is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_HIDP is not set
+CONFIG_BT_L2CAP=y
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_RFCOMM is not set
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_SCO=y
+CONFIG_BUG=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+# CONFIG_C2PORT is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_CARMA_FPGA is not set
+# CONFIG_CARMA_FPGA_PROGRAM is not set
+# CONFIG_CASSINI is not set
+CONFIG_CAVIUM_OCTEON_HELPER=y
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CED1401 is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
+# CONFIG_CIFS_DEBUG is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CIFS_NFSD_EXPORT is not set
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CLEANCACHE is not set
+CONFIG_CLS_U32_MARK=y
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CMA is not set
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+# CONFIG_CNIC is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_COMEDI is not set
+# CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_CONSTRUCTORS=y
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
+# CONFIG_CORDIC is not set
+# CONFIG_COREDUMP is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRASHLOG=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC32_SARWATE=y
+# CONFIG_CRC32_SELFTEST is not set
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SLICEBY8 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_CRC8 is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CROSS_COMPILE=""
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_AEAD is not set
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES_ARM is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_BLKCIPHER is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
+# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_HASH is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA1_ARM is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_TWOFISH_COMMON is not set
+# CONFIG_CRYPTO_USER is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_XZ is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CS5535_MFGPT is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_CUSE is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DCB is not set
+# CONFIG_DDR is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO_REDUCED=y
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_LOCKDEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_ZBOOT is not set
+# CONFIG_DECNET is not set
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_DEFAULT_NOOP is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_DEVPORT=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DEVTMPFS is not set
+# CONFIG_DEVTMPFS_MOUNT is not set
+# CONFIG_DGRP is not set
+# CONFIG_DIRECT_IO is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DL2K is not set
+# CONFIG_DLM is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMASCC is not set
+# CONFIG_DMATEST is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_ENGINE is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_DM_LOG_USERSPACE is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_RAID is not set
+# CONFIG_DM_THIN_PROVISIONING is not set
+# CONFIG_DM_UEVENT is not set
+# CONFIG_DM_VERITY is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DNET is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_DNS_RESOLVER is not set
+CONFIG_DQL=y
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
+# CONFIG_DTLK is not set
+# CONFIG_DUMMY is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E2100 is not set
+# CONFIG_EASYCAP is not set
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_EDAC is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEXPRESS is not set
+# CONFIG_EEXPRESS_PRO is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_EFS_FS is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_ENIC is not set
+# CONFIG_EPAPR_PARAVIRT is not set
+# CONFIG_EPIC100 is not set
+CONFIG_EPOLL=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ET131X is not set
+# CONFIG_ETH16I is not set
+CONFIG_ETHERNET=y
+# CONFIG_ETHOC is not set
+CONFIG_EVENTFD=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+# CONFIG_EWRK3 is not set
+CONFIG_EXPERIMENTAL=y
+CONFIG_EXPERT=y
+# CONFIG_EXPORTFS is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXTCON is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_EXYNOS_VIDEO is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_F2FS_FS is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FAIR_SHARE is not set
+# CONFIG_FANOTIFY is not set
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_FS is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FB is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_PS3 is not set
+# CONFIG_FB_PXA is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_FCOE is not set
+# CONFIG_FCOE_FNIC is not set
+# CONFIG_FDDI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_FHANDLE is not set
+CONFIG_FIB_RULES=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_FLATMEM=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FORCEDETH is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_FSCACHE is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_FT1000 is not set
+# CONFIG_FTGMAC100 is not set
+# CONFIG_FTL is not set
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_FUSE_FS is not set
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+# CONFIG_FUSION_SPI is not set
+CONFIG_FUTEX=y
+CONFIG_FW_LOADER=y
+CONFIG_GACT_PROB=y
+# CONFIG_GADGET_UAC1 is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_GCOV is not set
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_TIME=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_ICH is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RDC321X is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HAMACHI is not set
+CONFIG_HAMRADIO=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HCALL_STATS is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HDQ_MASTER_OMAP is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HERMES is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_HID is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GENERIC is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_PS3REMOTE is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIPPI is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_CS is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
+CONFIG_HOTPLUG=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HP100 is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_HPLAN is not set
+# CONFIG_HPLAN_PLUS is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_HSI is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_HVC_UDBG is not set
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HW_PERF_EVENTS=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_PPC4XX is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_CHARDEV is not set
+# CONFIG_I2C_COMPAT is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_HID is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_MUX is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_SCMI is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2O is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_ZMII is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_IDE is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_IFB is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IIO is not set
+# CONFIG_IIO_BUFFER_CB is not set
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_GPIO_TRIGGER is not set
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_IIO_ST_HWMON is not set
+# CONFIG_IIO_SW_RING is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
+CONFIG_INET=y
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_TCP_DIAG is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_INFTL is not set
+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_MATRIXKMAP is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_INTEL_OAKTRAIL is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IP1000 is not set
+# CONFIG_IP17XX_PHY is not set
+# CONFIG_IP6_NF_FILTER is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IPACK_BUS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPV6 is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_ROUTE_INFO is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_SIT_6RD is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_PROMISCUOUS is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_NF_ARPFILTER is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARP_MANGLE is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_IP_PNP is not set
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_LIRC_CODEC is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_NEC_DECODER is not set
+# CONFIG_IR_RC5_DECODER is not set
+# CONFIG_IR_RC5_SZ_DECODER is not set
+# CONFIG_IR_RC6_DECODER is not set
+# CONFIG_IR_SONY_DECODER is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_ISCSI_TCP is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_ISO9660_FS is not set
+# CONFIG_ISS4xx is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWMC3200TOP is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD2_DEBUG is not set
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_FS_POSIX_ACL is not set
+# CONFIG_JFFS2_FS_SECURITY is not set
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_LZMA=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_ZLIB is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JME is not set
+CONFIG_JOLIET=y
+# CONFIG_JUMP_LABEL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_UNCOMPRESSED is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_KGDB is not set
+# CONFIG_KMEMCHECK is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSM is not set
+# CONFIG_KSZ884X_PCI is not set
+# CONFIG_KVM_GUEST is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_L2TP is not set
+# CONFIG_L2TP_ETH is not set
+# CONFIG_L2TP_IP is not set
+# CONFIG_L2TP_V3 is not set
+# CONFIG_LANMEDIA is not set
+# CONFIG_LANTIQ is not set
+# CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_LBDAF=y
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO_OF=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3556 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_NET5501 is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_USBDEV is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_LIB80211_CRYPT_CCMP is not set
+# CONFIG_LIB80211_CRYPT_TKIP is not set
+# CONFIG_LIB80211_CRYPT_WEP is not set
+# CONFIG_LIB80211_DEBUG is not set
+# CONFIG_LIBCRC32C is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_LIRC_STAGING is not set
+# CONFIG_LIS3L02DQ is not set
+# CONFIG_LKDTM is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_LOCKD is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_LOCKD_V4=y
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_LOGFS is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_LOONGSON_MC146818 is not set
+# CONFIG_LP486E is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
+# CONFIG_LZO_COMPRESS is not set
+# CONFIG_LZO_DECOMPRESS is not set
+# CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_MACB is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_JZ4740 is not set
+# CONFIG_MACH_LOONGSON is not set
+# CONFIG_MACH_LOONGSON1 is not set
+# CONFIG_MACH_NO_WESTBRIDGE is not set
+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MD is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_CONTROLLER is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+# CONFIG_MEDIA_USB_SUPPORT is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_MEMORY is not set
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MIGRATION is not set
+CONFIG_MII=y
+# CONFIG_MIKROTIK_RB532 is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_ALCHEMY is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD3 is not set
+# CONFIG_MIPS_SIM is not set
+CONFIG_MISC_DEVICES=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_MISDN is not set
+# CONFIG_MISDN_AVMFRITZ is not set
+# CONFIG_MISDN_HFCPCI is not set
+# CONFIG_MISDN_HFCUSB is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_NETJET is not set
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MKISS is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MMC is not set
+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_AU1X is not set
+# CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_BLOCK_MINORS=8
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_TEST is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+CONFIG_MMU=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_STRIPPED=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_MSI_LAPTOP is not set
+CONFIG_MTD=y
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LATCH_ADDR is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_AMS_DELTA is not set
+# CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_ATMEL is not set
+# CONFIG_MTD_NAND_AU1550 is not set
+# CONFIG_MTD_NAND_AUTCPU12 is not set
+# CONFIG_MTD_NAND_BCH is not set
+# CONFIG_MTD_NAND_BCM_UMI is not set
+# CONFIG_MTD_NAND_BF5XX is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CM_X270 is not set
+# CONFIG_MTD_NAND_CS553X is not set
+# CONFIG_MTD_NAND_DAVINCI is not set
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_ECC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+# CONFIG_MTD_NAND_FSL_IFC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
+# CONFIG_MTD_NAND_FSMC is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_GPMI_NAND is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_JZ4740 is not set
+# CONFIG_MTD_NAND_MPC5121_NFC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_MXC is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_NDFC is not set
+# CONFIG_MTD_NAND_NOMADIK is not set
+# CONFIG_MTD_NAND_NUC900 is not set
+# CONFIG_MTD_NAND_OMAP2 is not set
+# CONFIG_MTD_NAND_ORION is not set
+# CONFIG_MTD_NAND_PASEMI is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_PPCHAMELEONEVB is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
+# CONFIG_MTD_NAND_RB4XX is not set
+# CONFIG_MTD_NAND_RB750 is not set
+# CONFIG_MTD_NAND_RICOH is not set
+# CONFIG_MTD_NAND_RTC_FROM4 is not set
+# CONFIG_MTD_NAND_S3C2410 is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_SH_FLCTL is not set
+# CONFIG_MTD_NAND_SOCRATES is not set
+# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_NAND_TMIO is not set
+# CONFIG_MTD_NAND_TXX9NDFMC is not set
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROOTFS_ROOT_DEV=y
+CONFIG_MTD_ROOTFS_SPLIT=y
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_MVMDIO is not set
+# CONFIG_MVSWITCH_PHY is not set
+# CONFIG_MWAVE is not set
+# CONFIG_MWL8K is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NE2000 is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
+CONFIG_NET=y
+# CONFIG_NETCONSOLE is not set
+CONFIG_NETDEVICES=y
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+# CONFIG_NETFILTER_TPROXY is not set
+# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETROM is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_POLICE is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
+# CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_TCINDEX is not set
+# CONFIG_NET_CLS_U32 is not set
+CONFIG_NET_CORE=y
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_EMATCH_CMP is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_NBYTE is not set
+CONFIG_NET_EMATCH_STACK=32
+# CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_U32 is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_FC is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPVTI is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+CONFIG_NET_PCI=y
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POCKET is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_NET_SCHED=y
+# CONFIG_NET_SCH_ATM is not set
+# CONFIG_NET_SCH_CBQ is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_ESFQ is not set
+CONFIG_NET_SCH_ESFQ_NFCT=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_NET_SCH_FQ_CODEL=y
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_HTB is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_NET_TULIP is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_NEW_LEDS=y
+# CONFIG_NFC is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_DEPRECATED is not set
+# CONFIG_NFSD_V2_ACL is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFS_ACL_SUPPORT is not set
+CONFIG_NFS_COMMON=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V2 is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFTL is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+# CONFIG_NF_CONNTRACK_RTSP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_GRE is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_NAT is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_IPV4=m
+# CONFIG_NF_NAT_IPV6 is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_NEEDED is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
+# CONFIG_NF_NAT_RTSP is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_NIU is not set
+CONFIG_NLATTR=y
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
+# CONFIG_NLS is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_NO_BOOTMEM is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_NTP_PPS is not set
+# CONFIG_NVRAM is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
+# CONFIG_N_GSM is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OBS600 is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_KIRKWOOD is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_UBSEC_SSB is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OF_SELFTEST is not set
+# CONFIG_OMAP_OCP2SCP is not set
+# CONFIG_OMAP_USB2 is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_ORION_WATCHDOG is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_OVERLAYFS_FS=y
+# CONFIG_P54_COMMON is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PANEL is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_1284 is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OF_PLATFORM is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PCMCIA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PC300TOO is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
+# CONFIG_PCI_HERMES is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_PCI_PRI is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCMCIA is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_AXNET is not set
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_HERMES is not set
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_SPECTRUM is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_XIRCOM is not set
+# CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PD6729 is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_PID_NS is not set
+# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_EXYNOS is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_PLIP is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PM is not set
+# CONFIG_PMBUS is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_DEVFREQ is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_POWERTV is not set
+# CONFIG_POWER_AVS is not set
+# CONFIG_POWER_RESET is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PPC4xx_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_PPP is not set
+# CONFIG_PPPOATM is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_FILTER=y
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPS is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_PARPORT is not set
+# CONFIG_PPS_DEBUG is not set
+# CONFIG_PPTP is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_PRINTK=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
+# CONFIG_PROC_DEVICETREE is not set
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_STRIPPED=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILING is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_PSB6970_PHY is not set
+# CONFIG_PSTORE is not set
+# CONFIG_PTP_1588_CLOCK is not set
+# CONFIG_PTP_1588_CLOCK_IXP46X is not set
+# CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_PWM is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_R3964 is not set
+# CONFIG_R6040 is not set
+# CONFIG_R8169 is not set
+# CONFIG_R8187SE is not set
+# CONFIG_R8712U is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RAPIDIO is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_RCU_NOCB_CPU is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RC_CORE is not set
+# CONFIG_RC_MAP is not set
+# CONFIG_RDS is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_REDWOOD is not set
+# CONFIG_REGMAP is not set
+# CONFIG_REGMAP_I2C is not set
+# CONFIG_REGMAP_SPI is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_RELAY is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_ROSE is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RT2X00 is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_EP93XX is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_GENERIC is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_PS3 is not set
+# CONFIG_RTC_DRV_PT7C4338 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTL8306_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
+# CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
+# CONFIG_RTL8367B_PHY is not set
+# CONFIG_RTL8367_PHY is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_RTS_PSTOR is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_RUNTIME_DEBUG is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_S2IO is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_FSL is not set
+# CONFIG_SATA_HIGHBANK is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SB105X is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_SBE_2T3E3 is not set
+# CONFIG_SBYPASS is not set
+# CONFIG_SC92031 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCC is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHED_MC is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_SCHED_SMT is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_ISCI is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_LPFC is not set
+CONFIG_SCSI_MOD=y
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PROC_FS=y
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SDIO_UART is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SEEQ8005 is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_ACPI_POWER is not set
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AK8975 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FAM15H_POWER is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_GSC is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HMC5843 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_K10TEMP is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VIA_CPUTEMP is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_ACCENT is not set
+# CONFIG_SERIAL_8250_BOCA is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_FOURPORT is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_PCI is not set
+# CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_SYSRQ is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SFC is not set
+# CONFIG_SFI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SGI_PARTITION is not set
+CONFIG_SHMEM=y
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIGMA is not set
+CONFIG_SIGNALFD=y
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLHC is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SMARTJOYPLUS_FF is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC9194 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_SND is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FIREWIRE is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_HWDEP is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_MIPS is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_OXYGEN is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_PCM is not set
+# CONFIG_SND_PCMCIA is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_POWERPC_SOC is not set
+# CONFIG_SND_PPC is not set
+# CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SOC_AU1XAUDIO is not set
+# CONFIG_SND_SOC_AU1XPSC is not set
+# CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TIMER is not set
+# CONFIG_SND_TRIDENT is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_SOLO6X10 is not set
+# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_SOUND is not set
+# CONFIG_SOUND_PRIME is not set
+# CONFIG_SP5100_TCO is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+# CONFIG_SPARSE_IRQ is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_SPEAKUP is not set
+# CONFIG_SPI is not set
+# CONFIG_SPINLOCK_TEST is not set
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_ESPI is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PPC4xx is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_RAMIPS is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZLIB is not set
+# CONFIG_SSB is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSFDC is not set
+CONFIG_STACKTRACE_SUPPORT=y
+# CONFIG_STACK_TRACER is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
+CONFIG_STANDALONE=y
+CONFIG_STDBINUTILS=y
+# CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_STMMAC_ETH is not set
+CONFIG_STP=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_SUSPEND is not set
+CONFIG_SWAP=y
+# CONFIG_SWCONFIG is not set
+# CONFIG_SWCONFIG_LEDS is not set
+# CONFIG_SYNCLINK_CS is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_SYSCTL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TC35815 is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TCIC is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_POWER is not set
+CONFIG_TEXTSEARCH=y
+# CONFIG_TEXTSEARCH_BM is not set
+# CONFIG_TEXTSEARCH_FSM is not set
+# CONFIG_TEXTSEARCH_KMP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_TIFM_CORE is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_TIMB_DMA is not set
+CONFIG_TIMERFD=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_TINY_RCU=y
+# CONFIG_TIPC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_TI_ST is not set
+# CONFIG_TLAN is not set
+# CONFIG_TMD_HERMES is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_XATTR=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TR is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_TRACE_SINK is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_TRAD_SIGNALS=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2x7x is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_TYPHOON is not set
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UDF_NLS=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_UFS_FS is not set
+# CONFIG_UHID is not set
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
+# CONFIG_UIO is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_UNIX=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_ALI_M5632=y
+# CONFIG_USB_AMD5536UDC is not set
+CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATM is not set
+CONFIG_USB_BELKIN=y
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC_OTG_LPM is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_USB_EZUSB=y
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_JL2005BCD is not set
+# CONFIG_USB_GSPCA_KINECT is not set
+# CONFIG_USB_GSPCA_KONICA is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_NW80X is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SE401 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_SQ930X is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TOPRO is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_VICAM is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDCETHER is not set
+# CONFIG_USB_NET_CDC_EEM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PCI is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RCAR_PHY is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_S2255 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_METRO is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_ZTE is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USB_XHCI_HCD is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_USE_OF is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VETH is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VGA_ARB is not set
+# CONFIG_VGA_SWITCHEROO is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_IR_I2C is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTUALIZATION is not set
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_VITESSE_PHY is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_VMSPLIT_1G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMWARE_PVSCSI is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VORTEX is not set
+# CONFIG_VT is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_VXGE is not set
+# CONFIG_VXLAN is not set
+# CONFIG_W1 is not set
+# CONFIG_W1_CON is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_WAN is not set
+# CONFIG_WANXL is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_WDTPCI is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+# CONFIG_WIMAX is not set
+# CONFIG_WIMAX_GDM72XX is not set
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+CONFIG_WLAN=y
+# CONFIG_WL_TI is not set
+# CONFIG_WR_PPMC is not set
+# CONFIG_X25 is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_IPCOMP is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XILINX_AXI_EMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_XMON is not set
+# CONFIG_XVMALLOC is not set
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_BCJ is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_YAM is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_YENTA is not set
+# CONFIG_YENTA_O2 is not set
+# CONFIG_YENTA_RICOH is not set
+# CONFIG_YENTA_TI is not set
+# CONFIG_YENTA_TOSHIBA is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_ZLIB_DEFLATE is not set
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZNET is not set
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
+# CONFIG_ZRAM is not set
+# CONFIG_ZSMALLOC is not set
diff --git a/trunk/target/linux/generic/files/Documentation/networking/adm6996.txt b/trunk/target/linux/generic/files/Documentation/networking/adm6996.txt
new file mode 100644
index 00000000..ab59f1df
--- /dev/null
+++ b/trunk/target/linux/generic/files/Documentation/networking/adm6996.txt
@@ -0,0 +1,110 @@
+------- 
+
+ADM6996FC / ADM6996M switch chip driver
+
+
+1. General information
+
+  This driver supports the FC and M models only. The ADM6996F and L are
+  completely different chips.
+  
+  Support for the FC model is extremely limited at the moment. There is no VLAN
+  support as of yet. The driver will not offer an swconfig interface for the FC
+  chip.
+ 
+1.1 VLAN IDs
+
+  It is possible to define 16 different VLANs. Every VLAN has an identifier, its
+  VLAN ID. It is easiest if you use at most VLAN IDs 0-15. In that case, the
+  swconfig based configuration is very straightforward. To define two VLANs with
+  IDs 4 and 5, you can invoke, for example:
+  
+      # swconfig dev ethX vlan 4 set ports '0 1t 2 5t' 
+      # swconfig dev ethX vlan 5 set ports '0t 1t 5t'
+  
+  The swconfig framework will automatically invoke 'port Y set pvid Z' for every
+  port that is an untagged member of VLAN Y, setting its Primary VLAN ID. In
+  this example, ports 0 and 2 would get "pvid 4". The Primary VLAN ID of a port
+  is the VLAN ID associated with untagged packets coming in on that port.
+  
+  But if you wish to use VLAN IDs outside the range 0-15, this automatic
+  behaviour of the swconfig framework becomes a problem. The 16 VLANs that
+  swconfig can configure on the ADM6996 also have a "vid" setting. By default,
+  this is the same as the number of the VLAN entry, to make the simple behaviour
+  above possible. To still support a VLAN with a VLAN ID higher than 15
+  (presumably because you are in a network where such VLAN IDs are already in
+  use), you can change the "vid" setting of the VLAN to anything in the range
+  0-1023. But suppose you did the following:
+  
+      # swconfig dev ethX vlan 0 set vid 998 
+      # swconfig dev ethX vlan 0 set ports '0 2 5t'
+ 
+  Now the swconfig framework will issue 'port 0 set pvid 0' and 'port 2 set pvid
+  0'. But the "pvid" should be set to 998, so you are responsible for manually
+  fixing this!
+
+1.2 VLAN filtering
+
+  The switch is configured to apply source port filtering. This means that
+  packets are only accepted when the port the packets came in on is a member of
+  the VLAN the packet should go to.
+
+  Only membership of a VLAN is tested, it does not matter whether it is a tagged
+  or untagged membership.
+
+  For untagged packets, the destination VLAN is the Primary VLAN ID of the
+  incoming port. So if the PVID of a port is 0, but that port is not a member of
+  the VLAN with ID 0, this means that untagged packets on that port are dropped.
+  This can be used as a roundabout way of dropping untagged packets from a port,
+  a mode often referred to as "Admit only tagged packets".
+
+1.3 Reset
+
+  The two supported chip models do not have a sofware-initiated reset. When the
+  driver is initialised, as well as when the 'reset' swconfig option is invoked,
+  the driver will set those registers it knows about and supports to the correct
+  default value. But there are a lot of registers in the chip that the driver
+  does not support. If something changed those registers, invoking 'reset' or
+  performing a warm reboot might still leave the chip in a "broken" state. Only
+  a hardware reset will bring it back in the default state.
+
+2. Technical details on PHYs and the ADM6996
+
+  From the viewpoint of the Linux kernel, it is common that an Ethernet adapter
+  can be seen as a separate MAC entity and a separate PHY entity. The PHY entity
+  can be queried and set through registers accessible via an MDIO bus. A PHY
+  normally has a single address on that bus, in the range 0 through 31.
+
+  The ADM6996 has special-purpose registers in the range of PHYs 0 through 10.
+  Even though all these registers control a single ADM6996 chip, the Linux
+  kernel treats this as 11 separate PHYs.  The driver will bind to these
+  addresses to prevent a different PHY driver from binding and corrupting these
+  registers.
+
+  What Linux sees as the PHY on address 0 is meant for the Ethernet MAC
+  connected to the CPU port of the ADM6996 switch chip (port 5). This is the
+  Ethernet MAC you will use to send and receive data through the switch.
+
+  The PHYs at addresses 16 through 20 map to the PHYs on ports 0 through 4 of
+  the switch chip. These can be accessed with the Generic PHY driver, as the
+  registers have the common layout.
+
+  If a second Ethernet MAC on your board is wired to the port 4 PHY, that MAC
+  needs to bind to PHY address 20 for the port to work correctly.
+
+  The ADM6996 switch driver will reset the ports 0 through 3 on startup and when
+  'reset' is invoked. This could clash with a different PHY driver if the kernel
+  binds a PHY driver to address 16 through 19.
+
+  If Linux binds a PHY on addresses 1 through 10 to an Ethernet MAC, the ADM6996
+  driver will simply always report a connected 100 Mbit/s full-duplex link for
+  that PHY, and provide no other functionality. This is most likely not what you
+  want. So if you see a message in your log
+
+  	ethX: PHY overlaps ADM6996, providing fixed PHY yy.
+
+  This is most likely an indication that ethX will not work properly, and your
+  kernel needs to be configured to attach a different PHY to that Ethernet MAC.
+
+  Controlling the mapping between MACs and PHYs is usually done in platform- or
+  board-specific fixup code. The ADM6996 driver has no influence over this.
diff --git a/trunk/target/linux/generic/files/arch/mips/fw/myloader/Makefile b/trunk/target/linux/generic/files/arch/mips/fw/myloader/Makefile
new file mode 100644
index 00000000..34acfd01
--- /dev/null
+++ b/trunk/target/linux/generic/files/arch/mips/fw/myloader/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Compex's MyLoader support on MIPS architecture
+#
+
+lib-y += myloader.o
diff --git a/trunk/target/linux/generic/files/arch/mips/fw/myloader/myloader.c b/trunk/target/linux/generic/files/arch/mips/fw/myloader/myloader.c
new file mode 100644
index 00000000..a26f9ad3
--- /dev/null
+++ b/trunk/target/linux/generic/files/arch/mips/fw/myloader/myloader.c
@@ -0,0 +1,63 @@
+/*
+ *  Compex's MyLoader specific prom routines
+ *
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/string.h>
+
+#include <asm/addrspace.h>
+#include <asm/fw/myloader/myloader.h>
+
+#define SYS_PARAMS_ADDR		KSEG1ADDR(0x80000800)
+#define BOARD_PARAMS_ADDR	KSEG1ADDR(0x80000A00)
+#define PART_TABLE_ADDR		KSEG1ADDR(0x80000C00)
+#define BOOT_PARAMS_ADDR	KSEG1ADDR(0x80000E00)
+
+static struct myloader_info myloader_info __initdata;
+static int myloader_found __initdata;
+
+struct myloader_info * __init myloader_get_info(void)
+{
+	struct mylo_system_params *sysp;
+	struct mylo_board_params *boardp;
+	struct mylo_partition_table *parts;
+
+	if (myloader_found)
+		return &myloader_info;
+
+	sysp = (struct mylo_system_params *)(SYS_PARAMS_ADDR);
+	boardp = (struct mylo_board_params *)(BOARD_PARAMS_ADDR);
+	parts = (struct mylo_partition_table *)(PART_TABLE_ADDR);
+
+	printk(KERN_DEBUG "MyLoader: sysp=%08x, boardp=%08x, parts=%08x\n",
+		sysp->magic, boardp->magic, parts->magic);
+
+	/* Check for some magic numbers */
+	if (sysp->magic != MYLO_MAGIC_SYS_PARAMS ||
+	    boardp->magic != MYLO_MAGIC_BOARD_PARAMS ||
+	    le32_to_cpu(parts->magic) != MYLO_MAGIC_PARTITIONS)
+		return NULL;
+
+	printk(KERN_DEBUG "MyLoader: id=%04x:%04x, sub_id=%04x:%04x\n",
+		sysp->vid, sysp->did, sysp->svid, sysp->sdid);
+
+	myloader_info.vid = sysp->vid;
+	myloader_info.did = sysp->did;
+	myloader_info.svid = sysp->svid;
+	myloader_info.sdid = sysp->sdid;
+
+	memcpy(myloader_info.macs, boardp->addr, sizeof(myloader_info.macs));
+
+	myloader_found = 1;
+
+	return &myloader_info;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/Config.in b/trunk/target/linux/generic/files/crypto/ocf/Config.in
new file mode 100644
index 00000000..652f76e9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/Config.in
@@ -0,0 +1,38 @@
+#############################################################################
+
+mainmenu_option next_comment
+comment 'OCF Configuration'
+tristate 'OCF (Open Cryptograhic Framework)' CONFIG_OCF_OCF
+dep_mbool '  enable fips RNG checks (fips check on RNG data before use)' \
+				CONFIG_OCF_FIPS $CONFIG_OCF_OCF
+dep_mbool '  enable harvesting entropy for /dev/random' \
+				CONFIG_OCF_RANDOMHARVEST $CONFIG_OCF_OCF
+dep_tristate '  cryptodev (user space support)' \
+				CONFIG_OCF_CRYPTODEV $CONFIG_OCF_OCF
+dep_tristate '  cryptosoft (software crypto engine)' \
+				CONFIG_OCF_CRYPTOSOFT $CONFIG_OCF_OCF
+dep_tristate '  safenet (HW crypto engine)' \
+				CONFIG_OCF_SAFE $CONFIG_OCF_OCF
+dep_tristate '  IXP4xx (HW crypto engine)' \
+				CONFIG_OCF_IXP4XX $CONFIG_OCF_OCF
+dep_mbool    '  Enable IXP4xx HW to perform SHA1 and MD5 hashing (very slow)' \
+				CONFIG_OCF_IXP4XX_SHA1_MD5 $CONFIG_OCF_IXP4XX
+dep_tristate '  hifn (HW crypto engine)' \
+				CONFIG_OCF_HIFN $CONFIG_OCF_OCF
+dep_tristate '  talitos (HW crypto engine)' \
+				CONFIG_OCF_TALITOS $CONFIG_OCF_OCF
+dep_tristate '  pasemi (HW crypto engine)' \
+				CONFIG_OCF_PASEMI $CONFIG_OCF_OCF
+dep_tristate '  ep80579 (HW crypto engine)' \
+				CONFIG_OCF_EP80579 $CONFIG_OCF_OCF
+dep_tristate '  Micronas c7108 (HW crypto engine)' \
+				CONFIG_OCF_C7108 $CONFIG_OCF_OCF
+dep_tristate '  uBsec BCM5365 (HW crypto engine)'
+				CONFIG_OCF_UBSEC_SSB $CONFIG_OCF_OCF
+dep_tristate '  ocfnull (does no crypto)' \
+				CONFIG_OCF_OCFNULL $CONFIG_OCF_OCF
+dep_tristate '  ocf-bench (HW crypto in-kernel benchmark)' \
+				CONFIG_OCF_BENCH $CONFIG_OCF_OCF
+endmenu
+
+#############################################################################
diff --git a/trunk/target/linux/generic/files/crypto/ocf/Kconfig b/trunk/target/linux/generic/files/crypto/ocf/Kconfig
new file mode 100644
index 00000000..3b3e1d17
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/Kconfig
@@ -0,0 +1,128 @@
+menu "OCF Configuration"
+
+config OCF_OCF
+	tristate "OCF (Open Cryptograhic Framework)"
+	help
+	  A linux port of the OpenBSD/FreeBSD crypto framework.
+
+config OCF_RANDOMHARVEST
+	bool "crypto random --- harvest entropy for /dev/random"
+	depends on OCF_OCF
+	help
+	  Includes code to harvest random numbers from devices that support it.
+
+config OCF_FIPS
+	bool "enable fips RNG checks"
+	depends on OCF_OCF && OCF_RANDOMHARVEST
+	help
+	  Run all RNG provided data through a fips check before
+	  adding it /dev/random's entropy pool.
+
+config OCF_CRYPTODEV
+	tristate "cryptodev (user space support)"
+	depends on OCF_OCF
+	help
+	  The user space API to access crypto hardware.
+
+config OCF_CRYPTOSOFT
+	tristate "cryptosoft (software crypto engine)"
+	depends on OCF_OCF
+	select CRYPTO
+	select CRYPTO_HASH
+	select CRYPTO_BLKCIPHER
+	help
+	  A software driver for the OCF framework that uses
+	  the kernel CryptoAPI.
+
+config OCF_SAFE
+	tristate "safenet (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  A driver for a number of the safenet Excel crypto accelerators.
+	  Currently tested and working on the 1141 and 1741.
+
+config OCF_IXP4XX
+	tristate "IXP4xx (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  XScale IXP4xx crypto accelerator driver.  Requires the
+	  Intel Access library.
+
+config OCF_IXP4XX_SHA1_MD5
+	bool "IXP4xx SHA1 and MD5 Hashing"
+	depends on OCF_IXP4XX
+	help
+	  Allows the IXP4xx crypto accelerator to perform SHA1 and MD5 hashing.
+	  Note: this is MUCH slower than using cryptosoft (software crypto engine).
+
+config OCF_HIFN
+	tristate "hifn (HW crypto engine)"
+	depends on OCF_OCF && PCI
+	help
+	  OCF driver for various HIFN based crypto accelerators.
+	  (7951, 7955, 7956, 7751, 7811)
+
+config OCF_HIFNHIPP
+	tristate "Hifn HIPP (HW packet crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for various HIFN (HIPP) based crypto accelerators
+	  (7855)
+
+config OCF_TALITOS
+	tristate "talitos (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for Freescale's security engine (SEC/talitos).
+
+config OCF_PASEMI
+	tristate "pasemi (HW crypto engine)"
+	depends on OCF_OCF && PPC_PASEMI
+	help
+	  OCF driver for the PA Semi PWRficient DMA Engine
+
+config OCF_EP80579
+	tristate "ep80579 (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for the Intel EP80579 Integrated Processor Product Line.
+
+config OCF_CRYPTOCTEON
+	tristate "cryptocteon (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for the Cavium OCTEON Processors.
+
+config OCF_KIRKWOOD
+	tristate "kirkwood (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for the Marvell Kirkwood (88F6xxx) Processors.
+
+config OCF_C7108
+	tristate "Micronas 7108 (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for the Microna 7108 Cipher processors.
+
+config OCF_UBSEC_SSB
+	tristate "uBsec BCM5365 (HW crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for uBsec BCM5365 hardware crypto accelerator.
+
+config OCF_OCFNULL
+	tristate "ocfnull (fake crypto engine)"
+	depends on OCF_OCF
+	help
+	  OCF driver for measuring ipsec overheads (does no crypto)
+
+config OCF_BENCH
+	tristate "ocf-bench (HW crypto in-kernel benchmark)"
+	depends on OCF_OCF
+	help
+	  A very simple encryption test for the in-kernel interface
+	  of OCF.  Also includes code to benchmark the IXP Access library
+	  for comparison.
+
+endmenu
diff --git a/trunk/target/linux/generic/files/crypto/ocf/Makefile b/trunk/target/linux/generic/files/crypto/ocf/Makefile
new file mode 100644
index 00000000..110ed83e
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/Makefile
@@ -0,0 +1,148 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+OCF_OBJS = crypto.o criov.o
+
+ifdef CONFIG_OCF_RANDOMHARVEST
+	OCF_OBJS += random.o
+endif
+
+ifdef CONFIG_OCF_FIPS
+	OCF_OBJS += rndtest.o
+endif
+
+# Add in autoconf.h to get #defines for CONFIG_xxx
+AUTOCONF_H=$(ROOTDIR)/modules/autoconf.h
+ifeq ($(AUTOCONF_H), $(wildcard $(AUTOCONF_H)))
+	EXTRA_CFLAGS += -include $(AUTOCONF_H)
+	export EXTRA_CFLAGS
+endif
+
+ifndef obj
+	obj ?= .
+	_obj = subdir
+	mod-subdirs := safe hifn ixp4xx talitos ocfnull
+	export-objs += crypto.o criov.o random.o
+	list-multi += ocf.o
+	_slash :=
+else
+	_obj = obj
+	_slash := /
+endif
+
+EXTRA_CFLAGS += -I$(obj)/.
+
+obj-$(CONFIG_OCF_OCF)         += ocf.o
+obj-$(CONFIG_OCF_CRYPTODEV)   += cryptodev.o
+obj-$(CONFIG_OCF_CRYPTOSOFT)  += cryptosoft.o
+obj-$(CONFIG_OCF_BENCH)       += ocf-bench.o
+
+$(_obj)-$(CONFIG_OCF_SAFE)    += safe$(_slash)
+$(_obj)-$(CONFIG_OCF_HIFN)    += hifn$(_slash)
+$(_obj)-$(CONFIG_OCF_IXP4XX)  += ixp4xx$(_slash)
+$(_obj)-$(CONFIG_OCF_TALITOS) += talitos$(_slash)
+$(_obj)-$(CONFIG_OCF_PASEMI)  += pasemi$(_slash)
+$(_obj)-$(CONFIG_OCF_EP80579) += ep80579$(_slash)
+$(_obj)-$(CONFIG_OCF_CRYPTOCTEON) += cryptocteon$(_slash)
+$(_obj)-$(CONFIG_OCF_KIRKWOOD) += kirkwood$(_slash)
+$(_obj)-$(CONFIG_OCF_OCFNULL) += ocfnull$(_slash)
+$(_obj)-$(CONFIG_OCF_C7108) += c7108$(_slash)
+$(_obj)-$(CONFIG_OCF_UBSEC_SSB) += ubsec_ssb$(_slash)
+
+ocf-objs := $(OCF_OBJS)
+
+dummy:
+	@echo "Please consult the README for how to build OCF."
+	@echo "If you can't wait then the following should do it:"
+	@echo ""
+	@echo "    make ocf_modules"
+	@echo "    sudo make ocf_install"
+	@echo ""
+	@exit 1
+	
+$(list-multi) dummy1: $(ocf-objs)
+	$(LD) -r -o $@ $(ocf-objs)
+
+.PHONY:
+clean:
+	rm -f *.o *.ko .*.o.flags .*.ko.cmd .*.o.cmd .*.mod.o.cmd *.mod.c
+	rm -f */*.o */*.ko */.*.o.cmd */.*.ko.cmd */.*.mod.o.cmd */*.mod.c */.*.o.flags
+	rm -f */modules.order */modules.builtin modules.order modules.builtin
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
+#
+# targets to build easily on the current machine
+#
+
+ocf_make:
+	make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m
+	make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_CRYPTOSOFT=m
+	-make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_BENCH=m
+	-make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_OCFNULL=m
+	-make -C /lib/modules/$(shell uname -r)/build M=`pwd` $(OCF_TARGET) CONFIG_OCF_OCF=m CONFIG_OCF_HIFN=m
+
+ocf_modules:
+	$(MAKE) ocf_make OCF_TARGET=modules
+
+ocf_install:
+	$(MAKE) ocf_make OCF_TARGET="modules modules_install"
+	depmod
+	mkdir -p /usr/include/crypto
+	cp cryptodev.h /usr/include/crypto/.
+
+#
+# generate full kernel patches for 2.4 and 2.6 kernels to make patching
+# your kernel easier
+#
+
+.PHONY: patch
+patch:
+	patchbase=.; \
+		[ -d $$patchbase/patches ] || patchbase=..; \
+		patch=ocf-linux-base.patch; \
+		patch24=ocf-linux-24.patch; \
+		patch26=ocf-linux-26.patch; \
+		patch3=ocf-linux-3.patch; \
+		( \
+			find . -name Makefile; \
+			find . -name Config.in; \
+			find . -name Kconfig; \
+			find . -name README; \
+			find . -name '*.[ch]' | grep -v '.mod.c'; \
+		) | while read t; do \
+			diff -Nau /dev/null $$t | sed 's?^+++ \./?+++ linux/crypto/ocf/?'; \
+		done > $$patch; \
+		cat $$patchbase/patches/linux-2.4.35-ocf.patch $$patch > $$patch24; \
+		cat $$patchbase/patches/linux-2.6.38-ocf.patch $$patch > $$patch26; \
+		cat $$patchbase/patches/linux-3.2.1-ocf.patch $$patch > $$patch3; \
+
+
+#
+# this target probably does nothing for anyone but me - davidm
+#
+
+.PHONY: release
+release:
+	REL=`date +%Y%m%d`; RELDIR=/tmp/ocf-linux-$$REL; \
+		CURDIR=`pwd`; \
+		rm -rf /tmp/ocf-linux-$$REL*; \
+		mkdir -p $$RELDIR/ocf; \
+		mkdir -p $$RELDIR/patches; \
+		mkdir -p $$RELDIR/crypto-tools; \
+		cp README* $$RELDIR/.; \
+		cp patches/[!C]* $$RELDIR/patches/.; \
+		cp tools/[!C]* $$RELDIR/crypto-tools/.; \
+		cp -r [!C]* Config.in $$RELDIR/ocf/.; \
+		rm -rf $$RELDIR/ocf/patches $$RELDIR/ocf/tools; \
+		rm -f $$RELDIR/ocf/README*; \
+		cp $$CURDIR/../../user/crypto-tools/[!C]* $$RELDIR/crypto-tools/.; \
+		make -C $$RELDIR/crypto-tools clean; \
+		make -C $$RELDIR/ocf clean; \
+		find $$RELDIR/ocf -name CVS | xargs rm -rf; \
+		cd $$RELDIR/..; \
+		tar cvf ocf-linux-$$REL.tar ocf-linux-$$REL; \
+		gzip -9 ocf-linux-$$REL.tar
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/c7108/Makefile b/trunk/target/linux/generic/files/crypto/ocf/c7108/Makefile
new file mode 100644
index 00000000..e7e634b2
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/c7108/Makefile
@@ -0,0 +1,12 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_C7108) += aes-7108.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.c b/trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.c
new file mode 100644
index 00000000..f4841f55
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.c
@@ -0,0 +1,841 @@
+/*
+ * Copyright (C) 2006 Micronas USA
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+//#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/crypto.h>
+#include <linux/mm.h>
+#include <linux/skbuff.h>
+#include <linux/random.h>
+#include <asm/io.h>
+#include <asm/delay.h>
+//#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
+#include <linux/dma-mapping.h>
+#include <linux/highmem.h>
+#include <cryptodev.h>
+#include <uio.h>
+#include <aes-7108.h>
+
+/* Runtime mode */
+static int c7108_crypto_mode = C7108_AES_CTRL_MODE_CTR;
+//static int c7108_crypto_mode = C7108_AES_CTRL_MODE_CBC;
+
+static int32_t c7108_id = -1;
+static struct cipher_7108 **c7108_sessions = NULL;
+static u_int32_t c7108_sesnum = 0;
+static unsigned long iobar;
+
+/* Crypto entry points */
+static	int c7108_process(void *, struct cryptop *, int);
+static	int c7108_newsession(void *, u_int32_t *, struct cryptoini *);
+static	int c7108_freesession(void *, u_int64_t);
+
+/* Globals */
+static int debug = 0;
+static spinlock_t csr_mutex;
+
+/* Generic controller-based lock */
+#define AES_LOCK()\
+          spin_lock(&csr_mutex)
+#define AES_UNLOCK()\
+          spin_unlock(&csr_mutex)
+
+/* 7108 AES register access */
+#define c7108_reg_wr8(a,d)   iowrite8(d, (void*)(iobar+(a)))
+#define c7108_reg_wr16(a,d)  iowrite16(d, (void*)(iobar+(a)))
+#define c7108_reg_wr32(a,d)  iowrite32(d, (void*)(iobar+(a)))
+#define c7108_reg_rd8(a)     ioread8((void*)(iobar+(a)))
+#define c7108_reg_rd16(a)    ioread16((void*)(iobar+(a)))
+#define c7108_reg_rd32(a)    ioread32((void*)(iobar+(a)))
+
+static int 
+c7108_xlate_key(int klen, u8* k8ptr, u32* k32ptr)
+{
+        int i, nw=0;
+	nw = ((klen >= 256) ? 8 : (klen >= 192) ? 6 : 4);
+	for ( i = 0; i < nw; i++) { 
+	    k32ptr[i] =    (k8ptr[i+3] << 24) | (k8ptr[i+2] << 16) | 
+		           (k8ptr[i+1] << 8)  | k8ptr[i];
+	    
+	}
+	return 0;
+}
+
+static int 
+c7108_cache_key(int klen, u32* k32ptr, u8* k8ptr)
+{
+        int i, nb=0;
+	u8* ptr = (u8*)k32ptr;
+	nb = ((klen >= 256) ? 32 : (klen >= 192) ? 24 : 16);
+	for ( i = 0; i < nb; i++)
+	    k8ptr[i] = ptr[i];
+	return 0;
+}
+
+static int
+c7108_aes_setup_dma(u32 src, u32 dst, u32 len)
+{
+        if (len < 16) {
+	    printk("len < 16\n");
+	    return -10;
+	}
+	if (len % 16) {
+	    printk("len not multiple of 16\n");
+	    return -11;
+	}	
+	c7108_reg_wr16(C7108_AES_DMA_SRC0_LO, (u16) src);
+	c7108_reg_wr16(C7108_AES_DMA_SRC0_HI, (u16)((src & 0xffff0000) >> 16));
+	c7108_reg_wr16(C7108_AES_DMA_DST0_LO, (u16) dst);
+	c7108_reg_wr16(C7108_AES_DMA_DST0_HI, (u16)((dst & 0xffff0000) >> 16));
+	c7108_reg_wr16(C7108_AES_DMA_LEN, (u16) ((len / 16) - 1));
+
+	return 0;
+}
+
+static int
+c7108_aes_set_hw_iv(u8 iv[16])
+{
+        c7108_reg_wr16(C7108_AES_IV0_LO, (u16) ((iv[1] << 8) | iv[0]));
+	c7108_reg_wr16(C7108_AES_IV0_HI, (u16) ((iv[3] << 8) | iv[2]));
+	c7108_reg_wr16(C7108_AES_IV1_LO, (u16) ((iv[5] << 8) | iv[4]));
+	c7108_reg_wr16(C7108_AES_IV1_HI, (u16) ((iv[7] << 8) | iv[6]));
+	c7108_reg_wr16(C7108_AES_IV2_LO, (u16) ((iv[9] << 8) | iv[8]));
+	c7108_reg_wr16(C7108_AES_IV2_HI, (u16) ((iv[11] << 8) | iv[10]));
+	c7108_reg_wr16(C7108_AES_IV3_LO, (u16) ((iv[13] << 8) | iv[12]));
+	c7108_reg_wr16(C7108_AES_IV3_HI, (u16) ((iv[15] << 8) | iv[14]));
+
+    return 0;
+}
+
+static void
+c7108_aes_read_dkey(u32 * dkey)
+{
+        dkey[0] = (c7108_reg_rd16(C7108_AES_EKEY0_HI) << 16) | 
+	           c7108_reg_rd16(C7108_AES_EKEY0_LO);
+	dkey[1] = (c7108_reg_rd16(C7108_AES_EKEY1_HI) << 16) | 
+	           c7108_reg_rd16(C7108_AES_EKEY1_LO);
+	dkey[2] = (c7108_reg_rd16(C7108_AES_EKEY2_HI) << 16) | 
+	           c7108_reg_rd16(C7108_AES_EKEY2_LO);
+	dkey[3] = (c7108_reg_rd16(C7108_AES_EKEY3_HI) << 16) | 
+	           c7108_reg_rd16(C7108_AES_EKEY3_LO);
+	dkey[4] = (c7108_reg_rd16(C7108_AES_EKEY4_HI) << 16) | 
+                   c7108_reg_rd16(C7108_AES_EKEY4_LO);
+	dkey[5] = (c7108_reg_rd16(C7108_AES_EKEY5_HI) << 16) | 
+                   c7108_reg_rd16(C7108_AES_EKEY5_LO);
+	dkey[6] = (c7108_reg_rd16(C7108_AES_EKEY6_HI) << 16) | 
+                   c7108_reg_rd16(C7108_AES_EKEY6_LO);
+	dkey[7] = (c7108_reg_rd16(C7108_AES_EKEY7_HI) << 16) | 
+                   c7108_reg_rd16(C7108_AES_EKEY7_LO);
+}
+
+static int
+c7108_aes_cipher(int op,
+		 u32 dst,
+		 u32 src,
+		 u32 len,
+		 int klen,
+		 u16 mode,
+		 u32 key[8],
+		 u8 iv[16])
+{
+        int rv = 0, cnt=0;
+	u16 ctrl = 0, stat = 0;
+
+	AES_LOCK();
+
+	/* Setup key length */
+	if (klen == 128) {
+	    ctrl |= C7108_AES_KEY_LEN_128;
+	} else if (klen == 192) {
+	    ctrl |= C7108_AES_KEY_LEN_192;
+	} else if (klen == 256) {
+	    ctrl |= C7108_AES_KEY_LEN_256;
+	} else {
+	    AES_UNLOCK();
+	    return -3;
+	}
+	
+	/* Check opcode */
+	if (C7108_AES_ENCRYPT == op) {
+	    ctrl |= C7108_AES_ENCRYPT;
+	} else if (C7108_AES_DECRYPT == op) {
+	    ctrl |= C7108_AES_DECRYPT;
+	} else {
+	    AES_UNLOCK();
+	    return -4;
+	}
+	
+	/* check mode */
+	if ( (mode != C7108_AES_CTRL_MODE_CBC) &&
+	     (mode != C7108_AES_CTRL_MODE_CFB) &&
+	     (mode != C7108_AES_CTRL_MODE_OFB) &&
+	     (mode != C7108_AES_CTRL_MODE_CTR) && 
+	     (mode != C7108_AES_CTRL_MODE_ECB) ) { 
+	    AES_UNLOCK();	    
+	    return -5;
+	}
+	
+	/* Now set mode */
+	ctrl |= mode;
+	
+	/* For CFB, OFB, and CTR, neither backward key
+	 * expansion nor key inversion is required.
+	 */
+	if ( (C7108_AES_DECRYPT == op) &&  
+	     (C7108_AES_CTRL_MODE_CBC == mode ||
+	      C7108_AES_CTRL_MODE_ECB == mode ) ){ 
+
+	    /* Program Key */
+	    c7108_reg_wr16(C7108_AES_KEY0_LO, (u16) key[4]);
+	    c7108_reg_wr16(C7108_AES_KEY0_HI, (u16) (key[4] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY1_LO, (u16) key[5]);
+	    c7108_reg_wr16(C7108_AES_KEY1_HI, (u16) (key[5] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY2_LO, (u16) key[6]);
+	    c7108_reg_wr16(C7108_AES_KEY2_HI, (u16) (key[6] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY3_LO, (u16) key[7]);
+	    c7108_reg_wr16(C7108_AES_KEY3_HI, (u16) (key[7] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY6_LO, (u16) key[2]);
+	    c7108_reg_wr16(C7108_AES_KEY6_HI, (u16) (key[2] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY7_LO, (u16) key[3]);
+	    c7108_reg_wr16(C7108_AES_KEY7_HI, (u16) (key[3] >> 16));
+	    
+	    
+	    if (192 == klen) { 
+		c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[7]);
+		c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[7] >> 16));
+		c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[7]);
+		c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[7] >> 16));
+		
+	    } else if (256 == klen) {
+		/* 256 */
+		c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[0]);
+		c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[0] >> 16));
+		c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[1]);
+		c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[1] >> 16));
+		
+	    }
+	    
+	} else { 
+	    /* Program Key */
+	    c7108_reg_wr16(C7108_AES_KEY0_LO, (u16) key[0]);
+	    c7108_reg_wr16(C7108_AES_KEY0_HI, (u16) (key[0] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY1_LO, (u16) key[1]);
+	    c7108_reg_wr16(C7108_AES_KEY1_HI, (u16) (key[1] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY2_LO, (u16) key[2]);
+	    c7108_reg_wr16(C7108_AES_KEY2_HI, (u16) (key[2] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY3_LO, (u16) key[3]);
+	    c7108_reg_wr16(C7108_AES_KEY3_HI, (u16) (key[3] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[4]);
+	    c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[4] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[5]);
+	    c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[5] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY6_LO, (u16) key[6]);
+	    c7108_reg_wr16(C7108_AES_KEY6_HI, (u16) (key[6] >> 16));
+	    c7108_reg_wr16(C7108_AES_KEY7_LO, (u16) key[7]);
+	    c7108_reg_wr16(C7108_AES_KEY7_HI, (u16) (key[7] >> 16));
+	    
+	}
+	
+	/* Set IV always */
+	c7108_aes_set_hw_iv(iv);
+	
+	/* Program DMA addresses */
+	if ((rv = c7108_aes_setup_dma(src, dst, len)) < 0) { 
+	    AES_UNLOCK();
+	    return rv;
+	}
+
+	
+	/* Start AES cipher */
+	c7108_reg_wr16(C7108_AES_CTRL, ctrl | C7108_AES_GO);
+	
+	//printk("Ctrl: 0x%x\n", ctrl | C7108_AES_GO);
+	do {
+	    /* TODO: interrupt mode */
+	    //        printk("aes_stat=0x%x\n", stat);
+	    //udelay(100);
+	} while ((cnt++ < 1000000) && 
+		 !((stat=c7108_reg_rd16(C7108_AES_CTRL))&C7108_AES_OP_DONE));
+
+
+	if ((mode == C7108_AES_CTRL_MODE_ECB)||
+	    (mode == C7108_AES_CTRL_MODE_CBC)) { 
+	    /* Save out key when the lock is held ... */
+	    c7108_aes_read_dkey(key);
+	}
+	
+	AES_UNLOCK();
+	return 0;
+	
+}
+
+/*
+ * Generate a new crypto device session.
+ */
+static int
+c7108_newsession(void *arg, u_int32_t *sid, struct cryptoini *cri)
+{
+	struct cipher_7108 **swd;
+	u_int32_t i;
+	char *algo;
+	int mode, xfm_type;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid == NULL || cri == NULL) {
+		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	if (c7108_sessions) {
+		for (i = 1; i < c7108_sesnum; i++)
+			if (c7108_sessions[i] == NULL)
+				break;
+	} else
+		i = 1;		/* NB: to silence compiler warning */
+
+	if (c7108_sessions == NULL || i == c7108_sesnum) {
+	    if (c7108_sessions == NULL) {
+		i = 1; /* We leave c7108_sessions[0] empty */
+		c7108_sesnum = CRYPTO_SW_SESSIONS;
+	    } else
+		c7108_sesnum *= 2;
+	    
+	    swd = kmalloc(c7108_sesnum * sizeof(struct cipher_7108 *), 
+			  GFP_ATOMIC);
+	    if (swd == NULL) {
+		/* Reset session number */
+		if (c7108_sesnum == CRYPTO_SW_SESSIONS)
+		    c7108_sesnum = 0;
+		else
+		    c7108_sesnum /= 2;
+		dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+		return ENOBUFS;
+	    }
+	    memset(swd, 0, c7108_sesnum * sizeof(struct cipher_7108 *));
+	    
+	    /* Copy existing sessions */
+	    if (c7108_sessions) {
+		memcpy(swd, c7108_sessions,
+		       (c7108_sesnum / 2) * sizeof(struct cipher_7108 *));
+		kfree(c7108_sessions);
+	    }
+	    
+	    c7108_sessions = swd;
+
+	}
+	
+	swd = &c7108_sessions[i];
+	*sid = i;
+
+	while (cri) {
+		*swd = (struct cipher_7108 *) 
+		    kmalloc(sizeof(struct cipher_7108), GFP_ATOMIC);
+		if (*swd == NULL) {
+		    c7108_freesession(NULL, i);
+		    dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		    return ENOBUFS;
+		}
+		memset(*swd, 0, sizeof(struct cipher_7108));
+
+		algo = NULL;
+		mode = 0;
+		xfm_type = HW_TYPE_CIPHER;
+
+		switch (cri->cri_alg) {
+
+		case CRYPTO_AES_CBC:
+			algo = "aes";
+			mode = CRYPTO_TFM_MODE_CBC;
+			c7108_crypto_mode = C7108_AES_CTRL_MODE_CBC;
+			break;
+#if 0
+		case CRYPTO_AES_CTR:
+			algo = "aes_ctr";
+			mode = CRYPTO_TFM_MODE_CBC;
+			c7108_crypto_mode = C7108_AES_CTRL_MODE_CTR;
+			break;
+		case CRYPTO_AES_ECB:
+			algo = "aes_ecb";
+			mode = CRYPTO_TFM_MODE_CBC;
+			c7108_crypto_mode = C7108_AES_CTRL_MODE_ECB;
+			break;
+		case CRYPTO_AES_OFB:
+			algo = "aes_ofb";
+			mode = CRYPTO_TFM_MODE_CBC;
+			c7108_crypto_mode = C7108_AES_CTRL_MODE_OFB;
+			break;
+		case CRYPTO_AES_CFB:
+			algo = "aes_cfb";
+			mode = CRYPTO_TFM_MODE_CBC;
+			c7108_crypto_mode = C7108_AES_CTRL_MODE_CFB;
+			break;
+#endif
+		default:
+		        printk("unsupported crypto algorithm: %d\n", 
+			       cri->cri_alg);
+			return -EINVAL;
+			break;
+		}
+
+
+		if (!algo || !*algo) {
+		    printk("cypher_7108_crypto: Unknown algo 0x%x\n", 
+			   cri->cri_alg);
+		    c7108_freesession(NULL, i);
+		    return EINVAL;
+		}
+		
+		if (xfm_type == HW_TYPE_CIPHER) {
+		    if (debug) {
+			dprintk("%s key:", __FUNCTION__);
+			for (i = 0; i < (cri->cri_klen + 7) / 8; i++)
+			    dprintk("%s0x%02x", (i % 8) ? " " : "\n    ",
+				    cri->cri_key[i]);
+			dprintk("\n");
+		    }
+
+		} else if (xfm_type == SW_TYPE_HMAC || 
+			   xfm_type == SW_TYPE_HASH) {
+		    printk("cypher_7108_crypto: HMAC unsupported!\n");
+		    return -EINVAL;
+		    c7108_freesession(NULL, i);
+		} else {
+		    printk("cypher_7108_crypto: "
+			   "Unhandled xfm_type %d\n", xfm_type);
+		    c7108_freesession(NULL, i);
+		    return EINVAL;
+		}
+		
+		(*swd)->cri_alg = cri->cri_alg;
+		(*swd)->xfm_type = xfm_type;
+		
+		cri = cri->cri_next;
+		swd = &((*swd)->next);
+	}
+	return 0;
+}
+
+/*
+ * Free a session.
+ */
+static int
+c7108_freesession(void *arg, u_int64_t tid)
+{
+	struct cipher_7108 *swd;
+	u_int32_t sid = CRYPTO_SESID2LID(tid);
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid > c7108_sesnum || c7108_sessions == NULL ||
+			c7108_sessions[sid] == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return(EINVAL);
+	}
+
+	/* Silently accept and return */
+	if (sid == 0)
+		return(0);
+
+	while ((swd = c7108_sessions[sid]) != NULL) {
+		c7108_sessions[sid] = swd->next;
+		kfree(swd);
+	}
+	return 0;
+}
+
+/*
+ * Process a hardware request.
+ */
+static int
+c7108_process(void *arg, struct cryptop *crp, int hint)
+{
+	struct cryptodesc *crd;
+	struct cipher_7108 *sw;
+	u_int32_t lid;
+	int type;
+	u32 hwkey[8];
+
+#define SCATTERLIST_MAX 16
+	struct scatterlist sg[SCATTERLIST_MAX];
+	int sg_num, sg_len, skip;
+	struct sk_buff *skb = NULL;
+	struct uio *uiop = NULL;
+
+	dprintk("%s()\n", __FUNCTION__);
+	/* Sanity check */
+	if (crp == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	crp->crp_etype = 0;
+
+	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		crp->crp_etype = EINVAL;
+		goto done;
+	}
+
+	lid = crp->crp_sid & 0xffffffff;
+	if (lid >= c7108_sesnum || lid == 0 || c7108_sessions == NULL ||
+			c7108_sessions[lid] == NULL) {
+		crp->crp_etype = ENOENT;
+		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
+		goto done;
+	}
+
+	/*
+	 * do some error checking outside of the loop for SKB and IOV
+	 * processing this leaves us with valid skb or uiop pointers
+	 * for later
+	 */
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		skb = (struct sk_buff *) crp->crp_buf;
+		if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
+			printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", 
+			       __FILE__, __LINE__,
+			       skb_shinfo(skb)->nr_frags);
+			goto done;
+		}
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		uiop = (struct uio *) crp->crp_buf;
+		if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
+			printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", 
+			       __FILE__, __LINE__,
+			       uiop->uio_iovcnt);
+			goto done;
+		}
+	}
+
+	/* Go through crypto descriptors, processing as we go */
+	for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
+	    /*
+	     * Find the crypto context.
+	     *
+	     * XXX Note that the logic here prevents us from having
+	     * XXX the same algorithm multiple times in a session
+	     * XXX (or rather, we can but it won't give us the right
+	     * XXX results). To do that, we'd need some way of differentiating
+	     * XXX between the various instances of an algorithm (so we can
+	     * XXX locate the correct crypto context).
+	     */
+	    for (sw = c7108_sessions[lid]; 
+		 sw && sw->cri_alg != crd->crd_alg;
+		 sw = sw->next)
+		;
+	    
+	    /* No such context ? */
+	    if (sw == NULL) {
+		crp->crp_etype = EINVAL;
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		goto done;
+	    }
+	    
+	    skip = crd->crd_skip;
+	    
+	    /*
+	     * setup the SG list skip from the start of the buffer
+	     */
+	    memset(sg, 0, sizeof(sg));
+	    if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		int i, len;
+		type = CRYPTO_BUF_SKBUF;
+		
+		sg_num = 0;
+		sg_len = 0;
+
+		if (skip < skb_headlen(skb)) {
+		    //sg[sg_num].page   = virt_to_page(skb->data + skip);
+			//sg[sg_num].offset = offset_in_page(skb->data + skip);
+		    len = skb_headlen(skb) - skip;
+		    if (len + sg_len > crd->crd_len)
+			len = crd->crd_len - sg_len;
+		    //sg[sg_num].length = len;
+		    sg_set_page(&sg[sg_num], virt_to_page(skb->data + skip), len, offset_in_page(skb->data + skip));
+			sg_len += sg[sg_num].length;
+		    sg_num++;
+		    skip = 0;
+		} else
+		    skip -= skb_headlen(skb);
+		
+		for (i = 0; sg_len < crd->crd_len &&
+			 i < skb_shinfo(skb)->nr_frags &&
+			 sg_num < SCATTERLIST_MAX; i++) {
+		    if (skip < skb_shinfo(skb)->frags[i].size) {
+			//sg[sg_num].page   = skb_frag_page(&skb_shinfo(skb)->frags[i]);
+			//sg[sg_num].offset = skb_shinfo(skb)->frags[i].page_offset + skip;
+			len = skb_shinfo(skb)->frags[i].size - skip;
+			if (len + sg_len > crd->crd_len)
+			    len = crd->crd_len - sg_len;
+			//sg[sg_num].length = len;
+			sg_set_page(&sg[sg_num], skb_frag_page(&skb_shinfo(skb)->frags[i]), len, skb_shinfo(skb)->frags[i].page_offset + skip);
+			sg_len += sg[sg_num].length;
+			sg_num++;
+			skip = 0;
+		    } else
+			skip -= skb_shinfo(skb)->frags[i].size;
+		}
+	    } else if (crp->crp_flags & CRYPTO_F_IOV) {
+		int len;
+		type = CRYPTO_BUF_IOV;
+		sg_len = 0;
+		for (sg_num = 0; sg_len < crd->crd_len &&
+			 sg_num < uiop->uio_iovcnt &&
+			 sg_num < SCATTERLIST_MAX; sg_num++) {
+		    if (skip < uiop->uio_iov[sg_num].iov_len) {
+			//sg[sg_num].page   =			    virt_to_page(uiop->uio_iov[sg_num].iov_base+skip);
+			//sg[sg_num].offset =			   offset_in_page(uiop->uio_iov[sg_num].iov_base+skip);
+			len = uiop->uio_iov[sg_num].iov_len - skip;
+			if (len + sg_len > crd->crd_len)
+			    len = crd->crd_len - sg_len;
+			//sg[sg_num].length = len;
+			sg_set_page(&sg[sg_num], virt_to_page(uiop->uio_iov[sg_num].iov_base+skip), len, offset_in_page(uiop->uio_iov[sg_num].iov_base+skip));
+			sg_len += sg[sg_num].length;
+			skip = 0;
+		    } else 
+			skip -= uiop->uio_iov[sg_num].iov_len;
+		}
+	    } else {
+		type = CRYPTO_BUF_CONTIG;
+		//sg[0].page   = virt_to_page(crp->crp_buf + skip);
+		//sg[0].offset = offset_in_page(crp->crp_buf + skip);
+		sg_len = (crp->crp_ilen - skip);
+		if (sg_len > crd->crd_len)
+		    sg_len = crd->crd_len;
+		//sg[0].length = sg_len;
+		sg_set_page(&sg[0], virt_to_page(crp->crp_buf + skip), sg_len, offset_in_page(crp->crp_buf + skip));
+		sg_num = 1;
+	    }
+	    if (sg_num > 0)
+		sg_mark_end(&sg[sg_num-1]);
+	    
+	    
+	    switch (sw->xfm_type) {
+
+	    case HW_TYPE_CIPHER: {
+
+		unsigned char iv[64];
+		unsigned char *ivp = iv;
+		int i;
+		int ivsize = 16;    /* fixed for AES */
+		int blocksize = 16; /* fixed for AES */
+
+		if (sg_len < blocksize) {
+		    crp->crp_etype = EINVAL;
+		    dprintk("%s,%d: EINVAL len %d < %d\n", 
+			    __FILE__, __LINE__,
+			    sg_len, 
+			    blocksize);
+		    goto done;
+		}
+		
+		if (ivsize > sizeof(iv)) {
+		    crp->crp_etype = EINVAL;
+		    dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		    goto done;
+		}
+		
+		if (crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
+		    
+		    if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
+			ivp = crd->crd_iv;
+		    } else {
+			get_random_bytes(ivp, ivsize);
+		    }
+		    /*
+		     * do we have to copy the IV back to the buffer ?
+		     */
+		    if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+			    crypto_copyback(crp->crp_buf,
+					  crd->crd_inject,
+					  ivsize,
+					  (caddr_t)ivp);
+		    }
+
+		    c7108_xlate_key(crd->crd_klen,
+				    (u8*)crd->crd_key, (u32*)hwkey);
+
+		    /* Encrypt SG list */
+		    for (i = 0; i < sg_num; i++) { 
+			sg[i].dma_address = 
+			    dma_map_single(NULL, 
+					   kmap(sg_page(&sg[i])) + sg[i].offset, sg_len, DMA_BIDIRECTIONAL);
+#if 0							   
+			printk("sg[%d]:0x%08x, off 0x%08x "
+			       "kmap 0x%08x phys 0x%08x\n", 
+			       i, sg[i].page, sg[i].offset,
+			       kmap(sg[i].page) + sg[i].offset,
+			       sg[i].dma_address);
+#endif
+			c7108_aes_cipher(C7108_AES_ENCRYPT,
+					 sg[i].dma_address,
+					 sg[i].dma_address,
+					 sg_len,
+					 crd->crd_klen,
+					 c7108_crypto_mode,
+					 hwkey,
+					 ivp);
+
+			if ((c7108_crypto_mode == C7108_AES_CTRL_MODE_CBC)||
+			    (c7108_crypto_mode == C7108_AES_CTRL_MODE_ECB)) { 
+			    /* Read back expanded key and cache it in key
+			     * context.
+			     * NOTE: for ECB/CBC modes only (not CTR, CFB, OFB)
+			     *       where you set the key once.
+			     */
+			    c7108_cache_key(crd->crd_klen, 
+					    (u32*)hwkey, (u8*)crd->crd_key);
+#if 0
+			    printk("%s expanded key:", __FUNCTION__);
+			    for (i = 0; i < (crd->crd_klen + 7) / 8; i++)
+				printk("%s0x%02x", (i % 8) ? " " : "\n    ",
+				       crd->crd_key[i]);
+			    printk("\n");
+#endif
+			}
+		    }
+		}
+		else { /*decrypt */
+
+		    if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
+			ivp = crd->crd_iv;
+		    } else {
+			crypto_copydata(crp->crp_buf, crd->crd_inject,
+				  ivsize, (caddr_t)ivp);
+		    }
+
+		    c7108_xlate_key(crd->crd_klen,
+				    (u8*)crd->crd_key, (u32*)hwkey);
+
+		    /* Decrypt SG list */
+		    for (i = 0; i < sg_num; i++) { 
+			sg[i].dma_address = 
+			    dma_map_single(NULL, 
+					   kmap(sg_page(&sg[i])) + sg[i].offset,
+					   sg_len, DMA_BIDIRECTIONAL);
+
+#if 0
+			printk("sg[%d]:0x%08x, off 0x%08x "
+			       "kmap 0x%08x phys 0x%08x\n", 
+			       i, sg[i].page, sg[i].offset,
+			       kmap(sg[i].page) + sg[i].offset,
+			       sg[i].dma_address);
+#endif
+			c7108_aes_cipher(C7108_AES_DECRYPT,
+					 sg[i].dma_address,
+					 sg[i].dma_address,
+					 sg_len,
+					 crd->crd_klen,
+					 c7108_crypto_mode,
+					 hwkey,
+					 ivp);
+		    }
+		}
+	    } break;
+	    case SW_TYPE_HMAC:
+	    case SW_TYPE_HASH:
+		crp->crp_etype = EINVAL;
+		goto done;
+		break;
+		
+	    case SW_TYPE_COMP:
+		crp->crp_etype = EINVAL;
+		goto done;
+		break;
+		
+	    default:
+		/* Unknown/unsupported algorithm */
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		crp->crp_etype = EINVAL;
+		goto done;
+	    }
+	}
+	
+done:
+	crypto_done(crp);
+	return 0;
+}
+
+static struct {                                                                                                                 
+	softc_device_decl sc_dev;                                                                                               
+} a7108dev;
+
+static device_method_t a7108_methods = {                                                                                          
+/* crypto device methods */                                                                                             
+	DEVMETHOD(cryptodev_newsession, c7108_newsession),                                                                  
+	DEVMETHOD(cryptodev_freesession, c7108_freesession),                                                             
+	DEVMETHOD(cryptodev_process, c7108_process),                                                                     
+	DEVMETHOD(cryptodev_kprocess, NULL) 
+};   
+
+static int
+cypher_7108_crypto_init(void)
+{
+	dprintk("%s(%p)\n", __FUNCTION__, cypher_7108_crypto_init);
+	
+	iobar = (unsigned long)ioremap(CCU_AES_REG_BASE, 0x4000);
+	printk("7108: AES @ 0x%08x (0x%08x phys) %s mode\n", 
+	       iobar, CCU_AES_REG_BASE, 
+	       c7108_crypto_mode & C7108_AES_CTRL_MODE_CBC ? "CBC" :
+	       c7108_crypto_mode & C7108_AES_CTRL_MODE_ECB ? "ECB" : 
+	       c7108_crypto_mode & C7108_AES_CTRL_MODE_CTR ? "CTR" : 
+	       c7108_crypto_mode & C7108_AES_CTRL_MODE_CFB ? "CFB" : 
+	       c7108_crypto_mode & C7108_AES_CTRL_MODE_OFB ? "OFB" : "???");
+	csr_mutex  = SPIN_LOCK_UNLOCKED;
+
+	memset(&a7108dev, 0, sizeof(a7108dev));                                                                                     
+	softc_device_init(&a7108dev, "aes7108", 0, a7108_methods);
+
+       	c7108_id = crypto_get_driverid(softc_get_device(&a7108dev), CRYPTOCAP_F_HARDWARE);
+	if (c7108_id < 0)
+		panic("7108: crypto device cannot initialize!");
+
+//	crypto_register(c7108_id, CRYPTO_AES_CBC, 0, 0, c7108_newsession, c7108_freesession, c7108_process, NULL);
+	crypto_register(c7108_id, CRYPTO_AES_CBC, 0, 0);
+
+	return(0);
+}
+
+static void
+cypher_7108_crypto_exit(void)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	crypto_unregister_all(c7108_id);
+	c7108_id = -1;
+}
+
+module_init(cypher_7108_crypto_init);
+module_exit(cypher_7108_crypto_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("Cypher 7108 Crypto (OCF module for kernel crypto)");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.h b/trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.h
new file mode 100644
index 00000000..0c7bfcbb
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/c7108/aes-7108.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2006 Micronas USA
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+#ifndef __AES_7108_H__
+#define __AES_7108_H__
+
+/* Cypher 7108 AES Controller Hardware */
+#define CCU_REG_BASE       0x1b500000	
+#define CCU_AES_REG_BASE   (CCU_REG_BASE + 0x100)
+#define C7108_AES_KEY0_LO        (0x0000) 
+#define C7108_AES_KEY0_HI        (0x0004) 
+#define C7108_AES_KEY1_LO        (0x0008) 
+#define C7108_AES_KEY1_HI        (0x000c) 
+#define C7108_AES_KEY2_LO        (0x0010) 
+#define C7108_AES_KEY2_HI        (0x0014) 
+#define C7108_AES_KEY3_LO        (0x0018) 
+#define C7108_AES_KEY3_HI        (0x001c) 
+#define C7108_AES_KEY4_LO        (0x0020) 
+#define C7108_AES_KEY4_HI        (0x0024) 
+#define C7108_AES_KEY5_LO        (0x0028) 
+#define C7108_AES_KEY5_HI        (0x002c) 
+#define C7108_AES_KEY6_LO        (0x0030) 
+#define C7108_AES_KEY6_HI        (0x0034) 
+#define C7108_AES_KEY7_LO        (0x0038) 
+#define C7108_AES_KEY7_HI        (0x003c) 
+#define C7108_AES_IV0_LO         (0x0040) 
+#define C7108_AES_IV0_HI         (0x0044) 
+#define C7108_AES_IV1_LO         (0x0048) 
+#define C7108_AES_IV1_HI         (0x004c) 
+#define C7108_AES_IV2_LO         (0x0050) 
+#define C7108_AES_IV2_HI         (0x0054) 
+#define C7108_AES_IV3_LO         (0x0058) 
+#define C7108_AES_IV3_HI         (0x005c) 
+
+#define C7108_AES_DMA_SRC0_LO    (0x0068) /* Bits 0:15 */
+#define C7108_AES_DMA_SRC0_HI    (0x006c) /* Bits 27:16 */
+#define C7108_AES_DMA_DST0_LO    (0x0070) /* Bits 0:15 */
+#define C7108_AES_DMA_DST0_HI    (0x0074) /* Bits 27:16 */
+#define C7108_AES_DMA_LEN        (0x0078)  /*Bytes:(Count+1)x16 */
+
+/* AES/Copy engine control register */
+#define C7108_AES_CTRL           (0x007c) /* AES control */
+#define C7108_AES_CTRL_RS        (1<<0)     /* Which set of src/dst to use */
+
+/* AES Cipher mode, controlled by setting Bits 2:0 */
+#define C7108_AES_CTRL_MODE_CBC     0
+#define C7108_AES_CTRL_MODE_CFB     (1<<0)
+#define C7108_AES_CTRL_MODE_OFB     (1<<1)
+#define C7108_AES_CTRL_MODE_CTR     ((1<<0)|(1<<1))
+#define C7108_AES_CTRL_MODE_ECB     (1<<2)
+
+/* AES Key length , Bits 5:4 */
+#define C7108_AES_KEY_LEN_128         0       /* 00 */
+#define C7108_AES_KEY_LEN_192         (1<<4)  /* 01 */
+#define C7108_AES_KEY_LEN_256         (1<<5)  /* 10 */
+
+/* AES Operation (crypt/decrypt), Bit 3 */
+#define C7108_AES_DECRYPT             (1<<3)   /* Clear for encrypt */
+#define C7108_AES_ENCRYPT              0       
+#define C7108_AES_INTR                (1<<13) /* Set on done trans from 0->1*/
+#define C7108_AES_GO                  (1<<14) /* Run */
+#define C7108_AES_OP_DONE             (1<<15) /* Set when complete */
+
+
+/* Expanded key registers */
+#define C7108_AES_EKEY0_LO            (0x0080)
+#define C7108_AES_EKEY0_HI            (0x0084)
+#define C7108_AES_EKEY1_LO            (0x0088)
+#define C7108_AES_EKEY1_HI            (0x008c)
+#define C7108_AES_EKEY2_LO            (0x0090)
+#define C7108_AES_EKEY2_HI            (0x0094)
+#define C7108_AES_EKEY3_LO            (0x0098)
+#define C7108_AES_EKEY3_HI            (0x009c)
+#define C7108_AES_EKEY4_LO            (0x00a0)
+#define C7108_AES_EKEY4_HI            (0x00a4)
+#define C7108_AES_EKEY5_LO            (0x00a8)
+#define C7108_AES_EKEY5_HI            (0x00ac)
+#define C7108_AES_EKEY6_LO            (0x00b0)
+#define C7108_AES_EKEY6_HI            (0x00b4)
+#define C7108_AES_EKEY7_LO            (0x00b8)
+#define C7108_AES_EKEY7_HI            (0x00bc)
+#define C7108_AES_OK                  (0x00fc) /* Reset: "OK" */
+
+#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
+
+/* Software session entry */
+
+#define HW_TYPE_CIPHER	0
+#define SW_TYPE_HMAC	1
+#define SW_TYPE_AUTH2	2
+#define SW_TYPE_HASH	3
+#define SW_TYPE_COMP	4
+
+struct cipher_7108 {
+	int			xfm_type;
+	int			cri_alg;
+	union {
+		struct {
+			char sw_key[HMAC_BLOCK_LEN];
+			int  sw_klen;
+			int  sw_authlen;
+		} hmac;
+	} u;
+	struct cipher_7108	*next;
+};
+
+
+
+#endif /* __C7108_AES_7108_H__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/criov.c b/trunk/target/linux/generic/files/crypto/ocf/criov.c
new file mode 100644
index 00000000..a8c1a8c4
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/criov.c
@@ -0,0 +1,215 @@
+/*      $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $	*/
+
+/*
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ * The license and original author are listed below.
+ *
+ * Copyright (c) 1999 Theo de Raadt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+__FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.5 2006/06/04 22:15:13 pjd Exp $");
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/uio.h>
+#include <linux/skbuff.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/io.h>
+
+#include <uio.h>
+#include <cryptodev.h>
+
+/*
+ * This macro is only for avoiding code duplication, as we need to skip
+ * given number of bytes in the same way in three functions below.
+ */
+#define	CUIO_SKIP()	do {						\
+	KASSERT(off >= 0, ("%s: off %d < 0", __func__, off));		\
+	KASSERT(len >= 0, ("%s: len %d < 0", __func__, len));		\
+	while (off > 0) {						\
+		KASSERT(iol >= 0, ("%s: empty in skip", __func__));	\
+		if (off < iov->iov_len)					\
+			break;						\
+		off -= iov->iov_len;					\
+		iol--;							\
+		iov++;							\
+	}								\
+} while (0)
+
+void
+cuio_copydata(struct uio* uio, int off, int len, caddr_t cp)
+{
+	struct iovec *iov = uio->uio_iov;
+	int iol = uio->uio_iovcnt;
+	unsigned count;
+
+	CUIO_SKIP();
+	while (len > 0) {
+		KASSERT(iol >= 0, ("%s: empty", __func__));
+		count = min((int)(iov->iov_len - off), len);
+		memcpy(cp, ((caddr_t)iov->iov_base) + off, count);
+		len -= count;
+		cp += count;
+		off = 0;
+		iol--;
+		iov++;
+	}
+}
+
+void
+cuio_copyback(struct uio* uio, int off, int len, caddr_t cp)
+{
+	struct iovec *iov = uio->uio_iov;
+	int iol = uio->uio_iovcnt;
+	unsigned count;
+
+	CUIO_SKIP();
+	while (len > 0) {
+		KASSERT(iol >= 0, ("%s: empty", __func__));
+		count = min((int)(iov->iov_len - off), len);
+		memcpy(((caddr_t)iov->iov_base) + off, cp, count);
+		len -= count;
+		cp += count;
+		off = 0;
+		iol--;
+		iov++;
+	}
+}
+
+/*
+ * Return a pointer to iov/offset of location in iovec list.
+ */
+struct iovec *
+cuio_getptr(struct uio *uio, int loc, int *off)
+{
+	struct iovec *iov = uio->uio_iov;
+	int iol = uio->uio_iovcnt;
+
+	while (loc >= 0) {
+		/* Normal end of search */
+		if (loc < iov->iov_len) {
+	    		*off = loc;
+	    		return (iov);
+		}
+
+		loc -= iov->iov_len;
+		if (iol == 0) {
+			if (loc == 0) {
+				/* Point at the end of valid data */
+				*off = iov->iov_len;
+				return (iov);
+			} else
+				return (NULL);
+		} else {
+			iov++, iol--;
+		}
+    	}
+
+	return (NULL);
+}
+
+EXPORT_SYMBOL(cuio_copyback);
+EXPORT_SYMBOL(cuio_copydata);
+EXPORT_SYMBOL(cuio_getptr);
+
+static void
+skb_copy_bits_back(struct sk_buff *skb, int offset, caddr_t cp, int len)
+{
+	int i;
+	if (offset < skb_headlen(skb)) {
+		memcpy(skb->data + offset, cp, min_t(int, skb_headlen(skb), len));
+		len -= skb_headlen(skb);
+		cp += skb_headlen(skb);
+	}
+	offset -= skb_headlen(skb);
+	for (i = 0; len > 0 && i < skb_shinfo(skb)->nr_frags; i++) {
+		if (offset < skb_shinfo(skb)->frags[i].size) {
+			memcpy(page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
+					skb_shinfo(skb)->frags[i].page_offset,
+					cp, min_t(int, skb_shinfo(skb)->frags[i].size, len));
+			len -= skb_shinfo(skb)->frags[i].size;
+			cp += skb_shinfo(skb)->frags[i].size;
+		}
+		offset -= skb_shinfo(skb)->frags[i].size;
+	}
+}
+
+void
+crypto_copyback(int flags, caddr_t buf, int off, int size, caddr_t in)
+{
+
+	if ((flags & CRYPTO_F_SKBUF) != 0)
+		skb_copy_bits_back((struct sk_buff *)buf, off, in, size);
+	else if ((flags & CRYPTO_F_IOV) != 0)
+		cuio_copyback((struct uio *)buf, off, size, in);
+	else
+		bcopy(in, buf + off, size);
+}
+
+void
+crypto_copydata(int flags, caddr_t buf, int off, int size, caddr_t out)
+{
+
+	if ((flags & CRYPTO_F_SKBUF) != 0)
+		skb_copy_bits((struct sk_buff *)buf, off, out, size);
+	else if ((flags & CRYPTO_F_IOV) != 0)
+		cuio_copydata((struct uio *)buf, off, size, out);
+	else
+		bcopy(buf + off, out, size);
+}
+
+int
+crypto_apply(int flags, caddr_t buf, int off, int len,
+    int (*f)(void *, void *, u_int), void *arg)
+{
+#if 0
+	int error;
+
+	if ((flags & CRYPTO_F_SKBUF) != 0)
+		error = XXXXXX((struct mbuf *)buf, off, len, f, arg);
+	else if ((flags & CRYPTO_F_IOV) != 0)
+		error = cuio_apply((struct uio *)buf, off, len, f, arg);
+	else
+		error = (*f)(arg, buf + off, len);
+	return (error);
+#else
+	KASSERT(0, ("crypto_apply not implemented!\n"));
+#endif
+	return 0;
+}
+
+EXPORT_SYMBOL(crypto_copyback);
+EXPORT_SYMBOL(crypto_copydata);
+EXPORT_SYMBOL(crypto_apply);
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/crypto.c b/trunk/target/linux/generic/files/crypto/ocf/crypto.c
new file mode 100644
index 00000000..dab34273
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/crypto.c
@@ -0,0 +1,1766 @@
+/*-
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ * The license and original author are listed below.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * Copyright (c) 2002-2006 Sam Leffler.  All rights reserved.
+ *
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if 0
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.27 2007/03/21 03:42:51 sam Exp $");
+#endif
+
+/*
+ * Cryptographic Subsystem.
+ *
+ * This code is derived from the Openbsd Cryptographic Framework (OCF)
+ * that has the copyright shown below.  Very little of the original
+ * code remains.
+ */
+/*-
+ * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
+ *
+ * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * February 2000. Network Security Technologies Inc. (NSTI) kindly
+ * supported the development of this code.
+ *
+ * Copyright (c) 2000, 2001 Angelos D. Keromytis
+ *
+ * Permission to use, copy, and modify this software with or without fee
+ * is hereby granted, provided that this entire notice is included in
+ * all source code copies of any software which is or includes a copy or
+ * modification of this software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+ * PURPOSE.
+ *
+__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.16 2005/01/07 02:29:16 imp Exp $");
+ */
+
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4)
+#include <linux/kthread.h>
+#endif
+#include <cryptodev.h>
+
+/*
+ * keep track of whether or not we have been initialised, a big
+ * issue if we are linked into the kernel and a driver gets started before
+ * us
+ */
+static int crypto_initted = 0;
+
+/*
+ * Crypto drivers register themselves by allocating a slot in the
+ * crypto_drivers table with crypto_get_driverid() and then registering
+ * each algorithm they support with crypto_register() and crypto_kregister().
+ */
+
+/*
+ * lock on driver table
+ * we track its state as spin_is_locked does not do anything on non-SMP boxes
+ */
+static spinlock_t	crypto_drivers_lock;
+static int			crypto_drivers_locked;		/* for non-SMP boxes */
+
+#define	CRYPTO_DRIVER_LOCK() \
+			({ \
+				spin_lock_irqsave(&crypto_drivers_lock, d_flags); \
+			 	crypto_drivers_locked = 1; \
+				dprintk("%s,%d: DRIVER_LOCK()\n", __FILE__, __LINE__); \
+			 })
+#define	CRYPTO_DRIVER_UNLOCK() \
+			({ \
+			 	dprintk("%s,%d: DRIVER_UNLOCK()\n", __FILE__, __LINE__); \
+			 	crypto_drivers_locked = 0; \
+				spin_unlock_irqrestore(&crypto_drivers_lock, d_flags); \
+			 })
+#define	CRYPTO_DRIVER_ASSERT() \
+			({ \
+			 	if (!crypto_drivers_locked) { \
+					dprintk("%s,%d: DRIVER_ASSERT!\n", __FILE__, __LINE__); \
+			 	} \
+			 })
+
+/*
+ * Crypto device/driver capabilities structure.
+ *
+ * Synchronization:
+ * (d) - protected by CRYPTO_DRIVER_LOCK()
+ * (q) - protected by CRYPTO_Q_LOCK()
+ * Not tagged fields are read-only.
+ */
+struct cryptocap {
+	device_t	cc_dev;			/* (d) device/driver */
+	u_int32_t	cc_sessions;		/* (d) # of sessions */
+	u_int32_t	cc_koperations;		/* (d) # os asym operations */
+	/*
+	 * Largest possible operator length (in bits) for each type of
+	 * encryption algorithm. XXX not used
+	 */
+	u_int16_t	cc_max_op_len[CRYPTO_ALGORITHM_MAX + 1];
+	u_int8_t	cc_alg[CRYPTO_ALGORITHM_MAX + 1];
+	u_int8_t	cc_kalg[CRK_ALGORITHM_MAX + 1];
+
+	int		cc_flags;		/* (d) flags */
+#define CRYPTOCAP_F_CLEANUP	0x80000000	/* needs resource cleanup */
+	int		cc_qblocked;		/* (q) symmetric q blocked */
+	int		cc_kqblocked;		/* (q) asymmetric q blocked */
+
+	int		cc_unqblocked;		/* (q) symmetric q blocked */
+	int		cc_unkqblocked;		/* (q) asymmetric q blocked */
+};
+static struct cryptocap *crypto_drivers = NULL;
+static int crypto_drivers_num = 0;
+
+/*
+ * There are two queues for crypto requests; one for symmetric (e.g.
+ * cipher) operations and one for asymmetric (e.g. MOD)operations.
+ * A single mutex is used to lock access to both queues.  We could
+ * have one per-queue but having one simplifies handling of block/unblock
+ * operations.
+ */
+static LIST_HEAD(crp_q);		/* crypto request queue */
+static LIST_HEAD(crp_kq);		/* asym request queue */
+
+static spinlock_t crypto_q_lock;
+
+int crypto_all_qblocked = 0;  /* protect with Q_LOCK */
+module_param(crypto_all_qblocked, int, 0444);
+MODULE_PARM_DESC(crypto_all_qblocked, "Are all crypto queues blocked");
+
+int crypto_all_kqblocked = 0; /* protect with Q_LOCK */
+module_param(crypto_all_kqblocked, int, 0444);
+MODULE_PARM_DESC(crypto_all_kqblocked, "Are all asym crypto queues blocked");
+
+#define	CRYPTO_Q_LOCK() \
+			({ \
+				spin_lock_irqsave(&crypto_q_lock, q_flags); \
+			 	dprintk("%s,%d: Q_LOCK()\n", __FILE__, __LINE__); \
+			 })
+#define	CRYPTO_Q_UNLOCK() \
+			({ \
+			 	dprintk("%s,%d: Q_UNLOCK()\n", __FILE__, __LINE__); \
+				spin_unlock_irqrestore(&crypto_q_lock, q_flags); \
+			 })
+
+/*
+ * There are two queues for processing completed crypto requests; one
+ * for the symmetric and one for the asymmetric ops.  We only need one
+ * but have two to avoid type futzing (cryptop vs. cryptkop).  A single
+ * mutex is used to lock access to both queues.  Note that this lock
+ * must be separate from the lock on request queues to insure driver
+ * callbacks don't generate lock order reversals.
+ */
+static LIST_HEAD(crp_ret_q);		/* callback queues */
+static LIST_HEAD(crp_ret_kq);
+
+static spinlock_t crypto_ret_q_lock;
+#define	CRYPTO_RETQ_LOCK() \
+			({ \
+				spin_lock_irqsave(&crypto_ret_q_lock, r_flags); \
+				dprintk("%s,%d: RETQ_LOCK\n", __FILE__, __LINE__); \
+			 })
+#define	CRYPTO_RETQ_UNLOCK() \
+			({ \
+			 	dprintk("%s,%d: RETQ_UNLOCK\n", __FILE__, __LINE__); \
+				spin_unlock_irqrestore(&crypto_ret_q_lock, r_flags); \
+			 })
+#define	CRYPTO_RETQ_EMPTY()	(list_empty(&crp_ret_q) && list_empty(&crp_ret_kq))
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+static kmem_cache_t *cryptop_zone;
+static kmem_cache_t *cryptodesc_zone;
+#else
+static struct kmem_cache *cryptop_zone;
+static struct kmem_cache *cryptodesc_zone;
+#endif
+
+#define debug crypto_debug
+int crypto_debug = 0;
+module_param(crypto_debug, int, 0644);
+MODULE_PARM_DESC(crypto_debug, "Enable debug");
+EXPORT_SYMBOL(crypto_debug);
+
+/*
+ * Maximum number of outstanding crypto requests before we start
+ * failing requests.  We need this to prevent DOS when too many
+ * requests are arriving for us to keep up.  Otherwise we will
+ * run the system out of memory.  Since crypto is slow,  we are
+ * usually the bottleneck that needs to say, enough is enough.
+ *
+ * We cannot print errors when this condition occurs,  we are already too
+ * slow,  printing anything will just kill us
+ */
+
+static int crypto_q_cnt = 0;
+module_param(crypto_q_cnt, int, 0444);
+MODULE_PARM_DESC(crypto_q_cnt,
+		"Current number of outstanding crypto requests");
+
+static int crypto_q_max = 1000;
+module_param(crypto_q_max, int, 0644);
+MODULE_PARM_DESC(crypto_q_max,
+		"Maximum number of outstanding crypto requests");
+
+#define bootverbose crypto_verbose
+static int crypto_verbose = 0;
+module_param(crypto_verbose, int, 0644);
+MODULE_PARM_DESC(crypto_verbose,
+		"Enable verbose crypto startup");
+
+int	crypto_usercrypto = 1;	/* userland may do crypto reqs */
+module_param(crypto_usercrypto, int, 0644);
+MODULE_PARM_DESC(crypto_usercrypto,
+	   "Enable/disable user-mode access to crypto support");
+
+int	crypto_userasymcrypto = 1;	/* userland may do asym crypto reqs */
+module_param(crypto_userasymcrypto, int, 0644);
+MODULE_PARM_DESC(crypto_userasymcrypto,
+	   "Enable/disable user-mode access to asymmetric crypto support");
+
+int	crypto_devallowsoft = 0;	/* only use hardware crypto */
+module_param(crypto_devallowsoft, int, 0644);
+MODULE_PARM_DESC(crypto_devallowsoft,
+	   "Enable/disable use of software crypto support");
+
+/*
+ * This parameter controls the maximum number of crypto operations to 
+ * do consecutively in the crypto kernel thread before scheduling to allow 
+ * other processes to run. Without it, it is possible to get into a 
+ * situation where the crypto thread never allows any other processes to run.
+ * Default to 1000 which should be less than one second.
+ */
+static int crypto_max_loopcount = 1000;
+module_param(crypto_max_loopcount, int, 0644);
+MODULE_PARM_DESC(crypto_max_loopcount,
+	   "Maximum number of crypto ops to do before yielding to other processes");
+
+#ifndef CONFIG_NR_CPUS
+#define CONFIG_NR_CPUS 1
+#endif
+
+static struct task_struct *cryptoproc[CONFIG_NR_CPUS];
+static struct task_struct *cryptoretproc[CONFIG_NR_CPUS];
+static DECLARE_WAIT_QUEUE_HEAD(cryptoproc_wait);
+static DECLARE_WAIT_QUEUE_HEAD(cryptoretproc_wait);
+
+static	int crypto_proc(void *arg);
+static	int crypto_ret_proc(void *arg);
+static	int crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint);
+static	int crypto_kinvoke(struct cryptkop *krp, int flags);
+static	void crypto_exit(void);
+static  int crypto_init(void);
+
+static	struct cryptostats cryptostats;
+
+static struct cryptocap *
+crypto_checkdriver(u_int32_t hid)
+{
+	if (crypto_drivers == NULL)
+		return NULL;
+	return (hid >= crypto_drivers_num ? NULL : &crypto_drivers[hid]);
+}
+
+/*
+ * Compare a driver's list of supported algorithms against another
+ * list; return non-zero if all algorithms are supported.
+ */
+static int
+driver_suitable(const struct cryptocap *cap, const struct cryptoini *cri)
+{
+	const struct cryptoini *cr;
+
+	/* See if all the algorithms are supported. */
+	for (cr = cri; cr; cr = cr->cri_next)
+		if (cap->cc_alg[cr->cri_alg] == 0)
+			return 0;
+	return 1;
+}
+
+
+/*
+ * Select a driver for a new session that supports the specified
+ * algorithms and, optionally, is constrained according to the flags.
+ * The algorithm we use here is pretty stupid; just use the
+ * first driver that supports all the algorithms we need. If there
+ * are multiple drivers we choose the driver with the fewest active
+ * sessions.  We prefer hardware-backed drivers to software ones.
+ *
+ * XXX We need more smarts here (in real life too, but that's
+ * XXX another story altogether).
+ */
+static struct cryptocap *
+crypto_select_driver(const struct cryptoini *cri, int flags)
+{
+	struct cryptocap *cap, *best;
+	int match, hid;
+
+	CRYPTO_DRIVER_ASSERT();
+
+	/*
+	 * Look first for hardware crypto devices if permitted.
+	 */
+	if (flags & CRYPTOCAP_F_HARDWARE)
+		match = CRYPTOCAP_F_HARDWARE;
+	else
+		match = CRYPTOCAP_F_SOFTWARE;
+	best = NULL;
+again:
+	for (hid = 0; hid < crypto_drivers_num; hid++) {
+		cap = &crypto_drivers[hid];
+		/*
+		 * If it's not initialized, is in the process of
+		 * going away, or is not appropriate (hardware
+		 * or software based on match), then skip.
+		 */
+		if (cap->cc_dev == NULL ||
+		    (cap->cc_flags & CRYPTOCAP_F_CLEANUP) ||
+		    (cap->cc_flags & match) == 0)
+			continue;
+
+		/* verify all the algorithms are supported. */
+		if (driver_suitable(cap, cri)) {
+			if (best == NULL ||
+			    cap->cc_sessions < best->cc_sessions)
+				best = cap;
+		}
+	}
+	if (best != NULL)
+		return best;
+	if (match == CRYPTOCAP_F_HARDWARE && (flags & CRYPTOCAP_F_SOFTWARE)) {
+		/* sort of an Algol 68-style for loop */
+		match = CRYPTOCAP_F_SOFTWARE;
+		goto again;
+	}
+	return best;
+}
+
+/*
+ * Create a new session.  The crid argument specifies a crypto
+ * driver to use or constraints on a driver to select (hardware
+ * only, software only, either).  Whatever driver is selected
+ * must be capable of the requested crypto algorithms.
+ */
+int
+crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int crid)
+{
+	struct cryptocap *cap;
+	u_int32_t hid, lid;
+	int err;
+	unsigned long d_flags;
+
+	CRYPTO_DRIVER_LOCK();
+	if ((crid & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
+		/*
+		 * Use specified driver; verify it is capable.
+		 */
+		cap = crypto_checkdriver(crid);
+		if (cap != NULL && !driver_suitable(cap, cri))
+			cap = NULL;
+	} else {
+		/*
+		 * No requested driver; select based on crid flags.
+		 */
+		cap = crypto_select_driver(cri, crid);
+		/*
+		 * if NULL then can't do everything in one session.
+		 * XXX Fix this. We need to inject a "virtual" session
+		 * XXX layer right about here.
+		 */
+	}
+	if (cap != NULL) {
+		/* Call the driver initialization routine. */
+		hid = cap - crypto_drivers;
+		lid = hid;		/* Pass the driver ID. */
+		cap->cc_sessions++;
+		CRYPTO_DRIVER_UNLOCK();
+		err = CRYPTODEV_NEWSESSION(cap->cc_dev, &lid, cri);
+		CRYPTO_DRIVER_LOCK();
+		if (err == 0) {
+			(*sid) = (cap->cc_flags & 0xff000000)
+			       | (hid & 0x00ffffff);
+			(*sid) <<= 32;
+			(*sid) |= (lid & 0xffffffff);
+		} else
+			cap->cc_sessions--;
+	} else
+		err = EINVAL;
+	CRYPTO_DRIVER_UNLOCK();
+	return err;
+}
+
+static void
+crypto_remove(struct cryptocap *cap)
+{
+	CRYPTO_DRIVER_ASSERT();
+	if (cap->cc_sessions == 0 && cap->cc_koperations == 0)
+		bzero(cap, sizeof(*cap));
+}
+
+/*
+ * Delete an existing session (or a reserved session on an unregistered
+ * driver).
+ */
+int
+crypto_freesession(u_int64_t sid)
+{
+	struct cryptocap *cap;
+	u_int32_t hid;
+	int err = 0;
+	unsigned long d_flags;
+
+	dprintk("%s()\n", __FUNCTION__);
+	CRYPTO_DRIVER_LOCK();
+
+	if (crypto_drivers == NULL) {
+		err = EINVAL;
+		goto done;
+	}
+
+	/* Determine two IDs. */
+	hid = CRYPTO_SESID2HID(sid);
+
+	if (hid >= crypto_drivers_num) {
+		dprintk("%s - INVALID DRIVER NUM %d\n", __FUNCTION__, hid);
+		err = ENOENT;
+		goto done;
+	}
+	cap = &crypto_drivers[hid];
+
+	if (cap->cc_dev) {
+		CRYPTO_DRIVER_UNLOCK();
+		/* Call the driver cleanup routine, if available, unlocked. */
+		err = CRYPTODEV_FREESESSION(cap->cc_dev, sid);
+		CRYPTO_DRIVER_LOCK();
+	}
+
+	if (cap->cc_sessions)
+		cap->cc_sessions--;
+
+	if (cap->cc_flags & CRYPTOCAP_F_CLEANUP)
+		crypto_remove(cap);
+
+done:
+	CRYPTO_DRIVER_UNLOCK();
+	return err;
+}
+
+/*
+ * Return an unused driver id.  Used by drivers prior to registering
+ * support for the algorithms they handle.
+ */
+int32_t
+crypto_get_driverid(device_t dev, int flags)
+{
+	struct cryptocap *newdrv;
+	int i;
+	unsigned long d_flags;
+
+	if ((flags & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
+		printf("%s: no flags specified when registering driver\n",
+		    device_get_nameunit(dev));
+		return -1;
+	}
+
+	CRYPTO_DRIVER_LOCK();
+
+	for (i = 0; i < crypto_drivers_num; i++) {
+		if (crypto_drivers[i].cc_dev == NULL &&
+		    (crypto_drivers[i].cc_flags & CRYPTOCAP_F_CLEANUP) == 0) {
+			break;
+		}
+	}
+
+	/* Out of entries, allocate some more. */
+	if (i == crypto_drivers_num) {
+		/* Be careful about wrap-around. */
+		if (2 * crypto_drivers_num <= crypto_drivers_num) {
+			CRYPTO_DRIVER_UNLOCK();
+			printk("crypto: driver count wraparound!\n");
+			return -1;
+		}
+
+		newdrv = kmalloc(2 * crypto_drivers_num * sizeof(struct cryptocap),
+				GFP_KERNEL);
+		if (newdrv == NULL) {
+			CRYPTO_DRIVER_UNLOCK();
+			printk("crypto: no space to expand driver table!\n");
+			return -1;
+		}
+
+		memcpy(newdrv, crypto_drivers,
+				crypto_drivers_num * sizeof(struct cryptocap));
+		memset(&newdrv[crypto_drivers_num], 0,
+				crypto_drivers_num * sizeof(struct cryptocap));
+
+		crypto_drivers_num *= 2;
+
+		kfree(crypto_drivers);
+		crypto_drivers = newdrv;
+	}
+
+	/* NB: state is zero'd on free */
+	crypto_drivers[i].cc_sessions = 1;	/* Mark */
+	crypto_drivers[i].cc_dev = dev;
+	crypto_drivers[i].cc_flags = flags;
+	if (bootverbose)
+		printf("crypto: assign %s driver id %u, flags %u\n",
+		    device_get_nameunit(dev), i, flags);
+
+	CRYPTO_DRIVER_UNLOCK();
+
+	return i;
+}
+
+/*
+ * Lookup a driver by name.  We match against the full device
+ * name and unit, and against just the name.  The latter gives
+ * us a simple widlcarding by device name.  On success return the
+ * driver/hardware identifier; otherwise return -1.
+ */
+int
+crypto_find_driver(const char *match)
+{
+	int i, len = strlen(match);
+	unsigned long d_flags;
+
+	CRYPTO_DRIVER_LOCK();
+	for (i = 0; i < crypto_drivers_num; i++) {
+		device_t dev = crypto_drivers[i].cc_dev;
+		if (dev == NULL ||
+		    (crypto_drivers[i].cc_flags & CRYPTOCAP_F_CLEANUP))
+			continue;
+		if (strncmp(match, device_get_nameunit(dev), len) == 0 ||
+		    strncmp(match, device_get_name(dev), len) == 0)
+			break;
+	}
+	CRYPTO_DRIVER_UNLOCK();
+	return i < crypto_drivers_num ? i : -1;
+}
+
+/*
+ * Return the device_t for the specified driver or NULL
+ * if the driver identifier is invalid.
+ */
+device_t
+crypto_find_device_byhid(int hid)
+{
+	struct cryptocap *cap = crypto_checkdriver(hid);
+	return cap != NULL ? cap->cc_dev : NULL;
+}
+
+/*
+ * Return the device/driver capabilities.
+ */
+int
+crypto_getcaps(int hid)
+{
+	struct cryptocap *cap = crypto_checkdriver(hid);
+	return cap != NULL ? cap->cc_flags : 0;
+}
+
+/*
+ * Register support for a key-related algorithm.  This routine
+ * is called once for each algorithm supported a driver.
+ */
+int
+crypto_kregister(u_int32_t driverid, int kalg, u_int32_t flags)
+{
+	struct cryptocap *cap;
+	int err;
+	unsigned long d_flags;
+
+	dprintk("%s()\n", __FUNCTION__);
+	CRYPTO_DRIVER_LOCK();
+
+	cap = crypto_checkdriver(driverid);
+	if (cap != NULL &&
+	    (CRK_ALGORITM_MIN <= kalg && kalg <= CRK_ALGORITHM_MAX)) {
+		/*
+		 * XXX Do some performance testing to determine placing.
+		 * XXX We probably need an auxiliary data structure that
+		 * XXX describes relative performances.
+		 */
+
+		cap->cc_kalg[kalg] = flags | CRYPTO_ALG_FLAG_SUPPORTED;
+		if (bootverbose)
+			printf("crypto: %s registers key alg %u flags %u\n"
+				, device_get_nameunit(cap->cc_dev)
+				, kalg
+				, flags
+			);
+		err = 0;
+	} else
+		err = EINVAL;
+
+	CRYPTO_DRIVER_UNLOCK();
+	return err;
+}
+
+/*
+ * Register support for a non-key-related algorithm.  This routine
+ * is called once for each such algorithm supported by a driver.
+ */
+int
+crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
+    u_int32_t flags)
+{
+	struct cryptocap *cap;
+	int err;
+	unsigned long d_flags;
+
+	dprintk("%s(id=0x%x, alg=%d, maxoplen=%d, flags=0x%x)\n", __FUNCTION__,
+			driverid, alg, maxoplen, flags);
+
+	CRYPTO_DRIVER_LOCK();
+
+	cap = crypto_checkdriver(driverid);
+	/* NB: algorithms are in the range [1..max] */
+	if (cap != NULL &&
+	    (CRYPTO_ALGORITHM_MIN <= alg && alg <= CRYPTO_ALGORITHM_MAX)) {
+		/*
+		 * XXX Do some performance testing to determine placing.
+		 * XXX We probably need an auxiliary data structure that
+		 * XXX describes relative performances.
+		 */
+
+		cap->cc_alg[alg] = flags | CRYPTO_ALG_FLAG_SUPPORTED;
+		cap->cc_max_op_len[alg] = maxoplen;
+		if (bootverbose)
+			printf("crypto: %s registers alg %u flags %u maxoplen %u\n"
+				, device_get_nameunit(cap->cc_dev)
+				, alg
+				, flags
+				, maxoplen
+			);
+		cap->cc_sessions = 0;		/* Unmark */
+		err = 0;
+	} else
+		err = EINVAL;
+
+	CRYPTO_DRIVER_UNLOCK();
+	return err;
+}
+
+static void
+driver_finis(struct cryptocap *cap)
+{
+	u_int32_t ses, kops;
+
+	CRYPTO_DRIVER_ASSERT();
+
+	ses = cap->cc_sessions;
+	kops = cap->cc_koperations;
+	bzero(cap, sizeof(*cap));
+	if (ses != 0 || kops != 0) {
+		/*
+		 * If there are pending sessions,
+		 * just mark as invalid.
+		 */
+		cap->cc_flags |= CRYPTOCAP_F_CLEANUP;
+		cap->cc_sessions = ses;
+		cap->cc_koperations = kops;
+	}
+}
+
+/*
+ * Unregister a crypto driver. If there are pending sessions using it,
+ * leave enough information around so that subsequent calls using those
+ * sessions will correctly detect the driver has been unregistered and
+ * reroute requests.
+ */
+int
+crypto_unregister(u_int32_t driverid, int alg)
+{
+	struct cryptocap *cap;
+	int i, err;
+	unsigned long d_flags;
+
+	dprintk("%s()\n", __FUNCTION__);
+	CRYPTO_DRIVER_LOCK();
+
+	cap = crypto_checkdriver(driverid);
+	if (cap != NULL &&
+	    (CRYPTO_ALGORITHM_MIN <= alg && alg <= CRYPTO_ALGORITHM_MAX) &&
+	    cap->cc_alg[alg] != 0) {
+		cap->cc_alg[alg] = 0;
+		cap->cc_max_op_len[alg] = 0;
+
+		/* Was this the last algorithm ? */
+		for (i = 1; i <= CRYPTO_ALGORITHM_MAX; i++)
+			if (cap->cc_alg[i] != 0)
+				break;
+
+		if (i == CRYPTO_ALGORITHM_MAX + 1)
+			driver_finis(cap);
+		err = 0;
+	} else
+		err = EINVAL;
+	CRYPTO_DRIVER_UNLOCK();
+	return err;
+}
+
+/*
+ * Unregister all algorithms associated with a crypto driver.
+ * If there are pending sessions using it, leave enough information
+ * around so that subsequent calls using those sessions will
+ * correctly detect the driver has been unregistered and reroute
+ * requests.
+ */
+int
+crypto_unregister_all(u_int32_t driverid)
+{
+	struct cryptocap *cap;
+	int err;
+	unsigned long d_flags;
+
+	dprintk("%s()\n", __FUNCTION__);
+	CRYPTO_DRIVER_LOCK();
+	cap = crypto_checkdriver(driverid);
+	if (cap != NULL) {
+		driver_finis(cap);
+		err = 0;
+	} else
+		err = EINVAL;
+	CRYPTO_DRIVER_UNLOCK();
+
+	return err;
+}
+
+/*
+ * Clear blockage on a driver.  The what parameter indicates whether
+ * the driver is now ready for cryptop's and/or cryptokop's.
+ */
+int
+crypto_unblock(u_int32_t driverid, int what)
+{
+	struct cryptocap *cap;
+	int err;
+	unsigned long q_flags;
+
+	CRYPTO_Q_LOCK();
+	cap = crypto_checkdriver(driverid);
+	if (cap != NULL) {
+		if (what & CRYPTO_SYMQ) {
+			cap->cc_qblocked = 0;
+			cap->cc_unqblocked = 0;
+			crypto_all_qblocked = 0;
+		}
+		if (what & CRYPTO_ASYMQ) {
+			cap->cc_kqblocked = 0;
+			cap->cc_unkqblocked = 0;
+			crypto_all_kqblocked = 0;
+		}
+		wake_up_interruptible(&cryptoproc_wait);
+		err = 0;
+	} else
+		err = EINVAL;
+	CRYPTO_Q_UNLOCK(); //DAVIDM should this be a driver lock
+
+	return err;
+}
+
+/*
+ * Add a crypto request to a queue, to be processed by the kernel thread.
+ */
+int
+crypto_dispatch(struct cryptop *crp)
+{
+	struct cryptocap *cap;
+	int result = -1;
+	unsigned long q_flags;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	cryptostats.cs_ops++;
+
+	CRYPTO_Q_LOCK();
+	if (crypto_q_cnt >= crypto_q_max) {
+		cryptostats.cs_drops++;
+		CRYPTO_Q_UNLOCK();
+		return ENOMEM;
+	}
+	crypto_q_cnt++;
+
+	/* make sure we are starting a fresh run on this crp. */
+	crp->crp_flags &= ~CRYPTO_F_DONE;
+	crp->crp_etype = 0;
+
+	/*
+	 * Caller marked the request to be processed immediately; dispatch
+	 * it directly to the driver unless the driver is currently blocked.
+	 */
+	if ((crp->crp_flags & CRYPTO_F_BATCH) == 0) {
+		int hid = CRYPTO_SESID2HID(crp->crp_sid);
+		cap = crypto_checkdriver(hid);
+		/* Driver cannot disappear when there is an active session. */
+		KASSERT(cap != NULL, ("%s: Driver disappeared.", __func__));
+		if (!cap->cc_qblocked) {
+			crypto_all_qblocked = 0;
+			crypto_drivers[hid].cc_unqblocked = 1;
+			CRYPTO_Q_UNLOCK();
+			result = crypto_invoke(cap, crp, 0);
+			CRYPTO_Q_LOCK();
+			if (result == ERESTART)
+				if (crypto_drivers[hid].cc_unqblocked)
+					crypto_drivers[hid].cc_qblocked = 1;
+			crypto_drivers[hid].cc_unqblocked = 0;
+		}
+	}
+	if (result == ERESTART) {
+		/*
+		 * The driver ran out of resources, mark the
+		 * driver ``blocked'' for cryptop's and put
+		 * the request back in the queue.  It would
+		 * best to put the request back where we got
+		 * it but that's hard so for now we put it
+		 * at the front.  This should be ok; putting
+		 * it at the end does not work.
+		 */
+		list_add(&crp->crp_next, &crp_q);
+		cryptostats.cs_blocks++;
+		result = 0;
+	} else if (result == -1) {
+		TAILQ_INSERT_TAIL(&crp_q, crp, crp_next);
+		result = 0;
+	}
+	wake_up_interruptible(&cryptoproc_wait);
+	CRYPTO_Q_UNLOCK();
+	return result;
+}
+
+/*
+ * Add an asymetric crypto request to a queue,
+ * to be processed by the kernel thread.
+ */
+int
+crypto_kdispatch(struct cryptkop *krp)
+{
+	int error;
+	unsigned long q_flags;
+
+	cryptostats.cs_kops++;
+
+	error = crypto_kinvoke(krp, krp->krp_crid);
+	if (error == ERESTART) {
+		CRYPTO_Q_LOCK();
+		TAILQ_INSERT_TAIL(&crp_kq, krp, krp_next);
+		wake_up_interruptible(&cryptoproc_wait);
+		CRYPTO_Q_UNLOCK();
+		error = 0;
+	}
+	return error;
+}
+
+/*
+ * Verify a driver is suitable for the specified operation.
+ */
+static __inline int
+kdriver_suitable(const struct cryptocap *cap, const struct cryptkop *krp)
+{
+	return (cap->cc_kalg[krp->krp_op] & CRYPTO_ALG_FLAG_SUPPORTED) != 0;
+}
+
+/*
+ * Select a driver for an asym operation.  The driver must
+ * support the necessary algorithm.  The caller can constrain
+ * which device is selected with the flags parameter.  The
+ * algorithm we use here is pretty stupid; just use the first
+ * driver that supports the algorithms we need. If there are
+ * multiple suitable drivers we choose the driver with the
+ * fewest active operations.  We prefer hardware-backed
+ * drivers to software ones when either may be used.
+ */
+static struct cryptocap *
+crypto_select_kdriver(const struct cryptkop *krp, int flags)
+{
+	struct cryptocap *cap, *best, *blocked;
+	int match, hid;
+
+	CRYPTO_DRIVER_ASSERT();
+
+	/*
+	 * Look first for hardware crypto devices if permitted.
+	 */
+	if (flags & CRYPTOCAP_F_HARDWARE)
+		match = CRYPTOCAP_F_HARDWARE;
+	else
+		match = CRYPTOCAP_F_SOFTWARE;
+	best = NULL;
+	blocked = NULL;
+again:
+	for (hid = 0; hid < crypto_drivers_num; hid++) {
+		cap = &crypto_drivers[hid];
+		/*
+		 * If it's not initialized, is in the process of
+		 * going away, or is not appropriate (hardware
+		 * or software based on match), then skip.
+		 */
+		if (cap->cc_dev == NULL ||
+		    (cap->cc_flags & CRYPTOCAP_F_CLEANUP) ||
+		    (cap->cc_flags & match) == 0)
+			continue;
+
+		/* verify all the algorithms are supported. */
+		if (kdriver_suitable(cap, krp)) {
+			if (best == NULL ||
+			    cap->cc_koperations < best->cc_koperations)
+				best = cap;
+		}
+	}
+	if (best != NULL)
+		return best;
+	if (match == CRYPTOCAP_F_HARDWARE && (flags & CRYPTOCAP_F_SOFTWARE)) {
+		/* sort of an Algol 68-style for loop */
+		match = CRYPTOCAP_F_SOFTWARE;
+		goto again;
+	}
+	return best;
+}
+
+/*
+ * Dispatch an assymetric crypto request.
+ */
+static int
+crypto_kinvoke(struct cryptkop *krp, int crid)
+{
+	struct cryptocap *cap = NULL;
+	int error;
+	unsigned long d_flags;
+
+	KASSERT(krp != NULL, ("%s: krp == NULL", __func__));
+	KASSERT(krp->krp_callback != NULL,
+	    ("%s: krp->crp_callback == NULL", __func__));
+
+	CRYPTO_DRIVER_LOCK();
+	if ((crid & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
+		cap = crypto_checkdriver(crid);
+		if (cap != NULL) {
+			/*
+			 * Driver present, it must support the necessary
+			 * algorithm and, if s/w drivers are excluded,
+			 * it must be registered as hardware-backed.
+			 */
+			if (!kdriver_suitable(cap, krp) ||
+			    (!crypto_devallowsoft &&
+			     (cap->cc_flags & CRYPTOCAP_F_HARDWARE) == 0))
+				cap = NULL;
+		}
+	} else {
+		/*
+		 * No requested driver; select based on crid flags.
+		 */
+		if (!crypto_devallowsoft)	/* NB: disallow s/w drivers */
+			crid &= ~CRYPTOCAP_F_SOFTWARE;
+		cap = crypto_select_kdriver(krp, crid);
+	}
+	if (cap != NULL && !cap->cc_kqblocked) {
+		krp->krp_hid = cap - crypto_drivers;
+		cap->cc_koperations++;
+		CRYPTO_DRIVER_UNLOCK();
+		error = CRYPTODEV_KPROCESS(cap->cc_dev, krp, 0);
+		CRYPTO_DRIVER_LOCK();
+		if (error == ERESTART) {
+			cap->cc_koperations--;
+			CRYPTO_DRIVER_UNLOCK();
+			return (error);
+		}
+		/* return the actual device used */
+		krp->krp_crid = krp->krp_hid;
+	} else {
+		/*
+		 * NB: cap is !NULL if device is blocked; in
+		 *     that case return ERESTART so the operation
+		 *     is resubmitted if possible.
+		 */
+		error = (cap == NULL) ? ENODEV : ERESTART;
+	}
+	CRYPTO_DRIVER_UNLOCK();
+
+	if (error) {
+		krp->krp_status = error;
+		crypto_kdone(krp);
+	}
+	return 0;
+}
+
+
+/*
+ * Dispatch a crypto request to the appropriate crypto devices.
+ */
+static int
+crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint)
+{
+	KASSERT(crp != NULL, ("%s: crp == NULL", __func__));
+	KASSERT(crp->crp_callback != NULL,
+	    ("%s: crp->crp_callback == NULL", __func__));
+	KASSERT(crp->crp_desc != NULL, ("%s: crp->crp_desc == NULL", __func__));
+
+	dprintk("%s()\n", __FUNCTION__);
+
+#ifdef CRYPTO_TIMING
+	if (crypto_timing)
+		crypto_tstat(&cryptostats.cs_invoke, &crp->crp_tstamp);
+#endif
+	if (cap->cc_flags & CRYPTOCAP_F_CLEANUP) {
+		struct cryptodesc *crd;
+		u_int64_t nid;
+
+		/*
+		 * Driver has unregistered; migrate the session and return
+		 * an error to the caller so they'll resubmit the op.
+		 *
+		 * XXX: What if there are more already queued requests for this
+		 *      session?
+		 */
+		crypto_freesession(crp->crp_sid);
+
+		for (crd = crp->crp_desc; crd->crd_next; crd = crd->crd_next)
+			crd->CRD_INI.cri_next = &(crd->crd_next->CRD_INI);
+
+		/* XXX propagate flags from initial session? */
+		if (crypto_newsession(&nid, &(crp->crp_desc->CRD_INI),
+		    CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE) == 0)
+			crp->crp_sid = nid;
+
+		crp->crp_etype = EAGAIN;
+		crypto_done(crp);
+		return 0;
+	} else {
+		/*
+		 * Invoke the driver to process the request.
+		 */
+		return CRYPTODEV_PROCESS(cap->cc_dev, crp, hint);
+	}
+}
+
+/*
+ * Release a set of crypto descriptors.
+ */
+void
+crypto_freereq(struct cryptop *crp)
+{
+	struct cryptodesc *crd;
+
+	if (crp == NULL)
+		return;
+
+#ifdef DIAGNOSTIC
+	{
+		struct cryptop *crp2;
+		unsigned long q_flags;
+
+		CRYPTO_Q_LOCK();
+		TAILQ_FOREACH(crp2, &crp_q, crp_next) {
+			KASSERT(crp2 != crp,
+			    ("Freeing cryptop from the crypto queue (%p).",
+			    crp));
+		}
+		CRYPTO_Q_UNLOCK();
+		CRYPTO_RETQ_LOCK();
+		TAILQ_FOREACH(crp2, &crp_ret_q, crp_next) {
+			KASSERT(crp2 != crp,
+			    ("Freeing cryptop from the return queue (%p).",
+			    crp));
+		}
+		CRYPTO_RETQ_UNLOCK();
+	}
+#endif
+
+	while ((crd = crp->crp_desc) != NULL) {
+		crp->crp_desc = crd->crd_next;
+		kmem_cache_free(cryptodesc_zone, crd);
+	}
+	kmem_cache_free(cryptop_zone, crp);
+}
+
+/*
+ * Acquire a set of crypto descriptors.
+ */
+struct cryptop *
+crypto_getreq(int num)
+{
+	struct cryptodesc *crd;
+	struct cryptop *crp;
+
+	crp = kmem_cache_alloc(cryptop_zone, SLAB_ATOMIC);
+	if (crp != NULL) {
+		memset(crp, 0, sizeof(*crp));
+		INIT_LIST_HEAD(&crp->crp_next);
+		init_waitqueue_head(&crp->crp_waitq);
+		while (num--) {
+			crd = kmem_cache_alloc(cryptodesc_zone, SLAB_ATOMIC);
+			if (crd == NULL) {
+				crypto_freereq(crp);
+				return NULL;
+			}
+			memset(crd, 0, sizeof(*crd));
+			crd->crd_next = crp->crp_desc;
+			crp->crp_desc = crd;
+		}
+	}
+	return crp;
+}
+
+/*
+ * Invoke the callback on behalf of the driver.
+ */
+void
+crypto_done(struct cryptop *crp)
+{
+	unsigned long q_flags;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if ((crp->crp_flags & CRYPTO_F_DONE) == 0) {
+		crp->crp_flags |= CRYPTO_F_DONE;
+		CRYPTO_Q_LOCK();
+		crypto_q_cnt--;
+		CRYPTO_Q_UNLOCK();
+	} else
+		printk("crypto: crypto_done op already done, flags 0x%x",
+				crp->crp_flags);
+	if (crp->crp_etype != 0)
+		cryptostats.cs_errs++;
+	/*
+	 * CBIMM means unconditionally do the callback immediately;
+	 * CBIFSYNC means do the callback immediately only if the
+	 * operation was done synchronously.  Both are used to avoid
+	 * doing extraneous context switches; the latter is mostly
+	 * used with the software crypto driver.
+	 */
+	if ((crp->crp_flags & CRYPTO_F_CBIMM) ||
+	    ((crp->crp_flags & CRYPTO_F_CBIFSYNC) &&
+	     (CRYPTO_SESID2CAPS(crp->crp_sid) & CRYPTOCAP_F_SYNC))) {
+		/*
+		 * Do the callback directly.  This is ok when the
+		 * callback routine does very little (e.g. the
+		 * /dev/crypto callback method just does a wakeup).
+		 */
+		crp->crp_callback(crp);
+	} else {
+		unsigned long r_flags;
+		/*
+		 * Normal case; queue the callback for the thread.
+		 */
+		CRYPTO_RETQ_LOCK();
+		wake_up_interruptible(&cryptoretproc_wait);/* shared wait channel */
+		TAILQ_INSERT_TAIL(&crp_ret_q, crp, crp_next);
+		CRYPTO_RETQ_UNLOCK();
+	}
+}
+
+/*
+ * Invoke the callback on behalf of the driver.
+ */
+void
+crypto_kdone(struct cryptkop *krp)
+{
+	struct cryptocap *cap;
+	unsigned long d_flags;
+
+	if ((krp->krp_flags & CRYPTO_KF_DONE) != 0)
+		printk("crypto: crypto_kdone op already done, flags 0x%x",
+				krp->krp_flags);
+	krp->krp_flags |= CRYPTO_KF_DONE;
+	if (krp->krp_status != 0)
+		cryptostats.cs_kerrs++;
+
+	CRYPTO_DRIVER_LOCK();
+	/* XXX: What if driver is loaded in the meantime? */
+	if (krp->krp_hid < crypto_drivers_num) {
+		cap = &crypto_drivers[krp->krp_hid];
+		cap->cc_koperations--;
+		KASSERT(cap->cc_koperations >= 0, ("cc_koperations < 0"));
+		if (cap->cc_flags & CRYPTOCAP_F_CLEANUP)
+			crypto_remove(cap);
+	}
+	CRYPTO_DRIVER_UNLOCK();
+
+	/*
+	 * CBIMM means unconditionally do the callback immediately;
+	 * This is used to avoid doing extraneous context switches
+	 */
+	if ((krp->krp_flags & CRYPTO_KF_CBIMM)) {
+		/*
+		 * Do the callback directly.  This is ok when the
+		 * callback routine does very little (e.g. the
+		 * /dev/crypto callback method just does a wakeup).
+		 */
+		krp->krp_callback(krp);
+	} else {
+		unsigned long r_flags;
+		/*
+		 * Normal case; queue the callback for the thread.
+		 */
+		CRYPTO_RETQ_LOCK();
+		wake_up_interruptible(&cryptoretproc_wait);/* shared wait channel */
+		TAILQ_INSERT_TAIL(&crp_ret_kq, krp, krp_next);
+		CRYPTO_RETQ_UNLOCK();
+	}
+}
+
+int
+crypto_getfeat(int *featp)
+{
+	int hid, kalg, feat = 0;
+	unsigned long d_flags;
+
+	CRYPTO_DRIVER_LOCK();
+	for (hid = 0; hid < crypto_drivers_num; hid++) {
+		const struct cryptocap *cap = &crypto_drivers[hid];
+
+		if ((cap->cc_flags & CRYPTOCAP_F_SOFTWARE) &&
+		    !crypto_devallowsoft) {
+			continue;
+		}
+		for (kalg = 0; kalg < CRK_ALGORITHM_MAX; kalg++)
+			if (cap->cc_kalg[kalg] & CRYPTO_ALG_FLAG_SUPPORTED)
+				feat |=  1 << kalg;
+	}
+	CRYPTO_DRIVER_UNLOCK();
+	*featp = feat;
+	return (0);
+}
+
+/*
+ * Crypto thread, dispatches crypto requests.
+ */
+static int
+crypto_proc(void *arg)
+{
+	struct cryptop *crp, *submit;
+	struct cryptkop *krp, *krpp;
+	struct cryptocap *cap;
+	u_int32_t hid;
+	int result, hint;
+	unsigned long q_flags;
+	int loopcount = 0;
+
+	set_current_state(TASK_INTERRUPTIBLE);
+
+	CRYPTO_Q_LOCK();
+	for (;;) {
+		/*
+		 * we need to make sure we don't get into a busy loop with nothing
+		 * to do,  the two crypto_all_*blocked vars help us find out when
+		 * we are all full and can do nothing on any driver or Q.  If so we
+		 * wait for an unblock.
+		 */
+		crypto_all_qblocked  = !list_empty(&crp_q);
+
+		/*
+		 * Find the first element in the queue that can be
+		 * processed and look-ahead to see if multiple ops
+		 * are ready for the same driver.
+		 */
+		submit = NULL;
+		hint = 0;
+		list_for_each_entry(crp, &crp_q, crp_next) {
+			hid = CRYPTO_SESID2HID(crp->crp_sid);
+			cap = crypto_checkdriver(hid);
+			/*
+			 * Driver cannot disappear when there is an active
+			 * session.
+			 */
+			KASSERT(cap != NULL, ("%s:%u Driver disappeared.",
+			    __func__, __LINE__));
+			if (cap == NULL || cap->cc_dev == NULL) {
+				/* Op needs to be migrated, process it. */
+				if (submit == NULL)
+					submit = crp;
+				break;
+			}
+			if (!cap->cc_qblocked) {
+				if (submit != NULL) {
+					/*
+					 * We stop on finding another op,
+					 * regardless whether its for the same
+					 * driver or not.  We could keep
+					 * searching the queue but it might be
+					 * better to just use a per-driver
+					 * queue instead.
+					 */
+					if (CRYPTO_SESID2HID(submit->crp_sid) == hid)
+						hint = CRYPTO_HINT_MORE;
+					break;
+				} else {
+					submit = crp;
+					if ((submit->crp_flags & CRYPTO_F_BATCH) == 0)
+						break;
+					/* keep scanning for more are q'd */
+				}
+			}
+		}
+		if (submit != NULL) {
+			hid = CRYPTO_SESID2HID(submit->crp_sid);
+			crypto_all_qblocked = 0;
+			list_del(&submit->crp_next);
+			crypto_drivers[hid].cc_unqblocked = 1;
+			cap = crypto_checkdriver(hid);
+			CRYPTO_Q_UNLOCK();
+			KASSERT(cap != NULL, ("%s:%u Driver disappeared.",
+			    __func__, __LINE__));
+			result = crypto_invoke(cap, submit, hint);
+			CRYPTO_Q_LOCK();
+			if (result == ERESTART) {
+				/*
+				 * The driver ran out of resources, mark the
+				 * driver ``blocked'' for cryptop's and put
+				 * the request back in the queue.  It would
+				 * best to put the request back where we got
+				 * it but that's hard so for now we put it
+				 * at the front.  This should be ok; putting
+				 * it at the end does not work.
+				 */
+				/* XXX validate sid again? */
+				list_add(&submit->crp_next, &crp_q);
+				cryptostats.cs_blocks++;
+				if (crypto_drivers[hid].cc_unqblocked)
+					crypto_drivers[hid].cc_qblocked=0;
+				crypto_drivers[hid].cc_unqblocked=0;
+			}
+			crypto_drivers[hid].cc_unqblocked = 0;
+		}
+
+		crypto_all_kqblocked = !list_empty(&crp_kq);
+
+		/* As above, but for key ops */
+		krp = NULL;
+		list_for_each_entry(krpp, &crp_kq, krp_next) {
+			cap = crypto_checkdriver(krpp->krp_hid);
+			if (cap == NULL || cap->cc_dev == NULL) {
+				/*
+				 * Operation needs to be migrated, invalidate
+				 * the assigned device so it will reselect a
+				 * new one below.  Propagate the original
+				 * crid selection flags if supplied.
+				 */
+				krp->krp_hid = krp->krp_crid &
+				    (CRYPTOCAP_F_SOFTWARE|CRYPTOCAP_F_HARDWARE);
+				if (krp->krp_hid == 0)
+					krp->krp_hid =
+				    CRYPTOCAP_F_SOFTWARE|CRYPTOCAP_F_HARDWARE;
+				break;
+			}
+			if (!cap->cc_kqblocked) {
+				krp = krpp;
+				break;
+			}
+		}
+		if (krp != NULL) {
+			crypto_all_kqblocked = 0;
+			list_del(&krp->krp_next);
+			crypto_drivers[krp->krp_hid].cc_kqblocked = 1;
+			CRYPTO_Q_UNLOCK();
+			result = crypto_kinvoke(krp, krp->krp_hid);
+			CRYPTO_Q_LOCK();
+			if (result == ERESTART) {
+				/*
+				 * The driver ran out of resources, mark the
+				 * driver ``blocked'' for cryptkop's and put
+				 * the request back in the queue.  It would
+				 * best to put the request back where we got
+				 * it but that's hard so for now we put it
+				 * at the front.  This should be ok; putting
+				 * it at the end does not work.
+				 */
+				/* XXX validate sid again? */
+				list_add(&krp->krp_next, &crp_kq);
+				cryptostats.cs_kblocks++;
+			} else
+				crypto_drivers[krp->krp_hid].cc_kqblocked = 0;
+		}
+
+		if (submit == NULL && krp == NULL) {
+			/*
+			 * Nothing more to be processed.  Sleep until we're
+			 * woken because there are more ops to process.
+			 * This happens either by submission or by a driver
+			 * becoming unblocked and notifying us through
+			 * crypto_unblock.  Note that when we wakeup we
+			 * start processing each queue again from the
+			 * front. It's not clear that it's important to
+			 * preserve this ordering since ops may finish
+			 * out of order if dispatched to different devices
+			 * and some become blocked while others do not.
+			 */
+			dprintk("%s - sleeping (qe=%d qb=%d kqe=%d kqb=%d)\n",
+					__FUNCTION__,
+					list_empty(&crp_q), crypto_all_qblocked,
+					list_empty(&crp_kq), crypto_all_kqblocked);
+			loopcount = 0;
+			CRYPTO_Q_UNLOCK();
+			wait_event_interruptible(cryptoproc_wait,
+					!(list_empty(&crp_q) || crypto_all_qblocked) ||
+					!(list_empty(&crp_kq) || crypto_all_kqblocked) ||
+					kthread_should_stop());
+			if (signal_pending (current)) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+				spin_lock_irq(&current->sigmask_lock);
+#endif
+				flush_signals(current);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+				spin_unlock_irq(&current->sigmask_lock);
+#endif
+			}
+			CRYPTO_Q_LOCK();
+			dprintk("%s - awake\n", __FUNCTION__);
+			if (kthread_should_stop())
+				break;
+			cryptostats.cs_intrs++;
+		} else if (loopcount > crypto_max_loopcount) {
+			/*
+			 * Give other processes a chance to run if we've 
+			 * been using the CPU exclusively for a while.
+			 */
+			loopcount = 0;
+			CRYPTO_Q_UNLOCK();
+			schedule();
+			CRYPTO_Q_LOCK();
+		}
+		loopcount++;
+	}
+	CRYPTO_Q_UNLOCK();
+	return 0;
+}
+
+/*
+ * Crypto returns thread, does callbacks for processed crypto requests.
+ * Callbacks are done here, rather than in the crypto drivers, because
+ * callbacks typically are expensive and would slow interrupt handling.
+ */
+static int
+crypto_ret_proc(void *arg)
+{
+	struct cryptop *crpt;
+	struct cryptkop *krpt;
+	unsigned long  r_flags;
+
+	set_current_state(TASK_INTERRUPTIBLE);
+
+	CRYPTO_RETQ_LOCK();
+	for (;;) {
+		/* Harvest return q's for completed ops */
+		crpt = NULL;
+		if (!list_empty(&crp_ret_q))
+			crpt = list_entry(crp_ret_q.next, typeof(*crpt), crp_next);
+		if (crpt != NULL)
+			list_del(&crpt->crp_next);
+
+		krpt = NULL;
+		if (!list_empty(&crp_ret_kq))
+			krpt = list_entry(crp_ret_kq.next, typeof(*krpt), krp_next);
+		if (krpt != NULL)
+			list_del(&krpt->krp_next);
+
+		if (crpt != NULL || krpt != NULL) {
+			CRYPTO_RETQ_UNLOCK();
+			/*
+			 * Run callbacks unlocked.
+			 */
+			if (crpt != NULL)
+				crpt->crp_callback(crpt);
+			if (krpt != NULL)
+				krpt->krp_callback(krpt);
+			CRYPTO_RETQ_LOCK();
+		} else {
+			/*
+			 * Nothing more to be processed.  Sleep until we're
+			 * woken because there are more returns to process.
+			 */
+			dprintk("%s - sleeping\n", __FUNCTION__);
+			CRYPTO_RETQ_UNLOCK();
+			wait_event_interruptible(cryptoretproc_wait,
+					!list_empty(&crp_ret_q) ||
+					!list_empty(&crp_ret_kq) ||
+					kthread_should_stop());
+			if (signal_pending (current)) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+				spin_lock_irq(&current->sigmask_lock);
+#endif
+				flush_signals(current);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+				spin_unlock_irq(&current->sigmask_lock);
+#endif
+			}
+			CRYPTO_RETQ_LOCK();
+			dprintk("%s - awake\n", __FUNCTION__);
+			if (kthread_should_stop()) {
+				dprintk("%s - EXITING!\n", __FUNCTION__);
+				break;
+			}
+			cryptostats.cs_rets++;
+		}
+	}
+	CRYPTO_RETQ_UNLOCK();
+	return 0;
+}
+
+
+#if 0 /* should put this into /proc or something */
+static void
+db_show_drivers(void)
+{
+	int hid;
+
+	db_printf("%12s %4s %4s %8s %2s %2s\n"
+		, "Device"
+		, "Ses"
+		, "Kops"
+		, "Flags"
+		, "QB"
+		, "KB"
+	);
+	for (hid = 0; hid < crypto_drivers_num; hid++) {
+		const struct cryptocap *cap = &crypto_drivers[hid];
+		if (cap->cc_dev == NULL)
+			continue;
+		db_printf("%-12s %4u %4u %08x %2u %2u\n"
+		    , device_get_nameunit(cap->cc_dev)
+		    , cap->cc_sessions
+		    , cap->cc_koperations
+		    , cap->cc_flags
+		    , cap->cc_qblocked
+		    , cap->cc_kqblocked
+		);
+	}
+}
+
+DB_SHOW_COMMAND(crypto, db_show_crypto)
+{
+	struct cryptop *crp;
+
+	db_show_drivers();
+	db_printf("\n");
+
+	db_printf("%4s %8s %4s %4s %4s %4s %8s %8s\n",
+	    "HID", "Caps", "Ilen", "Olen", "Etype", "Flags",
+	    "Desc", "Callback");
+	TAILQ_FOREACH(crp, &crp_q, crp_next) {
+		db_printf("%4u %08x %4u %4u %4u %04x %8p %8p\n"
+		    , (int) CRYPTO_SESID2HID(crp->crp_sid)
+		    , (int) CRYPTO_SESID2CAPS(crp->crp_sid)
+		    , crp->crp_ilen, crp->crp_olen
+		    , crp->crp_etype
+		    , crp->crp_flags
+		    , crp->crp_desc
+		    , crp->crp_callback
+		);
+	}
+	if (!TAILQ_EMPTY(&crp_ret_q)) {
+		db_printf("\n%4s %4s %4s %8s\n",
+		    "HID", "Etype", "Flags", "Callback");
+		TAILQ_FOREACH(crp, &crp_ret_q, crp_next) {
+			db_printf("%4u %4u %04x %8p\n"
+			    , (int) CRYPTO_SESID2HID(crp->crp_sid)
+			    , crp->crp_etype
+			    , crp->crp_flags
+			    , crp->crp_callback
+			);
+		}
+	}
+}
+
+DB_SHOW_COMMAND(kcrypto, db_show_kcrypto)
+{
+	struct cryptkop *krp;
+
+	db_show_drivers();
+	db_printf("\n");
+
+	db_printf("%4s %5s %4s %4s %8s %4s %8s\n",
+	    "Op", "Status", "#IP", "#OP", "CRID", "HID", "Callback");
+	TAILQ_FOREACH(krp, &crp_kq, krp_next) {
+		db_printf("%4u %5u %4u %4u %08x %4u %8p\n"
+		    , krp->krp_op
+		    , krp->krp_status
+		    , krp->krp_iparams, krp->krp_oparams
+		    , krp->krp_crid, krp->krp_hid
+		    , krp->krp_callback
+		);
+	}
+	if (!TAILQ_EMPTY(&crp_ret_q)) {
+		db_printf("%4s %5s %8s %4s %8s\n",
+		    "Op", "Status", "CRID", "HID", "Callback");
+		TAILQ_FOREACH(krp, &crp_ret_kq, krp_next) {
+			db_printf("%4u %5u %08x %4u %8p\n"
+			    , krp->krp_op
+			    , krp->krp_status
+			    , krp->krp_crid, krp->krp_hid
+			    , krp->krp_callback
+			);
+		}
+	}
+}
+#endif
+
+
+static int
+crypto_init(void)
+{
+	int error;
+	unsigned long cpu;
+
+	dprintk("%s(%p)\n", __FUNCTION__, (void *) crypto_init);
+
+	if (crypto_initted)
+		return 0;
+	crypto_initted = 1;
+
+	spin_lock_init(&crypto_drivers_lock);
+	spin_lock_init(&crypto_q_lock);
+	spin_lock_init(&crypto_ret_q_lock);
+
+	cryptop_zone = kmem_cache_create("cryptop", sizeof(struct cryptop),
+				       0, SLAB_HWCACHE_ALIGN, NULL
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+				       , NULL
+#endif
+					);
+
+	cryptodesc_zone = kmem_cache_create("cryptodesc", sizeof(struct cryptodesc),
+				       0, SLAB_HWCACHE_ALIGN, NULL
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+				       , NULL
+#endif
+					);
+
+	if (cryptodesc_zone == NULL || cryptop_zone == NULL) {
+		printk("crypto: crypto_init cannot setup crypto zones\n");
+		error = ENOMEM;
+		goto bad;
+	}
+
+	crypto_drivers_num = CRYPTO_DRIVERS_INITIAL;
+	crypto_drivers = kmalloc(crypto_drivers_num * sizeof(struct cryptocap),
+			GFP_KERNEL);
+	if (crypto_drivers == NULL) {
+		printk("crypto: crypto_init cannot setup crypto drivers\n");
+		error = ENOMEM;
+		goto bad;
+	}
+
+	memset(crypto_drivers, 0, crypto_drivers_num * sizeof(struct cryptocap));
+
+	ocf_for_each_cpu(cpu) {
+		cryptoproc[cpu] = kthread_create(crypto_proc, (void *) cpu,
+									"ocf_%d", (int) cpu);
+		if (IS_ERR(cryptoproc[cpu])) {
+			error = PTR_ERR(cryptoproc[cpu]);
+			printk("crypto: crypto_init cannot start crypto thread; error %d",
+				error);
+			goto bad;
+		}
+		kthread_bind(cryptoproc[cpu], cpu);
+		wake_up_process(cryptoproc[cpu]);
+
+		cryptoretproc[cpu] = kthread_create(crypto_ret_proc, (void *) cpu,
+									"ocf_ret_%d", (int) cpu);
+		if (IS_ERR(cryptoretproc[cpu])) {
+			error = PTR_ERR(cryptoretproc[cpu]);
+			printk("crypto: crypto_init cannot start cryptoret thread; error %d",
+					error);
+			goto bad;
+		}
+		kthread_bind(cryptoretproc[cpu], cpu);
+		wake_up_process(cryptoretproc[cpu]);
+	}
+
+	return 0;
+bad:
+	crypto_exit();
+	return error;
+}
+
+
+static void
+crypto_exit(void)
+{
+	int cpu;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	/*
+	 * Terminate any crypto threads.
+	 */
+	ocf_for_each_cpu(cpu) {
+		kthread_stop(cryptoproc[cpu]);
+		kthread_stop(cryptoretproc[cpu]);
+	}
+
+	/* 
+	 * Reclaim dynamically allocated resources.
+	 */
+	if (crypto_drivers != NULL)
+		kfree(crypto_drivers);
+
+	if (cryptodesc_zone != NULL)
+		kmem_cache_destroy(cryptodesc_zone);
+	if (cryptop_zone != NULL)
+		kmem_cache_destroy(cryptop_zone);
+}
+
+
+EXPORT_SYMBOL(crypto_newsession);
+EXPORT_SYMBOL(crypto_freesession);
+EXPORT_SYMBOL(crypto_get_driverid);
+EXPORT_SYMBOL(crypto_kregister);
+EXPORT_SYMBOL(crypto_register);
+EXPORT_SYMBOL(crypto_unregister);
+EXPORT_SYMBOL(crypto_unregister_all);
+EXPORT_SYMBOL(crypto_unblock);
+EXPORT_SYMBOL(crypto_dispatch);
+EXPORT_SYMBOL(crypto_kdispatch);
+EXPORT_SYMBOL(crypto_freereq);
+EXPORT_SYMBOL(crypto_getreq);
+EXPORT_SYMBOL(crypto_done);
+EXPORT_SYMBOL(crypto_kdone);
+EXPORT_SYMBOL(crypto_getfeat);
+EXPORT_SYMBOL(crypto_userasymcrypto);
+EXPORT_SYMBOL(crypto_getcaps);
+EXPORT_SYMBOL(crypto_find_driver);
+EXPORT_SYMBOL(crypto_find_device_byhid);
+
+module_init(crypto_init);
+module_exit(crypto_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("OCF (OpenBSD Cryptographic Framework)");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/Makefile b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/Makefile
new file mode 100644
index 00000000..eeed0d64
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/Makefile
@@ -0,0 +1,17 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_CRYPTOCTEON) += cryptocteon.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
+
+ifdef CONFIG_OCF_CRYPTOCTEON
+# you need the cavium crypto component installed
+EXTRA_CFLAGS += -I$(ROOTDIR)/prop/include
+endif
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/README.txt b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/README.txt
new file mode 100644
index 00000000..807b2e51
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/README.txt
@@ -0,0 +1,11 @@
+
+You will need the CRYPTO package installed to build this driver,  and
+potentially the ADK.
+
+cavium_crypto sourced from:
+
+	adk/components/source/cavium_ipsec_kame/cavium_ipsec.c
+
+and significantly modified to suit use with OCF.  All original
+copyright/ownership headers retained.
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cavium_crypto.c b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cavium_crypto.c
new file mode 100644
index 00000000..ceaf77c5
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cavium_crypto.c
@@ -0,0 +1,2283 @@
+/*
+ * Copyright (c) 2009 David McCullough <david.mccullough@securecomputing.com>
+ *
+ * Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
+ * reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Cavium Networks
+ * 4. Cavium Networks' name may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ * 
+ * This Software, including technical data, may be subject to U.S. export
+ * control laws, including the U.S. Export Administration Act and its
+ * associated regulations, and may be subject to export or import regulations
+ * in other countries. You warrant that You will comply strictly in all
+ * respects with all such regulations and acknowledge that you have the
+ * responsibility to obtain licenses to export, re-export or import the
+ * Software.
+ * 
+ * TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" AND
+ * WITH ALL FAULTS AND CAVIUM MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES,
+ * EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE
+ * SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR
+ * DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM
+ * SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE,
+ * MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF
+ * VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR
+ * CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR
+ * PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
+*/
+/****************************************************************************/
+
+#include <linux/scatterlist.h>
+#include <asm/octeon/octeon.h>
+#include "octeon-asm.h"
+
+/****************************************************************************/
+
+extern unsigned long octeon_crypto_enable(struct octeon_cop2_state *);
+extern void octeon_crypto_disable(struct octeon_cop2_state *, unsigned long);
+
+#define SG_INIT(s, p, i, l) \
+	{ \
+	    (i) = 0; \
+	    (l) = (s)[0].length; \
+	    (p) = (typeof(p)) sg_virt((s)); \
+		CVMX_PREFETCH0((p)); \
+	}
+
+#define SG_CONSUME(s, p, i, l) \
+	{ \
+		(p)++; \
+		(l) -= sizeof(*(p)); \
+		if ((l) < 0) { \
+			dprintk("%s, %d: l = %d\n", __FILE__, __LINE__, l); \
+		} else if ((l) == 0) { \
+		    (i)++; \
+		    (l) = (s)[0].length; \
+		    (p) = (typeof(p)) sg_virt(s); \
+			CVMX_PREFETCH0((p)); \
+		} \
+	}
+
+#define ESP_HEADER_LENGTH     8
+#define DES_CBC_IV_LENGTH     8
+#define AES_CBC_IV_LENGTH     16
+#define ESP_HMAC_LEN          12
+
+#define ESP_HEADER_LENGTH 8
+#define DES_CBC_IV_LENGTH 8
+
+/****************************************************************************/
+
+#define CVM_LOAD_SHA_UNIT(dat, next)  { \
+   if (next == 0) {                     \
+      next = 1;                         \
+      CVMX_MT_HSH_DAT (dat, 0);         \
+   } else if (next == 1) {              \
+      next = 2;                         \
+      CVMX_MT_HSH_DAT (dat, 1);         \
+   } else if (next == 2) {              \
+      next = 3;                    \
+      CVMX_MT_HSH_DAT (dat, 2);         \
+   } else if (next == 3) {              \
+      next = 4;                         \
+      CVMX_MT_HSH_DAT (dat, 3);         \
+   } else if (next == 4) {              \
+      next = 5;                           \
+      CVMX_MT_HSH_DAT (dat, 4);         \
+   } else if (next == 5) {              \
+      next = 6;                         \
+      CVMX_MT_HSH_DAT (dat, 5);         \
+   } else if (next == 6) {              \
+      next = 7;                         \
+      CVMX_MT_HSH_DAT (dat, 6);         \
+   } else {                             \
+     CVMX_MT_HSH_STARTSHA (dat);        \
+     next = 0;                          \
+   }                                    \
+}
+
+#define CVM_LOAD2_SHA_UNIT(dat1, dat2, next)  { \
+   if (next == 0) {                      \
+      CVMX_MT_HSH_DAT (dat1, 0);         \
+      CVMX_MT_HSH_DAT (dat2, 1);         \
+      next = 2;                          \
+   } else if (next == 1) {               \
+      CVMX_MT_HSH_DAT (dat1, 1);         \
+      CVMX_MT_HSH_DAT (dat2, 2);         \
+      next = 3;                          \
+   } else if (next == 2) {               \
+      CVMX_MT_HSH_DAT (dat1, 2);         \
+      CVMX_MT_HSH_DAT (dat2, 3);         \
+      next = 4;                          \
+   } else if (next == 3) {               \
+      CVMX_MT_HSH_DAT (dat1, 3);         \
+      CVMX_MT_HSH_DAT (dat2, 4);         \
+      next = 5;                          \
+   } else if (next == 4) {               \
+      CVMX_MT_HSH_DAT (dat1, 4);         \
+      CVMX_MT_HSH_DAT (dat2, 5);         \
+      next = 6;                          \
+   } else if (next == 5) {               \
+      CVMX_MT_HSH_DAT (dat1, 5);         \
+      CVMX_MT_HSH_DAT (dat2, 6);         \
+      next = 7;                          \
+   } else if (next == 6) {               \
+      CVMX_MT_HSH_DAT (dat1, 6);         \
+      CVMX_MT_HSH_STARTSHA (dat2);       \
+      next = 0;                          \
+   } else {                              \
+     CVMX_MT_HSH_STARTSHA (dat1);        \
+     CVMX_MT_HSH_DAT (dat2, 0);          \
+     next = 1;                           \
+   }                                     \
+}
+
+/****************************************************************************/
+
+#define CVM_LOAD_MD5_UNIT(dat, next)  { \
+   if (next == 0) {                     \
+      next = 1;                         \
+      CVMX_MT_HSH_DAT (dat, 0);         \
+   } else if (next == 1) {              \
+      next = 2;                         \
+      CVMX_MT_HSH_DAT (dat, 1);         \
+   } else if (next == 2) {              \
+      next = 3;                    \
+      CVMX_MT_HSH_DAT (dat, 2);         \
+   } else if (next == 3) {              \
+      next = 4;                         \
+      CVMX_MT_HSH_DAT (dat, 3);         \
+   } else if (next == 4) {              \
+      next = 5;                           \
+      CVMX_MT_HSH_DAT (dat, 4);         \
+   } else if (next == 5) {              \
+      next = 6;                         \
+      CVMX_MT_HSH_DAT (dat, 5);         \
+   } else if (next == 6) {              \
+      next = 7;                         \
+      CVMX_MT_HSH_DAT (dat, 6);         \
+   } else {                             \
+     CVMX_MT_HSH_STARTMD5 (dat);        \
+     next = 0;                          \
+   }                                    \
+}
+
+#define CVM_LOAD2_MD5_UNIT(dat1, dat2, next)  { \
+   if (next == 0) {                      \
+      CVMX_MT_HSH_DAT (dat1, 0);         \
+      CVMX_MT_HSH_DAT (dat2, 1);         \
+      next = 2;                          \
+   } else if (next == 1) {               \
+      CVMX_MT_HSH_DAT (dat1, 1);         \
+      CVMX_MT_HSH_DAT (dat2, 2);         \
+      next = 3;                          \
+   } else if (next == 2) {               \
+      CVMX_MT_HSH_DAT (dat1, 2);         \
+      CVMX_MT_HSH_DAT (dat2, 3);         \
+      next = 4;                          \
+   } else if (next == 3) {               \
+      CVMX_MT_HSH_DAT (dat1, 3);         \
+      CVMX_MT_HSH_DAT (dat2, 4);         \
+      next = 5;                          \
+   } else if (next == 4) {               \
+      CVMX_MT_HSH_DAT (dat1, 4);         \
+      CVMX_MT_HSH_DAT (dat2, 5);         \
+      next = 6;                          \
+   } else if (next == 5) {               \
+      CVMX_MT_HSH_DAT (dat1, 5);         \
+      CVMX_MT_HSH_DAT (dat2, 6);         \
+      next = 7;                          \
+   } else if (next == 6) {               \
+      CVMX_MT_HSH_DAT (dat1, 6);         \
+      CVMX_MT_HSH_STARTMD5 (dat2);       \
+      next = 0;                          \
+   } else {                              \
+     CVMX_MT_HSH_STARTMD5 (dat1);        \
+     CVMX_MT_HSH_DAT (dat2, 0);          \
+     next = 1;                           \
+   }                                     \
+}
+
+/****************************************************************************/
+
+static inline uint64_t
+swap64(uint64_t a)
+{
+    return ((a >> 56) |
+       (((a >> 48) & 0xfful) << 8) |
+       (((a >> 40) & 0xfful) << 16) |
+       (((a >> 32) & 0xfful) << 24) |
+       (((a >> 24) & 0xfful) << 32) |
+       (((a >> 16) & 0xfful) << 40) |
+       (((a >> 8) & 0xfful) << 48) | (((a >> 0) & 0xfful) << 56));
+}
+
+/****************************************************************************/
+
+void
+octo_calc_hash(__u8 auth, unsigned char *key, uint64_t *inner, uint64_t *outer)
+{
+    uint8_t hash_key[64];
+    uint64_t *key1;
+    register uint64_t xor1 = 0x3636363636363636ULL;
+    register uint64_t xor2 = 0x5c5c5c5c5c5c5c5cULL;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    memset(hash_key, 0, sizeof(hash_key));
+    memcpy(hash_key, (uint8_t *) key, (auth ? 20 : 16));
+    key1 = (uint64_t *) hash_key;
+    flags = octeon_crypto_enable(&state);
+    if (auth) {
+       CVMX_MT_HSH_IV(0x67452301EFCDAB89ULL, 0);
+       CVMX_MT_HSH_IV(0x98BADCFE10325476ULL, 1);
+       CVMX_MT_HSH_IV(0xC3D2E1F000000000ULL, 2);
+    } else {
+       CVMX_MT_HSH_IV(0x0123456789ABCDEFULL, 0);
+       CVMX_MT_HSH_IV(0xFEDCBA9876543210ULL, 1);
+    }
+
+    CVMX_MT_HSH_DAT((*key1 ^ xor1), 0);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor1), 1);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor1), 2);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor1), 3);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor1), 4);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor1), 5);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor1), 6);
+    key1++;
+    if (auth)
+	CVMX_MT_HSH_STARTSHA((*key1 ^ xor1));
+    else
+	CVMX_MT_HSH_STARTMD5((*key1 ^ xor1));
+
+    CVMX_MF_HSH_IV(inner[0], 0);
+    CVMX_MF_HSH_IV(inner[1], 1);
+    if (auth) {
+	inner[2] = 0;
+	CVMX_MF_HSH_IV(((uint64_t *) inner)[2], 2);
+    }
+
+    memset(hash_key, 0, sizeof(hash_key));
+    memcpy(hash_key, (uint8_t *) key, (auth ? 20 : 16));
+    key1 = (uint64_t *) hash_key;
+    if (auth) {
+      CVMX_MT_HSH_IV(0x67452301EFCDAB89ULL, 0);
+      CVMX_MT_HSH_IV(0x98BADCFE10325476ULL, 1);
+      CVMX_MT_HSH_IV(0xC3D2E1F000000000ULL, 2);
+    } else {
+      CVMX_MT_HSH_IV(0x0123456789ABCDEFULL, 0);
+      CVMX_MT_HSH_IV(0xFEDCBA9876543210ULL, 1);
+    }
+
+    CVMX_MT_HSH_DAT((*key1 ^ xor2), 0);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor2), 1);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor2), 2);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor2), 3);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor2), 4);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor2), 5);
+    key1++;
+    CVMX_MT_HSH_DAT((*key1 ^ xor2), 6);
+    key1++;
+    if (auth)
+       CVMX_MT_HSH_STARTSHA((*key1 ^ xor2));
+    else 
+       CVMX_MT_HSH_STARTMD5((*key1 ^ xor2));
+
+    CVMX_MF_HSH_IV(outer[0], 0);
+    CVMX_MF_HSH_IV(outer[1], 1);
+    if (auth) {
+      outer[2] = 0;
+      CVMX_MF_HSH_IV(outer[2], 2);
+    }
+    octeon_crypto_disable(&state, flags);
+    return;
+}
+
+/****************************************************************************/
+/* DES functions */
+
+int
+octo_des_cbc_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    uint64_t *data;
+    int data_i, data_l;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load 3DES Key */
+    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    if (od->octo_encklen == 24) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+    } else if (od->octo_encklen == 8) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+
+    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
+
+    while (crypt_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_off -= 8;
+    }
+
+    while (crypt_len > 0) {
+	CVMX_MT_3DES_ENC_CBC(*data);
+	CVMX_MF_3DES_RESULT(*data);
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_len -= 8;
+    }
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+
+int
+octo_des_cbc_decrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    uint64_t *data;
+    int data_i, data_l;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load 3DES Key */
+    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    if (od->octo_encklen == 24) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+    } else if (od->octo_encklen == 8) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+
+    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
+
+    while (crypt_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_off -= 8;
+    }
+
+    while (crypt_len > 0) {
+	CVMX_MT_3DES_DEC_CBC(*data);
+	CVMX_MF_3DES_RESULT(*data);
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_len -= 8;
+    }
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
+/* AES functions */
+
+int
+octo_aes_cbc_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    uint64_t *data, *pdata;
+    int data_i, data_l;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load AES Key */
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+
+    if (od->octo_encklen == 16) {
+	CVMX_MT_AES_KEY(0x0, 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 24) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 32) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
+
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
+
+    while (crypt_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_off -= 8;
+    }
+
+    while (crypt_len > 0) {
+	pdata = data;
+	CVMX_MT_AES_ENC_CBC0(*data);
+	SG_CONSUME(sg, data, data_i, data_l);
+	CVMX_MT_AES_ENC_CBC1(*data);
+	CVMX_MF_AES_RESULT(*pdata, 0);
+	CVMX_MF_AES_RESULT(*data, 1);
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_len -= 16;
+    }
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+
+int
+octo_aes_cbc_decrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    uint64_t *data, *pdata;
+    int data_i, data_l;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load AES Key */
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+
+    if (od->octo_encklen == 16) {
+	CVMX_MT_AES_KEY(0x0, 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 24) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 32) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
+
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
+
+    while (crypt_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_off -= 8;
+    }
+
+    while (crypt_len > 0) {
+	pdata = data;
+	CVMX_MT_AES_DEC_CBC0(*data);
+	SG_CONSUME(sg, data, data_i, data_l);
+	CVMX_MT_AES_DEC_CBC1(*data);
+	CVMX_MF_AES_RESULT(*pdata, 0);
+	CVMX_MF_AES_RESULT(*data, 1);
+	SG_CONSUME(sg, data, data_i, data_l);
+	crypt_len -= 16;
+    }
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
+/* MD5 */
+
+int
+octo_null_md5_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    uint64_t *data;
+    uint64_t tmp1, tmp2;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 ||
+	    (auth_off & 0x7) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data, data_i, data_l);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* Load MD5 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+
+    while (auth_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	auth_off -= 8;
+    }
+
+    while (auth_len > 0) {
+	CVM_LOAD_MD5_UNIT(*data, next);
+	auth_len -= 8;
+	SG_CONSUME(sg, data, data_i, data_l);
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVMX_ES64(tmp1, ((alen + 64) << 3));
+    CVM_LOAD_MD5_UNIT(tmp1, next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_ES64(tmp1, ((64 + 16) << 3));
+    CVMX_MT_HSH_STARTMD5(tmp1);
+
+    /* save the HMAC */
+    SG_INIT(sg, data, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	icv_off -= 8;
+    }
+    CVMX_MF_HSH_IV(*data, 0);
+    SG_CONSUME(sg, data, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *(uint32_t *)data = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
+/* SHA1 */
+
+int
+octo_null_sha1_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    uint64_t *data;
+    uint64_t tmp1, tmp2, tmp3;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 ||
+	    (auth_off & 0x7) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data, data_i, data_l);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* Load SHA1 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
+
+    while (auth_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	auth_off -= 8;
+    }
+
+    while (auth_len > 0) {
+	CVM_LOAD_SHA_UNIT(*data, next);
+	auth_len -= 8;
+	SG_CONSUME(sg, data, data_i, data_l);
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+    tmp3 = 0;
+    CVMX_MF_HSH_IV(tmp3, 2);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    tmp3 |= 0x0000000080000000;
+    CVMX_MT_HSH_DAT(tmp3, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
+
+    /* save the HMAC */
+    SG_INIT(sg, data, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data, data_i, data_l);
+	icv_off -= 8;
+    }
+    CVMX_MF_HSH_IV(*data, 0);
+    SG_CONSUME(sg, data, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *(uint32_t *)data = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
+/* DES MD5 */
+
+int
+octo_des_cbc_md5_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata;
+    uint64_t *data = &mydata.data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load 3DES Key */
+    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    if (od->octo_encklen == 24) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+    } else if (od->octo_encklen == 8) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+
+    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
+
+    /* Load MD5 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    while (crypt_len > 0 || auth_len > 0) {
+    	uint32_t *first = data32;
+	mydata.data32[0] = *first;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata.data32[1] = *data32;
+    	if (crypt_off <= 0) {
+	    if (crypt_len > 0) {
+		CVMX_MT_3DES_ENC_CBC(*data);
+		CVMX_MF_3DES_RESULT(*data);
+		crypt_len -= 8;
+	    }
+	} else
+	    crypt_off -= 8;
+    	if (auth_off <= 0) {
+	    if (auth_len > 0) {
+		CVM_LOAD_MD5_UNIT(*data, next);
+		auth_len -= 8;
+	    }
+	} else
+	    auth_off -= 8;
+	*first = mydata.data32[0];
+	*data32 = mydata.data32[1];
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVMX_ES64(tmp1, ((alen + 64) << 3));
+    CVM_LOAD_MD5_UNIT(tmp1, next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_ES64(tmp1, ((64 + 16) << 3));
+    CVMX_MT_HSH_STARTMD5(tmp1);
+
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+int
+octo_des_cbc_md5_decrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata;
+    uint64_t *data = &mydata.data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load 3DES Key */
+    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    if (od->octo_encklen == 24) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+    } else if (od->octo_encklen == 8) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+
+    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
+
+    /* Load MD5 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    while (crypt_len > 0 || auth_len > 0) {
+    	uint32_t *first = data32;
+	mydata.data32[0] = *first;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata.data32[1] = *data32;
+    	if (auth_off <= 0) {
+	    if (auth_len > 0) {
+		CVM_LOAD_MD5_UNIT(*data, next);
+		auth_len -= 8;
+	    }
+	} else
+	    auth_off -= 8;
+    	if (crypt_off <= 0) {
+	    if (crypt_len > 0) {
+		CVMX_MT_3DES_DEC_CBC(*data);
+		CVMX_MF_3DES_RESULT(*data);
+		crypt_len -= 8;
+	    }
+	} else
+	    crypt_off -= 8;
+	*first = mydata.data32[0];
+	*data32 = mydata.data32[1];
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVMX_ES64(tmp1, ((alen + 64) << 3));
+    CVM_LOAD_MD5_UNIT(tmp1, next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_ES64(tmp1, ((64 + 16) << 3));
+    CVMX_MT_HSH_STARTMD5(tmp1);
+
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
+/* DES SHA */
+
+int
+octo_des_cbc_sha1_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata;
+    uint64_t *data = &mydata.data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2, tmp3;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load 3DES Key */
+    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    if (od->octo_encklen == 24) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+    } else if (od->octo_encklen == 8) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+
+    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
+
+    /* Load SHA1 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    while (crypt_len > 0 || auth_len > 0) {
+    	uint32_t *first = data32;
+	mydata.data32[0] = *first;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata.data32[1] = *data32;
+    	if (crypt_off <= 0) {
+	    if (crypt_len > 0) {
+		CVMX_MT_3DES_ENC_CBC(*data);
+		CVMX_MF_3DES_RESULT(*data);
+		crypt_len -= 8;
+	    }
+	} else
+	    crypt_off -= 8;
+    	if (auth_off <= 0) {
+	    if (auth_len > 0) {
+		CVM_LOAD_SHA_UNIT(*data, next);
+		auth_len -= 8;
+	    }
+	} else
+	    auth_off -= 8;
+	*first = mydata.data32[0];
+	*data32 = mydata.data32[1];
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_SHA_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
+    }
+	CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+    tmp3 = 0;
+    CVMX_MF_HSH_IV(tmp3, 2);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    tmp3 |= 0x0000000080000000;
+    CVMX_MT_HSH_DAT(tmp3, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
+
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+int
+octo_des_cbc_sha1_decrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata;
+    uint64_t *data = &mydata.data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2, tmp3;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load 3DES Key */
+    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    if (od->octo_encklen == 24) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+    } else if (od->octo_encklen == 8) {
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
+	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+
+    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
+
+    /* Load SHA1 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    while (crypt_len > 0 || auth_len > 0) {
+    	uint32_t *first = data32;
+	mydata.data32[0] = *first;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata.data32[1] = *data32;
+    	if (auth_off <= 0) {
+	    if (auth_len > 0) {
+		CVM_LOAD_SHA_UNIT(*data, next);
+		auth_len -= 8;
+	    }
+	} else
+	    auth_off -= 8;
+    	if (crypt_off <= 0) {
+	    if (crypt_len > 0) {
+		CVMX_MT_3DES_DEC_CBC(*data);
+		CVMX_MF_3DES_RESULT(*data);
+		crypt_len -= 8;
+	    }
+	} else
+	    crypt_off -= 8;
+	*first = mydata.data32[0];
+	*data32 = mydata.data32[1];
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_SHA_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+    tmp3 = 0;
+    CVMX_MF_HSH_IV(tmp3, 2);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    tmp3 |= 0x0000000080000000;
+    CVMX_MT_HSH_DAT(tmp3, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
+/* AES MD5 */
+
+int
+octo_aes_cbc_md5_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata[2];
+    uint64_t *pdata = &mydata[0].data64[0];
+    uint64_t *data =  &mydata[1].data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load AES Key */
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+
+    if (od->octo_encklen == 16) {
+	CVMX_MT_AES_KEY(0x0, 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 24) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 32) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
+
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
+
+    /* Load MD5 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    /* align auth and crypt */
+    while (crypt_off > 0 && auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_MD5_UNIT(*pdata, next);
+	crypt_off -= 8;
+	auth_len -= 8;
+    }
+
+    while (crypt_len > 0) {
+    	uint32_t *pdata32[3];
+
+	pdata32[0] = data32;
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+
+	pdata32[1] = data32;
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+
+	pdata32[2] = data32;
+	mydata[1].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+
+	mydata[1].data32[1] = *data32;
+
+	CVMX_MT_AES_ENC_CBC0(*pdata);
+	CVMX_MT_AES_ENC_CBC1(*data);
+	CVMX_MF_AES_RESULT(*pdata, 0);
+	CVMX_MF_AES_RESULT(*data, 1);
+	crypt_len -= 16;
+
+	if (auth_len > 0) {
+	    CVM_LOAD_MD5_UNIT(*pdata, next);
+	    auth_len -= 8;
+	}
+	if (auth_len > 0) {
+	    CVM_LOAD_MD5_UNIT(*data, next);
+	    auth_len -= 8;
+	}
+
+	*pdata32[0] = mydata[0].data32[0];
+	*pdata32[1] = mydata[0].data32[1];
+	*pdata32[2] = mydata[1].data32[0];
+	*data32     = mydata[1].data32[1];
+
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish any left over hashing */
+    while (auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_MD5_UNIT(*pdata, next);
+	auth_len -= 8;
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVMX_ES64(tmp1, ((alen + 64) << 3));
+    CVM_LOAD_MD5_UNIT(tmp1, next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_ES64(tmp1, ((64 + 16) << 3));
+    CVMX_MT_HSH_STARTMD5(tmp1);
+
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+int
+octo_aes_cbc_md5_decrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata[2];
+    uint64_t *pdata = &mydata[0].data64[0];
+    uint64_t *data =  &mydata[1].data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s()\n", __FUNCTION__);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load AES Key */
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+
+    if (od->octo_encklen == 16) {
+	CVMX_MT_AES_KEY(0x0, 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 24) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 32) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
+
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
+
+    /* Load MD5 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    /* align auth and crypt */
+    while (crypt_off > 0 && auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_MD5_UNIT(*pdata, next);
+	crypt_off -= 8;
+	auth_len -= 8;
+    }
+
+    while (crypt_len > 0) {
+    	uint32_t *pdata32[3];
+
+	pdata32[0] = data32;
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	pdata32[1] = data32;
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	pdata32[2] = data32;
+	mydata[1].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[1].data32[1] = *data32;
+
+	if (auth_len > 0) {
+	    CVM_LOAD_MD5_UNIT(*pdata, next);
+	    auth_len -= 8;
+	}
+
+	if (auth_len > 0) {
+	    CVM_LOAD_MD5_UNIT(*data, next);
+	    auth_len -= 8;
+	}
+
+	CVMX_MT_AES_DEC_CBC0(*pdata);
+	CVMX_MT_AES_DEC_CBC1(*data);
+	CVMX_MF_AES_RESULT(*pdata, 0);
+	CVMX_MF_AES_RESULT(*data, 1);
+	crypt_len -= 16;
+
+	*pdata32[0] = mydata[0].data32[0];
+	*pdata32[1] = mydata[0].data32[1];
+	*pdata32[2] = mydata[1].data32[0];
+	*data32     = mydata[1].data32[1];
+
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish left over hash if any */
+    while (auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_MD5_UNIT(*pdata, next);
+	auth_len -= 8;
+    }
+
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVMX_ES64(tmp1, ((alen + 64) << 3));
+    CVM_LOAD_MD5_UNIT(tmp1, next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_ES64(tmp1, ((64 + 16) << 3));
+    CVMX_MT_HSH_STARTMD5(tmp1);
+
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
+/* AES SHA1 */
+
+int
+octo_aes_cbc_sha1_encrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata[2];
+    uint64_t *pdata = &mydata[0].data64[0];
+    uint64_t *data =  &mydata[1].data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2, tmp3;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s(a_off=%d a_len=%d c_off=%d c_len=%d icv_off=%d)\n",
+			__FUNCTION__, auth_off, auth_len, crypt_off, crypt_len, icv_off);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load AES Key */
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+
+    if (od->octo_encklen == 16) {
+	CVMX_MT_AES_KEY(0x0, 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 24) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 32) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
+
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
+
+    /* Load SHA IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    /* align auth and crypt */
+    while (crypt_off > 0 && auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_SHA_UNIT(*pdata, next);
+	crypt_off -= 8;
+	auth_len -= 8;
+    }
+
+    while (crypt_len > 0) {
+    	uint32_t *pdata32[3];
+
+	pdata32[0] = data32;
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	pdata32[1] = data32;
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	pdata32[2] = data32;
+	mydata[1].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[1].data32[1] = *data32;
+
+	CVMX_MT_AES_ENC_CBC0(*pdata);
+	CVMX_MT_AES_ENC_CBC1(*data);
+	CVMX_MF_AES_RESULT(*pdata, 0);
+	CVMX_MF_AES_RESULT(*data, 1);
+	crypt_len -= 16;
+
+	if (auth_len > 0) {
+	    CVM_LOAD_SHA_UNIT(*pdata, next);
+	    auth_len -= 8;
+	}
+	if (auth_len > 0) {
+	    CVM_LOAD_SHA_UNIT(*data, next);
+	    auth_len -= 8;
+	}
+
+	*pdata32[0] = mydata[0].data32[0];
+	*pdata32[1] = mydata[0].data32[1];
+	*pdata32[2] = mydata[1].data32[0];
+	*data32     = mydata[1].data32[1];
+
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish and hashing */
+    while (auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_SHA_UNIT(*pdata, next);
+	auth_len -= 8;
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_SHA_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
+    }
+    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+    tmp3 = 0;
+    CVMX_MF_HSH_IV(tmp3, 2);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    tmp3 |= 0x0000000080000000;
+    CVMX_MT_HSH_DAT(tmp3, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+int
+octo_aes_cbc_sha1_decrypt(
+    struct octo_sess *od,
+    struct scatterlist *sg, int sg_len,
+    int auth_off, int auth_len,
+    int crypt_off, int crypt_len,
+    int icv_off, uint8_t *ivp)
+{
+    register int next = 0;
+    union {
+	uint32_t data32[2];
+	uint64_t data64[1];
+    } mydata[2];
+    uint64_t *pdata = &mydata[0].data64[0];
+    uint64_t *data =  &mydata[1].data64[0];
+    uint32_t *data32;
+    uint64_t tmp1, tmp2, tmp3;
+    int data_i, data_l, alen = auth_len;
+    struct octeon_cop2_state state;
+    unsigned long flags;
+
+    dprintk("%s(a_off=%d a_len=%d c_off=%d c_len=%d icv_off=%d)\n",
+			__FUNCTION__, auth_off, auth_len, crypt_off, crypt_len, icv_off);
+
+    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
+	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
+	    (crypt_len  & 0x7) ||
+	    (auth_len  & 0x7) ||
+	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
+	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
+		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
+		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
+		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	return -EINVAL;
+    }
+
+    SG_INIT(sg, data32, data_i, data_l);
+
+    CVMX_PREFETCH0(ivp);
+    CVMX_PREFETCH0(od->octo_enckey);
+
+    flags = octeon_crypto_enable(&state);
+
+    /* load AES Key */
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
+    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
+
+    if (od->octo_encklen == 16) {
+	CVMX_MT_AES_KEY(0x0, 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 24) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(0x0, 3);
+    } else if (od->octo_encklen == 32) {
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
+	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
+    } else {
+	octeon_crypto_disable(&state, flags);
+	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
+	return -EINVAL;
+    }
+    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
+
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
+    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
+
+    /* Load SHA1 IV */
+    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
+
+    while (crypt_off > 0 && auth_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	crypt_off -= 4;
+	auth_off -= 4;
+    }
+
+    /* align auth and crypt */
+    while (crypt_off > 0 && auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_SHA_UNIT(*pdata, next);
+	crypt_off -= 8;
+	auth_len -= 8;
+    }
+
+    while (crypt_len > 0) {
+    	uint32_t *pdata32[3];
+
+	pdata32[0] = data32;
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	pdata32[1] = data32;
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	pdata32[2] = data32;
+	mydata[1].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[1].data32[1] = *data32;
+
+	if (auth_len > 0) {
+	    CVM_LOAD_SHA_UNIT(*pdata, next);
+	    auth_len -= 8;
+	}
+	if (auth_len > 0) {
+	    CVM_LOAD_SHA_UNIT(*data, next);
+	    auth_len -= 8;
+	}
+
+	CVMX_MT_AES_DEC_CBC0(*pdata);
+	CVMX_MT_AES_DEC_CBC1(*data);
+	CVMX_MF_AES_RESULT(*pdata, 0);
+	CVMX_MF_AES_RESULT(*data, 1);
+	crypt_len -= 16;
+
+	*pdata32[0] = mydata[0].data32[0];
+	*pdata32[1] = mydata[0].data32[1];
+	*pdata32[2] = mydata[1].data32[0];
+	*data32     = mydata[1].data32[1];
+
+	SG_CONSUME(sg, data32, data_i, data_l);
+    }
+
+    /* finish and leftover hashing */
+    while (auth_len > 0) {
+	mydata[0].data32[0] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	mydata[0].data32[1] = *data32;
+	SG_CONSUME(sg, data32, data_i, data_l);
+	CVM_LOAD_SHA_UNIT(*pdata, next);
+	auth_len -= 8;
+    }
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_SHA_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* Finish Inner hash */
+    while (next != 7) {
+	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
+    }
+	CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
+
+    /* Get the inner hash of HMAC */
+    CVMX_MF_HSH_IV(tmp1, 0);
+    CVMX_MF_HSH_IV(tmp2, 1);
+    tmp3 = 0;
+    CVMX_MF_HSH_IV(tmp3, 2);
+
+    /* Initialize hash unit */
+    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
+    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
+    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
+
+    CVMX_MT_HSH_DAT(tmp1, 0);
+    CVMX_MT_HSH_DAT(tmp2, 1);
+    tmp3 |= 0x0000000080000000;
+    CVMX_MT_HSH_DAT(tmp3, 2);
+    CVMX_MT_HSH_DATZ(3);
+    CVMX_MT_HSH_DATZ(4);
+    CVMX_MT_HSH_DATZ(5);
+    CVMX_MT_HSH_DATZ(6);
+    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
+
+    /* finish the hash */
+    CVMX_PREFETCH0(od->octo_hmouter);
+#if 0
+    if (unlikely(inplen)) {
+	uint64_t tmp = 0;
+	uint8_t *p = (uint8_t *) & tmp;
+	p[inplen] = 0x80;
+	do {
+	    inplen--;
+	    p[inplen] = ((uint8_t *) data)[inplen];
+	} while (inplen);
+	CVM_LOAD_MD5_UNIT(tmp, next);
+    } else {
+	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+    }
+#else
+    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
+#endif
+
+    /* save the HMAC */
+    SG_INIT(sg, data32, data_i, data_l);
+    while (icv_off > 0) {
+	SG_CONSUME(sg, data32, data_i, data_l);
+	icv_off -= 4;
+    }
+    CVMX_MF_HSH_IV(tmp1, 0);
+    *data32 = (uint32_t) (tmp1 >> 32);
+    SG_CONSUME(sg, data32, data_i, data_l);
+    *data32 = (uint32_t) tmp1;
+    SG_CONSUME(sg, data32, data_i, data_l);
+    CVMX_MF_HSH_IV(tmp1, 1);
+    *data32 = (uint32_t) (tmp1 >> 32);
+
+    octeon_crypto_disable(&state, flags);
+    return 0;
+}
+
+/****************************************************************************/
diff --git a/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c
new file mode 100644
index 00000000..e084c6b0
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/cryptocteon/cryptocteon.c
@@ -0,0 +1,576 @@
+/*
+ * Octeon Crypto for OCF
+ *
+ * Written by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2009-2010 David McCullough
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ * ---------------------------------------------------------------------------
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/crypto.h>
+#include <linux/mm.h>
+#include <linux/skbuff.h>
+#include <linux/random.h>
+#include <linux/scatterlist.h>
+
+#include <cryptodev.h>
+#include <uio.h>
+
+struct {
+	softc_device_decl	sc_dev;
+} octo_softc;
+
+#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
+
+struct octo_sess {
+	int					 octo_encalg;
+	#define MAX_CIPHER_KEYLEN	64
+	char				 octo_enckey[MAX_CIPHER_KEYLEN];
+	int					 octo_encklen;
+
+	int					 octo_macalg;
+	#define MAX_HASH_KEYLEN	64
+	char				 octo_mackey[MAX_HASH_KEYLEN];
+	int					 octo_macklen;
+	int					 octo_mackey_set;
+
+	int					 octo_mlen;
+	int					 octo_ivsize;
+
+	int					(*octo_encrypt)(struct octo_sess *od,
+	                      struct scatterlist *sg, int sg_len,
+						  int auth_off, int auth_len,
+						  int crypt_off, int crypt_len,
+						  int icv_off, uint8_t *ivp);
+	int					(*octo_decrypt)(struct octo_sess *od,
+	                      struct scatterlist *sg, int sg_len,
+						  int auth_off, int auth_len,
+						  int crypt_off, int crypt_len,
+						  int icv_off, uint8_t *ivp);
+
+	uint64_t			 octo_hminner[3];
+	uint64_t			 octo_hmouter[3];
+};
+
+int32_t octo_id = -1;
+module_param(octo_id, int, 0444);
+MODULE_PARM_DESC(octo_id, "Read-Only OCF ID for cryptocteon driver");
+
+static struct octo_sess **octo_sessions = NULL;
+static u_int32_t octo_sesnum = 0;
+
+static	int octo_process(device_t, struct cryptop *, int);
+static	int octo_newsession(device_t, u_int32_t *, struct cryptoini *);
+static	int octo_freesession(device_t, u_int64_t);
+
+static device_method_t octo_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	octo_newsession),
+	DEVMETHOD(cryptodev_freesession,octo_freesession),
+	DEVMETHOD(cryptodev_process,	octo_process),
+};
+
+#define debug octo_debug
+int octo_debug = 0;
+module_param(octo_debug, int, 0644);
+MODULE_PARM_DESC(octo_debug, "Enable debug");
+
+
+#include "cavium_crypto.c"
+
+
+/*
+ * Generate a new octo session.  We artifically limit it to a single
+ * hash/cipher or hash-cipher combo just to make it easier, most callers
+ * do not expect more than this anyway.
+ */
+static int
+octo_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
+{
+	struct cryptoini *c, *encini = NULL, *macini = NULL;
+	struct octo_sess **ocd;
+	int i;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid == NULL || cri == NULL) {
+		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	/*
+	 * To keep it simple, we only handle hash, cipher or hash/cipher in a
+	 * session,  you cannot currently do multiple ciphers/hashes in one
+	 * session even though it would be possibel to code this driver to
+	 * handle it.
+	 */
+	for (i = 0, c = cri; c && i < 2; i++) {
+		if (c->cri_alg == CRYPTO_MD5_HMAC ||
+				c->cri_alg == CRYPTO_SHA1_HMAC ||
+				c->cri_alg == CRYPTO_NULL_HMAC) {
+			if (macini) {
+				break;
+			}
+			macini = c;
+		}
+		if (c->cri_alg == CRYPTO_DES_CBC ||
+				c->cri_alg == CRYPTO_3DES_CBC ||
+				c->cri_alg == CRYPTO_AES_CBC ||
+				c->cri_alg == CRYPTO_NULL_CBC) {
+			if (encini) {
+				break;
+			}
+			encini = c;
+		}
+		c = c->cri_next;
+	}
+	if (!macini && !encini) {
+		dprintk("%s,%d - EINVAL bad cipher/hash or combination\n",
+				__FILE__, __LINE__);
+		return EINVAL;
+	}
+	if (c) {
+		dprintk("%s,%d - EINVAL cannot handle chained cipher/hash combos\n",
+				__FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	/*
+	 * So we have something we can do, lets setup the session
+	 */
+
+	if (octo_sessions) {
+		for (i = 1; i < octo_sesnum; i++)
+			if (octo_sessions[i] == NULL)
+				break;
+	} else
+		i = 1;		/* NB: to silence compiler warning */
+
+	if (octo_sessions == NULL || i == octo_sesnum) {
+		if (octo_sessions == NULL) {
+			i = 1; /* We leave octo_sessions[0] empty */
+			octo_sesnum = CRYPTO_SW_SESSIONS;
+		} else
+			octo_sesnum *= 2;
+
+		ocd = kmalloc(octo_sesnum * sizeof(struct octo_sess *), SLAB_ATOMIC);
+		if (ocd == NULL) {
+			/* Reset session number */
+			if (octo_sesnum == CRYPTO_SW_SESSIONS)
+				octo_sesnum = 0;
+			else
+				octo_sesnum /= 2;
+			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+			return ENOBUFS;
+		}
+		memset(ocd, 0, octo_sesnum * sizeof(struct octo_sess *));
+
+		/* Copy existing sessions */
+		if (octo_sessions) {
+			memcpy(ocd, octo_sessions,
+			    (octo_sesnum / 2) * sizeof(struct octo_sess *));
+			kfree(octo_sessions);
+		}
+
+		octo_sessions = ocd;
+	}
+
+	ocd = &octo_sessions[i];
+	*sid = i;
+
+
+	*ocd = (struct octo_sess *) kmalloc(sizeof(struct octo_sess), SLAB_ATOMIC);
+	if (*ocd == NULL) {
+		octo_freesession(NULL, i);
+		dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+		return ENOBUFS;
+	}
+	memset(*ocd, 0, sizeof(struct octo_sess));
+
+	if (encini && encini->cri_key) {
+		(*ocd)->octo_encklen = (encini->cri_klen + 7) / 8;
+		memcpy((*ocd)->octo_enckey, encini->cri_key, (*ocd)->octo_encklen);
+	}
+
+	if (macini && macini->cri_key) {
+		(*ocd)->octo_macklen = (macini->cri_klen + 7) / 8;
+		memcpy((*ocd)->octo_mackey, macini->cri_key, (*ocd)->octo_macklen);
+	}
+
+	(*ocd)->octo_mlen = 0;
+	if (encini && encini->cri_mlen)
+		(*ocd)->octo_mlen = encini->cri_mlen;
+	else if (macini && macini->cri_mlen)
+		(*ocd)->octo_mlen = macini->cri_mlen;
+	else
+		(*ocd)->octo_mlen = 12;
+
+	/*
+	 * point c at the enc if it exists, otherwise the mac
+	 */
+	c = encini ? encini : macini;
+
+	switch (c->cri_alg) {
+	case CRYPTO_DES_CBC:
+	case CRYPTO_3DES_CBC:
+		(*ocd)->octo_ivsize  = 8;
+		switch (macini ? macini->cri_alg : -1) {
+		case CRYPTO_MD5_HMAC:
+			(*ocd)->octo_encrypt = octo_des_cbc_md5_encrypt;
+			(*ocd)->octo_decrypt = octo_des_cbc_md5_decrypt;
+			octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
+					(*ocd)->octo_hmouter);
+			break;
+		case CRYPTO_SHA1_HMAC:
+			(*ocd)->octo_encrypt = octo_des_cbc_sha1_encrypt;
+			(*ocd)->octo_decrypt = octo_des_cbc_sha1_decrypt;
+			octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
+					(*ocd)->octo_hmouter);
+			break;
+		case -1:
+			(*ocd)->octo_encrypt = octo_des_cbc_encrypt;
+			(*ocd)->octo_decrypt = octo_des_cbc_decrypt;
+			break;
+		default:
+			octo_freesession(NULL, i);
+			dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
+			return EINVAL;
+		}
+		break;
+	case CRYPTO_AES_CBC:
+		(*ocd)->octo_ivsize  = 16;
+		switch (macini ? macini->cri_alg : -1) {
+		case CRYPTO_MD5_HMAC:
+			(*ocd)->octo_encrypt = octo_aes_cbc_md5_encrypt;
+			(*ocd)->octo_decrypt = octo_aes_cbc_md5_decrypt;
+			octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
+					(*ocd)->octo_hmouter);
+			break;
+		case CRYPTO_SHA1_HMAC:
+			(*ocd)->octo_encrypt = octo_aes_cbc_sha1_encrypt;
+			(*ocd)->octo_decrypt = octo_aes_cbc_sha1_decrypt;
+			octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
+					(*ocd)->octo_hmouter);
+			break;
+		case -1:
+			(*ocd)->octo_encrypt = octo_aes_cbc_encrypt;
+			(*ocd)->octo_decrypt = octo_aes_cbc_decrypt;
+			break;
+		default:
+			octo_freesession(NULL, i);
+			dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
+			return EINVAL;
+		}
+		break;
+	case CRYPTO_MD5_HMAC:
+		(*ocd)->octo_encrypt = octo_null_md5_encrypt;
+		(*ocd)->octo_decrypt = octo_null_md5_encrypt; /* encrypt == decrypt */
+		octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
+				(*ocd)->octo_hmouter);
+		break;
+	case CRYPTO_SHA1_HMAC:
+		(*ocd)->octo_encrypt = octo_null_sha1_encrypt;
+		(*ocd)->octo_decrypt = octo_null_sha1_encrypt; /* encrypt == decrypt */
+		octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
+				(*ocd)->octo_hmouter);
+		break;
+	default:
+		octo_freesession(NULL, i);
+		dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	(*ocd)->octo_encalg = encini ? encini->cri_alg : -1;
+	(*ocd)->octo_macalg = macini ? macini->cri_alg : -1;
+
+	return 0;
+}
+
+/*
+ * Free a session.
+ */
+static int
+octo_freesession(device_t dev, u_int64_t tid)
+{
+	u_int32_t sid = CRYPTO_SESID2LID(tid);
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid > octo_sesnum || octo_sessions == NULL ||
+			octo_sessions[sid] == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return(EINVAL);
+	}
+
+	/* Silently accept and return */
+	if (sid == 0)
+		return(0);
+
+	if (octo_sessions[sid])
+		kfree(octo_sessions[sid]);
+	octo_sessions[sid] = NULL;
+	return 0;
+}
+
+/*
+ * Process a request.
+ */
+static int
+octo_process(device_t dev, struct cryptop *crp, int hint)
+{
+	struct cryptodesc *crd;
+	struct octo_sess *od;
+	u_int32_t lid;
+#define SCATTERLIST_MAX 16
+	struct scatterlist sg[SCATTERLIST_MAX];
+	int sg_num, sg_len;
+	struct sk_buff *skb = NULL;
+	struct uio *uiop = NULL;
+	struct cryptodesc *enccrd = NULL, *maccrd = NULL;
+	unsigned char *ivp = NULL;
+	unsigned char iv_data[HASH_MAX_LEN];
+	int auth_off = 0, auth_len = 0, crypt_off = 0, crypt_len = 0, icv_off = 0;
+
+	dprintk("%s()\n", __FUNCTION__);
+	/* Sanity check */
+	if (crp == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	crp->crp_etype = 0;
+
+	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		crp->crp_etype = EINVAL;
+		goto done;
+	}
+
+	lid = crp->crp_sid & 0xffffffff;
+	if (lid >= octo_sesnum || lid == 0 || octo_sessions == NULL ||
+			octo_sessions[lid] == NULL) {
+		crp->crp_etype = ENOENT;
+		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
+		goto done;
+	}
+	od = octo_sessions[lid];
+
+	/*
+	 * do some error checking outside of the loop for SKB and IOV processing
+	 * this leaves us with valid skb or uiop pointers for later
+	 */
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		skb = (struct sk_buff *) crp->crp_buf;
+		if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
+			printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", __FILE__, __LINE__,
+					skb_shinfo(skb)->nr_frags);
+			goto done;
+		}
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		uiop = (struct uio *) crp->crp_buf;
+		if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
+			printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", __FILE__, __LINE__,
+					uiop->uio_iovcnt);
+			goto done;
+		}
+	}
+
+	/* point our enccrd and maccrd appropriately */
+	crd = crp->crp_desc;
+	if (crd->crd_alg == od->octo_encalg) enccrd = crd;
+	if (crd->crd_alg == od->octo_macalg) maccrd = crd;
+	crd = crd->crd_next;
+	if (crd) {
+		if (crd->crd_alg == od->octo_encalg) enccrd = crd;
+		if (crd->crd_alg == od->octo_macalg) maccrd = crd;
+		crd = crd->crd_next;
+	}
+	if (crd) {
+		crp->crp_etype = EINVAL;
+		dprintk("%s,%d: ENOENT - descriptors do not match session\n",
+				__FILE__, __LINE__);
+		goto done;
+	}
+
+	if (enccrd) {
+		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+				ivp = enccrd->crd_iv;
+			else
+				read_random((ivp = iv_data), od->octo_ivsize);
+			if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0)
+				crypto_copyback(crp->crp_flags, crp->crp_buf,
+						enccrd->crd_inject, od->octo_ivsize, ivp);
+		} else {
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
+				ivp = enccrd->crd_iv;
+			} else {
+				ivp = iv_data;
+				crypto_copydata(crp->crp_flags, crp->crp_buf,
+						enccrd->crd_inject, od->octo_ivsize, (caddr_t) ivp);
+			}
+		}
+
+		if (maccrd) {
+			auth_off = maccrd->crd_skip;
+			auth_len = maccrd->crd_len;
+			icv_off  = maccrd->crd_inject;
+		}
+
+		crypt_off = enccrd->crd_skip;
+		crypt_len = enccrd->crd_len;
+	} else { /* if (maccrd) */
+		auth_off = maccrd->crd_skip;
+		auth_len = maccrd->crd_len;
+		icv_off  = maccrd->crd_inject;
+	}
+
+
+	/*
+	 * setup the SG list to cover the buffer
+	 */
+	memset(sg, 0, sizeof(sg));
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		int i, len;
+
+		sg_num = 0;
+		sg_len = 0;
+
+		len = skb_headlen(skb);
+		sg_set_page(&sg[sg_num], virt_to_page(skb->data), len,
+				offset_in_page(skb->data));
+		sg_len += len;
+		sg_num++;
+
+		for (i = 0; i < skb_shinfo(skb)->nr_frags && sg_num < SCATTERLIST_MAX;
+				i++) {
+			len = skb_shinfo(skb)->frags[i].size;
+			sg_set_page(&sg[sg_num], skb_frag_page(&skb_shinfo(skb)->frags[i]),
+					len, skb_shinfo(skb)->frags[i].page_offset);
+			sg_len += len;
+			sg_num++;
+		}
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		int len;
+
+		sg_len = 0;
+		for (sg_num = 0; sg_len < crp->crp_ilen &&
+				sg_num < uiop->uio_iovcnt &&
+				sg_num < SCATTERLIST_MAX; sg_num++) {
+			len = uiop->uio_iov[sg_num].iov_len;
+			sg_set_page(&sg[sg_num],
+					virt_to_page(uiop->uio_iov[sg_num].iov_base), len,
+					offset_in_page(uiop->uio_iov[sg_num].iov_base));
+			sg_len += len;
+		}
+	} else {
+		sg_len = crp->crp_ilen;
+		sg_set_page(&sg[0], virt_to_page(crp->crp_buf), sg_len,
+				offset_in_page(crp->crp_buf));
+		sg_num = 1;
+	}
+	if (sg_num > 0)
+		sg_mark_end(&sg[sg_num-1]);
+
+	/*
+	 * setup a new explicit key
+	 */
+	if (enccrd) {
+		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
+			od->octo_encklen = (enccrd->crd_klen + 7) / 8;
+			memcpy(od->octo_enckey, enccrd->crd_key, od->octo_encklen);
+		}
+	}
+	if (maccrd) {
+		if (maccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
+			od->octo_macklen = (maccrd->crd_klen + 7) / 8;
+			memcpy(od->octo_mackey, maccrd->crd_key, od->octo_macklen);
+			od->octo_mackey_set = 0;
+		}
+		if (!od->octo_mackey_set) {
+			octo_calc_hash(maccrd->crd_alg == CRYPTO_MD5_HMAC ? 0 : 1,
+				maccrd->crd_key, od->octo_hminner, od->octo_hmouter);
+			od->octo_mackey_set = 1;
+		}
+	}
+
+
+	if (!enccrd || (enccrd->crd_flags & CRD_F_ENCRYPT))
+		(*od->octo_encrypt)(od, sg, sg_len,
+				auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+	else
+		(*od->octo_decrypt)(od, sg, sg_len,
+				auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
+
+done:
+	crypto_done(crp);
+	return 0;
+}
+
+static int
+cryptocteon_init(void)
+{
+	dprintk("%s(%p)\n", __FUNCTION__, cryptocteon_init);
+
+	softc_device_init(&octo_softc, "cryptocteon", 0, octo_methods);
+
+	octo_id = crypto_get_driverid(softc_get_device(&octo_softc),
+			CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SYNC);
+	if (octo_id < 0) {
+		printk("Cryptocteon device cannot initialize!");
+		return -ENODEV;
+	}
+
+	crypto_register(octo_id, CRYPTO_MD5_HMAC, 0,0);
+	crypto_register(octo_id, CRYPTO_SHA1_HMAC, 0,0);
+	//crypto_register(octo_id, CRYPTO_MD5, 0,0);
+	//crypto_register(octo_id, CRYPTO_SHA1, 0,0);
+	crypto_register(octo_id, CRYPTO_DES_CBC, 0,0);
+	crypto_register(octo_id, CRYPTO_3DES_CBC, 0,0);
+	crypto_register(octo_id, CRYPTO_AES_CBC, 0,0);
+
+	return(0);
+}
+
+static void
+cryptocteon_exit(void)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	crypto_unregister_all(octo_id);
+	octo_id = -1;
+}
+
+module_init(cryptocteon_init);
+module_exit(cryptocteon_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("Cryptocteon (OCF module for Cavium OCTEON crypto)");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/cryptodev.c b/trunk/target/linux/generic/files/crypto/ocf/cryptodev.c
new file mode 100644
index 00000000..9a23f05c
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/cryptodev.c
@@ -0,0 +1,1069 @@
+/*	$OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $	*/
+
+/*-
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ * The license and original author are listed below.
+ *
+ * Copyright (c) 2001 Theo de Raadt
+ * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+__FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.34 2007/05/09 19:37:02 gnn Exp $");
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/types.h>
+#include <linux/time.h>
+#include <linux/delay.h>
+#include <linux/list.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/unistd.h>
+#include <linux/module.h>
+#include <linux/wait.h>
+#include <linux/slab.h>
+#include <linux/fs.h>
+#include <linux/dcache.h>
+#include <linux/file.h>
+#include <linux/mount.h>
+#include <linux/miscdevice.h>
+#include <asm/uaccess.h>
+
+#include <cryptodev.h>
+#include <uio.h>
+
+extern asmlinkage long sys_dup(unsigned int fildes);
+
+#define debug cryptodev_debug
+int cryptodev_debug = 0;
+module_param(cryptodev_debug, int, 0644);
+MODULE_PARM_DESC(cryptodev_debug, "Enable cryptodev debug");
+
+struct csession_info {
+	u_int16_t	blocksize;
+	u_int16_t	minkey, maxkey;
+
+	u_int16_t	keysize;
+	/* u_int16_t	hashsize;  */
+	u_int16_t	authsize;
+	u_int16_t	authkey;
+	/* u_int16_t	ctxsize; */
+};
+
+struct csession {
+	struct list_head	list;
+	u_int64_t	sid;
+	u_int32_t	ses;
+
+	wait_queue_head_t waitq;
+
+	u_int32_t	cipher;
+
+	u_int32_t	mac;
+
+	caddr_t		key;
+	int		keylen;
+	u_char		tmp_iv[EALG_MAX_BLOCK_LEN];
+
+	caddr_t		mackey;
+	int		mackeylen;
+
+	struct csession_info info;
+
+	struct iovec	iovec;
+	struct uio	uio;
+	int		error;
+};
+
+struct fcrypt {
+	struct list_head	csessions;
+	int		sesn;
+};
+
+static struct csession *csefind(struct fcrypt *, u_int);
+static int csedelete(struct fcrypt *, struct csession *);
+static struct csession *cseadd(struct fcrypt *, struct csession *);
+static struct csession *csecreate(struct fcrypt *, u_int64_t,
+		struct cryptoini *crie, struct cryptoini *cria, struct csession_info *);
+static int csefree(struct csession *);
+
+static	int cryptodev_op(struct csession *, struct crypt_op *);
+static	int cryptodev_key(struct crypt_kop *);
+static	int cryptodev_find(struct crypt_find_op *);
+
+static int cryptodev_cb(void *);
+static int cryptodev_open(struct inode *inode, struct file *filp);
+
+/*
+ * Check a crypto identifier to see if it requested
+ * a valid crid and it's capabilities match.
+ */
+static int
+checkcrid(int crid)
+{
+	int hid = crid & ~(CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE);
+	int typ = crid & (CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE);
+	int caps = 0;
+	
+	/* if the user hasn't selected a driver, then just call newsession */
+	if (hid == 0 && typ != 0)
+		return 0;
+
+	caps = crypto_getcaps(hid);
+
+	/* didn't find anything with capabilities */
+	if (caps == 0) {
+		dprintk("%s: hid=%x typ=%x not matched\n", __FUNCTION__, hid, typ);
+		return EINVAL;
+	}
+	
+	/* the user didn't specify SW or HW, so the driver is ok */
+	if (typ == 0)
+		return 0;
+
+	/* if the type specified didn't match */
+	if (typ != (caps & (CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE))) {
+		dprintk("%s: hid=%x typ=%x caps=%x not matched\n", __FUNCTION__,
+				hid, typ, caps);
+		return EINVAL;
+	}
+
+	return 0;
+}
+
+static int
+cryptodev_op(struct csession *cse, struct crypt_op *cop)
+{
+	struct cryptop *crp = NULL;
+	struct cryptodesc *crde = NULL, *crda = NULL;
+	int error = 0;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (cop->len > CRYPTO_MAX_DATA_LEN) {
+		dprintk("%s: %d > %d\n", __FUNCTION__, cop->len, CRYPTO_MAX_DATA_LEN);
+		return (E2BIG);
+	}
+
+	if (cse->info.blocksize && (cop->len % cse->info.blocksize) != 0) {
+		dprintk("%s: blocksize=%d len=%d\n", __FUNCTION__, cse->info.blocksize,
+				cop->len);
+		return (EINVAL);
+	}
+
+	cse->uio.uio_iov = &cse->iovec;
+	cse->uio.uio_iovcnt = 1;
+	cse->uio.uio_offset = 0;
+#if 0
+	cse->uio.uio_resid = cop->len;
+	cse->uio.uio_segflg = UIO_SYSSPACE;
+	cse->uio.uio_rw = UIO_WRITE;
+	cse->uio.uio_td = td;
+#endif
+	cse->uio.uio_iov[0].iov_len = cop->len;
+	if (cse->info.authsize)
+		cse->uio.uio_iov[0].iov_len += cse->info.authsize;
+	cse->uio.uio_iov[0].iov_base = kmalloc(cse->uio.uio_iov[0].iov_len,
+			GFP_KERNEL);
+
+	if (cse->uio.uio_iov[0].iov_base == NULL) {
+		dprintk("%s: iov_base kmalloc(%d) failed\n", __FUNCTION__,
+				(int)cse->uio.uio_iov[0].iov_len);
+		return (ENOMEM);
+	}
+
+	crp = crypto_getreq((cse->info.blocksize != 0) + (cse->info.authsize != 0));
+	if (crp == NULL) {
+		dprintk("%s: ENOMEM\n", __FUNCTION__);
+		error = ENOMEM;
+		goto bail;
+	}
+
+	if (cse->info.authsize && cse->info.blocksize) {
+		if (cop->op == COP_ENCRYPT) {
+			crde = crp->crp_desc;
+			crda = crde->crd_next;
+		} else {
+			crda = crp->crp_desc;
+			crde = crda->crd_next;
+		}
+	} else if (cse->info.authsize) {
+		crda = crp->crp_desc;
+	} else if (cse->info.blocksize) {
+		crde = crp->crp_desc;
+	} else {
+		dprintk("%s: bad request\n", __FUNCTION__);
+		error = EINVAL;
+		goto bail;
+	}
+
+	if ((error = copy_from_user(cse->uio.uio_iov[0].iov_base, cop->src,
+					cop->len))) {
+		dprintk("%s: bad copy\n", __FUNCTION__);
+		goto bail;
+	}
+
+	if (crda) {
+		crda->crd_skip = 0;
+		crda->crd_len = cop->len;
+		crda->crd_inject = cop->len;
+
+		crda->crd_alg = cse->mac;
+		crda->crd_key = cse->mackey;
+		crda->crd_klen = cse->mackeylen * 8;
+	}
+
+	if (crde) {
+		if (cop->op == COP_ENCRYPT)
+			crde->crd_flags |= CRD_F_ENCRYPT;
+		else
+			crde->crd_flags &= ~CRD_F_ENCRYPT;
+		crde->crd_len = cop->len;
+		crde->crd_inject = 0;
+
+		crde->crd_alg = cse->cipher;
+		crde->crd_key = cse->key;
+		crde->crd_klen = cse->keylen * 8;
+	}
+
+	crp->crp_ilen = cse->uio.uio_iov[0].iov_len;
+	crp->crp_flags = CRYPTO_F_IOV | CRYPTO_F_CBIMM
+		       | (cop->flags & COP_F_BATCH);
+	crp->crp_buf = (caddr_t)&cse->uio;
+	crp->crp_callback = (int (*) (struct cryptop *)) cryptodev_cb;
+	crp->crp_sid = cse->sid;
+	crp->crp_opaque = (void *)cse;
+
+	if (cop->iv) {
+		if (crde == NULL) {
+			error = EINVAL;
+			dprintk("%s no crde\n", __FUNCTION__);
+			goto bail;
+		}
+		if (cse->cipher == CRYPTO_ARC4) { /* XXX use flag? */
+			error = EINVAL;
+			dprintk("%s arc4 with IV\n", __FUNCTION__);
+			goto bail;
+		}
+		if ((error = copy_from_user(cse->tmp_iv, cop->iv,
+						cse->info.blocksize))) {
+			dprintk("%s bad iv copy\n", __FUNCTION__);
+			goto bail;
+		}
+		memcpy(crde->crd_iv, cse->tmp_iv, cse->info.blocksize);
+		crde->crd_flags |= CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT;
+		crde->crd_skip = 0;
+	} else if (cse->cipher == CRYPTO_ARC4) { /* XXX use flag? */
+		crde->crd_skip = 0;
+	} else if (crde) {
+		crde->crd_flags |= CRD_F_IV_PRESENT;
+		crde->crd_skip = cse->info.blocksize;
+		crde->crd_len -= cse->info.blocksize;
+	}
+
+	if (cop->mac && crda == NULL) {
+		error = EINVAL;
+		dprintk("%s no crda\n", __FUNCTION__);
+		goto bail;
+	}
+
+	/*
+	 * Let the dispatch run unlocked, then, interlock against the
+	 * callback before checking if the operation completed and going
+	 * to sleep.  This insures drivers don't inherit our lock which
+	 * results in a lock order reversal between crypto_dispatch forced
+	 * entry and the crypto_done callback into us.
+	 */
+	error = crypto_dispatch(crp);
+	if (error) {
+		dprintk("%s error in crypto_dispatch\n", __FUNCTION__);
+		goto bail;
+	}
+
+	dprintk("%s about to WAIT\n", __FUNCTION__);
+	/*
+	 * we really need to wait for driver to complete to maintain
+	 * state,  luckily interrupts will be remembered
+	 */
+	do {
+		error = wait_event_interruptible(crp->crp_waitq,
+				((crp->crp_flags & CRYPTO_F_DONE) != 0));
+		/*
+		 * we can't break out of this loop or we will leave behind
+		 * a huge mess,  however,  staying here means if your driver
+		 * is broken user applications can hang and not be killed.
+		 * The solution,  fix your driver :-)
+		 */
+		if (error) {
+			schedule();
+			error = 0;
+		}
+	} while ((crp->crp_flags & CRYPTO_F_DONE) == 0);
+	dprintk("%s finished WAITING error=%d\n", __FUNCTION__, error);
+
+	if (crp->crp_etype != 0) {
+		error = crp->crp_etype;
+		dprintk("%s error in crp processing\n", __FUNCTION__);
+		goto bail;
+	}
+
+	if (cse->error) {
+		error = cse->error;
+		dprintk("%s error in cse processing\n", __FUNCTION__);
+		goto bail;
+	}
+
+	if (cop->dst && (error = copy_to_user(cop->dst,
+					cse->uio.uio_iov[0].iov_base, cop->len))) {
+		dprintk("%s bad dst copy\n", __FUNCTION__);
+		goto bail;
+	}
+
+	if (cop->mac &&
+			(error=copy_to_user(cop->mac,
+				(caddr_t)cse->uio.uio_iov[0].iov_base + cop->len,
+				cse->info.authsize))) {
+		dprintk("%s bad mac copy\n", __FUNCTION__);
+		goto bail;
+	}
+
+bail:
+	if (crp)
+		crypto_freereq(crp);
+	if (cse->uio.uio_iov[0].iov_base)
+		kfree(cse->uio.uio_iov[0].iov_base);
+
+	return (error);
+}
+
+static int
+cryptodev_cb(void *op)
+{
+	struct cryptop *crp = (struct cryptop *) op;
+	struct csession *cse = (struct csession *)crp->crp_opaque;
+	int error;
+
+	dprintk("%s()\n", __FUNCTION__);
+	error = crp->crp_etype;
+	if (error == EAGAIN) {
+		crp->crp_flags &= ~CRYPTO_F_DONE;
+#ifdef NOTYET
+		/*
+		 * DAVIDM I am fairly sure that we should turn this into a batch
+		 * request to stop bad karma/lockup, revisit
+		 */
+		crp->crp_flags |= CRYPTO_F_BATCH;
+#endif
+		return crypto_dispatch(crp);
+	}
+	if (error != 0 || (crp->crp_flags & CRYPTO_F_DONE)) {
+		cse->error = error;
+		wake_up_interruptible(&crp->crp_waitq);
+	}
+	return (0);
+}
+
+static int
+cryptodevkey_cb(void *op)
+{
+	struct cryptkop *krp = (struct cryptkop *) op;
+	dprintk("%s()\n", __FUNCTION__);
+	wake_up_interruptible(&krp->krp_waitq);
+	return (0);
+}
+
+static int
+cryptodev_key(struct crypt_kop *kop)
+{
+	struct cryptkop *krp = NULL;
+	int error = EINVAL;
+	int in, out, size, i;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (kop->crk_iparams + kop->crk_oparams > CRK_MAXPARAM) {
+		dprintk("%s params too big\n", __FUNCTION__);
+		return (EFBIG);
+	}
+
+	in = kop->crk_iparams;
+	out = kop->crk_oparams;
+	switch (kop->crk_op) {
+	case CRK_MOD_EXP:
+		if (in == 3 && out == 1)
+			break;
+		return (EINVAL);
+	case CRK_MOD_EXP_CRT:
+		if (in == 6 && out == 1)
+			break;
+		return (EINVAL);
+	case CRK_DSA_SIGN:
+		if (in == 5 && out == 2)
+			break;
+		return (EINVAL);
+	case CRK_DSA_VERIFY:
+		if (in == 7 && out == 0)
+			break;
+		return (EINVAL);
+	case CRK_DH_COMPUTE_KEY:
+		if (in == 3 && out == 1)
+			break;
+		return (EINVAL);
+	default:
+		return (EINVAL);
+	}
+
+	krp = (struct cryptkop *)kmalloc(sizeof *krp, GFP_KERNEL);
+	if (!krp)
+		return (ENOMEM);
+	bzero(krp, sizeof *krp);
+	krp->krp_op = kop->crk_op;
+	krp->krp_status = kop->crk_status;
+	krp->krp_iparams = kop->crk_iparams;
+	krp->krp_oparams = kop->crk_oparams;
+	krp->krp_crid = kop->crk_crid;
+	krp->krp_status = 0;
+	krp->krp_flags = CRYPTO_KF_CBIMM;
+	krp->krp_callback = (int (*) (struct cryptkop *)) cryptodevkey_cb;
+	init_waitqueue_head(&krp->krp_waitq);
+
+	for (i = 0; i < CRK_MAXPARAM; i++)
+		krp->krp_param[i].crp_nbits = kop->crk_param[i].crp_nbits;
+	for (i = 0; i < krp->krp_iparams + krp->krp_oparams; i++) {
+		size = (krp->krp_param[i].crp_nbits + 7) / 8;
+		if (size == 0)
+			continue;
+		krp->krp_param[i].crp_p = (caddr_t) kmalloc(size, GFP_KERNEL);
+		if (i >= krp->krp_iparams)
+			continue;
+		error = copy_from_user(krp->krp_param[i].crp_p,
+				kop->crk_param[i].crp_p, size);
+		if (error)
+			goto fail;
+	}
+
+	error = crypto_kdispatch(krp);
+	if (error)
+		goto fail;
+
+	do {
+		error = wait_event_interruptible(krp->krp_waitq,
+				((krp->krp_flags & CRYPTO_KF_DONE) != 0));
+		/*
+		 * we can't break out of this loop or we will leave behind
+		 * a huge mess,  however,  staying here means if your driver
+		 * is broken user applications can hang and not be killed.
+		 * The solution,  fix your driver :-)
+		 */
+		if (error) {
+			schedule();
+			error = 0;
+		}
+	} while ((krp->krp_flags & CRYPTO_KF_DONE) == 0);
+
+	dprintk("%s finished WAITING error=%d\n", __FUNCTION__, error);
+	
+	kop->crk_crid = krp->krp_crid;		/* device that did the work */
+	if (krp->krp_status != 0) {
+		error = krp->krp_status;
+		goto fail;
+	}
+
+	for (i = krp->krp_iparams; i < krp->krp_iparams + krp->krp_oparams; i++) {
+		size = (krp->krp_param[i].crp_nbits + 7) / 8;
+		if (size == 0)
+			continue;
+		error = copy_to_user(kop->crk_param[i].crp_p, krp->krp_param[i].crp_p,
+				size);
+		if (error)
+			goto fail;
+	}
+
+fail:
+	if (krp) {
+		kop->crk_status = krp->krp_status;
+		for (i = 0; i < CRK_MAXPARAM; i++) {
+			if (krp->krp_param[i].crp_p)
+				kfree(krp->krp_param[i].crp_p);
+		}
+		kfree(krp);
+	}
+	return (error);
+}
+
+static int
+cryptodev_find(struct crypt_find_op *find)
+{
+	device_t dev;
+
+	if (find->crid != -1) {
+		dev = crypto_find_device_byhid(find->crid);
+		if (dev == NULL)
+			return (ENOENT);
+		strlcpy(find->name, device_get_nameunit(dev),
+		    sizeof(find->name));
+	} else {
+		find->crid = crypto_find_driver(find->name);
+		if (find->crid == -1)
+			return (ENOENT);
+	}
+	return (0);
+}
+
+static struct csession *
+csefind(struct fcrypt *fcr, u_int ses)
+{
+	struct csession *cse;
+
+	dprintk("%s()\n", __FUNCTION__);
+	list_for_each_entry(cse, &fcr->csessions, list)
+		if (cse->ses == ses)
+			return (cse);
+	return (NULL);
+}
+
+static int
+csedelete(struct fcrypt *fcr, struct csession *cse_del)
+{
+	struct csession *cse;
+
+	dprintk("%s()\n", __FUNCTION__);
+	list_for_each_entry(cse, &fcr->csessions, list) {
+		if (cse == cse_del) {
+			list_del(&cse->list);
+			return (1);
+		}
+	}
+	return (0);
+}
+	
+static struct csession *
+cseadd(struct fcrypt *fcr, struct csession *cse)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	list_add_tail(&cse->list, &fcr->csessions);
+	cse->ses = fcr->sesn++;
+	return (cse);
+}
+
+static struct csession *
+csecreate(struct fcrypt *fcr, u_int64_t sid, struct cryptoini *crie,
+	struct cryptoini *cria, struct csession_info *info)
+{
+	struct csession *cse;
+
+	dprintk("%s()\n", __FUNCTION__);
+	cse = (struct csession *) kmalloc(sizeof(struct csession), GFP_KERNEL);
+	if (cse == NULL)
+		return NULL;
+	memset(cse, 0, sizeof(struct csession));
+
+	INIT_LIST_HEAD(&cse->list);
+	init_waitqueue_head(&cse->waitq);
+
+	cse->key = crie->cri_key;
+	cse->keylen = crie->cri_klen/8;
+	cse->mackey = cria->cri_key;
+	cse->mackeylen = cria->cri_klen/8;
+	cse->sid = sid;
+	cse->cipher = crie->cri_alg;
+	cse->mac = cria->cri_alg;
+	cse->info = *info;
+	cseadd(fcr, cse);
+	return (cse);
+}
+
+static int
+csefree(struct csession *cse)
+{
+	int error;
+
+	dprintk("%s()\n", __FUNCTION__);
+	error = crypto_freesession(cse->sid);
+	if (cse->key)
+		kfree(cse->key);
+	if (cse->mackey)
+		kfree(cse->mackey);
+	kfree(cse);
+	return(error);
+}
+
+static int
+cryptodev_ioctl(
+	struct inode *inode,
+	struct file *filp,
+	unsigned int cmd,
+	unsigned long arg)
+{
+	struct cryptoini cria, crie;
+	struct fcrypt *fcr = filp->private_data;
+	struct csession *cse;
+	struct csession_info info;
+	struct session2_op sop;
+	struct crypt_op cop;
+	struct crypt_kop kop;
+	struct crypt_find_op fop;
+	u_int64_t sid;
+	u_int32_t ses = 0;
+	int feat, fd, error = 0, crid;
+	mm_segment_t fs;
+
+	dprintk("%s(cmd=%x arg=%lx)\n", __FUNCTION__, cmd, arg);
+
+	switch (cmd) {
+
+	case CRIOGET: {
+		dprintk("%s(CRIOGET)\n", __FUNCTION__);
+		fs = get_fs();
+		set_fs(get_ds());
+		for (fd = 0; fd < files_fdtable(current->files)->max_fds; fd++)
+			if (files_fdtable(current->files)->fd[fd] == filp)
+				break;
+		fd = sys_dup(fd);
+		set_fs(fs);
+		put_user(fd, (int *) arg);
+		return IS_ERR_VALUE(fd) ? fd : 0;
+		}
+
+#define	CIOCGSESSSTR	(cmd == CIOCGSESSION ? "CIOCGSESSION" : "CIOCGSESSION2")
+	case CIOCGSESSION:
+	case CIOCGSESSION2:
+		dprintk("%s(%s)\n", __FUNCTION__, CIOCGSESSSTR);
+		memset(&crie, 0, sizeof(crie));
+		memset(&cria, 0, sizeof(cria));
+		memset(&info, 0, sizeof(info));
+		memset(&sop, 0, sizeof(sop));
+
+		if (copy_from_user(&sop, (void*)arg, (cmd == CIOCGSESSION) ?
+					sizeof(struct session_op) : sizeof(sop))) {
+			dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
+			error = EFAULT;
+			goto bail;
+		}
+
+		switch (sop.cipher) {
+		case 0:
+			dprintk("%s(%s) - no cipher\n", __FUNCTION__, CIOCGSESSSTR);
+			break;
+		case CRYPTO_NULL_CBC:
+			info.blocksize = NULL_BLOCK_LEN;
+			info.minkey = NULL_MIN_KEY_LEN;
+			info.maxkey = NULL_MAX_KEY_LEN;
+			break;
+		case CRYPTO_DES_CBC:
+			info.blocksize = DES_BLOCK_LEN;
+			info.minkey = DES_MIN_KEY_LEN;
+			info.maxkey = DES_MAX_KEY_LEN;
+			break;
+		case CRYPTO_3DES_CBC:
+			info.blocksize = DES3_BLOCK_LEN;
+			info.minkey = DES3_MIN_KEY_LEN;
+			info.maxkey = DES3_MAX_KEY_LEN;
+			break;
+		case CRYPTO_BLF_CBC:
+			info.blocksize = BLOWFISH_BLOCK_LEN;
+			info.minkey = BLOWFISH_MIN_KEY_LEN;
+			info.maxkey = BLOWFISH_MAX_KEY_LEN;
+			break;
+		case CRYPTO_CAST_CBC:
+			info.blocksize = CAST128_BLOCK_LEN;
+			info.minkey = CAST128_MIN_KEY_LEN;
+			info.maxkey = CAST128_MAX_KEY_LEN;
+			break;
+		case CRYPTO_SKIPJACK_CBC:
+			info.blocksize = SKIPJACK_BLOCK_LEN;
+			info.minkey = SKIPJACK_MIN_KEY_LEN;
+			info.maxkey = SKIPJACK_MAX_KEY_LEN;
+			break;
+		case CRYPTO_AES_CBC:
+			info.blocksize = AES_BLOCK_LEN;
+			info.minkey = AES_MIN_KEY_LEN;
+			info.maxkey = AES_MAX_KEY_LEN;
+			break;
+		case CRYPTO_ARC4:
+			info.blocksize = ARC4_BLOCK_LEN;
+			info.minkey = ARC4_MIN_KEY_LEN;
+			info.maxkey = ARC4_MAX_KEY_LEN;
+			break;
+		case CRYPTO_CAMELLIA_CBC:
+			info.blocksize = CAMELLIA_BLOCK_LEN;
+			info.minkey = CAMELLIA_MIN_KEY_LEN;
+			info.maxkey = CAMELLIA_MAX_KEY_LEN;
+			break;
+		default:
+			dprintk("%s(%s) - bad cipher\n", __FUNCTION__, CIOCGSESSSTR);
+			error = EINVAL;
+			goto bail;
+		}
+
+		switch (sop.mac) {
+		case 0:
+			dprintk("%s(%s) - no mac\n", __FUNCTION__, CIOCGSESSSTR);
+			break;
+		case CRYPTO_NULL_HMAC:
+			info.authsize = NULL_HASH_LEN;
+			break;
+		case CRYPTO_MD5:
+			info.authsize = MD5_HASH_LEN;
+			break;
+		case CRYPTO_SHA1:
+			info.authsize = SHA1_HASH_LEN;
+			break;
+		case CRYPTO_SHA2_256:
+			info.authsize = SHA2_256_HASH_LEN;
+			break;
+		case CRYPTO_SHA2_384:
+			info.authsize = SHA2_384_HASH_LEN;
+  			break;
+		case CRYPTO_SHA2_512:
+			info.authsize = SHA2_512_HASH_LEN;
+			break;
+		case CRYPTO_RIPEMD160:
+			info.authsize = RIPEMD160_HASH_LEN;
+			break;
+		case CRYPTO_MD5_HMAC:
+			info.authsize = MD5_HASH_LEN;
+			info.authkey = 16;
+			break;
+		case CRYPTO_SHA1_HMAC:
+			info.authsize = SHA1_HASH_LEN;
+			info.authkey = 20;
+			break;
+		case CRYPTO_SHA2_256_HMAC:
+			info.authsize = SHA2_256_HASH_LEN;
+			info.authkey = 32;
+			break;
+		case CRYPTO_SHA2_384_HMAC:
+			info.authsize = SHA2_384_HASH_LEN;
+			info.authkey = 48;
+  			break;
+		case CRYPTO_SHA2_512_HMAC:
+			info.authsize = SHA2_512_HASH_LEN;
+			info.authkey = 64;
+			break;
+		case CRYPTO_RIPEMD160_HMAC:
+			info.authsize = RIPEMD160_HASH_LEN;
+			info.authkey = 20;
+			break;
+		default:
+			dprintk("%s(%s) - bad mac\n", __FUNCTION__, CIOCGSESSSTR);
+			error = EINVAL;
+			goto bail;
+		}
+
+		if (info.blocksize) {
+			crie.cri_alg = sop.cipher;
+			crie.cri_klen = sop.keylen * 8;
+			if ((info.maxkey && sop.keylen > info.maxkey) ||
+				   	sop.keylen < info.minkey) {
+				dprintk("%s(%s) - bad key\n", __FUNCTION__, CIOCGSESSSTR);
+				error = EINVAL;
+				goto bail;
+			}
+
+			crie.cri_key = (u_int8_t *) kmalloc(crie.cri_klen/8+1, GFP_KERNEL);
+			if (copy_from_user(crie.cri_key, sop.key,
+							crie.cri_klen/8)) {
+				dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
+				error = EFAULT;
+				goto bail;
+			}
+			if (info.authsize)
+				crie.cri_next = &cria;
+		}
+
+		if (info.authsize) {
+			cria.cri_alg = sop.mac;
+			cria.cri_klen = sop.mackeylen * 8;
+			if (info.authkey && sop.mackeylen != info.authkey) {
+				dprintk("%s(%s) - mackeylen %d != %d\n", __FUNCTION__,
+						CIOCGSESSSTR, sop.mackeylen, info.authkey);
+				error = EINVAL;
+				goto bail;
+			}
+
+			if (cria.cri_klen) {
+				cria.cri_key = (u_int8_t *) kmalloc(cria.cri_klen/8,GFP_KERNEL);
+				if (copy_from_user(cria.cri_key, sop.mackey,
+								cria.cri_klen / 8)) {
+					dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
+					error = EFAULT;
+					goto bail;
+				}
+			}
+		}
+
+		/* NB: CIOGSESSION2 has the crid */
+		if (cmd == CIOCGSESSION2) {
+			crid = sop.crid;
+			error = checkcrid(crid);
+			if (error) {
+				dprintk("%s(%s) - checkcrid %x\n", __FUNCTION__,
+						CIOCGSESSSTR, error);
+				goto bail;
+			}
+		} else {
+			/* allow either HW or SW to be used */
+			crid = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
+		}
+		error = crypto_newsession(&sid, (info.blocksize ? &crie : &cria), crid);
+		if (error) {
+			dprintk("%s(%s) - newsession %d\n",__FUNCTION__,CIOCGSESSSTR,error);
+			goto bail;
+		}
+
+		cse = csecreate(fcr, sid, &crie, &cria, &info);
+		if (cse == NULL) {
+			crypto_freesession(sid);
+			error = EINVAL;
+			dprintk("%s(%s) - csecreate failed\n", __FUNCTION__, CIOCGSESSSTR);
+			goto bail;
+		}
+		sop.ses = cse->ses;
+
+		if (cmd == CIOCGSESSION2) {
+			/* return hardware/driver id */
+			sop.crid = CRYPTO_SESID2HID(cse->sid);
+		}
+
+		if (copy_to_user((void*)arg, &sop, (cmd == CIOCGSESSION) ?
+					sizeof(struct session_op) : sizeof(sop))) {
+			dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
+			error = EFAULT;
+		}
+bail:
+		if (error) {
+			dprintk("%s(%s) - bail %d\n", __FUNCTION__, CIOCGSESSSTR, error);
+			if (crie.cri_key)
+				kfree(crie.cri_key);
+			if (cria.cri_key)
+				kfree(cria.cri_key);
+		}
+		break;
+	case CIOCFSESSION:
+		dprintk("%s(CIOCFSESSION)\n", __FUNCTION__);
+		get_user(ses, (uint32_t*)arg);
+		cse = csefind(fcr, ses);
+		if (cse == NULL) {
+			error = EINVAL;
+			dprintk("%s(CIOCFSESSION) - Fail %d\n", __FUNCTION__, error);
+			break;
+		}
+		csedelete(fcr, cse);
+		error = csefree(cse);
+		break;
+	case CIOCCRYPT:
+		dprintk("%s(CIOCCRYPT)\n", __FUNCTION__);
+		if(copy_from_user(&cop, (void*)arg, sizeof(cop))) {
+			dprintk("%s(CIOCCRYPT) - bad copy\n", __FUNCTION__);
+			error = EFAULT;
+			goto bail;
+		}
+		cse = csefind(fcr, cop.ses);
+		if (cse == NULL) {
+			error = EINVAL;
+			dprintk("%s(CIOCCRYPT) - Fail %d\n", __FUNCTION__, error);
+			break;
+		}
+		error = cryptodev_op(cse, &cop);
+		if(copy_to_user((void*)arg, &cop, sizeof(cop))) {
+			dprintk("%s(CIOCCRYPT) - bad return copy\n", __FUNCTION__);
+			error = EFAULT;
+			goto bail;
+		}
+		break;
+	case CIOCKEY:
+	case CIOCKEY2:
+		dprintk("%s(CIOCKEY)\n", __FUNCTION__);
+		if (!crypto_userasymcrypto)
+			return (EPERM);		/* XXX compat? */
+		if(copy_from_user(&kop, (void*)arg, sizeof(kop))) {
+			dprintk("%s(CIOCKEY) - bad copy\n", __FUNCTION__);
+			error = EFAULT;
+			goto bail;
+		}
+		if (cmd == CIOCKEY) {
+			/* NB: crypto core enforces s/w driver use */
+			kop.crk_crid =
+			    CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
+		}
+		error = cryptodev_key(&kop);
+		if(copy_to_user((void*)arg, &kop, sizeof(kop))) {
+			dprintk("%s(CIOCGKEY) - bad return copy\n", __FUNCTION__);
+			error = EFAULT;
+			goto bail;
+		}
+		break;
+	case CIOCASYMFEAT:
+		dprintk("%s(CIOCASYMFEAT)\n", __FUNCTION__);
+		if (!crypto_userasymcrypto) {
+			/*
+			 * NB: if user asym crypto operations are
+			 * not permitted return "no algorithms"
+			 * so well-behaved applications will just
+			 * fallback to doing them in software.
+			 */
+			feat = 0;
+		} else
+			error = crypto_getfeat(&feat);
+		if (!error) {
+		  error = copy_to_user((void*)arg, &feat, sizeof(feat));
+		}
+		break;
+	case CIOCFINDDEV:
+		if (copy_from_user(&fop, (void*)arg, sizeof(fop))) {
+			dprintk("%s(CIOCFINDDEV) - bad copy\n", __FUNCTION__);
+			error = EFAULT;
+			goto bail;
+		}
+		error = cryptodev_find(&fop);
+		if (copy_to_user((void*)arg, &fop, sizeof(fop))) {
+			dprintk("%s(CIOCFINDDEV) - bad return copy\n", __FUNCTION__);
+			error = EFAULT;
+			goto bail;
+		}
+		break;
+	default:
+		dprintk("%s(unknown ioctl 0x%x)\n", __FUNCTION__, cmd);
+		error = EINVAL;
+		break;
+	}
+	return(-error);
+}
+
+#ifdef HAVE_UNLOCKED_IOCTL
+static long
+cryptodev_unlocked_ioctl(
+	struct file *filp,
+	unsigned int cmd,
+	unsigned long arg)
+{
+	return cryptodev_ioctl(NULL, filp, cmd, arg);
+}
+#endif
+
+static int
+cryptodev_open(struct inode *inode, struct file *filp)
+{
+	struct fcrypt *fcr;
+
+	dprintk("%s()\n", __FUNCTION__);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
+	/*
+	 * on 2.6.35 private_data points to a miscdevice structure, we override
+	 * it,  which is currently safe to do.
+	 */
+	if (filp->private_data) {
+		printk("cryptodev: Private data already exists - %p!\n", filp->private_data);
+		return(-ENODEV);
+	}
+#endif
+
+	fcr = kmalloc(sizeof(*fcr), GFP_KERNEL);
+	if (!fcr) {
+		dprintk("%s() - malloc failed\n", __FUNCTION__);
+		return(-ENOMEM);
+	}
+	memset(fcr, 0, sizeof(*fcr));
+
+	INIT_LIST_HEAD(&fcr->csessions);
+	filp->private_data = fcr;
+	return(0);
+}
+
+static int
+cryptodev_release(struct inode *inode, struct file *filp)
+{
+	struct fcrypt *fcr = filp->private_data;
+	struct csession *cse, *tmp;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (!filp) {
+		printk("cryptodev: No private data on release\n");
+		return(0);
+	}
+
+	list_for_each_entry_safe(cse, tmp, &fcr->csessions, list) {
+		list_del(&cse->list);
+		(void)csefree(cse);
+	}
+	filp->private_data = NULL;
+	kfree(fcr);
+	return(0);
+}
+
+static struct file_operations cryptodev_fops = {
+	.owner = THIS_MODULE,
+	.open = cryptodev_open,
+	.release = cryptodev_release,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+	.ioctl = cryptodev_ioctl,
+#endif
+#ifdef HAVE_UNLOCKED_IOCTL
+	.unlocked_ioctl = cryptodev_unlocked_ioctl,
+#endif
+};
+
+static struct miscdevice cryptodev = {
+	.minor = CRYPTODEV_MINOR,
+	.name = "crypto",
+	.fops = &cryptodev_fops,
+};
+
+static int __init
+cryptodev_init(void)
+{
+	int rc;
+
+	dprintk("%s(%p)\n", __FUNCTION__, cryptodev_init);
+	rc = misc_register(&cryptodev);
+	if (rc) {
+		printk(KERN_ERR "cryptodev: registration of /dev/crypto failed\n");
+		return(rc);
+	}
+
+	return(0);
+}
+
+static void __exit
+cryptodev_exit(void)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	misc_deregister(&cryptodev);
+}
+
+module_init(cryptodev_init);
+module_exit(cryptodev_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("Cryptodev (user interface to OCF)");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/cryptodev.h b/trunk/target/linux/generic/files/crypto/ocf/cryptodev.h
new file mode 100644
index 00000000..cca0ec82
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/cryptodev.h
@@ -0,0 +1,480 @@
+/*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.25 2007/05/09 19:37:02 gnn Exp $	*/
+/*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
+
+/*-
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ * The license and original author are listed below.
+ *
+ * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
+ * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
+ *
+ * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * February 2000. Network Security Technologies Inc. (NSTI) kindly
+ * supported the development of this code.
+ *
+ * Copyright (c) 2000 Angelos D. Keromytis
+ *
+ * Permission to use, copy, and modify this software with or without fee
+ * is hereby granted, provided that this entire notice is included in
+ * all source code copies of any software which is or includes a copy or
+ * modification of this software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+ * PURPOSE.
+ *
+ * Copyright (c) 2001 Theo de Raadt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+#ifndef _CRYPTO_CRYPTO_H_
+#define _CRYPTO_CRYPTO_H_
+
+/* Some initial values */
+#define CRYPTO_DRIVERS_INITIAL	4
+#define CRYPTO_SW_SESSIONS	32
+
+/* Hash values */
+#define NULL_HASH_LEN		0
+#define MD5_HASH_LEN		16
+#define SHA1_HASH_LEN		20
+#define RIPEMD160_HASH_LEN	20
+#define SHA2_256_HASH_LEN	32
+#define SHA2_384_HASH_LEN	48
+#define SHA2_512_HASH_LEN	64
+#define MD5_KPDK_HASH_LEN	16
+#define SHA1_KPDK_HASH_LEN	20
+/* Maximum hash algorithm result length */
+#define HASH_MAX_LEN		SHA2_512_HASH_LEN /* Keep this updated */
+
+/* HMAC values */
+#define NULL_HMAC_BLOCK_LEN			1
+#define MD5_HMAC_BLOCK_LEN			64
+#define SHA1_HMAC_BLOCK_LEN			64
+#define RIPEMD160_HMAC_BLOCK_LEN	64
+#define SHA2_256_HMAC_BLOCK_LEN		64
+#define SHA2_384_HMAC_BLOCK_LEN		128
+#define SHA2_512_HMAC_BLOCK_LEN		128
+/* Maximum HMAC block length */
+#define HMAC_MAX_BLOCK_LEN		SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
+#define HMAC_IPAD_VAL			0x36
+#define HMAC_OPAD_VAL			0x5C
+
+/* Encryption algorithm block sizes */
+#define NULL_BLOCK_LEN			1
+#define DES_BLOCK_LEN			8
+#define DES3_BLOCK_LEN			8
+#define BLOWFISH_BLOCK_LEN		8
+#define SKIPJACK_BLOCK_LEN		8
+#define CAST128_BLOCK_LEN		8
+#define RIJNDAEL128_BLOCK_LEN	16
+#define AES_BLOCK_LEN			RIJNDAEL128_BLOCK_LEN
+#define CAMELLIA_BLOCK_LEN		16
+#define ARC4_BLOCK_LEN			1
+#define EALG_MAX_BLOCK_LEN		AES_BLOCK_LEN /* Keep this updated */
+
+/* Encryption algorithm min and max key sizes */
+#define NULL_MIN_KEY_LEN		0
+#define NULL_MAX_KEY_LEN		0
+#define DES_MIN_KEY_LEN			8
+#define DES_MAX_KEY_LEN			8
+#define DES3_MIN_KEY_LEN		24
+#define DES3_MAX_KEY_LEN		24
+#define BLOWFISH_MIN_KEY_LEN	4
+#define BLOWFISH_MAX_KEY_LEN	56
+#define SKIPJACK_MIN_KEY_LEN	10
+#define SKIPJACK_MAX_KEY_LEN	10
+#define CAST128_MIN_KEY_LEN		5
+#define CAST128_MAX_KEY_LEN		16
+#define RIJNDAEL128_MIN_KEY_LEN	16
+#define RIJNDAEL128_MAX_KEY_LEN	32
+#define AES_MIN_KEY_LEN			RIJNDAEL128_MIN_KEY_LEN
+#define AES_MAX_KEY_LEN			RIJNDAEL128_MAX_KEY_LEN
+#define CAMELLIA_MIN_KEY_LEN	16
+#define CAMELLIA_MAX_KEY_LEN	32
+#define ARC4_MIN_KEY_LEN		1
+#define ARC4_MAX_KEY_LEN		256
+
+/* Max size of data that can be processed */
+#define CRYPTO_MAX_DATA_LEN		64*1024 - 1
+
+#define CRYPTO_ALGORITHM_MIN	1
+#define CRYPTO_DES_CBC			1
+#define CRYPTO_3DES_CBC			2
+#define CRYPTO_BLF_CBC			3
+#define CRYPTO_CAST_CBC			4
+#define CRYPTO_SKIPJACK_CBC		5
+#define CRYPTO_MD5_HMAC			6
+#define CRYPTO_SHA1_HMAC		7
+#define CRYPTO_RIPEMD160_HMAC	8
+#define CRYPTO_MD5_KPDK			9
+#define CRYPTO_SHA1_KPDK		10
+#define CRYPTO_RIJNDAEL128_CBC	11 /* 128 bit blocksize */
+#define CRYPTO_AES_CBC			11 /* 128 bit blocksize -- the same as above */
+#define CRYPTO_ARC4				12
+#define CRYPTO_MD5				13
+#define CRYPTO_SHA1				14
+#define CRYPTO_NULL_HMAC		15
+#define CRYPTO_NULL_CBC			16
+#define CRYPTO_DEFLATE_COMP		17 /* Deflate compression algorithm */
+#define CRYPTO_SHA2_256_HMAC	18
+#define CRYPTO_SHA2_384_HMAC	19
+#define CRYPTO_SHA2_512_HMAC	20
+#define CRYPTO_CAMELLIA_CBC		21
+#define CRYPTO_SHA2_256			22
+#define CRYPTO_SHA2_384			23
+#define CRYPTO_SHA2_512			24
+#define CRYPTO_RIPEMD160		25
+#define	CRYPTO_LZS_COMP			26
+#define CRYPTO_ALGORITHM_MAX	26 /* Keep updated - see above */
+
+/* Algorithm flags */
+#define CRYPTO_ALG_FLAG_SUPPORTED	0x01 /* Algorithm is supported */
+#define CRYPTO_ALG_FLAG_RNG_ENABLE	0x02 /* Has HW RNG for DH/DSA */
+#define CRYPTO_ALG_FLAG_DSA_SHA		0x04 /* Can do SHA on msg */
+
+/*
+ * Crypto driver/device flags.  They can set in the crid
+ * parameter when creating a session or submitting a key
+ * op to affect the device/driver assigned.  If neither
+ * of these are specified then the crid is assumed to hold
+ * the driver id of an existing (and suitable) device that
+ * must be used to satisfy the request.
+ */
+#define CRYPTO_FLAG_HARDWARE	0x01000000	/* hardware accelerated */
+#define CRYPTO_FLAG_SOFTWARE	0x02000000	/* software implementation */
+
+/* NB: deprecated */
+struct session_op {
+	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
+	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
+
+	u_int32_t	keylen;		/* cipher key */
+	caddr_t		key;
+	int		mackeylen;	/* mac key */
+	caddr_t		mackey;
+
+  	u_int32_t	ses;		/* returns: session # */ 
+};
+
+struct session2_op {
+	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
+	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
+
+	u_int32_t	keylen;		/* cipher key */
+	caddr_t		key;
+	int		mackeylen;	/* mac key */
+	caddr_t		mackey;
+
+  	u_int32_t	ses;		/* returns: session # */ 
+	int		crid;		/* driver id + flags (rw) */
+	int		pad[4];		/* for future expansion */
+};
+
+struct crypt_op {
+	u_int32_t	ses;
+	u_int16_t	op;		/* i.e. COP_ENCRYPT */
+#define COP_NONE	0
+#define COP_ENCRYPT	1
+#define COP_DECRYPT	2
+	u_int16_t	flags;
+#define	COP_F_BATCH	0x0008		/* Batch op if possible */
+	u_int		len;
+	caddr_t		src, dst;	/* become iov[] inside kernel */
+	caddr_t		mac;		/* must be big enough for chosen MAC */
+	caddr_t		iv;
+};
+
+/*
+ * Parameters for looking up a crypto driver/device by
+ * device name or by id.  The latter are returned for
+ * created sessions (crid) and completed key operations.
+ */
+struct crypt_find_op {
+	int		crid;		/* driver id + flags */
+	char		name[32];	/* device/driver name */
+};
+
+/* bignum parameter, in packed bytes, ... */
+struct crparam {
+	caddr_t		crp_p;
+	u_int		crp_nbits;
+};
+
+#define CRK_MAXPARAM	8
+
+struct crypt_kop {
+	u_int		crk_op;		/* ie. CRK_MOD_EXP or other */
+	u_int		crk_status;	/* return status */
+	u_short		crk_iparams;	/* # of input parameters */
+	u_short		crk_oparams;	/* # of output parameters */
+	u_int		crk_crid;	/* NB: only used by CIOCKEY2 (rw) */
+	struct crparam	crk_param[CRK_MAXPARAM];
+};
+#define CRK_ALGORITM_MIN	0
+#define CRK_MOD_EXP		0
+#define CRK_MOD_EXP_CRT		1
+#define CRK_DSA_SIGN		2
+#define CRK_DSA_VERIFY		3
+#define CRK_DH_COMPUTE_KEY	4
+#define CRK_ALGORITHM_MAX	4 /* Keep updated - see below */
+
+#define CRF_MOD_EXP		(1 << CRK_MOD_EXP)
+#define CRF_MOD_EXP_CRT		(1 << CRK_MOD_EXP_CRT)
+#define CRF_DSA_SIGN		(1 << CRK_DSA_SIGN)
+#define CRF_DSA_VERIFY		(1 << CRK_DSA_VERIFY)
+#define CRF_DH_COMPUTE_KEY	(1 << CRK_DH_COMPUTE_KEY)
+
+/*
+ * done against open of /dev/crypto, to get a cloned descriptor.
+ * Please use F_SETFD against the cloned descriptor.
+ */
+#define CRIOGET		_IOWR('c', 100, u_int32_t)
+#define CRIOASYMFEAT	CIOCASYMFEAT
+#define CRIOFINDDEV	CIOCFINDDEV
+
+/* the following are done against the cloned descriptor */
+#define CIOCGSESSION	_IOWR('c', 101, struct session_op)
+#define CIOCFSESSION	_IOW('c', 102, u_int32_t)
+#define CIOCCRYPT	_IOWR('c', 103, struct crypt_op)
+#define CIOCKEY		_IOWR('c', 104, struct crypt_kop)
+#define CIOCASYMFEAT	_IOR('c', 105, u_int32_t)
+#define CIOCGSESSION2	_IOWR('c', 106, struct session2_op)
+#define CIOCKEY2	_IOWR('c', 107, struct crypt_kop)
+#define CIOCFINDDEV	_IOWR('c', 108, struct crypt_find_op)
+
+struct cryptotstat {
+	struct timespec	acc;		/* total accumulated time */
+	struct timespec	min;		/* min time */
+	struct timespec	max;		/* max time */
+	u_int32_t	count;		/* number of observations */
+};
+
+struct cryptostats {
+	u_int32_t	cs_ops;		/* symmetric crypto ops submitted */
+	u_int32_t	cs_errs;	/* symmetric crypto ops that failed */
+	u_int32_t	cs_kops;	/* asymetric/key ops submitted */
+	u_int32_t	cs_kerrs;	/* asymetric/key ops that failed */
+	u_int32_t	cs_intrs;	/* crypto swi thread activations */
+	u_int32_t	cs_rets;	/* crypto return thread activations */
+	u_int32_t	cs_blocks;	/* symmetric op driver block */
+	u_int32_t	cs_kblocks;	/* symmetric op driver block */
+	/*
+	 * When CRYPTO_TIMING is defined at compile time and the
+	 * sysctl debug.crypto is set to 1, the crypto system will
+	 * accumulate statistics about how long it takes to process
+	 * crypto requests at various points during processing.
+	 */
+	struct cryptotstat cs_invoke;	/* crypto_dipsatch -> crypto_invoke */
+	struct cryptotstat cs_done;	/* crypto_invoke -> crypto_done */
+	struct cryptotstat cs_cb;	/* crypto_done -> callback */
+	struct cryptotstat cs_finis;	/* callback -> callback return */
+
+	u_int32_t	cs_drops;		/* crypto ops dropped due to congestion */
+};
+
+#ifdef __KERNEL__
+
+/* Standard initialization structure beginning */
+struct cryptoini {
+	int		cri_alg;	/* Algorithm to use */
+	int		cri_klen;	/* Key length, in bits */
+	int		cri_mlen;	/* Number of bytes we want from the
+					   entire hash. 0 means all. */
+	caddr_t		cri_key;	/* key to use */
+	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
+	struct cryptoini *cri_next;
+};
+
+/* Describe boundaries of a single crypto operation */
+struct cryptodesc {
+	int		crd_skip;	/* How many bytes to ignore from start */
+	int		crd_len;	/* How many bytes to process */
+	int		crd_inject;	/* Where to inject results, if applicable */
+	int		crd_flags;
+
+#define CRD_F_ENCRYPT		0x01	/* Set when doing encryption */
+#define CRD_F_IV_PRESENT	0x02	/* When encrypting, IV is already in
+					   place, so don't copy. */
+#define CRD_F_IV_EXPLICIT	0x04	/* IV explicitly provided */
+#define CRD_F_DSA_SHA_NEEDED	0x08	/* Compute SHA-1 of buffer for DSA */
+#define CRD_F_KEY_EXPLICIT	0x10	/* Key explicitly provided */
+#define CRD_F_COMP		0x0f    /* Set when doing compression */
+
+	struct cryptoini	CRD_INI; /* Initialization/context data */
+#define crd_iv		CRD_INI.cri_iv
+#define crd_key		CRD_INI.cri_key
+#define crd_alg		CRD_INI.cri_alg
+#define crd_klen	CRD_INI.cri_klen
+#define crd_mlen	CRD_INI.cri_mlen
+
+	struct cryptodesc *crd_next;
+};
+
+/* Structure describing complete operation */
+struct cryptop {
+	struct list_head crp_next;
+	wait_queue_head_t crp_waitq;
+
+	u_int64_t	crp_sid;	/* Session ID */
+	int		crp_ilen;	/* Input data total length */
+	int		crp_olen;	/* Result total length */
+
+	int		crp_etype;	/*
+					 * Error type (zero means no error).
+					 * All error codes except EAGAIN
+					 * indicate possible data corruption (as in,
+					 * the data have been touched). On all
+					 * errors, the crp_sid may have changed
+					 * (reset to a new one), so the caller
+					 * should always check and use the new
+					 * value on future requests.
+					 */
+	int		crp_flags;
+
+#define CRYPTO_F_SKBUF		0x0001	/* Input/output are skbuf chains */
+#define CRYPTO_F_IOV		0x0002	/* Input/output are uio */
+#define CRYPTO_F_REL		0x0004	/* Must return data in same place */
+#define CRYPTO_F_BATCH		0x0008	/* Batch op if possible */
+#define CRYPTO_F_CBIMM		0x0010	/* Do callback immediately */
+#define CRYPTO_F_DONE		0x0020	/* Operation completed */
+#define CRYPTO_F_CBIFSYNC	0x0040	/* Do CBIMM if op is synchronous */
+
+	caddr_t		crp_buf;	/* Data to be processed */
+	caddr_t		crp_opaque;	/* Opaque pointer, passed along */
+	struct cryptodesc *crp_desc;	/* Linked list of processing descriptors */
+
+	int (*crp_callback)(struct cryptop *); /* Callback function */
+};
+
+#define CRYPTO_BUF_CONTIG	0x0
+#define CRYPTO_BUF_IOV		0x1
+#define CRYPTO_BUF_SKBUF		0x2
+
+#define CRYPTO_OP_DECRYPT	0x0
+#define CRYPTO_OP_ENCRYPT	0x1
+
+/*
+ * Hints passed to process methods.
+ */
+#define CRYPTO_HINT_MORE	0x1	/* more ops coming shortly */
+
+struct cryptkop {
+	struct list_head krp_next;
+	wait_queue_head_t krp_waitq;
+
+	int		krp_flags;
+#define CRYPTO_KF_DONE		0x0001	/* Operation completed */
+#define CRYPTO_KF_CBIMM		0x0002	/* Do callback immediately */
+
+	u_int		krp_op;		/* ie. CRK_MOD_EXP or other */
+	u_int		krp_status;	/* return status */
+	u_short		krp_iparams;	/* # of input parameters */
+	u_short		krp_oparams;	/* # of output parameters */
+	u_int		krp_crid;	/* desired device, etc. */
+	u_int32_t	krp_hid;
+	struct crparam	krp_param[CRK_MAXPARAM];	/* kvm */
+	int		(*krp_callback)(struct cryptkop *);
+};
+
+#include <ocf-compat.h>
+
+/*
+ * Session ids are 64 bits.  The lower 32 bits contain a "local id" which
+ * is a driver-private session identifier.  The upper 32 bits contain a
+ * "hardware id" used by the core crypto code to identify the driver and
+ * a copy of the driver's capabilities that can be used by client code to
+ * optimize operation.
+ */
+#define CRYPTO_SESID2HID(_sid)	(((_sid) >> 32) & 0x00ffffff)
+#define CRYPTO_SESID2CAPS(_sid)	(((_sid) >> 32) & 0xff000000)
+#define CRYPTO_SESID2LID(_sid)	(((u_int32_t) (_sid)) & 0xffffffff)
+
+extern	int crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard);
+extern	int crypto_freesession(u_int64_t sid);
+#define CRYPTOCAP_F_HARDWARE	CRYPTO_FLAG_HARDWARE
+#define CRYPTOCAP_F_SOFTWARE	CRYPTO_FLAG_SOFTWARE
+#define CRYPTOCAP_F_SYNC	0x04000000	/* operates synchronously */
+extern	int32_t crypto_get_driverid(device_t dev, int flags);
+extern	int crypto_find_driver(const char *);
+extern	device_t crypto_find_device_byhid(int hid);
+extern	int crypto_getcaps(int hid);
+extern	int crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
+	    u_int32_t flags);
+extern	int crypto_kregister(u_int32_t, int, u_int32_t);
+extern	int crypto_unregister(u_int32_t driverid, int alg);
+extern	int crypto_unregister_all(u_int32_t driverid);
+extern	int crypto_dispatch(struct cryptop *crp);
+extern	int crypto_kdispatch(struct cryptkop *);
+#define CRYPTO_SYMQ	0x1
+#define CRYPTO_ASYMQ	0x2
+extern	int crypto_unblock(u_int32_t, int);
+extern	void crypto_done(struct cryptop *crp);
+extern	void crypto_kdone(struct cryptkop *);
+extern	int crypto_getfeat(int *);
+
+extern	void crypto_freereq(struct cryptop *crp);
+extern	struct cryptop *crypto_getreq(int num);
+
+extern  int crypto_usercrypto;      /* userland may do crypto requests */
+extern  int crypto_userasymcrypto;  /* userland may do asym crypto reqs */
+extern  int crypto_devallowsoft;    /* only use hardware crypto */
+
+/*
+ * random number support,  crypto_unregister_all will unregister
+ */
+extern int crypto_rregister(u_int32_t driverid,
+		int (*read_random)(void *arg, u_int32_t *buf, int len), void *arg);
+extern int crypto_runregister_all(u_int32_t driverid);
+
+/*
+ * Crypto-related utility routines used mainly by drivers.
+ *
+ * XXX these don't really belong here; but for now they're
+ *     kept apart from the rest of the system.
+ */
+struct uio;
+extern	void cuio_copydata(struct uio* uio, int off, int len, caddr_t cp);
+extern	void cuio_copyback(struct uio* uio, int off, int len, caddr_t cp);
+extern	struct iovec *cuio_getptr(struct uio *uio, int loc, int *off);
+
+extern	void crypto_copyback(int flags, caddr_t buf, int off, int size,
+	    caddr_t in);
+extern	void crypto_copydata(int flags, caddr_t buf, int off, int size,
+	    caddr_t out);
+extern	int crypto_apply(int flags, caddr_t buf, int off, int len,
+	    int (*f)(void *, void *, u_int), void *arg);
+
+#endif /* __KERNEL__ */
+#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/cryptosoft.c b/trunk/target/linux/generic/files/crypto/ocf/cryptosoft.c
new file mode 100644
index 00000000..aa2383d1
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/cryptosoft.c
@@ -0,0 +1,1322 @@
+/*
+ * An OCF module that uses the linux kernel cryptoapi, based on the
+ * original cryptosoft for BSD by Angelos D. Keromytis (angelos@cis.upenn.edu)
+ * but is mostly unrecognisable,
+ *
+ * Written by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2004-2011 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ * ---------------------------------------------------------------------------
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/crypto.h>
+#include <linux/mm.h>
+#include <linux/skbuff.h>
+#include <linux/random.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
+#include <linux/scatterlist.h>
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
+#include <crypto/hash.h>
+#endif
+
+#include <cryptodev.h>
+#include <uio.h>
+
+struct {
+	softc_device_decl	sc_dev;
+} swcr_softc;
+
+#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
+
+#define SW_TYPE_CIPHER		0x01
+#define SW_TYPE_HMAC		0x02
+#define SW_TYPE_HASH		0x04
+#define SW_TYPE_COMP		0x08
+#define SW_TYPE_BLKCIPHER	0x10
+#define SW_TYPE_ALG_MASK	0x1f
+
+#define SW_TYPE_ASYNC		0x8000
+
+#define SW_TYPE_INUSE		0x10000000
+
+/* We change some of the above if we have an async interface */
+
+#define SW_TYPE_ALG_AMASK	(SW_TYPE_ALG_MASK | SW_TYPE_ASYNC)
+
+#define SW_TYPE_ABLKCIPHER	(SW_TYPE_BLKCIPHER | SW_TYPE_ASYNC)
+#define SW_TYPE_AHASH		(SW_TYPE_HASH | SW_TYPE_ASYNC)
+#define SW_TYPE_AHMAC		(SW_TYPE_HMAC | SW_TYPE_ASYNC)
+
+#define SCATTERLIST_MAX 16
+
+struct swcr_data {
+	struct work_struct  workq;
+	int					sw_type;
+	int					sw_alg;
+	struct crypto_tfm	*sw_tfm;
+	spinlock_t			sw_tfm_lock;
+	union {
+		struct {
+			char *sw_key;
+			int  sw_klen;
+			int  sw_mlen;
+		} hmac;
+		void *sw_comp_buf;
+	} u;
+	struct swcr_data	*sw_next;
+};
+
+struct swcr_req {
+	struct swcr_data	*sw_head;
+	struct swcr_data	*sw;
+	struct cryptop		*crp;
+	struct cryptodesc	*crd;
+	struct scatterlist	 sg[SCATTERLIST_MAX];
+	unsigned char		 iv[EALG_MAX_BLOCK_LEN];
+	char				 result[HASH_MAX_LEN];
+	void				*crypto_req;
+};
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+static kmem_cache_t *swcr_req_cache;
+#else
+static struct kmem_cache *swcr_req_cache;
+#endif
+
+#ifndef CRYPTO_TFM_MODE_CBC
+/*
+ * As of linux-2.6.21 this is no longer defined, and presumably no longer
+ * needed to be passed into the crypto core code.
+ */
+#define	CRYPTO_TFM_MODE_CBC	0
+#define	CRYPTO_TFM_MODE_ECB	0
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+	/*
+	 * Linux 2.6.19 introduced a new Crypto API, setup macro's to convert new
+	 * API into old API.
+	 */
+
+	/* Symmetric/Block Cipher */
+	struct blkcipher_desc
+	{
+		struct crypto_tfm *tfm;
+		void *info;
+	};
+	#define ecb(X)								#X , CRYPTO_TFM_MODE_ECB
+	#define cbc(X)								#X , CRYPTO_TFM_MODE_CBC
+	#define crypto_has_blkcipher(X, Y, Z)		crypto_alg_available(X, 0)
+	#define crypto_blkcipher_cast(X)			X
+	#define crypto_blkcipher_tfm(X)				X
+	#define crypto_alloc_blkcipher(X, Y, Z)		crypto_alloc_tfm(X, mode)
+	#define crypto_blkcipher_ivsize(X)			crypto_tfm_alg_ivsize(X)
+	#define crypto_blkcipher_blocksize(X)		crypto_tfm_alg_blocksize(X)
+	#define crypto_blkcipher_setkey(X, Y, Z)	crypto_cipher_setkey(X, Y, Z)
+	#define crypto_blkcipher_encrypt_iv(W, X, Y, Z)	\
+				crypto_cipher_encrypt_iv((W)->tfm, X, Y, Z, (u8 *)((W)->info))
+	#define crypto_blkcipher_decrypt_iv(W, X, Y, Z)	\
+				crypto_cipher_decrypt_iv((W)->tfm, X, Y, Z, (u8 *)((W)->info))
+	#define crypto_blkcipher_set_flags(x, y)	/* nop */
+	#define crypto_free_blkcipher(x)			crypto_free_tfm(x)
+	#define crypto_free_comp					crypto_free_tfm
+	#define crypto_free_hash					crypto_free_tfm
+
+	/* Hash/HMAC/Digest */
+	struct hash_desc
+	{
+		struct crypto_tfm *tfm;
+	};
+	#define hmac(X)							#X , 0
+	#define crypto_has_hash(X, Y, Z)		crypto_alg_available(X, 0)
+	#define crypto_hash_cast(X)				X
+	#define crypto_hash_tfm(X)				X
+	#define crypto_alloc_hash(X, Y, Z)		crypto_alloc_tfm(X, mode)
+	#define crypto_hash_digestsize(X)		crypto_tfm_alg_digestsize(X)
+	#define crypto_hash_digest(W, X, Y, Z)	\
+				crypto_digest_digest((W)->tfm, X, sg_num, Z)
+
+	/* Asymmetric Cipher */
+	#define crypto_has_cipher(X, Y, Z)		crypto_alg_available(X, 0)
+
+	/* Compression */
+	#define crypto_has_comp(X, Y, Z)		crypto_alg_available(X, 0)
+	#define crypto_comp_tfm(X)				X
+	#define crypto_comp_cast(X)				X
+	#define crypto_alloc_comp(X, Y, Z)		crypto_alloc_tfm(X, mode)
+	#define plain(X)	#X , 0
+#else
+	#define ecb(X)	"ecb(" #X ")" , 0
+	#define cbc(X)	"cbc(" #X ")" , 0
+	#define hmac(X)	"hmac(" #X ")" , 0
+	#define plain(X)	#X , 0
+#endif /* if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+/* no ablkcipher in older kernels */
+#define crypto_alloc_ablkcipher(a,b,c)		(NULL)
+#define crypto_ablkcipher_tfm(x)			((struct crypto_tfm *)(x))
+#define crypto_ablkcipher_set_flags(a, b)	/* nop */
+#define crypto_ablkcipher_setkey(x, y, z)	(-EINVAL)
+#define	crypto_has_ablkcipher(a,b,c)		(0)
+#else
+#define	HAVE_ABLKCIPHER
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
+/* no ahash in older kernels */
+#define crypto_ahash_tfm(x)					((struct crypto_tfm *)(x))
+#define	crypto_alloc_ahash(a,b,c)			(NULL)
+#define	crypto_ahash_digestsize(x)			0
+#else
+#define	HAVE_AHASH
+#endif
+
+struct crypto_details {
+	char *alg_name;
+	int mode;
+	int sw_type;
+};
+
+static struct crypto_details crypto_details[] = {
+	[CRYPTO_DES_CBC]         = { cbc(des),          SW_TYPE_BLKCIPHER, },
+	[CRYPTO_3DES_CBC]        = { cbc(des3_ede),     SW_TYPE_BLKCIPHER, },
+	[CRYPTO_BLF_CBC]         = { cbc(blowfish),     SW_TYPE_BLKCIPHER, },
+	[CRYPTO_CAST_CBC]        = { cbc(cast5),        SW_TYPE_BLKCIPHER, },
+	[CRYPTO_SKIPJACK_CBC]    = { cbc(skipjack),     SW_TYPE_BLKCIPHER, },
+	[CRYPTO_MD5_HMAC]        = { hmac(md5),         SW_TYPE_HMAC, },
+	[CRYPTO_SHA1_HMAC]       = { hmac(sha1),        SW_TYPE_HMAC, },
+	[CRYPTO_RIPEMD160_HMAC]  = { hmac(ripemd160),   SW_TYPE_HMAC, },
+	[CRYPTO_MD5_KPDK]        = { plain(md5-kpdk),   SW_TYPE_HASH, },
+	[CRYPTO_SHA1_KPDK]       = { plain(sha1-kpdk),  SW_TYPE_HASH, },
+	[CRYPTO_AES_CBC]         = { cbc(aes),          SW_TYPE_BLKCIPHER, },
+	[CRYPTO_ARC4]            = { ecb(arc4),         SW_TYPE_BLKCIPHER, },
+	[CRYPTO_MD5]             = { plain(md5),        SW_TYPE_HASH, },
+	[CRYPTO_SHA1]            = { plain(sha1),       SW_TYPE_HASH, },
+	[CRYPTO_NULL_HMAC]       = { hmac(digest_null), SW_TYPE_HMAC, },
+	[CRYPTO_NULL_CBC]        = { cbc(cipher_null),  SW_TYPE_BLKCIPHER, },
+	[CRYPTO_DEFLATE_COMP]    = { plain(deflate),    SW_TYPE_COMP, },
+	[CRYPTO_SHA2_256_HMAC]   = { hmac(sha256),      SW_TYPE_HMAC, },
+	[CRYPTO_SHA2_384_HMAC]   = { hmac(sha384),      SW_TYPE_HMAC, },
+	[CRYPTO_SHA2_512_HMAC]   = { hmac(sha512),      SW_TYPE_HMAC, },
+	[CRYPTO_CAMELLIA_CBC]    = { cbc(camellia),     SW_TYPE_BLKCIPHER, },
+	[CRYPTO_SHA2_256]        = { plain(sha256),     SW_TYPE_HASH, },
+	[CRYPTO_SHA2_384]        = { plain(sha384),     SW_TYPE_HASH, },
+	[CRYPTO_SHA2_512]        = { plain(sha512),     SW_TYPE_HASH, },
+	[CRYPTO_RIPEMD160]       = { plain(ripemd160),  SW_TYPE_HASH, },
+};
+
+int32_t swcr_id = -1;
+module_param(swcr_id, int, 0444);
+MODULE_PARM_DESC(swcr_id, "Read-Only OCF ID for cryptosoft driver");
+
+int swcr_fail_if_compression_grows = 1;
+module_param(swcr_fail_if_compression_grows, int, 0644);
+MODULE_PARM_DESC(swcr_fail_if_compression_grows,
+                "Treat compression that results in more data as a failure");
+
+int swcr_no_ahash = 0;
+module_param(swcr_no_ahash, int, 0644);
+MODULE_PARM_DESC(swcr_no_ahash,
+                "Do not use async hash/hmac even if available");
+
+int swcr_no_ablk = 0;
+module_param(swcr_no_ablk, int, 0644);
+MODULE_PARM_DESC(swcr_no_ablk,
+                "Do not use async blk ciphers even if available");
+
+static struct swcr_data **swcr_sessions = NULL;
+static u_int32_t swcr_sesnum = 0;
+
+static	int swcr_process(device_t, struct cryptop *, int);
+static	int swcr_newsession(device_t, u_int32_t *, struct cryptoini *);
+static	int swcr_freesession(device_t, u_int64_t);
+
+static device_method_t swcr_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	swcr_newsession),
+	DEVMETHOD(cryptodev_freesession,swcr_freesession),
+	DEVMETHOD(cryptodev_process,	swcr_process),
+};
+
+#define debug swcr_debug
+int swcr_debug = 0;
+module_param(swcr_debug, int, 0644);
+MODULE_PARM_DESC(swcr_debug, "Enable debug");
+
+static void swcr_process_req(struct swcr_req *req);
+
+/*
+ * somethings just need to be run with user context no matter whether
+ * the kernel compression libs use vmalloc/vfree for example.
+ */
+
+typedef struct {
+	struct work_struct wq;
+	void	(*func)(void *arg);
+	void	*arg;
+} execute_later_t;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void
+doing_it_now(struct work_struct *wq)
+{
+	execute_later_t *w = container_of(wq, execute_later_t, wq);
+	(w->func)(w->arg);
+	kfree(w);
+}
+#else
+static void
+doing_it_now(void *arg)
+{
+	execute_later_t *w = (execute_later_t *) arg;
+	(w->func)(w->arg);
+	kfree(w);
+}
+#endif
+
+static void
+execute_later(void (fn)(void *), void *arg)
+{
+	execute_later_t *w;
+
+	w = (execute_later_t *) kmalloc(sizeof(execute_later_t), SLAB_ATOMIC);
+	if (w) {
+		memset(w, '\0', sizeof(w));
+		w->func = fn;
+		w->arg = arg;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+		INIT_WORK(&w->wq, doing_it_now);
+#else
+		INIT_WORK(&w->wq, doing_it_now, w);
+#endif
+		schedule_work(&w->wq);
+	}
+}
+
+/*
+ * Generate a new software session.
+ */
+static int
+swcr_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
+{
+	struct swcr_data **swd;
+	u_int32_t i;
+	int error;
+	char *algo;
+	int mode;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid == NULL || cri == NULL) {
+		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	if (swcr_sessions) {
+		for (i = 1; i < swcr_sesnum; i++)
+			if (swcr_sessions[i] == NULL)
+				break;
+	} else
+		i = 1;		/* NB: to silence compiler warning */
+
+	if (swcr_sessions == NULL || i == swcr_sesnum) {
+		if (swcr_sessions == NULL) {
+			i = 1; /* We leave swcr_sessions[0] empty */
+			swcr_sesnum = CRYPTO_SW_SESSIONS;
+		} else
+			swcr_sesnum *= 2;
+
+		swd = kmalloc(swcr_sesnum * sizeof(struct swcr_data *), SLAB_ATOMIC);
+		if (swd == NULL) {
+			/* Reset session number */
+			if (swcr_sesnum == CRYPTO_SW_SESSIONS)
+				swcr_sesnum = 0;
+			else
+				swcr_sesnum /= 2;
+			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+			return ENOBUFS;
+		}
+		memset(swd, 0, swcr_sesnum * sizeof(struct swcr_data *));
+
+		/* Copy existing sessions */
+		if (swcr_sessions) {
+			memcpy(swd, swcr_sessions,
+			    (swcr_sesnum / 2) * sizeof(struct swcr_data *));
+			kfree(swcr_sessions);
+		}
+
+		swcr_sessions = swd;
+	}
+
+	swd = &swcr_sessions[i];
+	*sid = i;
+
+	while (cri) {
+		*swd = (struct swcr_data *) kmalloc(sizeof(struct swcr_data),
+				SLAB_ATOMIC);
+		if (*swd == NULL) {
+			swcr_freesession(NULL, i);
+			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+			return ENOBUFS;
+		}
+		memset(*swd, 0, sizeof(struct swcr_data));
+
+		if (cri->cri_alg < 0 ||
+				cri->cri_alg>=sizeof(crypto_details)/sizeof(crypto_details[0])){
+			printk("cryptosoft: Unknown algorithm 0x%x\n", cri->cri_alg);
+			swcr_freesession(NULL, i);
+			return EINVAL;
+		}
+
+		algo = crypto_details[cri->cri_alg].alg_name;
+		if (!algo || !*algo) {
+			printk("cryptosoft: Unsupported algorithm 0x%x\n", cri->cri_alg);
+			swcr_freesession(NULL, i);
+			return EINVAL;
+		}
+
+		mode = crypto_details[cri->cri_alg].mode;
+		(*swd)->sw_type = crypto_details[cri->cri_alg].sw_type;
+		(*swd)->sw_alg = cri->cri_alg;
+
+		spin_lock_init(&(*swd)->sw_tfm_lock);
+
+		/* Algorithm specific configuration */
+		switch (cri->cri_alg) {
+		case CRYPTO_NULL_CBC:
+			cri->cri_klen = 0; /* make it work with crypto API */
+			break;
+		default:
+			break;
+		}
+
+		if ((*swd)->sw_type & SW_TYPE_BLKCIPHER) {
+			dprintk("%s crypto_alloc_*blkcipher(%s, 0x%x)\n", __FUNCTION__,
+					algo, mode);
+
+			/* try async first */
+			(*swd)->sw_tfm = swcr_no_ablk ? NULL :
+					crypto_ablkcipher_tfm(crypto_alloc_ablkcipher(algo, 0, 0));
+			if ((*swd)->sw_tfm && !IS_ERR((*swd)->sw_tfm)) {
+				dprintk("%s %s cipher is async\n", __FUNCTION__, algo);
+				(*swd)->sw_type |= SW_TYPE_ASYNC;
+			} else {
+				(*swd)->sw_tfm = crypto_blkcipher_tfm(
+						crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC));
+				if ((*swd)->sw_tfm && !IS_ERR((*swd)->sw_tfm))
+					dprintk("%s %s cipher is sync\n", __FUNCTION__, algo);
+			}
+			if (!(*swd)->sw_tfm || IS_ERR((*swd)->sw_tfm)) {
+				int err;
+				dprintk("cryptosoft: crypto_alloc_blkcipher failed(%s, 0x%x)\n",
+						algo,mode);
+				err = IS_ERR((*swd)->sw_tfm) ? -(PTR_ERR((*swd)->sw_tfm)) : EINVAL;
+				(*swd)->sw_tfm = NULL; /* ensure NULL */
+				swcr_freesession(NULL, i);
+				return err;
+			}
+
+			if (debug) {
+				dprintk("%s key:cri->cri_klen=%d,(cri->cri_klen + 7)/8=%d",
+						__FUNCTION__, cri->cri_klen, (cri->cri_klen + 7) / 8);
+				for (i = 0; i < (cri->cri_klen + 7) / 8; i++)
+					dprintk("%s0x%x", (i % 8) ? " " : "\n    ",
+							cri->cri_key[i] & 0xff);
+				dprintk("\n");
+			}
+			if ((*swd)->sw_type & SW_TYPE_ASYNC) {
+				/* OCF doesn't enforce keys */
+				crypto_ablkcipher_set_flags(
+						__crypto_ablkcipher_cast((*swd)->sw_tfm),
+							CRYPTO_TFM_REQ_WEAK_KEY);
+				error = crypto_ablkcipher_setkey(
+							__crypto_ablkcipher_cast((*swd)->sw_tfm),
+								cri->cri_key, (cri->cri_klen + 7) / 8);
+			} else {
+				/* OCF doesn't enforce keys */
+				crypto_blkcipher_set_flags(
+						crypto_blkcipher_cast((*swd)->sw_tfm),
+							CRYPTO_TFM_REQ_WEAK_KEY);
+				error = crypto_blkcipher_setkey(
+							crypto_blkcipher_cast((*swd)->sw_tfm),
+								cri->cri_key, (cri->cri_klen + 7) / 8);
+			}
+			if (error) {
+				printk("cryptosoft: setkey failed %d (crt_flags=0x%x)\n", error,
+						(*swd)->sw_tfm->crt_flags);
+				swcr_freesession(NULL, i);
+				return error;
+			}
+		} else if ((*swd)->sw_type & (SW_TYPE_HMAC | SW_TYPE_HASH)) {
+			dprintk("%s crypto_alloc_*hash(%s, 0x%x)\n", __FUNCTION__,
+					algo, mode);
+
+			/* try async first */
+			(*swd)->sw_tfm = swcr_no_ahash ? NULL :
+					crypto_ahash_tfm(crypto_alloc_ahash(algo, 0, 0));
+			if ((*swd)->sw_tfm) {
+				dprintk("%s %s hash is async\n", __FUNCTION__, algo);
+				(*swd)->sw_type |= SW_TYPE_ASYNC;
+			} else {
+				dprintk("%s %s hash is sync\n", __FUNCTION__, algo);
+				(*swd)->sw_tfm = crypto_hash_tfm(
+						crypto_alloc_hash(algo, 0, CRYPTO_ALG_ASYNC));
+			}
+
+			if (!(*swd)->sw_tfm) {
+				dprintk("cryptosoft: crypto_alloc_hash failed(%s,0x%x)\n",
+						algo, mode);
+				swcr_freesession(NULL, i);
+				return EINVAL;
+			}
+
+			(*swd)->u.hmac.sw_klen = (cri->cri_klen + 7) / 8;
+			(*swd)->u.hmac.sw_key = (char *)kmalloc((*swd)->u.hmac.sw_klen,
+					SLAB_ATOMIC);
+			if ((*swd)->u.hmac.sw_key == NULL) {
+				swcr_freesession(NULL, i);
+				dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+				return ENOBUFS;
+			}
+			memcpy((*swd)->u.hmac.sw_key, cri->cri_key, (*swd)->u.hmac.sw_klen);
+			if (cri->cri_mlen) {
+				(*swd)->u.hmac.sw_mlen = cri->cri_mlen;
+			} else if ((*swd)->sw_type & SW_TYPE_ASYNC) {
+				(*swd)->u.hmac.sw_mlen = crypto_ahash_digestsize(
+						__crypto_ahash_cast((*swd)->sw_tfm));
+			} else  {
+				(*swd)->u.hmac.sw_mlen = crypto_hash_digestsize(
+						crypto_hash_cast((*swd)->sw_tfm));
+			}
+		} else if ((*swd)->sw_type & SW_TYPE_COMP) {
+			(*swd)->sw_tfm = crypto_comp_tfm(
+					crypto_alloc_comp(algo, 0, CRYPTO_ALG_ASYNC));
+			if (!(*swd)->sw_tfm) {
+				dprintk("cryptosoft: crypto_alloc_comp failed(%s,0x%x)\n",
+						algo, mode);
+				swcr_freesession(NULL, i);
+				return EINVAL;
+			}
+			(*swd)->u.sw_comp_buf = kmalloc(CRYPTO_MAX_DATA_LEN, SLAB_ATOMIC);
+			if ((*swd)->u.sw_comp_buf == NULL) {
+				swcr_freesession(NULL, i);
+				dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+				return ENOBUFS;
+			}
+		} else {
+			printk("cryptosoft: Unhandled sw_type %d\n", (*swd)->sw_type);
+			swcr_freesession(NULL, i);
+			return EINVAL;
+		}
+
+		cri = cri->cri_next;
+		swd = &((*swd)->sw_next);
+	}
+	return 0;
+}
+
+/*
+ * Free a session.
+ */
+static int
+swcr_freesession(device_t dev, u_int64_t tid)
+{
+	struct swcr_data *swd;
+	u_int32_t sid = CRYPTO_SESID2LID(tid);
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid > swcr_sesnum || swcr_sessions == NULL ||
+			swcr_sessions[sid] == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return(EINVAL);
+	}
+
+	/* Silently accept and return */
+	if (sid == 0)
+		return(0);
+
+	while ((swd = swcr_sessions[sid]) != NULL) {
+		swcr_sessions[sid] = swd->sw_next;
+		if (swd->sw_tfm) {
+			switch (swd->sw_type & SW_TYPE_ALG_AMASK) {
+#ifdef HAVE_AHASH
+			case SW_TYPE_AHMAC:
+			case SW_TYPE_AHASH:
+				crypto_free_ahash(__crypto_ahash_cast(swd->sw_tfm));
+				break;
+#endif
+#ifdef HAVE_ABLKCIPHER
+			case SW_TYPE_ABLKCIPHER:
+				crypto_free_ablkcipher(__crypto_ablkcipher_cast(swd->sw_tfm));
+				break;
+#endif
+			case SW_TYPE_BLKCIPHER:
+				crypto_free_blkcipher(crypto_blkcipher_cast(swd->sw_tfm));
+				break;
+			case SW_TYPE_HMAC:
+			case SW_TYPE_HASH:
+				crypto_free_hash(crypto_hash_cast(swd->sw_tfm));
+				break;
+			case SW_TYPE_COMP:
+				if (in_interrupt())
+					execute_later((void (*)(void *))crypto_free_comp, (void *)crypto_comp_cast(swd->sw_tfm));
+				else
+					crypto_free_comp(crypto_comp_cast(swd->sw_tfm));
+				break;
+			default:
+				crypto_free_tfm(swd->sw_tfm);
+				break;
+			}
+			swd->sw_tfm = NULL;
+		}
+		if (swd->sw_type & SW_TYPE_COMP) {
+			if (swd->u.sw_comp_buf)
+				kfree(swd->u.sw_comp_buf);
+		} else {
+			if (swd->u.hmac.sw_key)
+				kfree(swd->u.hmac.sw_key);
+		}
+		kfree(swd);
+	}
+	return 0;
+}
+
+static void swcr_process_req_complete(struct swcr_req *req)
+{
+	dprintk("%s()\n", __FUNCTION__);
+
+	if (req->sw->sw_type & SW_TYPE_INUSE) {
+		unsigned long flags;
+		spin_lock_irqsave(&req->sw->sw_tfm_lock, flags);
+		req->sw->sw_type &= ~SW_TYPE_INUSE;
+		spin_unlock_irqrestore(&req->sw->sw_tfm_lock, flags);
+	}
+
+	if (req->crp->crp_etype)
+		goto done;
+
+	switch (req->sw->sw_type & SW_TYPE_ALG_AMASK) {
+#if defined(HAVE_AHASH)
+	case SW_TYPE_AHMAC:
+	case SW_TYPE_AHASH:
+		crypto_copyback(req->crp->crp_flags, req->crp->crp_buf,
+				req->crd->crd_inject, req->sw->u.hmac.sw_mlen, req->result);
+		ahash_request_free(req->crypto_req);
+		break;
+#endif
+#if defined(HAVE_ABLKCIPHER)
+	case SW_TYPE_ABLKCIPHER:
+		ablkcipher_request_free(req->crypto_req);
+		break;
+#endif
+	case SW_TYPE_CIPHER:
+	case SW_TYPE_HMAC:
+	case SW_TYPE_HASH:
+	case SW_TYPE_COMP:
+	case SW_TYPE_BLKCIPHER:
+		break;
+	default:
+		req->crp->crp_etype = EINVAL;
+		goto done;
+	}
+
+	req->crd = req->crd->crd_next;
+	if (req->crd) {
+		swcr_process_req(req);
+		return;
+	}
+
+done:
+	dprintk("%s crypto_done %p\n", __FUNCTION__, req);
+	crypto_done(req->crp);
+	kmem_cache_free(swcr_req_cache, req);
+}
+
+#if defined(HAVE_ABLKCIPHER) || defined(HAVE_AHASH)
+static void swcr_process_callback(struct crypto_async_request *creq, int err)
+{
+	struct swcr_req *req = creq->data;
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (err) {
+		if (err == -EINPROGRESS)
+			return;
+		dprintk("%s() fail %d\n", __FUNCTION__, -err);
+		req->crp->crp_etype = -err;
+	}
+
+	swcr_process_req_complete(req);
+}
+#endif /* defined(HAVE_ABLKCIPHER) || defined(HAVE_AHASH) */
+
+
+static void swcr_process_req(struct swcr_req *req)
+{
+	struct swcr_data *sw;
+	struct cryptop *crp = req->crp;
+	struct cryptodesc *crd = req->crd;
+	struct sk_buff *skb = (struct sk_buff *) crp->crp_buf;
+	struct uio *uiop = (struct uio *) crp->crp_buf;
+	int sg_num, sg_len, skip;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	/*
+	 * Find the crypto context.
+	 *
+	 * XXX Note that the logic here prevents us from having
+	 * XXX the same algorithm multiple times in a session
+	 * XXX (or rather, we can but it won't give us the right
+	 * XXX results). To do that, we'd need some way of differentiating
+	 * XXX between the various instances of an algorithm (so we can
+	 * XXX locate the correct crypto context).
+	 */
+	for (sw = req->sw_head; sw && sw->sw_alg != crd->crd_alg; sw = sw->sw_next)
+		;
+
+	/* No such context ? */
+	if (sw == NULL) {
+		crp->crp_etype = EINVAL;
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		goto done;
+	}
+
+	/*
+	 * for some types we need to ensure only one user as info is stored in
+	 * the tfm during an operation that can get corrupted
+	 */
+	switch (sw->sw_type & SW_TYPE_ALG_AMASK) {
+#ifdef HAVE_AHASH
+	case SW_TYPE_AHMAC:
+	case SW_TYPE_AHASH:
+#endif
+	case SW_TYPE_HMAC:
+	case SW_TYPE_HASH: {
+		unsigned long flags;
+		spin_lock_irqsave(&sw->sw_tfm_lock, flags);
+		if (sw->sw_type & SW_TYPE_INUSE) {
+			spin_unlock_irqrestore(&sw->sw_tfm_lock, flags);
+			execute_later((void (*)(void *))swcr_process_req, (void *)req);
+			return;
+		}
+		sw->sw_type |= SW_TYPE_INUSE;
+		spin_unlock_irqrestore(&sw->sw_tfm_lock, flags);
+		} break;
+	}
+
+	req->sw = sw;
+	skip = crd->crd_skip;
+
+	/*
+	 * setup the SG list skip from the start of the buffer
+	 */
+	memset(req->sg, 0, sizeof(req->sg));
+	sg_init_table(req->sg, SCATTERLIST_MAX);
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		int i, len;
+
+		sg_num = 0;
+		sg_len = 0;
+
+		if (skip < skb_headlen(skb)) {
+			len = skb_headlen(skb) - skip;
+			if (len + sg_len > crd->crd_len)
+				len = crd->crd_len - sg_len;
+			sg_set_page(&req->sg[sg_num],
+				virt_to_page(skb->data + skip), len,
+				offset_in_page(skb->data + skip));
+			sg_len += len;
+			sg_num++;
+			skip = 0;
+		} else
+			skip -= skb_headlen(skb);
+
+		for (i = 0; sg_len < crd->crd_len &&
+					i < skb_shinfo(skb)->nr_frags &&
+					sg_num < SCATTERLIST_MAX; i++) {
+			if (skip < skb_shinfo(skb)->frags[i].size) {
+				len = skb_shinfo(skb)->frags[i].size - skip;
+				if (len + sg_len > crd->crd_len)
+					len = crd->crd_len - sg_len;
+				sg_set_page(&req->sg[sg_num],
+					skb_frag_page(&skb_shinfo(skb)->frags[i]),
+					len,
+					skb_shinfo(skb)->frags[i].page_offset + skip);
+				sg_len += len;
+				sg_num++;
+				skip = 0;
+			} else
+				skip -= skb_shinfo(skb)->frags[i].size;
+		}
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		int len;
+
+		sg_len = 0;
+		for (sg_num = 0; sg_len < crd->crd_len &&
+				sg_num < uiop->uio_iovcnt &&
+				sg_num < SCATTERLIST_MAX; sg_num++) {
+			if (skip <= uiop->uio_iov[sg_num].iov_len) {
+				len = uiop->uio_iov[sg_num].iov_len - skip;
+				if (len + sg_len > crd->crd_len)
+					len = crd->crd_len - sg_len;
+				sg_set_page(&req->sg[sg_num],
+					virt_to_page(uiop->uio_iov[sg_num].iov_base+skip),
+					len,
+					offset_in_page(uiop->uio_iov[sg_num].iov_base+skip));
+				sg_len += len;
+				skip = 0;
+			} else 
+				skip -= uiop->uio_iov[sg_num].iov_len;
+		}
+	} else {
+		sg_len = (crp->crp_ilen - skip);
+		if (sg_len > crd->crd_len)
+			sg_len = crd->crd_len;
+		sg_set_page(&req->sg[0], virt_to_page(crp->crp_buf + skip),
+			sg_len, offset_in_page(crp->crp_buf + skip));
+		sg_num = 1;
+	}
+	if (sg_num > 0)
+		sg_mark_end(&req->sg[sg_num-1]);
+
+	switch (sw->sw_type & SW_TYPE_ALG_AMASK) {
+
+#ifdef HAVE_AHASH
+	case SW_TYPE_AHMAC:
+	case SW_TYPE_AHASH:
+		{
+		int ret;
+
+		/* check we have room for the result */
+		if (crp->crp_ilen - crd->crd_inject < sw->u.hmac.sw_mlen) {
+			dprintk("cryptosoft: EINVAL crp_ilen=%d, len=%d, inject=%d "
+					"digestsize=%d\n", crp->crp_ilen, crd->crd_skip + sg_len,
+					crd->crd_inject, sw->u.hmac.sw_mlen);
+			crp->crp_etype = EINVAL;
+			goto done;
+		}
+
+		req->crypto_req =
+				ahash_request_alloc(__crypto_ahash_cast(sw->sw_tfm),GFP_ATOMIC);
+		if (!req->crypto_req) {
+			crp->crp_etype = ENOMEM;
+			dprintk("%s,%d: ENOMEM ahash_request_alloc", __FILE__, __LINE__);
+			goto done;
+		}
+
+		ahash_request_set_callback(req->crypto_req,
+				CRYPTO_TFM_REQ_MAY_BACKLOG, swcr_process_callback, req);
+
+		memset(req->result, 0, sizeof(req->result));
+
+		if (sw->sw_type & SW_TYPE_AHMAC)
+			crypto_ahash_setkey(__crypto_ahash_cast(sw->sw_tfm),
+					sw->u.hmac.sw_key, sw->u.hmac.sw_klen);
+		ahash_request_set_crypt(req->crypto_req, req->sg, req->result, sg_len);
+		ret = crypto_ahash_digest(req->crypto_req);
+		switch (ret) {
+		case -EINPROGRESS:
+		case -EBUSY:
+			return;
+		default:
+		case 0:
+			dprintk("hash OP %s %d\n", ret ? "failed" : "success", ret);
+			crp->crp_etype = ret;
+			goto done;
+		}
+		} break;
+#endif /* HAVE_AHASH */
+
+#ifdef HAVE_ABLKCIPHER
+	case SW_TYPE_ABLKCIPHER: {
+		int ret;
+		unsigned char *ivp = req->iv;
+		int ivsize = 
+			crypto_ablkcipher_ivsize(__crypto_ablkcipher_cast(sw->sw_tfm));
+
+		if (sg_len < crypto_ablkcipher_blocksize(
+				__crypto_ablkcipher_cast(sw->sw_tfm))) {
+			crp->crp_etype = EINVAL;
+			dprintk("%s,%d: EINVAL len %d < %d\n", __FILE__, __LINE__,
+					sg_len, crypto_ablkcipher_blocksize(
+						__crypto_ablkcipher_cast(sw->sw_tfm)));
+			goto done;
+		}
+
+		if (ivsize > sizeof(req->iv)) {
+			crp->crp_etype = EINVAL;
+			dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+			goto done;
+		}
+
+		req->crypto_req = ablkcipher_request_alloc(
+				__crypto_ablkcipher_cast(sw->sw_tfm), GFP_ATOMIC);
+		if (!req->crypto_req) {
+			crp->crp_etype = ENOMEM;
+			dprintk("%s,%d: ENOMEM ablkcipher_request_alloc",
+					__FILE__, __LINE__);
+			goto done;
+		}
+
+		ablkcipher_request_set_callback(req->crypto_req,
+				CRYPTO_TFM_REQ_MAY_BACKLOG, swcr_process_callback, req);
+
+		if (crd->crd_flags & CRD_F_KEY_EXPLICIT) {
+			int i, error;
+
+			if (debug) {
+				dprintk("%s key:", __FUNCTION__);
+				for (i = 0; i < (crd->crd_klen + 7) / 8; i++)
+					dprintk("%s0x%x", (i % 8) ? " " : "\n    ",
+							crd->crd_key[i] & 0xff);
+				dprintk("\n");
+			}
+			/* OCF doesn't enforce keys */
+			crypto_ablkcipher_set_flags(__crypto_ablkcipher_cast(sw->sw_tfm),
+					CRYPTO_TFM_REQ_WEAK_KEY);
+			error = crypto_ablkcipher_setkey(
+						__crypto_ablkcipher_cast(sw->sw_tfm), crd->crd_key,
+						(crd->crd_klen + 7) / 8);
+			if (error) {
+				dprintk("cryptosoft: setkey failed %d (crt_flags=0x%x)\n",
+						error, sw->sw_tfm->crt_flags);
+				crp->crp_etype = -error;
+			}
+		}
+
+		if (crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
+
+			if (crd->crd_flags & CRD_F_IV_EXPLICIT)
+				ivp = crd->crd_iv;
+			else
+				get_random_bytes(ivp, ivsize);
+			/*
+			 * do we have to copy the IV back to the buffer ?
+			 */
+			if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+				crypto_copyback(crp->crp_flags, crp->crp_buf,
+						crd->crd_inject, ivsize, (caddr_t)ivp);
+			}
+			ablkcipher_request_set_crypt(req->crypto_req, req->sg, req->sg,
+					sg_len, ivp);
+			ret = crypto_ablkcipher_encrypt(req->crypto_req);
+
+		} else { /*decrypt */
+
+			if (crd->crd_flags & CRD_F_IV_EXPLICIT)
+				ivp = crd->crd_iv;
+			else
+				crypto_copydata(crp->crp_flags, crp->crp_buf,
+						crd->crd_inject, ivsize, (caddr_t)ivp);
+			ablkcipher_request_set_crypt(req->crypto_req, req->sg, req->sg,
+					sg_len, ivp);
+			ret = crypto_ablkcipher_decrypt(req->crypto_req);
+		}
+
+		switch (ret) {
+		case -EINPROGRESS:
+		case -EBUSY:
+			return;
+		default:
+		case 0:
+			dprintk("crypto OP %s %d\n", ret ? "failed" : "success", ret);
+			crp->crp_etype = ret;
+			goto done;
+		}
+		} break;
+#endif /* HAVE_ABLKCIPHER */
+
+	case SW_TYPE_BLKCIPHER: {
+		unsigned char iv[EALG_MAX_BLOCK_LEN];
+		unsigned char *ivp = iv;
+		struct blkcipher_desc desc;
+		int ivsize = crypto_blkcipher_ivsize(crypto_blkcipher_cast(sw->sw_tfm));
+
+		if (sg_len < crypto_blkcipher_blocksize(
+				crypto_blkcipher_cast(sw->sw_tfm))) {
+			crp->crp_etype = EINVAL;
+			dprintk("%s,%d: EINVAL len %d < %d\n", __FILE__, __LINE__,
+					sg_len, crypto_blkcipher_blocksize(
+						crypto_blkcipher_cast(sw->sw_tfm)));
+			goto done;
+		}
+
+		if (ivsize > sizeof(iv)) {
+			crp->crp_etype = EINVAL;
+			dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+			goto done;
+		}
+
+		if (crd->crd_flags & CRD_F_KEY_EXPLICIT) {
+			int i, error;
+
+			if (debug) {
+				dprintk("%s key:", __FUNCTION__);
+				for (i = 0; i < (crd->crd_klen + 7) / 8; i++)
+					dprintk("%s0x%x", (i % 8) ? " " : "\n    ",
+							crd->crd_key[i] & 0xff);
+				dprintk("\n");
+			}
+			/* OCF doesn't enforce keys */
+			crypto_blkcipher_set_flags(crypto_blkcipher_cast(sw->sw_tfm),
+					CRYPTO_TFM_REQ_WEAK_KEY);
+			error = crypto_blkcipher_setkey(
+						crypto_blkcipher_cast(sw->sw_tfm), crd->crd_key,
+						(crd->crd_klen + 7) / 8);
+			if (error) {
+				dprintk("cryptosoft: setkey failed %d (crt_flags=0x%x)\n",
+						error, sw->sw_tfm->crt_flags);
+				crp->crp_etype = -error;
+			}
+		}
+
+		memset(&desc, 0, sizeof(desc));
+		desc.tfm = crypto_blkcipher_cast(sw->sw_tfm);
+
+		if (crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
+
+			if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
+				ivp = crd->crd_iv;
+			} else {
+				get_random_bytes(ivp, ivsize);
+			}
+			/*
+			 * do we have to copy the IV back to the buffer ?
+			 */
+			if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+				crypto_copyback(crp->crp_flags, crp->crp_buf,
+						crd->crd_inject, ivsize, (caddr_t)ivp);
+			}
+			desc.info = ivp;
+			crypto_blkcipher_encrypt_iv(&desc, req->sg, req->sg, sg_len);
+
+		} else { /*decrypt */
+
+			if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
+				ivp = crd->crd_iv;
+			} else {
+				crypto_copydata(crp->crp_flags, crp->crp_buf,
+						crd->crd_inject, ivsize, (caddr_t)ivp);
+			}
+			desc.info = ivp;
+			crypto_blkcipher_decrypt_iv(&desc, req->sg, req->sg, sg_len);
+		}
+		} break;
+
+	case SW_TYPE_HMAC:
+	case SW_TYPE_HASH:
+		{
+		char result[HASH_MAX_LEN];
+		struct hash_desc desc;
+
+		/* check we have room for the result */
+		if (crp->crp_ilen - crd->crd_inject < sw->u.hmac.sw_mlen) {
+			dprintk("cryptosoft: EINVAL crp_ilen=%d, len=%d, inject=%d "
+					"digestsize=%d\n", crp->crp_ilen, crd->crd_skip + sg_len,
+					crd->crd_inject, sw->u.hmac.sw_mlen);
+			crp->crp_etype = EINVAL;
+			goto done;
+		}
+
+		memset(&desc, 0, sizeof(desc));
+		desc.tfm = crypto_hash_cast(sw->sw_tfm);
+
+		memset(result, 0, sizeof(result));
+
+		if (sw->sw_type & SW_TYPE_HMAC) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+			crypto_hmac(sw->sw_tfm, sw->u.hmac.sw_key, &sw->u.hmac.sw_klen,
+					req->sg, sg_num, result);
+#else
+			crypto_hash_setkey(desc.tfm, sw->u.hmac.sw_key,
+					sw->u.hmac.sw_klen);
+			crypto_hash_digest(&desc, req->sg, sg_len, result);
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */
+			
+		} else { /* SW_TYPE_HASH */
+			crypto_hash_digest(&desc, req->sg, sg_len, result);
+		}
+
+		crypto_copyback(crp->crp_flags, crp->crp_buf,
+				crd->crd_inject, sw->u.hmac.sw_mlen, result);
+		}
+		break;
+
+	case SW_TYPE_COMP: {
+		void *ibuf = NULL;
+		void *obuf = sw->u.sw_comp_buf;
+		int ilen = sg_len, olen = CRYPTO_MAX_DATA_LEN;
+		int ret = 0;
+
+		/*
+		 * we need to use an additional copy if there is more than one
+		 * input chunk since the kernel comp routines do not handle
+		 * SG yet.  Otherwise we just use the input buffer as is.
+		 * Rather than allocate another buffer we just split the tmp
+		 * buffer we already have.
+		 * Perhaps we should just use zlib directly ?
+		 */
+		if (sg_num > 1) {
+			int blk;
+
+			ibuf = obuf;
+			for (blk = 0; blk < sg_num; blk++) {
+				memcpy(obuf, sg_virt(&req->sg[blk]),
+						req->sg[blk].length);
+				obuf += req->sg[blk].length;
+			}
+			olen -= sg_len;
+		} else
+			ibuf = sg_virt(&req->sg[0]);
+
+		if (crd->crd_flags & CRD_F_ENCRYPT) { /* compress */
+			ret = crypto_comp_compress(crypto_comp_cast(sw->sw_tfm),
+					ibuf, ilen, obuf, &olen);
+			if (!ret && olen > crd->crd_len) {
+				dprintk("cryptosoft: ERANGE compress %d into %d\n",
+						crd->crd_len, olen);
+				if (swcr_fail_if_compression_grows)
+					ret = ERANGE;
+			}
+		} else { /* decompress */
+			ret = crypto_comp_decompress(crypto_comp_cast(sw->sw_tfm),
+					ibuf, ilen, obuf, &olen);
+			if (!ret && (olen + crd->crd_inject) > crp->crp_olen) {
+				dprintk("cryptosoft: ETOOSMALL decompress %d into %d, "
+						"space for %d,at offset %d\n",
+						crd->crd_len, olen, crp->crp_olen, crd->crd_inject);
+				ret = ETOOSMALL;
+			}
+		}
+		if (ret)
+			dprintk("%s,%d: ret = %d\n", __FILE__, __LINE__, ret);
+
+		/*
+		 * on success copy result back,
+		 * linux crpyto API returns -errno,  we need to fix that
+		 */
+		crp->crp_etype = ret < 0 ? -ret : ret;
+		if (ret == 0) {
+			/* copy back the result and return it's size */
+			crypto_copyback(crp->crp_flags, crp->crp_buf,
+					crd->crd_inject, olen, obuf);
+			crp->crp_olen = olen;
+		}
+		} break;
+
+	default:
+		/* Unknown/unsupported algorithm */
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		crp->crp_etype = EINVAL;
+		goto done;
+	}
+
+done:
+	swcr_process_req_complete(req);
+}
+
+
+/*
+ * Process a crypto request.
+ */
+static int
+swcr_process(device_t dev, struct cryptop *crp, int hint)
+{
+	struct swcr_req *req = NULL;
+	u_int32_t lid;
+
+	dprintk("%s()\n", __FUNCTION__);
+	/* Sanity check */
+	if (crp == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	crp->crp_etype = 0;
+
+	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		crp->crp_etype = EINVAL;
+		goto done;
+	}
+
+	lid = crp->crp_sid & 0xffffffff;
+	if (lid >= swcr_sesnum || lid == 0 || swcr_sessions == NULL ||
+			swcr_sessions[lid] == NULL) {
+		crp->crp_etype = ENOENT;
+		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
+		goto done;
+	}
+
+	/*
+	 * do some error checking outside of the loop for SKB and IOV processing
+	 * this leaves us with valid skb or uiop pointers for later
+	 */
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		struct sk_buff *skb = (struct sk_buff *) crp->crp_buf;
+		if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
+			printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", __FILE__, __LINE__,
+					skb_shinfo(skb)->nr_frags);
+			goto done;
+		}
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		struct uio *uiop = (struct uio *) crp->crp_buf;
+		if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
+			printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", __FILE__, __LINE__,
+					uiop->uio_iovcnt);
+			goto done;
+		}
+	}
+
+	/*
+	 * setup a new request ready for queuing
+	 */
+	req = kmem_cache_alloc(swcr_req_cache, SLAB_ATOMIC);
+	if (req == NULL) {
+		dprintk("%s,%d: ENOMEM\n", __FILE__, __LINE__);
+		crp->crp_etype = ENOMEM;
+		goto done;
+	}
+	memset(req, 0, sizeof(*req));
+
+	req->sw_head = swcr_sessions[lid];
+	req->crp = crp;
+	req->crd = crp->crp_desc;
+
+	swcr_process_req(req);
+	return 0;
+
+done:
+	crypto_done(crp);
+	if (req)
+		kmem_cache_free(swcr_req_cache, req);
+	return 0;
+}
+
+
+static int
+cryptosoft_init(void)
+{
+	int i, sw_type, mode;
+	char *algo;
+
+	dprintk("%s(%p)\n", __FUNCTION__, cryptosoft_init);
+
+	swcr_req_cache = kmem_cache_create("cryptosoft_req",
+				sizeof(struct swcr_req), 0, SLAB_HWCACHE_ALIGN, NULL
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+				, NULL
+#endif
+				);
+	if (!swcr_req_cache) {
+		printk("cryptosoft: failed to create request cache\n");
+		return -ENOENT;
+	}
+
+	softc_device_init(&swcr_softc, "cryptosoft", 0, swcr_methods);
+
+	swcr_id = crypto_get_driverid(softc_get_device(&swcr_softc),
+			CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_SYNC);
+	if (swcr_id < 0) {
+		printk("cryptosoft: Software crypto device cannot initialize!");
+		return -ENODEV;
+	}
+
+#define	REGISTER(alg) \
+		crypto_register(swcr_id, alg, 0,0)
+
+	for (i = 0; i < sizeof(crypto_details)/sizeof(crypto_details[0]); i++) {
+		int found;
+		
+		algo = crypto_details[i].alg_name;
+		if (!algo || !*algo) {
+			dprintk("%s:Algorithm %d not supported\n", __FUNCTION__, i);
+			continue;
+		}
+
+		mode = crypto_details[i].mode;
+		sw_type = crypto_details[i].sw_type;
+
+		found = 0;
+		switch (sw_type & SW_TYPE_ALG_MASK) {
+		case SW_TYPE_CIPHER:
+			found = crypto_has_cipher(algo, 0, CRYPTO_ALG_ASYNC);
+			break;
+		case SW_TYPE_HMAC:
+			found = crypto_has_hash(algo, 0, swcr_no_ahash?CRYPTO_ALG_ASYNC:0);
+			break;
+		case SW_TYPE_HASH:
+			found = crypto_has_hash(algo, 0, swcr_no_ahash?CRYPTO_ALG_ASYNC:0);
+			break;
+		case SW_TYPE_COMP:
+			found = crypto_has_comp(algo, 0, CRYPTO_ALG_ASYNC);
+			break;
+		case SW_TYPE_BLKCIPHER:
+			found = crypto_has_blkcipher(algo, 0, CRYPTO_ALG_ASYNC);
+			if (!found && !swcr_no_ablk)
+				found = crypto_has_ablkcipher(algo, 0, 0);
+			break;
+		}
+		if (found) {
+			REGISTER(i);
+		} else {
+			dprintk("%s:Algorithm Type %d not supported (algorithm %d:'%s')\n",
+					__FUNCTION__, sw_type, i, algo);
+		}
+	}
+	return 0;
+}
+
+static void
+cryptosoft_exit(void)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	crypto_unregister_all(swcr_id);
+	swcr_id = -1;
+	kmem_cache_destroy(swcr_req_cache);
+}
+
+late_initcall(cryptosoft_init);
+module_exit(cryptosoft_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("Cryptosoft (OCF module for kernel crypto)");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ep80579/Makefile b/trunk/target/linux/generic/files/crypto/ocf/ep80579/Makefile
new file mode 100644
index 00000000..9aab2957
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ep80579/Makefile
@@ -0,0 +1,119 @@
+#########################################################################
+#
+#  Targets supported
+#  all     - builds everything and installs
+#  install - identical to all
+#  depend  - build dependencies
+#  clean   - clears derived objects except the .depend files
+#  distclean- clears all derived objects and the .depend file
+#  
+# @par
+# This file is provided under a dual BSD/GPLv2 license.  When using or 
+#   redistributing this file, you may do so under either license.
+# 
+#   GPL LICENSE SUMMARY
+# 
+#   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+# 
+#   This program is free software; you can redistribute it and/or modify 
+#   it under the terms of version 2 of the GNU General Public License as
+#   published by the Free Software Foundation.
+# 
+#   This program is distributed in the hope that 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#   The full GNU General Public License is included in this distribution 
+#   in the file called LICENSE.GPL.
+# 
+#   Contact Information:
+#   Intel Corporation
+# 
+#   BSD LICENSE 
+# 
+#   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+#   All rights reserved.
+# 
+#   Redistribution and use in source and binary forms, with or without 
+#   modification, are permitted provided that the following conditions 
+#   are met:
+# 
+#     * Redistributions of source code must retain the above copyright 
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright 
+#       notice, this list of conditions and the following disclaimer in 
+#       the documentation and/or other materials provided with the 
+#       distribution.
+#     * Neither the name of Intel Corporation nor the names of its 
+#       contributors may be used to endorse or promote products derived 
+#       from this software without specific prior written permission.
+# 
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# 
+#  version: Security.L.1.0.2-229
+############################################################################
+
+
+####################Common variables and definitions########################
+
+ifndef ICP_ROOT
+$(warning ICP_ROOT is undefined. Please set the path to EP80579 release package directory \
+        "-> setenv ICP_ROOT <path>")
+all fastdep:
+	:
+else
+
+ifndef KERNEL_SOURCE_ROOT
+$(error KERNEL_SOURCE_ROOT is undefined. Please set the path to the kernel source directory \
+        "-> setenv KERNEL_SOURCE_ROOT <path>")
+endif
+
+# Ensure The ENV_DIR environmental var is defined.
+ifndef ICP_ENV_DIR
+$(error ICP_ENV_DIR is undefined. Please set the path to EP80579 driver environment.mk file \
+        "-> setenv ICP_ENV_DIR <path>")
+endif
+
+#Add your project environment Makefile
+include ${ICP_ENV_DIR}/environment.mk
+
+#include the makefile with all the default and common Make variable definitions
+include ${ICP_BUILDSYSTEM_PATH}/build_files/common.mk
+
+#Add the name for the executable, Library or Module output definitions
+OUTPUT_NAME= icp_ocf
+
+# List of Source Files to be compiled 
+SOURCES= icp_common.c icp_sym.c icp_asym.c icp_ocf_linux.c
+
+#common includes between all supported OSes
+INCLUDES= -I ${ICP_API_DIR} -I${ICP_LAC_API} \
+-I${ICP_OCF_SRC_DIR}
+
+# The location of the os level makefile needs to be changed.
+include ${ICP_ENV_DIR}/${ICP_OS}_${ICP_OS_LEVEL}.mk
+
+# On the line directly below list the outputs you wish to build for,
+# e.g "lib_static lib_shared exe module" as shown below
+install: module
+
+###################Include rules makefiles########################
+include ${ICP_BUILDSYSTEM_PATH}/build_files/rules.mk
+###################End of Rules inclusion#########################
+
+endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ep80579/environment.mk b/trunk/target/linux/generic/files/crypto/ocf/ep80579/environment.mk
new file mode 100644
index 00000000..1a663e58
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ep80579/environment.mk
@@ -0,0 +1,78 @@
+ ###########################################################################
+ #
+# This file is provided under a dual BSD/GPLv2 license.  When using or 
+#   redistributing this file, you may do so under either license.
+# 
+#   GPL LICENSE SUMMARY
+# 
+#   Copyright(c) 2007,2008 Intel Corporation. All rights reserved.
+# 
+#   This program is free software; you can redistribute it and/or modify 
+#   it under the terms of version 2 of the GNU General Public License as
+#   published by the Free Software Foundation.
+# 
+#   This program is distributed in the hope that 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#   The full GNU General Public License is included in this distribution 
+#   in the file called LICENSE.GPL.
+# 
+#   Contact Information:
+#   Intel Corporation
+# 
+#   BSD LICENSE 
+# 
+#   Copyright(c) 2007,2008 Intel Corporation. All rights reserved.
+#   All rights reserved.
+# 
+#   Redistribution and use in source and binary forms, with or without 
+#   modification, are permitted provided that the following conditions 
+#   are met:
+# 
+#     * Redistributions of source code must retain the above copyright 
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright 
+#       notice, this list of conditions and the following disclaimer in 
+#       the documentation and/or other materials provided with the 
+#       distribution.
+#     * Neither the name of Intel Corporation nor the names of its 
+#       contributors may be used to endorse or promote products derived 
+#       from this software without specific prior written permission.
+# 
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# 
+#  version: Security.L.1.0.130
+ #
+ ###########################################################################
+
+
+ICP_LAC_API=$(ICP_ROOT)/Acceleration/include/lac
+ICP_BTR_API=$(ICP_ROOT)/Acceleration/include/btr
+ICP_API_DIR=$(ICP_ROOT)/Acceleration/include
+ICP_OCF_SHIM_DIR?=$(KERNEL_SOURCE_ROOT)/crypto/ocf/
+ifeq ($(wildcard $(ICP_OCF_SHIM_DIR)),)
+ICP_OCF_SHIM_DIR?=$(ROOTDIR)/modules/ocf/
+endif
+
+ICP_OS_LEVEL?=kernel_space
+
+ICP_OS?=linux_2.6
+
+ICP_CORE?=ia
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_asym.c b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_asym.c
new file mode 100644
index 00000000..d2641c54
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_asym.c
@@ -0,0 +1,1334 @@
+/***************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or 
+ *   redistributing this file, you may do so under either license.
+ * 
+ *   GPL LICENSE SUMMARY
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ * 
+ *   This program is free software; you can redistribute it and/or modify 
+ *   it under the terms of version 2 of the GNU General Public License as
+ *   published by the Free Software Foundation.
+ * 
+ *   This program is distributed in the hope that 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *   The full GNU General Public License is included in this distribution 
+ *   in the file called LICENSE.GPL.
+ * 
+ *   Contact Information:
+ *   Intel Corporation
+ * 
+ *   BSD LICENSE 
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ * 
+ *   Redistribution and use in source and binary forms, with or without 
+ *   modification, are permitted provided that the following conditions 
+ *   are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright 
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright 
+ *       notice, this list of conditions and the following disclaimer in 
+ *       the documentation and/or other materials provided with the 
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its 
+ *       contributors may be used to endorse or promote products derived 
+ *       from this software without specific prior written permission.
+ * 
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * 
+ *  version: Security.L.1.0.2-229
+ *
+ ***************************************************************************/
+
+#include "icp_ocf.h"
+
+/*The following define values (containing the word 'INDEX') are used to find
+the index of each input buffer of the crypto_kop struct (see OCF cryptodev.h).
+These values were found through analysis of the OCF OpenSSL patch. If the
+calling program uses different input buffer positions, these defines will have
+to be changed.*/
+
+/*DIFFIE HELLMAN buffer index values*/
+#define ICP_DH_KRP_PARAM_PRIME_INDEX                            (0)
+#define ICP_DH_KRP_PARAM_BASE_INDEX                             (1)
+#define ICP_DH_KRP_PARAM_PRIVATE_VALUE_INDEX                    (2)
+#define ICP_DH_KRP_PARAM_RESULT_INDEX                           (3)
+
+/*MOD EXP buffer index values*/
+#define ICP_MOD_EXP_KRP_PARAM_BASE_INDEX                        (0)
+#define ICP_MOD_EXP_KRP_PARAM_EXPONENT_INDEX                    (1)
+#define ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX                     (2)
+#define ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX                      (3)
+
+/*MOD EXP CRT buffer index values*/
+#define ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_P_INDEX                 (0)
+#define ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_Q_INDEX                 (1)
+#define ICP_MOD_EXP_CRT_KRP_PARAM_I_INDEX                       (2)
+#define ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DP_INDEX             (3)
+#define ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DQ_INDEX             (4)
+#define ICP_MOD_EXP_CRT_KRP_PARAM_COEFF_QINV_INDEX              (5)
+#define ICP_MOD_EXP_CRT_KRP_PARAM_RESULT_INDEX                  (6)
+
+/*DSA sign buffer index values*/
+#define ICP_DSA_SIGN_KRP_PARAM_DGST_INDEX                       (0)
+#define ICP_DSA_SIGN_KRP_PARAM_PRIME_P_INDEX                    (1)
+#define ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX                    (2)
+#define ICP_DSA_SIGN_KRP_PARAM_G_INDEX                          (3)
+#define ICP_DSA_SIGN_KRP_PARAM_X_INDEX                          (4)
+#define ICP_DSA_SIGN_KRP_PARAM_R_RESULT_INDEX                   (5)
+#define ICP_DSA_SIGN_KRP_PARAM_S_RESULT_INDEX                   (6)
+
+/*DSA verify buffer index values*/
+#define ICP_DSA_VERIFY_KRP_PARAM_DGST_INDEX                     (0)
+#define ICP_DSA_VERIFY_KRP_PARAM_PRIME_P_INDEX                  (1)
+#define ICP_DSA_VERIFY_KRP_PARAM_PRIME_Q_INDEX                  (2)
+#define ICP_DSA_VERIFY_KRP_PARAM_G_INDEX                        (3)
+#define ICP_DSA_VERIFY_KRP_PARAM_PUBKEY_INDEX                   (4)
+#define ICP_DSA_VERIFY_KRP_PARAM_SIG_R_INDEX                    (5)
+#define ICP_DSA_VERIFY_KRP_PARAM_SIG_S_INDEX                    (6)
+
+/*DSA sign prime Q vs random number K size check values*/
+#define DONT_RUN_LESS_THAN_CHECK                                (0)
+#define FAIL_A_IS_GREATER_THAN_B                                (1)
+#define FAIL_A_IS_EQUAL_TO_B                                    (1)
+#define SUCCESS_A_IS_LESS_THAN_B                                (0)
+#define DSA_SIGN_RAND_GEN_VAL_CHECK_MAX_ITERATIONS              (500)
+
+/* We need to set a cryptokp success value just in case it is set or allocated
+   and not set to zero outside of this module */
+#define CRYPTO_OP_SUCCESS                                       (0)
+
+/*Function to compute Diffie Hellman (DH) phase 1 or phase 2 key values*/
+static int icp_ocfDrvDHComputeKey(struct cryptkop *krp);
+
+/*Function to compute a Modular Exponentiation (Mod Exp)*/
+static int icp_ocfDrvModExp(struct cryptkop *krp);
+
+/*Function to compute a Mod Exp using the Chinease Remainder Theorem*/
+static int icp_ocfDrvModExpCRT(struct cryptkop *krp);
+
+/*Helper function to compute whether the first big number argument is less than
+ the second big number argument */
+static int
+icp_ocfDrvCheckALessThanB(CpaFlatBuffer * pK, CpaFlatBuffer * pQ, int *doCheck);
+
+/*Function to sign an input with DSA R and S keys*/
+static int icp_ocfDrvDsaSign(struct cryptkop *krp);
+
+/*Function to Verify a DSA buffer signature*/
+static int icp_ocfDrvDsaVerify(struct cryptkop *krp);
+
+/*Callback function for DH operation*/
+static void
+icp_ocfDrvDhP1CallBack(void *callbackTag,
+		       CpaStatus status,
+		       void *pOpData, CpaFlatBuffer * pLocalOctetStringPV);
+
+/*Callback function for ME operation*/
+static void
+icp_ocfDrvModExpCallBack(void *callbackTag,
+			 CpaStatus status,
+			 void *pOpData, CpaFlatBuffer * pResult);
+
+/*Callback function for ME CRT operation*/
+static void
+icp_ocfDrvModExpCRTCallBack(void *callbackTag,
+			    CpaStatus status,
+			    void *pOpData, CpaFlatBuffer * pOutputData);
+
+/*Callback function for DSA sign operation*/
+static void
+icp_ocfDrvDsaRSSignCallBack(void *callbackTag,
+			    CpaStatus status,
+			    void *pOpData,
+			    CpaBoolean protocolStatus,
+			    CpaFlatBuffer * pR, CpaFlatBuffer * pS);
+
+/*Callback function for DSA Verify operation*/
+static void
+icp_ocfDrvDsaVerifyCallBack(void *callbackTag,
+			    CpaStatus status,
+			    void *pOpData, CpaBoolean verifyStatus);
+
+/* Name        : icp_ocfDrvPkeProcess
+ *
+ * Description : This function will choose which PKE process to follow
+ * based on the input arguments
+ */
+int icp_ocfDrvPkeProcess(icp_device_t dev, struct cryptkop *krp, int hint)
+{
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+
+	if (NULL == krp) {
+		DPRINTK("%s(): Invalid input parameters, cryptkop = %p\n",
+			__FUNCTION__, krp);
+		return EINVAL;
+	}
+
+	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
+		krp->krp_status = ECANCELED;
+		return ECANCELED;
+	}
+
+	switch (krp->krp_op) {
+	case CRK_DH_COMPUTE_KEY:
+		DPRINTK("%s() doing DH_COMPUTE_KEY\n", __FUNCTION__);
+		lacStatus = icp_ocfDrvDHComputeKey(krp);
+		if (CPA_STATUS_SUCCESS != lacStatus) {
+			EPRINTK("%s(): icp_ocfDrvDHComputeKey failed "
+				"(%d).\n", __FUNCTION__, lacStatus);
+			krp->krp_status = ECANCELED;
+			return ECANCELED;
+		}
+
+		break;
+
+	case CRK_MOD_EXP:
+		DPRINTK("%s() doing MOD_EXP \n", __FUNCTION__);
+		lacStatus = icp_ocfDrvModExp(krp);
+		if (CPA_STATUS_SUCCESS != lacStatus) {
+			EPRINTK("%s(): icp_ocfDrvModExp failed (%d).\n",
+				__FUNCTION__, lacStatus);
+			krp->krp_status = ECANCELED;
+			return ECANCELED;
+		}
+
+		break;
+
+	case CRK_MOD_EXP_CRT:
+		DPRINTK("%s() doing MOD_EXP_CRT \n", __FUNCTION__);
+		lacStatus = icp_ocfDrvModExpCRT(krp);
+		if (CPA_STATUS_SUCCESS != lacStatus) {
+			EPRINTK("%s(): icp_ocfDrvModExpCRT "
+				"failed (%d).\n", __FUNCTION__, lacStatus);
+			krp->krp_status = ECANCELED;
+			return ECANCELED;
+		}
+
+		break;
+
+	case CRK_DSA_SIGN:
+		DPRINTK("%s() doing DSA_SIGN \n", __FUNCTION__);
+		lacStatus = icp_ocfDrvDsaSign(krp);
+		if (CPA_STATUS_SUCCESS != lacStatus) {
+			EPRINTK("%s(): icp_ocfDrvDsaSign "
+				"failed (%d).\n", __FUNCTION__, lacStatus);
+			krp->krp_status = ECANCELED;
+			return ECANCELED;
+		}
+
+		break;
+
+	case CRK_DSA_VERIFY:
+		DPRINTK("%s() doing DSA_VERIFY \n", __FUNCTION__);
+		lacStatus = icp_ocfDrvDsaVerify(krp);
+		if (CPA_STATUS_SUCCESS != lacStatus) {
+			EPRINTK("%s(): icp_ocfDrvDsaVerify "
+				"failed (%d).\n", __FUNCTION__, lacStatus);
+			krp->krp_status = ECANCELED;
+			return ECANCELED;
+		}
+
+		break;
+
+	default:
+		EPRINTK("%s(): Asymettric function not "
+			"supported (%d).\n", __FUNCTION__, krp->krp_op);
+		krp->krp_status = EOPNOTSUPP;
+		return EOPNOTSUPP;
+	}
+
+	return ICP_OCF_DRV_STATUS_SUCCESS;
+}
+
+/* Name        : icp_ocfDrvSwapBytes
+ *
+ * Description : This function is used to swap the byte order of a buffer.
+ * It has been seen that in general we are passed little endian byte order
+ * buffers, but LAC only accepts big endian byte order buffers.
+ */
+static void inline icp_ocfDrvSwapBytes(u_int8_t * num, u_int32_t buff_len_bytes)
+{
+
+	int i;
+	u_int8_t *end_ptr;
+	u_int8_t hold_val;
+
+	end_ptr = num + (buff_len_bytes - 1);
+	buff_len_bytes = buff_len_bytes >> 1;
+	for (i = 0; i < buff_len_bytes; i++) {
+		hold_val = *num;
+		*num = *end_ptr;
+		num++;
+		*end_ptr = hold_val;
+		end_ptr--;
+	}
+}
+
+/* Name        : icp_ocfDrvDHComputeKey
+ *
+ * Description : This function will map Diffie Hellman calls from OCF
+ * to the LAC API. OCF uses this function for Diffie Hellman Phase1 and
+ * Phase2. LAC has a separate Diffie Hellman Phase2 call, however both phases
+ * break down to a modular exponentiation.
+ */
+static int icp_ocfDrvDHComputeKey(struct cryptkop *krp)
+{
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	void *callbackTag = NULL;
+	CpaCyDhPhase1KeyGenOpData *pPhase1OpData = NULL;
+	CpaFlatBuffer *pLocalOctetStringPV = NULL;
+	uint32_t dh_prime_len_bytes = 0, dh_prime_len_bits = 0;
+
+	/* Input checks - check prime is a multiple of 8 bits to allow for
+	   allocation later */
+	dh_prime_len_bits =
+	    (krp->krp_param[ICP_DH_KRP_PARAM_PRIME_INDEX].crp_nbits);
+
+	/* LAC can reject prime lengths based on prime key sizes, we just
+	   need to make sure we can allocate space for the base and
+	   exponent buffers correctly */
+	if ((dh_prime_len_bits % NUM_BITS_IN_BYTE) != 0) {
+		APRINTK("%s(): Warning Prime number buffer size is not a "
+			"multiple of 8 bits\n", __FUNCTION__);
+	}
+
+	/* Result storage space should be the same size as the prime as this
+	   value can take up the same amount of storage space */
+	if (dh_prime_len_bits !=
+	    krp->krp_param[ICP_DH_KRP_PARAM_RESULT_INDEX].crp_nbits) {
+		DPRINTK("%s(): Return Buffer must be the same size "
+			"as the Prime buffer\n", __FUNCTION__);
+		krp->krp_status = EINVAL;
+		return EINVAL;
+	}
+	/* Switch to size in bytes */
+	BITS_TO_BYTES(dh_prime_len_bytes, dh_prime_len_bits);
+
+	callbackTag = krp;
+
+/*All allocations are set to ICP_M_NOWAIT due to the possibility of getting
+called in interrupt context*/
+	pPhase1OpData = icp_kmem_cache_zalloc(drvDH_zone, ICP_M_NOWAIT);
+	if (NULL == pPhase1OpData) {
+		APRINTK("%s():Failed to get memory for key gen data\n",
+			__FUNCTION__);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	pLocalOctetStringPV =
+	    icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
+	if (NULL == pLocalOctetStringPV) {
+		APRINTK("%s():Failed to get memory for pLocalOctetStringPV\n",
+			__FUNCTION__);
+		ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	/* Link parameters */
+	pPhase1OpData->primeP.pData =
+	    krp->krp_param[ICP_DH_KRP_PARAM_PRIME_INDEX].crp_p;
+
+	pPhase1OpData->primeP.dataLenInBytes = dh_prime_len_bytes;
+
+	icp_ocfDrvSwapBytes(pPhase1OpData->primeP.pData, dh_prime_len_bytes);
+
+	pPhase1OpData->baseG.pData =
+	    krp->krp_param[ICP_DH_KRP_PARAM_BASE_INDEX].crp_p;
+
+	BITS_TO_BYTES(pPhase1OpData->baseG.dataLenInBytes,
+		      krp->krp_param[ICP_DH_KRP_PARAM_BASE_INDEX].crp_nbits);
+
+	icp_ocfDrvSwapBytes(pPhase1OpData->baseG.pData,
+			    pPhase1OpData->baseG.dataLenInBytes);
+
+	pPhase1OpData->privateValueX.pData =
+	    krp->krp_param[ICP_DH_KRP_PARAM_PRIVATE_VALUE_INDEX].crp_p;
+
+	BITS_TO_BYTES(pPhase1OpData->privateValueX.dataLenInBytes,
+		      krp->krp_param[ICP_DH_KRP_PARAM_PRIVATE_VALUE_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(pPhase1OpData->privateValueX.pData,
+			    pPhase1OpData->privateValueX.dataLenInBytes);
+
+	/* Output parameters */
+	pLocalOctetStringPV->pData =
+	    krp->krp_param[ICP_DH_KRP_PARAM_RESULT_INDEX].crp_p;
+
+	BITS_TO_BYTES(pLocalOctetStringPV->dataLenInBytes,
+		      krp->krp_param[ICP_DH_KRP_PARAM_RESULT_INDEX].crp_nbits);
+
+	lacStatus = cpaCyDhKeyGenPhase1(CPA_INSTANCE_HANDLE_SINGLE,
+					icp_ocfDrvDhP1CallBack,
+					callbackTag, pPhase1OpData,
+					pLocalOctetStringPV);
+
+	if (CPA_STATUS_SUCCESS != lacStatus) {
+		EPRINTK("%s(): DH Phase 1 Key Gen failed (%d).\n",
+			__FUNCTION__, lacStatus);
+		icp_ocfDrvFreeFlatBuffer(pLocalOctetStringPV);
+		ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
+	}
+
+	return lacStatus;
+}
+
+/* Name        : icp_ocfDrvModExp
+ *
+ * Description : This function will map ordinary Modular Exponentiation calls
+ * from OCF to the LAC API.
+ *
+ */
+static int icp_ocfDrvModExp(struct cryptkop *krp)
+{
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	void *callbackTag = NULL;
+	CpaCyLnModExpOpData *pModExpOpData = NULL;
+	CpaFlatBuffer *pResult = NULL;
+
+	if ((krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].crp_nbits %
+	     NUM_BITS_IN_BYTE) != 0) {
+		DPRINTK("%s(): Warning - modulus buffer size (%d) is not a "
+			"multiple of 8 bits\n", __FUNCTION__,
+			krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].
+			crp_nbits);
+	}
+
+	/* Result storage space should be the same size as the prime as this
+	   value can take up the same amount of storage space */
+	if (krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].crp_nbits >
+	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX].crp_nbits) {
+		APRINTK("%s(): Return Buffer size must be the same or"
+			" greater than the Modulus buffer\n", __FUNCTION__);
+		krp->krp_status = EINVAL;
+		return EINVAL;
+	}
+
+	callbackTag = krp;
+
+	pModExpOpData = icp_kmem_cache_zalloc(drvLnModExp_zone, ICP_M_NOWAIT);
+	if (NULL == pModExpOpData) {
+		APRINTK("%s():Failed to get memory for key gen data\n",
+			__FUNCTION__);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	pResult = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
+	if (NULL == pResult) {
+		APRINTK("%s():Failed to get memory for ModExp result\n",
+			__FUNCTION__);
+		ICP_CACHE_FREE(drvLnModExp_zone, pModExpOpData);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	/* Link parameters */
+	pModExpOpData->modulus.pData =
+	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].crp_p;
+	BITS_TO_BYTES(pModExpOpData->modulus.dataLenInBytes,
+		      krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(pModExpOpData->modulus.pData,
+			    pModExpOpData->modulus.dataLenInBytes);
+
+	DPRINTK("%s : base (%d)\n", __FUNCTION__, krp->
+		krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].crp_nbits);
+	pModExpOpData->base.pData =
+	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].crp_p;
+	BITS_TO_BYTES(pModExpOpData->base.dataLenInBytes,
+		      krp->krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].
+		      crp_nbits);
+	icp_ocfDrvSwapBytes(pModExpOpData->base.pData,
+			    pModExpOpData->base.dataLenInBytes);
+
+	pModExpOpData->exponent.pData =
+	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_EXPONENT_INDEX].crp_p;
+	BITS_TO_BYTES(pModExpOpData->exponent.dataLenInBytes,
+		      krp->krp_param[ICP_MOD_EXP_KRP_PARAM_EXPONENT_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(pModExpOpData->exponent.pData,
+			    pModExpOpData->exponent.dataLenInBytes);
+	/* Output parameters */
+	pResult->pData =
+	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX].crp_p,
+	    BITS_TO_BYTES(pResult->dataLenInBytes,
+			  krp->krp_param[ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX].
+			  crp_nbits);
+
+	lacStatus = cpaCyLnModExp(CPA_INSTANCE_HANDLE_SINGLE,
+				  icp_ocfDrvModExpCallBack,
+				  callbackTag, pModExpOpData, pResult);
+
+	if (CPA_STATUS_SUCCESS != lacStatus) {
+		EPRINTK("%s(): Mod Exp Operation failed (%d).\n",
+			__FUNCTION__, lacStatus);
+		krp->krp_status = ECANCELED;
+		icp_ocfDrvFreeFlatBuffer(pResult);
+		ICP_CACHE_FREE(drvLnModExp_zone, pModExpOpData);
+	}
+
+	return lacStatus;
+}
+
+/* Name        : icp_ocfDrvModExpCRT
+ *
+ * Description : This function will map ordinary Modular Exponentiation Chinese
+ * Remainder Theorem implementaion calls from OCF to the LAC API.
+ *
+ * Note : Mod Exp CRT for this driver is accelerated through LAC RSA type 2
+ * decrypt operation. Therefore P and Q input values must always be prime
+ * numbers. Although basic primality checks are done in LAC, it is up to the
+ * user to do any correct prime number checking before passing the inputs.
+ */
+static int icp_ocfDrvModExpCRT(struct cryptkop *krp)
+{
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	CpaCyRsaDecryptOpData *rsaDecryptOpData = NULL;
+	void *callbackTag = NULL;
+	CpaFlatBuffer *pOutputData = NULL;
+
+	/*Parameter input checks are all done by LAC, no need to repeat
+	   them here. */
+	callbackTag = krp;
+
+	rsaDecryptOpData =
+	    icp_kmem_cache_zalloc(drvRSADecrypt_zone, ICP_M_NOWAIT);
+	if (NULL == rsaDecryptOpData) {
+		APRINTK("%s():Failed to get memory"
+			" for MOD EXP CRT Op data struct\n", __FUNCTION__);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	rsaDecryptOpData->pRecipientPrivateKey
+	    = icp_kmem_cache_zalloc(drvRSAPrivateKey_zone, ICP_M_NOWAIT);
+	if (NULL == rsaDecryptOpData->pRecipientPrivateKey) {
+		APRINTK("%s():Failed to get memory for MOD EXP CRT"
+			" private key values struct\n", __FUNCTION__);
+		ICP_CACHE_FREE(drvRSADecrypt_zone, rsaDecryptOpData);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	rsaDecryptOpData->pRecipientPrivateKey->
+	    version = CPA_CY_RSA_VERSION_TWO_PRIME;
+	rsaDecryptOpData->pRecipientPrivateKey->
+	    privateKeyRepType = CPA_CY_RSA_PRIVATE_KEY_REP_TYPE_2;
+
+	pOutputData = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
+	if (NULL == pOutputData) {
+		APRINTK("%s():Failed to get memory"
+			" for MOD EXP CRT output data\n", __FUNCTION__);
+		ICP_CACHE_FREE(drvRSAPrivateKey_zone,
+			       rsaDecryptOpData->pRecipientPrivateKey);
+		ICP_CACHE_FREE(drvRSADecrypt_zone, rsaDecryptOpData);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	rsaDecryptOpData->pRecipientPrivateKey->
+	    version = CPA_CY_RSA_VERSION_TWO_PRIME;
+	rsaDecryptOpData->pRecipientPrivateKey->
+	    privateKeyRepType = CPA_CY_RSA_PRIVATE_KEY_REP_TYPE_2;
+
+	/* Link parameters */
+	rsaDecryptOpData->inputData.pData =
+	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_I_INDEX].crp_p;
+	BITS_TO_BYTES(rsaDecryptOpData->inputData.dataLenInBytes,
+		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_I_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(rsaDecryptOpData->inputData.pData,
+			    rsaDecryptOpData->inputData.dataLenInBytes);
+
+	rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.prime1P.pData =
+	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_P_INDEX].crp_p;
+	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.
+		      prime1P.dataLenInBytes,
+		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_P_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.prime1P.pData,
+			    rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.prime1P.dataLenInBytes);
+
+	rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.prime2Q.pData =
+	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_Q_INDEX].crp_p;
+	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.
+		      prime2Q.dataLenInBytes,
+		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_Q_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.prime2Q.pData,
+			    rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.prime2Q.dataLenInBytes);
+
+	rsaDecryptOpData->pRecipientPrivateKey->
+	    privateKeyRep2.exponent1Dp.pData =
+	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DP_INDEX].crp_p;
+	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.
+		      exponent1Dp.dataLenInBytes,
+		      krp->
+		      krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DP_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.exponent1Dp.pData,
+			    rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.exponent1Dp.dataLenInBytes);
+
+	rsaDecryptOpData->pRecipientPrivateKey->
+	    privateKeyRep2.exponent2Dq.pData =
+	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DQ_INDEX].crp_p;
+	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->
+		      privateKeyRep2.exponent2Dq.dataLenInBytes,
+		      krp->
+		      krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DQ_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.exponent2Dq.pData,
+			    rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.exponent2Dq.dataLenInBytes);
+
+	rsaDecryptOpData->pRecipientPrivateKey->
+	    privateKeyRep2.coefficientQInv.pData =
+	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_COEFF_QINV_INDEX].crp_p;
+	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->
+		      privateKeyRep2.coefficientQInv.dataLenInBytes,
+		      krp->
+		      krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_COEFF_QINV_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.coefficientQInv.pData,
+			    rsaDecryptOpData->pRecipientPrivateKey->
+			    privateKeyRep2.coefficientQInv.dataLenInBytes);
+
+	/* Output Parameter */
+	pOutputData->pData =
+	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_RESULT_INDEX].crp_p;
+	BITS_TO_BYTES(pOutputData->dataLenInBytes,
+		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_RESULT_INDEX].
+		      crp_nbits);
+
+	lacStatus = cpaCyRsaDecrypt(CPA_INSTANCE_HANDLE_SINGLE,
+				    icp_ocfDrvModExpCRTCallBack,
+				    callbackTag, rsaDecryptOpData, pOutputData);
+
+	if (CPA_STATUS_SUCCESS != lacStatus) {
+		EPRINTK("%s(): Mod Exp CRT Operation failed (%d).\n",
+			__FUNCTION__, lacStatus);
+		krp->krp_status = ECANCELED;
+		icp_ocfDrvFreeFlatBuffer(pOutputData);
+		ICP_CACHE_FREE(drvRSAPrivateKey_zone,
+			       rsaDecryptOpData->pRecipientPrivateKey);
+		ICP_CACHE_FREE(drvRSADecrypt_zone, rsaDecryptOpData);
+	}
+
+	return lacStatus;
+}
+
+/* Name        : icp_ocfDrvCheckALessThanB
+ *
+ * Description : This function will check whether the first argument is less
+ * than the second. It is used to check whether the DSA RS sign Random K
+ * value is less than the Prime Q value (as defined in the specification)
+ *
+ */
+static int
+icp_ocfDrvCheckALessThanB(CpaFlatBuffer * pK, CpaFlatBuffer * pQ, int *doCheck)
+{
+
+	uint8_t *MSB_K = pK->pData;
+	uint8_t *MSB_Q = pQ->pData;
+	uint32_t buffer_lengths_in_bytes = pQ->dataLenInBytes;
+
+	if (DONT_RUN_LESS_THAN_CHECK == *doCheck) {
+		return FAIL_A_IS_GREATER_THAN_B;
+	}
+
+/*Check MSBs
+if A == B, check next MSB
+if A > B, return A_IS_GREATER_THAN_B
+if A < B, return A_IS_LESS_THAN_B (success)
+*/
+	while (*MSB_K == *MSB_Q) {
+		MSB_K++;
+		MSB_Q++;
+
+		buffer_lengths_in_bytes--;
+		if (0 == buffer_lengths_in_bytes) {
+			DPRINTK("%s() Buffers have equal value!!\n",
+				__FUNCTION__);
+			return FAIL_A_IS_EQUAL_TO_B;
+		}
+
+	}
+
+	if (*MSB_K < *MSB_Q) {
+		return SUCCESS_A_IS_LESS_THAN_B;
+	} else {
+		return FAIL_A_IS_GREATER_THAN_B;
+	}
+
+}
+
+/* Name        : icp_ocfDrvDsaSign
+ *
+ * Description : This function will map DSA RS Sign from OCF to the LAC API.
+ *
+ * NOTE: From looking at OCF patch to OpenSSL and even the number of input
+ * parameters, OCF expects us to generate the random seed value. This value
+ * is generated and passed to LAC, however the number is discared in the
+ * callback and not returned to the user.
+ */
+static int icp_ocfDrvDsaSign(struct cryptkop *krp)
+{
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	CpaCyDsaRSSignOpData *dsaRsSignOpData = NULL;
+	void *callbackTag = NULL;
+	CpaCyRandGenOpData randGenOpData;
+	int primeQSizeInBytes = 0;
+	int doCheck = 0;
+	CpaFlatBuffer randData;
+	CpaBoolean protocolStatus = CPA_FALSE;
+	CpaFlatBuffer *pR = NULL;
+	CpaFlatBuffer *pS = NULL;
+
+	callbackTag = krp;
+
+	BITS_TO_BYTES(primeQSizeInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX].
+		      crp_nbits);
+
+	if (DSA_RS_SIGN_PRIMEQ_SIZE_IN_BYTES != primeQSizeInBytes) {
+		APRINTK("%s(): DSA PRIME Q size not equal to the "
+			"FIPS defined 20bytes, = %d\n",
+			__FUNCTION__, primeQSizeInBytes);
+		krp->krp_status = EDOM;
+		return EDOM;
+	}
+
+	dsaRsSignOpData =
+	    icp_kmem_cache_zalloc(drvDSARSSign_zone, ICP_M_NOWAIT);
+	if (NULL == dsaRsSignOpData) {
+		APRINTK("%s():Failed to get memory"
+			" for DSA RS Sign Op data struct\n", __FUNCTION__);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	dsaRsSignOpData->K.pData =
+	    icp_kmem_cache_alloc(drvDSARSSignKValue_zone, ICP_M_NOWAIT);
+
+	if (NULL == dsaRsSignOpData->K.pData) {
+		APRINTK("%s():Failed to get memory"
+			" for DSA RS Sign Op Random value\n", __FUNCTION__);
+		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	pR = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
+	if (NULL == pR) {
+		APRINTK("%s():Failed to get memory"
+			" for DSA signature R\n", __FUNCTION__);
+		ICP_CACHE_FREE(drvDSARSSignKValue_zone,
+			       dsaRsSignOpData->K.pData);
+		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	pS = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
+	if (NULL == pS) {
+		APRINTK("%s():Failed to get memory"
+			" for DSA signature S\n", __FUNCTION__);
+		icp_ocfDrvFreeFlatBuffer(pR);
+		ICP_CACHE_FREE(drvDSARSSignKValue_zone,
+			       dsaRsSignOpData->K.pData);
+		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	/*link prime number parameter for ease of processing */
+	dsaRsSignOpData->P.pData =
+	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_P_INDEX].crp_p;
+	BITS_TO_BYTES(dsaRsSignOpData->P.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_P_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(dsaRsSignOpData->P.pData,
+			    dsaRsSignOpData->P.dataLenInBytes);
+
+	dsaRsSignOpData->Q.pData =
+	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX].crp_p;
+	BITS_TO_BYTES(dsaRsSignOpData->Q.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX].
+		      crp_nbits);
+
+	icp_ocfDrvSwapBytes(dsaRsSignOpData->Q.pData,
+			    dsaRsSignOpData->Q.dataLenInBytes);
+
+	/*generate random number with equal buffer size to Prime value Q,
+	   but value less than Q */
+	dsaRsSignOpData->K.dataLenInBytes = dsaRsSignOpData->Q.dataLenInBytes;
+
+	randGenOpData.generateBits = CPA_TRUE;
+	randGenOpData.lenInBytes = dsaRsSignOpData->K.dataLenInBytes;
+
+	icp_ocfDrvPtrAndLenToFlatBuffer(dsaRsSignOpData->K.pData,
+					dsaRsSignOpData->K.dataLenInBytes,
+					&randData);
+
+	doCheck = 0;
+	while (icp_ocfDrvCheckALessThanB(&(dsaRsSignOpData->K),
+					 &(dsaRsSignOpData->Q), &doCheck)) {
+
+		if (CPA_STATUS_SUCCESS
+		    != cpaCyRandGen(CPA_INSTANCE_HANDLE_SINGLE,
+				    NULL, NULL, &randGenOpData, &randData)) {
+			APRINTK("%s(): ERROR - Failed to generate DSA RS Sign K"
+				"value\n", __FUNCTION__);
+			icp_ocfDrvFreeFlatBuffer(pS);
+			icp_ocfDrvFreeFlatBuffer(pR);
+			ICP_CACHE_FREE(drvDSARSSignKValue_zone,
+				       dsaRsSignOpData->K.pData);
+			ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
+			krp->krp_status = EAGAIN;
+			return EAGAIN;
+		}
+
+		doCheck++;
+		if (DSA_SIGN_RAND_GEN_VAL_CHECK_MAX_ITERATIONS == doCheck) {
+			APRINTK("%s(): ERROR - Failed to find DSA RS Sign K "
+				"value less than Q value\n", __FUNCTION__);
+			icp_ocfDrvFreeFlatBuffer(pS);
+			icp_ocfDrvFreeFlatBuffer(pR);
+			ICP_CACHE_FREE(drvDSARSSignKValue_zone,
+				       dsaRsSignOpData->K.pData);
+			ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
+			krp->krp_status = EAGAIN;
+			return EAGAIN;
+		}
+
+	}
+	/*Rand Data - no need to swap bytes for pK */
+
+	/* Link parameters */
+	dsaRsSignOpData->G.pData =
+	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_G_INDEX].crp_p;
+	BITS_TO_BYTES(dsaRsSignOpData->G.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_G_INDEX].crp_nbits);
+
+	icp_ocfDrvSwapBytes(dsaRsSignOpData->G.pData,
+			    dsaRsSignOpData->G.dataLenInBytes);
+
+	dsaRsSignOpData->X.pData =
+	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_X_INDEX].crp_p;
+	BITS_TO_BYTES(dsaRsSignOpData->X.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_X_INDEX].crp_nbits);
+	icp_ocfDrvSwapBytes(dsaRsSignOpData->X.pData,
+			    dsaRsSignOpData->X.dataLenInBytes);
+
+	/*OpenSSL dgst parameter is left in big endian byte order, 
+	   therefore no byte swap is required */
+	dsaRsSignOpData->M.pData =
+	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_DGST_INDEX].crp_p;
+	BITS_TO_BYTES(dsaRsSignOpData->M.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_DGST_INDEX].
+		      crp_nbits);
+
+	/* Output Parameters */
+	pS->pData = krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_S_RESULT_INDEX].crp_p;
+	BITS_TO_BYTES(pS->dataLenInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_S_RESULT_INDEX].
+		      crp_nbits);
+
+	pR->pData = krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_R_RESULT_INDEX].crp_p;
+	BITS_TO_BYTES(pR->dataLenInBytes,
+		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_R_RESULT_INDEX].
+		      crp_nbits);
+
+	lacStatus = cpaCyDsaSignRS(CPA_INSTANCE_HANDLE_SINGLE,
+				   icp_ocfDrvDsaRSSignCallBack,
+				   callbackTag, dsaRsSignOpData,
+				   &protocolStatus, pR, pS);
+
+	if (CPA_STATUS_SUCCESS != lacStatus) {
+		EPRINTK("%s(): DSA RS Sign Operation failed (%d).\n",
+			__FUNCTION__, lacStatus);
+		krp->krp_status = ECANCELED;
+		icp_ocfDrvFreeFlatBuffer(pS);
+		icp_ocfDrvFreeFlatBuffer(pR);
+		ICP_CACHE_FREE(drvDSARSSignKValue_zone,
+			       dsaRsSignOpData->K.pData);
+		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
+	}
+
+	return lacStatus;
+}
+
+/* Name        : icp_ocfDrvDsaVerify
+ *
+ * Description : This function will map DSA RS Verify from OCF to the LAC API.
+ *
+ */
+static int icp_ocfDrvDsaVerify(struct cryptkop *krp)
+{
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	CpaCyDsaVerifyOpData *dsaVerifyOpData = NULL;
+	void *callbackTag = NULL;
+	CpaBoolean verifyStatus = CPA_FALSE;
+
+	callbackTag = krp;
+
+	dsaVerifyOpData =
+	    icp_kmem_cache_zalloc(drvDSAVerify_zone, ICP_M_NOWAIT);
+	if (NULL == dsaVerifyOpData) {
+		APRINTK("%s():Failed to get memory"
+			" for DSA Verify Op data struct\n", __FUNCTION__);
+		krp->krp_status = ENOMEM;
+		return ENOMEM;
+	}
+
+	/* Link parameters */
+	dsaVerifyOpData->P.pData =
+	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_P_INDEX].crp_p;
+	BITS_TO_BYTES(dsaVerifyOpData->P.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_P_INDEX].
+		      crp_nbits);
+	icp_ocfDrvSwapBytes(dsaVerifyOpData->P.pData,
+			    dsaVerifyOpData->P.dataLenInBytes);
+
+	dsaVerifyOpData->Q.pData =
+	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_Q_INDEX].crp_p;
+	BITS_TO_BYTES(dsaVerifyOpData->Q.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_Q_INDEX].
+		      crp_nbits);
+	icp_ocfDrvSwapBytes(dsaVerifyOpData->Q.pData,
+			    dsaVerifyOpData->Q.dataLenInBytes);
+
+	dsaVerifyOpData->G.pData =
+	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_G_INDEX].crp_p;
+	BITS_TO_BYTES(dsaVerifyOpData->G.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_G_INDEX].
+		      crp_nbits);
+	icp_ocfDrvSwapBytes(dsaVerifyOpData->G.pData,
+			    dsaVerifyOpData->G.dataLenInBytes);
+
+	dsaVerifyOpData->Y.pData =
+	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PUBKEY_INDEX].crp_p;
+	BITS_TO_BYTES(dsaVerifyOpData->Y.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PUBKEY_INDEX].
+		      crp_nbits);
+	icp_ocfDrvSwapBytes(dsaVerifyOpData->Y.pData,
+			    dsaVerifyOpData->Y.dataLenInBytes);
+
+	/*OpenSSL dgst parameter is left in big endian byte order, 
+	   therefore no byte swap is required */
+	dsaVerifyOpData->M.pData =
+	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_DGST_INDEX].crp_p;
+	BITS_TO_BYTES(dsaVerifyOpData->M.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_DGST_INDEX].
+		      crp_nbits);
+
+	dsaVerifyOpData->R.pData =
+	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_R_INDEX].crp_p;
+	BITS_TO_BYTES(dsaVerifyOpData->R.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_R_INDEX].
+		      crp_nbits);
+	icp_ocfDrvSwapBytes(dsaVerifyOpData->R.pData,
+			    dsaVerifyOpData->R.dataLenInBytes);
+
+	dsaVerifyOpData->S.pData =
+	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_S_INDEX].crp_p;
+	BITS_TO_BYTES(dsaVerifyOpData->S.dataLenInBytes,
+		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_S_INDEX].
+		      crp_nbits);
+	icp_ocfDrvSwapBytes(dsaVerifyOpData->S.pData,
+			    dsaVerifyOpData->S.dataLenInBytes);
+
+	lacStatus = cpaCyDsaVerify(CPA_INSTANCE_HANDLE_SINGLE,
+				   icp_ocfDrvDsaVerifyCallBack,
+				   callbackTag, dsaVerifyOpData, &verifyStatus);
+
+	if (CPA_STATUS_SUCCESS != lacStatus) {
+		EPRINTK("%s(): DSA Verify Operation failed (%d).\n",
+			__FUNCTION__, lacStatus);
+		ICP_CACHE_FREE(drvDSAVerify_zone, dsaVerifyOpData);
+		krp->krp_status = ECANCELED;
+	}
+
+	return lacStatus;
+}
+
+/* Name        : icp_ocfDrvDhP1Callback
+ *
+ * Description : When this function returns it signifies that the LAC
+ * component has completed the DH operation.
+ */
+static void
+icp_ocfDrvDhP1CallBack(void *callbackTag,
+		       CpaStatus status,
+		       void *pOpData, CpaFlatBuffer * pLocalOctetStringPV)
+{
+	struct cryptkop *krp = NULL;
+	CpaCyDhPhase1KeyGenOpData *pPhase1OpData = NULL;
+
+	if (NULL == callbackTag) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"callbackTag data is NULL\n", __FUNCTION__);
+		return;
+	}
+	krp = (struct cryptkop *)callbackTag;
+
+	if (NULL == pOpData) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"Operation Data is NULL\n", __FUNCTION__);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+	pPhase1OpData = (CpaCyDhPhase1KeyGenOpData *) pOpData;
+
+	if (NULL == pLocalOctetStringPV) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"pLocalOctetStringPV Data is NULL\n", __FUNCTION__);
+		memset(pPhase1OpData, 0, sizeof(CpaCyDhPhase1KeyGenOpData));
+		ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+
+	if (CPA_STATUS_SUCCESS == status) {
+		krp->krp_status = CRYPTO_OP_SUCCESS;
+	} else {
+		APRINTK("%s(): Diffie Hellman Phase1 Key Gen failed - "
+			"Operation Status = %d\n", __FUNCTION__, status);
+		krp->krp_status = ECANCELED;
+	}
+
+	icp_ocfDrvSwapBytes(pLocalOctetStringPV->pData,
+			    pLocalOctetStringPV->dataLenInBytes);
+
+	icp_ocfDrvFreeFlatBuffer(pLocalOctetStringPV);
+	memset(pPhase1OpData, 0, sizeof(CpaCyDhPhase1KeyGenOpData));
+	ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
+
+	crypto_kdone(krp);
+
+	return;
+}
+
+/* Name        : icp_ocfDrvModExpCallBack
+ *
+ * Description : When this function returns it signifies that the LAC
+ * component has completed the Mod Exp operation.
+ */
+static void
+icp_ocfDrvModExpCallBack(void *callbackTag,
+			 CpaStatus status,
+			 void *pOpdata, CpaFlatBuffer * pResult)
+{
+	struct cryptkop *krp = NULL;
+	CpaCyLnModExpOpData *pLnModExpOpData = NULL;
+
+	if (NULL == callbackTag) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"callbackTag data is NULL\n", __FUNCTION__);
+		return;
+	}
+	krp = (struct cryptkop *)callbackTag;
+
+	if (NULL == pOpdata) {
+		DPRINTK("%s(): Invalid Mod Exp input parameters - "
+			"Operation Data is NULL\n", __FUNCTION__);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+	pLnModExpOpData = (CpaCyLnModExpOpData *) pOpdata;
+
+	if (NULL == pResult) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"pResult data is NULL\n", __FUNCTION__);
+		krp->krp_status = ECANCELED;
+		memset(pLnModExpOpData, 0, sizeof(CpaCyLnModExpOpData));
+		ICP_CACHE_FREE(drvLnModExp_zone, pLnModExpOpData);
+		crypto_kdone(krp);
+		return;
+	}
+
+	if (CPA_STATUS_SUCCESS == status) {
+		krp->krp_status = CRYPTO_OP_SUCCESS;
+	} else {
+		APRINTK("%s(): LAC Mod Exp Operation failed - "
+			"Operation Status = %d\n", __FUNCTION__, status);
+		krp->krp_status = ECANCELED;
+	}
+
+	icp_ocfDrvSwapBytes(pResult->pData, pResult->dataLenInBytes);
+
+	/*switch base size value back to original */
+	if (pLnModExpOpData->base.pData ==
+	    (uint8_t *) & (krp->
+			   krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].
+			   crp_nbits)) {
+		*((uint32_t *) pLnModExpOpData->base.pData) =
+		    ntohl(*((uint32_t *) pLnModExpOpData->base.pData));
+	}
+	icp_ocfDrvFreeFlatBuffer(pResult);
+	memset(pLnModExpOpData, 0, sizeof(CpaCyLnModExpOpData));
+	ICP_CACHE_FREE(drvLnModExp_zone, pLnModExpOpData);
+
+	crypto_kdone(krp);
+
+	return;
+
+}
+
+/* Name        : icp_ocfDrvModExpCRTCallBack
+ *
+ * Description : When this function returns it signifies that the LAC
+ * component has completed the Mod Exp CRT operation.
+ */
+static void
+icp_ocfDrvModExpCRTCallBack(void *callbackTag,
+			    CpaStatus status,
+			    void *pOpData, CpaFlatBuffer * pOutputData)
+{
+	struct cryptkop *krp = NULL;
+	CpaCyRsaDecryptOpData *pDecryptData = NULL;
+
+	if (NULL == callbackTag) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"callbackTag data is NULL\n", __FUNCTION__);
+		return;
+	}
+
+	krp = (struct cryptkop *)callbackTag;
+
+	if (NULL == pOpData) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"Operation Data is NULL\n", __FUNCTION__);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+	pDecryptData = (CpaCyRsaDecryptOpData *) pOpData;
+
+	if (NULL == pOutputData) {
+		DPRINTK("%s(): Invalid input parameter - "
+			"pOutputData is NULL\n", __FUNCTION__);
+		memset(pDecryptData->pRecipientPrivateKey, 0,
+		       sizeof(CpaCyRsaPrivateKey));
+		ICP_CACHE_FREE(drvRSAPrivateKey_zone,
+			       pDecryptData->pRecipientPrivateKey);
+		memset(pDecryptData, 0, sizeof(CpaCyRsaDecryptOpData));
+		ICP_CACHE_FREE(drvRSADecrypt_zone, pDecryptData);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+
+	if (CPA_STATUS_SUCCESS == status) {
+		krp->krp_status = CRYPTO_OP_SUCCESS;
+	} else {
+		APRINTK("%s(): LAC Mod Exp CRT operation failed - "
+			"Operation Status = %d\n", __FUNCTION__, status);
+		krp->krp_status = ECANCELED;
+	}
+
+	icp_ocfDrvSwapBytes(pOutputData->pData, pOutputData->dataLenInBytes);
+
+	icp_ocfDrvFreeFlatBuffer(pOutputData);
+	memset(pDecryptData->pRecipientPrivateKey, 0,
+	       sizeof(CpaCyRsaPrivateKey));
+	ICP_CACHE_FREE(drvRSAPrivateKey_zone,
+		       pDecryptData->pRecipientPrivateKey);
+	memset(pDecryptData, 0, sizeof(CpaCyRsaDecryptOpData));
+	ICP_CACHE_FREE(drvRSADecrypt_zone, pDecryptData);
+
+	crypto_kdone(krp);
+
+	return;
+}
+
+/* Name        : icp_ocfDrvDsaRSSignCallBack
+ *
+ * Description : When this function returns it signifies that the LAC
+ * component has completed the DSA RS sign operation.
+ */
+static void
+icp_ocfDrvDsaRSSignCallBack(void *callbackTag,
+			    CpaStatus status,
+			    void *pOpData,
+			    CpaBoolean protocolStatus,
+			    CpaFlatBuffer * pR, CpaFlatBuffer * pS)
+{
+	struct cryptkop *krp = NULL;
+	CpaCyDsaRSSignOpData *pSignData = NULL;
+
+	if (NULL == callbackTag) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"callbackTag data is NULL\n", __FUNCTION__);
+		return;
+	}
+
+	krp = (struct cryptkop *)callbackTag;
+
+	if (NULL == pOpData) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"Operation Data is NULL\n", __FUNCTION__);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+	pSignData = (CpaCyDsaRSSignOpData *) pOpData;
+
+	if (NULL == pR) {
+		DPRINTK("%s(): Invalid input parameter - "
+			"pR sign is NULL\n", __FUNCTION__);
+		icp_ocfDrvFreeFlatBuffer(pS);
+		ICP_CACHE_FREE(drvDSARSSign_zone, pSignData);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+
+	if (NULL == pS) {
+		DPRINTK("%s(): Invalid input parameter - "
+			"pS sign is NULL\n", __FUNCTION__);
+		icp_ocfDrvFreeFlatBuffer(pR);
+		ICP_CACHE_FREE(drvDSARSSign_zone, pSignData);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+
+	if (CPA_STATUS_SUCCESS != status) {
+		APRINTK("%s(): LAC DSA RS Sign operation failed - "
+			"Operation Status = %d\n", __FUNCTION__, status);
+		krp->krp_status = ECANCELED;
+	} else {
+		krp->krp_status = CRYPTO_OP_SUCCESS;
+
+		if (CPA_TRUE != protocolStatus) {
+			DPRINTK("%s(): LAC DSA RS Sign operation failed due "
+				"to protocol error\n", __FUNCTION__);
+			krp->krp_status = EIO;
+		}
+	}
+
+	/* Swap bytes only when the callback status is successful and
+	   protocolStatus is set to true */
+	if (CPA_STATUS_SUCCESS == status && CPA_TRUE == protocolStatus) {
+		icp_ocfDrvSwapBytes(pR->pData, pR->dataLenInBytes);
+		icp_ocfDrvSwapBytes(pS->pData, pS->dataLenInBytes);
+	}
+
+	icp_ocfDrvFreeFlatBuffer(pR);
+	icp_ocfDrvFreeFlatBuffer(pS);
+	memset(pSignData->K.pData, 0, pSignData->K.dataLenInBytes);
+	ICP_CACHE_FREE(drvDSARSSignKValue_zone, pSignData->K.pData);
+	memset(pSignData, 0, sizeof(CpaCyDsaRSSignOpData));
+	ICP_CACHE_FREE(drvDSARSSign_zone, pSignData);
+	crypto_kdone(krp);
+
+	return;
+}
+
+/* Name        : icp_ocfDrvDsaVerifyCallback
+ *
+ * Description : When this function returns it signifies that the LAC
+ * component has completed the DSA Verify operation.
+ */
+static void
+icp_ocfDrvDsaVerifyCallBack(void *callbackTag,
+			    CpaStatus status,
+			    void *pOpData, CpaBoolean verifyStatus)
+{
+
+	struct cryptkop *krp = NULL;
+	CpaCyDsaVerifyOpData *pVerData = NULL;
+
+	if (NULL == callbackTag) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"callbackTag data is NULL\n", __FUNCTION__);
+		return;
+	}
+
+	krp = (struct cryptkop *)callbackTag;
+
+	if (NULL == pOpData) {
+		DPRINTK("%s(): Invalid input parameters - "
+			"Operation Data is NULL\n", __FUNCTION__);
+		krp->krp_status = ECANCELED;
+		crypto_kdone(krp);
+		return;
+	}
+	pVerData = (CpaCyDsaVerifyOpData *) pOpData;
+
+	if (CPA_STATUS_SUCCESS != status) {
+		APRINTK("%s(): LAC DSA Verify operation failed - "
+			"Operation Status = %d\n", __FUNCTION__, status);
+		krp->krp_status = ECANCELED;
+	} else {
+		krp->krp_status = CRYPTO_OP_SUCCESS;
+
+		if (CPA_TRUE != verifyStatus) {
+			DPRINTK("%s(): DSA signature invalid\n", __FUNCTION__);
+			krp->krp_status = EIO;
+		}
+	}
+
+	/* Swap bytes only when the callback status is successful and
+	   verifyStatus is set to true */
+	/*Just swapping back the key values for now. Possibly all
+	   swapped buffers need to be reverted */
+	if (CPA_STATUS_SUCCESS == status && CPA_TRUE == verifyStatus) {
+		icp_ocfDrvSwapBytes(pVerData->R.pData,
+				    pVerData->R.dataLenInBytes);
+		icp_ocfDrvSwapBytes(pVerData->S.pData,
+				    pVerData->S.dataLenInBytes);
+	}
+
+	memset(pVerData, 0, sizeof(CpaCyDsaVerifyOpData));
+	ICP_CACHE_FREE(drvDSAVerify_zone, pVerData);
+	crypto_kdone(krp);
+
+	return;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_common.c b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_common.c
new file mode 100644
index 00000000..5d46c0ad
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_common.c
@@ -0,0 +1,773 @@
+/*************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or 
+ *   redistributing this file, you may do so under either license.
+ * 
+ *   GPL LICENSE SUMMARY
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ * 
+ *   This program is free software; you can redistribute it and/or modify 
+ *   it under the terms of version 2 of the GNU General Public License as
+ *   published by the Free Software Foundation.
+ * 
+ *   This program is distributed in the hope that 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *   The full GNU General Public License is included in this distribution 
+ *   in the file called LICENSE.GPL.
+ * 
+ *   Contact Information:
+ *   Intel Corporation
+ * 
+ *   BSD LICENSE 
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ * 
+ *   Redistribution and use in source and binary forms, with or without 
+ *   modification, are permitted provided that the following conditions 
+ *   are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright 
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright 
+ *       notice, this list of conditions and the following disclaimer in 
+ *       the documentation and/or other materials provided with the 
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its 
+ *       contributors may be used to endorse or promote products derived 
+ *       from this software without specific prior written permission.
+ * 
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * 
+ *  version: Security.L.1.0.2-229
+ *
+ ***************************************************************************/
+
+/*
+ * An OCF module that uses Intel® QuickAssist Integrated Accelerator to do the 
+ * crypto.
+ *
+ * This driver requires the ICP Access Library that is available from Intel in
+ * order to operate.
+ */
+
+#include "icp_ocf.h"
+
+#define ICP_OCF_COMP_NAME                       "ICP_OCF"
+#define ICP_OCF_VER_MAIN                        (2)
+#define ICP_OCF_VER_MJR                         (1)
+#define ICP_OCF_VER_MNR                         (0)
+
+#define MAX_DEREG_RETRIES                       (100)
+#define DEFAULT_DEREG_RETRIES 			(10)
+#define DEFAULT_DEREG_DELAY_IN_JIFFIES		(10)
+
+/* This defines the maximum number of sessions possible between OCF
+   and the OCF EP80579 Driver. If set to zero, there is no limit. */
+#define DEFAULT_OCF_TO_DRV_MAX_SESSION_COUNT    (0)
+#define NUM_SUPPORTED_CAPABILITIES              (21)
+
+/*Slab zone names*/
+#define ICP_SESSION_DATA_NAME   "icp_ocf.SesDat"
+#define ICP_OP_DATA_NAME        "icp_ocf.OpDat"
+#define ICP_DH_NAME             "icp_ocf.DH"
+#define ICP_MODEXP_NAME         "icp_ocf.ModExp"
+#define ICP_RSA_DECRYPT_NAME    "icp_ocf.RSAdec"
+#define ICP_RSA_PKEY_NAME       "icp_ocf.RSApk"
+#define ICP_DSA_SIGN_NAME       "icp_ocf.DSAsg"
+#define ICP_DSA_VER_NAME        "icp_ocf.DSAver"
+#define ICP_RAND_VAL_NAME       "icp_ocf.DSArnd"
+#define ICP_FLAT_BUFF_NAME      "icp_ocf.FB"
+
+/*Slabs zones*/
+icp_kmem_cache drvSessionData_zone = NULL;
+icp_kmem_cache drvOpData_zone = NULL;
+icp_kmem_cache drvDH_zone = NULL;
+icp_kmem_cache drvLnModExp_zone = NULL;
+icp_kmem_cache drvRSADecrypt_zone = NULL;
+icp_kmem_cache drvRSAPrivateKey_zone = NULL;
+icp_kmem_cache drvDSARSSign_zone = NULL;
+icp_kmem_cache drvDSARSSignKValue_zone = NULL;
+icp_kmem_cache drvDSAVerify_zone = NULL;
+
+/*Slab zones for flatbuffers and bufferlist*/
+icp_kmem_cache drvFlatBuffer_zone = NULL;
+
+static inline int icp_cache_null_check(void)
+{
+	return (drvSessionData_zone && drvOpData_zone
+		&& drvDH_zone && drvLnModExp_zone && drvRSADecrypt_zone
+		&& drvRSAPrivateKey_zone && drvDSARSSign_zone
+		&& drvDSARSSign_zone && drvDSARSSignKValue_zone
+		&& drvDSAVerify_zone && drvFlatBuffer_zone);
+}
+
+/*Function to free all allocated slab caches before exiting the module*/
+static void icp_ocfDrvFreeCaches(void);
+
+int32_t icp_ocfDrvDriverId = INVALID_DRIVER_ID;
+
+/* Module parameter - gives the number of times LAC deregistration shall be
+   re-tried */
+int num_dereg_retries = DEFAULT_DEREG_RETRIES;
+
+/* Module parameter - gives the delay time in jiffies before a LAC session 
+   shall be attempted to be deregistered again */
+int dereg_retry_delay_in_jiffies = DEFAULT_DEREG_DELAY_IN_JIFFIES;
+
+/* Module parameter - gives the maximum number of sessions possible between
+   OCF and the OCF EP80579 Driver. If set to zero, there is no limit.*/
+int max_sessions = DEFAULT_OCF_TO_DRV_MAX_SESSION_COUNT;
+
+/* This is set when the module is removed from the system, no further
+   processing can take place if this is set */
+icp_atomic_t icp_ocfDrvIsExiting = ICP_ATOMIC_INIT(0);
+
+/* This is used to show how many lac sessions were not deregistered*/
+icp_atomic_t lac_session_failed_dereg_count = ICP_ATOMIC_INIT(0);
+
+/* This is used to track the number of registered sessions between OCF and
+ * and the OCF EP80579 driver, when max_session is set to value other than
+ * zero. This ensures that the max_session set for the OCF and the driver
+ * is equal to the LAC registered sessions */
+icp_atomic_t num_ocf_to_drv_registered_sessions = ICP_ATOMIC_INIT(0);
+
+/* Head of linked list used to store session data */
+icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead;
+icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead_FreeMemList;
+
+icp_spinlock_t icp_ocfDrvSymSessInfoListSpinlock;
+
+/*Below pointer is only used in linux, FreeBSD uses the name to
+create its own variable name*/
+icp_workqueue *icp_ocfDrvFreeLacSessionWorkQ = NULL;
+ICP_WORKQUEUE_DEFINE_THREAD(icp_ocfDrvFreeLacSessionWorkQ);
+
+struct icp_drvBuffListInfo defBuffListInfo;
+
+/* Name        : icp_ocfDrvInit
+ *
+ * Description : This function will register all the symmetric and asymmetric
+ * functionality that will be accelerated by the hardware. It will also
+ * get a unique driver ID from the OCF and initialise all slab caches
+ */
+ICP_MODULE_INIT_FUNC(icp_ocfDrvInit)
+{
+	int ocfStatus = 0;
+
+	IPRINTK("=== %s ver %d.%d.%d ===\n", ICP_OCF_COMP_NAME,
+		ICP_OCF_VER_MAIN, ICP_OCF_VER_MJR, ICP_OCF_VER_MNR);
+
+	if (MAX_DEREG_RETRIES < num_dereg_retries) {
+		EPRINTK("Session deregistration retry count set to greater "
+			"than %d", MAX_DEREG_RETRIES);
+		icp_module_return_code(EINVAL);
+	}
+
+	/* Initialize and Start the Cryptographic component */
+	if (CPA_STATUS_SUCCESS !=
+	    cpaCyStartInstance(CPA_INSTANCE_HANDLE_SINGLE)) {
+		EPRINTK("Failed to initialize and start the instance "
+			"of the Cryptographic component.\n");
+		return icp_module_return_code(EINVAL);
+	}
+
+	icp_spin_lock_init(&icp_ocfDrvSymSessInfoListSpinlock);
+
+	/* Set the default size of BufferList to allocate */
+	memset(&defBuffListInfo, 0, sizeof(struct icp_drvBuffListInfo));
+	if (ICP_OCF_DRV_STATUS_SUCCESS !=
+	    icp_ocfDrvBufferListMemInfo(ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS,
+					&defBuffListInfo)) {
+		EPRINTK("Failed to get bufferlist memory info.\n");
+		return icp_module_return_code(ENOMEM);
+	}
+
+	/*Register OCF EP80579 Driver with OCF */
+	icp_ocfDrvDriverId = ICP_CRYPTO_GET_DRIVERID();
+
+	if (icp_ocfDrvDriverId < 0) {
+		EPRINTK("%s : ICP driver failed to register with OCF!\n",
+			__FUNCTION__);
+		return icp_module_return_code(ENODEV);
+	}
+
+	/*Create all the slab caches used by the OCF EP80579 Driver */
+	drvSessionData_zone =
+	    ICP_CACHE_CREATE(ICP_SESSION_DATA_NAME, struct icp_drvSessionData);
+
+	/* 
+	 * Allocation of the OpData includes the allocation space for meta data.
+	 * The memory after the opData structure is reserved for this meta data.
+	 */
+	drvOpData_zone =
+	    icp_kmem_cache_create(ICP_OP_DATA_NAME,
+				  sizeof(struct icp_drvOpData) +
+				  defBuffListInfo.metaSize,
+				  ICP_KERNEL_CACHE_ALIGN,
+				  ICP_KERNEL_CACHE_NOINIT);
+
+	drvDH_zone = ICP_CACHE_CREATE(ICP_DH_NAME, CpaCyDhPhase1KeyGenOpData);
+
+	drvLnModExp_zone =
+	    ICP_CACHE_CREATE(ICP_MODEXP_NAME, CpaCyLnModExpOpData);
+
+	drvRSADecrypt_zone =
+	    ICP_CACHE_CREATE(ICP_RSA_DECRYPT_NAME, CpaCyRsaDecryptOpData);
+
+	drvRSAPrivateKey_zone =
+	    ICP_CACHE_CREATE(ICP_RSA_PKEY_NAME, CpaCyRsaPrivateKey);
+
+	drvDSARSSign_zone =
+	    ICP_CACHE_CREATE(ICP_DSA_SIGN_NAME, CpaCyDsaRSSignOpData);
+
+	/*too awkward to use a macro here */
+	drvDSARSSignKValue_zone =
+	    ICP_CACHE_CREATE(ICP_RAND_VAL_NAME,
+			     DSA_RS_SIGN_PRIMEQ_SIZE_IN_BYTES);
+
+	drvDSAVerify_zone =
+	    ICP_CACHE_CREATE(ICP_DSA_VER_NAME, CpaCyDsaVerifyOpData);
+
+	drvFlatBuffer_zone =
+	    ICP_CACHE_CREATE(ICP_FLAT_BUFF_NAME, CpaFlatBuffer);
+
+	if (0 == icp_cache_null_check()) {
+		icp_ocfDrvFreeCaches();
+		EPRINTK("%s() line %d: Not enough memory!\n",
+			__FUNCTION__, __LINE__);
+		return ENOMEM;
+	}
+
+	/* Register the ICP symmetric crypto support. */
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_NULL_CBC, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_DES_CBC, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_3DES_CBC, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_AES_CBC, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_ARC4, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_MD5, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_MD5_HMAC, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA1, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA1_HMAC, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_256, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_256_HMAC,
+			     ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_384, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_384_HMAC,
+			     ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_512, ocfStatus);
+	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_512_HMAC,
+			     ocfStatus);
+
+	/* Register the ICP asymmetric algorithm support */
+	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_DH_COMPUTE_KEY,
+			      ocfStatus);
+	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_MOD_EXP, ocfStatus);
+	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_MOD_EXP_CRT, ocfStatus);
+	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_DSA_SIGN, ocfStatus);
+	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_DSA_VERIFY, ocfStatus);
+
+	/* Register the ICP random number generator support */
+	ICP_REG_RAND_WITH_OCF(icp_ocfDrvDriverId,
+			      icp_ocfDrvReadRandom, NULL, ocfStatus);
+
+	if (OCF_ZERO_FUNCTIONALITY_REGISTERED == ocfStatus) {
+		DPRINTK("%s: Failed to register any device capabilities\n",
+			__FUNCTION__);
+		icp_ocfDrvFreeCaches();
+		icp_ocfDrvDriverId = INVALID_DRIVER_ID;
+		return icp_module_return_code(ECANCELED);
+	}
+
+	DPRINTK("%s: Registered %d of %d device capabilities\n",
+		__FUNCTION__, ocfStatus, NUM_SUPPORTED_CAPABILITIES);
+
+	/*Session data linked list used during module exit */
+	ICP_INIT_LIST_HEAD(&icp_ocfDrvGlobalSymListHead);
+	ICP_INIT_LIST_HEAD(&icp_ocfDrvGlobalSymListHead_FreeMemList);
+
+	ICP_WORKQUEUE_CREATE(icp_ocfDrvFreeLacSessionWorkQ, "icpwq");
+	if (ICP_WORKQUEUE_NULL_CHECK(icp_ocfDrvFreeLacSessionWorkQ)) {
+		EPRINTK("%s: Failed to create single "
+			"thread workqueue\n", __FUNCTION__);
+		icp_ocfDrvFreeCaches();
+		icp_ocfDrvDriverId = INVALID_DRIVER_ID;
+		return icp_module_return_code(ENOMEM);
+	}
+
+	return icp_module_return_code(0);
+}
+
+/* Name        : icp_ocfDrvExit
+ *
+ * Description : This function will deregister all the symmetric sessions
+ * registered with the LAC component. It will also deregister all symmetric
+ * and asymmetric functionality that can be accelerated by the hardware via OCF
+ * and random number generation if it is enabled.
+ */
+ICP_MODULE_EXIT_FUNC(icp_ocfDrvExit)
+{
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	struct icp_drvSessionData *sessionData = NULL;
+	struct icp_drvSessionData *tempSessionData = NULL;
+	int i, remaining_delay_time_in_jiffies = 0;
+
+	/* For FreeBSD the invariant macro below makes function to return     */
+	/* with EBUSY value in the case of any session which has been regi-   */
+	/* stered with LAC not being deregistered.                            */
+	/* The Linux implementation is empty since it is purely to compensate */
+	/* for a limitation of the FreeBSD 7.1 Opencrypto framework.          */
+
+    ICP_MODULE_EXIT_INV();
+
+	/* There is a possibility of a process or new session command being   */
+	/* sent before this variable is incremented. The aim of this variable */
+	/* is to stop a loop of calls creating a deadlock situation which     */
+	/* would prevent the driver from exiting.                             */
+	icp_atomic_set(&icp_ocfDrvIsExiting, 1);
+
+	/*Existing sessions will be routed to another driver after these calls */
+	crypto_unregister_all(icp_ocfDrvDriverId);
+	crypto_runregister_all(icp_ocfDrvDriverId);
+
+	if (ICP_WORKQUEUE_NULL_CHECK(icp_ocfDrvFreeLacSessionWorkQ)) {
+		DPRINTK("%s: workqueue already "
+			"destroyed, therefore module exit "
+			" function already called. Exiting.\n", __FUNCTION__);
+		return ICP_MODULE_EXIT_FUNC_RETURN_VAL;
+	}
+	/*If any sessions are waiting to be deregistered, do that. This also 
+	   flushes the work queue */
+	ICP_WORKQUEUE_DESTROY(icp_ocfDrvFreeLacSessionWorkQ);
+
+	/*ENTER CRITICAL SECTION */
+	icp_spin_lockbh_lock(&icp_ocfDrvSymSessInfoListSpinlock);
+
+	ICP_LIST_FOR_EACH_ENTRY_SAFE(tempSessionData, sessionData,
+				     &icp_ocfDrvGlobalSymListHead, listNode) {
+		for (i = 0; i < num_dereg_retries; i++) {
+			/*No harm if bad input - LAC will handle error cases */
+			if (ICP_SESSION_RUNNING == tempSessionData->inUse) {
+				lacStatus =
+				    cpaCySymRemoveSession
+				    (CPA_INSTANCE_HANDLE_SINGLE,
+				     tempSessionData->sessHandle);
+				if (CPA_STATUS_SUCCESS == lacStatus) {
+					/* Succesfully deregistered */
+					break;
+				} else if (CPA_STATUS_RETRY != lacStatus) {
+					icp_atomic_inc
+					    (&lac_session_failed_dereg_count);
+					break;
+				}
+
+				/*schedule_timout returns the time left for completion if 
+				 * this task is set to TASK_INTERRUPTIBLE */
+				remaining_delay_time_in_jiffies =
+				    dereg_retry_delay_in_jiffies;
+				while (0 > remaining_delay_time_in_jiffies) {
+					remaining_delay_time_in_jiffies =
+					    icp_schedule_timeout
+					    (&icp_ocfDrvSymSessInfoListSpinlock,
+					     remaining_delay_time_in_jiffies);
+				}
+
+				DPRINTK
+				    ("%s(): Retry %d to deregistrate the session\n",
+				     __FUNCTION__, i);
+			}
+		}
+
+		/*remove from current list */
+		ICP_LIST_DEL(tempSessionData, listNode);
+		/*add to free mem linked list */
+		ICP_LIST_ADD(tempSessionData,
+			     &icp_ocfDrvGlobalSymListHead_FreeMemList,
+			     listNode);
+
+	}
+
+	/*EXIT CRITICAL SECTION */
+	icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
+
+	/*set back to initial values */
+	sessionData = NULL;
+	/*still have a reference in our list! */
+	tempSessionData = NULL;
+	/*free memory */
+
+	ICP_LIST_FOR_EACH_ENTRY_SAFE(tempSessionData, sessionData,
+				     &icp_ocfDrvGlobalSymListHead_FreeMemList,
+				     listNode) {
+
+		ICP_LIST_DEL(tempSessionData, listNode);
+		/* Free allocated CpaCySymSessionCtx */
+		if (NULL != tempSessionData->sessHandle) {
+			icp_kfree(tempSessionData->sessHandle);
+		}
+		memset(tempSessionData, 0, sizeof(struct icp_drvSessionData));
+		ICP_CACHE_FREE(drvSessionData_zone, tempSessionData);
+	}
+
+	if (0 != icp_atomic_read(&lac_session_failed_dereg_count)) {
+		DPRINTK("%s(): %d LAC sessions were not deregistered "
+			"correctly. This is not a clean exit! \n",
+			__FUNCTION__,
+			icp_atomic_read(&lac_session_failed_dereg_count));
+	}
+
+	icp_ocfDrvFreeCaches();
+	icp_ocfDrvDriverId = INVALID_DRIVER_ID;
+
+	icp_spin_lock_destroy(&icp_ocfDrvSymSessInfoListSpinlock);
+
+	/* Shutdown the Cryptographic component */
+	lacStatus = cpaCyStopInstance(CPA_INSTANCE_HANDLE_SINGLE);
+	if (CPA_STATUS_SUCCESS != lacStatus) {
+		DPRINTK("%s(): Failed to stop instance of the "
+			"Cryptographic component.(status == %d)\n",
+			__FUNCTION__, lacStatus);
+	}
+
+	return ICP_MODULE_EXIT_FUNC_RETURN_VAL;
+}
+
+/* Name        : icp_ocfDrvFreeCaches
+ *
+ * Description : This function deregisters all slab caches
+ */
+static void icp_ocfDrvFreeCaches(void)
+{
+	icp_atomic_set(&icp_ocfDrvIsExiting, 1);
+
+	/*Sym Zones */
+	ICP_CACHE_DESTROY(drvSessionData_zone);
+	ICP_CACHE_DESTROY(drvOpData_zone);
+
+	/*Asym zones */
+	ICP_CACHE_DESTROY(drvDH_zone);
+	ICP_CACHE_DESTROY(drvLnModExp_zone);
+	ICP_CACHE_DESTROY(drvRSADecrypt_zone);
+	ICP_CACHE_DESTROY(drvRSAPrivateKey_zone);
+	ICP_CACHE_DESTROY(drvDSARSSignKValue_zone);
+	ICP_CACHE_DESTROY(drvDSARSSign_zone);
+	ICP_CACHE_DESTROY(drvDSAVerify_zone);
+
+	/*FlatBuffer and BufferList Zones */
+	ICP_CACHE_DESTROY(drvFlatBuffer_zone);
+
+}
+
+/* Name        : icp_ocfDrvDeregRetry
+ *
+ * Description : This function will try to farm the session deregistration
+ * off to a work queue. If it fails, nothing more can be done and it
+ * returns an error
+ */
+int icp_ocfDrvDeregRetry(CpaCySymSessionCtx sessionToDeregister)
+{
+	struct icp_ocfDrvFreeLacSession *workstore = NULL;
+
+	DPRINTK("%s(): Retry - Deregistering session (%p)\n",
+		__FUNCTION__, sessionToDeregister);
+
+	/*make sure the session is not available to be allocated during this
+	   process */
+	icp_atomic_inc(&lac_session_failed_dereg_count);
+
+	/*Farm off to work queue */
+	workstore =
+	    icp_kmalloc(sizeof(struct icp_ocfDrvFreeLacSession), ICP_M_NOWAIT);
+	if (NULL == workstore) {
+		DPRINTK("%s(): unable to free session - no memory available "
+			"for work queue\n", __FUNCTION__);
+		return ENOMEM;
+	}
+
+	workstore->sessionToDeregister = sessionToDeregister;
+
+	icp_init_work(&(workstore->work),
+		      icp_ocfDrvDeferedFreeLacSessionTaskFn, workstore);
+
+	ICP_WORKQUEUE_ENQUEUE(icp_ocfDrvFreeLacSessionWorkQ,
+			      &(workstore->work));
+
+	return ICP_OCF_DRV_STATUS_SUCCESS;
+
+}
+
+/* Name        : icp_ocfDrvDeferedFreeLacSessionProcess
+ *
+ * Description : This function will retry (module input parameter)
+ * 'num_dereg_retries' times to deregister any symmetric session that recieves a
+ * CPA_STATUS_RETRY message from the LAC component. This function is run in
+ * Thread context because it is called from a worker thread
+ */
+void icp_ocfDrvDeferedFreeLacSessionProcess(void *arg)
+{
+	struct icp_ocfDrvFreeLacSession *workstore = NULL;
+	CpaCySymSessionCtx sessionToDeregister = NULL;
+	int i = 0;
+	int remaining_delay_time_in_jiffies = 0;
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+
+	workstore = (struct icp_ocfDrvFreeLacSession *)arg;
+	if (NULL == workstore) {
+		DPRINTK("%s() function called with null parameter \n",
+			__FUNCTION__);
+		return;
+	}
+
+	sessionToDeregister = workstore->sessionToDeregister;
+	icp_kfree(workstore);
+
+	/*if exiting, give deregistration one more blast only */
+	if (icp_atomic_read(&icp_ocfDrvIsExiting) == CPA_TRUE) {
+		lacStatus = cpaCySymRemoveSession(CPA_INSTANCE_HANDLE_SINGLE,
+						  sessionToDeregister);
+
+		if (lacStatus != CPA_STATUS_SUCCESS) {
+			DPRINTK("%s() Failed to Dereg LAC session %p "
+				"during module exit\n", __FUNCTION__,
+				sessionToDeregister);
+			return;
+		}
+
+		icp_atomic_dec(&lac_session_failed_dereg_count);
+		return;
+	}
+
+	for (i = 0; i <= num_dereg_retries; i++) {
+		lacStatus = cpaCySymRemoveSession(CPA_INSTANCE_HANDLE_SINGLE,
+						  sessionToDeregister);
+
+		if (lacStatus == CPA_STATUS_SUCCESS) {
+			icp_atomic_dec(&lac_session_failed_dereg_count);
+			return;
+		}
+		if (lacStatus != CPA_STATUS_RETRY) {
+			DPRINTK("%s() Failed to deregister session - lacStatus "
+				" = %d", __FUNCTION__, lacStatus);
+			break;
+		}
+
+		/*schedule_timout returns the time left for completion if this
+		   task is set to TASK_INTERRUPTIBLE */
+		remaining_delay_time_in_jiffies = dereg_retry_delay_in_jiffies;
+		while (0 < remaining_delay_time_in_jiffies) {
+			remaining_delay_time_in_jiffies =
+			    icp_schedule_timeout(NULL,
+						 remaining_delay_time_in_jiffies);
+		}
+
+	}
+
+	DPRINTK("%s(): Unable to deregister session\n", __FUNCTION__);
+	DPRINTK("%s(): Number of unavailable LAC sessions = %d\n", __FUNCTION__,
+		icp_atomic_read(&lac_session_failed_dereg_count));
+}
+
+/* Name        : icp_ocfDrvPtrAndLenToFlatBuffer 
+ *
+ * Description : This function converts a "pointer and length" buffer 
+ * structure to Fredericksburg Flat Buffer (CpaFlatBuffer) format.
+ *
+ * This function assumes that the data passed in are valid.
+ */
+inline void
+icp_ocfDrvPtrAndLenToFlatBuffer(void *pData, uint32_t len,
+				CpaFlatBuffer * pFlatBuffer)
+{
+	pFlatBuffer->pData = pData;
+	pFlatBuffer->dataLenInBytes = len;
+}
+
+/* Name        : icp_ocfDrvPtrAndLenToBufferList
+ *
+ * Description : This function converts a "pointer and length" buffer
+ * structure to Fredericksburg Scatter/Gather Buffer (CpaBufferList) format.
+ *
+ * This function assumes that the data passed in are valid.
+ */
+inline void
+icp_ocfDrvPtrAndLenToBufferList(void *pDataIn, uint32_t length,
+				CpaBufferList * pBufferList)
+{
+	pBufferList->numBuffers = 1;
+	pBufferList->pBuffers->pData = pDataIn;
+	pBufferList->pBuffers->dataLenInBytes = length;
+}
+
+/* Name        : icp_ocfDrvBufferListToPtrAndLen
+ *
+ * Description : This function converts Fredericksburg Scatter/Gather Buffer
+ * (CpaBufferList) format to a "pointer and length" buffer structure.
+ *
+ * This function assumes that the data passed in are valid.
+ */
+inline void
+icp_ocfDrvBufferListToPtrAndLen(CpaBufferList * pBufferList,
+				void **ppDataOut, uint32_t * pLength)
+{
+	*ppDataOut = pBufferList->pBuffers->pData;
+	*pLength = pBufferList->pBuffers->dataLenInBytes;
+}
+
+/* Name        : icp_ocfDrvBufferListMemInfo
+ *
+ * Description : This function will set the number of flat buffers in 
+ * bufferlist, the size of memory to allocate for the pPrivateMetaData 
+ * member of the CpaBufferList.
+ */
+int
+icp_ocfDrvBufferListMemInfo(uint16_t numBuffers,
+			    struct icp_drvBuffListInfo *buffListInfo)
+{
+	buffListInfo->numBuffers = numBuffers;
+
+	if (CPA_STATUS_SUCCESS !=
+	    cpaCyBufferListGetMetaSize(CPA_INSTANCE_HANDLE_SINGLE,
+				       buffListInfo->numBuffers,
+				       &(buffListInfo->metaSize))) {
+		EPRINTK("%s() Failed to get buffer list meta size.\n",
+			__FUNCTION__);
+		return ICP_OCF_DRV_STATUS_FAIL;
+	}
+
+	return ICP_OCF_DRV_STATUS_SUCCESS;
+}
+
+/* Name        : icp_ocfDrvFreeFlatBuffer
+ *
+ * Description : This function will deallocate flat buffer.
+ */
+inline void icp_ocfDrvFreeFlatBuffer(CpaFlatBuffer * pFlatBuffer)
+{
+	if (pFlatBuffer != NULL) {
+		memset(pFlatBuffer, 0, sizeof(CpaFlatBuffer));
+		ICP_CACHE_FREE(drvFlatBuffer_zone, pFlatBuffer);
+	}
+}
+
+/* Name        : icp_ocfDrvAllocMetaData
+ *
+ * Description : This function will allocate memory for the
+ * pPrivateMetaData member of CpaBufferList.
+ */
+inline int
+icp_ocfDrvAllocMetaData(CpaBufferList * pBufferList,
+			struct icp_drvOpData *pOpData)
+{
+	Cpa32U metaSize = 0;
+
+	if (pBufferList->numBuffers <= ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) {
+		uint8_t *pOpDataStartAddr = (uint8_t *) pOpData;
+
+		if (0 == defBuffListInfo.metaSize) {
+			pBufferList->pPrivateMetaData = NULL;
+			return ICP_OCF_DRV_STATUS_SUCCESS;
+		}
+		/*
+		 * The meta data allocation has been included as part of the 
+		 * op data.  It has been pre-allocated in memory just after the
+		 * icp_drvOpData structure.
+		 */
+		pBufferList->pPrivateMetaData = (void *)(pOpDataStartAddr +
+							 sizeof(struct
+								icp_drvOpData));
+	} else {
+		if (CPA_STATUS_SUCCESS !=
+		    cpaCyBufferListGetMetaSize(CPA_INSTANCE_HANDLE_SINGLE,
+					       pBufferList->numBuffers,
+					       &metaSize)) {
+			EPRINTK("%s() Failed to get buffer list meta size.\n",
+				__FUNCTION__);
+			return ICP_OCF_DRV_STATUS_FAIL;
+		}
+
+		if (0 == metaSize) {
+			pBufferList->pPrivateMetaData = NULL;
+			return ICP_OCF_DRV_STATUS_SUCCESS;
+		}
+
+		pBufferList->pPrivateMetaData =
+		    icp_kmalloc(metaSize, ICP_M_NOWAIT);
+	}
+	if (NULL == pBufferList->pPrivateMetaData) {
+		EPRINTK("%s() Failed to allocate pPrivateMetaData.\n",
+			__FUNCTION__);
+		return ICP_OCF_DRV_STATUS_FAIL;
+	}
+
+	return ICP_OCF_DRV_STATUS_SUCCESS;
+}
+
+/* Name        : icp_ocfDrvFreeMetaData
+ *
+ * Description : This function will deallocate pPrivateMetaData memory.
+ */
+inline void icp_ocfDrvFreeMetaData(CpaBufferList * pBufferList)
+{
+	if (NULL == pBufferList->pPrivateMetaData) {
+		return;
+	}
+
+	/*
+	 * Only free the meta data if the BufferList has more than 
+	 * ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS number of buffers.
+	 * Otherwise, the meta data shall be freed when the icp_drvOpData is
+	 * freed.
+	 */
+	if (ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS < pBufferList->numBuffers) {
+		icp_kfree(pBufferList->pPrivateMetaData);
+	}
+}
+
+/* Module declaration, init and exit functions */
+ICP_DECLARE_MODULE(icp_ocf, icp_ocfDrvInit, icp_ocfDrvExit);
+ICP_MODULE_DESCRIPTION("OCF Driver for Intel Quick Assist crypto acceleration");
+ICP_MODULE_VERSION(icp_ocf, ICP_OCF_VER_MJR);
+ICP_MODULE_LICENSE("Dual BSD/GPL");
+ICP_MODULE_AUTHOR("Intel");
+
+/* Module parameters */
+ICP_MODULE_PARAM_INT(icp_ocf, num_dereg_retries,
+		     "Number of times to retry LAC Sym Session Deregistration. "
+		     "Default 10, Max 100");
+ICP_MODULE_PARAM_INT(icp_ocf, dereg_retry_delay_in_jiffies, "Delay in jiffies "
+		     "(added to a schedule() function call) before a LAC Sym "
+		     "Session Dereg is retried. Default 10");
+ICP_MODULE_PARAM_INT(icp_ocf, max_sessions,
+		     "This sets the maximum number of sessions "
+		     "between OCF and this driver. If this value is set to zero,"
+		     "max session count checking is disabled. Default is zero(0)");
+
+/* Module dependencies */
+#define MODULE_MIN_VER	1
+#define CRYPTO_MAX_VER	3
+#define LAC_MAX_VER	2
+
+ICP_MODULE_DEPEND(icp_ocf, crypto, MODULE_MIN_VER, MODULE_MIN_VER,
+		  CRYPTO_MAX_VER);
+ICP_MODULE_DEPEND(icp_ocf, cryptodev, MODULE_MIN_VER, MODULE_MIN_VER,
+		  CRYPTO_MAX_VER);
+ICP_MODULE_DEPEND(icp_ocf, icp_crypto, MODULE_MIN_VER, MODULE_MIN_VER,
+		  LAC_MAX_VER);
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_ocf.h b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_ocf.h
new file mode 100644
index 00000000..d9dde874
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_ocf.h
@@ -0,0 +1,376 @@
+/***************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or 
+ *   redistributing this file, you may do so under either license.
+ * 
+ *   GPL LICENSE SUMMARY
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ * 
+ *   This program is free software; you can redistribute it and/or modify 
+ *   it under the terms of version 2 of the GNU General Public License as
+ *   published by the Free Software Foundation.
+ * 
+ *   This program is distributed in the hope that 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *   The full GNU General Public License is included in this distribution 
+ *   in the file called LICENSE.GPL.
+ * 
+ *   Contact Information:
+ *   Intel Corporation
+ * 
+ *   BSD LICENSE 
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ * 
+ *   Redistribution and use in source and binary forms, with or without 
+ *   modification, are permitted provided that the following conditions 
+ *   are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright 
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright 
+ *       notice, this list of conditions and the following disclaimer in 
+ *       the documentation and/or other materials provided with the 
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its 
+ *       contributors may be used to endorse or promote products derived 
+ *       from this software without specific prior written permission.
+ * 
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * 
+ *  version: Security.L.1.0.2-229
+ *
+ ***************************************************************************/
+
+/*
+ * OCF driver header file for the Intel ICP processor.
+ */
+
+#ifndef ICP_OCF_H_
+#define ICP_OCF_H_
+
+#include <cpa.h>
+#include <cpa_cy_im.h>
+#include <cpa_cy_sym.h>
+#include <cpa_cy_rand.h>
+#include <cpa_cy_dh.h>
+#include <cpa_cy_rsa.h>
+#include <cpa_cy_ln.h>
+#include <cpa_cy_common.h>
+#include <cpa_cy_dsa.h>
+
+#include "icp_os.h"
+
+#define NUM_BITS_IN_BYTE (8)
+#define NUM_BITS_IN_BYTE_MINUS_ONE (NUM_BITS_IN_BYTE -1)
+#define INVALID_DRIVER_ID (-1)
+#define RETURN_RAND_NUM_GEN_FAILED (-1)
+
+/*This is the max block cipher initialisation vector*/
+#define MAX_IV_LEN_IN_BYTES (20)
+/*This is used to check whether the OCF to this driver session limit has
+  been disabled*/
+#define NO_OCF_TO_DRV_MAX_SESSIONS		(0)
+
+/*OCF values mapped here*/
+#define ICP_SHA1_DIGEST_SIZE_IN_BYTES 		(SHA1_HASH_LEN)
+#define ICP_SHA256_DIGEST_SIZE_IN_BYTES 	(SHA2_256_HASH_LEN)
+#define ICP_SHA384_DIGEST_SIZE_IN_BYTES 	(SHA2_384_HASH_LEN)
+#define ICP_SHA512_DIGEST_SIZE_IN_BYTES 	(SHA2_512_HASH_LEN)
+#define ICP_MD5_DIGEST_SIZE_IN_BYTES 		(MD5_HASH_LEN)
+#define ARC4_COUNTER_LEN 			(ARC4_BLOCK_LEN)
+
+#define OCF_REGISTRATION_STATUS_SUCCESS 	(0)
+#define OCF_ZERO_FUNCTIONALITY_REGISTERED 	(0)
+#define ICP_OCF_DRV_NO_CRYPTO_PROCESS_ERROR 	(0)
+#define ICP_OCF_DRV_STATUS_SUCCESS 		(0)
+#define ICP_OCF_DRV_STATUS_FAIL 		(1)
+
+/*Turn on/off debug options*/
+#define ICP_OCF_PRINT_DEBUG_MESSAGES		(0)
+#define ICP_OCF_PRINT_KERN_ALERT		(1)
+#define ICP_OCF_PRINT_KERN_ERRS			(1)
+
+#if ICP_OCF_PRINT_DEBUG_MESSAGES == 1
+#define DPRINTK(args...)      \
+{			      \
+                ICP_IPRINTK(args); \
+}
+
+#else				//ICP_OCF_PRINT_DEBUG_MESSAGES == 1
+
+#define DPRINTK(args...)
+
+#endif				//ICP_OCF_PRINT_DEBUG_MESSAGES == 1
+
+#if ICP_OCF_PRINT_KERN_ALERT == 1
+#define APRINTK(args...)      						\
+{			      						\
+       ICP_APRINTK(args);						\
+}
+
+#else				//ICP_OCF_PRINT_KERN_ALERT == 1
+
+#define APRINTK(args...)
+
+#endif				//ICP_OCF_PRINT_KERN_ALERT == 1
+
+#if ICP_OCF_PRINT_KERN_ERRS == 1
+#define EPRINTK(args...)      \
+{			      \
+       ICP_EPRINTK(args); \
+}
+
+#else				//ICP_OCF_PRINT_KERN_ERRS == 1
+
+#define EPRINTK(args...)
+
+#endif				//ICP_OCF_PRINT_KERN_ERRS == 1
+
+#define IPRINTK(args...)      \
+{			      \
+      ICP_IPRINTK(args); \
+}
+
+/*DSA Prime Q size in bytes (as defined in the standard) */
+#define DSA_RS_SIGN_PRIMEQ_SIZE_IN_BYTES	(20)
+
+#define BITS_TO_BYTES(bytes, bits) 					\
+	bytes = (bits + NUM_BITS_IN_BYTE_MINUS_ONE) / NUM_BITS_IN_BYTE
+
+typedef enum {
+	ICP_OCF_DRV_ALG_CIPHER = 0,
+	ICP_OCF_DRV_ALG_HASH
+} icp_ocf_drv_alg_type_t;
+
+typedef ICP_LIST_HEAD(icp_drvSessionListHead_s,
+		      icp_drvSessionData) icp_drvSessionListHead_t;
+
+/*Values used to derisk chances of performs being called against
+deregistered sessions (for which the slab page has been reclaimed)
+This is not a fix - since page frames are reclaimed from a slab, one cannot
+rely on that memory not being re-used by another app.*/
+typedef enum {
+	ICP_SESSION_INITIALISED = 0x5C5C5C,
+	ICP_SESSION_RUNNING = 0x005C00,
+	ICP_SESSION_DEREGISTERED = 0xC5C5C5
+} usage_derisk;
+
+/* This struct is required for deferred session
+ deregistration as a work queue function can
+ only have one argument*/
+struct icp_ocfDrvFreeLacSession {
+	CpaCySymSessionCtx sessionToDeregister;
+	icp_workstruct work;
+};
+
+/*
+This is the OCF<->OCF_DRV session object:
+
+1.listNode
+  The first member is a listNode. These session objects are added to a linked
+  list in order to make it easier to remove them all at session exit time.
+
+2.inUse
+  The second member is used to give the session object state and derisk the
+  possibility of OCF batch calls executing against a deregistered session (as
+  described above).
+
+3.sessHandle
+  The third member is a LAC<->OCF_DRV session handle (initialised with the first
+  perform request for that session).
+
+4.lacSessCtx
+  The fourth is the LAC session context. All the parameters for this structure
+  are only known when the first perform request for this session occurs. That is
+  why the OCF EP80579 Driver only registers a new LAC session at perform time
+*/
+struct icp_drvSessionData {
+	ICP_LIST_ENTRY(icp_drvSessionData) listNode;
+	usage_derisk inUse;
+	CpaCySymSessionCtx sessHandle;
+	CpaCySymSessionSetupData lacSessCtx;
+};
+
+/* These are all defined in icp_common.c */
+extern icp_atomic_t lac_session_failed_dereg_count;
+extern icp_atomic_t icp_ocfDrvIsExiting;
+extern icp_atomic_t num_ocf_to_drv_registered_sessions;
+
+extern int32_t icp_ocfDrvDriverId;
+
+extern icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead;
+extern icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead_FreeMemList;
+extern icp_workqueue *icp_ocfDrvFreeLacSessionWorkQ;
+extern icp_spinlock_t icp_ocfDrvSymSessInfoListSpinlock;
+
+/*Slab zones for symettric functionality, instantiated in icp_common.c*/
+extern icp_kmem_cache drvSessionData_zone;
+extern icp_kmem_cache drvOpData_zone;
+
+/*Slabs zones for asymettric functionality, instantiated in icp_common.c*/
+extern icp_kmem_cache drvDH_zone;
+extern icp_kmem_cache drvLnModExp_zone;
+extern icp_kmem_cache drvRSADecrypt_zone;
+extern icp_kmem_cache drvRSAPrivateKey_zone;
+extern icp_kmem_cache drvDSARSSign_zone;
+extern icp_kmem_cache drvDSARSSignKValue_zone;
+extern icp_kmem_cache drvDSAVerify_zone;
+
+/* Module parameters defined in icp_cpmmon.c*/
+
+/* Module parameters - gives the number of times LAC deregistration shall be
+   re-tried */
+extern int num_dereg_retries;
+
+/* Module parameter - gives the delay time in jiffies before a LAC session 
+   shall be attempted to be deregistered again */
+extern int dereg_retry_delay_in_jiffies;
+
+/* Module parameter - gives the maximum number of sessions possible between
+   OCF and the OCF EP80579 Driver. If set to zero, there is no limit.*/
+extern int max_sessions;
+
+/*Slab zones for flatbuffers and bufferlist*/
+extern icp_kmem_cache drvFlatBuffer_zone;
+
+#define ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS     (16)
+
+struct icp_drvBuffListInfo {
+	Cpa16U numBuffers;
+	Cpa32U metaSize;
+	Cpa32U metaOffset;
+	Cpa32U buffListSize;
+};
+
+extern struct icp_drvBuffListInfo defBuffListInfo;
+
+/* This struct is used to keep a reference to the relevant node in the list
+   of sessionData structs, to the buffer type required by OCF and to the OCF
+   provided crp struct that needs to be returned. All this info is needed in
+   the callback function.*/
+struct icp_drvOpData {
+	CpaCySymOpData lacOpData;
+	uint32_t digestSizeInBytes;
+	struct cryptop *crp;
+	uint8_t bufferType;
+	uint8_t ivData[MAX_IV_LEN_IN_BYTES];
+	uint16_t numBufferListArray;
+	CpaBufferList srcBuffer;
+	CpaFlatBuffer bufferListArray[ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS];
+	CpaBoolean verifyResult;
+};
+
+/* Create a new session between OCF and this driver*/
+int icp_ocfDrvNewSession(icp_device_t dev, uint32_t * sild,
+			 struct cryptoini *cri);
+
+/* Free a session between this driver and the Quick Assist Framework*/
+int icp_ocfDrvFreeLACSession(icp_device_t dev, uint64_t sid);
+
+/* Defer freeing a Quick Assist session*/
+void icp_ocfDrvDeferedFreeLacSessionProcess(void *arg);
+
+/* Process OCF cryptographic request for a symmetric algorithm*/
+int icp_ocfDrvSymProcess(icp_device_t dev, struct cryptop *crp, int hint);
+
+/* Process OCF cryptographic request for an asymmetric algorithm*/
+int icp_ocfDrvPkeProcess(icp_device_t dev, struct cryptkop *krp, int hint);
+
+/* Populate a buffer with random data*/
+int icp_ocfDrvReadRandom(void *arg, uint32_t * buf, int maxwords);
+
+/* Retry Quick Assist session deregistration*/
+int icp_ocfDrvDeregRetry(CpaCySymSessionCtx sessionToDeregister);
+
+/* Convert an OS scatter gather list to a CPA buffer list*/
+int icp_ocfDrvPacketBuffToBufferList(icp_packet_buffer_t * pPacketBuffer,
+				     CpaBufferList * bufferList);
+
+/* Convert a CPA buffer list to an OS scatter gather list*/
+int icp_ocfDrvBufferListToPacketBuff(CpaBufferList * bufferList,
+				     icp_packet_buffer_t ** pPacketBuffer);
+
+/* Get the number of buffers in an OS scatter gather list*/
+uint16_t icp_ocfDrvGetPacketBuffFrags(icp_packet_buffer_t * pPacketBuffer);
+
+/* Convert a single OS buffer to a CPA Flat Buffer*/
+void icp_ocfDrvSinglePacketBuffToFlatBuffer(icp_packet_buffer_t * pPacketBuffer,
+					    CpaFlatBuffer * pFlatBuffer);
+
+/* Add pointer and length to a CPA Flat Buffer structure*/
+void icp_ocfDrvPtrAndLenToFlatBuffer(void *pData, uint32_t len,
+				     CpaFlatBuffer * pFlatBuffer);
+
+/* Convert pointer and length values to a CPA buffer list*/
+void icp_ocfDrvPtrAndLenToBufferList(void *pDataIn, uint32_t length,
+				     CpaBufferList * pBufferList);
+
+/* Convert a CPA buffer list to pointer and length values*/
+void icp_ocfDrvBufferListToPtrAndLen(CpaBufferList * pBufferList,
+				     void **ppDataOut, uint32_t * pLength);
+
+/* Set the number of flat buffers in bufferlist and the size of memory
+   to allocate for the pPrivateMetaData member of the CpaBufferList.*/
+int icp_ocfDrvBufferListMemInfo(uint16_t numBuffers,
+				struct icp_drvBuffListInfo *buffListInfo);
+
+/* Find pointer position of the digest within an OS scatter gather list*/
+uint8_t *icp_ocfDrvPacketBufferDigestPointerFind(struct icp_drvOpData
+						 *drvOpData,
+						 int offsetInBytes,
+						 uint32_t digestSizeInBytes);
+
+/*This top level function is used to find a pointer to where a digest is 
+  stored/needs to be inserted. */
+uint8_t *icp_ocfDrvDigestPointerFind(struct icp_drvOpData *drvOpData,
+				     struct cryptodesc *crp_desc);
+
+/* Free a CPA flat buffer*/
+void icp_ocfDrvFreeFlatBuffer(CpaFlatBuffer * pFlatBuffer);
+
+/* This function will allocate memory for the pPrivateMetaData
+   member of CpaBufferList. */
+int icp_ocfDrvAllocMetaData(CpaBufferList * pBufferList,
+			    struct icp_drvOpData *pOpData);
+
+/* Free data allocated for the pPrivateMetaData
+   member of CpaBufferList.*/
+void icp_ocfDrvFreeMetaData(CpaBufferList * pBufferList);
+
+#define ICP_CACHE_CREATE(cache_ID, cache_name) \
+	icp_kmem_cache_create(cache_ID, sizeof(cache_name),ICP_KERNEL_CACHE_ALIGN,\
+	ICP_KERNEL_CACHE_NOINIT)
+
+#define ICP_CACHE_FREE(args...) \
+	icp_kmem_cache_free (args)
+
+#define ICP_CACHE_DESTROY(slab_zone)\
+{\
+        if(NULL != slab_zone){\
+                icp_kmem_cache_destroy(slab_zone);\
+                slab_zone = NULL;\
+        }\
+}
+
+#endif
+/* ICP_OCF_H_ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_sym.c b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_sym.c
new file mode 100644
index 00000000..e1c71484
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ep80579/icp_sym.c
@@ -0,0 +1,1153 @@
+/***************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or 
+ *   redistributing this file, you may do so under either license.
+ * 
+ *   GPL LICENSE SUMMARY
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ * 
+ *   This program is free software; you can redistribute it and/or modify 
+ *   it under the terms of version 2 of the GNU General Public License as
+ *   published by the Free Software Foundation.
+ * 
+ *   This program is distributed in the hope that 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *   The full GNU General Public License is included in this distribution 
+ *   in the file called LICENSE.GPL.
+ * 
+ *   Contact Information:
+ *   Intel Corporation
+ * 
+ *   BSD LICENSE 
+ * 
+ *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ * 
+ *   Redistribution and use in source and binary forms, with or without 
+ *   modification, are permitted provided that the following conditions 
+ *   are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright 
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright 
+ *       notice, this list of conditions and the following disclaimer in 
+ *       the documentation and/or other materials provided with the 
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its 
+ *       contributors may be used to endorse or promote products derived 
+ *       from this software without specific prior written permission.
+ * 
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * 
+ *  version: Security.L.1.0.2-229
+ *
+ ***************************************************************************/
+/*
+ * An OCF module that uses the API for Intel® QuickAssist Technology to do the
+ * cryptography.
+ *
+ * This driver requires the ICP Access Library that is available from Intel in
+ * order to operate.
+ */
+
+#include "icp_ocf.h"
+
+/*This is the call back function for all symmetric cryptographic processes.
+  Its main functionality is to free driver crypto operation structure and to 
+  call back to OCF*/
+static void
+icp_ocfDrvSymCallBack(void *callbackTag,
+		      CpaStatus status,
+		      const CpaCySymOp operationType,
+		      void *pOpData,
+		      CpaBufferList * pDstBuffer, CpaBoolean verifyResult);
+
+/*This function is used to extract crypto processing information from the OCF
+  inputs, so as that it may be passed onto LAC*/
+static int
+icp_ocfDrvProcessDataSetup(struct icp_drvOpData *drvOpData,
+			   struct cryptodesc *crp_desc);
+
+/*This function checks whether the crp_desc argument pertains to a digest or a
+  cipher operation*/
+static int icp_ocfDrvAlgCheck(struct cryptodesc *crp_desc);
+
+/*This function copies all the passed in session context information and stores
+  it in a LAC context structure*/
+static int
+icp_ocfDrvAlgorithmSetup(struct cryptoini *cri,
+			 CpaCySymSessionSetupData * lacSessCtx);
+
+/*This function is used to free an OCF->OCF_DRV session object*/
+static void icp_ocfDrvFreeOCFSession(struct icp_drvSessionData *sessionData);
+
+/*max IOV buffs supported in a UIO structure*/
+#define NUM_IOV_SUPPORTED		(1)
+
+/* Name        : icp_ocfDrvSymCallBack
+ *
+ * Description : When this function returns it signifies that the LAC
+ * component has completed the relevant symmetric operation. 
+ *
+ * Notes : The callbackTag is a pointer to an icp_drvOpData. This memory
+ * object was passed to LAC for the cryptographic processing and contains all
+ * the relevant information for cleaning up buffer handles etc. so that the
+ * OCF EP80579 Driver portion of this crypto operation can be fully completed.
+ */
+static void
+icp_ocfDrvSymCallBack(void *callbackTag,
+		      CpaStatus status,
+		      const CpaCySymOp operationType,
+		      void *pOpData,
+		      CpaBufferList * pDstBuffer, CpaBoolean verifyResult)
+{
+	struct cryptop *crp = NULL;
+	struct icp_drvOpData *temp_drvOpData =
+	    (struct icp_drvOpData *)callbackTag;
+	uint64_t *tempBasePtr = NULL;
+	uint32_t tempLen = 0;
+
+	if (NULL == temp_drvOpData) {
+		DPRINTK("%s(): The callback from the LAC component"
+			" has failed due to Null userOpaque data"
+			"(status == %d).\n", __FUNCTION__, status);
+		DPRINTK("%s(): Unable to call OCF back! \n", __FUNCTION__);
+		return;
+	}
+
+	crp = temp_drvOpData->crp;
+	crp->crp_etype = ICP_OCF_DRV_NO_CRYPTO_PROCESS_ERROR;
+
+	if (NULL == pOpData) {
+		DPRINTK("%s(): The callback from the LAC component"
+			" has failed due to Null Symmetric Op data"
+			"(status == %d).\n", __FUNCTION__, status);
+		crp->crp_etype = ECANCELED;
+		crypto_done(crp);
+		return;
+	}
+
+	if (NULL == pDstBuffer) {
+		DPRINTK("%s(): The callback from the LAC component"
+			" has failed due to Null Dst Bufferlist data"
+			"(status == %d).\n", __FUNCTION__, status);
+		crp->crp_etype = ECANCELED;
+		crypto_done(crp);
+		return;
+	}
+
+	if (CPA_STATUS_SUCCESS == status) {
+
+		if (temp_drvOpData->bufferType == ICP_CRYPTO_F_PACKET_BUF) {
+			if (ICP_OCF_DRV_STATUS_SUCCESS !=
+			    icp_ocfDrvBufferListToPacketBuff(pDstBuffer,
+							     (icp_packet_buffer_t
+							      **)
+							     & (crp->crp_buf))) {
+				EPRINTK("%s(): BufferList to SkBuff "
+					"conversion error.\n", __FUNCTION__);
+				crp->crp_etype = EPERM;
+			}
+		} else {
+			icp_ocfDrvBufferListToPtrAndLen(pDstBuffer,
+							(void **)&tempBasePtr,
+							&tempLen);
+			crp->crp_olen = (int)tempLen;
+		}
+
+	} else {
+		DPRINTK("%s(): The callback from the LAC component has failed"
+			"(status == %d).\n", __FUNCTION__, status);
+
+		crp->crp_etype = ECANCELED;
+	}
+
+	if (temp_drvOpData->numBufferListArray >
+	    ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) {
+		icp_kfree(pDstBuffer->pBuffers);
+	}
+	icp_ocfDrvFreeMetaData(pDstBuffer);
+	ICP_CACHE_FREE(drvOpData_zone, temp_drvOpData);
+
+	/* Invoke the OCF callback function */
+	crypto_done(crp);
+
+	return;
+}
+
+/* Name        : icp_ocfDrvNewSession 
+ *
+ * Description : This function will create a new Driver<->OCF session
+ *
+ * Notes : LAC session registration happens during the first perform call.
+ * That is the first time we know all information about a given session.
+ */
+int icp_ocfDrvNewSession(icp_device_t dev, uint32_t * sid,
+			 struct cryptoini *cri)
+{
+	struct icp_drvSessionData *sessionData = NULL;
+	uint32_t delete_session = 0;
+
+	/* The SID passed in should be our driver ID. We can return the     */
+	/* local ID (LID) which is a unique identifier which we can use     */
+	/* to differentiate between the encrypt/decrypt LAC session handles */
+	if (NULL == sid) {
+		EPRINTK("%s(): Invalid input parameters - NULL sid.\n",
+			__FUNCTION__);
+		return EINVAL;
+	}
+
+	if (NULL == cri) {
+		EPRINTK("%s(): Invalid input parameters - NULL cryptoini.\n",
+			__FUNCTION__);
+		return EINVAL;
+	}
+
+	if (icp_ocfDrvDriverId != *sid) {
+		EPRINTK("%s(): Invalid input parameters - bad driver ID\n",
+			__FUNCTION__);
+		EPRINTK("\t sid = 0x08%p \n \t cri = 0x08%p \n", sid, cri);
+		return EINVAL;
+	}
+
+	sessionData = icp_kmem_cache_zalloc(drvSessionData_zone, ICP_M_NOWAIT);
+	if (NULL == sessionData) {
+		DPRINTK("%s():No memory for Session Data\n", __FUNCTION__);
+		return ENOMEM;
+	}
+
+	/*ENTER CRITICAL SECTION */
+	icp_spin_lockbh_lock(&icp_ocfDrvSymSessInfoListSpinlock);
+	/*put this check in the spinlock so no new sessions can be added to the
+	   linked list when we are exiting */
+	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
+		delete_session++;
+
+	} else if (NO_OCF_TO_DRV_MAX_SESSIONS != max_sessions) {
+		if (icp_atomic_read(&num_ocf_to_drv_registered_sessions) >=
+		    (max_sessions -
+		     icp_atomic_read(&lac_session_failed_dereg_count))) {
+			delete_session++;
+		} else {
+			icp_atomic_inc(&num_ocf_to_drv_registered_sessions);
+			/* Add to session data linked list */
+			ICP_LIST_ADD(sessionData, &icp_ocfDrvGlobalSymListHead,
+				     listNode);
+		}
+
+	} else if (NO_OCF_TO_DRV_MAX_SESSIONS == max_sessions) {
+		ICP_LIST_ADD(sessionData, &icp_ocfDrvGlobalSymListHead,
+			     listNode);
+	}
+
+	sessionData->inUse = ICP_SESSION_INITIALISED;
+
+	/*EXIT CRITICAL SECTION */
+	icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
+
+	if (delete_session) {
+		DPRINTK("%s():No Session handles available\n", __FUNCTION__);
+		ICP_CACHE_FREE(drvSessionData_zone, sessionData);
+		return EPERM;
+	}
+
+	if (ICP_OCF_DRV_STATUS_SUCCESS !=
+	    icp_ocfDrvAlgorithmSetup(cri, &(sessionData->lacSessCtx))) {
+		DPRINTK("%s():algorithm not supported\n", __FUNCTION__);
+		icp_ocfDrvFreeOCFSession(sessionData);
+		return EINVAL;
+	}
+
+	if (cri->cri_next) {
+		if (cri->cri_next->cri_next != NULL) {
+			DPRINTK("%s():only two chained algorithms supported\n",
+				__FUNCTION__);
+			icp_ocfDrvFreeOCFSession(sessionData);
+			return EPERM;
+		}
+
+		if (ICP_OCF_DRV_STATUS_SUCCESS !=
+		    icp_ocfDrvAlgorithmSetup(cri->cri_next,
+					     &(sessionData->lacSessCtx))) {
+			DPRINTK("%s():second algorithm not supported\n",
+				__FUNCTION__);
+			icp_ocfDrvFreeOCFSession(sessionData);
+			return EINVAL;
+		}
+
+		sessionData->lacSessCtx.symOperation =
+		    CPA_CY_SYM_OP_ALGORITHM_CHAINING;
+	}
+
+	*sid = (uint32_t) sessionData;
+
+	return ICP_OCF_DRV_STATUS_SUCCESS;
+}
+
+/* Name        : icp_ocfDrvAlgorithmSetup
+ *
+ * Description : This function builds the session context data from the
+ * information supplied through OCF. Algorithm chain order and whether the
+ * session is Encrypt/Decrypt can only be found out at perform time however, so
+ * the session is registered with LAC at that time.
+ */
+static int
+icp_ocfDrvAlgorithmSetup(struct cryptoini *cri,
+			 CpaCySymSessionSetupData * lacSessCtx)
+{
+
+	lacSessCtx->sessionPriority = CPA_CY_PRIORITY_NORMAL;
+
+	switch (cri->cri_alg) {
+
+	case CRYPTO_NULL_CBC:
+		DPRINTK("%s(): NULL CBC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
+		lacSessCtx->cipherSetupData.cipherAlgorithm =
+		    CPA_CY_SYM_CIPHER_NULL;
+		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
+		break;
+
+	case CRYPTO_DES_CBC:
+		DPRINTK("%s(): DES CBC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
+		lacSessCtx->cipherSetupData.cipherAlgorithm =
+		    CPA_CY_SYM_CIPHER_DES_CBC;
+		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
+		break;
+
+	case CRYPTO_3DES_CBC:
+		DPRINTK("%s(): 3DES CBC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
+		lacSessCtx->cipherSetupData.cipherAlgorithm =
+		    CPA_CY_SYM_CIPHER_3DES_CBC;
+		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
+		break;
+
+	case CRYPTO_AES_CBC:
+		DPRINTK("%s(): AES CBC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
+		lacSessCtx->cipherSetupData.cipherAlgorithm =
+		    CPA_CY_SYM_CIPHER_AES_CBC;
+		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
+		break;
+
+	case CRYPTO_ARC4:
+		DPRINTK("%s(): ARC4\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
+		lacSessCtx->cipherSetupData.cipherAlgorithm =
+		    CPA_CY_SYM_CIPHER_ARC4;
+		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
+		break;
+
+	case CRYPTO_SHA1:
+		DPRINTK("%s(): SHA1\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_SHA1;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA1_DIGEST_SIZE_IN_BYTES);
+
+		break;
+
+	case CRYPTO_SHA1_HMAC:
+		DPRINTK("%s(): SHA1_HMAC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_SHA1;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA1_DIGEST_SIZE_IN_BYTES);
+		lacSessCtx->hashSetupData.authModeSetupData.authKey =
+		    cri->cri_key;
+		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
+
+		break;
+
+	case CRYPTO_SHA2_256:
+		DPRINTK("%s(): SHA256\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm =
+		    CPA_CY_SYM_HASH_SHA256;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA256_DIGEST_SIZE_IN_BYTES);
+
+		break;
+
+	case CRYPTO_SHA2_256_HMAC:
+		DPRINTK("%s(): SHA256_HMAC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm =
+		    CPA_CY_SYM_HASH_SHA256;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA256_DIGEST_SIZE_IN_BYTES);
+		lacSessCtx->hashSetupData.authModeSetupData.authKey =
+		    cri->cri_key;
+		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
+
+		break;
+
+	case CRYPTO_SHA2_384:
+		DPRINTK("%s(): SHA384\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm =
+		    CPA_CY_SYM_HASH_SHA384;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA384_DIGEST_SIZE_IN_BYTES);
+
+		break;
+
+	case CRYPTO_SHA2_384_HMAC:
+		DPRINTK("%s(): SHA384_HMAC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm =
+		    CPA_CY_SYM_HASH_SHA384;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA384_DIGEST_SIZE_IN_BYTES);
+		lacSessCtx->hashSetupData.authModeSetupData.authKey =
+		    cri->cri_key;
+		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
+
+		break;
+
+	case CRYPTO_SHA2_512:
+		DPRINTK("%s(): SHA512\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm =
+		    CPA_CY_SYM_HASH_SHA512;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA512_DIGEST_SIZE_IN_BYTES);
+
+		break;
+
+	case CRYPTO_SHA2_512_HMAC:
+		DPRINTK("%s(): SHA512_HMAC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm =
+		    CPA_CY_SYM_HASH_SHA512;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_SHA512_DIGEST_SIZE_IN_BYTES);
+		lacSessCtx->hashSetupData.authModeSetupData.authKey =
+		    cri->cri_key;
+		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
+
+		break;
+
+	case CRYPTO_MD5:
+		DPRINTK("%s(): MD5\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_MD5;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_MD5_DIGEST_SIZE_IN_BYTES);
+
+		break;
+
+	case CRYPTO_MD5_HMAC:
+		DPRINTK("%s(): MD5_HMAC\n", __FUNCTION__);
+		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
+		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_MD5;
+		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
+		lacSessCtx->hashSetupData.digestResultLenInBytes =
+		    (cri->cri_mlen ?
+		     cri->cri_mlen : ICP_MD5_DIGEST_SIZE_IN_BYTES);
+		lacSessCtx->hashSetupData.authModeSetupData.authKey =
+		    cri->cri_key;
+		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
+		    cri->cri_klen / NUM_BITS_IN_BYTE;
+		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
+
+		break;
+
+	default:
+		DPRINTK("%s(): ALG Setup FAIL\n", __FUNCTION__);
+		return ICP_OCF_DRV_STATUS_FAIL;
+	}
+
+	return ICP_OCF_DRV_STATUS_SUCCESS;
+}
+
+/* Name        : icp_ocfDrvFreeOCFSession
+ *
+ * Description : This function deletes all existing Session data representing
+ * the Cryptographic session established between OCF and this driver. This
+ * also includes freeing the memory allocated for the session context. The
+ * session object is also removed from the session linked list.
+ */
+static void icp_ocfDrvFreeOCFSession(struct icp_drvSessionData *sessionData)
+{
+
+	sessionData->inUse = ICP_SESSION_DEREGISTERED;
+
+	/*ENTER CRITICAL SECTION */
+	icp_spin_lockbh_lock(&icp_ocfDrvSymSessInfoListSpinlock);
+
+	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
+		/*If the Driver is exiting, allow that process to
+		   handle any deletions */
+		/*EXIT CRITICAL SECTION */
+		icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
+		return;
+	}
+
+	icp_atomic_dec(&num_ocf_to_drv_registered_sessions);
+
+	ICP_LIST_DEL(sessionData, listNode);
+
+	/*EXIT CRITICAL SECTION */
+	icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
+
+	if (NULL != sessionData->sessHandle) {
+		icp_kfree(sessionData->sessHandle);
+	}
+	ICP_CACHE_FREE(drvSessionData_zone, sessionData);
+}
+
+/* Name        : icp_ocfDrvFreeLACSession
+ *
+ * Description : This attempts to deregister a LAC session. If it fails, the
+ * deregistation retry function is called.
+ */
+int icp_ocfDrvFreeLACSession(icp_device_t dev, uint64_t sid)
+{
+	CpaCySymSessionCtx sessionToDeregister = NULL;
+	struct icp_drvSessionData *sessionData = NULL;
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	int retval = 0;
+
+	sessionData = (struct icp_drvSessionData *)CRYPTO_SESID2LID(sid);
+	if (NULL == sessionData) {
+		EPRINTK("%s(): OCF Free session called with Null Session ID.\n",
+			__FUNCTION__);
+		return EINVAL;
+	}
+
+	sessionToDeregister = sessionData->sessHandle;
+
+	if ((ICP_SESSION_INITIALISED != sessionData->inUse) &&
+	    (ICP_SESSION_RUNNING != sessionData->inUse) &&
+	    (ICP_SESSION_DEREGISTERED != sessionData->inUse)) {
+		DPRINTK("%s() Session not initialised.\n", __FUNCTION__);
+		return EINVAL;
+	}
+
+	if (ICP_SESSION_RUNNING == sessionData->inUse) {
+		lacStatus = cpaCySymRemoveSession(CPA_INSTANCE_HANDLE_SINGLE,
+						  sessionToDeregister);
+		if (CPA_STATUS_RETRY == lacStatus) {
+			if (ICP_OCF_DRV_STATUS_SUCCESS !=
+			    icp_ocfDrvDeregRetry(&sessionToDeregister)) {
+				/* the retry function increments the 
+				   dereg failed count */
+				DPRINTK("%s(): LAC failed to deregister the "
+					"session. (localSessionId= %p)\n",
+					__FUNCTION__, sessionToDeregister);
+				retval = EPERM;
+			}
+
+		} else if (CPA_STATUS_SUCCESS != lacStatus) {
+			DPRINTK("%s(): LAC failed to deregister the session. "
+				"localSessionId= %p, lacStatus = %d\n",
+				__FUNCTION__, sessionToDeregister, lacStatus);
+			icp_atomic_inc(&lac_session_failed_dereg_count);
+			retval = EPERM;
+		}
+	} else {
+		DPRINTK("%s() Session not registered with LAC.\n",
+			__FUNCTION__);
+	}
+
+	icp_ocfDrvFreeOCFSession(sessionData);
+	return retval;
+
+}
+
+/* Name        : icp_ocfDrvAlgCheck 
+ *
+ * Description : This function checks whether the cryptodesc argument pertains
+ * to a sym or hash function
+ */
+static int icp_ocfDrvAlgCheck(struct cryptodesc *crp_desc)
+{
+
+	if (crp_desc->crd_alg == CRYPTO_3DES_CBC ||
+	    crp_desc->crd_alg == CRYPTO_AES_CBC ||
+	    crp_desc->crd_alg == CRYPTO_DES_CBC ||
+	    crp_desc->crd_alg == CRYPTO_NULL_CBC ||
+	    crp_desc->crd_alg == CRYPTO_ARC4) {
+		return ICP_OCF_DRV_ALG_CIPHER;
+	}
+
+	return ICP_OCF_DRV_ALG_HASH;
+}
+
+/* Name        : icp_ocfDrvSymProcess 
+ *
+ * Description : This function will map symmetric functionality calls from OCF
+ * to the LAC API. It will also allocate memory to store the session context.
+ * 
+ * Notes: If it is the first perform call for a given session, then a LAC
+ * session is registered. After the session is registered, no checks as
+ * to whether session paramaters have changed (e.g. alg chain order) are
+ * done.
+ */
+int icp_ocfDrvSymProcess(icp_device_t dev, struct cryptop *crp, int hint)
+{
+	struct icp_drvSessionData *sessionData = NULL;
+	struct icp_drvOpData *drvOpData = NULL;
+	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
+	Cpa32U sessionCtxSizeInBytes = 0;
+
+	if (NULL == crp) {
+		DPRINTK("%s(): Invalid input parameters, cryptop is NULL\n",
+			__FUNCTION__);
+		return EINVAL;
+	}
+
+	if (NULL == crp->crp_desc) {
+		DPRINTK("%s(): Invalid input parameters, no crp_desc attached "
+			"to crp\n", __FUNCTION__);
+		crp->crp_etype = EINVAL;
+		return EINVAL;
+	}
+
+	if (NULL == crp->crp_buf) {
+		DPRINTK("%s(): Invalid input parameters, no buffer attached "
+			"to crp\n", __FUNCTION__);
+		crp->crp_etype = EINVAL;
+		return EINVAL;
+	}
+
+	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
+		crp->crp_etype = EFAULT;
+		return EFAULT;
+	}
+
+	sessionData = (struct icp_drvSessionData *)
+	    (CRYPTO_SESID2LID(crp->crp_sid));
+	if (NULL == sessionData) {
+		DPRINTK("%s(): Invalid input parameters, Null Session ID \n",
+			__FUNCTION__);
+		crp->crp_etype = EINVAL;
+		return EINVAL;
+	}
+
+/*If we get a request against a deregisted session, cancel operation*/
+	if (ICP_SESSION_DEREGISTERED == sessionData->inUse) {
+		DPRINTK("%s(): Session ID %d was deregistered \n",
+			__FUNCTION__, (int)(CRYPTO_SESID2LID(crp->crp_sid)));
+		crp->crp_etype = EFAULT;
+		return EFAULT;
+	}
+
+/*If none of the session states are set, then the session structure was either
+  not initialised properly or we are reading from a freed memory area (possible
+  due to OCF batch mode not removing queued requests against deregistered 
+  sessions*/
+	if (ICP_SESSION_INITIALISED != sessionData->inUse &&
+	    ICP_SESSION_RUNNING != sessionData->inUse) {
+		DPRINTK("%s(): Session - ID %d - not properly initialised or "
+			"memory freed back to the kernel \n",
+			__FUNCTION__, (int)(CRYPTO_SESID2LID(crp->crp_sid)));
+		crp->crp_etype = EINVAL;
+		return EINVAL;
+	}
+
+	/*For the below checks, remember error checking is already done in LAC.
+	   We're not validating inputs subsequent to registration */
+	if (sessionData->inUse == ICP_SESSION_INITIALISED) {
+		DPRINTK("%s(): Initialising session\n", __FUNCTION__);
+
+		if (NULL != crp->crp_desc->crd_next) {
+			if (ICP_OCF_DRV_ALG_CIPHER ==
+			    icp_ocfDrvAlgCheck(crp->crp_desc)) {
+
+				sessionData->lacSessCtx.algChainOrder =
+				    CPA_CY_SYM_ALG_CHAIN_ORDER_CIPHER_THEN_HASH;
+
+				if (crp->crp_desc->crd_flags & CRD_F_ENCRYPT) {
+					sessionData->lacSessCtx.cipherSetupData.
+					    cipherDirection =
+					    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
+				} else {
+					sessionData->lacSessCtx.cipherSetupData.
+					    cipherDirection =
+					    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
+				}
+			} else {
+				sessionData->lacSessCtx.algChainOrder =
+				    CPA_CY_SYM_ALG_CHAIN_ORDER_HASH_THEN_CIPHER;
+
+				if (crp->crp_desc->crd_next->crd_flags &
+				    CRD_F_ENCRYPT) {
+					sessionData->lacSessCtx.cipherSetupData.
+					    cipherDirection =
+					    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
+				} else {
+					sessionData->lacSessCtx.cipherSetupData.
+					    cipherDirection =
+					    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
+				}
+
+			}
+
+		} else if (ICP_OCF_DRV_ALG_CIPHER ==
+			   icp_ocfDrvAlgCheck(crp->crp_desc)) {
+			if (crp->crp_desc->crd_flags & CRD_F_ENCRYPT) {
+				sessionData->lacSessCtx.cipherSetupData.
+				    cipherDirection =
+				    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
+			} else {
+				sessionData->lacSessCtx.cipherSetupData.
+				    cipherDirection =
+				    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
+			}
+
+		}
+
+		/*No action required for standalone Auth here */
+
+		/* Allocate memory for SymSessionCtx before the Session Registration */
+		lacStatus =
+		    cpaCySymSessionCtxGetSize(CPA_INSTANCE_HANDLE_SINGLE,
+					      &(sessionData->lacSessCtx),
+					      &sessionCtxSizeInBytes);
+		if (CPA_STATUS_SUCCESS != lacStatus) {
+			EPRINTK("%s(): cpaCySymSessionCtxGetSize failed - %d\n",
+				__FUNCTION__, lacStatus);
+			crp->crp_etype = EINVAL;
+			return EINVAL;
+		}
+		sessionData->sessHandle =
+		    icp_kmalloc(sessionCtxSizeInBytes, ICP_M_NOWAIT);
+		if (NULL == sessionData->sessHandle) {
+			EPRINTK
+			    ("%s(): Failed to get memory for SymSessionCtx\n",
+			     __FUNCTION__);
+			crp->crp_etype = ENOMEM;
+			return ENOMEM;
+		}
+
+		lacStatus = cpaCySymInitSession(CPA_INSTANCE_HANDLE_SINGLE,
+						icp_ocfDrvSymCallBack,
+						&(sessionData->lacSessCtx),
+						sessionData->sessHandle);
+
+		if (CPA_STATUS_SUCCESS != lacStatus) {
+			EPRINTK("%s(): cpaCySymInitSession failed -%d \n",
+				__FUNCTION__, lacStatus);
+			crp->crp_etype = EFAULT;
+			return EFAULT;
+		}
+
+		sessionData->inUse = ICP_SESSION_RUNNING;
+	}
+
+	drvOpData = icp_kmem_cache_zalloc(drvOpData_zone, ICP_M_NOWAIT);
+	if (NULL == drvOpData) {
+		EPRINTK("%s():Failed to get memory for drvOpData\n",
+			__FUNCTION__);
+		crp->crp_etype = ENOMEM;
+		return ENOMEM;
+	}
+
+	drvOpData->lacOpData.pSessionCtx = sessionData->sessHandle;
+	drvOpData->digestSizeInBytes = sessionData->lacSessCtx.hashSetupData.
+	    digestResultLenInBytes;
+	drvOpData->crp = crp;
+
+	/* Set the default buffer list array memory allocation */
+	drvOpData->srcBuffer.pBuffers = drvOpData->bufferListArray;
+	drvOpData->numBufferListArray = ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS;
+
+	if (ICP_OCF_DRV_STATUS_SUCCESS !=
+	    icp_ocfDrvProcessDataSetup(drvOpData, drvOpData->crp->crp_desc)) {
+		crp->crp_etype = EINVAL;
+		goto err;
+	}
+
+	if (drvOpData->crp->crp_desc->crd_next != NULL) {
+		if (icp_ocfDrvProcessDataSetup(drvOpData, drvOpData->crp->
+					       crp_desc->crd_next)) {
+			crp->crp_etype = EINVAL;
+			goto err;
+		}
+
+	}
+
+	/* 
+	 * Allocate buffer list array memory if the data fragment is more than
+	 * the default number (ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) and not 
+	 * calculated already
+	 */
+	if (crp->crp_flags & ICP_CRYPTO_F_PACKET_BUF) {
+		if (NULL == drvOpData->lacOpData.pDigestResult) {
+			drvOpData->numBufferListArray =
+			    icp_ocfDrvGetPacketBuffFrags((icp_packet_buffer_t *)
+							 crp->crp_buf);
+		}
+
+		if (ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS <
+		    drvOpData->numBufferListArray) {
+			DPRINTK("%s() numBufferListArray more than default\n",
+				__FUNCTION__);
+			drvOpData->srcBuffer.pBuffers = NULL;
+			drvOpData->srcBuffer.pBuffers =
+			    icp_kmalloc(drvOpData->numBufferListArray *
+					sizeof(CpaFlatBuffer), ICP_M_NOWAIT);
+			if (NULL == drvOpData->srcBuffer.pBuffers) {
+				EPRINTK("%s() Failed to get memory for "
+					"pBuffers\n", __FUNCTION__);
+				ICP_CACHE_FREE(drvOpData_zone, drvOpData);
+				crp->crp_etype = ENOMEM;
+				return ENOMEM;
+			}
+		}
+	}
+
+	/*
+	 * Check the type of buffer structure we got and convert it into
+	 * CpaBufferList format.
+	 */
+	if (crp->crp_flags & ICP_CRYPTO_F_PACKET_BUF) {
+		if (ICP_OCF_DRV_STATUS_SUCCESS !=
+		    icp_ocfDrvPacketBuffToBufferList((icp_packet_buffer_t *)
+						     crp->crp_buf,
+						     &(drvOpData->srcBuffer))) {
+			EPRINTK("%s():Failed to translate from packet buffer "
+				"to bufferlist\n", __FUNCTION__);
+			crp->crp_etype = EINVAL;
+			goto err;
+		}
+
+		drvOpData->bufferType = ICP_CRYPTO_F_PACKET_BUF;
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		/* OCF only supports IOV of one entry. */
+		if (NUM_IOV_SUPPORTED ==
+		    ((struct uio *)(crp->crp_buf))->uio_iovcnt) {
+
+			icp_ocfDrvPtrAndLenToBufferList(((struct uio *)(crp->
+									crp_buf))->
+							uio_iov[0].iov_base,
+							((struct uio *)(crp->
+									crp_buf))->
+							uio_iov[0].iov_len,
+							&(drvOpData->
+							  srcBuffer));
+
+			drvOpData->bufferType = CRYPTO_F_IOV;
+
+		} else {
+			DPRINTK("%s():Unable to handle IOVs with lengths of "
+				"greater than one!\n", __FUNCTION__);
+			crp->crp_etype = EINVAL;
+			goto err;
+		}
+
+	} else {
+		icp_ocfDrvPtrAndLenToBufferList(crp->crp_buf,
+						crp->crp_ilen,
+						&(drvOpData->srcBuffer));
+
+		drvOpData->bufferType = CRYPTO_BUF_CONTIG;
+	}
+
+	/* Allocate srcBuffer's private meta data */
+	if (ICP_OCF_DRV_STATUS_SUCCESS !=
+	    icp_ocfDrvAllocMetaData(&(drvOpData->srcBuffer), drvOpData)) {
+		EPRINTK("%s() icp_ocfDrvAllocMetaData failed\n", __FUNCTION__);
+		memset(&(drvOpData->lacOpData), 0, sizeof(CpaCySymOpData));
+		crp->crp_etype = EINVAL;
+		goto err;
+	}
+
+	/* Perform "in-place" crypto operation */
+	lacStatus = cpaCySymPerformOp(CPA_INSTANCE_HANDLE_SINGLE,
+				      (void *)drvOpData,
+				      &(drvOpData->lacOpData),
+				      &(drvOpData->srcBuffer),
+				      &(drvOpData->srcBuffer),
+				      &(drvOpData->verifyResult));
+	if (CPA_STATUS_RETRY == lacStatus) {
+		DPRINTK("%s(): cpaCySymPerformOp retry, lacStatus = %d\n",
+			__FUNCTION__, lacStatus);
+		memset(&(drvOpData->lacOpData), 0, sizeof(CpaCySymOpData));
+		crp->crp_etype = ERESTART;
+		goto err;
+	}
+	if (CPA_STATUS_SUCCESS != lacStatus) {
+		EPRINTK("%s(): cpaCySymPerformOp failed, lacStatus = %d\n",
+			__FUNCTION__, lacStatus);
+		memset(&(drvOpData->lacOpData), 0, sizeof(CpaCySymOpData));
+		crp->crp_etype = EINVAL;
+		goto err;
+	}
+
+	return 0;		//OCF success status value
+
+      err:
+	if (drvOpData->numBufferListArray > ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) {
+		icp_kfree(drvOpData->srcBuffer.pBuffers);
+	}
+	icp_ocfDrvFreeMetaData(&(drvOpData->srcBuffer));
+	ICP_CACHE_FREE(drvOpData_zone, drvOpData);
+
+	return crp->crp_etype;
+}
+
+/* Name        : icp_ocfDrvProcessDataSetup
+ *
+ * Description : This function will setup all the cryptographic operation data
+ *               that is required by LAC to execute the operation.
+ */
+static int icp_ocfDrvProcessDataSetup(struct icp_drvOpData *drvOpData,
+				      struct cryptodesc *crp_desc)
+{
+	CpaCyRandGenOpData randGenOpData;
+	CpaFlatBuffer randData;
+
+	drvOpData->lacOpData.packetType = CPA_CY_SYM_PACKET_TYPE_FULL;
+
+	/* Convert from the cryptop to the ICP LAC crypto parameters */
+	switch (crp_desc->crd_alg) {
+	case CRYPTO_NULL_CBC:
+		drvOpData->lacOpData.
+		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
+		drvOpData->lacOpData.
+		    messageLenToCipherInBytes = crp_desc->crd_len;
+		drvOpData->verifyResult = CPA_FALSE;
+		drvOpData->lacOpData.ivLenInBytes = NULL_BLOCK_LEN;
+		break;
+	case CRYPTO_DES_CBC:
+		drvOpData->lacOpData.
+		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
+		drvOpData->lacOpData.
+		    messageLenToCipherInBytes = crp_desc->crd_len;
+		drvOpData->verifyResult = CPA_FALSE;
+		drvOpData->lacOpData.ivLenInBytes = DES_BLOCK_LEN;
+		break;
+	case CRYPTO_3DES_CBC:
+		drvOpData->lacOpData.
+		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
+		drvOpData->lacOpData.
+		    messageLenToCipherInBytes = crp_desc->crd_len;
+		drvOpData->verifyResult = CPA_FALSE;
+		drvOpData->lacOpData.ivLenInBytes = DES3_BLOCK_LEN;
+		break;
+	case CRYPTO_ARC4:
+		drvOpData->lacOpData.
+		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
+		drvOpData->lacOpData.
+		    messageLenToCipherInBytes = crp_desc->crd_len;
+		drvOpData->verifyResult = CPA_FALSE;
+		drvOpData->lacOpData.ivLenInBytes = ARC4_COUNTER_LEN;
+		break;
+	case CRYPTO_AES_CBC:
+		drvOpData->lacOpData.
+		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
+		drvOpData->lacOpData.
+		    messageLenToCipherInBytes = crp_desc->crd_len;
+		drvOpData->verifyResult = CPA_FALSE;
+		drvOpData->lacOpData.ivLenInBytes = RIJNDAEL128_BLOCK_LEN;
+		break;
+	case CRYPTO_SHA1:
+	case CRYPTO_SHA1_HMAC:
+	case CRYPTO_SHA2_256:
+	case CRYPTO_SHA2_256_HMAC:
+	case CRYPTO_SHA2_384:
+	case CRYPTO_SHA2_384_HMAC:
+	case CRYPTO_SHA2_512:
+	case CRYPTO_SHA2_512_HMAC:
+	case CRYPTO_MD5:
+	case CRYPTO_MD5_HMAC:
+		drvOpData->lacOpData.
+		    hashStartSrcOffsetInBytes = crp_desc->crd_skip;
+		drvOpData->lacOpData.
+		    messageLenToHashInBytes = crp_desc->crd_len;
+		drvOpData->lacOpData.
+		    pDigestResult =
+		    icp_ocfDrvDigestPointerFind(drvOpData, crp_desc);
+
+		if (NULL == drvOpData->lacOpData.pDigestResult) {
+			DPRINTK("%s(): ERROR - could not calculate "
+				"Digest Result memory address\n", __FUNCTION__);
+			return ICP_OCF_DRV_STATUS_FAIL;
+		}
+
+		drvOpData->lacOpData.digestVerify = CPA_FALSE;
+		break;
+	default:
+		DPRINTK("%s(): Crypto process error - algorithm not "
+			"found \n", __FUNCTION__);
+		return ICP_OCF_DRV_STATUS_FAIL;
+	}
+
+	/* Figure out what the IV is supposed to be */
+	if ((crp_desc->crd_alg == CRYPTO_DES_CBC) ||
+	    (crp_desc->crd_alg == CRYPTO_3DES_CBC) ||
+	    (crp_desc->crd_alg == CRYPTO_AES_CBC)) {
+		/*ARC4 doesn't use an IV */
+		if (crp_desc->crd_flags & CRD_F_IV_EXPLICIT) {
+			/* Explicit IV provided to OCF */
+			drvOpData->lacOpData.pIv = crp_desc->crd_iv;
+		} else {
+			/* IV is not explicitly provided to OCF */
+
+			/* Point the LAC OP Data IV pointer to our allocated
+			   storage location for this session. */
+			drvOpData->lacOpData.pIv = drvOpData->ivData;
+
+			if ((crp_desc->crd_flags & CRD_F_ENCRYPT) &&
+			    ((crp_desc->crd_flags & CRD_F_IV_PRESENT) == 0)) {
+
+				/* Encrypting - need to create IV */
+				randGenOpData.generateBits = CPA_TRUE;
+				randGenOpData.lenInBytes = MAX_IV_LEN_IN_BYTES;
+
+				icp_ocfDrvPtrAndLenToFlatBuffer((Cpa8U *)
+								drvOpData->
+								ivData,
+								MAX_IV_LEN_IN_BYTES,
+								&randData);
+
+				if (CPA_STATUS_SUCCESS !=
+				    cpaCyRandGen(CPA_INSTANCE_HANDLE_SINGLE,
+						 NULL, NULL,
+						 &randGenOpData, &randData)) {
+					DPRINTK("%s(): ERROR - Failed to"
+						" generate"
+						" Initialisation Vector\n",
+						__FUNCTION__);
+					return ICP_OCF_DRV_STATUS_FAIL;
+				}
+
+				crypto_copyback(drvOpData->crp->
+						crp_flags,
+						drvOpData->crp->crp_buf,
+						crp_desc->crd_inject,
+						drvOpData->lacOpData.
+						ivLenInBytes,
+						(caddr_t) (drvOpData->lacOpData.
+							   pIv));
+			} else {
+				/* Reading IV from buffer */
+				crypto_copydata(drvOpData->crp->
+						crp_flags,
+						drvOpData->crp->crp_buf,
+						crp_desc->crd_inject,
+						drvOpData->lacOpData.
+						ivLenInBytes,
+						(caddr_t) (drvOpData->lacOpData.
+							   pIv));
+			}
+
+		}
+
+	}
+
+	return ICP_OCF_DRV_STATUS_SUCCESS;
+}
+
+/* Name        : icp_ocfDrvDigestPointerFind
+ *
+ * Description : This function is used to find the memory address of where the
+ * digest information shall be stored in. Input buffer types are an skbuff, iov
+ * or flat buffer. The address is found using the buffer data start address and
+ * an offset.
+ *
+ * Note: In the case of a linux skbuff, the digest address may exist within
+ * a memory space linked to from the start buffer. These linked memory spaces
+ * must be traversed by the data length offset in order to find the digest start
+ * address. Whether there is enough space for the digest must also be checked.
+ */
+uint8_t *icp_ocfDrvDigestPointerFind(struct icp_drvOpData * drvOpData,
+				     struct cryptodesc * crp_desc)
+{
+
+	int offsetInBytes = crp_desc->crd_inject;
+	uint32_t digestSizeInBytes = drvOpData->digestSizeInBytes;
+	uint8_t *flat_buffer_base = NULL;
+	int flat_buffer_length = 0;
+
+	if (drvOpData->crp->crp_flags & ICP_CRYPTO_F_PACKET_BUF) {
+
+		return icp_ocfDrvPacketBufferDigestPointerFind(drvOpData,
+							       offsetInBytes,
+							       digestSizeInBytes);
+
+	} else {
+		/* IOV or flat buffer */
+		if (drvOpData->crp->crp_flags & CRYPTO_F_IOV) {
+			/*single IOV check has already been done */
+			flat_buffer_base = ((struct uio *)
+					    (drvOpData->crp->crp_buf))->
+			    uio_iov[0].iov_base;
+			flat_buffer_length = ((struct uio *)
+					      (drvOpData->crp->crp_buf))->
+			    uio_iov[0].iov_len;
+		} else {
+			flat_buffer_base = (uint8_t *) drvOpData->crp->crp_buf;
+			flat_buffer_length = drvOpData->crp->crp_ilen;
+		}
+
+		if (flat_buffer_length < (offsetInBytes + digestSizeInBytes)) {
+			DPRINTK("%s() Not enough space for Digest "
+				"(IOV/Flat Buffer) \n", __FUNCTION__);
+			return NULL;
+		} else {
+			return (uint8_t *) (flat_buffer_base + offsetInBytes);
+		}
+	}
+	DPRINTK("%s() Should not reach this point\n", __FUNCTION__);
+	return NULL;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ep80579/linux_2.6_kernel_space.mk b/trunk/target/linux/generic/files/crypto/ocf/ep80579/linux_2.6_kernel_space.mk
new file mode 100644
index 00000000..96afa9a4
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ep80579/linux_2.6_kernel_space.mk
@@ -0,0 +1,69 @@
+###################
+# @par
+# This file is provided under a dual BSD/GPLv2 license.  When using or 
+#   redistributing this file, you may do so under either license.
+# 
+#   GPL LICENSE SUMMARY
+# 
+#   Copyright(c) 2007,2008 Intel Corporation. All rights reserved.
+# 
+#   This program is free software; you can redistribute it and/or modify 
+#   it under the terms of version 2 of the GNU General Public License as
+#   published by the Free Software Foundation.
+# 
+#   This program is distributed in the hope that 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#   The full GNU General Public License is included in this distribution 
+#   in the file called LICENSE.GPL.
+# 
+#   Contact Information:
+#   Intel Corporation
+# 
+#   BSD LICENSE 
+# 
+#   Copyright(c) 2007,2008 Intel Corporation. All rights reserved.
+#   All rights reserved.
+# 
+#   Redistribution and use in source and binary forms, with or without 
+#   modification, are permitted provided that the following conditions 
+#   are met:
+# 
+#     * Redistributions of source code must retain the above copyright 
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright 
+#       notice, this list of conditions and the following disclaimer in 
+#       the documentation and/or other materials provided with the 
+#       distribution.
+#     * Neither the name of Intel Corporation nor the names of its 
+#       contributors may be used to endorse or promote products derived 
+#       from this software without specific prior written permission.
+# 
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# 
+#  version: Security.L.1.0.130
+###################
+
+#specific include directories in kernel space
+INCLUDES+=#e.g. -I$(OSAL_DIR)/include \
+
+#Extra Flags Specific in kernel space e.g. include path or debug flags etc. e.g to add an include path EXTRA_CFLAGS += -I$(src)/../include
+EXTRA_CFLAGS += $(INCLUDES) -O2 -Wall
+EXTRA_LDFLAGS +=-whole-archive
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/hifn/Makefile b/trunk/target/linux/generic/files/crypto/ocf/hifn/Makefile
new file mode 100644
index 00000000..163fed05
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/hifn/Makefile
@@ -0,0 +1,13 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_HIFN)     += hifn7751.o
+obj-$(CONFIG_OCF_HIFNHIPP) += hifnHIPP.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c
new file mode 100644
index 00000000..3e5cc9b5
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751.c
@@ -0,0 +1,2954 @@
+/*	$OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $	*/
+
+/*-
+ * Invertex AEON / Hifn 7751 driver
+ * Copyright (c) 1999 Invertex Inc. All rights reserved.
+ * Copyright (c) 1999 Theo de Raadt
+ * Copyright (c) 2000-2001 Network Security Technologies, Inc.
+ *			http://www.netsec.net
+ * Copyright (c) 2003 Hifn Inc.
+ *
+ * This driver is based on a previous driver by Invertex, for which they
+ * requested:  Please send any comments, feedback, bug-fixes, or feature
+ * requests to software@invertex.com.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ *
+__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.40 2007/03/21 03:42:49 sam Exp $");
+ */
+
+/*
+ * Driver for various Hifn encryption processors.
+ */
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <asm/io.h>
+
+#include <cryptodev.h>
+#include <uio.h>
+#include <hifn/hifn7751reg.h>
+#include <hifn/hifn7751var.h>
+
+#if 1
+#define	DPRINTF(a...)	if (hifn_debug) { \
+							printk("%s: ", sc ? \
+								device_get_nameunit(sc->sc_dev) : "hifn"); \
+							printk(a); \
+						} else
+#else
+#define	DPRINTF(a...)
+#endif
+
+static inline int
+pci_get_revid(struct pci_dev *dev)
+{
+	u8 rid = 0;
+	pci_read_config_byte(dev, PCI_REVISION_ID, &rid);
+	return rid;
+}
+
+static	struct hifn_stats hifnstats;
+
+#define	debug hifn_debug
+int hifn_debug = 0;
+module_param(hifn_debug, int, 0644);
+MODULE_PARM_DESC(hifn_debug, "Enable debug");
+
+int hifn_maxbatch = 1;
+module_param(hifn_maxbatch, int, 0644);
+MODULE_PARM_DESC(hifn_maxbatch, "max ops to batch w/o interrupt");
+
+int hifn_cache_linesize = 0x10;
+module_param(hifn_cache_linesize, int, 0444);
+MODULE_PARM_DESC(hifn_cache_linesize, "PCI config cache line size");
+
+#ifdef MODULE_PARM
+char *hifn_pllconfig = NULL;
+MODULE_PARM(hifn_pllconfig, "s");
+#else
+char hifn_pllconfig[32]; /* This setting is RO after loading */
+module_param_string(hifn_pllconfig, hifn_pllconfig, 32, 0444);
+#endif
+MODULE_PARM_DESC(hifn_pllconfig, "PLL config, ie., pci66, ext33, ...");
+
+#ifdef HIFN_VULCANDEV
+#include <sys/conf.h>
+#include <sys/uio.h>
+
+static struct cdevsw vulcanpk_cdevsw; /* forward declaration */
+#endif
+
+/*
+ * Prototypes and count for the pci_device structure
+ */
+static	int  hifn_probe(struct pci_dev *dev, const struct pci_device_id *ent);
+static	void hifn_remove(struct pci_dev *dev);
+
+static	int hifn_newsession(device_t, u_int32_t *, struct cryptoini *);
+static	int hifn_freesession(device_t, u_int64_t);
+static	int hifn_process(device_t, struct cryptop *, int);
+
+static device_method_t hifn_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	hifn_newsession),
+	DEVMETHOD(cryptodev_freesession,hifn_freesession),
+	DEVMETHOD(cryptodev_process,	hifn_process),
+};
+
+static	void hifn_reset_board(struct hifn_softc *, int);
+static	void hifn_reset_puc(struct hifn_softc *);
+static	void hifn_puc_wait(struct hifn_softc *);
+static	int hifn_enable_crypto(struct hifn_softc *);
+static	void hifn_set_retry(struct hifn_softc *sc);
+static	void hifn_init_dma(struct hifn_softc *);
+static	void hifn_init_pci_registers(struct hifn_softc *);
+static	int hifn_sramsize(struct hifn_softc *);
+static	int hifn_dramsize(struct hifn_softc *);
+static	int hifn_ramtype(struct hifn_softc *);
+static	void hifn_sessions(struct hifn_softc *);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+static irqreturn_t hifn_intr(int irq, void *arg);
+#else
+static irqreturn_t hifn_intr(int irq, void *arg, struct pt_regs *regs);
+#endif
+static	u_int hifn_write_command(struct hifn_command *, u_int8_t *);
+static	u_int32_t hifn_next_signature(u_int32_t a, u_int cnt);
+static	void hifn_callback(struct hifn_softc *, struct hifn_command *, u_int8_t *);
+static	int hifn_crypto(struct hifn_softc *, struct hifn_command *, struct cryptop *, int);
+static	int hifn_readramaddr(struct hifn_softc *, int, u_int8_t *);
+static	int hifn_writeramaddr(struct hifn_softc *, int, u_int8_t *);
+static	int hifn_dmamap_load_src(struct hifn_softc *, struct hifn_command *);
+static	int hifn_dmamap_load_dst(struct hifn_softc *, struct hifn_command *);
+static	int hifn_init_pubrng(struct hifn_softc *);
+static	void hifn_tick(unsigned long arg);
+static	void hifn_abort(struct hifn_softc *);
+static	void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *, int *);
+
+static	void hifn_write_reg_0(struct hifn_softc *, bus_size_t, u_int32_t);
+static	void hifn_write_reg_1(struct hifn_softc *, bus_size_t, u_int32_t);
+
+#ifdef CONFIG_OCF_RANDOMHARVEST
+static	int hifn_read_random(void *arg, u_int32_t *buf, int len);
+#endif
+
+#define HIFN_MAX_CHIPS	8
+static struct hifn_softc *hifn_chip_idx[HIFN_MAX_CHIPS];
+
+static __inline u_int32_t
+READ_REG_0(struct hifn_softc *sc, bus_size_t reg)
+{
+	u_int32_t v = readl(sc->sc_bar0 + reg);
+	sc->sc_bar0_lastreg = (bus_size_t) -1;
+	return (v);
+}
+#define	WRITE_REG_0(sc, reg, val)	hifn_write_reg_0(sc, reg, val)
+
+static __inline u_int32_t
+READ_REG_1(struct hifn_softc *sc, bus_size_t reg)
+{
+	u_int32_t v = readl(sc->sc_bar1 + reg);
+	sc->sc_bar1_lastreg = (bus_size_t) -1;
+	return (v);
+}
+#define	WRITE_REG_1(sc, reg, val)	hifn_write_reg_1(sc, reg, val)
+
+/*
+ * map in a given buffer (great on some arches :-)
+ */
+
+static int
+pci_map_uio(struct hifn_softc *sc, struct hifn_operand *buf, struct uio *uio)
+{
+	struct iovec *iov = uio->uio_iov;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	buf->mapsize = 0;
+	for (buf->nsegs = 0; buf->nsegs < uio->uio_iovcnt; ) {
+		buf->segs[buf->nsegs].ds_addr = pci_map_single(sc->sc_pcidev,
+				iov->iov_base, iov->iov_len,
+				PCI_DMA_BIDIRECTIONAL);
+		buf->segs[buf->nsegs].ds_len = iov->iov_len;
+		buf->mapsize += iov->iov_len;
+		iov++;
+		buf->nsegs++;
+	}
+	/* identify this buffer by the first segment */
+	buf->map = (void *) buf->segs[0].ds_addr;
+	return(0);
+}
+
+/*
+ * map in a given sk_buff
+ */
+
+static int
+pci_map_skb(struct hifn_softc *sc,struct hifn_operand *buf,struct sk_buff *skb)
+{
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	buf->mapsize = 0;
+
+	buf->segs[0].ds_addr = pci_map_single(sc->sc_pcidev,
+			skb->data, skb_headlen(skb), PCI_DMA_BIDIRECTIONAL);
+	buf->segs[0].ds_len = skb_headlen(skb);
+	buf->mapsize += buf->segs[0].ds_len;
+
+	buf->nsegs = 1;
+
+	for (i = 0; i < skb_shinfo(skb)->nr_frags; ) {
+		buf->segs[buf->nsegs].ds_len = skb_shinfo(skb)->frags[i].size;
+		buf->segs[buf->nsegs].ds_addr = pci_map_single(sc->sc_pcidev,
+				page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
+					skb_shinfo(skb)->frags[i].page_offset,
+				buf->segs[buf->nsegs].ds_len, PCI_DMA_BIDIRECTIONAL);
+		buf->mapsize += buf->segs[buf->nsegs].ds_len;
+		buf->nsegs++;
+	}
+
+	/* identify this buffer by the first segment */
+	buf->map = (void *) buf->segs[0].ds_addr;
+	return(0);
+}
+
+/*
+ * map in a given contiguous buffer
+ */
+
+static int
+pci_map_buf(struct hifn_softc *sc,struct hifn_operand *buf, void *b, int len)
+{
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	buf->mapsize = 0;
+	buf->segs[0].ds_addr = pci_map_single(sc->sc_pcidev,
+			b, len, PCI_DMA_BIDIRECTIONAL);
+	buf->segs[0].ds_len = len;
+	buf->mapsize += buf->segs[0].ds_len;
+	buf->nsegs = 1;
+
+	/* identify this buffer by the first segment */
+	buf->map = (void *) buf->segs[0].ds_addr;
+	return(0);
+}
+
+#if 0 /* not needed at this time */
+static void
+pci_sync_iov(struct hifn_softc *sc, struct hifn_operand *buf)
+{
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+	for (i = 0; i < buf->nsegs; i++)
+		pci_dma_sync_single_for_cpu(sc->sc_pcidev, buf->segs[i].ds_addr,
+				buf->segs[i].ds_len, PCI_DMA_BIDIRECTIONAL);
+}
+#endif
+
+static void
+pci_unmap_buf(struct hifn_softc *sc, struct hifn_operand *buf)
+{
+	int i;
+	DPRINTF("%s()\n", __FUNCTION__);
+	for (i = 0; i < buf->nsegs; i++) {
+		pci_unmap_single(sc->sc_pcidev, buf->segs[i].ds_addr,
+				buf->segs[i].ds_len, PCI_DMA_BIDIRECTIONAL);
+		buf->segs[i].ds_addr = 0;
+		buf->segs[i].ds_len = 0;
+	}
+	buf->nsegs = 0;
+	buf->mapsize = 0;
+	buf->map = 0;
+}
+
+static const char*
+hifn_partname(struct hifn_softc *sc)
+{
+	/* XXX sprintf numbers when not decoded */
+	switch (pci_get_vendor(sc->sc_pcidev)) {
+	case PCI_VENDOR_HIFN:
+		switch (pci_get_device(sc->sc_pcidev)) {
+		case PCI_PRODUCT_HIFN_6500:	return "Hifn 6500";
+		case PCI_PRODUCT_HIFN_7751:	return "Hifn 7751";
+		case PCI_PRODUCT_HIFN_7811:	return "Hifn 7811";
+		case PCI_PRODUCT_HIFN_7951:	return "Hifn 7951";
+		case PCI_PRODUCT_HIFN_7955:	return "Hifn 7955";
+		case PCI_PRODUCT_HIFN_7956:	return "Hifn 7956";
+		}
+		return "Hifn unknown-part";
+	case PCI_VENDOR_INVERTEX:
+		switch (pci_get_device(sc->sc_pcidev)) {
+		case PCI_PRODUCT_INVERTEX_AEON:	return "Invertex AEON";
+		}
+		return "Invertex unknown-part";
+	case PCI_VENDOR_NETSEC:
+		switch (pci_get_device(sc->sc_pcidev)) {
+		case PCI_PRODUCT_NETSEC_7751:	return "NetSec 7751";
+		}
+		return "NetSec unknown-part";
+	}
+	return "Unknown-vendor unknown-part";
+}
+
+static u_int
+checkmaxmin(struct pci_dev *dev, const char *what, u_int v, u_int min, u_int max)
+{
+	struct hifn_softc *sc = pci_get_drvdata(dev);
+	if (v > max) {
+		device_printf(sc->sc_dev, "Warning, %s %u out of range, "
+			"using max %u\n", what, v, max);
+		v = max;
+	} else if (v < min) {
+		device_printf(sc->sc_dev, "Warning, %s %u out of range, "
+			"using min %u\n", what, v, min);
+		v = min;
+	}
+	return v;
+}
+
+/*
+ * Select PLL configuration for 795x parts.  This is complicated in
+ * that we cannot determine the optimal parameters without user input.
+ * The reference clock is derived from an external clock through a
+ * multiplier.  The external clock is either the host bus (i.e. PCI)
+ * or an external clock generator.  When using the PCI bus we assume
+ * the clock is either 33 or 66 MHz; for an external source we cannot
+ * tell the speed.
+ *
+ * PLL configuration is done with a string: "pci" for PCI bus, or "ext"
+ * for an external source, followed by the frequency.  We calculate
+ * the appropriate multiplier and PLL register contents accordingly.
+ * When no configuration is given we default to "pci66" since that
+ * always will allow the card to work.  If a card is using the PCI
+ * bus clock and in a 33MHz slot then it will be operating at half
+ * speed until the correct information is provided.
+ *
+ * We use a default setting of "ext66" because according to Mike Ham
+ * of HiFn, almost every board in existence has an external crystal
+ * populated at 66Mhz. Using PCI can be a problem on modern motherboards,
+ * because PCI33 can have clocks from 0 to 33Mhz, and some have
+ * non-PCI-compliant spread-spectrum clocks, which can confuse the pll.
+ */
+static void
+hifn_getpllconfig(struct pci_dev *dev, u_int *pll)
+{
+	const char *pllspec = hifn_pllconfig;
+	u_int freq, mul, fl, fh;
+	u_int32_t pllconfig;
+	char *nxt;
+
+	if (pllspec == NULL)
+		pllspec = "ext66";
+	fl = 33, fh = 66;
+	pllconfig = 0;
+	if (strncmp(pllspec, "ext", 3) == 0) {
+		pllspec += 3;
+		pllconfig |= HIFN_PLL_REF_SEL;
+		switch (pci_get_device(dev)) {
+		case PCI_PRODUCT_HIFN_7955:
+		case PCI_PRODUCT_HIFN_7956:
+			fl = 20, fh = 100;
+			break;
+#ifdef notyet
+		case PCI_PRODUCT_HIFN_7954:
+			fl = 20, fh = 66;
+			break;
+#endif
+		}
+	} else if (strncmp(pllspec, "pci", 3) == 0)
+		pllspec += 3;
+	freq = strtoul(pllspec, &nxt, 10);
+	if (nxt == pllspec)
+		freq = 66;
+	else
+		freq = checkmaxmin(dev, "frequency", freq, fl, fh);
+	/*
+	 * Calculate multiplier.  We target a Fck of 266 MHz,
+	 * allowing only even values, possibly rounded down.
+	 * Multipliers > 8 must set the charge pump current.
+	 */
+	mul = checkmaxmin(dev, "PLL divisor", (266 / freq) &~ 1, 2, 12);
+	pllconfig |= (mul / 2 - 1) << HIFN_PLL_ND_SHIFT;
+	if (mul > 8)
+		pllconfig |= HIFN_PLL_IS;
+	*pll = pllconfig;
+}
+
+/*
+ * Attach an interface that successfully probed.
+ */
+static int
+hifn_probe(struct pci_dev *dev, const struct pci_device_id *ent)
+{
+	struct hifn_softc *sc = NULL;
+	char rbase;
+	u_int16_t ena, rev;
+	int rseg, rc;
+	unsigned long mem_start, mem_len;
+	static int num_chips = 0;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (pci_enable_device(dev) < 0)
+		return(-ENODEV);
+
+	if (pci_set_mwi(dev))
+		return(-ENODEV);
+
+	if (!dev->irq) {
+		printk("hifn: found device with no IRQ assigned. check BIOS settings!");
+		pci_disable_device(dev);
+		return(-ENODEV);
+	}
+
+	sc = (struct hifn_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
+	if (!sc)
+		return(-ENOMEM);
+	memset(sc, 0, sizeof(*sc));
+
+	softc_device_init(sc, "hifn", num_chips, hifn_methods);
+
+	sc->sc_pcidev = dev;
+	sc->sc_irq = -1;
+	sc->sc_cid = -1;
+	sc->sc_num = num_chips++;
+	if (sc->sc_num < HIFN_MAX_CHIPS)
+		hifn_chip_idx[sc->sc_num] = sc;
+
+	pci_set_drvdata(sc->sc_pcidev, sc);
+
+	spin_lock_init(&sc->sc_mtx);
+
+	/* XXX handle power management */
+
+	/*
+	 * The 7951 and 795x have a random number generator and
+	 * public key support; note this.
+	 */
+	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN &&
+	    (pci_get_device(dev) == PCI_PRODUCT_HIFN_7951 ||
+	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 ||
+	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7956))
+		sc->sc_flags = HIFN_HAS_RNG | HIFN_HAS_PUBLIC;
+	/*
+	 * The 7811 has a random number generator and
+	 * we also note it's identity 'cuz of some quirks.
+	 */
+	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN &&
+	    pci_get_device(dev) == PCI_PRODUCT_HIFN_7811)
+		sc->sc_flags |= HIFN_IS_7811 | HIFN_HAS_RNG;
+
+	/*
+	 * The 795x parts support AES.
+	 */
+	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN &&
+	    (pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 ||
+	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7956)) {
+		sc->sc_flags |= HIFN_IS_7956 | HIFN_HAS_AES;
+		/*
+		 * Select PLL configuration.  This depends on the
+		 * bus and board design and must be manually configured
+		 * if the default setting is unacceptable.
+		 */
+		hifn_getpllconfig(dev, &sc->sc_pllconfig);
+	}
+
+	/*
+	 * Setup PCI resources. Note that we record the bus
+	 * tag and handle for each register mapping, this is
+	 * used by the READ_REG_0, WRITE_REG_0, READ_REG_1,
+	 * and WRITE_REG_1 macros throughout the driver.
+	 */
+	mem_start = pci_resource_start(sc->sc_pcidev, 0);
+	mem_len   = pci_resource_len(sc->sc_pcidev, 0);
+	sc->sc_bar0 = (ocf_iomem_t) ioremap(mem_start, mem_len);
+	if (!sc->sc_bar0) {
+		device_printf(sc->sc_dev, "cannot map bar%d register space\n", 0);
+		goto fail;
+	}
+	sc->sc_bar0_lastreg = (bus_size_t) -1;
+
+	mem_start = pci_resource_start(sc->sc_pcidev, 1);
+	mem_len   = pci_resource_len(sc->sc_pcidev, 1);
+	sc->sc_bar1 = (ocf_iomem_t) ioremap(mem_start, mem_len);
+	if (!sc->sc_bar1) {
+		device_printf(sc->sc_dev, "cannot map bar%d register space\n", 1);
+		goto fail;
+	}
+	sc->sc_bar1_lastreg = (bus_size_t) -1;
+
+	/* fix up the bus size */
+	if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
+		device_printf(sc->sc_dev, "No usable DMA configuration, aborting.\n");
+		goto fail;
+	}
+	if (pci_set_consistent_dma_mask(dev, DMA_32BIT_MASK)) {
+		device_printf(sc->sc_dev,
+				"No usable consistent DMA configuration, aborting.\n");
+		goto fail;
+	}
+
+	hifn_set_retry(sc);
+
+	/*
+	 * Setup the area where the Hifn DMA's descriptors
+	 * and associated data structures.
+	 */
+	sc->sc_dma = (struct hifn_dma *) pci_alloc_consistent(dev,
+			sizeof(*sc->sc_dma),
+			&sc->sc_dma_physaddr);
+	if (!sc->sc_dma) {
+		device_printf(sc->sc_dev, "cannot alloc sc_dma\n");
+		goto fail;
+	}
+	bzero(sc->sc_dma, sizeof(*sc->sc_dma));
+
+	/*
+	 * Reset the board and do the ``secret handshake''
+	 * to enable the crypto support.  Then complete the
+	 * initialization procedure by setting up the interrupt
+	 * and hooking in to the system crypto support so we'll
+	 * get used for system services like the crypto device,
+	 * IPsec, RNG device, etc.
+	 */
+	hifn_reset_board(sc, 0);
+
+	if (hifn_enable_crypto(sc) != 0) {
+		device_printf(sc->sc_dev, "crypto enabling failed\n");
+		goto fail;
+	}
+	hifn_reset_puc(sc);
+
+	hifn_init_dma(sc);
+	hifn_init_pci_registers(sc);
+
+	pci_set_master(sc->sc_pcidev);
+
+	/* XXX can't dynamically determine ram type for 795x; force dram */
+	if (sc->sc_flags & HIFN_IS_7956)
+		sc->sc_drammodel = 1;
+	else if (hifn_ramtype(sc))
+		goto fail;
+
+	if (sc->sc_drammodel == 0)
+		hifn_sramsize(sc);
+	else
+		hifn_dramsize(sc);
+
+	/*
+	 * Workaround for NetSec 7751 rev A: half ram size because two
+	 * of the address lines were left floating
+	 */
+	if (pci_get_vendor(dev) == PCI_VENDOR_NETSEC &&
+	    pci_get_device(dev) == PCI_PRODUCT_NETSEC_7751 &&
+	    pci_get_revid(dev) == 0x61)	/*XXX???*/
+		sc->sc_ramsize >>= 1;
+
+	/*
+	 * Arrange the interrupt line.
+	 */
+	rc = request_irq(dev->irq, hifn_intr, IRQF_SHARED, "hifn", sc);
+	if (rc) {
+		device_printf(sc->sc_dev, "could not map interrupt: %d\n", rc);
+		goto fail;
+	}
+	sc->sc_irq = dev->irq;
+
+	hifn_sessions(sc);
+
+	/*
+	 * NB: Keep only the low 16 bits; this masks the chip id
+	 *     from the 7951.
+	 */
+	rev = READ_REG_1(sc, HIFN_1_REVID) & 0xffff;
+
+	rseg = sc->sc_ramsize / 1024;
+	rbase = 'K';
+	if (sc->sc_ramsize >= (1024 * 1024)) {
+		rbase = 'M';
+		rseg /= 1024;
+	}
+	device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram",
+		hifn_partname(sc), rev,
+		rseg, rbase, sc->sc_drammodel ? 'd' : 's');
+	if (sc->sc_flags & HIFN_IS_7956)
+		printf(", pll=0x%x<%s clk, %ux mult>",
+			sc->sc_pllconfig,
+			sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci",
+			2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11));
+	printf("\n");
+
+	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),CRYPTOCAP_F_HARDWARE);
+	if (sc->sc_cid < 0) {
+		device_printf(sc->sc_dev, "could not get crypto driver id\n");
+		goto fail;
+	}
+
+	WRITE_REG_0(sc, HIFN_0_PUCNFG,
+	    READ_REG_0(sc, HIFN_0_PUCNFG) | HIFN_PUCNFG_CHIPID);
+	ena = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA;
+
+	switch (ena) {
+	case HIFN_PUSTAT_ENA_2:
+		crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
+		crypto_register(sc->sc_cid, CRYPTO_ARC4, 0, 0);
+		if (sc->sc_flags & HIFN_HAS_AES)
+			crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
+		/*FALLTHROUGH*/
+	case HIFN_PUSTAT_ENA_1:
+		crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0);
+		crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0);
+		crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
+		crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
+		crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
+		break;
+	}
+
+	if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG))
+		hifn_init_pubrng(sc);
+
+	init_timer(&sc->sc_tickto);
+	sc->sc_tickto.function = hifn_tick;
+	sc->sc_tickto.data = (unsigned long) sc->sc_num;
+	mod_timer(&sc->sc_tickto, jiffies + HZ);
+
+	return (0);
+
+fail:
+    if (sc->sc_cid >= 0)
+        crypto_unregister_all(sc->sc_cid);
+    if (sc->sc_irq != -1)
+        free_irq(sc->sc_irq, sc);
+    if (sc->sc_dma) {
+		/* Turn off DMA polling */
+		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
+			HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
+
+        pci_free_consistent(sc->sc_pcidev,
+				sizeof(*sc->sc_dma),
+                sc->sc_dma, sc->sc_dma_physaddr);
+	}
+    kfree(sc);
+	return (-ENXIO);
+}
+
+/*
+ * Detach an interface that successfully probed.
+ */
+static void
+hifn_remove(struct pci_dev *dev)
+{
+	struct hifn_softc *sc = pci_get_drvdata(dev);
+	unsigned long l_flags;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	KASSERT(sc != NULL, ("hifn_detach: null software carrier!"));
+
+	/* disable interrupts */
+	HIFN_LOCK(sc);
+	WRITE_REG_1(sc, HIFN_1_DMA_IER, 0);
+	HIFN_UNLOCK(sc);
+
+	/*XXX other resources */
+	del_timer_sync(&sc->sc_tickto);
+
+	/* Turn off DMA polling */
+	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
+	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
+
+	crypto_unregister_all(sc->sc_cid);
+
+	free_irq(sc->sc_irq, sc);
+
+	pci_free_consistent(sc->sc_pcidev, sizeof(*sc->sc_dma),
+                sc->sc_dma, sc->sc_dma_physaddr);
+}
+
+
+static int
+hifn_init_pubrng(struct hifn_softc *sc)
+{
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if ((sc->sc_flags & HIFN_IS_7811) == 0) {
+		/* Reset 7951 public key/rng engine */
+		WRITE_REG_1(sc, HIFN_1_PUB_RESET,
+		    READ_REG_1(sc, HIFN_1_PUB_RESET) | HIFN_PUBRST_RESET);
+
+		for (i = 0; i < 100; i++) {
+			DELAY(1000);
+			if ((READ_REG_1(sc, HIFN_1_PUB_RESET) &
+			    HIFN_PUBRST_RESET) == 0)
+				break;
+		}
+
+		if (i == 100) {
+			device_printf(sc->sc_dev, "public key init failed\n");
+			return (1);
+		}
+	}
+
+	/* Enable the rng, if available */
+#ifdef CONFIG_OCF_RANDOMHARVEST
+	if (sc->sc_flags & HIFN_HAS_RNG) {
+		if (sc->sc_flags & HIFN_IS_7811) {
+			u_int32_t r;
+			r = READ_REG_1(sc, HIFN_1_7811_RNGENA);
+			if (r & HIFN_7811_RNGENA_ENA) {
+				r &= ~HIFN_7811_RNGENA_ENA;
+				WRITE_REG_1(sc, HIFN_1_7811_RNGENA, r);
+			}
+			WRITE_REG_1(sc, HIFN_1_7811_RNGCFG,
+			    HIFN_7811_RNGCFG_DEFL);
+			r |= HIFN_7811_RNGENA_ENA;
+			WRITE_REG_1(sc, HIFN_1_7811_RNGENA, r);
+		} else
+			WRITE_REG_1(sc, HIFN_1_RNG_CONFIG,
+			    READ_REG_1(sc, HIFN_1_RNG_CONFIG) |
+			    HIFN_RNGCFG_ENA);
+
+		sc->sc_rngfirst = 1;
+		crypto_rregister(sc->sc_cid, hifn_read_random, sc);
+	}
+#endif
+
+	/* Enable public key engine, if available */
+	if (sc->sc_flags & HIFN_HAS_PUBLIC) {
+		WRITE_REG_1(sc, HIFN_1_PUB_IEN, HIFN_PUBIEN_DONE);
+		sc->sc_dmaier |= HIFN_DMAIER_PUBDONE;
+		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
+#ifdef HIFN_VULCANDEV
+		sc->sc_pkdev = make_dev(&vulcanpk_cdevsw, 0, 
+					UID_ROOT, GID_WHEEL, 0666,
+					"vulcanpk");
+		sc->sc_pkdev->si_drv1 = sc;
+#endif
+	}
+
+	return (0);
+}
+
+#ifdef CONFIG_OCF_RANDOMHARVEST
+static int
+hifn_read_random(void *arg, u_int32_t *buf, int len)
+{
+	struct hifn_softc *sc = (struct hifn_softc *) arg;
+	u_int32_t sts;
+	int i, rc = 0;
+
+	if (len <= 0)
+		return rc;
+
+	if (sc->sc_flags & HIFN_IS_7811) {
+		/* ONLY VALID ON 7811!!!! */
+		for (i = 0; i < 5; i++) {
+			sts = READ_REG_1(sc, HIFN_1_7811_RNGSTS);
+			if (sts & HIFN_7811_RNGSTS_UFL) {
+				device_printf(sc->sc_dev,
+					      "RNG underflow: disabling\n");
+				/* DAVIDM perhaps return -1 */
+				break;
+			}
+			if ((sts & HIFN_7811_RNGSTS_RDY) == 0)
+				break;
+
+			/*
+			 * There are at least two words in the RNG FIFO
+			 * at this point.
+			 */
+			if (rc < len)
+				buf[rc++] = READ_REG_1(sc, HIFN_1_7811_RNGDAT);
+			if (rc < len)
+				buf[rc++] = READ_REG_1(sc, HIFN_1_7811_RNGDAT);
+		}
+	} else
+		buf[rc++] = READ_REG_1(sc, HIFN_1_RNG_DATA);
+
+	/* NB: discard first data read */
+	if (sc->sc_rngfirst) {
+		sc->sc_rngfirst = 0;
+		rc = 0;
+	}
+
+	return(rc);
+}
+#endif /* CONFIG_OCF_RANDOMHARVEST */
+
+static void
+hifn_puc_wait(struct hifn_softc *sc)
+{
+	int i;
+	int reg = HIFN_0_PUCTRL;
+
+	if (sc->sc_flags & HIFN_IS_7956) {
+		reg = HIFN_0_PUCTRL2;
+	}
+
+	for (i = 5000; i > 0; i--) {
+		DELAY(1);
+		if (!(READ_REG_0(sc, reg) & HIFN_PUCTRL_RESET))
+			break;
+	}
+	if (!i)
+		device_printf(sc->sc_dev, "proc unit did not reset(0x%x)\n",
+				READ_REG_0(sc, HIFN_0_PUCTRL));
+}
+
+/*
+ * Reset the processing unit.
+ */
+static void
+hifn_reset_puc(struct hifn_softc *sc)
+{
+	/* Reset processing unit */
+	int reg = HIFN_0_PUCTRL;
+
+	if (sc->sc_flags & HIFN_IS_7956) {
+		reg = HIFN_0_PUCTRL2;
+	}
+	WRITE_REG_0(sc, reg, HIFN_PUCTRL_DMAENA);
+
+	hifn_puc_wait(sc);
+}
+
+/*
+ * Set the Retry and TRDY registers; note that we set them to
+ * zero because the 7811 locks up when forced to retry (section
+ * 3.6 of "Specification Update SU-0014-04".  Not clear if we
+ * should do this for all Hifn parts, but it doesn't seem to hurt.
+ */
+static void
+hifn_set_retry(struct hifn_softc *sc)
+{
+	DPRINTF("%s()\n", __FUNCTION__);
+	/* NB: RETRY only responds to 8-bit reads/writes */
+	pci_write_config_byte(sc->sc_pcidev, HIFN_RETRY_TIMEOUT, 0);
+	pci_write_config_byte(sc->sc_pcidev, HIFN_TRDY_TIMEOUT, 0);
+	/* piggy back the cache line setting here */
+	pci_write_config_byte(sc->sc_pcidev, PCI_CACHE_LINE_SIZE, hifn_cache_linesize);
+}
+
+/*
+ * Resets the board.  Values in the regesters are left as is
+ * from the reset (i.e. initial values are assigned elsewhere).
+ */
+static void
+hifn_reset_board(struct hifn_softc *sc, int full)
+{
+	u_int32_t reg;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+	/*
+	 * Set polling in the DMA configuration register to zero.  0x7 avoids
+	 * resetting the board and zeros out the other fields.
+	 */
+	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
+	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
+
+	/*
+	 * Now that polling has been disabled, we have to wait 1 ms
+	 * before resetting the board.
+	 */
+	DELAY(1000);
+
+	/* Reset the DMA unit */
+	if (full) {
+		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MODE);
+		DELAY(1000);
+	} else {
+		WRITE_REG_1(sc, HIFN_1_DMA_CNFG,
+		    HIFN_DMACNFG_MODE | HIFN_DMACNFG_MSTRESET);
+		hifn_reset_puc(sc);
+	}
+
+	KASSERT(sc->sc_dma != NULL, ("hifn_reset_board: null DMA tag!"));
+	bzero(sc->sc_dma, sizeof(*sc->sc_dma));
+
+	/* Bring dma unit out of reset */
+	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
+	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
+
+	hifn_puc_wait(sc);
+	hifn_set_retry(sc);
+
+	if (sc->sc_flags & HIFN_IS_7811) {
+		for (reg = 0; reg < 1000; reg++) {
+			if (READ_REG_1(sc, HIFN_1_7811_MIPSRST) &
+			    HIFN_MIPSRST_CRAMINIT)
+				break;
+			DELAY(1000);
+		}
+		if (reg == 1000)
+			device_printf(sc->sc_dev, ": cram init timeout\n");
+	} else {
+	  /* set up DMA configuration register #2 */
+	  /* turn off all PK and BAR0 swaps */
+	  WRITE_REG_1(sc, HIFN_1_DMA_CNFG2,
+		      (3 << HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT)|
+		      (3 << HIFN_DMACNFG2_INIT_READ_BURST_SHIFT)|
+		      (2 << HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT)|
+		      (2 << HIFN_DMACNFG2_TGT_READ_BURST_SHIFT));
+	}
+}
+
+static u_int32_t
+hifn_next_signature(u_int32_t a, u_int cnt)
+{
+	int i;
+	u_int32_t v;
+
+	for (i = 0; i < cnt; i++) {
+
+		/* get the parity */
+		v = a & 0x80080125;
+		v ^= v >> 16;
+		v ^= v >> 8;
+		v ^= v >> 4;
+		v ^= v >> 2;
+		v ^= v >> 1;
+
+		a = (v & 1) ^ (a << 1);
+	}
+
+	return a;
+}
+
+
+/*
+ * Checks to see if crypto is already enabled.  If crypto isn't enable,
+ * "hifn_enable_crypto" is called to enable it.  The check is important,
+ * as enabling crypto twice will lock the board.
+ */
+static int 
+hifn_enable_crypto(struct hifn_softc *sc)
+{
+	u_int32_t dmacfg, ramcfg, encl, addr, i;
+	char offtbl[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+					  0x00, 0x00, 0x00, 0x00 };
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	ramcfg = READ_REG_0(sc, HIFN_0_PUCNFG);
+	dmacfg = READ_REG_1(sc, HIFN_1_DMA_CNFG);
+
+	/*
+	 * The RAM config register's encrypt level bit needs to be set before
+	 * every read performed on the encryption level register.
+	 */
+	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg | HIFN_PUCNFG_CHIPID);
+
+	encl = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA;
+
+	/*
+	 * Make sure we don't re-unlock.  Two unlocks kills chip until the
+	 * next reboot.
+	 */
+	if (encl == HIFN_PUSTAT_ENA_1 || encl == HIFN_PUSTAT_ENA_2) {
+#ifdef HIFN_DEBUG
+		if (hifn_debug)
+			device_printf(sc->sc_dev,
+			    "Strong crypto already enabled!\n");
+#endif
+		goto report;
+	}
+
+	if (encl != 0 && encl != HIFN_PUSTAT_ENA_0) {
+#ifdef HIFN_DEBUG
+		if (hifn_debug)
+			device_printf(sc->sc_dev,
+			      "Unknown encryption level 0x%x\n", encl);
+#endif
+		return 1;
+	}
+
+	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_UNLOCK |
+	    HIFN_DMACNFG_MSTRESET | HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
+	DELAY(1000);
+	addr = READ_REG_1(sc, HIFN_UNLOCK_SECRET1);
+	DELAY(1000);
+	WRITE_REG_1(sc, HIFN_UNLOCK_SECRET2, 0);
+	DELAY(1000);
+
+	for (i = 0; i <= 12; i++) {
+		addr = hifn_next_signature(addr, offtbl[i] + 0x101);
+		WRITE_REG_1(sc, HIFN_UNLOCK_SECRET2, addr);
+
+		DELAY(1000);
+	}
+
+	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg | HIFN_PUCNFG_CHIPID);
+	encl = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA;
+
+#ifdef HIFN_DEBUG
+	if (hifn_debug) {
+		if (encl != HIFN_PUSTAT_ENA_1 && encl != HIFN_PUSTAT_ENA_2)
+			device_printf(sc->sc_dev, "Engine is permanently "
+				"locked until next system reset!\n");
+		else
+			device_printf(sc->sc_dev, "Engine enabled "
+				"successfully!\n");
+	}
+#endif
+
+report:
+	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg);
+	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, dmacfg);
+
+	switch (encl) {
+	case HIFN_PUSTAT_ENA_1:
+	case HIFN_PUSTAT_ENA_2:
+		break;
+	case HIFN_PUSTAT_ENA_0:
+	default:
+		device_printf(sc->sc_dev, "disabled\n");
+		break;
+	}
+
+	return 0;
+}
+
+/*
+ * Give initial values to the registers listed in the "Register Space"
+ * section of the HIFN Software Development reference manual.
+ */
+static void 
+hifn_init_pci_registers(struct hifn_softc *sc)
+{
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	/* write fixed values needed by the Initialization registers */
+	WRITE_REG_0(sc, HIFN_0_PUCTRL, HIFN_PUCTRL_DMAENA);
+	WRITE_REG_0(sc, HIFN_0_FIFOCNFG, HIFN_FIFOCNFG_THRESHOLD);
+	WRITE_REG_0(sc, HIFN_0_PUIER, HIFN_PUIER_DSTOVER);
+
+	/* write all 4 ring address registers */
+	WRITE_REG_1(sc, HIFN_1_DMA_CRAR, sc->sc_dma_physaddr +
+	    offsetof(struct hifn_dma, cmdr[0]));
+	WRITE_REG_1(sc, HIFN_1_DMA_SRAR, sc->sc_dma_physaddr +
+	    offsetof(struct hifn_dma, srcr[0]));
+	WRITE_REG_1(sc, HIFN_1_DMA_DRAR, sc->sc_dma_physaddr +
+	    offsetof(struct hifn_dma, dstr[0]));
+	WRITE_REG_1(sc, HIFN_1_DMA_RRAR, sc->sc_dma_physaddr +
+	    offsetof(struct hifn_dma, resr[0]));
+
+	DELAY(2000);
+
+	/* write status register */
+	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
+	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS |
+	    HIFN_DMACSR_S_CTRL_DIS | HIFN_DMACSR_C_CTRL_DIS |
+	    HIFN_DMACSR_D_ABORT | HIFN_DMACSR_D_DONE | HIFN_DMACSR_D_LAST |
+	    HIFN_DMACSR_D_WAIT | HIFN_DMACSR_D_OVER |
+	    HIFN_DMACSR_R_ABORT | HIFN_DMACSR_R_DONE | HIFN_DMACSR_R_LAST |
+	    HIFN_DMACSR_R_WAIT | HIFN_DMACSR_R_OVER |
+	    HIFN_DMACSR_S_ABORT | HIFN_DMACSR_S_DONE | HIFN_DMACSR_S_LAST |
+	    HIFN_DMACSR_S_WAIT |
+	    HIFN_DMACSR_C_ABORT | HIFN_DMACSR_C_DONE | HIFN_DMACSR_C_LAST |
+	    HIFN_DMACSR_C_WAIT |
+	    HIFN_DMACSR_ENGINE |
+	    ((sc->sc_flags & HIFN_HAS_PUBLIC) ?
+		HIFN_DMACSR_PUBDONE : 0) |
+	    ((sc->sc_flags & HIFN_IS_7811) ?
+		HIFN_DMACSR_ILLW | HIFN_DMACSR_ILLR : 0));
+
+	sc->sc_d_busy = sc->sc_r_busy = sc->sc_s_busy = sc->sc_c_busy = 0;
+	sc->sc_dmaier |= HIFN_DMAIER_R_DONE | HIFN_DMAIER_C_ABORT |
+	    HIFN_DMAIER_D_OVER | HIFN_DMAIER_R_OVER |
+	    HIFN_DMAIER_S_ABORT | HIFN_DMAIER_D_ABORT | HIFN_DMAIER_R_ABORT |
+	    ((sc->sc_flags & HIFN_IS_7811) ?
+		HIFN_DMAIER_ILLW | HIFN_DMAIER_ILLR : 0);
+	sc->sc_dmaier &= ~HIFN_DMAIER_C_WAIT;
+	WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
+
+
+	if (sc->sc_flags & HIFN_IS_7956) {
+		u_int32_t pll;
+
+		WRITE_REG_0(sc, HIFN_0_PUCNFG, HIFN_PUCNFG_COMPSING |
+		    HIFN_PUCNFG_TCALLPHASES |
+		    HIFN_PUCNFG_TCDRVTOTEM | HIFN_PUCNFG_BUS32);
+
+		/* turn off the clocks and insure bypass is set */
+		pll = READ_REG_1(sc, HIFN_1_PLL);
+		pll = (pll &~ (HIFN_PLL_PK_CLK_SEL | HIFN_PLL_PE_CLK_SEL))
+		  | HIFN_PLL_BP | HIFN_PLL_MBSET;
+		WRITE_REG_1(sc, HIFN_1_PLL, pll);
+		DELAY(10*1000);		/* 10ms */
+
+		/* change configuration */
+		pll = (pll &~ HIFN_PLL_CONFIG) | sc->sc_pllconfig;
+		WRITE_REG_1(sc, HIFN_1_PLL, pll);
+		DELAY(10*1000);		/* 10ms */
+
+		/* disable bypass */
+		pll &= ~HIFN_PLL_BP;
+		WRITE_REG_1(sc, HIFN_1_PLL, pll);
+		/* enable clocks with new configuration */
+		pll |= HIFN_PLL_PK_CLK_SEL | HIFN_PLL_PE_CLK_SEL;
+		WRITE_REG_1(sc, HIFN_1_PLL, pll);
+	} else {
+		WRITE_REG_0(sc, HIFN_0_PUCNFG, HIFN_PUCNFG_COMPSING |
+		    HIFN_PUCNFG_DRFR_128 | HIFN_PUCNFG_TCALLPHASES |
+		    HIFN_PUCNFG_TCDRVTOTEM | HIFN_PUCNFG_BUS32 |
+		    (sc->sc_drammodel ? HIFN_PUCNFG_DRAM : HIFN_PUCNFG_SRAM));
+	}
+
+	WRITE_REG_0(sc, HIFN_0_PUISR, HIFN_PUISR_DSTOVER);
+	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
+	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE | HIFN_DMACNFG_LAST |
+	    ((HIFN_POLL_FREQUENCY << 16 ) & HIFN_DMACNFG_POLLFREQ) |
+	    ((HIFN_POLL_SCALAR << 8) & HIFN_DMACNFG_POLLINVAL));
+}
+
+/*
+ * The maximum number of sessions supported by the card
+ * is dependent on the amount of context ram, which
+ * encryption algorithms are enabled, and how compression
+ * is configured.  This should be configured before this
+ * routine is called.
+ */
+static void
+hifn_sessions(struct hifn_softc *sc)
+{
+	u_int32_t pucnfg;
+	int ctxsize;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	pucnfg = READ_REG_0(sc, HIFN_0_PUCNFG);
+
+	if (pucnfg & HIFN_PUCNFG_COMPSING) {
+		if (pucnfg & HIFN_PUCNFG_ENCCNFG)
+			ctxsize = 128;
+		else
+			ctxsize = 512;
+		/*
+		 * 7955/7956 has internal context memory of 32K
+		 */
+		if (sc->sc_flags & HIFN_IS_7956)
+			sc->sc_maxses = 32768 / ctxsize;
+		else
+			sc->sc_maxses = 1 +
+			    ((sc->sc_ramsize - 32768) / ctxsize);
+	} else
+		sc->sc_maxses = sc->sc_ramsize / 16384;
+
+	if (sc->sc_maxses > 2048)
+		sc->sc_maxses = 2048;
+}
+
+/*
+ * Determine ram type (sram or dram).  Board should be just out of a reset
+ * state when this is called.
+ */
+static int
+hifn_ramtype(struct hifn_softc *sc)
+{
+	u_int8_t data[8], dataexpect[8];
+	int i;
+
+	for (i = 0; i < sizeof(data); i++)
+		data[i] = dataexpect[i] = 0x55;
+	if (hifn_writeramaddr(sc, 0, data))
+		return (-1);
+	if (hifn_readramaddr(sc, 0, data))
+		return (-1);
+	if (bcmp(data, dataexpect, sizeof(data)) != 0) {
+		sc->sc_drammodel = 1;
+		return (0);
+	}
+
+	for (i = 0; i < sizeof(data); i++)
+		data[i] = dataexpect[i] = 0xaa;
+	if (hifn_writeramaddr(sc, 0, data))
+		return (-1);
+	if (hifn_readramaddr(sc, 0, data))
+		return (-1);
+	if (bcmp(data, dataexpect, sizeof(data)) != 0) {
+		sc->sc_drammodel = 1;
+		return (0);
+	}
+
+	return (0);
+}
+
+#define	HIFN_SRAM_MAX		(32 << 20)
+#define	HIFN_SRAM_STEP_SIZE	16384
+#define	HIFN_SRAM_GRANULARITY	(HIFN_SRAM_MAX / HIFN_SRAM_STEP_SIZE)
+
+static int
+hifn_sramsize(struct hifn_softc *sc)
+{
+	u_int32_t a;
+	u_int8_t data[8];
+	u_int8_t dataexpect[sizeof(data)];
+	int32_t i;
+
+	for (i = 0; i < sizeof(data); i++)
+		data[i] = dataexpect[i] = i ^ 0x5a;
+
+	for (i = HIFN_SRAM_GRANULARITY - 1; i >= 0; i--) {
+		a = i * HIFN_SRAM_STEP_SIZE;
+		bcopy(&i, data, sizeof(i));
+		hifn_writeramaddr(sc, a, data);
+	}
+
+	for (i = 0; i < HIFN_SRAM_GRANULARITY; i++) {
+		a = i * HIFN_SRAM_STEP_SIZE;
+		bcopy(&i, dataexpect, sizeof(i));
+		if (hifn_readramaddr(sc, a, data) < 0)
+			return (0);
+		if (bcmp(data, dataexpect, sizeof(data)) != 0)
+			return (0);
+		sc->sc_ramsize = a + HIFN_SRAM_STEP_SIZE;
+	}
+
+	return (0);
+}
+
+/*
+ * XXX For dram boards, one should really try all of the
+ * HIFN_PUCNFG_DSZ_*'s.  This just assumes that PUCNFG
+ * is already set up correctly.
+ */
+static int
+hifn_dramsize(struct hifn_softc *sc)
+{
+	u_int32_t cnfg;
+
+	if (sc->sc_flags & HIFN_IS_7956) {
+		/*
+		 * 7955/7956 have a fixed internal ram of only 32K.
+		 */
+		sc->sc_ramsize = 32768;
+	} else {
+		cnfg = READ_REG_0(sc, HIFN_0_PUCNFG) &
+		    HIFN_PUCNFG_DRAMMASK;
+		sc->sc_ramsize = 1 << ((cnfg >> 13) + 18);
+	}
+	return (0);
+}
+
+static void
+hifn_alloc_slot(struct hifn_softc *sc, int *cmdp, int *srcp, int *dstp, int *resp)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (dma->cmdi == HIFN_D_CMD_RSIZE) {
+		dma->cmdi = 0;
+		dma->cmdr[HIFN_D_CMD_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
+		wmb();
+		dma->cmdr[HIFN_D_CMD_RSIZE].l |= htole32(HIFN_D_VALID);
+		HIFN_CMDR_SYNC(sc, HIFN_D_CMD_RSIZE,
+		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
+	*cmdp = dma->cmdi++;
+	dma->cmdk = dma->cmdi;
+
+	if (dma->srci == HIFN_D_SRC_RSIZE) {
+		dma->srci = 0;
+		dma->srcr[HIFN_D_SRC_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
+		wmb();
+		dma->srcr[HIFN_D_SRC_RSIZE].l |= htole32(HIFN_D_VALID);
+		HIFN_SRCR_SYNC(sc, HIFN_D_SRC_RSIZE,
+		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
+	*srcp = dma->srci++;
+	dma->srck = dma->srci;
+
+	if (dma->dsti == HIFN_D_DST_RSIZE) {
+		dma->dsti = 0;
+		dma->dstr[HIFN_D_DST_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
+		wmb();
+		dma->dstr[HIFN_D_DST_RSIZE].l |= htole32(HIFN_D_VALID);
+		HIFN_DSTR_SYNC(sc, HIFN_D_DST_RSIZE,
+		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
+	*dstp = dma->dsti++;
+	dma->dstk = dma->dsti;
+
+	if (dma->resi == HIFN_D_RES_RSIZE) {
+		dma->resi = 0;
+		dma->resr[HIFN_D_RES_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
+		wmb();
+		dma->resr[HIFN_D_RES_RSIZE].l |= htole32(HIFN_D_VALID);
+		HIFN_RESR_SYNC(sc, HIFN_D_RES_RSIZE,
+		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
+	*resp = dma->resi++;
+	dma->resk = dma->resi;
+}
+
+static int
+hifn_writeramaddr(struct hifn_softc *sc, int addr, u_int8_t *data)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+	hifn_base_command_t wc;
+	const u_int32_t masks = HIFN_D_VALID | HIFN_D_LAST | HIFN_D_MASKDONEIRQ;
+	int r, cmdi, resi, srci, dsti;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	wc.masks = htole16(3 << 13);
+	wc.session_num = htole16(addr >> 14);
+	wc.total_source_count = htole16(8);
+	wc.total_dest_count = htole16(addr & 0x3fff);
+
+	hifn_alloc_slot(sc, &cmdi, &srci, &dsti, &resi);
+
+	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
+	    HIFN_DMACSR_C_CTRL_ENA | HIFN_DMACSR_S_CTRL_ENA |
+	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA);
+
+	/* build write command */
+	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND);
+	*(hifn_base_command_t *)dma->command_bufs[cmdi] = wc;
+	bcopy(data, &dma->test_src, sizeof(dma->test_src));
+
+	dma->srcr[srci].p = htole32(sc->sc_dma_physaddr
+	    + offsetof(struct hifn_dma, test_src));
+	dma->dstr[dsti].p = htole32(sc->sc_dma_physaddr
+	    + offsetof(struct hifn_dma, test_dst));
+
+	dma->cmdr[cmdi].l = htole32(16 | masks);
+	dma->srcr[srci].l = htole32(8 | masks);
+	dma->dstr[dsti].l = htole32(4 | masks);
+	dma->resr[resi].l = htole32(4 | masks);
+
+	for (r = 10000; r >= 0; r--) {
+		DELAY(10);
+		if ((dma->resr[resi].l & htole32(HIFN_D_VALID)) == 0)
+			break;
+	}
+	if (r == 0) {
+		device_printf(sc->sc_dev, "writeramaddr -- "
+		    "result[%d](addr %d) still valid\n", resi, addr);
+		r = -1;
+		return (-1);
+	} else
+		r = 0;
+
+	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
+	    HIFN_DMACSR_C_CTRL_DIS | HIFN_DMACSR_S_CTRL_DIS |
+	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS);
+
+	return (r);
+}
+
+static int
+hifn_readramaddr(struct hifn_softc *sc, int addr, u_int8_t *data)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+	hifn_base_command_t rc;
+	const u_int32_t masks = HIFN_D_VALID | HIFN_D_LAST | HIFN_D_MASKDONEIRQ;
+	int r, cmdi, srci, dsti, resi;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	rc.masks = htole16(2 << 13);
+	rc.session_num = htole16(addr >> 14);
+	rc.total_source_count = htole16(addr & 0x3fff);
+	rc.total_dest_count = htole16(8);
+
+	hifn_alloc_slot(sc, &cmdi, &srci, &dsti, &resi);
+
+	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
+	    HIFN_DMACSR_C_CTRL_ENA | HIFN_DMACSR_S_CTRL_ENA |
+	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA);
+
+	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND);
+	*(hifn_base_command_t *)dma->command_bufs[cmdi] = rc;
+
+	dma->srcr[srci].p = htole32(sc->sc_dma_physaddr +
+	    offsetof(struct hifn_dma, test_src));
+	dma->test_src = 0;
+	dma->dstr[dsti].p =  htole32(sc->sc_dma_physaddr +
+	    offsetof(struct hifn_dma, test_dst));
+	dma->test_dst = 0;
+	dma->cmdr[cmdi].l = htole32(8 | masks);
+	dma->srcr[srci].l = htole32(8 | masks);
+	dma->dstr[dsti].l = htole32(8 | masks);
+	dma->resr[resi].l = htole32(HIFN_MAX_RESULT | masks);
+
+	for (r = 10000; r >= 0; r--) {
+		DELAY(10);
+		if ((dma->resr[resi].l & htole32(HIFN_D_VALID)) == 0)
+			break;
+	}
+	if (r == 0) {
+		device_printf(sc->sc_dev, "readramaddr -- "
+		    "result[%d](addr %d) still valid\n", resi, addr);
+		r = -1;
+	} else {
+		r = 0;
+		bcopy(&dma->test_dst, data, sizeof(dma->test_dst));
+	}
+
+	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
+	    HIFN_DMACSR_C_CTRL_DIS | HIFN_DMACSR_S_CTRL_DIS |
+	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS);
+
+	return (r);
+}
+
+/*
+ * Initialize the descriptor rings.
+ */
+static void 
+hifn_init_dma(struct hifn_softc *sc)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	hifn_set_retry(sc);
+
+	/* initialize static pointer values */
+	for (i = 0; i < HIFN_D_CMD_RSIZE; i++)
+		dma->cmdr[i].p = htole32(sc->sc_dma_physaddr +
+		    offsetof(struct hifn_dma, command_bufs[i][0]));
+	for (i = 0; i < HIFN_D_RES_RSIZE; i++)
+		dma->resr[i].p = htole32(sc->sc_dma_physaddr +
+		    offsetof(struct hifn_dma, result_bufs[i][0]));
+
+	dma->cmdr[HIFN_D_CMD_RSIZE].p =
+	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, cmdr[0]));
+	dma->srcr[HIFN_D_SRC_RSIZE].p =
+	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, srcr[0]));
+	dma->dstr[HIFN_D_DST_RSIZE].p =
+	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, dstr[0]));
+	dma->resr[HIFN_D_RES_RSIZE].p =
+	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, resr[0]));
+
+	dma->cmdu = dma->srcu = dma->dstu = dma->resu = 0;
+	dma->cmdi = dma->srci = dma->dsti = dma->resi = 0;
+	dma->cmdk = dma->srck = dma->dstk = dma->resk = 0;
+}
+
+/*
+ * Writes out the raw command buffer space.  Returns the
+ * command buffer size.
+ */
+static u_int
+hifn_write_command(struct hifn_command *cmd, u_int8_t *buf)
+{
+	struct hifn_softc *sc = NULL;
+	u_int8_t *buf_pos;
+	hifn_base_command_t *base_cmd;
+	hifn_mac_command_t *mac_cmd;
+	hifn_crypt_command_t *cry_cmd;
+	int using_mac, using_crypt, len, ivlen;
+	u_int32_t dlen, slen;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	buf_pos = buf;
+	using_mac = cmd->base_masks & HIFN_BASE_CMD_MAC;
+	using_crypt = cmd->base_masks & HIFN_BASE_CMD_CRYPT;
+
+	base_cmd = (hifn_base_command_t *)buf_pos;
+	base_cmd->masks = htole16(cmd->base_masks);
+	slen = cmd->src_mapsize;
+	if (cmd->sloplen)
+		dlen = cmd->dst_mapsize - cmd->sloplen + sizeof(u_int32_t);
+	else
+		dlen = cmd->dst_mapsize;
+	base_cmd->total_source_count = htole16(slen & HIFN_BASE_CMD_LENMASK_LO);
+	base_cmd->total_dest_count = htole16(dlen & HIFN_BASE_CMD_LENMASK_LO);
+	dlen >>= 16;
+	slen >>= 16;
+	base_cmd->session_num = htole16(
+	    ((slen << HIFN_BASE_CMD_SRCLEN_S) & HIFN_BASE_CMD_SRCLEN_M) |
+	    ((dlen << HIFN_BASE_CMD_DSTLEN_S) & HIFN_BASE_CMD_DSTLEN_M));
+	buf_pos += sizeof(hifn_base_command_t);
+
+	if (using_mac) {
+		mac_cmd = (hifn_mac_command_t *)buf_pos;
+		dlen = cmd->maccrd->crd_len;
+		mac_cmd->source_count = htole16(dlen & 0xffff);
+		dlen >>= 16;
+		mac_cmd->masks = htole16(cmd->mac_masks |
+		    ((dlen << HIFN_MAC_CMD_SRCLEN_S) & HIFN_MAC_CMD_SRCLEN_M));
+		mac_cmd->header_skip = htole16(cmd->maccrd->crd_skip);
+		mac_cmd->reserved = 0;
+		buf_pos += sizeof(hifn_mac_command_t);
+	}
+
+	if (using_crypt) {
+		cry_cmd = (hifn_crypt_command_t *)buf_pos;
+		dlen = cmd->enccrd->crd_len;
+		cry_cmd->source_count = htole16(dlen & 0xffff);
+		dlen >>= 16;
+		cry_cmd->masks = htole16(cmd->cry_masks |
+		    ((dlen << HIFN_CRYPT_CMD_SRCLEN_S) & HIFN_CRYPT_CMD_SRCLEN_M));
+		cry_cmd->header_skip = htole16(cmd->enccrd->crd_skip);
+		cry_cmd->reserved = 0;
+		buf_pos += sizeof(hifn_crypt_command_t);
+	}
+
+	if (using_mac && cmd->mac_masks & HIFN_MAC_CMD_NEW_KEY) {
+		bcopy(cmd->mac, buf_pos, HIFN_MAC_KEY_LENGTH);
+		buf_pos += HIFN_MAC_KEY_LENGTH;
+	}
+
+	if (using_crypt && cmd->cry_masks & HIFN_CRYPT_CMD_NEW_KEY) {
+		switch (cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) {
+		case HIFN_CRYPT_CMD_ALG_3DES:
+			bcopy(cmd->ck, buf_pos, HIFN_3DES_KEY_LENGTH);
+			buf_pos += HIFN_3DES_KEY_LENGTH;
+			break;
+		case HIFN_CRYPT_CMD_ALG_DES:
+			bcopy(cmd->ck, buf_pos, HIFN_DES_KEY_LENGTH);
+			buf_pos += HIFN_DES_KEY_LENGTH;
+			break;
+		case HIFN_CRYPT_CMD_ALG_RC4:
+			len = 256;
+			do {
+				int clen;
+
+				clen = MIN(cmd->cklen, len);
+				bcopy(cmd->ck, buf_pos, clen);
+				len -= clen;
+				buf_pos += clen;
+			} while (len > 0);
+			bzero(buf_pos, 4);
+			buf_pos += 4;
+			break;
+		case HIFN_CRYPT_CMD_ALG_AES:
+			/*
+			 * AES keys are variable 128, 192 and
+			 * 256 bits (16, 24 and 32 bytes).
+			 */
+			bcopy(cmd->ck, buf_pos, cmd->cklen);
+			buf_pos += cmd->cklen;
+			break;
+		}
+	}
+
+	if (using_crypt && cmd->cry_masks & HIFN_CRYPT_CMD_NEW_IV) {
+		switch (cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) {
+		case HIFN_CRYPT_CMD_ALG_AES:
+			ivlen = HIFN_AES_IV_LENGTH;
+			break;
+		default:
+			ivlen = HIFN_IV_LENGTH;
+			break;
+		}
+		bcopy(cmd->iv, buf_pos, ivlen);
+		buf_pos += ivlen;
+	}
+
+	if ((cmd->base_masks & (HIFN_BASE_CMD_MAC|HIFN_BASE_CMD_CRYPT)) == 0) {
+		bzero(buf_pos, 8);
+		buf_pos += 8;
+	}
+
+	return (buf_pos - buf);
+}
+
+static int
+hifn_dmamap_aligned(struct hifn_operand *op)
+{
+	struct hifn_softc *sc = NULL;
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	for (i = 0; i < op->nsegs; i++) {
+		if (op->segs[i].ds_addr & 3)
+			return (0);
+		if ((i != (op->nsegs - 1)) && (op->segs[i].ds_len & 3))
+			return (0);
+	}
+	return (1);
+}
+
+static __inline int
+hifn_dmamap_dstwrap(struct hifn_softc *sc, int idx)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+
+	if (++idx == HIFN_D_DST_RSIZE) {
+		dma->dstr[idx].l = htole32(HIFN_D_VALID | HIFN_D_JUMP |
+		    HIFN_D_MASKDONEIRQ);
+		HIFN_DSTR_SYNC(sc, idx,
+		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+		idx = 0;
+	}
+	return (idx);
+}
+
+static int
+hifn_dmamap_load_dst(struct hifn_softc *sc, struct hifn_command *cmd)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+	struct hifn_operand *dst = &cmd->dst;
+	u_int32_t p, l;
+	int idx, used = 0, i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	idx = dma->dsti;
+	for (i = 0; i < dst->nsegs - 1; i++) {
+		dma->dstr[idx].p = htole32(dst->segs[i].ds_addr);
+		dma->dstr[idx].l = htole32(HIFN_D_MASKDONEIRQ | dst->segs[i].ds_len);
+		wmb();
+		dma->dstr[idx].l |= htole32(HIFN_D_VALID);
+		HIFN_DSTR_SYNC(sc, idx,
+		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+		used++;
+
+		idx = hifn_dmamap_dstwrap(sc, idx);
+	}
+
+	if (cmd->sloplen == 0) {
+		p = dst->segs[i].ds_addr;
+		l = HIFN_D_MASKDONEIRQ | HIFN_D_LAST |
+		    dst->segs[i].ds_len;
+	} else {
+		p = sc->sc_dma_physaddr +
+		    offsetof(struct hifn_dma, slop[cmd->slopidx]);
+		l = HIFN_D_MASKDONEIRQ | HIFN_D_LAST |
+		    sizeof(u_int32_t);
+
+		if ((dst->segs[i].ds_len - cmd->sloplen) != 0) {
+			dma->dstr[idx].p = htole32(dst->segs[i].ds_addr);
+			dma->dstr[idx].l = htole32(HIFN_D_MASKDONEIRQ |
+			    (dst->segs[i].ds_len - cmd->sloplen));
+			wmb();
+			dma->dstr[idx].l |= htole32(HIFN_D_VALID);
+			HIFN_DSTR_SYNC(sc, idx,
+			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+			used++;
+
+			idx = hifn_dmamap_dstwrap(sc, idx);
+		}
+	}
+	dma->dstr[idx].p = htole32(p);
+	dma->dstr[idx].l = htole32(l);
+	wmb();
+	dma->dstr[idx].l |= htole32(HIFN_D_VALID);
+	HIFN_DSTR_SYNC(sc, idx, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	used++;
+
+	idx = hifn_dmamap_dstwrap(sc, idx);
+
+	dma->dsti = idx;
+	dma->dstu += used;
+	return (idx);
+}
+
+static __inline int
+hifn_dmamap_srcwrap(struct hifn_softc *sc, int idx)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+
+	if (++idx == HIFN_D_SRC_RSIZE) {
+		dma->srcr[idx].l = htole32(HIFN_D_VALID |
+		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ);
+		HIFN_SRCR_SYNC(sc, HIFN_D_SRC_RSIZE,
+		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+		idx = 0;
+	}
+	return (idx);
+}
+
+static int
+hifn_dmamap_load_src(struct hifn_softc *sc, struct hifn_command *cmd)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+	struct hifn_operand *src = &cmd->src;
+	int idx, i;
+	u_int32_t last = 0;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	idx = dma->srci;
+	for (i = 0; i < src->nsegs; i++) {
+		if (i == src->nsegs - 1)
+			last = HIFN_D_LAST;
+
+		dma->srcr[idx].p = htole32(src->segs[i].ds_addr);
+		dma->srcr[idx].l = htole32(src->segs[i].ds_len |
+		    HIFN_D_MASKDONEIRQ | last);
+		wmb();
+		dma->srcr[idx].l |= htole32(HIFN_D_VALID);
+		HIFN_SRCR_SYNC(sc, idx,
+		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+
+		idx = hifn_dmamap_srcwrap(sc, idx);
+	}
+	dma->srci = idx;
+	dma->srcu += src->nsegs;
+	return (idx);
+} 
+
+
+static int 
+hifn_crypto(
+	struct hifn_softc *sc,
+	struct hifn_command *cmd,
+	struct cryptop *crp,
+	int hint)
+{
+	struct	hifn_dma *dma = sc->sc_dma;
+	u_int32_t cmdlen, csr;
+	int cmdi, resi, err = 0;
+	unsigned long l_flags;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	/*
+	 * need 1 cmd, and 1 res
+	 *
+	 * NB: check this first since it's easy.
+	 */
+	HIFN_LOCK(sc);
+	if ((dma->cmdu + 1) > HIFN_D_CMD_RSIZE ||
+	    (dma->resu + 1) > HIFN_D_RES_RSIZE) {
+#ifdef HIFN_DEBUG
+		if (hifn_debug) {
+			device_printf(sc->sc_dev,
+				"cmd/result exhaustion, cmdu %u resu %u\n",
+				dma->cmdu, dma->resu);
+		}
+#endif
+		hifnstats.hst_nomem_cr++;
+		sc->sc_needwakeup |= CRYPTO_SYMQ;
+		HIFN_UNLOCK(sc);
+		return (ERESTART);
+	}
+
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		if (pci_map_skb(sc, &cmd->src, cmd->src_skb)) {
+			hifnstats.hst_nomem_load++;
+			err = ENOMEM;
+			goto err_srcmap1;
+		}
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		if (pci_map_uio(sc, &cmd->src, cmd->src_io)) {
+			hifnstats.hst_nomem_load++;
+			err = ENOMEM;
+			goto err_srcmap1;
+		}
+	} else {
+		if (pci_map_buf(sc, &cmd->src, cmd->src_buf, crp->crp_ilen)) {
+			hifnstats.hst_nomem_load++;
+			err = ENOMEM;
+			goto err_srcmap1;
+		}
+	}
+
+	if (hifn_dmamap_aligned(&cmd->src)) {
+		cmd->sloplen = cmd->src_mapsize & 3;
+		cmd->dst = cmd->src;
+	} else {
+		if (crp->crp_flags & CRYPTO_F_IOV) {
+			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+			err = EINVAL;
+			goto err_srcmap;
+		} else if (crp->crp_flags & CRYPTO_F_SKBUF) {
+#ifdef NOTYET
+			int totlen, len;
+			struct mbuf *m, *m0, *mlast;
+
+			KASSERT(cmd->dst_m == cmd->src_m,
+				("hifn_crypto: dst_m initialized improperly"));
+			hifnstats.hst_unaligned++;
+			/*
+			 * Source is not aligned on a longword boundary.
+			 * Copy the data to insure alignment.  If we fail
+			 * to allocate mbufs or clusters while doing this
+			 * we return ERESTART so the operation is requeued
+			 * at the crypto later, but only if there are
+			 * ops already posted to the hardware; otherwise we
+			 * have no guarantee that we'll be re-entered.
+			 */
+			totlen = cmd->src_mapsize;
+			if (cmd->src_m->m_flags & M_PKTHDR) {
+				len = MHLEN;
+				MGETHDR(m0, M_DONTWAIT, MT_DATA);
+				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_DONTWAIT)) {
+					m_free(m0);
+					m0 = NULL;
+				}
+			} else {
+				len = MLEN;
+				MGET(m0, M_DONTWAIT, MT_DATA);
+			}
+			if (m0 == NULL) {
+				hifnstats.hst_nomem_mbuf++;
+				err = dma->cmdu ? ERESTART : ENOMEM;
+				goto err_srcmap;
+			}
+			if (totlen >= MINCLSIZE) {
+				MCLGET(m0, M_DONTWAIT);
+				if ((m0->m_flags & M_EXT) == 0) {
+					hifnstats.hst_nomem_mcl++;
+					err = dma->cmdu ? ERESTART : ENOMEM;
+					m_freem(m0);
+					goto err_srcmap;
+				}
+				len = MCLBYTES;
+			}
+			totlen -= len;
+			m0->m_pkthdr.len = m0->m_len = len;
+			mlast = m0;
+
+			while (totlen > 0) {
+				MGET(m, M_DONTWAIT, MT_DATA);
+				if (m == NULL) {
+					hifnstats.hst_nomem_mbuf++;
+					err = dma->cmdu ? ERESTART : ENOMEM;
+					m_freem(m0);
+					goto err_srcmap;
+				}
+				len = MLEN;
+				if (totlen >= MINCLSIZE) {
+					MCLGET(m, M_DONTWAIT);
+					if ((m->m_flags & M_EXT) == 0) {
+						hifnstats.hst_nomem_mcl++;
+						err = dma->cmdu ? ERESTART : ENOMEM;
+						mlast->m_next = m;
+						m_freem(m0);
+						goto err_srcmap;
+					}
+					len = MCLBYTES;
+				}
+
+				m->m_len = len;
+				m0->m_pkthdr.len += len;
+				totlen -= len;
+
+				mlast->m_next = m;
+				mlast = m;
+			}
+			cmd->dst_m = m0;
+#else
+			device_printf(sc->sc_dev,
+					"%s,%d: CRYPTO_F_SKBUF unaligned not implemented\n",
+					__FILE__, __LINE__);
+			err = EINVAL;
+			goto err_srcmap;
+#endif
+		} else {
+			device_printf(sc->sc_dev,
+					"%s,%d: unaligned contig buffers not implemented\n",
+					__FILE__, __LINE__);
+			err = EINVAL;
+			goto err_srcmap;
+		}
+	}
+
+	if (cmd->dst_map == NULL) {
+		if (crp->crp_flags & CRYPTO_F_SKBUF) {
+			if (pci_map_skb(sc, &cmd->dst, cmd->dst_skb)) {
+				hifnstats.hst_nomem_map++;
+				err = ENOMEM;
+				goto err_dstmap1;
+			}
+		} else if (crp->crp_flags & CRYPTO_F_IOV) {
+			if (pci_map_uio(sc, &cmd->dst, cmd->dst_io)) {
+				hifnstats.hst_nomem_load++;
+				err = ENOMEM;
+				goto err_dstmap1;
+			}
+		} else {
+			if (pci_map_buf(sc, &cmd->dst, cmd->dst_buf, crp->crp_ilen)) {
+				hifnstats.hst_nomem_load++;
+				err = ENOMEM;
+				goto err_dstmap1;
+			}
+		}
+	}
+
+#ifdef HIFN_DEBUG
+	if (hifn_debug) {
+		device_printf(sc->sc_dev,
+		    "Entering cmd: stat %8x ien %8x u %d/%d/%d/%d n %d/%d\n",
+		    READ_REG_1(sc, HIFN_1_DMA_CSR),
+		    READ_REG_1(sc, HIFN_1_DMA_IER),
+		    dma->cmdu, dma->srcu, dma->dstu, dma->resu,
+		    cmd->src_nsegs, cmd->dst_nsegs);
+	}
+#endif
+
+#if 0
+	if (cmd->src_map == cmd->dst_map) {
+		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
+		    BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+	} else {
+		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
+		    BUS_DMASYNC_PREWRITE);
+		bus_dmamap_sync(sc->sc_dmat, cmd->dst_map,
+		    BUS_DMASYNC_PREREAD);
+	}
+#endif
+
+	/*
+	 * need N src, and N dst
+	 */
+	if ((dma->srcu + cmd->src_nsegs) > HIFN_D_SRC_RSIZE ||
+	    (dma->dstu + cmd->dst_nsegs + 1) > HIFN_D_DST_RSIZE) {
+#ifdef HIFN_DEBUG
+		if (hifn_debug) {
+			device_printf(sc->sc_dev,
+				"src/dst exhaustion, srcu %u+%u dstu %u+%u\n",
+				dma->srcu, cmd->src_nsegs,
+				dma->dstu, cmd->dst_nsegs);
+		}
+#endif
+		hifnstats.hst_nomem_sd++;
+		err = ERESTART;
+		goto err_dstmap;
+	}
+
+	if (dma->cmdi == HIFN_D_CMD_RSIZE) {
+		dma->cmdi = 0;
+		dma->cmdr[HIFN_D_CMD_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
+		wmb();
+		dma->cmdr[HIFN_D_CMD_RSIZE].l |= htole32(HIFN_D_VALID);
+		HIFN_CMDR_SYNC(sc, HIFN_D_CMD_RSIZE,
+		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
+	cmdi = dma->cmdi++;
+	cmdlen = hifn_write_command(cmd, dma->command_bufs[cmdi]);
+	HIFN_CMD_SYNC(sc, cmdi, BUS_DMASYNC_PREWRITE);
+
+	/* .p for command/result already set */
+	dma->cmdr[cmdi].l = htole32(cmdlen | HIFN_D_LAST |
+	    HIFN_D_MASKDONEIRQ);
+	wmb();
+	dma->cmdr[cmdi].l |= htole32(HIFN_D_VALID);
+	HIFN_CMDR_SYNC(sc, cmdi,
+	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	dma->cmdu++;
+
+	/*
+	 * We don't worry about missing an interrupt (which a "command wait"
+	 * interrupt salvages us from), unless there is more than one command
+	 * in the queue.
+	 */
+	if (dma->cmdu > 1) {
+		sc->sc_dmaier |= HIFN_DMAIER_C_WAIT;
+		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
+	}
+
+	hifnstats.hst_ipackets++;
+	hifnstats.hst_ibytes += cmd->src_mapsize;
+
+	hifn_dmamap_load_src(sc, cmd);
+
+	/*
+	 * Unlike other descriptors, we don't mask done interrupt from
+	 * result descriptor.
+	 */
+#ifdef HIFN_DEBUG
+	if (hifn_debug)
+		device_printf(sc->sc_dev, "load res\n");
+#endif
+	if (dma->resi == HIFN_D_RES_RSIZE) {
+		dma->resi = 0;
+		dma->resr[HIFN_D_RES_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
+		wmb();
+		dma->resr[HIFN_D_RES_RSIZE].l |= htole32(HIFN_D_VALID);
+		HIFN_RESR_SYNC(sc, HIFN_D_RES_RSIZE,
+		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	}
+	resi = dma->resi++;
+	KASSERT(dma->hifn_commands[resi] == NULL,
+		("hifn_crypto: command slot %u busy", resi));
+	dma->hifn_commands[resi] = cmd;
+	HIFN_RES_SYNC(sc, resi, BUS_DMASYNC_PREREAD);
+	if ((hint & CRYPTO_HINT_MORE) && sc->sc_curbatch < hifn_maxbatch) {
+		dma->resr[resi].l = htole32(HIFN_MAX_RESULT |
+		    HIFN_D_LAST | HIFN_D_MASKDONEIRQ);
+		wmb();
+		dma->resr[resi].l |= htole32(HIFN_D_VALID);
+		sc->sc_curbatch++;
+		if (sc->sc_curbatch > hifnstats.hst_maxbatch)
+			hifnstats.hst_maxbatch = sc->sc_curbatch;
+		hifnstats.hst_totbatch++;
+	} else {
+		dma->resr[resi].l = htole32(HIFN_MAX_RESULT | HIFN_D_LAST);
+		wmb();
+		dma->resr[resi].l |= htole32(HIFN_D_VALID);
+		sc->sc_curbatch = 0;
+	}
+	HIFN_RESR_SYNC(sc, resi,
+	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	dma->resu++;
+
+	if (cmd->sloplen)
+		cmd->slopidx = resi;
+
+	hifn_dmamap_load_dst(sc, cmd);
+
+	csr = 0;
+	if (sc->sc_c_busy == 0) {
+		csr |= HIFN_DMACSR_C_CTRL_ENA;
+		sc->sc_c_busy = 1;
+	}
+	if (sc->sc_s_busy == 0) {
+		csr |= HIFN_DMACSR_S_CTRL_ENA;
+		sc->sc_s_busy = 1;
+	}
+	if (sc->sc_r_busy == 0) {
+		csr |= HIFN_DMACSR_R_CTRL_ENA;
+		sc->sc_r_busy = 1;
+	}
+	if (sc->sc_d_busy == 0) {
+		csr |= HIFN_DMACSR_D_CTRL_ENA;
+		sc->sc_d_busy = 1;
+	}
+	if (csr)
+		WRITE_REG_1(sc, HIFN_1_DMA_CSR, csr);
+
+#ifdef HIFN_DEBUG
+	if (hifn_debug) {
+		device_printf(sc->sc_dev, "command: stat %8x ier %8x\n",
+		    READ_REG_1(sc, HIFN_1_DMA_CSR),
+		    READ_REG_1(sc, HIFN_1_DMA_IER));
+	}
+#endif
+
+	sc->sc_active = 5;
+	HIFN_UNLOCK(sc);
+	KASSERT(err == 0, ("hifn_crypto: success with error %u", err));
+	return (err);		/* success */
+
+err_dstmap:
+	if (cmd->src_map != cmd->dst_map)
+		pci_unmap_buf(sc, &cmd->dst);
+err_dstmap1:
+err_srcmap:
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		if (cmd->src_skb != cmd->dst_skb)
+#ifdef NOTYET
+			m_freem(cmd->dst_m);
+#else
+			device_printf(sc->sc_dev,
+					"%s,%d: CRYPTO_F_SKBUF src != dst not implemented\n",
+					__FILE__, __LINE__);
+#endif
+	}
+	pci_unmap_buf(sc, &cmd->src);
+err_srcmap1:
+	HIFN_UNLOCK(sc);
+	return (err);
+}
+
+static void
+hifn_tick(unsigned long arg)
+{
+	struct hifn_softc *sc;
+	unsigned long l_flags;
+
+	if (arg >= HIFN_MAX_CHIPS)
+		return;
+	sc = hifn_chip_idx[arg];
+	if (!sc)
+		return;
+
+	HIFN_LOCK(sc);
+	if (sc->sc_active == 0) {
+		struct hifn_dma *dma = sc->sc_dma;
+		u_int32_t r = 0;
+
+		if (dma->cmdu == 0 && sc->sc_c_busy) {
+			sc->sc_c_busy = 0;
+			r |= HIFN_DMACSR_C_CTRL_DIS;
+		}
+		if (dma->srcu == 0 && sc->sc_s_busy) {
+			sc->sc_s_busy = 0;
+			r |= HIFN_DMACSR_S_CTRL_DIS;
+		}
+		if (dma->dstu == 0 && sc->sc_d_busy) {
+			sc->sc_d_busy = 0;
+			r |= HIFN_DMACSR_D_CTRL_DIS;
+		}
+		if (dma->resu == 0 && sc->sc_r_busy) {
+			sc->sc_r_busy = 0;
+			r |= HIFN_DMACSR_R_CTRL_DIS;
+		}
+		if (r)
+			WRITE_REG_1(sc, HIFN_1_DMA_CSR, r);
+	} else
+		sc->sc_active--;
+	HIFN_UNLOCK(sc);
+	mod_timer(&sc->sc_tickto, jiffies + HZ);
+}
+
+static irqreturn_t
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+hifn_intr(int irq, void *arg)
+#else
+hifn_intr(int irq, void *arg, struct pt_regs *regs)
+#endif
+{
+	struct hifn_softc *sc = arg;
+	struct hifn_dma *dma;
+	u_int32_t dmacsr, restart;
+	int i, u;
+	unsigned long l_flags;
+
+	dmacsr = READ_REG_1(sc, HIFN_1_DMA_CSR);
+
+	/* Nothing in the DMA unit interrupted */
+	if ((dmacsr & sc->sc_dmaier) == 0)
+		return IRQ_NONE;
+
+	HIFN_LOCK(sc);
+
+	dma = sc->sc_dma;
+
+#ifdef HIFN_DEBUG
+	if (hifn_debug) {
+		device_printf(sc->sc_dev,
+		    "irq: stat %08x ien %08x damier %08x i %d/%d/%d/%d k %d/%d/%d/%d u %d/%d/%d/%d\n",
+		    dmacsr, READ_REG_1(sc, HIFN_1_DMA_IER), sc->sc_dmaier,
+		    dma->cmdi, dma->srci, dma->dsti, dma->resi,
+		    dma->cmdk, dma->srck, dma->dstk, dma->resk,
+		    dma->cmdu, dma->srcu, dma->dstu, dma->resu);
+	}
+#endif
+
+	WRITE_REG_1(sc, HIFN_1_DMA_CSR, dmacsr & sc->sc_dmaier);
+
+	if ((sc->sc_flags & HIFN_HAS_PUBLIC) &&
+	    (dmacsr & HIFN_DMACSR_PUBDONE))
+		WRITE_REG_1(sc, HIFN_1_PUB_STATUS,
+		    READ_REG_1(sc, HIFN_1_PUB_STATUS) | HIFN_PUBSTS_DONE);
+
+	restart = dmacsr & (HIFN_DMACSR_D_OVER | HIFN_DMACSR_R_OVER);
+	if (restart)
+		device_printf(sc->sc_dev, "overrun %x\n", dmacsr);
+
+	if (sc->sc_flags & HIFN_IS_7811) {
+		if (dmacsr & HIFN_DMACSR_ILLR)
+			device_printf(sc->sc_dev, "illegal read\n");
+		if (dmacsr & HIFN_DMACSR_ILLW)
+			device_printf(sc->sc_dev, "illegal write\n");
+	}
+
+	restart = dmacsr & (HIFN_DMACSR_C_ABORT | HIFN_DMACSR_S_ABORT |
+	    HIFN_DMACSR_D_ABORT | HIFN_DMACSR_R_ABORT);
+	if (restart) {
+		device_printf(sc->sc_dev, "abort, resetting.\n");
+		hifnstats.hst_abort++;
+		hifn_abort(sc);
+		HIFN_UNLOCK(sc);
+		return IRQ_HANDLED;
+	}
+
+	if ((dmacsr & HIFN_DMACSR_C_WAIT) && (dma->cmdu == 0)) {
+		/*
+		 * If no slots to process and we receive a "waiting on
+		 * command" interrupt, we disable the "waiting on command"
+		 * (by clearing it).
+		 */
+		sc->sc_dmaier &= ~HIFN_DMAIER_C_WAIT;
+		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
+	}
+
+	/* clear the rings */
+	i = dma->resk; u = dma->resu;
+	while (u != 0) {
+		HIFN_RESR_SYNC(sc, i,
+		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		if (dma->resr[i].l & htole32(HIFN_D_VALID)) {
+			HIFN_RESR_SYNC(sc, i,
+			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+			break;
+		}
+
+		if (i != HIFN_D_RES_RSIZE) {
+			struct hifn_command *cmd;
+			u_int8_t *macbuf = NULL;
+
+			HIFN_RES_SYNC(sc, i, BUS_DMASYNC_POSTREAD);
+			cmd = dma->hifn_commands[i];
+			KASSERT(cmd != NULL,
+				("hifn_intr: null command slot %u", i));
+			dma->hifn_commands[i] = NULL;
+
+			if (cmd->base_masks & HIFN_BASE_CMD_MAC) {
+				macbuf = dma->result_bufs[i];
+				macbuf += 12;
+			}
+
+			hifn_callback(sc, cmd, macbuf);
+			hifnstats.hst_opackets++;
+			u--;
+		}
+
+		if (++i == (HIFN_D_RES_RSIZE + 1))
+			i = 0;
+	}
+	dma->resk = i; dma->resu = u;
+
+	i = dma->srck; u = dma->srcu;
+	while (u != 0) {
+		if (i == HIFN_D_SRC_RSIZE)
+			i = 0;
+		HIFN_SRCR_SYNC(sc, i,
+		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		if (dma->srcr[i].l & htole32(HIFN_D_VALID)) {
+			HIFN_SRCR_SYNC(sc, i,
+			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+			break;
+		}
+		i++, u--;
+	}
+	dma->srck = i; dma->srcu = u;
+
+	i = dma->cmdk; u = dma->cmdu;
+	while (u != 0) {
+		HIFN_CMDR_SYNC(sc, i,
+		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		if (dma->cmdr[i].l & htole32(HIFN_D_VALID)) {
+			HIFN_CMDR_SYNC(sc, i,
+			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+			break;
+		}
+		if (i != HIFN_D_CMD_RSIZE) {
+			u--;
+			HIFN_CMD_SYNC(sc, i, BUS_DMASYNC_POSTWRITE);
+		}
+		if (++i == (HIFN_D_CMD_RSIZE + 1))
+			i = 0;
+	}
+	dma->cmdk = i; dma->cmdu = u;
+
+	HIFN_UNLOCK(sc);
+
+	if (sc->sc_needwakeup) {		/* XXX check high watermark */
+		int wakeup = sc->sc_needwakeup & (CRYPTO_SYMQ|CRYPTO_ASYMQ);
+#ifdef HIFN_DEBUG
+		if (hifn_debug)
+			device_printf(sc->sc_dev,
+				"wakeup crypto (%x) u %d/%d/%d/%d\n",
+				sc->sc_needwakeup,
+				dma->cmdu, dma->srcu, dma->dstu, dma->resu);
+#endif
+		sc->sc_needwakeup &= ~wakeup;
+		crypto_unblock(sc->sc_cid, wakeup);
+	}
+
+	return IRQ_HANDLED;
+}
+
+/*
+ * Allocate a new 'session' and return an encoded session id.  'sidp'
+ * contains our registration id, and should contain an encoded session
+ * id on successful allocation.
+ */
+static int
+hifn_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
+{
+	struct hifn_softc *sc = device_get_softc(dev);
+	struct cryptoini *c;
+	int mac = 0, cry = 0, sesn;
+	struct hifn_session *ses = NULL;
+	unsigned long l_flags;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	KASSERT(sc != NULL, ("hifn_newsession: null softc"));
+	if (sidp == NULL || cri == NULL || sc == NULL) {
+		DPRINTF("%s,%d: %s - EINVAL\n", __FILE__, __LINE__, __FUNCTION__);
+		return (EINVAL);
+	}
+
+	HIFN_LOCK(sc);
+	if (sc->sc_sessions == NULL) {
+		ses = sc->sc_sessions = (struct hifn_session *)kmalloc(sizeof(*ses),
+				SLAB_ATOMIC);
+		if (ses == NULL) {
+			HIFN_UNLOCK(sc);
+			return (ENOMEM);
+		}
+		sesn = 0;
+		sc->sc_nsessions = 1;
+	} else {
+		for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
+			if (!sc->sc_sessions[sesn].hs_used) {
+				ses = &sc->sc_sessions[sesn];
+				break;
+			}
+		}
+
+		if (ses == NULL) {
+			sesn = sc->sc_nsessions;
+			ses = (struct hifn_session *)kmalloc((sesn + 1) * sizeof(*ses),
+					SLAB_ATOMIC);
+			if (ses == NULL) {
+				HIFN_UNLOCK(sc);
+				return (ENOMEM);
+			}
+			bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
+			bzero(sc->sc_sessions, sesn * sizeof(*ses));
+			kfree(sc->sc_sessions);
+			sc->sc_sessions = ses;
+			ses = &sc->sc_sessions[sesn];
+			sc->sc_nsessions++;
+		}
+	}
+	HIFN_UNLOCK(sc);
+
+	bzero(ses, sizeof(*ses));
+	ses->hs_used = 1;
+
+	for (c = cri; c != NULL; c = c->cri_next) {
+		switch (c->cri_alg) {
+		case CRYPTO_MD5:
+		case CRYPTO_SHA1:
+		case CRYPTO_MD5_HMAC:
+		case CRYPTO_SHA1_HMAC:
+			if (mac) {
+				DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+				return (EINVAL);
+			}
+			mac = 1;
+			ses->hs_mlen = c->cri_mlen;
+			if (ses->hs_mlen == 0) {
+				switch (c->cri_alg) {
+				case CRYPTO_MD5:
+				case CRYPTO_MD5_HMAC:
+					ses->hs_mlen = 16;
+					break;
+				case CRYPTO_SHA1:
+				case CRYPTO_SHA1_HMAC:
+					ses->hs_mlen = 20;
+					break;
+				}
+			}
+			break;
+		case CRYPTO_DES_CBC:
+		case CRYPTO_3DES_CBC:
+		case CRYPTO_AES_CBC:
+		case CRYPTO_ARC4:
+			if (cry) {
+				DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+				return (EINVAL);
+			}
+			cry = 1;
+			break;
+		default:
+			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+			return (EINVAL);
+		}
+	}
+	if (mac == 0 && cry == 0) {
+		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+		return (EINVAL);
+	}
+
+	*sidp = HIFN_SID(device_get_unit(sc->sc_dev), sesn);
+
+	return (0);
+}
+
+/*
+ * Deallocate a session.
+ * XXX this routine should run a zero'd mac/encrypt key into context ram.
+ * XXX to blow away any keys already stored there.
+ */
+static int
+hifn_freesession(device_t dev, u_int64_t tid)
+{
+	struct hifn_softc *sc = device_get_softc(dev);
+	int session, error;
+	u_int32_t sid = CRYPTO_SESID2LID(tid);
+	unsigned long l_flags;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	KASSERT(sc != NULL, ("hifn_freesession: null softc"));
+	if (sc == NULL) {
+		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+		return (EINVAL);
+	}
+
+	HIFN_LOCK(sc);
+	session = HIFN_SESSION(sid);
+	if (session < sc->sc_nsessions) {
+		bzero(&sc->sc_sessions[session], sizeof(struct hifn_session));
+		error = 0;
+	} else {
+		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+		error = EINVAL;
+	}
+	HIFN_UNLOCK(sc);
+
+	return (error);
+}
+
+static int
+hifn_process(device_t dev, struct cryptop *crp, int hint)
+{
+	struct hifn_softc *sc = device_get_softc(dev);
+	struct hifn_command *cmd = NULL;
+	int session, err, ivlen;
+	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (crp == NULL || crp->crp_callback == NULL) {
+		hifnstats.hst_invalid++;
+		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+		return (EINVAL);
+	}
+	session = HIFN_SESSION(crp->crp_sid);
+
+	if (sc == NULL || session >= sc->sc_nsessions) {
+		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+		err = EINVAL;
+		goto errout;
+	}
+
+	cmd = kmalloc(sizeof(struct hifn_command), SLAB_ATOMIC);
+	if (cmd == NULL) {
+		hifnstats.hst_nomem++;
+		err = ENOMEM;
+		goto errout;
+	}
+	memset(cmd, 0, sizeof(*cmd));
+
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		cmd->src_skb = (struct sk_buff *)crp->crp_buf;
+		cmd->dst_skb = (struct sk_buff *)crp->crp_buf;
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		cmd->src_io = (struct uio *)crp->crp_buf;
+		cmd->dst_io = (struct uio *)crp->crp_buf;
+	} else {
+		cmd->src_buf = crp->crp_buf;
+		cmd->dst_buf = crp->crp_buf;
+	}
+
+	crd1 = crp->crp_desc;
+	if (crd1 == NULL) {
+		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+		err = EINVAL;
+		goto errout;
+	}
+	crd2 = crd1->crd_next;
+
+	if (crd2 == NULL) {
+		if (crd1->crd_alg == CRYPTO_MD5_HMAC ||
+		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
+		    crd1->crd_alg == CRYPTO_SHA1 ||
+		    crd1->crd_alg == CRYPTO_MD5) {
+			maccrd = crd1;
+			enccrd = NULL;
+		} else if (crd1->crd_alg == CRYPTO_DES_CBC ||
+		    crd1->crd_alg == CRYPTO_3DES_CBC ||
+		    crd1->crd_alg == CRYPTO_AES_CBC ||
+		    crd1->crd_alg == CRYPTO_ARC4) {
+			if ((crd1->crd_flags & CRD_F_ENCRYPT) == 0)
+				cmd->base_masks |= HIFN_BASE_CMD_DECODE;
+			maccrd = NULL;
+			enccrd = crd1;
+		} else {
+			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+			err = EINVAL;
+			goto errout;
+		}
+	} else {
+		if ((crd1->crd_alg == CRYPTO_MD5_HMAC ||
+                     crd1->crd_alg == CRYPTO_SHA1_HMAC ||
+                     crd1->crd_alg == CRYPTO_MD5 ||
+                     crd1->crd_alg == CRYPTO_SHA1) &&
+		    (crd2->crd_alg == CRYPTO_DES_CBC ||
+		     crd2->crd_alg == CRYPTO_3DES_CBC ||
+		     crd2->crd_alg == CRYPTO_AES_CBC ||
+		     crd2->crd_alg == CRYPTO_ARC4) &&
+		    ((crd2->crd_flags & CRD_F_ENCRYPT) == 0)) {
+			cmd->base_masks = HIFN_BASE_CMD_DECODE;
+			maccrd = crd1;
+			enccrd = crd2;
+		} else if ((crd1->crd_alg == CRYPTO_DES_CBC ||
+		     crd1->crd_alg == CRYPTO_ARC4 ||
+		     crd1->crd_alg == CRYPTO_3DES_CBC ||
+		     crd1->crd_alg == CRYPTO_AES_CBC) &&
+		    (crd2->crd_alg == CRYPTO_MD5_HMAC ||
+                     crd2->crd_alg == CRYPTO_SHA1_HMAC ||
+                     crd2->crd_alg == CRYPTO_MD5 ||
+                     crd2->crd_alg == CRYPTO_SHA1) &&
+		    (crd1->crd_flags & CRD_F_ENCRYPT)) {
+			enccrd = crd1;
+			maccrd = crd2;
+		} else {
+			/*
+			 * We cannot order the 7751 as requested
+			 */
+			DPRINTF("%s,%d: %s %d,%d,%d - EINVAL\n",__FILE__,__LINE__,__FUNCTION__, crd1->crd_alg, crd2->crd_alg, crd1->crd_flags & CRD_F_ENCRYPT);
+			err = EINVAL;
+			goto errout;
+		}
+	}
+
+	if (enccrd) {
+		cmd->enccrd = enccrd;
+		cmd->base_masks |= HIFN_BASE_CMD_CRYPT;
+		switch (enccrd->crd_alg) {
+		case CRYPTO_ARC4:
+			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_RC4;
+			break;
+		case CRYPTO_DES_CBC:
+			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_DES |
+			    HIFN_CRYPT_CMD_MODE_CBC |
+			    HIFN_CRYPT_CMD_NEW_IV;
+			break;
+		case CRYPTO_3DES_CBC:
+			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_3DES |
+			    HIFN_CRYPT_CMD_MODE_CBC |
+			    HIFN_CRYPT_CMD_NEW_IV;
+			break;
+		case CRYPTO_AES_CBC:
+			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_AES |
+			    HIFN_CRYPT_CMD_MODE_CBC |
+			    HIFN_CRYPT_CMD_NEW_IV;
+			break;
+		default:
+			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+			err = EINVAL;
+			goto errout;
+		}
+		if (enccrd->crd_alg != CRYPTO_ARC4) {
+			ivlen = ((enccrd->crd_alg == CRYPTO_AES_CBC) ?
+				HIFN_AES_IV_LENGTH : HIFN_IV_LENGTH);
+			if (enccrd->crd_flags & CRD_F_ENCRYPT) {
+				if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+					bcopy(enccrd->crd_iv, cmd->iv, ivlen);
+				else
+					read_random(cmd->iv, ivlen);
+
+				if ((enccrd->crd_flags & CRD_F_IV_PRESENT)
+				    == 0) {
+					crypto_copyback(crp->crp_flags,
+					    crp->crp_buf, enccrd->crd_inject,
+					    ivlen, cmd->iv);
+				}
+			} else {
+				if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+					bcopy(enccrd->crd_iv, cmd->iv, ivlen);
+				else {
+					crypto_copydata(crp->crp_flags,
+					    crp->crp_buf, enccrd->crd_inject,
+					    ivlen, cmd->iv);
+				}
+			}
+		}
+
+		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT)
+			cmd->cry_masks |= HIFN_CRYPT_CMD_NEW_KEY;
+		cmd->ck = enccrd->crd_key;
+		cmd->cklen = enccrd->crd_klen >> 3;
+		cmd->cry_masks |= HIFN_CRYPT_CMD_NEW_KEY;
+
+		/* 
+		 * Need to specify the size for the AES key in the masks.
+		 */
+		if ((cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) ==
+		    HIFN_CRYPT_CMD_ALG_AES) {
+			switch (cmd->cklen) {
+			case 16:
+				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_128;
+				break;
+			case 24:
+				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_192;
+				break;
+			case 32:
+				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_256;
+				break;
+			default:
+				DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
+				err = EINVAL;
+				goto errout;
+			}
+		}
+	}
+
+	if (maccrd) {
+		cmd->maccrd = maccrd;
+		cmd->base_masks |= HIFN_BASE_CMD_MAC;
+
+		switch (maccrd->crd_alg) {
+		case CRYPTO_MD5:
+			cmd->mac_masks |= HIFN_MAC_CMD_ALG_MD5 |
+			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HASH |
+			    HIFN_MAC_CMD_POS_IPSEC;
+                       break;
+		case CRYPTO_MD5_HMAC:
+			cmd->mac_masks |= HIFN_MAC_CMD_ALG_MD5 |
+			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HMAC |
+			    HIFN_MAC_CMD_POS_IPSEC | HIFN_MAC_CMD_TRUNC;
+			break;
+		case CRYPTO_SHA1:
+			cmd->mac_masks |= HIFN_MAC_CMD_ALG_SHA1 |
+			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HASH |
+			    HIFN_MAC_CMD_POS_IPSEC;
+			break;
+		case CRYPTO_SHA1_HMAC:
+			cmd->mac_masks |= HIFN_MAC_CMD_ALG_SHA1 |
+			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HMAC |
+			    HIFN_MAC_CMD_POS_IPSEC | HIFN_MAC_CMD_TRUNC;
+			break;
+		}
+
+		if (maccrd->crd_alg == CRYPTO_SHA1_HMAC ||
+		     maccrd->crd_alg == CRYPTO_MD5_HMAC) {
+			cmd->mac_masks |= HIFN_MAC_CMD_NEW_KEY;
+			bcopy(maccrd->crd_key, cmd->mac, maccrd->crd_klen >> 3);
+			bzero(cmd->mac + (maccrd->crd_klen >> 3),
+			    HIFN_MAC_KEY_LENGTH - (maccrd->crd_klen >> 3));
+		}
+	}
+
+	cmd->crp = crp;
+	cmd->session_num = session;
+	cmd->softc = sc;
+
+	err = hifn_crypto(sc, cmd, crp, hint);
+	if (!err) {
+		return 0;
+	} else if (err == ERESTART) {
+		/*
+		 * There weren't enough resources to dispatch the request
+		 * to the part.  Notify the caller so they'll requeue this
+		 * request and resubmit it again soon.
+		 */
+#ifdef HIFN_DEBUG
+		if (hifn_debug)
+			device_printf(sc->sc_dev, "requeue request\n");
+#endif
+		kfree(cmd);
+		sc->sc_needwakeup |= CRYPTO_SYMQ;
+		return (err);
+	}
+
+errout:
+	if (cmd != NULL)
+		kfree(cmd);
+	if (err == EINVAL)
+		hifnstats.hst_invalid++;
+	else
+		hifnstats.hst_nomem++;
+	crp->crp_etype = err;
+	crypto_done(crp);
+	return (err);
+}
+
+static void
+hifn_abort(struct hifn_softc *sc)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+	struct hifn_command *cmd;
+	struct cryptop *crp;
+	int i, u;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	i = dma->resk; u = dma->resu;
+	while (u != 0) {
+		cmd = dma->hifn_commands[i];
+		KASSERT(cmd != NULL, ("hifn_abort: null command slot %u", i));
+		dma->hifn_commands[i] = NULL;
+		crp = cmd->crp;
+
+		if ((dma->resr[i].l & htole32(HIFN_D_VALID)) == 0) {
+			/* Salvage what we can. */
+			u_int8_t *macbuf;
+
+			if (cmd->base_masks & HIFN_BASE_CMD_MAC) {
+				macbuf = dma->result_bufs[i];
+				macbuf += 12;
+			} else
+				macbuf = NULL;
+			hifnstats.hst_opackets++;
+			hifn_callback(sc, cmd, macbuf);
+		} else {
+#if 0
+			if (cmd->src_map == cmd->dst_map) {
+				bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
+				    BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
+			} else {
+				bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
+				    BUS_DMASYNC_POSTWRITE);
+				bus_dmamap_sync(sc->sc_dmat, cmd->dst_map,
+				    BUS_DMASYNC_POSTREAD);
+			}
+#endif
+
+			if (cmd->src_skb != cmd->dst_skb) {
+#ifdef NOTYET
+				m_freem(cmd->src_m);
+				crp->crp_buf = (caddr_t)cmd->dst_m;
+#else
+				device_printf(sc->sc_dev,
+						"%s,%d: CRYPTO_F_SKBUF src != dst not implemented\n",
+						__FILE__, __LINE__);
+#endif
+			}
+
+			/* non-shared buffers cannot be restarted */
+			if (cmd->src_map != cmd->dst_map) {
+				/*
+				 * XXX should be EAGAIN, delayed until
+				 * after the reset.
+				 */
+				crp->crp_etype = ENOMEM;
+				pci_unmap_buf(sc, &cmd->dst);
+			} else
+				crp->crp_etype = ENOMEM;
+
+			pci_unmap_buf(sc, &cmd->src);
+
+			kfree(cmd);
+			if (crp->crp_etype != EAGAIN)
+				crypto_done(crp);
+		}
+
+		if (++i == HIFN_D_RES_RSIZE)
+			i = 0;
+		u--;
+	}
+	dma->resk = i; dma->resu = u;
+
+	hifn_reset_board(sc, 1);
+	hifn_init_dma(sc);
+	hifn_init_pci_registers(sc);
+}
+
+static void
+hifn_callback(struct hifn_softc *sc, struct hifn_command *cmd, u_int8_t *macbuf)
+{
+	struct hifn_dma *dma = sc->sc_dma;
+	struct cryptop *crp = cmd->crp;
+	struct cryptodesc *crd;
+	int i, u;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+#if 0
+	if (cmd->src_map == cmd->dst_map) {
+		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
+		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+	} else {
+		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
+		    BUS_DMASYNC_POSTWRITE);
+		bus_dmamap_sync(sc->sc_dmat, cmd->dst_map,
+		    BUS_DMASYNC_POSTREAD);
+	}
+#endif
+
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		if (cmd->src_skb != cmd->dst_skb) {
+#ifdef NOTYET
+			crp->crp_buf = (caddr_t)cmd->dst_m;
+			totlen = cmd->src_mapsize;
+			for (m = cmd->dst_m; m != NULL; m = m->m_next) {
+				if (totlen < m->m_len) {
+					m->m_len = totlen;
+					totlen = 0;
+				} else
+					totlen -= m->m_len;
+			}
+			cmd->dst_m->m_pkthdr.len = cmd->src_m->m_pkthdr.len;
+			m_freem(cmd->src_m);
+#else
+			device_printf(sc->sc_dev,
+					"%s,%d: CRYPTO_F_SKBUF src != dst not implemented\n",
+					__FILE__, __LINE__);
+#endif
+		}
+	}
+
+	if (cmd->sloplen != 0) {
+		crypto_copyback(crp->crp_flags, crp->crp_buf,
+		    cmd->src_mapsize - cmd->sloplen, cmd->sloplen,
+		    (caddr_t)&dma->slop[cmd->slopidx]);
+	}
+
+	i = dma->dstk; u = dma->dstu;
+	while (u != 0) {
+		if (i == HIFN_D_DST_RSIZE)
+			i = 0;
+#if 0
+		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap,
+		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+#endif
+		if (dma->dstr[i].l & htole32(HIFN_D_VALID)) {
+#if 0
+			bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap,
+			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+#endif
+			break;
+		}
+		i++, u--;
+	}
+	dma->dstk = i; dma->dstu = u;
+
+	hifnstats.hst_obytes += cmd->dst_mapsize;
+
+	if (macbuf != NULL) {
+		for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
+                        int len;
+
+			if (crd->crd_alg != CRYPTO_MD5 &&
+			    crd->crd_alg != CRYPTO_SHA1 &&
+			    crd->crd_alg != CRYPTO_MD5_HMAC &&
+			    crd->crd_alg != CRYPTO_SHA1_HMAC) {
+				continue;
+			}
+			len = cmd->softc->sc_sessions[cmd->session_num].hs_mlen;
+			crypto_copyback(crp->crp_flags, crp->crp_buf,
+			    crd->crd_inject, len, macbuf);
+			break;
+		}
+	}
+
+	if (cmd->src_map != cmd->dst_map)
+		pci_unmap_buf(sc, &cmd->dst);
+	pci_unmap_buf(sc, &cmd->src);
+	kfree(cmd);
+	crypto_done(crp);
+}
+
+/*
+ * 7811 PB3 rev/2 parts lock-up on burst writes to Group 0
+ * and Group 1 registers; avoid conditions that could create
+ * burst writes by doing a read in between the writes.
+ *
+ * NB: The read we interpose is always to the same register;
+ *     we do this because reading from an arbitrary (e.g. last)
+ *     register may not always work.
+ */
+static void
+hifn_write_reg_0(struct hifn_softc *sc, bus_size_t reg, u_int32_t val)
+{
+	if (sc->sc_flags & HIFN_IS_7811) {
+		if (sc->sc_bar0_lastreg == reg - 4)
+			readl(sc->sc_bar0 + HIFN_0_PUCNFG);
+		sc->sc_bar0_lastreg = reg;
+	}
+	writel(val, sc->sc_bar0 + reg);
+}
+
+static void
+hifn_write_reg_1(struct hifn_softc *sc, bus_size_t reg, u_int32_t val)
+{
+	if (sc->sc_flags & HIFN_IS_7811) {
+		if (sc->sc_bar1_lastreg == reg - 4)
+			readl(sc->sc_bar1 + HIFN_1_REVID);
+		sc->sc_bar1_lastreg = reg;
+	}
+	writel(val, sc->sc_bar1 + reg);
+}
+
+
+static struct pci_device_id hifn_pci_tbl[] = {
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7951,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7955,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7956,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VENDOR_NETSEC, PCI_PRODUCT_NETSEC_7751,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VENDOR_INVERTEX, PCI_PRODUCT_INVERTEX_AEON,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7811,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	/*
+	 * Other vendors share this PCI ID as well, such as
+	 * http://www.powercrypt.com, and obviously they also
+	 * use the same key.
+	 */
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7751,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ 0, 0, 0, 0, 0, 0, }
+};
+MODULE_DEVICE_TABLE(pci, hifn_pci_tbl);
+
+static struct pci_driver hifn_driver = {
+	.name         = "hifn",
+	.id_table     = hifn_pci_tbl,
+	.probe        =	hifn_probe,
+	.remove       = hifn_remove,
+	/* add PM stuff here one day */
+};
+
+static int __init hifn_init (void)
+{
+	struct hifn_softc *sc = NULL;
+	int rc;
+
+	DPRINTF("%s(%p)\n", __FUNCTION__, hifn_init);
+
+	rc = pci_register_driver(&hifn_driver);
+	pci_register_driver_compat(&hifn_driver, rc);
+
+	return rc;
+}
+
+static void __exit hifn_exit (void)
+{
+	pci_unregister_driver(&hifn_driver);
+}
+
+module_init(hifn_init);
+module_exit(hifn_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("OCF driver for hifn PCI crypto devices");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751reg.h b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751reg.h
new file mode 100644
index 00000000..ccf54f9c
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751reg.h
@@ -0,0 +1,540 @@
+/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.7 2007/03/21 03:42:49 sam Exp $ */
+/*	$OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $	*/
+
+/*-
+ * Invertex AEON / Hifn 7751 driver
+ * Copyright (c) 1999 Invertex Inc. All rights reserved.
+ * Copyright (c) 1999 Theo de Raadt
+ * Copyright (c) 2000-2001 Network Security Technologies, Inc.
+ *			http://www.netsec.net
+ *
+ * Please send any comments, feedback, bug-fixes, or feature requests to
+ * software@invertex.com.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+#ifndef __HIFN_H__
+#define	__HIFN_H__
+
+/*
+ * Some PCI configuration space offset defines.  The names were made
+ * identical to the names used by the Linux kernel.
+ */
+#define	HIFN_BAR0		PCIR_BAR(0)	/* PUC register map */
+#define	HIFN_BAR1		PCIR_BAR(1)	/* DMA register map */
+#define	HIFN_TRDY_TIMEOUT	0x40
+#define	HIFN_RETRY_TIMEOUT	0x41
+
+/*
+ * PCI vendor and device identifiers
+ * (the names are preserved from their OpenBSD source).
+ */
+#define	PCI_VENDOR_HIFN		0x13a3		/* Hifn */
+#define	PCI_PRODUCT_HIFN_7751	0x0005		/* 7751 */
+#define	PCI_PRODUCT_HIFN_6500	0x0006		/* 6500 */
+#define	PCI_PRODUCT_HIFN_7811	0x0007		/* 7811 */
+#define	PCI_PRODUCT_HIFN_7855	0x001f		/* 7855 */
+#define	PCI_PRODUCT_HIFN_7951	0x0012		/* 7951 */
+#define	PCI_PRODUCT_HIFN_7955	0x0020		/* 7954/7955 */
+#define	PCI_PRODUCT_HIFN_7956	0x001d		/* 7956 */
+
+#define	PCI_VENDOR_INVERTEX	0x14e1		/* Invertex */
+#define	PCI_PRODUCT_INVERTEX_AEON 0x0005	/* AEON */
+
+#define	PCI_VENDOR_NETSEC	0x1660		/* NetSec */
+#define	PCI_PRODUCT_NETSEC_7751	0x7751		/* 7751 */
+
+/*
+ * The values below should multiple of 4 -- and be large enough to handle
+ * any command the driver implements.
+ *
+ * MAX_COMMAND = base command + mac command + encrypt command +
+ *			mac-key + rc4-key
+ * MAX_RESULT  = base result + mac result + mac + encrypt result
+ *			
+ *
+ */
+#define	HIFN_MAX_COMMAND	(8 + 8 + 8 + 64 + 260)
+#define	HIFN_MAX_RESULT		(8 + 4 + 20 + 4)
+
+/*
+ * hifn_desc_t
+ *
+ * Holds an individual descriptor for any of the rings.
+ */
+typedef struct hifn_desc {
+	volatile u_int32_t l;		/* length and status bits */
+	volatile u_int32_t p;
+} hifn_desc_t;
+
+/*
+ * Masks for the "length" field of struct hifn_desc.
+ */
+#define	HIFN_D_LENGTH		0x0000ffff	/* length bit mask */
+#define	HIFN_D_MASKDONEIRQ	0x02000000	/* mask the done interrupt */
+#define	HIFN_D_DESTOVER		0x04000000	/* destination overflow */
+#define	HIFN_D_OVER		0x08000000	/* overflow */
+#define	HIFN_D_LAST		0x20000000	/* last descriptor in chain */
+#define	HIFN_D_JUMP		0x40000000	/* jump descriptor */
+#define	HIFN_D_VALID		0x80000000	/* valid bit */
+
+
+/*
+ * Processing Unit Registers (offset from BASEREG0)
+ */
+#define	HIFN_0_PUDATA		0x00	/* Processing Unit Data */
+#define	HIFN_0_PUCTRL		0x04	/* Processing Unit Control */
+#define	HIFN_0_PUISR		0x08	/* Processing Unit Interrupt Status */
+#define	HIFN_0_PUCNFG		0x0c	/* Processing Unit Configuration */
+#define	HIFN_0_PUIER		0x10	/* Processing Unit Interrupt Enable */
+#define	HIFN_0_PUSTAT		0x14	/* Processing Unit Status/Chip ID */
+#define	HIFN_0_FIFOSTAT		0x18	/* FIFO Status */
+#define	HIFN_0_FIFOCNFG		0x1c	/* FIFO Configuration */
+#define	HIFN_0_PUCTRL2		0x28	/* Processing Unit Control (2nd map) */
+#define	HIFN_0_MUTE1		0x80
+#define	HIFN_0_MUTE2		0x90
+#define	HIFN_0_SPACESIZE	0x100	/* Register space size */
+
+/* Processing Unit Control Register (HIFN_0_PUCTRL) */
+#define	HIFN_PUCTRL_CLRSRCFIFO	0x0010	/* clear source fifo */
+#define	HIFN_PUCTRL_STOP	0x0008	/* stop pu */
+#define	HIFN_PUCTRL_LOCKRAM	0x0004	/* lock ram */
+#define	HIFN_PUCTRL_DMAENA	0x0002	/* enable dma */
+#define	HIFN_PUCTRL_RESET	0x0001	/* Reset processing unit */
+
+/* Processing Unit Interrupt Status Register (HIFN_0_PUISR) */
+#define	HIFN_PUISR_CMDINVAL	0x8000	/* Invalid command interrupt */
+#define	HIFN_PUISR_DATAERR	0x4000	/* Data error interrupt */
+#define	HIFN_PUISR_SRCFIFO	0x2000	/* Source FIFO ready interrupt */
+#define	HIFN_PUISR_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */
+#define	HIFN_PUISR_DSTOVER	0x0200	/* Destination overrun interrupt */
+#define	HIFN_PUISR_SRCCMD	0x0080	/* Source command interrupt */
+#define	HIFN_PUISR_SRCCTX	0x0040	/* Source context interrupt */
+#define	HIFN_PUISR_SRCDATA	0x0020	/* Source data interrupt */
+#define	HIFN_PUISR_DSTDATA	0x0010	/* Destination data interrupt */
+#define	HIFN_PUISR_DSTRESULT	0x0004	/* Destination result interrupt */
+
+/* Processing Unit Configuration Register (HIFN_0_PUCNFG) */
+#define	HIFN_PUCNFG_DRAMMASK	0xe000	/* DRAM size mask */
+#define	HIFN_PUCNFG_DSZ_256K	0x0000	/* 256k dram */
+#define	HIFN_PUCNFG_DSZ_512K	0x2000	/* 512k dram */
+#define	HIFN_PUCNFG_DSZ_1M	0x4000	/* 1m dram */
+#define	HIFN_PUCNFG_DSZ_2M	0x6000	/* 2m dram */
+#define	HIFN_PUCNFG_DSZ_4M	0x8000	/* 4m dram */
+#define	HIFN_PUCNFG_DSZ_8M	0xa000	/* 8m dram */
+#define	HIFN_PUNCFG_DSZ_16M	0xc000	/* 16m dram */
+#define	HIFN_PUCNFG_DSZ_32M	0xe000	/* 32m dram */
+#define	HIFN_PUCNFG_DRAMREFRESH	0x1800	/* DRAM refresh rate mask */
+#define	HIFN_PUCNFG_DRFR_512	0x0000	/* 512 divisor of ECLK */
+#define	HIFN_PUCNFG_DRFR_256	0x0800	/* 256 divisor of ECLK */
+#define	HIFN_PUCNFG_DRFR_128	0x1000	/* 128 divisor of ECLK */
+#define	HIFN_PUCNFG_TCALLPHASES	0x0200	/* your guess is as good as mine... */
+#define	HIFN_PUCNFG_TCDRVTOTEM	0x0100	/* your guess is as good as mine... */
+#define	HIFN_PUCNFG_BIGENDIAN	0x0080	/* DMA big endian mode */
+#define	HIFN_PUCNFG_BUS32	0x0040	/* Bus width 32bits */
+#define	HIFN_PUCNFG_BUS16	0x0000	/* Bus width 16 bits */
+#define	HIFN_PUCNFG_CHIPID	0x0020	/* Allow chipid from PUSTAT */
+#define	HIFN_PUCNFG_DRAM	0x0010	/* Context RAM is DRAM */
+#define	HIFN_PUCNFG_SRAM	0x0000	/* Context RAM is SRAM */
+#define	HIFN_PUCNFG_COMPSING	0x0004	/* Enable single compression context */
+#define	HIFN_PUCNFG_ENCCNFG	0x0002	/* Encryption configuration */
+
+/* Processing Unit Interrupt Enable Register (HIFN_0_PUIER) */
+#define	HIFN_PUIER_CMDINVAL	0x8000	/* Invalid command interrupt */
+#define	HIFN_PUIER_DATAERR	0x4000	/* Data error interrupt */
+#define	HIFN_PUIER_SRCFIFO	0x2000	/* Source FIFO ready interrupt */
+#define	HIFN_PUIER_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */
+#define	HIFN_PUIER_DSTOVER	0x0200	/* Destination overrun interrupt */
+#define	HIFN_PUIER_SRCCMD	0x0080	/* Source command interrupt */
+#define	HIFN_PUIER_SRCCTX	0x0040	/* Source context interrupt */
+#define	HIFN_PUIER_SRCDATA	0x0020	/* Source data interrupt */
+#define	HIFN_PUIER_DSTDATA	0x0010	/* Destination data interrupt */
+#define	HIFN_PUIER_DSTRESULT	0x0004	/* Destination result interrupt */
+
+/* Processing Unit Status Register/Chip ID (HIFN_0_PUSTAT) */
+#define	HIFN_PUSTAT_CMDINVAL	0x8000	/* Invalid command interrupt */
+#define	HIFN_PUSTAT_DATAERR	0x4000	/* Data error interrupt */
+#define	HIFN_PUSTAT_SRCFIFO	0x2000	/* Source FIFO ready interrupt */
+#define	HIFN_PUSTAT_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */
+#define	HIFN_PUSTAT_DSTOVER	0x0200	/* Destination overrun interrupt */
+#define	HIFN_PUSTAT_SRCCMD	0x0080	/* Source command interrupt */
+#define	HIFN_PUSTAT_SRCCTX	0x0040	/* Source context interrupt */
+#define	HIFN_PUSTAT_SRCDATA	0x0020	/* Source data interrupt */
+#define	HIFN_PUSTAT_DSTDATA	0x0010	/* Destination data interrupt */
+#define	HIFN_PUSTAT_DSTRESULT	0x0004	/* Destination result interrupt */
+#define	HIFN_PUSTAT_CHIPREV	0x00ff	/* Chip revision mask */
+#define	HIFN_PUSTAT_CHIPENA	0xff00	/* Chip enabled mask */
+#define	HIFN_PUSTAT_ENA_2	0x1100	/* Level 2 enabled */
+#define	HIFN_PUSTAT_ENA_1	0x1000	/* Level 1 enabled */
+#define	HIFN_PUSTAT_ENA_0	0x3000	/* Level 0 enabled */
+#define	HIFN_PUSTAT_REV_2	0x0020	/* 7751 PT6/2 */
+#define	HIFN_PUSTAT_REV_3	0x0030	/* 7751 PT6/3 */
+
+/* FIFO Status Register (HIFN_0_FIFOSTAT) */
+#define	HIFN_FIFOSTAT_SRC	0x7f00	/* Source FIFO available */
+#define	HIFN_FIFOSTAT_DST	0x007f	/* Destination FIFO available */
+
+/* FIFO Configuration Register (HIFN_0_FIFOCNFG) */
+#define	HIFN_FIFOCNFG_THRESHOLD	0x0400	/* must be written as this value */
+
+/*
+ * DMA Interface Registers (offset from BASEREG1)
+ */
+#define	HIFN_1_DMA_CRAR		0x0c	/* DMA Command Ring Address */
+#define	HIFN_1_DMA_SRAR		0x1c	/* DMA Source Ring Address */
+#define	HIFN_1_DMA_RRAR		0x2c	/* DMA Result Ring Address */
+#define	HIFN_1_DMA_DRAR		0x3c	/* DMA Destination Ring Address */
+#define	HIFN_1_DMA_CSR		0x40	/* DMA Status and Control */
+#define	HIFN_1_DMA_IER		0x44	/* DMA Interrupt Enable */
+#define	HIFN_1_DMA_CNFG		0x48	/* DMA Configuration */
+#define	HIFN_1_PLL		0x4c	/* 7955/7956: PLL config */
+#define	HIFN_1_7811_RNGENA	0x60	/* 7811: rng enable */
+#define	HIFN_1_7811_RNGCFG	0x64	/* 7811: rng config */
+#define	HIFN_1_7811_RNGDAT	0x68	/* 7811: rng data */
+#define	HIFN_1_7811_RNGSTS	0x6c	/* 7811: rng status */
+#define	HIFN_1_DMA_CNFG2	0x6c	/* 7955/7956: dma config #2 */
+#define	HIFN_1_7811_MIPSRST	0x94	/* 7811: MIPS reset */
+#define	HIFN_1_REVID		0x98	/* Revision ID */
+
+#define	HIFN_1_PUB_RESET	0x204	/* Public/RNG Reset */
+#define	HIFN_1_PUB_BASE		0x300	/* Public Base Address */
+#define	HIFN_1_PUB_OPLEN	0x304	/* 7951-compat Public Operand Length */
+#define	HIFN_1_PUB_OP		0x308	/* 7951-compat Public Operand */
+#define	HIFN_1_PUB_STATUS	0x30c	/* 7951-compat Public Status */
+#define	HIFN_1_PUB_IEN		0x310	/* Public Interrupt enable */
+#define	HIFN_1_RNG_CONFIG	0x314	/* RNG config */
+#define	HIFN_1_RNG_DATA		0x318	/* RNG data */
+#define	HIFN_1_PUB_MODE		0x320	/* PK mode */
+#define	HIFN_1_PUB_FIFO_OPLEN	0x380	/* first element of oplen fifo */
+#define	HIFN_1_PUB_FIFO_OP	0x384	/* first element of op fifo */
+#define	HIFN_1_PUB_MEM		0x400	/* start of Public key memory */
+#define	HIFN_1_PUB_MEMEND	0xbff	/* end of Public key memory */
+
+/* DMA Status and Control Register (HIFN_1_DMA_CSR) */
+#define	HIFN_DMACSR_D_CTRLMASK	0xc0000000	/* Destinition Ring Control */
+#define	HIFN_DMACSR_D_CTRL_NOP	0x00000000	/* Dest. Control: no-op */
+#define	HIFN_DMACSR_D_CTRL_DIS	0x40000000	/* Dest. Control: disable */
+#define	HIFN_DMACSR_D_CTRL_ENA	0x80000000	/* Dest. Control: enable */
+#define	HIFN_DMACSR_D_ABORT	0x20000000	/* Destinition Ring PCIAbort */
+#define	HIFN_DMACSR_D_DONE	0x10000000	/* Destinition Ring Done */
+#define	HIFN_DMACSR_D_LAST	0x08000000	/* Destinition Ring Last */
+#define	HIFN_DMACSR_D_WAIT	0x04000000	/* Destinition Ring Waiting */
+#define	HIFN_DMACSR_D_OVER	0x02000000	/* Destinition Ring Overflow */
+#define	HIFN_DMACSR_R_CTRL	0x00c00000	/* Result Ring Control */
+#define	HIFN_DMACSR_R_CTRL_NOP	0x00000000	/* Result Control: no-op */
+#define	HIFN_DMACSR_R_CTRL_DIS	0x00400000	/* Result Control: disable */
+#define	HIFN_DMACSR_R_CTRL_ENA	0x00800000	/* Result Control: enable */
+#define	HIFN_DMACSR_R_ABORT	0x00200000	/* Result Ring PCI Abort */
+#define	HIFN_DMACSR_R_DONE	0x00100000	/* Result Ring Done */
+#define	HIFN_DMACSR_R_LAST	0x00080000	/* Result Ring Last */
+#define	HIFN_DMACSR_R_WAIT	0x00040000	/* Result Ring Waiting */
+#define	HIFN_DMACSR_R_OVER	0x00020000	/* Result Ring Overflow */
+#define	HIFN_DMACSR_S_CTRL	0x0000c000	/* Source Ring Control */
+#define	HIFN_DMACSR_S_CTRL_NOP	0x00000000	/* Source Control: no-op */
+#define	HIFN_DMACSR_S_CTRL_DIS	0x00004000	/* Source Control: disable */
+#define	HIFN_DMACSR_S_CTRL_ENA	0x00008000	/* Source Control: enable */
+#define	HIFN_DMACSR_S_ABORT	0x00002000	/* Source Ring PCI Abort */
+#define	HIFN_DMACSR_S_DONE	0x00001000	/* Source Ring Done */
+#define	HIFN_DMACSR_S_LAST	0x00000800	/* Source Ring Last */
+#define	HIFN_DMACSR_S_WAIT	0x00000400	/* Source Ring Waiting */
+#define	HIFN_DMACSR_ILLW	0x00000200	/* Illegal write (7811 only) */
+#define	HIFN_DMACSR_ILLR	0x00000100	/* Illegal read (7811 only) */
+#define	HIFN_DMACSR_C_CTRL	0x000000c0	/* Command Ring Control */
+#define	HIFN_DMACSR_C_CTRL_NOP	0x00000000	/* Command Control: no-op */
+#define	HIFN_DMACSR_C_CTRL_DIS	0x00000040	/* Command Control: disable */
+#define	HIFN_DMACSR_C_CTRL_ENA	0x00000080	/* Command Control: enable */
+#define	HIFN_DMACSR_C_ABORT	0x00000020	/* Command Ring PCI Abort */
+#define	HIFN_DMACSR_C_DONE	0x00000010	/* Command Ring Done */
+#define	HIFN_DMACSR_C_LAST	0x00000008	/* Command Ring Last */
+#define	HIFN_DMACSR_C_WAIT	0x00000004	/* Command Ring Waiting */
+#define	HIFN_DMACSR_PUBDONE	0x00000002	/* Public op done (7951 only) */
+#define	HIFN_DMACSR_ENGINE	0x00000001	/* Command Ring Engine IRQ */
+
+/* DMA Interrupt Enable Register (HIFN_1_DMA_IER) */
+#define	HIFN_DMAIER_D_ABORT	0x20000000	/* Destination Ring PCIAbort */
+#define	HIFN_DMAIER_D_DONE	0x10000000	/* Destination Ring Done */
+#define	HIFN_DMAIER_D_LAST	0x08000000	/* Destination Ring Last */
+#define	HIFN_DMAIER_D_WAIT	0x04000000	/* Destination Ring Waiting */
+#define	HIFN_DMAIER_D_OVER	0x02000000	/* Destination Ring Overflow */
+#define	HIFN_DMAIER_R_ABORT	0x00200000	/* Result Ring PCI Abort */
+#define	HIFN_DMAIER_R_DONE	0x00100000	/* Result Ring Done */
+#define	HIFN_DMAIER_R_LAST	0x00080000	/* Result Ring Last */
+#define	HIFN_DMAIER_R_WAIT	0x00040000	/* Result Ring Waiting */
+#define	HIFN_DMAIER_R_OVER	0x00020000	/* Result Ring Overflow */
+#define	HIFN_DMAIER_S_ABORT	0x00002000	/* Source Ring PCI Abort */
+#define	HIFN_DMAIER_S_DONE	0x00001000	/* Source Ring Done */
+#define	HIFN_DMAIER_S_LAST	0x00000800	/* Source Ring Last */
+#define	HIFN_DMAIER_S_WAIT	0x00000400	/* Source Ring Waiting */
+#define	HIFN_DMAIER_ILLW	0x00000200	/* Illegal write (7811 only) */
+#define	HIFN_DMAIER_ILLR	0x00000100	/* Illegal read (7811 only) */
+#define	HIFN_DMAIER_C_ABORT	0x00000020	/* Command Ring PCI Abort */
+#define	HIFN_DMAIER_C_DONE	0x00000010	/* Command Ring Done */
+#define	HIFN_DMAIER_C_LAST	0x00000008	/* Command Ring Last */
+#define	HIFN_DMAIER_C_WAIT	0x00000004	/* Command Ring Waiting */
+#define	HIFN_DMAIER_PUBDONE	0x00000002	/* public op done (7951 only) */
+#define	HIFN_DMAIER_ENGINE	0x00000001	/* Engine IRQ */
+
+/* DMA Configuration Register (HIFN_1_DMA_CNFG) */
+#define	HIFN_DMACNFG_BIGENDIAN	0x10000000	/* big endian mode */
+#define	HIFN_DMACNFG_POLLFREQ	0x00ff0000	/* Poll frequency mask */
+#define	HIFN_DMACNFG_UNLOCK	0x00000800
+#define	HIFN_DMACNFG_POLLINVAL	0x00000700	/* Invalid Poll Scalar */
+#define	HIFN_DMACNFG_LAST	0x00000010	/* Host control LAST bit */
+#define	HIFN_DMACNFG_MODE	0x00000004	/* DMA mode */
+#define	HIFN_DMACNFG_DMARESET	0x00000002	/* DMA Reset # */
+#define	HIFN_DMACNFG_MSTRESET	0x00000001	/* Master Reset # */
+
+/* DMA Configuration Register (HIFN_1_DMA_CNFG2) */
+#define	HIFN_DMACNFG2_PKSWAP32	(1 << 19)	/* swap the OPLEN/OP reg */
+#define	HIFN_DMACNFG2_PKSWAP8	(1 << 18)	/* swap the bits of OPLEN/OP */
+#define	HIFN_DMACNFG2_BAR0_SWAP32 (1<<17)	/* swap the bytes of BAR0 */
+#define	HIFN_DMACNFG2_BAR1_SWAP8 (1<<16)	/* swap the bits  of BAR0 */
+#define	HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT 12
+#define	HIFN_DMACNFG2_INIT_READ_BURST_SHIFT 8
+#define	HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT 4
+#define	HIFN_DMACNFG2_TGT_READ_BURST_SHIFT  0
+
+/* 7811 RNG Enable Register (HIFN_1_7811_RNGENA) */
+#define	HIFN_7811_RNGENA_ENA	0x00000001	/* enable RNG */
+
+/* 7811 RNG Config Register (HIFN_1_7811_RNGCFG) */
+#define	HIFN_7811_RNGCFG_PRE1	0x00000f00	/* first prescalar */
+#define	HIFN_7811_RNGCFG_OPRE	0x00000080	/* output prescalar */
+#define	HIFN_7811_RNGCFG_DEFL	0x00000f80	/* 2 words/ 1/100 sec */
+
+/* 7811 RNG Status Register (HIFN_1_7811_RNGSTS) */
+#define	HIFN_7811_RNGSTS_RDY	0x00004000	/* two numbers in FIFO */
+#define	HIFN_7811_RNGSTS_UFL	0x00001000	/* rng underflow */
+
+/* 7811 MIPS Reset Register (HIFN_1_7811_MIPSRST) */
+#define	HIFN_MIPSRST_BAR2SIZE	0xffff0000	/* sdram size */
+#define	HIFN_MIPSRST_GPRAMINIT	0x00008000	/* gpram can be accessed */
+#define	HIFN_MIPSRST_CRAMINIT	0x00004000	/* ctxram can be accessed */
+#define	HIFN_MIPSRST_LED2	0x00000400	/* external LED2 */
+#define	HIFN_MIPSRST_LED1	0x00000200	/* external LED1 */
+#define	HIFN_MIPSRST_LED0	0x00000100	/* external LED0 */
+#define	HIFN_MIPSRST_MIPSDIS	0x00000004	/* disable MIPS */
+#define	HIFN_MIPSRST_MIPSRST	0x00000002	/* warm reset MIPS */
+#define	HIFN_MIPSRST_MIPSCOLD	0x00000001	/* cold reset MIPS */
+
+/* Public key reset register (HIFN_1_PUB_RESET) */
+#define	HIFN_PUBRST_RESET	0x00000001	/* reset public/rng unit */
+
+/* Public operation register (HIFN_1_PUB_OP) */
+#define	HIFN_PUBOP_AOFFSET	0x0000003e	/* A offset */
+#define	HIFN_PUBOP_BOFFSET	0x00000fc0	/* B offset */
+#define	HIFN_PUBOP_MOFFSET	0x0003f000	/* M offset */
+#define	HIFN_PUBOP_OP_MASK	0x003c0000	/* Opcode: */
+#define	HIFN_PUBOP_OP_NOP	0x00000000	/*  NOP */
+#define	HIFN_PUBOP_OP_ADD	0x00040000	/*  ADD */
+#define	HIFN_PUBOP_OP_ADDC	0x00080000	/*  ADD w/carry */
+#define	HIFN_PUBOP_OP_SUB	0x000c0000	/*  SUB */
+#define	HIFN_PUBOP_OP_SUBC	0x00100000	/*  SUB w/carry */
+#define	HIFN_PUBOP_OP_MODADD	0x00140000	/*  Modular ADD */
+#define	HIFN_PUBOP_OP_MODSUB	0x00180000	/*  Modular SUB */
+#define	HIFN_PUBOP_OP_INCA	0x001c0000	/*  INC A */
+#define	HIFN_PUBOP_OP_DECA	0x00200000	/*  DEC A */
+#define	HIFN_PUBOP_OP_MULT	0x00240000	/*  MULT */
+#define	HIFN_PUBOP_OP_MODMULT	0x00280000	/*  Modular MULT */
+#define	HIFN_PUBOP_OP_MODRED	0x002c0000	/*  Modular Red */
+#define	HIFN_PUBOP_OP_MODEXP	0x00300000	/*  Modular Exp */
+
+/* Public operand length register (HIFN_1_PUB_OPLEN) */
+#define	HIFN_PUBOPLEN_MODLEN	0x0000007f
+#define	HIFN_PUBOPLEN_EXPLEN	0x0003ff80
+#define	HIFN_PUBOPLEN_REDLEN	0x003c0000
+
+/* Public status register (HIFN_1_PUB_STATUS) */
+#define	HIFN_PUBSTS_DONE	0x00000001	/* operation done */
+#define	HIFN_PUBSTS_CARRY	0x00000002	/* carry */
+#define	HIFN_PUBSTS_FIFO_EMPTY	0x00000100	/* fifo empty */
+#define	HIFN_PUBSTS_FIFO_FULL	0x00000200	/* fifo full */
+#define	HIFN_PUBSTS_FIFO_OVFL	0x00000400	/* fifo overflow */
+#define	HIFN_PUBSTS_FIFO_WRITE	0x000f0000	/* fifo write */
+#define	HIFN_PUBSTS_FIFO_READ	0x0f000000	/* fifo read */
+
+/* Public interrupt enable register (HIFN_1_PUB_IEN) */
+#define	HIFN_PUBIEN_DONE	0x00000001	/* operation done interrupt */
+
+/* Random number generator config register (HIFN_1_RNG_CONFIG) */
+#define	HIFN_RNGCFG_ENA		0x00000001	/* enable rng */
+
+/*
+ * Register offsets in register set 1
+ */
+
+#define	HIFN_UNLOCK_SECRET1	0xf4
+#define	HIFN_UNLOCK_SECRET2	0xfc
+
+/*
+ * PLL config register
+ *
+ * This register is present only on 7954/7955/7956 parts. It must be
+ * programmed according to the bus interface method used by the h/w.
+ * Note that the parts require a stable clock.  Since the PCI clock
+ * may vary the reference clock must usually be used.  To avoid
+ * overclocking the core logic, setup must be done carefully, refer
+ * to the driver for details.  The exact multiplier required varies
+ * by part and system configuration; refer to the Hifn documentation.
+ */
+#define	HIFN_PLL_REF_SEL	0x00000001	/* REF/HBI clk selection */
+#define	HIFN_PLL_BP		0x00000002	/* bypass (used during setup) */
+/* bit 2 reserved */
+#define	HIFN_PLL_PK_CLK_SEL	0x00000008	/* public key clk select */
+#define	HIFN_PLL_PE_CLK_SEL	0x00000010	/* packet engine clk select */
+/* bits 5-9 reserved */
+#define	HIFN_PLL_MBSET		0x00000400	/* must be set to 1 */
+#define	HIFN_PLL_ND		0x00003800	/* Fpll_ref multiplier select */
+#define	HIFN_PLL_ND_SHIFT	11
+#define	HIFN_PLL_ND_2		0x00000000	/* 2x */
+#define	HIFN_PLL_ND_4		0x00000800	/* 4x */
+#define	HIFN_PLL_ND_6		0x00001000	/* 6x */
+#define	HIFN_PLL_ND_8		0x00001800	/* 8x */
+#define	HIFN_PLL_ND_10		0x00002000	/* 10x */
+#define	HIFN_PLL_ND_12		0x00002800	/* 12x */
+/* bits 14-15 reserved */
+#define	HIFN_PLL_IS		0x00010000	/* charge pump current select */
+/* bits 17-31 reserved */
+
+/*
+ * Board configuration specifies only these bits.
+ */
+#define	HIFN_PLL_CONFIG		(HIFN_PLL_IS|HIFN_PLL_ND|HIFN_PLL_REF_SEL)
+
+/*
+ * Public Key Engine Mode Register
+ */
+#define	HIFN_PKMODE_HOSTINVERT	(1 << 0)	/* HOST INVERT */
+#define	HIFN_PKMODE_ENHANCED	(1 << 1)	/* Enable enhanced mode */
+
+
+/*********************************************************************
+ * Structs for board commands 
+ *
+ *********************************************************************/
+
+/*
+ * Structure to help build up the command data structure.
+ */
+typedef struct hifn_base_command {
+	volatile u_int16_t masks;
+	volatile u_int16_t session_num;
+	volatile u_int16_t total_source_count;
+	volatile u_int16_t total_dest_count;
+} hifn_base_command_t;
+
+#define	HIFN_BASE_CMD_MAC		0x0400
+#define	HIFN_BASE_CMD_CRYPT		0x0800
+#define	HIFN_BASE_CMD_DECODE		0x2000
+#define	HIFN_BASE_CMD_SRCLEN_M		0xc000
+#define	HIFN_BASE_CMD_SRCLEN_S		14
+#define	HIFN_BASE_CMD_DSTLEN_M		0x3000
+#define	HIFN_BASE_CMD_DSTLEN_S		12
+#define	HIFN_BASE_CMD_LENMASK_HI	0x30000
+#define	HIFN_BASE_CMD_LENMASK_LO	0x0ffff
+
+/*
+ * Structure to help build up the command data structure.
+ */
+typedef struct hifn_crypt_command {
+	volatile u_int16_t masks;
+	volatile u_int16_t header_skip;
+	volatile u_int16_t source_count;
+	volatile u_int16_t reserved;
+} hifn_crypt_command_t;
+
+#define	HIFN_CRYPT_CMD_ALG_MASK		0x0003		/* algorithm: */
+#define	HIFN_CRYPT_CMD_ALG_DES		0x0000		/*   DES */
+#define	HIFN_CRYPT_CMD_ALG_3DES		0x0001		/*   3DES */
+#define	HIFN_CRYPT_CMD_ALG_RC4		0x0002		/*   RC4 */
+#define	HIFN_CRYPT_CMD_ALG_AES		0x0003		/*   AES */
+#define	HIFN_CRYPT_CMD_MODE_MASK	0x0018		/* Encrypt mode: */
+#define	HIFN_CRYPT_CMD_MODE_ECB		0x0000		/*   ECB */
+#define	HIFN_CRYPT_CMD_MODE_CBC		0x0008		/*   CBC */
+#define	HIFN_CRYPT_CMD_MODE_CFB		0x0010		/*   CFB */
+#define	HIFN_CRYPT_CMD_MODE_OFB		0x0018		/*   OFB */
+#define	HIFN_CRYPT_CMD_CLR_CTX		0x0040		/* clear context */
+#define	HIFN_CRYPT_CMD_NEW_KEY		0x0800		/* expect new key */
+#define	HIFN_CRYPT_CMD_NEW_IV		0x1000		/* expect new iv */
+
+#define	HIFN_CRYPT_CMD_SRCLEN_M		0xc000
+#define	HIFN_CRYPT_CMD_SRCLEN_S		14
+
+#define	HIFN_CRYPT_CMD_KSZ_MASK		0x0600		/* AES key size: */
+#define	HIFN_CRYPT_CMD_KSZ_128		0x0000		/*   128 bit */
+#define	HIFN_CRYPT_CMD_KSZ_192		0x0200		/*   192 bit */
+#define	HIFN_CRYPT_CMD_KSZ_256		0x0400		/*   256 bit */
+
+/*
+ * Structure to help build up the command data structure.
+ */
+typedef struct hifn_mac_command {
+	volatile u_int16_t masks;
+	volatile u_int16_t header_skip;
+	volatile u_int16_t source_count;
+	volatile u_int16_t reserved;
+} hifn_mac_command_t;
+
+#define	HIFN_MAC_CMD_ALG_MASK		0x0001
+#define	HIFN_MAC_CMD_ALG_SHA1		0x0000
+#define	HIFN_MAC_CMD_ALG_MD5		0x0001
+#define	HIFN_MAC_CMD_MODE_MASK		0x000c
+#define	HIFN_MAC_CMD_MODE_HMAC		0x0000
+#define	HIFN_MAC_CMD_MODE_SSL_MAC	0x0004
+#define	HIFN_MAC_CMD_MODE_HASH		0x0008
+#define	HIFN_MAC_CMD_MODE_FULL		0x0004
+#define	HIFN_MAC_CMD_TRUNC		0x0010
+#define	HIFN_MAC_CMD_RESULT		0x0020
+#define	HIFN_MAC_CMD_APPEND		0x0040
+#define	HIFN_MAC_CMD_SRCLEN_M		0xc000
+#define	HIFN_MAC_CMD_SRCLEN_S		14
+
+/*
+ * MAC POS IPsec initiates authentication after encryption on encodes
+ * and before decryption on decodes.
+ */
+#define	HIFN_MAC_CMD_POS_IPSEC		0x0200
+#define	HIFN_MAC_CMD_NEW_KEY		0x0800
+
+/*
+ * The poll frequency and poll scalar defines are unshifted values used
+ * to set fields in the DMA Configuration Register.
+ */
+#ifndef HIFN_POLL_FREQUENCY
+#define	HIFN_POLL_FREQUENCY	0x1
+#endif
+
+#ifndef HIFN_POLL_SCALAR
+#define	HIFN_POLL_SCALAR	0x0
+#endif
+
+#define	HIFN_MAX_SEGLEN 	0xffff		/* maximum dma segment len */
+#define	HIFN_MAX_DMALEN		0x3ffff		/* maximum dma length */
+#endif /* __HIFN_H__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751var.h b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751var.h
new file mode 100644
index 00000000..c5d30f96
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifn7751var.h
@@ -0,0 +1,368 @@
+/* $FreeBSD: src/sys/dev/hifn/hifn7751var.h,v 1.9 2007/03/21 03:42:49 sam Exp $ */
+/*	$OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $	*/
+
+/*-
+ * Invertex AEON / Hifn 7751 driver
+ * Copyright (c) 1999 Invertex Inc. All rights reserved.
+ * Copyright (c) 1999 Theo de Raadt
+ * Copyright (c) 2000-2001 Network Security Technologies, Inc.
+ *			http://www.netsec.net
+ *
+ * Please send any comments, feedback, bug-fixes, or feature requests to
+ * software@invertex.com.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+#ifndef __HIFN7751VAR_H__
+#define __HIFN7751VAR_H__
+
+#ifdef __KERNEL__
+
+/*
+ * Some configurable values for the driver.  By default command+result
+ * descriptor rings are the same size.  The src+dst descriptor rings
+ * are sized at 3.5x the number of potential commands.  Slower parts
+ * (e.g. 7951) tend to run out of src descriptors; faster parts (7811)
+ * src+cmd/result descriptors.  It's not clear that increasing the size
+ * of the descriptor rings helps performance significantly as other
+ * factors tend to come into play (e.g. copying misaligned packets).
+ */
+#define	HIFN_D_CMD_RSIZE	24	/* command descriptors */
+#define	HIFN_D_SRC_RSIZE	((HIFN_D_CMD_RSIZE * 7) / 2)	/* source descriptors */
+#define	HIFN_D_RES_RSIZE	HIFN_D_CMD_RSIZE	/* result descriptors */
+#define	HIFN_D_DST_RSIZE	HIFN_D_SRC_RSIZE	/* destination descriptors */
+
+/*
+ *  Length values for cryptography
+ */
+#define HIFN_DES_KEY_LENGTH		8
+#define HIFN_3DES_KEY_LENGTH		24
+#define HIFN_MAX_CRYPT_KEY_LENGTH	HIFN_3DES_KEY_LENGTH
+#define HIFN_IV_LENGTH			8
+#define	HIFN_AES_IV_LENGTH		16
+#define HIFN_MAX_IV_LENGTH		HIFN_AES_IV_LENGTH
+
+/*
+ *  Length values for authentication
+ */
+#define HIFN_MAC_KEY_LENGTH		64
+#define HIFN_MD5_LENGTH			16
+#define HIFN_SHA1_LENGTH		20
+#define HIFN_MAC_TRUNC_LENGTH		12
+
+#define MAX_SCATTER 64
+
+/*
+ * Data structure to hold all 4 rings and any other ring related data.
+ */
+struct hifn_dma {
+	/*
+	 *  Descriptor rings.  We add +1 to the size to accomidate the
+	 *  jump descriptor.
+	 */
+	struct hifn_desc	cmdr[HIFN_D_CMD_RSIZE+1];
+	struct hifn_desc	srcr[HIFN_D_SRC_RSIZE+1];
+	struct hifn_desc	dstr[HIFN_D_DST_RSIZE+1];
+	struct hifn_desc	resr[HIFN_D_RES_RSIZE+1];
+
+	struct hifn_command	*hifn_commands[HIFN_D_RES_RSIZE];
+
+	u_char			command_bufs[HIFN_D_CMD_RSIZE][HIFN_MAX_COMMAND];
+	u_char			result_bufs[HIFN_D_CMD_RSIZE][HIFN_MAX_RESULT];
+	u_int32_t		slop[HIFN_D_CMD_RSIZE];
+
+	u_int64_t		test_src, test_dst;
+
+	/*
+	 *  Our current positions for insertion and removal from the desriptor
+	 *  rings. 
+	 */
+	int			cmdi, srci, dsti, resi;
+	volatile int		cmdu, srcu, dstu, resu;
+	int			cmdk, srck, dstk, resk;
+};
+
+struct hifn_session {
+	int hs_used;
+	int hs_mlen;
+};
+
+#define	HIFN_RING_SYNC(sc, r, i, f)					\
+	/* DAVIDM bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) */
+
+#define	HIFN_CMDR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), cmdr, (i), (f))
+#define	HIFN_RESR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), resr, (i), (f))
+#define	HIFN_SRCR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), srcr, (i), (f))
+#define	HIFN_DSTR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), dstr, (i), (f))
+
+#define	HIFN_CMD_SYNC(sc, i, f)						\
+	/* DAVIDM bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) */
+
+#define	HIFN_RES_SYNC(sc, i, f)						\
+	/* DAVIDM bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) */
+
+typedef int bus_size_t;
+
+/*
+ * Holds data specific to a single HIFN board.
+ */
+struct hifn_softc {
+	softc_device_decl		 sc_dev;
+
+	struct pci_dev		*sc_pcidev;	/* PCI device pointer */
+	spinlock_t		sc_mtx;		/* per-instance lock */
+
+	int			sc_num;		/* for multiple devs */
+
+	ocf_iomem_t		sc_bar0;
+	bus_size_t		sc_bar0_lastreg;/* bar0 last reg written */
+	ocf_iomem_t		sc_bar1;
+	bus_size_t		sc_bar1_lastreg;/* bar1 last reg written */
+
+	int			sc_irq;
+
+	u_int32_t		sc_dmaier;
+	u_int32_t		sc_drammodel;	/* 1=dram, 0=sram */
+	u_int32_t		sc_pllconfig;	/* 7954/7955/7956 PLL config */
+
+	struct hifn_dma		*sc_dma;
+	dma_addr_t		sc_dma_physaddr;/* physical address of sc_dma */
+
+	int			sc_dmansegs;
+	int32_t			sc_cid;
+	int			sc_maxses;
+	int			sc_nsessions;
+	struct hifn_session	*sc_sessions;
+	int			sc_ramsize;
+	int			sc_flags;
+#define	HIFN_HAS_RNG		0x1	/* includes random number generator */
+#define	HIFN_HAS_PUBLIC		0x2	/* includes public key support */
+#define	HIFN_HAS_AES		0x4	/* includes AES support */
+#define	HIFN_IS_7811		0x8	/* Hifn 7811 part */
+#define	HIFN_IS_7956		0x10	/* Hifn 7956/7955 don't have SDRAM */
+
+	struct timer_list	sc_tickto;	/* for managing DMA */
+
+	int			sc_rngfirst;
+	int			sc_rnghz;	/* RNG polling frequency */
+
+	int			sc_c_busy;	/* command ring busy */
+	int			sc_s_busy;	/* source data ring busy */
+	int			sc_d_busy;	/* destination data ring busy */
+	int			sc_r_busy;	/* result ring busy */
+	int			sc_active;	/* for initial countdown */
+	int			sc_needwakeup;	/* ops q'd wating on resources */
+	int			sc_curbatch;	/* # ops submitted w/o int */
+	int			sc_suspended;
+#ifdef HIFN_VULCANDEV
+	struct cdev            *sc_pkdev;
+#endif
+};
+
+#define	HIFN_LOCK(_sc)		spin_lock_irqsave(&(_sc)->sc_mtx, l_flags)
+#define	HIFN_UNLOCK(_sc)	spin_unlock_irqrestore(&(_sc)->sc_mtx, l_flags)
+
+/*
+ *  hifn_command_t
+ *
+ *  This is the control structure used to pass commands to hifn_encrypt().
+ *
+ *  flags
+ *  -----
+ *  Flags is the bitwise "or" values for command configuration.  A single
+ *  encrypt direction needs to be set:
+ *
+ *	HIFN_ENCODE or HIFN_DECODE
+ *
+ *  To use cryptography, a single crypto algorithm must be included:
+ *
+ *	HIFN_CRYPT_3DES or HIFN_CRYPT_DES
+ *
+ *  To use authentication is used, a single MAC algorithm must be included:
+ *
+ *	HIFN_MAC_MD5 or HIFN_MAC_SHA1
+ *
+ *  By default MD5 uses a 16 byte hash and SHA-1 uses a 20 byte hash.
+ *  If the value below is set, hash values are truncated or assumed
+ *  truncated to 12 bytes:
+ *
+ *	HIFN_MAC_TRUNC
+ *
+ *  Keys for encryption and authentication can be sent as part of a command,
+ *  or the last key value used with a particular session can be retrieved
+ *  and used again if either of these flags are not specified.
+ *
+ *	HIFN_CRYPT_NEW_KEY, HIFN_MAC_NEW_KEY
+ *
+ *  session_num
+ *  -----------
+ *  A number between 0 and 2048 (for DRAM models) or a number between 
+ *  0 and 768 (for SRAM models).  Those who don't want to use session
+ *  numbers should leave value at zero and send a new crypt key and/or
+ *  new MAC key on every command.  If you use session numbers and
+ *  don't send a key with a command, the last key sent for that same
+ *  session number will be used.
+ *
+ *  Warning:  Using session numbers and multiboard at the same time
+ *            is currently broken.
+ *
+ *  mbuf
+ *  ----
+ *  Either fill in the mbuf pointer and npa=0 or
+ *	 fill packp[] and packl[] and set npa to > 0
+ * 
+ *  mac_header_skip
+ *  ---------------
+ *  The number of bytes of the source_buf that are skipped over before
+ *  authentication begins.  This must be a number between 0 and 2^16-1
+ *  and can be used by IPsec implementers to skip over IP headers.
+ *  *** Value ignored if authentication not used ***
+ *
+ *  crypt_header_skip
+ *  -----------------
+ *  The number of bytes of the source_buf that are skipped over before
+ *  the cryptographic operation begins.  This must be a number between 0
+ *  and 2^16-1.  For IPsec, this number will always be 8 bytes larger
+ *  than the auth_header_skip (to skip over the ESP header).
+ *  *** Value ignored if cryptography not used ***
+ *
+ */
+struct hifn_operand {
+	union {
+		struct sk_buff *skb;
+		struct uio *io;
+		unsigned char *buf;
+	} u;
+	void		*map;
+	bus_size_t	mapsize;
+	int		nsegs;
+	struct {
+	    dma_addr_t  ds_addr;
+	    int         ds_len;
+	} segs[MAX_SCATTER];
+};
+
+struct hifn_command {
+	u_int16_t session_num;
+	u_int16_t base_masks, cry_masks, mac_masks;
+	u_int8_t iv[HIFN_MAX_IV_LENGTH], *ck, mac[HIFN_MAC_KEY_LENGTH];
+	int cklen;
+	int sloplen, slopidx;
+
+	struct hifn_operand src;
+	struct hifn_operand dst;
+
+	struct hifn_softc *softc;
+	struct cryptop *crp;
+	struct cryptodesc *enccrd, *maccrd;
+};
+
+#define	src_skb		src.u.skb
+#define	src_io		src.u.io
+#define	src_map		src.map
+#define	src_mapsize	src.mapsize
+#define	src_segs	src.segs
+#define	src_nsegs	src.nsegs
+#define	src_buf		src.u.buf
+
+#define	dst_skb		dst.u.skb
+#define	dst_io		dst.u.io
+#define	dst_map		dst.map
+#define	dst_mapsize	dst.mapsize
+#define	dst_segs	dst.segs
+#define	dst_nsegs	dst.nsegs
+#define	dst_buf		dst.u.buf
+
+/*
+ *  Return values for hifn_crypto()
+ */
+#define HIFN_CRYPTO_SUCCESS	0
+#define HIFN_CRYPTO_BAD_INPUT	(-1)
+#define HIFN_CRYPTO_RINGS_FULL	(-2)
+
+/**************************************************************************
+ *
+ *  Function:  hifn_crypto
+ *
+ *  Purpose:   Called by external drivers to begin an encryption on the
+ *             HIFN board.
+ *
+ *  Blocking/Non-blocking Issues
+ *  ============================
+ *  The driver cannot block in hifn_crypto (no calls to tsleep) currently.
+ *  hifn_crypto() returns HIFN_CRYPTO_RINGS_FULL if there is not enough
+ *  room in any of the rings for the request to proceed.
+ *
+ *  Return Values
+ *  =============
+ *  0 for success, negative values on error
+ *
+ *  Defines for negative error codes are:
+ *  
+ *    HIFN_CRYPTO_BAD_INPUT  :  The passed in command had invalid settings.
+ *    HIFN_CRYPTO_RINGS_FULL :  All DMA rings were full and non-blocking
+ *                              behaviour was requested.
+ *
+ *************************************************************************/
+
+/*
+ * Convert back and forth from 'sid' to 'card' and 'session'
+ */
+#define HIFN_CARD(sid)		(((sid) & 0xf0000000) >> 28)
+#define HIFN_SESSION(sid)	((sid) & 0x000007ff)
+#define HIFN_SID(crd,ses)	(((crd) << 28) | ((ses) & 0x7ff))
+
+#endif /* _KERNEL */
+
+struct hifn_stats {
+	u_int64_t hst_ibytes;
+	u_int64_t hst_obytes;
+	u_int32_t hst_ipackets;
+	u_int32_t hst_opackets;
+	u_int32_t hst_invalid;
+	u_int32_t hst_nomem;		/* malloc or one of hst_nomem_* */
+	u_int32_t hst_abort;
+	u_int32_t hst_noirq;		/* IRQ for no reason */
+	u_int32_t hst_totbatch;		/* ops submitted w/o interrupt */
+	u_int32_t hst_maxbatch;		/* max ops submitted together */
+	u_int32_t hst_unaligned;	/* unaligned src caused copy */
+	/*
+	 * The following divides hst_nomem into more specific buckets.
+	 */
+	u_int32_t hst_nomem_map;	/* bus_dmamap_create failed */
+	u_int32_t hst_nomem_load;	/* bus_dmamap_load_* failed */
+	u_int32_t hst_nomem_mbuf;	/* MGET* failed */
+	u_int32_t hst_nomem_mcl;	/* MCLGET* failed */
+	u_int32_t hst_nomem_cr;		/* out of command/result descriptor */
+	u_int32_t hst_nomem_sd;		/* out of src/dst descriptors */
+};
+
+#endif /* __HIFN7751VAR_H__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c
new file mode 100644
index 00000000..56b8a5cf
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPP.c
@@ -0,0 +1,421 @@
+/*-
+ * Driver for Hifn HIPP-I/II chipset
+ * Copyright (c) 2006 Michael Richardson <mcr@xelerance.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored by Hifn Inc.
+ *
+ */
+
+/*
+ * Driver for various Hifn encryption processors.
+ */
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <linux/uio.h>
+#include <linux/sysfs.h>
+#include <linux/miscdevice.h>
+#include <asm/io.h>
+
+#include <cryptodev.h>
+
+#include "hifnHIPPreg.h"
+#include "hifnHIPPvar.h"
+
+#if 1
+#define	DPRINTF(a...)	if (hipp_debug) { \
+							printk("%s: ", sc ? \
+								device_get_nameunit(sc->sc_dev) : "hifn"); \
+							printk(a); \
+						} else
+#else
+#define	DPRINTF(a...)
+#endif
+
+typedef int bus_size_t;
+
+static inline int
+pci_get_revid(struct pci_dev *dev)
+{
+	u8 rid = 0;
+	pci_read_config_byte(dev, PCI_REVISION_ID, &rid);
+	return rid;
+}
+
+#define debug hipp_debug
+int hipp_debug = 0;
+module_param(hipp_debug, int, 0644);
+MODULE_PARM_DESC(hipp_debug, "Enable debug");
+
+int hipp_maxbatch = 1;
+module_param(hipp_maxbatch, int, 0644);
+MODULE_PARM_DESC(hipp_maxbatch, "max ops to batch w/o interrupt");
+
+static	int  hipp_probe(struct pci_dev *dev, const struct pci_device_id *ent);
+static	void hipp_remove(struct pci_dev *dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+static irqreturn_t hipp_intr(int irq, void *arg);
+#else
+static irqreturn_t hipp_intr(int irq, void *arg, struct pt_regs *regs);
+#endif
+
+static int hipp_num_chips = 0;
+static struct hipp_softc *hipp_chip_idx[HIPP_MAX_CHIPS];
+
+static	int hipp_newsession(device_t, u_int32_t *, struct cryptoini *);
+static	int hipp_freesession(device_t, u_int64_t);
+static	int hipp_process(device_t, struct cryptop *, int);
+
+static device_method_t hipp_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	hipp_newsession),
+	DEVMETHOD(cryptodev_freesession,hipp_freesession),
+	DEVMETHOD(cryptodev_process,	hipp_process),
+};
+
+static __inline u_int32_t
+READ_REG(struct hipp_softc *sc, unsigned int barno, bus_size_t reg)
+{
+	u_int32_t v = readl(sc->sc_bar[barno] + reg);
+	//sc->sc_bar0_lastreg = (bus_size_t) -1;
+	return (v);
+}
+static __inline void
+WRITE_REG(struct hipp_softc *sc, unsigned int barno, bus_size_t reg, u_int32_t val)
+{
+	writel(val, sc->sc_bar[barno] + reg);
+}
+
+#define READ_REG_0(sc, reg)         READ_REG(sc, 0, reg)
+#define WRITE_REG_0(sc, reg, val)   WRITE_REG(sc,0, reg, val)
+#define READ_REG_1(sc, reg)         READ_REG(sc, 1, reg)
+#define WRITE_REG_1(sc, reg, val)   WRITE_REG(sc,1, reg, val)
+
+static int
+hipp_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
+{
+	return EINVAL;
+}
+
+static int
+hipp_freesession(device_t dev, u_int64_t tid)
+{
+	return EINVAL;
+}
+
+static int
+hipp_process(device_t dev, struct cryptop *crp, int hint)
+{
+	return EINVAL;
+}
+
+static const char*
+hipp_partname(struct hipp_softc *sc, char buf[128], size_t blen)
+{
+	char *n = NULL;
+
+	switch (pci_get_vendor(sc->sc_pcidev)) {
+	case PCI_VENDOR_HIFN:
+		switch (pci_get_device(sc->sc_pcidev)) {
+		case PCI_PRODUCT_HIFN_7855:	n = "Hifn 7855";
+		case PCI_PRODUCT_HIFN_8155:	n = "Hifn 8155";
+		case PCI_PRODUCT_HIFN_6500:	n = "Hifn 6500";
+		}
+	}
+
+	if(n==NULL) {
+		snprintf(buf, blen, "VID=%02x,PID=%02x",
+			 pci_get_vendor(sc->sc_pcidev),
+			 pci_get_device(sc->sc_pcidev));
+	} else {
+		buf[0]='\0';
+		strncat(buf, n, blen);
+	}
+	return buf;
+}
+
+struct hipp_fs_entry {
+	struct attribute attr;
+	/* other stuff */
+};
+
+
+static ssize_t
+cryptoid_show(struct device *dev,
+	      struct device_attribute *attr,
+	      char *buf)						
+{								
+	struct hipp_softc *sc;					
+
+	sc = pci_get_drvdata(to_pci_dev (dev));
+	return sprintf (buf, "%d\n", sc->sc_cid);
+}
+
+struct device_attribute hipp_dev_cryptoid = __ATTR_RO(cryptoid);
+
+/*
+ * Attach an interface that successfully probed.
+ */
+static int
+hipp_probe(struct pci_dev *dev, const struct pci_device_id *ent)
+{
+	struct hipp_softc *sc = NULL;
+	int i;
+	//char rbase;
+	//u_int16_t ena;
+	int rev;
+	//int rseg;
+	int rc;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (pci_enable_device(dev) < 0)
+		return(-ENODEV);
+
+	if (pci_set_mwi(dev))
+		return(-ENODEV);
+
+	if (!dev->irq) {
+		printk("hifn: found device with no IRQ assigned. check BIOS settings!");
+		pci_disable_device(dev);
+		return(-ENODEV);
+	}
+
+	sc = (struct hipp_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
+	if (!sc)
+		return(-ENOMEM);
+	memset(sc, 0, sizeof(*sc));
+
+	softc_device_init(sc, "hifn-hipp", hipp_num_chips, hipp_methods);
+
+	sc->sc_pcidev = dev;
+	sc->sc_irq = -1;
+	sc->sc_cid = -1;
+	sc->sc_num = hipp_num_chips++;
+
+	if (sc->sc_num < HIPP_MAX_CHIPS)
+		hipp_chip_idx[sc->sc_num] = sc;
+
+	pci_set_drvdata(sc->sc_pcidev, sc);
+
+	spin_lock_init(&sc->sc_mtx);
+
+	/*
+	 * Setup PCI resources.
+	 * The READ_REG_0, WRITE_REG_0, READ_REG_1,
+	 * and WRITE_REG_1 macros throughout the driver are used
+	 * to permit better debugging.
+	 */
+	for(i=0; i<4; i++) {
+		unsigned long mem_start, mem_len;
+		mem_start = pci_resource_start(sc->sc_pcidev, i);
+		mem_len   = pci_resource_len(sc->sc_pcidev, i);
+		sc->sc_barphy[i] = (caddr_t)mem_start;
+		sc->sc_bar[i] = (ocf_iomem_t) ioremap(mem_start, mem_len);
+		if (!sc->sc_bar[i]) {
+			device_printf(sc->sc_dev, "cannot map bar%d register space\n", i);
+			goto fail;
+		}
+	}
+
+	//hipp_reset_board(sc, 0);
+	pci_set_master(sc->sc_pcidev);
+
+	/*
+	 * Arrange the interrupt line.
+	 */
+	rc = request_irq(dev->irq, hipp_intr, IRQF_SHARED, "hifn", sc);
+	if (rc) {
+		device_printf(sc->sc_dev, "could not map interrupt: %d\n", rc);
+		goto fail;
+	}
+	sc->sc_irq = dev->irq;
+
+	rev = READ_REG_1(sc, HIPP_1_REVID) & 0xffff;
+
+	{
+		char b[32];
+		device_printf(sc->sc_dev, "%s, rev %u",
+			      hipp_partname(sc, b, sizeof(b)), rev);
+	}
+
+#if 0
+	if (sc->sc_flags & HIFN_IS_7956)
+		printf(", pll=0x%x<%s clk, %ux mult>",
+			sc->sc_pllconfig,
+			sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci",
+			2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11));
+#endif
+	printf("\n");
+
+	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),CRYPTOCAP_F_HARDWARE);
+	if (sc->sc_cid < 0) {
+		device_printf(sc->sc_dev, "could not get crypto driver id\n");
+		goto fail;
+	}
+
+#if 0 /* cannot work with a non-GPL module */
+	/* make a sysfs entry to let the world know what entry we got */
+	sysfs_create_file(&sc->sc_pcidev->dev.kobj, &hipp_dev_cryptoid.attr);
+#endif
+
+#if 0
+	init_timer(&sc->sc_tickto);
+	sc->sc_tickto.function = hifn_tick;
+	sc->sc_tickto.data = (unsigned long) sc->sc_num;
+	mod_timer(&sc->sc_tickto, jiffies + HZ);
+#endif
+
+#if 0 /* no code here yet ?? */
+	crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
+#endif
+
+	return (0);
+
+fail:
+	if (sc->sc_cid >= 0)
+		crypto_unregister_all(sc->sc_cid);
+	if (sc->sc_irq != -1)
+		free_irq(sc->sc_irq, sc);
+	
+#if 0
+	if (sc->sc_dma) {
+		/* Turn off DMA polling */
+		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
+			    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
+		
+		pci_free_consistent(sc->sc_pcidev,
+				    sizeof(*sc->sc_dma),
+				    sc->sc_dma, sc->sc_dma_physaddr);
+	}
+#endif
+	kfree(sc);
+	return (-ENXIO);
+}
+
+/*
+ * Detach an interface that successfully probed.
+ */
+static void
+hipp_remove(struct pci_dev *dev)
+{
+	struct hipp_softc *sc = pci_get_drvdata(dev);
+	unsigned long l_flags;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	/* disable interrupts */
+	HIPP_LOCK(sc);
+
+#if 0
+	WRITE_REG_1(sc, HIFN_1_DMA_IER, 0);
+	HIFN_UNLOCK(sc);
+
+	/*XXX other resources */
+	del_timer_sync(&sc->sc_tickto);
+
+	/* Turn off DMA polling */
+	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
+	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
+#endif
+
+	crypto_unregister_all(sc->sc_cid);
+
+	free_irq(sc->sc_irq, sc);
+
+#if 0
+	pci_free_consistent(sc->sc_pcidev, sizeof(*sc->sc_dma),
+                sc->sc_dma, sc->sc_dma_physaddr);
+#endif
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+static irqreturn_t hipp_intr(int irq, void *arg)
+#else
+static irqreturn_t hipp_intr(int irq, void *arg, struct pt_regs *regs)
+#endif
+{
+	struct hipp_softc *sc = arg;
+
+	sc = sc; /* shut up compiler */
+
+	return IRQ_HANDLED;
+}
+
+static struct pci_device_id hipp_pci_tbl[] = {
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7855,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_8155,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ 0 }, /* terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, hipp_pci_tbl);
+
+static struct pci_driver hipp_driver = {
+	.name         = "hipp",
+	.id_table     = hipp_pci_tbl,
+	.probe        =	hipp_probe,
+	.remove       = hipp_remove,
+	/* add PM stuff here one day */
+};
+
+static int __init hipp_init (void)
+{
+	struct hipp_softc *sc = NULL;
+	int rc;
+
+	DPRINTF("%s(%p)\n", __FUNCTION__, hipp_init);
+
+	rc = pci_register_driver(&hipp_driver);
+	pci_register_driver_compat(&hipp_driver, rc);
+
+	return rc;
+}
+
+static void __exit hipp_exit (void)
+{
+	pci_unregister_driver(&hipp_driver);
+}
+
+module_init(hipp_init);
+module_exit(hipp_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("Michael Richardson <mcr@xelerance.com>");
+MODULE_DESCRIPTION("OCF driver for hifn HIPP-I/II PCI crypto devices");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPreg.h b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPreg.h
new file mode 100644
index 00000000..8c0e7203
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPreg.h
@@ -0,0 +1,46 @@
+/*-
+ * Hifn HIPP-I/HIPP-II (7855/8155) driver.
+ * Copyright (c) 2006 Michael Richardson <mcr@xelerance.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored by Hifn inc.
+ *
+ */
+
+#ifndef __HIFNHIPP_H__
+#define	__HIFNHIPP_H__
+
+/*
+ * PCI vendor and device identifiers
+ */
+#define	PCI_VENDOR_HIFN		0x13a3		/* Hifn */
+#define	PCI_PRODUCT_HIFN_6500	0x0006		/* 6500 */
+#define	PCI_PRODUCT_HIFN_7855	0x001f		/* 7855 */
+#define	PCI_PRODUCT_HIFN_8155	0x999		/* XXX 8155 */
+
+#define HIPP_1_REVID            0x01 /* BOGUS */
+
+#endif /* __HIPP_H__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPvar.h b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPvar.h
new file mode 100644
index 00000000..61d292fb
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/hifn/hifnHIPPvar.h
@@ -0,0 +1,93 @@
+/*
+ * Hifn HIPP-I/HIPP-II (7855/8155) driver.
+ * Copyright (c) 2006 Michael Richardson <mcr@xelerance.com> * 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored by Hifn inc.
+ *
+ */
+
+#ifndef __HIFNHIPPVAR_H__
+#define __HIFNHIPPVAR_H__
+
+#define HIPP_MAX_CHIPS 8
+
+/*
+ * Holds data specific to a single Hifn HIPP-I board.
+ */
+struct hipp_softc {
+	softc_device_decl		 sc_dev;
+
+	struct pci_dev		*sc_pcidev;	/* device backpointer */
+	ocf_iomem_t             sc_bar[5];
+	caddr_t		        sc_barphy[5];   /* physical address */
+	int			sc_num;		/* for multiple devs */
+	spinlock_t		sc_mtx;		/* per-instance lock */
+	int32_t			sc_cid;
+	int			sc_irq;
+
+#if 0
+
+	u_int32_t		sc_dmaier;
+	u_int32_t		sc_drammodel;	/* 1=dram, 0=sram */
+	u_int32_t		sc_pllconfig;	/* 7954/7955/7956 PLL config */
+
+	struct hifn_dma		*sc_dma;
+	dma_addr_t		sc_dma_physaddr;/* physical address of sc_dma */
+
+	int			sc_dmansegs;
+	int			sc_maxses;
+	int			sc_nsessions;
+	struct hifn_session	*sc_sessions;
+	int			sc_ramsize;
+	int			sc_flags;
+#define	HIFN_HAS_RNG		0x1	/* includes random number generator */
+#define	HIFN_HAS_PUBLIC		0x2	/* includes public key support */
+#define	HIFN_HAS_AES		0x4	/* includes AES support */
+#define	HIFN_IS_7811		0x8	/* Hifn 7811 part */
+#define	HIFN_IS_7956		0x10	/* Hifn 7956/7955 don't have SDRAM */
+
+	struct timer_list	sc_tickto;	/* for managing DMA */
+
+	int			sc_rngfirst;
+	int			sc_rnghz;	/* RNG polling frequency */
+
+	int			sc_c_busy;	/* command ring busy */
+	int			sc_s_busy;	/* source data ring busy */
+	int			sc_d_busy;	/* destination data ring busy */
+	int			sc_r_busy;	/* result ring busy */
+	int			sc_active;	/* for initial countdown */
+	int			sc_needwakeup;	/* ops q'd wating on resources */
+	int			sc_curbatch;	/* # ops submitted w/o int */
+	int			sc_suspended;
+	struct miscdevice       sc_miscdev;
+#endif
+};
+
+#define	HIPP_LOCK(_sc)		spin_lock_irqsave(&(_sc)->sc_mtx, l_flags)
+#define	HIPP_UNLOCK(_sc)	spin_unlock_irqrestore(&(_sc)->sc_mtx, l_flags)
+
+#endif /* __HIFNHIPPVAR_H__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ixp4xx/Makefile b/trunk/target/linux/generic/files/crypto/ocf/ixp4xx/Makefile
new file mode 100644
index 00000000..d94a3b79
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ixp4xx/Makefile
@@ -0,0 +1,104 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+#
+# You will need to point this at your Intel ixp425 includes,  this portion
+# of the Makefile only really works under SGLinux with the appropriate libs
+# installed.  They can be downloaded from http://www.snapgear.org/
+#
+ifeq ($(CONFIG_CPU_IXP46X),y)
+IXPLATFORM = ixp46X
+else
+ifeq ($(CONFIG_CPU_IXP43X),y)
+IXPLATFORM = ixp43X
+else
+IXPLATFORM = ixp42X
+endif
+endif
+
+ifdef CONFIG_IXP400_LIB_2_4
+IX_XSCALE_SW = $(ROOTDIR)/modules/ixp425/ixp400-2.4/ixp400_xscale_sw
+OSAL_DIR     = $(ROOTDIR)/modules/ixp425/ixp400-2.4/ixp_osal
+endif
+ifdef CONFIG_IXP400_LIB_2_1
+IX_XSCALE_SW = $(ROOTDIR)/modules/ixp425/ixp400-2.1/ixp400_xscale_sw
+OSAL_DIR     = $(ROOTDIR)/modules/ixp425/ixp400-2.1/ixp_osal
+endif
+ifdef CONFIG_IXP400_LIB_2_0
+IX_XSCALE_SW = $(ROOTDIR)/modules/ixp425/ixp400-2.0/ixp400_xscale_sw
+OSAL_DIR     = $(ROOTDIR)/modules/ixp425/ixp400-2.0/ixp_osal
+endif
+ifdef IX_XSCALE_SW
+ifdef CONFIG_IXP400_LIB_2_4
+IXP_CFLAGS = \
+	-I$(ROOTDIR)/. \
+	-I$(IX_XSCALE_SW)/src/include \
+	-I$(OSAL_DIR)/common/include/ \
+	-I$(OSAL_DIR)/common/include/modules/ \
+	-I$(OSAL_DIR)/common/include/modules/ddk/ \
+	-I$(OSAL_DIR)/common/include/modules/bufferMgt/ \
+	-I$(OSAL_DIR)/common/include/modules/ioMem/ \
+	-I$(OSAL_DIR)/common/os/linux/include/ \
+	-I$(OSAL_DIR)/common/os/linux/include/core/  \
+	-I$(OSAL_DIR)/common/os/linux/include/modules/ \
+	-I$(OSAL_DIR)/common/os/linux/include/modules/ddk/ \
+	-I$(OSAL_DIR)/common/os/linux/include/modules/bufferMgt/ \
+	-I$(OSAL_DIR)/common/os/linux/include/modules/ioMem/ \
+	-I$(OSAL_DIR)/platforms/$(IXPLATFORM)/include/ \
+	-I$(OSAL_DIR)/platforms/$(IXPLATFORM)/os/linux/include/ \
+	-DENABLE_IOMEM -DENABLE_BUFFERMGT -DENABLE_DDK \
+	-DUSE_IXP4XX_CRYPTO
+else
+IXP_CFLAGS = \
+	-I$(ROOTDIR)/. \
+	-I$(IX_XSCALE_SW)/src/include \
+	-I$(OSAL_DIR)/ \
+	-I$(OSAL_DIR)/os/linux/include/ \
+	-I$(OSAL_DIR)/os/linux/include/modules/ \
+	-I$(OSAL_DIR)/os/linux/include/modules/ioMem/ \
+	-I$(OSAL_DIR)/os/linux/include/modules/bufferMgt/ \
+	-I$(OSAL_DIR)/os/linux/include/core/  \
+	-I$(OSAL_DIR)/os/linux/include/platforms/ \
+	-I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ \
+	-I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ixp425 \
+	-I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ixp465 \
+	-I$(OSAL_DIR)/os/linux/include/core/ \
+	-I$(OSAL_DIR)/include/ \
+	-I$(OSAL_DIR)/include/modules/ \
+	-I$(OSAL_DIR)/include/modules/bufferMgt/ \
+	-I$(OSAL_DIR)/include/modules/ioMem/ \
+	-I$(OSAL_DIR)/include/platforms/ \
+	-I$(OSAL_DIR)/include/platforms/ixp400/ \
+	-DUSE_IXP4XX_CRYPTO
+endif
+endif
+ifdef CONFIG_IXP400_LIB_1_4
+IXP_CFLAGS   = \
+	-I$(ROOTDIR)/. \
+	-I$(ROOTDIR)/modules/ixp425/ixp400-1.4/ixp400_xscale_sw/src/include \
+	-I$(ROOTDIR)/modules/ixp425/ixp400-1.4/ixp400_xscale_sw/src/linux \
+	-DUSE_IXP4XX_CRYPTO
+endif
+ifndef IXPDIR
+IXPDIR = ixp-version-is-not-supported
+endif
+
+ifeq ($(CONFIG_CPU_IXP46X),y)
+IXP_CFLAGS += -D__ixp46X
+else
+ifeq ($(CONFIG_CPU_IXP43X),y)
+IXP_CFLAGS += -D__ixp43X
+else
+IXP_CFLAGS += -D__ixp42X
+endif
+endif
+
+obj-$(CONFIG_OCF_IXP4XX) += ixp4xx.o
+
+obj ?= .
+EXTRA_CFLAGS += $(IXP_CFLAGS) -I$(obj)/.. -I$(obj)/.
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c b/trunk/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c
new file mode 100644
index 00000000..ede598fa
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ixp4xx/ixp4xx.c
@@ -0,0 +1,1339 @@
+/*
+ * An OCF module that uses Intels IXP CryptACC API to do the crypto.
+ * This driver requires the IXP400 Access Library that is available
+ * from Intel in order to operate (or compile).
+ *
+ * Written by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2011 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/crypto.h>
+#include <linux/interrupt.h>
+#include <asm/scatterlist.h>
+
+#include <IxTypes.h>
+#include <IxOsBuffMgt.h>
+#include <IxNpeDl.h>
+#include <IxCryptoAcc.h>
+#include <IxQMgr.h>
+#include <IxOsServices.h>
+#include <IxOsCacheMMU.h>
+
+#include <cryptodev.h>
+#include <uio.h>
+
+#ifndef IX_MBUF_PRIV
+#define IX_MBUF_PRIV(x) ((x)->priv)
+#endif
+
+struct ixp_data;
+
+struct ixp_q {
+	struct list_head	 ixp_q_list;
+	struct ixp_data		*ixp_q_data;
+	struct cryptop		*ixp_q_crp;
+	struct cryptodesc	*ixp_q_ccrd;
+	struct cryptodesc	*ixp_q_acrd;
+	IX_MBUF				 ixp_q_mbuf;
+	UINT8				*ixp_hash_dest; /* Location for hash in client buffer */
+	UINT8				*ixp_hash_src; /* Location of hash in internal buffer */
+	unsigned char		 ixp_q_iv_data[IX_CRYPTO_ACC_MAX_CIPHER_IV_LENGTH];
+	unsigned char		*ixp_q_iv;
+};
+
+struct ixp_data {
+	int					 ixp_registered;	/* is the context registered */
+	int					 ixp_crd_flags;		/* detect direction changes */
+
+	int					 ixp_cipher_alg;
+	int					 ixp_auth_alg;
+
+	UINT32				 ixp_ctx_id;
+	UINT32				 ixp_hash_key_id;	/* used when hashing */
+	IxCryptoAccCtx		 ixp_ctx;
+	IX_MBUF				 ixp_pri_mbuf;
+	IX_MBUF				 ixp_sec_mbuf;
+
+	struct work_struct   ixp_pending_work;
+	struct work_struct   ixp_registration_work;
+	struct list_head	 ixp_q;				/* unprocessed requests */
+};
+
+#ifdef __ixp46X
+
+#define	MAX_IOP_SIZE	64	/* words */
+#define	MAX_OOP_SIZE	128
+
+#define	MAX_PARAMS		3
+
+struct ixp_pkq {
+	struct list_head			 pkq_list;
+	struct cryptkop				*pkq_krp;
+
+	IxCryptoAccPkeEauInOperands	 pkq_op;
+	IxCryptoAccPkeEauOpResult	 pkq_result;
+
+	UINT32						 pkq_ibuf0[MAX_IOP_SIZE];
+	UINT32						 pkq_ibuf1[MAX_IOP_SIZE];
+	UINT32						 pkq_ibuf2[MAX_IOP_SIZE];
+	UINT32						 pkq_obuf[MAX_OOP_SIZE];
+};
+
+static LIST_HEAD(ixp_pkq); /* current PK wait list */
+static struct ixp_pkq *ixp_pk_cur;
+static spinlock_t ixp_pkq_lock;
+
+#endif /* __ixp46X */
+
+static int ixp_blocked = 0;
+
+static int32_t			 ixp_id = -1;
+static struct ixp_data **ixp_sessions = NULL;
+static u_int32_t		 ixp_sesnum = 0;
+
+static int ixp_process(device_t, struct cryptop *, int);
+static int ixp_newsession(device_t, u_int32_t *, struct cryptoini *);
+static int ixp_freesession(device_t, u_int64_t);
+#ifdef __ixp46X
+static int ixp_kprocess(device_t, struct cryptkop *krp, int hint);
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+static kmem_cache_t *qcache;
+#else
+static struct kmem_cache *qcache;
+#endif
+
+#define debug ixp_debug
+static int ixp_debug = 0;
+module_param(ixp_debug, int, 0644);
+MODULE_PARM_DESC(ixp_debug, "Enable debug");
+
+static int ixp_init_crypto = 1;
+module_param(ixp_init_crypto, int, 0444); /* RO after load/boot */
+MODULE_PARM_DESC(ixp_init_crypto, "Call ixCryptoAccInit (default is 1)");
+
+static void ixp_process_pending(void *arg);
+static void ixp_registration(void *arg);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void ixp_process_pending_wq(struct work_struct *work);
+static void ixp_registration_wq(struct work_struct *work);
+#endif
+
+/*
+ * dummy device structure
+ */
+
+static struct {
+	softc_device_decl	sc_dev;
+} ixpdev;
+
+static device_method_t ixp_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	ixp_newsession),
+	DEVMETHOD(cryptodev_freesession,ixp_freesession),
+	DEVMETHOD(cryptodev_process,	ixp_process),
+#ifdef __ixp46X
+	DEVMETHOD(cryptodev_kprocess,	ixp_kprocess),
+#endif
+};
+
+/*
+ * Generate a new software session.
+ */
+static int
+ixp_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
+{
+	struct ixp_data *ixp;
+	u_int32_t i;
+#define AUTH_LEN(cri, def) \
+	(cri->cri_mlen ? cri->cri_mlen : (def))
+
+	dprintk("%s():alg %d\n", __FUNCTION__,cri->cri_alg);
+	if (sid == NULL || cri == NULL) {
+		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	if (ixp_sessions) {
+		for (i = 1; i < ixp_sesnum; i++)
+			if (ixp_sessions[i] == NULL)
+				break;
+	} else
+		i = 1;		/* NB: to silence compiler warning */
+
+	if (ixp_sessions == NULL || i == ixp_sesnum) {
+		struct ixp_data **ixpd;
+
+		if (ixp_sessions == NULL) {
+			i = 1; /* We leave ixp_sessions[0] empty */
+			ixp_sesnum = CRYPTO_SW_SESSIONS;
+		} else
+			ixp_sesnum *= 2;
+
+		ixpd = kmalloc(ixp_sesnum * sizeof(struct ixp_data *), SLAB_ATOMIC);
+		if (ixpd == NULL) {
+			/* Reset session number */
+			if (ixp_sesnum == CRYPTO_SW_SESSIONS)
+				ixp_sesnum = 0;
+			else
+				ixp_sesnum /= 2;
+			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
+			return ENOBUFS;
+		}
+		memset(ixpd, 0, ixp_sesnum * sizeof(struct ixp_data *));
+
+		/* Copy existing sessions */
+		if (ixp_sessions) {
+			memcpy(ixpd, ixp_sessions,
+			    (ixp_sesnum / 2) * sizeof(struct ixp_data *));
+			kfree(ixp_sessions);
+		}
+
+		ixp_sessions = ixpd;
+	}
+
+	ixp_sessions[i] = (struct ixp_data *) kmalloc(sizeof(struct ixp_data),
+			SLAB_ATOMIC);
+	if (ixp_sessions[i] == NULL) {
+		ixp_freesession(NULL, i);
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return ENOBUFS;
+	}
+
+	*sid = i;
+
+	ixp = ixp_sessions[i];
+	memset(ixp, 0, sizeof(*ixp));
+
+	ixp->ixp_cipher_alg = -1;
+	ixp->ixp_auth_alg = -1;
+	ixp->ixp_ctx_id = -1;
+	INIT_LIST_HEAD(&ixp->ixp_q);
+
+	ixp->ixp_ctx.useDifferentSrcAndDestMbufs = 0;
+
+	while (cri) {
+		switch (cri->cri_alg) {
+		case CRYPTO_DES_CBC:
+			ixp->ixp_cipher_alg = cri->cri_alg;
+			ixp->ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_DES;
+			ixp->ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
+			ixp->ixp_ctx.cipherCtx.cipherKeyLen = (cri->cri_klen + 7) / 8;
+			ixp->ixp_ctx.cipherCtx.cipherBlockLen = IX_CRYPTO_ACC_DES_BLOCK_64;
+			ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen =
+						IX_CRYPTO_ACC_DES_IV_64;
+			memcpy(ixp->ixp_ctx.cipherCtx.key.cipherKey,
+					cri->cri_key, (cri->cri_klen + 7) / 8);
+			break;
+
+		case CRYPTO_3DES_CBC:
+			ixp->ixp_cipher_alg = cri->cri_alg;
+			ixp->ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_3DES;
+			ixp->ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
+			ixp->ixp_ctx.cipherCtx.cipherKeyLen = (cri->cri_klen + 7) / 8;
+			ixp->ixp_ctx.cipherCtx.cipherBlockLen = IX_CRYPTO_ACC_DES_BLOCK_64;
+			ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen =
+						IX_CRYPTO_ACC_DES_IV_64;
+			memcpy(ixp->ixp_ctx.cipherCtx.key.cipherKey,
+					cri->cri_key, (cri->cri_klen + 7) / 8);
+			break;
+
+		case CRYPTO_RIJNDAEL128_CBC:
+			ixp->ixp_cipher_alg = cri->cri_alg;
+			ixp->ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_AES;
+			ixp->ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
+			ixp->ixp_ctx.cipherCtx.cipherKeyLen = (cri->cri_klen + 7) / 8;
+			ixp->ixp_ctx.cipherCtx.cipherBlockLen = 16;
+			ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen = 16;
+			memcpy(ixp->ixp_ctx.cipherCtx.key.cipherKey,
+					cri->cri_key, (cri->cri_klen + 7) / 8);
+			break;
+
+		case CRYPTO_MD5:
+		case CRYPTO_MD5_HMAC:
+			ixp->ixp_auth_alg = cri->cri_alg;
+			ixp->ixp_ctx.authCtx.authAlgo = IX_CRYPTO_ACC_AUTH_MD5;
+			ixp->ixp_ctx.authCtx.authDigestLen = AUTH_LEN(cri, MD5_HASH_LEN);
+			ixp->ixp_ctx.authCtx.aadLen = 0;
+			/* Only MD5_HMAC needs a key */
+			if (cri->cri_alg == CRYPTO_MD5_HMAC) {
+				ixp->ixp_ctx.authCtx.authKeyLen = (cri->cri_klen + 7) / 8;
+				if (ixp->ixp_ctx.authCtx.authKeyLen >
+						sizeof(ixp->ixp_ctx.authCtx.key.authKey)) {
+					printk(
+						"ixp4xx: Invalid key length for MD5_HMAC - %d bits\n",
+							cri->cri_klen);
+					ixp_freesession(NULL, i);
+					return EINVAL;
+				}
+				memcpy(ixp->ixp_ctx.authCtx.key.authKey,
+						cri->cri_key, (cri->cri_klen + 7) / 8);
+			}
+			break;
+
+		case CRYPTO_SHA1:
+		case CRYPTO_SHA1_HMAC:
+			ixp->ixp_auth_alg = cri->cri_alg;
+			ixp->ixp_ctx.authCtx.authAlgo = IX_CRYPTO_ACC_AUTH_SHA1;
+			ixp->ixp_ctx.authCtx.authDigestLen = AUTH_LEN(cri, SHA1_HASH_LEN);
+			ixp->ixp_ctx.authCtx.aadLen = 0;
+			/* Only SHA1_HMAC needs a key */
+			if (cri->cri_alg == CRYPTO_SHA1_HMAC) {
+				ixp->ixp_ctx.authCtx.authKeyLen = (cri->cri_klen + 7) / 8;
+				if (ixp->ixp_ctx.authCtx.authKeyLen >
+						sizeof(ixp->ixp_ctx.authCtx.key.authKey)) {
+					printk(
+						"ixp4xx: Invalid key length for SHA1_HMAC - %d bits\n",
+							cri->cri_klen);
+					ixp_freesession(NULL, i);
+					return EINVAL;
+				}
+				memcpy(ixp->ixp_ctx.authCtx.key.authKey,
+						cri->cri_key, (cri->cri_klen + 7) / 8);
+			}
+			break;
+
+		default:
+			printk("ixp: unknown algo 0x%x\n", cri->cri_alg);
+			ixp_freesession(NULL, i);
+			return EINVAL;
+		}
+		cri = cri->cri_next;
+	}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+	INIT_WORK(&ixp->ixp_pending_work, ixp_process_pending_wq);
+	INIT_WORK(&ixp->ixp_registration_work, ixp_registration_wq);
+#else
+	INIT_WORK(&ixp->ixp_pending_work, ixp_process_pending, ixp);
+	INIT_WORK(&ixp->ixp_registration_work, ixp_registration, ixp);
+#endif
+
+	return 0;
+}
+
+
+/*
+ * Free a session.
+ */
+static int
+ixp_freesession(device_t dev, u_int64_t tid)
+{
+	u_int32_t sid = CRYPTO_SESID2LID(tid);
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid > ixp_sesnum || ixp_sessions == NULL ||
+			ixp_sessions[sid] == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	/* Silently accept and return */
+	if (sid == 0)
+		return 0;
+
+	if (ixp_sessions[sid]) {
+		if (ixp_sessions[sid]->ixp_ctx_id != -1) {
+			ixCryptoAccCtxUnregister(ixp_sessions[sid]->ixp_ctx_id);
+			ixp_sessions[sid]->ixp_ctx_id = -1;
+		}
+		kfree(ixp_sessions[sid]);
+	}
+	ixp_sessions[sid] = NULL;
+	if (ixp_blocked) {
+		ixp_blocked = 0;
+		crypto_unblock(ixp_id, CRYPTO_SYMQ);
+	}
+	return 0;
+}
+
+
+/*
+ * callback for when hash processing is complete
+ */
+
+static void
+ixp_hash_perform_cb(
+	UINT32 hash_key_id,
+	IX_MBUF *bufp,
+	IxCryptoAccStatus status)
+{
+	struct ixp_q *q;
+
+	dprintk("%s(%u, %p, 0x%x)\n", __FUNCTION__, hash_key_id, bufp, status);
+
+	if (bufp == NULL) {
+		printk("ixp: NULL buf in %s\n", __FUNCTION__);
+		return;
+	}
+
+	q = IX_MBUF_PRIV(bufp);
+	if (q == NULL) {
+		printk("ixp: NULL priv in %s\n", __FUNCTION__);
+		return;
+	}
+
+	if (status == IX_CRYPTO_ACC_STATUS_SUCCESS) {
+		/* On success, need to copy hash back into original client buffer */
+		memcpy(q->ixp_hash_dest, q->ixp_hash_src,
+				(q->ixp_q_data->ixp_auth_alg == CRYPTO_SHA1) ?
+					SHA1_HASH_LEN : MD5_HASH_LEN);
+	}
+	else {
+		printk("ixp: hash perform failed status=%d\n", status);
+		q->ixp_q_crp->crp_etype = EINVAL;
+	}
+
+	/* Free internal buffer used for hashing */
+	kfree(IX_MBUF_MDATA(&q->ixp_q_mbuf));
+
+	crypto_done(q->ixp_q_crp);
+	kmem_cache_free(qcache, q);
+}
+
+/*
+ * setup a request and perform it
+ */
+static void
+ixp_q_process(struct ixp_q *q)
+{
+	IxCryptoAccStatus status;
+	struct ixp_data *ixp = q->ixp_q_data;
+	int auth_off = 0;
+	int auth_len = 0;
+	int crypt_off = 0;
+	int crypt_len = 0;
+	int icv_off = 0;
+	char *crypt_func;
+
+	dprintk("%s(%p)\n", __FUNCTION__, q);
+
+	if (q->ixp_q_ccrd) {
+		if (q->ixp_q_ccrd->crd_flags & CRD_F_ENCRYPT) {
+			if (q->ixp_q_ccrd->crd_flags & CRD_F_IV_EXPLICIT) {
+				q->ixp_q_iv = q->ixp_q_ccrd->crd_iv;
+			} else {
+				q->ixp_q_iv = q->ixp_q_iv_data;
+				read_random(q->ixp_q_iv, ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen);
+			}
+			if ((q->ixp_q_ccrd->crd_flags & CRD_F_IV_PRESENT) == 0)
+				crypto_copyback(q->ixp_q_crp->crp_flags, q->ixp_q_crp->crp_buf,
+						q->ixp_q_ccrd->crd_inject,
+						ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen,
+						(caddr_t) q->ixp_q_iv);
+		} else {
+			if (q->ixp_q_ccrd->crd_flags & CRD_F_IV_EXPLICIT)
+				q->ixp_q_iv = q->ixp_q_ccrd->crd_iv;
+			else {
+				q->ixp_q_iv = q->ixp_q_iv_data;
+				crypto_copydata(q->ixp_q_crp->crp_flags, q->ixp_q_crp->crp_buf,
+						q->ixp_q_ccrd->crd_inject,
+						ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen,
+						(caddr_t) q->ixp_q_iv);
+			}
+		}
+
+		if (q->ixp_q_acrd) {
+			auth_off = q->ixp_q_acrd->crd_skip;
+			auth_len = q->ixp_q_acrd->crd_len;
+			icv_off  = q->ixp_q_acrd->crd_inject;
+		}
+
+		crypt_off = q->ixp_q_ccrd->crd_skip;
+		crypt_len = q->ixp_q_ccrd->crd_len;
+	} else { /* if (q->ixp_q_acrd) */
+		auth_off = q->ixp_q_acrd->crd_skip;
+		auth_len = q->ixp_q_acrd->crd_len;
+		icv_off  = q->ixp_q_acrd->crd_inject;
+	}
+
+	if (q->ixp_q_crp->crp_flags & CRYPTO_F_SKBUF) {
+		struct sk_buff *skb = (struct sk_buff *) q->ixp_q_crp->crp_buf;
+		if (skb_shinfo(skb)->nr_frags) {
+			/*
+			 * DAVIDM fix this limitation one day by using
+			 * a buffer pool and chaining,  it is not currently
+			 * needed for current user/kernel space acceleration
+			 */
+			printk("ixp: Cannot handle fragmented skb's yet !\n");
+			q->ixp_q_crp->crp_etype = ENOENT;
+			goto done;
+		}
+		IX_MBUF_MLEN(&q->ixp_q_mbuf) =
+				IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) =  skb->len;
+		IX_MBUF_MDATA(&q->ixp_q_mbuf) = skb->data;
+	} else if (q->ixp_q_crp->crp_flags & CRYPTO_F_IOV) {
+		struct uio *uiop = (struct uio *) q->ixp_q_crp->crp_buf;
+		if (uiop->uio_iovcnt != 1) {
+			/*
+			 * DAVIDM fix this limitation one day by using
+			 * a buffer pool and chaining,  it is not currently
+			 * needed for current user/kernel space acceleration
+			 */
+			printk("ixp: Cannot handle more than 1 iovec yet !\n");
+			q->ixp_q_crp->crp_etype = ENOENT;
+			goto done;
+		}
+		IX_MBUF_MLEN(&q->ixp_q_mbuf) =
+				IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) = uiop->uio_iov[0].iov_len;
+		IX_MBUF_MDATA(&q->ixp_q_mbuf) = uiop->uio_iov[0].iov_base;
+	} else /* contig buffer */ {
+		IX_MBUF_MLEN(&q->ixp_q_mbuf)  =
+				IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) = q->ixp_q_crp->crp_ilen;
+		IX_MBUF_MDATA(&q->ixp_q_mbuf) = q->ixp_q_crp->crp_buf;
+	}
+
+	IX_MBUF_PRIV(&q->ixp_q_mbuf) = q;
+
+	if (ixp->ixp_auth_alg == CRYPTO_SHA1 || ixp->ixp_auth_alg == CRYPTO_MD5) {
+		/*
+		 * For SHA1 and MD5 hash, need to create an internal buffer that is big
+		 * enough to hold the original data + the appropriate padding for the
+		 * hash algorithm.
+		 */
+		UINT8 *tbuf = NULL;
+
+		IX_MBUF_MLEN(&q->ixp_q_mbuf) = IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) =
+			((IX_MBUF_MLEN(&q->ixp_q_mbuf) * 8) + 72 + 511) / 8;
+		tbuf = kmalloc(IX_MBUF_MLEN(&q->ixp_q_mbuf), SLAB_ATOMIC);
+		
+		if (IX_MBUF_MDATA(&q->ixp_q_mbuf) == NULL) {
+			printk("ixp: kmalloc(%u, SLAB_ATOMIC) failed\n",
+					IX_MBUF_MLEN(&q->ixp_q_mbuf));
+			q->ixp_q_crp->crp_etype = ENOMEM;
+			goto done;
+		}
+		memcpy(tbuf, &(IX_MBUF_MDATA(&q->ixp_q_mbuf))[auth_off], auth_len);
+
+		/* Set location in client buffer to copy hash into */
+		q->ixp_hash_dest =
+			&(IX_MBUF_MDATA(&q->ixp_q_mbuf))[auth_off + auth_len];
+
+		IX_MBUF_MDATA(&q->ixp_q_mbuf) = tbuf;
+
+		/* Set location in internal buffer for where hash starts */
+		q->ixp_hash_src = &(IX_MBUF_MDATA(&q->ixp_q_mbuf))[auth_len];
+
+		crypt_func = "ixCryptoAccHashPerform";
+		status = ixCryptoAccHashPerform(ixp->ixp_ctx.authCtx.authAlgo,
+				&q->ixp_q_mbuf, ixp_hash_perform_cb, 0, auth_len, auth_len,
+				&ixp->ixp_hash_key_id);
+	}
+	else {
+		crypt_func = "ixCryptoAccAuthCryptPerform";
+		status = ixCryptoAccAuthCryptPerform(ixp->ixp_ctx_id, &q->ixp_q_mbuf,
+			NULL, auth_off, auth_len, crypt_off, crypt_len, icv_off,
+			q->ixp_q_iv);
+	}
+
+	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
+		return;
+
+	if (IX_CRYPTO_ACC_STATUS_QUEUE_FULL == status) {
+		q->ixp_q_crp->crp_etype = ENOMEM;
+		goto done;
+	}
+
+	printk("ixp: %s failed %u\n", crypt_func, status);
+	q->ixp_q_crp->crp_etype = EINVAL;
+
+done:
+	crypto_done(q->ixp_q_crp);
+	kmem_cache_free(qcache, q);
+}
+
+
+/*
+ * because we cannot process the Q from the Register callback
+ * we do it here on a task Q.
+ */
+
+static void
+ixp_process_pending(void *arg)
+{
+	struct ixp_data *ixp = arg;
+	struct ixp_q *q = NULL;
+
+	dprintk("%s(%p)\n", __FUNCTION__, arg);
+
+	if (!ixp)
+		return;
+
+	while (!list_empty(&ixp->ixp_q)) {
+		q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
+		list_del(&q->ixp_q_list);
+		ixp_q_process(q);
+	}
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void
+ixp_process_pending_wq(struct work_struct *work)
+{
+	struct ixp_data *ixp = container_of(work, struct ixp_data, ixp_pending_work);
+	ixp_process_pending(ixp);
+}
+#endif
+
+/*
+ * callback for when context registration is complete
+ */
+
+static void
+ixp_register_cb(UINT32 ctx_id, IX_MBUF *bufp, IxCryptoAccStatus status)
+{
+	int i;
+	struct ixp_data *ixp;
+	struct ixp_q *q;
+
+	dprintk("%s(%d, %p, %d)\n", __FUNCTION__, ctx_id, bufp, status);
+
+	/*
+	 * free any buffer passed in to this routine
+	 */
+	if (bufp) {
+		IX_MBUF_MLEN(bufp) = IX_MBUF_PKT_LEN(bufp) = 0;
+		kfree(IX_MBUF_MDATA(bufp));
+		IX_MBUF_MDATA(bufp) = NULL;
+	}
+
+	for (i = 0; i < ixp_sesnum; i++) {
+		ixp = ixp_sessions[i];
+		if (ixp && ixp->ixp_ctx_id == ctx_id)
+			break;
+	}
+	if (i >= ixp_sesnum) {
+		printk("ixp: invalid context id %d\n", ctx_id);
+		return;
+	}
+
+	if (IX_CRYPTO_ACC_STATUS_WAIT == status) {
+		/* this is normal to free the first of two buffers */
+		dprintk("ixp: register not finished yet.\n");
+		return;
+	}
+
+	if (IX_CRYPTO_ACC_STATUS_SUCCESS != status) {
+		printk("ixp: register failed 0x%x\n", status);
+		while (!list_empty(&ixp->ixp_q)) {
+			q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
+			list_del(&q->ixp_q_list);
+			q->ixp_q_crp->crp_etype = EINVAL;
+			crypto_done(q->ixp_q_crp);
+			kmem_cache_free(qcache, q);
+		}
+		return;
+	}
+
+	/*
+	 * we are now registered,  we cannot start processing the Q here
+	 * or we get strange errors with AES (DES/3DES seem to be ok).
+	 */
+	ixp->ixp_registered = 1;
+	schedule_work(&ixp->ixp_pending_work);
+}
+
+
+/*
+ * callback for when data processing is complete
+ */
+
+static void
+ixp_perform_cb(
+	UINT32 ctx_id,
+	IX_MBUF *sbufp,
+	IX_MBUF *dbufp,
+	IxCryptoAccStatus status)
+{
+	struct ixp_q *q;
+
+	dprintk("%s(%d, %p, %p, 0x%x)\n", __FUNCTION__, ctx_id, sbufp,
+			dbufp, status);
+
+	if (sbufp == NULL) {
+		printk("ixp: NULL sbuf in ixp_perform_cb\n");
+		return;
+	}
+
+	q = IX_MBUF_PRIV(sbufp);
+	if (q == NULL) {
+		printk("ixp: NULL priv in ixp_perform_cb\n");
+		return;
+	}
+
+	if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
+		printk("ixp: perform failed status=%d\n", status);
+		q->ixp_q_crp->crp_etype = EINVAL;
+	}
+
+	crypto_done(q->ixp_q_crp);
+	kmem_cache_free(qcache, q);
+}
+
+
+/*
+ * registration is not callable at IRQ time,  so we defer
+ * to a task queue,  this routines completes the registration for us
+ * when the task queue runs
+ *
+ * Unfortunately this means we cannot tell OCF that the driver is blocked,
+ * we do that on the next request.
+ */
+
+static void
+ixp_registration(void *arg)
+{
+	struct ixp_data *ixp = arg;
+	struct ixp_q *q = NULL;
+	IX_MBUF *pri = NULL, *sec = NULL;
+	int status = IX_CRYPTO_ACC_STATUS_SUCCESS;
+
+	if (!ixp) {
+		printk("ixp: ixp_registration with no arg\n");
+		return;
+	}
+
+	if (ixp->ixp_ctx_id != -1) {
+		ixCryptoAccCtxUnregister(ixp->ixp_ctx_id);
+		ixp->ixp_ctx_id = -1;
+	}
+
+	if (list_empty(&ixp->ixp_q)) {
+		printk("ixp: ixp_registration with no Q\n");
+		return;
+	}
+
+	/*
+	 * setup the primary and secondary buffers
+	 */
+	q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
+	if (q->ixp_q_acrd) {
+		pri = &ixp->ixp_pri_mbuf;
+		sec = &ixp->ixp_sec_mbuf;
+		IX_MBUF_MLEN(pri)  = IX_MBUF_PKT_LEN(pri) = 128;
+		IX_MBUF_MDATA(pri) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
+		IX_MBUF_MLEN(sec)  = IX_MBUF_PKT_LEN(sec) = 128;
+		IX_MBUF_MDATA(sec) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
+	}
+
+	/* Only need to register if a crypt op or HMAC op */
+	if (!(ixp->ixp_auth_alg == CRYPTO_SHA1 ||
+				ixp->ixp_auth_alg == CRYPTO_MD5)) {
+		status = ixCryptoAccCtxRegister(
+					&ixp->ixp_ctx,
+					pri, sec,
+					ixp_register_cb,
+					ixp_perform_cb,
+					&ixp->ixp_ctx_id);
+	}
+	else {
+		/* Otherwise we start processing pending q */
+		schedule_work(&ixp->ixp_pending_work);
+	}
+
+	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
+		return;
+
+	if (IX_CRYPTO_ACC_STATUS_EXCEED_MAX_TUNNELS == status) {
+		printk("ixp: ixCryptoAccCtxRegister failed (out of tunnels)\n");
+		ixp_blocked = 1;
+		/* perhaps we should return EGAIN on queued ops ? */
+		return;
+	}
+
+	printk("ixp: ixCryptoAccCtxRegister failed %d\n", status);
+	ixp->ixp_ctx_id = -1;
+
+	/*
+	 * everything waiting is toasted
+	 */
+	while (!list_empty(&ixp->ixp_q)) {
+		q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
+		list_del(&q->ixp_q_list);
+		q->ixp_q_crp->crp_etype = ENOENT;
+		crypto_done(q->ixp_q_crp);
+		kmem_cache_free(qcache, q);
+	}
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void
+ixp_registration_wq(struct work_struct *work)
+{
+	struct ixp_data *ixp = container_of(work, struct ixp_data,
+								ixp_registration_work);
+	ixp_registration(ixp);
+}
+#endif
+
+/*
+ * Process a request.
+ */
+static int
+ixp_process(device_t dev, struct cryptop *crp, int hint)
+{
+	struct ixp_data *ixp;
+	unsigned int lid;
+	struct ixp_q *q = NULL;
+	int status;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	/* Sanity check */
+	if (crp == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	crp->crp_etype = 0;
+
+	if (ixp_blocked)
+		return ERESTART;
+
+	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		crp->crp_etype = EINVAL;
+		goto done;
+	}
+
+	/*
+	 * find the session we are using
+	 */
+
+	lid = crp->crp_sid & 0xffffffff;
+	if (lid >= ixp_sesnum || lid == 0 || ixp_sessions == NULL ||
+			ixp_sessions[lid] == NULL) {
+		crp->crp_etype = ENOENT;
+		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
+		goto done;
+	}
+	ixp = ixp_sessions[lid];
+
+	/*
+	 * setup a new request ready for queuing
+	 */
+	q = kmem_cache_alloc(qcache, SLAB_ATOMIC);
+	if (q == NULL) {
+		dprintk("%s,%d: ENOMEM\n", __FILE__, __LINE__);
+		crp->crp_etype = ENOMEM;
+		goto done;
+	}
+	/*
+	 * save some cycles by only zeroing the important bits
+	 */
+	memset(&q->ixp_q_mbuf, 0, sizeof(q->ixp_q_mbuf));
+	q->ixp_q_ccrd = NULL;
+	q->ixp_q_acrd = NULL;
+	q->ixp_q_crp = crp;
+	q->ixp_q_data = ixp;
+
+	/*
+	 * point the cipher and auth descriptors appropriately
+	 * check that we have something to do
+	 */
+	if (crp->crp_desc->crd_alg == ixp->ixp_cipher_alg)
+		q->ixp_q_ccrd = crp->crp_desc;
+	else if (crp->crp_desc->crd_alg == ixp->ixp_auth_alg)
+		q->ixp_q_acrd = crp->crp_desc;
+	else {
+		crp->crp_etype = ENOENT;
+		dprintk("%s,%d: bad desc match: ENOENT\n", __FILE__, __LINE__);
+		goto done;
+	}
+	if (crp->crp_desc->crd_next) {
+		if (crp->crp_desc->crd_next->crd_alg == ixp->ixp_cipher_alg)
+			q->ixp_q_ccrd = crp->crp_desc->crd_next;
+		else if (crp->crp_desc->crd_next->crd_alg == ixp->ixp_auth_alg)
+			q->ixp_q_acrd = crp->crp_desc->crd_next;
+		else {
+			crp->crp_etype = ENOENT;
+			dprintk("%s,%d: bad desc match: ENOENT\n", __FILE__, __LINE__);
+			goto done;
+		}
+	}
+
+	/*
+	 * If there is a direction change for this context then we mark it as
+	 * unregistered and re-register is for the new direction.  This is not
+	 * a very expensive operation and currently only tends to happen when
+	 * user-space application are doing benchmarks
+	 *
+	 * DM - we should be checking for pending requests before unregistering.
+	 */
+	if (q->ixp_q_ccrd && ixp->ixp_registered &&
+			ixp->ixp_crd_flags != (q->ixp_q_ccrd->crd_flags & CRD_F_ENCRYPT)) {
+		dprintk("%s - detected direction change on session\n", __FUNCTION__);
+		ixp->ixp_registered = 0;
+	}
+
+	/*
+	 * if we are registered,  call straight into the perform code
+	 */
+	if (ixp->ixp_registered) {
+		ixp_q_process(q);
+		return 0;
+	}
+
+	/*
+	 * the only part of the context not set in newsession is the direction
+	 * dependent parts
+	 */
+	if (q->ixp_q_ccrd) {
+		ixp->ixp_crd_flags = (q->ixp_q_ccrd->crd_flags & CRD_F_ENCRYPT);
+		if (q->ixp_q_ccrd->crd_flags & CRD_F_ENCRYPT) {
+			ixp->ixp_ctx.operation = q->ixp_q_acrd ?
+					IX_CRYPTO_ACC_OP_ENCRYPT_AUTH : IX_CRYPTO_ACC_OP_ENCRYPT;
+		} else {
+			ixp->ixp_ctx.operation = q->ixp_q_acrd ?
+					IX_CRYPTO_ACC_OP_AUTH_DECRYPT : IX_CRYPTO_ACC_OP_DECRYPT;
+		}
+	} else {
+		/* q->ixp_q_acrd must be set if we are here */
+		ixp->ixp_ctx.operation = IX_CRYPTO_ACC_OP_AUTH_CALC;
+	}
+
+	status = list_empty(&ixp->ixp_q);
+	list_add_tail(&q->ixp_q_list, &ixp->ixp_q);
+	if (status)
+		schedule_work(&ixp->ixp_registration_work);
+	return 0;
+
+done:
+	if (q)
+		kmem_cache_free(qcache, q);
+	crypto_done(crp);
+	return 0;
+}
+
+
+#ifdef __ixp46X
+/*
+ * key processing support for the ixp465
+ */
+
+
+/*
+ * copy a BN (LE) into a buffer (BE) an fill out the op appropriately
+ * assume zeroed and only copy bits that are significant
+ */
+
+static int
+ixp_copy_ibuf(struct crparam *p, IxCryptoAccPkeEauOperand *op, UINT32 *buf)
+{
+	unsigned char *src = (unsigned char *) p->crp_p;
+	unsigned char *dst;
+	int len, bits = p->crp_nbits;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	if (bits > MAX_IOP_SIZE * sizeof(UINT32) * 8) {
+		dprintk("%s - ibuf too big (%d > %d)\n", __FUNCTION__,
+				bits, MAX_IOP_SIZE * sizeof(UINT32) * 8);
+		return -1;
+	}
+
+	len = (bits + 31) / 32; /* the number UINT32's needed */
+
+	dst = (unsigned char *) &buf[len];
+	dst--;
+
+	while (bits > 0) {
+		*dst-- = *src++;
+		bits -= 8;
+	}
+
+#if 0 /* no need to zero remaining bits as it is done during request alloc */
+	while (dst > (unsigned char *) buf)
+		*dst-- = '\0';
+#endif
+
+	op->pData = buf;
+	op->dataLen = len;
+	return 0;
+}
+
+/*
+ * copy out the result,  be as forgiving as we can about small output buffers
+ */
+
+static int
+ixp_copy_obuf(struct crparam *p, IxCryptoAccPkeEauOpResult *op, UINT32 *buf)
+{
+	unsigned char *dst = (unsigned char *) p->crp_p;
+	unsigned char *src = (unsigned char *) buf;
+	int len, z, bits = p->crp_nbits;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	len = op->dataLen * sizeof(UINT32);
+
+	/* skip leading zeroes to be small buffer friendly */
+	z = 0;
+	while (z < len && src[z] == '\0')
+		z++;
+
+	src += len;
+	src--;
+	len -= z;
+
+	while (len > 0 && bits > 0) {
+		*dst++ = *src--;
+		len--;
+		bits -= 8;
+	}
+
+	while (bits > 0) {
+		*dst++ = '\0';
+		bits -= 8;
+	}
+
+	if (len > 0) {
+		dprintk("%s - obuf is %d (z=%d, ob=%d) bytes too small\n",
+				__FUNCTION__, len, z, p->crp_nbits / 8);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+/*
+ * the parameter offsets for exp_mod
+ */
+
+#define IXP_PARAM_BASE 0
+#define IXP_PARAM_EXP  1
+#define IXP_PARAM_MOD  2
+#define IXP_PARAM_RES  3
+
+/*
+ * key processing complete callback,  is also used to start processing
+ * by passing a NULL for pResult
+ */
+
+static void
+ixp_kperform_cb(
+	IxCryptoAccPkeEauOperation operation,
+	IxCryptoAccPkeEauOpResult *pResult,
+	BOOL carryOrBorrow,
+	IxCryptoAccStatus status)
+{
+	struct ixp_pkq *q, *tmp;
+	unsigned long flags;
+
+	dprintk("%s(0x%x, %p, %d, 0x%x)\n", __FUNCTION__, operation, pResult,
+			carryOrBorrow, status);
+
+	/* handle a completed request */
+	if (pResult) {
+		if (ixp_pk_cur && &ixp_pk_cur->pkq_result == pResult) {
+			q = ixp_pk_cur;
+			if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
+				dprintk("%s() - op failed 0x%x\n", __FUNCTION__, status);
+				q->pkq_krp->krp_status = ERANGE; /* could do better */
+			} else {
+				/* copy out the result */
+				if (ixp_copy_obuf(&q->pkq_krp->krp_param[IXP_PARAM_RES],
+						&q->pkq_result, q->pkq_obuf))
+					q->pkq_krp->krp_status = ERANGE;
+			}
+			crypto_kdone(q->pkq_krp);
+			kfree(q);
+			ixp_pk_cur = NULL;
+		} else
+			printk("%s - callback with invalid result pointer\n", __FUNCTION__);
+	}
+
+	spin_lock_irqsave(&ixp_pkq_lock, flags);
+	if (ixp_pk_cur || list_empty(&ixp_pkq)) {
+		spin_unlock_irqrestore(&ixp_pkq_lock, flags);
+		return;
+	}
+
+	list_for_each_entry_safe(q, tmp, &ixp_pkq, pkq_list) {
+
+		list_del(&q->pkq_list);
+		ixp_pk_cur = q;
+
+		spin_unlock_irqrestore(&ixp_pkq_lock, flags);
+
+		status = ixCryptoAccPkeEauPerform(
+				IX_CRYPTO_ACC_OP_EAU_MOD_EXP,
+				&q->pkq_op,
+				ixp_kperform_cb,
+				&q->pkq_result);
+	
+		if (status == IX_CRYPTO_ACC_STATUS_SUCCESS) {
+			dprintk("%s() - ixCryptoAccPkeEauPerform SUCCESS\n", __FUNCTION__);
+			return; /* callback will return here for callback */
+		} else if (status == IX_CRYPTO_ACC_STATUS_RETRY) {
+			printk("%s() - ixCryptoAccPkeEauPerform RETRY\n", __FUNCTION__);
+		} else {
+			printk("%s() - ixCryptoAccPkeEauPerform failed %d\n",
+					__FUNCTION__, status);
+		}
+		q->pkq_krp->krp_status = ERANGE; /* could do better */
+		crypto_kdone(q->pkq_krp);
+		kfree(q);
+		spin_lock_irqsave(&ixp_pkq_lock, flags);
+	}
+	spin_unlock_irqrestore(&ixp_pkq_lock, flags);
+}
+
+
+static int
+ixp_kprocess(device_t dev, struct cryptkop *krp, int hint)
+{
+	struct ixp_pkq *q;
+	int rc = 0;
+	unsigned long flags;
+
+	dprintk("%s l1=%d l2=%d l3=%d l4=%d\n", __FUNCTION__,
+			krp->krp_param[IXP_PARAM_BASE].crp_nbits,
+			krp->krp_param[IXP_PARAM_EXP].crp_nbits,
+			krp->krp_param[IXP_PARAM_MOD].crp_nbits,
+			krp->krp_param[IXP_PARAM_RES].crp_nbits);
+
+
+	if (krp->krp_op != CRK_MOD_EXP) {
+		krp->krp_status = EOPNOTSUPP;
+		goto err;
+	}
+
+	q = (struct ixp_pkq *) kmalloc(sizeof(*q), GFP_KERNEL);
+	if (q == NULL) {
+		krp->krp_status = ENOMEM;
+		goto err;
+	}
+
+	/*
+	 * The PKE engine does not appear to zero the output buffer
+	 * appropriately, so we need to do it all here.
+	 */
+	memset(q, 0, sizeof(*q));
+
+	q->pkq_krp = krp;
+	INIT_LIST_HEAD(&q->pkq_list);
+
+	if (ixp_copy_ibuf(&krp->krp_param[IXP_PARAM_BASE], &q->pkq_op.modExpOpr.M,
+			q->pkq_ibuf0))
+		rc = 1;
+	if (!rc && ixp_copy_ibuf(&krp->krp_param[IXP_PARAM_EXP],
+				&q->pkq_op.modExpOpr.e, q->pkq_ibuf1))
+		rc = 2;
+	if (!rc && ixp_copy_ibuf(&krp->krp_param[IXP_PARAM_MOD],
+				&q->pkq_op.modExpOpr.N, q->pkq_ibuf2))
+		rc = 3;
+
+	if (rc) {
+		kfree(q);
+		krp->krp_status = ERANGE;
+		goto err;
+	}
+
+	q->pkq_result.pData           = q->pkq_obuf;
+	q->pkq_result.dataLen         =
+			(krp->krp_param[IXP_PARAM_RES].crp_nbits + 31) / 32;
+
+	spin_lock_irqsave(&ixp_pkq_lock, flags);
+	list_add_tail(&q->pkq_list, &ixp_pkq);
+	spin_unlock_irqrestore(&ixp_pkq_lock, flags);
+
+	if (!ixp_pk_cur)
+		ixp_kperform_cb(0, NULL, 0, 0);
+	return (0);
+
+err:
+	crypto_kdone(krp);
+	return (0);
+}
+
+
+
+#ifdef CONFIG_OCF_RANDOMHARVEST
+/*
+ * We run the random number generator output through SHA so that it
+ * is FIPS compliant.
+ */
+
+static volatile int sha_done = 0;
+static unsigned char sha_digest[20];
+
+static void
+ixp_hash_cb(UINT8 *digest, IxCryptoAccStatus status)
+{
+	dprintk("%s(%p, %d)\n", __FUNCTION__, digest, status);
+	if (sha_digest != digest)
+		printk("digest error\n");
+	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
+		sha_done = 1;
+	else
+		sha_done = -status;
+}
+
+static int
+ixp_read_random(void *arg, u_int32_t *buf, int maxwords)
+{
+	IxCryptoAccStatus status;
+	int i, n, rc;
+
+	dprintk("%s(%p, %d)\n", __FUNCTION__, buf, maxwords);
+	memset(buf, 0, maxwords * sizeof(*buf));
+	status = ixCryptoAccPkePseudoRandomNumberGet(maxwords, buf);
+	if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
+		dprintk("%s: ixCryptoAccPkePseudoRandomNumberGet failed %d\n",
+				__FUNCTION__, status);
+		return 0;
+	}
+
+	/*
+	 * run the random data through SHA to make it look more random
+	 */
+
+	n = sizeof(sha_digest); /* process digest bytes at a time */
+
+	rc = 0;
+	for (i = 0; i < maxwords; i += n / sizeof(*buf)) {
+		if ((maxwords - i) * sizeof(*buf) < n)
+			n = (maxwords - i) * sizeof(*buf);
+		sha_done = 0;
+		status = ixCryptoAccPkeHashPerform(IX_CRYPTO_ACC_AUTH_SHA1,
+				(UINT8 *) &buf[i], n, ixp_hash_cb, sha_digest);
+		if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
+			dprintk("ixCryptoAccPkeHashPerform failed %d\n", status);
+			return -EIO;
+		}
+		while (!sha_done)
+			schedule();
+		if (sha_done < 0) {
+			dprintk("ixCryptoAccPkeHashPerform failed CB %d\n", -sha_done);
+			return 0;
+		}
+		memcpy(&buf[i], sha_digest, n);
+		rc += n / sizeof(*buf);;
+	}
+
+	return rc;
+}
+#endif /* CONFIG_OCF_RANDOMHARVEST */
+
+#endif /* __ixp46X */
+
+
+
+/*
+ * our driver startup and shutdown routines
+ */
+
+static int
+ixp_init(void)
+{
+	dprintk("%s(%p)\n", __FUNCTION__, ixp_init);
+
+	if (ixp_init_crypto && ixCryptoAccInit() != IX_CRYPTO_ACC_STATUS_SUCCESS)
+		printk("ixCryptoAccInit failed, assuming already initialised!\n");
+
+	qcache = kmem_cache_create("ixp4xx_q", sizeof(struct ixp_q), 0,
+				SLAB_HWCACHE_ALIGN, NULL
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+				, NULL
+#endif
+				  );
+	if (!qcache) {
+		printk("failed to create Qcache\n");
+		return -ENOENT;
+	}
+
+	memset(&ixpdev, 0, sizeof(ixpdev));
+	softc_device_init(&ixpdev, "ixp4xx", 0, ixp_methods);
+
+	ixp_id = crypto_get_driverid(softc_get_device(&ixpdev),
+				CRYPTOCAP_F_HARDWARE);
+	if (ixp_id < 0)
+		panic("IXP/OCF crypto device cannot initialize!");
+
+#define	REGISTER(alg) \
+	crypto_register(ixp_id,alg,0,0)
+
+	REGISTER(CRYPTO_DES_CBC);
+	REGISTER(CRYPTO_3DES_CBC);
+	REGISTER(CRYPTO_RIJNDAEL128_CBC);
+#ifdef CONFIG_OCF_IXP4XX_SHA1_MD5
+	REGISTER(CRYPTO_MD5);
+	REGISTER(CRYPTO_SHA1);
+#endif
+	REGISTER(CRYPTO_MD5_HMAC);
+	REGISTER(CRYPTO_SHA1_HMAC);
+#undef REGISTER
+
+#ifdef __ixp46X
+	spin_lock_init(&ixp_pkq_lock);
+	/*
+	 * we do not enable the go fast options here as they can potentially
+	 * allow timing based attacks
+	 *
+	 * http://www.openssl.org/news/secadv_20030219.txt
+	 */
+	ixCryptoAccPkeEauExpConfig(0, 0);
+	crypto_kregister(ixp_id, CRK_MOD_EXP, 0);
+#ifdef CONFIG_OCF_RANDOMHARVEST
+	crypto_rregister(ixp_id, ixp_read_random, NULL);
+#endif
+#endif
+
+	return 0;
+}
+
+static void
+ixp_exit(void)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	crypto_unregister_all(ixp_id);
+	ixp_id = -1;
+	kmem_cache_destroy(qcache);
+	qcache = NULL;
+}
+
+module_init(ixp_init);
+module_exit(ixp_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <dmccullough@cyberguard.com>");
+MODULE_DESCRIPTION("ixp (OCF module for IXP4xx crypto)");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/Makefile b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/Makefile
new file mode 100644
index 00000000..6dafd004
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/Makefile
@@ -0,0 +1,19 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_KIRKWOOD) += mv_cesa.o
+
+mv_cesa-y := cesa/mvCesa.o cesa/mvLru.o cesa/mvMD5.o cesa/mvSHA1.o cesa/AES/mvAesAlg.o cesa/AES/mvAesApi.o cesa/mvCesaDebug.o cesa_ocf_drv.o
+
+# Extra objects required by the CESA driver
+mv_cesa-y += mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.o mvHal/kw_family/boardEnv/mvBoardEnvLib.o mvHal/mv_hal/twsi/mvTwsi.o mvHal/kw_family/ctrlEnv/sys/mvCpuIf.o mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.o mvHal/kw_family/ctrlEnv/sys/mvSysDram.o mvHal/linux_oss/mvOs.o mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.o mvHal/mv_hal/gpp/mvGpp.o mvHal/kw_family/ctrlEnv/sys/mvSysPex.o mvHal/mv_hal/pex/mvPex.o mvHal/kw_family/boardEnv/mvBoardEnvSpec.o mvHal/common/mvCommon.o mvHal/common/mvDebug.o mvHal/kw_family/ctrlEnv/sys/mvSysCesa.o
+
+ifdef src
+EXTRA_CFLAGS += -I$(src)/.. -I$(src)/cesa -I$(src)/mvHal -I$(src)/mvHal/common -I$(src)/mvHal/kw_family -I$(src)/mvHal/mv_hal -I$(src)/mvHal/linux_oss -I$(src)
+endif
+
+EXTRA_CFLAGS += -DMV_LINUX -DMV_CPU_LE -DMV_ARM -DMV_INCLUDE_CESA -DMV_INCLUDE_PEX -DMV_CACHE_COHERENCY=3
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h
new file mode 100644
index 00000000..07a8601f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h
@@ -0,0 +1,62 @@
+/* mvAes.h   v2.0   August '99
+ * Reference ANSI C code
+ */
+
+/*  AES Cipher header file for ANSI C Submissions
+      Lawrence E. Bassham III
+      Computer Security Division
+      National Institute of Standards and Technology
+
+      April 15, 1998
+
+    This sample is to assist implementers developing to the Cryptographic 
+API Profile for AES Candidate Algorithm Submissions.  Please consult this 
+document as a cross-reference.
+
+    ANY CHANGES, WHERE APPROPRIATE, TO INFORMATION PROVIDED IN THIS FILE
+MUST BE DOCUMENTED.  CHANGES ARE ONLY APPROPRIATE WHERE SPECIFIED WITH
+THE STRING "CHANGE POSSIBLE".  FUNCTION CALLS AND THEIR PARAMETERS CANNOT 
+BE CHANGED.  STRUCTURES CAN BE ALTERED TO ALLOW IMPLEMENTERS TO INCLUDE 
+IMPLEMENTATION SPECIFIC INFORMATION.
+*/
+
+/*  Includes:
+	Standard include files
+*/
+
+#include "mvOs.h"
+
+
+/*  Error Codes - CHANGE POSSIBLE: inclusion of additional error codes  */
+
+/*  Key direction is invalid, e.g., unknown value */
+#define     AES_BAD_KEY_DIR        -1  
+
+/*  Key material not of correct length */
+#define     AES_BAD_KEY_MAT        -2  
+
+/*  Key passed is not valid  */
+#define     AES_BAD_KEY_INSTANCE   -3  
+
+/*  Params struct passed to cipherInit invalid */
+#define     AES_BAD_CIPHER_MODE    -4  
+
+/*  Cipher in wrong state (e.g., not initialized) */
+#define     AES_BAD_CIPHER_STATE   -5  
+
+#define     AES_BAD_CIPHER_INSTANCE   -7 
+
+
+/*  Function protoypes  */
+/*  CHANGED: makeKey(): parameter blockLen added
+                        this parameter is absolutely necessary if you want to
+			setup the round keys in a variable block length setting 
+	     cipherInit(): parameter blockLen added (for obvious reasons)		
+ */
+int     aesMakeKey(MV_U8 *expandedKey, MV_U8 *keyMaterial, int keyLen, int blockLen);
+int     aesBlockEncrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
+                    MV_U32 *plain, int numBlocks, MV_U32 *cipher);
+int     aesBlockDecrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
+                    MV_U32 *plain, int numBlocks, MV_U32 *cipher);
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c
new file mode 100644
index 00000000..a65dc289
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c
@@ -0,0 +1,317 @@
+/* rijndael-alg-ref.c   v2.0   August '99
+ * Reference ANSI C code
+ * authors: Paulo Barreto
+ *          Vincent Rijmen, K.U.Leuven
+ *
+ * This code is placed in the public domain.
+ */
+
+#include "mvOs.h"
+
+#include "mvAesAlg.h"
+
+#include "mvAesBoxes.dat"
+
+
+MV_U8 mul1(MV_U8 aa, MV_U8 bb);
+void KeyAddition(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC], MV_U8 BC);
+void ShiftRow128Enc(MV_U8 a[4][MAXBC]);
+void ShiftRow128Dec(MV_U8 a[4][MAXBC]);
+void Substitution(MV_U8 a[4][MAXBC], MV_U8 box[256]);
+void MixColumn(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC]);
+void InvMixColumn(MV_U8 a[4][MAXBC]);
+
+
+#define mul(aa, bb) (mask[bb] & Alogtable[aa + Logtable[bb]])
+                         
+MV_U8 mul1(MV_U8 aa, MV_U8 bb)
+{
+    return mask[bb] & Alogtable[aa + Logtable[bb]];
+}
+
+
+void KeyAddition(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC], MV_U8 BC) 
+{
+	/* Exor corresponding text input and round key input bytes
+	 */
+    ((MV_U32*)(&(a[0][0])))[0] ^= ((MV_U32*)(&(rk[0][0])))[0];
+    ((MV_U32*)(&(a[1][0])))[0] ^= ((MV_U32*)(&(rk[1][0])))[0];
+    ((MV_U32*)(&(a[2][0])))[0] ^= ((MV_U32*)(&(rk[2][0])))[0];
+    ((MV_U32*)(&(a[3][0])))[0] ^= ((MV_U32*)(&(rk[3][0])))[0];
+
+}
+
+void ShiftRow128Enc(MV_U8 a[4][MAXBC]) {
+	/* Row 0 remains unchanged
+	 * The other three rows are shifted a variable amount
+	 */
+	MV_U8 tmp[MAXBC];
+	
+    tmp[0] = a[1][1];
+    tmp[1] = a[1][2];
+    tmp[2] = a[1][3];
+    tmp[3] = a[1][0];
+
+    ((MV_U32*)(&(a[1][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
+     /*
+    a[1][0] = tmp[0];
+    a[1][1] = tmp[1];
+    a[1][2] = tmp[2];
+    a[1][3] = tmp[3];
+       */
+    tmp[0] = a[2][2];
+    tmp[1] = a[2][3];
+    tmp[2] = a[2][0];
+    tmp[3] = a[2][1];
+
+    ((MV_U32*)(&(a[2][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
+      /*
+    a[2][0] = tmp[0];
+    a[2][1] = tmp[1];
+    a[2][2] = tmp[2];
+    a[2][3] = tmp[3];
+    */
+    tmp[0] = a[3][3];
+    tmp[1] = a[3][0];
+    tmp[2] = a[3][1];
+    tmp[3] = a[3][2];
+
+    ((MV_U32*)(&(a[3][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
+    /*
+    a[3][0] = tmp[0];
+    a[3][1] = tmp[1];
+    a[3][2] = tmp[2];
+    a[3][3] = tmp[3];
+    */
+}  
+
+void ShiftRow128Dec(MV_U8 a[4][MAXBC]) {
+	/* Row 0 remains unchanged
+	 * The other three rows are shifted a variable amount
+	 */
+   	MV_U8 tmp[MAXBC];
+	
+    tmp[0] = a[1][3];
+    tmp[1] = a[1][0];
+    tmp[2] = a[1][1];
+    tmp[3] = a[1][2];
+
+    ((MV_U32*)(&(a[1][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
+    /*
+    a[1][0] = tmp[0];
+    a[1][1] = tmp[1];
+    a[1][2] = tmp[2];
+    a[1][3] = tmp[3];
+    */
+
+    tmp[0] = a[2][2];
+    tmp[1] = a[2][3];
+    tmp[2] = a[2][0];
+    tmp[3] = a[2][1];
+
+    ((MV_U32*)(&(a[2][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
+    /*
+    a[2][0] = tmp[0];
+    a[2][1] = tmp[1];
+    a[2][2] = tmp[2];
+    a[2][3] = tmp[3];
+    */
+
+    tmp[0] = a[3][1];
+    tmp[1] = a[3][2];
+    tmp[2] = a[3][3];
+    tmp[3] = a[3][0];
+
+    ((MV_U32*)(&(a[3][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
+    /*
+    a[3][0] = tmp[0];
+    a[3][1] = tmp[1];
+    a[3][2] = tmp[2];
+    a[3][3] = tmp[3];
+    */
+}  
+
+void Substitution(MV_U8 a[4][MAXBC], MV_U8 box[256]) {
+	/* Replace every byte of the input by the byte at that place
+	 * in the nonlinear S-box
+	 */
+	int i, j;
+	
+	for(i = 0; i < 4; i++)
+		for(j = 0; j < 4; j++) a[i][j] = box[a[i][j]] ;
+}
+   
+void MixColumn(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC]) {
+        /* Mix the four bytes of every column in a linear way
+	 */
+	MV_U8 b[4][MAXBC];
+	int i, j;
+		
+	for(j = 0; j < 4; j++){
+        b[0][j] = mul(25,a[0][j]) ^ mul(1,a[1][j]) ^ a[2][j] ^ a[3][j];
+        b[1][j] = mul(25,a[1][j]) ^ mul(1,a[2][j]) ^ a[3][j] ^ a[0][j];
+        b[2][j] = mul(25,a[2][j]) ^ mul(1,a[3][j]) ^ a[0][j] ^ a[1][j];
+        b[3][j] = mul(25,a[3][j]) ^ mul(1,a[0][j]) ^ a[1][j] ^ a[2][j];
+    }
+	for(i = 0; i < 4; i++)
+		/*for(j = 0; j < BC; j++) a[i][j] = b[i][j];*/
+        ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0] ^ ((MV_U32*)(&(rk[i][0])))[0];;
+}
+
+void InvMixColumn(MV_U8 a[4][MAXBC]) {
+        /* Mix the four bytes of every column in a linear way
+	 * This is the opposite operation of Mixcolumn
+	 */
+	MV_U8 b[4][MAXBC];
+	int i, j;
+	
+	for(j = 0; j < 4; j++){
+        b[0][j] = mul(223,a[0][j]) ^ mul(104,a[1][j]) ^ mul(238,a[2][j]) ^ mul(199,a[3][j]);
+        b[1][j] = mul(223,a[1][j]) ^ mul(104,a[2][j]) ^ mul(238,a[3][j]) ^ mul(199,a[0][j]);
+        b[2][j] = mul(223,a[2][j]) ^ mul(104,a[3][j]) ^ mul(238,a[0][j]) ^ mul(199,a[1][j]);
+        b[3][j] = mul(223,a[3][j]) ^ mul(104,a[0][j]) ^ mul(238,a[1][j]) ^ mul(199,a[2][j]);
+    }
+	for(i = 0; i < 4; i++)
+		/*for(j = 0; j < BC; j++) a[i][j] = b[i][j];*/
+        ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0];
+}
+
+int rijndaelKeySched (MV_U8 k[4][MAXKC], int keyBits, int blockBits, MV_U8 W[MAXROUNDS+1][4][MAXBC]) 
+{
+	/* Calculate the necessary round keys
+	 * The number of calculations depends on keyBits and blockBits
+	 */
+	int KC, BC, ROUNDS;
+	int i, j, t, rconpointer = 0;
+	MV_U8 tk[4][MAXKC];   
+
+	switch (keyBits) {
+	case 128: KC = 4; break;
+	case 192: KC = 6; break;
+	case 256: KC = 8; break;
+	default : return (-1);
+	}
+
+	switch (blockBits) {
+	case 128: BC = 4; break;
+	case 192: BC = 6; break;
+	case 256: BC = 8; break;
+	default : return (-2);
+	}
+
+	switch (keyBits >= blockBits ? keyBits : blockBits) {
+	case 128: ROUNDS = 10; break;
+	case 192: ROUNDS = 12; break;
+	case 256: ROUNDS = 14; break;
+	default : return (-3); /* this cannot happen */
+	}
+
+	
+	for(j = 0; j < KC; j++)
+		for(i = 0; i < 4; i++)
+			tk[i][j] = k[i][j];
+	t = 0;
+	/* copy values into round key array */
+	for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++)
+		for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j];
+		
+	while (t < (ROUNDS+1)*BC) { /* while not enough round key material calculated */
+		/* calculate new values */
+		for(i = 0; i < 4; i++)
+			tk[i][0] ^= S[tk[(i+1)%4][KC-1]];
+		tk[0][0] ^= rcon[rconpointer++];
+
+		if (KC != 8)
+			for(j = 1; j < KC; j++)
+				for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1];
+		else {
+			for(j = 1; j < KC/2; j++)
+				for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1];
+			for(i = 0; i < 4; i++) tk[i][KC/2] ^= S[tk[i][KC/2 - 1]];
+			for(j = KC/2 + 1; j < KC; j++)
+				for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1];
+	}
+	/* copy values into round key array */
+	for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++)
+		for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j];
+	}		
+
+	return 0;
+}
+      
+        
+
+int rijndaelEncrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds)
+{
+	/* Encryption of one block. 
+	 */
+	int r, BC, ROUNDS;
+
+    BC = 4;
+    ROUNDS = rounds;
+
+	/* begin with a key addition
+	 */
+
+	KeyAddition(a,rk[0],BC); 
+
+    /* ROUNDS-1 ordinary rounds
+	 */
+	for(r = 1; r < ROUNDS; r++) {
+		Substitution(a,S);
+		ShiftRow128Enc(a);
+		MixColumn(a, rk[r]);
+		/*KeyAddition(a,rk[r],BC);*/
+	}
+	
+	/* Last round is special: there is no MixColumn
+	 */
+	Substitution(a,S);
+	ShiftRow128Enc(a);
+	KeyAddition(a,rk[ROUNDS],BC);
+
+	return 0;
+}   
+
+
+int rijndaelDecrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds)
+{
+	int r, BC, ROUNDS;
+	
+    BC = 4;
+    ROUNDS = rounds;
+
+	/* To decrypt: apply the inverse operations of the encrypt routine,
+	 *             in opposite order
+	 * 
+	 * (KeyAddition is an involution: it 's equal to its inverse)
+	 * (the inverse of Substitution with table S is Substitution with the inverse table of S)
+	 * (the inverse of Shiftrow is Shiftrow over a suitable distance)
+	 */
+
+        /* First the special round:
+	 *   without InvMixColumn
+	 *   with extra KeyAddition
+	 */
+	KeyAddition(a,rk[ROUNDS],BC);
+    ShiftRow128Dec(a);               
+	Substitution(a,Si);
+	
+	/* ROUNDS-1 ordinary rounds
+	 */
+	for(r = ROUNDS-1; r > 0; r--) {
+		KeyAddition(a,rk[r],BC);
+		InvMixColumn(a);      
+		ShiftRow128Dec(a);               
+		Substitution(a,Si);
+
+	}
+	
+	/* End with the extra key addition
+	 */
+	
+	KeyAddition(a,rk[0],BC);    
+
+	return 0;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h
new file mode 100644
index 00000000..ec81e403
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h
@@ -0,0 +1,19 @@
+/* rijndael-alg-ref.h   v2.0   August '99
+ * Reference ANSI C code
+ * authors: Paulo Barreto
+ *          Vincent Rijmen, K.U.Leuven
+ */
+#ifndef __RIJNDAEL_ALG_H
+#define __RIJNDAEL_ALG_H
+
+#define MAXBC				(128/32)
+#define MAXKC				(256/32)
+#define MAXROUNDS			14
+
+
+int rijndaelKeySched (MV_U8 k[4][MAXKC], int keyBits, int blockBits, MV_U8 rk[MAXROUNDS+1][4][MAXBC]);
+
+int rijndaelEncrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds);
+int rijndaelDecrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds);
+
+#endif /* __RIJNDAEL_ALG_H */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c
new file mode 100644
index 00000000..b432dc6e
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c
@@ -0,0 +1,312 @@
+/* rijndael-api-ref.c   v2.1   April 2000
+ * Reference ANSI C code
+ * authors: v2.0 Paulo Barreto
+ *               Vincent Rijmen, K.U.Leuven
+ *          v2.1 Vincent Rijmen, K.U.Leuven
+ *
+ * This code is placed in the public domain.
+ */
+#include "mvOs.h"
+
+#include "mvAes.h"
+#include "mvAesAlg.h"
+
+
+/*  Defines:
+	Add any additional defines you need
+*/
+
+#define     MODE_ECB        1    /*  Are we ciphering in ECB mode?   */
+#define     MODE_CBC        2    /*  Are we ciphering in CBC mode?   */
+#define     MODE_CFB1       3    /*  Are we ciphering in 1-bit CFB mode? */
+
+
+int     aesMakeKey(MV_U8 *expandedKey, MV_U8 *keyMaterial, int keyLen, int blockLen)
+{
+    MV_U8   W[MAXROUNDS+1][4][MAXBC];
+	MV_U8   k[4][MAXKC];
+    MV_U8   j;
+	int     i, rounds, KC;
+	
+	if (expandedKey == NULL) 
+    {
+		return AES_BAD_KEY_INSTANCE;
+	}
+
+	if (!((keyLen == 128) || (keyLen == 192) || (keyLen == 256))) 
+    { 
+		return AES_BAD_KEY_MAT;
+	}
+
+	if (keyMaterial == NULL) 
+    {
+		return AES_BAD_KEY_MAT;
+	}
+
+	/* initialize key schedule: */ 
+ 	for(i=0; i<keyLen/8; i++) 
+    {
+		j = keyMaterial[i];
+		k[i % 4][i / 4] = j; 
+	}	
+	
+	rijndaelKeySched (k, keyLen, blockLen, W);
+#ifdef MV_AES_DEBUG
+    {
+        MV_U8*  pW = &W[0][0][0];
+        int     x;
+
+        mvOsPrintf("Expended Key: size = %d\n", sizeof(W));
+        for(i=0; i<sizeof(W); i++)
+        {
+            mvOsPrintf("%02x ", pW[i]);
+        }
+        for(i=0; i<MAXROUNDS+1; i++)
+        {
+            mvOsPrintf("\n Round #%02d: ", i);
+            for(x=0; x<MAXBC; x++)
+            {
+                mvOsPrintf("%02x%02x%02x%02x ", 
+                    W[i][0][x], W[i][1][x], W[i][2][x], W[i][3][x]);
+            }
+            mvOsPrintf("\n");
+        }
+    }
+#endif /* MV_AES_DEBUG */
+  	switch (keyLen) 
+    {
+	    case 128: 
+            rounds = 10;
+            KC = 4; 
+            break;
+	    case 192: 
+            rounds = 12;
+            KC = 6; 
+            break;
+	    case 256: 
+            rounds = 14;
+            KC = 8; 
+            break;
+	    default : 
+            return (-1);
+	}
+
+    for(i=0; i<MAXBC; i++)
+    {
+        for(j=0; j<4; j++)
+        {
+            expandedKey[i*4+j] = W[rounds][j][i];
+        }
+    }
+    for(; i<KC; i++)
+    {
+        for(j=0; j<4; j++)
+        {
+            expandedKey[i*4+j] = W[rounds-1][j][i+MAXBC-KC];
+        }
+    }
+
+	
+	return 0;
+}
+
+int     aesBlockEncrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
+                        MV_U32 *plain, int numBlocks, MV_U32 *cipher)
+{
+	int     i, j, t;
+	MV_U8   block[4][MAXBC];
+    int     rounds;
+    char    *input, *outBuffer;
+
+    input = (char*)plain;
+    outBuffer = (char*)cipher;
+
+        /* check parameter consistency: */
+    if( (expandedKey == NULL) || ((keyLen != 128) && (keyLen != 192) && (keyLen != 256))) 
+    {
+        return AES_BAD_KEY_MAT;
+    }
+    if ((mode != MODE_ECB && mode != MODE_CBC))
+    {
+        return AES_BAD_CIPHER_STATE;
+    }
+
+	switch (keyLen) 
+    {
+	    case 128: rounds = 10; break;
+	    case 192: rounds = 12; break;
+	    case 256: rounds = 14; break;
+	    default : return (-3); /* this cannot happen */
+	}
+
+	
+	switch (mode) 
+    {
+	    case MODE_ECB: 
+		    for (i = 0; i < numBlocks; i++) 
+            {
+			    for (j = 0; j < 4; j++) 
+                {
+				    for(t = 0; t < 4; t++)
+				        /* parse input stream into rectangular array */
+					    block[t][j] = input[16*i+4*j+t] & 0xFF;
+			    }                           
+			    rijndaelEncrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
+			    for (j = 0; j < 4; j++) 
+                {           
+				    /* parse rectangular array into output ciphertext bytes */
+				    for(t = 0; t < 4; t++)
+                        outBuffer[16*i+4*j+t] = (MV_U8) block[t][j];
+
+			    }
+		    }
+		    break;
+		
+	    case MODE_CBC:
+		    for (j = 0; j < 4; j++) 
+            {
+			    for(t = 0; t < 4; t++)
+			    /* parse initial value into rectangular array */
+					block[t][j] = IV[t+4*j] & 0xFF;
+			}
+		    for (i = 0; i < numBlocks; i++) 
+            {
+			    for (j = 0; j < 4; j++) 
+                {
+				    for(t = 0; t < 4; t++)
+				        /* parse input stream into rectangular array and exor with 
+				        IV or the previous ciphertext */
+					    block[t][j] ^= input[16*i+4*j+t] & 0xFF;
+			    }
+			    rijndaelEncrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
+			    for (j = 0; j < 4; j++) 
+                {
+				    /* parse rectangular array into output ciphertext bytes */
+				    for(t = 0; t < 4; t++)
+					    outBuffer[16*i+4*j+t] = (MV_U8) block[t][j];
+			    }
+		    }
+		    break;
+	
+	    default: return AES_BAD_CIPHER_STATE;
+	}
+	
+	return 0;
+}
+
+int     aesBlockDecrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
+                            MV_U32 *srcData, int numBlocks, MV_U32 *dstData)
+{
+	int     i, j, t;
+	MV_U8   block[4][MAXBC];
+    MV_U8   iv[4][MAXBC];    
+    int     rounds;
+    char    *input, *outBuffer;
+
+    input = (char*)srcData;
+    outBuffer = (char*)dstData;
+
+    if (expandedKey == NULL) 
+    {
+		return AES_BAD_KEY_MAT;
+	}
+
+    /* check parameter consistency: */
+    if (keyLen != 128 && keyLen != 192 && keyLen != 256)
+    {
+        return AES_BAD_KEY_MAT;
+    }
+    if ((mode != MODE_ECB && mode != MODE_CBC)) 
+    {
+        return AES_BAD_CIPHER_STATE;
+    }
+
+	switch (keyLen) 
+    {
+	    case 128: rounds = 10; break;
+	    case 192: rounds = 12; break;
+	    case 256: rounds = 14; break;
+	    default : return (-3); /* this cannot happen */
+	}
+
+	
+	switch (mode) 
+    {
+	    case MODE_ECB: 
+		    for (i = 0; i < numBlocks; i++) 
+            {
+			    for (j = 0; j < 4; j++) 
+                {
+				    for(t = 0; t < 4; t++)
+                    {
+				        /* parse input stream into rectangular array */
+					    block[t][j] = input[16*i+4*j+t] & 0xFF;
+                    }
+			    }
+			    rijndaelDecrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
+			    for (j = 0; j < 4; j++) 
+                {
+				    /* parse rectangular array into output ciphertext bytes */
+				    for(t = 0; t < 4; t++)
+					    outBuffer[16*i+4*j+t] = (MV_U8) block[t][j];
+			    }
+		    }
+		    break;
+		
+	    case MODE_CBC:
+		    /* first block */
+		    for (j = 0; j < 4; j++) 
+            {
+			    for(t = 0; t < 4; t++)
+                {
+			        /* parse input stream into rectangular array */
+				    block[t][j] = input[4*j+t] & 0xFF;
+                    iv[t][j] = block[t][j];
+                }
+		    }
+		    rijndaelDecrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
+		
+		    for (j = 0; j < 4; j++) 
+            {
+			    /* exor the IV and parse rectangular array into output ciphertext bytes */
+			    for(t = 0; t < 4; t++)
+                {
+				    outBuffer[4*j+t] = (MV_U8) (block[t][j] ^ IV[t+4*j]);
+                    IV[t+4*j] = iv[t][j];
+                }
+		    }
+		
+		    /* next blocks */
+		    for (i = 1; i < numBlocks; i++) 
+            {
+			    for (j = 0; j < 4; j++) 
+                {
+				    for(t = 0; t < 4; t++)
+                    {
+				        /* parse input stream into rectangular array */
+                        iv[t][j] = input[16*i+4*j+t] & 0xFF;
+					    block[t][j] = iv[t][j];
+                    }
+			    }
+			    rijndaelDecrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
+			
+			    for (j = 0; j < 4; j++) 
+                {
+				    /* exor previous ciphertext block and parse rectangular array 
+				       into output ciphertext bytes */
+				    for(t = 0; t < 4; t++)
+                    {
+					    outBuffer[16*i+4*j+t] = (MV_U8) (block[t][j] ^ IV[t+4*j]);
+                        IV[t+4*j] = iv[t][j];
+                    }
+			    }
+		    }
+		    break;
+	
+	    default: return AES_BAD_CIPHER_STATE;
+	}
+	
+	return 0;
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesBoxes.dat b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesBoxes.dat
new file mode 100644
index 00000000..4011b187
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/AES/mvAesBoxes.dat
@@ -0,0 +1,123 @@
+static MV_U8 mask[256] = {
+0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+};
+
+static MV_U8 Logtable[256] = {
+  0,   0,  25,   1,  50,   2,  26, 198,  75, 199,  27, 104,  51, 238, 223,   3, 
+100,   4, 224,  14,  52, 141, 129, 239,  76, 113,   8, 200, 248, 105,  28, 193, 
+125, 194,  29, 181, 249, 185,  39, 106,  77, 228, 166, 114, 154, 201,   9, 120, 
+101,  47, 138,   5,  33,  15, 225,  36,  18, 240, 130,  69,  53, 147, 218, 142, 
+150, 143, 219, 189,  54, 208, 206, 148,  19,  92, 210, 241,  64,  70, 131,  56, 
+102, 221, 253,  48, 191,   6, 139,  98, 179,  37, 226, 152,  34, 136, 145,  16, 
+126, 110,  72, 195, 163, 182,  30,  66,  58, 107,  40,  84, 250, 133,  61, 186, 
+ 43, 121,  10,  21, 155, 159,  94, 202,  78, 212, 172, 229, 243, 115, 167,  87, 
+175,  88, 168,  80, 244, 234, 214, 116,  79, 174, 233, 213, 231, 230, 173, 232, 
+ 44, 215, 117, 122, 235,  22,  11, 245,  89, 203,  95, 176, 156, 169,  81, 160, 
+127,  12, 246, 111,  23, 196,  73, 236, 216,  67,  31,  45, 164, 118, 123, 183, 
+204, 187,  62,  90, 251,  96, 177, 134,  59,  82, 161, 108, 170,  85,  41, 157, 
+151, 178, 135, 144,  97, 190, 220, 252, 188, 149, 207, 205,  55,  63,  91, 209, 
+ 83,  57, 132,  60,  65, 162, 109,  71,  20,  42, 158,  93,  86, 242, 211, 171, 
+ 68,  17, 146, 217,  35,  32,  46, 137, 180, 124, 184,  38, 119, 153, 227, 165, 
+103,  74, 237, 222, 197,  49, 254,  24,  13,  99, 140, 128, 192, 247, 112,   7, 
+};
+
+static MV_U8 Alogtable[512] = {
+  1,   3,   5,  15,  17,  51,  85, 255,  26,  46, 114, 150, 161, 248,  19,  53, 
+ 95, 225,  56,  72, 216, 115, 149, 164, 247,   2,   6,  10,  30,  34, 102, 170, 
+229,  52,  92, 228,  55,  89, 235,  38, 106, 190, 217, 112, 144, 171, 230,  49, 
+ 83, 245,   4,  12,  20,  60,  68, 204,  79, 209, 104, 184, 211, 110, 178, 205, 
+ 76, 212, 103, 169, 224,  59,  77, 215,  98, 166, 241,   8,  24,  40, 120, 136, 
+131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206,  73, 219, 118, 154, 
+181, 196,  87, 249,  16,  48,  80, 240,  11,  29,  39, 105, 187, 214,  97, 163, 
+254,  25,  43, 125, 135, 146, 173, 236,  47, 113, 147, 174, 233,  32,  96, 160, 
+251,  22,  58,  78, 210, 109, 183, 194,  93, 231,  50,  86, 250,  21,  63,  65, 
+195,  94, 226,  61,  71, 201,  64, 192,  91, 237,  44, 116, 156, 191, 218, 117, 
+159, 186, 213, 100, 172, 239,  42, 126, 130, 157, 188, 223, 122, 142, 137, 128, 
+155, 182, 193,  88, 232,  35, 101, 175, 234,  37, 111, 177, 200,  67, 197,  84, 
+252,  31,  33,  99, 165, 244,   7,   9,  27,  45, 119, 153, 176, 203,  70, 202, 
+ 69, 207,  74, 222, 121, 139, 134, 145, 168, 227,  62,  66, 198,  81, 243,  14, 
+ 18,  54,  90, 238,  41, 123, 141, 140, 143, 138, 133, 148, 167, 242,  13,  23, 
+ 57,  75, 221, 124, 132, 151, 162, 253,  28,  36, 108, 180, 199,  82, 246,   1, 
+
+       3,   5,  15,  17,  51,  85, 255,  26,  46, 114, 150, 161, 248,  19,  53, 
+ 95, 225,  56,  72, 216, 115, 149, 164, 247,   2,   6,  10,  30,  34, 102, 170, 
+229,  52,  92, 228,  55,  89, 235,  38, 106, 190, 217, 112, 144, 171, 230,  49, 
+ 83, 245,   4,  12,  20,  60,  68, 204,  79, 209, 104, 184, 211, 110, 178, 205, 
+ 76, 212, 103, 169, 224,  59,  77, 215,  98, 166, 241,   8,  24,  40, 120, 136, 
+131, 158, 185, 208, 107, 189, 220, 127, 129, 152, 179, 206,  73, 219, 118, 154, 
+181, 196,  87, 249,  16,  48,  80, 240,  11,  29,  39, 105, 187, 214,  97, 163, 
+254,  25,  43, 125, 135, 146, 173, 236,  47, 113, 147, 174, 233,  32,  96, 160, 
+251,  22,  58,  78, 210, 109, 183, 194,  93, 231,  50,  86, 250,  21,  63,  65, 
+195,  94, 226,  61,  71, 201,  64, 192,  91, 237,  44, 116, 156, 191, 218, 117, 
+159, 186, 213, 100, 172, 239,  42, 126, 130, 157, 188, 223, 122, 142, 137, 128, 
+155, 182, 193,  88, 232,  35, 101, 175, 234,  37, 111, 177, 200,  67, 197,  84, 
+252,  31,  33,  99, 165, 244,   7,   9,  27,  45, 119, 153, 176, 203,  70, 202, 
+ 69, 207,  74, 222, 121, 139, 134, 145, 168, 227,  62,  66, 198,  81, 243,  14, 
+ 18,  54,  90, 238,  41, 123, 141, 140, 143, 138, 133, 148, 167, 242,  13,  23, 
+ 57,  75, 221, 124, 132, 151, 162, 253,  28,  36, 108, 180, 199,  82, 246,   1, 
+
+};
+
+static MV_U8 S[256] = {
+ 99, 124, 119, 123, 242, 107, 111, 197,  48,   1, 103,  43, 254, 215, 171, 118, 
+202, 130, 201, 125, 250,  89,  71, 240, 173, 212, 162, 175, 156, 164, 114, 192, 
+183, 253, 147,  38,  54,  63, 247, 204,  52, 165, 229, 241, 113, 216,  49,  21, 
+  4, 199,  35, 195,  24, 150,   5, 154,   7,  18, 128, 226, 235,  39, 178, 117, 
+  9, 131,  44,  26,  27, 110,  90, 160,  82,  59, 214, 179,  41, 227,  47, 132, 
+ 83, 209,   0, 237,  32, 252, 177,  91, 106, 203, 190,  57,  74,  76,  88, 207, 
+208, 239, 170, 251,  67,  77,  51, 133,  69, 249,   2, 127,  80,  60, 159, 168, 
+ 81, 163,  64, 143, 146, 157,  56, 245, 188, 182, 218,  33,  16, 255, 243, 210, 
+205,  12,  19, 236,  95, 151,  68,  23, 196, 167, 126,  61, 100,  93,  25, 115, 
+ 96, 129,  79, 220,  34,  42, 144, 136,  70, 238, 184,  20, 222,  94,  11, 219, 
+224,  50,  58,  10,  73,   6,  36,  92, 194, 211, 172,  98, 145, 149, 228, 121, 
+231, 200,  55, 109, 141, 213,  78, 169, 108,  86, 244, 234, 101, 122, 174,   8, 
+186, 120,  37,  46,  28, 166, 180, 198, 232, 221, 116,  31,  75, 189, 139, 138, 
+112,  62, 181, 102,  72,   3, 246,  14,  97,  53,  87, 185, 134, 193,  29, 158, 
+225, 248, 152,  17, 105, 217, 142, 148, 155,  30, 135, 233, 206,  85,  40, 223, 
+140, 161, 137,  13, 191, 230,  66, 104,  65, 153,  45,  15, 176,  84, 187,  22, 
+};
+
+static MV_U8 Si[256] = {
+ 82,   9, 106, 213,  48,  54, 165,  56, 191,  64, 163, 158, 129, 243, 215, 251, 
+124, 227,  57, 130, 155,  47, 255, 135,  52, 142,  67,  68, 196, 222, 233, 203, 
+ 84, 123, 148,  50, 166, 194,  35,  61, 238,  76, 149,  11,  66, 250, 195,  78, 
+  8,  46, 161, 102,  40, 217,  36, 178, 118,  91, 162,  73, 109, 139, 209,  37, 
+114, 248, 246, 100, 134, 104, 152,  22, 212, 164,  92, 204,  93, 101, 182, 146, 
+108, 112,  72,  80, 253, 237, 185, 218,  94,  21,  70,  87, 167, 141, 157, 132, 
+144, 216, 171,   0, 140, 188, 211,  10, 247, 228,  88,   5, 184, 179,  69,   6, 
+208,  44,  30, 143, 202,  63,  15,   2, 193, 175, 189,   3,   1,  19, 138, 107, 
+ 58, 145,  17,  65,  79, 103, 220, 234, 151, 242, 207, 206, 240, 180, 230, 115, 
+150, 172, 116,  34, 231, 173,  53, 133, 226, 249,  55, 232,  28, 117, 223, 110, 
+ 71, 241,  26, 113,  29,  41, 197, 137, 111, 183,  98,  14, 170,  24, 190,  27, 
+252,  86,  62,  75, 198, 210, 121,  32, 154, 219, 192, 254, 120, 205,  90, 244, 
+ 31, 221, 168,  51, 136,   7, 199,  49, 177,  18,  16,  89,  39, 128, 236,  95, 
+ 96,  81, 127, 169,  25, 181,  74,  13,  45, 229, 122, 159, 147, 201, 156, 239, 
+160, 224,  59,  77, 174,  42, 245, 176, 200, 235, 187,  60, 131,  83, 153,  97, 
+ 23,  43,   4, 126, 186, 119, 214,  38, 225, 105,  20,  99,  85,  33,  12, 125, 
+};
+
+/*
+static MV_U8 iG[4][4] = {
+{0x0e, 0x09, 0x0d, 0x0b}, 
+{0x0b, 0x0e, 0x09, 0x0d}, 
+{0x0d, 0x0b, 0x0e, 0x09}, 
+{0x09, 0x0d, 0x0b, 0x0e}, 
+};
+*/
+static MV_U32 rcon[30] = { 
+  0x01,0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, };
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.c
new file mode 100644
index 00000000..17ab086f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.c
@@ -0,0 +1,3126 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "cesa/mvCesa.h"
+
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#undef CESA_DEBUG
+
+
+/********** Global variables **********/
+
+/*  If request size is more than MV_CESA_MAX_BUF_SIZE the
+ *  request is processed as fragmented request.
+ */
+
+MV_CESA_STATS           cesaStats;
+
+MV_BUF_INFO             cesaSramSaBuf;
+short                   cesaLastSid = -1;
+MV_CESA_SA*             pCesaSAD = NULL;
+MV_U16                  cesaMaxSA = 0;
+
+MV_CESA_REQ*            pCesaReqFirst = NULL;
+MV_CESA_REQ*            pCesaReqLast = NULL;
+MV_CESA_REQ*            pCesaReqEmpty = NULL;
+MV_CESA_REQ*            pCesaReqProcess = NULL;
+int                     cesaQueueDepth = 0;
+int                     cesaReqResources = 0;
+
+MV_CESA_SRAM_MAP*       cesaSramVirtPtr = NULL;
+MV_U32                  cesaCryptEngBase = 0;
+void			*cesaOsHandle = NULL;
+#if (MV_CESA_VERSION >= 3)
+MV_U32			cesaChainLength = 0;
+int                     chainReqNum = 0;
+MV_U32			chainIndex = 0;
+MV_CESA_REQ*  		pNextActiveChain = 0;
+MV_CESA_REQ*		pEndCurrChain = 0;
+MV_BOOL			isFirstReq = MV_TRUE;
+#endif
+
+static INLINE MV_U8*  mvCesaSramAddrGet(void)
+{
+#ifdef MV_CESA_NO_SRAM
+    return (MV_U8*)cesaSramVirtPtr;
+#else
+    return (MV_U8*)cesaCryptEngBase;
+#endif /* MV_CESA_NO_SRAM */
+}
+
+static INLINE MV_ULONG    mvCesaSramVirtToPhys(void* pDev, MV_U8* pSramVirt)
+{
+#ifdef MV_CESA_NO_SRAM
+    return (MV_ULONG)mvOsIoVirtToPhy(NULL, pSramVirt);
+#else
+    return (MV_ULONG)pSramVirt;
+#endif /* MV_CESA_NO_SRAM */
+}
+
+/* Internal Function prototypes */
+
+static INLINE void      mvCesaSramDescrBuild(MV_U32 config, int frag,
+                                 int cryptoOffset, int ivOffset, int cryptoLength,
+                                 int macOffset, int digestOffset, int macLength, int macTotalLen,
+                                 MV_CESA_REQ *pCesaReq, MV_DMA_DESC* pDmaDesc);
+
+static INLINE void      mvCesaSramSaUpdate(short sid, MV_DMA_DESC *pDmaDesc);
+
+static INLINE int       mvCesaDmaCopyPrepare(MV_CESA_MBUF* pMbuf, MV_U8* pSramBuf, 
+                                MV_DMA_DESC* pDmaDesc, MV_BOOL isToMbuf,
+                                int offset, int copySize, MV_BOOL skipFlush);
+
+static void        mvCesaHmacIvGet(MV_CESA_MAC_MODE macMode, unsigned char key[], int keyLength,
+                                    unsigned char innerIV[], unsigned char outerIV[]);
+
+static MV_STATUS   mvCesaFragAuthComplete(MV_CESA_REQ* pReq, MV_CESA_SA* pSA,
+                                          int macDataSize);
+
+static MV_CESA_COMMAND*   mvCesaCtrModeInit(void);
+
+static MV_STATUS   mvCesaCtrModePrepare(MV_CESA_COMMAND *pCtrModeCmd, MV_CESA_COMMAND *pCmd);
+static MV_STATUS   mvCesaCtrModeComplete(MV_CESA_COMMAND *pOrgCmd, MV_CESA_COMMAND *pCmd);
+static void        mvCesaCtrModeFinish(MV_CESA_COMMAND *pCmd);
+
+static INLINE MV_STATUS mvCesaReqProcess(MV_CESA_REQ* pReq);
+static MV_STATUS   mvCesaFragReqProcess(MV_CESA_REQ* pReq, MV_U8 frag);
+
+static INLINE MV_STATUS mvCesaParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd, MV_U8* pFixOffset);
+static INLINE MV_STATUS mvCesaFragParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd);
+
+static INLINE void      mvCesaFragSizeFind(MV_CESA_SA* pSA, MV_CESA_REQ* pReq, 
+                               int cryptoOffset, int macOffset,
+                               int* pCopySize, int* pCryptoDataSize, int* pMacDataSize);
+static MV_STATUS        mvCesaMbufCacheUnmap(MV_CESA_MBUF* pMbuf, int offset, int size);
+
+
+/* Go to the next request in the request queue */
+static INLINE MV_CESA_REQ* MV_CESA_REQ_NEXT_PTR(MV_CESA_REQ* pReq)
+{
+    if(pReq == pCesaReqLast)
+        return pCesaReqFirst;
+
+    return pReq+1;
+}
+
+#if (MV_CESA_VERSION >= 3)
+/* Go to the previous request in the request queue */
+static INLINE MV_CESA_REQ* MV_CESA_REQ_PREV_PTR(MV_CESA_REQ* pReq)
+{
+    if(pReq == pCesaReqFirst)
+        return pCesaReqLast;
+
+    return pReq-1;
+}
+
+#endif
+
+
+static INLINE void mvCesaReqProcessStart(MV_CESA_REQ* pReq)
+{
+    int frag;
+
+#if (MV_CESA_VERSION >= 3)
+    pReq->state = MV_CESA_CHAIN;
+#else
+    pReq->state = MV_CESA_PROCESS;
+#endif
+    cesaStats.startCount++;
+
+    if(pReq->fragMode == MV_CESA_FRAG_NONE)
+    {
+        frag = 0;
+    }
+    else
+    {
+        frag = pReq->frags.nextFrag;
+        pReq->frags.nextFrag++;
+    }
+#if (MV_CESA_VERSION >= 2)
+    /* Enable TDMA engine */
+    MV_REG_WRITE(MV_CESA_TDMA_CURR_DESC_PTR_REG, 0);
+    MV_REG_WRITE(MV_CESA_TDMA_NEXT_DESC_PTR_REG, 
+            (MV_U32)mvCesaVirtToPhys(&pReq->dmaDescBuf, pReq->dma[frag].pDmaFirst));
+#else
+    /* Enable IDMA engine */
+    MV_REG_WRITE(IDMA_CURR_DESC_PTR_REG(0), 0);
+    MV_REG_WRITE(IDMA_NEXT_DESC_PTR_REG(0), 
+            (MV_U32)mvCesaVirtToPhys(&pReq->dmaDescBuf, pReq->dma[frag].pDmaFirst));
+#endif /* MV_CESA_VERSION >= 2 */
+
+#if defined(MV_BRIDGE_SYNC_REORDER) 
+    mvOsBridgeReorderWA();
+#endif
+
+    /* Start Accelerator */
+    MV_REG_WRITE(MV_CESA_CMD_REG, MV_CESA_CMD_CHAN_ENABLE_MASK);
+}
+
+
+/*******************************************************************************
+* mvCesaHalInit - Initialize the CESA driver
+*
+* DESCRIPTION:
+*       This function initialize the CESA driver.
+*       1) Session database
+*       2) Request queue
+*       4) DMA descriptor lists - one list per request. Each list
+*           has MV_CESA_MAX_DMA_DESC descriptors.
+*
+* INPUT:
+*       numOfSession    - maximum number of supported sessions
+*       queueDepth      - number of elements in the request queue.
+*       pSramBase       - virtual address of Sram
+*	osHandle	- A handle used by the OS to allocate memory for the 
+*			  module (Passed to the OS Services layer)
+*
+* RETURN:
+*       MV_OK           - Success
+*       MV_NO_RESOURCE  - Fail, can't allocate resources:
+*                         Session database, request queue,
+*                         DMA descriptors list, LRU cache database.
+*       MV_NOT_ALIGNED  - Sram base address is not 8 byte aligned.
+*
+*******************************************************************************/
+MV_STATUS mvCesaHalInit (int numOfSession, int queueDepth, char* pSramBase, MV_U32 cryptEngBase,
+			 void *osHandle)
+{
+    int     i, req;
+    MV_U32  descOffsetReg, configReg;
+    MV_CESA_SRAM_SA *pSramSA;
+
+
+    mvOsPrintf("mvCesaInit: sessions=%d, queue=%d, pSram=%p\n",
+                numOfSession, queueDepth, pSramBase);
+
+    cesaOsHandle = osHandle;
+    /* Create Session database */
+    pCesaSAD = mvOsMalloc(sizeof(MV_CESA_SA)*numOfSession);
+    if(pCesaSAD == NULL)
+    {
+        mvOsPrintf("mvCesaInit: Can't allocate %u bytes for %d SAs\n",
+                    sizeof(MV_CESA_SA)*numOfSession, numOfSession);
+        mvCesaFinish();
+        return MV_NO_RESOURCE;
+    }
+    memset(pCesaSAD, 0, sizeof(MV_CESA_SA)*numOfSession);
+    cesaMaxSA = numOfSession;
+
+    /* Allocate imag of sramSA in the DRAM */
+    cesaSramSaBuf.bufSize = sizeof(MV_CESA_SRAM_SA)*numOfSession + 
+                                    CPU_D_CACHE_LINE_SIZE;
+
+    cesaSramSaBuf.bufVirtPtr = mvOsIoCachedMalloc(osHandle,cesaSramSaBuf.bufSize,
+						  &cesaSramSaBuf.bufPhysAddr,
+						  &cesaSramSaBuf.memHandle);
+        
+    if(cesaSramSaBuf.bufVirtPtr == NULL)
+    {
+        mvOsPrintf("mvCesaInit: Can't allocate %d bytes for sramSA structures\n", 
+                    cesaSramSaBuf.bufSize);
+        mvCesaFinish();
+        return MV_NO_RESOURCE;
+    }
+    memset(cesaSramSaBuf.bufVirtPtr, 0, cesaSramSaBuf.bufSize); 
+    pSramSA = (MV_CESA_SRAM_SA*)MV_ALIGN_UP((MV_ULONG)cesaSramSaBuf.bufVirtPtr, 
+                                                       CPU_D_CACHE_LINE_SIZE);
+    for(i=0; i<numOfSession; i++)
+    {
+        pCesaSAD[i].pSramSA = &pSramSA[i];
+    }
+
+    /* Create request queue */
+    pCesaReqFirst = mvOsMalloc(sizeof(MV_CESA_REQ)*queueDepth);
+    if(pCesaReqFirst == NULL)
+    {
+        mvOsPrintf("mvCesaInit: Can't allocate %u bytes for %d requests\n",
+                    sizeof(MV_CESA_REQ)*queueDepth, queueDepth);
+        mvCesaFinish();
+        return MV_NO_RESOURCE;
+    }
+    memset(pCesaReqFirst, 0, sizeof(MV_CESA_REQ)*queueDepth);
+    pCesaReqEmpty = pCesaReqFirst;
+    pCesaReqLast = pCesaReqFirst + (queueDepth-1);
+    pCesaReqProcess = pCesaReqEmpty;
+    cesaQueueDepth = queueDepth;
+    cesaReqResources = queueDepth;
+#if (MV_CESA_VERSION >= 3)
+    cesaChainLength = MAX_CESA_CHAIN_LENGTH; 
+#endif
+    /* pSramBase must be 8 byte aligned */
+    if( MV_IS_NOT_ALIGN((MV_ULONG)pSramBase, 8) )
+    {
+        mvOsPrintf("mvCesaInit: pSramBase (%p) must be 8 byte aligned\n",
+                pSramBase);
+        mvCesaFinish();
+        return MV_NOT_ALIGNED;
+    }
+    cesaSramVirtPtr = (MV_CESA_SRAM_MAP*)pSramBase;
+    
+    cesaCryptEngBase = cryptEngBase;
+
+    /*memset(cesaSramVirtPtr, 0, sizeof(MV_CESA_SRAM_MAP));*/
+
+    /* Clear registers */
+    MV_REG_WRITE( MV_CESA_CFG_REG, 0);
+    MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
+    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, 0);
+
+    /* Initialize DMA descriptor lists for all requests in Request queue */
+    descOffsetReg = configReg = 0;
+    for(req=0; req<queueDepth; req++)
+    {
+        int             frag;
+        MV_CESA_REQ*    pReq;
+        MV_DMA_DESC*    pDmaDesc;
+
+        pReq = &pCesaReqFirst[req];
+
+        pReq->cesaDescBuf.bufSize = sizeof(MV_CESA_DESC)*MV_CESA_MAX_REQ_FRAGS + 
+                                        CPU_D_CACHE_LINE_SIZE;
+
+	pReq->cesaDescBuf.bufVirtPtr = 
+		mvOsIoCachedMalloc(osHandle,pReq->cesaDescBuf.bufSize,
+				   &pReq->cesaDescBuf.bufPhysAddr,
+				   &pReq->cesaDescBuf.memHandle);
+
+        if(pReq->cesaDescBuf.bufVirtPtr == NULL)
+        {
+            mvOsPrintf("mvCesaInit: req=%d, Can't allocate %d bytes for CESA descriptors\n", 
+                        req, pReq->cesaDescBuf.bufSize);
+                mvCesaFinish();
+                return MV_NO_RESOURCE;
+            }
+        memset(pReq->cesaDescBuf.bufVirtPtr, 0, pReq->cesaDescBuf.bufSize); 
+        pReq->pCesaDesc = (MV_CESA_DESC*)MV_ALIGN_UP((MV_ULONG)pReq->cesaDescBuf.bufVirtPtr, 
+                                                                CPU_D_CACHE_LINE_SIZE);
+
+        pReq->dmaDescBuf.bufSize = sizeof(MV_DMA_DESC)*MV_CESA_MAX_DMA_DESC*MV_CESA_MAX_REQ_FRAGS + 
+                                    CPU_D_CACHE_LINE_SIZE;
+
+        pReq->dmaDescBuf.bufVirtPtr = 
+		mvOsIoCachedMalloc(osHandle,pReq->dmaDescBuf.bufSize,
+				   &pReq->dmaDescBuf.bufPhysAddr,
+				   &pReq->dmaDescBuf.memHandle);
+
+        if(pReq->dmaDescBuf.bufVirtPtr == NULL)
+        {
+            mvOsPrintf("mvCesaInit: req=%d, Can't allocate %d bytes for DMA descriptor list\n", 
+                        req, pReq->dmaDescBuf.bufSize);
+            mvCesaFinish();
+            return MV_NO_RESOURCE;
+        }
+        memset(pReq->dmaDescBuf.bufVirtPtr, 0, pReq->dmaDescBuf.bufSize); 
+        pDmaDesc = (MV_DMA_DESC*)MV_ALIGN_UP((MV_ULONG)pReq->dmaDescBuf.bufVirtPtr, 
+                                                       CPU_D_CACHE_LINE_SIZE);
+
+        for(frag=0; frag<MV_CESA_MAX_REQ_FRAGS; frag++)
+        {
+            MV_CESA_DMA*    pDma = &pReq->dma[frag];
+
+            pDma->pDmaFirst = pDmaDesc;
+            pDma->pDmaLast = NULL;
+            
+            for(i=0; i<MV_CESA_MAX_DMA_DESC-1; i++)
+            {
+                /* link all DMA descriptors together */
+                pDma->pDmaFirst[i].phyNextDescPtr = 
+                        MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, &pDmaDesc[i+1]));
+            }
+            pDma->pDmaFirst[i].phyNextDescPtr = 0;
+            mvOsCacheFlush(NULL, &pDma->pDmaFirst[0], MV_CESA_MAX_DMA_DESC*sizeof(MV_DMA_DESC));        
+
+            pDmaDesc += MV_CESA_MAX_DMA_DESC;
+        }        
+    }
+    /*mvCesaCryptoIvSet(NULL, MV_CESA_MAX_IV_LENGTH);*/
+    descOffsetReg = (MV_U16)((MV_U8*)&cesaSramVirtPtr->desc - mvCesaSramAddrGet());
+    MV_REG_WRITE(MV_CESA_CHAN_DESC_OFFSET_REG, descOffsetReg);
+
+    configReg |= (MV_CESA_CFG_WAIT_DMA_MASK | MV_CESA_CFG_ACT_DMA_MASK);
+#if (MV_CESA_VERSION >= 3)
+    configReg |= MV_CESA_CFG_CHAIN_MODE_MASK;
+#endif
+
+#if (MV_CESA_VERSION >= 2)
+    /* Initialize TDMA engine */
+    MV_REG_WRITE(MV_CESA_TDMA_CTRL_REG, MV_CESA_TDMA_CTRL_VALUE);
+    MV_REG_WRITE(MV_CESA_TDMA_BYTE_COUNT_REG, 0);
+    MV_REG_WRITE(MV_CESA_TDMA_CURR_DESC_PTR_REG, 0);
+#else
+    /* Initialize IDMA #0 engine */
+    MV_REG_WRITE(IDMA_CTRL_LOW_REG(0), 0);
+    MV_REG_WRITE(IDMA_BYTE_COUNT_REG(0), 0);
+    MV_REG_WRITE(IDMA_CURR_DESC_PTR_REG(0), 0);
+    MV_REG_WRITE(IDMA_CTRL_HIGH_REG(0), ICCHR_ENDIAN_LITTLE
+#ifdef MV_CPU_LE
+      		| ICCHR_DESC_BYTE_SWAP_EN
+#endif
+		 );
+    /* Clear Cause Byte of IDMA channel to be used */
+    MV_REG_WRITE( IDMA_CAUSE_REG, ~ICICR_CAUSE_MASK_ALL(0));
+    MV_REG_WRITE(IDMA_CTRL_LOW_REG(0), MV_CESA_IDMA_CTRL_LOW_VALUE);
+#endif /* (MV_CESA_VERSION >= 2) */
+
+    /* Set CESA configuration registers */
+    MV_REG_WRITE( MV_CESA_CFG_REG, configReg);
+    mvCesaDebugStatsClear();
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaFinish - Shutdown the CESA driver
+*
+* DESCRIPTION:
+*       This function shutdown the CESA driver and free all allocted resources.
+*
+* INPUT:    None
+*
+* RETURN:
+*       MV_OK   - Success
+*       Other   - Fail
+*
+*******************************************************************************/
+MV_STATUS   mvCesaFinish (void)
+{
+    int             req;
+    MV_CESA_REQ*    pReq;
+
+    mvOsPrintf("mvCesaFinish: \n");
+
+    cesaSramVirtPtr = NULL;
+
+    /* Free all resources: DMA list, etc. */
+    for(req=0; req<cesaQueueDepth; req++)
+    {
+    	pReq = &pCesaReqFirst[req];
+        if(pReq->dmaDescBuf.bufVirtPtr != NULL)
+        {
+        	mvOsIoCachedFree(cesaOsHandle,pReq->dmaDescBuf.bufSize,
+				 pReq->dmaDescBuf.bufPhysAddr,
+				 pReq->dmaDescBuf.bufVirtPtr,
+				 pReq->dmaDescBuf.memHandle);
+        }
+        if(pReq->cesaDescBuf.bufVirtPtr != NULL)
+        {
+                mvOsIoCachedFree(cesaOsHandle,pReq->cesaDescBuf.bufSize,
+				 pReq->cesaDescBuf.bufPhysAddr,
+				 pReq->cesaDescBuf.bufVirtPtr,
+				 pReq->cesaDescBuf.memHandle);
+        }
+    }
+#if (MV_CESA_VERSION < 2)
+    MV_REG_WRITE(IDMA_CTRL_LOW_REG(0), 0);
+#endif /* (MV_CESA_VERSION < 2) */
+
+    /* Free request queue */
+    if(pCesaReqFirst != NULL)
+    {
+        mvOsFree(pCesaReqFirst);
+        pCesaReqFirst = pCesaReqLast = NULL;
+        pCesaReqEmpty = pCesaReqProcess = NULL;
+        cesaQueueDepth = cesaReqResources = 0;
+    }
+    /* Free SA database */
+    if(pCesaSAD != NULL)
+    {
+        mvOsFree(pCesaSAD);
+        pCesaSAD = NULL;
+        cesaMaxSA = 0;
+    }
+    MV_REG_WRITE( MV_CESA_CFG_REG, 0);
+    MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
+    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, 0);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaCryptoIvSet - Set IV value for Crypto algorithm working in CBC mode
+*
+* DESCRIPTION:
+*    This function set IV value using by Crypto algorithms in CBC mode.
+*   Each channel has its own IV value.
+*   This function gets IV value from the caller. If no IV value passed from
+*   the caller or only part of IV passed, the function will init the rest part
+*   of IV value (or the whole IV) by random value.
+*
+* INPUT:
+*       MV_U8*  pIV     - Pointer to IV value supplied by user. If pIV==NULL
+*                       the function will generate random IV value.
+*       int     ivSize  - size (in bytes) of IV provided by user. If ivSize is
+*                       smaller than maximum IV size, the function will complete
+*                       IV by random value.
+*
+* RETURN:
+*       MV_OK   - Success
+*       Other   - Fail
+*
+*******************************************************************************/
+MV_STATUS   mvCesaCryptoIvSet(MV_U8* pIV, int ivSize)
+{
+    MV_U8*  pSramIV;
+#if defined(MV646xx)
+    mvOsPrintf("mvCesaCryptoIvSet: ERR. shouldn't use this call on MV64660\n");
+#endif
+    pSramIV = cesaSramVirtPtr->cryptoIV;
+    if(ivSize > MV_CESA_MAX_IV_LENGTH)
+    {
+        mvOsPrintf("mvCesaCryptoIvSet: ivSize (%d) is too large\n", ivSize);
+        ivSize = MV_CESA_MAX_IV_LENGTH;
+    }
+    if(pIV != NULL)
+    {
+        memcpy(pSramIV, pIV, ivSize);
+        ivSize = MV_CESA_MAX_IV_LENGTH - ivSize;
+        pSramIV += ivSize;
+    }
+
+    while(ivSize > 0)
+    {
+        int size, mv_random = mvOsRand();
+
+        size = MV_MIN(ivSize, sizeof(mv_random));
+        memcpy(pSramIV, (void*)&mv_random, size);
+
+        pSramIV += size;
+        ivSize -= size;
+    }
+/*
+    mvOsCacheFlush(NULL, cesaSramVirtPtr->cryptoIV,
+                                MV_CESA_MAX_IV_LENGTH);
+    mvOsCacheInvalidate(NULL, cesaSramVirtPtr->cryptoIV,
+                              MV_CESA_MAX_IV_LENGTH);
+*/
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaSessionOpen - Open new uni-directional crypto session
+*
+* DESCRIPTION:
+*       This function open new session.
+*
+* INPUT:
+*       MV_CESA_OPEN_SESSION *pSession - pointer to new session input parameters
+*
+* OUTPUT:
+*       short           *pSid  - session ID, should be used for all future
+*                                   requests over this session.
+*
+* RETURN:
+*       MV_OK           - Session opend successfully.
+*       MV_FULL         - All sessions are in use, no free place in
+*                       SA database.
+*       MV_BAD_PARAM    - One of session input parameters is invalid.
+*
+*******************************************************************************/
+MV_STATUS   mvCesaSessionOpen(MV_CESA_OPEN_SESSION *pSession, short* pSid)
+{
+    short       sid;
+    MV_U32      config = 0;
+    int         digestSize;
+
+    cesaStats.openedCount++;
+    
+    /* Find free entry in SAD */
+    for(sid=0; sid<cesaMaxSA; sid++)
+    {
+        if(pCesaSAD[sid].valid == 0)
+        {
+            break;
+        }
+    }
+    if(sid == cesaMaxSA)
+    {
+        mvOsPrintf("mvCesaSessionOpen: SA Database is FULL\n");
+        return MV_FULL;
+    }
+
+    /* Check Input parameters for Open session */
+    if (pSession->operation >= MV_CESA_MAX_OPERATION)
+    {
+        mvOsPrintf("mvCesaSessionOpen: Unexpected operation %d\n",
+                    pSession->operation);
+        return MV_BAD_PARAM;
+    }
+    config |= (pSession->operation << MV_CESA_OPERATION_OFFSET);
+
+    if( (pSession->direction != MV_CESA_DIR_ENCODE) &&
+        (pSession->direction != MV_CESA_DIR_DECODE) )
+    {
+        mvOsPrintf("mvCesaSessionOpen: Unexpected direction %d\n",
+                    pSession->direction);
+        return MV_BAD_PARAM;
+    }
+    config |= (pSession->direction << MV_CESA_DIRECTION_BIT);
+    /* Clear SA entry */
+    /* memset(&pCesaSAD[sid], 0, sizeof(pCesaSAD[sid])); */
+
+    /* Check AUTH parameters and update SA entry */
+    if(pSession->operation != MV_CESA_CRYPTO_ONLY)
+    {
+        /* For HMAC (MD5 and SHA1) - Maximum Key size is 64 bytes */
+        if( (pSession->macMode == MV_CESA_MAC_HMAC_MD5) ||
+            (pSession->macMode == MV_CESA_MAC_HMAC_SHA1) )
+        {
+            if(pSession->macKeyLength > MV_CESA_MAX_MAC_KEY_LENGTH)
+            {
+                mvOsPrintf("mvCesaSessionOpen: macKeyLength %d is too large\n",
+                            pSession->macKeyLength);
+                return MV_BAD_PARAM;
+            }
+            mvCesaHmacIvGet(pSession->macMode, pSession->macKey, pSession->macKeyLength,
+                            pCesaSAD[sid].pSramSA->macInnerIV, 
+                            pCesaSAD[sid].pSramSA->macOuterIV);
+            pCesaSAD[sid].macKeyLength = pSession->macKeyLength;
+        }
+        switch(pSession->macMode)
+        {
+            case MV_CESA_MAC_MD5:
+            case MV_CESA_MAC_HMAC_MD5:
+                digestSize = MV_CESA_MD5_DIGEST_SIZE;
+                break;
+
+            case MV_CESA_MAC_SHA1:
+            case MV_CESA_MAC_HMAC_SHA1:
+                digestSize = MV_CESA_SHA1_DIGEST_SIZE;
+                break;
+
+            default:
+                mvOsPrintf("mvCesaSessionOpen: Unexpected macMode %d\n",
+                            pSession->macMode);
+                return MV_BAD_PARAM;
+        }
+        config |= (pSession->macMode << MV_CESA_MAC_MODE_OFFSET);
+
+        /* Supported digest sizes: MD5 - 16 bytes (128 bits), */
+        /* SHA1 - 20 bytes (160 bits) or 12 bytes (96 bits) for both */
+        if( (pSession->digestSize != digestSize) && (pSession->digestSize != 12))
+        {
+            mvOsPrintf("mvCesaSessionOpen: Unexpected digest size %d\n",
+                        pSession->digestSize);
+            mvOsPrintf("\t Valid values [bytes]: MD5-16, SHA1-20, Both-12\n");
+            return MV_BAD_PARAM;
+        }
+        pCesaSAD[sid].digestSize = pSession->digestSize;
+
+        if(pCesaSAD[sid].digestSize == 12)
+        {
+            /* Set MV_CESA_MAC_DIGEST_SIZE_BIT if digest size is 96 bits */
+            config |= (MV_CESA_MAC_DIGEST_96B << MV_CESA_MAC_DIGEST_SIZE_BIT);
+        }
+    }
+
+    /* Check CRYPTO parameters and update SA entry */
+    if(pSession->operation != MV_CESA_MAC_ONLY)
+    {
+        switch(pSession->cryptoAlgorithm)
+        {
+            case MV_CESA_CRYPTO_DES:
+                pCesaSAD[sid].cryptoKeyLength = MV_CESA_DES_KEY_LENGTH;
+                pCesaSAD[sid].cryptoBlockSize = MV_CESA_DES_BLOCK_SIZE;
+                break;
+
+            case MV_CESA_CRYPTO_3DES:
+                pCesaSAD[sid].cryptoKeyLength = MV_CESA_3DES_KEY_LENGTH;
+                pCesaSAD[sid].cryptoBlockSize = MV_CESA_DES_BLOCK_SIZE;
+                /* Only EDE mode is supported */
+                config |= (MV_CESA_CRYPTO_3DES_EDE <<
+                            MV_CESA_CRYPTO_3DES_MODE_BIT);
+                break;
+
+            case MV_CESA_CRYPTO_AES:
+                switch(pSession->cryptoKeyLength)
+                {
+                    case 16:
+                        pCesaSAD[sid].cryptoKeyLength = MV_CESA_AES_128_KEY_LENGTH;
+                        config |= (MV_CESA_CRYPTO_AES_KEY_128 <<
+                                       MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET);
+                        break;
+
+                    case 24:
+                        pCesaSAD[sid].cryptoKeyLength = MV_CESA_AES_192_KEY_LENGTH;
+                        config |= (MV_CESA_CRYPTO_AES_KEY_192 <<
+                                       MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET);
+                        break;
+
+                    case 32:
+                    default:
+                        pCesaSAD[sid].cryptoKeyLength = MV_CESA_AES_256_KEY_LENGTH;
+                        config |= (MV_CESA_CRYPTO_AES_KEY_256 <<
+                                       MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET);
+                        break;
+                }
+                pCesaSAD[sid].cryptoBlockSize = MV_CESA_AES_BLOCK_SIZE;
+                break;
+
+            default:
+                mvOsPrintf("mvCesaSessionOpen: Unexpected cryptoAlgorithm %d\n",
+                            pSession->cryptoAlgorithm);
+                return MV_BAD_PARAM;
+        }
+        config |= (pSession->cryptoAlgorithm << MV_CESA_CRYPTO_ALG_OFFSET);
+
+        if(pSession->cryptoKeyLength != pCesaSAD[sid].cryptoKeyLength)
+        {
+            mvOsPrintf("cesaSessionOpen: Wrong CryptoKeySize %d != %d\n",
+                        pSession->cryptoKeyLength, pCesaSAD[sid].cryptoKeyLength);
+            return MV_BAD_PARAM;
+        }
+        
+        /* Copy Crypto key */
+        if( (pSession->cryptoAlgorithm == MV_CESA_CRYPTO_AES) &&
+            (pSession->direction == MV_CESA_DIR_DECODE))
+        {
+            /* Crypto Key for AES decode is computed from original key material */
+            /* and depend on cryptoKeyLength (128/192/256 bits) */
+            aesMakeKey(pCesaSAD[sid].pSramSA->cryptoKey, pSession->cryptoKey, 
+                        pSession->cryptoKeyLength*8, MV_CESA_AES_BLOCK_SIZE*8);
+        }
+        else
+        {
+                /*panic("mvCesaSessionOpen2");*/
+                memcpy(pCesaSAD[sid].pSramSA->cryptoKey, pSession->cryptoKey, 
+                    pCesaSAD[sid].cryptoKeyLength);
+            
+        }
+        
+        switch(pSession->cryptoMode)
+        {
+            case MV_CESA_CRYPTO_ECB:
+                pCesaSAD[sid].cryptoIvSize = 0;
+                break;
+
+            case MV_CESA_CRYPTO_CBC:
+                pCesaSAD[sid].cryptoIvSize = pCesaSAD[sid].cryptoBlockSize;
+                break;
+
+            case MV_CESA_CRYPTO_CTR:
+                /* Supported only for AES algorithm */
+                if(pSession->cryptoAlgorithm != MV_CESA_CRYPTO_AES)
+                {
+                    mvOsPrintf("mvCesaSessionOpen: CRYPTO CTR mode supported for AES only\n");
+                    return MV_BAD_PARAM;
+                }
+                pCesaSAD[sid].cryptoIvSize = 0;
+                pCesaSAD[sid].ctrMode = 1;
+                /* Replace to ECB mode for HW */
+                pSession->cryptoMode = MV_CESA_CRYPTO_ECB;
+                break;
+
+            default:
+                mvOsPrintf("mvCesaSessionOpen: Unexpected cryptoMode %d\n",
+                            pSession->cryptoMode);
+                return MV_BAD_PARAM;
+        }
+        
+        config |= (pSession->cryptoMode << MV_CESA_CRYPTO_MODE_BIT);
+    }
+    pCesaSAD[sid].config = config;
+    
+    mvOsCacheFlush(NULL, pCesaSAD[sid].pSramSA, sizeof(MV_CESA_SRAM_SA));
+    if(pSid != NULL)
+        *pSid = sid;
+
+    pCesaSAD[sid].valid = 1;
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaSessionClose - Close active crypto session
+*
+* DESCRIPTION:
+*       This function closes existing session
+*
+* INPUT:
+*       short sid   - Unique identifier of the session to be closed
+*
+* RETURN:
+*       MV_OK        - Session closed successfully.
+*       MV_BAD_PARAM - Session identifier is out of valid range.
+*       MV_NOT_FOUND - There is no active session with such ID.
+*
+*******************************************************************************/
+MV_STATUS mvCesaSessionClose(short sid)
+{
+    cesaStats.closedCount++;
+
+    if(sid >= cesaMaxSA)
+    {
+        mvOsPrintf("CESA Error: sid (%d) is too big\n", sid);
+        return MV_BAD_PARAM;
+    }
+    if(pCesaSAD[sid].valid == 0)
+    {
+        mvOsPrintf("CESA Warning: Session (sid=%d) is invalid\n", sid);
+        return MV_NOT_FOUND;
+    }
+    if(cesaLastSid == sid)
+        cesaLastSid = -1;
+
+    pCesaSAD[sid].valid = 0;
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaAction - Perform crypto operation
+*
+* DESCRIPTION:
+*       This function set new CESA request FIFO queue for further HW processing.
+*       The function checks request parameters before set new request to the queue.
+*       If one of the CESA channels is ready for processing the request will be
+*       passed to HW. When request processing is finished the CESA interrupt will
+*       be generated by HW. The caller should call mvCesaReadyGet() function to
+*       complete request processing and get result.
+*
+* INPUT:
+*       MV_CESA_COMMAND *pCmd   - pointer to new CESA request.
+*                               It includes pointers to Source and Destination
+*                               buffers, session identifier get from
+*                               mvCesaSessionOpen() function, pointer to caller
+*                               private data and all needed crypto parameters.
+*
+* RETURN:
+*       MV_OK             - request successfully added to request queue
+*                         and will be processed.
+*       MV_NO_MORE        - request successfully added to request queue and will
+*                         be processed, but request queue became Full and next
+*                         request will not be accepted.
+*       MV_NO_RESOURCE    - request queue is FULL and the request can not
+*                         be processed.
+*       MV_OUT_OF_CPU_MEM - memory allocation needed for request processing is
+*                         failed. Request can not be processed.
+*       MV_NOT_ALLOWED    - This mixed request (CRYPTO+MAC) can not be processed
+*                         as one request and should be splitted for two requests:
+*                         CRYPTO_ONLY and MAC_ONLY.
+*       MV_BAD_PARAM      - One of the request parameters is out of valid range.
+*                         The request can not be processed.
+*
+*******************************************************************************/
+MV_STATUS   mvCesaAction (MV_CESA_COMMAND *pCmd)
+{
+    MV_STATUS       status;
+    MV_CESA_REQ*    pReq = pCesaReqEmpty;
+    int             sid = pCmd->sessionId;
+    MV_CESA_SA*     pSA = &pCesaSAD[sid];
+#if (MV_CESA_VERSION >= 3)
+     MV_CESA_REQ*   pFromReq;
+     MV_CESA_REQ*   pToReq;
+#endif
+    cesaStats.reqCount++;
+
+    /* Check that the request queue is not FULL */
+    if(cesaReqResources == 0)
+        return MV_NO_RESOURCE;
+
+    if( (sid >= cesaMaxSA) || (!pSA->valid) )
+    {
+        mvOsPrintf("CESA Action Error: Session sid=%d is INVALID\n", sid);
+        return MV_BAD_PARAM;
+    }
+    pSA->count++;
+
+    if(pSA->ctrMode)
+    {
+        /* AES in CTR mode can't be mixed with Authentication */
+        if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+            (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
+        {
+            mvOsPrintf("mvCesaAction : CRYPTO CTR mode can't be mixed with AUTH\n");
+            return MV_NOT_ALLOWED;
+        }
+        /* All other request parameters should not be checked because key stream */
+        /* (not user data) processed by AES HW engine */
+        pReq->pOrgCmd = pCmd;
+        /* Allocate temporary pCmd structure for Key stream */
+        pCmd = mvCesaCtrModeInit();
+        if(pCmd == NULL)
+            return MV_OUT_OF_CPU_MEM;
+
+        /* Prepare Key stream */
+        mvCesaCtrModePrepare(pCmd, pReq->pOrgCmd);
+        pReq->fixOffset = 0;
+    }
+    else
+    {
+        /* Check request parameters and calculae fixOffset */
+        status = mvCesaParamCheck(pSA, pCmd, &pReq->fixOffset);
+        if(status != MV_OK)
+        {
+            return status;
+        }
+    }
+    pReq->pCmd = pCmd;
+
+    /* Check if the packet need fragmentation */
+    if(pCmd->pSrc->mbufSize <= sizeof(cesaSramVirtPtr->buf) )
+    {
+        /* request size is smaller than single buffer size */
+        pReq->fragMode = MV_CESA_FRAG_NONE;
+
+        /* Prepare NOT fragmented packets */
+        status = mvCesaReqProcess(pReq);
+        if(status != MV_OK)
+        {
+            mvOsPrintf("CesaReady: ReqProcess error: pReq=%p, status=0x%x\n",
+                        pReq, status);
+        }
+#if (MV_CESA_VERSION >= 3)
+	pReq->frags.numFrag = 1;
+#endif
+    }
+    else
+    {
+        MV_U8     frag = 0;
+
+        /* request size is larger than buffer size - needs fragmentation */
+
+        /* Check restrictions for processing fragmented packets */
+        status = mvCesaFragParamCheck(pSA, pCmd);
+        if(status != MV_OK)
+            return status;
+
+        pReq->fragMode = MV_CESA_FRAG_FIRST;
+        pReq->frags.nextFrag = 0;
+
+        /* Prepare Process Fragmented packets */
+        while(pReq->fragMode != MV_CESA_FRAG_LAST)
+        {
+            if(frag >= MV_CESA_MAX_REQ_FRAGS)
+            {
+                mvOsPrintf("mvCesaAction Error: Too large request frag=%d\n", frag);
+                return MV_OUT_OF_CPU_MEM;
+            }
+            status = mvCesaFragReqProcess(pReq, frag);
+            if(status == MV_OK) {
+#if (MV_CESA_VERSION >= 3)
+		if(frag) {
+			pReq->dma[frag-1].pDmaLast->phyNextDescPtr = 
+				MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, pReq->dma[frag].pDmaFirst));
+			mvOsCacheFlush(NULL, pReq->dma[frag-1].pDmaLast, sizeof(MV_DMA_DESC));
+		}
+#endif
+                frag++;
+        }
+        }
+        pReq->frags.numFrag = frag;
+#if (MV_CESA_VERSION >= 3)
+	if(chainReqNum) {	
+		chainReqNum += pReq->frags.numFrag;
+		if(chainReqNum >= MAX_CESA_CHAIN_LENGTH)
+			chainReqNum = MAX_CESA_CHAIN_LENGTH;
+	}		
+#endif
+    }
+
+    pReq->state = MV_CESA_PENDING;
+
+    pCesaReqEmpty = MV_CESA_REQ_NEXT_PTR(pReq);
+    cesaReqResources -= 1;
+
+/* #ifdef CESA_DEBUG */
+    if( (cesaQueueDepth - cesaReqResources) > cesaStats.maxReqCount)
+        cesaStats.maxReqCount = (cesaQueueDepth - cesaReqResources);
+/* #endif CESA_DEBUG */
+
+    cesaLastSid = sid;
+
+#if (MV_CESA_VERSION >= 3)
+    /* Are we within chain bounderies and follows the first request ? */
+    if((chainReqNum > 0) && (chainReqNum < MAX_CESA_CHAIN_LENGTH)) {
+	if(chainIndex) {
+		pFromReq = MV_CESA_REQ_PREV_PTR(pReq); 
+		pToReq = pReq;
+		pReq->state = MV_CESA_CHAIN;
+		/* assume concatenating is possible */
+		pFromReq->dma[pFromReq->frags.numFrag-1].pDmaLast->phyNextDescPtr = 
+			MV_32BIT_LE(mvCesaVirtToPhys(&pToReq->dmaDescBuf, pToReq->dma[0].pDmaFirst));
+		mvOsCacheFlush(NULL, pFromReq->dma[pFromReq->frags.numFrag-1].pDmaLast, sizeof(MV_DMA_DESC));
+			
+		/* align active & next pointers */
+		if(pNextActiveChain->state != MV_CESA_PENDING)
+			pEndCurrChain = pNextActiveChain = MV_CESA_REQ_NEXT_PTR(pReq);
+	}
+	else { /* we have only one chain, start new one */
+		chainReqNum = 0;
+		chainIndex++;
+		/* align active & next pointers  */
+		if(pNextActiveChain->state != MV_CESA_PENDING)
+			pEndCurrChain = pNextActiveChain = pReq;
+	}
+    }
+    else {
+		/* In case we concatenate full chain */
+		if(chainReqNum == MAX_CESA_CHAIN_LENGTH) {
+			chainIndex++;
+			if(pNextActiveChain->state != MV_CESA_PENDING)
+				pEndCurrChain = pNextActiveChain = pReq;
+			chainReqNum = 0;
+		}
+		
+		pReq = pCesaReqProcess;
+		if(pReq->state == MV_CESA_PENDING) {
+			pNextActiveChain = pReq;
+			pEndCurrChain = MV_CESA_REQ_NEXT_PTR(pReq);
+        		/* Start Process new request */
+ 	      		mvCesaReqProcessStart(pReq);
+    		}
+    }
+
+    chainReqNum++;
+
+    if((chainIndex < MAX_CESA_CHAIN_LENGTH) && (chainReqNum > cesaStats.maxChainUsage))
+	cesaStats.maxChainUsage = chainReqNum;
+
+#else
+
+    /* Check status of CESA channels and process requests if possible */
+    pReq = pCesaReqProcess;
+    if(pReq->state == MV_CESA_PENDING)
+    {
+        /* Start Process new request */
+        mvCesaReqProcessStart(pReq);
+    }
+#endif
+    /* If request queue became FULL - return MV_NO_MORE */
+    if(cesaReqResources == 0)
+        return MV_NO_MORE;
+
+    return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvCesaReadyGet - Get crypto request that processing is finished
+*
+* DESCRIPTION:
+*       This function complete request processing and return ready request to
+*       caller. To don't miss interrupts the caller must call this function
+*       while MV_OK or MV_TERMINATE values returned.
+*
+* INPUT:
+*   MV_U32          chanMap  - map of CESA channels finished thier job
+*                              accordingly with CESA Cause register.
+*   MV_CESA_RESULT* pResult  - pointer to structure contains information
+*                            about ready request. It includes pointer to
+*                            user private structure "pReqPrv", session identifier
+*                            for this request "sessionId" and return code.
+*                            Return code set to MV_FAIL if calculated digest value
+*                            on decode direction is different than digest value
+*                            in the packet.
+*
+* RETURN:
+*       MV_OK           - Success, ready request is returned.
+*       MV_NOT_READY    - Next request is not ready yet. New interrupt will
+*                       be generated for futher request processing.
+*       MV_EMPTY        - There is no more request for processing.
+*       MV_BUSY         - Fragmented request is not ready yet.
+*       MV_TERMINATE    - Call this function once more to complete processing
+*                       of fragmented request.
+*
+*******************************************************************************/
+MV_STATUS mvCesaReadyGet(MV_CESA_RESULT* pResult)
+{
+    MV_STATUS       status, readyStatus = MV_NOT_READY;
+    MV_U32          statusReg;
+    MV_CESA_REQ*    pReq;
+    MV_CESA_SA*     pSA;
+
+#if (MV_CESA_VERSION >= 3)
+    if(isFirstReq == MV_TRUE) {
+	if(chainIndex == 0)
+		chainReqNum = 0;
+	
+	isFirstReq = MV_FALSE;
+
+	if(pNextActiveChain->state == MV_CESA_PENDING) {
+		/* Start request Process */
+		mvCesaReqProcessStart(pNextActiveChain);
+		pEndCurrChain = pNextActiveChain;
+		if(chainIndex > 0)
+			chainIndex--;
+		/* Update pNextActiveChain to next chain head */
+		   while(pNextActiveChain->state == MV_CESA_CHAIN)
+			pNextActiveChain = MV_CESA_REQ_NEXT_PTR(pNextActiveChain);
+    	}    
+    }
+    
+    /* Check if there are more processed requests - can we remove pEndCurrChain ??? */
+    if(pCesaReqProcess == pEndCurrChain) {
+		isFirstReq = MV_TRUE;
+		pEndCurrChain = pNextActiveChain;
+#else
+    if(pCesaReqProcess->state != MV_CESA_PROCESS) {
+#endif
+        return MV_EMPTY;
+    }
+
+#ifdef CESA_DEBUG
+    statusReg = MV_REG_READ(MV_CESA_STATUS_REG);
+    if( statusReg & MV_CESA_STATUS_ACTIVE_MASK )
+    {
+        mvOsPrintf("mvCesaReadyGet: Not Ready, Status = 0x%x\n", statusReg);
+        cesaStats.notReadyCount++;
+        return MV_NOT_READY;
+    }
+#endif /* CESA_DEBUG */
+
+    cesaStats.readyCount++;
+
+    pReq = pCesaReqProcess;
+    pSA = &pCesaSAD[pReq->pCmd->sessionId];
+
+    pResult->retCode = MV_OK;
+    if(pReq->fragMode != MV_CESA_FRAG_NONE)
+    {
+        MV_U8*          pNewDigest;
+      int             frag;
+#if (MV_CESA_VERSION >= 3)
+      pReq->frags.nextFrag = 1;
+      while(pReq->frags.nextFrag <= pReq->frags.numFrag) {
+#endif
+	frag = (pReq->frags.nextFrag - 1);
+
+        /* Restore DMA descriptor list */
+        pReq->dma[frag].pDmaLast->phyNextDescPtr = 
+                MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, &pReq->dma[frag].pDmaLast[1]));
+        pReq->dma[frag].pDmaLast = NULL;
+
+        /* Special processing for finished fragmented request */
+        if(pReq->frags.nextFrag >= pReq->frags.numFrag)
+        {
+            mvCesaMbufCacheUnmap(pReq->pCmd->pDst, 0, pReq->pCmd->pDst->mbufSize);
+
+            /* Fragmented packet is ready */
+            if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
+            {
+                int  macDataSize = pReq->pCmd->macLength - pReq->frags.macSize;
+
+                if(macDataSize != 0)
+                {
+                    /* Calculate all other blocks by SW */
+                    mvCesaFragAuthComplete(pReq, pSA, macDataSize);
+                }
+
+                /* Copy new digest from SRAM to the Destination buffer */
+                pNewDigest = cesaSramVirtPtr->buf + pReq->frags.newDigestOffset;
+                status = mvCesaCopyToMbuf(pNewDigest, pReq->pCmd->pDst,
+                                   pReq->pCmd->digestOffset, pSA->digestSize);
+
+                /* For decryption: Compare new digest value with original one */
+                if((pSA->config & MV_CESA_DIRECTION_MASK) ==
+                            (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT))
+                {
+                    if( memcmp(pNewDigest, pReq->frags.orgDigest, pSA->digestSize) != 0)
+                    {
+/*
+                        mvOsPrintf("Digest error: chan=%d, newDigest=%p, orgDigest=%p, status = 0x%x\n",
+                            chan, pNewDigest, pReq->frags.orgDigest, MV_REG_READ(MV_CESA_STATUS_REG));
+*/
+                        /* Signiture verification is failed */
+                        pResult->retCode = MV_FAIL;
+                    }
+                }
+            }
+            readyStatus = MV_OK;
+        }
+#if (MV_CESA_VERSION >= 3)
+	pReq->frags.nextFrag++;
+      }
+#endif
+    }
+    else
+    {
+        mvCesaMbufCacheUnmap(pReq->pCmd->pDst, 0, pReq->pCmd->pDst->mbufSize);
+
+        /* Restore DMA descriptor list */
+        pReq->dma[0].pDmaLast->phyNextDescPtr = 
+                MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, &pReq->dma[0].pDmaLast[1]));
+        pReq->dma[0].pDmaLast = NULL;
+        if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) ) &&
+            ((pSA->config & MV_CESA_DIRECTION_MASK) ==
+                        (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT)) )
+        {
+            /* For AUTH on decode : Check Digest result in Status register */
+            statusReg = MV_REG_READ(MV_CESA_STATUS_REG);
+            if(statusReg & MV_CESA_STATUS_DIGEST_ERR_MASK)
+            {
+/*
+                mvOsPrintf("Digest error: chan=%d, status = 0x%x\n",
+                        chan, statusReg);
+*/
+                /* Signiture verification is failed */
+                pResult->retCode = MV_FAIL;
+            }
+        }
+        readyStatus = MV_OK;
+    }
+
+    if(readyStatus == MV_OK)
+    {
+        /* If Request is ready - Prepare pResult structure */
+        pResult->pReqPrv = pReq->pCmd->pReqPrv;
+        pResult->sessionId = pReq->pCmd->sessionId;
+
+        pReq->state = MV_CESA_IDLE;
+        pCesaReqProcess = MV_CESA_REQ_NEXT_PTR(pReq);
+        cesaReqResources++;
+
+        if(pSA->ctrMode)
+        {
+            /* For AES CTR mode - complete processing and free allocated resources */
+            mvCesaCtrModeComplete(pReq->pOrgCmd, pReq->pCmd);
+            mvCesaCtrModeFinish(pReq->pCmd);
+            pReq->pOrgCmd = NULL;
+        }
+    }
+
+#if (MV_CESA_VERSION < 3)
+    if(pCesaReqProcess->state == MV_CESA_PROCESS)
+    {
+        /* Start request Process */
+        mvCesaReqProcessStart(pCesaReqProcess);
+        if(readyStatus == MV_NOT_READY)
+            readyStatus = MV_BUSY;
+    }
+    else if(pCesaReqProcess != pCesaReqEmpty)
+    {
+        /* Start process new request from the queue */
+        mvCesaReqProcessStart(pCesaReqProcess);
+    }
+#endif 
+    return readyStatus;
+}
+
+/***************** Functions to work with CESA_MBUF structure ******************/
+
+/*******************************************************************************
+* mvCesaMbufOffset - Locate offset in the Mbuf structure
+*
+* DESCRIPTION:
+*       This function locates offset inside Multi-Bufeer structure.
+*       It get fragment number and place in the fragment where the offset
+*       is located.
+*
+*
+* INPUT:
+*   MV_CESA_MBUF* pMbuf  - Pointer to multi-buffer structure
+*   int           offset - Offset from the beginning of the data presented by
+*                        the Mbuf structure.
+*
+* OUTPUT:
+*   int*        pBufOffset  - Offset from the beginning of the fragment where
+*                           the offset is located.
+*
+* RETURN:
+*       int - Number of fragment, where the offset is located\
+*
+*******************************************************************************/
+int     mvCesaMbufOffset(MV_CESA_MBUF* pMbuf, int offset, int* pBufOffset)
+{
+    int frag = 0;
+
+    while(offset > 0)
+    {
+        if(frag >= pMbuf->numFrags)
+        {
+            mvOsPrintf("mvCesaMbufOffset: Error: frag (%d) > numFrags (%d)\n",
+                    frag, pMbuf->numFrags);
+            return MV_INVALID;
+        }
+        if(offset < pMbuf->pFrags[frag].bufSize)
+        {
+            break;
+        }
+        offset -= pMbuf->pFrags[frag].bufSize;
+        frag++;
+    }
+    if(pBufOffset != NULL)
+        *pBufOffset = offset;
+
+    return frag;
+}
+
+/*******************************************************************************
+* mvCesaCopyFromMbuf - Copy data from the Mbuf structure to continuous buffer
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*   MV_U8*          pDstBuf  - Pointer to continuous buffer, where data is
+*                              copied to.
+*   MV_CESA_MBUF*   pSrcMbuf - Pointer to multi-buffer structure where data is
+*                              copied from.
+*   int             offset   - Offset in the Mbuf structure where located first
+*                            byte of data should be copied.
+*   int             size     - Size of data should be copied
+*
+* RETURN:
+*       MV_OK           - Success, all data is copied successfully.
+*       MV_OUT_OF_RANGE - Failed, offset is out of Multi-buffer data range.
+*                         No data is copied.
+*       MV_EMPTY        - Multi-buffer structure has not enough data to copy
+*                       Data from the offset to end of Mbuf data is copied.
+*
+*******************************************************************************/
+MV_STATUS   mvCesaCopyFromMbuf(MV_U8* pDstBuf, MV_CESA_MBUF* pSrcMbuf,
+                               int offset, int size)
+{
+    int     frag, fragOffset, bufSize;
+    MV_U8*  pBuf;
+
+    if(size == 0)
+        return MV_OK;
+
+    frag = mvCesaMbufOffset(pSrcMbuf, offset, &fragOffset);
+    if(frag == MV_INVALID)
+    {
+        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
+        return MV_OUT_OF_RANGE;
+    }
+
+    bufSize = pSrcMbuf->pFrags[frag].bufSize - fragOffset;
+    pBuf = pSrcMbuf->pFrags[frag].bufVirtPtr + fragOffset;
+    while(MV_TRUE)
+    {
+        if(size <= bufSize)
+        {
+            memcpy(pDstBuf, pBuf, size);
+            return MV_OK;
+        }
+        memcpy(pDstBuf, pBuf, bufSize);
+        size -= bufSize;
+        frag++;
+        pDstBuf += bufSize;
+        if(frag >= pSrcMbuf->numFrags)
+            break;
+
+        bufSize = pSrcMbuf->pFrags[frag].bufSize;
+        pBuf = pSrcMbuf->pFrags[frag].bufVirtPtr;
+    }
+    mvOsPrintf("mvCesaCopyFromMbuf: Mbuf is EMPTY - %d bytes isn't copied\n",
+                size);
+    return MV_EMPTY;
+}
+
+/*******************************************************************************
+* mvCesaCopyToMbuf - Copy data from continuous buffer to the Mbuf structure
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*   MV_U8*          pSrcBuf  - Pointer to continuous buffer, where data is
+*                              copied from.
+*   MV_CESA_MBUF*   pDstMbuf - Pointer to multi-buffer structure where data is
+*                              copied to.
+*   int             offset   - Offset in the Mbuf structure where located first
+*                            byte of data should be copied.
+*   int             size     - Size of data should be copied
+*
+* RETURN:
+*       MV_OK           - Success, all data is copied successfully.
+*       MV_OUT_OF_RANGE - Failed, offset is out of Multi-buffer data range.
+*                         No data is copied.
+*       MV_FULL         - Multi-buffer structure has not enough place to copy
+*                       all data. Data from the offset to end of Mbuf data
+*                       is copied.
+*
+*******************************************************************************/
+MV_STATUS   mvCesaCopyToMbuf(MV_U8* pSrcBuf, MV_CESA_MBUF* pDstMbuf,
+                               int offset, int size)
+{
+    int     frag, fragOffset, bufSize;
+    MV_U8*  pBuf;
+
+    if(size == 0)
+        return MV_OK;
+
+    frag = mvCesaMbufOffset(pDstMbuf, offset, &fragOffset);
+    if(frag == MV_INVALID)
+    {
+        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
+        return MV_OUT_OF_RANGE;
+    }
+
+    bufSize = pDstMbuf->pFrags[frag].bufSize - fragOffset;
+    pBuf = pDstMbuf->pFrags[frag].bufVirtPtr + fragOffset;
+    while(MV_TRUE)
+    {
+        if(size <= bufSize)
+        {
+            memcpy(pBuf, pSrcBuf, size);
+            return MV_OK;
+        }
+        memcpy(pBuf, pSrcBuf, bufSize);
+        size -= bufSize;
+        frag++;
+        pSrcBuf += bufSize;
+        if(frag >= pDstMbuf->numFrags)
+            break;
+
+        bufSize = pDstMbuf->pFrags[frag].bufSize;
+        pBuf = pDstMbuf->pFrags[frag].bufVirtPtr;
+    }
+    mvOsPrintf("mvCesaCopyToMbuf: Mbuf is FULL - %d bytes isn't copied\n",
+                size);
+    return MV_FULL;
+}
+
+/*******************************************************************************
+* mvCesaMbufCopy - Copy data from one Mbuf structure to the other Mbuf structure
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*
+*   MV_CESA_MBUF*   pDstMbuf - Pointer to multi-buffer structure where data is
+*                              copied to.
+*   int      dstMbufOffset   - Offset in the dstMbuf structure where first byte
+*                            of data should be copied to.
+*   MV_CESA_MBUF*   pSrcMbuf - Pointer to multi-buffer structure where data is
+*                              copied from.
+*   int      srcMbufOffset   - Offset in the srcMbuf structure where first byte
+*                            of data should be copied from.
+*   int             size     - Size of data should be copied
+*
+* RETURN:
+*       MV_OK           - Success, all data is copied successfully.
+*       MV_OUT_OF_RANGE - Failed, srcMbufOffset or dstMbufOffset is out of
+*                       srcMbuf or dstMbuf structure correspondently.
+*                       No data is copied.
+*       MV_BAD_SIZE     - srcMbuf or dstMbuf structure is too small to copy
+*                       all data. Partial data is copied
+*
+*******************************************************************************/
+MV_STATUS   mvCesaMbufCopy(MV_CESA_MBUF* pMbufDst, int dstMbufOffset,
+                           MV_CESA_MBUF* pMbufSrc, int srcMbufOffset, int size)
+{
+    int     srcFrag, dstFrag, srcSize, dstSize, srcOffset, dstOffset;
+    int     copySize;
+    MV_U8   *pSrc, *pDst;
+
+    if(size == 0)
+        return MV_OK;
+
+    srcFrag = mvCesaMbufOffset(pMbufSrc, srcMbufOffset, &srcOffset);
+    if(srcFrag == MV_INVALID)
+    {
+        mvOsPrintf("CESA srcMbuf Error: offset (%d) out of range\n", srcMbufOffset);
+        return MV_OUT_OF_RANGE;
+    }
+    pSrc = pMbufSrc->pFrags[srcFrag].bufVirtPtr + srcOffset;
+    srcSize = pMbufSrc->pFrags[srcFrag].bufSize - srcOffset;
+
+    dstFrag = mvCesaMbufOffset(pMbufDst, dstMbufOffset, &dstOffset);
+    if(dstFrag == MV_INVALID)
+    {
+        mvOsPrintf("CESA dstMbuf Error: offset (%d) out of range\n", dstMbufOffset);
+        return MV_OUT_OF_RANGE;
+    }
+    pDst = pMbufDst->pFrags[dstFrag].bufVirtPtr + dstOffset;
+    dstSize = pMbufDst->pFrags[dstFrag].bufSize - dstOffset;
+
+    while(size > 0)
+    {
+        copySize = MV_MIN(srcSize, dstSize);
+        if(size <= copySize)
+        {
+            memcpy(pDst, pSrc, size);
+            return MV_OK;
+        }
+        memcpy(pDst, pSrc, copySize);
+        size -= copySize;
+        srcSize -= copySize;
+        dstSize -= copySize;
+
+        if(srcSize == 0)
+        {
+            srcFrag++;
+            if(srcFrag >= pMbufSrc->numFrags)
+                break;
+
+            pSrc = pMbufSrc->pFrags[srcFrag].bufVirtPtr;
+            srcSize = pMbufSrc->pFrags[srcFrag].bufSize;
+        }
+
+        if(dstSize == 0)
+        {
+            dstFrag++;
+            if(dstFrag >= pMbufDst->numFrags)
+                break;
+
+            pDst = pMbufDst->pFrags[dstFrag].bufVirtPtr;
+            dstSize = pMbufDst->pFrags[dstFrag].bufSize;
+        }
+    }
+    mvOsPrintf("mvCesaMbufCopy: BAD size - %d bytes isn't copied\n",
+                size);
+
+    return MV_BAD_SIZE;
+}
+
+static MV_STATUS   mvCesaMbufCacheUnmap(MV_CESA_MBUF* pMbuf, int offset, int size)
+{
+    int     frag, fragOffset, bufSize;
+    MV_U8*  pBuf;
+
+    if(size == 0)
+        return MV_OK;
+
+    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
+    if(frag == MV_INVALID)
+    {
+        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
+        return MV_OUT_OF_RANGE;
+    }
+
+    bufSize = pMbuf->pFrags[frag].bufSize - fragOffset;
+    pBuf = pMbuf->pFrags[frag].bufVirtPtr + fragOffset;
+    while(MV_TRUE)
+    {
+        if(size <= bufSize)
+        {
+            mvOsCacheUnmap(NULL, mvOsIoVirtToPhy(NULL, pBuf), size);
+            return MV_OK;
+        }
+
+        mvOsCacheUnmap(NULL, mvOsIoVirtToPhy(NULL, pBuf), bufSize);
+        size -= bufSize;
+        frag++;
+        if(frag >= pMbuf->numFrags)
+            break;
+
+        bufSize = pMbuf->pFrags[frag].bufSize;
+        pBuf = pMbuf->pFrags[frag].bufVirtPtr;
+    }
+    mvOsPrintf("%s: Mbuf is FULL - %d bytes isn't Unmapped\n",
+                __FUNCTION__, size);
+    return MV_FULL;
+}
+
+
+/*************************************** Local Functions ******************************/
+
+/*******************************************************************************
+* mvCesaFragReqProcess - Process fragmented request
+*
+* DESCRIPTION:
+*       This function processes a fragment of fragmented request (First, Middle or Last)
+*
+*
+* INPUT:
+*       MV_CESA_REQ* pReq   - Pointer to the request in the request queue.
+*
+* RETURN:
+*       MV_OK        - The fragment is successfully passed to HW for processing.
+*       MV_TERMINATE - Means, that HW finished its work on this packet and no more
+*                    interrupts will be generated for this request.
+*                    Function mvCesaReadyGet() must be called to complete request
+*                    processing and get request result.
+*
+*******************************************************************************/
+static MV_STATUS   mvCesaFragReqProcess(MV_CESA_REQ* pReq, MV_U8 frag)
+{
+    int                     i, copySize, cryptoDataSize, macDataSize, sid;
+    int                     cryptoIvOffset, digestOffset;
+    MV_U32                  config;
+    MV_CESA_COMMAND*        pCmd = pReq->pCmd;
+    MV_CESA_SA*             pSA;
+    MV_CESA_MBUF*           pMbuf;
+    MV_DMA_DESC*            pDmaDesc = pReq->dma[frag].pDmaFirst;
+    MV_U8*                  pSramBuf = cesaSramVirtPtr->buf;
+    int                     macTotalLen = 0;
+    int                     fixOffset, cryptoOffset, macOffset;
+
+    cesaStats.fragCount++;
+
+    sid = pReq->pCmd->sessionId;
+
+    pSA = &pCesaSAD[sid];
+
+    cryptoIvOffset = digestOffset = 0;
+    i = macDataSize = 0;
+    cryptoDataSize = 0;
+
+    /* First fragment processing */
+    if(pReq->fragMode == MV_CESA_FRAG_FIRST)
+    {
+        /* pReq->frags monitors processing of fragmented request between fragments */
+        pReq->frags.bufOffset = 0;
+        pReq->frags.cryptoSize = 0;
+        pReq->frags.macSize = 0;
+
+        config = pSA->config | (MV_CESA_FRAG_FIRST << MV_CESA_FRAG_MODE_OFFSET);
+
+        /* fixOffset can be not equal to zero only for FIRST fragment */
+        fixOffset = pReq->fixOffset;
+        /* For FIRST fragment crypto and mac offsets are taken from pCmd */
+        cryptoOffset = pCmd->cryptoOffset;
+        macOffset = pCmd->macOffset;
+
+        copySize = sizeof(cesaSramVirtPtr->buf) - pReq->fixOffset;
+
+        /* Find fragment size: Must meet all requirements for CRYPTO and MAC
+         * cryptoDataSize   - size of data will be encrypted/decrypted in this fragment
+         * macDataSize      - size of data will be signed/verified in this fragment
+         * copySize         - size of data will be copied from srcMbuf to SRAM and
+         *                  back to dstMbuf for this fragment
+         */
+        mvCesaFragSizeFind(pSA, pReq, cryptoOffset, macOffset,
+                        &copySize, &cryptoDataSize, &macDataSize);
+
+        if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET))
+        {
+            /* CryptoIV special processing */
+            if( (pSA->config & MV_CESA_CRYPTO_MODE_MASK) ==
+                (MV_CESA_CRYPTO_CBC << MV_CESA_CRYPTO_MODE_BIT) )
+            {
+                /* In CBC mode for encode direction when IV from user */
+                if( (pCmd->ivFromUser) &&
+                    ((pSA->config & MV_CESA_DIRECTION_MASK) ==
+                        (MV_CESA_DIR_ENCODE << MV_CESA_DIRECTION_BIT)) )
+                {
+
+                    /* For Crypto Encode in CBC mode HW always takes IV from SRAM IVPointer,
+                    * (not from IVBufPointer). So when ivFromUser==1, we should copy IV from user place
+                    * in the buffer to SRAM IVPointer
+                    */
+                    i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->cryptoIV, &pDmaDesc[i],
+                                    MV_FALSE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
+                }
+
+                /* Special processing when IV is not located in the first fragment */
+                if(pCmd->ivOffset > (copySize - pSA->cryptoIvSize))
+                {
+                    /* Prepare dummy place for cryptoIV in SRAM */
+                    cryptoIvOffset = cesaSramVirtPtr->tempCryptoIV - mvCesaSramAddrGet();
+
+                    /* For Decryption: Copy IV value from pCmd->ivOffset to Special SRAM place */
+                    if((pSA->config & MV_CESA_DIRECTION_MASK) ==
+                            (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT))
+                    {
+                        i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->tempCryptoIV, &pDmaDesc[i],
+                                    MV_FALSE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
+                    }
+                    else
+                    {
+                        /* For Encryption when IV is NOT from User: */
+                        /* Copy IV from SRAM to buffer (pCmd->ivOffset) */
+                        if(pCmd->ivFromUser == 0)
+                        {
+                            /* copy IV value from cryptoIV to Buffer (pCmd->ivOffset) */
+                            i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->cryptoIV, &pDmaDesc[i],
+                                    MV_TRUE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
+                        }
+                    }
+                }
+                else
+                {
+                    cryptoIvOffset = pCmd->ivOffset;
+                }
+            }
+        }
+
+        if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
+        {
+            /* MAC digest special processing on Decode direction */
+            if((pSA->config & MV_CESA_DIRECTION_MASK) ==
+                        (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT))
+            {
+                /* Save digest from pCmd->digestOffset */
+                mvCesaCopyFromMbuf(pReq->frags.orgDigest,
+                               pCmd->pSrc, pCmd->digestOffset, pSA->digestSize);
+
+                /* If pCmd->digestOffset is not located on the first */
+                if(pCmd->digestOffset > (copySize - pSA->digestSize))
+                {
+                    MV_U8  digestZero[MV_CESA_MAX_DIGEST_SIZE];
+
+                    /* Set zeros to pCmd->digestOffset (DRAM) */
+                    memset(digestZero, 0, MV_CESA_MAX_DIGEST_SIZE);
+                    mvCesaCopyToMbuf(digestZero, pCmd->pSrc, pCmd->digestOffset, pSA->digestSize);
+
+                    /* Prepare dummy place for digest in SRAM */
+                    digestOffset = cesaSramVirtPtr->tempDigest - mvCesaSramAddrGet();
+                }
+                else
+                {
+                    digestOffset = pCmd->digestOffset;
+                }
+            }
+        }
+        /* Update SA in SRAM */
+        if(cesaLastSid != sid)
+        {
+            mvCesaSramSaUpdate(sid, &pDmaDesc[i]);
+            i++;
+        }
+
+        pReq->fragMode = MV_CESA_FRAG_MIDDLE;
+    }
+    else
+    {
+        /* Continue fragment */
+        fixOffset = 0;
+        cryptoOffset = 0;
+        macOffset = 0;
+        if( (pCmd->pSrc->mbufSize - pReq->frags.bufOffset) <= sizeof(cesaSramVirtPtr->buf))
+        {
+            /* Last fragment */
+            config = pSA->config | (MV_CESA_FRAG_LAST << MV_CESA_FRAG_MODE_OFFSET);
+            pReq->fragMode = MV_CESA_FRAG_LAST;
+            copySize = pCmd->pSrc->mbufSize - pReq->frags.bufOffset;
+
+            if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
+            {
+                macDataSize = pCmd->macLength - pReq->frags.macSize;
+
+                /* If pCmd->digestOffset is not located on last fragment */
+                if(pCmd->digestOffset < pReq->frags.bufOffset)
+                {
+                    /* Prepare dummy place for digest in SRAM */
+                    digestOffset = cesaSramVirtPtr->tempDigest - mvCesaSramAddrGet();
+                }
+                else
+                {
+                    digestOffset = pCmd->digestOffset - pReq->frags.bufOffset;
+                }
+                pReq->frags.newDigestOffset = digestOffset;
+                macTotalLen = pCmd->macLength;
+
+                /* HW can't calculate the Digest correctly for fragmented packets
+                 * in the following cases:
+                 *  - MV88F5182                                           ||
+                 *  - MV88F5181L when total macLength more that 16 Kbytes ||
+                 *  - total macLength more that 64 Kbytes
+                 */
+                if( (mvCtrlModelGet() == MV_5182_DEV_ID) ||
+                    ( (mvCtrlModelGet() == MV_5181_DEV_ID) &&
+                      (mvCtrlRevGet() >= MV_5181L_A0_REV)  &&
+                      (pCmd->macLength >= (1 << 14)) ) )
+                {
+                    return MV_TERMINATE;
+                }
+            }
+            if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET) )
+            {
+                cryptoDataSize = pCmd->cryptoLength - pReq->frags.cryptoSize;
+            }
+
+            /* cryptoIvOffset - don't care */
+        }
+        else
+        {
+            /* WA for MV88F5182 SHA1 and MD5 fragmentation mode */
+            if( (mvCtrlModelGet() == MV_5182_DEV_ID) &&
+                (((pSA->config & MV_CESA_MAC_MODE_MASK) ==
+                    (MV_CESA_MAC_MD5 << MV_CESA_MAC_MODE_OFFSET)) ||
+                ((pSA->config & MV_CESA_MAC_MODE_MASK) ==
+                    (MV_CESA_MAC_SHA1 << MV_CESA_MAC_MODE_OFFSET))) )
+            {
+                pReq->frags.newDigestOffset = cesaSramVirtPtr->tempDigest - mvCesaSramAddrGet();
+                pReq->fragMode = MV_CESA_FRAG_LAST;
+
+                return MV_TERMINATE;
+            }
+            /* Middle fragment */
+            config = pSA->config | (MV_CESA_FRAG_MIDDLE << MV_CESA_FRAG_MODE_OFFSET);
+            copySize = sizeof(cesaSramVirtPtr->buf);
+            /* digestOffset and cryptoIvOffset - don't care */
+
+            /* Find fragment size */
+            mvCesaFragSizeFind(pSA, pReq, cryptoOffset, macOffset,
+                            &copySize, &cryptoDataSize, &macDataSize);
+        }
+    }
+    /********* Prepare DMA descriptors to copy from pSrc to SRAM *********/
+    pMbuf = pCmd->pSrc;
+    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
+                                MV_FALSE, pReq->frags.bufOffset, copySize, pCmd->skipFlush);
+
+    /* Prepare CESA descriptor to copy from DRAM to SRAM by DMA */
+    mvCesaSramDescrBuild(config, frag, 
+                cryptoOffset + fixOffset, cryptoIvOffset + fixOffset,
+                cryptoDataSize, macOffset + fixOffset,
+                digestOffset + fixOffset, macDataSize, macTotalLen,
+                pReq, &pDmaDesc[i]);
+    i++;
+
+   /* Add special descriptor Ownership for CPU */
+    pDmaDesc[i].byteCnt = 0;
+    pDmaDesc[i].phySrcAdd = 0;
+    pDmaDesc[i].phyDestAdd = 0;
+    i++;
+
+    /********* Prepare DMA descriptors to copy from SRAM to pDst *********/
+    pMbuf = pCmd->pDst;
+    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
+                                MV_TRUE, pReq->frags.bufOffset, copySize, pCmd->skipFlush);
+
+    /* Next field of Last DMA descriptor must be NULL */
+    pDmaDesc[i-1].phyNextDescPtr = 0;
+    pReq->dma[frag].pDmaLast = &pDmaDesc[i-1];
+    mvOsCacheFlush(NULL, pReq->dma[frag].pDmaFirst, 
+                    i*sizeof(MV_DMA_DESC));
+
+    /*mvCesaDebugDescriptor(&cesaSramVirtPtr->desc[frag]);*/
+
+    pReq->frags.bufOffset += copySize;
+    pReq->frags.cryptoSize += cryptoDataSize;
+    pReq->frags.macSize += macDataSize;
+
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvCesaReqProcess - Process regular (Non-fragmented) request
+*
+* DESCRIPTION:
+*       This function processes the whole (not fragmented) request
+*
+* INPUT:
+*       MV_CESA_REQ* pReq   - Pointer to the request in the request queue.
+*
+* RETURN:
+*       MV_OK   - The request is successfully passed to HW for processing.
+*       Other   - Failure. The request will not be processed
+*
+*******************************************************************************/
+static MV_STATUS   mvCesaReqProcess(MV_CESA_REQ* pReq)
+{
+    MV_CESA_MBUF    *pMbuf;
+    MV_DMA_DESC     *pDmaDesc;
+    MV_U8           *pSramBuf;
+    int             sid, i, fixOffset;
+    MV_CESA_SA      *pSA;
+    MV_CESA_COMMAND *pCmd = pReq->pCmd;
+
+    cesaStats.procCount++;
+
+    sid = pCmd->sessionId;
+    pSA = &pCesaSAD[sid];
+    pDmaDesc = pReq->dma[0].pDmaFirst;
+    pSramBuf = cesaSramVirtPtr->buf;
+    fixOffset = pReq->fixOffset;
+
+/*
+    mvOsPrintf("mvCesaReqProcess: sid=%d, pSA=%p, pDmaDesc=%p, pSramBuf=%p\n",
+                sid, pSA, pDmaDesc, pSramBuf);
+*/
+    i = 0;
+
+    /* Crypto IV Special processing in CBC mode for Encryption direction */
+    if( ((pSA->config & MV_CESA_OPERATION_MASK) != (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET)) &&
+        ((pSA->config & MV_CESA_CRYPTO_MODE_MASK) == (MV_CESA_CRYPTO_CBC << MV_CESA_CRYPTO_MODE_BIT)) &&
+        ((pSA->config & MV_CESA_DIRECTION_MASK) == (MV_CESA_DIR_ENCODE << MV_CESA_DIRECTION_BIT)) &&
+        (pCmd->ivFromUser) )
+    {
+        /* For Crypto Encode in CBC mode HW always takes IV from SRAM IVPointer,
+         * (not from IVBufPointer). So when ivFromUser==1, we should copy IV from user place
+         * in the buffer to SRAM IVPointer
+         */
+        i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->cryptoIV, &pDmaDesc[i],
+                                    MV_FALSE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
+    }
+
+    /* Update SA in SRAM */
+    if(cesaLastSid != sid)
+    {
+        mvCesaSramSaUpdate(sid, &pDmaDesc[i]);
+        i++;
+    }
+
+    /********* Prepare DMA descriptors to copy from pSrc to SRAM *********/
+    pMbuf = pCmd->pSrc;
+    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
+                                MV_FALSE, 0, pMbuf->mbufSize, pCmd->skipFlush);
+
+    /* Prepare Security Accelerator descriptor to SRAM words 0 - 7 */
+    mvCesaSramDescrBuild(pSA->config, 0, pCmd->cryptoOffset + fixOffset, 
+                        pCmd->ivOffset + fixOffset, pCmd->cryptoLength,
+                        pCmd->macOffset + fixOffset, pCmd->digestOffset + fixOffset,
+                        pCmd->macLength, pCmd->macLength, pReq, &pDmaDesc[i]);
+    i++;
+
+   /* Add special descriptor Ownership for CPU */
+    pDmaDesc[i].byteCnt = 0;
+    pDmaDesc[i].phySrcAdd = 0;
+    pDmaDesc[i].phyDestAdd = 0;
+    i++;
+
+    /********* Prepare DMA descriptors to copy from SRAM to pDst *********/
+    pMbuf = pCmd->pDst;
+    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
+                                MV_TRUE, 0, pMbuf->mbufSize, pCmd->skipFlush);
+
+    /* Next field of Last DMA descriptor must be NULL */
+    pDmaDesc[i-1].phyNextDescPtr = 0;
+    pReq->dma[0].pDmaLast = &pDmaDesc[i-1];
+    mvOsCacheFlush(NULL, pReq->dma[0].pDmaFirst, i*sizeof(MV_DMA_DESC));
+            
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvCesaSramDescrBuild - Set CESA descriptor in SRAM
+*
+* DESCRIPTION:
+*       This function builds CESA descriptor in SRAM from all Command parameters
+*
+*
+* INPUT:
+*       int     chan            - CESA channel uses the descriptor
+*       MV_U32  config          - 32 bits of WORD_0 in CESA descriptor structure
+*       int     cryptoOffset    - Offset from the beginning of SRAM buffer where
+*                               data for encryption/decription is started.
+*       int     ivOffset        - Offset of crypto IV from the SRAM base. Valid only
+*                               for first fragment.
+*       int     cryptoLength    - Size (in bytes) of data for encryption/descryption
+*                               operation on this fragment.
+*       int     macOffset       - Offset from the beginning of SRAM buffer where
+*                               data for Authentication is started
+*       int     digestOffset    - Offset from the beginning of SRAM buffer where
+*                               digest is located. Valid for first and last fragments.
+*       int     macLength       - Size (in bytes) of data for Authentication
+*                               operation on this fragment.
+*       int     macTotalLen     - Toatl size (in bytes) of data for Authentication
+*                               operation on the whole request (packet). Valid for
+*                               last fragment only.
+*
+* RETURN:   None
+*
+*******************************************************************************/
+static void    mvCesaSramDescrBuild(MV_U32 config, int frag, 
+                             int cryptoOffset, int ivOffset, int cryptoLength,
+                             int macOffset, int digestOffset, int macLength,
+                             int macTotalLen, MV_CESA_REQ* pReq, MV_DMA_DESC* pDmaDesc)
+{    
+    MV_CESA_DESC*   pCesaDesc = &pReq->pCesaDesc[frag];
+    MV_CESA_DESC*   pSramDesc = pSramDesc = &cesaSramVirtPtr->desc;
+    MV_U16          sramBufOffset = (MV_U16)((MV_U8*)cesaSramVirtPtr->buf - mvCesaSramAddrGet());
+
+    pCesaDesc->config = MV_32BIT_LE(config);
+
+    if( (config & MV_CESA_OPERATION_MASK) !=
+         (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET) )
+    {
+        /* word 1 */
+        pCesaDesc->cryptoSrcOffset = MV_16BIT_LE(sramBufOffset + cryptoOffset);
+        pCesaDesc->cryptoDstOffset = MV_16BIT_LE(sramBufOffset + cryptoOffset);
+        /* word 2 */
+        pCesaDesc->cryptoDataLen = MV_16BIT_LE(cryptoLength);
+        /* word 3 */
+        pCesaDesc->cryptoKeyOffset = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->sramSA.cryptoKey - 
+                                                            mvCesaSramAddrGet()));
+        /* word 4 */
+        pCesaDesc->cryptoIvOffset  = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->cryptoIV -
+                                                            mvCesaSramAddrGet()));
+        pCesaDesc->cryptoIvBufOffset = MV_16BIT_LE(sramBufOffset + ivOffset);
+    }
+
+    if( (config & MV_CESA_OPERATION_MASK) !=
+         (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
+    {
+        /* word 5 */
+        pCesaDesc->macSrcOffset = MV_16BIT_LE(sramBufOffset + macOffset);
+        pCesaDesc->macTotalLen = MV_16BIT_LE(macTotalLen);
+
+        /* word 6 */
+        pCesaDesc->macDigestOffset = MV_16BIT_LE(sramBufOffset + digestOffset);
+        pCesaDesc->macDataLen = MV_16BIT_LE(macLength);
+
+        /* word 7 */
+        pCesaDesc->macInnerIvOffset = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->sramSA.macInnerIV - 
+                                 mvCesaSramAddrGet()));
+        pCesaDesc->macOuterIvOffset = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->sramSA.macOuterIV - 
+                                 mvCesaSramAddrGet()));
+    }
+    /* Prepare DMA descriptor to CESA descriptor from DRAM to SRAM */
+    pDmaDesc->phySrcAdd = MV_32BIT_LE(mvCesaVirtToPhys(&pReq->cesaDescBuf, pCesaDesc));
+    pDmaDesc->phyDestAdd = MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (MV_U8*)pSramDesc));
+    pDmaDesc->byteCnt = MV_32BIT_LE(sizeof(MV_CESA_DESC) | BIT31);
+                                
+    /* flush Source buffer */
+    mvOsCacheFlush(NULL, pCesaDesc, sizeof(MV_CESA_DESC));
+}
+
+/*******************************************************************************
+* mvCesaSramSaUpdate - Move required SA information to SRAM if needed.
+*
+* DESCRIPTION:
+*   Copy to SRAM values of the required SA.
+*
+*
+* INPUT:
+*       short       sid          - Session ID needs SRAM Cache update
+*       MV_DMA_DESC *pDmaDesc   - Pointer to DMA descriptor used to
+*                                copy SA values from DRAM to SRAM.
+*
+* RETURN:
+*       MV_OK           - Cache entry for this SA copied to SRAM.
+*       MV_NO_CHANGE    - Cache entry for this SA already exist in SRAM
+*
+*******************************************************************************/
+static INLINE void   mvCesaSramSaUpdate(short sid, MV_DMA_DESC *pDmaDesc)
+{
+    MV_CESA_SA      *pSA = &pCesaSAD[sid];
+
+    /* Prepare DMA descriptor to Copy CACHE_SA from SA database in DRAM to SRAM */
+     pDmaDesc->byteCnt = MV_32BIT_LE(sizeof(MV_CESA_SRAM_SA) | BIT31);
+    pDmaDesc->phySrcAdd = MV_32BIT_LE(mvCesaVirtToPhys(&cesaSramSaBuf, pSA->pSramSA));
+     pDmaDesc->phyDestAdd =
+          MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (MV_U8*)&cesaSramVirtPtr->sramSA));
+
+    /* Source buffer is already flushed during OpenSession*/
+    /*mvOsCacheFlush(NULL, &pSA->sramSA, sizeof(MV_CESA_SRAM_SA));*/
+}
+
+/*******************************************************************************
+* mvCesaDmaCopyPrepare - prepare DMA descriptor list to copy data presented by
+*                       Mbuf structure from DRAM to SRAM
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_MBUF*   pMbuf       - pointer to Mbuf structure contains request
+*                                   data in DRAM
+*       MV_U8*          pSramBuf    - pointer to buffer in SRAM where data should
+*                                   be copied to.
+*       MV_DMA_DESC*    pDmaDesc   - pointer to first DMA descriptor for this copy.
+*                                   The function set number of DMA descriptors needed
+*                                   to copy the copySize bytes from Mbuf.
+*       MV_BOOL         isToMbuf    - Copy direction.
+*                                   MV_TRUE means copy from SRAM buffer to Mbuf in DRAM.
+*                                   MV_FALSE means copy from Mbuf in DRAM to SRAM buffer.
+*       int             offset      - Offset in the Mbuf structure that copy should be
+*                                   started from.
+*       int             copySize    - Size of data should be copied.
+*
+* RETURN:
+*       int  - number of DMA descriptors used for the copy.
+*
+*******************************************************************************/
+#ifndef MV_NETBSD
+static INLINE int    mvCesaDmaCopyPrepare(MV_CESA_MBUF* pMbuf, MV_U8* pSramBuf, 
+                        MV_DMA_DESC* pDmaDesc, MV_BOOL isToMbuf,
+                        int offset, int copySize, MV_BOOL skipFlush)
+{
+    int     bufOffset, bufSize, size, frag, i;
+    MV_U8*  pBuf;
+
+    i = 0;
+
+    /* Calculate start place for copy: fragment number and offset in the fragment */
+    frag = mvCesaMbufOffset(pMbuf, offset, &bufOffset);
+    bufSize = pMbuf->pFrags[frag].bufSize - bufOffset;
+    pBuf = pMbuf->pFrags[frag].bufVirtPtr + bufOffset;
+
+    /* Size accumulate total copy size */
+    size = 0;
+
+    /* Create DMA lists to copy mBuf from pSrc to SRAM */
+    while(size < copySize)
+    {
+        /* Find copy size for each DMA descriptor */
+        bufSize = MV_MIN(bufSize, (copySize - size));
+        pDmaDesc[i].byteCnt = MV_32BIT_LE(bufSize | BIT31);
+        if(isToMbuf)
+        {
+            pDmaDesc[i].phyDestAdd = MV_32BIT_LE(mvOsIoVirtToPhy(NULL, pBuf));
+            pDmaDesc[i].phySrcAdd  =
+                MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (pSramBuf + size)));
+            /* invalidate the buffer */
+	    if(skipFlush == MV_FALSE)
+            	mvOsCacheInvalidate(NULL, pBuf, bufSize);
+        }
+        else
+        {
+            pDmaDesc[i].phySrcAdd = MV_32BIT_LE(mvOsIoVirtToPhy(NULL, pBuf));
+            pDmaDesc[i].phyDestAdd =
+                MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (pSramBuf + size)));
+            /* flush the buffer */
+	    if(skipFlush == MV_FALSE)
+            	mvOsCacheFlush(NULL, pBuf, bufSize);
+        }
+
+        /* Count number of used DMA descriptors */
+        i++;
+        size += bufSize;
+
+        /* go to next fragment in the Mbuf */
+        frag++;
+        pBuf = pMbuf->pFrags[frag].bufVirtPtr;
+        bufSize = pMbuf->pFrags[frag].bufSize;
+    }
+    return i;
+}
+#else /* MV_NETBSD */
+static int    mvCesaDmaCopyPrepare(MV_CESA_MBUF* pMbuf, MV_U8* pSramBuf,
+                        MV_DMA_DESC* pDmaDesc, MV_BOOL isToMbuf,
+                        int offset, int copySize, MV_BOOL skipFlush)
+{
+	int bufOffset, bufSize, thisSize, size, frag, i;
+	MV_ULONG bufPhys, sramPhys;
+    MV_U8*  pBuf;
+
+	/*
+	 * Calculate start place for copy: fragment number and offset in
+	 * the fragment
+	 */
+    frag = mvCesaMbufOffset(pMbuf, offset, &bufOffset);
+
+	/*
+	 * Get SRAM physical address only once. We can update it in-place
+	 * as we build the descriptor chain.
+	 */
+	sramPhys = mvCesaSramVirtToPhys(NULL, pSramBuf);
+
+	/*
+	 * 'size' accumulates total copy size, 'i' counts desccriptors.
+	 */
+	size = i = 0;
+
+	/* Create DMA lists to copy mBuf from pSrc to SRAM */
+	while (size < copySize) {
+		/*
+		 * Calculate # of bytes to copy from the current fragment,
+		 * and the pointer to the start of data
+		 */
+    bufSize = pMbuf->pFrags[frag].bufSize - bufOffset;
+    pBuf = pMbuf->pFrags[frag].bufVirtPtr + bufOffset;
+		bufOffset = 0;	/* First frag may be non-zero */
+		frag++;
+
+		/*
+		 * As long as there is data in the current fragment...
+		 */
+		while (bufSize > 0) {
+			/*
+			 * Ensure we don't cross an MMU page boundary.
+			 * XXX: This is NetBSD-specific, but it is a
+			 * quick and dirty way to fix the problem.
+			 * A true HAL would rely on the OS-specific
+			 * driver to do this...
+			 */
+			thisSize = PAGE_SIZE -
+			    (((MV_ULONG)pBuf) & (PAGE_SIZE - 1));
+			thisSize = MV_MIN(bufSize, thisSize);
+			/*
+			 * Make sure we don't copy more than requested
+			 */
+			if (thisSize > (copySize - size)) {
+				thisSize = copySize - size;
+				bufSize = 0;
+			}
+
+			/*
+			 * Physicall address of this fragment
+			 */
+			bufPhys = MV_32BIT_LE(mvOsIoVirtToPhy(NULL, pBuf));
+
+			/*
+			 * Set up the descriptor
+			 */
+		        pDmaDesc[i].byteCnt = MV_32BIT_LE(thisSize | BIT31);
+		        if(isToMbuf) {
+				pDmaDesc[i].phyDestAdd = bufPhys;
+				pDmaDesc[i].phySrcAdd  = MV_32BIT_LE(sramPhys);
+            /* invalidate the buffer */
+				if(skipFlush == MV_FALSE)
+					mvOsCacheInvalidate(NULL, pBuf, thisSize);
+			} else {
+				pDmaDesc[i].phySrcAdd = bufPhys;
+				pDmaDesc[i].phyDestAdd = MV_32BIT_LE(sramPhys);
+            /* flush the buffer */
+				if(skipFlush == MV_FALSE)
+					mvOsCacheFlush(NULL, pBuf, thisSize);
+			}
+
+			pDmaDesc[i].phyNextDescPtr =
+			    MV_32BIT_LE(mvOsIoVirtToPhy(NULL,(&pDmaDesc[i+1])));
+
+        /* flush the DMA desc */
+        mvOsCacheFlush(NULL, &pDmaDesc[i], sizeof(MV_DMA_DESC));
+
+			/* Update state */
+			bufSize -= thisSize;
+			sramPhys += thisSize;
+			pBuf += thisSize;
+			size += thisSize;
+        i++;
+		}
+	}
+
+    return i;
+}
+#endif /* MV_NETBSD */
+/*******************************************************************************
+* mvCesaHmacIvGet - Calculate Inner and Outter values from HMAC key
+*
+* DESCRIPTION:
+*       This function calculate Inner and Outer values used for HMAC algorithm.
+*       This operation allows improve performance fro the whole HMAC processing.
+*
+* INPUT:
+*       MV_CESA_MAC_MODE    macMode     - Authentication mode: HMAC_MD5 or HMAC_SHA1.
+*       unsigned char       key[]       - Pointer to HMAC key.
+*       int                 keyLength   - Size of HMAC key (maximum 64 bytes)
+*
+* OUTPUT:
+*       unsigned char       innerIV[]   - HASH(key^inner)
+*       unsigned char       outerIV[]   - HASH(key^outter)
+*
+* RETURN:   None
+*
+*******************************************************************************/
+static void    mvCesaHmacIvGet(MV_CESA_MAC_MODE macMode, unsigned char key[], int keyLength,
+                     unsigned char innerIV[], unsigned char outerIV[])
+{
+    unsigned char   inner[MV_CESA_MAX_MAC_KEY_LENGTH];
+    unsigned char   outer[MV_CESA_MAX_MAC_KEY_LENGTH];
+    int             i, digestSize = 0;
+#if defined(MV_CPU_LE) || defined(MV_PPC)
+    MV_U32          swapped32, val32, *pVal32;
+#endif 
+    for(i=0; i<keyLength; i++)
+    {
+        inner[i] = 0x36 ^ key[i];
+        outer[i] = 0x5c ^ key[i];
+    }
+
+    for(i=keyLength; i<MV_CESA_MAX_MAC_KEY_LENGTH; i++)
+    {
+        inner[i] = 0x36;
+        outer[i] = 0x5c;
+    }
+    if(macMode == MV_CESA_MAC_HMAC_MD5)
+    {
+        MV_MD5_CONTEXT  ctx;
+
+        mvMD5Init(&ctx);
+        mvMD5Update(&ctx, inner, MV_CESA_MAX_MAC_KEY_LENGTH);
+
+        memcpy(innerIV, ctx.buf, MV_CESA_MD5_DIGEST_SIZE);
+        memset(&ctx, 0, sizeof(ctx));
+
+        mvMD5Init(&ctx);
+        mvMD5Update(&ctx, outer, MV_CESA_MAX_MAC_KEY_LENGTH);
+        memcpy(outerIV, ctx.buf, MV_CESA_MD5_DIGEST_SIZE);
+        memset(&ctx, 0, sizeof(ctx));
+        digestSize = MV_CESA_MD5_DIGEST_SIZE;
+    }
+    else if(macMode == MV_CESA_MAC_HMAC_SHA1)
+    {
+        MV_SHA1_CTX  ctx;
+
+        mvSHA1Init(&ctx);
+        mvSHA1Update(&ctx, inner, MV_CESA_MAX_MAC_KEY_LENGTH);
+        memcpy(innerIV, ctx.state, MV_CESA_SHA1_DIGEST_SIZE);
+        memset(&ctx, 0, sizeof(ctx));
+
+        mvSHA1Init(&ctx);
+        mvSHA1Update(&ctx, outer, MV_CESA_MAX_MAC_KEY_LENGTH);
+        memcpy(outerIV, ctx.state, MV_CESA_SHA1_DIGEST_SIZE);
+        memset(&ctx, 0, sizeof(ctx));
+        digestSize = MV_CESA_SHA1_DIGEST_SIZE;
+    }
+    else
+    {
+        mvOsPrintf("hmacGetIV: Unexpected macMode %d\n", macMode);
+    }
+#if defined(MV_CPU_LE) || defined(MV_PPC)
+    /* 32 bits Swap of Inner and Outer values */
+    pVal32 = (MV_U32*)innerIV;
+    for(i=0; i<digestSize/4; i++)
+    {
+        val32 = *pVal32;
+        swapped32 = MV_BYTE_SWAP_32BIT(val32);
+        *pVal32 = swapped32;
+        pVal32++;
+    }
+    pVal32 = (MV_U32*)outerIV;
+    for(i=0; i<digestSize/4; i++)
+    {
+        val32 = *pVal32;
+        swapped32 = MV_BYTE_SWAP_32BIT(val32);
+        *pVal32 = swapped32;
+        pVal32++;
+    }
+#endif  /* defined(MV_CPU_LE) || defined(MV_PPC) */
+}
+
+
+/*******************************************************************************
+* mvCesaFragSha1Complete - Complete SHA1 authentication started by HW using SW
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_MBUF*   pMbuf           - Pointer to Mbuf structure where data
+*                                       for SHA1 is placed.
+*       int             offset          - Offset in the Mbuf structure where
+*                                       unprocessed data for SHA1 is started.
+*       MV_U8*          pOuterIV        - Pointer to OUTER for this session.
+*                                       If pOuterIV==NULL - MAC mode is HASH_SHA1
+*                                       If pOuterIV!=NULL - MAC mode is HMAC_SHA1
+*       int             macLeftSize     - Size of unprocessed data for SHA1.
+*       int             macTotalSize    - Total size of data for SHA1 in the
+*                                       request (processed + unprocessed)
+*
+* OUTPUT:
+*       MV_U8*     pDigest  - Pointer to place where calculated Digest will
+*                           be stored.
+*
+* RETURN:   None
+*
+*******************************************************************************/
+static void    mvCesaFragSha1Complete(MV_CESA_MBUF* pMbuf, int offset,
+                                      MV_U8* pOuterIV, int macLeftSize,
+                                      int macTotalSize, MV_U8* pDigest)
+{
+    MV_SHA1_CTX     ctx;
+    MV_U8           *pData;
+    int             i, frag, fragOffset, size;
+
+    /* Read temporary Digest from HW */
+    for(i=0; i<MV_CESA_SHA1_DIGEST_SIZE/4; i++)
+    {
+        ctx.state[i] = MV_REG_READ(MV_CESA_AUTH_INIT_VAL_DIGEST_REG(i));
+    }
+    /* Initialize MV_SHA1_CTX structure */
+    memset(ctx.buffer, 0, 64);
+    /* Set count[0] in bits. 32 bits is enough for 512 MBytes */
+    /* so count[1] is always 0 */
+    ctx.count[0] = ((macTotalSize - macLeftSize) * 8);
+    ctx.count[1] = 0;
+
+    /* If HMAC - add size of Inner block (64 bytes) ro count[0] */
+    if(pOuterIV != NULL)
+        ctx.count[0] += (64 * 8);
+
+    /* Get place of unprocessed data in the Mbuf structure */
+    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
+    if(frag == MV_INVALID)
+    {
+        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
+        return;
+    }
+
+    pData = pMbuf->pFrags[frag].bufVirtPtr + fragOffset;
+    size = pMbuf->pFrags[frag].bufSize - fragOffset;
+
+    /* Complete Inner part */
+    while(macLeftSize > 0)
+    {
+        if(macLeftSize <= size)
+        {
+            mvSHA1Update(&ctx, pData, macLeftSize);
+            break;
+        }
+        mvSHA1Update(&ctx, pData, size);
+        macLeftSize -= size;
+        frag++;
+        pData = pMbuf->pFrags[frag].bufVirtPtr;
+        size = pMbuf->pFrags[frag].bufSize;
+    }
+    mvSHA1Final(pDigest, &ctx);
+/*
+    mvOsPrintf("mvCesaFragSha1Complete: pOuterIV=%p, macLeftSize=%d, macTotalSize=%d\n",
+                pOuterIV, macLeftSize, macTotalSize);
+    mvDebugMemDump(pDigest, MV_CESA_SHA1_DIGEST_SIZE, 1);
+*/
+
+    if(pOuterIV != NULL)
+    {
+        /* If HMAC - Complete Outer part */
+        for(i=0; i<MV_CESA_SHA1_DIGEST_SIZE/4; i++)
+        {
+#if defined(MV_CPU_LE) || defined(MV_ARM)
+            ctx.state[i] = MV_BYTE_SWAP_32BIT(((MV_U32*)pOuterIV)[i]);
+#else
+	    ctx.state[i] = ((MV_U32*)pOuterIV)[i];
+#endif
+	}
+        memset(ctx.buffer, 0, 64);
+
+        ctx.count[0] = 64*8;
+        ctx.count[1] = 0;
+        mvSHA1Update(&ctx, pDigest, MV_CESA_SHA1_DIGEST_SIZE);
+        mvSHA1Final(pDigest, &ctx);
+    }
+}
+
+/*******************************************************************************
+* mvCesaFragMd5Complete - Complete MD5 authentication started by HW using SW
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_MBUF*   pMbuf           - Pointer to Mbuf structure where data
+*                                       for SHA1 is placed.
+*       int             offset          - Offset in the Mbuf structure where
+*                                       unprocessed data for MD5 is started.
+*       MV_U8*          pOuterIV        - Pointer to OUTER for this session.
+*                                       If pOuterIV==NULL - MAC mode is HASH_MD5
+*                                       If pOuterIV!=NULL - MAC mode is HMAC_MD5
+*       int             macLeftSize     - Size of unprocessed data for MD5.
+*       int             macTotalSize    - Total size of data for MD5 in the
+*                                       request (processed + unprocessed)
+*
+* OUTPUT:
+*       MV_U8*     pDigest  - Pointer to place where calculated Digest will
+*                           be stored.
+*
+* RETURN:   None
+*
+*******************************************************************************/
+static void    mvCesaFragMd5Complete(MV_CESA_MBUF* pMbuf, int offset,
+                                     MV_U8* pOuterIV, int macLeftSize,
+                                     int macTotalSize, MV_U8* pDigest)
+{
+    MV_MD5_CONTEXT  ctx;
+    MV_U8           *pData;
+    int             i, frag, fragOffset, size;
+
+    /* Read temporary Digest from HW */
+    for(i=0; i<MV_CESA_MD5_DIGEST_SIZE/4; i++)
+    {
+        ctx.buf[i] = MV_REG_READ(MV_CESA_AUTH_INIT_VAL_DIGEST_REG(i));
+    }
+    memset(ctx.in, 0, 64);
+
+    /* Set count[0] in bits. 32 bits is enough for 512 MBytes */
+    /* so count[1] is always 0 */
+    ctx.bits[0] = ((macTotalSize - macLeftSize) * 8);
+    ctx.bits[1] = 0;
+
+    /* If HMAC - add size of Inner block (64 bytes) ro count[0] */
+    if(pOuterIV != NULL)
+        ctx.bits[0] += (64 * 8);
+
+    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
+    if(frag == MV_INVALID)
+    {
+        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
+        return;
+    }
+
+    pData = pMbuf->pFrags[frag].bufVirtPtr + fragOffset;
+    size = pMbuf->pFrags[frag].bufSize - fragOffset;
+
+    /* Complete Inner part */
+    while(macLeftSize > 0)
+    {
+        if(macLeftSize <= size)
+        {
+            mvMD5Update(&ctx, pData, macLeftSize);
+            break;
+        }
+        mvMD5Update(&ctx, pData, size);
+        macLeftSize -= size;
+        frag++;
+        pData = pMbuf->pFrags[frag].bufVirtPtr;
+        size = pMbuf->pFrags[frag].bufSize;
+    }
+    mvMD5Final(pDigest, &ctx);
+
+/*
+    mvOsPrintf("mvCesaFragMd5Complete: pOuterIV=%p, macLeftSize=%d, macTotalSize=%d\n",
+                pOuterIV, macLeftSize, macTotalSize);
+    mvDebugMemDump(pDigest, MV_CESA_MD5_DIGEST_SIZE, 1);
+*/
+    if(pOuterIV != NULL)
+    {
+        /* Complete Outer part */
+        for(i=0; i<MV_CESA_MD5_DIGEST_SIZE/4; i++)
+        {
+#if defined(MV_CPU_LE) || defined(MV_ARM)
+            ctx.buf[i] = MV_BYTE_SWAP_32BIT(((MV_U32*)pOuterIV)[i]);
+#else
+	    ctx.buf[i] = ((MV_U32*)pOuterIV)[i];
+#endif
+	}
+        memset(ctx.in, 0, 64);
+
+        ctx.bits[0] = 64*8;
+        ctx.bits[1] = 0;
+        mvMD5Update(&ctx, pDigest, MV_CESA_MD5_DIGEST_SIZE);
+        mvMD5Final(pDigest, &ctx);
+    }
+}
+
+/*******************************************************************************
+* mvCesaFragAuthComplete -
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_REQ*    pReq,
+*       MV_CESA_SA*     pSA,
+*       int             macDataSize
+*
+* RETURN:
+*       MV_STATUS
+*
+*******************************************************************************/
+static MV_STATUS   mvCesaFragAuthComplete(MV_CESA_REQ* pReq, MV_CESA_SA* pSA,
+                               int macDataSize)
+{
+    MV_CESA_COMMAND*        pCmd = pReq->pCmd;
+    MV_U8*                  pDigest;
+    MV_CESA_MAC_MODE        macMode;
+    MV_U8*                  pOuterIV = NULL;
+
+    /* Copy data from Source fragment to Destination */
+    if(pCmd->pSrc != pCmd->pDst)
+    {
+        mvCesaMbufCopy(pCmd->pDst, pReq->frags.bufOffset,
+                       pCmd->pSrc, pReq->frags.bufOffset, macDataSize);
+    }
+
+/*
+    mvCesaCopyFromMbuf(cesaSramVirtPtr->buf[0], pCmd->pSrc, pReq->frags.bufOffset, macDataSize);
+    mvCesaCopyToMbuf(cesaSramVirtPtr->buf[0], pCmd->pDst, pReq->frags.bufOffset, macDataSize);
+*/
+    pDigest = (mvCesaSramAddrGet() + pReq->frags.newDigestOffset);
+
+    macMode = (pSA->config & MV_CESA_MAC_MODE_MASK) >> MV_CESA_MAC_MODE_OFFSET;
+/*
+    mvOsPrintf("macDataSize=%d, macLength=%d, digestOffset=%d, macMode=%d\n",
+            macDataSize, pCmd->macLength, pCmd->digestOffset, macMode);
+*/
+    switch(macMode)
+    {
+        case MV_CESA_MAC_HMAC_MD5:
+            pOuterIV = pSA->pSramSA->macOuterIV;
+
+        case MV_CESA_MAC_MD5:
+            mvCesaFragMd5Complete(pCmd->pDst, pReq->frags.bufOffset, pOuterIV,
+                               macDataSize, pCmd->macLength, pDigest);
+        break;
+
+        case MV_CESA_MAC_HMAC_SHA1:
+            pOuterIV = pSA->pSramSA->macOuterIV;
+
+        case MV_CESA_MAC_SHA1:
+            mvCesaFragSha1Complete(pCmd->pDst, pReq->frags.bufOffset, pOuterIV,
+                               macDataSize, pCmd->macLength, pDigest);
+        break;
+
+        default:
+            mvOsPrintf("mvCesaFragAuthComplete: Unexpected macMode %d\n", macMode);
+            return MV_BAD_PARAM;
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaCtrModeInit -
+*
+* DESCRIPTION:
+*
+*
+* INPUT: NONE
+*
+*
+* RETURN:
+*       MV_CESA_COMMAND*
+*
+*******************************************************************************/
+static MV_CESA_COMMAND*    mvCesaCtrModeInit(void)
+{
+    MV_CESA_MBUF    *pMbuf;
+    MV_U8           *pBuf;
+    MV_CESA_COMMAND *pCmd;
+
+    pBuf = mvOsMalloc(sizeof(MV_CESA_COMMAND) +
+                      sizeof(MV_CESA_MBUF) + sizeof(MV_BUF_INFO) + 100);
+    if(pBuf == NULL)
+    {
+        mvOsPrintf("mvCesaSessionOpen: Can't allocate %u bytes for CTR Mode\n",
+                    sizeof(MV_CESA_COMMAND) + sizeof(MV_CESA_MBUF) + sizeof(MV_BUF_INFO) );
+        return NULL;
+    }
+    pCmd = (MV_CESA_COMMAND*)pBuf;
+    pBuf += sizeof(MV_CESA_COMMAND);
+
+    pMbuf = (MV_CESA_MBUF*)pBuf;
+    pBuf += sizeof(MV_CESA_MBUF);
+
+    pMbuf->pFrags = (MV_BUF_INFO*)pBuf;
+
+    pMbuf->numFrags = 1;
+    pCmd->pSrc = pMbuf;
+    pCmd->pDst = pMbuf;
+/*
+    mvOsPrintf("CtrModeInit: pCmd=%p, pSrc=%p, pDst=%p, pFrags=%p\n",
+                pCmd, pCmd->pSrc, pCmd->pDst,
+                pMbuf->pFrags);
+*/
+    return pCmd;
+}
+
+/*******************************************************************************
+* mvCesaCtrModePrepare -
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_COMMAND *pCtrModeCmd, MV_CESA_COMMAND *pCmd
+*
+* RETURN:
+*       MV_STATUS
+*
+*******************************************************************************/
+static MV_STATUS    mvCesaCtrModePrepare(MV_CESA_COMMAND *pCtrModeCmd, MV_CESA_COMMAND *pCmd)
+{
+    MV_CESA_MBUF    *pMbuf;
+    MV_U8           *pBuf, *pIV;
+    MV_U32          counter, *pCounter;
+    int             cryptoSize = MV_ALIGN_UP(pCmd->cryptoLength, MV_CESA_AES_BLOCK_SIZE);
+/*
+    mvOsPrintf("CtrModePrepare: pCmd=%p, pCtrSrc=%p, pCtrDst=%p, pOrgCmd=%p, pOrgSrc=%p, pOrgDst=%p\n",
+                pCmd, pCmd->pSrc, pCmd->pDst,
+                pCtrModeCmd, pCtrModeCmd->pSrc, pCtrModeCmd->pDst);
+*/
+    pMbuf = pCtrModeCmd->pSrc;
+
+    /* Allocate buffer for Key stream */
+    pBuf = mvOsIoCachedMalloc(cesaOsHandle,cryptoSize, 
+			      &pMbuf->pFrags[0].bufPhysAddr,
+			      &pMbuf->pFrags[0].memHandle);
+    if(pBuf == NULL)
+    {
+        mvOsPrintf("mvCesaCtrModePrepare: Can't allocate %d bytes\n", cryptoSize);
+        return MV_OUT_OF_CPU_MEM;
+    }
+    memset(pBuf, 0, cryptoSize);
+    mvOsCacheFlush(NULL, pBuf, cryptoSize);
+
+    pMbuf->pFrags[0].bufVirtPtr = pBuf;
+    pMbuf->mbufSize = cryptoSize;
+    pMbuf->pFrags[0].bufSize = cryptoSize;
+
+    pCtrModeCmd->pReqPrv = pCmd->pReqPrv;
+    pCtrModeCmd->sessionId = pCmd->sessionId;
+
+    /* ivFromUser and ivOffset are don't care */
+    pCtrModeCmd->cryptoOffset = 0;
+    pCtrModeCmd->cryptoLength = cryptoSize;
+
+    /* digestOffset, macOffset and macLength are don't care */
+
+    mvCesaCopyFromMbuf(pBuf, pCmd->pSrc, pCmd->ivOffset, MV_CESA_AES_BLOCK_SIZE);
+    pCounter = (MV_U32*)(pBuf + (MV_CESA_AES_BLOCK_SIZE - sizeof(counter)));
+    counter = *pCounter;
+    counter = MV_32BIT_BE(counter);
+    pIV = pBuf;
+    cryptoSize -= MV_CESA_AES_BLOCK_SIZE;
+
+    /* fill key stream */
+    while(cryptoSize > 0)
+    {
+        pBuf += MV_CESA_AES_BLOCK_SIZE;
+        memcpy(pBuf, pIV, MV_CESA_AES_BLOCK_SIZE - sizeof(counter));
+        pCounter = (MV_U32*)(pBuf + (MV_CESA_AES_BLOCK_SIZE - sizeof(counter)));
+        counter++;
+        *pCounter = MV_32BIT_BE(counter);
+        cryptoSize -= MV_CESA_AES_BLOCK_SIZE;
+    }
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaCtrModeComplete -
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_COMMAND *pOrgCmd, MV_CESA_COMMAND *pCmd
+*
+* RETURN:
+*       MV_STATUS
+*
+*******************************************************************************/
+static MV_STATUS   mvCesaCtrModeComplete(MV_CESA_COMMAND *pOrgCmd, MV_CESA_COMMAND *pCmd)
+{
+    int         srcFrag, dstFrag, srcOffset, dstOffset, keyOffset, srcSize, dstSize;
+    int         cryptoSize = pCmd->cryptoLength;
+    MV_U8       *pSrc, *pDst, *pKey;
+    MV_STATUS   status = MV_OK;
+/*
+    mvOsPrintf("CtrModeComplete: pCmd=%p, pCtrSrc=%p, pCtrDst=%p, pOrgCmd=%p, pOrgSrc=%p, pOrgDst=%p\n",
+                pCmd, pCmd->pSrc, pCmd->pDst,
+                pOrgCmd, pOrgCmd->pSrc, pOrgCmd->pDst);
+*/
+    /* XOR source data with key stream to destination data */
+    pKey = pCmd->pDst->pFrags[0].bufVirtPtr;
+    keyOffset = 0;
+
+    if( (pOrgCmd->pSrc != pOrgCmd->pDst) &&
+        (pOrgCmd->cryptoOffset > 0) )
+    {
+        /* Copy Prefix from source buffer to destination buffer */
+
+        status = mvCesaMbufCopy(pOrgCmd->pDst, 0,
+                                pOrgCmd->pSrc, 0, pOrgCmd->cryptoOffset);
+/*
+        status = mvCesaCopyFromMbuf(tempBuf, pOrgCmd->pSrc,
+                       0, pOrgCmd->cryptoOffset);
+        status = mvCesaCopyToMbuf(tempBuf, pOrgCmd->pDst,
+                       0, pOrgCmd->cryptoOffset);
+*/
+    }
+
+    srcFrag = mvCesaMbufOffset(pOrgCmd->pSrc, pOrgCmd->cryptoOffset, &srcOffset);
+    pSrc = pOrgCmd->pSrc->pFrags[srcFrag].bufVirtPtr;
+    srcSize = pOrgCmd->pSrc->pFrags[srcFrag].bufSize;
+
+    dstFrag = mvCesaMbufOffset(pOrgCmd->pDst, pOrgCmd->cryptoOffset, &dstOffset);
+    pDst = pOrgCmd->pDst->pFrags[dstFrag].bufVirtPtr;
+    dstSize = pOrgCmd->pDst->pFrags[dstFrag].bufSize;
+
+    while(cryptoSize > 0)
+    {
+        pDst[dstOffset] = (pSrc[srcOffset] ^ pKey[keyOffset]);
+
+        cryptoSize--;
+        dstOffset++;
+        srcOffset++;
+        keyOffset++;
+
+        if(srcOffset >= srcSize)
+        {
+            srcFrag++;
+            srcOffset = 0;
+            pSrc = pOrgCmd->pSrc->pFrags[srcFrag].bufVirtPtr;
+            srcSize = pOrgCmd->pSrc->pFrags[srcFrag].bufSize;
+        }
+
+        if(dstOffset >= dstSize)
+        {
+            dstFrag++;
+            dstOffset = 0;
+            pDst = pOrgCmd->pDst->pFrags[dstFrag].bufVirtPtr;
+            dstSize = pOrgCmd->pDst->pFrags[dstFrag].bufSize;
+        }
+    }
+
+    if(pOrgCmd->pSrc != pOrgCmd->pDst)
+    {
+        /* Copy Suffix from source buffer to destination buffer */
+        srcOffset = pOrgCmd->cryptoOffset + pOrgCmd->cryptoLength;
+
+        if( (pOrgCmd->pDst->mbufSize - srcOffset) > 0)
+        {
+            status = mvCesaMbufCopy(pOrgCmd->pDst, srcOffset,
+                                    pOrgCmd->pSrc, srcOffset,
+                                    pOrgCmd->pDst->mbufSize - srcOffset);
+        }
+
+/*
+        status = mvCesaCopyFromMbuf(tempBuf, pOrgCmd->pSrc,
+                                srcOffset, pOrgCmd->pSrc->mbufSize - srcOffset);
+        status = mvCesaCopyToMbuf(tempBuf, pOrgCmd->pDst,
+                       srcOffset, pOrgCmd->pDst->mbufSize - srcOffset);
+*/
+    }
+
+    /* Free buffer used for Key stream */
+    mvOsIoCachedFree(cesaOsHandle,pCmd->pDst->pFrags[0].bufSize,
+		     pCmd->pDst->pFrags[0].bufPhysAddr,
+                     pCmd->pDst->pFrags[0].bufVirtPtr,
+		     pCmd->pDst->pFrags[0].memHandle);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaCtrModeFinish -
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_COMMAND* pCmd
+*
+* RETURN:
+*       MV_STATUS
+*
+*******************************************************************************/
+static void    mvCesaCtrModeFinish(MV_CESA_COMMAND* pCmd)
+{
+    mvOsFree(pCmd);
+}
+
+/*******************************************************************************
+* mvCesaParamCheck -
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd, MV_U8* pFixOffset
+*
+* RETURN:
+*       MV_STATUS
+*
+*******************************************************************************/
+static MV_STATUS   mvCesaParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd,
+                                    MV_U8* pFixOffset)
+{
+    MV_U8   fixOffset = 0xFF;
+
+    /* Check AUTH operation parameters */
+    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET)) )
+    {
+        /* MAC offset should be at least 4 byte aligned */
+        if( MV_IS_NOT_ALIGN(pCmd->macOffset, 4) )
+        {
+            mvOsPrintf("mvCesaAction: macOffset %d must be 4 byte aligned\n",
+                    pCmd->macOffset);
+            return MV_BAD_PARAM;
+        }
+        /* Digest offset must be 4 byte aligned */
+        if( MV_IS_NOT_ALIGN(pCmd->digestOffset, 4) )
+        {
+            mvOsPrintf("mvCesaAction: digestOffset %d must be 4 byte aligned\n",
+                    pCmd->digestOffset);
+            return MV_BAD_PARAM;
+        }
+        /* In addition all offsets should be the same alignment: 8 or 4 */
+        if(fixOffset == 0xFF)
+        {
+            fixOffset = (pCmd->macOffset % 8);
+        }
+        else
+        {
+            if( (pCmd->macOffset % 8) != fixOffset)
+            {
+                mvOsPrintf("mvCesaAction: macOffset %d mod 8 must be equal %d\n",
+                                pCmd->macOffset, fixOffset);
+                return MV_BAD_PARAM;
+            }
+        }
+        if( (pCmd->digestOffset % 8) != fixOffset)
+        {
+            mvOsPrintf("mvCesaAction: digestOffset %d mod 8 must be equal %d\n",
+                                pCmd->digestOffset, fixOffset);
+            return MV_BAD_PARAM;
+        }
+    }
+    /* Check CRYPTO operation parameters */
+    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET)) )
+    {
+        /* CryptoOffset should be at least 4 byte aligned */
+        if( MV_IS_NOT_ALIGN(pCmd->cryptoOffset, 4)  )
+        {
+            mvOsPrintf("CesaAction: cryptoOffset=%d must be 4 byte aligned\n",
+                        pCmd->cryptoOffset);
+            return MV_BAD_PARAM;
+        }
+        /* cryptoLength should be the whole number of blocks */
+        if( MV_IS_NOT_ALIGN(pCmd->cryptoLength, pSA->cryptoBlockSize) )
+        {
+            mvOsPrintf("mvCesaAction: cryptoLength=%d must be %d byte aligned\n",
+                        pCmd->cryptoLength, pSA->cryptoBlockSize);
+            return MV_BAD_PARAM;
+        }
+        if(fixOffset == 0xFF)
+        {
+            fixOffset = (pCmd->cryptoOffset % 8);
+        }
+        else
+        {
+            /* In addition all offsets should be the same alignment: 8 or 4 */
+            if( (pCmd->cryptoOffset % 8) != fixOffset)
+            {
+                mvOsPrintf("mvCesaAction: cryptoOffset %d mod 8 must be equal %d \n",
+                                pCmd->cryptoOffset, fixOffset);
+                return MV_BAD_PARAM;
+            }
+        }
+
+        /* check for CBC mode */
+        if(pSA->cryptoIvSize > 0)
+        {
+            /* cryptoIV must not be part of CryptoLength */
+            if( ((pCmd->ivOffset + pSA->cryptoIvSize) > pCmd->cryptoOffset) &&
+                (pCmd->ivOffset < (pCmd->cryptoOffset + pCmd->cryptoLength)) )
+            {
+                mvOsPrintf("mvCesaFragParamCheck: cryptoIvOffset (%d) is part of cryptoLength (%d+%d)\n",
+                        pCmd->ivOffset, pCmd->macOffset, pCmd->macLength);
+                return MV_BAD_PARAM;
+            }
+
+            /* ivOffset must be 4 byte aligned */
+            if( MV_IS_NOT_ALIGN(pCmd->ivOffset, 4) )
+            {
+                mvOsPrintf("CesaAction: ivOffset=%d must be 4 byte aligned\n",
+                            pCmd->ivOffset);
+                return MV_BAD_PARAM;
+            }
+            /* In addition all offsets should be the same alignment: 8 or 4 */
+            if( (pCmd->ivOffset % 8) != fixOffset)
+            {
+                mvOsPrintf("mvCesaAction: ivOffset %d mod 8 must be %d\n",
+                                pCmd->ivOffset, fixOffset);
+                return MV_BAD_PARAM;
+            }
+        }
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaFragParamCheck -
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd
+*
+* RETURN:
+*       MV_STATUS
+*
+*******************************************************************************/
+static MV_STATUS   mvCesaFragParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd)
+{
+    int     offset;
+
+    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET)) )
+    {
+        /* macOffset must be less that SRAM buffer size */
+        if(pCmd->macOffset > (sizeof(cesaSramVirtPtr->buf) - MV_CESA_AUTH_BLOCK_SIZE))
+        {
+            mvOsPrintf("mvCesaFragParamCheck: macOffset is too large (%d)\n",
+                        pCmd->macOffset);
+            return MV_BAD_PARAM;
+        }
+        /* macOffset+macSize must be more than mbufSize - SRAM buffer size */
+        if( ((pCmd->macOffset + pCmd->macLength) > pCmd->pSrc->mbufSize) ||
+            ((pCmd->pSrc->mbufSize - (pCmd->macOffset + pCmd->macLength)) >=
+             sizeof(cesaSramVirtPtr->buf)) )
+        {
+            mvOsPrintf("mvCesaFragParamCheck: macLength is too large (%d), mbufSize=%d\n",
+                        pCmd->macLength, pCmd->pSrc->mbufSize);
+            return MV_BAD_PARAM;
+        }
+    }
+
+    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET)) )
+    {
+        /* cryptoOffset must be less that SRAM buffer size */
+        /* 4 for possible fixOffset */
+        if( (pCmd->cryptoOffset + 4) > (sizeof(cesaSramVirtPtr->buf) - pSA->cryptoBlockSize))
+        {
+            mvOsPrintf("mvCesaFragParamCheck: cryptoOffset is too large (%d)\n",
+                        pCmd->cryptoOffset);
+            return MV_BAD_PARAM;
+        }
+
+        /* cryptoOffset+cryptoSize must be more than mbufSize - SRAM buffer size */
+        if( ((pCmd->cryptoOffset + pCmd->cryptoLength) > pCmd->pSrc->mbufSize) ||
+            ((pCmd->pSrc->mbufSize - (pCmd->cryptoOffset + pCmd->cryptoLength)) >=
+             (sizeof(cesaSramVirtPtr->buf) - pSA->cryptoBlockSize)) )
+        {
+            mvOsPrintf("mvCesaFragParamCheck: cryptoLength is too large (%d), mbufSize=%d\n",
+                        pCmd->cryptoLength, pCmd->pSrc->mbufSize);
+            return MV_BAD_PARAM;
+        }
+    }
+
+    /* When MAC_THEN_CRYPTO or CRYPTO_THEN_MAC */
+    if( ((pSA->config & MV_CESA_OPERATION_MASK) ==
+            (MV_CESA_MAC_THEN_CRYPTO << MV_CESA_OPERATION_OFFSET)) ||
+        ((pSA->config & MV_CESA_OPERATION_MASK) ==
+            (MV_CESA_CRYPTO_THEN_MAC << MV_CESA_OPERATION_OFFSET)) )
+    {
+        if( (mvCtrlModelGet() == MV_5182_DEV_ID) ||
+            ( (mvCtrlModelGet() == MV_5181_DEV_ID) &&
+              (mvCtrlRevGet() >= MV_5181L_A0_REV)  &&
+              (pCmd->macLength >= (1 << 14)) ) )
+        {
+            return MV_NOT_ALLOWED;
+        }
+
+        /* abs(cryptoOffset-macOffset) must be aligned cryptoBlockSize */
+        if(pCmd->cryptoOffset > pCmd->macOffset)
+        {
+            offset = pCmd->cryptoOffset - pCmd->macOffset;
+        }
+        else
+        {
+            offset = pCmd->macOffset - pCmd->cryptoOffset;
+        }
+
+        if( MV_IS_NOT_ALIGN(offset,  pSA->cryptoBlockSize) )
+        {
+/*
+            mvOsPrintf("mvCesaFragParamCheck: (cryptoOffset - macOffset) must be %d byte aligned\n",
+                        pSA->cryptoBlockSize);
+*/
+            return MV_NOT_ALLOWED;
+        }
+        /* Digest must not be part of CryptoLength */
+        if( ((pCmd->digestOffset + pSA->digestSize) > pCmd->cryptoOffset) &&
+            (pCmd->digestOffset < (pCmd->cryptoOffset + pCmd->cryptoLength)) )
+        {
+/*
+            mvOsPrintf("mvCesaFragParamCheck: digestOffset (%d) is part of cryptoLength (%d+%d)\n",
+                        pCmd->digestOffset, pCmd->cryptoOffset, pCmd->cryptoLength);
+*/
+            return MV_NOT_ALLOWED;
+        }
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCesaFragSizeFind -
+*
+* DESCRIPTION:
+*
+*
+* INPUT:
+*       MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd,
+*       int cryptoOffset, int macOffset,
+*
+* OUTPUT:
+*       int* pCopySize, int* pCryptoDataSize, int* pMacDataSize
+*
+* RETURN:
+*       MV_STATUS
+*
+*******************************************************************************/
+static void   mvCesaFragSizeFind(MV_CESA_SA* pSA, MV_CESA_REQ* pReq,
+                                 int cryptoOffset, int macOffset,
+                          int* pCopySize, int* pCryptoDataSize, int* pMacDataSize)
+{
+    MV_CESA_COMMAND *pCmd = pReq->pCmd;
+    int             cryptoDataSize, macDataSize, copySize;
+
+    cryptoDataSize = macDataSize = 0;
+    copySize = *pCopySize;
+
+    if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET) )
+    {
+        cryptoDataSize = MV_MIN( (copySize - cryptoOffset),
+                                 (pCmd->cryptoLength - (pReq->frags.cryptoSize + 1)) );
+
+        /* cryptoSize for each fragment must be the whole number of blocksSize */
+        if( MV_IS_NOT_ALIGN(cryptoDataSize, pSA->cryptoBlockSize) )
+        {
+            cryptoDataSize = MV_ALIGN_DOWN(cryptoDataSize, pSA->cryptoBlockSize);
+            copySize = cryptoOffset + cryptoDataSize;
+        }
+    }
+    if( (pSA->config & MV_CESA_OPERATION_MASK) !=
+             (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
+    {
+        macDataSize = MV_MIN( (copySize - macOffset),
+                              (pCmd->macLength - (pReq->frags.macSize + 1)));
+
+        /* macSize for each fragment (except last) must be the whole number of blocksSize */
+        if( MV_IS_NOT_ALIGN(macDataSize, MV_CESA_AUTH_BLOCK_SIZE) )
+        {
+            macDataSize = MV_ALIGN_DOWN(macDataSize, MV_CESA_AUTH_BLOCK_SIZE);
+            copySize = macOffset + macDataSize;
+        }
+        cryptoDataSize = copySize - cryptoOffset;
+    }
+    *pCopySize = copySize;
+
+    if(pCryptoDataSize != NULL)
+        *pCryptoDataSize = cryptoDataSize;
+
+    if(pMacDataSize != NULL)
+        *pMacDataSize = macDataSize;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.h
new file mode 100644
index 00000000..c0abc9b7
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesa.h
@@ -0,0 +1,412 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvCesa.h - Header File for Cryptographic Engines and Security Accelerator
+*
+* DESCRIPTION:
+*       This header file contains macros typedefs and function declaration for
+*       the Marvell Cryptographic Engines and Security Accelerator.
+*
+*******************************************************************************/
+
+#ifndef __mvCesa_h__
+#define __mvCesa_h__
+
+#include "mvOs.h"
+#include "mvCommon.h"
+#include "mvDebug.h"
+
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+
+#include "cesa/mvMD5.h"
+#include "cesa/mvSHA1.h"
+
+#include "cesa/mvCesa.h"
+#include "cesa/AES/mvAes.h"
+#include "mvSysHwConfig.h"
+
+#ifdef MV_INCLUDE_IDMA
+#include "idma/mvIdma.h"
+#include "idma/mvIdmaRegs.h"
+#else
+/* Redefine MV_DMA_DESC structure */
+typedef struct _mvDmaDesc
+{
+    MV_U32 	byteCnt;        /* The total number of bytes to transfer        */
+    MV_U32 	phySrcAdd;	    /* The physical source address                  */
+    MV_U32 	phyDestAdd;     /* The physical destination address             */
+    MV_U32	phyNextDescPtr; /* If we are using chain mode DMA transfer,     */
+				            /* then this pointer should point to the        */
+                            /* physical address of the next descriptor,     */
+                            /* otherwise it should be NULL.                 */
+}MV_DMA_DESC;
+#endif /* MV_INCLUDE_IDMA */
+
+#include "cesa/mvCesaRegs.h"
+
+#define MV_CESA_AUTH_BLOCK_SIZE         64 /* bytes */
+
+#define MV_CESA_MD5_DIGEST_SIZE         16 /* bytes */
+#define MV_CESA_SHA1_DIGEST_SIZE        20 /* bytes */
+
+#define MV_CESA_MAX_DIGEST_SIZE         MV_CESA_SHA1_DIGEST_SIZE
+
+#define MV_CESA_DES_KEY_LENGTH          8   /* bytes = 64 bits */
+#define MV_CESA_3DES_KEY_LENGTH         24  /* bytes = 192 bits */
+#define MV_CESA_AES_128_KEY_LENGTH      16  /* bytes = 128 bits */
+#define MV_CESA_AES_192_KEY_LENGTH      24  /* bytes = 192 bits */
+#define MV_CESA_AES_256_KEY_LENGTH      32  /* bytes = 256 bits */
+
+#define MV_CESA_MAX_CRYPTO_KEY_LENGTH   MV_CESA_AES_256_KEY_LENGTH
+
+#define MV_CESA_DES_BLOCK_SIZE          8 /* bytes = 64 bits */
+#define MV_CESA_3DES_BLOCK_SIZE         8 /* bytes = 64 bits */
+
+#define MV_CESA_AES_BLOCK_SIZE          16 /* bytes = 128 bits */
+
+#define MV_CESA_MAX_IV_LENGTH           MV_CESA_AES_BLOCK_SIZE
+
+#define MV_CESA_MAX_MAC_KEY_LENGTH      64 /* bytes */
+
+typedef struct
+{
+	MV_U8               cryptoKey[MV_CESA_MAX_CRYPTO_KEY_LENGTH];
+	MV_U8               macKey[MV_CESA_MAX_MAC_KEY_LENGTH];
+	MV_CESA_OPERATION   operation;
+	MV_CESA_DIRECTION   direction;
+	MV_CESA_CRYPTO_ALG  cryptoAlgorithm;
+	MV_CESA_CRYPTO_MODE cryptoMode;
+   	MV_U8               cryptoKeyLength;
+	MV_CESA_MAC_MODE    macMode;
+	MV_U8               macKeyLength;
+	MV_U8               digestSize;
+
+} MV_CESA_OPEN_SESSION;
+
+typedef struct
+{
+    MV_BUF_INFO *pFrags;
+	MV_U16	    numFrags;
+    MV_U16      mbufSize;
+
+} MV_CESA_MBUF;
+
+typedef struct
+{
+    void* 	pReqPrv; /* instead of reqId */
+    MV_U32 	retCode;
+    MV_16   sessionId;
+
+} MV_CESA_RESULT;
+
+typedef void    (*MV_CESA_CALLBACK) (MV_CESA_RESULT* pResult);
+
+
+typedef struct
+{
+    void*               pReqPrv;    /* instead of reqId */
+    MV_CESA_MBUF*       pSrc;
+    MV_CESA_MBUF*       pDst;
+    MV_CESA_CALLBACK*   pFuncCB;
+    MV_16               sessionId;
+    MV_U16              ivFromUser;
+    MV_U16              ivOffset;
+    MV_U16              cryptoOffset;
+    MV_U16              cryptoLength;
+    MV_U16              digestOffset;
+    MV_U16              macOffset;
+    MV_U16              macLength;
+    MV_BOOL		skipFlush;
+} MV_CESA_COMMAND;
+
+
+
+MV_STATUS   mvCesaHalInit (int numOfSession, int queueDepth, char* pSramBase, MV_U32 cryptEngBase, void *osHandle);
+MV_STATUS   mvCesaFinish (void);
+MV_STATUS   mvCesaSessionOpen(MV_CESA_OPEN_SESSION *pSession, short* pSid);
+MV_STATUS   mvCesaSessionClose(short sid);
+MV_STATUS   mvCesaCryptoIvSet(MV_U8* pIV, int ivSize);
+
+MV_STATUS   mvCesaAction (MV_CESA_COMMAND* pCmd);
+
+MV_U32      mvCesaInProcessGet(void);
+MV_STATUS   mvCesaReadyDispatch(void);
+MV_STATUS   mvCesaReadyGet(MV_CESA_RESULT* pResult);
+MV_BOOL     mvCesaIsReady(void);
+
+int     	mvCesaMbufOffset(MV_CESA_MBUF* pMbuf, int offset, int* pBufOffset);
+MV_STATUS   mvCesaCopyFromMbuf(MV_U8* pDst, MV_CESA_MBUF* pSrcMbuf,
+                               int offset, int size);
+MV_STATUS   mvCesaCopyToMbuf(MV_U8* pSrc, MV_CESA_MBUF* pDstMbuf,
+                               int offset, int size);
+MV_STATUS   mvCesaMbufCopy(MV_CESA_MBUF* pMbufDst, int dstMbufOffset,
+                           MV_CESA_MBUF* pMbufSrc, int srcMbufOffset, int size);
+
+/********** Debug functions ********/
+
+void        mvCesaDebugMbuf(const char* str, MV_CESA_MBUF *pMbuf, int offset, int size);
+void        mvCesaDebugSA(short sid, int mode);
+void        mvCesaDebugStats(void);
+void        mvCesaDebugStatsClear(void);
+void        mvCesaDebugRegs(void);
+void        mvCesaDebugStatus(void);
+void        mvCesaDebugQueue(int mode);
+void        mvCesaDebugSram(int mode);
+void        mvCesaDebugSAD(int mode);
+
+
+/********  CESA Private definitions ********/
+#if (MV_CESA_VERSION >= 2)
+#if (MV_CACHE_COHERENCY  == MV_CACHE_COHER_SW)
+#define MV_CESA_TDMA_CTRL_VALUE       MV_CESA_TDMA_DST_BURST_MASK(MV_CESA_TDMA_BURST_128B) \
+                                    | MV_CESA_TDMA_SRC_BURST_MASK(MV_CESA_TDMA_BURST_128B) \
+                                    | MV_CESA_TDMA_OUTSTAND_READ_EN_MASK                   \
+				    | MV_CESA_TDMA_NO_BYTE_SWAP_MASK			   \
+                                    | MV_CESA_TDMA_ENABLE_MASK
+#else
+#define MV_CESA_TDMA_CTRL_VALUE       MV_CESA_TDMA_DST_BURST_MASK(MV_CESA_TDMA_BURST_32B)  \
+                                    | MV_CESA_TDMA_SRC_BURST_MASK(MV_CESA_TDMA_BURST_128B) \
+                                    /*| MV_CESA_TDMA_OUTSTAND_READ_EN_MASK                   */\
+                                    | MV_CESA_TDMA_ENABLE_MASK
+
+#endif
+#else
+#define MV_CESA_IDMA_CTRL_LOW_VALUE   ICCLR_DST_BURST_LIM_128BYTE   \
+                                    | ICCLR_SRC_BURST_LIM_128BYTE   \
+                                    | ICCLR_INT_MODE_MASK           \
+                                    | ICCLR_BLOCK_MODE              \
+                                    | ICCLR_CHAN_ENABLE             \
+                                    | ICCLR_DESC_MODE_16M
+#endif /* MV_CESA_VERSION >= 2 */
+
+#define MV_CESA_MAX_PKT_SIZE        (64 * 1024)
+#define MV_CESA_MAX_MBUF_FRAGS      20
+
+#define MV_CESA_MAX_REQ_FRAGS       ( (MV_CESA_MAX_PKT_SIZE / MV_CESA_MAX_BUF_SIZE) + 1)
+
+#define MV_CESA_MAX_DMA_DESC    (MV_CESA_MAX_MBUF_FRAGS*2 + 5)
+
+#define MAX_CESA_CHAIN_LENGTH	20
+
+typedef enum
+{
+    MV_CESA_IDLE     = 0,
+    MV_CESA_PENDING,
+    MV_CESA_PROCESS,
+    MV_CESA_READY,
+#if (MV_CESA_VERSION >= 3)
+    MV_CESA_CHAIN,
+#endif
+} MV_CESA_STATE;
+
+
+/* Session database */
+
+/* Map of Key materials of the session in SRAM.
+ * Each field must be 8 byte aligned
+ * Total size: 32 + 24 + 24 = 80 bytes
+ */
+typedef struct
+{
+    MV_U8  cryptoKey[MV_CESA_MAX_CRYPTO_KEY_LENGTH];
+    MV_U8  macInnerIV[MV_CESA_MAX_DIGEST_SIZE];
+    MV_U8  reservedInner[4];
+    MV_U8  macOuterIV[MV_CESA_MAX_DIGEST_SIZE];
+    MV_U8  reservedOuter[4];
+
+} MV_CESA_SRAM_SA;
+
+typedef struct
+{
+    MV_CESA_SRAM_SA*    pSramSA;
+    MV_U32              config;
+    MV_U8               cryptoKeyLength;
+    MV_U8               cryptoIvSize;
+    MV_U8               cryptoBlockSize;
+    MV_U8               digestSize;
+    MV_U8               macKeyLength;
+    MV_U8               valid;
+    MV_U8               ctrMode;
+    MV_U32              count;
+
+} MV_CESA_SA;
+
+/* DMA list management */
+typedef struct
+{
+    MV_DMA_DESC*    pDmaFirst;
+    MV_DMA_DESC*    pDmaLast;
+
+} MV_CESA_DMA;
+
+
+typedef struct
+{
+    MV_U8               numFrag;
+    MV_U8               nextFrag;
+    int                 bufOffset;
+    int                 cryptoSize;
+    int                 macSize;
+    int                 newDigestOffset;
+    MV_U8               orgDigest[MV_CESA_MAX_DIGEST_SIZE];
+
+} MV_CESA_FRAGS;
+
+/* Request queue */
+typedef struct
+{
+    MV_U8               state;
+    MV_U8               fragMode;
+    MV_U8               fixOffset;
+    MV_CESA_COMMAND*    pCmd;
+    MV_CESA_COMMAND*    pOrgCmd;
+    MV_BUF_INFO         dmaDescBuf;
+    MV_CESA_DMA         dma[MV_CESA_MAX_REQ_FRAGS];
+    MV_BUF_INFO         cesaDescBuf;
+    MV_CESA_DESC*       pCesaDesc;
+    MV_CESA_FRAGS       frags;
+
+
+} MV_CESA_REQ;
+
+
+/* SRAM map */
+/* Total SRAM size calculation */
+/*  SRAM size =
+ *              MV_CESA_MAX_BUF_SIZE  +
+ *              sizeof(MV_CESA_DESC)  +
+ *              MV_CESA_MAX_IV_LENGTH +
+ *              MV_CESA_MAX_IV_LENGTH +
+ *              MV_CESA_MAX_DIGEST_SIZE +
+ *              sizeof(MV_CESA_SRAM_SA)
+ *            = 1600 + 32 + 16 + 16 + 24 + 80 + 280 (reserved) = 2048 bytes
+ *            = 3200 + 32 + 16 + 16 + 24 + 80 + 728 (reserved) = 4096 bytes
+ */
+typedef struct
+{
+    MV_U8               buf[MV_CESA_MAX_BUF_SIZE];
+    MV_CESA_DESC        desc;
+    MV_U8               cryptoIV[MV_CESA_MAX_IV_LENGTH];
+    MV_U8               tempCryptoIV[MV_CESA_MAX_IV_LENGTH];
+    MV_U8               tempDigest[MV_CESA_MAX_DIGEST_SIZE+4];
+    MV_CESA_SRAM_SA     sramSA;
+
+} MV_CESA_SRAM_MAP;
+
+
+typedef struct
+{
+    MV_U32  openedCount;
+    MV_U32  closedCount;
+    MV_U32  fragCount;
+    MV_U32  reqCount;
+    MV_U32  maxReqCount;
+    MV_U32  procCount;
+    MV_U32  readyCount;
+    MV_U32  notReadyCount;
+    MV_U32  startCount;
+#if (MV_CESA_VERSION >= 3)
+    MV_U32  maxChainUsage;
+#endif
+
+} MV_CESA_STATS;
+
+
+/* External variables */
+
+extern MV_CESA_STATS    cesaStats;
+extern MV_CESA_FRAGS    cesaFrags;
+
+extern MV_BUF_INFO      cesaSramSaBuf;
+
+extern MV_CESA_SA*       pCesaSAD;
+extern MV_U16            cesaMaxSA;
+
+extern MV_CESA_REQ*      pCesaReqFirst;
+extern MV_CESA_REQ*      pCesaReqLast;
+extern MV_CESA_REQ*      pCesaReqEmpty;
+extern MV_CESA_REQ*      pCesaReqProcess;
+extern int               cesaQueueDepth;
+extern int               cesaReqResources;
+#if (MV_CESA_VERSION>= 3)
+extern MV_U32		cesaChainLength;
+#endif
+
+extern MV_CESA_SRAM_MAP*  cesaSramVirtPtr;
+extern MV_U32           cesaSramPhysAddr;
+
+static INLINE MV_ULONG  mvCesaVirtToPhys(MV_BUF_INFO* pBufInfo, void* pVirt)
+{
+    return (pBufInfo->bufPhysAddr + ((MV_U8*)pVirt - pBufInfo->bufVirtPtr));
+}
+
+/* Additional DEBUG functions */
+void        mvCesaDebugSramSA(MV_CESA_SRAM_SA* pSramSA, int mode);
+void        mvCesaDebugCmd(MV_CESA_COMMAND* pCmd,  int mode);
+void        mvCesaDebugDescriptor(MV_CESA_DESC* pDesc);
+
+
+
+#endif /* __mvCesa_h__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c
new file mode 100644
index 00000000..31b78a80
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c
@@ -0,0 +1,484 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvOs.h"
+#include "mvDebug.h"
+
+#include "cesa/mvMD5.h"
+#include "cesa/mvSHA1.h"
+
+#include "cesa/mvCesa.h"
+#include "cesa/mvCesaRegs.h"
+#include "cesa/AES/mvAes.h"
+
+static const char*   mvCesaDebugStateStr(MV_CESA_STATE state)
+{
+    switch(state)
+    {
+        case MV_CESA_IDLE:
+            return "Idle";
+
+        case MV_CESA_PENDING:
+            return "Pend";
+
+        case MV_CESA_PROCESS:
+            return "Proc";
+
+        case MV_CESA_READY:
+            return "Ready";
+
+        default:
+            break;
+    }
+    return "Unknown";
+}
+
+static const char*   mvCesaDebugOperStr(MV_CESA_OPERATION oper)
+{
+    switch(oper)
+    {
+        case MV_CESA_MAC_ONLY:
+            return "MacOnly";
+
+        case MV_CESA_CRYPTO_ONLY:
+            return "CryptoOnly";
+
+        case MV_CESA_MAC_THEN_CRYPTO:
+            return "MacCrypto";
+
+        case MV_CESA_CRYPTO_THEN_MAC:
+            return "CryptoMac";
+
+        default:
+            break;
+    }
+    return "Null";
+}
+
+static const char* mvCesaDebugCryptoAlgStr(MV_CESA_CRYPTO_ALG cryptoAlg)
+{
+    switch(cryptoAlg)
+    {
+        case MV_CESA_CRYPTO_DES:
+            return "DES";
+
+        case MV_CESA_CRYPTO_3DES:
+            return "3DES";
+
+        case MV_CESA_CRYPTO_AES:
+            return "AES";
+
+        default:
+            break;
+    }
+    return "Null";
+}
+
+static const char* mvCesaDebugMacModeStr(MV_CESA_MAC_MODE macMode)
+{
+    switch(macMode)
+    {
+        case MV_CESA_MAC_MD5:
+            return "MD5";
+
+        case MV_CESA_MAC_SHA1:
+            return "SHA1";
+
+        case MV_CESA_MAC_HMAC_MD5:
+            return "HMAC-MD5";
+
+        case MV_CESA_MAC_HMAC_SHA1:
+            return "HMAC_SHA1";
+
+        default:
+            break;
+    }
+    return "Null";
+}
+
+void    mvCesaDebugCmd(MV_CESA_COMMAND* pCmd,  int mode)
+{
+    mvOsPrintf("pCmd=%p, pReqPrv=%p, pSrc=%p, pDst=%p, pCB=%p, sid=%d\n",
+                pCmd, pCmd->pReqPrv, pCmd->pSrc, pCmd->pDst,
+                pCmd->pFuncCB, pCmd->sessionId);
+    mvOsPrintf("isUser=%d, ivOffs=%d, crOffs=%d, crLen=%d, digest=%d, macOffs=%d, macLen=%d\n",
+                pCmd->ivFromUser, pCmd->ivOffset, pCmd->cryptoOffset, pCmd->cryptoLength,
+                pCmd->digestOffset, pCmd->macOffset, pCmd->macLength);
+}
+
+/* no need to use in tool */
+void     mvCesaDebugMbuf(const char* str, MV_CESA_MBUF *pMbuf, int offset, int size)
+{
+    int frag, len, fragOffset;
+
+    if(str != NULL)
+        mvOsPrintf("%s: pMbuf=%p, numFrags=%d, mbufSize=%d\n",
+                    str, pMbuf, pMbuf->numFrags, pMbuf->mbufSize);
+
+    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
+    if(frag == MV_INVALID)
+    {
+        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
+        return;
+    }
+
+    for(; frag<pMbuf->numFrags; frag++)
+    {
+        mvOsPrintf("#%2d. bufVirt=%p, bufSize=%d\n",
+                    frag, pMbuf->pFrags[frag].bufVirtPtr,
+                    pMbuf->pFrags[frag].bufSize);
+        if(size > 0)
+        {
+            len = MV_MIN(pMbuf->pFrags[frag].bufSize, size);
+            mvDebugMemDump(pMbuf->pFrags[frag].bufVirtPtr+fragOffset, len, 1);
+            size -= len;
+            fragOffset = 0;
+        }
+    }
+}
+
+void    mvCesaDebugRegs(void)
+{
+    mvOsPrintf("\t CESA Registers:\n");
+
+    mvOsPrintf("MV_CESA_CMD_REG                     : 0x%X = 0x%08x\n",
+                MV_CESA_CMD_REG,
+                MV_REG_READ( MV_CESA_CMD_REG ) );
+
+    mvOsPrintf("MV_CESA_CHAN_DESC_OFFSET_REG        : 0x%X = 0x%08x\n",
+                MV_CESA_CHAN_DESC_OFFSET_REG,
+                MV_REG_READ(MV_CESA_CHAN_DESC_OFFSET_REG) );
+
+    mvOsPrintf("MV_CESA_CFG_REG                     : 0x%X = 0x%08x\n",
+                MV_CESA_CFG_REG,
+                MV_REG_READ( MV_CESA_CFG_REG ) );
+
+    mvOsPrintf("MV_CESA_STATUS_REG                  : 0x%X = 0x%08x\n",
+                MV_CESA_STATUS_REG,
+                MV_REG_READ( MV_CESA_STATUS_REG ) );
+
+    mvOsPrintf("MV_CESA_ISR_CAUSE_REG               : 0x%X = 0x%08x\n",
+                MV_CESA_ISR_CAUSE_REG,
+                MV_REG_READ( MV_CESA_ISR_CAUSE_REG ) );
+
+    mvOsPrintf("MV_CESA_ISR_MASK_REG                : 0x%X = 0x%08x\n",
+                MV_CESA_ISR_MASK_REG,
+                MV_REG_READ( MV_CESA_ISR_MASK_REG ) );
+#if (MV_CESA_VERSION >= 2)
+    mvOsPrintf("MV_CESA_TDMA_CTRL_REG               : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_CTRL_REG, 
+                MV_REG_READ( MV_CESA_TDMA_CTRL_REG ) );
+
+    mvOsPrintf("MV_CESA_TDMA_BYTE_COUNT_REG         : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_BYTE_COUNT_REG, 
+                MV_REG_READ( MV_CESA_TDMA_BYTE_COUNT_REG ) );
+
+    mvOsPrintf("MV_CESA_TDMA_SRC_ADDR_REG           : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_SRC_ADDR_REG, 
+                MV_REG_READ( MV_CESA_TDMA_SRC_ADDR_REG ) );
+
+    mvOsPrintf("MV_CESA_TDMA_DST_ADDR_REG           : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_DST_ADDR_REG, 
+                MV_REG_READ( MV_CESA_TDMA_DST_ADDR_REG ) );
+
+    mvOsPrintf("MV_CESA_TDMA_NEXT_DESC_PTR_REG      : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_NEXT_DESC_PTR_REG, 
+                MV_REG_READ( MV_CESA_TDMA_NEXT_DESC_PTR_REG ) );
+
+    mvOsPrintf("MV_CESA_TDMA_CURR_DESC_PTR_REG      : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_CURR_DESC_PTR_REG, 
+                MV_REG_READ( MV_CESA_TDMA_CURR_DESC_PTR_REG ) );
+
+    mvOsPrintf("MV_CESA_TDMA_ERROR_CAUSE_REG        : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_ERROR_CAUSE_REG, 
+                MV_REG_READ( MV_CESA_TDMA_ERROR_CAUSE_REG ) );
+
+    mvOsPrintf("MV_CESA_TDMA_ERROR_MASK_REG         : 0x%X = 0x%08x\n", 
+                MV_CESA_TDMA_ERROR_MASK_REG, 
+                MV_REG_READ( MV_CESA_TDMA_ERROR_CAUSE_REG ) );
+
+#endif
+}
+
+void    mvCesaDebugStatus(void)
+{
+    mvOsPrintf("\n\t CESA Status\n\n");
+
+    mvOsPrintf("pReqQ=%p, qDepth=%d, reqSize=%ld bytes, qRes=%d, ",
+                pCesaReqFirst, cesaQueueDepth, sizeof(MV_CESA_REQ),
+                cesaReqResources);
+#if (MV_CESA_VERSION >= 3)
+    mvOsPrintf("chainLength=%u\n",cesaChainLength);
+#else
+   mvOsPrintf("\n"); 	
+#endif
+
+    mvOsPrintf("pSAD=%p, maxSA=%d, sizeSA=%ld bytes\n",
+                pCesaSAD, cesaMaxSA, sizeof(MV_CESA_SA));
+
+    mvOsPrintf("\n");
+
+    mvCesaDebugRegs();
+    mvCesaDebugStats();
+    mvCesaDebugStatsClear();
+}
+
+void    mvCesaDebugDescriptor(MV_CESA_DESC* pDesc)
+{
+    mvOsPrintf("config=0x%08x, crSrcOffs=0x%04x, crDstOffs=0x%04x\n",
+            pDesc->config, pDesc->cryptoSrcOffset, pDesc->cryptoDstOffset);
+
+    mvOsPrintf("crLen=0x%04x, crKeyOffs=0x%04x, ivOffs=0x%04x, ivBufOffs=0x%04x\n",
+            pDesc->cryptoDataLen, pDesc->cryptoKeyOffset,
+            pDesc->cryptoIvOffset, pDesc->cryptoIvBufOffset);
+
+    mvOsPrintf("macSrc=0x%04x, digest=0x%04x, macLen=0x%04x, inIv=0x%04x, outIv=0x%04x\n",
+            pDesc->macSrcOffset, pDesc->macDigestOffset, pDesc->macDataLen,
+            pDesc->macInnerIvOffset, pDesc->macOuterIvOffset);
+}
+
+void    mvCesaDebugQueue(int mode)
+{
+    mvOsPrintf("\n\t CESA Request Queue:\n\n");
+
+    mvOsPrintf("pFirstReq=%p, pLastReq=%p, qDepth=%d, reqSize=%ld bytes\n",
+                pCesaReqFirst, pCesaReqLast, cesaQueueDepth, sizeof(MV_CESA_REQ));
+
+    mvOsPrintf("pEmpty=%p, pProcess=%p, qResources=%d\n",
+                pCesaReqEmpty, pCesaReqProcess,
+                cesaReqResources);
+
+    if(mode != 0)
+    {
+        int             count = 0;
+        MV_CESA_REQ*    pReq = pCesaReqFirst;
+
+        for(count=0; count<cesaQueueDepth; count++)
+        {
+            /* Print out requsts */
+            mvOsPrintf("%02d. pReq=%p, state=%s, frag=0x%x, pCmd=%p, pDma=%p, pDesc=%p\n",
+                count, pReq, mvCesaDebugStateStr(pReq->state),
+                pReq->fragMode, pReq->pCmd, pReq->dma[0].pDmaFirst, &pReq->pCesaDesc[0]);
+            if(pReq->fragMode != MV_CESA_FRAG_NONE)
+            {
+                int frag;
+
+                mvOsPrintf("pFrags=%p, num=%d, next=%d, bufOffset=%d, cryptoSize=%d, macSize=%d\n",
+                            &pReq->frags, pReq->frags.numFrag, pReq->frags.nextFrag,
+                            pReq->frags.bufOffset, pReq->frags.cryptoSize, pReq->frags.macSize);
+                for(frag=0; frag<pReq->frags.numFrag; frag++)
+                {
+                    mvOsPrintf("#%d: pDmaFirst=%p, pDesc=%p\n", frag,
+                                pReq->dma[frag].pDmaFirst, &pReq->pCesaDesc[frag]);
+                }
+            }
+            if(mode > 1)
+            {
+                /* Print out Command */
+                mvCesaDebugCmd(pReq->pCmd, mode);
+
+                /* Print out Descriptor */
+                mvCesaDebugDescriptor(&pReq->pCesaDesc[0]);
+            }
+            pReq++;
+        }
+    }
+}
+
+
+void    mvCesaDebugSramSA(MV_CESA_SRAM_SA* pSramSA, int mode)
+{
+    if(pSramSA == NULL)
+    {
+        mvOsPrintf("cesaSramSA: Unexpected pSramSA=%p\n", pSramSA);
+        return;
+    }
+    mvOsPrintf("pSramSA=%p, sizeSramSA=%ld bytes\n",
+                pSramSA, sizeof(MV_CESA_SRAM_SA));
+
+    if(mode != 0)
+    {
+        mvOsPrintf("cryptoKey=%p, maxCryptoKey=%d bytes\n",
+                    pSramSA->cryptoKey, MV_CESA_MAX_CRYPTO_KEY_LENGTH);
+        mvDebugMemDump(pSramSA->cryptoKey, MV_CESA_MAX_CRYPTO_KEY_LENGTH, 1);
+
+        mvOsPrintf("macInnerIV=%p, maxInnerIV=%d bytes\n",
+                    pSramSA->macInnerIV, MV_CESA_MAX_DIGEST_SIZE);
+        mvDebugMemDump(pSramSA->macInnerIV, MV_CESA_MAX_DIGEST_SIZE, 1);
+
+        mvOsPrintf("macOuterIV=%p, maxOuterIV=%d bytes\n",
+                    pSramSA->macOuterIV, MV_CESA_MAX_DIGEST_SIZE);
+        mvDebugMemDump(pSramSA->macOuterIV, MV_CESA_MAX_DIGEST_SIZE, 1);
+    }
+}
+
+void    mvCesaDebugSA(short sid, int mode)
+{
+    MV_CESA_OPERATION   oper;
+    MV_CESA_DIRECTION   dir;
+    MV_CESA_CRYPTO_ALG  cryptoAlg;
+    MV_CESA_CRYPTO_MODE cryptoMode;
+    MV_CESA_MAC_MODE    macMode;
+    MV_CESA_SA*         pSA = &pCesaSAD[sid];
+
+    if( (pSA->valid) || ((pSA->count != 0) && (mode > 0)) || (mode >= 2) )
+    {
+        mvOsPrintf("\n\nCESA SA Entry #%d (%p) - %s (count=%d)\n",
+                    sid, pSA,
+                    pSA->valid ? "Valid" : "Invalid", pSA->count);
+
+        oper = (pSA->config & MV_CESA_OPERATION_MASK) >> MV_CESA_OPERATION_OFFSET;
+        dir  = (pSA->config & MV_CESA_DIRECTION_MASK) >> MV_CESA_DIRECTION_BIT;
+        mvOsPrintf("%s - %s ", mvCesaDebugOperStr(oper),
+                    (dir == MV_CESA_DIR_ENCODE) ? "Encode" : "Decode");
+        if(oper != MV_CESA_MAC_ONLY)
+        {
+            cryptoAlg = (pSA->config & MV_CESA_CRYPTO_ALG_MASK) >> MV_CESA_CRYPTO_ALG_OFFSET;
+            cryptoMode = (pSA->config & MV_CESA_CRYPTO_MODE_MASK) >> MV_CESA_CRYPTO_MODE_BIT;
+            mvOsPrintf("- %s - %s ", mvCesaDebugCryptoAlgStr(cryptoAlg),
+                        (cryptoMode == MV_CESA_CRYPTO_ECB) ? "ECB" : "CBC");
+        }
+        if(oper != MV_CESA_CRYPTO_ONLY)
+        {
+            macMode = (pSA->config & MV_CESA_MAC_MODE_MASK) >> MV_CESA_MAC_MODE_OFFSET;
+            mvOsPrintf("- %s ", mvCesaDebugMacModeStr(macMode));
+        }
+        mvOsPrintf("\n");
+
+        if(mode > 0)
+        {
+            mvOsPrintf("config=0x%08x, cryptoKeySize=%d, digestSize=%d\n",
+                        pCesaSAD[sid].config, pCesaSAD[sid].cryptoKeyLength,
+                        pCesaSAD[sid].digestSize);
+
+            mvCesaDebugSramSA(pCesaSAD[sid].pSramSA, mode);
+        }
+    }
+}
+
+
+/**/
+void    mvCesaDebugSram(int mode)
+{
+    mvOsPrintf("\n\t SRAM contents: size=%ld, pVirt=%p\n\n",
+            sizeof(MV_CESA_SRAM_MAP), cesaSramVirtPtr);
+
+    mvOsPrintf("\n\t Sram buffer: size=%d, pVirt=%p\n",
+                    MV_CESA_MAX_BUF_SIZE, cesaSramVirtPtr->buf);
+        if(mode != 0)
+            mvDebugMemDump(cesaSramVirtPtr->buf, 64, 1);
+
+    mvOsPrintf("\n");
+    mvOsPrintf("\n\t Sram descriptor: size=%ld, pVirt=%p\n",
+                    sizeof(MV_CESA_DESC), &cesaSramVirtPtr->desc);
+    if(mode != 0)
+    {
+        mvOsPrintf("\n");
+        mvCesaDebugDescriptor(&cesaSramVirtPtr->desc);
+    }
+    mvOsPrintf("\n\t Sram IV: size=%d, pVirt=%p\n",
+                    MV_CESA_MAX_IV_LENGTH, &cesaSramVirtPtr->cryptoIV);
+    if(mode != 0)
+    {
+        mvOsPrintf("\n");
+        mvDebugMemDump(cesaSramVirtPtr->cryptoIV, MV_CESA_MAX_IV_LENGTH, 1);
+    }
+    mvOsPrintf("\n");
+    mvCesaDebugSramSA(&cesaSramVirtPtr->sramSA, 0);
+}
+
+void    mvCesaDebugSAD(int mode)
+{
+    int sid;
+
+    mvOsPrintf("\n\t Cesa SAD status: pSAD=%p, maxSA=%d\n",
+                pCesaSAD, cesaMaxSA);
+
+    for(sid=0; sid<cesaMaxSA; sid++)
+    {
+        mvCesaDebugSA(sid, mode);
+    }
+}
+
+void    mvCesaDebugStats(void)
+{
+    mvOsPrintf("\n\t Cesa Statistics\n");
+
+    mvOsPrintf("Opened=%u, Closed=%u\n",
+                cesaStats.openedCount, cesaStats.closedCount);
+    mvOsPrintf("Req=%u, maxReq=%u, frags=%u, start=%u\n",
+                cesaStats.reqCount, cesaStats.maxReqCount,
+                cesaStats.fragCount, cesaStats.startCount);
+#if (MV_CESA_VERSION >= 3)
+    mvOsPrintf("maxChainUsage=%u\n",cesaStats.maxChainUsage);
+#endif
+    mvOsPrintf("\n");
+    mvOsPrintf("proc=%u, ready=%u, notReady=%u\n",
+                cesaStats.procCount, cesaStats.readyCount, cesaStats.notReadyCount);
+}
+
+void    mvCesaDebugStatsClear(void)
+{
+    memset(&cesaStats, 0, sizeof(cesaStats));
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h
new file mode 100644
index 00000000..6b7ce123
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h
@@ -0,0 +1,357 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __mvCesaRegs_h__
+#define __mvCesaRegs_h__
+
+#include "mvTypes.h"
+
+typedef struct
+{
+    /* word 0 */
+    MV_U32  config;
+    /* word 1 */    
+    MV_U16  cryptoSrcOffset;
+    MV_U16  cryptoDstOffset;
+    /* word 2 */    
+    MV_U16  cryptoDataLen;
+    MV_U16  reserved1;
+    /* word 3 */
+    MV_U16  cryptoKeyOffset;
+    MV_U16  reserved2;
+    /* word 4 */
+    MV_U16  cryptoIvOffset;
+    MV_U16  cryptoIvBufOffset;
+    /* word 5 */
+    MV_U16  macSrcOffset;
+    MV_U16  macTotalLen;
+    /* word 6 */
+    MV_U16  macDigestOffset;
+    MV_U16  macDataLen;
+    /* word 7 */
+    MV_U16  macInnerIvOffset;
+    MV_U16  macOuterIvOffset;
+
+} MV_CESA_DESC;
+
+/* operation */
+typedef enum 
+{
+    MV_CESA_MAC_ONLY         = 0,
+    MV_CESA_CRYPTO_ONLY      = 1,
+    MV_CESA_MAC_THEN_CRYPTO  = 2,
+    MV_CESA_CRYPTO_THEN_MAC  = 3,
+    
+    MV_CESA_MAX_OPERATION
+
+} MV_CESA_OPERATION;
+
+#define MV_CESA_OPERATION_OFFSET        0
+#define MV_CESA_OPERATION_MASK          (0x3 << MV_CESA_OPERATION_OFFSET)
+
+/* mac algorithm */
+typedef enum 
+{   
+    MV_CESA_MAC_NULL        = 0,
+    MV_CESA_MAC_MD5         = 4,
+    MV_CESA_MAC_SHA1        = 5,
+    MV_CESA_MAC_HMAC_MD5    = 6,
+    MV_CESA_MAC_HMAC_SHA1   = 7,
+
+} MV_CESA_MAC_MODE;
+
+#define MV_CESA_MAC_MODE_OFFSET         4
+#define MV_CESA_MAC_MODE_MASK           (0x7 << MV_CESA_MAC_MODE_OFFSET)
+
+typedef enum
+{
+    MV_CESA_MAC_DIGEST_FULL = 0,
+    MV_CESA_MAC_DIGEST_96B  = 1,
+
+} MV_CESA_MAC_DIGEST_SIZE;
+
+#define MV_CESA_MAC_DIGEST_SIZE_BIT     7
+#define MV_CESA_MAC_DIGEST_SIZE_MASK    (1 << MV_CESA_MAC_DIGEST_SIZE_BIT)
+
+
+typedef enum 
+{
+    MV_CESA_CRYPTO_NULL = 0,
+    MV_CESA_CRYPTO_DES  = 1,
+    MV_CESA_CRYPTO_3DES = 2,
+    MV_CESA_CRYPTO_AES  = 3,
+
+} MV_CESA_CRYPTO_ALG;
+
+#define MV_CESA_CRYPTO_ALG_OFFSET       8
+#define MV_CESA_CRYPTO_ALG_MASK         (0x3 << MV_CESA_CRYPTO_ALG_OFFSET)
+
+
+/* direction */
+typedef enum 
+{
+    MV_CESA_DIR_ENCODE = 0,
+    MV_CESA_DIR_DECODE = 1,
+
+} MV_CESA_DIRECTION;
+
+#define MV_CESA_DIRECTION_BIT           12
+#define MV_CESA_DIRECTION_MASK          (1 << MV_CESA_DIRECTION_BIT)
+
+/* crypto IV mode */
+typedef enum 
+{
+    MV_CESA_CRYPTO_ECB = 0,
+    MV_CESA_CRYPTO_CBC = 1,
+
+    /* NO HW Support */
+    MV_CESA_CRYPTO_CTR = 10,
+
+} MV_CESA_CRYPTO_MODE;
+
+#define MV_CESA_CRYPTO_MODE_BIT         16
+#define MV_CESA_CRYPTO_MODE_MASK        (1 << MV_CESA_CRYPTO_MODE_BIT)         
+
+/* 3DES mode */
+typedef enum 
+{
+    MV_CESA_CRYPTO_3DES_EEE = 0,
+    MV_CESA_CRYPTO_3DES_EDE = 1,
+
+} MV_CESA_CRYPTO_3DES_MODE;
+
+#define MV_CESA_CRYPTO_3DES_MODE_BIT    20
+#define MV_CESA_CRYPTO_3DES_MODE_MASK   (1 << MV_CESA_CRYPTO_3DES_MODE_BIT)
+
+
+/* AES Key Length */
+typedef enum 
+{
+    MV_CESA_CRYPTO_AES_KEY_128 = 0,
+    MV_CESA_CRYPTO_AES_KEY_192 = 1,
+    MV_CESA_CRYPTO_AES_KEY_256 = 2,
+
+} MV_CESA_CRYPTO_AES_KEY_LEN;
+
+#define MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET   24
+#define MV_CESA_CRYPTO_AES_KEY_LEN_MASK     (0x3 << MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET)
+
+/* Fragmentation mode */
+typedef enum 
+{
+    MV_CESA_FRAG_NONE   = 0,
+    MV_CESA_FRAG_FIRST  = 1,
+    MV_CESA_FRAG_LAST   = 2,
+    MV_CESA_FRAG_MIDDLE = 3,
+
+} MV_CESA_FRAG_MODE;
+
+#define MV_CESA_FRAG_MODE_OFFSET            30
+#define MV_CESA_FRAG_MODE_MASK              (0x3 << MV_CESA_FRAG_MODE_OFFSET)
+/*---------------------------------------------------------------------------*/
+
+/********** Security Accelerator Command Register **************/
+#define MV_CESA_CMD_REG                     (MV_CESA_REG_BASE + 0xE00)
+
+#define MV_CESA_CMD_CHAN_ENABLE_BIT         0  
+#define MV_CESA_CMD_CHAN_ENABLE_MASK        (1 << MV_CESA_CMD_CHAN_ENABLE_BIT)
+
+#define MV_CESA_CMD_CHAN_DISABLE_BIT        2  
+#define MV_CESA_CMD_CHAN_DISABLE_MASK       (1 << MV_CESA_CMD_CHAN_DISABLE_BIT)  
+
+/********** Security Accelerator Descriptor Pointers Register **********/
+#define MV_CESA_CHAN_DESC_OFFSET_REG        (MV_CESA_REG_BASE + 0xE04)
+
+/********** Security Accelerator Configuration Register **********/
+#define MV_CESA_CFG_REG                     (MV_CESA_REG_BASE + 0xE08)
+
+#define MV_CESA_CFG_STOP_DIGEST_ERR_BIT     0
+#define MV_CESA_CFG_STOP_DIGEST_ERR_MASK    (1 << MV_CESA_CFG_STOP_DIGEST_ERR_BIT)
+
+#define MV_CESA_CFG_WAIT_DMA_BIT            7
+#define MV_CESA_CFG_WAIT_DMA_MASK           (1 << MV_CESA_CFG_WAIT_DMA_BIT)
+          
+#define MV_CESA_CFG_ACT_DMA_BIT             9
+#define MV_CESA_CFG_ACT_DMA_MASK            (1 << MV_CESA_CFG_ACT_DMA_BIT)
+
+#define MV_CESA_CFG_CHAIN_MODE_BIT          11
+#define MV_CESA_CFG_CHAIN_MODE_MASK         (1 << MV_CESA_CFG_CHAIN_MODE_BIT)
+
+/********** Security Accelerator Status Register ***********/
+#define MV_CESA_STATUS_REG                  (MV_CESA_REG_BASE + 0xE0C)
+
+#define MV_CESA_STATUS_ACTIVE_BIT           0
+#define MV_CESA_STATUS_ACTIVE_MASK          (1 << MV_CESA_STATUS_ACTIVE_BIT)
+
+#define MV_CESA_STATUS_DIGEST_ERR_BIT       8
+#define MV_CESA_STATUS_DIGEST_ERR_MASK      (1 << MV_CESA_STATUS_DIGEST_ERR_BIT)
+
+
+/* Cryptographic Engines and Security Accelerator Interrupt Cause Register */
+#define MV_CESA_ISR_CAUSE_REG               (MV_CESA_REG_BASE + 0xE20)
+
+/* Cryptographic Engines and Security Accelerator Interrupt Mask Register */
+#define MV_CESA_ISR_MASK_REG                (MV_CESA_REG_BASE + 0xE24)
+
+#define MV_CESA_CAUSE_AUTH_MASK             (1 << 0)
+#define MV_CESA_CAUSE_DES_MASK              (1 << 1)
+#define MV_CESA_CAUSE_AES_ENCR_MASK         (1 << 2)
+#define MV_CESA_CAUSE_AES_DECR_MASK         (1 << 3)
+#define MV_CESA_CAUSE_DES_ALL_MASK          (1 << 4)
+
+#define MV_CESA_CAUSE_ACC_BIT               5
+#define MV_CESA_CAUSE_ACC_MASK              (1 << MV_CESA_CAUSE_ACC_BIT)
+
+#define MV_CESA_CAUSE_ACC_DMA_BIT           7
+#define MV_CESA_CAUSE_ACC_DMA_MASK          (1 << MV_CESA_CAUSE_ACC_DMA_BIT)
+#define MV_CESA_CAUSE_ACC_DMA_ALL_MASK      (3 << MV_CESA_CAUSE_ACC_DMA_BIT)
+
+#define MV_CESA_CAUSE_DMA_COMPL_BIT         9
+#define MV_CESA_CAUSE_DMA_COMPL_MASK        (1 << MV_CESA_CAUSE_DMA_COMPL_BIT)
+
+#define MV_CESA_CAUSE_DMA_OWN_ERR_BIT       10
+#define MV_CESA_CAUSE_DMA_OWN_ERR_MASK      (1 < MV_CESA_CAUSE_DMA_OWN_ERR_BIT)
+
+#define MV_CESA_CAUSE_DMA_CHAIN_PKT_BIT     11
+#define MV_CESA_CAUSE_DMA_CHAIN_PKT_MASK    (1 < MV_CESA_CAUSE_DMA_CHAIN_PKT_BIT)
+
+
+#define MV_CESA_AUTH_DATA_IN_REG            (MV_CESA_REG_BASE + 0xd38)
+#define MV_CESA_AUTH_BIT_COUNT_LOW_REG      (MV_CESA_REG_BASE + 0xd20)
+#define MV_CESA_AUTH_BIT_COUNT_HIGH_REG     (MV_CESA_REG_BASE + 0xd24)
+
+#define MV_CESA_AUTH_INIT_VAL_DIGEST_REG(i) (MV_CESA_REG_BASE + 0xd00 + (i<<2))
+
+#define MV_CESA_AUTH_INIT_VAL_DIGEST_A_REG  (MV_CESA_REG_BASE + 0xd00)
+#define MV_CESA_AUTH_INIT_VAL_DIGEST_B_REG  (MV_CESA_REG_BASE + 0xd04)
+#define MV_CESA_AUTH_INIT_VAL_DIGEST_C_REG  (MV_CESA_REG_BASE + 0xd08)
+#define MV_CESA_AUTH_INIT_VAL_DIGEST_D_REG  (MV_CESA_REG_BASE + 0xd0c)
+#define MV_CESA_AUTH_INIT_VAL_DIGEST_E_REG  (MV_CESA_REG_BASE + 0xd10)
+#define MV_CESA_AUTH_COMMAND_REG            (MV_CESA_REG_BASE + 0xd18)
+
+#define MV_CESA_AUTH_ALGORITHM_BIT          0
+#define MV_CESA_AUTH_ALGORITHM_MD5          (0<<AUTH_ALGORITHM_BIT)
+#define MV_CESA_AUTH_ALGORITHM_SHA1         (1<<AUTH_ALGORITHM_BIT)
+
+#define MV_CESA_AUTH_IV_MODE_BIT            1
+#define MV_CESA_AUTH_IV_MODE_INIT           (0<<AUTH_IV_MODE_BIT)
+#define MV_CESA_AUTH_IV_MODE_CONTINUE       (1<<AUTH_IV_MODE_BIT)
+
+#define MV_CESA_AUTH_DATA_BYTE_SWAP_BIT     2
+#define MV_CESA_AUTH_DATA_BYTE_SWAP_MASK    (1<<AUTH_DATA_BYTE_SWAP_BIT)
+
+
+#define MV_CESA_AUTH_IV_BYTE_SWAP_BIT       4
+#define MV_CESA_AUTH_IV_BYTE_SWAP_MASK      (1<<AUTH_IV_BYTE_SWAP_BIT)
+
+#define MV_CESA_AUTH_TERMINATION_BIT        31
+#define MV_CESA_AUTH_TERMINATION_MASK       (1<<AUTH_TERMINATION_BIT)
+
+
+/*************** TDMA Control Register ************************************************/
+#define MV_CESA_TDMA_CTRL_REG               (MV_CESA_TDMA_REG_BASE + 0x840)
+
+#define MV_CESA_TDMA_BURST_32B              3   
+#define MV_CESA_TDMA_BURST_128B             4   
+
+#define MV_CESA_TDMA_DST_BURST_OFFSET       0
+#define MV_CESA_TDMA_DST_BURST_ALL_MASK     (0x7<<MV_CESA_TDMA_DST_BURST_OFFSET)
+#define MV_CESA_TDMA_DST_BURST_MASK(burst)  ((burst)<<MV_CESA_TDMA_DST_BURST_OFFSET)
+
+#define MV_CESA_TDMA_OUTSTAND_READ_EN_BIT   4
+#define MV_CESA_TDMA_OUTSTAND_READ_EN_MASK  (1<<MV_CESA_TDMA_OUTSTAND_READ_EN_BIT)
+
+#define MV_CESA_TDMA_SRC_BURST_OFFSET       6
+#define MV_CESA_TDMA_SRC_BURST_ALL_MASK     (0x7<<MV_CESA_TDMA_SRC_BURST_OFFSET)
+#define MV_CESA_TDMA_SRC_BURST_MASK(burst)  ((burst)<<MV_CESA_TDMA_SRC_BURST_OFFSET)
+
+#define MV_CESA_TDMA_CHAIN_MODE_BIT         9
+#define MV_CESA_TDMA_NON_CHAIN_MODE_MASK    (1<<MV_CESA_TDMA_CHAIN_MODE_BIT)
+
+#define MV_CESA_TDMA_BYTE_SWAP_BIT	    11
+#define MV_CESA_TDMA_BYTE_SWAP_MASK	    (0 << MV_CESA_TDMA_BYTE_SWAP_BIT)
+#define MV_CESA_TDMA_NO_BYTE_SWAP_MASK	    (1 << MV_CESA_TDMA_BYTE_SWAP_BIT)		    	
+
+#define MV_CESA_TDMA_ENABLE_BIT		    12
+#define MV_CESA_TDMA_ENABLE_MASK            (1<<MV_CESA_TDMA_ENABLE_BIT)
+			    
+#define MV_CESA_TDMA_FETCH_NEXT_DESC_BIT    13	
+#define MV_CESA_TDMA_FETCH_NEXT_DESC_MASK   (1<<MV_CESA_TDMA_FETCH_NEXT_DESC_BIT)	
+
+#define MV_CESA_TDMA_CHAN_ACTIVE_BIT	    14    
+#define MV_CESA_TDMA_CHAN_ACTIVE_MASK       (1<<MV_CESA_TDMA_CHAN_ACTIVE_BIT)
+/*------------------------------------------------------------------------------------*/
+
+#define MV_CESA_TDMA_BYTE_COUNT_REG         (MV_CESA_TDMA_REG_BASE + 0x800)
+#define MV_CESA_TDMA_SRC_ADDR_REG           (MV_CESA_TDMA_REG_BASE + 0x810)
+#define MV_CESA_TDMA_DST_ADDR_REG           (MV_CESA_TDMA_REG_BASE + 0x820)
+#define MV_CESA_TDMA_NEXT_DESC_PTR_REG      (MV_CESA_TDMA_REG_BASE + 0x830)
+#define MV_CESA_TDMA_CURR_DESC_PTR_REG      (MV_CESA_TDMA_REG_BASE + 0x870)
+
+#define MV_CESA_TDMA_ERROR_CAUSE_REG        (MV_CESA_TDMA_REG_BASE + 0x8C0)
+#define MV_CESA_TDMA_ERROR_MASK_REG         (MV_CESA_TDMA_REG_BASE + 0x8C4)
+
+
+#endif /* __mvCesaRegs_h__ */ 
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c
new file mode 100644
index 00000000..74632938
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c
@@ -0,0 +1,3096 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvOs.h"
+
+#if defined(MV_VXWORKS)
+
+#include "sysLib.h"
+#include "logLib.h"
+#include "tickLib.h"
+#include "intLib.h"
+#include "config.h"
+
+
+SEM_ID      cesaSemId = NULL;
+SEM_ID      cesaWaitSemId = NULL;
+
+#define CESA_TEST_LOCK(flags)       flags = intLock()
+#define CESA_TEST_UNLOCK(flags)     intUnlock(flags)
+
+#define CESA_TEST_WAIT_INIT()       cesaWaitSemId = semBCreate(SEM_Q_PRIORITY, SEM_EMPTY)
+#define CESA_TEST_WAKE_UP()         semGive(cesaWaitSemId)
+#define CESA_TEST_WAIT(cond, ms)    semTake(cesaWaitSemId, (sysClkRateGet()*ms)/1000)
+
+#define CESA_TEST_TICK_GET()        tickGet()
+#define CESA_TEST_TICK_TO_MS(tick)  (((tick)*1000)/sysClkRateGet())
+
+#elif defined(MV_LINUX)
+
+#include <linux/wait.h>
+wait_queue_head_t   cesaTest_waitq;
+spinlock_t          cesaLock;
+
+#define CESA_TEST_LOCK(flags)       spin_lock_irqsave( &cesaLock, flags)
+#define CESA_TEST_UNLOCK(flags)     spin_unlock_irqrestore( &cesaLock, flags);
+
+#define CESA_TEST_WAIT_INIT()       init_waitqueue_head(&cesaTest_waitq)
+#define CESA_TEST_WAKE_UP()         wake_up(&cesaTest_waitq)
+#define CESA_TEST_WAIT(cond, ms)    wait_event_timeout(cesaTest_waitq, (cond), msecs_to_jiffies(ms))
+
+#define CESA_TEST_TICK_GET()        jiffies
+#define CESA_TEST_TICK_TO_MS(tick)  jiffies_to_msecs(tick)
+
+#elif defined(MV_NETBSD)
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+static int	cesaLock;
+
+#define	CESA_TEST_LOCK(flags)		flags = splnet()
+#define	CESA_TEST_UNLOCK(flags)		splx(flags)
+
+#define	CESA_TEST_WAIT_INIT()		/* nothing */
+#define	CESA_TEST_WAKE_UP()		wakeup(&cesaLock)
+#define	CESA_TEST_WAIT(cond, ms)	\
+do {					\
+	while (!(cond))			\
+		tsleep(&cesaLock, PWAIT, "cesatest",mstohz(ms)); \
+} while (/*CONSTCOND*/0)
+
+#define	CESA_TEST_TICK_GET()		hardclock_ticks
+#define	CESA_TEST_TICK_TO_MS(tick)	((1000/hz)*(tick))
+
+#define	request_irq(i,h,t,n,a)	\
+	!mv_intr_establish((i),IPL_NET,(int(*)(void *))(h),(a))
+
+#else
+#error "Only Linux, VxWorks, or NetBSD OS are supported"
+#endif
+
+#include "mvDebug.h"
+
+#include "mvSysHwConfig.h"
+#include "boardEnv/mvBoardEnvLib.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "cntmr/mvCntmr.h"
+#include "cesa/mvCesa.h"
+#include "cesa/mvCesaRegs.h"
+#include "cesa/mvMD5.h"
+#include "cesa/mvSHA1.h"
+
+#if defined(CONFIG_MV646xx)
+#include "marvell_pic.h"
+#endif
+
+#define MV_CESA_USE_TIMER_ID    0
+#define CESA_DEF_BUF_SIZE       1500
+#define CESA_DEF_BUF_NUM        1
+#define CESA_DEF_SESSION_NUM    32
+
+#define CESA_DEF_ITER_NUM       100
+
+#define CESA_DEF_REQ_SIZE       256
+
+
+/* CESA Tests Debug */
+#undef CESA_TEST_DEBUG
+
+#ifdef CESA_TEST_DEBUG
+
+#   define CESA_TEST_DEBUG_PRINT(msg)   mvOsPrintf msg
+#   define CESA_TEST_DEBUG_CODE(code)   code
+
+typedef struct
+{
+    int             type;       /* 0 - isrEmpty, 1 - cesaReadyGet, 2 - cesaAction */
+    MV_U32          timeStamp;
+    MV_U32          cause;
+    MV_U32          realCause;
+    MV_U32          dmaCause;
+    int             resources;
+    MV_CESA_REQ*    pReqReady;
+    MV_CESA_REQ*    pReqEmpty;
+    MV_CESA_REQ*    pReqProcess;
+} MV_CESA_TEST_TRACE;
+
+#define MV_CESA_TEST_TRACE_SIZE      25
+
+static int cesaTestTraceIdx = 0;
+static MV_CESA_TEST_TRACE    cesaTestTrace[MV_CESA_TEST_TRACE_SIZE];
+
+static void cesaTestTraceAdd(int type, MV_U32 cause)
+{
+    cesaTestTrace[cesaTestTraceIdx].type = type;
+    cesaTestTrace[cesaTestTraceIdx].cause = cause;
+    cesaTestTrace[cesaTestTraceIdx].realCause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
+    cesaTestTrace[cesaTestTraceIdx].dmaCause = MV_REG_READ(IDMA_CAUSE_REG);
+    cesaTestTrace[cesaTestTraceIdx].resources = cesaReqResources;
+    cesaTestTrace[cesaTestTraceIdx].pReqReady = pCesaReqReady;
+    cesaTestTrace[cesaTestTraceIdx].pReqEmpty = pCesaReqEmpty;
+    cesaTestTrace[cesaTestTraceIdx].pReqProcess = pCesaReqProcess;
+    cesaTestTrace[cesaTestTraceIdx].timeStamp = mvCntmrRead(MV_CESA_USE_TIMER_ID);
+    cesaTestTraceIdx++;
+    if(cesaTestTraceIdx == MV_CESA_TEST_TRACE_SIZE)
+        cesaTestTraceIdx = 0;
+}
+
+#else
+
+#   define CESA_TEST_DEBUG_PRINT(msg)
+#   define CESA_TEST_DEBUG_CODE(code)
+
+#endif /* CESA_TEST_DEBUG */
+
+int                 cesaExpReqId=0;
+int                 cesaCbIter=0;
+
+int                 cesaIdx;
+int                 cesaIteration;
+int                 cesaRateSize;
+int                 cesaReqSize;
+unsigned long       cesaTaskId;
+int                 cesaBufNum;
+int                 cesaBufSize;
+int                 cesaCheckOffset;
+int                 cesaCheckSize;
+int                 cesaCheckMode;
+int                 cesaTestIdx;
+int                 cesaCaseIdx;
+
+
+MV_U32      cesaTestIsrCount = 0;
+MV_U32      cesaTestIsrMissCount = 0;
+
+MV_U32      cesaCryptoError = 0;
+MV_U32      cesaReqIdError  = 0;
+MV_U32      cesaError = 0;
+
+char*       cesaHexBuffer = NULL;
+
+char*       cesaBinBuffer = NULL;
+char*       cesaExpBinBuffer = NULL;
+
+char*       cesaInputHexStr  = NULL;
+char*       cesaOutputHexStr = NULL;
+
+MV_BUF_INFO         cesaReqBufs[CESA_DEF_REQ_SIZE];
+
+MV_CESA_COMMAND*    cesaCmdRing;
+MV_CESA_RESULT      cesaResult;
+
+int                 cesaTestFull = 0;
+
+MV_BOOL             cesaIsReady = MV_FALSE;
+MV_U32              cesaCycles = 0;
+MV_U32              cesaBeginTicks = 0;
+MV_U32              cesaEndTicks = 0;
+MV_U32              cesaRate = 0;
+MV_U32              cesaRateAfterDot = 0;
+
+void 		    *cesaTestOSHandle = NULL;
+
+enum
+{
+    CESA_FAST_CHECK_MODE = 0,
+    CESA_FULL_CHECK_MODE,
+    CESA_NULL_CHECK_MODE,
+    CESA_SHOW_CHECK_MODE,
+    CESA_SW_SHOW_CHECK_MODE,
+    CESA_SW_NULL_CHECK_MODE,
+
+    CESA_MAX_CHECK_MODE
+};
+
+enum
+{
+    DES_TEST_TYPE         = 0,
+    TRIPLE_DES_TEST_TYPE  = 1,
+    AES_TEST_TYPE         = 2,
+    MD5_TEST_TYPE         = 3,
+    SHA_TEST_TYPE         = 4,
+    COMBINED_TEST_TYPE    = 5,
+
+    MAX_TEST_TYPE
+};
+
+/* Tests data base */
+typedef struct
+{
+    short           sid;
+    char            cryptoAlgorithm;    /* DES/3DES/AES */
+    char            cryptoMode;         /* ECB or CBC */
+    char            macAlgorithm;       /* MD5 / SHA1 */
+    char            operation;          /* CRYPTO/HMAC/CRYPTO+HMAC/HMAC+CRYPTO */
+    char            direction;          /* ENCODE(SIGN)/DECODE(VERIFY) */
+    unsigned char*  pCryptoKey;
+    int             cryptoKeySize;
+    unsigned char*  pMacKey;
+    int             macKeySize;
+    const char*     name;
+
+} MV_CESA_TEST_SESSION;
+
+typedef struct
+{
+    MV_CESA_TEST_SESSION*   pSessions;
+    int                     numSessions;
+
+} MV_CESA_TEST_DB_ENTRY;
+
+typedef struct
+{
+    char*           plainHexStr;
+    char*           cipherHexStr;
+    unsigned char*  pCryptoIV;
+    int             cryptoLength;
+    int             macLength;
+    int             digestOffset;
+
+} MV_CESA_TEST_CASE;
+
+typedef struct
+{
+    int     size;
+    const char* outputHexStr;
+
+} MV_CESA_SIZE_TEST;
+
+static unsigned char    cryptoKey1[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+                                        0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+                                        0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef};
+
+static unsigned char    cryptoKey7[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef};
+static unsigned char    iv1[]        = {0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef};
+
+
+static unsigned char    cryptoKey2[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                                        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F};
+
+static unsigned char    cryptoKey3[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                                        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+                                        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17};
+
+static unsigned char    cryptoKey4[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                                        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+                                        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+                                        0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f};
+
+static unsigned char    cryptoKey5[] = {0x56, 0xe4, 0x7a, 0x38, 0xc5, 0x59, 0x89, 0x74,
+                                        0xbc, 0x46, 0x90, 0x3d, 0xba, 0x29, 0x03, 0x49};
+
+
+static unsigned char    key3des1[]   = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+                                        0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01,
+                                        0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23};
+
+/*  Input ASCII string: The quick brown fox jump  */
+static char  plain3des1[]           =   "54686520717566636B2062726F776E20666F78206A756D70";
+static char  cipher3des1[]          =   "A826FD8CE53B855FCCE21C8112256FE668D5C05DD9B6B900";
+
+static unsigned char    key3des2[]  = {0x62, 0x7f, 0x46, 0x0e, 0x08, 0x10, 0x4a, 0x10,
+                                       0x43, 0xcd, 0x26, 0x5d, 0x58, 0x40, 0xea, 0xf1,
+                                       0x31, 0x3e, 0xdf, 0x97, 0xdf, 0x2a, 0x8a, 0x8c};
+
+static unsigned char    iv3des2[]   = {0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75};
+
+static char  plain3des2[]           = "326a494cd33fe756";
+
+static char  cipher3desCbc2[]       = "8e29f75ea77e5475"
+                                      "b22b8d66de970692";
+
+static unsigned char    key3des3[]  = {0x37, 0xae, 0x5e, 0xbf, 0x46, 0xdf, 0xf2, 0xdc,
+                                       0x07, 0x54, 0xb9, 0x4f, 0x31, 0xcb, 0xb3, 0x85,
+                                       0x5e, 0x7f, 0xd3, 0x6d, 0xc8, 0x70, 0xbf, 0xae};
+
+static unsigned char    iv3des3[]   = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65};
+
+static char  plain3des3[]           = "84401f78fe6c10876d8ea23094ea5309";
+
+static char  cipher3desCbc3[]       = "3d1de3cc132e3b65"
+                                      "7b1f7c7e3b1c948ebd04a75ffba7d2f5";
+
+static unsigned char    iv5[]        = {0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c,
+                                        0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9};
+
+static unsigned char    aesCtrKey[]  = {0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
+                                        0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC};
+
+static unsigned char    mdKey1[]     = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+                                        0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b};
+
+static unsigned char    mdKey2[]     = {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+                                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa};
+
+static unsigned char    shaKey1[]    = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+                                        0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+                                        0x0b, 0x0b, 0x0b, 0x0b};
+
+static unsigned char    shaKey2[]    = {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+                                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+                                        0xaa, 0xaa, 0xaa, 0xaa};
+
+static unsigned char    mdKey4[]     = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+                                        0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10};
+
+static unsigned char    shaKey4[]    = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+                                        0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+                                        0x11, 0x12, 0x13, 0x14};
+
+
+static MV_CESA_TEST_SESSION   desTestSessions[] =
+{
+/*000*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
+             NULL, 0,
+             "DES ECB encode",
+        },
+/*001*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
+             NULL, 0,
+             "DES ECB decode",
+        },
+/*002*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
+             NULL, 0,
+             "DES CBC encode"
+        },
+/*003*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
+             NULL, 0,
+             "DES CBC decode"
+        },
+/*004*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0, NULL, 0,
+              "NULL Crypto Algorithm encode"
+        },
+};
+
+
+static MV_CESA_TEST_SESSION   tripleDesTestSessions[] =
+{
+/*100*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             NULL, 0,
+             "3DES ECB encode",
+        },
+/*101*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             NULL, 0,
+             "3DES ECB decode",
+        },
+/*102*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             NULL, 0,
+             "3DES CBC encode"
+        },
+/*103*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             NULL, 0,
+             "3DES CBC decode"
+        },
+/*104*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             key3des1, sizeof(key3des1),
+             NULL, 0,
+             "3DES ECB encode"
+        },
+/*105*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             key3des2, sizeof(key3des2),
+             NULL, 0,
+             "3DES ECB encode"
+        },
+/*106*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             key3des3, sizeof(key3des3),
+             NULL, 0,
+             "3DES ECB encode"
+        },
+};
+
+
+static MV_CESA_TEST_SESSION   aesTestSessions[] =
+{
+/*200*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey2, sizeof(cryptoKey2)/sizeof(cryptoKey2[0]),
+             NULL, 0,
+             "AES-128 ECB encode"
+        },
+/*201*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey2, sizeof(cryptoKey2)/sizeof(cryptoKey2[0]),
+             NULL, 0,
+             "AES-128 ECB decode"
+        },
+/*202*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
+             NULL, 0,
+             "AES-128 CBC encode"
+        },
+/*203*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
+             NULL, 0,
+             "AES-128 CBC decode"
+        },
+/*204*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey3, sizeof(cryptoKey3)/sizeof(cryptoKey3[0]),
+             NULL, 0,
+             "AES-192 ECB encode"
+        },
+/*205*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey3, sizeof(cryptoKey3)/sizeof(cryptoKey3[0]),
+             NULL, 0,
+             "AES-192 ECB decode"
+        },
+/*206*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey4, sizeof(cryptoKey4)/sizeof(cryptoKey4[0]),
+             NULL, 0,
+             "AES-256 ECB encode"
+        },
+/*207*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_DECODE,
+             cryptoKey4, sizeof(cryptoKey4)/sizeof(cryptoKey4[0]),
+             NULL, 0,
+             "AES-256 ECB decode"
+        },
+/*208*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CTR,
+             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
+             MV_CESA_DIR_ENCODE,
+             aesCtrKey, sizeof(aesCtrKey)/sizeof(aesCtrKey[0]),
+             NULL, 0,
+             "AES-128 CTR encode"
+        },
+};
+
+
+static MV_CESA_TEST_SESSION   md5TestSessions[] =
+{
+/*300*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             mdKey1, sizeof(mdKey1),
+             "HMAC-MD5 Generate Signature"
+        },
+/*301*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_DECODE,
+             NULL, 0,
+             mdKey1, sizeof(mdKey1),
+             "HMAC-MD5 Verify Signature"
+        },
+/*302*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             mdKey2, sizeof(mdKey2),
+             "HMAC-MD5 Generate Signature"
+        },
+/*303*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_DECODE,
+             NULL, 0,
+             mdKey2, sizeof(mdKey2),
+             "HMAC-MD5 Verify Signature"
+        },
+/*304*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             mdKey4, sizeof(mdKey4),
+             "HMAC-MD5 Generate Signature"
+        },
+/*305*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_MD5, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             NULL, 0,
+             "HASH-MD5 Generate Signature"
+        },
+};
+
+
+static MV_CESA_TEST_SESSION   shaTestSessions[] =
+{
+/*400*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             shaKey1, sizeof(shaKey1),
+             "HMAC-SHA1 Generate Signature"
+        },
+/*401*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_DECODE,
+             NULL, 0,
+             shaKey1, sizeof(shaKey1),
+             "HMAC-SHA1 Verify Signature"
+        },
+/*402*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             shaKey2, sizeof(shaKey2),
+             "HMAC-SHA1 Generate Signature"
+        },
+/*403*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_DECODE,
+             NULL, 0,
+             shaKey2, sizeof(shaKey2),
+             "HMAC-SHA1 Verify Signature"
+        },
+/*404*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             shaKey4, sizeof(shaKey4),
+             "HMAC-SHA1 Generate Signature"
+        },
+/*405*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_SHA1, MV_CESA_MAC_ONLY,
+             MV_CESA_DIR_ENCODE,
+             NULL, 0,
+             NULL, 0,
+             "HASH-SHA1 Generate Signature"
+        },
+};
+
+static MV_CESA_TEST_SESSION   combinedTestSessions[] =
+{
+/*500*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, MV_CESA_DES_KEY_LENGTH,
+             mdKey4, sizeof(mdKey4),
+             "DES + MD5 encode"
+        },
+/*501*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, MV_CESA_DES_KEY_LENGTH,
+             shaKey4, sizeof(shaKey4),
+             "DES + SHA1 encode"
+        },
+/*502*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             mdKey4, sizeof(mdKey4),
+             "3DES + MD5 encode"
+        },
+/*503*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             shaKey4, sizeof(shaKey4),
+             "3DES + SHA1 encode"
+        },
+/*504*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             mdKey4, sizeof(mdKey4),
+             "3DES CBC + MD5 encode"
+        },
+/*505*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             shaKey4, sizeof(shaKey4),
+             "3DES CBC + SHA1 encode"
+        },
+/*506*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
+             mdKey4, sizeof(mdKey4),
+             "AES-128 CBC + MD5 encode"
+        },
+/*507*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
+             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
+             MV_CESA_DIR_ENCODE,
+             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
+             shaKey4, sizeof(shaKey4),
+             "AES-128 CBC + SHA1 encode"
+        },
+/*508*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
+             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_THEN_CRYPTO,
+             MV_CESA_DIR_DECODE,
+             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
+             mdKey4, sizeof(mdKey4),
+             "HMAC-MD5 + 3DES decode"
+        },
+};
+
+
+static MV_CESA_TEST_DB_ENTRY cesaTestsDB[MAX_TEST_TYPE+1] =
+{
+    { desTestSessions,       sizeof(desTestSessions)/sizeof(desTestSessions[0]) },
+    { tripleDesTestSessions, sizeof(tripleDesTestSessions)/sizeof(tripleDesTestSessions[0]) },
+    { aesTestSessions,       sizeof(aesTestSessions)/sizeof(aesTestSessions[0]) },
+    { md5TestSessions,       sizeof(md5TestSessions)/sizeof(md5TestSessions[0]) },
+    { shaTestSessions,       sizeof(shaTestSessions)/sizeof(shaTestSessions[0]) },
+    { combinedTestSessions,  sizeof(combinedTestSessions)/sizeof(combinedTestSessions[0]) },
+    { NULL,                  0 }
+};
+
+
+char  cesaNullPlainHexText[]   = "000000000000000000000000000000000000000000000000";
+
+char  cesaPlainAsciiText[]     = "Now is the time for all ";
+char  cesaPlainHexEbc[]        = "4e6f77206973207468652074696d6520666f7220616c6c20";
+char  cesaCipherHexEcb[]       = "3fa40e8a984d48156a271787ab8883f9893d51ec4b563b53";
+char  cesaPlainHexCbc[]        = "1234567890abcdef4e6f77206973207468652074696d6520666f7220616c6c20";
+char  cesaCipherHexCbc[]       = "1234567890abcdefe5c7cdde872bf27c43e934008c389c0f683788499a7c05f6";
+
+char  cesaAesPlainHexEcb[]     = "000102030405060708090a0b0c0d0e0f";
+char  cesaAes128cipherHexEcb[] = "0a940bb5416ef045f1c39458c653ea5a";
+char  cesaAes192cipherHexEcb[] = "0060bffe46834bb8da5cf9a61ff220ae";
+char  cesaAes256cipherHexEcb[] = "5a6e045708fb7196f02e553d02c3a692";
+
+char  cesaAsciiStr1[]          = "Hi There";
+char  cesaDataHexStr1[]        = "4869205468657265";
+char  cesaHmacMd5digestHex1[]  = "9294727a3638bb1c13f48ef8158bfc9d";
+char  cesaHmacSha1digestHex1[] = "b617318655057264e28bc0b6fb378c8ef146be00";
+char  cesaDataAndMd5digest1[]  = "48692054686572659294727a3638bb1c13f48ef8158bfc9d";
+char  cesaDataAndSha1digest1[] = "4869205468657265b617318655057264e28bc0b6fb378c8ef146be00";
+
+char  cesaAesPlainText[]       = "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
+                                 "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
+                                 "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
+                                 "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf";
+
+char  cesaAes128CipherCbc[]    = "c30e32ffedc0774e6aff6af0869f71aa"
+                                 "0f3af07a9a31a9c684db207eb0ef8e4e"
+                                 "35907aa632c3ffdf868bb7b29d3d46ad"
+                                 "83ce9f9a102ee99d49a53e87f4c3da55";
+
+char  cesaAesIvPlainText[]     = "8ce82eefbea0da3c44699ed7db51b7d9"
+                                 "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
+                                 "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
+                                 "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
+                                 "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf";
+
+char  cesaAes128IvCipherCbc[]  = "8ce82eefbea0da3c44699ed7db51b7d9"
+                                 "c30e32ffedc0774e6aff6af0869f71aa"
+                                 "0f3af07a9a31a9c684db207eb0ef8e4e"
+                                 "35907aa632c3ffdf868bb7b29d3d46ad"
+                                 "83ce9f9a102ee99d49a53e87f4c3da55";
+
+char  cesaAesCtrPlain[]        = "00E0017B27777F3F4A1786F000000001"
+                                 "000102030405060708090A0B0C0D0E0F"
+                                 "101112131415161718191A1B1C1D1E1F"
+                                 "20212223";
+
+char  cesaAesCtrCipher[]       = "00E0017B27777F3F4A1786F000000001"
+                                 "C1CF48A89F2FFDD9CF4652E9EFDB72D7"
+                                 "4540A42BDE6D7836D59A5CEAAEF31053"
+                                 "25B2072F";
+
+
+
+/* Input cesaHmacHex3 is '0xdd' repeated 50 times */
+char  cesaHmacMd5digestHex3[]  = "56be34521d144c88dbb8c733f0e8b3f6";
+char  cesaHmacSha1digestHex3[] = "125d7342b9ac11cd91a39af48aa17b4f63f175d3";
+char  cesaDataHexStr3[50*2+1]          = "";
+char  cesaDataAndMd5digest3[sizeof(cesaDataHexStr3)+sizeof(cesaHmacMd5digestHex3)+8*2+1] = "";
+char  cesaDataAndSha1digest3[sizeof(cesaDataHexStr3)+sizeof(cesaHmacSha1digestHex3)+8*2+1] = "";
+
+/* Ascii string is "abc" */
+char hashHexStr3[] = "616263";
+char hashMd5digest3[] = "900150983cd24fb0d6963f7d28e17f72";
+char hashSha1digest3[] = "a9993e364706816aba3e25717850c26c9cd0d89d";
+
+char hashHexStr80[]     = "31323334353637383930"
+                          "31323334353637383930"
+                          "31323334353637383930"
+                          "31323334353637383930"
+                          "31323334353637383930"
+                          "31323334353637383930"
+                          "31323334353637383930"
+                          "31323334353637383930";
+
+char hashMd5digest80[]           = "57edf4a22be3c955ac49da2e2107b67a";
+
+char tripleDesThenMd5digest80[]  = "b7726a03aad490bd6c5a452a89a1b271";
+char tripleDesThenSha1digest80[] = "b2ddeaca91030eab5b95a234ef2c0f6e738ff883";
+
+char cbc3desThenMd5digest80[]    = "6f463057e1a90e0e91ae505b527bcec0";
+char cbc3desThenSha1digest80[]   = "1b002ed050be743aa98860cf35659646bb8efcc0";
+
+char cbcAes128ThenMd5digest80[]  = "6b6e863ac5a71d15e3e9b1c86c9ba05f";
+char cbcAes128ThenSha1digest80[] = "13558472d1fc1c90dffec6e5136c7203452d509b";
+
+
+static MV_CESA_TEST_CASE  cesaTestCases[] =
+{
+ /*     plainHexStr          cipherHexStr               IV    crypto  mac     digest */
+ /*                                                           Length  Length  Offset */
+ /*0*/ { NULL,               NULL,                      NULL,   0,      0,      -1  },
+ /*1*/ { cesaPlainHexEbc,    cesaCipherHexEcb,          NULL,   24,     0,      -1  },
+ /*2*/ { cesaPlainHexCbc,    cesaCipherHexCbc,          NULL,   24,     0,      -1  },
+ /*3*/ { cesaAesPlainHexEcb, cesaAes128cipherHexEcb,    NULL,   16,     0,      -1  },
+ /*4*/ { cesaAesPlainHexEcb, cesaAes192cipherHexEcb,    NULL,   16,     0,      -1  },
+ /*5*/ { cesaAesPlainHexEcb, cesaAes256cipherHexEcb,    NULL,   16,     0,      -1  },
+ /*6*/ { cesaDataHexStr1,    cesaHmacMd5digestHex1,     NULL,   0,      8,      -1  },
+ /*7*/ { NULL,               cesaDataAndMd5digest1,     NULL,   0,      8,      -1  },
+ /*8*/ { cesaDataHexStr3,    cesaHmacMd5digestHex3,     NULL,   0,      50,     -1  },
+ /*9*/ { NULL,               cesaDataAndMd5digest3,     NULL,   0,      50,     -1  },
+/*10*/ { cesaAesPlainText,   cesaAes128IvCipherCbc,     iv5,    64,     0,      -1  },
+/*11*/ { cesaDataHexStr1,    cesaHmacSha1digestHex1,    NULL,   0,      8,      -1  },
+/*12*/ { NULL,               cesaDataAndSha1digest1,    NULL,   0,      8,      -1  },
+/*13*/ { cesaDataHexStr3,    cesaHmacSha1digestHex3,    NULL,   0,      50,     -1  },
+/*14*/ { NULL,               cesaDataAndSha1digest3,    NULL,   0,      50,     -1  },
+/*15*/ { hashHexStr3,        hashMd5digest3,            NULL,   0,      3,      -1  },
+/*16*/ { hashHexStr3,        hashSha1digest3,           NULL,   0,      3,      -1  },
+/*17*/ { hashHexStr80,       tripleDesThenMd5digest80,  NULL,   80,     80,     -1  },
+/*18*/ { hashHexStr80,       tripleDesThenSha1digest80, NULL,   80,     80,     -1  },
+/*19*/ { hashHexStr80,       cbc3desThenMd5digest80,    iv1,    80,     80,     -1  },
+/*20*/ { hashHexStr80,       cbc3desThenSha1digest80,   iv1,    80,     80,     -1  },
+/*21*/ { hashHexStr80,       cbcAes128ThenMd5digest80,  iv5,    80,     80,     -1  },
+/*22*/ { hashHexStr80,       cbcAes128ThenSha1digest80, iv5,    80,     80,     -1  },
+/*23*/ { cesaAesCtrPlain,    cesaAesCtrCipher,          NULL,   36,     0,      -1  },
+/*24*/ { cesaAesIvPlainText, cesaAes128IvCipherCbc,     NULL,   64,     0,      -1  },
+/*25*/ { plain3des1,         cipher3des1,               NULL,   0,      0,      -1  },
+/*26*/ { plain3des2,         cipher3desCbc2,            iv3des2,0,      0,      -1  },
+/*27*/ { plain3des3,         cipher3desCbc3,            iv3des3,0,      0,      -1  },
+};
+
+
+/* Key         = 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ *               0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
+ * Input 0xdd repeated "size" times
+ */
+static MV_CESA_SIZE_TEST     mdMultiSizeTest302[] =
+{
+    { 80,   "7a031a640c14a4872814930b1ef3a5b2" },
+    { 512,  "5488e6c5a14dc72a79f28312ca5b939b" },
+    { 1000, "d00814f586a8b78a05724239d2531821" },
+    { 1001, "bf07df7b7f49d3f5b5ecacd4e9e63281" },
+    { 1002, "1ed4a1a802e87817a819d4e37bb4d0f7" },
+    { 1003, "5972ab64a4f265ee371dac2f2f137f90" },
+    { 1004, "71f95e7ec3aa7df2548e90898abdb28e" },
+    { 1005, "e082790b4857fcfc266e92e59e608814" },
+    { 1006, "9500f02fd8ac7fde8b10e4fece9a920d" },
+    { 1336, "e42edcce57d0b75b01aa09d71427948b" },
+    { 1344, "bb5454ada0deb49ba0a97ffd60f57071" },
+    { 1399, "0f44d793e744b24d53f44f295082ee8c" },
+    { 1400, "359de8a03a9b707928c6c60e0e8d79f1" },
+    { 1401, "e913858b484cbe2b384099ea88d8855b" },
+    { 1402, "d9848a164af53620e0540c1d7d87629e" },
+    { 1403, "0c9ee1c2c9ef45e9b625c26cbaf3e822" },
+    { 1404, "12edd4f609416e3c936170360561b064" },
+    { 1405, "7fc912718a05446395345009132bf562" },
+    { 1406, "882f17425e579ff0d85a91a59f308aa0" },
+    { 1407, "005cae408630a2fb5db82ad9db7e59da" },
+    { 1408, "64655f8b404b3fea7a3e3e609bc5088f" },
+    { 1409, "4a145284a7f74e01b6bb1a0ec6a0dd80" },
+    { 2048, "67caf64475650732def374ebb8bde3fd" },
+    { 2049, "6c84f11f472825f7e6cd125c2981884b" },
+    { 2050, "8999586754a73a99efbe4dbad2816d41" },
+    { 2051, "ba6946b610e098d286bc81091659dfff" },
+    { 2052, "d0afa01c92d4d13def2b024f36faed83" },
+    { 3072, "61d8beac61806afa2585d74a9a0e6974" },
+    { 3074, "f6501a28dcc24d1e4770505c51a87ed3" },
+    { 3075, "ea4a6929be67e33e61ff475369248b73" },
+    { 4048, "aa8c4d68f282a07e7385acdfa69f4bed" },
+    { 4052, "afb5ed2c0e1d430ea59e59ed5ed6b18a" },
+    { 4058, "9e8553f9bdd43aebe0bd729f0e600c99" },
+    { 6144, "f628f3e5d183fe5cdd3a5abee39cf872" },
+    { 6150, "89a3efcea9a2f25f919168ad4a1fd292" },
+    { 6400, "cdd176b7fb747873efa4da5e32bdf88f" },
+    { 6528, "b1d707b027354aca152c45ee559ccd3f" },
+    { 8192, "c600ea4429ac47f9941f09182166e51a" },
+    {16384, "16e8754bfbeb4c649218422792267a37" },
+    {18432, "0fd0607521b0aa8b52219cfbe215f63e" },
+    { 0, NULL },
+};
+
+/* Key         = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ */
+static MV_CESA_SIZE_TEST     mdMultiSizeTest304[] =
+{
+    { 80,   "a456c4723fee6068530af5a2afa71627" },
+    { 512,  "f85c2a2344f5de68b432208ad13e5794" },
+    { 1000, "35464d6821fd4a293a41eb84e274c8c5" },
+    { 1001, "c08eedbdce60cceb54bc2d732bb32c8b" },
+    { 1002, "5664f71800c011cc311cb6943339c1b8" },
+    { 1003, "779c723b044c585dc7802b13e8501bdc" },
+    { 1004, "55e500766a2c307bc5c5fdd15e4cacd4" },
+    { 1005, "d5f978954f5c38529d1679d2b714f068" },
+    { 1006, "cd3efc827ce628b7281b72172693abf9" },
+    { 1336, "6f04479910785878ae6335b8d1e87edf" },
+    { 1344, "b6d27b50c2bce1ba2a8e1b5cc4324368" },
+    { 1399, "65f70a1d4c86e5eaeb0704c8a7816795" },
+    { 1400, "3394b5adc4cb3ff98843ca260a44a88a" },
+    { 1401, "3a06f3582033a66a4e57e0603ce94e74" },
+    { 1402, "e4d97f5ed51edc48abfa46eeb5c31752" },
+    { 1403, "3d05e40b080ee3bedf293cb87b7140e7" },
+    { 1404, "8cf294fc3cd153ab18dccb2a52cbf244" },
+    { 1405, "d1487bd42f6edd9b4dab316631159221" },
+    { 1406, "0527123b6bf6936cf5d369dc18c6c70f" },
+    { 1407, "3224a06639db70212a0cd1ae1fcc570a" },
+    { 1408, "a9e13335612c0356f5e2c27086e86c43" },
+    { 1409, "a86d1f37d1ed8a3552e9a4f04dceea98" },
+    { 2048, "396905c9b961cd0f6152abfb69c4449c" },
+    { 2049, "49f39bff85d9dcf059fadb89efc4a70f" },
+    { 2050, "3a2b4823bc4d0415656550226a63e34a" },
+    { 2051, "dec60580d406c782540f398ad0bcc7e0" },
+    { 2052, "32f76610a14310309eb748fe025081bf" },
+    { 3072, "45edc1a42bf9d708a621076b63b774da" },
+    { 3074, "9be1b333fe7c0c9f835fb369dc45f778" },
+    { 3075, "8c06fcac7bd0e7b7a17fd6508c09a549" },
+    { 4048, "0ddaef848184bf0ad98507a10f1e90e4" },
+    { 4052, "81976bcaeb274223983996c137875cb8" },
+    { 4058, "0b0a7a1c82bc7cbc64d8b7cd2dc2bb22" },
+    { 6144, "1c24056f52725ede2dff0d7f9fc9855f" },
+    { 6150, "b7f4b65681c4e43ee68ca466ca9ca4ec" },
+    { 6400, "443bbaab9f7331ddd4bf11b659cd43c8" },
+    { 6528, "216f44f23047cfee03a7a64f88f9a995" },
+    { 8192, "ac7a993b2cad54879dba1bde63e39097" },
+    { 8320, "55ed7be9682d6c0025b3221a62088d08" },
+    {16384, "c6c722087653b62007aea668277175e5" },
+    {18432, "f1faca8e907872c809e14ffbd85792d6" },
+    { 0, NULL },
+};
+
+/* HASH-MD5
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ *               repeated "size" times
+ */
+static MV_CESA_SIZE_TEST     mdMultiSizeTest305[] =
+{
+    { 80,   "57edf4a22be3c955ac49da2e2107b67a" },
+    { 512,  "c729ae8f0736cc377a9767a660eaa04e" },
+    { 1000, "f1257a8659eb92d36fe14c6bf3852a6a" },
+    { 1001, "f8a46fe8ea04fdc8c7de0e84042d3878" },
+    { 1002, "da188dd67bff87d58aa3c02af2d0cc0f" },
+    { 1003, "961753017feee04c9b93a8e51658a829" },
+    { 1004, "dd68c4338608dcc87807a711636bf2af" },
+    { 1005, "e338d567d3ce66bf69ada29658a8759b" },
+    { 1006, "443c9811e8b92599b0b149e8d7ec700a" },
+    { 1336, "89a98511706008ba4cbd0b4a24fa5646" },
+    { 1344, "335a919805f370b9e402a62c6fe01739" },
+    { 1399, "5d18d0eddcd84212fe28d812b5e80e3b" },
+    { 1400, "6b695c240d2dffd0dffc99459ca76db6" },
+    { 1401, "49590f61298a76719bc93a57a30136f5" },
+    { 1402, "94c2999fa3ef1910a683d69b2b8476f2" },
+    { 1403, "37073a02ab00ecba2645c57c228860db" },
+    { 1404, "1bcd06994fce28b624f0c5fdc2dcdd2b" },
+    { 1405, "11b93671a64c95079e8cf9e7cddc8b3d" },
+    { 1406, "4b6695772a4c66313fa4871017d05f36" },
+    { 1407, "d1539b97fbfda1c075624e958de19c5b" },
+    { 1408, "b801b9b69920907cd018e8063092ede9" },
+    { 1409, "b765f1406cfe78e238273ed01bbcaf7e" },
+    { 2048, "1d7e2c64ac29e2b3fb4c272844ed31f5" },
+    { 2049, "71d38fac49c6b1f4478d8d88447bcdd0" },
+    { 2050, "141c34a5592b1bebfa731e0b23d0cdba" },
+    { 2051, "c5e1853f21c59f5d6039bd13d4b380d8" },
+    { 2052, "dd44a0d128b63d4b5cccd967906472d7" },
+    { 3072, "37d158e33b21390822739d13db7b87fe" },
+    { 3074, "aef3b209d01d39d0597fe03634bbf441" },
+    { 3075, "335ffb428eabf210bada96d74d5a4012" },
+    { 4048, "2434c2b43d798d2819487a886261fc64" },
+    { 4052, "ac2fa84a8a33065b2e92e36432e861f8" },
+    { 4058, "856781f85616c341c3533d090c1e1e84" },
+    { 6144, "e5d134c652c18bf19833e115f7a82e9b" },
+    { 6150, "a09a353be7795fac2401dac5601872e6" },
+    { 6400, "08b9033ac6a1821398f50af75a2dbc83" },
+    { 6528, "3d47aa193a8540c091e7e02f779e6751" },
+    { 8192, "d3164e710c0626f6f395b38f20141cb7" },
+    { 8320, "b727589d9183ff4e8491dd24466974a3" },
+    {16384, "3f54d970793d2274d5b20d10a69938ac" },
+    {18432, "f558511dcf81985b7a1bb57fad970531" },
+    { 0, NULL },
+};
+
+
+/* Key         = 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+ *               0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
+ *               0xaa, 0xaa, 0xaa, 0xaa
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ */
+static MV_CESA_SIZE_TEST     shaMultiSizeTest402[] =
+{
+    { 80,   "e812f370e659705a1649940d1f78cd7af18affd3" },
+    { 512,  "e547f886b2c15d995ed76a8a924cb408c8080f66" },
+    { 1000, "239443194409f1a5342ecde1a092c8f3a3ed790a" },
+    { 1001, "f278ab9a102850a9f48dc4e9e6822afe2d0c52b5" },
+    { 1002, "8bcc667df5ab6ece988b3af361d09747c77f4e72" },
+    { 1003, "0fae6046c7dc1d3e356b25af836f6077a363f338" },
+    { 1004, "0ea48401cc92ae6bc92ae76685269cb0167fbe1a" },
+    { 1005, "ecbcd7c879b295bafcd8766cbeac58cc371e31d1" },
+    { 1006, "eb4a4a3d07d1e9a15e6f1ab8a9c47f243e27324c" },
+    { 1336, "f5950ee1d77c10e9011d2149699c9366fe52529c" },
+    { 1344, "b04263604a63c351b0b3b9cf1785b4bdba6c8838" },
+    { 1399, "8cb1cff61d5b784045974a2fc69386e3b8d24218" },
+    { 1400, "9bb2f3fcbeddb2b90f0be797cd647334a2816d51" },
+    { 1401, "23ae462a7a0cb440f7445791079a5d75a535dd33" },
+    { 1402, "832974b524a4d3f9cc2f45a3cabf5ccef65cd2aa" },
+    { 1403, "d1c683742fe404c3c20d5704a5430e7832a7ec95" },
+    { 1404, "867c79042e64f310628e219d8b85594cd0c7adc3" },
+    { 1405, "c9d81d49d13d94358f56ccfd61af02b36c69f7c3" },
+    { 1406, "0df43daab2786172f9b8d07d61f14a070cf1287a" },
+    { 1407, "0fd8f3ad7f169534b274d4c66bbddd89f759e391" },
+    { 1408, "3987511182b18473a564436003139b808fa46343" },
+    { 1409, "ef667e063c9e9f539a8987a8d0bd3066ee85d901" },
+    { 2048, "921109c99f3fedaca21727156d5f2b4460175327" },
+    { 2049, "47188600dd165eb45f27c27196d3c46f4f042c1b" },
+    { 2050, "8831939904009338de10e7fa670847041387807d" },
+    { 2051, "2f8ebb5db2997d614e767be1050366f3641e7520" },
+    { 2052, "669e51cd730dae158d3bef8adba075bd95a0d011" },
+    { 3072, "cfee66cfd83abc8451af3c96c6b35a41cc6c55f5" },
+    { 3074, "216ea26f02976a261b7d21a4dd3085157bedfabd" },
+    { 3075, "bd612ebba021fd8e012b14c3bd60c8c5161fabc0" },
+    { 4048, "c2564c1fdf2d5e9d7dde7aace2643428e90662e8" },
+    { 4052, "91ce61fe924b445dfe7b5a1dcd10a27caec16df6" },
+    { 4058, "db2a9be5ee8124f091c7ebd699266c5de223c164" },
+    { 6144, "855109903feae2ba3a7a05a326b8a171116eb368" },
+    { 6150, "37520bb3a668294d9c7b073e7e3daf8fee248a78" },
+    { 6400, "60a353c841b6d2b1a05890349dad2fa33c7536b7" },
+    { 6528, "9e53a43a69bb42d7c8522ca8bd632e421d5edb36" },
+    { 8192, "a918cb0da862eaea0a33ee0efea50243e6b4927c" },
+    { 8320, "29a5dcf55d1db29cd113fcf0572ae414f1c71329" },
+    {16384, "6fb27966138e0c8d5a0d65ace817ebd53633cee1" },
+    {18432, "ca09900d891c7c9ae2a559b10f63a217003341c1" },
+    { 0, NULL },
+};
+
+/* Key         = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ *               0x11, 0x12, 0x13, 0x14
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ */
+static MV_CESA_SIZE_TEST     shaMultiSizeTest404[] =
+{
+    { 80,   "beaf20a34b06a87558d156c0949bc3957d40222e" },
+    { 512,  "3353955358d886bc2940a3c7f337ff7dafb59c7b" },
+    { 1000, "8737a542c5e9b2b6244b757ebb69d5bd602a829f" },
+    { 1001, "fd9e7582d8a5d3c9fe3b923e4e6a41b07a1eb4d4" },
+    { 1002, "a146d14a6fc3c274ff600568f4d75b977989e00d" },
+    { 1003, "be22601bbc027ddef2dec97d30b3dc424fd803c5" },
+    { 1004, "3e71fe99b2fe2b7bfdf4dbf0c7f3da25d7ea35e7" },
+    { 1005, "2c422735d7295408fddd76f5e8a83a2a8da13df3" },
+    { 1006, "6d875319049314b61855101a647b9ba3313428e6" },
+    { 1336, "c1631ea80bad9dc43a180712461b65a0598c711c" },
+    { 1344, "816069bf91d34581005746e2e0283d0f9c7b7605" },
+    { 1399, "4e139866dc61cfcb8b67ca2ebd637b3a538593af" },
+    { 1400, "ff2a0f8dd2b02c5417910f6f55d33a78e081a723" },
+    { 1401, "ab00c12be62336964cbce31ae97fe2a0002984d5" },
+    { 1402, "61349e7f999f3a1acc56c3e9a5060a9c4a7b05b6" },
+    { 1403, "3edbc0f61e435bc1317fa27d840076093fb79353" },
+    { 1404, "d052c6dfdbe63d45dab23ef9893e2aa4636aca1e" },
+    { 1405, "0cc16b7388d67bf0add15a31e6e6c753cfae4987" },
+    { 1406, "c96ba7eaad74253c38c22101b558d2850b1d1b90" },
+    { 1407, "3445428a40d2c6556e7c55797ad8d323b61a48d9" },
+    { 1408, "8d6444f937a09317c89834187b8ea9b8d3a8c56b" },
+    { 1409, "c700acd3ecd19014ea2bdb4d42510c467e088475" },
+    { 2048, "ee27d2a0cb77470c2f496212dfd68b5bb7b04e4b" },
+    { 2049, "683762d7a02983b26a6d046e6451d9cd82c25932" },
+    { 2050, "0fd20f1d55a9ee18363c2a6fd54aa13aee69992f" },
+    { 2051, "86c267d8cc4bc8d59090e4f8b303da960fd228b7" },
+    { 2052, "452395ae05b3ec503eea34f86fc0832485ad97c1" },
+    { 3072, "75198e3cfd0b9bcff2dabdf8e38e6fdaa33ca49a" },
+    { 3074, "4e24785ef080141ce4aab4675986d9acea624d7c" },
+    { 3075, "3a20c5978dd637ec0e809bf84f0d9ccf30bc65bf" },
+    { 4048, "3c32da256be7a7554922bf5fed51b0d2d09e59ad" },
+    { 4052, "fff898426ea16e54325ae391a32c6c9bce4c23c0" },
+    { 4058, "c800b9e562e1c91e1310116341a3c91d37f848ec" },
+    { 6144, "d91d509d0cc4376c2d05bf9a5097717a373530e6" },
+    { 6150, "d957030e0f13c5df07d9eec298542d8f94a07f12" },
+    { 6400, "bb745313c3d7dc17b3f955e5534ad500a1082613" },
+    { 6528, "77905f80d9ca82080bbb3e5654896dabfcfd1bdb" },
+    { 8192, "5237fd9a81830c974396f99f32047586612ff3c0" },
+    { 8320, "57668e28d5f2dba0839518a11db0f6af3d7e08bf" },
+    {16384, "62e093fde467f0748087beea32e9af97d5c61241" },
+    {18432, "845fb33130c7d6ea554fd5aacb9c50cf7ccb5929" },
+    { 0, NULL },
+};
+
+/* HASH-SHA1
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ *               repeated "size" times
+ */
+static MV_CESA_SIZE_TEST     shaMultiSizeTest405[] =
+{
+    { 80,   "50abf5706a150990a08b2c5ea40fa0e585554732" },
+    { 512,  "f14516a08948fa27917a974d219741a697ba0087" },
+    { 1000, "0bd18c378d5788817eb4f1e5dc07d867efa5cbf4" },
+    { 1001, "ca29b85c35db1b8aef83c977893a11159d1b7aa2" },
+    { 1002, "d83bc973eaaedb8a31437994dabbb3304b0be086" },
+    { 1003, "2cf7bbef0acd6c00536b5c58ca470df9a3a90b6c" },
+    { 1004, "e4375d09b1223385a8a393066f8209acfd936a80" },
+    { 1005, "1029b38043e027745d019ce1d2d68e3d8b9d8f99" },
+    { 1006, "deea16dcebbd8ac137e2b984deb639b9fb5e9680" },
+    { 1336, "ea031b065fff63dcfb6a41956e4777520cdbc55d" },
+    { 1344, "b52096c6445e6c0a8355995c70dc36ae186c863c" },
+    { 1399, "cde2f6f8379870db4b32cf17471dc828a8dbff2b" },
+    { 1400, "e53ff664064bc09fe5054c650806bd42d8179518" },
+    { 1401, "d1156db5ddafcace64cdb510ff0d4af9b9a8ad64" },
+    { 1402, "34ede0e9a909dd84a2ae291539105c0507b958e1" },
+    { 1403, "a772ca3536da77e6ad3251e4f9e1234a4d7b87c0" },
+    { 1404, "29740fd2b04e7a8bfd32242db6233156ad699948" },
+    { 1405, "65b17397495b70ce4865dad93bf991b74c97cce1" },
+    { 1406, "a7ee89cd0754061fdb91af7ea6abad2c69d542e3" },
+    { 1407, "3eebf82f7420188e23d328b7ce93580b279a5715" },
+    { 1408, "e08d3363a8b9a490dfb3a4c453452b8f114deeec" },
+    { 1409, "95d74df739181a4ff30b8c39e28793a36598e924" },
+    { 2048, "aa40262509c2abf84aab0197f83187fc90056d91" },
+    { 2049, "7dec28ef105bc313bade8d9a7cdeac58b99de5ea" },
+    { 2050, "d2e30f77ec81197de20f56588a156094ecb88450" },
+    { 2051, "6b22ccc874833e96551a39da0c0edcaa0d969d92" },
+    { 2052, "f843141e57875cd669af58744bc60aa9ea59549c" },
+    { 3072, "09c5fedeaa62c132e673cc3c608a00142273d086" },
+    { 3074, "b09e95eea9c7b1b007a58accec488301901a7f3d" },
+    { 3075, "e6226b77b4ada287a8c9bbcf4ed71eec5ce632dc" },
+    { 4048, "e99394894f855821951ddddf5bfc628547435f5c" },
+    { 4052, "32d2f1af38be9cfba6cd03d55a254d0b3e1eb382" },
+    { 4058, "d906552a4f2aca3a22e1fecccbcd183d7289d0ef" },
+    { 6144, "2e7f62d35a860988e1224dc0543204af19316041" },
+    { 6150, "d6b89698ee133df46fec9d552fadc328aa5a1b51" },
+    { 6400, "dff50e90c46853988fa3a4b4ce5dda6945aae976" },
+    { 6528, "9e63ec0430b96db02d38bc78357a2f63de2ab7f8" },
+    { 8192, "971eb71ed60394d5ab5abb12e88420bdd41b5992" },
+    { 8320, "91606a31b46afeaac965cecf87297e791b211013" },
+    {16384, "547f830a5ec1f5f170ce818f156b1002cabc7569" },
+    {18432, "f16f272787f3b8d539652e4dc315af6ab4fda0ef" },
+    { 0, NULL },
+};
+
+/* CryptoKey   = 0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef;
+ * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ * Note: only sizes aligned to 3DES block size (8 bytes) allowed
+ */
+static MV_CESA_SIZE_TEST     tripleDesMdMultiSizeTest502[] =
+{
+    {   64, "9586962a2aaaef28803dec2e17807a7f" },
+    {   80, "b7726a03aad490bd6c5a452a89a1b271" },
+    {  352, "f1ed9563aecc3c0d2766eb2bed3b4e4c" },
+    {  512, "0f9decb11ab40fe86f4d4d9397bc020e" },
+    { 1000, "3ba69deac12cab8ff9dff7dbd9669927" },
+    { 1336, "6cf47bf1e80e03e2c1d0945bc50d37d2" },
+    { 1344, "4be388dab21ceb3fa1b8d302e9b821f7" },
+    { 1400, "a58b79fb21dd9bfc6ec93e3b99fb0ef1" },
+    { 1408, "8bc97379fc2ac3237effcdd4f7a86528" },
+    { 2048, "1339f03ab3076f25a20bc4cba16eb5bf" },
+    { 3072, "731204d2d90c4b36ae41f5e1fb874288" },
+    { 4048, "c028d998cfda5642547b7e1ed5ea16e4" },
+    { 6144, "b1b19cd910cc51bd22992f1e59f1e068" },
+    { 6400, "44e4613496ba622deb0e7cb768135a2f" },
+    { 6528, "3b06b0a86f8db9cd67f9448dfcf10549" },
+    { 8192, "d581780b7163138a0f412be681457d82" },
+    {16384, "03b8ac05527faaf1bed03df149c65ccf" },
+    {18432, "677c8a86a41dab6c5d81b85b8fb10ff6" },
+    { 0, NULL },
+};
+
+
+/* CryptoKey   = 0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef;
+ * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ *               0x11, 0x12, 0x13, 0x14
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ * Note: only sizes aligned to 3DES block size (8 bytes) allowed
+ */
+static MV_CESA_SIZE_TEST     tripleDesShaMultiSizeTest503[] =
+{
+    {   64, "44a1e9bcbfc1429630d9ea68b7a48b0427a684f2" },
+    {   80, "b2ddeaca91030eab5b95a234ef2c0f6e738ff883" },
+    {  352, "4b91864c7ff629bdff75d9726421f76705452aaf" },
+    {  512, "6dd37faceeb2aa98ba74f4242ed6734a4d546af5" },
+    { 1000, "463661c30300be512a9df40904f0757cde5f1141" },
+    { 1336, "b931f831d9034fe59c65176400b039fe9c1f44a5" },
+    { 1344, "af8866b1cd4a4887d6185bfe72470ffdfb3648e1" },
+    { 1400, "49c6caf07296d5e31d2504d088bc5b20c3ee7cdb" },
+    { 1408, "fcae8deedbc6ebf0763575dc7e9de075b448a0f4" },
+    { 2048, "edece5012146c1faa0dd10f50b183ba5d2af58ac" },
+    { 3072, "5b83625adb43a488b8d64fecf39bb766818547b7" },
+    { 4048, "d2c533678d26c970293af60f14c8279dc708bfc9" },
+    { 6144, "b8f67af4f991b08b725f969b049ebf813bfacc5c" },
+    { 6400, "d9a6c7f746ac7a60ef2edbed2841cf851c25cfb0" },
+    { 6528, "376792b8c8d18161d15579fb7829e6e3a27e9946" },
+    { 8192, "d890eabdca195b34ef8724b28360cffa92ae5655" },
+    {16384, "a167ee52639ec7bf19aee9c6e8f76667c14134b9" },
+    {18432, "e4396ab56f67296b220985a12078f4a0e365d2cc" },
+    { 0, NULL },
+};
+
+/* CryptoKey   = 0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef
+ * IV          = 0x12345678, 0x90abcdef
+ * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ * Note: only sizes aligned to 3DES block size (8 bytes) allowed
+ */
+static MV_CESA_SIZE_TEST     cbc3desMdMultiSizeTest504[] =
+{
+    {   64, "8d10e00802460ede0058c139ba48bd2d" },
+    {   80, "6f463057e1a90e0e91ae505b527bcec0" },
+    {  352, "4938d48bdf86aece2c6851e7c6079788" },
+    {  512, "516705d59f3cf810ebf2a13a23a7d42e" },
+    { 1000, "a5a000ee5c830e67ddc6a2d2e5644b31" },
+    { 1336, "44af60087b74ed07950088efbe3b126a" },
+    { 1344, "1f5b39e0577920af731dabbfcf6dfc2a" },
+    { 1400, "6804ea640e29b9cd39e08bc37dbce734" },
+    { 1408, "4fb436624b02516fc9d1535466574bf9" },
+    { 2048, "c909b0985c423d8d86719f701e9e83db" },
+    { 3072, "cfe0bc34ef97213ee3d3f8b10122db21" },
+    { 4048, "03ea10b5ae4ddeb20aed6af373082ed1" },
+    { 6144, "b9a0ff4f87fc14b3c2dc6f0ed0998fdf" },
+    { 6400, "6995f85d9d4985dd99e974ec7dda9dd6" },
+    { 6528, "bbbb548ce2fa3d58467f6a6a5168a0e6" },
+    { 8192, "afe101fbe745bb449ae4f50d10801456" },
+    {16384, "9741706d0b1c923340c4660ff97cacdf" },
+    {18432, "b0217becb73cb8f61fd79c7ce9d023fb" },
+    { 0, NULL },
+};
+
+
+/* CryptoKey   = 0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef;
+ * IV          = 0x12345678, 0x90abcdef
+ * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ *               0x11, 0x12, 0x13, 0x14
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ * Note: only sizes aligned to 3DES block size (8 bytes) allowed
+ */
+static MV_CESA_SIZE_TEST     cbc3desShaMultiSizeTest505[] =
+{
+    {   64, "409187e5bdb0be4a7754ca3747f7433dc4f01b98" },
+    {   80, "1b002ed050be743aa98860cf35659646bb8efcc0" },
+    {  352, "6cbf7ebe50fa4fa6eecc19eca23f9eae553ccfff" },
+    {  512, "cfb5253fb4bf72b743320c30c7e48c54965853b0" },
+    { 1000, "95e04e1ca2937e7c5a9aba9e42d2bcdb8a7af21f" },
+    { 1336, "3b5c1f5eee5837ebf67b83ae01405542d77a6627" },
+    { 1344, "2b3d42ab25615437f98a1ee310b81d07a02badc2" },
+    { 1400, "7f8687df7c1af44e4baf3c934b6cca5ab6bc993e" },
+    { 1408, "473a581c5f04f7527d50793c845471ac87e86430" },
+    { 2048, "e41d20cae7ebe34e6e828ed62b1e5734019037bb" },
+    { 3072, "275664afd7a561d804e6b0d204e53939cde653ae" },
+    { 4048, "0d220cc5b34aeeb46bbbd637dde6290b5a8285a3" },
+    { 6144, "cb393ddcc8b1c206060625b7d822ef9839e67bc5" },
+    { 6400, "dd3317e2a627fc04800f74a4b05bfda00fab0347" },
+    { 6528, "8a74c3b2441ab3f5a7e08895cc432566219a7c41" },
+    { 8192, "b8e6ef3a549ed0e005bd5b8b1a5fe6689e9711a7" },
+    {16384, "55f59404008276cdac0e2ba0d193af2d40eac5ce" },
+    {18432, "86ae6c4fc72369a54cce39938e2d0296cd9c6ec5" },
+    { 0, NULL },
+};
+
+
+/* CryptoKey   = 0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef
+ * IV          = 0x12345678, 0x90abcdef
+ * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ * Note: only sizes aligned to AES block size (16 bytes) allowed
+ */
+static MV_CESA_SIZE_TEST     cbcAes128md5multiSizeTest506[] =
+{
+    {   16, "7ca4c2ba866751598720c5c4aa0d6786" },
+    {   64, "7dba7fb988e80da609b1fea7254bced8" },
+    {   80, "6b6e863ac5a71d15e3e9b1c86c9ba05f" },
+    {  352, "a1ceb9c2e3021002400d525187a9f38c" },
+    {  512, "596c055c1c55db748379223164075641" },
+    { 1008, "f920989c02f3b3603f53c99d89492377" },
+    { 1344, "2e496b73759d77ed32ea222dbd2e7b41" },
+    { 1408, "7178c046b3a8d772efdb6a71c4991ea4" },
+    { 2048, "a917f0099c69eb94079a8421714b6aad" },
+    { 3072, "693cd5033d7f5391d3c958519fa9e934" },
+    { 4048, "139dca91bcff65b3c40771749052906b" },
+    { 6144, "428d9cef6df4fb70a6e9b6bbe4819e55" },
+    { 6400, "9c0b909e76daa811e12b1fc17000a0c4" },
+    { 6528, "ad876f6297186a7be1f1b907ed860eda" },
+    { 8192, "479cbbaca37dd3191ea1f3e8134a0ef4" },
+    {16384, "60fda559c74f91df538100c9842f2f15" },
+    {18432, "4a3eb1cba1fa45f3981270953f720c42" },
+    { 0, NULL },
+};
+
+
+/* CryptoKey   = 0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef,
+ *               0x01234567, 0x89abcdef;
+ * IV          = 0x12345678, 0x90abcdef
+ * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
+ *               0x11, 0x12, 0x13, 0x14
+ * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
+ * Note: only sizes aligned to AES block size (16 bytes) allowed
+ */
+static MV_CESA_SIZE_TEST     cbcAes128sha1multiSizeTest507[] =
+{
+    {   16, "9aa8dc1c45f0946daf78057fa978759c625c1fee" },
+    {   64, "9f588fc1ede851e5f8b20256abc9979465ae2189" },
+    {   80, "13558472d1fc1c90dffec6e5136c7203452d509b" },
+    {  352, "6b93518e006cfaa1f7adb24615e7291fb0a27e06" },
+    {  512, "096874951a77fbbf333e49d80c096ee2016e09bd" },
+    { 1008, "696fc203c2e4b5ae0ec5d1db3f623c490bc6dbac" },
+    { 1344, "79bf77509935ccd3528caaac6a5eb6481f74029b" },
+    { 1408, "627f9462b95fc188e8cfa7eec15119bdc5d4fcf1" },
+    { 2048, "3d50d0c005feba92fe41502d609fced9c882b4d1" },
+    { 3072, "758807e5b983e3a91c06fb218fe0f73f77111e94" },
+    { 4048, "ca90e85242e33f005da3504416a52098d0d31fb2" },
+    { 6144, "8044c1d4fd06642dfc46990b4f18b61ef1e972cf" },
+    { 6400, "166f1f4ea57409f04feba9fb1e39af0e00bd6f43" },
+    { 6528, "0389016a39485d6e330f8b4215ddf718b404f7e9" },
+    { 8192, "6df7ee2a8b61d6f7f860ce8dbf778f0c2a5b508b" },
+    {16384, "a70a6d8dfa1f91ded621c3dbaed34162bc48783f" },
+    {18432, "8dfad627922ce15df1eed10bdbed49244efa57db" },
+    { 0, NULL },
+};
+
+
+void    cesaTestPrintStatus(void);
+
+
+/*------------------------- LOCAL FUNCTIONs ---------------------------------*/
+MV_STATUS testCmd(int sid, int iter, MV_CESA_COMMAND* pCmd,
+                  MV_CESA_TEST_SESSION* pTestSession, MV_U8* pIV, int ivSize);
+MV_STATUS testClose(int idx);
+MV_STATUS testOpen(int idx);
+void close_session(int sid);
+void cesaTestCheckReady(const MV_CESA_RESULT *r);
+void cesaCheckReady(MV_CESA_RESULT* r);
+void printTestResults(int idx, MV_STATUS status, int checkMode);
+void cesaLastResult(void);
+void cesaTestPrintReq(int req, int offset, int size);
+
+void cesaTestPrintStatus(void);
+void cesaTestPrintSession(int idx);
+void sizeTest(int testIdx, int iter, int checkMode);
+void multiTest(int iter, int reqSize, int checkMode);
+void oneTest(int testIdx, int caseIdx,int iter, int reqSize, int checkMode);
+void multiSizeTest(int idx, int iter, int checkMode, char* inputData);
+void cesaTest(int iter, int reqSize, int checkMode);
+void cesaOneTest(int testIdx, int caseIdx,int iter, int reqSize, int checkMode);
+void combiTest(int iter, int reqSize, int checkMode);
+void shaTest(int iter, int reqSize, int checkMode);
+void mdTest(int iter, int reqSize, int checkMode);
+void aesTest(int iter, int reqSize, int checkMode);
+void tripleDesTest(int iter, int reqSize, int checkMode);
+void desTest(int iter, int reqSize, int checkMode);
+void cesaTestStop(void);
+MV_STATUS testRun(int idx, int caseIdx, int iter,int reqSize, int checkMode);
+void cesaTestStart(int bufNum, int bufSize);
+
+
+static MV_U32      getRate(MV_U32* remainder)
+{
+    MV_U32     kBits, milliSec, rate;
+
+    milliSec = 0;
+    if( (cesaEndTicks - cesaBeginTicks) > 0)
+    {
+        milliSec = CESA_TEST_TICK_TO_MS(cesaEndTicks - cesaBeginTicks);
+    }
+    if(milliSec == 0)
+    {
+        if(remainder != NULL)
+            *remainder = 0;
+        return 0;
+    }
+
+    kBits = (cesaIteration*cesaRateSize*8)/1000;
+    rate = kBits/milliSec;
+    if(remainder != NULL)
+        *remainder = ((kBits % milliSec)*10)/milliSec;
+
+    return rate;
+}
+
+static char*    extractMbuf(MV_CESA_MBUF *pMbuf,
+                            int offset, int size, char* hexStr)
+{
+    mvCesaCopyFromMbuf((MV_U8*)cesaBinBuffer, pMbuf, offset, size);
+    mvBinToHex((const MV_U8*)cesaBinBuffer, hexStr, size);
+
+    return hexStr;
+}
+
+static MV_BOOL  cesaCheckMbuf(MV_CESA_MBUF *pMbuf,
+                          const char* hexString, int offset,
+                          int checkSize)
+{
+    MV_BOOL     isFailed = MV_FALSE;
+    MV_STATUS   status;
+    int         size = strlen(hexString)/2;
+    int         checkedSize = 0;
+/*
+    mvOsPrintf("cesaCheckMbuf: pMbuf=%p, offset=%d, checkSize=%d, mBufSize=%d\n",
+                pMbuf, offset, checkSize, pMbuf->mbufSize);
+*/
+    if(pMbuf->mbufSize < (checkSize + offset))
+    {
+        mvOsPrintf("checkSize (%d) is too large: offset=%d, mbufSize=%d\n",
+                    checkSize, offset, pMbuf->mbufSize);
+        return MV_TRUE;
+    }
+    status = mvCesaCopyFromMbuf((MV_U8*)cesaBinBuffer, pMbuf, offset, checkSize);
+    if(status != MV_OK)
+    {
+        mvOsPrintf("CesaTest: Can't copy %d bytes from Mbuf=%p to checkBuf=%p\n",
+                    checkSize, pMbuf, cesaBinBuffer);
+        return MV_TRUE;
+    }
+/*
+    mvDebugMemDump(cesaBinBuffer, size, 1);
+*/
+    mvHexToBin(hexString, (MV_U8*)cesaExpBinBuffer, size);
+
+    /* Compare buffers */
+    while(checkSize > checkedSize)
+    {
+        size = MV_MIN(size, (checkSize - checkedSize));
+        if(memcmp(cesaExpBinBuffer, &cesaBinBuffer[checkedSize], size) != 0)
+        {
+            mvOsPrintf("CheckMbuf failed: checkSize=%d, size=%d, checkedSize=%d\n",
+                        checkSize, size, checkedSize);
+            mvDebugMemDump(&cesaBinBuffer[checkedSize], size, 1);
+            mvDebugMemDump(cesaExpBinBuffer, size, 1);
+
+            isFailed = MV_TRUE;
+            break;
+        }
+        checkedSize += size;
+    }
+
+    return isFailed;
+}
+
+static MV_STATUS    cesaSetMbuf(MV_CESA_MBUF *pMbuf,
+                        const char* hexString,
+                        int offset, int reqSize)
+{
+    MV_STATUS   status = MV_OK;
+    int         copySize, size = strlen(hexString)/2;
+
+    mvHexToBin(hexString, (MV_U8*)cesaBinBuffer, size);
+
+    copySize = 0;
+    while(reqSize > copySize)
+    {
+        size = MV_MIN(size, (reqSize - copySize));
+
+        status = mvCesaCopyToMbuf((MV_U8*)cesaBinBuffer, pMbuf, offset+copySize, size);
+        if(status != MV_OK)
+        {
+            mvOsPrintf("cesaSetMbuf Error: Copy %d of %d bytes to MBuf\n",
+                        copySize, reqSize);
+            break;
+        }
+        copySize += size;
+    }
+    pMbuf->mbufSize = offset+copySize;
+    return status;
+}
+
+static  MV_CESA_TEST_SESSION* getTestSessionDb(int idx, int* pTestIdx)
+{
+    int                 testIdx, dbIdx = idx/100;
+
+    if(dbIdx > MAX_TEST_TYPE)
+    {
+        mvOsPrintf("Wrong index %d - No such test type\n", idx);
+        return NULL;
+    }
+    testIdx = idx % 100;
+
+    if(testIdx >= cesaTestsDB[dbIdx].numSessions)
+    {
+        mvOsPrintf("Wrong index %d - No such test\n", idx);
+        return NULL;
+    }
+    if(pTestIdx != NULL)
+        *pTestIdx = testIdx;
+
+    return  cesaTestsDB[dbIdx].pSessions;
+}
+
+/* Debug */
+void    cesaTestPrintReq(int req, int offset, int size)
+{
+    MV_CESA_MBUF*   pMbuf;
+
+    mvOsPrintf("cesaTestPrintReq: req=%d, offset=%d, size=%d\n", 
+                req, offset, size);
+    mvDebugMemDump(cesaCmdRing, 128, 4);
+
+    pMbuf = cesaCmdRing[req].pSrc;
+    mvCesaDebugMbuf("src", pMbuf, offset,size);
+    pMbuf = cesaCmdRing[req].pDst;
+    mvCesaDebugMbuf("dst", pMbuf, offset, size);
+
+    cesaTestPrintStatus();
+}
+
+void    cesaLastResult(void)
+{
+        mvOsPrintf("Last Result: ReqId = %d, SessionId = %d, rc = (%d)\n",
+                (MV_U32)cesaResult.pReqPrv, cesaResult.sessionId,
+                cesaResult.retCode);
+}
+
+void    printTestResults(int idx, MV_STATUS status, int checkMode)
+{
+    int                     testIdx;
+    MV_CESA_TEST_SESSION*   pTestSessions = getTestSessionDb(idx, &testIdx);
+
+    if(pTestSessions == NULL)
+        return;
+
+    mvOsPrintf("%-35s %4dx%-4d : ", pTestSessions[testIdx].name,
+            cesaIteration, cesaReqSize);
+    if( (status == MV_OK)      &&
+        (cesaCryptoError == 0) &&
+        (cesaError == 0)       &&
+        (cesaReqIdError == 0) )
+    {
+        mvOsPrintf("Passed, Rate=%3u.%u Mbps (%5u cpp)\n", 
+                     cesaRate, cesaRateAfterDot, cesaEndTicks - cesaBeginTicks);
+    }
+    else
+    {
+        mvOsPrintf("Failed, Status = 0x%x\n", status);
+        if(cesaCryptoError > 0)
+            mvOsPrintf("cryptoError : %d\n", cesaCryptoError);
+        if(cesaReqIdError > 0)
+            mvOsPrintf("reqIdError  : %d\n", cesaReqIdError);
+        if(cesaError > 0)
+            mvOsPrintf("cesaError  : %d\n", cesaError);
+    }
+    if(cesaTestIsrMissCount > 0)
+        mvOsPrintf("cesaIsrMissed  : %d\n", cesaTestIsrMissCount);
+}
+
+void cesaCheckReady(MV_CESA_RESULT* r)
+{
+    int             reqId;
+    MV_CESA_MBUF    *pMbuf;
+    MV_BOOL         isFailed;
+
+    cesaResult  =  *r;
+    reqId = (int)cesaResult.pReqPrv;
+    pMbuf = cesaCmdRing[reqId].pDst;
+
+/*
+    mvOsPrintf("cesaCheckReady: reqId=%d, checkOffset=%d, checkSize=%d\n",
+                    reqId, cesaCheckOffset, cesaCheckSize);
+*/
+    /* Check expected reqId */
+    if(reqId != cesaExpReqId)
+    {
+        cesaReqIdError++;
+/*
+        mvOsPrintf("CESA reqId Error: cbIter=%d (%d), reqId=%d, expReqId=%d\n",
+                    cesaCbIter, cesaIteration, reqId, cesaExpReqId);
+*/
+    }
+    else
+    {
+        if( (cesaCheckMode == CESA_FULL_CHECK_MODE) ||
+            (cesaCheckMode == CESA_FAST_CHECK_MODE) )
+        {
+            if(cesaResult.retCode != MV_OK)
+            {
+                cesaError++;
+
+                mvOsPrintf("CESA Error: cbIter=%d (%d), reqId=%d, rc=%d\n",
+                            cesaCbIter, cesaIteration, reqId, cesaResult.retCode);
+            }
+            else
+            {
+                if( (cesaCheckSize > 0) && (cesaOutputHexStr != NULL) )
+                {
+                    /* Check expected output */
+
+                    isFailed = cesaCheckMbuf(pMbuf, cesaOutputHexStr, cesaCheckOffset, cesaCheckSize);
+                    if(isFailed)
+                    {
+                        mvOsPrintf("CESA Crypto Error: cbIter=%d (%d), reqId=%d\n",
+                                    cesaCbIter, cesaIteration, reqId);
+
+                        CESA_TEST_DEBUG_PRINT(("Error: reqId=%d, reqSize=%d, checkOffset=%d, checkSize=%d\n",
+                                    reqId, cesaReqSize, cesaCheckOffset, cesaCheckSize));
+
+                        CESA_TEST_DEBUG_PRINT(("Output str: %s\n", cesaOutputHexStr));
+
+                        CESA_TEST_DEBUG_CODE( mvCesaDebugMbuf("error", pMbuf, 0, cesaCheckOffset+cesaCheckSize) );
+
+                        cesaCryptoError++;
+                    }
+                }
+            }
+        }
+    }
+    if(cesaCheckMode == CESA_SHOW_CHECK_MODE)
+    {
+        extractMbuf(pMbuf, cesaCheckOffset, cesaCheckSize, cesaHexBuffer);
+        mvOsPrintf("%4d, %s\n", cesaCheckOffset, cesaHexBuffer);
+    }
+
+    cesaCbIter++;
+    if(cesaCbIter >= cesaIteration)
+    {
+        cesaCbIter = 0;
+        cesaExpReqId = 0;
+        cesaIsReady = MV_TRUE;
+
+        cesaEndTicks = CESA_TEST_TICK_GET();
+        cesaRate = getRate(&cesaRateAfterDot);
+    }
+    else
+    {
+        cesaExpReqId = reqId + 1;
+        if(cesaExpReqId == CESA_DEF_REQ_SIZE)
+            cesaExpReqId = 0;
+    }
+}
+
+
+#ifdef MV_NETBSD
+static int cesaTestReadyIsr(void *arg)
+#else
+#ifdef __KERNEL__
+static irqreturn_t cesaTestReadyIsr( int irq , void *dev_id)
+#endif
+#ifdef MV_VXWORKS
+void   cesaTestReadyIsr(void)
+#endif
+#endif
+{
+    MV_U32          cause;
+    MV_STATUS       status;
+    MV_CESA_RESULT  result;
+
+    cesaTestIsrCount++;
+    /* Clear cause register */
+    cause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
+    if( (cause & MV_CESA_CAUSE_ACC_DMA_ALL_MASK) == 0)
+    {
+        mvOsPrintf("cesaTestReadyIsr: cause=0x%x\n", cause);
+#ifdef MV_NETBSD
+        return 0;
+#else
+#ifdef __KERNEL__
+        return 1;
+#else
+        return;
+#endif
+#endif
+    }
+
+    MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
+
+    while(MV_TRUE)
+    {
+        /* Get Ready requests */
+        status = mvCesaReadyGet(&result);
+        if(status == MV_OK)
+            cesaCheckReady(&result);
+
+        break;
+    }
+    if( (cesaTestFull == 1) && (status != MV_BUSY) )
+    {
+        cesaTestFull = 0;
+        CESA_TEST_WAKE_UP();
+    }
+
+#ifdef __KERNEL__
+    return 1;
+#endif
+}
+
+void
+cesaTestCheckReady(const MV_CESA_RESULT *r)
+{
+	MV_CESA_RESULT result = *r;
+
+	cesaCheckReady(&result);
+
+	if (cesaTestFull == 1) {
+		cesaTestFull = 0;
+		CESA_TEST_WAKE_UP();
+	}
+}
+
+static INLINE int   open_session(MV_CESA_OPEN_SESSION* pOs)
+{
+    MV_U16      sid;
+    MV_STATUS   status;
+
+    status = mvCesaSessionOpen(pOs, (short*)&sid);
+    if(status != MV_OK)
+    {
+        mvOsPrintf("CesaTest: Can't open new session - status = 0x%x\n",
+                    status);
+        return -1;
+    }
+
+    return  (int)sid;
+}
+
+void close_session(int sid)
+{
+    MV_STATUS   status;
+
+    status = mvCesaSessionClose(sid);
+    if(status != MV_OK)
+    {
+        mvOsPrintf("CesaTest: Can't close session %d - status = 0x%x\n",
+                    sid, status);
+    }
+}
+
+MV_STATUS testOpen(int idx)
+{
+    MV_CESA_OPEN_SESSION    os;
+    int                     sid, i, testIdx;
+    MV_CESA_TEST_SESSION*   pTestSession;
+    MV_U16          digestSize = 0;
+
+    pTestSession = getTestSessionDb(idx, &testIdx);
+    if(pTestSession == NULL)
+    {
+        mvOsPrintf("Test %d is not exist\n", idx);
+        return MV_BAD_PARAM;
+    }
+    pTestSession = &pTestSession[testIdx];
+
+    if(pTestSession->sid != -1)
+    {
+        mvOsPrintf("Session for test %d already created: sid=%d\n",
+                    idx, pTestSession->sid);
+        return MV_OK;
+    }
+
+    os.cryptoAlgorithm = pTestSession->cryptoAlgorithm;
+    os.macMode = pTestSession->macAlgorithm;
+    switch(os.macMode)
+    {
+        case MV_CESA_MAC_MD5:
+        case MV_CESA_MAC_HMAC_MD5:
+            digestSize = MV_CESA_MD5_DIGEST_SIZE;
+            break;
+
+        case MV_CESA_MAC_SHA1:
+        case MV_CESA_MAC_HMAC_SHA1:
+            digestSize = MV_CESA_SHA1_DIGEST_SIZE;
+            break;
+
+        case MV_CESA_MAC_NULL:
+            digestSize = 0;
+    }
+    os.cryptoMode = pTestSession->cryptoMode;
+    os.direction = pTestSession->direction;
+    os.operation = pTestSession->operation;
+
+    for(i=0; i<pTestSession->cryptoKeySize; i++)
+        os.cryptoKey[i] = pTestSession->pCryptoKey[i];
+
+    os.cryptoKeyLength = pTestSession->cryptoKeySize;
+
+    for(i=0; i<pTestSession->macKeySize; i++)
+        os.macKey[i] = pTestSession->pMacKey[i];
+
+    os.macKeyLength = pTestSession->macKeySize;
+    os.digestSize = digestSize;
+
+    sid = open_session(&os);
+    if(sid == -1)
+    {
+        mvOsPrintf("Can't open session for test %d: rc=0x%x\n",
+                    idx, cesaResult.retCode);
+        return cesaResult.retCode;
+    }
+    CESA_TEST_DEBUG_PRINT(("Opened session: sid = %d\n", sid));
+    pTestSession->sid = sid;
+    return MV_OK;
+}
+
+MV_STATUS   testClose(int idx)
+{
+    int                     testIdx;
+    MV_CESA_TEST_SESSION*   pTestSession;
+
+    pTestSession = getTestSessionDb(idx, &testIdx);
+    if(pTestSession == NULL)
+    {
+        mvOsPrintf("Test %d is not exist\n", idx);
+        return MV_BAD_PARAM;
+    }
+    pTestSession = &pTestSession[testIdx];
+
+    if(pTestSession->sid == -1)
+    {
+        mvOsPrintf("Test session %d is not opened\n", idx);
+        return MV_NO_SUCH;
+    }
+
+    close_session(pTestSession->sid);
+    pTestSession->sid = -1;
+
+    return MV_OK;
+}
+
+MV_STATUS testCmd(int sid, int iter, MV_CESA_COMMAND* pCmd,
+             MV_CESA_TEST_SESSION* pTestSession, MV_U8* pIV, int ivSize)
+{
+    int                 cmdReqId = 0;
+    int                 i;
+    MV_STATUS           rc = MV_OK;
+    char                ivZeroHex[] = "0000";
+
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    if(pCmd == NULL)
+    {
+        mvOsPrintf("testCmd failed: pCmd=NULL\n");
+        return MV_BAD_PARAM;
+    }
+    pCmd->sessionId = sid;
+
+    cesaCryptoError = 0;
+    cesaReqIdError = 0;
+    cesaError = 0;
+    cesaTestIsrMissCount = 0;
+    cesaIsReady = MV_FALSE;
+    cesaIteration = iter;
+
+    if(cesaInputHexStr == NULL)
+        cesaInputHexStr = cesaPlainHexEbc;
+
+    for(i=0; i<CESA_DEF_REQ_SIZE; i++)
+    {
+        pCmd->pSrc = (MV_CESA_MBUF*)(cesaCmdRing[i].pSrc);
+        if(pIV != NULL)
+        {
+            /* If IV from SA - set IV in Source buffer to zeros */
+            cesaSetMbuf(pCmd->pSrc, ivZeroHex, 0, pCmd->cryptoOffset);
+            cesaSetMbuf(pCmd->pSrc, cesaInputHexStr, pCmd->cryptoOffset,
+                        (cesaReqSize - pCmd->cryptoOffset));
+        }
+        else
+        {
+            cesaSetMbuf(pCmd->pSrc, cesaInputHexStr, 0, cesaReqSize);
+        }
+        pCmd->pDst = (MV_CESA_MBUF*)(cesaCmdRing[i].pDst);
+        cesaSetMbuf(pCmd->pDst, cesaNullPlainHexText, 0, cesaReqSize);
+
+        memcpy(&cesaCmdRing[i], pCmd, sizeof(*pCmd));
+    }
+
+    if(cesaCheckMode == CESA_SW_SHOW_CHECK_MODE)
+    {
+        MV_U8   pDigest[MV_CESA_MAX_DIGEST_SIZE];
+
+        if(pTestSession->macAlgorithm == MV_CESA_MAC_MD5)
+        {
+            mvMD5(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, pDigest);
+            mvOsPrintf("SW HASH_MD5: reqSize=%d, macLength=%d\n",
+                        cesaReqSize, pCmd->macLength);
+            mvDebugMemDump(pDigest, MV_CESA_MD5_DIGEST_SIZE, 1);
+            return MV_OK;
+        }
+        if(pTestSession->macAlgorithm == MV_CESA_MAC_SHA1)
+        {
+            mvSHA1(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, pDigest);
+            mvOsPrintf("SW HASH_SHA1: reqSize=%d, macLength=%d\n",
+                        cesaReqSize, pCmd->macLength);
+            mvDebugMemDump(pDigest, MV_CESA_SHA1_DIGEST_SIZE, 1);
+            return MV_OK;
+        }
+    }
+
+    cesaBeginTicks = CESA_TEST_TICK_GET();
+    CESA_TEST_DEBUG_CODE( memset(cesaTestTrace, 0, sizeof(cesaTestTrace));
+                     cesaTestTraceIdx = 0;
+    );
+
+    if(cesaCheckMode == CESA_SW_NULL_CHECK_MODE)
+    {
+        volatile MV_U8   pDigest[MV_CESA_MAX_DIGEST_SIZE];
+
+        for(i=0; i<iter; i++)
+        {
+            if(pTestSession->macAlgorithm == MV_CESA_MAC_MD5)
+            {
+                mvMD5(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, (unsigned char*)pDigest);
+            }
+            if(pTestSession->macAlgorithm == MV_CESA_MAC_SHA1)
+            {
+                mvSHA1(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, (MV_U8 *)pDigest);
+            }
+        }
+        cesaEndTicks = CESA_TEST_TICK_GET();
+        cesaRate = getRate(&cesaRateAfterDot);
+        cesaIsReady = MV_TRUE;
+
+        return MV_OK;
+    }
+
+    /*cesaTestIsrCount = 0;*/
+    /*mvCesaDebugStatsClear();*/
+
+#ifndef MV_NETBSD
+    MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
+#endif
+
+    for(i=0; i<iter; i++)
+    {
+        unsigned long flags;
+
+        pCmd = &cesaCmdRing[cmdReqId];
+        pCmd->pReqPrv = (void*)cmdReqId;
+
+        CESA_TEST_LOCK(flags);
+
+        rc = mvCesaAction(pCmd);
+        if(rc == MV_NO_RESOURCE)
+            cesaTestFull = 1;
+
+        CESA_TEST_UNLOCK(flags);
+
+        if(rc == MV_NO_RESOURCE)
+        {
+            CESA_TEST_LOCK(flags);
+            CESA_TEST_WAIT( (cesaTestFull == 0), 100);
+            CESA_TEST_UNLOCK(flags);
+            if(cesaTestFull == 1)
+            {
+                mvOsPrintf("CESA Test timeout: i=%d, iter=%d, cesaTestFull=%d\n",
+                            i, iter, cesaTestFull);
+                cesaTestFull = 0;
+                return MV_TIMEOUT;
+            }
+
+            CESA_TEST_LOCK(flags);
+
+            rc = mvCesaAction(pCmd);
+
+            CESA_TEST_UNLOCK(flags);
+        }
+        if( (rc != MV_OK) && (rc != MV_NO_MORE) )
+        {
+            mvOsPrintf("mvCesaAction failed: rc=%d\n", rc);
+            return rc;
+        }
+
+        cmdReqId++;
+        if(cmdReqId >= CESA_DEF_REQ_SIZE)
+            cmdReqId = 0;
+
+#ifdef MV_LINUX
+        /* Reschedule each 16 requests */
+        if( (i & 0xF) == 0)
+            schedule();
+#endif
+    }
+    return MV_OK;
+}
+
+void    cesaTestStart(int bufNum, int bufSize)
+{
+    int             i, j, idx;
+    MV_CESA_MBUF    *pMbufSrc, *pMbufDst;
+    MV_BUF_INFO     *pFragsSrc, *pFragsDst;
+    char            *pBuf;
+#ifndef MV_NETBSD
+    int             numOfSessions, queueDepth;
+    char            *pSram;
+    MV_STATUS       status;
+    MV_CPU_DEC_WIN  addrDecWin;
+#endif
+
+    cesaCmdRing = mvOsMalloc(sizeof(MV_CESA_COMMAND) * CESA_DEF_REQ_SIZE);
+    if(cesaCmdRing == NULL)
+    {
+        mvOsPrintf("testStart: Can't allocate %ld bytes of memory\n",
+                sizeof(MV_CESA_COMMAND) * CESA_DEF_REQ_SIZE);
+        return;
+    }
+    memset(cesaCmdRing, 0, sizeof(MV_CESA_COMMAND) * CESA_DEF_REQ_SIZE);
+
+    if(bufNum == 0)
+        bufNum = CESA_DEF_BUF_NUM;
+
+    if(bufSize == 0)
+        bufSize = CESA_DEF_BUF_SIZE;
+
+    cesaBufNum = bufNum;
+    cesaBufSize = bufSize;
+    mvOsPrintf("CESA test started: bufNum = %d, bufSize = %d\n",
+                bufNum, bufSize);
+
+    cesaHexBuffer = mvOsMalloc(2*bufNum*bufSize);
+    if(cesaHexBuffer == NULL)
+    {
+        mvOsPrintf("testStart: Can't malloc %d bytes for cesaHexBuffer.\n",
+                    2*bufNum*bufSize);
+        return;
+    }
+    memset(cesaHexBuffer, 0, (2*bufNum*bufSize));
+
+    cesaBinBuffer = mvOsMalloc(bufNum*bufSize);
+    if(cesaBinBuffer == NULL)
+    {
+        mvOsPrintf("testStart: Can't malloc %d bytes for cesaBinBuffer\n",
+                    bufNum*bufSize);
+        return;
+    }
+    memset(cesaBinBuffer, 0, (bufNum*bufSize));
+
+    cesaExpBinBuffer = mvOsMalloc(bufNum*bufSize);
+    if(cesaExpBinBuffer == NULL)
+    {
+        mvOsPrintf("testStart: Can't malloc %d bytes for cesaExpBinBuffer\n",
+                    bufNum*bufSize);
+        return;
+    }
+    memset(cesaExpBinBuffer, 0, (bufNum*bufSize));
+
+    CESA_TEST_WAIT_INIT();
+
+    pMbufSrc = mvOsMalloc(sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
+    pFragsSrc = mvOsMalloc(sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
+
+    pMbufDst = mvOsMalloc(sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
+    pFragsDst = mvOsMalloc(sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
+
+    if( (pMbufSrc == NULL) || (pFragsSrc == NULL) ||
+        (pMbufDst == NULL) || (pFragsDst == NULL) )
+    {
+        mvOsPrintf("testStart: Can't malloc Src and Dst pMbuf and pFrags structures.\n");
+        /* !!!! Dima cesaTestCleanup();*/
+        return;
+    }
+
+    memset(pMbufSrc, 0, sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
+    memset(pFragsSrc, 0, sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
+
+    memset(pMbufDst, 0, sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
+    memset(pFragsDst, 0, sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
+
+    mvOsPrintf("Cesa Test Start: pMbufSrc=%p, pFragsSrc=%p, pMbufDst=%p, pFragsDst=%p\n",
+                pMbufSrc, pFragsSrc, pMbufDst, pFragsDst);
+
+    idx = 0;
+    for(i=0; i<CESA_DEF_REQ_SIZE; i++)
+    {
+        pBuf = mvOsIoCachedMalloc(cesaTestOSHandle,bufSize * bufNum * 2,
+				  &cesaReqBufs[i].bufPhysAddr,
+				  &cesaReqBufs[i].memHandle);
+		if(pBuf == NULL)
+    	{
+        	mvOsPrintf("testStart: Can't malloc %d bytes for pBuf\n",
+                    bufSize * bufNum * 2);
+        	return;
+    	}
+
+        memset(pBuf, 0, bufSize * bufNum * 2);
+        mvOsCacheFlush(cesaTestOSHandle,pBuf, bufSize * bufNum * 2);
+        if(pBuf == NULL)
+        {
+            mvOsPrintf("cesaTestStart: Can't allocate %d bytes for req_%d buffers\n",
+                        bufSize * bufNum * 2, i);
+            return;
+        }
+
+        cesaReqBufs[i].bufVirtPtr = (MV_U8*)pBuf;
+        cesaReqBufs[i].bufSize =  bufSize * bufNum * 2;
+
+        cesaCmdRing[i].pSrc = &pMbufSrc[i];
+        cesaCmdRing[i].pSrc->pFrags = &pFragsSrc[idx];
+        cesaCmdRing[i].pSrc->numFrags = bufNum;
+        cesaCmdRing[i].pSrc->mbufSize = 0;
+
+        cesaCmdRing[i].pDst = &pMbufDst[i];
+        cesaCmdRing[i].pDst->pFrags = &pFragsDst[idx];
+        cesaCmdRing[i].pDst->numFrags = bufNum;
+        cesaCmdRing[i].pDst->mbufSize = 0;
+
+        for(j=0; j<bufNum; j++)
+        {
+            cesaCmdRing[i].pSrc->pFrags[j].bufVirtPtr = (MV_U8*)pBuf;
+            cesaCmdRing[i].pSrc->pFrags[j].bufSize = bufSize;
+            pBuf += bufSize;
+            cesaCmdRing[i].pDst->pFrags[j].bufVirtPtr = (MV_U8*)pBuf;
+            cesaCmdRing[i].pDst->pFrags[j].bufSize = bufSize;
+            pBuf += bufSize;
+        }
+        idx += bufNum;
+    }
+
+#ifndef MV_NETBSD
+    if (mvCpuIfTargetWinGet(CRYPT_ENG, &addrDecWin) == MV_OK)
+        pSram = (char*)addrDecWin.addrWin.baseLow;
+    else
+    {
+        mvOsPrintf("mvCesaInit: ERR. mvCpuIfTargetWinGet failed\n");
+        return;
+    }
+
+#ifdef MV_CESA_NO_SRAM
+    pSram = mvOsMalloc(4*1024+8);
+    if(pSram == NULL)
+    {
+        mvOsPrintf("CesaTest: can't allocate %d bytes for SRAM simulation\n",
+                4*1024+8);
+        /* !!!! Dima cesaTestCleanup();*/
+        return;
+    }
+    pSram = (MV_U8*)MV_ALIGN_UP((MV_U32)pSram, 8);
+#endif /* MV_CESA_NO_SRAM */
+
+    numOfSessions = CESA_DEF_SESSION_NUM;
+    queueDepth = CESA_DEF_REQ_SIZE - MV_CESA_MAX_CHAN;
+
+    status = mvCesaInit(numOfSessions, queueDepth, pSram, NULL);
+    if(status != MV_OK)
+    {
+        mvOsPrintf("mvCesaInit is Failed: status = 0x%x\n", status);
+        /* !!!! Dima cesaTestCleanup();*/
+        return;
+    }
+#endif /* !MV_NETBSD */
+
+    /* Prepare data for tests */
+    for(i=0; i<50; i++)
+        strcat((char*)cesaDataHexStr3, "dd");
+
+    strcpy((char*)cesaDataAndMd5digest3,  cesaDataHexStr3);
+    strcpy((char*)cesaDataAndSha1digest3, cesaDataHexStr3);
+
+    /* Digest must be 8 byte aligned */
+    for(; i<56; i++)
+    {
+        strcat((char*)cesaDataAndMd5digest3, "00");
+        strcat((char*)cesaDataAndSha1digest3, "00");
+    }
+    strcat((char*)cesaDataAndMd5digest3,  cesaHmacMd5digestHex3);
+    strcat((char*)cesaDataAndSha1digest3, cesaHmacSha1digestHex3);
+
+#ifndef MV_NETBSD
+    MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
+    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, MV_CESA_CAUSE_ACC_DMA_MASK);
+#endif
+
+#ifdef MV_VXWORKS
+    {
+        MV_STATUS       status;
+
+        status = intConnect((VOIDFUNCPTR *)INT_LVL_CESA, cesaTestReadyIsr, (int)NULL);
+        if (status != OK)
+        {
+            mvOsPrintf("CESA: Can't connect CESA (%d) interrupt, status=0x%x \n",
+                        INT_LVL_CESA, status);
+            /* !!!! Dima cesaTestCleanup();*/
+            return;
+        }
+        cesaSemId = semMCreate(SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
+        if(cesaSemId == NULL)
+        {
+            mvOsPrintf("cesaTestStart: Can't create semaphore\n");
+            return;
+        }
+        intEnable(INT_LVL_CESA);
+    }
+#endif /* MV_VXWORKS */
+
+#if !defined(MV_NETBSD) && defined(__KERNEL__)
+        if( request_irq(CESA_IRQ, cesaTestReadyIsr, (SA_INTERRUPT) , "cesa_test", NULL ) ) 
+        {
+            mvOsPrintf( "cannot assign irq\n" );
+            /* !!!! Dima cesaTestCleanup();*/
+            return;
+        }
+        spin_lock_init( &cesaLock );
+#endif
+}
+
+MV_STATUS   testRun(int idx, int caseIdx, int iter,
+                    int reqSize, int checkMode)
+{
+    int                     testIdx, count, sid, digestSize;
+    int                     blockSize;
+    MV_CESA_TEST_SESSION*   pTestSession;
+    MV_CESA_COMMAND         cmd;
+    MV_STATUS               status;
+
+    memset(&cmd, 0, sizeof(cmd));
+
+    pTestSession = getTestSessionDb(idx, &testIdx);
+    if(pTestSession == NULL)
+    {
+        mvOsPrintf("Test %d is not exist\n", idx);
+        return MV_BAD_PARAM;
+    }
+    pTestSession = &pTestSession[testIdx];
+
+    sid = pTestSession->sid;
+    if(sid == -1)
+    {
+        mvOsPrintf("Test %d is not opened\n", idx);
+        return MV_BAD_STATE;
+    }
+    switch(pTestSession->cryptoAlgorithm)
+    {
+        case MV_CESA_CRYPTO_DES:
+        case MV_CESA_CRYPTO_3DES:
+            blockSize = MV_CESA_DES_BLOCK_SIZE;
+            break;
+
+        case MV_CESA_CRYPTO_AES:
+            blockSize = MV_CESA_AES_BLOCK_SIZE;
+            break;
+
+        case MV_CESA_CRYPTO_NULL:
+            blockSize = 0;
+            break;
+
+        default:
+            mvOsPrintf("cesaTestRun: Bad CryptoAlgorithm=%d\n",
+                pTestSession->cryptoAlgorithm);
+        return MV_BAD_PARAM;
+    }
+    switch(pTestSession->macAlgorithm)
+    {
+        case MV_CESA_MAC_MD5:
+        case MV_CESA_MAC_HMAC_MD5:
+            digestSize = MV_CESA_MD5_DIGEST_SIZE;
+            break;
+
+        case MV_CESA_MAC_SHA1:
+        case MV_CESA_MAC_HMAC_SHA1:
+            digestSize = MV_CESA_SHA1_DIGEST_SIZE;
+            break;
+        default:
+            digestSize = 0;
+    }
+
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    if(pTestSession->direction == MV_CESA_DIR_ENCODE)
+    {
+        cesaOutputHexStr = cesaTestCases[caseIdx].cipherHexStr;
+        cesaInputHexStr = cesaTestCases[caseIdx].plainHexStr;
+    }
+    else
+    {
+        cesaOutputHexStr = cesaTestCases[caseIdx].plainHexStr;
+        cesaInputHexStr = cesaTestCases[caseIdx].cipherHexStr;
+    }
+
+    cmd.sessionId = sid;
+    if(checkMode == CESA_FAST_CHECK_MODE)
+    {
+        cmd.cryptoLength = cesaTestCases[caseIdx].cryptoLength;
+        cmd.macLength = cesaTestCases[caseIdx].macLength;
+    }
+    else
+    {
+        cmd.cryptoLength = reqSize;
+        cmd.macLength = reqSize;
+    }
+    cesaRateSize = cmd.cryptoLength;
+    cesaReqSize = cmd.cryptoLength;
+    cmd.cryptoOffset = 0;
+    if(pTestSession->operation != MV_CESA_MAC_ONLY)
+    {
+        if( (pTestSession->cryptoMode == MV_CESA_CRYPTO_CBC) ||
+            (pTestSession->cryptoMode == MV_CESA_CRYPTO_CTR) )
+        {
+            cmd.ivOffset = 0;
+            cmd.cryptoOffset = blockSize;
+            if(cesaTestCases[caseIdx].pCryptoIV == NULL)
+            {
+                cmd.ivFromUser = 1;
+            }
+            else
+            {
+                cmd.ivFromUser = 0;
+                mvCesaCryptoIvSet(cesaTestCases[caseIdx].pCryptoIV, blockSize);
+            }
+            cesaReqSize = cmd.cryptoOffset + cmd.cryptoLength;
+        }
+    }
+
+/*
+    mvOsPrintf("ivFromUser=%d, cryptoLength=%d, cesaReqSize=%d, cryptoOffset=%d\n",
+                cmd.ivFromUser, cmd.cryptoLength, cesaReqSize, cmd.cryptoOffset);
+*/
+    if(pTestSession->operation != MV_CESA_CRYPTO_ONLY)
+    {
+        cmd.macOffset = cmd.cryptoOffset;
+
+        if(cesaTestCases[caseIdx].digestOffset == -1)
+        {
+            cmd.digestOffset = cmd.macOffset + cmd.macLength;
+            cmd.digestOffset = MV_ALIGN_UP(cmd.digestOffset, 8);
+        }
+        else
+        {
+            cmd.digestOffset = cesaTestCases[caseIdx].digestOffset;
+        }
+        if( (cmd.digestOffset + digestSize) > cesaReqSize)
+            cesaReqSize = cmd.digestOffset + digestSize;
+    }
+
+    cesaCheckMode = checkMode;
+
+    if(checkMode == CESA_NULL_CHECK_MODE)
+    {
+        cesaCheckSize = 0;
+        cesaCheckOffset = 0;
+    }
+    else
+    {
+        if(pTestSession->operation == MV_CESA_CRYPTO_ONLY)
+        {
+            cesaCheckOffset = 0;
+            cesaCheckSize = cmd.cryptoLength;
+        }
+        else
+        {
+            cesaCheckSize = digestSize;
+            cesaCheckOffset = cmd.digestOffset;
+        }
+    }
+/*
+    mvOsPrintf("reqSize=%d, checkSize=%d, checkOffset=%d, checkMode=%d\n",
+                cesaReqSize, cesaCheckSize, cesaCheckOffset, cesaCheckMode);
+
+    mvOsPrintf("blockSize=%d, ivOffset=%d, ivFromUser=%d, crOffset=%d, crLength=%d\n",
+                blockSize, cmd.ivOffset, cmd.ivFromUser,
+                cmd.cryptoOffset, cmd.cryptoLength);
+
+    mvOsPrintf("macOffset=%d, digestOffset=%d, macLength=%d\n",
+                cmd.macOffset, cmd.digestOffset, cmd.macLength);
+*/
+    status = testCmd(sid, iter, &cmd, pTestSession,
+                     cesaTestCases[caseIdx].pCryptoIV, blockSize);
+
+    if(status != MV_OK)
+        return status;
+
+    /* Wait when all callbacks is received */
+    count = 0;
+    while(cesaIsReady == MV_FALSE)
+    {
+        mvOsSleep(10);
+        count++;
+        if(count > 100)
+        {
+            mvOsPrintf("testRun: Timeout occured\n");
+            return MV_TIMEOUT;
+        }
+    }
+
+    return MV_OK;
+}
+
+
+void cesaTestStop(void)
+{
+    MV_CESA_MBUF    *pMbufSrc, *pMbufDst;
+    MV_BUF_INFO     *pFragsSrc, *pFragsDst;
+    int             i;
+
+    /* Release all allocated memories */
+    pMbufSrc = (MV_CESA_MBUF*)(cesaCmdRing[0].pSrc);
+    pFragsSrc = cesaCmdRing[0].pSrc->pFrags;
+
+    pMbufDst = (MV_CESA_MBUF*)(cesaCmdRing[0].pDst);
+    pFragsDst = cesaCmdRing[0].pDst->pFrags;
+
+    mvOsFree(pMbufSrc);
+    mvOsFree(pMbufDst);
+    mvOsFree(pFragsSrc);
+    mvOsFree(pFragsDst);
+
+    for(i=0; i<CESA_DEF_REQ_SIZE; i++)
+    {
+        mvOsIoCachedFree(cesaTestOSHandle,cesaReqBufs[i].bufSize,
+			 cesaReqBufs[i].bufPhysAddr,cesaReqBufs[i].bufVirtPtr,
+			 cesaReqBufs[i].memHandle);
+    }
+    cesaDataHexStr3[0] = '\0';
+}
+
+void    desTest(int iter, int reqSize, int checkMode)
+{
+    int         mode, i;
+    MV_STATUS   status;
+
+    mode = checkMode;
+    if(checkMode == CESA_FULL_CHECK_MODE)
+        mode = CESA_FAST_CHECK_MODE;
+    i = iter;
+    if(mode != CESA_NULL_CHECK_MODE)
+        i = 1;
+
+    testOpen(0);
+    testOpen(1);
+    testOpen(2);
+    testOpen(3);
+
+/* DES / ECB mode / Encrypt only */
+    status = testRun(0, 1, iter, reqSize, checkMode);
+    printTestResults(0, status, checkMode);
+
+/* DES / ECB mode / Decrypt only */
+    status = testRun(1, 1, iter, reqSize, checkMode);
+    printTestResults(1, status, checkMode);
+
+/* DES / CBC mode / Encrypt only */
+    status = testRun(2, 2, i, reqSize, mode);
+    printTestResults(2, status, mode);
+
+/* DES / CBC mode / Decrypt only */
+    status = testRun(3, 2, iter, reqSize, mode);
+    printTestResults(3, status, mode);
+
+    testClose(0);
+    testClose(1);
+    testClose(2);
+    testClose(3);
+}
+
+void    tripleDesTest(int iter, int reqSize, int checkMode)
+{
+    int         mode, i;
+    MV_STATUS   status;
+
+    mode = checkMode;
+    if(checkMode == CESA_FULL_CHECK_MODE)
+        mode = CESA_FAST_CHECK_MODE;
+    i = iter;
+    if(mode != CESA_NULL_CHECK_MODE)
+        i = 1;
+
+    testOpen(100);
+    testOpen(101);
+    testOpen(102);
+    testOpen(103);
+
+/* 3DES / ECB mode / Encrypt only */
+    status = testRun(100, 1, iter, reqSize, checkMode);
+    printTestResults(100, status, checkMode);
+
+/* 3DES / ECB mode / Decrypt only */
+    status = testRun(101, 1, iter, reqSize, checkMode);
+    printTestResults(101, status, checkMode);
+
+/* 3DES / CBC mode / Encrypt only */
+    status = testRun(102, 2, i, reqSize, mode);
+    printTestResults(102, status, mode);
+
+/* 3DES / CBC mode / Decrypt only */
+    status = testRun(103, 2, iter, reqSize, mode);
+    printTestResults(103, status, mode);
+
+    testClose(100);
+    testClose(101);
+    testClose(102);
+    testClose(103);
+}
+
+void    aesTest(int iter, int reqSize, int checkMode)
+{
+    MV_STATUS   status;
+    int         mode, i;
+
+    mode = checkMode;
+    if(checkMode == CESA_FULL_CHECK_MODE)
+        mode = CESA_FAST_CHECK_MODE;
+
+    i = iter;
+    if(mode != CESA_NULL_CHECK_MODE)
+        i = 1;
+
+    testOpen(200);
+    testOpen(201);
+    testOpen(202);
+    testOpen(203);
+    testOpen(204);
+    testOpen(205);
+    testOpen(206);
+    testOpen(207);
+    testOpen(208);
+
+/* AES-128 Encode ECB mode */
+    status = testRun(200, 3, iter, reqSize, checkMode);
+    printTestResults(200, status, checkMode);
+
+/* AES-128 Decode ECB mode */
+    status = testRun(201, 3, iter, reqSize, checkMode);
+    printTestResults(201, status, checkMode);
+
+/* AES-128 Encode CBC mode (IV from SA) */
+    status = testRun(202, 10, i, reqSize, mode);
+    printTestResults(202, status, mode);
+
+/* AES-128 Encode CBC mode (IV from User) */
+    status = testRun(202, 24, i, reqSize, mode);
+    printTestResults(202, status, mode);
+
+/* AES-128 Decode CBC mode */
+    status = testRun(203, 24, iter, reqSize, mode);
+    printTestResults(203, status, checkMode);
+
+/* AES-192 Encode ECB mode */
+    status = testRun(204, 4, iter, reqSize, checkMode);
+    printTestResults(204, status, checkMode);
+
+/* AES-192 Decode ECB mode */
+    status = testRun(205, 4, iter, reqSize, checkMode);
+    printTestResults(205, status, checkMode);
+
+/* AES-256 Encode ECB mode */
+    status = testRun(206, 5, iter, reqSize, checkMode);
+    printTestResults(206, status, checkMode);
+
+/* AES-256 Decode ECB mode */
+    status = testRun(207, 5, iter, reqSize, checkMode);
+    printTestResults(207, status, checkMode);
+
+#if defined(MV_LINUX)
+/* AES-128 Encode CTR mode */
+    status = testRun(208, 23, iter, reqSize, mode);
+    printTestResults(208, status, checkMode);
+#endif
+    testClose(200);
+    testClose(201);
+    testClose(202);
+    testClose(203);
+    testClose(204);
+    testClose(205);
+    testClose(206);
+    testClose(207);
+    testClose(208);
+}
+
+
+void    mdTest(int iter, int reqSize, int checkMode)
+{
+    int         mode;
+    MV_STATUS   status;
+
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    mode = checkMode;
+    if(checkMode == CESA_FULL_CHECK_MODE)
+        mode = CESA_FAST_CHECK_MODE;
+
+    testOpen(300);
+    testOpen(301);
+    testOpen(302);
+    testOpen(303);
+    testOpen(305);
+
+/* HMAC-MD5 Generate signature test */
+    status = testRun(300, 6, iter, reqSize, mode);
+    printTestResults(300, status, checkMode);
+
+/* HMAC-MD5 Verify Signature test */
+    status = testRun(301, 7, iter, reqSize, mode);
+    printTestResults(301, status, checkMode);
+
+/* HMAC-MD5 Generate signature test */
+    status = testRun(302, 8, iter, reqSize, mode);
+    printTestResults(302, status, checkMode);
+
+/* HMAC-MD5 Verify Signature test */
+    status = testRun(303, 9, iter, reqSize, mode);
+    printTestResults(303, status, checkMode);
+
+/* HASH-MD5 Generate signature test */
+    status = testRun(305, 15, iter, reqSize, mode);
+    printTestResults(305, status, checkMode);
+
+    testClose(300);
+    testClose(301);
+    testClose(302);
+    testClose(303);
+    testClose(305);
+}
+
+void    shaTest(int iter, int reqSize, int checkMode)
+{
+    int         mode;
+    MV_STATUS   status;
+
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    mode = checkMode;
+    if(checkMode == CESA_FULL_CHECK_MODE)
+        mode = CESA_FAST_CHECK_MODE;
+
+    testOpen(400);
+    testOpen(401);
+    testOpen(402);
+    testOpen(403);
+    testOpen(405);
+
+/* HMAC-SHA1 Generate signature test */
+    status = testRun(400, 11, iter, reqSize, mode);
+    printTestResults(400, status, checkMode);
+
+/* HMAC-SHA1 Verify Signature test */
+    status = testRun(401, 12, iter, reqSize, mode);
+    printTestResults(401, status, checkMode);
+
+/* HMAC-SHA1 Generate signature test */
+    status = testRun(402, 13, iter, reqSize, mode);
+    printTestResults(402, status, checkMode);
+
+/* HMAC-SHA1 Verify Signature test */
+    status = testRun(403, 14, iter, reqSize, mode);
+    printTestResults(403, status, checkMode);
+
+/* HMAC-SHA1 Generate signature test */
+    status = testRun(405, 16, iter, reqSize, mode);
+    printTestResults(405, status, checkMode);
+
+    testClose(400);
+    testClose(401);
+    testClose(402);
+    testClose(403);
+    testClose(405);
+}
+
+void    combiTest(int iter, int reqSize, int checkMode)
+{
+    MV_STATUS   status;
+    int         mode, i;
+
+    mode = checkMode;
+    if(checkMode == CESA_FULL_CHECK_MODE)
+        mode = CESA_FAST_CHECK_MODE;
+
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    i = iter;
+    if(mode != CESA_NULL_CHECK_MODE)
+        i = 1;
+
+    testOpen(500);
+    testOpen(501);
+    testOpen(502);
+    testOpen(503);
+    testOpen(504);
+    testOpen(505);
+    testOpen(506);
+    testOpen(507);
+
+/* DES ECB + MD5 encode test */
+    status = testRun(500, 17, iter, reqSize, mode);
+    printTestResults(500, status, mode);
+
+/* DES ECB + SHA1 encode test */
+    status = testRun(501, 18, iter, reqSize, mode);
+    printTestResults(501, status, mode);
+
+/* 3DES ECB + MD5 encode test */
+    status = testRun(502, 17, iter, reqSize, mode);
+    printTestResults(502, status, mode);
+
+/* 3DES ECB + SHA1 encode test */
+    status = testRun(503, 18, iter, reqSize, mode);
+    printTestResults(503, status, mode);
+
+/* 3DES CBC + MD5 encode test */
+    status = testRun(504, 19, i, reqSize, mode);
+    printTestResults(504, status, mode);
+
+/* 3DES CBC + SHA1 encode test */
+    status = testRun(505, 20, i, reqSize, mode);
+    printTestResults(505, status, mode);
+
+/* AES-128 CBC + MD5 encode test */
+    status = testRun(506, 21, i, reqSize, mode);
+    printTestResults(506, status, mode);
+
+/* AES-128 CBC + SHA1 encode test */
+    status = testRun(507, 22, i, reqSize, mode);
+    printTestResults(507, status, mode);
+
+    testClose(500);
+    testClose(501);
+    testClose(502);
+    testClose(503);
+    testClose(504);
+    testClose(505);
+    testClose(506);
+    testClose(507);
+}
+
+void    cesaOneTest(int testIdx, int caseIdx,
+                    int iter, int reqSize, int checkMode)
+{
+    MV_STATUS   status;
+
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    mvOsPrintf("test=%d, case=%d, size=%d, iter=%d\n",
+                testIdx, caseIdx, reqSize, iter);
+
+    status = testOpen(testIdx);
+
+    status = testRun(testIdx, caseIdx, iter, reqSize, checkMode);
+    printTestResults(testIdx, status, checkMode);
+    status = testClose(testIdx);
+
+}
+
+void    cesaTest(int iter, int reqSize, int checkMode)
+{
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    mvOsPrintf("%d iteration\n", iter);
+    mvOsPrintf("%d size\n\n", reqSize);
+
+/* DES tests */
+    desTest(iter, reqSize, checkMode);
+
+/* 3DES tests */
+    tripleDesTest(iter, reqSize, checkMode);
+
+/* AES tests */
+    aesTest(iter, reqSize, checkMode);
+
+/* MD5 tests */
+    mdTest(iter, reqSize, checkMode);
+
+/* SHA-1 tests */
+    shaTest(iter, reqSize, checkMode);
+}
+
+void    multiSizeTest(int idx, int iter, int checkMode, char* inputData)
+{
+    MV_STATUS               status;
+    int                     i;
+    MV_CESA_SIZE_TEST*      pMultiTest;
+
+    if( testOpen(idx) != MV_OK)
+        return;
+
+    if(iter == 0)
+        iter = CESA_DEF_ITER_NUM;
+
+    if(checkMode == CESA_SHOW_CHECK_MODE)
+    {
+        iter = 1;
+    }
+    else
+        checkMode = CESA_FULL_CHECK_MODE;
+
+    cesaTestCases[0].plainHexStr = inputData;
+    cesaTestCases[0].pCryptoIV = NULL;
+
+    switch(idx)
+    {
+        case 302:
+            pMultiTest = mdMultiSizeTest302;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = cesaDataHexStr3;
+            break;
+
+        case 304:
+            pMultiTest = mdMultiSizeTest304;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 305:
+            pMultiTest = mdMultiSizeTest305;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 402:
+            pMultiTest = shaMultiSizeTest402;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 404:
+            pMultiTest = shaMultiSizeTest404;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 405:
+            pMultiTest = shaMultiSizeTest405;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 502:
+            pMultiTest = tripleDesMdMultiSizeTest502;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 503:
+            pMultiTest = tripleDesShaMultiSizeTest503;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 504:
+            iter = 1;
+            pMultiTest = cbc3desMdMultiSizeTest504;
+            cesaTestCases[0].pCryptoIV = iv1;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 505:
+            iter = 1;
+            pMultiTest = cbc3desShaMultiSizeTest505;
+            cesaTestCases[0].pCryptoIV = iv1;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 506:
+            iter = 1;
+            pMultiTest = cbcAes128md5multiSizeTest506;
+            cesaTestCases[0].pCryptoIV = iv5;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        case 507:
+            iter = 1;
+            pMultiTest = cbcAes128sha1multiSizeTest507;
+            cesaTestCases[0].pCryptoIV = iv5;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+            break;
+
+        default:
+            iter = 1;
+            checkMode = CESA_SHOW_CHECK_MODE;
+            pMultiTest = mdMultiSizeTest302;
+            if(inputData == NULL)
+                cesaTestCases[0].plainHexStr = hashHexStr80;
+    }
+    i = 0;
+    while(pMultiTest[i].outputHexStr != NULL)
+    {
+        cesaTestCases[0].cipherHexStr = (char *)pMultiTest[i].outputHexStr;
+        status = testRun(idx, 0, iter, pMultiTest[i].size,
+                         checkMode);
+        if(checkMode != CESA_SHOW_CHECK_MODE)
+        {
+            cesaReqSize = pMultiTest[i].size;
+            printTestResults(idx, status, checkMode);
+        }
+        if(status != MV_OK)
+            break;
+        i++;
+    }
+    testClose(idx);
+/*
+    mvCesaDebugStatus();
+    cesaTestPrintStatus();
+*/
+}
+
+void    open_session_test(int idx, int caseIdx, int iter)
+{
+    int         reqIdError, cryptoError, openErrors, i;
+    int         openErrDisp[100];
+    MV_STATUS   status;
+
+    memset(openErrDisp, 0, sizeof(openErrDisp));
+    openErrors = 0;
+    reqIdError = 0;
+    cryptoError = 0;
+    for(i=0; i<iter; i++)
+    {
+        status = testOpen(idx);
+        if(status != MV_OK)
+        {
+            openErrors++;
+            openErrDisp[status]++;
+        }
+        else
+        {
+            testRun(idx, caseIdx, 1, 0, CESA_FAST_CHECK_MODE);
+            if(cesaCryptoError > 0)
+                cryptoError++;
+            if(cesaReqIdError > 0)
+                reqIdError++;
+
+            testClose(idx);
+        }
+    }
+    if(cryptoError > 0)
+        mvOsPrintf("cryptoError : %d\n", cryptoError);
+    if(reqIdError > 0)
+        mvOsPrintf("reqIdError  : %d\n", reqIdError);
+
+    if(openErrors > 0)
+    {
+        mvOsPrintf("Open Errors = %d\n", openErrors);
+        for(i=0; i<100; i++)
+        {
+            if(openErrDisp[i] != 0)
+                mvOsPrintf("Error %d - occurs %d times\n", i, openErrDisp[i]);
+        }
+    }
+}
+
+
+void    loopback_test(int idx, int iter, int size, char* pPlainData)
+{
+}
+
+
+#if defined(MV_VXWORKS)
+int testMode = 0;
+unsigned __TASKCONV cesaTask(void* args)
+{
+    int reqSize = cesaReqSize;
+
+    if(testMode == 0)
+    {
+        cesaOneTest(cesaTestIdx, cesaCaseIdx, cesaIteration,
+                    reqSize, cesaCheckMode);
+    }
+    else
+    {
+        if(testMode == 1)
+        {
+            cesaTest(cesaIteration, reqSize, cesaCheckMode);
+            combiTest(cesaIteration, reqSize, cesaCheckMode);
+        }
+        else
+        {
+            multiSizeTest(cesaIdx, cesaIteration, cesaCheckMode, NULL);
+        }
+    }
+    return 0;
+}
+
+void oneTest(int testIdx, int caseIdx,
+              int iter, int reqSize, int checkMode)
+{
+    long    rc;
+
+    cesaIteration = iter;
+    cesaReqSize = cesaRateSize = reqSize;
+    cesaCheckMode = checkMode;
+    testMode = 0;
+    cesaTestIdx = testIdx;
+    cesaCaseIdx = caseIdx;
+    rc = mvOsTaskCreate("CESA_T", 100, 4*1024, cesaTask, NULL, &cesaTaskId);
+    if (rc != MV_OK)
+    {
+        mvOsPrintf("hMW: Can't create CESA multiCmd test task, rc = %ld\n", rc);
+    }
+}
+
+void multiTest(int iter, int reqSize, int checkMode)
+{
+    long    rc;
+
+    cesaIteration = iter;
+    cesaCheckMode = checkMode;
+    cesaReqSize = reqSize;
+    testMode = 1;
+    rc = mvOsTaskCreate("CESA_T", 100, 4*1024, cesaTask, NULL, &cesaTaskId);
+    if (rc != MV_OK)
+    {
+        mvOsPrintf("hMW: Can't create CESA multiCmd test task, rc = %ld\n", rc);
+    }
+}
+
+void sizeTest(int testIdx, int iter, int checkMode)
+{
+    long    rc;
+
+    cesaIteration = iter;
+        cesaCheckMode = checkMode;
+        testMode = 2;
+        cesaIdx = testIdx;
+    rc = mvOsTaskCreate("CESA_T", 100, 4*1024, cesaTask, NULL, &cesaTaskId);
+    if (rc != MV_OK)
+    {
+        mvOsPrintf("hMW: Can't create CESA test task, rc = %ld\n", rc);
+    }
+}
+
+#endif /* MV_VXWORKS */
+
+extern void    mvCesaDebugSA(short sid, int mode);
+void    cesaTestPrintSession(int idx)
+{
+    int                     testIdx;
+    MV_CESA_TEST_SESSION*   pTestSession;
+
+    pTestSession = getTestSessionDb(idx, &testIdx);
+    if(pTestSession == NULL)
+    {
+        mvOsPrintf("Test %d is not exist\n", idx);
+        return;
+    }
+    pTestSession = &pTestSession[testIdx];
+
+    if(pTestSession->sid == -1)
+    {
+        mvOsPrintf("Test session %d is not opened\n", idx);
+        return;
+    }
+
+    mvCesaDebugSA(pTestSession->sid, 1);
+}
+
+void    cesaTestPrintStatus(void)
+{
+    mvOsPrintf("\n\t Cesa Test Status\n\n");
+
+    mvOsPrintf("isrCount=%d\n",
+                cesaTestIsrCount);
+
+#ifdef CESA_TEST_DEBUG
+    {
+        int i, j;
+        j = cesaTestTraceIdx;
+        mvOsPrintf("No  Type  Cause   rCause   iCause   Res     Time     pReady    pProc    pEmpty\n");
+        for(i=0; i<MV_CESA_TEST_TRACE_SIZE; i++)
+        {
+            mvOsPrintf("%02d.  %d   0x%04x  0x%04x   0x%04x   0x%02x   0x%02x   %02d   0x%06x  %p  %p  %p\n",
+                j, cesaTestTrace[j].type, cesaTestTrace[j].cause, cesaTestTrace[j].realCause,
+                cesaTestTrace[j].dmaCause, cesaTestTrace[j].resources, cesaTestTrace[j].timeStamp,
+                cesaTestTrace[j].pReqReady, cesaTestTrace[j].pReqProcess, cesaTestTrace[j].pReqEmpty);
+            j++;
+            if(j == MV_CESA_TEST_TRACE_SIZE)
+                j = 0;
+        }
+    }
+#endif /* CESA_TEST_DEBUG */
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCompVer.txt
new file mode 100644
index 00000000..38a92644
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.4
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.c
new file mode 100644
index 00000000..9ab29a88
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.c
@@ -0,0 +1,158 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvOs.h"
+#include "mvLru.h"
+/* LRU Cache support */
+
+
+/* Init LRU cache database */
+MV_LRU_CACHE*   mvLruCacheInit(int numOfEntries)
+{
+    int             i;
+    MV_LRU_CACHE*   pLruCache;
+
+    pLruCache = mvOsMalloc(sizeof(MV_LRU_CACHE));
+    if(pLruCache == NULL)
+    {
+        return NULL;
+    }
+    memset(pLruCache, 0, sizeof(MV_LRU_CACHE));
+
+    pLruCache->table = mvOsMalloc(numOfEntries*sizeof(MV_LRU_ENTRY));
+    if(pLruCache->table == NULL)
+    {
+        mvOsFree(pLruCache);
+        return NULL;
+    }
+    memset(pLruCache->table, 0, numOfEntries*sizeof(MV_LRU_ENTRY));
+    pLruCache->tableSize = numOfEntries;
+
+    for(i=0; i<numOfEntries; i++)
+    {
+        pLruCache->table[i].next = i+1;
+        pLruCache->table[i].prev = i-1;         
+    }
+    pLruCache->least = 0;
+    pLruCache->most = numOfEntries-1;   
+
+    return pLruCache;
+}
+
+void    mvLruCacheFinish(MV_LRU_CACHE* pLruCache)
+{
+    mvOsFree(pLruCache->table);
+    mvOsFree(pLruCache);
+}
+
+/* Update LRU cache database after using cache Index */
+void    mvLruCacheIdxUpdate(MV_LRU_CACHE* pLruHndl, int cacheIdx)
+{
+    int prev, next;
+
+    if(cacheIdx == pLruHndl->most)
+        return;
+
+    next = pLruHndl->table[cacheIdx].next;
+    if(cacheIdx == pLruHndl->least)
+    {
+        pLruHndl->least = next;
+    }
+    else
+    {
+        prev = pLruHndl->table[cacheIdx].prev;
+
+        pLruHndl->table[next].prev = prev;
+        pLruHndl->table[prev].next = next;
+    }
+
+    pLruHndl->table[pLruHndl->most].next = cacheIdx;
+    pLruHndl->table[cacheIdx].prev = pLruHndl->most;
+    pLruHndl->most = cacheIdx;
+}
+
+/* Delete LRU cache entry */
+void    mvLruCacheIdxDelete(MV_LRU_CACHE* pLruHndl, int cacheIdx)
+{
+    int prev, next;
+
+    if(cacheIdx == pLruHndl->least)
+        return;
+
+    prev = pLruHndl->table[cacheIdx].prev;
+    if(cacheIdx == pLruHndl->most)
+    {
+        pLruHndl->most = prev;
+    }
+    else
+    {
+        next = pLruHndl->table[cacheIdx].next;
+
+        pLruHndl->table[next].prev = prev;
+        pLruHndl->table[prev].next = next;
+    }
+    pLruHndl->table[pLruHndl->least].prev = cacheIdx;
+    pLruHndl->table[cacheIdx].next = pLruHndl->least;
+    pLruHndl->least = cacheIdx;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.h
new file mode 100644
index 00000000..896e7f81
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvLru.h
@@ -0,0 +1,112 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+/*******************************************************************************
+* mvLru.h - Header File for Least Recently Used Cache algorithm
+*
+* DESCRIPTION:
+*       This header file contains macros typedefs and function declaration for
+*       the Least Recently Used Cache algorithm.
+*
+*******************************************************************************/
+
+#ifndef __mvLru_h__
+#define __mvLru_h__
+
+
+typedef struct
+{
+    int next;
+    int prev;
+} MV_LRU_ENTRY;
+
+typedef struct
+{
+    int             least;
+    int             most;
+    MV_LRU_ENTRY*   table;
+    int             tableSize;
+
+}MV_LRU_CACHE;
+
+
+/* Find Cache index for replacement LRU */
+static INLINE int     mvLruCacheIdxFind(MV_LRU_CACHE* pLruHndl)
+{
+    return pLruHndl->least;
+}
+
+/* Init LRU cache module */
+MV_LRU_CACHE*   mvLruCacheInit(int numOfEntries);
+
+/* Finish LRU cache module */
+void    mvLruCacheFinish(MV_LRU_CACHE* pLruHndl);
+
+/* Update LRU cache database after using cache Index */
+void    mvLruCacheIdxUpdate(MV_LRU_CACHE* pLruHndl, int cacheIdx);
+
+/* Delete LRU cache entry */
+void    mvLruCacheIdxDelete(MV_LRU_CACHE* pLruHndl, int cacheIdx);
+
+
+#endif /* __mvLru_h__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.c
new file mode 100644
index 00000000..189f6292
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.c
@@ -0,0 +1,349 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvOs.h"
+#include "mvMD5.h"
+
+static void mvMD5Transform(MV_U32 buf[4], MV_U32 const in[MV_MD5_MAC_LEN]);
+ 
+#ifdef  MV_CPU_LE
+#define mvByteReverse(buf, len)   /* Nothing */
+#else
+static void mvByteReverse(unsigned char *buf, unsigned longs);
+
+/*
+ * Note: this code is harmless on little-endian machines.
+ */
+static void mvByteReverse(unsigned char *buf, unsigned longs)
+{
+    MV_U32 t;
+
+    do 
+    {
+        t = (MV_U32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+                      ((unsigned) buf[1] << 8 | buf[0]);
+        *(MV_U32 *) buf = t;
+        buf += 4;
+    } while (--longs);
+}
+#endif
+
+/*
+ * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+void    mvMD5Init(MV_MD5_CONTEXT *ctx)
+{
+    ctx->buf[0] = 0x67452301;
+    ctx->buf[1] = 0xefcdab89;
+    ctx->buf[2] = 0x98badcfe;
+    ctx->buf[3] = 0x10325476;
+
+    ctx->bits[0] = 0;
+    ctx->bits[1] = 0;
+}
+
+/*
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+void    mvMD5Update(MV_MD5_CONTEXT *ctx, unsigned char const *buf, unsigned len)
+{
+    MV_U32 t;
+
+    /* Update bitcount */
+
+    t = ctx->bits[0];
+    if ((ctx->bits[0] = t + ((MV_U32) len << 3)) < t)
+        ctx->bits[1]++;         /* Carry from low to high */
+    ctx->bits[1] += len >> 29;
+
+    t = (t >> 3) & 0x3f;        /* Bytes already in shsInfo->data */
+
+    /* Handle any leading odd-sized chunks */
+
+    if (t) 
+    {
+        unsigned char *p = (unsigned char *) ctx->in + t;
+
+        t = 64 - t;
+        if (len < t) 
+        {
+            memcpy(p, buf, len);
+            return;
+        }
+        memcpy(p, buf, t);
+        mvByteReverse(ctx->in, MV_MD5_MAC_LEN);
+        mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
+        buf += t;
+        len -= t;
+    }
+    /* Process data in 64-byte chunks */
+
+    while (len >= 64) 
+    {
+        memcpy(ctx->in, buf, 64);
+        mvByteReverse(ctx->in, MV_MD5_MAC_LEN);
+        mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
+        buf += 64;
+        len -= 64;
+    }
+
+    /* Handle any remaining bytes of data. */
+
+    memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+void    mvMD5Final(unsigned char digest[MV_MD5_MAC_LEN], MV_MD5_CONTEXT *ctx)
+{
+    unsigned count;
+    unsigned char *p;
+
+    /* Compute number of bytes mod 64 */
+    count = (ctx->bits[0] >> 3) & 0x3F;
+
+    /* Set the first char of padding to 0x80.  This is safe since there is
+       always at least one byte free */
+    p = ctx->in + count;
+    *p++ = 0x80;
+
+    /* Bytes of padding needed to make 64 bytes */
+    count = 64 - 1 - count;
+
+    /* Pad out to 56 mod 64 */
+    if (count < 8) 
+    {
+        /* Two lots of padding:  Pad the first block to 64 bytes */
+        memset(p, 0, count);
+        mvByteReverse(ctx->in, MV_MD5_MAC_LEN);
+        mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
+
+        /* Now fill the next block with 56 bytes */
+        memset(ctx->in, 0, 56);
+    } 
+    else 
+    {
+        /* Pad block to 56 bytes */
+        memset(p, 0, count - 8);
+    }
+    mvByteReverse(ctx->in, 14);
+
+    /* Append length in bits and transform */
+    ((MV_U32 *) ctx->in)[14] = ctx->bits[0];
+    ((MV_U32 *) ctx->in)[15] = ctx->bits[1];
+
+    mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
+    mvByteReverse((unsigned char *) ctx->buf, 4);
+    memcpy(digest, ctx->buf, MV_MD5_MAC_LEN);
+    memset(ctx, 0, sizeof(ctx));        /* In case it's sensitive */
+}
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+        ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+static void mvMD5Transform(MV_U32 buf[4], MV_U32 const in[MV_MD5_MAC_LEN])
+{
+    register MV_U32 a, b, c, d;
+
+    a = buf[0];
+    b = buf[1];
+    c = buf[2];
+    d = buf[3];
+
+    MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+    MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+    MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+    MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+    MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+    MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+    MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+    MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+    MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+    MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+    MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+    MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+    MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+    MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+    MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+    MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+    MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+    MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+    MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+    MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+    MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+    MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+    MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+    MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+    MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+    MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+    MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+    MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+    MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+    MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+    MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+    MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+    MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+    MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+    MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+    MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+    MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+    MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+    MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+    MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+    MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+    MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+    MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+    MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+    MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+    MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+    MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+    MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+    MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+    MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+    MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+    MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+    MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+    MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+    MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+    MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+    MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+    MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+    MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+    MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+    MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+    MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+    MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+    MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+    buf[0] += a;
+    buf[1] += b;
+    buf[2] += c;
+    buf[3] += d;
+}
+
+void    mvMD5(unsigned char const *buf, unsigned len, unsigned char* digest)
+{
+    MV_MD5_CONTEXT  ctx;
+
+    mvMD5Init(&ctx);
+    mvMD5Update(&ctx, buf, len);
+    mvMD5Final(digest, &ctx);
+}
+
+
+void    mvHmacMd5(unsigned char const* text, int text_len,
+                  unsigned char const* key, int key_len,
+                  unsigned char* digest)
+{
+    int             i;
+    MV_MD5_CONTEXT  ctx;
+    unsigned char   k_ipad[64+1]; /* inner padding - key XORd with ipad */
+    unsigned char   k_opad[64+1]; /* outer padding - key XORd with opad */
+
+    /* start out by storing key in pads */
+    memset(k_ipad, 0, 64);
+    memcpy(k_ipad, key, key_len);
+    memset(k_opad, 0, 64);
+    memcpy(k_opad, key, key_len);
+
+    /* XOR key with ipad and opad values */
+    for (i=0; i<64; i++) 
+    {
+	    k_ipad[i] ^= 0x36;
+	    k_opad[i] ^= 0x5c;
+    }
+
+    /* perform inner MD5 */
+    mvMD5Init(&ctx);                   /* init ctx for 1st pass */
+    mvMD5Update(&ctx, k_ipad, 64);    /* start with inner pad */
+    mvMD5Update(&ctx, text, text_len); /* then text of datagram */
+    mvMD5Final(digest, &ctx);          /* finish up 1st pass */
+
+    /* perform outer MD5 */
+    mvMD5Init(&ctx);                   /* init ctx for 2nd pass */
+    mvMD5Update(&ctx, k_opad, 64);     /* start with outer pad */
+    mvMD5Update(&ctx, digest, 16);     /* then results of 1st hash */
+    mvMD5Final(digest, &ctx);          /* finish up 2nd pass */
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.h
new file mode 100644
index 00000000..d05c6b66
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvMD5.h
@@ -0,0 +1,93 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __mvMD5_h__
+#define __mvMD5_h__
+
+#include "mvMD5.h"
+
+#define MV_MD5_MAC_LEN 16
+ 
+ 
+typedef struct 
+{
+    MV_U32 buf[4];
+    MV_U32 bits[2];
+    MV_U8  in[64];
+
+} MV_MD5_CONTEXT;
+ 
+void mvMD5Init(MV_MD5_CONTEXT *context);
+void mvMD5Update(MV_MD5_CONTEXT *context, unsigned char const *buf,
+                unsigned len);
+void mvMD5Final(unsigned char digest[16], MV_MD5_CONTEXT *context);
+
+void mvMD5(unsigned char const *buf, unsigned len, unsigned char* digest);
+
+void mvHmacMd5(unsigned char const* text, int text_len,
+                  unsigned char const* key, int key_len,
+                  unsigned char* digest);
+  
+
+#endif /* __mvMD5_h__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.c
new file mode 100644
index 00000000..0e0786b0
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.c
@@ -0,0 +1,239 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvOs.h"
+#include "mvSHA1.h"
+
+#define SHA1HANDSOFF  
+
+typedef union 
+{
+    MV_U8   c[64];
+    MV_U32  l[16];
+
+} CHAR64LONG16;
+
+static void mvSHA1Transform(MV_U32 state[5], const MV_U8 *buffer); 
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+ 
+#ifdef MV_CPU_LE
+#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | \
+        (rol(block->l[i], 8) & 0x00FF00FF))
+#else
+#define blk0(i) block->l[i]
+#endif
+#define blk(i) (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ \
+        block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) \
+        z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \
+        w = rol(w, 30);
+#define R1(v,w,x,y,z,i) \
+        z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \
+        w = rol(w, 30);
+#define R2(v,w,x,y,z,i) \
+        z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30);
+#define R3(v,w,x,y,z,i) \
+        z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \
+        w = rol(w, 30);
+#define R4(v,w,x,y,z,i) \
+        z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \
+        w=rol(w, 30);
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+static void    mvSHA1Transform(MV_U32 state[5], const MV_U8 *buffer)
+{
+    MV_U32          a, b, c, d, e;
+    CHAR64LONG16*   block;
+
+#ifdef SHA1HANDSOFF
+    static MV_U32  workspace[16];
+
+    block = (CHAR64LONG16 *) workspace;
+    memcpy(block, buffer, 64);
+#else
+    block = (CHAR64LONG16 *) buffer;
+#endif
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+}
+
+void    mvSHA1Init(MV_SHA1_CTX* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+void    mvSHA1Update(MV_SHA1_CTX *context, MV_U8 const *data, 
+                     unsigned int len)
+{
+    MV_U32 i, j;
+
+    j = (context->count[0] >> 3) & 63;
+    if ((context->count[0] += len << 3) < (len << 3))
+            context->count[1]++;
+    context->count[1] += (len >> 29);
+    if ((j + len) > 63) 
+    {
+        memcpy(&context->buffer[j], data, (i = 64-j));
+        mvSHA1Transform(context->state, context->buffer);
+        for ( ; i + 63 < len; i += 64) 
+        {
+            mvSHA1Transform(context->state, &data[i]);
+        }
+        j = 0;
+    }
+    else
+    {
+        i = 0;
+    }
+    memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+void    mvSHA1Final(MV_U8* digest, MV_SHA1_CTX* context)
+{
+    MV_U32  i;
+    MV_U8   finalcount[8];
+
+    for (i = 0; i < 8; i++) 
+    {
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] >>
+                      ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+    mvSHA1Update(context, (const unsigned char *) "\200", 1);
+    while ((context->count[0] & 504) != 448) 
+    {
+        mvSHA1Update(context, (const unsigned char *) "\0", 1);
+    }
+    mvSHA1Update(context, finalcount, 8);  /* Should cause a mvSHA1Transform()
+                                          */
+    for (i = 0; i < 20; i++) 
+    {
+        digest[i] = (unsigned char)
+                    ((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
+    }
+    /* Wipe variables */
+    i = 0;
+    memset(context->buffer, 0, 64);
+    memset(context->state, 0, 20);
+    memset(context->count, 0, 8);
+    memset(finalcount, 0, 8);
+
+#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite it's own static vars */
+    mvSHA1Transform(context->state, context->buffer);
+#endif 
+}
+
+
+void mvSHA1(MV_U8 const *buf, unsigned int len, MV_U8* digest)
+{
+    MV_SHA1_CTX  ctx;
+
+    mvSHA1Init(&ctx);
+    mvSHA1Update(&ctx, buf, len);
+    mvSHA1Final(digest, &ctx);
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.h
new file mode 100644
index 00000000..17df9fcd
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa/mvSHA1.h
@@ -0,0 +1,88 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __mvSHA1_h__
+#define __mvSHA1_h__
+
+#include "mvSHA1.h"
+
+#define MV_SHA1_MAC_LEN 20
+ 
+ 
+typedef struct 
+{
+    MV_U32 state[5];
+    MV_U32 count[2];
+    MV_U8  buffer[64];
+
+} MV_SHA1_CTX; 
+ 
+void mvSHA1Init(MV_SHA1_CTX *context);
+void mvSHA1Update(MV_SHA1_CTX *context, MV_U8 const *buf, unsigned int len);
+void mvSHA1Final(MV_U8* digest, MV_SHA1_CTX *context);
+
+void mvSHA1(MV_U8 const *buf, unsigned int len, MV_U8* digest);
+  
+
+#endif /* __mvSHA1_h__ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
new file mode 100644
index 00000000..e689f24e
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
@@ -0,0 +1,1302 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+*******************************************************************************/
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/crypto.h>
+#include <linux/mm.h>
+#include <linux/skbuff.h>
+#include <linux/random.h>
+#include <linux/platform_device.h>
+#include <asm/scatterlist.h>
+#include <linux/spinlock.h>
+#include "ctrlEnv/sys/mvSysCesa.h"
+#include "cesa/mvCesa.h" /* moved here before cryptodev.h due to include dependencies */
+#include <cryptodev.h>
+#include <uio.h>
+#include <plat/mv_cesa.h>
+#include <linux/mbus.h>
+#include "mvDebug.h"
+
+#include "cesa/mvMD5.h"
+#include "cesa/mvSHA1.h"
+
+#include "cesa/mvCesaRegs.h"
+#include "cesa/AES/mvAes.h"
+#include "cesa/mvLru.h"
+
+#undef  RT_DEBUG
+#ifdef RT_DEBUG
+static int debug = 1;
+module_param(debug, int, 1);
+MODULE_PARM_DESC(debug, "Enable debug");
+#undef dprintk
+#define dprintk(a...)	if (debug) { printk(a); } else
+#else
+static int debug = 0;
+#undef dprintk
+#define dprintk(a...)
+#endif
+
+
+/* TDMA Regs */
+#define WINDOW_BASE(i) 0xA00 + (i << 3)
+#define WINDOW_CTRL(i) 0xA04 + (i << 3)
+
+/* interrupt handling */
+#undef CESA_OCF_POLLING
+#undef CESA_OCF_TASKLET
+
+#if defined(CESA_OCF_POLLING) && defined(CESA_OCF_TASKLET)
+#error "don't use both tasklet and polling mode"
+#endif
+
+extern int cesaReqResources;
+/* support for spliting action into 2 actions */
+#define CESA_OCF_SPLIT
+
+/* general defines */
+#define CESA_OCF_MAX_SES 128
+#define CESA_Q_SIZE	 64
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+#define FRAG_PAGE(f)    (f).p
+#else
+#define FRAG_PAGE(f)    (f)
+#endif
+
+/* data structures */
+struct cesa_ocf_data {
+        int                                      cipher_alg;
+        int                                      auth_alg;
+	int					 encrypt_tn_auth;
+#define  auth_tn_decrypt  encrypt_tn_auth
+	int					 ivlen;
+	int 					 digestlen;
+	short					 sid_encrypt;
+	short					 sid_decrypt;
+	/* fragment workaround sessions */
+	short					 frag_wa_encrypt;
+	short					 frag_wa_decrypt;
+	short					 frag_wa_auth;
+};
+
+/* CESA device data */
+struct cesa_dev {
+	void __iomem *sram;
+	void __iomem *reg;
+        struct mv_cesa_platform_data *plat_data;
+	int irq;
+};
+
+#define DIGEST_BUF_SIZE	32
+struct cesa_ocf_process {
+	MV_CESA_COMMAND 			cesa_cmd;
+	MV_CESA_MBUF 				cesa_mbuf;	
+	MV_BUF_INFO  				cesa_bufs[MV_CESA_MAX_MBUF_FRAGS];
+	char					digest[DIGEST_BUF_SIZE];
+	int					digest_len;
+	struct cryptop 				*crp;
+	int 					need_cb;
+};
+
+/* global variables */
+static int32_t			cesa_ocf_id 		= -1;
+static struct cesa_ocf_data 	*cesa_ocf_sessions[CESA_OCF_MAX_SES];
+static spinlock_t 		cesa_lock;
+static struct cesa_dev cesa_device;
+
+/* static APIs */
+static int 		cesa_ocf_process	(device_t, struct cryptop *, int);
+static int 		cesa_ocf_newsession	(device_t, u_int32_t *, struct cryptoini *);
+static int 		cesa_ocf_freesession	(device_t, u_int64_t);
+static void 		cesa_callback		(unsigned long);
+static irqreturn_t	cesa_interrupt_handler	(int, void *);
+#ifdef CESA_OCF_POLLING
+static void cesa_interrupt_polling(void);
+#endif
+#ifdef CESA_OCF_TASKLET
+static struct tasklet_struct cesa_ocf_tasklet;
+#endif
+
+static struct timeval          tt_start;
+static struct timeval          tt_end;
+
+/*
+ * dummy device structure
+ */
+
+static struct {
+	softc_device_decl	sc_dev;
+} mv_cesa_dev;
+
+static device_method_t mv_cesa_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	cesa_ocf_newsession),
+	DEVMETHOD(cryptodev_freesession,cesa_ocf_freesession),
+	DEVMETHOD(cryptodev_process,	cesa_ocf_process),
+	DEVMETHOD(cryptodev_kprocess,	NULL),
+};
+
+
+
+/* Add debug Trace */
+#undef CESA_OCF_TRACE_DEBUG
+#ifdef CESA_OCF_TRACE_DEBUG
+
+#define MV_CESA_USE_TIMER_ID    0
+
+typedef struct
+{
+    int             type;       /* 0 - isrEmpty, 1 - cesaReadyGet, 2 - cesaAction */
+    MV_U32          timeStamp;
+    MV_U32          cause;
+    MV_U32          realCause;
+    MV_U32          dmaCause;
+    int             resources;
+    MV_CESA_REQ*    pReqReady;
+    MV_CESA_REQ*    pReqEmpty;
+    MV_CESA_REQ*    pReqProcess;
+} MV_CESA_TEST_TRACE;
+
+#define MV_CESA_TEST_TRACE_SIZE      50
+
+static int cesaTestTraceIdx = 0;
+static MV_CESA_TEST_TRACE    cesaTestTrace[MV_CESA_TEST_TRACE_SIZE];
+
+static void cesaTestTraceAdd(int type)
+{
+    cesaTestTrace[cesaTestTraceIdx].type = type;
+    cesaTestTrace[cesaTestTraceIdx].realCause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
+    //cesaTestTrace[cesaTestTraceIdx].idmaCause = MV_REG_READ(IDMA_CAUSE_REG);
+    cesaTestTrace[cesaTestTraceIdx].resources = cesaReqResources;
+    cesaTestTrace[cesaTestTraceIdx].pReqReady = pCesaReqReady;
+    cesaTestTrace[cesaTestTraceIdx].pReqEmpty = pCesaReqEmpty;
+    cesaTestTrace[cesaTestTraceIdx].pReqProcess = pCesaReqProcess;
+    cesaTestTrace[cesaTestTraceIdx].timeStamp = mvCntmrRead(MV_CESA_USE_TIMER_ID);
+    cesaTestTraceIdx++;
+    if(cesaTestTraceIdx == MV_CESA_TEST_TRACE_SIZE)
+        cesaTestTraceIdx = 0;
+}
+
+#else /* CESA_OCF_TRACE_DEBUG */
+
+#define cesaTestTraceAdd(x)
+
+#endif /* CESA_OCF_TRACE_DEBUG */
+
+unsigned int
+get_usec(unsigned int start)
+{
+	if(start) {
+		do_gettimeofday (&tt_start);
+		return 0;
+	}
+	else {
+        	do_gettimeofday (&tt_end);
+        	tt_end.tv_sec -= tt_start.tv_sec;
+        	tt_end.tv_usec -= tt_start.tv_usec;
+        	if (tt_end.tv_usec < 0) {
+                	tt_end.tv_usec += 1000 * 1000;
+                	tt_end.tv_sec -= 1;
+        	}
+	}
+	printk("time taken is  %d\n", (unsigned int)(tt_end.tv_usec + tt_end.tv_sec * 1000000));
+	return (tt_end.tv_usec + tt_end.tv_sec * 1000000);
+}
+
+#ifdef RT_DEBUG
+/* 
+ * check that the crp action match the current session
+ */
+static int 
+ocf_check_action(struct cryptop *crp, struct cesa_ocf_data *cesa_ocf_cur_ses) {
+	int count = 0;
+	int encrypt = 0, decrypt = 0, auth = 0;
+	struct cryptodesc *crd;
+
+        /* Go through crypto descriptors, processing as we go */
+        for (crd = crp->crp_desc; crd; crd = crd->crd_next, count++) {
+		if(count > 2) {
+			printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
+			return 1;
+		}
+		
+		/* Encryption /Decryption */
+		if(crd->crd_alg == cesa_ocf_cur_ses->cipher_alg) {
+			/* check that the action is compatible with session */
+			if(encrypt || decrypt) {
+				printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
+				return 1;
+			}
+
+			if(crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
+				if( (count == 2) && (cesa_ocf_cur_ses->encrypt_tn_auth) ) {
+					printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
+					return 1;
+				}
+				encrypt++;
+			}
+			else { 					/* decrypt */
+				if( (count == 2) && !(cesa_ocf_cur_ses->auth_tn_decrypt) ) {
+					printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
+					return 1;
+				}
+				decrypt++;
+			}
+
+		}
+		/* Authentication */
+		else if(crd->crd_alg == cesa_ocf_cur_ses->auth_alg) {
+			/* check that the action is compatible with session */
+			if(auth) {
+				printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
+				return 1;
+			}
+			if( (count == 2) && (decrypt) && (cesa_ocf_cur_ses->auth_tn_decrypt)) {
+				printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
+				return 1;
+			}
+			if( (count == 2) && (encrypt) && !(cesa_ocf_cur_ses->encrypt_tn_auth)) {
+				printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
+				return 1;
+			}
+			auth++;
+		} 
+		else {
+			printk("%s,%d: Alg isn't supported by this session.\n", __FILE__, __LINE__);
+			return 1;
+		}
+	}
+	return 0;
+
+}
+#endif
+
+/*
+ * Process a request.
+ */
+static int 
+cesa_ocf_process(device_t dev, struct cryptop *crp, int hint)
+{
+	struct cesa_ocf_process *cesa_ocf_cmd = NULL;
+	struct cesa_ocf_process *cesa_ocf_cmd_wa = NULL;
+	MV_CESA_COMMAND	*cesa_cmd;
+	struct cryptodesc *crd;
+	struct cesa_ocf_data *cesa_ocf_cur_ses;
+	int sid = 0, temp_len = 0, i;
+	int encrypt = 0, decrypt = 0, auth = 0;
+	int  status;
+	struct sk_buff *skb = NULL;
+	struct uio *uiop = NULL;
+	unsigned char *ivp;
+	MV_BUF_INFO *p_buf_info;	
+	MV_CESA_MBUF *p_mbuf_info;
+	unsigned long flags;
+
+        dprintk("%s()\n", __FUNCTION__);
+
+	if( cesaReqResources <= 1 ) {
+                dprintk("%s,%d: ERESTART\n", __FILE__, __LINE__);
+                return ERESTART;
+	}
+
+#ifdef RT_DEBUG
+        /* Sanity check */
+        if (crp == NULL) {
+                printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+                return EINVAL;
+        }
+
+        if (crp->crp_desc == NULL || crp->crp_buf == NULL ) {
+                printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+                crp->crp_etype = EINVAL;
+                return EINVAL;
+        }
+
+        sid = crp->crp_sid & 0xffffffff;
+        if ((sid >= CESA_OCF_MAX_SES) || (cesa_ocf_sessions[sid] == NULL)) {
+                crp->crp_etype = ENOENT;
+                printk("%s,%d: ENOENT session %d \n", __FILE__, __LINE__, sid);
+                return EINVAL;
+        }
+#endif
+
+	sid = crp->crp_sid & 0xffffffff;
+	crp->crp_etype = 0;
+	cesa_ocf_cur_ses = cesa_ocf_sessions[sid];
+
+#ifdef RT_DEBUG
+	if(ocf_check_action(crp, cesa_ocf_cur_ses)){
+		goto p_error;
+	}
+#endif
+
+	/* malloc a new  cesa process */	
+	cesa_ocf_cmd = kmalloc(sizeof(struct cesa_ocf_process), GFP_ATOMIC);
+	
+        if (cesa_ocf_cmd == NULL) {
+            	printk("%s,%d: ENOBUFS \n", __FILE__, __LINE__);
+            	goto p_error;
+      	}
+	memset(cesa_ocf_cmd, 0, sizeof(struct cesa_ocf_process));
+
+	/* init cesa_process */
+	cesa_ocf_cmd->crp = crp;
+	/* always call callback */
+	cesa_ocf_cmd->need_cb = 1;
+
+	/* init cesa_cmd for usage of the HALs */
+	cesa_cmd = &cesa_ocf_cmd->cesa_cmd;
+	cesa_cmd->pReqPrv = (void *)cesa_ocf_cmd;
+	cesa_cmd->sessionId = cesa_ocf_cur_ses->sid_encrypt; /* defualt use encrypt */
+
+	/* prepare src buffer 	*/
+	/* we send the entire buffer to the HAL, even if only part of it should be encrypt/auth.  */
+	/* if not using seesions for both encrypt and auth, then it will be wiser to to copy only */
+	/* from skip to crd_len. 								  */
+	p_buf_info = cesa_ocf_cmd->cesa_bufs;	
+	p_mbuf_info = &cesa_ocf_cmd->cesa_mbuf;
+
+	p_buf_info += 2; /* save 2 first buffers for IV and digest - 
+			    we won't append them to the end since, they 
+			    might be places in an unaligned addresses. */
+	
+	p_mbuf_info->pFrags = p_buf_info;
+	temp_len = 0;
+
+	/* handle SKB */
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		
+		dprintk("%s,%d: handle SKB.\n", __FILE__, __LINE__);
+		skb = (struct sk_buff *) crp->crp_buf;
+
+                if (skb_shinfo(skb)->nr_frags >= (MV_CESA_MAX_MBUF_FRAGS - 1)) {
+                        printk("%s,%d: %d nr_frags > MV_CESA_MAX_MBUF_FRAGS", __FILE__, __LINE__, skb_shinfo(skb)->nr_frags);
+                        goto p_error;
+                }
+
+		p_mbuf_info->mbufSize = skb->len;
+		temp_len = skb->len;
+        	/* first skb fragment */
+        	p_buf_info->bufSize = skb_headlen(skb);
+        	p_buf_info->bufVirtPtr = skb->data;
+		p_buf_info++;
+
+        	/* now handle all other skb fragments */
+        	for ( i = 0; i < skb_shinfo(skb)->nr_frags; i++ ) {
+            		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+            		p_buf_info->bufSize = frag->size;
+            		p_buf_info->bufVirtPtr = page_address(FRAG_PAGE(frag->page)) + frag->page_offset;
+            		p_buf_info++;
+        	}
+        	p_mbuf_info->numFrags = skb_shinfo(skb)->nr_frags + 1;
+	}
+	/* handle UIO */
+	else if(crp->crp_flags & CRYPTO_F_IOV) {
+	
+		dprintk("%s,%d: handle UIO.\n", __FILE__, __LINE__);
+		uiop = (struct uio *) crp->crp_buf;
+
+                if (uiop->uio_iovcnt > (MV_CESA_MAX_MBUF_FRAGS - 1)) {
+                        printk("%s,%d: %d uio_iovcnt > MV_CESA_MAX_MBUF_FRAGS \n", __FILE__, __LINE__, uiop->uio_iovcnt);
+                        goto p_error;
+                }
+
+		p_mbuf_info->mbufSize = crp->crp_ilen;
+		p_mbuf_info->numFrags = uiop->uio_iovcnt;
+		for(i = 0; i < uiop->uio_iovcnt; i++) {
+			p_buf_info->bufVirtPtr = uiop->uio_iov[i].iov_base;
+			p_buf_info->bufSize = uiop->uio_iov[i].iov_len;
+			temp_len += p_buf_info->bufSize;
+			dprintk("%s,%d: buf %x-> addr %x, size %x \n"
+				, __FILE__, __LINE__, i, (unsigned int)p_buf_info->bufVirtPtr, p_buf_info->bufSize);
+			p_buf_info++;			
+		}
+
+	}
+	/* handle CONTIG */
+	else {
+		dprintk("%s,%d: handle CONTIG.\n", __FILE__, __LINE__); 
+		p_mbuf_info->numFrags = 1;
+		p_mbuf_info->mbufSize = crp->crp_ilen;
+		p_buf_info->bufVirtPtr = crp->crp_buf;
+		p_buf_info->bufSize = crp->crp_ilen;
+		temp_len = crp->crp_ilen;
+		p_buf_info++;
+	}
+	
+	/* Support up to 64K why? cause! */
+	if(crp->crp_ilen > 64*1024) {
+		printk("%s,%d: buf too big %x \n", __FILE__, __LINE__, crp->crp_ilen);
+		goto p_error;
+	}
+
+	if( temp_len != crp->crp_ilen ) {
+		printk("%s,%d: warning size don't match.(%x %x) \n", __FILE__, __LINE__, temp_len, crp->crp_ilen);
+	}	
+
+	cesa_cmd->pSrc = p_mbuf_info;
+	cesa_cmd->pDst = p_mbuf_info;
+	
+	/* restore p_buf_info to point to first available buf */
+	p_buf_info = cesa_ocf_cmd->cesa_bufs;	
+	p_buf_info += 1; 
+
+
+        /* Go through crypto descriptors, processing as we go */
+        for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
+		
+		/* Encryption /Decryption */
+		if(crd->crd_alg == cesa_ocf_cur_ses->cipher_alg) {
+
+			dprintk("%s,%d: cipher", __FILE__, __LINE__);
+
+			cesa_cmd->cryptoOffset = crd->crd_skip;
+    	              	cesa_cmd->cryptoLength = crd->crd_len;
+
+			if(crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
+				dprintk(" encrypt \n");
+				encrypt++;
+
+				/* handle IV */
+				if (crd->crd_flags & CRD_F_IV_EXPLICIT) {  /* IV from USER */
+					dprintk("%s,%d: IV from USER (offset %x) \n", __FILE__, __LINE__, crd->crd_inject);
+					cesa_cmd->ivFromUser = 1;
+					ivp = crd->crd_iv;
+
+                                	/*
+                                 	 * do we have to copy the IV back to the buffer ?
+                                 	 */
+                                	if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+						dprintk("%s,%d: copy the IV back to the buffer\n", __FILE__, __LINE__);
+						cesa_cmd->ivOffset = crd->crd_inject;
+						crypto_copyback(crp->crp_flags, crp->crp_buf, crd->crd_inject, cesa_ocf_cur_ses->ivlen, ivp);
+                                	}
+					else {
+						dprintk("%s,%d: don't copy the IV back to the buffer \n", __FILE__, __LINE__);
+						p_mbuf_info->numFrags++;
+						p_mbuf_info->mbufSize += cesa_ocf_cur_ses->ivlen; 
+						p_mbuf_info->pFrags = p_buf_info;
+
+						p_buf_info->bufVirtPtr = ivp;
+						p_buf_info->bufSize = cesa_ocf_cur_ses->ivlen; 
+						p_buf_info--;
+
+						/* offsets */
+						cesa_cmd->ivOffset = 0;
+						cesa_cmd->cryptoOffset += cesa_ocf_cur_ses->ivlen;
+						if(auth) {
+							cesa_cmd->macOffset += cesa_ocf_cur_ses->ivlen;
+							cesa_cmd->digestOffset += cesa_ocf_cur_ses->ivlen; 
+						}	
+					}
+                                }
+				else {					/* random IV */
+					dprintk("%s,%d: random IV \n", __FILE__, __LINE__);
+					cesa_cmd->ivFromUser = 0;
+
+                                	/*
+                                 	 * do we have to copy the IV back to the buffer ?
+                                 	 */
+					/* in this mode the HAL will always copy the IV */
+					/* given by the session to the ivOffset  	*/
+					if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+						cesa_cmd->ivOffset = crd->crd_inject;
+					} 
+					else {
+						/* if IV isn't copy, then how will the user know which IV did we use??? */
+						printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+						goto p_error; 
+					}
+				}
+			}
+			else { 					/* decrypt */
+				dprintk(" decrypt \n");
+				decrypt++;
+				cesa_cmd->sessionId = cesa_ocf_cur_ses->sid_decrypt;
+
+				/* handle IV */
+				if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
+					dprintk("%s,%d: IV from USER \n", __FILE__, __LINE__);
+					/* append the IV buf to the mbuf */
+					cesa_cmd->ivFromUser = 1;	
+					p_mbuf_info->numFrags++;
+					p_mbuf_info->mbufSize += cesa_ocf_cur_ses->ivlen; 
+					p_mbuf_info->pFrags = p_buf_info;
+
+					p_buf_info->bufVirtPtr = crd->crd_iv;
+					p_buf_info->bufSize = cesa_ocf_cur_ses->ivlen; 
+					p_buf_info--;
+
+					/* offsets */
+					cesa_cmd->ivOffset = 0;
+					cesa_cmd->cryptoOffset += cesa_ocf_cur_ses->ivlen;
+					if(auth) {
+						cesa_cmd->macOffset += cesa_ocf_cur_ses->ivlen;
+						cesa_cmd->digestOffset += cesa_ocf_cur_ses->ivlen; 
+					}
+                                }
+				else {
+					dprintk("%s,%d: IV inside the buffer \n", __FILE__, __LINE__);
+					cesa_cmd->ivFromUser = 0;
+					cesa_cmd->ivOffset = crd->crd_inject;
+				}
+			}
+
+		}
+		/* Authentication */
+		else if(crd->crd_alg == cesa_ocf_cur_ses->auth_alg) {
+			dprintk("%s,%d:  Authentication \n", __FILE__, __LINE__);
+			auth++;
+			cesa_cmd->macOffset = crd->crd_skip;
+			cesa_cmd->macLength = crd->crd_len;
+
+			/* digest + mac */
+			cesa_cmd->digestOffset = crd->crd_inject;
+		} 
+		else {
+			printk("%s,%d: Alg isn't supported by this session.\n", __FILE__, __LINE__);
+			goto p_error;
+		}
+	}
+
+	dprintk("\n");
+	dprintk("%s,%d: Sending Action: \n", __FILE__, __LINE__);
+	dprintk("%s,%d: IV from user: %d. IV offset %x \n",  __FILE__, __LINE__, cesa_cmd->ivFromUser, cesa_cmd->ivOffset);
+	dprintk("%s,%d: crypt offset %x len %x \n", __FILE__, __LINE__, cesa_cmd->cryptoOffset, cesa_cmd->cryptoLength);
+	dprintk("%s,%d: Auth offset %x len %x \n", __FILE__, __LINE__, cesa_cmd->macOffset, cesa_cmd->macLength);
+	dprintk("%s,%d: set digest in offset %x . \n", __FILE__, __LINE__, cesa_cmd->digestOffset);
+	if(debug) {
+		mvCesaDebugMbuf("SRC BUFFER", cesa_cmd->pSrc, 0, cesa_cmd->pSrc->mbufSize);
+	}
+
+
+	/* send action to HAL */
+	spin_lock_irqsave(&cesa_lock, flags);
+	status = mvCesaAction(cesa_cmd);
+	spin_unlock_irqrestore(&cesa_lock, flags);
+
+	/* action not allowed */
+	if(status == MV_NOT_ALLOWED) {
+#ifdef CESA_OCF_SPLIT
+		/* if both encrypt and auth try to split */
+		if(auth && (encrypt || decrypt)) {
+			MV_CESA_COMMAND	*cesa_cmd_wa;
+
+			/* malloc a new cesa process and init it */	
+			cesa_ocf_cmd_wa = kmalloc(sizeof(struct cesa_ocf_process), GFP_ATOMIC);
+	
+        		if (cesa_ocf_cmd_wa == NULL) {
+            			printk("%s,%d: ENOBUFS \n", __FILE__, __LINE__);
+            			goto p_error;
+      			}
+			memcpy(cesa_ocf_cmd_wa, cesa_ocf_cmd, sizeof(struct cesa_ocf_process));
+			cesa_cmd_wa = &cesa_ocf_cmd_wa->cesa_cmd;
+			cesa_cmd_wa->pReqPrv = (void *)cesa_ocf_cmd_wa;
+			cesa_ocf_cmd_wa->need_cb = 0;
+
+			/* break requests to two operation, first operation completion won't call callback */
+			if((decrypt) && (cesa_ocf_cur_ses->auth_tn_decrypt)) {
+				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
+				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_decrypt;
+			}
+			else if((decrypt) && !(cesa_ocf_cur_ses->auth_tn_decrypt)) {
+				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_decrypt;
+				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
+			}
+			else if((encrypt) && (cesa_ocf_cur_ses->encrypt_tn_auth)) {
+				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_encrypt;
+				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
+			}
+			else if((encrypt) && !(cesa_ocf_cur_ses->encrypt_tn_auth)){
+				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
+				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_encrypt;
+			}
+			else {
+				printk("%s,%d: Unsupporterd fragment wa mode \n", __FILE__, __LINE__);
+            			goto p_error;
+			}
+
+			/* send the 2 actions to the HAL */
+			spin_lock_irqsave(&cesa_lock, flags);
+			status = mvCesaAction(cesa_cmd_wa);
+			spin_unlock_irqrestore(&cesa_lock, flags);
+
+			if((status != MV_NO_MORE) && (status != MV_OK)) {
+				printk("%s,%d: cesa action failed, status = 0x%x\n", __FILE__, __LINE__, status);
+				goto p_error;
+			}
+			spin_lock_irqsave(&cesa_lock, flags);
+			status = mvCesaAction(cesa_cmd);
+			spin_unlock_irqrestore(&cesa_lock, flags);
+
+		}
+		/* action not allowed and can't split */
+		else 
+#endif
+		{
+			goto p_error;
+		}
+	}
+
+	/* Hal Q is full, send again. This should never happen */
+	if(status == MV_NO_RESOURCE) {
+		printk("%s,%d: cesa no more resources \n", __FILE__, __LINE__);
+		if(cesa_ocf_cmd)
+			kfree(cesa_ocf_cmd);
+		if(cesa_ocf_cmd_wa)
+			kfree(cesa_ocf_cmd_wa);
+		return ERESTART;
+	} 
+	else if((status != MV_NO_MORE) && (status != MV_OK)) {
+                printk("%s,%d: cesa action failed, status = 0x%x\n", __FILE__, __LINE__, status);
+		goto p_error;
+        }
+
+
+#ifdef CESA_OCF_POLLING
+	cesa_interrupt_polling();
+#endif
+	cesaTestTraceAdd(5);
+
+	return 0;
+p_error:
+	crp->crp_etype = EINVAL;
+	if(cesa_ocf_cmd)
+		kfree(cesa_ocf_cmd);
+	if(cesa_ocf_cmd_wa)
+		kfree(cesa_ocf_cmd_wa);
+       	return EINVAL;
+}
+
+/*
+ * cesa callback. 
+ */
+static void
+cesa_callback(unsigned long dummy)
+{
+	struct cesa_ocf_process *cesa_ocf_cmd = NULL;
+	struct cryptop 		*crp = NULL;
+	MV_CESA_RESULT  	result[MV_CESA_MAX_CHAN];
+	int 			res_idx = 0,i;
+	MV_STATUS               status;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+#ifdef CESA_OCF_TASKLET
+	disable_irq(cesa_device.irq);
+#endif
+    while(MV_TRUE) {
+	
+		 /* Get Ready requests */
+		spin_lock(&cesa_lock);
+		status = mvCesaReadyGet(&result[res_idx]);
+		spin_unlock(&cesa_lock);
+
+	        cesaTestTraceAdd(2);	
+
+		    if(status != MV_OK) {
+#ifdef CESA_OCF_POLLING
+		        if(status == MV_BUSY) { /* Fragment */
+			        cesa_interrupt_polling();
+			        return;
+		        }
+#endif
+	    	    break;
+    	    }
+	        res_idx++;
+		    break;
+	    }
+	
+	for(i = 0; i < res_idx; i++) {
+
+		if(!result[i].pReqPrv) {
+			printk("%s,%d: warning private is NULL\n", __FILE__, __LINE__);
+			break;
+		}
+
+		cesa_ocf_cmd = result[i].pReqPrv;
+		crp = cesa_ocf_cmd->crp; 
+
+		// ignore HMAC error.
+		//if(result->retCode)
+		//	crp->crp_etype = EIO;	
+	
+#if  defined(CESA_OCF_POLLING) 
+		if(!cesa_ocf_cmd->need_cb){
+			cesa_interrupt_polling();
+		}	
+#endif
+		if(cesa_ocf_cmd->need_cb) {
+			if(debug) {
+				mvCesaDebugMbuf("DST BUFFER", cesa_ocf_cmd->cesa_cmd.pDst, 0, cesa_ocf_cmd->cesa_cmd.pDst->mbufSize);
+			}
+			crypto_done(crp);
+		}
+		kfree(cesa_ocf_cmd);
+    	}
+#ifdef CESA_OCF_TASKLET
+	enable_irq(cesa_device.irq);
+#endif
+
+	cesaTestTraceAdd(3);
+
+	return;
+}
+
+#ifdef CESA_OCF_POLLING
+static void
+cesa_interrupt_polling(void)
+{
+        u32                  	cause;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+  	/* Read cause register */
+	do {
+		cause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
+		cause &= MV_CESA_CAUSE_ACC_DMA_ALL_MASK;
+
+	} while (cause == 0);
+		
+	/* clear interrupts */
+    	MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
+
+	cesa_callback(0);
+
+	return;
+}
+
+#endif
+
+/*
+ * cesa Interrupt polling routine.
+ */
+static irqreturn_t
+cesa_interrupt_handler(int irq, void *arg)
+{
+        u32                  	cause;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	cesaTestTraceAdd(0);
+
+  	/* Read cause register */
+	cause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
+
+    	if( (cause & MV_CESA_CAUSE_ACC_DMA_ALL_MASK) == 0)
+    	{
+        /* Empty interrupt */
+		dprintk("%s,%d: cesaTestReadyIsr: cause=0x%x\n", __FILE__, __LINE__, cause);
+        	return IRQ_HANDLED;
+    	}
+	
+	/* clear interrupts */
+    	MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
+
+	cesaTestTraceAdd(1);
+#ifdef CESA_OCF_TASKLET	
+	tasklet_hi_schedule(&cesa_ocf_tasklet);
+#else
+	cesa_callback(0);
+#endif
+	return IRQ_HANDLED;
+}
+
+/*
+ * Open a session.
+ */
+static int 
+/*cesa_ocf_newsession(void *arg, u_int32_t *sid, struct cryptoini *cri)*/
+cesa_ocf_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
+{
+	u32 status = 0, i;
+	u32 count = 0, auth = 0, encrypt =0;
+	struct cesa_ocf_data *cesa_ocf_cur_ses;
+	MV_CESA_OPEN_SESSION cesa_session;
+	MV_CESA_OPEN_SESSION *cesa_ses = &cesa_session;
+
+
+        dprintk("%s()\n", __FUNCTION__);
+        if (sid == NULL || cri == NULL) {
+                printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+                return EINVAL;
+        }
+
+	/* leave first empty like in other implementations */
+        for (i = 1; i < CESA_OCF_MAX_SES; i++) {
+       		if (cesa_ocf_sessions[i] == NULL)
+               		break;
+	}
+
+	if(i >= CESA_OCF_MAX_SES) {
+		printk("%s,%d: no more sessions \n", __FILE__, __LINE__);
+                return EINVAL;
+	}
+
+        cesa_ocf_sessions[i] = (struct cesa_ocf_data *) kmalloc(sizeof(struct cesa_ocf_data), GFP_ATOMIC);
+        if (cesa_ocf_sessions[i] == NULL) {
+                cesa_ocf_freesession(NULL, i);
+                printk("%s,%d: ENOBUFS \n", __FILE__, __LINE__);
+                return ENOBUFS;
+        }
+	dprintk("%s,%d: new session %d \n", __FILE__, __LINE__, i);
+	
+        *sid = i;
+        cesa_ocf_cur_ses = cesa_ocf_sessions[i];
+        memset(cesa_ocf_cur_ses, 0, sizeof(struct cesa_ocf_data));
+	cesa_ocf_cur_ses->sid_encrypt = -1;
+	cesa_ocf_cur_ses->sid_decrypt = -1;
+	cesa_ocf_cur_ses->frag_wa_encrypt = -1;
+	cesa_ocf_cur_ses->frag_wa_decrypt = -1;
+	cesa_ocf_cur_ses->frag_wa_auth = -1;
+
+	/* init the session */	
+	memset(cesa_ses, 0, sizeof(MV_CESA_OPEN_SESSION));
+	count = 1;
+        while (cri) {	
+		if(count > 2) {
+        		printk("%s,%d: don't support more then 2 operations\n", __FILE__, __LINE__);
+        		goto error;
+		}
+                switch (cri->cri_alg) {
+		case CRYPTO_AES_CBC:
+			dprintk("%s,%d: (%d) AES CBC \n", __FILE__, __LINE__, count);
+			cesa_ocf_cur_ses->cipher_alg = cri->cri_alg;
+			cesa_ocf_cur_ses->ivlen = MV_CESA_AES_BLOCK_SIZE;
+			cesa_ses->cryptoAlgorithm = MV_CESA_CRYPTO_AES;
+			cesa_ses->cryptoMode = MV_CESA_CRYPTO_CBC;
+			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
+        			printk("%s,%d: CRYPTO key too long.\n", __FILE__, __LINE__);
+        			goto error;
+			}
+			memcpy(cesa_ses->cryptoKey, cri->cri_key, cri->cri_klen/8);
+			dprintk("%s,%d: key length %d \n", __FILE__, __LINE__, cri->cri_klen/8);
+			cesa_ses->cryptoKeyLength = cri->cri_klen/8;
+			encrypt += count;
+			break;
+                case CRYPTO_3DES_CBC:
+			dprintk("%s,%d: (%d) 3DES CBC \n", __FILE__, __LINE__, count);
+			cesa_ocf_cur_ses->cipher_alg = cri->cri_alg;
+			cesa_ocf_cur_ses->ivlen = MV_CESA_3DES_BLOCK_SIZE;
+			cesa_ses->cryptoAlgorithm = MV_CESA_CRYPTO_3DES;
+			cesa_ses->cryptoMode = MV_CESA_CRYPTO_CBC;
+			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
+        			printk("%s,%d: CRYPTO key too long.\n", __FILE__, __LINE__);
+        			goto error;
+			}
+			memcpy(cesa_ses->cryptoKey, cri->cri_key, cri->cri_klen/8);
+			cesa_ses->cryptoKeyLength = cri->cri_klen/8;
+			encrypt += count;
+			break;
+                case CRYPTO_DES_CBC:
+			dprintk("%s,%d: (%d) DES CBC \n", __FILE__, __LINE__, count);
+			cesa_ocf_cur_ses->cipher_alg = cri->cri_alg;
+			cesa_ocf_cur_ses->ivlen = MV_CESA_DES_BLOCK_SIZE;
+			cesa_ses->cryptoAlgorithm = MV_CESA_CRYPTO_DES;
+			cesa_ses->cryptoMode = MV_CESA_CRYPTO_CBC;
+			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
+        			printk("%s,%d: CRYPTO key too long.\n", __FILE__, __LINE__);
+        			goto error;
+			}
+			memcpy(cesa_ses->cryptoKey, cri->cri_key, cri->cri_klen/8);
+			cesa_ses->cryptoKeyLength = cri->cri_klen/8;
+			encrypt += count;
+			break;
+                case CRYPTO_MD5:
+                case CRYPTO_MD5_HMAC:
+			dprintk("%s,%d: (%d) %sMD5 CBC \n", __FILE__, __LINE__, count, (cri->cri_alg != CRYPTO_MD5)? "H-":" ");
+                        cesa_ocf_cur_ses->auth_alg = cri->cri_alg;
+			cesa_ocf_cur_ses->digestlen = (cri->cri_alg == CRYPTO_MD5)? MV_CESA_MD5_DIGEST_SIZE : 12;
+			cesa_ses->macMode = (cri->cri_alg == CRYPTO_MD5)? MV_CESA_MAC_MD5 : MV_CESA_MAC_HMAC_MD5;
+			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
+        			printk("%s,%d: MAC key too long. \n", __FILE__, __LINE__);
+        			goto error;
+			}
+			cesa_ses->macKeyLength = cri->cri_klen/8;
+			memcpy(cesa_ses->macKey, cri->cri_key, cri->cri_klen/8);
+			cesa_ses->digestSize = cesa_ocf_cur_ses->digestlen; 
+			auth += count;
+			break;
+                case CRYPTO_SHA1:
+                case CRYPTO_SHA1_HMAC:
+			dprintk("%s,%d: (%d) %sSHA1 CBC \n", __FILE__, __LINE__, count, (cri->cri_alg != CRYPTO_SHA1)? "H-":" ");
+                        cesa_ocf_cur_ses->auth_alg = cri->cri_alg;
+			cesa_ocf_cur_ses->digestlen = (cri->cri_alg == CRYPTO_SHA1)? MV_CESA_SHA1_DIGEST_SIZE : 12; 
+			cesa_ses->macMode = (cri->cri_alg == CRYPTO_SHA1)? MV_CESA_MAC_SHA1 : MV_CESA_MAC_HMAC_SHA1;
+			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
+        			printk("%s,%d: MAC key too long. \n", __FILE__, __LINE__);
+        			goto error;
+			}
+			cesa_ses->macKeyLength = cri->cri_klen/8;
+			memcpy(cesa_ses->macKey, cri->cri_key, cri->cri_klen/8);
+			cesa_ses->digestSize = cesa_ocf_cur_ses->digestlen;
+			auth += count;
+			break;
+                default:
+                        printk("%s,%d: unknown algo 0x%x\n", __FILE__, __LINE__, cri->cri_alg);
+                        goto error;
+                }
+                cri = cri->cri_next;
+		count++;
+        }
+
+	if((encrypt > 2) || (auth > 2)) {
+		printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
+                goto error;
+	}
+	/* create new sessions in HAL */
+	if(encrypt) {
+		cesa_ses->operation = MV_CESA_CRYPTO_ONLY;
+		/* encrypt session */
+		if(auth == 1) {
+			cesa_ses->operation = MV_CESA_MAC_THEN_CRYPTO;
+		}
+		else if(auth == 2) {
+			cesa_ses->operation = MV_CESA_CRYPTO_THEN_MAC;
+			cesa_ocf_cur_ses->encrypt_tn_auth = 1;
+		}
+		else {
+			cesa_ses->operation = MV_CESA_CRYPTO_ONLY;
+		}
+		cesa_ses->direction = MV_CESA_DIR_ENCODE;
+		status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->sid_encrypt);
+    		if(status != MV_OK) {
+        		printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
+        		goto error;
+    		}	
+		/* decrypt session */
+		if( cesa_ses->operation == MV_CESA_MAC_THEN_CRYPTO ) {
+			cesa_ses->operation = MV_CESA_CRYPTO_THEN_MAC;
+		}
+		else if( cesa_ses->operation == MV_CESA_CRYPTO_THEN_MAC ) {
+			cesa_ses->operation = MV_CESA_MAC_THEN_CRYPTO;
+		}
+		cesa_ses->direction = MV_CESA_DIR_DECODE;
+		status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->sid_decrypt);
+		if(status != MV_OK) {
+        		printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
+        		goto error;
+    		}
+
+		/* preapre one action sessions for case we will need to split an action */
+#ifdef CESA_OCF_SPLIT
+		if(( cesa_ses->operation == MV_CESA_MAC_THEN_CRYPTO ) || 
+			( cesa_ses->operation == MV_CESA_CRYPTO_THEN_MAC )) {
+			/* open one session for encode and one for decode */
+			cesa_ses->operation = MV_CESA_CRYPTO_ONLY;
+			cesa_ses->direction = MV_CESA_DIR_ENCODE;
+			status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->frag_wa_encrypt);
+    			if(status != MV_OK) {
+        			printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
+        			goto error;
+    			}
+
+			cesa_ses->direction = MV_CESA_DIR_DECODE;
+			status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->frag_wa_decrypt);
+    			if(status != MV_OK) {
+        			printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
+        			goto error;
+    			}
+			/* open one session for auth */	
+			cesa_ses->operation = MV_CESA_MAC_ONLY;
+			cesa_ses->direction = MV_CESA_DIR_ENCODE;
+			status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->frag_wa_auth);
+			if(status != MV_OK) {
+        			printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
+				goto error;
+    			}
+		}
+#endif
+	}
+	else { /* only auth */
+		cesa_ses->operation = MV_CESA_MAC_ONLY;
+		cesa_ses->direction = MV_CESA_DIR_ENCODE;
+        	status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->sid_encrypt);
+		if(status != MV_OK) {
+        		printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
+			goto error;
+    		}
+	}
+	
+        return 0;
+error:
+     	cesa_ocf_freesession(NULL, *sid);
+      	return EINVAL;	
+
+}
+
+
+/*
+ * Free a session.
+ */
+static int
+cesa_ocf_freesession(device_t dev, u_int64_t tid)
+{
+        struct cesa_ocf_data *cesa_ocf_cur_ses;
+        u_int32_t sid = CRYPTO_SESID2LID(tid);
+	//unsigned long flags;
+
+        dprintk("%s() %d \n", __FUNCTION__, sid);
+        if ( (sid >= CESA_OCF_MAX_SES) || (cesa_ocf_sessions[sid] == NULL) ) {
+                printk("%s,%d: EINVAL can't free session %d \n", __FILE__, __LINE__, sid);
+                return(EINVAL);
+        }
+
+        /* Silently accept and return */
+        if (sid == 0)
+                return(0);
+
+	/* release session from HAL */
+	cesa_ocf_cur_ses = cesa_ocf_sessions[sid];
+     	if (cesa_ocf_cur_ses->sid_encrypt != -1) {
+		mvCesaSessionClose(cesa_ocf_cur_ses->sid_encrypt);
+	}
+	if (cesa_ocf_cur_ses->sid_decrypt != -1) {
+		mvCesaSessionClose(cesa_ocf_cur_ses->sid_decrypt);
+	}
+     	if (cesa_ocf_cur_ses->frag_wa_encrypt != -1) {
+		mvCesaSessionClose(cesa_ocf_cur_ses->frag_wa_encrypt);
+	}
+	if (cesa_ocf_cur_ses->frag_wa_decrypt != -1) {
+		mvCesaSessionClose(cesa_ocf_cur_ses->frag_wa_decrypt);
+	}
+	if (cesa_ocf_cur_ses->frag_wa_auth != -1) {
+		mvCesaSessionClose(cesa_ocf_cur_ses->frag_wa_auth);
+	}
+
+      	kfree(cesa_ocf_cur_ses);
+	cesa_ocf_sessions[sid] = NULL;
+
+        return 0;
+}
+
+
+/* TDMA Window setup */
+
+static void __init
+setup_tdma_mbus_windows(struct cesa_dev *dev)
+{
+    int i;
+    
+    for (i = 0; i < 4; i++) {
+        writel(0, dev->reg + WINDOW_BASE(i));
+        writel(0, dev->reg + WINDOW_CTRL(i));
+    }
+    
+    for (i = 0; i < dev->plat_data->dram->num_cs; i++) {
+        struct mbus_dram_window *cs = dev->plat_data->dram->cs + i;
+        writel(
+            ((cs->size - 1) & 0xffff0000) |
+            (cs->mbus_attr << 8) |
+            (dev->plat_data->dram->mbus_dram_target_id << 4) | 1,
+            dev->reg + WINDOW_CTRL(i)
+        );
+        writel(cs->base, dev->reg + WINDOW_BASE(i));
+    }
+}
+                                        
+/*
+ * our driver startup and shutdown routines
+ */
+static int
+mv_cesa_ocf_init(struct platform_device *pdev)
+{
+#if defined(CONFIG_MV78200) || defined(CONFIG_MV632X)
+	if (MV_FALSE == mvSocUnitIsMappedToThisCpu(CESA))
+	{
+		dprintk("CESA is not mapped to this CPU\n");
+		return -ENODEV;
+	}		
+#endif
+
+	dprintk("%s\n", __FUNCTION__);
+	memset(&mv_cesa_dev, 0, sizeof(mv_cesa_dev));
+	softc_device_init(&mv_cesa_dev, "MV CESA", 0, mv_cesa_methods);
+	cesa_ocf_id = crypto_get_driverid(softc_get_device(&mv_cesa_dev),CRYPTOCAP_F_HARDWARE);
+
+	if (cesa_ocf_id < 0)
+		panic("MV CESA crypto device cannot initialize!");
+
+	dprintk("%s,%d: cesa ocf device id is %d \n", __FILE__, __LINE__, cesa_ocf_id);
+
+	/* CESA unit is auto power on off */
+#if 0
+	if (MV_FALSE == mvCtrlPwrClckGet(CESA_UNIT_ID,0))
+	{
+		printk("\nWarning CESA %d is Powered Off\n",0);
+		return EINVAL;
+	}
+#endif
+
+	memset(&cesa_device, 0, sizeof(struct cesa_dev));
+	/* Get the IRQ, and crypto memory regions */
+	{
+		struct resource *res;
+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram");
+		
+		if (!res)
+			return -ENXIO;
+		
+		cesa_device.sram = ioremap(res->start, res->end - res->start + 1);
+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
+		
+		if (!res) {
+		        iounmap(cesa_device.sram);
+			return -ENXIO;
+                }
+                cesa_device.reg = ioremap(res->start, res->end - res->start + 1);
+		cesa_device.irq = platform_get_irq(pdev, 0);
+		cesa_device.plat_data = pdev->dev.platform_data;
+	        setup_tdma_mbus_windows(&cesa_device);	
+		
+	}
+	
+	
+	if( MV_OK != mvCesaInit(CESA_OCF_MAX_SES*5, CESA_Q_SIZE, cesa_device.reg,
+				NULL) ) {
+            	printk("%s,%d: mvCesaInit Failed. \n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	/* clear and unmask Int */
+	MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
+#ifndef CESA_OCF_POLLING
+    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, MV_CESA_CAUSE_ACC_DMA_MASK);
+#endif
+#ifdef CESA_OCF_TASKLET
+	tasklet_init(&cesa_ocf_tasklet, cesa_callback, (unsigned int) 0);
+#endif
+	/* register interrupt */
+	if( request_irq( cesa_device.irq, cesa_interrupt_handler,
+                             (IRQF_DISABLED) , "cesa", &cesa_ocf_id) < 0) {
+            	printk("%s,%d: cannot assign irq %x\n", __FILE__, __LINE__, cesa_device.reg);
+		return EINVAL;
+        }
+
+
+	memset(cesa_ocf_sessions, 0, sizeof(struct cesa_ocf_data *) * CESA_OCF_MAX_SES);
+
+#define	REGISTER(alg) \
+	crypto_register(cesa_ocf_id, alg, 0,0)
+	REGISTER(CRYPTO_AES_CBC);
+	REGISTER(CRYPTO_DES_CBC);
+	REGISTER(CRYPTO_3DES_CBC);
+	REGISTER(CRYPTO_MD5);
+	REGISTER(CRYPTO_MD5_HMAC);
+	REGISTER(CRYPTO_SHA1);
+	REGISTER(CRYPTO_SHA1_HMAC);
+#undef REGISTER
+
+	return 0;
+}
+
+static void
+mv_cesa_ocf_exit(struct platform_device *pdev)
+{
+	dprintk("%s()\n", __FUNCTION__);
+
+	crypto_unregister_all(cesa_ocf_id);
+	cesa_ocf_id = -1;
+	iounmap(cesa_device.reg);
+	iounmap(cesa_device.sram);
+	free_irq(cesa_device.irq, NULL);
+	
+	/* mask and clear Int */
+	MV_REG_WRITE( MV_CESA_ISR_MASK_REG, 0);
+	MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
+    	
+
+	if( MV_OK != mvCesaFinish() ) {
+            	printk("%s,%d: mvCesaFinish Failed. \n", __FILE__, __LINE__);
+		return;
+	}
+}
+
+
+void cesa_ocf_debug(void)
+{
+
+#ifdef CESA_OCF_TRACE_DEBUG
+    {
+        int i, j;
+        j = cesaTestTraceIdx;
+        mvOsPrintf("No  Type   rCause   iCause   Proc   Isr   Res     Time     pReady    pProc    pEmpty\n");
+        for(i=0; i<MV_CESA_TEST_TRACE_SIZE; i++)
+        {
+            mvOsPrintf("%02d.  %d   0x%04x   0x%04x   0x%02x   0x%02x   %02d   0x%06x  %p  %p  %p\n",
+                j, cesaTestTrace[j].type, cesaTestTrace[j].realCause,
+                cesaTestTrace[j].idmaCause, 
+                cesaTestTrace[j].resources, cesaTestTrace[j].timeStamp,
+                cesaTestTrace[j].pReqReady, cesaTestTrace[j].pReqProcess, cesaTestTrace[j].pReqEmpty);
+            j++;
+            if(j == MV_CESA_TEST_TRACE_SIZE)
+                j = 0;
+        }
+    }
+#endif
+
+}
+
+static struct platform_driver marvell_cesa = {
+	.probe		= mv_cesa_ocf_init,
+	.remove		= mv_cesa_ocf_exit,
+	.driver		= {
+		.owner	= THIS_MODULE,
+		.name	= "mv_crypto",
+	},
+};
+
+MODULE_ALIAS("platform:mv_crypto");
+
+static int __init mv_cesa_init(void)
+{
+	return platform_driver_register(&marvell_cesa);
+}
+
+module_init(mv_cesa_init);
+
+static void __exit mv_cesa_exit(void)
+{
+	platform_driver_unregister(&marvell_cesa);
+}
+
+module_exit(mv_cesa_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ronen Shitrit");
+MODULE_DESCRIPTION("OCF module for Orion CESA crypto");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h
new file mode 100644
index 00000000..3769dde2
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h
@@ -0,0 +1,213 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmv802_3h
+#define __INCmv802_3h
+
+
+/* includes */
+#include "mvTypes.h"
+
+/* Defines */
+#define MV_MAX_ETH_DATA     1500
+
+/* 802.3 types */
+#define MV_IP_TYPE                  0x0800
+#define MV_IP_ARP_TYPE              0x0806
+#define MV_APPLE_TALK_ARP_TYPE      0x80F3
+#define MV_NOVELL_IPX_TYPE          0x8137
+#define MV_EAPOL_TYPE				0x888e
+
+
+
+/* Encapsulation header for RFC1042 and Ethernet_tunnel */
+
+#define MV_RFC1042_SNAP_HEADER     {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}
+
+#define MV_ETH_SNAP_LSB             0xF8
+
+
+#define	MV_MAC_ADDR_SIZE	(6)
+#define MV_MAC_STR_SIZE		(20)
+#define MV_VLAN_HLEN		(4)
+
+/* This macro checks for a multicast mac address    */
+#define MV_IS_MULTICAST_MAC(mac)  (((mac)[0] & 0x1) == 1)
+
+
+/* This macro checks for an broadcast mac address     */
+#define MV_IS_BROADCAST_MAC(mac)            \
+       (((mac)[0] == 0xFF) &&       \
+        ((mac)[1] == 0xFF) &&       \
+        ((mac)[2] == 0xFF) &&       \
+        ((mac)[3] == 0xFF) &&       \
+        ((mac)[4] == 0xFF) &&       \
+        ((mac)[5] == 0xFF))
+
+
+/* Typedefs */
+typedef struct
+{
+    MV_U8     pDA[MV_MAC_ADDR_SIZE];
+    MV_U8     pSA[MV_MAC_ADDR_SIZE];
+    MV_U16    typeOrLen;
+
+} MV_802_3_HEADER;
+
+enum {
+  MV_IP_PROTO_NULL	= 0,    /* Dummy protocol for TCP               */
+  MV_IP_PROTO_ICMP	= 1,    /* Internet Control Message Protocol    */
+  MV_IP_PROTO_IGMP	= 2,    /* Internet Group Management Protocol   */
+  MV_IP_PROTO_IPIP	= 4,    /* IPIP tunnels (older KA9Q tunnels use 94) */
+  MV_IP_PROTO_TCP	= 6,    /* Transmission Control Protocol        */
+  MV_IP_PROTO_EGP	= 8,    /* Exterior Gateway Protocol            */
+  MV_IP_PROTO_PUP	= 12,   /* PUP protocol                         */
+  MV_IP_PROTO_UDP	= 17,   /* User Datagram Protocol               */
+  MV_IP_PROTO_IDP	= 22,   /* XNS IDP protocol                     */
+  MV_IP_PROTO_DCCP	= 33,   /* Datagram Congestion Control Protocol */
+  MV_IP_PROTO_IPV6	= 41,   /* IPv6-in-IPv4 tunnelling              */
+  MV_IP_PROTO_RSVP	= 46,   /* RSVP protocol                        */
+  MV_IP_PROTO_GRE	= 47,   /* Cisco GRE tunnels (rfc 1701,1702)    */
+  MV_IP_PROTO_ESP	= 50,   /* Encapsulation Security Payload protocol */
+  MV_IP_PROTO_AH	= 51,   /* Authentication Header protocol       */
+  MV_IP_PROTO_BEETPH	= 94,   /* IP option pseudo header for BEET     */
+  MV_IP_PROTO_PIM	= 103, 
+  MV_IP_PROTO_COMP	= 108,  /* Compression Header protocol          */
+  MV_IP_PROTO_ZERO_HOP	= 114,  /* Any 0 hop protocol (IANA)            */
+  MV_IP_PROTO_SCTP	= 132,  /* Stream Control Transport Protocol    */
+  MV_IP_PROTO_UDPLITE	= 136,  /* UDP-Lite (RFC 3828)                  */
+
+  MV_IP_PROTO_RAW	= 255,  /* Raw IP packets                       */
+  MV_IP_PROTO_MAX
+};
+
+typedef struct
+{
+    MV_U8   version;
+    MV_U8   tos;
+    MV_U16  totalLength;
+    MV_U16  identifier;
+    MV_U16  fragmentCtrl;
+    MV_U8   ttl;
+    MV_U8   protocol;
+    MV_U16  checksum;
+    MV_U32  srcIP;
+    MV_U32  dstIP;
+
+} MV_IP_HEADER; 
+
+typedef struct
+{       
+    MV_U32 spi;
+    MV_U32 seqNum;
+} MV_ESP_HEADER; 
+
+#define MV_ICMP_ECHOREPLY          0       /* Echo Reply                   */
+#define MV_ICMP_DEST_UNREACH       3       /* Destination Unreachable      */
+#define MV_ICMP_SOURCE_QUENCH      4       /* Source Quench                */
+#define MV_ICMP_REDIRECT           5       /* Redirect (change route)      */
+#define MV_ICMP_ECHO               8       /* Echo Request                 */
+#define MV_ICMP_TIME_EXCEEDED      11      /* Time Exceeded                */
+#define MV_ICMP_PARAMETERPROB      12      /* Parameter Problem            */
+#define MV_ICMP_TIMESTAMP          13      /* Timestamp Request            */
+#define MV_ICMP_TIMESTAMPREPLY     14      /* Timestamp Reply              */
+#define MV_ICMP_INFO_REQUEST       15      /* Information Request          */
+#define MV_ICMP_INFO_REPLY         16      /* Information Reply            */
+#define MV_ICMP_ADDRESS            17      /* Address Mask Request         */
+#define MV_ICMP_ADDRESSREPLY       18      /* Address Mask Reply           */
+
+typedef struct
+{
+    MV_U8   type;
+    MV_U8   code;
+    MV_U16  checksum;
+    MV_U16  id;
+    MV_U16  sequence;
+
+} MV_ICMP_ECHO_HEADER;
+
+typedef struct
+{
+    MV_U16  source;
+    MV_U16  dest;
+    MV_U32  seq;
+    MV_U32  ack_seq;
+    MV_U16  flags;
+    MV_U16  window;
+    MV_U16  chksum;
+    MV_U16  urg_offset;
+
+} MV_TCP_HEADER;
+
+typedef struct
+{
+    MV_U16  source;
+    MV_U16  dest;
+    MV_U16  len;
+    MV_U16  check;
+
+} MV_UDP_HEADER;
+
+#endif /* __INCmv802_3h */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c
new file mode 100644
index 00000000..dc0e0cfc
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c
@@ -0,0 +1,277 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvOs.h"
+#include "mv802_3.h"
+#include "mvCommon.h"
+
+
+/*******************************************************************************
+* mvMacStrToHex - Convert MAC format string to hex.
+*
+* DESCRIPTION:
+*		This function convert MAC format string to hex.
+*
+* INPUT:
+*       macStr - MAC address string. Fornat of address string is 
+*                uu:vv:ww:xx:yy:zz, where ":" can be any delimiter.
+*
+* OUTPUT:
+*       macHex - MAC in hex format.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvMacStrToHex(const char* macStr, MV_U8* macHex)
+{
+    int i;
+    char tmp[3];
+
+    for(i = 0; i < MV_MAC_ADDR_SIZE; i++)
+    {
+        tmp[0] = macStr[(i * 3) + 0];
+        tmp[1] = macStr[(i * 3) + 1];
+        tmp[2] = '\0';
+        macHex[i] = (MV_U8) (strtol(tmp, NULL, 16));
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvMacHexToStr - Convert MAC in hex format to string format.
+*
+* DESCRIPTION:
+*		This function convert MAC in hex format to string format.
+*
+* INPUT:
+*       macHex - MAC in hex format.
+*
+* OUTPUT:
+*       macStr - MAC address string. String format is uu:vv:ww:xx:yy:zz.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvMacHexToStr(MV_U8* macHex, char* macStr)
+{
+	int i;
+
+    for(i = 0; i < MV_MAC_ADDR_SIZE; i++)
+    {
+        mvOsSPrintf(&macStr[i * 3], "%02x:", macHex[i]);
+    }
+    macStr[(i * 3) - 1] = '\0';
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvSizePrint - Print the given size with size unit description.
+*
+* DESCRIPTION:
+*		This function print the given size with size unit description.
+*       FOr example when size paramter is 0x180000, the function prints:
+*       "size 1MB+500KB"
+*
+* INPUT:
+*       size - Size in bytes.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvSizePrint(MV_U32 size)
+{
+    mvOsOutput("size ");
+
+    if(size >= _1G)
+    {
+        mvOsOutput("%3dGB ", size / _1G);
+        size %= _1G;
+        if(size)
+            mvOsOutput("+");
+    }
+    if(size >= _1M )
+    {
+        mvOsOutput("%3dMB ", size / _1M);
+        size %= _1M;
+        if(size)
+            mvOsOutput("+");
+    }
+    if(size >= _1K)
+    {
+        mvOsOutput("%3dKB ", size / _1K);
+        size %= _1K;
+        if(size)
+            mvOsOutput("+");
+    }
+    if(size > 0)
+    {
+        mvOsOutput("%3dB ", size);
+    }
+}
+
+/*******************************************************************************
+* mvHexToBin - Convert hex to binary
+*
+* DESCRIPTION:
+*		This function Convert hex to binary.
+*
+* INPUT:
+*       pHexStr - hex buffer pointer.
+*       size    - Size to convert.
+*
+* OUTPUT:
+*       pBin - Binary buffer pointer.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvHexToBin(const char* pHexStr, MV_U8* pBin, int size)
+{
+  	int     j, i;
+    char    tmp[3];
+    MV_U8   byte;
+    
+    for(j=0, i=0; j<size; j++, i+=2)
+    {
+        tmp[0] = pHexStr[i];
+        tmp[1] = pHexStr[i+1];
+        tmp[2] = '\0';
+        byte = (MV_U8) (strtol(tmp, NULL, 16) & 0xFF);
+        pBin[j] =  byte;     
+    }
+}
+
+void     mvAsciiToHex(const char* asciiStr, char* hexStr)
+{
+	int	i=0;
+
+	while(asciiStr[i] != 0)
+	{
+		mvOsSPrintf(&hexStr[i*2], "%02x", asciiStr[i]);
+		i++;
+	}
+	hexStr[i*2] = 0;
+}
+
+
+void    mvBinToHex(const MV_U8* bin, char* hexStr, int size)
+{
+	int i;
+
+    for(i=0; i<size; i++)
+    {
+        mvOsSPrintf(&hexStr[i*2], "%02x", bin[i]);
+    }
+    hexStr[i*2] = '\0';
+}
+
+void    mvBinToAscii(const MV_U8* bin, char* asciiStr, int size)
+{
+	int i;
+ 
+    for(i=0; i<size; i++)
+    {
+        mvOsSPrintf(&asciiStr[i*2], "%c", bin[i]);
+    }
+    asciiStr[i*2] = '\0';
+}
+
+/*******************************************************************************
+* mvLog2 - 
+*
+* DESCRIPTION:
+*	Calculate the Log2 of a given number.
+*
+* INPUT:
+*       num - A number to calculate the Log2 for.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Log 2 of the input number, or 0xFFFFFFFF if input is 0.
+*
+*******************************************************************************/
+MV_U32 mvLog2(MV_U32	num)
+{
+	MV_U32 result = 0;
+	if(num == 0)
+		return 0xFFFFFFFF;
+	while(num != 1)
+	{
+		num = num >> 1;
+		result++;
+	}
+	return result;
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h
new file mode 100644
index 00000000..c8e9ce10
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h
@@ -0,0 +1,308 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+
+#ifndef __INCmvCommonh
+#define __INCmvCommonh
+
+#include "mvTypes.h"
+
+/* Swap tool */
+
+/* 16bit nibble swap. For example 0x1234 -> 0x2143                          */
+#define MV_NIBBLE_SWAP_16BIT(X)    (((X&0xf) << 4) |     \
+                                    ((X&0xf0) >> 4) |    \
+                                    ((X&0xf00) << 4) |   \
+                                    ((X&0xf000) >> 4))
+        
+/* 32bit nibble swap. For example 0x12345678 -> 0x21436587                  */
+#define MV_NIBBLE_SWAP_32BIT(X)    (((X&0xf) << 4) |       \
+                                    ((X&0xf0) >> 4) |      \
+                                    ((X&0xf00) << 4) |     \
+                                    ((X&0xf000) >> 4) |    \
+                                    ((X&0xf0000) << 4) |   \
+                                    ((X&0xf00000) >> 4) |  \
+                                    ((X&0xf000000) << 4) | \
+                                    ((X&0xf0000000) >> 4))
+
+/* 16bit byte swap. For example 0x1122 -> 0x2211                            */
+#define MV_BYTE_SWAP_16BIT(X) ((((X)&0xff)<<8) | (((X)&0xff00)>>8))
+
+/* 32bit byte swap. For example 0x11223344 -> 0x44332211                    */
+#define MV_BYTE_SWAP_32BIT(X) ((((X)&0xff)<<24) |                       \
+                               (((X)&0xff00)<<8) |                      \
+                               (((X)&0xff0000)>>8) |                    \
+                               (((X)&0xff000000)>>24))
+
+/* 64bit byte swap. For example 0x11223344.55667788 -> 0x88776655.44332211  */
+#define MV_BYTE_SWAP_64BIT(X) ((l64) ((((X)&0xffULL)<<56) |             \
+                                      (((X)&0xff00ULL)<<40) |           \
+                                      (((X)&0xff0000ULL)<<24) |         \
+                                      (((X)&0xff000000ULL)<<8) |        \
+                                      (((X)&0xff00000000ULL)>>8) |      \
+                                      (((X)&0xff0000000000ULL)>>24) |   \
+                                      (((X)&0xff000000000000ULL)>>40) | \
+                                      (((X)&0xff00000000000000ULL)>>56)))
+
+/* Endianess macros.                                                        */
+#if defined(MV_CPU_LE)
+    #define MV_16BIT_LE(X)  (X) 
+    #define MV_32BIT_LE(X)  (X)
+    #define MV_64BIT_LE(X)  (X)
+    #define MV_16BIT_BE(X)  MV_BYTE_SWAP_16BIT(X)
+    #define MV_32BIT_BE(X)  MV_BYTE_SWAP_32BIT(X)
+    #define MV_64BIT_BE(X)  MV_BYTE_SWAP_64BIT(X)
+#elif defined(MV_CPU_BE)
+    #define MV_16BIT_LE(X)  MV_BYTE_SWAP_16BIT(X) 
+    #define MV_32BIT_LE(X)  MV_BYTE_SWAP_32BIT(X)
+    #define MV_64BIT_LE(X)  MV_BYTE_SWAP_64BIT(X)
+    #define MV_16BIT_BE(X)  (X)
+    #define MV_32BIT_BE(X)  (X)
+    #define MV_64BIT_BE(X)  (X)
+#else
+    #error "CPU endianess isn't defined!\n"
+#endif 
+
+
+/* Bit field definitions */
+#define NO_BIT      0x00000000
+#define BIT0        0x00000001
+#define BIT1        0x00000002
+#define BIT2        0x00000004
+#define BIT3        0x00000008
+#define BIT4        0x00000010
+#define BIT5        0x00000020
+#define BIT6        0x00000040
+#define BIT7        0x00000080
+#define BIT8        0x00000100
+#define BIT9        0x00000200
+#define BIT10       0x00000400
+#define BIT11       0x00000800
+#define BIT12       0x00001000
+#define BIT13       0x00002000
+#define BIT14       0x00004000
+#define BIT15       0x00008000
+#define BIT16       0x00010000
+#define BIT17       0x00020000
+#define BIT18       0x00040000
+#define BIT19       0x00080000
+#define BIT20       0x00100000
+#define BIT21       0x00200000
+#define BIT22       0x00400000
+#define BIT23       0x00800000
+#define BIT24       0x01000000
+#define BIT25       0x02000000
+#define BIT26       0x04000000
+#define BIT27       0x08000000
+#define BIT28       0x10000000
+#define BIT29       0x20000000
+#define BIT30       0x40000000
+#define BIT31       0x80000000
+
+/* Handy sizes */
+#define _1K         0x00000400
+#define _2K         0x00000800
+#define _4K         0x00001000
+#define _8K         0x00002000
+#define _16K        0x00004000
+#define _32K        0x00008000
+#define _64K        0x00010000
+#define _128K       0x00020000
+#define _256K       0x00040000
+#define _512K       0x00080000
+
+#define _1M         0x00100000
+#define _2M         0x00200000
+#define _4M         0x00400000
+#define _8M         0x00800000
+#define _16M        0x01000000
+#define _32M        0x02000000
+#define _64M        0x04000000
+#define _128M       0x08000000
+#define _256M       0x10000000
+#define _512M       0x20000000
+
+#define _1G         0x40000000
+#define _2G         0x80000000
+
+/* Tclock and Sys clock define */
+#define _100MHz     100000000
+#define _125MHz     125000000
+#define _133MHz     133333334
+#define _150MHz     150000000
+#define _160MHz     160000000
+#define _166MHz     166666667
+#define _175MHz     175000000
+#define _178MHz     178000000
+#define _183MHz     183333334
+#define _187MHz     187000000
+#define _192MHz     192000000
+#define _194MHz     194000000
+#define _200MHz     200000000
+#define _233MHz     233333334
+#define _250MHz     250000000
+#define _266MHz     266666667
+#define _300MHz     300000000
+
+/* For better address window table readability */
+#define EN			MV_TRUE
+#define DIS			MV_FALSE
+#define N_A			-1			/* Not applicable */
+
+/* Cache configuration options for memory (DRAM, SRAM, ... ) */
+
+/* Memory uncached, HW or SW cache coherency is not needed */
+#define MV_UNCACHED             0   
+/* Memory cached, HW cache coherency supported in WriteThrough mode */
+#define MV_CACHE_COHER_HW_WT    1
+/* Memory cached, HW cache coherency supported in WriteBack mode */
+#define MV_CACHE_COHER_HW_WB    2
+/* Memory cached, No HW cache coherency, Cache coherency must be in SW */
+#define MV_CACHE_COHER_SW       3
+
+               
+/* Macro for testing aligment. Positive if number is NOT aligned   */
+#define MV_IS_NOT_ALIGN(number, align)      ((number) & ((align) - 1))
+
+/* Macro for alignment up. For example, MV_ALIGN_UP(0x0330, 0x20) = 0x0340   */
+#define MV_ALIGN_UP(number, align)                                          \
+(((number) & ((align) - 1)) ? (((number) + (align)) & ~((align)-1)) : (number))
+
+/* Macro for alignment down. For example, MV_ALIGN_UP(0x0330, 0x20) = 0x0320 */
+#define MV_ALIGN_DOWN(number, align) ((number) & ~((align)-1))
+
+/* This macro returns absolute value                                        */
+#define MV_ABS(number)  (((int)(number) < 0) ? -(int)(number) : (int)(number))
+
+
+/* Bit fields manipulation macros                                           */
+
+/* An integer word which its 'x' bit is set                                 */
+#define MV_BIT_MASK(bitNum)         (1 << (bitNum) )     
+
+/* Checks wheter bit 'x' in integer word is set                             */
+#define MV_BIT_CHECK(word, bitNum)  ( (word) & MV_BIT_MASK(bitNum) )
+
+/* Clear (reset) bit 'x' in integer word (RMW - Read-Modify-Write)          */
+#define MV_BIT_CLEAR(word, bitNum)  ( (word) &= ~(MV_BIT_MASK(bitNum)) )
+
+/* Set bit 'x' in integer word (RMW)                                        */
+#define MV_BIT_SET(word, bitNum)    ( (word) |= MV_BIT_MASK(bitNum) )
+
+/* Invert bit 'x' in integer word (RMW)                                     */
+#define MV_BIT_INV(word, bitNum)    ( (word) ^= MV_BIT_MASK(bitNum) )
+
+/* Get the min between 'a' or 'b'                                           */
+#define MV_MIN(a,b)    (((a) < (b)) ? (a) : (b)) 
+
+/* Get the max between 'a' or 'b'                                           */
+#define MV_MAX(a,b)    (((a) < (b)) ? (b) : (a)) 
+
+/* Temporary */
+#define mvOsDivide(num, div)        \
+({                                  \
+    int i=0, rem=(num);             \
+                                    \
+    while(rem >= (div))             \
+    {                               \
+        rem -= (div);               \
+        i++;                        \
+    }                               \
+    (i);                            \
+})
+
+/* Temporary */
+#define mvOsReminder(num, div)      \
+({                                  \
+    int rem = (num);                \
+                                    \
+    while(rem >= (div))             \
+        rem -= (div);               \
+    (rem);                          \
+})
+
+#define MV_IP_QUAD(ipAddr)    ((ipAddr >> 24) & 0xFF), ((ipAddr >> 16) & 0xFF), \
+                              ((ipAddr >> 8) & 0xFF), ((ipAddr >> 0) & 0xFF)
+
+#define MV_IS_POWER_OF_2(num) ((num != 0) && ((num & (num - 1)) == 0))
+
+#ifndef MV_ASMLANGUAGE
+/* mvCommon API list */
+
+MV_VOID     mvHexToBin(const char* pHexStr, MV_U8* pBin, int size);
+void        mvAsciiToHex(const char* asciiStr, char* hexStr);
+void        mvBinToHex(const MV_U8* bin, char* hexStr, int size);
+void        mvBinToAscii(const MV_U8* bin, char* asciiStr, int size);
+
+MV_STATUS mvMacStrToHex(const char* macStr, MV_U8* macHex);
+MV_STATUS mvMacHexToStr(MV_U8* macHex, char* macStr);
+void        mvSizePrint(MV_U32);
+
+MV_U32 mvLog2(MV_U32 num);
+
+#endif /* MV_ASMLANGUAGE */
+
+
+#endif	/* __INCmvCommonh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCompVer.txt
new file mode 100644
index 00000000..38a92644
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.4
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c
new file mode 100644
index 00000000..087f36d3
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c
@@ -0,0 +1,326 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+
+/* includes */
+#include "mvOs.h"
+#include "mv802_3.h"
+#include "mvCommon.h"
+#include "mvDebug.h"
+
+/* Global variables effect on behave MV_DEBUG_PRINT and MV_DEBUG_CODE macros
+ * mvDebug  - map of bits (one for each module) bit=1 means enable 
+ *          debug code and messages for this module
+ * mvModuleDebug - array of 32 bits varables one for each module
+ */
+MV_U32    mvDebug = 0;
+MV_U32    mvDebugModules[MV_MODULE_MAX];
+ 
+/* Init mvModuleDebug array to default values */
+void    mvDebugInit(void)
+{
+    int     bit;
+
+    mvDebug = 0;
+    for(bit=0; bit<MV_MODULE_MAX; bit++)
+    {
+        mvDebugModules[bit] = MV_DEBUG_FLAG_ERR | MV_DEBUG_FLAG_STATS;
+        mvDebug |= MV_BIT_MASK(bit);
+    }
+}
+ 
+void    mvDebugModuleEnable(MV_MODULE_ID module, MV_BOOL isEnable)
+{    
+    if (isEnable)
+    {
+       MV_BIT_SET(mvDebug, module);               
+    }
+    else
+       MV_BIT_CLEAR(mvDebug, module);                   
+}
+ 
+void    mvDebugModuleSetFlags(MV_MODULE_ID module, MV_U32 flags)
+{ 
+    mvDebugModules[module] |= flags;
+}
+
+void    mvDebugModuleClearFlags(MV_MODULE_ID module, MV_U32 flags)
+{ 
+    mvDebugModules[module] &= ~flags;
+}
+
+/* Dump memory in specific format: 
+ * address: X1X1X1X1 X2X2X2X2 ... X8X8X8X8 
+ */
+void mvDebugMemDump(void* addr, int size, int access)
+{
+    int     i, j;
+    MV_U32  memAddr = (MV_U32)addr;
+
+    if(access == 0)
+        access = 1;
+
+    if( (access != 4) && (access != 2) && (access != 1) )
+    {
+        mvOsPrintf("%d wrong access size. Access must be 1 or 2 or 4\n",
+                    access);
+        return;
+    }
+    memAddr = MV_ALIGN_DOWN( (unsigned int)addr, 4);
+    size = MV_ALIGN_UP(size, 4);
+    addr = (void*)MV_ALIGN_DOWN( (unsigned int)addr, access);
+    while(size > 0)
+    {
+        mvOsPrintf("%08x: ", memAddr);
+        i = 0;
+        /* 32 bytes in the line */
+        while(i < 32)
+        {
+            if(memAddr >= (MV_U32)addr)
+            {
+                switch(access)
+                {
+                    case 1:
+                        if( memAddr == CPU_PHY_MEM(memAddr) )
+                        {
+                            mvOsPrintf("%02x ", MV_MEMIO8_READ(memAddr));
+                        }
+                        else
+                        {
+                            mvOsPrintf("%02x ", *((MV_U8*)memAddr));
+                        }
+                        break;
+
+                    case 2:
+                        if( memAddr == CPU_PHY_MEM(memAddr) )
+                        {
+                            mvOsPrintf("%04x ", MV_MEMIO16_READ(memAddr));
+                        }
+                        else
+                        {
+                            mvOsPrintf("%04x ", *((MV_U16*)memAddr));
+                        }
+                        break;
+
+                    case 4:
+                        if( memAddr == CPU_PHY_MEM(memAddr) )
+                        {
+                            mvOsPrintf("%08x ", MV_MEMIO32_READ(memAddr));
+                        }
+                        else
+                        {
+                            mvOsPrintf("%08x ", *((MV_U32*)memAddr));
+                        }
+                        break;
+                }
+            }
+            else
+            {
+                for(j=0; j<(access*2+1); j++)
+                    mvOsPrintf(" ");
+            }
+            i += access;
+            memAddr += access;
+            size -= access;
+            if(size <= 0)
+                break;
+        }
+        mvOsPrintf("\n");
+    }
+}
+
+void mvDebugPrintBufInfo(BUF_INFO* pBufInfo, int size, int access)
+{
+	if(pBufInfo == NULL)
+	{
+		mvOsPrintf("\n!!! pBufInfo = NULL\n");
+		return;
+	}
+    mvOsPrintf("\n*** pBufInfo=0x%x, cmdSts=0x%08x, pBuf=0x%x, bufSize=%d\n",
+               (unsigned int)pBufInfo, 
+			   (unsigned int)pBufInfo->cmdSts, 
+			   (unsigned int)pBufInfo->pBuff, 
+			   (unsigned int)pBufInfo->bufSize);
+    mvOsPrintf("pData=0x%x, byteCnt=%d, pNext=0x%x, uInfo1=0x%x, uInfo2=0x%x\n",
+               (unsigned int)pBufInfo->pData, 
+			   (unsigned int)pBufInfo->byteCnt, 
+			   (unsigned int)pBufInfo->pNextBufInfo,
+               (unsigned int)pBufInfo->userInfo1, 
+			   (unsigned int)pBufInfo->userInfo2);
+    if(pBufInfo->pData != NULL)
+    {
+        if(size > pBufInfo->byteCnt)
+            size = pBufInfo->byteCnt;
+        mvDebugMemDump(pBufInfo->pData, size, access);
+    }
+}
+
+void mvDebugPrintPktInfo(MV_PKT_INFO* pPktInfo, int size, int access)
+{
+    int frag, len;
+
+	if(pPktInfo == NULL)
+	{
+		mvOsPrintf("\n!!! pPktInfo = NULL\n");
+		return;
+	}
+    mvOsPrintf("\npPkt=%p, stat=0x%08x, numFr=%d, size=%d, pFr=%p, osInfo=0x%lx\n",
+                pPktInfo, pPktInfo->status, pPktInfo->numFrags, pPktInfo->pktSize, 
+                pPktInfo->pFrags, pPktInfo->osInfo);
+    
+    for(frag=0; frag<pPktInfo->numFrags; frag++)
+    {
+        mvOsPrintf("#%2d. bufVirt=%p, bufSize=%d\n", 
+                    frag, pPktInfo->pFrags[frag].bufVirtPtr, 
+                    pPktInfo->pFrags[frag].bufSize);
+        if(size > 0)
+        {
+            len = MV_MIN((int)pPktInfo->pFrags[frag].bufSize, size);
+            mvDebugMemDump(pPktInfo->pFrags[frag].bufVirtPtr, len, access);
+            size -= len;
+        }
+    }
+    
+}
+
+void    mvDebugPrintIpAddr(MV_U32 ipAddr)
+{
+    mvOsPrintf("%d.%d.%d.%d", ((ipAddr >> 24) & 0xFF), ((ipAddr >> 16) & 0xFF),
+                              ((ipAddr >> 8) & 0xFF), ((ipAddr >> 0) & 0xFF));
+}
+
+void    mvDebugPrintMacAddr(const MV_U8* pMacAddr)
+{
+    int     i;
+
+    mvOsPrintf("%02x", (unsigned int)pMacAddr[0]);
+    for(i=1; i<MV_MAC_ADDR_SIZE; i++)
+    {
+        mvOsPrintf(":%02x", pMacAddr[i]);
+    }
+    /* mvOsPrintf("\n");*/
+}
+
+
+/******* There are three functions deals with MV_DEBUG_TIMES structure ********/
+
+/* Reset MV_DEBUG_TIMES entry */
+void mvDebugResetTimeEntry(MV_DEBUG_TIMES* pTimeEntry, int count, char* pName)
+{
+    pTimeEntry->begin = 0;
+    pTimeEntry->count = count;
+    pTimeEntry->end = 0;
+    pTimeEntry->left = pTimeEntry->count;
+    pTimeEntry->total = 0;
+    pTimeEntry->min = 0xFFFFFFFF;
+    pTimeEntry->max = 0x0;
+    strncpy(pTimeEntry->name, pName, sizeof(pTimeEntry->name)-1);
+    pTimeEntry->name[sizeof(pTimeEntry->name)-1] = '\0';
+}
+
+/* Print out MV_DEBUG_TIMES entry */
+void mvDebugPrintTimeEntry(MV_DEBUG_TIMES* pTimeEntry, MV_BOOL isTitle)
+{
+    int     num;
+
+    if(isTitle == MV_TRUE)
+        mvOsPrintf("Event         NumOfEvents       TotalTime         Average       Min       Max\n");
+
+    num = pTimeEntry->count-pTimeEntry->left;
+    if(num > 0)
+    {
+        mvOsPrintf("%-11s     %6u          0x%08lx        %6lu     %6lu    %6lu\n",
+                pTimeEntry->name, num, pTimeEntry->total, pTimeEntry->total/num,
+                pTimeEntry->min, pTimeEntry->max);
+    }   
+}
+
+/* Update MV_DEBUG_TIMES entry */
+void mvDebugUpdateTimeEntry(MV_DEBUG_TIMES* pTimeEntry)
+{
+    MV_U32  delta;
+
+    if(pTimeEntry->left > 0)                                        
+    {                                                                           
+        if(pTimeEntry->end <= pTimeEntry->begin)       
+        {                                                                       
+            delta = pTimeEntry->begin - pTimeEntry->end;
+        }
+        else
+        {
+            delta = ((MV_U32)0x10000 - pTimeEntry->end) + pTimeEntry->begin;
+        }
+        pTimeEntry->total += delta;             
+
+        if(delta < pTimeEntry->min)    
+            pTimeEntry->min = delta;    
+
+        if(delta > pTimeEntry->max)    
+            pTimeEntry->max = delta;      
+
+        pTimeEntry->left--;                                                                                                                 
+    }
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h
new file mode 100644
index 00000000..e4975bed
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h
@@ -0,0 +1,178 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+
+#ifndef __INCmvDebugh
+#define __INCmvDebugh
+
+/* includes */
+#include "mvTypes.h"
+
+typedef enum 
+{
+    MV_MODULE_INVALID  = -1,
+    MV_MODULE_ETH      = 0,
+    MV_MODULE_IDMA,
+    MV_MODULE_XOR, 
+    MV_MODULE_TWASI,
+    MV_MODULE_MGI,
+    MV_MODULE_USB,
+    MV_MODULE_CESA,
+
+    MV_MODULE_MAX
+}MV_MODULE_ID;
+ 
+/* Define generic flags useful for most of modules */
+#define MV_DEBUG_FLAG_ALL   (0)
+#define MV_DEBUG_FLAG_INIT  (1 << 0)
+#define MV_DEBUG_FLAG_RX    (1 << 1)
+#define MV_DEBUG_FLAG_TX    (1 << 2)
+#define MV_DEBUG_FLAG_ERR   (1 << 3)
+#define MV_DEBUG_FLAG_TRACE (1 << 4)
+#define MV_DEBUG_FLAG_DUMP  (1 << 5)
+#define MV_DEBUG_FLAG_CACHE (1 << 6)
+#define MV_DEBUG_FLAG_IOCTL (1 << 7)
+#define MV_DEBUG_FLAG_STATS (1 << 8)
+
+extern MV_U32  mvDebug; 
+extern MV_U32  mvDebugModules[MV_MODULE_MAX];
+
+#ifdef MV_DEBUG
+# define MV_DEBUG_PRINT(module, flags, msg)     mvOsPrintf msg
+# define MV_DEBUG_CODE(module, flags, code)     code 
+#elif defined(MV_RT_DEBUG)
+# define MV_DEBUG_PRINT(module, flags, msg)                    \
+    if( (mvDebug & (1<<(module))) &&                           \
+        ((mvDebugModules[(module)] & (flags)) == (flags)) )    \
+        mvOsPrintf msg
+# define MV_DEBUG_CODE(module, flags, code)                    \
+    if( (mvDebug & (1<<(module))) &&                           \
+        ((mvDebugModules[(module)] & (flags)) == (flags)) )    \
+        code
+#else
+# define MV_DEBUG_PRINT(module, flags, msg)
+# define MV_DEBUG_CODE(module, flags, code)
+#endif
+
+
+
+/* typedefs */
+
+/*  time measurement structure used to check how much time pass between
+ *  two points
+ */
+typedef struct {
+    char            name[20];   /* name of the entry */
+    unsigned long   begin;      /* time measured on begin point */
+    unsigned long   end;        /* time measured on end point */
+    unsigned long   total;      /* Accumulated time */
+    unsigned long   left;       /* The rest measurement actions */
+    unsigned long   count;      /* Maximum measurement actions */
+    unsigned long   min;        /* Minimum time from begin to end */
+    unsigned long   max;        /* Maximum time from begin to end */
+} MV_DEBUG_TIMES;
+
+
+/* mvDebug.h API list */
+
+/****** Error Recording ******/
+
+/* Dump memory in specific format: 
+ * address: X1X1X1X1 X2X2X2X2 ... X8X8X8X8 
+ */
+void mvDebugMemDump(void* addr, int size, int access);
+
+void mvDebugPrintBufInfo(BUF_INFO* pBufInfo, int size, int access);
+
+void mvDebugPrintPktInfo(MV_PKT_INFO* pPktInfo, int size, int access);
+
+void    mvDebugPrintIpAddr(MV_U32 ipAddr);
+
+void mvDebugPrintMacAddr(const MV_U8* pMacAddr);
+
+/**** There are three functions deals with MV_DEBUG_TIMES structure ****/
+
+/* Reset MV_DEBUG_TIMES entry */
+void mvDebugResetTimeEntry(MV_DEBUG_TIMES* pTimeEntry, int count, char* name);
+
+/* Update MV_DEBUG_TIMES entry */
+void mvDebugUpdateTimeEntry(MV_DEBUG_TIMES* pTimeEntry);
+
+/* Print out MV_DEBUG_TIMES entry */
+void mvDebugPrintTimeEntry(MV_DEBUG_TIMES* pTimeEntry, MV_BOOL isTitle);
+
+
+/******** General ***********/
+
+/* Change value of mvDebugPrint global variable */
+
+void    mvDebugInit(void);
+void    mvDebugModuleEnable(MV_MODULE_ID module, MV_BOOL isEnable);
+void    mvDebugModuleSetFlags(MV_MODULE_ID module, MV_U32 flags);
+void    mvDebugModuleClearFlags(MV_MODULE_ID module, MV_U32 flags);
+
+
+#endif /* __INCmvDebug.h */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h
new file mode 100644
index 00000000..47820940
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h
@@ -0,0 +1,225 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvDeviceIdh
+#define __INCmvDeviceIdh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* defines  */
+#define MARVELL_VEN_ID		    0x11ab
+
+/* Disco-3 */
+#define MV64460_DEV_ID          	0x6480
+#define MV64460B_DEV_ID         	0x6485
+#define MV64430_DEV_ID          	0x6420
+
+/* Disco-5 */
+#define MV64560_DEV_ID          	0x6450
+
+/* Disco-6 */
+#define MV64660_DEV_ID          	0x6460
+
+/* Orion */        
+#define MV_1181_DEV_ID          	0x1181
+#define MV_5181_DEV_ID          	0x5181
+#define MV_5281_DEV_ID          	0x5281
+#define MV_5182_DEV_ID          	0x5182
+#define MV_8660_DEV_ID          	0x8660
+#define MV_5180_DEV_ID          	0x5180
+#define MV_5082_DEV_ID          	0x5082
+#define MV_1281_DEV_ID          	0x1281
+#define MV_6082_DEV_ID          	0x6082
+#define MV_6183_DEV_ID          	0x6183
+#define MV_6183L_DEV_ID          	0x6083
+
+#define MV_5281_D0_REV          	0x4
+#define MV_5281_D0_ID           	((MV_5281_DEV_ID << 16) | MV_5281_D0_REV)
+#define MV_5281_D0_NAME         "88F5281 D0"
+
+#define MV_5281_D1_REV          	0x5
+#define MV_5281_D1_ID           	((MV_5281_DEV_ID << 16) | MV_5281_D1_REV)
+#define MV_5281_D1_NAME         "88F5281 D1"
+
+#define MV_5281_D2_REV          	0x6
+#define MV_5281_D2_ID           	((MV_5281_DEV_ID << 16) | MV_5281_D2_REV)
+#define MV_5281_D2_NAME         "88F5281 D2"
+
+
+#define MV_5181L_A0_REV         	0x8 /* need for PCIE Er */
+#define MV_5181_A1_REV          	0x1 /* for USB Er ..*/
+#define MV_5181_B0_REV          	0x2
+#define MV_5181_B1_REV          	0x3
+#define MV_5182_A1_REV          	0x1
+#define MV_5180N_B1_REV         	0x3
+#define MV_5181L_A0_ID          	((MV_5181_DEV_ID << 16) | MV_5181L_A0_REV)
+
+
+
+/* kw */
+#define MV_6281_DEV_ID          	0x6281
+#define MV_6192_DEV_ID          	0x6192
+#define MV_6190_DEV_ID          	0x6190
+#define MV_6180_DEV_ID          	0x6180
+
+#define MV_6281_A0_REV         		0x2
+#define MV_6281_A0_ID          		((MV_6281_DEV_ID << 16) | MV_6281_A0_REV)
+#define MV_6281_A0_NAME         	"88F6281 A0"
+
+#define MV_6192_A0_REV         		0x2
+#define MV_6192_A0_ID          		((MV_6192_DEV_ID << 16) | MV_6192_A0_REV)
+#define MV_6192_A0_NAME         	"88F6192 A0"
+
+#define MV_6190_A0_REV         		0x2
+#define MV_6190_A0_ID          		((MV_6190_DEV_ID << 16) | MV_6190_A0_REV)
+#define MV_6190_A0_NAME         	"88F6190 A0"
+
+#define MV_6180_A0_REV         		0x2
+#define MV_6180_A0_ID          		((MV_6180_DEV_ID << 16) | MV_6180_A0_REV)
+#define MV_6180_A0_NAME         	"88F6180 A0"
+
+#define MV_6281_A1_REV              0x3
+#define MV_6281_A1_ID               ((MV_6281_DEV_ID << 16) | MV_6281_A1_REV)
+#define MV_6281_A1_NAME             "88F6281 A1"
+
+#define MV_6192_A1_REV              0x3
+#define MV_6192_A1_ID               ((MV_6192_DEV_ID << 16) | MV_6192_A1_REV)
+#define MV_6192_A1_NAME             "88F6192 A1"
+
+#define MV_6190_A1_REV              0x3
+#define MV_6190_A1_ID               ((MV_6190_DEV_ID << 16) | MV_6190_A1_REV)
+#define MV_6190_A1_NAME             "88F6190 A1"
+
+#define MV_6180_A1_REV              0x3
+#define MV_6180_A1_ID               ((MV_6180_DEV_ID << 16) | MV_6180_A1_REV)
+#define MV_6180_A1_NAME             "88F6180 A1" 
+
+#define MV_88F6XXX_A0_REV         	0x2
+#define MV_88F6XXX_A1_REV         	0x3
+/* Disco-Duo */
+#define MV_78XX0_ZY_DEV_ID       0x6381
+#define MV_78XX0_ZY_NAME         "MV78X00"
+
+#define MV_78XX0_Z0_REV         0x1
+#define MV_78XX0_Z0_ID          ((MV_78XX0_ZY_DEV_ID << 16) | MV_78XX0_Z0_REV)
+#define MV_78XX0_Z0_NAME        "78X00 Z0"
+
+#define MV_78XX0_Y0_REV         0x2
+#define MV_78XX0_Y0_ID          ((MV_78XX0_ZY_DEV_ID << 16) | MV_78XX0_Y0_REV)
+#define MV_78XX0_Y0_NAME        "78X00 Y0"
+
+#define MV_78XX0_DEV_ID       	0x7800
+#define MV_78XX0_NAME         	"MV78X00"
+
+#define MV_76100_DEV_ID      	0x7610
+#define MV_78200_DEV_ID      	0x7820
+#define MV_78100_DEV_ID      	0x7810
+#define MV_78XX0_A0_REV		0x1
+#define MV_78XX0_A1_REV		0x2
+
+#define MV_76100_NAME		"MV76100"
+#define MV_78100_NAME		"MV78100"
+#define MV_78200_NAME		"MV78200"
+
+#define MV_76100_A0_ID		((MV_76100_DEV_ID << 16) | MV_78XX0_A0_REV)
+#define MV_78100_A0_ID		((MV_78100_DEV_ID << 16) | MV_78XX0_A0_REV)
+#define MV_78200_A0_ID		((MV_78200_DEV_ID << 16) | MV_78XX0_A0_REV)
+
+#define MV_76100_A1_ID		((MV_76100_DEV_ID << 16) | MV_78XX0_A1_REV)
+#define MV_78100_A1_ID		((MV_78100_DEV_ID << 16) | MV_78XX0_A1_REV)
+#define MV_78200_A1_ID		((MV_78200_DEV_ID << 16) | MV_78XX0_A1_REV)
+
+#define MV_76100_A0_NAME	"MV76100 A0"
+#define MV_78100_A0_NAME	"MV78100 A0"
+#define MV_78200_A0_NAME	"MV78200 A0"
+#define MV_78XX0_A0_NAME	"MV78XX0 A0"
+
+#define MV_76100_A1_NAME	"MV76100 A1"
+#define MV_78100_A1_NAME	"MV78100 A1"
+#define MV_78200_A1_NAME	"MV78200 A1"
+#define MV_78XX0_A1_NAME	"MV78XX0 A1"
+
+/*MV88F632X family*/
+#define MV_6321_DEV_ID      	0x6321
+#define MV_6322_DEV_ID      	0x6322
+#define MV_6323_DEV_ID      	0x6323
+
+#define MV_6321_NAME		"88F6321"
+#define MV_6322_NAME		"88F6322"
+#define MV_6323_NAME		"88F6323"
+
+#define MV_632X_A1_REV		0x2
+
+#define MV_6321_A1_ID		((MV_6321_DEV_ID << 16) | MV_632X_A1_REV)
+#define MV_6322_A1_ID		((MV_6322_DEV_ID << 16) | MV_632X_A1_REV)
+#define MV_6323_A1_ID		((MV_6323_DEV_ID << 16) | MV_632X_A1_REV)
+
+#define MV_6321_A1_NAME		"88F6321 A1"
+#define MV_6322_A1_NAME		"88F6322 A1"
+#define MV_6323_A1_NAME		"88F6323 A1"
+
+
+#endif /* __INCmvDeviceIdh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h
new file mode 100644
index 00000000..3bfcfe19
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h
@@ -0,0 +1,73 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvHalVerh
+#define __INCmvHalVerh
+
+/* Defines */
+#define MV_HAL_VERSION			"FEROCEON_HAL_3_1_7"
+#define MV_RELEASE_BASELINE		"SoCandControllers_FEROCEON_RELEASE_7_9_2009_KW_4_3_4_DD_2_1_4_6183_1_1_4"
+
+#endif /* __INCmvHalVerh */
\ No newline at end of file
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c
new file mode 100644
index 00000000..41ca7ceb
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c
@@ -0,0 +1,100 @@
+/******************************************************************************* 
+*                   Copyright 2003, Marvell Semiconductor Israel LTD.          * 
+* THIS CODE CONTAINS CONFIDENTIAL INFORMATION OF MARVELL.                      * 
+* NO RIGHTS ARE GRANTED HEREIN UNDER ANY PATENT, MASK WORK RIGHT OR COPYRIGHT  * 
+* OF MARVELL OR ANY THIRD PARTY. MARVELL RESERVES THE RIGHT AT ITS SOLE        * 
+* DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL.     * 
+* THIS CODE IS PROVIDED "AS IS". MARVELL MAKES NO WARRANTIES, EXPRESSED,       * 
+* IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, COMPLETENESS OR PERFORMANCE.   * 
+*                                                                              * 
+* MARVELL COMPRISES MARVELL TECHNOLOGY GROUP LTD. (MTGL) AND ITS SUBSIDIARIES, * 
+* MARVELL INTERNATIONAL LTD. (MIL), MARVELL TECHNOLOGY, INC. (MTI), MARVELL    * 
+* SEMICONDUCTOR, INC. (MSI), MARVELL ASIA PTE LTD. (MAPL), MARVELL JAPAN K.K.  * 
+* (MJKK), MARVELL SEMICONDUCTOR ISRAEL LTD (MSIL).                             * 
+********************************************************************************
+* mvQueue.c
+*
+* FILENAME:    $Workfile: mvStack.c $                     
+* REVISION:    $Revision: 1.1 $                              
+* LAST UPDATE: $Modtime:  $                  
+*                                                          
+* DESCRIPTION:                                             
+*     This file implements simple Stack LIFO functionality.
+*******************************************************************************/
+
+/* includes */
+#include "mvOs.h"
+#include "mvTypes.h"
+#include "mvDebug.h"
+#include "mvStack.h"
+
+/* defines  */
+
+
+/* Public functions */
+
+
+/* Purpose: Create new stack
+ * Inputs:
+ *	- MV_U32	noOfElements	- maximum number of elements in the stack.
+ *                              Each element 4 bytes size
+ * Return: void* - pointer to created stack.
+ */
+void*   mvStackCreate(int numOfElements)
+{
+	MV_STACK*   pStack;
+    MV_U32*     pStackElements;
+
+    pStack = (MV_STACK*)mvOsMalloc(sizeof(MV_STACK));
+    pStackElements = (MV_U32*)mvOsMalloc(numOfElements*sizeof(MV_U32));
+    if( (pStack == NULL) || (pStackElements == NULL) )
+    {
+	    mvOsPrintf("mvStack: Can't create new stack\n");
+        return NULL;
+    }
+    memset(pStackElements, 0, numOfElements*sizeof(MV_U32));
+    pStack->numOfElements = numOfElements;
+    pStack->stackIdx = 0;
+    pStack->stackElements = pStackElements;
+
+	return pStack;
+}
+
+/* Purpose: Delete existing stack
+ * Inputs:
+ *	- void* 	stackHndl 	- Stack handle as returned by "mvStackCreate()" function
+ *
+ * Return: MV_STATUS  	MV_NOT_FOUND - Failure. StackHandle is not valid.
+ *						MV_OK        - Success.
+ */
+MV_STATUS   mvStackDelete(void* stackHndl)
+{
+	MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+	if( (pStack == NULL) || (pStack->stackElements == NULL) )
+		return MV_NOT_FOUND;
+
+    mvOsFree(pStack->stackElements);
+    mvOsFree(pStack);
+
+    return MV_OK;
+}
+
+
+/* PrintOut status of the stack */
+void    mvStackStatus(void* stackHndl, MV_BOOL isPrintElements)
+{
+	int			i;
+    MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+    mvOsPrintf("StackHandle=%p, pElements=%p, numElements=%d, stackIdx=%d\n",
+                stackHndl, pStack->stackElements, pStack->numOfElements, 
+                pStack->stackIdx);
+    if(isPrintElements == MV_TRUE)
+    {
+        for(i=0; i<pStack->stackIdx; i++)
+        {
+            mvOsPrintf("%3d. Value=0x%x\n", i, pStack->stackElements[i]);
+        }
+    }
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h
new file mode 100644
index 00000000..e247e61c
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h
@@ -0,0 +1,140 @@
+/******************************************************************************* 
+*                   Copyright 2003, Marvell Semiconductor Israel LTD.          * 
+* THIS CODE CONTAINS CONFIDENTIAL INFORMATION OF MARVELL.                      * 
+* NO RIGHTS ARE GRANTED HEREIN UNDER ANY PATENT, MASK WORK RIGHT OR COPYRIGHT  * 
+* OF MARVELL OR ANY THIRD PARTY. MARVELL RESERVES THE RIGHT AT ITS SOLE        * 
+* DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL.     * 
+* THIS CODE IS PROVIDED "AS IS". MARVELL MAKES NO WARRANTIES, EXPRESSED,       * 
+* IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, COMPLETENESS OR PERFORMANCE.   * 
+*                                                                              * 
+* MARVELL COMPRISES MARVELL TECHNOLOGY GROUP LTD. (MTGL) AND ITS SUBSIDIARIES, * 
+* MARVELL INTERNATIONAL LTD. (MIL), MARVELL TECHNOLOGY, INC. (MTI), MARVELL    * 
+* SEMICONDUCTOR, INC. (MSI), MARVELL ASIA PTE LTD. (MAPL), MARVELL JAPAN K.K.  * 
+* (MJKK), MARVELL SEMICONDUCTOR ISRAEL LTD (MSIL).                             * 
+********************************************************************************
+* mvStack.h - Header File for :
+*
+* FILENAME:    $Workfile: mvStack.h $
+* REVISION:    $Revision: 1.1 $
+* LAST UPDATE: $Modtime:  $
+*
+* DESCRIPTION:
+*     This file defines simple Stack (LIFO) functionality.
+*
+*******************************************************************************/
+
+#ifndef __mvStack_h__
+#define __mvStack_h__
+
+
+/* includes */
+#include "mvTypes.h"
+
+
+/* defines  */
+
+
+/* typedefs */
+/* Data structure describes general purpose Stack */
+typedef struct 
+{
+    int     stackIdx;
+    int     numOfElements;
+    MV_U32* stackElements;
+} MV_STACK;
+
+static INLINE MV_BOOL mvStackIsFull(void* stackHndl)
+{	
+    MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+    if(pStack->stackIdx == pStack->numOfElements)
+        return MV_TRUE;
+
+    return MV_FALSE;
+}
+
+static INLINE MV_BOOL mvStackIsEmpty(void* stackHndl)
+{	
+    MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+    if(pStack->stackIdx == 0)
+        return MV_TRUE;
+
+    return MV_FALSE;
+}
+/* Purpose: Push new element to stack
+ * Inputs:
+ *	- void* 	stackHndl 	- Stack handle as returned by "mvStackCreate()" function.
+ *	- MV_U32	value		- New element.
+ *
+ * Return: MV_STATUS  	MV_FULL - Failure. Stack is full.
+ *						MV_OK   - Success. Element is put to stack.
+ */
+static INLINE void mvStackPush(void* stackHndl, MV_U32 value)
+{	
+    MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+#ifdef MV_RT_DEBUG
+    if(pStack->stackIdx == pStack->numOfElements)
+    {
+        mvOsPrintf("mvStackPush: Stack is FULL\n");
+        return;
+    }
+#endif /* MV_RT_DEBUG */
+
+    pStack->stackElements[pStack->stackIdx] = value;
+    pStack->stackIdx++;
+}
+
+/* Purpose: Pop element from the top of stack and copy it to "pValue"
+ * Inputs:
+ *	- void* 	stackHndl 	- Stack handle as returned by "mvStackCreate()" function.
+ *	- MV_U32	value		- Element in the top of stack.
+ *
+ * Return: MV_STATUS  	MV_EMPTY - Failure. Stack is empty.
+ *						MV_OK    - Success. Element is removed from the stack and
+ *									copied to pValue argument
+ */
+static INLINE MV_U32   mvStackPop(void* stackHndl)
+{
+    MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+#ifdef MV_RT_DEBUG
+    if(pStack->stackIdx == 0)
+    {
+        mvOsPrintf("mvStackPop: Stack is EMPTY\n");
+        return 0;
+    }
+#endif /* MV_RT_DEBUG */
+
+    pStack->stackIdx--;
+    return pStack->stackElements[pStack->stackIdx];
+}
+
+static INLINE int       mvStackIndex(void* stackHndl)
+{
+    MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+    return pStack->stackIdx;
+}
+
+static INLINE int       mvStackFreeElements(void* stackHndl)
+{
+    MV_STACK*   pStack = (MV_STACK*)stackHndl;
+
+    return (pStack->numOfElements - pStack->stackIdx);
+}
+
+/* mvStack.h API list */
+
+/* Create new Stack */
+void*       mvStackCreate(int numOfElements);
+
+/* Delete existing stack */
+MV_STATUS   mvStackDelete(void* stackHndl);
+
+/* Print status of the stack */
+void        mvStackStatus(void* stackHndl, MV_BOOL isPrintElements);
+
+#endif /* __mvStack_h__ */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h
new file mode 100644
index 00000000..de212a14
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h
@@ -0,0 +1,245 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvTypesh
+#define __INCmvTypesh
+
+/* Defines */
+
+/* The following is a list of Marvell status    */
+#define MV_ERROR		    (-1)
+#define MV_OK			    (0x00)  /* Operation succeeded                   */
+#define MV_FAIL			    (0x01)	/* Operation failed                      */
+#define MV_BAD_VALUE        (0x02)  /* Illegal value (general)               */
+#define MV_OUT_OF_RANGE     (0x03)  /* The value is out of range             */
+#define MV_BAD_PARAM        (0x04)  /* Illegal parameter in function called  */
+#define MV_BAD_PTR          (0x05)  /* Illegal pointer value                 */
+#define MV_BAD_SIZE         (0x06)  /* Illegal size                          */
+#define MV_BAD_STATE        (0x07)  /* Illegal state of state machine        */
+#define MV_SET_ERROR        (0x08)  /* Set operation failed                  */
+#define MV_GET_ERROR        (0x09)  /* Get operation failed                  */
+#define MV_CREATE_ERROR     (0x0A)  /* Fail while creating an item           */
+#define MV_NOT_FOUND        (0x0B)  /* Item not found                        */
+#define MV_NO_MORE          (0x0C)  /* No more items found                   */
+#define MV_NO_SUCH          (0x0D)  /* No such item                          */
+#define MV_TIMEOUT          (0x0E)  /* Time Out                              */
+#define MV_NO_CHANGE        (0x0F)  /* Parameter(s) is already in this value */
+#define MV_NOT_SUPPORTED    (0x10)  /* This request is not support           */
+#define MV_NOT_IMPLEMENTED  (0x11)  /* Request supported but not implemented */
+#define MV_NOT_INITIALIZED  (0x12)  /* The item is not initialized           */
+#define MV_NO_RESOURCE      (0x13)  /* Resource not available (memory ...)   */
+#define MV_FULL             (0x14)  /* Item is full (Queue or table etc...)  */
+#define MV_EMPTY            (0x15)  /* Item is empty (Queue or table etc...) */
+#define MV_INIT_ERROR       (0x16)  /* Error occured while INIT process      */
+#define MV_HW_ERROR         (0x17)  /* Hardware error                        */
+#define MV_TX_ERROR         (0x18)  /* Transmit operation not succeeded      */
+#define MV_RX_ERROR         (0x19)  /* Recieve operation not succeeded       */
+#define MV_NOT_READY	    (0x1A)	/* The other side is not ready yet       */
+#define MV_ALREADY_EXIST    (0x1B)  /* Tried to create existing item         */
+#define MV_OUT_OF_CPU_MEM   (0x1C)  /* Cpu memory allocation failed.         */
+#define MV_NOT_STARTED      (0x1D)  /* Not started yet         */
+#define MV_BUSY             (0x1E)  /* Item is busy.                         */
+#define MV_TERMINATE        (0x1F)  /* Item terminates it's work.            */
+#define MV_NOT_ALIGNED      (0x20)  /* Wrong alignment                       */
+#define MV_NOT_ALLOWED      (0x21)  /* Operation NOT allowed                 */
+#define MV_WRITE_PROTECT    (0x22)  /* Write protected                       */
+
+
+#define MV_INVALID  (int)(-1)
+
+#define MV_FALSE	0
+#define MV_TRUE     (!(MV_FALSE))
+
+
+#ifndef NULL
+#define NULL ((void*)0)
+#endif
+
+
+#ifndef MV_ASMLANGUAGE
+/* typedefs */
+
+typedef char  MV_8;
+typedef unsigned char	MV_U8;
+
+typedef int		MV_32;
+typedef unsigned int	MV_U32;
+
+typedef short		MV_16;
+typedef unsigned short	MV_U16;
+
+#ifdef MV_PPC64
+typedef long		MV_64;
+typedef unsigned long	MV_U64;
+#else
+typedef long long		MV_64;
+typedef unsigned long long	MV_U64;
+#endif
+
+typedef long		MV_LONG;	/* 32/64 */
+typedef unsigned long	MV_ULONG;	/* 32/64 */
+
+typedef int     MV_STATUS;
+typedef int     MV_BOOL;
+typedef void    MV_VOID;
+typedef float   MV_FLOAT;
+
+typedef int 	(*MV_FUNCPTR) (void);	  /* ptr to function returning int   */
+typedef void 	(*MV_VOIDFUNCPTR) (void); /* ptr to function returning void  */
+typedef double 	(*MV_DBLFUNCPTR) (void);  /* ptr to function returning double*/
+typedef float 	(*MV_FLTFUNCPTR) (void);  /* ptr to function returning float */
+
+typedef MV_U32 MV_KHZ;
+typedef MV_U32 MV_MHZ;
+typedef MV_U32 MV_HZ;
+
+
+/* This enumerator describes the set of commands that can be applied on   	*/
+/* an engine (e.g. IDMA, XOR). Appling a comman depends on the current   	*/
+/* status (see MV_STATE enumerator)                      					*/
+/* Start can be applied only when status is IDLE                         */
+/* Stop can be applied only when status is IDLE, ACTIVE or PAUSED        */
+/* Pause can be applied only when status is ACTIVE                          */
+/* Restart can be applied only when status is PAUSED                        */
+typedef enum _mvCommand
+{
+    MV_START,              /* Start	*/
+    MV_STOP,               /* Stop     */
+    MV_PAUSE,              /* Pause    */
+    MV_RESTART             /* Restart  */
+} MV_COMMAND;
+
+/* This enumerator describes the set of state conditions.					*/
+/* Moving from one state to other is stricted.   							*/
+typedef enum _mvState
+{
+    MV_IDLE,
+    MV_ACTIVE,
+    MV_PAUSED,
+    MV_UNDEFINED_STATE
+} MV_STATE;
+
+
+/* This structure describes address space window. Window base can be        */
+/* 64 bit, window size up to 4GB                                            */
+typedef struct _mvAddrWin
+{
+    MV_U32      baseLow;    /* 32bit base low       */
+    MV_U32      baseHigh;   /* 32bit base high      */
+    MV_U32      size;       /* 32bit size           */
+}MV_ADDR_WIN;
+
+/* This binary enumerator describes protection attribute status             */
+typedef enum _mvProtRight
+{
+    ALLOWED,        /* Protection attribute allowed                         */
+    FORBIDDEN       /* Protection attribute forbidden                       */
+}MV_PROT_RIGHT;
+
+/* Unified struct for Rx and Tx packet operations. The user is required to 	*/
+/* be familier only with Tx/Rx descriptor command status.               	*/
+typedef struct _bufInfo
+{
+    MV_U32   cmdSts;        /* Tx/Rx command status                                     */
+        MV_U16   byteCnt;       /* Size of valid data in the buffer     */
+    MV_U16   bufSize;       /* Total size of the buffer             */
+    MV_U8    *pBuff;            /* Pointer to Buffer                    */
+    MV_U8    *pData;            /* Pointer to data in the Buffer        */
+    MV_U32   userInfo1;         /* Tx/Rx attached user information 1    */
+    MV_U32   userInfo2;         /* Tx/Rx attached user information 2    */
+    struct _bufInfo *pNextBufInfo;  /* Next buffer in packet            */
+} BUF_INFO;
+
+/* This structure contains information describing one of buffers
+ * (fragments) they are built Ethernet packet.
+ */
+typedef struct
+{
+     MV_U8*	    bufVirtPtr;
+     MV_ULONG	bufPhysAddr;
+     MV_U32   	bufSize;
+     MV_U32     dataSize;
+     MV_U32		memHandle;
+	 MV_32      bufAddrShift;
+} MV_BUF_INFO;
+
+/* This structure contains information describing Ethernet packet.
+ * The packet can be divided for few buffers (fragments)
+ */
+typedef struct
+{
+    MV_ULONG   	osInfo;
+    MV_BUF_INFO *pFrags;
+    MV_U32      status;
+    MV_U16      pktSize;
+    MV_U16      numFrags;
+    MV_U32      ownerId;
+    MV_U32      fragIP;
+} MV_PKT_INFO;
+
+#endif /* MV_ASMLANGUAGE */
+
+#endif /* __INCmvTypesh */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c
new file mode 100644
index 00000000..644fd02d
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c
@@ -0,0 +1,110 @@
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include "dbg-trace.h"
+
+#define TRACE_ARR_LEN   800
+#define STR_LEN         128
+struct trace {
+    struct timeval tv;
+        char str[STR_LEN];
+    unsigned int callback_val1;
+    unsigned int callback_val2;
+        char valid;
+};
+static unsigned int (*trc_callback1) (unsigned char) = NULL;
+static unsigned int (*trc_callback2) (unsigned char) = NULL;
+static unsigned char trc_param1 = 0;
+static unsigned char trc_param2 = 0;
+struct trace *trc_arr;
+static int trc_index;
+static int trc_active = 0;
+
+void TRC_START()
+{
+    trc_active = 1;
+}
+
+void TRC_STOP()
+{
+    trc_active = 0;
+}
+
+void TRC_INIT(void *callback1, void *callback2, unsigned char callback1_param, unsigned char callback2_param)
+{
+    printk("Marvell debug tracing is on\n");
+        trc_arr = (struct trace *)kmalloc(TRACE_ARR_LEN*sizeof(struct trace),GFP_KERNEL);
+    if(trc_arr == NULL)
+    {
+        printk("Can't allocate Debug Trace buffer\n");
+        return;
+    }
+        memset(trc_arr,0,TRACE_ARR_LEN*sizeof(struct trace));
+        trc_index = 0;
+    trc_callback1 = callback1;
+    trc_callback2 = callback2;
+    trc_param1 = callback1_param;
+    trc_param2 = callback2_param;
+}
+void TRC_REC(char *fmt,...)
+{
+    va_list args;
+        struct trace *trc = &trc_arr[trc_index];
+
+    if(trc_active == 0)
+        return;
+
+    do_gettimeofday(&trc->tv);
+    if(trc_callback1)
+        trc->callback_val1 = trc_callback1(trc_param1);
+    if(trc_callback2)
+        trc->callback_val2 = trc_callback2(trc_param2);
+    va_start(args, fmt);
+    vsprintf(trc->str,fmt,args);
+    va_end(args);
+        trc->valid = 1;
+        if((++trc_index) == TRACE_ARR_LEN) {
+                trc_index = 0;
+    }
+}
+void TRC_OUTPUT(void)
+{
+        int i,j;
+        struct trace *p;
+        printk("\n\nTrace %d items\n",TRACE_ARR_LEN);
+        for(i=0,j=trc_index; i<TRACE_ARR_LEN; i++,j++) {
+                if(j == TRACE_ARR_LEN)
+                        j = 0;
+                p = &trc_arr[j];
+                if(p->valid) {
+            unsigned long uoffs;
+            struct trace *plast;
+            if(p == &trc_arr[0])
+                plast = &trc_arr[TRACE_ARR_LEN-1];
+            else
+                plast = p-1;
+            if(p->tv.tv_sec == ((plast)->tv.tv_sec))
+                uoffs = (p->tv.tv_usec - ((plast)->tv.tv_usec));
+            else
+                uoffs = (1000000 - ((plast)->tv.tv_usec)) +
+                    ((p->tv.tv_sec - ((plast)->tv.tv_sec) - 1) * 1000000) + 
+                    p->tv.tv_usec;
+                        printk("%03d: [+%ld usec]", j, (unsigned long)uoffs);
+            if(trc_callback1)
+                printk("[%u]",p->callback_val1);
+            if(trc_callback2)
+                printk("[%u]",p->callback_val2);
+            printk(": %s",p->str);
+        }
+                p->valid = 0;
+        }
+        memset(trc_arr,0,TRACE_ARR_LEN*sizeof(struct trace));
+        trc_index = 0;
+}
+void TRC_RELEASE(void)
+{
+        kfree(trc_arr);
+        trc_index = 0;
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h
new file mode 100644
index 00000000..a5aac267
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h
@@ -0,0 +1,24 @@
+
+#ifndef _MV_DBG_TRCE_H_
+#define _MV_DBG_TRCE_H_
+
+#ifdef CONFIG_MV_DBG_TRACE
+void TRC_INIT(void *callback1, void *callback2, 
+    unsigned char callback1_param, unsigned char callback2_param);
+void TRC_REC(char *fmt,...);
+void TRC_OUTPUT(void);
+void TRC_RELEASE(void);
+void TRC_START(void);
+void TRC_STOP(void);
+
+#else
+#define TRC_INIT(x1,x2,x3,x4)
+#define TRC_REC(X...)
+#define TRC_OUTPUT()
+#define TRC_RELEASE()
+#define TRC_START()
+#define TRC_STOP()
+#endif
+
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c
new file mode 100644
index 00000000..5f627844
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c
@@ -0,0 +1,2513 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "boardEnv/mvBoardEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "cpu/mvCpu.h"
+#include "cntmr/mvCntmr.h"
+#include "gpp/mvGpp.h"
+#include "twsi/mvTwsi.h"
+#include "pex/mvPex.h"
+#include "device/mvDevice.h"
+#include "eth/gbe/mvEthRegs.h"
+
+/* defines  */
+/* #define MV_DEBUG */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif
+
+extern MV_CPU_ARM_CLK _cpuARMDDRCLK[];
+
+#define CODE_IN_ROM		MV_FALSE
+#define CODE_IN_RAM		MV_TRUE
+
+extern	MV_BOARD_INFO*	boardInfoTbl[];
+#define BOARD_INFO(boardId)	boardInfoTbl[boardId - BOARD_ID_BASE]
+
+/* Locals */
+static MV_DEV_CS_INFO*  boardGetDevEntry(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
+
+MV_U32 tClkRate   = -1;
+
+
+/*******************************************************************************
+* mvBoardEnvInit - Init board
+*
+* DESCRIPTION:
+*		In this function the board environment take care of device bank
+*		initialization.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvBoardEnvInit(MV_VOID)
+{
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardEnvInit:Board unknown.\n");
+		return;
+
+	}
+
+	/* Set GPP Out value */
+	MV_REG_WRITE(GPP_DATA_OUT_REG(0), BOARD_INFO(boardId)->gppOutValLow);
+	MV_REG_WRITE(GPP_DATA_OUT_REG(1), BOARD_INFO(boardId)->gppOutValHigh);
+
+	/* set GPP polarity */
+	mvGppPolaritySet(0, 0xFFFFFFFF, BOARD_INFO(boardId)->gppPolarityValLow);
+	mvGppPolaritySet(1, 0xFFFFFFFF, BOARD_INFO(boardId)->gppPolarityValHigh);
+
+    /* Workaround for Erratum FE-MISC-70*/
+    if(mvCtrlRevGet()==MV_88F6XXX_A0_REV)
+    {
+        BOARD_INFO(boardId)->gppOutEnValLow &= 0xfffffffd;
+        BOARD_INFO(boardId)->gppOutEnValLow |= (BOARD_INFO(boardId)->gppOutEnValHigh) & 0x00000002;
+    } /*End of WA*/
+
+	/* Set GPP Out Enable*/
+	mvGppTypeSet(0, 0xFFFFFFFF, BOARD_INFO(boardId)->gppOutEnValLow);
+	mvGppTypeSet(1, 0xFFFFFFFF, BOARD_INFO(boardId)->gppOutEnValHigh);
+
+	/* Nand CE */
+	MV_REG_BIT_SET(NAND_CTRL_REG, NAND_ACTCEBOOT_BIT);
+}
+
+/*******************************************************************************
+* mvBoardModelGet - Get Board model
+*
+* DESCRIPTION:
+*       This function returns 16bit describing board model.
+*       Board model is constructed of one byte major and minor numbers in the
+*       following manner:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       String describing board model.
+*
+*******************************************************************************/
+MV_U16 mvBoardModelGet(MV_VOID)
+{
+	return (mvBoardIdGet() >> 16);
+}
+
+/*******************************************************************************
+* mbBoardRevlGet - Get Board revision
+*
+* DESCRIPTION:
+*       This function returns a 32bit describing the board revision.
+*       Board revision is constructed of 4bytes. 2bytes describes major number
+*       and the other 2bytes describes minor munber.
+*       For example for board revision 3.4 the function will return
+*       0x00030004.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       String describing board model.
+*
+*******************************************************************************/
+MV_U16 mvBoardRevGet(MV_VOID)
+{
+	return (mvBoardIdGet() & 0xFFFF);
+}
+
+/*******************************************************************************
+* mvBoardNameGet - Get Board name
+*
+* DESCRIPTION:
+*       This function returns a string describing the board model and revision.
+*       String is extracted from board I2C EEPROM.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       pNameBuff - Buffer to contain board name string. Minimum size 32 chars.
+*
+* RETURN:
+*
+*       MV_ERROR if informantion can not be read.
+*******************************************************************************/
+MV_STATUS mvBoardNameGet(char *pNameBuff)
+{
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsSPrintf (pNameBuff, "Board unknown.\n");
+		return MV_ERROR;
+
+	}
+
+	mvOsSPrintf (pNameBuff, "%s",BOARD_INFO(boardId)->boardName);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvBoardIsPortInSgmii -
+*
+* DESCRIPTION:
+*       This routine returns MV_TRUE for port number works in SGMII or MV_FALSE
+*	For all other options.
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE - port in SGMII.
+*       MV_FALSE - other.
+*
+*******************************************************************************/
+MV_BOOL mvBoardIsPortInSgmii(MV_U32 ethPortNum)
+{
+    MV_BOOL ethPortSgmiiSupport[BOARD_ETH_PORT_NUM] = MV_ETH_PORT_SGMII;
+
+    if(ethPortNum >= BOARD_ETH_PORT_NUM)
+    {
+	    mvOsPrintf ("Invalid portNo=%d\n", ethPortNum);
+		return MV_FALSE;
+    }
+    return ethPortSgmiiSupport[ethPortNum];
+}
+
+/*******************************************************************************
+* mvBoardIsPortInGmii -
+*
+* DESCRIPTION:
+*       This routine returns MV_TRUE for port number works in GMII or MV_FALSE
+*	For all other options.
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE - port in GMII.
+*       MV_FALSE - other.
+*
+*******************************************************************************/
+MV_BOOL mvBoardIsPortInGmii(MV_VOID)
+{
+	MV_U32 devClassId, devClass = 0;
+	if (mvBoardMppGroupTypeGet(devClass) == MV_BOARD_AUTO)
+	{
+		/* Get MPP module ID */
+		devClassId = mvBoarModuleTypeGet(devClass);
+		if (MV_BOARD_MODULE_GMII_ID == devClassId)
+			return MV_TRUE;
+	}
+	else if (mvBoardMppGroupTypeGet(devClass) == MV_BOARD_GMII)
+		return MV_TRUE;
+
+    return MV_FALSE;
+}
+/*******************************************************************************
+* mvBoardPhyAddrGet - Get the phy address
+*
+* DESCRIPTION:
+*       This routine returns the Phy address of a given ethernet port.
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit describing Phy address, -1 if the port number is wrong.
+*
+*******************************************************************************/
+MV_32 mvBoardPhyAddrGet(MV_U32 ethPortNum)
+{
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardPhyAddrGet: Board unknown.\n");
+		return MV_ERROR;
+	}
+
+	return BOARD_INFO(boardId)->pBoardMacInfo[ethPortNum].boardEthSmiAddr;
+}
+
+/*******************************************************************************
+* mvBoardMacSpeedGet - Get the Mac speed
+*
+* DESCRIPTION:
+*       This routine returns the Mac speed if pre define of a given ethernet port.
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BOARD_MAC_SPEED, -1 if the port number is wrong.
+*
+*******************************************************************************/
+MV_BOARD_MAC_SPEED      mvBoardMacSpeedGet(MV_U32 ethPortNum)
+{
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardMacSpeedGet: Board unknown.\n");
+		return MV_ERROR;
+	}
+
+	return BOARD_INFO(boardId)->pBoardMacInfo[ethPortNum].boardMacSpeed;
+}
+
+/*******************************************************************************
+* mvBoardLinkStatusIrqGet - Get the IRQ number for the link status indication
+*
+* DESCRIPTION:
+*       This routine returns the IRQ number for the link status indication.
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       the number of the IRQ for the link status indication, -1 if the port 
+*	number is wrong or if not relevant.
+*
+*******************************************************************************/
+MV_32	mvBoardLinkStatusIrqGet(MV_U32 ethPortNum)
+{
+	MV_U32 boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardLinkStatusIrqGet: Board unknown.\n");
+		return MV_ERROR;
+	}
+
+	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].linkStatusIrq;
+}
+
+/*******************************************************************************
+* mvBoardSwitchPortGet - Get the mapping between the board connector and the 
+* Ethernet Switch port
+*
+* DESCRIPTION:
+*       This routine returns the matching Switch port.
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*	boardPortNum - logical number of the connector on the board
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       the matching Switch port, -1 if the port number is wrong or if not relevant.
+*
+*******************************************************************************/
+MV_32	mvBoardSwitchPortGet(MV_U32 ethPortNum, MV_U8 boardPortNum)
+{
+	MV_U32 boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardSwitchPortGet: Board unknown.\n");
+		return MV_ERROR;
+	}
+	if (boardPortNum >= BOARD_ETH_SWITCH_PORT_NUM)
+	{
+		mvOsPrintf("mvBoardSwitchPortGet: Illegal board port number.\n");
+		return MV_ERROR;
+	}
+
+	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].qdPort[boardPortNum];
+}
+
+/*******************************************************************************
+* mvBoardSwitchCpuPortGet - Get the the Ethernet Switch CPU port
+*
+* DESCRIPTION:
+*       This routine returns the Switch CPU port.
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       the Switch CPU port, -1 if the port number is wrong or if not relevant.
+*
+*******************************************************************************/
+MV_32	mvBoardSwitchCpuPortGet(MV_U32 ethPortNum)
+{
+	MV_U32 boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardSwitchCpuPortGet: Board unknown.\n");
+		return MV_ERROR;
+	}
+
+	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].qdCpuPort;
+}
+
+/*******************************************************************************
+* mvBoardIsSwitchConnected - Get switch connection status 
+* DESCRIPTION:
+*       This routine returns port's connection status
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       1 - if ethPortNum is connected to switch, 0 otherwise
+*
+*******************************************************************************/
+MV_32	mvBoardIsSwitchConnected(MV_U32 ethPortNum)
+{
+	MV_U32 boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardIsSwitchConnected: Board unknown.\n");
+		return MV_ERROR;
+	}
+
+	if(ethPortNum >= BOARD_INFO(boardId)->numBoardMacInfo)
+	{
+		mvOsPrintf("mvBoardIsSwitchConnected: Illegal port number(%u)\n", ethPortNum);
+		return MV_ERROR;
+	}
+	
+	if((MV_32)(BOARD_INFO(boardId)->pSwitchInfo))	
+	return (MV_32)(BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].switchOnPort == ethPortNum);
+	else
+		return 0;
+}
+/*******************************************************************************
+* mvBoardSmiScanModeGet - Get Switch SMI scan mode
+*
+* DESCRIPTION:
+*       This routine returns Switch SMI scan mode.
+*
+* INPUT:
+*       ethPortNum - Ethernet port number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       1 for SMI_MANUAL_MODE, -1 if the port number is wrong or if not relevant.
+*
+*******************************************************************************/
+MV_32	mvBoardSmiScanModeGet(MV_U32 ethPortNum)
+{
+	MV_U32 boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardSmiScanModeGet: Board unknown.\n");
+		return MV_ERROR;
+	}
+
+	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].smiScanMode;
+}
+/*******************************************************************************
+* mvBoardSpecInitGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN: Return MV_TRUE and parameters in case board need spesific phy init, 
+* 	  otherwise return MV_FALSE. 
+*
+*
+*******************************************************************************/
+
+MV_BOOL mvBoardSpecInitGet(MV_U32* regOff, MV_U32* data)
+{
+	return MV_FALSE;
+}
+
+/*******************************************************************************
+* mvBoardTclkGet - Get the board Tclk (Controller clock)
+*
+* DESCRIPTION:
+*       This routine extract the controller core clock.
+*       This function uses the controller counters to make identification.
+*		Note: In order to avoid interference, make sure task context switch
+*		and interrupts will not occure during this function operation
+*
+* INPUT:
+*       countNum - Counter number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit clock cycles in Hertz.
+*
+*******************************************************************************/
+MV_U32 mvBoardTclkGet(MV_VOID)
+{
+    if(mvCtrlModelGet()==MV_6281_DEV_ID)
+    {
+#if defined(TCLK_AUTO_DETECT)
+	MV_U32 tmpTClkRate = MV_BOARD_TCLK_166MHZ;
+
+    tmpTClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+    tmpTClkRate &= MSAR_TCLCK_MASK;
+
+    switch (tmpTClkRate)
+    {
+    case MSAR_TCLCK_166:
+            return MV_BOARD_TCLK_166MHZ;
+            break;
+    case MSAR_TCLCK_200:
+            return MV_BOARD_TCLK_200MHZ;
+            break;
+    }
+#else
+    return MV_BOARD_TCLK_200MHZ;
+#endif
+    }
+
+        return MV_BOARD_TCLK_166MHZ;
+
+}
+/*******************************************************************************
+* mvBoardSysClkGet - Get the board SysClk (CPU bus clock)
+*
+* DESCRIPTION:
+*       This routine extract the CPU bus clock.
+*
+* INPUT:
+*       countNum - Counter number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit clock cycles in Hertz.
+*
+*******************************************************************************/
+static MV_U32  mvBoard6180SysClkGet(MV_VOID)
+{
+	MV_U32 	sysClkRate=0;
+	MV_CPU_ARM_CLK _cpu6180_ddr_l2_CLK[] = MV_CPU6180_DDR_L2_CLCK_TBL;
+
+	sysClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+	sysClkRate = sysClkRate & MSAR_CPUCLCK_MASK_6180;
+	sysClkRate = sysClkRate >> MSAR_CPUCLCK_OFFS_6180;
+			
+	sysClkRate = _cpu6180_ddr_l2_CLK[sysClkRate].ddrClk;
+
+	return sysClkRate;
+
+}
+
+MV_U32  mvBoardSysClkGet(MV_VOID)
+{
+#ifdef SYSCLK_AUTO_DETECT
+	MV_U32 sysClkRate, tmp, pClkRate, indexDdrRtio;
+	MV_U32 cpuCLK[] = MV_CPU_CLCK_TBL;
+	MV_U32 ddrRtio[][2] = MV_DDR_CLCK_RTIO_TBL;
+
+	if(mvCtrlModelGet() == MV_6180_DEV_ID)
+		return mvBoard6180SysClkGet();
+
+	tmp = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+	pClkRate = MSAR_CPUCLCK_EXTRACT(tmp);
+	pClkRate = cpuCLK[pClkRate];
+
+	indexDdrRtio = tmp & MSAR_DDRCLCK_RTIO_MASK;
+	indexDdrRtio = indexDdrRtio >> MSAR_DDRCLCK_RTIO_OFFS;
+    if(ddrRtio[indexDdrRtio][0] != 0)
+        sysClkRate = ((pClkRate * ddrRtio[indexDdrRtio][1]) / ddrRtio[indexDdrRtio][0]);
+    else
+        sysClkRate = 0;
+	return sysClkRate;
+#else
+	return MV_BOARD_DEFAULT_SYSCLK;
+#endif
+}
+
+
+/*******************************************************************************
+* mvBoardPexBridgeIntPinGet - Get PEX to PCI bridge interrupt pin number
+*
+* DESCRIPTION:
+*		Multi-ported PCI Express bridges that is implemented on the board
+*		collapse interrupts across multiple conventional PCI/PCI-X buses.
+*		A dual-headed PCI Express bridge would map (or "swizzle") the
+*		interrupts per the following table (in accordance with the respective
+*		logical PCI/PCI-X bridge's Device Number), collapse the INTA#-INTD#
+*		signals from its two logical PCI/PCI-X bridges, collapse the
+*		INTA#-INTD# signals from any internal sources, and convert the
+*		signals to in-band PCI Express messages. 10
+*		This function returns the upstream interrupt as it was converted by
+*		the bridge, according to board configuration and the following table:
+*					  		PCI dev num
+*			Interrupt pin 	7, 	8, 	9
+*		   			A  ->	A	D	C
+*		   			B  -> 	B	A	D
+*		   			C  -> 	C	B	A
+*		  			D  ->	D	C	B
+*
+*
+* INPUT:
+*       devNum - PCI/PCIX device number.
+*       intPin - PCI Int pin
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Int pin connected to the Interrupt controller
+*
+*******************************************************************************/
+MV_U32 mvBoardPexBridgeIntPinGet(MV_U32 devNum, MV_U32 intPin)
+{
+	MV_U32 realIntPin = ((intPin + (3 - (devNum % 4))) %4 );
+
+	if (realIntPin == 0) return 4;
+		else return realIntPin;
+
+}
+
+/*******************************************************************************
+* mvBoardDebugLedNumGet - Get number of debug Leds
+*
+* DESCRIPTION:
+* INPUT:
+*       boardId
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_U32 mvBoardDebugLedNumGet(MV_U32 boardId)
+{
+	return BOARD_INFO(boardId)->activeLedsNumber;
+}
+
+/*******************************************************************************
+* mvBoardDebugLeg - Set the board debug Leds
+*
+* DESCRIPTION: turn on/off status leds.
+* 	       Note: assume MPP leds are part of group 0 only.
+*
+* INPUT:
+*       hexNum - Number to be displied in hex by Leds.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvBoardDebugLed(MV_U32 hexNum)
+{
+    MV_U32 val = 0,totalMask, currentBitMask = 1,i;
+    MV_U32 boardId= mvBoardIdGet();
+
+    if (BOARD_INFO(boardId)->pLedGppPin == NULL)
+	return;
+
+    totalMask = (1 << BOARD_INFO(boardId)->activeLedsNumber) -1;
+    hexNum &= totalMask;
+    totalMask = 0;
+
+    for (i = 0 ; i < BOARD_INFO(boardId)->activeLedsNumber ; i++)
+    {
+	if (hexNum & currentBitMask)
+	{
+	    val |= (1 << BOARD_INFO(boardId)->pLedGppPin[i]);
+	}
+
+	totalMask |= (1 << BOARD_INFO(boardId)->pLedGppPin[i]);
+
+	currentBitMask = (currentBitMask << 1);
+    }
+
+    if (BOARD_INFO(boardId)->ledsPolarity)
+    {
+	mvGppValueSet(0, totalMask, val);
+    }
+    else
+    {
+	mvGppValueSet(0, totalMask, ~val);
+    }
+}
+
+
+/*******************************************************************************
+* mvBoarGpioPinGet - mvBoarGpioPinGet
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		class - MV_BOARD_GPP_CLASS enum.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       GPIO pin number. The function return -1 for bad parameters.
+*
+*******************************************************************************/
+MV_32 mvBoarGpioPinNumGet(MV_BOARD_GPP_CLASS class, MV_U32 index)
+{
+	MV_U32 boardId, i;
+	MV_U32 indexFound = 0;
+
+	boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardRTCGpioPinGet:Board unknown.\n");
+		return MV_ERROR;
+
+	}
+
+        for (i = 0; i < BOARD_INFO(boardId)->numBoardGppInfo; i++)
+		if (BOARD_INFO(boardId)->pBoardGppInfo[i].devClass == class) {
+			if (indexFound == index)
+        			return (MV_U32)BOARD_INFO(boardId)->pBoardGppInfo[i].gppPinNum;
+			else
+				indexFound++;
+
+		}
+
+	return MV_ERROR;
+}
+
+
+/*******************************************************************************
+* mvBoardRTCGpioPinGet - mvBoardRTCGpioPinGet
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       GPIO pin number. The function return -1 for bad parameters.
+*
+*******************************************************************************/
+MV_32 mvBoardRTCGpioPinGet(MV_VOID)
+{
+	return mvBoarGpioPinNumGet(BOARD_GPP_RTC, 0);
+}
+
+
+/*******************************************************************************
+* mvBoardReset - mvBoardReset
+*
+* DESCRIPTION:
+*			Reset the board
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       None
+*
+*******************************************************************************/
+MV_VOID	mvBoardReset(MV_VOID)
+{
+	MV_32 resetPin;
+
+	/* Get gpp reset pin if define */
+	resetPin = mvBoardResetGpioPinGet();
+	if (resetPin != MV_ERROR)
+	{
+        	MV_REG_BIT_RESET( GPP_DATA_OUT_REG(0) ,(1 << resetPin));
+		MV_REG_BIT_RESET( GPP_DATA_OUT_EN_REG(0) ,(1 << resetPin));
+
+	}
+	else
+	{
+	    /* No gpp reset pin was found, try to reset ussing
+	    system reset out */
+	    MV_REG_BIT_SET( CPU_RSTOUTN_MASK_REG , BIT2);
+	    MV_REG_BIT_SET( CPU_SYS_SOFT_RST_REG , BIT0);
+	}
+}
+
+/*******************************************************************************
+* mvBoardResetGpioPinGet - mvBoardResetGpioPinGet
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       GPIO pin number. The function return -1 for bad parameters.
+*
+*******************************************************************************/
+MV_32 mvBoardResetGpioPinGet(MV_VOID)
+{
+	return mvBoarGpioPinNumGet(BOARD_GPP_RESET, 0);
+}
+/*******************************************************************************
+* mvBoardSDIOGpioPinGet - mvBoardSDIOGpioPinGet
+*
+* DESCRIPTION:
+*	used for hotswap detection
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       GPIO pin number. The function return -1 for bad parameters.
+*
+*******************************************************************************/
+MV_32  mvBoardSDIOGpioPinGet(MV_VOID)
+{
+	return mvBoarGpioPinNumGet(BOARD_GPP_SDIO_DETECT, 0);
+}
+
+/*******************************************************************************
+* mvBoardUSBVbusGpioPinGet - return Vbus input GPP
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		int  devNo.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       GPIO pin number. The function return -1 for bad parameters.
+*
+*******************************************************************************/
+MV_32 mvBoardUSBVbusGpioPinGet(MV_32 devId)
+{
+	return mvBoarGpioPinNumGet(BOARD_GPP_USB_VBUS, devId);
+}
+
+/*******************************************************************************
+* mvBoardUSBVbusEnGpioPinGet - return Vbus Enable output GPP
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		int  devNo.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       GPIO pin number. The function return -1 for bad parameters.
+*
+*******************************************************************************/
+MV_32 mvBoardUSBVbusEnGpioPinGet(MV_32 devId)
+{
+	return mvBoarGpioPinNumGet(BOARD_GPP_USB_VBUS_EN, devId);
+}
+
+
+/*******************************************************************************
+* mvBoardGpioIntMaskGet - Get GPIO mask for interrupt pins
+*
+* DESCRIPTION:
+*		This function returns a 32-bit mask of GPP pins that connected to
+*		interrupt generating sources on board.
+*		For example if UART channel A is hardwired to GPP pin 8 and
+*		UART channel B is hardwired to GPP pin 4 the fuinction will return
+*		the value 0x000000110
+*
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		See description. The function return -1 if board is not identified.
+*
+*******************************************************************************/
+MV_32 mvBoardGpioIntMaskLowGet(MV_VOID)
+{
+	MV_U32 boardId;
+
+	boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardGpioIntMaskGet:Board unknown.\n");
+		return MV_ERROR;
+
+	}
+
+	return BOARD_INFO(boardId)->intsGppMaskLow;
+}
+MV_32 mvBoardGpioIntMaskHighGet(MV_VOID)
+{
+	MV_U32 boardId;
+
+	boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardGpioIntMaskGet:Board unknown.\n");
+		return MV_ERROR;
+
+	}
+
+	return BOARD_INFO(boardId)->intsGppMaskHigh;
+}
+
+
+/*******************************************************************************
+* mvBoardMppGet - Get board dependent MPP register value
+*
+* DESCRIPTION:
+*		MPP settings are derived from board design.
+*		MPP group consist of 8 MPPs. An MPP group represent MPP
+*		control register.
+*       This function retrieves board dependend MPP register value.
+*
+* INPUT:
+*       mppGroupNum - MPP group number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit value describing MPP control register value.
+*
+*******************************************************************************/
+MV_32 mvBoardMppGet(MV_U32 mppGroupNum)
+{
+	MV_U32 boardId;
+
+	boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardMppGet:Board unknown.\n");
+		return MV_ERROR;
+
+	}
+
+	return BOARD_INFO(boardId)->pBoardMppConfigValue[0].mppGroup[mppGroupNum];
+}
+
+
+/*******************************************************************************
+* mvBoardMppGroupId - If MPP group type is AUTO then identify it using twsi
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_VOID mvBoardMppGroupIdUpdate(MV_VOID)
+{
+
+	MV_BOARD_MPP_GROUP_CLASS devClass;
+	MV_BOARD_MODULE_ID_CLASS devClassId;
+	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
+	MV_U32 devId;
+	MV_U32 maxMppGrp = 1;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			maxMppGrp = MV_6281_MPP_MAX_MODULE;
+			break;
+		case MV_6192_DEV_ID:
+			maxMppGrp = MV_6192_MPP_MAX_MODULE;
+			break;
+        case MV_6190_DEV_ID:
+            maxMppGrp = MV_6190_MPP_MAX_MODULE;
+            break;
+		case MV_6180_DEV_ID:
+			maxMppGrp = MV_6180_MPP_MAX_MODULE;
+			break;		
+	}
+
+	for (devClass = 0; devClass < maxMppGrp; devClass++)
+	{
+		/* If MPP group can be defined by the module connected to it */
+		if (mvBoardMppGroupTypeGet(devClass) == MV_BOARD_AUTO)
+		{
+			/* Get MPP module ID */
+			devClassId = mvBoarModuleTypeGet(devClass);
+			if (MV_ERROR != devClassId)
+			{
+				switch(devClassId)
+				{
+				case MV_BOARD_MODULE_TDM_ID:
+				case MV_BOARD_MODULE_TDM_5CHAN_ID:
+					mppGroupType = MV_BOARD_TDM;
+					break;
+				case MV_BOARD_MODULE_AUDIO_ID:
+					mppGroupType = MV_BOARD_AUDIO;
+					break;
+				case MV_BOARD_MODULE_RGMII_ID:
+					mppGroupType = MV_BOARD_RGMII;
+					break;
+				case MV_BOARD_MODULE_GMII_ID:
+					mppGroupType = MV_BOARD_GMII;
+					break;
+				case MV_BOARD_MODULE_TS_ID:
+					mppGroupType = MV_BOARD_TS;
+					break;
+				case MV_BOARD_MODULE_MII_ID:
+					mppGroupType = MV_BOARD_MII;
+					break;
+				default:
+					mppGroupType = MV_BOARD_OTHER;
+					break;
+				}
+			}
+			else
+				/* The module bay is empty */
+				mppGroupType = MV_BOARD_OTHER;
+			
+			/* Update MPP group type */
+			mvBoardMppGroupTypeSet(devClass, mppGroupType);
+		}
+
+		/* Update MPP output voltage for RGMII 1.8V. Set port to GMII for GMII module */
+		if ((mvBoardMppGroupTypeGet(devClass) == MV_BOARD_RGMII))
+			MV_REG_BIT_SET(MPP_OUTPUT_DRIVE_REG,MPP_1_8_RGMII1_OUTPUT_DRIVE | MPP_1_8_RGMII0_OUTPUT_DRIVE);
+        	else 
+		{
+			if ((mvBoardMppGroupTypeGet(devClass) == MV_BOARD_GMII))
+        		{
+				MV_REG_BIT_RESET(MPP_OUTPUT_DRIVE_REG, BIT7 | BIT15);
+            			MV_REG_BIT_RESET(ETH_PORT_SERIAL_CTRL_1_REG(0),BIT3);
+            			MV_REG_BIT_RESET(ETH_PORT_SERIAL_CTRL_1_REG(1),BIT3);
+        		}
+        		else if ((mvBoardMppGroupTypeGet(devClass) == MV_BOARD_MII))
+        		{
+				/* Assumption that the MDC & MDIO should be 3.3V */
+				MV_REG_BIT_RESET(MPP_OUTPUT_DRIVE_REG, BIT7 | BIT15);
+				/* Assumption that only ETH1 can be MII when using modules on DB */
+            			MV_REG_BIT_RESET(ETH_PORT_SERIAL_CTRL_1_REG(1),BIT3);
+        		}
+		}
+	}
+}
+
+/*******************************************************************************
+* mvBoardMppGroupTypeGet 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       mppGroupClass - MPP group number 0  for MPP[35:20] or 1 for MPP[49:36].
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_BOARD_MPP_TYPE_CLASS mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass)
+{
+	MV_U32 boardId;
+
+	boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardMppGet:Board unknown.\n");
+		return MV_ERROR;
+
+	}
+	
+	if (mppGroupClass == MV_BOARD_MPP_GROUP_1)
+		return BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup1;
+	else
+		return BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup2;
+}
+
+/*******************************************************************************
+* mvBoardMppGroupTypeSet 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       mppGroupClass - MPP group number 0  for MPP[35:20] or 1 for MPP[49:36].
+*       mppGroupType - MPP group type for MPP[35:20] or for MPP[49:36].
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_VOID mvBoardMppGroupTypeSet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass,
+						MV_BOARD_MPP_TYPE_CLASS mppGroupType)
+{
+	MV_U32 boardId;
+
+	boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardMppGet:Board unknown.\n");
+	}
+
+	if (mppGroupClass == MV_BOARD_MPP_GROUP_1)
+		BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup1 = mppGroupType;
+	else
+		BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup2 = mppGroupType;
+
+}
+
+/*******************************************************************************
+* mvBoardMppMuxSet - Update MPP mux
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_VOID mvBoardMppMuxSet(MV_VOID)
+{
+
+	MV_BOARD_MPP_GROUP_CLASS devClass;
+	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
+	MV_U32 devId;
+	MV_U8 muxVal = 0xf;
+	MV_U32 maxMppGrp = 1;
+    MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			maxMppGrp = MV_6281_MPP_MAX_MODULE;
+			break;
+		case MV_6192_DEV_ID:
+			maxMppGrp = MV_6192_MPP_MAX_MODULE;
+			break;
+        case MV_6190_DEV_ID:
+            maxMppGrp = MV_6190_MPP_MAX_MODULE;
+            break;
+		case MV_6180_DEV_ID:
+			maxMppGrp = MV_6180_MPP_MAX_MODULE;
+			break;		
+	}
+
+	for (devClass = 0; devClass < maxMppGrp; devClass++)
+	{
+		mppGroupType = mvBoardMppGroupTypeGet(devClass);
+
+		switch(mppGroupType)
+		{
+			case MV_BOARD_TDM:
+				muxVal &= ~(devClass ? (0x2 << (devClass * 2)):0x0);
+				break;
+			case MV_BOARD_AUDIO:
+				 muxVal &= ~(devClass ? 0x7 : 0x0); /*old Z0 value 0xd:0x0*/
+				break;
+			case MV_BOARD_TS:
+				 muxVal &= ~(devClass ? (0x2 << (devClass * 2)):0x0);
+				break;
+			default:
+				muxVal |= (devClass ? 0xf : 0);
+				break;
+		}
+	}
+
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+	/* Read MPP module ID */
+    	DB(mvOsPrintf("Board: twsi exp set\n"));
+    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(MV_BOARD_MUX_I2C_ADDR_ENTRY);
+    	twsiSlave.slaveAddr.type = mvBoardTwsiExpAddrTypeGet(MV_BOARD_MUX_I2C_ADDR_ENTRY);
+    	twsiSlave.validOffset = MV_TRUE;
+	/* Offset is the first command after the address which indicate the register number to be read 
+	   in next operation */
+    	twsiSlave.offset = 2;
+    	twsiSlave.moreThen256 = MV_FALSE;
+
+
+
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
+        	return;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
+    	
+	/* Change twsi exp to output */
+    	twsiSlave.offset = 6;
+	muxVal = 0;
+	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
+        	return;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
+	
+}
+
+/*******************************************************************************
+* mvBoardTdmMppSet - set MPPs in TDM module
+*
+* DESCRIPTION:
+*
+* INPUT: type of second telephony device
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_VOID mvBoardTdmMppSet(MV_32 chType)
+{
+
+	MV_BOARD_MPP_GROUP_CLASS devClass;
+	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
+	MV_U32 devId;
+	MV_U8 muxVal = 1;
+	MV_U8 muxValMask = 1;
+	MV_U8 twsiVal;
+	MV_U32 maxMppGrp = 1;
+    	MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			maxMppGrp = MV_6281_MPP_MAX_MODULE;
+			break;
+		case MV_6192_DEV_ID:
+			maxMppGrp = MV_6192_MPP_MAX_MODULE;
+			break;
+        case MV_6190_DEV_ID:
+            maxMppGrp = MV_6190_MPP_MAX_MODULE;
+            break;
+		case MV_6180_DEV_ID:
+			maxMppGrp = MV_6180_MPP_MAX_MODULE;
+			break;		
+	}
+
+	for (devClass = 0; devClass < maxMppGrp; devClass++)
+	{
+		mppGroupType = mvBoardMppGroupTypeGet(devClass);
+		if(mppGroupType == MV_BOARD_TDM)
+			break;
+	}
+
+	if(devClass == maxMppGrp)
+		return;		/* TDM module not found */
+
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+	/* Read MPP module ID */
+    	DB(mvOsPrintf("Board: twsi exp set\n"));
+    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(devClass);
+    	twsiSlave.slaveAddr.type = ADDR7_BIT;
+    	twsiSlave.validOffset = MV_TRUE;
+	/* Offset is the first command after the address which indicate the register number to be read 
+	   in next operation */
+    	twsiSlave.offset = 3;
+    	twsiSlave.moreThen256 = MV_FALSE;
+
+	if(mvBoardIdGet() == RD_88F6281A_ID)
+	{
+		muxVal = 0xc;
+		muxValMask = 0xf3;
+	}
+
+	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        muxVal = (twsiVal & muxValMask) | muxVal;
+
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		mvOsPrintf("Board: twsi exp out val fail\n");
+        	return;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
+    	
+	/* Change twsi exp to output */
+    	twsiSlave.offset = 7;
+	muxVal = 0xfe;
+	if(mvBoardIdGet() == RD_88F6281A_ID)
+		muxVal = 0xf3;
+
+	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+	muxVal = (twsiVal & muxVal);
+
+	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		mvOsPrintf("Board: twsi exp change to out fail\n");
+        	return;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
+	/* reset the line to 0 */
+    	twsiSlave.offset = 3;
+	muxVal = 0;
+	muxValMask = 1;
+
+	if(mvBoardIdGet() == RD_88F6281A_ID) {
+		muxVal = 0x0;
+		muxValMask = 0xf3;
+	}
+
+	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        muxVal = (twsiVal & muxValMask) | muxVal;
+
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		mvOsPrintf("Board: twsi exp out val fail\n");
+        	return;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
+
+	mvOsDelay(20);
+
+	/* set the line to 1 */
+    	twsiSlave.offset = 3;
+	muxVal = 1;
+	muxValMask = 1;
+
+	if(mvBoardIdGet() == RD_88F6281A_ID)
+	{
+		muxVal = 0xc;
+		muxValMask = 0xf3;
+		if(chType) /* FXS - issue reset properly */
+		{
+			MV_REG_BIT_SET(GPP_DATA_OUT_REG(1), MV_GPP12);
+			mvOsDelay(50);
+			MV_REG_BIT_RESET(GPP_DATA_OUT_REG(1), MV_GPP12);
+		}
+		else /* FXO - issue reset via TDM_CODEC_RST*/
+		{
+		   /* change MPP44 type to TDM_CODEC_RST(0x2) */
+		   MV_REG_WRITE(MPP_CONTROL_REG5, ((MV_REG_READ(MPP_CONTROL_REG5) & 0xFFF0FFFF)  | BIT17));	
+		}	
+	}
+
+	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        muxVal = (twsiVal & muxValMask) | muxVal;
+
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		mvOsPrintf("Board: twsi exp out val fail\n");
+        	return;
+    	}
+
+	/* TBD - 5 channels */
+#if defined(MV_TDM_5CHANNELS)
+	/* change MPP38 type to GPIO(0x0) & polarity for TDM_STROBE */
+	MV_REG_WRITE(MPP_CONTROL_REG4, (MV_REG_READ(MPP_CONTROL_REG4) & 0xF0FFFFFF));
+	mvGppPolaritySet(1, MV_GPP6, 0);
+	
+	twsiSlave.offset = 6;
+	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(2);
+
+	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+	muxVal = (twsiVal & ~BIT2);
+
+	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		mvOsPrintf("Board: twsi exp change to out fail\n");
+        	return;
+    	}
+
+
+	twsiSlave.offset = 2;
+
+	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+	muxVal = (twsiVal & ~BIT2);
+
+	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
+    	{
+    		mvOsPrintf("Board: twsi exp change to out fail\n");
+        	return;
+    	}
+#endif
+    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
+
+	
+}
+/*******************************************************************************
+* mvBoardVoiceConnModeGet - return SLIC/DAA connection & interrupt modes  
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+
+MV_VOID mvBoardVoiceConnModeGet(MV_32* connMode, MV_32* irqMode)
+{
+	switch(mvBoardIdGet())
+	{
+		case RD_88F6281A_ID:
+			*connMode = DAISY_CHAIN_MODE;
+			*irqMode = INTERRUPT_TO_TDM;
+			break;
+		case DB_88F6281A_BP_ID:
+			 *connMode = DUAL_CHIP_SELECT_MODE;
+			 *irqMode = INTERRUPT_TO_TDM;
+			break;
+		case RD_88F6192A_ID:
+			*connMode = DUAL_CHIP_SELECT_MODE;
+			*irqMode = INTERRUPT_TO_TDM;
+			break;
+		case DB_88F6192A_BP_ID:
+			 *connMode = DUAL_CHIP_SELECT_MODE;
+			 *irqMode = INTERRUPT_TO_TDM;
+			break;
+		default:
+			*connMode = *irqMode = -1;
+			mvOsPrintf("mvBoardVoiceAssembleModeGet: TDM not supported(boardId=0x%x)\n",mvBoardIdGet());
+	}
+		return;
+	
+}
+
+/*******************************************************************************
+* mvBoardMppModuleTypePrint - print module detect
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_VOID mvBoardMppModuleTypePrint(MV_VOID)
+{
+
+	MV_BOARD_MPP_GROUP_CLASS devClass;
+	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
+	MV_U32 devId;
+	MV_U32 maxMppGrp = 1;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			maxMppGrp = MV_6281_MPP_MAX_MODULE;
+			break;
+		case MV_6192_DEV_ID:
+			maxMppGrp = MV_6192_MPP_MAX_MODULE;
+			break;
+        case MV_6190_DEV_ID:
+            maxMppGrp = MV_6190_MPP_MAX_MODULE;
+            break;
+		case MV_6180_DEV_ID:
+			maxMppGrp = MV_6180_MPP_MAX_MODULE;
+			break;		
+	}
+
+	for (devClass = 0; devClass < maxMppGrp; devClass++)
+	{
+		mppGroupType = mvBoardMppGroupTypeGet(devClass);
+
+		switch(mppGroupType)
+		{
+			case MV_BOARD_TDM:
+                if(devId != MV_6190_DEV_ID)
+                    mvOsPrintf("Module %d is TDM\n", devClass);
+				break;
+			case MV_BOARD_AUDIO:
+                if(devId != MV_6190_DEV_ID)
+                    mvOsPrintf("Module %d is AUDIO\n", devClass);
+				break;
+            case MV_BOARD_RGMII:
+                if(devId != MV_6190_DEV_ID)
+                    mvOsPrintf("Module %d is RGMII\n", devClass);
+				break;
+			case MV_BOARD_GMII:
+                if(devId != MV_6190_DEV_ID)
+                    mvOsPrintf("Module %d is GMII\n", devClass);
+				break;
+			case MV_BOARD_TS:
+                if(devId != MV_6190_DEV_ID)
+                    mvOsPrintf("Module %d is TS\n", devClass);
+				break;
+			default:
+				break;
+		}
+	}
+}
+
+/* Board devices API managments */
+
+/*******************************************************************************
+* mvBoardGetDeviceNumber - Get number of device of some type on the board
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		devType - The device type ( Flash,RTC , etc .. )
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       If the device is found on the board the then the functions returns the
+*		number of those devices else the function returns 0
+*
+*
+*******************************************************************************/
+MV_32 mvBoardGetDevicesNumber(MV_BOARD_DEV_CLASS devClass)
+{
+	MV_U32	foundIndex=0,devNum;
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("mvBoardGetDeviceNumber:Board unknown.\n");
+		return 0xFFFFFFFF;
+
+	}
+
+	for (devNum = START_DEV_CS; devNum < BOARD_INFO(boardId)->numBoardDeviceIf; devNum++)
+	{
+		if (BOARD_INFO(boardId)->pDevCsInfo[devNum].devClass == devClass)
+		{
+			foundIndex++;
+		}
+	}
+
+    return foundIndex;
+
+}
+
+/*******************************************************************************
+* mvBoardGetDeviceBaseAddr - Get base address of a device existing on the board
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       devIndex - The device sequential number on the board
+*		devType - The device type ( Flash,RTC , etc .. )
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       If the device is found on the board the then the functions returns the
+*		Base address else the function returns 0xffffffff
+*
+*
+*******************************************************************************/
+MV_32 mvBoardGetDeviceBaseAddr(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
+{
+	MV_DEV_CS_INFO* devEntry;
+	devEntry = boardGetDevEntry(devNum,devClass);
+	if (devEntry != NULL)
+	{
+		return mvCpuIfTargetWinBaseLowGet(DEV_TO_TARGET(devEntry->deviceCS));
+
+	}
+
+	return 0xFFFFFFFF;
+}
+
+/*******************************************************************************
+* mvBoardGetDeviceBusWidth - Get Bus width of a device existing on the board
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       devIndex - The device sequential number on the board
+*		devType - The device type ( Flash,RTC , etc .. )
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       If the device is found on the board the then the functions returns the
+*		Bus width else the function returns 0xffffffff
+*
+*
+*******************************************************************************/
+MV_32 mvBoardGetDeviceBusWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
+{
+	MV_DEV_CS_INFO* devEntry;
+
+	devEntry = boardGetDevEntry(devNum,devClass);
+	if (devEntry != NULL)
+	{
+		return 8; 
+	}
+
+	return 0xFFFFFFFF;
+
+}
+
+/*******************************************************************************
+* mvBoardGetDeviceWidth - Get dev width of a device existing on the board
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       devIndex - The device sequential number on the board
+*		devType - The device type ( Flash,RTC , etc .. )
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       If the device is found on the board the then the functions returns the
+*		dev width else the function returns 0xffffffff
+*
+*
+*******************************************************************************/
+MV_32 mvBoardGetDeviceWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
+{
+	MV_DEV_CS_INFO* devEntry;
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("Board unknown.\n");
+		return 0xFFFFFFFF;
+	}
+
+	devEntry = boardGetDevEntry(devNum,devClass);
+	if (devEntry != NULL)
+		return devEntry->devWidth;
+
+	return MV_ERROR;
+
+}
+
+/*******************************************************************************
+* mvBoardGetDeviceWinSize - Get the window size of a device existing on the board
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       devIndex - The device sequential number on the board
+*		devType - The device type ( Flash,RTC , etc .. )
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       If the device is found on the board the then the functions returns the
+*		window size else the function returns 0xffffffff
+*
+*
+*******************************************************************************/
+MV_32 mvBoardGetDeviceWinSize(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
+{
+	MV_DEV_CS_INFO* devEntry;
+	MV_U32 boardId = mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("Board unknown.\n");
+		return 0xFFFFFFFF;
+	}
+
+	devEntry = boardGetDevEntry(devNum,devClass);
+	if (devEntry != NULL)
+	{
+		return mvCpuIfTargetWinSizeGet(DEV_TO_TARGET(devEntry->deviceCS));
+	}
+
+	return 0xFFFFFFFF;
+}
+
+
+/*******************************************************************************
+* boardGetDevEntry - returns the entry pointer of a device on the board
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       devIndex - The device sequential number on the board
+*		devType - The device type ( Flash,RTC , etc .. )
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       If the device is found on the board the then the functions returns the
+*		dev number else the function returns 0x0
+*
+*
+*******************************************************************************/
+static MV_DEV_CS_INFO*  boardGetDevEntry(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
+{
+	MV_U32	foundIndex=0,devIndex;
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("boardGetDevEntry: Board unknown.\n");
+		return NULL;
+
+	}
+
+	for (devIndex = START_DEV_CS; devIndex < BOARD_INFO(boardId)->numBoardDeviceIf; devIndex++)
+	{
+		/* TBR */
+		/*if (BOARD_INFO(boardId)->pDevCsInfo[devIndex].deviceCS == MV_BOOTDEVICE_INDEX)
+		     continue;*/
+
+		if (BOARD_INFO(boardId)->pDevCsInfo[devIndex].devClass == devClass)
+		{
+            		if (foundIndex == devNum)
+			{
+				return &(BOARD_INFO(boardId)->pDevCsInfo[devIndex]);
+			}
+			foundIndex++;
+		}
+	}
+
+	/* device not found */
+	return NULL;
+}
+
+/* Get device CS number */
+
+MV_U32 boardGetDevCSNum(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
+{
+	MV_DEV_CS_INFO* devEntry;
+	MV_U32 boardId= mvBoardIdGet();
+
+	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
+	{
+		mvOsPrintf("Board unknown.\n");
+		return 0xFFFFFFFF;
+
+	}
+
+
+	devEntry = boardGetDevEntry(devNum,devClass);
+	if (devEntry != NULL)
+		return devEntry->deviceCS;
+
+	return 0xFFFFFFFF;
+
+}
+
+/*******************************************************************************
+* mvBoardRtcTwsiAddrTypeGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardRtcTwsiAddrTypeGet()
+{
+	int i;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_RTC)
+			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
+	return (MV_ERROR);
+}
+
+/*******************************************************************************
+* mvBoardRtcTwsiAddrGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardRtcTwsiAddrGet()
+{
+	int i;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_RTC)
+			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
+	return (0xFF);
+}
+
+/*******************************************************************************
+* mvBoardA2DTwsiAddrTypeGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardA2DTwsiAddrTypeGet()
+{
+	int i;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_AUDIO_DEC)
+			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
+	return (MV_ERROR);
+}
+
+/*******************************************************************************
+* mvBoardA2DTwsiAddrGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardA2DTwsiAddrGet()
+{
+	int i;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_AUDIO_DEC)
+			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
+	return (0xFF);
+}
+
+/*******************************************************************************
+* mvBoardTwsiExpAddrTypeGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardTwsiExpAddrTypeGet(MV_U32 index)
+{
+	int i;
+	MV_U32 indexFound = 0;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_EXP)
+		{
+			if (indexFound == index)
+				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
+			else
+				indexFound++;
+		}
+
+	return (MV_ERROR);
+}
+
+/*******************************************************************************
+* mvBoardTwsiExpAddrGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardTwsiExpAddrGet(MV_U32 index)
+{
+	int i;
+	MV_U32 indexFound = 0;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_EXP)
+		{
+			if (indexFound == index)
+				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
+			else
+				indexFound++;
+		}
+
+	return (0xFF);
+}
+
+
+/*******************************************************************************
+* mvBoardTwsiSatRAddrTypeGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardTwsiSatRAddrTypeGet(MV_U32 index)
+{
+	int i;
+	MV_U32 indexFound = 0;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_SATR)
+		{
+			if (indexFound == index)
+				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
+			else
+				indexFound++;
+		}
+
+	return (MV_ERROR);
+}
+
+/*******************************************************************************
+* mvBoardTwsiSatRAddrGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_U8 mvBoardTwsiSatRAddrGet(MV_U32 index)
+{
+	int i;
+	MV_U32 indexFound = 0;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
+		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_SATR)
+		{
+			if (indexFound == index)
+				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
+			else
+				indexFound++;
+		}
+
+	return (0xFF);
+}
+
+/*******************************************************************************
+* mvBoardNandWidthGet -
+*
+* DESCRIPTION: Get the width of the first NAND device in byte.
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN: 1, 2, 4 or MV_ERROR
+*
+*
+*******************************************************************************/
+/*  */
+MV_32 mvBoardNandWidthGet(void)
+{
+	MV_U32 devNum;
+	MV_U32 devWidth;
+	MV_U32 boardId= mvBoardIdGet();
+
+	for (devNum = START_DEV_CS; devNum < BOARD_INFO(boardId)->numBoardDeviceIf; devNum++)
+	{
+		devWidth = mvBoardGetDeviceWidth(devNum, BOARD_DEV_NAND_FLASH);
+		if (devWidth != MV_ERROR)
+			return (devWidth / 8);
+	}
+		
+	/* NAND wasn't found */
+	return MV_ERROR;
+}
+
+MV_U32 gBoardId = -1;
+
+/*******************************************************************************
+* mvBoardIdGet - Get Board model
+*
+* DESCRIPTION:
+*       This function returns board ID.
+*       Board ID is 32bit word constructed of board model (16bit) and
+*       board revision (16bit) in the following way: 0xMMMMRRRR.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit board ID number, '-1' if board is undefined.
+*
+*******************************************************************************/
+MV_U32 mvBoardIdGet(MV_VOID)
+{
+	MV_U32 tmpBoardId = -1;
+
+	if(gBoardId == -1)
+        {
+		#if defined(DB_88F6281A)
+		tmpBoardId = DB_88F6281A_BP_ID;
+		#elif defined(RD_88F6281A)
+		tmpBoardId = RD_88F6281A_ID;
+		#elif defined(DB_88F6192A)
+		tmpBoardId = DB_88F6192A_BP_ID;
+		#elif defined(DB_88F6190A)
+		tmpBoardId = DB_88F6190A_BP_ID;
+		#elif defined(RD_88F6192A)
+		tmpBoardId = RD_88F6192A_ID;
+		#elif defined(RD_88F6190A)
+		tmpBoardId = RD_88F6190A_ID;
+		#elif defined(DB_88F6180A)
+		tmpBoardId = DB_88F6180A_BP_ID;
+		#elif defined(RD_88F6281A_PCAC)
+		tmpBoardId = RD_88F6281A_PCAC_ID;
+		#elif defined(RD_88F6281A_SHEEVA_PLUG)
+		tmpBoardId = SHEEVA_PLUG_ID;
+		#elif defined(DB_CUSTOMER)
+		tmpBoardId = DB_CUSTOMER_ID;
+		#endif
+		gBoardId = tmpBoardId;
+	}
+
+	return gBoardId;
+}
+
+
+/*******************************************************************************
+* mvBoarModuleTypeGet - mvBoarModuleTypeGet
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		group num - MV_BOARD_MPP_GROUP_CLASS enum
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		module num - MV_BOARD_MODULE_CLASS enum
+*
+*******************************************************************************/
+MV_BOARD_MODULE_ID_CLASS mvBoarModuleTypeGet(MV_BOARD_MPP_GROUP_CLASS devClass)
+{
+    	MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+    	MV_U8 data;
+
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+    	/* Read MPP module ID */
+    	DB(mvOsPrintf("Board: Read MPP module ID\n"));
+    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(devClass);
+    	twsiSlave.slaveAddr.type = mvBoardTwsiExpAddrTypeGet(devClass);
+    	twsiSlave.validOffset = MV_TRUE;
+	/* Offset is the first command after the address which indicate the register number to be read 
+	   in next operation */
+    	twsiSlave.offset = 0;
+    	twsiSlave.moreThen256 = MV_FALSE;
+
+
+
+    	if( MV_OK != mvTwsiRead (0, &twsiSlave, &data, 1) )
+    	{
+    		DB(mvOsPrintf("Board: Read MPP module ID fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: Read MPP module ID succeded\n"));
+	
+	return data;
+}
+
+/*******************************************************************************
+* mvBoarTwsiSatRGet - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		device num - one of three devices
+*		reg num - 0 or 1
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		reg value
+*
+*******************************************************************************/
+MV_U8 mvBoarTwsiSatRGet(MV_U8 devNum, MV_U8 regNum)
+{
+    	MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+    	MV_U8 data;
+
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+    	/* Read MPP module ID */
+    	DB(mvOsPrintf("Board: Read S@R device read\n"));
+    	twsiSlave.slaveAddr.address = mvBoardTwsiSatRAddrGet(devNum);
+    	twsiSlave.slaveAddr.type = mvBoardTwsiSatRAddrTypeGet(devNum);
+    	twsiSlave.validOffset = MV_TRUE;
+	/* Use offset as command */
+    	twsiSlave.offset = regNum;
+    	twsiSlave.moreThen256 = MV_FALSE;
+
+    	if( MV_OK != mvTwsiRead (0, &twsiSlave, &data, 1) )
+    	{
+    		DB(mvOsPrintf("Board: Read S@R fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: Read S@R succeded\n"));
+	
+	return data;
+}
+
+/*******************************************************************************
+* mvBoarTwsiSatRSet - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*		devNum - one of three devices
+*		regNum - 0 or 1
+*		regVal - value
+*
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		reg value
+*
+*******************************************************************************/
+MV_STATUS mvBoarTwsiSatRSet(MV_U8 devNum, MV_U8 regNum, MV_U8 regVal)
+{
+    	MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+	
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+    	/* Read MPP module ID */
+    	twsiSlave.slaveAddr.address = mvBoardTwsiSatRAddrGet(devNum);
+    	twsiSlave.slaveAddr.type = mvBoardTwsiSatRAddrTypeGet(devNum);
+    	twsiSlave.validOffset = MV_TRUE;
+    	DB(mvOsPrintf("Board: Write S@R device addr %x, type %x, data %x\n", twsiSlave.slaveAddr.address,\
+								twsiSlave.slaveAddr.type, regVal));
+	/* Use offset as command */
+    	twsiSlave.offset = regNum;
+    	twsiSlave.moreThen256 = MV_FALSE;
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &regVal, 1) )
+    	{
+    		DB(mvOsPrintf("Board: Write S@R fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: Write S@R succeded\n"));
+	
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvBoardSlicGpioPinGet -
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*
+*******************************************************************************/
+MV_32 mvBoardSlicGpioPinGet(MV_U32 slicNum)
+{
+	MV_U32 boardId;
+	boardId = mvBoardIdGet();
+
+	switch (boardId)
+	{
+	case DB_88F6281A_BP_ID:
+	case RD_88F6281A_ID:
+	default:
+		return MV_ERROR;
+		break;
+
+	}
+}
+
+/*******************************************************************************
+* mvBoardFanPowerControl - Turn on/off the fan power control on the RD-6281A
+*
+* DESCRIPTION:
+*
+* INPUT:
+*        mode - MV_TRUE = on ; MV_FALSE = off
+*
+* OUTPUT:
+*       MV_STATUS - MV_OK , MV_ERROR.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_STATUS mvBoardFanPowerControl(MV_BOOL mode)
+{
+
+	MV_U8 val = 1, twsiVal;
+   	MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+	
+	if(mvBoardIdGet() != RD_88F6281A_ID)
+        return MV_ERROR;
+
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+	/* Read MPP module ID */
+    	DB(mvOsPrintf("Board: twsi exp set\n"));
+    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(1);
+    	twsiSlave.slaveAddr.type = ADDR7_BIT;
+    	twsiSlave.validOffset = MV_TRUE;
+	/* Offset is the first command after the address which indicate the register number to be read 
+	   in next operation */
+    	twsiSlave.offset = 3;
+    	twsiSlave.moreThen256 = MV_FALSE;
+        if(mode == MV_TRUE)
+            val = 0x1;
+        else
+            val = 0;
+        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        val = (twsiVal & 0xfe) | val;
+
+        if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
+    	
+	/* Change twsi exp to output */
+    	twsiSlave.offset = 7;
+        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        val = (twsiVal & 0xfe);
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
+        return MV_OK;
+}
+
+/*******************************************************************************
+* mvBoardHDDPowerControl - Turn on/off the HDD power control on the RD-6281A
+*
+* DESCRIPTION:
+*
+* INPUT:
+*        mode - MV_TRUE = on ; MV_FALSE = off
+*
+* OUTPUT:
+*       MV_STATUS - MV_OK , MV_ERROR.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_STATUS mvBoardHDDPowerControl(MV_BOOL mode)
+{
+
+	MV_U8 val = 1, twsiVal;
+   	MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+	
+	if(mvBoardIdGet() != RD_88F6281A_ID)
+        return MV_ERROR;
+
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+	/* Read MPP module ID */
+    	DB(mvOsPrintf("Board: twsi exp set\n"));
+    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(1);
+    	twsiSlave.slaveAddr.type = ADDR7_BIT;
+    	twsiSlave.validOffset = MV_TRUE;
+	/* Offset is the first command after the address which indicate the register number to be read 
+	   in next operation */
+    	twsiSlave.offset = 3;
+    	twsiSlave.moreThen256 = MV_FALSE;
+        if(mode == MV_TRUE)
+            val = 0x2;
+        else
+            val = 0;
+        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        val = (twsiVal & 0xfd) | val;
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
+    	
+	/* Change twsi exp to output */
+    	twsiSlave.offset = 7;
+        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        val = (twsiVal & 0xfd);
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
+        return MV_OK;
+}
+
+/*******************************************************************************
+* mvBoardSDioWPControl - Turn on/off the SDIO WP on the RD-6281A
+*
+* DESCRIPTION:
+*
+* INPUT:
+*        mode - MV_TRUE = on ; MV_FALSE = off
+*
+* OUTPUT:
+*       MV_STATUS - MV_OK , MV_ERROR.
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_STATUS mvBoardSDioWPControl(MV_BOOL mode)
+{
+
+	MV_U8 val = 1, twsiVal;
+   	MV_TWSI_SLAVE twsiSlave;
+	MV_TWSI_ADDR slave;
+	
+	if(mvBoardIdGet() != RD_88F6281A_ID)
+        return MV_ERROR;
+
+	/* TWSI init */    	
+	slave.type = ADDR7_BIT;
+	slave.address = 0;
+	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
+
+	/* Read MPP module ID */
+    	DB(mvOsPrintf("Board: twsi exp set\n"));
+    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(0);
+    	twsiSlave.slaveAddr.type = ADDR7_BIT;
+    	twsiSlave.validOffset = MV_TRUE;
+	/* Offset is the first command after the address which indicate the register number to be read 
+	   in next operation */
+    	twsiSlave.offset = 3;
+    	twsiSlave.moreThen256 = MV_FALSE;
+        if(mode == MV_TRUE)
+            val = 0x10;
+        else
+            val = 0;
+        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        val = (twsiVal & 0xef) | val;
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
+    	
+	/* Change twsi exp to output */
+    	twsiSlave.offset = 7;
+        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
+        val = (twsiVal & 0xef);
+    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
+    	{
+    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
+        	return MV_ERROR;
+    	}
+    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
+        return MV_OK;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h
new file mode 100644
index 00000000..dead6336
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h
@@ -0,0 +1,376 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#ifndef __INCmvBoardEnvLibh
+#define __INCmvBoardEnvLibh
+
+/* defines */
+/* The below constant macros defines the board I2C EEPROM data offsets */
+
+
+
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "mvSysHwConfig.h"
+#include "boardEnv/mvBoardEnvSpec.h"
+
+
+/* DUART stuff for Tclk detection only */
+#define DUART_BAUD_RATE			115200
+#define MAX_CLOCK_MARGINE		5000000	/* Maximum detected clock margine */
+
+/* Voice devices assembly modes */
+#define DAISY_CHAIN_MODE	1
+#define DUAL_CHIP_SELECT_MODE   0
+#define INTERRUPT_TO_MPP        1
+#define INTERRUPT_TO_TDM	0
+
+
+#define BOARD_ETH_PORT_NUM  MV_ETH_MAX_PORTS
+#define BOARD_ETH_SWITCH_PORT_NUM	5
+
+#define	MV_BOARD_MAX_USB_IF		1
+#define MV_BOARD_MAX_MPP		7
+#define MV_BOARD_NAME_LEN  		0x20
+
+typedef struct _boardData
+{
+   MV_U32 magic;
+   MV_U16 boardId;
+   MV_U8 boardVer;
+   MV_U8 boardRev;
+   MV_U32 reserved1;
+   MV_U32 reserved2;
+
+}BOARD_DATA;
+
+typedef enum _devBoardMppGroupClass
+{
+	MV_BOARD_MPP_GROUP_1,
+	MV_BOARD_MPP_GROUP_2,
+	MV_BOARD_MAX_MPP_GROUP
+}MV_BOARD_MPP_GROUP_CLASS;
+
+typedef enum _devBoardMppTypeClass
+{
+	MV_BOARD_AUTO,
+	MV_BOARD_TDM,
+	MV_BOARD_AUDIO,
+	MV_BOARD_RGMII,
+	MV_BOARD_GMII,
+	MV_BOARD_TS,
+	MV_BOARD_MII,
+	MV_BOARD_OTHER
+}MV_BOARD_MPP_TYPE_CLASS;
+
+typedef enum _devBoardModuleIdClass
+{
+	MV_BOARD_MODULE_TDM_ID = 1,
+	MV_BOARD_MODULE_AUDIO_ID,
+	MV_BOARD_MODULE_RGMII_ID,
+	MV_BOARD_MODULE_GMII_ID,
+	MV_BOARD_MODULE_TS_ID,
+	MV_BOARD_MODULE_MII_ID,
+	MV_BOARD_MODULE_TDM_5CHAN_ID,
+	MV_BOARD_MODULE_OTHER_ID
+}MV_BOARD_MODULE_ID_CLASS;
+
+typedef struct _boardMppTypeInfo
+{
+	MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1;
+	MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2;
+
+}MV_BOARD_MPP_TYPE_INFO;
+
+
+typedef enum _devBoardClass
+{
+	BOARD_DEV_NOR_FLASH,
+	BOARD_DEV_NAND_FLASH,
+	BOARD_DEV_SEVEN_SEG,
+	BOARD_DEV_FPGA,
+	BOARD_DEV_SRAM,
+	BOARD_DEV_SPI_FLASH,
+	BOARD_DEV_OTHER,
+}MV_BOARD_DEV_CLASS;
+
+typedef enum _devTwsiBoardClass
+{
+	BOARD_TWSI_RTC,
+	BOARD_DEV_TWSI_EXP,
+	BOARD_DEV_TWSI_SATR,
+	BOARD_TWSI_AUDIO_DEC,
+	BOARD_TWSI_OTHER
+}MV_BOARD_TWSI_CLASS;
+	
+typedef enum _devGppBoardClass
+{
+	BOARD_GPP_RTC,
+	BOARD_GPP_MV_SWITCH,
+	BOARD_GPP_USB_VBUS,
+	BOARD_GPP_USB_VBUS_EN,
+	BOARD_GPP_USB_OC,
+	BOARD_GPP_USB_HOST_DEVICE,
+	BOARD_GPP_REF_CLCK,
+	BOARD_GPP_VOIP_SLIC,
+	BOARD_GPP_LIFELINE,
+	BOARD_GPP_BUTTON,
+	BOARD_GPP_TS_BUTTON_C,
+	BOARD_GPP_TS_BUTTON_U,
+	BOARD_GPP_TS_BUTTON_D,
+	BOARD_GPP_TS_BUTTON_L,
+	BOARD_GPP_TS_BUTTON_R,
+	BOARD_GPP_POWER_BUTTON,
+	BOARD_GPP_RESTOR_BUTTON,
+	BOARD_GPP_WPS_BUTTON,
+	BOARD_GPP_HDD0_POWER,
+	BOARD_GPP_HDD1_POWER,
+	BOARD_GPP_FAN_POWER,
+	BOARD_GPP_RESET,
+	BOARD_GPP_POWER_ON_LED,
+	BOARD_GPP_HDD_POWER,
+    BOARD_GPP_SDIO_POWER,
+    BOARD_GPP_SDIO_DETECT,
+    BOARD_GPP_SDIO_WP,
+	BOARD_GPP_SWITCH_PHY_INT,
+	BOARD_GPP_TSU_DIRCTION,
+	BOARD_GPP_OTHER
+}MV_BOARD_GPP_CLASS;
+
+
+typedef struct _devCsInfo
+{
+    MV_U8		deviceCS;
+    MV_U32		params;
+    MV_U32		devClass;	/* MV_BOARD_DEV_CLASS */
+    MV_U8		devWidth;
+
+}MV_DEV_CS_INFO;
+
+
+#define MV_BOARD_PHY_FORCE_10MB		0x0
+#define MV_BOARD_PHY_FORCE_100MB	0x1
+#define MV_BOARD_PHY_FORCE_1000MB	0x2
+#define MV_BOARD_PHY_SPEED_AUTO		0x3
+
+typedef struct _boardSwitchInfo
+{
+	MV_32	linkStatusIrq;
+	MV_32	qdPort[BOARD_ETH_SWITCH_PORT_NUM];
+	MV_32	qdCpuPort;
+	MV_32	smiScanMode; /* 1 for SMI_MANUAL_MODE, 0 otherwise */
+	MV_32	switchOnPort;
+
+}MV_BOARD_SWITCH_INFO;
+
+typedef struct _boardLedInfo
+{
+	MV_U8	activeLedsNumber;
+	MV_U8	ledsPolarity;	/* '0' or '1' to turn on led */
+	MV_U8*	gppPinNum; 	/* Pointer to GPP values */
+
+}MV_BOARD_LED_INFO;
+
+typedef struct _boardGppInfo
+{
+	MV_BOARD_GPP_CLASS	devClass;
+	MV_U8	gppPinNum;
+
+}MV_BOARD_GPP_INFO;
+
+
+typedef struct _boardTwsiInfo
+{
+	MV_BOARD_TWSI_CLASS	devClass;
+	MV_U8	twsiDevAddr;
+	MV_U8	twsiDevAddrType;
+
+}MV_BOARD_TWSI_INFO;
+
+
+typedef enum _boardMacSpeed
+{
+	BOARD_MAC_SPEED_10M,
+	BOARD_MAC_SPEED_100M,
+	BOARD_MAC_SPEED_1000M,
+	BOARD_MAC_SPEED_AUTO,
+
+}MV_BOARD_MAC_SPEED;
+
+typedef struct _boardMacInfo
+{
+	MV_BOARD_MAC_SPEED	boardMacSpeed;
+	MV_U8	boardEthSmiAddr;
+
+}MV_BOARD_MAC_INFO;
+
+typedef struct _boardMppInfo
+{
+	MV_U32		mppGroup[MV_BOARD_MAX_MPP];
+
+}MV_BOARD_MPP_INFO;
+
+typedef struct _boardInfo
+{
+	char 			   	boardName[MV_BOARD_NAME_LEN];
+	MV_U8				numBoardMppTypeValue;
+	MV_BOARD_MPP_TYPE_INFO*		pBoardMppTypeValue;
+	MV_U8				numBoardMppConfigValue;
+	MV_BOARD_MPP_INFO*		pBoardMppConfigValue;
+    	MV_U32				intsGppMaskLow;
+	MV_U32				intsGppMaskHigh;
+	MV_U8				numBoardDeviceIf;
+    	MV_DEV_CS_INFO*			pDevCsInfo;
+	MV_U8				numBoardTwsiDev;
+	MV_BOARD_TWSI_INFO*		pBoardTwsiDev;
+	MV_U8				numBoardMacInfo;
+	MV_BOARD_MAC_INFO*		pBoardMacInfo;
+	MV_U8				numBoardGppInfo;
+	MV_BOARD_GPP_INFO*		pBoardGppInfo;
+    	MV_U8				activeLedsNumber;
+	MV_U8*				pLedGppPin;
+	MV_U8				ledsPolarity;	/* '0' or '1' to turn on led */
+	/* GPP values */
+	MV_U32				gppOutEnValLow;
+	MV_U32				gppOutEnValHigh;
+	MV_U32				gppOutValLow;
+	MV_U32				gppOutValHigh;
+	MV_U32				gppPolarityValLow;
+	MV_U32				gppPolarityValHigh;
+
+	/* Switch Configuration */
+	MV_BOARD_SWITCH_INFO*		pSwitchInfo;
+}MV_BOARD_INFO;
+
+
+
+MV_VOID 	mvBoardEnvInit(MV_VOID);
+MV_U32      	mvBoardIdGet(MV_VOID);
+MV_U16      	mvBoardModelGet(MV_VOID);
+MV_U16      	mvBoardRevGet(MV_VOID);
+MV_STATUS	mvBoardNameGet(char *pNameBuff);
+MV_32      	mvBoardPhyAddrGet(MV_U32 ethPortNum);
+MV_BOARD_MAC_SPEED      mvBoardMacSpeedGet(MV_U32 ethPortNum);
+MV_32		mvBoardLinkStatusIrqGet(MV_U32 ethPortNum);
+MV_32		mvBoardSwitchPortGet(MV_U32 ethPortNum, MV_U8 boardPortNum);
+MV_32		mvBoardSwitchCpuPortGet(MV_U32 ethPortNum);
+MV_32		mvBoardIsSwitchConnected(MV_U32 ethPortNum);
+MV_32		mvBoardSmiScanModeGet(MV_U32 ethPortNum);
+MV_BOOL     	mvBoardIsPortInSgmii(MV_U32 ethPortNum);
+MV_BOOL 	mvBoardIsPortInGmii(MV_VOID);
+MV_U32 		mvBoardTclkGet(MV_VOID);
+MV_U32      	mvBoardSysClkGet(MV_VOID);
+MV_U32 		mvBoardDebugLedNumGet(MV_U32 boardId);
+MV_VOID     	mvBoardDebugLed(MV_U32 hexNum);
+MV_32      	mvBoardMppGet(MV_U32 mppGroupNum);
+
+MV_U8		mvBoardRtcTwsiAddrTypeGet(MV_VOID);
+MV_U8		mvBoardRtcTwsiAddrGet(MV_VOID);
+
+MV_U8		mvBoardA2DTwsiAddrTypeGet(MV_VOID);
+MV_U8		mvBoardA2DTwsiAddrGet(MV_VOID);
+
+MV_U8 		mvBoardTwsiExpAddrGet(MV_U32 index);
+MV_U8 		mvBoardTwsiSatRAddrTypeGet(MV_U32 index);
+MV_U8 		mvBoardTwsiSatRAddrGet(MV_U32 index);
+MV_U8 		mvBoardTwsiExpAddrTypeGet(MV_U32 index);
+MV_BOARD_MODULE_ID_CLASS 	mvBoarModuleTypeGet(MV_BOARD_MPP_GROUP_CLASS devClass);
+MV_BOARD_MPP_TYPE_CLASS 	mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass);
+MV_VOID 	mvBoardMppGroupTypeSet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass,
+						MV_BOARD_MPP_TYPE_CLASS mppGroupType);
+MV_VOID 	mvBoardMppGroupIdUpdate(MV_VOID);
+MV_VOID 	mvBoardMppMuxSet(MV_VOID);
+MV_VOID 	mvBoardTdmMppSet(MV_32 chType);
+MV_VOID 	mvBoardVoiceConnModeGet(MV_32* connMode, MV_32* irqMode);
+
+MV_VOID 	mvBoardMppModuleTypePrint(MV_VOID);
+MV_VOID	    	mvBoardReset(MV_VOID);
+MV_U8 		mvBoarTwsiSatRGet(MV_U8 devNum, MV_U8 regNum);
+MV_STATUS 		mvBoarTwsiSatRSet(MV_U8 devNum, MV_U8 regNum, MV_U8 regVal);
+MV_BOOL 	mvBoardSpecInitGet(MV_U32* regOff, MV_U32* data);
+/* Board devices API managments */
+MV_32  	    mvBoardGetDevicesNumber(MV_BOARD_DEV_CLASS devClass);
+MV_32  	    mvBoardGetDeviceBaseAddr(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
+MV_32	    mvBoardGetDeviceBusWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
+MV_32  	    mvBoardGetDeviceWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
+MV_32  	    mvBoardGetDeviceWinSize(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
+MV_U32 	    boardGetDevCSNum(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
+
+/* Gpio Pin Connections API */
+MV_32 	    mvBoardUSBVbusGpioPinGet(int devId);
+MV_32 	    mvBoardUSBVbusEnGpioPinGet(int devId);
+MV_U32      mvBoardPexBridgeIntPinGet(MV_U32 devNum, MV_U32 intPin);
+
+MV_32	    mvBoardResetGpioPinGet(MV_VOID);
+MV_32 	    mvBoardRTCGpioPinGet(MV_VOID);
+MV_32 	    mvBoardGpioIntMaskLowGet(MV_VOID);
+MV_32 	    mvBoardGpioIntMaskHighGet(MV_VOID);
+MV_32 	    mvBoardSlicGpioPinGet(MV_U32 slicNum);
+
+MV_32	    mvBoardSDIOGpioPinGet(MV_VOID);
+MV_STATUS   mvBoardSDioWPControl(MV_BOOL mode);
+MV_32	    mvBoarGpioPinNumGet(MV_BOARD_GPP_CLASS class, MV_U32 index);
+
+MV_32 	    mvBoardNandWidthGet(void);
+MV_STATUS   mvBoardFanPowerControl(MV_BOOL mode);
+MV_STATUS   mvBoardHDDPowerControl(MV_BOOL mode);
+#endif /* __INCmvBoardEnvLibh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c
new file mode 100644
index 00000000..e256c4f7
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c
@@ -0,0 +1,848 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#include "mvCommon.h"
+#include "mvBoardEnvLib.h"
+#include "mvBoardEnvSpec.h"
+#include "twsi/mvTwsi.h"
+
+#define DB_88F6281A_BOARD_PCI_IF_NUM            0x0
+#define DB_88F6281A_BOARD_TWSI_DEF_NUM		    0x7
+#define DB_88F6281A_BOARD_MAC_INFO_NUM		    0x2
+#define DB_88F6281A_BOARD_GPP_INFO_NUM		    0x3
+#define DB_88F6281A_BOARD_MPP_CONFIG_NUM		0x1
+#define DB_88F6281A_BOARD_MPP_GROUP_TYPE_NUM	0x1
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+    #define DB_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+    #define DB_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x2
+#else
+    #define DB_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
+#endif
+#define DB_88F6281A_BOARD_DEBUG_LED_NUM		    0x0
+
+
+MV_BOARD_TWSI_INFO	db88f6281AInfoBoardTwsiDev[] =
+	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
+	{
+	{BOARD_DEV_TWSI_EXP, 0x20, ADDR7_BIT},
+	{BOARD_DEV_TWSI_EXP, 0x21, ADDR7_BIT},
+	{BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT},
+	{BOARD_DEV_TWSI_SATR, 0x4C, ADDR7_BIT},
+	{BOARD_DEV_TWSI_SATR, 0x4D, ADDR7_BIT},
+	{BOARD_DEV_TWSI_SATR, 0x4E, ADDR7_BIT},
+	{BOARD_TWSI_AUDIO_DEC, 0x4A, ADDR7_BIT}
+	};
+
+MV_BOARD_MAC_INFO db88f6281AInfoBoardMacInfo[] = 
+	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
+	{
+	{BOARD_MAC_SPEED_AUTO, 0x8},
+	{BOARD_MAC_SPEED_AUTO, 0x9}
+	}; 
+
+MV_BOARD_MPP_TYPE_INFO db88f6281AInfoBoardMppTypeInfo[] = 
+	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
+ 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
+	{{MV_BOARD_AUTO, MV_BOARD_AUTO}
+	}; 
+
+MV_BOARD_GPP_INFO db88f6281AInfoBoardGppInfo[] = 
+	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
+	{
+	{BOARD_GPP_TSU_DIRCTION, 33}
+	/*muxed with TDM/Audio module via IOexpender
+	{BOARD_GPP_SDIO_DETECT, 38},
+	{BOARD_GPP_USB_VBUS, 49}*/
+	};
+
+MV_DEV_CS_INFO db88f6281AInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */         
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+		 {
+         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
+         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
+         };
+#else
+	 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
+#endif
+
+MV_BOARD_MPP_INFO	db88f6281AInfoBoardMppConfigValue[] = 
+	{{{
+	DB_88F6281A_MPP0_7,		
+	DB_88F6281A_MPP8_15,		
+	DB_88F6281A_MPP16_23,		
+	DB_88F6281A_MPP24_31,		
+	DB_88F6281A_MPP32_39,		
+	DB_88F6281A_MPP40_47,		
+	DB_88F6281A_MPP48_55		
+	}}};
+
+
+MV_BOARD_INFO db88f6281AInfo = {
+	"DB-88F6281A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
+	DB_88F6281A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
+	db88f6281AInfoBoardMppTypeInfo,
+	DB_88F6281A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	db88f6281AInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	0,						/* intsGppMaskHigh */
+	DB_88F6281A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	db88f6281AInfoBoardDeCsInfo,
+	DB_88F6281A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
+	db88f6281AInfoBoardTwsiDev,					
+	DB_88F6281A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
+	db88f6281AInfoBoardMacInfo,
+	DB_88F6281A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
+	db88f6281AInfoBoardGppInfo,
+	DB_88F6281A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	NULL,
+	0,						/* ledsPolarity */		
+	DB_88F6281A_OE_LOW,				/* gppOutEnLow */
+	DB_88F6281A_OE_HIGH,				/* gppOutEnHigh */
+	DB_88F6281A_OE_VAL_LOW,				/* gppOutValLow */
+	DB_88F6281A_OE_VAL_HIGH,				/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	BIT6, 						/* gppPolarityValHigh */
+	NULL						/* pSwitchInfo */
+};
+
+
+#define RD_88F6281A_BOARD_PCI_IF_NUM		0x0
+#define RD_88F6281A_BOARD_TWSI_DEF_NUM		0x2
+#define RD_88F6281A_BOARD_MAC_INFO_NUM		0x2
+#define RD_88F6281A_BOARD_GPP_INFO_NUM		0x5
+#define RD_88F6281A_BOARD_MPP_GROUP_TYPE_NUM	0x1
+#define RD_88F6281A_BOARD_MPP_CONFIG_NUM		0x1
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+    #define RD_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+    #define RD_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x2
+#else
+    #define RD_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
+#endif
+#define RD_88F6281A_BOARD_DEBUG_LED_NUM		0x0
+
+MV_BOARD_MAC_INFO rd88f6281AInfoBoardMacInfo[] = 
+	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
+	{{BOARD_MAC_SPEED_1000M, 0xa},
+    {BOARD_MAC_SPEED_AUTO, 0xb}
+	}; 
+
+MV_BOARD_SWITCH_INFO rd88f6281AInfoBoardSwitchInfo[] = 
+	/* MV_32 linkStatusIrq, {MV_32 qdPort0, MV_32 qdPort1, MV_32 qdPort2, MV_32 qdPort3, MV_32 qdPort4}, 
+		MV_32 qdCpuPort, MV_32 smiScanMode, MV_32 switchOnPort} */
+	{{38, {0, 1, 2, 3, -1}, 5, 2, 0},
+	 {-1, {-1}, -1, -1, -1}};
+
+MV_BOARD_TWSI_INFO	rd88f6281AInfoBoardTwsiDev[] =
+	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
+	{
+	{BOARD_DEV_TWSI_EXP, 0xFF, ADDR7_BIT}, /* dummy entry to align with modules indexes */
+	{BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT}
+	};
+
+MV_BOARD_MPP_TYPE_INFO rd88f6281AInfoBoardMppTypeInfo[] = 
+	{{MV_BOARD_RGMII, MV_BOARD_TDM}
+	}; 
+
+MV_DEV_CS_INFO rd88f6281AInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+		 {
+         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
+         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
+         };
+#else
+		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
+#endif
+
+MV_BOARD_GPP_INFO rd88f6281AInfoBoardGppInfo[] = 
+	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
+	{{BOARD_GPP_SDIO_DETECT, 28},
+    {BOARD_GPP_USB_OC, 29},
+    {BOARD_GPP_WPS_BUTTON, 35},
+    {BOARD_GPP_MV_SWITCH, 38},
+    {BOARD_GPP_USB_VBUS, 49}
+	};
+
+MV_BOARD_MPP_INFO	rd88f6281AInfoBoardMppConfigValue[] = 
+	{{{
+	RD_88F6281A_MPP0_7,		
+	RD_88F6281A_MPP8_15,		
+	RD_88F6281A_MPP16_23,		
+	RD_88F6281A_MPP24_31,		
+	RD_88F6281A_MPP32_39,		
+	RD_88F6281A_MPP40_47,		
+	RD_88F6281A_MPP48_55		
+	}}};
+
+MV_BOARD_INFO rd88f6281AInfo = {
+	"RD-88F6281A",				/* boardName[MAX_BOARD_NAME_LEN] */
+	RD_88F6281A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
+	rd88f6281AInfoBoardMppTypeInfo,
+	RD_88F6281A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	rd88f6281AInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	(1 << 3),					/* intsGppMaskHigh */
+	RD_88F6281A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	rd88f6281AInfoBoardDeCsInfo,
+	RD_88F6281A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
+	rd88f6281AInfoBoardTwsiDev,					
+	RD_88F6281A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
+	rd88f6281AInfoBoardMacInfo,
+	RD_88F6281A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
+	rd88f6281AInfoBoardGppInfo,
+	RD_88F6281A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	NULL,
+	0,										/* ledsPolarity */		
+	RD_88F6281A_OE_LOW,				/* gppOutEnLow */
+	RD_88F6281A_OE_HIGH,				/* gppOutEnHigh */
+	RD_88F6281A_OE_VAL_LOW,				/* gppOutValLow */
+	RD_88F6281A_OE_VAL_HIGH,				/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	BIT6, 						/* gppPolarityValHigh */
+	rd88f6281AInfoBoardSwitchInfo			/* pSwitchInfo */
+};
+
+
+#define DB_88F6192A_BOARD_PCI_IF_NUM            0x0
+#define DB_88F6192A_BOARD_TWSI_DEF_NUM		    0x7
+#define DB_88F6192A_BOARD_MAC_INFO_NUM		    0x2
+#define DB_88F6192A_BOARD_GPP_INFO_NUM		    0x3
+#define DB_88F6192A_BOARD_MPP_GROUP_TYPE_NUM	0x1
+#define DB_88F6192A_BOARD_MPP_CONFIG_NUM		0x1
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+    #define DB_88F6192A_BOARD_DEVICE_CONFIG_NUM	    0x1
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+    #define DB_88F6192A_BOARD_DEVICE_CONFIG_NUM	    0x2
+#else
+    #define DB_88F6192A_BOARD_DEVICE_CONFIG_NUM	    0x1
+#endif
+#define DB_88F6192A_BOARD_DEBUG_LED_NUM		    0x0
+
+MV_BOARD_TWSI_INFO	db88f6192AInfoBoardTwsiDev[] =
+	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
+	{
+	{BOARD_DEV_TWSI_EXP, 0x20, ADDR7_BIT},
+	{BOARD_DEV_TWSI_EXP, 0x21, ADDR7_BIT},
+	{BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT},
+	{BOARD_DEV_TWSI_SATR, 0x4C, ADDR7_BIT},
+	{BOARD_DEV_TWSI_SATR, 0x4D, ADDR7_BIT},
+	{BOARD_DEV_TWSI_SATR, 0x4E, ADDR7_BIT},
+	{BOARD_TWSI_AUDIO_DEC, 0x4A, ADDR7_BIT}
+	};
+
+MV_BOARD_MAC_INFO db88f6192AInfoBoardMacInfo[] = 
+	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
+	{
+	{BOARD_MAC_SPEED_AUTO, 0x8},
+	{BOARD_MAC_SPEED_AUTO, 0x9}
+	}; 
+
+MV_BOARD_MPP_TYPE_INFO db88f6192AInfoBoardMppTypeInfo[] = 
+	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
+ 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
+	{{MV_BOARD_AUTO, MV_BOARD_OTHER}
+	}; 
+
+MV_DEV_CS_INFO db88f6192AInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+		 {
+         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
+         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
+         };
+#else
+		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
+#endif
+
+MV_BOARD_GPP_INFO db88f6192AInfoBoardGppInfo[] = 
+	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
+	{
+    {BOARD_GPP_SDIO_WP, 20},
+	{BOARD_GPP_USB_VBUS, 22},
+	{BOARD_GPP_SDIO_DETECT, 23},
+	};
+
+MV_BOARD_MPP_INFO	db88f6192AInfoBoardMppConfigValue[] = 
+	{{{
+	DB_88F6192A_MPP0_7,		
+	DB_88F6192A_MPP8_15,		
+	DB_88F6192A_MPP16_23,		
+	DB_88F6192A_MPP24_31,		
+	DB_88F6192A_MPP32_35
+	}}};
+
+MV_BOARD_INFO db88f6192AInfo = {
+	"DB-88F6192A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
+	DB_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
+	db88f6192AInfoBoardMppTypeInfo,
+	DB_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	db88f6192AInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	(1 << 3),					/* intsGppMaskHigh */
+	DB_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	db88f6192AInfoBoardDeCsInfo,
+	DB_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
+	db88f6192AInfoBoardTwsiDev,					
+	DB_88F6192A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
+	db88f6192AInfoBoardMacInfo,
+	DB_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
+	db88f6192AInfoBoardGppInfo,
+	DB_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	NULL,
+	0,										/* ledsPolarity */		
+	DB_88F6192A_OE_LOW,				/* gppOutEnLow */
+	DB_88F6192A_OE_HIGH,				/* gppOutEnHigh */
+	DB_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
+	DB_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	0, 						/* gppPolarityValHigh */
+	NULL						/* pSwitchInfo */
+};
+
+#define DB_88F6190A_BOARD_MAC_INFO_NUM		0x1
+
+MV_BOARD_INFO db88f6190AInfo = {
+	"DB-88F6190A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
+	DB_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
+	db88f6192AInfoBoardMppTypeInfo,
+	DB_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	db88f6192AInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	(1 << 3),					/* intsGppMaskHigh */
+	DB_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	db88f6192AInfoBoardDeCsInfo,
+	DB_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
+	db88f6192AInfoBoardTwsiDev,					
+	DB_88F6190A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
+	db88f6192AInfoBoardMacInfo,
+	DB_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
+	db88f6192AInfoBoardGppInfo,
+	DB_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	NULL,
+	0,										/* ledsPolarity */		
+	DB_88F6192A_OE_LOW,				/* gppOutEnLow */
+	DB_88F6192A_OE_HIGH,				/* gppOutEnHigh */
+	DB_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
+	DB_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	0, 						/* gppPolarityValHigh */
+	NULL						/* pSwitchInfo */
+};
+
+#define RD_88F6192A_BOARD_PCI_IF_NUM		0x0
+#define RD_88F6192A_BOARD_TWSI_DEF_NUM		0x0
+#define RD_88F6192A_BOARD_MAC_INFO_NUM		0x1
+#define RD_88F6192A_BOARD_GPP_INFO_NUM		0xE
+#define RD_88F6192A_BOARD_MPP_GROUP_TYPE_NUM	0x1
+#define RD_88F6192A_BOARD_MPP_CONFIG_NUM		0x1
+#define RD_88F6192A_BOARD_DEVICE_CONFIG_NUM	0x1
+#define RD_88F6192A_BOARD_DEBUG_LED_NUM		0x3
+
+MV_U8	rd88f6192AInfoBoardDebugLedIf[] =
+	{17, 28, 29};
+
+MV_BOARD_MAC_INFO rd88f6192AInfoBoardMacInfo[] = 
+	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
+	{{BOARD_MAC_SPEED_AUTO, 0x8}
+	}; 
+
+MV_BOARD_MPP_TYPE_INFO rd88f6192AInfoBoardMppTypeInfo[] = 
+	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
+ 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
+	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
+	}; 
+
+MV_DEV_CS_INFO rd88f6192AInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */
+
+MV_BOARD_GPP_INFO rd88f6192AInfoBoardGppInfo[] = 
+	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
+	{
+	{BOARD_GPP_USB_VBUS_EN, 10},
+	{BOARD_GPP_USB_HOST_DEVICE, 11},
+	{BOARD_GPP_RESET, 14},
+	{BOARD_GPP_POWER_ON_LED, 15},
+	{BOARD_GPP_HDD_POWER, 16},
+	{BOARD_GPP_WPS_BUTTON, 24},
+	{BOARD_GPP_TS_BUTTON_C, 25},
+	{BOARD_GPP_USB_VBUS, 26},
+	{BOARD_GPP_USB_OC, 27},
+	{BOARD_GPP_TS_BUTTON_U, 30},
+	{BOARD_GPP_TS_BUTTON_R, 31},
+	{BOARD_GPP_TS_BUTTON_L, 32},
+	{BOARD_GPP_TS_BUTTON_D, 34},
+	{BOARD_GPP_FAN_POWER, 35}
+	};
+
+MV_BOARD_MPP_INFO	rd88f6192AInfoBoardMppConfigValue[] = 
+	{{{
+	RD_88F6192A_MPP0_7,		
+	RD_88F6192A_MPP8_15,		
+	RD_88F6192A_MPP16_23,		
+	RD_88F6192A_MPP24_31,		
+	RD_88F6192A_MPP32_35
+	}}};
+
+MV_BOARD_INFO rd88f6192AInfo = {
+	"RD-88F6192A-NAS",				/* boardName[MAX_BOARD_NAME_LEN] */
+	RD_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
+	rd88f6192AInfoBoardMppTypeInfo,
+	RD_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	rd88f6192AInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	(1 << 3),					/* intsGppMaskHigh */
+	RD_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	rd88f6192AInfoBoardDeCsInfo,
+	RD_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
+	NULL,					
+	RD_88F6192A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
+	rd88f6192AInfoBoardMacInfo,
+	RD_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
+	rd88f6192AInfoBoardGppInfo,
+	RD_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	rd88f6192AInfoBoardDebugLedIf,
+	0,										/* ledsPolarity */		
+	RD_88F6192A_OE_LOW,				/* gppOutEnLow */
+	RD_88F6192A_OE_HIGH,				/* gppOutEnHigh */
+	RD_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
+	RD_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	0, 						/* gppPolarityValHigh */
+	NULL						/* pSwitchInfo */
+};
+
+MV_BOARD_INFO rd88f6190AInfo = {
+	"RD-88F6190A-NAS",				/* boardName[MAX_BOARD_NAME_LEN] */
+	RD_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
+	rd88f6192AInfoBoardMppTypeInfo,
+	RD_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	rd88f6192AInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	(1 << 3),					/* intsGppMaskHigh */
+	RD_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	rd88f6192AInfoBoardDeCsInfo,
+	RD_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
+	NULL,					
+	RD_88F6192A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
+	rd88f6192AInfoBoardMacInfo,
+	RD_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
+	rd88f6192AInfoBoardGppInfo,
+	RD_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	rd88f6192AInfoBoardDebugLedIf,
+	0,										/* ledsPolarity */		
+	RD_88F6192A_OE_LOW,				/* gppOutEnLow */
+	RD_88F6192A_OE_HIGH,				/* gppOutEnHigh */
+	RD_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
+	RD_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	0, 						/* gppPolarityValHigh */
+	NULL						/* pSwitchInfo */
+};
+
+#define DB_88F6180A_BOARD_PCI_IF_NUM		0x0
+#define DB_88F6180A_BOARD_TWSI_DEF_NUM		0x5
+#define DB_88F6180A_BOARD_MAC_INFO_NUM		0x1
+#define DB_88F6180A_BOARD_GPP_INFO_NUM		0x0
+#define DB_88F6180A_BOARD_MPP_GROUP_TYPE_NUM	0x2
+#define DB_88F6180A_BOARD_MPP_CONFIG_NUM		0x1
+#define DB_88F6180A_BOARD_DEVICE_CONFIG_NUM	    0x1
+#define DB_88F6180A_BOARD_DEBUG_LED_NUM		0x0
+
+MV_BOARD_TWSI_INFO	db88f6180AInfoBoardTwsiDev[] =
+	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
+	{
+    {BOARD_DEV_TWSI_EXP, 0x20, ADDR7_BIT},
+    {BOARD_DEV_TWSI_EXP, 0x21, ADDR7_BIT},
+    {BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT},
+	{BOARD_DEV_TWSI_SATR, 0x4C, ADDR7_BIT},
+	{BOARD_TWSI_AUDIO_DEC, 0x4A, ADDR7_BIT}
+	};
+
+MV_BOARD_MAC_INFO db88f6180AInfoBoardMacInfo[] = 
+	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
+	{{BOARD_MAC_SPEED_AUTO, 0x8}
+	}; 
+
+MV_BOARD_GPP_INFO db88f6180AInfoBoardGppInfo[] = 
+	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
+	{
+	/* Muxed with TDM/Audio module via IOexpender
+	{BOARD_GPP_USB_VBUS, 6} */
+	};
+
+MV_BOARD_MPP_TYPE_INFO db88f6180AInfoBoardMppTypeInfo[] = 
+	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
+ 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
+	{{MV_BOARD_OTHER, MV_BOARD_AUTO}
+	}; 
+
+MV_DEV_CS_INFO db88f6180AInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+#if defined(MV_NAND_BOOT)
+		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */         
+#else
+		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
+#endif
+
+MV_BOARD_MPP_INFO	db88f6180AInfoBoardMppConfigValue[] = 
+	{{{
+	DB_88F6180A_MPP0_7,		
+	DB_88F6180A_MPP8_15,
+    DB_88F6180A_MPP16_23,
+    DB_88F6180A_MPP24_31,		
+    DB_88F6180A_MPP32_39,
+    DB_88F6180A_MPP40_44
+	}}};
+
+MV_BOARD_INFO db88f6180AInfo = {
+	"DB-88F6180A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
+	DB_88F6180A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
+	db88f6180AInfoBoardMppTypeInfo,
+	DB_88F6180A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	db88f6180AInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	0,					/* intsGppMaskHigh */
+	DB_88F6180A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	db88f6180AInfoBoardDeCsInfo,
+	DB_88F6180A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
+	db88f6180AInfoBoardTwsiDev,					
+	DB_88F6180A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
+	db88f6180AInfoBoardMacInfo,
+	DB_88F6180A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
+	NULL,
+	DB_88F6180A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	NULL,
+	0,										/* ledsPolarity */		
+	DB_88F6180A_OE_LOW,				/* gppOutEnLow */
+	DB_88F6180A_OE_HIGH,				/* gppOutEnHigh */
+	DB_88F6180A_OE_VAL_LOW,				/* gppOutValLow */
+	DB_88F6180A_OE_VAL_HIGH,				/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	0, 						/* gppPolarityValHigh */
+	NULL						/* pSwitchInfo */
+};
+
+
+#define RD_88F6281A_PCAC_BOARD_PCI_IF_NUM		0x0
+#define RD_88F6281A_PCAC_BOARD_TWSI_DEF_NUM		0x1
+#define RD_88F6281A_PCAC_BOARD_MAC_INFO_NUM		0x1
+#define RD_88F6281A_PCAC_BOARD_GPP_INFO_NUM		0x0
+#define RD_88F6281A_PCAC_BOARD_MPP_GROUP_TYPE_NUM	0x1
+#define RD_88F6281A_PCAC_BOARD_MPP_CONFIG_NUM		0x1
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+    #define RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM	    0x1
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+    #define RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM	    0x2
+#else
+    #define RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM	    0x1
+#endif
+#define RD_88F6281A_PCAC_BOARD_DEBUG_LED_NUM		0x4
+
+MV_U8	rd88f6281APcacInfoBoardDebugLedIf[] =
+	{38, 39, 40, 41};
+
+MV_BOARD_MAC_INFO rd88f6281APcacInfoBoardMacInfo[] = 
+	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
+	{{BOARD_MAC_SPEED_AUTO, 0x8}
+	}; 
+
+MV_BOARD_TWSI_INFO	rd88f6281APcacInfoBoardTwsiDev[] =
+	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
+	{
+	{BOARD_TWSI_OTHER, 0xa7, ADDR7_BIT}
+	};
+
+MV_BOARD_MPP_TYPE_INFO rd88f6281APcacInfoBoardMppTypeInfo[] = 
+	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
+	}; 
+
+MV_DEV_CS_INFO rd88f6281APcacInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+		 {
+         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
+         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
+         };
+#else
+	 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
+#endif
+
+MV_BOARD_MPP_INFO	rd88f6281APcacInfoBoardMppConfigValue[] = 
+	{{{
+	RD_88F6281A_PCAC_MPP0_7,		
+	RD_88F6281A_PCAC_MPP8_15,		
+	RD_88F6281A_PCAC_MPP16_23,		
+	RD_88F6281A_PCAC_MPP24_31,		
+	RD_88F6281A_PCAC_MPP32_39,		
+	RD_88F6281A_PCAC_MPP40_47,		
+	RD_88F6281A_PCAC_MPP48_55		
+	}}};
+
+MV_BOARD_INFO rd88f6281APcacInfo = {
+	"RD-88F6281A-PCAC",				/* boardName[MAX_BOARD_NAME_LEN] */
+	RD_88F6281A_PCAC_BOARD_MPP_GROUP_TYPE_NUM,	/* numBoardMppGroupType */
+	rd88f6281APcacInfoBoardMppTypeInfo,
+	RD_88F6281A_PCAC_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
+	rd88f6281APcacInfoBoardMppConfigValue,
+	0,						/* intsGppMaskLow */
+	(1 << 3),					/* intsGppMaskHigh */
+	RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM,	/* numBoardDevIf */
+	rd88f6281APcacInfoBoardDeCsInfo,
+	RD_88F6281A_PCAC_BOARD_TWSI_DEF_NUM,		/* numBoardTwsiDev */
+	rd88f6281APcacInfoBoardTwsiDev,					
+	RD_88F6281A_PCAC_BOARD_MAC_INFO_NUM,		/* numBoardMacInfo */
+	rd88f6281APcacInfoBoardMacInfo,
+	RD_88F6281A_PCAC_BOARD_GPP_INFO_NUM,		/* numBoardGppInfo */
+	0,
+	RD_88F6281A_PCAC_BOARD_DEBUG_LED_NUM,		/* activeLedsNumber */              
+	NULL,
+	0,										/* ledsPolarity */		
+	RD_88F6281A_PCAC_OE_LOW,			/* gppOutEnLow */
+	RD_88F6281A_PCAC_OE_HIGH,			/* gppOutEnHigh */
+	RD_88F6281A_PCAC_OE_VAL_LOW,			/* gppOutValLow */
+	RD_88F6281A_PCAC_OE_VAL_HIGH,			/* gppOutValHigh */
+	0,						/* gppPolarityValLow */
+	0, 	 					/* gppPolarityValHigh */
+	NULL						/* pSwitchInfo */
+};
+
+
+/* 6281 Sheeva Plug*/
+
+#define SHEEVA_PLUG_BOARD_PCI_IF_NUM		        0x0
+#define SHEEVA_PLUG_BOARD_TWSI_DEF_NUM		        0x0
+#define SHEEVA_PLUG_BOARD_MAC_INFO_NUM		        0x1
+#define SHEEVA_PLUG_BOARD_GPP_INFO_NUM		        0x0
+#define SHEEVA_PLUG_BOARD_MPP_GROUP_TYPE_NUN        0x1
+#define SHEEVA_PLUG_BOARD_MPP_CONFIG_NUM		    0x1
+#define SHEEVA_PLUG_BOARD_DEVICE_CONFIG_NUM	        0x1
+#define SHEEVA_PLUG_BOARD_DEBUG_LED_NUM		        0x1
+
+MV_U8	sheevaPlugInfoBoardDebugLedIf[] =
+	{49};
+
+MV_BOARD_MAC_INFO sheevaPlugInfoBoardMacInfo[] = 
+    /* {{MV_BOARD_MAC_SPEED	boardMacSpeed,	MV_U8	boardEthSmiAddr}} */
+	{{BOARD_MAC_SPEED_AUTO, 0x0}}; 
+
+MV_BOARD_TWSI_INFO	sheevaPlugInfoBoardTwsiDev[] =
+	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
+	{{BOARD_TWSI_OTHER, 0x0, ADDR7_BIT}};
+
+MV_BOARD_MPP_TYPE_INFO sheevaPlugInfoBoardMppTypeInfo[] = 
+	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
+	}; 
+
+MV_DEV_CS_INFO sheevaPlugInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
+
+MV_BOARD_MPP_INFO	sheevaPlugInfoBoardMppConfigValue[] = 
+	{{{
+	RD_SHEEVA_PLUG_MPP0_7,		
+	RD_SHEEVA_PLUG_MPP8_15,		
+	RD_SHEEVA_PLUG_MPP16_23,		
+	RD_SHEEVA_PLUG_MPP24_31,		
+	RD_SHEEVA_PLUG_MPP32_39,		
+	RD_SHEEVA_PLUG_MPP40_47,		
+	RD_SHEEVA_PLUG_MPP48_55		
+	}}};
+
+MV_BOARD_INFO sheevaPlugInfo = {
+	"SHEEVA PLUG",				                /* boardName[MAX_BOARD_NAME_LEN] */
+	SHEEVA_PLUG_BOARD_MPP_GROUP_TYPE_NUN,		/* numBoardMppGroupType */
+	sheevaPlugInfoBoardMppTypeInfo,
+	SHEEVA_PLUG_BOARD_MPP_CONFIG_NUM,		    /* numBoardMppConfig */
+	sheevaPlugInfoBoardMppConfigValue,
+	0,						                    /* intsGppMaskLow */
+	0,					                        /* intsGppMaskHigh */
+	SHEEVA_PLUG_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	sheevaPlugInfoBoardDeCsInfo,
+	SHEEVA_PLUG_BOARD_TWSI_DEF_NUM,			    /* numBoardTwsiDev */
+	sheevaPlugInfoBoardTwsiDev,					
+	SHEEVA_PLUG_BOARD_MAC_INFO_NUM,			    /* numBoardMacInfo */
+	sheevaPlugInfoBoardMacInfo,
+	SHEEVA_PLUG_BOARD_GPP_INFO_NUM,			    /* numBoardGppInfo */
+	0,
+	SHEEVA_PLUG_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	sheevaPlugInfoBoardDebugLedIf,
+	0,										/* ledsPolarity */		
+	RD_SHEEVA_PLUG_OE_LOW,				            /* gppOutEnLow */
+	RD_SHEEVA_PLUG_OE_HIGH,				        /* gppOutEnHigh */
+	RD_SHEEVA_PLUG_OE_VAL_LOW,				        /* gppOutValLow */
+	RD_SHEEVA_PLUG_OE_VAL_HIGH,				    /* gppOutValHigh */
+	0,						                    /* gppPolarityValLow */
+	0, 						                    /* gppPolarityValHigh */
+    NULL										/* pSwitchInfo */
+};
+
+/* Customer specific board place holder*/
+
+#define DB_CUSTOMER_BOARD_PCI_IF_NUM		        0x0
+#define DB_CUSTOMER_BOARD_TWSI_DEF_NUM		        0x0
+#define DB_CUSTOMER_BOARD_MAC_INFO_NUM		        0x0
+#define DB_CUSTOMER_BOARD_GPP_INFO_NUM		        0x0
+#define DB_CUSTOMER_BOARD_MPP_GROUP_TYPE_NUN        0x0
+#define DB_CUSTOMER_BOARD_MPP_CONFIG_NUM		    0x0
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+    #define DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM	    0x0
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+    #define DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM	    0x0
+#else
+    #define DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM	    0x0
+#endif
+#define DB_CUSTOMER_BOARD_DEBUG_LED_NUM		0x0
+
+MV_U8	dbCustomerInfoBoardDebugLedIf[] =
+	{0};
+
+MV_BOARD_MAC_INFO dbCustomerInfoBoardMacInfo[] = 
+    /* {{MV_BOARD_MAC_SPEED	boardMacSpeed,	MV_U8	boardEthSmiAddr}} */
+	{{BOARD_MAC_SPEED_AUTO, 0x0}}; 
+
+MV_BOARD_TWSI_INFO	dbCustomerInfoBoardTwsiDev[] =
+	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
+	{{BOARD_TWSI_OTHER, 0x0, ADDR7_BIT}};
+
+MV_BOARD_MPP_TYPE_INFO dbCustomerInfoBoardMppTypeInfo[] = 
+	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
+	}; 
+
+MV_DEV_CS_INFO dbCustomerInfoBoardDeCsInfo[] = 
+		/*{deviceCS, params, devType, devWidth}*/			   
+#if defined(MV_NAND) && defined(MV_NAND_BOOT)
+		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
+#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
+		 {
+         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
+         {2, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
+         };
+#else
+		 {{2, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
+#endif
+
+MV_BOARD_MPP_INFO	dbCustomerInfoBoardMppConfigValue[] = 
+	{{{
+	DB_CUSTOMER_MPP0_7,		
+	DB_CUSTOMER_MPP8_15,		
+	DB_CUSTOMER_MPP16_23,		
+	DB_CUSTOMER_MPP24_31,		
+	DB_CUSTOMER_MPP32_39,		
+	DB_CUSTOMER_MPP40_47,		
+	DB_CUSTOMER_MPP48_55		
+	}}};
+
+MV_BOARD_INFO dbCustomerInfo = {
+	"DB-CUSTOMER",				                /* boardName[MAX_BOARD_NAME_LEN] */
+	DB_CUSTOMER_BOARD_MPP_GROUP_TYPE_NUN,		/* numBoardMppGroupType */
+	dbCustomerInfoBoardMppTypeInfo,
+	DB_CUSTOMER_BOARD_MPP_CONFIG_NUM,		    /* numBoardMppConfig */
+	dbCustomerInfoBoardMppConfigValue,
+	0,						                    /* intsGppMaskLow */
+	0,					                        /* intsGppMaskHigh */
+	DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
+	dbCustomerInfoBoardDeCsInfo,
+	DB_CUSTOMER_BOARD_TWSI_DEF_NUM,			    /* numBoardTwsiDev */
+	dbCustomerInfoBoardTwsiDev,					
+	DB_CUSTOMER_BOARD_MAC_INFO_NUM,			    /* numBoardMacInfo */
+	dbCustomerInfoBoardMacInfo,
+	DB_CUSTOMER_BOARD_GPP_INFO_NUM,			    /* numBoardGppInfo */
+	0,
+	DB_CUSTOMER_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
+	NULL,
+	0,										/* ledsPolarity */		
+	DB_CUSTOMER_OE_LOW,				            /* gppOutEnLow */
+	DB_CUSTOMER_OE_HIGH,				        /* gppOutEnHigh */
+	DB_CUSTOMER_OE_VAL_LOW,				        /* gppOutValLow */
+	DB_CUSTOMER_OE_VAL_HIGH,				    /* gppOutValHigh */
+	0,						                    /* gppPolarityValLow */
+	0, 						                    /* gppPolarityValHigh */
+    NULL										/* pSwitchInfo */
+};
+
+MV_BOARD_INFO*	boardInfoTbl[] = 	{
+                    &db88f6281AInfo,
+                    &rd88f6281AInfo,
+                    &db88f6192AInfo,
+                    &rd88f6192AInfo,
+                    &db88f6180AInfo,
+                    &db88f6190AInfo,
+                    &rd88f6190AInfo,
+                    &rd88f6281APcacInfo,
+                    &dbCustomerInfo,
+                    &sheevaPlugInfo
+					};
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h
new file mode 100644
index 00000000..0372eee5
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h
@@ -0,0 +1,262 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvBoardEnvSpech
+#define __INCmvBoardEnvSpech
+
+#include "mvSysHwConfig.h"
+
+
+/* For future use */
+#define BD_ID_DATA_START_OFFS		0x0
+#define BD_DETECT_SEQ_OFFS		0x0
+#define BD_SYS_NUM_OFFS			0x4
+#define BD_NAME_OFFS			0x8
+
+/* I2C bus addresses */
+#define MV_BOARD_CTRL_I2C_ADDR			0x0     /* Controller slave addr */
+#define MV_BOARD_CTRL_I2C_ADDR_TYPE 		ADDR7_BIT
+#define MV_BOARD_DIMM0_I2C_ADDR			0x56
+#define MV_BOARD_DIMM0_I2C_ADDR_TYPE 		ADDR7_BIT
+#define MV_BOARD_DIMM1_I2C_ADDR			0x54
+#define MV_BOARD_DIMM1_I2C_ADDR_TYPE 		ADDR7_BIT
+#define MV_BOARD_EEPROM_I2C_ADDR	    	0x51
+#define MV_BOARD_EEPROM_I2C_ADDR_TYPE 		ADDR7_BIT
+#define MV_BOARD_MAIN_EEPROM_I2C_ADDR	   	0x50
+#define MV_BOARD_MAIN_EEPROM_I2C_ADDR_TYPE 	ADDR7_BIT
+#define MV_BOARD_MUX_I2C_ADDR_ENTRY		0x2
+#define MV_BOARD_DIMM_I2C_CHANNEL		0x0
+
+#define BOOT_FLASH_INDEX			0
+#define MAIN_FLASH_INDEX			1
+
+#define BOARD_ETH_START_PORT_NUM	0
+
+/* Supported clocks */
+#define MV_BOARD_TCLK_100MHZ	100000000
+#define MV_BOARD_TCLK_125MHZ	125000000
+#define MV_BOARD_TCLK_133MHZ	133333333
+#define MV_BOARD_TCLK_150MHZ	150000000
+#define MV_BOARD_TCLK_166MHZ	166666667
+#define MV_BOARD_TCLK_200MHZ	200000000
+
+#define MV_BOARD_SYSCLK_100MHZ	100000000
+#define MV_BOARD_SYSCLK_125MHZ	125000000
+#define MV_BOARD_SYSCLK_133MHZ	133333333
+#define MV_BOARD_SYSCLK_150MHZ	150000000
+#define MV_BOARD_SYSCLK_166MHZ	166666667
+#define MV_BOARD_SYSCLK_200MHZ	200000000
+#define MV_BOARD_SYSCLK_233MHZ	233333333
+#define MV_BOARD_SYSCLK_250MHZ	250000000
+#define MV_BOARD_SYSCLK_267MHZ	266666667
+#define MV_BOARD_SYSCLK_300MHZ	300000000
+#define MV_BOARD_SYSCLK_333MHZ	333333334
+#define MV_BOARD_SYSCLK_400MHZ	400000000
+
+#define MV_BOARD_REFCLK_25MHZ	 25000000
+
+/* Board specific */
+/* =============================== */
+
+/* boards ID numbers */
+
+#define BOARD_ID_BASE           		0x0
+
+/* New board ID numbers */
+#define DB_88F6281A_BP_ID			(BOARD_ID_BASE)
+#define DB_88F6281_BP_MLL_ID        1680
+#define RD_88F6281A_ID				(BOARD_ID_BASE+0x1)
+#define RD_88F6281_MLL_ID			1682
+#define DB_88F6192A_BP_ID			(BOARD_ID_BASE+0x2)
+#define RD_88F6192A_ID				(BOARD_ID_BASE+0x3)
+#define RD_88F6192_MLL_ID			1681
+#define DB_88F6180A_BP_ID			(BOARD_ID_BASE+0x4)
+#define DB_88F6190A_BP_ID			(BOARD_ID_BASE+0x5)
+#define RD_88F6190A_ID				(BOARD_ID_BASE+0x6)
+#define RD_88F6281A_PCAC_ID			(BOARD_ID_BASE+0x7)
+#define DB_CUSTOMER_ID			    (BOARD_ID_BASE+0x8)
+#define SHEEVA_PLUG_ID			    (BOARD_ID_BASE+0x9)
+#define MV_MAX_BOARD_ID 			(SHEEVA_PLUG_ID + 1)
+
+/* DB-88F6281A-BP */
+#if defined(MV_NAND)
+    #define DB_88F6281A_MPP0_7                   	0x21111111
+#else
+    #define DB_88F6281A_MPP0_7                   	0x21112220
+#endif
+#define DB_88F6281A_MPP8_15                   	0x11113311
+#define DB_88F6281A_MPP16_23                   	0x00551111
+#define DB_88F6281A_MPP24_31                   	0x00000000
+#define DB_88F6281A_MPP32_39                   	0x00000000
+#define DB_88F6281A_MPP40_47                   	0x00000000
+#define DB_88F6281A_MPP48_55                   	0x00000000
+#define DB_88F6281A_OE_LOW                       0x0
+#if defined(MV_TDM_5CHANNELS)
+	#define DB_88F6281A_OE_HIGH		(BIT6)
+#else
+#define DB_88F6281A_OE_HIGH                      0x0
+#endif
+#define DB_88F6281A_OE_VAL_LOW                   0x0
+#define DB_88F6281A_OE_VAL_HIGH                  0x0
+
+/* RD-88F6281A */
+#if defined(MV_NAND)
+    #define RD_88F6281A_MPP0_7                   	0x21111111
+#else
+    #define RD_88F6281A_MPP0_7                   	0x21112220
+#endif
+#define RD_88F6281A_MPP8_15                   	0x11113311
+#define RD_88F6281A_MPP16_23                   	0x33331111
+#define RD_88F6281A_MPP24_31                   	0x33003333
+#define RD_88F6281A_MPP32_39                   	0x20440533
+#define RD_88F6281A_MPP40_47                   	0x22202222
+#define RD_88F6281A_MPP48_55                   	0x00000002
+#define RD_88F6281A_OE_LOW                      (BIT28 | BIT29)
+#define RD_88F6281A_OE_HIGH                     (BIT3 | BIT6 | BIT17)
+#define RD_88F6281A_OE_VAL_LOW                   0x0
+#define RD_88F6281A_OE_VAL_HIGH                  0x0
+
+/* DB-88F6192A-BP */
+#if defined(MV_NAND)
+    #define DB_88F6192A_MPP0_7                   	0x21111111
+#else
+    #define DB_88F6192A_MPP0_7                   	0x21112220
+#endif
+#define DB_88F6192A_MPP8_15                   	0x11113311
+#define DB_88F6192A_MPP16_23                   	0x00501111
+#define DB_88F6192A_MPP24_31                   	0x00000000
+#define DB_88F6192A_MPP32_35                   	0x00000000
+#define DB_88F6192A_OE_LOW                       (BIT22 | BIT23)
+#define DB_88F6192A_OE_HIGH                      0x0
+#define DB_88F6192A_OE_VAL_LOW                   0x0
+#define DB_88F6192A_OE_VAL_HIGH                  0x0
+
+/* RD-88F6192A */
+#define RD_88F6192A_MPP0_7                   	0x01222222
+#define RD_88F6192A_MPP8_15                   	0x00000011
+#define RD_88F6192A_MPP16_23                   	0x05550000
+#define RD_88F6192A_MPP24_31                   	0x0
+#define RD_88F6192A_MPP32_35                   	0x0
+#define RD_88F6192A_OE_LOW                      (BIT11 | BIT14 | BIT24 | BIT25 | BIT26 | BIT27 | BIT30 | BIT31)
+#define RD_88F6192A_OE_HIGH                     (BIT0 | BIT2)
+#define RD_88F6192A_OE_VAL_LOW                  0x18400
+#define RD_88F6192A_OE_VAL_HIGH                 0x8
+
+/* DB-88F6180A-BP */
+#if defined(MV_NAND)
+    #define DB_88F6180A_MPP0_7                   	0x21111111
+#else
+    #define DB_88F6180A_MPP0_7                   	0x01112222
+#endif
+#define DB_88F6180A_MPP8_15                   	0x11113311
+#define DB_88F6180A_MPP16_23                   	0x00001111
+#define DB_88F6180A_MPP24_31                   	0x0
+#define DB_88F6180A_MPP32_39                   	0x4444c000
+#define DB_88F6180A_MPP40_44                   	0x00044444
+#define DB_88F6180A_OE_LOW                       0x0
+#define DB_88F6180A_OE_HIGH                      0x0
+#define DB_88F6180A_OE_VAL_LOW                   0x0
+#define DB_88F6180A_OE_VAL_HIGH                  0x0
+
+/* RD-88F6281A_PCAC */
+#define RD_88F6281A_PCAC_MPP0_7                	0x21111111
+#define RD_88F6281A_PCAC_MPP8_15               	0x00003311
+#define RD_88F6281A_PCAC_MPP16_23              	0x00001100
+#define RD_88F6281A_PCAC_MPP24_31              	0x00000000
+#define RD_88F6281A_PCAC_MPP32_39              	0x00000000
+#define RD_88F6281A_PCAC_MPP40_47              	0x00000000
+#define RD_88F6281A_PCAC_MPP48_55              	0x00000000
+#define RD_88F6281A_PCAC_OE_LOW                 0x0
+#define RD_88F6281A_PCAC_OE_HIGH                0x0
+#define RD_88F6281A_PCAC_OE_VAL_LOW             0x0
+#define RD_88F6281A_PCAC_OE_VAL_HIGH            0x0
+
+/* SHEEVA PLUG */
+#define RD_SHEEVA_PLUG_MPP0_7                   0x01111111
+#define RD_SHEEVA_PLUG_MPP8_15                  0x11113322
+#define RD_SHEEVA_PLUG_MPP16_23                 0x00001111
+#define RD_SHEEVA_PLUG_MPP24_31                 0x00100000
+#define RD_SHEEVA_PLUG_MPP32_39                 0x00000000
+#define RD_SHEEVA_PLUG_MPP40_47                 0x00000000
+#define RD_SHEEVA_PLUG_MPP48_55                 0x00000000
+#define RD_SHEEVA_PLUG_OE_LOW                   0x0
+#define RD_SHEEVA_PLUG_OE_HIGH                  0x0
+#define RD_SHEEVA_PLUG_OE_VAL_LOW               (BIT29)
+#define RD_SHEEVA_PLUG_OE_VAL_HIGH              ((~(BIT17 | BIT16 | BIT15)) | BIT14) 
+
+/* DB-CUSTOMER */
+#define DB_CUSTOMER_MPP0_7                	    0x21111111
+#define DB_CUSTOMER_MPP8_15               	    0x00003311
+#define DB_CUSTOMER_MPP16_23              	    0x00001100
+#define DB_CUSTOMER_MPP24_31              	    0x00000000
+#define DB_CUSTOMER_MPP32_39              	    0x00000000
+#define DB_CUSTOMER_MPP40_47              	    0x00000000
+#define DB_CUSTOMER_MPP48_55              	    0x00000000
+#define DB_CUSTOMER_OE_LOW                      0x0
+#define DB_CUSTOMER_OE_HIGH                     (~((BIT6) | (BIT7) | (BIT8) | (BIT9)))
+#define DB_CUSTOMER_OE_VAL_LOW                  0x0
+#define DB_CUSTOMER_OE_VAL_HIGH                 0x0
+
+#endif /* __INCmvBoardEnvSpech */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c
new file mode 100644
index 00000000..fed0fa11
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c
@@ -0,0 +1,320 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#include "cpu/mvCpu.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvRegs.h"
+#include "ctrlEnv/sys/mvCpuIfRegs.h"
+
+/* defines  */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif	
+
+/* locals */
+
+/*******************************************************************************
+* mvCpuPclkGet - Get the CPU pClk (pipe clock)
+*
+* DESCRIPTION:
+*       This routine extract the CPU core clock.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit clock cycles in MHertz.
+*
+*******************************************************************************/
+/* 6180 have different clk reset sampling */
+
+static MV_U32 mvCpu6180PclkGet(MV_VOID)
+{
+	MV_U32 	tmpPClkRate=0;
+	MV_CPU_ARM_CLK cpu6180_ddr_l2_CLK[] = MV_CPU6180_DDR_L2_CLCK_TBL;
+
+	tmpPClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+	tmpPClkRate = tmpPClkRate & MSAR_CPUCLCK_MASK_6180;
+	tmpPClkRate = tmpPClkRate >> MSAR_CPUCLCK_OFFS_6180;
+			
+	tmpPClkRate = cpu6180_ddr_l2_CLK[tmpPClkRate].cpuClk;
+
+	return tmpPClkRate;
+}
+
+
+MV_U32 mvCpuPclkGet(MV_VOID)
+{
+#if defined(PCLCK_AUTO_DETECT)
+	MV_U32 	tmpPClkRate=0;
+	MV_U32 cpuCLK[] = MV_CPU_CLCK_TBL;
+
+	if(mvCtrlModelGet() == MV_6180_DEV_ID)
+		return mvCpu6180PclkGet();
+
+	tmpPClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+	tmpPClkRate = MSAR_CPUCLCK_EXTRACT(tmpPClkRate);
+	tmpPClkRate = cpuCLK[tmpPClkRate];
+
+	return tmpPClkRate;
+#else
+	return MV_DEFAULT_PCLK
+#endif
+}
+
+/*******************************************************************************
+* mvCpuL2ClkGet - Get the CPU L2 (CPU bus clock)
+*
+* DESCRIPTION:
+*       This routine extract the CPU L2 clock.
+*
+* RETURN:
+*       32bit clock cycles in Hertz.
+*
+*******************************************************************************/
+static MV_U32  mvCpu6180L2ClkGet(MV_VOID)
+{
+	MV_U32 	L2ClkRate=0;
+	MV_CPU_ARM_CLK _cpu6180_ddr_l2_CLK[] = MV_CPU6180_DDR_L2_CLCK_TBL;
+
+	L2ClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+	L2ClkRate = L2ClkRate & MSAR_CPUCLCK_MASK_6180;
+	L2ClkRate = L2ClkRate >> MSAR_CPUCLCK_OFFS_6180;
+			
+	L2ClkRate = _cpu6180_ddr_l2_CLK[L2ClkRate].l2Clk;
+
+	return L2ClkRate;
+
+}
+
+MV_U32  mvCpuL2ClkGet(MV_VOID)
+{
+#ifdef L2CLK_AUTO_DETECT
+	MV_U32 L2ClkRate, tmp, pClkRate, indexL2Rtio;
+	MV_U32 L2Rtio[][2] = MV_L2_CLCK_RTIO_TBL;
+
+	if(mvCtrlModelGet() == MV_6180_DEV_ID)
+		return mvCpu6180L2ClkGet();
+
+	pClkRate = mvCpuPclkGet();
+
+	tmp = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+	indexL2Rtio = MSAR_L2CLCK_EXTRACT(tmp);
+
+	L2ClkRate = ((pClkRate * L2Rtio[indexL2Rtio][1]) / L2Rtio[indexL2Rtio][0]);
+
+	return L2ClkRate;
+#else
+	return MV_BOARD_DEFAULT_L2CLK;
+#endif
+}
+
+
+/*******************************************************************************
+* mvCpuNameGet - Get CPU name
+*
+* DESCRIPTION:
+*       This function returns a string describing the CPU model and revision.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       pNameBuff - Buffer to contain board name string. Minimum size 32 chars.
+*
+* RETURN:
+*       None.
+*******************************************************************************/
+MV_VOID mvCpuNameGet(char *pNameBuff)
+{
+    MV_U32 cpuModel;
+    
+    cpuModel = mvOsCpuPartGet();
+
+    /* The CPU module is indicated in the Processor Version Register (PVR) */
+    switch(cpuModel)
+    {
+        case CPU_PART_MRVL131:
+            mvOsSPrintf(pNameBuff, "%s (Rev %d)", "Marvell Feroceon",mvOsCpuRevGet());
+            break;
+        case CPU_PART_ARM926:
+            mvOsSPrintf(pNameBuff, "%s (Rev %d)", "ARM926",mvOsCpuRevGet());
+            break;
+	case CPU_PART_ARM946:
+		mvOsSPrintf(pNameBuff, "%s (Rev %d)", "ARM946",mvOsCpuRevGet());
+		break;
+        default:
+            mvOsSPrintf(pNameBuff,"??? (0x%04x) (Rev %d)",cpuModel,mvOsCpuRevGet());
+            break;
+    }  /* switch  */
+
+    return;
+}
+
+
+#define MV_PROC_STR_SIZE 50
+
+static void mvCpuIfGetL2EccMode(MV_8 *buf)
+{
+    MV_U32 regVal = MV_REG_READ(CPU_L2_CONFIG_REG);
+    if (regVal & BIT2)
+	mvOsSPrintf(buf, "L2 ECC Enabled");
+    else
+	mvOsSPrintf(buf, "L2 ECC Disabled");
+}
+
+static void mvCpuIfGetL2Mode(MV_8 *buf)
+{
+    MV_U32 regVal = 0;
+    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
+    if (regVal & BIT22)
+	mvOsSPrintf(buf, "L2 Enabled");
+    else
+	mvOsSPrintf(buf, "L2 Disabled");
+}
+
+static void mvCpuIfGetL2PrefetchMode(MV_8 *buf)
+{
+    MV_U32 regVal = 0;
+    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
+    if (regVal & BIT24)
+	mvOsSPrintf(buf, "L2 Prefetch Disabled");
+    else
+	mvOsSPrintf(buf, "L2 Prefetch Enabled");
+}
+
+static void mvCpuIfGetWriteAllocMode(MV_8 *buf)
+{
+    MV_U32 regVal = 0;
+    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
+    if (regVal & BIT28)
+	mvOsSPrintf(buf, "Write Allocate Enabled");
+    else
+	mvOsSPrintf(buf, "Write Allocate Disabled");
+}
+
+static void mvCpuIfGetCpuStreamMode(MV_8 *buf)
+{
+    MV_U32 regVal = 0;
+    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
+    if (regVal & BIT29)
+	mvOsSPrintf(buf, "CPU Streaming Enabled");
+    else
+	mvOsSPrintf(buf, "CPU Streaming Disabled");
+}
+
+static void mvCpuIfPrintCpuRegs(void)
+{
+    MV_U32 regVal = 0;
+
+    __asm volatile ("mrc p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
+    mvOsPrintf("Extra Feature Reg = 0x%x\n",regVal);
+
+   __asm volatile ("mrc	p15, 0, %0, c1, c0, 0" : "=r" (regVal)); /* Read Control register */
+   mvOsPrintf("Control Reg = 0x%x\n",regVal);
+
+   __asm volatile ("mrc	p15, 0, %0, c0, c0, 0" : "=r" (regVal)); /* Read ID Code register */
+    mvOsPrintf("ID Code Reg = 0x%x\n",regVal);
+
+   __asm volatile ("mrc	p15, 0, %0, c0, c0, 1" : "=r" (regVal)); /* Read Cache Type register */
+   mvOsPrintf("Cache Type Reg = 0x%x\n",regVal);
+
+}
+
+MV_U32 mvCpuIfPrintSystemConfig(MV_8 *buffer, MV_U32 index)
+{
+  MV_U32 count = 0;
+  
+  MV_8 L2_ECC_str[MV_PROC_STR_SIZE];
+  MV_8 L2_En_str[MV_PROC_STR_SIZE];
+  MV_8 L2_Prefetch_str[MV_PROC_STR_SIZE];
+  MV_8 Write_Alloc_str[MV_PROC_STR_SIZE];
+  MV_8 Cpu_Stream_str[MV_PROC_STR_SIZE];
+  
+  mvCpuIfGetL2Mode(L2_En_str);
+  mvCpuIfGetL2EccMode(L2_ECC_str); 
+  mvCpuIfGetL2PrefetchMode(L2_Prefetch_str);
+  mvCpuIfGetWriteAllocMode(Write_Alloc_str);
+  mvCpuIfGetCpuStreamMode(Cpu_Stream_str);
+  mvCpuIfPrintCpuRegs();
+  
+  count += mvOsSPrintf(buffer + count + index, "%s\n", L2_En_str);
+  count += mvOsSPrintf(buffer + count + index, "%s\n", L2_ECC_str);
+  count += mvOsSPrintf(buffer + count + index, "%s\n", L2_Prefetch_str);
+  count += mvOsSPrintf(buffer + count + index, "%s\n", Write_Alloc_str);
+  count += mvOsSPrintf(buffer + count + index, "%s\n", Cpu_Stream_str);
+  return count;
+}
+
+MV_U32 whoAmI(MV_VOID)
+{
+	return 0;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h
new file mode 100644
index 00000000..7f58b03f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h
@@ -0,0 +1,99 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvCpuh
+#define __INCmvCpuh
+
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+
+/* defines */
+#define CPU_PART_MRVL131      0x131
+#define CPU_PART_ARM926       0x926
+#define CPU_PART_ARM946       0x946
+#define MV_CPU_ARM_CLK_ELM_SIZE	    12
+#define MV_CPU_ARM_CLK_RATIO_OFF    8
+#define MV_CPU_ARM_CLK_DDR_OFF	    4
+
+#ifndef MV_ASMLANGUAGE
+typedef struct _mvCpuArmClk 
+{
+	MV_U32	      cpuClk;	  /* CPU clock in MHz */
+	MV_U32	      ddrClk;	  /* DDR clock in MHz */
+	MV_U32	      l2Clk;	  /* CPU DDR clock ratio */
+
+}MV_CPU_ARM_CLK;
+
+MV_U32    mvCpuPclkGet(MV_VOID);
+MV_VOID   mvCpuNameGet(char *pNameBuff);
+MV_U32  mvCpuL2ClkGet(MV_VOID);
+MV_U32 mvCpuIfPrintSystemConfig(MV_8 *buffer, MV_U32 index);
+MV_U32 whoAmI(MV_VOID);
+
+#endif /* MV_ASMLANGUAGE */
+
+
+#endif /* __INCmvCpuh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
new file mode 100644
index 00000000..fbe7c566
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
@@ -0,0 +1,296 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvCtrlEnvAddrDec.h - Marvell controller address decode library
+*
+* DESCRIPTION:
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+/* includes */
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+#include "ctrlEnv/sys/mvAhbToMbusRegs.h"
+#include "ddr2/mvDramIfRegs.h"
+#include "pex/mvPexRegs.h"
+
+#define MV_DEBUG
+
+/* defines  */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif
+	
+/* Default Attributes array */
+MV_TARGET_ATTRIB	mvTargetDefaultsArray[] = TARGETS_DEF_ARRAY;
+extern MV_TARGET 	*sampleAtResetTargetArray;
+/* Dram\AHBToMbus\PEX share regsiter */
+
+#define CTRL_DEC_BASE_OFFS		16
+#define CTRL_DEC_BASE_MASK		(0xffff << CTRL_DEC_BASE_OFFS)
+#define CTRL_DEC_BASE_ALIGNMENT	0x10000
+
+#define CTRL_DEC_SIZE_OFFS		16
+#define CTRL_DEC_SIZE_MASK		(0xffff << CTRL_DEC_SIZE_OFFS)
+#define CTRL_DEC_SIZE_ALIGNMENT	0x10000
+
+#define CTRL_DEC_WIN_EN			BIT0
+
+
+
+/*******************************************************************************
+* mvCtrlAddrDecToReg - Get address decode register format values
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_STATUS mvCtrlAddrDecToReg(MV_ADDR_WIN *pAddrDecWin, MV_DEC_REGS *pAddrDecRegs)
+{
+
+	MV_U32 baseToReg=0 , sizeToReg=0;
+    
+	/* BaseLow[31:16] => base register [31:16]		*/
+	baseToReg = pAddrDecWin->baseLow & CTRL_DEC_BASE_MASK;
+
+	/* Write to address decode Base Address Register                  */
+	pAddrDecRegs->baseReg &= ~CTRL_DEC_BASE_MASK;
+	pAddrDecRegs->baseReg |= baseToReg;
+
+	/* Get size register value according to window size						*/
+	sizeToReg = ctrlSizeToReg(pAddrDecWin->size, CTRL_DEC_SIZE_ALIGNMENT);
+	
+	/* Size parameter validity check.                                   */
+	if (-1 == sizeToReg)
+	{
+		return MV_BAD_PARAM;
+	}
+
+	/* set size */
+	pAddrDecRegs->sizeReg &= ~CTRL_DEC_SIZE_MASK;
+	pAddrDecRegs->sizeReg |= (sizeToReg << CTRL_DEC_SIZE_OFFS);
+	
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvCtrlRegToAddrDec - Extract address decode struct from registers.
+*
+* DESCRIPTION:
+*       This function extract address decode struct from address decode 
+*       registers given as parameters.
+*
+* INPUT:
+*       pAddrDecRegs - Address decode register struct.
+*
+* OUTPUT:
+*       pAddrDecWin - Target window data structure.
+*
+* RETURN:
+*		MV_BAD_PARAM if address decode registers data is invalid.
+*
+*******************************************************************************/
+MV_STATUS mvCtrlRegToAddrDec(MV_DEC_REGS *pAddrDecRegs, MV_ADDR_WIN *pAddrDecWin)
+{
+	MV_U32 sizeRegVal;
+	
+	sizeRegVal = (pAddrDecRegs->sizeReg & CTRL_DEC_SIZE_MASK) >> 
+					CTRL_DEC_SIZE_OFFS;
+
+	pAddrDecWin->size = ctrlRegToSize(sizeRegVal, CTRL_DEC_SIZE_ALIGNMENT);
+
+
+	/* Extract base address						*/
+	/* Base register [31:16] ==> baseLow[31:16] 		*/
+	pAddrDecWin->baseLow = pAddrDecRegs->baseReg & CTRL_DEC_BASE_MASK;
+
+	pAddrDecWin->baseHigh =  0;
+
+	return MV_OK;
+    
+}
+
+/*******************************************************************************
+* mvCtrlAttribGet - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*
+*******************************************************************************/
+
+MV_STATUS mvCtrlAttribGet(MV_TARGET target,
+						  MV_TARGET_ATTRIB *targetAttrib)
+{
+
+	targetAttrib->attrib = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(target)].attrib;
+	targetAttrib->targetId = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(target)].targetId;
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvCtrlGetAttrib - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_TARGET mvCtrlTargetGet(MV_TARGET_ATTRIB *targetAttrib)
+{
+	MV_TARGET target;
+	MV_TARGET x;
+	for (target = SDRAM_CS0; target < MAX_TARGETS ; target ++)
+	{
+		x = MV_CHANGE_BOOT_CS(target);
+		if ((mvTargetDefaultsArray[x].attrib == targetAttrib->attrib) &&
+			(mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(target)].targetId == targetAttrib->targetId))
+		{
+			/* found it */
+			break;
+		}
+	}
+
+	return target;
+}
+
+MV_STATUS mvCtrlAddrDecToParams(MV_DEC_WIN *pAddrDecWin, 
+                                MV_DEC_WIN_PARAMS *pWinParam)
+{
+	MV_U32 baseToReg=0, sizeToReg=0;
+    
+	/* BaseLow[31:16] => base register [31:16]		*/
+	baseToReg = pAddrDecWin->addrWin.baseLow & CTRL_DEC_BASE_MASK;
+
+	/* Write to address decode Base Address Register                  */
+	pWinParam->baseAddr &= ~CTRL_DEC_BASE_MASK;
+	pWinParam->baseAddr |= baseToReg;
+
+	/* Get size register value according to window size						*/
+	sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, CTRL_DEC_SIZE_ALIGNMENT);
+	
+	/* Size parameter validity check.                                   */
+	if (-1 == sizeToReg)
+	{
+        mvOsPrintf("mvCtrlAddrDecToParams: ERR. ctrlSizeToReg failed.\n");
+		return MV_BAD_PARAM;
+	}
+    pWinParam->size = sizeToReg;
+
+    pWinParam->attrib   = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].attrib;
+    pWinParam->targetId = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].targetId;
+
+    return MV_OK;
+}
+
+MV_STATUS mvCtrlParamsToAddrDec(MV_DEC_WIN_PARAMS *pWinParam, 
+                                MV_DEC_WIN *pAddrDecWin)
+{
+    MV_TARGET_ATTRIB    targetAttrib;
+
+    pAddrDecWin->addrWin.baseLow = pWinParam->baseAddr;
+	
+	/* Upper 32bit address base is supported under PCI High Address remap */
+	pAddrDecWin->addrWin.baseHigh = 0;	
+
+	/* Prepare sizeReg to ctrlRegToSize function */
+    pAddrDecWin->addrWin.size = ctrlRegToSize(pWinParam->size, CTRL_DEC_SIZE_ALIGNMENT);
+
+	if (-1 == pAddrDecWin->addrWin.size)
+	{
+		DB(mvOsPrintf("mvCtrlParamsToAddrDec: ERR. ctrlRegToSize failed.\n"));
+		return MV_BAD_PARAM;
+	}
+    targetAttrib.targetId = pWinParam->targetId;
+    targetAttrib.attrib = pWinParam->attrib;
+
+    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+    return MV_OK;
+}
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h
new file mode 100644
index 00000000..946737f5
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h
@@ -0,0 +1,203 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvCtrlEnvAddrDech
+#define __INCmvCtrlEnvAddrDech
+
+/* includes */
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvRegs.h"
+
+
+/* defines  */
+/* DUnit attributes */
+#define ATMWCR_WIN_DUNIT_CS0_OFFS			0
+#define ATMWCR_WIN_DUNIT_CS0_MASK			BIT0
+#define ATMWCR_WIN_DUNIT_CS0_REQ			(0 << ATMWCR_WIN_DUNIT_CS0_OFFS)
+
+#define ATMWCR_WIN_DUNIT_CS1_OFFS			1
+#define ATMWCR_WIN_DUNIT_CS1_MASK			BIT1
+#define ATMWCR_WIN_DUNIT_CS1_REQ 			(0 << ATMWCR_WIN_DUNIT_CS1_OFFS)
+
+#define ATMWCR_WIN_DUNIT_CS2_OFFS			2
+#define ATMWCR_WIN_DUNIT_CS2_MASK			BIT2
+#define ATMWCR_WIN_DUNIT_CS2_REQ 			(0 << ATMWCR_WIN_DUNIT_CS2_OFFS)
+
+#define ATMWCR_WIN_DUNIT_CS3_OFFS			3
+#define ATMWCR_WIN_DUNIT_CS3_MASK			BIT3
+#define ATMWCR_WIN_DUNIT_CS3_REQ 			(0 << ATMWCR_WIN_DUNIT_CS3_OFFS)
+
+/* RUnit (Device)  attributes */
+#define ATMWCR_WIN_RUNIT_DEVCS0_OFFS		0
+#define ATMWCR_WIN_RUNIT_DEVCS0_MASK		BIT0
+#define ATMWCR_WIN_RUNIT_DEVCS0_REQ			(0 << ATMWCR_WIN_RUNIT_DEVCS0_OFFS)
+
+#define ATMWCR_WIN_RUNIT_DEVCS1_OFFS		1
+#define ATMWCR_WIN_RUNIT_DEVCS1_MASK		BIT1
+#define ATMWCR_WIN_RUNIT_DEVCS1_REQ 		(0 << ATMWCR_WIN_RUNIT_DEVCS1_OFFS)
+
+#define ATMWCR_WIN_RUNIT_DEVCS2_OFFS		2
+#define ATMWCR_WIN_RUNIT_DEVCS2_MASK		BIT2
+#define ATMWCR_WIN_RUNIT_DEVCS2_REQ 		(0 << ATMWCR_WIN_RUNIT_DEVCS2_OFFS)
+
+#define ATMWCR_WIN_RUNIT_BOOTCS_OFFS		4
+#define ATMWCR_WIN_RUNIT_BOOTCS_MASK		BIT4
+#define ATMWCR_WIN_RUNIT_BOOTCS_REQ 		(0 << ATMWCR_WIN_RUNIT_BOOTCS_OFFS)
+
+/* LMaster (PCI)  attributes */
+#define ATMWCR_WIN_LUNIT_BYTE_SWP_OFFS		0
+#define ATMWCR_WIN_LUNIT_BYTE_SWP_MASK		BIT0
+#define ATMWCR_WIN_LUNIT_BYTE_SWP			(0 << ATMWCR_WIN_LUNIT_BYTE_SWP_OFFS)
+#define ATMWCR_WIN_LUNIT_BYTE_NO_SWP		(1 << ATMWCR_WIN_LUNIT_BYTE_SWP_OFFS)
+
+
+#define ATMWCR_WIN_LUNIT_WORD_SWP_OFFS		1
+#define ATMWCR_WIN_LUNIT_WORD_SWP_MASK		BIT1
+#define ATMWCR_WIN_LUNIT_WORD_SWP			(0 << ATMWCR_WIN_LUNIT_WORD_SWP_OFFS)
+#define ATMWCR_WIN_LUNIT_WORD_NO_SWP		(1 << ATMWCR_WIN_LUNIT_WORD_SWP_OFFS)
+
+#define ATMWCR_WIN_LUNIT_NO_SNOOP			BIT2
+
+#define ATMWCR_WIN_LUNIT_TYPE_OFFS			3
+#define ATMWCR_WIN_LUNIT_TYPE_MASK			BIT3
+#define ATMWCR_WIN_LUNIT_TYPE_IO			(0 << ATMWCR_WIN_LUNIT_TYPE_OFFS)
+#define ATMWCR_WIN_LUNIT_TYPE_MEM			(1 << ATMWCR_WIN_LUNIT_TYPE_OFFS)
+
+#define ATMWCR_WIN_LUNIT_FORCE64_OFFS		4
+#define ATMWCR_WIN_LUNIT_FORCE64_MASK		BIT4
+#define ATMWCR_WIN_LUNIT_FORCE64			(0 << ATMWCR_WIN_LUNIT_FORCE64_OFFS)
+
+#define ATMWCR_WIN_LUNIT_ORDERING_OFFS		6
+#define ATMWCR_WIN_LUNIT_ORDERING_MASK		BIT6
+#define ATMWCR_WIN_LUNIT_ORDERING			(1 << ATMWCR_WIN_LUNIT_FORCE64_OFFS)
+
+/* PEX Attributes */
+#define ATMWCR_WIN_PEX_TYPE_OFFS			3
+#define ATMWCR_WIN_PEX_TYPE_MASK			BIT3
+#define ATMWCR_WIN_PEX_TYPE_IO				(0 << ATMWCR_WIN_PEX_TYPE_OFFS)
+#define ATMWCR_WIN_PEX_TYPE_MEM				(1 << ATMWCR_WIN_PEX_TYPE_OFFS)
+
+/* typedefs */
+
+/* Unsupported attributes for address decode:                               */
+/* 2) PCI0/1_REQ64n control                                                 */
+
+typedef struct _mvDecRegs
+{
+	MV_U32 baseReg;
+    MV_U32 baseRegHigh;
+    MV_U32 sizeReg;
+
+}MV_DEC_REGS;
+
+typedef struct _mvTargetAttrib
+{
+	MV_U8			attrib;			/* chip select attributes */
+	MV_TARGET_ID 		targetId; 		/* Target Id of this MV_TARGET */
+
+}MV_TARGET_ATTRIB;
+
+
+/* This structure describes address decode window                           */
+typedef struct _mvDecWin 
+{
+    MV_TARGET       target;         /* Target for addr decode window        */
+    MV_ADDR_WIN     addrWin;        /* Address window of target             */
+    MV_BOOL     	enable;         /* Window enable/disable                */
+}MV_DEC_WIN;
+
+typedef struct _mvDecWinParams
+{
+    MV_TARGET_ID    targetId;   /* Target ID field */
+    MV_U8           attrib;     /* Attribute field */
+    MV_U32          baseAddr;   /* Base address in register format */
+    MV_U32          size;       /* Size in register format */
+}MV_DEC_WIN_PARAMS;
+
+
+/* mvCtrlEnvAddrDec API list */
+
+MV_STATUS mvCtrlAddrDecToReg(MV_ADDR_WIN *pAddrDecWin,
+							 MV_DEC_REGS *pAddrDecRegs);
+
+MV_STATUS mvCtrlRegToAddrDec(MV_DEC_REGS *pAddrDecRegs,
+							 MV_ADDR_WIN *pAddrDecWin);
+
+MV_STATUS mvCtrlAttribGet(MV_TARGET target,
+						  MV_TARGET_ATTRIB *targetAttrib);
+
+MV_TARGET mvCtrlTargetGet(MV_TARGET_ATTRIB *targetAttrib);
+
+
+MV_STATUS mvCtrlAddrDecToParams(MV_DEC_WIN *pAddrDecWin, 
+                                MV_DEC_WIN_PARAMS *pWinParam);
+
+MV_STATUS mvCtrlParamsToAddrDec(MV_DEC_WIN_PARAMS *pWinParam, 
+                                MV_DEC_WIN *pAddrDecWin);
+
+
+
+
+#endif /* __INCmvCtrlEnvAddrDech */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h
new file mode 100644
index 00000000..6f6367a2
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h
@@ -0,0 +1,98 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvCtrlEnvAsmh
+#define __INCmvCtrlEnvAsmh
+#include "pex/mvPexRegs.h"
+
+#define CHIP_BOND_REG					0x10034
+#define PCKG_OPT_MASK_AS 		#3
+#define PXCCARI_REVID_MASK_AS           #PXCCARI_REVID_MASK
+
+/* Read device ID into toReg bits 15:0 from 0xd0000000 */
+/* defines  */
+#define MV_DV_CTRL_MODEL_GET_ASM(toReg, tmpReg) \
+        MV_DV_REG_READ_ASM(toReg, tmpReg, CHIP_BOND_REG);\
+        and     toReg, toReg, PCKG_OPT_MASK_AS                 /* Mask for package ID */
+
+/* Read device ID into toReg bits 15:0 from 0xf1000000*/
+#define MV_CTRL_MODEL_GET_ASM(toReg, tmpReg) \
+        MV_REG_READ_ASM(toReg, tmpReg, CHIP_BOND_REG);\
+        and     toReg, toReg, PCKG_OPT_MASK_AS                  /* Mask for package ID */
+
+/* Read Revision into toReg bits 7:0 0xd0000000*/
+#define MV_DV_CTRL_REV_GET_ASM(toReg, tmpReg)	\
+        /* Read device revision */			\
+        MV_DV_REG_READ_ASM(toReg, tmpReg, PEX_CFG_DIRECT_ACCESS(0,PEX_CLASS_CODE_AND_REVISION_ID));\
+        and     toReg, toReg, PXCCARI_REVID_MASK_AS                  /* Mask for calss ID */
+
+/* Read Revision into toReg bits 7:0 0xf1000000*/
+#define MV_CTRL_REV_GET_ASM(toReg, tmpReg)	\
+        /* Read device revision */			\
+        MV_REG_READ_ASM(toReg, tmpReg, PEX_CFG_DIRECT_ACCESS(0,PEX_CLASS_CODE_AND_REVISION_ID));\
+        and     toReg, toReg, PXCCARI_REVID_MASK_AS                  /* Mask for calss ID */
+
+
+#endif /* __INCmvCtrlEnvAsmh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c
new file mode 100644
index 00000000..adf451d3
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c
@@ -0,0 +1,1825 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+/* includes */
+#include "mvCommon.h"
+#include "mvCtrlEnvLib.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+#if defined(MV_INCLUDE_PEX)
+#include "pex/mvPex.h"
+#include "ctrlEnv/sys/mvSysPex.h"
+#endif
+
+#if defined(MV_INCLUDE_GIG_ETH)
+#include "ctrlEnv/sys/mvSysGbe.h"
+#endif
+
+#if defined(MV_INCLUDE_XOR)
+#include "ctrlEnv/sys/mvSysXor.h"
+#endif
+
+#if defined(MV_INCLUDE_SATA)
+#include "ctrlEnv/sys/mvSysSata.h"
+#endif
+
+#if defined(MV_INCLUDE_USB)
+#include "ctrlEnv/sys/mvSysUsb.h"
+#endif
+
+#if defined(MV_INCLUDE_AUDIO)
+#include "ctrlEnv/sys/mvSysAudio.h"
+#endif
+
+#if defined(MV_INCLUDE_CESA)
+#include "ctrlEnv/sys/mvSysCesa.h"
+#endif
+
+#if defined(MV_INCLUDE_TS)
+#include "ctrlEnv/sys/mvSysTs.h"
+#endif
+
+/* defines  */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif	
+
+/*******************************************************************************
+* mvCtrlEnvInit - Initialize Marvell controller environment.
+*
+* DESCRIPTION:
+*       This function get environment information and initialize controller
+*       internal/external environment. For example
+*       1) MPP settings according to board MPP macros.
+*		NOTE: It is the user responsibility to shut down all DMA channels
+*		in device and disable controller sub units interrupts during 
+*		boot process.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvCtrlEnvInit(MV_VOID)
+{
+    	MV_U32 mppGroup;
+	MV_U32 devId;
+	MV_U32 boardId;
+	MV_U32 i;
+	MV_U32 maxMppGrp = 1;
+	MV_U32 mppVal = 0;
+	MV_U32 bootVal = 0;
+	MV_U32 mppGroupType = 0;
+	MV_U32 mppGroup1[][3] = MPP_GROUP_1_TYPE;
+	MV_U32 mppGroup2[][3] = MPP_GROUP_2_TYPE;
+
+	devId = mvCtrlModelGet();
+	boardId= mvBoardIdGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			maxMppGrp = MV_6281_MPP_MAX_GROUP;
+			break;
+		case MV_6192_DEV_ID:
+			maxMppGrp = MV_6192_MPP_MAX_GROUP;
+			break;
+        case MV_6190_DEV_ID:
+            maxMppGrp = MV_6190_MPP_MAX_GROUP;
+            break;
+		case MV_6180_DEV_ID:
+			maxMppGrp = MV_6180_MPP_MAX_GROUP;
+			break;		
+	}
+	
+	/* MPP Init */
+	/* We split mpp init to 3 phases:
+	 * 1. We init mpp[19:0] from the board info. mpp[23:20] will be over write 
+	 * in phase 2.
+	 * 2. We detect the mpp group type and according the mpp values [35:20].
+	 * 3. We detect the mpp group type and according the mpp values [49:36].
+	 */
+	/* Mpp phase 1 mpp[19:0] */
+	/* Read MPP group from board level and assign to MPP register */
+	for (mppGroup = 0; mppGroup < 3; mppGroup++)
+	{
+		mppVal = mvBoardMppGet(mppGroup);
+		if (mppGroup == 0)
+		{
+		    bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
+		    if (mvCtrlIsBootFromSPI())
+		    {
+			mppVal &= ~0xffff;
+			bootVal &= 0xffff;
+			mppVal |= bootVal;
+		    }
+		    else if (mvCtrlIsBootFromSPIUseNAND())
+		    {
+			mppVal &= ~0xf0000000;
+			bootVal &= 0xf0000000;
+			mppVal |= bootVal;
+		    }
+		    else if (mvCtrlIsBootFromNAND())
+		    {
+			mppVal &= ~0xffffff;
+			bootVal &= 0xffffff;
+			mppVal |= bootVal;
+		    }
+		}
+		
+		if (mppGroup == 2)
+		{
+		    bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
+		    if (mvCtrlIsBootFromNAND())
+		    {
+			mppVal &= ~0xff00;
+			bootVal &= 0xff00;
+			mppVal |= bootVal;
+		    }
+		}
+
+		MV_REG_WRITE(mvCtrlMppRegGet(mppGroup), mppVal);
+	}
+
+	/* Identify MPPs group */
+	mvBoardMppGroupIdUpdate();
+
+	/* Update MPPs mux relevent only on Marvell DB */
+	if ((boardId == DB_88F6281A_BP_ID) ||
+		(boardId == DB_88F6180A_BP_ID))
+		mvBoardMppMuxSet();
+
+	mppGroupType = mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_1);
+
+	/* Mpp phase 2 */
+	/* Read MPP group from board level and assign to MPP register */
+    if (devId != MV_6180_DEV_ID)
+    {
+        i = 0;
+    	for (mppGroup = 2; mppGroup < 5; mppGroup++)
+    	{
+    		if ((mppGroupType == MV_BOARD_OTHER) ||
+    			(boardId == RD_88F6281A_ID) ||
+    			(boardId == RD_88F6192A_ID) ||
+                (boardId == RD_88F6190A_ID) ||
+                (boardId == RD_88F6281A_PCAC_ID) ||
+                (boardId == SHEEVA_PLUG_ID))
+    			mppVal = mvBoardMppGet(mppGroup);
+    		else
+    		{
+    			mppVal = mppGroup1[mppGroupType][i];
+    			i++;
+    		}
+    
+    		/* Group 2 is shared mpp[23:16] */
+    		if (mppGroup == 2)
+    		{
+                bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
+    			mppVal &= ~0xffff;
+    			bootVal &= 0xffff;
+    			mppVal |= bootVal;
+    		}
+    
+    		MV_REG_WRITE(mvCtrlMppRegGet(mppGroup), mppVal);
+    	}
+    }
+
+	if ((devId == MV_6192_DEV_ID) || (devId == MV_6190_DEV_ID))
+		return MV_OK;
+ 	
+	/* Mpp phase 3 */
+	mppGroupType = mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_2);
+	/* Read MPP group from board level and assign to MPP register */
+	i = 0;
+	for (mppGroup = 4; mppGroup < 7; mppGroup++)
+	{
+		if ((mppGroupType == MV_BOARD_OTHER) ||
+			(boardId == RD_88F6281A_ID) ||
+            (boardId == RD_88F6281A_PCAC_ID) ||
+            (boardId == SHEEVA_PLUG_ID))
+			mppVal = mvBoardMppGet(mppGroup);
+		else
+		{
+			mppVal = mppGroup2[mppGroupType][i];
+			i++;
+		}
+
+		/* Group 4 is shared mpp[35:32] */
+		if (mppGroup == 4)
+		{
+            bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
+			mppVal &= ~0xffff;
+			bootVal &= 0xffff;
+			mppVal |= bootVal;
+		}
+
+		MV_REG_WRITE(mvCtrlMppRegGet(mppGroup), mppVal);
+	}
+    /* Update SSCG configuration register*/
+    if(mvBoardIdGet() == DB_88F6281A_BP_ID || mvBoardIdGet() == DB_88F6192A_BP_ID ||
+       mvBoardIdGet() == DB_88F6190A_BP_ID || mvBoardIdGet() == DB_88F6180A_BP_ID)
+        MV_REG_WRITE(0x100d8, 0x53);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvCtrlMppRegGet - return reg address of mpp group
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       mppGroup - MPP group.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_U32 - Register address.
+*
+*******************************************************************************/
+MV_U32 mvCtrlMppRegGet(MV_U32 mppGroup)
+{
+        MV_U32 ret;
+
+        switch(mppGroup){
+                case (0):       ret = MPP_CONTROL_REG0;
+                                break;
+                case (1):       ret = MPP_CONTROL_REG1;
+                                break;
+                case (2):       ret = MPP_CONTROL_REG2;
+                                break;
+                case (3):       ret = MPP_CONTROL_REG3;
+                                break;
+                case (4):       ret = MPP_CONTROL_REG4;
+                                break;
+                case (5):       ret = MPP_CONTROL_REG5;
+                                break;
+                case (6):       ret = MPP_CONTROL_REG6;
+                                break;
+                default:        ret = MPP_CONTROL_REG0;
+                                break;
+        }
+        return ret;
+}
+#if defined(MV_INCLUDE_PEX) 
+/*******************************************************************************
+* mvCtrlPexMaxIfGet - Get Marvell controller number of PEX interfaces.
+*
+* DESCRIPTION:
+*       This function returns Marvell controller number of PEX interfaces.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Marvell controller number of PEX interfaces. If controller 
+*		ID is undefined the function returns '0'.
+*
+*******************************************************************************/
+MV_U32 mvCtrlPexMaxIfGet(MV_VOID)
+{
+
+	return MV_PEX_MAX_IF;
+}
+#endif
+
+#if defined(MV_INCLUDE_GIG_ETH)
+/*******************************************************************************
+* mvCtrlEthMaxPortGet - Get Marvell controller number of etherent ports.
+*
+* DESCRIPTION:
+*       This function returns Marvell controller number of etherent port.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Marvell controller number of etherent port.
+*
+*******************************************************************************/
+MV_U32 mvCtrlEthMaxPortGet(MV_VOID)
+{
+	MV_U32 devId;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			return MV_6281_ETH_MAX_PORTS;
+			break;
+		case MV_6192_DEV_ID:
+			return MV_6192_ETH_MAX_PORTS;
+			break;
+        case MV_6190_DEV_ID:
+            return MV_6190_ETH_MAX_PORTS;
+            break;
+		case MV_6180_DEV_ID:
+			return MV_6180_ETH_MAX_PORTS;
+			break;		
+	}
+	return 0;
+
+}
+#endif
+
+#if defined(MV_INCLUDE_XOR)
+/*******************************************************************************
+* mvCtrlXorMaxChanGet - Get Marvell controller number of XOR channels.
+*
+* DESCRIPTION:
+*       This function returns Marvell controller number of XOR channels.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Marvell controller number of XOR channels.
+*
+*******************************************************************************/
+MV_U32 mvCtrlXorMaxChanGet(MV_VOID)
+{
+	return MV_XOR_MAX_CHAN; 
+}
+#endif
+
+#if defined(MV_INCLUDE_USB)
+/*******************************************************************************
+* mvCtrlUsbHostMaxGet - Get number of Marvell Usb  controllers
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       returns number of Marvell USB  controllers.
+*
+*******************************************************************************/
+MV_U32 mvCtrlUsbMaxGet(void)
+{
+	return MV_USB_MAX_PORTS;
+}
+#endif
+
+
+#if defined(MV_INCLUDE_NAND)
+/*******************************************************************************
+* mvCtrlNandSupport - Return if this controller has integrated NAND flash support
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if NAND is supported and MV_FALSE otherwise
+*
+*******************************************************************************/
+MV_U32	  mvCtrlNandSupport(MV_VOID)
+{
+	MV_U32 devId;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			return MV_6281_NAND;
+			break;
+		case MV_6192_DEV_ID:
+			return MV_6192_NAND;
+			break;
+        case MV_6190_DEV_ID:
+            return MV_6190_NAND;
+            break;
+		case MV_6180_DEV_ID:
+			return MV_6180_NAND;
+			break;		
+	}
+	return 0;
+
+}
+#endif
+
+#if defined(MV_INCLUDE_SDIO)
+/*******************************************************************************
+* mvCtrlSdioSupport - Return if this controller has integrated SDIO flash support
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if SDIO is supported and MV_FALSE otherwise
+*
+*******************************************************************************/
+MV_U32	  mvCtrlSdioSupport(MV_VOID)
+{
+	MV_U32 devId;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			return MV_6281_SDIO;
+			break;
+		case MV_6192_DEV_ID:
+			return MV_6192_SDIO;
+			break;
+        case MV_6190_DEV_ID:
+            return MV_6190_SDIO;
+            break;
+		case MV_6180_DEV_ID:
+			return MV_6180_SDIO;
+			break;		
+	}
+	return 0;
+
+}
+#endif
+
+#if defined(MV_INCLUDE_TS)
+/*******************************************************************************
+* mvCtrlTsSupport - Return if this controller has integrated TS flash support
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if TS is supported and MV_FALSE otherwise
+*
+*******************************************************************************/
+MV_U32	  mvCtrlTsSupport(MV_VOID)
+{
+	MV_U32 devId;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			return MV_6281_TS;
+			break;
+		case MV_6192_DEV_ID:
+			return MV_6192_TS;
+			break;
+        case MV_6190_DEV_ID:
+            return MV_6190_TS;
+            break;
+		case MV_6180_DEV_ID:
+			return MV_6180_TS;
+			break;		
+	}
+	return 0;
+}
+#endif
+
+#if defined(MV_INCLUDE_AUDIO)
+/*******************************************************************************
+* mvCtrlAudioSupport - Return if this controller has integrated AUDIO flash support
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if AUDIO is supported and MV_FALSE otherwise
+*
+*******************************************************************************/
+MV_U32	  mvCtrlAudioSupport(MV_VOID)
+{
+	MV_U32 devId;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			return MV_6281_AUDIO;
+			break;
+		case MV_6192_DEV_ID:
+			return MV_6192_AUDIO;
+			break;
+        case MV_6190_DEV_ID:
+            return MV_6190_AUDIO;
+            break;
+		case MV_6180_DEV_ID:
+			return MV_6180_AUDIO;
+			break;		
+	}
+	return 0;
+
+}
+#endif
+
+#if defined(MV_INCLUDE_TDM)
+/*******************************************************************************
+* mvCtrlTdmSupport - Return if this controller has integrated TDM flash support
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if TDM is supported and MV_FALSE otherwise
+*
+*******************************************************************************/
+MV_U32	  mvCtrlTdmSupport(MV_VOID)
+{
+	MV_U32 devId;
+	
+	devId = mvCtrlModelGet();
+
+	switch(devId){
+		case MV_6281_DEV_ID:
+			return MV_6281_TDM;
+			break;
+		case MV_6192_DEV_ID:
+			return MV_6192_TDM;
+			break;
+        case MV_6190_DEV_ID:
+            return MV_6190_TDM;
+            break;
+		case MV_6180_DEV_ID:
+			return MV_6180_TDM;
+			break;		
+	}
+	return 0;
+
+}
+#endif
+
+/*******************************************************************************
+* mvCtrlModelGet - Get Marvell controller device model (Id)
+*
+* DESCRIPTION:
+*       This function returns 16bit describing the device model (ID) as defined
+*       in PCI Device and Vendor ID configuration register offset 0x0.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       16bit desscribing Marvell controller ID 
+*
+*******************************************************************************/
+MV_U16 mvCtrlModelGet(MV_VOID)
+{
+	MV_U32 devId;
+	
+	devId = MV_REG_READ(CHIP_BOND_REG);
+	devId &= PCKG_OPT_MASK;
+
+	switch(devId){
+		case 2:
+			return	MV_6281_DEV_ID;
+			break;
+    case 1:
+            if (((MV_REG_READ(PEX_CFG_DIRECT_ACCESS(0,PEX_DEVICE_AND_VENDOR_ID))& 0xffff0000) >> 16)
+                 == MV_6190_DEV_ID)
+                return	MV_6190_DEV_ID;
+            else
+                return	MV_6192_DEV_ID;
+			break;
+		case 0:
+			return	MV_6180_DEV_ID;
+			break;
+	}
+
+	return 0;
+}
+/*******************************************************************************
+* mvCtrlRevGet - Get Marvell controller device revision number
+*
+* DESCRIPTION:
+*       This function returns 8bit describing the device revision as defined
+*       in PCI Express Class Code and Revision ID Register.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       8bit desscribing Marvell controller revision number 
+*
+*******************************************************************************/
+MV_U8 mvCtrlRevGet(MV_VOID)
+{
+	MV_U8 revNum;
+#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
+	/* Check pex power state */
+	MV_U32 pexPower;
+	pexPower = mvCtrlPwrClckGet(PEX_UNIT_ID,0);
+	if (pexPower == MV_FALSE)
+		mvCtrlPwrClckSet(PEX_UNIT_ID, 0, MV_TRUE);
+#endif
+	revNum = (MV_U8)MV_REG_READ(PEX_CFG_DIRECT_ACCESS(0,PCI_CLASS_CODE_AND_REVISION_ID));
+#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
+	/* Return to power off state */
+	if (pexPower == MV_FALSE)
+		mvCtrlPwrClckSet(PEX_UNIT_ID, 0, MV_FALSE);
+#endif
+	return ((revNum & PCCRIR_REVID_MASK) >> PCCRIR_REVID_OFFS);
+}
+
+/*******************************************************************************
+* mvCtrlNameGet - Get Marvell controller name
+*
+* DESCRIPTION:
+*       This function returns a string describing the device model and revision.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       pNameBuff - Buffer to contain device name string. Minimum size 30 chars.
+*
+* RETURN:
+*       
+*       MV_ERROR if informantion can not be read.
+*******************************************************************************/
+MV_STATUS mvCtrlNameGet(char *pNameBuff)
+{
+	mvOsSPrintf (pNameBuff, "%s%x Rev %d", SOC_NAME_PREFIX, 
+				mvCtrlModelGet(), mvCtrlRevGet()); 
+	
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvCtrlModelRevGet - Get Controller Model (Device ID) and Revision
+*
+* DESCRIPTION:
+*       This function returns 32bit value describing both Device ID and Revision
+*       as defined in PCI Express Device and Vendor ID Register and device revision
+*	    as defined in PCI Express Class Code and Revision ID Register.
+     
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit describing both controller device ID and revision number
+*
+*******************************************************************************/
+MV_U32	mvCtrlModelRevGet(MV_VOID)
+{
+	return ((mvCtrlModelGet() << 16) | mvCtrlRevGet());
+}
+
+/*******************************************************************************
+* mvCtrlModelRevNameGet - Get Marvell controller name
+*
+* DESCRIPTION:
+*       This function returns a string describing the device model and revision.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       pNameBuff - Buffer to contain device name string. Minimum size 30 chars.
+*
+* RETURN:
+*       
+*       MV_ERROR if informantion can not be read.
+*******************************************************************************/
+
+MV_STATUS mvCtrlModelRevNameGet(char *pNameBuff)
+{
+
+        switch (mvCtrlModelRevGet())
+        {
+        case MV_6281_A0_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6281_A0_NAME); 
+                break;
+        case MV_6192_A0_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6192_A0_NAME); 
+                break;
+        case MV_6180_A0_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6180_A0_NAME); 
+                break;
+        case MV_6190_A0_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6190_A0_NAME); 
+                break;
+        case MV_6281_A1_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6281_A1_NAME);
+                break;
+        case MV_6192_A1_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6192_A1_NAME);
+                break;
+        case MV_6180_A1_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6180_A1_NAME);
+                break;
+        case MV_6190_A1_ID:
+                mvOsSPrintf (pNameBuff, "%s",MV_6190_A1_NAME);
+                break;
+        default:
+                mvCtrlNameGet(pNameBuff);
+                break;
+        }
+
+        return MV_OK;
+}
+
+
+/*******************************************************************************
+* ctrlWinOverlapTest - Test address windows for overlaping.
+*
+* DESCRIPTION:
+*       This function checks the given two address windows for overlaping.
+*
+* INPUT:
+*       pAddrWin1 - Address window 1.
+*       pAddrWin2 - Address window 2.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       
+*       MV_TRUE if address window overlaps, MV_FALSE otherwise.
+*******************************************************************************/
+MV_STATUS ctrlWinOverlapTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2)
+{
+    MV_U32 winBase1, winBase2;
+    MV_U32 winTop1, winTop2;
+    
+	/* check if we have overflow than 4G*/
+	if (((0xffffffff - pAddrWin1->baseLow) < pAddrWin1->size-1)||
+	   ((0xffffffff - pAddrWin2->baseLow) < pAddrWin2->size-1))
+	{
+		return MV_TRUE;
+	}
+
+    winBase1 = pAddrWin1->baseLow;
+    winBase2 = pAddrWin2->baseLow;
+    winTop1  = winBase1 + pAddrWin1->size-1;
+    winTop2  = winBase2 + pAddrWin2->size-1;
+
+    
+    if (((winBase1 <= winTop2 ) && ( winTop2 <= winTop1)) ||
+        ((winBase1 <= winBase2) && (winBase2 <= winTop1)))
+    {
+        return MV_TRUE;
+    }
+    else
+    {
+        return MV_FALSE;
+    }
+}
+
+/*******************************************************************************
+* ctrlWinWithinWinTest - Test address windows for overlaping.
+*
+* DESCRIPTION:
+*       This function checks the given win1 boundries is within
+*		win2 boundries.
+*
+* INPUT:
+*       pAddrWin1 - Address window 1.
+*       pAddrWin2 - Address window 2.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       
+*       MV_TRUE if found win1 inside win2, MV_FALSE otherwise.
+*******************************************************************************/
+MV_STATUS ctrlWinWithinWinTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2)
+{
+    MV_U32 winBase1, winBase2;
+    MV_U32 winTop1, winTop2;
+    
+    winBase1 = pAddrWin1->baseLow;
+    winBase2 = pAddrWin2->baseLow;
+    winTop1  = winBase1 + pAddrWin1->size -1;
+    winTop2  = winBase2 + pAddrWin2->size -1;
+    
+    if (((winBase1 >= winBase2 ) && ( winBase1 <= winTop2)) ||
+        ((winTop1  >= winBase2) && (winTop1 <= winTop2)))
+    {
+        return MV_TRUE;
+    }
+    else
+    {
+        return MV_FALSE;
+    }
+}
+
+static const char* cntrlName[] = TARGETS_NAME_ARRAY;
+
+/*******************************************************************************
+* mvCtrlTargetNameGet - Get Marvell controller target name
+*
+* DESCRIPTION:
+*       This function convert the trget enumeration to string.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Target name (const MV_8 *)
+*******************************************************************************/
+const MV_8* mvCtrlTargetNameGet( MV_TARGET target )
+{
+
+	if (target >= MAX_TARGETS)
+	{
+		return "target unknown";
+	}
+
+	return cntrlName[target];
+}
+
+/*******************************************************************************
+* mvCtrlAddrDecShow - Print the Controller units address decode map.
+*
+* DESCRIPTION:
+*		This function the Controller units address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvCtrlAddrDecShow(MV_VOID)
+{
+    mvCpuIfAddDecShow();
+    mvAhbToMbusAddDecShow();
+#if defined(MV_INCLUDE_PEX)
+	mvPexAddrDecShow();
+#endif
+#if defined(MV_INCLUDE_USB)
+    	mvUsbAddrDecShow();
+#endif
+#if defined(MV_INCLUDE_GIG_ETH)
+	mvEthAddrDecShow();
+#endif
+#if defined(MV_INCLUDE_XOR)
+	mvXorAddrDecShow();
+#endif
+#if defined(MV_INCLUDE_SATA)
+    mvSataAddrDecShow();
+#endif
+#if defined(MV_INCLUDE_AUDIO)
+    mvAudioAddrDecShow();
+#endif
+#if defined(MV_INCLUDE_TS)
+    mvTsuAddrDecShow();
+#endif
+}
+
+/*******************************************************************************
+* ctrlSizeToReg - Extract size value for register assignment.
+*
+* DESCRIPTION:		
+*       Address decode size parameter must be programed from LSB to MSB as
+*       sequence of 1's followed by sequence of 0's. The number of 1's 
+*       specifies the size of the window in 64 KB granularity (e.g. a 
+*       value of 0x00ff specifies 256x64k = 16 MB).
+*       This function extract the size value from the size parameter according 
+*		to given aligment paramter. For example for size 0x1000000 (16MB) and 
+*		aligment 0x10000 (64KB) the function will return 0x00FF.
+*
+* INPUT:
+*       size - Size.
+*		alignment - Size alignment.	Note that alignment must be power of 2!
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit describing size register value correspond to size parameter. 
+*		If value is '-1' size parameter or aligment are invalid.
+*******************************************************************************/
+MV_U32	ctrlSizeToReg(MV_U32 size, MV_U32 alignment)
+{
+	MV_U32 retVal;
+
+	/* Check size parameter alignment		*/
+	if ((0 == size) || (MV_IS_NOT_ALIGN(size, alignment)))
+	{
+		DB(mvOsPrintf("ctrlSizeToReg: ERR. Size is zero or not aligned.\n"));
+		return -1;
+	}
+	
+	/* Take out the "alignment" portion out of the size parameter */
+	alignment--;	/* Now the alignmet is a sequance of '1' (e.g. 0xffff) 		*/
+					/* and size is 0x1000000 (16MB) for example	*/
+	while(alignment & 1)	/* Check that alignmet LSB is set	*/
+	{
+		size = (size >> 1); /* If LSB is set, move 'size' one bit to right	*/	
+		alignment = (alignment >> 1);
+	}
+	
+	/* If after the alignment first '0' was met we still have '1' in 		*/
+	/* it then aligment is invalid (not power of 2) 				*/
+	if (alignment)
+	{
+		DB(mvOsPrintf("ctrlSizeToReg: ERR. Alignment parameter 0x%x invalid.\n", 
+			(MV_U32)alignment));
+		return -1;
+	}
+
+	/* Now the size is shifted right according to aligment: 0x0100			*/
+	size--;         /* Now the size is a sequance of '1': 0x00ff 			*/
+    
+	retVal = size ;
+	
+	/* Check that LSB to MSB is sequence of 1's followed by sequence of 0's		*/
+	while(size & 1)	/* Check that LSB is set	*/
+	{
+		size = (size >> 1); /* If LSB is set, move one bit to the right		*/	
+	}
+
+    if (size) /* Sequance of 1's is over. Check that we have no other 1's		*/
+	{
+		DB(mvOsPrintf("ctrlSizeToReg: ERR. Size parameter 0x%x invalid.\n", 
+                                                                        size));
+		return -1;
+	}
+	
+    return retVal;
+	
+}
+
+/*******************************************************************************
+* ctrlRegToSize - Extract size value from register value.
+*
+* DESCRIPTION:		
+*       This function extract a size value from the register size parameter 
+*		according to given aligment paramter. For example for register size 
+*		value 0xff and aligment 0x10000 the function will return 0x01000000.
+*
+* INPUT:
+*       regSize   - Size as in register format.	See ctrlSizeToReg.
+*		alignment - Size alignment.	Note that alignment must be power of 2!
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit describing size. 
+*		If value is '-1' size parameter or aligment are invalid.
+*******************************************************************************/
+MV_U32	ctrlRegToSize(MV_U32 regSize, MV_U32 alignment)
+{
+   	MV_U32 temp;
+
+	/* Check that LSB to MSB is sequence of 1's followed by sequence of 0's		*/ 
+	temp = regSize;		/* Now the size is a sequance of '1': 0x00ff		*/
+	
+	while(temp & 1)	/* Check that LSB is set					*/
+	{
+		temp = (temp >> 1); /* If LSB is set, move one bit to the right		*/	
+	}
+
+    if (temp) /* Sequance of 1's is over. Check that we have no other 1's		*/
+	{
+		DB(mvOsPrintf("ctrlRegToSize: ERR. Size parameter 0x%x invalid.\n", 
+					regSize));
+	   	return -1;
+	}
+	
+
+	/* Check that aligment is a power of two					*/
+	temp = alignment - 1;/* Now the alignmet is a sequance of '1' (0xffff) 		*/
+					
+	while(temp & 1)	/* Check that alignmet LSB is set				*/
+	{
+		temp = (temp >> 1); /* If LSB is set, move 'size' one bit to right	*/	
+	}
+	
+	/* If after the 'temp' first '0' was met we still have '1' in 'temp'		*/
+	/* then 'temp' is invalid (not power of 2) 					*/
+	if (temp)
+	{
+		DB(mvOsPrintf("ctrlSizeToReg: ERR. Alignment parameter 0x%x invalid.\n", 
+					alignment));
+		return -1;
+	}
+
+	regSize++;      /* Now the size is 0x0100					*/
+
+	/* Add in the "alignment" portion to the register size parameter 		*/
+	alignment--;	/* Now the alignmet is a sequance of '1' (e.g. 0xffff) 		*/
+
+	while(alignment & 1)	/* Check that alignmet LSB is set			*/
+	{
+		regSize   = (regSize << 1); /* LSB is set, move 'size' one bit left	*/	
+		alignment = (alignment >> 1);
+	}
+		
+    return regSize;	
+}
+
+
+/*******************************************************************************
+* ctrlSizeRegRoundUp - Round up given size 
+*
+* DESCRIPTION:		
+*       This function round up a given size to a size that fits the 
+*       restrictions of size format given an aligment parameter.
+*		to given aligment paramter. For example for size parameter 0xa1000 and 
+*		aligment 0x1000 the function will return 0xFF000.
+*
+* INPUT:
+*       size - Size.
+*		alignment - Size alignment.	Note that alignment must be power of 2!
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit describing size value correspond to size in register.  
+*******************************************************************************/
+MV_U32	ctrlSizeRegRoundUp(MV_U32 size, MV_U32 alignment)
+{
+	MV_U32 msbBit = 0;
+    MV_U32 retSize;
+	
+    /* Check if size parameter is already comply with restriction		*/
+	if (!(-1 == ctrlSizeToReg(size, alignment)))
+	{
+		return size;
+	}
+    
+    while(size)
+	{
+		size = (size >> 1);
+        msbBit++;
+	}
+
+    retSize = (1 << msbBit);
+    
+    if (retSize < alignment)
+    {
+        return alignment;
+    }
+    else
+    {
+        return retSize;
+    }
+}
+/*******************************************************************************
+* mvCtrlSysRstLengthCounterGet - Return number of milliseconds the reset button 
+* 				 was pressed and clear counter
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN: number of milliseconds the reset button was pressed 
+*******************************************************************************/
+MV_U32	mvCtrlSysRstLengthCounterGet(MV_VOID)
+{
+	static volatile MV_U32 Count = 0;
+
+	if(!Count) {
+		Count = (MV_REG_READ(SYSRST_LENGTH_COUNTER_REG) & SLCR_COUNT_MASK);
+		Count = (Count / (MV_BOARD_REFCLK_25MHZ / 1000));
+		/* clear counter for next boot */
+		MV_REG_BIT_SET(SYSRST_LENGTH_COUNTER_REG, SLCR_CLR_MASK);	
+	}
+
+	DB(mvOsPrintf("mvCtrlSysRstLengthCounterGet: Reset button was pressed for %u milliseconds\n", Count));
+
+	return Count;		
+}
+
+MV_BOOL	  mvCtrlIsBootFromSPI(MV_VOID)
+{
+    MV_U32 satr = 0;
+    satr = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+    if(mvCtrlModelGet() == MV_6180_DEV_ID)
+    {
+        if (MSAR_BOOT_MODE_6180(satr) == MSAR_BOOT_SPI_WITH_BOOTROM_6180)
+            return MV_TRUE;
+        else
+            return MV_FALSE;
+    }
+    satr = satr & MSAR_BOOT_MODE_MASK;    
+    if (satr == MSAR_BOOT_SPI_WITH_BOOTROM)
+        return MV_TRUE;
+    else
+        return MV_FALSE;
+}
+
+MV_BOOL	  mvCtrlIsBootFromSPIUseNAND(MV_VOID)
+{
+    MV_U32 satr = 0;
+    if(mvCtrlModelGet() == MV_6180_DEV_ID)
+        return MV_FALSE;
+    satr = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+    satr = satr & MSAR_BOOT_MODE_MASK;
+    
+    if (satr == MSAR_BOOT_SPI_USE_NAND_WITH_BOOTROM)
+        return MV_TRUE;
+    else
+        return MV_FALSE;
+}
+
+MV_BOOL	  mvCtrlIsBootFromNAND(MV_VOID)
+{
+    MV_U32 satr = 0;
+    satr = MV_REG_READ(MPP_SAMPLE_AT_RESET);
+    if(mvCtrlModelGet() == MV_6180_DEV_ID)
+    {
+        if (MSAR_BOOT_MODE_6180(satr) == MSAR_BOOT_NAND_WITH_BOOTROM_6180)
+            return MV_TRUE;
+        else
+            return MV_FALSE;
+    }
+    satr = satr & MSAR_BOOT_MODE_MASK;    
+    if ((satr == MSAR_BOOT_NAND_WITH_BOOTROM))
+        return MV_TRUE;
+    else
+        return MV_FALSE;
+}
+
+#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
+/*******************************************************************************
+* mvCtrlPwrSaveOn - Set Power save mode
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*******************************************************************************/
+MV_VOID   mvCtrlPwrSaveOn(MV_VOID)
+{
+	unsigned long old,temp;
+	/* Disable int */
+	__asm__ __volatile__("mrs %0, cpsr\n"
+			     "orr %1, %0, #0xc0\n"
+			     "msr cpsr_c, %1"
+			     : "=r" (old), "=r" (temp)
+			     :
+			     : "memory");
+
+	/* Set SoC in power save */
+	MV_REG_BIT_SET(POWER_MNG_CTRL_REG, BIT11);
+	/* Wait for int */
+	__asm__ __volatile__("mcr    p15, 0, r0, c7, c0, 4");
+
+	/* Enabled int */
+	__asm__ __volatile__("msr cpsr_c, %0"
+			     :
+			     : "r" (old)
+			     : "memory");
+}
+
+
+
+/*******************************************************************************
+* mvCtrlPwrSaveOff - Go out of power save mode
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*******************************************************************************/
+MV_VOID   mvCtrlPwrSaveOff(MV_VOID)
+{
+	unsigned long old,temp;
+	/* Disable int */
+	__asm__ __volatile__("mrs %0, cpsr\n"
+			     "orr %1, %0, #0xc0\n"
+			     "msr cpsr_c, %1"
+			     : "=r" (old), "=r" (temp)
+			     :
+			     : "memory");
+
+	/* Set SoC in power save */
+	MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, BIT11);
+	/* Wait for int */
+	__asm__ __volatile__("mcr    p15, 0, r0, c7, c0, 4");
+
+	/* Enabled int */
+	__asm__ __volatile__("msr cpsr_c, %0"
+			     :
+			     : "r" (old)
+			     : "memory");
+}
+
+/*******************************************************************************
+* mvCtrlPwrClckSet - Set Power State for specific Unit
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*******************************************************************************/
+MV_VOID   mvCtrlPwrClckSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable)
+{
+	switch (unitId)
+    {
+#if defined(MV_INCLUDE_PEX)
+	case PEX_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_PEXSTOPCLOCK_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_PEXSTOPCLOCK_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_GIG_ETH)
+	case ETH_GIG_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_GESTOPCLOCK_MASK(index));
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_GESTOPCLOCK_MASK(index));
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_INTEG_SATA)
+	case SATA_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_SATASTOPCLOCK_MASK(index));
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_SATASTOPCLOCK_MASK(index));
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_CESA)
+	case CESA_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_SESTOPCLOCK_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_SESTOPCLOCK_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_USB)
+	case USB_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_USBSTOPCLOCK_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_USBSTOPCLOCK_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_AUDIO)
+	case AUDIO_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_AUDIOSTOPCLOCK_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_AUDIOSTOPCLOCK_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_TS)
+	case TS_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_TSSTOPCLOCK_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_TSSTOPCLOCK_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_SDIO)
+	case SDIO_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_SDIOSTOPCLOCK_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_SDIOSTOPCLOCK_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_TDM)
+	case TDM_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_TDMSTOPCLOCK_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_TDMSTOPCLOCK_MASK);
+		}
+		break;
+#endif
+
+	default:
+
+		break;
+
+	}
+}
+
+/*******************************************************************************
+* mvCtrlPwrClckGet - Get Power State of specific Unit
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+******************************************************************************/
+MV_BOOL		mvCtrlPwrClckGet(MV_UNIT_ID unitId, MV_U32 index)
+{
+	MV_U32 reg = MV_REG_READ(POWER_MNG_CTRL_REG);
+	MV_BOOL state = MV_TRUE;
+
+	switch (unitId)
+    {
+#if defined(MV_INCLUDE_PEX)
+	case PEX_UNIT_ID:
+		if ((reg & PMC_PEXSTOPCLOCK_MASK) == PMC_PEXSTOPCLOCK_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+
+		break;
+#endif
+#if defined(MV_INCLUDE_GIG_ETH)
+	case ETH_GIG_UNIT_ID:
+		if ((reg & PMC_GESTOPCLOCK_MASK(index)) == PMC_GESTOPCLOCK_STOP(index))
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_SATA)
+	case SATA_UNIT_ID:
+		if ((reg & PMC_SATASTOPCLOCK_MASK(index)) == PMC_SATASTOPCLOCK_STOP(index))
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_CESA)
+	case CESA_UNIT_ID:
+		if ((reg & PMC_SESTOPCLOCK_MASK) == PMC_SESTOPCLOCK_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_USB)
+	case USB_UNIT_ID:
+		if ((reg & PMC_USBSTOPCLOCK_MASK) == PMC_USBSTOPCLOCK_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_AUDIO)
+	case AUDIO_UNIT_ID:
+		if ((reg & PMC_AUDIOSTOPCLOCK_MASK) == PMC_AUDIOSTOPCLOCK_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_TS)
+	case TS_UNIT_ID:
+		if ((reg & PMC_TSSTOPCLOCK_MASK) == PMC_TSSTOPCLOCK_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_SDIO)
+	case SDIO_UNIT_ID:
+		if ((reg & PMC_SDIOSTOPCLOCK_MASK)== PMC_SDIOSTOPCLOCK_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_TDM)
+	case TDM_UNIT_ID:
+		if ((reg & PMC_TDMSTOPCLOCK_MASK) == PMC_TDMSTOPCLOCK_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+
+	default:
+		state = MV_TRUE;
+		break;
+	}
+
+
+	return state;	
+}
+/*******************************************************************************
+* mvCtrlPwrMemSet - Set Power State for memory on specific Unit
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*******************************************************************************/
+MV_VOID   mvCtrlPwrMemSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable)
+{
+	switch (unitId)
+    {
+#if defined(MV_INCLUDE_PEX)
+	case PEX_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_PEXSTOPMEM_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_PEXSTOPMEM_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_GIG_ETH)
+	case ETH_GIG_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_GESTOPMEM_MASK(index));
+		}
+		else
+		{
+			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_GESTOPMEM_MASK(index));
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_INTEG_SATA)
+	case SATA_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_SATASTOPMEM_MASK(index));
+		}
+		else
+		{
+			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_SATASTOPMEM_MASK(index));
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_CESA)
+	case CESA_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_SESTOPMEM_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_SESTOPMEM_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_USB)
+	case USB_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_USBSTOPMEM_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_USBSTOPMEM_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_AUDIO)
+	case AUDIO_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_AUDIOSTOPMEM_MASK);
+		}
+		else
+		{
+			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_AUDIOSTOPMEM_MASK);
+		}
+		break;
+#endif
+#if defined(MV_INCLUDE_XOR)
+	case XOR_UNIT_ID:
+		if (enable == MV_FALSE)
+		{
+			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_XORSTOPMEM_MASK(index));
+		}
+		else
+		{
+			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_XORSTOPMEM_MASK(index));
+		}
+		break;
+#endif
+	default:
+
+		break;
+
+	}
+}
+
+/*******************************************************************************
+* mvCtrlPwrMemGet - Get Power State of memory on specific Unit
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+******************************************************************************/
+MV_BOOL		mvCtrlPwrMemGet(MV_UNIT_ID unitId, MV_U32 index)
+{
+	MV_U32 reg = MV_REG_READ(POWER_MNG_MEM_CTRL_REG);
+	MV_BOOL state = MV_TRUE;
+
+	switch (unitId)
+    {
+#if defined(MV_INCLUDE_PEX)
+	case PEX_UNIT_ID:
+		if ((reg & PMC_PEXSTOPMEM_MASK) == PMC_PEXSTOPMEM_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+
+		break;
+#endif
+#if defined(MV_INCLUDE_GIG_ETH)
+	case ETH_GIG_UNIT_ID:
+		if ((reg & PMC_GESTOPMEM_MASK(index)) == PMC_GESTOPMEM_STOP(index))
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_SATA)
+	case SATA_UNIT_ID:
+		if ((reg & PMC_SATASTOPMEM_MASK(index)) == PMC_SATASTOPMEM_STOP(index))
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_CESA)
+	case CESA_UNIT_ID:
+		if ((reg & PMC_SESTOPMEM_MASK) == PMC_SESTOPMEM_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_USB)
+	case USB_UNIT_ID:
+		if ((reg & PMC_USBSTOPMEM_MASK) == PMC_USBSTOPMEM_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_AUDIO)
+	case AUDIO_UNIT_ID:
+		if ((reg & PMC_AUDIOSTOPMEM_MASK) == PMC_AUDIOSTOPMEM_STOP)
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+#if defined(MV_INCLUDE_XOR)
+	case XOR_UNIT_ID:
+		if ((reg & PMC_XORSTOPMEM_MASK(index)) == PMC_XORSTOPMEM_STOP(index))
+		{
+			state = MV_FALSE;
+		}
+		else state = MV_TRUE;
+		break;
+#endif
+
+	default:
+		state = MV_TRUE;
+		break;
+	}
+
+
+	return state;	
+}
+#else
+MV_VOID   mvCtrlPwrClckSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable) {return;}
+MV_BOOL	  mvCtrlPwrClckGet(MV_UNIT_ID unitId, MV_U32 index) {return MV_TRUE;}
+#endif /* #if defined(MV_INCLUDE_CLK_PWR_CNTRL) */
+
+
+/*******************************************************************************
+* mvMPPConfigToSPI - Change MPP[3:0] configuration to SPI mode
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+******************************************************************************/
+MV_VOID   mvMPPConfigToSPI(MV_VOID)
+{
+	MV_U32 mppVal = 0;
+	MV_U32 bootVal = 0;
+
+    if(!mvCtrlIsBootFromSPIUseNAND())
+        return;
+    mppVal = 0x00002220; /* Set MPP [3:1] to SPI mode */
+    bootVal = MV_REG_READ(mvCtrlMppRegGet(0));
+    bootVal &= 0xffff000f;
+        mppVal |= bootVal;
+    
+    MV_REG_WRITE(mvCtrlMppRegGet(0), mppVal);
+}
+
+
+/*******************************************************************************
+* mvMPPConfigToDefault - Change MPP[7:0] configuration to default configuration
+*
+* DESCRIPTION:		
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+******************************************************************************/
+MV_VOID   mvMPPConfigToDefault(MV_VOID)
+{
+	MV_U32 mppVal = 0;
+	MV_U32 bootVal = 0;
+
+    if(!mvCtrlIsBootFromSPIUseNAND())
+        return;
+    mppVal = mvBoardMppGet(0);
+    bootVal = MV_REG_READ(mvCtrlMppRegGet(0));
+    mppVal &= ~0xffff000f;
+    bootVal &= 0xffff000f;
+        mppVal |= bootVal;
+    
+    MV_REG_WRITE(mvCtrlMppRegGet(0), mppVal);
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h
new file mode 100644
index 00000000..6e2e8137
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h
@@ -0,0 +1,185 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvCtrlEnvLibh
+#define __INCmvCtrlEnvLibh
+
+/* includes */
+#include "mvSysHwConfig.h"
+#include "mvCommon.h"
+#include "mvTypes.h"
+#include "mvOs.h"
+#include "boardEnv/mvBoardEnvLib.h"			
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "ctrlEnv/mvCtrlEnvRegs.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+
+/* typedefs */
+
+/* This enumerator describes the possible HW cache coherency policies the   */
+/* controllers supports.                                                    */
+typedef enum _mvCachePolicy
+{
+    NO_COHERENCY,   /* No HW cache coherency support                        */
+    WT_COHERENCY,   /* HW cache coherency supported in Write Through policy */
+    WB_COHERENCY    /* HW cache coherency supported in Write Back policy    */   
+}MV_CACHE_POLICY;
+
+
+/* The swapping is referred to a 64-bit words (as this is the controller    */
+/* internal data path width). This enumerator describes the possible        */
+/* data swap types. Below is an example of the data 0x0011223344556677      */
+typedef enum _mvSwapType
+{
+    MV_BYTE_SWAP,       /* Byte Swap                77 66 55 44 33 22 11 00 */             
+    MV_NO_SWAP,         /* No swapping              00 11 22 33 44 55 66 77 */
+    MV_BYTE_WORD_SWAP,  /* Both byte and word swap  33 22 11 00 77 66 55 44 */
+    MV_WORD_SWAP,       /* Word swap                44 55 66 77 00 11 22 33 */
+    SWAP_TYPE_MAX	/* Delimiter for this enumerator					*/
+}MV_SWAP_TYPE;
+
+/* This structure describes access rights for Access protection windows     */
+/* that can be found in IDMA, XOR, Ethernet and MPSC units.                 */
+/* Note that the permission enumerator coresponds to its register format.   */
+/* For example, Read only premission is presented as "1" in register field. */
+typedef enum _mvAccessRights
+{
+    	NO_ACCESS_ALLOWED = 0,  /* No access allowed            */
+    	READ_ONLY         = 1,  /* Read only permission         */
+	ACC_RESERVED	  = 2,	/* Reserved access right		*/
+    	FULL_ACCESS       = 3,  /* Read and Write permission    */
+	MAX_ACC_RIGHTS
+}MV_ACCESS_RIGHTS;
+
+
+/* mcspLib.h API list */
+
+MV_STATUS mvCtrlEnvInit(MV_VOID);
+MV_U32    mvCtrlMppRegGet(MV_U32 mppGroup);
+
+#if defined(MV_INCLUDE_PEX)
+MV_U32	  mvCtrlPexMaxIfGet(MV_VOID);
+#else
+#define   mvCtrlPexMaxIfGet()	(0)
+#endif
+
+#define   mvCtrlPciIfMaxIfGet()	(0)
+
+#if defined(MV_INCLUDE_GIG_ETH) 
+MV_U32	  mvCtrlEthMaxPortGet(MV_VOID);
+#endif
+#if defined(MV_INCLUDE_XOR)
+MV_U32 mvCtrlXorMaxChanGet(MV_VOID);
+#endif
+#if defined(MV_INCLUDE_USB)
+MV_U32 	  mvCtrlUsbMaxGet(MV_VOID);
+#endif
+#if defined(MV_INCLUDE_NAND)
+MV_U32	  mvCtrlNandSupport(MV_VOID);
+#endif
+#if defined(MV_INCLUDE_SDIO)
+MV_U32	  mvCtrlSdioSupport(MV_VOID);
+#endif
+#if defined(MV_INCLUDE_TS)
+MV_U32	  mvCtrlTsSupport(MV_VOID);
+#endif
+#if defined(MV_INCLUDE_AUDIO)
+MV_U32	  mvCtrlAudioSupport(MV_VOID);
+#endif
+#if defined(MV_INCLUDE_TDM)
+MV_U32	  mvCtrlTdmSupport(MV_VOID);
+#endif
+
+MV_U16    mvCtrlModelGet(MV_VOID);
+MV_U8     mvCtrlRevGet(MV_VOID);
+MV_STATUS mvCtrlNameGet(char *pNameBuff);
+MV_U32    mvCtrlModelRevGet(MV_VOID);
+MV_STATUS mvCtrlModelRevNameGet(char *pNameBuff);
+MV_VOID   mvCtrlAddrDecShow(MV_VOID);
+const MV_8* mvCtrlTargetNameGet(MV_TARGET target);
+MV_U32	  ctrlSizeToReg(MV_U32 size, MV_U32 alignment);
+MV_U32	  ctrlRegToSize(MV_U32 regSize, MV_U32 alignment);
+MV_U32	  ctrlSizeRegRoundUp(MV_U32 size, MV_U32 alignment);
+MV_U32	  mvCtrlSysRstLengthCounterGet(MV_VOID);
+MV_STATUS ctrlWinOverlapTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2);
+MV_STATUS ctrlWinWithinWinTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2);
+
+MV_VOID   mvCtrlPwrClckSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable);
+MV_BOOL	  mvCtrlPwrClckGet(MV_UNIT_ID unitId, MV_U32 index);
+MV_VOID   mvCtrlPwrMemSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable);
+MV_BOOL	  mvCtrlIsBootFromSPI(MV_VOID);
+MV_BOOL	  mvCtrlIsBootFromSPIUseNAND(MV_VOID);
+MV_BOOL	  mvCtrlIsBootFromNAND(MV_VOID);
+#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
+MV_VOID   mvCtrlPwrSaveOn(MV_VOID);
+MV_VOID   mvCtrlPwrSaveOff(MV_VOID);
+#endif
+MV_BOOL	  mvCtrlPwrMemGet(MV_UNIT_ID unitId, MV_U32 index);
+MV_VOID   mvMPPConfigToSPI(MV_VOID);
+MV_VOID   mvMPPConfigToDefault(MV_VOID);
+
+
+#endif /* __INCmvCtrlEnvLibh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h
new file mode 100644
index 00000000..ae3f141a
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h
@@ -0,0 +1,419 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvCtrlEnvRegsh
+#define __INCmvCtrlEnvRegsh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* CV Support */
+#define PEX0_MEM0 	PEX0_MEM
+#define PCI0_MEM0	PEX0_MEM
+
+/* Controller revision info */
+#define PCI_CLASS_CODE_AND_REVISION_ID			    0x008
+#define PCCRIR_REVID_OFFS				    0		/* Revision ID */
+#define PCCRIR_REVID_MASK				    (0xff << PCCRIR_REVID_OFFS)
+
+/* Controler environment registers offsets */
+
+/* Power Managment Control */
+#define POWER_MNG_MEM_CTRL_REG			0x20118
+
+#define PMC_GESTOPMEM_OFFS(port)		((port)? 13 : 0)
+#define PMC_GESTOPMEM_MASK(port)		(1 << PMC_GESTOPMEM_OFFS(port))
+#define PMC_GESTOPMEM_EN(port)			(0 << PMC_GESTOPMEM_OFFS(port))
+#define PMC_GESTOPMEM_STOP(port)		(1 << PMC_GESTOPMEM_OFFS(port))
+
+#define PMC_PEXSTOPMEM_OFFS			1
+#define PMC_PEXSTOPMEM_MASK			(1 << PMC_PEXSTOPMEM_OFFS)
+#define PMC_PEXSTOPMEM_EN			(0 << PMC_PEXSTOPMEM_OFFS)
+#define PMC_PEXSTOPMEM_STOP			(1 << PMC_PEXSTOPMEM_OFFS)
+
+#define PMC_USBSTOPMEM_OFFS			2
+#define PMC_USBSTOPMEM_MASK			(1 << PMC_USBSTOPMEM_OFFS)
+#define PMC_USBSTOPMEM_EN			(0 << PMC_USBSTOPMEM_OFFS)
+#define PMC_USBSTOPMEM_STOP			(1 << PMC_USBSTOPMEM_OFFS)
+
+#define PMC_DUNITSTOPMEM_OFFS			3
+#define PMC_DUNITSTOPMEM_MASK			(1 << PMC_DUNITSTOPMEM_OFFS)
+#define PMC_DUNITSTOPMEM_EN			(0 << PMC_DUNITSTOPMEM_OFFS)
+#define PMC_DUNITSTOPMEM_STOP			(1 << PMC_DUNITSTOPMEM_OFFS)
+
+#define PMC_RUNITSTOPMEM_OFFS			4
+#define PMC_RUNITSTOPMEM_MASK			(1 << PMC_RUNITSTOPMEM_OFFS)
+#define PMC_RUNITSTOPMEM_EN			(0 << PMC_RUNITSTOPMEM_OFFS)
+#define PMC_RUNITSTOPMEM_STOP			(1 << PMC_RUNITSTOPMEM_OFFS)
+
+#define PMC_XORSTOPMEM_OFFS(port)		(5+(port*2))
+#define PMC_XORSTOPMEM_MASK(port)		(1 << PMC_XORSTOPMEM_OFFS(port))
+#define PMC_XORSTOPMEM_EN(port)			(0 << PMC_XORSTOPMEM_OFFS(port))
+#define PMC_XORSTOPMEM_STOP(port)		(1 << PMC_XORSTOPMEM_OFFS(port))
+
+#define PMC_SATASTOPMEM_OFFS(port)		(6+(port*5))
+#define PMC_SATASTOPMEM_MASK(port)		(1 << PMC_SATASTOPMEM_OFFS(port))
+#define PMC_SATASTOPMEM_EN(port)		(0 << PMC_SATASTOPMEM_OFFS(port))
+#define PMC_SATASTOPMEM_STOP(port)		(1 << PMC_SATASTOPMEM_OFFS(port))
+
+#define PMC_SESTOPMEM_OFFS			8
+#define PMC_SESTOPMEM_MASK			(1 << PMC_SESTOPMEM_OFFS)
+#define PMC_SESTOPMEM_EN			(0 << PMC_SESTOPMEM_OFFS)
+#define PMC_SESTOPMEM_STOP			(1 << PMC_SESTOPMEM_OFFS)
+
+#define PMC_AUDIOSTOPMEM_OFFS			9
+#define PMC_AUDIOSTOPMEM_MASK			(1 << PMC_AUDIOSTOPMEM_OFFS)
+#define PMC_AUDIOSTOPMEM_EN			(0 << PMC_AUDIOSTOPMEM_OFFS)
+#define PMC_AUDIOSTOPMEM_STOP			(1 << PMC_AUDIOSTOPMEM_OFFS)
+
+#define POWER_MNG_CTRL_REG			0x2011C
+
+#define PMC_GESTOPCLOCK_OFFS(port)		((port)? 19 : 0)
+#define PMC_GESTOPCLOCK_MASK(port)		(1 << PMC_GESTOPCLOCK_OFFS(port))
+#define PMC_GESTOPCLOCK_EN(port)		(1 << PMC_GESTOPCLOCK_OFFS(port))
+#define PMC_GESTOPCLOCK_STOP(port)		(0 << PMC_GESTOPCLOCK_OFFS(port))
+
+#define PMC_PEXPHYSTOPCLOCK_OFFS		1
+#define PMC_PEXPHYSTOPCLOCK_MASK		(1 << PMC_PEXPHYSTOPCLOCK_OFFS)
+#define PMC_PEXPHYSTOPCLOCK_EN			(1 << PMC_PEXPHYSTOPCLOCK_OFFS)
+#define PMC_PEXPHYSTOPCLOCK_STOP		(0 << PMC_PEXPHYSTOPCLOCK_OFFS)
+
+#define PMC_PEXSTOPCLOCK_OFFS			2
+#define PMC_PEXSTOPCLOCK_MASK			(1 << PMC_PEXSTOPCLOCK_OFFS)
+#define PMC_PEXSTOPCLOCK_EN			(1 << PMC_PEXSTOPCLOCK_OFFS)
+#define PMC_PEXSTOPCLOCK_STOP			(0 << PMC_PEXSTOPCLOCK_OFFS)
+
+#define PMC_USBSTOPCLOCK_OFFS			3
+#define PMC_USBSTOPCLOCK_MASK			(1 << PMC_USBSTOPCLOCK_OFFS)
+#define PMC_USBSTOPCLOCK_EN			(1 << PMC_USBSTOPCLOCK_OFFS)
+#define PMC_USBSTOPCLOCK_STOP			(0 << PMC_USBSTOPCLOCK_OFFS)
+
+#define PMC_SDIOSTOPCLOCK_OFFS			4
+#define PMC_SDIOSTOPCLOCK_MASK			(1 << PMC_SDIOSTOPCLOCK_OFFS)
+#define PMC_SDIOSTOPCLOCK_EN			(1 << PMC_SDIOSTOPCLOCK_OFFS)
+#define PMC_SDIOSTOPCLOCK_STOP			(0 << PMC_SDIOSTOPCLOCK_OFFS)
+
+#define PMC_TSSTOPCLOCK_OFFS			5
+#define PMC_TSSTOPCLOCK_MASK			(1 << PMC_TSSTOPCLOCK_OFFS)
+#define PMC_TSSTOPCLOCK_EN			(1 << PMC_TSSTOPCLOCK_OFFS)
+#define PMC_TSSTOPCLOCK_STOP			(0 << PMC_TSSTOPCLOCK_OFFS)
+
+#define PMC_AUDIOSTOPCLOCK_OFFS			9
+#define PMC_AUDIOSTOPCLOCK_MASK			(1 << PMC_AUDIOSTOPCLOCK_OFFS)
+#define PMC_AUDIOSTOPCLOCK_EN			(1 << PMC_AUDIOSTOPCLOCK_OFFS)
+#define PMC_AUDIOSTOPCLOCK_STOP			(0 << PMC_AUDIOSTOPCLOCK_OFFS)
+
+#define PMC_POWERSAVE_OFFS			11
+#define PMC_POWERSAVE_MASK			(1 << PMC_POWERSAVE_OFFS)
+#define PMC_POWERSAVE_EN			(1 << PMC_POWERSAVE_OFFS)
+#define PMC_POWERSAVE_STOP			(0 << PMC_POWERSAVE_OFFS)
+
+
+
+
+#define PMC_SATASTOPCLOCK_OFFS(port)		(14+(port))
+#define PMC_SATASTOPCLOCK_MASK(port)		(1 << PMC_SATASTOPCLOCK_OFFS(port))
+#define PMC_SATASTOPCLOCK_EN(port)		(1 << PMC_SATASTOPCLOCK_OFFS(port))
+#define PMC_SATASTOPCLOCK_STOP(port)		(0 << PMC_SATASTOPCLOCK_OFFS(port))
+
+#define PMC_SESTOPCLOCK_OFFS			17
+#define PMC_SESTOPCLOCK_MASK			(1 << PMC_SESTOPCLOCK_OFFS)
+#define PMC_SESTOPCLOCK_EN			(1 << PMC_SESTOPCLOCK_OFFS)
+#define PMC_SESTOPCLOCK_STOP			(0 << PMC_SESTOPCLOCK_OFFS)
+
+#define PMC_TDMSTOPCLOCK_OFFS			20
+#define PMC_TDMSTOPCLOCK_MASK			(1 << PMC_TDMSTOPCLOCK_OFFS)
+#define PMC_TDMSTOPCLOCK_EN			(1 << PMC_TDMSTOPCLOCK_OFFS)
+#define PMC_TDMSTOPCLOCK_STOP			(0 << PMC_TDMSTOPCLOCK_OFFS)
+
+
+/* Controler environment registers offsets */
+#define MPP_CONTROL_REG0			0x10000
+#define MPP_CONTROL_REG1			0x10004
+#define MPP_CONTROL_REG2			0x10008
+#define MPP_CONTROL_REG3			0x1000C
+#define MPP_CONTROL_REG4			0x10010
+#define MPP_CONTROL_REG5			0x10014
+#define MPP_CONTROL_REG6			0x10018
+#define MPP_SAMPLE_AT_RESET			0x10030
+#define CHIP_BOND_REG				0x10034
+#define SYSRST_LENGTH_COUNTER_REG		0x10050
+#define SLCR_COUNT_OFFS				0
+#define SLCR_COUNT_MASK				(0x1FFFFFFF << SLCR_COUNT_OFFS)
+#define SLCR_CLR_OFFS				31
+#define SLCR_CLR_MASK				(1 << SLCR_CLR_OFFS)			
+#define PCKG_OPT_MASK				0x3
+#define MPP_OUTPUT_DRIVE_REG			0x100E0
+#define MPP_RGMII0_OUTPUT_DRIVE_OFFS            7
+#define MPP_3_3_RGMII0_OUTPUT_DRIVE		(0x0 << MPP_RGMII0_OUTPUT_DRIVE_OFFS)
+#define MPP_1_8_RGMII0_OUTPUT_DRIVE		(0x1 << MPP_RGMII0_OUTPUT_DRIVE_OFFS)
+#define MPP_RGMII1_OUTPUT_DRIVE_OFFS            15
+#define MPP_3_3_RGMII1_OUTPUT_DRIVE		(0x0 << MPP_RGMII1_OUTPUT_DRIVE_OFFS)
+#define MPP_1_8_RGMII1_OUTPUT_DRIVE		(0x1 << MPP_RGMII1_OUTPUT_DRIVE_OFFS)
+
+#define MSAR_BOOT_MODE_OFFS                     12
+#define MSAR_BOOT_MODE_MASK                     (0x7 << MSAR_BOOT_MODE_OFFS)
+#define MSAR_BOOT_NAND_WITH_BOOTROM		        (0x5 << MSAR_BOOT_MODE_OFFS)
+#define MSAR_BOOT_SPI_WITH_BOOTROM              (0x4 << MSAR_BOOT_MODE_OFFS)
+#define MSAR_BOOT_SPI_USE_NAND_WITH_BOOTROM		(0x2 << MSAR_BOOT_MODE_OFFS)
+
+#define MSAR_BOOT_MODE_6180(X)                  (((X & 0x3000) >> 12) | \
+                                                ((X & 0x2) << 1))
+#define MSAR_BOOT_SPI_WITH_BOOTROM_6180         0x1
+#define MSAR_BOOT_NAND_WITH_BOOTROM_6180        0x5
+
+#define MSAR_TCLCK_OFFS				21
+#define MSAR_TCLCK_MASK				(0x1 << MSAR_TCLCK_OFFS)
+#define MSAR_TCLCK_166				(0x1 << MSAR_TCLCK_OFFS)
+#define MSAR_TCLCK_200				(0x0 << MSAR_TCLCK_OFFS)
+
+
+#define MSAR_CPUCLCK_EXTRACT(X)     (((X & 0x2) >> 1) | ((X & 0x400000) >> 21) | \
+                                    ((X & 0x18) >> 1))
+
+#define MSAR_CPUCLCK_OFFS_6180		2
+#define MSAR_CPUCLCK_MASK_6180		(0x7 << MSAR_CPUCLCK_OFFS_6180)
+
+#define MSAR_DDRCLCK_RTIO_OFFS		5
+#define MSAR_DDRCLCK_RTIO_MASK		(0xF << MSAR_DDRCLCK_RTIO_OFFS)
+
+#define MSAR_L2CLCK_EXTRACT(X)      (((X & 0x600) >> 9) | ((X & 0x80000) >> 17))
+
+#ifndef MV_ASMLANGUAGE
+/* CPU clock for 6281,6192  0->Resereved */
+#define MV_CPU_CLCK_TBL { 	0,		0, 		0, 		0,	\
+			     	600000000, 	0,		800000000,	1000000000,	\
+			     	0,	 	1200000000,	0,		0,		\
+			     	1500000000,	0,		0,		0}
+
+/* DDR clock RATIO for 6281,6192 {0,0}->Reserved */
+#define MV_DDR_CLCK_RTIO_TBL	{\
+	{0, 0}, {0, 0}, {2, 1}, {0, 0}, \
+	{3, 1}, {0, 0}, {4, 1}, {9, 2}, \
+	{5, 1}, {6, 1}, {0, 0}, {0, 0}, \
+	{0, 0}, {0, 0}, {0, 0}, {0, 0} \
+}
+
+/* L2 clock RATIO for 6281,6192 {1,1}->Reserved */
+#define MV_L2_CLCK_RTIO_TBL	{\
+	{0, 0}, {2, 1}, {0, 0}, {3, 1}, \
+	{0, 0}, {0, 0}, {0, 0}, {0, 0} \
+}
+
+/* 6180 have different clk reset sampling 		*/
+/* ARM CPU, DDR, L2 clock for 6180 {0,0,0}->Reserved 	*/
+#define MV_CPU6180_DDR_L2_CLCK_TBL    { \
+	{0,   		0,   		0		},\
+	{0,   		0,   		0		},\
+	{0,   		0,   		0		},\
+	{0,   		0,   		0		},\
+	{0,   		0,   		0		},\
+	{600000000, 	200000000, 	300000000	},\
+	{800000000, 	200000000, 	400000000	},\
+	{0,   		0,   		0		}\
+}
+
+
+
+/* These macros help units to identify a target Mbus Arbiter group */
+#define MV_TARGET_IS_DRAM(target)   \
+                            ((target >= SDRAM_CS0) && (target <= SDRAM_CS3))
+
+#define MV_TARGET_IS_PEX0(target)   \
+                            ((target >= PEX0_MEM) && (target <= PEX0_IO))
+
+#define MV_TARGET_IS_PEX1(target)   0
+
+#define MV_TARGET_IS_PEX(target) (MV_TARGET_IS_PEX0(target) || MV_TARGET_IS_PEX1(target))
+
+#define MV_TARGET_IS_DEVICE(target) \
+                            ((target >= DEVICE_CS0) && (target <= DEVICE_CS3))
+
+#define MV_PCI_DRAM_BAR_TO_DRAM_TARGET(bar)   0
+
+#define	MV_TARGET_IS_AS_BOOT(target) ((target) == (sampleAtResetTargetArray[ \
+                     (mvCtrlModelGet() == MV_6180_DEV_ID)? MSAR_BOOT_MODE_6180 \
+                     (MV_REG_READ(MPP_SAMPLE_AT_RESET)):((MV_REG_READ(MPP_SAMPLE_AT_RESET)\
+						 & MSAR_BOOT_MODE_MASK) >> MSAR_BOOT_MODE_OFFS)]))
+
+
+#define MV_CHANGE_BOOT_CS(target)	(((target) == DEV_BOOCS)?\
+					sampleAtResetTargetArray[(mvCtrlModelGet() == MV_6180_DEV_ID)? \
+                    MSAR_BOOT_MODE_6180(MV_REG_READ(MPP_SAMPLE_AT_RESET)): \
+                    ((MV_REG_READ(MPP_SAMPLE_AT_RESET) & MSAR_BOOT_MODE_MASK)\
+                     >> MSAR_BOOT_MODE_OFFS)]:(target))
+					
+#define TCLK_TO_COUNTER_RATIO   1   /* counters running in Tclk */
+
+#define BOOT_TARGETS_NAME_ARRAY {       \
+    TBL_TERM,         	\
+    TBL_TERM,         	\
+    BOOT_ROM_CS,          	\
+    TBL_TERM,         	\
+    BOOT_ROM_CS,          	\
+    BOOT_ROM_CS,          \
+    TBL_TERM,         	\
+    TBL_TERM           \
+}
+
+#define BOOT_TARGETS_NAME_ARRAY_6180 {       \
+    TBL_TERM,         	\
+    BOOT_ROM_CS,          	\
+    TBL_TERM,           \
+    TBL_TERM,           \
+    TBL_TERM,           \
+    BOOT_ROM_CS,          \
+    TBL_TERM,           \
+    TBL_TERM           \
+}
+
+
+/* For old competability */
+#define DEVICE_CS0		NFLASH_CS  
+#define DEVICE_CS1  		SPI_CS 
+#define DEVICE_CS2  		BOOT_ROM_CS 
+#define DEVICE_CS3  		DEV_BOOCS
+#define MV_BOOTDEVICE_INDEX   	0
+
+#define START_DEV_CS   		DEV_CS0
+#define DEV_TO_TARGET(dev)	((dev) + DEVICE_CS0)
+
+#define PCI_IF0_MEM0		PEX0_MEM
+#define PCI_IF0_IO		PEX0_IO
+
+
+/* This enumerator defines the Marvell controller target ID      */ 
+typedef enum _mvTargetId
+{
+    DRAM_TARGET_ID  = 0 ,    /* Port 0 -> DRAM interface         */
+    DEV_TARGET_ID   = 1,     /* Port 1 -> Nand/SPI 		*/
+    PEX0_TARGET_ID  = 4 ,    /* Port 4 -> PCI Express0 		*/
+    CRYPT_TARGET_ID = 3 ,    /* Port 3 --> Crypto Engine 	*/
+    SAGE_TARGET_ID = 12 ,    /* Port 12 -> SAGE Unit 	*/
+    MAX_TARGETS_ID
+}MV_TARGET_ID;
+
+
+/* This enumerator described the possible Controller paripheral targets.    */
+/* Controller peripherals are designated memory/IO address spaces that the  */
+/* controller can access. They are also refered as "targets"                */
+typedef enum _mvTarget
+{
+    TBL_TERM = -1, 	/* none valid target, used as targets list terminator*/
+    SDRAM_CS0,      	/* SDRAM chip select 0                          */  
+    SDRAM_CS1,      	/* SDRAM chip select 1                          */  
+    SDRAM_CS2,      	/* SDRAM chip select 2                          */  
+    SDRAM_CS3,      	/* SDRAM chip select 3                          */  
+    PEX0_MEM,		/* PCI Express 0 Memory				*/
+    PEX0_IO,		/* PCI Express 0 IO				*/
+    INTER_REGS,     	/* Internal registers                           */  
+    NFLASH_CS,     	/* NFLASH_CS					*/  
+    SPI_CS,     	/* SPI_CS					*/  
+    BOOT_ROM_CS,        /* BOOT_ROM_CS                                  */  
+    DEV_BOOCS,     	/* DEV_BOOCS					*/  
+    CRYPT_ENG,      	/* Crypto Engine				*/  
+#ifdef MV_INCLUDE_SAGE
+    SAGE_UNIT,      	/* SAGE Unit					*/  
+#endif
+    MAX_TARGETS
+
+}MV_TARGET;
+
+#define TARGETS_DEF_ARRAY	{			\
+    {0x0E, DRAM_TARGET_ID }, /* SDRAM_CS0 */		\
+    {0x0D, DRAM_TARGET_ID }, /* SDRAM_CS1 */		\
+    {0x0B, DRAM_TARGET_ID }, /* SDRAM_CS0 */		\
+    {0x07, DRAM_TARGET_ID }, /* SDRAM_CS1 */		\
+    {0xE8, PEX0_TARGET_ID }, /* PEX0_MEM */			\
+    {0xE0, PEX0_TARGET_ID }, /* PEX0_IO */			\
+    {0xFF, 0xFF           }, /* INTER_REGS */		\
+    {0x2F, DEV_TARGET_ID  },  /* NFLASH_CS */		\
+    {0x1E, DEV_TARGET_ID  },  /* SPI_CS */		 	\
+    {0x1D, DEV_TARGET_ID  },  /* BOOT_ROM_CS */     \
+    {0x1E, DEV_TARGET_ID  },  /* DEV_BOOCS */		\
+    {0x01, CRYPT_TARGET_ID}, /* CRYPT_ENG */        \
+    {0x00, SAGE_TARGET_ID }  						\
+}
+
+
+#define TARGETS_NAME_ARRAY	{	\
+    "SDRAM_CS0",    /* SDRAM_CS0 */	\
+    "SDRAM_CS1",    /* SDRAM_CS1 */	\
+    "SDRAM_CS2",    /* SDRAM_CS2 */	\
+    "SDRAM_CS3",    /* SDRAM_CS3 */	\
+    "PEX0_MEM",	    /* PEX0_MEM */	\
+    "PEX0_IO",	    /* PEX0_IO */	\
+    "INTER_REGS",   /* INTER_REGS */	\
+    "NFLASH_CS",    /* NFLASH_CS */	\
+    "SPI_CS",	    /* SPI_CS */	\
+    "BOOT_ROM_CS",  /* BOOT_ROM_CS */ \
+    "DEV_BOOTCS",   /* DEV_BOOCS */	\
+    "CRYPT_ENG",    /* CRYPT_ENG */  \
+    "SAGE_UNIT"	   /* SAGE_UNIT */	\
+}
+#endif /* MV_ASMLANGUAGE */
+
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h
new file mode 100644
index 00000000..e41d80a4
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h
@@ -0,0 +1,257 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvCtrlEnvSpech
+#define __INCmvCtrlEnvSpech
+
+#include "mvDeviceId.h"
+#include "mvSysHwConfig.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define MV_ARM_SOC
+#define SOC_NAME_PREFIX			"MV88F"
+
+
+/* units base and port numbers */
+#ifdef MV_ASMLANGUAGE
+#define XOR_UNIT_BASE(unit)           	0x60800
+#else
+#define MV_XOR_REG_BASE			0x60000
+#define XOR_UNIT_BASE(unit)           	((unit)? 0x60900:0x60800)
+#endif
+
+#define TDM_REG_BASE			0xD0000
+#define USB_REG_BASE(dev)       	0x50000
+#define AUDIO_REG_BASE  		0xA0000
+#define SATA_REG_BASE           	0x80000
+#define MV_CESA_REG_BASE                0x3D000
+#define MV_CESA_TDMA_REG_BASE		0x30000
+#define MV_SDIO_REG_BASE		0x90000
+#define MV_ETH_REG_BASE(port)      	(((port) == 0) ? 0x72000 : 0x76000)
+#define MV_UART_CHAN_BASE(chanNum)	(0x12000 + (chanNum * 0x100))
+#define DRAM_BASE			0x0
+#define CNTMR_BASE                  	0x20300
+#define TWSI_SLAVE_BASE(chanNum)    	0x11000
+#define PEX_IF_BASE(pexIf)      	0x40000
+#define MPP_REG_BASE			0x10000
+#define TSU_GLOBAL_REG_BASE             0xB4000
+#define MAX_AHB_TO_MBUS_REG_BASE	0x20000
+
+#define INTER_REGS_SIZE	 	 	_1M
+/* This define describes the TWSI interrupt bit and location */
+#define TWSI_CPU_MAIN_INT_CAUSE_REG		0x20200
+#define TWSI0_CPU_MAIN_INT_BIT			(1<<29)
+#define TWSI_SPEED				100000
+
+#define MV_GPP_MAX_GROUP    		2
+#define MV_CNTMR_MAX_COUNTER 		2
+#define MV_UART_MAX_CHAN		2
+#define MV_XOR_MAX_UNIT         	2
+#define MV_XOR_MAX_CHAN         	4 /* total channels for all units together*/
+#define MV_XOR_MAX_CHAN_PER_UNIT       	2 /* channels for units */
+#define MV_SATA_MAX_CHAN	 	2
+
+#define MV_6281_MPP_MAX_MODULE    	2
+#define MV_6192_MPP_MAX_MODULE    	1
+#define MV_6190_MPP_MAX_MODULE    	1
+#define MV_6180_MPP_MAX_MODULE    	2
+#define MV_6281_MPP_MAX_GROUP    	7
+#define MV_6192_MPP_MAX_GROUP    	4
+#define MV_6190_MPP_MAX_GROUP    	4
+#define MV_6180_MPP_MAX_GROUP    	3
+
+#define MV_DRAM_MAX_CS      		4
+
+/* This define describes the maximum number of supported PCI\PCIX Interfaces*/
+#define MV_PCI_MAX_IF		0
+#define MV_PCI_START_IF		0
+
+/* This define describes the maximum number of supported PEX Interfaces 	*/
+#define MV_INCLUDE_PEX0
+#define MV_DISABLE_PEX_DEVICE_BAR 
+#define MV_PEX_MAX_IF		1
+#define MV_PEX_START_IF		MV_PCI_MAX_IF
+
+/* This define describes the maximum number of supported PCI Interfaces 	*/
+#define MV_PCI_IF_MAX_IF   	(MV_PEX_MAX_IF+MV_PCI_MAX_IF)
+
+#define MV_ETH_MAX_PORTS		2
+#define MV_6281_ETH_MAX_PORTS	   	2
+#define MV_6192_ETH_MAX_PORTS	   	2
+#define MV_6190_ETH_MAX_PORTS	   	1
+#define MV_6180_ETH_MAX_PORTS	   	1
+
+#define MV_IDMA_MAX_CHAN    		0
+
+#define MV_USB_MAX_PORTS		1
+
+#define MV_USB_VERSION              1
+
+
+#define MV_6281_NAND			1
+#define MV_6192_NAND			1
+#define MV_6190_NAND			1
+#define MV_6180_NAND			0
+
+#define MV_6281_SDIO			1
+#define MV_6192_SDIO			1
+#define MV_6190_SDIO			1
+#define MV_6180_SDIO			1
+
+#define MV_6281_TS			1
+#define MV_6192_TS			1
+#define MV_6190_TS			0
+#define MV_6180_TS			0
+
+#define MV_6281_AUDIO			1
+#define MV_6192_AUDIO			1
+#define MV_6190_AUDIO			0
+#define MV_6180_AUDIO			1
+
+#define MV_6281_TDM			1
+#define MV_6192_TDM			1
+#define MV_6190_TDM			0
+#define MV_6180_TDM			0
+
+#define MV_DEVICE_MAX_CS      		4
+
+/* Others */
+#define PEX_HOST_BUS_NUM(pciIf)		(pciIf)
+#define PEX_HOST_DEV_NUM(pciIf)		0
+
+#define PCI_IO(pciIf)		(PEX0_IO)
+#define PCI_MEM(pciIf, memNum)  (PEX0_MEM0)
+/* CESA version #2: One channel, 2KB SRAM, TDMA */
+#if defined(MV_CESA_CHAIN_MODE_SUPPORT)
+	#define MV_CESA_VERSION		 	3
+#else
+#define MV_CESA_VERSION		 	2
+#endif
+#define MV_CESA_SRAM_SIZE               2*1024
+/* This define describes the maximum number of supported Ethernet ports 	*/
+#define MV_ETH_VERSION 			4
+#define MV_ETH_MAX_RXQ              	8
+#define MV_ETH_MAX_TXQ              	8
+#define MV_ETH_PORT_SGMII          	{ MV_FALSE, MV_FALSE }
+/* This define describes the the support of USB 	*/
+#define MV_USB_VERSION  		1
+
+#define MV_INCLUDE_SDRAM_CS0
+#define MV_INCLUDE_SDRAM_CS1
+#define MV_INCLUDE_SDRAM_CS2
+#define MV_INCLUDE_SDRAM_CS3
+
+#define MV_INCLUDE_DEVICE_CS0
+#define MV_INCLUDE_DEVICE_CS1
+#define MV_INCLUDE_DEVICE_CS2
+#define MV_INCLUDE_DEVICE_CS3
+
+#define MPP_GROUP_1_TYPE {\
+	{0, 0, 0}, /* Reserved for AUTO */ \
+	{0x22220000, 0x22222222, 0x2222}, /* TDM */ \
+	{0x44440000, 0x00044444, 0x0000}, /* AUDIO */ \
+	{0x33330000, 0x33003333, 0x0033}, /* RGMII */ \
+	{0x33330000, 0x03333333, 0x0033}, /* GMII */ \
+	{0x11110000, 0x11111111, 0x0001}, /* TS */ \
+	{0x33330000, 0x33333333, 0x3333}  /* MII */ \
+}
+
+#define MPP_GROUP_2_TYPE {\
+	{0, 0, 0}, /* Reserved for AUTO */ \
+	{0x22220000, 0x22222222, 0x22}, /* TDM */ \
+	{0x44440000, 0x00044444, 0x0}, /* AUDIO */ \
+	{0, 0, 0}, /* N_A */ \
+	{0, 0, 0}, /* N_A */ \
+	{0x11110000, 0x11111111, 0x01}  /* TS */ \
+}
+
+#ifndef MV_ASMLANGUAGE
+
+/* This enumerator defines the Marvell Units ID      */ 
+typedef enum _mvUnitId
+{
+    DRAM_UNIT_ID,
+    PEX_UNIT_ID,
+    ETH_GIG_UNIT_ID,
+    USB_UNIT_ID,
+    IDMA_UNIT_ID,
+    XOR_UNIT_ID,
+    SATA_UNIT_ID,
+    TDM_UNIT_ID,
+    UART_UNIT_ID,
+    CESA_UNIT_ID,
+    SPI_UNIT_ID,
+    AUDIO_UNIT_ID,
+    SDIO_UNIT_ID,
+    TS_UNIT_ID,
+    MAX_UNITS_ID
+
+}MV_UNIT_ID;
+
+#endif
+
+#endif /* __INCmvCtrlEnvSpech */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c
new file mode 100644
index 00000000..d21bb074
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c
@@ -0,0 +1,1048 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+/* includes */
+#include "ctrlEnv/sys/mvAhbToMbus.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+#undef MV_DEBUG
+/* defines  */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif
+
+/* typedefs */
+
+
+/* CPU address remap registers offsets are inconsecutive. This struct 		*/
+/* describes address remap register offsets									*/
+typedef struct _ahbToMbusRemapRegOffs
+{
+    MV_U32 lowRegOffs;		/* Low 32-bit remap register offset			*/
+    MV_U32 highRegOffs;		/* High 32 bit remap register offset		*/
+}AHB_TO_MBUS_REMAP_REG_OFFS;
+
+/* locals   */
+static MV_STATUS ahbToMbusRemapRegOffsGet	(MV_U32 winNum,
+										AHB_TO_MBUS_REMAP_REG_OFFS *pRemapRegs);
+
+/*******************************************************************************
+* mvAhbToMbusInit - Initialize Ahb To Mbus Address Map !
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK laways.
+*
+*******************************************************************************/
+MV_STATUS mvAhbToMbusInit(void)
+{
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvAhbToMbusWinSet - Set CPU-to-peripheral winNum address window
+*
+* DESCRIPTION:
+*       This function sets
+*       address window, also known as address decode window.
+*       A new address decode window is set for specified winNum address window.
+*       If address decode window parameter structure enables the window,
+*       the routine will also enable the winNum window, allowing CPU to access
+*       the winNum window.
+*
+* INPUT:
+*       winNum      - Windows number.
+*       pAddrDecWin - CPU winNum window data structure.
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_OK if CPU winNum window was set correctly, MV_ERROR in case of
+*       address window overlapps with other active CPU winNum window or
+*		trying to assign 36bit base address while CPU does not support that.
+*       The function returns MV_NOT_SUPPORTED, if the winNum is unsupported.
+*
+*******************************************************************************/
+MV_STATUS mvAhbToMbusWinSet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin)
+{
+	MV_TARGET_ATTRIB targetAttribs;
+	MV_DEC_REGS decRegs;
+
+	/* Parameter checking   */
+	if (winNum >= MAX_AHB_TO_MBUS_WINS)
+	{
+		mvOsPrintf("mvAhbToMbusWinSet: ERR. Invalid winNum %d\n", winNum);
+		return MV_NOT_SUPPORTED;
+	}
+
+
+	/* read base register*/
+	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_BASE_REG(winNum));
+	}
+	else
+	{
+		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_INTEREG_REG);
+	}
+
+	/* check if address is aligned to the size */
+	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+	{
+		mvOsPrintf("mvAhbToMbusWinSet:Error setting AHB to MBUS window %d to "\
+				   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+				   winNum,
+				   mvCtrlTargetNameGet(pAddrDecWin->target),
+				   pAddrDecWin->addrWin.baseLow,
+				   pAddrDecWin->addrWin.size);
+		return MV_ERROR;
+	}
+
+	/* read control register*/
+	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		decRegs.sizeReg = MV_REG_READ(AHB_TO_MBUS_WIN_CTRL_REG(winNum));
+	}
+
+	if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+	{
+		mvOsPrintf("mvAhbToMbusWinSet:mvCtrlAddrDecToReg Failed\n");
+		return MV_ERROR;
+	}
+
+	/* enable\Disable */
+	if (MV_TRUE == pAddrDecWin->enable)
+	{
+		decRegs.sizeReg |= ATMWCR_WIN_ENABLE;
+	}
+	else
+	{
+		decRegs.sizeReg &= ~ATMWCR_WIN_ENABLE;
+	}
+
+	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
+
+	/* set attributes */
+	decRegs.sizeReg &= ~ATMWCR_WIN_ATTR_MASK;
+	decRegs.sizeReg |= targetAttribs.attrib << ATMWCR_WIN_ATTR_OFFS;
+	/* set target ID */
+	decRegs.sizeReg &= ~ATMWCR_WIN_TARGET_MASK;
+	decRegs.sizeReg |= targetAttribs.targetId << ATMWCR_WIN_TARGET_OFFS;
+
+#if !defined(MV_RUN_FROM_FLASH)
+    /* To be on the safe side we disable the window before writing the  */
+    /* new values.                                                      */
+	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		mvAhbToMbusWinEnable(winNum,MV_FALSE);
+	}
+#endif
+
+	/* 3) Write to address decode Base Address Register                   */
+	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		MV_REG_WRITE(AHB_TO_MBUS_WIN_BASE_REG(winNum), decRegs.baseReg);
+	}
+	else
+	{
+		MV_REG_WRITE(AHB_TO_MBUS_WIN_INTEREG_REG, decRegs.baseReg);
+	}
+
+
+	/* Internal register space have no size	*/
+	/* register. Do not perform size register assigment for those targets 	*/
+	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		/* Write to address decode Size Register                        	*/
+		MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), decRegs.sizeReg);
+	}
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvAhbToMbusWinGet - Get CPU-to-peripheral winNum address window
+*
+* DESCRIPTION:
+*		Get the CPU peripheral winNum address window.
+*
+* INPUT:
+*       winNum - Peripheral winNum enumerator
+*
+* OUTPUT:
+*       pAddrDecWin - CPU winNum window information data structure.
+*
+* RETURN:
+*       MV_OK if winNum exist, MV_ERROR otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvAhbToMbusWinGet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin)
+{
+	MV_DEC_REGS decRegs;
+	MV_TARGET_ATTRIB targetAttrib;
+
+
+	/* Parameter checking   */
+	if (winNum >= MAX_AHB_TO_MBUS_WINS)
+	{
+		mvOsPrintf("mvAhbToMbusWinGet: ERR. Invalid winNum %d\n", winNum);
+		return MV_NOT_SUPPORTED;
+	}
+
+
+	/* Internal register space size have no size register*/
+	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		decRegs.sizeReg =  MV_REG_READ(AHB_TO_MBUS_WIN_CTRL_REG(winNum));
+	}
+	else
+	{
+		decRegs.sizeReg = 0;
+	}
+
+
+	/* Read base and size	*/
+	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_BASE_REG(winNum));
+	}
+	else
+	{
+		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_INTEREG_REG);
+	}
+
+
+
+	if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
+	{
+		mvOsPrintf("mvAhbToMbusWinGet: mvCtrlRegToAddrDec Failed \n");
+		return MV_ERROR;
+	}
+
+	if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+        pAddrDecWin->addrWin.size = INTER_REGS_SIZE;
+		pAddrDecWin->target = INTER_REGS;
+		pAddrDecWin->enable = MV_TRUE;
+
+		return MV_OK;
+	}
+
+
+	if (decRegs.sizeReg & ATMWCR_WIN_ENABLE)
+	{
+		pAddrDecWin->enable = MV_TRUE;
+	}
+	else
+	{
+		pAddrDecWin->enable = MV_FALSE;
+
+	}
+
+
+
+	if (-1 == pAddrDecWin->addrWin.size)
+	{
+		return MV_ERROR;
+	}
+
+	/* attrib and targetId */
+	targetAttrib.attrib = (decRegs.sizeReg & ATMWCR_WIN_ATTR_MASK) >>
+													ATMWCR_WIN_ATTR_OFFS;
+	targetAttrib.targetId = (decRegs.sizeReg & ATMWCR_WIN_TARGET_MASK) >>
+													ATMWCR_WIN_TARGET_OFFS;
+
+	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvAhbToMbusWinTargetGet - Get Window number associated with target
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_U32	  mvAhbToMbusWinTargetGet(MV_TARGET target)
+{
+	MV_AHB_TO_MBUS_DEC_WIN decWin;
+	MV_U32 winNum;
+
+	/* Check parameters */
+	if (target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetGet: target %d is Illigal\n", target);
+		return 0xffffffff;
+	}
+
+	if (INTER_REGS == target)
+	{
+		return MV_AHB_TO_MBUS_INTREG_WIN;
+	}
+
+	for (winNum = 0; winNum < MAX_AHB_TO_MBUS_WINS ; winNum++)
+	{
+		if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
+			continue;
+
+		if (mvAhbToMbusWinGet(winNum,&decWin) != MV_OK)
+		{
+			mvOsPrintf("mvAhbToMbusWinTargetGet: mvAhbToMbusWinGet fail\n");
+			return 0xffffffff;
+
+		}
+
+		if (decWin.enable == MV_TRUE)
+		{
+			if (decWin.target == target)
+			{
+				return winNum;
+			}
+
+		}
+
+	}
+
+	return 0xFFFFFFFF;
+
+
+}
+
+/*******************************************************************************
+* mvAhbToMbusWinAvailGet - Get First Available window number.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*
+*******************************************************************************/
+MV_U32    mvAhbToMbusWinAvailGet(MV_VOID)
+{
+        MV_AHB_TO_MBUS_DEC_WIN decWin;
+        MV_U32 winNum;
+
+        for (winNum = 0; winNum < MAX_AHB_TO_MBUS_WINS ; winNum++)
+        {
+                if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
+                        continue;
+
+                if (mvAhbToMbusWinGet(winNum,&decWin) != MV_OK)
+                {
+                        mvOsPrintf("mvAhbToMbusWinTargetGet: mvAhbToMbusWinGet fail\n");
+                        return 0xffffffff;
+
+                }
+
+                if (decWin.enable == MV_FALSE)
+                {
+			return winNum;
+                }
+
+        }
+
+        return 0xFFFFFFFF;
+}
+
+
+/*******************************************************************************
+* mvAhbToMbusWinEnable - Enable/disable a CPU address decode window
+*
+* DESCRIPTION:
+*       This function enable/disable a CPU address decode window.
+*       if parameter 'enable' == MV_TRUE the routine will enable the
+*       window, thus enabling CPU accesses (before enabling the window it is
+*       tested for overlapping). Otherwise, the window will be disabled.
+*
+* INPUT:
+*       winNum - Peripheral winNum enumerator.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_ERROR if protection window number was wrong, or the window
+*       overlapps other winNum window.
+*
+*******************************************************************************/
+MV_STATUS mvAhbToMbusWinEnable(MV_U32 winNum, MV_BOOL enable)
+{
+
+	/* Parameter checking   */
+	if (winNum >= MAX_AHB_TO_MBUS_WINS)
+	{
+		mvOsPrintf("mvAhbToMbusWinEnable: ERR. Invalid winNum %d\n", winNum);
+		return MV_NOT_SUPPORTED;
+	}
+
+	/* Internal registers bar can't be disable or enabled */
+	if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
+	{
+		return (enable ? MV_OK : MV_ERROR);
+	}
+
+    if (enable == MV_TRUE)
+    {
+		/* enable the window */
+		MV_REG_BIT_SET(AHB_TO_MBUS_WIN_CTRL_REG(winNum), ATMWCR_WIN_ENABLE);
+    }
+    else
+    {   /* Disable address decode winNum window                             */
+		MV_REG_BIT_RESET(AHB_TO_MBUS_WIN_CTRL_REG(winNum), ATMWCR_WIN_ENABLE);
+    }
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvAhbToMbusWinRemap - Set CPU remap register for address windows.
+*
+* DESCRIPTION:
+*       After a CPU address hits one of PCI address decode windows there is an
+*       option to remap the address to a different one. For example, CPU
+*       executes a read from PCI winNum window address 0x1200.0000. This
+*       can be modified so the address on the PCI bus would be 0x1400.0000
+*       Using the PCI address remap mechanism.
+*
+* INPUT:
+*       winNum      - Peripheral winNum enumerator. Must be a PCI winNum.
+*       pAddrDecWin - CPU winNum window information data structure.
+*                     Note that caller has to fill in the base field only. The
+*                     size field is ignored.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if winNum is not a PCI one, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_U32 mvAhbToMbusWinRemap(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32 baseAddr;
+	AHB_TO_MBUS_REMAP_REG_OFFS remapRegOffs;
+
+    MV_U32 effectiveBaseAddress=0,
+		   baseAddrValue=0,windowSizeValue=0;
+
+
+	/* Get registers offsets of given winNum 		*/
+	if (MV_NO_SUCH == ahbToMbusRemapRegOffsGet(winNum, &remapRegOffs))
+	{
+		return 0xffffffff;
+	}
+
+	/* 1) Set address remap low */
+    baseAddr = pAddrWin->baseLow;
+
+    /* Check base address aligment 					*/
+	/*
+	if (MV_IS_NOT_ALIGN(baseAddr, ATMWRLR_REMAP_LOW_ALIGNMENT))
+	{
+        mvOsPrintf("mvAhbToMbusPciRemap: Warning. Target base 0x%x unaligned\n",
+																baseAddr);
+        return MV_ERROR;
+	}
+	*/
+
+	/* BaseLow[31:16] => base register [31:16] 		*/
+	baseAddr = baseAddr & ATMWRLR_REMAP_LOW_MASK;
+
+    MV_REG_WRITE(remapRegOffs.lowRegOffs, baseAddr);
+
+	MV_REG_WRITE(remapRegOffs.highRegOffs, pAddrWin->baseHigh);
+
+
+	baseAddrValue = MV_REG_READ(AHB_TO_MBUS_WIN_BASE_REG(winNum));
+	windowSizeValue = MV_REG_READ(AHB_TO_MBUS_WIN_CTRL_REG(winNum));
+
+	baseAddrValue &= ATMWBR_BASE_MASK;
+	windowSizeValue &=ATMWCR_WIN_SIZE_MASK;
+
+   /* Start calculating the effective Base Address */
+   effectiveBaseAddress = baseAddrValue ;
+
+   /* The effective base address will be combined from the chopped (if any)
+	  remap value (according to the size value and remap mechanism) and the
+	  window's base address */
+   effectiveBaseAddress |= (((windowSizeValue) | 0xffff) & pAddrWin->baseLow);
+   /* If the effectiveBaseAddress exceed the window boundaries return an
+	  invalid value. */
+
+   if (effectiveBaseAddress > (baseAddrValue + (windowSizeValue | 0xffff)))
+   {
+		mvOsPrintf("mvAhbToMbusPciRemap: Error\n");
+		return 0xffffffff;
+   }
+
+	return effectiveBaseAddress;
+
+
+}
+/*******************************************************************************
+* mvAhbToMbusWinTargetSwap - Swap AhbToMbus windows between targets
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       target1      - CPU Interface target 1
+*       target2      - CPU Interface target 2
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if targets are illigal, or if one of the targets is not
+*	    associated to a valid window .
+*       MV_OK otherwise.
+*
+*******************************************************************************/
+
+
+MV_STATUS mvAhbToMbusWinTargetSwap(MV_TARGET target1,MV_TARGET target2)
+{
+	MV_U32 winNum1,winNum2;
+	MV_AHB_TO_MBUS_DEC_WIN winDec1,winDec2,winDecTemp;
+	AHB_TO_MBUS_REMAP_REG_OFFS remapRegs1,remapRegs2;
+	MV_U32 remapBaseLow1=0,remapBaseLow2=0;
+	MV_U32 remapBaseHigh1=0,remapBaseHigh2=0;
+
+
+	/* Check parameters */
+	if (target1 >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d is Illigal\n", target1);
+		return MV_ERROR;
+	}
+
+	if (target2 >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d is Illigal\n", target1);
+		return MV_ERROR;
+	}
+
+
+    /* get window associated with this target */
+	winNum1 = mvAhbToMbusWinTargetGet(target1);
+
+	if (winNum1 == 0xffffffff)
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d has illigal win %d\n",
+					target1,winNum1);
+		return MV_ERROR;
+
+	}
+
+    /* get window associated with this target */
+	winNum2 = mvAhbToMbusWinTargetGet(target2);
+
+	if (winNum2 == 0xffffffff)
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d has illigal win %d\n",
+					target2,winNum2);
+		return MV_ERROR;
+
+	}
+
+	/* now Get original values of both Windows */
+	if (MV_OK != mvAhbToMbusWinGet(winNum1,&winDec1))
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: mvAhbToMbusWinGet failed win %d\n",
+					winNum1);
+		return MV_ERROR;
+
+	}
+	if (MV_OK != mvAhbToMbusWinGet(winNum2,&winDec2))
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: mvAhbToMbusWinGet failed win %d\n",
+					winNum2);
+		return MV_ERROR;
+
+	}
+
+
+	/* disable both windows */
+	if (MV_OK != mvAhbToMbusWinEnable(winNum1,MV_FALSE))
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: failed to enable window %d\n",
+					winNum1);
+		return MV_ERROR;
+
+	}
+	if (MV_OK != mvAhbToMbusWinEnable(winNum2,MV_FALSE))
+	{
+		mvOsPrintf("mvAhbToMbusWinTargetSwap: failed to enable windo %d\n",
+					winNum2);
+		return MV_ERROR;
+
+	}
+
+
+	/* now swap targets */
+
+	/* first save winDec2 values */
+	winDecTemp.addrWin.baseHigh = winDec2.addrWin.baseHigh;
+	winDecTemp.addrWin.baseLow = winDec2.addrWin.baseLow;
+	winDecTemp.addrWin.size = winDec2.addrWin.size;
+	winDecTemp.enable = winDec2.enable;
+	winDecTemp.target = winDec2.target;
+
+	/* winDec2 = winDec1 */
+	winDec2.addrWin.baseHigh = winDec1.addrWin.baseHigh;
+	winDec2.addrWin.baseLow = winDec1.addrWin.baseLow;
+	winDec2.addrWin.size = winDec1.addrWin.size;
+	winDec2.enable = winDec1.enable;
+	winDec2.target = winDec1.target;
+
+
+	/* winDec1 = winDecTemp */
+	winDec1.addrWin.baseHigh = winDecTemp.addrWin.baseHigh;
+	winDec1.addrWin.baseLow = winDecTemp.addrWin.baseLow;
+	winDec1.addrWin.size = winDecTemp.addrWin.size;
+	winDec1.enable = winDecTemp.enable;
+	winDec1.target = winDecTemp.target;
+
+
+	/* now set the new values */
+
+
+    mvAhbToMbusWinSet(winNum1,&winDec1);
+	mvAhbToMbusWinSet(winNum2,&winDec2);
+
+
+
+
+
+	/* now we will treat the remap windows if exist */
+
+
+	/* now check if one or both windows has a remap window
+	as well after the swap ! */
+
+	/* if a window had a remap value differnt than the base value
+	before the swap , then after the swap the remap value will be
+	equal to the base value unless both windows has a remap windows*/
+
+	/* first get old values */
+	if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum1,&remapRegs1))
+	{
+		remapBaseLow1 = MV_REG_READ(remapRegs1.lowRegOffs);
+	    remapBaseHigh1 = MV_REG_READ(remapRegs1.highRegOffs);
+
+	}
+	if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum2,&remapRegs2))
+	{
+		remapBaseLow2 = MV_REG_READ(remapRegs2.lowRegOffs);
+	    remapBaseHigh2 = MV_REG_READ(remapRegs2.highRegOffs);
+
+
+	}
+
+	/* now do the swap */
+	if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum1,&remapRegs1))
+	{
+		if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum2,&remapRegs2))
+		{
+			/* Two windows has a remap !!! so swap */
+
+			MV_REG_WRITE(remapRegs2.highRegOffs,remapBaseHigh1);
+			MV_REG_WRITE(remapRegs2.lowRegOffs,remapBaseLow1);
+
+			MV_REG_WRITE(remapRegs1.highRegOffs,remapBaseHigh2);
+			MV_REG_WRITE(remapRegs1.lowRegOffs,remapBaseLow2);
+
+
+
+		}
+		else
+		{
+			/* remap == base */
+			MV_REG_WRITE(remapRegs1.highRegOffs,winDec1.addrWin.baseHigh);
+			MV_REG_WRITE(remapRegs1.lowRegOffs,winDec1.addrWin.baseLow);
+
+		}
+
+	}
+	else if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum2,&remapRegs2))
+	{
+		/* remap == base */
+		MV_REG_WRITE(remapRegs2.highRegOffs,winDec2.addrWin.baseHigh);
+		MV_REG_WRITE(remapRegs2.lowRegOffs,winDec2.addrWin.baseLow);
+
+	}
+
+
+
+	return MV_OK;
+
+
+}
+
+
+
+#if defined(MV_88F1181)
+
+/*******************************************************************************
+* mvAhbToMbusXbarCtrlSet - Set The CPU master Xbar arbitration.
+*
+* DESCRIPTION:
+*       This function sets CPU Mbus Arbiter
+*
+* INPUT:
+*       pPizzaArbArray - A priority Structure describing 16 "pizza slices". At
+*                    each clock cycle, the crossbar arbiter samples all
+*                    requests and gives the bus to the next agent according
+*                    to the "pizza".
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_ERROR if paramers to function invalid.
+*
+*******************************************************************************/
+MV_STATUS  mvMbusArbSet(MV_MBUS_ARB_TARGET *pPizzaArbArray)
+{
+	MV_U32 sliceNum;
+	MV_U32 xbarCtrl = 0;
+	MV_MBUS_ARB_TARGET xbarTarget;
+
+	/* 1) Set crossbar control low register */
+	for (sliceNum = 0; sliceNum < MRLR_SLICE_NUM; sliceNum++)
+	{
+		xbarTarget = pPizzaArbArray[sliceNum];
+
+		/* sliceNum parameter check */
+		if (xbarTarget > MAX_MBUS_ARB_TARGETS)
+		{
+			mvOsPrintf("mvAhbToMbusXbarCtrlSet: ERR. Can't set Target %d\n",
+																  xbarTarget);
+			return MV_ERROR;
+		}
+		xbarCtrl |= (xbarTarget << MRLR_LOW_ARB_OFFS(sliceNum));
+	}
+	/* Write to crossbar control low register */
+    MV_REG_WRITE(MBUS_ARBITER_LOW_REG, xbarCtrl);
+
+	xbarCtrl = 0;
+
+	/* 2) Set crossbar control high register */
+	for (sliceNum = MRLR_SLICE_NUM;
+		 sliceNum < MRLR_SLICE_NUM+MRHR_SLICE_NUM;
+		 sliceNum++)
+	{
+
+		xbarTarget = pPizzaArbArray[sliceNum];
+
+		/* sliceNum parameter check */
+		if (xbarTarget > MAX_MBUS_ARB_TARGETS)
+		{
+			mvOsPrintf("mvAhbToMbusXbarCtrlSet: ERR. Can't set Target %d\n",
+																  xbarTarget);
+			return MV_ERROR;
+		}
+		xbarCtrl |= (xbarTarget << MRHR_HIGH_ARB_OFFS(sliceNum));
+	}
+	/* Write to crossbar control high register */
+    MV_REG_WRITE(MBUS_ARBITER_HIGH_REG, xbarCtrl);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvMbusArbCtrlSet - Set MBus Arbiter control register
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       ctrl  - pointer to MV_MBUS_ARB_CTRL register
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_ERROR if paramers to function invalid.
+*
+*******************************************************************************/
+MV_STATUS mvMbusArbCtrlSet(MV_MBUS_ARB_CTRL *ctrl)
+{
+
+	if (ctrl->highPrio == MV_FALSE)
+	{
+		MV_REG_BIT_RESET(MBUS_ARBITER_CTRL_REG, MACR_ARB_ARM_TOP);
+	}
+	else
+	{
+		MV_REG_BIT_SET(MBUS_ARBITER_CTRL_REG, MACR_ARB_ARM_TOP);
+	}
+
+	if (ctrl->fixedRoundRobin == MV_FALSE)
+	{
+		MV_REG_BIT_RESET(MBUS_ARBITER_CTRL_REG, MACR_ARB_TARGET_FIXED);
+	}
+	else
+	{
+		MV_REG_BIT_SET(MBUS_ARBITER_CTRL_REG, MACR_ARB_TARGET_FIXED);
+	}
+
+	if (ctrl->starvEn == MV_FALSE)
+	{
+		MV_REG_BIT_RESET(MBUS_ARBITER_CTRL_REG, MACR_ARB_REQ_CTRL_EN);
+	}
+	else
+	{
+		MV_REG_BIT_SET(MBUS_ARBITER_CTRL_REG, MACR_ARB_REQ_CTRL_EN);
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvMbusArbCtrlGet - Get MBus Arbiter control register
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       ctrl  - pointer to MV_MBUS_ARB_CTRL register
+*
+* OUTPUT:
+*       ctrl  - pointer to MV_MBUS_ARB_CTRL register
+*
+* RETURN:
+*       MV_ERROR if paramers to function invalid.
+*
+*******************************************************************************/
+MV_STATUS mvMbusArbCtrlGet(MV_MBUS_ARB_CTRL *ctrl)
+{
+
+	MV_U32 ctrlReg = MV_REG_READ(MBUS_ARBITER_CTRL_REG);
+
+	if (ctrlReg & MACR_ARB_ARM_TOP)
+	{
+		ctrl->highPrio = MV_TRUE;
+	}
+	else
+	{
+		ctrl->highPrio = MV_FALSE;
+	}
+
+	if (ctrlReg & MACR_ARB_TARGET_FIXED)
+	{
+		ctrl->fixedRoundRobin = MV_TRUE;
+	}
+	else
+	{
+		ctrl->fixedRoundRobin = MV_FALSE;
+	}
+
+	if (ctrlReg & MACR_ARB_REQ_CTRL_EN)
+	{
+		ctrl->starvEn = MV_TRUE;
+	}
+	else
+	{
+		ctrl->starvEn = MV_FALSE;
+	}
+
+
+	return MV_OK;
+}
+
+#endif  /* #if defined(MV_88F1181) */
+
+
+
+/*******************************************************************************
+* ahbToMbusRemapRegOffsGet - Get CPU address remap register offsets
+*
+* DESCRIPTION:
+* 		CPU to PCI address remap registers offsets are inconsecutive.
+*		This function returns PCI address remap registers offsets.
+*
+* INPUT:
+*       winNum - Address decode window number. See MV_U32 enumerator.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*		MV_ERROR if winNum is not a PCI one.
+*
+*******************************************************************************/
+static MV_STATUS ahbToMbusRemapRegOffsGet(MV_U32 winNum,
+									AHB_TO_MBUS_REMAP_REG_OFFS *pRemapRegs)
+{
+	switch (winNum)
+	{
+		case 0:
+        case 1:
+			pRemapRegs->lowRegOffs  = AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum);
+			pRemapRegs->highRegOffs = AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum);
+			break;
+		case 2:
+		case 3:
+			if((mvCtrlModelGet() == MV_5281_DEV_ID) ||
+				(mvCtrlModelGet() == MV_1281_DEV_ID) ||
+				(mvCtrlModelGet() == MV_6183_DEV_ID) ||
+               (mvCtrlModelGet() == MV_6183L_DEV_ID))
+			{
+				pRemapRegs->lowRegOffs  = AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum);
+				pRemapRegs->highRegOffs = AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum);
+				break;
+			}
+			else
+			{
+				pRemapRegs->lowRegOffs  = 0;
+				pRemapRegs->highRegOffs = 0;
+
+				DB(mvOsPrintf("ahbToMbusRemapRegOffsGet: ERR. Invalid winNum %d\n",
+							winNum));
+				return MV_NO_SUCH;
+			}
+		default:
+		{
+			pRemapRegs->lowRegOffs  = 0;
+			pRemapRegs->highRegOffs = 0;
+
+			DB(mvOsPrintf("ahbToMbusRemapRegOffsGet: ERR. Invalid winNum %d\n",
+						winNum));
+		   	return MV_NO_SUCH;
+		}
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvAhbToMbusAddDecShow - Print the AHB to MBus bridge address decode map.
+*
+* DESCRIPTION:
+*		This function print the CPU address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvAhbToMbusAddDecShow(MV_VOID)
+{
+	MV_AHB_TO_MBUS_DEC_WIN win;
+	MV_U32 winNum;
+	mvOsOutput( "\n" );
+	mvOsOutput( "AHB To MBUS Bridge:\n" );
+	mvOsOutput( "-------------------\n" );
+
+	for( winNum = 0; winNum < MAX_AHB_TO_MBUS_WINS; winNum++ )
+	{
+		memset( &win, 0, sizeof(MV_AHB_TO_MBUS_DEC_WIN) );
+
+		mvOsOutput( "win%d - ", winNum );
+
+		if( mvAhbToMbusWinGet( winNum, &win ) == MV_OK )
+		{
+			if( win.enable )
+			{
+				mvOsOutput( "%s base %08x, ",
+				mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
+                		mvOsOutput( "...." );
+				mvSizePrint( win.addrWin.size );
+
+				mvOsOutput( "\n" );
+
+            }
+			else
+				mvOsOutput( "disable\n" );
+		}
+	}
+
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h
new file mode 100644
index 00000000..1b352a1f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h
@@ -0,0 +1,130 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvAhbToMbush
+#define __INCmvAhbToMbush
+
+/* includes */
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/sys/mvAhbToMbusRegs.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+/* defines  */
+
+#if defined(MV_88F1181)
+/* This enumerator defines the Marvell controller possible MBUS arbiter     */
+/* target ports. It is used to define crossbar priority scheame (pizza)     */ 
+typedef enum _mvMBusArbTargetId
+{
+    DRAM_MBUS_ARB_TARGET = 0,    /* Port 0 -> DRAM interface         */
+    TWSI_MBUS_ARB_TARGET  = 1,     /* Port 1 -> TWSI 		    */
+    ARM_MBUS_ARB_TARGET   = 2,     /* Port 2 -> ARM		    */
+	PEX1_MBUS_ARB_TARGET  = 3,    /* Port 3 -> PCI Express 1		    */
+    PEX0_MBUS_ARB_TARGET  = 4,    /* Port 4 -> PCI Express0 		    */
+	MAX_MBUS_ARB_TARGETS
+}MV_MBUS_ARB_TARGET;
+
+typedef struct _mvMBusArbCtrl
+{
+	MV_BOOL starvEn;
+	MV_BOOL highPrio;
+	MV_BOOL fixedRoundRobin;
+
+}MV_MBUS_ARB_CTRL;
+
+#endif /* #if defined(MV_88F1181) */
+
+typedef struct _mvAhbtoMbusDecWin
+{
+	MV_TARGET	  target;
+	MV_ADDR_WIN   addrWin;    /* An address window*/
+	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+
+}MV_AHB_TO_MBUS_DEC_WIN;
+
+/* mvAhbToMbus.h API list */
+
+MV_STATUS mvAhbToMbusInit(MV_VOID);
+MV_STATUS mvAhbToMbusWinSet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin);
+MV_STATUS mvAhbToMbusWinGet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin);
+MV_STATUS mvAhbToMbusWinEnable(MV_U32 winNum,MV_BOOL enable);
+MV_U32    mvAhbToMbusWinRemap(MV_U32 winNum, MV_ADDR_WIN *pAddrDecWin);
+MV_U32	  mvAhbToMbusWinTargetGet(MV_TARGET target);
+MV_U32    mvAhbToMbusWinAvailGet(MV_VOID);
+MV_STATUS mvAhbToMbusWinTargetSwap(MV_TARGET target1,MV_TARGET target2);
+
+#if defined(MV_88F1181)
+
+MV_STATUS mvMbusArbSet(MV_MBUS_ARB_TARGET *pPizzaArbArray);
+MV_STATUS mvMbusArbCtrlSet(MV_MBUS_ARB_CTRL *ctrl);
+MV_STATUS mvMbusArbCtrlGet(MV_MBUS_ARB_CTRL *ctrl);
+
+#endif /* #if defined(MV_88F1181) */
+
+
+MV_VOID   mvAhbToMbusAddDecShow(MV_VOID);
+
+
+#endif /* __INCmvAhbToMbush */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h
new file mode 100644
index 00000000..97dc6318
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h
@@ -0,0 +1,143 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvAhbToMbusRegsh
+#define __INCmvAhbToMbusRegsh
+
+/******************************/
+/* ARM Address Map Registers  */
+/******************************/
+
+#define MAX_AHB_TO_MBUS_WINS	9
+#define MV_AHB_TO_MBUS_INTREG_WIN	8
+
+
+#define AHB_TO_MBUS_WIN_CTRL_REG(winNum)		(0x20000 + (winNum)*0x10)
+#define AHB_TO_MBUS_WIN_BASE_REG(winNum)		(0x20004 + (winNum)*0x10)
+#define AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum)	(0x20008 + (winNum)*0x10)
+#define AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum)	(0x2000C + (winNum)*0x10)
+#define AHB_TO_MBUS_WIN_INTEREG_REG				 0x20080
+
+/* Window Control Register      */
+/* AHB_TO_MBUS_WIN_CTRL_REG (ATMWCR)*/
+#define ATMWCR_WIN_ENABLE					BIT0	/* Window Enable */
+
+#define ATMWCR_WIN_TARGET_OFFS			4 /* The target interface associated 
+											 with this window*/
+#define ATMWCR_WIN_TARGET_MASK			(0xf << ATMWCR_WIN_TARGET_OFFS)
+
+#define ATMWCR_WIN_ATTR_OFFS				8 /* The target interface attributes
+											 Associated with this window */
+#define ATMWCR_WIN_ATTR_MASK				(0xff << ATMWCR_WIN_ATTR_OFFS)
+
+											 
+/*
+Used with the Base register to set the address window size and location
+Must be programed from LSB to MSB as sequence of 1’s followed
+by sequence of 0’s. The number of 1’s specifies the size of the window
+in 64 KB granularity (e.g. a value of 0x00FF specifies 256 = 16 MB).
+
+NOTE: A value of 0x0 specifies 64KB size.
+*/
+#define ATMWCR_WIN_SIZE_OFFS				16 /* Window Size */
+#define ATMWCR_WIN_SIZE_MASK				(0xffff << ATMWCR_WIN_SIZE_OFFS)
+#define ATMWCR_WIN_SIZE_ALIGNMENT			0x10000
+
+/*  Window Base Register     */
+/* AHB_TO_MBUS_WIN_BASE_REG (ATMWBR) */
+
+/*
+Used with the size field to set the address window size and location.
+Corresponds to transaction address[31:16]
+*/
+#define ATMWBR_BASE_OFFS					16 /* Base Address */
+#define ATMWBR_BASE_MASK					(0xffff << 	ATMWBR_BASE_OFFS)
+#define ATMWBR_BASE_ALIGNMENT				0x10000
+
+/*  Window Remap Low Register   */
+/* AHB_TO_MBUS_WIN_REMAP_LOW_REG (ATMWRLR) */
+
+/*
+Used with the size field to specifies address bits[31:0] to be driven to
+the target interface.:
+target_addr[31:16] = (addr[31:16] & size[15:0]) | (remap[31:16] & ~size[15:0])
+*/
+#define ATMWRLR_REMAP_LOW_OFFS			16 /* Remap Address */
+#define ATMWRLR_REMAP_LOW_MASK			(0xffff << ATMWRLR_REMAP_LOW_OFFS)
+#define ATMWRLR_REMAP_LOW_ALIGNMENT		0x10000
+
+/* Window Remap High Register   */
+/* AHB_TO_MBUS_WIN_REMAP_HIGH_REG (ATMWRHR) */
+
+/*
+Specifies address bits[63:32] to be driven to the target interface.
+target_addr[63:32] = (RemapHigh[31:0]
+*/
+#define ATMWRHR_REMAP_HIGH_OFFS			0 /* Remap Address */
+#define ATMWRHR_REMAP_HIGH_MASK			(0xffffffff << ATMWRHR_REMAP_HIGH_OFFS)
+
+
+#endif /* __INCmvAhbToMbusRegsh */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c
new file mode 100644
index 00000000..872dc6e9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c
@@ -0,0 +1,1036 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+/* includes */
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "ctrlEnv/sys/mvAhbToMbusRegs.h"
+#include "cpu/mvCpu.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "mvSysHwConfig.h"
+#include "mvSysDram.h"
+
+/*#define MV_DEBUG*/
+/* defines  */
+
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif
+
+/* locals   */
+/* static functions */
+static MV_BOOL cpuTargetWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin);
+
+MV_TARGET * sampleAtResetTargetArray;
+MV_TARGET sampleAtResetTargetArrayP[] = BOOT_TARGETS_NAME_ARRAY;
+MV_TARGET sampleAtResetTargetArray6180P[] = BOOT_TARGETS_NAME_ARRAY_6180;
+/*******************************************************************************
+* mvCpuIfInit - Initialize Controller CPU interface
+*
+* DESCRIPTION:
+*       This function initialize Controller CPU interface:
+*       1. Set CPU interface configuration registers.
+*       2. Set CPU master Pizza arbiter control according to static
+*          configuration described in configuration file.
+*       3. Opens CPU address decode windows. DRAM windows are assumed to be
+*		   already set (auto detection).
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvCpuIfInit(MV_CPU_DEC_WIN *cpuAddrWinMap)
+{
+	MV_U32 regVal;
+	MV_TARGET target;
+	MV_ADDR_WIN addrWin;
+
+	if (cpuAddrWinMap == NULL)
+	{
+		DB(mvOsPrintf("mvCpuIfInit:ERR. cpuAddrWinMap == NULL\n"));
+		return MV_ERROR;
+	}
+
+    /*Initialize the boot target array according to device type*/
+    if(mvCtrlModelGet() == MV_6180_DEV_ID)
+        sampleAtResetTargetArray = sampleAtResetTargetArray6180P;
+    else
+        sampleAtResetTargetArray = sampleAtResetTargetArrayP;
+
+	/* Set ARM Configuration register */
+	regVal  = MV_REG_READ(CPU_CONFIG_REG);
+	regVal &= ~CPU_CONFIG_DEFAULT_MASK;
+	regVal |= CPU_CONFIG_DEFAULT;
+	MV_REG_WRITE(CPU_CONFIG_REG,regVal);
+
+	/* First disable all CPU target windows  */
+	for (target = 0; cpuAddrWinMap[target].enable != TBL_TERM; target++)
+    	{
+		if ((MV_TARGET_IS_DRAM(target))||(target == INTER_REGS))
+		{
+			continue;
+		}
+
+#if defined(MV_MEM_OVER_PCI_WA) || defined(MV_UART_OVER_PCI_WA)
+		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
+		if (MV_TARGET_IS_PCI(target))
+		{
+			continue;
+		}
+#endif
+
+#if defined(MV_MEM_OVER_PEX_WA) || defined(MV_UART_OVER_PEX_WA)
+		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
+		if (MV_TARGET_IS_PEX(target))
+		{
+			continue;
+		}
+#endif
+#if defined(MV_RUN_FROM_FLASH)
+        	/* Don't disable the boot device.                               */
+		if (target == DEV_BOOCS)
+		{
+			continue;
+		}
+#endif /* MV_RUN_FROM_FLASH */
+		mvCpuIfTargetWinEnable(MV_CHANGE_BOOT_CS(target),MV_FALSE);
+	}
+
+#if defined(MV_RUN_FROM_FLASH)
+    	/* Resize the bootcs windows before other windows, because this     */
+    	/* window is enabled and will cause an overlap if not resized.      */
+	target = DEV_BOOCS;
+
+	if (MV_OK != mvCpuIfTargetWinSet(target, &cpuAddrWinMap[target]))
+	{
+		DB(mvOsPrintf("mvCpuIfInit:ERR. mvCpuIfTargetWinSet fail\n"));
+		return MV_ERROR;
+	}
+
+	addrWin.baseLow = cpuAddrWinMap[target].addrWin.baseLow;
+	addrWin.baseHigh = cpuAddrWinMap[target].addrWin.baseHigh;
+	if (0xffffffff == mvAhbToMbusWinRemap(cpuAddrWinMap[target].winNum ,&addrWin))
+	{
+		DB(mvOsPrintf("mvCpuIfInit:WARN. mvAhbToMbusWinRemap can't remap winNum=%d\n",
+					  cpuAddrWinMap[target].winNum));
+	}
+
+#endif /* MV_RUN_FROM_FLASH */
+
+	/* Go through all targets in user table until table terminator			*/
+	for (target = 0; cpuAddrWinMap[target].enable != TBL_TERM; target++)
+    	{
+
+#if defined(MV_RUN_FROM_FLASH)
+	if (target == DEV_BOOCS)
+	{
+		continue;
+	}
+#endif /* MV_RUN_FROM_FLASH */
+
+	/* if DRAM auto sizing is used do not initialized DRAM target windows, 	*/
+	/* assuming this already has been done earlier.							*/
+#ifdef	MV_DRAM_AUTO_SIZE
+		if (MV_TARGET_IS_DRAM(target))
+		{
+			continue;
+		}
+#endif
+
+#if defined(MV_MEM_OVER_PCI_WA) || defined(MV_UART_OVER_PCI_WA)
+		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
+		if (MV_TARGET_IS_PCI(target))
+		{
+			continue;
+		}
+#endif
+
+#if defined(MV_MEM_OVER_PEX_WA) || defined(MV_UART_OVER_PEX_WA)
+		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
+		if (MV_TARGET_IS_PEX(target))
+		{
+			continue;
+		}
+#endif
+	/* If the target attribute is the same as the boot device attribute */
+	/* then it's stays disable */
+		if (MV_TARGET_IS_AS_BOOT(target))
+		{
+			continue;
+		}
+
+		if((0 == cpuAddrWinMap[target].addrWin.size) ||
+		   (DIS == cpuAddrWinMap[target].enable))
+
+		{
+			if (MV_OK != mvCpuIfTargetWinEnable(target, MV_FALSE))
+			{
+				DB(mvOsPrintf("mvCpuIfInit:ERR. mvCpuIfTargetWinEnable fail\n"));
+				return MV_ERROR;
+			}
+
+		}
+		else
+		{
+			if (MV_OK != mvCpuIfTargetWinSet(target, &cpuAddrWinMap[target]))
+			{
+				DB(mvOsPrintf("mvCpuIfInit:ERR. mvCpuIfTargetWinSet fail\n"));
+				return MV_ERROR;
+			}
+
+			addrWin.baseLow = cpuAddrWinMap[target].addrWin.baseLow;
+			addrWin.baseHigh = cpuAddrWinMap[target].addrWin.baseHigh;
+			if (0xffffffff == mvAhbToMbusWinRemap(cpuAddrWinMap[target].winNum ,&addrWin))
+			{
+				DB(mvOsPrintf("mvCpuIfInit:WARN. mvAhbToMbusWinRemap can't remap winNum=%d\n",
+							  cpuAddrWinMap[target].winNum));
+			}
+
+
+		}
+    }
+
+	return MV_OK;
+
+
+}
+
+
+/*******************************************************************************
+* mvCpuIfTargetWinSet - Set CPU-to-peripheral target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI0_MEM0)
+*       address window, also known as address decode window.
+*       A new address decode window is set for specified target address window.
+*       If address decode window parameter structure enables the window,
+*       the routine will also enable the target window, allowing CPU to access
+*       the target window.
+*
+* INPUT:
+*       target      - Peripheral target enumerator.
+*       pAddrDecWin - CPU target window data structure.
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_OK if CPU target window was set correctly, MV_ERROR in case of
+*       address window overlapps with other active CPU target window or
+*		trying to assign 36bit base address while CPU does not support that.
+*       The function returns MV_NOT_SUPPORTED, if the target is unsupported.
+*
+*******************************************************************************/
+MV_STATUS mvCpuIfTargetWinSet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin)
+{
+	MV_AHB_TO_MBUS_DEC_WIN decWin;
+	MV_U32 existingWinNum;
+	MV_DRAM_DEC_WIN addrDecWin;
+
+	target = MV_CHANGE_BOOT_CS(target);
+
+	/* Check parameters */
+	if (target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvCpuIfTargetWinSet: target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+    	/* 2) Check if the requested window overlaps with current windows		*/
+    	if (MV_TRUE == cpuTargetWinOverlap(target, &pAddrDecWin->addrWin))
+	{
+        	mvOsPrintf("mvCpuIfTargetWinSet: ERR. Target %d overlap\n", target);
+		return MV_BAD_PARAM;
+	}
+
+	if (MV_TARGET_IS_DRAM(target))
+	{
+		/* copy relevant data to MV_DRAM_DEC_WIN structure */
+		addrDecWin.addrWin.baseHigh = pAddrDecWin->addrWin.baseHigh;
+		addrDecWin.addrWin.baseLow = pAddrDecWin->addrWin.baseLow;
+		addrDecWin.addrWin.size = pAddrDecWin->addrWin.size;
+		addrDecWin.enable = pAddrDecWin->enable;
+
+
+		if (mvDramIfWinSet(target,&addrDecWin) != MV_OK);
+		{
+			mvOsPrintf("mvCpuIfTargetWinSet: mvDramIfWinSet Failed\n");
+			return MV_ERROR;
+		}
+
+	}
+	else
+	{
+		/* copy relevant data to MV_AHB_TO_MBUS_DEC_WIN structure */
+		decWin.addrWin.baseLow = pAddrDecWin->addrWin.baseLow;
+		decWin.addrWin.baseHigh = pAddrDecWin->addrWin.baseHigh;
+		decWin.addrWin.size = pAddrDecWin->addrWin.size;
+		decWin.enable = pAddrDecWin->enable;
+		decWin.target = target;
+
+		existingWinNum = mvAhbToMbusWinTargetGet(target);
+
+		/* check if there is already another Window configured
+		for this target */
+		if ((existingWinNum < MAX_AHB_TO_MBUS_WINS )&&
+			(existingWinNum != pAddrDecWin->winNum))
+		{
+			/* if we want to enable the new winow number
+			passed by the user , then the old one should
+			be disabled */
+			if (MV_TRUE == pAddrDecWin->enable)
+			{
+				/* be sure it is disabled */
+				mvAhbToMbusWinEnable(existingWinNum , MV_FALSE);
+			}
+		}
+
+        if (mvAhbToMbusWinSet(pAddrDecWin->winNum,&decWin) != MV_OK)
+		{
+			mvOsPrintf("mvCpuIfTargetWinSet: mvAhbToMbusWinSet Failed\n");
+			return MV_ERROR;
+		}
+
+	}
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvCpuIfTargetWinGet - Get CPU-to-peripheral target address window
+*
+* DESCRIPTION:
+*		Get the CPU peripheral target address window.
+*
+* INPUT:
+*       target - Peripheral target enumerator
+*
+* OUTPUT:
+*       pAddrDecWin - CPU target window information data structure.
+*
+* RETURN:
+*       MV_OK if target exist, MV_ERROR otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvCpuIfTargetWinGet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin)
+{
+
+	MV_U32 winNum=0xffffffff;
+	MV_AHB_TO_MBUS_DEC_WIN decWin;
+	MV_DRAM_DEC_WIN addrDecWin;
+
+	target = MV_CHANGE_BOOT_CS(target);
+
+	/* Check parameters */
+	if (target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvCpuIfTargetWinGet: target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	if (MV_TARGET_IS_DRAM(target))
+	{
+		if (mvDramIfWinGet(target,&addrDecWin) != MV_OK)
+		{
+			mvOsPrintf("mvCpuIfTargetWinGet: Failed to get window target %d\n",
+					   target);
+			return MV_ERROR;
+		}
+
+		/* copy relevant data to MV_CPU_DEC_WIN structure */
+		pAddrDecWin->addrWin.baseLow = addrDecWin.addrWin.baseLow;
+		pAddrDecWin->addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
+		pAddrDecWin->addrWin.size = addrDecWin.addrWin.size;
+		pAddrDecWin->enable = addrDecWin.enable;
+		pAddrDecWin->winNum = 0xffffffff;
+
+	}
+	else
+	{
+		/* get the Window number associated with this target */
+
+		winNum = mvAhbToMbusWinTargetGet(target);
+		if (winNum >= MAX_AHB_TO_MBUS_WINS)
+		{
+			return MV_NO_SUCH;
+
+		}
+
+		if (mvAhbToMbusWinGet(winNum , &decWin) != MV_OK)
+		{
+			mvOsPrintf("%s: mvAhbToMbusWinGet Failed at winNum = %d\n",
+					   __FUNCTION__, winNum);
+			return MV_ERROR;
+
+		}
+
+		/* copy relevant data to MV_CPU_DEC_WIN structure */
+		pAddrDecWin->addrWin.baseLow = decWin.addrWin.baseLow;
+		pAddrDecWin->addrWin.baseHigh = decWin.addrWin.baseHigh;
+		pAddrDecWin->addrWin.size = decWin.addrWin.size;
+		pAddrDecWin->enable = decWin.enable;
+		pAddrDecWin->winNum = winNum;
+
+	}
+
+
+
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvCpuIfTargetWinEnable - Enable/disable a CPU address decode window
+*
+* DESCRIPTION:
+*       This function enable/disable a CPU address decode window.
+*       if parameter 'enable' == MV_TRUE the routine will enable the
+*       window, thus enabling CPU accesses (before enabling the window it is
+*       tested for overlapping). Otherwise, the window will be disabled.
+*
+* INPUT:
+*       target - Peripheral target enumerator.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_ERROR if protection window number was wrong, or the window
+*       overlapps other target window.
+*
+*******************************************************************************/
+MV_STATUS mvCpuIfTargetWinEnable(MV_TARGET target,MV_BOOL enable)
+{
+	MV_U32 winNum, temp;
+	MV_CPU_DEC_WIN addrDecWin;
+
+	target = MV_CHANGE_BOOT_CS(target);
+	
+	/* Check parameters */
+	if (target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvCpuIfTargetWinEnable: target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	/* get the window and check if it exist */
+	temp = mvCpuIfTargetWinGet(target, &addrDecWin);
+	if (MV_NO_SUCH == temp)
+	{
+		return (enable? MV_ERROR: MV_OK);
+	}
+	else if( MV_OK != temp)
+	{
+		mvOsPrintf("%s: ERR. Getting target %d failed.\n",__FUNCTION__, target);
+		return MV_ERROR;
+	}
+
+
+	/* check overlap */
+
+	if (MV_TRUE == enable)
+	{
+		if (MV_TRUE == cpuTargetWinOverlap(target, &addrDecWin.addrWin))
+		{
+			DB(mvOsPrintf("%s: ERR. Target %d overlap\n",__FUNCTION__, target));
+			return MV_ERROR;
+		}
+
+	}
+
+
+	if (MV_TARGET_IS_DRAM(target))
+	{
+		if (mvDramIfWinEnable(target , enable) != MV_OK)
+		{
+			mvOsPrintf("mvCpuIfTargetWinGet: mvDramIfWinEnable Failed at \n");
+			return MV_ERROR;
+
+		}
+
+	}
+	else
+	{
+		/* get the Window number associated with this target */
+
+		winNum = mvAhbToMbusWinTargetGet(target);
+
+		if (winNum >= MAX_AHB_TO_MBUS_WINS)
+		{
+			return (enable? MV_ERROR: MV_OK);
+		}
+
+		if (mvAhbToMbusWinEnable(winNum , enable) != MV_OK)
+		{
+			mvOsPrintf("mvCpuIfTargetWinGet: Failed to enable window = %d\n",
+					   winNum);
+			return MV_ERROR;
+
+		}
+
+	}
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvCpuIfTargetWinSizeGet - Get CPU target address window size
+*
+* DESCRIPTION:
+*		Get the size of CPU-to-peripheral target window.
+*
+* INPUT:
+*       target - Peripheral target enumerator
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit size. Function also returns '0' if window is closed.
+*		Function returns 0xFFFFFFFF in case of an error.
+*
+*******************************************************************************/
+MV_U32    mvCpuIfTargetWinSizeGet(MV_TARGET target)
+{
+	MV_CPU_DEC_WIN addrDecWin;
+
+	target = MV_CHANGE_BOOT_CS(target);
+
+	/* Check parameters */
+	if (target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvCpuIfTargetWinSizeGet: target %d is Illigal\n", target);
+		return 0;
+	}
+
+    /* Get the winNum window */
+	if (MV_OK != mvCpuIfTargetWinGet(target, &addrDecWin))
+	{
+		mvOsPrintf("mvCpuIfTargetWinSizeGet:ERR. Getting target %d failed.\n",
+                                                                        target);
+		return 0;
+	}
+
+	/* Check if window is enabled   */
+	if (addrDecWin.enable == MV_TRUE)
+    {
+		return (addrDecWin.addrWin.size);
+    }
+    else
+    {
+        return 0;		/* Window disabled. return 0 */
+    }
+}
+
+/*******************************************************************************
+* mvCpuIfTargetWinBaseLowGet - Get CPU target address window base low
+*
+* DESCRIPTION:
+*       CPU-to-peripheral target address window base is constructed of
+*       two parts: Low and high.
+*		This function gets the CPU peripheral target low base address.
+*
+* INPUT:
+*       target - Peripheral target enumerator
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit low base address.
+*
+*******************************************************************************/
+MV_U32   mvCpuIfTargetWinBaseLowGet(MV_TARGET target)
+{
+	MV_CPU_DEC_WIN addrDecWin;
+
+	target = MV_CHANGE_BOOT_CS(target);
+
+	/* Check parameters */
+	if (target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvCpuIfTargetWinBaseLowGet: target %d is Illigal\n", target);
+		return 0xffffffff;
+	}
+
+    /* Get the target window */
+	if (MV_OK != mvCpuIfTargetWinGet(target, &addrDecWin))
+	{
+		mvOsPrintf("mvCpuIfTargetWinBaseLowGet:ERR. Getting target %d failed.\n",
+                                                                        target);
+		return 0xffffffff;
+	}
+
+	if (MV_FALSE == addrDecWin.enable)
+	{
+		return 0xffffffff;
+	}
+	return (addrDecWin.addrWin.baseLow);
+}
+
+/*******************************************************************************
+* mvCpuIfTargetWinBaseHighGet - Get CPU target address window base high
+*
+* DESCRIPTION:
+*       CPU-to-peripheral target address window base is constructed of
+*       two parts: Low and high.
+*		This function gets the CPU peripheral target high base address.
+*
+* INPUT:
+*       target - Peripheral target enumerator
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit high base address.
+*
+*******************************************************************************/
+MV_U32    mvCpuIfTargetWinBaseHighGet(MV_TARGET target)
+{
+	MV_CPU_DEC_WIN addrDecWin;
+
+	target = MV_CHANGE_BOOT_CS(target);
+
+	/* Check parameters */
+	if (target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvCpuIfTargetWinBaseLowGet: target %d is Illigal\n", target);
+		return 0xffffffff;
+	}
+
+    /* Get the target window */
+	if (MV_OK != mvCpuIfTargetWinGet(target, &addrDecWin))
+	{
+		mvOsPrintf("mvCpuIfTargetWinBaseHighGet:ERR. Getting target %d failed.\n",
+                                                                        target);
+		return 0xffffffff;
+	}
+
+	if (MV_FALSE == addrDecWin.enable)
+	{
+		return 0;
+	}
+
+	return (addrDecWin.addrWin.baseHigh);
+}
+
+#if defined(MV_INCLUDE_PEX)
+/*******************************************************************************
+* mvCpuIfPexRemap - Set CPU remap register for address windows.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       pexTarget   - Peripheral target enumerator. Must be a PEX target.
+*       pAddrDecWin - CPU target window information data structure.
+*                     Note that caller has to fill in the base field only. The
+*                     size field is ignored.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if target is not a PEX one, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_U32 mvCpuIfPexRemap(MV_TARGET pexTarget, MV_ADDR_WIN *pAddrDecWin)
+{
+	MV_U32 winNum;
+
+	/* Check parameters */
+
+	if (mvCtrlPexMaxIfGet() > 1)
+	{
+		if ((!MV_TARGET_IS_PEX1(pexTarget))&&(!MV_TARGET_IS_PEX0(pexTarget)))
+		{
+			mvOsPrintf("mvCpuIfPexRemap: target %d is Illigal\n",pexTarget);
+			return 0xffffffff;
+		}
+
+	}
+	else
+	{
+		if (!MV_TARGET_IS_PEX0(pexTarget))
+		{
+			mvOsPrintf("mvCpuIfPexRemap: target %d is Illigal\n",pexTarget);
+			return 0xffffffff;
+		}
+
+	}
+
+	/* get the Window number associated with this target */
+	winNum = mvAhbToMbusWinTargetGet(pexTarget);
+
+	if (winNum >= MAX_AHB_TO_MBUS_WINS)
+	{
+		mvOsPrintf("mvCpuIfPexRemap: mvAhbToMbusWinTargetGet Failed\n");
+		return 0xffffffff;
+
+	}
+
+	return mvAhbToMbusWinRemap(winNum , pAddrDecWin);
+}
+
+#endif
+
+#if defined(MV_INCLUDE_PCI)
+/*******************************************************************************
+* mvCpuIfPciRemap - Set CPU remap register for address windows.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       pciTarget   - Peripheral target enumerator. Must be a PCI target.
+*       pAddrDecWin - CPU target window information data structure.
+*                     Note that caller has to fill in the base field only. The
+*                     size field is ignored.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if target is not a PCI one, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_U32 mvCpuIfPciRemap(MV_TARGET pciTarget, MV_ADDR_WIN *pAddrDecWin)
+{
+	MV_U32 winNum;
+
+	/* Check parameters */
+	if (!MV_TARGET_IS_PCI(pciTarget))
+	{
+		mvOsPrintf("mvCpuIfPciRemap: target %d is Illigal\n",pciTarget);
+		return 0xffffffff;
+	}
+
+	/* get the Window number associated with this target */
+	winNum = mvAhbToMbusWinTargetGet(pciTarget);
+
+	if (winNum >= MAX_AHB_TO_MBUS_WINS)
+	{
+		mvOsPrintf("mvCpuIfPciRemap: mvAhbToMbusWinTargetGet Failed\n");
+		return 0xffffffff;
+
+	}
+
+	return mvAhbToMbusWinRemap(winNum , pAddrDecWin);
+}
+#endif /* MV_INCLUDE_PCI */
+
+
+/*******************************************************************************
+* mvCpuIfPciIfRemap - Set CPU remap register for address windows.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       pciTarget   - Peripheral target enumerator. Must be a PCI target.
+*       pAddrDecWin - CPU target window information data structure.
+*                     Note that caller has to fill in the base field only. The
+*                     size field is ignored.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if target is not a PCI one, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_U32 mvCpuIfPciIfRemap(MV_TARGET pciIfTarget, MV_ADDR_WIN *pAddrDecWin)
+{
+#if defined(MV_INCLUDE_PEX)
+	if (MV_TARGET_IS_PEX(pciIfTarget))
+	{
+		return mvCpuIfPexRemap(pciIfTarget,pAddrDecWin);
+	}
+#endif
+#if defined(MV_INCLUDE_PCI)
+
+	if (MV_TARGET_IS_PCI(pciIfTarget))
+	{
+		return mvCpuIfPciRemap(pciIfTarget,pAddrDecWin);
+	}
+#endif
+	return 0;
+}
+
+
+
+/*******************************************************************************
+* mvCpuIfTargetOfBaseAddressGet - Get the target according to base address
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       baseAddress -  base address to be checked
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       the target number that baseAddress belongs to or MAX_TARGETS is not
+*       found
+*
+*******************************************************************************/
+
+MV_TARGET mvCpuIfTargetOfBaseAddressGet(MV_U32 baseAddress)
+{
+	MV_CPU_DEC_WIN win;
+	MV_U32 target;
+
+	for( target = 0; target < MAX_TARGETS; target++ )
+	{
+		if( mvCpuIfTargetWinGet( target, &win ) == MV_OK )
+		{
+			if( win.enable )
+			{
+				if ((baseAddress >= win.addrWin.baseLow) &&
+					(baseAddress < win.addrWin.baseLow + win.addrWin.size)) break;
+            }
+		}
+		else return MAX_TARGETS;
+
+	}
+
+	return target;
+}
+/*******************************************************************************
+* cpuTargetWinOverlap - Detect CPU address decode windows overlapping
+*
+* DESCRIPTION:
+*       An unpredicted behaviur is expected in case CPU address decode
+*       windows overlapps.
+*       This function detects CPU address decode windows overlapping of a
+*       specified target. The function does not check the target itself for
+*       overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       target      - Peripheral target enumerator.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlaps current address
+*       decode map, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_BOOL cpuTargetWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32 			targetNum;
+    MV_CPU_DEC_WIN 	addrDecWin;
+	MV_STATUS		status;
+
+
+	for(targetNum = 0; targetNum < MAX_TARGETS; targetNum++)
+    {
+#if defined(MV_RUN_FROM_FLASH)
+		if(MV_TARGET_IS_AS_BOOT(target))
+		{
+			if (MV_CHANGE_BOOT_CS(targetNum) == target)
+				continue;
+		}
+#endif /* MV_RUN_FROM_FLASH */
+
+		/* don't check our target or illegal targets */
+        if (targetNum == target)
+        {
+            continue;
+        }
+
+		/* Get window parameters 	*/
+		status = mvCpuIfTargetWinGet(targetNum, &addrDecWin);
+        if(MV_NO_SUCH == status)
+        {
+            continue;
+        }
+		if(MV_OK != status)
+		{
+			DB(mvOsPrintf("cpuTargetWinOverlap: ERR. TargetWinGet failed\n"));
+            return MV_TRUE;
+		}
+
+		/* Do not check disabled windows	*/
+		if (MV_FALSE == addrDecWin.enable)
+		{
+			continue;
+		}
+
+        if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
+		{
+			DB(mvOsPrintf(
+			"cpuTargetWinOverlap: Required target %d overlap current %d\n",
+								target, targetNum));
+			return MV_TRUE;
+		}
+    }
+
+	return MV_FALSE;
+
+}
+
+/*******************************************************************************
+* mvCpuIfAddDecShow - Print the CPU address decode map.
+*
+* DESCRIPTION:
+*		This function print the CPU address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvCpuIfAddDecShow(MV_VOID)
+{
+	MV_CPU_DEC_WIN win;
+	MV_U32 target;
+	mvOsOutput( "\n" );
+	mvOsOutput( "CPU Interface\n" );
+	mvOsOutput( "-------------\n" );
+
+	for( target = 0; target < MAX_TARGETS; target++ )
+	{
+
+		memset( &win, 0, sizeof(MV_CPU_DEC_WIN) );
+
+		mvOsOutput( "%s ",mvCtrlTargetNameGet(target));
+		mvOsOutput( "...." );
+
+		if( mvCpuIfTargetWinGet( target, &win ) == MV_OK )
+		{
+			if( win.enable )
+			{
+				mvOsOutput( "base %08x, ", win.addrWin.baseLow );
+				mvSizePrint( win.addrWin.size );
+				mvOsOutput( "\n" );
+
+            }
+			else
+				mvOsOutput( "disable\n" );
+		}
+		else if( mvCpuIfTargetWinGet( target, &win ) == MV_NO_SUCH )
+		{
+				mvOsOutput( "no such\n" );
+		}
+	}
+}
+
+/*******************************************************************************
+* mvCpuIfEnablePex - Enable PCI Express.
+*
+* DESCRIPTION:
+*		This function Enable PCI Express.
+*
+* INPUT:
+*       pexIf   -  PEX interface number.
+*       pexType -  MV_PEX_ROOT_COMPLEX - root complex device
+*		   MV_PEX_END_POINT - end point device
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+#if defined(MV_INCLUDE_PEX)
+MV_VOID mvCpuIfEnablePex(MV_U32 pexIf, MV_PEX_TYPE pexType)
+{
+	/* Set pex mode incase S@R not exist */
+	if( pexType == MV_PEX_END_POINT)
+	{
+		MV_REG_BIT_RESET(PEX_CTRL_REG(pexIf),PXCR_DEV_TYPE_CTRL_MASK);
+		/* Change pex mode in capability reg */
+		MV_REG_BIT_RESET(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_CAPABILITY_REG), BIT22);
+		MV_REG_BIT_SET(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_CAPABILITY_REG), BIT20);
+
+	}
+	else
+	{	
+		MV_REG_BIT_SET(PEX_CTRL_REG(pexIf),PXCR_DEV_TYPE_CTRL_MASK);
+	}
+
+	/* CPU config register Pex enable */
+	MV_REG_BIT_SET(CPU_CTRL_STAT_REG,CCSR_PCI_ACCESS_MASK);
+}
+#endif
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h
new file mode 100644
index 00000000..224ed07f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h
@@ -0,0 +1,120 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvCpuIfh
+#define __INCmvCpuIfh
+
+/* includes */
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/sys/mvCpuIfRegs.h"
+#include "ctrlEnv/sys/mvAhbToMbus.h"
+#include "ddr2/mvDramIf.h"
+#include "ctrlEnv/sys/mvSysDram.h"
+#if defined(MV_INCLUDE_PEX)
+#include "pex/mvPex.h"
+#endif
+
+/* defines  */
+
+/* typedefs */
+/* This structure describes CPU interface address decode window               */
+typedef struct _mvCpuIfDecWin 
+{
+	MV_ADDR_WIN   addrWin;    /* An address window*/
+	MV_U32		  winNum;	  /* Window Number in the AHB To Mbus bridge */
+	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+
+}MV_CPU_DEC_WIN;
+
+
+
+/* mvCpuIfLib.h API list */
+
+/* mvCpuIfLib.h API list */
+
+MV_STATUS mvCpuIfInit(MV_CPU_DEC_WIN *cpuAddrWinMap);
+MV_STATUS mvCpuIfTargetWinSet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin);
+MV_STATUS mvCpuIfTargetWinGet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin);
+MV_STATUS mvCpuIfTargetWinEnable(MV_TARGET target,MV_BOOL enable);
+MV_U32    mvCpuIfTargetWinSizeGet(MV_TARGET target);
+MV_U32    mvCpuIfTargetWinBaseLowGet(MV_TARGET target);
+MV_U32    mvCpuIfTargetWinBaseHighGet(MV_TARGET target);
+MV_TARGET mvCpuIfTargetOfBaseAddressGet(MV_U32 baseAddress);
+#if defined(MV_INCLUDE_PEX)
+MV_U32    mvCpuIfPexRemap(MV_TARGET pexTarget, MV_ADDR_WIN *pAddrDecWin);
+MV_VOID   mvCpuIfEnablePex(MV_U32 pexIf, MV_PEX_TYPE pexType);
+#endif
+#if defined(MV_INCLUDE_PCI)
+MV_U32    mvCpuIfPciRemap(MV_TARGET pciTarget, MV_ADDR_WIN *pAddrDecWin);
+#endif                                               
+MV_U32 	  mvCpuIfPciIfRemap(MV_TARGET pciTarget, MV_ADDR_WIN *pAddrDecWin);
+
+MV_VOID   mvCpuIfAddDecShow(MV_VOID);
+
+#if defined(MV88F6281)
+MV_STATUS mvCpuIfBridgeReorderWAInit(void);
+#endif
+
+#endif /* __INCmvCpuIfh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfInit.S b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfInit.S
new file mode 100644
index 00000000..b7efda02
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfInit.S
@@ -0,0 +1,163 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#define MV_ASMLANGUAGE
+#include "mvOsAsm.h"
+#include "mvDeviceId.h"
+#include "mvCtrlEnvRegs.h"
+#include "mvCpuIfRegs.h"
+#include "mvCtrlEnvAsm.h"
+
+
+/*******************************************************************************
+* mvCpuIfPreInit - Make early initialization of CPU interface.
+*
+* DESCRIPTION:
+*       The function will initialize the CPU interface parameters that must
+*       be initialize before any BUS activity towards the DDR interface,
+*       which means it must be executed from ROM. Because of that, the function
+*       is implemented in assembly code.
+*       The function configure the following CPU config register parameters:
+*       1) CPU2MbusLTickDrv
+*       2) CPU2MbusLTickSample.
+*       NOTE: This function must be called AFTER the internal register
+*       base is modified to INTER_REGS_BASE.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*       r11 holds return function address.
+*******************************************************************************/
+#define MV88F6281_PCKG_OPT	2
+#define MV88F6192_PCKG_OPT	1
+#define MV88F6180_PCKG_OPT	0
+
+	.globl _mvCpuIfPreInit
+_mvCpuIfPreInit:
+
+        mov     r11, LR     		/* Save link register */
+
+	/* Read device ID  */
+	MV_CTRL_MODEL_GET_ASM(r4, r5);
+
+        /* goto calcConfigReg if device is 6281 */
+        ldr     r5, =MV88F6281_PCKG_OPT
+        cmp     r4, r5
+        beq     calcConfigReg
+
+        /* goto calcConfigReg if device is 6192/6190 */
+        ldr     r5, =MV88F6192_PCKG_OPT
+        cmp     r4, r5
+        beq     calcConfigReg
+
+        /* Else 6180 */
+        /* Get the "sample on reset" register */
+	MV_REG_READ_ASM (r4, r5, MPP_SAMPLE_AT_RESET)
+        ldr    r5, =MSAR_CPUCLCK_MASK_6180
+        and    r5, r4, r5
+	    mov    r5, r5, lsr #MSAR_CPUCLCK_OFFS_6180
+
+        ldr    r4, =CPU_2_MBUSL_DDR_CLK_1x3
+        cmp    r5, #CPU_2_DDR_CLK_1x3_1
+        beq    setConfigReg
+
+        ldr    r4, =CPU_2_MBUSL_DDR_CLK_1x4
+        cmp    r5, #CPU_2_DDR_CLK_1x4_1
+        beq    setConfigReg
+        b    setConfigReg
+
+calcConfigReg:
+        /* Get the "sample on reset" register */
+	    MV_REG_READ_ASM (r4, r5, MPP_SAMPLE_AT_RESET)
+        ldr    r5, =MSAR_DDRCLCK_RTIO_MASK
+        and    r5, r4, r5
+	    mov    r5, r5, lsr #MSAR_DDRCLCK_RTIO_OFFS
+
+        ldr    r4, =CPU_2_MBUSL_DDR_CLK_1x3
+        cmp    r5, #CPU_2_DDR_CLK_1x3
+        beq    setConfigReg
+
+        ldr    r4, =CPU_2_MBUSL_DDR_CLK_1x4
+        cmp    r5, #CPU_2_DDR_CLK_1x4
+        beq    setConfigReg
+
+        /* Else */
+        ldr    r4, =0
+
+setConfigReg:
+        /* Read CPU Config register */
+        MV_REG_READ_ASM (r7, r5, CPU_CONFIG_REG)
+        ldr    r5, =~(CCR_CPU_2_MBUSL_TICK_DRV_MASK | CCR_CPU_2_MBUSL_TICK_SMPL_MASK)
+        and    r7, r7, r5       /* Clear register fields */
+        orr    r7, r7, r4       /* Set the values according to the findings */
+        MV_REG_WRITE_ASM (r7, r5, CPU_CONFIG_REG)
+
+done:
+        mov     PC, r11         /* r11 is saved link register */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h
new file mode 100644
index 00000000..8cfeee2d
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h
@@ -0,0 +1,304 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvCpuIfRegsh
+#define __INCmvCpuIfRegsh
+
+/****************************************/
+/* ARM Control and Status Registers Map */
+/****************************************/
+
+#define CPU_CONFIG_REG				0x20100
+#define CPU_CTRL_STAT_REG			0x20104
+#define CPU_RSTOUTN_MASK_REG			0x20108
+#define CPU_SYS_SOFT_RST_REG			0x2010C
+#define CPU_AHB_MBUS_CAUSE_INT_REG		0x20110
+#define CPU_AHB_MBUS_MASK_INT_REG		0x20114
+#define CPU_FTDLL_CONFIG_REG			0x20120
+#define CPU_L2_CONFIG_REG			0x20128
+
+
+
+/* ARM Configuration register */
+/* CPU_CONFIG_REG (CCR) */
+
+
+/* Reset vector location */
+#define CCR_VEC_INIT_LOC_OFFS			1
+#define CCR_VEC_INIT_LOC_MASK			BIT1
+/* reset at 0x00000000 */
+#define CCR_VEC_INIT_LOC_0000			(0 << CCR_VEC_INIT_LOC_OFFS)
+/* reset at 0xFFFF0000 */
+#define CCR_VEC_INIT_LOC_FF00			(1 << CCR_VEC_INIT_LOC_OFFS)
+
+
+#define CCR_AHB_ERROR_PROP_OFFS			2
+#define CCR_AHB_ERROR_PROP_MASK			BIT2
+/* Erros are not propogated to AHB */
+#define CCR_AHB_ERROR_PROP_NO_INDICATE		(0 << CCR_AHB_ERROR_PROP_OFFS)
+/* Erros are propogated to AHB */
+#define CCR_AHB_ERROR_PROP_INDICATE		(1 << CCR_AHB_ERROR_PROP_OFFS)
+
+
+#define CCR_ENDIAN_INIT_OFFS			3
+#define CCR_ENDIAN_INIT_MASK			BIT3
+#define CCR_ENDIAN_INIT_LITTLE			(0 << CCR_ENDIAN_INIT_OFFS)
+#define CCR_ENDIAN_INIT_BIG			(1 << CCR_ENDIAN_INIT_OFFS)
+
+
+#define CCR_INCR_EN_OFFS			4
+#define CCR_INCR_EN_MASK			BIT4
+#define CCR_INCR_EN				BIT4
+
+
+#define CCR_NCB_BLOCKING_OFFS			5			
+#define CCR_NCB_BLOCKING_MASK			(1 << CCR_NCB_BLOCKING_OFFS)
+#define CCR_NCB_BLOCKING_NON			(0 << CCR_NCB_BLOCKING_OFFS)
+#define CCR_NCB_BLOCKING_EN			(1 << CCR_NCB_BLOCKING_OFFS)
+
+#define CCR_CPU_2_MBUSL_TICK_DRV_OFFS		8
+#define CCR_CPU_2_MBUSL_TICK_DRV_MASK		(0xF << CCR_CPU_2_MBUSL_TICK_DRV_OFFS)
+#define CCR_CPU_2_MBUSL_TICK_SMPL_OFFS		12
+#define CCR_CPU_2_MBUSL_TICK_SMPL_MASK		(0xF << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS)
+#define CCR_ICACH_PREF_BUF_ENABLE		BIT16
+#define CCR_DCACH_PREF_BUF_ENABLE		BIT17
+
+/* Ratio options for CPU to DDR for 6281/6192/6190 */
+#define CPU_2_DDR_CLK_1x3	    4
+#define CPU_2_DDR_CLK_1x4	    6
+
+/* Ratio options for CPU to DDR for 6281 only */
+#define CPU_2_DDR_CLK_2x9	    7
+#define CPU_2_DDR_CLK_1x5	    8
+#define CPU_2_DDR_CLK_1x6	    9
+
+/* Ratio options for CPU to DDR for 6180 only */
+#define CPU_2_DDR_CLK_1x3_1	    0x5
+#define CPU_2_DDR_CLK_1x4_1	    0x6
+
+/* Default values for CPU to Mbus-L DDR Interface Tick Driver and 	*/
+/* CPU to Mbus-L Tick Sample fields in CPU config register		*/
+
+#define TICK_DRV_1x1	0
+#define TICK_DRV_1x2	0
+#define TICK_DRV_1x3	1
+#define TICK_DRV_1x4	2
+#define TICK_SMPL_1x1	0
+#define TICK_SMPL_1x2	1
+#define TICK_SMPL_1x3	0
+#define TICK_SMPL_1x4	0
+
+#define CPU_2_MBUSL_DDR_CLK_1x2						\
+		 ((TICK_DRV_1x2  << CCR_CPU_2_MBUSL_TICK_DRV_OFFS) | 	\
+		  (TICK_SMPL_1x2 << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS))
+#define CPU_2_MBUSL_DDR_CLK_1x3						\
+		 ((TICK_DRV_1x3  << CCR_CPU_2_MBUSL_TICK_DRV_OFFS) | 	\
+		  (TICK_SMPL_1x3 << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS))
+#define CPU_2_MBUSL_DDR_CLK_1x4						\
+		 ((TICK_DRV_1x4  << CCR_CPU_2_MBUSL_TICK_DRV_OFFS) | 	\
+		  (TICK_SMPL_1x4 << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS))
+
+/* ARM Control and Status register */
+/* CPU_CTRL_STAT_REG (CCSR) */
+
+
+/*
+This is used to block PCI express\PCI from access Socrates/Feroceon GP
+while ARM boot is still in progress
+*/
+
+#define CCSR_PCI_ACCESS_OFFS			0
+#define CCSR_PCI_ACCESS_MASK			BIT0
+#define CCSR_PCI_ACCESS_ENABLE			(0 << CCSR_PCI_ACCESS_OFFS)
+#define CCSR_PCI_ACCESS_DISBALE			(1 << CCSR_PCI_ACCESS_OFFS)
+
+#define CCSR_ARM_RESET				BIT1
+#define CCSR_SELF_INT				BIT2
+#define CCSR_BIG_ENDIAN				BIT15
+
+
+/* RSTOUTn Mask Register */
+/* CPU_RSTOUTN_MASK_REG (CRMR) */
+
+#define CRMR_PEX_RST_OUT_OFFS			0
+#define CRMR_PEX_RST_OUT_MASK			BIT0
+#define CRMR_PEX_RST_OUT_ENABLE			(1 << CRMR_PEX_RST_OUT_OFFS)
+#define CRMR_PEX_RST_OUT_DISABLE		(0 << CRMR_PEX_RST_OUT_OFFS)
+
+#define CRMR_WD_RST_OUT_OFFS			1
+#define CRMR_WD_RST_OUT_MASK			BIT1
+#define CRMR_WD_RST_OUT_ENABLE			(1 << CRMR_WD_RST_OUT_OFFS)
+#define CRMR_WD_RST_OUT_DISBALE			(0 << CRMR_WD_RST_OUT_OFFS)			
+
+#define CRMR_SOFT_RST_OUT_OFFS			2
+#define CRMR_SOFT_RST_OUT_MASK			BIT2
+#define CRMR_SOFT_RST_OUT_ENABLE		(1 << CRMR_SOFT_RST_OUT_OFFS)
+#define CRMR_SOFT_RST_OUT_DISBALE		(0 << CRMR_SOFT_RST_OUT_OFFS)
+
+/* System Software Reset Register */
+/* CPU_SYS_SOFT_RST_REG (CSSRR) */
+
+#define CSSRR_SYSTEM_SOFT_RST			BIT0
+
+/* AHB to Mbus Bridge Interrupt Cause Register*/
+/* CPU_AHB_MBUS_CAUSE_INT_REG (CAMCIR) */
+
+#define CAMCIR_ARM_SELF_INT			BIT0
+#define CAMCIR_ARM_TIMER0_INT_REQ		BIT1
+#define CAMCIR_ARM_TIMER1_INT_REQ		BIT2
+#define CAMCIR_ARM_WD_TIMER_INT_REQ		BIT3
+
+
+/* AHB to Mbus Bridge Interrupt Mask Register*/
+/* CPU_AHB_MBUS_MASK_INT_REG (CAMMIR) */
+
+#define CAMCIR_ARM_SELF_INT_OFFS		0
+#define CAMCIR_ARM_SELF_INT_MASK		BIT0
+#define CAMCIR_ARM_SELF_INT_EN			(1 << CAMCIR_ARM_SELF_INT_OFFS)
+#define CAMCIR_ARM_SELF_INT_DIS			(0 << CAMCIR_ARM_SELF_INT_OFFS)
+
+
+#define CAMCIR_ARM_TIMER0_INT_REQ_OFFS		1
+#define CAMCIR_ARM_TIMER0_INT_REQ_MASK		BIT1
+#define CAMCIR_ARM_TIMER0_INT_REQ_EN		(1 << CAMCIR_ARM_TIMER0_INT_REQ_OFFS) 
+#define CAMCIR_ARM_TIMER0_INT_REQ_DIS		(0 << CAMCIR_ARM_TIMER0_INT_REQ_OFFS)
+
+#define CAMCIR_ARM_TIMER1_INT_REQ_OFFS		2
+#define CAMCIR_ARM_TIMER1_INT_REQ_MASK		BIT2
+#define CAMCIR_ARM_TIMER1_INT_REQ_EN		(1 << CAMCIR_ARM_TIMER1_INT_REQ_OFFS) 
+#define CAMCIR_ARM_TIMER1_INT_REQ_DIS		(0 << CAMCIR_ARM_TIMER1_INT_REQ_OFFS) 
+
+#define CAMCIR_ARM_WD_TIMER_INT_REQ_OFFS 	3
+#define CAMCIR_ARM_WD_TIMER_INT_REQ_MASK 	BIT3
+#define CAMCIR_ARM_WD_TIMER_INT_REQ_EN	 	(1 << CAMCIR_ARM_WD_TIMER_INT_REQ_OFFS) 
+#define CAMCIR_ARM_WD_TIMER_INT_REQ_DIS	 	(0 << CAMCIR_ARM_WD_TIMER_INT_REQ_OFFS) 
+
+/* CPU FTDLL Config register (CFCR) fields */
+#define CFCR_FTDLL_ICACHE_TAG_OFFS		0
+#define CFCR_FTDLL_ICACHE_TAG_MASK		(0x7F << CFCR_FTDLL_ICACHE_TAG_OFFS)
+#define CFCR_FTDLL_DCACHE_TAG_OFFS		8
+#define CFCR_FTDLL_DCACHE_TAG_MASK		(0x7F << CFCR_FTDLL_DCACHE_TAG_OFFS)
+#define CFCR_FTDLL_OVERWRITE_ENABLE		(1 << 15)
+/* For Orion 2 D2 only */
+#define CFCR_MRVL_CPU_ID_OFFS			16
+#define CFCR_MRVL_CPU_ID_MASK			(0x1 << CFCR_MRVL_CPU_ID_OFFS)
+#define CFCR_ARM_CPU_ID				(0x0 << CFCR_MRVL_CPU_ID_OFFS)
+#define CFCR_MRVL_CPU_ID			(0x1 << CFCR_MRVL_CPU_ID_OFFS)
+#define CFCR_VFP_SUB_ARC_NUM_OFFS		7
+#define CFCR_VFP_SUB_ARC_NUM_MASK		(0x1 << CFCR_VFP_SUB_ARC_NUM_OFFS)
+#define CFCR_VFP_SUB_ARC_NUM_1			(0x0 << CFCR_VFP_SUB_ARC_NUM_OFFS)
+#define CFCR_VFP_SUB_ARC_NUM_2			(0x1 << CFCR_VFP_SUB_ARC_NUM_OFFS)
+
+/* CPU_L2_CONFIG_REG fields */
+#ifdef MV_CPU_LE
+#define CL2CR_L2_ECC_EN_OFFS			2
+#define CL2CR_L2_WT_MODE_OFFS			4
+#else
+#define CL2CR_L2_ECC_EN_OFFS			26
+#define CL2CR_L2_WT_MODE_OFFS			28
+#endif
+
+#define CL2CR_L2_ECC_EN_MASK			(1 << CL2CR_L2_ECC_EN_OFFS)
+#define CL2CR_L2_WT_MODE_MASK			(1 << CL2CR_L2_WT_MODE_OFFS)
+
+/*******************************************/
+/* Main Interrupt Controller Registers Map */
+/*******************************************/
+
+#define CPU_MAIN_INT_CAUSE_REG			0x20200
+#define CPU_MAIN_IRQ_MASK_REG			0x20204
+#define CPU_MAIN_FIQ_MASK_REG			0x20208
+#define CPU_ENPOINT_MASK_REG			0x2020C
+#define CPU_MAIN_INT_CAUSE_HIGH_REG		0x20210
+#define CPU_MAIN_IRQ_MASK_HIGH_REG		0x20214
+#define CPU_MAIN_FIQ_MASK_HIGH_REG		0x20218
+#define CPU_ENPOINT_MASK_HIGH_REG		0x2021C
+
+
+/*******************************************/
+/* ARM Doorbell Registers Map		   */
+/*******************************************/
+
+#define CPU_HOST_TO_ARM_DRBL_REG		0x20400
+#define CPU_HOST_TO_ARM_MASK_REG		0x20404
+#define CPU_ARM_TO_HOST_DRBL_REG		0x20408
+#define CPU_ARM_TO_HOST_MASK_REG		0x2040C
+
+
+
+/* CPU control register map */
+/* Set bits means value is about to change according to new value */
+#define CPU_CONFIG_DEFAULT_MASK         	(CCR_VEC_INIT_LOC_MASK  | CCR_AHB_ERROR_PROP_MASK)      
+
+#define CPU_CONFIG_DEFAULT                      (CCR_VEC_INIT_LOC_FF00)
+                 
+/* CPU Control and status defaults */
+#define CPU_CTRL_STAT_DEFAULT_MASK              (CCSR_PCI_ACCESS_MASK)
+                                                                        
+
+#define CPU_CTRL_STAT_DEFAULT                   (CCSR_PCI_ACCESS_ENABLE)
+
+#endif /* __INCmvCpuIfRegsh */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c
new file mode 100644
index 00000000..769475f8
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c
@@ -0,0 +1,324 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#include "mvSysAudio.h"
+
+/*******************************************************************************
+* mvAudioWinSet - Set AUDIO target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
+*       address window, also known as address decode window. 
+*       After setting this target window, the AUDIO will be able to access the 
+*       target within the address window. 
+*
+* INPUT:
+*       winNum      - AUDIO target address decode window number.
+*       pAddrDecWin - AUDIO target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if address window overlapps with other address decode windows.
+*       MV_BAD_PARAM if base address is invalid parameter or target is 
+*       unknown.
+*
+*******************************************************************************/
+MV_STATUS mvAudioWinSet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin)
+{
+    MV_TARGET_ATTRIB    targetAttribs;
+    MV_DEC_REGS         decRegs;
+
+    /* Parameter checking   */
+    if (winNum >= MV_AUDIO_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
+        return MV_BAD_PARAM;
+    }
+    
+    /* check if address is aligned to the size */
+    if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+    {
+		mvOsPrintf("mvAudioWinSet:Error setting AUDIO window %d to "\
+			   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+			   winNum,
+			   mvCtrlTargetNameGet(pAddrDecWin->target), 
+			   pAddrDecWin->addrWin.baseLow,
+			   pAddrDecWin->addrWin.size);
+		return MV_ERROR;
+    }
+
+    decRegs.baseReg = 0;
+    decRegs.sizeReg = 0;
+
+    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+    {
+        mvOsPrintf("%s: mvCtrlAddrDecToReg Failed\n", __FUNCTION__);
+        return MV_ERROR;
+    }
+
+    mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
+                                                                                                                         
+    /* set attributes */
+    decRegs.sizeReg &= ~MV_AUDIO_WIN_ATTR_MASK;
+    decRegs.sizeReg |= (targetAttribs.attrib << MV_AUDIO_WIN_ATTR_OFFSET);
+
+    /* set target ID */
+    decRegs.sizeReg &= ~MV_AUDIO_WIN_TARGET_MASK;
+    decRegs.sizeReg |= (targetAttribs.targetId << MV_AUDIO_WIN_TARGET_OFFSET);
+
+    if (pAddrDecWin->enable == MV_TRUE)
+    {
+        decRegs.sizeReg |= MV_AUDIO_WIN_ENABLE_MASK;
+    }
+    else
+    {
+        decRegs.sizeReg &= ~MV_AUDIO_WIN_ENABLE_MASK;
+    }
+
+    MV_REG_WRITE( MV_AUDIO_WIN_CTRL_REG(winNum), decRegs.sizeReg);
+    MV_REG_WRITE( MV_AUDIO_WIN_BASE_REG(winNum), decRegs.baseReg);
+    
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvAudioWinGet - Get AUDIO peripheral target address window.
+*
+* DESCRIPTION:
+*       Get AUDIO peripheral target address window.
+*
+* INPUT:
+*       winNum - AUDIO target address decode window number.
+*
+* OUTPUT:
+*       pAddrDecWin - AUDIO target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvAudioWinGet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin)
+{
+    MV_DEC_REGS         decRegs;
+    MV_TARGET_ATTRIB    targetAttrib;
+                                                                                                                         
+    /* Parameter checking   */
+    if (winNum >= MV_AUDIO_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s : ERR. Invalid winNum %d\n", 
+                    __FUNCTION__,  winNum);
+        return MV_NOT_SUPPORTED;
+    }
+
+    decRegs.baseReg = MV_REG_READ( MV_AUDIO_WIN_BASE_REG(winNum) );
+    decRegs.sizeReg = MV_REG_READ( MV_AUDIO_WIN_CTRL_REG(winNum) );
+ 
+    if (MV_OK != mvCtrlRegToAddrDec(&decRegs, &pAddrDecWin->addrWin) )
+    {
+        mvOsPrintf("%s: mvCtrlRegToAddrDec Failed\n", __FUNCTION__);
+        return MV_ERROR; 
+    }
+       
+    /* attrib and targetId */
+    targetAttrib.attrib = (decRegs.sizeReg & MV_AUDIO_WIN_ATTR_MASK) >> 
+		MV_AUDIO_WIN_ATTR_OFFSET;
+    targetAttrib.targetId = (decRegs.sizeReg & MV_AUDIO_WIN_TARGET_MASK) >> 
+		MV_AUDIO_WIN_TARGET_OFFSET;
+ 
+    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+    /* Check if window is enabled   */
+    if(decRegs.sizeReg & MV_AUDIO_WIN_ENABLE_MASK) 
+    {
+        pAddrDecWin->enable = MV_TRUE;
+    }
+    else
+    {
+        pAddrDecWin->enable = MV_FALSE;
+    }
+    return MV_OK;
+}
+/*******************************************************************************
+* mvAudioAddrDecShow - Print the AUDIO address decode map.
+*
+* DESCRIPTION:
+*		This function print the AUDIO address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvAudioAddrDecShow(MV_VOID)
+{
+
+	MV_AUDIO_DEC_WIN win;
+	int i;
+
+	if (MV_FALSE == mvCtrlPwrClckGet(AUDIO_UNIT_ID, 0)) 
+		return;
+
+
+	mvOsOutput( "\n" );
+	mvOsOutput( "AUDIO:\n" );
+	mvOsOutput( "----\n" );
+
+	for( i = 0; i < MV_AUDIO_MAX_ADDR_DECODE_WIN; i++ )
+	{
+            memset( &win, 0, sizeof(MV_AUDIO_DEC_WIN) );
+
+	    mvOsOutput( "win%d - ", i );
+
+	    if( mvAudioWinGet( i, &win ) == MV_OK )
+	    {
+	        if( win.enable )
+	        {
+                    mvOsOutput( "%s base %08x, ",
+                    mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
+                    mvOsOutput( "...." );
+
+                    mvSizePrint( win.addrWin.size );
+    
+		    mvOsOutput( "\n" );
+                }
+		else
+		mvOsOutput( "disable\n" );
+	    }
+	}
+}
+
+
+/*******************************************************************************
+* mvAudioWinInit - Initialize the integrated AUDIO target address window.
+*
+* DESCRIPTION:
+*       Initialize the AUDIO peripheral target address window.
+*
+* INPUT:
+*
+*
+* OUTPUT:
+*     
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvAudioInit(MV_VOID)
+{
+    int             winNum;
+    MV_AUDIO_DEC_WIN  audioWin;
+    MV_CPU_DEC_WIN  cpuAddrDecWin;
+    MV_U32          status;
+
+    mvAudioHalInit();
+
+    /* Initiate Audio address decode */
+
+    /* First disable all address decode windows */
+    for(winNum = 0; winNum < MV_AUDIO_MAX_ADDR_DECODE_WIN; winNum++)
+    {
+        MV_U32  regVal = MV_REG_READ(MV_AUDIO_WIN_CTRL_REG(winNum));
+        regVal &= ~MV_AUDIO_WIN_ENABLE_MASK;
+        MV_REG_WRITE(MV_AUDIO_WIN_CTRL_REG(winNum), regVal);
+    }
+
+    for(winNum = 0; winNum < MV_AUDIO_MAX_ADDR_DECODE_WIN; winNum++)
+    {
+
+		/* We will set the Window to DRAM_CS0 in default */
+		/* first get attributes from CPU If */
+		status = mvCpuIfTargetWinGet(SDRAM_CS0,
+									 &cpuAddrDecWin);
+	
+		if (MV_OK != status)
+		{
+				mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
+			return MV_ERROR;
+		}
+	
+		if (cpuAddrDecWin.enable == MV_TRUE)
+		{
+			audioWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+			audioWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
+			audioWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
+			audioWin.enable           = MV_TRUE;
+			audioWin.target           = SDRAM_CS0;
+	
+			if(MV_OK != mvAudioWinSet(winNum, &audioWin))
+			{
+				return MV_ERROR;
+			}
+		}
+	}
+
+    return MV_OK;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h
new file mode 100644
index 00000000..f59eb9a9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h
@@ -0,0 +1,123 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#ifndef __INCMVSysAudioH
+#define __INCMVSysAudioH
+
+#include "mvCommon.h"
+#include "audio/mvAudio.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+/***********************************/
+/* Audio Address Decoding registers*/
+/***********************************/
+
+#define MV_AUDIO_MAX_ADDR_DECODE_WIN 		2
+#define MV_AUDIO_RECORD_WIN_NUM			0
+#define MV_AUDIO_PLAYBACK_WIN_NUM		1
+
+#define MV_AUDIO_WIN_CTRL_REG(win)        (AUDIO_REG_BASE + 0xA04 + ((win)<<3))
+#define MV_AUDIO_WIN_BASE_REG(win)        (AUDIO_REG_BASE + 0xA00 + ((win)<<3))
+
+#define MV_AUDIO_RECORD_WIN_CTRL_REG		MV_AUDIO_WIN_CTRL_REG(MV_AUDIO_RECORD_WIN_NUM)
+#define MV_AUDIO_RECORD_WIN_BASE_REG		MV_AUDIO_WIN_BASE_REG(MV_AUDIO_RECORD_WIN_NUM)
+#define MV_AUDIO_PLAYBACK_WIN_CTRL_REG		MV_AUDIO_WIN_CTRL_REG(MV_AUDIO_PLAYBACK_WIN_NUM)
+#define MV_AUDIO_PLAYBACK_WIN_BASE_REG		MV_AUDIO_WIN_BASE_REG(MV_AUDIO_PLAYBACK_WIN_NUM)
+
+
+/* BITs in Windows 0-3 Control and Base Registers */
+#define MV_AUDIO_WIN_ENABLE_BIT               0
+#define MV_AUDIO_WIN_ENABLE_MASK              (1<<MV_AUDIO_WIN_ENABLE_BIT)
+
+#define MV_AUDIO_WIN_TARGET_OFFSET            4
+#define MV_AUDIO_WIN_TARGET_MASK              (0xF<<MV_AUDIO_WIN_TARGET_OFFSET)
+
+#define MV_AUDIO_WIN_ATTR_OFFSET              8
+#define MV_AUDIO_WIN_ATTR_MASK                (0xFF<<MV_AUDIO_WIN_ATTR_OFFSET)
+
+#define MV_AUDIO_WIN_SIZE_OFFSET              16
+#define MV_AUDIO_WIN_SIZE_MASK                (0xFFFF<<MV_AUDIO_WIN_SIZE_OFFSET)
+
+#define MV_AUDIO_WIN_BASE_OFFSET              16
+#define MV_AUDIO_WIN_BASE_MASK                (0xFFFF<<MV_AUDIO_WIN_BASE_OFFSET)
+
+
+typedef struct _mvAudioDecWin
+{
+    MV_TARGET     target;
+    MV_ADDR_WIN   addrWin;    /* An address window*/
+    MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+ 
+} MV_AUDIO_DEC_WIN;
+
+
+MV_STATUS mvAudioInit(MV_VOID);
+MV_STATUS mvAudioWinGet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin);
+MV_STATUS mvAudioWinSet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin);
+MV_STATUS mvAudioWinInit(MV_VOID);
+MV_VOID   mvAudioAddrDecShow(MV_VOID);
+
+
+#endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c
new file mode 100644
index 00000000..84d0cd0b
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c
@@ -0,0 +1,382 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvSysCesa.h"
+
+#if (MV_CESA_VERSION >= 2)
+MV_TARGET tdmaAddrDecPrioTable[] =
+{
+#if defined(MV_INCLUDE_SDRAM_CS0)
+    SDRAM_CS0,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS1)
+    SDRAM_CS1,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS2)
+    SDRAM_CS2,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS3)
+    SDRAM_CS3,
+#endif
+#if defined(MV_INCLUDE_PEX)
+    PEX0_MEM,
+#endif
+
+    TBL_TERM
+};
+
+/*******************************************************************************
+* mvCesaWinGet - Get TDMA target address window.
+*
+* DESCRIPTION:
+*       Get TDMA target address window.
+*
+* INPUT:
+*       winNum - TDMA target address decode window number.
+*
+* OUTPUT:
+*       pDecWin - TDMA target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+static MV_STATUS mvCesaWinGet(MV_U32 winNum, MV_DEC_WIN *pDecWin)
+{                                                                                                                         
+    MV_DEC_WIN_PARAMS   winParam;
+    MV_U32              sizeReg, baseReg;
+
+    /* Parameter checking   */
+    if (winNum >= MV_CESA_TDMA_ADDR_DEC_WIN)
+    {
+        mvOsPrintf("%s : ERR. Invalid winNum %d\n", 
+                    __FUNCTION__, winNum);
+        return MV_NOT_SUPPORTED;
+    }
+
+    baseReg = MV_REG_READ( MV_CESA_TDMA_BASE_ADDR_REG(winNum) );
+    sizeReg = MV_REG_READ( MV_CESA_TDMA_WIN_CTRL_REG(winNum) );
+ 
+   /* Check if window is enabled   */
+    if(sizeReg & MV_CESA_TDMA_WIN_ENABLE_MASK) 
+    {
+        pDecWin->enable = MV_TRUE;
+
+        /* Extract window parameters from registers */
+        winParam.targetId = (sizeReg & MV_CESA_TDMA_WIN_TARGET_MASK) >> MV_CESA_TDMA_WIN_TARGET_OFFSET; 
+        winParam.attrib   = (sizeReg & MV_CESA_TDMA_WIN_ATTR_MASK) >> MV_CESA_TDMA_WIN_ATTR_OFFSET;
+        winParam.size     = (sizeReg & MV_CESA_TDMA_WIN_SIZE_MASK) >> MV_CESA_TDMA_WIN_SIZE_OFFSET;
+        winParam.baseAddr = (baseReg & MV_CESA_TDMA_WIN_BASE_MASK);
+
+        /* Translate the decode window parameters to address decode struct */
+        if (MV_OK != mvCtrlParamsToAddrDec(&winParam, pDecWin))
+        {
+            mvOsPrintf("Failed to translate register parameters to CESA address" \
+                       " decode window structure\n");
+            return MV_ERROR;        
+        }
+    }
+    else
+    {
+        pDecWin->enable = MV_FALSE;
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* cesaWinOverlapDetect - Detect CESA TDMA address windows overlapping
+*
+* DESCRIPTION:
+*       An unpredicted behaviur is expected in case TDMA address decode 
+*       windows overlapps.
+*       This function detects TDMA address decode windows overlapping of a 
+*       specified window. The function does not check the window itself for 
+*       overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE     - if the given address window overlap current address
+*                   decode map, 
+*       MV_FALSE    - otherwise, MV_ERROR if reading invalid data 
+*                   from registers.
+*
+*******************************************************************************/
+static MV_STATUS cesaWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32          winNumIndex;
+    MV_DEC_WIN      addrDecWin;
+    
+    for(winNumIndex=0; winNumIndex<MV_CESA_TDMA_ADDR_DEC_WIN; winNumIndex++)
+    {
+        /* Do not check window itself       */
+        if (winNumIndex == winNum)
+        {
+            continue;
+        }
+
+        /* Get window parameters    */
+        if (MV_OK != mvCesaWinGet(winNumIndex, &addrDecWin))
+        {
+            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
+            return MV_ERROR;
+        }
+
+        /* Do not check disabled windows    */
+        if(addrDecWin.enable == MV_FALSE)
+        {
+            continue;
+        }
+
+        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+        {
+            return MV_TRUE;
+        }        
+    }
+    return MV_FALSE;
+}
+
+/*******************************************************************************
+* mvCesaTdmaWinSet - Set CESA TDMA target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
+*       address window, also known as address decode window. 
+*       After setting this target window, the CESA TDMA will be able to access the 
+*       target within the address window. 
+*
+* INPUT:
+*       winNum      - CESA TDMA target address decode window number.
+*       pAddrDecWin - CESA TDMA target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR        - if address window overlapps with other address decode windows.
+*       MV_BAD_PARAM    - if base address is invalid parameter or target is 
+*                       unknown.
+*
+*******************************************************************************/
+static MV_STATUS mvCesaTdmaWinSet(MV_U32 winNum, MV_DEC_WIN *pDecWin)
+{
+    MV_DEC_WIN_PARAMS   winParams;
+    MV_U32              sizeReg, baseReg;
+    
+    /* Parameter checking   */
+    if (winNum >= MV_CESA_TDMA_ADDR_DEC_WIN)
+    {
+        mvOsPrintf("mvCesaTdmaWinSet: ERR. Invalid win num %d\n",winNum);
+        return MV_BAD_PARAM;
+    }
+
+    /* Check if the requested window overlapps with current windows     */
+    if (MV_TRUE == cesaWinOverlapDetect(winNum, &pDecWin->addrWin))
+    {
+        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
+        return MV_ERROR;
+    }
+
+    /* check if address is aligned to the size */
+    if(MV_IS_NOT_ALIGN(pDecWin->addrWin.baseLow, pDecWin->addrWin.size))
+    {
+        mvOsPrintf("mvCesaTdmaWinSet: Error setting CESA TDMA window %d to "\
+                   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+                   winNum,
+                   mvCtrlTargetNameGet(pDecWin->target), 
+                   pDecWin->addrWin.baseLow,
+                   pDecWin->addrWin.size);
+        return MV_ERROR;
+    }
+
+    if(MV_OK != mvCtrlAddrDecToParams(pDecWin, &winParams))
+    {
+        mvOsPrintf("%s: mvCtrlAddrDecToParams Failed\n", __FUNCTION__);
+        return MV_ERROR;
+    }
+
+    /* set Size, Attributes and TargetID */
+    sizeReg = (((winParams.targetId << MV_CESA_TDMA_WIN_TARGET_OFFSET) & MV_CESA_TDMA_WIN_TARGET_MASK) |
+               ((winParams.attrib   << MV_CESA_TDMA_WIN_ATTR_OFFSET)   & MV_CESA_TDMA_WIN_ATTR_MASK)   |
+               ((winParams.size << MV_CESA_TDMA_WIN_SIZE_OFFSET) & MV_CESA_TDMA_WIN_SIZE_MASK));
+
+    if (pDecWin->enable == MV_TRUE)
+    {
+        sizeReg |= MV_CESA_TDMA_WIN_ENABLE_MASK;
+    }
+    else
+    {
+        sizeReg &= ~MV_CESA_TDMA_WIN_ENABLE_MASK;
+    }
+
+    /* Update Base value  */
+    baseReg = (winParams.baseAddr & MV_CESA_TDMA_WIN_BASE_MASK);     
+
+    MV_REG_WRITE( MV_CESA_TDMA_WIN_CTRL_REG(winNum), sizeReg);
+    MV_REG_WRITE( MV_CESA_TDMA_BASE_ADDR_REG(winNum), baseReg);
+        
+    return MV_OK;
+}
+
+
+static MV_STATUS   mvCesaTdmaAddrDecInit (void)
+{
+    MV_U32          winNum;
+    MV_STATUS       status;
+    MV_CPU_DEC_WIN  cpuAddrDecWin;
+    MV_DEC_WIN      cesaWin;
+    MV_U32          winPrioIndex = 0;
+
+    /* First disable all address decode windows */
+    for(winNum=0; winNum<MV_CESA_TDMA_ADDR_DEC_WIN; winNum++)
+    {
+        MV_REG_BIT_RESET(MV_CESA_TDMA_WIN_CTRL_REG(winNum), MV_CESA_TDMA_WIN_ENABLE_MASK);
+    }
+
+    /* Go through all windows in user table until table terminator      */
+    winNum = 0;
+    while( (tdmaAddrDecPrioTable[winPrioIndex] != TBL_TERM) && 
+           (winNum < MV_CESA_TDMA_ADDR_DEC_WIN) )    {
+
+        /* first get attributes from CPU If */
+        status = mvCpuIfTargetWinGet(tdmaAddrDecPrioTable[winPrioIndex], 
+                                     &cpuAddrDecWin);
+        if(MV_NO_SUCH == status){
+	    winPrioIndex++;
+            continue;
+	}
+
+        if (MV_OK != status)
+        {
+            mvOsPrintf("cesaInit: TargetWinGet failed. winNum=%d, winIdx=%d, target=%d, status=0x%x\n",
+                        winNum, winPrioIndex, tdmaAddrDecPrioTable[winPrioIndex], status);
+            return MV_ERROR;
+        }
+        if (cpuAddrDecWin.enable == MV_TRUE)
+        {
+            cesaWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+            cesaWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
+            cesaWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
+            cesaWin.enable           = MV_TRUE;
+            cesaWin.target           = tdmaAddrDecPrioTable[winPrioIndex];
+
+#if defined(MV646xx) 
+            /* Get the default attributes for that target window */
+            mvCtrlDefAttribGet(cesaWin.target, &cesaWin.addrWinAttr);
+#endif /* MV646xx */ 
+
+            if(MV_OK != mvCesaTdmaWinSet(winNum, &cesaWin))
+            {
+                mvOsPrintf("mvCesaTdmaWinSet FAILED: winNum=%d\n",
+                           winNum);
+                return MV_ERROR;
+            }
+            winNum++;
+        }
+        winPrioIndex++;
+    }
+    return MV_OK;
+}
+#endif /* MV_CESA_VERSION >= 2 */
+
+
+
+
+MV_STATUS mvCesaInit (int numOfSession, int queueDepth, char* pSramBase, void *osHandle)
+{
+    MV_U32 cesaCryptEngBase;
+    MV_CPU_DEC_WIN addrDecWin;
+
+    if(sizeof(MV_CESA_SRAM_MAP) > MV_CESA_SRAM_SIZE)
+    {
+        mvOsPrintf("mvCesaInit: Wrong SRAM map - %ld > %d\n",
+                sizeof(MV_CESA_SRAM_MAP), MV_CESA_SRAM_SIZE);
+        return MV_FAIL;
+    }
+#if 0
+    if (mvCpuIfTargetWinGet(CRYPT_ENG, &addrDecWin) == MV_OK)
+        cesaCryptEngBase = addrDecWin.addrWin.baseLow;
+    else
+    {
+        mvOsPrintf("mvCesaInit: ERR. mvCpuIfTargetWinGet failed\n");
+        return MV_ERROR;
+    }
+#else
+        cesaCryptEngBase = (MV_U32)pSramBase;
+#endif     
+
+#if 0 /* Already done in the platform init */
+#if (MV_CESA_VERSION >= 2)
+    mvCesaTdmaAddrDecInit();
+#endif /* MV_CESA_VERSION >= 2 */
+#endif
+	return mvCesaHalInit(numOfSession, queueDepth, pSramBase, cesaCryptEngBase, 
+			     osHandle);
+
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h
new file mode 100644
index 00000000..73bcdc58
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h
@@ -0,0 +1,100 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __mvSysCesa_h__
+#define __mvSysCesa_h__
+
+
+#include "mvCommon.h"
+#include "cesa/mvCesa.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+/***************************** TDMA Registers *************************************/
+
+#define MV_CESA_TDMA_ADDR_DEC_WIN           4
+
+#define MV_CESA_TDMA_BASE_ADDR_REG(win)     (MV_CESA_TDMA_REG_BASE + 0xa00 + (win<<3))
+
+#define MV_CESA_TDMA_WIN_CTRL_REG(win)      (MV_CESA_TDMA_REG_BASE + 0xa04 + (win<<3))
+
+#define MV_CESA_TDMA_WIN_ENABLE_BIT         0
+#define MV_CESA_TDMA_WIN_ENABLE_MASK        (1 << MV_CESA_TDMA_WIN_ENABLE_BIT)
+
+#define MV_CESA_TDMA_WIN_TARGET_OFFSET      4 
+#define MV_CESA_TDMA_WIN_TARGET_MASK        (0xf << MV_CESA_TDMA_WIN_TARGET_OFFSET)
+
+#define MV_CESA_TDMA_WIN_ATTR_OFFSET        8 
+#define MV_CESA_TDMA_WIN_ATTR_MASK          (0xff << MV_CESA_TDMA_WIN_ATTR_OFFSET)
+
+#define MV_CESA_TDMA_WIN_SIZE_OFFSET        16
+#define MV_CESA_TDMA_WIN_SIZE_MASK          (0xFFFF << MV_CESA_TDMA_WIN_SIZE_OFFSET)
+
+#define MV_CESA_TDMA_WIN_BASE_OFFSET        16
+#define MV_CESA_TDMA_WIN_BASE_MASK          (0xFFFF << MV_CESA_TDMA_WIN_BASE_OFFSET)
+
+
+MV_STATUS   mvCesaInit (int numOfSession, int queueDepth, char* pSramBase, void *osHandle);
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c
new file mode 100644
index 00000000..6f76c2ca
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c
@@ -0,0 +1,348 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+/* includes */
+
+#include "ddr2/mvDramIf.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "ctrlEnv/sys/mvSysDram.h"
+
+/* #define MV_DEBUG */
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin);
+
+/*******************************************************************************
+* mvDramIfWinSet - Set DRAM interface address decode window
+*
+* DESCRIPTION: 
+*       This function sets DRAM interface address decode window.
+*
+* INPUT:
+*	    target      - System target. Use only SDRAM targets.
+*       pAddrDecWin - SDRAM address window structure.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
+*       otherwise.
+*******************************************************************************/
+MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
+{
+	MV_U32 baseReg=0,sizeReg=0;
+	MV_U32 baseToReg=0 , sizeToReg=0;
+
+    /* Check parameters */
+	if (!MV_TARGET_IS_DRAM(target))
+	{
+		mvOsPrintf("mvDramIfWinSet: target %d is not SDRAM\n", target);
+		return MV_BAD_PARAM;
+	}
+
+    /* Check if the requested window overlaps with current enabled windows	*/
+    if (MV_TRUE == sdramIfWinOverlap(target, &pAddrDecWin->addrWin))
+	{
+        mvOsPrintf("mvDramIfWinSet: ERR. Target %d overlaps\n", target);
+		return MV_BAD_PARAM;
+	}
+
+	/* check if address is aligned to the size */
+	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+	{
+		mvOsPrintf("mvDramIfWinSet:Error setting DRAM interface window %d."\
+				   "\nAddress 0x%08x is unaligned to size 0x%x.\n",
+                   target, 
+				   pAddrDecWin->addrWin.baseLow,
+				   pAddrDecWin->addrWin.size);
+		return MV_ERROR;
+	}
+
+	/* read base register*/
+	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(0,target));
+
+	/* read size register */
+	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(0,target));
+
+	/* BaseLow[31:16] => base register [31:16]		*/
+	baseToReg = pAddrDecWin->addrWin.baseLow & SCBAR_BASE_MASK;
+
+	/* Write to address decode Base Address Register                  */
+	baseReg &= ~SCBAR_BASE_MASK;
+	baseReg |= baseToReg;
+
+	/* Translate the given window size to register format			*/
+	sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, SCSR_SIZE_ALIGNMENT);
+
+	/* Size parameter validity check.                                   */
+	if (-1 == sizeToReg)
+	{
+		mvOsPrintf("mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n",target);
+		return MV_BAD_PARAM;
+	}
+
+	/* set size */
+	sizeReg &= ~SCSR_SIZE_MASK;
+	/* Size is located at upper 16 bits */
+	sizeReg |= (sizeToReg << SCSR_SIZE_OFFS);
+
+	/* enable/Disable */
+	if (MV_TRUE == pAddrDecWin->enable)
+	{
+		sizeReg |= SCSR_WIN_EN;
+	}
+	else
+	{
+		sizeReg &= ~SCSR_WIN_EN;
+	}
+
+	/* 3) Write to address decode Base Address Register                   */
+	MV_REG_WRITE(SDRAM_BASE_ADDR_REG(0,target), baseReg);
+
+	/* Write to address decode Size Register                        	*/
+	MV_REG_WRITE(SDRAM_SIZE_REG(0,target), sizeReg);
+	
+	return MV_OK;
+}
+/*******************************************************************************
+* mvDramIfWinGet - Get DRAM interface address decode window
+*
+* DESCRIPTION: 
+*       This function gets DRAM interface address decode window.
+*
+* INPUT:
+*	    target - System target. Use only SDRAM targets.
+*
+* OUTPUT:
+*       pAddrDecWin - SDRAM address window structure.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
+*       otherwise.
+*******************************************************************************/
+MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
+{
+	MV_U32 baseReg,sizeReg;
+	MV_U32 sizeRegVal;
+	/* Check parameters */
+	if (!MV_TARGET_IS_DRAM(target))
+	{
+		mvOsPrintf("mvDramIfWinGet: target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	/* Read base and size registers */
+	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(0,target));
+	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(0,target));
+
+	sizeRegVal = (sizeReg & SCSR_SIZE_MASK) >> SCSR_SIZE_OFFS;
+
+	pAddrDecWin->addrWin.size = ctrlRegToSize(sizeRegVal,
+							SCSR_SIZE_ALIGNMENT);
+
+    	/* Check if ctrlRegToSize returned OK */
+	if (-1 == pAddrDecWin->addrWin.size)
+	{
+		mvOsPrintf("mvDramIfWinGet: size of target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	/* Extract base address						*/
+	/* Base register [31:16] ==> baseLow[31:16] 		*/
+	pAddrDecWin->addrWin.baseLow = baseReg & SCBAR_BASE_MASK;
+
+	pAddrDecWin->addrWin.baseHigh =  0;
+
+
+	if (sizeReg & SCSR_WIN_EN)
+	{
+		pAddrDecWin->enable = MV_TRUE;
+	}
+	else
+	{
+		pAddrDecWin->enable = MV_FALSE;			
+	}
+
+	return MV_OK;
+}
+/*******************************************************************************
+* mvDramIfWinEnable - Enable/Disable SDRAM address decode window
+*
+* DESCRIPTION: 
+*		This function enable/Disable SDRAM address decode window.
+*
+* INPUT:
+*	    target - System target. Use only SDRAM targets.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		MV_ERROR in case function parameter are invalid, MV_OK otherewise.
+*
+*******************************************************************************/
+MV_STATUS mvDramIfWinEnable(MV_TARGET target, MV_BOOL enable)
+{
+	MV_DRAM_DEC_WIN 	addrDecWin;
+
+	/* Check parameters */
+	if (!MV_TARGET_IS_DRAM(target))
+	{
+		mvOsPrintf("mvDramIfWinEnable: target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	if (enable == MV_TRUE) 
+	{   /* First check for overlap with other enabled windows				*/
+		if (MV_OK != mvDramIfWinGet(target, &addrDecWin))
+		{
+			mvOsPrintf("mvDramIfWinEnable:ERR. Getting target %d failed.\n", 
+                                                                        target);
+			return MV_ERROR;
+		}
+		/* Check for overlapping */
+		if (MV_FALSE == sdramIfWinOverlap(target, &(addrDecWin.addrWin)))
+		{
+			/* No Overlap. Enable address decode winNum window              */
+			MV_REG_BIT_SET(SDRAM_SIZE_REG(0,target), SCSR_WIN_EN);
+		}
+		else
+		{   /* Overlap detected	*/
+			mvOsPrintf("mvDramIfWinEnable: ERR. Target %d overlap detect\n",
+                                                                        target);
+			return MV_ERROR;
+		}
+	}
+	else
+	{   /* Disable address decode winNum window                             */
+		MV_REG_BIT_RESET(SDRAM_SIZE_REG(0, target), SCSR_WIN_EN);
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* sdramIfWinOverlap - Check if an address window overlap an SDRAM address window
+*
+* DESCRIPTION:
+*		This function scan each SDRAM address decode window to test if it 
+*		overlapps the given address windoow 
+*
+* INPUT:
+*       target      - SDRAM target where the function skips checking.
+*       pAddrDecWin - The tested address window for overlapping with 
+*					  SDRAM windows.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlaps any enabled address
+*       decode map, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin)
+{
+	MV_TARGET	targetNum;
+	MV_DRAM_DEC_WIN 	addrDecWin;
+	
+	for(targetNum = SDRAM_CS0; targetNum < MV_DRAM_MAX_CS ; targetNum++)
+	{
+		/* don't check our winNum or illegal targets */
+		if (targetNum == target)
+		{
+			continue;
+		}
+		
+		/* Get window parameters 	*/
+		if (MV_OK != mvDramIfWinGet(targetNum, &addrDecWin))
+		{
+			mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
+			return MV_ERROR;
+		}
+	
+		/* Do not check disabled windows	*/
+		if (MV_FALSE == addrDecWin.enable)
+		{
+			continue;
+		}
+	
+		if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
+		{                    
+			mvOsPrintf(
+			"sdramIfWinOverlap: Required target %d overlap winNum %d\n", 
+			target, targetNum);
+			return MV_TRUE;           
+		}
+	}
+	
+	return MV_FALSE;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h
new file mode 100644
index 00000000..7bd9c9de
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h
@@ -0,0 +1,80 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __sysDram
+#define __sysDram
+
+/* This structure describes CPU interface address decode window               */
+typedef struct _mvDramIfDecWin 
+{
+	MV_ADDR_WIN   addrWin;    /* An address window*/
+	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+}MV_DRAM_DEC_WIN;
+
+MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
+MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
+MV_STATUS mvDramIfWinEnable(MV_TARGET target, MV_BOOL enable);
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c
new file mode 100644
index 00000000..7f6e4a59
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c
@@ -0,0 +1,658 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#include "ctrlEnv/sys/mvSysGbe.h"
+
+
+
+typedef struct _mvEthDecWin
+{
+    MV_TARGET     target;
+    MV_ADDR_WIN   addrWin;  /* An address window*/
+    MV_BOOL       enable;   /* Address decode window is enabled/disabled */
+  
+}MV_ETH_DEC_WIN;
+
+MV_TARGET ethAddrDecPrioTap[] =
+{
+#if defined(MV_INCLUDE_SDRAM_CS0)
+        SDRAM_CS0,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS1)
+        SDRAM_CS1,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS2)
+        SDRAM_CS2,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS3)
+        SDRAM_CS3,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS0)
+        DEVICE_CS0,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS1)
+        DEVICE_CS1,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS2)
+        DEVICE_CS2,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS3)
+        DEVICE_CS3,
+#endif
+#if defined(MV_INCLUDE_PEX)
+        PEX0_IO,
+#endif
+        TBL_TERM
+};
+
+static MV_STATUS   ethWinOverlapDetect(int port, MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
+static MV_STATUS   mvEthWinSet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin);
+static MV_STATUS   mvEthWinGet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin);
+
+                                                                                                                             
+/*******************************************************************************
+* mvEthWinInit - Initialize ETH address decode windows 
+*
+* DESCRIPTION:
+*               This function initialize ETH window decode unit. It set the 
+*               default address decode windows of the unit.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if setting fail.
+*******************************************************************************/
+/* Configure EthDrv memory map registes. */
+MV_STATUS 	mvEthWinInit (int port)
+{
+    MV_U32          winNum, status, winPrioIndex=0, i, regVal=0;
+    MV_ETH_DEC_WIN  ethWin;
+    MV_CPU_DEC_WIN  cpuAddrDecWin;
+    static MV_U32   accessProtReg = 0;
+
+#if (MV_ETH_VERSION <= 1)
+    static MV_BOOL  isFirst = MV_TRUE;
+
+    if(isFirst == MV_FALSE)
+    {
+        MV_REG_WRITE(ETH_ACCESS_PROTECT_REG(port), accessProtReg);
+        return MV_OK;
+    }
+    isFirst = MV_FALSE;
+#endif /* MV_GIGA_ETH_VERSION */
+
+    /* Initiate Ethernet address decode */
+
+    /* First disable all address decode windows */
+    for(winNum=0; winNum<ETH_MAX_DECODE_WIN; winNum++)
+    {
+        regVal |= MV_BIT_MASK(winNum);
+    }
+    MV_REG_WRITE(ETH_BASE_ADDR_ENABLE_REG(port), regVal);
+
+   /* Go through all windows in user table until table terminator      */
+    for (winNum=0; ((ethAddrDecPrioTap[winPrioIndex] != TBL_TERM) && 
+                    (winNum < ETH_MAX_DECODE_WIN)); )
+    {
+        /* first get attributes from CPU If */
+        status = mvCpuIfTargetWinGet(ethAddrDecPrioTap[winPrioIndex], 
+                                     &cpuAddrDecWin);
+
+        if(MV_NO_SUCH == status)
+        {
+            winPrioIndex++;
+            continue;
+        }
+		if (MV_OK != status)
+		{
+			mvOsPrintf("mvEthWinInit: ERR. mvCpuIfTargetWinGet failed\n");
+			return MV_ERROR;
+		}
+
+        if (cpuAddrDecWin.enable == MV_TRUE)
+        {
+            ethWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+            ethWin.addrWin.baseLow = cpuAddrDecWin.addrWin.baseLow;
+            ethWin.addrWin.size = cpuAddrDecWin.addrWin.size;
+            ethWin.enable = MV_TRUE;
+            ethWin.target = ethAddrDecPrioTap[winPrioIndex];
+
+            if(MV_OK != mvEthWinSet(port, winNum, &ethWin))
+            {
+                mvOsPrintf("mvEthWinInit: ERR. mvEthWinSet failed winNum=%d\n",
+                           winNum);
+                return MV_ERROR;
+            }
+            winNum++;
+        }
+        winPrioIndex ++;
+    }
+
+    /* set full access to all windows. */
+    for(i=0; i<winNum; i++)
+    {
+        accessProtReg |= (FULL_ACCESS << (i*2));
+    }
+    MV_REG_WRITE(ETH_ACCESS_PROTECT_REG(port), accessProtReg);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthWinSet - Set ETH target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
+*       address window, also known as address decode window.
+*       After setting this target window, the ETH will be able to access the
+*       target within the address window.
+*
+* INPUT:
+*       winNum      - ETH to target address decode window number.
+*       pAddrDecWin - ETH target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if address window overlapps with other address decode windows.
+*       MV_BAD_PARAM if base address is invalid parameter or target is
+*       unknown.
+*
+*******************************************************************************/
+MV_STATUS mvEthWinSet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin)
+{
+    MV_TARGET_ATTRIB    targetAttribs;
+    MV_DEC_REGS         decRegs;
+    
+    /* Parameter checking   */
+    if (winNum >= ETH_MAX_DECODE_WIN)
+    {
+        mvOsPrintf("mvEthWinSet: ERR. Invalid win num %d\n",winNum);
+        return MV_BAD_PARAM;
+    }    
+    
+    /* Check if the requested window overlapps with current windows     */
+    if (MV_TRUE == ethWinOverlapDetect(port, winNum, &pAddrDecWin->addrWin))
+    {
+        mvOsPrintf("mvEthWinSet: ERR. Window %d overlap\n", winNum);
+        return MV_ERROR;
+    }
+
+	/* check if address is aligned to the size */
+	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+	{
+		mvOsPrintf("mvEthWinSet: Error setting Ethernet window %d to "\
+				   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+				   winNum,
+				   mvCtrlTargetNameGet(pAddrDecWin->target), 
+				   pAddrDecWin->addrWin.baseLow,
+				   pAddrDecWin->addrWin.size);
+		return MV_ERROR;
+	}
+
+    
+    decRegs.baseReg = MV_REG_READ(ETH_WIN_BASE_REG(port, winNum));
+    decRegs.sizeReg = MV_REG_READ(ETH_WIN_SIZE_REG(port, winNum));
+    
+    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+    {
+        mvOsPrintf("mvEthWinSet:mvCtrlAddrDecToReg Failed\n");
+        return MV_ERROR;
+    }
+    
+    mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
+    
+    /* set attributes */
+    decRegs.baseReg &= ~ETH_WIN_ATTR_MASK;
+    decRegs.baseReg |= targetAttribs.attrib << ETH_WIN_ATTR_OFFS;
+    /* set target ID */
+    decRegs.baseReg &= ~ETH_WIN_TARGET_MASK;
+    decRegs.baseReg |= targetAttribs.targetId << ETH_WIN_TARGET_OFFS;
+    
+    /* for the safe side we disable the window before writing the new
+    values */
+    mvEthWinEnable(port, winNum, MV_FALSE);
+    MV_REG_WRITE(ETH_WIN_BASE_REG(port, winNum), decRegs.baseReg);
+    
+    /* Write to address decode Size Register                            */
+    MV_REG_WRITE(ETH_WIN_SIZE_REG(port, winNum), decRegs.sizeReg);
+    
+    /* Enable address decode target window                              */
+    if (pAddrDecWin->enable == MV_TRUE)
+    {
+            mvEthWinEnable(port, winNum, MV_TRUE);
+    }
+    
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvETHWinGet - Get dma peripheral target address window.
+*
+* DESCRIPTION:
+*               Get ETH peripheral target address window.
+*
+* INPUT:
+*       winNum - ETH to target address decode window number.
+*
+* OUTPUT:
+*       pAddrDecWin - ETH target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvEthWinGet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin)
+{
+    MV_DEC_REGS decRegs;
+    MV_TARGET_ATTRIB targetAttrib;
+    
+    /* Parameter checking   */
+    if (winNum >= ETH_MAX_DECODE_WIN)
+    {
+        mvOsPrintf("mvEthWinGet: ERR. Invalid winNum %d\n", winNum);
+        return MV_NOT_SUPPORTED;
+    }
+    
+    decRegs.baseReg =  MV_REG_READ(ETH_WIN_BASE_REG(port, winNum));
+    decRegs.sizeReg = MV_REG_READ(ETH_WIN_SIZE_REG(port, winNum));
+    
+    if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
+    {
+        mvOsPrintf("mvAhbToMbusWinGet: mvCtrlRegToAddrDec Failed \n");
+        return MV_ERROR;
+    }
+    
+    /* attrib and targetId */
+    targetAttrib.attrib = 
+     (decRegs.baseReg & ETH_WIN_ATTR_MASK) >> ETH_WIN_ATTR_OFFS;
+    targetAttrib.targetId = 
+     (decRegs.baseReg & ETH_WIN_TARGET_MASK) >> ETH_WIN_TARGET_OFFS;
+    
+    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+    
+    /* Check if window is enabled   */
+    if (~(MV_REG_READ(ETH_BASE_ADDR_ENABLE_REG(port))) & (1 << winNum) )
+    {
+        pAddrDecWin->enable = MV_TRUE;
+    }
+    else
+    {
+        pAddrDecWin->enable = MV_FALSE;
+    }
+    
+        return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthWinEnable - Enable/disable a ETH to target address window
+*
+* DESCRIPTION:
+*       This function enable/disable a ETH to target address window.
+*       According to parameter 'enable' the routine will enable the
+*       window, thus enabling ETH accesses (before enabling the window it is
+*       tested for overlapping). Otherwise, the window will be disabled.
+*
+* INPUT:
+*       winNum - ETH to target address decode window number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_ERROR if decode window number was wrong or enabled window overlapps.
+*
+*******************************************************************************/
+MV_STATUS mvEthWinEnable(int port, MV_U32 winNum,MV_BOOL enable)
+{
+    MV_ETH_DEC_WIN addrDecWin;
+
+    /* Parameter checking   */
+    if (winNum >= ETH_MAX_DECODE_WIN)
+    {
+        mvOsPrintf("mvEthTargetWinEnable:ERR. Invalid winNum%d\n",winNum);
+        return MV_ERROR;
+    }
+
+    if (enable == MV_TRUE)
+    {   /* First check for overlap with other enabled windows               */
+        /* Get current window */
+        if (MV_OK != mvEthWinGet(port, winNum, &addrDecWin))
+        {
+            mvOsPrintf("mvEthTargetWinEnable:ERR. targetWinGet fail\n");
+            return MV_ERROR;
+        }
+        /* Check for overlapping */
+        if (MV_FALSE == ethWinOverlapDetect(port, winNum, &(addrDecWin.addrWin)))
+        {
+            /* No Overlap. Enable address decode target window              */
+            MV_REG_BIT_RESET(ETH_BASE_ADDR_ENABLE_REG(port), (1 << winNum));
+        }
+        else
+        {   /* Overlap detected */
+            mvOsPrintf("mvEthTargetWinEnable:ERR. Overlap detected\n");
+            return MV_ERROR;
+        }
+    }
+    else
+    {   /* Disable address decode target window                             */
+        MV_REG_BIT_SET(ETH_BASE_ADDR_ENABLE_REG(port), (1 << winNum));
+    }
+    return MV_OK;
+}
+ 
+/*******************************************************************************
+* mvEthWinTargetGet - Get Window number associated with target
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*       window number
+*
+*******************************************************************************/
+MV_U32  mvEthWinTargetGet(int port, MV_TARGET target)
+{
+    MV_ETH_DEC_WIN decWin;
+    MV_U32 winNum;
+
+    /* Check parameters */
+    if (target >= MAX_TARGETS)
+    {
+        mvOsPrintf("mvAhbToMbusWinTargetGet: target %d is Illigal\n", target);
+        return 0xffffffff;
+    }
+
+    for (winNum=0; winNum<ETH_MAX_DECODE_WIN; winNum++)
+    {
+        if (mvEthWinGet(port, winNum,&decWin) != MV_OK)
+        {
+            mvOsPrintf("mvAhbToMbusWinTargetGet: window returned error\n");
+            return 0xffffffff;
+        }
+
+        if (decWin.enable == MV_TRUE)
+        {
+            if (decWin.target == target)
+            {
+                return winNum;
+            }  
+        }
+    }
+    return 0xFFFFFFFF;
+}
+ 
+/*******************************************************************************
+* mvEthProtWinSet - Set access protection of Ethernet to target window.
+*
+* DESCRIPTION:
+*       Each Ethernet port can be configured with access attributes for each 
+*       of the Ethenret to target windows (address decode windows). This
+*       function sets access attributes to a given window for the given channel.
+*
+* INPUTS:
+*       ethPort   - ETH channel number. See MV_ETH_CHANNEL enumerator.
+*       winNum - IETH to target address decode window number.
+*       access - IETH access rights. See MV_ACCESS_RIGHTS enumerator.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR in case window number is invalid or access right reserved.
+*
+*******************************************************************************/
+MV_STATUS mvEthProtWinSet(MV_U32 portNo, MV_U32 winNum, MV_ACCESS_RIGHTS access)
+{    
+    MV_U32 protReg;
+
+    /* Parameter checking   */
+    if(portNo >= mvCtrlEthMaxPortGet())
+    {
+        mvOsPrintf("mvEthProtWinSet:ERR. Invalid port number %d\n", portNo);
+        return MV_ERROR;
+    }
+    
+    if (winNum >= ETH_MAX_DECODE_WIN)
+    {
+            mvOsPrintf("mvEthProtWinSet:ERR. Invalid winNum%d\n",winNum);
+            return MV_ERROR;
+    }
+
+    if((access == ACC_RESERVED) || (access >= MAX_ACC_RIGHTS))
+    {
+        mvOsPrintf("mvEthProtWinSet:ERR. Inv access param %d\n", access);
+        return MV_ERROR;
+    }
+    /* Read current protection register */
+    protReg = MV_REG_READ(ETH_ACCESS_PROTECT_REG(portNo));
+                          
+    /* Clear protection window field */
+    protReg &= ~(ETH_PROT_WIN_MASK(winNum));
+
+    /* Set new protection field value */
+    protReg |= (access << (ETH_PROT_WIN_OFFS(winNum)));
+    
+    /* Write protection register back   */
+    MV_REG_WRITE(ETH_ACCESS_PROTECT_REG(portNo), protReg);
+
+    return MV_OK;
+}               
+
+/*******************************************************************************
+* ethWinOverlapDetect - Detect ETH address windows overlapping
+*
+* DESCRIPTION:
+*       An unpredicted behaviur is expected in case ETH address decode
+*       windows overlapps.
+*       This function detects ETH address decode windows overlapping of a
+*       specified window. The function does not check the window itself for
+*       overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data
+*       from registers.
+*
+*******************************************************************************/
+static MV_STATUS ethWinOverlapDetect(int port, MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32              baseAddrEnableReg;
+    MV_U32              winNumIndex;
+    MV_ETH_DEC_WIN      addrDecWin;
+                                                                                                                             
+    /* Read base address enable register. Do not check disabled windows     */
+    baseAddrEnableReg = MV_REG_READ(ETH_BASE_ADDR_ENABLE_REG(port));
+                                                                                                                             
+    for (winNumIndex=0; winNumIndex<ETH_MAX_DECODE_WIN; winNumIndex++)
+    {
+        /* Do not check window itself           */
+        if (winNumIndex == winNum)
+        {
+            continue;
+        }
+    
+        /* Do not check disabled windows        */
+        if (baseAddrEnableReg & (1 << winNumIndex))
+        {
+            continue;
+        }
+    
+        /* Get window parameters        */
+        if (MV_OK != mvEthWinGet(port, winNumIndex, &addrDecWin))
+        {
+            mvOsPrintf("ethWinOverlapDetect: ERR. TargetWinGet failed\n");
+            return MV_ERROR;
+        }
+/*    
+        mvOsPrintf("ethWinOverlapDetect:\n
+            winNumIndex =%d baseHigh =0x%x baseLow=0x%x size=0x%x enable=0x%x\n",
+            winNumIndex,
+            addrDecWin.addrWin.baseHigh,
+            addrDecWin.addrWin.baseLow,
+            addrDecWin.addrWin.size,
+            addrDecWin.enable);
+*/
+        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+        {
+            return MV_TRUE;
+        }
+    }
+    return MV_FALSE;
+}
+
+/*******************************************************************************
+* mvEthAddrDecShow - Print the Etherent address decode map.
+*
+* DESCRIPTION:
+*       This function print the Etherent address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+void    mvEthPortAddrDecShow(int port)
+{
+    MV_ETH_DEC_WIN  win;
+    int             i;
+
+    mvOsOutput( "\n" );
+    mvOsOutput( "ETH %d:\n", port );
+    mvOsOutput( "----\n" );
+
+    for( i = 0; i < ETH_MAX_DECODE_WIN; i++ )
+    {
+        memset( &win, 0, sizeof(ETH_MAX_DECODE_WIN) );
+
+        mvOsOutput( "win%d - ", i );
+
+        if( mvEthWinGet(port, i, &win ) == MV_OK )
+        {
+            if( win.enable )
+            {
+                mvOsOutput( "%s base %08x, ",
+                mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
+                mvOsOutput( "...." );
+                mvSizePrint( win.addrWin.size );
+
+                mvOsOutput( "\n" );
+            }
+            else
+                mvOsOutput( "disable\n" );
+        }
+    }
+    return;
+}
+
+void    mvEthAddrDecShow(void)
+{
+    int port;
+
+    for(port=0; port<mvCtrlEthMaxPortGet(); port++)
+    {
+	if (MV_FALSE == mvCtrlPwrClckGet(ETH_GIG_UNIT_ID, port)) continue;
+    
+        mvEthPortAddrDecShow(port);
+    }
+}
+
+
+void    mvEthInit(void)
+{
+    MV_U32 port;
+
+    /* Power down all existing ports */
+    for(port=0; port<mvCtrlEthMaxPortGet(); port++)
+    {
+	    if (MV_FALSE == mvCtrlPwrClckGet(ETH_GIG_UNIT_ID, port)) 
+            continue;
+
+        mvEthPortPowerUp(port);
+	    mvEthWinInit(port);
+    }
+    mvEthHalInit();
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h
new file mode 100644
index 00000000..615af512
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h
@@ -0,0 +1,113 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSysGbeh
+#define __INCmvSysGbeh
+
+#include "mvCommon.h"
+#include "eth/mvEth.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+#define ETH_WIN_BASE_REG(port, win)         (MV_ETH_REG_BASE(port) + 0x200 + ((win)<<3))
+#define ETH_WIN_SIZE_REG(port, win)         (MV_ETH_REG_BASE(port) + 0x204 + ((win)<<3))
+#define ETH_WIN_REMAP_REG(port, win)        (MV_ETH_REG_BASE(port) + 0x280 + ((win)<<2))
+#define ETH_BASE_ADDR_ENABLE_REG(port)      (MV_ETH_REG_BASE(port) + 0x290)
+#define ETH_ACCESS_PROTECT_REG(port)        (MV_ETH_REG_BASE(port) + 0x294)
+
+/**** Address decode parameters ****/
+
+/* Ethernet Base Address Register bits */
+#define ETH_MAX_DECODE_WIN              6
+#define ETH_MAX_HIGH_ADDR_REMAP_WIN     4
+
+/* Ethernet Port Access Protect (EPAP) register */
+
+/* The target associated with this window*/
+#define ETH_WIN_TARGET_OFFS             0 
+#define ETH_WIN_TARGET_MASK             (0xf << ETH_WIN_TARGET_OFFS)
+/* The target attributes Associated with window */
+#define ETH_WIN_ATTR_OFFS               8 
+#define ETH_WIN_ATTR_MASK               (0xff << ETH_WIN_ATTR_OFFS)
+
+/* Ethernet Port Access Protect Register (EPAPR) */
+#define ETH_PROT_NO_ACCESS              NO_ACCESS_ALLOWED
+#define ETH_PROT_READ_ONLY              READ_ONLY
+#define ETH_PROT_FULL_ACCESS            FULL_ACCESS
+#define ETH_PROT_WIN_OFFS(winNum)       (2 * (winNum))
+#define ETH_PROT_WIN_MASK(winNum)       (0x3 << ETH_PROT_WIN_OFFS(winNum))
+
+MV_STATUS   mvEthWinInit (int port);
+MV_STATUS   mvEthWinEnable(int port, MV_U32 winNum, MV_BOOL enable);
+MV_U32      mvEthWinTargetGet(int port, MV_TARGET target);
+MV_STATUS mvEthProtWinSet(MV_U32 portNo, MV_U32 winNum, MV_ACCESS_RIGHTS
+		access);
+
+void        mvEthPortAddrDecShow(int port);
+
+MV_VOID     mvEthAddrDecShow(MV_VOID);
+
+void        mvEthInit(void);
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c
new file mode 100644
index 00000000..b0cb466a
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c
@@ -0,0 +1,1697 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "ctrlEnv/sys/mvSysPex.h"
+
+/* this structure describes the mapping between a Pex Window and a CPU target*/
+typedef struct _pexWinToTarget
+{
+	MV_TARGET target;
+	MV_BOOL	  enable;
+
+}PEX_WIN_TO_TARGET;
+
+/* this array is a priority array that define How Pex windows should be 
+configured , We have only 6 Pex Windows that can be configured , but we
+have maximum of 9 CPU target windows ! the following array is a priority
+array where the lowest index has the highest priotiy and the highest 
+index has the lowest priority of being cnfigured */
+
+MV_U32	pexDevBarPrioTable[] =
+{
+#if defined(MV_INCLUDE_DEVICE_CS0)
+    DEVICE_CS0,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS1)
+    DEVICE_CS1,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS2)
+    DEVICE_CS2,
+#endif                                               
+#if defined(MV_INCLUDE_DEVICE_CS3)
+    DEVICE_CS3,
+#endif
+/*
+#if defined(MV_INCLUDE_DEVICE_CS4)
+    DEVICE_CS4,
+#endif
+*/
+    TBL_TERM
+};
+
+
+/* PEX Wins registers offsets are inconsecutive. This struct describes WIN	*/
+/* register offsets	and its function where its is located.					*/
+/* Also, PEX address remap registers offsets are inconsecutive. This struct	*/
+/* describes address remap register offsets									*/
+typedef struct _pexWinRegInfo
+{
+    MV_U32 baseLowRegOffs;
+	MV_U32 baseHighRegOffs;
+	MV_U32 sizeRegOffs;
+	MV_U32 remapLowRegOffs;
+	MV_U32 remapHighRegOffs;
+
+}PEX_WIN_REG_INFO;
+
+static MV_STATUS pexWinOverlapDetect(MV_U32 pexIf, MV_U32 winNum,
+									 MV_ADDR_WIN *pAddrWin);
+static MV_STATUS pexWinRegInfoGet(MV_U32 pexIf, MV_U32 winNum,
+								  PEX_WIN_REG_INFO *pWinRegInfo);
+
+static MV_STATUS pexBarIsValid(MV_U32 baseLow, MV_U32 size);
+
+static MV_BOOL pexIsWinWithinBar(MV_U32 pexIf,MV_ADDR_WIN *pAddrWin);
+static MV_BOOL pexBarOverlapDetect(MV_U32 pexIf,MV_U32 barNum,
+								   MV_ADDR_WIN *pAddrWin);
+const MV_8* pexBarNameGet( MV_U32 bar );
+
+
+/*******************************************************************************
+* mvPexInit - Initialize PEX interfaces
+*
+* DESCRIPTION:
+*
+* This function is responsible of intialization of the Pex Interface , It 
+* configure the Pex Bars and Windows in the following manner:
+*
+*  Assumptions : 
+*				Bar0 is always internal registers bar
+*			    Bar1 is always the DRAM bar
+*				Bar2 is always the Device bar
+*
+*  1) Sets the Internal registers bar base by obtaining the base from
+*	  the CPU Interface
+*  2) Sets the DRAM bar base and size by getting the base and size from
+*     the CPU Interface when the size is the sum of all enabled DRAM 
+*	  chip selects and the base is the base of CS0 .
+*  3) Sets the Device bar base and size by getting these values from the 
+*     CPU Interface when the base is the base of the lowest base of the
+*     Device chip selects, and the 
+*
+*
+* INPUT:
+*
+*       pexIf   -  PEX interface number.
+*
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK if function success otherwise MV_ERROR or MV_BAD_PARAM
+*
+*******************************************************************************/
+MV_STATUS mvPexInit(MV_U32 pexIf, MV_PEX_TYPE pexType)
+{
+	MV_U32 	       		bar;
+	MV_U32		   	winNum;
+	MV_PEX_BAR	  	pexBar;
+	MV_PEX_DEC_WIN 		pexWin;
+	MV_CPU_DEC_WIN 		addrDecWin;
+	MV_TARGET 		target;
+	MV_U32			pexCurrWin=0;
+	MV_U32			status;
+	/* default and exapntion rom 
+	are always configured */
+
+#ifndef MV_DISABLE_PEX_DEVICE_BAR
+	MV_U32		   	winIndex;
+	MV_U32 		    	maxBase=0, sizeOfMaxBase=0;
+	MV_U32			pexStartWindow;
+#endif
+
+	/* Parameter checking   */
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexInit: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+	
+	/* Enabled CPU access to PCI-Express */
+	mvCpuIfEnablePex(pexIf, pexType);
+
+    /* Start with bars */
+	/* First disable all PEX bars*/
+	for (bar = 0; bar < PEX_MAX_BARS; bar++)
+    {
+		if (PEX_INTER_REGS_BAR != bar)
+		{
+			if (MV_OK != mvPexBarEnable(pexIf, bar, MV_FALSE))
+			{
+				mvOsPrintf("mvPexInit:mvPexBarEnable bar =%d failed \n",bar);
+				return MV_ERROR;
+			}
+			
+		}
+
+	}
+
+	/* and disable all PEX target windows  */
+	for (winNum = 0; winNum < PEX_MAX_TARGET_WIN - 2; winNum++)
+    {
+		if (MV_OK != mvPexTargetWinEnable(pexIf, winNum, MV_FALSE))
+		{
+			mvOsPrintf("mvPexInit:mvPexTargetWinEnable winNum =%d failed \n",
+					   winNum);
+			return MV_ERROR;
+
+		}
+	}
+
+	/* Now, go through all bars*/
+
+
+
+/******************************************************************************/
+/*                       Internal registers bar                               */
+/******************************************************************************/
+	bar = PEX_INTER_REGS_BAR;
+
+	/* we only open the bar , no need to open windows for this bar */
+
+	/* first get the CS attribute from the CPU Interface */
+	if (MV_OK !=mvCpuIfTargetWinGet(INTER_REGS,&addrDecWin))
+	{
+		mvOsPrintf("mvPexInit: ERR. mvCpuIfTargetWinGet failed target =%d\n",INTER_REGS);
+		return MV_ERROR;
+	}
+
+	pexBar.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
+	pexBar.addrWin.baseLow = addrDecWin.addrWin.baseLow;
+	pexBar.addrWin.size = addrDecWin.addrWin.size;
+	pexBar.enable = MV_TRUE;
+
+	if (MV_OK != mvPexBarSet(pexIf, bar, &pexBar))
+	{
+		mvOsPrintf("mvPexInit: ERR. mvPexBarSet %d failed\n", bar);
+		return MV_ERROR;
+	}
+	
+/******************************************************************************/
+/*                                DRAM bar                                    */
+/******************************************************************************/
+
+	bar = PEX_DRAM_BAR;
+
+	pexBar.addrWin.size = 0;
+	
+	for (target = SDRAM_CS0;target < MV_DRAM_MAX_CS; target++ )
+	{
+
+		status = mvCpuIfTargetWinGet(target,&addrDecWin);
+
+		if((MV_NO_SUCH == status)&&(target != SDRAM_CS0))
+		{
+			continue;
+		}
+
+		/* first get attributes from CPU If */
+		if (MV_OK != status)
+		{
+			mvOsPrintf("mvPexInit: ERR. mvCpuIfTargetWinGet failed target =%d\n",target);
+			return MV_ERROR;
+		}
+		if (addrDecWin.enable == MV_TRUE)
+		{				
+			/* the base is the base of DRAM CS0 always */
+			if (SDRAM_CS0 == target )
+			{
+				pexBar.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
+				pexBar.addrWin.baseLow = addrDecWin.addrWin.baseLow;
+
+			}
+
+			/* increment the bar size to be the sum of the size of all
+			DRAM chips selecs */
+			pexBar.addrWin.size += addrDecWin.addrWin.size;
+
+			/* set a Pex window for this target ! 
+			DRAM CS always will have a Pex Window , and is not a 
+			part of the priority table */
+			pexWin.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
+			pexWin.addrWin.baseLow = addrDecWin.addrWin.baseLow;
+			pexWin.addrWin.size = addrDecWin.addrWin.size;
+			
+			/* we disable the windows at first because we are not
+			sure that it is witihin bar boundries */
+			pexWin.enable =MV_FALSE;
+			pexWin.target = target;
+			pexWin.targetBar = bar;
+
+			if (MV_OK != mvPexTargetWinSet(pexIf,pexCurrWin++,&pexWin))
+			{
+				mvOsPrintf("mvPexInit: ERR. mvPexTargetWinSet failed\n");
+				return MV_ERROR;
+			}
+		}
+	}
+
+	/* check if the size of the bar is illeggal */
+	if (-1 == ctrlSizeToReg(pexBar.addrWin.size, PXBCR_BAR_SIZE_ALIGNMENT))
+	{
+		/* try to get a good size */
+		pexBar.addrWin.size = ctrlSizeRegRoundUp(pexBar.addrWin.size,
+												 PXBCR_BAR_SIZE_ALIGNMENT);
+	}
+    
+	/* check if the size and base are valid */
+	if (MV_TRUE == pexBarOverlapDetect(pexIf,bar,&pexBar.addrWin))
+	{
+		mvOsPrintf("mvPexInit:Warning :Bar %d size is illigal\n",bar);
+		mvOsPrintf("it will be disabled\n");
+		mvOsPrintf("please check Pex and CPU windows configuration\n");
+	}
+	else
+	{
+		pexBar.enable = MV_TRUE;
+        
+		/* configure the bar */
+		if (MV_OK != mvPexBarSet(pexIf, bar, &pexBar))
+		{
+			mvOsPrintf("mvPexInit: ERR. mvPexBarSet %d failed\n", bar);
+			return MV_ERROR;
+		}
+	
+		/* after the bar was configured then we enable the Pex windows*/
+		for (winNum = 0;winNum < pexCurrWin ;winNum++)
+		{
+			if (MV_OK != mvPexTargetWinEnable(pexIf, winNum, MV_TRUE))
+			{
+				mvOsPrintf("mvPexInit: Can't enable window =%d\n",winNum);
+				return MV_ERROR;
+			}
+	
+		}
+	}
+
+/******************************************************************************/
+/*                              DEVICE bar                                    */
+/******************************************************************************/
+
+/* Open the Device BAR for non linux only */
+#ifndef MV_DISABLE_PEX_DEVICE_BAR 
+
+	/* then device  bar*/
+	bar = PEX_DEVICE_BAR;
+
+	/* save the starting window */
+	pexStartWindow = pexCurrWin;
+	pexBar.addrWin.size = 0;
+	pexBar.addrWin.baseLow = 0xffffffff;
+	pexBar.addrWin.baseHigh = 0;
+	maxBase = 0;
+
+	for (target = DEV_TO_TARGET(START_DEV_CS);target < DEV_TO_TARGET(MV_DEV_MAX_CS); target++ )
+	{
+		status = mvCpuIfTargetWinGet(target,&addrDecWin);
+
+		if (MV_NO_SUCH == status)
+		{
+			continue;
+		}
+
+		if (MV_OK != status)
+		{
+			mvOsPrintf("mvPexInit: ERR. mvCpuIfTargetWinGet failed target =%d\n",target);
+			return MV_ERROR;
+		}
+
+		if (addrDecWin.enable == MV_TRUE)
+		{				
+			/* get the minimum base */
+			if (addrDecWin.addrWin.baseLow < pexBar.addrWin.baseLow)
+			{
+				pexBar.addrWin.baseLow = addrDecWin.addrWin.baseLow;
+			}
+
+			/* get the maximum base */
+			if (addrDecWin.addrWin.baseLow > maxBase)
+			{
+				maxBase = addrDecWin.addrWin.baseLow;
+				sizeOfMaxBase = addrDecWin.addrWin.size;
+			}
+
+			/* search in the priority table for this target */
+			for (winIndex = 0; pexDevBarPrioTable[winIndex] != TBL_TERM;
+				 winIndex++)
+			{
+				if (pexDevBarPrioTable[winIndex] != target)
+				{
+					continue;
+				}
+				else if (pexDevBarPrioTable[winIndex] == target)
+				{
+					/*found it */
+
+					/* if the index of this target in the prio table is valid 
+					then we set the Pex window for this target, a valid index is 
+					an index that is lower than the number of the windows that
+					was not configured yet */
+
+					/* we subtract 2 always because the default and expantion
+					rom windows are always configured */
+					if ( pexCurrWin  < PEX_MAX_TARGET_WIN - 2)
+					{
+						/* set a Pex window for this target !  */
+						pexWin.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
+						pexWin.addrWin.baseLow = addrDecWin.addrWin.baseLow;
+						pexWin.addrWin.size = addrDecWin.addrWin.size;
+						
+						/* we disable the windows at first because we are not
+						sure that it is witihin bar boundries */
+						pexWin.enable = MV_FALSE;
+						pexWin.target = target;
+						pexWin.targetBar = bar;
+
+						if (MV_OK != mvPexTargetWinSet(pexIf,pexCurrWin++,
+													   &pexWin))
+						{
+							mvOsPrintf("mvPexInit: ERR. Window Set failed\n");
+							return MV_ERROR;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	pexBar.addrWin.size = maxBase - pexBar.addrWin.baseLow + sizeOfMaxBase;
+	pexBar.enable = MV_TRUE;
+
+	/* check if the size of the bar is illegal */
+	if (-1 == ctrlSizeToReg(pexBar.addrWin.size, PXBCR_BAR_SIZE_ALIGNMENT))
+	{
+		/* try to get a good size */
+		pexBar.addrWin.size = ctrlSizeRegRoundUp(pexBar.addrWin.size,
+												 PXBCR_BAR_SIZE_ALIGNMENT);
+	}
+
+	/* check if the size and base are valid */
+	if (MV_TRUE == pexBarOverlapDetect(pexIf,bar,&pexBar.addrWin))
+	{
+		mvOsPrintf("mvPexInit:Warning :Bar %d size is illigal\n",bar);
+		mvOsPrintf("it will be disabled\n");
+		mvOsPrintf("please check Pex and CPU windows configuration\n");
+	}
+	else
+	{
+		if (MV_OK != mvPexBarSet(pexIf, bar, &pexBar))
+		{
+			mvOsPrintf("mvPexInit: ERR. mvPexBarSet %d failed\n", bar);
+			return MV_ERROR;
+		}
+
+		/* now enable the windows */
+		for (winNum = pexStartWindow; winNum < pexCurrWin ; winNum++)
+		{
+			if (MV_OK != mvPexTargetWinEnable(pexIf, winNum, MV_TRUE))
+			{
+				mvOsPrintf("mvPexInit:mvPexTargetWinEnable winNum =%d failed \n",
+						   winNum);
+				return MV_ERROR;
+			}
+		}
+	}
+
+#endif
+
+	return mvPexHalInit(pexIf, pexType);
+
+}
+
+/*******************************************************************************
+* mvPexTargetWinSet - Set PEX to peripheral target address window BAR
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_OK if PEX BAR target window was set correctly, 
+*		MV_BAD_PARAM on bad params 
+*       MV_ERROR otherwise 
+*       (e.g. address window overlapps with other active PEX target window).
+*
+*******************************************************************************/
+MV_STATUS mvPexTargetWinSet(MV_U32 pexIf, MV_U32 winNum, 
+                            MV_PEX_DEC_WIN *pAddrDecWin)
+{
+
+	MV_DEC_REGS decRegs;
+	PEX_WIN_REG_INFO winRegInfo;
+	MV_TARGET_ATTRIB targetAttribs;
+
+	/* Parameter checking   */
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexTargetWinSet: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+
+	if (winNum >= PEX_MAX_TARGET_WIN)
+	{
+		mvOsPrintf("mvPexTargetWinSet: ERR. Invalid PEX winNum %d\n", winNum);
+		return MV_BAD_PARAM;
+
+	}
+
+	/* get the pex Window registers offsets */
+	pexWinRegInfoGet(pexIf,winNum,&winRegInfo);
+
+
+	if (MV_TRUE == pAddrDecWin->enable)
+	{
+
+		/* 2) Check if the requested window overlaps with current windows  */
+		if (MV_TRUE == pexWinOverlapDetect(pexIf,winNum, &pAddrDecWin->addrWin))
+		{
+			mvOsPrintf("mvPexTargetWinSet: ERR. Target %d overlap\n", winNum);
+			return MV_BAD_PARAM;
+		}
+	
+		/* 2) Check if the requested window overlaps with current windows  */
+		if (MV_FALSE == pexIsWinWithinBar(pexIf,&pAddrDecWin->addrWin))
+		{
+			mvOsPrintf("mvPexTargetWinSet: Win %d should be in bar boundries\n",
+					   winNum);
+			return MV_BAD_PARAM;
+		}
+
+	}
+
+
+
+	/* read base register*/
+	
+	if (winRegInfo.baseLowRegOffs)
+	{
+		decRegs.baseReg = MV_REG_READ(winRegInfo.baseLowRegOffs);
+	}
+	else
+	{
+		decRegs.baseReg = 0;
+	}
+
+	if (winRegInfo.sizeRegOffs)
+	{
+		decRegs.sizeReg = MV_REG_READ(winRegInfo.sizeRegOffs);
+	}
+	else
+	{
+		decRegs.sizeReg =0;
+	}
+	
+	if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+	{
+		mvOsPrintf("mvPexTargetWinSet:mvCtrlAddrDecToReg Failed\n");
+		return MV_ERROR;		
+	}
+
+	/* enable\Disable */
+	if (MV_TRUE == pAddrDecWin->enable)
+	{
+		decRegs.sizeReg |= PXWCR_WIN_EN;
+	}
+	else
+	{
+		decRegs.sizeReg &= ~PXWCR_WIN_EN;
+	}
+
+
+	/* clear bit location */
+	decRegs.sizeReg &= ~PXWCR_WIN_BAR_MAP_MASK;
+
+	/* set bar Mapping */
+	if (pAddrDecWin->targetBar == 1)
+	{
+		decRegs.sizeReg |= PXWCR_WIN_BAR_MAP_BAR1;
+	}
+	else if (pAddrDecWin->targetBar == 2)
+	{
+		decRegs.sizeReg |= PXWCR_WIN_BAR_MAP_BAR2;
+	}
+
+	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
+
+	/* set attributes */
+	decRegs.sizeReg &= ~PXWCR_ATTRIB_MASK;
+	decRegs.sizeReg |= targetAttribs.attrib << PXWCR_ATTRIB_OFFS;
+	/* set target ID */
+	decRegs.sizeReg &= ~PXWCR_TARGET_MASK;
+	decRegs.sizeReg |= targetAttribs.targetId << PXWCR_TARGET_OFFS;
+
+
+	/* 3) Write to address decode Base Address Register                   */
+
+	if (winRegInfo.baseLowRegOffs)
+	{
+		MV_REG_WRITE(winRegInfo.baseLowRegOffs, decRegs.baseReg);
+	}
+
+	/* write size reg */
+	if (winRegInfo.sizeRegOffs)
+	{
+		if ((MV_PEX_WIN_DEFAULT == winNum)||
+			(MV_PEX_WIN_EXP_ROM == winNum))
+		{
+			/* clear size because there is no size field*/
+			decRegs.sizeReg &= ~PXWCR_SIZE_MASK;
+
+			/* clear enable because there is no enable field*/
+			decRegs.sizeReg &= ~PXWCR_WIN_EN;
+
+		}
+
+		MV_REG_WRITE(winRegInfo.sizeRegOffs, decRegs.sizeReg);
+	}
+
+
+    return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvPexTargetWinGet - Get PEX to peripheral target address window
+*
+* DESCRIPTION:
+*		Get the PEX to peripheral target address window BAR.
+*
+* INPUT:
+*       pexIf - PEX interface number.
+*       bar   - BAR to be accessed by slave.
+*
+* OUTPUT:
+*       pAddrBarWin - PEX target window information data structure.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexTargetWinGet(MV_U32 pexIf, MV_U32 winNum, 
+                            MV_PEX_DEC_WIN *pAddrDecWin)
+{
+	MV_TARGET_ATTRIB targetAttrib;
+	MV_DEC_REGS decRegs;
+
+	PEX_WIN_REG_INFO winRegInfo;
+
+	/* Parameter checking   */
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexTargetWinGet: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+
+	if (winNum >= PEX_MAX_TARGET_WIN)
+	{
+		mvOsPrintf("mvPexTargetWinGet: ERR. Invalid PEX winNum %d\n", winNum);
+		return MV_BAD_PARAM;
+
+	}
+
+	/* get the pex Window registers offsets */
+	pexWinRegInfoGet(pexIf,winNum,&winRegInfo);
+
+	/* read base register*/
+	if (winRegInfo.baseLowRegOffs)
+	{
+		decRegs.baseReg = MV_REG_READ(winRegInfo.baseLowRegOffs);
+	}
+	else
+	{
+		decRegs.baseReg = 0;
+	}
+
+	/* read size reg */
+	if (winRegInfo.sizeRegOffs)
+	{
+		decRegs.sizeReg = MV_REG_READ(winRegInfo.sizeRegOffs);
+	}
+	else
+	{
+		decRegs.sizeReg =0;
+	}
+
+	if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
+	{
+		mvOsPrintf("mvPexTargetWinGet: mvCtrlRegToAddrDec Failed \n");
+		return MV_ERROR;
+
+	}
+
+	if (decRegs.sizeReg & PXWCR_WIN_EN)
+	{
+		pAddrDecWin->enable = MV_TRUE;
+	}
+	else
+	{
+		pAddrDecWin->enable = MV_FALSE;	  
+
+	}
+
+
+	#if 0
+    if (-1 == pAddrDecWin->addrWin.size)
+	{
+		return MV_ERROR;
+	}
+	#endif
+
+
+	/* get target bar */
+	if ((decRegs.sizeReg & PXWCR_WIN_BAR_MAP_MASK) == PXWCR_WIN_BAR_MAP_BAR1 )
+	{
+		pAddrDecWin->targetBar = 1;
+	} 
+	else if ((decRegs.sizeReg & PXWCR_WIN_BAR_MAP_MASK) == 
+			 PXWCR_WIN_BAR_MAP_BAR2 )
+	{
+		pAddrDecWin->targetBar = 2;
+	}
+
+	/* attrib and targetId */
+	pAddrDecWin->attrib = (decRegs.sizeReg & PXWCR_ATTRIB_MASK) >> 
+													PXWCR_ATTRIB_OFFS;
+	pAddrDecWin->targetId = (decRegs.sizeReg & PXWCR_TARGET_MASK) >> 
+													PXWCR_TARGET_OFFS;
+
+	targetAttrib.attrib = pAddrDecWin->attrib;
+	targetAttrib.targetId = pAddrDecWin->targetId;
+
+	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+	return MV_OK;
+
+}
+
+
+/*******************************************************************************
+* mvPexTargetWinEnable - Enable/disable a PEX BAR window
+*
+* DESCRIPTION:
+*       This function enable/disable a PEX BAR window.
+*       if parameter 'enable' == MV_TRUE the routine will enable the 
+*       window, thus enabling PEX accesses for that BAR (before enabling the 
+*       window it is tested for overlapping). Otherwise, the window will 
+*       be disabled.
+*
+* INPUT:
+*       pexIf  - PEX interface number.
+*       bar    - BAR to be accessed by slave.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexTargetWinEnable(MV_U32 pexIf,MV_U32 winNum, MV_BOOL enable)
+{
+	PEX_WIN_REG_INFO winRegInfo;
+	MV_PEX_DEC_WIN addrDecWin;
+
+	/* Parameter checking   */
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexTargetWinEnable: ERR. Invalid PEX If %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+
+	if (winNum >= PEX_MAX_TARGET_WIN)
+	{
+		mvOsPrintf("mvPexTargetWinEnable ERR. Invalid PEX winNum %d\n", winNum);
+		return MV_BAD_PARAM;
+
+	}
+
+
+	/* get the pex Window registers offsets */
+	pexWinRegInfoGet(pexIf,winNum,&winRegInfo);
+
+
+	/* if the address windows is disabled , we only disable the appropriare
+	pex window and ignore other settings */
+
+	if (MV_FALSE == enable)
+	{
+
+		/* this is not relevant to default and expantion rom
+		windows */
+		if (winRegInfo.sizeRegOffs)
+		{
+			if ((MV_PEX_WIN_DEFAULT != winNum)&&
+				(MV_PEX_WIN_EXP_ROM != winNum))
+			{
+				MV_REG_BIT_RESET(winRegInfo.sizeRegOffs, PXWCR_WIN_EN);
+			}
+		}
+
+	}
+	else
+	{
+		if (MV_OK != mvPexTargetWinGet(pexIf,winNum, &addrDecWin))
+		{
+			mvOsPrintf("mvPexTargetWinEnable: mvPexTargetWinGet Failed\n");
+			return MV_ERROR;
+		}
+
+		/* Check if the requested window overlaps with current windows	*/
+		if (MV_TRUE == pexWinOverlapDetect(pexIf,winNum, &addrDecWin.addrWin))
+		{
+			mvOsPrintf("mvPexTargetWinEnable: ERR. Target %d overlap\n", winNum);
+			return MV_BAD_PARAM;
+		}
+
+		if (MV_FALSE == pexIsWinWithinBar(pexIf,&addrDecWin.addrWin))
+		{
+			mvOsPrintf("mvPexTargetWinEnable: Win %d should be in bar boundries\n",
+					   winNum);
+			return MV_BAD_PARAM;
+		}
+
+
+		/* this is not relevant to default and expantion rom
+		windows */
+		if (winRegInfo.sizeRegOffs)
+		{
+			if ((MV_PEX_WIN_DEFAULT != winNum)&&
+				(MV_PEX_WIN_EXP_ROM != winNum))
+			{
+				MV_REG_BIT_SET(winRegInfo.sizeRegOffs, PXWCR_WIN_EN);
+			}
+		}
+
+
+	}
+
+	return MV_OK;
+
+}
+
+
+
+/*******************************************************************************
+* mvPexTargetWinRemap - Set PEX to target address window remap.
+*
+* DESCRIPTION:
+*       The PEX interface supports remap of the BAR original address window.
+*       For each BAR it is possible to define a remap address. For example
+*       an address 0x12345678 that hits BAR 0x10 (SDRAM CS[0]) will be modified
+*       according to remap register but will also be targeted to the 
+*       SDRAM CS[0].
+*
+* INPUT:
+*       pexIf    - PEX interface number.
+*       bar      - Peripheral target enumerator accessed by slave.
+*       pAddrWin - Address window to be checked.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexTargetWinRemap(MV_U32 pexIf, MV_U32 winNum, 
+                           MV_PEX_REMAP_WIN *pAddrWin)
+{
+
+	PEX_WIN_REG_INFO winRegInfo;
+	
+	/* Parameter checking   */
+	if (pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX interface num %d\n", 
+																		pexIf);
+		return MV_BAD_PARAM;
+	}
+	if (MV_PEX_WIN_DEFAULT == winNum)
+	{
+		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX win num %d\n", 
+																		winNum);
+		return MV_BAD_PARAM;
+
+	}
+
+	if (MV_IS_NOT_ALIGN(pAddrWin->addrWin.baseLow, PXWRR_REMAP_ALIGNMENT))
+	{
+		mvOsPrintf("mvPexTargetWinRemap: Error remap PEX interface %d win %d."\
+				   "\nAddress 0x%08x is unaligned to size 0x%x.\n",
+				   pexIf,
+				   winNum,
+                   pAddrWin->addrWin.baseLow,
+				   pAddrWin->addrWin.size);
+		
+		return MV_ERROR;
+	}
+
+	pexWinRegInfoGet(pexIf, winNum, &winRegInfo);
+
+	/* Set remap low register value */
+	MV_REG_WRITE(winRegInfo.remapLowRegOffs, pAddrWin->addrWin.baseLow);
+	
+	/* Skip base high settings if the BAR has only base low (32-bit)		*/
+	if (0 != winRegInfo.remapHighRegOffs)
+	{
+		MV_REG_WRITE(winRegInfo.remapHighRegOffs, pAddrWin->addrWin.baseHigh);
+	}
+
+
+	if (pAddrWin->enable == MV_TRUE)
+	{
+		MV_REG_BIT_SET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
+	}
+	else
+	{
+		MV_REG_BIT_RESET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvPexTargetWinRemapEnable - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+
+MV_STATUS mvPexTargetWinRemapEnable(MV_U32 pexIf, MV_U32 winNum, 
+                           MV_BOOL enable)
+{
+	PEX_WIN_REG_INFO winRegInfo;
+	
+	/* Parameter checking   */
+	if (pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX interface num %d\n", 
+																		pexIf);
+		return MV_BAD_PARAM;
+	}
+	if (MV_PEX_WIN_DEFAULT == winNum)
+	{
+		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX win num %d\n", 
+																		winNum);
+		return MV_BAD_PARAM;
+
+	}
+
+
+	pexWinRegInfoGet(pexIf, winNum, &winRegInfo);
+
+	if (enable == MV_TRUE)
+	{
+		MV_REG_BIT_SET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
+	}
+	else
+	{
+		MV_REG_BIT_RESET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
+	}
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+*  mvPexBarSet - Set PEX bar address and size 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexBarSet(MV_U32 pexIf,
+						MV_U32 barNum,
+						MV_PEX_BAR *pAddrWin)
+{
+	MV_U32 regBaseLow;
+	MV_U32 regSize,sizeToReg;
+
+
+	/* check parameters */
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexBarSet: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+
+	if(barNum >= PEX_MAX_BARS)
+	{
+		mvOsPrintf("mvPexBarSet: ERR. Invalid bar number %d\n", barNum);
+		return MV_BAD_PARAM;
+	}
+	
+
+	if (pAddrWin->addrWin.size == 0)
+	{
+		mvOsPrintf("mvPexBarSet: Size zero is Illigal\n" );
+		return MV_BAD_PARAM;
+	}
+
+
+	/* Check if the window complies with PEX spec							*/
+	if (MV_TRUE != pexBarIsValid(pAddrWin->addrWin.baseLow,
+								 pAddrWin->addrWin.size))
+	{
+        mvOsPrintf("mvPexBarSet: ERR. Target %d window invalid\n", barNum);
+		return MV_BAD_PARAM;
+	}
+
+    /* 2) Check if the requested bar overlaps with current bars		*/
+    if (MV_TRUE == pexBarOverlapDetect(pexIf,barNum, &pAddrWin->addrWin))
+	{
+        mvOsPrintf("mvPexBarSet: ERR. Target %d overlap\n", barNum);
+		return MV_BAD_PARAM;
+	}
+
+	/* Get size register value according to window size						*/
+	sizeToReg = ctrlSizeToReg(pAddrWin->addrWin.size, PXBCR_BAR_SIZE_ALIGNMENT);
+	
+	/* Read bar size */
+	if (PEX_INTER_REGS_BAR != barNum) /* internal registers have no size */
+	{
+		regSize = MV_REG_READ(PEX_BAR_CTRL_REG(pexIf,barNum));
+
+		/* Size parameter validity check.                                   */
+		if (-1 == sizeToReg)
+		{
+			mvOsPrintf("mvPexBarSet: ERR. Target BAR %d size invalid.\n",barNum);
+			return MV_BAD_PARAM;
+		}
+	
+		regSize &= ~PXBCR_BAR_SIZE_MASK;
+		regSize |= (sizeToReg << PXBCR_BAR_SIZE_OFFS) ;
+	
+		MV_REG_WRITE(PEX_BAR_CTRL_REG(pexIf,barNum),regSize);
+
+	}
+
+	/* set size */
+
+
+
+	/* Read base address low */
+	regBaseLow = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,
+												   PEX_MV_BAR_BASE(barNum)));
+
+	/* clear current base */
+	if (PEX_INTER_REGS_BAR == barNum)
+	{
+		regBaseLow &= ~PXBIR_BASE_MASK;
+        regBaseLow |= (pAddrWin->addrWin.baseLow & PXBIR_BASE_MASK);
+	}
+	else
+	{
+		regBaseLow &= ~PXBR_BASE_MASK;
+		regBaseLow |= (pAddrWin->addrWin.baseLow & PXBR_BASE_MASK);
+	}
+
+	/* if we had a previous value that contain the bar type (MeM\IO), we want to
+	restore it */
+	regBaseLow |= PEX_BAR_DEFAULT_ATTRIB;
+
+
+
+	/* write base low */
+    MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE(barNum)),
+				regBaseLow);
+
+	if (pAddrWin->addrWin.baseHigh != 0)
+	{
+		/* Read base address high */
+		MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE_HIGH(barNum)),
+								 pAddrWin->addrWin.baseHigh);
+
+	}
+
+	/* lastly enable the Bar */
+	if (pAddrWin->enable == MV_TRUE)
+	{
+		if (PEX_INTER_REGS_BAR != barNum) /* internal registers 
+												are enabled always */
+		{
+			MV_REG_BIT_SET(PEX_BAR_CTRL_REG(pexIf,barNum),PXBCR_BAR_EN);
+		}
+	}
+	else if (MV_FALSE == pAddrWin->enable)
+	{
+		if (PEX_INTER_REGS_BAR != barNum) /* internal registers 
+												are enabled always */
+		{
+			MV_REG_BIT_RESET(PEX_BAR_CTRL_REG(pexIf,barNum),PXBCR_BAR_EN);
+		}
+
+	}
+
+
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+*  mvPexBarGet - Get PEX bar address and size
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+
+MV_STATUS mvPexBarGet(MV_U32 pexIf,
+								MV_U32 barNum,
+								MV_PEX_BAR *pAddrWin)
+{
+	/* check parameters */
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexBarGet: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+
+	if(barNum >= PEX_MAX_BARS)
+	{
+		mvOsPrintf("mvPexBarGet: ERR. Invalid bar number %d\n", barNum);
+		return MV_BAD_PARAM;
+	}
+
+	/* read base low */
+	pAddrWin->addrWin.baseLow = 
+		MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE(barNum)));
+
+
+	if (PEX_INTER_REGS_BAR == barNum)
+	{
+		pAddrWin->addrWin.baseLow &= PXBIR_BASE_MASK;
+	}
+	else
+	{
+		pAddrWin->addrWin.baseLow &= PXBR_BASE_MASK;
+	}
+
+
+	/* read base high */
+	pAddrWin->addrWin.baseHigh = 
+		MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE_HIGH(barNum)));
+
+
+	/* Read bar size */
+	if (PEX_INTER_REGS_BAR != barNum) /* internal registers have no size */
+	{
+		pAddrWin->addrWin.size = MV_REG_READ(PEX_BAR_CTRL_REG(pexIf,barNum));
+
+		/* check if enable or not */
+		if (pAddrWin->addrWin.size & PXBCR_BAR_EN)
+		{
+			pAddrWin->enable = MV_TRUE;
+		}
+		else
+		{
+			pAddrWin->enable = MV_FALSE;
+		}
+			
+		/* now get the size */
+		pAddrWin->addrWin.size &= PXBCR_BAR_SIZE_MASK;
+		pAddrWin->addrWin.size >>= PXBCR_BAR_SIZE_OFFS;
+
+		pAddrWin->addrWin.size = ctrlRegToSize(pAddrWin->addrWin.size,
+											   PXBCR_BAR_SIZE_ALIGNMENT);
+
+	}
+	else /* PEX_INTER_REGS_BAR */
+	{
+		pAddrWin->addrWin.size = INTER_REGS_SIZE;
+		pAddrWin->enable = MV_TRUE;
+	}
+
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+*  mvPexBarEnable - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+
+
+MV_STATUS mvPexBarEnable(MV_U32 pexIf, MV_U32 barNum, MV_BOOL enable)
+{
+
+	MV_PEX_BAR pexBar;
+
+	/* check parameters */
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexBarEnable: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+
+
+	if(barNum >= PEX_MAX_BARS)
+	{
+		mvOsPrintf("mvPexBarEnable: ERR. Invalid bar number %d\n", barNum);
+		return MV_BAD_PARAM;
+	}
+
+    if (PEX_INTER_REGS_BAR == barNum)
+	{
+		if (MV_TRUE == enable)
+		{
+			return MV_OK;
+		}
+		else
+		{
+			return MV_ERROR;
+		}
+	}
+
+
+	if (MV_FALSE == enable)
+	{
+			/* disable bar and quit */
+			MV_REG_BIT_RESET(PEX_BAR_CTRL_REG(pexIf,barNum),PXBCR_BAR_EN);
+			return MV_OK;
+	}
+
+	/* else */
+
+	if (mvPexBarGet(pexIf,barNum,&pexBar) != MV_OK)
+	{
+		mvOsPrintf("mvPexBarEnable: mvPexBarGet Failed\n");
+		return MV_ERROR;
+
+	}
+
+	if (MV_TRUE == pexBar.enable)
+	{
+		/* it is already enabled !!! */
+		return MV_OK;
+	}
+
+	/* else enable the bar*/
+
+	pexBar.enable = MV_TRUE;
+
+	if (mvPexBarSet(pexIf,barNum,&pexBar) != MV_OK)
+	{
+		mvOsPrintf("mvPexBarEnable: mvPexBarSet Failed\n");
+		return MV_ERROR;
+
+	}
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* pexWinOverlapDetect - Detect address windows overlapping
+*
+* DESCRIPTION:
+*       This function detects address window overlapping of a given address 
+*       window in PEX BARs.
+*
+* INPUT:
+*       pAddrWin - Address window to be checked.
+*       bar      - BAR to be accessed by slave.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_BOOL pexWinOverlapDetect(MV_U32 pexIf,
+									 MV_U32 winNum,
+									 MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32 		   win;
+	MV_PEX_DEC_WIN addrDecWin;
+
+	
+	for(win = 0; win < PEX_MAX_TARGET_WIN -2 ; win++)
+    {
+        /* don't check our target or illegal targets */
+        if (winNum == win)
+        {
+            continue;
+        }
+        
+		/* Get window parameters 	*/
+		if (MV_OK != mvPexTargetWinGet(pexIf, win, &addrDecWin))
+		{
+			mvOsPrintf("pexWinOverlapDetect: ERR. TargetWinGet failed win=%x\n",
+					   win);
+            return MV_ERROR;
+		}
+
+		/* Do not check disabled windows	*/
+		if (MV_FALSE == addrDecWin.enable)
+		{
+			continue;
+		}
+
+        
+        if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
+		{                    
+			mvOsPrintf("pexWinOverlapDetect: winNum %d overlap current %d\n", 
+															winNum, win);
+			return MV_TRUE;           
+		}
+    }
+    
+	return MV_FALSE;
+}
+
+/*******************************************************************************
+* pexIsWinWithinBar - Detect if address is within PEX bar boundries
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_BOOL pexIsWinWithinBar(MV_U32 pexIf,
+								   MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32 		   bar;
+	MV_PEX_BAR addrDecWin;
+
+	for(bar = 0; bar < PEX_MAX_BARS; bar++)
+    {
+        
+		/* Get window parameters 	*/
+		if (MV_OK != mvPexBarGet(pexIf, bar, &addrDecWin))
+		{
+			mvOsPrintf("pexIsWinWithinBar: ERR. mvPexBarGet failed\n");
+            return MV_ERROR;
+		}
+		
+		/* Do not check disabled bars	*/
+		if (MV_FALSE == addrDecWin.enable)
+		{
+			continue;
+		}
+
+        
+        if(MV_TRUE == ctrlWinWithinWinTest(pAddrWin, &addrDecWin.addrWin))
+		{                    
+			return MV_TRUE;
+		}
+    }
+    
+	return MV_FALSE;
+
+}
+
+/*******************************************************************************
+* pexBarOverlapDetect - Detect address windows overlapping
+*
+* DESCRIPTION:
+*       This function detects address window overlapping of a given address 
+*       window in PEX BARs.
+*
+* INPUT:
+*       pAddrWin - Address window to be checked.
+*       bar      - BAR to be accessed by slave.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_BOOL pexBarOverlapDetect(MV_U32 pexIf,
+									 MV_U32 barNum,
+									 MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32 		   bar;
+	MV_PEX_BAR barDecWin;
+
+	
+	for(bar = 0; bar < PEX_MAX_BARS; bar++)
+    {
+        /* don't check our target or illegal targets */
+        if (barNum == bar)
+        {
+            continue;
+        }
+        
+		/* Get window parameters 	*/
+		if (MV_OK != mvPexBarGet(pexIf, bar, &barDecWin))
+		{
+			mvOsPrintf("pexBarOverlapDetect: ERR. TargetWinGet failed\n");
+            return MV_ERROR;
+		}
+
+		/* don'nt check disabled bars */
+        if (barDecWin.enable == MV_FALSE)
+		{
+			continue;
+		}
+
+
+        if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &barDecWin.addrWin))
+		{                    
+			mvOsPrintf("pexBarOverlapDetect: winNum %d overlap current %d\n", 
+															barNum, bar);
+			return MV_TRUE;           
+		}
+    }
+    
+	return MV_FALSE;
+}
+
+/*******************************************************************************
+* pexBarIsValid - Check if the given address window is valid
+*
+* DESCRIPTION:
+*		PEX spec restrict BAR base to be aligned to BAR size.
+*		This function checks if the given address window is valid.
+*
+* INPUT:
+*       baseLow - 32bit low base address.
+*       size    - Window size.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the address window is valid, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_STATUS pexBarIsValid(MV_U32 baseLow, MV_U32 size)
+{
+
+	/* PCI spec restrict BAR base to be aligned to BAR size					*/
+	if(MV_IS_NOT_ALIGN(baseLow, size))
+	{
+		return MV_ERROR;
+	}
+	else
+	{
+		return MV_TRUE;
+	}
+	
+	return MV_TRUE;
+}
+
+/*******************************************************************************
+* pexBarRegInfoGet - Get BAR register information
+*
+* DESCRIPTION:
+* 		PEX BARs registers offsets are inconsecutive. 
+*		This function gets a PEX BAR register information like register offsets
+*		and function location of the BAR.
+*
+* INPUT:
+*       pexIf - PEX interface number.
+*		bar	  - The PEX BAR in question.	
+*
+* OUTPUT:
+*       pBarRegInfo - BAR register info struct.
+*
+* RETURN:
+*		MV_BAD_PARAM when bad parameters ,MV_ERROR on error ,othewise MV_OK
+*
+*******************************************************************************/
+static MV_STATUS pexWinRegInfoGet(MV_U32 pexIf, 
+								  MV_U32 winNum,
+								  PEX_WIN_REG_INFO *pWinRegInfo)
+{
+
+	if ((winNum >= 0)&&(winNum <=3))
+	{
+		pWinRegInfo->baseLowRegOffs   = PEX_WIN0_3_BASE_REG(pexIf,winNum);
+		pWinRegInfo->baseHighRegOffs  = 0;
+		pWinRegInfo->sizeRegOffs      = PEX_WIN0_3_CTRL_REG(pexIf,winNum);
+		pWinRegInfo->remapLowRegOffs  = PEX_WIN0_3_REMAP_REG(pexIf,winNum);
+		pWinRegInfo->remapHighRegOffs = 0;
+	}
+	else if ((winNum >= 4)&&(winNum <=5))
+	{
+		pWinRegInfo->baseLowRegOffs   = PEX_WIN4_5_BASE_REG(pexIf,winNum);
+		pWinRegInfo->baseHighRegOffs  = 0;
+		pWinRegInfo->sizeRegOffs      = PEX_WIN4_5_CTRL_REG(pexIf,winNum);
+		pWinRegInfo->remapLowRegOffs  = PEX_WIN4_5_REMAP_REG(pexIf,winNum);
+		pWinRegInfo->remapHighRegOffs = PEX_WIN4_5_REMAP_HIGH_REG(pexIf,winNum);
+
+	}
+	else if (MV_PEX_WIN_DEFAULT == winNum)
+	{
+		pWinRegInfo->baseLowRegOffs   = 0;
+		pWinRegInfo->baseHighRegOffs  = 0;
+		pWinRegInfo->sizeRegOffs      = PEX_WIN_DEFAULT_CTRL_REG(pexIf);
+		pWinRegInfo->remapLowRegOffs  = 0;
+		pWinRegInfo->remapHighRegOffs = 0;
+	}
+	else if (MV_PEX_WIN_EXP_ROM == winNum)
+	{
+		pWinRegInfo->baseLowRegOffs   = 0;
+		pWinRegInfo->baseHighRegOffs  = 0;
+		pWinRegInfo->sizeRegOffs      = PEX_WIN_EXP_ROM_CTRL_REG(pexIf);
+		pWinRegInfo->remapLowRegOffs  = PEX_WIN_EXP_ROM_REMAP_REG(pexIf);
+		pWinRegInfo->remapHighRegOffs = 0;
+
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* pexBarNameGet - Get the string name of PEX BAR.
+*
+* DESCRIPTION:
+*		This function get the string name of PEX BAR.
+*
+* INPUT:
+*       bar - PEX bar number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       pointer to the string name of PEX BAR.
+*
+*******************************************************************************/
+const MV_8* pexBarNameGet( MV_U32 bar )
+{
+	switch( bar ) 
+	{
+		case PEX_INTER_REGS_BAR: 
+			return "Internal Regs Bar0....";
+		case PEX_DRAM_BAR: 
+			return "DRAM Bar1.............";
+		case PEX_DEVICE_BAR: 
+			return "Devices Bar2..........";
+		default:
+			 return "Bar unknown";
+	}
+}
+/*******************************************************************************
+* mvPexAddrDecShow - Print the PEX address decode map (BARs and windows).
+*
+* DESCRIPTION:
+*		This function print the PEX address decode map (BARs and windows).
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvPexAddrDecShow(MV_VOID)
+{
+	MV_PEX_BAR pexBar;
+	MV_PEX_DEC_WIN win;
+	MV_U32 pexIf;
+	MV_U32 bar,winNum;
+
+	for( pexIf = 0; pexIf < mvCtrlPexMaxIfGet(); pexIf++ )
+	{
+		if (MV_FALSE == mvCtrlPwrClckGet(PEX_UNIT_ID, pexIf)) continue;
+		mvOsOutput( "\n" );
+		mvOsOutput( "PEX%d:\n", pexIf );
+		mvOsOutput( "-----\n" );
+
+		mvOsOutput( "\nPex Bars \n\n");
+
+		for( bar = 0; bar < PEX_MAX_BARS; bar++ ) 
+		{
+			memset( &pexBar, 0, sizeof(MV_PEX_BAR) );
+
+			mvOsOutput( "%s ", pexBarNameGet(bar) );
+
+			if( mvPexBarGet( pexIf, bar, &pexBar ) == MV_OK )
+			{
+				if( pexBar.enable )
+				{
+                    mvOsOutput( "base %08x, ", pexBar.addrWin.baseLow );
+                    mvSizePrint( pexBar.addrWin.size );
+                    mvOsOutput( "\n" );
+				}
+				else
+					mvOsOutput( "disable\n" );
+			}
+		}
+		mvOsOutput( "\nPex Decode Windows\n\n");
+
+		for( winNum = 0; winNum < PEX_MAX_TARGET_WIN - 2; winNum++)
+		{
+			memset( &win, 0,sizeof(MV_PEX_DEC_WIN) );
+
+			mvOsOutput( "win%d - ", winNum );
+
+			if ( mvPexTargetWinGet(pexIf,winNum,&win) == MV_OK)
+			{
+				if (win.enable)
+				{
+					mvOsOutput( "%s base %08x, ",
+					mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
+					mvOsOutput( "...." );
+					mvSizePrint( win.addrWin.size );
+
+					mvOsOutput( "\n" );
+				}
+				else
+					mvOsOutput( "disable\n" );
+
+
+			}
+		}
+	
+		memset( &win, 0,sizeof(MV_PEX_DEC_WIN) );
+
+		mvOsOutput( "default win - " );
+
+		if ( mvPexTargetWinGet(pexIf, MV_PEX_WIN_DEFAULT, &win) == MV_OK)
+		{
+			mvOsOutput( "%s ",
+			mvCtrlTargetNameGet(win.target) );
+			mvOsOutput( "\n" );
+		}
+		memset( &win, 0,sizeof(MV_PEX_DEC_WIN) );
+
+		mvOsOutput( "Expansion ROM - " );
+
+		if ( mvPexTargetWinGet(pexIf, MV_PEX_WIN_EXP_ROM, &win) == MV_OK)
+		{
+			mvOsOutput( "%s ",
+			mvCtrlTargetNameGet(win.target) );
+			mvOsOutput( "\n" );
+		}
+
+	}
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h
new file mode 100644
index 00000000..3505613b
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h
@@ -0,0 +1,348 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCSysPEXH
+#define __INCSysPEXH
+
+#include "mvCommon.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+/* 4KB granularity */
+#define MINIMUM_WINDOW_SIZE     0x1000
+#define MINIMUM_BAR_SIZE        0x1000
+#define MINIMUM_BAR_SIZE_MASK	0xFFFFF000
+#define BAR_SIZE_OFFS			12
+#define BAR_SIZE_MASK			(0xFFFFF << BAR_SIZE_OFFS)
+
+
+
+#define MV_PEX_WIN_DEFAULT		6
+#define MV_PEX_WIN_EXP_ROM		7
+#define PEX_MAX_TARGET_WIN		8
+
+
+#define PEX_MAX_BARS			3
+#define PEX_INTER_REGS_BAR		0
+#define PEX_DRAM_BAR			1
+#define PEX_DEVICE_BAR			2
+
+/*************************************/
+/* PCI Express BAR Control Registers */
+/*************************************/
+#define PEX_BAR_CTRL_REG(pexIf,bar)		(0x41804 + (bar-1)*4- (pexIf)*0x10000)
+#define PEX_EXP_ROM_BAR_CTRL_REG(pexIf)	(0x4180C - (pexIf)*0x10000)
+
+
+/* PCI Express BAR Control Register */
+/* PEX_BAR_CTRL_REG (PXBCR) */
+
+#define PXBCR_BAR_EN				BIT0
+#define PXBCR_BAR_SIZE_OFFS			16
+#define PXBCR_BAR_SIZE_MASK			(0xffff << PXBCR_BAR_SIZE_OFFS)
+#define PXBCR_BAR_SIZE_ALIGNMENT	0x10000
+
+
+
+/* PCI Express Expansion ROM BAR Control Register */
+/* PEX_EXP_ROM_BAR_CTRL_REG (PXERBCR) */
+
+#define PXERBCR_EXPROM_EN			BIT0
+#define PXERBCR_EXPROMSZ_OFFS		19
+#define PXERBCR_EXPROMSZ_MASK		(0xf << PXERBCR_EXPROMSZ_OFFS)
+#define PXERBCR_EXPROMSZ_512KB		(0x0 << PXERBCR_EXPROMSZ_OFFS)
+#define PXERBCR_EXPROMSZ_1024KB		(0x1 << PXERBCR_EXPROMSZ_OFFS)
+#define PXERBCR_EXPROMSZ_2048KB		(0x3 << PXERBCR_EXPROMSZ_OFFS)
+#define PXERBCR_EXPROMSZ_4096KB		(0x7 << PXERBCR_EXPROMSZ_OFFS)
+
+/************************************************/
+/* PCI Express Address Window Control Registers */
+/************************************************/
+#define PEX_WIN0_3_CTRL_REG(pexIf,winNum)       \
+                                (0x41820 + (winNum) * 0x10 - (pexIf) * 0x10000)
+#define PEX_WIN0_3_BASE_REG(pexIf,winNum)       \
+                                (0x41824 + (winNum) * 0x10 - (pexIf) * 0x10000)
+#define PEX_WIN0_3_REMAP_REG(pexIf,winNum)      \
+                                (0x4182C + (winNum) * 0x10 - (pexIf) * 0x10000)
+#define PEX_WIN4_5_CTRL_REG(pexIf,winNum)       \
+                            (0x41860 + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
+#define PEX_WIN4_5_BASE_REG(pexIf,winNum)       \
+                            (0x41864 + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
+#define PEX_WIN4_5_REMAP_REG(pexIf,winNum)      \
+                            (0x4186C + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
+#define PEX_WIN4_5_REMAP_HIGH_REG(pexIf,winNum) \
+                            (0x41870 + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
+
+#define PEX_WIN_DEFAULT_CTRL_REG(pexIf)         (0x418B0 - (pexIf) * 0x10000)
+#define PEX_WIN_EXP_ROM_CTRL_REG(pexIf)         (0x418C0 - (pexIf) * 0x10000)
+#define PEX_WIN_EXP_ROM_REMAP_REG(pexIf)        (0x418C4 - (pexIf) * 0x10000)
+
+/* PCI Express Window Control Register */
+/* PEX_WIN_CTRL_REG (PXWCR) */
+
+#define	PXWCR_WIN_EN					BIT0 /* Window Enable.*/
+
+#define	PXWCR_WIN_BAR_MAP_OFFS			1    /* Mapping to BAR.*/
+#define	PXWCR_WIN_BAR_MAP_MASK			BIT1
+#define	PXWCR_WIN_BAR_MAP_BAR1			(0 << PXWCR_WIN_BAR_MAP_OFFS)
+#define	PXWCR_WIN_BAR_MAP_BAR2			(1 << PXWCR_WIN_BAR_MAP_OFFS)
+
+#define	PXWCR_TARGET_OFFS				4  /*Unit ID */
+#define	PXWCR_TARGET_MASK				(0xf << PXWCR_TARGET_OFFS)
+
+#define	PXWCR_ATTRIB_OFFS				8  /* target attributes */
+#define	PXWCR_ATTRIB_MASK				(0xff << PXWCR_ATTRIB_OFFS)
+
+#define	PXWCR_SIZE_OFFS					16 /* size */
+#define	PXWCR_SIZE_MASK					(0xffff << PXWCR_SIZE_OFFS)
+#define	PXWCR_SIZE_ALIGNMENT			0x10000
+
+/* PCI Express Window Base Register */
+/* PEX_WIN_BASE_REG (PXWBR)*/
+
+#define PXWBR_BASE_OFFS					16 /* address[31:16] */
+#define PXWBR_BASE_MASK					(0xffff << PXWBR_BASE_OFFS)
+#define PXWBR_BASE_ALIGNMENT			0x10000
+
+/* PCI Express Window Remap Register */
+/* PEX_WIN_REMAP_REG (PXWRR)*/
+
+#define PXWRR_REMAP_EN					BIT0
+#define PXWRR_REMAP_OFFS				16
+#define PXWRR_REMAP_MASK				(0xffff << PXWRR_REMAP_OFFS)
+#define PXWRR_REMAP_ALIGNMENT			0x10000
+
+/* PCI Express Window Remap (High) Register */
+/* PEX_WIN_REMAP_HIGH_REG (PXWRHR)*/
+
+#define PXWRHR_REMAP_HIGH_OFFS			0
+#define PXWRHR_REMAP_HIGH_MASK			(0xffffffff << PXWRHR_REMAP_HIGH_OFFS)
+
+/* PCI Express Default Window Control Register */
+/* PEX_WIN_DEFAULT_CTRL_REG (PXWDCR) */
+
+#define	PXWDCR_TARGET_OFFS				4  /*Unit ID */
+#define	PXWDCR_TARGET_MASK				(0xf << PXWDCR_TARGET_OFFS)
+#define	PXWDCR_ATTRIB_OFFS				8  /* target attributes */
+#define	PXWDCR_ATTRIB_MASK				(0xff << PXWDCR_ATTRIB_OFFS)
+
+/* PCI Express Expansion ROM Window Control Register */
+/* PEX_WIN_EXP_ROM_CTRL_REG (PXWERCR)*/
+
+#define	PXWERCR_TARGET_OFFS				4  /*Unit ID */
+#define	PXWERCR_TARGET_MASK				(0xf << PXWERCR_TARGET_OFFS)
+#define	PXWERCR_ATTRIB_OFFS				8  /* target attributes */
+#define	PXWERCR_ATTRIB_MASK				(0xff << PXWERCR_ATTRIB_OFFS)
+
+/* PCI Express Expansion ROM Window Remap Register */
+/* PEX_WIN_EXP_ROM_REMAP_REG (PXWERRR)*/
+
+#define PXWERRR_REMAP_EN				BIT0
+#define PXWERRR_REMAP_OFFS				16
+#define PXWERRR_REMAP_MASK				(0xffff << PXWERRR_REMAP_OFFS)
+#define PXWERRR_REMAP_ALIGNMENT			0x10000
+
+
+
+/*PEX_MEMORY_BAR_BASE_ADDR(barNum) (PXMBBA)*/ 
+/* PCI Express BAR0 Internal Register*/
+/*PEX BAR0_INTER_REG (PXBIR)*/
+
+#define PXBIR_IOSPACE			BIT0	/* Memory Space Indicator */
+
+#define PXBIR_TYPE_OFFS			1	   /* BAR Type/Init Val. */ 
+#define PXBIR_TYPE_MASK			(0x3 << PXBIR_TYPE_OFFS)
+#define PXBIR_TYPE_32BIT_ADDR	(0x0 << PXBIR_TYPE_OFFS)
+#define PXBIR_TYPE_64BIT_ADDR	(0x2 << PXBIR_TYPE_OFFS)
+
+#define PXBIR_PREFETCH_EN		BIT3 	/* Prefetch Enable */
+
+#define PXBIR_BASE_OFFS		20		/* Base address. Address bits [31:20] */
+#define PXBIR_BASE_MASK		(0xfff << PXBIR_BASE_OFFS)
+#define PXBIR_BASE_ALIGNMET	(1 << PXBIR_BASE_OFFS)
+
+
+/* PCI Express BAR0 Internal (High) Register*/
+/*PEX BAR0_INTER_REG_HIGH (PXBIRH)*/      
+
+#define PXBIRH_BASE_OFFS			0		/* Base address. Bits [63:32] */
+#define PXBIRH_BASE_MASK			(0xffffffff << PBBHR_BASE_OFFS)
+
+
+#define PEX_BAR_DEFAULT_ATTRIB		0xc /* Memory - Prefetch - 64 bit address */
+#define PEX_BAR0_DEFAULT_ATTRIB	    PEX_BAR_DEFAULT_ATTRIB  
+#define PEX_BAR1_DEFAULT_ATTRIB		PEX_BAR_DEFAULT_ATTRIB
+#define PEX_BAR2_DEFAULT_ATTRIB		PEX_BAR_DEFAULT_ATTRIB
+
+
+/* PCI Express BAR1 Register */
+/*  PCI Express BAR2 Register*/
+/*PEX BAR1_REG (PXBR)*/
+/*PEX BAR2_REG (PXBR)*/
+
+#define PXBR_IOSPACE			BIT0	/* Memory Space Indicator */
+
+#define PXBR_TYPE_OFFS			1	   /* BAR Type/Init Val. */ 
+#define PXBR_TYPE_MASK			(0x3 << PXBR_TYPE_OFFS)
+#define PXBR_TYPE_32BIT_ADDR	(0x0 << PXBR_TYPE_OFFS)
+#define PXBR_TYPE_64BIT_ADDR	(0x2 << PXBR_TYPE_OFFS)
+
+#define PXBR_PREFETCH_EN		BIT3 	/* Prefetch Enable */
+
+#define PXBR_BASE_OFFS		16		/* Base address. Address bits [31:16] */
+#define PXBR_BASE_MASK		(0xffff << PXBR_BASE_OFFS)
+#define PXBR_BASE_ALIGNMET	(1 << PXBR_BASE_OFFS)
+
+
+/* PCI Express BAR1 (High) Register*/
+/* PCI Express BAR2 (High) Register*/
+/*PEX BAR1_REG_HIGH (PXBRH)*/
+/*PEX BAR2_REG_HIGH (PXBRH)*/
+
+#define PXBRH_BASE_OFFS			0		/* Base address. Address bits [63:32] */
+#define PXBRH_BASE_MASK			(0xffffffff << PXBRH_BASE_OFFS)
+
+/* PCI Express Expansion ROM BAR Register*/
+/*PEX_EXPANSION_ROM_BASE_ADDR_REG (PXERBAR)*/
+
+#define PXERBAR_EXPROMEN		BIT0	/* Expansion ROM Enable */
+
+#define PXERBAR_BASE_512K_OFFS		19		/* Expansion ROM Base Address */
+#define PXERBAR_BASE_512K_MASK		(0x1fff << PXERBAR_BASE_512K_OFFS) 	
+
+#define PXERBAR_BASE_1MB_OFFS		20		/* Expansion ROM Base Address */
+#define PXERBAR_BASE_1MB_MASK		(0xfff << PXERBAR_BASE_1MB_OFFS) 	
+
+#define PXERBAR_BASE_2MB_OFFS		21		/* Expansion ROM Base Address */
+#define PXERBAR_BASE_2MB_MASK		(0x7ff << PXERBAR_BASE_2MB_OFFS) 	
+
+#define PXERBAR_BASE_4MB_OFFS		22		/* Expansion ROM Base Address */
+#define PXERBAR_BASE_4MB_MASK		(0x3ff << PXERBAR_BASE_4MB_OFFS) 	
+
+/* PEX Bar attributes */
+typedef struct _mvPexBar
+{
+	MV_ADDR_WIN   addrWin;    /* An address window*/
+	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+
+}MV_PEX_BAR;
+
+/* PEX Remap Window attributes */
+typedef struct _mvPexRemapWin
+{
+	MV_ADDR_WIN   addrWin;    /* An address window*/
+	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+
+}MV_PEX_REMAP_WIN;
+
+/* PEX Remap Window attributes */
+typedef struct _mvPexDecWin
+{
+	MV_TARGET	  target;
+	MV_ADDR_WIN   addrWin;    /* An address window*/
+	MV_U32		  targetBar;
+	MV_U8			attrib;			/* chip select attributes */
+	MV_TARGET_ID 	targetId; 		/* Target Id of this MV_TARGET */
+	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+
+}MV_PEX_DEC_WIN;
+
+/* Global Functions prototypes */
+/* mvPexHalInit - Initialize PEX interfaces*/
+MV_STATUS mvPexInit(MV_U32 pexIf, MV_PEX_TYPE pexType);
+
+
+/* mvPexTargetWinSet - Set PEX to peripheral target address window BAR*/
+MV_STATUS mvPexTargetWinSet(MV_U32 pexIf, MV_U32 winNum, 
+                            MV_PEX_DEC_WIN *pAddrDecWin);
+
+/* mvPexTargetWinGet - Get PEX to peripheral target address window*/
+MV_STATUS mvPexTargetWinGet(MV_U32 pexIf, MV_U32 winNum, 
+                            MV_PEX_DEC_WIN *pAddrDecWin);
+
+/* mvPexTargetWinEnable - Enable/disable a PEX BAR window*/
+MV_STATUS mvPexTargetWinEnable(MV_U32 pexIf,MV_U32 winNum, MV_BOOL enable);
+
+/* mvPexTargetWinRemap - Set PEX to target address window remap.*/
+MV_STATUS mvPexTargetWinRemap(MV_U32 pexIf, MV_U32 winNum, 
+                           MV_PEX_REMAP_WIN *pAddrWin);
+
+/* mvPexTargetWinRemapEnable -enable\disable a PEX Window remap.*/
+MV_STATUS mvPexTargetWinRemapEnable(MV_U32 pexIf, MV_U32 winNum, 
+                           MV_BOOL enable);
+
+/* mvPexBarSet - Set PEX bar address and size */
+MV_STATUS mvPexBarSet(MV_U32 pexIf, MV_U32 barNum, MV_PEX_BAR *addrWin);
+
+/* mvPexBarGet - Get PEX bar address and size */
+MV_STATUS mvPexBarGet(MV_U32 pexIf, MV_U32 barNum, MV_PEX_BAR *addrWin);
+
+/* mvPexBarEnable - enable\disable a PEX bar*/
+MV_STATUS mvPexBarEnable(MV_U32 pexIf, MV_U32 barNum, MV_BOOL enable);
+
+/* mvPexAddrDecShow - Display address decode windows attributes */
+MV_VOID mvPexAddrDecShow(MV_VOID);
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c
new file mode 100644
index 00000000..f100a12d
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c
@@ -0,0 +1,430 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#include "mvTypes.h"
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "cpu/mvCpu.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "sata/CoreDriver/mvRegs.h"
+#include "ctrlEnv/sys/mvSysSata.h"
+
+MV_TARGET sataAddrDecPrioTab[] =
+{
+#if defined(MV_INCLUDE_SDRAM_CS0)
+    SDRAM_CS0,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS1)
+    SDRAM_CS1,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS2)
+    SDRAM_CS2,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS3)
+    SDRAM_CS3,
+#endif
+#if defined(MV_INCLUDE_PEX)
+	PEX0_MEM,
+#endif
+	TBL_TERM
+};
+
+
+/*******************************************************************************
+* sataWinOverlapDetect - Detect SATA address windows overlapping
+*
+* DESCRIPTION:
+*       An unpredicted behaviur is expected in case SATA address decode 
+*       windows overlapps.
+*       This function detects SATA address decode windows overlapping of a 
+*       specified window. The function does not check the window itself for 
+*       overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
+*       from registers.
+*
+*******************************************************************************/
+static MV_STATUS sataWinOverlapDetect(int dev, MV_U32 winNum, 
+				      MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32          winNumIndex;
+    MV_SATA_DEC_WIN  addrDecWin;
+
+    for(winNumIndex=0; winNumIndex<MV_SATA_MAX_ADDR_DECODE_WIN; winNumIndex++)
+    {
+        /* Do not check window itself       */
+        if (winNumIndex == winNum)
+        {
+            continue;
+        }
+
+        /* Get window parameters    */
+        if (MV_OK != mvSataWinGet(dev, winNumIndex, &addrDecWin))
+        {
+            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
+            return MV_ERROR;
+        }
+
+        /* Do not check disabled windows    */
+        if(addrDecWin.enable == MV_FALSE)
+        {
+            continue;
+        }
+
+        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+        {
+            return MV_TRUE;
+        }        
+    }
+    return MV_FALSE;
+}
+
+
+/*******************************************************************************
+* mvSataWinSet - Set SATA target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
+*       address window, also known as address decode window. 
+*       After setting this target window, the SATA will be able to access the 
+*       target within the address window. 
+*
+* INPUT:
+*       winNum      - SATA target address decode window number.
+*       pAddrDecWin - SATA target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if address window overlapps with other address decode windows.
+*       MV_BAD_PARAM if base address is invalid parameter or target is 
+*       unknown.
+*
+*******************************************************************************/
+MV_STATUS mvSataWinSet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin)
+{
+    MV_TARGET_ATTRIB    targetAttribs;
+    MV_DEC_REGS         decRegs;
+
+    /* Parameter checking   */
+    if (winNum >= MV_SATA_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
+        return MV_BAD_PARAM;
+    }
+    
+    /* Check if the requested window overlapps with current windows         */
+    if (MV_TRUE == sataWinOverlapDetect(dev, winNum, &pAddrDecWin->addrWin))
+    {
+        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
+        return MV_ERROR;
+    }
+
+    /* check if address is aligned to the size */
+    if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+    {
+	mvOsPrintf("mvSataWinSet:Error setting SATA window %d to "\
+		   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+		   winNum,
+		   mvCtrlTargetNameGet(pAddrDecWin->target), 
+		   pAddrDecWin->addrWin.baseLow,
+		   pAddrDecWin->addrWin.size);
+	return MV_ERROR;
+    }
+
+    decRegs.baseReg = 0;
+    decRegs.sizeReg = 0;
+
+    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+    {
+        mvOsPrintf("%s: mvCtrlAddrDecToReg Failed\n", __FUNCTION__);
+        return MV_ERROR;
+    }
+
+    mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
+                                                                                                                         
+    /* set attributes */
+    decRegs.sizeReg &= ~MV_SATA_WIN_ATTR_MASK;
+    decRegs.sizeReg |= (targetAttribs.attrib << MV_SATA_WIN_ATTR_OFFSET);
+
+    /* set target ID */
+    decRegs.sizeReg &= ~MV_SATA_WIN_TARGET_MASK;
+    decRegs.sizeReg |= (targetAttribs.targetId << MV_SATA_WIN_TARGET_OFFSET);
+
+    if (pAddrDecWin->enable == MV_TRUE)
+    {
+        decRegs.sizeReg |= MV_SATA_WIN_ENABLE_MASK;
+    }
+    else
+    {
+        decRegs.sizeReg &= ~MV_SATA_WIN_ENABLE_MASK;
+    }
+
+    MV_REG_WRITE( MV_SATA_WIN_CTRL_REG(dev, winNum), decRegs.sizeReg);
+    MV_REG_WRITE( MV_SATA_WIN_BASE_REG(dev, winNum), decRegs.baseReg);
+    
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvSataWinGet - Get SATA peripheral target address window.
+*
+* DESCRIPTION:
+*       Get SATA peripheral target address window.
+*
+* INPUT:
+*       winNum - SATA target address decode window number.
+*
+* OUTPUT:
+*       pAddrDecWin - SATA target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvSataWinGet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin)
+{
+    MV_DEC_REGS         decRegs;
+    MV_TARGET_ATTRIB    targetAttrib;
+                                                                                                                         
+    /* Parameter checking   */
+    if (winNum >= MV_SATA_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s (dev=%d): ERR. Invalid winNum %d\n", 
+                    __FUNCTION__, dev, winNum);
+        return MV_NOT_SUPPORTED;
+    }
+
+    decRegs.baseReg = MV_REG_READ( MV_SATA_WIN_BASE_REG(dev, winNum) );
+    decRegs.sizeReg = MV_REG_READ( MV_SATA_WIN_CTRL_REG(dev, winNum) );
+ 
+    if (MV_OK != mvCtrlRegToAddrDec(&decRegs, &pAddrDecWin->addrWin) )
+    {
+        mvOsPrintf("%s: mvCtrlRegToAddrDec Failed\n", __FUNCTION__);
+        return MV_ERROR; 
+    }
+       
+    /* attrib and targetId */
+    targetAttrib.attrib = (decRegs.sizeReg & MV_SATA_WIN_ATTR_MASK) >> 
+		MV_SATA_WIN_ATTR_OFFSET;
+    targetAttrib.targetId = (decRegs.sizeReg & MV_SATA_WIN_TARGET_MASK) >> 
+		MV_SATA_WIN_TARGET_OFFSET;
+ 
+    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+    /* Check if window is enabled   */
+    if(decRegs.sizeReg & MV_SATA_WIN_ENABLE_MASK) 
+    {
+        pAddrDecWin->enable = MV_TRUE;
+    }
+    else
+    {
+        pAddrDecWin->enable = MV_FALSE;
+    }
+    return MV_OK;
+}
+/*******************************************************************************
+* mvSataAddrDecShow - Print the SATA address decode map.
+*
+* DESCRIPTION:
+*		This function print the SATA address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvSataAddrDecShow(MV_VOID)
+{
+
+	MV_SATA_DEC_WIN win;
+	int i,j;
+
+
+
+    for( j = 0; j < MV_SATA_MAX_CHAN; j++ )
+    {
+	if (MV_FALSE == mvCtrlPwrClckGet(SATA_UNIT_ID, j)) 
+		return;
+
+	mvOsOutput( "\n" );
+	mvOsOutput( "SATA %d:\n", j );
+	mvOsOutput( "----\n" );
+
+	for( i = 0; i < MV_SATA_MAX_ADDR_DECODE_WIN; i++ )
+	{
+            memset( &win, 0, sizeof(MV_SATA_DEC_WIN) );
+
+	    mvOsOutput( "win%d - ", i );
+
+	    if( mvSataWinGet(j, i, &win ) == MV_OK )
+	    {
+	        if( win.enable )
+	        {
+                    mvOsOutput( "%s base %08x, ",
+                    mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
+                    mvOsOutput( "...." );
+
+                    mvSizePrint( win.addrWin.size );
+    
+		    mvOsOutput( "\n" );
+                }
+		else
+		mvOsOutput( "disable\n" );
+	    }
+	}
+    }
+}
+
+
+/*******************************************************************************
+* mvSataWinInit - Initialize the integrated SATA target address window.
+*
+* DESCRIPTION:
+*       Initialize the SATA peripheral target address window.
+*
+* INPUT:
+*
+*
+* OUTPUT:
+*     
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvSataWinInit(MV_VOID)
+{
+    int             winNum;
+    MV_SATA_DEC_WIN  sataWin;
+    MV_CPU_DEC_WIN  cpuAddrDecWin;
+    MV_U32          status, winPrioIndex = 0;
+
+    /* Initiate Sata address decode */
+
+    /* First disable all address decode windows */
+    for(winNum = 0; winNum < MV_SATA_MAX_ADDR_DECODE_WIN; winNum++)
+    {
+        MV_U32  regVal = MV_REG_READ(MV_SATA_WIN_CTRL_REG(0, winNum));
+        regVal &= ~MV_SATA_WIN_ENABLE_MASK;
+        MV_REG_WRITE(MV_SATA_WIN_CTRL_REG(0, winNum), regVal);
+    }
+    
+    winNum = 0;
+    while( (sataAddrDecPrioTab[winPrioIndex] != TBL_TERM) &&
+           (winNum < MV_SATA_MAX_ADDR_DECODE_WIN) )
+    {
+        /* first get attributes from CPU If */
+        status = mvCpuIfTargetWinGet(sataAddrDecPrioTab[winPrioIndex],
+                                     &cpuAddrDecWin);
+
+        if(MV_NO_SUCH == status)
+        {
+            winPrioIndex++;
+            continue;
+        }
+	if (MV_OK != status)
+	{
+            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
+	    return MV_ERROR;
+	}
+
+        if (cpuAddrDecWin.enable == MV_TRUE)
+        {
+            sataWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+            sataWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
+            sataWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
+            sataWin.enable           = MV_TRUE;
+            sataWin.target           = sataAddrDecPrioTab[winPrioIndex];
+            
+            if(MV_OK != mvSataWinSet(0/*dev*/, winNum, &sataWin))
+            {
+                return MV_ERROR;
+            }
+            winNum++;
+        }
+        winPrioIndex++;
+    }
+    return MV_OK;
+}
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h
new file mode 100644
index 00000000..325fb8d0
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h
@@ -0,0 +1,128 @@
+
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#ifndef __INCMVSysSataAddrDech
+#define __INCMVSysSataAddrDech
+
+#include "mvCommon.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _mvSataDecWin
+{
+    MV_TARGET     target;
+    MV_ADDR_WIN   addrWin;    /* An address window*/
+    MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+ 
+} MV_SATA_DEC_WIN;
+
+
+#define MV_SATA_MAX_ADDR_DECODE_WIN 4
+
+#define MV_SATA_WIN_CTRL_REG(dev, win)        (SATA_REG_BASE + 0x30 + ((win)<<4))
+#define MV_SATA_WIN_BASE_REG(dev, win)        (SATA_REG_BASE + 0x34 + ((win)<<4))
+
+/* BITs in Bridge Interrupt Cause and Mask registers */
+#define MV_SATA_ADDR_DECODE_ERROR_BIT        0
+#define MV_SATA_ADDR_DECODE_ERROR_MASK       (1<<MV_SATA_ADDR_DECODE_ERROR_BIT)
+
+/* BITs in Windows 0-3 Control and Base Registers */
+#define MV_SATA_WIN_ENABLE_BIT               0
+#define MV_SATA_WIN_ENABLE_MASK              (1<<MV_SATA_WIN_ENABLE_BIT)
+
+#define MV_SATA_WIN_TARGET_OFFSET            4
+#define MV_SATA_WIN_TARGET_MASK              (0xF<<MV_SATA_WIN_TARGET_OFFSET)
+
+#define MV_SATA_WIN_ATTR_OFFSET              8
+#define MV_SATA_WIN_ATTR_MASK                (0xFF<<MV_SATA_WIN_ATTR_OFFSET)
+
+#define MV_SATA_WIN_SIZE_OFFSET              16
+#define MV_SATA_WIN_SIZE_MASK                (0xFFFF<<MV_SATA_WIN_SIZE_OFFSET)
+
+#define MV_SATA_WIN_BASE_OFFSET              16
+#define MV_SATA_WIN_BASE_MASK                (0xFFFF<<MV_SATA_WIN_BASE_OFFSET)
+
+MV_STATUS mvSataWinGet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin);
+MV_STATUS mvSataWinSet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin);
+MV_STATUS mvSataWinByTargetGet(MV_TARGET target, MV_SATA_DEC_WIN *pAddrDecWin);
+MV_STATUS mvSataWinInit(MV_VOID);
+MV_VOID   mvSataAddrDecShow(MV_VOID);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
+
+
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c
new file mode 100644
index 00000000..6d2a9192
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c
@@ -0,0 +1,427 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#include "mvTypes.h"
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "cpu/mvCpu.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "mvRegs.h"
+#include "ctrlEnv/sys/mvSysSdmmc.h"
+
+MV_TARGET sdmmcAddrDecPrioTab[] =
+{
+#if defined(MV_INCLUDE_SDRAM_CS0)
+    SDRAM_CS0,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS1)
+    SDRAM_CS1,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS2)
+    SDRAM_CS2,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS3)
+    SDRAM_CS3,
+#endif
+#if defined(MV_INCLUDE_PEX)
+	PEX0_MEM,
+#endif
+	TBL_TERM
+};
+
+
+/*******************************************************************************
+* sdmmcWinOverlapDetect - Detect SDMMC address windows overlapping
+*
+* DESCRIPTION:
+*       An unpredicted behaviur is expected in case SDMMC address decode 
+*       windows overlapps.
+*       This function detects SDMMC address decode windows overlapping of a 
+*       specified window. The function does not check the window itself for 
+*       overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
+*       from registers.
+*
+*******************************************************************************/
+static MV_STATUS sdmmcWinOverlapDetect(int dev, MV_U32 winNum, 
+				      MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32          winNumIndex;
+    MV_SDMMC_DEC_WIN  addrDecWin;
+
+    for(winNumIndex=0; winNumIndex<MV_SDMMC_MAX_ADDR_DECODE_WIN; winNumIndex++)
+    {
+        /* Do not check window itself       */
+        if (winNumIndex == winNum)
+        {
+            continue;
+        }
+
+        /* Get window parameters    */
+        if (MV_OK != mvSdmmcWinGet(dev, winNumIndex, &addrDecWin))
+        {
+            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
+            return MV_ERROR;
+        }
+
+        /* Do not check disabled windows    */
+        if(addrDecWin.enable == MV_FALSE)
+        {
+            continue;
+        }
+
+        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+        {
+            return MV_TRUE;
+        }        
+    }
+    return MV_FALSE;
+}
+
+
+/*******************************************************************************
+* mvSdmmcWinSet - Set SDMMC target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
+*       address window, also known as address decode window. 
+*       After setting this target window, the SDMMC will be able to access the 
+*       target within the address window. 
+*
+* INPUT:
+*       winNum      - SDMMC target address decode window number.
+*       pAddrDecWin - SDMMC target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if address window overlapps with other address decode windows.
+*       MV_BAD_PARAM if base address is invalid parameter or target is 
+*       unknown.
+*
+*******************************************************************************/
+MV_STATUS mvSdmmcWinSet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin)
+{
+    MV_TARGET_ATTRIB    targetAttribs;
+    MV_DEC_REGS         decRegs;
+
+    /* Parameter checking   */
+    if (winNum >= MV_SDMMC_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
+        return MV_BAD_PARAM;
+    }
+    
+    /* Check if the requested window overlapps with current windows         */
+    if (MV_TRUE == sdmmcWinOverlapDetect(dev, winNum, &pAddrDecWin->addrWin))
+    {
+        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
+        return MV_ERROR;
+    }
+
+    /* check if address is aligned to the size */
+    if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+    {
+	mvOsPrintf("mvSdmmcWinSet:Error setting SDMMC window %d to "\
+		   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+		   winNum,
+		   mvCtrlTargetNameGet(pAddrDecWin->target), 
+		   pAddrDecWin->addrWin.baseLow,
+		   pAddrDecWin->addrWin.size);
+	return MV_ERROR;
+    }
+
+    decRegs.baseReg = 0;
+    decRegs.sizeReg = 0;
+
+    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+    {
+        mvOsPrintf("%s: mvCtrlAddrDecToReg Failed\n", __FUNCTION__);
+        return MV_ERROR;
+    }
+
+    mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
+                                                                                                                         
+    /* set attributes */
+    decRegs.sizeReg &= ~MV_SDMMC_WIN_ATTR_MASK;
+    decRegs.sizeReg |= (targetAttribs.attrib << MV_SDMMC_WIN_ATTR_OFFSET);
+
+    /* set target ID */
+    decRegs.sizeReg &= ~MV_SDMMC_WIN_TARGET_MASK;
+    decRegs.sizeReg |= (targetAttribs.targetId << MV_SDMMC_WIN_TARGET_OFFSET);
+
+    if (pAddrDecWin->enable == MV_TRUE)
+    {
+        decRegs.sizeReg |= MV_SDMMC_WIN_ENABLE_MASK;
+    }
+    else
+    {
+        decRegs.sizeReg &= ~MV_SDMMC_WIN_ENABLE_MASK;
+    }
+
+    MV_REG_WRITE( MV_SDMMC_WIN_CTRL_REG(dev, winNum), decRegs.sizeReg);
+    MV_REG_WRITE( MV_SDMMC_WIN_BASE_REG(dev, winNum), decRegs.baseReg);
+    
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvSdmmcWinGet - Get SDMMC peripheral target address window.
+*
+* DESCRIPTION:
+*       Get SDMMC peripheral target address window.
+*
+* INPUT:
+*       winNum - SDMMC target address decode window number.
+*d
+* OUTPUT:
+*       pAddrDecWin - SDMMC target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvSdmmcWinGet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin)
+{
+    MV_DEC_REGS         decRegs;
+    MV_TARGET_ATTRIB    targetAttrib;
+                                                                                                                         
+    /* Parameter checking   */
+    if (winNum >= MV_SDMMC_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s (dev=%d): ERR. Invalid winNum %d\n", 
+                    __FUNCTION__, dev, winNum);
+        return MV_NOT_SUPPORTED;
+    }
+
+    decRegs.baseReg = MV_REG_READ( MV_SDMMC_WIN_BASE_REG(dev, winNum) );
+    decRegs.sizeReg = MV_REG_READ( MV_SDMMC_WIN_CTRL_REG(dev, winNum) );
+ 
+    if (MV_OK != mvCtrlRegToAddrDec(&decRegs, &pAddrDecWin->addrWin) )
+    {
+        mvOsPrintf("%s: mvCtrlRegToAddrDec Failed\n", __FUNCTION__);
+        return MV_ERROR; 
+    }
+       
+    /* attrib and targetId */
+    targetAttrib.attrib = (decRegs.sizeReg & MV_SDMMC_WIN_ATTR_MASK) >> 
+		MV_SDMMC_WIN_ATTR_OFFSET;
+    targetAttrib.targetId = (decRegs.sizeReg & MV_SDMMC_WIN_TARGET_MASK) >> 
+		MV_SDMMC_WIN_TARGET_OFFSET;
+ 
+    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+    /* Check if window is enabled   */
+    if(decRegs.sizeReg & MV_SDMMC_WIN_ENABLE_MASK) 
+    {
+        pAddrDecWin->enable = MV_TRUE;
+    }
+    else
+    {
+        pAddrDecWin->enable = MV_FALSE;
+    }
+    return MV_OK;
+}
+/*******************************************************************************
+* mvSdmmcAddrDecShow - Print the SDMMC address decode map.
+*
+* DESCRIPTION:
+*		This function print the SDMMC address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvSdmmcAddrDecShow(MV_VOID)
+{
+
+	MV_SDMMC_DEC_WIN win;
+	int i,j=0;
+
+
+
+	if (MV_FALSE == mvCtrlPwrClckGet(SDIO_UNIT_ID, 0)) 
+		return;
+
+	mvOsOutput( "\n" );
+	mvOsOutput( "SDMMC %d:\n", j );
+	mvOsOutput( "----\n" );
+
+	for( i = 0; i < MV_SDMMC_MAX_ADDR_DECODE_WIN; i++ )
+	{
+            memset( &win, 0, sizeof(MV_SDMMC_DEC_WIN) );
+
+	    mvOsOutput( "win%d - ", i );
+
+	    if( mvSdmmcWinGet(j, i, &win ) == MV_OK )
+	    {
+	        if( win.enable )
+	        {
+                    mvOsOutput( "%s base %08x, ",
+                    mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
+                    mvOsOutput( "...." );
+
+                    mvSizePrint( win.addrWin.size );
+    
+		    mvOsOutput( "\n" );
+                }
+		else
+		mvOsOutput( "disable\n" );
+	    }
+	}
+}
+
+
+/*******************************************************************************
+* mvSdmmcWinInit - Initialize the integrated SDMMC target address window.
+*
+* DESCRIPTION:
+*       Initialize the SDMMC peripheral target address window.
+*
+* INPUT:
+*
+*
+* OUTPUT:
+*     
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvSdmmcWinInit(MV_VOID)
+{
+    int             winNum;
+    MV_SDMMC_DEC_WIN  sdmmcWin;
+    MV_CPU_DEC_WIN  cpuAddrDecWin;
+    MV_U32          status, winPrioIndex = 0;
+
+    /* Initiate Sdmmc address decode */
+
+    /* First disable all address decode windows */
+    for(winNum = 0; winNum < MV_SDMMC_MAX_ADDR_DECODE_WIN; winNum++)
+    {
+        MV_U32  regVal = MV_REG_READ(MV_SDMMC_WIN_CTRL_REG(0, winNum));
+        regVal &= ~MV_SDMMC_WIN_ENABLE_MASK;
+        MV_REG_WRITE(MV_SDMMC_WIN_CTRL_REG(0, winNum), regVal);
+    }
+    
+    winNum = 0;
+    while( (sdmmcAddrDecPrioTab[winPrioIndex] != TBL_TERM) &&
+           (winNum < MV_SDMMC_MAX_ADDR_DECODE_WIN) )
+    {
+        /* first get attributes from CPU If */
+        status = mvCpuIfTargetWinGet(sdmmcAddrDecPrioTab[winPrioIndex],
+                                     &cpuAddrDecWin);
+
+        if(MV_NO_SUCH == status)
+        {
+            winPrioIndex++;
+            continue;
+        }
+	if (MV_OK != status)
+	{
+            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
+	    return MV_ERROR;
+	}
+
+        if (cpuAddrDecWin.enable == MV_TRUE)
+        {
+            sdmmcWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+            sdmmcWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
+            sdmmcWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
+            sdmmcWin.enable           = MV_TRUE;
+            sdmmcWin.target           = sdmmcAddrDecPrioTab[winPrioIndex];
+            
+            if(MV_OK != mvSdmmcWinSet(0/*dev*/, winNum, &sdmmcWin))
+            {
+                return MV_ERROR;
+            }
+            winNum++;
+        }
+        winPrioIndex++;
+    }
+    return MV_OK;
+}
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h
new file mode 100644
index 00000000..4c50a2b6
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h
@@ -0,0 +1,125 @@
+
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#ifndef __INCMVSysSdmmcAddrDech
+#define __INCMVSysSdmmcAddrDech
+
+#include "mvCommon.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _mvSdmmcDecWin
+{
+    MV_TARGET     target;
+    MV_ADDR_WIN   addrWin;    /* An address window*/
+    MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+ 
+} MV_SDMMC_DEC_WIN;
+
+
+#define MV_SDMMC_MAX_ADDR_DECODE_WIN 4
+
+#define MV_SDMMC_WIN_CTRL_REG(dev, win)        (MV_SDIO_REG_BASE + 0x108 + ((win)<<3))
+#define MV_SDMMC_WIN_BASE_REG(dev, win)        (MV_SDIO_REG_BASE + 0x10c + ((win)<<3))
+
+
+/* BITs in Windows 0-3 Control and Base Registers */
+#define MV_SDMMC_WIN_ENABLE_BIT               0
+#define MV_SDMMC_WIN_ENABLE_MASK              (1<<MV_SDMMC_WIN_ENABLE_BIT)
+
+#define MV_SDMMC_WIN_TARGET_OFFSET            4
+#define MV_SDMMC_WIN_TARGET_MASK              (0xF<<MV_SDMMC_WIN_TARGET_OFFSET)
+
+#define MV_SDMMC_WIN_ATTR_OFFSET              8
+#define MV_SDMMC_WIN_ATTR_MASK                (0xFF<<MV_SDMMC_WIN_ATTR_OFFSET)
+
+#define MV_SDMMC_WIN_SIZE_OFFSET              16
+#define MV_SDMMC_WIN_SIZE_MASK                (0xFFFF<<MV_SDMMC_WIN_SIZE_OFFSET)
+
+#define MV_SDMMC_WIN_BASE_OFFSET              16
+#define MV_SDMMC_WIN_BASE_MASK                (0xFFFF<<MV_SDMMC_WIN_BASE_OFFSET)
+
+MV_STATUS mvSdmmcWinGet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin);
+MV_STATUS mvSdmmcWinSet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin);
+MV_STATUS mvSdmmcWinByTargetGet(MV_TARGET target, MV_SDMMC_DEC_WIN *pAddrDecWin);
+MV_STATUS mvSdmmcWinInit(MV_VOID);
+MV_VOID   mvSdmmcAddrDecShow(MV_VOID);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
+
+
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c
new file mode 100644
index 00000000..ecf6944b
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c
@@ -0,0 +1,462 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvSysTdm.h"
+
+
+/* defines  */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif	
+
+static MV_TARGET tdmAddrDecPrioTap[] =
+{
+        PEX0_MEM,
+        SDRAM_CS0,
+        SDRAM_CS1,
+        SDRAM_CS2,
+        SDRAM_CS3,
+        DEVICE_CS0,
+        DEVICE_CS1,
+        DEVICE_CS2,
+        DEV_BOOCS,
+        PEX0_IO,
+        TBL_TERM
+};

+
+static MV_STATUS tdmWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
+
+/*******************************************************************************
+* mvTdmWinInit - Initialize TDM address decode windows 
+*
+* DESCRIPTION:
+*               This function initialize TDM window decode unit. It set the 
+*               default address decode
+*               windows of the unit.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if setting fail.
+*******************************************************************************/
+
+MV_STATUS mvTdmWinInit(void)
+{
+	MV_U32 		winNum;
+	MV_U32		winPrioIndex = 0;
+	MV_CPU_DEC_WIN cpuAddrDecWin;
+	MV_TDM_DEC_WIN tdmWin;
+	MV_STATUS status;
+
+	/*Disable all windows*/	
+	for (winNum = 0; winNum < TDM_MBUS_MAX_WIN; winNum++)
+	{
+		mvTdmWinEnable(winNum, MV_FALSE);
+	}
+
+	for (winNum = 0; ((tdmAddrDecPrioTap[winPrioIndex] != TBL_TERM) && 
+					  (winNum < TDM_MBUS_MAX_WIN)); )
+	{	
+		status = mvCpuIfTargetWinGet(tdmAddrDecPrioTap[winPrioIndex], 
+									 &cpuAddrDecWin);
+        if (MV_NO_SUCH == status)
+        {
+            winPrioIndex++;
+            continue;
+        }
+		if (MV_OK != status)
+		{
+			mvOsPrintf("mvTdmInit: ERR. mvCpuIfTargetWinGet failed\n");
+			return MV_ERROR;
+		}
+
+        if (cpuAddrDecWin.enable == MV_TRUE)
+		{
+			tdmWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+			tdmWin.addrWin.baseLow = cpuAddrDecWin.addrWin.baseLow;
+			tdmWin.addrWin.size = cpuAddrDecWin.addrWin.size;
+			tdmWin.enable = MV_TRUE;
+		    tdmWin.target = tdmAddrDecPrioTap[winPrioIndex];
+		    if (MV_OK != mvTdmWinSet(winNum, &tdmWin))
+		    {
+			    return MV_ERROR;
+		    }
+		    winNum++;
+		}
+		winPrioIndex++;			
+    }
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvTdmWinSet - Set TDM target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
+*       address window, also known as address decode window.
+*       After setting this target window, the TDM will be able to access the
+*       target within the address window.
+*
+* INPUT:
+*       winNum      - TDM to target address decode window number.
+*       pAddrDecWin - TDM target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if address window overlapps with other address decode windows.
+*       MV_BAD_PARAM if base address is invalid parameter or target is
+*       unknown.
+*
+*******************************************************************************/
+
+MV_STATUS mvTdmWinSet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin)
+{
+	MV_TARGET_ATTRIB targetAttribs;
+	MV_DEC_REGS decRegs;
+	MV_U32 ctrlReg = 0;
+
+    /* Parameter checking   */
+    if (winNum >= TDM_MBUS_MAX_WIN)
+    {
+		mvOsPrintf("mvTdmWinSet: ERR. Invalid win num %d\n",winNum);
+        return MV_BAD_PARAM;
+    }
+    
+    /* Check if the requested window overlapps with current windows         */
+    if (MV_TRUE == tdmWinOverlapDetect(winNum, &pAddrDecWin->addrWin))
+   	{
+       	mvOsPrintf("mvTdmWinSet: ERR. Window %d overlap\n", winNum);
+		return MV_ERROR;
+	}
+
+	/* check if address is aligned to the size */
+	if (MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+	{
+		mvOsPrintf("mvTdmWinSet: Error setting TDM window %d to "\
+				   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+				   winNum,
+				   mvCtrlTargetNameGet(pAddrDecWin->target), 
+				   pAddrDecWin->addrWin.baseLow,
+				   pAddrDecWin->addrWin.size);
+		return MV_ERROR;
+	}
+
+	decRegs.baseReg = MV_REG_READ(TDM_WIN_BASE_REG(winNum));
+	decRegs.sizeReg = (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_SIZE_MASK) >>  TDM_WIN_SIZE_OFFS;
+
+	if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+	{
+			mvOsPrintf("mvTdmWinSet: mvCtrlAddrDecToReg Failed\n");
+			return MV_ERROR;
+	}
+	
+	mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
+	
+	/* for the safe side we disable the window before writing the new
+	values */
+	mvTdmWinEnable(winNum, MV_FALSE);
+
+	ctrlReg |= (targetAttribs.attrib << TDM_WIN_ATTRIB_OFFS);
+	ctrlReg |= (targetAttribs.targetId << TDM_WIN_TARGET_OFFS);
+	ctrlReg |= (decRegs.sizeReg & TDM_WIN_SIZE_MASK);
+
+	/* Write to address base and control registers  */
+	MV_REG_WRITE(TDM_WIN_BASE_REG(winNum), decRegs.baseReg);
+	MV_REG_WRITE(TDM_WIN_CTRL_REG(winNum), ctrlReg);  
+	/* Enable address decode target window  */
+	if (pAddrDecWin->enable == MV_TRUE)
+	{
+		mvTdmWinEnable(winNum, MV_TRUE);
+	}    
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvTdmWinGet - Get peripheral target address window.
+*
+* DESCRIPTION:
+*               Get TDM peripheral target address window.
+*
+* INPUT:
+*       winNum - TDM to target address decode window number.
+*
+* OUTPUT:
+*       pAddrDecWin - TDM target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+
+MV_STATUS mvTdmWinGet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin)
+{
+
+	MV_DEC_REGS decRegs;
+	MV_TARGET_ATTRIB targetAttrib;
+
+	/* Parameter checking   */
+	if (winNum >= TDM_MBUS_MAX_WIN)
+	{
+		mvOsPrintf("mvTdmWinGet: ERR. Invalid winNum %d\n", winNum);
+		return MV_NOT_SUPPORTED;
+	}
+	
+	decRegs.baseReg =  MV_REG_READ(TDM_WIN_BASE_REG(winNum));                                                                           
+	decRegs.sizeReg = (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_SIZE_MASK) >>  TDM_WIN_SIZE_OFFS;
+ 
+	if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
+	{
+		mvOsPrintf("mvTdmWinGet: mvCtrlRegToAddrDec Failed \n");
+		return MV_ERROR;
+	}
+	 
+	/* attrib and targetId */
+	targetAttrib.attrib = 
+		(MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_ATTRIB_MASK) >>  TDM_WIN_ATTRIB_OFFS;
+	targetAttrib.targetId = 
+		(MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_TARGET_MASK) >>  TDM_WIN_TARGET_OFFS;
+	 
+	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+	/* Check if window is enabled   */
+	if (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_ENABLE_MASK)
+	{
+		pAddrDecWin->enable = MV_TRUE;
+	}
+	else
+	{
+		pAddrDecWin->enable = MV_FALSE;
+	}
+	
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvTdmWinEnable - Enable/disable a TDM to target address window
+*
+* DESCRIPTION:
+*       This function enable/disable a TDM to target address window.
+*       According to parameter 'enable' the routine will enable the
+*       window, thus enabling TDM accesses (before enabling the window it is
+*       tested for overlapping). Otherwise, the window will be disabled.
+*
+* INPUT:
+*       winNum - TDM to target address decode window number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_ERROR if decode window number was wrong or enabled window overlapps.
+*
+*******************************************************************************/
+MV_STATUS mvTdmWinEnable(int winNum, MV_BOOL enable)
+{
+	MV_TDM_DEC_WIN addrDecWin;
+
+	if (MV_TRUE == enable)
+	{
+		if (winNum >= TDM_MBUS_MAX_WIN)
+		{
+			mvOsPrintf("mvTdmWinEnable:ERR. Invalid winNum%d\n",winNum);
+			return MV_ERROR;
+		}	
+		
+		/* First check for overlap with other enabled windows				*/
+		/* Get current window */
+		if (MV_OK != mvTdmWinGet(winNum, &addrDecWin))
+		{
+			mvOsPrintf("mvTdmWinEnable:ERR. targetWinGet fail\n");
+			return MV_ERROR;
+		}
+		/* Check for overlapping */
+		if (MV_FALSE == tdmWinOverlapDetect(winNum, &(addrDecWin.addrWin)))
+		{
+			/* No Overlap. Enable address decode target window */
+			MV_REG_BIT_SET(TDM_WIN_CTRL_REG(winNum), TDM_WIN_ENABLE_MASK);
+		}
+		else
+		{   /* Overlap detected	*/
+			mvOsPrintf("mvTdmWinEnable:ERR. Overlap detected\n");
+			return MV_ERROR;
+		}
+	}
+	else
+	{
+		MV_REG_BIT_RESET(TDM_WIN_CTRL_REG(winNum), TDM_WIN_ENABLE_MASK);	
+	}
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* tdmWinOverlapDetect - Detect TDM address windows overlapping
+*
+* DESCRIPTION:
+*       An unpredicted behaviour is expected in case TDM address decode 
+*       windows overlapps.
+*       This function detects TDM address decode windows overlapping of a 
+*       specified window. The function does not check the window itself for 
+*       overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
+*       from registers.
+*
+*******************************************************************************/
+static MV_STATUS tdmWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32      	winNumIndex;
+    MV_TDM_DEC_WIN  	addrDecWin;
+
+    for (winNumIndex = 0; winNumIndex < TDM_MBUS_MAX_WIN; winNumIndex++)
+    {
+		/* Do not check window itself		*/
+        if (winNumIndex == winNum)
+		{
+			continue;
+		}
+		/* Do not check disabled windows	*/
+		if (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_ENABLE_MASK)
+		{
+			/* Get window parameters 	*/
+			if (MV_OK != mvTdmWinGet(winNumIndex, &addrDecWin))
+			{
+				DB(mvOsPrintf("dmaWinOverlapDetect: ERR. TargetWinGet failed\n"));
+            		return MV_ERROR;
+			}
+
+			if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+			{
+				return MV_TRUE;
+			}        
+		}
+    }
+	return MV_FALSE;
+}
+
+/*******************************************************************************
+* mvTdmAddrDecShow - Print the TDM address decode map.
+*
+* DESCRIPTION:
+*       This function print the TDM address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvTdmAddrDecShow(MV_VOID)
+{
+	MV_TDM_DEC_WIN win;
+	int i;
+
+	mvOsOutput( "\n" );
+	mvOsOutput( "TDM:\n" );
+	mvOsOutput( "----\n" );
+
+	for( i = 0; i < TDM_MBUS_MAX_WIN; i++ )
+	{
+		memset( &win, 0, sizeof(MV_TDM_DEC_WIN) );
+
+		mvOsOutput( "win%d - ", i );
+
+		if (mvTdmWinGet(i, &win ) == MV_OK )
+		{
+			if( win.enable )
+			{
+                mvOsOutput( "%s base %08x, ",
+                mvCtrlTargetNameGet(win.target), win.addrWin.baseLow);
+                mvOsOutput( "...." );
+                mvSizePrint( win.addrWin.size );
+				mvOsOutput( "\n" );
+			}
+			else
+				mvOsOutput( "disable\n" );
+		}
+	}
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h
new file mode 100644
index 00000000..0d3140f5
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h
@@ -0,0 +1,106 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSysTdmh
+#define __INCmvSysTdmh
+
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+typedef struct _mvTdmDecWin
+{
+        MV_TARGET     target;
+        MV_ADDR_WIN   addrWin; /* An address window*/
+        MV_BOOL       enable;  /* Address decode window is enabled/disabled */ 
+} MV_TDM_DEC_WIN;
+
+MV_STATUS mvTdmWinInit(MV_VOID);
+MV_STATUS mvTdmWinSet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin);
+MV_STATUS mvTdmWinGet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin);
+MV_STATUS mvTdmWinEnable(int winNum, MV_BOOL enable);
+MV_VOID mvTdmAddrDecShow(MV_VOID);
+
+
+#define TDM_MBUS_MAX_WIN	4
+#define TDM_WIN_CTRL_REG(win)	((TDM_REG_BASE + 0x4030) + (win<<4))
+#define TDM_WIN_BASE_REG(win)	((TDM_REG_BASE +0x4034) + (win<<4))
+
+/* TDM_WIN_CTRL_REG bits */
+#define TDM_WIN_ENABLE_OFFS	0
+#define TDM_WIN_ENABLE_MASK	(1<<TDM_WIN_ENABLE_OFFS)
+#define TDM_WIN_ENABLE		1
+#define TDM_WIN_TARGET_OFFS	4
+#define TDM_WIN_TARGET_MASK	(0xf<<TDM_WIN_TARGET_OFFS)
+#define TDM_WIN_ATTRIB_OFFS	8
+#define TDM_WIN_ATTRIB_MASK	(0xff<<TDM_WIN_ATTRIB_OFFS)
+#define TDM_WIN_SIZE_OFFS	16
+#define TDM_WIN_SIZE_MASK	(0xffff<<TDM_WIN_SIZE_OFFS)
+
+/* TDM_WIN_BASE_REG bits */
+#define TDM_BASE_OFFS		16
+#define TDM_BASE_MASK		(0xffff<<TDM_BASE_OFFS)
+
+#endif /*__INCmvSysTdmh*/
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c
new file mode 100644
index 00000000..4415c7c2
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c
@@ -0,0 +1,591 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+	used to endorse or promote products derived from this software without
+	specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#include "ctrlEnv/sys/mvSysTs.h"
+
+
+typedef struct _mvTsuDecWin
+{
+        MV_TARGET     target;
+        MV_ADDR_WIN   addrWin; /* An address window*/
+        MV_BOOL       enable;  /* Address decode window is enabled/disabled */
+ 
+}MV_TSU_DEC_WIN;
+
+
+MV_TARGET tsuAddrDecPrioTap[] =
+{
+#if defined(MV_INCLUDE_PEX)
+        PEX0_MEM,
+#endif
+#if defined(MV_INCLUDE_PCI)
+        PCI0_MEM,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS0)
+        SDRAM_CS0,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS1)
+        SDRAM_CS1,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS2)
+        SDRAM_CS2,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS3)
+        SDRAM_CS3,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS0)
+        DEVICE_CS0,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS1)
+        DEVICE_CS1,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS2)
+        DEVICE_CS2,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS3)
+        DEVICE_CS3,
+#endif
+#if defined(MV_INCLUDE_PEX)
+        PEX0_IO,
+#endif
+#if defined(MV_INCLUDE_PCI)
+        PCI0_IO,
+#endif
+        TBL_TERM
+};
+
+static MV_STATUS tsuWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
+static MV_STATUS mvTsuWinSet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin);
+static MV_STATUS mvTsuWinGet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin);
+MV_STATUS mvTsuWinEnable(MV_U32 winNum,MV_BOOL enable);
+
+/*******************************************************************************
+* mvTsuWinInit
+*
+* DESCRIPTION:
+* 	Initialize the TSU unit address decode windows.
+*
+* INPUT:
+*       None.
+* OUTPUT:
+*	None.
+* RETURN:
+*       MV_OK	- on success,
+*
+*******************************************************************************/
+MV_STATUS mvTsuWinInit(void)
+{
+	MV_U32          winNum, status, winPrioIndex=0;
+	MV_TSU_DEC_WIN  tsuWin;
+	MV_CPU_DEC_WIN  cpuAddrDecWin;
+
+	/* First disable all address decode windows */
+	for(winNum = 0; winNum < TSU_MAX_DECODE_WIN; winNum++)
+	{
+		MV_REG_BIT_RESET(MV_TSU_WIN_CTRL_REG(winNum),
+				 TSU_WIN_CTRL_EN_MASK);
+	}
+
+	/* Go through all windows in user table until table terminator      */
+	for(winNum = 0; ((tsuAddrDecPrioTap[winPrioIndex] != TBL_TERM) &&
+			 (winNum < TSU_MAX_DECODE_WIN));)
+	{
+		/* first get attributes from CPU If */
+		status = mvCpuIfTargetWinGet(tsuAddrDecPrioTap[winPrioIndex],
+					     &cpuAddrDecWin);
+
+		if(MV_NO_SUCH == status)
+		{
+			winPrioIndex++;
+			continue;
+		}
+		if(MV_OK != status)
+		{
+			mvOsPrintf("mvTsuWinInit: ERR. mvCpuIfTargetWinGet failed\n");
+			return MV_ERROR;
+		}
+
+		if (cpuAddrDecWin.enable == MV_TRUE)
+		{
+			tsuWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+			tsuWin.addrWin.baseLow = cpuAddrDecWin.addrWin.baseLow;
+			tsuWin.addrWin.size = cpuAddrDecWin.addrWin.size;
+			tsuWin.enable = MV_TRUE;
+			tsuWin.target = tsuAddrDecPrioTap[winPrioIndex];
+
+			if(MV_OK != mvTsuWinSet(winNum, &tsuWin))
+			{
+				mvOsPrintf("mvTsuWinInit: ERR. mvTsuWinSet failed winNum=%d\n",
+					   winNum);
+				return MV_ERROR;
+			}
+			winNum++;
+		}
+		winPrioIndex ++;
+	}
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvTsuWinSet
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
+*       address window, also known as address decode window.
+*       After setting this target window, the TSU will be able to access the
+*       target within the address window.
+*
+* INPUT:
+*       winNum      - TSU to target address decode window number.
+*       pAddrDecWin - TSU target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR	- if address window overlapps with other address decode 
+*			windows.
+*       MV_BAD_PARAM	- if base address is invalid parameter or target is
+*       		unknown.
+*
+*******************************************************************************/
+MV_STATUS mvTsuWinSet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin)
+{
+	MV_TARGET_ATTRIB    targetAttribs;
+	MV_DEC_REGS         decRegs;
+
+	/* Parameter checking   */
+	if(winNum >= TSU_MAX_DECODE_WIN)
+	{
+		mvOsPrintf("mvTsuWinSet: ERR. Invalid win num %d\n",winNum);
+		return MV_BAD_PARAM;
+	}    
+
+	/* Check if the requested window overlapps with current windows     */
+	if(MV_TRUE == tsuWinOverlapDetect(winNum, &pAddrDecWin->addrWin))
+	{
+		mvOsPrintf("mvTsuWinSet: ERR. Window %d overlap\n", winNum);
+		return MV_ERROR;
+	}
+
+	/* check if address is aligned to the size */
+	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow,pAddrDecWin->addrWin.size))
+	{
+		mvOsPrintf("mvTsuWinSet: Error setting TSU window %d to target "
+			   "%s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+			   winNum, mvCtrlTargetNameGet(pAddrDecWin->target),
+			   pAddrDecWin->addrWin.baseLow,
+			   pAddrDecWin->addrWin.size);
+		return MV_ERROR;
+	}
+
+	decRegs.baseReg = MV_REG_READ(MV_TSU_WIN_BASE_REG(winNum));
+	decRegs.sizeReg = MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNum));
+    
+	if(MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
+	{
+		mvOsPrintf("mvTsuWinSet: mvCtrlAddrDecToReg Failed\n");
+		return MV_ERROR;
+	}
+    
+	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
+    
+	/* set attributes */
+	decRegs.sizeReg &= ~TSU_WIN_CTRL_ATTR_MASK;
+	decRegs.sizeReg |= targetAttribs.attrib << TSU_WIN_CTRL_ATTR_OFFS;
+	/* set target ID */
+	decRegs.sizeReg &= ~TSU_WIN_CTRL_TARGET_MASK;
+	decRegs.sizeReg |= targetAttribs.targetId << TSU_WIN_CTRL_TARGET_OFFS;
+
+	/* for the safe side we disable the window before writing the new */
+	/* values */
+	mvTsuWinEnable(winNum, MV_FALSE);
+	MV_REG_WRITE(MV_TSU_WIN_CTRL_REG(winNum),decRegs.sizeReg);
+
+	/* Write to address decode Size Register                            */
+	MV_REG_WRITE(MV_TSU_WIN_BASE_REG(winNum), decRegs.baseReg);
+
+	/* Enable address decode target window                              */
+	if(pAddrDecWin->enable == MV_TRUE)
+	{
+		mvTsuWinEnable(winNum,MV_TRUE);
+	}
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvTsuWinGet
+*
+* DESCRIPTION:
+*	Get TSU peripheral target address window.
+*
+* INPUT:
+*	winNum - TSU to target address decode window number.
+*
+* OUTPUT:
+*       pAddrDecWin - TSU target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvTsuWinGet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin)
+{
+	MV_DEC_REGS decRegs;
+	MV_TARGET_ATTRIB targetAttrib;
+
+	/* Parameter checking   */
+	if(winNum >= TSU_MAX_DECODE_WIN)
+	{
+		mvOsPrintf("mvTsuWinGet: ERR. Invalid winNum %d\n", winNum);
+		return MV_NOT_SUPPORTED;
+	}
+
+	decRegs.baseReg = MV_REG_READ(MV_TSU_WIN_BASE_REG(winNum));                                                                           
+	decRegs.sizeReg = MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNum));
+ 
+	if(MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
+	{
+		mvOsPrintf("mvTsuWinGet: mvCtrlRegToAddrDec Failed \n");
+		return MV_ERROR;
+	}
+
+	/* attrib and targetId */
+	targetAttrib.attrib = 
+		(decRegs.sizeReg & TSU_WIN_CTRL_ATTR_MASK) >> TSU_WIN_CTRL_ATTR_OFFS;
+	targetAttrib.targetId = 
+		(decRegs.sizeReg & TSU_WIN_CTRL_TARGET_MASK) >> TSU_WIN_CTRL_TARGET_OFFS;
+
+	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+	/* Check if window is enabled   */
+	if((MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNum)) & TSU_WIN_CTRL_EN_MASK))
+	{
+		pAddrDecWin->enable = MV_TRUE;
+	}
+	else
+	{
+		pAddrDecWin->enable = MV_FALSE;
+	}
+	
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvTsuWinEnable
+*
+* DESCRIPTION:
+*       This function enable/disable a TSU to target address window.
+*       According to parameter 'enable' the routine will enable the
+*       window, thus enabling TSU accesses (before enabling the window it is
+*       tested for overlapping). Otherwise, the window will be disabled.
+*
+* INPUT:
+*       winNum - TSU to target address decode window number.
+*       enable - Enable / disable parameter.
+*
+* OUTPUT:
+*       N/A
+*
+* RETURN:
+*       MV_ERROR if decode window number was wrong or enabled window overlapps.
+*
+*******************************************************************************/
+MV_STATUS mvTsuWinEnable(MV_U32 winNum,MV_BOOL enable)
+{
+	MV_TSU_DEC_WIN addrDecWin;
+
+	/* Parameter checking   */
+	if(winNum >= TSU_MAX_DECODE_WIN)
+	{
+		mvOsPrintf("mvTsuWinEnable: ERR. Invalid winNum%d\n",winNum);
+		return MV_ERROR;
+	}
+
+	if(enable == MV_TRUE)
+	{
+		/* First check for overlap with other enabled windows   */
+		/* Get current window.					*/
+		if(MV_OK != mvTsuWinGet(winNum,&addrDecWin))
+		{
+			mvOsPrintf("mvTsuWinEnable: ERR. targetWinGet fail\n");
+			return MV_ERROR;
+		}
+		/* Check for overlapping.	*/
+		if(MV_FALSE == tsuWinOverlapDetect(winNum,&(addrDecWin.addrWin)))
+		{
+			/* No Overlap. Enable address decode target window   */
+			MV_REG_BIT_SET(MV_TSU_WIN_CTRL_REG(winNum),
+				       TSU_WIN_CTRL_EN_MASK);
+		}
+		else
+		{
+			/* Overlap detected */
+			mvOsPrintf("mvTsuWinEnable: ERR. Overlap detected\n");
+			return MV_ERROR;
+		}
+	}
+	else
+	{
+		/* Disable address decode target window */
+		MV_REG_BIT_RESET(MV_TSU_WIN_CTRL_REG(winNum),
+				 TSU_WIN_CTRL_EN_MASK);
+	}
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvTsuWinTargetGet
+*
+* DESCRIPTION:
+*	Get Window number associated with target
+*
+* INPUT:
+*	target	- Target ID to get the window number for.
+* OUTPUT:
+*
+* RETURN:
+*       window number or 0xFFFFFFFF on error.
+*
+*******************************************************************************/
+MV_U32  mvTsuWinTargetGet(MV_TARGET target)
+{
+	MV_TSU_DEC_WIN decWin;
+	MV_U32 winNum;
+
+	/* Check parameters */
+	if(target >= MAX_TARGETS)
+	{
+		mvOsPrintf("mvTsuWinTargetGet: target %d is Illigal\n", target);
+		return 0xffffffff;
+	}
+
+	for(winNum = 0; winNum < TSU_MAX_DECODE_WIN; winNum++)
+	{
+		if(mvTsuWinGet(winNum,&decWin) != MV_OK)
+		{
+			mvOsPrintf("mvTsuWinGet: window returned error\n");
+			return 0xffffffff;
+		}
+
+		if (decWin.enable == MV_TRUE)
+		{
+			if(decWin.target == target)
+			{
+				return winNum;
+			}
+		}
+	}
+	return 0xFFFFFFFF;
+}
+
+
+/*******************************************************************************
+* tsuWinOverlapDetect
+*
+* DESCRIPTION:
+*	Detect TSU address windows overlapping
+*	An unpredicted behaviur is expected in case TSU address decode
+*	windows overlapps.
+*	This function detects TSU address decode windows overlapping of a
+*	specified window. The function does not check the window itself for
+*	overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data
+*       from registers.
+*
+*******************************************************************************/
+static MV_STATUS tsuWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
+{
+	MV_U32              ctrlReg;
+	MV_U32              winNumIndex;
+	MV_TSU_DEC_WIN      addrDecWin;
+
+	for(winNumIndex = 0; winNumIndex < TSU_MAX_DECODE_WIN; winNumIndex++)
+	{
+		/* Do not check window itself           */
+		if(winNumIndex == winNum)
+		{
+			continue;
+		}
+
+		/* Do not check disabled windows        */
+		ctrlReg = MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNumIndex));
+		if((ctrlReg & TSU_WIN_CTRL_EN_MASK) == 0)
+		{
+			continue;
+		}
+
+		/* Get window parameters        */
+		if (MV_OK != mvTsuWinGet(winNumIndex, &addrDecWin))
+		{
+			mvOsPrintf("tsuWinOverlapDetect: ERR. mvTsuWinGet failed\n");
+			return MV_ERROR;
+		}
+
+		if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+		{
+			return MV_TRUE;
+		}
+	}
+	return MV_FALSE;
+}
+
+
+/*******************************************************************************
+* mvTsuAddrDecShow
+*
+* DESCRIPTION:
+*	Print the TSU address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+void mvTsuAddrDecShow(void)
+{
+	MV_TSU_DEC_WIN  win;
+	int             i;
+
+	if (MV_FALSE == mvCtrlPwrClckGet(TS_UNIT_ID, 0)) 
+		return;
+
+	mvOsOutput( "\n" );
+	mvOsOutput( "TSU:\n");
+	mvOsOutput( "----\n" );
+
+	for(i = 0; i < TSU_MAX_DECODE_WIN; i++)
+	{
+		memset(&win, 0, sizeof(TSU_MAX_DECODE_WIN));
+		mvOsOutput( "win%d - ", i );
+
+		if(mvTsuWinGet(i, &win ) == MV_OK )
+		{
+			if(win.enable == MV_TRUE)
+			{
+				mvOsOutput("%s base %08x, ",
+					   mvCtrlTargetNameGet(win.target),
+					   win.addrWin.baseLow);
+				mvOsOutput( "...." );
+				mvSizePrint(win.addrWin.size );
+				mvOsOutput( "\n" );
+			}
+			else
+			{
+				mvOsOutput( "disable\n" );
+			}
+		}
+	}
+	return;
+}
+
+
+/*******************************************************************************
+* mvTsuInit
+*
+* DESCRIPTION:
+* 	Initialize the TSU unit, and get unit out of reset.
+*
+* INPUT:
+*       coreClock	- The core clock at which the TSU should operate.
+*       mode		- The mode on configure the unit into (serial/parallel).
+* 	memHandle	- Memory handle used for memory allocations.
+* OUTPUT:
+*	None.
+* RETURN:
+*       MV_OK	- on success,
+*
+*******************************************************************************/
+MV_STATUS mvTsuInit(MV_TSU_CORE_CLOCK coreClock, MV_TSU_PORTS_MODE mode,
+	            void *osHandle)
+{
+	MV_STATUS status;
+
+	status = mvTsuWinInit();
+	if(status == MV_OK)
+		status = mvTsuHalInit(coreClock,mode,osHandle);
+
+	return status;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h
new file mode 100644
index 00000000..42825893
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h
@@ -0,0 +1,110 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSysTsh
+#define __INCmvSysTsh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* includes */
+#include "ts/mvTsu.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+#define TSU_MAX_DECODE_WIN	4
+
+
+/*******************************************/
+/* TSU Windows Registers                   */
+/*******************************************/
+#define MV_TSU_WIN_CTRL_REG(win)	(TSU_GLOBAL_REG_BASE +0x30 + 0x10 * win)
+#define MV_TSU_WIN_BASE_REG(win)	(TSU_GLOBAL_REG_BASE +0x34 + 0x10 * win)
+
+/* TSU windows control register.		*/
+#define TSU_WIN_CTRL_EN_MASK		(0x1 << 0)
+#define TSU_WIN_CTRL_TARGET_OFFS	4
+#define TSU_WIN_CTRL_TARGET_MASK	(0xF << TSU_WIN_CTRL_TARGET_OFFS)
+#define TSU_WIN_CTRL_ATTR_OFFS		8
+#define TSU_WIN_CTRL_ATTR_MASK		(0xFF << TSU_WIN_CTRL_ATTR_OFFS)
+#define TSU_WIN_CTRL_SIZE_OFFS		16
+#define TSU_WIN_CTRL_SIZE_MASK		(0xFFFF << TSU_WIN_CTRL_SIZE_OFFS)
+
+/* TSU windows base register.			*/
+#define TSU_WIN_BASE_OFFS		16
+#define TSU_WIN_BASE_MASK		(0xFFFF << TSU_WIN_BASE_OFFS)
+
+MV_STATUS mvTsuWinInit(void);
+
+void mvTsuAddrDecShow(void);
+MV_STATUS mvTsuInit(MV_TSU_CORE_CLOCK coreClock, MV_TSU_PORTS_MODE mode,
+	            void *osHandle);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvTsh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c
new file mode 100644
index 00000000..195b5e13
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c
@@ -0,0 +1,497 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "ctrlEnv/sys/mvSysUsb.h"
+
+MV_TARGET usbAddrDecPrioTab[] =
+{
+#if defined(MV_INCLUDE_SDRAM_CS0)
+    SDRAM_CS0,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS1)
+    SDRAM_CS1,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS2)
+    SDRAM_CS2,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS3)
+    SDRAM_CS3,
+#endif
+#if defined(MV_INCLUDE_CESA) && defined(USB_UNDERRUN_WA)
+    CRYPT_ENG,
+#endif
+#if defined(MV_INCLUDE_PEX)
+    PEX0_MEM,
+#endif
+    TBL_TERM
+};
+
+
+
+MV_STATUS   mvUsbInit(int dev, MV_BOOL isHost)
+{
+    MV_STATUS       status;
+
+    status = mvUsbWinInit(dev);
+    if(status != MV_OK)
+        return status;
+
+    return mvUsbHalInit(dev, isHost);
+}
+
+
+/*******************************************************************************
+* usbWinOverlapDetect - Detect USB address windows overlapping
+*
+* DESCRIPTION:
+*       An unpredicted behaviur is expected in case USB address decode
+*       windows overlapps.
+*       This function detects USB address decode windows overlapping of a
+*       specified window. The function does not check the window itself for
+*       overlapping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data
+*       from registers.
+*
+*******************************************************************************/
+static MV_STATUS usbWinOverlapDetect(int dev, MV_U32 winNum,
+                                     MV_ADDR_WIN *pAddrWin)
+{
+    MV_U32          winNumIndex;
+    MV_DEC_WIN      addrDecWin;
+
+    for(winNumIndex=0; winNumIndex<MV_USB_MAX_ADDR_DECODE_WIN; winNumIndex++)
+    {
+        /* Do not check window itself       */
+        if (winNumIndex == winNum)
+        {
+            continue;
+        }
+
+        /* Get window parameters    */
+        if (MV_OK != mvUsbWinGet(dev, winNumIndex, &addrDecWin))
+        {
+            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
+            return MV_ERROR;
+        }
+
+        /* Do not check disabled windows    */
+        if(addrDecWin.enable == MV_FALSE)
+        {
+            continue;
+        }
+
+        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+        {
+            return MV_TRUE;
+        }
+    }
+    return MV_FALSE;
+}
+
+/*******************************************************************************
+* mvUsbWinSet - Set USB target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
+*       address window, also known as address decode window.
+*       After setting this target window, the USB will be able to access the
+*       target within the address window.
+*
+* INPUT:
+*       winNum      - USB target address decode window number.
+*       pAddrDecWin - USB target window data structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_ERROR if address window overlapps with other address decode windows.
+*       MV_BAD_PARAM if base address is invalid parameter or target is
+*       unknown.
+*
+*******************************************************************************/
+MV_STATUS mvUsbWinSet(int dev, MV_U32 winNum, MV_DEC_WIN *pDecWin)
+{
+    MV_DEC_WIN_PARAMS   winParams;
+    MV_U32              sizeReg, baseReg;
+
+    /* Parameter checking   */
+    if (winNum >= MV_USB_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
+        return MV_BAD_PARAM;
+    }
+
+    /* Check if the requested window overlapps with current windows         */
+    if (MV_TRUE == usbWinOverlapDetect(dev, winNum, &pDecWin->addrWin))
+    {
+        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
+        return MV_ERROR;
+    }
+
+    /* check if address is aligned to the size */
+    if(MV_IS_NOT_ALIGN(pDecWin->addrWin.baseLow, pDecWin->addrWin.size))
+    {
+        mvOsPrintf("mvUsbWinSet:Error setting USB window %d to "\
+                   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
+                   winNum,
+                   mvCtrlTargetNameGet(pDecWin->target),
+                   pDecWin->addrWin.baseLow,
+                   pDecWin->addrWin.size);
+        return MV_ERROR;
+    }
+
+    if(MV_OK != mvCtrlAddrDecToParams(pDecWin, &winParams))
+    {
+        mvOsPrintf("%s: mvCtrlAddrDecToParams Failed\n", __FUNCTION__);
+        return MV_ERROR;
+    }
+
+    /* set Size, Attributes and TargetID */
+    sizeReg = (((winParams.targetId << MV_USB_WIN_TARGET_OFFSET) & MV_USB_WIN_TARGET_MASK) |
+               ((winParams.attrib   << MV_USB_WIN_ATTR_OFFSET)   & MV_USB_WIN_ATTR_MASK)   |
+               ((winParams.size << MV_USB_WIN_SIZE_OFFSET) & MV_USB_WIN_SIZE_MASK));
+
+#if defined(MV645xx) || defined(MV646xx)
+    /* If window is DRAM with HW cache coherency, make sure bit2 is set */
+    sizeReg &= ~MV_USB_WIN_BURST_WR_LIMIT_MASK;
+
+    if((MV_TARGET_IS_DRAM(pDecWin->target)) &&
+       (pDecWin->addrWinAttr.cachePolicy != NO_COHERENCY))
+    {
+        sizeReg |= MV_USB_WIN_BURST_WR_32BIT_LIMIT;
+    }
+    else
+    {
+        sizeReg |= MV_USB_WIN_BURST_WR_NO_LIMIT;
+    }
+#endif /* MV645xx || MV646xx */
+
+    if (pDecWin->enable == MV_TRUE)
+    {
+        sizeReg |= MV_USB_WIN_ENABLE_MASK;
+    }
+    else
+    {
+        sizeReg &= ~MV_USB_WIN_ENABLE_MASK;
+    }
+
+    /* Update Base value  */
+    baseReg = (winParams.baseAddr & MV_USB_WIN_BASE_MASK);
+
+    MV_REG_WRITE( MV_USB_WIN_CTRL_REG(dev, winNum), sizeReg);
+    MV_REG_WRITE( MV_USB_WIN_BASE_REG(dev, winNum), baseReg);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvUsbWinGet - Get USB peripheral target address window.
+*
+* DESCRIPTION:
+*       Get USB peripheral target address window.
+*
+* INPUT:
+*       winNum - USB target address decode window number.
+*
+* OUTPUT:
+*       pDecWin - USB target window data structure.
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS mvUsbWinGet(int dev, MV_U32 winNum, MV_DEC_WIN *pDecWin)
+{
+    MV_DEC_WIN_PARAMS   winParam;
+    MV_U32              sizeReg, baseReg;
+
+    /* Parameter checking   */
+    if (winNum >= MV_USB_MAX_ADDR_DECODE_WIN)
+    {
+        mvOsPrintf("%s (dev=%d): ERR. Invalid winNum %d\n",
+                    __FUNCTION__, dev, winNum);
+        return MV_NOT_SUPPORTED;
+    }
+
+    baseReg = MV_REG_READ( MV_USB_WIN_BASE_REG(dev, winNum) );
+    sizeReg = MV_REG_READ( MV_USB_WIN_CTRL_REG(dev, winNum) );
+
+   /* Check if window is enabled   */
+    if(sizeReg & MV_USB_WIN_ENABLE_MASK)
+    {
+        pDecWin->enable = MV_TRUE;
+
+        /* Extract window parameters from registers */
+        winParam.targetId = (sizeReg & MV_USB_WIN_TARGET_MASK) >> MV_USB_WIN_TARGET_OFFSET;
+        winParam.attrib   = (sizeReg & MV_USB_WIN_ATTR_MASK) >> MV_USB_WIN_ATTR_OFFSET;
+        winParam.size     = (sizeReg & MV_USB_WIN_SIZE_MASK) >> MV_USB_WIN_SIZE_OFFSET;
+        winParam.baseAddr = (baseReg & MV_USB_WIN_BASE_MASK);
+
+        /* Translate the decode window parameters to address decode struct */
+        if (MV_OK != mvCtrlParamsToAddrDec(&winParam, pDecWin))
+        {
+            mvOsPrintf("Failed to translate register parameters to USB address" \
+                       " decode window structure\n");
+            return MV_ERROR;
+        }
+    }
+    else
+    {
+        pDecWin->enable = MV_FALSE;
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvUsbWinInit -
+*
+* INPUT:
+*
+* OUTPUT:
+*
+* RETURN:
+*       MV_ERROR if register parameters are invalid.
+*
+*******************************************************************************/
+MV_STATUS   mvUsbWinInit(int dev)
+{
+    MV_STATUS       status;
+    MV_DEC_WIN      usbWin;
+    MV_CPU_DEC_WIN  cpuAddrDecWin;
+    int             winNum;
+    MV_U32          winPrioIndex = 0;
+
+    /* First disable all address decode windows */
+    for(winNum = 0; winNum < MV_USB_MAX_ADDR_DECODE_WIN; winNum++)
+    {
+        MV_REG_BIT_RESET(MV_USB_WIN_CTRL_REG(dev, winNum), MV_USB_WIN_ENABLE_MASK);
+    }
+
+    /* Go through all windows in user table until table terminator          */
+    winNum = 0;
+    while( (usbAddrDecPrioTab[winPrioIndex] != TBL_TERM) &&
+           (winNum < MV_USB_MAX_ADDR_DECODE_WIN) )
+    {
+        /* first get attributes from CPU If */
+        status = mvCpuIfTargetWinGet(usbAddrDecPrioTab[winPrioIndex],
+                                     &cpuAddrDecWin);
+
+        if(MV_NO_SUCH == status)
+        {
+            winPrioIndex++;
+            continue;
+        }
+        if (MV_OK != status)
+        {
+            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
+            return MV_ERROR;
+        }
+
+        if (cpuAddrDecWin.enable == MV_TRUE)
+        {
+            usbWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
+            usbWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
+            usbWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
+            usbWin.enable           = MV_TRUE;
+            usbWin.target           = usbAddrDecPrioTab[winPrioIndex];
+
+#if defined(MV645xx) || defined(MV646xx)
+            /* Get the default attributes for that target window */
+            mvCtrlDefAttribGet(usbWin.target, &usbWin.addrWinAttr);
+#endif /* MV645xx || MV646xx */
+
+            if(MV_OK != mvUsbWinSet(dev, winNum, &usbWin))
+            {
+                return MV_ERROR;
+            }
+            winNum++;
+        }
+        winPrioIndex++;
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvUsbAddrDecShow - Print the USB address decode map.
+*
+* DESCRIPTION:
+*       This function print the USB address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvUsbAddrDecShow(MV_VOID)
+{
+    MV_DEC_WIN  addrDecWin;
+    int         i, winNum;
+
+    mvOsOutput( "\n" );
+    mvOsOutput( "USB:\n" );
+    mvOsOutput( "----\n" );
+
+    for(i=0; i<mvCtrlUsbMaxGet(); i++)
+    {
+        mvOsOutput( "Device %d:\n", i);
+
+        for(winNum = 0; winNum < MV_USB_MAX_ADDR_DECODE_WIN; winNum++)
+        {
+            memset(&addrDecWin, 0, sizeof(MV_DEC_WIN) );
+
+            mvOsOutput( "win%d - ", winNum );
+
+            if( mvUsbWinGet(i, winNum, &addrDecWin ) == MV_OK )
+            {
+                if( addrDecWin.enable )
+                {
+                    mvOsOutput( "%s base %08x, ",
+                        mvCtrlTargetNameGet(addrDecWin.target), addrDecWin.addrWin.baseLow );
+
+                    mvSizePrint( addrDecWin.addrWin.size );
+
+#if defined(MV645xx) || defined(MV646xx)
+                    switch( addrDecWin.addrWinAttr.swapType)
+                    {
+                        case MV_BYTE_SWAP:
+                            mvOsOutput( "BYTE_SWAP, " );
+                            break;
+                        case MV_NO_SWAP:
+                            mvOsOutput( "NO_SWAP  , " );
+                            break;
+                        case MV_BYTE_WORD_SWAP:
+                            mvOsOutput( "BYTE_WORD_SWAP, " );
+                            break;
+                        case MV_WORD_SWAP:
+                            mvOsOutput( "WORD_SWAP, " );
+                            break;
+                        default:
+                            mvOsOutput( "SWAP N/A , " );
+                    }
+
+                    switch( addrDecWin.addrWinAttr.cachePolicy )
+                    {
+                        case NO_COHERENCY:
+                            mvOsOutput( "NO_COHERENCY , " );
+                            break;
+                        case WT_COHERENCY:
+                            mvOsOutput( "WT_COHERENCY , " );
+                            break;
+                        case WB_COHERENCY:
+                            mvOsOutput( "WB_COHERENCY , " );
+                            break;
+                        default:
+                            mvOsOutput( "COHERENCY N/A, " );
+                    }
+
+                    switch( addrDecWin.addrWinAttr.pcixNoSnoop )
+                    {
+                        case 0:
+                            mvOsOutput( "PCI-X NS inactive, " );
+                            break;
+                        case 1:
+                            mvOsOutput( "PCI-X NS active  , " );
+                            break;
+                        default:
+                            mvOsOutput( "PCI-X NS N/A     , " );
+                    }
+
+                    switch( addrDecWin.addrWinAttr.p2pReq64 )
+                    {
+                        case 0:
+                            mvOsOutput( "REQ64 force" );
+                            break;
+                        case 1:
+                            mvOsOutput( "REQ64 detect" );
+                            break;
+                        default:
+                            mvOsOutput( "REQ64 N/A" );
+                    }
+#endif /* MV645xx || MV646xx */
+                    mvOsOutput( "\n" );
+                }
+                else
+                    mvOsOutput( "disable\n" );
+            }
+        }
+    }
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h
new file mode 100644
index 00000000..07f98de9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h
@@ -0,0 +1,125 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSysUsbh
+#define __INCmvSysUsbh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* includes */
+#include "usb/mvUsb.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+#define MV_USB_MAX_ADDR_DECODE_WIN  4
+
+/*******************************************/
+/* USB Bridge Registers                    */
+/*******************************************/
+#define MV_USB_BRIDGE_CTRL_REG(dev)              (USB_REG_BASE(dev) + 0x300)
+
+#define MV_USB_WIN_CTRL_REG(dev, win)        (USB_REG_BASE(dev) + 0x320 + ((win)<<4)) 
+#define MV_USB_WIN_BASE_REG(dev, win)        (USB_REG_BASE(dev) + 0x324 + ((win)<<4))
+
+/* BITs in Windows 0-3 Control and Base Registers */
+#define MV_USB_WIN_ENABLE_BIT               0
+#define MV_USB_WIN_ENABLE_MASK              (1 << MV_USB_WIN_ENABLE_BIT)
+
+#define MV_USB_WIN_BURST_WR_LIMIT_BIT       1
+#define MV_USB_WIN_BURST_WR_LIMIT_MASK      (1 << MV_USB_WIN_BURST_WR_LIMIT_BIT)
+#define MV_USB_WIN_BURST_WR_NO_LIMIT        (0 << MV_USB_WIN_BURST_WR_LIMIT_BIT)
+#define MV_USB_WIN_BURST_WR_32BIT_LIMIT     (1 << MV_USB_WIN_BURST_WR_LIMIT_BIT)
+
+#define MV_USB_WIN_TARGET_OFFSET            4
+#define MV_USB_WIN_TARGET_MASK              (0xF << MV_USB_WIN_TARGET_OFFSET)
+
+#define MV_USB_WIN_ATTR_OFFSET              8
+#define MV_USB_WIN_ATTR_MASK                (0xFF << MV_USB_WIN_ATTR_OFFSET)
+
+#define MV_USB_WIN_SIZE_OFFSET              16
+#define MV_USB_WIN_SIZE_MASK                (0xFFFF << MV_USB_WIN_SIZE_OFFSET)
+
+#define MV_USB_WIN_BASE_OFFSET              16
+#define MV_USB_WIN_BASE_MASK                (0xFFFF << MV_USB_WIN_BASE_OFFSET)
+
+
+#define MV_USB_BRIDGE_IPG_REG(dev)          (USB_REG_BASE(dev) + 0x360)
+
+
+MV_STATUS   mvUsbInit(int dev, MV_BOOL isHost);
+
+MV_STATUS   mvUsbWinInit(int dev);
+MV_STATUS   mvUsbWinSet(int dev, MV_U32 winNum, MV_DEC_WIN *pAddrWin);
+MV_STATUS   mvUsbWinGet(int dev, MV_U32 winNum, MV_DEC_WIN *pAddrWin);
+
+void        mvUsbAddrDecShow(void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvUsbh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c
new file mode 100644
index 00000000..f9d0ab37
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c
@@ -0,0 +1,662 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "xor/mvXor.h"
+#include "mvSysXor.h"
+
+/* defines  */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+#else
+	#define DB(x)
+#endif	
+
+
+static MV_STATUS xorWinOverlapDetect(MV_U32 unit,MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
+
+MV_TARGET xorAddrDecPrioTap[] = 
+{
+#if defined(MV_INCLUDE_DEVICE_CS0)
+    DEVICE_CS0,
+#endif
+#if defined(MV_INCLUDE_PEX)
+	PEX0_MEM,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS0)
+    SDRAM_CS0,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS1)
+    SDRAM_CS1,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS2)
+    SDRAM_CS2,
+#endif
+#if defined(MV_INCLUDE_SDRAM_CS3)
+    SDRAM_CS3,
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS1)
+    DEVICE_CS1,
+#endif
+#if defined(MV_INCLUDE_CESA)
+   CRYPT_ENG,
+#endif 
+	TBL_TERM
+};
+static MV_STATUS mvXorInitWinsUnit (MV_U32 unit)
+{
+	MV_U32         winNum;
+	MV_XOR_DEC_WIN addrDecWin;
+	MV_CPU_DEC_WIN cpuAddrDecWin;
+	MV_U32          status;
+	MV_U32			winPrioIndex=0;
+
+	/* Initiate XOR address decode */
+
+	/* First disable all address decode windows */
+	for(winNum = 0; winNum < XOR_MAX_ADDR_DEC_WIN; winNum++)
+	{
+	    mvXorTargetWinEnable(unit,winNum, MV_FALSE);
+	}
+	
+	/* Go through all windows in user table until table terminator			*/
+	for (winNum = 0; ((xorAddrDecPrioTap[winPrioIndex] != TBL_TERM) &&
+					(winNum < XOR_MAX_ADDR_DEC_WIN));)
+	{
+		/* first get attributes from CPU If */
+		status = mvCpuIfTargetWinGet(xorAddrDecPrioTap[winPrioIndex], 
+									 &cpuAddrDecWin);
+
+        if(MV_NO_SUCH == status)
+        {
+            winPrioIndex++;
+            continue;
+        }
+		if (MV_OK != status)
+		{
+            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
+			return MV_ERROR;
+		}
+
+	
+        if (cpuAddrDecWin.enable == MV_TRUE)
+		{
+
+			addrDecWin.target           = xorAddrDecPrioTap[winPrioIndex];
+			addrDecWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow; 
+			addrDecWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh; 
+			addrDecWin.addrWin.size     = cpuAddrDecWin.addrWin.size;    
+			addrDecWin.enable           = MV_TRUE;
+	
+			if (MV_OK != mvXorTargetWinSet(unit,winNum, &addrDecWin))
+			{
+				DB(mvOsPrintf("mvXorInit: ERR. mvDmaTargetWinSet failed\n"));
+				return MV_ERROR;
+			}
+			winNum++;
+		}
+		winPrioIndex++;	
+        
+	}
+    
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvXorInit - Initialize XOR engine
+*
+* DESCRIPTION:
+*		This function initialize XOR unit. It set the default address decode
+*		windows of the unit.
+*		Note that if the address window is disabled in xorAddrDecMap, the
+*		window parameters will be set but the window will remain disabled.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
+*******************************************************************************/
+MV_STATUS mvXorInit (MV_VOID)
+{
+	MV_U32         i;
+
+	/* Initiate XOR address decode */
+	for(i = 0; i < MV_XOR_MAX_UNIT; i++)
+	    mvXorInitWinsUnit(i);
+
+	mvXorHalInit(MV_XOR_MAX_CHAN);	
+    
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvXorTargetWinSet - Set XOR target address window
+*
+* DESCRIPTION:
+*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
+*       address window. After setting this target window, the XOR will be 
+*       able to access the target within the address window. 
+*
+* INPUT:
+*	    winNum - One of the possible XOR memory decode windows.
+*       target - Peripheral target enumerator.
+*       base   - Window base address.
+*       size   - Window size.
+*       enable - Window enable/disable.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvXorTargetWinSet(MV_U32 unit, MV_U32 winNum, MV_XOR_DEC_WIN *pAddrDecWin)
+{
+    MV_DEC_REGS xorDecRegs;
+	MV_TARGET_ATTRIB targetAttribs;
+    MV_U32      chan;
+    
+    /* Parameter checking */
+    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
+    {
+		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum));
+        return MV_BAD_PARAM;
+    }
+    if (pAddrDecWin == NULL)
+    {
+        DB(mvOsPrintf("%s: ERR. pAddrDecWin is NULL pointer\n", __FUNCTION__ ));
+        return MV_BAD_PTR;
+    }                                         
+    /* Check if the requested window overlaps with current windows */
+    if (MV_TRUE == xorWinOverlapDetect(unit, winNum, &pAddrDecWin->addrWin))
+    {
+	DB(mvOsPrintf("%s: ERR. Window %d overlap\n",__FUNCTION__,winNum));
+	return MV_ERROR;
+    }                              
+
+    xorDecRegs.baseReg = MV_REG_READ(XOR_BASE_ADDR_REG(unit,winNum));
+    xorDecRegs.sizeReg = MV_REG_READ(XOR_SIZE_MASK_REG(unit,winNum));
+
+    /* Get Base Address and size registers values */
+    if(MV_OK != mvCtrlAddrDecToReg(&pAddrDecWin->addrWin, &xorDecRegs))
+    {
+		DB(mvOsPrintf("%s: ERR. Invalid addr dec window\n",__FUNCTION__));
+        return MV_BAD_PARAM;
+	}
+    
+
+	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
+
+	/* set attributes */
+	xorDecRegs.baseReg &= ~XEBARX_ATTR_MASK;
+	xorDecRegs.baseReg |= targetAttribs.attrib << XEBARX_ATTR_OFFS;
+	/* set target ID */
+	xorDecRegs.baseReg &= ~XEBARX_TARGET_MASK;
+	xorDecRegs.baseReg |= targetAttribs.targetId << XEBARX_TARGET_OFFS;
+
+
+    /* Write to address decode Base Address Register */
+	MV_REG_WRITE(XOR_BASE_ADDR_REG(unit,winNum), xorDecRegs.baseReg);
+    
+    /* Write to Size Register */
+	MV_REG_WRITE(XOR_SIZE_MASK_REG(unit,winNum), xorDecRegs.sizeReg);
+    
+    for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
+    {
+        if (pAddrDecWin->enable)
+        {
+            MV_REG_BIT_SET(XOR_WINDOW_CTRL_REG(unit,chan),
+                           XEXWCR_WIN_EN_MASK(winNum));
+        }
+        else
+        {
+            MV_REG_BIT_RESET(XOR_WINDOW_CTRL_REG(unit,chan),
+                             XEXWCR_WIN_EN_MASK(winNum));
+        }
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvXorTargetWinGet - Get xor peripheral target address window.
+*
+* DESCRIPTION:
+*		Get xor peripheral target address window.
+*
+* INPUT:
+*	  winNum - One of the possible XOR memory decode windows.
+*
+* OUTPUT:
+*       base   - Window base address.
+*       size   - Window size.
+*       enable - window enable/disable.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvXorTargetWinGet(MV_U32 unit,MV_U32 winNum, MV_XOR_DEC_WIN *pAddrDecWin)
+{
+    MV_DEC_REGS xorDecRegs;
+	MV_TARGET_ATTRIB targetAttrib;
+    MV_U32      chan=0,chanWinEn;
+    
+    /* Parameter checking */
+    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
+    {
+		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__ , winNum));
+        return MV_ERROR;
+    }
+
+    if (NULL == pAddrDecWin)
+    {
+        DB(mvOsPrintf("%s: ERR. pAddrDecWin is NULL pointer\n", __FUNCTION__ ));
+        return MV_BAD_PTR;
+    }
+
+    chanWinEn = MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,0)) & XEXWCR_WIN_EN_MASK(winNum);
+    
+    for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++) /* we should scan here all channels per unit */
+    {
+    	/* Check if enable bit is equal for all channels */
+        if ((MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,chan)) & 
+             XEXWCR_WIN_EN_MASK(winNum)) != chanWinEn)
+        {
+            mvOsPrintf("%s: ERR. Window enable field must be equal in "
+                              "all channels(chan=%d)\n",__FUNCTION__, chan);
+            return MV_ERROR;
+        }
+    }
+
+
+
+	xorDecRegs.baseReg  = MV_REG_READ(XOR_BASE_ADDR_REG(unit,winNum));
+	xorDecRegs.sizeReg  = MV_REG_READ(XOR_SIZE_MASK_REG(unit,winNum));
+
+	if (MV_OK != mvCtrlRegToAddrDec(&xorDecRegs, &pAddrDecWin->addrWin))
+	{
+		mvOsPrintf("%s: ERR. mvCtrlRegToAddrDec failed\n", __FUNCTION__);
+		return MV_ERROR;
+	}
+
+	/* attrib and targetId */
+	targetAttrib.attrib = 
+		(xorDecRegs.baseReg & XEBARX_ATTR_MASK) >> XEBARX_ATTR_OFFS;
+	targetAttrib.targetId = 
+		(xorDecRegs.baseReg & XEBARX_TARGET_MASK) >> XEBARX_TARGET_OFFS;
+
+
+	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
+
+	if(chanWinEn)
+	{
+		pAddrDecWin->enable = MV_TRUE;
+	}
+	else pAddrDecWin->enable = MV_FALSE;
+	
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvXorTargetWinEnable - Enable/disable a Xor address decode window
+*
+* DESCRIPTION:
+*       This function enable/disable a XOR address decode window.
+*       if parameter 'enable' == MV_TRUE the routine will enable the 
+*       window, thus enabling XOR accesses (before enabling the window it is 
+*       tested for overlapping). Otherwise, the window will be disabled.
+*
+* INPUT:
+*       winNum - Decode window number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvXorTargetWinEnable(MV_U32 unit,MV_U32 winNum, MV_BOOL enable)
+{
+	MV_XOR_DEC_WIN  addrDecWin;
+    MV_U32          chan;
+    
+	/* Parameter checking   */               
+    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
+    {
+        DB(mvOsPrintf("%s: ERR. Invalid winNum%d\n", __FUNCTION__, winNum));
+        return MV_ERROR;
+    }
+
+	if (enable == MV_TRUE) 
+	{
+		/* Get current window */
+	    if (MV_OK != mvXorTargetWinGet(unit,winNum, &addrDecWin))
+		{
+			DB(mvOsPrintf("%s: ERR. targetWinGet fail\n", __FUNCTION__));
+			return MV_ERROR;
+		}
+
+		/* Check for overlapping */
+	    if (MV_TRUE == xorWinOverlapDetect(unit,winNum, &(addrDecWin.addrWin)))
+		{
+			/* Overlap detected	*/
+			DB(mvOsPrintf("%s: ERR. Overlap detected\n", __FUNCTION__));
+			return MV_ERROR;
+		}
+
+		/* No Overlap. Enable address decode target window */
+		for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
+		{
+		    MV_REG_BIT_SET(XOR_WINDOW_CTRL_REG(unit,chan),
+						   XEXWCR_WIN_EN_MASK(winNum));
+		}
+
+	}
+	else
+	{
+		/* Disable address decode target window */
+
+		for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
+		{
+		    MV_REG_BIT_RESET(XOR_WINDOW_CTRL_REG(unit,chan),
+							 XEXWCR_WIN_EN_MASK(winNum));
+		}
+
+	}
+
+	return MV_OK;                  
+}
+
+/*******************************************************************************
+* mvXorSetProtWinSet - Configure access attributes of a XOR engine
+*                               to one of the XOR memory windows.
+*
+* DESCRIPTION:
+*       Each engine can be configured with access attributes for each of the
+*       memory spaces. This function sets access attributes 
+*       to a given window for the given engine
+*
+* INPUTS:
+*       chan    - One of the possible engines.
+*       winNum  - One of the possible XOR memory spaces.
+*       access  - Protection access rights.
+*       write   - Write rights.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvXorProtWinSet (MV_U32 unit,MV_U32 chan, MV_U32 winNum, MV_BOOL access, 
+                           MV_BOOL write)
+{
+    MV_U32 temp;
+    
+    /* Parameter checking   */
+    if (chan >= MV_XOR_MAX_CHAN_PER_UNIT)
+    {
+		DB(mvOsPrintf("%s: ERR. Invalid chan num %d\n", __FUNCTION__ , chan));
+        return MV_BAD_PARAM;
+    }
+    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
+    {
+		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n", __FUNCTION__, winNum));
+        return MV_BAD_PARAM;
+    }
+
+    temp = MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,chan)) & 
+        (~XEXWCR_WIN_ACC_MASK(winNum));
+
+    /* if access is disable */
+    if (!access)
+    {
+        /* disable access */
+        temp |= XEXWCR_WIN_ACC_NO_ACC(winNum);
+    }
+    /* if access is enable */
+    else
+    {
+        /* if write is enable */
+        if (write)
+        {
+            /* enable write */
+            temp |= XEXWCR_WIN_ACC_RW(winNum);
+        }
+        /* if write is disable */
+        else
+        {
+            /* disable write */
+            temp |= XEXWCR_WIN_ACC_RO(winNum);
+        }
+    }
+    MV_REG_WRITE(XOR_WINDOW_CTRL_REG(unit,chan),temp);
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvXorPciRemap - Set XOR remap register for PCI address windows.
+*
+* DESCRIPTION:
+*       only Windows 0-3 can be remapped.
+*
+* INPUT:
+*       winNum      - window number
+*       pAddrDecWin  - pointer to address space window structure
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvXorPciRemap(MV_U32 unit,MV_U32 winNum, MV_U32 addrHigh)
+{
+    /* Parameter checking   */
+    if (winNum >= XOR_MAX_REMAP_WIN)
+    {
+		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n", __FUNCTION__, winNum));
+        return MV_BAD_PARAM;
+    }
+
+    MV_REG_WRITE(XOR_HIGH_ADDR_REMAP_REG(unit,winNum), addrHigh);
+    
+	return MV_OK;
+}
+
+/*******************************************************************************
+* xorWinOverlapDetect - Detect XOR address windows overlaping
+*
+* DESCRIPTION:
+*       An unpredicted behaviour is expected in case XOR address decode 
+*       windows overlaps.
+*       This function detects XOR address decode windows overlaping of a 
+*       specified window. The function does not check the window itself for 
+*       overlaping. The function also skipps disabled address decode windows.
+*
+* INPUT:
+*       winNum      - address decode window number.
+*       pAddrDecWin - An address decode window struct.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlap current address
+*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
+*       from registers.
+*
+*******************************************************************************/
+static MV_STATUS xorWinOverlapDetect(MV_U32 unit,MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
+{
+	MV_U32 	        baseAddrEnableReg;
+	MV_U32          winNumIndex,chan;
+	MV_XOR_DEC_WIN  addrDecWin;
+
+	if (pAddrWin == NULL)
+	{
+		DB(mvOsPrintf("%s: ERR. pAddrWin is NULL pointer\n", __FUNCTION__ ));
+		return MV_BAD_PTR;
+	}
+    
+	for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
+	{
+		/* Read base address enable register. Do not check disabled windows	*/
+	    baseAddrEnableReg = MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,chan));
+
+		for (winNumIndex = 0; winNumIndex < XOR_MAX_ADDR_DEC_WIN; winNumIndex++)
+		{
+			/* Do not check window itself */
+			if (winNumIndex == winNum)
+			{
+				continue;
+			}
+    
+			/* Do not check disabled windows */
+			if ((baseAddrEnableReg & XEXWCR_WIN_EN_MASK(winNumIndex)) == 0)
+			{
+				continue;
+			}
+    
+			/* Get window parameters */
+			if (MV_OK != mvXorTargetWinGet(unit,winNumIndex, &addrDecWin))
+			{
+				DB(mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__ ));
+				return MV_ERROR;
+			}
+            
+			if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
+			{
+				return MV_TRUE;
+			}
+		}
+	}
+	
+	return MV_FALSE;
+}
+
+static MV_VOID mvXorAddrDecShowUnit(MV_U32 unit)
+{
+	MV_XOR_DEC_WIN win;
+	int            i;
+
+	mvOsOutput( "\n" );
+	mvOsOutput( "XOR %d:\n", unit );
+	mvOsOutput( "----\n" );
+
+	for( i = 0; i < XOR_MAX_ADDR_DEC_WIN; i++ )
+	{
+		memset( &win, 0, sizeof(MV_XOR_DEC_WIN) );
+
+		mvOsOutput( "win%d - ", i );
+
+		if( mvXorTargetWinGet(unit, i, &win ) == MV_OK )
+		{
+			if( win.enable )
+			{
+				mvOsOutput( "%s base %x, ",
+				mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
+
+				mvSizePrint( win.addrWin.size );
+				
+                mvOsOutput( "\n" );
+			}
+			else
+				mvOsOutput( "disable\n" );
+		}
+	}
+}
+
+/*******************************************************************************
+* mvXorAddrDecShow - Print the XOR address decode map.
+*
+* DESCRIPTION:
+*		This function print the XOR address decode map.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID mvXorAddrDecShow(MV_VOID)
+{
+	int            i;
+
+	for( i = 0; i < MV_XOR_MAX_UNIT; i++ )
+	    mvXorAddrDecShowUnit(i);
+	
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h
new file mode 100644
index 00000000..73b2d9e6
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h
@@ -0,0 +1,140 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCMVSysXorh
+#define __INCMVSysXorh
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+#define XOR_MAX_ADDR_DEC_WIN	8	/* Maximum address decode windows		*/
+#define XOR_MAX_REMAP_WIN       4	/* Maximum address arbiter windows		*/
+
+/* XOR Engine Address Decoding Register Map */                  
+#define XOR_WINDOW_CTRL_REG(unit,chan)     (XOR_UNIT_BASE(unit)+(0x240 + ((chan) * 4)))
+#define XOR_BASE_ADDR_REG(unit,winNum)     (XOR_UNIT_BASE(unit)+(0x250 + ((winNum) * 4)))
+#define XOR_SIZE_MASK_REG(unit,winNum)     (XOR_UNIT_BASE(unit)+(0x270 + ((winNum) * 4)))
+#define XOR_HIGH_ADDR_REMAP_REG(unit,winNum) (XOR_UNIT_BASE(unit)+(0x290 + ((winNum) * 4)))
+
+/* XOR Engine [0..1] Window Control Registers (XExWCR) */
+#define XEXWCR_WIN_EN_OFFS(winNum)          (winNum)
+#define XEXWCR_WIN_EN_MASK(winNum)          (1 << (XEXWCR_WIN_EN_OFFS(winNum)))
+#define XEXWCR_WIN_EN_ENABLE(winNum)        (1 << (XEXWCR_WIN_EN_OFFS(winNum)))
+#define XEXWCR_WIN_EN_DISABLE(winNum)       (0 << (XEXWCR_WIN_EN_OFFS(winNum)))
+
+#define XEXWCR_WIN_ACC_OFFS(winNum)         ((2 * winNum) + 16)
+#define XEXWCR_WIN_ACC_MASK(winNum)         (3 << (XEXWCR_WIN_ACC_OFFS(winNum)))
+#define XEXWCR_WIN_ACC_NO_ACC(winNum)       (0 << (XEXWCR_WIN_ACC_OFFS(winNum)))
+#define XEXWCR_WIN_ACC_RO(winNum)           (1 << (XEXWCR_WIN_ACC_OFFS(winNum)))
+#define XEXWCR_WIN_ACC_RW(winNum)           (3 << (XEXWCR_WIN_ACC_OFFS(winNum)))
+
+/* XOR Engine Base Address Registers (XEBARx) */
+#define XEBARX_TARGET_OFFS                  (0)
+#define XEBARX_TARGET_MASK                  (0xF << XEBARX_TARGET_OFFS)
+#define XEBARX_ATTR_OFFS                    (8)
+#define XEBARX_ATTR_MASK                    (0xFF << XEBARX_ATTR_OFFS)
+#define XEBARX_BASE_OFFS                    (16)
+#define XEBARX_BASE_MASK                    (0xFFFF << XEBARX_BASE_OFFS)
+
+/* XOR Engine Size Mask Registers (XESMRx) */
+#define XESMRX_SIZE_MASK_OFFS               (16)
+#define XESMRX_SIZE_MASK_MASK               (0xFFFF << XESMRX_SIZE_MASK_OFFS)
+
+/* XOR Engine High Address Remap Register (XEHARRx1) */
+#define XEHARRX_REMAP_OFFS                  (0)
+#define XEHARRX_REMAP_MASK                  (0xFFFFFFFF << XEHARRX_REMAP_OFFS)
+
+typedef struct _mvXorDecWin
+{
+    MV_TARGET     target;
+    MV_ADDR_WIN   addrWin; /* An address window*/
+    MV_BOOL       enable;  /* Address decode window is enabled/disabled */
+ 
+}MV_XOR_DEC_WIN;
+
+MV_STATUS   mvXorInit (MV_VOID);
+MV_STATUS   mvXorTargetWinSet(MV_U32 unit, MV_U32 winNum,
+			      MV_XOR_DEC_WIN *pAddrDecWin);
+MV_STATUS   mvXorTargetWinGet(MV_U32 unit, MV_U32 winNum,
+			      MV_XOR_DEC_WIN *pAddrDecWin);
+MV_STATUS   mvXorTargetWinEnable(MV_U32 unit, 
+			      MV_U32 winNum, MV_BOOL enable);
+MV_STATUS   mvXorProtWinSet (MV_U32 unit,MV_U32 chan, MV_U32 winNum, MV_BOOL access, 
+                             MV_BOOL write);
+MV_STATUS   mvXorPciRemap(MV_U32 unit, MV_U32 winNum, MV_U32 addrHigh);
+
+MV_VOID     mvXorAddrDecShow(MV_VOID);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c
new file mode 100644
index 00000000..80325fc1
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c
@@ -0,0 +1,75 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "device/mvDevice.h"
+
+/* defines  */       
+#ifdef MV_DEBUG         
+	#define DB(x)	x
+#else                
+	#define DB(x)    
+#endif	             
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h
new file mode 100644
index 00000000..93507796
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h
@@ -0,0 +1,74 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvDeviceH
+#define __INCmvDeviceH
+
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "device/mvDeviceRegs.h"
+
+
+#endif /* #ifndef __INCmvDeviceH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h
new file mode 100644
index 00000000..80778ad9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h
@@ -0,0 +1,101 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvDeviceRegsH
+#define __INCmvDeviceRegsH
+
+#ifndef MV_ASMLANGUAGE
+#include "ctrlEnv/mvCtrlEnvLib.h"
+/* This enumerator describes the Marvell controller possible devices that   */
+/* can be connected to its device interface.                                */
+typedef enum _mvDevice
+{
+#if defined(MV_INCLUDE_DEVICE_CS0)
+	DEV_CS0 = 0,    /* Device connected to dev CS[0]    */
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS1)
+	DEV_CS1 = 1,        /* Device connected to dev CS[1]    */
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS2)
+	DEV_CS2 = 2,        /* Device connected to dev CS[2]    */
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS3)
+	DEV_CS3 = 3,        /* Device connected to dev CS[2]    */
+#endif
+#if defined(MV_INCLUDE_DEVICE_CS4)
+	DEV_CS4 = 4,        /* Device connected to BOOT dev    */
+#endif
+	MV_DEV_MAX_CS = MV_DEVICE_MAX_CS
+}MV_DEVICE;
+
+ 
+#endif /* MV_ASMLANGUAGE */
+
+
+#define NAND_CTRL_REG		0x10470
+
+#define NAND_ACTCEBOOT_BIT	BIT1
+
+
+#endif /* #ifndef __INCmvDeviceRegsH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/mvCompVer.txt
new file mode 100644
index 00000000..40531164
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/kw_family/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.5
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c
new file mode 100644
index 00000000..75f7e88c
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c
@@ -0,0 +1,211 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+*******************************************************************************/
+/*******************************************************************************
+* mvOsCpuArchLib.c - Marvell CPU architecture library
+*
+* DESCRIPTION:
+*       This library introduce Marvell API for OS dependent CPU architecture 
+*       APIs. This library introduce single CPU architecture services APKI 
+*       cross OS.
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+/* includes */
+#include <asm/processor.h>
+#include "mvOs.h"
+
+static MV_U32 read_p15_c0 (void);
+
+/* defines  */
+#define ARM_ID_REVISION_OFFS	0
+#define ARM_ID_REVISION_MASK	(0xf << ARM_ID_REVISION_OFFS)
+
+#define ARM_ID_PART_NUM_OFFS	4
+#define ARM_ID_PART_NUM_MASK	(0xfff << ARM_ID_PART_NUM_OFFS)
+
+#define ARM_ID_ARCH_OFFS	16
+#define ARM_ID_ARCH_MASK	(0xf << ARM_ID_ARCH_OFFS)
+
+#define ARM_ID_VAR_OFFS		20
+#define ARM_ID_VAR_MASK		(0xf << ARM_ID_VAR_OFFS)
+
+#define ARM_ID_ASCII_OFFS	24
+#define ARM_ID_ASCII_MASK	(0xff << ARM_ID_ASCII_OFFS)
+
+
+
+void* mvOsIoCachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr,
+			  MV_U32 *memHandle)
+{
+    void *p = kmalloc( size, GFP_KERNEL );
+    *pPhyAddr = pci_map_single( osHandle, p, 0, PCI_DMA_BIDIRECTIONAL );
+    return p;
+}
+void* mvOsIoUncachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr,
+			    MV_U32 *memHandle)
+{
+    return pci_alloc_consistent( osHandle, size, (dma_addr_t *)pPhyAddr );
+}
+ 
+void mvOsIoUncachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr,
+			 MV_U32 memHandle)
+{
+    return pci_free_consistent( osHandle, size, pVirtAddr, (dma_addr_t)phyAddr );
+} 
+                                                                                                                                               
+void mvOsIoCachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr,
+		       MV_U32 memHandle )
+{
+    return kfree( pVirtAddr );
+}
+ 
+int mvOsRand(void)
+{
+    int rand;
+    get_random_bytes(&rand, sizeof(rand) );
+    return rand;
+}
+
+/*******************************************************************************
+* mvOsCpuVerGet() - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit CPU Revision
+*
+*******************************************************************************/
+MV_U32 mvOsCpuRevGet( MV_VOID )
+{
+	return ((read_p15_c0() & ARM_ID_REVISION_MASK ) >> ARM_ID_REVISION_OFFS);
+}
+/*******************************************************************************
+* mvOsCpuPartGet() - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit CPU Part number
+*
+*******************************************************************************/
+MV_U32 mvOsCpuPartGet( MV_VOID )
+{
+	return ((read_p15_c0() & ARM_ID_PART_NUM_MASK ) >> ARM_ID_PART_NUM_OFFS);
+}
+/*******************************************************************************
+* mvOsCpuArchGet() - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit CPU Architicture number
+*
+*******************************************************************************/
+MV_U32 mvOsCpuArchGet( MV_VOID )
+{
+    return ((read_p15_c0() & ARM_ID_ARCH_MASK ) >> ARM_ID_ARCH_OFFS);
+}
+/*******************************************************************************
+* mvOsCpuVarGet() - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit CPU Variant number
+*
+*******************************************************************************/
+MV_U32 mvOsCpuVarGet( MV_VOID )
+{
+    return ((read_p15_c0() & ARM_ID_VAR_MASK ) >> ARM_ID_VAR_OFFS);
+}
+/*******************************************************************************
+* mvOsCpuAsciiGet() - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit CPU Variant number
+*
+*******************************************************************************/
+MV_U32 mvOsCpuAsciiGet( MV_VOID )
+{
+    return ((read_p15_c0() & ARM_ID_ASCII_MASK ) >> ARM_ID_ASCII_OFFS);
+}
+
+
+
+/*
+static unsigned long read_p15_c0 (void)
+*/
+/* read co-processor 15, register #0 (ID register) */
+static MV_U32 read_p15_c0 (void)
+{
+	MV_U32 value;
+
+	__asm__ __volatile__(
+		"mrc	p15, 0, %0, c0, c0, 0   @ read control reg\n"
+		: "=r" (value)
+		:
+		: "memory");
+
+	return value;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h
new file mode 100644
index 00000000..8da562a4
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h
@@ -0,0 +1,423 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+*******************************************************************************/
+#ifndef _MV_OS_LNX_H_
+#define _MV_OS_LNX_H_
+                                                                                                                                               
+                                                                                                                                               
+#ifdef __KERNEL__
+/* for kernel space */
+#include <linux/autoconf.h>
+#include <linux/interrupt.h>
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/reboot.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/major.h>
+#include <linux/blkdev.h>
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+  
+#include <asm/system.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <asm/hardirq.h>
+#include <asm/dma.h>
+#include <asm/io.h>
+ 
+#include <linux/random.h>
+
+#include "dbg-trace.h"
+
+extern void mv_early_printk(char *fmt,...);
+
+#define MV_ASM              __asm__ __volatile__  
+#define INLINE              inline
+#define MV_TRC_REC	        TRC_REC
+#define mvOsPrintf          printk
+#define mvOsEarlyPrintf	    mv_early_printk
+#define mvOsOutput          printk
+#define mvOsSPrintf         sprintf
+#define mvOsMalloc(_size_)  kmalloc(_size_,GFP_ATOMIC)
+#define mvOsFree            kfree
+#define mvOsMemcpy          memcpy
+#define mvOsSleep(_mils_)   mdelay(_mils_)
+#define mvOsTaskLock()
+#define mvOsTaskUnlock()
+#define strtol              simple_strtoul
+#define mvOsDelay(x)        mdelay(x)
+#define mvOsUDelay(x)       udelay(x)
+#define mvCopyFromOs        copy_from_user
+#define mvCopyToOs          copy_to_user
+
+ 
+#include "mvTypes.h"
+#include "mvCommon.h"
+  
+#ifdef MV_NDEBUG
+#define mvOsAssert(cond)
+#else
+#define mvOsAssert(cond) { do { if(!(cond)) { BUG(); } }while(0); }
+#endif /* MV_NDEBUG */
+ 
+#else /* __KERNEL__ */
+ 
+/* for user space applications */
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+ 
+#define INLINE inline
+#define mvOsPrintf printf
+#define mvOsOutput printf
+#define mvOsMalloc(_size_) malloc(_size_)
+#define mvOsFree free
+#define mvOsAssert(cond) assert(cond)
+ 
+#endif /* __KERNEL__ */                                                                                                                                               
+#define mvOsIoVirtToPhy(pDev, pVirtAddr)                            \
+    pci_map_single( (pDev), (pVirtAddr), 0, PCI_DMA_BIDIRECTIONAL )
+
+#define mvOsCacheClear(pDev, p, size )                              \
+    pci_map_single( (pDev), (p), (size), PCI_DMA_BIDIRECTIONAL)
+ 
+#define mvOsCacheFlush(pDev, p, size )                              \
+    pci_map_single( (pDev), (p), (size), PCI_DMA_TODEVICE)
+ 
+#define mvOsCacheInvalidate(pDev, p, size)                          \
+    pci_map_single( (pDev), (p), (size), PCI_DMA_FROMDEVICE )
+
+#define mvOsCacheUnmap(pDev, phys, size)                          \
+    pci_unmap_single( (pDev), (dma_addr_t)(phys), (size), PCI_DMA_FROMDEVICE )
+
+
+#define CPU_PHY_MEM(x)              (MV_U32)x
+#define CPU_MEMIO_CACHED_ADDR(x)    (void*)x
+#define CPU_MEMIO_UNCACHED_ADDR(x)  (void*)x
+
+
+/* CPU architecture dependent 32, 16, 8 bit read/write IO addresses */
+#define MV_MEMIO32_WRITE(addr, data)    \
+    ((*((volatile unsigned int*)(addr))) = ((unsigned int)(data)))
+
+#define MV_MEMIO32_READ(addr)           \
+    ((*((volatile unsigned int*)(addr))))
+
+#define MV_MEMIO16_WRITE(addr, data)    \
+    ((*((volatile unsigned short*)(addr))) = ((unsigned short)(data)))
+
+#define MV_MEMIO16_READ(addr)           \
+    ((*((volatile unsigned short*)(addr))))
+
+#define MV_MEMIO8_WRITE(addr, data)     \
+    ((*((volatile unsigned char*)(addr))) = ((unsigned char)(data)))
+
+#define MV_MEMIO8_READ(addr)            \
+    ((*((volatile unsigned char*)(addr))))
+
+
+/* No Fast Swap implementation (in assembler) for ARM */
+#define MV_32BIT_LE_FAST(val)            MV_32BIT_LE(val)
+#define MV_16BIT_LE_FAST(val)            MV_16BIT_LE(val)
+#define MV_32BIT_BE_FAST(val)            MV_32BIT_BE(val)
+#define MV_16BIT_BE_FAST(val)            MV_16BIT_BE(val)
+    
+/* 32 and 16 bit read/write in big/little endian mode */
+
+/* 16bit write in little endian mode */
+#define MV_MEMIO_LE16_WRITE(addr, data) \
+        MV_MEMIO16_WRITE(addr, MV_16BIT_LE_FAST(data))
+
+/* 16bit read in little endian mode */
+static __inline MV_U16 MV_MEMIO_LE16_READ(MV_U32 addr)
+{
+    MV_U16 data;
+
+    data= (MV_U16)MV_MEMIO16_READ(addr);
+
+    return (MV_U16)MV_16BIT_LE_FAST(data);
+}
+
+/* 32bit write in little endian mode */
+#define MV_MEMIO_LE32_WRITE(addr, data) \
+        MV_MEMIO32_WRITE(addr, MV_32BIT_LE_FAST(data))
+
+/* 32bit read in little endian mode */
+static __inline MV_U32 MV_MEMIO_LE32_READ(MV_U32 addr)
+{
+    MV_U32 data;
+
+    data= (MV_U32)MV_MEMIO32_READ(addr);
+
+    return (MV_U32)MV_32BIT_LE_FAST(data);
+}
+
+static __inline void mvOsBCopy(char* srcAddr, char* dstAddr, int byteCount)
+{
+    while(byteCount != 0)
+    {
+        *dstAddr = *srcAddr;
+        dstAddr++;
+        srcAddr++;
+        byteCount--;
+    }
+}
+
+static INLINE MV_U64 mvOsDivMod64(MV_U64 divided, MV_U64 divisor, MV_U64* modulu)
+{
+    MV_U64  division = 0;
+
+    if(divisor == 1)
+	return divided;
+
+    while(divided >= divisor)
+    {
+	    division++;
+	    divided -= divisor;
+    }
+    if (modulu != NULL)
+        *modulu = divided;
+
+    return division;
+}
+
+#if defined(MV_BRIDGE_SYNC_REORDER)
+extern MV_U32 *mvUncachedParam;
+
+static __inline void mvOsBridgeReorderWA(void)
+{
+	volatile MV_U32 val = 0;
+
+	val = mvUncachedParam[0];
+}
+#endif
+
+
+/* Flash APIs */
+#define MV_FL_8_READ            MV_MEMIO8_READ
+#define MV_FL_16_READ           MV_MEMIO_LE16_READ
+#define MV_FL_32_READ           MV_MEMIO_LE32_READ
+#define MV_FL_8_DATA_READ       MV_MEMIO8_READ
+#define MV_FL_16_DATA_READ      MV_MEMIO16_READ
+#define MV_FL_32_DATA_READ      MV_MEMIO32_READ
+#define MV_FL_8_WRITE           MV_MEMIO8_WRITE
+#define MV_FL_16_WRITE          MV_MEMIO_LE16_WRITE
+#define MV_FL_32_WRITE          MV_MEMIO_LE32_WRITE
+#define MV_FL_8_DATA_WRITE      MV_MEMIO8_WRITE
+#define MV_FL_16_DATA_WRITE     MV_MEMIO16_WRITE
+#define MV_FL_32_DATA_WRITE     MV_MEMIO32_WRITE
+
+
+/* CPU cache information */
+#define CPU_I_CACHE_LINE_SIZE   32    /* 2do: replace 32 with linux core macro */
+#define CPU_D_CACHE_LINE_SIZE   32    /* 2do: replace 32 with linux core macro */
+
+#ifdef CONFIG_L2_CACHE_ENABLE
+/* Data cache flush one line */
+#define mvOsCacheLineFlushInv(handle, addr)                     \
+{                                                               \
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c14, 1" : : "r" (addr));\
+  __asm__ __volatile__ ("mcr p15, 1, %0, c15, c10, 1" : : "r" (addr));\
+  __asm__ __volatile__ ("mcr p15, 0, r0, c7, c10, 4");		\
+}
+
+#else
+
+/* Data cache flush one line */
+#define mvOsCacheLineFlushInv(handle, addr)                     \
+{                                                               \
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c14, 1" : : "r" (addr));\
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" : : "r" (addr)); \
+}
+#endif
+ 
+#ifdef CONFIG_L2_CACHE_ENABLE
+#define mvOsCacheLineInv(handle,addr)                           \
+{                                                               \
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c6, 1" : : "r" (addr)); \
+ __asm__ __volatile__ ("mcr p15, 1, %0, c15, c11, 1" : : "r" (addr)); \
+}
+#else
+#define mvOsCacheLineInv(handle,addr)                           \
+{                                                               \
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c6, 1" : : "r" (addr)); \
+}
+#endif
+
+#ifdef CONFIG_L2_CACHE_ENABLE
+/* Data cache flush one line */
+#define mvOsCacheLineFlush(handle, addr)                     \
+{                                                               \
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 1" : : "r" (addr));\
+  __asm__ __volatile__ ("mcr p15, 1, %0, c15, c9, 1" : : "r" (addr));\
+  __asm__ __volatile__ ("mcr p15, 0, r0, c7, c10, 4");          \
+}
+
+#else
+/* Data cache flush one line */
+#define mvOsCacheLineFlush(handle, addr)                     \
+{                                                               \
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 1" : : "r" (addr));\
+  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" : : "r" (addr)); \
+}
+#endif 
+
+static __inline void mvOsPrefetch(const void *ptr)
+{
+#ifdef CONFIG_USE_DSP
+        __asm__ __volatile__(
+                "pld\t%0"
+                :
+                : "o" (*(char *)ptr)
+                : "cc");
+#else
+	return;
+#endif
+}
+
+
+/* Flush CPU pipe */
+#define CPU_PIPE_FLUSH
+
+
+
+
+
+/* register manipulations  */
+
+/******************************************************************************
+* This debug function enable the write of each register that u-boot access to 
+* to an array in the DRAM, the function record only MV_REG_WRITE access.
+* The function could not be operate when booting from flash.
+* In order to print the array we use the printreg command.
+******************************************************************************/
+/* #define REG_DEBUG */
+#if defined(REG_DEBUG)
+extern int reg_arry[2048][2];
+extern int reg_arry_index;
+#endif
+
+/* Marvell controller register read/write macros */
+#define MV_REG_VALUE(offset)          \
+                (MV_MEMIO32_READ((INTER_REGS_BASE | (offset))))
+
+#define MV_REG_READ(offset)             \
+        (MV_MEMIO_LE32_READ(INTER_REGS_BASE | (offset)))
+
+#if defined(REG_DEBUG)
+#define MV_REG_WRITE(offset, val)    \
+        MV_MEMIO_LE32_WRITE((INTER_REGS_BASE | (offset)), (val)); \
+        { \
+                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
+                reg_arry[reg_arry_index][1] = (val);\
+                reg_arry_index++;\
+        }
+#else
+#define MV_REG_WRITE(offset, val)    \
+        MV_MEMIO_LE32_WRITE((INTER_REGS_BASE | (offset)), (val));
+#endif
+                                                
+#define MV_REG_BYTE_READ(offset)        \
+        (MV_MEMIO8_READ((INTER_REGS_BASE | (offset))))
+
+#if defined(REG_DEBUG)
+#define MV_REG_BYTE_WRITE(offset, val)  \
+        MV_MEMIO8_WRITE((INTER_REGS_BASE | (offset)), (val)); \
+        { \
+                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
+                reg_arry[reg_arry_index][1] = (val);\
+                reg_arry_index++;\
+        }
+#else
+#define MV_REG_BYTE_WRITE(offset, val)  \
+        MV_MEMIO8_WRITE((INTER_REGS_BASE | (offset)), (val))
+#endif
+
+#if defined(REG_DEBUG)
+#define MV_REG_BIT_SET(offset, bitMask)                 \
+        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
+         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) | \
+          MV_32BIT_LE_FAST(bitMask)))); \
+        { \
+                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
+                reg_arry[reg_arry_index][1] = (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)));\
+                reg_arry_index++;\
+        }
+#else
+#define MV_REG_BIT_SET(offset, bitMask)                 \
+        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
+         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) | \
+          MV_32BIT_LE_FAST(bitMask))))
+#endif
+        
+#if defined(REG_DEBUG)
+#define MV_REG_BIT_RESET(offset,bitMask)                \
+        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
+         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) & \
+          MV_32BIT_LE_FAST(~bitMask)))); \
+        { \
+                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
+                reg_arry[reg_arry_index][1] = (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)));\
+                reg_arry_index++;\
+        }
+#else
+#define MV_REG_BIT_RESET(offset,bitMask)                \
+        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
+         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) & \
+          MV_32BIT_LE_FAST(~bitMask))))
+#endif
+
+
+
+/* ARM architecture APIs */
+MV_U32  mvOsCpuRevGet (MV_VOID);
+MV_U32  mvOsCpuPartGet (MV_VOID);
+MV_U32  mvOsCpuArchGet (MV_VOID);
+MV_U32  mvOsCpuVarGet (MV_VOID);
+MV_U32  mvOsCpuAsciiGet (MV_VOID);
+
+/*  Other APIs  */
+void* mvOsIoCachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr, MV_U32 *memHandle);
+void* mvOsIoUncachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr, MV_U32 *memHandle );
+void mvOsIoUncachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr, MV_U32 memHandle );
+void mvOsIoCachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr, MV_U32 memHandle );
+int mvOsRand(void);
+
+#endif /* _MV_OS_LNX_H_ */
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h
new file mode 100644
index 00000000..c925a9e9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h
@@ -0,0 +1,158 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+*******************************************************************************/
+/*******************************************************************************
+* mvOsLinux.h - O.S. interface header file for Linux  
+*
+* DESCRIPTION:
+*       This header file contains OS dependent definition under Linux
+*
+* DEPENDENCIES:
+*       Linux kernel header files.
+*
+* FILE REVISION NUMBER:
+*       $Revision: 1.1 $
+*******************************************************************************/
+
+#ifndef __INCmvOsLinuxh
+#define __INCmvOsLinuxh
+
+/* Includes */
+#include <linux/autoconf.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/timer.h>
+#include <linux/mm.h>
+#include <linux/interrupt.h>
+#include <linux/major.h>
+#include <linux/errno.h>
+#include <linux/genhd.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/ide.h>
+#include <linux/pci.h>
+
+#include <asm/byteorder.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include "mvOs.h"
+
+
+/* Definitions */
+#define MV_DEFAULT_QUEUE_DEPTH 2
+#define MV_SATA_SUPPORT_EDMA_SINGLE_DATA_REGION
+#define MV_SATA_SUPPORT_GEN2E_128_QUEUE_LEN
+
+#ifdef CONFIG_MV88F6082
+ #define MV_SATA_OVERRIDE_SW_QUEUE_SIZE
+ #define MV_SATA_REQUESTED_SW_QUEUE_SIZE 2
+ #undef MV_SATA_SUPPORT_GEN2E_128_QUEUE_LEN
+#endif
+
+/* System dependent macro for flushing CPU write cache */
+#if defined (MV_BRIDGE_SYNC_REORDER)
+#define MV_CPU_WRITE_BUFFER_FLUSH()	do {	\
+						wmb();	\
+						mvOsBridgeReorderWA();	\
+					} while (0)
+#else
+#define MV_CPU_WRITE_BUFFER_FLUSH()     wmb()
+#endif /* CONFIG_MV78XX0 */
+
+/* System dependent little endian from / to CPU conversions */
+#define MV_CPU_TO_LE16(x)   cpu_to_le16(x)
+#define MV_CPU_TO_LE32(x)   cpu_to_le32(x)
+
+#define MV_LE16_TO_CPU(x)   le16_to_cpu(x)
+#define MV_LE32_TO_CPU(x)   le32_to_cpu(x)
+
+#ifdef __BIG_ENDIAN_BITFIELD
+#define MV_BIG_ENDIAN_BITFIELD
+#endif
+
+/* System dependent register read / write in byte/word/dword variants */
+#define MV_REG_WRITE_BYTE(base, offset, val)    writeb(val, base + offset)
+#define MV_REG_WRITE_WORD(base, offset, val)    writew(val, base + offset)
+#define MV_REG_WRITE_DWORD(base, offset, val)   writel(val, base + offset)
+#define MV_REG_READ_BYTE(base, offset)          readb(base + offset)
+#define MV_REG_READ_WORD(base, offset)          readw(base + offset)
+#define MV_REG_READ_DWORD(base, offset)         readl(base + offset)
+
+
+/* Typedefs    */
+
+/* System dependant typedefs */
+typedef void            *MV_VOID_PTR;
+typedef u32             *MV_U32_PTR;
+typedef u16             *MV_U16_PTR;
+typedef u8              *MV_U8_PTR;
+typedef char            *MV_CHAR_PTR;
+typedef void            *MV_BUS_ADDR_T;
+typedef unsigned long   MV_CPU_FLAGS;
+
+
+/* Structures  */
+/* System dependent structure */
+typedef struct mvOsSemaphore
+{
+  int notUsed;
+} MV_OS_SEMAPHORE;
+
+
+/* Functions (User implemented)*/
+
+/* Semaphore init, take and release */
+#define mvOsSemInit(x) MV_TRUE
+#define mvOsSemTake(x)
+#define mvOsSemRelease(x)
+
+/* Interrupt masking and unmasking functions */
+MV_CPU_FLAGS mvOsSaveFlagsAndMaskCPUInterrupts(MV_VOID);
+MV_VOID      mvOsRestoreFlags(MV_CPU_FLAGS);
+
+/* Delay function in micro seconds resolution */
+void mvMicroSecondsDelay(MV_VOID_PTR, MV_U32);
+
+/* Typedefs    */
+typedef enum mvBoolean
+{
+    MV_SFALSE, MV_STRUE
+} MV_BOOLEAN;
+
+/* System logging function */
+#include "mvLog.h"
+/* Enable READ/WRITE Long SCSI command only when driver is compiled for debugging */
+#ifdef MV_LOGGER
+#define MV_SATA_SUPPORT_READ_WRITE_LONG
+#endif
+
+#define MV_IAL_LOG_ID       3
+
+#endif /* __INCmvOsLinuxh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h
new file mode 100644
index 00000000..d761060c
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h
@@ -0,0 +1,375 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+
+*******************************************************************************/
+/*******************************************************************************
+* mvSysHwCfg.h - Marvell system HW configuration file
+*
+* DESCRIPTION:
+*       None.
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+#ifndef __INCmvSysHwConfigh
+#define __INCmvSysHwConfigh
+
+#include "../../../../include/linux/autoconf.h"
+
+#define CONFIG_MARVELL	1
+
+/* includes */
+#define _1K         0x00000400
+#define _4K         0x00001000
+#define _8K         0x00002000
+#define _16K        0x00004000
+#define _32K        0x00008000
+#define _64K        0x00010000
+#define _128K       0x00020000
+#define _256K       0x00040000
+#define _512K       0x00080000
+
+#define _1M         0x00100000
+#define _2M         0x00200000
+#define _4M         0x00400000
+#define _8M         0x00800000
+#define _16M        0x01000000
+#define _32M        0x02000000
+#define _64M        0x04000000
+#define _128M       0x08000000
+#define _256M       0x10000000
+#define _512M       0x20000000
+
+#define _1G         0x40000000
+#define _2G         0x80000000
+
+/****************************************/
+/* Soc supporeted Units definitions	*/
+/****************************************/
+
+#ifdef CONFIG_MV_INCLUDE_PEX
+#define MV_INCLUDE_PEX
+#endif
+#ifdef CONFIG_MV_INCLUDE_TWSI
+#define MV_INCLUDE_TWSI
+#endif
+#ifdef CONFIG_MV_INCLUDE_CESA
+#define MV_INCLUDE_CESA
+#endif
+#ifdef CONFIG_MV_INCLUDE_GIG_ETH
+#define MV_INCLUDE_GIG_ETH
+#endif
+#ifdef CONFIG_MV_INCLUDE_INTEG_SATA
+#define MV_INCLUDE_INTEG_SATA
+#define MV_INCLUDE_SATA
+#endif
+#ifdef CONFIG_MV_INCLUDE_USB
+#define MV_INCLUDE_USB
+#define MV_USB_VOLTAGE_FIX
+#endif
+#ifdef CONFIG_MV_INCLUDE_NAND
+#define MV_INCLUDE_NAND
+#endif
+#ifdef CONFIG_MV_INCLUDE_TDM
+#define MV_INCLUDE_TDM
+#endif
+#ifdef CONFIG_MV_INCLUDE_XOR
+#define MV_INCLUDE_XOR
+#endif
+#ifdef CONFIG_MV_INCLUDE_TWSI
+#define MV_INCLUDE_TWSI
+#endif
+#ifdef CONFIG_MV_INCLUDE_UART
+#define MV_INCLUDE_UART
+#endif
+#ifdef CONFIG_MV_INCLUDE_SPI
+#define MV_INCLUDE_SPI
+#endif
+#ifdef CONFIG_MV_INCLUDE_SFLASH_MTD
+#define MV_INCLUDE_SFLASH_MTD
+#endif
+#ifdef CONFIG_MV_INCLUDE_AUDIO
+#define MV_INCLUDE_AUDIO
+#endif
+#ifdef CONFIG_MV_INCLUDE_TS
+#define MV_INCLUDE_TS
+#endif
+#ifdef CONFIG_MV_INCLUDE_SDIO
+#define MV_INCLUDE_SDIO
+#endif
+
+
+/* NAND flash stuff */
+#ifdef CONFIG_MV_NAND_BOOT
+#define MV_NAND_BOOT
+#endif
+#ifdef CONFIG_MV_NAND
+#define MV_NAND
+#endif
+
+/* SPI flash stuff */
+#ifdef CONFIG_MV_SPI_BOOT
+#define MV_SPI_BOOT
+#endif
+
+
+/****************************************************************/
+/************* General    configuration ********************/
+/****************************************************************/
+
+/* Enable Clock Power Control */
+#define MV_INCLUDE_CLK_PWR_CNTRL
+
+/* Disable the DEVICE BAR in the PEX */
+#define MV_DISABLE_PEX_DEVICE_BAR
+
+/* Allow the usage of early printings during initialization */
+#define MV_INCLUDE_EARLY_PRINTK
+
+/****************************************************************/
+/************* NFP configuration ********************************/
+/****************************************************************/
+#define MV_NFP_SEC_Q_SIZE		64
+#define MV_NFP_SEC_REQ_Q_SIZE		1000
+
+
+
+/****************************************************************/
+/************* CESA configuration ********************/
+/****************************************************************/
+
+#ifdef MV_INCLUDE_CESA
+
+#define MV_CESA_MAX_CHAN               4
+
+/* Use 2K of SRAM */
+#define MV_CESA_MAX_BUF_SIZE           1600
+
+#endif /* MV_INCLUDE_CESA */
+
+#if defined(CONFIG_MV_INCLUDE_GIG_ETH)
+
+#ifdef CONFIG_MV_NFP_STATS
+#define MV_FP_STATISTICS
+#else
+#undef MV_FP_STATISTICS
+#endif
+/* Default configuration for SKB_REUSE: 0 - Disabled, 1 - Enabled */
+#define MV_ETH_SKB_REUSE_DEFAULT    1
+/* Default configuration for TX_EN workaround: 0 - Disabled, 1 - Enabled */
+#define MV_ETH_TX_EN_DEFAULT        0
+
+/* un-comment if you want to perform tx_done from within the poll function */
+/* #define ETH_TX_DONE_ISR */
+
+/* put descriptors in uncached memory */
+/* #define ETH_DESCR_UNCACHED */
+
+/* Descriptors location: DRAM/internal-SRAM */
+#define ETH_DESCR_IN_SDRAM
+#undef  ETH_DESCR_IN_SRAM    /* No integrated SRAM in 88Fxx81 devices */
+
+#if defined(ETH_DESCR_IN_SRAM)
+#if defined(ETH_DESCR_UNCACHED)
+ #define ETH_DESCR_CONFIG_STR    "Uncached descriptors in integrated SRAM"
+#else
+ #define ETH_DESCR_CONFIG_STR    "Cached descriptors in integrated SRAM"
+#endif
+#elif defined(ETH_DESCR_IN_SDRAM)
+#if defined(ETH_DESCR_UNCACHED)
+ #define ETH_DESCR_CONFIG_STR    "Uncached descriptors in DRAM"
+#else
+ #define ETH_DESCR_CONFIG_STR    "Cached descriptors in DRAM"
+#endif
+#else 
+ #error "Ethernet descriptors location undefined"
+#endif /* ETH_DESCR_IN_SRAM or ETH_DESCR_IN_SDRAM*/
+
+/* SW Sync-Barrier: not relevant for 88fxx81*/
+/* Reasnable to define this macro when descriptors in SRAM and buffers in DRAM */
+/* In RX the CPU theoretically might see himself as the descriptor owner,      */
+/* although the buffer hadn't been written to DRAM yet. Performance cost.      */
+/* #define INCLUDE_SYNC_BARR */
+
+/* Buffers cache coherency method (buffers in DRAM) */
+#ifndef MV_CACHE_COHER_SW
+/* Taken from mvCommon.h */
+/* Memory uncached, HW or SW cache coherency is not needed */
+#define MV_UNCACHED             0   
+/* Memory cached, HW cache coherency supported in WriteThrough mode */
+#define MV_CACHE_COHER_HW_WT    1
+/* Memory cached, HW cache coherency supported in WriteBack mode */
+#define MV_CACHE_COHER_HW_WB    2
+/* Memory cached, No HW cache coherency, Cache coherency must be in SW */
+#define MV_CACHE_COHER_SW       3
+
+#endif
+
+/* DRAM cache coherency configuration */
+#define MV_CACHE_COHERENCY  MV_CACHE_COHER_SW
+
+
+#define ETHER_DRAM_COHER    MV_CACHE_COHER_SW   /* No HW coherency in 88Fxx81 devices */
+
+#if (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WB)
+ #define ETH_SDRAM_CONFIG_STR    "DRAM HW cache coherency (write-back)"
+#elif (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WT)
+ #define ETH_SDRAM_CONFIG_STR    "DRAM HW cache coherency (write-through)"
+#elif (ETHER_DRAM_COHER == MV_CACHE_COHER_SW)
+ #define ETH_SDRAM_CONFIG_STR    "DRAM SW cache-coherency"
+#elif (ETHER_DRAM_COHER == MV_UNCACHED)
+#   define ETH_SDRAM_CONFIG_STR  "DRAM uncached"
+#else
+ #error "Ethernet-DRAM undefined"
+#endif /* ETHER_DRAM_COHER */
+
+
+/****************************************************************/
+/************* Ethernet driver configuration ********************/
+/****************************************************************/
+
+/* port's default queueus */
+#define ETH_DEF_TXQ         0
+#define ETH_DEF_RXQ         0 
+
+#define MV_ETH_RX_Q_NUM     CONFIG_MV_ETH_RX_Q_NUM
+#define MV_ETH_TX_Q_NUM     CONFIG_MV_ETH_TX_Q_NUM
+
+/* interrupt coalescing setting */
+#define ETH_TX_COAL    		    200
+#define ETH_RX_COAL    		    200
+
+/* Checksum offloading */
+#define TX_CSUM_OFFLOAD
+#define RX_CSUM_OFFLOAD
+
+#endif /* CONFIG_MV_INCLUDE_GIG_ETH */
+
+/****************************************************************/
+/*************** Telephony configuration ************************/
+/****************************************************************/
+#if defined(CONFIG_MV_TDM_LINEAR_MODE)
+ #define MV_TDM_LINEAR_MODE
+#elif defined(CONFIG_MV_TDM_ULAW_MODE)
+ #define MV_TDM_ULAW_MODE
+#endif
+
+#if defined(CONFIG_MV_TDM_5CHANNELS)
+ #define MV_TDM_5CHANNELS 
+#endif
+
+#if defined(CONFIG_MV_TDM_USE_EXTERNAL_PCLK_SOURCE)
+ #define MV_TDM_USE_EXTERNAL_PCLK_SOURCE
+#endif
+
+/* We use the following registers to store DRAM interface pre configuration   */
+/* auto-detection results													  */
+/* IMPORTANT: We are using mask register for that purpose. Before writing     */
+/* to units mask register, make sure main maks register is set to disable     */
+/* all interrupts.                                                            */
+#define DRAM_BUF_REG0   0x30810 /* sdram bank 0 size            */  
+#define DRAM_BUF_REG1   0x30820 /* sdram config                 */
+#define DRAM_BUF_REG2   0x30830 /* sdram mode                   */
+#define DRAM_BUF_REG3   0x308c4 /* dunit control low            */          
+#define DRAM_BUF_REG4   0x60a90 /* sdram address control        */
+#define DRAM_BUF_REG5   0x60a94 /* sdram timing control low     */
+#define DRAM_BUF_REG6   0x60a98 /* sdram timing control high    */
+#define DRAM_BUF_REG7   0x60a9c /* sdram ODT control low        */
+#define DRAM_BUF_REG8   0x60b90 /* sdram ODT control high       */
+#define DRAM_BUF_REG9   0x60b94 /* sdram Dunit ODT control      */
+#define DRAM_BUF_REG10  0x60b98 /* sdram Extended Mode          */
+#define DRAM_BUF_REG11  0x60b9c /* sdram Ddr2 Time Low Reg      */
+#define DRAM_BUF_REG12  0x60a00 /* sdram Ddr2 Time High Reg     */
+#define DRAM_BUF_REG13  0x60a04 /* dunit Ctrl High              */
+#define DRAM_BUF_REG14  0x60b00 /* sdram second DIMM exist      */
+
+/* Following the pre-configuration registers default values restored after    */
+/* auto-detection is done                                                     */
+#define DRAM_BUF_REG_DV 0
+
+/* System Mapping */
+#define SDRAM_CS0_BASE  0x00000000
+#define SDRAM_CS0_SIZE  _256M
+
+#define SDRAM_CS1_BASE  0x10000000
+#define SDRAM_CS1_SIZE  _256M
+
+#define SDRAM_CS2_BASE  0x20000000
+#define SDRAM_CS2_SIZE  _256M
+
+#define SDRAM_CS3_BASE  0x30000000
+#define SDRAM_CS3_SIZE  _256M
+
+/* PEX */
+#define PEX0_MEM_BASE 0xe8000000
+#define PEX0_MEM_SIZE _128M
+
+#define PEX0_IO_BASE 0xf2000000
+#define PEX0_IO_SIZE _1M
+
+/* Device Chip Selects */
+#define NFLASH_CS_BASE 0xfa000000
+#define NFLASH_CS_SIZE _2M
+
+#define SPI_CS_BASE 0xf4000000
+#define SPI_CS_SIZE _16M
+
+#define CRYPT_ENG_BASE	0xf0000000
+#define CRYPT_ENG_SIZE	_2M
+
+#define BOOTDEV_CS_BASE	0xff800000
+#define BOOTDEV_CS_SIZE _8M
+
+/* CS2 - BOOTROM */
+#define DEVICE_CS2_BASE 0xff900000
+#define DEVICE_CS2_SIZE _1M
+
+/* PEX Work arround */
+/* the target we will use for the workarround */
+#define PEX_CONFIG_RW_WA_TARGET PEX0_MEM
+/*a flag that indicates if we are going to use the 
+size and base of the target we using for the workarround
+window */
+#define PEX_CONFIG_RW_WA_USE_ORIGINAL_WIN_VALUES 1
+/* if the above flag is 0 then the following values
+will be used for the workarround window base and size,
+otherwise the following defines will be ignored */
+#define PEX_CONFIG_RW_WA_BASE 0xF3000000
+#define PEX_CONFIG_RW_WA_SIZE _16M
+
+/* Internal registers: size is defined in Controllerenvironment */
+#define INTER_REGS_BASE	0xFEE00000
+
+/* DRAM detection stuff */
+#define MV_DRAM_AUTO_SIZE
+
+/* Board clock detection */
+#define TCLK_AUTO_DETECT    	/* Use Tclk auto detection   */
+#define SYSCLK_AUTO_DETECT	/* Use SysClk auto detection */
+#define PCLCK_AUTO_DETECT  	/* Use PClk auto detection   */
+#define L2CLK_AUTO_DETECT 	/* Use L2Clk auto detection   */
+
+/* PEX-PCI\PCI-PCI Bridge*/
+#define PCI0_IF_PTP		0		/* Bridge exist on pciIf0*/
+
+ 
+
+#endif /* __INCmvSysHwConfigh */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c
new file mode 100644
index 00000000..717c1507
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c
@@ -0,0 +1,376 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvCntmr.h"
+#include "cpu/mvCpu.h"
+
+/* defines  */       
+#ifdef MV_DEBUG         
+	#define DB(x)	x
+#else                
+	#define DB(x)    
+#endif	             
+
+extern unsigned int whoAmI(void);
+
+/*******************************************************************************
+* mvCntmrLoad - 
+*
+* DESCRIPTION:
+*       Load an init Value to a given counter/timer 
+*
+* INPUT:
+*       countNum - counter number
+*       value - value to be loaded
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
+*******************************************************************************/
+MV_STATUS mvCntmrLoad(MV_U32 countNum, MV_U32 value)
+{
+	if (countNum >= MV_CNTMR_MAX_COUNTER )
+	{
+
+		mvOsPrintf(("mvCntmrLoad: Err. Illigal counter number \n"));
+		return MV_BAD_PARAM;;
+
+	}
+
+	MV_REG_WRITE(CNTMR_RELOAD_REG(countNum),value);
+	MV_REG_WRITE(CNTMR_VAL_REG(countNum),value);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvCntmrRead - 
+*
+* DESCRIPTION:
+*  	Returns the value of the given Counter/Timer     
+*
+* INPUT:
+*       countNum - counter number
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_U32 counter value
+*******************************************************************************/
+MV_U32 mvCntmrRead(MV_U32 countNum)
+{
+	return MV_REG_READ(CNTMR_VAL_REG(countNum));
+}
+
+/*******************************************************************************
+* mvCntmrWrite - 
+*
+* DESCRIPTION:
+*  	Returns the value of the given Counter/Timer     
+*
+* INPUT:
+*       countNum - counter number
+*		countVal - value to write
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None
+*******************************************************************************/
+void mvCntmrWrite(MV_U32 countNum,MV_U32 countVal)
+{
+	MV_REG_WRITE(CNTMR_VAL_REG(countNum),countVal);
+}
+
+/*******************************************************************************
+* mvCntmrCtrlSet - 
+*
+* DESCRIPTION:
+*  	Set the Control to a given counter/timer     
+*
+* INPUT:
+*       countNum - counter number
+*		pCtrl - pointer to MV_CNTMR_CTRL structure 
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
+*******************************************************************************/
+MV_STATUS mvCntmrCtrlSet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl)
+{
+	MV_U32 cntmrCtrl;
+
+	if (countNum >= MV_CNTMR_MAX_COUNTER )
+	{
+
+		DB(mvOsPrintf(("mvCntmrCtrlSet: Err. Illigal counter number \n")));
+		return MV_BAD_PARAM;;
+
+	}
+
+	/* read control register */
+	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
+
+	
+	if (pCtrl->enable)	/* enable counter\timer */
+	{
+		cntmrCtrl |= CTCR_ARM_TIMER_EN(countNum);
+	}
+	else	/* disable counter\timer */
+	{
+		cntmrCtrl &= ~CTCR_ARM_TIMER_EN(countNum);
+	}
+
+	if ( pCtrl->autoEnable ) /* Auto mode */
+	{
+		cntmrCtrl |= CTCR_ARM_TIMER_AUTO_EN(countNum);		
+
+	}
+	else 	/* no auto mode */
+	{
+		cntmrCtrl &= ~CTCR_ARM_TIMER_AUTO_EN(countNum);
+	}
+
+	MV_REG_WRITE(CNTMR_CTRL_REG,cntmrCtrl);
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvCntmrCtrlGet - 
+*
+* DESCRIPTION:
+*  	Get the Control value of a given counter/timer     
+*
+* INPUT:
+*       countNum - counter number
+*		pCtrl - pointer to MV_CNTMR_CTRL structure 
+*
+* OUTPUT:
+*       Counter\Timer control value
+*
+* RETURN:
+*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
+*******************************************************************************/
+MV_STATUS mvCntmrCtrlGet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl)
+{
+	MV_U32 cntmrCtrl;
+
+	if (countNum >= MV_CNTMR_MAX_COUNTER )
+	{
+		DB(mvOsPrintf(("mvCntmrCtrlGet: Err. Illigal counter number \n")));
+		return MV_BAD_PARAM;;
+	}
+
+	/* read control register */
+	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
+
+	/* enable counter\timer */
+	if (cntmrCtrl & CTCR_ARM_TIMER_EN(countNum))
+	{
+		pCtrl->enable = MV_TRUE;
+	}
+	else
+	{
+		pCtrl->enable = MV_FALSE;
+	}
+
+	/* counter mode */
+	if (cntmrCtrl & CTCR_ARM_TIMER_AUTO_EN(countNum))
+	{
+		pCtrl->autoEnable = MV_TRUE;
+	}
+	else
+	{
+		pCtrl->autoEnable = MV_FALSE;
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvCntmrEnable - 
+*
+* DESCRIPTION:
+*  	Set the Enable-Bit to logic '1' ==> starting the counter     
+*
+* INPUT:
+*       countNum - counter number
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
+*******************************************************************************/
+MV_STATUS mvCntmrEnable(MV_U32 countNum)
+{
+	MV_U32 cntmrCtrl;
+
+	if (countNum >= MV_CNTMR_MAX_COUNTER )
+	{
+
+		DB(mvOsPrintf(("mvCntmrEnable: Err. Illigal counter number \n")));
+		return MV_BAD_PARAM;;
+
+	}
+
+	/* read control register */
+	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
+
+	/* enable counter\timer */
+	cntmrCtrl |= CTCR_ARM_TIMER_EN(countNum);
+
+
+	MV_REG_WRITE(CNTMR_CTRL_REG,cntmrCtrl);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvCntmrDisable - 
+*
+* DESCRIPTION:
+*  	Stop the counter/timer running, and returns its Value     
+*
+* INPUT:
+*       countNum - counter number
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_U32 counter\timer value
+*******************************************************************************/
+MV_STATUS mvCntmrDisable(MV_U32 countNum)
+{
+	MV_U32 cntmrCtrl;
+
+	if (countNum >= MV_CNTMR_MAX_COUNTER )
+	{
+
+		DB(mvOsPrintf(("mvCntmrDisable: Err. Illigal counter number \n")));
+		return MV_BAD_PARAM;;
+
+	}
+
+	/* read control register */
+	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
+
+	/* disable counter\timer */
+	cntmrCtrl &= ~CTCR_ARM_TIMER_EN(countNum);
+
+	MV_REG_WRITE(CNTMR_CTRL_REG,cntmrCtrl);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvCntmrStart - 
+*
+* DESCRIPTION:
+*  	Combined all the sub-operations above to one function: Load,setMode,Enable     
+*
+* INPUT:
+*       countNum - counter number
+*		value - value of the counter\timer to be set
+*		pCtrl - pointer to MV_CNTMR_CTRL structure 
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
+*******************************************************************************/
+MV_STATUS mvCntmrStart(MV_U32 countNum, MV_U32 value,
+                       MV_CNTMR_CTRL *pCtrl)
+{
+
+	if (countNum >= MV_CNTMR_MAX_COUNTER )
+	{
+
+		mvOsPrintf(("mvCntmrDisable: Err. Illigal counter number \n"));
+		return MV_BAD_PARAM;;
+
+	}
+
+	/* load value onto counter\timer */
+	mvCntmrLoad(countNum,value);
+
+	/* set the counter to load in the first time */
+	mvCntmrWrite(countNum,value);
+
+	/* set control for timer \ cunter and enable */
+	mvCntmrCtrlSet(countNum,pCtrl);
+
+	return MV_OK;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h
new file mode 100644
index 00000000..b911d0f0
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h
@@ -0,0 +1,121 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvTmrWtdgh
+#define __INCmvTmrWtdgh
+
+/* includes */
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "cntmr/mvCntmrRegs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+
+
+/* This enumerator describe counters\watchdog numbers       */
+typedef enum _mvCntmrID
+{
+	TIMER0 = 0,               
+	TIMER1,
+	WATCHDOG,
+	TIMER2,               
+	TIMER3,
+}MV_CNTMR_ID;
+
+
+/* Counter / Timer control structure */
+typedef struct _mvCntmrCtrl
+{
+	MV_BOOL 				enable;		/* enable */
+	MV_BOOL					autoEnable;	/* counter/Timer                    */
+}MV_CNTMR_CTRL;
+
+
+/* Functions */
+
+/* Load an init Value to a given counter/timer */
+MV_STATUS mvCntmrLoad(MV_U32 countNum, MV_U32 value);
+
+/* Returns the value of the given Counter/Timer */
+MV_U32 mvCntmrRead(MV_U32 countNum);
+
+/* Write a value of the given Counter/Timer */
+void mvCntmrWrite(MV_U32 countNum,MV_U32 countVal);
+
+/* Set the Control to a given counter/timer */
+MV_STATUS mvCntmrCtrlSet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl);
+
+/* Get the value of a given counter/timer */
+MV_STATUS mvCntmrCtrlGet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl);
+
+/* Set the Enable-Bit to logic '1' ==> starting the counter. */
+MV_STATUS mvCntmrEnable(MV_U32 countNum);
+
+/* Stop the counter/timer running, and returns its Value. */
+MV_STATUS mvCntmrDisable(MV_U32 countNum);
+
+/* Combined all the sub-operations above to one function: Load,setMode,Enable */
+MV_STATUS mvCntmrStart(MV_U32 countNum, MV_U32 value,
+                       MV_CNTMR_CTRL *pCtrl);
+
+#endif /* __INCmvTmrWtdgh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h
new file mode 100644
index 00000000..b69bc66a
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h
@@ -0,0 +1,121 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvTmrwtdgRegsh
+#define __INCmvTmrwtdgRegsh
+
+/*******************************************/
+/* ARM Timers Registers Map                */
+/*******************************************/
+
+#define CNTMR_RELOAD_REG(tmrNum)	(CNTMR_BASE + 0x10 + (tmrNum)*8 + \
+						(((tmrNum) <= 3)?0:8))
+#define CNTMR_VAL_REG(tmrNum)		(CNTMR_BASE + 0x14 + (tmrNum)*8 + \
+						(((tmrNum) <= 3)?0:8))
+#define CNTMR_CTRL_REG			(CNTMR_BASE)
+
+/*For MV78XX0*/
+#define CNTMR_CAUSE_REG		(CPU_AHB_MBUS_CAUSE_INT_REG(whoAmI()))
+#define CNTMR_MASK_REG		(CPU_AHB_MBUS_MASK_INT_REG(whoAmI()))
+
+/* ARM Timers Registers Map                */
+/*******************************************/
+
+
+/* ARM Timers Control Register */
+/* CPU_TIMERS_CTRL_REG (CTCR) */
+
+#define TIMER0_NUM				0
+#define TIMER1_NUM				1
+#define WATCHDOG_NUM			2
+#define TIMER2_NUM				3
+#define TIMER3_NUM				4
+	
+#define CTCR_ARM_TIMER_EN_OFFS(cntr)	(cntr * 2)
+#define CTCR_ARM_TIMER_EN_MASK(cntr)	(1 << CTCR_ARM_TIMER_EN_OFFS)
+#define CTCR_ARM_TIMER_EN(cntr)			(1 << CTCR_ARM_TIMER_EN_OFFS(cntr))
+#define CTCR_ARM_TIMER_DIS(cntr)		(0 << CTCR_ARM_TIMER_EN_OFFS(cntr))
+	
+#define CTCR_ARM_TIMER_AUTO_OFFS(cntr)	((cntr * 2) + 1)
+#define CTCR_ARM_TIMER_AUTO_MASK(cntr)	BIT1
+#define CTCR_ARM_TIMER_AUTO_EN(cntr)	(1 << CTCR_ARM_TIMER_AUTO_OFFS(cntr))
+#define CTCR_ARM_TIMER_AUTO_DIS(cntr)	(0 << CTCR_ARM_TIMER_AUTO_OFFS(cntr))
+
+
+/* ARM Timer\Watchdog Reload Register */
+/* CNTMR_RELOAD_REG (TRR) */
+
+#define TRG_ARM_TIMER_REL_OFFS			0
+#define TRG_ARM_TIMER_REL_MASK			0xffffffff
+
+/* ARM Timer\Watchdog Register */
+/* CNTMR_VAL_REG (TVRG) */
+
+#define TVR_ARM_TIMER_OFFS			0
+#define TVR_ARM_TIMER_MASK			0xffffffff
+#define TVR_ARM_TIMER_MAX			0xffffffff
+
+
+
+#endif /* __INCmvTmrwtdgRegsh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCompVer.txt
new file mode 100644
index 00000000..85bfa612
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.3
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c
new file mode 100644
index 00000000..609e674e
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c
@@ -0,0 +1,207 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 "mvOs.h"
+#include "mvCpuCntrs.h"
+
+
+const static MV_CPU_CNTRS_OPS  mvCpuCntrsOpsTbl[MV_CPU_CNTRS_NUM][MV_CPU_CNTRS_OPS_NUM] =
+{   
+    /*0*/
+    {   
+        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_DCACHE_READ_HIT,       MV_CPU_CNTRS_DCACHE_READ_MISS,
+        MV_CPU_CNTRS_DCACHE_WRITE_HIT,  MV_CPU_CNTRS_DCACHE_WRITE_MISS,     MV_CPU_CNTRS_INSTRUCTIONS, 
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
+        MV_CPU_CNTRS_MMU_READ_LATENCY,  MV_CPU_CNTRS_ICACHE_READ_LATENCY,   MV_CPU_CNTRS_WB_WRITE_LATENCY,
+        MV_CPU_CNTRS_LDM_STM_HOLD,      MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
+        MV_CPU_CNTRS_DATA_WRITE_ACCESS, MV_CPU_CNTRS_DATA_READ_ACCESS,      MV_CPU_CNTRS_INVALID,
+        MV_CPU_CNTRS_BRANCH_PREDICT_COUNT,
+    },
+    /*1*/
+    {   
+        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_ICACHE_READ_MISS,      MV_CPU_CNTRS_DCACHE_READ_MISS,
+        MV_CPU_CNTRS_DCACHE_WRITE_MISS, MV_CPU_CNTRS_ITLB_MISS,             MV_CPU_CNTRS_SINGLE_ISSUE,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_BRANCH_RETIRED,        MV_CPU_CNTRS_INVALID, 
+        MV_CPU_CNTRS_MMU_READ_BEAT,     MV_CPU_CNTRS_ICACHE_READ_LATENCY,   MV_CPU_CNTRS_WB_WRITE_BEAT,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_IS_HOLD,               MV_CPU_CNTRS_DATA_READ_ACCESS,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
+        MV_CPU_CNTRS_INVALID,
+    },
+    /*2*/   
+    {
+        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_DCACHE_ACCESS, 
+        MV_CPU_CNTRS_DTLB_MISS,         MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_BRANCH_PREDICT_MISS,   MV_CPU_CNTRS_WB_WRITE_BEAT,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_DCACHE_READ_LATENCY,   MV_CPU_CNTRS_DCACHE_WRITE_LATENCY,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_BIU_SIMULT_ACCESS,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
+        MV_CPU_CNTRS_INVALID,
+    },
+    /*3*/   
+    {
+        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_DCACHE_READ_MISS,      MV_CPU_CNTRS_DCACHE_WRITE_MISS,
+        MV_CPU_CNTRS_TLB_MISS,          MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID, 
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_BRANCH_TAKEN,          MV_CPU_CNTRS_WB_FULL_CYCLES,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_DCACHE_READ_BEAT,      MV_CPU_CNTRS_DCACHE_WRITE_BEAT,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_BIU_ANY_ACCESS,
+        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_DATA_WRITE_ACCESS,
+        MV_CPU_CNTRS_INVALID,
+    }
+};
+
+MV_CPU_CNTRS_ENTRY  mvCpuCntrsTbl[MV_CPU_CNTRS_NUM];
+
+MV_CPU_CNTRS_EVENT*   mvCpuCntrsEventTbl[128];
+
+void mvCpuCntrsReset(void)
+{
+    MV_U32 reg = 0;
+   
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 0" : : "r" (reg));
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 1" : : "r" (reg));
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 2" : : "r" (reg));
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 3" : : "r" (reg));
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 4" : : "r" (reg));
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 5" : : "r" (reg));
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 6" : : "r" (reg));
+    MV_ASM ("mcr p15, 0, %0, c15, c13, 7" : : "r" (reg));
+}
+               
+void program_counter(int counter, int op)
+{
+    MV_U32 reg =  (1 << op) | 0x1; /*enable*/
+
+    switch(counter)
+    {
+        case 0:
+         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 0" : : "r" (reg));
+         return;
+
+        case 1:
+         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 1" : : "r" (reg));
+         return;
+
+        case 2:
+         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 2" : : "r" (reg));
+         return;
+
+        case 3:
+         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 3" : : "r" (reg));
+         return;
+
+        default:
+            mvOsPrintf("error in program_counter: bad counter number (%d)\n", counter);
+    }
+    return;
+}
+
+void mvCpuCntrsEventClear(MV_CPU_CNTRS_EVENT* pEvent)
+{
+    int i;
+
+    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
+    {
+        pEvent->counters_sum[i] = 0;
+    }
+    pEvent->num_of_measurements = 0;
+}
+
+                                                                                                              
+MV_CPU_CNTRS_EVENT* mvCpuCntrsEventCreate(char* name, MV_U32 print_threshold)
+{
+    int                     i;
+    MV_CPU_CNTRS_EVENT*     event = mvOsMalloc(sizeof(MV_CPU_CNTRS_EVENT));
+
+    if(event)
+    {
+        strncpy(event->name, name, sizeof(event->name));
+        event->num_of_measurements = 0;
+        event->avg_sample_count = print_threshold;
+        for(i=0; i<MV_CPU_CNTRS_NUM; i++)
+        {
+            event->counters_before[i] = 0;
+            event->counters_after[i] = 0;
+            event->counters_sum[i] = 0;
+        }
+    }
+    return event;
+}
+
+void    mvCpuCntrsEventDelete(MV_CPU_CNTRS_EVENT* event)
+{
+    if(event != NULL)
+        mvOsFree(event);
+}
+
+                                                                                     
+MV_STATUS   mvCpuCntrsProgram(int counter, MV_CPU_CNTRS_OPS op, 
+                                 char* name, MV_U32 overhead)
+{
+    int     i;
+
+    /* Find required operations */
+    for(i=0; i<MV_CPU_CNTRS_OPS_NUM; i++)
+    {
+        if( mvCpuCntrsOpsTbl[counter][i] == op)
+        {
+            strncpy(mvCpuCntrsTbl[counter].name, name, sizeof(mvCpuCntrsTbl[counter].name));
+            mvCpuCntrsTbl[counter].operation = op;
+            mvCpuCntrsTbl[counter].opIdx = i+1;
+            mvCpuCntrsTbl[counter].overhead = overhead;
+            program_counter(counter, mvCpuCntrsTbl[counter].opIdx);
+            mvOsPrintf("Counter=%d, opIdx=%d, overhead=%d\n",
+                        counter, mvCpuCntrsTbl[counter].opIdx, mvCpuCntrsTbl[counter].overhead);
+            return MV_OK;
+        }
+    }
+    return MV_NOT_FOUND;
+}
+
+void    mvCpuCntrsShow(MV_CPU_CNTRS_EVENT* pEvent)
+{
+    int     i;
+    MV_U64  counters_avg;
+
+    if(pEvent->num_of_measurements < pEvent->avg_sample_count) 
+        return;
+
+    mvOsPrintf("%16s: ", pEvent->name);
+    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
+    {
+        counters_avg = mvOsDivMod64(pEvent->counters_sum[i], 
+                                  pEvent->num_of_measurements, NULL);
+        if(counters_avg >= mvCpuCntrsTbl[i].overhead)
+            counters_avg -= mvCpuCntrsTbl[i].overhead;
+        else
+            counters_avg = 0;
+
+        mvOsPrintf("%s=%5llu, ", mvCpuCntrsTbl[i].name, counters_avg);
+    }
+    mvOsPrintf("\n");
+    mvCpuCntrsEventClear(pEvent);
+    mvCpuCntrsReset();
+}
+
+void    mvCpuCntrsStatus(void)
+{
+    int i;
+
+    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
+    {
+        mvOsPrintf("#%d: %s, overhead=%d\n", 
+            i, mvCpuCntrsTbl[i].name, mvCpuCntrsTbl[i].overhead);
+    }
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h
new file mode 100644
index 00000000..8d49af00
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h
@@ -0,0 +1,213 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+*******************************************************************************/
+#ifndef __mvCpuCntrs_h__
+#define __mvCpuCntrs_h__
+
+#include "mvTypes.h"
+#include "mvOs.h"
+
+
+#define MV_CPU_CNTRS_NUM            4
+#define MV_CPU_CNTRS_OPS_NUM        32
+
+typedef enum
+{
+    MV_CPU_CNTRS_INVALID = 0,
+    MV_CPU_CNTRS_CYCLES,
+    MV_CPU_CNTRS_ICACHE_READ_MISS,
+    MV_CPU_CNTRS_DCACHE_ACCESS,
+    MV_CPU_CNTRS_DCACHE_READ_MISS,
+    MV_CPU_CNTRS_DCACHE_READ_HIT,
+    MV_CPU_CNTRS_DCACHE_WRITE_MISS,
+    MV_CPU_CNTRS_DCACHE_WRITE_HIT,
+    MV_CPU_CNTRS_DTLB_MISS,
+    MV_CPU_CNTRS_TLB_MISS,
+    MV_CPU_CNTRS_ITLB_MISS,
+    MV_CPU_CNTRS_INSTRUCTIONS,
+    MV_CPU_CNTRS_SINGLE_ISSUE,
+    MV_CPU_CNTRS_MMU_READ_LATENCY,
+    MV_CPU_CNTRS_MMU_READ_BEAT,
+    MV_CPU_CNTRS_BRANCH_RETIRED,
+    MV_CPU_CNTRS_BRANCH_TAKEN,
+    MV_CPU_CNTRS_BRANCH_PREDICT_MISS,
+    MV_CPU_CNTRS_BRANCH_PREDICT_COUNT,
+    MV_CPU_CNTRS_WB_FULL_CYCLES,
+    MV_CPU_CNTRS_WB_WRITE_LATENCY,
+    MV_CPU_CNTRS_WB_WRITE_BEAT,
+    MV_CPU_CNTRS_ICACHE_READ_LATENCY,
+    MV_CPU_CNTRS_ICACHE_READ_BEAT,
+    MV_CPU_CNTRS_DCACHE_READ_LATENCY,
+    MV_CPU_CNTRS_DCACHE_READ_BEAT,
+    MV_CPU_CNTRS_DCACHE_WRITE_LATENCY,
+    MV_CPU_CNTRS_DCACHE_WRITE_BEAT,
+    MV_CPU_CNTRS_LDM_STM_HOLD,
+    MV_CPU_CNTRS_IS_HOLD,
+    MV_CPU_CNTRS_DATA_WRITE_ACCESS,
+    MV_CPU_CNTRS_DATA_READ_ACCESS,
+    MV_CPU_CNTRS_BIU_SIMULT_ACCESS,
+    MV_CPU_CNTRS_BIU_ANY_ACCESS,
+
+} MV_CPU_CNTRS_OPS;
+
+typedef struct
+{
+    char                name[16];
+    MV_CPU_CNTRS_OPS    operation;
+    int                 opIdx;
+    MV_U32              overhead;
+    
+} MV_CPU_CNTRS_ENTRY;
+
+
+typedef struct
+{
+    char   name[16];
+    MV_U32 num_of_measurements;
+    MV_U32 avg_sample_count;
+    MV_U64 counters_before[MV_CPU_CNTRS_NUM];
+    MV_U64 counters_after[MV_CPU_CNTRS_NUM];
+    MV_U64 counters_sum[MV_CPU_CNTRS_NUM];
+
+} MV_CPU_CNTRS_EVENT;
+
+extern MV_CPU_CNTRS_ENTRY  mvCpuCntrsTbl[MV_CPU_CNTRS_NUM];
+
+
+MV_STATUS           mvCpuCntrsProgram(int counter, MV_CPU_CNTRS_OPS op, 
+                                      char* name, MV_U32 overhead);
+void                mvCpuCntrsInit(void);
+MV_CPU_CNTRS_EVENT* mvCpuCntrsEventCreate(char* name, MV_U32 print_threshold);
+void                mvCpuCntrsEventDelete(MV_CPU_CNTRS_EVENT* event);
+void                mvCpuCntrsReset(void);
+void                mvCpuCntrsShow(MV_CPU_CNTRS_EVENT* pEvent);
+void 		    mvCpuCntrsEventClear(MV_CPU_CNTRS_EVENT* pEvent);
+
+/* internal */
+void 		    program_counter(int counter, int op);
+
+static INLINE MV_U64 mvCpuCntrsRead(const int counter)
+{
+    MV_U32 low = 0, high = 0;
+    MV_U32 ll = 0;
+    
+    switch(counter)
+    {
+        case 0:
+            MV_ASM  ("mcr p15, 0, %0, c15, c12, 0" : : "r" (ll));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 0" : "=r" (low));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 1" : "=r" (high));
+         break;
+
+        case 1:
+            MV_ASM  ("mcr p15, 0, %0, c15, c12, 1" : : "r" (ll));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 2" : "=r" (low));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 3" : "=r" (high));
+         break;
+
+        case 2:
+            MV_ASM  ("mcr p15, 0, %0, c15, c12, 2" : : "r" (ll));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 4" : "=r" (low));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 5" : "=r" (high));
+         break;
+
+        case 3:
+            MV_ASM  ("mcr p15, 0, %0, c15, c12, 3" : : "r" (ll));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 6" : "=r" (low));
+            MV_ASM  ("mrc p15, 0, %0, c15, c13, 7" : "=r" (high));
+         break;
+
+        default:
+            mvOsPrintf("mv_cpu_cntrs_read: bad counter number (%d)\n", counter);
+    }
+    program_counter(counter, mvCpuCntrsTbl[counter].opIdx);
+    return (((MV_U64)high << 32 ) | low);
+
+}
+
+
+static INLINE void mvCpuCntrsReadBefore(MV_CPU_CNTRS_EVENT* pEvent)
+{
+#if 0
+    int i;
+
+    /* order is important - we want to measure the cycle count last here! */
+    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
+        pEvent->counters_before[i] = mvCpuCntrsRead(i);
+#else
+    pEvent->counters_before[1] = mvCpuCntrsRead(1);
+    pEvent->counters_before[3] = mvCpuCntrsRead(3);
+    pEvent->counters_before[0] = mvCpuCntrsRead(0);
+    pEvent->counters_before[2] = mvCpuCntrsRead(2);
+#endif
+}
+
+static INLINE void mvCpuCntrsReadAfter(MV_CPU_CNTRS_EVENT* pEvent)
+{
+    int i;
+
+#if 0
+    /* order is important - we want to measure the cycle count first here! */
+    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
+        pEvent->counters_after[i] = mvCpuCntrsRead(i);
+#else
+    pEvent->counters_after[2] = mvCpuCntrsRead(2);
+    pEvent->counters_after[0] = mvCpuCntrsRead(0);
+    pEvent->counters_after[3] = mvCpuCntrsRead(3);
+    pEvent->counters_after[1] = mvCpuCntrsRead(1);
+#endif 
+
+    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
+    {
+        pEvent->counters_sum[i] += (pEvent->counters_after[i] - pEvent->counters_before[i]);	
+    }
+    pEvent->num_of_measurements++;
+}
+
+
+#ifdef CONFIG_MV_CPU_PERF_CNTRS
+
+#define MV_CPU_CNTRS_READ(counter)  mvCpuCntrsRead(counter)
+
+#define MV_CPU_CNTRS_START(event)	mvCpuCntrsReadBefore(event)
+
+#define MV_CPU_CNTRS_STOP(event)	mvCpuCntrsReadAfter(event)
+			
+#define MV_CPU_CNTRS_SHOW(event)	mvCpuCntrsShow(event)
+
+#else
+
+#define MV_CPU_CNTRS_READ(counter)
+#define MV_CPU_CNTRS_START(event)
+#define MV_CPU_CNTRS_STOP(event)
+#define MV_CPU_CNTRS_SHOW(event)
+
+#endif /* CONFIG_MV_CPU_PERF_CNTRS */
+
+
+#endif /* __mvCpuCntrs_h__ */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c
new file mode 100644
index 00000000..03338622
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c
@@ -0,0 +1,143 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 "mvOs.h"
+#include "mvCpuL2Cntrs.h"
+
+
+
+MV_CPU_L2_CNTRS_ENTRY   mvCpuL2CntrsTbl[MV_CPU_L2_CNTRS_NUM];
+
+MV_CPU_L2_CNTRS_EVENT*  mvCpuL2CntrsEventTbl[128];
+
+void mvCpuL2CntrsReset(void)
+{
+    MV_U32 reg = 0;
+   
+    MV_ASM ("mcr p15, 6, %0, c15, c13, 0" : : "r" (reg));
+    MV_ASM ("mcr p15, 6, %0, c15, c13, 1" : : "r" (reg));
+    MV_ASM ("mcr p15, 6, %0, c15, c13, 2" : : "r" (reg));
+    MV_ASM ("mcr p15, 6, %0, c15, c13, 3" : : "r" (reg));
+}
+               
+static void mvCpuL2CntrConfig(int counter, int op)
+{
+    MV_U32 reg =  (1 << op) | 0x1; /*enable*/
+
+    switch(counter)
+    {
+        case 0:
+         MV_ASM ("mcr p15, 6, %0, c15, c12, 0" : : "r" (reg));
+         return;
+
+        case 1:
+         MV_ASM ("mcr p15, 6, %0, c15, c12, 1" : : "r" (reg));
+         return;
+
+        default:
+            mvOsPrintf("mvCpuL2CntrConfig: bad counter number (%d)\n", counter);
+    }
+    return;
+}
+
+void mvCpuL2CntrsEventClear(MV_CPU_L2_CNTRS_EVENT* pEvent)
+{
+    int i;
+
+    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
+    {
+        pEvent->counters_sum[i] = 0;
+    }
+    pEvent->num_of_measurements = 0;
+}
+
+                                                                                                              
+MV_CPU_L2_CNTRS_EVENT* mvCpuL2CntrsEventCreate(char* name, MV_U32 print_threshold)
+{
+    int                     i;
+    MV_CPU_L2_CNTRS_EVENT*  event = mvOsMalloc(sizeof(MV_CPU_L2_CNTRS_EVENT));
+
+    if(event)
+    {
+        strncpy(event->name, name, sizeof(event->name));
+        event->num_of_measurements = 0;
+        event->avg_sample_count = print_threshold;
+        for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
+        {
+            event->counters_before[i] = 0;
+            event->counters_after[i] = 0;
+            event->counters_sum[i] = 0;
+        }
+    }
+    return event;
+}
+
+void    mvCpuL2CntrsEventDelete(MV_CPU_L2_CNTRS_EVENT* event)
+{
+    if(event != NULL)
+        mvOsFree(event);
+}
+
+                                                                                     
+MV_STATUS   mvCpuL2CntrsProgram(int counter, MV_CPU_L2_CNTRS_OPS op, 
+                                 char* name, MV_U32 overhead)
+{
+    strncpy(mvCpuL2CntrsTbl[counter].name, name, sizeof(mvCpuL2CntrsTbl[counter].name));
+    mvCpuL2CntrsTbl[counter].operation = op;
+    mvCpuL2CntrsTbl[counter].opIdx = op;
+    mvCpuL2CntrsTbl[counter].overhead = overhead;
+    mvCpuL2CntrConfig(counter, op);
+    mvOsPrintf("CPU L2 Counter %d: operation=%d, overhead=%d\n",
+                        counter, op, overhead);
+    return MV_OK;
+}
+
+void    mvCpuL2CntrsShow(MV_CPU_L2_CNTRS_EVENT* pEvent)
+{
+    int     i;
+    MV_U64  counters_avg;
+
+    if(pEvent->num_of_measurements < pEvent->avg_sample_count) 
+        return;
+
+    mvOsPrintf("%16s: ", pEvent->name);
+    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
+    {
+        counters_avg = mvOsDivMod64(pEvent->counters_sum[i], 
+                                    pEvent->num_of_measurements, NULL);
+
+        if(counters_avg >= mvCpuL2CntrsTbl[i].overhead)
+            counters_avg -= mvCpuL2CntrsTbl[i].overhead;
+        else
+            counters_avg = 0;
+
+        mvOsPrintf("%s=%5llu, ", mvCpuL2CntrsTbl[i].name, counters_avg);
+    }
+    mvOsPrintf("\n");
+    mvCpuL2CntrsEventClear(pEvent);
+    mvCpuL2CntrsReset();
+}
+
+void    mvCpuL2CntrsStatus(void)
+{
+    int i;
+
+    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
+    {
+        mvOsPrintf("#%d: %s, overhead=%d\n", 
+            i, mvCpuL2CntrsTbl[i].name, mvCpuL2CntrsTbl[i].overhead);
+    }
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h
new file mode 100644
index 00000000..570d7019
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h
@@ -0,0 +1,151 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+*******************************************************************************/
+#ifndef __mvCpuL2Cntrs_h__
+#define __mvCpuL2Cntrs_h__
+
+#include "mvTypes.h"
+#include "mvOs.h"
+
+
+#define MV_CPU_L2_CNTRS_NUM         2
+
+typedef enum
+{
+    MV_CPU_L2_CNTRS_ENABLE = 0,
+    MV_CPU_L2_CNTRS_DATA_REQ,
+    MV_CPU_L2_CNTRS_DATA_MISS_REQ,
+    MV_CPU_L2_CNTRS_INST_REQ,
+    MV_CPU_L2_CNTRS_INST_MISS_REQ,
+    MV_CPU_L2_CNTRS_DATA_READ_REQ,
+    MV_CPU_L2_CNTRS_DATA_READ_MISS_REQ,
+    MV_CPU_L2_CNTRS_DATA_WRITE_REQ,
+    MV_CPU_L2_CNTRS_DATA_WRITE_MISS_REQ,
+    MV_CPU_L2_CNTRS_RESERVED,
+    MV_CPU_L2_CNTRS_DIRTY_EVICT_REQ,
+    MV_CPU_L2_CNTRS_EVICT_BUFF_STALL,
+    MV_CPU_L2_CNTRS_ACTIVE_CYCLES,
+
+} MV_CPU_L2_CNTRS_OPS;
+
+typedef struct
+{
+    char                name[16];
+    MV_CPU_L2_CNTRS_OPS operation;
+    int                 opIdx;
+    MV_U32              overhead;
+    
+} MV_CPU_L2_CNTRS_ENTRY;
+
+
+typedef struct
+{
+    char   name[16];
+    MV_U32 num_of_measurements;
+    MV_U32 avg_sample_count;
+    MV_U64 counters_before[MV_CPU_L2_CNTRS_NUM];
+    MV_U64 counters_after[MV_CPU_L2_CNTRS_NUM];
+    MV_U64 counters_sum[MV_CPU_L2_CNTRS_NUM];
+
+} MV_CPU_L2_CNTRS_EVENT;
+
+
+MV_STATUS               mvCpuL2CntrsProgram(int counter, MV_CPU_L2_CNTRS_OPS op, 
+                                        char* name, MV_U32 overhead);
+void                    mvCpuL2CntrsInit(void);
+MV_CPU_L2_CNTRS_EVENT*  mvCpuL2CntrsEventCreate(char* name, MV_U32 print_threshold);
+void                    mvCpuL2CntrsEventDelete(MV_CPU_L2_CNTRS_EVENT* event);
+void                    mvCpuL2CntrsReset(void);
+void                    mvCpuL2CntrsShow(MV_CPU_L2_CNTRS_EVENT* pEvent);
+void 			mvCpuL2CntrsEventClear(MV_CPU_L2_CNTRS_EVENT* pEvent);
+
+static INLINE MV_U64 mvCpuL2CntrsRead(const int counter)
+{
+    MV_U32 low = 0, high = 0;
+    
+    switch(counter)
+    {
+        case 0:
+            MV_ASM  ("mrc p15, 6, %0, c15, c13, 0" : "=r" (low));
+            MV_ASM  ("mrc p15, 6, %0, c15, c13, 1" : "=r" (high));
+         break;
+
+        case 1:
+            MV_ASM  ("mrc p15, 6, %0, c15, c13, 2" : "=r" (low));
+            MV_ASM  ("mrc p15, 6, %0, c15, c13, 3" : "=r" (high));
+         break;
+
+        default:
+            mvOsPrintf("mvCpuL2CntrsRead: bad counter number (%d)\n", counter);
+    }
+    return (((MV_U64)high << 32 ) | low);
+
+}
+
+static INLINE void mvCpuL2CntrsReadBefore(MV_CPU_L2_CNTRS_EVENT* pEvent)
+{
+    int i;
+
+    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
+        pEvent->counters_before[i] = mvCpuL2CntrsRead(i);
+}
+
+static INLINE void mvCpuL2CntrsReadAfter(MV_CPU_L2_CNTRS_EVENT* pEvent)
+{
+    int i;
+
+    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++) 
+    {
+        pEvent->counters_after[i] = mvCpuL2CntrsRead(i);
+        pEvent->counters_sum[i] += (pEvent->counters_after[i] - pEvent->counters_before[i]);	
+    }
+    pEvent->num_of_measurements++;
+}
+
+
+#ifdef CONFIG_MV_CPU_L2_PERF_CNTRS
+
+#define MV_CPU_L2_CNTRS_READ(counter)   mvCpuL2CntrsRead(counter)
+
+#define MV_CPU_L2_CNTRS_START(event)	mvCpuL2CntrsReadBefore(event)
+
+#define MV_CPU_L2_CNTRS_STOP(event)	    mvCpuL2CntrsReadAfter(event)
+			
+#define MV_CPU_L2_CNTRS_SHOW(event)	    mvCpuL2CntrsShow(event)
+
+#else
+
+#define MV_CPU_L2_CNTRS_READ(counter)
+#define MV_CPU_L2_CNTRS_START(event)
+#define MV_CPU_L2_CNTRS_STOP(event)
+#define MV_CPU_L2_CNTRS_SHOW(event)
+
+#endif /* CONFIG_MV_CPU_L2_PERF_CNTRS */
+
+
+#endif /* __mvCpuL2Cntrs_h__ */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvCompVer.txt
new file mode 100644
index 00000000..85bfa612
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.3
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c
new file mode 100644
index 00000000..d1b8a3d3
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c
@@ -0,0 +1,1479 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "ddr1_2/mvDram.h"
+#include "boardEnv/mvBoardEnvLib.h"
+
+#undef MV_DEBUG
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
+                                            MV_DRAM_BANK_INFO *pBankInfo);
+static MV_U32  cas2ps(MV_U8 spd_byte);
+/*******************************************************************************
+* mvDramBankGet - Get the DRAM bank paramters.
+*
+* DESCRIPTION:
+*       This function retrieves DRAM bank parameters as described in 
+*       DRAM_BANK_INFO struct to the controller DRAM unit. In case the board 
+*       has its DRAM on DIMMs it will use its EEPROM to extract SPD data
+*       from it. Otherwise, if the DRAM is soldered on board, the function 
+*       should insert its bank information into MV_DRAM_BANK_INFO struct.
+*
+* INPUT:
+*       bankNum  - Board DRAM bank number.
+*
+* OUTPUT:
+*       pBankInfo  - DRAM bank information struct.
+*
+* RETURN:
+*       MV_FAIL - Bank parameters could not be read.
+*
+*******************************************************************************/
+MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo)
+{
+    MV_DIMM_INFO dimmInfo;
+
+    DB(mvOsPrintf("Dram: mvDramBankInfoGet bank %d\n", bankNum)); 
+    /* zero pBankInfo structure */
+    memset(pBankInfo, 0, sizeof(*pBankInfo));
+
+    if((NULL == pBankInfo) || (bankNum >= MV_DRAM_MAX_CS ))
+    {
+        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
+        return MV_BAD_PARAM;
+    }
+    if( MV_OK != dimmSpdGet((MV_U32)(bankNum/2), &dimmInfo))
+    {
+    DB(mvOsPrintf("Dram: ERR dimmSpdGet failed to get dimm info \n"));
+    return MV_FAIL;
+    }
+    if((dimmInfo.numOfModuleBanks == 1) && ((bankNum % 2) == 1))
+    {
+    DB(mvOsPrintf("Dram: ERR dimmSpdGet. Can't find DIMM bank 2 \n"));
+    return MV_FAIL;
+    }
+
+    /* convert Dimm info to Bank info */
+    cpyDimm2BankInfo(&dimmInfo, pBankInfo);
+    
+    return MV_OK;
+}
+
+/*******************************************************************************
+* cpyDimm2BankInfo - Convert a Dimm info struct into a bank info struct.
+*
+* DESCRIPTION:
+*       Convert a Dimm info struct into a bank info struct.
+*
+* INPUT:
+*       pDimmInfo - DIMM information structure.
+*
+* OUTPUT:
+*       pBankInfo  - DRAM bank information struct.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
+                                                MV_DRAM_BANK_INFO *pBankInfo)
+{
+    pBankInfo->memoryType = pDimmInfo->memoryType;        
+
+    /* DIMM dimensions */
+    pBankInfo->numOfRowAddr = pDimmInfo->numOfRowAddr;
+    pBankInfo->numOfColAddr = pDimmInfo->numOfColAddr;
+    pBankInfo->dataWidth = pDimmInfo->dataWidth;
+    pBankInfo->errorCheckType = pDimmInfo->errorCheckType;             
+    pBankInfo->sdramWidth = pDimmInfo->sdramWidth;
+    pBankInfo->errorCheckDataWidth = pDimmInfo->errorCheckDataWidth;   
+    pBankInfo->numOfBanksOnEachDevice = pDimmInfo->numOfBanksOnEachDevice;
+    pBankInfo->suportedCasLatencies = pDimmInfo->suportedCasLatencies;
+    pBankInfo->refreshInterval = pDimmInfo->refreshInterval;
+ 
+    /* DIMM timing parameters */
+    pBankInfo->minCycleTimeAtMaxCasLatPs = pDimmInfo->minCycleTimeAtMaxCasLatPs;
+    pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
+                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps;
+    pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
+                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps;
+
+    pBankInfo->minRowPrechargeTime     = pDimmInfo->minRowPrechargeTime;     
+    pBankInfo->minRowActiveToRowActive = pDimmInfo->minRowActiveToRowActive;
+    pBankInfo->minRasToCasDelay        = pDimmInfo->minRasToCasDelay;       
+    pBankInfo->minRasPulseWidth        = pDimmInfo->minRasPulseWidth;       
+    pBankInfo->minWriteRecoveryTime    = pDimmInfo->minWriteRecoveryTime;
+    pBankInfo->minWriteToReadCmdDelay  = pDimmInfo->minWriteToReadCmdDelay;
+    pBankInfo->minReadToPrechCmdDelay  = pDimmInfo->minReadToPrechCmdDelay;
+    pBankInfo->minRefreshToActiveCmd   = pDimmInfo->minRefreshToActiveCmd;
+               
+    /* Parameters calculated from the extracted DIMM information */
+    pBankInfo->size = pDimmInfo->size/pDimmInfo->numOfModuleBanks;
+    pBankInfo->deviceDensity = pDimmInfo->deviceDensity;              
+    pBankInfo->numberOfDevices = pDimmInfo->numberOfDevices /
+                                 pDimmInfo->numOfModuleBanks;
+ 
+    /* DIMM attributes (MV_TRUE for yes) */
+
+    if ((pDimmInfo->memoryType == MEM_TYPE_SDRAM) ||
+        (pDimmInfo->memoryType == MEM_TYPE_DDR1)   )
+    {   
+        if (pDimmInfo->dimmAttributes & BIT1)
+            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
+        else
+            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
+    }
+    else /* pDimmInfo->memoryType == MEM_TYPE_DDR2 */
+    {
+        if (pDimmInfo->dimmTypeInfo & (BIT0 | BIT4))
+            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
+        else
+            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
+    }
+
+    return;
+}
+
+/*******************************************************************************
+* dimmSpdCpy - Cpy SPD parameters from dimm 0 to dimm 1.
+*
+* DESCRIPTION:
+*       Read the DIMM SPD parameters from dimm 0 into dimm 1 SPD.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
+*
+*******************************************************************************/
+MV_STATUS dimmSpdCpy(MV_VOID)
+{
+    MV_U32 i;
+    MV_U32 spdChecksum;
+     
+    MV_TWSI_SLAVE twsiSlave;
+    MV_U8 data[SPD_SIZE];
+
+    /* zero dimmInfo structure */
+    memset(data, 0, SPD_SIZE);
+
+    /* read the dimm eeprom */
+    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
+    twsiSlave.slaveAddr.address = MV_BOARD_DIMM0_I2C_ADDR;
+    twsiSlave.slaveAddr.type = ADDR7_BIT;
+    twsiSlave.validOffset = MV_TRUE;
+    twsiSlave.offset = 0;
+    twsiSlave.moreThen256 = MV_FALSE;
+
+    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL,
+			&twsiSlave, data, SPD_SIZE) )
+    {
+        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 0\n"));
+        return MV_FAIL;
+    }
+    DB(puts("DRAM: Reading dimm info succeded.\n"));
+    
+    /* calculate SPD checksum */
+    spdChecksum = 0;
+    
+    for(i = 0 ; i <= 62 ; i++)
+    {
+        spdChecksum += data[i];
+    }
+    
+    if ((spdChecksum & 0xff) != data[63])
+    {
+        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
+                            (MV_U32)(spdChecksum & 0xff), data[63]));
+    }
+    else
+    {
+        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
+    }
+
+    /* copy the SPD content 1:1 into the DIMM 1 SPD */
+    twsiSlave.slaveAddr.address = MV_BOARD_DIMM1_I2C_ADDR;
+    twsiSlave.slaveAddr.type = ADDR7_BIT;
+    twsiSlave.validOffset = MV_TRUE;
+    twsiSlave.offset = 0;
+    twsiSlave.moreThen256 = MV_FALSE;
+
+    for(i = 0 ; i < SPD_SIZE ; i++)
+    {
+	twsiSlave.offset = i;
+	if( MV_OK != mvTwsiWrite (MV_BOARD_DIMM_I2C_CHANNEL,
+	    			&twsiSlave, &data[i], 1) )
+	{
+	    mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 1 byte %d \n",i);
+	    return MV_FAIL;
+	}
+	mvOsDelay(5);
+    }
+    
+    DB(puts("DRAM: Reading dimm info succeded.\n"));
+    return MV_OK;
+}
+
+/*******************************************************************************
+* dimmSpdGet - Get the SPD parameters.
+*
+* DESCRIPTION:
+*       Read the DIMM SPD parameters into given struct parameter.
+*
+* INPUT:
+*       dimmNum - DIMM number. See MV_BOARD_DIMM_NUM enumerator.
+*
+* OUTPUT:
+*       pDimmInfo - DIMM information structure.
+*
+* RETURN:
+*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
+*
+*******************************************************************************/
+MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo)
+{
+    MV_U32 i;
+    MV_U32 density = 1;
+    MV_U32 spdChecksum;
+     
+    MV_TWSI_SLAVE twsiSlave;
+    MV_U8 data[SPD_SIZE];
+
+    if((NULL == pDimmInfo)|| (dimmNum >= MAX_DIMM_NUM))
+    {
+        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
+        return MV_BAD_PARAM;
+    }
+
+    /* zero dimmInfo structure */
+    memset(data, 0, SPD_SIZE);
+
+    /* read the dimm eeprom */
+    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
+    twsiSlave.slaveAddr.address = (dimmNum == 0) ?
+                            MV_BOARD_DIMM0_I2C_ADDR : MV_BOARD_DIMM1_I2C_ADDR;
+    twsiSlave.slaveAddr.type = ADDR7_BIT;
+    twsiSlave.validOffset = MV_TRUE;
+    twsiSlave.offset = 0;
+    twsiSlave.moreThen256 = MV_FALSE;
+
+    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL,
+			&twsiSlave, data, SPD_SIZE) )
+    {
+        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum %d \n", dimmNum));
+        return MV_FAIL;
+    }
+    DB(puts("DRAM: Reading dimm info succeded.\n"));
+    
+    /* calculate SPD checksum */
+    spdChecksum = 0;
+    
+        for(i = 0 ; i <= 62 ; i++)
+        {
+        spdChecksum += data[i];
+    }
+    
+    if ((spdChecksum & 0xff) != data[63])
+    {
+        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
+                            (MV_U32)(spdChecksum & 0xff), data[63]));
+    }
+    else
+    {
+        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
+    }
+
+    /* copy the SPD content 1:1 into the dimmInfo structure*/
+    for(i = 0 ; i < SPD_SIZE ; i++)
+    {
+        pDimmInfo->spdRawData[i] = data[i];
+        DB(mvOsPrintf("SPD-EEPROM Byte %3d = %3x (%3d)\n",i, data[i], data[i]));
+    }
+
+    DB(mvOsPrintf("DRAM SPD Information:\n"));
+
+    /* Memory type (DDR / SDRAM) */
+    switch (data[DIMM_MEM_TYPE])
+    {
+        case (DIMM_MEM_TYPE_SDRAM):
+            pDimmInfo->memoryType = MEM_TYPE_SDRAM;
+            DB(mvOsPrintf("DRAM Memeory type SDRAM\n"));
+            break;
+        case (DIMM_MEM_TYPE_DDR1):
+            pDimmInfo->memoryType = MEM_TYPE_DDR1;
+            DB(mvOsPrintf("DRAM Memeory type DDR1\n"));
+            break;
+        case (DIMM_MEM_TYPE_DDR2):
+            pDimmInfo->memoryType = MEM_TYPE_DDR2;
+            DB(mvOsPrintf("DRAM Memeory type DDR2\n"));
+            break;
+        default:
+            mvOsPrintf("ERROR: Undefined memory type!\n");
+            return MV_ERROR;
+    }
+
+    
+    /* Number Of Row Addresses */
+    pDimmInfo->numOfRowAddr = data[DIMM_ROW_NUM];
+    DB(mvOsPrintf("DRAM numOfRowAddr[3]         %d\n",pDimmInfo->numOfRowAddr));
+        
+    /* Number Of Column Addresses */
+    pDimmInfo->numOfColAddr = data[DIMM_COL_NUM];
+    DB(mvOsPrintf("DRAM numOfColAddr[4]         %d\n",pDimmInfo->numOfColAddr));
+        
+    /* Number Of Module Banks */
+    pDimmInfo->numOfModuleBanks = data[DIMM_MODULE_BANK_NUM];
+    DB(mvOsPrintf("DRAM numOfModuleBanks[5]     0x%x\n", 
+                                                  pDimmInfo->numOfModuleBanks));
+        
+    /* Number of module banks encoded differently for DDR2 */
+    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
+        pDimmInfo->numOfModuleBanks = (pDimmInfo->numOfModuleBanks & 0x7)+1;
+
+    /* Data Width */
+    pDimmInfo->dataWidth = data[DIMM_DATA_WIDTH];
+    DB(mvOsPrintf("DRAM dataWidth[6]            0x%x\n", pDimmInfo->dataWidth));
+        
+    /* Minimum Cycle Time At Max CasLatancy */
+    pDimmInfo->minCycleTimeAtMaxCasLatPs = cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS]);
+
+    /* Error Check Type */
+    pDimmInfo->errorCheckType = data[DIMM_ERR_CHECK_TYPE];
+    DB(mvOsPrintf("DRAM errorCheckType[11]      0x%x\n", 
+                                                    pDimmInfo->errorCheckType));
+
+    /* Refresh Interval */
+    pDimmInfo->refreshInterval = data[DIMM_REFRESH_INTERVAL];
+    DB(mvOsPrintf("DRAM refreshInterval[12]     0x%x\n", 
+                                                   pDimmInfo->refreshInterval));
+    
+    /* Sdram Width */
+    pDimmInfo->sdramWidth = data[DIMM_SDRAM_WIDTH];
+    DB(mvOsPrintf("DRAM sdramWidth[13]          0x%x\n",pDimmInfo->sdramWidth));
+        
+    /* Error Check Data Width */
+    pDimmInfo->errorCheckDataWidth = data[DIMM_ERR_CHECK_DATA_WIDTH];
+    DB(mvOsPrintf("DRAM errorCheckDataWidth[14] 0x%x\n", 
+                                               pDimmInfo->errorCheckDataWidth));
+    
+    /* Burst Length Supported */
+    /*     SDRAM/DDR1:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
+                    *********************************************************/ 
+    /*     DDR2:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
+                    *********************************************************/ 
+
+    pDimmInfo->burstLengthSupported = data[DIMM_BURST_LEN_SUP];
+    DB(mvOsPrintf("DRAM burstLengthSupported[16] 0x%x\n", 
+                                              pDimmInfo->burstLengthSupported));
+    
+    /* Number Of Banks On Each Device */
+    pDimmInfo->numOfBanksOnEachDevice = data[DIMM_DEV_BANK_NUM];
+    DB(mvOsPrintf("DRAM numOfBanksOnEachDevice[17] 0x%x\n", 
+                                            pDimmInfo->numOfBanksOnEachDevice));
+    
+    /* Suported Cas Latencies */
+                   
+    /*      SDRAM:
+            *******-******-******-******-******-******-******-******* 
+            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+            *******-******-******-******-******-******-******-******* 
+    CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
+            ********************************************************/ 
+
+    /*     DDR 1:
+            *******-******-******-******-******-******-******-******* 
+            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+            *******-******-******-******-******-******-******-******* 
+    CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
+            *********************************************************/
+
+    /*     DDR 2:
+            *******-******-******-******-******-******-******-******* 
+            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+            *******-******-******-******-******-******-******-******* 
+    CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
+            *********************************************************/
+    
+    pDimmInfo->suportedCasLatencies = data[DIMM_SUP_CAL];
+    DB(mvOsPrintf("DRAM suportedCasLatencies[18]    0x%x\n", 
+                                              pDimmInfo->suportedCasLatencies));
+
+    /* For DDR2 only, get the DIMM type information */
+    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
+    {   
+        pDimmInfo->dimmTypeInfo = data[DIMM_DDR2_TYPE_INFORMATION];
+        DB(mvOsPrintf("DRAM dimmTypeInfo[20] (DDR2) 0x%x\n", 
+                                                      pDimmInfo->dimmTypeInfo));
+    }
+
+    /* SDRAM Modules Attributes */
+    pDimmInfo->dimmAttributes = data[DIMM_BUF_ADDR_CONT_IN];
+    DB(mvOsPrintf("DRAM dimmAttributes[21]          0x%x\n",    
+                                                    pDimmInfo->dimmAttributes));
+    
+    /* Minimum Cycle Time At Max CasLatancy Minus 1*/
+    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
+                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS1]);
+
+    /* Minimum Cycle Time At Max CasLatancy Minus 2*/
+    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
+                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS2]);
+
+    pDimmInfo->minRowPrechargeTime = data[DIMM_MIN_ROW_PRECHARGE_TIME];
+    DB(mvOsPrintf("DRAM minRowPrechargeTime[27]     0x%x\n", 
+                                               pDimmInfo->minRowPrechargeTime));
+    pDimmInfo->minRowActiveToRowActive = data[DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE];
+    DB(mvOsPrintf("DRAM minRowActiveToRowActive[28] 0x%x\n", 
+                                           pDimmInfo->minRowActiveToRowActive));
+    pDimmInfo->minRasToCasDelay = data[DIMM_MIN_RAS_TO_CAS_DELAY];
+    DB(mvOsPrintf("DRAM minRasToCasDelay[29]        0x%x\n", 
+                                                  pDimmInfo->minRasToCasDelay));
+    pDimmInfo->minRasPulseWidth = data[DIMM_MIN_RAS_PULSE_WIDTH];
+    DB(mvOsPrintf("DRAM minRasPulseWidth[30]        0x%x\n", 
+                                                  pDimmInfo->minRasPulseWidth));
+        
+    /* DIMM Bank Density */
+    pDimmInfo->dimmBankDensity = data[DIMM_BANK_DENSITY];
+    DB(mvOsPrintf("DRAM dimmBankDensity[31]         0x%x\n", 
+                                                   pDimmInfo->dimmBankDensity));
+
+    /* Only DDR2 includes Write Recovery Time field. Other SDRAM ignore     */
+    pDimmInfo->minWriteRecoveryTime = data[DIMM_MIN_WRITE_RECOVERY_TIME];
+    DB(mvOsPrintf("DRAM minWriteRecoveryTime[36]    0x%x\n", 
+                                              pDimmInfo->minWriteRecoveryTime));
+    
+    /* Only DDR2 includes Internal Write To Read Command Delay field.       */
+    pDimmInfo->minWriteToReadCmdDelay = data[DIMM_MIN_WRITE_TO_READ_CMD_DELAY];
+    DB(mvOsPrintf("DRAM minWriteToReadCmdDelay[37]  0x%x\n", 
+                                            pDimmInfo->minWriteToReadCmdDelay));
+    
+    /* Only DDR2 includes Internal Read To Precharge Command Delay field.   */
+    pDimmInfo->minReadToPrechCmdDelay = data[DIMM_MIN_READ_TO_PRECH_CMD_DELAY];
+    DB(mvOsPrintf("DRAM minReadToPrechCmdDelay[38]  0x%x\n",    
+                                            pDimmInfo->minReadToPrechCmdDelay));
+    
+    /* Only DDR2 includes Minimum Refresh to Activate/Refresh Command field */
+    pDimmInfo->minRefreshToActiveCmd = data[DIMM_MIN_REFRESH_TO_ACTIVATE_CMD];
+    DB(mvOsPrintf("DRAM minRefreshToActiveCmd[42]   0x%x\n", 
+                                             pDimmInfo->minRefreshToActiveCmd));
+                 
+    /* calculating the sdram density. Representing device density from      */
+    /* bit 20 to allow representation of 4GB and above.                     */
+    /* For example, if density is 512Mbit 0x20000000, will be represent in  */
+    /* deviceDensity by 0x20000000 >> 16 --> 0x00000200. Another example    */
+    /* is density 8GB 0x200000000 >> 16 --> 0x00002000.                     */
+    density = (1 << ((pDimmInfo->numOfRowAddr + pDimmInfo->numOfColAddr) - 20));
+    pDimmInfo->deviceDensity = density * 
+                                pDimmInfo->numOfBanksOnEachDevice * 
+                                pDimmInfo->sdramWidth;
+    DB(mvOsPrintf("DRAM deviceDensity           %d\n",pDimmInfo->deviceDensity));
+    
+    /* Number of devices includeing Error correction */
+    pDimmInfo->numberOfDevices = (pDimmInfo->dataWidth/pDimmInfo->sdramWidth) * 
+                                  pDimmInfo->numOfModuleBanks;
+    DB(mvOsPrintf("DRAM numberOfDevices         %d\n",  
+                                                   pDimmInfo->numberOfDevices));
+
+    pDimmInfo->size = 0; 
+
+    /* Note that pDimmInfo->size is in MB units */
+    if (pDimmInfo->memoryType == MEM_TYPE_SDRAM)
+    {
+        if (pDimmInfo->dimmBankDensity & BIT0)
+            pDimmInfo->size += 1024;                /* Equal to 1GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT1)
+            pDimmInfo->size += 8;                   /* Equal to 8MB     */
+        else if (pDimmInfo->dimmBankDensity & BIT2)
+            pDimmInfo->size += 16;                  /* Equal to 16MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT3)
+            pDimmInfo->size += 32;                  /* Equal to 32MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT4)
+            pDimmInfo->size += 64;                  /* Equal to 64MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT5)
+            pDimmInfo->size += 128;                 /* Equal to 128MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT6) 
+            pDimmInfo->size += 256;                 /* Equal to 256MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT7) 
+            pDimmInfo->size += 512;                 /* Equal to 512MB   */
+    }
+    else if (pDimmInfo->memoryType == MEM_TYPE_DDR1)
+    {
+        if (pDimmInfo->dimmBankDensity & BIT0)
+            pDimmInfo->size += 1024;                /* Equal to 1GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT1)
+            pDimmInfo->size += 2048;                /* Equal to 2GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT2)
+            pDimmInfo->size += 16;                  /* Equal to 16MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT3)
+            pDimmInfo->size += 32;                  /* Equal to 32MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT4)
+            pDimmInfo->size += 64;                  /* Equal to 64MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT5)
+            pDimmInfo->size += 128;                 /* Equal to 128MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT6) 
+            pDimmInfo->size += 256;                 /* Equal to 256MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT7) 
+            pDimmInfo->size += 512;                 /* Equal to 512MB   */
+    }
+    else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
+    {
+        if (pDimmInfo->dimmBankDensity & BIT0)
+            pDimmInfo->size += 1024;                /* Equal to 1GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT1)
+            pDimmInfo->size += 2048;                /* Equal to 2GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT2)
+            pDimmInfo->size += 4096;                /* Equal to 4GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT3)
+            pDimmInfo->size += 8192;                /* Equal to 8GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT4)
+            pDimmInfo->size += 16384;               /* Equal to 16GB    */
+        else if (pDimmInfo->dimmBankDensity & BIT5)
+            pDimmInfo->size += 128;                 /* Equal to 128MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT6) 
+            pDimmInfo->size += 256;                 /* Equal to 256MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT7) 
+            pDimmInfo->size += 512;                 /* Equal to 512MB   */
+    }
+    
+    pDimmInfo->size *= pDimmInfo->numOfModuleBanks;
+
+    DB(mvOsPrintf("Dram: dimm size    %dMB \n",pDimmInfo->size));
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* dimmSpdPrint - Print the SPD parameters.
+*
+* DESCRIPTION:
+*       Print the Dimm SPD parameters.
+*
+* INPUT:
+*       pDimmInfo - DIMM information structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID dimmSpdPrint(MV_U32 dimmNum)
+{
+    MV_DIMM_INFO dimmInfo;
+    MV_U32  i, temp = 0;
+    MV_U32  k, maskLeftOfPoint = 0, maskRightOfPoint = 0;
+    MV_U32  rightOfPoint = 0,leftOfPoint = 0, div, time_tmp, shift;
+    MV_U32  busClkPs;
+    MV_U8   trp_clocks=0, trcd_clocks, tras_clocks, trrd_clocks,
+            temp_buf[40], *spdRawData;
+
+    busClkPs = 1000000000 / (mvBoardSysClkGet() / 100);  /* in 10 ps units */
+
+    spdRawData = dimmInfo.spdRawData;
+    
+    if(MV_OK != dimmSpdGet(dimmNum, &dimmInfo))
+    {
+        mvOsOutput("ERROR: Could not read SPD information!\n");
+        return;
+    }
+
+    /* find Manufactura of Dimm Module */
+    mvOsOutput("\nManufacturer's JEDEC ID Code:   ");
+    for(i = 0 ; i < DIMM_MODULE_MANU_SIZE ; i++)
+    {
+        mvOsOutput("%x",spdRawData[DIMM_MODULE_MANU_OFFS + i]);
+    }
+    mvOsOutput("\n");
+
+    /* Manufacturer's Specific Data */
+    for(i = 0 ; i < DIMM_MODULE_ID_SIZE ; i++)
+    {
+        temp_buf[i] = spdRawData[DIMM_MODULE_ID_OFFS + i];
+    }
+    mvOsOutput("Manufacturer's Specific Data:   %s\n", temp_buf);
+
+    /* Module Part Number */
+    for(i = 0 ; i < DIMM_MODULE_VEN_SIZE ; i++)
+    {
+        temp_buf[i] = spdRawData[DIMM_MODULE_VEN_OFFS + i];
+    }
+    mvOsOutput("Module Part Number:             %s\n", temp_buf);
+
+    /* Module Serial Number */
+    for(i = 0; i < sizeof(MV_U32); i++)
+    {
+    	temp |= spdRawData[95+i] << 8*i;
+    }
+    mvOsOutput("DIMM Serial No.                 %ld (%lx)\n", (long)temp, 
+                                    (long)temp);
+
+    /* find Manufac-Data of Dimm Module */
+    mvOsOutput("Manufactoring Date:             Year 20%d%d/ ww %d%d\n", 
+                        ((spdRawData[93] & 0xf0) >> 4), (spdRawData[93] & 0xf), 
+                        ((spdRawData[94] & 0xf0) >> 4), (spdRawData[94] & 0xf)); 
+    /* find modul_revision of Dimm Module */
+    mvOsOutput("Module Revision:                %d.%d\n", 
+                                                spdRawData[91], spdRawData[92]); 
+
+    /* find manufac_place of Dimm Module */
+    mvOsOutput("manufac_place:                  %d\n", spdRawData[72]);
+    
+    /* go over the first 35 I2C data bytes */
+    for(i = 2 ; i <= 35 ; i++)
+       switch(i)
+        {
+            case 2:  /* Memory type (DDR1/2 / SDRAM) */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                    mvOsOutput("Dram Type is:                   SDRAM\n");
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                    mvOsOutput("Dram Type is:                   SDRAM DDR1\n");
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                    mvOsOutput("Dram Type is:                   SDRAM DDR2\n");
+                else
+                    mvOsOutput("Dram Type unknown\n");
+                break;
+/*----------------------------------------------------------------------------*/
+
+            case 3:  /* Number Of Row Addresses */
+                mvOsOutput("Module Number of row addresses: %d\n", 
+                                                        dimmInfo.numOfRowAddr);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 4:  /* Number Of Column Addresses */
+                mvOsOutput("Module Number of col addresses: %d\n", 
+                                                        dimmInfo.numOfColAddr);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 5:  /* Number Of Module Banks */
+                mvOsOutput("Number of Banks on Mod.:        %d\n",  
+                                                    dimmInfo.numOfModuleBanks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 6:  /* Data Width */
+                mvOsOutput("Module Data Width:              %d bit\n",  
+                                                           dimmInfo.dataWidth);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 8:  /* Voltage Interface */
+                switch(spdRawData[i])
+                {
+                    case 0x0:
+                        mvOsOutput("Module is               TTL_5V_TOLERANT\n");
+                        break;
+                    case 0x1:
+                        mvOsOutput("Module is               LVTTL\n");
+                        break;
+                    case 0x2:
+                        mvOsOutput("Module is               HSTL_1_5V\n");
+                        break;
+                    case 0x3:
+                        mvOsOutput("Module is               SSTL_3_3V\n");
+                        break;
+                    case 0x4:
+                        mvOsOutput("Module is               SSTL_2_5V\n");
+                        break;
+                    case 0x5:
+                        if (dimmInfo.memoryType != MEM_TYPE_SDRAM)
+                        {
+                            mvOsOutput("Module is                 SSTL_1_8V\n");
+                            break;
+                        }
+                    default:
+                        mvOsOutput("Module is               VOLTAGE_UNKNOWN\n");
+                        break;
+                }
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 9:  /* Minimum Cycle Time At Max CasLatancy */
+                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
+                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
+                
+                /* DDR2 addition of right of point */
+                if ((spdRawData[i] & 0x0f) == 0xA)
+                {
+                    rightOfPoint = 25;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xB)
+                {
+                    rightOfPoint = 33;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xC)
+                {
+                    rightOfPoint = 66;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xD)
+                {
+                    rightOfPoint = 75;
+                }
+                mvOsOutput("Minimum Cycle Time At Max CL:   %d.%d [ns]\n",
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 10: /* Clock To Data Out */
+                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 10:100;
+                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                leftOfPoint     = time_tmp / div;
+                rightOfPoint    = time_tmp % div;
+                mvOsOutput("Clock To Data Out:              %d.%d [ns]\n",
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 11: /* Error Check Type */
+                mvOsOutput("Error Check Type (0=NONE):      %d\n", 
+                                                      dimmInfo.errorCheckType);
+                break;
+/*----------------------------------------------------------------------------*/
+
+            case 12: /* Refresh Interval */
+                mvOsOutput("Refresh Rate:                   %x\n", 
+                                                     dimmInfo.refreshInterval);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 13: /* Sdram Width */
+                mvOsOutput("Sdram Width:                    %d bits\n",     
+                                                          dimmInfo.sdramWidth);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 14: /* Error Check Data Width */
+                mvOsOutput("Error Check Data Width:         %d bits\n", 
+                                                 dimmInfo.errorCheckDataWidth);
+                break;
+/*----------------------------------------------------------------------------*/
+
+           case 15: /* Minimum Clock Delay is unsupported */
+                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
+                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
+                {
+                    mvOsOutput("Minimum Clk Delay back to back: %d\n", 
+                                                                spdRawData[i]);
+                }
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 16: /* Burst Length Supported */
+    /*     SDRAM/DDR1:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
+                    *********************************************************/ 
+    /*     DDR2:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
+                    *********************************************************/ 
+                mvOsOutput("Burst Length Supported: ");
+                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
+                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
+                {
+                    if (dimmInfo.burstLengthSupported & BIT0)
+                        mvOsOutput("1, ");
+                    if (dimmInfo.burstLengthSupported & BIT1)
+                        mvOsOutput("2, ");
+                }
+                if (dimmInfo.burstLengthSupported & BIT2)
+                    mvOsOutput("4, ");
+                if (dimmInfo.burstLengthSupported & BIT3) 
+                    mvOsOutput("8, ");
+                
+                mvOsOutput(" Bit \n");
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 17: /* Number Of Banks On Each Device */
+                mvOsOutput("Number Of Banks On Each Chip:   %d\n",  
+                                              dimmInfo.numOfBanksOnEachDevice);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 18: /* Suported Cas Latencies */
+                   
+            /*      SDRAM:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+            CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
+                    ********************************************************/ 
+
+            /*     DDR 1:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+            CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
+                    *********************************************************/
+
+            /*     DDR 2:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+            CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
+                    *********************************************************/
+
+                mvOsOutput("Suported Cas Latencies: (CL) 			");
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    for (k = 0; k <=7; k++)
+                    {
+                        if (dimmInfo.suportedCasLatencies & (1 << k))
+                            mvOsOutput("%d,             ", k+1);
+                    }
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if (dimmInfo.suportedCasLatencies & BIT0)
+                        mvOsOutput("1, ");
+                    if (dimmInfo.suportedCasLatencies & BIT1)
+                        mvOsOutput("1.5, ");
+                    if (dimmInfo.suportedCasLatencies & BIT2)
+                        mvOsOutput("2, ");
+                    if (dimmInfo.suportedCasLatencies & BIT3)
+                        mvOsOutput("2.5, ");
+                    if (dimmInfo.suportedCasLatencies & BIT4)
+                        mvOsOutput("3, ");
+                    if (dimmInfo.suportedCasLatencies & BIT5)
+                        mvOsOutput("3.5, ");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                {
+                    if (dimmInfo.suportedCasLatencies & BIT2)
+                        mvOsOutput("2, ");
+                    if (dimmInfo.suportedCasLatencies & BIT3)
+                        mvOsOutput("3, ");
+                    if (dimmInfo.suportedCasLatencies & BIT4)
+                        mvOsOutput("4, ");
+                    if (dimmInfo.suportedCasLatencies & BIT5)
+                        mvOsOutput("5, ");		
+                }
+                else
+                    mvOsOutput("?.?, ");		
+                mvOsOutput("\n");
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 20:   /* DDR2 DIMM type info */
+                if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                {
+                    if (dimmInfo.dimmTypeInfo & (BIT0 | BIT4))
+                        mvOsOutput("Registered DIMM (RDIMM)\n");
+                    else if (dimmInfo.dimmTypeInfo & (BIT1 | BIT5))
+                        mvOsOutput("Unbuffered DIMM (UDIMM)\n");
+                    else 
+                        mvOsOutput("Unknown DIMM type.\n");
+                }
+
+                break;
+/*----------------------------------------------------------------------------*/
+   
+            case 21: /* SDRAM Modules Attributes */
+                mvOsOutput("\nModule Attributes (SPD Byte 21): \n");
+                
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    if (dimmInfo.dimmAttributes & BIT0)
+                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
+                    else
+                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
+
+                    if (dimmInfo.dimmAttributes & BIT1)
+                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
+                    else
+                        mvOsOutput(" Registered Addr/Control Input: No\n");
+   
+                    if (dimmInfo.dimmAttributes & BIT2)
+                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
+                    else
+                        mvOsOutput(" On-Card PLL (clock):           No \n");
+
+                    if (dimmInfo.dimmAttributes & BIT3)
+                        mvOsOutput(" Bufferd DQMB Input:            Yes \n");
+                    else
+                        mvOsOutput(" Bufferd DQMB Inputs:           No \n");
+   
+                    if (dimmInfo.dimmAttributes & BIT4)
+                        mvOsOutput(" Registered DQMB Inputs:        Yes \n");
+                    else
+                        mvOsOutput(" Registered DQMB Inputs:        No \n");
+ 
+                    if (dimmInfo.dimmAttributes & BIT5)
+                        mvOsOutput(" Differential Clock Input:      Yes \n");
+                    else
+                        mvOsOutput(" Differential Clock Input:      No \n");
+   
+                    if (dimmInfo.dimmAttributes & BIT6)
+                        mvOsOutput(" redundant Row Addressing:      Yes \n");
+                    else
+                        mvOsOutput(" redundant Row Addressing:      No \n");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if (dimmInfo.dimmAttributes & BIT0)
+                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
+                    else 
+                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
+   
+                    if (dimmInfo.dimmAttributes & BIT1)
+                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
+                    else
+                        mvOsOutput(" Registered Addr/Control Input: No\n");
+   
+                    if (dimmInfo.dimmAttributes & BIT2)
+                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
+                    else
+                        mvOsOutput(" On-Card PLL (clock):           No \n");
+            
+                    if (dimmInfo.dimmAttributes & BIT3)
+                        mvOsOutput(" FET Switch On-Card Enabled:    Yes \n");
+                    else
+                        mvOsOutput(" FET Switch On-Card Enabled:    No \n");
+                    
+                    if (dimmInfo.dimmAttributes & BIT4)
+                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
+                    else
+                        mvOsOutput(" FET Switch External Enabled:   No \n");
+
+                    if (dimmInfo.dimmAttributes & BIT5)
+                        mvOsOutput(" Differential Clock Input:      Yes \n");
+                    else
+                        mvOsOutput(" Differential Clock Input:      No \n");
+                }
+                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
+                {
+                    mvOsOutput(" Number of Active Registers on the DIMM: %d\n", 
+                                        (dimmInfo.dimmAttributes & 0x3) + 1);
+            
+                    mvOsOutput(" Number of PLLs on the DIMM: %d\n", 
+                                      ((dimmInfo.dimmAttributes) >> 2) & 0x3);
+               
+                    if (dimmInfo.dimmAttributes & BIT4)
+                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
+                    else
+                        mvOsOutput(" FET Switch External Enabled:   No \n");
+
+                    if (dimmInfo.dimmAttributes & BIT6)
+                        mvOsOutput(" Analysis probe installed:      Yes \n");
+                    else
+                        mvOsOutput(" Analysis probe installed:      No \n");
+                }
+                
+                break;
+/*----------------------------------------------------------------------------*/
+
+            case 22: /* Suported AutoPreCharge */
+                mvOsOutput("\nModul Attributes (SPD Byte 22): \n");
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    if ( spdRawData[i] & BIT0 )
+                        mvOsOutput(" Early Ras Precharge:           Yes \n");
+                    else
+                        mvOsOutput(" Early Ras Precharge:           No \n");
+                                                        
+                    if ( spdRawData[i] & BIT1 )                 
+                        mvOsOutput(" AutoPreCharge:                 Yes \n");
+                    else
+                        mvOsOutput(" AutoPreCharge:                 No \n");
+                                                            
+                    if ( spdRawData[i] & BIT2 )                 
+                        mvOsOutput(" Precharge All:                 Yes \n");
+                    else
+                        mvOsOutput(" Precharge All:                 No \n");
+                                                        
+                    if ( spdRawData[i] & BIT3 )                 
+                        mvOsOutput(" Write 1/ReadBurst:             Yes \n");
+                    else
+                        mvOsOutput(" Write 1/ReadBurst:             No \n");
+                                                        
+                    if ( spdRawData[i] & BIT4 )                 
+                        mvOsOutput(" lower VCC tolerance:           5%%\n");
+                    else
+                        mvOsOutput(" lower VCC tolerance:           10%%\n");
+                                                        
+                    if ( spdRawData[i] & BIT5 )                 
+                        mvOsOutput(" upper VCC tolerance:           5%%\n");
+                    else
+                        mvOsOutput(" upper VCC tolerance:           10%%\n");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if ( spdRawData[i] & BIT0 )
+                        mvOsOutput(" Supports Weak Driver:          Yes \n");
+                    else
+                        mvOsOutput(" Supports Weak Driver:          No \n");
+
+                    if ( !(spdRawData[i] & BIT4) )
+                        mvOsOutput(" lower VCC tolerance:           0.2V\n");
+   
+                    if ( !(spdRawData[i] & BIT5) )
+                        mvOsOutput(" upper VCC tolerance:           0.2V\n");
+
+                    if ( spdRawData[i] & BIT6 )
+                        mvOsOutput(" Concurrent Auto Preharge:      Yes \n");
+                    else
+                        mvOsOutput(" Concurrent Auto Preharge:      No \n");
+
+                    if ( spdRawData[i] & BIT7 )
+                        mvOsOutput(" Supports Fast AP:              Yes \n");
+                    else
+                        mvOsOutput(" Supports Fast AP:              No \n");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                {
+                    if ( spdRawData[i] & BIT0 )
+                        mvOsOutput(" Supports Weak Driver:          Yes \n");
+                    else
+                        mvOsOutput(" Supports Weak Driver:          No \n");
+                }
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 23:
+            /* Minimum Cycle Time At Maximum Cas Latancy Minus 1 (2nd highest CL) */
+                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
+                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
+                
+                /* DDR2 addition of right of point */
+                if ((spdRawData[i] & 0x0f) == 0xA)
+                {
+                    rightOfPoint = 25;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xB)
+                {
+                    rightOfPoint = 33;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xC)
+                {
+                    rightOfPoint = 66;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xD)
+                {
+                    rightOfPoint = 75;
+                }
+
+                mvOsOutput("Minimum Cycle Time At 2nd highest CasLatancy"
+                           "(0 = Not supported): %d.%d [ns]\n",
+                           leftOfPoint, rightOfPoint );
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 24: /* Clock To Data Out 2nd highest Cas Latency Value*/
+                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 10:100;
+                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                    ((spdRawData[i] & 0x0f));
+                leftOfPoint     = time_tmp / div;
+                rightOfPoint    = time_tmp % div;
+                mvOsOutput("Clock To Data Out (2nd CL value): 		%d.%d [ns]\n",
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 25: 
+            /* Minimum Cycle Time At Maximum Cas Latancy Minus 2 (3rd highest CL) */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
+                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
+                }
+                else    /* DDR1 or DDR2 */ 
+                {
+                    leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
+                    rightOfPoint = (spdRawData[i] & 0x0f) * 10;
+                    
+                    /* DDR2 addition of right of point */
+                    if ((spdRawData[i] & 0x0f) == 0xA)
+                    {
+                        rightOfPoint = 25;
+                    }
+                    if ((spdRawData[i] & 0x0f) == 0xB)
+                    {
+                        rightOfPoint = 33;
+                    }
+                    if ((spdRawData[i] & 0x0f) == 0xC)
+                    {
+                        rightOfPoint = 66;
+                    }
+                    if ((spdRawData[i] & 0x0f) == 0xD)
+                    {
+                        rightOfPoint = 75;
+                    }
+                }
+                mvOsOutput("Minimum Cycle Time At 3rd highest CasLatancy" 
+                           "(0 = Not supported): %d.%d [ns]\n",
+                           leftOfPoint, rightOfPoint );
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 26: /* Clock To Data Out 3rd highest Cas Latency Value*/
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
+                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
+                }
+                else    /* DDR1 or DDR2 */ 
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint     = 0;
+                    rightOfPoint    = time_tmp;
+                }
+                mvOsOutput("Clock To Data Out (3rd CL value): 		%d.%2d[ns]\n",
+                                                  leftOfPoint, rightOfPoint );
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 27: /* Minimum Row Precharge Time */
+                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
+                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0xff : 0xfc;
+                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0x00 : 0x03;
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
+                temp = ((leftOfPoint*100) + rightOfPoint);/* in 10ps Intervals*/
+                trp_clocks = (temp + (busClkPs-1)) /  busClkPs;    
+                mvOsOutput("Minimum Row Precharge Time [ns]: 		%d.%d = " 
+                           "in Clk cycles %d\n", 
+                           leftOfPoint, rightOfPoint, trp_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 28: /* Minimum Row Active to Row Active Time */
+                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
+                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0xff : 0xfc;
+                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0x00 : 0x03;
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
+                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
+                trrd_clocks = (temp + (busClkPs-1)) / busClkPs;
+                mvOsOutput("Minimum Row Active -To- Row Active Delay [ns]: " 
+                           "%d.%d = in Clk cycles %d\n",
+                            leftOfPoint, rightOfPoint, trp_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 29: /* Minimum Ras-To-Cas Delay */
+                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
+                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0xff : 0xfc;
+                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0x00 : 0x03;
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;  
+                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
+                trcd_clocks = (temp + (busClkPs-1) )/ busClkPs;
+                mvOsOutput("Minimum Ras-To-Cas Delay [ns]: 			%d.%d = "
+                           "in Clk cycles %d\n", 
+                           leftOfPoint, rightOfPoint, trp_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+   
+            case 30: /* Minimum Ras Pulse Width */
+                tras_clocks = (cas2ps(spdRawData[i])+(busClkPs-1)) / busClkPs;
+                mvOsOutput("Minimum Ras Pulse Width [ns]: 			%d = "
+                           "in Clk cycles %d\n", spdRawData[i], tras_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 31: /* Module Bank Density */
+                mvOsOutput("Module Bank Density (more than 1= Multisize-Module):");
+
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    if (dimmInfo.dimmBankDensity & BIT0)
+                        mvOsOutput("1GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT1)
+                        mvOsOutput("8MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT2)
+                        mvOsOutput("16MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT3)
+                        mvOsOutput("32MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT4)
+                        mvOsOutput("64MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT5)
+                        mvOsOutput("128MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT6) 
+                        mvOsOutput("256MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT7) 
+                        mvOsOutput("512MB, ");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if (dimmInfo.dimmBankDensity & BIT0)
+                        mvOsOutput("1GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT1)
+                        mvOsOutput("2GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT2)
+                        mvOsOutput("16MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT3)
+                        mvOsOutput("32MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT4)
+                        mvOsOutput("64MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT5)
+                        mvOsOutput("128MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT6) 
+                        mvOsOutput("256MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT7) 
+                        mvOsOutput("512MB, ");
+                }
+                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
+                {
+                    if (dimmInfo.dimmBankDensity & BIT0)
+                        mvOsOutput("1GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT1)
+                        mvOsOutput("2GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT2)
+                        mvOsOutput("4GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT3)
+                        mvOsOutput("8GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT4)
+                        mvOsOutput("16GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT5)
+                    mvOsOutput("128MB, ");
+                        if (dimmInfo.dimmBankDensity & BIT6) 
+                    mvOsOutput("256MB, ");
+                        if (dimmInfo.dimmBankDensity & BIT7) 
+                    mvOsOutput("512MB, ");
+                }
+                mvOsOutput("\n");
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 32: /* Address And Command Setup Time (measured in ns/1000) */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                    leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100; 
+                }
+                mvOsOutput("Address And Command Setup Time [ns]: 		%d.%d\n",
+                                                     leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 33: /* Address And Command Hold Time */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                    leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100;                 
+                }
+                mvOsOutput("Address And Command Hold Time [ns]: 		%d.%d\n",
+                                                   leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 34: /* Data Input Setup Time */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                        leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100;                 
+                }
+                mvOsOutput("Data Input Setup Time [ns]: 			%d.%d\n", 
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 35: /* Data Input Hold Time */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                        leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100;                 
+                }
+                mvOsOutput("Data Input Hold Time [ns]: 			%d.%d\n\n", 
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 36: /* Relevant for DDR2 only: Write Recovery Time */
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> 2);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint) * 25;  
+                mvOsOutput("Write Recovery Time [ns]: 			%d.%d\n", 
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+        }
+    
+}
+
+
+/*
+ * translate ns.ns/10 coding of SPD timing values
+ * into ps unit values
+ */
+/*******************************************************************************
+*  cas2ps - Translate x.y ns parameter to pico-seconds values
+*
+* DESCRIPTION:
+*       This function translates x.y nano seconds to its value in pico seconds.
+*       For example 3.75ns will return 3750.
+*
+* INPUT:
+*       spd_byte - DIMM SPD byte.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       value in pico seconds.
+*
+*******************************************************************************/
+static MV_U32  cas2ps(MV_U8 spd_byte)
+{
+    MV_U32 ns, ns10;
+    
+    /* isolate upper nibble */
+    ns = (spd_byte >> 4) & 0x0F;
+    /* isolate lower nibble */
+    ns10 = (spd_byte & 0x0F);
+    
+    if( ns10 < 10 ) {
+        ns10 *= 10;
+    }
+    else if( ns10 == 10 )
+        ns10 = 25;
+    else if( ns10 == 11 )
+        ns10 = 33;
+    else if( ns10 == 12 )
+        ns10 = 66;
+    else if( ns10 == 13 )
+        ns10 = 75;
+    else 
+    {
+        mvOsOutput("cas2ps Err. unsupported cycle time.\n");
+    }
+    
+    return (ns*1000 + ns10*10);
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h
new file mode 100644
index 00000000..678e2245
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h
@@ -0,0 +1,191 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvDram
+#define __INCmvDram
+
+#include "ddr1_2/mvDramIf.h"
+#include "twsi/mvTwsi.h"
+
+#define MAX_DIMM_NUM 			2
+#define SPD_SIZE			128
+
+/* Dimm spd offsets */
+#define DIMM_MEM_TYPE 						2
+#define DIMM_ROW_NUM 						3
+#define DIMM_COL_NUM 						4
+#define DIMM_MODULE_BANK_NUM 				5
+#define DIMM_DATA_WIDTH 					6
+#define DIMM_VOLT_IF 						8
+#define DIMM_MIN_CC_AT_MAX_CAS 				9
+#define DIMM_ERR_CHECK_TYPE 				11
+#define DIMM_REFRESH_INTERVAL 				12
+#define DIMM_SDRAM_WIDTH 					13
+#define DIMM_ERR_CHECK_DATA_WIDTH 			14
+#define DIMM_MIN_CLK_DEL 					15
+#define DIMM_BURST_LEN_SUP 					16
+#define DIMM_DEV_BANK_NUM 					17
+#define DIMM_SUP_CAL 						18
+#define DIMM_DDR2_TYPE_INFORMATION          20      /* DDR2 only */
+#define DIMM_BUF_ADDR_CONT_IN 				21
+#define DIMM_MIN_CC_AT_MAX_CAS_MINUS1		23
+#define DIMM_MIN_CC_AT_MAX_CAS_MINUS2		25
+#define DIMM_MIN_ROW_PRECHARGE_TIME			27
+#define DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE	28
+#define DIMM_MIN_RAS_TO_CAS_DELAY			29
+#define DIMM_MIN_RAS_PULSE_WIDTH			30
+#define DIMM_BANK_DENSITY					31
+#define DIMM_MIN_WRITE_RECOVERY_TIME        36
+#define DIMM_MIN_WRITE_TO_READ_CMD_DELAY    37
+#define DIMM_MIN_READ_TO_PRECH_CMD_DELAY    38
+#define DIMM_MIN_REFRESH_TO_ACTIVATE_CMD    42
+
+/* Dimm Memory Type values */
+#define DIMM_MEM_TYPE_SDRAM					0x4
+#define DIMM_MEM_TYPE_DDR1 					0x7
+#define DIMM_MEM_TYPE_DDR2 					0x8
+        
+#define DIMM_MODULE_MANU_OFFS 		64
+#define DIMM_MODULE_MANU_SIZE 		8
+#define DIMM_MODULE_VEN_OFFS 		73 
+#define DIMM_MODULE_VEN_SIZE 		25
+#define DIMM_MODULE_ID_OFFS 		99
+#define DIMM_MODULE_ID_SIZE 		18
+
+/* enumeration for voltage levels. */
+typedef enum _mvDimmVoltageIf
+{
+    TTL_5V_TOLERANT, 
+    LVTTL, 
+    HSTL_1_5V, 
+    SSTL_3_3V, 
+    SSTL_2_5V, 
+    VOLTAGE_UNKNOWN, 
+} MV_DIMM_VOLTAGE_IF;
+
+
+/* enumaration for SDRAM CAS Latencies. */
+typedef enum _mvDimmSdramCas
+{
+    SD_CL_1 =1,  
+    SD_CL_2,  
+    SD_CL_3, 
+    SD_CL_4, 
+    SD_CL_5, 
+    SD_CL_6, 
+    SD_CL_7, 
+    SD_FAULT
+}MV_DIMM_SDRAM_CAS;
+
+
+/* DIMM information structure */                                                    
+typedef struct _mvDimmInfo
+{
+    MV_MEMORY_TYPE  memoryType; 	/* DDR or SDRAM */
+
+    MV_U8       spdRawData[SPD_SIZE];  	/* Content of SPD-EEPROM copied 1:1  */
+
+    /* DIMM dimensions */
+    MV_U32  numOfRowAddr;
+    MV_U32  numOfColAddr;
+    MV_U32  numOfModuleBanks;
+    MV_U32  dataWidth;
+    MV_U32  errorCheckType;             /* ECC , PARITY..*/
+    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
+    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
+    MV_U32  burstLengthSupported;
+    MV_U32  numOfBanksOnEachDevice;
+    MV_U32  suportedCasLatencies;
+    MV_U32  refreshInterval;
+    MV_U32  dimmBankDensity;
+    MV_U32  dimmTypeInfo;           /* DDR2 only */
+    MV_U32  dimmAttributes;
+
+    /* DIMM timing parameters */
+    MV_U32  minCycleTimeAtMaxCasLatPs;	
+    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
+    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
+	MV_U32  minRowPrechargeTime;
+	MV_U32  minRowActiveToRowActive;
+	MV_U32  minRasToCasDelay;
+	MV_U32  minRasPulseWidth;
+    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
+    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
+    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
+    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
+
+    /* Parameters calculated from the extracted DIMM information */
+    MV_U32  size;               /* 16,64,128,256 or 512 MByte in MB units */
+    MV_U32  deviceDensity;      /* 16,64,128,256 or 512 Mbit in MB units  */
+    MV_U32  numberOfDevices;
+
+} MV_DIMM_INFO;
+
+
+MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo);
+MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo);
+MV_VOID dimmSpdPrint(MV_U32 dimmNum);
+MV_STATUS dimmSpdCpy(MV_VOID);
+
+#endif /* __INCmvDram */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c
new file mode 100644
index 00000000..12fb26ad
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c
@@ -0,0 +1,1599 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+/* includes */
+#include "ddr1_2/mvDramIf.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+
+
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+/* DRAM bank presence encoding */
+#define BANK_PRESENT_CS0				0x1
+#define BANK_PRESENT_CS0_CS1			0x3
+#define BANK_PRESENT_CS0_CS2			0x5
+#define BANK_PRESENT_CS0_CS1_CS2		0x7
+#define BANK_PRESENT_CS0_CS2_CS3		0xd
+#define BANK_PRESENT_CS0_CS2_CS3_CS4	0xf
+
+/* locals   */
+static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin);
+#if defined(MV_INC_BOARD_DDIM)
+static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo);
+static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas);
+static MV_U32 sdramModeRegCalc(MV_U32 minCas);
+static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo);
+static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo);
+static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk);
+static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk, 
+						 MV_U32 forcedCl);
+static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
+									  MV_U32 minCas, MV_U32 busClk);
+static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
+									   MV_U32 busClk);
+
+/*******************************************************************************
+* mvDramIfDetect - Prepare DRAM interface configuration values.
+*
+* DESCRIPTION:
+*       This function implements the full DRAM detection and timing 
+*       configuration for best system performance.
+*       Since this routine runs from a ROM device (Boot Flash), its stack 
+*       resides on RAM, that might be the system DRAM. Changing DRAM 
+*       configuration values while keeping vital data in DRAM is risky. That
+*       is why the function does not preform the configuration setting but 
+*       prepare those in predefined 32bit registers (in this case IDMA 
+*       registers are used) for other routine to perform the settings.
+*       The function will call for board DRAM SPD information for each DRAM 
+*       chip select. The function will then analyze those SPD parameters of 
+*       all DRAM banks in order to decide on DRAM configuration compatible 
+*       for all DRAM banks.
+*       The function will set the CPU DRAM address decode registers.
+*       Note: This routine prepares values that will overide configuration of
+*       mvDramBasicAsmInit().
+*       
+* INPUT:
+*       forcedCl - Forced CAL Latency. If equal to zero, do not force.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvDramIfDetect(MV_U32 forcedCl)
+{
+	MV_U32 retVal = MV_OK;	/* return value */
+	MV_DRAM_BANK_INFO bankInfo[MV_DRAM_MAX_CS];
+	MV_U32  busClk, size, base = 0, i, temp, deviceW, dimmW;
+	MV_U8	minCas;
+	MV_DRAM_DEC_WIN dramDecWin;
+
+	dramDecWin.addrWin.baseHigh = 0;
+
+	busClk = mvBoardSysClkGet();
+	
+	if (0 == busClk)
+	{
+		mvOsPrintf("Dram: ERR. Can't detect system clock! \n");
+		return MV_ERROR;
+	}
+	
+	/* Close DRAM banks except bank 0 (in case code is excecuting from it...) */
+#if defined(MV_INCLUDE_SDRAM_CS1)
+	for(i= SDRAM_CS1; i < MV_DRAM_MAX_CS; i++)
+		mvCpuIfTargetWinEnable(i, MV_FALSE);
+#endif
+
+	/* we will use bank 0 as the representative of the all the DRAM banks,  */
+	/* since bank 0 must exist.                                             */	
+	for(i = 0; i < MV_DRAM_MAX_CS; i++)
+	{ 
+		/* if Bank exist */
+		if(MV_OK == mvDramBankInfoGet(i, &bankInfo[i]))
+		{
+			/* check it isn't SDRAM */
+			if(bankInfo[i].memoryType == MEM_TYPE_SDRAM)
+			{
+				mvOsPrintf("Dram: ERR. SDRAM type not supported !!!\n");
+				return MV_ERROR;
+			}
+			/* All banks must support registry in order to activate it */
+			if(bankInfo[i].registeredAddrAndControlInputs != 
+			   bankInfo[0].registeredAddrAndControlInputs)
+			{
+				mvOsPrintf("Dram: ERR. different Registered settings !!!\n");
+				return MV_ERROR;
+			}
+
+			/* Init the CPU window decode */
+			/* Note that the size in Bank info is in MB units 			*/
+			/* Note that the Dimm width might be different then the device DRAM width */
+			temp = MV_REG_READ(SDRAM_CONFIG_REG);
+			
+			deviceW = ((temp & SDRAM_DWIDTH_MASK) == SDRAM_DWIDTH_16BIT )? 16 : 32;
+			dimmW = bankInfo[0].dataWidth - (bankInfo[0].dataWidth % 16);
+			size = ((bankInfo[i].size << 20) / (dimmW/deviceW)); 
+
+			/* We can not change DRAM window settings while excecuting  	*/
+			/* code from it. That is why we skip the DRAM CS[0], saving     */
+			/* it to the ROM configuration routine	*/
+			if(i == SDRAM_CS0)
+			{
+				MV_U32 sizeToReg;
+				
+				/* Translate the given window size to register format */
+				sizeToReg = ctrlSizeToReg(size, SCSR_SIZE_ALIGNMENT);
+
+				/* Size parameter validity check. */
+				if (-1 == sizeToReg)
+				{
+					mvOsPrintf("mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n"
+							   ,i);
+					return MV_BAD_PARAM;
+				}
+                
+				/* Size is located at upper 16 bits */
+				sizeToReg <<= SCSR_SIZE_OFFS;
+
+				/* enable it */
+				sizeToReg |= SCSR_WIN_EN;
+
+				MV_REG_WRITE(DRAM_BUF_REG0, sizeToReg);
+			}
+			else
+			{
+				dramDecWin.addrWin.baseLow = base;
+				dramDecWin.addrWin.size = size;
+				dramDecWin.enable = MV_TRUE;
+				
+				if (MV_OK != mvDramIfWinSet(SDRAM_CS0 + i, &dramDecWin))
+				{
+					mvOsPrintf("Dram: ERR. Fail to set bank %d!!!\n", 
+							   SDRAM_CS0 + i);
+					return MV_ERROR;
+				}
+			}
+			
+			base += size;
+
+			/* update the suportedCasLatencies mask */
+			bankInfo[0].suportedCasLatencies &= bankInfo[i].suportedCasLatencies;
+
+		}
+		else
+		{
+			if( i == 0 ) /* bank 0 doesn't exist */
+			{
+				mvOsPrintf("Dram: ERR. Fail to detect bank 0 !!!\n");
+				return MV_ERROR;
+			}
+			else
+			{
+				DB(mvOsPrintf("Dram: Could not find bank %d\n", i));
+				bankInfo[i].size = 0;     /* Mark this bank as non exist */
+			}
+		}
+	}
+
+	/* calculate minimum CAS */
+	minCas = minCasCalc(&bankInfo[0], busClk, forcedCl);
+	if (0 == minCas) 
+	{
+		mvOsOutput("Dram: Warn: Could not find CAS compatible to SysClk %dMhz\n",
+				   (busClk / 1000000));
+
+		if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+		{
+			minCas = DDR2_CL_4; /* Continue with this CAS */
+			mvOsPrintf("Set default CAS latency 4\n");
+		}
+		else
+		{
+			minCas = DDR1_CL_3; /* Continue with this CAS */
+			mvOsPrintf("Set default CAS latency 3\n");
+		}
+	}
+
+	/* calc SDRAM_CONFIG_REG  and save it to temp register */
+	temp = sdramConfigRegCalc(&bankInfo[0], busClk);
+	if(-1 == temp)
+	{
+		mvOsPrintf("Dram: ERR. sdramConfigRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	MV_REG_WRITE(DRAM_BUF_REG1, temp);
+
+	/* calc SDRAM_MODE_REG  and save it to temp register */ 
+	temp = sdramModeRegCalc(minCas);
+	if(-1 == temp)
+	{
+		mvOsPrintf("Dram: ERR. sdramModeRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	MV_REG_WRITE(DRAM_BUF_REG2, temp);
+
+	/* calc SDRAM_EXTENDED_MODE_REG  and save it to temp register */ 
+	temp = sdramExtModeRegCalc(&bankInfo[0]);
+	if(-1 == temp)
+	{
+		mvOsPrintf("Dram: ERR. sdramModeRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	MV_REG_WRITE(DRAM_BUF_REG10, temp);
+
+	/* calc D_UNIT_CONTROL_LOW  and save it to temp register */
+	temp = dunitCtrlLowRegCalc(&bankInfo[0], minCas); 
+	if(-1 == temp)
+	{
+		mvOsPrintf("Dram: ERR. dunitCtrlLowRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	MV_REG_WRITE(DRAM_BUF_REG3, temp); 
+
+	/* calc SDRAM_ADDR_CTRL_REG  and save it to temp register */
+	temp = sdramAddrCtrlRegCalc(&bankInfo[0]);
+	if(-1 == temp)
+	{
+		mvOsPrintf("Dram: ERR. sdramAddrCtrlRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	MV_REG_WRITE(DRAM_BUF_REG4, temp);
+
+	/* calc SDRAM_TIMING_CTRL_LOW_REG  and save it to temp register */
+	temp = sdramTimeCtrlLowRegCalc(&bankInfo[0], minCas, busClk);
+	if(-1 == temp)
+	{
+		mvOsPrintf("Dram: ERR. sdramTimeCtrlLowRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	MV_REG_WRITE(DRAM_BUF_REG5, temp);
+
+	/* calc SDRAM_TIMING_CTRL_HIGH_REG  and save it to temp register */
+	temp = sdramTimeCtrlHighRegCalc(&bankInfo[0], busClk);
+	if(-1 == temp)
+	{
+		mvOsPrintf("Dram: ERR. sdramTimeCtrlHighRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	MV_REG_WRITE(DRAM_BUF_REG6, temp);
+
+	/* Config DDR2 On Die Termination (ODT) registers */
+	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+	{
+		sdramDDr2OdtConfig(bankInfo);
+	}
+	
+	/* Note that DDR SDRAM Address/Control and Data pad calibration     */
+	/* settings is done in mvSdramIfConfig.s                            */
+
+	return retVal;
+}
+
+/*******************************************************************************
+* minCasCalc - Calculate the Minimum CAS latency which can be used.
+*
+* DESCRIPTION:
+*	Calculate the minimum CAS latency that can be used, base on the DRAM
+*	parameters and the SDRAM bus Clock freq.
+*
+* INPUT:
+*	busClk    - the DRAM bus Clock.
+*	pBankInfo - bank info parameters.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       The minimum CAS Latency. The function returns 0 if max CAS latency
+*		supported by banks is incompatible with system bus clock frequancy.
+*
+*******************************************************************************/
+static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk, 
+						 MV_U32 forcedCl)
+{
+	MV_U32 count = 1, j;
+	MV_U32 busClkPs = 1000000000 / (busClk / 1000);  /* in ps units */
+	MV_U32 startBit, stopBit;
+	
+	/*     DDR 1:
+			*******-******-******-******-******-******-******-******* 
+			* bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+			*******-******-******-******-******-******-******-******* 
+	CAS	=	* TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
+			*********************************************************/
+	
+	/*     DDR 2:
+			*******-******-******-******-******-******-******-******* 
+			* bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+			*******-******-******-******-******-******-******-******* 
+	CAS	=	* TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
+			*********************************************************/
+	
+	
+	/* If we are asked to use the forced CAL */
+	if (forcedCl)
+	{
+		mvOsPrintf("DRAM: Using forced CL %d.%d\n", (forcedCl / 10), 
+													(forcedCl % 10));
+	
+		if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+		{
+			if (forcedCl == 30)
+				pBankInfo->suportedCasLatencies = 0x08;
+			else if (forcedCl == 40)
+				pBankInfo->suportedCasLatencies = 0x10;
+			else
+			{
+				mvOsPrintf("Forced CL %d.%d not supported. Set default CL 4\n", 
+						   (forcedCl / 10), (forcedCl % 10));
+				pBankInfo->suportedCasLatencies = 0x10;
+			}
+		}
+		else
+		{
+			if (forcedCl == 15)
+				pBankInfo->suportedCasLatencies = 0x02;
+			else if (forcedCl == 20)
+				pBankInfo->suportedCasLatencies = 0x04;
+			else if (forcedCl == 25)
+				pBankInfo->suportedCasLatencies = 0x08;
+			else if (forcedCl == 30)
+				pBankInfo->suportedCasLatencies = 0x10;
+			else if (forcedCl == 40)
+				pBankInfo->suportedCasLatencies = 0x40;
+			else
+			{
+				mvOsPrintf("Forced CL %d.%d not supported. Set default CL 3\n", 
+						   (forcedCl / 10), (forcedCl % 10));
+				pBankInfo->suportedCasLatencies = 0x10;
+			}
+		}
+	
+		return pBankInfo->suportedCasLatencies;        
+	}   
+	
+	/* go over the supported cas mask from Max Cas down and check if the 	*/
+	/* SysClk stands in its time requirments.								*/
+	
+	
+	DB(mvOsPrintf("Dram: minCasCalc supported mask = %x busClkPs = %x \n",
+								pBankInfo->suportedCasLatencies,busClkPs ));
+	for(j = 7; j > 0; j--)
+	{
+		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
+		{
+			/* Reset the bits for CL incompatible for the sysClk            */
+			switch (count)
+			{
+				case 1: 
+					if (pBankInfo->minCycleTimeAtMaxCasLatPs > busClkPs) 
+						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				case 2: 
+					if (pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps > busClkPs)
+						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				case 3: 
+					if (pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps > busClkPs)
+						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				default: 
+					pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					break;
+			}
+		}
+	}
+	
+	DB(mvOsPrintf("Dram: minCasCalc support = %x (after SysCC calc)\n",
+				  pBankInfo->suportedCasLatencies ));
+	
+	/* SDRAM DDR1 controller supports CL 1.5 to 3.5 */
+	/* SDRAM DDR2 controller supports CL 3 to 5     */
+	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+	{
+		startBit = 3;   /* DDR2 support CL start with CL3 (bit 3) */
+		stopBit  = 5;   /* DDR2 support CL stops with CL5 (bit 5) */
+	}
+	else
+	{
+		startBit = 1;   /* DDR1 support CL start with CL1.5 (bit 3) */
+		stopBit  = 4;   /* DDR1 support CL stops with CL3 (bit 4)   */
+	}
+	
+	for(j = startBit; j <= stopBit ; j++)
+	{
+		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
+		{
+			DB(mvOsPrintf("Dram: minCasCalc choose CAS %x \n",(BIT0 << j)));
+			return (BIT0 << j);
+		}
+	}
+	
+	return 0; 
+}
+
+/*******************************************************************************
+* sdramConfigRegCalc - Calculate sdram config register
+*
+* DESCRIPTION: Calculate sdram config register optimized value based
+*			on the bank info parameters.
+*
+* INPUT:
+*	pBankInfo - sdram bank parameters
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram config reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk)
+{
+	MV_U32 sdramConfig = 0;
+	MV_U32 refreshPeriod;
+	
+	busClk /= 1000000; /* we work with busClk in MHz */
+	
+	sdramConfig = MV_REG_READ(SDRAM_CONFIG_REG);
+	
+	/* figure out the memory refresh internal */
+	switch (pBankInfo->refreshInterval & 0xf)
+	{
+		case 0x0: /* refresh period is 15.625 usec */
+			refreshPeriod = 15625;
+			break;
+		case 0x1: /* refresh period is 3.9 usec  	*/
+			refreshPeriod = 3900;
+			break;
+		case 0x2: /* refresh period is 7.8 usec 	*/
+			refreshPeriod = 7800;
+			break;
+		case 0x3: /* refresh period is 31.3 usec	*/
+			refreshPeriod = 31300;
+			break;
+		case 0x4: /* refresh period is 62.5 usec	*/
+			refreshPeriod = 62500;
+			break;
+		case 0x5: /* refresh period is 125 usec 	*/
+			refreshPeriod = 125000;
+			break;
+		default:  /* refresh period undefined 					*/
+			mvOsPrintf("Dram: ERR. DRAM refresh period is unknown!\n");
+			return -1;
+	}
+	
+	/* Now the refreshPeriod is in register format value */
+	refreshPeriod = (busClk * refreshPeriod) / 1000;
+	
+	DB(mvOsPrintf("Dram: sdramConfigRegCalc calculated refresh interval %0x\n", 
+				  refreshPeriod));
+
+	/* make sure the refresh value is only 14 bits */
+	if(refreshPeriod > SDRAM_REFRESH_MAX)
+	{
+		refreshPeriod = SDRAM_REFRESH_MAX;
+		DB(mvOsPrintf("Dram: sdramConfigRegCalc adjusted refresh interval %0x\n", 
+					  refreshPeriod));
+	}
+	
+	/* Clear the refresh field */
+	sdramConfig &= ~SDRAM_REFRESH_MASK;
+	
+	/* Set new value to refresh field */
+	sdramConfig |= (refreshPeriod & SDRAM_REFRESH_MASK);
+	
+	/*  registered DRAM ? */
+	if ( pBankInfo->registeredAddrAndControlInputs )
+	{
+		/* it's registered DRAM, so set the reg. DRAM bit */
+		sdramConfig |= SDRAM_REGISTERED;
+		mvOsPrintf("DRAM Attribute: Registered address and control inputs.\n");
+	}
+	
+	/* set DDR SDRAM devices configuration */
+	sdramConfig &= ~SDRAM_DCFG_MASK;    /* Clear Dcfg field */
+	
+	switch (pBankInfo->sdramWidth)
+	{
+		case 8:  /* memory is x8 */
+			sdramConfig |= SDRAM_DCFG_X8_DEV;
+			DB(mvOsPrintf("Dram: sdramConfigRegCalc SDRAM device width x8\n"));
+			break;
+		case 16:
+			sdramConfig |= SDRAM_DCFG_X16_DEV;
+			DB(mvOsPrintf("Dram: sdramConfigRegCalc SDRAM device width x16\n"));
+			break;
+		default: /* memory width unsupported */
+			mvOsPrintf("Dram: ERR. DRAM chip width is unknown!\n");
+			return -1;
+	}
+
+	/* Set static default settings */
+	sdramConfig |= SDRAM_CONFIG_DV;
+	
+	DB(mvOsPrintf("Dram: sdramConfigRegCalc set sdramConfig to 0x%x\n",
+				  sdramConfig));
+	
+	return sdramConfig;  
+}
+
+/*******************************************************************************
+* sdramModeRegCalc - Calculate sdram mode register
+*
+* DESCRIPTION: Calculate sdram mode register optimized value based
+*			on the bank info parameters and the minCas.
+*
+* INPUT:
+*	minCas	  - minimum CAS supported. 
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram mode reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramModeRegCalc(MV_U32 minCas)
+{
+	MV_U32 sdramMode;
+		
+	sdramMode = MV_REG_READ(SDRAM_MODE_REG);
+	
+	/* Clear CAS Latency field */
+	sdramMode &= ~SDRAM_CL_MASK;
+	
+	mvOsPrintf("DRAM CAS Latency ");
+	
+	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+	{            	
+		switch (minCas)
+		{
+			case DDR2_CL_3: 
+				sdramMode |= SDRAM_DDR2_CL_3;
+				mvOsPrintf("3.\n");
+				break;
+			case DDR2_CL_4: 
+				sdramMode |= SDRAM_DDR2_CL_4;
+				mvOsPrintf("4.\n");
+				break;
+			case DDR2_CL_5: 
+				sdramMode |= SDRAM_DDR2_CL_5;
+				mvOsPrintf("5.\n");
+				break;
+			default:
+				mvOsPrintf("\nsdramModeRegCalc ERROR: Max. CL out of range\n");
+				return -1;
+		}
+	sdramMode |= DDR2_MODE_REG_DV;
+	}
+	else	/* DDR1 */
+	{
+		switch (minCas)
+		{			
+			case DDR1_CL_1_5: 
+				sdramMode |= SDRAM_DDR1_CL_1_5;
+				mvOsPrintf("1.5\n");
+				break;
+			case DDR1_CL_2: 
+				sdramMode |= SDRAM_DDR1_CL_2;
+				mvOsPrintf("2\n");
+				break;            
+			case DDR1_CL_2_5: 
+				sdramMode |= SDRAM_DDR1_CL_2_5;
+				mvOsPrintf("2.5\n");
+				break;
+			case DDR1_CL_3: 
+				sdramMode |= SDRAM_DDR1_CL_3;
+				mvOsPrintf("3\n");
+				break;
+			case DDR1_CL_4: 
+				sdramMode |= SDRAM_DDR1_CL_4;
+				mvOsPrintf("4\n");
+				break;
+			default:
+				mvOsPrintf("\nsdramModeRegCalc ERROR: Max. CL out of range\n");
+				return -1;	
+		}
+		sdramMode |= DDR1_MODE_REG_DV;		
+	}
+	
+	DB(mvOsPrintf("nsdramModeRegCalc register 0x%x\n", sdramMode ));
+
+	return sdramMode;
+}
+
+/*******************************************************************************
+* sdramExtModeRegCalc - Calculate sdram Extended mode register
+*
+* DESCRIPTION: 
+*		Return sdram Extended mode register value based
+*		on the bank info parameters and bank presence.
+*
+* INPUT:
+*	pBankInfo - sdram bank parameters
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram Extended mode reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo)
+{
+	MV_U32 populateBanks = 0;
+	int bankNum;
+	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+	{
+	/* Represent the populate banks in binary form */
+	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+		if (0 != pBankInfo[bankNum].size)
+		{
+				populateBanks |= (1 << bankNum);
+			}
+		}
+	
+		switch(populateBanks)
+		{
+			case(BANK_PRESENT_CS0):
+				return DDR_SDRAM_EXT_MODE_CS0_DV;
+		
+			case(BANK_PRESENT_CS0_CS1):
+				return DDR_SDRAM_EXT_MODE_CS0_DV;
+		
+			case(BANK_PRESENT_CS0_CS2):
+				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
+		
+			case(BANK_PRESENT_CS0_CS1_CS2):
+				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
+		
+			case(BANK_PRESENT_CS0_CS2_CS3):
+				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
+		
+			case(BANK_PRESENT_CS0_CS2_CS3_CS4):
+				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
+		
+			default:
+				mvOsPrintf("sdramExtModeRegCalc: Invalid DRAM bank presence\n");
+				return -1;
+		} 
+	}
+	return 0;
+}
+
+/*******************************************************************************
+* dunitCtrlLowRegCalc - Calculate sdram dunit control low register
+*
+* DESCRIPTION: Calculate sdram dunit control low register optimized value based
+*			on the bank info parameters and the minCas.
+*
+* INPUT:
+*	pBankInfo - sdram bank parameters
+*	minCas	  - minimum CAS supported. 
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram dunit control low reg value.
+*
+*******************************************************************************/
+static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas)
+{
+	MV_U32 dunitCtrlLow;
+	
+	dunitCtrlLow = MV_REG_READ(SDRAM_DUNIT_CTRL_REG);
+	
+	/* Clear StBurstDel field */
+	dunitCtrlLow &= ~SDRAM_ST_BURST_DEL_MASK;
+	
+#ifdef MV_88W8660
+	/* Clear address/control output timing field */
+	dunitCtrlLow &= ~SDRAM_CTRL_POS_RISE;
+#endif /* MV_88W8660 */
+
+	DB(mvOsPrintf("Dram: dunitCtrlLowRegCalc\n"));
+	
+	/* For proper sample of read data set the Dunit Control register's      */
+	/* stBurstDel bits [27:24]                                              */
+			/********-********-********-********-********-*********
+			* CL=1.5 |  CL=2  | CL=2.5 |  CL=3  |  CL=4  |  CL=5  *
+			*********-********-********-********-********-*********
+Not Reg.	*  0011  |  0011  |  0100  |  0100  |  0101  |  TBD   *
+			*********-********-********-********-********-*********
+Registered	*  0100  |  0100  |  0101  |  0101  |  0110  |  TBD   *
+			*********-********-********-********-********-*********/
+    
+	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+	{
+		switch (minCas)
+		{
+			case DDR2_CL_3: 
+					/* registerd DDR SDRAM? */
+				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE) 		
+					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;
+				else
+					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;
+				break;
+			case DDR2_CL_4: 
+				/* registerd DDR SDRAM? */
+				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE) 		
+					dunitCtrlLow |= 0x6 << SDRAM_ST_BURST_DEL_OFFS;
+				else
+					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;	
+				break;
+			default:
+				mvOsPrintf("Dram: dunitCtrlLowRegCalc Max. CL out of range %d\n", 
+						   minCas);
+				return -1;
+		}
+	}
+	else    /* DDR1 */
+	{
+		switch (minCas)
+		{
+			case DDR1_CL_1_5: 
+				/* registerd DDR SDRAM? */
+				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;
+				else
+					dunitCtrlLow |= 0x3 << SDRAM_ST_BURST_DEL_OFFS;
+				break;
+			case DDR1_CL_2: 
+				/* registerd DDR SDRAM? */
+				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;
+				else
+					dunitCtrlLow |= 0x3 << SDRAM_ST_BURST_DEL_OFFS;
+				break;
+			case DDR1_CL_2_5: 
+				/* registerd DDR SDRAM? */
+				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;
+				else
+					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;	
+				break;
+			case DDR1_CL_3: 
+				/* registerd DDR SDRAM? */
+				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;
+				else
+					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;	
+				break;
+			case DDR1_CL_4: 
+				/* registerd DDR SDRAM? */
+				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+					dunitCtrlLow |= 0x6 << SDRAM_ST_BURST_DEL_OFFS;
+				else
+					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;	
+				break;
+			default:
+				mvOsPrintf("Dram: dunitCtrlLowRegCalc Max. CL out of range %d\n", 
+						   minCas);
+				return -1;
+	}
+	
+	}
+	DB(mvOsPrintf("Dram: Reg dunit control low = %x\n", dunitCtrlLow ));
+
+	return dunitCtrlLow;
+}  
+                                                                    
+/*******************************************************************************
+* sdramAddrCtrlRegCalc - Calculate sdram address control register
+*
+* DESCRIPTION: Calculate sdram address control register optimized value based
+*			on the bank info parameters and the minCas.
+*
+* INPUT:
+*	pBankInfo - sdram bank parameters
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram address control reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo)
+{
+	MV_U32 addrCtrl = 0;
+	
+	/* Set Address Control register static configuration bits */
+	addrCtrl = MV_REG_READ(SDRAM_ADDR_CTRL_REG);
+	
+	/* Set address control default value */
+	addrCtrl |= SDRAM_ADDR_CTRL_DV;  
+	
+	/* Clear DSize field */
+	addrCtrl &= ~SDRAM_DSIZE_MASK;
+	
+	/* Note that density is in MB units */
+	switch (pBankInfo->deviceDensity) 
+	{
+		case 128:                 /* 128 Mbit */
+			DB(mvOsPrintf("DRAM Device Density 128Mbit\n"));
+			addrCtrl |= SDRAM_DSIZE_128Mb;
+			break;
+		case 256:                 /* 256 Mbit */
+			DB(mvOsPrintf("DRAM Device Density 256Mbit\n"));
+			addrCtrl |= SDRAM_DSIZE_256Mb;
+			break;
+		case 512:                /* 512 Mbit */
+			DB(mvOsPrintf("DRAM Device Density 512Mbit\n"));
+			addrCtrl |= SDRAM_DSIZE_512Mb;
+			break;
+		default:
+			mvOsPrintf("Dram: sdramAddrCtrl unsupported RAM-Device size %d\n",
+                       pBankInfo->deviceDensity);
+			return -1;
+	}
+     
+	/* SDRAM address control */
+	DB(mvOsPrintf("Dram: setting sdram address control with: %x \n", addrCtrl));
+
+	return addrCtrl;
+}
+
+/*******************************************************************************
+* sdramTimeCtrlLowRegCalc - Calculate sdram timing control low register
+*
+* DESCRIPTION: 
+*       This function calculates sdram timing control low register 
+*       optimized value based on the bank info parameters and the minCas.
+*
+* INPUT:
+*	    pBankInfo - sdram bank parameters
+*       busClk    - Bus clock
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram timinf control low reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
+                                                MV_U32 minCas, MV_U32 busClk)
+{
+	MV_U32 tRp  = 0;
+	MV_U32 tRrd = 0;
+	MV_U32 tRcd = 0;
+	MV_U32 tRas = 0;
+	MV_U32 tWr  = 0;
+	MV_U32 tWtr = 0;
+	MV_U32 tRtp = 0;
+	
+	MV_U32 bankNum;
+	
+	busClk = busClk / 1000000;    /* In MHz */
+	
+	/* Scan all DRAM banks to find maximum timing values */
+	for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+		tRp  = MV_MAX(tRp,  pBankInfo[bankNum].minRowPrechargeTime);
+		tRrd = MV_MAX(tRrd, pBankInfo[bankNum].minRowActiveToRowActive);
+		tRcd = MV_MAX(tRcd, pBankInfo[bankNum].minRasToCasDelay);
+		tRas = MV_MAX(tRas, pBankInfo[bankNum].minRasPulseWidth);
+	}
+	
+	/* Extract timing (in ns) from SPD value. We ignore the tenth ns part.  */
+	/* by shifting the data two bits right.                                 */
+	tRp  = tRp  >> 2;    /* For example 0x50 -> 20ns                        */
+	tRrd = tRrd >> 2;
+	tRcd = tRcd >> 2;
+	
+	/* Extract clock cycles from time parameter. We need to round up        */
+	tRp  = ((busClk * tRp)  / 1000) + (((busClk * tRp)  % 1000) ? 1 : 0);
+	/* Micron work around for 133MHz */
+	if (busClk == 133)
+		tRp += 1;
+	DB(mvOsPrintf("Dram  Timing Low: tRp = %d ", tRp));
+	tRrd = ((busClk * tRrd) / 1000) + (((busClk * tRrd) % 1000) ? 1 : 0);
+	/* JEDEC min reqeirments tRrd = 2 */
+	if (tRrd < 2)
+		tRrd = 2;
+	DB(mvOsPrintf("tRrd = %d ", tRrd));
+	tRcd = ((busClk * tRcd) / 1000) + (((busClk * tRcd) % 1000) ? 1 : 0);
+	DB(mvOsPrintf("tRcd = %d ", tRcd));
+	tRas = ((busClk * tRas) / 1000) + (((busClk * tRas) % 1000) ? 1 : 0);
+	DB(mvOsPrintf("tRas = %d ", tRas));
+	
+	/* tWr and tWtr is different for DDR1 and DDR2. tRtp is only for DDR2   */
+	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+	{
+		/* Scan all DRAM banks to find maximum timing values */
+		for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+		{
+			tWr  = MV_MAX(tWr,  pBankInfo[bankNum].minWriteRecoveryTime);
+			tWtr = MV_MAX(tWtr, pBankInfo[bankNum].minWriteToReadCmdDelay);
+			tRtp = MV_MAX(tRtp, pBankInfo[bankNum].minReadToPrechCmdDelay);
+		}
+		
+		/* Extract timing (in ns) from SPD value. We ignore the tenth ns    */
+		/* part by shifting the data two bits right.                        */
+		tWr  = tWr  >> 2;    /* For example 0x50 -> 20ns                    */
+		tWtr = tWtr >> 2;
+		tRtp = tRtp >> 2;
+	
+		/* Extract clock cycles from time parameter. We need to round up    */
+		tWr  = ((busClk * tWr)  / 1000) + (((busClk * tWr)  % 1000) ? 1 : 0);
+		DB(mvOsPrintf("tWr = %d ", tWr));
+		tWtr = ((busClk * tWtr) / 1000) + (((busClk * tWtr) % 1000) ? 1 : 0);
+		/* JEDEC min reqeirments tWtr = 2 */
+		if (tWtr < 2)
+			tWtr = 2;
+		DB(mvOsPrintf("tWtr = %d ", tWtr));
+		tRtp = ((busClk * tRtp) / 1000) + (((busClk * tRtp) % 1000) ? 1 : 0);
+		/* JEDEC min reqeirments tRtp = 2 */
+		if (tRtp < 2)
+			tRtp = 2;
+		DB(mvOsPrintf("tRtp = %d ", tRtp));
+	}
+	else
+	{    
+		tWr  = ((busClk*SDRAM_TWR) / 1000) + (((busClk*SDRAM_TWR) % 1000)?1:0);
+		
+		if ((200 == busClk) || ((100 == busClk) && (DDR1_CL_1_5 == minCas)))
+		{
+			tWtr = 2;
+		}
+		else
+		{
+			tWtr = 1;
+		}
+		
+		tRtp = 2; /* Must be set to 0x1 (two cycles) when using DDR1 */
+	}
+	
+	DB(mvOsPrintf("tWtr = %d\n", tWtr));
+	
+	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
+	return (((tRp  - 1) << SDRAM_TRP_OFFS)	|
+			((tRrd - 1) << SDRAM_TRRD_OFFS)	|
+			((tRcd - 1) << SDRAM_TRCD_OFFS)	|
+			((tRas - 1) << SDRAM_TRAS_OFFS)	|
+			((tWr  - 1) << SDRAM_TWR_OFFS)	|
+			((tWtr - 1) << SDRAM_TWTR_OFFS)	|
+			((tRtp - 1) << SDRAM_TRTP_OFFS));
+}
+
+/*******************************************************************************
+* sdramTimeCtrlHighRegCalc - Calculate sdram timing control high register
+*
+* DESCRIPTION: 
+*       This function calculates sdram timing control high register 
+*       optimized value based on the bank info parameters and the bus clock.
+*
+* INPUT:
+*	    pBankInfo - sdram bank parameters
+*       busClk    - Bus clock
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram timinf control high reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
+                                                                MV_U32 busClk)
+{
+	MV_U32 tRfc;
+	MV_U32 timeNs = 0;
+	int bankNum;
+	MV_U32 sdramTw2wCyc = 0;
+	
+	busClk = busClk / 1000000;    /* In MHz */
+	
+	/* tRfc is different for DDR1 and DDR2. */
+	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
+	{
+		MV_U32 bankNum;
+	
+		/* Scan all DRAM banks to find maximum timing values */
+		for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+			timeNs = MV_MAX(timeNs,  pBankInfo[bankNum].minRefreshToActiveCmd);
+	}
+	else
+	{
+		if (pBankInfo[0].deviceDensity == _1G)
+		{
+			timeNs = SDRAM_TRFC_1G;
+		}
+		else
+		{
+			if (200 == busClk)
+			{
+				timeNs = SDRAM_TRFC_64_512M_AT_200MHZ;
+			}
+			else
+			{
+				timeNs = SDRAM_TRFC_64_512M;
+			}
+		}
+	}
+	
+	tRfc = ((busClk * timeNs)  / 1000) + (((busClk * timeNs)  % 1000) ? 1 : 0);
+	
+	DB(mvOsPrintf("Dram  Timing High: tRfc = %d\n", tRfc));
+
+	
+	/* Represent the populate banks in binary form */
+	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+		if (0 != pBankInfo[bankNum].size)
+			sdramTw2wCyc++;
+	}
+
+	/* If we have more the 1 bank then we need the TW2W in 1 for ODT switch */	
+	if (sdramTw2wCyc > 1)
+		sdramTw2wCyc = 1;
+	else
+		sdramTw2wCyc = 0;
+
+	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
+	return ((((tRfc - 1) & SDRAM_TRFC_MASK)	<< SDRAM_TRFC_OFFS)		|
+			((SDRAM_TR2R_CYC - 1)			<< SDRAM_TR2R_OFFS)		|
+			((SDRAM_TR2WW2R_CYC - 1)		<< SDRAM_TR2W_W2R_OFFS)	|
+			(((tRfc - 1) >> 4)				<< SDRAM_TRFC_EXT_OFFS)	|
+			(sdramTw2wCyc					<< SDRAM_TW2W_OFFS));
+	
+}
+
+/*******************************************************************************
+* sdramDDr2OdtConfig - Set DRAM DDR2 On Die Termination registers.
+*
+* DESCRIPTION: 
+*       This function config DDR2 On Die Termination (ODT) registers.
+*	ODT configuration is done according to DIMM presence:
+*	
+*       Presence	  Ctrl Low    Ctrl High  Dunit Ctrl   Ext Mode  
+*	CS0	         0x84210000  0x00000000  0x0000780F  0x00000440 
+*	CS0+CS1          0x84210000  0x00000000  0x0000780F  0x00000440 
+*	CS0+CS2	    	 0x030C030C  0x00000000  0x0000740F  0x00000404 
+*	CS0+CS1+CS2	 0x030C030C  0x00000000  0x0000740F  0x00000404 
+*	CS0+CS2+CS3	 0x030C030C  0x00000000  0x0000740F  0x00000404 
+*	CS0+CS1+CS2+CS3  0x030C030C  0x00000000  0x0000740F  0x00000404 
+*		
+* INPUT:
+*		pBankInfo - bank info parameters.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       None
+*******************************************************************************/
+static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo)
+{
+	MV_U32 populateBanks = 0;
+	MV_U32 odtCtrlLow, odtCtrlHigh, dunitOdtCtrl;
+	int bankNum;
+	
+	/* Represent the populate banks in binary form */
+	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+		if (0 != pBankInfo[bankNum].size)
+		{
+				populateBanks |= (1 << bankNum);
+			}
+		}
+	
+	switch(populateBanks)
+	{
+		case(BANK_PRESENT_CS0):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_DV;
+			break;
+		case(BANK_PRESENT_CS0_CS1):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_DV;
+			break;
+		case(BANK_PRESENT_CS0_CS2):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
+			break;
+		case(BANK_PRESENT_CS0_CS1_CS2):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
+			break;
+		case(BANK_PRESENT_CS0_CS2_CS3):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
+			break;
+		case(BANK_PRESENT_CS0_CS2_CS3_CS4):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
+			break;
+		default:
+			mvOsPrintf("sdramDDr2OdtConfig: Invalid DRAM bank presence\n");
+			return;
+	} 
+	MV_REG_WRITE(DRAM_BUF_REG7, odtCtrlLow);
+	MV_REG_WRITE(DRAM_BUF_REG8, odtCtrlHigh);
+	MV_REG_WRITE(DRAM_BUF_REG9, dunitOdtCtrl);
+	return;
+}
+#endif /* defined(MV_INC_BOARD_DDIM) */
+
+/*******************************************************************************
+* mvDramIfWinSet - Set DRAM interface address decode window
+*
+* DESCRIPTION: 
+*       This function sets DRAM interface address decode window.
+*
+* INPUT:
+*	    target      - System target. Use only SDRAM targets.
+*       pAddrDecWin - SDRAM address window structure.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
+*       otherwise.
+*******************************************************************************/
+MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
+{
+	MV_U32 baseReg=0,sizeReg=0;
+	MV_U32 baseToReg=0 , sizeToReg=0;
+
+    /* Check parameters */
+	if (!MV_TARGET_IS_DRAM(target))
+	{
+		mvOsPrintf("mvDramIfWinSet: target %d is not SDRAM\n", target);
+		return MV_BAD_PARAM;
+	}
+
+    /* Check if the requested window overlaps with current enabled windows	*/
+    if (MV_TRUE == sdramIfWinOverlap(target, &pAddrDecWin->addrWin))
+	{
+        mvOsPrintf("mvDramIfWinSet: ERR. Target %d overlaps\n", target);
+		return MV_BAD_PARAM;
+	}
+
+	/* check if address is aligned to the size */
+	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
+	{
+		mvOsPrintf("mvDramIfWinSet:Error setting DRAM interface window %d."\
+				   "\nAddress 0x%08x is unaligned to size 0x%x.\n",
+                   target, 
+				   pAddrDecWin->addrWin.baseLow,
+				   pAddrDecWin->addrWin.size);
+		return MV_ERROR;
+	}
+
+	/* read base register*/
+	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(target));
+
+	/* read size register */
+	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(target));
+
+	/* BaseLow[31:16] => base register [31:16]		*/
+	baseToReg = pAddrDecWin->addrWin.baseLow & SCBAR_BASE_MASK;
+
+	/* Write to address decode Base Address Register                  */
+	baseReg &= ~SCBAR_BASE_MASK;
+	baseReg |= baseToReg;
+
+	/* Translate the given window size to register format			*/
+	sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, SCSR_SIZE_ALIGNMENT);
+
+	/* Size parameter validity check.                                   */
+	if (-1 == sizeToReg)
+	{
+		mvOsPrintf("mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n",target);
+		return MV_BAD_PARAM;
+	}
+
+	/* set size */
+	sizeReg &= ~SCSR_SIZE_MASK;
+	/* Size is located at upper 16 bits */
+	sizeReg |= (sizeToReg << SCSR_SIZE_OFFS);
+
+	/* enable/Disable */
+	if (MV_TRUE == pAddrDecWin->enable)
+	{
+		sizeReg |= SCSR_WIN_EN;
+	}
+	else
+	{
+		sizeReg &= ~SCSR_WIN_EN;
+	}
+
+	/* 3) Write to address decode Base Address Register                   */
+	MV_REG_WRITE(SDRAM_BASE_ADDR_REG(target), baseReg);
+
+	/* Write to address decode Size Register                        	*/
+	MV_REG_WRITE(SDRAM_SIZE_REG(target), sizeReg);
+	
+	return MV_OK;
+}
+/*******************************************************************************
+* mvDramIfWinGet - Get DRAM interface address decode window
+*
+* DESCRIPTION: 
+*       This function gets DRAM interface address decode window.
+*
+* INPUT:
+*	    target - System target. Use only SDRAM targets.
+*
+* OUTPUT:
+*       pAddrDecWin - SDRAM address window structure.
+*
+* RETURN:
+*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
+*       otherwise.
+*******************************************************************************/
+MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
+{
+	MV_U32 baseReg,sizeReg;
+	MV_U32 sizeRegVal;
+
+	/* Check parameters */
+	if (!MV_TARGET_IS_DRAM(target))
+	{
+		mvOsPrintf("mvDramIfWinGet: target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	/* Read base and size registers */
+	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(target));
+	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(target));
+
+	sizeRegVal = (sizeReg & SCSR_SIZE_MASK) >> SCSR_SIZE_OFFS;
+
+	pAddrDecWin->addrWin.size = ctrlRegToSize(sizeRegVal,
+											 SCSR_SIZE_ALIGNMENT);
+
+    /* Check if ctrlRegToSize returned OK */
+	if (-1 == pAddrDecWin->addrWin.size)
+	{
+		mvOsPrintf("mvDramIfWinGet: size of target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	/* Extract base address						*/
+	/* Base register [31:16] ==> baseLow[31:16] 		*/
+	pAddrDecWin->addrWin.baseLow = baseReg & SCBAR_BASE_MASK;
+
+	pAddrDecWin->addrWin.baseHigh =  0;
+
+
+	if (sizeReg & SCSR_WIN_EN)
+	{
+		pAddrDecWin->enable = MV_TRUE;
+	}
+	else
+	{
+		pAddrDecWin->enable = MV_FALSE;			
+	}
+
+	return MV_OK;
+}
+/*******************************************************************************
+* mvDramIfWinEnable - Enable/Disable SDRAM address decode window
+*
+* DESCRIPTION: 
+*		This function enable/Disable SDRAM address decode window.
+*
+* INPUT:
+*	    target - System target. Use only SDRAM targets.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		MV_ERROR in case function parameter are invalid, MV_OK otherewise.
+*
+*******************************************************************************/
+MV_STATUS mvDramIfWinEnable(MV_TARGET target,MV_BOOL enable)
+{
+	MV_DRAM_DEC_WIN 	addrDecWin;
+
+	/* Check parameters */
+	if (!MV_TARGET_IS_DRAM(target))
+	{
+		mvOsPrintf("mvDramIfWinEnable: target %d is Illigal\n", target);
+		return MV_ERROR;
+	}
+
+	if (enable == MV_TRUE) 
+	{   /* First check for overlap with other enabled windows				*/
+		if (MV_OK != mvDramIfWinGet(target, &addrDecWin))
+		{
+			mvOsPrintf("mvDramIfWinEnable:ERR. Getting target %d failed.\n", 
+                                                                        target);
+			return MV_ERROR;
+		}
+		/* Check for overlapping */
+		if (MV_FALSE == sdramIfWinOverlap(target, &(addrDecWin.addrWin)))
+		{
+			/* No Overlap. Enable address decode winNum window              */
+			MV_REG_BIT_SET(SDRAM_SIZE_REG(target), SCSR_WIN_EN);
+		}
+		else
+		{   /* Overlap detected	*/
+			mvOsPrintf("mvDramIfWinEnable: ERR. Target %d overlap detect\n",
+                                                                        target);
+			return MV_ERROR;
+		}
+	}
+	else
+	{   /* Disable address decode winNum window                             */
+		MV_REG_BIT_RESET(SDRAM_SIZE_REG(target), SCSR_WIN_EN);
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* sdramIfWinOverlap - Check if an address window overlap an SDRAM address window
+*
+* DESCRIPTION:
+*		This function scan each SDRAM address decode window to test if it 
+*		overlapps the given address windoow 
+*
+* INPUT:
+*       target      - SDRAM target where the function skips checking.
+*       pAddrDecWin - The tested address window for overlapping with 
+*					  SDRAM windows.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if the given address window overlaps any enabled address
+*       decode map, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin)
+{
+	MV_TARGET	targetNum;
+	MV_DRAM_DEC_WIN 	addrDecWin;
+	
+	for(targetNum = SDRAM_CS0; targetNum < MV_DRAM_MAX_CS ; targetNum++)
+	{
+		/* don't check our winNum or illegal targets */
+		if (targetNum == target)
+		{
+			continue;
+		}
+		
+		/* Get window parameters 	*/
+		if (MV_OK != mvDramIfWinGet(targetNum, &addrDecWin))
+		{
+			mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
+			return MV_ERROR;
+		}
+	
+		/* Do not check disabled windows	*/
+		if (MV_FALSE == addrDecWin.enable)
+		{
+			continue;
+		}
+	
+		if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
+		{                    
+			mvOsPrintf(
+			"sdramIfWinOverlap: Required target %d overlap winNum %d\n", 
+			target, targetNum);
+			return MV_TRUE;           
+		}
+	}
+	
+	return MV_FALSE;
+}
+
+/*******************************************************************************
+* mvDramIfBankSizeGet - Get DRAM interface bank size.
+*
+* DESCRIPTION:
+*       This function returns the size of a given DRAM bank.
+*
+* INPUT:
+*       bankNum - Bank number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       DRAM bank size. If bank is disabled the function return '0'. In case 
+*		or paramter is invalid, the function returns -1.
+*
+*******************************************************************************/
+MV_32 mvDramIfBankSizeGet(MV_U32 bankNum)
+{
+    MV_DRAM_DEC_WIN 	addrDecWin;
+	
+	/* Check parameters */
+	if (!MV_TARGET_IS_DRAM(bankNum))
+	{
+		mvOsPrintf("mvDramIfBankBaseGet: bankNum %d is invalid\n", bankNum);
+		return -1;
+	}
+	/* Get window parameters 	*/
+	if (MV_OK != mvDramIfWinGet(bankNum, &addrDecWin))
+	{
+		mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
+		return -1;
+	}
+	
+	if (MV_TRUE == addrDecWin.enable)
+	{
+		return addrDecWin.addrWin.size;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+
+/*******************************************************************************
+* mvDramIfSizeGet - Get DRAM interface total size.
+*
+* DESCRIPTION:
+*       This function get the DRAM total size.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       DRAM total size. In case or paramter is invalid, the function 
+*		returns -1.
+*
+*******************************************************************************/
+MV_32 mvDramIfSizeGet(MV_VOID)
+{
+	MV_U32 totalSize = 0, bankSize = 0, bankNum;
+	
+	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+		bankSize = mvDramIfBankSizeGet(bankNum);
+
+		if (-1 == bankSize)
+		{
+			mvOsPrintf("Dram: mvDramIfSizeGet error with bank %d \n",bankNum);
+			return -1;
+		}
+		else
+		{
+			totalSize += bankSize;
+		}
+	}
+	
+	DB(mvOsPrintf("Dram: Total DRAM size is 0x%x \n",totalSize));
+	
+	return totalSize;
+}
+
+/*******************************************************************************
+* mvDramIfBankBaseGet - Get DRAM interface bank base.
+*
+* DESCRIPTION:
+*       This function returns the 32 bit base address of a given DRAM bank.
+*
+* INPUT:
+*       bankNum - Bank number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       DRAM bank size. If bank is disabled or paramter is invalid, the 
+*		function returns -1.
+*
+*******************************************************************************/
+MV_32 mvDramIfBankBaseGet(MV_U32 bankNum)
+{
+    MV_DRAM_DEC_WIN 	addrDecWin;
+	
+	/* Check parameters */
+	if (!MV_TARGET_IS_DRAM(bankNum))
+	{
+		mvOsPrintf("mvDramIfBankBaseGet: bankNum %d is invalid\n", bankNum);
+		return -1;
+	}
+	/* Get window parameters 	*/
+	if (MV_OK != mvDramIfWinGet(bankNum, &addrDecWin))
+	{
+		mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
+		return -1;
+	}
+	
+	if (MV_TRUE == addrDecWin.enable)
+	{
+		return addrDecWin.addrWin.baseLow;
+	}
+	else
+	{
+		return -1;
+	}
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h
new file mode 100644
index 00000000..8bfa3e88
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h
@@ -0,0 +1,179 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvDramIfh
+#define __INCmvDramIfh
+
+/* includes */
+#include "ddr1_2/mvDramIfRegs.h"
+#include "ddr1_2/mvDramIfConfig.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+/* defines  */
+/* DRAM Timing parameters */
+#define SDRAM_TWR                    15  /* ns tWr */
+#define SDRAM_TRFC_64_512M_AT_200MHZ 70  /* ns tRfc for dens 64-512 @ 200MHz */
+#define SDRAM_TRFC_64_512M           75  /* ns tRfc for dens 64-512          */
+#define SDRAM_TRFC_1G                120 /* ns tRfc for dens 1GB             */
+#define SDRAM_TR2R_CYC               1   /* cycle for tR2r                   */
+#define SDRAM_TR2WW2R_CYC            1   /* cycle for tR2wW2r                */
+
+/* typedefs */
+
+/* enumeration for memory types */
+typedef enum _mvMemoryType
+{
+    MEM_TYPE_SDRAM,
+    MEM_TYPE_DDR1,
+    MEM_TYPE_DDR2
+}MV_MEMORY_TYPE;
+
+/* enumeration for DDR1 supported CAS Latencies */
+typedef enum _mvDimmDdr1Cas
+{
+    DDR1_CL_1_5  = 0x02, 
+    DDR1_CL_2    = 0x04, 
+    DDR1_CL_2_5  = 0x08, 
+    DDR1_CL_3    = 0x10, 
+    DDR1_CL_4    = 0x40, 
+    DDR1_CL_FAULT
+} MV_DIMM_DDR1_CAS;
+
+/* enumeration for DDR2 supported CAS Latencies */
+typedef enum _mvDimmDdr2Cas
+{
+    DDR2_CL_3    = 0x08, 
+    DDR2_CL_4    = 0x10, 
+    DDR2_CL_5    = 0x20, 
+    DDR2_CL_FAULT
+} MV_DIMM_DDR2_CAS;
+
+
+typedef struct _mvDramBankInfo
+{
+    MV_MEMORY_TYPE  memoryType; 	/* DDR1, DDR2 or SDRAM */
+
+    /* DIMM dimensions */
+    MV_U32  numOfRowAddr;
+    MV_U32  numOfColAddr;
+    MV_U32  dataWidth;
+    MV_U32  errorCheckType;             /* ECC , PARITY..*/
+    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
+    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
+    MV_U32  burstLengthSupported;
+    MV_U32  numOfBanksOnEachDevice;
+    MV_U32  suportedCasLatencies;
+    MV_U32  refreshInterval;
+
+    /* DIMM timing parameters */
+    MV_U32  minCycleTimeAtMaxCasLatPs;	
+    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
+    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
+	MV_U32  minRowPrechargeTime;
+	MV_U32  minRowActiveToRowActive;
+	MV_U32  minRasToCasDelay;
+	MV_U32  minRasPulseWidth;
+    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
+    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
+    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
+    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
+                      
+    /* Parameters calculated from the extracted DIMM information */
+    MV_U32  size;
+    MV_U32  deviceDensity;           	/* 16,64,128,256 or 512 Mbit */
+    MV_U32  numberOfDevices;
+
+    /* DIMM attributes (MV_TRUE for yes) */
+    MV_BOOL registeredAddrAndControlInputs;
+     
+}MV_DRAM_BANK_INFO;
+
+/* This structure describes CPU interface address decode window               */
+typedef struct _mvDramIfDecWin 
+{
+	MV_ADDR_WIN   addrWin;    /* An address window*/
+	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
+}MV_DRAM_DEC_WIN;
+
+#include "ddr1_2/mvDram.h"
+
+/* mvDramIf.h API list */
+MV_VOID   mvDramIfBasicAsmInit(MV_VOID);
+MV_STATUS mvDramIfDetect(MV_U32 forcedCl);
+MV_VOID   _mvDramIfConfig(MV_VOID);
+
+MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
+MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
+MV_STATUS mvDramIfWinEnable(MV_TARGET target,MV_BOOL enable);
+MV_32 mvDramIfBankSizeGet(MV_U32 bankNum);
+MV_32 mvDramIfBankBaseGet(MV_U32 bankNum);
+MV_32 mvDramIfSizeGet(MV_VOID);
+
+#if 0
+MV_STATUS mvDramIfMbusCtrlSet(MV_XBAR_TARGET *pPizzaArbArray);
+MV_STATUS mvDramIfMbusToutSet(MV_U32 timeout, MV_BOOL enable);
+#endif
+
+#endif /* __INCmvDramIfh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfBasicInit.S b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfBasicInit.S
new file mode 100644
index 00000000..f2a9365c
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfBasicInit.S
@@ -0,0 +1,988 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#define MV_ASMLANGUAGE
+#include "mvSysHwConfig.h"
+#include "mvOsAsm.h"
+#include "mvBoardEnvSpec.h"
+#include "mvCpuIfRegs.h"
+#include "mvDramIfConfig.h"
+#include "mvDramIfRegs.h"
+#include "pex/mvPexRegs.h"
+#include "pci/mvPciRegs.h"
+#include "mvCtrlEnvSpec.h"
+#include "mvCtrlEnvAsm.h"
+#include "cpu/mvCpuArm.h"
+#include "mvCommon.h"
+
+/* defines */
+
+#if !defined(MV_INC_BOARD_DDIM)
+.globl dramBoot1
+dramBoot1:
+        .word   0
+
+/******************************************************************************
+*
+*
+*
+*
+*******************************************************************************/
+#if defined(DB_PRPMC) || defined(DB_PEX_PCI) || defined(DB_MNG)
+
+/* PEX_PCI and PRPMC boards 256 MB*/
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x0fff0001
+#define STATIC_SDRAM_CONFIG	     		0x03248400
+#define STATIC_SDRAM_MODE	     		0x62
+#define STATIC_DUNIT_CTRL_LOW	     		0x4041000
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000020
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11602220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x0000030F
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x0
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x0
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0
+#define STATIC_SDRAM_EXT_MODE          		0x0
+
+#elif defined(DB_FPGA)
+
+/* FPGA DC boards 256 MB*/
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x0fff0001
+#define STATIC_SDRAM_CONFIG	     		0x03208400	/* 32bit */
+#define STATIC_SDRAM_MODE	     		0x22
+#define STATIC_DUNIT_CTRL_LOW	     		0x03041000
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000020
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11112220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x0000000D
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x0
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x0
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0
+#define STATIC_SDRAM_EXT_MODE          		0x1
+
+#elif  defined(RD_88F6183GP) || defined(DB_CUSTOMER)
+
+/* Customer 1 DDR2 2 devices 512Mbit by 16 bit */
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x07ff0001
+#define STATIC_SDRAM_CONFIG	     		0x03158400
+#define STATIC_SDRAM_MODE	     		0x452
+#define STATIC_DUNIT_CTRL_LOW	     		0x06041000
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000020
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11912220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x00000502
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x00010000
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000002
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x00000601
+#define STATIC_SDRAM_EXT_MODE          		0x00000440
+
+
+#elif  defined(RD_88F6183AP)
+
+/* DDR2 1 devices 512Mbit by 16 bit */
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x03ff0001
+#define STATIC_SDRAM_CONFIG	     		0x1f154400
+#define STATIC_SDRAM_MODE	     		0x432
+#define STATIC_DUNIT_CTRL_LOW	     		0x04041000
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000020
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11912220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x00000502
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x00010000
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000002
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x00000601
+#define STATIC_SDRAM_EXT_MODE          		0x00000440
+
+/* 6082L MARVELL DIMM */
+#elif  defined(DB_88F6082LBP)
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x07ff0001
+#define STATIC_SDRAM_CONFIG	     		0x7f158400
+#define STATIC_SDRAM_MODE	     		0x432
+#define STATIC_DUNIT_CTRL_LOW	     		0x04041040
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000020
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11612220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x00000501
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x00010000
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000002
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x00000a01
+#define STATIC_SDRAM_EXT_MODE          		0x00000440
+
+#elif  defined(RD_88W8660_AP82S)
+
+/* Shark RD */
+
+#if defined(MV_DRAM_32M)
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x01ff0001
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000010
+#elif defined(MV_DRAM_16M)
+
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x00ff0001
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000000
+
+#else
+#error "NO DDR size selected"
+#endif
+
+#define STATIC_SDRAM_CONFIG	     		0x03144400
+#define STATIC_SDRAM_MODE	     		0x62
+#define STATIC_DUNIT_CTRL_LOW	     		0x4041000
+
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11602220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x0000040b
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x0
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x0
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0
+#define STATIC_SDRAM_EXT_MODE          		0x0
+
+#elif defined(RD_88W8660)
+
+/* Shark RD */
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x03ff0001
+#define STATIC_SDRAM_CONFIG	     		0x03144400
+#define STATIC_SDRAM_MODE	     		0x62
+#define STATIC_DUNIT_CTRL_LOW	     		0x4041000
+#define STATIC_SDRAM_ADDR_CTRL	     		0x00000010
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11602220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x0000040b
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x0
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x0
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0
+#define STATIC_SDRAM_EXT_MODE          		0x0
+
+#else /* NAS */
+
+
+#if defined(RD_88F5182)
+
+#if defined(MV_88F5082)
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x3ff0001
+#define STATIC_SDRAM_ADDR_CTRL	    	 	0x20
+#else
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x7ff0001
+#define STATIC_SDRAM_ADDR_CTRL	    	 	0x20
+#endif
+
+#elif defined(RD_88F5182_3)
+
+#if defined(MV_88F5082)
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x3ff0001
+#define STATIC_SDRAM_ADDR_CTRL	    	 	0x20
+#else
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x7ff0001
+#define STATIC_SDRAM_ADDR_CTRL	    	 	0x20
+#endif
+
+#else
+
+#define STATIC_SDRAM0_BANK0_SIZE	     	0x1ff0001
+#define STATIC_SDRAM_ADDR_CTRL	    	 	0x0
+
+#endif
+
+#if defined(MV_88F5082)
+#define STATIC_SDRAM_CONFIG	     		0x3144400
+#else
+#define STATIC_SDRAM_CONFIG	     		0x3148400
+#endif
+#define STATIC_SDRAM_MODE	     		0x62
+#define STATIC_DUNIT_CTRL_LOW	     		0x4041000
+#define STATIC_SDRAM_TIME_CTRL_LOW     		0x11602220
+#define STATIC_SDRAM_TIME_CTRL_HI	     	0x40c
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x0
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x0
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0
+#define STATIC_SDRAM_EXT_MODE          		0x0
+
+#endif
+
+	.globl _mvDramIfStaticInit
+_mvDramIfStaticInit:
+
+	mov     r11, LR     		/* Save link register */
+	mov	r10, r2
+
+        /* If we boot from NAND jump to DRAM sddress */
+
+        mov     r5, #1
+        ldr     r6, =dramBoot1
+        str     r5, [r6]                /* We started executing from DRAM */
+
+        ldr     r6, dramBoot1
+        cmp     r6, #0
+        bne     1f
+
+
+	/* set all dram windows to 0 */
+	mov	r6, #0
+	MV_REG_WRITE_ASM(r6, r5, 0x1504)
+	MV_REG_WRITE_ASM(r6, r5, 0x150c)
+	MV_REG_WRITE_ASM(r6, r5, 0x1514)
+	MV_REG_WRITE_ASM(r6, r5, 0x151c)
+
+	/* set all dram configuration in temp registers */
+	ldr	r6, = STATIC_SDRAM0_BANK0_SIZE
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG0)
+	ldr	r6, = STATIC_SDRAM_CONFIG
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG1)
+	ldr	r6, = STATIC_SDRAM_MODE
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG2)
+	ldr	r6, = STATIC_DUNIT_CTRL_LOW
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG3)
+	ldr	r6, = STATIC_SDRAM_ADDR_CTRL
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG4)
+	ldr	r6, = STATIC_SDRAM_TIME_CTRL_LOW
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG5)
+	ldr	r6, = STATIC_SDRAM_TIME_CTRL_HI
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG6)
+	ldr	r6, = STATIC_SDRAM_ODT_CTRL_LOW
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG7)
+	ldr	r6, = STATIC_SDRAM_ODT_CTRL_HI
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG8)
+	ldr	r6, = STATIC_SDRAM_DUNIT_ODT_CTRL
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG9)
+	ldr	r6, = STATIC_SDRAM_EXT_MODE
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG10)
+
+	mov 	sp, #0
+	bl	_mvDramIfConfig
+1:
+	mov 	r2, r10
+	mov     PC, r11         	/* r11 is saved link register */
+
+#else  /* #if !defined(MV_INC_BOARD_DDIM) */
+
+.globl dramBoot1
+dramBoot1:
+        .word   0
+
+/*******************************************************************************
+* mvDramIfBasicInit - Basic initialization of DRAM interface
+*
+* DESCRIPTION:
+*       The function will initialize the DRAM for basic usage. The function
+*       will use the TWSI assembly API to extract DIMM parameters according
+*       to which DRAM interface will be initialized.
+*       The function referes to the following DRAM parameters:
+*       1) DIMM is registered or not.
+*       2) DIMM width detection.
+*       3) DIMM density.
+*
+* INPUT:
+*       r3 - required size for initial DRAM.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*       Note:
+*       r4 holds I2C EEPROM address
+*       r5 holds SDRAM register base address
+*	r7 holds returned values
+*       r8 holds SDRAM various configuration registers value.
+*       r11 holds return function address.
+*******************************************************************************/
+/* Setting the offsets of the I2C registers */
+#define NUM_OF_ROWS_OFFSET            3
+#define NUM_OF_COLS_OFFSET            4
+#define NUM_OF_RANKS		      5
+#define SDRAM_WIDTH_OFFSET           13
+#define NUM_OF_BANKS_OFFSET          17
+#define SUPPORTED_CL_OFFSET          18
+#define DIMM_TYPE_INFO_OFFSET        20         /* DDR2 only    */
+#define SDRAM_MODULES_ATTR_OFFSET    21
+
+#define DRAM_DEV_DENSITY_128M        0x080
+#define DRAM_DEV_DENSITY_256M        0x100
+#define DRAM_DEV_DENSITY_512M        0x200
+       .globl _mvDramIfBasicInit
+       .extern _i2cInit
+
+_mvDramIfBasicInit:
+
+        mov     r11, LR     		/* Save link register */
+
+        mov     r5, #1
+        ldr     r8, =dramBoot1
+        str     r5, [r8]                /* We started executing from DRAM */
+
+        /* If we boot from NAND jump to DRAM sddress */
+        ldr     r8, dramBoot1
+        cmp     r8, #0
+        movne   pc, r11
+
+
+
+        bl      _i2cInit                /* Initialize TWSI master             */
+
+        /* Get default SDRAM Config values */
+        MV_REG_READ_ASM (r8, r5, SDRAM_CONFIG_REG)
+        bic     r8, r8, #SDRAM_DCFG_MASK
+
+
+        /* Read device ID  */
+	MV_CTRL_MODEL_GET_ASM(r4, r5);
+
+        /* Return if OrionN */
+        ldr     r5, =MV_5180_DEV_ID
+        cmp     r4, r5
+        beq     cat_through_end
+
+        /* Return if Orion1 */
+        ldr     r5, =MV_5181_DEV_ID
+        cmp     r4, r5
+        beq     cat_through_end
+
+        /* Return if Nas */
+        ldr     r5, =MV_5182_DEV_ID
+        cmp     r4, r5
+        beq     cat_through_end
+
+        /* Return if Shark */
+        ldr     r5, =MV_8660_DEV_ID
+        cmp     r4, r5
+        beq     cat_through_end
+
+        /* goto calcConfigReg if bigger than Orion2*/
+        ldr     r5, =MV_5281_DEV_ID
+        cmp     r4, r5
+        bne     cat_through
+
+cat_through:
+        /* set cat through - for better performance - in orion2 b0 and higher*/
+        orr     r8, r8, #SDRAM_CATTHR_EN
+
+cat_through_end:
+
+
+        /* Get registered/non registered info from DIMM */
+	bl  	_is_Registered
+        beq     nonRegistered
+
+setRegistered:
+        orr     r8, r8, #SDRAM_REGISTERED   /* Set registered bit(17)         */
+
+nonRegistered:
+	/* Get SDRAM width */
+	bl 	_get_width
+
+        orr     r6, r8, #SDRAM_DCFG_X16_DEV /* x16 devices  */
+        cmp     r7, #16
+        beq     setConfigReg
+
+        orr     r6, r8, #SDRAM_DCFG_X8_DEV  /* x8 devices   */
+        cmp     r7, #8
+        beq     setConfigReg
+
+        /* This is an error. return */
+        b       exit_ddrAutoConfig
+
+setConfigReg:
+        mov     r8, r6
+        ldr     r6, =SDRAM_CONFIG_DV
+        orr     r8, r8, r6              /* Add default settings */
+        mov     r6, r8                  /* Do not swap r8 content */
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_CONFIG_REG)
+
+        /* Set maximum CL supported by DIMM */
+	bl	_get_CAL
+
+        /* r7 is DIMM supported CAS (e.g: 3 --> 0x1C)                         */
+        clz     r6, r7
+        rsb     r6, r6, #31     /* r6 = the bit number of MAX CAS supported   */
+
+        /* Check the DDR version */
+        tst     r8, #SDRAM_DTYPE_DDR2
+        bne     casDdr2
+
+casDdr1:
+        ldr	r7, =3		/* stBurstDel field value	*/
+	ldr     r8, =0x52       /* Assuming MAX CL = 1.5        */
+        cmp     r6, #1          /* If CL = 1.5 break            */
+        beq     setModeReg
+
+        ldr	r7, =3		/* stBurstDel field value	*/
+	ldr     r8, =0x22       /* Assuming MAX CL = 2          */
+        cmp     r6, #2          /* If CL = 2 break              */
+        beq     setModeReg
+
+        ldr	r7, =4		/* stBurstDel field value	*/
+	ldr     r8, =0x62       /* Assuming MAX CL = 2.5        */
+        cmp     r6, #3          /* If CL = 2.5 break            */
+        beq     setModeReg
+
+        ldr	r7, =4		/* stBurstDel field value	*/
+	ldr     r8, =0x32       /* Assuming MAX CL = 3          */
+        cmp     r6, #4          /* If CL = 3 break              */
+        beq     setModeReg
+
+        ldr	r7, =5		/* stBurstDel field value	*/
+	ldr     r8, =0x42       /* Assuming MAX CL = 4          */
+        cmp     r6, #6          /* If CL = 4 break              */
+        b       setModeReg
+
+        b       exit_ddrAutoConfig      /* This is an error !!  */
+
+casDdr2:
+        ldr	r7, =4		/* stBurstDel field value	*/
+	ldr     r8, =0x32      /* Assuming MAX CL = 3           */
+        cmp     r6, #3          /* If CL = 3 break              */
+        beq     casDdr2Cont
+
+        ldr	r7, =5		/* stBurstDel field value	*/
+	ldr     r8, =0x42      /* Assuming MAX CL = 4           */
+        cmp     r6, #4          /* If CL = 4 break              */
+        beq     casDdr2Cont
+
+        /* CL 5 currently unsupported. We use CL 4 instead      */
+        ldr	r7, =5		/* stBurstDel field value	*/
+	ldr     r8, =0x42      /* Assuming MAX CL = 5           */
+        cmp     r6, #5          /* If CL = 5 break              */
+        beq     casDdr2Cont
+
+        b       exit_ddrAutoConfig      /* This is an error !!  */
+casDdr2Cont:
+        /* Write recovery for auto-precharge relevant only in DDR2 */
+        orr     r8, r8, #0x400   /* Default value */
+
+setModeReg:
+        /* The CPU must not attempt to change the SDRAM Mode register setting */
+        /* prior to DRAM controller completion of the DRAM initialization     */
+        /* sequence. To guarantee this restriction, it is recommended that    */
+        /* the CPU sets the SDRAM Operation register to NOP command, performs */
+        /* read polling until the register is back in Normal operation value, */
+        /* and then sets SDRAM Mode register to it's new value.               */
+
+	/* write 'nop' to SDRAM operation */
+        mov     r6, #0x5                 /* 'NOP' command              */
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_OPERATION_REG)
+
+        /* poll SDRAM operation. Make sure its back to normal operation       */
+_sdramOpPoll1:
+        ldr     r6, [r5]
+        cmp     r6, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll1
+
+        /* Now its safe to write new value to SDRAM Mode register             */
+        MV_REG_WRITE_ASM (r8, r5, SDRAM_MODE_REG)
+
+        /* Make the Dunit write the DRAM its new mode                         */
+        mov     r6, #0x3                 /* Mode Register Set command  */
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_OPERATION_REG)
+
+        /* poll SDRAM operation. Make sure its back to normal operation       */
+_sdramOpPoll2:
+        ldr     r6, [r5]
+        cmp     r6, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll2
+
+	/* Set Dunit control register according to max CL detected	      */
+	/* If we use registered DIMM, add 1 to stBurstDel		      */
+        MV_REG_READ_ASM (r6, r5, SDRAM_CONFIG_REG)
+	tst	r6, #SDRAM_REGISTERED
+	beq	setDunitReg
+	add	r7, r7, #1
+
+setDunitReg:
+        ldr     r6, =SDRAM_DUNIT_CTRL_LOW_DV
+        orr	r6, r6, r7, LSL #SDRAM_ST_BURST_DEL_OFFS
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_DUNIT_CTRL_REG)
+
+
+        /* DIMM density configuration*/
+        /* Density = (1 << (rowNum + colNum)) * dramWidth * dramBankNum       */
+Density:
+	bl 	_getDensity
+	mov 	r8, r7
+        mov     r8, r8, LSR #20 /* Move density 20 bits to the right  */
+                                /* For example 0x10000000 --> 0x1000 */
+
+        mov     r6, #0x00
+        cmp     r8, #DRAM_DEV_DENSITY_128M
+        beq     densCont
+
+        mov     r6, #0x10
+        cmp     r8, #DRAM_DEV_DENSITY_256M
+        beq     densCont
+
+        mov     r6, #0x20
+        cmp     r8, #DRAM_DEV_DENSITY_512M
+        beq     densCont
+
+        /* This is an error. return */
+        b       exit_ddrAutoConfig
+
+densCont:
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_ADDR_CTRL_REG)
+
+        /* Config DDR2 registers (Extended mode, ODTs and pad calibration)    */
+        MV_REG_READ_ASM (r8, r5, SDRAM_CONFIG_REG)
+        tst     r8, #SDRAM_DTYPE_DDR2
+        beq     _extModeODTEnd
+
+
+	/* Set DDR Extended Mode register for working with CS[0]	      */
+        /* write 'nop' to SDRAM operation */
+        mov     r6, #0x5                 /* 'NOP' command              */
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_OPERATION_REG)
+
+        /* poll SDRAM operation. Make sure its back to normal operation       */
+_sdramOpPoll3:
+        ldr     r6, [r5]
+        cmp     r6, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll3
+
+        /* Now its safe to write new value to SDRAM Extended Mode register    */
+        ldr	r6, =DDR_SDRAM_EXT_MODE_CS0_DV
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_EXTENDED_MODE_REG)
+
+        /* Make the Dunit write the DRAM its new extended mode                */
+        mov     r6, #0x4                /* Extended Mode Register Set command */
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_OPERATION_REG)
+
+        /* poll SDRAM operation. Make sure its back to normal operation       */
+_sdramOpPoll4:
+        ldr     r6, [r5]
+        cmp     r6, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll4
+
+	/* ODT configuration is done for single bank CS[0] only		      */
+        /* Config DDR2 On Die Termination (ODT) registers */
+        ldr     r6, =DDR2_ODT_CTRL_LOW_CS0_DV
+        MV_REG_WRITE_ASM (r6, r5, DDR2_SDRAM_ODT_CTRL_LOW_REG)
+
+        ldr     r6, =DDR2_ODT_CTRL_HIGH_CS0_DV
+        MV_REG_WRITE_ASM (r6, r5, DDR2_SDRAM_ODT_CTRL_HIGH_REG)
+
+        ldr     r6, =DDR2_DUNIT_ODT_CTRL_CS0_DV
+        MV_REG_WRITE_ASM (r6, r5, DDR2_DUNIT_ODT_CONTROL_REG)
+
+
+        /* we will check what device we are running and perform
+        Initialization according to device value */
+
+_extModeODTEnd:
+
+        /* Implement Guideline (GL# MEM-2) P_CAL Automatic Calibration  */
+        /* Does Not Work for Address/Control and Data Pads.             */
+        /* Relevant for: 88F5181-A1/B0 and 88F5281-A0                   */
+
+	/* Read device ID  */
+	MV_CTRL_MODEL_GET_ASM(r6, r5);
+        /* Read device revision */
+	MV_CTRL_REV_GET_ASM(r8, r5);
+
+	/* Continue if OrionN */
+        ldr     r5, =MV_5180_DEV_ID
+        cmp     r6, r5
+        bne     1f
+        b     glMem2End
+1:
+
+	/* Continue if Orion1 and device revision B1 */
+        ldr     r5, =MV_5181_DEV_ID
+        cmp     r6, r5
+        bne     1f
+
+        cmp     r8, #MV_5181_B1_REV
+        bge     glMem2End
+        b       glMem2Start
+1:
+
+        /* Orion NAS */
+        ldr     r5, =MV_5182_DEV_ID
+        cmp     r6, r5
+        beq     glMem2Start
+
+        /* Orion Shark */
+        ldr     r5, =MV_8660_DEV_ID
+        cmp     r6, r5
+        beq     glMem2Start
+
+	b	glMem2End
+
+glMem2Start:
+
+        /* DDR SDRAM Address/Control Pads Calibration                   */
+        MV_REG_READ_ASM (r6, r5, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+        /* Set Bit [31] to make the register writable                   */
+        orr   r8, r6, #SDRAM_WR_EN
+
+        MV_REG_WRITE_ASM (r8, r5, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+        bic   r6, r6, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r6, r6, #SDRAM_TUNE_EN    /* Disable auto calibration     */
+        bic   r6, r6, #SDRAM_DRVN_MASK  /* Clear r5[5:0]<DrvN>          */
+        bic   r6, r6, #SDRAM_DRVP_MASK  /* Clear r5[11:6]<DrvP>         */
+
+        /* Get the final N locked value of driving strength [22:17]     */
+        mov   r5, r6
+        mov   r5, r5, LSL #9
+        mov   r5, r5, LSR #26    /* r5[5:0]<DrvN>  = r6[22:17]<LockN>   */
+        orr   r5, r5, r5, LSL #6 /* r5[11:6]<DrvP> = r5[5:0]<DrvN>      */
+
+        /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6]       */
+        orr   r6, r6, r5
+
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+
+        /* DDR SDRAM Data Pads Calibration                              */
+        MV_REG_READ_ASM (r6, r5, SDRAM_DATA_PADS_CAL_REG)
+
+        /* Set Bit [31] to make the register writable                   */
+        orr   r8, r6, #SDRAM_WR_EN
+
+        MV_REG_WRITE_ASM (r8, r5, SDRAM_DATA_PADS_CAL_REG)
+
+        bic   r6, r6, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r6, r6, #SDRAM_TUNE_EN    /* Disable auto calibration     */
+        bic   r6, r6, #SDRAM_DRVN_MASK  /* Clear r5[5:0]<DrvN>          */
+        bic   r6, r6, #SDRAM_DRVP_MASK  /* Clear r5[11:6]<DrvP>         */
+
+        /* Get the final N locked value of driving strength [22:17]     */
+        mov   r5, r6
+        mov   r5, r5, LSL #9
+        mov   r5, r5, LSR #26
+        orr   r5, r5, r5, LSL #6 /* r5[5:0] = r6[22:17]<LockN>  */
+
+        /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6]       */
+        orr   r6, r6, r5
+
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_DATA_PADS_CAL_REG)
+
+glMem2End:
+        /* Implement Guideline (GL# MEM-3) Drive Strength Value         */
+        /* Relevant for: 88F5181-A1/B0/B1 and 88F5281-A0/B0             */
+
+        /* Get SDRAM Config value */
+        MV_REG_READ_ASM (r8, r5, SDRAM_CONFIG_REG)
+
+        /* Get DIMM type */
+        tst     r8, #SDRAM_DTYPE_DDR2
+        beq     ddr1StrengthVal
+
+ddr2StrengthVal:
+        ldr     r4, =DDR2_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV
+        ldr     r8, =DDR2_DATA_PAD_STRENGTH_TYPICAL_DV
+        b       setDrvStrength
+ddr1StrengthVal:
+        ldr     r4, =DDR1_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV
+        ldr     r8, =DDR1_DATA_PAD_STRENGTH_TYPICAL_DV
+
+setDrvStrength:
+        /* DDR SDRAM Address/Control Pads Calibration                   */
+        MV_REG_READ_ASM (r6, r5, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+        orr   r6, r6, #SDRAM_WR_EN      /* Make register writeable      */
+
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+        HTOLL(r6,r5)
+
+        bic   r6, r6, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r6, r6, #SDRAM_PRE_DRIVER_STRENGTH_MASK
+        orr   r6, r4, r6                /* Set default value for DDR    */
+
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+
+        /* DDR SDRAM Data Pads Calibration                              */
+        MV_REG_READ_ASM (r6, r5, SDRAM_DATA_PADS_CAL_REG)
+
+        orr   r6, r6, #SDRAM_WR_EN      /* Make register writeable      */
+
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_DATA_PADS_CAL_REG)
+        HTOLL(r6,r5)
+
+        bic   r6, r6, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r6, r6, #SDRAM_PRE_DRIVER_STRENGTH_MASK
+        orr   r6, r8, r6                /* Set default value for DDR    */
+
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_DATA_PADS_CAL_REG)
+
+
+        /* Implement Guideline (GL# MEM-4) DQS Reference Delay Tuning   */
+        /* Relevant for: 88F5181-A1/B0/B1 and 88F5281-A0/B0             */
+        /* Get the "sample on reset" register for the DDR frequancy     */
+
+#if defined(MV_RUN_FROM_FLASH)
+	/* Calc the absolute address of the _cpuARMDDRCLK[] in the boot flash */
+	ldr   r7, = _cpuARMDDRCLK
+	ldr	r4, =_start
+	ldr	r4, [r4]
+	sub   r7, r7, r4
+         ldr   r4, = Lrom_start_of_data
+         ldr	r4, [r4]
+         add   r7, r4, r7
+#else
+	/* Calc the absolute address of the _cpuARMDDRCLK[] in the boot flash */
+	ldr     r7, = _cpuARMDDRCLK
+	ldr	r4, =_start
+	sub     r7, r7, r4
+	add	r7, r7, #CFG_MONITOR_BASE
+#endif
+        /* Get the "sample on reset" register for the DDR frequancy     */
+        MV_REG_READ_ASM (r4, r5, MPP_SAMPLE_AT_RESET)
+        ldr     r5, =MSAR_ARMDDRCLCK_MASK
+        and     r5, r4, r5
+#if 0 /* YOTAM TO BE FIX */
+	mov    r5, r5, LSR #MSAR_ARMDDRCLCK_OFFS
+#endif
+
+	/* Read device ID  */
+	MV_CTRL_MODEL_GET_ASM(r6, r8);
+
+        /* Continue if TC90 */
+        ldr     r8, =MV_1281_DEV_ID
+        cmp     r6, r6
+        beq     armClkMsb
+
+        /* Continue if Orion2 */
+        ldr     r8, =MV_5281_DEV_ID
+        cmp     r6, r8
+#if 0 /* YOTAM TO BE FIX */
+        bne     1f
+#endif
+
+armClkMsb:
+#if 0 /* YOTAM TO BE FIX */
+        tst    r4, #MSAR_ARMDDRCLCK_H_MASK
+        beq    1f
+        orr    r5, r5, #BIT4
+1:
+	ldr    r4, =MV_CPU_ARM_CLK_ELM_SIZE
+	mul    r5, r4, r5
+	add    r7, r7, r5
+	add    r7, r7, #MV_CPU_ARM_CLK_DDR_OFF
+	ldr    r5, [r7]
+#endif
+
+        /* Get SDRAM Config value */
+        MV_REG_READ_ASM (r8, r4, SDRAM_CONFIG_REG)
+
+        /* Get DIMM type */
+        tst     r8, #SDRAM_DTYPE_DDR2
+        beq     ddr1FtdllVal
+
+ddr2FtdllVal:
+        ldr    r4, =FTDLL_DDR2_250MHZ
+	ldr    r7, =_250MHz
+        cmp    r5, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_200MHZ
+	ldr    r7, =_200MHz
+        cmp    r5, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_166MHZ
+	ldr    r7, =_166MHz
+        cmp    r5, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_133MHZ
+        b       setFtdllReg
+
+ddr1FtdllVal:
+        ldr    r4, =FTDLL_DDR1_200MHZ
+	ldr    r7, =_200MHz
+        cmp    r5, r7
+        beq    setFtdllReg
+        ldr    r4, =FTDLL_DDR1_166MHZ
+	ldr    r7, =_166MHz
+        cmp    r5, r7
+        beq    setFtdllReg
+        ldr    r4, =FTDLL_DDR1_133MHZ
+	ldr    r7, =_133MHz
+        cmp    r5, r7
+        beq    setFtdllReg
+        ldr    r4, =0
+
+setFtdllReg:
+
+#if !defined(MV_88W8660) && !defined(MV_88F6183) && !defined(MV_88F6183L)
+        MV_REG_READ_ASM (r8, r5, SDRAM_FTDLL_CONFIG_REG)
+        orr    r8, r8, r4
+        MV_REG_WRITE_ASM (r8, r5, SDRAM_FTDLL_CONFIG_REG)
+        bic   r8, r8, #1
+        MV_REG_WRITE_ASM (r8, r5, SDRAM_FTDLL_CONFIG_REG)
+#endif /* !defined(MV_88W8660) && !defined(MV_88F6183) && !defined(MV_88F6183L)*/
+
+
+setTimingReg:
+        /* Set default Timing parameters */
+        MV_REG_READ_ASM (r8, r5, SDRAM_CONFIG_REG)
+        tst     r8, #SDRAM_DTYPE_DDR2
+        bne     ddr2TimeParam
+
+ddr1TimeParam:
+        ldr     r6, =DDR1_TIMING_LOW_DV
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_TIMING_CTRL_LOW_REG)
+        ldr     r6, =DDR1_TIMING_HIGH_DV
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_TIMING_CTRL_HIGH_REG)
+        b       timeParamDone
+
+ddr2TimeParam:
+        ldr     r6, =DDR2_TIMING_LOW_DV
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_TIMING_CTRL_LOW_REG)
+        ldr     r6, =DDR2_TIMING_HIGH_DV
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_TIMING_CTRL_HIGH_REG)
+
+timeParamDone:
+        /* Open CS[0] window to requested size and enable it. Disable other   */
+	/* windows 							      */
+        ldr	r6, =SCBAR_BASE_MASK
+        sub     r3, r3, #1
+        and	r3, r3, r6
+	orr	r3, r3, #1	/* Enable bank */
+        MV_REG_WRITE_ASM (r3, r5, SDRAM_SIZE_REG(0))
+        ldr	r6, =0
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(1))
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(2))
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(3))
+
+exit_ddrAutoConfig:
+        mov     PC, r11         /* r11 is saved link register */
+
+
+/***************************************************************************************/
+/*       r4 holds I2C EEPROM address
+ *       r7 holds I2C EEPROM offset parameter for i2cRead and its --> returned value
+ *       r8 holds SDRAM various configuration registers value.
+ *	r13 holds Link register
+ */
+/**************************/
+_getDensity:
+	mov     r13, LR                            /* Save link register */
+
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR       /* reading from DIMM0      */
+        mov     r7, #NUM_OF_ROWS_OFFSET            /* offset  3               */
+        bl      _i2cRead
+        mov     r8, r7                             /* r8 save number of rows  */
+
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR       /* reading from DIMM0      */
+        mov     r7, #NUM_OF_COLS_OFFSET            /* offset  4               */
+        bl      _i2cRead
+        add     r8, r8, r7                         /* r8 = number of rows + number of col */
+
+        mov     r7, #0x1
+        mov     r8, r7, LSL r8                     /* r8 = (1 << r8)          */
+
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR       /* reading from DIMM0      */
+        mov     r7, #SDRAM_WIDTH_OFFSET            /* offset 13 */
+        bl      _i2cRead
+        mul     r8, r7, r8
+
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR       /* reading from DIMM0      */
+        mov     r7, #NUM_OF_BANKS_OFFSET           /* offset 17               */
+        bl      _i2cRead
+        mul     r7, r8, r7
+
+	mov     PC, r13
+
+/**************************/
+_get_width:
+	mov     r13, LR                 /* Save link register */
+
+        /* Get SDRAM width (SPD offset 13) */
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #SDRAM_WIDTH_OFFSET
+        bl      _i2cRead                /* result in r7                       */
+
+	mov     PC, r13
+
+/**************************/
+_get_CAL:
+	mov     r13, LR                 /* Save link register */
+
+        /* Set maximum CL supported by DIMM */
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #SUPPORTED_CL_OFFSET     /* offset  18 */
+        bl      _i2cRead
+
+	mov     PC, r13
+
+/**************************/
+/* R8 - sdram configuration register.
+ * Return value in flag if no-registered then Z-flag is set
+ */
+_is_Registered:
+	mov     r13, LR                 /* Save link register */
+
+        /* Get registered/non registered info from DIMM */
+        tst     r8, #SDRAM_DTYPE_DDR2
+        bne     regDdr2
+
+regDdr1:
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #SDRAM_MODULES_ATTR_OFFSET
+        bl      _i2cRead                /* result in r7                       */
+        tst     r7, #0x2
+	b	exit
+regDdr2:
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #DIMM_TYPE_INFO_OFFSET
+        bl      _i2cRead                /* result in r7                       */
+        tst     r7, #0x11               /* DIMM type = regular RDIMM (0x01)   */
+                                        /* or Mini-RDIMM (0x10)               */
+exit:
+        mov     PC, r13
+
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.S b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.S
new file mode 100644
index 00000000..e34ebbf2
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.S
@@ -0,0 +1,668 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvDramIfBasicAsm.s
+*
+* DESCRIPTION:
+*       Memory full detection and best timing configuration is done in
+*       C code. C runtime environment requires a stack. This module API
+*       initialize DRAM interface chip select 0 for basic functionality for
+*       the use of stack.
+*       The module API assumes DRAM information is stored in I2C EEPROM reside
+*       in a given I2C address MV_BOARD_DIMM0_I2C_ADDR. The I2C EEPROM
+*       internal data structure is assumed to be orgenzied in common DRAM
+*       vendor SPD structure.
+*       NOTE: DFCDL values are assumed to be already initialized prior to
+*       this module API activity.
+*
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+/* includes */
+#define MV_ASMLANGUAGE
+#include "mvOsAsm.h"
+#include "mvSysHwConfig.h"
+#include "mvDramIfRegs.h"
+#include "mvDramIfConfig.h"
+#include "mvCpuIfRegs.h"
+#include "pex/mvPexRegs.h"
+#include "pci/mvPciRegs.h"
+#include "mvCtrlEnvSpec.h"
+#include "mvCtrlEnvAsm.h"
+#include "cpu/mvCpuArm.h"
+#include "mvCommon.h"
+
+/* defines  */
+
+/* locals   */
+.data
+.globl _mvDramIfConfig
+
+.text
+
+/*******************************************************************************
+* _mvDramIfConfig - Basic DRAM interface initialization.
+*
+* DESCRIPTION:
+*       The function will initialize the following DRAM parameters using the
+*       values prepared by mvDramIfDetect routine. Values are located
+*       in predefined registers.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+
+_mvDramIfConfig:
+
+        /* Save register on stack */
+	cmp	sp, #0
+	beq	no_stack_s
+save_on_stack:
+        stmdb	sp!, {r1, r2, r3, r4, r7, r11}
+no_stack_s:
+
+	/* 1) Write to SDRAM coniguration register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG1)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_CONFIG_REG)
+        str     r4, [r1]
+
+	/* 2) Write Dunit control low register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG3)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_DUNIT_CTRL_REG)
+        str     r4, [r1]
+
+        /* 3) Write SDRAM address control register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG4)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_ADDR_CTRL_REG)
+        str     r4, [r1]
+
+        /* 4) Write SDRAM bank 0 size register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG0)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_SIZE_REG(0))
+        str     r4, [r1]
+
+        /* 5) Write SDRAM open pages control register */
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_OPEN_PAGE_CTRL_REG)
+        ldr     r4, =SDRAM_OPEN_PAGES_CTRL_REG_DV
+        str     r4, [r1]
+
+        /* 6) Write SDRAM timing Low register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG5)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_TIMING_CTRL_LOW_REG)
+        str     r4, [r1]
+
+        /* 7) Write SDRAM timing High register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG6)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_TIMING_CTRL_HIGH_REG)
+        str     r4, [r1]
+
+        /* 8) Write SDRAM mode register */
+        /* The CPU must not attempt to change the SDRAM Mode register setting */
+        /* prior to DRAM controller completion of the DRAM initialization     */
+        /* sequence. To guarantee this restriction, it is recommended that    */
+        /* the CPU sets the SDRAM Operation register to NOP command, performs */
+        /* read polling until the register is back in Normal operation value, */
+        /* and then sets SDRAM Mode register to it’s new value.               */
+
+	/* 8.1 write 'nop' to SDRAM operation */
+        mov     r4, #0x5                 /* 'NOP' command              */
+        MV_REG_WRITE_ASM(r4, r1, SDRAM_OPERATION_REG)
+
+        /* 8.2 poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll1:
+        ldr     r4, [r1]
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll1
+
+        /* 8.3 Now its safe to write new value to SDRAM Mode register         */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG2)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_MODE_REG)
+        str     r4, [r1]
+
+        /* 8.4 Make the Dunit write the DRAM its new mode                     */
+        mov     r4, #0x3                 /* Mode Register Set command  */
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_OPERATION_REG)
+
+        /* 8.5 poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll2:
+        ldr     r4, [r1]
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll2
+
+#ifndef DB_FPGA
+        /* Config DDR2 registers (Extended mode, ODTs and pad calibration)    */
+        MV_REG_READ_ASM (r4, r1, SDRAM_CONFIG_REG)
+        tst     r4, #SDRAM_DTYPE_DDR2
+        beq     _extModeODTEnd
+#endif /* DB_FPGA */
+
+        /* 9) Write SDRAM Extended mode register This operation should be     */
+        /*    done for each memory bank                                       */
+        /* write 'nop' to SDRAM operation */
+        mov     r4, #0x5                 /* 'NOP' command              */
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_OPERATION_REG)
+
+        /* poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll3:
+        ldr     r4, [r1]
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll3
+
+        /* Now its safe to write new value to SDRAM Extended Mode register    */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG10)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_EXTENDED_MODE_REG)
+        str     r4, [r1]
+
+        /* Go over each of the Banks */
+        ldr     r3, =0          /* r3 = DRAM bank Num */
+
+extModeLoop:
+        /* Set the SDRAM Operation Control to each of the DRAM banks          */
+        mov     r2, r3   /* Do not swap the bank counter value */
+        MV_REG_WRITE_ASM (r2, r1, SDRAM_OPERATION_CTRL_REG)
+
+        /* Make the Dunit write the DRAM its new mode                     */
+        mov     r4, #0x4        /* Extended Mode Register Set command  */
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_OPERATION_REG)
+
+        /* poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll4:
+        ldr     r4, [r1]
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll4
+#ifndef DB_FPGA
+        add     r3, r3, #1
+        cmp     r3, #4         /* 4 = Number of banks */
+        bne     extModeLoop
+
+extModeEnd:
+        /* Config DDR2 On Die Termination (ODT) registers */
+        /* Write SDRAM DDR2 ODT control low register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG7)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + DDR2_SDRAM_ODT_CTRL_LOW_REG)
+        str     r4, [r1]
+
+        /* Write SDRAM DDR2 ODT control high register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG8)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + DDR2_SDRAM_ODT_CTRL_HIGH_REG)
+        str     r4, [r1]
+
+        /* Write SDRAM DDR2 Dunit ODT control register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG9)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + DDR2_DUNIT_ODT_CONTROL_REG)
+        str     r4, [r1]
+
+#endif /* DB_FPGA */
+_extModeODTEnd:
+#ifndef DB_FPGA
+        /* Implement Guideline (GL# MEM-2) P_CAL Automatic Calibration  */
+        /* Does Not Work for Address/Control and Data Pads.             */
+        /* Relevant for: 88F5181-A1/B0 and 88F5281-A0                   */
+
+	/* Read device ID  */
+	MV_CTRL_MODEL_GET_ASM(r3, r1);
+        /* Read device revision */
+	MV_CTRL_REV_GET_ASM(r2, r1);
+
+	/* Continue if OrionN */
+        ldr     r1, =MV_5180_DEV_ID
+        cmp     r3, r1
+        bne     1f
+        b     glMem2End
+1:
+        /* Continue if Orion1 and device revision B1 */
+        ldr     r1, =MV_5181_DEV_ID
+        cmp     r3, r1
+        bne     1f
+
+        cmp     r2, #MV_5181_B1_REV
+        bge     glMem2End
+        b       glMem2Start
+1:
+
+        /* Orion NAS */
+        ldr     r1, =MV_5182_DEV_ID
+        cmp     r3, r1
+        beq     glMem2Start
+
+        /* Orion NAS */
+        ldr     r1, =MV_5082_DEV_ID
+        cmp     r3, r1
+        beq     glMem2Start
+
+        /* Orion Shark */
+        ldr     r1, =MV_8660_DEV_ID
+        cmp     r3, r1
+        beq     glMem2Start
+
+	b	glMem2End
+
+glMem2Start:
+
+        /* DDR SDRAM Address/Control Pads Calibration                         */
+        MV_REG_READ_ASM (r3, r1, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+        /* Set Bit [31] to make the register writable                   */
+        orr   r2, r3, #SDRAM_WR_EN
+
+        MV_REG_WRITE_ASM (r2, r1, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+        bic   r3, r3, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r3, r3, #SDRAM_TUNE_EN    /* Disable auto calibration     */
+        bic   r3, r3, #SDRAM_DRVN_MASK  /* Clear r1[5:0]<DrvN>          */
+        bic   r3, r3, #SDRAM_DRVP_MASK  /* Clear r1[11:6]<DrvP>         */
+
+        /* Get the final N locked value of driving strength [22:17]     */
+        mov   r1, r3
+        mov   r1, r1, LSL #9
+        mov   r1, r1, LSR #26    /* r1[5:0]<DrvN>  = r3[22:17]<LockN>   */
+        orr   r1, r1, r1, LSL #6 /* r1[11:6]<DrvP> = r1[5:0]<DrvN>      */
+
+        /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6]       */
+        orr   r3, r3, r1
+
+        MV_REG_WRITE_ASM (r3, r1, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+
+        /* DDR SDRAM Data Pads Calibration                         	*/
+        MV_REG_READ_ASM (r3, r1, SDRAM_DATA_PADS_CAL_REG)
+
+        /* Set Bit [31] to make the register writable                   */
+        orr   r2, r3, #SDRAM_WR_EN
+
+        MV_REG_WRITE_ASM (r2, r1, SDRAM_DATA_PADS_CAL_REG)
+
+        bic   r3, r3, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r3, r3, #SDRAM_TUNE_EN    /* Disable auto calibration     */
+        bic   r3, r3, #SDRAM_DRVN_MASK  /* Clear r1[5:0]<DrvN>          */
+        bic   r3, r3, #SDRAM_DRVP_MASK  /* Clear r1[11:6]<DrvP>         */
+
+        /* Get the final N locked value of driving strength [22:17]     */
+        mov   r1, r3
+        mov   r1, r1, LSL #9
+        mov   r1, r1, LSR #26
+        orr   r1, r1, r1, LSL #6 /* r1[5:0] = r3[22:17]<LockN>  */
+
+        /* Write to both <DrvN> bits [5:0] and <DrvP> bits [11:6]       */
+        orr   r3, r3, r1
+
+        MV_REG_WRITE_ASM (r3, r1, SDRAM_DATA_PADS_CAL_REG)
+
+glMem2End:
+
+
+        /* Implement Guideline (GL# MEM-3) Drive Strength Value         */
+        /* Relevant for: 88F5181-A1/B0/B1, 88F5281-A0/B0/C/D, 88F5182,  */
+	/* 88F5082, 88F5181L, 88F6082/L, 88F6183, 88F6183L */
+
+        /* Get SDRAM Config value */
+        MV_REG_READ_ASM (r2, r1, SDRAM_CONFIG_REG)
+
+        /* Get DIMM type */
+        tst     r2, #SDRAM_DTYPE_DDR2
+        beq     ddr1StrengthVal
+
+ddr2StrengthVal:
+        ldr     r4, =DDR2_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV
+        ldr     r2, =DDR2_DATA_PAD_STRENGTH_TYPICAL_DV
+        b       setDrvStrength
+ddr1StrengthVal:
+        ldr     r4, =DDR1_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV
+        ldr     r2, =DDR1_DATA_PAD_STRENGTH_TYPICAL_DV
+
+setDrvStrength:
+        /* DDR SDRAM Address/Control Pads Calibration                   */
+        MV_REG_READ_ASM (r3, r1, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+        orr   r3, r3, #SDRAM_WR_EN      /* Make register writeable      */
+
+        MV_REG_WRITE_ASM (r3, r1, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+        HTOLL(r3,r1)
+
+        bic   r3, r3, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r3, r3, #SDRAM_PRE_DRIVER_STRENGTH_MASK
+        orr   r3, r4, r3                /* Set default value for DDR    */
+
+        MV_REG_WRITE_ASM (r3, r1, SDRAM_ADDR_CTRL_PADS_CAL_REG)
+
+
+        /* DDR SDRAM Data Pads Calibration                         	      */
+        MV_REG_READ_ASM (r3, r1, SDRAM_DATA_PADS_CAL_REG)
+
+        orr   r3, r3, #SDRAM_WR_EN      /* Make register writeable      */
+
+        MV_REG_WRITE_ASM (r3, r1, SDRAM_DATA_PADS_CAL_REG)
+        HTOLL(r3,r1)
+
+        bic   r3, r3, #SDRAM_WR_EN      /* Make register read-only      */
+        bic   r3, r3, #SDRAM_PRE_DRIVER_STRENGTH_MASK
+        orr   r3, r2, r3                /* Set default value for DDR    */
+
+        MV_REG_WRITE_ASM (r3, r1, SDRAM_DATA_PADS_CAL_REG)
+
+#if !defined(MV_88W8660) && !defined(MV_88F6183) && !defined(MV_88F6183L)
+        /* Implement Guideline (GL# MEM-4) DQS Reference Delay Tuning   */
+        /* Relevant for: 88F5181-A1/B0/B1 and 88F5281-A0/B0/C/D, 88F5182 */
+	/* 88F5082, 88F5181L, 88F6082/L */
+                
+	/* Calc the absolute address of the _cpuARMDDRCLK[] in the boot flash */
+	ldr     r7, = _cpuARMDDRCLK
+	ldr	r4, =_start
+	sub     r7, r7, r4
+	add	r7, r7, #CFG_MONITOR_BASE
+
+        /* Get the "sample on reset" register for the DDR frequancy     */
+        MV_REG_READ_ASM (r4, r1, MPP_SAMPLE_AT_RESET)
+        ldr     r1, =MSAR_ARMDDRCLCK_MASK
+        and     r1, r4, r1
+#if 0 /* YOTAM TO BE FIX */
+	mov    r1, r1, LSR #MSAR_ARMDDRCLCK_OFFS
+#endif
+
+	/* Read device ID  */
+	MV_CTRL_MODEL_GET_ASM(r3, r2);
+
+        /* Continue if TC90 */
+        ldr     r2, =MV_1281_DEV_ID
+        cmp     r3, r2
+        beq     armClkMsb
+
+        /* Continue if Orion2 */
+        ldr     r2, =MV_5281_DEV_ID
+        cmp     r3, r2
+#if 0 /* YOTAM TO BE FIX */
+        bne     1f
+#endif
+
+armClkMsb:
+#if 0 /* YOTAM TO BE FIX */
+	tst    r4, #MSAR_ARMDDRCLCK_H_MASK
+        beq    1f
+        orr    r1, r1, #BIT4
+1:
+	ldr    r4, =MV_CPU_ARM_CLK_ELM_SIZE
+	mul    r1, r4, r1
+	add    r7, r7, r1
+	add    r7, r7, #MV_CPU_ARM_CLK_DDR_OFF
+	ldr    r1, [r7]
+#endif
+
+        /* Get SDRAM Config value */
+        MV_REG_READ_ASM (r2, r4, SDRAM_CONFIG_REG)
+
+        /* Get DIMM type */
+        tst     r2, #SDRAM_DTYPE_DDR2
+        beq     ddr1FtdllVal
+
+ddr2FtdllVal:
+        ldr     r2, =MV_5281_DEV_ID
+        cmp     r3, r2
+	bne	2f
+    	MV_CTRL_REV_GET_ASM(r3, r2)
+        cmp     r3, #MV_5281_D0_REV
+        beq     orin2_d0_ddr2_ftdll_val
+        cmp     r3, #MV_5281_D1_REV
+        beq     orin2_d1_ddr2_ftdll_val
+        cmp     r3, #MV_5281_D2_REV
+        beq     orin2_d1_ddr2_ftdll_val
+	b	ddr2_default_val
+
+/* Set Orion 2 D1 ftdll values for DDR2 */
+orin2_d1_ddr2_ftdll_val:
+	ldr    r4, =FTDLL_DDR2_250MHZ_5281_D1
+	ldr    r7, =_250MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_200MHZ_5281_D1
+	ldr    r7, =_200MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_166MHZ_5281_D0
+	ldr    r7, =_166MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+	b	ddr2_default_val
+
+/* Set Orion 2 D0 ftdll values for DDR2 */
+orin2_d0_ddr2_ftdll_val:
+	ldr    r4, =FTDLL_DDR2_250MHZ_5281_D0
+	ldr    r7, =_250MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_200MHZ_5281_D0
+	ldr    r7, =_200MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_166MHZ_5281_D0
+	ldr    r7, =_166MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+	b       ddr2_default_val
+2:
+        ldr     r2, =MV_5182_DEV_ID
+        cmp     r3, r2
+	bne	3f
+
+/* Set Orion nas ftdll values for DDR2 */
+orin_nas_ftdll_val:
+        ldr     r4, =FTDLL_DDR2_166MHZ_5182
+	ldr    r7, =_166MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+
+/* default values for all other devices */
+3:
+ddr2_default_val:
+        ldr    r4, =FTDLL_DDR2_250MHZ
+	ldr    r7, =_250MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_200MHZ
+	ldr    r7, =_200MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_166MHZ
+	ldr    r7, =_166MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR2_133MHZ
+	ldr    r7, =_133MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr    r4, =0
+        b       setFtdllReg
+
+ddr1FtdllVal:
+        ldr     r2, =MV_5281_DEV_ID
+        cmp     r3, r2
+	bne	2f
+    	MV_CTRL_REV_GET_ASM(r3, r2)
+        cmp     r3, #MV_5281_D0_REV
+        bge     orin2_ddr1_ftdll_val
+	b	ddr1_default_val
+
+/* Set Orion 2 D0 and above ftdll values for DDR1 */
+orin2_ddr1_ftdll_val:
+        ldr     r4, =FTDLL_DDR1_200MHZ_5281_D0
+	ldr    r7, =_200MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+        ldr     r4, =FTDLL_DDR1_166MHZ_5281_D0
+	ldr    r7, =_166MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+	b       ddr1_default_val
+2:
+        ldr     r2, =MV_5181_DEV_ID
+        cmp     r3, r2
+	bne	3f
+    	MV_CTRL_REV_GET_ASM(r3, r2)
+        cmp     r3, #MV_5181_B1_REV
+        bge     orin1_ddr1_ftdll_val
+	b	ddr1_default_val
+
+/* Set Orion 1 ftdll values for DDR1 */
+orin1_ddr1_ftdll_val:
+        ldr     r4, =FTDLL_DDR1_166MHZ_5181_B1
+	ldr    r7, =_166MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+3:
+ddr1_default_val:
+        ldr    r4, =FTDLL_DDR1_133MHZ
+	ldr    r7, =_133MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+
+        ldr    r4, =FTDLL_DDR1_166MHZ
+	ldr    r7, =_166MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+
+        ldr    r4, =FTDLL_DDR1_200MHZ
+	ldr    r7, =_200MHz
+        cmp    r1, r7
+        beq    setFtdllReg
+
+        ldr    r4, =0
+
+setFtdllReg:
+
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_FTDLL_CONFIG_REG)
+        HTOLL(r4,r1)
+        bic   r4, r4, #1
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_FTDLL_CONFIG_REG)
+
+#endif /* !defined(MV_88W8660) && !defined(MV_88F6183) && !defined(MV_88F6183L) */
+#endif /* DB_FPGA */
+
+restoreTmpRegs:
+        /* Restore the registers we used to save the DDR detect values */
+
+        ldr     r4, =DRAM_BUF_REG0_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG0)
+
+        ldr     r4, =DRAM_BUF_REG1_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG1)
+
+        ldr     r4, =DRAM_BUF_REG2_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG2)
+
+        ldr     r4, =DRAM_BUF_REG3_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG3)
+
+        ldr     r4, =DRAM_BUF_REG4_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG4)
+
+        ldr     r4, =DRAM_BUF_REG5_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG5)
+
+        ldr     r4, =DRAM_BUF_REG6_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG6)
+
+        ldr     r4, =DRAM_BUF_REG7_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG7)
+
+        ldr     r4, =DRAM_BUF_REG8_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG8)
+
+        ldr     r4, =DRAM_BUF_REG9_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG9)
+
+        ldr     r4, =DRAM_BUF_REG10_DV
+        MV_REG_WRITE_ASM (r4, r1, DRAM_BUF_REG10)
+
+
+        /* Restore registers */
+        /* Save register on stack */
+	cmp	sp, #0
+	beq	no_stack_l
+load_from_stack:
+        ldmia	sp!, {r1, r2, r3, r4, r7, r11}
+no_stack_l:
+
+        mov     pc, lr
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h
new file mode 100644
index 00000000..a7c66444
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h
@@ -0,0 +1,192 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvDramIfConfigh
+#define __INCmvDramIfConfigh
+
+/* includes */
+
+/* defines  */
+
+/* registers defaults values */
+
+#define SDRAM_CONFIG_DV 				\
+		(SDRAM_PERR_WRITE			|	\
+		 SDRAM_SRMODE				|	\
+		 SDRAM_SRCLK_GATED)
+
+#define SDRAM_DUNIT_CTRL_LOW_DV			\
+		(SDRAM_CTRL_POS_RISE		|	\
+		 SDRAM_CLK1DRV_NORMAL		|	\
+		 SDRAM_LOCKEN_ENABLE)
+
+#define SDRAM_ADDR_CTRL_DV	    0
+		
+#define SDRAM_TIMING_CTRL_LOW_REG_DV 	\
+		((0x2 << SDRAM_TRCD_OFFS)	|	\
+		 (0x2 << SDRAM_TRP_OFFS)	|	\
+		 (0x1 << SDRAM_TWR_OFFS)	|	\
+		 (0x0 << SDRAM_TWTR_OFFS)	|	\
+		 (0x5 << SDRAM_TRAS_OFFS)	|	\
+		 (0x1 << SDRAM_TRRD_OFFS))
+/* TRFC 0x27, TW2W 0x1 */
+#define SDRAM_TIMING_CTRL_HIGH_REG_DV	(( 0x7 << SDRAM_TRFC_OFFS )	|\
+					( 0x2 << SDRAM_TRFC_EXT_OFFS)	|\
+					( 0x1 << SDRAM_TW2W_OFFS))
+
+#define SDRAM_OPEN_PAGES_CTRL_REG_DV	SDRAM_OPEN_PAGE_EN	
+
+/* DDR2 ODT default register values */
+
+/* Presence	     Ctrl Low    Ctrl High  Dunit Ctrl   Ext Mode     */
+/*	CS0	         0x84210000  0x00000000  0x0000780F  0x00000440 */
+/*	CS0+CS1          0x84210000  0x00000000  0x0000780F  0x00000440 */
+/*	CS0+CS2	    	 0x030C030C  0x00000000  0x0000740F  0x00000404 */
+/*	CS0+CS1+CS2	 0x030C030C  0x00000000  0x0000740F  0x00000404 */
+/*	CS0+CS2+CS3	 0x030C030C  0x00000000  0x0000740F  0x00000404 */
+/*	CS0+CS1+CS2+CS3  0x030C030C  0x00000000  0x0000740F  0x00000404 */
+
+#define DDR2_ODT_CTRL_LOW_CS0_DV	0x84210000
+#define DDR2_ODT_CTRL_HIGH_CS0_DV	0x00000000
+#define DDR2_DUNIT_ODT_CTRL_CS0_DV	0x0000780F
+#define DDR_SDRAM_EXT_MODE_CS0_DV	0x00000440
+
+#define DDR2_ODT_CTRL_LOW_CS0_CS2_DV	0x030C030C
+#define DDR2_ODT_CTRL_HIGH_CS0_CS2_DV	0x00000000
+#define DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV	0x0000740F
+#define DDR_SDRAM_EXT_MODE_CS0_CS2_DV	0x00000404
+
+
+/* DDR SDRAM Adderss/Control and Data Pads Calibration default values */
+#define DDR1_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV	\
+		(1 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+#define DDR2_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV	\
+		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+		
+		
+#define DDR1_DATA_PAD_STRENGTH_TYPICAL_DV		\
+		(1 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+#define DDR2_DATA_PAD_STRENGTH_TYPICAL_DV		\
+		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+
+/* DDR SDRAM Mode Register default value */
+#define DDR1_MODE_REG_DV			0x00000000
+#define DDR2_MODE_REG_DV			0x00000400
+
+/* DDR SDRAM Timing parameter default values */
+#define DDR1_TIMING_LOW_DV           0x11602220
+#define DDR1_TIMING_HIGH_DV          0x0000000d
+
+#define DDR2_TIMING_LOW_DV           0x11812220
+#define DDR2_TIMING_HIGH_DV          0x0000030f
+
+/* For Guideline (GL# MEM-4) DQS Reference Delay Tuning */
+#define FTDLL_DDR1_166MHZ           ((0x1 << 0)    | \
+                                     (0x7F<< 12)   | \
+                                     (0x1 << 22))
+
+#define FTDLL_DDR1_133MHZ           FTDLL_DDR1_166MHZ
+
+#define FTDLL_DDR1_200MHZ           ((0x1 << 0)    | \
+                                     (0x1 << 12)   | \
+                                     (0x3 << 14)   | \
+                                     (0x1 << 18)   | \
+                                     (0x1 << 22))
+
+
+#define FTDLL_DDR2_166MHZ           ((0x1 << 0)    | \
+                                     (0x1 << 12)   | \
+                                     (0x1 << 14)   | \
+                                     (0x1 << 16)   | \
+                                     (0x1 << 19)   | \
+                                     (0xF << 20))
+
+#define FTDLL_DDR2_133MHZ           FTDLL_DDR2_166MHZ
+
+#define FTDLL_DDR2_200MHZ           ((0x1 << 0)    | \
+                                     (0x1 << 12)   | \
+                                     (0x1 << 14)   | \
+                                     (0x1 << 16)   | \
+                                     (0x1 << 19)   | \
+                                     (0xF << 20))
+
+#define FTDLL_DDR2_250MHZ            0x445001
+
+/* Orion 1 B1 and above */
+#define FTDLL_DDR1_166MHZ_5181_B1    0x45D001
+
+/* Orion nas */
+#define FTDLL_DDR2_166MHZ_5182       0x597001
+
+/* Orion 2 D0 and above */
+#define FTDLL_DDR1_166MHZ_5281_D0    0x8D0001
+#define FTDLL_DDR1_200MHZ_5281_D0    0x8D0001
+#define FTDLL_DDR2_166MHZ_5281_D0    0x485001
+#define FTDLL_DDR2_200MHZ_5281_D0    0x485001
+#define FTDLL_DDR2_250MHZ_5281_D0    0x445001
+#define FTDLL_DDR2_200MHZ_5281_D1    0x995001
+#define FTDLL_DDR2_250MHZ_5281_D1    0x984801
+
+#endif /* __INCmvDramIfh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h
new file mode 100644
index 00000000..e9cd7c4e
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h
@@ -0,0 +1,306 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvDramIfRegsh
+#define __INCmvDramIfRegsh
+
+
+/* DDR SDRAM Controller Address Decode Registers */
+/* SDRAM CSn Base Address Register (SCBAR) */
+#define SDRAM_BASE_ADDR_REG(csNum)	(0x1500 + (csNum * 8))
+#define SCBAR_BASE_OFFS				16 
+#define SCBAR_BASE_MASK				(0xffff << SCBAR_BASE_OFFS)
+#define SCBAR_BASE_ALIGNMENT		0x10000 
+
+/* SDRAM CSn Size Register (SCSR) */		  
+#define SDRAM_SIZE_REG(csNum)	(0x1504 + (csNum * 8))
+#define SCSR_WIN_EN					BIT0
+#define SCSR_SIZE_OFFS				16
+#define SCSR_SIZE_MASK				(0xffff << SCSR_SIZE_OFFS)
+#define SCSR_SIZE_ALIGNMENT			0x10000
+
+/* configuration register */
+#define SDRAM_CONFIG_REG   		0x1400
+#define SDRAM_REFRESH_OFFS 		0
+#define SDRAM_REFRESH_MAX  		0x3000
+#define SDRAM_REFRESH_MASK 		(SDRAM_REFRESH_MAX << SDRAM_REFRESH_OFFS)
+#define SDRAM_DWIDTH_OFFS       14
+#define SDRAM_DWIDTH_MASK       (3 << SDRAM_DWIDTH_OFFS)
+#define SDRAM_DWIDTH_16BIT      (1 << SDRAM_DWIDTH_OFFS)
+#define SDRAM_DWIDTH_32BIT      (2 << SDRAM_DWIDTH_OFFS)
+#define SDRAM_DTYPE_OFFS        16
+#define SDRAM_DTYPE_MASK        (1 << SDRAM_DTYPE_OFFS)
+#define SDRAM_DTYPE_DDR1        (0 << SDRAM_DTYPE_OFFS)
+#define SDRAM_DTYPE_DDR2        (1 << SDRAM_DTYPE_OFFS)
+#define SDRAM_REGISTERED   		(1 << 17)
+#define SDRAM_PERR_OFFS    		18
+#define SDRAM_PERR_MASK    		(1 << SDRAM_PERR_OFFS)
+#define SDRAM_PERR_NO_WRITE     (0 << SDRAM_PERR_OFFS)
+#define SDRAM_PERR_WRITE        (1 << SDRAM_PERR_OFFS)
+#define SDRAM_DCFG_OFFS     	20
+#define SDRAM_DCFG_MASK     	(0x3 << SDRAM_DCFG_OFFS)
+#define SDRAM_DCFG_X16_DEV   	(1 << SDRAM_DCFG_OFFS)
+#define SDRAM_DCFG_X8_DEV   	(2 << SDRAM_DCFG_OFFS)
+#define SDRAM_SRMODE			(1 << 24)
+#define SDRAM_SRCLK_OFFS		25
+#define SDRAM_SRCLK_MASK		(1 << SDRAM_SRCLK_OFFS)
+#define SDRAM_SRCLK_KEPT		(0 << SDRAM_SRCLK_OFFS)
+#define SDRAM_SRCLK_GATED		(1 << SDRAM_SRCLK_OFFS)
+#define SDRAM_CATTH_OFFS		26
+#define SDRAM_CATTHR_EN			(1 << SDRAM_CATTH_OFFS)
+
+
+/* dunit control register */
+#define SDRAM_DUNIT_CTRL_REG  	0x1404
+#define SDRAM_CTRL_POS_OFFS	   	6
+#define SDRAM_CTRL_POS_FALL	   	(0 << SDRAM_CTRL_POS_OFFS)
+#define SDRAM_CTRL_POS_RISE	   	(1 << SDRAM_CTRL_POS_OFFS)
+#define SDRAM_CLK1DRV_OFFS      12
+#define SDRAM_CLK1DRV_MASK      (1 << SDRAM_CLK1DRV_OFFS)
+#define SDRAM_CLK1DRV_HIGH_Z    (0 << SDRAM_CLK1DRV_OFFS)
+#define SDRAM_CLK1DRV_NORMAL    (1 << SDRAM_CLK1DRV_OFFS)
+#define SDRAM_LOCKEN_OFFS       18
+#define SDRAM_LOCKEN_MASK       (1 << SDRAM_LOCKEN_OFFS)
+#define SDRAM_LOCKEN_DISABLE    (0 << SDRAM_LOCKEN_OFFS)
+#define SDRAM_LOCKEN_ENABLE     (1 << SDRAM_LOCKEN_OFFS)
+#define SDRAM_ST_BURST_DEL_OFFS 	24
+#define SDRAM_ST_BURST_DEL_MAX 	0xf
+#define SDRAM_ST_BURST_DEL_MASK (SDRAM_ST_BURST_DEL_MAX<<SDRAM_ST_BURST_DEL_OFFS)
+
+/* sdram timing control low register */
+#define SDRAM_TIMING_CTRL_LOW_REG	0x1408
+#define SDRAM_TRCD_OFFS 		4
+#define SDRAM_TRCD_MASK 		(0xF << SDRAM_TRCD_OFFS)
+#define SDRAM_TRP_OFFS 			8
+#define SDRAM_TRP_MASK 			(0xF << SDRAM_TRP_OFFS)
+#define SDRAM_TWR_OFFS 			12
+#define SDRAM_TWR_MASK 			(0xF << SDRAM_TWR_OFFS)
+#define SDRAM_TWTR_OFFS 		16
+#define SDRAM_TWTR_MASK 		(0xF << SDRAM_TWTR_OFFS)
+#define SDRAM_TRAS_OFFS 		20
+#define SDRAM_TRAS_MASK 		(0xF << SDRAM_TRAS_OFFS)
+#define SDRAM_TRRD_OFFS 		24
+#define SDRAM_TRRD_MASK 		(0xF << SDRAM_TRRD_OFFS)
+#define SDRAM_TRTP_OFFS 		28
+#define SDRAM_TRTP_MASK 		(0xF << SDRAM_TRTP_OFFS)
+
+/* sdram timing control high register */
+#define SDRAM_TIMING_CTRL_HIGH_REG	0x140c
+#define SDRAM_TRFC_OFFS 		0
+#define SDRAM_TRFC_MASK 		(0xF << SDRAM_TRFC_OFFS)
+#define SDRAM_TR2R_OFFS 		4
+#define SDRAM_TR2R_MASK 		(0x3 << SDRAM_TR2R_OFFS)
+#define SDRAM_TR2W_W2R_OFFS 		6
+#define SDRAM_TR2W_W2R_MASK 		(0x3 << SDRAM_TR2W_W2R_OFFS)
+#define SDRAM_TRFC_EXT_OFFS		8
+#define SDRAM_TRFC_EXT_MASK		(0x1 << SDRAM_TRFC_EXT_OFFS)
+#define SDRAM_TW2W_OFFS		    10
+#define SDRAM_TW2W_MASK		    (0x1 << SDRAM_TW2W_OFFS)
+
+/* address control register */
+#define SDRAM_ADDR_CTRL_REG		0x1410
+#define SDRAM_DSIZE_OFFS   	    4
+#define SDRAM_DSIZE_MASK   	    (0x3 << SDRAM_DSIZE_OFFS)
+#define SDRAM_DSIZE_128Mb 	    (0x0 << SDRAM_DSIZE_OFFS)
+#define SDRAM_DSIZE_256Mb 	    (0x1 << SDRAM_DSIZE_OFFS)
+#define SDRAM_DSIZE_512Mb  	    (0x2 << SDRAM_DSIZE_OFFS)
+
+/* SDRAM Open Pages Control registers */
+#define SDRAM_OPEN_PAGE_CTRL_REG	0x1414
+#define SDRAM_OPEN_PAGE_EN		    (0 << 0)
+#define SDRAM_OPEN_PAGE_DIS		    (1 << 0)
+
+/* sdram opertion register */
+#define SDRAM_OPERATION_REG 	0x1418
+#define SDRAM_CMD_OFFS  		0
+#define SDRAM_CMD_MASK   		(0x7 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_NORMAL 		(0x0 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_PRECHARGE_ALL (0x1 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_REFRESH_ALL 	(0x2 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_REG_SET_CMD 	(0x3 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_EXT_MODE_SET 	(0x4 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_NOP 			(0x5 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_SLF_RFRSH 	(0x7 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_EMRS2_CMD  	(0x8 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_EMRS3_CMD  	(0x9 << SDRAM_CMD_OFFS)
+
+/* sdram mode register */
+#define SDRAM_MODE_REG 			0x141c
+#define SDRAM_BURST_LEN_OFFS 	0
+#define SDRAM_BURST_LEN_MASK 	(0x7 << SDRAM_BURST_LEN_OFFS)
+#define SDRAM_BURST_LEN_4    	(0x2 << SDRAM_BURST_LEN_OFFS)
+#define SDRAM_CL_OFFS   		4
+#define SDRAM_CL_MASK   		(0x7 << SDRAM_CL_OFFS)
+#define SDRAM_DDR1_CL_2	     	(0x2 << SDRAM_CL_OFFS)
+#define SDRAM_DDR1_CL_3      	(0x3 << SDRAM_CL_OFFS)
+#define SDRAM_DDR1_CL_4      	(0x4 << SDRAM_CL_OFFS)
+#define SDRAM_DDR1_CL_1_5    	(0x5 << SDRAM_CL_OFFS)
+#define SDRAM_DDR1_CL_2_5    	(0x6 << SDRAM_CL_OFFS)
+#define SDRAM_DDR2_CL_3      	(0x3 << SDRAM_CL_OFFS)
+#define SDRAM_DDR2_CL_4      	(0x4 << SDRAM_CL_OFFS)
+#define SDRAM_DDR2_CL_5    		(0x5 << SDRAM_CL_OFFS)
+#define SDRAM_TM_OFFS           7
+#define SDRAM_TM_MASK           (1 << SDRAM_TM_OFFS)
+#define SDRAM_TM_NORMAL         (0 << SDRAM_TM_OFFS)
+#define SDRAM_TM_TEST_MODE      (1 << SDRAM_TM_OFFS)
+#define SDRAM_DLL_OFFS          8
+#define SDRAM_DLL_MASK          (1 << SDRAM_DLL_OFFS)
+#define SDRAM_DLL_NORMAL        (0 << SDRAM_DLL_OFFS)
+#define SDRAM_DLL_RESET 	(1 << SDRAM_DLL_OFFS)
+#define SDRAM_WR_OFFS		11
+#define SDRAM_WR_MAX		7
+#define SDRAM_WR_MASK		(SDRAM_WR_MAX << SDRAM_WR_OFFS)
+#define SDRAM_PD_OFFS		12
+#define SDRAM_PD_MASK		(1 << SDRAM_PD_OFFS) 
+#define SDRAM_PD_FAST_EXIT	(0 << SDRAM_PD_OFFS) 
+#define SDRAM_PD_SLOW_EXIT	(1 << SDRAM_PD_OFFS) 
+
+/* DDR SDRAM Extended Mode register (DSEMR) */
+#define SDRAM_EXTENDED_MODE_REG	0x1420
+#define DSEMR_DLL_ENABLE		(1 << 0)
+#define DSEMR_DS_OFFS			1
+#define DSEMR_DS_MASK			(1 << DSEMR_DS_OFFS)
+#define DSEMR_DS_NORMAL			(0 << DSEMR_DS_OFFS)
+#define DSEMR_DS_REDUCED		(1 << DSEMR_DS_OFFS)
+#define DSEMR_RTT0_OFFS			2
+#define DSEMR_RTT1_OFFS			6
+#define DSEMR_RTT_ODT_DISABLE	((0 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
+#define DSEMR_RTT_ODT_75_OHM	((1 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
+#define DSEMR_RTT_ODT_150_OHM	((0 << DSEMR_RTT0_OFFS)||(1 << DSEMR_RTT1_OFFS))
+#define DSEMR_OCD_OFFS			7
+#define DSEMR_OCD_MASK			(0x7 << DSEMR_OCD_OFFS)
+#define DSEMR_OCD_EXIT_CALIB	(0 << DSEMR_OCD_OFFS)
+#define DSEMR_OCD_DRIVE1		(1 << DSEMR_OCD_OFFS)
+#define DSEMR_OCD_DRIVE0		(2 << DSEMR_OCD_OFFS)
+#define DSEMR_OCD_ADJUST_MODE	(4 << DSEMR_OCD_OFFS)
+#define DSEMR_OCD_CALIB_DEFAULT	(7 << DSEMR_OCD_OFFS)
+#define DSEMR_DQS_OFFS			10
+#define DSEMR_DQS_MASK			(1 << DSEMR_DQS_OFFS)
+#define DSEMR_DQS_DIFFERENTIAL	(0 << DSEMR_DQS_OFFS)
+#define DSEMR_DQS_SINGLE_ENDED	(0 << DSEMR_DQS_OFFS)
+#define DSEMR_RDQS_ENABLE		(1 << 11)
+#define DSEMR_QOFF_OUTPUT_BUFF_EN	(1 << 12)
+
+/* DDR SDRAM Operation Control Register */
+#define SDRAM_OPERATION_CTRL_REG	0x142c
+
+/* Dunit FTDLL Configuration Register */
+#define SDRAM_FTDLL_CONFIG_REG			0x1484
+  
+/* Pads Calibration register */
+#define SDRAM_ADDR_CTRL_PADS_CAL_REG	0x14c0
+#define SDRAM_DATA_PADS_CAL_REG		0x14c4
+#define SDRAM_DRVN_OFFS 				0
+#define SDRAM_DRVN_MASK 				(0x3F << SDRAM_DRVN_OFFS)
+#define SDRAM_DRVP_OFFS 				6
+#define SDRAM_DRVP_MASK 				(0x3F << SDRAM_DRVP_OFFS)
+#define SDRAM_PRE_DRIVER_STRENGTH_OFFS	12
+#define SDRAM_PRE_DRIVER_STRENGTH_MASK	(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+#define SDRAM_TUNE_EN   		BIT16
+#define SDRAM_LOCK_OFFS 		17
+#define SDRAM_LOCK_MAKS 		(0x1F << SDRAM_LOCK_OFFS)
+#define SDRAM_LOCKN_OFFS 		17
+#define SDRAM_LOCKN_MAKS 		(0x3F << SDRAM_LOCKN_OFFS)
+#define SDRAM_LOCKP_OFFS 		23
+#define SDRAM_LOCKP_MAKS 		(0x3F << SDRAM_LOCKP_OFFS)
+#define SDRAM_WR_EN     		(1 << 31)
+
+/* DDR2 SDRAM ODT Control (Low) Register (DSOCLR) */
+#define DDR2_SDRAM_ODT_CTRL_LOW_REG  0x1494
+#define DSOCLR_ODT_RD_OFFS(odtNum)   (odtNum * 4)
+#define DSOCLR_ODT_RD_MASK(odtNum)   (0xf << DSOCLR_ODT_RD_OFFS(odtNum))
+#define DSOCLR_ODT_RD(odtNum, bank)  ((1 << bank) << DSOCLR_ODT_RD_OFFS(odtNum))
+#define DSOCLR_ODT_WR_OFFS(odtNum)   (16 + (odtNum * 4))
+#define DSOCLR_ODT_WR_MASK(odtNum)   (0xf << DSOCLR_ODT_WR_OFFS(odtNum))
+#define DSOCLR_ODT_WD(odtNum, bank)  ((1 << bank) << DSOCLR_ODT_WR_OFFS(odtNum))
+
+/* DDR2 SDRAM ODT Control (High) Register (DSOCHR) */
+#define DDR2_SDRAM_ODT_CTRL_HIGH_REG    0x1498
+/* Optional control values to DSOCHR_ODT_EN macro */
+#define DDR2_ODT_CTRL_DUNIT         0
+#define DDR2_ODT_CTRL_NEVER         1
+#define DDR2_ODT_CTRL_ALWAYS        3
+#define DSOCHR_ODT_EN_OFFS(odtNum)  (odtNum * 2)
+#define DSOCHR_ODT_EN_MASK(odtNum)  (0x3 << DSOCHR_ODT_EN_OFFS(odtNum))
+#define DSOCHR_ODT_EN(odtNum, ctrl) ((1 << ctrl) << DSOCHR_ODT_RD_OFFS(odtNum))
+
+/* DDR2 Dunit ODT Control Register (DDOCR)*/
+#define DDR2_DUNIT_ODT_CONTROL_REG  0x149c
+#define DDOCR_ODT_RD_OFFS           0
+#define DDOCR_ODT_RD_MASK           (0xf << DDOCR_ODT_RD_OFFS)
+#define DDOCR_ODT_RD(bank)          ((1 << bank) << DDOCR_ODT_RD_OFFS)
+#define DDOCR_ODT_WR_OFFS           4
+#define DDOCR_ODT_WR_MASK           (0xf << DDOCR_ODT_WR_OFFS)
+#define DDOCR_ODT_WR(bank)          ((1 << bank) << DDOCR_ODT_WR_OFFS)
+#define DSOCR_ODT_EN_OFFS           8
+#define DSOCR_ODT_EN_MASK           (0x3 << DSOCR_ODT_EN_OFFS)
+#define DSOCR_ODT_EN(ctrl)          ((1 << ctrl) << DSOCR_ODT_EN_OFFS)
+#define DSOCR_ODT_SEL_OFFS          10
+#define DSOCR_ODT_SEL_MASK          (0x3 << DSOCR_ODT_SEL_OFFS)
+
+/* DDR SDRAM Initialization Control Register (DSICR) */
+#define DDR_SDRAM_INIT_CTRL_REG		0x1480
+#define DSICR_INIT_EN				(1 << 0)
+
+#endif /* __INCmvDramIfRegsh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvCompVer.txt
new file mode 100644
index 00000000..38a92644
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.4
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c
new file mode 100644
index 00000000..a214c95c
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c
@@ -0,0 +1,1855 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+/* includes */
+#include "ddr2/mvDramIf.h"
+#include "ctrlEnv/sys/mvCpuIf.h"
+
+#include "ddr2/mvDramIfStaticInit.h"
+
+/* #define MV_DEBUG */
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+/* DRAM bank presence encoding */
+#define BANK_PRESENT_CS0			    0x1
+#define BANK_PRESENT_CS0_CS1			0x3
+#define BANK_PRESENT_CS0_CS2			0x5
+#define BANK_PRESENT_CS0_CS1_CS2		0x7
+#define BANK_PRESENT_CS0_CS2_CS3		0xd
+#define BANK_PRESENT_CS0_CS2_CS3_CS4	0xf
+
+/* locals   */
+#ifndef MV_STATIC_DRAM_ON_BOARD
+static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo);
+static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32  busClk, MV_STATUS TTmode );
+static MV_U32 dunitCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32  busClk);
+static MV_U32 sdramModeRegCalc(MV_U32 minCas);
+static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk);
+static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_DRAM_BANK_INFO *pBankInfoDIMM1);
+static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk);
+static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo,MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk, MV_U32 forcedCl);
+static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32 busClk);
+static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk);
+static MV_U32 sdramDdr2TimeLoRegCalc(MV_U32 minCas);
+static MV_U32 sdramDdr2TimeHiRegCalc(MV_U32 minCas);
+#endif
+MV_32 DRAM_CS_Order[MV_DRAM_MAX_CS] = {N_A
+
+#ifdef MV_INCLUDE_SDRAM_CS1
+		,N_A
+#endif
+#ifdef MV_INCLUDE_SDRAM_CS2
+		,N_A
+#endif
+#ifdef MV_INCLUDE_SDRAM_CS3
+    ,N_A
+#endif
+	};
+/* Get DRAM size of CS num */
+MV_U32 mvDramCsSizeGet(MV_U32 csNum)
+{
+	MV_DRAM_BANK_INFO bankInfo;
+	MV_U32  size, deviceW, dimmW;
+#ifdef MV78XX0	
+	MV_U32  temp;
+#endif
+
+	if(MV_OK == mvDramBankInfoGet(csNum, &bankInfo))
+	{
+        	if (0 == bankInfo.size)
+			return 0;
+
+		/* Note that the Dimm width might be different then the device DRAM width */
+#ifdef MV78XX0	
+		temp = MV_REG_READ(SDRAM_CONFIG_REG);
+		deviceW = ((temp & SDRAM_DWIDTH_MASK) == SDRAM_DWIDTH_32BIT )? 32 : 64;
+#else
+		deviceW = 16 /* KW family */;
+#endif
+		dimmW = bankInfo.dataWidth - (bankInfo.dataWidth % 16);
+		size = ((bankInfo.size << 20) / (dimmW/deviceW)); 
+		return size;
+	}
+	else
+		return 0;
+}
+/*******************************************************************************
+* mvDramIfDetect - Prepare DRAM interface configuration values.
+*
+* DESCRIPTION:
+*       This function implements the full DRAM detection and timing 
+*       configuration for best system performance.
+*       Since this routine runs from a ROM device (Boot Flash), its stack 
+*       resides on RAM, that might be the system DRAM. Changing DRAM 
+*       configuration values while keeping vital data in DRAM is risky. That
+*       is why the function does not preform the configuration setting but 
+*       prepare those in predefined 32bit registers (in this case IDMA 
+*       registers are used) for other routine to perform the settings.
+*       The function will call for board DRAM SPD information for each DRAM 
+*       chip select. The function will then analyze those SPD parameters of 
+*       all DRAM banks in order to decide on DRAM configuration compatible 
+*       for all DRAM banks.
+*       The function will set the CPU DRAM address decode registers.
+*       Note: This routine prepares values that will overide configuration of
+*       mvDramBasicAsmInit().
+*       
+* INPUT:
+*       forcedCl - Forced CAL Latency. If equal to zero, do not force.
+*       eccDisable - Force down the ECC.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvDramIfDetect(MV_U32 forcedCl, MV_BOOL eccDisable)
+{
+	MV_32 	MV_DRAM_CS_order[MV_DRAM_MAX_CS] = {
+		SDRAM_CS0
+#ifdef MV_INCLUDE_SDRAM_CS1
+		,SDRAM_CS1
+#endif
+#ifdef MV_INCLUDE_SDRAM_CS2
+		,SDRAM_CS2
+#endif
+#ifdef MV_INCLUDE_SDRAM_CS3
+		,SDRAM_CS3
+#endif
+		};
+	MV_U32  busClk, deviceW, dimmW;
+	MV_U32 numOfAllDevices = 0;
+	MV_STATUS TTMode; 
+#ifndef MV_STATIC_DRAM_ON_BOARD
+	MV_DRAM_BANK_INFO bankInfo[MV_DRAM_MAX_CS];
+	MV_U32  size, base = 0, i, j, temp, busClkPs;
+	MV_U8	minCas;
+	MV_CPU_DEC_WIN dramDecWin;
+	dramDecWin.addrWin.baseHigh = 0;
+#endif
+
+	busClk = mvBoardSysClkGet();
+
+	if (0 == busClk)
+	{
+		mvOsPrintf("Dram: ERR. Can't detect system clock! \n");
+		return MV_ERROR;
+	}
+	
+#ifndef MV_STATIC_DRAM_ON_BOARD
+
+	busClkPs = 1000000000 / (busClk / 1000);  /* in ps units */
+	/* we will use bank 0 as the representative of the all the DRAM banks,  */
+	/* since bank 0 must exist.                                             */	
+	for(i = 0; i < MV_DRAM_MAX_CS; i++)
+	{ 
+		/* if Bank exist */
+		if(MV_OK == mvDramBankInfoGet(i, &bankInfo[i]))
+		{
+			DB(mvOsPrintf("Dram: Find bank %d\n", i));
+			/* check it isn't SDRAM */
+			if(bankInfo[i].memoryType != MEM_TYPE_DDR2)
+			{
+				mvOsOutput("Dram: ERR. SDRAM type not supported !!!\n");
+				return MV_ERROR;
+			}
+
+            		/* All banks must support the Mclk freqency */
+			if(bankInfo[i].minCycleTimeAtMaxCasLatPs > busClkPs)
+			{
+				mvOsOutput("Dram: ERR. Bank %d doesn't support memory clock!!!\n", i);
+				return MV_ERROR;
+			}
+
+			/* All banks must support registry in order to activate it */
+			if(bankInfo[i].registeredAddrAndControlInputs != 
+			   bankInfo[0].registeredAddrAndControlInputs)
+			{
+				mvOsOutput("Dram: ERR. different Registered settings !!!\n");
+				return MV_ERROR;
+			}
+
+			/* All banks must support same ECC mode */
+			if(bankInfo[i].errorCheckType != 
+			   bankInfo[0].errorCheckType)
+			{
+				mvOsOutput("Dram: ERR. different ECC settings !!!\n");
+				return MV_ERROR;
+			}
+
+		}
+		else
+		{
+			if( i == 0 ) /* bank 0 doesn't exist */
+			{
+				mvOsOutput("Dram: ERR. Fail to detect bank 0 !!!\n");
+				return MV_ERROR;
+			}
+			else
+			{
+				DB(mvOsPrintf("Dram: Could not find bank %d\n", i));
+				bankInfo[i].size = 0;     /* Mark this bank as non exist */
+			}
+		}
+	}
+
+#ifdef MV_INCLUDE_SDRAM_CS2
+	if (bankInfo[SDRAM_CS0].size <  bankInfo[SDRAM_CS2].size)
+	{
+		MV_DRAM_CS_order[0] = SDRAM_CS2;
+		MV_DRAM_CS_order[1] = SDRAM_CS3;
+		MV_DRAM_CS_order[2] = SDRAM_CS0;
+		MV_DRAM_CS_order[3] = SDRAM_CS1;
+		DRAM_CS_Order[0] = SDRAM_CS2;
+		DRAM_CS_Order[1] = SDRAM_CS3;
+		DRAM_CS_Order[2] = SDRAM_CS0;
+		DRAM_CS_Order[3] = SDRAM_CS1;
+
+	}
+	else
+#endif
+	{
+		MV_DRAM_CS_order[0] = SDRAM_CS0;
+		MV_DRAM_CS_order[1] = SDRAM_CS1;
+		DRAM_CS_Order[0] = SDRAM_CS0;
+		DRAM_CS_Order[1] = SDRAM_CS1;
+#ifdef MV_INCLUDE_SDRAM_CS2
+		MV_DRAM_CS_order[2] = SDRAM_CS2;
+		MV_DRAM_CS_order[3] = SDRAM_CS3;
+		DRAM_CS_Order[2] = SDRAM_CS2;
+		DRAM_CS_Order[3] = SDRAM_CS3;
+#endif
+	}
+
+	for(j = 0; j < MV_DRAM_MAX_CS; j++)
+	{
+		i = MV_DRAM_CS_order[j];
+		
+        	if (0 == bankInfo[i].size)
+			continue;
+
+			/* Init the CPU window decode */
+			/* Note that the Dimm width might be different then the device DRAM width */
+#ifdef MV78XX0	
+			temp = MV_REG_READ(SDRAM_CONFIG_REG);
+			deviceW = ((temp & SDRAM_DWIDTH_MASK) == SDRAM_DWIDTH_32BIT )? 32 : 64;
+#else
+			deviceW = 16 /* KW family */;
+#endif
+			dimmW = bankInfo[0].dataWidth - (bankInfo[0].dataWidth % 16);
+			size = ((bankInfo[i].size << 20) / (dimmW/deviceW)); 
+		
+			/* We can not change DRAM window settings while excecuting  	*/
+			/* code from it. That is why we skip the DRAM CS[0], saving     */
+			/* it to the ROM configuration routine				*/
+
+			numOfAllDevices += bankInfo[i].numberOfDevices;
+			if (i == MV_DRAM_CS_order[0])
+			{
+				MV_U32 sizeToReg;
+				/* Translate the given window size to register format		*/
+				sizeToReg = ctrlSizeToReg(size, SCSR_SIZE_ALIGNMENT);
+				/* Size parameter validity check.                           */
+				if (-1 == sizeToReg)
+				{
+					mvOsOutput("DRAM: mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n"
+							   ,i);
+					return MV_BAD_PARAM;
+				}
+
+				DB(mvOsPrintf("Dram: Bank 0 Size - %x\n",sizeToReg);)
+				sizeToReg = (sizeToReg << SCSR_SIZE_OFFS);
+				sizeToReg |= SCSR_WIN_EN;
+				MV_REG_WRITE(DRAM_BUF_REG0, sizeToReg);
+			}
+			else
+			{
+				dramDecWin.addrWin.baseLow = base;
+				dramDecWin.addrWin.size = size;
+				dramDecWin.enable = MV_TRUE;
+				DB(mvOsPrintf("Dram: Enable window %d base 0x%x, size=0x%x\n",i, base, size));
+				
+				/* Check if the DRAM size is more then 3GByte */
+				if (base < 0xC0000000)
+				{
+					DB(mvOsPrintf("Dram: Enable window %d base 0x%x, size=0x%x\n",i, base, size));
+           			if (MV_OK != mvCpuIfTargetWinSet(i, &dramDecWin))
+					{
+						mvOsPrintf("Dram: ERR. Fail to set bank %d!!!\n", SDRAM_CS0 + i);
+						return 	MV_ERROR;
+					}
+				}
+			}
+			
+			base += size;
+
+			/* update the suportedCasLatencies mask */
+			bankInfo[0].suportedCasLatencies &= bankInfo[i].suportedCasLatencies;
+	}
+
+	/* calculate minimum CAS */
+	minCas = minCasCalc(&bankInfo[0], &bankInfo[2], busClk, forcedCl);
+	if (0 == minCas) 
+	{
+		mvOsOutput("Dram: Warn: Could not find CAS compatible to SysClk %dMhz\n",
+				   (busClk / 1000000));
+
+		minCas = DDR2_CL_4; /* Continue with this CAS */
+		mvOsOutput("Set default CAS latency 4\n");
+	}
+
+	/* calc SDRAM_CONFIG_REG  and save it to temp register */
+	temp = sdramConfigRegCalc(&bankInfo[0],&bankInfo[2], busClk);
+	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramConfigRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+
+	/* check if ECC is enabled by the user */
+	if(eccDisable)	
+	{	
+		/* turn off ECC*/
+		temp &= ~BIT18;
+	}
+	DB(mvOsPrintf("Dram: sdramConfigRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG1, temp);
+	
+	/* calc SDRAM_MODE_REG  and save it to temp register */ 
+	temp = sdramModeRegCalc(minCas);
+    	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramModeRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: sdramModeRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG2, temp);
+
+	/* calc SDRAM_EXTENDED_MODE_REG  and save it to temp register */ 
+	temp = sdramExtModeRegCalc(&bankInfo[0], busClk);
+	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramExtModeRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: sdramExtModeRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG10, temp);
+
+	/* calc D_UNIT_CONTROL_LOW  and save it to temp register */
+	TTMode = MV_FALSE;
+	DB(mvOsPrintf("Dram: numOfAllDevices = %x\n",numOfAllDevices);)
+	if( (numOfAllDevices > 9) && (bankInfo[0].registeredAddrAndControlInputs == MV_FALSE) )
+	{
+		if ( ( (numOfAllDevices > 9) && (busClk > MV_BOARD_SYSCLK_200MHZ) ) ||
+			(numOfAllDevices > 18) )
+		{
+			mvOsOutput("Enable 2T ");
+			TTMode = MV_TRUE;
+		}
+	}
+
+  	temp = dunitCtrlLowRegCalc(&bankInfo[0], minCas, busClk, TTMode ); 
+   	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. dunitCtrlLowRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: dunitCtrlLowRegCalc - %x\n",temp);)
+  	MV_REG_WRITE(DRAM_BUF_REG3, temp); 
+
+	/* calc D_UNIT_CONTROL_HIGH  and save it to temp register */
+  	temp = dunitCtrlHighRegCalc(&bankInfo[0], busClk); 
+   	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. dunitCtrlHighRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: dunitCtrlHighRegCalc - %x\n",temp);)
+	/* check if ECC is enabled by the user */
+	if(eccDisable)	
+	{	
+		/* turn off sample stage if no ecc */
+		temp &= ~SDRAM__D2P_EN;;
+	}
+  	MV_REG_WRITE(DRAM_BUF_REG13, temp); 
+
+	/* calc SDRAM_ADDR_CTRL_REG  and save it to temp register */
+	temp = sdramAddrCtrlRegCalc(&bankInfo[0],&bankInfo[2]);
+    	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramAddrCtrlRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: sdramAddrCtrlRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG4, temp);
+
+	/* calc SDRAM_TIMING_CTRL_LOW_REG  and save it to temp register */
+	temp = sdramTimeCtrlLowRegCalc(&bankInfo[0], minCas, busClk);
+    	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramTimeCtrlLowRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: sdramTimeCtrlLowRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG5, temp);
+
+	/* calc SDRAM_TIMING_CTRL_HIGH_REG  and save it to temp register */
+	temp = sdramTimeCtrlHighRegCalc(&bankInfo[0], busClk);
+    	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramTimeCtrlHighRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: sdramTimeCtrlHighRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG6, temp);
+
+	sdramDDr2OdtConfig(bankInfo);
+
+	/* calc DDR2_SDRAM_TIMING_LOW_REG  and save it to temp register */
+	temp = sdramDdr2TimeLoRegCalc(minCas);
+	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramDdr2TimeLoRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: sdramDdr2TimeLoRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG11, temp);
+
+	/* calc DDR2_SDRAM_TIMING_HIGH_REG  and save it to temp register */
+	temp = sdramDdr2TimeHiRegCalc(minCas);
+	if(-1 == temp)
+	{
+		mvOsOutput("Dram: ERR. sdramDdr2TimeHiRegCalc failed !!!\n");
+		return MV_ERROR;
+	}
+	DB(mvOsPrintf("Dram: sdramDdr2TimeHiRegCalc - %x\n",temp);)
+	MV_REG_WRITE(DRAM_BUF_REG12, temp);
+#endif
+	
+	/* Note that DDR SDRAM Address/Control and Data pad calibration     */
+	/* settings is done in mvSdramIfConfig.s                            */
+
+ 	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvDramIfBankBaseGet - Get DRAM interface bank base.
+*
+* DESCRIPTION:
+*       This function returns the 32 bit base address of a given DRAM bank.
+*
+* INPUT:
+*       bankNum - Bank number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       DRAM bank size. If bank is disabled or paramter is invalid, the 
+*		function returns -1.
+*
+*******************************************************************************/
+MV_U32 mvDramIfBankBaseGet(MV_U32 bankNum)
+{
+	DB(mvOsPrintf("Dram: mvDramIfBankBaseGet Bank %d base addr is %x \n",
+				  bankNum, mvCpuIfTargetWinBaseLowGet(SDRAM_CS0 + bankNum)));
+	return mvCpuIfTargetWinBaseLowGet(SDRAM_CS0 + bankNum);
+}
+
+/*******************************************************************************
+* mvDramIfBankSizeGet - Get DRAM interface bank size.
+*
+* DESCRIPTION:
+*       This function returns the size of a given DRAM bank.
+*
+* INPUT:
+*       bankNum - Bank number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       DRAM bank size. If bank is disabled the function return '0'. In case 
+*		or paramter is invalid, the function returns -1.
+*
+*******************************************************************************/
+MV_U32 mvDramIfBankSizeGet(MV_U32 bankNum)
+{
+	DB(mvOsPrintf("Dram: mvDramIfBankSizeGet Bank %d size is %x \n",
+				  bankNum, mvCpuIfTargetWinSizeGet(SDRAM_CS0 + bankNum)));
+	return mvCpuIfTargetWinSizeGet(SDRAM_CS0 + bankNum);
+}
+
+
+/*******************************************************************************
+* mvDramIfSizeGet - Get DRAM interface total size.
+*
+* DESCRIPTION:
+*       This function get the DRAM total size.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       DRAM total size. In case or paramter is invalid, the function 
+*		returns -1.
+*
+*******************************************************************************/
+MV_U32 mvDramIfSizeGet(MV_VOID)
+{
+	MV_U32 size = 0, i;
+	
+	for(i = 0; i < MV_DRAM_MAX_CS; i++)
+		size += mvDramIfBankSizeGet(i);
+	
+	DB(mvOsPrintf("Dram: mvDramIfSizeGet size is %x \n",size));
+	return size;
+}
+
+/*******************************************************************************
+* mvDramIfSingleBitErrThresholdSet - Set single bit ECC threshold.
+*
+* DESCRIPTION:
+*       The ECC single bit error threshold is the number of single bit 
+*       errors to happen before the Dunit generates an interrupt.
+*       This function set single bit ECC threshold.
+*
+* INPUT:
+*       threshold - threshold.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM if threshold is to big, MV_OK otherwise.
+*
+*******************************************************************************/
+MV_STATUS mvDramIfSingleBitErrThresholdSet(MV_U32 threshold)
+{
+    MV_U32 regVal; 
+
+    if (threshold > SECR_THRECC_MAX)
+    {
+        return MV_BAD_PARAM;
+    }
+
+    regVal = MV_REG_READ(SDRAM_ECC_CONTROL_REG);
+    regVal &= ~SECR_THRECC_MASK;
+    regVal |= ((SECR_THRECC(threshold) & SECR_THRECC_MASK));
+    MV_REG_WRITE(SDRAM_ECC_CONTROL_REG, regVal);
+
+    return MV_OK;
+}
+
+#ifndef MV_STATIC_DRAM_ON_BOARD
+/*******************************************************************************
+* minCasCalc - Calculate the Minimum CAS latency which can be used.
+*
+* DESCRIPTION:
+*	Calculate the minimum CAS latency that can be used, base on the DRAM
+*	parameters and the SDRAM bus Clock freq.
+*
+* INPUT:
+*	busClk    - the DRAM bus Clock.
+*	pBankInfo - bank info parameters.
+*	forcedCl - Forced CAS Latency multiplied by 10. If equal to zero, do not force.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       The minimum CAS Latency. The function returns 0 if max CAS latency
+*		supported by banks is incompatible with system bus clock frequancy.
+*
+*******************************************************************************/
+
+static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo,MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk, MV_U32 forcedCl)
+{
+	MV_U32 count = 1, j;
+	MV_U32 busClkPs = 1000000000 / (busClk / 1000);  /* in ps units */
+	MV_U32 startBit, stopBit;
+	MV_U32 minCas0 = 0, minCas2 = 0;
+	
+	
+	/*     DDR 2:
+			*******-******-******-******-******-******-******-******* 
+			* bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+			*******-******-******-******-******-******-******-******* 
+	CAS	=	* TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
+	Disco VI=	* TBD  | TBD  |  5   |  4   |  3   |  TBD   | TBD | TBD * 
+	Disco Duo=	* TBD  |   6  |  5   |  4   |  3   |  TBD   | TBD | TBD * 
+			*********************************************************/
+	
+	
+	/* If we are asked to use the forced CAL  we change the suported CAL to be forcedCl only */
+	if (forcedCl)
+	{
+		mvOsOutput("DRAM: Using forced CL %d.%d\n", (forcedCl / 10), (forcedCl % 10));
+	
+			if (forcedCl == 30)
+				pBankInfo->suportedCasLatencies = 0x08;
+			else if (forcedCl == 40)
+				pBankInfo->suportedCasLatencies = 0x10;
+			else if (forcedCl == 50)
+				pBankInfo->suportedCasLatencies = 0x20;
+			else if (forcedCl == 60)
+				pBankInfo->suportedCasLatencies = 0x40;
+			else
+			{
+				mvOsPrintf("Forced CL %d.%d not supported. Set default CL 4\n", 
+						   (forcedCl / 10), (forcedCl % 10));
+				pBankInfo->suportedCasLatencies = 0x10;
+			}
+
+		return pBankInfo->suportedCasLatencies;        
+	}   
+	
+	/* go over the supported cas mask from Max Cas down and check if the 	*/
+	/* SysClk stands in its time requirments.				*/
+
+	DB(mvOsPrintf("Dram: minCasCalc supported mask = %x busClkPs = %x \n",
+								pBankInfo->suportedCasLatencies,busClkPs ));
+	count = 1;
+	for(j = 7; j > 0; j--)
+	{
+		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
+		{
+			/* Reset the bits for CL incompatible for the sysClk */
+			switch (count)
+			{
+				case 1: 
+					if (pBankInfo->minCycleTimeAtMaxCasLatPs > busClkPs) 
+						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				case 2: 
+					if (pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps > busClkPs)
+						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				case 3: 
+					if (pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps > busClkPs)
+						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				default: 
+					pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
+					break;
+			}
+		}
+	}
+	
+	DB(mvOsPrintf("Dram: minCasCalc support = %x (after SysCC calc)\n",
+											pBankInfo->suportedCasLatencies ));
+
+	count = 1;
+	DB(mvOsPrintf("Dram2: minCasCalc supported mask = %x busClkPs = %x \n",
+								pBankInfo2->suportedCasLatencies,busClkPs ));
+	for(j = 7; j > 0; j--)
+	{
+		if((pBankInfo2->suportedCasLatencies >> j) & BIT0 )
+		{
+			/* Reset the bits for CL incompatible for the sysClk */
+			switch (count)
+			{
+				case 1: 
+					if (pBankInfo2->minCycleTimeAtMaxCasLatPs > busClkPs) 
+						pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				case 2: 
+					if (pBankInfo2->minCycleTimeAtMaxCasLatMinus1Ps > busClkPs)
+						pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				case 3: 
+					if (pBankInfo2->minCycleTimeAtMaxCasLatMinus2Ps > busClkPs)
+						pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
+					count++;
+					break;
+				default: 
+					pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
+					break;
+			}
+		}
+	}
+	
+	DB(mvOsPrintf("Dram2: minCasCalc support = %x (after SysCC calc)\n",
+									pBankInfo2->suportedCasLatencies ));
+
+	startBit = 3;   /* DDR2 support CL start with CL3 (bit 3) */
+	stopBit  = 6;   /* DDR2 support CL stops with CL6 (bit 6) */
+
+	for(j = startBit; j <= stopBit ; j++)
+	{
+		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
+		{
+			DB(mvOsPrintf("Dram: minCasCalc choose CAS %x \n",(BIT0 << j)));
+			minCas0 = (BIT0 << j);
+			break;
+		}
+	}
+
+	for(j = startBit; j <= stopBit ; j++)
+	{
+		if((pBankInfo2->suportedCasLatencies >> j) & BIT0 )
+		{
+			DB(mvOsPrintf("Dram: minCasCalc choose CAS %x \n",(BIT0 << j)));
+			minCas2 = (BIT0 << j);
+			break;
+		}
+	}
+	
+	if (minCas2 > minCas0)
+		return minCas2;
+	else
+		return minCas0;
+	
+	return 0; 
+}
+
+/*******************************************************************************
+* sdramConfigRegCalc - Calculate sdram config register
+*
+* DESCRIPTION: Calculate sdram config register optimized value based
+*			on the bank info parameters.
+*
+* INPUT:
+*	busClk    - the DRAM bus Clock.
+*	pBankInfo - sdram bank parameters
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram config reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo,MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk)
+{
+	MV_U32 sdramConfig = 0;
+	MV_U32 refreshPeriod;
+	
+	busClk /= 1000000; /* we work with busClk in MHz */
+	
+	sdramConfig = MV_REG_READ(SDRAM_CONFIG_REG);
+	
+	/* figure out the memory refresh internal */
+	switch (pBankInfo->refreshInterval & 0xf)
+	{
+		case 0x0: /* refresh period is 15.625 usec */
+				refreshPeriod = 15625;
+				break;
+		case 0x1: /* refresh period is 3.9 usec  	*/
+				refreshPeriod = 3900;
+				break;
+		case 0x2: /* refresh period is 7.8 usec 	*/
+				refreshPeriod = 7800;
+				break;
+		case 0x3: /* refresh period is 31.3 usec	*/
+				refreshPeriod = 31300;
+				break;
+		case 0x4: /* refresh period is 62.5 usec	*/
+				refreshPeriod = 62500;
+				break;
+		case 0x5: /* refresh period is 125 usec 	*/
+				refreshPeriod = 125000;
+				break;
+		default:  /* refresh period undefined 					*/
+				mvOsPrintf("Dram: ERR. DRAM refresh period is unknown!\n");
+				return -1;
+    }
+	
+	/* Now the refreshPeriod is in register format value */
+	refreshPeriod = (busClk * refreshPeriod) / 1000;
+	
+	DB(mvOsPrintf("Dram: sdramConfigRegCalc calculated refresh interval %0x\n", 
+				  refreshPeriod));
+
+	/* make sure the refresh value is only 14 bits */
+	if(refreshPeriod > SDRAM_REFRESH_MAX)
+	{
+		refreshPeriod = SDRAM_REFRESH_MAX;
+		DB(mvOsPrintf("Dram: sdramConfigRegCalc adjusted refresh interval %0x\n", 
+					  refreshPeriod));
+	}
+	
+	/* Clear the refresh field */
+	sdramConfig &= ~SDRAM_REFRESH_MASK;
+	
+	/* Set new value to refresh field */
+	sdramConfig |= (refreshPeriod & SDRAM_REFRESH_MASK);
+	
+	/*  registered DRAM ? */
+	if ( pBankInfo->registeredAddrAndControlInputs )
+	{
+		/* it's registered DRAM, so set the reg. DRAM bit */
+		sdramConfig |= SDRAM_REGISTERED;
+		DB(mvOsPrintf("DRAM Attribute: Registered address and control inputs.\n");)
+	}
+
+	/* ECC and IERR support */
+	sdramConfig &= ~SDRAM_ECC_MASK;    /* Clear ECC field */
+	sdramConfig &= ~SDRAM_IERR_MASK;    /* Clear IErr field */
+
+	if ( pBankInfo->errorCheckType ) 
+	{
+		sdramConfig |= SDRAM_ECC_EN;
+		sdramConfig |= SDRAM_IERR_REPORTE; 
+                DB(mvOsPrintf("Dram: mvDramIfDetect Enabling ECC\n"));
+	}
+	else
+	{
+                sdramConfig |= SDRAM_ECC_DIS;
+		sdramConfig |= SDRAM_IERR_IGNORE; 
+                DB(mvOsPrintf("Dram: mvDramIfDetect Disabling ECC!\n"));
+	}
+	/* Set static default settings */
+	sdramConfig |= SDRAM_CONFIG_DV;
+	
+	DB(mvOsPrintf("Dram: sdramConfigRegCalc set sdramConfig to 0x%x\n",
+				  sdramConfig));
+	
+ 	return sdramConfig;  
+}
+
+/*******************************************************************************
+* sdramModeRegCalc - Calculate sdram mode register
+*
+* DESCRIPTION: Calculate sdram mode register optimized value based
+*			on the bank info parameters and the minCas.
+*
+* INPUT:
+*	minCas	  - minimum CAS supported. 
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram mode reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramModeRegCalc(MV_U32 minCas)
+{
+	MV_U32 sdramMode;
+		
+	sdramMode = MV_REG_READ(SDRAM_MODE_REG);
+	
+	/* Clear CAS Latency field */
+	sdramMode &= ~SDRAM_CL_MASK;
+	
+	DB(mvOsPrintf("DRAM CAS Latency ");)
+	
+		switch (minCas)
+		{
+			case DDR2_CL_3: 
+				sdramMode |= SDRAM_DDR2_CL_3;
+				DB(mvOsPrintf("3.\n");)
+				break;
+			case DDR2_CL_4: 
+				sdramMode |= SDRAM_DDR2_CL_4;
+				DB(mvOsPrintf("4.\n");)
+				break;
+			case DDR2_CL_5: 
+				sdramMode |= SDRAM_DDR2_CL_5;
+				DB(mvOsPrintf("5.\n");)
+				break;
+			case DDR2_CL_6: 
+				sdramMode |= SDRAM_DDR2_CL_6;
+				DB(mvOsPrintf("6.\n");)
+				break;
+			default:
+				mvOsOutput("\nsdramModeRegCalc ERROR: Max. CL out of range\n");
+				return -1;
+        }
+
+	DB(mvOsPrintf("\nsdramModeRegCalc register 0x%x\n", sdramMode ));
+
+	return sdramMode;
+}
+/*******************************************************************************
+* sdramExtModeRegCalc - Calculate sdram Extended mode register
+*
+* DESCRIPTION: 
+*		Return sdram Extended mode register value based
+*		on the bank info parameters and bank presence.
+*
+* INPUT:
+*	pBankInfo - sdram bank parameters
+*	busClk - DRAM frequency
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram Extended mode reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk)
+{
+	MV_U32 populateBanks = 0;
+	int bankNum;
+
+		/* Represent the populate banks in binary form */
+		for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+		{
+			if (0 != pBankInfo[bankNum].size)
+			{
+				populateBanks |= (1 << bankNum);
+			}
+		}
+	
+		switch(populateBanks)
+		{
+			case(BANK_PRESENT_CS0):
+			case(BANK_PRESENT_CS0_CS1):
+				return DDR_SDRAM_EXT_MODE_CS0_CS1_DV;
+		
+			case(BANK_PRESENT_CS0_CS2):
+			case(BANK_PRESENT_CS0_CS1_CS2):
+			case(BANK_PRESENT_CS0_CS2_CS3):
+			case(BANK_PRESENT_CS0_CS2_CS3_CS4):
+				if (busClk >= MV_BOARD_SYSCLK_267MHZ)
+				    return DDR_SDRAM_EXT_MODE_FAST_CS0_CS1_CS2_CS3_DV;
+				else
+				    return DDR_SDRAM_EXT_MODE_CS0_CS1_CS2_CS3_DV;
+		
+			default:
+				mvOsOutput("sdramExtModeRegCalc: Invalid DRAM bank presence\n");
+				return -1;
+		} 
+	return 0;
+}
+
+/*******************************************************************************
+* dunitCtrlLowRegCalc - Calculate sdram dunit control low register
+*
+* DESCRIPTION: Calculate sdram dunit control low register optimized value based
+*			on the bank info parameters and the minCas.
+*
+* INPUT:
+*	pBankInfo - sdram bank parameters
+*	minCas	  - minimum CAS supported. 
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram dunit control low reg value.
+*
+*******************************************************************************/
+static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32  busClk, MV_STATUS TTMode)
+{
+	MV_U32 dunitCtrlLow, cl;
+	MV_U32 sbOutR[4]={3,5,7,9} ;
+	MV_U32 sbOutU[4]={1,3,5,7} ;
+	
+    	dunitCtrlLow = MV_REG_READ(SDRAM_DUNIT_CTRL_REG);
+
+        DB(mvOsPrintf("Dram: dunitCtrlLowRegCalc\n"));
+
+	/* Clear StBurstOutDel field */
+	dunitCtrlLow &= ~SDRAM_SB_OUT_MASK;
+	
+	/* Clear StBurstInDel field */
+	dunitCtrlLow &= ~SDRAM_SB_IN_MASK;
+
+	/* Clear CtrlPos field */
+	dunitCtrlLow &= ~SDRAM_CTRL_POS_MASK;
+
+	/* Clear 2T field */
+	dunitCtrlLow &= ~SDRAM_2T_MASK;
+	if (TTMode == MV_TRUE)
+	{
+		dunitCtrlLow |= SDRAM_2T_MODE;
+	}
+	
+	/* For proper sample of read data set the Dunit Control register's      */
+	/* stBurstInDel bits [27:24]                                            */
+	/*		200MHz - 267MHz None reg  = CL + 1			*/
+	/*		200MHz - 267MHz reg	  = CL + 2			*/
+	/*		> 267MHz None reg  = CL + 2			*/
+	/*		> 267MHz reg	  = CL + 3			*/
+	
+	/* For proper sample of read data set the Dunit Control register's      */
+	/* stBurstOutDel bits [23:20]                                           */
+			/********-********-********-********-
+			*  CL=3  |  CL=4  |  CL=5  |  CL=6  |
+			*********-********-********-********-
+	Not Reg.	*  0001  |  0011  |  0101  |  0111  |
+			*********-********-********-********-
+	Registered	*  0011  |  0101  |  0111  |  1001  |
+			*********-********-********-********/
+    
+		/* Set Dunit Control low default value */
+		dunitCtrlLow |= SDRAM_DUNIT_CTRL_LOW_DDR2_DV; 
+
+		switch (minCas)
+		{
+			case DDR2_CL_3: cl = 3; break;
+			case DDR2_CL_4: cl = 4; break;
+			case DDR2_CL_5: cl = 5; break;
+			case DDR2_CL_6: cl = 6; break;
+			default:
+				mvOsOutput("Dram: dunitCtrlLowRegCalc Max. CL out of range %d\n", minCas);
+				return -1;
+		}
+
+		/* registerd DDR SDRAM? */
+		if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+		{
+			dunitCtrlLow |= (sbOutR[cl-3]) << SDRAM_SB_OUT_DEL_OFFS;
+		}
+		else
+		{
+			dunitCtrlLow |= (sbOutU[cl-3]) << SDRAM_SB_OUT_DEL_OFFS;
+		}
+
+		DB(mvOsPrintf("\n\ndunitCtrlLowRegCalc: CL = %d, frequencies=%d\n", cl, busClk));
+
+		if (busClk <= MV_BOARD_SYSCLK_267MHZ)
+		{
+			if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+				cl = cl + 2;
+			else
+				cl = cl + 1;
+		}
+		else
+		{
+			if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
+				cl = cl + 3;
+			else
+				cl = cl + 2;
+		}
+		
+        DB(mvOsPrintf("dunitCtrlLowRegCalc: SDRAM_SB_IN_DEL_OFFS = %d \n", cl));
+		dunitCtrlLow |= cl << SDRAM_SB_IN_DEL_OFFS;
+
+	DB(mvOsPrintf("Dram: Reg dunit control low = %x\n", dunitCtrlLow ));
+
+	return dunitCtrlLow;
+}  
+
+/*******************************************************************************
+* dunitCtrlHighRegCalc - Calculate sdram dunit control high register
+*
+* DESCRIPTION: Calculate sdram dunit control high register optimized value based
+*			on the bus clock.
+*
+* INPUT:
+*	busClk	  - DRAM frequency. 
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram dunit control high reg value.
+*
+*******************************************************************************/
+static MV_U32 dunitCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32  busClk)
+{
+	MV_U32 dunitCtrlHigh;
+	dunitCtrlHigh = MV_REG_READ(SDRAM_DUNIT_CTRL_HI_REG);
+	if(busClk > MV_BOARD_SYSCLK_300MHZ) 
+		dunitCtrlHigh |= SDRAM__P2D_EN;
+	else
+		dunitCtrlHigh &= ~SDRAM__P2D_EN;
+
+	if(busClk > MV_BOARD_SYSCLK_267MHZ) 
+	    dunitCtrlHigh |= (SDRAM__WR_MESH_DELAY_EN | SDRAM__PUP_ZERO_SKEW_EN | SDRAM__ADD_HALF_FCC_EN);
+
+	/* If ECC support we turn on D2P sample */
+	dunitCtrlHigh &= ~SDRAM__D2P_EN;    /* Clear D2P bit */
+	if (( pBankInfo->errorCheckType ) && (busClk > MV_BOARD_SYSCLK_267MHZ))
+		dunitCtrlHigh |= SDRAM__D2P_EN;
+
+	return dunitCtrlHigh;
+}
+
+/*******************************************************************************
+* sdramAddrCtrlRegCalc - Calculate sdram address control register
+*
+* DESCRIPTION: Calculate sdram address control register optimized value based
+*			on the bank info parameters and the minCas.
+*
+* INPUT:
+*	pBankInfo - sdram bank parameters
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram address control reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_DRAM_BANK_INFO *pBankInfoDIMM1)
+{
+	MV_U32 addrCtrl = 0;
+	
+	if (pBankInfoDIMM1->size)
+	{
+		switch (pBankInfoDIMM1->sdramWidth)
+		{
+			case 4:  /* memory is x4 */
+				mvOsOutput("sdramAddrCtrlRegCalc: Error - x4 not supported!\n");
+				return -1;
+				break;
+			case 8:  /* memory is x8 */
+				addrCtrl |= SDRAM_ADDRSEL_X8(2) | SDRAM_ADDRSEL_X8(3);
+				DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device DIMM2 width x8\n"));
+				break;
+			case 16:
+				addrCtrl |= SDRAM_ADDRSEL_X16(2) | SDRAM_ADDRSEL_X16(3);
+				DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device DIMM2 width x16\n"));
+				break;
+			default: /* memory width unsupported */
+				mvOsOutput("sdramAddrCtrlRegCalc: ERR. DRAM chip width is unknown!\n");
+				return -1;
+		}
+	}
+
+	switch (pBankInfo->sdramWidth)
+	{
+		case 4:  /* memory is x4 */
+			mvOsOutput("sdramAddrCtrlRegCalc: Error - x4 not supported!\n");
+			return -1;
+			break;
+		case 8:  /* memory is x8 */
+			addrCtrl |= SDRAM_ADDRSEL_X8(0) | SDRAM_ADDRSEL_X8(1);
+			DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device width x8\n"));
+			break;
+		case 16:
+			addrCtrl |= SDRAM_ADDRSEL_X16(0) | SDRAM_ADDRSEL_X16(1);
+			DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device width x16\n"));
+			break;
+		default: /* memory width unsupported */
+			mvOsOutput("sdramAddrCtrlRegCalc: ERR. DRAM chip width is unknown!\n");
+			return -1;
+	}
+
+	/* Note that density is in MB units */
+	switch (pBankInfo->deviceDensity) 
+	{
+		case 256:                 /* 256 Mbit */
+			DB(mvOsPrintf("DRAM Device Density 256Mbit\n"));
+			addrCtrl |= SDRAM_DSIZE_256Mb(0) | SDRAM_DSIZE_256Mb(1);
+			break;
+		case 512:                /* 512 Mbit */
+			DB(mvOsPrintf("DRAM Device Density 512Mbit\n"));
+			addrCtrl |= SDRAM_DSIZE_512Mb(0) | SDRAM_DSIZE_512Mb(1);
+			break;
+		case 1024:                /* 1 Gbit */
+			DB(mvOsPrintf("DRAM Device Density 1Gbit\n"));
+			addrCtrl |= SDRAM_DSIZE_1Gb(0) | SDRAM_DSIZE_1Gb(1);
+			break;
+		case 2048:                /* 2 Gbit */
+			DB(mvOsPrintf("DRAM Device Density 2Gbit\n"));
+			addrCtrl |= SDRAM_DSIZE_2Gb(0) | SDRAM_DSIZE_2Gb(1);
+			break;
+		default:
+			mvOsOutput("Dram: sdramAddrCtrl unsupported RAM-Device size %d\n",
+                       pBankInfo->deviceDensity);
+			return -1;
+        }
+
+	if (pBankInfoDIMM1->size)
+	{
+		switch (pBankInfoDIMM1->deviceDensity) 
+		{
+			case 256:                 /* 256 Mbit */
+				DB(mvOsPrintf("DIMM2: DRAM Device Density 256Mbit\n"));
+				addrCtrl |= SDRAM_DSIZE_256Mb(2) | SDRAM_DSIZE_256Mb(3);
+				break;
+			case 512:                /* 512 Mbit */
+				DB(mvOsPrintf("DIMM2: DRAM Device Density 512Mbit\n"));
+				addrCtrl |= SDRAM_DSIZE_512Mb(2) | SDRAM_DSIZE_512Mb(3);
+				break;
+			case 1024:                /* 1 Gbit */
+				DB(mvOsPrintf("DIMM2: DRAM Device Density 1Gbit\n"));
+				addrCtrl |= SDRAM_DSIZE_1Gb(2) | SDRAM_DSIZE_1Gb(3);
+				break;
+			case 2048:                /* 2 Gbit */
+				DB(mvOsPrintf("DIMM2: DRAM Device Density 2Gbit\n"));
+				addrCtrl |= SDRAM_DSIZE_2Gb(2) | SDRAM_DSIZE_2Gb(3);
+				break;
+			default:
+				mvOsOutput("DIMM2: Dram: sdramAddrCtrl unsupported RAM-Device size %d\n",
+						   pBankInfoDIMM1->deviceDensity);
+				return -1;
+		}
+	}
+	/* SDRAM address control */
+	DB(mvOsPrintf("Dram: setting sdram address control with: %x \n", addrCtrl));
+
+	return addrCtrl;
+}
+
+/*******************************************************************************
+* sdramTimeCtrlLowRegCalc - Calculate sdram timing control low register
+*
+* DESCRIPTION: 
+*       This function calculates sdram timing control low register 
+*       optimized value based on the bank info parameters and the minCas.
+*
+* INPUT:
+*	    pBankInfo - sdram bank parameters
+*	minCas	  - minimum CAS supported. 
+*       busClk    - Bus clock
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram timing control low reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32 busClk)
+{
+    MV_U32 tRp  = 0;
+    MV_U32 tRrd = 0;
+    MV_U32 tRcd = 0;
+    MV_U32 tRas = 0;
+    MV_U32 tWr  = 0;
+    MV_U32 tWtr = 0;
+    MV_U32 tRtp = 0;
+    MV_U32 timeCtrlLow = 0;
+	
+    MV_U32 bankNum;
+    
+    busClk = busClk / 1000000;    /* In MHz */
+
+    /* Scan all DRAM banks to find maximum timing values */
+    for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+    {
+        tRp  = MV_MAX(tRp,  pBankInfo[bankNum].minRowPrechargeTime);
+        tRrd = MV_MAX(tRrd, pBankInfo[bankNum].minRowActiveToRowActive);
+        tRcd = MV_MAX(tRcd, pBankInfo[bankNum].minRasToCasDelay);
+        tRas = MV_MAX(tRas, pBankInfo[bankNum].minRasPulseWidth);
+    }
+
+    /* Extract timing (in ns) from SPD value. We ignore the tenth ns part.  */
+    /* by shifting the data two bits right.                                 */
+    tRp  = tRp  >> 2;    /* For example 0x50 -> 20ns                        */
+    tRrd = tRrd >> 2;
+    tRcd = tRcd >> 2;
+	
+    /* Extract clock cycles from time parameter. We need to round up        */
+    tRp  = ((busClk * tRp)  / 1000) + (((busClk * tRp)  % 1000) ? 1 : 0);
+    DB(mvOsPrintf("Dram  Timing Low: tRp = %d ", tRp));
+    tRrd = ((busClk * tRrd) / 1000) + (((busClk * tRrd) % 1000) ? 1 : 0);
+	/* JEDEC min reqeirments tRrd = 2 */
+	if (tRrd < 2)
+		tRrd = 2;
+    DB(mvOsPrintf("tRrd = %d ", tRrd));
+    tRcd = ((busClk * tRcd) / 1000) + (((busClk * tRcd) % 1000) ? 1 : 0);
+    DB(mvOsPrintf("tRcd = %d ", tRcd));
+    tRas = ((busClk * tRas) / 1000) + (((busClk * tRas) % 1000) ? 1 : 0);
+    DB(mvOsPrintf("tRas = %d ", tRas));
+
+    /* tWr and tWtr is different for DDR1 and DDR2. tRtp is only for DDR2   */
+	/* Scan all DRAM banks to find maximum timing values */
+	for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+	    tWr  = MV_MAX(tWr,  pBankInfo[bankNum].minWriteRecoveryTime);
+	    tWtr = MV_MAX(tWtr, pBankInfo[bankNum].minWriteToReadCmdDelay);
+	    tRtp = MV_MAX(tRtp, pBankInfo[bankNum].minReadToPrechCmdDelay);
+	}
+	
+	/* Extract timing (in ns) from SPD value. We ignore the tenth ns    */
+	/* part by shifting the data two bits right.                        */
+	tWr  = tWr  >> 2;    /* For example 0x50 -> 20ns                    */
+	tWtr = tWtr >> 2;
+	tRtp = tRtp >> 2;
+	/* Extract clock cycles from time parameter. We need to round up    */
+	tWr  = ((busClk * tWr)  / 1000) + (((busClk * tWr)  % 1000) ? 1 : 0);
+	DB(mvOsPrintf("tWr = %d ", tWr));
+	tWtr = ((busClk * tWtr) / 1000) + (((busClk * tWtr) % 1000) ? 1 : 0);
+	/* JEDEC min reqeirments tWtr = 2 */
+	if (tWtr < 2)
+		tWtr = 2;
+	DB(mvOsPrintf("tWtr = %d ", tWtr));
+	tRtp = ((busClk * tRtp) / 1000) + (((busClk * tRtp) % 1000) ? 1 : 0);
+	/* JEDEC min reqeirments tRtp = 2 */
+	if (tRtp < 2)
+	tRtp = 2;
+	DB(mvOsPrintf("tRtp = %d ", tRtp));
+
+	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
+	timeCtrlLow = (((tRp  - 1) << SDRAM_TRP_OFFS) |
+		    ((tRrd - 1) << SDRAM_TRRD_OFFS) |
+		    ((tRcd - 1) << SDRAM_TRCD_OFFS) |
+		    (((tRas - 1) << SDRAM_TRAS_OFFS) & SDRAM_TRAS_MASK)|
+		    ((tWr  - 1) << SDRAM_TWR_OFFS)  |
+		    ((tWtr - 1) << SDRAM_TWTR_OFFS)	|
+		    ((tRtp - 1) << SDRAM_TRTP_OFFS));
+	
+	/* Check extended tRas bit */
+	if ((tRas - 1) & BIT4)
+	    timeCtrlLow |= (1 << SDRAM_EXT_TRAS_OFFS);
+
+	return timeCtrlLow;
+}
+
+/*******************************************************************************
+* sdramTimeCtrlHighRegCalc - Calculate sdram timing control high register
+*
+* DESCRIPTION: 
+*       This function calculates sdram timing control high register 
+*       optimized value based on the bank info parameters and the bus clock.
+*
+* INPUT:
+*	    pBankInfo - sdram bank parameters
+*       busClk    - Bus clock
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       sdram timing control high reg value.
+*
+*******************************************************************************/
+static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk)
+{
+	MV_U32 tRfc;
+	MV_U32 timingHigh;
+	MV_U32 timeNs = 0;
+	MV_U32 bankNum;
+	
+	busClk = busClk / 1000000;    /* In MHz */
+
+	/* Set DDR timing high register static configuration bits */
+	timingHigh = MV_REG_READ(SDRAM_TIMING_CTRL_HIGH_REG);
+	
+	/* Set DDR timing high register default value */
+	timingHigh |= SDRAM_TIMING_CTRL_HIGH_REG_DV;  
+	
+	/* Clear tRfc field */
+	timingHigh &= ~SDRAM_TRFC_MASK;
+
+	/* Scan all DRAM banks to find maximum timing values */
+	for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+		timeNs = MV_MAX(timeNs,  pBankInfo[bankNum].minRefreshToActiveCmd);
+		DB(mvOsPrintf("Dram:  Timing High: minRefreshToActiveCmd = %d\n", 
+				pBankInfo[bankNum].minRefreshToActiveCmd));
+	}
+	if(busClk >= 333 && mvCtrlModelGet() == MV_78XX0_A1_REV)
+    {
+        timingHigh |= 0x1 << SDRAM_TR2W_W2R_OFFS;
+    }
+
+	tRfc = ((busClk * timeNs)  / 1000) + (((busClk * timeNs)  % 1000) ? 1 : 0);
+	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
+	DB(mvOsPrintf("Dram:  Timing High: tRfc = %d\n", tRfc));
+	timingHigh |= (((tRfc - 1) & SDRAM_TRFC_MASK) << SDRAM_TRFC_OFFS);
+	DB(mvOsPrintf("Dram:  Timing High: tRfc = %d\n", tRfc));
+	
+	/* SDRAM timing high */
+	DB(mvOsPrintf("Dram: setting timing high with: %x \n", timingHigh));
+
+	return timingHigh;
+}
+/*******************************************************************************
+* sdramDDr2OdtConfig - Set DRAM DDR2 On Die Termination registers.
+*
+* DESCRIPTION: 
+*       This function config DDR2 On Die Termination (ODT) registers.
+*	
+* INPUT:
+*		pBankInfo - bank info parameters.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       None
+*******************************************************************************/
+static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo)
+{
+	MV_U32 populateBanks = 0;
+	MV_U32 odtCtrlLow, odtCtrlHigh, dunitOdtCtrl;
+	int bankNum;
+	
+	/* Represent the populate banks in binary form */
+	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
+	{
+		if (0 != pBankInfo[bankNum].size)
+		{
+				populateBanks |= (1 << bankNum);
+			}
+		}
+	
+	switch(populateBanks)
+	{
+		case(BANK_PRESENT_CS0):
+		case(BANK_PRESENT_CS0_CS1):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS1_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS1_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS1_DV;
+			break;
+		case(BANK_PRESENT_CS0_CS2):
+		case(BANK_PRESENT_CS0_CS1_CS2):
+		case(BANK_PRESENT_CS0_CS2_CS3):
+		case(BANK_PRESENT_CS0_CS2_CS3_CS4):
+			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS1_CS2_CS3_DV;
+			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS1_CS2_CS3_DV;
+			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS1_CS2_CS3_DV;
+			break;
+		default:
+			DB(mvOsPrintf("sdramDDr2OdtConfig: Invalid DRAM bank presence\n"));
+			return;
+	}
+ 	/* DDR2 SDRAM ODT ctrl low  */
+	DB(mvOsPrintf("Dram: DDR2 setting ODT ctrl low with: %x \n", odtCtrlLow));
+	MV_REG_WRITE(DRAM_BUF_REG7, odtCtrlLow);
+
+ 	/* DDR2 SDRAM ODT ctrl high  */
+	DB(mvOsPrintf("Dram: DDR2 setting ODT ctrl high with: %x \n", odtCtrlHigh));
+	MV_REG_WRITE(DRAM_BUF_REG8, odtCtrlHigh);
+
+	/* DDR2 DUNIT ODT ctrl  */
+	if ( ((mvCtrlModelGet() == MV_78XX0_DEV_ID) && (mvCtrlRevGet() == MV_78XX0_Y0_REV)) ||
+		(mvCtrlModelGet() == MV_76100_DEV_ID) ||
+		(mvCtrlModelGet() == MV_78100_DEV_ID) ||
+		(mvCtrlModelGet() == MV_78200_DEV_ID) )
+		dunitOdtCtrl &= ~(BIT9|BIT8); /* Clear ODT always on */
+
+	DB(mvOsPrintf("DUNIT: DDR2 setting ODT ctrl with: %x \n", dunitOdtCtrl));
+	MV_REG_WRITE(DRAM_BUF_REG9, dunitOdtCtrl);
+	return;
+}
+/*******************************************************************************
+* sdramDdr2TimeLoRegCalc - Set DDR2 DRAM Timing Low registers.
+*
+* DESCRIPTION: 
+*       This function config DDR2 DRAM Timing low registers.
+*	
+* INPUT:
+*	minCas	  - minimum CAS supported. 
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       DDR2 sdram timing low reg value.
+*******************************************************************************/
+static MV_U32 sdramDdr2TimeLoRegCalc(MV_U32 minCas)
+{
+	MV_U8 cl = -1;
+	MV_U32 ddr2TimeLoReg;
+
+	/* read and clear the feilds we are going to set */
+	ddr2TimeLoReg = MV_REG_READ(SDRAM_DDR2_TIMING_LO_REG);
+	ddr2TimeLoReg &= ~(SD2TLR_TODT_ON_RD_MASK	| 
+			   SD2TLR_TODT_OFF_RD_MASK	| 
+			   SD2TLR_TODT_ON_CTRL_RD_MASK	|
+			   SD2TLR_TODT_OFF_CTRL_RD_MASK);
+
+	if( minCas == DDR2_CL_3 )
+	{
+		cl = 3;
+	}
+	else if( minCas == DDR2_CL_4 )
+	{
+		cl = 4;
+	}
+	else if( minCas == DDR2_CL_5 )
+	{
+		cl = 5;
+	}
+	else if( minCas == DDR2_CL_6 )
+	{
+		cl = 6;
+	}
+	else
+	{
+		DB(mvOsPrintf("sdramDdr2TimeLoRegCalc: CAS latency %d unsupported. using CAS latency 4\n",
+				minCas));
+		cl = 4;
+	}
+
+	ddr2TimeLoReg |= ((cl-3) << SD2TLR_TODT_ON_RD_OFFS);
+	ddr2TimeLoReg |= ( cl << SD2TLR_TODT_OFF_RD_OFFS);
+	ddr2TimeLoReg |= ( cl << SD2TLR_TODT_ON_CTRL_RD_OFFS);
+	ddr2TimeLoReg |= ((cl+3) << SD2TLR_TODT_OFF_CTRL_RD_OFFS);
+
+	/* DDR2 SDRAM timing low */
+	DB(mvOsPrintf("Dram: DDR2 setting timing low with: %x \n", ddr2TimeLoReg));
+
+	return ddr2TimeLoReg;
+}
+
+/*******************************************************************************
+* sdramDdr2TimeHiRegCalc - Set DDR2 DRAM Timing High registers.
+*
+* DESCRIPTION: 
+*       This function config DDR2 DRAM Timing high registers.
+*	
+* INPUT:
+*	minCas	  - minimum CAS supported. 
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       DDR2 sdram timing high reg value.
+*******************************************************************************/
+static MV_U32 sdramDdr2TimeHiRegCalc(MV_U32 minCas)
+{
+	MV_U8 cl = -1;
+	MV_U32 ddr2TimeHiReg;
+
+	/* read and clear the feilds we are going to set */
+	ddr2TimeHiReg = MV_REG_READ(SDRAM_DDR2_TIMING_HI_REG);
+	ddr2TimeHiReg &= ~(SD2THR_TODT_ON_WR_MASK	|
+			   SD2THR_TODT_OFF_WR_MASK	|
+			   SD2THR_TODT_ON_CTRL_WR_MASK	|
+			   SD2THR_TODT_OFF_CTRL_WR_MASK);
+
+	if( minCas == DDR2_CL_3 )
+	{
+		cl = 3;
+	}
+	else if( minCas == DDR2_CL_4 )
+	{
+		cl = 4;
+	}
+	else if( minCas == DDR2_CL_5 )
+	{
+		cl = 5;
+	}
+	else if( minCas == DDR2_CL_6 )
+	{
+		cl = 6;
+	}
+	else
+	{
+		mvOsOutput("sdramDdr2TimeHiRegCalc: CAS latency %d unsupported. using CAS latency 4\n", 
+				minCas);
+		cl = 4;
+	}
+
+	ddr2TimeHiReg |= ((cl-3) << SD2THR_TODT_ON_WR_OFFS);
+	ddr2TimeHiReg |= ( cl << SD2THR_TODT_OFF_WR_OFFS);
+	ddr2TimeHiReg |= ( cl << SD2THR_TODT_ON_CTRL_WR_OFFS);
+	ddr2TimeHiReg |= ((cl+3) << SD2THR_TODT_OFF_CTRL_WR_OFFS);
+
+	/* DDR2 SDRAM timin high  */
+	DB(mvOsPrintf("Dram: DDR2 setting timing high with: %x \n", ddr2TimeHiReg));
+
+	return ddr2TimeHiReg;
+}
+#endif
+
+/*******************************************************************************
+* mvDramIfCalGet - Get CAS Latency
+*
+* DESCRIPTION: 
+*       This function get the CAS Latency.
+*
+* INPUT:
+*       None
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       CAS latency times 10 (to avoid using floating point).
+*
+*******************************************************************************/
+MV_U32 mvDramIfCalGet(void)
+{
+	MV_U32 sdramCasLat, casLatMask;
+	
+    casLatMask = (MV_REG_READ(SDRAM_MODE_REG) & SDRAM_CL_MASK);
+
+    switch (casLatMask)
+    {
+        case SDRAM_DDR2_CL_3: 
+            sdramCasLat = 30;
+            break;
+        case SDRAM_DDR2_CL_4: 
+            sdramCasLat = 40;
+            break;
+        case SDRAM_DDR2_CL_5: 
+            sdramCasLat = 50;
+            break;
+        case SDRAM_DDR2_CL_6: 
+            sdramCasLat = 60;
+            break;
+        default:
+            mvOsOutput("mvDramIfCalGet: Err, unknown DDR2 CAL\n");
+            return -1;
+    }                                  
+    
+    return sdramCasLat;
+}
+
+
+/*******************************************************************************
+* mvDramIfSelfRefreshSet - Put the dram in self refresh mode - 
+*
+* DESCRIPTION: 
+*               add support in power management.
+*                          
+*
+* INPUT:
+*       None
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       None
+*
+*******************************************************************************/
+
+MV_VOID mvDramIfSelfRefreshSet()
+{
+    MV_U32 operReg;
+
+      operReg =  MV_REG_READ(SDRAM_OPERATION_REG);
+      MV_REG_WRITE(SDRAM_OPERATION_REG ,operReg |SDRAM_CMD_SLF_RFRSH);
+      /* Read until register is reset to 0 */
+      while(MV_REG_READ(SDRAM_OPERATION_REG));
+}
+/*******************************************************************************
+* mvDramIfDimGetSPDversion - return DIMM SPD version.
+*
+* DESCRIPTION:
+*		This function prints the DRAM controller information.
+*
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		None.
+*
+*******************************************************************************/
+static void mvDramIfDimGetSPDversion(MV_U32 *pMajor, MV_U32 *pMinor, MV_U32 bankNum)
+{
+	MV_DIMM_INFO dimmInfo;
+	if (bankNum >= MV_DRAM_MAX_CS )
+	{
+		DB(mvOsPrintf("Dram: mvDramIfDimGetSPDversion bad params \n")); 
+		return ;
+	}
+	memset(&dimmInfo,0,sizeof(dimmInfo));
+	if ( MV_OK != dimmSpdGet((MV_U32)(bankNum/2), &dimmInfo))
+	{
+		DB(mvOsPrintf("Dram: ERR dimmSpdGet failed to get dimm info \n"));
+		return ;
+	}
+	*pMajor = dimmInfo.spdRawData[DIMM_SPD_VERSION]/10;
+	*pMinor = dimmInfo.spdRawData[DIMM_SPD_VERSION]%10;
+}
+/*******************************************************************************
+* mvDramIfShow - Show DRAM controller information.
+*
+* DESCRIPTION:
+*		This function prints the DRAM controller information.
+*
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*		None.
+*
+*******************************************************************************/
+void mvDramIfShow(void)
+{
+    int i, sdramCasLat, sdramCsSize;
+	MV_U32 Major=0, Minor=0;
+    
+    mvOsOutput("DRAM Controller info:\n");
+    
+    mvOsOutput("Total DRAM ");
+    mvSizePrint(mvDramIfSizeGet());
+    mvOsOutput("\n");
+
+	for(i = 0; i < MV_DRAM_MAX_CS; i++)
+	{ 
+        sdramCsSize = mvDramIfBankSizeGet(i);
+        if (sdramCsSize)
+        {
+			if (0 == (i & 1))
+			{
+				mvDramIfDimGetSPDversion(&Major, &Minor,i);
+				mvOsOutput("DIMM %d version %d.%d\n", i/2, Major, Minor);
+			}
+            mvOsOutput("\tDRAM CS[%d] ", i);
+            mvSizePrint(sdramCsSize);
+            mvOsOutput("\n");
+        }
+    }
+    sdramCasLat = mvDramIfCalGet();
+
+    if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_ECC_EN)
+    {
+        mvOsOutput("ECC enabled, ");
+    }
+    else
+    {
+        mvOsOutput("ECC Disabled, ");
+    }
+    
+    if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_REGISTERED)
+    {
+        mvOsOutput("Registered DIMM\n");
+    }
+    else
+    {
+        mvOsOutput("Non registered DIMM\n");
+    }
+
+    mvOsOutput("Configured CAS Latency %d.%d\n", sdramCasLat/10, sdramCasLat%10);
+}
+/*******************************************************************************
+* mvDramIfGetFirstCS - find the  DRAM bank on the lower address
+* 
+*
+* DESCRIPTION:
+*       This function return the fisrt CS on address 0
+*
+* INPUT:
+*		None.
+*
+* OUTPUT:
+*		None.
+*
+* RETURN:
+*       SDRAM_CS0 or SDRAM_CS2
+*
+*******************************************************************************/
+MV_U32 mvDramIfGetFirstCS(void)
+{
+	MV_DRAM_BANK_INFO bankInfo[MV_DRAM_MAX_CS];
+
+	if (DRAM_CS_Order[0] == N_A)
+	{
+		mvDramBankInfoGet(SDRAM_CS0, &bankInfo[SDRAM_CS0]);
+#ifdef MV_INCLUDE_SDRAM_CS2
+		mvDramBankInfoGet(SDRAM_CS2, &bankInfo[SDRAM_CS2]);
+#endif 
+		
+#ifdef MV_INCLUDE_SDRAM_CS2
+		if (bankInfo[SDRAM_CS0].size <  bankInfo[SDRAM_CS2].size)
+		{
+			DRAM_CS_Order[0] = SDRAM_CS2;
+			DRAM_CS_Order[1] = SDRAM_CS3;
+			DRAM_CS_Order[2] = SDRAM_CS0;
+			DRAM_CS_Order[3] = SDRAM_CS1;
+
+			return SDRAM_CS2;
+		}
+#endif
+		DRAM_CS_Order[0] = SDRAM_CS0;
+		DRAM_CS_Order[1] = SDRAM_CS1;
+#ifdef MV_INCLUDE_SDRAM_CS2
+		DRAM_CS_Order[2] = SDRAM_CS2;
+		DRAM_CS_Order[3] = SDRAM_CS3;
+#endif	
+		return SDRAM_CS0;
+	}
+	return DRAM_CS_Order[0];
+}
+/*******************************************************************************
+* mvDramIfGetCSorder - 
+* 
+*
+* DESCRIPTION:
+*       This function return the fisrt CS on address 0
+*
+* INPUT:
+*		CS number.
+*
+* OUTPUT:
+*		CS order.
+*
+* RETURN:
+*       SDRAM_CS0 or SDRAM_CS2
+* 
+* NOTE: mvDramIfGetFirstCS must be caled before this subroutine
+*******************************************************************************/
+MV_U32 mvDramIfGetCSorder(MV_U32 csOrder )
+{
+	return DRAM_CS_Order[csOrder];
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h
new file mode 100644
index 00000000..23f2e540
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h
@@ -0,0 +1,172 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvDramIfh
+#define __INCmvDramIfh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* includes */
+#include "ddr2/mvDramIfRegs.h"
+#include "ddr2/mvDramIfConfig.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+/* defines  */
+/* DRAM Timing parameters */
+#define SDRAM_TWR                    15  /* ns tWr */
+#define SDRAM_TRFC_64_512M_AT_200MHZ 70  /* ns tRfc for dens 64-512 @ 200MHz */
+#define SDRAM_TRFC_64_512M           75  /* ns tRfc for dens 64-512          */
+#define SDRAM_TRFC_1G                120 /* ns tRfc for dens 1GB             */
+#define SDRAM_TR2R_CYC               1   /* cycle for tR2r                   */
+
+#define CAL_AUTO_DETECT     0   /* Do not force CAS latancy (mvDramIfDetect) */
+#define ECC_DISABLE         1   /* Force ECC to Disable                      */
+#define ECC_ENABLE          0   /* Force ECC to ENABLE                       */
+/* typedefs */
+
+/* enumeration for memory types */
+typedef enum _mvMemoryType
+{
+    MEM_TYPE_SDRAM,
+    MEM_TYPE_DDR1,
+    MEM_TYPE_DDR2
+}MV_MEMORY_TYPE;
+
+/* enumeration for DDR2 supported CAS Latencies */
+typedef enum _mvDimmDdr2Cas
+{
+    DDR2_CL_3    = 0x08, 
+    DDR2_CL_4    = 0x10, 
+    DDR2_CL_5    = 0x20, 
+    DDR2_CL_6    = 0x40, 
+    DDR2_CL_FAULT
+} MV_DIMM_DDR2_CAS;
+
+
+typedef struct _mvDramBankInfo
+{
+    MV_MEMORY_TYPE  memoryType; 	/* DDR1, DDR2 or SDRAM */
+
+    /* DIMM dimensions */
+    MV_U32  numOfRowAddr;
+    MV_U32  numOfColAddr;
+    MV_U32  dataWidth;
+    MV_U32  errorCheckType;             /* ECC , PARITY..*/
+    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
+    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
+    MV_U32  burstLengthSupported;
+    MV_U32  numOfBanksOnEachDevice;
+    MV_U32  suportedCasLatencies;
+    MV_U32  refreshInterval;
+
+    /* DIMM timing parameters */
+    MV_U32  minCycleTimeAtMaxCasLatPs;	
+    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
+    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
+    MV_U32  minRowPrechargeTime;
+    MV_U32  minRowActiveToRowActive;
+    MV_U32  minRasToCasDelay;
+    MV_U32  minRasPulseWidth;
+    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
+    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
+    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
+    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
+                      
+    /* Parameters calculated from the extracted DIMM information */
+    MV_U32  size;
+    MV_U32  deviceDensity;           	/* 16,64,128,256 or 512 Mbit */
+    MV_U32  numberOfDevices;
+
+    /* DIMM attributes (MV_TRUE for yes) */
+    MV_BOOL registeredAddrAndControlInputs;
+    MV_BOOL registeredDQMBinputs;
+     
+}MV_DRAM_BANK_INFO;
+
+#include "ddr2/spd/mvSpd.h"
+
+/* mvDramIf.h API list */
+MV_VOID   mvDramIfBasicAsmInit(MV_VOID);
+MV_STATUS mvDramIfDetect(MV_U32 forcedCl, MV_BOOL eccDisable);
+MV_VOID   _mvDramIfConfig(int entryNum);
+
+MV_U32 mvDramIfBankSizeGet(MV_U32 bankNum);
+MV_U32 mvDramIfBankBaseGet(MV_U32 bankNum);
+MV_U32 mvDramIfSizeGet(MV_VOID);
+MV_U32 mvDramIfCalGet(void);
+MV_STATUS mvDramIfSingleBitErrThresholdSet(MV_U32 threshold);
+MV_VOID mvDramIfSelfRefreshSet(void);
+void mvDramIfShow(void);
+MV_U32 mvDramIfGetFirstCS(void);
+MV_U32 mvDramIfGetCSorder(MV_U32 csOrder );
+MV_U32 mvDramCsSizeGet(MV_U32 csNum);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvDramIfh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfBasicInit.S b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfBasicInit.S
new file mode 100644
index 00000000..76723816
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfBasicInit.S
@@ -0,0 +1,986 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#define	_ASMLANGUAGE
+#define MV_ASMLANGUAGE
+#include "mvSysHwConfig.h"
+#include "mvOsAsm.h"
+#include "boardEnv/mvBoardEnvSpec.h"
+#include "ctrlEnv/sys/mvCpuIfRegs.h"
+#include "mvDramIfConfig.h"
+#include "mvDramIfRegs.h"
+#include "pex/mvPexRegs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "ctrlEnv/mvCtrlEnvAsm.h"
+#include "mvCommon.h"
+
+/* defines */
+
+#if defined(MV_STATIC_DRAM_ON_BOARD) 
+.globl dramBoot1
+dramBoot1:
+        .word   0
+
+/******************************************************************************
+*
+*
+*
+*
+*******************************************************************************/
+#if defined(DB_MV78XX0) || defined(DB_MV88F632X)
+/* DDR2 boards 512MB 333MHz */
+#define STATIC_SDRAM0_BANK0_SIZE		0x1ffffff1 /*	0x1504	*/ 
+#define STATIC_SDRAM_CONFIG	     		0x43048C30 /*	0x1400  */	
+#define STATIC_SDRAM_MODE	     		0x00000652 /*	0x141c  */	
+#define STATIC_DUNIT_CTRL_LOW			0x38543000 /*   0x1404  */  
+#define STATIC_DUNIT_CTRL_HI			0x0000FFFF /*   0x1424  */  
+#define STATIC_SDRAM_ADDR_CTRL			0x00000088 /*   0x1410  */  
+#define STATIC_SDRAM_TIME_CTRL_LOW		0x22125441 /*   0x1408  */  
+#define STATIC_SDRAM_TIME_CTRL_HI		0x00000A29 /*   0x140c  */  
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000 /*   0x1494  */  
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000 /*   0x1498  */  
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000E80F /*   0x149c  */  
+#define STATIC_SDRAM_EXT_MODE          		0x00000040 /*   0x1420  */  
+#define STATIC_SDRAM_DDR2_TIMING_LO		0x00085520 /*   0x1428  */  
+#define STATIC_SDRAM_DDR2_TIMING_HI		0x00008552 /*   0x147C  */  
+
+#elif defined(RD_MV78XX0_AMC)
+/* On board DDR2 512MB 400MHz CL5 */
+#define STATIC_SDRAM0_BANK0_SIZE		0x1ffffff1 /*	0x1504	*/ 
+#define STATIC_SDRAM_CONFIG	     		0x43008C30 /*	0x1400  */	
+#define STATIC_SDRAM_MODE	     		0x00000652 /*	0x141c  */	
+#define STATIC_DUNIT_CTRL_LOW			0x38543000 /*   0x1404  */  
+#define STATIC_DUNIT_CTRL_HI			0x0000F07F /*   0x1424  */  
+#define STATIC_SDRAM_ADDR_CTRL			0x000000DD /*   0x1410  */  
+#define STATIC_SDRAM_TIME_CTRL_LOW		0x23135441 /*   0x1408  */  
+#define STATIC_SDRAM_TIME_CTRL_HI		0x00000A32 /*   0x140c  */  
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000 /*   0x1494  */  
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000 /*   0x1498  */  
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000EB0F /*   0x149c  */  
+#define STATIC_SDRAM_EXT_MODE          		0x00000040 /*   0x1420  */  
+#define STATIC_SDRAM_DDR2_TIMING_LO		0x00085520 /*   0x1428  */  
+#define STATIC_SDRAM_DDR2_TIMING_HI		0x00008552 /*   0x147C  */  
+
+#elif defined(RD_MV78XX0_H3C)
+/* DDR2 boards 512MB 333MHz */
+#define STATIC_SDRAM0_BANK0_SIZE		0x1ffffff1 /*	0x1504	*/ 
+#define STATIC_SDRAM_CONFIG	     		0x43048a25 /*	0x1400  */	
+#define STATIC_SDRAM_MODE	     		0x00000652 /*	0x141c  */	
+#define STATIC_DUNIT_CTRL_LOW			0x38543000 /*   0x1404  */  
+#define STATIC_DUNIT_CTRL_HI			0x0000F07F /*   0x1424  */  
+#define STATIC_SDRAM_ADDR_CTRL			0x00000088 /*   0x1410  */  
+#define STATIC_SDRAM_TIME_CTRL_LOW		0x2202444e /*   0x1408  */  
+#define STATIC_SDRAM_TIME_CTRL_HI		0x00000A22 /*   0x140c  */  
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000 /*   0x1494  */  
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000 /*   0x1498  */  
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000EB0F /*   0x149c  */  
+#define STATIC_SDRAM_EXT_MODE          		0x00000040 /*   0x1420  */  
+#define STATIC_SDRAM_DDR2_TIMING_LO		0x00085520 /*   0x1428  */  
+#define STATIC_SDRAM_DDR2_TIMING_HI		0x00008552 /*   0x147C  */  
+
+#elif defined(RD_MV78XX0_PCAC)
+/* DDR2 boards 256MB 200MHz */
+#define STATIC_SDRAM0_BANK0_SIZE		0x0ffffff1 /*	0x1504	*/ 
+#define STATIC_SDRAM_CONFIG	     		0x43000a25 /*	0x1400  */	
+#define STATIC_SDRAM_MODE	     		0x00000652 /*	0x141c  */	
+#define STATIC_DUNIT_CTRL_LOW			0x38543000 /*   0x1404  */  
+#define STATIC_DUNIT_CTRL_HI			0x0000F07F /*   0x1424  */  
+#define STATIC_SDRAM_ADDR_CTRL			0x000000DD /*   0x1410  */  
+#define STATIC_SDRAM_TIME_CTRL_LOW		0x2202444e /*   0x1408  */  
+#define STATIC_SDRAM_TIME_CTRL_HI		0x00000822 /*   0x140c  */  
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000 /*   0x1494  */  
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000 /*   0x1498  */  
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000EB0F /*   0x149c  */  
+#define STATIC_SDRAM_EXT_MODE          		0x00000040 /*   0x1420  */  
+#define STATIC_SDRAM_DDR2_TIMING_LO		0x00085520 /*   0x1428  */  
+#define STATIC_SDRAM_DDR2_TIMING_HI		0x00008552 /*   0x147C  */  
+
+#else
+/* DDR2 MV88F6281 boards 256MB 400MHz */
+#define STATIC_SDRAM0_BANK0_SIZE		0x0FFFFFF1 /*	0x1504	*/ 
+#define STATIC_SDRAM_CONFIG	     		0x43000c30 /*	0x1400  */	
+#define STATIC_SDRAM_MODE	     		0x00000C52 /*	0x141c  */	
+#define STATIC_DUNIT_CTRL_LOW			0x39543000 /*   0x1404  */  
+#define STATIC_DUNIT_CTRL_HI			0x0000F1FF /*   0x1424  */  
+#define STATIC_SDRAM_ADDR_CTRL			0x000000cc /*   0x1410  */  
+#define STATIC_SDRAM_TIME_CTRL_LOW		0x22125451 /*   0x1408  */  
+#define STATIC_SDRAM_TIME_CTRL_HI		0x00000A33 /*   0x140c  */  
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x003C0000 /*   0x1494  */  
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000 /*   0x1498  */  
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000F80F /*   0x149c  */  
+#define STATIC_SDRAM_EXT_MODE          		0x00000042 /*   0x1420  */  
+#define STATIC_SDRAM_DDR2_TIMING_LO		0x00085520 /*   0x1428  */  
+#define STATIC_SDRAM_DDR2_TIMING_HI		0x00008552 /*   0x147C  */  
+#endif /* MV78XX0 */
+
+	.globl _mvDramIfStaticInit
+_mvDramIfStaticInit:
+
+	mov     r11, LR     		/* Save link register */
+	mov	r10, r2
+
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r5, SDRAM_DUNIT_CTRL_REG)
+	orr	r6, r6, #BIT4	/* Enable 2T mode */
+	bic	r6, r6, #BIT6	/* clear ctrlPos */
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_DUNIT_CTRL_REG)
+#endif
+
+     	/*DDR SDRAM Initialization Control */
+	ldr	r6, =DSICR_INIT_EN
+	MV_REG_WRITE_ASM (r6, r1, DDR_SDRAM_INIT_CTRL_REG)
+2:	MV_REG_READ_ASM (r6, r1, DDR_SDRAM_INIT_CTRL_REG)
+         and    r6, r6, #DSICR_INIT_EN
+         cmp    r6, #0
+         bne 2b
+
+        /* If we boot from NAND jump to DRAM address */
+        mov     r5, #1
+        ldr     r6, =dramBoot1
+        str     r5, [r6]                /* We started executing from DRAM */
+
+        ldr     r6, dramBoot1
+        cmp     r6, #0
+        bne     1f
+
+	/* set all dram windows to 0 */
+	mov	r6, #0
+	MV_REG_WRITE_ASM(r6, r5, SDRAM_SIZE_REG(0,0))
+	MV_REG_WRITE_ASM(r6, r5, SDRAM_SIZE_REG(0,1))
+	MV_REG_WRITE_ASM(r6, r5, SDRAM_SIZE_REG(0,2))
+	MV_REG_WRITE_ASM(r6, r5, SDRAM_SIZE_REG(0,3))
+	ldr	r6, = STATIC_SDRAM0_BANK0_SIZE
+	MV_REG_WRITE_ASM(r6, r5, SDRAM_SIZE_REG(0,0))
+
+
+	/* set all dram configuration in temp registers */
+	ldr	r6, = STATIC_SDRAM0_BANK0_SIZE
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG0)
+	ldr	r6, = STATIC_SDRAM_CONFIG
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG1)
+	ldr	r6, = STATIC_SDRAM_MODE
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG2)
+	ldr	r6, = STATIC_DUNIT_CTRL_LOW
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG3)
+	ldr	r6, = STATIC_SDRAM_ADDR_CTRL
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG4)
+	ldr	r6, = STATIC_SDRAM_TIME_CTRL_LOW
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG5)
+	ldr	r6, = STATIC_SDRAM_TIME_CTRL_HI
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG6)
+	ldr	r6, = STATIC_SDRAM_ODT_CTRL_LOW
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG7)
+	ldr	r6, = STATIC_SDRAM_ODT_CTRL_HI
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG8)
+	ldr	r6, = STATIC_SDRAM_DUNIT_ODT_CTRL
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG9)
+	ldr	r6, = STATIC_SDRAM_EXT_MODE
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG10)
+	ldr	r6, = STATIC_SDRAM_DDR2_TIMING_LO
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG11)
+	ldr	r6, = STATIC_SDRAM_DDR2_TIMING_HI
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG12)
+#ifndef MV_NAND_BOOT
+	ldr	r6, = STATIC_DUNIT_CTRL_HI
+	MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG13)
+#endif
+
+	ldr	sp,=0
+	bl	_mvDramIfConfig
+	ldr	r0, =0
+#ifdef MV78XX0
+	bl	_mvDramIfEccMemInit 
+#endif
+1:
+	mov 	r2, r10
+	mov     PC, r11         	/* r11 is saved link register */
+
+#else  /* #if defined(MV_STATIC_DRAM_ON_BOARD) */
+
+.globl dramBoot1
+dramBoot1:
+        .word   0
+
+/*******************************************************************************
+* mvDramIfBasicInit - Basic initialization of DRAM interface
+*
+* DESCRIPTION:
+*       The function will initialize the DRAM for basic usage. The function
+*       will use the TWSI assembly API to extract DIMM parameters according
+*       to which DRAM interface will be initialized.
+*       The function referes to the following DRAM parameters:
+*       1) DIMM is registered or not.
+*       2) DIMM width detection.
+*       3) DIMM density.
+*
+* INPUT:
+*       r3 - required size for initial DRAM.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*       Note:
+*       r4 holds I2C EEPROM address
+*       r5 holds SDRAM register base address
+*	r7 holds returned values
+*       r8 holds SDRAM various configuration registers value.
+*       r11 holds return function address.
+*******************************************************************************/
+/* Setting the offsets of the I2C registers */
+#define DIMM_TYPE_OFFSET	      2
+#define NUM_OF_ROWS_OFFSET            3
+#define NUM_OF_COLS_OFFSET            4
+#define NUM_OF_RANKS		      5
+#define DIMM_CONFIG_TYPE             11
+#define SDRAM_WIDTH_OFFSET           13
+#define NUM_OF_BANKS_OFFSET          17
+#define SUPPORTED_CL_OFFSET          18
+#define DIMM_TYPE_INFO_OFFSET        20         /* DDR2 only    */
+#define SDRAM_MODULES_ATTR_OFFSET    21
+#define RANK_SIZE_OFFSET             31
+
+#define DRAM_DEV_DENSITY_128M         128
+#define DRAM_DEV_DENSITY_256M         256
+#define DRAM_DEV_DENSITY_512M         512
+#define DRAM_DEV_DENSITY_1G          1024
+#define DRAM_DEV_DENSITY_2G          2048
+
+#define DRAM_RANK_DENSITY_128M       0x20
+#define DRAM_RANK_DENSITY_256M       0x40
+#define DRAM_RANK_DENSITY_512M       0x80
+#define DRAM_RANK_DENSITY_1G	     0x1
+#define DRAM_RANK_DENSITY_2G	     0x2
+
+       .globl _mvDramIfBasicInit
+       .extern _i2cInit
+_mvDramIfBasicInit:
+
+        mov     r11, LR     		/* Save link register */
+
+	/* Set Dunit high control register	      */
+        MV_REG_READ_ASM (r6, r5, SDRAM_DUNIT_CTRL_HI_REG)
+	orr	r6, r6, #BIT7 /* SDRAM__D2P_EN */
+	orr	r6, r6, #BIT8 /* SDRAM__P2D_EN */
+#ifdef MV78XX0
+	orr	r6, r6, #BIT9 /* SDRAM__ADD_HALF_FCC_EN */
+	orr	r6, r6, #BIT10 /* SDRAM__PUP_ZERO_SKEW_EN */
+	orr	r6, r6, #BIT11 /* SDRAM__WR_MASH_DELAY_EN */
+#endif
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_DUNIT_CTRL_HI_REG)
+
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r5, SDRAM_DUNIT_CTRL_REG)
+	orr	r6, r6, #BIT4	/* Enable 2T mode */
+	bic	r6, r6, #BIT6	/* clear ctrlPos */
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_DUNIT_CTRL_REG)
+#endif
+
+     	/*DDR SDRAM Initialization Control */
+	ldr	r6, =DSICR_INIT_EN
+	MV_REG_WRITE_ASM (r6, r1, DDR_SDRAM_INIT_CTRL_REG)
+2:	MV_REG_READ_ASM (r6, r1, DDR_SDRAM_INIT_CTRL_REG)
+         and    r6, r6, #DSICR_INIT_EN
+         cmp    r6, #0
+         bne 2b
+
+        mov     r5, #1
+        ldr     r8, =dramBoot1
+        str     r5, [r8]                /* We started executing from DRAM */
+
+        /* If we boot from NAND jump to DRAM address */
+        ldr     r8, dramBoot1
+        cmp     r8, #0
+        movne   pc, r11
+
+        bl      _i2cInit                /* Initialize TWSI master             */
+
+        /* Check if we have more then 1 dimm */
+	ldr	r6, =0
+	MV_REG_WRITE_ASM (r6, r1, DRAM_BUF_REG14)
+#ifdef MV78XX0
+	bl _is_Second_Dimm_Exist
+	beq single_dimm
+	ldr	r6, =1
+	MV_REG_WRITE_ASM (r6, r1, DRAM_BUF_REG14)
+single_dimm:
+        bl      _i2cInit                /* Initialize TWSI master             */
+#endif
+
+        /* Get default SDRAM Config values */
+        MV_REG_READ_ASM (r8, r5, SDRAM_CONFIG_REG)
+
+        /* Get registered/non registered info from DIMM */
+	bl  	_is_Registered
+        beq     nonRegistered
+
+setRegistered:
+        orr     r8, r8, #SDRAM_REGISTERED   /* Set registered bit(17)         */
+nonRegistered:
+#ifdef MV78XX0
+        /* Get ECC/non ECC info from DIMM */
+	bl  	_is_Ecc
+        beq     setConfigReg
+
+setEcc:        
+        orr     r8, r8, #SDRAM_ECC_EN   /* Set ecc bit(18)         */
+#endif
+setConfigReg:
+        MV_REG_WRITE_ASM (r8, r5, DRAM_BUF_REG1)
+
+        /* Set maximum CL supported by DIMM */
+	bl	_get_CAL
+
+        /* r7 is DIMM supported CAS (e.g: 3 --> 0x1C)                         */
+        clz     r6, r7
+        rsb     r6, r6, #31     /* r6 = the bit number of MAX CAS supported   */
+
+casDdr2:
+	ldr     r7, =0x41        /* stBurstInDel|stBurstOutDel field value     */
+	ldr     r3, =0x53       /* stBurstInDel|stBurstOutDel registered value*/
+	ldr     r8, =0x32      /* Assuming MAX CL = 3           */
+        cmp     r6, #3          /* If CL = 3 break              */
+        beq     casDdr2Cont
+
+	ldr     r7, =0x53        /* stBurstInDel|stBurstOutDel field value     */
+	ldr     r3, =0x65       /* stBurstInDel|stBurstOutDel registered value*/
+	ldr     r8, =0x42      /* Assuming MAX CL = 4           */
+        cmp     r6, #4          /* If CL = 4 break              */
+        beq     casDdr2Cont
+
+	ldr     r7, =0x65        /* stBurstInDel|stBurstOutDel field value     */
+	ldr     r3, =0x77       /* stBurstInDel|stBurstOutDel registered value*/
+	ldr     r8, =0x52      /* Assuming MAX CL = 5           */
+        cmp     r6, #5          /* If CL = 5 break              */
+        beq     casDdr2Cont
+
+	ldr     r7, =0x77        /* stBurstInDel|stBurstOutDel field value     */
+	ldr     r3, =0x89       /* stBurstInDel|stBurstOutDel registered value*/
+	ldr     r8, =0x62      /* Assuming MAX CL = 6           */
+        cmp     r6, #6          /* If CL = 5 break              */
+        beq     casDdr2Cont                
+
+        /* This is an error. return */
+        b       exit_ddrAutoConfig      /* This is an error !!  */
+casDdr2Cont:
+
+        /* Get default SDRAM Mode values */
+        MV_REG_READ_ASM (r6, r5, SDRAM_MODE_REG)
+        bic     r6, r6, #(BIT6 | BIT5 | BIT4) /* Clear CL filed */
+	orr	r6, r6, r8
+        MV_REG_WRITE_ASM (r6, r5, DRAM_BUF_REG2)
+
+	/* Set Dunit control register according to max CL detected	      */
+        MV_REG_READ_ASM (r6, r5, DRAM_BUF_REG1)
+	tst	r6, #SDRAM_REGISTERED
+	beq	setDunitReg
+	mov	r7, r3
+
+setDunitReg:
+#ifdef MV78XX0
+        /* Set SDRAM Extended Mode register for double DIMM */
+	/* Check DRAM frequency for more then 267MHz set ODT Rtt to 50ohm */
+
+        MV_REG_READ_ASM (r4, r5, CPU_RESET_SAMPLE_L_REG)
+	ldr	r5, =MSAR_SYSCLCK_MASK
+	and	r4, r4, r5	
+	ldr	r5, =MSAR_SYSCLCK_333
+	cmp	r4, r5
+	ble	Clock333
+	add r7, r7, #0x10
+Clock333:
+#endif
+
+        MV_REG_READ_ASM (r6, r5, SDRAM_DUNIT_CTRL_REG)
+	bic	r6, r6, #(0xff << 20) /* Clear SBout and SBin */
+	orr	r6, r6, #BIT4	/* Enable 2T mode */
+	bic	r6, r6, #BIT6	/* clear ctrlPos */
+	orr	r6, r6, r7, LSL #20
+        MV_REG_WRITE_ASM (r6, r5, DRAM_BUF_REG3)
+
+	/* Set Dunit high control register	      */
+        MV_REG_READ_ASM (r6, r5, SDRAM_DUNIT_CTRL_HI_REG)
+	orr	r6, r6, #BIT7 /* SDRAM__D2P_EN */
+	orr	r6, r6, #BIT8 /* SDRAM__P2D_EN */
+#ifdef MV78XX0
+	orr	r6, r6, #BIT9 /* SDRAM__ADD_HALF_FCC_EN */
+	orr	r6, r6, #BIT10 /* SDRAM__PUP_ZERO_SKEW_EN */
+	orr	r6, r6, #BIT11 /* SDRAM__WR_MASH_DELAY_EN */
+#endif
+        MV_REG_WRITE_ASM (r6, r5, DRAM_BUF_REG13)
+
+        /* DIMM density configuration*/
+        /* Density = (1 << (rowNum + colNum)) * dramWidth * dramBankNum       */
+Density:
+	/* Get bank 0 and 1 density */
+	ldr	r6, =0
+	bl 	_getDensity
+
+	mov 	r8, r7
+        mov     r8, r8, LSR #20 /* Move density 20 bits to the right  */
+                                /* For example 0x10000000 --> 0x1000 */
+
+        mov     r3, #(SDRAM_DSIZE_256Mb(0) | SDRAM_DSIZE_256Mb(1))
+        cmp     r8, #DRAM_DEV_DENSITY_256M
+        beq     get_bank_2_density
+
+        mov     r3, #(SDRAM_DSIZE_512Mb(0) | SDRAM_DSIZE_512Mb(1))
+        cmp     r8, #DRAM_DEV_DENSITY_512M
+        beq     get_bank_2_density
+
+        mov     r3, #(SDRAM_DSIZE_1Gb(0) | SDRAM_DSIZE_1Gb(1))
+        cmp     r8, #DRAM_DEV_DENSITY_1G
+        beq     get_bank_2_density
+
+        mov     r3, #(SDRAM_DSIZE_2Gb(0) | SDRAM_DSIZE_2Gb(1))
+        cmp     r8, #DRAM_DEV_DENSITY_2G
+        beq     get_bank_2_density
+
+        /* This is an error. return */
+        b       exit_ddrAutoConfig
+
+get_bank_2_density:
+	/* Check for second dimm */
+	MV_REG_READ_ASM (r6, r1, DRAM_BUF_REG14)
+	cmp	r6, #1
+	bne 	get_width
+
+	/* Get bank 2 and 3 density */
+	ldr	r6, =2
+	bl 	_getDensity
+
+	mov 	r8, r7
+        mov     r8, r8, LSR #20 /* Move density 20 bits to the right  */
+                                /* For example 0x10000000 --> 0x1000 */
+
+        orr     r3, r3, #(SDRAM_DSIZE_256Mb(2) | SDRAM_DSIZE_256Mb(3))
+        cmp     r8, #DRAM_DEV_DENSITY_256M
+        beq     get_width
+
+        and     r3, r3, #~(SDRAM_DSIZE_MASK(2) | SDRAM_DSIZE_MASK(3))
+        orr     r3, r3, #(SDRAM_DSIZE_512Mb(2) | SDRAM_DSIZE_512Mb(3))
+        cmp     r8, #DRAM_DEV_DENSITY_512M
+        beq     get_width
+
+        and     r3, r3, #~(SDRAM_DSIZE_MASK(2) | SDRAM_DSIZE_MASK(3))
+        orr     r3, r3, #(SDRAM_DSIZE_1Gb(2) | SDRAM_DSIZE_1Gb(3))
+        cmp     r8, #DRAM_DEV_DENSITY_1G
+        beq     get_width
+
+        and     r3, r3, #~(SDRAM_DSIZE_MASK(2) | SDRAM_DSIZE_MASK(3))
+        orr     r3, r3, #(SDRAM_DSIZE_2Gb(2) | SDRAM_DSIZE_2Gb(3))
+        cmp     r8, #DRAM_DEV_DENSITY_2G
+        beq     get_width
+
+        /* This is an error. return */
+        b       exit_ddrAutoConfig
+
+	/* Get SDRAM width */
+get_width: 
+	/* Get bank 0 and 1 width */
+	ldr	r6, =0
+	bl 	_get_width
+
+        cmp     r7, #8           /* x8 devices   */  
+        beq     get_bank_2_width
+
+        orr     r3, r3, #(SDRAM_ADDRSEL_X16(0) | SDRAM_ADDRSEL_X16(1)) /* x16 devices  */
+        cmp     r7, #16
+        beq     get_bank_2_width
+
+        /* This is an error. return */
+        b       exit_ddrAutoConfig
+
+get_bank_2_width:
+	/* Check for second dimm */
+	MV_REG_READ_ASM (r6, r1, DRAM_BUF_REG14)
+	cmp	r6, #1
+	bne 	densCont
+
+	/* Get bank 2 and 3 width */
+	ldr	r6, =2
+	bl 	_get_width
+
+        cmp     r7, #8           /* x8 devices   */  
+        beq     densCont
+
+        orr     r3, r3, #(SDRAM_ADDRSEL_X16(2) | SDRAM_ADDRSEL_X16(3)) /* x16 devices  */
+        cmp     r7, #16
+        beq     densCont
+
+        /* This is an error. return */
+        b       exit_ddrAutoConfig
+
+densCont:
+        MV_REG_WRITE_ASM (r3, r5, DRAM_BUF_REG4)
+
+        /* Set SDRAM timing control low register */
+	ldr	r4, =SDRAM_TIMING_CTRL_LOW_REG_DEFAULT
+        /* MV_REG_READ_ASM (r4, r5, SDRAM_TIMING_CTRL_LOW_REG) */
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG5)
+
+        /* Set SDRAM timing control high register */
+	ldr	r6, =SDRAM_TIMING_CTRL_HIGH_REG_DEFAULT
+
+    MV_REG_READ_ASM (r4, r5, CPU_RESET_SAMPLE_L_REG)
+	ldr	r5, =MSAR_SYSCLCK_MASK
+	and	r4, r4, r5	
+	ldr	r5, =MSAR_SYSCLCK_333
+	cmp	r4, r5
+	blt	timingHighClock333
+    orr r6, r6, #BIT9
+
+timingHighClock333:
+    /* MV_REG_READ_ASM (r6, r5, SDRAM_TIMING_CTRL_HIGH_REG) */
+    MV_REG_WRITE_ASM(r6, r5, DRAM_BUF_REG6)
+
+	/* Check for second dimm */
+	MV_REG_READ_ASM (r6, r1, DRAM_BUF_REG14)
+	cmp	r6, #1
+	bne 	single_dimm_odt
+
+        /* Set SDRAM ODT control low register for double DIMM*/        
+        ldr	r4, =DDR2_ODT_CTRL_LOW_CS0_CS1_CS2_CS3_DV
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG7)
+
+        /* Set DUNIT ODT control register for double DIMM */
+        ldr	r4, =DDR2_DUNIT_ODT_CTRL_CS0_CS1_CS2_CS3_DV
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG9)
+
+#ifdef MV78XX0
+        /* Set SDRAM Extended Mode register for double DIMM */
+	/* Check DRAM frequency for more then 267MHz set ODT Rtt to 50ohm */
+
+        MV_REG_READ_ASM (r4, r5, CPU_RESET_SAMPLE_L_REG)
+	ldr	r5, =MSAR_SYSCLCK_MASK
+	and	r4, r4, r5	
+	ldr	r5, =MSAR_SYSCLCK_267
+	cmp	r4, r5
+	beq	slow_dram_clock_rtt
+	ldr	r5, =MSAR_SYSCLCK_300
+	cmp	r4, r5
+	beq	slow_dram_clock_rtt
+	ldr	r5, =MSAR_SYSCLCK_333
+	cmp	r4, r5
+	beq	fast_dram_clock_rtt
+	ldr	r5, =MSAR_SYSCLCK_400
+	cmp	r4, r5
+	beq	fast_dram_clock_rtt
+
+	b	slow_dram_clock_rtt
+
+fast_dram_clock_rtt:
+        ldr	r4, =DDR_SDRAM_EXT_MODE_FAST_CS0_CS1_CS2_CS3_DV
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG10)
+	b odt_config_end
+#endif
+slow_dram_clock_rtt:
+        ldr	r4, =DDR_SDRAM_EXT_MODE_CS0_CS1_CS2_CS3_DV
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG10)
+	b odt_config_end
+
+single_dimm_odt:
+        /* Set SDRAM ODT control low register */        
+        ldr	r4, =DDR2_ODT_CTRL_LOW_CS0_CS1_DV
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG7)
+
+        /* Set DUNIT ODT control register */
+        ldr	r4, =DDR2_DUNIT_ODT_CTRL_CS0_CS1_DV
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG9)
+
+        /* Set SDRAM Extended Mode register */
+        ldr	r4, =DDR_SDRAM_EXT_MODE_CS0_CS1_DV
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG10)
+
+odt_config_end:
+        /* SDRAM ODT control high register is left as default */
+        MV_REG_READ_ASM (r4, r5, DDR2_SDRAM_ODT_CTRL_HIGH_REG)
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG8)
+
+        /*Read CL and set the DDR2 registers accordingly */
+        MV_REG_READ_ASM (r6, r5, DRAM_BUF_REG2)
+        and r6, r6, #SDRAM_CL_MASK
+        mov r4, r6
+        orr r4, r4, r6, LSL #4
+        orr r4, r4, r6, LSL #8
+        orr r4, r4, r6, LSL #12
+        mov r5, #0x30000
+        add r4, r4, r5
+        sub r4, r4, #0x30
+        /* Set SDRAM Ddr2 Timing Low register */
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG11)
+
+        /* Set SDRAM Ddr2 Timing High register */
+        mov r4, r4, LSR #4
+        MV_REG_WRITE_ASM(r4, r5, DRAM_BUF_REG12)
+
+timeParamDone:        
+	/* Close all windows */
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,0))
+        and	r6, r6,#~SCSR_SIZE_MASK
+        and	r6, r6,#~1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,0))
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,1))
+        and	r6, r6,#~SCSR_SIZE_MASK
+        and	r6, r6,#~1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,1))
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,2))
+        and	r6, r6,#~SCSR_SIZE_MASK
+        and	r6, r6,#~1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,2))
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,3))
+        and	r6, r6,#~SCSR_SIZE_MASK
+        and	r6, r6,#~1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,3))
+
+        /* Set sdram bank 0 size and enable it */
+	ldr	r6, =0
+	bl _mvDramIfGetDimmSizeFromSpd
+#ifdef MV78XX0
+	/* Check DRAM width */
+        MV_REG_READ_ASM (r4, r5, SDRAM_CONFIG_REG)
+	ldr	r5, =SDRAM_DWIDTH_MASK
+	and	r4, r4, r5	
+	ldr	r5, =SDRAM_DWIDTH_64BIT
+	cmp	r4, r5
+	beq	dram_64bit_width
+	/* Utilize only 32bit width */
+	mov	r8, r8, LSR #1
+#else
+	/* Utilize only 16bit width */
+	mov	r8, r8, LSR #2
+#endif
+dram_64bit_width:
+	/* Update first dimm size return value R8 */
+        MV_REG_READ_ASM (r5, r6, SDRAM_SIZE_REG(0,0))
+        ldr	r6, =~SCSR_SIZE_MASK	
+	and	r5, r5, r6
+	orr	r5, r5, r8
+        MV_REG_WRITE_ASM(r5, r8, SDRAM_SIZE_REG(0,0))
+
+	/* Clear bank 2 size */
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,2))
+        and	r6, r6,#~SCSR_SIZE_MASK	
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,2))
+
+	/* Check for second dimm */
+	MV_REG_READ_ASM (r6, r1, DRAM_BUF_REG14)
+	cmp	r6, #1
+	bne 	defualt_order
+
+        /* Set sdram bank 2 size */
+	ldr	r6, =2
+	bl _mvDramIfGetDimmSizeFromSpd
+#ifdef MV78XX0
+	/* Check DRAM width */
+        MV_REG_READ_ASM (r4, r5, SDRAM_CONFIG_REG)
+	ldr	r5, =SDRAM_DWIDTH_MASK
+	and	r4, r4, r5	
+	ldr	r5, =SDRAM_DWIDTH_64BIT
+	cmp	r4, r5
+	beq	dram_64bit_width2
+	/* Utilize only 32bit width */
+	mov	r8, r8, LSR #1
+#else
+	/* Utilize only 16bit width */
+	mov	r8, r8, LSR #2
+#endif
+dram_64bit_width2:
+	/* Update first dimm size return value R8 */
+        MV_REG_READ_ASM (r5, r6, SDRAM_SIZE_REG(0,2))
+        ldr	r6, =~SCSR_SIZE_MASK	
+	and	r5, r5, r6
+	orr	r5, r5, r8
+        MV_REG_WRITE_ASM(r5, r8, SDRAM_SIZE_REG(0,2))
+
+	/* Close windows 1 and 3 */
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,1))
+        and	r6, r6,#~1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,1))
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,3))
+        and	r6, r6,#~1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,3))
+
+	/* Check dimm size for setting dram bank order */
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,0))
+        MV_REG_READ_ASM (r4, r5, SDRAM_SIZE_REG(0,2))
+        and	r6, r6,#SCSR_SIZE_MASK	
+        and	r4, r4,#SCSR_SIZE_MASK	
+	cmp	r6, r4
+	bge	defualt_order
+
+	/* Bank 2 is biger then bank 0 */
+	ldr	r6,=0
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_BASE_ADDR_REG(0,2))
+
+	/* Open win 2 */
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,2))
+        orr	r6, r6,#1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,2))
+
+	ldr	sp,=0
+	bl	_mvDramIfConfig
+#ifdef MV78XX0
+	/* Init ECC on CS 2 */
+	ldr	r0, =2
+	bl	_mvDramIfEccMemInit
+#endif
+        mov     PC, r11         /* r11 is saved link register */
+
+defualt_order:
+
+	/* Open win 0 */
+        MV_REG_READ_ASM (r6, r5, SDRAM_SIZE_REG(0,0))
+        orr	r6, r6,#1
+        MV_REG_WRITE_ASM (r6, r5, SDRAM_SIZE_REG(0,0))
+
+	ldr	sp,=0
+	bl	_mvDramIfConfig
+#ifdef MV78XX0
+	/* Init ECC on CS 0 */
+	ldr	r0, =0
+	bl	_mvDramIfEccMemInit
+#endif
+exit_ddrAutoConfig:
+        mov     PC, r11         /* r11 is saved link register */
+
+
+/***************************************************************************************/
+/*       r4 holds I2C EEPROM address
+ *       r7 holds I2C EEPROM offset parameter for i2cRead and its --> returned value
+ *       r8 holds SDRAM various configuration registers value.
+ *	r13 holds Link register
+ */
+/**************************/
+_getDensity:
+	mov     r13, LR                            /* Save link register */
+
+	/* Read SPD rank size from DIMM0 */
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR       /* reading from DIMM0      */
+
+	cmp	r6, #0
+	beq	1f
+
+	/* Read SPD rank size from DIMM1 */
+        mov     r4, #MV_BOARD_DIMM1_I2C_ADDR /* reading from DIMM1            */
+
+1:
+        mov     r7, #NUM_OF_ROWS_OFFSET            /* offset  3               */
+        bl      _i2cRead
+        mov     r8, r7                             /* r8 save number of rows  */
+
+        mov     r7, #NUM_OF_COLS_OFFSET            /* offset  4               */
+        bl      _i2cRead
+        add     r8, r8, r7                         /* r8 = number of rows + number of col */
+
+        mov     r7, #0x1
+        mov     r8, r7, LSL r8                     /* r8 = (1 << r8)          */
+
+        mov     r7, #SDRAM_WIDTH_OFFSET            /* offset 13 */
+        bl      _i2cRead
+        mul     r8, r7, r8
+
+        mov     r7, #NUM_OF_BANKS_OFFSET           /* offset 17               */
+        bl      _i2cRead
+        mul     r7, r8, r7
+
+	mov     PC, r13
+
+/**************************/
+_get_width:
+	mov     r13, LR                 /* Save link register */
+
+	/* Read SPD rank size from DIMM0 */
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+
+	cmp	r6, #0
+	beq	1f
+
+	/* Read SPD rank size from DIMM1 */
+        mov     r4, #MV_BOARD_DIMM1_I2C_ADDR /* reading from DIMM1            */
+
+1:
+        /* Get SDRAM width (SPD offset 13) */
+        mov     r7, #SDRAM_WIDTH_OFFSET
+        bl      _i2cRead                /* result in r7                       */
+
+	mov     PC, r13
+
+/**************************/
+_get_CAL:
+	mov     r13, LR                 /* Save link register */
+
+        /* Set maximum CL supported by DIMM */
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #SUPPORTED_CL_OFFSET     /* offset  18 */
+        bl      _i2cRead
+
+	mov     PC, r13
+
+/**************************/
+/* R8 - sdram configuration register.
+ * Return value in flag if no-registered then Z-flag is set
+ */
+_is_Registered:
+	mov     r13, LR                 /* Save link register */
+#if defined(MV645xx)
+        /* Get registered/non registered info from DIMM */
+        tst     r8, #SDRAM_DTYPE_DDR2
+        bne     regDdr2
+
+regDdr1:
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #SDRAM_MODULES_ATTR_OFFSET
+        bl      _i2cRead                /* result in r7                       */
+
+        tst     r7, #0x2
+	b	exit
+#endif
+regDdr2:
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #DIMM_TYPE_INFO_OFFSET
+        bl      _i2cRead                /* result in r7                       */
+
+        tst     r7, #0x11               /* DIMM type = regular RDIMM (0x01)   */
+                                        /* or Mini-RDIMM (0x10)               */
+exit:
+        mov     PC, r13
+
+
+/**************************/
+/* Return value in flag if no-Ecc then Z-flag is set */
+_is_Ecc:
+	mov     r13, LR                 /* Save link register */
+
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #DIMM_CONFIG_TYPE
+        bl      _i2cRead                /* result in r7                       */
+
+        tst     r7, #0x2               /* bit 1 -> Data ECC */
+        mov     PC, r13
+
+/**************************/
+/* Return value in flag if no second DIMM then Z-flag is set */
+_is_Second_Dimm_Exist:
+	mov     r13, LR                 /* Save link register */
+
+        mov     r4, #MV_BOARD_DIMM1_I2C_ADDR /* reading from DIMM0            */
+        mov     r7, #DIMM_TYPE_OFFSET
+        bl      _i2cRead                /* result in r7                       */
+
+     	tst     r7, #0x8               /* bit3 is '1' -> DDR 2 */
+        mov     PC, r13
+
+/*******************************************************************************
+* _mvDramIfGetDimmSizeFromSpd  - read bank 0 dram's size
+*
+* DESCRIPTION:
+*       The function will read the bank 0 dram size(SPD version 1.0 and above )  
+*
+* INPUT:
+*       r6 - dram bank number.
+*
+* OUTPUT:
+*	none
+*/
+_mvDramIfGetDimmSizeFromSpd:
+
+	mov     r13, LR                 /* Save link register */
+	
+	/* Read SPD rank size from DIMM0 */
+        mov     r4, #MV_BOARD_DIMM0_I2C_ADDR /* reading from DIMM0            */
+
+	cmp	r6, #0
+	beq	1f
+
+	/* Read SPD rank size from DIMM1 */
+        mov     r4, #MV_BOARD_DIMM1_I2C_ADDR /* reading from DIMM1            */
+
+1:
+        mov     r7, #RANK_SIZE_OFFSET	/* offset  31 */
+        bl      _i2cRead  
+	
+pass_read:
+      	ldr     r8, =(0x7 << SCSR_SIZE_OFFS)
+        cmp	r7, #DRAM_RANK_DENSITY_128M
+        beq     endDimmSize
+
+      	ldr     r8, =(0xf << SCSR_SIZE_OFFS)
+        cmp	r7, #DRAM_RANK_DENSITY_256M
+        beq     endDimmSize
+        
+        ldr     r8, =(0x1f << SCSR_SIZE_OFFS)
+        cmp	r7, #DRAM_RANK_DENSITY_512M
+        beq     endDimmSize
+        
+        ldr     r8, =(0x3f << SCSR_SIZE_OFFS)
+        cmp	r7, #DRAM_RANK_DENSITY_1G
+        beq     endDimmSize
+
+        ldr     r8, =(0x7f  << SCSR_SIZE_OFFS)     /* DRAM_RANK_DENSITY_2G */
+endDimmSize:
+        mov     PC, r13
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.S b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.S
new file mode 100644
index 00000000..88527e58
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.S
@@ -0,0 +1,528 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvDramIfBasicAsm.s
+*
+* DESCRIPTION:
+*       Memory full detection and best timing configuration is done in 
+*       C code. C runtime environment requires a stack. This module API 
+*       initialize DRAM interface chip select 0 for basic functionality for 
+*       the use of stack.
+*       The module API assumes DRAM information is stored in I2C EEPROM reside
+*       in a given I2C address MV_BOARD_DIMM0_I2C_ADDR. The I2C EEPROM 
+*       internal data structure is assumed to be orgenzied in common DRAM 
+*       vendor SPD structure.
+*       NOTE: DFCDL values are assumed to be already initialized prior to 
+*       this module API activity.
+*       
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+/* includes */
+#define	_ASMLANGUAGE
+#define MV_ASMLANGUAGE
+#include "mvOsAsm.h"
+#include "mvSysHwConfig.h"
+#include "mvDramIfRegs.h"
+#include "mvDramIfConfig.h"
+#include "ctrlEnv/sys/mvCpuIfRegs.h"
+#include "pex/mvPexRegs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "mvCommon.h"
+
+/* defines  */
+
+/* locals   */
+.data
+.globl _mvDramIfConfig
+.text
+.globl _mvDramIfMemInit
+
+/*******************************************************************************
+* _mvDramIfConfig - Basic DRAM interface initialization.
+*
+* DESCRIPTION:
+*       The function will initialize the following DRAM parameters using the
+*       values prepared by mvDramIfDetect routine. Values are located
+*       in predefined registers.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+
+_mvDramIfConfig:      
+        
+        /* Save register on stack */
+	cmp	sp, #0
+	beq	no_stack_s
+save_on_stack:
+        stmdb	sp!, {r1, r2, r3, r4}
+no_stack_s:
+
+	/* Dunit FTDLL Configuration Register */
+	/* 0) Write to SDRAM FTDLL coniguration register */
+        ldr     r4, = SDRAM_FTDLL_REG_DEFAULT_LEFT;
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_FTDLL_CONFIG_LEFT_REG)
+        str     r4, [r1]
+        ldr     r4, = SDRAM_FTDLL_REG_DEFAULT_RIGHT;
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_FTDLL_CONFIG_RIGHT_REG)
+        str     r4, [r1]
+        ldr     r4, = SDRAM_FTDLL_REG_DEFAULT_UP;
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_FTDLL_CONFIG_UP_REG)
+        str     r4, [r1]
+
+	/* 1) Write to SDRAM coniguration register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG1)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_CONFIG_REG)
+        str     r4, [r1]
+        
+	/* 2) Write Dunit control low register */ 
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG3)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_DUNIT_CTRL_REG)
+        str     r4, [r1]
+        
+	/* 2) Write Dunit control high register */ 
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG13)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_DUNIT_CTRL_HI_REG)
+        str     r4, [r1]
+        
+        /* 3) Write SDRAM address control register */ 
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG4)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_ADDR_CTRL_REG)
+        str     r4, [r1]
+#if defined(MV_STATIC_DRAM_ON_BOARD)
+        /* 4) Write SDRAM bank 0 size register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG0)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_SIZE_REG(0,0))
+        str     r4, [r1]
+#endif
+                          
+        /* 5) Write SDRAM open pages control register */
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_OPEN_PAGE_CTRL_REG)
+        ldr     r4, =SDRAM_OPEN_PAGES_CTRL_REG_DV
+        str     r4, [r1]
+                          
+        /* 6) Write SDRAM timing Low register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG5)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_TIMING_CTRL_LOW_REG)
+        str     r4, [r1]
+        
+        /* 7) Write SDRAM timing High register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG6)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_TIMING_CTRL_HIGH_REG)
+        str     r4, [r1]
+                
+        /* Config DDR2 On Die Termination (ODT) registers */
+        /* Write SDRAM DDR2 ODT control low register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG7)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + DDR2_SDRAM_ODT_CTRL_LOW_REG)
+        str     r4, [r1]
+        
+        /* Write SDRAM DDR2 ODT control high register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG8)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + DDR2_SDRAM_ODT_CTRL_HIGH_REG)
+        str     r4, [r1]
+        
+        /* Write SDRAM DDR2 Dunit ODT control register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG9)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + DDR2_DUNIT_ODT_CONTROL_REG)
+        str     r4, [r1]
+        
+        /* Write DDR2 SDRAM timing Low register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG11)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_DDR2_TIMING_LO_REG)
+        str     r4, [r1]
+                                   
+        /* Write DDR2 SDRAM timing High register */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG12)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_DDR2_TIMING_HI_REG)
+        str     r4, [r1]
+
+        /* 8) Write SDRAM mode register */ 
+        /* The CPU must not attempt to change the SDRAM Mode register setting */
+        /* prior to DRAM controller completion of the DRAM initialization     */
+        /* sequence. To guarantee this restriction, it is recommended that    */
+        /* the CPU sets the SDRAM Operation register to NOP command, performs */
+        /* read polling until the register is back in Normal operation value, */
+        /* and then sets SDRAM Mode register to its new value.               */
+        
+	/* 8.1 write 'nop' to SDRAM operation */
+        mov     r4, #0x5                 /* 'NOP' command              */
+        MV_REG_WRITE_ASM(r4, r1, SDRAM_OPERATION_REG)
+       
+        /* 8.2 poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll1:        
+        ldr     r4, [r1]
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll1
+
+        /* 8.3 Now its safe to write new value to SDRAM Mode register         */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG2)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_MODE_REG)
+        str     r4, [r1]
+
+        /* 8.4 Make the Dunit write the DRAM its new mode                     */       
+        mov     r4, #0x3                 /* Mode Register Set command  */
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_OPERATION_REG)
+               
+        /* 8.5 poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll2:        
+        ldr     r4, [r1]                     
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll2
+
+        /* Now its safe to write new value to SDRAM Extended Mode regist */
+        ldr     r1, =(INTER_REGS_BASE + DRAM_BUF_REG10)
+        ldr     r4, [r1]
+        ldr     r1, =(INTER_REGS_BASE + SDRAM_EXTENDED_MODE_REG)
+        str     r4, [r1]
+
+        /* 9) Write SDRAM Extended mode register This operation should be     */
+        /*    done for each memory bank                                       */ 
+        /* write 'nop' to SDRAM operation */
+        mov     r4, #0x5                 /* 'NOP' command              */
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_OPERATION_REG)
+       
+        /* poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll3:        
+        ldr     r4, [r1]
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll3
+        /* Go over each of the Banks */
+        ldr     r3, =0          /* r3 = DRAM bank Num */
+
+extModeLoop:        
+        /* Set the SDRAM Operation Control to each of the DRAM banks          */
+        mov     r4, r3   /* Do not swap the bank counter value */
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_OPERATION_CTRL_REG)
+        
+        /* Make the Dunit write the DRAM its new mode                     */       
+        mov     r4, #0x4        /* Extended Mode Register Set command  */
+        MV_REG_WRITE_ASM (r4, r1, SDRAM_OPERATION_REG)
+               
+        /* poll SDRAM operation. Make sure its back to normal operation   */
+_sdramOpPoll4:        
+        ldr     r4, [r1]                     
+        cmp     r4, #0                          /* '0' = Normal SDRAM Mode    */
+        bne     _sdramOpPoll4
+
+        add     r3, r3, #1
+        cmp     r3, #4         /* 4 = Number of banks */
+        bne     extModeLoop
+        
+extModeEnd:	
+cmp	sp, #0
+	beq	no_stack_l
+	mov     r1, LR                        	/* Save link register */
+#if defined(MV78XX0)
+	bl   	_mvDramIfMemInit 
+#endif
+	mov	LR,r1				/* restore link register */
+load_from_stack:
+	/* Restore registers */
+        ldmia	sp!, {r1, r2, r3, r4}
+no_stack_l:
+           
+        mov     pc, lr
+
+
+/*******************************************************************************
+* _mvDramIfEccMemInit - Basic DRAM ECC initialization.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+#define XOR_CHAN0         0   /* XOR channel 0 used for memory initialization */
+#define XOR_UNIT0         0   /* XOR unit 0 used for memory initialization */
+#define XOR_ADDR_DEC_WIN0 0   /* Enable DRAM access using XOR decode window 0 */ 
+/* XOR engine register offsets macros */
+#define XOR_CONFIG_REG(chan)                (XOR_UNIT_BASE(0) + 0x10 + ((chan)    * 4))
+#define XOR_ACTIVATION_REG(chan)            (XOR_UNIT_BASE(0) + 0x20 + ((chan)    * 4))
+#define XOR_CAUSE_REG			            (XOR_UNIT_BASE(0) + 0x30)
+#define XOR_ERROR_CAUSE_REG                 (XOR_UNIT_BASE(0) + 0x50)             
+#define XOR_ERROR_ADDR_REG                  (XOR_UNIT_BASE(0) + 0x60)             
+#define XOR_INIT_VAL_LOW_REG                (XOR_UNIT_BASE(0) + 0x2E0)
+#define XOR_INIT_VAL_HIGH_REG               (XOR_UNIT_BASE(0) + 0x2E4)
+#define XOR_DST_PTR_REG(chan)               (XOR_UNIT_BASE(0) + 0x2B0 + ((chan)    * 4))
+#define XOR_BLOCK_SIZE_REG(chan)            (XOR_UNIT_BASE(0) + 0x2C0 + ((chan)    * 4))
+
+/* XOR Engine Address Decoding Register Map */                  
+#define XOR_WINDOW_CTRL_REG(unit,chan)     (XOR_UNIT_BASE(unit)+(0x240 + ((chan) * 4)))
+#define XOR_BASE_ADDR_REG(unit,winNum)     (XOR_UNIT_BASE(unit)+(0x250 + ((winNum) * 4)))
+#define XOR_SIZE_MASK_REG(unit,winNum)     (XOR_UNIT_BASE(unit)+(0x270 + ((winNum) * 4)))
+
+.globl _mvDramIfEccMemInit
+/*******************************************************************************
+* _mvDramIfEccMemInit  - mem init for dram cs
+*
+* DESCRIPTION:
+*       This function will clean the cs by ussing the XOR mem init.  
+*
+* INPUT:
+*       r0 - dram bank number.
+*
+* OUTPUT:
+*	none
+*/
+_mvDramIfEccMemInit:      
+        
+        /* Save register on stack */
+	cmp	sp, #0
+	beq	no_stack_s1
+save_on_stack1:
+        stmdb	sp!, {r0,r1, r2, r3, r4, r5, r6}
+no_stack_s1:
+
+	ldr	r1, = 0             
+
+        /* Disable all XOR address decode windows to avoid possible overlap */
+        MV_REG_WRITE_ASM (r1, r5, (XOR_WINDOW_CTRL_REG(XOR_UNIT0,XOR_CHAN0)))
+
+        /* Init r5 to first XOR_SIZE_MASK_REG */
+		mov		r5, r0, LSL #3
+        add     r5, r5,#0x1500
+        add     r5, r5,#0x04
+        add     r5, r5,#(INTER_REGS_BASE)
+        ldr     r6, [r5]
+        HTOLL(r6,r5)
+        MV_REG_WRITE_ASM (r6, r5, XOR_SIZE_MASK_REG(XOR_UNIT0,XOR_ADDR_DEC_WIN0))
+       
+	mov		r5, r0, LSL #3
+        add     r5, r5,#0x1500
+        add     r5, r5,#(INTER_REGS_BASE)
+        ldr     r6, [r5]
+        /* Update destination & size */
+        MV_REG_WRITE_ASM(r6, r5, XOR_DST_PTR_REG(XOR_CHAN0))
+        HTOLL(r6,r5)
+        /* Init r6 to first XOR_BASE_ADDR_REG */
+	ldr	r4, = 0xf              
+	ldr	r5, = 0x1
+	mov	r5, r5, LSL r0
+	bic	r4, r4, r5
+	mov 	r4, r4, LSL #8
+
+        orr	r6, r6, r4
+        MV_REG_WRITE_ASM (r6, r5, XOR_BASE_ADDR_REG(XOR_UNIT0,XOR_ADDR_DEC_WIN0))
+        
+	ldr	r6, = 0xff0001              
+        MV_REG_WRITE_ASM (r6, r5, XOR_WINDOW_CTRL_REG(XOR_UNIT0,XOR_CHAN0))        
+
+        /* Configure XOR engine for memory init function.           */
+        MV_REG_READ_ASM (r6, r5, XOR_CONFIG_REG(XOR_CHAN0))
+        and	r6, r6, #~0x7        	/* Clear operation mode field      */
+        orr     r6, r6, #0x4             /* Set operation to memory init    */
+        MV_REG_WRITE_ASM(r6, r5, XOR_CONFIG_REG(XOR_CHAN0))
+               
+        /* Set initVal in the XOR Engine Initial Value Registers       */
+	ldr	r6, = 0xfeedfeed              
+        MV_REG_WRITE_ASM(r6, r5, XOR_INIT_VAL_LOW_REG)
+	ldr	r6, = 0xfeedfeed              
+        MV_REG_WRITE_ASM(r6, r5, XOR_INIT_VAL_HIGH_REG)
+
+        /* Set block size using DRAM bank size  */
+
+	mov	r5, r0, LSL #3
+        add     r5, r5,#0x1500
+        add     r5, r5,#0x04
+        add     r5, r5,#(INTER_REGS_BASE)
+
+        ldr     r6, [r5]
+        HTOLL(r6,r5)
+	and	r6, r6, #SCSR_SIZE_MASK
+	mov	r5, r6, LSR #SCSR_SIZE_OFFS
+        add	r5, r5, #1
+	mov	r6, r5, LSL #SCSR_SIZE_OFFS
+        MV_REG_WRITE_ASM(r6, r5, XOR_BLOCK_SIZE_REG(XOR_CHAN0))
+        
+        /* Clean interrupt cause*/
+        MV_REG_WRITE_ASM(r1, r5, XOR_CAUSE_REG)
+
+        /* Clean error interrupt cause*/
+        MV_REG_READ_ASM(r6, r5, XOR_ERROR_CAUSE_REG)
+        MV_REG_READ_ASM(r6, r5, XOR_ERROR_ADDR_REG)
+
+        /* Start transfer */
+        MV_REG_READ_ASM (r6, r5, XOR_ACTIVATION_REG(XOR_CHAN0))
+        orr     r6, r6, #0x1 /* Preform start command      */
+        MV_REG_WRITE_ASM(r6, r5, XOR_ACTIVATION_REG(XOR_CHAN0))
+
+        /* Wait for engine to finish */
+waitForComplete:        
+        MV_REG_READ_ASM(r6, r5, XOR_CAUSE_REG)
+        and   	r6, r6, #2
+	cmp	r6, #0
+        beq     waitForComplete
+
+        /* Clear all error report registers */
+        MV_REG_WRITE_ASM(r1, r5, SDRAM_SINGLE_BIT_ERR_CNTR_REG)
+        MV_REG_WRITE_ASM(r1, r5, SDRAM_DOUBLE_BIT_ERR_CNTR_REG)
+
+        MV_REG_WRITE_ASM(r1, r5, SDRAM_ERROR_CAUSE_REG)
+
+	cmp	sp, #0
+	beq	no_stack_l1
+load_from_stack1:
+        ldmia	sp!, {r0, r1, r2, r3, r4, r5, r6}
+no_stack_l1:
+        mov     pc, lr
+
+
+/*******************************************************************************
+* mvDramIfMemInit - Use XOR to clear all memory.
+*
+* DESCRIPTION:
+*       Use assembler function _mvDramIfEccMemInit to fill all memory with FEADFEAD pattern.
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+#if defined(MV78XX0)
+
+_mvDramIfMemInit:
+        stmdb	sp!, {r0,r1, r2, r3, r4, r5, r6}
+	mov     r6, LR                 /* Save link register */
+    	/* Check if dram bank 0 has to be init for ECC */
+	MV_REG_READ_ASM (r0, r5, SDRAM_SIZE_REG(0,0))
+	and 	r3, r0, #SCSR_WIN_EN
+        cmp     r3, #0 
+	beq   	no_bank_0
+	MV_REG_READ_ASM(r0, r5,  SDRAM_BASE_ADDR_REG(0,0))
+        cmp     r0, #0 
+	beq   	no_bank_0
+	mov	r0,#0
+	bl	_mvDramIfEccMemInit
+
+no_bank_0:
+    	/* Check if dram bank 1 has to be init for ECC */
+        MV_REG_READ_ASM (r0, r5, SDRAM_SIZE_REG(0,1))
+	and 	r0, r0, #SCSR_WIN_EN
+        cmp     r0, #0 
+	beq   	no_bank_1
+	mov	r0,#1
+	bl	_mvDramIfEccMemInit
+no_bank_1:
+    	/* Check if dram bank 2 has to be init for ECC */
+    	MV_REG_READ_ASM (r0, r5, SDRAM_SIZE_REG(0,2))
+	and 	r0, r0, #SCSR_WIN_EN
+        cmp     r0, #0 
+	beq   	no_bank_2
+	MV_REG_READ_ASM(r0, r5,  SDRAM_BASE_ADDR_REG(0,2))
+        cmp     r0, #0 
+	beq   	no_bank_2
+	mov	r0,#2
+	bl	_mvDramIfEccMemInit
+
+no_bank_2:
+    	/* Check if dram bank 3 has to be init for ECC */
+	MV_REG_READ_ASM (r0, r5, SDRAM_SIZE_REG(0,3))
+	and 	r0, r0, #SCSR_WIN_EN
+	cmp     r0, #0 
+	beq   	no_bank_3
+	mov	r0,#3
+	bl	_mvDramIfEccMemInit
+no_bank_3:
+	mov     LR ,r6                /* restore link register */
+	ldmia	sp!, {r0, r1, r2, r3, r4, r5, r6}
+	mov     pc, lr
+#endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h
new file mode 100644
index 00000000..6141c46a
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h
@@ -0,0 +1,157 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvDramIfConfigh
+#define __INCmvDramIfConfigh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* includes */
+
+/* defines  */
+
+/* registers defaults values */
+
+#define SDRAM_CONFIG_DV 	(SDRAM_SRMODE_DRAM | BIT25 | BIT30)
+
+#define SDRAM_DUNIT_CTRL_LOW_DDR2_DV			\
+		(SDRAM_SRCLK_KEPT		|	\
+		 SDRAM_CLK1DRV_NORMAL		|	\
+		 (BIT28 | BIT29))
+
+#define SDRAM_ADDR_CTRL_DV	    2
+		
+#define SDRAM_TIMING_CTRL_LOW_REG_DV 	\
+		((0x2 << SDRAM_TRCD_OFFS) | 	\
+		 (0x2 << SDRAM_TRP_OFFS)  | 	\
+		 (0x1 << SDRAM_TWR_OFFS)  | 	\
+		 (0x0 << SDRAM_TWTR_OFFS) | 	\
+		 (0x5 << SDRAM_TRAS_OFFS) | 	\
+		 (0x1 << SDRAM_TRRD_OFFS))
+
+/* Note: value of 0 in register means one cycle, 1 means two and so on  */
+#define SDRAM_TIMING_CTRL_HIGH_REG_DV 	\
+		((0x0 << SDRAM_TR2R_OFFS)	|	\
+		 (0x0 << SDRAM_TR2W_W2R_OFFS)	|	\
+		 (0x1 << SDRAM_TW2W_OFFS))
+
+#define SDRAM_OPEN_PAGES_CTRL_REG_DV 	SDRAM_OPEN_PAGE_EN	
+
+/* Presence	     Ctrl Low    Ctrl High  Dunit Ctrl   Ext Mode     */
+/* CS0              0x84210000  0x00000000  0x0000780F  0x00000440    */
+/* CS0+CS1          0x84210000  0x00000000  0x0000780F  0x00000440    */
+/* CS0+CS2          0x030C030C  0x00000000  0x0000740F  0x00000404    */
+/* CS0+CS1+CS2      0x030C030C  0x00000000  0x0000740F  0x00000404    */
+/* CS0+CS2+CS3      0x030C030C  0x00000000  0x0000740F  0x00000404    */
+/* CS0+CS1+CS2+CS3  0x030C030C  0x00000000  0x0000740F  0x00000404    */
+
+#define DDR2_ODT_CTRL_LOW_CS0_CS1_DV		0x84210000
+#define DDR2_ODT_CTRL_HIGH_CS0_CS1_DV		0x00000000
+#define DDR2_DUNIT_ODT_CTRL_CS0_CS1_DV		0x0000E80F
+#ifdef MV78XX0
+#define DDR_SDRAM_EXT_MODE_CS0_CS1_DV		0x00000040
+#else
+#define DDR_SDRAM_EXT_MODE_CS0_CS1_DV		0x00000440
+#endif
+
+#define DDR2_ODT_CTRL_LOW_CS0_CS1_CS2_CS3_DV	0x030C030C
+#define DDR2_ODT_CTRL_HIGH_CS0_CS1_CS2_CS3_DV	0x00000000
+#define DDR2_DUNIT_ODT_CTRL_CS0_CS1_CS2_CS3_DV	0x0000F40F
+#ifdef MV78XX0
+#define DDR_SDRAM_EXT_MODE_CS0_CS1_CS2_CS3_DV	0x00000004
+#define DDR_SDRAM_EXT_MODE_FAST_CS0_CS1_CS2_CS3_DV	0x00000044
+#else
+#define DDR_SDRAM_EXT_MODE_CS0_CS1_CS2_CS3_DV	0x00000404
+#define DDR_SDRAM_EXT_MODE_FAST_CS0_CS1_CS2_CS3_DV	0x00000444
+#endif
+
+/* DDR SDRAM Adderss/Control and Data Pads Calibration default values */
+#define DDR2_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV	\
+		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+		
+#define DDR2_DATA_PAD_STRENGTH_TYPICAL_DV		\
+		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+
+/* DDR SDRAM Mode Register default value */
+#define DDR2_MODE_REG_DV		(SDRAM_BURST_LEN_4 | SDRAM_WR_3_CYC)
+/* DDR SDRAM Timing parameter default values */
+#define SDRAM_TIMING_CTRL_LOW_REG_DEFAULT  	0x33136552
+#define SDRAM_TRFC_DEFAULT_VALUE		0x34
+#define SDRAM_TRFC_DEFAULT		SDRAM_TRFC_DEFAULT_VALUE
+#define SDRAM_TW2W_DEFALT		(0x1 << SDRAM_TW2W_OFFS)
+
+#define SDRAM_TIMING_CTRL_HIGH_REG_DEFAULT  (SDRAM_TRFC_DEFAULT | SDRAM_TW2W_DEFALT)
+
+#define SDRAM_FTDLL_REG_DEFAULT_LEFT  		0x88C800
+#define SDRAM_FTDLL_REG_DEFAULT_RIGHT  		0x88C800
+#define SDRAM_FTDLL_REG_DEFAULT_UP  		0x88C800
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvDramIfh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h
new file mode 100644
index 00000000..369eda69
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h
@@ -0,0 +1,423 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvDramIfRegsh
+#define __INCmvDramIfRegsh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* DDR SDRAM Controller Address Decode Registers */
+ /* SDRAM CSn Base Address Register (SCBAR) */
+#define SDRAM_BASE_ADDR_REG(cpu,csNum)	(0x1500 + ((csNum) * 8) + ((cpu) * 0x70))
+#define SCBAR_BASE_OFFS			16 
+#define SCBAR_BASE_MASK			(0xffff << SCBAR_BASE_OFFS)
+#define SCBAR_BASE_ALIGNMENT		0x10000 
+
+/* SDRAM CSn Size Register (SCSR) */		  
+#define SDRAM_SIZE_REG(cpu,csNum)	(0x1504 + ((csNum) * 8) + ((cpu) * 0x70)) 
+#define SCSR_SIZE_OFFS			24
+#define SCSR_SIZE_MASK			(0xff << SCSR_SIZE_OFFS)
+#define SCSR_SIZE_ALIGNMENT		0x1000000
+#define SCSR_WIN_EN			BIT0
+
+/* configuration register */
+#define SDRAM_CONFIG_REG   		(DRAM_BASE + 0x1400)
+#define SDRAM_REFRESH_OFFS 		0
+#define SDRAM_REFRESH_MAX  		0x3FFF
+#define SDRAM_REFRESH_MASK 		(SDRAM_REFRESH_MAX << SDRAM_REFRESH_OFFS)
+#define SDRAM_DWIDTH_OFFS       	15
+#define SDRAM_DWIDTH_MASK       	(1 << SDRAM_DWIDTH_OFFS)
+#define SDRAM_DWIDTH_32BIT      	(0 << SDRAM_DWIDTH_OFFS)
+#define SDRAM_DWIDTH_64BIT      	(1 << SDRAM_DWIDTH_OFFS)
+#define SDRAM_REGISTERED   		(1 << 17)
+#define SDRAM_ECC_OFFS    		18
+#define SDRAM_ECC_MASK    		(1 << SDRAM_ECC_OFFS)
+#define SDRAM_ECC_DIS     		(0 << SDRAM_ECC_OFFS)
+#define SDRAM_ECC_EN        		(1 << SDRAM_ECC_OFFS)
+#define SDRAM_IERR_OFFS    		19
+#define SDRAM_IERR_MASK    		(1 << SDRAM_IERR_OFFS)
+#define SDRAM_IERR_REPORTE     		(0 << SDRAM_IERR_OFFS)
+#define SDRAM_IERR_IGNORE      		(1 << SDRAM_IERR_OFFS)
+#define SDRAM_SRMODE_OFFS       	24
+#define SDRAM_SRMODE_MASK       	(1 << SDRAM_SRMODE_OFFS)
+#define SDRAM_SRMODE_POWER      	(0 << SDRAM_SRMODE_OFFS)
+#define SDRAM_SRMODE_DRAM       	(1 << SDRAM_SRMODE_OFFS)
+
+/* dunit control low register */
+#define SDRAM_DUNIT_CTRL_REG  		(DRAM_BASE + 0x1404)
+#define SDRAM_2T_OFFS			4
+#define SDRAM_2T_MASK			(1 << SDRAM_2T_OFFS)
+#define SDRAM_2T_MODE			(1 << SDRAM_2T_OFFS)
+
+#define SDRAM_SRCLK_OFFS		5
+#define SDRAM_SRCLK_MASK		(1 << SDRAM_SRCLK_OFFS)
+#define SDRAM_SRCLK_KEPT		(0 << SDRAM_SRCLK_OFFS)
+#define SDRAM_SRCLK_GATED		(1 << SDRAM_SRCLK_OFFS)
+#define SDRAM_CTRL_POS_OFFS	   	6
+#define SDRAM_CTRL_POS_MASK		(1 << SDRAM_CTRL_POS_OFFS)
+#define SDRAM_CTRL_POS_FALL	   	(0 << SDRAM_CTRL_POS_OFFS)
+#define SDRAM_CTRL_POS_RISE	   	(1 << SDRAM_CTRL_POS_OFFS)
+#define SDRAM_CLK1DRV_OFFS      	12
+#define SDRAM_CLK1DRV_MASK      	(1 << SDRAM_CLK1DRV_OFFS)
+#define SDRAM_CLK1DRV_HIGH_Z    	(0 << SDRAM_CLK1DRV_OFFS)
+#define SDRAM_CLK1DRV_NORMAL    	(1 << SDRAM_CLK1DRV_OFFS)
+#define SDRAM_CLK2DRV_OFFS      	13
+#define SDRAM_CLK2DRV_MASK      	(1 << SDRAM_CLK2DRV_OFFS)
+#define SDRAM_CLK2DRV_HIGH_Z    	(0 << SDRAM_CLK2DRV_OFFS)
+#define SDRAM_CLK2DRV_NORMAL    	(1 << SDRAM_CLK2DRV_OFFS)
+#define SDRAM_SB_OUT_DEL_OFFS 		20
+#define SDRAM_SB_OUT_DEL_MAX 		0xf
+#define SDRAM_SB_OUT_MASK 		(SDRAM_SB_OUT_DEL_MAX<<SDRAM_SB_OUT_DEL_OFFS)
+#define SDRAM_SB_IN_DEL_OFFS 		24
+#define SDRAM_SB_IN_DEL_MAX 		0xf
+#define SDRAM_SB_IN_MASK 		(SDRAM_SB_IN_DEL_MAX<<SDRAM_SB_IN_DEL_OFFS)
+
+/* dunit control hight register */
+#define SDRAM_DUNIT_CTRL_HI_REG  	(DRAM_BASE + 0x1424)
+#define SDRAM__D2P_OFFS			7
+#define SDRAM__D2P_EN			(1 << SDRAM__D2P_OFFS)
+#define SDRAM__P2D_OFFS			8
+#define SDRAM__P2D_EN			(1 << SDRAM__P2D_OFFS)
+#define SDRAM__ADD_HALF_FCC_OFFS	9
+#define SDRAM__ADD_HALF_FCC_EN		(1 << SDRAM__ADD_HALF_FCC_OFFS)
+#define SDRAM__PUP_ZERO_SKEW_OFFS	10
+#define SDRAM__PUP_ZERO_SKEW_EN		(1 << SDRAM__PUP_ZERO_SKEW_OFFS)
+#define SDRAM__WR_MESH_DELAY_OFFS	11
+#define SDRAM__WR_MESH_DELAY_EN		(1 << SDRAM__WR_MESH_DELAY_OFFS)
+
+/* sdram timing control low register */
+#define SDRAM_TIMING_CTRL_LOW_REG	(DRAM_BASE + 0x1408)
+#define SDRAM_TRCD_OFFS 		4
+#define SDRAM_TRCD_MASK 		(0xF << SDRAM_TRCD_OFFS)
+#define SDRAM_TRP_OFFS 			8
+#define SDRAM_TRP_MASK 			(0xF << SDRAM_TRP_OFFS)
+#define SDRAM_TWR_OFFS 			12
+#define SDRAM_TWR_MASK 			(0xF << SDRAM_TWR_OFFS)
+#define SDRAM_TWTR_OFFS 		16
+#define SDRAM_TWTR_MASK 		(0xF << SDRAM_TWTR_OFFS)
+#define SDRAM_TRAS_OFFS 		0
+#define SDRAM_TRAS_MASK 		(0xF << SDRAM_TRAS_OFFS)
+#define SDRAM_EXT_TRAS_OFFS 		20
+#define SDRAM_EXT_TRAS_MASK 		(0x1 << SDRAM_EXT_TRAS_OFFS)
+#define SDRAM_TRRD_OFFS 		24
+#define SDRAM_TRRD_MASK 		(0xF << SDRAM_TRRD_OFFS)
+#define SDRAM_TRTP_OFFS			28
+#define SDRAM_TRTP_MASK			(0xF << SDRAM_TRTP_OFFS)
+#define SDRAM_TRTP_DDR1 		(0x1 << SDRAM_TRTP_OFFS)
+
+/* sdram timing control high register */
+#define SDRAM_TIMING_CTRL_HIGH_REG	(DRAM_BASE + 0x140c)
+#define SDRAM_TRFC_OFFS 		0
+#define SDRAM_TRFC_MASK 		(0x3F << SDRAM_TRFC_OFFS)
+#define SDRAM_TR2R_OFFS 		7
+#define SDRAM_TR2R_MASK 		(0x3 << SDRAM_TR2R_OFFS)
+#define SDRAM_TR2W_W2R_OFFS		9
+#define SDRAM_TR2W_W2R_MASK		(0x3 << SDRAM_TR2W_W2R_OFFS)
+#define SDRAM_TW2W_OFFS			11
+#define SDRAM_TW2W_MASK			(0x3 << SDRAM_TW2W_OFFS)
+
+/* sdram DDR2 timing low register (SD2TLR) */
+#define SDRAM_DDR2_TIMING_LO_REG	(DRAM_BASE + 0x1428)
+#define SD2TLR_TODT_ON_RD_OFFS		4
+#define SD2TLR_TODT_ON_RD_MASK		(0xF << SD2TLR_TODT_ON_RD_OFFS)
+#define SD2TLR_TODT_OFF_RD_OFFS		8
+#define SD2TLR_TODT_OFF_RD_MASK		(0xF << SD2TLR_TODT_OFF_RD_OFFS)
+#define SD2TLR_TODT_ON_CTRL_RD_OFFS	12
+#define SD2TLR_TODT_ON_CTRL_RD_MASK	(0xF << SD2TLR_TODT_ON_CTRL_RD_OFFS)
+#define SD2TLR_TODT_OFF_CTRL_RD_OFFS	16
+#define SD2TLR_TODT_OFF_CTRL_RD_MASK	(0xF << SD2TLR_TODT_OFF_CTRL_RD_OFFS)
+
+/* sdram DDR2 timing high register (SD2TLR) */
+#define SDRAM_DDR2_TIMING_HI_REG	(DRAM_BASE + 0x147C)
+#define SD2THR_TODT_ON_WR_OFFS		0
+#define SD2THR_TODT_ON_WR_MASK		(0xF << SD2THR_TODT_ON_WR_OFFS)
+#define SD2THR_TODT_OFF_WR_OFFS		4
+#define SD2THR_TODT_OFF_WR_MASK		(0xF << SD2THR_TODT_OFF_WR_OFFS)
+#define SD2THR_TODT_ON_CTRL_WR_OFFS	8
+#define SD2THR_TODT_ON_CTRL_WR_MASK	(0xF << SD2THR_TODT_ON_CTRL_WR_OFFS)
+#define SD2THR_TODT_OFF_CTRL_WR_OFFS	12
+#define SD2THR_TODT_OFF_CTRL_WR_MASK	(0xF << SD2THR_TODT_OFF_CTRL_WR_OFFS)
+
+/* address control register */
+#define SDRAM_ADDR_CTRL_REG		(DRAM_BASE + 0x1410)
+#define SDRAM_ADDRSEL_OFFS(cs)		(4 * (cs))
+#define SDRAM_ADDRSEL_MASK(cs)		(0x3 << SDRAM_ADDRSEL_OFFS(cs))
+#define SDRAM_ADDRSEL_X8(cs)		(0x0 << SDRAM_ADDRSEL_OFFS(cs))
+#define SDRAM_ADDRSEL_X16(cs)		(0x1 << SDRAM_ADDRSEL_OFFS(cs))
+#define SDRAM_DSIZE_OFFS(cs)   	    	(2 + 4 * (cs))
+#define SDRAM_DSIZE_MASK(cs)   	    	(0x3 << SDRAM_DSIZE_OFFS(cs))
+#define SDRAM_DSIZE_256Mb(cs) 	    	(0x1 << SDRAM_DSIZE_OFFS(cs))
+#define SDRAM_DSIZE_512Mb(cs)  	    	(0x2 << SDRAM_DSIZE_OFFS(cs))
+#define SDRAM_DSIZE_1Gb(cs)  	    	(0x3 << SDRAM_DSIZE_OFFS(cs))
+#define SDRAM_DSIZE_2Gb(cs)  	    	(0x0 << SDRAM_DSIZE_OFFS(cs))
+
+/* SDRAM Open Pages Control registers */
+#define SDRAM_OPEN_PAGE_CTRL_REG	(DRAM_BASE + 0x1414)
+#define SDRAM_OPEN_PAGE_EN			(0 << 0)
+#define SDRAM_OPEN_PAGE_DIS			(1 << 0)
+
+/* sdram opertion register */
+#define SDRAM_OPERATION_REG 		(DRAM_BASE + 0x1418)
+#define SDRAM_CMD_OFFS  			0
+#define SDRAM_CMD_MASK   			(0xF << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_NORMAL 			(0x0 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_PRECHARGE_ALL 	(0x1 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_REFRESH_ALL 		(0x2 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_REG_SET_CMD 		(0x3 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_EXT_MODE_SET 		(0x4 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_NOP 				(0x5 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_SLF_RFRSH 		(0x7 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_EMRS2_CMD  		(0x8 << SDRAM_CMD_OFFS)
+#define SDRAM_CMD_EMRS3_CMD  		(0x9 << SDRAM_CMD_OFFS)
+
+/* sdram mode register */
+#define SDRAM_MODE_REG 				(DRAM_BASE + 0x141c)
+#define SDRAM_BURST_LEN_OFFS 		0
+#define SDRAM_BURST_LEN_MASK 		(0x7 << SDRAM_BURST_LEN_OFFS)
+#define SDRAM_BURST_LEN_4    		(0x2 << SDRAM_BURST_LEN_OFFS)
+#define SDRAM_CL_OFFS   			4
+#define SDRAM_CL_MASK   			(0x7 << SDRAM_CL_OFFS)
+#define SDRAM_DDR2_CL_3      		(0x3 << SDRAM_CL_OFFS)
+#define SDRAM_DDR2_CL_4      		(0x4 << SDRAM_CL_OFFS)
+#define SDRAM_DDR2_CL_5    		    (0x5 << SDRAM_CL_OFFS)
+#define SDRAM_DDR2_CL_6    		    (0x6 << SDRAM_CL_OFFS)
+
+#define SDRAM_TM_OFFS           	7
+#define SDRAM_TM_MASK           	(1 << SDRAM_TM_OFFS)
+#define SDRAM_TM_NORMAL         	(0 << SDRAM_TM_OFFS)
+#define SDRAM_TM_TEST_MODE      	(1 << SDRAM_TM_OFFS)
+#define SDRAM_DLL_OFFS         		8
+#define SDRAM_DLL_MASK          	(1 << SDRAM_DLL_OFFS)
+#define SDRAM_DLL_NORMAL        	(0 << SDRAM_DLL_OFFS)
+#define SDRAM_DLL_RESET 			(1 << SDRAM_DLL_OFFS)
+#define SDRAM_WR_OFFS				9
+#define SDRAM_WR_MAX				7
+#define SDRAM_WR_MASK				(SDRAM_WR_MAX << SDRAM_WR_OFFS)
+#define SDRAM_WR_2_CYC				(1 << SDRAM_WR_OFFS)
+#define SDRAM_WR_3_CYC				(2 << SDRAM_WR_OFFS)
+#define SDRAM_WR_4_CYC				(3 << SDRAM_WR_OFFS)
+#define SDRAM_WR_5_CYC				(4 << SDRAM_WR_OFFS)
+#define SDRAM_WR_6_CYC				(5 << SDRAM_WR_OFFS)
+#define SDRAM_PD_OFFS				12
+#define SDRAM_PD_MASK				(1 << SDRAM_PD_OFFS) 
+#define SDRAM_PD_FAST_EXIT			(0 << SDRAM_PD_OFFS) 
+#define SDRAM_PD_SLOW_EXIT			(1 << SDRAM_PD_OFFS) 
+
+/* DDR SDRAM Extended Mode register (DSEMR) */
+#define SDRAM_EXTENDED_MODE_REG		(DRAM_BASE + 0x1420)
+#define DSEMR_DLL_ENABLE			0
+#define DSEMR_DLL_DISABLE			1
+#define DSEMR_DS_OFFS				1
+#define DSEMR_DS_MASK				(1 << DSEMR_DS_OFFS)
+#define DSEMR_DS_NORMAL				(0 << DSEMR_DS_OFFS)
+#define DSEMR_DS_REDUCED			(1 << DSEMR_DS_OFFS)
+#define DSEMR_QOFF_OUTPUT_BUFF_EN	(0 << 12)
+#define DSEMR_RTT0_OFFS				2
+#define DSEMR_RTT1_OFFS				6
+#define DSEMR_RTT_ODT_DISABLE		((0 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
+#define DSEMR_RTT_ODT_75_OHM		((1 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
+#define DSEMR_RTT_ODT_150_OHM		((0 << DSEMR_RTT0_OFFS)||(1 << DSEMR_RTT1_OFFS))
+#define DSEMR_RTT_ODT_50_OHM		((1 << DSEMR_RTT0_OFFS)||(1 << DSEMR_RTT1_OFFS))
+#define DSEMR_DQS_OFFS				10
+#define DSEMR_DQS_MASK				(1 << DSEMR_DQS_OFFS)
+#define DSEMR_DQS_DIFFERENTIAL		(0 << DSEMR_DQS_OFFS)
+#define DSEMR_DQS_SINGLE_ENDED		(1 << DSEMR_DQS_OFFS)
+#define DSEMR_RDQS_ENABLE			(1 << 11)
+#define DSEMR_QOFF_OUTPUT_BUFF_EN	(0 << 12)
+#define DSEMR_QOFF_OUTPUT_BUFF_DIS	(1 << 12)
+
+/* DDR SDRAM Operation Control Register */
+#define SDRAM_OPERATION_CTRL_REG	(DRAM_BASE + 0x142c)
+
+/* Dunit FTDLL Configuration Register */
+#define SDRAM_FTDLL_CONFIG_LEFT_REG		(DRAM_BASE + 0x1484)
+#define SDRAM_FTDLL_CONFIG_RIGHT_REG		(DRAM_BASE + 0x161C)
+#define SDRAM_FTDLL_CONFIG_UP_REG		(DRAM_BASE + 0x1620)
+  
+/* Pads Calibration register */
+#define SDRAM_ADDR_CTRL_PADS_CAL_REG	(DRAM_BASE + 0x14c0)
+#define SDRAM_DATA_PADS_CAL_REG		    (DRAM_BASE + 0x14c4)
+#define SDRAM_DRVN_OFFS 			0
+#define SDRAM_DRVN_MASK 			(0x3F << SDRAM_DRVN_OFFS)
+#define SDRAM_DRVP_OFFS 			6
+#define SDRAM_DRVP_MASK 			(0x3F << SDRAM_DRVP_OFFS)
+#define SDRAM_PRE_DRIVER_STRENGTH_OFFS		12
+#define SDRAM_PRE_DRIVER_STRENGTH_MASK		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
+#define SDRAM_TUNE_EN   		BIT16
+#define SDRAM_LOCKN_OFFS 			17
+#define SDRAM_LOCKN_MAKS 			(0x3F << SDRAM_LOCKN_OFFS)
+#define SDRAM_LOCKP_OFFS 			23
+#define SDRAM_LOCKP_MAKS 			(0x3F << SDRAM_LOCKP_OFFS)
+#define SDRAM_WR_EN     			(1 << 31)
+
+/* DDR2 SDRAM ODT Control (Low) Register (DSOCLR) */
+#define DDR2_SDRAM_ODT_CTRL_LOW_REG (DRAM_BASE + 0x1494)
+#define DSOCLR_ODT_RD_OFFS(odtNum)  (odtNum * 4)
+#define DSOCLR_ODT_RD_MASK(odtNum)  (0xf << DSOCLR_ODT_RD_OFFS(odtNum))
+#define DSOCLR_ODT_RD(odtNum, bank) ((1 << bank) << DSOCLR_ODT_RD_OFFS(odtNum))
+#define DSOCLR_ODT_WR_OFFS(odtNum)  (16 + (odtNum * 4))
+#define DSOCLR_ODT_WR_MASK(odtNum)  (0xf << DSOCLR_ODT_WR_OFFS(odtNum))
+#define DSOCLR_ODT_WR(odtNum, bank) ((1 << bank) << DSOCLR_ODT_WR_OFFS(odtNum))
+
+/* DDR2 SDRAM ODT Control (High) Register (DSOCHR) */
+#define DDR2_SDRAM_ODT_CTRL_HIGH_REG    	(DRAM_BASE + 0x1498)
+/* Optional control values to DSOCHR_ODT_EN macro */
+#define DDR2_ODT_CTRL_DUNIT         0
+#define DDR2_ODT_CTRL_NEVER         1
+#define DDR2_ODT_CTRL_ALWAYS        3
+#define DSOCHR_ODT_EN_OFFS(odtNum)  (odtNum * 2)
+#define DSOCHR_ODT_EN_MASK(odtNum)  (0x3 << DSOCHR_ODT_EN_OFFS(odtNum))
+#define DSOCHR_ODT_EN(odtNum, ctrl) (ctrl << DSOCHR_ODT_EN_OFFS(odtNum))
+
+/* DDR2 Dunit ODT Control Register (DDOCR)*/
+#define DDR2_DUNIT_ODT_CONTROL_REG  (DRAM_BASE + 0x149c)
+#define DDOCR_ODT_RD_OFFS          	0
+#define DDOCR_ODT_RD_MASK           (0xf << DDOCR_ODT_RD_OFFS)
+#define DDOCR_ODT_RD(bank)          ((1 << bank) << DDOCR_ODT_RD_OFFS)
+#define DDOCR_ODT_WR_OFFS           4
+#define DDOCR_ODT_WR_MASK           (0xf << DDOCR_ODT_WR_OFFS)
+#define DDOCR_ODT_WR(bank)          ((1 << bank) << DDOCR_ODT_WR_OFFS)
+#define DSOCR_ODT_EN_OFFS           8
+#define DSOCR_ODT_EN_MASK           (0x3 << DSOCR_ODT_EN_OFFS)
+/* For ctrl parameters see DDR2 SDRAM ODT Control (High) Register (0x1498) above. */
+#define DSOCR_ODT_EN(ctrl)         	(ctrl << DSOCR_ODT_EN_OFFS)
+#define DSOCR_ODT_SEL_DISABLE	    0	
+#define DSOCR_ODT_SEL_75_OHM	    2	
+#define DSOCR_ODT_SEL_150_OHM	    1
+#define DSOCR_ODT_SEL_50_OHM        3
+#define DSOCR_DQ_ODT_SEL_OFFS       10
+#define DSOCR_DQ_ODT_SEL_MASK       (0x3 << DSOCR_DQ_ODT_SEL_OFFS)
+#define DSOCR_DQ_ODT_SEL(odtSel)    (odtSel << DSOCR_DQ_ODT_SEL_OFFS)
+#define DSOCR_ST_ODT_SEL_OFFS       12
+#define DSOCR_ST_ODT_SEL_MASK       (0x3 << DSOCR_ST_ODT_SEL_OFFS)
+#define DSOCR_ST_ODT_SEL(odtSel)    (odtSel << DSOCR_ST_ODT_SEL_OFFS)
+#define DSOCR_ST_ODT_EN             (1 << 14)
+
+/* DDR SDRAM Initialization Control Register (DSICR) */
+#define DDR_SDRAM_INIT_CTRL_REG	    (DRAM_BASE + 0x1480)
+#define DSICR_INIT_EN		    	(1 << 0)
+#define DSICR_T200_SET		    	(1 << 8)
+
+/* sdram extended mode2 register (SEM2R) */
+#define SDRAM_EXTENDED_MODE2_REG	(DRAM_BASE + 0x148C)
+#define SEM2R_EMRS2_DDR2_OFFS		0
+#define SEM2R_EMRS2_DDR2_MASK		(0x7FFF << SEM2R_EMRS2_DDR2_OFFS)
+
+/* sdram extended mode3 register (SEM3R) */
+#define SDRAM_EXTENDED_MODE3_REG	(DRAM_BASE + 0x1490)
+#define SEM3R_EMRS3_DDR2_OFFS		0
+#define SEM3R_EMRS3_DDR2_MASK		(0x7FFF << SEM3R_EMRS3_DDR2_OFFS)
+
+/* sdram error registers */
+#define SDRAM_ERROR_CAUSE_REG               	(DRAM_BASE + 0x14d0)
+#define SDRAM_ERROR_MASK_REG                	(DRAM_BASE + 0x14d4)
+#define SDRAM_ERROR_DATA_LOW_REG            	(DRAM_BASE + 0x1444)
+#define SDRAM_ERROR_DATA_HIGH_REG           	(DRAM_BASE + 0x1440)
+#define SDRAM_ERROR_ADDR_REG                	(DRAM_BASE + 0x1450)
+#define SDRAM_ERROR_ECC_REG                 	(DRAM_BASE + 0x1448)
+#define SDRAM_CALC_ECC_REG                  	(DRAM_BASE + 0x144c)
+#define SDRAM_ECC_CONTROL_REG               	(DRAM_BASE + 0x1454)
+#define SDRAM_SINGLE_BIT_ERR_CNTR_REG 		(DRAM_BASE + 0x1458)
+#define SDRAM_DOUBLE_BIT_ERR_CNTR_REG 		(DRAM_BASE + 0x145c)
+
+/* SDRAM Error Cause Register (SECR) */
+#define SECR_SINGLE_BIT_ERR			BIT0
+#define SECR_DOUBLE_BIT_ERR			BIT1
+#define SECR_DATA_PATH_PARITY_ERR	BIT2
+/* SDRAM Error Address Register (SEAR) */
+#define SEAR_ERR_TYPE_OFFS			0
+#define SEAR_ERR_TYPE_MASK      	(1 << SEAR_ERR_TYPE_OFFS)
+#define SEAR_ERR_TYPE_SINGLE    	0	
+#define SEAR_ERR_TYPE_DOUBLE    	(1 << SEAR_ERR_TYPE_OFFS)
+#define SEAR_ERR_CS_OFFS			1
+#define SEAR_ERR_CS_MASK			(3 << SEAR_ERR_CS_OFFS)
+#define SEAR_ERR_CS(csNum)			(csNum << SEAR_ERR_CS_OFFS)
+#define SEAR_ERR_ADDR_OFFS      	3
+#define SEAR_ERR_ADDR_MASK      	(0x1FFFFFFF << SEAR_ERR_ADDR_OFFS)
+
+/* SDRAM ECC Control Register (SECR) */
+#define SECR_FORCEECC_OFFS          0
+#define SECR_FORCEECC_MASK          (0xFF << SECR_FORCEECC_OFFS)
+#define SECR_FORCEEN_OFFS           8
+#define SECR_FORCEEN_MASK           (1 << SECR_FORCEEN_OFFS)
+#define SECR_ECC_CALC_MASK          (0 << SECR_FORCEEN_OFFS)
+#define SECR_ECC_USER_MASK          (1 << SECR_FORCEEN_OFFS)
+#define SECR_PERRPROP_EN            BIT9
+#define SECR_CNTMODE_OFFS           10
+#define SECR_CNTMODE_MASK           (1 << SECR_CNTMODE_OFFS)
+#define SECR_ALL_IN_CS0             (0 << SECR_CNTMODE_OFFS)
+#define SECR_NORMAL_COUNTER         (1 << SECR_CNTMODE_OFFS)
+#define SECR_THRECC_OFFS            16
+#define SECR_THRECC_MAX             0xFF
+#define SECR_THRECC_MASK            (SECR_THRECC_MAX << SECR_THRECC_OFFS)
+#define SECR_THRECC(threshold)      (threshold << SECR_THRECC_OFFS)
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvDramIfRegsh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h
new file mode 100644
index 00000000..f3bf83b4
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h
@@ -0,0 +1,179 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvDramIfStaticInith
+#define __INCmvDramIfStaticInith
+
+#ifdef MV_STATIC_DRAM_ON_BOARD
+#define STATIC_DRAM_BANK_1
+#undef	STATIC_DRAM_BANK_2             
+#undef	STATIC_DRAM_BANK_3                         
+#undef 	STATIC_DRAM_BANK_4             
+
+
+#ifdef MV_DIMM_TS256MLQ72V5U
+#define	STATIC_DRAM_BANK_2             
+#define	STATIC_DRAM_BANK_3                         
+#undef 	STATIC_DRAM_BANK_4             
+
+#define STATIC_SDRAM_CONFIG_REG		    0x4724481A  /* offset 0x1400 - DMA reg-0xf1000814 */ 
+#define STATIC_SDRAM_DUNIT_CTRL_REG         0x37707450  /* offset 0x1404 - DMA reg-0xf100081c */ 
+#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    0x11A13330  /* offset 0x1408 - DMA reg-0xf1000824 */ 
+#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG   0x00000601  /* offset 0x140c - DMA reg-0xf1000828 */ 
+#define STATIC_SDRAM_ADDR_CTRL_REG          0x00001CB2  /* offset 0x1410 - DMA reg-0xf1000820 */ 
+#define STATIC_SDRAM_MODE_REG               0x00000642  /* offset 0x141c - DMA reg-0xf1000818 */ 
+#define STATIC_SDRAM_ODT_CTRL_LOW	    0x030C030C /*   0x1494  */  
+#define STATIC_SDRAM_ODT_CTRL_HI	    0x00000000 /*   0x1498  */  
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    	    0x0000740F /*   0x149c  */  
+#define STATIC_SDRAM_EXT_MODE          	    0x00000404 /*   0x1420  */  
+#define STATIC_SDRAM_DDR2_TIMING_LO         0x00074410 /*   0x1428  */  
+#define STATIC_SDRAM_DDR2_TIMING_HI         0x00007441 /*   0x147C  */  
+
+#define STATIC_SDRAM_RANK0_SIZE_DIMM0       0x3FFF /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
+#define STATIC_SDRAM_RANK1_SIZE_DIMM0       0x3FFF /* size bank1 dimm0   */ 
+#define STATIC_SDRAM_RANK0_SIZE_DIMM1       0x3FFF /* size bank0 dimm1   */ 
+#define STATIC_SDRAM_RANK1_SIZE_DIMM1       0x0	   /* size bank1 dimm1   */ 
+
+#endif /* TS256MLQ72V5U */
+
+
+#ifdef MV_MT9VDDT3272AG
+/* one DIMM 256M  */
+#define STATIC_SDRAM_CONFIG_REG		    0x5820040d  /* offset 0x1400 - DMA reg-0xf1000814 */ 
+#define STATIC_SDRAM_DUNIT_CTRL_REG         0xC4000540  /* offset 0x1404 - DMA reg-0xf100081c */ 
+#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    0x01602220  /* offset 0x1408 - DMA reg-0xf1000824 */ 
+#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG   0x0000000b  /* offset 0x140c - DMA reg-0xf1000828 */ 
+#define STATIC_SDRAM_ADDR_CTRL_REG          0x00000012  /* offset 0x1410 - DMA reg-0xf1000820 */ 
+#define STATIC_SDRAM_MODE_REG               0x00000062  /* offset 0x141c - DMA reg-0xf1000818 */ 
+#define STATIC_SDRAM_RANK0_SIZE_DIMM0       0x0fff /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
+#define STATIC_SDRAM_RANK0_SIZE_DIMM1       0x0    /* size bank0 dimm1   */ 
+
+#endif /* MV_MT9VDDT3272AG */
+
+
+
+#ifdef MV_D27RB12P
+/* 
+Two DIMM 512M + ECC enabled, Registered DIMM  CAS Latency 2.5
+*/
+
+#define STATIC_SDRAM_CONFIG_REG		    0x6826081E  /* offset 0x1400 - DMA reg-0xf1000814 */ 
+#define STATIC_SDRAM_DUNIT_CTRL_REG         0xC5000540  /* offset 0x1404 - DMA reg-0xf100081c */ 
+#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    0x01501220  /* offset 0x1408 - DMA reg-0xf1000824 */ 
+#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG   0x00000009  /* offset 0x140c - DMA reg-0xf1000828 */ 
+#define STATIC_SDRAM_ADDR_CTRL_REG          0x00000012  /* offset 0x1410 - DMA reg-0xf1000820 */ 
+#define STATIC_SDRAM_MODE_REG               0x00000062  /* offset 0x141c - DMA reg-0xf1000818 */ 
+#define STATIC_SDRAM_RANK0_SIZE_DIMM0       0x0FFF /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
+#define STATIC_SDRAM_RANK0_SIZE_DIMM1       0x0FFF    /* size bank0 dimm1   */ 
+
+#define STATIC_DRAM_BANK_2             
+
+#define STATIC_DRAM_BANK_3                         
+#define STATIC_DRAM_BANK_4             
+
+#endif /*  mv_D27RB12P  */
+
+#ifdef RD_MV645XX
+
+#define STATIC_MEM_TYPE				MEM_TYPE_DDR2
+#define STATIC_DIMM_INFO_BANK0_SIZE		256
+/* DDR2 boards 256 MB*/
+
+#define STATIC_SDRAM_RANK0_SIZE_DIMM0       	0x00000fff /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
+#define STATIC_SDRAM_CONFIG_REG	     		0x07190618	
+#define STATIC_SDRAM_MODE_REG	     		0x00000432	
+#define STATIC_SDRAM_DUNIT_CTRL_REG     	0xf4a03440
+#define STATIC_SDRAM_ADDR_CTRL_REG	     	0x00000022
+#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    	0x11712220
+#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG	0x00000504
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000780f
+#define STATIC_SDRAM_EXT_MODE          		0x00000440
+#define STATIC_SDRAM_DDR2_TIMING_LO         	0x00063300
+#define STATIC_SDRAM_DDR2_TIMING_HI         	0x00006330
+#endif /* RD_MV645XX */
+
+#if MV_DIMM_M3783354CZ3_CE6 
+
+#define STATIC_SDRAM_RANK0_SIZE_DIMM0		0x00000FFF /* 0x2010 size bank0 dimm0   - DMA reg-0xf1000810 */ 
+#define STATIC_SDRAM_CONFIG_REG	     		0x07190618 /*   0x1400  */ 
+#define STATIC_SDRAM_MODE_REG	     		0x00000432 /*   0x141c  */  
+#define STATIC_SDRAM_DUNIT_CTRL_REG     	0xf4a03440 /*   0x1404  */  
+#define STATIC_SDRAM_ADDR_CTRL_REG	     	0x00000022 /*   0x1410  */  
+#define STATIC_SDRAM_TIMING_CTRL_LOW_REG	0x11712220 /*   0x1408  */  
+#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG	0x00000504 /*   0x140c  */  
+#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000 /*   0x1494  */  
+#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000 /*   0x1498  */  
+#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000780f /*   0x149c  */  
+#define STATIC_SDRAM_EXT_MODE          		0x00000440 /*   0x1420  */  
+#define STATIC_SDRAM_DDR2_TIMING_LO		0x00063300 /*   0x1428  */  
+#define STATIC_SDRAM_DDR2_TIMING_HI		0x00006330 /*   0x147C  */  
+
+#endif /* MV_DIMM_M3783354CZ3_CE6 */
+
+#endif /* MV_STATIC_DRAM_ON_BOARD */
+#endif /* __INCmvDramIfStaticInith */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c
new file mode 100644
index 00000000..7a26f905
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c
@@ -0,0 +1,1474 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "ddr2/spd/mvSpd.h"
+#include "boardEnv/mvBoardEnvLib.h"
+
+/* #define MV_DEBUG */
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
+                                            MV_DRAM_BANK_INFO *pBankInfo);
+static MV_U32  cas2ps(MV_U8 spd_byte);
+/*******************************************************************************
+* mvDramBankGet - Get the DRAM bank paramters.
+*
+* DESCRIPTION:
+*       This function retrieves DRAM bank parameters as described in 
+*       DRAM_BANK_INFO struct to the controller DRAM unit. In case the board 
+*       has its DRAM on DIMMs it will use its EEPROM to extract SPD data
+*       from it. Otherwise, if the DRAM is soldered on board, the function 
+*       should insert its bank information into MV_DRAM_BANK_INFO struct.
+*
+* INPUT:
+*       bankNum  - Board DRAM bank number.
+*
+* OUTPUT:
+*       pBankInfo  - DRAM bank information struct.
+*
+* RETURN:
+*       MV_FAIL - Bank parameters could not be read.
+*
+*******************************************************************************/
+MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo)
+{
+    MV_DIMM_INFO dimmInfo;
+
+    DB(mvOsPrintf("Dram: mvDramBankInfoGet bank %d\n", bankNum)); 
+    /* zero pBankInfo structure */
+
+    if((NULL == pBankInfo) || (bankNum >= MV_DRAM_MAX_CS ))
+    {
+        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
+        return MV_BAD_PARAM;
+    }
+    memset(pBankInfo, 0, sizeof(*pBankInfo));
+
+	if ( MV_OK != dimmSpdGet((MV_U32)(bankNum/2), &dimmInfo))
+	{
+		DB(mvOsPrintf("Dram: ERR dimmSpdGet failed to get dimm info \n"));
+		return MV_FAIL;
+	}
+	if ((dimmInfo.numOfModuleBanks == 1) && ((bankNum % 2) == 1))
+	{
+		DB(mvOsPrintf("Dram: ERR dimmSpdGet. Can't find DIMM bank 2 \n"));
+		return MV_FAIL;
+	}
+	/* convert Dimm info to Bank info */
+    cpyDimm2BankInfo(&dimmInfo, pBankInfo);
+    return MV_OK;
+}
+
+/*******************************************************************************
+* cpyDimm2BankInfo - Convert a Dimm info struct into a bank info struct.
+*
+* DESCRIPTION:
+*       Convert a Dimm info struct into a bank info struct.
+*
+* INPUT:
+*       pDimmInfo - DIMM information structure.
+*
+* OUTPUT:
+*       pBankInfo  - DRAM bank information struct.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
+                                                MV_DRAM_BANK_INFO *pBankInfo)
+{
+    pBankInfo->memoryType = pDimmInfo->memoryType;        
+
+    /* DIMM dimensions */
+    pBankInfo->numOfRowAddr = pDimmInfo->numOfRowAddr;
+    pBankInfo->numOfColAddr = pDimmInfo->numOfColAddr;
+    pBankInfo->dataWidth = pDimmInfo->dataWidth;
+    pBankInfo->errorCheckType = pDimmInfo->errorCheckType;             
+    pBankInfo->sdramWidth = pDimmInfo->sdramWidth;
+    pBankInfo->errorCheckDataWidth = pDimmInfo->errorCheckDataWidth;   
+    pBankInfo->numOfBanksOnEachDevice = pDimmInfo->numOfBanksOnEachDevice;
+    pBankInfo->suportedCasLatencies = pDimmInfo->suportedCasLatencies;
+    pBankInfo->refreshInterval = pDimmInfo->refreshInterval;
+ 
+    /* DIMM timing parameters */
+    pBankInfo->minCycleTimeAtMaxCasLatPs = pDimmInfo->minCycleTimeAtMaxCasLatPs;
+    pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
+                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps;
+    pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
+                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps;
+
+    pBankInfo->minRowPrechargeTime     = pDimmInfo->minRowPrechargeTime;     
+    pBankInfo->minRowActiveToRowActive = pDimmInfo->minRowActiveToRowActive;
+    pBankInfo->minRasToCasDelay        = pDimmInfo->minRasToCasDelay;       
+    pBankInfo->minRasPulseWidth        = pDimmInfo->minRasPulseWidth;       
+    pBankInfo->minWriteRecoveryTime    = pDimmInfo->minWriteRecoveryTime;
+    pBankInfo->minWriteToReadCmdDelay  = pDimmInfo->minWriteToReadCmdDelay;
+    pBankInfo->minReadToPrechCmdDelay  = pDimmInfo->minReadToPrechCmdDelay;
+    pBankInfo->minRefreshToActiveCmd   = pDimmInfo->minRefreshToActiveCmd;
+               
+    /* Parameters calculated from the extracted DIMM information */
+    pBankInfo->size = pDimmInfo->size/pDimmInfo->numOfModuleBanks;
+    pBankInfo->deviceDensity = pDimmInfo->deviceDensity;              
+    pBankInfo->numberOfDevices = pDimmInfo->numberOfDevices /
+                                 pDimmInfo->numOfModuleBanks;
+ 
+    /* DIMM attributes (MV_TRUE for yes) */
+
+    if ((pDimmInfo->memoryType == MEM_TYPE_SDRAM) ||
+        (pDimmInfo->memoryType == MEM_TYPE_DDR1)   )
+    {   
+        if (pDimmInfo->dimmAttributes & BIT1)
+            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
+        else
+            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
+    }
+    else /* pDimmInfo->memoryType == MEM_TYPE_DDR2 */
+    {
+        if (pDimmInfo->dimmTypeInfo & (BIT0 | BIT4))
+            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
+        else
+            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
+    }
+
+    return;
+}
+/*******************************************************************************
+* dimmSpdCpy - Cpy SPD parameters from dimm 0 to dimm 1.
+*
+* DESCRIPTION:
+*       Read the DIMM SPD parameters from dimm 0 into dimm 1 SPD.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
+*
+*******************************************************************************/
+MV_STATUS dimmSpdCpy(MV_VOID)
+{
+    MV_U32 i;
+    MV_U32 spdChecksum;
+     
+    MV_TWSI_SLAVE twsiSlave;
+    MV_U8 data[SPD_SIZE];
+
+    /* zero dimmInfo structure */
+    memset(data, 0, SPD_SIZE);
+
+    /* read the dimm eeprom */
+    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
+    twsiSlave.slaveAddr.address = MV_BOARD_DIMM0_I2C_ADDR;
+    twsiSlave.slaveAddr.type = ADDR7_BIT;
+    twsiSlave.validOffset = MV_TRUE;
+    twsiSlave.offset = 0;
+    twsiSlave.moreThen256 = MV_FALSE;
+
+    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL, &twsiSlave, data, SPD_SIZE) )
+    {
+        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 0\n"));
+        return MV_FAIL;
+    }
+    DB(puts("DRAM: Reading dimm info succeded.\n"));
+    
+    /* calculate SPD checksum */
+    spdChecksum = 0;
+    
+    for(i = 0 ; i <= 62 ; i++)
+    {
+        spdChecksum += data[i];
+    }
+    
+    if ((spdChecksum & 0xff) != data[63])
+    {
+        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
+                            (MV_U32)(spdChecksum & 0xff), data[63]));
+    }
+    else
+    {
+        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
+    }
+
+    /* copy the SPD content 1:1 into the DIMM 1 SPD */
+    twsiSlave.slaveAddr.address = MV_BOARD_DIMM1_I2C_ADDR;
+    twsiSlave.slaveAddr.type = ADDR7_BIT;
+    twsiSlave.validOffset = MV_TRUE;
+    twsiSlave.offset = 0;
+    twsiSlave.moreThen256 = MV_FALSE;
+
+    for(i = 0 ; i < SPD_SIZE ; i++)
+    {
+	twsiSlave.offset = i;
+	if( MV_OK != mvTwsiWrite (MV_BOARD_DIMM_I2C_CHANNEL, &twsiSlave, &data[i], 1) )
+	{
+	    mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 1 byte %d \n",i);
+	    return MV_FAIL;
+	}
+	mvOsDelay(5);
+    }
+    
+    DB(puts("DRAM: Reading dimm info succeded.\n"));
+    return MV_OK;
+}
+
+/*******************************************************************************
+* dimmSpdGet - Get the SPD parameters.
+*
+* DESCRIPTION:
+*       Read the DIMM SPD parameters into given struct parameter.
+*
+* INPUT:
+*       dimmNum - DIMM number. See MV_BOARD_DIMM_NUM enumerator.
+*
+* OUTPUT:
+*       pDimmInfo - DIMM information structure.
+*
+* RETURN:
+*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
+*
+*******************************************************************************/
+MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo)
+{
+    MV_U32 i;
+    MV_U32 density = 1;
+    MV_U32 spdChecksum;
+     
+    MV_TWSI_SLAVE twsiSlave;
+    MV_U8 data[SPD_SIZE];
+
+    if((NULL == pDimmInfo)|| (dimmNum >= MAX_DIMM_NUM))
+    {
+        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
+        return MV_BAD_PARAM;
+    }
+
+    /* zero dimmInfo structure */
+    memset(data, 0, SPD_SIZE);
+
+    /* read the dimm eeprom */
+    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
+    twsiSlave.slaveAddr.address = (dimmNum == 0) ?
+                            MV_BOARD_DIMM0_I2C_ADDR : MV_BOARD_DIMM1_I2C_ADDR;
+    twsiSlave.slaveAddr.type = ADDR7_BIT;
+    twsiSlave.validOffset = MV_TRUE;
+    twsiSlave.offset = 0;
+    twsiSlave.moreThen256 = MV_FALSE;
+
+    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL, &twsiSlave, data, SPD_SIZE) )
+    {
+        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum %d \n", dimmNum));
+        return MV_FAIL;
+    }
+    DB(puts("DRAM: Reading dimm info succeded.\n"));
+    
+    /* calculate SPD checksum */
+    spdChecksum = 0;
+    
+        for(i = 0 ; i <= 62 ; i++)
+        {
+        spdChecksum += data[i];
+    }
+    
+    if ((spdChecksum & 0xff) != data[63])
+    {
+        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
+                            (MV_U32)(spdChecksum & 0xff), data[63]));
+    }
+    else
+    {
+        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
+    }
+
+    /* copy the SPD content 1:1 into the dimmInfo structure*/
+    for(i = 0 ; i < SPD_SIZE ; i++)
+    {
+        pDimmInfo->spdRawData[i] = data[i];
+        DB(mvOsPrintf("SPD-EEPROM Byte %3d = %3x (%3d)\n",i, data[i], data[i]));
+    }
+
+    DB(mvOsPrintf("DRAM SPD Information:\n"));
+
+    /* Memory type (DDR / SDRAM) */
+    switch (data[DIMM_MEM_TYPE])
+    {
+        case (DIMM_MEM_TYPE_SDRAM):
+            pDimmInfo->memoryType = MEM_TYPE_SDRAM;
+            DB(mvOsPrintf("DRAM Memeory type SDRAM\n"));
+            break;
+        case (DIMM_MEM_TYPE_DDR1):
+            pDimmInfo->memoryType = MEM_TYPE_DDR1;
+            DB(mvOsPrintf("DRAM Memeory type DDR1\n"));
+            break;
+        case (DIMM_MEM_TYPE_DDR2):
+            pDimmInfo->memoryType = MEM_TYPE_DDR2;
+            DB(mvOsPrintf("DRAM Memeory type DDR2\n"));
+            break;
+        default:
+            mvOsPrintf("ERROR: Undefined memory type!\n");
+            return MV_ERROR;
+    }
+
+    
+    /* Number Of Row Addresses */
+    pDimmInfo->numOfRowAddr = data[DIMM_ROW_NUM];
+    DB(mvOsPrintf("DRAM numOfRowAddr[3]         %d\n",pDimmInfo->numOfRowAddr));
+        
+    /* Number Of Column Addresses */
+    pDimmInfo->numOfColAddr = data[DIMM_COL_NUM];
+    DB(mvOsPrintf("DRAM numOfColAddr[4]         %d\n",pDimmInfo->numOfColAddr));
+        
+    /* Number Of Module Banks */
+    pDimmInfo->numOfModuleBanks = data[DIMM_MODULE_BANK_NUM];
+    DB(mvOsPrintf("DRAM numOfModuleBanks[5]     0x%x\n", 
+                                                  pDimmInfo->numOfModuleBanks));
+        
+    /* Number of module banks encoded differently for DDR2 */
+    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
+        pDimmInfo->numOfModuleBanks = (pDimmInfo->numOfModuleBanks & 0x7)+1;
+
+    /* Data Width */
+    pDimmInfo->dataWidth = data[DIMM_DATA_WIDTH];
+    DB(mvOsPrintf("DRAM dataWidth[6]            0x%x\n", pDimmInfo->dataWidth));
+        
+    /* Minimum Cycle Time At Max CasLatancy */
+    pDimmInfo->minCycleTimeAtMaxCasLatPs = cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS]);
+
+    /* Error Check Type */
+    pDimmInfo->errorCheckType = data[DIMM_ERR_CHECK_TYPE];
+    DB(mvOsPrintf("DRAM errorCheckType[11]      0x%x\n", 
+                                                    pDimmInfo->errorCheckType));
+
+    /* Refresh Interval */
+    pDimmInfo->refreshInterval = data[DIMM_REFRESH_INTERVAL];
+    DB(mvOsPrintf("DRAM refreshInterval[12]     0x%x\n", 
+                                                   pDimmInfo->refreshInterval));
+    
+    /* Sdram Width */
+    pDimmInfo->sdramWidth = data[DIMM_SDRAM_WIDTH];
+    DB(mvOsPrintf("DRAM sdramWidth[13]          0x%x\n",pDimmInfo->sdramWidth));
+        
+    /* Error Check Data Width */
+    pDimmInfo->errorCheckDataWidth = data[DIMM_ERR_CHECK_DATA_WIDTH];
+    DB(mvOsPrintf("DRAM errorCheckDataWidth[14] 0x%x\n", 
+                                               pDimmInfo->errorCheckDataWidth));
+    
+    /* Burst Length Supported */
+    /*     SDRAM/DDR1:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
+                    *********************************************************/ 
+    /*     DDR2:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
+                    *********************************************************/ 
+
+    pDimmInfo->burstLengthSupported = data[DIMM_BURST_LEN_SUP];
+    DB(mvOsPrintf("DRAM burstLengthSupported[16] 0x%x\n", 
+                                              pDimmInfo->burstLengthSupported));
+    
+    /* Number Of Banks On Each Device */
+    pDimmInfo->numOfBanksOnEachDevice = data[DIMM_DEV_BANK_NUM];
+    DB(mvOsPrintf("DRAM numOfBanksOnEachDevice[17] 0x%x\n", 
+                                            pDimmInfo->numOfBanksOnEachDevice));
+    
+    /* Suported Cas Latencies */
+                   
+    /*      SDRAM:
+            *******-******-******-******-******-******-******-******* 
+            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+            *******-******-******-******-******-******-******-******* 
+    CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
+            ********************************************************/ 
+
+    /*     DDR 1:
+            *******-******-******-******-******-******-******-******* 
+            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+            *******-******-******-******-******-******-******-******* 
+    CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
+            *********************************************************/
+
+    /*     DDR 2:
+            *******-******-******-******-******-******-******-******* 
+            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+            *******-******-******-******-******-******-******-******* 
+    CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
+            *********************************************************/
+    
+    pDimmInfo->suportedCasLatencies = data[DIMM_SUP_CAL];
+    DB(mvOsPrintf("DRAM suportedCasLatencies[18]    0x%x\n", 
+                                              pDimmInfo->suportedCasLatencies));
+
+    /* For DDR2 only, get the DIMM type information */
+    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
+    {   
+        pDimmInfo->dimmTypeInfo = data[DIMM_DDR2_TYPE_INFORMATION];
+        DB(mvOsPrintf("DRAM dimmTypeInfo[20] (DDR2) 0x%x\n", 
+                                                      pDimmInfo->dimmTypeInfo));
+    }
+
+    /* SDRAM Modules Attributes */
+    pDimmInfo->dimmAttributes = data[DIMM_BUF_ADDR_CONT_IN];
+    DB(mvOsPrintf("DRAM dimmAttributes[21]          0x%x\n",    
+                                                    pDimmInfo->dimmAttributes));
+    
+    /* Minimum Cycle Time At Max CasLatancy Minus 1*/
+    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
+                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS1]);
+
+    /* Minimum Cycle Time At Max CasLatancy Minus 2*/
+    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
+                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS2]);
+
+    pDimmInfo->minRowPrechargeTime = data[DIMM_MIN_ROW_PRECHARGE_TIME];
+    DB(mvOsPrintf("DRAM minRowPrechargeTime[27]     0x%x\n", 
+                                               pDimmInfo->minRowPrechargeTime));
+    pDimmInfo->minRowActiveToRowActive = data[DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE];
+    DB(mvOsPrintf("DRAM minRowActiveToRowActive[28] 0x%x\n", 
+                                           pDimmInfo->minRowActiveToRowActive));
+    pDimmInfo->minRasToCasDelay = data[DIMM_MIN_RAS_TO_CAS_DELAY];
+    DB(mvOsPrintf("DRAM minRasToCasDelay[29]        0x%x\n", 
+                                                  pDimmInfo->minRasToCasDelay));
+    pDimmInfo->minRasPulseWidth = data[DIMM_MIN_RAS_PULSE_WIDTH];
+    DB(mvOsPrintf("DRAM minRasPulseWidth[30]        0x%x\n", 
+                                                  pDimmInfo->minRasPulseWidth));
+        
+    /* DIMM Bank Density */
+    pDimmInfo->dimmBankDensity = data[DIMM_BANK_DENSITY];
+    DB(mvOsPrintf("DRAM dimmBankDensity[31]         0x%x\n", 
+                                                   pDimmInfo->dimmBankDensity));
+
+    /* Only DDR2 includes Write Recovery Time field. Other SDRAM ignore     */
+    pDimmInfo->minWriteRecoveryTime = data[DIMM_MIN_WRITE_RECOVERY_TIME];
+    DB(mvOsPrintf("DRAM minWriteRecoveryTime[36]    0x%x\n", 
+                                              pDimmInfo->minWriteRecoveryTime));
+    
+    /* Only DDR2 includes Internal Write To Read Command Delay field.       */
+    pDimmInfo->minWriteToReadCmdDelay = data[DIMM_MIN_WRITE_TO_READ_CMD_DELAY];
+    DB(mvOsPrintf("DRAM minWriteToReadCmdDelay[37]  0x%x\n", 
+                                            pDimmInfo->minWriteToReadCmdDelay));
+    
+    /* Only DDR2 includes Internal Read To Precharge Command Delay field.   */
+    pDimmInfo->minReadToPrechCmdDelay = data[DIMM_MIN_READ_TO_PRECH_CMD_DELAY];
+    DB(mvOsPrintf("DRAM minReadToPrechCmdDelay[38]  0x%x\n",    
+                                            pDimmInfo->minReadToPrechCmdDelay));
+    
+    /* Only DDR2 includes Minimum Refresh to Activate/Refresh Command field */
+    pDimmInfo->minRefreshToActiveCmd = data[DIMM_MIN_REFRESH_TO_ACTIVATE_CMD];
+    DB(mvOsPrintf("DRAM minRefreshToActiveCmd[42]   0x%x\n", 
+                                             pDimmInfo->minRefreshToActiveCmd));
+                 
+    /* calculating the sdram density. Representing device density from      */
+    /* bit 20 to allow representation of 4GB and above.                     */
+    /* For example, if density is 512Mbit 0x20000000, will be represent in  */
+    /* deviceDensity by 0x20000000 >> 16 --> 0x00000200. Another example    */
+    /* is density 8GB 0x200000000 >> 16 --> 0x00002000.                     */
+    density = (1 << ((pDimmInfo->numOfRowAddr + pDimmInfo->numOfColAddr) - 20));
+    pDimmInfo->deviceDensity = density * 
+                                pDimmInfo->numOfBanksOnEachDevice * 
+                                pDimmInfo->sdramWidth;
+    DB(mvOsPrintf("DRAM deviceDensity           %d\n",pDimmInfo->deviceDensity));
+    
+    /* Number of devices includeing Error correction */
+    pDimmInfo->numberOfDevices = (pDimmInfo->dataWidth/pDimmInfo->sdramWidth) * 
+                                  pDimmInfo->numOfModuleBanks;
+    DB(mvOsPrintf("DRAM numberOfDevices         %d\n",  
+                                                   pDimmInfo->numberOfDevices));
+
+    pDimmInfo->size = 0; 
+
+    /* Note that pDimmInfo->size is in MB units */
+    if (pDimmInfo->memoryType == MEM_TYPE_SDRAM)
+    {
+        if (pDimmInfo->dimmBankDensity & BIT0)
+            pDimmInfo->size += 1024;                /* Equal to 1GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT1)
+            pDimmInfo->size += 8;                   /* Equal to 8MB     */
+        else if (pDimmInfo->dimmBankDensity & BIT2)
+            pDimmInfo->size += 16;                  /* Equal to 16MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT3)
+            pDimmInfo->size += 32;                  /* Equal to 32MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT4)
+            pDimmInfo->size += 64;                  /* Equal to 64MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT5)
+            pDimmInfo->size += 128;                 /* Equal to 128MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT6) 
+            pDimmInfo->size += 256;                 /* Equal to 256MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT7) 
+            pDimmInfo->size += 512;                 /* Equal to 512MB   */
+    }
+    else if (pDimmInfo->memoryType == MEM_TYPE_DDR1)
+    {
+        if (pDimmInfo->dimmBankDensity & BIT0)
+            pDimmInfo->size += 1024;                /* Equal to 1GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT1)
+            pDimmInfo->size += 2048;                /* Equal to 2GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT2)
+            pDimmInfo->size += 16;                  /* Equal to 16MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT3)
+            pDimmInfo->size += 32;                  /* Equal to 32MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT4)
+            pDimmInfo->size += 64;                  /* Equal to 64MB    */
+        else if (pDimmInfo->dimmBankDensity & BIT5)
+            pDimmInfo->size += 128;                 /* Equal to 128MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT6) 
+            pDimmInfo->size += 256;                 /* Equal to 256MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT7) 
+            pDimmInfo->size += 512;                 /* Equal to 512MB   */
+    }
+    else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
+    {
+        if (pDimmInfo->dimmBankDensity & BIT0)
+            pDimmInfo->size += 1024;                /* Equal to 1GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT1)
+            pDimmInfo->size += 2048;                /* Equal to 2GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT2)
+            pDimmInfo->size += 4096;                /* Equal to 4GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT3)
+            pDimmInfo->size += 8192;                /* Equal to 8GB     */
+        else if (pDimmInfo->dimmBankDensity & BIT4)
+            pDimmInfo->size += 16384;               /* Equal to 16GB    */
+        else if (pDimmInfo->dimmBankDensity & BIT5)
+            pDimmInfo->size += 128;                 /* Equal to 128MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT6) 
+            pDimmInfo->size += 256;                 /* Equal to 256MB   */
+        else if (pDimmInfo->dimmBankDensity & BIT7) 
+            pDimmInfo->size += 512;                 /* Equal to 512MB   */
+    }
+    
+    pDimmInfo->size *= pDimmInfo->numOfModuleBanks;
+
+    DB(mvOsPrintf("Dram: dimm size    %dMB \n",pDimmInfo->size));
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* dimmSpdPrint - Print the SPD parameters.
+*
+* DESCRIPTION:
+*       Print the Dimm SPD parameters.
+*
+* INPUT:
+*       pDimmInfo - DIMM information structure.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_VOID dimmSpdPrint(MV_U32 dimmNum)
+{
+    MV_DIMM_INFO dimmInfo;
+    MV_U32  i, temp = 0;
+    MV_U32  k, maskLeftOfPoint = 0, maskRightOfPoint = 0;
+    MV_U32  rightOfPoint = 0,leftOfPoint = 0, div, time_tmp, shift;
+    MV_U32  busClkPs;
+    MV_U8   trp_clocks=0, trcd_clocks, tras_clocks, trrd_clocks,
+            temp_buf[40], *spdRawData;
+
+    busClkPs = 1000000000 / (mvBoardSysClkGet() / 100);  /* in 10 ps units */
+
+    spdRawData = dimmInfo.spdRawData;
+    
+    if(MV_OK != dimmSpdGet(dimmNum, &dimmInfo))
+    {
+        mvOsOutput("ERROR: Could not read SPD information!\n");
+        return;
+    }
+
+    /* find Manufactura of Dimm Module */
+    mvOsOutput("\nManufacturer's JEDEC ID Code:   ");
+    for(i = 0 ; i < DIMM_MODULE_MANU_SIZE ; i++)
+    {
+        mvOsOutput("%x",spdRawData[DIMM_MODULE_MANU_OFFS + i]);
+    }
+    mvOsOutput("\n");
+
+    /* Manufacturer's Specific Data */
+    for(i = 0 ; i < DIMM_MODULE_ID_SIZE ; i++)
+    {
+        temp_buf[i] = spdRawData[DIMM_MODULE_ID_OFFS + i];
+    }
+    mvOsOutput("Manufacturer's Specific Data:   %s\n", temp_buf);
+
+    /* Module Part Number */
+    for(i = 0 ; i < DIMM_MODULE_VEN_SIZE ; i++)
+    {
+        temp_buf[i] = spdRawData[DIMM_MODULE_VEN_OFFS + i];
+    }
+    mvOsOutput("Module Part Number:             %s\n", temp_buf);
+
+    /* Module Serial Number */
+    for(i = 0; i < sizeof(MV_U32); i++)
+    {
+    	temp |= spdRawData[95+i] << 8*i;
+    }
+    mvOsOutput("DIMM Serial No.                 %ld (%lx)\n", (long)temp, 
+                                    (long)temp);
+
+    /* find Manufac-Data of Dimm Module */
+    mvOsOutput("Manufactoring Date:             Year 20%d%d/ ww %d%d\n", 
+                        ((spdRawData[93] & 0xf0) >> 4), (spdRawData[93] & 0xf), 
+                        ((spdRawData[94] & 0xf0) >> 4), (spdRawData[94] & 0xf)); 
+    /* find modul_revision of Dimm Module */
+    mvOsOutput("Module Revision:                %d.%d\n", 
+               spdRawData[62]/10, spdRawData[62]%10); 
+
+    /* find manufac_place of Dimm Module */
+    mvOsOutput("manufac_place:                  %d\n", spdRawData[72]);
+    
+    /* go over the first 35 I2C data bytes */
+    for(i = 2 ; i <= 35 ; i++)
+       switch(i)
+        {
+            case 2:  /* Memory type (DDR1/2 / SDRAM) */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                    mvOsOutput("Dram Type is:                   SDRAM\n");
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                    mvOsOutput("Dram Type is:                   SDRAM DDR1\n");
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                    mvOsOutput("Dram Type is:                   SDRAM DDR2\n");
+                else
+                    mvOsOutput("Dram Type unknown\n");
+                break;
+/*----------------------------------------------------------------------------*/
+
+            case 3:  /* Number Of Row Addresses */
+                mvOsOutput("Module Number of row addresses: %d\n", 
+                                                        dimmInfo.numOfRowAddr);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 4:  /* Number Of Column Addresses */
+                mvOsOutput("Module Number of col addresses: %d\n", 
+                                                        dimmInfo.numOfColAddr);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 5:  /* Number Of Module Banks */
+                mvOsOutput("Number of Banks on Mod.:        %d\n",  
+                                                    dimmInfo.numOfModuleBanks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 6:  /* Data Width */
+                mvOsOutput("Module Data Width:              %d bit\n",  
+                                                           dimmInfo.dataWidth);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 8:  /* Voltage Interface */
+                switch(spdRawData[i])
+                {
+                    case 0x0:
+                        mvOsOutput("Module is               TTL_5V_TOLERANT\n");
+                        break;
+                    case 0x1:
+                        mvOsOutput("Module is               LVTTL\n");
+                        break;
+                    case 0x2:
+                        mvOsOutput("Module is               HSTL_1_5V\n");
+                        break;
+                    case 0x3:
+                        mvOsOutput("Module is               SSTL_3_3V\n");
+                        break;
+                    case 0x4:
+                        mvOsOutput("Module is               SSTL_2_5V\n");
+                        break;
+                    case 0x5:
+                        if (dimmInfo.memoryType != MEM_TYPE_SDRAM)
+                        {
+                            mvOsOutput("Module is                 SSTL_1_8V\n");
+                            break;
+                        }
+                    default:
+                        mvOsOutput("Module is               VOLTAGE_UNKNOWN\n");
+                        break;
+                }
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 9:  /* Minimum Cycle Time At Max CasLatancy */
+                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
+                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
+                
+                /* DDR2 addition of right of point */
+                if ((spdRawData[i] & 0x0f) == 0xA)
+                {
+                    rightOfPoint = 25;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xB)
+                {
+                    rightOfPoint = 33;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xC)
+                {
+                    rightOfPoint = 66;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xD)
+                {
+                    rightOfPoint = 75;
+                }
+                mvOsOutput("Minimum Cycle Time At Max CL:   %d.%d [ns]\n",
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 10: /* Clock To Data Out */
+                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 10:100;
+                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                leftOfPoint     = time_tmp / div;
+                rightOfPoint    = time_tmp % div;
+                mvOsOutput("Clock To Data Out:              %d.%d [ns]\n",
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 11: /* Error Check Type */
+                mvOsOutput("Error Check Type (0=NONE):      %d\n", 
+                                                      dimmInfo.errorCheckType);
+                break;
+/*----------------------------------------------------------------------------*/
+
+            case 12: /* Refresh Interval */
+                mvOsOutput("Refresh Rate:                   %x\n", 
+                                                     dimmInfo.refreshInterval);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 13: /* Sdram Width */
+                mvOsOutput("Sdram Width:                    %d bits\n",     
+                                                          dimmInfo.sdramWidth);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 14: /* Error Check Data Width */
+                mvOsOutput("Error Check Data Width:         %d bits\n", 
+                                                 dimmInfo.errorCheckDataWidth);
+                break;
+/*----------------------------------------------------------------------------*/
+
+           case 15: /* Minimum Clock Delay is unsupported */
+                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
+                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
+                {
+                    mvOsOutput("Minimum Clk Delay back to back: %d\n", 
+                                                                spdRawData[i]);
+                }
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 16: /* Burst Length Supported */
+    /*     SDRAM/DDR1:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
+                    *********************************************************/ 
+    /*     DDR2:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
+                    *********************************************************/ 
+                mvOsOutput("Burst Length Supported: ");
+                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
+                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
+                {
+                    if (dimmInfo.burstLengthSupported & BIT0)
+                        mvOsOutput("1, ");
+                    if (dimmInfo.burstLengthSupported & BIT1)
+                        mvOsOutput("2, ");
+                }
+                if (dimmInfo.burstLengthSupported & BIT2)
+                    mvOsOutput("4, ");
+                if (dimmInfo.burstLengthSupported & BIT3) 
+                    mvOsOutput("8, ");
+                
+                mvOsOutput(" Bit \n");
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 17: /* Number Of Banks On Each Device */
+                mvOsOutput("Number Of Banks On Each Chip:   %d\n",  
+                                              dimmInfo.numOfBanksOnEachDevice);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 18: /* Suported Cas Latencies */
+                   
+            /*      SDRAM:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+            CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
+                    ********************************************************/ 
+
+            /*     DDR 1:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+            CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
+                    *********************************************************/
+
+            /*     DDR 2:
+                    *******-******-******-******-******-******-******-******* 
+                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
+                    *******-******-******-******-******-******-******-******* 
+            CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
+                    *********************************************************/
+
+                mvOsOutput("Suported Cas Latencies: (CL) 			");
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    for (k = 0; k <=7; k++)
+                    {
+                        if (dimmInfo.suportedCasLatencies & (1 << k))
+                            mvOsOutput("%d,             ", k+1);
+                    }
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if (dimmInfo.suportedCasLatencies & BIT0)
+                        mvOsOutput("1, ");
+                    if (dimmInfo.suportedCasLatencies & BIT1)
+                        mvOsOutput("1.5, ");
+                    if (dimmInfo.suportedCasLatencies & BIT2)
+                        mvOsOutput("2, ");
+                    if (dimmInfo.suportedCasLatencies & BIT3)
+                        mvOsOutput("2.5, ");
+                    if (dimmInfo.suportedCasLatencies & BIT4)
+                        mvOsOutput("3, ");
+                    if (dimmInfo.suportedCasLatencies & BIT5)
+                        mvOsOutput("3.5, ");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                {
+                    if (dimmInfo.suportedCasLatencies & BIT2)
+                        mvOsOutput("2, ");
+                    if (dimmInfo.suportedCasLatencies & BIT3)
+                        mvOsOutput("3, ");
+                    if (dimmInfo.suportedCasLatencies & BIT4)
+                        mvOsOutput("4, ");
+                    if (dimmInfo.suportedCasLatencies & BIT5)
+                        mvOsOutput("5, ");		
+                }
+                else
+                    mvOsOutput("?.?, ");		
+                mvOsOutput("\n");
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 20:   /* DDR2 DIMM type info */
+                if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                {
+                    if (dimmInfo.dimmTypeInfo & (BIT0 | BIT4))
+                        mvOsOutput("Registered DIMM (RDIMM)\n");
+                    else if (dimmInfo.dimmTypeInfo & (BIT1 | BIT5))
+                        mvOsOutput("Unbuffered DIMM (UDIMM)\n");
+                    else 
+                        mvOsOutput("Unknown DIMM type.\n");
+                }
+
+                break;
+/*----------------------------------------------------------------------------*/
+   
+            case 21: /* SDRAM Modules Attributes */
+                mvOsOutput("\nModule Attributes (SPD Byte 21): \n");
+                
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    if (dimmInfo.dimmAttributes & BIT0)
+                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
+                    else
+                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
+
+                    if (dimmInfo.dimmAttributes & BIT1)
+                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
+                    else
+                        mvOsOutput(" Registered Addr/Control Input: No\n");
+   
+                    if (dimmInfo.dimmAttributes & BIT2)
+                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
+                    else
+                        mvOsOutput(" On-Card PLL (clock):           No \n");
+
+                    if (dimmInfo.dimmAttributes & BIT3)
+                        mvOsOutput(" Bufferd DQMB Input:            Yes \n");
+                    else
+                        mvOsOutput(" Bufferd DQMB Inputs:           No \n");
+   
+                    if (dimmInfo.dimmAttributes & BIT4)
+                        mvOsOutput(" Registered DQMB Inputs:        Yes \n");
+                    else
+                        mvOsOutput(" Registered DQMB Inputs:        No \n");
+ 
+                    if (dimmInfo.dimmAttributes & BIT5)
+                        mvOsOutput(" Differential Clock Input:      Yes \n");
+                    else
+                        mvOsOutput(" Differential Clock Input:      No \n");
+   
+                    if (dimmInfo.dimmAttributes & BIT6)
+                        mvOsOutput(" redundant Row Addressing:      Yes \n");
+                    else
+                        mvOsOutput(" redundant Row Addressing:      No \n");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if (dimmInfo.dimmAttributes & BIT0)
+                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
+                    else 
+                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
+   
+                    if (dimmInfo.dimmAttributes & BIT1)
+                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
+                    else
+                        mvOsOutput(" Registered Addr/Control Input: No\n");
+   
+                    if (dimmInfo.dimmAttributes & BIT2)
+                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
+                    else
+                        mvOsOutput(" On-Card PLL (clock):           No \n");
+            
+                    if (dimmInfo.dimmAttributes & BIT3)
+                        mvOsOutput(" FET Switch On-Card Enabled:    Yes \n");
+                    else
+                        mvOsOutput(" FET Switch On-Card Enabled:    No \n");
+                    
+                    if (dimmInfo.dimmAttributes & BIT4)
+                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
+                    else
+                        mvOsOutput(" FET Switch External Enabled:   No \n");
+
+                    if (dimmInfo.dimmAttributes & BIT5)
+                        mvOsOutput(" Differential Clock Input:      Yes \n");
+                    else
+                        mvOsOutput(" Differential Clock Input:      No \n");
+                }
+                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
+                {
+                    mvOsOutput(" Number of Active Registers on the DIMM: %d\n", 
+                                        (dimmInfo.dimmAttributes & 0x3) + 1);
+            
+                    mvOsOutput(" Number of PLLs on the DIMM: %d\n", 
+                                      ((dimmInfo.dimmAttributes) >> 2) & 0x3);
+               
+                    if (dimmInfo.dimmAttributes & BIT4)
+                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
+                    else
+                        mvOsOutput(" FET Switch External Enabled:   No \n");
+
+                    if (dimmInfo.dimmAttributes & BIT6)
+                        mvOsOutput(" Analysis probe installed:      Yes \n");
+                    else
+                        mvOsOutput(" Analysis probe installed:      No \n");
+                }
+                
+                break;
+/*----------------------------------------------------------------------------*/
+
+            case 22: /* Suported AutoPreCharge */
+                mvOsOutput("\nModul Attributes (SPD Byte 22): \n");
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    if ( spdRawData[i] & BIT0 )
+                        mvOsOutput(" Early Ras Precharge:           Yes \n");
+                    else
+                        mvOsOutput(" Early Ras Precharge:           No \n");
+                                                        
+                    if ( spdRawData[i] & BIT1 )                 
+                        mvOsOutput(" AutoPreCharge:                 Yes \n");
+                    else
+                        mvOsOutput(" AutoPreCharge:                 No \n");
+                                                            
+                    if ( spdRawData[i] & BIT2 )                 
+                        mvOsOutput(" Precharge All:                 Yes \n");
+                    else
+                        mvOsOutput(" Precharge All:                 No \n");
+                                                        
+                    if ( spdRawData[i] & BIT3 )                 
+                        mvOsOutput(" Write 1/ReadBurst:             Yes \n");
+                    else
+                        mvOsOutput(" Write 1/ReadBurst:             No \n");
+                                                        
+                    if ( spdRawData[i] & BIT4 )                 
+                        mvOsOutput(" lower VCC tolerance:           5%%\n");
+                    else
+                        mvOsOutput(" lower VCC tolerance:           10%%\n");
+                                                        
+                    if ( spdRawData[i] & BIT5 )                 
+                        mvOsOutput(" upper VCC tolerance:           5%%\n");
+                    else
+                        mvOsOutput(" upper VCC tolerance:           10%%\n");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if ( spdRawData[i] & BIT0 )
+                        mvOsOutput(" Supports Weak Driver:          Yes \n");
+                    else
+                        mvOsOutput(" Supports Weak Driver:          No \n");
+
+                    if ( !(spdRawData[i] & BIT4) )
+                        mvOsOutput(" lower VCC tolerance:           0.2V\n");
+   
+                    if ( !(spdRawData[i] & BIT5) )
+                        mvOsOutput(" upper VCC tolerance:           0.2V\n");
+
+                    if ( spdRawData[i] & BIT6 )
+                        mvOsOutput(" Concurrent Auto Preharge:      Yes \n");
+                    else
+                        mvOsOutput(" Concurrent Auto Preharge:      No \n");
+
+                    if ( spdRawData[i] & BIT7 )
+                        mvOsOutput(" Supports Fast AP:              Yes \n");
+                    else
+                        mvOsOutput(" Supports Fast AP:              No \n");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
+                {
+                    if ( spdRawData[i] & BIT0 )
+                        mvOsOutput(" Supports Weak Driver:          Yes \n");
+                    else
+                        mvOsOutput(" Supports Weak Driver:          No \n");
+                }
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 23:
+            /* Minimum Cycle Time At Maximum Cas Latancy Minus 1 (2nd highest CL) */
+                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
+                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
+                
+                /* DDR2 addition of right of point */
+                if ((spdRawData[i] & 0x0f) == 0xA)
+                {
+                    rightOfPoint = 25;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xB)
+                {
+                    rightOfPoint = 33;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xC)
+                {
+                    rightOfPoint = 66;
+                }
+                if ((spdRawData[i] & 0x0f) == 0xD)
+                {
+                    rightOfPoint = 75;
+                }
+
+                mvOsOutput("Minimum Cycle Time At 2nd highest CasLatancy"
+                           "(0 = Not supported): %d.%d [ns]\n",
+                           leftOfPoint, rightOfPoint );
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 24: /* Clock To Data Out 2nd highest Cas Latency Value*/
+                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 10:100;
+                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                    ((spdRawData[i] & 0x0f));
+                leftOfPoint     = time_tmp / div;
+                rightOfPoint    = time_tmp % div;
+                mvOsOutput("Clock To Data Out (2nd CL value): 		%d.%d [ns]\n",
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 25: 
+            /* Minimum Cycle Time At Maximum Cas Latancy Minus 2 (3rd highest CL) */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
+                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
+                }
+                else    /* DDR1 or DDR2 */ 
+                {
+                    leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
+                    rightOfPoint = (spdRawData[i] & 0x0f) * 10;
+                    
+                    /* DDR2 addition of right of point */
+                    if ((spdRawData[i] & 0x0f) == 0xA)
+                    {
+                        rightOfPoint = 25;
+                    }
+                    if ((spdRawData[i] & 0x0f) == 0xB)
+                    {
+                        rightOfPoint = 33;
+                    }
+                    if ((spdRawData[i] & 0x0f) == 0xC)
+                    {
+                        rightOfPoint = 66;
+                    }
+                    if ((spdRawData[i] & 0x0f) == 0xD)
+                    {
+                        rightOfPoint = 75;
+                    }
+                }
+                mvOsOutput("Minimum Cycle Time At 3rd highest CasLatancy" 
+                           "(0 = Not supported): %d.%d [ns]\n",
+                           leftOfPoint, rightOfPoint );
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 26: /* Clock To Data Out 3rd highest Cas Latency Value*/
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
+                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
+                }
+                else    /* DDR1 or DDR2 */ 
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint     = 0;
+                    rightOfPoint    = time_tmp;
+                }
+                mvOsOutput("Clock To Data Out (3rd CL value): 		%d.%2d[ns]\n",
+                                                  leftOfPoint, rightOfPoint );
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 27: /* Minimum Row Precharge Time */
+                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
+                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0xff : 0xfc;
+                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0x00 : 0x03;
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
+                temp = ((leftOfPoint*100) + rightOfPoint);/* in 10ps Intervals*/
+                trp_clocks = (temp + (busClkPs-1)) /  busClkPs;    
+                mvOsOutput("Minimum Row Precharge Time [ns]: 		%d.%d = " 
+                           "in Clk cycles %d\n", 
+                           leftOfPoint, rightOfPoint, trp_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 28: /* Minimum Row Active to Row Active Time */
+                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
+                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0xff : 0xfc;
+                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0x00 : 0x03;
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
+                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
+                trrd_clocks = (temp + (busClkPs-1)) / busClkPs;
+                mvOsOutput("Minimum Row Active -To- Row Active Delay [ns]: " 
+                           "%d.%d = in Clk cycles %d\n",
+                            leftOfPoint, rightOfPoint, trp_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 29: /* Minimum Ras-To-Cas Delay */
+                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
+                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0xff : 0xfc;
+                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
+                                                                    0x00 : 0x03;
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;  
+                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
+                trcd_clocks = (temp + (busClkPs-1) )/ busClkPs;
+                mvOsOutput("Minimum Ras-To-Cas Delay [ns]: 			%d.%d = "
+                           "in Clk cycles %d\n", 
+                           leftOfPoint, rightOfPoint, trp_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+   
+            case 30: /* Minimum Ras Pulse Width */
+                tras_clocks = (cas2ps(spdRawData[i])+(busClkPs-1)) / busClkPs;
+                mvOsOutput("Minimum Ras Pulse Width [ns]: 			%d = "
+                           "in Clk cycles %d\n", spdRawData[i], tras_clocks);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 31: /* Module Bank Density */
+                mvOsOutput("Module Bank Density (more than 1= Multisize-Module):");
+
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    if (dimmInfo.dimmBankDensity & BIT0)
+                        mvOsOutput("1GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT1)
+                        mvOsOutput("8MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT2)
+                        mvOsOutput("16MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT3)
+                        mvOsOutput("32MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT4)
+                        mvOsOutput("64MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT5)
+                        mvOsOutput("128MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT6) 
+                        mvOsOutput("256MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT7) 
+                        mvOsOutput("512MB, ");
+                }
+                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
+                {
+                    if (dimmInfo.dimmBankDensity & BIT0)
+                        mvOsOutput("1GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT1)
+                        mvOsOutput("2GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT2)
+                        mvOsOutput("16MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT3)
+                        mvOsOutput("32MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT4)
+                        mvOsOutput("64MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT5)
+                        mvOsOutput("128MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT6) 
+                        mvOsOutput("256MB, ");
+                    if (dimmInfo.dimmBankDensity & BIT7) 
+                        mvOsOutput("512MB, ");
+                }
+                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
+                {
+                    if (dimmInfo.dimmBankDensity & BIT0)
+                        mvOsOutput("1GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT1)
+                        mvOsOutput("2GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT2)
+                        mvOsOutput("4GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT3)
+                        mvOsOutput("8GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT4)
+                        mvOsOutput("16GB, ");
+                    if (dimmInfo.dimmBankDensity & BIT5)
+                    mvOsOutput("128MB, ");
+                        if (dimmInfo.dimmBankDensity & BIT6) 
+                    mvOsOutput("256MB, ");
+                        if (dimmInfo.dimmBankDensity & BIT7) 
+                    mvOsOutput("512MB, ");
+                }
+                mvOsOutput("\n");
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 32: /* Address And Command Setup Time (measured in ns/1000) */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                    leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100; 
+                }
+                mvOsOutput("Address And Command Setup Time [ns]: 		%d.%d\n",
+                                                     leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 33: /* Address And Command Hold Time */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                    leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100;                 
+                }
+                mvOsOutput("Address And Command Hold Time [ns]: 		%d.%d\n",
+                                                   leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 34: /* Data Input Setup Time */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                        leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100;                 
+                }
+                mvOsOutput("Data Input Setup Time [ns]: 			%d.%d\n", 
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 35: /* Data Input Hold Time */
+                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
+                {
+                    rightOfPoint = (spdRawData[i] & 0x0f);
+                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
+                    if(leftOfPoint > 7)
+                    {
+                        leftOfPoint *= -1;
+                    }
+                }
+                else /* DDR1 or DDR2 */
+                {
+                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
+                                                      ((spdRawData[i] & 0x0f));
+                    leftOfPoint = time_tmp / 100;
+                    rightOfPoint = time_tmp % 100;                 
+                }
+                mvOsOutput("Data Input Hold Time [ns]: 			%d.%d\n\n", 
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+    
+            case 36: /* Relevant for DDR2 only: Write Recovery Time */
+                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> 2);
+                rightOfPoint = (spdRawData[i] & maskRightOfPoint) * 25;  
+                mvOsOutput("Write Recovery Time [ns]: 			%d.%d\n", 
+                                                    leftOfPoint, rightOfPoint);
+                break;
+/*----------------------------------------------------------------------------*/
+        }
+    
+}
+
+
+/*
+ * translate ns.ns/10 coding of SPD timing values
+ * into ps unit values
+ */
+/*******************************************************************************
+*  cas2ps - Translate x.y ns parameter to pico-seconds values
+*
+* DESCRIPTION:
+*       This function translates x.y nano seconds to its value in pico seconds.
+*       For example 3.75ns will return 3750.
+*
+* INPUT:
+*       spd_byte - DIMM SPD byte.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       value in pico seconds.
+*
+*******************************************************************************/
+static MV_U32  cas2ps(MV_U8 spd_byte)
+{
+    MV_U32 ns, ns10;
+    
+    /* isolate upper nibble */
+    ns = (spd_byte >> 4) & 0x0F;
+    /* isolate lower nibble */
+    ns10 = (spd_byte & 0x0F);
+    
+    if( ns10 < 10 ) {
+        ns10 *= 10;
+    }
+    else if( ns10 == 10 )
+        ns10 = 25;
+    else if( ns10 == 11 )
+        ns10 = 33;
+    else if( ns10 == 12 )
+        ns10 = 66;
+    else if( ns10 == 13 )
+        ns10 = 75;
+    else 
+    {
+        mvOsOutput("cas2ps Err. unsupported cycle time.\n");
+    }
+    
+    return (ns*1000 + ns10*10);
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h
new file mode 100644
index 00000000..f9554662
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h
@@ -0,0 +1,192 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvDram
+#define __INCmvDram
+
+#include "ddr2/mvDramIf.h"
+#include "twsi/mvTwsi.h"
+
+#define MAX_DIMM_NUM 			2
+#define SPD_SIZE			128
+
+/* Dimm spd offsets */
+#define DIMM_MEM_TYPE 					2
+#define DIMM_ROW_NUM 					3
+#define DIMM_COL_NUM 					4
+#define DIMM_MODULE_BANK_NUM 				5
+#define DIMM_DATA_WIDTH 				6
+#define DIMM_VOLT_IF 					8
+#define DIMM_MIN_CC_AT_MAX_CAS 				9
+#define DIMM_ERR_CHECK_TYPE 				11
+#define DIMM_REFRESH_INTERVAL 				12
+#define DIMM_SDRAM_WIDTH 				13
+#define DIMM_ERR_CHECK_DATA_WIDTH 			14
+#define DIMM_MIN_CLK_DEL 				15
+#define DIMM_BURST_LEN_SUP 				16
+#define DIMM_DEV_BANK_NUM 				17
+#define DIMM_SUP_CAL 					18
+#define DIMM_DDR2_TYPE_INFORMATION          		20      /* DDR2 only */
+#define DIMM_BUF_ADDR_CONT_IN 				21
+#define DIMM_MIN_CC_AT_MAX_CAS_MINUS1			23
+#define DIMM_MIN_CC_AT_MAX_CAS_MINUS2			25
+#define DIMM_MIN_ROW_PRECHARGE_TIME			27
+#define DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE		28
+#define DIMM_MIN_RAS_TO_CAS_DELAY			29
+#define DIMM_MIN_RAS_PULSE_WIDTH			30
+#define DIMM_BANK_DENSITY				31
+#define DIMM_MIN_WRITE_RECOVERY_TIME        		36
+#define DIMM_MIN_WRITE_TO_READ_CMD_DELAY    		37
+#define DIMM_MIN_READ_TO_PRECH_CMD_DELAY    		38
+#define DIMM_MIN_REFRESH_TO_ACTIVATE_CMD    		42
+#define DIMM_SPD_VERSION    				62
+
+/* Dimm Memory Type values */
+#define DIMM_MEM_TYPE_SDRAM					0x4
+#define DIMM_MEM_TYPE_DDR1 					0x7
+#define DIMM_MEM_TYPE_DDR2 					0x8
+        
+#define DIMM_MODULE_MANU_OFFS 		64
+#define DIMM_MODULE_MANU_SIZE 		8
+#define DIMM_MODULE_VEN_OFFS 		73 
+#define DIMM_MODULE_VEN_SIZE 		25
+#define DIMM_MODULE_ID_OFFS 		99
+#define DIMM_MODULE_ID_SIZE 		18
+
+/* enumeration for voltage levels. */
+typedef enum _mvDimmVoltageIf
+{
+    TTL_5V_TOLERANT, 
+    LVTTL, 
+    HSTL_1_5V, 
+    SSTL_3_3V, 
+    SSTL_2_5V, 
+    VOLTAGE_UNKNOWN, 
+} MV_DIMM_VOLTAGE_IF;
+
+
+/* enumaration for SDRAM CAS Latencies. */
+typedef enum _mvDimmSdramCas
+{
+    SD_CL_1 =1,  
+    SD_CL_2,  
+    SD_CL_3, 
+    SD_CL_4, 
+    SD_CL_5, 
+    SD_CL_6, 
+    SD_CL_7, 
+    SD_FAULT
+}MV_DIMM_SDRAM_CAS;
+
+
+/* DIMM information structure */                                                    
+typedef struct _mvDimmInfo
+{
+    MV_MEMORY_TYPE  memoryType; 	/* DDR or SDRAM */
+
+    MV_U8       spdRawData[SPD_SIZE];  	/* Content of SPD-EEPROM copied 1:1  */
+
+    /* DIMM dimensions */
+    MV_U32  numOfRowAddr;
+    MV_U32  numOfColAddr;
+    MV_U32  numOfModuleBanks;
+    MV_U32  dataWidth;
+    MV_U32  errorCheckType;             /* ECC , PARITY..*/
+    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
+    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
+    MV_U32  burstLengthSupported;
+    MV_U32  numOfBanksOnEachDevice;
+    MV_U32  suportedCasLatencies;
+    MV_U32  refreshInterval;
+    MV_U32  dimmBankDensity;
+    MV_U32  dimmTypeInfo;           /* DDR2 only */
+    MV_U32  dimmAttributes;
+
+    /* DIMM timing parameters */
+    MV_U32  minCycleTimeAtMaxCasLatPs;	
+    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
+    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
+	MV_U32  minRowPrechargeTime;
+	MV_U32  minRowActiveToRowActive;
+	MV_U32  minRasToCasDelay;
+	MV_U32  minRasPulseWidth;
+    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
+    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
+    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
+    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
+
+    /* Parameters calculated from the extracted DIMM information */
+    MV_U32  size;               /* 16,64,128,256 or 512 MByte in MB units */
+    MV_U32  deviceDensity;      /* 16,64,128,256 or 512 Mbit in MB units  */
+    MV_U32  numberOfDevices;
+
+} MV_DIMM_INFO;
+
+
+MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo);
+MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo);
+MV_VOID dimmSpdPrint(MV_U32 dimmNum);
+MV_STATUS dimmSpdCpy(MV_VOID);
+
+#endif /* __INCmvDram */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c
new file mode 100644
index 00000000..d24e788f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c
@@ -0,0 +1,2952 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvEth.c - Marvell's Gigabit Ethernet controller low level driver
+*
+* DESCRIPTION:
+*       This file introduce OS independent APIs to Marvell's Gigabit Ethernet
+*       controller. This Gigabit Ethernet Controller driver API controls
+*       1) Operations (i.e. port Init, Finish, Up, Down, PhyReset etc').
+*       2) Data flow (i.e. port Send, Receive etc').
+*       3) MAC Filtering functions (ethSetMcastAddr, ethSetRxFilterMode, etc.)
+*       4) MIB counters support (ethReadMibCounter)
+*       5) Debug functions (ethPortRegs, ethPortCounters, ethPortQueues, etc.)
+*       Each Gigabit Ethernet port is controlled via ETH_PORT_CTRL struct.
+*       This struct includes configuration information as well as driver
+*       internal data needed for its operations.
+*
+*       Supported Features:
+*       - OS independent. All required OS services are implemented via external 
+*       OS dependent components (like osLayer or ethOsg)
+*       - The user is free from Rx/Tx queue managing.
+*       - Simple Gigabit Ethernet port operation API.
+*       - Simple Gigabit Ethernet port data flow API.
+*       - Data flow and operation API support per queue functionality.
+*       - Support cached descriptors for better performance.
+*       - PHY access and control API.
+*       - Port Configuration API.
+*       - Full control over Special and Other Multicast MAC tables.
+*
+*******************************************************************************/
+/* includes */
+#include "mvTypes.h"
+#include "mv802_3.h"
+#include "mvDebug.h"
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "eth-phy/mvEthPhy.h"
+#include "eth/mvEth.h"
+#include "eth/gbe/mvEthGbe.h"
+#include "cpu/mvCpu.h"
+
+#ifdef INCLUDE_SYNC_BARR
+#include "sys/mvCpuIf.h"
+#endif
+
+#ifdef MV_RT_DEBUG
+#   define ETH_DEBUG
+#endif
+
+
+/* locals */
+MV_BOOL         ethDescInSram;
+MV_BOOL         ethDescSwCoher;
+
+/* This array holds the control structure of each port */
+ETH_PORT_CTRL* ethPortCtrl[MV_ETH_MAX_PORTS];
+
+/* Ethernet Port Local routines */
+
+static void    ethInitRxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue);
+
+static void    ethInitTxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue);
+
+static void    ethSetUcastTable(int portNo, int queue);
+
+static MV_BOOL ethSetUcastAddr (int ethPortNum, MV_U8 lastNibble, int queue);
+static MV_BOOL ethSetSpecialMcastAddr(int ethPortNum, MV_U8 lastByte, int queue);
+static MV_BOOL ethSetOtherMcastAddr(int ethPortNum, MV_U8 crc8, int queue);
+
+static void    ethFreeDescrMemory(ETH_PORT_CTRL* pEthPortCtrl, MV_BUF_INFO* pDescBuf);
+static MV_U8*  ethAllocDescrMemory(ETH_PORT_CTRL* pEthPortCtrl, int size, 
+                                   MV_ULONG* pPhysAddr, MV_U32 *memHandle);
+
+static MV_U32 mvEthMruGet(MV_U32 maxRxPktSize);
+
+static void mvEthPortSgmiiConfig(int port);
+
+
+
+/******************************************************************************/
+/*                      EthDrv Initialization functions                       */
+/******************************************************************************/
+
+/*******************************************************************************
+* mvEthHalInit - Initialize the Giga Ethernet unit
+*
+* DESCRIPTION:
+*       This function initialize the Giga Ethernet unit.
+*       1) Configure Address decode windows of the unit
+*       2) Set registers to HW default values. 
+*       3) Clear and Disable interrupts
+*
+* INPUT:  NONE
+*
+* RETURN: NONE
+*
+* NOTE: this function is called once in the boot process.
+*******************************************************************************/
+void    mvEthHalInit(void)
+{
+    int port;
+
+    /* Init static data structures */
+    for (port=0; port<MV_ETH_MAX_PORTS; port++)
+    {
+        ethPortCtrl[port] = NULL;
+    }
+    /* Power down all existing ports */
+    for(port=0; port<mvCtrlEthMaxPortGet(); port++)
+    {
+
+#if defined (MV78200)
+	    /* Skip ports mapped to another CPU*/
+	if (MV_FALSE == mvSocUnitIsMappedToThisCpu(GIGA0+port))
+	{
+		    continue;
+	}		
+#endif
+
+	/* Skip power down ports */
+	if (MV_FALSE == mvCtrlPwrClckGet(ETH_GIG_UNIT_ID, port)) continue;
+
+        /* Disable Giga Ethernet Unit interrupts */
+        MV_REG_WRITE(ETH_UNIT_INTR_MASK_REG(port), 0);
+
+        /* Clear ETH_UNIT_INTR_CAUSE_REG register */
+        MV_REG_WRITE(ETH_UNIT_INTR_CAUSE_REG(port), 0);
+
+    }
+
+    mvEthMemAttrGet(&ethDescInSram, &ethDescSwCoher);
+
+#if defined(ETH_DESCR_IN_SRAM)
+    if(ethDescInSram == MV_FALSE)
+    {
+        mvOsPrintf("ethDrv: WARNING! Descriptors will be allocated in DRAM instead of SRAM.\n");
+    }
+#endif /* ETH_DESCR_IN_SRAM */
+}
+
+/*******************************************************************************
+* mvEthMemAttrGet - Define properties (SRAM/DRAM, SW_COHER / HW_COHER / UNCACHED) 
+*                       of of memory location for RX and TX descriptors.
+*
+* DESCRIPTION:
+*       This function allocates memory for RX and TX descriptors.
+*       - If ETH_DESCR_IN_SRAM defined, allocate from SRAM memory.
+*       - If ETH_DESCR_IN_SDRAM defined, allocate from SDRAM memory.
+*
+* INPUT:
+*   MV_BOOL* pIsSram - place of descriptors: 
+*                      MV_TRUE  - in SRAM
+*                      MV_FALSE - in DRAM
+*   MV_BOOL* pIsSwCoher - cache coherency of descriptors:
+*                      MV_TRUE  - driver is responsible for cache coherency
+*                      MV_FALSE - driver is not responsible for cache coherency
+*
+* RETURN:
+*
+*******************************************************************************/
+void   mvEthMemAttrGet(MV_BOOL* pIsSram, MV_BOOL* pIsSwCoher)
+{
+    MV_BOOL isSram, isSwCoher;
+
+    isSram = MV_FALSE;
+#if (ETHER_DRAM_COHER == MV_CACHE_COHER_SW) 
+    isSwCoher = MV_TRUE;
+#else 
+    isSwCoher = MV_FALSE;
+#endif
+
+#if defined(ETH_DESCR_IN_SRAM)
+    if( mvCtrlSramSizeGet() > 0)
+    {
+        isSram = MV_TRUE;
+        #if (INTEG_SRAM_COHER == MV_CACHE_COHER_SW) 
+            isSwCoher = MV_TRUE;
+        #else 
+            isSwCoher = MV_FALSE;
+        #endif
+    }
+#endif /* ETH_DESCR_IN_SRAM */
+
+    if(pIsSram != NULL)
+        *pIsSram = isSram;
+
+    if(pIsSwCoher != NULL)
+        *pIsSwCoher = isSwCoher;
+}
+
+
+
+/******************************************************************************/
+/*                      Port Initialization functions                         */
+/******************************************************************************/
+
+/*******************************************************************************
+* mvEthPortInit - Initialize the Ethernet port driver
+*
+* DESCRIPTION:
+*       This function initialize the ethernet port.
+*       1) Allocate and initialize internal port Control structure.
+*       2) Create RX and TX descriptor rings for default RX and TX queues
+*       3) Disable RX and TX operations, clear cause registers and 
+*          mask all interrupts.
+*       4) Set all registers to default values and clean all MAC tables. 
+*
+* INPUT:
+*       int             portNo          - Ethernet port number
+*       ETH_PORT_INIT   *pEthPortInit   - Ethernet port init structure
+*
+* RETURN:
+*       void* - ethernet port handler, that should be passed to the most other
+*               functions dealing with this port.
+*
+* NOTE: This function is called once per port when loading the eth module.
+*******************************************************************************/
+void*   mvEthPortInit(int portNo, MV_ETH_PORT_INIT *pEthPortInit)
+{
+    int             queue, descSize;
+    ETH_PORT_CTRL*  pPortCtrl;
+
+    /* Check validity of parameters */
+    if( (portNo >= (int)mvCtrlEthMaxPortGet()) || 
+        (pEthPortInit->rxDefQ   >= MV_ETH_RX_Q_NUM)  ||
+        (pEthPortInit->maxRxPktSize < 1518) )
+    {
+        mvOsPrintf("EthPort #%d: Bad initialization parameters\n", portNo);
+        return NULL;
+    }
+    if( (pEthPortInit->rxDescrNum[pEthPortInit->rxDefQ]) == 0)
+    {
+        mvOsPrintf("EthPort #%d: rxDefQ (%d) must be created\n", 
+                    portNo, pEthPortInit->rxDefQ);
+        return NULL;
+    }
+
+    pPortCtrl = (ETH_PORT_CTRL*)mvOsMalloc( sizeof(ETH_PORT_CTRL) );
+    if(pPortCtrl == NULL)   
+    {
+       mvOsPrintf("EthDrv: Can't allocate %dB for port #%d control structure!\n",
+                   (int)sizeof(ETH_PORT_CTRL), portNo);
+       return NULL;
+    }
+
+    memset(pPortCtrl, 0, sizeof(ETH_PORT_CTRL) );
+    ethPortCtrl[portNo] = pPortCtrl;
+
+    pPortCtrl->portState = MV_UNDEFINED_STATE;
+
+    pPortCtrl->portNo = portNo;
+
+    pPortCtrl->osHandle = pEthPortInit->osHandle;
+
+    /* Copy Configuration parameters */
+    pPortCtrl->portConfig.maxRxPktSize = pEthPortInit->maxRxPktSize;
+    pPortCtrl->portConfig.rxDefQ = pEthPortInit->rxDefQ;
+    pPortCtrl->portConfig.ejpMode = 0;
+
+    for( queue=0; queue<MV_ETH_RX_Q_NUM; queue++ )
+    {
+        pPortCtrl->rxQueueConfig[queue].descrNum = pEthPortInit->rxDescrNum[queue];
+    }
+    for( queue=0; queue<MV_ETH_TX_Q_NUM; queue++ )
+    {
+        pPortCtrl->txQueueConfig[queue].descrNum = pEthPortInit->txDescrNum[queue];
+    }
+
+    mvEthPortDisable(pPortCtrl);
+
+    /* Set the board information regarding PHY address */
+    mvEthPhyAddrSet(pPortCtrl, mvBoardPhyAddrGet(portNo) );
+
+    /* Create all requested RX queues */
+    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
+    {
+        if(pPortCtrl->rxQueueConfig[queue].descrNum == 0)
+            continue;
+
+        /* Allocate memory for RX descriptors */
+        descSize = ((pPortCtrl->rxQueueConfig[queue].descrNum * ETH_RX_DESC_ALIGNED_SIZE) +
+                                                        CPU_D_CACHE_LINE_SIZE);
+ 
+        pPortCtrl->rxQueue[queue].descBuf.bufVirtPtr = 
+                        ethAllocDescrMemory(pPortCtrl, descSize, 
+					    &pPortCtrl->rxQueue[queue].descBuf.bufPhysAddr,
+					    &pPortCtrl->rxQueue[queue].descBuf.memHandle);
+        pPortCtrl->rxQueue[queue].descBuf.bufSize = descSize;
+        if(pPortCtrl->rxQueue[queue].descBuf.bufVirtPtr == NULL)
+        {
+            mvOsPrintf("EthPort #%d, rxQ=%d: Can't allocate %d bytes in %s for %d RX descr\n", 
+                        pPortCtrl->portNo, queue, descSize, 
+                        ethDescInSram ? "SRAM" : "DRAM",
+                        pPortCtrl->rxQueueConfig[queue].descrNum);
+            return NULL;
+        }
+
+        ethInitRxDescRing(pPortCtrl, queue);
+    }
+    /* Create TX queues */
+    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
+    {
+        if(pPortCtrl->txQueueConfig[queue].descrNum == 0)
+            continue;
+
+        /* Allocate memory for TX descriptors */
+        descSize = ((pPortCtrl->txQueueConfig[queue].descrNum * ETH_TX_DESC_ALIGNED_SIZE) +
+                                                        CPU_D_CACHE_LINE_SIZE);
+ 
+        pPortCtrl->txQueue[queue].descBuf.bufVirtPtr = 
+		ethAllocDescrMemory(pPortCtrl, descSize,
+				    &pPortCtrl->txQueue[queue].descBuf.bufPhysAddr,
+				    &pPortCtrl->txQueue[queue].descBuf.memHandle);
+        pPortCtrl->txQueue[queue].descBuf.bufSize = descSize;
+        if(pPortCtrl->txQueue[queue].descBuf.bufVirtPtr == NULL)
+        {
+            mvOsPrintf("EthPort #%d, txQ=%d: Can't allocate %d bytes in %s for %d TX descr\n", 
+                        pPortCtrl->portNo, queue, descSize, ethDescInSram ? "SRAM" : "DRAM",
+                        pPortCtrl->txQueueConfig[queue].descrNum);
+            return NULL;
+        }
+
+        ethInitTxDescRing(pPortCtrl, queue);
+    }
+    mvEthDefaultsSet(pPortCtrl);
+
+    pPortCtrl->portState = MV_IDLE;
+    return pPortCtrl;
+}
+
+/*******************************************************************************
+* ethPortFinish - Finish the Ethernet port driver
+*
+* DESCRIPTION:
+*       This function finish the ethernet port.
+*       1) Down ethernet port if needed.
+*       2) Delete RX and TX descriptor rings for all created RX and TX queues
+*       3) Free internal port Control structure.
+*
+* INPUT:
+*       void*   pEthPortHndl  - Ethernet port handler
+*
+* RETURN:   NONE.
+*
+*******************************************************************************/
+void    mvEthPortFinish(void* pPortHndl)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    int             queue, portNo  = pPortCtrl->portNo;
+
+    if(pPortCtrl->portState == MV_ACTIVE)
+    {
+        mvOsPrintf("ethPort #%d: Warning !!! Finish port in Active state\n",
+                 portNo);
+        mvEthPortDisable(pPortHndl);
+    }
+
+    /* Free all allocated RX queues */
+    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
+    {
+        ethFreeDescrMemory(pPortCtrl, &pPortCtrl->rxQueue[queue].descBuf);
+    }
+
+    /* Free all allocated TX queues */
+    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
+    {
+        ethFreeDescrMemory(pPortCtrl, &pPortCtrl->txQueue[queue].descBuf);
+    }
+
+    /* Free port control structure */
+    mvOsFree(pPortCtrl);
+
+    ethPortCtrl[portNo] = NULL;
+}
+
+/*******************************************************************************
+* mvEthDefaultsSet - Set defaults to the ethernet port
+*
+* DESCRIPTION:
+*       This function set default values to the ethernet port.
+*       1) Clear Cause registers and Mask all interrupts
+*       2) Clear all MAC tables
+*       3) Set defaults to all registers
+*       4) Reset all created RX and TX descriptors ring
+*       5) Reset PHY
+*
+* INPUT:
+*       void*   pEthPortHndl  - Ethernet port handler
+*
+* RETURN:   MV_STATUS  
+*               MV_OK - Success, Others - Failure
+* NOTE:
+*   This function update all the port configuration except those set
+*   Initialy by the OsGlue by MV_ETH_PORT_INIT.
+*   This function can be called after portDown to return the port setting 
+*   to defaults.
+*******************************************************************************/
+MV_STATUS   mvEthDefaultsSet(void* pPortHndl)
+{
+    int                 ethPortNo, queue;
+    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    ETH_QUEUE_CTRL*     pQueueCtrl;
+    MV_U32              txPrio;
+    MV_U32              portCfgReg, portCfgExtReg, portSerialCtrlReg, portSerialCtrl1Reg, portSdmaCfgReg;
+    MV_BOARD_MAC_SPEED  boardMacCfg;
+
+    ethPortNo = pPortCtrl->portNo;
+
+    /* Clear Cause registers */
+    MV_REG_WRITE(ETH_INTR_CAUSE_REG(ethPortNo),0);
+    MV_REG_WRITE(ETH_INTR_CAUSE_EXT_REG(ethPortNo),0);
+
+    /* Mask all interrupts */
+    MV_REG_WRITE(ETH_INTR_MASK_REG(ethPortNo),0);
+    MV_REG_WRITE(ETH_INTR_MASK_EXT_REG(ethPortNo),0);
+
+    portCfgReg  =   PORT_CONFIG_VALUE;
+    portCfgExtReg  =  PORT_CONFIG_EXTEND_VALUE;
+
+    boardMacCfg = mvBoardMacSpeedGet(ethPortNo);
+
+    if(boardMacCfg == BOARD_MAC_SPEED_100M)
+    {
+        portSerialCtrlReg = PORT_SERIAL_CONTROL_100MB_FORCE_VALUE;
+    }
+    else if(boardMacCfg == BOARD_MAC_SPEED_1000M)
+    {
+        portSerialCtrlReg = PORT_SERIAL_CONTROL_1000MB_FORCE_VALUE;
+    }
+    else
+    {
+        portSerialCtrlReg =  PORT_SERIAL_CONTROL_VALUE;
+    }
+
+    /* build PORT_SDMA_CONFIG_REG */
+    portSdmaCfgReg = ETH_TX_INTR_COAL_MASK(0);
+    portSdmaCfgReg |= ETH_TX_BURST_SIZE_MASK(ETH_BURST_SIZE_16_64BIT_VALUE);
+
+#if ( (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WB) ||  \
+      (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WT) )
+    /* some devices have restricted RX burst size when using HW coherency */
+    portSdmaCfgReg |= ETH_RX_BURST_SIZE_MASK(ETH_BURST_SIZE_4_64BIT_VALUE);
+#else
+    portSdmaCfgReg |= ETH_RX_BURST_SIZE_MASK(ETH_BURST_SIZE_16_64BIT_VALUE);
+#endif
+
+#if defined(MV_CPU_BE)
+    /* big endian */
+# if defined(MV_ARM)
+    portSdmaCfgReg |= (ETH_RX_NO_DATA_SWAP_MASK |
+                       ETH_TX_NO_DATA_SWAP_MASK |
+                       ETH_DESC_SWAP_MASK);
+# elif defined(MV_PPC)
+    portSdmaCfgReg |= (ETH_RX_DATA_SWAP_MASK |
+                       ETH_TX_DATA_SWAP_MASK |
+                       ETH_NO_DESC_SWAP_MASK);
+# else
+# error "Giga Ethernet Swap policy is not defined for the CPU_ARCH"
+# endif /* MV_ARM / MV_PPC */
+
+#else /* MV_CPU_LE */
+    /* little endian */
+    portSdmaCfgReg |= (ETH_RX_NO_DATA_SWAP_MASK | 
+                       ETH_TX_NO_DATA_SWAP_MASK | 
+                       ETH_NO_DESC_SWAP_MASK);
+#endif /* MV_CPU_BE / MV_CPU_LE */
+
+    pPortCtrl->portRxQueueCmdReg = 0;
+    pPortCtrl->portTxQueueCmdReg = 0;
+
+#if (MV_ETH_VERSION >= 4) 
+    if(pPortCtrl->portConfig.ejpMode == MV_TRUE)
+    {
+        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(ethPortNo), ETH_TX_EJP_ENABLE_MASK);
+    }
+    else
+    {
+        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(ethPortNo), 0)
+    }
+#endif /* (MV_ETH_VERSION >= 4) */
+
+    ethSetUcastTable(ethPortNo, -1);
+    mvEthSetSpecialMcastTable(ethPortNo, -1);
+    mvEthSetOtherMcastTable(ethPortNo, -1);
+
+    portSerialCtrlReg &= ~ETH_MAX_RX_PACKET_SIZE_MASK;
+
+    portSerialCtrlReg |= mvEthMruGet(pPortCtrl->portConfig.maxRxPktSize);
+
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNo), portSerialCtrlReg);
+
+    /* Update value of PortConfig register accordingly with all RxQueue types */
+    pPortCtrl->portConfig.rxArpQ = pPortCtrl->portConfig.rxDefQ;
+    pPortCtrl->portConfig.rxBpduQ = pPortCtrl->portConfig.rxDefQ; 
+    pPortCtrl->portConfig.rxTcpQ = pPortCtrl->portConfig.rxDefQ; 
+    pPortCtrl->portConfig.rxUdpQ = pPortCtrl->portConfig.rxDefQ; 
+
+    portCfgReg &= ~ETH_DEF_RX_QUEUE_ALL_MASK;
+    portCfgReg |= ETH_DEF_RX_QUEUE_MASK(pPortCtrl->portConfig.rxDefQ);
+    
+    portCfgReg &= ~ETH_DEF_RX_ARP_QUEUE_ALL_MASK;
+    portCfgReg |= ETH_DEF_RX_ARP_QUEUE_MASK(pPortCtrl->portConfig.rxArpQ); 
+
+    portCfgReg &= ~ETH_DEF_RX_BPDU_QUEUE_ALL_MASK;
+    portCfgReg |= ETH_DEF_RX_BPDU_QUEUE_MASK(pPortCtrl->portConfig.rxBpduQ);
+
+    portCfgReg &= ~ETH_DEF_RX_TCP_QUEUE_ALL_MASK;
+    portCfgReg |= ETH_DEF_RX_TCP_QUEUE_MASK(pPortCtrl->portConfig.rxTcpQ);
+
+    portCfgReg &= ~ETH_DEF_RX_UDP_QUEUE_ALL_MASK;
+    portCfgReg |= ETH_DEF_RX_UDP_QUEUE_MASK(pPortCtrl->portConfig.rxUdpQ);
+
+    /* Assignment of Tx CTRP of given queue */
+    txPrio = 0;
+
+    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
+    {
+        pQueueCtrl = &pPortCtrl->txQueue[queue];
+
+        if(pQueueCtrl->pFirstDescr != NULL)
+        {
+            ethResetTxDescRing(pPortCtrl, queue);
+
+            MV_REG_WRITE(ETH_TXQ_TOKEN_COUNT_REG(ethPortNo, queue),
+                         0x3fffffff);
+            MV_REG_WRITE(ETH_TXQ_TOKEN_CFG_REG(ethPortNo, queue), 
+                         0x03ffffff);
+        }
+        else
+        {
+            MV_REG_WRITE(ETH_TXQ_TOKEN_COUNT_REG(ethPortNo, queue),  0x0);
+            MV_REG_WRITE(ETH_TXQ_TOKEN_CFG_REG(ethPortNo, queue), 0x0);
+        }
+    }
+
+    /* Assignment of Rx CRDP of given queue */
+    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
+    {
+        ethResetRxDescRing(pPortCtrl, queue);
+    }
+
+    /* Allow receiving packes with odd number of preamble nibbles */
+    portSerialCtrl1Reg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(ethPortNo));
+    portSerialCtrl1Reg |= ETH_EN_MII_ODD_PRE_MASK;
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(ethPortNo), portSerialCtrl1Reg);
+
+    /* Assign port configuration and command. */
+    MV_REG_WRITE(ETH_PORT_CONFIG_REG(ethPortNo), portCfgReg);
+
+    MV_REG_WRITE(ETH_PORT_CONFIG_EXTEND_REG(ethPortNo), portCfgExtReg);
+
+    /* Assign port SDMA configuration */
+    MV_REG_WRITE(ETH_SDMA_CONFIG_REG(ethPortNo), portSdmaCfgReg);
+    
+    /* Turn off the port/queue bandwidth limitation */
+    MV_REG_WRITE(ETH_MAX_TRANSMIT_UNIT_REG(ethPortNo), 0x0);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* ethPortUp - Start the Ethernet port RX and TX activity.
+*
+* DESCRIPTION:
+*       This routine start Rx and Tx activity:
+*
+*       Note: Each Rx and Tx queue descriptor's list must be initialized prior
+*       to calling this function (use etherInitTxDescRing for Tx queues and
+*       etherInitRxDescRing for Rx queues).
+*
+* INPUT:
+*       void*   pEthPortHndl  - Ethernet port handler
+*
+* RETURN:   MV_STATUS
+*           MV_OK - Success, Others - Failure.
+*
+* NOTE : used for port link up.
+*******************************************************************************/
+MV_STATUS   mvEthPortUp(void* pEthPortHndl)
+{
+    int             ethPortNo;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+
+    ethPortNo = pPortCtrl->portNo;
+    
+    if( (pPortCtrl->portState != MV_ACTIVE) && 
+        (pPortCtrl->portState != MV_PAUSED) )
+    {
+        mvOsPrintf("ethDrv port%d: Unexpected port state %d\n", 
+                        ethPortNo, pPortCtrl->portState);
+        return MV_BAD_STATE;
+    }
+    
+    ethPortNo = pPortCtrl->portNo;
+
+    /* Enable port RX. */
+    MV_REG_WRITE(ETH_RX_QUEUE_COMMAND_REG(ethPortNo), pPortCtrl->portRxQueueCmdReg);
+
+    /* Enable port TX. */
+    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(ethPortNo)) = pPortCtrl->portTxQueueCmdReg;
+
+    pPortCtrl->portState = MV_ACTIVE;
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* ethPortDown - Stop the Ethernet port activity.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       void*   pEthPortHndl  - Ethernet port handler
+*
+* RETURN:   MV_STATUS
+*               MV_OK - Success, Others - Failure.
+*
+* NOTE : used for port link down.
+*******************************************************************************/
+MV_STATUS   mvEthPortDown(void* pEthPortHndl)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    int             ethPortNum = pPortCtrl->portNo;
+    unsigned int    regData;
+    volatile int    uDelay, mDelay;
+
+    /* Stop Rx port activity. Check port Rx activity. */
+    regData = (MV_REG_READ(ETH_RX_QUEUE_COMMAND_REG(ethPortNum))) & ETH_RXQ_ENABLE_MASK;
+    if(regData != 0)
+    {
+        /* Issue stop command for active channels only */
+        MV_REG_WRITE(ETH_RX_QUEUE_COMMAND_REG(ethPortNum), (regData << ETH_RXQ_DISABLE_OFFSET));
+    }
+
+    /* Stop Tx port activity. Check port Tx activity. */
+    regData = (MV_REG_READ(ETH_TX_QUEUE_COMMAND_REG(ethPortNum))) & ETH_TXQ_ENABLE_MASK;
+    if(regData != 0)
+    {
+        /* Issue stop command for active channels only */
+        MV_REG_WRITE(ETH_TX_QUEUE_COMMAND_REG(ethPortNum), 
+                            (regData << ETH_TXQ_DISABLE_OFFSET) ); 
+    }
+
+    /* Force link down */
+/*
+    regData = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNum));
+    regData &= ~(ETH_DO_NOT_FORCE_LINK_FAIL_MASK);
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNum), regData);
+*/
+    /* Wait for all Rx activity to terminate. */
+    mDelay = 0;
+    do
+    {
+        if(mDelay >= RX_DISABLE_TIMEOUT_MSEC)
+        {
+            mvOsPrintf("ethPort_%d: TIMEOUT for RX stopped !!! rxQueueCmd - 0x08%x\n", 
+                        ethPortNum, regData);
+            break;
+        }
+        mvOsDelay(1);
+        mDelay++;
+        
+        /* Check port RX Command register that all Rx queues are stopped */
+        regData = MV_REG_READ(ETH_RX_QUEUE_COMMAND_REG(ethPortNum));
+    }
+    while(regData & 0xFF);
+
+    /* Wait for all Tx activity to terminate. */
+    mDelay = 0;
+    do
+    {
+        if(mDelay >= TX_DISABLE_TIMEOUT_MSEC)
+        {
+            mvOsPrintf("ethPort_%d: TIMEOUT for TX stoped !!! txQueueCmd - 0x08%x\n", 
+                        ethPortNum, regData);
+            break;
+        }
+        mvOsDelay(1);
+        mDelay++;
+
+        /* Check port TX Command register that all Tx queues are stopped */
+        regData = MV_REG_READ(ETH_TX_QUEUE_COMMAND_REG(ethPortNum));
+    }
+    while(regData & 0xFF);
+    
+    /* Double check to Verify that TX FIFO is Empty */
+    mDelay = 0;
+    while(MV_TRUE)
+    {
+        do
+        {
+            if(mDelay >= TX_FIFO_EMPTY_TIMEOUT_MSEC)
+            {
+                mvOsPrintf("\n ethPort_%d: TIMEOUT for TX FIFO empty !!! portStatus - 0x08%x\n", 
+                            ethPortNum, regData);
+                break;
+            }
+            mvOsDelay(1);
+            mDelay++;
+
+            regData = MV_REG_READ(ETH_PORT_STATUS_REG(ethPortNum));
+        }
+        while( ((regData & ETH_TX_FIFO_EMPTY_MASK) == 0) || 
+               ((regData & ETH_TX_IN_PROGRESS_MASK) != 0) );
+
+        if(mDelay >= TX_FIFO_EMPTY_TIMEOUT_MSEC)
+            break;
+
+        /* Double check */
+        regData = MV_REG_READ(ETH_PORT_STATUS_REG(ethPortNum));
+        if( ((regData & ETH_TX_FIFO_EMPTY_MASK) != 0) && 
+            ((regData & ETH_TX_IN_PROGRESS_MASK) == 0) )
+        {
+            break;
+        }
+        else
+            mvOsPrintf("ethPort_%d: TX FIFO Empty double check failed. %d msec, portStatus=0x%x\n",
+                                ethPortNum, mDelay, regData);     
+    }
+
+    /* Do NOT force link down */
+/*
+    regData = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNum));
+    regData |= (ETH_DO_NOT_FORCE_LINK_FAIL_MASK);
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNum), regData);
+*/
+    /* Wait about 2500 tclk cycles */
+    uDelay = (PORT_DISABLE_WAIT_TCLOCKS/(mvBoardTclkGet()/1000000));
+    mvOsUDelay(uDelay);
+
+    pPortCtrl->portState = MV_PAUSED;
+
+    return MV_OK;   
+}
+
+
+/*******************************************************************************
+* ethPortEnable - Enable the Ethernet port and Start RX and TX.
+*
+* DESCRIPTION:
+*       This routine enable the Ethernet port and Rx and Tx activity:
+*
+*       Note: Each Rx and Tx queue descriptor's list must be initialized prior
+*       to calling this function (use etherInitTxDescRing for Tx queues and
+*       etherInitRxDescRing for Rx queues).
+*
+* INPUT:
+*       void*   pEthPortHndl  - Ethernet port handler
+*
+* RETURN:   MV_STATUS
+*               MV_OK - Success, Others - Failure.
+*
+* NOTE: main usage is to enable the port after ifconfig up.
+*******************************************************************************/
+MV_STATUS   mvEthPortEnable(void* pEthPortHndl)
+{
+    int             ethPortNo;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    MV_U32      portSerialCtrlReg;
+
+    ethPortNo = pPortCtrl->portNo;
+
+    /* Enable port */
+    portSerialCtrlReg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNo));
+    portSerialCtrlReg |= (ETH_DO_NOT_FORCE_LINK_FAIL_MASK | ETH_PORT_ENABLE_MASK);
+
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNo), portSerialCtrlReg);
+
+    mvEthMibCountersClear(pEthPortHndl);
+
+    pPortCtrl->portState = MV_PAUSED;
+
+    /* If Link is UP, Start RX and TX traffic */
+    if( MV_REG_READ( ETH_PORT_STATUS_REG(ethPortNo) ) & ETH_LINK_UP_MASK)
+        return( mvEthPortUp(pEthPortHndl) );
+    
+    return MV_NOT_READY;
+}
+
+
+/*******************************************************************************
+* mvEthPortDisable - Stop RX and TX activities and Disable the Ethernet port.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       void*   pEthPortHndl  - Ethernet port handler
+*
+* RETURN:   MV_STATUS
+*               MV_OK - Success, Others - Failure.
+*
+* NOTE: main usage is to disable the port after ifconfig down.
+*******************************************************************************/
+MV_STATUS   mvEthPortDisable(void* pEthPortHndl)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    int             ethPortNum = pPortCtrl->portNo;
+    unsigned int    regData;
+    volatile int    mvDelay;
+
+    if(pPortCtrl->portState == MV_ACTIVE)           
+    {    
+        /* Stop RX and TX activities */
+        mvEthPortDown(pEthPortHndl);
+    }
+
+    /* Reset the Enable bit in the Serial Control Register */
+    regData = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNum));
+    regData &= ~(ETH_PORT_ENABLE_MASK);
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNum), regData);
+
+    /* Wait about 2500 tclk cycles */
+    mvDelay = (PORT_DISABLE_WAIT_TCLOCKS*(mvCpuPclkGet()/mvBoardTclkGet()));
+    for(mvDelay; mvDelay>0; mvDelay--);
+
+    pPortCtrl->portState = MV_IDLE;
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthPortForceTxDone - Get next buffer from TX queue in spite of buffer ownership.
+*
+* DESCRIPTION:
+*       This routine used to free buffers attached to the Tx ring and should
+*       be called only when Giga Ethernet port is Down
+*
+* INPUT:
+*       void*       pEthPortHndl    - Ethernet Port handler.
+*       int         txQueue         - Number of TX queue.
+*
+* OUTPUT:
+*       MV_PKT_INFO *pPktInfo       - Pointer to packet was sent.
+*
+* RETURN:
+*       MV_EMPTY    - There is no more buffers in this queue.
+*       MV_OK       - Buffer detached from the queue and pPktInfo structure 
+*                   filled with relevant information.
+*
+*******************************************************************************/
+MV_PKT_INFO*    mvEthPortForceTxDone(void* pEthPortHndl, int txQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl;
+    MV_PKT_INFO*    pPktInfo;
+    ETH_TX_DESC*    pTxDesc;
+    int             port = pPortCtrl->portNo;
+       
+    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
+
+    while( (pQueueCtrl->pUsedDescr != pQueueCtrl->pCurrentDescr) ||
+           (pQueueCtrl->resource == 0) )
+    {
+        /* Free next descriptor */
+        pQueueCtrl->resource++;
+        pTxDesc = (ETH_TX_DESC*)pQueueCtrl->pUsedDescr;
+
+	/* pPktInfo is available only in descriptors which are last descriptors */
+        pPktInfo = (MV_PKT_INFO*)pTxDesc->returnInfo;
+	if (pPktInfo)
+        	pPktInfo->status = pTxDesc->cmdSts;
+
+        pTxDesc->cmdSts = 0x0;
+        pTxDesc->returnInfo = 0x0;
+        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxDesc);
+
+        pQueueCtrl->pUsedDescr = TX_NEXT_DESC_PTR(pTxDesc, pQueueCtrl);
+
+        if (pPktInfo)
+		if (pPktInfo->status  & ETH_TX_LAST_DESC_MASK) 
+            		return pPktInfo;
+    }   
+    MV_REG_WRITE( ETH_TX_CUR_DESC_PTR_REG(port, txQueue), 
+                    (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
+    return NULL;
+}
+
+        
+
+/*******************************************************************************
+* mvEthPortForceRx - Get next buffer from RX queue in spite of buffer ownership.
+*
+* DESCRIPTION:
+*       This routine used to free buffers attached to the Rx ring and should
+*       be called only when Giga Ethernet port is Down
+*
+* INPUT:
+*       void*       pEthPortHndl    - Ethernet Port handler.
+*       int         rxQueue         - Number of Rx queue.
+*
+* OUTPUT:
+*       MV_PKT_INFO *pPktInfo       - Pointer to received packet.
+*
+* RETURN:
+*       MV_EMPTY    - There is no more buffers in this queue.
+*       MV_OK       - Buffer detached from the queue and pBufInfo structure 
+*                   filled with relevant information.
+*
+*******************************************************************************/
+MV_PKT_INFO*    mvEthPortForceRx(void* pEthPortHndl, int rxQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl;
+    ETH_RX_DESC*    pRxDesc;
+    MV_PKT_INFO*    pPktInfo;
+    int             port = pPortCtrl->portNo;
+       
+    pQueueCtrl = &pPortCtrl->rxQueue[rxQueue];
+
+    if(pQueueCtrl->resource == 0)
+    {
+        MV_REG_WRITE( ETH_RX_CUR_DESC_PTR_REG(port, rxQueue), 
+                    (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
+
+        return NULL;
+    }
+    /* Free next descriptor */
+    pQueueCtrl->resource--;
+    pRxDesc = (ETH_RX_DESC*)pQueueCtrl->pCurrentDescr;
+    pPktInfo = (MV_PKT_INFO*)pRxDesc->returnInfo;
+
+    pPktInfo->status  = pRxDesc->cmdSts;
+    pRxDesc->cmdSts = 0x0;
+    pRxDesc->returnInfo = 0x0;
+    ETH_DESCR_FLUSH_INV(pPortCtrl, pRxDesc);
+
+    pQueueCtrl->pCurrentDescr = RX_NEXT_DESC_PTR(pRxDesc, pQueueCtrl);
+    return pPktInfo;    
+}
+
+
+/******************************************************************************/
+/*                          Port Configuration functions                      */
+/******************************************************************************/
+/*******************************************************************************
+* mvEthMruGet - Get MRU configuration for Max Rx packet size.
+*
+* INPUT:
+*           MV_U32 maxRxPktSize - max  packet size.
+*
+* RETURN:   MV_U32 - MRU configuration.
+*
+*******************************************************************************/
+static MV_U32 mvEthMruGet(MV_U32 maxRxPktSize)
+{
+    MV_U32 portSerialCtrlReg = 0;
+
+    if(maxRxPktSize > 9192)
+        portSerialCtrlReg |= ETH_MAX_RX_PACKET_9700BYTE;
+    else if(maxRxPktSize > 9022)
+        portSerialCtrlReg |= ETH_MAX_RX_PACKET_9192BYTE;
+    else if(maxRxPktSize > 1552)
+        portSerialCtrlReg |= ETH_MAX_RX_PACKET_9022BYTE;
+    else if(maxRxPktSize > 1522)
+        portSerialCtrlReg |= ETH_MAX_RX_PACKET_1552BYTE;
+    else if(maxRxPktSize > 1518)
+        portSerialCtrlReg |= ETH_MAX_RX_PACKET_1522BYTE;
+    else
+        portSerialCtrlReg |= ETH_MAX_RX_PACKET_1518BYTE;
+
+    return portSerialCtrlReg;
+}
+
+/*******************************************************************************
+* mvEthRxCoalSet  - Sets coalescing interrupt mechanism on RX path
+*
+* DESCRIPTION:
+*       This routine sets the RX coalescing interrupt mechanism parameter.
+*       This parameter is a timeout counter, that counts in 64 tClk
+*       chunks, that when timeout event occurs a maskable interrupt occurs.
+*       The parameter is calculated using the tCLK frequency of the
+*       MV-64xxx chip, and the required number is in micro seconds.
+*
+* INPUT:
+*       void*           pPortHndl   - Ethernet Port handler.
+*       MV_U32          uSec        - Number of micro seconds between 
+*                                   RX interrupts
+*
+* RETURN:
+*       None.
+*
+* COMMENT:     
+*   1 sec           - TCLK_RATE clocks
+*   1 uSec          - TCLK_RATE / 1,000,000 clocks
+*
+*   Register Value for N micro seconds -  ((N * ( (TCLK_RATE / 1,000,000)) / 64)
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_U32    mvEthRxCoalSet (void* pPortHndl, MV_U32 uSec) 
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    MV_U32          coal = ((uSec * (mvBoardTclkGet() / 1000000)) / 64);
+    MV_U32          portSdmaCfgReg;
+
+    portSdmaCfgReg =  MV_REG_READ(ETH_SDMA_CONFIG_REG(pPortCtrl->portNo));
+    portSdmaCfgReg &= ~ETH_RX_INTR_COAL_ALL_MASK;
+
+    portSdmaCfgReg |= ETH_RX_INTR_COAL_MASK(coal);
+
+#if (MV_ETH_VERSION >= 2)
+    /* Set additional bit if needed ETH_RX_INTR_COAL_MSB_BIT (25) */
+    if(ETH_RX_INTR_COAL_MASK(coal) > ETH_RX_INTR_COAL_ALL_MASK)
+        portSdmaCfgReg |= ETH_RX_INTR_COAL_MSB_MASK;
+#endif /* MV_ETH_VERSION >= 2 */
+
+    MV_REG_WRITE (ETH_SDMA_CONFIG_REG(pPortCtrl->portNo), portSdmaCfgReg);
+    return coal;
+}
+
+/*******************************************************************************
+* mvEthTxCoalSet - Sets coalescing interrupt mechanism on TX path
+*
+* DESCRIPTION:
+*       This routine sets the TX coalescing interrupt mechanism parameter.
+*       This parameter is a timeout counter, that counts in 64 tClk
+*       chunks, that when timeout event occurs a maskable interrupt
+*       occurs.
+*       The parameter is calculated using the tCLK frequency of the
+*       MV-64xxx chip, and the required number is in micro seconds.
+*
+* INPUT:
+*       void*           pPortHndl    - Ethernet Port handler.
+*       MV_U32          uSec        - Number of micro seconds between 
+*                                   RX interrupts
+*
+* RETURN:
+*       None.
+*
+* COMMENT:     
+*   1 sec           - TCLK_RATE clocks
+*   1 uSec          - TCLK_RATE / 1,000,000 clocks
+*
+*   Register Value for N micro seconds -  ((N * ( (TCLK_RATE / 1,000,000)) / 64)
+*
+*******************************************************************************/
+MV_U32    mvEthTxCoalSet(void* pPortHndl, MV_U32 uSec) 
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    MV_U32          coal = ((uSec * (mvBoardTclkGet() / 1000000)) / 64);
+    MV_U32          regVal;
+
+    regVal = MV_REG_READ(ETH_TX_FIFO_URGENT_THRESH_REG(pPortCtrl->portNo));
+    regVal &= ~ETH_TX_INTR_COAL_ALL_MASK;
+    regVal |= ETH_TX_INTR_COAL_MASK(coal);
+
+    /* Set TX Coalescing mechanism */
+    MV_REG_WRITE (ETH_TX_FIFO_URGENT_THRESH_REG(pPortCtrl->portNo), regVal); 
+    return coal;
+}
+
+/*******************************************************************************
+* mvEthCoalGet - Gets RX and TX coalescing values in micro seconds
+*
+* DESCRIPTION:
+*       This routine gets the RX and TX coalescing interrupt values.
+*       The parameter is calculated using the tCLK frequency of the
+*       MV-64xxx chip, and the returned numbers are in micro seconds.
+*
+* INPUTs:
+*       void*   pPortHndl   - Ethernet Port handler.
+*
+* OUTPUTs:
+*       MV_U32* pRxCoal     - Number of micro seconds between RX interrupts
+*       MV_U32* pTxCoal     - Number of micro seconds between TX interrupts
+*
+* RETURN:
+*       MV_STATUS   MV_OK  - success
+*                   Others - failure.
+*
+* COMMENT:     
+*   1 sec           - TCLK_RATE clocks
+*   1 uSec          - TCLK_RATE / 1,000,000 clocks
+*
+*   Register Value for N micro seconds -  ((N * ( (TCLK_RATE / 1,000,000)) / 64)
+*
+*******************************************************************************/
+MV_STATUS   mvEthCoalGet(void* pPortHndl, MV_U32* pRxCoal, MV_U32* pTxCoal)
+{
+    MV_U32  regVal, coal, usec;
+
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+
+    /* get TX Coalescing */
+    regVal = MV_REG_READ (ETH_TX_FIFO_URGENT_THRESH_REG(pPortCtrl->portNo));
+    coal = ((regVal & ETH_TX_INTR_COAL_ALL_MASK) >> ETH_TX_INTR_COAL_OFFSET);
+
+    usec = (coal * 64) / (mvBoardTclkGet() / 1000000);
+    if(pTxCoal != NULL)
+        *pTxCoal = usec;
+
+    /* Get RX Coalescing */
+    regVal =  MV_REG_READ(ETH_SDMA_CONFIG_REG(pPortCtrl->portNo));
+    coal = ((regVal & ETH_RX_INTR_COAL_ALL_MASK) >> ETH_RX_INTR_COAL_OFFSET);
+
+#if (MV_ETH_VERSION >= 2)
+    if(regVal & ETH_RX_INTR_COAL_MSB_MASK)
+    {
+        /* Add MSB */
+        coal |= (ETH_RX_INTR_COAL_ALL_MASK + 1);
+    }
+#endif /* MV_ETH_VERSION >= 2 */
+
+    usec = (coal * 64) / (mvBoardTclkGet() / 1000000);
+    if(pRxCoal != NULL)
+        *pRxCoal = usec;
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthMaxRxSizeSet - 
+*
+* DESCRIPTION:
+*       Change maximum receive size of the port. This configuration will take place 
+*       after next call of ethPortSetDefaults() function.
+*
+* INPUT:
+*
+* RETURN:
+*******************************************************************************/
+MV_STATUS   mvEthMaxRxSizeSet(void* pPortHndl, int maxRxSize)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    MV_U32      portSerialCtrlReg;
+
+    if((maxRxSize < 1518) || (maxRxSize & ~ETH_RX_BUFFER_MASK))
+       return MV_BAD_PARAM;
+    
+    pPortCtrl->portConfig.maxRxPktSize = maxRxSize;
+
+    portSerialCtrlReg =  MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(pPortCtrl->portNo));
+    portSerialCtrlReg &= ~ETH_MAX_RX_PACKET_SIZE_MASK;
+    portSerialCtrlReg |= mvEthMruGet(pPortCtrl->portConfig.maxRxPktSize);
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(pPortCtrl->portNo), portSerialCtrlReg);
+
+    return MV_OK;
+}
+
+
+/******************************************************************************/
+/*                      MAC Filtering functions                               */
+/******************************************************************************/
+
+/*******************************************************************************
+* mvEthRxFilterModeSet - Configure Fitering mode of Ethernet port
+*
+* DESCRIPTION:
+*       This routine used to free buffers attached to the Rx ring and should
+*       be called only when Giga Ethernet port is Down
+*
+* INPUT:
+*       void*       pEthPortHndl    - Ethernet Port handler.
+*       MV_BOOL     isPromisc       - Promiscous mode
+*                                   MV_TRUE  - accept all Broadcast, Multicast 
+*                                              and Unicast packets
+*                                   MV_FALSE - accept all Broadcast, 
+*                                              specially added Multicast and
+*                                              single Unicast packets
+*
+* RETURN:   MV_STATUS   MV_OK - Success, Other - Failure
+*
+*******************************************************************************/
+MV_STATUS   mvEthRxFilterModeSet(void* pEthPortHndl, MV_BOOL isPromisc)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    int             queue;
+    MV_U32      portCfgReg;
+
+    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
+    /* Set / Clear UPM bit in port configuration register */
+    if(isPromisc)
+    {
+        /* Accept all multicast packets to RX default queue */
+        queue = pPortCtrl->portConfig.rxDefQ;
+        portCfgReg |= ETH_UNICAST_PROMISCUOUS_MODE_MASK;
+        memset(pPortCtrl->mcastCount, 1, sizeof(pPortCtrl->mcastCount));
+        MV_REG_WRITE(ETH_MAC_ADDR_LOW_REG(pPortCtrl->portNo),0xFFFF);
+        MV_REG_WRITE(ETH_MAC_ADDR_HIGH_REG(pPortCtrl->portNo),0xFFFFFFFF);
+    }
+    else
+    {
+        /* Reject all Multicast addresses */
+        queue = -1;
+        portCfgReg &= ~ETH_UNICAST_PROMISCUOUS_MODE_MASK;
+        /* Clear all mcastCount */
+        memset(pPortCtrl->mcastCount, 0, sizeof(pPortCtrl->mcastCount));
+    }
+    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);        
+
+    /* Set Special Multicast and Other Multicast tables */
+    mvEthSetSpecialMcastTable(pPortCtrl->portNo, queue);
+    mvEthSetOtherMcastTable(pPortCtrl->portNo, queue);
+    ethSetUcastTable(pPortCtrl->portNo, queue);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthMacAddrSet - This function Set the port Unicast address.
+*
+* DESCRIPTION:
+*       This function Set the port Ethernet MAC address. This address
+*       will be used to send Pause frames if enabled. Packets with this
+*       address will be accepted and dispatched to default RX queue
+*
+* INPUT:
+*       void*   pEthPortHndl    - Ethernet port handler.
+*       char*   pAddr           - Address to be set
+*
+* RETURN:   MV_STATUS
+*               MV_OK - Success,  Other - Faulure
+*
+*******************************************************************************/
+MV_STATUS   mvEthMacAddrSet(void* pPortHndl, unsigned char *pAddr, int queue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    unsigned int    macH;
+    unsigned int    macL;
+
+    if(queue >= MV_ETH_RX_Q_NUM)
+    {
+        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", queue);
+        return MV_BAD_PARAM;
+    }
+
+    if(queue != -1)
+    {
+        macL =  (pAddr[4] << 8) | (pAddr[5]);
+        macH =  (pAddr[0] << 24)| (pAddr[1] << 16) |
+                (pAddr[2] << 8) | (pAddr[3] << 0);
+
+        MV_REG_WRITE(ETH_MAC_ADDR_LOW_REG(pPortCtrl->portNo),  macL);
+        MV_REG_WRITE(ETH_MAC_ADDR_HIGH_REG(pPortCtrl->portNo), macH);
+    }
+
+    /* Accept frames of this address */
+    ethSetUcastAddr(pPortCtrl->portNo, pAddr[5], queue);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthMacAddrGet - This function returns the port Unicast address.
+*
+* DESCRIPTION:
+*       This function returns the port Ethernet MAC address.
+*
+* INPUT:
+*       int     portNo          - Ethernet port number.
+*       char*   pAddr           - Pointer where address will be written to
+*
+* RETURN:   MV_STATUS
+*               MV_OK - Success,  Other - Faulure
+*
+*******************************************************************************/
+MV_STATUS   mvEthMacAddrGet(int portNo, unsigned char *pAddr)
+{
+    unsigned int    macH;
+    unsigned int    macL;
+
+    if(pAddr == NULL)
+    {
+        mvOsPrintf("mvEthMacAddrGet: NULL pointer.\n");
+        return MV_BAD_PARAM;
+    }
+
+    macH = MV_REG_READ(ETH_MAC_ADDR_HIGH_REG(portNo));
+    macL = MV_REG_READ(ETH_MAC_ADDR_LOW_REG(portNo));
+    pAddr[0] = (macH >> 24) & 0xff;
+    pAddr[1] = (macH >> 16) & 0xff;
+    pAddr[2] = (macH >> 8) & 0xff;
+    pAddr[3] = macH  & 0xff;
+    pAddr[4] = (macL >> 8) & 0xff;
+    pAddr[5] = macL  & 0xff;
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthMcastCrc8Get - Calculate CRC8 of MAC address.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       MV_U8*  pAddr           - Address to calculate CRC-8
+*
+* RETURN: MV_U8 - CRC-8 of this MAC address
+*
+*******************************************************************************/
+MV_U8   mvEthMcastCrc8Get(MV_U8* pAddr)
+{
+    unsigned int    macH;
+    unsigned int    macL;
+    int             macArray[48];
+    int             crc[8];
+    int             i;
+    unsigned char   crcResult = 0;
+
+        /* Calculate CRC-8 out of the given address */
+    macH =  (pAddr[0] << 8) | (pAddr[1]);
+    macL =  (pAddr[2] << 24)| (pAddr[3] << 16) |
+            (pAddr[4] << 8) | (pAddr[5] << 0);
+
+    for(i=0; i<32; i++)
+        macArray[i] = (macL >> i) & 0x1;
+
+    for(i=32; i<48; i++)
+        macArray[i] = (macH >> (i - 32)) & 0x1;
+
+    crc[0] = macArray[45] ^ macArray[43] ^ macArray[40] ^ macArray[39] ^
+             macArray[35] ^ macArray[34] ^ macArray[31] ^ macArray[30] ^
+             macArray[28] ^ macArray[23] ^ macArray[21] ^ macArray[19] ^
+             macArray[18] ^ macArray[16] ^ macArray[14] ^ macArray[12] ^
+             macArray[8]  ^ macArray[7]  ^ macArray[6]  ^ macArray[0];
+
+    crc[1] = macArray[46] ^ macArray[45] ^ macArray[44] ^ macArray[43] ^
+             macArray[41] ^ macArray[39] ^ macArray[36] ^ macArray[34] ^
+             macArray[32] ^ macArray[30] ^ macArray[29] ^ macArray[28] ^
+             macArray[24] ^ macArray[23] ^ macArray[22] ^ macArray[21] ^
+             macArray[20] ^ macArray[18] ^ macArray[17] ^ macArray[16] ^
+             macArray[15] ^ macArray[14] ^ macArray[13] ^ macArray[12] ^
+             macArray[9]  ^ macArray[6]  ^ macArray[1]  ^ macArray[0];
+
+    crc[2] = macArray[47] ^ macArray[46] ^ macArray[44] ^ macArray[43] ^
+             macArray[42] ^ macArray[39] ^ macArray[37] ^ macArray[34] ^
+             macArray[33] ^ macArray[29] ^ macArray[28] ^ macArray[25] ^
+             macArray[24] ^ macArray[22] ^ macArray[17] ^ macArray[15] ^
+             macArray[13] ^ macArray[12] ^ macArray[10] ^ macArray[8]  ^
+             macArray[6]  ^ macArray[2]  ^ macArray[1]  ^ macArray[0];
+
+    crc[3] = macArray[47] ^ macArray[45] ^ macArray[44] ^ macArray[43] ^
+             macArray[40] ^ macArray[38] ^ macArray[35] ^ macArray[34] ^
+             macArray[30] ^ macArray[29] ^ macArray[26] ^ macArray[25] ^
+             macArray[23] ^ macArray[18] ^ macArray[16] ^ macArray[14] ^
+             macArray[13] ^ macArray[11] ^ macArray[9]  ^ macArray[7]  ^
+             macArray[3]  ^ macArray[2]  ^ macArray[1];
+
+    crc[4] = macArray[46] ^ macArray[45] ^ macArray[44] ^ macArray[41] ^
+             macArray[39] ^ macArray[36] ^ macArray[35] ^ macArray[31] ^
+             macArray[30] ^ macArray[27] ^ macArray[26] ^ macArray[24] ^
+             macArray[19] ^ macArray[17] ^ macArray[15] ^ macArray[14] ^
+             macArray[12] ^ macArray[10] ^ macArray[8]  ^ macArray[4]  ^
+             macArray[3]  ^ macArray[2];
+
+    crc[5] = macArray[47] ^ macArray[46] ^ macArray[45] ^ macArray[42] ^
+             macArray[40] ^ macArray[37] ^ macArray[36] ^ macArray[32] ^
+             macArray[31] ^ macArray[28] ^ macArray[27] ^ macArray[25] ^
+             macArray[20] ^ macArray[18] ^ macArray[16] ^ macArray[15] ^
+             macArray[13] ^ macArray[11] ^ macArray[9]  ^ macArray[5]  ^
+             macArray[4]  ^ macArray[3];
+
+    crc[6] = macArray[47] ^ macArray[46] ^ macArray[43] ^ macArray[41] ^
+             macArray[38] ^ macArray[37] ^ macArray[33] ^ macArray[32] ^
+             macArray[29] ^ macArray[28] ^ macArray[26] ^ macArray[21] ^
+             macArray[19] ^ macArray[17] ^ macArray[16] ^ macArray[14] ^
+             macArray[12] ^ macArray[10] ^ macArray[6]  ^ macArray[5]  ^
+             macArray[4];
+
+    crc[7] = macArray[47] ^ macArray[44] ^ macArray[42] ^ macArray[39] ^
+             macArray[38] ^ macArray[34] ^ macArray[33] ^ macArray[30] ^
+             macArray[29] ^ macArray[27] ^ macArray[22] ^ macArray[20] ^
+             macArray[18] ^ macArray[17] ^ macArray[15] ^ macArray[13] ^
+             macArray[11] ^ macArray[7]  ^ macArray[6]  ^ macArray[5];
+
+    for(i=0; i<8; i++)
+        crcResult = crcResult | (crc[i] << i);
+
+    return crcResult;
+}
+/*******************************************************************************
+* mvEthMcastAddrSet - Multicast address settings.
+*
+* DESCRIPTION:
+*       This API controls the MV device MAC multicast support.
+*       The MV device supports multicast using two tables:
+*       1) Special Multicast Table for MAC addresses of the form
+*          0x01-00-5E-00-00-XX (where XX is between 0x00 and 0xFF).
+*          The MAC DA[7:0] bits are used as a pointer to the Special Multicast
+*          Table entries in the DA-Filter table.
+*          In this case, the function calls ethPortSmcAddr() routine to set the
+*          Special Multicast Table.
+*       2) Other Multicast Table for multicast of another type. A CRC-8bit
+*          is used as an index to the Other Multicast Table entries in the
+*          DA-Filter table.
+*          In this case, the function calculates the CRC-8bit value and calls
+*          ethPortOmcAddr() routine to set the Other Multicast Table.
+*
+* INPUT:
+*       void*   pEthPortHndl    - Ethernet port handler.
+*       MV_U8*  pAddr           - Address to be set
+*       int     queue           - RX queue to capture all packets with this 
+*                               Multicast MAC address.
+*                               -1 means delete this Multicast address.
+*
+* RETURN: MV_STATUS
+*       MV_TRUE - Success, Other - Failure
+*
+*******************************************************************************/
+MV_STATUS   mvEthMcastAddrSet(void* pPortHndl, MV_U8 *pAddr, int queue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    unsigned char   crcResult = 0;
+
+    if(queue >= MV_ETH_RX_Q_NUM)
+    {
+        mvOsPrintf("ethPort %d: RX queue #%d is out of range\n", 
+                    pPortCtrl->portNo, queue);
+        return MV_BAD_PARAM;
+    }
+
+    if((pAddr[0] == 0x01) &&
+       (pAddr[1] == 0x00) &&
+       (pAddr[2] == 0x5E) &&
+       (pAddr[3] == 0x00) &&
+       (pAddr[4] == 0x00))
+    {
+        ethSetSpecialMcastAddr(pPortCtrl->portNo, pAddr[5], queue);
+    }
+    else
+    {
+        crcResult = mvEthMcastCrc8Get(pAddr);
+
+        /* Check Add counter for this CRC value */
+        if(queue == -1)
+        {
+            if(pPortCtrl->mcastCount[crcResult] == 0)
+            {
+                mvOsPrintf("ethPort #%d: No valid Mcast for crc8=0x%02x\n",
+                            pPortCtrl->portNo, (unsigned)crcResult);
+                return MV_NO_SUCH;
+            }
+
+            pPortCtrl->mcastCount[crcResult]--;
+            if(pPortCtrl->mcastCount[crcResult] != 0)
+            {
+                mvOsPrintf("ethPort #%d: After delete there are %d valid Mcast for crc8=0x%02x\n",
+                            pPortCtrl->portNo, pPortCtrl->mcastCount[crcResult],
+                            (unsigned)crcResult);
+                return MV_NO_CHANGE;
+            }
+        }
+        else
+        {
+            pPortCtrl->mcastCount[crcResult]++;
+            if(pPortCtrl->mcastCount[crcResult] > 1)
+            {
+                mvOsPrintf("ethPort #%d: Valid Mcast for crc8=0x%02x already exists\n",
+                                pPortCtrl->portNo, (unsigned)crcResult);
+                return MV_NO_CHANGE;
+            }
+        }
+        ethSetOtherMcastAddr(pPortCtrl->portNo, crcResult, queue);
+    }
+    return MV_OK;
+}
+
+/*******************************************************************************
+* ethSetUcastTable - Unicast address settings.
+*
+* DESCRIPTION:
+*      Set all entries in the Unicast MAC Table queue==-1 means reject all 
+* INPUT:
+*
+* RETURN: 
+*
+*******************************************************************************/
+static void    ethSetUcastTable(int portNo, int queue)
+{
+    int     offset;
+    MV_U32  regValue;
+
+    if(queue == -1)
+    {
+        regValue = 0;
+    }
+    else
+    {
+        regValue = (((0x01 | (queue<<1)) << 0)  |
+                    ((0x01 | (queue<<1)) << 8)  |
+                    ((0x01 | (queue<<1)) << 16) |
+                    ((0x01 | (queue<<1)) << 24));
+    }
+
+    for (offset=0; offset<=0xC; offset+=4)
+        MV_REG_WRITE((ETH_DA_FILTER_UCAST_BASE(portNo) + offset), regValue);
+}
+
+/*******************************************************************************
+* mvEthSetSpecialMcastTable - Special Multicast address settings.
+*
+* DESCRIPTION:
+*   Set all entries to the Special Multicast MAC Table. queue==-1 means reject all
+* INPUT:
+*
+* RETURN: 
+*
+*******************************************************************************/
+MV_VOID    mvEthSetSpecialMcastTable(int portNo, int queue)
+{
+    int     offset;
+    MV_U32  regValue;
+
+    if(queue == -1)
+    {
+        regValue = 0;
+    }
+    else
+    {
+        regValue = (((0x01 | (queue<<1)) << 0)  |
+                    ((0x01 | (queue<<1)) << 8)  |
+                    ((0x01 | (queue<<1)) << 16) |
+                    ((0x01 | (queue<<1)) << 24));
+    }
+
+    for (offset=0; offset<=0xFC; offset+=4)
+    {
+        MV_REG_WRITE((ETH_DA_FILTER_SPEC_MCAST_BASE(portNo) + 
+                      offset), regValue);
+    }
+}
+
+/*******************************************************************************
+* mvEthSetOtherMcastTable - Other Multicast address settings.
+*
+* DESCRIPTION:
+*   Set all entries to the Other Multicast MAC Table. queue==-1 means reject all
+* INPUT:
+*
+* RETURN: 
+*
+*******************************************************************************/
+MV_VOID    mvEthSetOtherMcastTable(int portNo, int queue)
+{
+    int     offset;
+    MV_U32  regValue;
+
+    if(queue == -1)
+    {
+        regValue = 0;
+    }
+    else
+    {
+        regValue = (((0x01 | (queue<<1)) << 0)  |
+                    ((0x01 | (queue<<1)) << 8)  |
+                    ((0x01 | (queue<<1)) << 16) |
+                    ((0x01 | (queue<<1)) << 24));
+    }
+
+    for (offset=0; offset<=0xFC; offset+=4)
+    {
+        MV_REG_WRITE((ETH_DA_FILTER_OTH_MCAST_BASE(portNo) + 
+                      offset), regValue);
+    }
+}
+
+/*******************************************************************************
+* ethSetUcastAddr - This function Set the port unicast address table
+*
+* DESCRIPTION:
+*       This function locates the proper entry in the Unicast table for the
+*       specified MAC nibble and sets its properties according to function
+*       parameters.
+*
+* INPUT:
+*       int     ethPortNum  - Port number.
+*       MV_U8   lastNibble  - Unicast MAC Address last nibble.
+*       int     queue       - Rx queue number for this MAC address.
+*                           value "-1" means remove address
+*
+* OUTPUT:
+*       This function add/removes MAC addresses from the port unicast address
+*       table.
+*
+* RETURN:
+*       MV_TRUE is output succeeded.
+*       MV_FALSE if option parameter is invalid.
+*
+*******************************************************************************/
+static MV_BOOL ethSetUcastAddr(int portNo, MV_U8 lastNibble, int queue)
+{
+    unsigned int unicastReg;
+    unsigned int tblOffset;
+    unsigned int regOffset;
+
+    /* Locate the Unicast table entry */
+    lastNibble  = (0xf & lastNibble);
+    tblOffset = (lastNibble / 4) * 4; /* Register offset from unicast table base*/
+    regOffset = lastNibble % 4;     /* Entry offset within the above register */
+
+
+    unicastReg = MV_REG_READ( (ETH_DA_FILTER_UCAST_BASE(portNo) + 
+                               tblOffset));
+                 
+
+    if(queue == -1)
+    {
+        /* Clear accepts frame bit at specified unicast DA table entry */
+        unicastReg &= ~(0xFF << (8*regOffset));
+    }
+    else
+    {
+        unicastReg &= ~(0xFF << (8*regOffset));
+        unicastReg |= ((0x01 | (queue<<1)) << (8*regOffset));
+    }
+    MV_REG_WRITE( (ETH_DA_FILTER_UCAST_BASE(portNo) + tblOffset),
+                  unicastReg);
+
+    return MV_TRUE;
+}
+
+/*******************************************************************************
+* ethSetSpecialMcastAddr - Special Multicast address settings.
+*
+* DESCRIPTION:
+*       This routine controls the MV device special MAC multicast support.
+*       The Special Multicast Table for MAC addresses supports MAC of the form
+*       0x01-00-5E-00-00-XX (where XX is between 0x00 and 0xFF).
+*       The MAC DA[7:0] bits are used as a pointer to the Special Multicast
+*       Table entries in the DA-Filter table.
+*       This function set the Special Multicast Table appropriate entry
+*       according to the argument given.
+*
+* INPUT:
+*       int     ethPortNum      Port number.
+*       unsigned char   mcByte      Multicast addr last byte (MAC DA[7:0] bits).
+*       int          queue      Rx queue number for this MAC address.
+*       int             option      0 = Add, 1 = remove address.
+*
+* OUTPUT:
+*       See description.
+*
+* RETURN:
+*       MV_TRUE is output succeeded.
+*       MV_FALSE if option parameter is invalid.
+*
+*******************************************************************************/
+static MV_BOOL ethSetSpecialMcastAddr(int ethPortNum, MV_U8 lastByte, int queue)
+{
+    unsigned int smcTableReg;
+    unsigned int tblOffset;
+    unsigned int regOffset;
+
+    /* Locate the SMC table entry */
+    tblOffset = (lastByte / 4);     /* Register offset from SMC table base    */
+    regOffset = lastByte % 4;       /* Entry offset within the above register */
+
+    smcTableReg = MV_REG_READ((ETH_DA_FILTER_SPEC_MCAST_BASE(ethPortNum) + tblOffset*4));
+    
+    if(queue == -1)
+    {
+        /* Clear accepts frame bit at specified Special DA table entry */
+        smcTableReg &= ~(0xFF << (8 * regOffset));
+    }
+    else
+    {
+        smcTableReg &= ~(0xFF << (8 * regOffset));
+        smcTableReg |= ((0x01 | (queue<<1)) << (8 * regOffset));
+    }
+    MV_REG_WRITE((ETH_DA_FILTER_SPEC_MCAST_BASE(ethPortNum) + 
+                  tblOffset*4), smcTableReg);
+
+    return MV_TRUE;
+}
+
+/*******************************************************************************
+* ethSetOtherMcastAddr - Multicast address settings.
+*
+* DESCRIPTION:
+*       This routine controls the MV device Other MAC multicast support.
+*       The Other Multicast Table is used for multicast of another type.
+*       A CRC-8bit is used as an index to the Other Multicast Table entries
+*       in the DA-Filter table.
+*       The function gets the CRC-8bit value from the calling routine and
+*       set the Other Multicast Table appropriate entry according to the
+*       CRC-8 argument given.
+*
+* INPUT:
+*       int     ethPortNum  Port number.
+*       MV_U8   crc8        A CRC-8bit (Polynomial: x^8+x^2+x^1+1).
+*       int     queue       Rx queue number for this MAC address.
+*
+* OUTPUT:
+*       See description.
+*
+* RETURN:
+*       MV_TRUE is output succeeded.
+*       MV_FALSE if option parameter is invalid.
+*
+*******************************************************************************/
+static MV_BOOL ethSetOtherMcastAddr(int ethPortNum, MV_U8 crc8, int queue)
+{
+    unsigned int omcTableReg;
+    unsigned int tblOffset;
+    unsigned int regOffset;
+
+    /* Locate the OMC table entry */
+    tblOffset = (crc8 / 4) * 4;     /* Register offset from OMC table base    */
+    regOffset = crc8 % 4;           /* Entry offset within the above register */
+
+    omcTableReg = MV_REG_READ(
+        (ETH_DA_FILTER_OTH_MCAST_BASE(ethPortNum) + tblOffset));
+
+    if(queue == -1)
+    {
+        /* Clear accepts frame bit at specified Other DA table entry */
+        omcTableReg &= ~(0xFF << (8 * regOffset));
+    }
+    else
+    {
+        omcTableReg &= ~(0xFF << (8 * regOffset));
+        omcTableReg |= ((0x01 | (queue<<1)) << (8 * regOffset));
+    }
+
+    MV_REG_WRITE((ETH_DA_FILTER_OTH_MCAST_BASE(ethPortNum) + tblOffset), 
+                    omcTableReg);
+
+    return MV_TRUE;
+}
+
+
+/******************************************************************************/
+/*                      MIB Counters functions                                */
+/******************************************************************************/
+
+
+/*******************************************************************************
+* mvEthMibCounterRead - Read a MIB counter
+*
+* DESCRIPTION:
+*       This function reads a MIB counter of a specific ethernet port.
+*       NOTE - Read from ETH_MIB_GOOD_OCTETS_RECEIVED_LOW or 
+*              ETH_MIB_GOOD_OCTETS_SENT_LOW counters will return 64 bits value,
+*              so pHigh32 pointer should not be NULL in this case.
+*
+* INPUT:
+*       int           ethPortNum  - Ethernet Port number.
+*       unsigned int  mibOffset   - MIB counter offset.
+*
+* OUTPUT:
+*       MV_U32*       pHigh32 - pointer to place where 32 most significant bits
+*                             of the counter will be stored.
+*
+* RETURN:
+*       32 low sgnificant bits of MIB counter value.
+*
+*******************************************************************************/
+MV_U32  mvEthMibCounterRead(void* pPortHandle, unsigned int mibOffset, 
+                            MV_U32* pHigh32)
+{
+    int             portNo;
+    MV_U32          valLow32, valHigh32;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+
+    portNo = pPortCtrl->portNo;
+
+    valLow32 = MV_REG_READ(ETH_MIB_COUNTERS_BASE(portNo) + mibOffset);
+    
+    /* Implement FEr ETH. Erroneous Value when Reading the Upper 32-bits    */
+    /* of a 64-bit MIB Counter.                                             */
+    if( (mibOffset == ETH_MIB_GOOD_OCTETS_RECEIVED_LOW) || 
+        (mibOffset == ETH_MIB_GOOD_OCTETS_SENT_LOW) )
+    {
+        valHigh32 = MV_REG_READ(ETH_MIB_COUNTERS_BASE(portNo) + mibOffset + 4);
+        if(pHigh32 != NULL)
+            *pHigh32 = valHigh32;
+    }
+    return valLow32;
+}
+
+/*******************************************************************************
+* mvEthMibCountersClear - Clear all MIB counters
+*
+* DESCRIPTION:
+*       This function clears all MIB counters
+*
+* INPUT:
+*       int           ethPortNum  - Ethernet Port number.
+*
+*
+* RETURN:   void
+*
+*******************************************************************************/
+void  mvEthMibCountersClear(void* pPortHandle)
+{
+    int             i, portNo;
+    unsigned int    dummy;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+
+    portNo = pPortCtrl->portNo;
+
+    /* Perform dummy reads from MIB counters */
+    for(i=ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i<ETH_MIB_LATE_COLLISION; i+=4)
+        dummy = MV_REG_READ((ETH_MIB_COUNTERS_BASE(portNo) + i));
+}
+    
+
+/******************************************************************************/
+/*                        RX Dispatching configuration routines               */
+/******************************************************************************/
+
+int     mvEthTosToRxqGet(void* pPortHandle, int tos)
+{
+    MV_U32          regValue;
+    int             regIdx, regOffs, rxq;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+
+    if(tos > 0xFF)
+    {
+        mvOsPrintf("eth_%d: tos=0x%x is out of range\n", pPortCtrl->portNo, tos);
+        return -1;
+    }
+    regIdx  = mvOsDivide(tos>>2, 10);
+    regOffs = mvOsReminder(tos>>2, 10);
+    
+    regValue = MV_REG_READ(ETH_DIFF_SERV_PRIO_REG(pPortCtrl->portNo, regIdx) );
+    rxq = (regValue >> (regOffs*3));
+    rxq &= 0x7;
+
+    return rxq;
+}
+
+/*******************************************************************************
+* mvEthTosToRxqSet - Map packets with special TOS value to special RX queue
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       void*   pPortHandle - Pointer to port specific handler;
+*       int     tos         - TOS value in the IP header of the packet
+*       int     rxq         - RX Queue for packets with the configured TOS value
+*                           Negative value (-1) means no special processing for these packets, 
+*                           so they will be processed as regular packets.
+*
+* RETURN:   MV_STATUS
+*******************************************************************************/
+MV_STATUS   mvEthTosToRxqSet(void* pPortHandle, int tos, int rxq)
+{
+    MV_U32          regValue;
+    int             regIdx, regOffs;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+
+    if( (rxq < 0) || (rxq >= MV_ETH_RX_Q_NUM) )
+    {
+        mvOsPrintf("eth_%d: RX queue #%d is out of range\n", pPortCtrl->portNo, rxq);
+        return MV_BAD_PARAM;
+    }
+    if(tos > 0xFF)
+    {
+        mvOsPrintf("eth_%d: tos=0x%x is out of range\n", pPortCtrl->portNo, tos);
+        return MV_BAD_PARAM;
+    }
+    regIdx  = mvOsDivide(tos>>2, 10);
+    regOffs = mvOsReminder(tos>>2, 10);
+    
+    regValue = MV_REG_READ(ETH_DIFF_SERV_PRIO_REG(pPortCtrl->portNo, regIdx) );
+    regValue &= ~(0x7 << (regOffs*3));
+    regValue |= (rxq << (regOffs*3));
+
+    MV_REG_WRITE(ETH_DIFF_SERV_PRIO_REG(pPortCtrl->portNo, regIdx), regValue);
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthVlanPrioRxQueue - Configure RX queue to capture VLAN tagged packets with 
+*                        special priority bits [0-2]
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       void*   pPortHandle - Pointer to port specific handler;
+*       int     bpduQueue   - Special queue to capture VLAN tagged packets with special
+*                           priority.
+*                           Negative value (-1) means no special processing for these packets, 
+*                           so they will be processed as regular packets.
+*
+* RETURN:   MV_STATUS
+*       MV_OK       - Success
+*       MV_FAIL     - Failed. 
+*
+*******************************************************************************/
+MV_STATUS   mvEthVlanPrioRxQueue(void* pPortHandle, int vlanPrio, int vlanPrioQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    MV_U32          vlanPrioReg;
+
+    if(vlanPrioQueue >= MV_ETH_RX_Q_NUM)
+    {
+        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", vlanPrioQueue);
+        return MV_BAD_PARAM;
+    }
+    if(vlanPrio >= 8)
+    {
+        mvOsPrintf("ethDrv: vlanPrio=%d is out of range\n", vlanPrio);
+        return MV_BAD_PARAM;
+    }
+  
+    vlanPrioReg = MV_REG_READ(ETH_VLAN_TAG_TO_PRIO_REG(pPortCtrl->portNo));
+    vlanPrioReg &= ~(0x7 << (vlanPrio*3));
+    vlanPrioReg |= (vlanPrioQueue << (vlanPrio*3));
+    MV_REG_WRITE(ETH_VLAN_TAG_TO_PRIO_REG(pPortCtrl->portNo), vlanPrioReg);
+
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvEthBpduRxQueue - Configure RX queue to capture BPDU packets.
+*
+* DESCRIPTION:
+*       This function defines processing of BPDU packets. 
+*   BPDU packets can be accepted and captured to one of RX queues 
+*   or can be processing as regular Multicast packets. 
+*
+* INPUT:
+*       void*   pPortHandle - Pointer to port specific handler;
+*       int     bpduQueue   - Special queue to capture BPDU packets (DA is equal to 
+*                           01-80-C2-00-00-00 through 01-80-C2-00-00-FF, 
+*                           except for the Flow-Control Pause packets). 
+*                           Negative value (-1) means no special processing for BPDU, 
+*                           packets so they will be processed as regular Multicast packets.
+*
+* RETURN:   MV_STATUS
+*       MV_OK       - Success
+*       MV_FAIL     - Failed. 
+*
+*******************************************************************************/
+MV_STATUS   mvEthBpduRxQueue(void* pPortHandle, int bpduQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    MV_U32      portCfgReg;
+    MV_U32      portCfgExtReg;
+
+    if(bpduQueue >= MV_ETH_RX_Q_NUM)
+    {
+        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", bpduQueue);
+        return MV_BAD_PARAM;
+    }
+  
+    portCfgExtReg = MV_REG_READ(ETH_PORT_CONFIG_EXTEND_REG(pPortCtrl->portNo));
+
+    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
+    if(bpduQueue >= 0)
+    {
+        pPortCtrl->portConfig.rxBpduQ = bpduQueue;
+
+        portCfgReg &= ~ETH_DEF_RX_BPDU_QUEUE_ALL_MASK;
+        portCfgReg |= ETH_DEF_RX_BPDU_QUEUE_MASK(pPortCtrl->portConfig.rxBpduQ);
+
+        MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
+
+        portCfgExtReg |= ETH_CAPTURE_SPAN_BPDU_ENABLE_MASK;
+    }
+    else
+    {
+        pPortCtrl->portConfig.rxBpduQ = -1;
+        /* no special processing for BPDU packets */
+        portCfgExtReg &= (~ETH_CAPTURE_SPAN_BPDU_ENABLE_MASK);
+    }
+
+    MV_REG_WRITE(ETH_PORT_CONFIG_EXTEND_REG(pPortCtrl->portNo),  portCfgExtReg);
+
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvEthArpRxQueue - Configure RX queue to capture ARP packets.
+*
+* DESCRIPTION:
+*       This function defines processing of ARP (type=0x0806) packets. 
+*   ARP packets can be accepted and captured to one of RX queues 
+*   or can be processed as other Broadcast packets. 
+*
+* INPUT:
+*       void*   pPortHandle - Pointer to port specific handler;
+*       int     arpQueue    - Special queue to capture ARP packets (type=0x806). 
+*                           Negative value (-1) means discard ARP packets
+*
+* RETURN:   MV_STATUS
+*       MV_OK       - Success
+*       MV_FAIL     - Failed. 
+*
+*******************************************************************************/
+MV_STATUS   mvEthArpRxQueue(void* pPortHandle, int arpQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    MV_U32      portCfgReg;
+
+    if(arpQueue >= MV_ETH_RX_Q_NUM)
+    {
+        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", arpQueue);
+        return MV_BAD_PARAM;
+    }
+
+    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
+
+    if(arpQueue >= 0)
+    {
+        pPortCtrl->portConfig.rxArpQ = arpQueue;
+        portCfgReg &= ~ETH_DEF_RX_ARP_QUEUE_ALL_MASK;
+        portCfgReg |= ETH_DEF_RX_ARP_QUEUE_MASK(pPortCtrl->portConfig.rxArpQ);
+
+        portCfgReg &= (~ETH_REJECT_ARP_BCAST_MASK);
+    }
+    else
+    {
+        pPortCtrl->portConfig.rxArpQ = -1;
+        portCfgReg |= ETH_REJECT_ARP_BCAST_MASK;
+    }
+
+    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
+
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvEthTcpRxQueue - Configure RX queue to capture TCP packets.
+*
+* DESCRIPTION:
+*       This function defines processing of TCP packets. 
+*   TCP packets can be accepted and captured to one of RX queues 
+*   or can be processed as regular Unicast packets. 
+*
+* INPUT:
+*       void*   pPortHandle - Pointer to port specific handler;
+*       int     tcpQueue    - Special queue to capture TCP packets. Value "-1" 
+*                           means no special processing for TCP packets, 
+*                           so they will be processed as regular
+*
+* RETURN:   MV_STATUS
+*       MV_OK       - Success
+*       MV_FAIL     - Failed. 
+*
+*******************************************************************************/
+MV_STATUS   mvEthTcpRxQueue(void* pPortHandle, int tcpQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    MV_U32      portCfgReg;
+
+    if(tcpQueue >= MV_ETH_RX_Q_NUM)
+    {
+        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", tcpQueue);
+        return MV_BAD_PARAM;
+    }
+    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
+
+    if(tcpQueue >= 0)
+    {
+        pPortCtrl->portConfig.rxTcpQ = tcpQueue;
+        portCfgReg &= ~ETH_DEF_RX_TCP_QUEUE_ALL_MASK;
+        portCfgReg |= ETH_DEF_RX_TCP_QUEUE_MASK(pPortCtrl->portConfig.rxTcpQ);
+
+        portCfgReg |= ETH_CAPTURE_TCP_FRAMES_ENABLE_MASK;
+    }
+    else
+    {
+        pPortCtrl->portConfig.rxTcpQ = -1;
+        portCfgReg &= (~ETH_CAPTURE_TCP_FRAMES_ENABLE_MASK);
+    }
+
+    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
+
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvEthUdpRxQueue - Configure RX queue to capture UDP packets.
+*
+* DESCRIPTION:
+*       This function defines processing of UDP packets. 
+*   TCP packets can be accepted and captured to one of RX queues 
+*   or can be processed as regular Unicast packets. 
+*
+* INPUT:
+*       void*   pPortHandle - Pointer to port specific handler;
+*       int     udpQueue    - Special queue to capture UDP packets. Value "-1" 
+*                           means no special processing for UDP packets, 
+*                           so they will be processed as regular
+*
+* RETURN:   MV_STATUS
+*       MV_OK       - Success
+*       MV_FAIL     - Failed. 
+*
+*******************************************************************************/
+MV_STATUS   mvEthUdpRxQueue(void* pPortHandle, int udpQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    MV_U32          portCfgReg;
+
+    if(udpQueue >= MV_ETH_RX_Q_NUM)
+    {
+        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", udpQueue);
+        return MV_BAD_PARAM;
+    }
+
+    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
+
+    if(udpQueue >= 0)
+    {
+        pPortCtrl->portConfig.rxUdpQ = udpQueue;
+        portCfgReg &= ~ETH_DEF_RX_UDP_QUEUE_ALL_MASK;
+        portCfgReg |= ETH_DEF_RX_UDP_QUEUE_MASK(pPortCtrl->portConfig.rxUdpQ);
+
+        portCfgReg |= ETH_CAPTURE_UDP_FRAMES_ENABLE_MASK;        
+    }
+    else
+    {
+        pPortCtrl->portConfig.rxUdpQ = -1;
+        portCfgReg &= ~ETH_CAPTURE_UDP_FRAMES_ENABLE_MASK;
+    }
+
+    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
+
+    return MV_OK;
+}
+
+
+/******************************************************************************/
+/*                          Speed, Duplex, FlowControl routines               */
+/******************************************************************************/
+
+/*******************************************************************************
+* mvEthSpeedDuplexSet - Set Speed and Duplex of the port.
+*
+* DESCRIPTION:
+*       This function configure the port to work with desirable Duplex and Speed.
+*       Changing of these parameters are allowed only when port is disabled.
+*       This function disable the port if was enabled, change duplex and speed 
+*       and, enable the port back if needed.
+*
+* INPUT:
+*       void*           pPortHandle - Pointer to port specific handler;
+*       ETH_PORT_SPEED  speed       - Speed of the port.
+*       ETH_PORT_SPEED  duplex      - Duplex of the port.
+*
+* RETURN:   MV_STATUS
+*       MV_OK           - Success
+*       MV_OUT_OF_RANGE - Failed. Port is out of valid range
+*       MV_NOT_FOUND    - Failed. Port is not initialized.
+*       MV_BAD_PARAM    - Input parameters (speed/duplex) in conflict.
+*       MV_BAD_VALUE    - Value of one of input parameters (speed, duplex) 
+*                       is not valid
+*
+*******************************************************************************/
+MV_STATUS   mvEthSpeedDuplexSet(void* pPortHandle, MV_ETH_PORT_SPEED speed, 
+                                MV_ETH_PORT_DUPLEX duplex)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    int             port = pPortCtrl->portNo;
+    MV_U32      portSerialCtrlReg;
+    
+    if( (port < 0) || (port >= (int)mvCtrlEthMaxPortGet()) )
+        return MV_OUT_OF_RANGE;
+
+    pPortCtrl = ethPortCtrl[port];
+    if(pPortCtrl == NULL)
+        return MV_NOT_FOUND;
+
+    /* Check validity */
+    if( (speed == MV_ETH_SPEED_1000) && (duplex == MV_ETH_DUPLEX_HALF) )
+        return MV_BAD_PARAM;
+
+    portSerialCtrlReg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(port));
+    /* Set Speed */
+    switch(speed)
+    {
+        case MV_ETH_SPEED_AN:
+            portSerialCtrlReg &= ~ETH_DISABLE_SPEED_AUTO_NEG_MASK;
+            break;
+
+        case MV_ETH_SPEED_10:
+            portSerialCtrlReg |= ETH_DISABLE_SPEED_AUTO_NEG_MASK;
+            portSerialCtrlReg &= ~ETH_SET_GMII_SPEED_1000_MASK;
+            portSerialCtrlReg &= ~ETH_SET_MII_SPEED_100_MASK;
+            break;
+
+        case MV_ETH_SPEED_100:
+            portSerialCtrlReg |= ETH_DISABLE_SPEED_AUTO_NEG_MASK;
+            portSerialCtrlReg &= ~ETH_SET_GMII_SPEED_1000_MASK;
+            portSerialCtrlReg |= ETH_SET_MII_SPEED_100_MASK;
+            break;
+
+        case MV_ETH_SPEED_1000:
+            portSerialCtrlReg |= ETH_DISABLE_SPEED_AUTO_NEG_MASK;
+            portSerialCtrlReg |= ETH_SET_GMII_SPEED_1000_MASK;
+            break;
+
+        default:
+            mvOsPrintf("ethDrv: Unexpected Speed value %d\n", speed);
+            return MV_BAD_VALUE;
+    }
+    /* Set duplex */
+    switch(duplex)
+    {
+        case MV_ETH_DUPLEX_AN:
+            portSerialCtrlReg &= ~ETH_DISABLE_DUPLEX_AUTO_NEG_MASK;
+            break;
+
+        case MV_ETH_DUPLEX_HALF:
+            portSerialCtrlReg |= ETH_DISABLE_DUPLEX_AUTO_NEG_MASK;
+            portSerialCtrlReg &= ~ETH_SET_FULL_DUPLEX_MASK;
+            break;
+
+        case MV_ETH_DUPLEX_FULL:
+            portSerialCtrlReg |= ETH_DISABLE_DUPLEX_AUTO_NEG_MASK;
+            portSerialCtrlReg |= ETH_SET_FULL_DUPLEX_MASK;
+            break;
+
+        default:
+            mvOsPrintf("ethDrv: Unexpected Duplex value %d\n", duplex);
+            return MV_BAD_VALUE;
+    }
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(port), portSerialCtrlReg);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthFlowCtrlSet - Set Flow Control of the port.
+*
+* DESCRIPTION:
+*       This function configure the port to work with desirable Duplex and 
+*       Speed. Changing of these parameters are allowed only when port is 
+*       disabled. This function disable the port if was enabled, change 
+*       duplex and speed and, enable the port back if needed.
+*
+* INPUT:
+*       void*           pPortHandle - Pointer to port specific handler;
+*       MV_ETH_PORT_FC  flowControl - Flow control of the port.
+*
+* RETURN:   MV_STATUS
+*       MV_OK           - Success
+*       MV_OUT_OF_RANGE - Failed. Port is out of valid range
+*       MV_NOT_FOUND    - Failed. Port is not initialized.
+*       MV_BAD_VALUE    - Value flowControl parameters is not valid
+*
+*******************************************************************************/
+MV_STATUS   mvEthFlowCtrlSet(void* pPortHandle, MV_ETH_PORT_FC flowControl)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    int             port = pPortCtrl->portNo;
+    MV_U32      portSerialCtrlReg;
+    
+    if( (port < 0) || (port >= (int)mvCtrlEthMaxPortGet() ) )
+        return MV_OUT_OF_RANGE;
+
+    pPortCtrl = ethPortCtrl[port];
+    if(pPortCtrl == NULL)
+        return MV_NOT_FOUND;
+
+    portSerialCtrlReg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(port));
+    switch(flowControl)
+    {
+        case MV_ETH_FC_AN_ADV_DIS:
+            portSerialCtrlReg &= ~ETH_DISABLE_FC_AUTO_NEG_MASK;
+            portSerialCtrlReg &= ~ETH_ADVERTISE_SYM_FC_MASK;
+            break;
+
+        case MV_ETH_FC_AN_ADV_SYM:
+            portSerialCtrlReg &= ~ETH_DISABLE_FC_AUTO_NEG_MASK;
+            portSerialCtrlReg |= ETH_ADVERTISE_SYM_FC_MASK;
+            break;
+
+        case MV_ETH_FC_DISABLE:
+            portSerialCtrlReg |= ETH_DISABLE_FC_AUTO_NEG_MASK;
+            portSerialCtrlReg &= ~ETH_SET_FLOW_CTRL_MASK;
+            break;
+
+        case MV_ETH_FC_ENABLE:
+            portSerialCtrlReg |= ETH_DISABLE_FC_AUTO_NEG_MASK;
+            portSerialCtrlReg |= ETH_SET_FLOW_CTRL_MASK;
+            break;
+
+        default:
+            mvOsPrintf("ethDrv: Unexpected FlowControl value %d\n", flowControl);
+            return MV_BAD_VALUE;
+    }
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(port), portSerialCtrlReg);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthHeaderModeSet - Set port header mode.
+*
+* DESCRIPTION:
+*       This function configures the port to work in Marvell-Header mode.
+*
+* INPUT:
+*       void*           pPortHandle - Pointer to port specific handler;
+*       MV_ETH_HEADER_MODE headerMode - The header mode to set the port in.
+*
+* RETURN:   MV_STATUS
+*       MV_OK           - Success
+*       MV_NOT_SUPPORTED- Feature not supported.
+*       MV_OUT_OF_RANGE - Failed. Port is out of valid range
+*       MV_NOT_FOUND    - Failed. Port is not initialized.
+*       MV_BAD_VALUE    - Value of headerMode or numRxQueue parameter is not valid.
+*
+*******************************************************************************/
+MV_STATUS mvEthHeaderModeSet(void* pPortHandle, MV_ETH_HEADER_MODE headerMode)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    int             port = pPortCtrl->portNo;
+    MV_U32			mvHeaderReg;
+    MV_U32          numRxQ = MV_ETH_RX_Q_NUM;
+    
+    if((port < 0) || (port >= mvCtrlEthMaxPortGet()))
+        return MV_OUT_OF_RANGE;
+
+    pPortCtrl = ethPortCtrl[port];
+    if(pPortCtrl == NULL)
+        return MV_NOT_FOUND;
+
+    mvHeaderReg = MV_REG_READ(ETH_PORT_MARVELL_HEADER_REG(port));
+    /* Disable header mode.             */
+    mvHeaderReg &= ~ETH_MVHDR_EN_MASK;
+
+    if(headerMode != MV_ETH_DISABLE_HEADER_MODE)
+    {
+        /* Enable Header mode.              */
+        mvHeaderReg |= ETH_MVHDR_EN_MASK;
+
+        /* Clear DA-Prefix  & MHMask fields.*/
+        mvHeaderReg &= ~(ETH_MVHDR_DAPREFIX_MASK | ETH_MVHDR_MHMASK_MASK);
+
+        if(numRxQ > 1)
+        {
+            switch (headerMode)
+            {
+                case(MV_ETH_ENABLE_HEADER_MODE_PRI_2_1):
+                    mvHeaderReg |= ETH_MVHDR_DAPREFIX_PRI_1_2;
+                    break;
+                case(MV_ETH_ENABLE_HEADER_MODE_PRI_DBNUM):
+                    mvHeaderReg |= ETH_MVHDR_DAPREFIX_DBNUM_PRI;
+                    break;
+                case(MV_ETH_ENABLE_HEADER_MODE_PRI_SPID):
+                    mvHeaderReg |= ETH_MVHDR_DAPREFIX_SPID_PRI;
+                    break;
+                default:
+                    break;
+            }
+
+            switch (numRxQ)
+            {
+                case (4):
+                    mvHeaderReg |= ETH_MVHDR_MHMASK_4_QUEUE;
+                    break;
+                case (8):
+                    mvHeaderReg |= ETH_MVHDR_MHMASK_8_QUEUE;
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    MV_REG_WRITE(ETH_PORT_MARVELL_HEADER_REG(port), mvHeaderReg);
+
+    return MV_OK;
+}
+
+#if (MV_ETH_VERSION >= 4)
+/*******************************************************************************
+* mvEthEjpModeSet - Enable / Disable EJP policy for TX.
+*
+* DESCRIPTION:
+*       This function 
+*
+* INPUT:
+*       void*           pPortHandle - Pointer to port specific handler;
+*       MV_BOOL         TRUE - enable EJP mode
+*                       FALSE - disable EJP mode
+*
+* OUTPUT:   MV_STATUS
+*       MV_OK           - Success
+*       Other           - Failure
+*
+* RETURN:   None.
+*
+*******************************************************************************/
+MV_STATUS    mvEthEjpModeSet(void* pPortHandle, int mode) 
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    int             port = pPortCtrl->portNo;
+    
+    if((port < 0) || (port >= mvCtrlEthMaxPortGet()))
+        return MV_OUT_OF_RANGE;
+
+    pPortCtrl = ethPortCtrl[port];
+    if(pPortCtrl == NULL)
+        return MV_NOT_FOUND;
+    
+    pPortCtrl->portConfig.ejpMode = mode;
+    if(mode)
+    {
+        /* EJP enabled */
+        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(port), ETH_TX_EJP_ENABLE_MASK);
+    }
+    else
+    {
+        /* EJP disabled */
+        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(port), 0);
+    }
+    mvOsPrintf("eth_%d: EJP %s - ETH_TXQ_CMD_1_REG: 0x%x = 0x%08x\n", 
+        port, mode ? "Enabled" : "Disabled", ETH_TXQ_CMD_1_REG(port), 
+                    MV_REG_READ(ETH_TXQ_CMD_1_REG(port)));
+
+    return MV_OK;
+}
+#endif /* MV_ETH_VERSION >= 4 */
+
+/*******************************************************************************
+* mvEthStatusGet - Get major properties of the port .
+*
+* DESCRIPTION:
+*       This function get major properties of the port (link, speed, duplex, 
+*       flowControl, etc) and return them using the single structure.
+*
+* INPUT:
+*       void*           pPortHandle - Pointer to port specific handler;
+*
+* OUTPUT:
+*       MV_ETH_PORT_STATUS* pStatus - Pointer to structure, were port status 
+*                                   will be placed.
+*
+* RETURN:   None.
+*
+*******************************************************************************/
+void    mvEthStatusGet(void* pPortHandle, MV_ETH_PORT_STATUS* pStatus)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    int             port = pPortCtrl->portNo;
+
+    MV_U32  regValue;
+
+    regValue = MV_REG_READ( ETH_PORT_STATUS_REG(port) );
+
+    if(regValue & ETH_GMII_SPEED_1000_MASK)
+        pStatus->speed = MV_ETH_SPEED_1000;
+    else if(regValue & ETH_MII_SPEED_100_MASK)
+        pStatus->speed = MV_ETH_SPEED_100;
+    else
+        pStatus->speed = MV_ETH_SPEED_10;
+
+    if(regValue & ETH_LINK_UP_MASK) 
+        pStatus->isLinkUp = MV_TRUE;
+    else
+        pStatus->isLinkUp = MV_FALSE;
+
+    if(regValue & ETH_FULL_DUPLEX_MASK) 
+        pStatus->duplex = MV_ETH_DUPLEX_FULL; 
+    else
+        pStatus->duplex = MV_ETH_DUPLEX_HALF; 
+
+
+    if(regValue & ETH_ENABLE_RCV_FLOW_CTRL_MASK) 
+        pStatus->flowControl = MV_ETH_FC_ENABLE;
+    else
+        pStatus->flowControl = MV_ETH_FC_DISABLE;
+}
+
+
+/******************************************************************************/
+/*                         PHY Control Functions                              */
+/******************************************************************************/
+
+
+/*******************************************************************************
+* mvEthPhyAddrSet - Set the ethernet port PHY address.
+*
+* DESCRIPTION:
+*       This routine set the ethernet port PHY address according to given
+*       parameter.
+*
+* INPUT:
+*       void*   pPortHandle     - Pointer to port specific handler;
+*       int     phyAddr         - PHY address       
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+void    mvEthPhyAddrSet(void* pPortHandle, int phyAddr)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    int             port = pPortCtrl->portNo;
+    unsigned int    regData;
+
+    regData = MV_REG_READ(ETH_PHY_ADDR_REG(port));
+
+    regData &= ~ETH_PHY_ADDR_MASK;
+    regData |=  phyAddr;
+
+    MV_REG_WRITE(ETH_PHY_ADDR_REG(port), regData);
+
+    return;
+}
+
+/*******************************************************************************
+* mvEthPhyAddrGet - Get the ethernet port PHY address.
+*
+* DESCRIPTION:
+*       This routine returns the given ethernet port PHY address.
+*
+* INPUT:
+*       void*   pPortHandle - Pointer to port specific handler;
+*
+*
+* RETURN: int - PHY address.
+*
+*******************************************************************************/
+int     mvEthPhyAddrGet(void* pPortHandle)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
+    int             port = pPortCtrl->portNo;
+    unsigned int    regData;
+
+    regData = MV_REG_READ(ETH_PHY_ADDR_REG(port));
+
+    return ((regData >> (5 * port)) & 0x1f);
+}
+
+/******************************************************************************/
+/*                Descriptor handling Functions                               */
+/******************************************************************************/
+
+/*******************************************************************************
+* etherInitRxDescRing - Curve a Rx chain desc list and buffer in memory.
+*
+* DESCRIPTION:
+*       This function prepares a Rx chained list of descriptors and packet
+*       buffers in a form of a ring. The routine must be called after port
+*       initialization routine and before port start routine.
+*       The Ethernet SDMA engine uses CPU bus addresses to access the various
+*       devices in the system (i.e. DRAM). This function uses the ethernet
+*       struct 'virtual to physical' routine (set by the user) to set the ring
+*       with physical addresses.
+*
+* INPUT:
+*       ETH_QUEUE_CTRL  *pEthPortCtrl   Ethernet Port Control srtuct.
+*       int             rxQueue         Number of Rx queue.
+*       int             rxDescNum       Number of Rx descriptors
+*       MV_U8*          rxDescBaseAddr  Rx descriptors memory area base addr.
+*
+* OUTPUT:
+*       The routine updates the Ethernet port control struct with information
+*       regarding the Rx descriptors and buffers.
+*
+* RETURN: None
+*
+*******************************************************************************/
+static void ethInitRxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue)
+{
+    ETH_RX_DESC     *pRxDescBase, *pRxDesc, *pRxPrevDesc; 
+    int             ix, rxDescNum = pPortCtrl->rxQueueConfig[queue].descrNum;
+    ETH_QUEUE_CTRL  *pQueueCtrl = &pPortCtrl->rxQueue[queue];
+
+    /* Make sure descriptor address is cache line size aligned  */        
+    pRxDescBase = (ETH_RX_DESC*)MV_ALIGN_UP((MV_ULONG)pQueueCtrl->descBuf.bufVirtPtr,
+                                     CPU_D_CACHE_LINE_SIZE);
+
+    pRxDesc      = (ETH_RX_DESC*)pRxDescBase;
+    pRxPrevDesc  = pRxDesc;
+
+    /* initialize the Rx descriptors ring */
+    for (ix=0; ix<rxDescNum; ix++)
+    {
+        pRxDesc->bufSize     = 0x0;
+        pRxDesc->byteCnt     = 0x0;
+        pRxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
+        pRxDesc->bufPtr      = 0x0;
+        pRxDesc->returnInfo  = 0x0;
+        pRxPrevDesc = pRxDesc;
+        if(ix == (rxDescNum-1))
+        {
+            /* Closing Rx descriptors ring */
+            pRxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pRxDescBase);
+        }
+        else
+        {
+            pRxDesc = (ETH_RX_DESC*)((MV_ULONG)pRxDesc + ETH_RX_DESC_ALIGNED_SIZE);
+            pRxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pRxDesc);
+        }
+        ETH_DESCR_FLUSH_INV(pPortCtrl, pRxPrevDesc);
+    }
+
+    pQueueCtrl->pCurrentDescr = pRxDescBase;
+    pQueueCtrl->pUsedDescr = pRxDescBase;
+    
+    pQueueCtrl->pFirstDescr = pRxDescBase;
+    pQueueCtrl->pLastDescr = pRxDesc;
+    pQueueCtrl->resource = 0;
+}
+
+void ethResetRxDescRing(void* pPortHndl, int queue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->rxQueue[queue];
+    ETH_RX_DESC*    pRxDesc = (ETH_RX_DESC*)pQueueCtrl->pFirstDescr;
+
+    pQueueCtrl->resource = 0;
+    if(pQueueCtrl->pFirstDescr != NULL)
+    {
+        while(MV_TRUE)
+        {
+            pRxDesc->bufSize     = 0x0;
+            pRxDesc->byteCnt     = 0x0;
+            pRxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
+            pRxDesc->bufPtr      = 0x0;
+            pRxDesc->returnInfo  = 0x0;
+            ETH_DESCR_FLUSH_INV(pPortCtrl, pRxDesc);
+            if( (void*)pRxDesc == pQueueCtrl->pLastDescr)
+                    break;
+            pRxDesc = RX_NEXT_DESC_PTR(pRxDesc, pQueueCtrl);
+        }
+        pQueueCtrl->pCurrentDescr = pQueueCtrl->pFirstDescr;
+        pQueueCtrl->pUsedDescr = pQueueCtrl->pFirstDescr;
+
+        /* Update RX Command register */
+        pPortCtrl->portRxQueueCmdReg |= (1 << queue);
+
+        /* update HW */
+        MV_REG_WRITE( ETH_RX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue),
+                 (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
+    }
+    else
+    {
+        /* Update RX Command register */
+        pPortCtrl->portRxQueueCmdReg &= ~(1 << queue);
+
+        /* update HW */
+        MV_REG_WRITE( ETH_RX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue), 0);
+    }
+}
+
+/*******************************************************************************
+* etherInitTxDescRing - Curve a Tx chain desc list and buffer in memory.
+*
+* DESCRIPTION:
+*       This function prepares a Tx chained list of descriptors and packet
+*       buffers in a form of a ring. The routine must be called after port
+*       initialization routine and before port start routine.
+*       The Ethernet SDMA engine uses CPU bus addresses to access the various
+*       devices in the system (i.e. DRAM). This function uses the ethernet
+*       struct 'virtual to physical' routine (set by the user) to set the ring
+*       with physical addresses.
+*
+* INPUT:
+*       ETH_PORT_CTRL   *pEthPortCtrl   Ethernet Port Control srtuct.
+*       int             txQueue         Number of Tx queue.
+*       int             txDescNum       Number of Tx descriptors
+*       int             txBuffSize      Size of Tx buffer
+*       MV_U8*          pTxDescBase     Tx descriptors memory area base addr.
+*
+* OUTPUT:
+*       The routine updates the Ethernet port control struct with information
+*       regarding the Tx descriptors and buffers.
+*
+* RETURN:   None.
+*
+*******************************************************************************/
+static void ethInitTxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue)
+{
+    ETH_TX_DESC     *pTxDescBase, *pTxDesc, *pTxPrevDesc; 
+    int             ix, txDescNum = pPortCtrl->txQueueConfig[queue].descrNum;
+    ETH_QUEUE_CTRL  *pQueueCtrl = &pPortCtrl->txQueue[queue];
+
+    /* Make sure descriptor address is cache line size aligned  */
+    pTxDescBase = (ETH_TX_DESC*)MV_ALIGN_UP((MV_ULONG)pQueueCtrl->descBuf.bufVirtPtr, 
+                                     CPU_D_CACHE_LINE_SIZE);
+
+    pTxDesc      = (ETH_TX_DESC*)pTxDescBase;
+    pTxPrevDesc  = pTxDesc;
+
+    /* initialize the Tx descriptors ring */
+    for (ix=0; ix<txDescNum; ix++)
+    {
+        pTxDesc->byteCnt     = 0x0000;
+        pTxDesc->L4iChk      = 0x0000;
+        pTxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
+        pTxDesc->bufPtr      = 0x0;
+        pTxDesc->returnInfo  = 0x0;
+
+        pTxPrevDesc = pTxDesc;
+
+        if(ix == (txDescNum-1))
+        {
+            /* Closing Tx descriptors ring */
+            pTxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pTxDescBase);
+        }
+        else
+        {
+            pTxDesc = (ETH_TX_DESC*)((MV_ULONG)pTxDesc + ETH_TX_DESC_ALIGNED_SIZE);
+            pTxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pTxDesc);
+        }
+        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxPrevDesc);
+    }
+
+    pQueueCtrl->pCurrentDescr = pTxDescBase;
+    pQueueCtrl->pUsedDescr = pTxDescBase;
+    
+    pQueueCtrl->pFirstDescr = pTxDescBase;
+    pQueueCtrl->pLastDescr = pTxDesc;
+    /* Leave one TX descriptor out of use */
+    pQueueCtrl->resource = txDescNum - 1;
+}
+
+void ethResetTxDescRing(void* pPortHndl, int queue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->txQueue[queue];
+    ETH_TX_DESC*    pTxDesc = (ETH_TX_DESC*)pQueueCtrl->pFirstDescr;
+    
+    pQueueCtrl->resource = 0;
+    if(pQueueCtrl->pFirstDescr != NULL)
+    {
+        while(MV_TRUE)
+        {
+            pTxDesc->byteCnt     = 0x0000;
+            pTxDesc->L4iChk      = 0x0000;
+            pTxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
+            pTxDesc->bufPtr      = 0x0;
+            pTxDesc->returnInfo  = 0x0;
+            ETH_DESCR_FLUSH_INV(pPortCtrl, pTxDesc);
+            pQueueCtrl->resource++;
+            if( (void*)pTxDesc == pQueueCtrl->pLastDescr)
+                    break;
+            pTxDesc = TX_NEXT_DESC_PTR(pTxDesc, pQueueCtrl);
+        }
+        /* Leave one TX descriptor out of use */
+        pQueueCtrl->resource--;
+        pQueueCtrl->pCurrentDescr = pQueueCtrl->pFirstDescr;
+        pQueueCtrl->pUsedDescr = pQueueCtrl->pFirstDescr;
+
+        /* Update TX Command register */
+        pPortCtrl->portTxQueueCmdReg |= MV_32BIT_LE_FAST(1 << queue);
+        /* update HW */
+        MV_REG_WRITE( ETH_TX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue),
+        (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
+    }
+    else
+    {
+        /* Update TX Command register */
+        pPortCtrl->portTxQueueCmdReg &=  MV_32BIT_LE_FAST(~(1 << queue));
+        /* update HW */
+        MV_REG_WRITE( ETH_TX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue), 0 );    
+    }
+}
+
+/*******************************************************************************
+* ethAllocDescrMemory - Free memory allocated for RX and TX descriptors.
+*
+* DESCRIPTION:
+*       This function allocates memory for RX and TX descriptors.
+*       - If ETH_DESCR_IN_SRAM defined, allocate memory from SRAM.
+*       - If ETH_DESCR_IN_SDRAM defined, allocate memory in SDRAM.
+*
+* INPUT:
+*       int size - size of memory should be allocated.
+*
+* RETURN: None
+*
+*******************************************************************************/
+static MV_U8*  ethAllocDescrMemory(ETH_PORT_CTRL* pPortCtrl, int descSize, 
+                            MV_ULONG* pPhysAddr, MV_U32 *memHandle)
+{
+    MV_U8*  pVirt;
+
+#if defined(ETH_DESCR_IN_SRAM)
+    if(ethDescInSram == MV_TRUE)
+        pVirt = (char*)mvSramMalloc(descSize, pPhysAddr);
+    else
+#endif /* ETH_DESCR_IN_SRAM */
+    {
+#ifdef ETH_DESCR_UNCACHED
+        pVirt = (MV_U8*)mvOsIoUncachedMalloc(pPortCtrl->osHandle, descSize,
+					    pPhysAddr,memHandle);
+#else
+        pVirt = (MV_U8*)mvOsIoCachedMalloc(pPortCtrl->osHandle, descSize,
+					  pPhysAddr, memHandle);
+#endif /* ETH_DESCR_UNCACHED */
+    }
+    memset(pVirt, 0, descSize);
+
+    return pVirt;
+}
+
+/*******************************************************************************
+* ethFreeDescrMemory - Free memory allocated for RX and TX descriptors.
+*
+* DESCRIPTION:
+*       This function frees memory allocated for RX and TX descriptors.
+*       - If ETH_DESCR_IN_SRAM defined, free memory using gtSramFree() function.
+*       - If ETH_DESCR_IN_SDRAM defined, free memory using mvOsFree() function.
+*
+* INPUT:
+*       void* pVirtAddr - virtual pointer to memory allocated for RX and TX
+*                       desriptors.        
+*
+* RETURN: None
+*
+*******************************************************************************/
+void    ethFreeDescrMemory(ETH_PORT_CTRL* pPortCtrl, MV_BUF_INFO* pDescBuf)
+{
+    if( (pDescBuf == NULL) || (pDescBuf->bufVirtPtr == NULL) )
+        return;
+
+#if defined(ETH_DESCR_IN_SRAM)
+    if( ethDescInSram )
+    {
+        mvSramFree(pDescBuf->bufSize, pDescBuf->bufPhysAddr, pDescBuf->bufVirtPtr);
+        return;
+    }
+#endif /* ETH_DESCR_IN_SRAM */
+
+#ifdef ETH_DESCR_UNCACHED
+    mvOsIoUncachedFree(pPortCtrl->osHandle, pDescBuf->bufSize, pDescBuf->bufPhysAddr, 
+                     pDescBuf->bufVirtPtr,pDescBuf->memHandle);
+#else
+    mvOsIoCachedFree(pPortCtrl->osHandle, pDescBuf->bufSize, pDescBuf->bufPhysAddr, 
+                     pDescBuf->bufVirtPtr,pDescBuf->memHandle);
+#endif /* ETH_DESCR_UNCACHED */
+}
+                                                                                                                             
+/******************************************************************************/
+/*                Other Functions                                         */
+/******************************************************************************/
+
+void mvEthPortPowerUp(int port)
+{
+    MV_U32  regVal;
+
+    /* MAC Cause register should be cleared */
+    MV_REG_WRITE(ETH_UNIT_INTR_CAUSE_REG(port), 0);
+
+	if (mvBoardIsPortInSgmii(port))
+    mvEthPortSgmiiConfig(port);
+
+    /* Cancel Port Reset */
+    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port));
+    regVal &= (~ETH_PORT_RESET_MASK);
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(port), regVal);
+    while( (MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port)) & ETH_PORT_RESET_MASK) != 0);
+}
+
+void mvEthPortPowerDown(int port)
+{
+    MV_U32  regVal;
+
+    /* Port must be DISABLED */
+    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(port));
+    if( (regVal & ETH_PORT_ENABLE_MASK) != 0)
+    {
+        mvOsPrintf("ethPort #%d: PowerDown - port must be Disabled (PSC=0x%x)\n",
+                    port, regVal);
+        return;
+    }
+
+    /* Port Reset (Read after write the register as a precaution) */
+    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port));
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(port), regVal | ETH_PORT_RESET_MASK);
+    while((MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port)) & ETH_PORT_RESET_MASK) == 0);
+}
+
+static void mvEthPortSgmiiConfig(int port)
+{
+    MV_U32  regVal;
+
+    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port));
+
+    regVal |= (ETH_SGMII_MODE_MASK /*| ETH_INBAND_AUTO_NEG_ENABLE_MASK */);
+    regVal &= (~ETH_INBAND_AUTO_NEG_BYPASS_MASK);
+
+    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(port), regVal);
+}
+
+
+
+
+
+
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
new file mode 100644
index 00000000..f5334759
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
@@ -0,0 +1,748 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvEthDebug.c - Source file for user friendly debug functions
+*
+* DESCRIPTION:
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+#include "mvOs.h"
+#include "mvCommon.h"
+#include "mvTypes.h"
+#include "mv802_3.h"
+#include "mvDebug.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "eth-phy/mvEthPhy.h"
+#include "eth/mvEth.h"
+#include "eth/gbe/mvEthDebug.h"
+
+/* #define mvOsPrintf printf */
+
+void    mvEthPortShow(void* pHndl);
+void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode);
+
+/******************************************************************************/
+/*                          Debug functions                                   */
+/******************************************************************************/
+void    ethRxCoal(int port, int usec)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthRxCoalSet(pHndl, usec);
+    }
+}
+
+void    ethTxCoal(int port, int usec)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthTxCoalSet(pHndl, usec);
+    }
+}
+
+#if (MV_ETH_VERSION >= 4)
+void     ethEjpModeSet(int port, int mode)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthEjpModeSet(pHndl, mode);
+    }
+}
+#endif /* (MV_ETH_VERSION >= 4) */
+
+void    ethBpduRxQ(int port, int bpduQueue)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthBpduRxQueue(pHndl, bpduQueue);
+    }
+}
+
+void    ethArpRxQ(int port, int arpQueue)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthArpRxQueue(pHndl, arpQueue);
+    }
+}
+
+void    ethTcpRxQ(int port, int tcpQueue)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthTcpRxQueue(pHndl, tcpQueue);
+    }
+}
+
+void    ethUdpRxQ(int port, int udpQueue)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthUdpRxQueue(pHndl, udpQueue);
+    }
+}
+
+void    ethTxPolicyRegs(int port)
+{
+    int             queue;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)mvEthPortHndlGet(port);
+
+    if(pPortCtrl == NULL) 
+    {
+        return;
+    }
+    mvOsPrintf("Port #%d TX Policy: EJP=%d, TXQs: ", 
+                port, pPortCtrl->portConfig.ejpMode);
+    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
+    {
+        if(pPortCtrl->txQueueConfig[queue].descrNum > 0)
+            mvOsPrintf("%d, ", queue);
+    }
+    mvOsPrintf("\n");
+
+    mvOsPrintf("\n\t TX policy Port #%d configuration registers\n", port);
+
+    mvOsPrintf("ETH_TX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 
+                ETH_TX_QUEUE_COMMAND_REG(port), 
+                MV_REG_READ( ETH_TX_QUEUE_COMMAND_REG(port) ) );    
+    
+    mvOsPrintf("ETH_TX_FIXED_PRIO_CFG_REG           : 0x%X = 0x%08x\n", 
+                ETH_TX_FIXED_PRIO_CFG_REG(port), 
+                MV_REG_READ( ETH_TX_FIXED_PRIO_CFG_REG(port) ) );
+
+    mvOsPrintf("ETH_TX_TOKEN_RATE_CFG_REG           : 0x%X = 0x%08x\n", 
+                ETH_TX_TOKEN_RATE_CFG_REG(port), 
+                MV_REG_READ( ETH_TX_TOKEN_RATE_CFG_REG(port) ) );
+
+    mvOsPrintf("ETH_MAX_TRANSMIT_UNIT_REG           : 0x%X = 0x%08x\n", 
+                ETH_MAX_TRANSMIT_UNIT_REG(port), 
+                MV_REG_READ( ETH_MAX_TRANSMIT_UNIT_REG(port) ) );
+
+    mvOsPrintf("ETH_TX_TOKEN_BUCKET_SIZE_REG        : 0x%X = 0x%08x\n", 
+                ETH_TX_TOKEN_BUCKET_SIZE_REG(port), 
+                MV_REG_READ( ETH_TX_TOKEN_BUCKET_SIZE_REG(port) ) );
+
+    mvOsPrintf("ETH_TX_TOKEN_BUCKET_COUNT_REG       : 0x%X = 0x%08x\n", 
+                ETH_TX_TOKEN_BUCKET_COUNT_REG(port), 
+                MV_REG_READ( ETH_TX_TOKEN_BUCKET_COUNT_REG(port) ) );
+
+    for(queue=0; queue<MV_ETH_MAX_TXQ; queue++)
+    {
+        mvOsPrintf("\n\t TX policy Port #%d, Queue #%d configuration registers\n", port, queue);
+
+        mvOsPrintf("ETH_TXQ_TOKEN_COUNT_REG             : 0x%X = 0x%08x\n", 
+                ETH_TXQ_TOKEN_COUNT_REG(port, queue), 
+                MV_REG_READ( ETH_TXQ_TOKEN_COUNT_REG(port, queue) ) );
+
+        mvOsPrintf("ETH_TXQ_TOKEN_CFG_REG               : 0x%X = 0x%08x\n", 
+                ETH_TXQ_TOKEN_CFG_REG(port, queue), 
+                MV_REG_READ( ETH_TXQ_TOKEN_CFG_REG(port, queue) ) );
+
+        mvOsPrintf("ETH_TXQ_ARBITER_CFG_REG             : 0x%X = 0x%08x\n", 
+                ETH_TXQ_ARBITER_CFG_REG(port, queue), 
+                MV_REG_READ( ETH_TXQ_ARBITER_CFG_REG(port, queue) ) );
+    }
+    mvOsPrintf("\n");
+}
+
+/* Print important registers of Ethernet port */
+void    ethPortRegs(int port)
+{
+    mvOsPrintf("\n\t ethGiga #%d port Registers:\n", port);
+
+    mvOsPrintf("ETH_PORT_STATUS_REG                 : 0x%X = 0x%08x\n", 
+                ETH_PORT_STATUS_REG(port), 
+                MV_REG_READ( ETH_PORT_STATUS_REG(port) ) );
+
+    mvOsPrintf("ETH_PORT_SERIAL_CTRL_REG            : 0x%X = 0x%08x\n", 
+                ETH_PORT_SERIAL_CTRL_REG(port), 
+                MV_REG_READ( ETH_PORT_SERIAL_CTRL_REG(port) ) );
+
+    mvOsPrintf("ETH_PORT_CONFIG_REG                 : 0x%X = 0x%08x\n", 
+                ETH_PORT_CONFIG_REG(port), 
+                MV_REG_READ( ETH_PORT_CONFIG_REG(port) ) );    
+
+    mvOsPrintf("ETH_PORT_CONFIG_EXTEND_REG          : 0x%X = 0x%08x\n", 
+                ETH_PORT_CONFIG_EXTEND_REG(port), 
+                MV_REG_READ( ETH_PORT_CONFIG_EXTEND_REG(port) ) );    
+
+    mvOsPrintf("ETH_SDMA_CONFIG_REG                 : 0x%X = 0x%08x\n", 
+                ETH_SDMA_CONFIG_REG(port), 
+                MV_REG_READ( ETH_SDMA_CONFIG_REG(port) ) );    
+
+    mvOsPrintf("ETH_TX_FIFO_URGENT_THRESH_REG       : 0x%X = 0x%08x\n", 
+                ETH_TX_FIFO_URGENT_THRESH_REG(port), 
+                MV_REG_READ( ETH_TX_FIFO_URGENT_THRESH_REG(port) ) );    
+
+    mvOsPrintf("ETH_RX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 
+                ETH_RX_QUEUE_COMMAND_REG(port), 
+                MV_REG_READ( ETH_RX_QUEUE_COMMAND_REG(port) ) );    
+
+    mvOsPrintf("ETH_TX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 
+                ETH_TX_QUEUE_COMMAND_REG(port), 
+                MV_REG_READ( ETH_TX_QUEUE_COMMAND_REG(port) ) );    
+
+    mvOsPrintf("ETH_INTR_CAUSE_REG                  : 0x%X = 0x%08x\n", 
+                ETH_INTR_CAUSE_REG(port), 
+                MV_REG_READ( ETH_INTR_CAUSE_REG(port) ) );    
+
+    mvOsPrintf("ETH_INTR_EXTEND_CAUSE_REG           : 0x%X = 0x%08x\n", 
+                ETH_INTR_CAUSE_EXT_REG(port), 
+                MV_REG_READ( ETH_INTR_CAUSE_EXT_REG(port) ) );    
+
+    mvOsPrintf("ETH_INTR_MASK_REG                   : 0x%X = 0x%08x\n", 
+                ETH_INTR_MASK_REG(port), 
+                MV_REG_READ( ETH_INTR_MASK_REG(port) ) );    
+
+    mvOsPrintf("ETH_INTR_EXTEND_MASK_REG            : 0x%X = 0x%08x\n", 
+                ETH_INTR_MASK_EXT_REG(port), 
+                MV_REG_READ( ETH_INTR_MASK_EXT_REG(port) ) );    
+
+    mvOsPrintf("ETH_RX_DESCR_STAT_CMD_REG           : 0x%X = 0x%08x\n", 
+                ETH_RX_DESCR_STAT_CMD_REG(port, 0), 
+                MV_REG_READ( ETH_RX_DESCR_STAT_CMD_REG(port, 0) ) );    
+
+    mvOsPrintf("ETH_RX_BYTE_COUNT_REG               : 0x%X = 0x%08x\n", 
+                ETH_RX_BYTE_COUNT_REG(port, 0), 
+                MV_REG_READ( ETH_RX_BYTE_COUNT_REG(port, 0) ) );    
+
+    mvOsPrintf("ETH_RX_BUF_PTR_REG                  : 0x%X = 0x%08x\n", 
+                ETH_RX_BUF_PTR_REG(port, 0), 
+                MV_REG_READ( ETH_RX_BUF_PTR_REG(port, 0) ) );    
+
+    mvOsPrintf("ETH_RX_CUR_DESC_PTR_REG             : 0x%X = 0x%08x\n", 
+                ETH_RX_CUR_DESC_PTR_REG(port, 0), 
+                MV_REG_READ( ETH_RX_CUR_DESC_PTR_REG(port, 0) ) );    
+}
+
+
+/* Print Giga Ethernet UNIT registers */
+void    ethRegs(int port)
+{
+    mvOsPrintf("ETH_PHY_ADDR_REG               : 0x%X = 0x%08x\n", 
+                ETH_PHY_ADDR_REG(port), 
+                MV_REG_READ(ETH_PHY_ADDR_REG(port)) );    
+
+    mvOsPrintf("ETH_UNIT_INTR_CAUSE_REG        : 0x%X = 0x%08x\n", 
+                ETH_UNIT_INTR_CAUSE_REG(port), 
+                MV_REG_READ( ETH_UNIT_INTR_CAUSE_REG(port)) );    
+
+    mvOsPrintf("ETH_UNIT_INTR_MASK_REG         : 0x%X = 0x%08x\n", 
+                ETH_UNIT_INTR_MASK_REG(port), 
+                MV_REG_READ( ETH_UNIT_INTR_MASK_REG(port)) );    
+
+    mvOsPrintf("ETH_UNIT_ERROR_ADDR_REG        : 0x%X = 0x%08x\n", 
+                ETH_UNIT_ERROR_ADDR_REG(port), 
+                MV_REG_READ(ETH_UNIT_ERROR_ADDR_REG(port)) );    
+
+    mvOsPrintf("ETH_UNIT_INT_ADDR_ERROR_REG    : 0x%X = 0x%08x\n", 
+                ETH_UNIT_INT_ADDR_ERROR_REG(port), 
+                MV_REG_READ(ETH_UNIT_INT_ADDR_ERROR_REG(port)) );    
+    
+}
+
+/******************************************************************************/
+/*                      MIB Counters functions                                */
+/******************************************************************************/
+
+/*******************************************************************************
+* ethClearMibCounters - Clear all MIB counters
+*
+* DESCRIPTION:
+*       This function clears all MIB counters of a specific ethernet port.
+*       A read from the MIB counter will reset the counter.
+*
+* INPUT:
+*       int    port -  Ethernet Port number.
+*
+* RETURN: None
+*
+*******************************************************************************/
+void ethClearCounters(int port)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+        mvEthMibCountersClear(pHndl);
+
+    return;
+}
+
+
+/* Print counters of the Ethernet port */
+void    ethPortCounters(int port)
+{
+    MV_U32  regValue, regValHigh;
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl == NULL)
+        return;
+
+    mvOsPrintf("\n\t Port #%d MIB Counters\n\n", port);
+
+    mvOsPrintf("GoodFramesReceived          = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_FRAMES_RECEIVED, NULL));
+    mvOsPrintf("BadFramesReceived           = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_BAD_FRAMES_RECEIVED, NULL));
+    mvOsPrintf("BroadcastFramesReceived     = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_BROADCAST_FRAMES_RECEIVED, NULL));
+    mvOsPrintf("MulticastFramesReceived     = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_MULTICAST_FRAMES_RECEIVED, NULL));
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_OCTETS_RECEIVED_LOW, 
+                                 &regValHigh);
+    mvOsPrintf("GoodOctetsReceived          = 0x%08x%08x\n", 
+               regValHigh, regValue);
+
+    mvOsPrintf("\n");
+    mvOsPrintf("GoodFramesSent              = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_FRAMES_SENT, NULL));
+    mvOsPrintf("BroadcastFramesSent         = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_BROADCAST_FRAMES_SENT, NULL));
+    mvOsPrintf("MulticastFramesSent         = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_MULTICAST_FRAMES_SENT, NULL));
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_OCTETS_SENT_LOW, 
+                                 &regValHigh);
+    mvOsPrintf("GoodOctetsSent              = 0x%08x%08x\n", regValHigh, regValue);
+
+
+    mvOsPrintf("\n\t FC Control Counters\n");
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_UNREC_MAC_CONTROL_RECEIVED, NULL);
+    mvOsPrintf("UnrecogMacControlReceived   = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_FC_RECEIVED, NULL);
+    mvOsPrintf("GoodFCFramesReceived        = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_BAD_FC_RECEIVED, NULL);
+    mvOsPrintf("BadFCFramesReceived         = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_FC_SENT, NULL);
+    mvOsPrintf("FCFramesSent                = %u\n", regValue);
+
+
+    mvOsPrintf("\n\t RX Errors\n");
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_BAD_OCTETS_RECEIVED, NULL);
+    mvOsPrintf("BadOctetsReceived           = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_UNDERSIZE_RECEIVED, NULL);
+    mvOsPrintf("UndersizeFramesReceived     = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_FRAGMENTS_RECEIVED, NULL);
+    mvOsPrintf("FragmentsReceived           = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_OVERSIZE_RECEIVED, NULL);
+    mvOsPrintf("OversizeFramesReceived      = %u\n", regValue);
+    
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_JABBER_RECEIVED, NULL);
+    mvOsPrintf("JabbersReceived             = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_MAC_RECEIVE_ERROR, NULL);
+    mvOsPrintf("MacReceiveErrors            = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_BAD_CRC_EVENT, NULL);
+    mvOsPrintf("BadCrcReceived              = %u\n", regValue);
+
+    mvOsPrintf("\n\t TX Errors\n");
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR, NULL);
+    mvOsPrintf("TxMacErrors                 = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_EXCESSIVE_COLLISION, NULL);
+    mvOsPrintf("TxExcessiveCollisions       = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_COLLISION, NULL);
+    mvOsPrintf("TxCollisions                = %u\n", regValue);
+
+    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_LATE_COLLISION, NULL);
+    mvOsPrintf("TxLateCollisions            = %u\n", regValue);
+
+
+    mvOsPrintf("\n");
+    regValue = MV_REG_READ( ETH_RX_DISCARD_PKTS_CNTR_REG(port));
+    mvOsPrintf("Rx Discard packets counter  = %u\n", regValue);
+
+    regValue = MV_REG_READ(ETH_RX_OVERRUN_PKTS_CNTR_REG(port));
+    mvOsPrintf("Rx Overrun packets counter  = %u\n", regValue);
+}
+
+/* Print RMON counters of the Ethernet port */
+void    ethPortRmonCounters(int port)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl == NULL)
+        return;
+
+    mvOsPrintf("\n\t Port #%d RMON MIB Counters\n\n", port);
+
+    mvOsPrintf("64 ByteFramesReceived           = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_64_OCTETS, NULL));
+    mvOsPrintf("65...127 ByteFramesReceived     = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_65_TO_127_OCTETS, NULL));
+    mvOsPrintf("128...255 ByteFramesReceived    = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_128_TO_255_OCTETS, NULL));
+    mvOsPrintf("256...511 ByteFramesReceived    = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_256_TO_511_OCTETS, NULL));
+    mvOsPrintf("512...1023 ByteFramesReceived   = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_512_TO_1023_OCTETS, NULL));
+    mvOsPrintf("1024...Max ByteFramesReceived   = %u\n", 
+              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_1024_TO_MAX_OCTETS, NULL));
+}
+
+/* Print port information */
+void    ethPortStatus(int port)
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthPortShow(pHndl);
+    }
+}
+
+/* Print port queues information */
+void    ethPortQueues(int port, int rxQueue, int txQueue, int mode)  
+{
+    void*   pHndl;
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvEthQueuesShow(pHndl, rxQueue, txQueue, mode);
+    }
+}
+
+void    ethUcastSet(int port, char* macStr, int queue)
+{
+    void*   pHndl;
+    MV_U8   macAddr[MV_MAC_ADDR_SIZE];
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvMacStrToHex(macStr, macAddr);
+        mvEthMacAddrSet(pHndl, macAddr, queue);
+    }
+}
+
+
+void    ethPortUcastShow(int port)
+{
+    MV_U32  unicastReg, macL, macH;
+    int     i, j;
+
+    macL = MV_REG_READ(ETH_MAC_ADDR_LOW_REG(port));
+    macH = MV_REG_READ(ETH_MAC_ADDR_HIGH_REG(port));
+ 
+    mvOsPrintf("\n\t Port #%d Unicast MAC table: %02x:%02x:%02x:%02x:%02x:%02x\n\n", 
+                port, ((macH >> 24) & 0xff), ((macH >> 16) & 0xff),
+                      ((macH >> 8) & 0xff), (macH  & 0xff), 
+                      ((macL >> 8) & 0xff), (macL  & 0xff) );
+
+    for (i=0; i<4; i++)
+    {
+        unicastReg = MV_REG_READ( (ETH_DA_FILTER_UCAST_BASE(port) + i*4));
+        for(j=0; j<4; j++)
+        {
+            MV_U8   macEntry = (unicastReg >> (8*j)) & 0xFF;
+
+            mvOsPrintf("%X: %8s, Q = %d\n", i*4+j, 
+                (macEntry & BIT0) ? "Accept" : "Reject", (macEntry >> 1) & 0x7);
+        }
+    }
+} 
+
+void    ethMcastAdd(int port, char* macStr, int queue)
+{
+    void*   pHndl;
+    MV_U8   macAddr[MV_MAC_ADDR_SIZE];
+
+    pHndl = mvEthPortHndlGet(port);
+    if(pHndl != NULL)
+    {
+        mvMacStrToHex(macStr, macAddr);
+        mvEthMcastAddrSet(pHndl, macAddr, queue);
+    }
+}
+
+void    ethPortMcast(int port)
+{
+    int     tblIdx, regIdx;
+    MV_U32  regVal;
+
+    mvOsPrintf("\n\t Port #%d Special (IP) Multicast table: 01:00:5E:00:00:XX\n\n", 
+                port);
+
+    for(tblIdx=0; tblIdx<(256/4); tblIdx++)
+    {
+        regVal = MV_REG_READ((ETH_DA_FILTER_SPEC_MCAST_BASE(port) + tblIdx*4));
+        for(regIdx=0; regIdx<4; regIdx++)
+        {
+            if((regVal & (0x01 << (regIdx*8))) != 0)
+            {
+                mvOsPrintf("0x%02X: Accepted, rxQ = %d\n", 
+                    tblIdx*4+regIdx, ((regVal >> (regIdx*8+1)) & 0x07));
+            }
+        }
+    }
+    mvOsPrintf("\n\t Port #%d Other Multicast table\n\n", port);
+    for(tblIdx=0; tblIdx<(256/4); tblIdx++)
+    {
+        regVal = MV_REG_READ((ETH_DA_FILTER_OTH_MCAST_BASE(port) + tblIdx*4));
+        for(regIdx=0; regIdx<4; regIdx++)
+        {
+            if((regVal & (0x01 << (regIdx*8))) != 0)
+            {
+                mvOsPrintf("Crc8=0x%02X: Accepted, rxQ = %d\n", 
+                    tblIdx*4+regIdx, ((regVal >> (regIdx*8+1)) & 0x07));
+            }
+        }
+    }
+}
+
+
+/* Print status of Ethernet port */
+void    mvEthPortShow(void* pHndl)
+{
+    MV_U32              regValue, rxCoal, txCoal;
+    int                 speed, queue, port;
+    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pHndl;
+
+    port = pPortCtrl->portNo;
+
+    regValue = MV_REG_READ( ETH_PORT_STATUS_REG(port) );
+
+    mvOsPrintf("\n\t ethGiga #%d port Status: 0x%04x = 0x%08x\n\n", 
+                port, ETH_PORT_STATUS_REG(port), regValue);
+
+    mvOsPrintf("descInSram=%d, descSwCoher=%d\n", 
+                ethDescInSram, ethDescSwCoher);
+
+    if(regValue & ETH_GMII_SPEED_1000_MASK)
+        speed = 1000;
+    else if(regValue & ETH_MII_SPEED_100_MASK)
+        speed = 100;
+    else
+        speed = 10;
+
+    mvEthCoalGet(pPortCtrl, &rxCoal, &txCoal);
+
+    /* Link, Speed, Duplex, FlowControl */
+    mvOsPrintf("Link=%s, Speed=%d, Duplex=%s, RxFlowControl=%s",
+                (regValue & ETH_LINK_UP_MASK) ? "UP" : "DOWN",
+                speed, 
+                (regValue & ETH_FULL_DUPLEX_MASK) ? "FULL" : "HALF",
+                (regValue & ETH_ENABLE_RCV_FLOW_CTRL_MASK) ? "ENABLE" : "DISABLE");
+
+    mvOsPrintf("\n");
+
+    mvOsPrintf("RxCoal = %d usec, TxCoal = %d usec\n", 
+                rxCoal, txCoal);
+
+    mvOsPrintf("rxDefQ=%d, arpQ=%d, bpduQ=%d, tcpQ=%d, udpQ=%d\n\n",
+                pPortCtrl->portConfig.rxDefQ, pPortCtrl->portConfig.rxArpQ, 
+                pPortCtrl->portConfig.rxBpduQ, 
+                pPortCtrl->portConfig.rxTcpQ, pPortCtrl->portConfig.rxUdpQ); 
+
+    /* Print all RX and TX queues */
+    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
+    {
+        mvOsPrintf("RX Queue #%d: base=0x%lx, free=%d\n", 
+                    queue, (MV_ULONG)pPortCtrl->rxQueue[queue].pFirstDescr,
+                    mvEthRxResourceGet(pPortCtrl, queue) );
+    }
+    mvOsPrintf("\n");
+    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
+    {
+        mvOsPrintf("TX Queue #%d: base=0x%lx, free=%d\n", 
+                queue, (MV_ULONG)pPortCtrl->txQueue[queue].pFirstDescr,
+                mvEthTxResourceGet(pPortCtrl, queue) );
+    }
+}
+
+/* Print RX and TX queue of the Ethernet port */
+void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode)  
+{
+    ETH_PORT_CTRL   *pPortCtrl = (ETH_PORT_CTRL*)pHndl;
+    ETH_QUEUE_CTRL  *pQueueCtrl;
+    MV_U32          regValue;
+    ETH_RX_DESC     *pRxDescr;
+    ETH_TX_DESC     *pTxDescr;
+    int             i, port = pPortCtrl->portNo;
+
+    if( (rxQueue >=0) && (rxQueue < MV_ETH_RX_Q_NUM) )
+    {
+        pQueueCtrl = &(pPortCtrl->rxQueue[rxQueue]);
+        mvOsPrintf("Port #%d, RX Queue #%d\n\n", port, rxQueue);
+
+        mvOsPrintf("CURR_RX_DESC_PTR        : 0x%X = 0x%08x\n", 
+            ETH_RX_CUR_DESC_PTR_REG(port, rxQueue), 
+            MV_REG_READ( ETH_RX_CUR_DESC_PTR_REG(port, rxQueue)));
+
+
+        if(pQueueCtrl->pFirstDescr != NULL)
+        {
+            mvOsPrintf("pFirstDescr=0x%lx, pLastDescr=0x%lx, numOfResources=%d\n",
+                (MV_ULONG)pQueueCtrl->pFirstDescr, (MV_ULONG)pQueueCtrl->pLastDescr, 
+                pQueueCtrl->resource);
+            mvOsPrintf("pCurrDescr: 0x%lx, pUsedDescr: 0x%lx\n",
+                (MV_ULONG)pQueueCtrl->pCurrentDescr, 
+                (MV_ULONG)pQueueCtrl->pUsedDescr);
+
+            if(mode == 1)
+            {
+                pRxDescr = (ETH_RX_DESC*)pQueueCtrl->pFirstDescr;
+                i = 0; 
+                do 
+                {
+                    mvOsPrintf("%3d. desc=%08x (%08x), cmd=%08x, data=%4d, buf=%4d, buf=%08x, pkt=%lx, os=%lx\n", 
+                                i, (MV_U32)pRxDescr, (MV_U32)ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pRxDescr), 
+                                pRxDescr->cmdSts, pRxDescr->byteCnt, (MV_U32)pRxDescr->bufSize, 
+                                (unsigned int)pRxDescr->bufPtr, (MV_ULONG)pRxDescr->returnInfo,
+                                ((MV_PKT_INFO*)pRxDescr->returnInfo)->osInfo);
+
+                    ETH_DESCR_INV(pPortCtrl, pRxDescr);
+                    pRxDescr = RX_NEXT_DESC_PTR(pRxDescr, pQueueCtrl);
+                    i++;
+                } while (pRxDescr != pQueueCtrl->pFirstDescr);
+            }
+        }
+        else
+            mvOsPrintf("RX Queue #%d is NOT CREATED\n", rxQueue);
+    }
+
+    if( (txQueue >=0) && (txQueue < MV_ETH_TX_Q_NUM) )
+    {
+        pQueueCtrl = &(pPortCtrl->txQueue[txQueue]);
+        mvOsPrintf("Port #%d, TX Queue #%d\n\n", port, txQueue);
+
+        regValue = MV_REG_READ( ETH_TX_CUR_DESC_PTR_REG(port, txQueue));
+        mvOsPrintf("CURR_TX_DESC_PTR        : 0x%X = 0x%08x\n", 
+                    ETH_TX_CUR_DESC_PTR_REG(port, txQueue), regValue);
+
+        if(pQueueCtrl->pFirstDescr != NULL)
+        {
+            mvOsPrintf("pFirstDescr=0x%lx, pLastDescr=0x%lx, numOfResources=%d\n",
+                       (MV_ULONG)pQueueCtrl->pFirstDescr, 
+                       (MV_ULONG)pQueueCtrl->pLastDescr, 
+                        pQueueCtrl->resource);
+            mvOsPrintf("pCurrDescr: 0x%lx, pUsedDescr: 0x%lx\n",
+                       (MV_ULONG)pQueueCtrl->pCurrentDescr, 
+                       (MV_ULONG)pQueueCtrl->pUsedDescr);
+
+            if(mode == 1)
+            {
+                pTxDescr = (ETH_TX_DESC*)pQueueCtrl->pFirstDescr;
+                i = 0; 
+                do 
+                {
+                    mvOsPrintf("%3d. desc=%08x (%08x), cmd=%08x, data=%4d, buf=%08x, pkt=%lx, os=%lx\n", 
+                                i, (MV_U32)pTxDescr, (MV_U32)ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pTxDescr), 
+                                pTxDescr->cmdSts, pTxDescr->byteCnt, 
+                                (MV_U32)pTxDescr->bufPtr, (MV_ULONG)pTxDescr->returnInfo,
+                                pTxDescr->returnInfo ? (((MV_PKT_INFO*)pTxDescr->returnInfo)->osInfo) : 0x0);
+
+                    ETH_DESCR_INV(pPortCtrl, pTxDescr);
+                    pTxDescr = TX_NEXT_DESC_PTR(pTxDescr, pQueueCtrl);
+                    i++;
+                } while (pTxDescr != pQueueCtrl->pFirstDescr);
+            }
+        }
+        else
+            mvOsPrintf("TX Queue #%d is NOT CREATED\n", txQueue);
+    }
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h
new file mode 100644
index 00000000..f026f966
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h
@@ -0,0 +1,146 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#ifndef __MV_ETH_DEBUG_H__
+#define __MV_ETH_DEBUG_H__
+
+#if 0
+/*
+ ** Externs
+ */
+void     ethBpduRxQ(int port, int bpduQueue);
+void     ethArpRxQ(int port, int bpduQueue);
+void     ethTcpRxQ(int port, int bpduQueue);
+void     ethUdpRxQ(int port, int bpduQueue);
+void     ethMcastAdd(int port, char* macStr, int queue);
+
+#ifdef INCLUDE_MULTI_QUEUE
+void   	ethRxPolicy( int port);
+void   	ethTxPolicy( int port);
+void   	ethTxPolDA(int port, char* macStr, int txQ, char* headerHexStr);
+void   	ethRxPolMode(int port, MV_ETH_PRIO_MODE prioMode);
+void    ethRxPolQ(int port, int rxQueue, int rxQuota);
+#endif /* INCLUDE_MULTI_QUEUE */
+
+void    print_egiga_stat(void *sc, unsigned int port);
+void    ethPortStatus (int port);
+void    ethPortQueues( int port, int rxQueue, int txQueue, int mode);
+void    ethPortMcast(int port);
+void    ethPortRegs(int port);
+void    ethPortCounters(int port);
+void 	ethPortRmonCounters(int port);
+void    ethRxCoal(int port, int usec);
+void    ethTxCoal(int port, int usec);
+
+void    ethRegs(int port);
+void	ethClearCounters(int port);
+void    ethUcastSet(int port, char* macStr, int queue);
+void    ethPortUcastShow(int port);
+
+#ifdef CONFIG_MV_ETH_HEADER
+void	run_com_header(const char *buffer);
+#endif
+
+#ifdef INCLUDE_MULTI_QUEUE
+void    ethRxPolMode(int port, MV_ETH_PRIO_MODE prioMode);
+void    ethRxPolQ(int port, int queue, int quota);
+void    ethRxPolicy(int port);
+void    ethTxPolDef(int port, int txQ, char* headerHexStr);
+void    ethTxPolDA(int port, char* macStr, int txQ, char* headerHexStr);
+void    ethTxPolicy(int port);
+#endif /* INCLUDE_MULTI_QUEUE */
+
+#if (MV_ETH_VERSION >= 4)
+void     ethEjpModeSet(int port, int mode)
+#endif
+#endif /* 0 */
+
+
+
+
+void    ethRxCoal(int port, int usec);
+void    ethTxCoal(int port, int usec);
+#if (MV_ETH_VERSION >= 4)
+void     ethEjpModeSet(int port, int mode);
+#endif /* (MV_ETH_VERSION >= 4) */
+
+void    ethBpduRxQ(int port, int bpduQueue);
+void    ethArpRxQ(int port, int arpQueue);
+void    ethTcpRxQ(int port, int tcpQueue);
+void    ethUdpRxQ(int port, int udpQueue);
+void    ethTxPolicyRegs(int port);
+void    ethPortRegs(int port);
+void    ethRegs(int port);
+void ethClearCounters(int port);
+void    ethPortCounters(int port);
+void    ethPortRmonCounters(int port);
+void    ethPortStatus(int port);
+void    ethPortQueues(int port, int rxQueue, int txQueue, int mode);
+void    ethUcastSet(int port, char* macStr, int queue);
+void    ethPortUcastShow(int port);
+void    ethMcastAdd(int port, char* macStr, int queue);
+void    ethPortMcast(int port);
+void    mvEthPortShow(void* pHndl);
+void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode);
+
+#endif
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h
new file mode 100644
index 00000000..f4cae507
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h
@@ -0,0 +1,751 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvEth.h - Header File for : Marvell Gigabit Ethernet Controller
+*
+* DESCRIPTION:
+*       This header file contains macros typedefs and function declaration specific to 
+*       the Marvell Gigabit Ethernet Controller.
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+#ifndef __mvEthGbe_h__
+#define __mvEthGbe_h__
+
+extern MV_BOOL         ethDescInSram;
+extern MV_BOOL         ethDescSwCoher;
+extern ETH_PORT_CTRL*  ethPortCtrl[];
+
+static INLINE MV_ULONG  ethDescVirtToPhy(ETH_QUEUE_CTRL* pQueueCtrl, MV_U8* pDesc)
+{
+#if defined (ETH_DESCR_IN_SRAM)
+    if( ethDescInSram )
+        return mvSramVirtToPhy(pDesc);
+    else
+#endif /* ETH_DESCR_IN_SRAM */
+        return (pQueueCtrl->descBuf.bufPhysAddr + (pDesc - pQueueCtrl->descBuf.bufVirtPtr));
+}
+/* Return port handler */
+#define mvEthPortHndlGet(port)  ethPortCtrl[port]
+
+/* Used as WA for HW/SW race on TX */
+static INLINE int      mvEthPortTxEnable(void* pPortHndl, int queue, int max_deep)
+{
+    int                 deep = 0;
+    MV_U32              txCurrReg, txEnReg;
+    ETH_TX_DESC*        pTxLastDesc;
+    ETH_QUEUE_CTRL*     pQueueCtrl;
+    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+
+    txEnReg = MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo));
+    if( (txEnReg & MV_32BIT_LE_FAST(ETH_TXQ_ENABLE_MASK)) == 0)
+    {
+        MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) = pPortCtrl->portTxQueueCmdReg;
+        return 0;
+    }
+
+    pQueueCtrl = &pPortCtrl->txQueue[queue];
+    pTxLastDesc = pQueueCtrl->pCurrentDescr;
+    txCurrReg = MV_REG_READ(ETH_TX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue));
+    if(ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pTxLastDesc) == txCurrReg)
+    {
+        /* All descriptors are processed, no chance for race */
+        return 0;
+    }
+
+    /* Check distance betwee HW and SW location: */
+    /* If distance between HW and SW pointers is less than max_deep descriptors */
+    /* Race condition is possible, so wait end of TX and restart TXQ */
+    while(deep < max_deep)
+    {
+        pTxLastDesc = TX_PREV_DESC_PTR(pTxLastDesc, pQueueCtrl);
+        if(ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pTxLastDesc) == txCurrReg)
+        {
+            int count = 0;
+
+            while( (txEnReg & MV_32BIT_LE_FAST(ETH_TXQ_ENABLE_MASK)) != 0)
+            {   
+                count++;
+                if(count > 10000)
+                {
+                    mvOsPrintf("mvEthPortTxEnable: timeout - TXQ_CMD=0x%08x\n", 
+                                MV_REG_READ(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) );
+                    break;
+                }
+                txEnReg = MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo));
+            }
+
+            MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) = pPortCtrl->portTxQueueCmdReg;
+            return count;
+        }
+        deep++;
+    }
+    /* Distance between HW and SW pointers is more than max_deep descriptors, */
+    /* So NO race condition - do nothing */
+    return -1;
+}
+
+
+/* defines  */
+#define ETH_CSUM_MIN_BYTE_COUNT     72
+
+/* Tailgate and Kirwood have only 2K TX FIFO */
+#if (MV_ETH_VERSION == 2) || (MV_ETH_VERSION == 4)
+#define ETH_CSUM_MAX_BYTE_COUNT     1600
+#else
+#define ETH_CSUM_MAX_BYTE_COUNT     9*1024
+#endif /* MV_ETH_VERSION */
+
+#define ETH_MV_HEADER_SIZE	    2
+#define ETH_MV_TX_EN
+
+/* An offest in Tx descriptors to store data for buffers less than 8 Bytes */
+#define MIN_TX_BUFF_LOAD            8
+#define TX_BUF_OFFSET_IN_DESC       (ETH_TX_DESC_ALIGNED_SIZE - MIN_TX_BUFF_LOAD)
+
+/* Default port configuration value */
+#define PORT_CONFIG_VALUE                       \
+             ETH_DEF_RX_QUEUE_MASK(0)       |   \
+             ETH_DEF_RX_ARP_QUEUE_MASK(0)   |   \
+             ETH_DEF_RX_TCP_QUEUE_MASK(0)   |   \
+             ETH_DEF_RX_UDP_QUEUE_MASK(0)   |   \
+             ETH_DEF_RX_BPDU_QUEUE_MASK(0)  |   \
+             ETH_RX_CHECKSUM_WITH_PSEUDO_HDR
+
+/* Default port extend configuration value */
+#define PORT_CONFIG_EXTEND_VALUE            0
+
+#define PORT_SERIAL_CONTROL_VALUE                           \
+            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
+            BIT9                                        |   \
+            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
+            ETH_MAX_RX_PACKET_1552BYTE                  |   \
+            ETH_SET_FULL_DUPLEX_MASK
+
+#define PORT_SERIAL_CONTROL_100MB_FORCE_VALUE               \
+            ETH_FORCE_LINK_PASS_MASK                    |   \
+            ETH_DISABLE_DUPLEX_AUTO_NEG_MASK            |   \
+            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
+            BIT9                                        |   \
+            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
+            ETH_DISABLE_SPEED_AUTO_NEG_MASK             |   \
+            ETH_SET_FULL_DUPLEX_MASK                    |   \
+            ETH_SET_MII_SPEED_100_MASK                  |   \
+            ETH_MAX_RX_PACKET_1552BYTE
+
+
+#define PORT_SERIAL_CONTROL_1000MB_FORCE_VALUE              \
+            ETH_FORCE_LINK_PASS_MASK                    |   \
+            ETH_DISABLE_DUPLEX_AUTO_NEG_MASK            |   \
+            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
+            BIT9                                        |   \
+            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
+            ETH_DISABLE_SPEED_AUTO_NEG_MASK             |   \
+            ETH_SET_FULL_DUPLEX_MASK                    |   \
+            ETH_SET_GMII_SPEED_1000_MASK                |   \
+            ETH_MAX_RX_PACKET_1552BYTE
+
+#define PORT_SERIAL_CONTROL_SGMII_IBAN_VALUE                \
+            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
+            BIT9                                        |   \
+            ETH_IN_BAND_AN_EN_MASK                      |   \
+            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
+            ETH_MAX_RX_PACKET_1552BYTE                  
+
+/* Function headers: */
+MV_VOID     mvEthSetSpecialMcastTable(int portNo, int queue);
+MV_STATUS   mvEthArpRxQueue(void* pPortHandle, int arpQueue);
+MV_STATUS   mvEthUdpRxQueue(void* pPortHandle, int udpQueue);
+MV_STATUS   mvEthTcpRxQueue(void* pPortHandle, int tcpQueue);
+MV_STATUS   mvEthMacAddrGet(int portNo, unsigned char *pAddr);
+MV_VOID     mvEthSetOtherMcastTable(int portNo, int queue);
+MV_STATUS   mvEthHeaderModeSet(void* pPortHandle, MV_ETH_HEADER_MODE headerMode);
+/* Interrupt Coalesting functions */
+MV_U32      mvEthRxCoalSet(void* pPortHndl, MV_U32 uSec);
+MV_U32      mvEthTxCoalSet(void* pPortHndl, MV_U32 uSec);
+MV_STATUS   mvEthCoalGet(void* pPortHndl, MV_U32* pRxCoal, MV_U32* pTxCoal);
+
+/******************************************************************************/
+/*                          Data Flow functions                               */
+/******************************************************************************/
+static INLINE void      mvEthPortTxRestart(void* pPortHndl)
+{
+    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+
+    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) = pPortCtrl->portTxQueueCmdReg;
+}
+
+/* Get number of Free resources in specific TX queue */
+static INLINE int     mvEthTxResourceGet(void* pPortHndl, int txQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+
+    return (pPortCtrl->txQueue[txQueue].resource);      
+}
+
+/* Get number of Free resources in specific RX queue */
+static INLINE int     mvEthRxResourceGet(void* pPortHndl, int rxQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+
+    return (pPortCtrl->rxQueue[rxQueue].resource);      
+}
+
+static INLINE int     mvEthTxQueueIsFull(void* pPortHndl, int txQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+
+    if(pPortCtrl->txQueue[txQueue].resource == 0)
+        return MV_TRUE;
+
+    return MV_FALSE;
+}
+
+/* Get number of Free resources in specific RX queue */
+static INLINE int     mvEthRxQueueIsFull(void* pPortHndl, int rxQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->rxQueue[rxQueue];
+
+    if( (pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) && 
+        (pQueueCtrl->resource != 0) )
+        return MV_TRUE;
+
+    return MV_FALSE;
+}
+
+static INLINE int     mvEthTxQueueIsEmpty(void* pPortHndl, int txQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->txQueue[txQueue];
+
+    if( (pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) &&
+        (pQueueCtrl->resource != 0) )
+    {
+        return MV_TRUE;
+    }
+    return MV_FALSE;
+}
+
+/* Get number of Free resources in specific RX queue */
+static INLINE int     mvEthRxQueueIsEmpty(void* pPortHndl, int rxQueue)
+{
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
+
+    if(pPortCtrl->rxQueue[rxQueue].resource == 0)
+        return MV_TRUE;
+
+    return MV_FALSE;
+}
+
+/*******************************************************************************
+* mvEthPortTx - Send an Ethernet packet
+*
+* DESCRIPTION:
+*       This routine send a given packet described by pPktInfo parameter. 
+*       Single buffer only.
+*
+* INPUT:
+*       void*       pEthPortHndl  - Ethernet Port handler.
+*       int         txQueue       - Number of Tx queue.
+*       MV_PKT_INFO *pPktInfo     - User packet to send.
+*
+* RETURN:
+*       MV_NO_RESOURCE  - No enough resources to send this packet.
+*       MV_ERROR        - Unexpected Fatal error.
+*       MV_OK           - Packet send successfully.
+*
+*******************************************************************************/
+static INLINE MV_STATUS   mvEthPortTx(void* pEthPortHndl, int txQueue, MV_PKT_INFO* pPktInfo)
+{
+    ETH_TX_DESC*    pTxCurrDesc;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl;
+    int             portNo;
+    MV_BUF_INFO*    pBufInfo = pPktInfo->pFrags;
+
+#ifdef ETH_DEBUG
+    if(pPortCtrl->portState != MV_ACTIVE)
+        return MV_BAD_STATE;
+#endif /* ETH_DEBUG */
+
+    portNo = pPortCtrl->portNo;
+    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
+
+    /* Get the Tx Desc ring indexes */
+    pTxCurrDesc = pQueueCtrl->pCurrentDescr;
+
+    /* Check if there is enough resources to send the packet */
+    if(pQueueCtrl->resource == 0)
+        return MV_NO_RESOURCE;
+
+    pTxCurrDesc->byteCnt = pBufInfo->dataSize;
+
+    /* Flash Buffer */
+    if(pPktInfo->pktSize != 0)
+    {
+#ifdef MV_NETBSD
+        pTxCurrDesc->bufPtr = pBufInfo->bufPhysAddr;
+        ETH_PACKET_CACHE_FLUSH(pBufInfo->bufVirtPtr, pPktInfo->pktSize);
+#else
+        pTxCurrDesc->bufPtr = ETH_PACKET_CACHE_FLUSH(pBufInfo->bufVirtPtr, pPktInfo->pktSize);
+#endif
+        pPktInfo->pktSize = 0;
+    }
+    else
+        pTxCurrDesc->bufPtr = pBufInfo->bufPhysAddr;
+
+    pTxCurrDesc->returnInfo = (MV_ULONG)pPktInfo;
+
+    /* There is only one buffer in the packet */
+    /* The OSG might set some bits for checksum offload, so add them to first descriptor */
+    pTxCurrDesc->cmdSts = pPktInfo->status              |
+                          ETH_BUFFER_OWNED_BY_DMA       |
+                          ETH_TX_GENERATE_CRC_MASK      |
+                          ETH_TX_ENABLE_INTERRUPT_MASK  |
+                          ETH_TX_ZERO_PADDING_MASK      |
+                          ETH_TX_FIRST_DESC_MASK        |
+                          ETH_TX_LAST_DESC_MASK;
+
+    ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
+
+    pQueueCtrl->resource--;
+    pQueueCtrl->pCurrentDescr = TX_NEXT_DESC_PTR(pTxCurrDesc, pQueueCtrl);
+
+    /* Apply send command */
+    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(portNo)) = pPortCtrl->portTxQueueCmdReg;
+
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvEthPortSgTx - Send an Ethernet packet
+*
+* DESCRIPTION:
+*       This routine send a given packet described by pBufInfo parameter. It
+*       supports transmitting of a packet spaned over multiple buffers. 
+*
+* INPUT:
+*       void*       pEthPortHndl  - Ethernet Port handler.
+*       int         txQueue       - Number of Tx queue.
+*       MV_PKT_INFO *pPktInfo     - User packet to send.
+*
+* RETURN:
+*       MV_NO_RESOURCE  - No enough resources to send this packet.
+*       MV_ERROR        - Unexpected Fatal error.
+*       MV_OK           - Packet send successfully.
+*
+*******************************************************************************/
+static INLINE MV_STATUS   mvEthPortSgTx(void* pEthPortHndl, int txQueue, MV_PKT_INFO* pPktInfo)
+{
+    ETH_TX_DESC*    pTxFirstDesc;
+    ETH_TX_DESC*    pTxCurrDesc;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl;
+    int             portNo, bufCount;
+    MV_BUF_INFO*    pBufInfo = pPktInfo->pFrags;
+    MV_U8*          pTxBuf;
+
+#ifdef ETH_DEBUG
+    if(pPortCtrl->portState != MV_ACTIVE)
+        return MV_BAD_STATE;
+#endif /* ETH_DEBUG */
+
+    portNo = pPortCtrl->portNo;
+    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
+
+    /* Get the Tx Desc ring indexes */
+    pTxCurrDesc = pQueueCtrl->pCurrentDescr;
+
+    /* Check if there is enough resources to send the packet */
+    if(pQueueCtrl->resource < pPktInfo->numFrags)
+        return MV_NO_RESOURCE;
+
+    /* Remember first desc */
+    pTxFirstDesc  = pTxCurrDesc;
+
+    bufCount = 0;
+    while(MV_TRUE)
+    {   
+        if(pBufInfo[bufCount].dataSize <= MIN_TX_BUFF_LOAD)
+        {
+            /* Buffers with a payload smaller than MIN_TX_BUFF_LOAD (8 bytes) must be aligned    */
+            /* to 64-bit boundary. Two options here:                                             */
+            /* 1) Usually, copy the payload to the reserved 8 bytes inside descriptor.           */
+            /* 2) In the Half duplex workaround, the reserved 8 bytes inside descriptor are used */ 
+            /*    as a pointer to the aligned buffer, copy the small payload to this buffer.     */
+            pTxBuf = ((MV_U8*)pTxCurrDesc)+TX_BUF_OFFSET_IN_DESC;
+            mvOsBCopy(pBufInfo[bufCount].bufVirtPtr, pTxBuf, pBufInfo[bufCount].dataSize);
+            pTxCurrDesc->bufPtr = ethDescVirtToPhy(pQueueCtrl, pTxBuf);
+        }
+        else
+        {
+            /* Flash Buffer */
+#ifdef MV_NETBSD
+            pTxCurrDesc->bufPtr = pBufInfo[bufCount].bufPhysAddr;
+	    ETH_PACKET_CACHE_FLUSH(pBufInfo[bufCount].bufVirtPtr, pBufInfo[bufCount].dataSize);
+#else
+            pTxCurrDesc->bufPtr = ETH_PACKET_CACHE_FLUSH(pBufInfo[bufCount].bufVirtPtr, pBufInfo[bufCount].dataSize);
+#endif
+        }
+
+        pTxCurrDesc->byteCnt = pBufInfo[bufCount].dataSize;
+        bufCount++;
+
+        if(bufCount >= pPktInfo->numFrags)
+            break;
+
+        if(bufCount > 1)
+        {
+            /* There is middle buffer of the packet Not First and Not Last */
+            pTxCurrDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA;
+            ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
+        }
+        /* Go to next descriptor and next buffer */
+        pTxCurrDesc = TX_NEXT_DESC_PTR(pTxCurrDesc, pQueueCtrl);
+    }
+    /* Set last desc with DMA ownership and interrupt enable. */
+    pTxCurrDesc->returnInfo = (MV_ULONG)pPktInfo;
+    if(bufCount == 1) 
+    {
+        /* There is only one buffer in the packet */
+        /* The OSG might set some bits for checksum offload, so add them to first descriptor */
+        pTxCurrDesc->cmdSts = pPktInfo->status              |
+                              ETH_BUFFER_OWNED_BY_DMA       |
+                              ETH_TX_GENERATE_CRC_MASK      |
+                              ETH_TX_ENABLE_INTERRUPT_MASK  |
+                              ETH_TX_ZERO_PADDING_MASK      |
+                              ETH_TX_FIRST_DESC_MASK        |
+                              ETH_TX_LAST_DESC_MASK;
+
+        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
+    }
+    else
+    {
+        /* Last but not First */
+        pTxCurrDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA       |
+                              ETH_TX_ENABLE_INTERRUPT_MASK  |
+                              ETH_TX_ZERO_PADDING_MASK      |
+                              ETH_TX_LAST_DESC_MASK;
+
+        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
+
+        /* Update First when more than one buffer in the packet */
+        /* The OSG might set some bits for checksum offload, so add them to first descriptor */
+        pTxFirstDesc->cmdSts = pPktInfo->status             |
+                               ETH_BUFFER_OWNED_BY_DMA      |
+                               ETH_TX_GENERATE_CRC_MASK     |
+                               ETH_TX_FIRST_DESC_MASK;
+
+        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxFirstDesc);
+    }
+    /* Update txQueue state */
+    pQueueCtrl->resource -= bufCount;
+    pQueueCtrl->pCurrentDescr = TX_NEXT_DESC_PTR(pTxCurrDesc, pQueueCtrl);
+
+    /* Apply send command */
+    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(portNo)) = pPortCtrl->portTxQueueCmdReg;
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvEthPortTxDone - Free all used Tx descriptors and mBlks.
+*
+* DESCRIPTION:
+*       This routine returns the transmitted packet information to the caller.
+*
+* INPUT:
+*       void*       pEthPortHndl    - Ethernet Port handler.
+*       int         txQueue         - Number of Tx queue.
+*
+* OUTPUT:
+*       MV_PKT_INFO *pPktInfo       - Pointer to packet was sent.
+*
+* RETURN:
+*       MV_NOT_FOUND    - No transmitted packets to return. Transmit in progress.
+*       MV_EMPTY        - No transmitted packets to return. TX Queue is empty.
+*       MV_ERROR        - Unexpected Fatal error.
+*       MV_OK           - There is transmitted packet in the queue, 
+*                       'pPktInfo' filled with relevant information.
+*
+*******************************************************************************/
+static INLINE MV_PKT_INFO*    mvEthPortTxDone(void* pEthPortHndl, int txQueue)
+{
+    ETH_TX_DESC*    pTxCurrDesc;
+    ETH_TX_DESC*    pTxUsedDesc;
+    ETH_QUEUE_CTRL* pQueueCtrl;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    MV_PKT_INFO*    pPktInfo;
+    MV_U32          commandStatus;
+
+    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
+
+    pTxUsedDesc = pQueueCtrl->pUsedDescr;
+    pTxCurrDesc = pQueueCtrl->pCurrentDescr;
+
+    while(MV_TRUE)
+    {
+        /* No more used descriptors */
+        commandStatus = pTxUsedDesc->cmdSts;
+        if (commandStatus  & (ETH_BUFFER_OWNED_BY_DMA))
+        {    
+            ETH_DESCR_INV(pPortCtrl, pTxUsedDesc);
+            return NULL;
+        }
+        if( (pTxUsedDesc == pTxCurrDesc) &&
+            (pQueueCtrl->resource != 0) )
+        {
+            return NULL;
+        }
+        pQueueCtrl->resource++;
+        pQueueCtrl->pUsedDescr = TX_NEXT_DESC_PTR(pTxUsedDesc, pQueueCtrl);
+        if(commandStatus & (ETH_TX_LAST_DESC_MASK)) 
+        {
+            pPktInfo = (MV_PKT_INFO*)pTxUsedDesc->returnInfo;
+            pPktInfo->status  = commandStatus;            
+            return pPktInfo;
+        }
+        pTxUsedDesc = pQueueCtrl->pUsedDescr;
+    }
+}
+
+/*******************************************************************************
+* mvEthPortRx - Get new received packets from Rx queue.
+*
+* DESCRIPTION:
+*       This routine returns the received data to the caller. There is no
+*       data copying during routine operation. All information is returned
+*       using pointer to packet information struct passed from the caller.
+*
+* INPUT:
+*       void*       pEthPortHndl    - Ethernet Port handler.
+*       int         rxQueue         - Number of Rx queue.
+*
+* OUTPUT:
+*       MV_PKT_INFO *pPktInfo       - Pointer to received packet.
+*
+* RETURN:
+*       MV_NO_RESOURCE  - No free resources in RX queue.
+*       MV_ERROR        - Unexpected Fatal error.
+*       MV_OK           - New packet received and 'pBufInfo' structure filled
+*                       with relevant information.
+*
+*******************************************************************************/
+static INLINE MV_PKT_INFO*    mvEthPortRx(void* pEthPortHndl, int rxQueue)
+{
+    ETH_RX_DESC     *pRxCurrDesc;
+    MV_U32          commandStatus;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+    ETH_QUEUE_CTRL* pQueueCtrl;
+    MV_PKT_INFO*    pPktInfo;
+
+    pQueueCtrl = &(pPortCtrl->rxQueue[rxQueue]);
+
+    /* Check resources */
+    if(pQueueCtrl->resource == 0)
+    {
+        mvOsPrintf("ethPortRx: no more resources\n");
+        return NULL;
+    }
+    while(MV_TRUE)
+    {
+        /* Get the Rx Desc ring 'curr and 'used' indexes */
+        pRxCurrDesc = pQueueCtrl->pCurrentDescr;
+
+	commandStatus   = pRxCurrDesc->cmdSts;
+        if (commandStatus & (ETH_BUFFER_OWNED_BY_DMA))
+        {
+            /* Nothing to receive... */
+            ETH_DESCR_INV(pPortCtrl, pRxCurrDesc);
+            return NULL;
+        }
+
+        /* Valid RX only if FIRST and LAST bits are set */
+        if( (commandStatus & (ETH_RX_LAST_DESC_MASK | ETH_RX_FIRST_DESC_MASK)) == 
+                             (ETH_RX_LAST_DESC_MASK | ETH_RX_FIRST_DESC_MASK) )
+        {
+            pPktInfo = (MV_PKT_INFO*)pRxCurrDesc->returnInfo;
+            pPktInfo->pFrags->dataSize  = pRxCurrDesc->byteCnt - 4;
+            pPktInfo->status            = commandStatus;
+            pPktInfo->fragIP            = pRxCurrDesc->bufSize & ETH_RX_IP_FRAGMENTED_FRAME_MASK;
+
+            pQueueCtrl->resource--;
+            /* Update 'curr' in data structure */
+            pQueueCtrl->pCurrentDescr = RX_NEXT_DESC_PTR(pRxCurrDesc, pQueueCtrl);
+
+#ifdef INCLUDE_SYNC_BARR
+            mvCpuIfSyncBarr(DRAM_TARGET);
+#endif
+            return pPktInfo;
+        }
+        else
+        {
+            ETH_RX_DESC*    pRxUsedDesc = pQueueCtrl->pUsedDescr;
+
+#ifdef ETH_DEBUG
+            mvOsPrintf("ethDrv: Unexpected Jumbo frame: "
+                       "status=0x%08x, byteCnt=%d, pData=0x%x\n", 
+                        commandStatus, pRxCurrDesc->byteCnt, pRxCurrDesc->bufPtr);
+#endif /* ETH_DEBUG */
+
+            /* move buffer from pCurrentDescr position to pUsedDescr position */
+            pRxUsedDesc->bufPtr     = pRxCurrDesc->bufPtr;
+            pRxUsedDesc->returnInfo = pRxCurrDesc->returnInfo;
+            pRxUsedDesc->bufSize    = pRxCurrDesc->bufSize & ETH_RX_BUFFER_MASK;
+
+            /* Return the descriptor to DMA ownership */
+            pRxUsedDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA | 
+                                  ETH_RX_ENABLE_INTERRUPT_MASK;
+
+            /* Flush descriptor and CPU pipe */
+            ETH_DESCR_FLUSH_INV(pPortCtrl, pRxUsedDesc);
+
+            /* Move the used descriptor pointer to the next descriptor */
+            pQueueCtrl->pUsedDescr = RX_NEXT_DESC_PTR(pRxUsedDesc, pQueueCtrl);
+            pQueueCtrl->pCurrentDescr = RX_NEXT_DESC_PTR(pRxCurrDesc, pQueueCtrl);            
+        }
+    }
+}
+
+/*******************************************************************************
+* mvEthPortRxDone - Returns a Rx buffer back to the Rx ring.
+*
+* DESCRIPTION:
+*       This routine returns a Rx buffer back to the Rx ring. 
+*
+* INPUT:
+*       void*       pEthPortHndl    - Ethernet Port handler.
+*       int         rxQueue         - Number of Rx queue.
+*       MV_PKT_INFO *pPktInfo       - Pointer to received packet.
+*
+* RETURN:
+*       MV_ERROR        - Unexpected Fatal error.
+*       MV_OUT_OF_RANGE - RX queue is already FULL, so this buffer can't be 
+*                       returned to this queue.
+*       MV_FULL         - Buffer returned successfully and RX queue became full.
+*                       More buffers should not be returned at the time.
+*       MV_OK           - Buffer returned successfully and there are more free 
+*                       places in the queue.
+*
+*******************************************************************************/
+static INLINE MV_STATUS   mvEthPortRxDone(void* pEthPortHndl, int rxQueue, MV_PKT_INFO *pPktInfo)
+{
+    ETH_RX_DESC*    pRxUsedDesc;
+    ETH_QUEUE_CTRL* pQueueCtrl;
+    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
+            
+    pQueueCtrl = &pPortCtrl->rxQueue[rxQueue];
+
+    /* Get 'used' Rx descriptor */
+    pRxUsedDesc = pQueueCtrl->pUsedDescr;
+
+    /* Check that ring is not FULL */
+    if( (pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) && 
+        (pQueueCtrl->resource != 0) )
+    {
+        mvOsPrintf("%s %d: out of range Error resource=%d, curr=%p, used=%p\n", 
+                    __FUNCTION__, pPortCtrl->portNo, pQueueCtrl->resource, 
+                    pQueueCtrl->pCurrentDescr, pQueueCtrl->pUsedDescr);
+        return MV_OUT_OF_RANGE;
+    }
+
+    pRxUsedDesc->bufPtr     = pPktInfo->pFrags->bufPhysAddr;
+    pRxUsedDesc->returnInfo = (MV_ULONG)pPktInfo;
+    pRxUsedDesc->bufSize    = pPktInfo->pFrags->bufSize & ETH_RX_BUFFER_MASK;
+
+    /* Invalidate data buffer accordingly with pktSize */
+    if(pPktInfo->pktSize != 0)
+    {
+        ETH_PACKET_CACHE_INVALIDATE(pPktInfo->pFrags->bufVirtPtr, pPktInfo->pktSize);
+        pPktInfo->pktSize = 0;
+    }
+
+    /* Return the descriptor to DMA ownership */
+    pRxUsedDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT_MASK;
+
+    /* Flush descriptor and CPU pipe */
+    ETH_DESCR_FLUSH_INV(pPortCtrl, pRxUsedDesc);
+
+    pQueueCtrl->resource++;
+
+    /* Move the used descriptor pointer to the next descriptor */
+    pQueueCtrl->pUsedDescr = RX_NEXT_DESC_PTR(pRxUsedDesc, pQueueCtrl);
+    
+    /* If ring became Full return MV_FULL */
+    if(pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) 
+        return MV_FULL;
+
+    return MV_OK;
+}
+
+
+#endif /* __mvEthGbe_h__ */
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h
new file mode 100644
index 00000000..7b9f0520
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h
@@ -0,0 +1,700 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCmvEthRegsh
+#define __INCmvEthRegsh
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+
+/****************************************/
+/*        Ethernet Unit Registers       */
+/****************************************/
+#define ETH_REG_BASE 					MV_ETH_REG_BASE
+
+#define ETH_PHY_ADDR_REG(port)              (ETH_REG_BASE(port) + 0x000)
+#define ETH_SMI_REG(port)                   (ETH_REG_BASE(port) + 0x004)
+#define ETH_UNIT_DEF_ADDR_REG(port)         (ETH_REG_BASE(port) + 0x008)
+#define ETH_UNIT_DEF_ID_REG(port)           (ETH_REG_BASE(port) + 0x00c)
+#define ETH_UNIT_RESERVED(port)             (ETH_REG_BASE(port) + 0x014)
+#define ETH_UNIT_INTR_CAUSE_REG(port)       (ETH_REG_BASE(port) + 0x080)
+#define ETH_UNIT_INTR_MASK_REG(port)        (ETH_REG_BASE(port) + 0x084)
+
+
+#define ETH_UNIT_ERROR_ADDR_REG(port)       (ETH_REG_BASE(port) + 0x094)
+#define ETH_UNIT_INT_ADDR_ERROR_REG(port)   (ETH_REG_BASE(port) + 0x098)
+#define ETH_UNIT_CONTROL_REG(port)          (ETH_REG_BASE(port) + 0x0B0)
+
+#define ETH_PORT_CONFIG_REG(port)           (ETH_REG_BASE(port) + 0x400)
+#define ETH_PORT_CONFIG_EXTEND_REG(port)    (ETH_REG_BASE(port) + 0x404)
+#define ETH_MII_SERIAL_PARAM_REG(port)      (ETH_REG_BASE(port) + 0x408)
+#define ETH_GMII_SERIAL_PARAM_REG(port)     (ETH_REG_BASE(port) + 0x40c)
+#define ETH_VLAN_ETHER_TYPE_REG(port)       (ETH_REG_BASE(port) + 0x410)
+#define ETH_MAC_ADDR_LOW_REG(port)          (ETH_REG_BASE(port) + 0x414)
+#define ETH_MAC_ADDR_HIGH_REG(port)         (ETH_REG_BASE(port) + 0x418)
+#define ETH_SDMA_CONFIG_REG(port)           (ETH_REG_BASE(port) + 0x41c)
+#define ETH_DIFF_SERV_PRIO_REG(port, code)  (ETH_REG_BASE(port) + 0x420  + ((code)<<2))
+#define ETH_PORT_SERIAL_CTRL_REG(port)      (ETH_REG_BASE(port) + 0x43c)
+#define ETH_VLAN_TAG_TO_PRIO_REG(port)      (ETH_REG_BASE(port) + 0x440)
+#define ETH_PORT_STATUS_REG(port)           (ETH_REG_BASE(port) + 0x444)
+
+#define ETH_RX_QUEUE_COMMAND_REG(port)      (ETH_REG_BASE(port) + 0x680)
+#define ETH_TX_QUEUE_COMMAND_REG(port)      (ETH_REG_BASE(port) + 0x448)
+
+#define ETH_PORT_SERIAL_CTRL_1_REG(port)    (ETH_REG_BASE(port) + 0x44c)
+#define ETH_PORT_STATUS_1_REG(port)         (ETH_REG_BASE(port) + 0x450)
+#define ETH_PORT_MARVELL_HEADER_REG(port)   (ETH_REG_BASE(port) + 0x454)
+#define ETH_PORT_FIFO_PARAMS_REG(port)      (ETH_REG_BASE(port) + 0x458)
+#define ETH_MAX_TOKEN_BUCKET_SIZE_REG(port) (ETH_REG_BASE(port) + 0x45c)
+#define ETH_INTR_CAUSE_REG(port)            (ETH_REG_BASE(port) + 0x460)
+#define ETH_INTR_CAUSE_EXT_REG(port)        (ETH_REG_BASE(port) + 0x464)
+#define ETH_INTR_MASK_REG(port)             (ETH_REG_BASE(port) + 0x468)
+#define ETH_INTR_MASK_EXT_REG(port)         (ETH_REG_BASE(port) + 0x46c)
+#define ETH_TX_FIFO_URGENT_THRESH_REG(port) (ETH_REG_BASE(port) + 0x474)
+#define ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (ETH_REG_BASE(port) + 0x47c)
+#define ETH_RX_DISCARD_PKTS_CNTR_REG(port)  (ETH_REG_BASE(port) + 0x484)
+#define ETH_RX_OVERRUN_PKTS_CNTR_REG(port)  (ETH_REG_BASE(port) + 0x488)
+#define ETH_INTERNAL_ADDR_ERROR_REG(port)   (ETH_REG_BASE(port) + 0x494)
+#define ETH_TX_FIXED_PRIO_CFG_REG(port)     (ETH_REG_BASE(port) + 0x4dc)
+#define ETH_TX_TOKEN_RATE_CFG_REG(port)     (ETH_REG_BASE(port) + 0x4e0)
+#define ETH_TX_QUEUE_COMMAND1_REG(port)     (ETH_REG_BASE(port) + 0x4e4)
+#define ETH_MAX_TRANSMIT_UNIT_REG(port)     (ETH_REG_BASE(port) + 0x4e8)
+#define ETH_TX_TOKEN_BUCKET_SIZE_REG(port)  (ETH_REG_BASE(port) + 0x4ec)
+#define ETH_TX_TOKEN_BUCKET_COUNT_REG(port) (ETH_REG_BASE(port) + 0x780)
+#define ETH_RX_DESCR_STAT_CMD_REG(port, q)  (ETH_REG_BASE(port) + 0x600 + ((q)<<4))
+#define ETH_RX_BYTE_COUNT_REG(port, q)      (ETH_REG_BASE(port) + 0x604 + ((q)<<4))
+#define ETH_RX_BUF_PTR_REG(port, q)         (ETH_REG_BASE(port) + 0x608 + ((q)<<4))
+#define ETH_RX_CUR_DESC_PTR_REG(port, q)    (ETH_REG_BASE(port) + 0x60c + ((q)<<4))
+#define ETH_TX_CUR_DESC_PTR_REG(port, q)    (ETH_REG_BASE(port) + 0x6c0 + ((q)<<2))
+
+#define ETH_TXQ_TOKEN_COUNT_REG(port, q)    (ETH_REG_BASE(port) + 0x700 + ((q)<<4))
+#define ETH_TXQ_TOKEN_CFG_REG(port, q)      (ETH_REG_BASE(port) + 0x704 + ((q)<<4))
+#define ETH_TXQ_ARBITER_CFG_REG(port, q)    (ETH_REG_BASE(port) + 0x708 + ((q)<<4))
+
+#if (MV_ETH_VERSION >= 4) 
+#define ETH_TXQ_CMD_1_REG(port)             (ETH_REG_BASE(port) + 0x4E4)
+#define ETH_EJP_TX_HI_IPG_REG(port)         (ETH_REG_BASE(port) + 0x7A8)
+#define ETH_EJP_TX_LO_IPG_REG(port)         (ETH_REG_BASE(port) + 0x7B8)
+#define ETH_EJP_HI_TKN_LO_PKT_REG(port)     (ETH_REG_BASE(port) + 0x7C0)
+#define ETH_EJP_HI_TKN_ASYNC_PKT_REG(port)  (ETH_REG_BASE(port) + 0x7C4)
+#define ETH_EJP_LO_TKN_ASYNC_PKT_REG(port)  (ETH_REG_BASE(port) + 0x7C8)
+#define ETH_EJP_TX_SPEED_REG(port)          (ETH_REG_BASE(port) + 0x7D0)
+#endif /* MV_ETH_VERSION >= 4 */
+
+#define ETH_MIB_COUNTERS_BASE(port)         (ETH_REG_BASE(port) + 0x1000)
+#define ETH_DA_FILTER_SPEC_MCAST_BASE(port) (ETH_REG_BASE(port) + 0x1400)
+#define ETH_DA_FILTER_OTH_MCAST_BASE(port)  (ETH_REG_BASE(port) + 0x1500)
+#define ETH_DA_FILTER_UCAST_BASE(port)      (ETH_REG_BASE(port) + 0x1600)
+
+/* Phy address register definitions */
+#define ETH_PHY_ADDR_OFFS          0                                       
+#define ETH_PHY_ADDR_MASK          (0x1f <<ETH_PHY_ADDR_OFFS)
+                                 
+/* MIB Counters register definitions */
+#define ETH_MIB_GOOD_OCTETS_RECEIVED_LOW    0x0
+#define ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH   0x4
+#define ETH_MIB_BAD_OCTETS_RECEIVED         0x8
+#define ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR   0xc
+#define ETH_MIB_GOOD_FRAMES_RECEIVED        0x10
+#define ETH_MIB_BAD_FRAMES_RECEIVED         0x14
+#define ETH_MIB_BROADCAST_FRAMES_RECEIVED   0x18
+#define ETH_MIB_MULTICAST_FRAMES_RECEIVED   0x1c
+#define ETH_MIB_FRAMES_64_OCTETS            0x20
+#define ETH_MIB_FRAMES_65_TO_127_OCTETS     0x24
+#define ETH_MIB_FRAMES_128_TO_255_OCTETS    0x28
+#define ETH_MIB_FRAMES_256_TO_511_OCTETS    0x2c
+#define ETH_MIB_FRAMES_512_TO_1023_OCTETS   0x30
+#define ETH_MIB_FRAMES_1024_TO_MAX_OCTETS   0x34
+#define ETH_MIB_GOOD_OCTETS_SENT_LOW        0x38
+#define ETH_MIB_GOOD_OCTETS_SENT_HIGH       0x3c
+#define ETH_MIB_GOOD_FRAMES_SENT            0x40
+#define ETH_MIB_EXCESSIVE_COLLISION         0x44
+#define ETH_MIB_MULTICAST_FRAMES_SENT       0x48
+#define ETH_MIB_BROADCAST_FRAMES_SENT       0x4c
+#define ETH_MIB_UNREC_MAC_CONTROL_RECEIVED  0x50
+#define ETH_MIB_FC_SENT                     0x54
+#define ETH_MIB_GOOD_FC_RECEIVED            0x58
+#define ETH_MIB_BAD_FC_RECEIVED             0x5c
+#define ETH_MIB_UNDERSIZE_RECEIVED          0x60
+#define ETH_MIB_FRAGMENTS_RECEIVED          0x64
+#define ETH_MIB_OVERSIZE_RECEIVED           0x68
+#define ETH_MIB_JABBER_RECEIVED             0x6c
+#define ETH_MIB_MAC_RECEIVE_ERROR           0x70
+#define ETH_MIB_BAD_CRC_EVENT               0x74
+#define ETH_MIB_COLLISION                   0x78
+#define ETH_MIB_LATE_COLLISION              0x7c
+
+
+/****************************************/
+/*        Ethernet Unit Register BITs   */
+/****************************************/
+
+#define ETH_RXQ_ENABLE_OFFSET               0
+#define ETH_RXQ_ENABLE_MASK                 (0x000000FF << ETH_RXQ_ENABLE_OFFSET)
+
+#define ETH_RXQ_DISABLE_OFFSET              8
+#define ETH_RXQ_DISABLE_MASK                (0x000000FF << ETH_RXQ_DISABLE_OFFSET)
+
+/***** BITs of Transmit Queue Command (TQC) register *****/
+#define ETH_TXQ_ENABLE_OFFSET               0
+#define ETH_TXQ_ENABLE_MASK                 (0x000000FF << ETH_TXQ_ENABLE_OFFSET)
+
+#define ETH_TXQ_DISABLE_OFFSET              8
+#define ETH_TXQ_DISABLE_MASK                (0x000000FF << ETH_TXQ_DISABLE_OFFSET)
+
+#if (MV_ETH_VERSION >= 4) 
+#define ETH_TX_EJP_RESET_BIT                0
+#define ETH_TX_EJP_RESET_MASK               (1 << ETH_TX_EJP_RESET_BIT)
+
+#define ETH_TX_EJP_ENABLE_BIT               2
+#define ETH_TX_EJP_ENABLE_MASK              (1 << ETH_TX_EJP_ENABLE_BIT)
+
+#define ETH_TX_LEGACY_WRR_BIT               3
+#define ETH_TX_LEGACY_WRR_MASK              (1 << ETH_TX_LEGACY_WRR_BIT)
+#endif /* (MV_ETH_VERSION >= 4) */
+
+/***** BITs of Ethernet Port Status reg (PSR) *****/
+#define ETH_LINK_UP_BIT                     1
+#define ETH_LINK_UP_MASK                    (1<<ETH_LINK_UP_BIT)
+                     
+#define ETH_FULL_DUPLEX_BIT                 2
+#define ETH_FULL_DUPLEX_MASK                (1<<ETH_FULL_DUPLEX_BIT)
+
+#define ETH_ENABLE_RCV_FLOW_CTRL_BIT        3
+#define ETH_ENABLE_RCV_FLOW_CTRL_MASK       (1<<ETH_ENABLE_RCV_FLOW_CTRL_BIT)
+
+#define ETH_GMII_SPEED_1000_BIT             4
+#define ETH_GMII_SPEED_1000_MASK            (1<<ETH_GMII_SPEED_1000_BIT)
+
+#define ETH_MII_SPEED_100_BIT               5
+#define ETH_MII_SPEED_100_MASK              (1<<ETH_MII_SPEED_100_BIT)
+
+#define ETH_TX_IN_PROGRESS_BIT              7
+#define ETH_TX_IN_PROGRESS_MASK             (1<<ETH_TX_IN_PROGRESS_BIT)
+
+#define ETH_TX_FIFO_EMPTY_BIT               10
+#define ETH_TX_FIFO_EMPTY_MASK              (1<<ETH_TX_FIFO_EMPTY_BIT)
+
+/***** BITs of Ethernet Port Status 1 reg (PS1R) *****/
+#define ETH_AUTO_NEG_DONE_BIT               4
+#define ETH_AUTO_NEG_DONE_MASK              (1<<ETH_AUTO_NEG_DONE_BIT)
+
+#define ETH_SERDES_PLL_LOCKED_BIT           6
+#define ETH_SERDES_PLL_LOCKED_MASK          (1<<ETH_SERDES_PLL_LOCKED_BIT)
+
+/***** BITs of Port Configuration reg (PxCR) *****/
+#define ETH_UNICAST_PROMISCUOUS_MODE_BIT    0
+#define ETH_UNICAST_PROMISCUOUS_MODE_MASK   (1<<ETH_UNICAST_PROMISCUOUS_MODE_BIT)
+
+#define ETH_DEF_RX_QUEUE_OFFSET             1
+#define ETH_DEF_RX_QUEUE_ALL_MASK           (0x7<<ETH_DEF_RX_QUEUE_OFFSET)
+#define ETH_DEF_RX_QUEUE_MASK(queue)        ((queue)<<ETH_DEF_RX_QUEUE_OFFSET)
+
+#define ETH_DEF_RX_ARP_QUEUE_OFFSET         4
+#define ETH_DEF_RX_ARP_QUEUE_ALL_MASK       (0x7<<ETH_DEF_RX_ARP_QUEUE_OFFSET)
+#define ETH_DEF_RX_ARP_QUEUE_MASK(queue)    ((queue)<<ETH_DEF_RX_ARP_QUEUE_OFFSET)
+
+#define ETH_REJECT_NOT_IP_ARP_BCAST_BIT     7
+#define ETH_REJECT_NOT_IP_ARP_BCAST_MASK    (1<<ETH_REJECT_NOT_IP_ARP_BCAST_BIT)
+
+#define ETH_REJECT_IP_BCAST_BIT             8
+#define ETH_REJECT_IP_BCAST_MASK            (1<<ETH_REJECT_IP_BCAST_BIT)
+
+#define ETH_REJECT_ARP_BCAST_BIT            9
+#define ETH_REJECT_ARP_BCAST_MASK           (1<<ETH_REJECT_ARP_BCAST_BIT)
+
+#define ETH_TX_NO_SET_ERROR_SUMMARY_BIT     12
+#define ETH_TX_NO_SET_ERROR_SUMMARY_MASK    (1<<ETH_TX_NO_SET_ERROR_SUMMARY_BIT)
+
+#define ETH_CAPTURE_TCP_FRAMES_ENABLE_BIT   14
+#define ETH_CAPTURE_TCP_FRAMES_ENABLE_MASK  (1<<ETH_CAPTURE_TCP_FRAMES_ENABLE_BIT)
+
+#define ETH_CAPTURE_UDP_FRAMES_ENABLE_BIT   15
+#define ETH_CAPTURE_UDP_FRAMES_ENABLE_MASK  (1<<ETH_CAPTURE_UDP_FRAMES_ENABLE_BIT)
+
+#define ETH_DEF_RX_TCP_QUEUE_OFFSET         16
+#define ETH_DEF_RX_TCP_QUEUE_ALL_MASK       (0x7<<ETH_DEF_RX_TCP_QUEUE_OFFSET)
+#define ETH_DEF_RX_TCP_QUEUE_MASK(queue)    ((queue)<<ETH_DEF_RX_TCP_QUEUE_OFFSET)
+
+#define ETH_DEF_RX_UDP_QUEUE_OFFSET         19
+#define ETH_DEF_RX_UDP_QUEUE_ALL_MASK       (0x7<<ETH_DEF_RX_UDP_QUEUE_OFFSET)
+#define ETH_DEF_RX_UDP_QUEUE_MASK(queue)    ((queue)<<ETH_DEF_RX_UDP_QUEUE_OFFSET)
+
+#define ETH_DEF_RX_BPDU_QUEUE_OFFSET        22
+#define ETH_DEF_RX_BPDU_QUEUE_ALL_MASK      (0x7<<ETH_DEF_RX_BPDU_QUEUE_OFFSET)
+#define ETH_DEF_RX_BPDU_QUEUE_MASK(queue)   ((queue)<<ETH_DEF_RX_BPDU_QUEUE_OFFSET)
+
+#define ETH_RX_CHECKSUM_MODE_OFFSET         25
+#define ETH_RX_CHECKSUM_NO_PSEUDO_HDR       (0<<ETH_RX_CHECKSUM_MODE_OFFSET)
+#define ETH_RX_CHECKSUM_WITH_PSEUDO_HDR     (1<<ETH_RX_CHECKSUM_MODE_OFFSET)
+
+/***** BITs of Port Configuration Extend reg (PxCXR) *****/
+#define ETH_CAPTURE_SPAN_BPDU_ENABLE_BIT    1
+#define ETH_CAPTURE_SPAN_BPDU_ENABLE_MASK   (1<<ETH_CAPTURE_SPAN_BPDU_ENABLE_BIT)
+
+#define ETH_TX_DISABLE_GEN_CRC_BIT          3
+#define ETH_TX_DISABLE_GEN_CRC_MASK         (1<<ETH_TX_DISABLE_GEN_CRC_BIT)
+
+/***** BITs of Tx/Rx queue command reg (RQCR/TQCR) *****/
+#define ETH_QUEUE_ENABLE_OFFSET             0
+#define ETH_QUEUE_ENABLE_ALL_MASK           (0xFF<<ETH_QUEUE_ENABLE_OFFSET)
+#define ETH_QUEUE_ENABLE_MASK(queue)        (1<<((queue)+ETH_QUEUE_ENABLE_OFFSET))
+
+#define ETH_QUEUE_DISABLE_OFFSET            8 
+#define ETH_QUEUE_DISABLE_ALL_MASK          (0xFF<<ETH_QUEUE_DISABLE_OFFSET)
+#define ETH_QUEUE_DISABLE_MASK(queue)       (1<<((queue)+ETH_QUEUE_DISABLE_OFFSET))
+
+
+/***** BITs of Port Sdma Configuration reg (SDCR) *****/
+#define ETH_RX_FRAME_INTERRUPT_BIT          0
+#define ETH_RX_FRAME_INTERRUPT_MASK         (1<<ETH_RX_FRAME_INTERRUPT_BIT)
+
+#define ETH_BURST_SIZE_1_64BIT_VALUE        0   
+#define ETH_BURST_SIZE_2_64BIT_VALUE        1
+#define ETH_BURST_SIZE_4_64BIT_VALUE        2
+#define ETH_BURST_SIZE_8_64BIT_VALUE        3
+#define ETH_BURST_SIZE_16_64BIT_VALUE       4
+
+#define ETH_RX_BURST_SIZE_OFFSET            1
+#define ETH_RX_BURST_SIZE_ALL_MASK          (0x7<<ETH_RX_BURST_SIZE_OFFSET)
+#define ETH_RX_BURST_SIZE_MASK(burst)       ((burst)<<ETH_RX_BURST_SIZE_OFFSET)
+
+#define ETH_RX_NO_DATA_SWAP_BIT             4
+#define ETH_RX_NO_DATA_SWAP_MASK            (1<<ETH_RX_NO_DATA_SWAP_BIT)
+#define ETH_RX_DATA_SWAP_MASK               (0<<ETH_RX_NO_DATA_SWAP_BIT)
+
+#define ETH_TX_NO_DATA_SWAP_BIT             5
+#define ETH_TX_NO_DATA_SWAP_MASK            (1<<ETH_TX_NO_DATA_SWAP_BIT)
+#define ETH_TX_DATA_SWAP_MASK               (0<<ETH_TX_NO_DATA_SWAP_BIT)
+
+#define ETH_DESC_SWAP_BIT                   6
+#define ETH_DESC_SWAP_MASK                  (1<<ETH_DESC_SWAP_BIT)
+#define ETH_NO_DESC_SWAP_MASK               (0<<ETH_DESC_SWAP_BIT)
+
+#define ETH_RX_INTR_COAL_OFFSET             7
+#define ETH_RX_INTR_COAL_ALL_MASK           (0x3fff<<ETH_RX_INTR_COAL_OFFSET)
+#define ETH_RX_INTR_COAL_MASK(value)        (((value)<<ETH_RX_INTR_COAL_OFFSET)  \
+                                             & ETH_RX_INTR_COAL_ALL_MASK)
+
+#define ETH_TX_BURST_SIZE_OFFSET            22
+#define ETH_TX_BURST_SIZE_ALL_MASK          (0x7<<ETH_TX_BURST_SIZE_OFFSET)
+#define ETH_TX_BURST_SIZE_MASK(burst)       ((burst)<<ETH_TX_BURST_SIZE_OFFSET)
+
+#define ETH_RX_INTR_COAL_MSB_BIT            25
+#define ETH_RX_INTR_COAL_MSB_MASK           (1<<ETH_RX_INTR_COAL_MSB_BIT)  
+
+/* BITs Port #x Tx FIFO Urgent Threshold (PxTFUT) */
+#define ETH_TX_INTR_COAL_OFFSET             4
+#define ETH_TX_INTR_COAL_ALL_MASK           (0x3fff << ETH_TX_INTR_COAL_OFFSET)
+#define ETH_TX_INTR_COAL_MASK(value)        (((value) << ETH_TX_INTR_COAL_OFFSET)  \
+                                             & ETH_TX_INTR_COAL_ALL_MASK)
+
+/* BITs of Port Serial Control reg (PSCR) */
+#define ETH_PORT_ENABLE_BIT                 0
+#define ETH_PORT_ENABLE_MASK                (1<<ETH_PORT_ENABLE_BIT)
+
+#define ETH_FORCE_LINK_PASS_BIT             1
+#define ETH_FORCE_LINK_PASS_MASK            (1<<ETH_FORCE_LINK_PASS_BIT)
+
+#define ETH_DISABLE_DUPLEX_AUTO_NEG_BIT     2
+#define ETH_DISABLE_DUPLEX_AUTO_NEG_MASK    (1<<ETH_DISABLE_DUPLEX_AUTO_NEG_BIT)
+
+#define ETH_DISABLE_FC_AUTO_NEG_BIT         3
+#define ETH_DISABLE_FC_AUTO_NEG_MASK        (1<<ETH_DISABLE_FC_AUTO_NEG_BIT)
+
+#define ETH_ADVERTISE_SYM_FC_BIT            4
+#define ETH_ADVERTISE_SYM_FC_MASK           (1<<ETH_ADVERTISE_SYM_FC_BIT)
+
+#define ETH_TX_FC_MODE_OFFSET               5
+#define ETH_TX_FC_MODE_MASK                 (3<<ETH_TX_FC_MODE_OFFSET)
+#define ETH_TX_FC_NO_PAUSE                  (0<<ETH_TX_FC_MODE_OFFSET)
+#define ETH_TX_FC_SEND_PAUSE                (1<<ETH_TX_FC_MODE_OFFSET)
+
+#define ETH_TX_BP_MODE_OFFSET               7
+#define ETH_TX_BP_MODE_MASK                 (3<<ETH_TX_BP_MODE_OFFSET)
+#define ETH_TX_BP_NO_JAM                    (0<<ETH_TX_BP_MODE_OFFSET)
+#define ETH_TX_BP_SEND_JAM                  (1<<ETH_TX_BP_MODE_OFFSET)
+
+#define ETH_DO_NOT_FORCE_LINK_FAIL_BIT      10
+#define ETH_DO_NOT_FORCE_LINK_FAIL_MASK     (1<<ETH_DO_NOT_FORCE_LINK_FAIL_BIT)
+
+#define ETH_RETRANSMIT_FOREVER_BIT          11
+#define ETH_RETRANSMIT_FOREVER_MASK         (1<<ETH_RETRANSMIT_FOREVER_BIT)
+
+#define ETH_DISABLE_SPEED_AUTO_NEG_BIT      13
+#define ETH_DISABLE_SPEED_AUTO_NEG_MASK     (1<<ETH_DISABLE_SPEED_AUTO_NEG_BIT)
+
+#define ETH_DTE_ADVERT_BIT                  14    
+#define ETH_DTE_ADVERT_MASK                 (1<<ETH_DTE_ADVERT_BIT)    
+
+#define ETH_MII_PHY_MODE_BIT                15  
+#define ETH_MII_PHY_MODE_MAC                (0<<ETH_MII_PHY_MODE_BIT)
+#define ETH_MII_PHY_MODE_PHY                (1<<ETH_MII_PHY_MODE_BIT)
+
+#define ETH_MII_SOURCE_SYNCH_BIT            16
+#define ETH_MII_STANDARD_SYNCH              (0<<ETH_MII_SOURCE_SYNCH_BIT)
+#define ETH_MII_400Mbps_SYNCH               (1<<ETH_MII_SOURCE_CLK_BIT)
+
+#define ETH_MAX_RX_PACKET_SIZE_OFFSET       17
+#define ETH_MAX_RX_PACKET_SIZE_MASK         (7<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
+#define ETH_MAX_RX_PACKET_1518BYTE          (0<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
+#define ETH_MAX_RX_PACKET_1522BYTE          (1<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
+#define ETH_MAX_RX_PACKET_1552BYTE          (2<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
+#define ETH_MAX_RX_PACKET_9022BYTE          (3<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
+#define ETH_MAX_RX_PACKET_9192BYTE          (4<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
+#define ETH_MAX_RX_PACKET_9700BYTE          (5<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
+
+#define ETH_SET_FULL_DUPLEX_BIT             21
+#define ETH_SET_FULL_DUPLEX_MASK            (1<<ETH_SET_FULL_DUPLEX_BIT)
+
+#define ETH_SET_FLOW_CTRL_BIT               22
+#define ETH_SET_FLOW_CTRL_MASK              (1<<ETH_SET_FLOW_CTRL_BIT)
+
+#define ETH_SET_GMII_SPEED_1000_BIT         23
+#define ETH_SET_GMII_SPEED_1000_MASK        (1<<ETH_SET_GMII_SPEED_1000_BIT)
+
+#define ETH_SET_MII_SPEED_100_BIT           24
+#define ETH_SET_MII_SPEED_100_MASK          (1<<ETH_SET_MII_SPEED_100_BIT)
+
+/* BITs of Port Serial Control 1 reg (PSC1R) */
+#define ETH_PSC_ENABLE_BIT                  2
+#define ETH_PSC_ENABLE_MASK                 (1<<ETH_PSC_ENABLE_BIT)
+
+#define ETH_RGMII_ENABLE_BIT                3
+#define ETH_RGMII_ENABLE_MASK               (1<<ETH_RGMII_ENABLE_BIT)
+
+#define ETH_PORT_RESET_BIT                  4
+#define ETH_PORT_RESET_MASK                 (1<<ETH_PORT_RESET_BIT)
+
+#define ETH_INBAND_AUTO_NEG_ENABLE_BIT      6
+#define ETH_INBAND_AUTO_NEG_ENABLE_MASK     (1<<ETH_INBAND_AUTO_NEG_ENABLE_BIT)
+
+#define ETH_INBAND_AUTO_NEG_BYPASS_BIT      7
+#define ETH_INBAND_AUTO_NEG_BYPASS_MASK     (1<<ETH_INBAND_AUTO_NEG_BYPASS_BIT)
+
+#define ETH_INBAND_AUTO_NEG_START_BIT       8
+#define ETH_INBAND_AUTO_NEG_START_MASK      (1<<ETH_INBAND_AUTO_NEG_START_BIT)
+
+#define ETH_PORT_TYPE_BIT                   11
+#define ETH_PORT_TYPE_1000BasedX_MASK       (1<<ETH_PORT_TYPE_BIT)
+
+#define ETH_SGMII_MODE_BIT                  12
+#define ETH_1000BaseX_MODE_MASK             (0<<ETH_SGMII_MODE_BIT)
+#define ETH_SGMII_MODE_MASK                 (1<<ETH_SGMII_MODE_BIT)
+            
+#define ETH_MGMII_MODE_BIT                  13
+
+#define ETH_EN_MII_ODD_PRE_BIT		    22
+#define ETH_EN_MII_ODD_PRE_MASK		    (1<<ETH_EN_MII_ODD_PRE_BIT)
+
+/* BITs of SDMA Descriptor Command/Status field */
+#if defined(MV_CPU_BE)
+typedef struct _ethRxDesc
+{
+    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
+    MV_U16      bufSize    ;    /* Buffer size                      */
+    MV_U32      cmdSts     ;    /* Descriptor command status        */
+    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
+    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
+    MV_ULONG    returnInfo ;    /* User resource return information */
+} ETH_RX_DESC;
+
+typedef struct _ethTxDesc
+{
+    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
+    MV_U16      L4iChk     ;    /* CPU provided TCP Checksum        */
+    MV_U32      cmdSts     ;    /* Descriptor command status        */
+    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
+    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
+    MV_ULONG    returnInfo ;    /* User resource return information */
+    MV_U8*      alignBufPtr;    /* Pointer to 8 byte aligned buffer */
+} ETH_TX_DESC;
+
+#elif defined(MV_CPU_LE)
+
+typedef struct _ethRxDesc
+{
+    MV_U32      cmdSts     ;    /* Descriptor command status        */
+    MV_U16      bufSize    ;    /* Buffer size                      */
+    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
+    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
+    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
+    MV_ULONG    returnInfo ;    /* User resource return information */
+} ETH_RX_DESC;
+
+typedef struct _ethTxDesc
+{
+    MV_U32      cmdSts     ;    /* Descriptor command status        */
+    MV_U16      L4iChk     ;    /* CPU provided TCP Checksum        */
+    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
+    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
+    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
+    MV_ULONG    returnInfo ;    /* User resource return information */
+    MV_U8*      alignBufPtr;    /* Pointer to 32 byte aligned buffer */
+} ETH_TX_DESC;
+
+#else
+#error "MV_CPU_BE or MV_CPU_LE must be defined"
+#endif /* MV_CPU_BE || MV_CPU_LE */
+
+/* Buffer offset from buffer pointer */
+#define ETH_RX_BUF_OFFSET               0x2
+
+
+/* Tx & Rx descriptor bits */
+#define ETH_ERROR_SUMMARY_BIT               0
+#define ETH_ERROR_SUMMARY_MASK              (1<<ETH_ERROR_SUMMARY_BIT)
+
+#define ETH_BUFFER_OWNER_BIT                31             
+#define ETH_BUFFER_OWNED_BY_DMA             (1<<ETH_BUFFER_OWNER_BIT)
+#define ETH_BUFFER_OWNED_BY_HOST            (0<<ETH_BUFFER_OWNER_BIT)
+
+/* Tx descriptor bits */
+#define ETH_TX_ERROR_CODE_OFFSET            1
+#define ETH_TX_ERROR_CODE_MASK              (3<<ETH_TX_ERROR_CODE_OFFSET)
+#define ETH_TX_LATE_COLLISION_ERROR         (0<<ETH_TX_ERROR_CODE_OFFSET)
+#define ETH_TX_UNDERRUN_ERROR               (1<<ETH_TX_ERROR_CODE_OFFSET)
+#define ETH_TX_EXCESSIVE_COLLISION_ERROR    (2<<ETH_TX_ERROR_CODE_OFFSET)
+
+#define ETH_TX_LLC_SNAP_FORMAT_BIT          9
+#define ETH_TX_LLC_SNAP_FORMAT_MASK         (1<<ETH_TX_LLC_SNAP_FORMAT_BIT)
+
+#define ETH_TX_IP_FRAG_BIT                  10
+#define ETH_TX_IP_FRAG_MASK                 (1<<ETH_TX_IP_FRAG_BIT)
+#define ETH_TX_IP_FRAG                      (0<<ETH_TX_IP_FRAG_BIT)
+#define ETH_TX_IP_NO_FRAG                   (1<<ETH_TX_IP_FRAG_BIT)
+
+#define ETH_TX_IP_HEADER_LEN_OFFSET         11
+#define ETH_TX_IP_HEADER_LEN_ALL_MASK       (0xF<<ETH_TX_IP_HEADER_LEN_OFFSET)
+#define ETH_TX_IP_HEADER_LEN_MASK(len)      ((len)<<ETH_TX_IP_HEADER_LEN_OFFSET)
+
+#define ETH_TX_VLAN_TAGGED_FRAME_BIT        15
+#define ETH_TX_VLAN_TAGGED_FRAME_MASK       (1<<ETH_TX_VLAN_TAGGED_FRAME_BIT)
+
+#define ETH_TX_L4_TYPE_BIT                  16
+#define ETH_TX_L4_TCP_TYPE                  (0<<ETH_TX_L4_TYPE_BIT)
+#define ETH_TX_L4_UDP_TYPE                  (1<<ETH_TX_L4_TYPE_BIT)
+
+#define ETH_TX_GENERATE_L4_CHKSUM_BIT       17
+#define ETH_TX_GENERATE_L4_CHKSUM_MASK      (1<<ETH_TX_GENERATE_L4_CHKSUM_BIT)
+
+#define ETH_TX_GENERATE_IP_CHKSUM_BIT       18
+#define ETH_TX_GENERATE_IP_CHKSUM_MASK      (1<<ETH_TX_GENERATE_IP_CHKSUM_BIT)
+
+#define ETH_TX_ZERO_PADDING_BIT             19
+#define ETH_TX_ZERO_PADDING_MASK            (1<<ETH_TX_ZERO_PADDING_BIT)
+
+#define ETH_TX_LAST_DESC_BIT                20
+#define ETH_TX_LAST_DESC_MASK               (1<<ETH_TX_LAST_DESC_BIT)
+
+#define ETH_TX_FIRST_DESC_BIT               21
+#define ETH_TX_FIRST_DESC_MASK              (1<<ETH_TX_FIRST_DESC_BIT)
+
+#define ETH_TX_GENERATE_CRC_BIT             22
+#define ETH_TX_GENERATE_CRC_MASK            (1<<ETH_TX_GENERATE_CRC_BIT)
+
+#define ETH_TX_ENABLE_INTERRUPT_BIT         23
+#define ETH_TX_ENABLE_INTERRUPT_MASK        (1<<ETH_TX_ENABLE_INTERRUPT_BIT)
+
+#define ETH_TX_AUTO_MODE_BIT                30
+#define ETH_TX_AUTO_MODE_MASK               (1<<ETH_TX_AUTO_MODE_BIT)
+
+
+/* Rx descriptor bits */
+#define ETH_RX_ERROR_CODE_OFFSET            1
+#define ETH_RX_ERROR_CODE_MASK              (3<<ETH_RX_ERROR_CODE_OFFSET)
+#define ETH_RX_CRC_ERROR                    (0<<ETH_RX_ERROR_CODE_OFFSET)
+#define ETH_RX_OVERRUN_ERROR                (1<<ETH_RX_ERROR_CODE_OFFSET)
+#define ETH_RX_MAX_FRAME_LEN_ERROR          (2<<ETH_RX_ERROR_CODE_OFFSET)
+#define ETH_RX_RESOURCE_ERROR               (3<<ETH_RX_ERROR_CODE_OFFSET)
+
+#define ETH_RX_L4_CHECKSUM_OFFSET           3
+#define ETH_RX_L4_CHECKSUM_MASK             (0xffff<<ETH_RX_L4_CHECKSUM_OFFSET)
+
+#define ETH_RX_VLAN_TAGGED_FRAME_BIT        19
+#define ETH_RX_VLAN_TAGGED_FRAME_MASK       (1<<ETH_RX_VLAN_TAGGED_FRAME_BIT)
+
+#define ETH_RX_BPDU_FRAME_BIT               20
+#define ETH_RX_BPDU_FRAME_MASK              (1<<ETH_RX_BPDU_FRAME_BIT)
+
+#define ETH_RX_L4_TYPE_OFFSET               21
+#define ETH_RX_L4_TYPE_MASK                 (3<<ETH_RX_L4_TYPE_OFFSET)
+#define ETH_RX_L4_TCP_TYPE                  (0<<ETH_RX_L4_TYPE_OFFSET)
+#define ETH_RX_L4_UDP_TYPE                  (1<<ETH_RX_L4_TYPE_OFFSET)
+#define ETH_RX_L4_OTHER_TYPE                (2<<ETH_RX_L4_TYPE_OFFSET)
+
+#define ETH_RX_NOT_LLC_SNAP_FORMAT_BIT      23
+#define ETH_RX_NOT_LLC_SNAP_FORMAT_MASK     (1<<ETH_RX_NOT_LLC_SNAP_FORMAT_BIT)
+
+#define ETH_RX_IP_FRAME_TYPE_BIT            24
+#define ETH_RX_IP_FRAME_TYPE_MASK           (1<<ETH_RX_IP_FRAME_TYPE_BIT)
+
+#define ETH_RX_IP_HEADER_OK_BIT             25
+#define ETH_RX_IP_HEADER_OK_MASK            (1<<ETH_RX_IP_HEADER_OK_BIT)
+
+#define ETH_RX_LAST_DESC_BIT                26
+#define ETH_RX_LAST_DESC_MASK               (1<<ETH_RX_LAST_DESC_BIT)
+
+#define ETH_RX_FIRST_DESC_BIT               27
+#define ETH_RX_FIRST_DESC_MASK              (1<<ETH_RX_FIRST_DESC_BIT)
+
+#define ETH_RX_UNKNOWN_DA_BIT               28
+#define ETH_RX_UNKNOWN_DA_MASK              (1<<ETH_RX_UNKNOWN_DA_BIT)
+
+#define ETH_RX_ENABLE_INTERRUPT_BIT         29
+#define ETH_RX_ENABLE_INTERRUPT_MASK        (1<<ETH_RX_ENABLE_INTERRUPT_BIT)
+
+#define ETH_RX_L4_CHECKSUM_OK_BIT           30
+#define ETH_RX_L4_CHECKSUM_OK_MASK          (1<<ETH_RX_L4_CHECKSUM_OK_BIT)
+
+/* Rx descriptor bufSize field */
+#define ETH_RX_IP_FRAGMENTED_FRAME_BIT      2
+#define ETH_RX_IP_FRAGMENTED_FRAME_MASK     (1<<ETH_RX_IP_FRAGMENTED_FRAME_BIT)
+
+#define ETH_RX_BUFFER_MASK                  0xFFF8
+
+
+/* Ethernet Cause Register BITs */
+#define ETH_CAUSE_RX_READY_SUM_BIT          0
+#define ETH_CAUSE_EXTEND_BIT                1
+
+#define ETH_CAUSE_RX_READY_OFFSET           2
+#define ETH_CAUSE_RX_READY_BIT(queue)       (ETH_CAUSE_RX_READY_OFFSET + (queue))
+#define ETH_CAUSE_RX_READY_MASK(queue)      (1 << (ETH_CAUSE_RX_READY_BIT(queue))) 
+
+#define ETH_CAUSE_RX_ERROR_SUM_BIT          10
+#define ETH_CAUSE_RX_ERROR_OFFSET           11
+#define ETH_CAUSE_RX_ERROR_BIT(queue)       (ETH_CAUSE_RX_ERROR_OFFSET + (queue))
+#define ETH_CAUSE_RX_ERROR_MASK(queue)      (1 << (ETH_CAUSE_RX_ERROR_BIT(queue))) 
+
+#define ETH_CAUSE_TX_END_BIT                19
+#define ETH_CAUSE_SUM_BIT                   31
+
+/* Ethernet Cause Extended Register BITs */
+#define ETH_CAUSE_TX_BUF_OFFSET             0
+#define ETH_CAUSE_TX_BUF_BIT(queue)         (ETH_CAUSE_TX_BUF_OFFSET + (queue))
+#define ETH_CAUSE_TX_BUF_MASK(queue)        (1 << (ETH_CAUSE_TX_BUF_BIT(queue)))
+         
+#define ETH_CAUSE_TX_ERROR_OFFSET           8
+#define ETH_CAUSE_TX_ERROR_BIT(queue)       (ETH_CAUSE_TX_ERROR_OFFSET + (queue))
+#define ETH_CAUSE_TX_ERROR_MASK(queue)      (1 << (ETH_CAUSE_TX_ERROR_BIT(queue)))
+
+#define ETH_CAUSE_PHY_STATUS_CHANGE_BIT     16
+#define ETH_CAUSE_RX_OVERRUN_BIT            18          
+#define ETH_CAUSE_TX_UNDERRUN_BIT           19
+#define ETH_CAUSE_LINK_STATE_CHANGE_BIT     20
+#define ETH_CAUSE_INTERNAL_ADDR_ERR_BIT     23
+#define ETH_CAUSE_EXTEND_SUM_BIT            31
+
+/* Marvell Header Register */
+/* Marvell Header register bits */
+#define ETH_MVHDR_EN_BIT                    0
+#define ETH_MVHDR_EN_MASK                   (1 << ETH_MVHDR_EN_BIT)
+
+#define ETH_MVHDR_DAPREFIX_BIT              1
+#define ETH_MVHDR_DAPREFIX_MASK             (0x3 << ETH_MVHDR_DAPREFIX_BIT)
+#define ETH_MVHDR_DAPREFIX_PRI_1_2          (0x1 << ETH_MVHDR_DAPREFIX_BIT)
+#define ETH_MVHDR_DAPREFIX_DBNUM_PRI        (0x2 << ETH_MVHDR_DAPREFIX_BIT)
+#define ETH_MVHDR_DAPREFIX_SPID_PRI         (0x3 << ETH_MVHDR_DAPREFIX_BIT)
+
+#define ETH_MVHDR_MHMASK_BIT                8
+#define ETH_MVHDR_MHMASK_MASK               (0x3 << ETH_MVHDR_MHMASK_BIT)
+#define ETH_MVHDR_MHMASK_8_QUEUE            (0x0 << ETH_MVHDR_MHMASK_BIT)
+#define ETH_MVHDR_MHMASK_4_QUEUE            (0x1 << ETH_MVHDR_MHMASK_BIT)
+#define ETH_MVHDR_MHMASK_2_QUEUE            (0x3 << ETH_MVHDR_MHMASK_BIT)
+
+
+/* Relevant for 6183 ONLY */
+#define ETH_UNIT_PORTS_PADS_CALIB_0_REG     (MV_ETH_REG_BASE(0) + 0x0A0)
+#define ETH_UNIT_PORTS_PADS_CALIB_1_REG     (MV_ETH_REG_BASE(0) + 0x0A4)
+#define ETH_UNIT_PORTS_PADS_CALIB_2_REG     (MV_ETH_REG_BASE(0) + 0x0A8)
+/* Ethernet Unit Ports Pads Calibration_REG (ETH_UNIT_PORTS_PADS_CALIB_x_REG)  */
+#define ETH_ETHERNET_PAD_CLIB_DRVN_OFFS		0
+#define ETH_ETHERNET_PAD_CLIB_DRVN_MASK		(0x1F << ETH_ETHERNET_PAD_CLIB_DRVN_OFFS)
+
+#define ETH_ETHERNET_PAD_CLIB_DRVP_OFFS         5                      
+#define ETH_ETHERNET_PAD_CLIB_DRVP_MASK         (0x1F << ETH_ETHERNET_PAD_CLIB_DRVP_OFFS)
+ 
+#define ETH_ETHERNET_PAD_CLIB_TUNEEN_OFFS       16                      
+#define ETH_ETHERNET_PAD_CLIB_TUNEEN_MASK       (0x1 << ETH_ETHERNET_PAD_CLIB_TUNEEN_OFFS) 
+
+#define ETH_ETHERNET_PAD_CLIB_LOCKN_OFFS        17                   
+#define ETH_ETHERNET_PAD_CLIB_LOCKN_MASK        (0x1F << ETH_ETHERNET_PAD_CLIB_LOCKN_OFFS) 
+
+#define ETH_ETHERNET_PAD_CLIB_OFFST_OFFS        24                   
+#define ETH_ETHERNET_PAD_CLIB_OFFST_MASK        (0x1F << ETH_ETHERNET_PAD_CLIB_OFFST_OFFS) 
+
+#define ETH_ETHERNET_PAD_CLIB_WR_EN_OFFS        31                   
+#define ETH_ETHERNET_PAD_CLIB_WR_EN_MASK        (0x1  << ETH_ETHERNET_PAD_CLIB_WR_EN_OFFS) 
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvEthRegsh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvCompVer.txt
new file mode 100644
index 00000000..38a92644
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.4
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h
new file mode 100644
index 00000000..c42ed1a6
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h
@@ -0,0 +1,356 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/*******************************************************************************
+* mvEth.h - Header File for : Ethernet Controller 
+*
+* DESCRIPTION:
+*       This header file contains macros typedefs and function declaration for
+*       Marvell Gigabit Ethernet Controllers.
+*
+* DEPENDENCIES:
+*       None.
+*
+*******************************************************************************/
+
+#ifndef __mvEth_h__
+#define __mvEth_h__
+
+/* includes */
+#include "mvTypes.h"
+#include "mv802_3.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+#include "eth/gbe/mvEthRegs.h"
+#include "mvSysHwConfig.h"
+
+/* defines  */
+
+#define MV_ETH_EXTRA_FRAGS_NUM      2
+
+
+typedef enum
+{
+    MV_ETH_SPEED_AN,
+    MV_ETH_SPEED_10,
+    MV_ETH_SPEED_100,
+    MV_ETH_SPEED_1000
+    
+} MV_ETH_PORT_SPEED;
+
+typedef enum
+{
+    MV_ETH_DUPLEX_AN,
+    MV_ETH_DUPLEX_HALF,
+    MV_ETH_DUPLEX_FULL
+    
+} MV_ETH_PORT_DUPLEX;
+
+typedef enum
+{
+    MV_ETH_FC_AN_ADV_DIS,
+    MV_ETH_FC_AN_ADV_SYM,
+    MV_ETH_FC_DISABLE,
+    MV_ETH_FC_ENABLE
+
+} MV_ETH_PORT_FC;
+
+typedef enum
+{
+    MV_ETH_PRIO_FIXED = 0,  /* Fixed priority mode */
+    MV_ETH_PRIO_WRR   = 1   /* Weighted round robin priority mode */    
+} MV_ETH_PRIO_MODE;
+
+/* Ethernet port specific infomation */
+typedef struct
+{
+    int     maxRxPktSize;
+    int     rxDefQ;
+    int     rxBpduQ;
+    int     rxArpQ;
+    int     rxTcpQ;
+    int     rxUdpQ;
+    int     ejpMode;
+} MV_ETH_PORT_CFG;
+
+typedef struct
+{
+    int     descrNum;
+} MV_ETH_RX_Q_CFG;
+
+typedef struct
+{
+    int         descrNum;
+    MV_ETH_PRIO_MODE    prioMode;
+    int         quota;
+} MV_ETH_TX_Q_CFG;
+
+typedef struct
+{
+    int     maxRxPktSize;
+    int     rxDefQ;
+    int     txDescrNum[MV_ETH_TX_Q_NUM];
+    int     rxDescrNum[MV_ETH_RX_Q_NUM];
+    void    *osHandle;
+} MV_ETH_PORT_INIT;
+
+typedef struct
+{
+    MV_BOOL             isLinkUp;
+    MV_ETH_PORT_SPEED   speed;
+    MV_ETH_PORT_DUPLEX  duplex;
+    MV_ETH_PORT_FC      flowControl;
+
+} MV_ETH_PORT_STATUS;
+
+typedef enum
+{
+	MV_ETH_DISABLE_HEADER_MODE = 0, 
+	MV_ETH_ENABLE_HEADER_MODE_PRI_2_1 = 1, 
+	MV_ETH_ENABLE_HEADER_MODE_PRI_DBNUM = 2, 
+	MV_ETH_ENABLE_HEADER_MODE_PRI_SPID = 3
+} MV_ETH_HEADER_MODE;
+
+
+/* ethernet.h API list */
+void        mvEthHalInit(void);
+void        mvEthMemAttrGet(MV_BOOL* pIsSram, MV_BOOL* pIsSwCoher);
+
+/* Port Initalization routines */
+void*       mvEthPortInit (int port, MV_ETH_PORT_INIT *pPortInit);
+void        ethResetTxDescRing(void* pPortHndl, int queue);
+void        ethResetRxDescRing(void* pPortHndl, int queue);
+
+void*       mvEthPortHndlGet(int port);
+
+void        mvEthPortFinish(void* pEthPortHndl);
+MV_STATUS   mvEthPortDown(void* pEthPortHndl);
+MV_STATUS   mvEthPortDisable(void* pEthPortHndl);
+MV_STATUS   mvEthPortUp(void* pEthPortHndl);
+MV_STATUS   mvEthPortEnable(void* pEthPortHndl);
+
+/* Port data flow routines */
+MV_PKT_INFO *mvEthPortForceTxDone(void* pEthPortHndl, int txQueue);
+MV_PKT_INFO *mvEthPortForceRx(void* pEthPortHndl, int rxQueue);
+
+/* Port Configuration routines */
+MV_STATUS   mvEthDefaultsSet(void* pEthPortHndl);
+MV_STATUS   mvEthMaxRxSizeSet(void* pPortHndl, int maxRxSize);
+
+/* Port RX MAC Filtering control routines */
+MV_U8       mvEthMcastCrc8Get(MV_U8* pAddr);
+MV_STATUS   mvEthRxFilterModeSet(void* pPortHndl, MV_BOOL isPromisc);
+MV_STATUS   mvEthMacAddrSet(void* pPortHandle, MV_U8* pMacAddr, int queue);
+MV_STATUS   mvEthMcastAddrSet(void* pPortHandle, MV_U8 *pAddr, int queue);
+
+/* MIB Counters APIs */
+MV_U32      mvEthMibCounterRead(void* pPortHndl, unsigned int mibOffset, 
+                               MV_U32* pHigh32);
+void        mvEthMibCountersClear(void* pPortHandle);
+
+/* TX Scheduling configuration routines */
+MV_STATUS   mvEthTxQueueConfig(void* pPortHandle, int txQueue,                          
+                               MV_ETH_PRIO_MODE txPrioMode, int txQuota);
+
+/* RX Dispatching configuration routines */
+MV_STATUS   mvEthBpduRxQueue(void* pPortHandle, int bpduQueue);
+MV_STATUS   mvEthVlanPrioRxQueue(void* pPortHandle, int vlanPrio, int vlanPrioQueue);
+MV_STATUS   mvEthTosToRxqSet(void* pPortHandle, int tos, int rxq);
+int         mvEthTosToRxqGet(void* pPortHandle, int tos);
+
+/* Speed, Duplex, FlowControl routines */
+MV_STATUS   mvEthSpeedDuplexSet(void* pPortHandle, MV_ETH_PORT_SPEED speed, 
+                                                   MV_ETH_PORT_DUPLEX duplex);
+
+MV_STATUS   mvEthFlowCtrlSet(void* pPortHandle, MV_ETH_PORT_FC flowControl);
+
+#if (MV_ETH_VERSION >= 4)
+MV_STATUS   mvEthEjpModeSet(void* pPortHandle, int mode);
+#endif /* (MV_ETH_VERSION >= 4) */
+
+void        mvEthStatusGet(void* pPortHandle, MV_ETH_PORT_STATUS* pStatus);
+
+/* Marvell Header control               */
+MV_STATUS   mvEthHeaderModeSet(void* pPortHandle, MV_ETH_HEADER_MODE headerMode);
+
+/* PHY routines */
+void       mvEthPhyAddrSet(void* pPortHandle, int phyAddr);
+int        mvEthPhyAddrGet(void* pPortHandle);
+
+/* Power management routines */
+void        mvEthPortPowerDown(int port);
+void        mvEthPortPowerUp(int port);
+
+/******************** ETH PRIVATE ************************/
+
+/*#define UNCACHED_TX_BUFFERS*/
+/*#define UNCACHED_RX_BUFFERS*/
+
+
+/* Port attributes */
+/* Size of a Tx/Rx descriptor used in chain list data structure */
+#define ETH_RX_DESC_ALIGNED_SIZE        32
+#define ETH_TX_DESC_ALIGNED_SIZE        32
+
+#define TX_DISABLE_TIMEOUT_MSEC     1000
+#define RX_DISABLE_TIMEOUT_MSEC     1000
+#define TX_FIFO_EMPTY_TIMEOUT_MSEC  10000
+#define PORT_DISABLE_WAIT_TCLOCKS   5000
+
+/* Macros that save access to desc in order to find next desc pointer  */
+#define RX_NEXT_DESC_PTR(pRxDescr, pQueueCtrl)                              \
+        ((pRxDescr) == (pQueueCtrl)->pLastDescr) ?                          \
+               (ETH_RX_DESC*)((pQueueCtrl)->pFirstDescr) :                  \
+               (ETH_RX_DESC*)(((MV_ULONG)(pRxDescr)) + ETH_RX_DESC_ALIGNED_SIZE)
+
+#define TX_NEXT_DESC_PTR(pTxDescr, pQueueCtrl)                              \
+        ((pTxDescr) == (pQueueCtrl)->pLastDescr) ?                          \
+               (ETH_TX_DESC*)((pQueueCtrl)->pFirstDescr) :                  \
+               (ETH_TX_DESC*)(((MV_ULONG)(pTxDescr)) + ETH_TX_DESC_ALIGNED_SIZE)
+
+#define RX_PREV_DESC_PTR(pRxDescr, pQueueCtrl)                              \
+        ((pRxDescr) == (pQueueCtrl)->pFirstDescr) ?                          \
+               (ETH_RX_DESC*)((pQueueCtrl)->pLastDescr) :                  \
+               (ETH_RX_DESC*)(((MV_ULONG)(pRxDescr)) - ETH_RX_DESC_ALIGNED_SIZE)
+
+#define TX_PREV_DESC_PTR(pTxDescr, pQueueCtrl)                              \
+        ((pTxDescr) == (pQueueCtrl)->pFirstDescr) ?                          \
+               (ETH_TX_DESC*)((pQueueCtrl)->pLastDescr) :                  \
+               (ETH_TX_DESC*)(((MV_ULONG)(pTxDescr)) - ETH_TX_DESC_ALIGNED_SIZE)
+
+
+/* Queue specific information */
+typedef struct 
+{
+    void*       pFirstDescr;
+    void*       pLastDescr;
+    void*       pCurrentDescr;
+    void*       pUsedDescr;
+    int         resource;
+    MV_BUF_INFO descBuf;
+} ETH_QUEUE_CTRL;
+
+
+/* Ethernet port specific infomation */
+typedef struct _ethPortCtrl
+{
+    int             portNo;
+    ETH_QUEUE_CTRL  rxQueue[MV_ETH_RX_Q_NUM]; /* Rx ring resource  */
+    ETH_QUEUE_CTRL  txQueue[MV_ETH_TX_Q_NUM]; /* Tx ring resource  */
+
+    MV_ETH_PORT_CFG portConfig;
+    MV_ETH_RX_Q_CFG rxQueueConfig[MV_ETH_RX_Q_NUM];
+    MV_ETH_TX_Q_CFG txQueueConfig[MV_ETH_TX_Q_NUM];
+
+    /* Register images - For DP */
+    MV_U32          portTxQueueCmdReg;   /* Port active Tx queues summary    */
+    MV_U32          portRxQueueCmdReg;   /* Port active Rx queues summary    */
+
+    MV_STATE        portState;
+
+    MV_U8           mcastCount[256];
+    MV_U32*         hashPtr;
+    void 	    *osHandle;
+} ETH_PORT_CTRL; 
+
+/************** MACROs ****************/
+
+/* MACROs to Flush / Invalidate TX / RX Buffers */
+#if (ETHER_DRAM_COHER == MV_CACHE_COHER_SW) && !defined(UNCACHED_TX_BUFFERS)
+#   define ETH_PACKET_CACHE_FLUSH(pAddr, size)                                  \
+        mvOsCacheClear(NULL, (pAddr), (size));                                  \
+        /*CPU_PIPE_FLUSH;*/
+#else
+#   define ETH_PACKET_CACHE_FLUSH(pAddr, size)                                  \
+        mvOsIoVirtToPhy(NULL, (pAddr));
+#endif /* ETHER_DRAM_COHER == MV_CACHE_COHER_SW */
+
+#if ( (ETHER_DRAM_COHER == MV_CACHE_COHER_SW) && !defined(UNCACHED_RX_BUFFERS) )
+#   define ETH_PACKET_CACHE_INVALIDATE(pAddr, size)                             \
+        mvOsCacheInvalidate (NULL, (pAddr), (size));                            \
+        /*CPU_PIPE_FLUSH;*/
+#else
+#   define ETH_PACKET_CACHE_INVALIDATE(pAddr, size)    
+#endif /* ETHER_DRAM_COHER == MV_CACHE_COHER_SW && !UNCACHED_RX_BUFFERS */
+
+#ifdef ETH_DESCR_UNCACHED
+
+#define ETH_DESCR_FLUSH_INV(pPortCtrl, pDescr)
+#define ETH_DESCR_INV(pPortCtrl, pDescr)
+
+#else
+
+#define ETH_DESCR_FLUSH_INV(pPortCtrl, pDescr)      \
+        mvOsCacheLineFlushInv(pPortCtrl->osHandle, (MV_ULONG)(pDescr))
+
+#define ETH_DESCR_INV(pPortCtrl, pDescr)            \
+        mvOsCacheLineInv(pPortCtrl->osHandle, (MV_ULONG)(pDescr))
+
+#endif /* ETH_DESCR_UNCACHED */
+
+#include "eth/gbe/mvEthGbe.h"
+
+#endif /* __mvEth_h__ */
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvCompVer.txt
new file mode 100644
index 00000000..38a92644
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.4
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c
new file mode 100644
index 00000000..889d4d9e
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c
@@ -0,0 +1,362 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "gpp/mvGpp.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+/* defines  */       
+#ifdef MV_DEBUG         
+	#define DB(x)	x
+#else                
+	#define DB(x)    
+#endif	             
+
+static MV_VOID gppRegSet(MV_U32 group, MV_U32 regOffs,MV_U32 mask,MV_U32 value);
+
+/*******************************************************************************
+* mvGppTypeSet - Enable a GPP (OUT) pin
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       group - GPP group number
+*       mask  - 32bit mask value. Each set bit in the mask means that the type
+*               of corresponding GPP will be set. Other GPPs are ignored.
+*       value - 32bit value that describes GPP type per pin.
+*
+* OUTPUT:
+*       None.
+*
+* EXAMPLE:
+*       Set GPP8 to input and GPP15 to output.
+*       mvGppTypeSet(0, (GPP8 | GPP15), 
+*                    ((MV_GPP_IN & GPP8) | (MV_GPP_OUT & GPP15)) );
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvGppTypeSet(MV_U32 group, MV_U32 mask, MV_U32 value)
+{
+	if (group >= MV_GPP_MAX_GROUP)
+	{
+		DB(mvOsPrintf("mvGppTypeSet: ERR. invalid group number \n"));
+		return MV_BAD_PARAM;
+	}
+
+	gppRegSet(group, GPP_DATA_OUT_EN_REG(group), mask, value);
+
+    /* Workaround for Erratum FE-MISC-70*/
+    if(mvCtrlRevGet()==MV_88F6XXX_A0_REV && (group == 1))
+    {
+        mask &= 0x2;
+        gppRegSet(0, GPP_DATA_OUT_EN_REG(0), mask, value);
+    } /*End of WA*/
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvGppBlinkEn - Set a GPP (IN) Pin list to blink every ~100ms
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       group - GPP group number
+*       mask  - 32bit mask value. Each set bit in the mask means that the type
+*               of corresponding GPP will be set. Other GPPs are ignored.
+*       value - 32bit value that describes GPP blink per pin.
+*
+* OUTPUT:
+*       None.
+*
+* EXAMPLE:
+*       Set GPP8 to be static and GPP15 to be blinking.
+*       mvGppBlinkEn(0, (GPP8 | GPP15), 
+*                    ((MV_GPP_OUT_STATIC & GPP8) | (MV_GPP_OUT_BLINK & GPP15)) );
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvGppBlinkEn(MV_U32 group, MV_U32 mask, MV_U32 value)
+{
+	if (group >= MV_GPP_MAX_GROUP)
+	{
+		DB(mvOsPrintf("mvGppBlinkEn: ERR. invalid group number \n"));
+		return MV_BAD_PARAM;
+	}
+
+	gppRegSet(group, GPP_BLINK_EN_REG(group), mask, value);
+
+	return MV_OK;
+
+}
+/*******************************************************************************
+* mvGppPolaritySet - Set a GPP (IN) Pin list Polarity mode
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       group - GPP group number
+*       mask  - 32bit mask value. Each set bit in the mask means that the type
+*               of corresponding GPP will be set. Other GPPs are ignored.
+*       value - 32bit value that describes GPP polarity per pin.
+*
+* OUTPUT:
+*       None.
+*
+* EXAMPLE:
+*       Set GPP8 to the actual pin value and GPP15 to be inverted.
+*       mvGppPolaritySet(0, (GPP8 | GPP15), 
+*                    ((MV_GPP_IN_ORIGIN & GPP8) | (MV_GPP_IN_INVERT & GPP15)) );
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvGppPolaritySet(MV_U32 group, MV_U32 mask, MV_U32 value)
+{
+	if (group >= MV_GPP_MAX_GROUP)
+	{
+		DB(mvOsPrintf("mvGppPolaritySet: ERR. invalid group number \n"));
+		return MV_BAD_PARAM;
+	}
+
+	gppRegSet(group, GPP_DATA_IN_POL_REG(group), mask, value);
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvGppPolarityGet - Get a value of relevant bits from GPP Polarity register.
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       group - GPP group number
+*       mask  - 32bit mask value. Each set bit in the mask means that the 
+*               returned value is valid for it.
+*
+* OUTPUT:
+*       None.
+*
+* EXAMPLE:
+*       Get GPP8 and GPP15 value.
+*       mvGppPolarityGet(0, (GPP8 | GPP15));
+*
+* RETURN:
+*       32bit value that describes GPP polatity mode per pin.
+*
+*******************************************************************************/
+MV_U32  mvGppPolarityGet(MV_U32 group, MV_U32 mask)
+{
+    MV_U32  regVal;
+
+  	if (group >= MV_GPP_MAX_GROUP)
+	{
+		DB(mvOsPrintf("mvGppActiveSet: Error invalid group number \n"));
+		return MV_ERROR;
+	}
+    regVal = MV_REG_READ(GPP_DATA_IN_POL_REG(group));
+    
+    return (regVal & mask);
+}
+
+/*******************************************************************************
+* mvGppValueGet - Get a GPP Pin list value.
+*
+* DESCRIPTION:
+*       This function get GPP value.
+*
+* INPUT:
+*       group - GPP group number
+*       mask  - 32bit mask value. Each set bit in the mask means that the 
+*               returned value is valid for it.
+*
+* OUTPUT:
+*       None.
+*
+* EXAMPLE:
+*       Get GPP8 and GPP15 value.
+*       mvGppValueGet(0, (GPP8 | GPP15));
+*
+* RETURN:
+*       32bit value that describes GPP activity mode per pin.
+*
+*******************************************************************************/
+MV_U32 mvGppValueGet(MV_U32 group, MV_U32 mask)
+{
+	MV_U32 gppData;
+
+	gppData = MV_REG_READ(GPP_DATA_IN_REG(group));
+
+	gppData &= mask;
+
+	return gppData;
+
+}
+
+/*******************************************************************************
+* mvGppValueSet - Set a GPP Pin list value.
+*
+* DESCRIPTION:
+*       This function set value for given GPP pin list.
+*
+* INPUT:
+*       group - GPP group number
+*       mask  - 32bit mask value. Each set bit in the mask means that the 
+*               value of corresponding GPP will be set accordingly. Other GPP 
+*               are not affected.
+*       value - 32bit value that describes GPP value per pin.
+*
+* OUTPUT:
+*       None.
+*
+* EXAMPLE:
+*       Set GPP8 value of '0' and GPP15 value of '1'.
+*       mvGppActiveSet(0, (GPP8 | GPP15), ((0 & GPP8) | (GPP15)) );
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvGppValueSet (MV_U32 group, MV_U32 mask, MV_U32 value)
+{
+	MV_U32 outEnable, tmp;
+	MV_U32 i;
+
+	if (group >= MV_GPP_MAX_GROUP)
+	{
+		DB(mvOsPrintf("mvGppValueSet: Error invalid group number \n"));
+		return MV_BAD_PARAM;
+	}
+
+	/* verify that the gpp pin is configured as output 		*/
+	/* Note that in the register out enabled -> bit = '0'. 	*/
+	outEnable = ~MV_REG_READ(GPP_DATA_OUT_EN_REG(group));
+
+    /* Workaround for Erratum FE-MISC-70*/
+    if(mvCtrlRevGet()==MV_88F6XXX_A0_REV && (group == 1))
+    {
+        tmp = ~MV_REG_READ(GPP_DATA_OUT_EN_REG(0));
+        outEnable &= 0xfffffffd;
+        outEnable |= (tmp & 0x2);
+    } /*End of WA*/
+
+	for (i = 0 ; i < 32 ;i++)
+	{
+		if (((mask & (1 << i)) & (outEnable & (1 << i))) != (mask & (1 << i)))
+		{
+			mvOsPrintf("mvGppValueSet: Err. An attempt to set output "\
+					   "value to GPP %d in input mode.\n", i);
+			return MV_ERROR;
+		}
+	}
+
+	gppRegSet(group, GPP_DATA_OUT_REG(group), mask, value);
+
+	return MV_OK;
+
+}
+/*******************************************************************************
+* gppRegSet - Set a specific GPP pin on a specific GPP register
+*
+* DESCRIPTION:
+*       This function set a specific GPP pin on a specific GPP register
+*
+* INPUT:
+*		regOffs - GPP Register offset 
+*       group - GPP group number
+*       mask  - 32bit mask value. Each set bit in the mask means that the 
+*               value of corresponding GPP will be set accordingly. Other GPP 
+*               are not affected.
+*       value - 32bit value that describes GPP value per pin.
+*
+* OUTPUT:
+*       None.
+*
+* EXAMPLE:
+*       Set GPP8 value of '0' and GPP15 value of '1'.
+*       mvGppActiveSet(0, (GPP8 | GPP15), ((0 & GPP8) | (1 & GPP15)) );
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+static MV_VOID gppRegSet (MV_U32 group, MV_U32 regOffs,MV_U32 mask,MV_U32 value)
+{
+	MV_U32 gppData;
+
+	gppData = MV_REG_READ(regOffs);
+
+	gppData &= ~mask;
+
+	gppData |= (value & mask);
+
+	MV_REG_WRITE(regOffs, gppData);
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h
new file mode 100644
index 00000000..526d324f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h
@@ -0,0 +1,118 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvGppH
+#define __INCmvGppH
+
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "gpp/mvGppRegs.h"
+
+/* These macros describes the GPP type. Each of the GPPs pins can        	*/
+/* be assigned to act as a general purpose input or output pin.             */
+#define	MV_GPP_IN	0xFFFFFFFF      			/* GPP input   */
+#define MV_GPP_OUT  0    						/* GPP output  */
+
+
+/* These macros describes the GPP Out Enable. */
+#define	MV_GPP_OUT_DIS	0xFFFFFFFF         	/* Out pin disabled*/
+#define MV_GPP_OUT_EN   0    			 	/* Out pin enabled*/
+
+/* These macros describes the GPP Out Blinking. */
+/* When set and the corresponding bit in GPIO Data Out Enable Control 		*/
+/* Register is enabled, the GPIO pin blinks every ~100 ms (a period of		*/
+/* 2^24 TCLK clocks).														*/
+#define	MV_GPP_OUT_BLINK	0xFFFFFFFF         	/* Out pin blinking*/
+#define MV_GPP_OUT_STATIC   0    			 	/* Out pin static*/
+
+
+/* These macros describes the GPP Polarity. */
+/* When set to 1 GPIO Data In Register reflects the inverted value of the	*/
+/* corresponding pin.														*/
+
+#define	MV_GPP_IN_INVERT	0xFFFFFFFF         	/* Inverted value is got*/
+#define MV_GPP_IN_ORIGIN    0    			 	/* original value is got*/
+
+/* mvGppTypeSet - Set PP pin mode (IN or OUT) */
+MV_STATUS mvGppTypeSet(MV_U32 group, MV_U32 mask, MV_U32 value);
+
+/* mvGppBlinkEn - Set a GPP (IN) Pin list to blink every ~100ms */
+MV_STATUS mvGppBlinkEn(MV_U32 group, MV_U32 mask, MV_U32 value);
+
+/* mvGppPolaritySet - Set a GPP (IN) Pin list Polarity mode. */
+MV_STATUS mvGppPolaritySet(MV_U32 group, MV_U32 mask, MV_U32 value);
+
+/* mvGppPolarityGet - Get the Polarity of a GPP Pin */
+MV_U32  mvGppPolarityGet(MV_U32 group, MV_U32 mask);
+
+/* mvGppValueGet - Get a GPP Pin list value.*/
+MV_U32 mvGppValueGet(MV_U32 group, MV_U32 mask);
+
+
+/* mvGppValueSet - Set a GPP Pin list value. */
+MV_STATUS mvGppValueSet (MV_U32 group, MV_U32 mask, MV_U32 value);
+
+#endif /* #ifndef __INCmvGppH */ 
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h
new file mode 100644
index 00000000..b6fec34f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h
@@ -0,0 +1,116 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvGppRegsH
+#define __INCmvGppRegsH
+
+#define    MV_GPP0  BIT0
+#define    MV_GPP1  BIT1
+#define    MV_GPP2  BIT2
+#define    MV_GPP3  BIT3
+#define    MV_GPP4  BIT4
+#define    MV_GPP5  BIT5
+#define    MV_GPP6  BIT6
+#define    MV_GPP7  BIT7
+#define    MV_GPP8  BIT8
+#define    MV_GPP9  BIT9
+#define    MV_GPP10 BIT10
+#define    MV_GPP11 BIT11
+#define    MV_GPP12 BIT12
+#define    MV_GPP13 BIT13
+#define    MV_GPP14 BIT14
+#define    MV_GPP15 BIT15
+#define    MV_GPP16 BIT16
+#define    MV_GPP17 BIT17
+#define    MV_GPP18 BIT18
+#define    MV_GPP19 BIT19
+#define    MV_GPP20 BIT20
+#define    MV_GPP21 BIT21
+#define    MV_GPP22 BIT22
+#define    MV_GPP23 BIT23
+#define    MV_GPP24 BIT24
+#define    MV_GPP25 BIT25
+#define    MV_GPP26 BIT26
+#define    MV_GPP27 BIT27
+#define    MV_GPP28 BIT28
+#define    MV_GPP29 BIT29
+#define    MV_GPP30 BIT30
+#define    MV_GPP31 BIT31
+
+
+/* registers offsets */
+   
+#define GPP_DATA_OUT_REG(grp)			((grp == 0) ? 0x10100 : 0x10140)
+#define GPP_DATA_OUT_EN_REG(grp)		((grp == 0) ? 0x10104 : 0x10144)
+#define GPP_BLINK_EN_REG(grp)			((grp == 0) ? 0x10108 : 0x10148)
+#define GPP_DATA_IN_POL_REG(grp)		((grp == 0) ? 0x1010C : 0x1014c)
+#define GPP_DATA_IN_REG(grp)			((grp == 0) ? 0x10110 : 0x10150)
+#define GPP_INT_CAUSE_REG(grp)			((grp == 0) ? 0x10114 : 0x10154)
+#define GPP_INT_MASK_REG(grp)			((grp == 0) ? 0x10118 : 0x10158)
+#define GPP_INT_LVL_REG(grp)			((grp == 0) ? 0x1011c : 0x1015c)
+
+#define GPP_DATA_OUT_SET_REG			0x10120
+#define GPP_DATA_OUT_CLEAR_REG			0x10124
+
+#endif /* #ifndef __INCmvGppRegsH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvCompVer.txt
new file mode 100644
index 00000000..85bfa612
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.3
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c
new file mode 100644
index 00000000..672d3e31
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c
@@ -0,0 +1,669 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvPciIf.h"
+#include "ctrlEnv/sys/mvSysPex.h"
+
+#if defined(MV_INCLUDE_PCI)
+#include "ctrlEnv/sys/mvSysPci.h"
+#endif
+
+
+/* defines  */       
+#ifdef MV_DEBUG         
+	#define DB(x)	x
+#else                
+	#define DB(x)    
+#endif	             
+					 
+
+/*******************************************************************************
+* mvPciInit - Initialize PCI interfaces
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK if function success otherwise MV_ERROR or MV_BAD_PARAM
+*
+*******************************************************************************/
+
+
+MV_STATUS mvPciIfInit(MV_U32 pciIf, PCI_IF_MODE pciIfmode)
+{
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		
+        MV_PCI_MOD pciMod;
+		
+        if (PCI_IF_MODE_HOST == pciIfmode)
+        {
+            pciMod = MV_PCI_MOD_HOST;
+        }
+        else if (PCI_IF_MODE_DEVICE == pciIfmode)
+        {
+            pciMod = MV_PCI_MOD_DEVICE;
+        }
+        else
+        {
+            mvOsPrintf("%s: ERROR!!! Bus %d mode %d neither host nor device!\n", 
+                        __FUNCTION__, pciIf, pciIfmode);
+            return MV_FAIL;
+        }
+        
+        return mvPciInit(pciIf - MV_PCI_START_IF, pciMod);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		
+        MV_PEX_TYPE pexType;
+		
+        if (PCI_IF_MODE_HOST == pciIfmode)
+        {
+            pexType = MV_PEX_ROOT_COMPLEX;
+        }
+        else if (PCI_IF_MODE_DEVICE == pciIfmode)
+        {
+            pexType = MV_PEX_END_POINT;
+        }
+        else
+        {
+            mvOsPrintf("%s: ERROR!!! Bus %d type %d neither root complex nor" \
+                       " end point\n", __FUNCTION__, pciIf, pciIfmode);
+            return MV_FAIL;
+        }
+		return mvPexInit(pciIf - MV_PEX_START_IF, pexType);
+
+		#else
+		return MV_OK;
+		#endif
+
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return MV_FAIL;
+
+}
+
+/* PCI configuration space read write */
+
+/*******************************************************************************
+* mvPciConfigRead - Read from configuration space
+*
+* DESCRIPTION:
+*       This function performs a 32 bit read from PCI configuration space.
+*       It supports both type 0 and type 1 of Configuration Transactions 
+*       (local and over bridge). In order to read from local bus segment, use 
+*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
+*       will result configuration transaction of type 1 (over bridge).
+*
+* INPUT:
+*       pciIf   - PCI interface number.
+*       bus     - PCI segment bus number.
+*       dev     - PCI device number.
+*       func    - Function number.
+*       regOffs - Register offset.       
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit register data, 0xffffffff on error
+*
+*******************************************************************************/
+MV_U32 mvPciIfConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
+                        MV_U32 regOff)
+{
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciConfigRead(pciIf - MV_PCI_START_IF,
+								bus,
+								dev, 
+                                func,
+								regOff);
+		#else
+		return 0xffffffff;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexConfigRead(pciIf - MV_PEX_START_IF,
+								bus,
+								dev, 
+                                func,
+								regOff);
+		#else
+		return 0xffffffff;
+		#endif
+
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return 0;
+
+}
+
+/*******************************************************************************
+* mvPciConfigWrite - Write to configuration space
+*
+* DESCRIPTION:
+*       This function performs a 32 bit write to PCI configuration space.
+*       It supports both type 0 and type 1 of Configuration Transactions 
+*       (local and over bridge). In order to write to local bus segment, use 
+*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
+*       will result configuration transaction of type 1 (over bridge).
+*
+* INPUT:
+*       pciIf   - PCI interface number.
+*       bus     - PCI segment bus number.
+*       dev     - PCI device number.
+*       func    - Function number.
+*       regOffs - Register offset.       
+*       data    - 32bit data.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciIfConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev, 
+                           MV_U32 func, MV_U32 regOff, MV_U32 data)
+{
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciConfigWrite(pciIf - MV_PCI_START_IF,
+								bus,
+								dev, 
+                                func,
+								regOff,
+								data);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexConfigWrite(pciIf - MV_PEX_START_IF,
+								bus,
+								dev, 
+                                func,
+								regOff,
+								data);
+		#else
+		return MV_OK;
+		#endif
+
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return MV_FAIL;
+
+}
+
+/*******************************************************************************
+* mvPciMasterEnable - Enable/disale PCI interface master transactions.
+*
+* DESCRIPTION:
+*       This function performs read modified write to PCI command status 
+*       (offset 0x4) to set/reset bit 2. After this bit is set, the PCI 
+*       master is allowed to gain ownership on the bus, otherwise it is 
+*       incapable to do so.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciIfMasterEnable(MV_U32 pciIf, MV_BOOL enable)
+{
+
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciMasterEnable(pciIf - MV_PCI_START_IF,
+								enable);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexMasterEnable(pciIf - MV_PEX_START_IF,
+								enable);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return MV_FAIL;
+
+}
+
+
+/*******************************************************************************
+* mvPciSlaveEnable - Enable/disale PCI interface slave transactions.
+*
+* DESCRIPTION:
+*       This function performs read modified write to PCI command status 
+*       (offset 0x4) to set/reset bit 0 and 1. After those bits are set, 
+*       the PCI slave is allowed to respond to PCI IO space access (bit 0) 
+*       and PCI memory space access (bit 1). 
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       dev     - PCI device number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciIfSlaveEnable(MV_U32 pciIf,MV_U32 bus, MV_U32 dev, MV_BOOL enable)
+{
+
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciSlaveEnable(pciIf - MV_PCI_START_IF,bus,dev,
+								enable);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexSlaveEnable(pciIf - MV_PEX_START_IF,bus,dev,
+								enable);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return MV_FAIL;
+
+}
+
+/*******************************************************************************
+* mvPciLocalBusNumSet - Set PCI interface local bus number.
+*
+* DESCRIPTION:
+*       This function sets given PCI interface its local bus number.
+*       Note: In case the PCI interface is PCI-X, the information is read-only.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       busNum - Bus number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_NOT_ALLOWED in case PCI interface is PCI-X. 
+*		MV_BAD_PARAM on bad parameters ,
+*       otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciIfLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum)
+{
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciLocalBusNumSet(pciIf - MV_PCI_START_IF,
+								busNum);	
+		#else
+		return MV_OK;
+		#endif
+    }
+    else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexLocalBusNumSet(pciIf - MV_PEX_START_IF,
+								busNum);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return MV_FAIL;
+
+}
+
+/*******************************************************************************
+* mvPciLocalBusNumGet - Get PCI interface local bus number.
+*
+* DESCRIPTION:
+*       This function gets the local bus number of a given PCI interface.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Local bus number.0xffffffff on Error
+*
+*******************************************************************************/
+MV_U32 mvPciIfLocalBusNumGet(MV_U32 pciIf)
+{
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciLocalBusNumGet(pciIf - MV_PCI_START_IF);
+		#else
+		return 0xFFFFFFFF;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexLocalBusNumGet(pciIf - MV_PEX_START_IF);
+		#else
+		return 0xFFFFFFFF;
+		#endif
+
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n",__FUNCTION__, pciIf);
+	}
+
+	return 0;
+
+}
+
+
+/*******************************************************************************
+* mvPciLocalDevNumSet - Set PCI interface local device number.
+*
+* DESCRIPTION:
+*       This function sets given PCI interface its local device number.
+*       Note: In case the PCI interface is PCI-X, the information is read-only.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       devNum - Device number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_NOT_ALLOWED in case PCI interface is PCI-X. MV_BAD_PARAM on bad parameters ,
+*       otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciIfLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum)
+{
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciLocalDevNumSet(pciIf - MV_PCI_START_IF,
+								devNum);	
+		#else
+		return MV_OK;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexLocalDevNumSet(pciIf - MV_PEX_START_IF,
+								devNum);
+		#else
+		return MV_OK;
+		#endif
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return MV_FAIL;
+
+}
+
+/*******************************************************************************
+* mvPciLocalDevNumGet - Get PCI interface local device number.
+*
+* DESCRIPTION:
+*       This function gets the local device number of a given PCI interface.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Local device number. 0xffffffff on Error
+*
+*******************************************************************************/
+MV_U32 mvPciIfLocalDevNumGet(MV_U32 pciIf)
+{
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PCI)
+		return mvPciLocalDevNumGet(pciIf - MV_PCI_START_IF);
+		#else
+		return 0xFFFFFFFF;
+		#endif
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		#if defined(MV_INCLUDE_PEX)
+		return mvPexLocalDevNumGet(pciIf - MV_PEX_START_IF);
+		#else
+		return 0xFFFFFFFF;
+		#endif
+
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return 0;
+
+}
+
+/*******************************************************************************
+* mvPciIfTypeGet - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+
+PCI_IF_TYPE mvPciIfTypeGet(MV_U32 pciIf)
+{
+
+	if ((pciIf >= MV_PCI_START_IF)&&(pciIf < MV_PCI_MAX_IF + MV_PCI_START_IF))
+	{
+		return PCI_IF_TYPE_CONVEN_PCIX;
+	}
+	else if ((pciIf >= MV_PEX_START_IF) &&
+			 (pciIf < MV_PEX_MAX_IF + MV_PEX_START_IF))
+	{
+		return PCI_IF_TYPE_PEX;
+
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return 0xffffffff;
+
+}
+
+/*******************************************************************************
+* mvPciIfTypeGet - 
+*
+* DESCRIPTION:
+*
+* INPUT:
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*
+*******************************************************************************/
+
+MV_U32  mvPciRealIfNumGet(MV_U32 pciIf)
+{
+
+	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
+
+	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
+	{
+		return (pciIf - MV_PCI_START_IF);
+	}
+	else if (PCI_IF_TYPE_PEX == pciIfType)
+	{
+		return (pciIf - MV_PEX_START_IF);
+
+	}
+	else
+	{
+		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
+	}
+
+	return 0xffffffff;
+
+}
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h
new file mode 100644
index 00000000..9c2d1604
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h
@@ -0,0 +1,134 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCPCIIFH
+#define __INCPCIIFH
+
+#include "mvSysHwConfig.h"
+#include "pci-if/mvPciIfRegs.h"
+#if defined(MV_INCLUDE_PEX)
+#include "pex/mvPex.h"
+#endif
+#if defined(MV_INCLUDE_PCI)
+#include "pci/mvPci.h"
+#endif
+#include "ctrlEnv/mvCtrlEnvLib.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+
+typedef enum _mvPCIIfType
+{
+	PCI_IF_TYPE_CONVEN_PCIX,
+	PCI_IF_TYPE_PEX
+
+}PCI_IF_TYPE;
+
+typedef enum _mvPCIIfMode
+{
+	PCI_IF_MODE_HOST,
+	PCI_IF_MODE_DEVICE
+}PCI_IF_MODE;
+
+
+/* Global Functions prototypes */
+
+/* mvPciIfInit - Initialize PCI interfaces*/
+MV_STATUS mvPciIfInit(MV_U32 pciIf, PCI_IF_MODE pciIfmode);
+
+/* mvPciIfConfigRead - Read from configuration space */
+MV_U32 mvPciIfConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
+						MV_U32 func,MV_U32 regOff);
+
+/* mvPciIfConfigWrite - Write to configuration space */
+MV_STATUS mvPciIfConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
+                           MV_U32 func, MV_U32 regOff, MV_U32 data);
+
+/* mvPciIfMasterEnable - Enable/disale PCI interface master transactions.*/
+MV_STATUS mvPciIfMasterEnable(MV_U32 pciIf, MV_BOOL enable);
+
+/* mvPciIfSlaveEnable - Enable/disale PCI interface slave transactions.*/
+MV_STATUS mvPciIfSlaveEnable(MV_U32 pciIf,MV_U32 bus, MV_U32 dev, 
+							 MV_BOOL enable);
+
+/* mvPciIfLocalBusNumSet - Set PCI interface local bus number.*/
+MV_STATUS mvPciIfLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum);
+
+/* mvPciIfLocalBusNumGet - Get PCI interface local bus number.*/
+MV_U32 mvPciIfLocalBusNumGet(MV_U32 pciIf);
+
+/* mvPciIfLocalDevNumSet - Set PCI interface local device number.*/
+MV_STATUS mvPciIfLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum);
+
+/* mvPciIfLocalDevNumGet - Get PCI interface local device number.*/
+MV_U32 mvPciIfLocalDevNumGet(MV_U32 pciIf);
+
+/* mvPciIfTypeGet - Get PCI If type*/
+PCI_IF_TYPE mvPciIfTypeGet(MV_U32 pciIf);
+
+MV_U32  mvPciRealIfNumGet(MV_U32 pciIf);
+
+/* mvPciIfAddrDecShow - Display address decode windows attributes */
+MV_VOID mvPciIfAddrDecShow(MV_VOID);
+
+#endif /* #ifndef __INCPCIIFH */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h
new file mode 100644
index 00000000..08d4d2d9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h
@@ -0,0 +1,245 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCPCIIFREGSH
+#define __INCPCIIFREGSH
+
+
+/* defines */
+#define MAX_PCI_DEVICES         32
+#define MAX_PCI_FUNCS           8
+#define MAX_PCI_BUSSES          128
+
+/***************************************/
+/* PCI Configuration registers */
+/***************************************/
+
+/*********************************************/
+/* PCI Configuration, Function 0, Registers  */
+/*********************************************/
+
+
+/* Standard registers */
+#define PCI_DEVICE_AND_VENDOR_ID					0x000
+#define PCI_STATUS_AND_COMMAND						0x004
+#define PCI_CLASS_CODE_AND_REVISION_ID			    0x008
+#define PCI_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE		0x00C
+#define PCI_MEMORY_BAR_BASE_ADDR(barNum)		 	(0x010 + ((barNum) << 2))
+#define PCI_SUBSYS_ID_AND_SUBSYS_VENDOR_ID		 	0x02C
+#define PCI_EXPANSION_ROM_BASE_ADDR_REG			    0x030
+#define PCI_CAPABILTY_LIST_POINTER			        0x034
+#define PCI_INTERRUPT_PIN_AND_LINE					0x03C
+
+
+/* PCI Device and Vendor ID Register (PDVIR) */
+#define PDVIR_VEN_ID_OFFS			0 	/* Vendor ID */
+#define PDVIR_VEN_ID_MASK			(0xffff << PDVIR_VEN_ID_OFFS)
+
+#define PDVIR_DEV_ID_OFFS			16	/* Device ID */
+#define PDVIR_DEV_ID_MASK  			(0xffff << PDVIR_DEV_ID_OFFS)
+
+/* PCI Status and Command Register (PSCR) */
+#define PSCR_IO_EN			BIT0 	/* IO Enable 							  */
+#define PSCR_MEM_EN			BIT1	/* Memory Enable 						  */
+#define PSCR_MASTER_EN		BIT2	/* Master Enable 						  */
+#define PSCR_SPECIAL_EN		BIT3	/* Special Cycle Enable 				  */
+#define PSCR_MEM_WRI_INV	BIT4	/* Memory Write and Invalidate Enable	  */
+#define PSCR_VGA			BIT5	/* VGA Palette Snoops 					  */
+#define PSCR_PERR_EN		BIT6	/* Parity Errors Respond Enable 		  */
+#define PSCR_ADDR_STEP   	BIT7    /* Address Stepping Enable (Wait Cycle En)*/
+#define PSCR_SERR_EN		BIT8	/* Ability to assert SERR# line			  */
+#define PSCR_FAST_BTB_EN	BIT9	/* generate fast back-to-back transactions*/
+#define PSCR_CAP_LIST		BIT20	/* Capability List Support 				  */
+#define PSCR_66MHZ_EN		BIT21   /* 66 MHz Capable 						  */
+#define PSCR_UDF_EN			BIT22   /* User definable features 				  */
+#define PSCR_TAR_FAST_BB 	BIT23   /* fast back-to-back transactions capable */
+#define PSCR_DATA_PERR		BIT24   /* Data Parity reported 				  */
+
+#define PSCR_DEVSEL_TIM_OFFS 	25  /* DEVSEL timing */
+#define PSCR_DEVSEL_TIM_MASK 	(0x3 << PSCR_DEVSEL_TIM_OFFS)
+#define PSCR_DEVSEL_TIM_FAST	(0x0 << PSCR_DEVSEL_TIM_OFFS)
+#define PSCR_DEVSEL_TIM_MED 	(0x1 << PSCR_DEVSEL_TIM_OFFS)
+#define PSCR_DEVSEL_TIM_SLOW 	(0x2 << PSCR_DEVSEL_TIM_OFFS)
+
+#define PSCR_SLAVE_TABORT	BIT27	/* Signalled Target Abort 	*/
+#define PSCR_MASTER_TABORT	BIT28	/* Recieved Target Abort 	*/
+#define PSCR_MABORT			BIT29	/* Recieved Master Abort 	*/
+#define PSCR_SYSERR			BIT30	/* Signalled system error 	*/
+#define PSCR_DET_PARERR		BIT31	/* Detect Parity Error 		*/
+
+/* 	PCI configuration register offset=0x08 fields 
+	(PCI_CLASS_CODE_AND_REVISION_ID)(PCCRI) 				*/
+
+#define PCCRIR_REVID_OFFS		0		/* Revision ID */
+#define PCCRIR_REVID_MASK		(0xff << PCCRIR_REVID_OFFS)
+
+#define PCCRIR_FULL_CLASS_OFFS	8		/* Full Class Code */
+#define PCCRIR_FULL_CLASS_MASK	(0xffffff << PCCRIR_FULL_CLASS_OFFS)
+
+#define PCCRIR_PROGIF_OFFS		8		/* Prog .I/F*/
+#define PCCRIR_PROGIF_MASK		(0xff << PCCRIR_PROGIF_OFFS)
+
+#define PCCRIR_SUB_CLASS_OFFS	16		/* Sub Class*/
+#define PCCRIR_SUB_CLASS_MASK	(0xff << PCCRIR_SUB_CLASS_OFFS)
+
+#define PCCRIR_BASE_CLASS_OFFS	24		/* Base Class*/
+#define PCCRIR_BASE_CLASS_MASK	(0xff << PCCRIR_BASE_CLASS_OFFS)
+
+/* 	PCI configuration register offset=0x0C fields 
+	(PCI_BIST_HEADER_TYPE_LATENCY_TIMER_CACHE_LINE)(PBHTLTCL) 				*/
+
+#define PBHTLTCLR_CACHELINE_OFFS		0	/* Specifies the cache line size */
+#define PBHTLTCLR_CACHELINE_MASK		(0xff << PBHTLTCLR_CACHELINE_OFFS)
+	
+#define PBHTLTCLR_LATTIMER_OFFS			8	/* latency timer */
+#define PBHTLTCLR_LATTIMER_MASK			(0xff << PBHTLTCLR_LATTIMER_OFFS)
+
+#define PBHTLTCLR_HEADTYPE_FULL_OFFS	16	/* Full Header Type */
+#define PBHTLTCLR_HEADTYPE_FULL_MASK	(0xff << PBHTLTCLR_HEADTYPE_FULL_OFFS)
+
+#define PBHTLTCLR_MULTI_FUNC			BIT23	/* Multi/Single function */
+
+#define PBHTLTCLR_HEADER_OFFS			16		/* Header type */
+#define PBHTLTCLR_HEADER_MASK			(0x7f << PBHTLTCLR_HEADER_OFFS)
+#define PBHTLTCLR_HEADER_STANDARD		(0x0 << PBHTLTCLR_HEADER_OFFS)
+#define PBHTLTCLR_HEADER_PCI2PCI_BRIDGE	(0x1 << PBHTLTCLR_HEADER_OFFS)
+
+
+#define PBHTLTCLR_BISTCOMP_OFFS		24	/* BIST Completion Code */
+#define PBHTLTCLR_BISTCOMP_MASK		(0xf << PBHTLTCLR_BISTCOMP_OFFS)
+
+#define PBHTLTCLR_BISTACT			BIT30	/* BIST Activate bit */
+#define PBHTLTCLR_BISTCAP			BIT31	/* BIST Capable Bit */
+
+
+/* PCI Bar Base Low Register (PBBLR) */
+#define PBBLR_IOSPACE			BIT0	/* Memory Space Indicator */
+
+#define PBBLR_TYPE_OFFS			1	   /* BAR Type/Init Val. */ 
+#define PBBLR_TYPE_MASK			(0x3 << PBBLR_TYPE_OFFS)
+#define PBBLR_TYPE_32BIT_ADDR	(0x0 << PBBLR_TYPE_OFFS)
+#define PBBLR_TYPE_64BIT_ADDR	(0x2 << PBBLR_TYPE_OFFS)
+
+#define PBBLR_PREFETCH_EN		BIT3 	/* Prefetch Enable */
+
+				
+#define PBBLR_MEM_BASE_OFFS		4	/* Memory Bar Base address. Corresponds to
+									address bits [31:4] */
+#define PBBLR_MEM_BASE_MASK		(0xfffffff << PBBLR_MEM_BASE_OFFS)
+
+#define PBBLR_IO_BASE_OFFS		2	/* IO Bar Base address. Corresponds to 
+										address bits [31:2] */
+#define PBBLR_IO_BASE_MASK		(0x3fffffff << PBBLR_IO_BASE_OFFS)
+
+
+#define PBBLR_BASE_OFFS			12		/* Base address. Address bits [31:12] */
+#define PBBLR_BASE_MASK			(0xfffff << PBBLR_BASE_OFFS)
+#define PBBLR_BASE_ALIGNMET		(1 << PBBLR_BASE_OFFS)
+
+
+/* PCI Bar Base High Fegister (PBBHR) */
+#define PBBHR_BASE_OFFS			0		/* Base address. Address bits [31:12] */
+#define PBBHR_BASE_MASK			(0xffffffff << PBBHR_BASE_OFFS)
+
+
+/* 	PCI configuration register offset=0x2C fields 
+	(PCI_SUBSYSTEM_ID_AND_SUBSYSTEM_VENDOR_ID)(PSISVI) 				*/
+
+#define PSISVIR_VENID_OFFS	0	/* Subsystem Manufacturer Vendor ID Number */
+#define PSISVIR_VENID_MASK	(0xffff << PSISVIR_VENID_OFFS)
+
+#define PSISVIR_DEVID_OFFS	16	/* Subsystem Device ID Number */
+#define PSISVIR_DEVID_MASK	(0xffff << PSISVIR_DEVID_OFFS)
+
+/* 	PCI configuration register offset=0x30 fields 
+	(PCI_EXPANSION_ROM_BASE_ADDR_REG)(PERBA) 				*/
+
+#define PERBAR_EXPROMEN		BIT0	/* Expansion ROM Enable */
+
+#define PERBAR_BASE_OFFS		12		/* Expansion ROM Base Address */
+#define PERBAR_BASE_MASK		(0xfffff << PERBAR_BASE_OFFS) 	
+
+/* 	PCI configuration register offset=0x34 fields 
+	(PCI_CAPABILTY_LIST_POINTER)(PCLP) 				*/
+
+#define PCLPR_CAPPTR_OFFS	0		/* Capability List Pointer */
+#define PCLPR_CAPPTR_MASK	(0xff << PCLPR_CAPPTR_OFFS)
+
+/* 	PCI configuration register offset=0x3C fields 
+	(PCI_INTERRUPT_PIN_AND_LINE)(PIPL) 				*/
+
+#define PIPLR_INTLINE_OFFS	0	/* Interrupt line (IRQ) */
+#define PIPLR_INTLINE_MASK	(0xff << PIPLR_INTLINE_OFFS)
+
+#define PIPLR_INTPIN_OFFS	8	/* interrupt pin (A,B,C,D) */
+#define PIPLR_INTPIN_MASK	(0xff << PIPLR_INTPIN_OFFS)
+
+#define PIPLR_MINGRANT_OFFS	16	/* Minimum Grant on 250 nano seconds units */
+#define PIPLR_MINGRANT_MASK	(0xff << PIPLR_MINGRANT_OFFS)
+
+#define PIPLR_MAXLATEN_OFFS	24	/* Maximum latency on 250 nano seconds units */
+#define PIPLR_MAXLATEN_MASK	(0xff << PIPLR_MAXLATEN_OFFS)
+
+#endif /* #ifndef __INCPCIIFREGSH */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c
new file mode 100644
index 00000000..f2169793
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c
@@ -0,0 +1,1006 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+/* includes */
+#include "mvPciUtils.h"
+
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+/* #define MV_DEBUG */
+/* defines  */
+#ifdef MV_DEBUG
+	#define DB(x)	x
+	#define mvOsPrintf printf
+#else
+	#define DB(x)
+#endif
+
+/*
+This module only support scanning of Header type 00h of pci devices
+There is no suppotr for Header type 01h of pci devices  ( PCI bridges )
+*/
+
+
+static MV_STATUS pciDetectDevice(MV_U32 pciIf,
+   								 MV_U32 bus,
+   								 MV_U32 dev,
+   								 MV_U32 func,
+								 MV_PCI_DEVICE *pPciAgent);
+
+static MV_U32 pciDetectDeviceBars(MV_U32 pciIf,
+									MV_U32 bus,
+									MV_U32 dev,
+									MV_U32 func,
+									MV_PCI_DEVICE *pPciAgent);
+
+
+
+
+
+
+/*******************************************************************************
+* mvPciScan - Scan a PCI interface bus
+*
+* DESCRIPTION:
+* Performs a full scan on a PCI interface and returns all possible details
+* on the agents found on the bus.
+*
+* INPUT:
+*       pciIf       - PCI Interface
+*       pPciAgents 	- Pointer to an Array of the pci agents to be detected
+*		pPciAgentsNum - pPciAgents array maximum number of elements
+*
+* OUTPUT:
+*       pPciAgents - Array of the pci agents detected on the bus
+*		pPciAgentsNum - Number of pci agents detected on the bus
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+
+MV_STATUS mvPciScan(MV_U32 pciIf,
+					MV_PCI_DEVICE *pPciAgents,
+					MV_U32 *pPciAgentsNum)
+{
+
+	MV_U32 devIndex,funcIndex=0,busIndex=0,detectedDevNum=0;
+    MV_U32 localBus=mvPciIfLocalBusNumGet(pciIf);
+    MV_PCI_DEVICE *pPciDevice;
+	MV_PCI_DEVICE *pMainDevice;
+
+	DB(mvOsPrintf("mvPciScan: PCI interface num %d\n", pciIf));
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPexMaxIfGet())
+	{
+		DB(mvOsPrintf("mvPciScan: ERR. Invalid PCI interface num %d\n", pciIf));
+		return MV_BAD_PARAM;
+	}
+	if (NULL == pPciAgents)
+	{
+		DB(mvOsPrintf("mvPciScan: ERR. pPciAgents=NULL \n"));
+		return MV_BAD_PARAM;
+	}
+	if (NULL == pPciAgentsNum)
+	{
+		DB(mvOsPrintf("mvPciScan: ERR. pPciAgentsNum=NULL \n"));
+		return MV_BAD_PARAM;
+	}
+
+
+	DB(mvOsPrintf("mvPciScan: PCI interface num %d mvPciMasterEnable\n", pciIf));
+	/* Master enable the MV PCI master */
+	if (MV_OK != mvPciIfMasterEnable(pciIf,MV_TRUE))
+	{
+		DB(mvOsPrintf("mvPciScan: ERR. mvPciMasterEnable failed  \n"));
+		return MV_ERROR;
+
+	}
+
+	DB(mvOsPrintf("mvPciScan: PCI interface num scan%d\n", pciIf));
+
+	/* go through all busses */
+	for (busIndex=localBus ; busIndex < MAX_PCI_BUSSES ; busIndex++)
+	{
+		/* go through all possible devices on the local bus */
+		for (devIndex=0 ; devIndex < MAX_PCI_DEVICES ; devIndex++)
+		{
+			/* always start with function equal to zero */
+			funcIndex=0;
+
+			pPciDevice=&pPciAgents[detectedDevNum];
+			DB(mvOsPrintf("mvPciScan: PCI interface num scan%d:%d\n", busIndex, devIndex));
+
+			if (MV_ERROR == pciDetectDevice(pciIf,
+										   busIndex,
+										   devIndex,
+										   funcIndex,
+										   pPciDevice))
+			{
+				/* no device detected , try the next address */
+				continue;
+			}
+
+			/* We are here ! means we have detected a device*/
+			/* always we start with only one function per device */
+			pMainDevice = pPciDevice;
+			pPciDevice->funtionsNum = 1;
+
+
+			/* move on */
+			detectedDevNum++;
+
+
+			/* check if we have no more room for a new device */
+			if (detectedDevNum == *pPciAgentsNum)
+			{
+				DB(mvOsPrintf("mvPciScan: ERR. array passed too small \n"));
+				return MV_ERROR;
+			}
+
+			/* check the detected device if it is a multi functional device then
+			scan all device functions*/
+			if (pPciDevice->isMultiFunction == MV_TRUE)
+			{
+				/* start with function number 1 because we have already detected
+				function 0 */
+				for (funcIndex=1; funcIndex<MAX_PCI_FUNCS ; funcIndex++)
+				{
+					pPciDevice=&pPciAgents[detectedDevNum];
+
+					if (MV_ERROR == pciDetectDevice(pciIf,
+												   busIndex,
+												   devIndex,
+												   funcIndex,
+												   pPciDevice))
+					{
+						/* no device detected means no more functions !*/
+						continue;
+					}
+					/* We are here ! means we have detected a device */
+
+					/* move on */
+					pMainDevice->funtionsNum++;
+					detectedDevNum++;
+
+					/* check if we have no more room for a new device */
+					if (detectedDevNum == *pPciAgentsNum)
+					{
+						DB(mvOsPrintf("mvPciScan: ERR. Array too small\n"));
+						return MV_ERROR;
+					}
+
+
+				}
+			}
+
+		}
+
+	}
+
+	/* return the number of devices actually detected on the bus ! */
+	*pPciAgentsNum = detectedDevNum;
+
+	return MV_OK;
+
+}
+
+
+/*******************************************************************************
+* pciDetectDevice - Detect a pci device parameters
+*
+* DESCRIPTION:
+*	This function detect if a pci agent exist on certain address !
+*   and if exists then it fills all possible information on the
+*   agent
+*
+* INPUT:
+*       pciIf       - PCI Interface
+*		bus		-	Bus number
+*		dev		- 	Device number
+*		func	-	Function number
+*
+*
+*
+* OUTPUT:
+*       pPciAgent - pointer to the pci agent filled with its information
+*
+* RETURN:
+*       MV_ERROR if no device , MV_OK otherwise
+*
+*******************************************************************************/
+
+static MV_STATUS pciDetectDevice(MV_U32 pciIf,
+   								 MV_U32 bus,
+   								 MV_U32 dev,
+   								 MV_U32 func,
+								 MV_PCI_DEVICE *pPciAgent)
+{
+	MV_U32 pciData;
+
+	/* no Parameters checking ! because it is static function and it is assumed
+	that all parameters were checked in the calling function */
+
+
+	/* Try read the PCI Vendor ID and Device ID */
+
+	/*  We will scan only ourselves and the PCI slots that exist on the
+		board, because we may have a case that we have one slot that has
+		a Cardbus connector, and because CardBus answers all IDsels we want
+		to scan only this slot and ourseleves.
+
+	*/
+	#if defined(MV_INCLUDE_PCI)
+	if ((PCI_IF_TYPE_CONVEN_PCIX == mvPciIfTypeGet(pciIf)) &&
+					(DB_88F5181_DDR1_PRPMC != mvBoardIdGet()) &&
+					(DB_88F5181_DDR1_PEXPCI != mvBoardIdGet()) &&
+					(DB_88F5181_DDR1_MNG != mvBoardIdGet()))
+    	{
+
+			if (mvBoardIsOurPciSlot(bus, dev) == MV_FALSE)
+			{
+				return MV_ERROR;
+			}
+	}
+	#endif /* defined(MV_INCLUDE_PCI) */
+
+	pciData = mvPciIfConfigRead(pciIf, bus,dev,func, PCI_DEVICE_AND_VENDOR_ID);
+
+	if (PCI_ERROR_CODE == pciData)
+	{
+		/* no device exist */
+		return MV_ERROR;
+	}
+
+	/* we are here ! means a device is detected */
+
+	/* fill basic information */
+	pPciAgent->busNumber=bus;
+	pPciAgent->deviceNum=dev;
+	pPciAgent->function=func;
+
+	/* Fill the PCI Vendor ID and Device ID */
+
+	pPciAgent->venID = (pciData & PDVIR_VEN_ID_MASK) >> PDVIR_VEN_ID_OFFS;
+	pPciAgent->deviceID = (pciData & PDVIR_DEV_ID_MASK) >> PDVIR_DEV_ID_OFFS;
+
+	/* Read Status and command */
+	pciData = mvPciIfConfigRead(pciIf,
+							  bus,dev,func,
+							  PCI_STATUS_AND_COMMAND);
+
+
+	/* Fill related Status and Command information*/
+
+	if (pciData & PSCR_TAR_FAST_BB)
+	{
+		pPciAgent->isFastB2BCapable = MV_TRUE;
+	}
+	else
+	{
+		pPciAgent->isFastB2BCapable = MV_FALSE;
+	}
+
+	if (pciData & PSCR_CAP_LIST)
+	{
+		pPciAgent->isCapListSupport=MV_TRUE;
+	}
+	else
+	{
+		pPciAgent->isCapListSupport=MV_FALSE;
+	}
+
+	if (pciData & PSCR_66MHZ_EN)
+	{
+		pPciAgent->is66MHZCapable=MV_TRUE;
+	}
+	else
+	{
+		pPciAgent->is66MHZCapable=MV_FALSE;
+	}
+
+	/* Read Class Code and Revision */
+	pciData = mvPciIfConfigRead(pciIf,
+							  bus,dev,func,
+							  PCI_CLASS_CODE_AND_REVISION_ID);
+
+
+	pPciAgent->baseClassCode =
+		(pciData & PCCRIR_BASE_CLASS_MASK) >> PCCRIR_BASE_CLASS_OFFS;
+
+	pPciAgent->subClassCode =
+		(pciData & PCCRIR_SUB_CLASS_MASK) >> PCCRIR_SUB_CLASS_OFFS;
+
+	pPciAgent->progIf =
+		(pciData & PCCRIR_PROGIF_MASK) >> PCCRIR_PROGIF_OFFS;
+
+	pPciAgent->revisionID =
+		(pciData & PCCRIR_REVID_MASK) >> PCCRIR_REVID_OFFS;
+
+	/* Read  PCI_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE */
+	pciData = mvPciIfConfigRead(pciIf,
+							  bus,dev,func,
+							  PCI_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE);
+
+
+
+	pPciAgent->pciCacheLine=
+		(pciData & PBHTLTCLR_CACHELINE_MASK ) >> PBHTLTCLR_CACHELINE_OFFS;
+	pPciAgent->pciLatencyTimer=
+		(pciData & PBHTLTCLR_LATTIMER_MASK) >> PBHTLTCLR_LATTIMER_OFFS;
+
+	switch (pciData & PBHTLTCLR_HEADER_MASK)
+	{
+	case PBHTLTCLR_HEADER_STANDARD:
+
+		pPciAgent->pciHeader=MV_PCI_STANDARD;
+		break;
+	case PBHTLTCLR_HEADER_PCI2PCI_BRIDGE:
+
+		pPciAgent->pciHeader=MV_PCI_PCI2PCI_BRIDGE;
+		break;
+
+	}
+
+	if (pciData & PBHTLTCLR_MULTI_FUNC)
+	{
+		pPciAgent->isMultiFunction=MV_TRUE;
+	}
+	else
+	{
+		pPciAgent->isMultiFunction=MV_FALSE;
+	}
+
+	if (pciData & PBHTLTCLR_BISTCAP)
+	{
+		pPciAgent->isBISTCapable=MV_TRUE;
+	}
+	else
+	{
+		pPciAgent->isBISTCapable=MV_FALSE;
+	}
+
+
+	/* read this device pci bars */
+
+	pciDetectDeviceBars(pciIf,
+					  bus,dev,func,
+	 				 pPciAgent);
+
+
+	/* check if we are bridge*/
+	if ((pPciAgent->baseClassCode == PCI_BRIDGE_CLASS)&&
+		(pPciAgent->subClassCode == P2P_BRIDGE_SUB_CLASS_CODE))
+	{
+
+		/* Read  P2P_BUSSES_NUM */
+		pciData = mvPciIfConfigRead(pciIf,
+								  bus,dev,func,
+								  P2P_BUSSES_NUM);
+
+		pPciAgent->p2pPrimBusNum =
+			(pciData & PBM_PRIME_BUS_NUM_MASK) >> PBM_PRIME_BUS_NUM_OFFS;
+
+		pPciAgent->p2pSecBusNum =
+			(pciData & PBM_SEC_BUS_NUM_MASK) >> PBM_SEC_BUS_NUM_OFFS;
+
+		pPciAgent->p2pSubBusNum =
+			(pciData & PBM_SUB_BUS_NUM_MASK) >> PBM_SUB_BUS_NUM_OFFS;
+
+		pPciAgent->p2pSecLatencyTimer =
+			(pciData & PBM_SEC_LAT_TMR_MASK) >> PBM_SEC_LAT_TMR_OFFS;
+
+		/* Read  P2P_IO_BASE_LIMIT_SEC_STATUS */
+		pciData = mvPciIfConfigRead(pciIf,
+								  bus,dev,func,
+								  P2P_IO_BASE_LIMIT_SEC_STATUS);
+
+		pPciAgent->p2pSecStatus =
+			(pciData & PIBLSS_SEC_STATUS_MASK) >> PIBLSS_SEC_STATUS_OFFS;
+
+
+		pPciAgent->p2pIObase =
+			(pciData & PIBLSS_IO_BASE_MASK) << PIBLSS_IO_LIMIT_OFFS;
+
+		/* clear low address (should be zero)*/
+		pPciAgent->p2pIObase &= PIBLSS_HIGH_ADDR_MASK;
+
+		pPciAgent->p2pIOLimit =
+			(pciData & PIBLSS_IO_LIMIT_MASK);
+
+		/* fill low address with 0xfff */
+		pPciAgent->p2pIOLimit |= PIBLSS_LOW_ADDR_MASK;
+
+
+		switch ((pciData & PIBLSS_ADD_CAP_MASK) >> PIBLSS_ADD_CAP_OFFS)
+		{
+		case PIBLSS_ADD_CAP_16BIT:
+
+			pPciAgent->bIO32 = MV_FALSE;
+
+			break;
+		case PIBLSS_ADD_CAP_32BIT:
+
+			pPciAgent->bIO32 = MV_TRUE;
+
+			/* Read  P2P_IO_BASE_LIMIT_UPPER_16 */
+			pciData = mvPciIfConfigRead(pciIf,
+									  bus,dev,func,
+									  P2P_IO_BASE_LIMIT_UPPER_16);
+
+			pPciAgent->p2pIObase |=
+				(pciData & PRBU_IO_UPP_BASE_MASK) << PRBU_IO_UPP_LIMIT_OFFS;
+
+
+			pPciAgent->p2pIOLimit |=
+				(pciData & PRBU_IO_UPP_LIMIT_MASK);
+
+			break;
+
+		}
+
+
+		/* Read  P2P_MEM_BASE_LIMIT */
+		pciData = mvPciIfConfigRead(pciIf,
+								  bus,dev,func,
+								  P2P_MEM_BASE_LIMIT);
+
+		pPciAgent->p2pMemBase =
+			(pciData & PMBL_MEM_BASE_MASK) << PMBL_MEM_LIMIT_OFFS;
+
+		/* clear low address */
+		pPciAgent->p2pMemBase &= PMBL_HIGH_ADDR_MASK;
+
+		pPciAgent->p2pMemLimit =
+			(pciData & PMBL_MEM_LIMIT_MASK);
+
+		/* add 0xfffff */
+		pPciAgent->p2pMemLimit |= PMBL_LOW_ADDR_MASK;
+
+
+		/* Read  P2P_PREF_MEM_BASE_LIMIT */
+		pciData = mvPciIfConfigRead(pciIf,
+								  bus,dev,func,
+								  P2P_PREF_MEM_BASE_LIMIT);
+
+
+		pPciAgent->p2pPrefMemBase =
+			(pciData & PRMBL_PREF_MEM_BASE_MASK) << PRMBL_PREF_MEM_LIMIT_OFFS;
+
+		/* get high address only */
+		pPciAgent->p2pPrefMemBase &= PRMBL_HIGH_ADDR_MASK;
+
+
+
+		pPciAgent->p2pPrefMemLimit =
+			(pciData & PRMBL_PREF_MEM_LIMIT_MASK);
+
+		/* add 0xfffff */
+		pPciAgent->p2pPrefMemLimit |= PRMBL_LOW_ADDR_MASK;
+
+		switch (pciData & PRMBL_ADD_CAP_MASK)
+		{
+		case PRMBL_ADD_CAP_32BIT:
+
+			pPciAgent->bPrefMem64 = MV_FALSE;
+
+			/* Read  P2P_PREF_BASE_UPPER_32 */
+			pPciAgent->p2pPrefBaseUpper32Bits = 0;
+
+			/* Read  P2P_PREF_LIMIT_UPPER_32 */
+			pPciAgent->p2pPrefLimitUpper32Bits = 0;
+
+			break;
+		case PRMBL_ADD_CAP_64BIT:
+
+			pPciAgent->bPrefMem64 = MV_TRUE;
+
+			/* Read  P2P_PREF_BASE_UPPER_32 */
+			pPciAgent->p2pPrefBaseUpper32Bits = mvPciIfConfigRead(pciIf,
+									  bus,dev,func,
+									  P2P_PREF_BASE_UPPER_32);
+
+			/* Read  P2P_PREF_LIMIT_UPPER_32 */
+			pPciAgent->p2pPrefLimitUpper32Bits = mvPciIfConfigRead(pciIf,
+									  bus,dev,func,
+									  P2P_PREF_LIMIT_UPPER_32);
+
+			break;
+
+		}
+
+	}
+	else /* no bridge */
+	{
+		/* Read  PCI_SUBSYS_ID_AND_SUBSYS_VENDOR_ID */
+		pciData = mvPciIfConfigRead(pciIf,
+								  bus,dev,func,
+								  PCI_SUBSYS_ID_AND_SUBSYS_VENDOR_ID);
+
+
+		pPciAgent->subSysVenID =
+			(pciData & PSISVIR_VENID_MASK) >> PSISVIR_VENID_OFFS;
+		pPciAgent->subSysID =
+			(pciData & PSISVIR_DEVID_MASK) >> PSISVIR_DEVID_OFFS;
+
+
+		/* Read  PCI_EXPANSION_ROM_BASE_ADDR_REG */
+		pciData = mvPciIfConfigRead(pciIf,
+								  bus,dev,func,
+								  PCI_EXPANSION_ROM_BASE_ADDR_REG);
+
+
+		if (pciData & PERBAR_EXPROMEN)
+		{
+			pPciAgent->isExpRom = MV_TRUE;
+		}
+		else
+		{
+			pPciAgent->isExpRom = MV_FALSE;
+		}
+
+		pPciAgent->expRomAddr =
+			(pciData & PERBAR_BASE_MASK) >> PERBAR_BASE_OFFS;
+
+	}
+
+
+	if (MV_TRUE == pPciAgent->isCapListSupport)
+	{
+		/* Read  PCI_CAPABILTY_LIST_POINTER */
+		pciData = mvPciIfConfigRead(pciIf,
+								  bus,dev,func,
+								  PCI_CAPABILTY_LIST_POINTER);
+
+		pPciAgent->capListPointer =
+			(pciData & PCLPR_CAPPTR_MASK) >> PCLPR_CAPPTR_OFFS;
+
+	}
+
+	/* Read  PCI_INTERRUPT_PIN_AND_LINE */
+	pciData = mvPciIfConfigRead(pciIf,
+							  bus,dev,func,
+							  PCI_INTERRUPT_PIN_AND_LINE);
+
+
+	pPciAgent->irqLine=
+		(pciData & PIPLR_INTLINE_MASK) >> PIPLR_INTLINE_OFFS;
+
+	pPciAgent->intPin=
+		(MV_PCI_INT_PIN)(pciData & PIPLR_INTPIN_MASK) >> PIPLR_INTPIN_OFFS;
+
+	pPciAgent->minGrant=
+		(pciData & PIPLR_MINGRANT_MASK) >> PIPLR_MINGRANT_OFFS;
+	pPciAgent->maxLatency=
+		(pciData & PIPLR_MAXLATEN_MASK) >> PIPLR_MAXLATEN_OFFS;
+
+	mvPciClassNameGet(pPciAgent->baseClassCode,
+					  (MV_8 *)pPciAgent->type);
+
+	return MV_OK;
+
+
+}
+
+/*******************************************************************************
+* pciDetectDeviceBars - Detect a pci device bars
+*
+* DESCRIPTION:
+*	This function detects all pci agent bars
+*
+* INPUT:
+*       pciIf       - PCI Interface
+*		bus		-	Bus number
+*		dev		- 	Device number
+*		func	-	Function number
+*
+*
+*
+* OUTPUT:
+*       pPciAgent - pointer to the pci agent filled with its information
+*
+* RETURN:
+*       detected bars number
+*
+*******************************************************************************/
+static MV_U32 pciDetectDeviceBars(MV_U32 pciIf,
+									MV_U32 bus,
+									MV_U32 dev,
+									MV_U32 func,
+									MV_PCI_DEVICE *pPciAgent)
+{
+	MV_U32 pciData,barIndex,detectedBar=0;
+	MV_U32 tmpBaseHigh=0,tmpBaseLow=0;
+	MV_U32 pciMaxBars=0;
+
+	pPciAgent->barsNum=0;
+
+	/* check if we are bridge*/
+	if ((pPciAgent->baseClassCode == PCI_BRIDGE_CLASS)&&
+		(pPciAgent->subClassCode == P2P_BRIDGE_SUB_CLASS_CODE))
+	{
+		pciMaxBars = 2;
+	}
+	else /* no bridge */
+	{
+		pciMaxBars = 6;
+	}
+
+	/* read this device pci bars */
+	for (barIndex = 0 ; barIndex < pciMaxBars ; barIndex++ )
+	{
+		/* Read  PCI_MEMORY_BAR_BASE_ADDR */
+		tmpBaseLow = pciData = mvPciIfConfigRead(pciIf,
+									   bus,dev,func,
+						               PCI_MEMORY_BAR_BASE_ADDR(barIndex));
+
+		pPciAgent->pciBar[detectedBar].barOffset =
+			PCI_MEMORY_BAR_BASE_ADDR(barIndex);
+
+		/* check if the bar is 32bit or 64bit bar */
+		switch (pciData & PBBLR_TYPE_MASK)
+		{
+		case PBBLR_TYPE_32BIT_ADDR:
+			pPciAgent->pciBar[detectedBar].barType = PCI_32BIT_BAR;
+			break;
+		case PBBLR_TYPE_64BIT_ADDR:
+			pPciAgent->pciBar[detectedBar].barType = PCI_64BIT_BAR;
+			break;
+
+		}
+
+		/* check if it is memory or IO bar */
+		if (pciData & PBBLR_IOSPACE)
+		{
+			pPciAgent->pciBar[detectedBar].barMapping=PCI_IO_BAR;
+		}
+		else
+		{
+			pPciAgent->pciBar[detectedBar].barMapping=PCI_MEMORY_BAR;
+		}
+
+		/* if it is memory bar then check if it is prefetchable */
+		if (PCI_MEMORY_BAR == pPciAgent->pciBar[detectedBar].barMapping)
+		{
+			if (pciData & PBBLR_PREFETCH_EN)
+			{
+				pPciAgent->pciBar[detectedBar].isPrefetchable = MV_TRUE;
+			}
+			else
+			{
+				pPciAgent->pciBar[detectedBar].isPrefetchable = MV_FALSE;
+			}
+
+            pPciAgent->pciBar[detectedBar].barBaseLow =
+				pciData & PBBLR_MEM_BASE_MASK;
+
+
+		}
+		else /* IO Bar */
+		{
+			pPciAgent->pciBar[detectedBar].barBaseLow =
+				pciData & PBBLR_IO_BASE_MASK;
+
+		}
+
+		pPciAgent->pciBar[detectedBar].barBaseHigh=0;
+
+		if (PCI_64BIT_BAR == pPciAgent->pciBar[detectedBar].barType)
+		{
+			barIndex++;
+
+			tmpBaseHigh = pPciAgent->pciBar[detectedBar].barBaseHigh =
+				mvPciIfConfigRead(pciIf,
+								bus,dev,func,
+								PCI_MEMORY_BAR_BASE_ADDR(barIndex));
+
+
+		}
+
+		/* calculating full base address (64bit) */
+		pPciAgent->pciBar[detectedBar].barBaseAddr =
+			(MV_U64)pPciAgent->pciBar[detectedBar].barBaseHigh;
+
+		pPciAgent->pciBar[detectedBar].barBaseAddr <<= 32;
+
+		pPciAgent->pciBar[detectedBar].barBaseAddr |=
+			(MV_U64)pPciAgent->pciBar[detectedBar].barBaseLow;
+
+
+
+		/* get the sizes of the the bar */
+
+		pPciAgent->pciBar[detectedBar].barSizeHigh=0;
+
+		if ((PCI_64BIT_BAR == pPciAgent->pciBar[detectedBar].barType) &&
+			(PCI_MEMORY_BAR == pPciAgent->pciBar[detectedBar].barMapping))
+
+		{
+			/* write oxffffffff to the bar to get the size */
+			/* start with sizelow ( original value was saved in tmpBaseLow ) */
+			mvPciIfConfigWrite(pciIf,
+							bus,dev,func,
+							PCI_MEMORY_BAR_BASE_ADDR(barIndex-1),
+							0xffffffff);
+
+			/* read size */
+			pPciAgent->pciBar[detectedBar].barSizeLow =
+				mvPciIfConfigRead(pciIf,
+								bus,dev,func,
+								PCI_MEMORY_BAR_BASE_ADDR(barIndex-1));
+
+
+
+			/* restore original value */
+			mvPciIfConfigWrite(pciIf,
+							bus,dev,func,
+							PCI_MEMORY_BAR_BASE_ADDR(barIndex-1),
+							tmpBaseLow);
+
+
+			/* now do the same for BaseHigh */
+
+			/* write oxffffffff to the bar to get the size */
+			mvPciIfConfigWrite(pciIf,
+							bus,dev,func,
+							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
+							0xffffffff);
+
+			/* read size */
+			pPciAgent->pciBar[detectedBar].barSizeHigh =
+				mvPciIfConfigRead(pciIf,
+								bus,dev,func,
+								PCI_MEMORY_BAR_BASE_ADDR(barIndex));
+
+			/* restore original value */
+			mvPciIfConfigWrite(pciIf,
+							bus,dev,func,
+							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
+							tmpBaseHigh);
+
+			if ((0 == pPciAgent->pciBar[detectedBar].barSizeLow)&&
+				(0 == pPciAgent->pciBar[detectedBar].barSizeHigh))
+			{
+				/* this bar is not applicable for this device,
+				   ignore all previous settings and check the next bar*/
+
+				/* we though this was a 64bit bar , and it seems this
+				   was wrong ! so decrement barIndex */
+				barIndex--;
+				continue;
+			}
+
+			/* calculate the full 64 bit size  */
+
+			if (0 != pPciAgent->pciBar[detectedBar].barSizeHigh)
+			{
+				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_MEM_BASE_MASK;
+
+				pPciAgent->pciBar[detectedBar].barSizeLow =
+					~pPciAgent->pciBar[detectedBar].barSizeLow + 1;
+
+				pPciAgent->pciBar[detectedBar].barSizeHigh = 0;
+
+			}
+			else
+			{
+
+				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_MEM_BASE_MASK;
+
+				pPciAgent->pciBar[detectedBar].barSizeLow =
+					~pPciAgent->pciBar[detectedBar].barSizeLow + 1;
+
+				pPciAgent->pciBar[detectedBar].barSizeHigh = 0;
+
+			}
+
+
+
+		}
+		else /* 32bit bar */
+		{
+			/* write oxffffffff to the bar to get the size */
+			mvPciIfConfigWrite(pciIf,
+							bus,dev,func,
+							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
+							0xffffffff);
+
+			/* read size */
+			pPciAgent->pciBar[detectedBar].barSizeLow =
+				mvPciIfConfigRead(pciIf,
+								bus,dev,func,
+								PCI_MEMORY_BAR_BASE_ADDR(barIndex));
+
+			if (0 == pPciAgent->pciBar[detectedBar].barSizeLow)
+			{
+				/* this bar is not applicable for this device,
+				   ignore all previous settings and check the next bar*/
+				continue;
+			}
+
+
+			/* restore original value */
+			mvPciIfConfigWrite(pciIf,
+							bus,dev,func,
+							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
+							tmpBaseLow);
+
+		/* calculate size low */
+
+			if (PCI_MEMORY_BAR == pPciAgent->pciBar[detectedBar].barMapping)
+			{
+				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_MEM_BASE_MASK;
+			}
+			else
+			{
+				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_IO_BASE_MASK;
+			}
+
+			pPciAgent->pciBar[detectedBar].barSizeLow =
+				~pPciAgent->pciBar[detectedBar].barSizeLow + 1;
+
+			pPciAgent->pciBar[detectedBar].barSizeHigh = 0;
+			pPciAgent->pciBar[detectedBar].barSize =
+				(MV_U64)pPciAgent->pciBar[detectedBar].barSizeLow;
+
+
+		}
+
+		/* we are here ! this means we have already detected a bar for
+		this device , now move on */
+
+		detectedBar++;
+		pPciAgent->barsNum++;
+	}
+
+	return detectedBar;
+}
+
+
+/*******************************************************************************
+* mvPciClassNameGet - get PCI  class name
+*
+* DESCRIPTION:
+*		This function returns the PCI class name
+*
+* INPUT:
+*       baseClassCode       - Base Class Code.
+*
+* OUTPUT:
+*       pType - the class name
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciClassNameGet(MV_U32 baseClassCode, MV_8 *pType)
+{
+
+    switch(baseClassCode)
+    {
+        case 0x0:
+            strcpy(pType,"Old generation device");
+            break;
+        case 0x1:
+            strcpy(pType,"Mass storage controller");
+            break;
+        case 0x2:
+            strcpy(pType,"Network controller");
+            break;
+        case 0x3:
+            strcpy(pType,"Display controller");
+            break;
+        case 0x4:
+            strcpy(pType,"Multimedia device");
+            break;
+        case 0x5:
+            strcpy(pType,"Memory controller");
+            break;
+        case 0x6:
+            strcpy(pType,"Bridge Device");
+            break;
+        case 0x7:
+            strcpy(pType,"Simple Communication controllers");
+            break;
+        case 0x8:
+            strcpy(pType,"Base system peripherals");
+            break;
+        case 0x9:
+            strcpy(pType,"Input Devices");
+            break;
+        case 0xa:
+            strcpy(pType,"Docking stations");
+            break;
+        case 0xb:
+            strcpy(pType,"Processors");
+            break;
+        case 0xc:
+            strcpy(pType,"Serial bus controllers");
+            break;
+        case 0xd:
+            strcpy(pType,"Wireless controllers");
+            break;
+        case 0xe:
+            strcpy(pType,"Intelligent I/O controllers");
+            break;
+        case 0xf:
+            strcpy(pType,"Satellite communication controllers");
+            break;
+        case 0x10:
+            strcpy(pType,"Encryption/Decryption controllers");
+            break;
+        case 0x11:
+            strcpy(pType,"Data acquisition and signal processing controllers");
+            break;
+        default:
+            strcpy(pType,"Unknown device");
+            break;
+    }
+
+	return MV_OK;
+
+}
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h
new file mode 100644
index 00000000..2ee0b173
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h
@@ -0,0 +1,323 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvPciUtilsh
+#define __INCmvPciUtilsh
+
+/* 
+This module only support scanning of Header type 00h of pci devices 
+There is no suppotr for Header type 01h of pci devices  ( PCI bridges )
+*/
+
+/* includes */
+#include "mvSysHwConfig.h"
+#include "pci-if/mvPciIf.h"
+#include "pci/mvPciRegs.h"
+
+
+
+/* PCI base address low bar mask */
+#define PCI_ERROR_CODE                      0xffffffff
+
+#define PCI_BRIDGE_CLASS					0x6
+#define P2P_BRIDGE_SUB_CLASS_CODE			0x4
+
+
+#define P2P_BUSSES_NUM						0x18
+#define P2P_IO_BASE_LIMIT_SEC_STATUS		0x1C
+#define P2P_MEM_BASE_LIMIT					0x20
+#define P2P_PREF_MEM_BASE_LIMIT				0x24
+#define P2P_PREF_BASE_UPPER_32				0x28
+#define P2P_PREF_LIMIT_UPPER_32				0x2C
+#define P2P_IO_BASE_LIMIT_UPPER_16			0x30
+#define P2P_EXP_ROM							0x38
+
+/* P2P_BUSSES_NUM  (PBM) */
+
+#define PBM_PRIME_BUS_NUM_OFFS				0
+#define PBM_PRIME_BUS_NUM_MASK				(0xff << PBM_PRIME_BUS_NUM_OFFS)
+
+#define PBM_SEC_BUS_NUM_OFFS				8
+#define PBM_SEC_BUS_NUM_MASK				(0xff << PBM_SEC_BUS_NUM_OFFS)
+
+#define PBM_SUB_BUS_NUM_OFFS				16
+#define PBM_SUB_BUS_NUM_MASK				(0xff << PBM_SUB_BUS_NUM_OFFS)
+
+#define PBM_SEC_LAT_TMR_OFFS				24
+#define PBM_SEC_LAT_TMR_MASK				(0xff << PBM_SEC_LAT_TMR_OFFS)
+
+/* P2P_IO_BASE_LIMIT_SEC_STATUS (PIBLSS) */
+
+#define PIBLSS_IO_BASE_OFFS					0
+#define PIBLSS_IO_BASE_MASK					(0xff << PIBLSS_IO_BASE_OFFS)
+
+#define PIBLSS_ADD_CAP_OFFS					0
+#define PIBLSS_ADD_CAP_MASK 				(0x3 << PIBLSS_ADD_CAP_OFFS)
+#define PIBLSS_ADD_CAP_16BIT 				(0x0 << PIBLSS_ADD_CAP_OFFS)
+#define PIBLSS_ADD_CAP_32BIT 				(0x1 << PIBLSS_ADD_CAP_OFFS)
+
+#define PIBLSS_LOW_ADDR_OFFS				0
+#define PIBLSS_LOW_ADDR_MASK				(0xFFF << PIBLSS_LOW_ADDR_OFFS)
+
+#define PIBLSS_HIGH_ADDR_OFFS				12
+#define PIBLSS_HIGH_ADDR_MASK				(0xF << PIBLSS_HIGH_ADDR_OFFS)
+
+#define PIBLSS_IO_LIMIT_OFFS				8
+#define PIBLSS_IO_LIMIT_MASK				(0xff << PIBLSS_IO_LIMIT_OFFS)
+
+#define PIBLSS_SEC_STATUS_OFFS				16
+#define PIBLSS_SEC_STATUS_MASK				(0xffff << PIBLSS_SEC_STATUS_OFFS)
+
+
+/* P2P_MEM_BASE_LIMIT (PMBL)*/
+
+#define PMBL_MEM_BASE_OFFS					0
+#define PMBL_MEM_BASE_MASK					(0xffff << PMBL_MEM_BASE_OFFS)
+
+#define PMBL_MEM_LIMIT_OFFS					16
+#define PMBL_MEM_LIMIT_MASK					(0xffff << PMBL_MEM_LIMIT_OFFS)
+
+
+#define PMBL_LOW_ADDR_OFFS					0
+#define PMBL_LOW_ADDR_MASK					(0xFFFFF << PMBL_LOW_ADDR_OFFS)
+
+#define PMBL_HIGH_ADDR_OFFS					20
+#define PMBL_HIGH_ADDR_MASK					(0xFFF << PMBL_HIGH_ADDR_OFFS)
+
+
+/* P2P_PREF_MEM_BASE_LIMIT (PRMBL) */
+
+#define PRMBL_PREF_MEM_BASE_OFFS			0
+#define PRMBL_PREF_MEM_BASE_MASK			(0xffff << PRMBL_PREF_MEM_BASE_OFFS)
+
+#define PRMBL_PREF_MEM_LIMIT_OFFS			16
+#define PRMBL_PREF_MEM_LIMIT_MASK			(0xffff<<PRMBL_PREF_MEM_LIMIT_OFFS)
+
+#define PRMBL_LOW_ADDR_OFFS					0
+#define PRMBL_LOW_ADDR_MASK					(0xFFFFF << PRMBL_LOW_ADDR_OFFS)
+
+#define PRMBL_HIGH_ADDR_OFFS				20
+#define PRMBL_HIGH_ADDR_MASK				(0xFFF << PRMBL_HIGH_ADDR_OFFS)
+
+#define PRMBL_ADD_CAP_OFFS					0
+#define PRMBL_ADD_CAP_MASK					(0xf << PRMBL_ADD_CAP_OFFS)
+#define PRMBL_ADD_CAP_32BIT					(0x0 << PRMBL_ADD_CAP_OFFS)
+#define PRMBL_ADD_CAP_64BIT					(0x1 << PRMBL_ADD_CAP_OFFS)
+
+/* P2P_IO_BASE_LIMIT_UPPER_16 (PIBLU) */
+
+#define PRBU_IO_UPP_BASE_OFFS				0
+#define PRBU_IO_UPP_BASE_MASK				(0xffff << PRBU_IO_UPP_BASE_OFFS)
+
+#define PRBU_IO_UPP_LIMIT_OFFS				16
+#define PRBU_IO_UPP_LIMIT_MASK				(0xffff << PRBU_IO_UPP_LIMIT_OFFS)
+
+
+/* typedefs */
+
+typedef enum _mvPciBarMapping
+{
+    PCI_MEMORY_BAR, 
+    PCI_IO_BAR, 
+    PCI_NO_MAPPING
+}MV_PCI_BAR_MAPPING;
+
+typedef enum _mvPciBarType
+{
+    PCI_32BIT_BAR, 
+    PCI_64BIT_BAR
+}MV_PCI_BAR_TYPE;
+
+typedef enum _mvPciIntPin
+{
+    MV_PCI_INTA = 1,
+    MV_PCI_INTB = 2,
+    MV_PCI_INTC = 3,
+    MV_PCI_INTD = 4
+}MV_PCI_INT_PIN;
+
+typedef enum _mvPciHeader
+{
+    MV_PCI_STANDARD,
+    MV_PCI_PCI2PCI_BRIDGE
+
+}MV_PCI_HEADER;
+
+
+/* BAR structure */
+typedef struct _pciBar
+{
+    MV_U32 barOffset;
+    MV_U32 barBaseLow;
+    MV_U32 barBaseHigh;
+    MV_U32 barSizeLow;
+    MV_U32 barSizeHigh;
+    /* The 'barBaseAddr' is a 64-bit variable
+       that will contain the TOTAL base address
+       value achived by combining both the 'barBaseLow'
+       and the 'barBaseHigh' parameters as follows:
+
+       BIT: 63          31         0
+            |           |         |
+            barBaseHigh barBaseLow */
+    MV_U64 barBaseAddr;
+    /* The 'barSize' is a 64-bit variable
+       that will contain the TOTAL size achived
+       by combining both the 'barSizeLow' and
+       the 'barSizeHigh' parameters as follows:
+
+       BIT: 63          31         0
+            |           |         |
+            barSizeHigh barSizeLow
+
+       NOTE: The total size described above
+             is AFTER the size calculation as
+             described in PCI spec rev2.2 */
+    MV_U64 barSize;
+    MV_BOOL            isPrefetchable;
+    MV_PCI_BAR_TYPE       barType;
+    MV_PCI_BAR_MAPPING    barMapping;
+
+
+} PCI_BAR;
+
+/* Device information structure */
+typedef struct _mvPciDevice
+{
+    /* Device specific information */
+	MV_U32			busNumber; 	/* Pci agent bus number */
+    MV_U32			deviceNum;	/* Pci agent device number */
+    MV_U32			function;	/* Pci agent function number */
+
+	MV_U32			venID;		/* Pci agent Vendor ID */
+    MV_U32			deviceID;	/* Pci agent Device ID */
+
+    MV_BOOL			isFastB2BCapable;	/* Capability of Fast Back to Back 
+										   transactions */
+	MV_BOOL			isCapListSupport;	/* Support of Capability list */
+	MV_BOOL			is66MHZCapable;		/* 66MHZ support */
+
+    MV_U32			baseClassCode;		/* Pci agent base Class Code */
+    MV_U32			subClassCode;		/* Pci agent sub Class Code */
+    MV_U32			progIf;				/* Pci agent Programing interface */
+	MV_U32			revisionID;
+
+    PCI_BAR			pciBar[6]; 			/* Pci agent bar list */
+
+	MV_U32			p2pPrimBusNum;		/* P2P Primary Bus number*/
+	MV_U32			p2pSecBusNum;		/* P2P Secondary Bus Number*/
+	MV_U32			p2pSubBusNum;		/* P2P Subordinate bus Number */
+	MV_U32			p2pSecLatencyTimer;	/* P2P Econdary Latency Timer*/
+	MV_U32			p2pIObase;			/* P2P IO Base */
+	MV_U32			p2pIOLimit;			/* P2P IO Linit */
+	MV_BOOL			bIO32;	
+	MV_U32			p2pSecStatus;		/* P2P Secondary Status */
+	MV_U32			p2pMemBase;			/* P2P Memory Space */
+	MV_U32			p2pMemLimit;		/* P2P Memory Limit*/
+	MV_U32			p2pPrefMemBase;		/* P2P Prefetchable Mem Base*/
+	MV_U32			p2pPrefMemLimit;	/* P2P Prefetchable Memory Limit*/
+	MV_BOOL			bPrefMem64;	
+	MV_U32			p2pPrefBaseUpper32Bits;/* P2P Prefetchable upper 32 bits*/
+	MV_U32			p2pPrefLimitUpper32Bits;/* P2P prefetchable limit upper 32*/
+
+
+	MV_U32			pciCacheLine;		/* Pci agent cache line */
+	MV_U32			pciLatencyTimer;	/* Pci agent Latency timer  */
+    MV_PCI_HEADER	pciHeader;			/* Pci agent header type*/
+    MV_BOOL			isMultiFunction;	/* Multi function support */
+	MV_BOOL			isBISTCapable;		/* Self test capable */
+
+	MV_U32			subSysID;			/* Sub System ID */
+	MV_U32			subSysVenID;		/* Sub System Vendor ID */
+
+	MV_BOOL			isExpRom;			/* Expantion Rom support */
+	MV_U32			expRomAddr;			/* Expantion Rom pointer */
+
+	MV_U32			capListPointer;		/* Capability list pointer */
+
+	MV_U32			irqLine;		/* IRQ line  */
+	MV_PCI_INT_PIN	intPin;			/* Interrupt pin */
+	MV_U32			minGrant;		/* Minimum grant*/
+	MV_U32			maxLatency;		/* Maximum latency*/
+
+	MV_U32 			funtionsNum;	/* pci agent total functions number */
+
+	MV_U32 			barsNum;
+    MV_U8           type[60];		/* class name of the pci agent */
+
+
+} MV_PCI_DEVICE;
+
+/* PCI gloabl functions */
+MV_STATUS mvPciClassNameGet(MV_U32 classCode, MV_8 *pType);
+
+
+/* Performs a full scan on both PCIs and returns all possible details on the
+   agents found on the bus. */
+MV_STATUS mvPciScan(MV_U32 pciIf,
+					MV_PCI_DEVICE *pPciAgents,
+					MV_U32 *pPciAgentsNum);
+
+
+#endif /* #ifndef __INCmvPciUtilsh */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvCompVer.txt
new file mode 100644
index 00000000..7b6fe369
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.2
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c
new file mode 100644
index 00000000..4a087343
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c
@@ -0,0 +1,1047 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#include "pci/mvPci.h"
+
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+/* defines  */       
+#ifdef MV_DEBUG         
+	#define DB(x)	x
+#else                
+	#define DB(x)    
+#endif	             
+					 
+
+
+MV_VOID mvPciHalInit(MV_U32 pciIf, MV_PCI_MOD pciIfmod)
+{
+        if (MV_PCI_MOD_HOST == pciIfmod)
+    {
+
+                mvPciLocalBusNumSet(pciIf, PCI_HOST_BUS_NUM(pciIf));
+                mvPciLocalDevNumSet(pciIf, PCI_HOST_DEV_NUM(pciIf));
+        
+                /* Local device master Enable */
+                mvPciMasterEnable(pciIf, MV_TRUE);
+        
+                /* Local device slave Enable */
+                mvPciSlaveEnable(pciIf, mvPciLocalBusNumGet(pciIf),
+                                                 mvPciLocalDevNumGet(pciIf), MV_TRUE);
+        }
+        /* enable CPU-2-PCI ordering */
+        MV_REG_BIT_SET(PCI_CMD_REG(0), PCR_CPU_TO_PCI_ORDER_EN);
+}
+
+/*******************************************************************************
+* mvPciCommandSet - Set PCI comman register value.
+*
+* DESCRIPTION:
+*       This function sets a given PCI interface with its command register 
+*       value.
+*
+* INPUT:
+*       pciIf   - PCI interface number.
+*       command - 32bit value to be written to comamnd register.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM if pciIf is not in range otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciCommandSet(MV_U32 pciIf, MV_U32 command)
+{
+    MV_U32 locBusNum, locDevNum, regVal;
+
+    locBusNum =  mvPciLocalBusNumGet(pciIf);
+    locDevNum =  mvPciLocalDevNumGet(pciIf);
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciCommandSet: ERR. Invalid PCI IF num %d\n", pciIf);
+		return MV_BAD_PARAM;
+	}
+
+	/* Set command register */
+	MV_REG_WRITE(PCI_CMD_REG(pciIf), command);
+
+    /* Upodate device max outstanding split tarnsaction */
+    if ((command & PCR_CPU_TO_PCI_ORDER_EN) && 
+        (command & PCR_PCI_TO_CPU_ORDER_EN))
+    {
+        /* Read PCI-X command register */
+        regVal = mvPciConfigRead (pciIf, locBusNum, locDevNum, 0, PCIX_COMMAND);
+                        
+        /* clear bits 22:20 */
+        regVal &= 0xff8fffff;
+
+        /* set reset value */
+        regVal |= (0x3 << 20);
+        
+        /* Write back the value */
+        mvPciConfigWrite (pciIf, locBusNum, locDevNum, 0, PCIX_COMMAND, regVal);
+    }
+
+	return MV_OK;
+
+
+}
+
+
+/*******************************************************************************
+* mvPciModeGet - Get PCI interface mode.
+*
+* DESCRIPTION:
+*       This function returns the given PCI interface mode.
+*
+* INPUT:
+*       pciIf   - PCI interface number.
+*
+* OUTPUT:
+*       pPciMode - Pointer to PCI mode structure.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciModeGet(MV_U32 pciIf, MV_PCI_MODE *pPciMode)
+{
+	MV_U32 pciMode;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciModeGet: ERR. Invalid PCI interface %d\n", pciIf);
+		return MV_BAD_PARAM;
+	}
+	if (NULL == pPciMode)
+	{
+		mvOsPrintf("mvPciModeGet: ERR. pPciMode = NULL  \n");
+		return MV_BAD_PARAM;
+	}
+
+	/* Read pci mode register */
+	pciMode = MV_REG_READ(PCI_MODE_REG(pciIf));
+	
+	switch (pciMode & PMR_PCI_MODE_MASK)
+	{
+		case PMR_PCI_MODE_CONV:
+            pPciMode->pciType  = MV_PCI_CONV;
+
+			if (MV_REG_READ(PCI_DLL_CTRL_REG(pciIf)) & PDC_DLL_EN)
+			{
+				pPciMode->pciSpeed = 66000000; /* 66MHZ */
+			}
+			else
+			{
+				pPciMode->pciSpeed = 33000000; /* 33MHZ */
+			}
+			
+			break;
+		
+		case PMR_PCI_MODE_PCIX_66MHZ:	
+			pPciMode->pciType  = MV_PCIX;
+			pPciMode->pciSpeed = 66000000; /* 66MHZ */	
+			break;
+		
+		case PMR_PCI_MODE_PCIX_100MHZ:	
+			pPciMode->pciType  = MV_PCIX;
+			pPciMode->pciSpeed = 100000000; /* 100MHZ */	
+			break;
+		
+		case PMR_PCI_MODE_PCIX_133MHZ:	
+			pPciMode->pciType  = MV_PCIX;
+			pPciMode->pciSpeed = 133000000; /* 133MHZ */	
+			break;
+
+		default:
+			{
+				mvOsPrintf("mvPciModeGet: ERR. Non existing mode !!\n");
+				return MV_ERROR;
+			}
+	}
+
+	switch (pciMode & PMR_PCI_64_MASK)
+	{
+		case PMR_PCI_64_64BIT:
+			pPciMode->pciWidth = MV_PCI_64;
+			break;
+		
+		case PMR_PCI_64_32BIT:
+            pPciMode->pciWidth = MV_PCI_32;
+            break;
+		
+		default:
+			{
+				mvOsPrintf("mvPciModeGet: ERR. Non existing mode !!\n");
+				return MV_ERROR;
+			}
+	}
+	
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvPciRetrySet - Set PCI retry counters
+*
+* DESCRIPTION:
+*       This function specifies the number of times the PCI controller 
+*       retries a transaction before it quits.
+*       Applies to the PCI Master when acting as a requester.
+*       Applies to the PCI slave when acting as a completer (PCI-X mode).
+*       A 0x00 value means a "retry forever".
+*
+* INPUT:
+*       pciIf   - PCI interface number.
+*       counter - Number of times PCI controller retry. Use counter value 
+*                 up to PRR_RETRY_CNTR_MAX.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciRetrySet(MV_U32 pciIf, MV_U32 counter)
+{
+	MV_U32 pciRetry;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciRetrySet: ERR. Invalid PCI interface %d\n", pciIf);
+		return MV_BAD_PARAM;
+	}
+
+	if (counter >= PRR_RETRY_CNTR_MAX)
+	{
+		mvOsPrintf("mvPciRetrySet: ERR. Invalid counter: %d\n", counter);
+		return MV_BAD_PARAM;
+
+	}
+
+	/* Reading PCI retry register */
+    pciRetry  = MV_REG_READ(PCI_RETRY_REG(pciIf));
+
+	pciRetry &= ~PRR_RETRY_CNTR_MASK;
+
+	pciRetry |= (counter << PRR_RETRY_CNTR_OFFS);
+
+	/* write new value */
+	MV_REG_WRITE(PCI_RETRY_REG(pciIf), pciRetry);
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvPciDiscardTimerSet - Set PCI discard timer
+*
+* DESCRIPTION:
+*       This function set PCI discard timer.
+*       In conventional PCI mode:
+*       Specifies the number of PCLK cycles the PCI slave keeps a non-accessed
+*       read buffers (non-completed delayed read) before invalidate the buffer.
+*       Set to '0' to disable the timer. The PCI slave waits for delayed 
+*       read completion forever.
+*       In PCI-X mode:
+*       Specifies the number of PCLK cycles the PCI master waits for split
+*       completion transaction, before it invalidates the pre-allocated read
+*       buffer.
+*       Set to '0' to disable the timer. The PCI master waits for split 
+*       completion forever.
+*       NOTE: Must be set to a number greater than MV_PCI_MAX_DISCARD_CLK, 
+*       unless using the "wait for ever" setting 0x0.
+*       NOTE: Must not be updated while there are pending read requests.
+*
+* INPUT:
+*       pciIf      - PCI interface number.
+*       pClkCycles - Number of PCI clock cycles.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciDiscardTimerSet(MV_U32 pciIf, MV_U32 pClkCycles)
+{
+	MV_U32 pciDiscardTimer;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciDiscardTimerSet: ERR. Invalid PCI interface %d\n", 
+																		pciIf);
+		return MV_BAD_PARAM;
+	}
+
+	if (pClkCycles >= PDTR_TIMER_MIN)
+	{
+		mvOsPrintf("mvPciDiscardTimerSet: ERR. Invalid Clk value: %d\n", 	
+																   pClkCycles);
+		return MV_BAD_PARAM;
+
+	}
+
+	/* Read  PCI Discard Timer */
+	pciDiscardTimer  = MV_REG_READ(PCI_DISCARD_TIMER_REG(pciIf));
+
+	pciDiscardTimer &= ~PDTR_TIMER_MASK;
+
+    pciDiscardTimer |= (pClkCycles << PDTR_TIMER_OFFS);
+
+	/* Write new value */
+	MV_REG_WRITE(PCI_DISCARD_TIMER_REG(pciIf), pciDiscardTimer);
+
+	return MV_OK;
+
+}
+
+/* PCI Arbiter routines */
+
+/*******************************************************************************
+* mvPciArbEnable - PCI arbiter enable/disable
+*
+* DESCRIPTION:
+*       This fuction enable/disables a given PCI interface arbiter.
+*       NOTE: Arbiter setting can not be changed while in work. It should only 
+*             be set once.
+* INPUT:
+*       pciIf  - PCI interface number.
+*       enable - Enable/disable parameter. If enable = MV_TRUE then enable.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvPciArbEnable(MV_U32 pciIf, MV_BOOL enable)
+{
+	MV_U32 regVal;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciArbEnable: ERR. Invalid PCI interface %d\n", pciIf);
+		return MV_ERROR;
+	}
+    	
+    /* Set PCI Arbiter Control register according to default configuration 	*/
+	regVal = MV_REG_READ(PCI_ARBITER_CTRL_REG(pciIf));
+
+	/* Make sure arbiter disabled before changing its values */
+	MV_REG_BIT_RESET(PCI_ARBITER_CTRL_REG(pciIf), PACR_ARB_ENABLE); 
+
+	regVal &= ~PCI_ARBITER_CTRL_DEFAULT_MASK;	
+
+	regVal |= PCI_ARBITER_CTRL_DEFAULT;		/* Set default configuration	*/
+
+	if (MV_TRUE == enable)
+	{
+		regVal |= PACR_ARB_ENABLE; 
+	}
+	else
+	{
+		regVal &= ~PACR_ARB_ENABLE; 
+	}
+
+	/* Write to register 										            */
+	MV_REG_WRITE(PCI_ARBITER_CTRL_REG(pciIf), regVal);
+
+	return MV_OK;	
+}
+
+
+/*******************************************************************************
+* mvPciArbParkDis - Disable arbiter parking on agent
+*
+* DESCRIPTION:
+*       This function disables the PCI arbiter from parking on the given agent
+*       list.
+*
+* INPUT:
+*       pciIf        - PCI interface number.
+*       pciAgentMask - When a bit in the mask is set to '1', parking on 
+*                      the associated PCI master is disabled. Mask bit 
+*                      refers to bit 0 - 6. For example disable parking on PCI
+*                      agent 3 set pciAgentMask 0x4 (bit 3 is set).
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+MV_STATUS mvPciArbParkDis(MV_U32 pciIf, MV_U32 pciAgentMask)
+{
+	MV_U32 pciArbiterCtrl;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciArbParkDis: ERR. Invalid PCI interface %d\n", pciIf);
+		return MV_ERROR;
+	}
+
+	/* Reading Arbiter Control register */
+	pciArbiterCtrl = MV_REG_READ(PCI_ARBITER_CTRL_REG(pciIf));
+
+	/* Arbiter must be disabled before changing parking */
+	MV_REG_BIT_RESET(PCI_ARBITER_CTRL_REG(pciIf), PACR_ARB_ENABLE); 
+
+	/* do the change */
+    pciArbiterCtrl &= ~PACR_PARK_DIS_MASK;
+	pciArbiterCtrl |= (pciAgentMask << PACR_PARK_DIS_OFFS);
+
+	/* writing new value ( if th earbiter was enabled before the change		*/ 
+	/* here it will be reenabled 											*/
+	MV_REG_WRITE(PCI_ARBITER_CTRL_REG(pciIf), pciArbiterCtrl);
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvPciArbBrokDetectSet - Set PCI arbiter broken detection
+*
+* DESCRIPTION:
+*       This function sets the maximum number of cycles that the arbiter 
+*       waits for a PCI master to respond to its grant assertion. If a 
+*       PCI agent fails to respond within this time, the PCI arbiter aborts 
+*       the transaction and performs a new arbitration cycle.
+*       NOTE: Value must be greater than '1' for conventional PCI and 
+*       greater than '5' for PCI-X.
+*
+* INPUT:
+*       pciIf      - PCI interface number.
+*       pClkCycles - Number of PCI clock cycles. If equal to '0' the broken
+*                    master detection is disabled.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciArbBrokDetectSet(MV_U32 pciIf, MV_U32 pClkCycles)
+{
+	MV_U32 pciArbiterCtrl;
+	MV_U32 pciMode;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciArbBrokDetectSet: ERR. Invalid PCI interface %d\n", 
+																		pciIf);
+		return MV_BAD_PARAM;
+	}
+
+	/* Checking PCI mode and if pClkCycles is legal value */
+	pciMode = MV_REG_READ(PCI_MODE_REG(pciIf));
+	pciMode &= PMR_PCI_MODE_MASK;
+
+	if (PMR_PCI_MODE_CONV == pciMode)
+	{
+		if (pClkCycles < PACR_BROKEN_VAL_CONV_MIN) 
+			return MV_ERROR;
+	}
+	else
+	{
+		if (pClkCycles < PACR_BROKEN_VAL_PCIX_MIN) 
+			return MV_ERROR;
+	}
+
+	pClkCycles <<= PACR_BROKEN_VAL_OFFS;
+
+	/* Reading Arbiter Control register */
+	pciArbiterCtrl  = MV_REG_READ(PCI_ARBITER_CTRL_REG(pciIf));
+	pciArbiterCtrl &= ~PACR_BROKEN_VAL_MASK;
+	pciArbiterCtrl |= pClkCycles;
+
+	/* Arbiter must be disabled before changing broken detection */
+	MV_REG_BIT_RESET(PCI_ARBITER_CTRL_REG(pciIf), PACR_ARB_ENABLE); 
+
+	/* writing new value ( if th earbiter was enabled before the change 	*/
+	/* here it will be reenabled 											*/
+
+	MV_REG_WRITE(PCI_ARBITER_CTRL_REG(pciIf), pciArbiterCtrl);
+
+	return MV_OK;
+}
+
+/* PCI configuration space read write */
+
+/*******************************************************************************
+* mvPciConfigRead - Read from configuration space
+*
+* DESCRIPTION:
+*       This function performs a 32 bit read from PCI configuration space.
+*       It supports both type 0 and type 1 of Configuration Transactions 
+*       (local and over bridge). In order to read from local bus segment, use 
+*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
+*       will result configuration transaction of type 1 (over bridge).
+*
+* INPUT:
+*       pciIf   - PCI interface number.
+*       bus     - PCI segment bus number.
+*       dev     - PCI device number.
+*       func    - Function number.
+*       regOffs - Register offset.       
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit register data, 0xffffffff on error
+*
+*******************************************************************************/
+MV_U32 mvPciConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
+                        MV_U32 regOff)
+{
+	MV_U32 pciData = 0;
+
+	/* Parameter checking   */
+	if (PCI_DEFAULT_IF != pciIf)
+	{
+		if (pciIf >= mvCtrlPciMaxIfGet())
+		{
+			mvOsPrintf("mvPciConfigRead: ERR. Invalid PCI interface %d\n",pciIf);
+			return 0xFFFFFFFF;
+		}
+	}
+
+	if (dev >= MAX_PCI_DEVICES)
+	{
+		DB(mvOsPrintf("mvPciConfigRead: ERR. device number illigal %d\n", dev));
+		return 0xFFFFFFFF;
+	}
+	
+	if (func >= MAX_PCI_FUNCS)
+	{
+		DB(mvOsPrintf("mvPciConfigRead: ERR. function number illigal %d\n", func));
+		return 0xFFFFFFFF;
+	}
+	
+	if (bus >= MAX_PCI_BUSSES)
+	{
+		DB(mvOsPrintf("mvPciConfigRead: ERR. bus number illigal %d\n", bus));
+		return MV_ERROR;
+	}
+
+
+	/* Creating PCI address to be passed */
+	pciData |= (bus << PCAR_BUS_NUM_OFFS);
+	pciData |= (dev << PCAR_DEVICE_NUM_OFFS);
+	pciData |= (func << PCAR_FUNC_NUM_OFFS);
+	pciData |= (regOff & PCAR_REG_NUM_MASK);
+
+	pciData |= PCAR_CONFIG_EN; 
+	
+	/* Write the address to the PCI configuration address register */
+	MV_REG_WRITE(PCI_CONFIG_ADDR_REG(pciIf), pciData);
+
+	/* In order to let the PCI controller absorbed the address of the read 	*/
+	/* transaction we perform a validity check that the address was written */
+	if(pciData != MV_REG_READ(PCI_CONFIG_ADDR_REG(pciIf)))
+	{
+		return MV_ERROR;
+	}
+	/* Read the Data returned in the PCI Data register */
+	pciData = MV_REG_READ(PCI_CONFIG_DATA_REG(pciIf));
+
+	return pciData;
+}
+
+/*******************************************************************************
+* mvPciConfigWrite - Write to configuration space
+*
+* DESCRIPTION:
+*       This function performs a 32 bit write to PCI configuration space.
+*       It supports both type 0 and type 1 of Configuration Transactions 
+*       (local and over bridge). In order to write to local bus segment, use 
+*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
+*       will result configuration transaction of type 1 (over bridge).
+*
+* INPUT:
+*       pciIf   - PCI interface number.
+*       bus     - PCI segment bus number.
+*       dev     - PCI device number.
+*       func    - Function number.
+*       regOffs - Register offset.       
+*       data    - 32bit data.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev, 
+                           MV_U32 func, MV_U32 regOff, MV_U32 data)
+{
+	MV_U32 pciData = 0;
+
+	/* Parameter checking   */
+	if (PCI_DEFAULT_IF != pciIf)
+	{
+		if (pciIf >= mvCtrlPciMaxIfGet())
+		{
+			mvOsPrintf("mvPciConfigWrite: ERR. Invalid PCI interface %d\n", 
+																		pciIf);
+			return 0xFFFFFFFF;
+		}
+	}
+
+	if (dev >= MAX_PCI_DEVICES)
+	{
+		mvOsPrintf("mvPciConfigWrite: ERR. device number illigal %d\n",dev);
+		return MV_BAD_PARAM;
+	}
+
+	if (func >= MAX_PCI_FUNCS)
+	{
+		mvOsPrintf("mvPciConfigWrite: ERR. function number illigal %d\n", func);
+		return MV_ERROR;
+	}
+
+	if (bus >= MAX_PCI_BUSSES)
+	{
+		mvOsPrintf("mvPciConfigWrite: ERR. bus number illigal %d\n", bus);
+		return MV_ERROR;
+	}
+
+	/* Creating PCI address to be passed */
+	pciData |= (bus << PCAR_BUS_NUM_OFFS);
+	pciData |= (dev << PCAR_DEVICE_NUM_OFFS);
+	pciData |= (func << PCAR_FUNC_NUM_OFFS);
+	pciData |= (regOff & PCAR_REG_NUM_MASK);
+
+	pciData |= PCAR_CONFIG_EN;
+	
+	/* Write the address to the PCI configuration address register */
+	MV_REG_WRITE(PCI_CONFIG_ADDR_REG(pciIf), pciData);
+
+	/* In order to let the PCI controller absorbed the address of the read 	*/
+	/* transaction we perform a validity check that the address was written */
+	if(pciData != MV_REG_READ(PCI_CONFIG_ADDR_REG(pciIf)))
+	{
+		return MV_ERROR;
+	}
+
+	/* Write the Data passed to the PCI Data register */
+	MV_REG_WRITE(PCI_CONFIG_DATA_REG(pciIf), data);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvPciMasterEnable - Enable/disale PCI interface master transactions.
+*
+* DESCRIPTION:
+*       This function performs read modified write to PCI command status 
+*       (offset 0x4) to set/reset bit 2. After this bit is set, the PCI 
+*       master is allowed to gain ownership on the bus, otherwise it is 
+*       incapable to do so.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciMasterEnable(MV_U32 pciIf, MV_BOOL enable)
+{
+	MV_U32 pciCommandStatus;
+	MV_U32 RegOffs;
+	MV_U32 localBus;
+	MV_U32 localDev;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciMasterEnable: ERR. Invalid PCI interface %d\n", pciIf);
+		return MV_ERROR;
+	}
+
+	localBus = mvPciLocalBusNumGet(pciIf);
+	localDev = mvPciLocalDevNumGet(pciIf);
+	
+	RegOffs = PCI_STATUS_AND_COMMAND;
+
+	pciCommandStatus = mvPciConfigRead(pciIf, localBus, localDev, 0, RegOffs);
+
+	if (MV_TRUE == enable)
+	{
+		pciCommandStatus |= PSCR_MASTER_EN;
+	}
+	else
+	{
+		pciCommandStatus &= ~PSCR_MASTER_EN;
+	}
+
+	mvPciConfigWrite(pciIf, localBus, localDev, 0, RegOffs, pciCommandStatus);
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvPciSlaveEnable - Enable/disale PCI interface slave transactions.
+*
+* DESCRIPTION:
+*       This function performs read modified write to PCI command status 
+*       (offset 0x4) to set/reset bit 0 and 1. After those bits are set, 
+*       the PCI slave is allowed to respond to PCI IO space access (bit 0) 
+*       and PCI memory space access (bit 1). 
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       dev     - PCI device number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciSlaveEnable(MV_U32 pciIf, MV_U32 bus, MV_U32 dev, MV_BOOL enable)
+{
+	MV_U32 pciCommandStatus;
+	MV_U32 RegOffs;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciSlaveEnable: ERR. Invalid PCI interface %d\n", pciIf);
+		return MV_BAD_PARAM;
+	}
+	if (dev >= MAX_PCI_DEVICES)
+	{
+		mvOsPrintf("mvPciLocalDevNumSet: ERR. device number illigal %d\n", dev);
+		return MV_BAD_PARAM;
+
+	}
+
+	RegOffs = PCI_STATUS_AND_COMMAND;
+	
+	pciCommandStatus=mvPciConfigRead(pciIf, bus, dev, 0, RegOffs);
+
+    if (MV_TRUE == enable)
+	{
+		pciCommandStatus |= (PSCR_IO_EN | PSCR_MEM_EN);
+	}
+	else                             
+	{
+		pciCommandStatus &= ~(PSCR_IO_EN | PSCR_MEM_EN);
+	}
+
+	mvPciConfigWrite(pciIf, bus, dev, 0, RegOffs, pciCommandStatus);
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvPciLocalBusNumSet - Set PCI interface local bus number.
+*
+* DESCRIPTION:
+*       This function sets given PCI interface its local bus number.
+*       Note: In case the PCI interface is PCI-X, the information is read-only.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       busNum - Bus number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_NOT_ALLOWED in case PCI interface is PCI-X. 
+*       MV_BAD_PARAM on bad parameters ,
+*       otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum)
+{
+	MV_U32 pciP2PConfig;
+	MV_PCI_MODE pciMode;
+	MV_U32 localBus;
+	MV_U32 localDev;
+
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciLocalBusNumSet: ERR. Invalid PCI interface %d\n",pciIf);
+		return MV_BAD_PARAM;
+	}
+	if (busNum >= MAX_PCI_BUSSES)
+	{
+		mvOsPrintf("mvPciLocalBusNumSet: ERR. bus number illigal %d\n", busNum);
+		return MV_ERROR;
+
+	}
+
+	localBus = mvPciLocalBusNumGet(pciIf);
+	localDev = mvPciLocalDevNumGet(pciIf);
+
+
+	/* PCI interface mode */
+	mvPciModeGet(pciIf, &pciMode);
+
+	/* if PCI type is PCI-X then it is not allowed to change the dev number */
+	if (MV_PCIX == pciMode.pciType)
+	{
+		pciP2PConfig = mvPciConfigRead(pciIf, localBus, localDev, 0, PCIX_STATUS );
+
+		pciP2PConfig &= ~PXS_BN_MASK;
+
+		pciP2PConfig |= (busNum << PXS_BN_OFFS) & PXS_BN_MASK;
+
+		mvPciConfigWrite(pciIf, localBus, localDev, 0, PCIX_STATUS,pciP2PConfig );
+
+	}
+	else
+	{
+		pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
+
+		pciP2PConfig &= ~PPCR_BUS_NUM_MASK;
+
+		pciP2PConfig |= (busNum << PPCR_BUS_NUM_OFFS) & PPCR_BUS_NUM_MASK;
+
+		MV_REG_WRITE(PCI_P2P_CONFIG_REG(pciIf), pciP2PConfig);
+
+	}
+
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvPciLocalBusNumGet - Get PCI interface local bus number.
+*
+* DESCRIPTION:
+*       This function gets the local bus number of a given PCI interface.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Local bus number.0xffffffff on Error
+*
+*******************************************************************************/
+MV_U32 mvPciLocalBusNumGet(MV_U32 pciIf)
+{
+	MV_U32 pciP2PConfig;
+
+	/* Parameter checking   */
+	if (PCI_DEFAULT_IF != pciIf)
+	{
+		if (pciIf >= mvCtrlPciMaxIfGet())
+		{
+			mvOsPrintf("mvPciLocalBusNumGet: ERR. Invalid PCI interface %d\n", 
+													   					pciIf);
+			return 0xFFFFFFFF;
+		}
+	}
+
+	pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
+	pciP2PConfig &= PPCR_BUS_NUM_MASK;
+	return (pciP2PConfig >> PPCR_BUS_NUM_OFFS);
+}
+
+
+/*******************************************************************************
+* mvPciLocalDevNumSet - Set PCI interface local device number.
+*
+* DESCRIPTION:
+*       This function sets given PCI interface its local device number.
+*       Note: In case the PCI interface is PCI-X, the information is read-only.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*       devNum - Device number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_NOT_ALLOWED in case PCI interface is PCI-X. MV_BAD_PARAM on bad parameters ,
+*       otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPciLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum)
+{
+	MV_U32 pciP2PConfig;
+	MV_PCI_MODE pciMode;
+	MV_U32 localBus;
+	MV_U32 localDev;
+
+	/* Parameter checking   */
+	if (pciIf >= mvCtrlPciMaxIfGet())
+	{
+		mvOsPrintf("mvPciLocalDevNumSet: ERR. Invalid PCI interface %d\n",pciIf);
+		return MV_BAD_PARAM;
+	}
+	if (devNum >= MAX_PCI_DEVICES)
+	{
+		mvOsPrintf("mvPciLocalDevNumSet: ERR. device number illigal %d\n", 
+																	   devNum);
+		return MV_BAD_PARAM;
+
+	}
+	
+	localBus = mvPciLocalBusNumGet(pciIf);
+	localDev = mvPciLocalDevNumGet(pciIf);
+
+	/* PCI interface mode */
+	mvPciModeGet(pciIf, &pciMode);
+
+	/* if PCI type is PCIX then it is not allowed to change the dev number */
+	if (MV_PCIX == pciMode.pciType)
+	{
+		pciP2PConfig = mvPciConfigRead(pciIf, localBus, localDev, 0, PCIX_STATUS );
+
+		pciP2PConfig &= ~PXS_DN_MASK;
+
+		pciP2PConfig |= (devNum << PXS_DN_OFFS) & PXS_DN_MASK;
+
+		mvPciConfigWrite(pciIf,localBus, localDev, 0, PCIX_STATUS,pciP2PConfig );
+	}
+	else
+	{
+		pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
+
+		pciP2PConfig &= ~PPCR_DEV_NUM_MASK;
+
+		pciP2PConfig |= (devNum << PPCR_DEV_NUM_OFFS) & PPCR_DEV_NUM_MASK;
+
+		MV_REG_WRITE(PCI_P2P_CONFIG_REG(pciIf), pciP2PConfig);
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvPciLocalDevNumGet - Get PCI interface local device number.
+*
+* DESCRIPTION:
+*       This function gets the local device number of a given PCI interface.
+*
+* INPUT:
+*       pciIf  - PCI interface number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Local device number. 0xffffffff on Error
+*
+*******************************************************************************/
+MV_U32 mvPciLocalDevNumGet(MV_U32 pciIf)
+{
+	MV_U32 pciP2PConfig;
+
+	/* Parameter checking   */
+	
+	if (PCI_DEFAULT_IF != pciIf)
+	{
+		if (pciIf >= mvCtrlPciMaxIfGet())
+		{
+			mvOsPrintf("mvPciLocalDevNumGet: ERR. Invalid PCI interface %d\n", 
+																   		pciIf);
+			return 0xFFFFFFFF;
+		}
+	}
+	
+	pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
+
+	pciP2PConfig &= PPCR_DEV_NUM_MASK;
+
+	return (pciP2PConfig >> PPCR_DEV_NUM_OFFS);
+}
+
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h
new file mode 100644
index 00000000..47463362
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h
@@ -0,0 +1,185 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#ifndef __INCPCIH
+#define __INCPCIH
+
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "pci/mvPciRegs.h"
+
+
+/* NOTE not supported in this driver:
+
+ Built In Self Test (BIST)
+ Vital Product Data (VPD)
+ Message Signaled Interrupt (MSI)
+ Power Management
+ Compact PCI Hot Swap
+ Header retarget
+ 
+Registers not supported: 
+1) PCI DLL Status and Control (PCI0 0x1D20, PCI1 0x1DA0)
+2) PCI/MPP Pads Calibration (CI0/MPP[31:16] 0x1D1C, PCI1/MPP[15:0] 0X1D9C)
+*/  
+
+/* defines */
+/* The number of supported PCI interfaces depend on Marvell controller 		*/
+/* device number. This device number ID is located on the PCI unit 			*/
+/* configuration header. This creates a loop where calling PCI 				*/
+/* configuration read/write	routine results a call to get PCI configuration */
+/* information etc. This macro defines a default PCI interface. This PCI	*/
+/* interface is sure to exist.												*/
+#define PCI_DEFAULT_IF	0
+
+
+/* typedefs */
+/* The Marvell controller supports both conventional PCI and PCI-X.         */
+/* This enumeration describes the PCI type.                                 */
+typedef enum _mvPciType
+{
+    MV_PCI_CONV,    /* Conventional PCI */
+    MV_PCIX         /* PCI-X            */
+}MV_PCI_TYPE;
+
+typedef enum _mvPciMod
+{
+	MV_PCI_MOD_HOST,
+	MV_PCI_MOD_DEVICE
+}MV_PCI_MOD;
+
+
+/* The Marvell controller supports both PCI width of 32 and 64 bit.         */
+/* This enumerator describes PCI width                                      */
+typedef enum _mvPciWidth
+{
+    MV_PCI_32,  /* PCI width 32bit  */
+    MV_PCI_64   /* PCI width 64bit  */
+}MV_PCI_WIDTH;
+
+/* This structure describes the PCI unit configured type, speed and width.  */
+typedef struct _mvPciMode
+{
+    MV_PCI_TYPE  pciType;    /* PCI type                                    */
+    MV_U32       pciSpeed;   /* Assuming PCI base clock on board is 33MHz   */
+    MV_PCI_WIDTH pciWidth;   /* PCI bus width                               */
+}MV_PCI_MODE;
+
+/* mvPciInit - Initialize PCI interfaces*/
+MV_VOID mvPciHalInit(MV_U32 pciIf, MV_PCI_MOD pciIfmod);
+
+/* mvPciCommandSet - Set PCI comman register value.*/
+MV_STATUS mvPciCommandSet(MV_U32 pciIf, MV_U32 command);
+
+/* mvPciModeGet - Get PCI interface mode.*/
+MV_STATUS mvPciModeGet(MV_U32 pciIf, MV_PCI_MODE *pPciMode);
+
+/* mvPciRetrySet - Set PCI retry counters*/
+MV_STATUS mvPciRetrySet(MV_U32 pciIf, MV_U32 counter);
+
+/* mvPciDiscardTimerSet - Set PCI discard timer*/
+MV_STATUS mvPciDiscardTimerSet(MV_U32 pciIf, MV_U32 pClkCycles);
+
+/* mvPciArbEnable - PCI arbiter enable/disable*/
+MV_STATUS mvPciArbEnable(MV_U32 pciIf, MV_BOOL enable);
+
+/* mvPciArbParkDis - Disable arbiter parking on agent */
+MV_STATUS mvPciArbParkDis(MV_U32 pciIf, MV_U32 pciAgentMask);
+
+/* mvPciArbBrokDetectSet - Set PCI arbiter broken detection */
+MV_STATUS mvPciArbBrokDetectSet(MV_U32 pciIf, MV_U32 pClkCycles);
+
+/* mvPciConfigRead - Read from configuration space */
+MV_U32 mvPciConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
+						MV_U32 func,MV_U32 regOff);
+
+/* mvPciConfigWrite - Write to configuration space */
+MV_STATUS mvPciConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
+                           MV_U32 func, MV_U32 regOff, MV_U32 data);
+
+/* mvPciMasterEnable - Enable/disale PCI interface master transactions.*/
+MV_STATUS mvPciMasterEnable(MV_U32 pciIf, MV_BOOL enable);
+
+/* mvPciSlaveEnable - Enable/disale PCI interface slave transactions.*/
+MV_STATUS mvPciSlaveEnable(MV_U32 pciIf, MV_U32 bus, MV_U32 dev,MV_BOOL enable);
+
+/* mvPciLocalBusNumSet - Set PCI interface local bus number.*/
+MV_STATUS mvPciLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum);
+
+/* mvPciLocalBusNumGet - Get PCI interface local bus number.*/
+MV_U32 mvPciLocalBusNumGet(MV_U32 pciIf);
+
+/* mvPciLocalDevNumSet - Set PCI interface local device number.*/
+MV_STATUS mvPciLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum);
+
+/* mvPciLocalDevNumGet - Get PCI interface local device number.*/
+MV_U32 mvPciLocalDevNumGet(MV_U32 pciIf);
+
+
+#endif /* #ifndef __INCPCIH */
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h
new file mode 100644
index 00000000..89d0ef12
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h
@@ -0,0 +1,411 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCPCIREGSH
+#define __INCPCIREGSH
+
+
+#include "pci-if/mvPciIfRegs.h"
+/* defines */
+#define MAX_PCI_DEVICES         32
+#define MAX_PCI_FUNCS           8
+#define MAX_PCI_BUSSES          128
+
+/* enumerators */
+
+/* This enumerator described the possible PCI slave targets.    	   */
+/* PCI slave targets are designated memory/IO address spaces that the  */
+/* PCI slave targets can access. They are also refered as "targets"    */
+/* this enumeratoe order is determined by the content of : 
+		PCI_BASE_ADDR_ENABLE_REG 				 					*/
+
+
+/* registers offsetes defines */
+
+
+
+/*************************/
+/* PCI control registers */
+/*************************/
+/* maen : should add new registers */
+#define PCI_CMD_REG(pciIf)				 		(0x30c00  + ((pciIf) * 0x80))
+#define PCI_MODE_REG(pciIf)				 		(0x30d00  + ((pciIf) * 0x80))
+#define PCI_RETRY_REG(pciIf)					(0x30c04  + ((pciIf) * 0x80))
+#define PCI_DISCARD_TIMER_REG(pciIf)			(0x30d04  + ((pciIf) * 0x80))
+#define PCI_ARBITER_CTRL_REG(pciIf)				(0x31d00 + ((pciIf) * 0x80))
+#define PCI_P2P_CONFIG_REG(pciIf)				(0x31d14 + ((pciIf) * 0x80))
+#define PCI_ACCESS_CTRL_BASEL_REG(pciIf, targetWin) \
+							(0x31e00 + ((pciIf) * 0x80) + ((targetWin) * 0x10))
+#define PCI_ACCESS_CTRL_BASEH_REG(pciIf, targetWin) \
+							(0x31e04 + ((pciIf) * 0x80) + ((targetWin) * 0x10))
+#define PCI_ACCESS_CTRL_SIZE_REG(pciIf, targetWin)	\
+							(0x31e08 + ((pciIf) * 0x80) + ((targetWin) * 0x10))
+							
+#define PCI_DLL_CTRL_REG(pciIf)	   		 		(0x31d20  + ((pciIf) * 0x80))
+
+/* PCI Dll Control (PDC)*/
+#define PDC_DLL_EN					BIT0
+
+
+/* PCI Command Register (PCR) */
+#define PCR_MASTER_BYTE_SWAP_EN     BIT0
+#define PCR_MASTER_WR_COMBINE_EN    BIT4
+#define PCR_MASTER_RD_COMBINE_EN    BIT5
+#define PCR_MASTER_WR_TRIG_WHOLE    BIT6
+#define PCR_MASTER_RD_TRIG_WHOLE    BIT7
+#define PCR_MASTER_MEM_RD_LINE_EN   BIT8
+#define PCR_MASTER_MEM_RD_MULT_EN   BIT9
+#define PCR_MASTER_WORD_SWAP_EN     BIT10
+#define PCR_SLAVE_WORD_SWAP_EN      BIT11
+#define PCR_NS_ACCORDING_RCV_TRANS  BIT14
+#define PCR_MASTER_PCIX_REQ64N_EN   BIT15
+#define PCR_SLAVE_BYTE_SWAP_EN      BIT16
+#define PCR_MASTER_DAC_EN           BIT17
+#define PCR_MASTER_M64_ALLIGN       BIT18
+#define PCR_ERRORS_PROPAGATION_EN   BIT19
+#define PCR_SLAVE_SWAP_ENABLE       BIT20
+#define PCR_MASTER_SWAP_ENABLE      BIT21
+#define PCR_MASTER_INT_SWAP_EN      BIT22
+#define PCR_LOOP_BACK_ENABLE        BIT23
+#define PCR_SLAVE_INTREG_SWAP_OFFS  24
+#define PCR_SLAVE_INTREG_SWAP_MASK  0x3
+#define PCR_SLAVE_INTREG_BYTE_SWAP  \
+                             (MV_BYTE_SWAP << PCR_SLAVE_INT_REG_SWAP_MASK)
+#define PCR_SLAVE_INTREG_NO_SWAP    \
+                             (MV_NO_SWAP   << PCR_SLAVE_INT_REG_SWAP_MASK)
+#define PCR_SLAVE_INTREG_BYTE_WORD  \
+                             (MV_BYTE_WORD_SWAP << PCR_SLAVE_INT_REG_SWAP_MASK)
+#define PCR_SLAVE_INTREG_WORD_SWAP  \
+                             (MV_WORD_SWAP << PCR_SLAVE_INT_REG_SWAP_MASK)
+#define PCR_RESET_REASSERTION_EN    BIT26
+#define PCR_PCI_TO_CPU_REG_ORDER_EN BIT28
+#define PCR_CPU_TO_PCI_ORDER_EN     BIT29
+#define PCR_PCI_TO_CPU_ORDER_EN     BIT30
+
+/* PCI Mode Register (PMR) */
+#define PMR_PCI_ID_OFFS 			0  /* PCI Interface ID */
+#define PMR_PCI_ID_MASK 			(0x1 << PMR_PCI_ID_OFFS)
+#define PMR_PCI_ID_PCI(pciNum) 		((pciNum) << PCI_MODE_PCIID_OFFS)
+
+#define PMR_PCI_64_OFFS				2 	/* 64-bit PCI Interface */
+#define PMR_PCI_64_MASK				(0x1 << PMR_PCI_64_OFFS)
+#define PMR_PCI_64_64BIT			(0x1 << PMR_PCI_64_OFFS)
+#define PMR_PCI_64_32BIT			(0x0 << PMR_PCI_64_OFFS)
+
+#define PMR_PCI_MODE_OFFS			4 	/* PCI interface mode of operation */
+#define PMR_PCI_MODE_MASK			(0x3 << PMR_PCI_MODE_OFFS)
+#define PMR_PCI_MODE_CONV			(0x0 << PMR_PCI_MODE_OFFS)
+#define PMR_PCI_MODE_PCIX_66MHZ		(0x1 << PMR_PCI_MODE_OFFS)
+#define PMR_PCI_MODE_PCIX_100MHZ	(0x2 << PMR_PCI_MODE_OFFS)
+#define PMR_PCI_MODE_PCIX_133MHZ	(0x3 << PMR_PCI_MODE_OFFS)
+
+#define PMR_EXP_ROM_SUPPORT			BIT8	/* Expansion ROM Active */
+
+#define PMR_PCI_RESET_OFFS			31 /* PCI Interface Reset Indication */
+#define PMR_PCI_RESET_MASK			(0x1 << PMR_PCI_RESET_OFFS)
+#define PMR_PCI_RESET_PCIXRST		(0x0 << PMR_PCI_RESET_OFFS)
+
+
+/* PCI Retry Register (PRR) */
+#define PRR_RETRY_CNTR_OFFS			16 /* Retry Counter */
+#define PRR_RETRY_CNTR_MAX			0xff
+#define PRR_RETRY_CNTR_MASK			(PRR_RETRY_CNTR_MAX << PRR_RETRY_CNTR_OFFS)
+
+
+/* PCI Discard Timer Register (PDTR) */
+#define PDTR_TIMER_OFFS				0	/* Timer */
+#define PDTR_TIMER_MAX				0xffff
+#define PDTR_TIMER_MIN				0x7F
+#define PDTR_TIMER_MASK				(PDTR_TIMER_MAX << PDTR_TIMER_OFFS)
+
+
+/* PCI Arbiter Control Register (PACR) */
+#define PACR_BROKEN_DETECT_EN		BIT1	/* Broken Detection Enable */
+
+#define PACR_BROKEN_VAL_OFFS		3	/* Broken Value */
+#define PACR_BROKEN_VAL_MASK		(0xf << PACR_BROKEN_VAL_OFFS)
+#define PACR_BROKEN_VAL_CONV_MIN	0x2
+#define PACR_BROKEN_VAL_PCIX_MIN	0x6
+
+#define PACR_PARK_DIS_OFFS		14	/* Parking Disable */
+#define PACR_PARK_DIS_MAX_AGENT	0x3f
+#define PACR_PARK_DIS_MASK		(PACR_PARK_DIS_MAX_AGENT<<PACR_PARK_DIS_OFFS)
+#define PACR_PARK_DIS(agent)	((1 << (agent)) << PACR_PARK_DIS_OFFS)
+
+#define PACR_ARB_ENABLE				BIT31	/* Enable Internal Arbiter */
+
+
+/* PCI P2P Configuration Register (PPCR) */
+#define PPCR_2ND_BUS_L_OFFS			0	/* 2nd PCI Interface Bus Range Lower */
+#define PPCR_2ND_BUS_L_MASK			(0xff << PPCR_2ND_BUS_L_OFFS)
+
+#define PPCR_2ND_BUS_H_OFFS			8	/* 2nd PCI Interface Bus Range Upper */
+#define PPCR_2ND_BUS_H_MASK			(0xff << PPCR_2ND_BUS_H_OFFS)
+
+#define PPCR_BUS_NUM_OFFS			16  /* The PCI interface's Bus number */
+#define PPCR_BUS_NUM_MASK			(0xff << PPCR_BUS_NUM_OFFS)
+
+#define PPCR_DEV_NUM_OFFS			24  /* The PCI interface’s Device number */
+#define PPCR_DEV_NUM_MASK			(0xff << PPCR_DEV_NUM_OFFS)
+
+
+/* PCI Access Control Base Low Register (PACBLR) */
+#define PACBLR_EN					BIT0 /* Access control window enable */
+
+#define PACBLR_ACCPROT				BIT4 /* Access Protect */
+#define PACBLR_WRPROT				BIT5 /* Write Protect */
+
+#define PACBLR_PCISWAP_OFFS			6 	 /* PCI slave Data Swap Control */
+#define PACBLR_PCISWAP_MASK			(0x3 << PACBLR_PCISWAP_OFFS)
+#define PACBLR_PCISWAP_BYTE			(0x0 << PACBLR_PCISWAP_OFFS)
+#define PACBLR_PCISWAP_NO_SWAP		(0x1 << PACBLR_PCISWAP_OFFS)
+#define PACBLR_PCISWAP_BYTE_WORD	(0x2 << PACBLR_PCISWAP_OFFS)
+#define PACBLR_PCISWAP_WORD			(0x3 << PACBLR_PCISWAP_OFFS)
+
+#define PACBLR_RDMBURST_OFFS		8 /* Read Max Burst */
+#define PACBLR_RDMBURST_MASK		(0x3 << PACBLR_RDMBURST_OFFS)
+#define PACBLR_RDMBURST_32BYTE		(0x0 << PACBLR_RDMBURST_OFFS)
+#define PACBLR_RDMBURST_64BYTE		(0x1 << PACBLR_RDMBURST_OFFS)
+#define PACBLR_RDMBURST_128BYTE		(0x2 << PACBLR_RDMBURST_OFFS)
+
+#define PACBLR_RDSIZE_OFFS			10 /* Typical PCI read transaction Size. */
+#define PACBLR_RDSIZE_MASK			(0x3 << PACBLR_RDSIZE_OFFS)
+#define PACBLR_RDSIZE_32BYTE		(0x0 << PACBLR_RDSIZE_OFFS)
+#define PACBLR_RDSIZE_64BYTE		(0x1 << PACBLR_RDSIZE_OFFS)
+#define PACBLR_RDSIZE_128BYTE		(0x2 << PACBLR_RDSIZE_OFFS)
+#define PACBLR_RDSIZE_256BYTE		(0x3 << PACBLR_RDSIZE_OFFS)
+
+#define PACBLR_BASE_L_OFFS			12	/* Corresponds to address bits [31:12] */
+#define PACBLR_BASE_L_MASK			(0xfffff << PACBLR_BASE_L_OFFS)
+#define PACBLR_BASE_L_ALIGNMENT		(1 << PACBLR_BASE_L_OFFS)
+#define PACBLR_BASE_ALIGN_UP(base)  \
+                             ((base+PACBLR_BASE_L_ALIGNMENT)&PACBLR_BASE_L_MASK)
+#define PACBLR_BASE_ALIGN_DOWN(base)  (base & PACBLR_BASE_L_MASK)
+
+
+/* PCI Access Control Base High Register (PACBHR) 	*/
+#define PACBHR_BASE_H_OFFS			0	/* Corresponds to address bits [63:32] */
+#define PACBHR_CTRL_BASE_H_MASK		(0xffffffff << PACBHR_BASE_H_OFFS)
+
+/* PCI Access Control Size Register (PACSR) 		*/
+#define PACSR_WRMBURST_OFFS			8 /* Write Max Burst */
+#define PACSR_WRMBURST_MASK			(0x3 << PACSR_WRMBURST_OFFS)
+#define PACSR_WRMBURST_32BYTE		(0x0 << PACSR_WRMBURST_OFFS)
+#define PACSR_WRMBURST_64BYTE		(0x1 << PACSR_WRMBURST_OFFS)
+#define PACSR_WRMBURST_128BYTE		(0x2 << PACSR_WRMBURST_OFFS)
+
+#define PACSR_PCI_ORDERING			BIT11 /* PCI Ordering required */
+
+#define PACSR_SIZE_OFFS				12	/* PCI access window size */
+#define PACSR_SIZE_MASK				(0xfffff << PACSR_SIZE_OFFS)
+#define PACSR_SIZE_ALIGNMENT		(1 << PACSR_SIZE_OFFS)
+#define PACSR_SIZE_ALIGN_UP(size)   \
+                                   ((size+PACSR_SIZE_ALIGNMENT)&PACSR_SIZE_MASK)
+#define PACSR_SIZE_ALIGN_DOWN(size) (size & PACSR_SIZE_MASK)
+
+
+/***************************************/
+/* PCI Configuration Access Registers  */
+/***************************************/
+
+#define PCI_CONFIG_ADDR_REG(pciIf)	(0x30C78 - ((pciIf) * 0x80) )
+#define PCI_CONFIG_DATA_REG(pciIf)	(0x30C7C - ((pciIf) * 0x80) )
+#define PCI_INT_ACK_REG(pciIf)		(0x30C34 + ((pciIf) * 0x80) )
+
+/* PCI Configuration Address Register (PCAR) */
+#define PCAR_REG_NUM_OFFS			2
+#define PCAR_REG_NUM_MASK			(0x3F << PCAR_REG_NUM_OFFS)
+		
+#define PCAR_FUNC_NUM_OFFS			8
+#define PCAR_FUNC_NUM_MASK			(0x7 << PCAR_FUNC_NUM_OFFS)
+		
+#define PCAR_DEVICE_NUM_OFFS		11
+#define PCAR_DEVICE_NUM_MASK		(0x1F << PCAR_DEVICE_NUM_OFFS)
+		
+#define PCAR_BUS_NUM_OFFS			16
+#define PCAR_BUS_NUM_MASK			(0xFF << PCAR_BUS_NUM_OFFS)
+		
+#define PCAR_CONFIG_EN				BIT31
+
+
+/***************************************/
+/* PCI Configuration registers */
+/***************************************/
+
+/*********************************************/
+/* PCI Configuration, Function 0, Registers  */
+/*********************************************/
+
+/* Marvell Specific */
+#define PCI_SCS0_BASE_ADDR_LOW			   			0x010
+#define PCI_SCS0_BASE_ADDR_HIGH			   			0x014
+#define PCI_SCS1_BASE_ADDR_LOW		  				0x018
+#define PCI_SCS1_BASE_ADDR_HIGH			  			0x01C
+#define PCI_INTER_REG_MEM_MAPPED_BASE_ADDR_L 		0x020
+#define PCI_INTER_REG_MEM_MAPPED_BASE_ADDR_H		0x024
+
+/* capability list */
+#define PCI_POWER_MNG_CAPABILITY		            0x040
+#define PCI_POWER_MNG_STATUS_CONTROL		        0x044
+#define PCI_VPD_ADDRESS_REG	                        0x048
+#define PCI_VPD_DATA_REG	                        0x04c
+#define PCI_MSI_MESSAGE_CONTROL						0x050
+#define PCI_MSI_MESSAGE_ADDR		                0x054
+#define PCI_MSI_MESSAGE_UPPER_ADDR		            0x058
+#define PCI_MSI_MESSAGE_DATA		                0x05c
+#define PCIX_COMMAND		                        0x060
+#define PCIX_STATUS		                            0x064
+#define PCI_COMPACT_PCI_HOT_SWAP		            0x068
+
+
+/*********************************************/
+/* PCI Configuration, Function 1, Registers  */
+/*********************************************/
+
+#define PCI_SCS2_BASE_ADDR_LOW						0x10
+#define PCI_SCS2_BASE_ADDR_HIGH						0x14
+#define PCI_SCS3_BASE_ADDR_LOW		 				0x18
+#define PCI_SCS3_BASE_ADDR_HIGH						0x1c
+
+
+/***********************************************/
+/*  PCI Configuration, Function 2, Registers   */
+/***********************************************/
+
+#define PCI_DEVCS0_BASE_ADDR_LOW					0x10
+#define PCI_DEVCS0_BASE_ADDR_HIGH		 			0x14
+#define PCI_DEVCS1_BASE_ADDR_LOW		 			0x18
+#define PCI_DEVCS1_BASE_ADDR_HIGH		      		0x1c
+#define PCI_DEVCS2_BASE_ADDR_LOW		 			0x20
+#define PCI_DEVCS2_BASE_ADDR_HIGH		      		0x24
+
+/***********************************************/
+/*  PCI Configuration, Function 3, Registers   */
+/***********************************************/
+
+#define PCI_BOOTCS_BASE_ADDR_LOW					0x18
+#define PCI_BOOTCS_BASE_ADDR_HIGH		      		0x1c
+
+/***********************************************/
+/*  PCI Configuration, Function 4, Registers   */
+/***********************************************/
+
+#define PCI_P2P_MEM0_BASE_ADDR_LOW				   	0x10
+#define PCI_P2P_MEM0_BASE_ADDR_HIGH		 			0x14
+#define PCI_P2P_IO_BASE_ADDR		               	0x20
+#define PCI_INTER_REGS_IO_MAPPED_BASE_ADDR		   0x24
+
+/* PCIX_STATUS  register fields (PXS) */
+
+#define PXS_FN_OFFS		0	/* Description Number */
+#define PXS_FN_MASK		(0x7 << PXS_FN_OFFS)
+
+#define PXS_DN_OFFS		3	/* Device Number */
+#define PXS_DN_MASK		(0x1f << PXS_DN_OFFS)
+
+#define PXS_BN_OFFS		8	/* Bus Number */
+#define PXS_BN_MASK		(0xff << PXS_BN_OFFS)
+
+
+/* PCI Error Report Register Map */
+#define PCI_SERRN_MASK_REG(pciIf)		(0x30c28  + (pciIf * 0x80))
+#define PCI_CAUSE_REG(pciIf)			(0x31d58 + (pciIf * 0x80))
+#define PCI_MASK_REG(pciIf)				(0x31d5C + (pciIf * 0x80))
+#define PCI_ERROR_ADDR_LOW_REG(pciIf)	(0x31d40 + (pciIf * 0x80))
+#define PCI_ERROR_ADDR_HIGH_REG(pciIf)	(0x31d44 + (pciIf * 0x80))
+#define PCI_ERROR_ATTRIBUTE_REG(pciIf)	(0x31d48 + (pciIf * 0x80))
+#define PCI_ERROR_COMMAND_REG(pciIf)	(0x31d50 + (pciIf * 0x80))
+
+/* PCI Interrupt Cause Register (PICR) */
+#define PICR_ERR_SEL_OFFS           27
+#define PICR_ERR_SEL_MASK           (0x1f << PICR_ERR_SEL_OFFS)
+
+/* PCI Error Command Register (PECR) */
+#define PECR_ERR_CMD_OFFS			0
+#define PECR_ERR_CMD_MASK			(0xf << PECR_ERR_CMD_OFFS)
+#define PECR_DAC					BIT4
+
+
+/* defaults */
+/* Set bits means value is about to change according to new value */
+#define PCI_COMMAND_DEFAULT_MASK                0xffffdff1
+#define PCI_COMMAND_DEFAULT                             \
+                (PCR_MASTER_WR_TRIG_WHOLE   |   \
+         PCR_MASTER_RD_TRIG_WHOLE       |       \
+                 PCR_MASTER_MEM_RD_LINE_EN      |       \
+         PCR_MASTER_MEM_RD_MULT_EN  |   \
+                 PCR_NS_ACCORDING_RCV_TRANS     |       \
+                 PCR_MASTER_PCIX_REQ64N_EN      |       \
+                 PCR_MASTER_DAC_EN                      |       \
+                 PCR_MASTER_M64_ALLIGN          |       \
+                 PCR_ERRORS_PROPAGATION_EN)
+                 
+                 
+#define PCI_ARBITER_CTRL_DEFAULT_MASK   0x801fc07a
+#define PCI_ARBITER_CTRL_DEFAULT        \
+        (PACR_BROKEN_VAL_PCIX_MIN << PACR_BROKEN_VAL_OFFS)
+
+
+#endif /* #ifndef __INCPCIREGSH */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvCompVer.txt
new file mode 100644
index 00000000..38a92644
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.4
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c
new file mode 100644
index 00000000..068aac2b
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c
@@ -0,0 +1,1143 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "pex/mvPex.h"
+
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+/* defines  */       
+#ifdef MV_DEBUG         
+#define DB(x)	x
+#else                
+#define DB(x)    
+#endif	             
+
+MV_STATUS mvPexHalInit(MV_U32 pexIf, MV_PEX_TYPE pexType)
+{
+	MV_PEX_MODE pexMode;
+	MV_U32 regVal;
+	MV_U32	status;
+ 
+    /* First implement Guideline (GL# PCI Express-2) Wrong Default Value    */
+    /* to Transmitter Output Current (TXAMP) Relevant for: 88F5181-A1/B0/B1 */
+    /* and 88F5281-B0 and above, 88F5182, 88F5082, 88F5181L, 88F6082/L      */
+ 
+    if ((mvCtrlModelGet() != MV_1281_DEV_ID) &&
+	(mvCtrlModelGet() != MV_6281_DEV_ID) &&
+	(mvCtrlModelGet() != MV_6192_DEV_ID) &&
+    (mvCtrlModelGet() != MV_6190_DEV_ID) &&
+	(mvCtrlModelGet() != MV_6180_DEV_ID) &&
+        	(mvCtrlModelGet() != MV_6183_DEV_ID) &&
+	(mvCtrlModelGet() != MV_6183L_DEV_ID) &&
+        	(mvCtrlModelGet() != MV_78100_DEV_ID) &&
+        	(mvCtrlModelGet() != MV_78200_DEV_ID) &&
+	(mvCtrlModelGet() != MV_76100_DEV_ID) &&
+	(mvCtrlModelGet() != MV_78XX0_DEV_ID))
+    {
+
+        /* Read current value of TXAMP */
+        MV_REG_WRITE(0x41b00, 0x80820000);   /* Write the read command   */
+
+        regVal = MV_REG_READ(0x41b00);      /* Extract the data         */
+
+        /* Prepare new data for write */
+        regVal &= ~0x7;                     /* Clear bits [2:0]         */
+        regVal |=  0x4;                     /* Set the new value        */
+        regVal &= ~0x80000000;              /* Set "write" command      */
+        MV_REG_WRITE(0x41b00, regVal);      /* Write the write command  */
+
+    }
+    else
+    {
+        /* Implement 1.0V termination GL for 88F1281 device only */
+        /* BIT0 - Common mode feedback */
+        /* BIT3 - TxBuf, extra drive for 1.0V termination */
+        if (mvCtrlModelGet() == MV_1281_DEV_ID)
+        {
+                MV_REG_WRITE(0x41b00, 0x80860000);   /* Write the read command   */
+                regVal = MV_REG_READ(0x41b00);      /* Extract the data         */
+                regVal |= (BIT0 | BIT3);
+                regVal &= ~0x80000000;              /* Set "write" command      */
+                MV_REG_WRITE(0x41b00, regVal);      /* Write the write command  */
+
+                MV_REG_WRITE(0x31b00, 0x80860000);   /* Write the read command   */
+                regVal = MV_REG_READ(0x31b00);      /* Extract the data         */
+                regVal |= (BIT0 | BIT3);
+                regVal &= ~0x80000000;              /* Set "write" command      */
+                MV_REG_WRITE(0x31b00, regVal);      /* Write the write command  */
+        }
+    }
+
+        if( mvPexModeGet(pexIf, &pexMode) != MV_OK)
+        {
+                mvOsPrintf("PEX init ERR. mvPexModeGet failed (pexType=%d)\n",pexMode.pexType);
+                return MV_ERROR;
+        }
+
+        /* Check that required PEX type is the one set in reset time */
+        if (pexType != pexMode.pexType)
+        {
+                /* No Link. Shut down the Phy */
+		mvPexPowerDown(pexIf);
+                mvOsPrintf("PEX init ERR. PEX type sampled mismatch (%d,%d)\n",pexType,pexMode.pexType);
+                return MV_ERROR;
+        }
+
+        if (MV_PEX_ROOT_COMPLEX == pexType)
+        {
+                mvPexLocalBusNumSet(pexIf, PEX_HOST_BUS_NUM(pexIf));
+                mvPexLocalDevNumSet(pexIf, PEX_HOST_DEV_NUM(pexIf));
+        
+                /* Local device master Enable */
+                mvPexMasterEnable(pexIf, MV_TRUE);
+        
+                /* Local device slave Enable */
+                mvPexSlaveEnable(pexIf, mvPexLocalBusNumGet(pexIf),
+                                                 mvPexLocalDevNumGet(pexIf), MV_TRUE);
+		/* Interrupt disable */
+		status = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_STATUS_AND_COMMAND));
+		status |= PXSAC_INT_DIS;
+		MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_STATUS_AND_COMMAND), status);
+        }
+
+        /* now wait 500 ms to be sure the link is valid (spec compliant) */ 
+        mvOsDelay(500);
+	/* Check if we have link */
+	if (MV_REG_READ(PEX_STATUS_REG(pexIf)) & PXSR_DL_DOWN)
+	{
+		mvOsPrintf("PEX%d interface detected no Link.\n",pexIf);
+		return MV_NO_SUCH;
+	}
+
+	if (MV_PEX_WITDH_X1 ==  pexMode.pexWidth)
+	{
+		mvOsPrintf("PEX%d interface detected Link X1\n",pexIf);
+	}
+	else
+	{
+		mvOsPrintf("PEX%d interface detected Link X4\n",pexIf);
+	}
+
+#ifdef PCIE_VIRTUAL_BRIDGE_SUPPORT
+	mvPexVrtBrgInit(pexIf);
+#endif
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvPexModeGet - Get Pex Mode
+*
+* DESCRIPTION:
+*
+* INPUT:
+*       pexIf   - PEX interface number.
+*
+* OUTPUT:
+*       pexMode - Pex mode structure
+*
+* RETURN:
+*       MV_OK on success , MV_ERROR otherwise
+*
+*******************************************************************************/
+MV_U32 mvPexModeGet(MV_U32 pexIf,MV_PEX_MODE *pexMode)
+{
+	MV_U32 pexData;
+
+	/* Parameter checking   */
+	if (PEX_DEFAULT_IF != pexIf)
+	{
+		if (pexIf >= mvCtrlPexMaxIfGet())
+		{
+			mvOsPrintf("mvPexModeGet: ERR. Invalid PEX interface %d\n",pexIf);
+			return MV_ERROR;
+		}
+	}
+
+	pexData = MV_REG_READ(PEX_CTRL_REG(pexIf));
+
+	switch (pexData & PXCR_DEV_TYPE_CTRL_MASK)
+	{
+	case PXCR_DEV_TYPE_CTRL_CMPLX:
+		pexMode->pexType = MV_PEX_ROOT_COMPLEX;
+		break;
+	case PXCR_DEV_TYPE_CTRL_POINT:
+		pexMode->pexType = MV_PEX_END_POINT;
+		break;
+
+	}
+
+    /* Check if we have link */
+    if (MV_REG_READ(PEX_STATUS_REG(pexIf)) & PXSR_DL_DOWN)
+    {
+        pexMode->pexLinkUp = MV_FALSE;
+        
+        /* If there is no link, the auto negotiation data is worthless */
+        pexMode->pexWidth  = MV_PEX_WITDH_INVALID;
+    }   
+    else
+    {
+        pexMode->pexLinkUp = MV_TRUE;
+
+        /* We have link. The link width is now valid */
+        pexData = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_LINK_CTRL_STAT_REG));
+        pexMode->pexWidth = ((pexData & PXLCSR_NEG_LNK_WDTH_MASK) >> 
+                             PXLCSR_NEG_LNK_WDTH_OFFS);
+    }
+
+    return MV_OK;
+}
+
+
+/* PEX configuration space read write */
+
+/*******************************************************************************
+* mvPexConfigRead - Read from configuration space
+*
+* DESCRIPTION:
+*       This function performs a 32 bit read from PEX configuration space.
+*       It supports both type 0 and type 1 of Configuration Transactions 
+*       (local and over bridge). In order to read from local bus segment, use 
+*       bus number retrieved from mvPexLocalBusNumGet(). Other bus numbers 
+*       will result configuration transaction of type 1 (over bridge).
+*
+* INPUT:
+*       pexIf   - PEX interface number.
+*       bus     - PEX segment bus number.
+*       dev     - PEX device number.
+*       func    - Function number.
+*       regOffs - Register offset.       
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       32bit register data, 0xffffffff on error
+*
+*******************************************************************************/
+MV_U32 mvPexConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
+                        MV_U32 regOff)
+{
+#if defined(PCIE_VIRTUAL_BRIDGE_SUPPORT)
+        return mvPexVrtBrgConfigRead (pexIf, bus, dev, func, regOff);
+}
+
+MV_U32 mvPexHwConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func,
+                        MV_U32 regOff)
+{
+#endif
+	MV_U32 pexData = 0;
+	MV_U32	localDev,localBus;
+
+	/* Parameter checking   */
+	if (PEX_DEFAULT_IF != pexIf)
+	{
+		if (pexIf >= mvCtrlPexMaxIfGet())
+		{
+			mvOsPrintf("mvPexConfigRead: ERR. Invalid PEX interface %d\n",pexIf);
+			return 0xFFFFFFFF;
+		}
+	}
+
+	if (dev >= MAX_PEX_DEVICES)
+	{
+		DB(mvOsPrintf("mvPexConfigRead: ERR. device number illigal %d\n", dev));
+		return 0xFFFFFFFF;
+	}
+	
+	if (func >= MAX_PEX_FUNCS)
+	{
+		DB(mvOsPrintf("mvPexConfigRead: ERR. function num illigal %d\n", func));
+		return 0xFFFFFFFF;
+	}
+	
+	if (bus >= MAX_PEX_BUSSES)
+	{
+		DB(mvOsPrintf("mvPexConfigRead: ERR. bus number illigal %d\n", bus));
+		return MV_ERROR;
+	}
+    	     
+    DB(mvOsPrintf("mvPexConfigRead: pexIf %d, bus %d, dev %d, func %d, regOff 0x%x\n",
+                   pexIf, bus, dev, func, regOff));
+	
+	localDev = mvPexLocalDevNumGet(pexIf);
+	localBus = mvPexLocalBusNumGet(pexIf);
+                                     
+    /* Speed up the process. In case on no link, return MV_ERROR */
+    if ((dev != localDev) || (bus != localBus))
+    {
+        pexData = MV_REG_READ(PEX_STATUS_REG(pexIf));
+
+        if ((pexData & PXSR_DL_DOWN))
+        {
+            return MV_ERROR;
+        }
+    }
+
+    /* in PCI Express we have only one device number */
+	/* and this number is the first number we encounter 
+	else that the localDev*/
+	/* spec pex define return on config read/write on any device */
+	if (bus == localBus)
+	{
+		if (localDev == 0)
+		{
+			/* if local dev is 0 then the first number we encounter 
+			after 0 is 1 */
+			if ((dev != 1)&&(dev != localDev))
+			{
+				return MV_ERROR;
+			}	
+		}
+		else
+		{
+			/* if local dev is not 0 then the first number we encounter 
+			is 0 */
+	
+			if ((dev != 0)&&(dev != localDev))
+			{
+				return MV_ERROR;
+			}
+		}
+		if(func != 0 ) /* i.e bridge */
+		{
+			return MV_ERROR;
+		}
+	}
+    
+    
+	/* Creating PEX address to be passed */
+	pexData = (bus << PXCAR_BUS_NUM_OFFS);
+	pexData |= (dev << PXCAR_DEVICE_NUM_OFFS);
+	pexData |= (func << PXCAR_FUNC_NUM_OFFS);
+	pexData |= (regOff & PXCAR_REG_NUM_MASK); /* lgacy register space */
+	/* extended register space */
+	pexData |=(((regOff & PXCAR_REAL_EXT_REG_NUM_MASK) >> 
+				PXCAR_REAL_EXT_REG_NUM_OFFS) << PXCAR_EXT_REG_NUM_OFFS);
+
+	pexData |= PXCAR_CONFIG_EN; 
+	
+	/* Write the address to the PEX configuration address register */
+	MV_REG_WRITE(PEX_CFG_ADDR_REG(pexIf), pexData);
+
+	DB(mvOsPrintf("mvPexConfigRead:address pexData=%x ",pexData));
+    
+	
+	/* In order to let the PEX controller absorbed the address of the read 	*/
+	/* transaction we perform a validity check that the address was written */
+	if(pexData != MV_REG_READ(PEX_CFG_ADDR_REG(pexIf)))
+	{
+		return MV_ERROR;
+	}
+
+	/* cleaning Master Abort */
+	MV_REG_BIT_SET(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_STATUS_AND_COMMAND), 
+				   PXSAC_MABORT);
+#if 0
+	/* Guideline (GL# PCI Express-1) Erroneous Read Data on Configuration   */
+	/* This guideline is relevant for all devices except of the following devices:
+	   88F5281-BO and above, 88F5181L-A0 and above, 88F1281 A0 and above
+	   88F6183 A0 and above, 88F6183L  */
+	if ( ( (dev != localDev) || (bus != localBus) ) && 
+		(
+		!(MV_5281_DEV_ID == mvCtrlModelGet())&&
+		!((MV_5181_DEV_ID == mvCtrlModelGet())&& (mvCtrlRevGet() >= MV_5181L_A0_REV))&&
+		!(MV_1281_DEV_ID == mvCtrlModelGet())&&
+		!(MV_6183_DEV_ID == mvCtrlModelGet())&&
+		!(MV_6183L_DEV_ID == mvCtrlModelGet())&&
+		!(MV_6281_DEV_ID == mvCtrlModelGet())&&
+		!(MV_6192_DEV_ID == mvCtrlModelGet())&&
+		!(MV_6190_DEV_ID == mvCtrlModelGet())&&
+        !(MV_6180_DEV_ID == mvCtrlModelGet())&& 
+		!(MV_78XX0_DEV_ID == mvCtrlModelGet()) 
+		))
+	{
+
+		/* PCI-Express configuration read work-around */
+
+		/* we will use one of the Punit (AHBToMbus) windows to access the xbar 
+		and read the data from there */
+		/*
+		Need to configure the 2 free Punit (AHB to MBus bridge) 
+		address decoding windows:
+		Configure the flash Window to handle Configuration space requests 
+		for PEX0/1:
+		1.    write 0x7931/0x7941 to the flash window and the size, 
+		      79-xbar attr (pci cfg), 3/4-xbar target (pex0/1), 1-WinEn
+		2.    write base to flash window 
+		
+		Configuration transactions from the CPU should write/read the data 
+		to/from address of the form:
+		addr[31:28] = 0x5 (for PEX0) or 0x6 (for PEX1)
+		addr[27:24] = extended register number
+		addr[23:16] = bus number
+		addr[15:11] = device number
+		addr[10:8]   = function number
+		addr[7:0]     = register number
+		*/
+
+		#include "ctrlEnv/sys/mvAhbToMbus.h"
+		{
+			MV_U32 winNum;
+			MV_AHB_TO_MBUS_DEC_WIN originWin;
+			MV_U32 pciAddr=0;
+			MV_U32 remapLow=0,remapHigh=0;
+
+			/* 
+			We will use DEV_CS2\Flash window for this workarround 
+			*/
+            
+			winNum = mvAhbToMbusWinTargetGet(PEX_CONFIG_RW_WA_TARGET);
+
+			/* save remap values if exist */
+			if ((1 == winNum)||(0 == winNum))
+			{
+				remapLow = MV_REG_READ(AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum));
+				remapHigh = MV_REG_READ(AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum));
+
+			}
+			
+
+			/* save the original window values */
+			mvAhbToMbusWinGet(winNum,&originWin);
+
+			if (PEX_CONFIG_RW_WA_USE_ORIGINAL_WIN_VALUES)
+			{
+				/* set the window as xbar window */
+				if (pexIf)
+				{
+					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
+					(0x7931 | (((originWin.addrWin.size >> 16)-1) ) << 16));
+				}
+				else
+				{
+					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
+					(0x7941 | (((originWin.addrWin.size >> 16)-1) ) << 16));
+				}
+
+				MV_REG_WRITE(AHB_TO_MBUS_WIN_BASE_REG(winNum),
+							 originWin.addrWin.baseLow);
+
+				/*pciAddr = originWin.addrWin.baseLow;*/
+				pciAddr = (MV_U32)CPU_MEMIO_UNCACHED_ADDR(
+					(MV_U32)originWin.addrWin.baseLow);
+			
+			}
+			else
+			{
+				/* set the window as xbar window */
+				if (pexIf)
+				{
+					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
+					(0x7931 | (((PEX_CONFIG_RW_WA_SIZE >> 16)-1) ) << 16));
+				}
+				else
+				{
+					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
+					(0x7941 | (((PEX_CONFIG_RW_WA_SIZE >> 16)-1) ) << 16));
+				}
+
+				MV_REG_WRITE(AHB_TO_MBUS_WIN_BASE_REG(winNum),
+							 PEX_CONFIG_RW_WA_BASE);
+
+				pciAddr = (MV_U32)CPU_MEMIO_UNCACHED_ADDR(PEX_CONFIG_RW_WA_BASE);
+			}
+			
+			
+			/* remap should be as base */
+			if ((1 == winNum)||(0 == winNum))
+			{
+			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum),pciAddr);
+			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum),0);
+
+			}
+
+			/* extended register space */
+			pciAddr |= (bus << 16);
+			pciAddr |= (dev << 11);
+			pciAddr |= (func << 8);
+			pciAddr |= (regOff & PXCAR_REG_NUM_MASK); /* lgacy register space */
+
+			pexData = *(MV_U32*)pciAddr; 
+			pexData = MV_32BIT_LE(pexData); /* Data always in LE */
+
+			/* restore the original window values */
+			mvAhbToMbusWinSet(winNum,&originWin);
+
+			/* restore original remap values*/
+			if ((1 == winNum)||(0 == winNum))
+			{
+			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum),remapLow);
+			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum),remapHigh);
+
+			}
+		}
+	}
+	else
+#endif
+	{
+		/* Read the Data returned in the PEX Data register */
+		pexData = MV_REG_READ(PEX_CFG_DATA_REG(pexIf));
+
+	}
+
+	DB(mvOsPrintf("mvPexConfigRead: got : %x \n",pexData));
+	
+	return pexData;
+
+}
+
+/*******************************************************************************
+* mvPexConfigWrite - Write to configuration space
+*
+* DESCRIPTION:
+*       This function performs a 32 bit write to PEX configuration space.
+*       It supports both type 0 and type 1 of Configuration Transactions 
+*       (local and over bridge). In order to write to local bus segment, use 
+*       bus number retrieved from mvPexLocalBusNumGet(). Other bus numbers 
+*       will result configuration transaction of type 1 (over bridge).
+*
+* INPUT:
+*       pexIf   - PEX interface number.
+*       bus     - PEX segment bus number.
+*       dev     - PEX device number.
+*       func    - Function number.
+*       regOffs - Register offset.       
+*       data    - 32bit data.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev, 
+                           MV_U32 func, MV_U32 regOff, MV_U32 data)
+{
+#if defined(PCIE_VIRTUAL_BRIDGE_SUPPORT)
+        return mvPexVrtBrgConfigWrite (pexIf, bus, dev, func, regOff, data);
+}
+
+MV_STATUS mvPexHwConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
+                           MV_U32 func, MV_U32 regOff, MV_U32 data)
+{
+#endif
+	MV_U32 pexData = 0;
+	MV_U32	localDev,localBus;
+
+	/* Parameter checking   */
+	if (PEX_DEFAULT_IF != pexIf)
+	{
+		if (pexIf >= mvCtrlPexMaxIfGet())
+		{
+			mvOsPrintf("mvPexConfigWrite: ERR. Invalid PEX interface %d\n", 
+																		pexIf);
+			return MV_ERROR;
+		}
+	}
+
+	if (dev >= MAX_PEX_DEVICES)
+	{
+		mvOsPrintf("mvPexConfigWrite: ERR. device number illigal %d\n",dev);
+		return MV_BAD_PARAM;
+	}
+
+	if (func >= MAX_PEX_FUNCS)
+	{
+		mvOsPrintf("mvPexConfigWrite: ERR. function number illigal %d\n", func);
+		return MV_ERROR;
+	}
+
+	if (bus >= MAX_PEX_BUSSES)
+	{
+		mvOsPrintf("mvPexConfigWrite: ERR. bus number illigal %d\n", bus);
+		return MV_ERROR;
+	}
+
+
+
+	localDev = mvPexLocalDevNumGet(pexIf);
+	localBus = mvPexLocalBusNumGet(pexIf);
+
+	
+	/* in PCI Express we have only one device number other than ourselves*/
+	/* and this number is the first number we encounter 
+		else than the localDev that can be any valid dev number*/
+	/* pex spec define return on config read/write on any device */
+	if (bus == localBus)
+	{
+
+		if (localDev == 0)
+		{
+			/* if local dev is 0 then the first number we encounter 
+			after 0 is 1 */
+			if ((dev != 1)&&(dev != localDev))
+			{
+				return MV_ERROR;
+			}
+	
+		}
+		else
+		{
+			/* if local dev is not 0 then the first number we encounter 
+			is 0 */
+	
+			if ((dev != 0)&&(dev != localDev))
+			{
+				return MV_ERROR;
+			}
+		}
+
+		
+	}
+
+	/* if we are not accessing ourselves , then check the link */
+	if ((dev != localDev) || (bus != localBus) )
+	{
+		/* workarround */
+		/* when no link return MV_ERROR */
+
+		pexData = MV_REG_READ(PEX_STATUS_REG(pexIf));
+
+		if ((pexData & PXSR_DL_DOWN))
+		{
+			return MV_ERROR;
+		}
+
+	}
+
+	pexData =0;
+
+	/* Creating PEX address to be passed */
+	pexData |= (bus << PXCAR_BUS_NUM_OFFS);
+	pexData |= (dev << PXCAR_DEVICE_NUM_OFFS);
+	pexData |= (func << PXCAR_FUNC_NUM_OFFS);
+	pexData |= (regOff & PXCAR_REG_NUM_MASK); /* lgacy register space */
+	/* extended register space */
+	pexData |=(((regOff & PXCAR_REAL_EXT_REG_NUM_MASK) >> 
+				PXCAR_REAL_EXT_REG_NUM_OFFS) << PXCAR_EXT_REG_NUM_OFFS);
+	pexData |= PXCAR_CONFIG_EN; 
+	
+	DB(mvOsPrintf("mvPexConfigWrite: If=%x bus=%x func=%x dev=%x regOff=%x data=%x \n",
+		   pexIf,bus,func,dev,regOff,data,pexData) ); 
+
+	/* Write the address to the PEX configuration address register */
+	MV_REG_WRITE(PEX_CFG_ADDR_REG(pexIf), pexData);
+
+	/* Clear CPU pipe. Important where CPU can perform OOO execution */
+    	CPU_PIPE_FLUSH;
+
+	/* In order to let the PEX controller absorbed the address of the read 	*/
+	/* transaction we perform a validity check that the address was written */
+	if(pexData != MV_REG_READ(PEX_CFG_ADDR_REG(pexIf)))
+	{
+		return MV_ERROR;
+	}
+
+	/* Write the Data passed to the PEX Data register */
+	MV_REG_WRITE(PEX_CFG_DATA_REG(pexIf), data);
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvPexMasterEnable - Enable/disale PEX interface master transactions.
+*
+* DESCRIPTION:
+*       This function performs read modified write to PEX command status 
+*       (offset 0x4) to set/reset bit 2. After this bit is set, the PEX 
+*       master is allowed to gain ownership on the bus, otherwise it is 
+*       incapable to do so.
+*
+* INPUT:
+*       pexIf  - PEX interface number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexMasterEnable(MV_U32 pexIf, MV_BOOL enable)
+{
+	MV_U32 pexCommandStatus;
+	MV_U32 localBus;
+	MV_U32 localDev;
+
+	/* Parameter checking   */
+	if (pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexMasterEnable: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_ERROR;
+	}
+
+	localBus = mvPexLocalBusNumGet(pexIf);
+	localDev = mvPexLocalDevNumGet(pexIf);
+	
+	pexCommandStatus = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,
+							    PEX_STATUS_AND_COMMAND));
+
+
+	if (MV_TRUE == enable)
+	{
+		pexCommandStatus |= PXSAC_MASTER_EN;
+	}
+	else
+	{
+		pexCommandStatus &= ~PXSAC_MASTER_EN;
+	}
+
+	
+	MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_STATUS_AND_COMMAND),
+				 pexCommandStatus);
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvPexSlaveEnable - Enable/disale PEX interface slave transactions.
+*
+* DESCRIPTION:
+*       This function performs read modified write to PEX command status 
+*       (offset 0x4) to set/reset bit 0 and 1. After those bits are set, 
+*       the PEX slave is allowed to respond to PEX IO space access (bit 0) 
+*       and PEX memory space access (bit 1). 
+*
+* INPUT:
+*       pexIf  - PEX interface number.
+*       dev     - PEX device number.
+*       enable - Enable/disable parameter.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexSlaveEnable(MV_U32 pexIf, MV_U32 bus,MV_U32 dev, MV_BOOL enable)
+{
+	MV_U32 pexCommandStatus;
+	MV_U32 RegOffs;
+
+	/* Parameter checking   */
+	if (pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexSlaveEnable: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+	if (dev >= MAX_PEX_DEVICES)
+	{
+		mvOsPrintf("mvPexLocalDevNumSet: ERR. device number illigal %d\n", dev);
+		return MV_BAD_PARAM;
+
+	}
+
+	
+	RegOffs = PEX_STATUS_AND_COMMAND;
+	
+	pexCommandStatus = mvPexConfigRead(pexIf, bus, dev, 0, RegOffs);
+
+    if (MV_TRUE == enable)
+	{
+		pexCommandStatus |= (PXSAC_IO_EN | PXSAC_MEM_EN);
+	}
+	else                             
+	{
+		pexCommandStatus &= ~(PXSAC_IO_EN | PXSAC_MEM_EN);
+	}
+
+	mvPexConfigWrite(pexIf, bus, dev, 0, RegOffs, pexCommandStatus);
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvPexLocalBusNumSet - Set PEX interface local bus number.
+*
+* DESCRIPTION:
+*       This function sets given PEX interface its local bus number.
+*       Note: In case the PEX interface is PEX-X, the information is read-only.
+*
+* INPUT:
+*       pexIf  - PEX interface number.
+*       busNum - Bus number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_NOT_ALLOWED in case PEX interface is PEX-X. 
+*		MV_BAD_PARAM on bad parameters ,
+*       otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexLocalBusNumSet(MV_U32 pexIf, MV_U32 busNum)
+{
+	MV_U32 pexStatus;
+	MV_U32 localBus;
+	MV_U32 localDev;
+
+
+	/* Parameter checking   */
+	if (pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexLocalBusNumSet: ERR. Invalid PEX interface %d\n",pexIf);
+		return MV_BAD_PARAM;
+	}
+	if (busNum >= MAX_PEX_BUSSES)
+	{
+		mvOsPrintf("mvPexLocalBusNumSet: ERR. bus number illigal %d\n", busNum);
+		return MV_ERROR;
+
+	}
+
+	localBus = mvPexLocalBusNumGet(pexIf);
+	localDev = mvPexLocalDevNumGet(pexIf);
+
+
+
+	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
+
+	pexStatus &= ~PXSR_PEX_BUS_NUM_MASK;
+
+	pexStatus |= (busNum << PXSR_PEX_BUS_NUM_OFFS) & PXSR_PEX_BUS_NUM_MASK;
+
+	MV_REG_WRITE(PEX_STATUS_REG(pexIf), pexStatus);
+
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvPexLocalBusNumGet - Get PEX interface local bus number.
+*
+* DESCRIPTION:
+*       This function gets the local bus number of a given PEX interface.
+*
+* INPUT:
+*       pexIf  - PEX interface number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Local bus number.0xffffffff on Error
+*
+*******************************************************************************/
+MV_U32 mvPexLocalBusNumGet(MV_U32 pexIf)
+{
+	MV_U32 pexStatus;
+
+	/* Parameter checking   */
+	if (PEX_DEFAULT_IF != pexIf)
+	{
+		if (pexIf >= mvCtrlPexMaxIfGet())
+		{
+			mvOsPrintf("mvPexLocalBusNumGet: ERR. Invalid PEX interface %d\n",pexIf);
+			return 0xFFFFFFFF;
+		}
+	}
+
+
+	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
+
+	pexStatus &= PXSR_PEX_BUS_NUM_MASK;
+
+	return (pexStatus >> PXSR_PEX_BUS_NUM_OFFS);
+
+}
+
+
+/*******************************************************************************
+* mvPexLocalDevNumSet - Set PEX interface local device number.
+*
+* DESCRIPTION:
+*       This function sets given PEX interface its local device number.
+*       Note: In case the PEX interface is PEX-X, the information is read-only.
+*
+* INPUT:
+*       pexIf  - PEX interface number.
+*       devNum - Device number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_NOT_ALLOWED in case PEX interface is PEX-X. 
+*		MV_BAD_PARAM on bad parameters ,
+*       otherwise MV_OK
+*
+*******************************************************************************/
+MV_STATUS mvPexLocalDevNumSet(MV_U32 pexIf, MV_U32 devNum)
+{
+	MV_U32 pexStatus;
+	MV_U32 localBus;
+	MV_U32 localDev;
+
+	/* Parameter checking   */
+	if (pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexLocalDevNumSet: ERR. Invalid PEX interface %d\n",pexIf);
+		return MV_BAD_PARAM;
+	}
+	if (devNum >= MAX_PEX_DEVICES)
+	{
+		mvOsPrintf("mvPexLocalDevNumSet: ERR. device number illigal %d\n", 
+																	   devNum);
+		return MV_BAD_PARAM;
+
+	}
+	
+	localBus = mvPexLocalBusNumGet(pexIf);
+	localDev = mvPexLocalDevNumGet(pexIf);
+
+
+	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
+
+	pexStatus &= ~PXSR_PEX_DEV_NUM_MASK;
+
+	pexStatus |= (devNum << PXSR_PEX_DEV_NUM_OFFS) & PXSR_PEX_DEV_NUM_MASK;
+
+	MV_REG_WRITE(PEX_STATUS_REG(pexIf), pexStatus);
+
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvPexLocalDevNumGet - Get PEX interface local device number.
+*
+* DESCRIPTION:
+*       This function gets the local device number of a given PEX interface.
+*
+* INPUT:
+*       pexIf  - PEX interface number.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Local device number. 0xffffffff on Error
+*
+*******************************************************************************/
+MV_U32 mvPexLocalDevNumGet(MV_U32 pexIf)
+{
+	MV_U32 pexStatus;
+
+	/* Parameter checking   */
+	
+	if (PEX_DEFAULT_IF != pexIf)
+	{
+		if (pexIf >= mvCtrlPexMaxIfGet())
+		{
+			mvOsPrintf("mvPexLocalDevNumGet: ERR. Invalid PEX interface %d\n", 
+																   		pexIf);
+			return 0xFFFFFFFF;
+		}
+	}
+	
+	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
+
+	pexStatus &= PXSR_PEX_DEV_NUM_MASK;
+
+	return (pexStatus >> PXSR_PEX_DEV_NUM_OFFS);
+}
+
+MV_VOID mvPexPhyRegRead(MV_U32 pexIf, MV_U32 regOffset, MV_U16 *value)
+{
+
+	MV_U32 regAddr;
+	if (pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexPhyRegRead: ERR. Invalid PEX interface %d\n", pexIf);
+		return;
+	}
+	regAddr = (BIT31 | ((regOffset & 0x3fff) << 16));
+	MV_REG_WRITE(PEX_PHY_ACCESS_REG(pexIf), regAddr);
+	*value = MV_REG_READ(PEX_PHY_ACCESS_REG(pexIf)); 
+}
+
+
+MV_VOID mvPexPhyRegWrite(MV_U32 pexIf, MV_U32 regOffset, MV_U16 value)
+{
+
+	MV_U32 regAddr;
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexPhyRegWrite: ERR. Invalid PEX interface %d\n", pexIf);
+		return;
+	}
+	regAddr = (((regOffset & 0x3fff) << 16) | value);
+	MV_REG_WRITE(PEX_PHY_ACCESS_REG(pexIf), regAddr);
+}
+
+/*******************************************************************************
+* mvPexActiveStateLinkPMEnable
+*
+* DESCRIPTION:
+*       Enable Active Link State Power Management
+*
+* INPUT:
+*       pexIf   - PEX interface number.
+*	enable	- MV_TRUE to enable ASPM, MV_FALSE to disable.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       MV_OK on success , MV_ERROR otherwise
+*
+*******************************************************************************/
+MV_STATUS mvPexActiveStateLinkPMEnable(MV_U32 pexIf, MV_BOOL enable)
+{
+	MV_U32 reg;
+
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexActiveStateLinkPMEnable: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_ERROR;
+	}
+
+	reg = MV_REG_READ(PEX_PWR_MNG_EXT_REG(pexIf)) & ~PXPMER_L1_ASPM_EN_MASK;
+	if(enable == MV_TRUE)
+		reg |= PXPMER_L1_ASPM_EN_MASK;
+	MV_REG_WRITE(PEX_PWR_MNG_EXT_REG(pexIf), reg);
+
+	/* Enable / Disable L0/1 entry */ 
+	reg = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_LINK_CTRL_STAT_REG))
+			& ~PXLCSR_ASPM_CNT_MASK;
+	if(enable == MV_TRUE)
+		reg |= PXLCSR_ASPM_CNT_L0S_L1S_ENT_SUPP;
+	MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_LINK_CTRL_STAT_REG), reg);
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvPexForceX1
+*
+* DESCRIPTION:
+*       shut down lanes 1-3 if recognize that attached to an x1 end-point
+* INPUT:
+*       pexIf   - PEX interface number.
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       MV_OK on success , MV_ERROR otherwise
+*
+*******************************************************************************/
+MV_U32 mvPexForceX1(MV_U32 pexIf)
+{
+	MV_U32 regData = 0;
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexForceX1: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_BAD_PARAM;
+	}
+
+	regData  = MV_REG_READ(PEX_CTRL_REG(pexIf)) & ~(PXCR_CONF_LINK_MASK) ;
+	regData |= PXCR_CONF_LINK_X1;
+
+	MV_REG_WRITE(PEX_CTRL_REG(pexIf), regData);
+	return MV_OK;
+}
+
+MV_BOOL mvPexIsPowerUp(MV_U32 pexIf)
+{
+	if(pexIf >= mvCtrlPexMaxIfGet())
+	{
+		mvOsPrintf("mvPexIsPowerUp: ERR. Invalid PEX interface %d\n", pexIf);
+		return MV_FALSE;
+	}
+	return mvCtrlPwrClckGet(PEX_UNIT_ID, pexIf);	
+}
+
+
+MV_VOID mvPexPowerDown(MV_U32 pexIf)
+{
+	if ( (mvCtrlModelGet() == MV_78XX0_DEV_ID) ||
+		(mvCtrlModelGet() == MV_76100_DEV_ID) ||
+		(mvCtrlModelGet() == MV_78100_DEV_ID) ||
+		(mvCtrlModelGet() == MV_78200_DEV_ID) )
+	{
+		mvCtrlPwrClckSet(PEX_UNIT_ID, pexIf, MV_FALSE);	
+	}
+	else
+	{
+		MV_REG_WRITE((0x41B00 -(pexIf)*0x10000), 0x20800087);
+	}
+}
+
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h
new file mode 100644
index 00000000..d8f1cdd9
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h
@@ -0,0 +1,168 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCPEXH
+#define __INCPEXH
+
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "pex/mvPexRegs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+
+
+
+/* NOTE not supported in this driver:*/
+  
+
+/* defines */
+/* The number of supported PEX interfaces depend on Marvell controller 		*/
+/* device number. This device number ID is located on the PEX unit 			*/
+/* configuration header. This creates a loop where calling PEX 				*/
+/* configuration read/write	routine results a call to get PEX configuration */
+/* information etc. This macro defines a default PEX interface. This PEX	*/
+/* interface is sure to exist.												*/
+#define PEX_DEFAULT_IF	0
+
+
+/* typedefs */
+/* The Marvell controller supports both root complex and end point devices */
+/* This enumeration describes the PEX type.                                 */
+typedef enum _mvPexType
+{
+    MV_PEX_ROOT_COMPLEX,   	/* root complex device */
+    MV_PEX_END_POINT        /* end point device */
+}MV_PEX_TYPE;
+
+typedef enum _mvPexWidth
+{
+    MV_PEX_WITDH_X1 = 1,
+    MV_PEX_WITDH_X2,
+    MV_PEX_WITDH_X3,
+    MV_PEX_WITDH_X4,
+    MV_PEX_WITDH_INVALID
+}MV_PEX_WIDTH;
+
+/* PEX Bar attributes */
+typedef struct _mvPexMode
+{
+	MV_PEX_TYPE 	pexType;
+	MV_PEX_WIDTH    pexWidth;
+	MV_BOOL         pexLinkUp;
+}MV_PEX_MODE;
+
+
+
+/* Global Functions prototypes */
+/* mvPexInit - Initialize PEX interfaces*/
+MV_STATUS mvPexHalInit(MV_U32 pexIf, MV_PEX_TYPE pexType);
+
+/* mvPexModeGet - Get Pex If mode */
+MV_U32 mvPexModeGet(MV_U32 pexIf,MV_PEX_MODE *pexMode);
+
+/* mvPexConfigRead - Read from configuration space */
+MV_U32 mvPexConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
+						MV_U32 func,MV_U32 regOff);
+
+/* mvPexConfigWrite - Write to configuration space */
+MV_STATUS mvPexConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
+                           MV_U32 func, MV_U32 regOff, MV_U32 data);
+
+/* mvPexMasterEnable - Enable/disale PEX interface master transactions.*/
+MV_STATUS mvPexMasterEnable(MV_U32 pexIf, MV_BOOL enable);
+
+/* mvPexSlaveEnable - Enable/disale PEX interface slave transactions.*/
+MV_STATUS mvPexSlaveEnable(MV_U32 pexIf, MV_U32 bus,MV_U32 dev, MV_BOOL enable);
+
+/* mvPexLocalBusNumSet - Set PEX interface local bus number.*/
+MV_STATUS mvPexLocalBusNumSet(MV_U32 pexIf, MV_U32 busNum);
+
+/* mvPexLocalBusNumGet - Get PEX interface local bus number.*/
+MV_U32 mvPexLocalBusNumGet(MV_U32 pexIf);
+
+/* mvPexLocalDevNumSet - Set PEX interface local device number.*/
+MV_STATUS mvPexLocalDevNumSet(MV_U32 pexIf, MV_U32 devNum);
+
+/* mvPexLocalDevNumGet - Get PEX interface local device number.*/
+MV_U32 mvPexLocalDevNumGet(MV_U32 pexIf);
+/* mvPexForceX1 - Force PEX interface to X1 mode. */
+MV_U32 mvPexForceX1(MV_U32 pexIf);
+
+/* mvPexIsPowerUp - Is PEX interface Power up? */
+MV_BOOL mvPexIsPowerUp(MV_U32 pexIf);
+
+/* mvPexPowerDown - Power Down */
+MV_VOID mvPexPowerDown(MV_U32 pexIf);
+
+/* mvPexPowerUp - Power Up */
+MV_VOID mvPexPowerUp(MV_U32 pexIf);
+
+/* mvPexPhyRegRead - Pex phy read */
+MV_VOID mvPexPhyRegRead(MV_U32 pexIf, MV_U32 regOffset, MV_U16 *value);
+
+/* mvPexPhyRegWrite - Pex phy write */
+MV_VOID mvPexPhyRegWrite(MV_U32 pexIf, MV_U32 regOffset, MV_U16 value);
+
+MV_STATUS mvPexActiveStateLinkPMEnable(MV_U32 pexIf, MV_BOOL enable);
+
+#endif /* #ifndef __INCPEXH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h
new file mode 100644
index 00000000..8ac16983
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h
@@ -0,0 +1,751 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCPEXREGSH
+#define __INCPEXREGSH
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* defines */
+#define MAX_PEX_DEVICES         32
+#define MAX_PEX_FUNCS           8
+#define MAX_PEX_BUSSES          256
+
+
+
+/*********************************************************/
+/* PCI Express Configuration Cycles Generation Registers */
+/*********************************************************/
+
+#define PEX_CFG_ADDR_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x18F8)
+#define PEX_CFG_DATA_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x18FC)
+#define PEX_PHY_ACCESS_REG(pexIf)	((PEX_IF_BASE(pexIf)) + 0x1B00)
+/* PCI Express Configuration Address Register */
+/* PEX_CFG_ADDR_REG (PXCAR)*/
+
+#define PXCAR_REG_NUM_OFFS			2
+#define PXCAR_REG_NUM_MAX			0x3F
+#define PXCAR_REG_NUM_MASK			(PXCAR_REG_NUM_MAX << PXCAR_REG_NUM_OFFS)
+#define PXCAR_FUNC_NUM_OFFS			8
+#define PXCAR_FUNC_NUM_MAX			0x7
+#define PXCAR_FUNC_NUM_MASK			(PXCAR_FUNC_NUM_MAX << PXCAR_FUNC_NUM_OFFS)
+#define PXCAR_DEVICE_NUM_OFFS		11
+#define PXCAR_DEVICE_NUM_MAX		0x1F
+#define PXCAR_DEVICE_NUM_MASK		(PXCAR_DEVICE_NUM_MAX << PXCAR_DEVICE_NUM_OFFS)
+#define PXCAR_BUS_NUM_OFFS			16
+#define PXCAR_BUS_NUM_MAX			0xFF
+#define PXCAR_BUS_NUM_MASK			(PXCAR_BUS_NUM_MAX << PXCAR_BUS_NUM_OFFS)
+#define PXCAR_EXT_REG_NUM_OFFS		24
+#define PXCAR_EXT_REG_NUM_MAX		0xF
+
+/* in pci express register address is now the legacy register address (8 bits)
+with the new extended register address (more 4 bits) , below is the mask of
+the upper 4 bits of the full register address */
+
+#define PXCAR_REAL_EXT_REG_NUM_OFFS	8
+#define PXCAR_EXT_REG_NUM_MASK		(PXCAR_EXT_REG_NUM_MAX << PXCAR_EXT_REG_NUM_OFFS)
+#define PXCAR_CONFIG_EN				BIT31
+
+#define PXCAR_REAL_EXT_REG_NUM_OFFS     8
+#define PXCAR_REAL_EXT_REG_NUM_MASK     (0xF << PXCAR_REAL_EXT_REG_NUM_OFFS)
+
+/* The traditional PCI spec defined 6-bit field to describe register offset.*/ 
+/* The new PCI Express extend the register offset by an extra 4-bits.       */
+/* The below macro assign 10-bit register offset into the apprpreate        */
+/* fields in the CFG_ADDR_REG                                               */
+#define PXCAR_REG_OFFS_SET(regOffs)                         \
+ ( (regOff & PXCAR_REG_NUM_MASK) | \
+   ( ((regOff & PXCAR_REAL_EXT_REG_NUM_MASK) >> PXCAR_REAL_EXT_REG_NUM_OFFS) << PXCAR_EXT_REG_NUM_OFFS) )
+
+/***********************************/
+/* PCI Express Interrupt registers */
+/***********************************/
+#define PEX_CAUSE_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x1900)
+#define PEX_MASK_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x1910)
+
+#define PXICR_TX_REQ_IN_DLDOWN_ERR  BIT0  /* Transmit request while field   */
+                                          /* <DLDown> of the PCI Express    */
+/* PCI Express Interrupt Cause */
+/* PEX_INT_CAUSE_REG  (PXICR)*/
+/* PEX_INT_MASK_REG*/
+/*
+NOTE:All bits except bits[27:24] are Read/Write Clear only. A cause bit sets
+upon an error event occurrence. A write of 0 clears the bit. A write of 1 has
+no affect. Bits[24:27} are set and cleared upon reception of interrupt
+emulation messages.
+
+Mask bit per cause bit. If a bit is set to 1, the corresponding event is
+enabled. Mask does not affect setting of the Interrupt Cause register bits;
+it only affects the assertion of the interrupt .*/
+                                          
+
+#define PXICR_MDIS_CAUSE			BIT1  /* Attempt to generate PCI transaction 
+                                             while master is disabled */
+#define PXICR_ERR_WRTO_REG_CAUSE	BIT3  /* Erroneous write attempt to
+                                             PCI Express internal register*/
+#define PXICR_HIT_DFLT_WIN_ERR		BIT4  /* Hit Default Window Error */
+#define PXICR_RX_RAM_PAR_ERR        BIT6  /* Rx RAM Parity Error */
+#define PXICR_TX_RAM_PAR_ERR        BIT7  /* Tx RAM Parity Error */
+#define PXICR_COR_ERR_DET			BIT8  /* Correctable Error Detected*/
+#define PXICR_NF_ERR_DET			BIT9  /* Non-Fatal Error Detected*/
+#define PXICR_FERR_DET				BIT10 /* Fatal Error Detected*/
+#define PXICR_DSTATE_CHANGE			BIT11 /* Dstate Change Indication*/
+#define PXICR_BIST					BIT12 /* PCI-Express BIST activated*/
+#define PXICR_FLW_CTRL_PROT     BIT14 /* Flow Control Protocol Error */
+
+#define PXICR_RCV_UR_CA_ERR         BIT15 /* Received UR or CA status. */
+#define PXICR_RCV_ERR_FATAL			BIT16 /* Received ERR_FATAL message.*/
+#define PXICR_RCV_ERR_NON_FATAL		BIT17 /* Received ERR_NONFATAL message*/
+#define PXICR_RCV_ERR_COR			BIT18 /* Received ERR_COR message.*/
+#define PXICR_RCV_CRS				BIT19 /* Received CRS completion status*/
+#define PXICR_SLV_HOT_RESET			BIT20 /* Received Hot Reset Indication*/
+#define PXICR_SLV_DIS_LINK			BIT21 /* Slave Disable Link Indication*/
+#define PXICR_SLV_LB				BIT22 /* Slave Loopback Indication*/
+#define PXICR_LINK_FAIL				BIT23 /* Link Failure indication.*/
+#define PXICR_RCV_INTA				BIT24 /* IntA status.*/
+#define PXICR_RCV_INTB				BIT25 /* IntB status.*/
+#define PXICR_RCV_INTC				BIT26 /* IntC status.*/
+#define PXICR_RCV_INTD				BIT27 /* IntD status.*/
+#define PXICR_RCV_PM_PME            BIT28 /* Received PM_PME message. */
+
+
+/********************************************/
+/* PCI Express Control and Status Registers */
+/********************************************/
+#define PEX_CTRL_REG(pexIf)				((PEX_IF_BASE(pexIf)) + 0x1A00)
+#define PEX_STATUS_REG(pexIf)				((PEX_IF_BASE(pexIf)) + 0x1A04)
+#define PEX_COMPLT_TMEOUT_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A10)
+#define PEX_PWR_MNG_EXT_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A18)
+#define PEX_FLOW_CTRL_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A20)
+#define PEX_ACK_TMR_4X_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A30)
+#define PEX_ACK_TMR_1X_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A40)
+#define PEX_TL_CTRL_REG(pexIf)				((PEX_IF_BASE(pexIf)) + 0x1AB0)
+
+
+#define PEX_RAM_PARITY_CTRL_REG(pexIf)  		((PEX_IF_BASE(pexIf)) + 0x1A50)
+/* PCI Express Control Register */
+/* PEX_CTRL_REG (PXCR) */
+
+#define PXCR_CONF_LINK_OFFS             0
+#define PXCR_CONF_LINK_MASK             (1 << PXCR_CONF_LINK_OFFS)
+#define PXCR_CONF_LINK_X4               (0 << PXCR_CONF_LINK_OFFS)
+#define PXCR_CONF_LINK_X1               (1 << PXCR_CONF_LINK_OFFS)
+#define PXCR_DEV_TYPE_CTRL_OFFS			1     /*PCI ExpressDevice Type Control*/
+#define PXCR_DEV_TYPE_CTRL_MASK			BIT1
+#define PXCR_DEV_TYPE_CTRL_CMPLX		(1 << PXCR_DEV_TYPE_CTRL_OFFS)
+#define PXCR_DEV_TYPE_CTRL_POINT		(0 << PXCR_DEV_TYPE_CTRL_OFFS)
+#define PXCR_CFG_MAP_TO_MEM_EN			BIT2  /* Configuration Header Mapping 
+											   to Memory Space Enable         */
+
+#define PXCR_CFG_MAP_TO_MEM_EN			BIT2 /* Configuration Header Mapping 
+											   to Memory Space Enable*/
+
+#define PXCR_RSRV1_OFFS					5
+#define PXCR_RSRV1_MASK					(0x7 << PXCR_RSRV1_OFFS)
+#define PXCR_RSRV1_VAL					(0x0 << PXCR_RSRV1_OFFS)
+
+#define PXCR_CONF_MAX_OUTSTND_OFFS		8 /*Maximum outstanding NP requests as a master*/
+#define PXCR_CONF_MAX_OUTSTND_MASK		(0x3 << PXCR_CONF_MAX_OUTSTND_OFFS)
+
+
+#define PXCR_CONF_NFTS_OFFS				16 /*number of FTS Ordered-Sets*/
+#define PXCR_CONF_NFTS_MASK				(0xff << PXCR_CONF_NFTS_OFFS)
+
+#define PXCR_CONF_MSTR_HOT_RESET		BIT24 /*Master Hot-Reset.*/
+#define PXCR_CONF_MSTR_LB				BIT26 /* Master Loopback */
+#define PXCR_CONF_MSTR_DIS_SCRMB		BIT27 /* Master Disable Scrambling*/
+#define PXCR_CONF_DIRECT_DIS_SCRMB		BIT28 /* Direct Disable Scrambling*/
+
+/* PCI Express Status Register */
+/* PEX_STATUS_REG (PXSR) */
+
+#define PXSR_DL_DOWN					BIT0 /* DL_Down indication.*/
+
+#define PXSR_PEX_BUS_NUM_OFFS			8 /* Bus Number Indication */
+#define PXSR_PEX_BUS_NUM_MASK			(0xff << PXSR_PEX_BUS_NUM_OFFS)
+
+#define PXSR_PEX_DEV_NUM_OFFS			16 /* Device Number Indication */
+#define PXSR_PEX_DEV_NUM_MASK			(0x1f << PXSR_PEX_DEV_NUM_OFFS)
+
+#define PXSR_PEX_SLV_HOT_RESET			BIT24 /* Slave Hot Reset Indication*/
+#define PXSR_PEX_SLV_DIS_LINK			BIT25 /* Slave Disable Link Indication*/
+#define PXSR_PEX_SLV_LB					BIT26 /* Slave Loopback Indication*/
+#define PXSR_PEX_SLV_DIS_SCRMB			BIT27 /* Slave Disable Scrambling Indication*/
+
+
+/* PCI Express Completion Timeout Register */
+/* PEX_COMPLT_TMEOUT_REG (PXCTR)*/
+
+#define PXCTR_CMP_TO_THRSHLD_OFFS		0 /* Completion Timeout Threshold */
+#define PXCTR_CMP_TO_THRSHLD_MASK		(0xffff << PXCTR_CMP_TO_THRSHLD_OFFS)
+
+/* PCI Express Power Management Extended Register */
+/* PEX_PWR_MNG_EXT_REG (PXPMER) */
+
+#define PXPMER_L1_ASPM_EN_OFFS			1
+#define PXPMER_L1_ASPM_EN_MASK			(0x1 << PXPMER_L1_ASPM_EN_OFFS)
+
+/* PCI Express Flow Control Register */
+/* PEX_FLOW_CTRL_REG (PXFCR)*/
+
+#define PXFCR_PH_INIT_FC_OFFS			0 /*Posted Headers Flow Control Credit
+										    Initial Value.*/
+#define PXFCR_PH_INIT_FC_MASK			(0xff << PXFCR_PH_INIT_FC_OFFS)
+
+
+#define PXFCR_NPH_INIT_FC_OFFS			8 /* Classified Non-Posted Headers
+											 Flow Control Credit Initial Value*/
+#define PXFCR_NPH_INIT_FC_MASK			(0xff << PXFCR_NPH_INIT_FC_OFFS)
+
+#define PXFCR_CH_INIT_FC_OFFS			16 /* Completion Headers Flow Control
+											  Credit Initial Value Infinite*/
+										
+#define PXFCR_CH_INIT_FC_MASK			(0xff << PXFCR_CH_INIT_FC_OFFS)
+
+#define PXFCR_FC_UPDATE_TO_OFFS			24 /* Flow Control Update Timeout */
+#define PXFCR_FC_UPDATE_TO_MASK			(0xff << PXFCR_FC_UPDATE_TO_OFFS)
+
+/* PCI Express Acknowledge Timers (4X) Register */
+/* PEX_ACK_TMR_4X_REG (PXAT4R) */
+#define PXAT1R_ACK_LAT_TOX4_OFFS		0  /* Ack Latency Timer Timeout Value */
+#define PXAT1R_ACK_LAT_TOX4_MASK		(0xffff << PXAT4R_ACK_LAT_TOX1_OFFS)
+#define PXAT1R_ACK_RPLY_TOX4_OFFS		16 /* Ack Replay Timer Timeout Value  */
+#define PXAT1R_ACK_RPLY_TOX4_MASK		(0xffff << PXAT1R_ACK_RPLY_TOX1_OFFS)
+
+/* PCI Express Acknowledge Timers (1X) Register */
+/* PEX_ACK_TMR_1X_REG (PXAT1R) */
+
+#define PXAT1R_ACK_LAT_TOX1_OFFS		0 /* Acknowledge Latency Timer Timeout
+										     Value for 1X Link*/
+#define PXAT1R_ACK_LAT_TOX1_MASK		(0xffff << PXAT1R_ACK_LAT_TOX1_OFFS)
+
+#define PXAT1R_ACK_RPLY_TOX1_OFFS		16 /* Acknowledge Replay Timer Timeout
+											  Value for 1X*/
+#define PXAT1R_ACK_RPLY_TOX1_MASK		(0xffff << PXAT1R_ACK_RPLY_TOX1_OFFS)
+
+
+/* PCI Express TL Control Register */
+/* PEX_TL_CTRL_REG (PXTCR) */
+
+#define PXTCR_TX_CMP_BUFF_NO_OFFS		8 /*Number of completion buffers in Tx*/
+#define PXTCR_TX_CMP_BUFF_NO_MASK		(0xf << PXTCR_TX_CMP_BUFF_NO_OFFS)
+
+/* PCI Express Debug MAC Control Register */
+/* PEX_DEBUG_MAC_CTRL_REG (PXDMCR) */
+
+#define PXDMCR_LINKUP					BIT4
+
+
+
+/**********************************************/
+/* PCI Express Configuration Header Registers */
+/**********************************************/
+#define PEX_CFG_DIRECT_ACCESS(pexIf,cfgReg)	((PEX_IF_BASE(pexIf)) + (cfgReg))
+
+#define PEX_DEVICE_AND_VENDOR_ID					0x000
+#define PEX_STATUS_AND_COMMAND						0x004
+#define PEX_CLASS_CODE_AND_REVISION_ID			    0x008
+#define PEX_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE		0x00C
+#define PEX_MEMORY_BAR_BASE_ADDR(barNum)		 	(0x010 + ((barNum) << 2))
+#define PEX_MV_BAR_BASE(barNum)						(0x010 + (barNum) * 8)
+#define PEX_MV_BAR_BASE_HIGH(barNum)				(0x014 + (barNum) * 8)
+#define PEX_BAR0_INTER_REG							0x010
+#define PEX_BAR0_INTER_REG_HIGH						0x014
+#define PEX_BAR1_REG								0x018
+#define PEX_BAR1_REG_HIGH							0x01C
+#define PEX_BAR2_REG								0x020
+#define PEX_BAR2_REG_HIGH							0x024
+
+#define PEX_SUBSYS_ID_AND_SUBSYS_VENDOR_ID			0x02C
+#define PEX_EXPANSION_ROM_BASE_ADDR_REG				0x030
+#define PEX_CAPABILTY_LIST_POINTER					0x034
+#define PEX_INTERRUPT_PIN_AND_LINE					0x03C
+
+/* capability list */
+#define PEX_POWER_MNG_CAPABILITY		            0x040
+#define PEX_POWER_MNG_STATUS_CONTROL		        0x044
+
+#define PEX_MSI_MESSAGE_CONTROL						0x050
+#define PEX_MSI_MESSAGE_ADDR		                0x054
+#define PEX_MSI_MESSAGE_HIGH_ADDR		            0x058
+#define PEX_MSI_MESSAGE_DATA		                0x05C
+
+#define PEX_CAPABILITY_REG							0x60
+#define PEX_DEV_CAPABILITY_REG						0x64
+#define PEX_DEV_CTRL_STAT_REG						0x68
+#define PEX_LINK_CAPABILITY_REG						0x6C
+#define PEX_LINK_CTRL_STAT_REG						0x70
+
+#define PEX_ADV_ERR_RPRT_HDR_TRGT_REG				0x100
+#define PEX_UNCORRECT_ERR_STAT_REG					0x104
+#define PEX_UNCORRECT_ERR_MASK_REG					0x108
+#define PEX_UNCORRECT_ERR_SERVITY_REG				0x10C
+#define PEX_CORRECT_ERR_STAT_REG					0x110
+#define PEX_CORRECT_ERR_MASK_REG					0x114
+#define PEX_ADV_ERR_CAPABILITY_CTRL_REG				0x118
+#define PEX_HDR_LOG_FIRST_DWORD_REG					0x11C
+#define PEX_HDR_LOG_SECOND_DWORD_REG				0x120
+#define PEX_HDR_LOG_THIRD_DWORD_REG					0x124
+#define PEX_HDR_LOG_FOURTH_DWORD_REG				0x128
+
+
+
+/* PCI Express Device and Vendor ID Register*/
+/*PEX_DEVICE_AND_VENDOR_ID (PXDAVI)*/
+
+#define PXDAVI_VEN_ID_OFFS			0 	/* Vendor ID */
+#define PXDAVI_VEN_ID_MASK			(0xffff << PXDAVI_VEN_ID_OFFS)
+
+#define PXDAVI_DEV_ID_OFFS			16	/* Device ID */
+#define PXDAVI_DEV_ID_MASK  		(0xffff << PXDAVI_DEV_ID_OFFS)
+
+
+/* PCI Express Command and Status Register*/
+/*PEX_STATUS_AND_COMMAND (PXSAC)*/
+
+#define PXSAC_IO_EN			BIT0 	/* IO Enable 							  */
+#define PXSAC_MEM_EN		BIT1	/* Memory Enable 						  */
+#define PXSAC_MASTER_EN		BIT2	/* Master Enable 						  */
+#define PXSAC_PERR_EN		BIT6	/* Parity Errors Respond Enable 		  */
+#define PXSAC_SERR_EN		BIT8	/* Ability to assert SERR# line			  */
+#define PXSAC_INT_DIS		BIT10   /* Interrupt Disable 					  */
+#define PXSAC_INT_STAT		BIT19   /* Interrupt Status 			*/
+#define PXSAC_CAP_LIST		BIT20	/* Capability List Support 				  */
+#define PXSAC_MAS_DATA_PERR	BIT24   /* Master Data Parity Error				  */
+#define PXSAC_SLAVE_TABORT	BIT27	/* Signalled Target Abort 	*/
+#define PXSAC_RT_ABORT		BIT28	/* Recieved Target Abort 	*/
+#define PXSAC_MABORT			BIT29	/* Recieved Master Abort 	*/
+#define PXSAC_SYSERR			BIT30	/* Signalled system error 	*/
+#define PXSAC_DET_PARERR		BIT31	/* Detect Parity Error 		*/
+
+
+/* PCI Express Class Code and Revision ID Register*/
+/*PEX_CLASS_CODE_AND_REVISION_ID (PXCCARI)*/       
+
+#define PXCCARI_REVID_OFFS		0		/* Revision ID */
+#define PXCCARI_REVID_MASK		(0xff << PXCCARI_REVID_OFFS)
+
+#define PXCCARI_FULL_CLASS_OFFS	8		/* Full Class Code */
+#define PXCCARI_FULL_CLASS_MASK	(0xffffff << PXCCARI_FULL_CLASS_OFFS)
+
+#define PXCCARI_PROGIF_OFFS		8		/* Prog .I/F*/
+#define PXCCARI_PROGIF_MASK		(0xff << PXCCARI_PROGIF_OFFS)
+
+#define PXCCARI_SUB_CLASS_OFFS	16		/* Sub Class*/
+#define PXCCARI_SUB_CLASS_MASK	(0xff << PXCCARI_SUB_CLASS_OFFS)
+
+#define PXCCARI_BASE_CLASS_OFFS	24		/* Base Class*/
+#define PXCCARI_BASE_CLASS_MASK	(0xff << PXCCARI_BASE_CLASS_OFFS)
+
+
+/* PCI Express BIST, Header Type and Cache Line Size Register*/
+/*PEX_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE (PXBHTLTCL)*/ 
+
+#define PXBHTLTCL_CACHELINE_OFFS		0	/* Specifies the cache line size */
+#define PXBHTLTCL_CACHELINE_MASK		(0xff << PXBHTLTCL_CACHELINE_OFFS)
+
+#define PXBHTLTCL_HEADTYPE_FULL_OFFS	16	/* Full Header Type */
+#define PXBHTLTCL_HEADTYPE_FULL_MASK	(0xff << PXBHTLTCL_HEADTYPE_FULL_OFFS)
+
+#define PXBHTLTCL_MULTI_FUNC			BIT23	/* Multi/Single function */
+
+#define PXBHTLTCL_HEADER_OFFS			16		/* Header type */
+#define PXBHTLTCL_HEADER_MASK			(0x7f << PXBHTLTCL_HEADER_OFFS)
+#define PXBHTLTCL_HEADER_STANDARD		(0x0 << PXBHTLTCL_HEADER_OFFS)
+#define PXBHTLTCL_HEADER_PCI2PCI_BRIDGE	(0x1 << PXBHTLTCL_HEADER_OFFS)
+
+
+#define PXBHTLTCL_BISTCOMP_OFFS		24	/* BIST Completion Code */
+#define PXBHTLTCL_BISTCOMP_MASK		(0xf << PXBHTLTCL_BISTCOMP_OFFS)
+
+#define PXBHTLTCL_BISTACT			BIT30	/* BIST Activate bit */
+#define PXBHTLTCL_BISTCAP			BIT31	/* BIST Capable Bit */
+#define PXBHTLTCL_BISTCAP_OFFS		31	
+#define PXBHTLTCL_BISTCAP_MASK		BIT31	
+#define PXBHTLTCL_BISTCAP_VAL		0
+
+
+/* PCI Express Subsystem Device and Vendor ID */
+/*PEX_SUBSYS_ID_AND_SUBSYS_VENDOR_ID (PXSIASVI)*/
+
+#define PXSIASVI_VENID_OFFS	0	/* Subsystem Manufacturer Vendor ID Number */
+#define PXSIASVI_VENID_MASK	(0xffff << PXSIASVI_VENID_OFFS)
+
+#define PXSIASVI_DEVID_OFFS	16	/* Subsystem Device ID Number */
+#define PXSIASVI_DEVID_MASK	(0xffff << PXSIASVI_DEVID_OFFS)
+
+
+/* PCI Express Capability List Pointer Register*/
+/*PEX_CAPABILTY_LIST_POINTER (PXCLP)*/
+
+#define PXCLP_CAPPTR_OFFS	0		/* Capability List Pointer */
+#define PXCLP_CAPPTR_MASK	(0xff << PXCLP_CAPPTR_OFFS)
+
+/* PCI Express Interrupt Pin and Line Register */
+/*PEX_INTERRUPT_PIN_AND_LINE (PXIPAL)*/
+
+#define PXIPAL_INTLINE_OFFS	0	/* Interrupt line (IRQ) */
+#define PXIPAL_INTLINE_MASK	(0xff << PXIPAL_INTLINE_OFFS)
+
+#define PXIPAL_INTPIN_OFFS	8	/* interrupt pin (A,B,C,D) */
+#define PXIPAL_INTPIN_MASK	(0xff << PXIPAL_INTPIN_OFFS)
+
+
+/* PCI Express Power Management Capability Header Register*/
+/*PEX_POWER_MNG_CAPABILITY (PXPMC)*/
+
+#define PXPMC_CAP_ID_OFFS		0 /* Capability ID */
+#define PXPMC_CAP_ID_MASK		(0xff << PXPMC_CAP_ID_OFFS)
+
+#define PXPMC_NEXT_PTR_OFFS		8 /* Next Item Pointer */
+#define PXPMC_NEXT_PTR_MASK		(0xff << PXPMC_NEXT_PTR_OFFS)
+
+#define PXPMC_PMC_VER_OFFS		16 /* PCI Power Management Capability Version*/
+#define PXPMC_PMC_VER_MASK		(0x7 << PXPMC_PMC_VER_OFFS)
+
+#define PXPMC_DSI 				BIT21/* Device Specific Initialization */
+
+#define PXPMC_AUX_CUR_OFFS		22 /* Auxiliary Current Requirements */
+#define PXPMC_AUX_CUR_MASK		(0x7 << PXPMC_AUX_CUR_OFFS)
+
+#define PXPMC_D1_SUP 			BIT25 /* D1 Power Management support*/
+
+#define PXPMC_D2_SUP 			BIT26 /* D2 Power Management support*/
+
+#define PXPMC_PME_SUP_OFFS		27 /* PM Event generation support*/
+#define PXPMC_PME_SUP_MASK		(0x1f << PXPMC_PME_SUP_OFFS)
+
+/* PCI Express Power Management Control and Status Register*/
+/*PEX_POWER_MNG_STATUS_CONTROL (PXPMSC)*/
+
+#define PXPMSC_PM_STATE_OFFS	0	/* Power State */
+#define PXPMSC_PM_STATE_MASK	(0x3 << PXPMSC_PM_STATE_OFFS)
+#define PXPMSC_PM_STATE_D0		(0x0 << PXPMSC_PM_STATE_OFFS)
+#define PXPMSC_PM_STATE_D1		(0x1 << PXPMSC_PM_STATE_OFFS)
+#define PXPMSC_PM_STATE_D2		(0x2 << PXPMSC_PM_STATE_OFFS)
+#define PXPMSC_PM_STATE_D3		(0x3 << PXPMSC_PM_STATE_OFFS)
+
+#define PXPMSC_PME_EN			BIT8/* PM_PME Message Generation Enable */
+
+#define PXPMSC_PM_DATA_SEL_OFFS	9	/* Data Select*/
+#define PXPMSC_PM_DATA_SEL_MASK	(0xf << PXPMSC_PM_DATA_SEL_OFFS)
+
+#define PXPMSC_PM_DATA_SCALE_OFFS	13	/* Data Scale */
+#define PXPMSC_PM_DATA_SCALE_MASK	(0x3 << PXPMSC_PM_DATA_SCALE_OFFS)
+
+#define PXPMSC_PME_STAT				BIT15/* PME Status */
+
+#define PXPMSC_PM_DATA_OFFS			24		/* State Data */
+#define PXPMSC_PM_DATA_MASK			(0xff << PXPMSC_PM_DATA_OFFS)
+
+
+/* PCI Express MSI Message Control Register*/								 
+/*PEX_MSI_MESSAGE_CONTROL (PXMMC)*/
+
+#define PXMMC_CAP_ID_OFFS			0 /* Capability ID */
+#define PXMMC_CAP_ID_MASK			(0xff << PXMMC_CAP_ID_OFFS)
+
+#define PXMMC_NEXT_PTR_OFFS			8 /* Next Item Pointer */
+#define PXMMC_NEXT_PTR_MASK			(0xff << PXMMC_NEXT_PTR_OFFS)
+
+#define PXMMC_MSI_EN				BIT18 /* MSI Enable */
+
+#define PXMMC_MULTI_CAP_OFFS		17 /* Multiple Message Capable */
+#define PXMMC_MULTI_CAP_MASK		(0x7 << PXMMC_MULTI_CAP_OFFS)
+
+#define PXMMC_MULTI_EN_OFFS			20  /* Multiple Messages Enable */
+#define PXMMC_MULTI_EN_MASK			(0x7 << PXMMC_MULTI_EN_OFFS)
+
+#define PXMMC_ADDR64				BIT23	/* 64-bit Addressing Capable */
+
+
+/* PCI Express MSI Message Address Register*/
+/*PEX_MSI_MESSAGE_ADDR (PXMMA)*/
+
+#define PXMMA_MSI_ADDR_OFFS			2 /* Message Address  corresponds to 
+										Address[31:2] of the MSI MWr TLP*/
+#define PXMMA_MSI_ADDR_MASK			(0x3fffffff << PXMMA_MSI_ADDR_OFFS)
+
+
+/* PCI Express MSI Message Address (High) Register */
+/*PEX_MSI_MESSAGE_HIGH_ADDR (PXMMHA)*/
+
+#define PXMMA_MSI_ADDR_H_OFFS		0 /* Message Upper Address corresponds to 
+											Address[63:32] of the MSI MWr TLP*/
+#define PXMMA_MSI_ADDR_H_MASK		(0xffffffff << PXMMA_MSI_ADDR_H_OFFS )
+
+
+/* PCI Express MSI Message Data Register*/
+/*PEX_MSI_MESSAGE_DATA (PXMMD)*/
+
+#define PXMMD_MSI_DATA_OFFS 		0 /* Message Data */
+#define PXMMD_MSI_DATA_MASK 		(0xffff << PXMMD_MSI_DATA_OFFS )
+
+
+/* PCI Express Capability Register*/								 
+/*PEX_CAPABILITY_REG (PXCR)*/
+
+#define PXCR_CAP_ID_OFFS			0	/* Capability ID*/
+#define PXCR_CAP_ID_MASK			(0xff << PXCR_CAP_ID_OFFS)
+
+#define PXCR_NEXT_PTR_OFFS			8 /* Next Item Pointer*/
+#define PXCR_NEXT_PTR_MASK			(0xff << PXCR_NEXT_PTR_OFFS)
+
+#define PXCR_CAP_VER_OFFS			16 /* Capability Version*/
+#define PXCR_CAP_VER_MASK			(0xf << PXCR_CAP_VER_OFFS)
+
+#define PXCR_DEV_TYPE_OFFS			20 /*  Device/Port Type*/
+#define PXCR_DEV_TYPE_MASK			(0xf << PXCR_DEV_TYPE_OFFS)
+
+#define PXCR_SLOT_IMP 				BIT24 /* Slot Implemented*/
+
+#define PXCR_INT_MSG_NUM_OFFS		25 /* Interrupt Message Number*/
+#define PXCR_INT_MSG_NUM_MASK		(0x1f << PXCR_INT_MSG_NUM_OFFS)
+
+
+/* PCI Express Device Capabilities Register */
+/*PEX_DEV_CAPABILITY_REG (PXDCR)*/
+
+#define PXDCR_MAX_PLD_SIZE_SUP_OFFS			0 /* Maximum Payload Size Supported*/
+#define PXDCR_MAX_PLD_SIZE_SUP_MASK			(0x7 << PXDCR_MAX_PLD_SIZE_SUP_OFFS)
+
+#define PXDCR_EP_L0S_ACC_LAT_OFFS			6/* Endpoint L0s Acceptable Latency*/
+#define PXDCR_EP_L0S_ACC_LAT_MASK			(0x7 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_64NS_LESS		(0x0 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_64NS_128NS		(0x1 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_128NS_256NS	(0x2 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_256NS_512NS	(0x3 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_512NS_1US		(0x4 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_1US_2US		(0x5 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_2US_4US		(0x6 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+#define PXDCR_EP_L0S_ACC_LAT_4US_MORE		(0x7 << PXDCR_EP_L0S_ACC_LAT_OFFS)
+
+#define PXDCR_EP_L1_ACC_LAT_OFFS 			9 /* Endpoint L1 Acceptable Latency*/
+#define PXDCR_EP_L1_ACC_LAT_MASK			(0x7 << PXDCR_EP_L1_ACC_LAT_OFFS)
+#define PXDCR_EP_L1_ACC_LAT_64NS_LESS       (0x0 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+#define PXDCR_EP_L1_ACC_LAT_64NS_128NS      (0x1 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+#define PXDCR_EP_L1_ACC_LAT_128NS_256NS     (0x2 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+#define PXDCR_EP_L1_ACC_LAT_256NS_512NS     (0x3 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+#define PXDCR_EP_L1_ACC_LAT_512NS_1US       (0x4 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+#define PXDCR_EP_L1_ACC_LAT_1US_2US         (0x5 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+#define PXDCR_EP_L1_ACC_LAT_2US_4US         (0x6 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+#define PXDCR_EP_L1_ACC_LAT_4US_MORE        (0x7 << PXDCR_EP_L1_ACC_LAT_OFFS) 
+
+
+#define PXDCR_ATT_BUT_PRS_OFFS				12 /* Attention Button Present*/
+#define PXDCR_ATT_BUT_PRS_MASK				BIT12
+#define PXDCR_ATT_BUT_PRS_IMPLEMENTED		BIT12
+
+#define PXDCR_ATT_IND_PRS_OFFS				13 /* Attention Indicator Present*/
+#define PXDCR_ATT_IND_PRS_MASK				BIT13
+#define PXDCR_ATT_IND_PRS_IMPLEMENTED		BIT13
+
+#define PXDCR_PWR_IND_PRS_OFFS        		14/* Power Indicator Present*/
+#define PXDCR_PWR_IND_PRS_MASK       		BIT14
+#define PXDCR_PWR_IND_PRS_IMPLEMENTED		BIT14
+
+#define PXDCR_CAP_SPL_VAL_OFFS				18 /*Captured Slot Power Limit 
+												 Value*/
+#define PXDCR_CAP_SPL_VAL_MASK				(0xff << PXDCR_CAP_SPL_VAL_OFFS)
+
+#define PXDCR_CAP_SP_LSCL_OFFS				26 /* Captured Slot Power Limit
+												  Scale */
+#define PXDCR_CAP_SP_LSCL_MASK				(0x3 << PXDCR_CAP_SP_LSCL_OFFS)
+
+/* PCI Express Device Control Status Register */
+/*PEX_DEV_CTRL_STAT_REG (PXDCSR)*/
+
+#define PXDCSR_COR_ERR_REP_EN		BIT0 /* Correctable Error Reporting Enable*/
+#define PXDCSR_NF_ERR_REP_EN		BIT1 /* Non-Fatal Error Reporting Enable*/
+#define PXDCSR_F_ERR_REP_EN			BIT2 /* Fatal Error Reporting Enable*/
+#define PXDCSR_UR_REP_EN			BIT3 /* Unsupported Request (UR) 
+													Reporting Enable*/
+#define PXDCSR_EN_RO 				BIT4 /* Enable Relaxed Ordering*/
+
+#define PXDCSR_MAX_PLD_SZ_OFFS		5	 /* Maximum Payload Size*/
+#define PXDCSR_MAX_PLD_SZ_MASK		(0x7 << PXDCSR_MAX_PLD_SZ_OFFS)
+#define PXDCSR_MAX_PLD_SZ_128B		(0x0 << PXDCSR_MAX_PLD_SZ_OFFS)
+#define PXDCSR_EN_NS				BIT11  /* Enable No Snoop*/
+
+#define PXDCSR_MAX_RD_RQ_SZ_OFFS	12 /* Maximum Read Request Size*/
+#define PXDCSR_MAX_RD_RQ_SZ_MASK	(0x7 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
+#define PXDCSR_MAX_RD_RQ_SZ_128B	(0x0 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
+#define PXDCSR_MAX_RD_RQ_SZ_256B	(0x1 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
+#define PXDCSR_MAX_RD_RQ_SZ_512B	(0x2 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
+#define PXDCSR_MAX_RD_RQ_SZ_1KB		(0x3 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
+#define PXDCSR_MAX_RD_RQ_SZ_2KB		(0x4 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
+#define PXDCSR_MAX_RD_RQ_SZ_4KB		(0x5 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
+
+#define PXDCSR_COR_ERR_DET 			BIT16 /* Correctable Error Detected*/
+#define PXDCSR_NF_ERR_DET 			BIT17 /* Non-Fatal Error Detected.*/
+#define PXDCSR_F_ERR_DET 			BIT18 /* Fatal Error Detected.*/
+#define PXDCSR_UR_DET				BIT19 /* Unsupported Request Detected */
+#define PXDCSR_AUX_PWR_DET 			BIT20 /* Reserved*/
+
+#define PXDCSR_TRANS_PEND_OFFS 			21 /* Transactions Pending*/
+#define PXDCSR_TRANS_PEND_MASK 			BIT21
+#define PXDCSR_TRANS_PEND_NOT_COMPLETED (0x1 << PXDCSR_TRANS_PEND_OFFS)
+
+
+/* PCI Express Link Capabilities Register*/
+/*PEX_LINK_CAPABILITY_REG (PXLCR)*/
+
+#define PXLCR_MAX_LINK_SPD_OFFS		0 /* Maximum Link Speed*/
+#define PXLCR_MAX_LINK_SPD_MASK		(0xf << PXLCR_MAX_LINK_SPD_OFFS)
+
+#define PXLCR_MAX_LNK_WDTH_OFFS 	3 /* Maximum Link Width*/
+#define PXLCR_MAX_LNK_WDTH_MASK		(0x3f << PXLCR_MAX_LNK_WDTH_OFFS)
+
+#define PXLCR_ASPM_SUP_OFFS 		10 /* Active State Link PM Support*/
+#define PXLCR_ASPM_SUP_MASK			(0x3 << PXLCR_ASPM_SUP_OFFS)
+
+#define PXLCR_L0S_EXT_LAT_OFFS 			12 /* L0s Exit Latency*/
+#define PXLCR_L0S_EXT_LAT_MASK			(0x7 << PXLCR_L0S_EXT_LAT_OFFS)
+#define PXLCR_L0S_EXT_LAT_64NS_LESS     (0x0 << PXDCR_EP_L1_ACC_LAT_OFFS)  
+#define PXLCR_L0S_EXT_LAT_64NS_128NS   	(0x1 << PXDCR_EP_L1_ACC_LAT_OFFS)  
+#define PXLCR_L0S_EXT_LAT_128NS_256NS   (0x2 << PXDCR_EP_L1_ACC_LAT_OFFS)  
+#define PXLCR_L0S_EXT_LAT_256NS_512NS   (0x3 << PXDCR_EP_L1_ACC_LAT_OFFS)  
+#define PXLCR_L0S_EXT_LAT_512NS_1US     (0x4 << PXDCR_EP_L1_ACC_LAT_OFFS)  
+#define PXLCR_L0S_EXT_LAT_1US_2US       (0x5 << PXDCR_EP_L1_ACC_LAT_OFFS)  
+#define PXLCR_L0S_EXT_LAT_2US_4US       (0x6 << PXDCR_EP_L1_ACC_LAT_OFFS)  
+
+#define PXLCR_POR_TNUM_OFFS 			24 /* Port Number */
+#define PXLCR_POR_TNUM_MASK				(0xff << PXLCR_POR_TNUM_OFFS)
+
+/* PCI Express Link Control Status Register */
+/*PEX_LINK_CTRL_STAT_REG (PXLCSR)*/
+
+#define PXLCSR_ASPM_CNT_OFFS			0 /* Active State Link PM Control */
+#define PXLCSR_ASPM_CNT_MASK			(0x3 << PXLCSR_ASPM_CNT_OFFS)
+#define PXLCSR_ASPM_CNT_DISABLED		(0x0 << PXLCSR_ASPM_CNT_OFFS)
+#define PXLCSR_ASPM_CNT_L0S_ENT_SUPP		(0x1 << PXLCSR_ASPM_CNT_OFFS)
+#define PXLCSR_ASPM_CNT_L1S_ENT_SUPP		(0x2 << PXLCSR_ASPM_CNT_OFFS)
+#define PXLCSR_ASPM_CNT_L0S_L1S_ENT_SUPP	(0x3 << PXLCSR_ASPM_CNT_OFFS)
+
+#define PXLCSR_RCB_OFFS				3 /* Read Completion Boundary */
+#define PXLCSR_RCB_MASK				BIT3
+#define PXLCSR_RCB_64B				(0 << PXLCSR_RCB_OFFS)
+#define PXLCSR_RCB_128B				(1 << PXLCSR_RCB_OFFS)
+
+#define PXLCSR_LNK_DIS 				BIT4 /* Link Disable */
+#define PXLCSR_RETRN_LNK 			BIT5 /* Retrain Link */
+#define PXLCSR_CMN_CLK_CFG			BIT6 /* Common Clock Configuration */
+#define PXLCSR_EXTD_SNC 			BIT7 /* Extended Sync */
+
+#define PXLCSR_LNK_SPD_OFFS 		16 /* Link Speed */
+#define PXLCSR_LNK_SPD_MASK			(0xf << PXLCSR_LNK_SPD_OFFS)
+
+#define PXLCSR_NEG_LNK_WDTH_OFFS	20  /* Negotiated Link Width */
+#define PXLCSR_NEG_LNK_WDTH_MASK 	(0x3f << PXLCSR_NEG_LNK_WDTH_OFFS)
+#define PXLCSR_NEG_LNK_WDTH_X1		(0x1 << PXLCSR_NEG_LNK_WDTH_OFFS)
+
+#define PXLCSR_LNK_TRN 				BIT27 /* Link Training */
+
+#define PXLCSR_SLT_CLK_CFG_OFFS		28 /* Slot Clock Configuration */
+#define PXLCSR_SLT_CLK_CFG_MASK		BIT28
+#define PXLCSR_SLT_CLK_CFG_INDPNT	(0x0 << PXLCSR_SLT_CLK_CFG_OFFS)
+#define PXLCSR_SLT_CLK_CFG_REF		(0x1 << PXLCSR_SLT_CLK_CFG_OFFS)
+								
+/* PCI Express Advanced Error Report Header Register */								 
+/*PEX_ADV_ERR_RPRT_HDR_TRGT_REG (PXAERHTR)*/
+
+/* PCI Express Uncorrectable Error Status Register*/
+/*PEX_UNCORRECT_ERR_STAT_REG (PXUESR)*/
+
+/* PCI Express Uncorrectable Error Mask Register */
+/*PEX_UNCORRECT_ERR_MASK_REG (PXUEMR)*/
+
+/* PCI Express Uncorrectable Error Severity Register */
+/*PEX_UNCORRECT_ERR_SERVITY_REG (PXUESR)*/
+
+/* PCI Express Correctable Error Status Register */
+/*PEX_CORRECT_ERR_STAT_REG (PXCESR)*/
+
+/* PCI Express Correctable Error Mask Register */
+/*PEX_CORRECT_ERR_MASK_REG (PXCEMR)*/
+
+/* PCI Express Advanced Error Capability and Control Register*/
+/*PEX_ADV_ERR_CAPABILITY_CTRL_REG (PXAECCR)*/
+
+/* PCI Express Header Log First DWORD Register*/
+/*PEX_HDR_LOG_FIRST_DWORD_REG (PXHLFDR)*/
+
+/* PCI Express Header Log Second DWORD Register*/
+/*PEX_HDR_LOG_SECOND_DWORD_REG (PXHLSDR)*/
+
+/* PCI Express Header Log Third DWORD Register*/
+/*PEX_HDR_LOG_THIRD_DWORD_REG (PXHLTDR)*/
+
+/* PCI Express Header Log Fourth DWORD Register*/
+/*PEX_HDR_LOG_FOURTH_DWORD_REG (PXHLFDR)*/
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* #ifndef __INCPEXREGSH */
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c
new file mode 100644
index 00000000..19c871ae
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c
@@ -0,0 +1,313 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvPex.h"
+
+//#define MV_DEBUG
+/* defines  */       
+#ifdef MV_DEBUG         
+	#define DB(x)	x
+#else                
+	#define DB(x)    
+#endif	             
+
+/* locals */         
+typedef struct
+{
+	MV_U32 data;
+	MV_U32 mask;
+}PEX_HEADER_DATA;
+
+/* local function forwad decleration */
+MV_U32 mvPexHwConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
+                        MV_U32 regOff);
+MV_STATUS mvPexHwConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev, 
+                           MV_U32 func, MV_U32 regOff, MV_U32 data);
+void resetPexConfig(MV_U32 pexIf, MV_U32 bus, MV_U32 dev);
+
+
+PEX_HEADER_DATA configHdr[16] = 
+{
+{0x888811ab, 0x00000000}, /*[device ID, vendor ID] */
+{0x00100007, 0x0000ffff}, /*[status register, command register] */  
+{0x0604000e, 0x00000000}, /*[programming interface, sub class code, class code, revision ID] */
+{0x00010008, 0x00000000},  /*[BIST, header type, latency time, cache line] */
+{0x00000000, 0x00000000},  /*[base address 0] */             
+{0x00000000, 0x00000000},  /*[base address 1] */             
+{0x00000000, 0x00ffffff},  /*[secondary latency timersubordinate bus number, secondary bus number, primary bus number] */         
+{0x0000f101, 0x00000000},  /*[secondary status ,IO limit, IO base] */
+{0x9ff0a000, 0x00000000},  /*[memory limit, memory base] */                
+{0x0001fff1, 0x00000000},  /*[prefetch memory limit, prefetch memory base] */       
+{0xffffffff, 0x00000000},  /*[prefetch memory base upper] */ 
+{0x00000000, 0x00000000},  /*[prefetch memory limit upper] */
+{0xeffff000, 0x00000000},  /*[IO limit upper 16 bits, IO base upper 16 bits] */      
+{0x00000000, 0x00000000},  /*[reserved, capability pointer] */ 
+{0x00000000, 0x00000000},  /*[expansion ROM base address] */ 
+{0x00000000, 0x000000FF},  /*[bridge control, interrupt pin, interrupt line] */             
+};
+
+
+#define HEADER_WRITE(data, offset) configHdr[offset/4].data = ((configHdr[offset/4].data & ~configHdr[offset/4].mask) | \
+																(data & configHdr[offset/4].mask))
+#define HEADER_READ(offset) configHdr[offset/4].data
+
+/*******************************************************************************
+* mvVrtBrgPexInit - Initialize PEX interfaces
+*
+* DESCRIPTION:
+*
+* This function is responsible of intialization of the Pex Interface , It 
+* configure the Pex Bars and Windows in the following manner:
+*
+*  Assumptions : 
+*				Bar0 is always internal registers bar
+*			    Bar1 is always the DRAM bar
+*				Bar2 is always the Device bar
+*
+*  1) Sets the Internal registers bar base by obtaining the base from
+*	  the CPU Interface
+*  2) Sets the DRAM bar base and size by getting the base and size from
+*     the CPU Interface when the size is the sum of all enabled DRAM 
+*	  chip selects and the base is the base of CS0 .
+*  3) Sets the Device bar base and size by getting these values from the 
+*     CPU Interface when the base is the base of the lowest base of the
+*     Device chip selects, and the 
+*
+*
+* INPUT:
+*
+*       pexIf   -  PEX interface number.
+*
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK if function success otherwise MV_ERROR or MV_BAD_PARAM
+*
+*******************************************************************************/
+MV_STATUS mvPexVrtBrgInit(MV_U32 pexIf)
+{
+	/* reset PEX tree to recover previous U-boot/Boot configurations */
+	MV_U32 localBus = mvPexLocalBusNumGet(pexIf);
+
+
+	resetPexConfig(pexIf, localBus, 1);
+	return MV_OK;
+}
+
+
+MV_U32 mvPexVrtBrgConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
+                        MV_U32 regOff)
+{
+	
+	MV_U32 localBus = mvPexLocalBusNumGet(pexIf);
+	MV_U32 localDev = mvPexLocalDevNumGet(pexIf);
+	MV_U32 val;  
+	if(bus == localBus)
+	{
+		if(dev > 1)
+		{
+/* on the local device allow only device #0 & #1 */
+			return 0xffffffff;
+		}
+		else
+		if (dev == localDev)
+		{
+			/* read the memory controller registers */
+			return mvPexHwConfigRead (pexIf, bus, dev, func, regOff);
+		}
+		else
+		{
+			/* access the virtual brg header */
+			return HEADER_READ(regOff);
+		}
+	}
+	else
+	if(bus == (localBus + 1))
+	{
+		/* access the device behind the virtual bridge */
+		if((dev == localDev) || (dev > 1))
+		{
+			return 0xffffffff;
+		}
+		else
+		{
+			/* access the device behind the virtual bridge, in this case 
+			*  change the bus number to the local bus number in order to 
+			*  generate type 0 config cycle
+			*/			
+			mvPexLocalBusNumSet(pexIf, bus);
+			mvPexLocalDevNumSet(pexIf, 1);
+			val = mvPexHwConfigRead (pexIf, bus, 0, func, regOff);
+			mvPexLocalBusNumSet(pexIf, localBus);
+			mvPexLocalDevNumSet(pexIf, localDev);
+			return val;
+		}
+	}
+	/* for all other devices use the HW function to get the 
+	*  requested registers
+	*/
+	mvPexLocalDevNumSet(pexIf, 1);
+	val = mvPexHwConfigRead (pexIf, bus, dev, func, regOff);
+	mvPexLocalDevNumSet(pexIf, localDev);	
+	return val;
+}
+
+
+MV_STATUS mvPexVrtBrgConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev, 
+                           MV_U32 func, MV_U32 regOff, MV_U32 data)
+{
+	MV_U32 localBus = mvPexLocalBusNumGet(pexIf);
+	MV_U32 localDev = mvPexLocalDevNumGet(pexIf);
+	MV_STATUS	status;
+
+	if(bus == localBus)
+	{
+		if(dev > 1)
+		{
+			/* on the local device allow only device #0 & #1 */
+			return MV_ERROR;
+		}
+		else
+		if (dev == localDev)
+		{
+			/* read the memory controller registers */
+			return mvPexHwConfigWrite (pexIf, bus, dev, func, regOff, data);			
+		}
+		else
+		{
+			/* access the virtual brg header */
+			HEADER_WRITE(data, regOff);
+			return MV_OK;
+		}
+	}
+	else
+	if(bus == (localBus + 1))
+	{
+		/* access the device behind the virtual bridge */
+		if((dev == localDev) || (dev > 1))
+		{
+			return MV_ERROR;
+		}
+		else
+		{
+			/* access the device behind the virtual bridge, in this case 
+			*  change the bus number to the local bus number in order to 
+			*  generate type 0 config cycle
+			*/
+			//return mvPexHwConfigWrite (pexIf, localBus, dev, func, regOff, data);
+			mvPexLocalBusNumSet(pexIf, bus);
+			mvPexLocalDevNumSet(pexIf, 1);
+			status = mvPexHwConfigWrite (pexIf, bus, 0, func, regOff, data);
+			mvPexLocalBusNumSet(pexIf, localBus);
+			mvPexLocalDevNumSet(pexIf, localDev);
+			return status;
+
+		}
+	}
+	/* for all other devices use the HW function to get the 
+	*  requested registers
+	*/
+	mvPexLocalDevNumSet(pexIf, 1);
+	status = mvPexHwConfigWrite (pexIf, bus, dev, func, regOff, data);
+	mvPexLocalDevNumSet(pexIf, localDev);
+	return status;
+}
+
+
+
+
+void resetPexConfig(MV_U32 pexIf, MV_U32 bus, MV_U32 dev)
+{
+	MV_U32 tData;
+	MV_U32 i;
+
+	/* restore the PEX configuration to initialization state */
+	/* in case PEX P2P call recursive and reset config */
+	tData = mvPexHwConfigRead (pexIf, bus, dev, 0x0, 0x0);
+	if(tData != 0xffffffff)
+	{
+		/* agent had been found - check whether P2P */
+		tData = mvPexHwConfigRead (pexIf, bus, dev, 0x0, 0x8);
+		if((tData & 0xffff0000) == 0x06040000)
+		{/* P2P */
+			/* get the sec bus and the subordinate */
+			MV_U32 secBus;	
+			tData = mvPexHwConfigRead (pexIf, bus, dev, 0x0, 0x18);
+			secBus = ((tData >> 8) & 0xff);
+			/* now scan on sec bus */
+			for(i = 0;i < 0xff;i++)
+			{
+				resetPexConfig(pexIf, secBus, i);
+			}
+			/* now reset this device */
+			DB(mvOsPrintf("Reset bus %d dev %d\n", bus, dev));
+			mvPexHwConfigWrite(pexIf, bus, dev, 0x0, 0x18, 0x0); 
+			DB(mvOsPrintf("Reset bus %d dev %d\n", bus, dev));
+		}
+	}
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h
new file mode 100644
index 00000000..82eb72d5
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h
@@ -0,0 +1,82 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCVRTBRGPEXH
+#define __INCVRTBRGPEXH
+
+
+/* Global Functions prototypes */
+/* mvPexInit - Initialize PEX interfaces*/
+MV_STATUS mvPexVrtBrgInit(MV_U32 pexIf);
+
+/* mvPexConfigRead - Read from configuration space */
+MV_U32 mvPexVrtBrgConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
+						MV_U32 func,MV_U32 regOff);
+
+/* mvPexConfigWrite - Write to configuration space */
+MV_STATUS mvPexVrtBrgConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
+                           MV_U32 func, MV_U32 regOff, MV_U32 data);
+
+
+#endif /* #ifndef __INCPEXH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvCompVer.txt
new file mode 100644
index 00000000..85bfa612
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.3
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c
new file mode 100644
index 00000000..6c5bc191
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c
@@ -0,0 +1,1522 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#include "mvOs.h"
+#include "sflash/mvSFlash.h"
+#include "sflash/mvSFlashSpec.h"
+#include "spi/mvSpi.h"
+#include "spi/mvSpiCmnd.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+/*#define MV_DEBUG*/
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+/* Globals */
+static MV_SFLASH_DEVICE_PARAMS sflash[] = {
+    /* ST M25P32 SPI flash, 4MB, 64 sectors of 64K each */
+    {
+     MV_M25P_WREN_CMND_OPCD,
+     MV_M25P_WRDI_CMND_OPCD,
+     MV_M25P_RDID_CMND_OPCD,
+     MV_M25P_RDSR_CMND_OPCD,
+     MV_M25P_WRSR_CMND_OPCD,
+     MV_M25P_READ_CMND_OPCD,
+     MV_M25P_FAST_RD_CMND_OPCD,
+     MV_M25P_PP_CMND_OPCD,
+     MV_M25P_SE_CMND_OPCD,
+     MV_M25P_BE_CMND_OPCD,
+     MV_M25P_RES_CMND_OPCD,
+     MV_SFLASH_NO_SPECIFIC_OPCD,    /* power save not supported */
+     MV_M25P32_SECTOR_SIZE,
+     MV_M25P32_SECTOR_NUMBER,
+     MV_M25P_PAGE_SIZE,
+     "ST M25P32",
+     MV_M25PXXX_ST_MANF_ID,
+     MV_M25P32_DEVICE_ID,
+     MV_M25P32_MAX_SPI_FREQ,
+     MV_M25P32_MAX_FAST_SPI_FREQ,
+     MV_M25P32_FAST_READ_DUMMY_BYTES
+    },
+    /* ST M25P64 SPI flash, 8MB, 128 sectors of 64K each */
+    {
+     MV_M25P_WREN_CMND_OPCD,
+     MV_M25P_WRDI_CMND_OPCD,
+     MV_M25P_RDID_CMND_OPCD,
+     MV_M25P_RDSR_CMND_OPCD,
+     MV_M25P_WRSR_CMND_OPCD,
+     MV_M25P_READ_CMND_OPCD,
+     MV_M25P_FAST_RD_CMND_OPCD,
+     MV_M25P_PP_CMND_OPCD,
+     MV_M25P_SE_CMND_OPCD,
+     MV_M25P_BE_CMND_OPCD,
+     MV_M25P_RES_CMND_OPCD,
+     MV_SFLASH_NO_SPECIFIC_OPCD,    /* power save not supported */
+     MV_M25P64_SECTOR_SIZE,
+     MV_M25P64_SECTOR_NUMBER,
+     MV_M25P_PAGE_SIZE,
+     "ST M25P64",
+     MV_M25PXXX_ST_MANF_ID,
+     MV_M25P64_DEVICE_ID,
+     MV_M25P64_MAX_SPI_FREQ,
+     MV_M25P64_MAX_FAST_SPI_FREQ,
+     MV_M25P64_FAST_READ_DUMMY_BYTES
+    },
+    /* ST M25P128 SPI flash, 16MB, 64 sectors of 256K each */
+    {
+     MV_M25P_WREN_CMND_OPCD,
+     MV_M25P_WRDI_CMND_OPCD,
+     MV_M25P_RDID_CMND_OPCD,
+     MV_M25P_RDSR_CMND_OPCD,
+     MV_M25P_WRSR_CMND_OPCD,
+     MV_M25P_READ_CMND_OPCD,
+     MV_M25P_FAST_RD_CMND_OPCD,
+     MV_M25P_PP_CMND_OPCD,
+     MV_M25P_SE_CMND_OPCD,
+     MV_M25P_BE_CMND_OPCD,
+     MV_M25P_RES_CMND_OPCD,
+     MV_SFLASH_NO_SPECIFIC_OPCD,    /* power save not supported */
+     MV_M25P128_SECTOR_SIZE,
+     MV_M25P128_SECTOR_NUMBER,
+     MV_M25P_PAGE_SIZE,
+     "ST M25P128",
+     MV_M25PXXX_ST_MANF_ID,
+     MV_M25P128_DEVICE_ID,
+     MV_M25P128_MAX_SPI_FREQ,
+     MV_M25P128_MAX_FAST_SPI_FREQ,
+     MV_M25P128_FAST_READ_DUMMY_BYTES
+    },
+    /* Macronix MXIC MX25L6405 SPI flash, 8MB, 128 sectors of 64K each */
+    {
+     MV_MX25L_WREN_CMND_OPCD,
+     MV_MX25L_WRDI_CMND_OPCD,
+     MV_MX25L_RDID_CMND_OPCD,
+     MV_MX25L_RDSR_CMND_OPCD,
+     MV_MX25L_WRSR_CMND_OPCD,
+     MV_MX25L_READ_CMND_OPCD,
+     MV_MX25L_FAST_RD_CMND_OPCD,
+     MV_MX25L_PP_CMND_OPCD,
+     MV_MX25L_SE_CMND_OPCD,
+     MV_MX25L_BE_CMND_OPCD,
+     MV_MX25L_RES_CMND_OPCD,
+     MV_MX25L_DP_CMND_OPCD,
+     MV_MX25L6405_SECTOR_SIZE,
+     MV_MX25L6405_SECTOR_NUMBER,
+     MV_MXIC_PAGE_SIZE,
+     "MXIC MX25L6405",
+     MV_MXIC_MANF_ID,
+     MV_MX25L6405_DEVICE_ID,
+     MV_MX25L6405_MAX_SPI_FREQ,
+     MV_MX25L6405_MAX_FAST_SPI_FREQ,
+     MV_MX25L6405_FAST_READ_DUMMY_BYTES
+    },
+    /* SPANSION S25FL128P SPI flash, 16MB, 64 sectors of 256K each */
+    {
+     MV_S25FL_WREN_CMND_OPCD,
+     MV_S25FL_WRDI_CMND_OPCD,
+     MV_S25FL_RDID_CMND_OPCD,
+     MV_S25FL_RDSR_CMND_OPCD,
+     MV_S25FL_WRSR_CMND_OPCD,
+     MV_S25FL_READ_CMND_OPCD,
+     MV_S25FL_FAST_RD_CMND_OPCD,
+     MV_S25FL_PP_CMND_OPCD,
+     MV_S25FL_SE_CMND_OPCD,
+     MV_S25FL_BE_CMND_OPCD,
+     MV_S25FL_RES_CMND_OPCD,
+     MV_S25FL_DP_CMND_OPCD,
+     MV_S25FL128_SECTOR_SIZE,
+     MV_S25FL128_SECTOR_NUMBER,
+     MV_S25FL_PAGE_SIZE,
+     "SPANSION S25FL128",
+     MV_SPANSION_MANF_ID,
+     MV_S25FL128_DEVICE_ID,
+     MV_S25FL128_MAX_SPI_FREQ,
+     MV_M25P128_MAX_FAST_SPI_FREQ,
+     MV_M25P128_FAST_READ_DUMMY_BYTES
+    }
+};
+
+/* Static Functions */
+static MV_STATUS    mvWriteEnable   (MV_SFLASH_INFO * pFlinfo);
+static MV_STATUS    mvStatusRegGet  (MV_SFLASH_INFO * pFlinfo, MV_U8 * pStatReg);
+static MV_STATUS    mvStatusRegSet  (MV_SFLASH_INFO * pFlinfo, MV_U8 sr);
+static MV_STATUS    mvWaitOnWipClear(MV_SFLASH_INFO * pFlinfo);
+static MV_STATUS    mvSFlashPageWr  (MV_SFLASH_INFO * pFlinfo, MV_U32 offset, \
+							         MV_U8* pPageBuff, MV_U32 buffSize);
+static MV_STATUS    mvSFlashWithDefaultsIdGet (MV_SFLASH_INFO * pFlinfo, \
+                                            MV_U8* manId, MV_U16* devId);
+
+/*******************************************************************************
+* mvWriteEnable - serialize the write enable sequence
+*
+* DESCRIPTION:
+*       transmit the sequence for write enable
+*
+********************************************************************************/
+static MV_STATUS mvWriteEnable(MV_SFLASH_INFO * pFlinfo)
+{
+	MV_U8 cmd[MV_SFLASH_WREN_CMND_LENGTH];
+
+
+    cmd[0] = sflash[pFlinfo->index].opcdWREN;
+
+	return mvSpiWriteThenRead(cmd, MV_SFLASH_WREN_CMND_LENGTH, NULL, 0, 0);
+}
+
+/*******************************************************************************
+* mvStatusRegGet - Retrieve the value of the status register
+*
+* DESCRIPTION:
+*       perform the RDSR sequence to get the 8bit status register
+*
+********************************************************************************/
+static MV_STATUS mvStatusRegGet(MV_SFLASH_INFO * pFlinfo, MV_U8 * pStatReg)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_RDSR_CMND_LENGTH];
+	MV_U8 sr[MV_SFLASH_RDSR_REPLY_LENGTH];
+
+
+
+
+	cmd[0] = sflash[pFlinfo->index].opcdRDSR;
+
+	if ((ret = mvSpiWriteThenRead(cmd, MV_SFLASH_RDSR_CMND_LENGTH, sr,
+                                         MV_SFLASH_RDSR_REPLY_LENGTH,0)) != MV_OK)
+        return ret;
+
+    *pStatReg = sr[0];
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvWaitOnWipClear - Block waiting for the WIP (write in progress) to be cleared
+*
+* DESCRIPTION:
+*       Block waiting for the WIP (write in progress) to be cleared
+*
+********************************************************************************/
+static MV_STATUS mvWaitOnWipClear(MV_SFLASH_INFO * pFlinfo)
+{
+    MV_STATUS ret;
+	MV_U32 i;
+    MV_U8 stat;
+
+	for (i=0; i<MV_SFLASH_MAX_WAIT_LOOP; i++)
+	{
+        if ((ret = mvStatusRegGet(pFlinfo, &stat)) != MV_OK)
+            return ret;
+
+		if ((stat & MV_SFLASH_STATUS_REG_WIP_MASK) == 0)
+			return MV_OK;
+	}
+
+    DB(mvOsPrintf("%s WARNING: Write Timeout!\n", __FUNCTION__);)
+	return MV_TIMEOUT;
+}
+
+/*******************************************************************************
+* mvWaitOnChipEraseDone - Block waiting for the WIP (write in progress) to be
+*                         cleared after a chip erase command which is supposed
+*                         to take about 2:30 minutes
+*
+* DESCRIPTION:
+*       Block waiting for the WIP (write in progress) to be cleared
+*
+********************************************************************************/
+static MV_STATUS mvWaitOnChipEraseDone(MV_SFLASH_INFO * pFlinfo)
+{
+    MV_STATUS ret;
+	MV_U32 i;
+    MV_U8 stat;
+
+	for (i=0; i<MV_SFLASH_CHIP_ERASE_MAX_WAIT_LOOP; i++)
+	{
+        if ((ret = mvStatusRegGet(pFlinfo, &stat)) != MV_OK)
+            return ret;
+
+		if ((stat & MV_SFLASH_STATUS_REG_WIP_MASK) == 0)
+			return MV_OK;
+	}
+
+    DB(mvOsPrintf("%s WARNING: Write Timeout!\n", __FUNCTION__);)
+	return MV_TIMEOUT;
+}
+
+/*******************************************************************************
+*  mvStatusRegSet - Set the value of the 8bit status register
+*
+* DESCRIPTION:
+*       Set the value of the 8bit status register
+*
+********************************************************************************/
+static MV_STATUS mvStatusRegSet(MV_SFLASH_INFO * pFlinfo, MV_U8 sr)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_WRSR_CMND_LENGTH];
+
+
+    /* Issue the Write enable command prior the WRSR command */
+	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
+		return ret;
+
+    /* Write the SR with the new values */
+    cmd[0] = sflash[pFlinfo->index].opcdWRSR;
+	cmd[1] = sr;
+
+	if ((ret = mvSpiWriteThenRead(cmd, MV_SFLASH_WRSR_CMND_LENGTH, NULL, 0, 0)) != MV_OK)
+		return ret;
+
+    if ((ret = mvWaitOnWipClear(pFlinfo)) != MV_OK)
+		return ret;
+
+    mvOsDelay(1);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashPageWr - Write up to 256 Bytes in the same page
+*
+* DESCRIPTION:
+*       Write a buffer up to the page size in length provided that the whole address
+*		range is within the same page (alligned to page bounderies)
+*
+*******************************************************************************/
+static MV_STATUS mvSFlashPageWr (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
+							     MV_U8* pPageBuff, MV_U32 buffSize)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_PP_CMND_LENGTH];
+
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invalid parameter device index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+	/* check that we do not cross the page bounderies */
+    if (((offset & (sflash[pFlinfo->index].pageSize - 1)) + buffSize) >
+        sflash[pFlinfo->index].pageSize)
+    {
+        DB(mvOsPrintf("%s WARNING: Page allignment problem!\n", __FUNCTION__);)
+		return MV_OUT_OF_RANGE;
+    }
+
+	/* Issue the Write enable command prior the page program command */
+	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
+		return ret;
+
+    cmd[0] = sflash[pFlinfo->index].opcdPP;
+	cmd[1] = ((offset >> 16) & 0xFF);
+	cmd[2] = ((offset >> 8) & 0xFF);
+	cmd[3] = (offset & 0xFF);
+
+	if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_PP_CMND_LENGTH, pPageBuff, buffSize)) != MV_OK)
+		return ret;
+
+	if ((ret = mvWaitOnWipClear(pFlinfo)) != MV_OK)
+		return ret;
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashWithDefaultsIdGet - Try to read the manufacturer and Device IDs from
+*       the device using the default RDID opcode and the default WREN opcode.
+*
+* DESCRIPTION:
+*       This is used to detect a generic device that uses the default opcodes
+*       for the WREN and RDID.
+*
+********************************************************************************/
+static MV_STATUS mvSFlashWithDefaultsIdGet (MV_SFLASH_INFO * pFlinfo, MV_U8* manId, MV_U16* devId)
+{
+    MV_STATUS ret;
+    MV_U8 cmdRDID[MV_SFLASH_RDID_CMND_LENGTH];
+	MV_U8 id[MV_SFLASH_RDID_REPLY_LENGTH];
+
+
+
+    /* Use the default RDID opcode to read the IDs */
+    cmdRDID[0] = MV_SFLASH_DEFAULT_RDID_OPCD;   /* unknown model try default */
+	if ((ret = mvSpiWriteThenRead(cmdRDID, MV_SFLASH_RDID_CMND_LENGTH, id, MV_SFLASH_RDID_REPLY_LENGTH, 0)) != MV_OK)
+		return ret;
+
+	*manId = id[0];
+	*devId = 0;
+	*devId |= (id[1] << 8);
+	*devId |= id[2];
+
+	return MV_OK;
+}
+
+/*
+#####################################################################################
+#####################################################################################
+*/
+
+/*******************************************************************************
+* mvSFlashInit - Initialize the serial flash device
+*
+* DESCRIPTION:
+*       Perform the neccessary initialization and configuration
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*           pFlinfo->baseAddr: base address in fast mode.
+*           pFlinfo->index: Index of the flash in the sflash tabel. If the SPI
+*                           flash device does not support read Id command with
+*                           the standard opcode, then the user should supply this
+*                           as an input to skip the autodetection process!!!!
+*
+* OUTPUT:
+*       pFlinfo: pointer to the Flash information structure after detection
+*           pFlinfo->manufacturerId: Manufacturer ID
+*           pFlinfo->deviceId: Device ID
+*           pFlinfo->sectorSize: size of the sector (all sectors are the same).
+*           pFlinfo->sectorNumber: number of sectors.
+*           pFlinfo->pageSize: size of the page.
+*           pFlinfo->index: Index of the detected flash in the sflash tabel
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashInit (MV_SFLASH_INFO * pFlinfo)
+{
+    MV_STATUS ret;
+    MV_U8 manf;
+    MV_U16 dev;
+    MV_U32 indx;
+    MV_BOOL detectFlag = MV_FALSE;
+
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Initialize the SPI interface with low frequency to make sure that the read ID succeeds */
+    if ((ret = mvSpiInit(MV_SFLASH_BASIC_SPI_FREQ)) != MV_OK)
+    {
+        mvOsPrintf("%s ERROR: Failed to initialize the SPI interface!\n", __FUNCTION__);
+        return ret;
+    }
+
+    /* First try to read the Manufacturer and Device IDs */
+    if ((ret = mvSFlashIdGet(pFlinfo, &manf, &dev)) != MV_OK)
+    {
+        mvOsPrintf("%s ERROR: Failed to get the SFlash ID!\n", __FUNCTION__);
+        return ret;
+    }
+
+    /* loop over the whole table and look for the appropriate SFLASH */
+    for (indx=0; indx<MV_ARRAY_SIZE(sflash); indx++)
+    {
+        if ((manf == sflash[indx].manufacturerId) && (dev == sflash[indx].deviceId))
+        {
+            pFlinfo->manufacturerId = manf;
+            pFlinfo->deviceId = dev;
+            pFlinfo->index = indx;
+            detectFlag = MV_TRUE;
+        }
+    }
+
+    if(!detectFlag)
+    {
+        mvOsPrintf("%s ERROR: Unknown SPI flash device!\n", __FUNCTION__);
+        return MV_FAIL;
+    }
+
+    /* fill the info based on the model detected */
+    pFlinfo->sectorSize = sflash[pFlinfo->index].sectorSize;
+    pFlinfo->sectorNumber = sflash[pFlinfo->index].sectorNumber;
+    pFlinfo->pageSize = sflash[pFlinfo->index].pageSize;
+
+    /* Set the SPI frequency to the MAX allowed for the device for best performance */
+    if ((ret = mvSpiBaudRateSet(sflash[pFlinfo->index].spiMaxFreq)) != MV_OK)
+    {
+        mvOsPrintf("%s ERROR: Failed to set the SPI frequency!\n", __FUNCTION__);
+        return ret;
+    }
+
+    /* As default lock the SR */
+    if ((ret = mvSFlashStatRegLock(pFlinfo, MV_TRUE)) != MV_OK)
+        return ret;
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashSectorErase - Erasse a single sector of the serial flash
+*
+* DESCRIPTION:
+*       Issue the erase sector command and address
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		secNumber: sector Number to erase (0 -> (sectorNumber-1))
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashSectorErase (MV_SFLASH_INFO * pFlinfo, MV_U32 secNumber)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_SE_CMND_LENGTH];
+
+    MV_U32 secAddr = (secNumber * pFlinfo->sectorSize);
+#if 0
+    MV_U32 i;
+    MV_U32 * pW = (MV_U32*) (secAddr + pFlinfo->baseAddr);
+    MV_U32 erasedWord = 0xFFFFFFFF;
+    MV_U32 wordsPerSector = (pFlinfo->sectorSize / sizeof(MV_U32));
+    MV_BOOL eraseNeeded = MV_FALSE;
+#endif
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    /* check that the sector number is valid */
+    if (secNumber >= pFlinfo->sectorNumber)
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter sector number!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+    
+    /* we don't want to access SPI in direct mode from in-direct API, 
+	becasue of timing issue between CS asserts. */
+#if 0
+    /* First compare to FF and check if erase is needed */
+    for (i=0; i<wordsPerSector; i++)
+    {
+        if (memcmp(pW, &erasedWord, sizeof(MV_U32)) != 0)
+        {
+            eraseNeeded = MV_TRUE;
+            break;
+        }
+
+        ++pW;
+    }
+    if (!eraseNeeded)
+        return MV_OK;
+#endif
+
+    cmd[0] = sflash[pFlinfo->index].opcdSE;
+	cmd[1] = ((secAddr >> 16) & 0xFF);
+	cmd[2] = ((secAddr >> 8) & 0xFF);
+	cmd[3] = (secAddr & 0xFF);
+
+	/* Issue the Write enable command prior the sector erase command */
+	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
+		return ret;
+
+	if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_SE_CMND_LENGTH, NULL, 0)) != MV_OK)
+		return ret;
+
+	if ((ret = mvWaitOnWipClear(pFlinfo)) != MV_OK)
+		return ret;
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashChipErase - Erasse the whole serial flash
+*
+* DESCRIPTION:
+*       Issue the bulk (chip) erase command
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashChipErase (MV_SFLASH_INFO * pFlinfo)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_BE_CMND_LENGTH];
+
+
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    cmd[0] = sflash[pFlinfo->index].opcdBE;
+
+	/* Issue the Write enable command prior the Bulk erase command */
+	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
+		return ret;
+
+    if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_BE_CMND_LENGTH, NULL, 0)) != MV_OK)
+		return ret;
+
+	if ((ret = mvWaitOnChipEraseDone(pFlinfo)) != MV_OK)
+		return ret;
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashBlockRd - Read from the serial flash
+*
+* DESCRIPTION:
+*       Issue the read command and address then perfom the needed read
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		offset: byte offset with the flash to start reading from
+*		pReadBuff: pointer to the buffer to read the data in
+*		buffSize: size of the buffer to read.
+*
+* OUTPUT:
+*       pReadBuff: pointer to the buffer containing the read data
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashBlockRd (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
+						   MV_U8* pReadBuff, MV_U32 buffSize)
+{
+	MV_U8 cmd[MV_SFLASH_READ_CMND_LENGTH];
+
+
+    /* check for NULL pointer */
+    if ((pFlinfo == NULL) || (pReadBuff == NULL))
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    cmd[0] = sflash[pFlinfo->index].opcdREAD;
+	cmd[1] = ((offset >> 16) & 0xFF);
+	cmd[2] = ((offset >> 8) & 0xFF);
+	cmd[3] = (offset & 0xFF);
+
+	return mvSpiWriteThenRead(cmd, MV_SFLASH_READ_CMND_LENGTH, pReadBuff, buffSize, 0);
+}
+
+/*******************************************************************************
+* mvSFlashFastBlockRd - Fast read from the serial flash
+*
+* DESCRIPTION:
+*       Issue the fast read command and address then perfom the needed read
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		offset: byte offset with the flash to start reading from
+*		pReadBuff: pointer to the buffer to read the data in
+*		buffSize: size of the buffer to read.
+*
+* OUTPUT:
+*       pReadBuff: pointer to the buffer containing the read data
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashFastBlockRd (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
+						       MV_U8* pReadBuff, MV_U32 buffSize)
+{
+    MV_U8 cmd[MV_SFLASH_READ_CMND_LENGTH];
+    MV_STATUS ret;
+
+    /* check for NULL pointer */
+    if ((pFlinfo == NULL) || (pReadBuff == NULL))
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    /* Set the SPI frequency to the MAX allowed for fast-read operations */
+    mvOsPrintf("Setting freq to %d.\n",sflash[pFlinfo->index].spiMaxFastFreq);
+    if ((ret = mvSpiBaudRateSet(sflash[pFlinfo->index].spiMaxFastFreq)) != MV_OK)
+    {
+        mvOsPrintf("%s ERROR: Failed to set the SPI fast frequency!\n", __FUNCTION__);
+        return ret;
+    }
+
+    cmd[0] = sflash[pFlinfo->index].opcdFSTRD;
+    cmd[1] = ((offset >> 16) & 0xFF);
+    cmd[2] = ((offset >> 8) & 0xFF);
+    cmd[3] = (offset & 0xFF);
+
+
+    ret = mvSpiWriteThenRead(cmd, MV_SFLASH_READ_CMND_LENGTH, pReadBuff, buffSize,
+                             sflash[pFlinfo->index].spiFastRdDummyBytes);
+
+    /* Reset the SPI frequency to the MAX allowed for the device for best performance */
+    if ((ret = mvSpiBaudRateSet(sflash[pFlinfo->index].spiMaxFreq)) != MV_OK)
+    {
+        mvOsPrintf("%s ERROR: Failed to set the SPI frequency!\n", __FUNCTION__);
+        return ret;
+    }
+
+    return ret;
+}
+
+
+/*******************************************************************************
+* mvSFlashBlockWr - Write a buffer with any size
+*
+* DESCRIPTION:
+*       write regardless of the page boundaries and size limit per Page
+*		program command
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		offset: byte offset within the flash region
+*		pWriteBuff: pointer to the buffer holding the data to program
+*		buffSize: size of the buffer to write
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashBlockWr (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
+						   MV_U8* pWriteBuff, MV_U32 buffSize)
+{
+    MV_STATUS ret;
+	MV_U32 data2write	= buffSize;
+    MV_U32 preAllOffset = (offset & MV_SFLASH_PAGE_ALLIGN_MASK(MV_M25P_PAGE_SIZE));
+    MV_U32 preAllSz		= (preAllOffset ? (MV_M25P_PAGE_SIZE - preAllOffset) : 0);
+	MV_U32 writeOffset	= offset;
+
+    /* check for NULL pointer */
+#ifndef CONFIG_MARVELL
+    if(NULL == pWriteBuff)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+#endif
+
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+	/* check that the buffer size does not exceed the flash size */
+    if ((offset + buffSize) > mvSFlashSizeGet(pFlinfo))
+    {
+        DB(mvOsPrintf("%s WARNING: Write exceeds flash size!\n", __FUNCTION__);)
+	    return MV_OUT_OF_RANGE;
+    }
+
+	/* check if the total block size is less than the first chunk remainder */
+	if (data2write < preAllSz)
+		preAllSz = data2write;
+
+	/* check if programing does not start at a 64byte alligned offset */
+	if (preAllSz)
+	{
+		if ((ret = mvSFlashPageWr(pFlinfo, writeOffset, pWriteBuff, preAllSz)) != MV_OK)
+			return ret;
+
+		/* increment pointers and counters */
+		writeOffset += preAllSz;
+		data2write -= preAllSz;
+		pWriteBuff += preAllSz;
+	}
+
+	/* program the data that fits in complete page chunks */
+	while (data2write >= sflash[pFlinfo->index].pageSize)
+	{
+		if ((ret = mvSFlashPageWr(pFlinfo, writeOffset, pWriteBuff, sflash[pFlinfo->index].pageSize)) != MV_OK)
+			return ret;
+
+		/* increment pointers and counters */
+		writeOffset += sflash[pFlinfo->index].pageSize;
+		data2write -= sflash[pFlinfo->index].pageSize;
+		pWriteBuff += sflash[pFlinfo->index].pageSize;
+	}
+
+	/* program the last partial chunk */
+	if (data2write)
+	{
+		if ((ret = mvSFlashPageWr(pFlinfo, writeOffset, pWriteBuff, data2write)) != MV_OK)
+			return ret;
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashIdGet - Get the manufacturer and device IDs.
+*
+* DESCRIPTION:
+*       Get the Manufacturer and device IDs from the serial flash through
+*		writing the RDID command then reading 3 bytes of data. In case that
+*       this command was called for the first time in order to detect the
+*       manufacturer and device IDs, then the default RDID opcode will be used
+*       unless the device index is indicated by the user (in case the SPI flash
+*       does not use the default RDID opcode).
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		pManId: pointer to the 8bit variable to hold the manufacturing ID
+*		pDevId: pointer to the 16bit variable to hold the device ID
+*
+* OUTPUT:
+*		pManId: pointer to the 8bit variable holding the manufacturing ID
+*		pDevId: pointer to the 16bit variable holding the device ID
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashIdGet (MV_SFLASH_INFO * pFlinfo, MV_U8* pManId, MV_U16* pDevId)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_RDID_CMND_LENGTH];
+	MV_U8 id[MV_SFLASH_RDID_REPLY_LENGTH];
+
+
+
+    /* check for NULL pointer */
+    if ((pFlinfo == NULL) || (pManId == NULL) || (pDevId == NULL))
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+        return mvSFlashWithDefaultsIdGet(pFlinfo, pManId, pDevId);
+    else
+        cmd[0] = sflash[pFlinfo->index].opcdRDID;
+
+	if ((ret = mvSpiWriteThenRead(cmd, MV_SFLASH_RDID_CMND_LENGTH, id, MV_SFLASH_RDID_REPLY_LENGTH, 0)) != MV_OK)
+		return ret;
+
+	*pManId = id[0];
+	*pDevId = 0;
+	*pDevId |= (id[1] << 8);
+	*pDevId |= id[2];
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashWpRegionSet - Set the Write-Protected region
+*
+* DESCRIPTION:
+*       Set the Write-Protected region
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		wpRegion: which region will be protected
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashWpRegionSet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION wpRegion)
+{
+    MV_U8 wpMask;
+
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    /* Check if the chip is an ST flash; then WP supports only 3 bits */
+    if (pFlinfo->manufacturerId == MV_M25PXXX_ST_MANF_ID)
+    {
+        switch (wpRegion)
+        {
+            case MV_WP_NONE:
+                wpMask = MV_M25P_STATUS_BP_NONE;
+                break;
+
+            case MV_WP_UPR_1OF128:
+                DB(mvOsPrintf("%s WARNING: Invaild option for this flash chip!\n", __FUNCTION__);)
+                return MV_NOT_SUPPORTED;
+
+            case MV_WP_UPR_1OF64:
+                wpMask = MV_M25P_STATUS_BP_1_OF_64;
+                break;
+
+            case MV_WP_UPR_1OF32:
+                wpMask = MV_M25P_STATUS_BP_1_OF_32;
+                break;
+
+            case MV_WP_UPR_1OF16:
+                wpMask = MV_M25P_STATUS_BP_1_OF_16;
+                break;
+
+            case MV_WP_UPR_1OF8:
+                wpMask = MV_M25P_STATUS_BP_1_OF_8;
+                break;
+
+            case MV_WP_UPR_1OF4:
+                wpMask = MV_M25P_STATUS_BP_1_OF_4;
+                break;
+
+            case MV_WP_UPR_1OF2:
+                wpMask = MV_M25P_STATUS_BP_1_OF_2;
+                break;
+
+            case MV_WP_ALL:
+                wpMask = MV_M25P_STATUS_BP_ALL;
+                break;
+
+            default:
+                DB(mvOsPrintf("%s WARNING: Invaild parameter WP region!\n", __FUNCTION__);)
+                return MV_BAD_PARAM;
+        }
+    }
+    /* check if the manufacturer is MXIC then the WP is 4bits */
+    else if (pFlinfo->manufacturerId == MV_MXIC_MANF_ID)
+    {
+        switch (wpRegion)
+        {
+            case MV_WP_NONE:
+                wpMask = MV_MX25L_STATUS_BP_NONE;
+                break;
+
+            case MV_WP_UPR_1OF128:
+                wpMask = MV_MX25L_STATUS_BP_1_OF_128;
+                break;
+
+            case MV_WP_UPR_1OF64:
+                wpMask = MV_MX25L_STATUS_BP_1_OF_64;
+                break;
+
+            case MV_WP_UPR_1OF32:
+                wpMask = MV_MX25L_STATUS_BP_1_OF_32;
+                break;
+
+            case MV_WP_UPR_1OF16:
+                wpMask = MV_MX25L_STATUS_BP_1_OF_16;
+                break;
+
+            case MV_WP_UPR_1OF8:
+                wpMask = MV_MX25L_STATUS_BP_1_OF_8;
+                break;
+
+            case MV_WP_UPR_1OF4:
+                wpMask = MV_MX25L_STATUS_BP_1_OF_4;
+                break;
+
+            case MV_WP_UPR_1OF2:
+                wpMask = MV_MX25L_STATUS_BP_1_OF_2;
+                break;
+
+            case MV_WP_ALL:
+                wpMask = MV_MX25L_STATUS_BP_ALL;
+                break;
+
+            default:
+                DB(mvOsPrintf("%s WARNING: Invaild parameter WP region!\n", __FUNCTION__);)
+                return MV_BAD_PARAM;
+        }
+    }
+    /* check if the manufacturer is SPANSION then the WP is 4bits */
+    else if (pFlinfo->manufacturerId == MV_SPANSION_MANF_ID)
+    {
+        switch (wpRegion)
+        {
+            case MV_WP_NONE:
+                wpMask = MV_S25FL_STATUS_BP_NONE;
+                break;
+
+            case MV_WP_UPR_1OF128:
+                DB(mvOsPrintf("%s WARNING: Invaild option for this flash chip!\n", __FUNCTION__);)
+                return MV_NOT_SUPPORTED;
+
+            case MV_WP_UPR_1OF64:
+                wpMask = MV_S25FL_STATUS_BP_1_OF_64;
+                break;
+
+            case MV_WP_UPR_1OF32:
+                wpMask = MV_S25FL_STATUS_BP_1_OF_32;
+                break;
+
+            case MV_WP_UPR_1OF16:
+                wpMask = MV_S25FL_STATUS_BP_1_OF_16;
+                break;
+
+            case MV_WP_UPR_1OF8:
+                wpMask = MV_S25FL_STATUS_BP_1_OF_8;
+                break;
+
+            case MV_WP_UPR_1OF4:
+                wpMask = MV_S25FL_STATUS_BP_1_OF_4;
+                break;
+
+            case MV_WP_UPR_1OF2:
+                wpMask = MV_S25FL_STATUS_BP_1_OF_2;
+                break;
+
+            case MV_WP_ALL:
+                wpMask = MV_S25FL_STATUS_BP_ALL;
+                break;
+
+
+            default:
+                DB(mvOsPrintf("%s WARNING: Invaild parameter WP region!\n", __FUNCTION__);)
+                return MV_BAD_PARAM;
+        }
+    }
+    else
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter Manufacturer ID!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    /* Verify that the SRWD bit is always set - register is s/w locked */
+    wpMask |= MV_SFLASH_STATUS_REG_SRWD_MASK;
+
+	return mvStatusRegSet(pFlinfo, wpMask);
+}
+
+/*******************************************************************************
+* mvSFlashWpRegionGet - Get the Write-Protected region configured
+*
+* DESCRIPTION:
+*       Get from the chip the Write-Protected region configured
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		pWpRegion: pointer to the variable to return the WP region in
+*
+* OUTPUT:
+*		wpRegion: pointer to the variable holding the WP region configured
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashWpRegionGet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION * pWpRegion)
+{
+    MV_STATUS ret;
+	MV_U8 reg;
+
+    /* check for NULL pointer */
+    if ((pFlinfo == NULL) || (pWpRegion == NULL))
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    if ((ret = mvStatusRegGet(pFlinfo, &reg)) != MV_OK)
+        return ret;
+
+    /* Check if the chip is an ST flash; then WP supports only 3 bits */
+    if (pFlinfo->manufacturerId == MV_M25PXXX_ST_MANF_ID)
+    {
+        switch ((reg & MV_M25P_STATUS_REG_WP_MASK))
+        {
+            case MV_M25P_STATUS_BP_NONE:
+                *pWpRegion = MV_WP_NONE;
+                break;
+
+            case MV_M25P_STATUS_BP_1_OF_64:
+                *pWpRegion = MV_WP_UPR_1OF64;
+                break;
+
+            case MV_M25P_STATUS_BP_1_OF_32:
+                *pWpRegion = MV_WP_UPR_1OF32;
+                break;
+
+            case MV_M25P_STATUS_BP_1_OF_16:
+                *pWpRegion = MV_WP_UPR_1OF16;
+                break;
+
+            case MV_M25P_STATUS_BP_1_OF_8:
+                *pWpRegion = MV_WP_UPR_1OF8;
+                break;
+
+            case MV_M25P_STATUS_BP_1_OF_4:
+                *pWpRegion = MV_WP_UPR_1OF4;
+                break;
+
+            case MV_M25P_STATUS_BP_1_OF_2:
+                *pWpRegion = MV_WP_UPR_1OF2;
+                break;
+
+            case MV_M25P_STATUS_BP_ALL:
+                *pWpRegion = MV_WP_ALL;
+                break;
+
+            default:
+                DB(mvOsPrintf("%s WARNING: Unidentified WP region in h/w!\n", __FUNCTION__);)
+                return MV_BAD_VALUE;
+        }
+    }
+    /* check if the manufacturer is MXIC then the WP is 4bits */
+    else if (pFlinfo->manufacturerId == MV_MXIC_MANF_ID)
+    {
+        switch ((reg & MV_MX25L_STATUS_REG_WP_MASK))
+        {
+            case MV_MX25L_STATUS_BP_NONE:
+                *pWpRegion = MV_WP_NONE;
+                break;
+
+            case MV_MX25L_STATUS_BP_1_OF_128:
+                *pWpRegion = MV_WP_UPR_1OF128;
+                break;
+
+            case MV_MX25L_STATUS_BP_1_OF_64:
+                *pWpRegion = MV_WP_UPR_1OF64;
+                break;
+
+            case MV_MX25L_STATUS_BP_1_OF_32:
+                *pWpRegion = MV_WP_UPR_1OF32;
+                break;
+
+            case MV_MX25L_STATUS_BP_1_OF_16:
+                *pWpRegion = MV_WP_UPR_1OF16;
+                break;
+
+            case MV_MX25L_STATUS_BP_1_OF_8:
+                *pWpRegion = MV_WP_UPR_1OF8;
+                break;
+
+            case MV_MX25L_STATUS_BP_1_OF_4:
+                *pWpRegion = MV_WP_UPR_1OF4;
+                break;
+
+            case MV_MX25L_STATUS_BP_1_OF_2:
+                *pWpRegion = MV_WP_UPR_1OF2;
+                break;
+
+            case MV_MX25L_STATUS_BP_ALL:
+                *pWpRegion = MV_WP_ALL;
+                break;
+
+            default:
+                DB(mvOsPrintf("%s WARNING: Unidentified WP region in h/w!\n", __FUNCTION__);)
+                return MV_BAD_VALUE;
+        }
+    }
+    /* Check if the chip is an SPANSION flash; then WP supports only 3 bits */
+    else if (pFlinfo->manufacturerId == MV_SPANSION_MANF_ID)
+    {
+        switch ((reg & MV_S25FL_STATUS_REG_WP_MASK))
+        {
+            case MV_S25FL_STATUS_BP_NONE:
+                *pWpRegion = MV_WP_NONE;
+                break;
+
+            case MV_S25FL_STATUS_BP_1_OF_64:
+                *pWpRegion = MV_WP_UPR_1OF64;
+                break;
+
+            case MV_S25FL_STATUS_BP_1_OF_32:
+                *pWpRegion = MV_WP_UPR_1OF32;
+                break;
+
+            case MV_S25FL_STATUS_BP_1_OF_16:
+                *pWpRegion = MV_WP_UPR_1OF16;
+                break;
+
+            case MV_S25FL_STATUS_BP_1_OF_8:
+                *pWpRegion = MV_WP_UPR_1OF8;
+                break;
+
+            case MV_S25FL_STATUS_BP_1_OF_4:
+                *pWpRegion = MV_WP_UPR_1OF4;
+                break;
+
+            case MV_S25FL_STATUS_BP_1_OF_2:
+                *pWpRegion = MV_WP_UPR_1OF2;
+                break;
+
+            case MV_S25FL_STATUS_BP_ALL:
+                *pWpRegion = MV_WP_ALL;
+                break;
+
+            default:
+                DB(mvOsPrintf("%s WARNING: Unidentified WP region in h/w!\n", __FUNCTION__);)
+                return MV_BAD_VALUE;
+        }
+    }
+    else
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter Manufacturer ID!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSFlashStatRegLock - Lock the status register for writing - W/Vpp
+*		pin should be low to take effect
+*
+* DESCRIPTION:
+*       Lock the access to the Status Register for writing. This will
+*		cause the flash to enter the hardware protection mode if the W/Vpp
+*		is low. If the W/Vpp is hi, the chip will be in soft protection mode, but
+*		the register will continue to be writable if WREN sequence was used.
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*		srLock: enable/disable (MV_TRUE/MV_FALSE) status registor lock mechanism
+*
+* OUTPUT:
+*       None
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashStatRegLock (MV_SFLASH_INFO * pFlinfo, MV_BOOL srLock)
+{
+    MV_STATUS ret;
+	MV_U8 reg;
+
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    if ((ret = mvStatusRegGet(pFlinfo, &reg)) != MV_OK)
+        return ret;
+
+	if (srLock)
+		reg |= MV_SFLASH_STATUS_REG_SRWD_MASK;
+	else
+		reg &= ~MV_SFLASH_STATUS_REG_SRWD_MASK;
+
+	return mvStatusRegSet(pFlinfo, reg);
+}
+
+/*******************************************************************************
+* mvSFlashSizeGet - Get the size of the SPI flash
+*
+* DESCRIPTION:
+*       based on the sector number and size of each sector calculate the total
+*       size of the flash memory.
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Size of the flash in bytes.
+*
+*
+*******************************************************************************/
+MV_U32 mvSFlashSizeGet (MV_SFLASH_INFO * pFlinfo)
+{
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return 0;
+    }
+
+    return (pFlinfo->sectorSize * pFlinfo->sectorNumber);
+}
+
+/*******************************************************************************
+* mvSFlashPowerSaveEnter - Cause the falsh device to go into power save mode
+*
+* DESCRIPTION:
+*       Enter a special power save mode.
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Size of the flash in bytes.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashPowerSaveEnter(MV_SFLASH_INFO * pFlinfo)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_DP_CMND_LENGTH];
+
+
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return 0;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    /* check that power save mode is supported in the specific device */
+    if (sflash[pFlinfo->index].opcdPwrSave == MV_SFLASH_NO_SPECIFIC_OPCD)
+    {
+        DB(mvOsPrintf("%s WARNING: Power save not supported for this device!\n", __FUNCTION__);)
+        return MV_NOT_SUPPORTED;
+    }
+
+    cmd[0] = sflash[pFlinfo->index].opcdPwrSave;
+
+    if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_DP_CMND_LENGTH, NULL, 0)) != MV_OK)
+		return ret;
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvSFlashPowerSaveExit - Cause the falsh device to exit the power save mode
+*
+* DESCRIPTION:
+*       Exit the deep power save mode.
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Size of the flash in bytes.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSFlashPowerSaveExit (MV_SFLASH_INFO * pFlinfo)
+{
+    MV_STATUS ret;
+	MV_U8 cmd[MV_SFLASH_RES_CMND_LENGTH];
+
+
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return 0;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return MV_BAD_PARAM;
+    }
+
+    /* check that power save mode is supported in the specific device */
+    if (sflash[pFlinfo->index].opcdRES == MV_SFLASH_NO_SPECIFIC_OPCD)
+    {
+        DB(mvOsPrintf("%s WARNING: Read Electronic Signature not supported for this device!\n", __FUNCTION__);)
+        return MV_NOT_SUPPORTED;
+    }
+
+    cmd[0] = sflash[pFlinfo->index].opcdRES;
+
+    if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_RES_CMND_LENGTH, NULL, 0)) != MV_OK)
+		return ret;
+
+    /* add the delay needed for the device to wake up */
+    mvOsDelay(MV_MXIC_DP_EXIT_DELAY);   /* 30 ms */
+
+	return MV_OK;
+
+}
+
+/*******************************************************************************
+* mvSFlashModelGet - Retreive the string with the device manufacturer and model
+*
+* DESCRIPTION:
+*       Retreive the string with the device manufacturer and model
+*
+* INPUT:
+*       pFlinfo: pointer to the Flash information structure
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       pointer to the string indicating the device manufacturer and model
+*
+*
+*******************************************************************************/
+const MV_8 * mvSFlashModelGet (MV_SFLASH_INFO * pFlinfo)
+{
+    static const MV_8 * unknModel = (const MV_8 *)"Unknown";
+
+    /* check for NULL pointer */
+    if (pFlinfo == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return 0;
+    }
+
+    /* Protection - check if the model was detected */
+    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
+    {
+        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
+        return unknModel;
+    }
+
+    return sflash[pFlinfo->index].deviceModel;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h
new file mode 100644
index 00000000..f441a5cf
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h
@@ -0,0 +1,166 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSFlashH
+#define __INCmvSFlashH
+
+#include "mvTypes.h"
+
+/* MCAROS */
+#define MV_SFLASH_PAGE_ALLIGN_MASK(pgSz)    (pgSz-1)
+#define MV_ARRAY_SIZE(a)                    ((sizeof(a)) / (sizeof(a[0])))
+
+/* Constants */
+#define MV_INVALID_DEVICE_NUMBER            0xFFFFFFFF
+/* 10 MHz is the minimum possible SPI frequency when tclk is set 200MHz*/
+#define MV_SFLASH_BASIC_SPI_FREQ            10000000
+/* enumerations */
+typedef enum
+{
+	MV_WP_NONE,             /* Unprotect the whole chip */
+    MV_WP_UPR_1OF128,       /* Write protect the upper 1/128 part */
+    MV_WP_UPR_1OF64,        /* Write protect the upper 1/64 part */
+	MV_WP_UPR_1OF32,        /* Write protect the upper 1/32 part */
+	MV_WP_UPR_1OF16,        /* Write protect the upper 1/16 part */
+	MV_WP_UPR_1OF8,         /* Write protect the upper 1/8 part */
+	MV_WP_UPR_1OF4,         /* Write protect the upper 1/4 part */
+	MV_WP_UPR_1OF2,         /* Write protect the upper 1/2 part */
+	MV_WP_ALL               /* Write protect the whole chip */
+} MV_SFLASH_WP_REGION;
+
+/* Type Definitions */
+typedef struct
+{
+    MV_U8   opcdWREN;       /* Write enable opcode */
+    MV_U8   opcdWRDI;       /* Write disable opcode */
+    MV_U8   opcdRDID;       /* Read ID opcode */
+    MV_U8   opcdRDSR;       /* Read Status Register opcode */
+    MV_U8   opcdWRSR;       /* Write Status register opcode */
+    MV_U8   opcdREAD;       /* Read opcode */
+    MV_U8   opcdFSTRD;      /* Fast Read opcode */
+    MV_U8   opcdPP;         /* Page program opcode */
+    MV_U8   opcdSE;         /* Sector erase opcode */
+    MV_U8   opcdBE;         /* Bulk erase opcode */
+    MV_U8   opcdRES;        /* Read electronic signature */
+    MV_U8   opcdPwrSave;    /* Go into power save mode */
+    MV_U32  sectorSize;     /* Size of each sector */
+    MV_U32  sectorNumber;   /* Number of sectors */
+    MV_U32  pageSize;       /* size of each page */
+    const char * deviceModel;    /* string with the device model */
+    MV_U32  manufacturerId; /* The manufacturer ID */
+    MV_U32  deviceId;       /* Device ID */
+    MV_U32  spiMaxFreq;     /* The MAX frequency that can be used with the device */
+    MV_U32  spiMaxFastFreq; /* The MAX frequency that can be used with the device for fast reads */
+    MV_U32  spiFastRdDummyBytes; /* Number of dumy bytes to read before real data when working in fast read mode. */
+} MV_SFLASH_DEVICE_PARAMS;
+
+typedef struct
+{
+    MV_U32					baseAddr;       /* Flash Base Address used in fast mode */
+	MV_U8	                manufacturerId;	/* Manufacturer ID */
+    MV_U16	                deviceId;	    /* Device ID */
+    MV_U32                  sectorSize;     /* Size of each sector - all the same */
+    MV_U32                  sectorNumber;   /* Number of sectors */
+    MV_U32                  pageSize;       /* Page size - affect allignment */
+    MV_U32                  index;          /* index of the device in the sflash table (internal parameter) */
+} MV_SFLASH_INFO;
+
+/* Function Prototypes */
+/* Init */
+MV_STATUS	mvSFlashInit		(MV_SFLASH_INFO * pFlinfo);
+
+/* erase */
+MV_STATUS 	mvSFlashSectorErase (MV_SFLASH_INFO * pFlinfo, MV_U32 secNumber);
+MV_STATUS 	mvSFlashChipErase   (MV_SFLASH_INFO * pFlinfo);
+
+/* Read */
+MV_STATUS	mvSFlashBlockRd  	(MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
+							     MV_U8* pReadBuff, MV_U32 buffSize);
+MV_STATUS mvSFlashFastBlockRd (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
+							     MV_U8* pReadBuff, MV_U32 buffSize);
+
+/* write regardless of the page boundaries and size limit per Page program command */
+MV_STATUS	mvSFlashBlockWr		(MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
+							     MV_U8* pWriteBuff, MV_U32 buffSize);
+/* Get IDs */
+MV_STATUS 	mvSFlashIdGet      	(MV_SFLASH_INFO * pFlinfo, MV_U8* pManId, MV_U16* pDevId);
+
+/* Set and Get the Write Protection region - if the Status register is not locked */
+MV_STATUS   mvSFlashWpRegionSet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION wpRegion);
+MV_STATUS   mvSFlashWpRegionGet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION * pWpRegion);
+
+/* Lock the status register for writing - W/Vpp pin should be low to take effect */
+MV_STATUS   mvSFlashStatRegLock (MV_SFLASH_INFO * pFlinfo, MV_BOOL srLock);
+
+/* Get the regions sizes */
+MV_U32      mvSFlashSizeGet     (MV_SFLASH_INFO * pFlinfo);
+
+/* Cause the falsh device to go into power save mode */
+MV_STATUS   mvSFlashPowerSaveEnter(MV_SFLASH_INFO * pFlinfo);
+MV_STATUS   mvSFlashPowerSaveExit (MV_SFLASH_INFO * pFlinfo);
+
+/* Retreive the string with the device manufacturer and model */
+const MV_8 *     mvSFlashModelGet    (MV_SFLASH_INFO * pFlinfo);
+
+#endif /* __INCmvSFlashH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h
new file mode 100644
index 00000000..eeb44262
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h
@@ -0,0 +1,233 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSFlashSpecH
+#define __INCmvSFlashSpecH
+
+/* Constants */
+#define		MV_SFLASH_READ_CMND_LENGTH		    4		/* 1B opcode + 3B address */
+#define		MV_SFLASH_SE_CMND_LENGTH		    4		/* 1B opcode + 3B address */
+#define		MV_SFLASH_BE_CMND_LENGTH		    1		/* 1B opcode */
+#define		MV_SFLASH_PP_CMND_LENGTH		    4		/* 1B opcode + 3B address */
+#define		MV_SFLASH_WREN_CMND_LENGTH		    1		/* 1B opcode */
+#define		MV_SFLASH_WRDI_CMND_LENGTH		    1		/* 1B opcode */
+#define		MV_SFLASH_RDID_CMND_LENGTH		    1		/* 1B opcode */
+#define		MV_SFLASH_RDID_REPLY_LENGTH		    3		/* 1B manf ID and 2B device ID */
+#define		MV_SFLASH_RDSR_CMND_LENGTH		    1		/* 1B opcode */
+#define		MV_SFLASH_RDSR_REPLY_LENGTH		    1		/* 1B status */
+#define		MV_SFLASH_WRSR_CMND_LENGTH		    2		/* 1B opcode + 1B status value */
+#define		MV_SFLASH_DP_CMND_LENGTH		    1		/* 1B opcode */
+#define		MV_SFLASH_RES_CMND_LENGTH		    1		/* 1B opcode */
+
+/* Status Register Bit Masks */
+#define		MV_SFLASH_STATUS_REG_WIP_OFFSET	    0	    /* bit 0; write in progress */
+#define		MV_SFLASH_STATUS_REG_WP_OFFSET	    2       /* bit 2-4; write protect option */
+#define		MV_SFLASH_STATUS_REG_SRWD_OFFSET	7	    /* bit 7; lock status register write */
+#define		MV_SFLASH_STATUS_REG_WIP_MASK	    (0x1 << MV_SFLASH_STATUS_REG_WIP_OFFSET)
+#define		MV_SFLASH_STATUS_REG_SRWD_MASK	    (0x1 << MV_SFLASH_STATUS_REG_SRWD_OFFSET)
+
+#define		MV_SFLASH_MAX_WAIT_LOOP			    1000000
+#define     MV_SFLASH_CHIP_ERASE_MAX_WAIT_LOOP  0x50000000
+
+#define		MV_SFLASH_DEFAULT_RDID_OPCD		    0x9F	/* Default Read ID */
+#define     MV_SFLASH_DEFAULT_WREN_OPCD         0x06	/* Default Write Enable */
+#define     MV_SFLASH_NO_SPECIFIC_OPCD          0x00
+
+/********************************/
+/*  ST M25Pxxx Device Specific  */
+/********************************/
+
+/* Manufacturer IDs and Device IDs for SFLASHs supported by the driver */
+#define     MV_M25PXXX_ST_MANF_ID               0x20
+#define     MV_M25P32_DEVICE_ID                 0x2016
+#define     MV_M25P32_MAX_SPI_FREQ              20000000    /* 20MHz */
+#define     MV_M25P32_MAX_FAST_SPI_FREQ         50000000    /* 50MHz */
+#define     MV_M25P32_FAST_READ_DUMMY_BYTES     1
+#define     MV_M25P64_DEVICE_ID                 0x2017
+#define     MV_M25P64_MAX_SPI_FREQ              20000000    /* 20MHz */
+#define     MV_M25P64_MAX_FAST_SPI_FREQ         50000000    /* 50MHz */
+#define     MV_M25P64_FAST_READ_DUMMY_BYTES     1
+#define     MV_M25P128_DEVICE_ID                0x2018
+#define     MV_M25P128_MAX_SPI_FREQ             20000000    /* 20MHz */
+#define     MV_M25P128_MAX_FAST_SPI_FREQ        50000000    /* 50MHz */
+#define     MV_M25P128_FAST_READ_DUMMY_BYTES    1
+
+
+/* Sector Sizes and population per device model*/
+#define     MV_M25P32_SECTOR_SIZE               0x10000 /* 64K */
+#define     MV_M25P64_SECTOR_SIZE               0x10000 /* 64K */
+#define     MV_M25P128_SECTOR_SIZE              0x40000 /* 256K */
+#define     MV_M25P32_SECTOR_NUMBER             64
+#define     MV_M25P64_SECTOR_NUMBER             128
+#define     MV_M25P128_SECTOR_NUMBER            64
+#define		MV_M25P_PAGE_SIZE				    0x100   /* 256 byte */
+
+#define		MV_M25P_WREN_CMND_OPCD			    0x06	/* Write Enable */
+#define		MV_M25P_WRDI_CMND_OPCD			    0x04	/* Write Disable */
+#define		MV_M25P_RDID_CMND_OPCD			    0x9F	/* Read ID */
+#define		MV_M25P_RDSR_CMND_OPCD			    0x05	/* Read Status Register */
+#define		MV_M25P_WRSR_CMND_OPCD			    0x01	/* Write Status Register */
+#define		MV_M25P_READ_CMND_OPCD			    0x03	/* Sequential Read */
+#define		MV_M25P_FAST_RD_CMND_OPCD		    0x0B	/* Fast Read */
+#define		MV_M25P_PP_CMND_OPCD			    0x02	/* Page Program */
+#define		MV_M25P_SE_CMND_OPCD			    0xD8	/* Sector Erase */
+#define		MV_M25P_BE_CMND_OPCD			    0xC7	/* Bulk Erase */
+#define		MV_M25P_RES_CMND_OPCD			    0xAB	/* Read Electronic Signature */
+
+/* Status Register Write Protect Bit Masks - 3bits */
+#define		MV_M25P_STATUS_REG_WP_MASK	        (0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_NONE              (0x00 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_1_OF_64           (0x01 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_1_OF_32           (0x02 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_1_OF_16           (0x03 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_1_OF_8            (0x04 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_1_OF_4            (0x05 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_1_OF_2            (0x06 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_M25P_STATUS_BP_ALL               (0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+
+/************************************/
+/*  MXIC MX25L6405 Device Specific  */
+/************************************/
+
+/* Manufacturer IDs and Device IDs for SFLASHs supported by the driver */
+#define     MV_MXIC_MANF_ID                     0xC2
+#define     MV_MX25L6405_DEVICE_ID              0x2017
+#define     MV_MX25L6405_MAX_SPI_FREQ           20000000    /* 20MHz */
+#define     MV_MX25L6405_MAX_FAST_SPI_FREQ      50000000    /* 50MHz */
+#define     MV_MX25L6405_FAST_READ_DUMMY_BYTES  1
+#define     MV_MXIC_DP_EXIT_DELAY               30          /* 30 ms */
+
+/* Sector Sizes and population per device model*/
+#define     MV_MX25L6405_SECTOR_SIZE            0x10000 /* 64K */
+#define     MV_MX25L6405_SECTOR_NUMBER          128
+#define		MV_MXIC_PAGE_SIZE			        0x100   /* 256 byte */
+
+#define		MV_MX25L_WREN_CMND_OPCD			    0x06	/* Write Enable */
+#define		MV_MX25L_WRDI_CMND_OPCD			    0x04	/* Write Disable */
+#define		MV_MX25L_RDID_CMND_OPCD			    0x9F	/* Read ID */
+#define		MV_MX25L_RDSR_CMND_OPCD			    0x05	/* Read Status Register */
+#define		MV_MX25L_WRSR_CMND_OPCD			    0x01	/* Write Status Register */
+#define		MV_MX25L_READ_CMND_OPCD			    0x03	/* Sequential Read */
+#define		MV_MX25L_FAST_RD_CMND_OPCD		    0x0B	/* Fast Read */
+#define		MV_MX25L_PP_CMND_OPCD			    0x02	/* Page Program */
+#define		MV_MX25L_SE_CMND_OPCD			    0xD8	/* Sector Erase */
+#define		MV_MX25L_BE_CMND_OPCD			    0xC7	/* Bulk Erase */
+#define     MV_MX25L_DP_CMND_OPCD               0xB9    /* Deep Power Down */
+#define		MV_MX25L_RES_CMND_OPCD			    0xAB	/* Read Electronic Signature */
+
+/* Status Register Write Protect Bit Masks - 4bits */
+#define		MV_MX25L_STATUS_REG_WP_MASK	        (0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_NONE             (0x00 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_1_OF_128         (0x01 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_1_OF_64          (0x02 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_1_OF_32          (0x03 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_1_OF_16          (0x04 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_1_OF_8           (0x05 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_1_OF_4           (0x06 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_1_OF_2           (0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     MV_MX25L_STATUS_BP_ALL              (0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
+
+/************************************/
+/*  SPANSION S25FL128P Device Specific  */
+/************************************/
+
+/* Manufacturer IDs and Device IDs for SFLASHs supported by the driver */
+#define     MV_SPANSION_MANF_ID                     	0x01
+#define     MV_S25FL128_DEVICE_ID              		0x2018
+#define     MV_S25FL128_MAX_SPI_FREQ           		33000000    /* 33MHz */
+#define     MV_S25FL128_MAX_FAST_SPI_FREQ        	104000000    /* 104MHz */
+#define     MV_S25FL128_FAST_READ_DUMMY_BYTES    	1
+
+/* Sector Sizes and population per device model*/
+#define     MV_S25FL128_SECTOR_SIZE            			0x40000 /* 256K */
+#define     MV_S25FL128_SECTOR_NUMBER          			64
+#define	    MV_S25FL_PAGE_SIZE			        	0x100   /* 256 byte */
+
+#define		MV_S25FL_WREN_CMND_OPCD			    0x06	/* Write Enable */
+#define		MV_S25FL_WRDI_CMND_OPCD			    0x04	/* Write Disable */
+#define		MV_S25FL_RDID_CMND_OPCD			    0x9F	/* Read ID */
+#define		MV_S25FL_RDSR_CMND_OPCD			    0x05	/* Read Status Register */
+#define		MV_S25FL_WRSR_CMND_OPCD			    0x01	/* Write Status Register */
+#define		MV_S25FL_READ_CMND_OPCD			    0x03	/* Sequential Read */
+#define		MV_S25FL_FAST_RD_CMND_OPCD		    0x0B	/* Fast Read */
+#define		MV_S25FL_PP_CMND_OPCD			    0x02	/* Page Program */
+#define		MV_S25FL_SE_CMND_OPCD			    0xD8	/* Sector Erase */
+#define		MV_S25FL_BE_CMND_OPCD			    0xC7	/* Bulk Erase */
+#define     	MV_S25FL_DP_CMND_OPCD               	    0xB9    	/* Deep Power Down */
+#define		MV_S25FL_RES_CMND_OPCD			    0xAB	/* Read Electronic Signature */
+
+/* Status Register Write Protect Bit Masks - 4bits */
+#define		MV_S25FL_STATUS_REG_WP_MASK	        (0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_NONE             	(0x00 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_1_OF_128         	(0x01 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_1_OF_64          	(0x02 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_1_OF_32          	(0x03 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_1_OF_16          	(0x04 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_1_OF_8           	(0x05 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_1_OF_4           	(0x06 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_1_OF_2           	(0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
+#define     	MV_S25FL_STATUS_BP_ALL              	(0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
+
+#endif /* __INCmvSFlashSpecH */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvCompVer.txt
new file mode 100644
index 00000000..85bfa612
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.3
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c
new file mode 100644
index 00000000..39e0b720
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c
@@ -0,0 +1,576 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "spi/mvSpi.h"
+#include "spi/mvSpiSpec.h"
+
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+/* #define MV_DEBUG */
+#ifdef MV_DEBUG
+#define DB(x) x
+#define mvOsPrintf printf
+#else
+#define DB(x)
+#endif
+
+
+/*******************************************************************************
+* mvSpi16bitDataTxRx - Transmt and receive data
+*
+* DESCRIPTION:
+*       Tx data and block waiting for data to be transmitted
+*
+********************************************************************************/
+static MV_STATUS mvSpi16bitDataTxRx (MV_U16 txData, MV_U16 * pRxData)
+{
+    MV_U32 i;
+    MV_BOOL ready = MV_FALSE;
+
+    /* First clear the bit in the interrupt cause register */
+    MV_REG_WRITE(MV_SPI_INT_CAUSE_REG, 0x0);
+
+    /* Transmit data */
+    MV_REG_WRITE(MV_SPI_DATA_OUT_REG, MV_16BIT_LE(txData));
+
+    /* wait with timeout for memory ready */
+    for (i=0; i<MV_SPI_WAIT_RDY_MAX_LOOP; i++)
+    {
+        if (MV_REG_READ(MV_SPI_INT_CAUSE_REG))
+        {
+            ready = MV_TRUE;
+            break;
+        }
+#ifdef MV_SPI_SLEEP_ON_WAIT
+        mvOsSleep(1);
+#endif /* MV_SPI_SLEEP_ON_WAIT */
+    }
+
+    if (!ready)
+        return MV_TIMEOUT;
+
+    /* check that the RX data is needed */
+    if (pRxData)
+    {
+    	if ((MV_U32)pRxData &  0x1) /* check if address is not alligned to 16bit */
+    	{
+#if defined(MV_CPU_LE)
+    		/* perform the data write to the buffer in two stages with 8bit each */
+    		MV_U8 * bptr = (MV_U8*)pRxData;
+    		MV_U16 data = MV_16BIT_LE(MV_REG_READ(MV_SPI_DATA_IN_REG));
+    		*bptr = (data & 0xFF);
+    		++bptr;
+    		*bptr = ((data >> 8) & 0xFF);
+
+#elif defined(MV_CPU_BE)
+
+    		/* perform the data write to the buffer in two stages with 8bit each */
+    		MV_U8 * bptr = (MV_U8 *)pRxData;
+    		MV_U16 data = MV_16BIT_LE(MV_REG_READ(MV_SPI_DATA_IN_REG));
+    		*bptr = ((data >> 8) & 0xFF);
+    		++bptr;
+    		*bptr = (data & 0xFF);
+
+#else
+    #error "CPU endianess isn't defined!\n"
+#endif
+
+    	}
+    	else
+        	*pRxData = MV_16BIT_LE(MV_REG_READ(MV_SPI_DATA_IN_REG));
+    }
+
+    return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvSpi8bitDataTxRx - Transmt and receive data (8bits)
+*
+* DESCRIPTION:
+*       Tx data and block waiting for data to be transmitted
+*
+********************************************************************************/
+static MV_STATUS mvSpi8bitDataTxRx (MV_U8 txData, MV_U8 * pRxData)
+{
+    MV_U32 i;
+    MV_BOOL ready = MV_FALSE;
+
+    /* First clear the bit in the interrupt cause register */
+    MV_REG_WRITE(MV_SPI_INT_CAUSE_REG, 0x0);
+
+    /* Transmit data */
+    MV_REG_WRITE(MV_SPI_DATA_OUT_REG, txData);
+
+    /* wait with timeout for memory ready */
+    for (i=0; i<MV_SPI_WAIT_RDY_MAX_LOOP; i++)
+    {
+        if (MV_REG_READ(MV_SPI_INT_CAUSE_REG))
+        {
+            ready = MV_TRUE;
+            break;
+        }
+#ifdef MV_SPI_SLEEP_ON_WAIT
+        mvOsSleep(1);
+#endif /* MV_SPI_SLEEP_ON_WAIT */
+    }
+
+    if (!ready)
+        return MV_TIMEOUT;
+
+    /* check that the RX data is needed */
+    if (pRxData)
+    	*pRxData = MV_REG_READ(MV_SPI_DATA_IN_REG);
+
+    return MV_OK;
+}
+
+/*
+#####################################################################################
+#####################################################################################
+*/
+
+/*******************************************************************************
+* mvSpiInit - Initialize the SPI controller
+*
+* DESCRIPTION:
+*       Perform the neccessary initialization in order to be able to send an
+*		receive over the SPI interface.
+*
+* INPUT:
+*       serialBaudRate: Baud rate (SPI clock frequency)
+*		use16BitMode: Whether to use 2bytes (MV_TRUE) or 1bytes (MV_FALSE)
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSpiInit	(MV_U32 serialBaudRate)
+{
+    MV_STATUS ret;
+
+    /* Set the serial clock */
+    if ((ret = mvSpiBaudRateSet(serialBaudRate)) != MV_OK)
+        return ret;
+
+    /* For devices in which the SPI is muxed on the MPP with other interfaces*/
+    mvMPPConfigToSPI();
+
+	/* Configure the default SPI mode to be 16bit */
+	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
+
+	/* Fix ac timing on SPI in 6183, 6183L and 78x00 only */
+	if ( (mvCtrlModelGet() == MV_6183_DEV_ID) ||
+		 (mvCtrlModelGet() == MV_6183L_DEV_ID) ||
+		(mvCtrlModelGet() == MV_78100_DEV_ID) ||
+		(mvCtrlModelGet() == MV_78200_DEV_ID) ||
+		(mvCtrlModelGet() == MV_76100_DEV_ID))
+	    MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, BIT14);
+
+    /* Verify that the CS is deasserted */
+    mvSpiCsDeassert();
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvSpiBaudRateSet - Set the Frequency of the SPI clock
+*
+* DESCRIPTION:
+*       Set the Prescale bits to adapt to the requested baud rate (the clock
+*       used for thr SPI).
+*
+* INPUT:
+*       serialBaudRate: Baud rate (SPI clock frequency)
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSpiBaudRateSet (MV_U32 serialBaudRate)
+{
+    MV_U8 i;
+	/* MV_U8 preScale[32] = {1, 1, 2, 3, 4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+						  2, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30};
+	*/
+	MV_U8 preScale[14] = { 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30};
+	MV_U8 bestPrescaleIndx = 100;
+	MV_U32 minBaudOffset = 0xFFFFFFFF;
+	MV_U32 cpuClk = mvBoardTclkGet(); /*mvCpuPclkGet();*/
+	MV_U32 tempReg;
+
+	/* Find the best prescale configuration - less or equal */
+	for (i=0; i<14; i++)
+	{
+		/* check for higher - irrelevent */
+		if ((cpuClk / preScale[i]) > serialBaudRate)
+			continue;
+
+		/* check for exact fit */
+		if ((cpuClk / preScale[i]) == serialBaudRate)
+		{
+			bestPrescaleIndx = i;
+			break;
+		}
+
+		/* check if this is better than the previous one */
+		if ((serialBaudRate - (cpuClk / preScale[i])) < minBaudOffset)
+		{
+			minBaudOffset = (serialBaudRate - (cpuClk / preScale[i]));
+			bestPrescaleIndx = i;
+		}
+	}
+
+	if (bestPrescaleIndx > 14)
+    {
+        mvOsPrintf("%s ERROR: SPI baud rate prescale error!\n", __FUNCTION__);
+		return MV_OUT_OF_RANGE;
+    }
+
+	/* configure the Prescale */
+	tempReg = MV_REG_READ(MV_SPI_IF_CONFIG_REG);
+	tempReg = ((tempReg & ~MV_SPI_CLK_PRESCALE_MASK) | (bestPrescaleIndx + 0x12));
+	MV_REG_WRITE(MV_SPI_IF_CONFIG_REG, tempReg);
+
+    return MV_OK;
+}
+
+/*******************************************************************************
+* mvSpiCsAssert - Assert the Chip Select pin indicating a new transfer
+*
+* DESCRIPTION:
+*       Assert The chip select - used to select an external SPI device
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Success or Error code.
+*
+********************************************************************************/
+MV_VOID mvSpiCsAssert(MV_VOID)
+{
+    /* For devices in which the SPI is muxed on the MPP with other interfaces*/
+    mvMPPConfigToSPI();
+    mvOsUDelay(1);
+    MV_REG_BIT_SET(MV_SPI_IF_CTRL_REG, MV_SPI_CS_ENABLE_MASK);
+}
+
+/*******************************************************************************
+* mvSpiCsDeassert - DeAssert the Chip Select pin indicating the end of a
+*				  SPI transfer sequence
+*
+* DESCRIPTION:
+*       DeAssert the chip select pin
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Success or Error code.
+*
+********************************************************************************/
+MV_VOID mvSpiCsDeassert(MV_VOID)
+{
+	MV_REG_BIT_RESET(MV_SPI_IF_CTRL_REG, MV_SPI_CS_ENABLE_MASK);
+
+    /* For devices in which the SPI is muxed on the MPP with other interfaces*/
+    mvMPPConfigToDefault();
+}
+
+/*******************************************************************************
+* mvSpiRead - Read a buffer over the SPI interface
+*
+* DESCRIPTION:
+*       Receive (read) a buffer over the SPI interface in 16bit chunks. If the
+*		buffer size is odd, then the last chunk will be 8bits. Chip select is not
+*       handled at this level.
+*
+* INPUT:
+*		pRxBuff: Pointer to the buffer to hold the received data
+*		buffSize: length of the pRxBuff
+*
+* OUTPUT:
+*		pRxBuff: Pointer to the buffer with the received data
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSpiRead	(MV_U8* pRxBuff, MV_U32 buffSize)
+{
+    MV_STATUS ret;
+	MV_U32 bytesLeft = buffSize;
+	MV_U16* rxPtr = (MV_U16*)pRxBuff;
+
+    /* check for null parameters */
+    if (pRxBuff == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Check that the buffer pointer and the buffer size are 16bit aligned */
+    if ((((MV_U32)buffSize & 1) == 0) && (((MV_U32)pRxBuff & 1) == 0))
+    {
+	/* Verify that the SPI mode is in 16bit mode */
+	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
+
+	/* TX/RX as long we have complete 16bit chunks */
+	while (bytesLeft >= MV_SPI_16_BIT_CHUNK_SIZE)
+	{
+		/* Transmitted and wait for the transfer to be completed */
+		if ((ret = mvSpi16bitDataTxRx(MV_SPI_DUMMY_WRITE_16BITS, rxPtr)) != MV_OK)
+			return ret;
+
+		/* increment the pointers */
+		rxPtr++;
+		bytesLeft -= MV_SPI_16_BIT_CHUNK_SIZE;
+	}
+
+    }
+    else
+    {
+	/* Verify that the SPI mode is in 8bit mode */
+	MV_REG_BIT_RESET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
+
+	/* TX/RX in 8bit chanks */
+	while (bytesLeft > 0)
+	{
+        	/* Transmitted and wait for the transfer to be completed */
+		if ((ret = mvSpi8bitDataTxRx(MV_SPI_DUMMY_WRITE_8BITS, pRxBuff)) != MV_OK)
+			return ret;
+		/* increment the pointers */
+		pRxBuff++;
+		bytesLeft--;
+	}
+    }
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvSpiWrite - Transmit a buffer over the SPI interface
+*
+* DESCRIPTION:
+*       Transmit a buffer over the SPI interface in 16bit chunks. If the
+*		buffer size is odd, then the last chunk will be 8bits. No chip select
+*       action is taken.
+*
+* INPUT:
+*		pTxBuff: Pointer to the buffer holding the TX data
+*		buffSize: length of the pTxBuff
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSpiWrite(MV_U8* pTxBuff, MV_U32 buffSize)
+{
+    MV_STATUS ret;
+	MV_U32 bytesLeft = buffSize;
+	MV_U16* txPtr = (MV_U16*)pTxBuff;
+
+    /* check for null parameters */
+    if (pTxBuff == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Check that the buffer pointer and the buffer size are 16bit aligned */
+    if ((((MV_U32)buffSize & 1) == 0) && (((MV_U32)pTxBuff & 1) == 0))
+    {
+	/* Verify that the SPI mode is in 16bit mode */
+	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
+
+	/* TX/RX as long we have complete 16bit chunks */
+	while (bytesLeft >= MV_SPI_16_BIT_CHUNK_SIZE)
+	{
+        /* Transmitted and wait for the transfer to be completed */
+		if ((ret = mvSpi16bitDataTxRx(*txPtr, NULL)) != MV_OK)
+			return ret;
+
+		/* increment the pointers */
+		txPtr++;
+		bytesLeft -= MV_SPI_16_BIT_CHUNK_SIZE;
+	}
+    }
+    else
+    {
+
+	/* Verify that the SPI mode is in 8bit mode */
+	MV_REG_BIT_RESET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
+
+	/* TX/RX in 8bit chanks */
+	while (bytesLeft > 0)
+	{
+		/* Transmitted and wait for the transfer to be completed */
+		if ((ret = mvSpi8bitDataTxRx(*pTxBuff, NULL)) != MV_OK)
+			return ret;
+
+		/* increment the pointers */
+		pTxBuff++;
+		bytesLeft--;
+	}
+    }
+
+	return MV_OK;
+}
+
+
+/*******************************************************************************
+* mvSpiReadWrite - Read and Write a buffer simultanuosely
+*
+* DESCRIPTION:
+*       Transmit and receive a buffer over the SPI in 16bit chunks. If the
+*		buffer size is odd, then the last chunk will be 8bits. The SPI chip
+*       select is not handled implicitely.
+*
+* INPUT:
+*       pRxBuff: Pointer to the buffer to write the RX info in
+*		pTxBuff: Pointer to the buffer holding the TX info
+*		buffSize: length of both the pTxBuff and pRxBuff
+*
+* OUTPUT:
+*       pRxBuff: Pointer of the buffer holding the RX data
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSpiReadWrite(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize)
+{
+    MV_STATUS ret;
+    MV_U32 bytesLeft = buffSize;
+    MV_U16* txPtr = (MV_U16*)pTxBuff;
+    MV_U16* rxPtr = (MV_U16*)pRxBuff;
+
+    /* check for null parameters */
+    if ((pRxBuff == NULL) || (pTxBuff == NULL))
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+    /* Check that the buffer pointer and the buffer size are 16bit aligned */
+    if ((((MV_U32)buffSize & 1) == 0) && (((MV_U32)pTxBuff & 1) == 0) && (((MV_U32)pRxBuff & 1) == 0))
+    {
+	/* Verify that the SPI mode is in 16bit mode */
+	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
+
+	/* TX/RX as long we have complete 16bit chunks */
+	while (bytesLeft >= MV_SPI_16_BIT_CHUNK_SIZE)
+	{
+        /* Transmitted and wait for the transfer to be completed */
+		if ((ret = mvSpi16bitDataTxRx(*txPtr, rxPtr)) != MV_OK)
+			return ret;
+
+		/* increment the pointers */
+		txPtr++;
+		rxPtr++;
+		bytesLeft -= MV_SPI_16_BIT_CHUNK_SIZE;
+	}
+    }
+    else
+    {
+	/* Verify that the SPI mode is in 8bit mode */
+	MV_REG_BIT_RESET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
+
+	/* TX/RX in 8bit chanks */
+	while (bytesLeft > 0)
+	{
+		/* Transmitted and wait for the transfer to be completed */
+		if ( (ret = mvSpi8bitDataTxRx(*pTxBuff, pRxBuff) ) != MV_OK)
+			return ret;
+		pRxBuff++;
+		pTxBuff++;
+		bytesLeft--;
+	}
+    }
+
+	return MV_OK;
+}
+
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h
new file mode 100644
index 00000000..74859f03
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h
@@ -0,0 +1,94 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSpihH
+#define __INCmvSpihH
+
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+
+/* Function Prototypes */
+/* Init */
+MV_STATUS   mvSpiInit		(MV_U32 serialBaudRate);
+
+/* Set the Frequency of the Spi clock */
+MV_STATUS   mvSpiBaudRateSet(MV_U32 serialBaudRate);
+
+/* Assert the SPI chip select */
+MV_VOID     mvSpiCsAssert   (MV_VOID);
+
+/* De-assert the SPI chip select */
+MV_VOID     mvSpiCsDeassert (MV_VOID);
+
+/* Simultanuous Read and write */
+MV_STATUS	mvSpiReadWrite	(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize);
+
+/* serialize a buffer on the TX line - Rx is ignored */
+MV_STATUS	mvSpiWrite  	(MV_U8* pTxBuff, MV_U32 buffSize);
+
+/* read from the RX line by writing dummy values to the TX line */
+MV_STATUS	mvSpiRead   	(MV_U8* pRxBuff, MV_U32 buffSize);
+
+#endif /* __INCmvSpihH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c
new file mode 100644
index 00000000..a5d5a647
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c
@@ -0,0 +1,249 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "spi/mvSpi.h"
+#include "spi/mvSpiSpec.h"
+
+/*#define MV_DEBUG*/
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+
+/*******************************************************************************
+* mvSpiReadAndWrite - Read and Write a buffer simultanuousely
+*
+* DESCRIPTION:
+*       Transmit and receive a buffer over the SPI in 16bit chunks. If the
+*		buffer size is odd, then the last chunk will be 8bits.
+*
+* INPUT:
+*       pRxBuff: Pointer to the buffer to write the RX info in
+*		pTxBuff: Pointer to the buffer holding the TX info
+*		buffSize: length of both the pTxBuff and pRxBuff
+*
+* OUTPUT:
+*       pRxBuff: Pointer of the buffer holding the RX data
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSpiReadAndWrite(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize)
+{
+    MV_STATUS ret;
+
+    /* check for null parameters */
+    if ((pRxBuff == NULL) || (pTxBuff == NULL) || (buffSize == 0))
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+	/* First assert the chip select */
+	mvSpiCsAssert();
+
+    ret = mvSpiReadWrite(pRxBuff, pTxBuff, buffSize);
+
+	/* Finally deassert the chip select */
+	mvSpiCsDeassert();
+
+	return ret;
+}
+
+/*******************************************************************************
+* mvSpiWriteThenWrite - Serialize a command followed by the data over the TX line
+*
+* DESCRIPTION:
+*       Assert the chip select line. Transmit the command buffer followed by
+*       the data buffer. Then deassert the CS line.
+*
+* INPUT:
+*       pCmndBuff: Pointer to the command buffer to transmit
+*       cmndSize: length of the command size
+*		pTxDataBuff: Pointer to the data buffer to transmit
+*		txDataSize: length of the data buffer
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS	mvSpiWriteThenWrite (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pTxDataBuff,
+                                 MV_U32 txDataSize)
+{
+    MV_STATUS ret = MV_OK, tempRet;
+
+    /* check for null parameters */
+#ifndef CONFIG_MARVELL
+    if(NULL == pTxDataBuff)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+#endif
+
+    if (pCmndBuff == NULL)
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+	/* First assert the chip select */
+	mvSpiCsAssert();
+
+    /* first write the command */
+    if ((cmndSize) && (pCmndBuff != NULL))
+    {
+        if ((tempRet = mvSpiWrite(pCmndBuff, cmndSize)) != MV_OK)
+            ret = tempRet;
+    }
+
+    /* Then write the data buffer */
+#ifndef CONFIG_MARVELL
+    if (txDataSize)
+#else
+    if ((txDataSize) && (pTxDataBuff != NULL))
+#endif
+    {
+        if ((tempRet = mvSpiWrite(pTxDataBuff, txDataSize)) != MV_OK)
+            ret = tempRet;
+    }
+
+	/* Finally deassert the chip select */
+	mvSpiCsDeassert();
+
+	return ret;
+}
+
+/*******************************************************************************
+* mvSpiWriteThenRead - Serialize a command then read a data buffer
+*
+* DESCRIPTION:
+*       Assert the chip select line. Transmit the command buffer then read
+*       the data buffer. Then deassert the CS line.
+*
+* INPUT:
+*       pCmndBuff: Pointer to the command buffer to transmit
+*       cmndSize: length of the command size
+*		pRxDataBuff: Pointer to the buffer to read the data in
+*		txDataSize: length of the data buffer
+*
+* OUTPUT:
+*		pRxDataBuff: Pointer to the buffer holding the data
+*
+* RETURN:
+*       Success or Error code.
+*
+*
+*******************************************************************************/
+MV_STATUS mvSpiWriteThenRead (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pRxDataBuff,
+                              MV_U32 rxDataSize,MV_U32 dummyBytesToRead)
+{
+    MV_STATUS ret = MV_OK, tempRet;
+    MV_U8   dummyByte;
+
+    /* check for null parameters */
+    if ((pCmndBuff == NULL) && (pRxDataBuff == NULL))
+    {
+        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
+        return MV_BAD_PARAM;
+    }
+
+	/* First assert the chip select */
+	mvSpiCsAssert();
+
+    /* first write the command */
+    if ((cmndSize) && (pCmndBuff != NULL))
+    {
+        if ((tempRet = mvSpiWrite(pCmndBuff, cmndSize)) != MV_OK)
+            ret = tempRet;
+    }
+
+    /* Read dummy bytes before real data.   */
+    while(dummyBytesToRead)
+    {
+        mvSpiRead(&dummyByte,1);
+        dummyBytesToRead--;
+    }
+
+    /* Then write the data buffer */
+    if ((rxDataSize) && (pRxDataBuff != NULL))
+    {
+        if ((tempRet = mvSpiRead(pRxDataBuff, rxDataSize)) != MV_OK)
+            ret = tempRet;
+    }
+
+	/* Finally deassert the chip select */
+	mvSpiCsDeassert();
+
+	return ret;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h
new file mode 100644
index 00000000..329e26b7
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h
@@ -0,0 +1,82 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSpiCmndhH
+#define __INCmvSpiCmndhH
+
+#include "mvTypes.h"
+
+/* Function Prototypes */
+
+/* Simultanuous Read and write */
+MV_STATUS	mvSpiReadAndWrite	(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize);
+
+/* write command - write a command and then write data */
+MV_STATUS	mvSpiWriteThenWrite (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pTxDataBuff, MV_U32 txDataSize);
+
+/* read command - write a command and then read data by writing dummy data */
+MV_STATUS mvSpiWriteThenRead (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pRxDataBuff,
+                              MV_U32 rxDataSize,MV_U32 dummyBytesToRead);
+
+#endif /* __INCmvSpiCmndhH */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h
new file mode 100644
index 00000000..658159ab
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h
@@ -0,0 +1,98 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#ifndef __INCmvSpiSpecH
+#define __INCmvSpiSpecH
+
+/* Constants */
+#define		MV_SPI_WAIT_RDY_MAX_LOOP			100000
+#define		MV_SPI_16_BIT_CHUNK_SIZE			2
+#define		MV_SPI_DUMMY_WRITE_16BITS			0xFFFF
+#define		MV_SPI_DUMMY_WRITE_8BITS			0xFF
+
+/* Marvell Flash Device Controller Registers */
+#define		MV_SPI_CTRLR_OFST					0x10600
+#define		MV_SPI_IF_CTRL_REG					(MV_SPI_CTRLR_OFST + 0x00)
+#define		MV_SPI_IF_CONFIG_REG				(MV_SPI_CTRLR_OFST + 0x04)
+#define		MV_SPI_DATA_OUT_REG					(MV_SPI_CTRLR_OFST + 0x08)
+#define		MV_SPI_DATA_IN_REG					(MV_SPI_CTRLR_OFST + 0x0c)
+#define		MV_SPI_INT_CAUSE_REG				(MV_SPI_CTRLR_OFST + 0x10)
+#define		MV_SPI_INT_CAUSE_MASK_REG			(MV_SPI_CTRLR_OFST + 0x14)
+
+/* Serial Memory Interface Control Register Masks */
+#define		MV_SPI_CS_ENABLE_OFFSET				0		/* bit 0 */
+#define		MV_SPI_MEMORY_READY_OFFSET			1		/* bit 1 */
+#define		MV_SPI_CS_ENABLE_MASK				(0x1  << MV_SPI_CS_ENABLE_OFFSET)
+#define		MV_SPI_MEMORY_READY_MASK			(0x1  << MV_SPI_MEMORY_READY_OFFSET)
+
+/* Serial Memory Interface Configuration Register Masks */
+#define		MV_SPI_CLK_PRESCALE_OFFSET			0		/* bit 0-4 */
+#define		MV_SPI_BYTE_LENGTH_OFFSET			5		/* bit 5 */
+#define		MV_SPI_ADDRESS_BURST_LENGTH_OFFSET  8	    /* bit 8-9 */
+#define		MV_SPI_CLK_PRESCALE_MASK			(0x1F << MV_SPI_CLK_PRESCALE_OFFSET)
+#define		MV_SPI_BYTE_LENGTH_MASK				(0x1  << MV_SPI_BYTE_LENGTH_OFFSET)
+#define		MV_SPI_ADDRESS_BURST_LENGTH_MASK	(0x3  << MV_SPI_ADDRESS_BURST_LENGTH_OFFSET)
+
+#endif /* __INCmvSpiSpecH */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvCompVer.txt b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvCompVer.txt
new file mode 100644
index 00000000..40531164
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvCompVer.txt
@@ -0,0 +1,4 @@
+Global HAL Version: FEROCEON_HAL_3_1_7
+Unit HAL Version: 3.1.5
+Description: This component includes an implementation of the unit HAL drivers
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c
new file mode 100644
index 00000000..0bf8b757
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c
@@ -0,0 +1,1023 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED.  The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer.
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    *   Neither the name of Marvell nor the names of its contributors may be
+        used to endorse or promote products derived from this software without
+        specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+#include "mvTwsi.h"
+#include "mvTwsiSpec.h"
+#include "cpu/mvCpu.h"
+
+
+/*#define MV_DEBUG*/
+#ifdef MV_DEBUG
+#define DB(x) x
+#else
+#define DB(x)
+#endif
+
+static MV_VOID twsiIntFlgClr(MV_U8 chanNum);
+static MV_BOOL twsiMainIntGet(MV_U8 chanNum);
+static MV_VOID twsiAckBitSet(MV_U8 chanNum);
+static MV_U32 twsiStsGet(MV_U8 chanNum);
+static MV_VOID twsiReset(MV_U8 chanNum);
+static MV_STATUS twsiAddr7BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command);
+static MV_STATUS twsiAddr10BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command);
+static MV_STATUS twsiDataTransmit(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize);
+static MV_STATUS twsiDataReceive(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize);
+static MV_STATUS twsiTargetOffsSet(MV_U8 chanNum, MV_U32 offset,MV_BOOL moreThen256);
+
+
+static MV_BOOL twsiTimeoutChk(MV_U32 timeout, const MV_8 *pString)
+{
+	if(timeout >= TWSI_TIMEOUT_VALUE)
+	{
+		DB(mvOsPrintf("%s",pString));
+		return MV_TRUE;
+	}
+	return MV_FALSE;
+	
+}
+/*******************************************************************************
+* mvTwsiStartBitSet - Set start bit on the bus
+*
+* DESCRIPTION:
+*       This routine sets the start bit on the TWSI bus. 
+*       The routine first checks for interrupt flag condition, then it sets 
+*       the start bit  in the TWSI Control register. 
+*       If the interrupt flag condition check previously was set, the function 
+*       will clear it.
+*       The function then wait for the start bit to be cleared by the HW. 
+*       Then it waits for the interrupt flag to be set and eventually, the 
+*       TWSI status is checked to be 0x8 or 0x10(repeated start bit).
+*
+* INPUT:
+*       chanNum - TWSI channel.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK is start bit was set successfuly on the bus.
+*       MV_FAIL if interrupt flag was set before setting start bit.
+*
+*******************************************************************************/
+MV_STATUS mvTwsiStartBitSet(MV_U8 chanNum)
+{
+	MV_BOOL isIntFlag = MV_FALSE;
+	MV_U32 timeout, temp;
+
+	DB(mvOsPrintf("TWSI: mvTwsiStartBitSet \n"));
+	/* check Int flag */
+    	if(twsiMainIntGet(chanNum))
+		isIntFlag = MV_TRUE;
+	/* set start Bit */
+    	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
+	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp | TWSI_CONTROL_START_BIT);
+	
+	/* in case that the int flag was set before i.e. repeated start bit */
+	if(isIntFlag){
+		DB(mvOsPrintf("TWSI: mvTwsiStartBitSet repeated start Bit\n"));
+		twsiIntFlgClr(chanNum);
+	}
+	
+   	/* wait for interrupt */
+	timeout = 0;
+	while(!twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
+	
+	/* check for timeout */	
+	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: mvTwsiStartBitSet ERROR - Start Clear bit TimeOut .\n"))
+		return MV_TIMEOUT;
+
+
+	/* check that start bit went down */
+	if((MV_REG_READ(TWSI_CONTROL_REG(chanNum)) & TWSI_CONTROL_START_BIT) != 0)
+	{
+		mvOsPrintf("TWSI: mvTwsiStartBitSet ERROR - start bit didn't went down\n");
+		return MV_FAIL;
+	}	
+
+	/* check the status */
+	temp = twsiStsGet(chanNum);
+	if(( temp != TWSI_START_CON_TRA ) && ( temp != TWSI_REPEATED_START_CON_TRA ))
+	  {
+		mvOsPrintf("TWSI: mvTwsiStartBitSet ERROR - status %x after Set Start Bit. \n",temp);
+		return MV_FAIL;
+	}
+
+	return MV_OK;	
+
+}
+
+/*******************************************************************************
+* mvTwsiStopBitSet - Set stop bit on the bus
+*
+* DESCRIPTION:
+*       This routine set the stop bit on the TWSI bus. 
+*       The function then wait for the stop bit to be cleared by the HW. 
+*       Finally the function checks for status of 0xF8.
+*
+* INPUT:
+*	chanNum - TWSI channel
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE is stop bit was set successfuly on the bus.
+*
+*******************************************************************************/
+MV_STATUS mvTwsiStopBitSet(MV_U8 chanNum)
+{
+    	MV_U32	timeout, temp;
+
+    	/* Generate stop bit */
+	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
+    	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp | TWSI_CONTROL_STOP_BIT);
+
+	twsiIntFlgClr(chanNum);
+		
+   	/* wait for stop bit to come down */
+	timeout = 0;
+	while( ((MV_REG_READ(TWSI_CONTROL_REG(chanNum)) & TWSI_CONTROL_STOP_BIT) != 0) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+	/* check for timeout */
+	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: mvTwsiStopBitSet ERROR - Stop bit TimeOut .\n"))
+		return MV_TIMEOUT;
+	
+	/* check that the stop bit went down */
+	if((MV_REG_READ(TWSI_CONTROL_REG(chanNum)) & TWSI_CONTROL_STOP_BIT) != 0)	
+	{
+		mvOsPrintf("TWSI: mvTwsiStopBitSet ERROR - stop bit didn't went down. \n");
+		return MV_FAIL;
+	}
+	
+	/* check the status */
+	temp = twsiStsGet(chanNum);
+	if( temp != TWSI_NO_REL_STS_INT_FLAG_IS_KEPT_0){
+		mvOsPrintf("TWSI: mvTwsiStopBitSet ERROR - status %x after Stop Bit. \n", temp);
+		return MV_FAIL;
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* twsiMainIntGet - Get twsi bit from main Interrupt cause.
+*
+* DESCRIPTION:
+*       This routine returns the twsi interrupt flag value.
+*       
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_TRUE is interrupt flag is set, MV_FALSE otherwise.
+*
+*******************************************************************************/
+static MV_BOOL twsiMainIntGet(MV_U8 chanNum)
+{
+	MV_U32 temp;
+	
+	/* get the int flag bit */
+
+	temp = MV_REG_READ(TWSI_CPU_MAIN_INT_CAUSE_REG);
+	if (temp & (TWSI0_CPU_MAIN_INT_BIT << chanNum))
+	    return MV_TRUE;
+    
+	return MV_FALSE;
+}
+/*******************************************************************************
+* twsiIntFlgClr - Clear Interrupt flag.
+*
+* DESCRIPTION:
+*       This routine clears the interrupt flag. It does NOT poll the interrupt
+*       to make sure the clear. After clearing the interrupt, it waits for at 
+*       least 1 miliseconds.
+*
+* INPUT:
+*	chanNum - TWSI channel
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+static MV_VOID twsiIntFlgClr(MV_U8 chanNum)
+{
+	MV_U32 temp;
+
+	/* wait for 1 mili to prevent TWSI register write after write problems */
+   	mvOsDelay(1);
+	/* clear the int flag bit */
+	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
+    	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum),temp & ~(TWSI_CONTROL_INT_FLAG_SET));
+
+	/* wait for 1 mili sec for the clear to take effect */
+   	mvOsDelay(1);
+	
+	return;
+}
+
+
+/*******************************************************************************
+* twsiAckBitSet - Set acknowledge bit on the bus
+*
+* DESCRIPTION:
+*       This routine set the acknowledge bit on the TWSI bus.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+static MV_VOID twsiAckBitSet(MV_U8 chanNum)
+{
+	MV_U32 temp;
+
+	/*Set the Ack bit */
+	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
+    	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp | TWSI_CONTROL_ACK);
+
+	/* Add delay of 1ms */
+	mvOsDelay(1);
+	return;
+}
+
+
+/*******************************************************************************
+* twsiInit - Initialize TWSI interface
+*
+* DESCRIPTION:
+*       This routine:
+*	-Reset the TWSI.
+*	-Initialize the TWSI clock baud rate according to given frequancy
+*	 parameter based on Tclk frequancy and enables TWSI slave.
+*       -Set the ack bit.
+*	-Assign the TWSI slave address according to the TWSI address Type.
+*       
+*
+* INPUT:
+*	chanNum - TWSI channel
+*       frequancy - TWSI frequancy in KHz. (up to 100KHZ)
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       Actual frequancy.
+*
+*******************************************************************************/
+MV_U32 mvTwsiInit(MV_U8 chanNum, MV_HZ frequancy, MV_U32 Tclk, MV_TWSI_ADDR *pTwsiAddr, MV_BOOL generalCallEnable)
+{
+    	MV_U32	n,m,freq,margin,minMargin = 0xffffffff;
+	MV_U32	power;
+    	MV_U32	actualFreq = 0,actualN = 0,actualM = 0,val;
+
+	if(frequancy > 100000)
+	{
+		mvOsPrintf("Warning TWSI frequancy is too high, please use up tp 100Khz. \n");
+	}
+
+	DB(mvOsPrintf("TWSI: mvTwsiInit - Tclk = %d freq = %d\n",Tclk,frequancy));
+    	/* Calucalte N and M for the TWSI clock baud rate */
+    	for(n = 0 ; n < 8 ; n++)
+    	{
+        	for(m = 0 ; m < 16 ; m++)
+        	{
+            		power = 2 << n; /* power = 2^(n+1) */
+            		freq = Tclk/(10*(m+1)*power);
+            		margin = MV_ABS(frequancy - freq);
+            		if(margin < minMargin)
+            		{
+                		minMargin   = margin;
+                		actualFreq  = freq;
+                		actualN     = n;
+                		actualM     = m;
+            		}
+        	}
+		}
+	DB(mvOsPrintf("TWSI: mvTwsiInit - actN %d actM %d actFreq %d\n",actualN , actualM, actualFreq));
+	/* Reset the TWSI logic */
+	twsiReset(chanNum);
+
+	/* Set the baud rate */
+	val = ((actualM<< TWSI_BAUD_RATE_M_OFFS) | actualN << TWSI_BAUD_RATE_N_OFFS);
+    	MV_REG_WRITE(TWSI_STATUS_BAUDE_RATE_REG(chanNum),val);
+
+    	/* Enable the TWSI and slave */
+	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), TWSI_CONTROL_ENA | TWSI_CONTROL_ACK); 
+
+	/* set the TWSI slave address */
+	if( pTwsiAddr->type == ADDR10_BIT )/* 10 Bit deviceAddress */
+    	{
+		/* writing the 2 most significant bits of the 10 bit address*/
+		val = ((pTwsiAddr->address & TWSI_SLAVE_ADDR_10BIT_MASK) >> TWSI_SLAVE_ADDR_10BIT_OFFS );
+		/* bits 7:3 must be 0x11110 */
+		val |= TWSI_SLAVE_ADDR_10BIT_CONST;
+		/* set GCE bit */
+		if(generalCallEnable)
+			val |= TWSI_SLAVE_ADDR_GCE_ENA;
+		/* write slave address */
+		MV_REG_WRITE(TWSI_SLAVE_ADDR_REG(chanNum),val);
+
+         	/* writing the 8 least significant bits of the 10 bit address*/
+        	val = (pTwsiAddr->address << TWSI_EXTENDED_SLAVE_OFFS) & TWSI_EXTENDED_SLAVE_MASK;  
+        	MV_REG_WRITE(TWSI_EXTENDED_SLAVE_ADDR_REG(chanNum), val);
+    	}
+    	else /*7 bit address*/
+    	{
+		/* set the 7 Bits address */
+        	MV_REG_WRITE(TWSI_EXTENDED_SLAVE_ADDR_REG(chanNum),0x0);
+		val = (pTwsiAddr->address << TWSI_SLAVE_ADDR_7BIT_OFFS) & TWSI_SLAVE_ADDR_7BIT_MASK;
+        	MV_REG_WRITE(TWSI_SLAVE_ADDR_REG(chanNum), val);
+    	}
+
+	/* unmask twsi int */
+    val = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
+	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), val | TWSI_CONTROL_INT_ENA);
+	/* Add delay of 1ms */
+	mvOsDelay(1);
+	
+   return actualFreq;
+} 
+
+
+/*******************************************************************************
+* twsiStsGet - Get the TWSI status value.
+*
+* DESCRIPTION:
+*       This routine returns the TWSI status value.
+*
+* INPUT:
+*	chanNum - TWSI channel
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_U32 - the TWSI status.
+*
+*******************************************************************************/
+static MV_U32 twsiStsGet(MV_U8 chanNum)
+{
+    return MV_REG_READ(TWSI_STATUS_BAUDE_RATE_REG(chanNum));
+
+}
+
+/*******************************************************************************
+* twsiReset - Reset the TWSI.
+*
+* DESCRIPTION:
+*       Resets the TWSI logic and sets all TWSI registers to their reset values.
+*
+* INPUT:
+*      chanNum - TWSI channel
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None
+*
+*******************************************************************************/
+static MV_VOID twsiReset(MV_U8 chanNum)
+{
+    	/* Reset the TWSI logic */
+    	MV_REG_WRITE(TWSI_SOFT_RESET_REG(chanNum),0);
+
+	/* wait for 2 mili sec */
+   	mvOsDelay(2);
+
+	return;
+}
+
+
+
+
+/******************************* POLICY ****************************************/
+
+
+
+/*******************************************************************************
+* mvTwsiAddrSet - Set address on TWSI bus.
+*
+* DESCRIPTION:
+*       This function Set address (7 or 10 Bit address) on the Twsi Bus.
+*
+* INPUT:
+*	chanNum - TWSI channel
+*       pTwsiAddr - twsi address.
+*	command	 - read / write .
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK - if setting the address completed succesfully.
+*	MV_FAIL otherwmise.
+*
+*******************************************************************************/
+MV_STATUS mvTwsiAddrSet(MV_U8 chanNum, MV_TWSI_ADDR *pTwsiAddr, MV_TWSI_CMD command)
+{
+	DB(mvOsPrintf("TWSI: mvTwsiAddr7BitSet addr %x , type %d, cmd is %s\n",pTwsiAddr->address,\
+		 			pTwsiAddr->type, ((command==MV_TWSI_WRITE)?"Write":"Read") ));
+	/* 10 Bit address */
+	if(pTwsiAddr->type == ADDR10_BIT)
+	{
+		return twsiAddr10BitSet(chanNum, pTwsiAddr->address,command);
+	}
+	/* 7 Bit address */
+	else
+	{
+		return twsiAddr7BitSet(chanNum, pTwsiAddr->address,command);
+	}
+
+}
+
+/*******************************************************************************
+* twsiAddr10BitSet - Set 10 Bit address on TWSI bus.
+*
+* DESCRIPTION:
+*       There are two address phases:
+*       1) Write '11110' to data register bits [7:3] and 10-bit address MSB 
+*          (bits [9:8]) to data register bits [2:1] plus a write(0) or read(1) bit 
+*          to the Data register. Then it clears interrupt flag which drive 
+*          the address on the TWSI bus. The function then waits for interrupt 
+*          flag to be active and status 0x18 (write) or 0x40 (read) to be set.
+*       2) write the rest of 10-bit address to data register and clears 
+*          interrupt flag which drive the address on the TWSI bus. The 
+*          function then waits for interrupt flag to be active and status 
+*          0xD0 (write) or 0xE0 (read) to be set. 
+*
+* INPUT:
+*	chanNum - TWSI channel
+*       deviceAddress - twsi address.
+*	command	 - read / write .
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK - if setting the address completed succesfully.
+*	MV_FAIL otherwmise.
+*
+*******************************************************************************/
+static MV_STATUS twsiAddr10BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command)
+{
+	MV_U32 val,timeout;
+
+	/* writing the 2 most significant bits of the 10 bit address*/
+	val = ((deviceAddress & TWSI_DATA_ADDR_10BIT_MASK) >> TWSI_DATA_ADDR_10BIT_OFFS );
+	/* bits 7:3 must be 0x11110 */
+	val |= TWSI_DATA_ADDR_10BIT_CONST;
+	/* set command */
+	val |= command;
+	MV_REG_WRITE(TWSI_DATA_REG(chanNum), val);
+	/* WA add a delay */
+	mvOsDelay(1);
+
+	/* clear Int flag */
+	twsiIntFlgClr(chanNum);
+
+	/* wait for Int to be Set */
+	timeout = 0;
+	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+	/* check for timeout */
+	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiAddr10BitSet ERROR - 1st addr (10Bit) Int TimeOut.\n"))
+		return MV_TIMEOUT;
+	
+	/* check the status */
+	val = twsiStsGet(chanNum);
+	if(( (val != TWSI_AD_PLS_RD_BIT_TRA_ACK_REC) && (command == MV_TWSI_READ ) ) || 
+	   ( (val != TWSI_AD_PLS_WR_BIT_TRA_ACK_REC) && (command == MV_TWSI_WRITE) ))
+	{
+		mvOsPrintf("TWSI: twsiAddr10BitSet ERROR - status %x 1st addr (10 Bit) in %s mode.\n"\
+						,val, ((command==MV_TWSI_WRITE)?"Write":"Read") );
+		return MV_FAIL;
+	}
+
+	/* set 	8 LSB of the address */
+	val = (deviceAddress << TWSI_DATA_ADDR_7BIT_OFFS) & TWSI_DATA_ADDR_7BIT_MASK;
+	MV_REG_WRITE(TWSI_DATA_REG(chanNum), val);
+
+	/* clear Int flag */
+	twsiIntFlgClr(chanNum);
+
+	/* wait for Int to be Set */
+	timeout = 0;
+	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+	/* check for timeout */
+	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiAddr10BitSet ERROR - 2nd (10 Bit) Int TimOut.\n"))
+		return MV_TIMEOUT;
+	
+	/* check the status */
+	val = twsiStsGet(chanNum);
+	if(( (val != TWSI_SEC_AD_PLS_RD_BIT_TRA_ACK_REC) && (command == MV_TWSI_READ ) ) || 
+	   ( (val != TWSI_SEC_AD_PLS_WR_BIT_TRA_ACK_REC) && (command == MV_TWSI_WRITE) ))
+	{
+		mvOsPrintf("TWSI: twsiAddr10BitSet ERROR - status %x 2nd addr(10 Bit) in %s mode.\n"\
+						,val, ((command==MV_TWSI_WRITE)?"Write":"Read") );
+		return MV_FAIL;
+	}
+	
+	return MV_OK;
+}
+
+/*******************************************************************************
+* twsiAddr7BitSet - Set 7 Bit address on TWSI bus.
+*
+* DESCRIPTION:
+*       This function writes 7 bit address plus a write or read bit to the 
+*       Data register. Then it clears interrupt flag which drive the address on 
+*       the TWSI bus. The function then waits for interrupt flag to be active
+*       and status 0x18 (write) or 0x40 (read) to be set.
+*
+* INPUT:
+*	chanNum - TWSI channel
+*       deviceAddress - twsi address.
+*	command	 - read / write .
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK - if setting the address completed succesfully.
+*	MV_FAIL otherwmise.
+*
+*******************************************************************************/
+static MV_STATUS twsiAddr7BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command)
+{
+	MV_U32 val,timeout;
+
+	/* set the address */
+	val = (deviceAddress << TWSI_DATA_ADDR_7BIT_OFFS) & TWSI_DATA_ADDR_7BIT_MASK;
+	/* set command */
+	val |= command;	
+	MV_REG_WRITE(TWSI_DATA_REG(chanNum), val);
+	/* WA add a delay */
+	mvOsDelay(1);
+
+	/* clear Int flag */
+	twsiIntFlgClr(chanNum);
+
+	/* wait for Int to be Set */
+	timeout = 0;
+	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+	/* check for timeout */
+	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiAddr7BitSet ERROR - Addr (7 Bit) int TimeOut.\n"))
+		return MV_TIMEOUT;
+	
+	/* check the status */
+	val = twsiStsGet(chanNum);
+	if(( (val != TWSI_AD_PLS_RD_BIT_TRA_ACK_REC) && (command == MV_TWSI_READ ) ) || 
+	   ( (val != TWSI_AD_PLS_WR_BIT_TRA_ACK_REC) && (command == MV_TWSI_WRITE) ))
+	{
+		/* only in debug, since in boot we try to read the SPD of both DRAM, and we don't
+			want error messeges in case DIMM doesn't exist. */
+		DB(mvOsPrintf("TWSI: twsiAddr7BitSet ERROR - status %x addr (7 Bit) in %s mode.\n"\
+						,val,((command==MV_TWSI_WRITE)?"Write":"Read") ));
+		return MV_FAIL;
+	}
+	
+	return MV_OK;
+}
+
+/*******************************************************************************
+* twsiDataWrite - Trnasmit a data block over TWSI bus.
+*
+* DESCRIPTION:
+*       This function writes a given data block to TWSI bus in 8 bit granularity.
+*	first The function waits for interrupt flag to be active then
+*       For each 8-bit data:
+*        The function writes data to data register. It then clears 
+*        interrupt flag which drives the data on the TWSI bus. 
+*        The function then waits for interrupt flag to be active and status 
+*        0x28 to be set. 
+*      
+*
+* INPUT:
+*	chanNum - TWSI channel
+*       pBlock - Data block.
+*	blockSize - number of chars in pBlock.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK - if transmiting the block completed succesfully,
+*	MV_BAD_PARAM - if pBlock is NULL,
+*	MV_FAIL otherwmise.
+*
+*******************************************************************************/
+static MV_STATUS twsiDataTransmit(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize)
+{
+	MV_U32 timeout, temp, blockSizeWr = blockSize;
+
+	if(NULL == pBlock)
+		return MV_BAD_PARAM;
+
+	/* wait for Int to be Set */
+	timeout = 0;
+	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+	/* check for timeout */
+	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataTransmit ERROR - Read Data Int TimeOut.\n"))
+		return MV_TIMEOUT;
+
+	while(blockSizeWr)
+	{
+		/* write the data*/
+		MV_REG_WRITE(TWSI_DATA_REG(chanNum),(MV_U32)*pBlock);
+		DB(mvOsPrintf("TWSI: twsiDataTransmit place = %d write %x \n",\
+						blockSize - blockSizeWr, *pBlock));
+		pBlock++;
+		blockSizeWr--;
+
+		twsiIntFlgClr(chanNum);
+
+		/* wait for Int to be Set */
+		timeout = 0;
+		while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+		/* check for timeout */
+		if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataTransmit ERROR - Read Data Int TimeOut.\n"))
+			return MV_TIMEOUT;
+
+		/* check the status */
+		temp = twsiStsGet(chanNum);
+		if(temp != TWSI_M_TRAN_DATA_BYTE_ACK_REC) 
+		{
+			mvOsPrintf("TWSI: twsiDataTransmit ERROR - status %x in write trans\n",temp);
+			return MV_FAIL;
+		}
+		
+	}
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* twsiDataReceive - Receive data block from TWSI bus.
+*
+* DESCRIPTION:
+*       This function receive data block from TWSI bus in 8bit granularity 
+*       into pBlock buffer.
+*	first The function waits for interrupt flag to be active then
+*       For each 8-bit data:
+*        It clears the interrupt flag which allows the next data to be 
+*        received from TWSI bus.
+*	 The function waits for interrupt flag to be active,
+*	 and status reg is 0x50. 
+*	 Then the function reads data from data register, and copies it to 
+*	 the given buffer. 
+*
+* INPUT:
+*	chanNum - TWSI channel
+*       blockSize - number of bytes to read.
+*
+* OUTPUT:
+*       pBlock - Data block.
+*
+* RETURN:
+*       MV_OK - if receive transaction completed succesfully,
+*	MV_BAD_PARAM - if pBlock is NULL,
+*	MV_FAIL otherwmise.
+*
+*******************************************************************************/
+static MV_STATUS twsiDataReceive(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize)
+{
+	MV_U32 timeout, temp, blockSizeRd = blockSize;
+	if(NULL == pBlock)
+		return MV_BAD_PARAM;
+
+	/* wait for Int to be Set */
+	timeout = 0;
+	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+	/* check for timeout */
+	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataReceive ERROR - Read Data int Time out .\n"))
+		return MV_TIMEOUT;
+
+	while(blockSizeRd)
+	{
+		if(blockSizeRd == 1)
+		{
+			/* clear ack and Int flag */
+			temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
+			temp &=  ~(TWSI_CONTROL_ACK);
+			MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp);
+		}
+		twsiIntFlgClr(chanNum);
+		/* wait for Int to be Set */
+		timeout = 0;
+		while( (!twsiMainIntGet(chanNum)) && (timeout++ < TWSI_TIMEOUT_VALUE));
+
+		/* check for timeout */
+		if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataReceive ERROR - Read Data Int Time out .\n"))
+			return MV_TIMEOUT;
+
+		/* check the status */
+		temp = twsiStsGet(chanNum);
+		if((temp != TWSI_M_REC_RD_DATA_ACK_TRA) && (blockSizeRd !=1))
+		{
+			mvOsPrintf("TWSI: twsiDataReceive ERROR - status %x in read trans \n",temp);
+			return MV_FAIL;
+		}
+		else if((temp != TWSI_M_REC_RD_DATA_ACK_NOT_TRA) && (blockSizeRd ==1))
+		{
+			mvOsPrintf("TWSI: twsiDataReceive ERROR - status %x in Rd Terminate\n",temp);
+			return MV_FAIL;
+		}
+		
+		/* read the data*/
+		*pBlock = (MV_U8)MV_REG_READ(TWSI_DATA_REG(chanNum));
+		DB(mvOsPrintf("TWSI: twsiDataReceive  place %d read %x \n",\
+						blockSize - blockSizeRd,*pBlock));
+		pBlock++;
+		blockSizeRd--;
+	}
+
+	return MV_OK;
+}
+
+
+
+/*******************************************************************************
+* twsiTargetOffsSet - Set TWST target offset on TWSI bus.
+*
+* DESCRIPTION:
+*       The function support TWSI targets that have inside address space (for
+*       example EEPROMs). The function:
+*       1) Convert the given offset into pBlock and size.
+*		in case the offset should be set to a TWSI slave which support 
+*		more then 256 bytes offset, the offset setting will be done
+*		in 2 transactions.
+*       2) Use twsiDataTransmit to place those on the bus.
+*
+* INPUT:
+*	chanNum - TWSI channel
+*       offset - offset to be set on the EEPROM device.
+*	moreThen256 - whether the EEPROM device support more then 256 byte offset. 
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       MV_OK - if setting the offset completed succesfully.
+*	MV_FAIL otherwmise.
+*
+*******************************************************************************/
+static MV_STATUS twsiTargetOffsSet(MV_U8 chanNum, MV_U32 offset, MV_BOOL moreThen256)
+{
+	MV_U8 offBlock[2];
+	MV_U32 offSize;
+
+	if(moreThen256 == MV_TRUE)
+	{
+		offBlock[0] = (offset >> 8) & 0xff;
+		offBlock[1] = offset & 0xff;
+		offSize = 2;
+	}
+	else
+	{
+		offBlock[0] = offset & 0xff;
+		offSize = 1;
+	}
+	DB(mvOsPrintf("TWSI: twsiTargetOffsSet offSize = %x addr1 = %x addr2 = %x\n",\
+							offSize,offBlock[0],offBlock[1]));
+	return twsiDataTransmit(chanNum, offBlock, offSize);
+
+}
+
+/*******************************************************************************
+* mvTwsiRead - Read data block from a TWSI Slave.
+*
+* DESCRIPTION:
+*       The function calls the following functions:
+*       -) mvTwsiStartBitSet();
+*	if(EEPROM device)
+*       	-) mvTwsiAddrSet(w);
+*       	-) twsiTargetOffsSet();
+*       	-) mvTwsiStartBitSet();
+*       -) mvTwsiAddrSet(r);
+*       -) twsiDataReceive();
+*       -) mvTwsiStopBitSet();
+*
+* INPUT:
+*	chanNum - TWSI channel
+*      	pTwsiSlave - Twsi Slave structure. 
+*       blockSize - number of bytes to read.	
+*
+* OUTPUT:
+*      	pBlock - Data block.
+*
+* RETURN:
+*       MV_OK - if EEPROM read transaction completed succesfully,
+* 	MV_BAD_PARAM - if pBlock is NULL,
+*	MV_FAIL otherwmise.
+*
+*******************************************************************************/
+MV_STATUS mvTwsiRead(MV_U8 chanNum, MV_TWSI_SLAVE *pTwsiSlave, MV_U8 *pBlock, MV_U32 blockSize)
+{
+	if((NULL == pBlock) || (NULL == pTwsiSlave))
+		return MV_BAD_PARAM;
+	if(MV_OK != mvTwsiStartBitSet(chanNum))
+	{
+		mvTwsiStopBitSet(chanNum);
+		 return MV_FAIL;
+	}
+	
+	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiStartBitSet\n"));
+	
+	/* in case offset exsist (i.e. eeprom ) */
+	if(MV_TRUE == pTwsiSlave->validOffset)
+	{
+		if(MV_OK != mvTwsiAddrSet(chanNum, &(pTwsiSlave->slaveAddr), MV_TWSI_WRITE)) 
+		{
+			mvTwsiStopBitSet(chanNum);
+			return MV_FAIL;
+		} 
+		DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiAddrSet\n"));
+		if(MV_OK != twsiTargetOffsSet(chanNum, pTwsiSlave->offset, pTwsiSlave->moreThen256)) 
+		{
+			mvTwsiStopBitSet(chanNum);
+			return MV_FAIL;
+		}
+		DB(mvOsPrintf("TWSI: mvTwsiEepromRead after twsiTargetOffsSet\n"));
+		if(MV_OK != mvTwsiStartBitSet(chanNum)) 
+		{
+			mvTwsiStopBitSet(chanNum);
+			return MV_FAIL;
+		}
+		DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiStartBitSet\n"));
+	}
+	if(MV_OK != mvTwsiAddrSet(chanNum, &(pTwsiSlave->slaveAddr), MV_TWSI_READ)) 
+	{
+		mvTwsiStopBitSet(chanNum);
+		return MV_FAIL;
+	} 
+	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiAddrSet\n"));
+	if(MV_OK != twsiDataReceive(chanNum, pBlock, blockSize))
+	{
+		mvTwsiStopBitSet(chanNum);
+		return MV_FAIL;
+	}
+	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after twsiDataReceive\n"));
+
+	if(MV_OK != mvTwsiStopBitSet(chanNum))
+	{
+		return MV_FAIL;
+	}
+
+	twsiAckBitSet(chanNum);
+
+	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiStopBitSet\n"));
+
+	return MV_OK;
+}
+
+/*******************************************************************************
+* mvTwsiWrite - Write data block to a TWSI Slave.
+*
+* DESCRIPTION:
+*       The function calls the following functions:
+*       -) mvTwsiStartBitSet();
+*       -) mvTwsiAddrSet();
+*	-)if(EEPROM device)
+*       	-) twsiTargetOffsSet();
+*       -) twsiDataTransmit();
+*       -) mvTwsiStopBitSet();
+*
+* INPUT:
+*	chanNum - TWSI channel
+*      	eepromAddress - eeprom address. 
+*       blockSize - number of bytes to write.	
+*      	pBlock - Data block.
+*
+* OUTPUT:
+*	None
+*
+* RETURN:
+*       MV_OK - if EEPROM read transaction completed succesfully.
+*	MV_BAD_PARAM - if pBlock is NULL,
+*	MV_FAIL otherwmise.
+*
+* NOTE: Part of the EEPROM, required that the offset will be aligned to the
+*	max write burst supported.
+*******************************************************************************/
+MV_STATUS mvTwsiWrite(MV_U8 chanNum, MV_TWSI_SLAVE *pTwsiSlave, MV_U8 *pBlock, MV_U32 blockSize)
+{
+	if((NULL == pBlock) || (NULL == pTwsiSlave))
+		return MV_BAD_PARAM;
+
+	if(MV_OK != mvTwsiStartBitSet(chanNum)) 
+	{
+		mvTwsiStopBitSet(chanNum);
+		return MV_FAIL;
+	}
+
+	DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after mvTwsiStartBitSet\n"));
+	if(MV_OK != mvTwsiAddrSet(chanNum, &(pTwsiSlave->slaveAddr), MV_TWSI_WRITE))
+	{
+		mvTwsiStopBitSet(chanNum);
+		return MV_FAIL;
+	}
+	DB(mvOsPrintf("TWSI :mvTwsiEepromWrite after mvTwsiAddrSet\n"));
+
+	/* in case offset exsist (i.e. eeprom ) */
+	if(MV_TRUE == pTwsiSlave->validOffset)
+	{
+		if(MV_OK != twsiTargetOffsSet(chanNum, pTwsiSlave->offset, pTwsiSlave->moreThen256)) 
+		{
+			mvTwsiStopBitSet(chanNum);
+			return MV_FAIL;
+		}
+		DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after twsiTargetOffsSet\n"));
+	}
+	if(MV_OK != twsiDataTransmit(chanNum, pBlock, blockSize)) 
+	{
+		mvTwsiStopBitSet(chanNum);
+		return MV_FAIL;
+	}
+	DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after twsiDataTransmit\n"));
+	if(MV_OK != mvTwsiStopBitSet(chanNum)) 
+	{
+		return MV_FAIL;
+	}
+	DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after mvTwsiStopBitSet\n"));
+
+	return MV_OK;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h
new file mode 100644
index 00000000..bd5b6d00
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h
@@ -0,0 +1,121 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+#ifndef __INCmvTwsiH
+#define __INCmvTwsiH
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* need to update this includes */
+#include "twsi/mvTwsiSpec.h"
+#include "ctrlEnv/mvCtrlEnvLib.h"
+
+
+/* The TWSI interface supports both 7-bit and 10-bit addressing.            */
+/* This enumerator describes addressing type.                               */
+typedef enum _mvTwsiAddrType
+{
+    ADDR7_BIT,                      /* 7 bit address    */
+    ADDR10_BIT                      /* 10 bit address   */
+}MV_TWSI_ADDR_TYPE;
+
+/* This structure describes TWSI address.                                   */
+typedef struct _mvTwsiAddr
+{
+    MV_U32              address;    /* address          */
+    MV_TWSI_ADDR_TYPE   type;       /* Address type     */
+}MV_TWSI_ADDR;
+
+/* This structure describes a TWSI slave.                                   */
+typedef struct _mvTwsiSlave
+{
+    MV_TWSI_ADDR	slaveAddr;
+    MV_BOOL 		validOffset;		/* whether the slave has offset (i.e. Eeprom  etc.) 	*/
+    MV_U32		offset;		/* offset in the slave.					*/
+    MV_BOOL 		moreThen256;	/* whether the ofset is bigger then 256 		*/
+}MV_TWSI_SLAVE;
+
+/* This enumerator describes TWSI protocol commands.                        */
+typedef enum _mvTwsiCmd
+{
+    MV_TWSI_WRITE,   /* TWSI write command - 0 according to spec   */
+    MV_TWSI_READ   /* TWSI read command  - 1 according to spec */
+}MV_TWSI_CMD;
+
+MV_STATUS mvTwsiStartBitSet(MV_U8 chanNum);
+MV_STATUS mvTwsiStopBitSet(MV_U8 chanNum);
+MV_STATUS mvTwsiAddrSet(MV_U8 chanNum, MV_TWSI_ADDR *twsiAddr, MV_TWSI_CMD command);
+
+MV_U32 mvTwsiInit(MV_U8 chanNum, MV_KHZ frequancy, MV_U32 Tclk, MV_TWSI_ADDR *twsiAddr, MV_BOOL generalCallEnable); 
+MV_STATUS mvTwsiRead (MV_U8 chanNum, MV_TWSI_SLAVE *twsiSlave, MV_U8 *pBlock, MV_U32 blockSize);
+MV_STATUS mvTwsiWrite(MV_U8 chanNum, MV_TWSI_SLAVE *twsiSlave, MV_U8 *pBlock, MV_U32 blockSize);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvTwsiH */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiEeprom.S b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiEeprom.S
new file mode 100644
index 00000000..9d81ef2a
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiEeprom.S
@@ -0,0 +1,457 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+
+/* includes */
+#define MV_ASMLANGUAGE
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "boardEnv/mvBoardEnvSpec.h"
+#include "mvOsAsm.h"
+#include "mvTwsiSpec.h"
+#include "mvSysHwConfig.h"
+#include "ctrlEnv/sys/mvCpuIfRegs.h"
+#include "mvCommon.h"
+
+#define I2C_CH MV_BOARD_DIMM_I2C_CHANNEL
+
+/* defines */
+/* defines  */
+
+
+        .data
+        .global _i2cInit
+        .global _i2cRead
+
+        .text
+
+/*******************************************************************************
+* _i2cInit - Initialize TWSI interface
+*
+* DESCRIPTION:
+*       The function performs TWSI interface initialization. It resets the 
+*       TWSI state machine and initialize its clock to 100KHz assuming Tclock
+*       of 133MHz.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+_i2cInit:        
+        mov     r9, LR     /* Save link register */
+        mov     r0, #0     /* Make sure r0 is zero */        
+       	
+        /* Reset the i2c Mechanism first */
+        MV_REG_WRITE_ASM (r0, r1, TWSI_SOFT_RESET_REG(I2C_CH))
+
+        bl      _twsiDelay        
+        bl      _twsiDelay              
+
+        /* Initializing the I2C mechanism. Assuming Tclock frequency          */
+        /* of 166MHz. The I2C frequency in that case will be 100KHz.          */
+        /* For this settings, M = 9 and N = 3. Set the baud-rate with the     */
+        /* value of 0x2b (freq of ==> 100KHz                                  */
+        /* see spec for more details about the calculation of this value)     */
+        mov     r6, #(9 << 3 | 3)
+        MV_REG_WRITE_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        
+        /* Enable the I2C master */
+	/* Enable TWSI interrupt in main mask reg */
+        mov     r6, #0xC4
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        
+        /* Let the slow TWSI machine get used to the idea that it is enabled  */
+        bl      _twsiDelay
+        
+        
+        mov     PC, r9         /* r9 is saved link register */
+
+/*******************************************************************************
+* _twsiDelay - Perform delay.
+*
+* DESCRIPTION:
+*       The function performs a delay to enable TWSI logic to stable.
+*
+* INPUT:
+*       None.
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       None.
+*
+*******************************************************************************/
+_twsiDelay:
+        mov     r10, #0x100000 /*was 0x400*/ 
+    
+_twsiDelayLoop:
+        subs    r10, r10, #1
+        bne     _twsiDelayLoop
+        
+        mov     PC, LR
+
+/*******************************************************************************
+* _i2cRead - Read byte from I2C EEPROM device.
+*
+* DESCRIPTION:
+*       The function returns a byte from I2C EEPROM device. 
+*       The EEPROM device is 7-bit address type. 
+*
+* INPUT:
+*       r4 has the DIMM0 base address with shift 1 bit to the left
+*       r7 has the EEPROM offset
+*
+* OUTPUT:
+*       None.
+*
+* RETURN:
+*       r4 returns '0' if address can not be read.
+*       r7 has byte value in case read is successful.
+*
+*******************************************************************************/
+_i2cRead:
+        mov     r9, LR     /* Save link register */
+       
+        /* Transmit the device address and desired offset within the EEPROM. */
+        
+        /* Generate Start Bit */
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        orr     r6, r6, #TWSI_CONTROL_START_BIT
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+
+        /* Wait for the interrupt flag (bit3) to be set  */
+        mov     r10, #0x50000        
+loop_1:
+        subs    r10, r10, #1
+        beq     loop_1_timeout
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r1, CPU_INT_LOW_REG(I2C_CH))
+        tst     r6, #BIT2
+#else
+        MV_REG_READ_ASM (r6, r1, CPU_MAIN_INT_CAUSE_REG) 
+        tst     r6, #BIT5
+#endif
+        beq     loop_1
+            
+loop_1_timeout:        
+            
+        /* Wait for the start bit to be reset by HW */
+        mov     r10, #0x50000 
+loop_2:
+        subs    r10, r10, #1
+        beq     loop_2_timeout
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        tst     r6, #TWSI_CONTROL_START_BIT
+        bne     loop_2
+           
+loop_2_timeout:
+
+        /* Wait for the status TWSI_START_CONDITION_TRA = 0x8 */
+        mov     r10, #0x50000
+loop_3:
+        subs    r10, r10, #1
+        beq     loop_3_timeout
+        MV_REG_READ_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        cmp     r6, #0x08
+        bne     loop_3
+        
+loop_3_timeout:
+        
+        /* writing the address of (DIMM0/1 << 1) with write indication */
+        mov     r6, r4, LSL #1 /* Write operation address bit 0 must be 0 */
+        MV_REG_WRITE_ASM (r6, r1, TWSI_DATA_REG(I2C_CH))
+        
+        bl      _twsiDelay
+        /* Clear the interrupt flag */
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bic     r6, r6, #TWSI_CONTROL_INT_FLAG_SET
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bl      _twsiDelay
+        
+        /* Waiting for the interrupt flag to be set which means that the
+           address has been transmitted                                  */
+loop_4:
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r1, CPU_INT_LOW_REG(I2C_CH))
+        tst     r6, #BIT2
+#else
+        MV_REG_READ_ASM (r6, r1, CPU_MAIN_INT_CAUSE_REG)
+        tst     r6, #BIT5
+#endif
+        beq     loop_4       /* if tst = 0, then the bit is not set yet */
+        
+        /* Wait for status TWSI_ADDR_PLUS_WRITE_BIT_TRA_ACK_REC = 0x18 */
+        mov     r10, #0x50000         /* Set r10 to 0x50000 =~ 328,000 */
+
+loop_5:
+        subs    r10, r10, #1          /* timeout count down         */
+        bne     testStatus
+        mov     r4, #0                /* r4 = 0 -> operation failed */  
+        b       exit_i2cRead          /* Exit if timeout (No DIMM)  */
+
+testStatus:    
+        MV_REG_READ_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        cmp     r6, #0x18
+        bne     loop_5
+                
+
+        /* check if the offset is bigger than 256 byte*/
+        tst     r7, #0x80000000
+        bne     great_than_256
+                        
+        /* Write the offset to be read from the DIMM EEPROM */
+        MV_REG_WRITE_ASM (r7, r1, TWSI_DATA_REG(I2C_CH))
+        
+        b after_offset
+        
+great_than_256:
+        mov     r10, r7, LSR #8
+        and     r10, r10, #0xff
+        /* Write the offset0 to be read from the  EEPROM */
+        MV_REG_WRITE_ASM (r10, r1, TWSI_DATA_REG(I2C_CH))
+        
+        /* Clear the interrupt flag ==> signaling that the address can now
+           be transmited                                                    */
+        
+        bl      _twsiDelay
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bic     r6, r6, #TWSI_CONTROL_INT_FLAG_SET
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bl      _twsiDelay
+    
+        /* Wait for the interrupt to be set again ==> address has transmited */
+loop_6_1:
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r1, CPU_INT_LOW_REG(I2C_CH))
+        tst     r6, #BIT2
+#else
+        MV_REG_READ_ASM (r6, r1, CPU_MAIN_INT_CAUSE_REG)
+        tst     r6, #BIT5
+#endif
+        beq     loop_6_1
+        
+        /* Wait for status TWSI_MAS_TRAN_DATA_BYTE_ACK_REC = 0x28 */
+loop_7_1:
+        MV_REG_READ_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        cmp     r6, #0x28
+        bne     loop_7_1
+        
+        
+        mov     r10, r7
+        and     r10, r10, #0xff
+        /* Write the offset1 to be read from the  EEPROM */
+        MV_REG_WRITE_ASM (r10, r1, TWSI_DATA_REG(I2C_CH))
+        
+        
+        
+after_offset:                
+        
+        /* Clear the interrupt flag ==> signaling that the address can now
+           be transmited                                                    */
+        
+        bl      _twsiDelay
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bic     r6, r6, #TWSI_CONTROL_INT_FLAG_SET
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bl      _twsiDelay
+    
+        /* Wait for the interrupt to be set again ==> address has transmited */
+loop_6:
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r1, CPU_INT_LOW_REG(I2C_CH))
+        tst     r6, #BIT2
+#else
+        MV_REG_READ_ASM (r6, r1, CPU_MAIN_INT_CAUSE_REG)
+        tst     r6, #BIT5
+#endif
+        beq     loop_6
+        
+        /* Wait for status TWSI_MAS_TRAN_DATA_BYTE_ACK_REC = 0x28 */
+loop_7:
+        MV_REG_READ_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        cmp     r6, #0x28
+        bne     loop_7
+        
+        /* Retransmit the device address with read indication to get the data */
+        
+        /* generate a repeated start bit */
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        orr     r6, r6, #TWSI_CONTROL_START_BIT
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+
+        
+        /* Clear the interrupt flag ==> the start bit will be transmitted. */ 
+        bl      _twsiDelay
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bic     r6, r6, #TWSI_CONTROL_INT_FLAG_SET
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bl      _twsiDelay
+        
+       /* Wait for the interrupt flag (bit3) to be set */
+loop_9:
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r1, CPU_INT_LOW_REG(I2C_CH))
+        tst     r6, #BIT2
+#else
+        MV_REG_READ_ASM (r6, r1, CPU_MAIN_INT_CAUSE_REG)
+        tst     r6, #BIT5
+#endif
+        beq     loop_9
+
+        /* Wait for the start bit to be reset by HW */
+loop_8:
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH)) 
+        tst     r6, #TWSI_CONTROL_START_BIT
+        bne     loop_8
+        
+        /* Wait for status TWSI_REPEATED_START_CONDITION_TRA = 0x10 */
+loop_10:
+        MV_REG_READ_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        cmp     r6, #0x10
+        bne     loop_10
+        
+        /* Writing the address of (DIMM0<<1) with read indication (bit0 is 1) */
+        mov     r6, r4, LSL #1
+        orr     r6, r6, #1     /* Read operation address bit 0 must be 1 */
+        MV_REG_WRITE_ASM (r6, r1, TWSI_DATA_REG(I2C_CH))
+        
+        /* Clear the interrupt flag ==> the address will be transmitted */
+        bl      _twsiDelay
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bic     r6, r6, #TWSI_CONTROL_INT_FLAG_SET
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bl      _twsiDelay
+        
+        /* Wait for the interrupt flag (bit3) to be set as a result of
+           transmitting the address.                                     */
+loop_11:
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r1, CPU_INT_LOW_REG(I2C_CH))
+        tst     r6, #BIT2
+#else
+        MV_REG_READ_ASM (r6, r1, CPU_MAIN_INT_CAUSE_REG)
+        tst     r6, #BIT5
+#endif
+        beq     loop_11
+        
+         /* Wait for status TWSI_ADDR_PLUS_READ_BIT_TRA_ACK_REC = 0x40 */
+loop_12:
+        MV_REG_READ_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        cmp     r6, #0x40
+        bne     loop_12
+        
+        /* Clear the interrupt flag and the Acknoledge bit */
+        bl      _twsiDelay
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bic     r6, r6, #(TWSI_CONTROL_INT_FLAG_SET | TWSI_CONTROL_ACK)
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bl      _twsiDelay
+        
+        /* Wait for the interrupt flag (bit3) to be set */
+loop_14:
+#ifdef MV78XX0
+        MV_REG_READ_ASM (r6, r1, CPU_INT_LOW_REG(I2C_CH))
+        tst     r6, #BIT2
+#else
+        MV_REG_READ_ASM (r6, r1, CPU_MAIN_INT_CAUSE_REG)
+        tst     r6, #BIT5
+#endif
+        beq     loop_14
+        
+        /* Wait for status TWSI_MAS_REC_READ_DATA_ACK_NOT_TRA = 0x58 */
+loop_15:
+        MV_REG_READ_ASM (r6, r1, TWSI_STATUS_BAUDE_RATE_REG(I2C_CH))
+        cmp     r6, #0x58
+        bne     loop_15
+        
+        /* Store the data in r7. */
+        MV_REG_READ_ASM (r7, r1, TWSI_DATA_REG(I2C_CH))
+        
+        /* Generate stop bit */
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        orr     r6, r6, #TWSI_CONTROL_STOP_BIT
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+
+        
+        /* Clear the interrupt flag  */
+        bl      _twsiDelay
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bic     r6, r6, #TWSI_CONTROL_INT_FLAG_SET
+        MV_REG_WRITE_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        bl      _twsiDelay
+        
+        /* Wait for the stop bit to be reset by HW */
+loop_16:
+        MV_REG_READ_ASM (r6, r1, TWSI_CONTROL_REG(I2C_CH))
+        tst     r6, #TWSI_CONTROL_INT_FLAG_SET
+        bne     loop_16
+
+exit_i2cRead:
+        mov     PC, r9         /* r9 is saved link register */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h
new file mode 100644
index 00000000..d0c2b9e7
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h
@@ -0,0 +1,160 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell 
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms.  Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File in accordance with the terms and conditions of the General 
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
+available along with the File in the license.txt file or by writing to the Free 
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
+DISCLAIMED.  The GPL License provides additional details about this warranty 
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or 
+modify this File under the following licensing terms. 
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    *   Redistributions of source code must retain the above copyright notice,
+	    this list of conditions and the following disclaimer. 
+
+    *   Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution. 
+
+    *   Neither the name of Marvell nor the names of its contributors may be 
+        used to endorse or promote products derived from this software without 
+        specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+/****************************************/
+/* TWSI Registers                        */
+/****************************************/
+#ifndef __INCmvTwsiSpech
+#define __INCmvTwsiSpech
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* defines */
+#define TWSI_SLAVE_ADDR_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum)+ 0x00)
+
+#define TWSI_SLAVE_ADDR_GCE_ENA		BIT0
+#define TWSI_SLAVE_ADDR_7BIT_OFFS	0x1
+#define TWSI_SLAVE_ADDR_7BIT_MASK 	(0xFF << TWSI_SLAVE_ADDR_7BIT_OFFS)
+#define TWSI_SLAVE_ADDR_10BIT_OFFS	0x7
+#define TWSI_SLAVE_ADDR_10BIT_MASK 	0x300
+#define	TWSI_SLAVE_ADDR_10BIT_CONST 	0xF0
+
+
+#define TWSI_EXTENDED_SLAVE_ADDR_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x10)
+#define TWSI_EXTENDED_SLAVE_OFFS 	0
+#define TWSI_EXTENDED_SLAVE_MASK	(0xFF << TWSI_EXTENDED_SLAVE_OFFS)
+
+
+#define TWSI_DATA_REG(chanNum)		(TWSI_SLAVE_BASE(chanNum) + 0x04)
+#define TWSI_DATA_COMMAND_OFFS		0x0
+#define TWSI_DATA_COMMAND_MASK 		(0x1 << TWSI_DATA_COMMAND_OFFS)
+#define TWSI_DATA_COMMAND_WR		(0x1 << TWSI_DATA_COMMAND_OFFS)
+#define TWSI_DATA_COMMAND_RD		(0x0 << TWSI_DATA_COMMAND_OFFS)
+#define TWSI_DATA_ADDR_7BIT_OFFS	0x1
+#define TWSI_DATA_ADDR_7BIT_MASK 	(0xFF << TWSI_DATA_ADDR_7BIT_OFFS)
+#define TWSI_DATA_ADDR_10BIT_OFFS	0x7
+#define TWSI_DATA_ADDR_10BIT_MASK	0x300
+#define TWSI_DATA_ADDR_10BIT_CONST	0xF0
+
+
+#define TWSI_CONTROL_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x08)
+#define TWSI_CONTROL_ACK            	BIT2
+#define TWSI_CONTROL_INT_FLAG_SET   	BIT3
+#define TWSI_CONTROL_STOP_BIT    	BIT4
+#define TWSI_CONTROL_START_BIT 		BIT5 
+#define TWSI_CONTROL_ENA     		BIT6
+#define TWSI_CONTROL_INT_ENA    	BIT7
+
+
+#define TWSI_STATUS_BAUDE_RATE_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x0c)
+#define TWSI_BAUD_RATE_N_OFFS		0
+#define TWSI_BAUD_RATE_N_MASK		(0x7 << TWSI_BAUD_RATE_N_OFFS)
+#define TWSI_BAUD_RATE_M_OFFS   	3
+#define TWSI_BAUD_RATE_M_MASK  		(0xF << TWSI_BAUD_RATE_M_OFFS)
+
+#define TWSI_SOFT_RESET_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x1c)
+
+/* defines */
+#define TWSI_TIMEOUT_VALUE 		0x500 
+
+/* TWSI status codes */
+#define TWSI_BUS_ERROR                                            0x00
+#define TWSI_START_CON_TRA                                        0x08
+#define TWSI_REPEATED_START_CON_TRA                               0x10
+#define TWSI_AD_PLS_WR_BIT_TRA_ACK_REC                            0x18
+#define TWSI_AD_PLS_WR_BIT_TRA_ACK_NOT_REC                        0x20
+#define TWSI_M_TRAN_DATA_BYTE_ACK_REC                             0x28
+#define TWSI_M_TRAN_DATA_BYTE_ACK_NOT_REC                         0x30
+#define TWSI_M_LOST_ARB_DUR_AD_OR_DATA_TRA                        0x38
+#define TWSI_AD_PLS_RD_BIT_TRA_ACK_REC                            0x40
+#define TWSI_AD_PLS_RD_BIT_TRA_ACK_NOT_REC                        0x48
+#define TWSI_M_REC_RD_DATA_ACK_TRA                                0x50
+#define TWSI_M_REC_RD_DATA_ACK_NOT_TRA                            0x58
+#define TWSI_SLA_REC_AD_PLS_WR_BIT_ACK_TRA                        0x60
+#define TWSI_M_LOST_ARB_DUR_AD_TRA_AD_IS_TRGT_TO_SLA_ACK_TRA_W    0x68
+#define TWSI_GNL_CALL_REC_ACK_TRA                                 0x70
+#define TWSI_M_LOST_ARB_DUR_AD_TRA_GNL_CALL_AD_REC_ACK_TRA        0x78
+#define TWSI_SLA_REC_WR_DATA_AF_REC_SLA_AD_ACK_TRAN               0x80
+#define TWSI_SLA_REC_WR_DATA_AF_REC_SLA_AD_ACK_NOT_TRAN           0x88
+#define TWSI_SLA_REC_WR_DATA_AF_REC_GNL_CALL_ACK_TRAN             0x90
+#define TWSI_SLA_REC_WR_DATA_AF_REC_GNL_CALL_ACK_NOT_TRAN         0x98
+#define TWSI_SLA_REC_STOP_OR_REPEATED_STRT_CON                    0xA0
+#define TWSI_SLA_REC_AD_PLS_RD_BIT_ACK_TRA                        0xA8
+#define TWSI_M_LOST_ARB_DUR_AD_TRA_AD_IS_TRGT_TO_SLA_ACK_TRA_R    0xB0
+#define TWSI_SLA_TRA_RD_DATA_ACK_REC                              0xB8
+#define TWSI_SLA_TRA_RD_DATA_ACK_NOT_REC                          0xC0
+#define TWSI_SLA_TRA_LAST_RD_DATA_ACK_REC                         0xC8
+#define TWSI_SEC_AD_PLS_WR_BIT_TRA_ACK_REC                        0xD0
+#define TWSI_SEC_AD_PLS_WR_BIT_TRA_ACK_NOT_REC                    0xD8
+#define TWSI_SEC_AD_PLS_RD_BIT_TRA_ACK_REC                        0xE0
+#define TWSI_SEC_AD_PLS_RD_BIT_TRA_ACK_NOT_REC                    0xE8
+#define TWSI_NO_REL_STS_INT_FLAG_IS_KEPT_0                        0xF8
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __INCmvTwsiSpech */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ocf-bench.c b/trunk/target/linux/generic/files/crypto/ocf/ocf-bench.c
new file mode 100644
index 00000000..a9a95381
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ocf-bench.c
@@ -0,0 +1,514 @@
+/*
+ * A loadable module that benchmarks the OCF crypto speed from kernel space.
+ *
+ * Copyright (C) 2004-2010 David McCullough <david_mccullough@mcafee.com>
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ */
+
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <cryptodev.h>
+
+#ifdef I_HAVE_AN_XSCALE_WITH_INTEL_SDK
+#define BENCH_IXP_ACCESS_LIB 1
+#endif
+#ifdef BENCH_IXP_ACCESS_LIB
+#include <IxTypes.h>
+#include <IxOsBuffMgt.h>
+#include <IxNpeDl.h>
+#include <IxCryptoAcc.h>
+#include <IxQMgr.h>
+#include <IxOsServices.h>
+#include <IxOsCacheMMU.h>
+#endif
+
+/*
+ * support for access lib version 1.4
+ */
+#ifndef IX_MBUF_PRIV
+#define IX_MBUF_PRIV(x) ((x)->priv)
+#endif
+
+/*
+ * the number of simultaneously active requests
+ */
+static int request_q_len = 40;
+module_param(request_q_len, int, 0);
+MODULE_PARM_DESC(request_q_len, "Number of outstanding requests");
+
+/*
+ * how many requests we want to have processed
+ */
+static int request_num = 1024;
+module_param(request_num, int, 0);
+MODULE_PARM_DESC(request_num, "run for at least this many requests");
+
+/*
+ * the size of each request
+ */
+static int request_size = 1488;
+module_param(request_size, int, 0);
+MODULE_PARM_DESC(request_size, "size of each request");
+
+/*
+ * OCF batching of requests
+ */
+static int request_batch = 1;
+module_param(request_batch, int, 0);
+MODULE_PARM_DESC(request_batch, "enable OCF request batching");
+
+/*
+ * OCF immediate callback on completion
+ */
+static int request_cbimm = 1;
+module_param(request_cbimm, int, 0);
+MODULE_PARM_DESC(request_cbimm, "enable OCF immediate callback on completion");
+
+/*
+ * a structure for each request
+ */
+typedef struct  {
+	struct work_struct work;
+#ifdef BENCH_IXP_ACCESS_LIB
+	IX_MBUF mbuf;
+#endif
+	unsigned char *buffer;
+} request_t;
+
+static request_t *requests;
+
+static spinlock_t ocfbench_counter_lock;
+static int outstanding;
+static int total;
+
+/*************************************************************************/
+/*
+ * OCF benchmark routines
+ */
+
+static uint64_t ocf_cryptoid;
+static unsigned long jstart, jstop;
+
+static int ocf_init(void);
+static int ocf_cb(struct cryptop *crp);
+static void ocf_request(void *arg);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void ocf_request_wq(struct work_struct *work);
+#endif
+
+static int
+ocf_init(void)
+{
+	int error;
+	struct cryptoini crie, cria;
+	struct cryptodesc crda, crde;
+
+	memset(&crie, 0, sizeof(crie));
+	memset(&cria, 0, sizeof(cria));
+	memset(&crde, 0, sizeof(crde));
+	memset(&crda, 0, sizeof(crda));
+
+	cria.cri_alg  = CRYPTO_SHA1_HMAC;
+	cria.cri_klen = 20 * 8;
+	cria.cri_key  = "0123456789abcdefghij";
+
+	//crie.cri_alg  = CRYPTO_3DES_CBC;
+	crie.cri_alg  = CRYPTO_AES_CBC;
+	crie.cri_klen = 24 * 8;
+	crie.cri_key  = "0123456789abcdefghijklmn";
+
+	crie.cri_next = &cria;
+
+	error = crypto_newsession(&ocf_cryptoid, &crie,
+				CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE);
+	if (error) {
+		printk("crypto_newsession failed %d\n", error);
+		return -1;
+	}
+	return 0;
+}
+
+static int
+ocf_cb(struct cryptop *crp)
+{
+	request_t *r = (request_t *) crp->crp_opaque;
+	unsigned long flags;
+
+	if (crp->crp_etype)
+		printk("Error in OCF processing: %d\n", crp->crp_etype);
+	crypto_freereq(crp);
+	crp = NULL;
+
+	/* do all requests  but take at least 1 second */
+	spin_lock_irqsave(&ocfbench_counter_lock, flags);
+	total++;
+	if (total > request_num && jstart + HZ < jiffies) {
+		outstanding--;
+		spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+		return 0;
+	}
+	spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+
+	schedule_work(&r->work);
+	return 0;
+}
+
+
+static void
+ocf_request(void *arg)
+{
+	request_t *r = arg;
+	struct cryptop *crp = crypto_getreq(2);
+	struct cryptodesc *crde, *crda;
+	unsigned long flags;
+
+	if (!crp) {
+		spin_lock_irqsave(&ocfbench_counter_lock, flags);
+		outstanding--;
+		spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+		return;
+	}
+
+	crde = crp->crp_desc;
+	crda = crde->crd_next;
+
+	crda->crd_skip = 0;
+	crda->crd_flags = 0;
+	crda->crd_len = request_size;
+	crda->crd_inject = request_size;
+	crda->crd_alg = CRYPTO_SHA1_HMAC;
+	crda->crd_key = "0123456789abcdefghij";
+	crda->crd_klen = 20 * 8;
+
+	crde->crd_skip = 0;
+	crde->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_ENCRYPT;
+	crde->crd_len = request_size;
+	crde->crd_inject = request_size;
+	//crde->crd_alg = CRYPTO_3DES_CBC;
+	crde->crd_alg = CRYPTO_AES_CBC;
+	crde->crd_key = "0123456789abcdefghijklmn";
+	crde->crd_klen = 24 * 8;
+
+	crp->crp_ilen = request_size + 64;
+	crp->crp_flags = 0;
+	if (request_batch)
+		crp->crp_flags |= CRYPTO_F_BATCH;
+	if (request_cbimm)
+		crp->crp_flags |= CRYPTO_F_CBIMM;
+	crp->crp_buf = (caddr_t) r->buffer;
+	crp->crp_callback = ocf_cb;
+	crp->crp_sid = ocf_cryptoid;
+	crp->crp_opaque = (caddr_t) r;
+	crypto_dispatch(crp);
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void
+ocf_request_wq(struct work_struct *work)
+{
+	request_t *r = container_of(work, request_t, work);
+	ocf_request(r);
+}
+#endif
+
+static void
+ocf_done(void)
+{
+	crypto_freesession(ocf_cryptoid);
+}
+
+/*************************************************************************/
+#ifdef BENCH_IXP_ACCESS_LIB
+/*************************************************************************/
+/*
+ * CryptoAcc benchmark routines
+ */
+
+static IxCryptoAccCtx ixp_ctx;
+static UINT32 ixp_ctx_id;
+static IX_MBUF ixp_pri;
+static IX_MBUF ixp_sec;
+static int ixp_registered = 0;
+
+static void ixp_register_cb(UINT32 ctx_id, IX_MBUF *bufp,
+					IxCryptoAccStatus status);
+static void ixp_perform_cb(UINT32 ctx_id, IX_MBUF *sbufp, IX_MBUF *dbufp,
+					IxCryptoAccStatus status);
+static void ixp_request(void *arg);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void ixp_request_wq(struct work_struct *work);
+#endif
+
+static int
+ixp_init(void)
+{
+	IxCryptoAccStatus status;
+
+	ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_3DES;
+	ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
+	ixp_ctx.cipherCtx.cipherKeyLen = 24;
+	ixp_ctx.cipherCtx.cipherBlockLen = IX_CRYPTO_ACC_DES_BLOCK_64;
+	ixp_ctx.cipherCtx.cipherInitialVectorLen = IX_CRYPTO_ACC_DES_IV_64;
+	memcpy(ixp_ctx.cipherCtx.key.cipherKey, "0123456789abcdefghijklmn", 24);
+
+	ixp_ctx.authCtx.authAlgo = IX_CRYPTO_ACC_AUTH_SHA1;
+	ixp_ctx.authCtx.authDigestLen = 12;
+	ixp_ctx.authCtx.aadLen = 0;
+	ixp_ctx.authCtx.authKeyLen = 20;
+	memcpy(ixp_ctx.authCtx.key.authKey, "0123456789abcdefghij", 20);
+
+	ixp_ctx.useDifferentSrcAndDestMbufs = 0;
+	ixp_ctx.operation = IX_CRYPTO_ACC_OP_ENCRYPT_AUTH ;
+
+	IX_MBUF_MLEN(&ixp_pri)  = IX_MBUF_PKT_LEN(&ixp_pri) = 128;
+	IX_MBUF_MDATA(&ixp_pri) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
+	IX_MBUF_MLEN(&ixp_sec)  = IX_MBUF_PKT_LEN(&ixp_sec) = 128;
+	IX_MBUF_MDATA(&ixp_sec) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
+
+	status = ixCryptoAccCtxRegister(&ixp_ctx, &ixp_pri, &ixp_sec,
+			ixp_register_cb, ixp_perform_cb, &ixp_ctx_id);
+
+	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status) {
+		while (!ixp_registered)
+			schedule();
+		return ixp_registered < 0 ? -1 : 0;
+	}
+
+	printk("ixp: ixCryptoAccCtxRegister failed %d\n", status);
+	return -1;
+}
+
+static void
+ixp_register_cb(UINT32 ctx_id, IX_MBUF *bufp, IxCryptoAccStatus status)
+{
+	if (bufp) {
+		IX_MBUF_MLEN(bufp) = IX_MBUF_PKT_LEN(bufp) = 0;
+		kfree(IX_MBUF_MDATA(bufp));
+		IX_MBUF_MDATA(bufp) = NULL;
+	}
+
+	if (IX_CRYPTO_ACC_STATUS_WAIT == status)
+		return;
+	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
+		ixp_registered = 1;
+	else
+		ixp_registered = -1;
+}
+
+static void
+ixp_perform_cb(
+	UINT32 ctx_id,
+	IX_MBUF *sbufp,
+	IX_MBUF *dbufp,
+	IxCryptoAccStatus status)
+{
+	request_t *r = NULL;
+	unsigned long flags;
+
+	/* do all requests  but take at least 1 second */
+	spin_lock_irqsave(&ocfbench_counter_lock, flags);
+	total++;
+	if (total > request_num && jstart + HZ < jiffies) {
+		outstanding--;
+		spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+		return;
+	}
+
+	if (!sbufp || !(r = IX_MBUF_PRIV(sbufp))) {
+		printk("crappo %p %p\n", sbufp, r);
+		outstanding--;
+		spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+		return;
+	}
+	spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+
+	schedule_work(&r->work);
+}
+
+static void
+ixp_request(void *arg)
+{
+	request_t *r = arg;
+	IxCryptoAccStatus status;
+	unsigned long flags;
+
+	memset(&r->mbuf, 0, sizeof(r->mbuf));
+	IX_MBUF_MLEN(&r->mbuf) = IX_MBUF_PKT_LEN(&r->mbuf) = request_size + 64;
+	IX_MBUF_MDATA(&r->mbuf) = r->buffer;
+	IX_MBUF_PRIV(&r->mbuf) = r;
+	status = ixCryptoAccAuthCryptPerform(ixp_ctx_id, &r->mbuf, NULL,
+			0, request_size, 0, request_size, request_size, r->buffer);
+	if (IX_CRYPTO_ACC_STATUS_SUCCESS != status) {
+		printk("status1 = %d\n", status);
+		spin_lock_irqsave(&ocfbench_counter_lock, flags);
+		outstanding--;
+		spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+		return;
+	}
+	return;
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void
+ixp_request_wq(struct work_struct *work)
+{
+	request_t *r = container_of(work, request_t, work);
+	ixp_request(r);
+}
+#endif
+
+static void
+ixp_done(void)
+{
+	/* we should free the session here but I am lazy :-) */
+}
+
+/*************************************************************************/
+#endif /* BENCH_IXP_ACCESS_LIB */
+/*************************************************************************/
+
+int
+ocfbench_init(void)
+{
+	int i;
+	unsigned long mbps;
+	unsigned long flags;
+
+	printk("Crypto Speed tests\n");
+
+	requests = kmalloc(sizeof(request_t) * request_q_len, GFP_KERNEL);
+	if (!requests) {
+		printk("malloc failed\n");
+		return -EINVAL;
+	}
+
+	for (i = 0; i < request_q_len; i++) {
+		/* +64 for return data */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+		INIT_WORK(&requests[i].work, ocf_request_wq);
+#else
+		INIT_WORK(&requests[i].work, ocf_request, &requests[i]);
+#endif
+		requests[i].buffer = kmalloc(request_size + 128, GFP_DMA);
+		if (!requests[i].buffer) {
+			printk("malloc failed\n");
+			return -EINVAL;
+		}
+		memset(requests[i].buffer, '0' + i, request_size + 128);
+	}
+
+	/*
+	 * OCF benchmark
+	 */
+	printk("OCF: testing ...\n");
+	if (ocf_init() == -1)
+		return -EINVAL;
+
+	spin_lock_init(&ocfbench_counter_lock);
+	total = outstanding = 0;
+	jstart = jiffies;
+	for (i = 0; i < request_q_len; i++) {
+		spin_lock_irqsave(&ocfbench_counter_lock, flags);
+		outstanding++;
+		spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+		ocf_request(&requests[i]);
+	}
+	while (outstanding > 0)
+		schedule();
+	jstop = jiffies;
+
+	mbps = 0;
+	if (jstop > jstart) {
+		mbps = (unsigned long) total * (unsigned long) request_size * 8;
+		mbps /= ((jstop - jstart) * 1000) / HZ;
+	}
+	printk("OCF: %d requests of %d bytes in %d jiffies (%d.%03d Mbps)\n",
+			total, request_size, (int)(jstop - jstart),
+			((int)mbps) / 1000, ((int)mbps) % 1000);
+	ocf_done();
+
+#ifdef BENCH_IXP_ACCESS_LIB
+	/*
+	 * IXP benchmark
+	 */
+	printk("IXP: testing ...\n");
+	ixp_init();
+	total = outstanding = 0;
+	jstart = jiffies;
+	for (i = 0; i < request_q_len; i++) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+		INIT_WORK(&requests[i].work, ixp_request_wq);
+#else
+		INIT_WORK(&requests[i].work, ixp_request, &requests[i]);
+#endif
+		spin_lock_irqsave(&ocfbench_counter_lock, flags);
+		outstanding++;
+		spin_unlock_irqrestore(&ocfbench_counter_lock, flags);
+		ixp_request(&requests[i]);
+	}
+	while (outstanding > 0)
+		schedule();
+	jstop = jiffies;
+
+	mbps = 0;
+	if (jstop > jstart) {
+		mbps = (unsigned long) total * (unsigned long) request_size * 8;
+		mbps /= ((jstop - jstart) * 1000) / HZ;
+	}
+	printk("IXP: %d requests of %d bytes in %d jiffies (%d.%03d Mbps)\n",
+			total, request_size, jstop - jstart,
+			((int)mbps) / 1000, ((int)mbps) % 1000);
+	ixp_done();
+#endif /* BENCH_IXP_ACCESS_LIB */
+
+	for (i = 0; i < request_q_len; i++)
+		kfree(requests[i].buffer);
+	kfree(requests);
+	return -EINVAL; /* always fail to load so it can be re-run quickly ;-) */
+}
+
+static void __exit ocfbench_exit(void)
+{
+}
+
+module_init(ocfbench_init);
+module_exit(ocfbench_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("Benchmark various in-kernel crypto speeds");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ocf-compat.h b/trunk/target/linux/generic/files/crypto/ocf/ocf-compat.h
new file mode 100644
index 00000000..831927e8
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ocf-compat.h
@@ -0,0 +1,378 @@
+#ifndef _BSD_COMPAT_H_
+#define _BSD_COMPAT_H_ 1
+/****************************************************************************/
+/*
+ * Provide compat routines for older linux kernels and BSD kernels
+ *
+ * Written by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2010 David McCullough <david_mccullough@mcafee.com>
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this file
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ */
+/****************************************************************************/
+#ifdef __KERNEL__
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+
+/*
+ * fake some BSD driver interface stuff specifically for OCF use
+ */
+
+typedef struct ocf_device *device_t;
+
+typedef struct {
+	int (*cryptodev_newsession)(device_t dev, u_int32_t *sidp, struct cryptoini *cri);
+	int (*cryptodev_freesession)(device_t dev, u_int64_t tid);
+	int (*cryptodev_process)(device_t dev, struct cryptop *crp, int hint);
+	int (*cryptodev_kprocess)(device_t dev, struct cryptkop *krp, int hint);
+} device_method_t;
+#define DEVMETHOD(id, func)	id: func
+
+struct ocf_device {
+	char name[32];		/* the driver name */
+	char nameunit[32];	/* the driver name + HW instance */
+	int  unit;
+	device_method_t	methods;
+	void *softc;
+};
+
+#define CRYPTODEV_NEWSESSION(dev, sid, cri) \
+	((*(dev)->methods.cryptodev_newsession)(dev,sid,cri))
+#define CRYPTODEV_FREESESSION(dev, sid) \
+	((*(dev)->methods.cryptodev_freesession)(dev, sid))
+#define CRYPTODEV_PROCESS(dev, crp, hint) \
+	((*(dev)->methods.cryptodev_process)(dev, crp, hint))
+#define CRYPTODEV_KPROCESS(dev, krp, hint) \
+	((*(dev)->methods.cryptodev_kprocess)(dev, krp, hint))
+
+#define device_get_name(dev)	((dev)->name)
+#define device_get_nameunit(dev)	((dev)->nameunit)
+#define device_get_unit(dev)	((dev)->unit)
+#define device_get_softc(dev)	((dev)->softc)
+
+#define	softc_device_decl \
+		struct ocf_device _device; \
+		device_t
+
+#define	softc_device_init(_sc, _name, _unit, _methods) \
+	if (1) {\
+	strncpy((_sc)->_device.name, _name, sizeof((_sc)->_device.name) - 1); \
+	snprintf((_sc)->_device.nameunit, sizeof((_sc)->_device.name), "%s%d", _name, _unit); \
+	(_sc)->_device.unit = _unit; \
+	(_sc)->_device.methods = _methods; \
+	(_sc)->_device.softc = (void *) _sc; \
+	*(device_t *)((softc_get_device(_sc))+1) = &(_sc)->_device; \
+	} else
+
+#define	softc_get_device(_sc)	(&(_sc)->_device)
+
+/*
+ * iomem support for 2.4 and 2.6 kernels
+ */
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#define ocf_iomem_t	unsigned long
+
+/*
+ * implement simple workqueue like support for older kernels
+ */
+
+#include <linux/tqueue.h>
+
+#define work_struct tq_struct
+
+#define INIT_WORK(wp, fp, ap) \
+	do { \
+		(wp)->sync = 0; \
+		(wp)->routine = (fp); \
+		(wp)->data = (ap); \
+	} while (0)
+
+#define schedule_work(wp) \
+	do { \
+		queue_task((wp), &tq_immediate); \
+		mark_bh(IMMEDIATE_BH); \
+	} while (0)
+
+#define flush_scheduled_work()	run_task_queue(&tq_immediate)
+
+#else
+#define ocf_iomem_t	void __iomem *
+
+#include <linux/workqueue.h>
+
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include <linux/fdtable.h>
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
+#define files_fdtable(files)	(files)
+#endif
+
+#ifdef MODULE_PARM
+#undef module_param	/* just in case */
+#define	module_param(a,b,c)		MODULE_PARM(a,"i")
+#endif
+
+#define bzero(s,l)		memset(s,0,l)
+#define bcopy(s,d,l)	memcpy(d,s,l)
+#define bcmp(x, y, l)	memcmp(x,y,l)
+
+#define MIN(x,y)	((x) < (y) ? (x) : (y))
+
+#define device_printf(dev, a...) ({ \
+				printk("%s: ", device_get_nameunit(dev)); printk(a); \
+			})
+
+#undef printf
+#define printf(fmt...)	printk(fmt)
+
+#define KASSERT(c,p)	if (!(c)) { printk p ; } else
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#define ocf_daemonize(str) \
+	daemonize(); \
+	spin_lock_irq(&current->sigmask_lock); \
+	sigemptyset(&current->blocked); \
+	recalc_sigpending(current); \
+	spin_unlock_irq(&current->sigmask_lock); \
+	sprintf(current->comm, str); \
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) \
+	spin_lock_irq(&current->sigmask_lock); \
+	sigemptyset(&current->blocked); \
+	recalc_sigpending(current); \
+	spin_unlock_irq(&current->sigmask_lock); \
+	sprintf(current->comm, str); \
+#else
+#define ocf_daemonize(str) daemonize(str);
+#endif
+
+#define	TAILQ_INSERT_TAIL(q,d,m) list_add_tail(&(d)->m, (q))
+#define	TAILQ_EMPTY(q)	list_empty(q)
+#define	TAILQ_FOREACH(v, q, m) list_for_each_entry(v, q, m)
+
+#define read_random(p,l) get_random_bytes(p,l)
+
+#define DELAY(x)	((x) > 2000 ? mdelay((x)/1000) : udelay(x))
+#define strtoul simple_strtoul
+
+#define pci_get_vendor(dev)	((dev)->vendor)
+#define pci_get_device(dev)	((dev)->device)
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#define pci_set_consistent_dma_mask(dev, mask) (0)
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+#define pci_dma_sync_single_for_cpu pci_dma_sync_single
+#endif
+
+#ifndef DMA_32BIT_MASK
+#define DMA_32BIT_MASK  0x00000000ffffffffULL
+#endif
+
+#ifndef htole32
+#define htole32(x)	cpu_to_le32(x)
+#endif
+#ifndef htobe32
+#define htobe32(x)	cpu_to_be32(x)
+#endif
+#ifndef htole16
+#define htole16(x)	cpu_to_le16(x)
+#endif
+#ifndef htobe16
+#define htobe16(x)	cpu_to_be16(x)
+#endif
+
+/* older kernels don't have these */
+
+#include <asm/irq.h>
+#if !defined(IRQ_NONE) && !defined(IRQ_RETVAL)
+#define IRQ_NONE
+#define IRQ_HANDLED
+#define IRQ_WAKE_THREAD
+#define IRQ_RETVAL
+#define irqreturn_t void
+typedef irqreturn_t (*irq_handler_t)(int irq, void *arg, struct pt_regs *regs);
+#endif
+#ifndef IRQF_SHARED
+#define IRQF_SHARED	SA_SHIRQ
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+# define strlcpy(dest,src,len) \
+		({strncpy(dest,src,(len)-1); ((char *)dest)[(len)-1] = '\0'; })
+#endif
+
+#ifndef MAX_ERRNO
+#define MAX_ERRNO	4095
+#endif
+#ifndef IS_ERR_VALUE
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,5)
+#include <linux/err.h>
+#endif
+#ifndef IS_ERR_VALUE
+#define IS_ERR_VALUE(x) ((unsigned long)(x) >= (unsigned long)-MAX_ERRNO)
+#endif
+#endif
+
+/*
+ * common debug for all
+ */
+#if 1
+#define dprintk(a...)	do { if (debug) printk(a); } while(0)
+#else
+#define dprintk(a...)
+#endif
+
+#ifndef SLAB_ATOMIC
+/* Changed in 2.6.20, must use GFP_ATOMIC now */
+#define	SLAB_ATOMIC	GFP_ATOMIC
+#endif
+
+/*
+ * need some additional support for older kernels */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,2)
+#define pci_register_driver_compat(driver, rc) \
+	do { \
+		if ((rc) > 0) { \
+			(rc) = 0; \
+		} else if (rc == 0) { \
+			(rc) = -ENODEV; \
+		} else { \
+			pci_unregister_driver(driver); \
+		} \
+	} while (0)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+#define pci_register_driver_compat(driver,rc) ((rc) = (rc) < 0 ? (rc) : 0)
+#else
+#define pci_register_driver_compat(driver,rc)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+
+#include <linux/mm.h>
+#include <asm/scatterlist.h>
+
+static inline void sg_set_page(struct scatterlist *sg,  struct page *page,
+			       unsigned int len, unsigned int offset)
+{
+	sg->page = page;
+	sg->offset = offset;
+	sg->length = len;
+}
+
+static inline void *sg_virt(struct scatterlist *sg)
+{
+	return page_address(sg->page) + sg->offset;
+}
+
+#define sg_init_table(sg, n)
+
+#define sg_mark_end(sg)
+
+#endif
+
+#ifndef late_initcall
+#define late_initcall(init) module_init(init)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4) || !defined(CONFIG_SMP)
+#define ocf_for_each_cpu(cpu) for ((cpu) = 0; (cpu) == 0; (cpu)++)
+#else
+#define ocf_for_each_cpu(cpu) for_each_present_cpu(cpu)
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+#include <linux/sched.h>
+#define	kill_proc(p,s,v)	send_sig(s,find_task_by_vpid(p),0)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
+
+struct ocf_thread {
+	struct task_struct	*task;
+	int					(*func)(void *arg);
+	void				*arg;
+};
+
+/* thread startup helper func */
+static inline int ocf_run_thread(void *arg)
+{
+	struct ocf_thread *t = (struct ocf_thread *) arg;
+	if (!t)
+		return -1; /* very bad */
+	t->task = current;
+	daemonize();
+	spin_lock_irq(&current->sigmask_lock);
+	sigemptyset(&current->blocked);
+	recalc_sigpending(current);
+	spin_unlock_irq(&current->sigmask_lock);
+	return (*t->func)(t->arg);
+}
+
+#define kthread_create(f,a,fmt...) \
+	({ \
+		struct ocf_thread t; \
+		pid_t p; \
+		t.task = NULL; \
+		t.func = (f); \
+		t.arg = (a); \
+		p = kernel_thread(ocf_run_thread, &t, CLONE_FS|CLONE_FILES); \
+		while (p != (pid_t) -1 && t.task == NULL) \
+			schedule(); \
+		if (t.task) \
+			snprintf(t.task->comm, sizeof(t.task->comm), fmt); \
+		(t.task); \
+	})
+
+#define kthread_bind(t,cpu)	/**/
+
+#define kthread_should_stop()	(strcmp(current->comm, "stopping") == 0)
+
+#define kthread_stop(t) \
+	({ \
+		strcpy((t)->comm, "stopping"); \
+		kill_proc((t)->pid, SIGTERM, 1); \
+		do { \
+			schedule(); \
+		} while (kill_proc((t)->pid, SIGTERM, 1) == 0); \
+	})
+
+#else
+#include <linux/kthread.h>
+#endif
+
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
+#define	skb_frag_page(x)	((x)->page)
+#endif
+
+#endif /* __KERNEL__ */
+
+/****************************************************************************/
+#endif /* _BSD_COMPAT_H_ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ocfnull/Makefile b/trunk/target/linux/generic/files/crypto/ocf/ocfnull/Makefile
new file mode 100644
index 00000000..044bcacb
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ocfnull/Makefile
@@ -0,0 +1,12 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_OCFNULL) += ocfnull.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/..
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c b/trunk/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c
new file mode 100644
index 00000000..9cf3f6e0
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ocfnull/ocfnull.c
@@ -0,0 +1,204 @@
+/*
+ * An OCF module for determining the cost of crypto versus the cost of
+ * IPSec processing outside of OCF.  This modules gives us the effect of
+ * zero cost encryption,  of course you will need to run it at both ends
+ * since it does no crypto at all.
+ *
+ * Written by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough 
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/crypto.h>
+#include <linux/interrupt.h>
+
+#include <cryptodev.h>
+#include <uio.h>
+
+static int32_t			 null_id = -1;
+static u_int32_t		 null_sesnum = 0;
+
+static int null_process(device_t, struct cryptop *, int);
+static int null_newsession(device_t, u_int32_t *, struct cryptoini *);
+static int null_freesession(device_t, u_int64_t);
+
+#define debug ocfnull_debug
+int ocfnull_debug = 0;
+module_param(ocfnull_debug, int, 0644);
+MODULE_PARM_DESC(ocfnull_debug, "Enable debug");
+
+/*
+ * dummy device structure
+ */
+
+static struct {
+	softc_device_decl	sc_dev;
+} nulldev;
+
+static device_method_t null_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	null_newsession),
+	DEVMETHOD(cryptodev_freesession,null_freesession),
+	DEVMETHOD(cryptodev_process,	null_process),
+};
+
+/*
+ * Generate a new software session.
+ */
+static int
+null_newsession(device_t arg, u_int32_t *sid, struct cryptoini *cri)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid == NULL || cri == NULL) {
+		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	if (null_sesnum == 0)
+		null_sesnum++;
+	*sid = null_sesnum++;
+	return 0;
+}
+
+
+/*
+ * Free a session.
+ */
+static int
+null_freesession(device_t arg, u_int64_t tid)
+{
+	u_int32_t sid = CRYPTO_SESID2LID(tid);
+
+	dprintk("%s()\n", __FUNCTION__);
+	if (sid > null_sesnum) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	/* Silently accept and return */
+	if (sid == 0)
+		return 0;
+	return 0;
+}
+
+
+/*
+ * Process a request.
+ */
+static int
+null_process(device_t arg, struct cryptop *crp, int hint)
+{
+	unsigned int lid;
+
+	dprintk("%s()\n", __FUNCTION__);
+
+	/* Sanity check */
+	if (crp == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+
+	crp->crp_etype = 0;
+
+	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
+		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
+		crp->crp_etype = EINVAL;
+		goto done;
+	}
+
+	/*
+	 * find the session we are using
+	 */
+
+	lid = crp->crp_sid & 0xffffffff;
+	if (lid >= null_sesnum || lid == 0) {
+		crp->crp_etype = ENOENT;
+		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
+		goto done;
+	}
+
+done:
+	crypto_done(crp);
+	return 0;
+}
+
+
+/*
+ * our driver startup and shutdown routines
+ */
+
+static int
+null_init(void)
+{
+	dprintk("%s(%p)\n", __FUNCTION__, null_init);
+
+	memset(&nulldev, 0, sizeof(nulldev));
+	softc_device_init(&nulldev, "ocfnull", 0, null_methods);
+
+	null_id = crypto_get_driverid(softc_get_device(&nulldev),
+				CRYPTOCAP_F_HARDWARE);
+	if (null_id < 0)
+		panic("ocfnull: crypto device cannot initialize!");
+
+#define	REGISTER(alg) \
+	crypto_register(null_id,alg,0,0)
+	REGISTER(CRYPTO_DES_CBC);
+	REGISTER(CRYPTO_3DES_CBC);
+	REGISTER(CRYPTO_RIJNDAEL128_CBC);
+	REGISTER(CRYPTO_MD5);
+	REGISTER(CRYPTO_SHA1);
+	REGISTER(CRYPTO_MD5_HMAC);
+	REGISTER(CRYPTO_SHA1_HMAC);
+#undef REGISTER
+
+	return 0;
+}
+
+static void
+null_exit(void)
+{
+	dprintk("%s()\n", __FUNCTION__);
+	crypto_unregister_all(null_id);
+	null_id = -1;
+}
+
+module_init(null_init);
+module_exit(null_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("ocfnull - claims a lot but does nothing");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/pasemi/Makefile b/trunk/target/linux/generic/files/crypto/ocf/pasemi/Makefile
new file mode 100644
index 00000000..b0a3980f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/pasemi/Makefile
@@ -0,0 +1,12 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_PASEMI) += pasemi.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c b/trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c
new file mode 100644
index 00000000..7bb62bc5
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c
@@ -0,0 +1,1007 @@
+/*
+ * Copyright (C) 2007 PA Semi, Inc
+ *
+ * Driver for the PA Semi PWRficient DMA Crypto Engine
+ *
+ * This program is free software; you can redistribute 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 that 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/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/timer.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <asm/scatterlist.h>
+#include <linux/moduleparam.h>
+#include <linux/pci.h>
+#include <cryptodev.h>
+#include <uio.h>
+#include "pasemi_fnu.h"
+
+#define DRV_NAME "pasemi"
+
+#define TIMER_INTERVAL 1000
+
+static void pasemi_dma_remove(struct pci_dev *pdev);
+static struct pasdma_status volatile * dma_status;
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Enable debug");
+
+static void pasemi_desc_start(struct pasemi_desc *desc, u64 hdr)
+{
+	desc->postop = 0;
+	desc->quad[0] = hdr;
+	desc->quad_cnt = 1;
+	desc->size = 1;
+}
+
+static void pasemi_desc_build(struct pasemi_desc *desc, u64 val)
+{
+	desc->quad[desc->quad_cnt++] = val;
+	desc->size = (desc->quad_cnt + 1) / 2;
+}
+
+static void pasemi_desc_hdr(struct pasemi_desc *desc, u64 hdr)
+{
+	desc->quad[0] |= hdr;
+}
+
+static int pasemi_desc_size(struct pasemi_desc *desc)
+{
+	return desc->size;
+}
+
+static void pasemi_ring_add_desc(
+				 struct pasemi_fnu_txring *ring,
+				 struct pasemi_desc *desc,
+				 struct cryptop *crp) {
+	int i;
+	int ring_index = 2 * (ring->next_to_fill & (TX_RING_SIZE-1));
+
+	TX_DESC_INFO(ring, ring->next_to_fill).desc_size = desc->size;
+	TX_DESC_INFO(ring, ring->next_to_fill).desc_postop = desc->postop;
+	TX_DESC_INFO(ring, ring->next_to_fill).cf_crp = crp;
+
+	for (i = 0; i < desc->quad_cnt; i += 2) {
+		ring_index = 2 * (ring->next_to_fill & (TX_RING_SIZE-1));
+		ring->desc[ring_index] = desc->quad[i];
+		ring->desc[ring_index + 1] = desc->quad[i + 1];
+		ring->next_to_fill++;
+	}
+
+	if (desc->quad_cnt & 1)
+		ring->desc[ring_index + 1] = 0;
+}
+
+static void pasemi_ring_incr(struct pasemi_softc *sc, int chan_index, int incr)
+{
+	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_INCR(sc->base_chan + chan_index),
+		 incr);
+}
+
+/*
+ * Generate a new software session.
+ */
+static int
+pasemi_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
+{
+	struct cryptoini *c, *encini = NULL, *macini = NULL;
+	struct pasemi_softc *sc = device_get_softc(dev);
+	struct pasemi_session *ses = NULL, **sespp;
+	int sesn, blksz = 0;
+	u64 ccmd = 0;
+	unsigned long flags;
+	struct pasemi_desc init_desc;
+	struct pasemi_fnu_txring *txring;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+	if (sidp == NULL || cri == NULL || sc == NULL) {
+		DPRINTF("%s,%d - EINVAL\n", __FILE__, __LINE__);
+		return -EINVAL;
+	}
+	for (c = cri; c != NULL; c = c->cri_next) {
+		if (ALG_IS_SIG(c->cri_alg)) {
+			if (macini)
+				return -EINVAL;
+			macini = c;
+		} else if (ALG_IS_CIPHER(c->cri_alg)) {
+			if (encini)
+				return -EINVAL;
+			encini = c;
+		} else {
+			DPRINTF("UNKNOWN c->cri_alg %d\n", c->cri_alg);
+			return -EINVAL;
+		}
+	}
+	if (encini == NULL && macini == NULL)
+		return -EINVAL;
+	if (encini) {
+		/* validate key length */
+		switch (encini->cri_alg) {
+		case CRYPTO_DES_CBC:
+			if (encini->cri_klen != 64)
+				return -EINVAL;
+			ccmd = DMA_CALGO_DES;
+			break;
+		case CRYPTO_3DES_CBC:
+			if (encini->cri_klen != 192)
+				return -EINVAL;
+			ccmd = DMA_CALGO_3DES;
+			break;
+		case CRYPTO_AES_CBC:
+			if (encini->cri_klen != 128 &&
+			    encini->cri_klen != 192 &&
+			    encini->cri_klen != 256)
+				return -EINVAL;
+			ccmd = DMA_CALGO_AES;
+			break;
+		case CRYPTO_ARC4:
+			if (encini->cri_klen != 128)
+				return -EINVAL;
+			ccmd = DMA_CALGO_ARC;
+			break;
+		default:
+			DPRINTF("UNKNOWN encini->cri_alg %d\n",
+				encini->cri_alg);
+			return -EINVAL;
+		}
+	}
+
+	if (macini) {
+		switch (macini->cri_alg) {
+		case CRYPTO_MD5:
+		case CRYPTO_MD5_HMAC:
+			blksz = 16;
+			break;
+		case CRYPTO_SHA1:
+		case CRYPTO_SHA1_HMAC:
+			blksz = 20;
+			break;
+		default:
+			DPRINTF("UNKNOWN macini->cri_alg %d\n",
+				macini->cri_alg);
+			return -EINVAL;
+		}
+		if (((macini->cri_klen + 7) / 8) > blksz) {
+			DPRINTF("key length %d bigger than blksize %d not supported\n",
+				((macini->cri_klen + 7) / 8), blksz);
+			return -EINVAL;
+		}
+	}
+
+	for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
+		if (sc->sc_sessions[sesn] == NULL) {
+			sc->sc_sessions[sesn] = (struct pasemi_session *)
+				kzalloc(sizeof(struct pasemi_session), GFP_ATOMIC);
+			ses = sc->sc_sessions[sesn];
+			break;
+		} else if (sc->sc_sessions[sesn]->used == 0) {
+			ses = sc->sc_sessions[sesn];
+			break;
+		}
+	}
+
+	if (ses == NULL) {
+		sespp = (struct pasemi_session **)
+			kzalloc(sc->sc_nsessions * 2 *
+				sizeof(struct pasemi_session *), GFP_ATOMIC);
+		if (sespp == NULL)
+			return -ENOMEM;
+		memcpy(sespp, sc->sc_sessions,
+		       sc->sc_nsessions * sizeof(struct pasemi_session *));
+		kfree(sc->sc_sessions);
+		sc->sc_sessions = sespp;
+		sesn = sc->sc_nsessions;
+		ses = sc->sc_sessions[sesn] = (struct pasemi_session *)
+			kzalloc(sizeof(struct pasemi_session), GFP_ATOMIC);
+		if (ses == NULL)
+			return -ENOMEM;
+		sc->sc_nsessions *= 2;
+	}
+
+	ses->used = 1;
+
+	ses->dma_addr = pci_map_single(sc->dma_pdev, (void *) ses->civ,
+				       sizeof(struct pasemi_session), DMA_TO_DEVICE);
+
+	/* enter the channel scheduler */
+	spin_lock_irqsave(&sc->sc_chnlock, flags);
+
+	/* ARC4 has to be processed by the even channel */
+	if (encini && (encini->cri_alg == CRYPTO_ARC4))
+		ses->chan = sc->sc_lastchn & ~1;
+	else
+		ses->chan = sc->sc_lastchn;
+	sc->sc_lastchn = (sc->sc_lastchn + 1) % sc->sc_num_channels;
+
+	spin_unlock_irqrestore(&sc->sc_chnlock, flags);
+
+	txring = &sc->tx[ses->chan];
+
+	if (encini) {
+		ses->ccmd = ccmd;
+		ses->keysz = (encini->cri_klen - 63) / 64;
+		memcpy(ses->key, encini->cri_key, (ses->keysz + 1) * 8);
+
+		pasemi_desc_start(&init_desc,
+				  XCT_CTRL_HDR(ses->chan, (encini && macini) ? 0x68 : 0x40, DMA_FN_CIV0));
+		pasemi_desc_build(&init_desc,
+				  XCT_FUN_SRC_PTR((encini && macini) ? 0x68 : 0x40, ses->dma_addr));
+	}
+	if (macini) {
+		if (macini->cri_alg == CRYPTO_MD5_HMAC ||
+		    macini->cri_alg == CRYPTO_SHA1_HMAC)
+			memcpy(ses->hkey, macini->cri_key, blksz);
+		else {
+			/* Load initialization constants(RFC 1321, 3174) */
+			ses->hiv[0] = 0x67452301efcdab89ULL;
+			ses->hiv[1] = 0x98badcfe10325476ULL;
+			ses->hiv[2] = 0xc3d2e1f000000000ULL;
+		}
+		ses->hseq = 0ULL;
+	}
+
+	spin_lock_irqsave(&txring->fill_lock, flags);
+
+	if (((txring->next_to_fill + pasemi_desc_size(&init_desc)) -
+	     txring->next_to_clean) > TX_RING_SIZE) {
+		spin_unlock_irqrestore(&txring->fill_lock, flags);
+		return ERESTART;
+	}
+
+	if (encini) {
+		pasemi_ring_add_desc(txring, &init_desc, NULL);
+		pasemi_ring_incr(sc, ses->chan,
+				 pasemi_desc_size(&init_desc));
+	}
+
+	txring->sesn = sesn;
+	spin_unlock_irqrestore(&txring->fill_lock, flags);
+
+	*sidp = PASEMI_SID(sesn);
+	return 0;
+}
+
+/*
+ * Deallocate a session.
+ */
+static int
+pasemi_freesession(device_t dev, u_int64_t tid)
+{
+	struct pasemi_softc *sc = device_get_softc(dev);
+	int session;
+	u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (sc == NULL)
+		return -EINVAL;
+	session = PASEMI_SESSION(sid);
+	if (session >= sc->sc_nsessions || !sc->sc_sessions[session])
+		return -EINVAL;
+
+	pci_unmap_single(sc->dma_pdev,
+			 sc->sc_sessions[session]->dma_addr,
+			 sizeof(struct pasemi_session), DMA_TO_DEVICE);
+	memset(sc->sc_sessions[session], 0,
+	       sizeof(struct pasemi_session));
+
+	return 0;
+}
+
+static int
+pasemi_process(device_t dev, struct cryptop *crp, int hint)
+{
+
+	int err = 0, ivsize, srclen = 0, reinit = 0, reinit_size = 0, chsel;
+	struct pasemi_softc *sc = device_get_softc(dev);
+	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
+	caddr_t ivp;
+	struct pasemi_desc init_desc, work_desc;
+	struct pasemi_session *ses;
+	struct sk_buff *skb;
+	struct uio *uiop;
+	unsigned long flags;
+	struct pasemi_fnu_txring *txring;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (crp == NULL || crp->crp_callback == NULL || sc == NULL)
+		return -EINVAL;
+
+	crp->crp_etype = 0;
+	if (PASEMI_SESSION(crp->crp_sid) >= sc->sc_nsessions)
+		return -EINVAL;
+
+	ses = sc->sc_sessions[PASEMI_SESSION(crp->crp_sid)];
+
+	crd1 = crp->crp_desc;
+	if (crd1 == NULL) {
+		err = -EINVAL;
+		goto errout;
+	}
+	crd2 = crd1->crd_next;
+
+	if (ALG_IS_SIG(crd1->crd_alg)) {
+		maccrd = crd1;
+		if (crd2 == NULL)
+			enccrd = NULL;
+		else if (ALG_IS_CIPHER(crd2->crd_alg) &&
+			 (crd2->crd_flags & CRD_F_ENCRYPT) == 0)
+			enccrd = crd2;
+		else
+			goto erralg;
+	} else if (ALG_IS_CIPHER(crd1->crd_alg)) {
+		enccrd = crd1;
+		if (crd2 == NULL)
+			maccrd = NULL;
+		else if (ALG_IS_SIG(crd2->crd_alg) &&
+			 (crd1->crd_flags & CRD_F_ENCRYPT))
+			maccrd = crd2;
+		else
+			goto erralg;
+	} else
+		goto erralg;
+
+	chsel = ses->chan;
+
+	txring = &sc->tx[chsel];
+
+	if (enccrd && !maccrd) {
+		if (enccrd->crd_alg == CRYPTO_ARC4)
+			reinit = 1;
+		reinit_size = 0x40;
+		srclen = crp->crp_ilen;
+
+		pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I
+				  | XCT_FUN_FUN(chsel));
+		if (enccrd->crd_flags & CRD_F_ENCRYPT)
+			pasemi_desc_hdr(&work_desc, XCT_FUN_CRM_ENC);
+		else
+			pasemi_desc_hdr(&work_desc, XCT_FUN_CRM_DEC);
+	} else if (enccrd && maccrd) {
+		if (enccrd->crd_alg == CRYPTO_ARC4)
+			reinit = 1;
+		reinit_size = 0x68;
+
+		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
+			/* Encrypt -> Authenticate */
+			pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I | XCT_FUN_CRM_ENC_SIG
+					  | XCT_FUN_A | XCT_FUN_FUN(chsel));
+			srclen = maccrd->crd_skip + maccrd->crd_len;
+		} else {
+			/* Authenticate -> Decrypt */
+			pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I | XCT_FUN_CRM_SIG_DEC
+					  | XCT_FUN_24BRES | XCT_FUN_FUN(chsel));
+			pasemi_desc_build(&work_desc, 0);
+			pasemi_desc_build(&work_desc, 0);
+			pasemi_desc_build(&work_desc, 0);
+			work_desc.postop = PASEMI_CHECK_SIG;
+			srclen = crp->crp_ilen;
+		}
+
+		pasemi_desc_hdr(&work_desc, XCT_FUN_SHL(maccrd->crd_skip / 4));
+		pasemi_desc_hdr(&work_desc, XCT_FUN_CHL(enccrd->crd_skip - maccrd->crd_skip));
+	} else if (!enccrd && maccrd) {
+		srclen = maccrd->crd_len;
+
+		pasemi_desc_start(&init_desc,
+				  XCT_CTRL_HDR(chsel, 0x58, DMA_FN_HKEY0));
+		pasemi_desc_build(&init_desc,
+				  XCT_FUN_SRC_PTR(0x58, ((struct pasemi_session *)ses->dma_addr)->hkey));
+
+		pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I | XCT_FUN_CRM_SIG
+				  | XCT_FUN_A | XCT_FUN_FUN(chsel));
+	}
+
+	if (enccrd) {
+		switch (enccrd->crd_alg) {
+		case CRYPTO_3DES_CBC:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_3DES |
+					XCT_FUN_BCM_CBC);
+			ivsize = sizeof(u64);
+			break;
+		case CRYPTO_DES_CBC:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_DES |
+					XCT_FUN_BCM_CBC);
+			ivsize = sizeof(u64);
+			break;
+		case CRYPTO_AES_CBC:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_AES |
+					XCT_FUN_BCM_CBC);
+			ivsize = 2 * sizeof(u64);
+			break;
+		case CRYPTO_ARC4:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_ARC);
+			ivsize = 0;
+			break;
+		default:
+			printk(DRV_NAME ": unimplemented enccrd->crd_alg %d\n",
+			       enccrd->crd_alg);
+			err = -EINVAL;
+			goto errout;
+		}
+
+		ivp = (ivsize == sizeof(u64)) ? (caddr_t) &ses->civ[1] : (caddr_t) &ses->civ[0];
+		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+				memcpy(ivp, enccrd->crd_iv, ivsize);
+			else
+				read_random(ivp, ivsize);
+			/* If IV is not present in the buffer already, it has to be copied there */
+			if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0)
+				crypto_copyback(crp->crp_flags, crp->crp_buf,
+						enccrd->crd_inject, ivsize, ivp);
+		} else {
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+				/* IV is provided expicitly in descriptor */
+				memcpy(ivp, enccrd->crd_iv, ivsize);
+			else
+				/* IV is provided in the packet */
+				crypto_copydata(crp->crp_flags, crp->crp_buf,
+						enccrd->crd_inject, ivsize,
+						ivp);
+		}
+	}
+
+	if (maccrd) {
+		switch (maccrd->crd_alg) {
+		case CRYPTO_MD5:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_MD5 |
+					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
+			break;
+		case CRYPTO_SHA1:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_SHA1 |
+					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
+			break;
+		case CRYPTO_MD5_HMAC:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_HMAC_MD5 |
+					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
+			break;
+		case CRYPTO_SHA1_HMAC:
+			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_HMAC_SHA1 |
+					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
+			break;
+		default:
+			printk(DRV_NAME ": unimplemented maccrd->crd_alg %d\n",
+			       maccrd->crd_alg);
+			err = -EINVAL;
+			goto errout;
+		}
+	}
+
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		/* using SKB buffers */
+		skb = (struct sk_buff *)crp->crp_buf;
+		if (skb_shinfo(skb)->nr_frags) {
+			printk(DRV_NAME ": skb frags unimplemented\n");
+			err = -EINVAL;
+			goto errout;
+		}
+		pasemi_desc_build(
+			&work_desc,
+			XCT_FUN_DST_PTR(skb->len, pci_map_single(
+						sc->dma_pdev, skb->data,
+						skb->len, DMA_TO_DEVICE)));
+		pasemi_desc_build(
+			&work_desc,
+			XCT_FUN_SRC_PTR(
+				srclen, pci_map_single(
+					sc->dma_pdev, skb->data,
+					srclen, DMA_TO_DEVICE)));
+		pasemi_desc_hdr(&work_desc, XCT_FUN_LLEN(srclen));
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		/* using IOV buffers */
+		uiop = (struct uio *)crp->crp_buf;
+		if (uiop->uio_iovcnt > 1) {
+			printk(DRV_NAME ": iov frags unimplemented\n");
+			err = -EINVAL;
+			goto errout;
+		}
+
+		/* crp_olen is never set; always use crp_ilen */
+		pasemi_desc_build(
+			&work_desc,
+			XCT_FUN_DST_PTR(crp->crp_ilen, pci_map_single(
+						sc->dma_pdev,
+						uiop->uio_iov->iov_base,
+						crp->crp_ilen, DMA_TO_DEVICE)));
+		pasemi_desc_hdr(&work_desc, XCT_FUN_LLEN(srclen));
+
+		pasemi_desc_build(
+			&work_desc,
+			XCT_FUN_SRC_PTR(srclen, pci_map_single(
+						sc->dma_pdev,
+						uiop->uio_iov->iov_base,
+						srclen, DMA_TO_DEVICE)));
+	} else {
+		/* using contig buffers */
+		pasemi_desc_build(
+			&work_desc,
+			XCT_FUN_DST_PTR(crp->crp_ilen, pci_map_single(
+						sc->dma_pdev,
+						crp->crp_buf,
+						crp->crp_ilen, DMA_TO_DEVICE)));
+		pasemi_desc_build(
+			&work_desc,
+			XCT_FUN_SRC_PTR(srclen, pci_map_single(
+						sc->dma_pdev,
+						crp->crp_buf, srclen,
+						DMA_TO_DEVICE)));
+		pasemi_desc_hdr(&work_desc, XCT_FUN_LLEN(srclen));
+	}
+
+	spin_lock_irqsave(&txring->fill_lock, flags);
+
+	if (txring->sesn != PASEMI_SESSION(crp->crp_sid)) {
+		txring->sesn = PASEMI_SESSION(crp->crp_sid);
+		reinit = 1;
+	}
+
+	if (enccrd) {
+		pasemi_desc_start(&init_desc,
+				  XCT_CTRL_HDR(chsel, reinit ? reinit_size : 0x10, DMA_FN_CIV0));
+		pasemi_desc_build(&init_desc,
+				  XCT_FUN_SRC_PTR(reinit ? reinit_size : 0x10, ses->dma_addr));
+	}
+
+	if (((txring->next_to_fill + pasemi_desc_size(&init_desc) +
+	      pasemi_desc_size(&work_desc)) -
+	     txring->next_to_clean) > TX_RING_SIZE) {
+		spin_unlock_irqrestore(&txring->fill_lock, flags);
+		err = ERESTART;
+		goto errout;
+	}
+
+	pasemi_ring_add_desc(txring, &init_desc, NULL);
+	pasemi_ring_add_desc(txring, &work_desc, crp);
+
+	pasemi_ring_incr(sc, chsel,
+			 pasemi_desc_size(&init_desc) +
+			 pasemi_desc_size(&work_desc));
+
+	spin_unlock_irqrestore(&txring->fill_lock, flags);
+
+	mod_timer(&txring->crypto_timer, jiffies + TIMER_INTERVAL);
+
+	return 0;
+
+erralg:
+	printk(DRV_NAME ": unsupported algorithm or algorithm order alg1 %d alg2 %d\n",
+	       crd1->crd_alg, crd2->crd_alg);
+	err = -EINVAL;
+
+errout:
+	if (err != ERESTART) {
+		crp->crp_etype = err;
+		crypto_done(crp);
+	}
+	return err;
+}
+
+static int pasemi_clean_tx(struct pasemi_softc *sc, int chan)
+{
+	int i, j, ring_idx;
+	struct pasemi_fnu_txring *ring = &sc->tx[chan];
+	u16 delta_cnt;
+	int flags, loops = 10;
+	int desc_size;
+	struct cryptop *crp;
+
+	spin_lock_irqsave(&ring->clean_lock, flags);
+
+	while ((delta_cnt = (dma_status->tx_sta[sc->base_chan + chan]
+			     & PAS_STATUS_PCNT_M) - ring->total_pktcnt)
+	       && loops--) {
+
+		for (i = 0; i < delta_cnt; i++) {
+			desc_size = TX_DESC_INFO(ring, ring->next_to_clean).desc_size;
+			crp = TX_DESC_INFO(ring, ring->next_to_clean).cf_crp;
+			if (crp) {
+				ring_idx = 2 * (ring->next_to_clean & (TX_RING_SIZE-1));
+				if (TX_DESC_INFO(ring, ring->next_to_clean).desc_postop & PASEMI_CHECK_SIG) {
+					/* Need to make sure signature matched,
+					 * if not - return error */
+					if (!(ring->desc[ring_idx + 1] & (1ULL << 63)))
+						crp->crp_etype = -EINVAL;
+				}
+				crypto_done(TX_DESC_INFO(ring,
+							 ring->next_to_clean).cf_crp);
+				TX_DESC_INFO(ring, ring->next_to_clean).cf_crp = NULL;
+				pci_unmap_single(
+					sc->dma_pdev,
+					XCT_PTR_ADDR_LEN(ring->desc[ring_idx + 1]),
+					PCI_DMA_TODEVICE);
+
+				ring->desc[ring_idx] = ring->desc[ring_idx + 1] = 0;
+
+				ring->next_to_clean++;
+				for (j = 1; j < desc_size; j++) {
+					ring_idx = 2 *
+						(ring->next_to_clean &
+						 (TX_RING_SIZE-1));
+					pci_unmap_single(
+						sc->dma_pdev,
+						XCT_PTR_ADDR_LEN(ring->desc[ring_idx]),
+						PCI_DMA_TODEVICE);
+					if (ring->desc[ring_idx + 1])
+						pci_unmap_single(
+							sc->dma_pdev,
+							XCT_PTR_ADDR_LEN(
+								ring->desc[
+									ring_idx + 1]),
+							PCI_DMA_TODEVICE);
+					ring->desc[ring_idx] =
+						ring->desc[ring_idx + 1] = 0;
+					ring->next_to_clean++;
+				}
+			} else {
+				for (j = 0; j < desc_size; j++) {
+					ring_idx = 2 * (ring->next_to_clean & (TX_RING_SIZE-1));
+					ring->desc[ring_idx] =
+						ring->desc[ring_idx + 1] = 0;
+					ring->next_to_clean++;
+				}
+			}
+		}
+
+		ring->total_pktcnt += delta_cnt;
+	}
+	spin_unlock_irqrestore(&ring->clean_lock, flags);
+
+	return 0;
+}
+
+static void sweepup_tx(struct pasemi_softc *sc)
+{
+	int i;
+
+	for (i = 0; i < sc->sc_num_channels; i++)
+		pasemi_clean_tx(sc, i);
+}
+
+static irqreturn_t pasemi_intr(int irq, void *arg, struct pt_regs *regs)
+{
+	struct pasemi_softc *sc = arg;
+	unsigned int reg;
+	int chan = irq - sc->base_irq;
+	int chan_index = sc->base_chan + chan;
+	u64 stat = dma_status->tx_sta[chan_index];
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (!(stat & PAS_STATUS_CAUSE_M))
+		return IRQ_NONE;
+
+	pasemi_clean_tx(sc, chan);
+
+	stat = dma_status->tx_sta[chan_index];
+
+	reg = PAS_IOB_DMA_TXCH_RESET_PINTC |
+		PAS_IOB_DMA_TXCH_RESET_PCNT(sc->tx[chan].total_pktcnt);
+
+	if (stat & PAS_STATUS_SOFT)
+		reg |= PAS_IOB_DMA_RXCH_RESET_SINTC;
+
+	out_le32(sc->iob_regs + PAS_IOB_DMA_TXCH_RESET(chan_index), reg);
+
+
+	return IRQ_HANDLED;
+}
+
+static int pasemi_dma_setup_tx_resources(struct pasemi_softc *sc, int chan)
+{
+	u32 val;
+	int chan_index = chan + sc->base_chan;
+	int ret;
+	struct pasemi_fnu_txring *ring;
+
+	ring = &sc->tx[chan];
+
+	spin_lock_init(&ring->fill_lock);
+	spin_lock_init(&ring->clean_lock);
+
+	ring->desc_info = kzalloc(sizeof(struct pasemi_desc_info) *
+				  TX_RING_SIZE, GFP_KERNEL);
+	if (!ring->desc_info)
+		return -ENOMEM;
+
+	/* Allocate descriptors */
+	ring->desc = dma_alloc_coherent(&sc->dma_pdev->dev,
+					TX_RING_SIZE *
+					2 * sizeof(u64),
+					&ring->dma, GFP_KERNEL);
+	if (!ring->desc)
+		return -ENOMEM;
+
+	memset((void *) ring->desc, 0, TX_RING_SIZE * 2 * sizeof(u64));
+
+	out_le32(sc->iob_regs + PAS_IOB_DMA_TXCH_RESET(chan_index), 0x30);
+
+	ring->total_pktcnt = 0;
+
+	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_BASEL(chan_index),
+		 PAS_DMA_TXCHAN_BASEL_BRBL(ring->dma));
+
+	val = PAS_DMA_TXCHAN_BASEU_BRBH(ring->dma >> 32);
+	val |= PAS_DMA_TXCHAN_BASEU_SIZ(TX_RING_SIZE >> 2);
+
+	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_BASEU(chan_index), val);
+
+	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_CFG(chan_index),
+		 PAS_DMA_TXCHAN_CFG_TY_FUNC |
+		 PAS_DMA_TXCHAN_CFG_TATTR(chan) |
+		 PAS_DMA_TXCHAN_CFG_WT(2));
+
+	/* enable tx channel */
+	out_le32(sc->dma_regs +
+		 PAS_DMA_TXCHAN_TCMDSTA(chan_index),
+		 PAS_DMA_TXCHAN_TCMDSTA_EN);
+
+	out_le32(sc->iob_regs + PAS_IOB_DMA_TXCH_CFG(chan_index),
+		 PAS_IOB_DMA_TXCH_CFG_CNTTH(1000));
+
+	ring->next_to_fill = 0;
+	ring->next_to_clean = 0;
+
+	snprintf(ring->irq_name, sizeof(ring->irq_name),
+		 "%s%d", "crypto", chan);
+
+	ring->irq = irq_create_mapping(NULL, sc->base_irq + chan);
+	ret = request_irq(ring->irq, (irq_handler_t)
+			  pasemi_intr, IRQF_DISABLED, ring->irq_name, sc);
+	if (ret) {
+		printk(KERN_ERR DRV_NAME ": failed to hook irq %d ret %d\n",
+		       ring->irq, ret);
+		ring->irq = -1;
+		return ret;
+	}
+
+	setup_timer(&ring->crypto_timer, (void *) sweepup_tx, (unsigned long) sc);
+
+	return 0;
+}
+
+static device_method_t pasemi_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,		pasemi_newsession),
+	DEVMETHOD(cryptodev_freesession,	pasemi_freesession),
+	DEVMETHOD(cryptodev_process,		pasemi_process),
+};
+
+/* Set up the crypto device structure, private data,
+ * and anything else we need before we start */
+
+static int
+pasemi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+	struct pasemi_softc *sc;
+	int ret, i;
+
+	DPRINTF(KERN_ERR "%s()\n", __FUNCTION__);
+
+	sc = kzalloc(sizeof(*sc), GFP_KERNEL);
+	if (!sc)
+		return -ENOMEM;
+
+	softc_device_init(sc, DRV_NAME, 1, pasemi_methods);
+
+	pci_set_drvdata(pdev, sc);
+
+	spin_lock_init(&sc->sc_chnlock);
+
+	sc->sc_sessions = (struct pasemi_session **)
+		kzalloc(PASEMI_INITIAL_SESSIONS *
+			sizeof(struct pasemi_session *), GFP_ATOMIC);
+	if (sc->sc_sessions == NULL) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
+	sc->sc_nsessions = PASEMI_INITIAL_SESSIONS;
+	sc->sc_lastchn = 0;
+	sc->base_irq = pdev->irq + 6;
+	sc->base_chan = 6;
+	sc->sc_cid = -1;
+	sc->dma_pdev = pdev;
+
+	sc->iob_pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa001, NULL);
+	if (!sc->iob_pdev) {
+		dev_err(&pdev->dev, "Can't find I/O Bridge\n");
+		ret = -ENODEV;
+		goto out;
+	}
+
+	/* This is hardcoded and ugly, but we have some firmware versions
+	 * who don't provide the register space in the device tree. Luckily
+	 * they are at well-known locations so we can just do the math here.
+	 */
+	sc->dma_regs =
+		ioremap(0xe0000000 + (sc->dma_pdev->devfn << 12), 0x2000);
+	sc->iob_regs =
+		ioremap(0xe0000000 + (sc->iob_pdev->devfn << 12), 0x2000);
+	if (!sc->dma_regs || !sc->iob_regs) {
+		dev_err(&pdev->dev, "Can't map registers\n");
+		ret = -ENODEV;
+		goto out;
+	}
+
+	dma_status = __ioremap(0xfd800000, 0x1000, 0);
+	if (!dma_status) {
+		ret = -ENODEV;
+		dev_err(&pdev->dev, "Can't map dmastatus space\n");
+		goto out;
+	}
+
+	sc->tx = (struct pasemi_fnu_txring *)
+		kzalloc(sizeof(struct pasemi_fnu_txring)
+			* 8, GFP_KERNEL);
+	if (!sc->tx) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
+	/* Initialize the h/w */
+	out_le32(sc->dma_regs + PAS_DMA_COM_CFG,
+		 (in_le32(sc->dma_regs + PAS_DMA_COM_CFG) |
+		  PAS_DMA_COM_CFG_FWF));
+	out_le32(sc->dma_regs + PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
+
+	for (i = 0; i < PASEMI_FNU_CHANNELS; i++) {
+		sc->sc_num_channels++;
+		ret = pasemi_dma_setup_tx_resources(sc, i);
+		if (ret)
+			goto out;
+	}
+
+	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),
+					 CRYPTOCAP_F_HARDWARE);
+	if (sc->sc_cid < 0) {
+		printk(KERN_ERR DRV_NAME ": could not get crypto driver id\n");
+		ret = -ENXIO;
+		goto out;
+	}
+
+	/* register algorithms with the framework */
+	printk(DRV_NAME ":");
+
+	crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_ARC4, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
+
+	return 0;
+
+out:
+	pasemi_dma_remove(pdev);
+	return ret;
+}
+
+#define MAX_RETRIES 5000
+
+static void pasemi_free_tx_resources(struct pasemi_softc *sc, int chan)
+{
+	struct pasemi_fnu_txring *ring = &sc->tx[chan];
+	int chan_index = chan + sc->base_chan;
+	int retries;
+	u32 stat;
+
+	/* Stop the channel */
+	out_le32(sc->dma_regs +
+		 PAS_DMA_TXCHAN_TCMDSTA(chan_index),
+		 PAS_DMA_TXCHAN_TCMDSTA_ST);
+
+	for (retries = 0; retries < MAX_RETRIES; retries++) {
+		stat = in_le32(sc->dma_regs +
+			       PAS_DMA_TXCHAN_TCMDSTA(chan_index));
+		if (!(stat & PAS_DMA_TXCHAN_TCMDSTA_ACT))
+			break;
+		cond_resched();
+	}
+
+	if (stat & PAS_DMA_TXCHAN_TCMDSTA_ACT)
+		dev_err(&sc->dma_pdev->dev, "Failed to stop tx channel %d\n",
+			chan_index);
+
+	/* Disable the channel */
+	out_le32(sc->dma_regs +
+		 PAS_DMA_TXCHAN_TCMDSTA(chan_index),
+		 0);
+
+	if (ring->desc_info)
+		kfree((void *) ring->desc_info);
+	if (ring->desc)
+		dma_free_coherent(&sc->dma_pdev->dev,
+				  TX_RING_SIZE *
+				  2 * sizeof(u64),
+				  (void *) ring->desc, ring->dma);
+	if (ring->irq != -1)
+		free_irq(ring->irq, sc);
+
+	del_timer(&ring->crypto_timer);
+}
+
+static void pasemi_dma_remove(struct pci_dev *pdev)
+{
+	struct pasemi_softc *sc = pci_get_drvdata(pdev);
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (sc->sc_cid >= 0) {
+		crypto_unregister_all(sc->sc_cid);
+	}
+
+	if (sc->tx) {
+		for (i = 0; i < sc->sc_num_channels; i++)
+			pasemi_free_tx_resources(sc, i);
+
+		kfree(sc->tx);
+	}
+	if (sc->sc_sessions) {
+		for (i = 0; i < sc->sc_nsessions; i++)
+			kfree(sc->sc_sessions[i]);
+		kfree(sc->sc_sessions);
+	}
+	if (sc->iob_pdev)
+		pci_dev_put(sc->iob_pdev);
+	if (sc->dma_regs)
+		iounmap(sc->dma_regs);
+	if (sc->iob_regs)
+		iounmap(sc->iob_regs);
+	kfree(sc);
+}
+
+static struct pci_device_id pasemi_dma_pci_tbl[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa007) },
+};
+
+MODULE_DEVICE_TABLE(pci, pasemi_dma_pci_tbl);
+
+static struct pci_driver pasemi_dma_driver = {
+	.name		= "pasemi_dma",
+	.id_table	= pasemi_dma_pci_tbl,
+	.probe		= pasemi_dma_probe,
+	.remove		= pasemi_dma_remove,
+};
+
+static void __exit pasemi_dma_cleanup_module(void)
+{
+	pci_unregister_driver(&pasemi_dma_driver);
+	__iounmap(dma_status);
+	dma_status = NULL;
+}
+
+int pasemi_dma_init_module(void)
+{
+	return pci_register_driver(&pasemi_dma_driver);
+}
+
+module_init(pasemi_dma_init_module);
+module_exit(pasemi_dma_cleanup_module);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("Egor Martovetsky egor@pasemi.com");
+MODULE_DESCRIPTION("OCF driver for PA Semi PWRficient DMA Crypto Engine");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi_fnu.h b/trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi_fnu.h
new file mode 100644
index 00000000..1a0dcc8b
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/pasemi/pasemi_fnu.h
@@ -0,0 +1,410 @@
+/*
+ * Copyright (C) 2007 PA Semi, Inc
+ *
+ * Driver for the PA Semi PWRficient DMA Crypto Engine, soft state and
+ * hardware register layouts.
+ *
+ * This program is free software; you can redistribute 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 that 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 PASEMI_FNU_H
+#define PASEMI_FNU_H
+
+#include <linux/spinlock.h>
+
+#define	PASEMI_SESSION(sid)	((sid) & 0xffffffff)
+#define	PASEMI_SID(sesn)	((sesn) & 0xffffffff)
+#define	DPRINTF(a...)	if (debug) { printk(DRV_NAME ": " a); }
+
+/* Must be a power of two */
+#define RX_RING_SIZE 512
+#define TX_RING_SIZE 512
+#define TX_DESC(ring, num)	((ring)->desc[2 * (num & (TX_RING_SIZE-1))])
+#define TX_DESC_INFO(ring, num)	((ring)->desc_info[(num) & (TX_RING_SIZE-1)])
+#define MAX_DESC_SIZE 8
+#define PASEMI_INITIAL_SESSIONS 10
+#define PASEMI_FNU_CHANNELS 8
+
+/* DMA descriptor */
+struct pasemi_desc {
+	u64 quad[2*MAX_DESC_SIZE];
+	int quad_cnt;
+	int size;
+	int postop;
+};
+
+/*
+ * Holds per descriptor data
+ */
+struct pasemi_desc_info {
+	int			desc_size;
+	int			desc_postop;
+#define PASEMI_CHECK_SIG 0x1
+
+	struct cryptop          *cf_crp;
+};
+
+/*
+ * Holds per channel data
+ */
+struct pasemi_fnu_txring {
+	volatile u64		*desc;
+	volatile struct
+	pasemi_desc_info	*desc_info;
+	dma_addr_t		dma;
+	struct timer_list       crypto_timer;
+	spinlock_t		fill_lock;
+	spinlock_t		clean_lock;
+	unsigned int		next_to_fill;
+	unsigned int		next_to_clean;
+	u16			total_pktcnt;
+	int			irq;
+	int			sesn;
+	char			irq_name[10];
+};
+
+/*
+ * Holds data specific to a single pasemi device.
+ */
+struct pasemi_softc {
+	softc_device_decl	sc_cdev;
+	struct pci_dev		*dma_pdev;	/* device backpointer */
+	struct pci_dev		*iob_pdev;	/* device backpointer */
+	void __iomem		*dma_regs;
+	void __iomem		*iob_regs;
+	int			base_irq;
+	int			base_chan;
+	int32_t			sc_cid;		/* crypto tag */
+	int			sc_nsessions;
+	struct pasemi_session	**sc_sessions;
+	int			sc_num_channels;/* number of crypto channels */
+
+	/* pointer to the array of txring datastructures, one txring per channel */
+	struct pasemi_fnu_txring *tx;
+
+	/*
+	 * mutual exclusion for the channel scheduler
+	 */
+	spinlock_t		sc_chnlock;
+	/* last channel used, for now use round-robin to allocate channels */
+	int			sc_lastchn;
+};
+
+struct pasemi_session {
+	u64 civ[2];
+	u64 keysz;
+	u64 key[4];
+	u64 ccmd;
+	u64 hkey[4];
+	u64 hseq;
+	u64 giv[2];
+	u64 hiv[4];
+
+	int used;
+	dma_addr_t	dma_addr;
+	int chan;
+};
+
+/* status register layout in IOB region, at 0xfd800000 */
+struct pasdma_status {
+	u64 rx_sta[64];
+	u64 tx_sta[20];
+};
+
+#define ALG_IS_CIPHER(alg) ((alg == CRYPTO_DES_CBC)		|| \
+				(alg == CRYPTO_3DES_CBC)	|| \
+				(alg == CRYPTO_AES_CBC)		|| \
+				(alg == CRYPTO_ARC4)		|| \
+				(alg == CRYPTO_NULL_CBC))
+
+#define ALG_IS_SIG(alg) ((alg == CRYPTO_MD5)			|| \
+				(alg == CRYPTO_MD5_HMAC)	|| \
+				(alg == CRYPTO_SHA1)		|| \
+				(alg == CRYPTO_SHA1_HMAC)	|| \
+				(alg == CRYPTO_NULL_HMAC))
+
+enum {
+	PAS_DMA_COM_TXCMD = 0x100,	/* Transmit Command Register  */
+	PAS_DMA_COM_TXSTA = 0x104,	/* Transmit Status Register   */
+	PAS_DMA_COM_RXCMD = 0x108,	/* Receive Command Register   */
+	PAS_DMA_COM_RXSTA = 0x10c,	/* Receive Status Register    */
+	PAS_DMA_COM_CFG   = 0x114,	/* DMA Configuration Register */
+};
+
+/* All these registers live in the PCI configuration space for the DMA PCI
+ * device. Use the normal PCI config access functions for them.
+ */
+
+#define PAS_DMA_COM_CFG_FWF	0x18000000
+
+#define PAS_DMA_COM_TXCMD_EN	0x00000001 /* enable */
+#define PAS_DMA_COM_TXSTA_ACT	0x00000001 /* active */
+#define PAS_DMA_COM_RXCMD_EN	0x00000001 /* enable */
+#define PAS_DMA_COM_RXSTA_ACT	0x00000001 /* active */
+
+#define _PAS_DMA_TXCHAN_STRIDE	0x20    /* Size per channel		*/
+#define _PAS_DMA_TXCHAN_TCMDSTA	0x300	/* Command / Status		*/
+#define _PAS_DMA_TXCHAN_CFG	0x304	/* Configuration		*/
+#define _PAS_DMA_TXCHAN_DSCRBU	0x308	/* Descriptor BU Allocation	*/
+#define _PAS_DMA_TXCHAN_INCR	0x310	/* Descriptor increment		*/
+#define _PAS_DMA_TXCHAN_CNT	0x314	/* Descriptor count/offset	*/
+#define _PAS_DMA_TXCHAN_BASEL	0x318	/* Descriptor ring base (low)	*/
+#define _PAS_DMA_TXCHAN_BASEU	0x31c	/*			(high)	*/
+#define PAS_DMA_TXCHAN_TCMDSTA(c) (0x300+(c)*_PAS_DMA_TXCHAN_STRIDE)
+#define    PAS_DMA_TXCHAN_TCMDSTA_EN	0x00000001	/* Enabled */
+#define    PAS_DMA_TXCHAN_TCMDSTA_ST	0x00000002	/* Stop interface */
+#define    PAS_DMA_TXCHAN_TCMDSTA_ACT	0x00010000	/* Active */
+#define PAS_DMA_TXCHAN_CFG(c)     (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
+#define    PAS_DMA_TXCHAN_CFG_TY_FUNC	0x00000002	/* Type = interface */
+#define    PAS_DMA_TXCHAN_CFG_TY_IFACE	0x00000000	/* Type = interface */
+#define    PAS_DMA_TXCHAN_CFG_TATTR_M	0x0000003c
+#define    PAS_DMA_TXCHAN_CFG_TATTR_S	2
+#define    PAS_DMA_TXCHAN_CFG_TATTR(x)	(((x) << PAS_DMA_TXCHAN_CFG_TATTR_S) & \
+					 PAS_DMA_TXCHAN_CFG_TATTR_M)
+#define    PAS_DMA_TXCHAN_CFG_WT_M	0x000001c0
+#define    PAS_DMA_TXCHAN_CFG_WT_S	6
+#define    PAS_DMA_TXCHAN_CFG_WT(x)	(((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
+					 PAS_DMA_TXCHAN_CFG_WT_M)
+#define    PAS_DMA_TXCHAN_CFG_LPSQ_FAST	0x00000400
+#define    PAS_DMA_TXCHAN_CFG_LPDQ_FAST	0x00000800
+#define    PAS_DMA_TXCHAN_CFG_CF	0x00001000	/* Clean first line */
+#define    PAS_DMA_TXCHAN_CFG_CL	0x00002000	/* Clean last line */
+#define    PAS_DMA_TXCHAN_CFG_UP	0x00004000	/* update tx descr when sent */
+#define PAS_DMA_TXCHAN_INCR(c)    (0x310+(c)*_PAS_DMA_TXCHAN_STRIDE)
+#define PAS_DMA_TXCHAN_BASEL(c)   (0x318+(c)*_PAS_DMA_TXCHAN_STRIDE)
+#define    PAS_DMA_TXCHAN_BASEL_BRBL_M	0xffffffc0
+#define    PAS_DMA_TXCHAN_BASEL_BRBL_S	0
+#define    PAS_DMA_TXCHAN_BASEL_BRBL(x)	(((x) << PAS_DMA_TXCHAN_BASEL_BRBL_S) & \
+					 PAS_DMA_TXCHAN_BASEL_BRBL_M)
+#define PAS_DMA_TXCHAN_BASEU(c)   (0x31c+(c)*_PAS_DMA_TXCHAN_STRIDE)
+#define    PAS_DMA_TXCHAN_BASEU_BRBH_M	0x00000fff
+#define    PAS_DMA_TXCHAN_BASEU_BRBH_S	0
+#define    PAS_DMA_TXCHAN_BASEU_BRBH(x)	(((x) << PAS_DMA_TXCHAN_BASEU_BRBH_S) & \
+					 PAS_DMA_TXCHAN_BASEU_BRBH_M)
+/* # of cache lines worth of buffer ring */
+#define    PAS_DMA_TXCHAN_BASEU_SIZ_M	0x3fff0000
+#define    PAS_DMA_TXCHAN_BASEU_SIZ_S	16		/* 0 = 16K */
+#define    PAS_DMA_TXCHAN_BASEU_SIZ(x)	(((x) << PAS_DMA_TXCHAN_BASEU_SIZ_S) & \
+					 PAS_DMA_TXCHAN_BASEU_SIZ_M)
+
+#define    PAS_STATUS_PCNT_M		0x000000000000ffffull
+#define    PAS_STATUS_PCNT_S		0
+#define    PAS_STATUS_DCNT_M		0x00000000ffff0000ull
+#define    PAS_STATUS_DCNT_S		16
+#define    PAS_STATUS_BPCNT_M		0x0000ffff00000000ull
+#define    PAS_STATUS_BPCNT_S		32
+#define    PAS_STATUS_CAUSE_M		0xf000000000000000ull
+#define    PAS_STATUS_TIMER		0x1000000000000000ull
+#define    PAS_STATUS_ERROR		0x2000000000000000ull
+#define    PAS_STATUS_SOFT		0x4000000000000000ull
+#define    PAS_STATUS_INT		0x8000000000000000ull
+
+#define PAS_IOB_DMA_RXCH_CFG(i)		(0x1100 + (i)*4)
+#define    PAS_IOB_DMA_RXCH_CFG_CNTTH_M		0x00000fff
+#define    PAS_IOB_DMA_RXCH_CFG_CNTTH_S		0
+#define    PAS_IOB_DMA_RXCH_CFG_CNTTH(x)	(((x) << PAS_IOB_DMA_RXCH_CFG_CNTTH_S) & \
+						 PAS_IOB_DMA_RXCH_CFG_CNTTH_M)
+#define PAS_IOB_DMA_TXCH_CFG(i)		(0x1200 + (i)*4)
+#define    PAS_IOB_DMA_TXCH_CFG_CNTTH_M		0x00000fff
+#define    PAS_IOB_DMA_TXCH_CFG_CNTTH_S		0
+#define    PAS_IOB_DMA_TXCH_CFG_CNTTH(x)	(((x) << PAS_IOB_DMA_TXCH_CFG_CNTTH_S) & \
+						 PAS_IOB_DMA_TXCH_CFG_CNTTH_M)
+#define PAS_IOB_DMA_RXCH_STAT(i)	(0x1300 + (i)*4)
+#define    PAS_IOB_DMA_RXCH_STAT_INTGEN	0x00001000
+#define    PAS_IOB_DMA_RXCH_STAT_CNTDEL_M	0x00000fff
+#define    PAS_IOB_DMA_RXCH_STAT_CNTDEL_S	0
+#define    PAS_IOB_DMA_RXCH_STAT_CNTDEL(x)	(((x) << PAS_IOB_DMA_RXCH_STAT_CNTDEL_S) &\
+						 PAS_IOB_DMA_RXCH_STAT_CNTDEL_M)
+#define PAS_IOB_DMA_TXCH_STAT(i)	(0x1400 + (i)*4)
+#define    PAS_IOB_DMA_TXCH_STAT_INTGEN	0x00001000
+#define    PAS_IOB_DMA_TXCH_STAT_CNTDEL_M	0x00000fff
+#define    PAS_IOB_DMA_TXCH_STAT_CNTDEL_S	0
+#define    PAS_IOB_DMA_TXCH_STAT_CNTDEL(x)	(((x) << PAS_IOB_DMA_TXCH_STAT_CNTDEL_S) &\
+						 PAS_IOB_DMA_TXCH_STAT_CNTDEL_M)
+#define PAS_IOB_DMA_RXCH_RESET(i)	(0x1500 + (i)*4)
+#define    PAS_IOB_DMA_RXCH_RESET_PCNT_M	0xffff0000
+#define    PAS_IOB_DMA_RXCH_RESET_PCNT_S	16
+#define    PAS_IOB_DMA_RXCH_RESET_PCNT(x)	(((x) << PAS_IOB_DMA_RXCH_RESET_PCNT_S) & \
+						 PAS_IOB_DMA_RXCH_RESET_PCNT_M)
+#define    PAS_IOB_DMA_RXCH_RESET_PCNTRST	0x00000020
+#define    PAS_IOB_DMA_RXCH_RESET_DCNTRST	0x00000010
+#define    PAS_IOB_DMA_RXCH_RESET_TINTC		0x00000008
+#define    PAS_IOB_DMA_RXCH_RESET_DINTC		0x00000004
+#define    PAS_IOB_DMA_RXCH_RESET_SINTC		0x00000002
+#define    PAS_IOB_DMA_RXCH_RESET_PINTC		0x00000001
+#define PAS_IOB_DMA_TXCH_RESET(i)	(0x1600 + (i)*4)
+#define    PAS_IOB_DMA_TXCH_RESET_PCNT_M	0xffff0000
+#define    PAS_IOB_DMA_TXCH_RESET_PCNT_S	16
+#define    PAS_IOB_DMA_TXCH_RESET_PCNT(x)	(((x) << PAS_IOB_DMA_TXCH_RESET_PCNT_S) & \
+						 PAS_IOB_DMA_TXCH_RESET_PCNT_M)
+#define    PAS_IOB_DMA_TXCH_RESET_PCNTRST	0x00000020
+#define    PAS_IOB_DMA_TXCH_RESET_DCNTRST	0x00000010
+#define    PAS_IOB_DMA_TXCH_RESET_TINTC		0x00000008
+#define    PAS_IOB_DMA_TXCH_RESET_DINTC		0x00000004
+#define    PAS_IOB_DMA_TXCH_RESET_SINTC		0x00000002
+#define    PAS_IOB_DMA_TXCH_RESET_PINTC		0x00000001
+
+#define PAS_IOB_DMA_COM_TIMEOUTCFG		0x1700
+#define    PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_M	0x00ffffff
+#define    PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_S	0
+#define    PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(x)	(((x) << PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_S) & \
+						 PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_M)
+
+/* Transmit descriptor fields */
+#define	XCT_MACTX_T		0x8000000000000000ull
+#define	XCT_MACTX_ST		0x4000000000000000ull
+#define XCT_MACTX_NORES		0x0000000000000000ull
+#define XCT_MACTX_8BRES		0x1000000000000000ull
+#define XCT_MACTX_24BRES	0x2000000000000000ull
+#define XCT_MACTX_40BRES	0x3000000000000000ull
+#define XCT_MACTX_I		0x0800000000000000ull
+#define XCT_MACTX_O		0x0400000000000000ull
+#define XCT_MACTX_E		0x0200000000000000ull
+#define XCT_MACTX_VLAN_M	0x0180000000000000ull
+#define XCT_MACTX_VLAN_NOP	0x0000000000000000ull
+#define XCT_MACTX_VLAN_REMOVE	0x0080000000000000ull
+#define XCT_MACTX_VLAN_INSERT   0x0100000000000000ull
+#define XCT_MACTX_VLAN_REPLACE  0x0180000000000000ull
+#define XCT_MACTX_CRC_M		0x0060000000000000ull
+#define XCT_MACTX_CRC_NOP	0x0000000000000000ull
+#define XCT_MACTX_CRC_INSERT	0x0020000000000000ull
+#define XCT_MACTX_CRC_PAD	0x0040000000000000ull
+#define XCT_MACTX_CRC_REPLACE	0x0060000000000000ull
+#define XCT_MACTX_SS		0x0010000000000000ull
+#define XCT_MACTX_LLEN_M	0x00007fff00000000ull
+#define XCT_MACTX_LLEN_S	32ull
+#define XCT_MACTX_LLEN(x)	((((long)(x)) << XCT_MACTX_LLEN_S) & \
+				 XCT_MACTX_LLEN_M)
+#define XCT_MACTX_IPH_M		0x00000000f8000000ull
+#define XCT_MACTX_IPH_S		27ull
+#define XCT_MACTX_IPH(x)	((((long)(x)) << XCT_MACTX_IPH_S) & \
+				 XCT_MACTX_IPH_M)
+#define XCT_MACTX_IPO_M		0x0000000007c00000ull
+#define XCT_MACTX_IPO_S		22ull
+#define XCT_MACTX_IPO(x)	((((long)(x)) << XCT_MACTX_IPO_S) & \
+				 XCT_MACTX_IPO_M)
+#define XCT_MACTX_CSUM_M	0x0000000000000060ull
+#define XCT_MACTX_CSUM_NOP	0x0000000000000000ull
+#define XCT_MACTX_CSUM_TCP	0x0000000000000040ull
+#define XCT_MACTX_CSUM_UDP	0x0000000000000060ull
+#define XCT_MACTX_V6		0x0000000000000010ull
+#define XCT_MACTX_C		0x0000000000000004ull
+#define XCT_MACTX_AL2		0x0000000000000002ull
+
+#define XCT_PTR_T		0x8000000000000000ull
+#define XCT_PTR_LEN_M		0x7ffff00000000000ull
+#define XCT_PTR_LEN_S		44
+#define XCT_PTR_LEN(x)		((((long)(x)) << XCT_PTR_LEN_S) & \
+				 XCT_PTR_LEN_M)
+#define XCT_PTR_ADDR_M		0x00000fffffffffffull
+#define XCT_PTR_ADDR_S		0
+#define XCT_PTR_ADDR(x)		((((long)(x)) << XCT_PTR_ADDR_S) & \
+				 XCT_PTR_ADDR_M)
+
+/* Function descriptor fields */
+#define	XCT_FUN_T		0x8000000000000000ull
+#define	XCT_FUN_ST		0x4000000000000000ull
+#define XCT_FUN_NORES		0x0000000000000000ull
+#define XCT_FUN_8BRES		0x1000000000000000ull
+#define XCT_FUN_24BRES		0x2000000000000000ull
+#define XCT_FUN_40BRES		0x3000000000000000ull
+#define XCT_FUN_I		0x0800000000000000ull
+#define XCT_FUN_O		0x0400000000000000ull
+#define XCT_FUN_E		0x0200000000000000ull
+#define XCT_FUN_FUN_S		54
+#define XCT_FUN_FUN_M		0x01c0000000000000ull
+#define XCT_FUN_FUN(num)	((((long)(num)) << XCT_FUN_FUN_S) & \
+				XCT_FUN_FUN_M)
+#define XCT_FUN_CRM_NOP		0x0000000000000000ull
+#define XCT_FUN_CRM_SIG		0x0008000000000000ull
+#define XCT_FUN_CRM_ENC		0x0010000000000000ull
+#define XCT_FUN_CRM_DEC		0x0018000000000000ull
+#define XCT_FUN_CRM_SIG_ENC	0x0020000000000000ull
+#define XCT_FUN_CRM_ENC_SIG	0x0028000000000000ull
+#define XCT_FUN_CRM_SIG_DEC	0x0030000000000000ull
+#define XCT_FUN_CRM_DEC_SIG	0x0038000000000000ull
+#define XCT_FUN_LLEN_M		0x0007ffff00000000ull
+#define XCT_FUN_LLEN_S		32ULL
+#define XCT_FUN_LLEN(x)		((((long)(x)) << XCT_FUN_LLEN_S) & \
+				 XCT_FUN_LLEN_M)
+#define XCT_FUN_SHL_M		0x00000000f8000000ull
+#define XCT_FUN_SHL_S		27ull
+#define XCT_FUN_SHL(x)		((((long)(x)) << XCT_FUN_SHL_S) & \
+				 XCT_FUN_SHL_M)
+#define XCT_FUN_CHL_M		0x0000000007c00000ull
+#define XCT_FUN_CHL_S		22ull
+#define XCT_FUN_CHL(x)		((((long)(x)) << XCT_FUN_CHL_S) & \
+				 XCT_FUN_CHL_M)
+#define XCT_FUN_HSZ_M		0x00000000003c0000ull
+#define XCT_FUN_HSZ_S		18ull
+#define XCT_FUN_HSZ(x)		((((long)(x)) << XCT_FUN_HSZ_S) & \
+				 XCT_FUN_HSZ_M)
+#define XCT_FUN_ALG_DES		0x0000000000000000ull
+#define XCT_FUN_ALG_3DES	0x0000000000008000ull
+#define XCT_FUN_ALG_AES		0x0000000000010000ull
+#define XCT_FUN_ALG_ARC		0x0000000000018000ull
+#define XCT_FUN_ALG_KASUMI	0x0000000000020000ull
+#define XCT_FUN_BCM_ECB		0x0000000000000000ull
+#define XCT_FUN_BCM_CBC		0x0000000000001000ull
+#define XCT_FUN_BCM_CFB		0x0000000000002000ull
+#define XCT_FUN_BCM_OFB		0x0000000000003000ull
+#define XCT_FUN_BCM_CNT		0x0000000000003800ull
+#define XCT_FUN_BCM_KAS_F8	0x0000000000002800ull
+#define XCT_FUN_BCM_KAS_F9	0x0000000000001800ull
+#define XCT_FUN_BCP_NO_PAD	0x0000000000000000ull
+#define XCT_FUN_BCP_ZRO		0x0000000000000200ull
+#define XCT_FUN_BCP_PL		0x0000000000000400ull
+#define XCT_FUN_BCP_INCR	0x0000000000000600ull
+#define XCT_FUN_SIG_MD5		(0ull << 4)
+#define XCT_FUN_SIG_SHA1	(2ull << 4)
+#define XCT_FUN_SIG_HMAC_MD5	(8ull << 4)
+#define XCT_FUN_SIG_HMAC_SHA1	(10ull << 4)
+#define XCT_FUN_A		0x0000000000000008ull
+#define XCT_FUN_C		0x0000000000000004ull
+#define XCT_FUN_AL2		0x0000000000000002ull
+#define XCT_FUN_SE		0x0000000000000001ull
+
+#define XCT_FUN_SRC_PTR(len, addr)	(XCT_PTR_LEN(len) | XCT_PTR_ADDR(addr))
+#define XCT_FUN_DST_PTR(len, addr)	(XCT_FUN_SRC_PTR(len, addr) | \
+					0x8000000000000000ull)
+
+#define XCT_CTRL_HDR_FUN_NUM_M		0x01c0000000000000ull
+#define XCT_CTRL_HDR_FUN_NUM_S		54
+#define XCT_CTRL_HDR_LEN_M		0x0007ffff00000000ull
+#define XCT_CTRL_HDR_LEN_S		32
+#define XCT_CTRL_HDR_REG_M		0x00000000000000ffull
+#define XCT_CTRL_HDR_REG_S		0
+
+#define XCT_CTRL_HDR(funcN,len,reg)	(0x9400000000000000ull | \
+			((((long)(funcN)) << XCT_CTRL_HDR_FUN_NUM_S) \
+			& XCT_CTRL_HDR_FUN_NUM_M) | \
+			((((long)(len)) << \
+			XCT_CTRL_HDR_LEN_S) & XCT_CTRL_HDR_LEN_M) | \
+			((((long)(reg)) << \
+			XCT_CTRL_HDR_REG_S) & XCT_CTRL_HDR_REG_M))
+
+/* Function config command options */
+#define	DMA_CALGO_DES			0x00
+#define	DMA_CALGO_3DES			0x01
+#define	DMA_CALGO_AES			0x02
+#define	DMA_CALGO_ARC			0x03
+
+#define DMA_FN_CIV0			0x02
+#define DMA_FN_CIV1			0x03
+#define DMA_FN_HKEY0			0x0a
+
+#define XCT_PTR_ADDR_LEN(ptr)		((ptr) & XCT_PTR_ADDR_M), \
+			(((ptr) & XCT_PTR_LEN_M) >> XCT_PTR_LEN_S)
+
+#endif /* PASEMI_FNU_H */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/random.c b/trunk/target/linux/generic/files/crypto/ocf/random.c
new file mode 100644
index 00000000..9fc070ed
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/random.c
@@ -0,0 +1,317 @@
+/*
+ * A system independant way of adding entropy to the kernels pool
+ * this way the drivers can focus on the real work and we can take
+ * care of pushing it to the appropriate place in the kernel.
+ *
+ * This should be fast and callable from timers/interrupts
+ *
+ * Written by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#include <linux/unistd.h>
+#include <linux/poll.h>
+#include <linux/random.h>
+#include <linux/kthread.h>
+#include <cryptodev.h>
+
+#ifdef CONFIG_OCF_FIPS
+#include "rndtest.h"
+#endif
+
+#ifndef HAS_RANDOM_INPUT_WAIT
+#error "Please do not enable OCF_RANDOMHARVEST unless you have applied patches"
+#endif
+
+/*
+ * a hack to access the debug levels from the crypto driver
+ */
+extern int crypto_debug;
+#define debug crypto_debug
+
+/*
+ * a list of all registered random providers
+ */
+static LIST_HEAD(random_ops);
+static int started = 0;
+static int initted = 0;
+
+struct random_op {
+	struct list_head random_list;
+	u_int32_t driverid;
+	int (*read_random)(void *arg, u_int32_t *buf, int len);
+	void *arg;
+};
+
+static struct task_struct *random_thread;
+static int random_proc(void *arg);
+
+static spinlock_t	random_lock;
+
+/*
+ * just init the spin locks
+ */
+static int
+crypto_random_init(void)
+{
+	spin_lock_init(&random_lock);
+	initted = 1;
+	return(0);
+}
+
+/*
+ * Add the given random reader to our list (if not present)
+ * and start the thread (if not already started)
+ *
+ * we have to assume that driver id is ok for now
+ */
+int
+crypto_rregister(
+	u_int32_t driverid,
+	int (*read_random)(void *arg, u_int32_t *buf, int len),
+	void *arg)
+{
+	unsigned long flags;
+	int ret = 0;
+	struct random_op	*rops, *tmp;
+
+	dprintk("%s,%d: %s(0x%x, %p, %p)\n", __FILE__, __LINE__,
+			__FUNCTION__, driverid, read_random, arg);
+
+	if (!initted)
+		crypto_random_init();
+
+#if 0
+	struct cryptocap	*cap;
+
+	cap = crypto_checkdriver(driverid);
+	if (!cap)
+		return EINVAL;
+#endif
+
+	list_for_each_entry_safe(rops, tmp, &random_ops, random_list) {
+		if (rops->driverid == driverid && rops->read_random == read_random)
+			return EEXIST;
+	}
+
+	rops = (struct random_op *) kmalloc(sizeof(*rops), GFP_KERNEL);
+	if (!rops)
+		return ENOMEM;
+
+	rops->driverid    = driverid;
+	rops->read_random = read_random;
+	rops->arg = arg;
+
+	spin_lock_irqsave(&random_lock, flags);
+	list_add_tail(&rops->random_list, &random_ops);
+	if (!started) {
+		random_thread = kthread_run(random_proc, NULL, "ocf-random");
+		if (IS_ERR(random_thread))
+			ret = PTR_ERR(random_thread);
+		else
+			started = 1;
+	}
+	spin_unlock_irqrestore(&random_lock, flags);
+
+	return ret;
+}
+EXPORT_SYMBOL(crypto_rregister);
+
+int
+crypto_runregister_all(u_int32_t driverid)
+{
+	struct random_op *rops, *tmp;
+	unsigned long flags;
+
+	dprintk("%s,%d: %s(0x%x)\n", __FILE__, __LINE__, __FUNCTION__, driverid);
+
+	list_for_each_entry_safe(rops, tmp, &random_ops, random_list) {
+		if (rops->driverid == driverid) {
+			list_del(&rops->random_list);
+			kfree(rops);
+		}
+	}
+
+	spin_lock_irqsave(&random_lock, flags);
+	if (list_empty(&random_ops) && started)
+		kthread_stop(random_thread);
+	spin_unlock_irqrestore(&random_lock, flags);
+	return(0);
+}
+EXPORT_SYMBOL(crypto_runregister_all);
+
+/*
+ * while we can add entropy to random.c continue to read random data from
+ * the drivers and push it to random.
+ */
+static int
+random_proc(void *arg)
+{
+	int n;
+	int wantcnt;
+	int bufcnt = 0;
+	int retval = 0;
+	int *buf = NULL;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+	daemonize();
+	spin_lock_irq(&current->sigmask_lock);
+	sigemptyset(&current->blocked);
+	recalc_sigpending(current);
+	spin_unlock_irq(&current->sigmask_lock);
+	sprintf(current->comm, "ocf-random");
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+	recalc_sigpending();
+	sprintf(current->comm, "ocf-random");
+#else
+	daemonize("ocf-random");
+#endif
+
+	(void) get_fs();
+	set_fs(get_ds());
+
+#ifdef CONFIG_OCF_FIPS
+#define NUM_INT (RNDTEST_NBYTES/sizeof(int))
+#else
+#define NUM_INT 32
+#endif
+
+	/*
+	 * some devices can transferr their RNG data direct into memory,
+	 * so make sure it is device friendly
+	 */
+	buf = kmalloc(NUM_INT * sizeof(int), GFP_DMA);
+	if (NULL == buf) {
+		printk("crypto: RNG could not allocate memory\n");
+		retval = -ENOMEM;
+		goto bad_alloc;
+	}
+
+	wantcnt = NUM_INT;   /* start by adding some entropy */
+
+	/*
+	 * its possible due to errors or driver removal that we no longer
+	 * have anything to do,  if so exit or we will consume all the CPU
+	 * doing nothing
+	 */
+	while (!list_empty(&random_ops)) {
+		struct random_op	*rops, *tmp;
+
+#ifdef CONFIG_OCF_FIPS
+		if (wantcnt)
+			wantcnt = NUM_INT; /* FIPs mode can do 20000 bits or none */
+#endif
+
+		/* see if we can get enough entropy to make the world
+		 * a better place.
+		 */
+		while (bufcnt < wantcnt && bufcnt < NUM_INT) {
+			list_for_each_entry_safe(rops, tmp, &random_ops, random_list) {
+
+				n = (*rops->read_random)(rops->arg, &buf[bufcnt],
+							 NUM_INT - bufcnt);
+
+				/* on failure remove the random number generator */
+				if (n == -1) {
+					list_del(&rops->random_list);
+					printk("crypto: RNG (driverid=0x%x) failed, disabling\n",
+							rops->driverid);
+					kfree(rops);
+				} else if (n > 0)
+					bufcnt += n;
+			}
+			/* give up CPU for a bit, just in case as this is a loop */
+			schedule();
+		}
+
+
+#ifdef CONFIG_OCF_FIPS
+		if (bufcnt > 0 && rndtest_buf((unsigned char *) &buf[0])) {
+			dprintk("crypto: buffer had fips errors, discarding\n");
+			bufcnt = 0;
+		}
+#endif
+
+		/*
+		 * if we have a certified buffer,  we can send some data
+		 * to /dev/random and move along
+		 */
+		if (bufcnt > 0) {
+			/* add what we have */
+			random_input_words(buf, bufcnt, bufcnt*sizeof(int)*8);
+			bufcnt = 0;
+		}
+
+		/* give up CPU for a bit so we don't hog while filling */
+		schedule();
+
+		/* wait for needing more */
+		wantcnt = random_input_wait();
+
+		if (wantcnt <= 0)
+			wantcnt = 0; /* try to get some info again */
+		else
+		 	/* round up to one word or we can loop forever */
+			wantcnt = (wantcnt + (sizeof(int)*8)) / (sizeof(int)*8);
+		if (wantcnt > NUM_INT) {
+			wantcnt = NUM_INT;
+		}
+
+		if (signal_pending(current)) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+			spin_lock_irq(&current->sigmask_lock);
+#endif
+			flush_signals(current);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+			spin_unlock_irq(&current->sigmask_lock);
+#endif
+		}
+	}
+
+	kfree(buf);
+
+bad_alloc:
+	spin_lock_irq(&random_lock);
+	started = 0;
+	spin_unlock_irq(&random_lock);
+
+	return retval;
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/rndtest.c b/trunk/target/linux/generic/files/crypto/ocf/rndtest.c
new file mode 100644
index 00000000..7bed6a19
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/rndtest.c
@@ -0,0 +1,300 @@
+/*	$OpenBSD$	*/
+
+/*
+ * OCF/Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ * The license and original author are listed below.
+ *
+ * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Jason L. Wright
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/wait.h>
+#include <linux/time.h>
+#include <linux/unistd.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/time.h>
+#include <cryptodev.h>
+#include "rndtest.h"
+
+static struct rndtest_stats rndstats;
+
+static	void rndtest_test(struct rndtest_state *);
+
+/* The tests themselves */
+static	int rndtest_monobit(struct rndtest_state *);
+static	int rndtest_runs(struct rndtest_state *);
+static	int rndtest_longruns(struct rndtest_state *);
+static	int rndtest_chi_4(struct rndtest_state *);
+
+static	int rndtest_runs_check(struct rndtest_state *, int, int *);
+static	void rndtest_runs_record(struct rndtest_state *, int, int *);
+
+static const struct rndtest_testfunc {
+	int (*test)(struct rndtest_state *);
+} rndtest_funcs[] = {
+	{ rndtest_monobit },
+	{ rndtest_runs },
+	{ rndtest_chi_4 },
+	{ rndtest_longruns },
+};
+
+#define	RNDTEST_NTESTS	(sizeof(rndtest_funcs)/sizeof(rndtest_funcs[0]))
+
+static void
+rndtest_test(struct rndtest_state *rsp)
+{
+	int i, rv = 0;
+
+	rndstats.rst_tests++;
+	for (i = 0; i < RNDTEST_NTESTS; i++)
+		rv |= (*rndtest_funcs[i].test)(rsp);
+	rsp->rs_discard = (rv != 0);
+}
+
+
+extern int crypto_debug;
+#define rndtest_verbose 2
+#define rndtest_report(rsp, failure, fmt, a...) \
+	{ if (failure || crypto_debug) { printk("rng_test: " fmt "\n", a); } else; }
+
+#define	RNDTEST_MONOBIT_MINONES	9725
+#define	RNDTEST_MONOBIT_MAXONES	10275
+
+static int
+rndtest_monobit(struct rndtest_state *rsp)
+{
+	int i, ones = 0, j;
+	u_int8_t r;
+
+	for (i = 0; i < RNDTEST_NBYTES; i++) {
+		r = rsp->rs_buf[i];
+		for (j = 0; j < 8; j++, r <<= 1)
+			if (r & 0x80)
+				ones++;
+	}
+	if (ones > RNDTEST_MONOBIT_MINONES &&
+	    ones < RNDTEST_MONOBIT_MAXONES) {
+		if (rndtest_verbose > 1)
+			rndtest_report(rsp, 0, "monobit pass (%d < %d < %d)",
+			    RNDTEST_MONOBIT_MINONES, ones,
+			    RNDTEST_MONOBIT_MAXONES);
+		return (0);
+	} else {
+		if (rndtest_verbose)
+			rndtest_report(rsp, 1,
+			    "monobit failed (%d ones)", ones);
+		rndstats.rst_monobit++;
+		return (-1);
+	}
+}
+
+#define	RNDTEST_RUNS_NINTERVAL	6
+
+static const struct rndtest_runs_tabs {
+	u_int16_t min, max;
+} rndtest_runs_tab[] = {
+	{ 2343, 2657 },
+	{ 1135, 1365 },
+	{ 542, 708 },
+	{ 251, 373 },
+	{ 111, 201 },
+	{ 111, 201 },
+};
+
+static int
+rndtest_runs(struct rndtest_state *rsp)
+{
+	int i, j, ones, zeros, rv = 0;
+	int onei[RNDTEST_RUNS_NINTERVAL], zeroi[RNDTEST_RUNS_NINTERVAL];
+	u_int8_t c;
+
+	bzero(onei, sizeof(onei));
+	bzero(zeroi, sizeof(zeroi));
+	ones = zeros = 0;
+	for (i = 0; i < RNDTEST_NBYTES; i++) {
+		c = rsp->rs_buf[i];
+		for (j = 0; j < 8; j++, c <<= 1) {
+			if (c & 0x80) {
+				ones++;
+				rndtest_runs_record(rsp, zeros, zeroi);
+				zeros = 0;
+			} else {
+				zeros++;
+				rndtest_runs_record(rsp, ones, onei);
+				ones = 0;
+			}
+		}
+	}
+	rndtest_runs_record(rsp, ones, onei);
+	rndtest_runs_record(rsp, zeros, zeroi);
+
+	rv |= rndtest_runs_check(rsp, 0, zeroi);
+	rv |= rndtest_runs_check(rsp, 1, onei);
+
+	if (rv)
+		rndstats.rst_runs++;
+
+	return (rv);
+}
+
+static void
+rndtest_runs_record(struct rndtest_state *rsp, int len, int *intrv)
+{
+	if (len == 0)
+		return;
+	if (len > RNDTEST_RUNS_NINTERVAL)
+		len = RNDTEST_RUNS_NINTERVAL;
+	len -= 1;
+	intrv[len]++;
+}
+
+static int
+rndtest_runs_check(struct rndtest_state *rsp, int val, int *src)
+{
+	int i, rv = 0;
+
+	for (i = 0; i < RNDTEST_RUNS_NINTERVAL; i++) {
+		if (src[i] < rndtest_runs_tab[i].min ||
+		    src[i] > rndtest_runs_tab[i].max) {
+			rndtest_report(rsp, 1,
+			    "%s interval %d failed (%d, %d-%d)",
+			    val ? "ones" : "zeros",
+			    i + 1, src[i], rndtest_runs_tab[i].min,
+			    rndtest_runs_tab[i].max);
+			rv = -1;
+		} else {
+			rndtest_report(rsp, 0,
+			    "runs pass %s interval %d (%d < %d < %d)",
+			    val ? "ones" : "zeros",
+			    i + 1, rndtest_runs_tab[i].min, src[i],
+			    rndtest_runs_tab[i].max);
+		}
+	}
+	return (rv);
+}
+
+static int
+rndtest_longruns(struct rndtest_state *rsp)
+{
+	int i, j, ones = 0, zeros = 0, maxones = 0, maxzeros = 0;
+	u_int8_t c;
+
+	for (i = 0; i < RNDTEST_NBYTES; i++) {
+		c = rsp->rs_buf[i];
+		for (j = 0; j < 8; j++, c <<= 1) {
+			if (c & 0x80) {
+				zeros = 0;
+				ones++;
+				if (ones > maxones)
+					maxones = ones;
+			} else {
+				ones = 0;
+				zeros++;
+				if (zeros > maxzeros)
+					maxzeros = zeros;
+			}
+		}
+	}
+
+	if (maxones < 26 && maxzeros < 26) {
+		rndtest_report(rsp, 0, "longruns pass (%d ones, %d zeros)",
+			maxones, maxzeros);
+		return (0);
+	} else {
+		rndtest_report(rsp, 1, "longruns fail (%d ones, %d zeros)",
+			maxones, maxzeros);
+		rndstats.rst_longruns++;
+		return (-1);
+	}
+}
+
+/*
+ * chi^2 test over 4 bits: (this is called the poker test in FIPS 140-2,
+ * but it is really the chi^2 test over 4 bits (the poker test as described
+ * by Knuth vol 2 is something different, and I take him as authoritative
+ * on nomenclature over NIST).
+ */
+#define	RNDTEST_CHI4_K	16
+#define	RNDTEST_CHI4_K_MASK	(RNDTEST_CHI4_K - 1)
+
+/*
+ * The unnormalized values are used so that we don't have to worry about
+ * fractional precision.  The "real" value is found by:
+ *	(V - 1562500) * (16 / 5000) = Vn   (where V is the unnormalized value)
+ */
+#define	RNDTEST_CHI4_VMIN	1563181		/* 2.1792 */
+#define	RNDTEST_CHI4_VMAX	1576929		/* 46.1728 */
+
+static int
+rndtest_chi_4(struct rndtest_state *rsp)
+{
+	unsigned int freq[RNDTEST_CHI4_K], i, sum;
+
+	for (i = 0; i < RNDTEST_CHI4_K; i++)
+		freq[i] = 0;
+
+	/* Get number of occurances of each 4 bit pattern */
+	for (i = 0; i < RNDTEST_NBYTES; i++) {
+		freq[(rsp->rs_buf[i] >> 4) & RNDTEST_CHI4_K_MASK]++;
+		freq[(rsp->rs_buf[i] >> 0) & RNDTEST_CHI4_K_MASK]++;
+	}
+
+	for (i = 0, sum = 0; i < RNDTEST_CHI4_K; i++)
+		sum += freq[i] * freq[i];
+
+	if (sum >= 1563181 && sum <= 1576929) {
+		rndtest_report(rsp, 0, "chi^2(4): pass (sum %u)", sum);
+		return (0);
+	} else {
+		rndtest_report(rsp, 1, "chi^2(4): failed (sum %u)", sum);
+		rndstats.rst_chi++;
+		return (-1);
+	}
+}
+
+int
+rndtest_buf(unsigned char *buf)
+{
+	struct rndtest_state rsp;
+
+	memset(&rsp, 0, sizeof(rsp));
+	rsp.rs_buf = buf;
+	rndtest_test(&rsp);
+	return(rsp.rs_discard);
+}
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/rndtest.h b/trunk/target/linux/generic/files/crypto/ocf/rndtest.h
new file mode 100644
index 00000000..e9d8ec8d
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/rndtest.h
@@ -0,0 +1,54 @@
+/*	$FreeBSD: src/sys/dev/rndtest/rndtest.h,v 1.1 2003/03/11 22:54:44 sam Exp $	*/
+/*	$OpenBSD$	*/
+
+/*
+ * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Jason L. Wright
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/* Some of the tests depend on these values */
+#define	RNDTEST_NBYTES	2500
+#define	RNDTEST_NBITS	(8 * RNDTEST_NBYTES)
+
+struct rndtest_state {
+	int		rs_discard;	/* discard/accept random data */
+	u_int8_t	*rs_buf;
+};
+
+struct rndtest_stats {
+	u_int32_t	rst_discard;	/* number of bytes discarded */
+	u_int32_t	rst_tests;	/* number of test runs */
+	u_int32_t	rst_monobit;	/* monobit test failures */
+	u_int32_t	rst_runs;	/* 0/1 runs failures */
+	u_int32_t	rst_longruns;	/* longruns failures */
+	u_int32_t	rst_chi;	/* chi^2 failures */
+};
+
+extern int rndtest_buf(unsigned char *buf);
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/Makefile b/trunk/target/linux/generic/files/crypto/ocf/safe/Makefile
new file mode 100644
index 00000000..9a36b081
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/Makefile
@@ -0,0 +1,12 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_SAFE) += safe.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/hmachack.h b/trunk/target/linux/generic/files/crypto/ocf/safe/hmachack.h
new file mode 100644
index 00000000..598c9585
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/hmachack.h
@@ -0,0 +1,37 @@
+/*
+ * until we find a cleaner way, include the BSD md5/sha1 code
+ * here
+ */
+#ifdef HMAC_HACK
+#define LITTLE_ENDIAN 1234
+#define BIG_ENDIAN 4321
+#ifdef __LITTLE_ENDIAN
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif
+#ifdef __BIG_ENDIAN
+#define BYTE_ORDER BIG_ENDIAN
+#endif
+
+u_int8_t hmac_ipad_buffer[64] = {
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
+    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36
+};
+
+u_int8_t hmac_opad_buffer[64] = {
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
+    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C
+};
+#endif /* HMAC_HACK */
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/md5.c b/trunk/target/linux/generic/files/crypto/ocf/safe/md5.c
new file mode 100644
index 00000000..077c42e7
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/md5.c
@@ -0,0 +1,308 @@
+/*	$KAME: md5.c,v 1.5 2000/11/08 06:13:08 itojun Exp $	*/
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if 0
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/crypto/md5.c,v 1.9 2004/01/27 19:49:19 des Exp $");
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+#include <crypto/md5.h>
+#endif
+
+#define SHIFT(X, s) (((X) << (s)) | ((X) >> (32 - (s))))
+
+#define F(X, Y, Z) (((X) & (Y)) | ((~X) & (Z)))
+#define G(X, Y, Z) (((X) & (Z)) | ((Y) & (~Z)))
+#define H(X, Y, Z) ((X) ^ (Y) ^ (Z))
+#define I(X, Y, Z) ((Y) ^ ((X) | (~Z)))
+
+#define ROUND1(a, b, c, d, k, s, i) { \
+	(a) = (a) + F((b), (c), (d)) + X[(k)] + T[(i)]; \
+	(a) = SHIFT((a), (s)); \
+	(a) = (b) + (a); \
+}
+
+#define ROUND2(a, b, c, d, k, s, i) { \
+	(a) = (a) + G((b), (c), (d)) + X[(k)] + T[(i)]; \
+	(a) = SHIFT((a), (s)); \
+	(a) = (b) + (a); \
+}
+
+#define ROUND3(a, b, c, d, k, s, i) { \
+	(a) = (a) + H((b), (c), (d)) + X[(k)] + T[(i)]; \
+	(a) = SHIFT((a), (s)); \
+	(a) = (b) + (a); \
+}
+
+#define ROUND4(a, b, c, d, k, s, i) { \
+	(a) = (a) + I((b), (c), (d)) + X[(k)] + T[(i)]; \
+	(a) = SHIFT((a), (s)); \
+	(a) = (b) + (a); \
+}
+
+#define Sa	 7
+#define Sb	12
+#define Sc	17
+#define Sd	22
+
+#define Se	 5
+#define Sf	 9
+#define Sg	14
+#define Sh	20
+
+#define Si	 4
+#define Sj	11
+#define Sk	16
+#define Sl	23
+
+#define Sm	 6
+#define Sn	10
+#define So	15
+#define Sp	21
+
+#define MD5_A0	0x67452301
+#define MD5_B0	0xefcdab89
+#define MD5_C0	0x98badcfe
+#define MD5_D0	0x10325476
+
+/* Integer part of 4294967296 times abs(sin(i)), where i is in radians. */
+static const u_int32_t T[65] = {
+	0,
+	0xd76aa478, 	0xe8c7b756,	0x242070db,	0xc1bdceee,
+	0xf57c0faf,	0x4787c62a, 	0xa8304613,	0xfd469501,
+	0x698098d8,	0x8b44f7af,	0xffff5bb1,	0x895cd7be,
+	0x6b901122, 	0xfd987193, 	0xa679438e,	0x49b40821,
+
+	0xf61e2562,	0xc040b340, 	0x265e5a51, 	0xe9b6c7aa,
+	0xd62f105d,	0x2441453,	0xd8a1e681,	0xe7d3fbc8,
+	0x21e1cde6,	0xc33707d6, 	0xf4d50d87, 	0x455a14ed,
+	0xa9e3e905,	0xfcefa3f8, 	0x676f02d9, 	0x8d2a4c8a,
+
+	0xfffa3942,	0x8771f681, 	0x6d9d6122, 	0xfde5380c,
+	0xa4beea44, 	0x4bdecfa9, 	0xf6bb4b60, 	0xbebfbc70,
+	0x289b7ec6, 	0xeaa127fa, 	0xd4ef3085,	0x4881d05,
+	0xd9d4d039, 	0xe6db99e5, 	0x1fa27cf8, 	0xc4ac5665,
+
+	0xf4292244, 	0x432aff97, 	0xab9423a7, 	0xfc93a039,
+	0x655b59c3, 	0x8f0ccc92, 	0xffeff47d, 	0x85845dd1,
+	0x6fa87e4f, 	0xfe2ce6e0, 	0xa3014314, 	0x4e0811a1,
+	0xf7537e82, 	0xbd3af235, 	0x2ad7d2bb, 	0xeb86d391,
+};
+
+static const u_int8_t md5_paddat[MD5_BUFLEN] = {
+	0x80,	0,	0,	0,	0,	0,	0,	0,
+	0,	0,	0,	0,	0,	0,	0,	0,
+	0,	0,	0,	0,	0,	0,	0,	0,
+	0,	0,	0,	0,	0,	0,	0,	0,
+	0,	0,	0,	0,	0,	0,	0,	0,
+	0,	0,	0,	0,	0,	0,	0,	0,
+	0,	0,	0,	0,	0,	0,	0,	0,
+	0,	0,	0,	0,	0,	0,	0,	0,	
+};
+
+static void md5_calc(u_int8_t *, md5_ctxt *);
+
+void md5_init(ctxt)
+	md5_ctxt *ctxt;
+{
+	ctxt->md5_n = 0;
+	ctxt->md5_i = 0;
+	ctxt->md5_sta = MD5_A0;
+	ctxt->md5_stb = MD5_B0;
+	ctxt->md5_stc = MD5_C0;
+	ctxt->md5_std = MD5_D0;
+	bzero(ctxt->md5_buf, sizeof(ctxt->md5_buf));
+}
+
+void md5_loop(ctxt, input, len)
+	md5_ctxt *ctxt;
+	u_int8_t *input;
+	u_int len; /* number of bytes */
+{
+	u_int gap, i;
+
+	ctxt->md5_n += len * 8; /* byte to bit */
+	gap = MD5_BUFLEN - ctxt->md5_i;
+
+	if (len >= gap) {
+		bcopy((void *)input, (void *)(ctxt->md5_buf + ctxt->md5_i),
+			gap);
+		md5_calc(ctxt->md5_buf, ctxt);
+
+		for (i = gap; i + MD5_BUFLEN <= len; i += MD5_BUFLEN) {
+			md5_calc((u_int8_t *)(input + i), ctxt);
+		}
+		
+		ctxt->md5_i = len - i;
+		bcopy((void *)(input + i), (void *)ctxt->md5_buf, ctxt->md5_i);
+	} else {
+		bcopy((void *)input, (void *)(ctxt->md5_buf + ctxt->md5_i),
+			len);
+		ctxt->md5_i += len;
+	}
+}
+
+void md5_pad(ctxt)
+	md5_ctxt *ctxt;
+{
+	u_int gap;
+
+	/* Don't count up padding. Keep md5_n. */	
+	gap = MD5_BUFLEN - ctxt->md5_i;
+	if (gap > 8) {
+		bcopy(md5_paddat,
+		      (void *)(ctxt->md5_buf + ctxt->md5_i),
+		      gap - sizeof(ctxt->md5_n));
+	} else {
+		/* including gap == 8 */
+		bcopy(md5_paddat, (void *)(ctxt->md5_buf + ctxt->md5_i),
+			gap);
+		md5_calc(ctxt->md5_buf, ctxt);
+		bcopy((md5_paddat + gap),
+		      (void *)ctxt->md5_buf,
+		      MD5_BUFLEN - sizeof(ctxt->md5_n));
+	}
+
+	/* 8 byte word */	
+#if BYTE_ORDER == LITTLE_ENDIAN
+	bcopy(&ctxt->md5_n8[0], &ctxt->md5_buf[56], 8);
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+	ctxt->md5_buf[56] = ctxt->md5_n8[7];
+	ctxt->md5_buf[57] = ctxt->md5_n8[6];
+	ctxt->md5_buf[58] = ctxt->md5_n8[5];
+	ctxt->md5_buf[59] = ctxt->md5_n8[4];
+	ctxt->md5_buf[60] = ctxt->md5_n8[3];
+	ctxt->md5_buf[61] = ctxt->md5_n8[2];
+	ctxt->md5_buf[62] = ctxt->md5_n8[1];
+	ctxt->md5_buf[63] = ctxt->md5_n8[0];
+#endif
+
+	md5_calc(ctxt->md5_buf, ctxt);
+}
+
+void md5_result(digest, ctxt)
+	u_int8_t *digest;
+	md5_ctxt *ctxt;
+{
+	/* 4 byte words */
+#if BYTE_ORDER == LITTLE_ENDIAN
+	bcopy(&ctxt->md5_st8[0], digest, 16);
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+	digest[ 0] = ctxt->md5_st8[ 3]; digest[ 1] = ctxt->md5_st8[ 2];
+	digest[ 2] = ctxt->md5_st8[ 1]; digest[ 3] = ctxt->md5_st8[ 0];
+	digest[ 4] = ctxt->md5_st8[ 7]; digest[ 5] = ctxt->md5_st8[ 6];
+	digest[ 6] = ctxt->md5_st8[ 5]; digest[ 7] = ctxt->md5_st8[ 4];
+	digest[ 8] = ctxt->md5_st8[11]; digest[ 9] = ctxt->md5_st8[10];
+	digest[10] = ctxt->md5_st8[ 9]; digest[11] = ctxt->md5_st8[ 8];
+	digest[12] = ctxt->md5_st8[15]; digest[13] = ctxt->md5_st8[14];
+	digest[14] = ctxt->md5_st8[13]; digest[15] = ctxt->md5_st8[12];
+#endif
+}
+
+static void md5_calc(b64, ctxt)
+	u_int8_t *b64;
+	md5_ctxt *ctxt;
+{
+	u_int32_t A = ctxt->md5_sta;
+	u_int32_t B = ctxt->md5_stb;
+	u_int32_t C = ctxt->md5_stc;
+	u_int32_t D = ctxt->md5_std;
+#if BYTE_ORDER == LITTLE_ENDIAN
+	u_int32_t *X = (u_int32_t *)b64;
+#endif	
+#if BYTE_ORDER == BIG_ENDIAN
+	/* 4 byte words */
+	/* what a brute force but fast! */
+	u_int32_t X[16];
+	u_int8_t *y = (u_int8_t *)X;
+	y[ 0] = b64[ 3]; y[ 1] = b64[ 2]; y[ 2] = b64[ 1]; y[ 3] = b64[ 0];
+	y[ 4] = b64[ 7]; y[ 5] = b64[ 6]; y[ 6] = b64[ 5]; y[ 7] = b64[ 4];
+	y[ 8] = b64[11]; y[ 9] = b64[10]; y[10] = b64[ 9]; y[11] = b64[ 8];
+	y[12] = b64[15]; y[13] = b64[14]; y[14] = b64[13]; y[15] = b64[12];
+	y[16] = b64[19]; y[17] = b64[18]; y[18] = b64[17]; y[19] = b64[16];
+	y[20] = b64[23]; y[21] = b64[22]; y[22] = b64[21]; y[23] = b64[20];
+	y[24] = b64[27]; y[25] = b64[26]; y[26] = b64[25]; y[27] = b64[24];
+	y[28] = b64[31]; y[29] = b64[30]; y[30] = b64[29]; y[31] = b64[28];
+	y[32] = b64[35]; y[33] = b64[34]; y[34] = b64[33]; y[35] = b64[32];
+	y[36] = b64[39]; y[37] = b64[38]; y[38] = b64[37]; y[39] = b64[36];
+	y[40] = b64[43]; y[41] = b64[42]; y[42] = b64[41]; y[43] = b64[40];
+	y[44] = b64[47]; y[45] = b64[46]; y[46] = b64[45]; y[47] = b64[44];
+	y[48] = b64[51]; y[49] = b64[50]; y[50] = b64[49]; y[51] = b64[48];
+	y[52] = b64[55]; y[53] = b64[54]; y[54] = b64[53]; y[55] = b64[52];
+	y[56] = b64[59]; y[57] = b64[58]; y[58] = b64[57]; y[59] = b64[56];
+	y[60] = b64[63]; y[61] = b64[62]; y[62] = b64[61]; y[63] = b64[60];
+#endif
+
+	ROUND1(A, B, C, D,  0, Sa,  1); ROUND1(D, A, B, C,  1, Sb,  2);
+	ROUND1(C, D, A, B,  2, Sc,  3); ROUND1(B, C, D, A,  3, Sd,  4);
+	ROUND1(A, B, C, D,  4, Sa,  5); ROUND1(D, A, B, C,  5, Sb,  6);
+	ROUND1(C, D, A, B,  6, Sc,  7); ROUND1(B, C, D, A,  7, Sd,  8);
+	ROUND1(A, B, C, D,  8, Sa,  9); ROUND1(D, A, B, C,  9, Sb, 10);
+	ROUND1(C, D, A, B, 10, Sc, 11); ROUND1(B, C, D, A, 11, Sd, 12);
+	ROUND1(A, B, C, D, 12, Sa, 13); ROUND1(D, A, B, C, 13, Sb, 14);
+	ROUND1(C, D, A, B, 14, Sc, 15); ROUND1(B, C, D, A, 15, Sd, 16);
+	
+	ROUND2(A, B, C, D,  1, Se, 17); ROUND2(D, A, B, C,  6, Sf, 18);
+	ROUND2(C, D, A, B, 11, Sg, 19); ROUND2(B, C, D, A,  0, Sh, 20);
+	ROUND2(A, B, C, D,  5, Se, 21); ROUND2(D, A, B, C, 10, Sf, 22);
+	ROUND2(C, D, A, B, 15, Sg, 23); ROUND2(B, C, D, A,  4, Sh, 24);
+	ROUND2(A, B, C, D,  9, Se, 25); ROUND2(D, A, B, C, 14, Sf, 26);
+	ROUND2(C, D, A, B,  3, Sg, 27); ROUND2(B, C, D, A,  8, Sh, 28);
+	ROUND2(A, B, C, D, 13, Se, 29); ROUND2(D, A, B, C,  2, Sf, 30);
+	ROUND2(C, D, A, B,  7, Sg, 31); ROUND2(B, C, D, A, 12, Sh, 32);
+
+	ROUND3(A, B, C, D,  5, Si, 33); ROUND3(D, A, B, C,  8, Sj, 34);
+	ROUND3(C, D, A, B, 11, Sk, 35); ROUND3(B, C, D, A, 14, Sl, 36);
+	ROUND3(A, B, C, D,  1, Si, 37); ROUND3(D, A, B, C,  4, Sj, 38);
+	ROUND3(C, D, A, B,  7, Sk, 39); ROUND3(B, C, D, A, 10, Sl, 40);
+	ROUND3(A, B, C, D, 13, Si, 41); ROUND3(D, A, B, C,  0, Sj, 42);
+	ROUND3(C, D, A, B,  3, Sk, 43); ROUND3(B, C, D, A,  6, Sl, 44);
+	ROUND3(A, B, C, D,  9, Si, 45); ROUND3(D, A, B, C, 12, Sj, 46);
+	ROUND3(C, D, A, B, 15, Sk, 47); ROUND3(B, C, D, A,  2, Sl, 48);
+	
+	ROUND4(A, B, C, D,  0, Sm, 49); ROUND4(D, A, B, C,  7, Sn, 50);	
+	ROUND4(C, D, A, B, 14, So, 51); ROUND4(B, C, D, A,  5, Sp, 52);	
+	ROUND4(A, B, C, D, 12, Sm, 53); ROUND4(D, A, B, C,  3, Sn, 54);	
+	ROUND4(C, D, A, B, 10, So, 55); ROUND4(B, C, D, A,  1, Sp, 56);	
+	ROUND4(A, B, C, D,  8, Sm, 57); ROUND4(D, A, B, C, 15, Sn, 58);	
+	ROUND4(C, D, A, B,  6, So, 59); ROUND4(B, C, D, A, 13, Sp, 60);	
+	ROUND4(A, B, C, D,  4, Sm, 61); ROUND4(D, A, B, C, 11, Sn, 62);	
+	ROUND4(C, D, A, B,  2, So, 63); ROUND4(B, C, D, A,  9, Sp, 64);
+
+	ctxt->md5_sta += A;
+	ctxt->md5_stb += B;
+	ctxt->md5_stc += C;
+	ctxt->md5_std += D;
+}
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/md5.h b/trunk/target/linux/generic/files/crypto/ocf/safe/md5.h
new file mode 100644
index 00000000..690f5bfc
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/md5.h
@@ -0,0 +1,76 @@
+/*	$FreeBSD: src/sys/crypto/md5.h,v 1.4 2002/03/20 05:13:50 alfred Exp $	*/
+/*	$KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _NETINET6_MD5_H_
+#define _NETINET6_MD5_H_
+
+#define MD5_BUFLEN	64
+
+typedef struct {
+	union {
+		u_int32_t	md5_state32[4];
+		u_int8_t	md5_state8[16];
+	} md5_st;
+
+#define md5_sta		md5_st.md5_state32[0]
+#define md5_stb		md5_st.md5_state32[1]
+#define md5_stc		md5_st.md5_state32[2]
+#define md5_std		md5_st.md5_state32[3]
+#define md5_st8		md5_st.md5_state8
+
+	union {
+		u_int64_t	md5_count64;
+		u_int8_t	md5_count8[8];
+	} md5_count;
+#define md5_n	md5_count.md5_count64
+#define md5_n8	md5_count.md5_count8
+
+	u_int	md5_i;
+	u_int8_t	md5_buf[MD5_BUFLEN];
+} md5_ctxt;
+
+extern void md5_init(md5_ctxt *);
+extern void md5_loop(md5_ctxt *, u_int8_t *, u_int);
+extern void md5_pad(md5_ctxt *);
+extern void md5_result(u_int8_t *, md5_ctxt *);
+
+/* compatibility */
+#define MD5_CTX		md5_ctxt
+#define MD5Init(x)	md5_init((x))
+#define MD5Update(x, y, z)	md5_loop((x), (y), (z))
+#define MD5Final(x, y) \
+do {				\
+	md5_pad((y));		\
+	md5_result((x), (y));	\
+} while (0)
+
+#endif /* ! _NETINET6_MD5_H_*/
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/safe.c b/trunk/target/linux/generic/files/crypto/ocf/safe/safe.c
new file mode 100644
index 00000000..f4daa5ff
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/safe.c
@@ -0,0 +1,2230 @@
+/*-
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2004-2010 David McCullough
+ * The license and original author are listed below.
+ *
+ * Copyright (c) 2003 Sam Leffler, Errno Consulting
+ * Copyright (c) 2003 Global Technology Associates, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $");
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <asm/io.h>
+
+/*
+ * SafeNet SafeXcel-1141 hardware crypto accelerator
+ */
+
+#include <cryptodev.h>
+#include <uio.h>
+#include <safe/safereg.h>
+#include <safe/safevar.h>
+
+#if 1
+#define	DPRINTF(a)	do { \
+						if (debug) { \
+							printk("%s: ", sc ? \
+								device_get_nameunit(sc->sc_dev) : "safe"); \
+							printk a; \
+						} \
+					} while (0)
+#else
+#define	DPRINTF(a)
+#endif
+
+/*
+ * until we find a cleaner way, include the BSD md5/sha1 code
+ * here
+ */
+#define HMAC_HACK 1
+#ifdef HMAC_HACK
+#include <safe/hmachack.h>
+#include <safe/md5.h>
+#include <safe/md5.c>
+#include <safe/sha1.h>
+#include <safe/sha1.c>
+#endif /* HMAC_HACK */
+
+/* add proc entry for this */
+struct safe_stats safestats;
+
+#define debug safe_debug
+int safe_debug = 0;
+module_param(safe_debug, int, 0644);
+MODULE_PARM_DESC(safe_debug, "Enable debug");
+
+static	void safe_callback(struct safe_softc *, struct safe_ringentry *);
+static	void safe_feed(struct safe_softc *, struct safe_ringentry *);
+#if defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG)
+static	void safe_rng_init(struct safe_softc *);
+int safe_rngbufsize = 8;		/* 32 bytes each read  */
+module_param(safe_rngbufsize, int, 0644);
+MODULE_PARM_DESC(safe_rngbufsize, "RNG polling buffer size (32-bit words)");
+int safe_rngmaxalarm = 8;		/* max alarms before reset */
+module_param(safe_rngmaxalarm, int, 0644);
+MODULE_PARM_DESC(safe_rngmaxalarm, "RNG max alarms before reset");
+#endif /* SAFE_NO_RNG */
+
+static void safe_totalreset(struct safe_softc *sc);
+static int safe_dmamap_aligned(struct safe_softc *sc, const struct safe_operand *op);
+static int safe_dmamap_uniform(struct safe_softc *sc, const struct safe_operand *op);
+static int safe_free_entry(struct safe_softc *sc, struct safe_ringentry *re);
+static int safe_kprocess(device_t dev, struct cryptkop *krp, int hint);
+static int safe_kstart(struct safe_softc *sc);
+static int safe_ksigbits(struct safe_softc *sc, struct crparam *cr);
+static void safe_kfeed(struct safe_softc *sc);
+static void safe_kpoll(unsigned long arg);
+static void safe_kload_reg(struct safe_softc *sc, u_int32_t off,
+								u_int32_t len, struct crparam *n);
+
+static	int safe_newsession(device_t, u_int32_t *, struct cryptoini *);
+static	int safe_freesession(device_t, u_int64_t);
+static	int safe_process(device_t, struct cryptop *, int);
+
+static device_method_t safe_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	safe_newsession),
+	DEVMETHOD(cryptodev_freesession,safe_freesession),
+	DEVMETHOD(cryptodev_process,	safe_process),
+	DEVMETHOD(cryptodev_kprocess,	safe_kprocess),
+};
+
+#define	READ_REG(sc,r)			readl((sc)->sc_base_addr + (r))
+#define WRITE_REG(sc,r,val)		writel((val), (sc)->sc_base_addr + (r))
+
+#define SAFE_MAX_CHIPS 8
+static struct safe_softc *safe_chip_idx[SAFE_MAX_CHIPS];
+
+/*
+ * split our buffers up into safe DMAable byte fragments to avoid lockup
+ * bug in 1141 HW on rev 1.0.
+ */
+
+static int
+pci_map_linear(
+	struct safe_softc *sc,
+	struct safe_operand *buf,
+	void *addr,
+	int len)
+{
+	dma_addr_t tmp;
+	int chunk, tlen = len;
+
+	tmp = pci_map_single(sc->sc_pcidev, addr, len, PCI_DMA_BIDIRECTIONAL);
+
+	buf->mapsize += len;
+	while (len > 0) {
+		chunk = (len > sc->sc_max_dsize) ? sc->sc_max_dsize : len;
+		buf->segs[buf->nsegs].ds_addr = tmp;
+		buf->segs[buf->nsegs].ds_len  = chunk;
+		buf->segs[buf->nsegs].ds_tlen = tlen;
+		buf->nsegs++;
+		tmp  += chunk;
+		len  -= chunk;
+		tlen = 0;
+	}
+	return 0;
+}
+
+/*
+ * map in a given uio buffer (great on some arches :-)
+ */
+
+static int
+pci_map_uio(struct safe_softc *sc, struct safe_operand *buf, struct uio *uio)
+{
+	struct iovec *iov = uio->uio_iov;
+	int n;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	buf->mapsize = 0;
+	buf->nsegs = 0;
+
+	for (n = 0; n < uio->uio_iovcnt; n++) {
+		pci_map_linear(sc, buf, iov->iov_base, iov->iov_len);
+		iov++;
+	}
+
+	/* identify this buffer by the first segment */
+	buf->map = (void *) buf->segs[0].ds_addr;
+	return(0);
+}
+
+/*
+ * map in a given sk_buff
+ */
+
+static int
+pci_map_skb(struct safe_softc *sc,struct safe_operand *buf,struct sk_buff *skb)
+{
+	int i;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	buf->mapsize = 0;
+	buf->nsegs = 0;
+
+	pci_map_linear(sc, buf, skb->data, skb_headlen(skb));
+
+	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+		pci_map_linear(sc, buf,
+				page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
+				                        skb_shinfo(skb)->frags[i].page_offset,
+				skb_shinfo(skb)->frags[i].size);
+	}
+
+	/* identify this buffer by the first segment */
+	buf->map = (void *) buf->segs[0].ds_addr;
+	return(0);
+}
+
+
+#if 0 /* not needed at this time */
+static void
+pci_sync_operand(struct safe_softc *sc, struct safe_operand *buf)
+{
+	int i;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+	for (i = 0; i < buf->nsegs; i++)
+		pci_dma_sync_single_for_cpu(sc->sc_pcidev, buf->segs[i].ds_addr,
+				buf->segs[i].ds_len, PCI_DMA_BIDIRECTIONAL);
+}
+#endif
+
+static void
+pci_unmap_operand(struct safe_softc *sc, struct safe_operand *buf)
+{
+	int i;
+	DPRINTF(("%s()\n", __FUNCTION__));
+	for (i = 0; i < buf->nsegs; i++) {
+		if (buf->segs[i].ds_tlen) {
+			DPRINTF(("%s - unmap %d 0x%x %d\n", __FUNCTION__, i, buf->segs[i].ds_addr, buf->segs[i].ds_tlen));
+			pci_unmap_single(sc->sc_pcidev, buf->segs[i].ds_addr,
+					buf->segs[i].ds_tlen, PCI_DMA_BIDIRECTIONAL);
+			DPRINTF(("%s - unmap %d 0x%x %d done\n", __FUNCTION__, i, buf->segs[i].ds_addr, buf->segs[i].ds_tlen));
+		}
+		buf->segs[i].ds_addr = 0;
+		buf->segs[i].ds_len = 0;
+		buf->segs[i].ds_tlen = 0;
+	}
+	buf->nsegs = 0;
+	buf->mapsize = 0;
+	buf->map = 0;
+}
+
+
+/*
+ * SafeXcel Interrupt routine
+ */
+static irqreturn_t
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+safe_intr(int irq, void *arg)
+#else
+safe_intr(int irq, void *arg, struct pt_regs *regs)
+#endif
+{
+	struct safe_softc *sc = arg;
+	int stat;
+	unsigned long flags;
+
+	stat = READ_REG(sc, SAFE_HM_STAT);
+
+	DPRINTF(("%s(stat=0x%x)\n", __FUNCTION__, stat));
+
+	if (stat == 0)		/* shared irq, not for us */
+		return IRQ_NONE;
+
+	WRITE_REG(sc, SAFE_HI_CLR, stat);	/* IACK */
+
+	if ((stat & SAFE_INT_PE_DDONE)) {
+		/*
+		 * Descriptor(s) done; scan the ring and
+		 * process completed operations.
+		 */
+		spin_lock_irqsave(&sc->sc_ringmtx, flags);
+		while (sc->sc_back != sc->sc_front) {
+			struct safe_ringentry *re = sc->sc_back;
+
+#ifdef SAFE_DEBUG
+			if (debug) {
+				safe_dump_ringstate(sc, __func__);
+				safe_dump_request(sc, __func__, re);
+			}
+#endif
+			/*
+			 * safe_process marks ring entries that were allocated
+			 * but not used with a csr of zero.  This insures the
+			 * ring front pointer never needs to be set backwards
+			 * in the event that an entry is allocated but not used
+			 * because of a setup error.
+			 */
+			DPRINTF(("%s re->re_desc.d_csr=0x%x\n", __FUNCTION__, re->re_desc.d_csr));
+			if (re->re_desc.d_csr != 0) {
+				if (!SAFE_PE_CSR_IS_DONE(re->re_desc.d_csr)) {
+					DPRINTF(("%s !CSR_IS_DONE\n", __FUNCTION__));
+					break;
+				}
+				if (!SAFE_PE_LEN_IS_DONE(re->re_desc.d_len)) {
+					DPRINTF(("%s !LEN_IS_DONE\n", __FUNCTION__));
+					break;
+				}
+				sc->sc_nqchip--;
+				safe_callback(sc, re);
+			}
+			if (++(sc->sc_back) == sc->sc_ringtop)
+				sc->sc_back = sc->sc_ring;
+		}
+		spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+	}
+
+	/*
+	 * Check to see if we got any DMA Error
+	 */
+	if (stat & SAFE_INT_PE_ERROR) {
+		printk("%s: dmaerr dmastat %08x\n", device_get_nameunit(sc->sc_dev),
+				(int)READ_REG(sc, SAFE_PE_DMASTAT));
+		safestats.st_dmaerr++;
+		safe_totalreset(sc);
+#if 0
+		safe_feed(sc);
+#endif
+	}
+
+	if (sc->sc_needwakeup) {		/* XXX check high watermark */
+		int wakeup = sc->sc_needwakeup & (CRYPTO_SYMQ|CRYPTO_ASYMQ);
+		DPRINTF(("%s: wakeup crypto %x\n", __func__,
+			sc->sc_needwakeup));
+		sc->sc_needwakeup &= ~wakeup;
+		crypto_unblock(sc->sc_cid, wakeup);
+	}
+	
+	return IRQ_HANDLED;
+}
+
+/*
+ * safe_feed() - post a request to chip
+ */
+static void
+safe_feed(struct safe_softc *sc, struct safe_ringentry *re)
+{
+	DPRINTF(("%s()\n", __FUNCTION__));
+#ifdef SAFE_DEBUG
+	if (debug) {
+		safe_dump_ringstate(sc, __func__);
+		safe_dump_request(sc, __func__, re);
+	}
+#endif
+	sc->sc_nqchip++;
+	if (sc->sc_nqchip > safestats.st_maxqchip)
+		safestats.st_maxqchip = sc->sc_nqchip;
+	/* poke h/w to check descriptor ring, any value can be written */
+	WRITE_REG(sc, SAFE_HI_RD_DESCR, 0);
+}
+
+#define	N(a)	(sizeof(a) / sizeof (a[0]))
+static void
+safe_setup_enckey(struct safe_session *ses, caddr_t key)
+{
+	int i;
+
+	bcopy(key, ses->ses_key, ses->ses_klen / 8);
+
+	/* PE is little-endian, insure proper byte order */
+	for (i = 0; i < N(ses->ses_key); i++)
+		ses->ses_key[i] = htole32(ses->ses_key[i]);
+}
+
+static void
+safe_setup_mackey(struct safe_session *ses, int algo, caddr_t key, int klen)
+{
+#ifdef HMAC_HACK
+	MD5_CTX md5ctx;
+	SHA1_CTX sha1ctx;
+	int i;
+
+
+	for (i = 0; i < klen; i++)
+		key[i] ^= HMAC_IPAD_VAL;
+
+	if (algo == CRYPTO_MD5_HMAC) {
+		MD5Init(&md5ctx);
+		MD5Update(&md5ctx, key, klen);
+		MD5Update(&md5ctx, hmac_ipad_buffer, MD5_HMAC_BLOCK_LEN - klen);
+		bcopy(md5ctx.md5_st8, ses->ses_hminner, sizeof(md5ctx.md5_st8));
+	} else {
+		SHA1Init(&sha1ctx);
+		SHA1Update(&sha1ctx, key, klen);
+		SHA1Update(&sha1ctx, hmac_ipad_buffer,
+		    SHA1_HMAC_BLOCK_LEN - klen);
+		bcopy(sha1ctx.h.b32, ses->ses_hminner, sizeof(sha1ctx.h.b32));
+	}
+
+	for (i = 0; i < klen; i++)
+		key[i] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL);
+
+	if (algo == CRYPTO_MD5_HMAC) {
+		MD5Init(&md5ctx);
+		MD5Update(&md5ctx, key, klen);
+		MD5Update(&md5ctx, hmac_opad_buffer, MD5_HMAC_BLOCK_LEN - klen);
+		bcopy(md5ctx.md5_st8, ses->ses_hmouter, sizeof(md5ctx.md5_st8));
+	} else {
+		SHA1Init(&sha1ctx);
+		SHA1Update(&sha1ctx, key, klen);
+		SHA1Update(&sha1ctx, hmac_opad_buffer,
+		    SHA1_HMAC_BLOCK_LEN - klen);
+		bcopy(sha1ctx.h.b32, ses->ses_hmouter, sizeof(sha1ctx.h.b32));
+	}
+
+	for (i = 0; i < klen; i++)
+		key[i] ^= HMAC_OPAD_VAL;
+
+#if 0
+	/*
+	 * this code prevents SHA working on a BE host,
+	 * so it is obviously wrong.  I think the byte
+	 * swap setup we do with the chip fixes this for us
+	 */
+
+	/* PE is little-endian, insure proper byte order */
+	for (i = 0; i < N(ses->ses_hminner); i++) {
+		ses->ses_hminner[i] = htole32(ses->ses_hminner[i]);
+		ses->ses_hmouter[i] = htole32(ses->ses_hmouter[i]);
+	}
+#endif
+#else /* HMAC_HACK */
+	printk("safe: md5/sha not implemented\n");
+#endif /* HMAC_HACK */
+}
+#undef N
+
+/*
+ * Allocate a new 'session' and return an encoded session id.  'sidp'
+ * contains our registration id, and should contain an encoded session
+ * id on successful allocation.
+ */
+static int
+safe_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
+{
+	struct safe_softc *sc = device_get_softc(dev);
+	struct cryptoini *c, *encini = NULL, *macini = NULL;
+	struct safe_session *ses = NULL;
+	int sesn;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (sidp == NULL || cri == NULL || sc == NULL)
+		return (EINVAL);
+
+	for (c = cri; c != NULL; c = c->cri_next) {
+		if (c->cri_alg == CRYPTO_MD5_HMAC ||
+		    c->cri_alg == CRYPTO_SHA1_HMAC ||
+		    c->cri_alg == CRYPTO_NULL_HMAC) {
+			if (macini)
+				return (EINVAL);
+			macini = c;
+		} else if (c->cri_alg == CRYPTO_DES_CBC ||
+		    c->cri_alg == CRYPTO_3DES_CBC ||
+		    c->cri_alg == CRYPTO_AES_CBC ||
+		    c->cri_alg == CRYPTO_NULL_CBC) {
+			if (encini)
+				return (EINVAL);
+			encini = c;
+		} else
+			return (EINVAL);
+	}
+	if (encini == NULL && macini == NULL)
+		return (EINVAL);
+	if (encini) {			/* validate key length */
+		switch (encini->cri_alg) {
+		case CRYPTO_DES_CBC:
+			if (encini->cri_klen != 64)
+				return (EINVAL);
+			break;
+		case CRYPTO_3DES_CBC:
+			if (encini->cri_klen != 192)
+				return (EINVAL);
+			break;
+		case CRYPTO_AES_CBC:
+			if (encini->cri_klen != 128 &&
+			    encini->cri_klen != 192 &&
+			    encini->cri_klen != 256)
+				return (EINVAL);
+			break;
+		}
+	}
+
+	if (sc->sc_sessions == NULL) {
+		ses = sc->sc_sessions = (struct safe_session *)
+			kmalloc(sizeof(struct safe_session), SLAB_ATOMIC);
+		if (ses == NULL)
+			return (ENOMEM);
+		memset(ses, 0, sizeof(struct safe_session));
+		sesn = 0;
+		sc->sc_nsessions = 1;
+	} else {
+		for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
+			if (sc->sc_sessions[sesn].ses_used == 0) {
+				ses = &sc->sc_sessions[sesn];
+				break;
+			}
+		}
+
+		if (ses == NULL) {
+			sesn = sc->sc_nsessions;
+			ses = (struct safe_session *)
+				kmalloc((sesn + 1) * sizeof(struct safe_session), SLAB_ATOMIC);
+			if (ses == NULL)
+				return (ENOMEM);
+			memset(ses, 0, (sesn + 1) * sizeof(struct safe_session));
+			bcopy(sc->sc_sessions, ses, sesn *
+			    sizeof(struct safe_session));
+			bzero(sc->sc_sessions, sesn *
+			    sizeof(struct safe_session));
+			kfree(sc->sc_sessions);
+			sc->sc_sessions = ses;
+			ses = &sc->sc_sessions[sesn];
+			sc->sc_nsessions++;
+		}
+	}
+
+	bzero(ses, sizeof(struct safe_session));
+	ses->ses_used = 1;
+
+	if (encini) {
+		ses->ses_klen = encini->cri_klen;
+		if (encini->cri_key != NULL)
+			safe_setup_enckey(ses, encini->cri_key);
+	}
+
+	if (macini) {
+		ses->ses_mlen = macini->cri_mlen;
+		if (ses->ses_mlen == 0) {
+			if (macini->cri_alg == CRYPTO_MD5_HMAC)
+				ses->ses_mlen = MD5_HASH_LEN;
+			else
+				ses->ses_mlen = SHA1_HASH_LEN;
+		}
+
+		if (macini->cri_key != NULL) {
+			safe_setup_mackey(ses, macini->cri_alg, macini->cri_key,
+			    macini->cri_klen / 8);
+		}
+	}
+
+	*sidp = SAFE_SID(device_get_unit(sc->sc_dev), sesn);
+	return (0);
+}
+
+/*
+ * Deallocate a session.
+ */
+static int
+safe_freesession(device_t dev, u_int64_t tid)
+{
+	struct safe_softc *sc = device_get_softc(dev);
+	int session, ret;
+	u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (sc == NULL)
+		return (EINVAL);
+
+	session = SAFE_SESSION(sid);
+	if (session < sc->sc_nsessions) {
+		bzero(&sc->sc_sessions[session], sizeof(sc->sc_sessions[session]));
+		ret = 0;
+	} else
+		ret = EINVAL;
+	return (ret);
+}
+
+
+static int
+safe_process(device_t dev, struct cryptop *crp, int hint)
+{
+	struct safe_softc *sc = device_get_softc(dev);
+	int err = 0, i, nicealign, uniform;
+	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
+	int bypass, oplen, ivsize;
+	caddr_t iv;
+	int16_t coffset;
+	struct safe_session *ses;
+	struct safe_ringentry *re;
+	struct safe_sarec *sa;
+	struct safe_pdesc *pd;
+	u_int32_t cmd0, cmd1, staterec, rand_iv[4];
+	unsigned long flags;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (crp == NULL || crp->crp_callback == NULL || sc == NULL) {
+		safestats.st_invalid++;
+		return (EINVAL);
+	}
+	if (SAFE_SESSION(crp->crp_sid) >= sc->sc_nsessions) {
+		safestats.st_badsession++;
+		return (EINVAL);
+	}
+
+	spin_lock_irqsave(&sc->sc_ringmtx, flags);
+	if (sc->sc_front == sc->sc_back && sc->sc_nqchip != 0) {
+		safestats.st_ringfull++;
+		sc->sc_needwakeup |= CRYPTO_SYMQ;
+		spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+		return (ERESTART);
+	}
+	re = sc->sc_front;
+
+	staterec = re->re_sa.sa_staterec;	/* save */
+	/* NB: zero everything but the PE descriptor */
+	bzero(&re->re_sa, sizeof(struct safe_ringentry) - sizeof(re->re_desc));
+	re->re_sa.sa_staterec = staterec;	/* restore */
+
+	re->re_crp = crp;
+	re->re_sesn = SAFE_SESSION(crp->crp_sid);
+
+	re->re_src.nsegs = 0;
+	re->re_dst.nsegs = 0;
+
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		re->re_src_skb = (struct sk_buff *)crp->crp_buf;
+		re->re_dst_skb = (struct sk_buff *)crp->crp_buf;
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		re->re_src_io = (struct uio *)crp->crp_buf;
+		re->re_dst_io = (struct uio *)crp->crp_buf;
+	} else {
+		safestats.st_badflags++;
+		err = EINVAL;
+		goto errout;	/* XXX we don't handle contiguous blocks! */
+	}
+
+	sa = &re->re_sa;
+	ses = &sc->sc_sessions[re->re_sesn];
+
+	crd1 = crp->crp_desc;
+	if (crd1 == NULL) {
+		safestats.st_nodesc++;
+		err = EINVAL;
+		goto errout;
+	}
+	crd2 = crd1->crd_next;
+
+	cmd0 = SAFE_SA_CMD0_BASIC;		/* basic group operation */
+	cmd1 = 0;
+	if (crd2 == NULL) {
+		if (crd1->crd_alg == CRYPTO_MD5_HMAC ||
+		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
+		    crd1->crd_alg == CRYPTO_NULL_HMAC) {
+			maccrd = crd1;
+			enccrd = NULL;
+			cmd0 |= SAFE_SA_CMD0_OP_HASH;
+		} else if (crd1->crd_alg == CRYPTO_DES_CBC ||
+		    crd1->crd_alg == CRYPTO_3DES_CBC ||
+		    crd1->crd_alg == CRYPTO_AES_CBC ||
+		    crd1->crd_alg == CRYPTO_NULL_CBC) {
+			maccrd = NULL;
+			enccrd = crd1;
+			cmd0 |= SAFE_SA_CMD0_OP_CRYPT;
+		} else {
+			safestats.st_badalg++;
+			err = EINVAL;
+			goto errout;
+		}
+	} else {
+		if ((crd1->crd_alg == CRYPTO_MD5_HMAC ||
+		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
+		    crd1->crd_alg == CRYPTO_NULL_HMAC) &&
+		    (crd2->crd_alg == CRYPTO_DES_CBC ||
+			crd2->crd_alg == CRYPTO_3DES_CBC ||
+		        crd2->crd_alg == CRYPTO_AES_CBC ||
+		        crd2->crd_alg == CRYPTO_NULL_CBC) &&
+		    ((crd2->crd_flags & CRD_F_ENCRYPT) == 0)) {
+			maccrd = crd1;
+			enccrd = crd2;
+		} else if ((crd1->crd_alg == CRYPTO_DES_CBC ||
+		    crd1->crd_alg == CRYPTO_3DES_CBC ||
+		    crd1->crd_alg == CRYPTO_AES_CBC ||
+		    crd1->crd_alg == CRYPTO_NULL_CBC) &&
+		    (crd2->crd_alg == CRYPTO_MD5_HMAC ||
+			crd2->crd_alg == CRYPTO_SHA1_HMAC ||
+			crd2->crd_alg == CRYPTO_NULL_HMAC) &&
+		    (crd1->crd_flags & CRD_F_ENCRYPT)) {
+			enccrd = crd1;
+			maccrd = crd2;
+		} else {
+			safestats.st_badalg++;
+			err = EINVAL;
+			goto errout;
+		}
+		cmd0 |= SAFE_SA_CMD0_OP_BOTH;
+	}
+
+	if (enccrd) {
+		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT)
+			safe_setup_enckey(ses, enccrd->crd_key);
+
+		if (enccrd->crd_alg == CRYPTO_DES_CBC) {
+			cmd0 |= SAFE_SA_CMD0_DES;
+			cmd1 |= SAFE_SA_CMD1_CBC;
+			ivsize = 2*sizeof(u_int32_t);
+		} else if (enccrd->crd_alg == CRYPTO_3DES_CBC) {
+			cmd0 |= SAFE_SA_CMD0_3DES;
+			cmd1 |= SAFE_SA_CMD1_CBC;
+			ivsize = 2*sizeof(u_int32_t);
+		} else if (enccrd->crd_alg == CRYPTO_AES_CBC) {
+			cmd0 |= SAFE_SA_CMD0_AES;
+			cmd1 |= SAFE_SA_CMD1_CBC;
+			if (ses->ses_klen == 128)
+			     cmd1 |=  SAFE_SA_CMD1_AES128;
+			else if (ses->ses_klen == 192)
+			     cmd1 |=  SAFE_SA_CMD1_AES192;
+			else
+			     cmd1 |=  SAFE_SA_CMD1_AES256;
+			ivsize = 4*sizeof(u_int32_t);
+		} else {
+			cmd0 |= SAFE_SA_CMD0_CRYPT_NULL;
+			ivsize = 0;
+		}
+
+		/*
+		 * Setup encrypt/decrypt state.  When using basic ops
+		 * we can't use an inline IV because hash/crypt offset
+		 * must be from the end of the IV to the start of the
+		 * crypt data and this leaves out the preceding header
+		 * from the hash calculation.  Instead we place the IV
+		 * in the state record and set the hash/crypt offset to
+		 * copy both the header+IV.
+		 */
+		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
+			cmd0 |= SAFE_SA_CMD0_OUTBOUND;
+
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+				iv = enccrd->crd_iv;
+			else
+				read_random((iv = (caddr_t) &rand_iv[0]), sizeof(rand_iv));
+			if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+				crypto_copyback(crp->crp_flags, crp->crp_buf,
+				    enccrd->crd_inject, ivsize, iv);
+			}
+			bcopy(iv, re->re_sastate.sa_saved_iv, ivsize);
+			/* make iv LE */
+			for (i = 0; i < ivsize/sizeof(re->re_sastate.sa_saved_iv[0]); i++)
+				re->re_sastate.sa_saved_iv[i] =
+					cpu_to_le32(re->re_sastate.sa_saved_iv[i]);
+			cmd0 |= SAFE_SA_CMD0_IVLD_STATE | SAFE_SA_CMD0_SAVEIV;
+			re->re_flags |= SAFE_QFLAGS_COPYOUTIV;
+		} else {
+			cmd0 |= SAFE_SA_CMD0_INBOUND;
+
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
+				bcopy(enccrd->crd_iv,
+					re->re_sastate.sa_saved_iv, ivsize);
+			} else {
+				crypto_copydata(crp->crp_flags, crp->crp_buf,
+				    enccrd->crd_inject, ivsize,
+				    (caddr_t)re->re_sastate.sa_saved_iv);
+			}
+			/* make iv LE */
+			for (i = 0; i < ivsize/sizeof(re->re_sastate.sa_saved_iv[0]); i++)
+				re->re_sastate.sa_saved_iv[i] =
+					cpu_to_le32(re->re_sastate.sa_saved_iv[i]);
+			cmd0 |= SAFE_SA_CMD0_IVLD_STATE;
+		}
+		/*
+		 * For basic encryption use the zero pad algorithm.
+		 * This pads results to an 8-byte boundary and
+		 * suppresses padding verification for inbound (i.e.
+		 * decrypt) operations.
+		 *
+		 * NB: Not sure if the 8-byte pad boundary is a problem.
+		 */
+		cmd0 |= SAFE_SA_CMD0_PAD_ZERO;
+
+		/* XXX assert key bufs have the same size */
+		bcopy(ses->ses_key, sa->sa_key, sizeof(sa->sa_key));
+	}
+
+	if (maccrd) {
+		if (maccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
+			safe_setup_mackey(ses, maccrd->crd_alg,
+			    maccrd->crd_key, maccrd->crd_klen / 8);
+		}
+
+		if (maccrd->crd_alg == CRYPTO_MD5_HMAC) {
+			cmd0 |= SAFE_SA_CMD0_MD5;
+			cmd1 |= SAFE_SA_CMD1_HMAC;	/* NB: enable HMAC */
+		} else if (maccrd->crd_alg == CRYPTO_SHA1_HMAC) {
+			cmd0 |= SAFE_SA_CMD0_SHA1;
+			cmd1 |= SAFE_SA_CMD1_HMAC;	/* NB: enable HMAC */
+		} else {
+			cmd0 |= SAFE_SA_CMD0_HASH_NULL;
+		}
+		/*
+		 * Digest data is loaded from the SA and the hash
+		 * result is saved to the state block where we
+		 * retrieve it for return to the caller.
+		 */
+		/* XXX assert digest bufs have the same size */
+		bcopy(ses->ses_hminner, sa->sa_indigest,
+			sizeof(sa->sa_indigest));
+		bcopy(ses->ses_hmouter, sa->sa_outdigest,
+			sizeof(sa->sa_outdigest));
+
+		cmd0 |= SAFE_SA_CMD0_HSLD_SA | SAFE_SA_CMD0_SAVEHASH;
+		re->re_flags |= SAFE_QFLAGS_COPYOUTICV;
+	}
+
+	if (enccrd && maccrd) {
+		/*
+		 * The offset from hash data to the start of
+		 * crypt data is the difference in the skips.
+		 */
+		bypass = maccrd->crd_skip;
+		coffset = enccrd->crd_skip - maccrd->crd_skip;
+		if (coffset < 0) {
+			DPRINTF(("%s: hash does not precede crypt; "
+				"mac skip %u enc skip %u\n",
+				__func__, maccrd->crd_skip, enccrd->crd_skip));
+			safestats.st_skipmismatch++;
+			err = EINVAL;
+			goto errout;
+		}
+		oplen = enccrd->crd_skip + enccrd->crd_len;
+		if (maccrd->crd_skip + maccrd->crd_len != oplen) {
+			DPRINTF(("%s: hash amount %u != crypt amount %u\n",
+				__func__, maccrd->crd_skip + maccrd->crd_len,
+				oplen));
+			safestats.st_lenmismatch++;
+			err = EINVAL;
+			goto errout;
+		}
+#ifdef SAFE_DEBUG
+		if (debug) {
+			printf("mac: skip %d, len %d, inject %d\n",
+			    maccrd->crd_skip, maccrd->crd_len,
+			    maccrd->crd_inject);
+			printf("enc: skip %d, len %d, inject %d\n",
+			    enccrd->crd_skip, enccrd->crd_len,
+			    enccrd->crd_inject);
+			printf("bypass %d coffset %d oplen %d\n",
+				bypass, coffset, oplen);
+		}
+#endif
+		if (coffset & 3) {	/* offset must be 32-bit aligned */
+			DPRINTF(("%s: coffset %u misaligned\n",
+				__func__, coffset));
+			safestats.st_coffmisaligned++;
+			err = EINVAL;
+			goto errout;
+		}
+		coffset >>= 2;
+		if (coffset > 255) {	/* offset must be <256 dwords */
+			DPRINTF(("%s: coffset %u too big\n",
+				__func__, coffset));
+			safestats.st_cofftoobig++;
+			err = EINVAL;
+			goto errout;
+		}
+		/*
+		 * Tell the hardware to copy the header to the output.
+		 * The header is defined as the data from the end of
+		 * the bypass to the start of data to be encrypted. 
+		 * Typically this is the inline IV.  Note that you need
+		 * to do this even if src+dst are the same; it appears
+		 * that w/o this bit the crypted data is written
+		 * immediately after the bypass data.
+		 */
+		cmd1 |= SAFE_SA_CMD1_HDRCOPY;
+		/*
+		 * Disable IP header mutable bit handling.  This is
+		 * needed to get correct HMAC calculations.
+		 */
+		cmd1 |= SAFE_SA_CMD1_MUTABLE;
+	} else {
+		if (enccrd) {
+			bypass = enccrd->crd_skip;
+			oplen = bypass + enccrd->crd_len;
+		} else {
+			bypass = maccrd->crd_skip;
+			oplen = bypass + maccrd->crd_len;
+		}
+		coffset = 0;
+	}
+	/* XXX verify multiple of 4 when using s/g */
+	if (bypass > 96) {		/* bypass offset must be <= 96 bytes */
+		DPRINTF(("%s: bypass %u too big\n", __func__, bypass));
+		safestats.st_bypasstoobig++;
+		err = EINVAL;
+		goto errout;
+	}
+
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		if (pci_map_skb(sc, &re->re_src, re->re_src_skb)) {
+			safestats.st_noload++;
+			err = ENOMEM;
+			goto errout;
+		}
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		if (pci_map_uio(sc, &re->re_src, re->re_src_io)) {
+			safestats.st_noload++;
+			err = ENOMEM;
+			goto errout;
+		}
+	}
+	nicealign = safe_dmamap_aligned(sc, &re->re_src);
+	uniform = safe_dmamap_uniform(sc, &re->re_src);
+
+	DPRINTF(("src nicealign %u uniform %u nsegs %u\n",
+		nicealign, uniform, re->re_src.nsegs));
+	if (re->re_src.nsegs > 1) {
+		re->re_desc.d_src = sc->sc_spalloc.dma_paddr +
+			((caddr_t) sc->sc_spfree - (caddr_t) sc->sc_spring);
+		for (i = 0; i < re->re_src_nsegs; i++) {
+			/* NB: no need to check if there's space */
+			pd = sc->sc_spfree;
+			if (++(sc->sc_spfree) == sc->sc_springtop)
+				sc->sc_spfree = sc->sc_spring;
+
+			KASSERT((pd->pd_flags&3) == 0 ||
+				(pd->pd_flags&3) == SAFE_PD_DONE,
+				("bogus source particle descriptor; flags %x",
+				pd->pd_flags));
+			pd->pd_addr = re->re_src_segs[i].ds_addr;
+			pd->pd_size = re->re_src_segs[i].ds_len;
+			pd->pd_flags = SAFE_PD_READY;
+		}
+		cmd0 |= SAFE_SA_CMD0_IGATHER;
+	} else {
+		/*
+		 * No need for gather, reference the operand directly.
+		 */
+		re->re_desc.d_src = re->re_src_segs[0].ds_addr;
+	}
+
+	if (enccrd == NULL && maccrd != NULL) {
+		/*
+		 * Hash op; no destination needed.
+		 */
+	} else {
+		if (crp->crp_flags & (CRYPTO_F_IOV|CRYPTO_F_SKBUF)) {
+			if (!nicealign) {
+				safestats.st_iovmisaligned++;
+				err = EINVAL;
+				goto errout;
+			}
+			if (uniform != 1) {
+				device_printf(sc->sc_dev, "!uniform source\n");
+				if (!uniform) {
+					/*
+					 * There's no way to handle the DMA
+					 * requirements with this uio.  We
+					 * could create a separate DMA area for
+					 * the result and then copy it back,
+					 * but for now we just bail and return
+					 * an error.  Note that uio requests
+					 * > SAFE_MAX_DSIZE are handled because
+					 * the DMA map and segment list for the
+					 * destination wil result in a
+					 * destination particle list that does
+					 * the necessary scatter DMA.
+					 */ 
+					safestats.st_iovnotuniform++;
+					err = EINVAL;
+					goto errout;
+				}
+			} else
+				re->re_dst = re->re_src;
+		} else {
+			safestats.st_badflags++;
+			err = EINVAL;
+			goto errout;
+		}
+
+		if (re->re_dst.nsegs > 1) {
+			re->re_desc.d_dst = sc->sc_dpalloc.dma_paddr +
+			    ((caddr_t) sc->sc_dpfree - (caddr_t) sc->sc_dpring);
+			for (i = 0; i < re->re_dst_nsegs; i++) {
+				pd = sc->sc_dpfree;
+				KASSERT((pd->pd_flags&3) == 0 ||
+					(pd->pd_flags&3) == SAFE_PD_DONE,
+					("bogus dest particle descriptor; flags %x",
+						pd->pd_flags));
+				if (++(sc->sc_dpfree) == sc->sc_dpringtop)
+					sc->sc_dpfree = sc->sc_dpring;
+				pd->pd_addr = re->re_dst_segs[i].ds_addr;
+				pd->pd_flags = SAFE_PD_READY;
+			}
+			cmd0 |= SAFE_SA_CMD0_OSCATTER;
+		} else {
+			/*
+			 * No need for scatter, reference the operand directly.
+			 */
+			re->re_desc.d_dst = re->re_dst_segs[0].ds_addr;
+		}
+	}
+
+	/*
+	 * All done with setup; fillin the SA command words
+	 * and the packet engine descriptor.  The operation
+	 * is now ready for submission to the hardware.
+	 */
+	sa->sa_cmd0 = cmd0 | SAFE_SA_CMD0_IPCI | SAFE_SA_CMD0_OPCI;
+	sa->sa_cmd1 = cmd1
+		    | (coffset << SAFE_SA_CMD1_OFFSET_S)
+		    | SAFE_SA_CMD1_SAREV1	/* Rev 1 SA data structure */
+		    | SAFE_SA_CMD1_SRPCI
+		    ;
+	/*
+	 * NB: the order of writes is important here.  In case the
+	 * chip is scanning the ring because of an outstanding request
+	 * it might nab this one too.  In that case we need to make
+	 * sure the setup is complete before we write the length
+	 * field of the descriptor as it signals the descriptor is
+	 * ready for processing.
+	 */
+	re->re_desc.d_csr = SAFE_PE_CSR_READY | SAFE_PE_CSR_SAPCI;
+	if (maccrd)
+		re->re_desc.d_csr |= SAFE_PE_CSR_LOADSA | SAFE_PE_CSR_HASHFINAL;
+	wmb();
+	re->re_desc.d_len = oplen
+			  | SAFE_PE_LEN_READY
+			  | (bypass << SAFE_PE_LEN_BYPASS_S)
+			  ;
+
+	safestats.st_ipackets++;
+	safestats.st_ibytes += oplen;
+
+	if (++(sc->sc_front) == sc->sc_ringtop)
+		sc->sc_front = sc->sc_ring;
+
+	/* XXX honor batching */
+	safe_feed(sc, re);
+	spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+	return (0);
+
+errout:
+	if (re->re_src.map != re->re_dst.map)
+		pci_unmap_operand(sc, &re->re_dst);
+	if (re->re_src.map)
+		pci_unmap_operand(sc, &re->re_src);
+	spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+	if (err != ERESTART) {
+		crp->crp_etype = err;
+		crypto_done(crp);
+	} else {
+		sc->sc_needwakeup |= CRYPTO_SYMQ;
+	}
+	return (err);
+}
+
+static void
+safe_callback(struct safe_softc *sc, struct safe_ringentry *re)
+{
+	struct cryptop *crp = (struct cryptop *)re->re_crp;
+	struct cryptodesc *crd;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	safestats.st_opackets++;
+	safestats.st_obytes += re->re_dst.mapsize;
+
+	if (re->re_desc.d_csr & SAFE_PE_CSR_STATUS) {
+		device_printf(sc->sc_dev, "csr 0x%x cmd0 0x%x cmd1 0x%x\n",
+			re->re_desc.d_csr,
+			re->re_sa.sa_cmd0, re->re_sa.sa_cmd1);
+		safestats.st_peoperr++;
+		crp->crp_etype = EIO;		/* something more meaningful? */
+	}
+
+	if (re->re_dst.map != NULL && re->re_dst.map != re->re_src.map)
+		pci_unmap_operand(sc, &re->re_dst);
+	pci_unmap_operand(sc, &re->re_src);
+
+	/* 
+	 * If result was written to a differet mbuf chain, swap
+	 * it in as the return value and reclaim the original.
+	 */
+	if ((crp->crp_flags & CRYPTO_F_SKBUF) && re->re_src_skb != re->re_dst_skb) {
+		device_printf(sc->sc_dev, "no CRYPTO_F_SKBUF swapping support\n");
+		/* kfree_skb(skb) */
+		/* crp->crp_buf = (caddr_t)re->re_dst_skb */
+		return;
+	}
+
+	if (re->re_flags & SAFE_QFLAGS_COPYOUTICV) {
+		/* copy out ICV result */
+		for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
+			if (!(crd->crd_alg == CRYPTO_MD5_HMAC ||
+			    crd->crd_alg == CRYPTO_SHA1_HMAC ||
+			    crd->crd_alg == CRYPTO_NULL_HMAC))
+				continue;
+			if (crd->crd_alg == CRYPTO_SHA1_HMAC) {
+				/*
+				 * SHA-1 ICV's are byte-swapped; fix 'em up
+				 * before copy them to their destination.
+				 */
+				re->re_sastate.sa_saved_indigest[0] =
+					cpu_to_be32(re->re_sastate.sa_saved_indigest[0]);
+				re->re_sastate.sa_saved_indigest[1] = 
+					cpu_to_be32(re->re_sastate.sa_saved_indigest[1]);
+				re->re_sastate.sa_saved_indigest[2] =
+					cpu_to_be32(re->re_sastate.sa_saved_indigest[2]);
+			} else {
+				re->re_sastate.sa_saved_indigest[0] =
+					cpu_to_le32(re->re_sastate.sa_saved_indigest[0]);
+				re->re_sastate.sa_saved_indigest[1] = 
+					cpu_to_le32(re->re_sastate.sa_saved_indigest[1]);
+				re->re_sastate.sa_saved_indigest[2] =
+					cpu_to_le32(re->re_sastate.sa_saved_indigest[2]);
+			}
+			crypto_copyback(crp->crp_flags, crp->crp_buf,
+			    crd->crd_inject,
+			    sc->sc_sessions[re->re_sesn].ses_mlen,
+			    (caddr_t)re->re_sastate.sa_saved_indigest);
+			break;
+		}
+	}
+	crypto_done(crp);
+}
+
+
+#if defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG)
+#define	SAFE_RNG_MAXWAIT	1000
+
+static void
+safe_rng_init(struct safe_softc *sc)
+{
+	u_int32_t w, v;
+	int i;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	WRITE_REG(sc, SAFE_RNG_CTRL, 0);
+	/* use default value according to the manual */
+	WRITE_REG(sc, SAFE_RNG_CNFG, 0x834);	/* magic from SafeNet */
+	WRITE_REG(sc, SAFE_RNG_ALM_CNT, 0);
+
+	/*
+	 * There is a bug in rev 1.0 of the 1140 that when the RNG
+	 * is brought out of reset the ready status flag does not
+	 * work until the RNG has finished its internal initialization.
+	 *
+	 * So in order to determine the device is through its
+	 * initialization we must read the data register, using the
+	 * status reg in the read in case it is initialized.  Then read
+	 * the data register until it changes from the first read.
+	 * Once it changes read the data register until it changes
+	 * again.  At this time the RNG is considered initialized. 
+	 * This could take between 750ms - 1000ms in time.
+	 */
+	i = 0;
+	w = READ_REG(sc, SAFE_RNG_OUT);
+	do {
+		v = READ_REG(sc, SAFE_RNG_OUT);
+		if (v != w) {
+			w = v;
+			break;
+		}
+		DELAY(10);
+	} while (++i < SAFE_RNG_MAXWAIT);
+
+	/* Wait Until data changes again */
+	i = 0;
+	do {
+		v = READ_REG(sc, SAFE_RNG_OUT);
+		if (v != w)
+			break;
+		DELAY(10);
+	} while (++i < SAFE_RNG_MAXWAIT);
+}
+
+static __inline void
+safe_rng_disable_short_cycle(struct safe_softc *sc)
+{
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	WRITE_REG(sc, SAFE_RNG_CTRL,
+		READ_REG(sc, SAFE_RNG_CTRL) &~ SAFE_RNG_CTRL_SHORTEN);
+}
+
+static __inline void
+safe_rng_enable_short_cycle(struct safe_softc *sc)
+{
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	WRITE_REG(sc, SAFE_RNG_CTRL, 
+		READ_REG(sc, SAFE_RNG_CTRL) | SAFE_RNG_CTRL_SHORTEN);
+}
+
+static __inline u_int32_t
+safe_rng_read(struct safe_softc *sc)
+{
+	int i;
+
+	i = 0;
+	while (READ_REG(sc, SAFE_RNG_STAT) != 0 && ++i < SAFE_RNG_MAXWAIT)
+		;
+	return READ_REG(sc, SAFE_RNG_OUT);
+}
+
+static int
+safe_read_random(void *arg, u_int32_t *buf, int maxwords)
+{
+	struct safe_softc *sc = (struct safe_softc *) arg;
+	int i, rc;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+	
+	safestats.st_rng++;
+	/*
+	 * Fetch the next block of data.
+	 */
+	if (maxwords > safe_rngbufsize)
+		maxwords = safe_rngbufsize;
+	if (maxwords > SAFE_RNG_MAXBUFSIZ)
+		maxwords = SAFE_RNG_MAXBUFSIZ;
+retry:
+	/* read as much as we can */
+	for (rc = 0; rc < maxwords; rc++) {
+		if (READ_REG(sc, SAFE_RNG_STAT) != 0)
+			break;
+		buf[rc] = READ_REG(sc, SAFE_RNG_OUT);
+	}
+	if (rc == 0)
+		return 0;
+	/*
+	 * Check the comparator alarm count and reset the h/w if
+	 * it exceeds our threshold.  This guards against the
+	 * hardware oscillators resonating with external signals.
+	 */
+	if (READ_REG(sc, SAFE_RNG_ALM_CNT) > safe_rngmaxalarm) {
+		u_int32_t freq_inc, w;
+
+		DPRINTF(("%s: alarm count %u exceeds threshold %u\n", __func__,
+			(unsigned)READ_REG(sc, SAFE_RNG_ALM_CNT), safe_rngmaxalarm));
+		safestats.st_rngalarm++;
+		safe_rng_enable_short_cycle(sc);
+		freq_inc = 18;
+		for (i = 0; i < 64; i++) {
+			w = READ_REG(sc, SAFE_RNG_CNFG);
+			freq_inc = ((w + freq_inc) & 0x3fL);
+			w = ((w & ~0x3fL) | freq_inc);
+			WRITE_REG(sc, SAFE_RNG_CNFG, w);
+
+			WRITE_REG(sc, SAFE_RNG_ALM_CNT, 0);
+
+			(void) safe_rng_read(sc);
+			DELAY(25);
+
+			if (READ_REG(sc, SAFE_RNG_ALM_CNT) == 0) {
+				safe_rng_disable_short_cycle(sc);
+				goto retry;
+			}
+			freq_inc = 1;
+		}
+		safe_rng_disable_short_cycle(sc);
+	} else
+		WRITE_REG(sc, SAFE_RNG_ALM_CNT, 0);
+
+	return(rc);
+}
+#endif /* defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG) */
+
+
+/*
+ * Resets the board.  Values in the regesters are left as is
+ * from the reset (i.e. initial values are assigned elsewhere).
+ */
+static void
+safe_reset_board(struct safe_softc *sc)
+{
+	u_int32_t v;
+	/*
+	 * Reset the device.  The manual says no delay
+	 * is needed between marking and clearing reset.
+	 */
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	v = READ_REG(sc, SAFE_PE_DMACFG) &~
+		(SAFE_PE_DMACFG_PERESET | SAFE_PE_DMACFG_PDRRESET |
+		 SAFE_PE_DMACFG_SGRESET);
+	WRITE_REG(sc, SAFE_PE_DMACFG, v
+				    | SAFE_PE_DMACFG_PERESET
+				    | SAFE_PE_DMACFG_PDRRESET
+				    | SAFE_PE_DMACFG_SGRESET);
+	WRITE_REG(sc, SAFE_PE_DMACFG, v);
+}
+
+/*
+ * Initialize registers we need to touch only once.
+ */
+static void
+safe_init_board(struct safe_softc *sc)
+{
+	u_int32_t v, dwords;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	v = READ_REG(sc, SAFE_PE_DMACFG);
+	v &=~ (   SAFE_PE_DMACFG_PEMODE
+			| SAFE_PE_DMACFG_FSENA		/* failsafe enable */
+			| SAFE_PE_DMACFG_GPRPCI		/* gather ring on PCI */
+			| SAFE_PE_DMACFG_SPRPCI		/* scatter ring on PCI */
+			| SAFE_PE_DMACFG_ESDESC		/* endian-swap descriptors */
+			| SAFE_PE_DMACFG_ESPDESC	/* endian-swap part. desc's */
+			| SAFE_PE_DMACFG_ESSA		/* endian-swap SA's */
+			| SAFE_PE_DMACFG_ESPACKET	/* swap the packet data */
+		  );
+	v |= SAFE_PE_DMACFG_FSENA		/* failsafe enable */
+	  |  SAFE_PE_DMACFG_GPRPCI		/* gather ring on PCI */
+	  |  SAFE_PE_DMACFG_SPRPCI		/* scatter ring on PCI */
+	  |  SAFE_PE_DMACFG_ESDESC		/* endian-swap descriptors */
+	  |  SAFE_PE_DMACFG_ESPDESC		/* endian-swap part. desc's */
+	  |  SAFE_PE_DMACFG_ESSA		/* endian-swap SA's */
+#if 0
+	  |  SAFE_PE_DMACFG_ESPACKET    /* swap the packet data */
+#endif
+	  ;
+	WRITE_REG(sc, SAFE_PE_DMACFG, v);
+
+#ifdef __BIG_ENDIAN
+	/* tell the safenet that we are 4321 and not 1234 */
+	WRITE_REG(sc, SAFE_ENDIAN, 0xe4e41b1b);
+#endif
+
+	if (sc->sc_chiprev == SAFE_REV(1,0)) {
+		/*
+		 * Avoid large PCI DMA transfers.  Rev 1.0 has a bug where
+		 * "target mode transfers" done while the chip is DMA'ing
+		 * >1020 bytes cause the hardware to lockup.  To avoid this
+		 * we reduce the max PCI transfer size and use small source
+		 * particle descriptors (<= 256 bytes).
+		 */
+		WRITE_REG(sc, SAFE_DMA_CFG, 256);
+		device_printf(sc->sc_dev,
+			"Reduce max DMA size to %u words for rev %u.%u WAR\n",
+			(unsigned) ((READ_REG(sc, SAFE_DMA_CFG)>>2) & 0xff),
+			(unsigned) SAFE_REV_MAJ(sc->sc_chiprev),
+			(unsigned) SAFE_REV_MIN(sc->sc_chiprev));
+		sc->sc_max_dsize = 256;
+	} else {
+		sc->sc_max_dsize = SAFE_MAX_DSIZE;
+	}
+
+	/* NB: operands+results are overlaid */
+	WRITE_REG(sc, SAFE_PE_PDRBASE, sc->sc_ringalloc.dma_paddr);
+	WRITE_REG(sc, SAFE_PE_RDRBASE, sc->sc_ringalloc.dma_paddr);
+	/*
+	 * Configure ring entry size and number of items in the ring.
+	 */
+	KASSERT((sizeof(struct safe_ringentry) % sizeof(u_int32_t)) == 0,
+		("PE ring entry not 32-bit aligned!"));
+	dwords = sizeof(struct safe_ringentry) / sizeof(u_int32_t);
+	WRITE_REG(sc, SAFE_PE_RINGCFG,
+		(dwords << SAFE_PE_RINGCFG_OFFSET_S) | SAFE_MAX_NQUEUE);
+	WRITE_REG(sc, SAFE_PE_RINGPOLL, 0);	/* disable polling */
+
+	WRITE_REG(sc, SAFE_PE_GRNGBASE, sc->sc_spalloc.dma_paddr);
+	WRITE_REG(sc, SAFE_PE_SRNGBASE, sc->sc_dpalloc.dma_paddr);
+	WRITE_REG(sc, SAFE_PE_PARTSIZE,
+		(SAFE_TOTAL_DPART<<16) | SAFE_TOTAL_SPART);
+	/*
+	 * NB: destination particles are fixed size.  We use
+	 *     an mbuf cluster and require all results go to
+	 *     clusters or smaller.
+	 */
+	WRITE_REG(sc, SAFE_PE_PARTCFG, sc->sc_max_dsize);
+
+	/* it's now safe to enable PE mode, do it */
+	WRITE_REG(sc, SAFE_PE_DMACFG, v | SAFE_PE_DMACFG_PEMODE);
+
+	/*
+	 * Configure hardware to use level-triggered interrupts and
+	 * to interrupt after each descriptor is processed.
+	 */
+	WRITE_REG(sc, SAFE_HI_CFG, SAFE_HI_CFG_LEVEL);
+	WRITE_REG(sc, SAFE_HI_CLR, 0xffffffff);
+	WRITE_REG(sc, SAFE_HI_DESC_CNT, 1);
+	WRITE_REG(sc, SAFE_HI_MASK, SAFE_INT_PE_DDONE | SAFE_INT_PE_ERROR);
+}
+
+
+/*
+ * Clean up after a chip crash.
+ * It is assumed that the caller in splimp()
+ */
+static void
+safe_cleanchip(struct safe_softc *sc)
+{
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (sc->sc_nqchip != 0) {
+		struct safe_ringentry *re = sc->sc_back;
+
+		while (re != sc->sc_front) {
+			if (re->re_desc.d_csr != 0)
+				safe_free_entry(sc, re);
+			if (++re == sc->sc_ringtop)
+				re = sc->sc_ring;
+		}
+		sc->sc_back = re;
+		sc->sc_nqchip = 0;
+	}
+}
+
+/*
+ * free a safe_q
+ * It is assumed that the caller is within splimp().
+ */
+static int
+safe_free_entry(struct safe_softc *sc, struct safe_ringentry *re)
+{
+	struct cryptop *crp;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	/*
+	 * Free header MCR
+	 */
+	if ((re->re_dst_skb != NULL) && (re->re_src_skb != re->re_dst_skb))
+#ifdef NOTYET
+		m_freem(re->re_dst_m);
+#else
+		printk("%s,%d: SKB not supported\n", __FILE__, __LINE__);
+#endif
+
+	crp = (struct cryptop *)re->re_crp;
+	
+	re->re_desc.d_csr = 0;
+	
+	crp->crp_etype = EFAULT;
+	crypto_done(crp);
+	return(0);
+}
+
+/*
+ * Routine to reset the chip and clean up.
+ * It is assumed that the caller is in splimp()
+ */
+static void
+safe_totalreset(struct safe_softc *sc)
+{
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	safe_reset_board(sc);
+	safe_init_board(sc);
+	safe_cleanchip(sc);
+}
+
+/*
+ * Is the operand suitable aligned for direct DMA.  Each
+ * segment must be aligned on a 32-bit boundary and all
+ * but the last segment must be a multiple of 4 bytes.
+ */
+static int
+safe_dmamap_aligned(struct safe_softc *sc, const struct safe_operand *op)
+{
+	int i;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	for (i = 0; i < op->nsegs; i++) {
+		if (op->segs[i].ds_addr & 3)
+			return (0);
+		if (i != (op->nsegs - 1) && (op->segs[i].ds_len & 3))
+			return (0);
+	}
+	return (1);
+}
+
+/*
+ * Is the operand suitable for direct DMA as the destination
+ * of an operation.  The hardware requires that each ``particle''
+ * but the last in an operation result have the same size.  We
+ * fix that size at SAFE_MAX_DSIZE bytes.  This routine returns
+ * 0 if some segment is not a multiple of of this size, 1 if all
+ * segments are exactly this size, or 2 if segments are at worst
+ * a multple of this size.
+ */
+static int
+safe_dmamap_uniform(struct safe_softc *sc, const struct safe_operand *op)
+{
+	int result = 1;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (op->nsegs > 0) {
+		int i;
+
+		for (i = 0; i < op->nsegs-1; i++) {
+			if (op->segs[i].ds_len % sc->sc_max_dsize)
+				return (0);
+			if (op->segs[i].ds_len != sc->sc_max_dsize)
+				result = 2;
+		}
+	}
+	return (result);
+}
+
+static int
+safe_kprocess(device_t dev, struct cryptkop *krp, int hint)
+{
+	struct safe_softc *sc = device_get_softc(dev);
+	struct safe_pkq *q;
+	unsigned long flags;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (sc == NULL) {
+		krp->krp_status = EINVAL;
+		goto err;
+	}
+
+	if (krp->krp_op != CRK_MOD_EXP) {
+		krp->krp_status = EOPNOTSUPP;
+		goto err;
+	}
+
+	q = (struct safe_pkq *) kmalloc(sizeof(*q), GFP_KERNEL);
+	if (q == NULL) {
+		krp->krp_status = ENOMEM;
+		goto err;
+	}
+	memset(q, 0, sizeof(*q));
+	q->pkq_krp = krp;
+	INIT_LIST_HEAD(&q->pkq_list);
+
+	spin_lock_irqsave(&sc->sc_pkmtx, flags);
+	list_add_tail(&q->pkq_list, &sc->sc_pkq);
+	safe_kfeed(sc);
+	spin_unlock_irqrestore(&sc->sc_pkmtx, flags);
+	return (0);
+
+err:
+	crypto_kdone(krp);
+	return (0);
+}
+
+#define	SAFE_CRK_PARAM_BASE	0
+#define	SAFE_CRK_PARAM_EXP	1
+#define	SAFE_CRK_PARAM_MOD	2
+
+static int
+safe_kstart(struct safe_softc *sc)
+{
+	struct cryptkop *krp = sc->sc_pkq_cur->pkq_krp;
+	int exp_bits, mod_bits, base_bits;
+	u_int32_t op, a_off, b_off, c_off, d_off;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (krp->krp_iparams < 3 || krp->krp_oparams != 1) {
+		krp->krp_status = EINVAL;
+		return (1);
+	}
+
+	base_bits = safe_ksigbits(sc, &krp->krp_param[SAFE_CRK_PARAM_BASE]);
+	if (base_bits > 2048)
+		goto too_big;
+	if (base_bits <= 0)		/* 5. base not zero */
+		goto too_small;
+
+	exp_bits = safe_ksigbits(sc, &krp->krp_param[SAFE_CRK_PARAM_EXP]);
+	if (exp_bits > 2048)
+		goto too_big;
+	if (exp_bits <= 0)		/* 1. exponent word length > 0 */
+		goto too_small;		/* 4. exponent not zero */
+
+	mod_bits = safe_ksigbits(sc, &krp->krp_param[SAFE_CRK_PARAM_MOD]);
+	if (mod_bits > 2048)
+		goto too_big;
+	if (mod_bits <= 32)		/* 2. modulus word length > 1 */
+		goto too_small;		/* 8. MSW of modulus != zero */
+	if (mod_bits < exp_bits)	/* 3 modulus len >= exponent len */
+		goto too_small;
+	if ((krp->krp_param[SAFE_CRK_PARAM_MOD].crp_p[0] & 1) == 0)
+		goto bad_domain;	/* 6. modulus is odd */
+	if (mod_bits > krp->krp_param[krp->krp_iparams].crp_nbits)
+		goto too_small;		/* make sure result will fit */
+
+	/* 7. modulus > base */
+	if (mod_bits < base_bits)
+		goto too_small;
+	if (mod_bits == base_bits) {
+		u_int8_t *basep, *modp;
+		int i;
+
+		basep = krp->krp_param[SAFE_CRK_PARAM_BASE].crp_p +
+		    ((base_bits + 7) / 8) - 1;
+		modp = krp->krp_param[SAFE_CRK_PARAM_MOD].crp_p +
+		    ((mod_bits + 7) / 8) - 1;
+		
+		for (i = 0; i < (mod_bits + 7) / 8; i++, basep--, modp--) {
+			if (*modp < *basep)
+				goto too_small;
+			if (*modp > *basep)
+				break;
+		}
+	}
+
+	/* And on the 9th step, he rested. */
+
+	WRITE_REG(sc, SAFE_PK_A_LEN, (exp_bits + 31) / 32);
+	WRITE_REG(sc, SAFE_PK_B_LEN, (mod_bits + 31) / 32);
+	if (mod_bits > 1024) {
+		op = SAFE_PK_FUNC_EXP4;
+		a_off = 0x000;
+		b_off = 0x100;
+		c_off = 0x200;
+		d_off = 0x300;
+	} else {
+		op = SAFE_PK_FUNC_EXP16;
+		a_off = 0x000;
+		b_off = 0x080;
+		c_off = 0x100;
+		d_off = 0x180;
+	}
+	sc->sc_pk_reslen = b_off - a_off;
+	sc->sc_pk_resoff = d_off;
+
+	/* A is exponent, B is modulus, C is base, D is result */
+	safe_kload_reg(sc, a_off, b_off - a_off,
+	    &krp->krp_param[SAFE_CRK_PARAM_EXP]);
+	WRITE_REG(sc, SAFE_PK_A_ADDR, a_off >> 2);
+	safe_kload_reg(sc, b_off, b_off - a_off,
+	    &krp->krp_param[SAFE_CRK_PARAM_MOD]);
+	WRITE_REG(sc, SAFE_PK_B_ADDR, b_off >> 2);
+	safe_kload_reg(sc, c_off, b_off - a_off,
+	    &krp->krp_param[SAFE_CRK_PARAM_BASE]);
+	WRITE_REG(sc, SAFE_PK_C_ADDR, c_off >> 2);
+	WRITE_REG(sc, SAFE_PK_D_ADDR, d_off >> 2);
+
+	WRITE_REG(sc, SAFE_PK_FUNC, op | SAFE_PK_FUNC_RUN);
+
+	return (0);
+
+too_big:
+	krp->krp_status = E2BIG;
+	return (1);
+too_small:
+	krp->krp_status = ERANGE;
+	return (1);
+bad_domain:
+	krp->krp_status = EDOM;
+	return (1);
+}
+
+static int
+safe_ksigbits(struct safe_softc *sc, struct crparam *cr)
+{
+	u_int plen = (cr->crp_nbits + 7) / 8;
+	int i, sig = plen * 8;
+	u_int8_t c, *p = cr->crp_p;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	for (i = plen - 1; i >= 0; i--) {
+		c = p[i];
+		if (c != 0) {
+			while ((c & 0x80) == 0) {
+				sig--;
+				c <<= 1;
+			}
+			break;
+		}
+		sig -= 8;
+	}
+	return (sig);
+}
+
+static void
+safe_kfeed(struct safe_softc *sc)
+{
+	struct safe_pkq *q, *tmp;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (list_empty(&sc->sc_pkq) && sc->sc_pkq_cur == NULL)
+		return;
+	if (sc->sc_pkq_cur != NULL)
+		return;
+	list_for_each_entry_safe(q, tmp, &sc->sc_pkq, pkq_list) {
+		sc->sc_pkq_cur = q;
+		list_del(&q->pkq_list);
+		if (safe_kstart(sc) != 0) {
+			crypto_kdone(q->pkq_krp);
+			kfree(q);
+			sc->sc_pkq_cur = NULL;
+		} else {
+			/* op started, start polling */
+			mod_timer(&sc->sc_pkto, jiffies + 1);
+			break;
+		}
+	}
+}
+
+static void
+safe_kpoll(unsigned long arg)
+{
+	struct safe_softc *sc = NULL;
+	struct safe_pkq *q;
+	struct crparam *res;
+	int i;
+	u_int32_t buf[64];
+	unsigned long flags;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (arg >= SAFE_MAX_CHIPS)
+		return;
+	sc = safe_chip_idx[arg];
+	if (!sc) {
+		DPRINTF(("%s() - bad callback\n", __FUNCTION__));
+		return;
+	}
+
+	spin_lock_irqsave(&sc->sc_pkmtx, flags);
+	if (sc->sc_pkq_cur == NULL)
+		goto out;
+	if (READ_REG(sc, SAFE_PK_FUNC) & SAFE_PK_FUNC_RUN) {
+		/* still running, check back later */
+		mod_timer(&sc->sc_pkto, jiffies + 1);
+		goto out;
+	}
+
+	q = sc->sc_pkq_cur;
+	res = &q->pkq_krp->krp_param[q->pkq_krp->krp_iparams];
+	bzero(buf, sizeof(buf));
+	bzero(res->crp_p, (res->crp_nbits + 7) / 8);
+	for (i = 0; i < sc->sc_pk_reslen >> 2; i++)
+		buf[i] = le32_to_cpu(READ_REG(sc, SAFE_PK_RAM_START +
+		    sc->sc_pk_resoff + (i << 2)));
+	bcopy(buf, res->crp_p, (res->crp_nbits + 7) / 8);
+	/*
+	 * reduce the bits that need copying if possible
+	 */
+	res->crp_nbits = min(res->crp_nbits,sc->sc_pk_reslen * 8);
+	res->crp_nbits = safe_ksigbits(sc, res);
+
+	for (i = SAFE_PK_RAM_START; i < SAFE_PK_RAM_END; i += 4)
+		WRITE_REG(sc, i, 0);
+
+	crypto_kdone(q->pkq_krp);
+	kfree(q);
+	sc->sc_pkq_cur = NULL;
+
+	safe_kfeed(sc);
+out:
+	spin_unlock_irqrestore(&sc->sc_pkmtx, flags);
+}
+
+static void
+safe_kload_reg(struct safe_softc *sc, u_int32_t off, u_int32_t len,
+    struct crparam *n)
+{
+	u_int32_t buf[64], i;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	bzero(buf, sizeof(buf));
+	bcopy(n->crp_p, buf, (n->crp_nbits + 7) / 8);
+
+	for (i = 0; i < len >> 2; i++)
+		WRITE_REG(sc, SAFE_PK_RAM_START + off + (i << 2),
+		    cpu_to_le32(buf[i]));
+}
+
+#ifdef SAFE_DEBUG
+static void
+safe_dump_dmastatus(struct safe_softc *sc, const char *tag)
+{
+	printf("%s: ENDIAN 0x%x SRC 0x%x DST 0x%x STAT 0x%x\n"
+		, tag
+		, READ_REG(sc, SAFE_DMA_ENDIAN)
+		, READ_REG(sc, SAFE_DMA_SRCADDR)
+		, READ_REG(sc, SAFE_DMA_DSTADDR)
+		, READ_REG(sc, SAFE_DMA_STAT)
+	);
+}
+
+static void
+safe_dump_intrstate(struct safe_softc *sc, const char *tag)
+{
+	printf("%s: HI_CFG 0x%x HI_MASK 0x%x HI_DESC_CNT 0x%x HU_STAT 0x%x HM_STAT 0x%x\n"
+		, tag
+		, READ_REG(sc, SAFE_HI_CFG)
+		, READ_REG(sc, SAFE_HI_MASK)
+		, READ_REG(sc, SAFE_HI_DESC_CNT)
+		, READ_REG(sc, SAFE_HU_STAT)
+		, READ_REG(sc, SAFE_HM_STAT)
+	);
+}
+
+static void
+safe_dump_ringstate(struct safe_softc *sc, const char *tag)
+{
+	u_int32_t estat = READ_REG(sc, SAFE_PE_ERNGSTAT);
+
+	/* NB: assume caller has lock on ring */
+	printf("%s: ERNGSTAT %x (next %u) back %lu front %lu\n",
+		tag,
+		estat, (estat >> SAFE_PE_ERNGSTAT_NEXT_S),
+		(unsigned long)(sc->sc_back - sc->sc_ring),
+		(unsigned long)(sc->sc_front - sc->sc_ring));
+}
+
+static void
+safe_dump_request(struct safe_softc *sc, const char* tag, struct safe_ringentry *re)
+{
+	int ix, nsegs;
+
+	ix = re - sc->sc_ring;
+	printf("%s: %p (%u): csr %x src %x dst %x sa %x len %x\n"
+		, tag
+		, re, ix
+		, re->re_desc.d_csr
+		, re->re_desc.d_src
+		, re->re_desc.d_dst
+		, re->re_desc.d_sa
+		, re->re_desc.d_len
+	);
+	if (re->re_src.nsegs > 1) {
+		ix = (re->re_desc.d_src - sc->sc_spalloc.dma_paddr) /
+			sizeof(struct safe_pdesc);
+		for (nsegs = re->re_src.nsegs; nsegs; nsegs--) {
+			printf(" spd[%u] %p: %p size %u flags %x"
+				, ix, &sc->sc_spring[ix]
+				, (caddr_t)(uintptr_t) sc->sc_spring[ix].pd_addr
+				, sc->sc_spring[ix].pd_size
+				, sc->sc_spring[ix].pd_flags
+			);
+			if (sc->sc_spring[ix].pd_size == 0)
+				printf(" (zero!)");
+			printf("\n");
+			if (++ix == SAFE_TOTAL_SPART)
+				ix = 0;
+		}
+	}
+	if (re->re_dst.nsegs > 1) {
+		ix = (re->re_desc.d_dst - sc->sc_dpalloc.dma_paddr) /
+			sizeof(struct safe_pdesc);
+		for (nsegs = re->re_dst.nsegs; nsegs; nsegs--) {
+			printf(" dpd[%u] %p: %p flags %x\n"
+				, ix, &sc->sc_dpring[ix]
+				, (caddr_t)(uintptr_t) sc->sc_dpring[ix].pd_addr
+				, sc->sc_dpring[ix].pd_flags
+			);
+			if (++ix == SAFE_TOTAL_DPART)
+				ix = 0;
+		}
+	}
+	printf("sa: cmd0 %08x cmd1 %08x staterec %x\n",
+		re->re_sa.sa_cmd0, re->re_sa.sa_cmd1, re->re_sa.sa_staterec);
+	printf("sa: key %x %x %x %x %x %x %x %x\n"
+		, re->re_sa.sa_key[0]
+		, re->re_sa.sa_key[1]
+		, re->re_sa.sa_key[2]
+		, re->re_sa.sa_key[3]
+		, re->re_sa.sa_key[4]
+		, re->re_sa.sa_key[5]
+		, re->re_sa.sa_key[6]
+		, re->re_sa.sa_key[7]
+	);
+	printf("sa: indigest %x %x %x %x %x\n"
+		, re->re_sa.sa_indigest[0]
+		, re->re_sa.sa_indigest[1]
+		, re->re_sa.sa_indigest[2]
+		, re->re_sa.sa_indigest[3]
+		, re->re_sa.sa_indigest[4]
+	);
+	printf("sa: outdigest %x %x %x %x %x\n"
+		, re->re_sa.sa_outdigest[0]
+		, re->re_sa.sa_outdigest[1]
+		, re->re_sa.sa_outdigest[2]
+		, re->re_sa.sa_outdigest[3]
+		, re->re_sa.sa_outdigest[4]
+	);
+	printf("sr: iv %x %x %x %x\n"
+		, re->re_sastate.sa_saved_iv[0]
+		, re->re_sastate.sa_saved_iv[1]
+		, re->re_sastate.sa_saved_iv[2]
+		, re->re_sastate.sa_saved_iv[3]
+	);
+	printf("sr: hashbc %u indigest %x %x %x %x %x\n"
+		, re->re_sastate.sa_saved_hashbc
+		, re->re_sastate.sa_saved_indigest[0]
+		, re->re_sastate.sa_saved_indigest[1]
+		, re->re_sastate.sa_saved_indigest[2]
+		, re->re_sastate.sa_saved_indigest[3]
+		, re->re_sastate.sa_saved_indigest[4]
+	);
+}
+
+static void
+safe_dump_ring(struct safe_softc *sc, const char *tag)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&sc->sc_ringmtx, flags);
+	printf("\nSafeNet Ring State:\n");
+	safe_dump_intrstate(sc, tag);
+	safe_dump_dmastatus(sc, tag);
+	safe_dump_ringstate(sc, tag);
+	if (sc->sc_nqchip) {
+		struct safe_ringentry *re = sc->sc_back;
+		do {
+			safe_dump_request(sc, tag, re);
+			if (++re == sc->sc_ringtop)
+				re = sc->sc_ring;
+		} while (re != sc->sc_front);
+	}
+	spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+}
+#endif /* SAFE_DEBUG */
+
+
+static int safe_probe(struct pci_dev *dev, const struct pci_device_id *ent)
+{
+	struct safe_softc *sc = NULL;
+	u32 mem_start, mem_len, cmd;
+	int i, rc, devinfo;
+	dma_addr_t raddr;
+	static int num_chips = 0;
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	if (pci_enable_device(dev) < 0)
+		return(-ENODEV);
+
+	if (!dev->irq) {
+		printk("safe: found device with no IRQ assigned. check BIOS settings!");
+		pci_disable_device(dev);
+		return(-ENODEV);
+	}
+
+	if (pci_set_mwi(dev)) {
+		printk("safe: pci_set_mwi failed!");
+		return(-ENODEV);
+	}
+
+	sc = (struct safe_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
+	if (!sc)
+		return(-ENOMEM);
+	memset(sc, 0, sizeof(*sc));
+
+	softc_device_init(sc, "safe", num_chips, safe_methods);
+
+	sc->sc_irq = -1;
+	sc->sc_cid = -1;
+	sc->sc_pcidev = dev;
+	if (num_chips < SAFE_MAX_CHIPS) {
+		safe_chip_idx[device_get_unit(sc->sc_dev)] = sc;
+		num_chips++;
+	}
+
+	INIT_LIST_HEAD(&sc->sc_pkq);
+	spin_lock_init(&sc->sc_pkmtx);
+
+	pci_set_drvdata(sc->sc_pcidev, sc);
+
+	/* we read its hardware registers as memory */
+	mem_start = pci_resource_start(sc->sc_pcidev, 0);
+	mem_len   = pci_resource_len(sc->sc_pcidev, 0);
+
+	sc->sc_base_addr = (ocf_iomem_t) ioremap(mem_start, mem_len);
+	if (!sc->sc_base_addr) {
+		device_printf(sc->sc_dev, "failed to ioremap 0x%x-0x%x\n",
+				mem_start, mem_start + mem_len - 1);
+		goto out;
+	}
+
+	/* fix up the bus size */
+	if (pci_set_dma_mask(sc->sc_pcidev, DMA_32BIT_MASK)) {
+		device_printf(sc->sc_dev, "No usable DMA configuration, aborting.\n");
+		goto out;
+	}
+	if (pci_set_consistent_dma_mask(sc->sc_pcidev, DMA_32BIT_MASK)) {
+		device_printf(sc->sc_dev, "No usable consistent DMA configuration, aborting.\n");
+		goto out;
+	}
+
+	pci_set_master(sc->sc_pcidev);
+
+	pci_read_config_dword(sc->sc_pcidev, PCI_COMMAND, &cmd);
+
+	if (!(cmd & PCI_COMMAND_MEMORY)) {
+		device_printf(sc->sc_dev, "failed to enable memory mapping\n");
+		goto out;
+	}
+
+	if (!(cmd & PCI_COMMAND_MASTER)) {
+		device_printf(sc->sc_dev, "failed to enable bus mastering\n");
+		goto out;
+	}
+
+	rc = request_irq(dev->irq, safe_intr, IRQF_SHARED, "safe", sc);
+	if (rc) {
+		device_printf(sc->sc_dev, "failed to hook irq %d\n", sc->sc_irq);
+		goto out;
+	}
+	sc->sc_irq = dev->irq;
+
+	sc->sc_chiprev = READ_REG(sc, SAFE_DEVINFO) &
+			(SAFE_DEVINFO_REV_MAJ | SAFE_DEVINFO_REV_MIN);
+
+	/*
+	 * Allocate packet engine descriptors.
+	 */
+	sc->sc_ringalloc.dma_vaddr = pci_alloc_consistent(sc->sc_pcidev,
+			SAFE_MAX_NQUEUE * sizeof (struct safe_ringentry),
+			&sc->sc_ringalloc.dma_paddr);
+	if (!sc->sc_ringalloc.dma_vaddr) {
+		device_printf(sc->sc_dev, "cannot allocate PE descriptor ring\n");
+		goto out;
+	}
+
+	/*
+	 * Hookup the static portion of all our data structures.
+	 */
+	sc->sc_ring = (struct safe_ringentry *) sc->sc_ringalloc.dma_vaddr;
+	sc->sc_ringtop = sc->sc_ring + SAFE_MAX_NQUEUE;
+	sc->sc_front = sc->sc_ring;
+	sc->sc_back = sc->sc_ring;
+	raddr = sc->sc_ringalloc.dma_paddr;
+	bzero(sc->sc_ring, SAFE_MAX_NQUEUE * sizeof(struct safe_ringentry));
+	for (i = 0; i < SAFE_MAX_NQUEUE; i++) {
+		struct safe_ringentry *re = &sc->sc_ring[i];
+
+		re->re_desc.d_sa = raddr +
+			offsetof(struct safe_ringentry, re_sa);
+		re->re_sa.sa_staterec = raddr +
+			offsetof(struct safe_ringentry, re_sastate);
+
+		raddr += sizeof (struct safe_ringentry);
+	}
+	spin_lock_init(&sc->sc_ringmtx);
+
+	/*
+	 * Allocate scatter and gather particle descriptors.
+	 */
+	sc->sc_spalloc.dma_vaddr = pci_alloc_consistent(sc->sc_pcidev,
+			SAFE_TOTAL_SPART * sizeof (struct safe_pdesc),
+			&sc->sc_spalloc.dma_paddr);
+	if (!sc->sc_spalloc.dma_vaddr) {
+		device_printf(sc->sc_dev, "cannot allocate source particle descriptor ring\n");
+		goto out;
+	}
+	sc->sc_spring = (struct safe_pdesc *) sc->sc_spalloc.dma_vaddr;
+	sc->sc_springtop = sc->sc_spring + SAFE_TOTAL_SPART;
+	sc->sc_spfree = sc->sc_spring;
+	bzero(sc->sc_spring, SAFE_TOTAL_SPART * sizeof(struct safe_pdesc));
+
+	sc->sc_dpalloc.dma_vaddr = pci_alloc_consistent(sc->sc_pcidev,
+			SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
+			&sc->sc_dpalloc.dma_paddr);
+	if (!sc->sc_dpalloc.dma_vaddr) {
+		device_printf(sc->sc_dev, "cannot allocate destination particle descriptor ring\n");
+		goto out;
+	}
+	sc->sc_dpring = (struct safe_pdesc *) sc->sc_dpalloc.dma_vaddr;
+	sc->sc_dpringtop = sc->sc_dpring + SAFE_TOTAL_DPART;
+	sc->sc_dpfree = sc->sc_dpring;
+	bzero(sc->sc_dpring, SAFE_TOTAL_DPART * sizeof(struct safe_pdesc));
+
+	sc->sc_cid = crypto_get_driverid(softc_get_device(sc), CRYPTOCAP_F_HARDWARE);
+	if (sc->sc_cid < 0) {
+		device_printf(sc->sc_dev, "could not get crypto driver id\n");
+		goto out;
+	}
+
+	printf("%s:", device_get_nameunit(sc->sc_dev));
+
+	devinfo = READ_REG(sc, SAFE_DEVINFO);
+	if (devinfo & SAFE_DEVINFO_RNG) {
+		sc->sc_flags |= SAFE_FLAGS_RNG;
+		printf(" rng");
+	}
+	if (devinfo & SAFE_DEVINFO_PKEY) {
+		printf(" key");
+		sc->sc_flags |= SAFE_FLAGS_KEY;
+		crypto_kregister(sc->sc_cid, CRK_MOD_EXP, 0);
+#if 0
+		crypto_kregister(sc->sc_cid, CRK_MOD_EXP_CRT, 0);
+#endif
+		init_timer(&sc->sc_pkto);
+		sc->sc_pkto.function = safe_kpoll;
+		sc->sc_pkto.data = (unsigned long) device_get_unit(sc->sc_dev);
+	}
+	if (devinfo & SAFE_DEVINFO_DES) {
+		printf(" des/3des");
+		crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
+		crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
+	}
+	if (devinfo & SAFE_DEVINFO_AES) {
+		printf(" aes");
+		crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
+	}
+	if (devinfo & SAFE_DEVINFO_MD5) {
+		printf(" md5");
+		crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
+	}
+	if (devinfo & SAFE_DEVINFO_SHA1) {
+		printf(" sha1");
+		crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
+	}
+	printf(" null");
+	crypto_register(sc->sc_cid, CRYPTO_NULL_CBC, 0, 0);
+	crypto_register(sc->sc_cid, CRYPTO_NULL_HMAC, 0, 0);
+	/* XXX other supported algorithms */
+	printf("\n");
+
+	safe_reset_board(sc);		/* reset h/w */
+	safe_init_board(sc);		/* init h/w */
+
+#if defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG)
+	if (sc->sc_flags & SAFE_FLAGS_RNG) {
+		safe_rng_init(sc);
+		crypto_rregister(sc->sc_cid, safe_read_random, sc);
+	}
+#endif /* SAFE_NO_RNG */
+
+	return (0);
+
+out:
+	if (sc->sc_cid >= 0)
+		crypto_unregister_all(sc->sc_cid);
+	if (sc->sc_irq != -1)
+		free_irq(sc->sc_irq, sc);
+	if (sc->sc_ringalloc.dma_vaddr)
+		pci_free_consistent(sc->sc_pcidev,
+				SAFE_MAX_NQUEUE * sizeof (struct safe_ringentry),
+				sc->sc_ringalloc.dma_vaddr, sc->sc_ringalloc.dma_paddr);
+	if (sc->sc_spalloc.dma_vaddr)
+		pci_free_consistent(sc->sc_pcidev,
+				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
+				sc->sc_spalloc.dma_vaddr, sc->sc_spalloc.dma_paddr);
+	if (sc->sc_dpalloc.dma_vaddr)
+		pci_free_consistent(sc->sc_pcidev,
+				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
+				sc->sc_dpalloc.dma_vaddr, sc->sc_dpalloc.dma_paddr);
+	kfree(sc);
+	return(-ENODEV);
+}
+
+static void safe_remove(struct pci_dev *dev)
+{
+	struct safe_softc *sc = pci_get_drvdata(dev);
+
+	DPRINTF(("%s()\n", __FUNCTION__));
+
+	/* XXX wait/abort active ops */
+
+	WRITE_REG(sc, SAFE_HI_MASK, 0);		/* disable interrupts */
+
+	del_timer_sync(&sc->sc_pkto);
+
+	crypto_unregister_all(sc->sc_cid);
+
+	safe_cleanchip(sc);
+
+	if (sc->sc_irq != -1)
+		free_irq(sc->sc_irq, sc);
+	if (sc->sc_ringalloc.dma_vaddr)
+		pci_free_consistent(sc->sc_pcidev,
+				SAFE_MAX_NQUEUE * sizeof (struct safe_ringentry),
+				sc->sc_ringalloc.dma_vaddr, sc->sc_ringalloc.dma_paddr);
+	if (sc->sc_spalloc.dma_vaddr)
+		pci_free_consistent(sc->sc_pcidev,
+				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
+				sc->sc_spalloc.dma_vaddr, sc->sc_spalloc.dma_paddr);
+	if (sc->sc_dpalloc.dma_vaddr)
+		pci_free_consistent(sc->sc_pcidev,
+				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
+				sc->sc_dpalloc.dma_vaddr, sc->sc_dpalloc.dma_paddr);
+	sc->sc_irq = -1;
+	sc->sc_ringalloc.dma_vaddr = NULL;
+	sc->sc_spalloc.dma_vaddr = NULL;
+	sc->sc_dpalloc.dma_vaddr = NULL;
+}
+
+static struct pci_device_id safe_pci_tbl[] = {
+	{ PCI_VENDOR_SAFENET, PCI_PRODUCT_SAFEXCEL,
+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ },
+};
+MODULE_DEVICE_TABLE(pci, safe_pci_tbl);
+
+static struct pci_driver safe_driver = {
+	.name         = "safe",
+	.id_table     = safe_pci_tbl,
+	.probe        =	safe_probe,
+	.remove       = safe_remove,
+	/* add PM stuff here one day */
+};
+
+static int __init safe_init (void)
+{
+	struct safe_softc *sc = NULL;
+	int rc;
+
+	DPRINTF(("%s(%p)\n", __FUNCTION__, safe_init));
+
+	rc = pci_register_driver(&safe_driver);
+	pci_register_driver_compat(&safe_driver, rc);
+
+	return rc;
+}
+
+static void __exit safe_exit (void)
+{
+	pci_unregister_driver(&safe_driver);
+}
+
+module_init(safe_init);
+module_exit(safe_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
+MODULE_DESCRIPTION("OCF driver for safenet PCI crypto devices");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/safereg.h b/trunk/target/linux/generic/files/crypto/ocf/safe/safereg.h
new file mode 100644
index 00000000..dbaf98fe
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/safereg.h
@@ -0,0 +1,421 @@
+/*-
+ * Copyright (c) 2003 Sam Leffler, Errno Consulting
+ * Copyright (c) 2003 Global Technology Associates, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/dev/safe/safereg.h,v 1.1 2003/07/21 21:46:07 sam Exp $
+ */
+#ifndef _SAFE_SAFEREG_H_
+#define	_SAFE_SAFEREG_H_
+
+/*
+ * Register definitions for SafeNet SafeXcel-1141 crypto device.
+ * Definitions from revision 1.3 (Nov 6 2002) of the User's Manual.
+ */
+
+#define BS_BAR			0x10	/* DMA base address register */
+#define	BS_TRDY_TIMEOUT		0x40	/* TRDY timeout */
+#define	BS_RETRY_TIMEOUT	0x41	/* DMA retry timeout */
+
+#define	PCI_VENDOR_SAFENET	0x16ae		/* SafeNet, Inc. */
+
+/* SafeNet */
+#define	PCI_PRODUCT_SAFEXCEL	0x1141		/* 1141 */
+
+#define	SAFE_PE_CSR		0x0000	/* Packet Enginge Ctrl/Status */
+#define	SAFE_PE_SRC		0x0004	/* Packet Engine Source */
+#define	SAFE_PE_DST		0x0008	/* Packet Engine Destination */
+#define	SAFE_PE_SA		0x000c	/* Packet Engine SA */
+#define	SAFE_PE_LEN		0x0010	/* Packet Engine Length */
+#define	SAFE_PE_DMACFG		0x0040	/* Packet Engine DMA Configuration */
+#define	SAFE_PE_DMASTAT		0x0044	/* Packet Engine DMA Status */
+#define	SAFE_PE_PDRBASE		0x0048	/* Packet Engine Descriptor Ring Base */
+#define	SAFE_PE_RDRBASE		0x004c	/* Packet Engine Result Ring Base */
+#define	SAFE_PE_RINGCFG		0x0050	/* Packet Engine Ring Configuration */
+#define	SAFE_PE_RINGPOLL	0x0054	/* Packet Engine Ring Poll */
+#define	SAFE_PE_IRNGSTAT	0x0058	/* Packet Engine Internal Ring Status */
+#define	SAFE_PE_ERNGSTAT	0x005c	/* Packet Engine External Ring Status */
+#define	SAFE_PE_IOTHRESH	0x0060	/* Packet Engine I/O Threshold */
+#define	SAFE_PE_GRNGBASE	0x0064	/* Packet Engine Gather Ring Base */
+#define	SAFE_PE_SRNGBASE	0x0068	/* Packet Engine Scatter Ring Base */
+#define	SAFE_PE_PARTSIZE	0x006c	/* Packet Engine Particlar Ring Size */
+#define	SAFE_PE_PARTCFG		0x0070	/* Packet Engine Particle Ring Config */
+#define	SAFE_CRYPTO_CTRL	0x0080	/* Crypto Control */
+#define	SAFE_DEVID		0x0084	/* Device ID */
+#define	SAFE_DEVINFO		0x0088	/* Device Info */
+#define	SAFE_HU_STAT		0x00a0	/* Host Unmasked Status */
+#define	SAFE_HM_STAT		0x00a4	/* Host Masked Status (read-only) */
+#define	SAFE_HI_CLR		0x00a4	/* Host Clear Interrupt (write-only) */
+#define	SAFE_HI_MASK		0x00a8	/* Host Mask Control */
+#define	SAFE_HI_CFG		0x00ac	/* Interrupt Configuration */
+#define	SAFE_HI_RD_DESCR	0x00b4	/* Force Descriptor Read */
+#define	SAFE_HI_DESC_CNT	0x00b8	/* Host Descriptor Done Count */
+#define	SAFE_DMA_ENDIAN		0x00c0	/* Master Endian Status */
+#define	SAFE_DMA_SRCADDR	0x00c4	/* DMA Source Address Status */
+#define	SAFE_DMA_DSTADDR	0x00c8	/* DMA Destination Address Status */
+#define	SAFE_DMA_STAT		0x00cc	/* DMA Current Status */
+#define	SAFE_DMA_CFG		0x00d4	/* DMA Configuration/Status */
+#define	SAFE_ENDIAN		0x00e0	/* Endian Configuration */
+#define	SAFE_PK_A_ADDR		0x0800	/* Public Key A Address */
+#define	SAFE_PK_B_ADDR		0x0804	/* Public Key B Address */
+#define	SAFE_PK_C_ADDR		0x0808	/* Public Key C Address */
+#define	SAFE_PK_D_ADDR		0x080c	/* Public Key D Address */
+#define	SAFE_PK_A_LEN		0x0810	/* Public Key A Length */
+#define	SAFE_PK_B_LEN		0x0814	/* Public Key B Length */
+#define	SAFE_PK_SHIFT		0x0818	/* Public Key Shift */
+#define	SAFE_PK_FUNC		0x081c	/* Public Key Function */
+#define SAFE_PK_RAM_START	0x1000	/* Public Key RAM start address */
+#define SAFE_PK_RAM_END		0x1fff	/* Public Key RAM end address */
+
+#define	SAFE_RNG_OUT		0x0100	/* RNG Output */
+#define	SAFE_RNG_STAT		0x0104	/* RNG Status */
+#define	SAFE_RNG_CTRL		0x0108	/* RNG Control */
+#define	SAFE_RNG_A		0x010c	/* RNG A */
+#define	SAFE_RNG_B		0x0110	/* RNG B */
+#define	SAFE_RNG_X_LO		0x0114	/* RNG X [31:0] */
+#define	SAFE_RNG_X_MID		0x0118	/* RNG X [63:32] */
+#define	SAFE_RNG_X_HI		0x011c	/* RNG X [80:64] */
+#define	SAFE_RNG_X_CNTR		0x0120	/* RNG Counter */
+#define	SAFE_RNG_ALM_CNT	0x0124	/* RNG Alarm Count */
+#define	SAFE_RNG_CNFG		0x0128	/* RNG Configuration */
+#define	SAFE_RNG_LFSR1_LO	0x012c	/* RNG LFSR1 [31:0] */
+#define	SAFE_RNG_LFSR1_HI	0x0130	/* RNG LFSR1 [47:32] */
+#define	SAFE_RNG_LFSR2_LO	0x0134	/* RNG LFSR1 [31:0] */
+#define	SAFE_RNG_LFSR2_HI	0x0138	/* RNG LFSR1 [47:32] */
+
+#define	SAFE_PE_CSR_READY	0x00000001	/* ready for processing */
+#define	SAFE_PE_CSR_DONE	0x00000002	/* h/w completed processing */
+#define	SAFE_PE_CSR_LOADSA	0x00000004	/* load SA digests */
+#define	SAFE_PE_CSR_HASHFINAL	0x00000010	/* do hash pad & write result */
+#define	SAFE_PE_CSR_SABUSID	0x000000c0	/* bus id for SA */
+#define	SAFE_PE_CSR_SAPCI	0x00000040	/* PCI bus id for SA */
+#define	SAFE_PE_CSR_NXTHDR	0x0000ff00	/* next hdr value for IPsec */
+#define	SAFE_PE_CSR_FPAD	0x0000ff00	/* fixed pad for basic ops */
+#define	SAFE_PE_CSR_STATUS	0x00ff0000	/* operation result status */
+#define	SAFE_PE_CSR_AUTH_FAIL	0x00010000	/* ICV mismatch (inbound) */
+#define	SAFE_PE_CSR_PAD_FAIL	0x00020000	/* pad verify fail (inbound) */
+#define	SAFE_PE_CSR_SEQ_FAIL	0x00040000	/* sequence number (inbound) */
+#define	SAFE_PE_CSR_XERROR	0x00080000	/* extended error follows */
+#define	SAFE_PE_CSR_XECODE	0x00f00000	/* extended error code */
+#define	SAFE_PE_CSR_XECODE_S	20
+#define	SAFE_PE_CSR_XECODE_BADCMD	0	/* invalid command */
+#define	SAFE_PE_CSR_XECODE_BADALG	1	/* invalid algorithm */
+#define	SAFE_PE_CSR_XECODE_ALGDIS	2	/* algorithm disabled */
+#define	SAFE_PE_CSR_XECODE_ZEROLEN	3	/* zero packet length */
+#define	SAFE_PE_CSR_XECODE_DMAERR	4	/* bus DMA error */
+#define	SAFE_PE_CSR_XECODE_PIPEABORT	5	/* secondary bus DMA error */
+#define	SAFE_PE_CSR_XECODE_BADSPI	6	/* IPsec SPI mismatch */
+#define	SAFE_PE_CSR_XECODE_TIMEOUT	10	/* failsafe timeout */
+#define	SAFE_PE_CSR_PAD		0xff000000	/* ESP padding control/status */
+#define	SAFE_PE_CSR_PAD_MIN	0x00000000	/* minimum IPsec padding */
+#define	SAFE_PE_CSR_PAD_16	0x08000000	/* pad to 16-byte boundary */
+#define	SAFE_PE_CSR_PAD_32	0x10000000	/* pad to 32-byte boundary */
+#define	SAFE_PE_CSR_PAD_64	0x20000000	/* pad to 64-byte boundary */
+#define	SAFE_PE_CSR_PAD_128	0x40000000	/* pad to 128-byte boundary */
+#define	SAFE_PE_CSR_PAD_256	0x80000000	/* pad to 256-byte boundary */
+
+/*
+ * Check the CSR to see if the PE has returned ownership to
+ * the host.  Note that before processing a descriptor this
+ * must be done followed by a check of the SAFE_PE_LEN register
+ * status bits to avoid premature processing of a descriptor
+ * on its way back to the host.
+ */
+#define	SAFE_PE_CSR_IS_DONE(_csr) \
+    (((_csr) & (SAFE_PE_CSR_READY | SAFE_PE_CSR_DONE)) == SAFE_PE_CSR_DONE)
+
+#define	SAFE_PE_LEN_LENGTH	0x000fffff	/* total length (bytes) */
+#define	SAFE_PE_LEN_READY	0x00400000	/* ready for processing */
+#define	SAFE_PE_LEN_DONE	0x00800000	/* h/w completed processing */
+#define	SAFE_PE_LEN_BYPASS	0xff000000	/* bypass offset (bytes) */
+#define	SAFE_PE_LEN_BYPASS_S	24
+
+#define	SAFE_PE_LEN_IS_DONE(_len) \
+    (((_len) & (SAFE_PE_LEN_READY | SAFE_PE_LEN_DONE)) == SAFE_PE_LEN_DONE)
+
+/* NB: these apply to HU_STAT, HM_STAT, HI_CLR, and HI_MASK */
+#define	SAFE_INT_PE_CDONE	0x00000002	/* PE context done */
+#define	SAFE_INT_PE_DDONE	0x00000008	/* PE descriptor done */
+#define	SAFE_INT_PE_ERROR	0x00000010	/* PE error */
+#define	SAFE_INT_PE_ODONE	0x00000020	/* PE operation done */
+
+#define	SAFE_HI_CFG_PULSE	0x00000001	/* use pulse interrupt */
+#define	SAFE_HI_CFG_LEVEL	0x00000000	/* use level interrupt */
+#define	SAFE_HI_CFG_AUTOCLR	0x00000002	/* auto-clear pulse interrupt */
+
+#define	SAFE_ENDIAN_PASS	0x000000e4	/* straight pass-thru */
+#define	SAFE_ENDIAN_SWAB	0x0000001b	/* swap bytes in 32-bit word */
+
+#define	SAFE_PE_DMACFG_PERESET	0x00000001	/* reset packet engine */
+#define	SAFE_PE_DMACFG_PDRRESET	0x00000002	/* reset PDR counters/ptrs */
+#define	SAFE_PE_DMACFG_SGRESET	0x00000004	/* reset scatter/gather cache */
+#define	SAFE_PE_DMACFG_FSENA	0x00000008	/* enable failsafe reset */
+#define	SAFE_PE_DMACFG_PEMODE	0x00000100	/* packet engine mode */
+#define	SAFE_PE_DMACFG_SAPREC	0x00000200	/* SA precedes packet */
+#define	SAFE_PE_DMACFG_PKFOLL	0x00000400	/* packet follows descriptor */
+#define	SAFE_PE_DMACFG_GPRBID	0x00003000	/* gather particle ring busid */
+#define	SAFE_PE_DMACFG_GPRPCI	0x00001000	/* PCI gather particle ring */
+#define	SAFE_PE_DMACFG_SPRBID	0x0000c000	/* scatter part. ring busid */
+#define	SAFE_PE_DMACFG_SPRPCI	0x00004000	/* PCI scatter part. ring */
+#define	SAFE_PE_DMACFG_ESDESC	0x00010000	/* endian swap descriptors */
+#define	SAFE_PE_DMACFG_ESSA	0x00020000	/* endian swap SA data */
+#define	SAFE_PE_DMACFG_ESPACKET	0x00040000	/* endian swap packet data */
+#define	SAFE_PE_DMACFG_ESPDESC	0x00080000	/* endian swap particle desc. */
+#define	SAFE_PE_DMACFG_NOPDRUP	0x00100000	/* supp. PDR ownership update */
+#define	SAFE_PD_EDMACFG_PCIMODE	0x01000000	/* PCI target mode */
+
+#define	SAFE_PE_DMASTAT_PEIDONE	0x00000001	/* PE core input done */
+#define	SAFE_PE_DMASTAT_PEODONE	0x00000002	/* PE core output done */
+#define	SAFE_PE_DMASTAT_ENCDONE	0x00000004	/* encryption done */
+#define	SAFE_PE_DMASTAT_IHDONE	0x00000008	/* inner hash done */
+#define	SAFE_PE_DMASTAT_OHDONE	0x00000010	/* outer hash (HMAC) done */
+#define	SAFE_PE_DMASTAT_PADFLT	0x00000020	/* crypto pad fault */
+#define	SAFE_PE_DMASTAT_ICVFLT	0x00000040	/* ICV fault */
+#define	SAFE_PE_DMASTAT_SPIMIS	0x00000080	/* SPI mismatch */
+#define	SAFE_PE_DMASTAT_CRYPTO	0x00000100	/* crypto engine timeout */
+#define	SAFE_PE_DMASTAT_CQACT	0x00000200	/* command queue active */
+#define	SAFE_PE_DMASTAT_IRACT	0x00000400	/* input request active */
+#define	SAFE_PE_DMASTAT_ORACT	0x00000800	/* output request active */
+#define	SAFE_PE_DMASTAT_PEISIZE	0x003ff000	/* PE input size:32-bit words */
+#define	SAFE_PE_DMASTAT_PEOSIZE	0xffc00000	/* PE out. size:32-bit words */
+
+#define	SAFE_PE_RINGCFG_SIZE	0x000003ff	/* ring size (descriptors) */
+#define	SAFE_PE_RINGCFG_OFFSET	0xffff0000	/* offset btw desc's (dwords) */
+#define	SAFE_PE_RINGCFG_OFFSET_S	16
+
+#define	SAFE_PE_RINGPOLL_POLL	0x00000fff	/* polling frequency/divisor */
+#define	SAFE_PE_RINGPOLL_RETRY	0x03ff0000	/* polling frequency/divisor */
+#define	SAFE_PE_RINGPOLL_CONT	0x80000000	/* continuously poll */
+
+#define	SAFE_PE_IRNGSTAT_CQAVAIL 0x00000001	/* command queue available */
+
+#define	SAFE_PE_ERNGSTAT_NEXT	0x03ff0000	/* index of next packet desc. */
+#define	SAFE_PE_ERNGSTAT_NEXT_S	16
+
+#define	SAFE_PE_IOTHRESH_INPUT	0x000003ff	/* input threshold (dwords) */
+#define	SAFE_PE_IOTHRESH_OUTPUT	0x03ff0000	/* output threshold (dwords) */
+
+#define	SAFE_PE_PARTCFG_SIZE	0x0000ffff	/* scatter particle size */
+#define	SAFE_PE_PARTCFG_GBURST	0x00030000	/* gather particle burst */
+#define	SAFE_PE_PARTCFG_GBURST_2	0x00000000
+#define	SAFE_PE_PARTCFG_GBURST_4	0x00010000
+#define	SAFE_PE_PARTCFG_GBURST_8	0x00020000
+#define	SAFE_PE_PARTCFG_GBURST_16	0x00030000
+#define	SAFE_PE_PARTCFG_SBURST	0x000c0000	/* scatter particle burst */
+#define	SAFE_PE_PARTCFG_SBURST_2	0x00000000
+#define	SAFE_PE_PARTCFG_SBURST_4	0x00040000
+#define	SAFE_PE_PARTCFG_SBURST_8	0x00080000
+#define	SAFE_PE_PARTCFG_SBURST_16	0x000c0000
+
+#define	SAFE_PE_PARTSIZE_SCAT	0xffff0000	/* scatter particle ring size */
+#define	SAFE_PE_PARTSIZE_GATH	0x0000ffff	/* gather particle ring size */
+
+#define	SAFE_CRYPTO_CTRL_3DES	0x00000001	/* enable 3DES support */
+#define	SAFE_CRYPTO_CTRL_PKEY	0x00010000	/* enable public key support */
+#define	SAFE_CRYPTO_CTRL_RNG	0x00020000	/* enable RNG support */
+
+#define	SAFE_DEVINFO_REV_MIN	0x0000000f	/* minor rev for chip */
+#define	SAFE_DEVINFO_REV_MAJ	0x000000f0	/* major rev for chip */
+#define	SAFE_DEVINFO_REV_MAJ_S	4
+#define	SAFE_DEVINFO_DES	0x00000100	/* DES/3DES support present */
+#define	SAFE_DEVINFO_ARC4	0x00000200	/* ARC4 support present */
+#define	SAFE_DEVINFO_AES	0x00000400	/* AES support present */
+#define	SAFE_DEVINFO_MD5	0x00001000	/* MD5 support present */
+#define	SAFE_DEVINFO_SHA1	0x00002000	/* SHA-1 support present */
+#define	SAFE_DEVINFO_RIPEMD	0x00004000	/* RIPEMD support present */
+#define	SAFE_DEVINFO_DEFLATE	0x00010000	/* Deflate support present */
+#define	SAFE_DEVINFO_SARAM	0x00100000	/* on-chip SA RAM present */
+#define	SAFE_DEVINFO_EMIBUS	0x00200000	/* EMI bus present */
+#define	SAFE_DEVINFO_PKEY	0x00400000	/* public key support present */
+#define	SAFE_DEVINFO_RNG	0x00800000	/* RNG present */
+
+#define	SAFE_REV(_maj, _min)	(((_maj) << SAFE_DEVINFO_REV_MAJ_S) | (_min))
+#define	SAFE_REV_MAJ(_chiprev) \
+	(((_chiprev) & SAFE_DEVINFO_REV_MAJ) >> SAFE_DEVINFO_REV_MAJ_S)
+#define	SAFE_REV_MIN(_chiprev)	((_chiprev) & SAFE_DEVINFO_REV_MIN)
+
+#define	SAFE_PK_FUNC_MULT	0x00000001	/* Multiply function */
+#define	SAFE_PK_FUNC_SQUARE	0x00000004	/* Square function */
+#define	SAFE_PK_FUNC_ADD	0x00000010	/* Add function */
+#define	SAFE_PK_FUNC_SUB	0x00000020	/* Subtract function */
+#define	SAFE_PK_FUNC_LSHIFT	0x00000040	/* Left-shift function */
+#define	SAFE_PK_FUNC_RSHIFT	0x00000080	/* Right-shift function */
+#define	SAFE_PK_FUNC_DIV	0x00000100	/* Divide function */
+#define	SAFE_PK_FUNC_CMP	0x00000400	/* Compare function */
+#define	SAFE_PK_FUNC_COPY	0x00000800	/* Copy function */
+#define	SAFE_PK_FUNC_EXP16	0x00002000	/* Exponentiate (4-bit ACT) */
+#define	SAFE_PK_FUNC_EXP4	0x00004000	/* Exponentiate (2-bit ACT) */
+#define	SAFE_PK_FUNC_RUN	0x00008000	/* start/status */
+
+#define	SAFE_RNG_STAT_BUSY	0x00000001	/* busy, data not valid */
+
+#define	SAFE_RNG_CTRL_PRE_LFSR	0x00000001	/* enable output pre-LFSR */
+#define	SAFE_RNG_CTRL_TST_MODE	0x00000002	/* enable test mode */
+#define	SAFE_RNG_CTRL_TST_RUN	0x00000004	/* start test state machine */
+#define	SAFE_RNG_CTRL_ENA_RING1	0x00000008	/* test entropy oscillator #1 */
+#define	SAFE_RNG_CTRL_ENA_RING2	0x00000010	/* test entropy oscillator #2 */
+#define	SAFE_RNG_CTRL_DIS_ALARM	0x00000020	/* disable RNG alarm reports */
+#define	SAFE_RNG_CTRL_TST_CLOCK	0x00000040	/* enable test clock */
+#define	SAFE_RNG_CTRL_SHORTEN	0x00000080	/* shorten state timers */
+#define	SAFE_RNG_CTRL_TST_ALARM	0x00000100	/* simulate alarm state */
+#define	SAFE_RNG_CTRL_RST_LFSR	0x00000200	/* reset LFSR */
+
+/*
+ * Packet engine descriptor.  Note that d_csr is a copy of the
+ * SAFE_PE_CSR register and all definitions apply, and d_len
+ * is a copy of the SAFE_PE_LEN register and all definitions apply.
+ * d_src and d_len may point directly to contiguous data or to a
+ * list of ``particle descriptors'' when using scatter/gather i/o.
+ */
+struct safe_desc {
+	u_int32_t	d_csr;			/* per-packet control/status */
+	u_int32_t	d_src;			/* source address */
+	u_int32_t	d_dst;			/* destination address */
+	u_int32_t	d_sa;			/* SA address */
+	u_int32_t	d_len;			/* length, bypass, status */
+};
+
+/*
+ * Scatter/Gather particle descriptor.
+ *
+ * NB: scatter descriptors do not specify a size; this is fixed
+ *     by the setting of the SAFE_PE_PARTCFG register.
+ */
+struct safe_pdesc {
+	u_int32_t	pd_addr;		/* particle address */
+#ifdef __BIG_ENDIAN
+	u_int16_t	pd_flags;		/* control word */
+	u_int16_t	pd_size;		/* particle size (bytes) */
+#else
+	u_int16_t	pd_flags;		/* control word */
+	u_int16_t	pd_size;		/* particle size (bytes) */
+#endif
+};
+
+#define	SAFE_PD_READY	0x0001			/* ready for processing */
+#define	SAFE_PD_DONE	0x0002			/* h/w completed processing */
+
+/*
+ * Security Association (SA) Record (Rev 1).  One of these is
+ * required for each operation processed by the packet engine.
+ */
+struct safe_sarec {
+	u_int32_t	sa_cmd0;
+	u_int32_t	sa_cmd1;
+	u_int32_t	sa_resv0;
+	u_int32_t	sa_resv1;
+	u_int32_t	sa_key[8];		/* DES/3DES/AES key */
+	u_int32_t	sa_indigest[5];		/* inner digest */
+	u_int32_t	sa_outdigest[5];	/* outer digest */
+	u_int32_t	sa_spi;			/* SPI */
+	u_int32_t	sa_seqnum;		/* sequence number */
+	u_int32_t	sa_seqmask[2];		/* sequence number mask */
+	u_int32_t	sa_resv2;
+	u_int32_t	sa_staterec;		/* address of state record */
+	u_int32_t	sa_resv3[2];
+	u_int32_t	sa_samgmt0;		/* SA management field 0 */
+	u_int32_t	sa_samgmt1;		/* SA management field 0 */
+};
+
+#define	SAFE_SA_CMD0_OP		0x00000007	/* operation code */
+#define	SAFE_SA_CMD0_OP_CRYPT	0x00000000	/* encrypt/decrypt (basic) */
+#define	SAFE_SA_CMD0_OP_BOTH	0x00000001	/* encrypt-hash/hash-decrypto */
+#define	SAFE_SA_CMD0_OP_HASH	0x00000003	/* hash (outbound-only) */
+#define	SAFE_SA_CMD0_OP_ESP	0x00000000	/* ESP in/out (proto) */
+#define	SAFE_SA_CMD0_OP_AH	0x00000001	/* AH in/out (proto) */
+#define	SAFE_SA_CMD0_INBOUND	0x00000008	/* inbound operation */
+#define	SAFE_SA_CMD0_OUTBOUND	0x00000000	/* outbound operation */
+#define	SAFE_SA_CMD0_GROUP	0x00000030	/* operation group */
+#define	SAFE_SA_CMD0_BASIC	0x00000000	/* basic operation */
+#define	SAFE_SA_CMD0_PROTO	0x00000010	/* protocol/packet operation */
+#define	SAFE_SA_CMD0_BUNDLE	0x00000020	/* bundled operation (resvd) */
+#define	SAFE_SA_CMD0_PAD	0x000000c0	/* crypto pad method */
+#define	SAFE_SA_CMD0_PAD_IPSEC	0x00000000	/* IPsec padding */
+#define	SAFE_SA_CMD0_PAD_PKCS7	0x00000040	/* PKCS#7 padding */
+#define	SAFE_SA_CMD0_PAD_CONS	0x00000080	/* constant padding */
+#define	SAFE_SA_CMD0_PAD_ZERO	0x000000c0	/* zero padding */
+#define	SAFE_SA_CMD0_CRYPT_ALG	0x00000f00	/* symmetric crypto algorithm */
+#define	SAFE_SA_CMD0_DES	0x00000000	/* DES crypto algorithm */
+#define	SAFE_SA_CMD0_3DES	0x00000100	/* 3DES crypto algorithm */
+#define	SAFE_SA_CMD0_AES	0x00000300	/* AES crypto algorithm */
+#define	SAFE_SA_CMD0_CRYPT_NULL	0x00000f00	/* null crypto algorithm */
+#define	SAFE_SA_CMD0_HASH_ALG	0x0000f000	/* hash algorithm */
+#define	SAFE_SA_CMD0_MD5	0x00000000	/* MD5 hash algorithm */
+#define	SAFE_SA_CMD0_SHA1	0x00001000	/* SHA-1 hash algorithm */
+#define	SAFE_SA_CMD0_HASH_NULL	0x0000f000	/* null hash algorithm */
+#define	SAFE_SA_CMD0_HDR_PROC	0x00080000	/* header processing */
+#define	SAFE_SA_CMD0_IBUSID	0x00300000	/* input bus id */
+#define	SAFE_SA_CMD0_IPCI	0x00100000	/* PCI input bus id */
+#define	SAFE_SA_CMD0_OBUSID	0x00c00000	/* output bus id */
+#define	SAFE_SA_CMD0_OPCI	0x00400000	/* PCI output bus id */
+#define	SAFE_SA_CMD0_IVLD	0x03000000	/* IV loading */
+#define	SAFE_SA_CMD0_IVLD_NONE	0x00000000	/* IV no load (reuse) */
+#define	SAFE_SA_CMD0_IVLD_IBUF	0x01000000	/* IV load from input buffer */
+#define	SAFE_SA_CMD0_IVLD_STATE	0x02000000	/* IV load from state */
+#define	SAFE_SA_CMD0_HSLD	0x0c000000	/* hash state loading */
+#define	SAFE_SA_CMD0_HSLD_SA	0x00000000	/* hash state load from SA */
+#define	SAFE_SA_CMD0_HSLD_STATE	0x08000000	/* hash state load from state */
+#define	SAFE_SA_CMD0_HSLD_NONE	0x0c000000	/* hash state no load */
+#define	SAFE_SA_CMD0_SAVEIV	0x10000000	/* save IV */
+#define	SAFE_SA_CMD0_SAVEHASH	0x20000000	/* save hash state */
+#define	SAFE_SA_CMD0_IGATHER	0x40000000	/* input gather */
+#define	SAFE_SA_CMD0_OSCATTER	0x80000000	/* output scatter */
+
+#define	SAFE_SA_CMD1_HDRCOPY	0x00000002	/* copy header to output */
+#define	SAFE_SA_CMD1_PAYCOPY	0x00000004	/* copy payload to output */
+#define	SAFE_SA_CMD1_PADCOPY	0x00000008	/* copy pad to output */
+#define	SAFE_SA_CMD1_IPV4	0x00000000	/* IPv4 protocol */
+#define	SAFE_SA_CMD1_IPV6	0x00000010	/* IPv6 protocol */
+#define	SAFE_SA_CMD1_MUTABLE	0x00000020	/* mutable bit processing */
+#define	SAFE_SA_CMD1_SRBUSID	0x000000c0	/* state record bus id */
+#define	SAFE_SA_CMD1_SRPCI	0x00000040	/* state record from PCI */
+#define	SAFE_SA_CMD1_CRMODE	0x00000300	/* crypto mode */
+#define	SAFE_SA_CMD1_ECB	0x00000000	/* ECB crypto mode */
+#define	SAFE_SA_CMD1_CBC	0x00000100	/* CBC crypto mode */
+#define	SAFE_SA_CMD1_OFB	0x00000200	/* OFB crypto mode */
+#define	SAFE_SA_CMD1_CFB	0x00000300	/* CFB crypto mode */
+#define	SAFE_SA_CMD1_CRFEEDBACK	0x00000c00	/* crypto feedback mode */
+#define	SAFE_SA_CMD1_64BIT	0x00000000	/* 64-bit crypto feedback */
+#define	SAFE_SA_CMD1_8BIT	0x00000400	/* 8-bit crypto feedback */
+#define	SAFE_SA_CMD1_1BIT	0x00000800	/* 1-bit crypto feedback */
+#define	SAFE_SA_CMD1_128BIT	0x00000c00	/* 128-bit crypto feedback */
+#define	SAFE_SA_CMD1_OPTIONS	0x00001000	/* HMAC/options mutable bit */
+#define	SAFE_SA_CMD1_HMAC	SAFE_SA_CMD1_OPTIONS
+#define	SAFE_SA_CMD1_SAREV1	0x00008000	/* SA Revision 1 */
+#define	SAFE_SA_CMD1_OFFSET	0x00ff0000	/* hash/crypto offset(dwords) */
+#define	SAFE_SA_CMD1_OFFSET_S	16
+#define	SAFE_SA_CMD1_AESKEYLEN	0x0f000000	/* AES key length */
+#define	SAFE_SA_CMD1_AES128	0x02000000	/* 128-bit AES key */
+#define	SAFE_SA_CMD1_AES192	0x03000000	/* 192-bit AES key */
+#define	SAFE_SA_CMD1_AES256	0x04000000	/* 256-bit AES key */
+
+/* 
+ * Security Associate State Record (Rev 1).
+ */
+struct safe_sastate {
+	u_int32_t	sa_saved_iv[4];		/* saved IV (DES/3DES/AES) */
+	u_int32_t	sa_saved_hashbc;	/* saved hash byte count */
+	u_int32_t	sa_saved_indigest[5];	/* saved inner digest */
+};
+#endif /* _SAFE_SAFEREG_H_ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/safevar.h b/trunk/target/linux/generic/files/crypto/ocf/safe/safevar.h
new file mode 100644
index 00000000..11d8304a
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/safevar.h
@@ -0,0 +1,229 @@
+/*-
+ * The linux port of this code done by David McCullough
+ * Copyright (C) 2004-2010 David McCullough <david_mccullough@mcafee.com>
+ * The license and original author are listed below.
+ *
+ * Copyright (c) 2003 Sam Leffler, Errno Consulting
+ * Copyright (c) 2003 Global Technology Associates, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/dev/safe/safevar.h,v 1.2 2006/05/17 18:34:26 pjd Exp $
+ */
+#ifndef _SAFE_SAFEVAR_H_
+#define	_SAFE_SAFEVAR_H_
+
+/* Maximum queue length */
+#ifndef SAFE_MAX_NQUEUE
+#define SAFE_MAX_NQUEUE	60
+#endif
+
+#define	SAFE_MAX_PART		64	/* Maximum scatter/gather depth */
+#define	SAFE_DMA_BOUNDARY	0	/* No boundary for source DMA ops */
+#define	SAFE_MAX_DSIZE		2048 /* MCLBYTES Fixed scatter particle size */
+#define	SAFE_MAX_SSIZE		0x0ffff	/* Maximum gather particle size */
+#define	SAFE_MAX_DMA		0xfffff	/* Maximum PE operand size (20 bits) */
+/* total src+dst particle descriptors */
+#define	SAFE_TOTAL_DPART	(SAFE_MAX_NQUEUE * SAFE_MAX_PART)
+#define	SAFE_TOTAL_SPART	(SAFE_MAX_NQUEUE * SAFE_MAX_PART)
+
+#define	SAFE_RNG_MAXBUFSIZ	128	/* 32-bit words */
+
+#define	SAFE_CARD(sid)		(((sid) & 0xf0000000) >> 28)
+#define	SAFE_SESSION(sid)	( (sid) & 0x0fffffff)
+#define	SAFE_SID(crd, sesn)	(((crd) << 28) | ((sesn) & 0x0fffffff))
+
+#define SAFE_DEF_RTY		0xff	/* PCI Retry Timeout */
+#define SAFE_DEF_TOUT		0xff	/* PCI TRDY Timeout */
+#define SAFE_DEF_CACHELINE	0x01	/* Cache Line setting */
+
+#ifdef __KERNEL__
+/*
+ * State associated with the allocation of each chunk
+ * of memory setup for DMA.
+ */
+struct safe_dma_alloc {
+	dma_addr_t		dma_paddr;
+	void			*dma_vaddr;
+};
+
+/*
+ * Cryptographic operand state.  One of these exists for each
+ * source and destination operand passed in from the crypto
+ * subsystem.  When possible source and destination operands
+ * refer to the same memory.  More often they are distinct.
+ * We track the virtual address of each operand as well as
+ * where each is mapped for DMA.
+ */
+struct safe_operand {
+	union {
+		struct sk_buff *skb;
+		struct uio *io;
+	} u;
+	void			*map;
+	int				mapsize;	/* total number of bytes in segs */
+	struct {
+		dma_addr_t	ds_addr;
+		int			ds_len;
+		int			ds_tlen;
+	} segs[SAFE_MAX_PART];
+	int				nsegs;
+};
+
+/*
+ * Packet engine ring entry and cryptographic operation state.
+ * The packet engine requires a ring of descriptors that contain
+ * pointers to various cryptographic state.  However the ring
+ * configuration register allows you to specify an arbitrary size
+ * for ring entries.  We use this feature to collect most of the
+ * state for each cryptographic request into one spot.  Other than
+ * ring entries only the ``particle descriptors'' (scatter/gather
+ * lists) and the actual operand data are kept separate.  The
+ * particle descriptors must also be organized in rings.  The
+ * operand data can be located aribtrarily (modulo alignment constraints).
+ *
+ * Note that the descriptor ring is mapped onto the PCI bus so
+ * the hardware can DMA data.  This means the entire ring must be
+ * contiguous.
+ */
+struct safe_ringentry {
+	struct safe_desc	re_desc;	/* command descriptor */
+	struct safe_sarec	re_sa;		/* SA record */
+	struct safe_sastate	re_sastate;	/* SA state record */
+
+	struct cryptop		*re_crp;	/* crypto operation */
+
+	struct safe_operand	re_src;		/* source operand */
+	struct safe_operand	re_dst;		/* destination operand */
+
+	int			re_sesn;	/* crypto session ID */
+	int			re_flags;
+#define	SAFE_QFLAGS_COPYOUTIV	0x1		/* copy back on completion */
+#define	SAFE_QFLAGS_COPYOUTICV	0x2		/* copy back on completion */
+};
+
+#define	re_src_skb	re_src.u.skb
+#define	re_src_io	re_src.u.io
+#define	re_src_map	re_src.map
+#define	re_src_nsegs	re_src.nsegs
+#define	re_src_segs	re_src.segs
+#define	re_src_mapsize	re_src.mapsize
+
+#define	re_dst_skb	re_dst.u.skb
+#define	re_dst_io	re_dst.u.io
+#define	re_dst_map	re_dst.map
+#define	re_dst_nsegs	re_dst.nsegs
+#define	re_dst_segs	re_dst.segs
+#define	re_dst_mapsize	re_dst.mapsize
+
+struct rndstate_test;
+
+struct safe_session {
+	u_int32_t	ses_used;
+	u_int32_t	ses_klen;		/* key length in bits */
+	u_int32_t	ses_key[8];		/* DES/3DES/AES key */
+	u_int32_t	ses_mlen;		/* hmac length in bytes */
+	u_int32_t	ses_hminner[5];		/* hmac inner state */
+	u_int32_t	ses_hmouter[5];		/* hmac outer state */
+};
+
+struct safe_pkq {
+	struct list_head	pkq_list;
+	struct cryptkop		*pkq_krp;
+};
+
+struct safe_softc {
+	softc_device_decl	sc_dev;
+	u32			sc_irq;
+
+	struct pci_dev		*sc_pcidev;
+	ocf_iomem_t		sc_base_addr;
+
+	u_int			sc_chiprev;	/* major/minor chip revision */
+	int			sc_flags;	/* device specific flags */
+#define	SAFE_FLAGS_KEY		0x01		/* has key accelerator */
+#define	SAFE_FLAGS_RNG		0x02		/* hardware rng */
+	int			sc_suspended;
+	int			sc_needwakeup;	/* notify crypto layer */
+	int32_t			sc_cid;		/* crypto tag */
+
+	struct safe_dma_alloc	sc_ringalloc;	/* PE ring allocation state */
+	struct safe_ringentry	*sc_ring;	/* PE ring */
+	struct safe_ringentry	*sc_ringtop;	/* PE ring top */
+	struct safe_ringentry	*sc_front;	/* next free entry */
+	struct safe_ringentry	*sc_back;	/* next pending entry */
+	int			sc_nqchip;	/* # passed to chip */
+	spinlock_t		sc_ringmtx;	/* PE ring lock */
+	struct safe_pdesc	*sc_spring;	/* src particle ring */
+	struct safe_pdesc	*sc_springtop;	/* src particle ring top */
+	struct safe_pdesc	*sc_spfree;	/* next free src particle */
+	struct safe_dma_alloc	sc_spalloc;	/* src particle ring state */
+	struct safe_pdesc	*sc_dpring;	/* dest particle ring */
+	struct safe_pdesc	*sc_dpringtop;	/* dest particle ring top */
+	struct safe_pdesc	*sc_dpfree;	/* next free dest particle */
+	struct safe_dma_alloc	sc_dpalloc;	/* dst particle ring state */
+	int			sc_nsessions;	/* # of sessions */
+	struct safe_session	*sc_sessions;	/* sessions */
+
+	struct timer_list	sc_pkto;	/* PK polling */
+	spinlock_t		sc_pkmtx;	/* PK lock */
+	struct list_head	sc_pkq;		/* queue of PK requests */
+	struct safe_pkq		*sc_pkq_cur;	/* current processing request */
+	u_int32_t		sc_pk_reslen, sc_pk_resoff;
+
+	int			sc_max_dsize;	/* maximum safe DMA size */
+};
+#endif /* __KERNEL__ */
+
+struct safe_stats {
+	u_int64_t st_ibytes;
+	u_int64_t st_obytes;
+	u_int32_t st_ipackets;
+	u_int32_t st_opackets;
+	u_int32_t st_invalid;		/* invalid argument */
+	u_int32_t st_badsession;	/* invalid session id */
+	u_int32_t st_badflags;		/* flags indicate !(mbuf | uio) */
+	u_int32_t st_nodesc;		/* op submitted w/o descriptors */
+	u_int32_t st_badalg;		/* unsupported algorithm */
+	u_int32_t st_ringfull;		/* PE descriptor ring full */
+	u_int32_t st_peoperr;		/* PE marked error */
+	u_int32_t st_dmaerr;		/* PE DMA error */
+	u_int32_t st_bypasstoobig;	/* bypass > 96 bytes */
+	u_int32_t st_skipmismatch;	/* enc part begins before auth part */
+	u_int32_t st_lenmismatch;	/* enc length different auth length */
+	u_int32_t st_coffmisaligned;	/* crypto offset not 32-bit aligned */
+	u_int32_t st_cofftoobig;	/* crypto offset > 255 words */
+	u_int32_t st_iovmisaligned;	/* iov op not aligned */
+	u_int32_t st_iovnotuniform;	/* iov op not suitable */
+	u_int32_t st_unaligned;		/* unaligned src caused copy */
+	u_int32_t st_notuniform;	/* non-uniform src caused copy */
+	u_int32_t st_nomap;		/* bus_dmamap_create failed */
+	u_int32_t st_noload;		/* bus_dmamap_load_* failed */
+	u_int32_t st_nombuf;		/* MGET* failed */
+	u_int32_t st_nomcl;		/* MCLGET* failed */
+	u_int32_t st_maxqchip;		/* max mcr1 ops out for processing */
+	u_int32_t st_rng;		/* RNG requests */
+	u_int32_t st_rngalarm;		/* RNG alarm requests */
+	u_int32_t st_noicvcopy;		/* ICV data copies suppressed */
+};
+#endif /* _SAFE_SAFEVAR_H_ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/sha1.c b/trunk/target/linux/generic/files/crypto/ocf/safe/sha1.c
new file mode 100644
index 00000000..4e360e20
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/sha1.c
@@ -0,0 +1,279 @@
+/*	$KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $	*/
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
+ * based on: http://csrc.nist.gov/fips/fip180-1.txt
+ * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
+ */
+
+#if 0
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/crypto/sha1.c,v 1.9 2003/06/10 21:36:57 obrien Exp $");
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+
+#include <crypto/sha1.h>
+#endif
+
+/* sanity check */
+#if BYTE_ORDER != BIG_ENDIAN
+# if BYTE_ORDER != LITTLE_ENDIAN
+#  define unsupported 1
+# endif
+#endif
+
+#ifndef unsupported
+
+/* constant table */
+static u_int32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
+#define	K(t)	_K[(t) / 20]
+
+#define	F0(b, c, d)	(((b) & (c)) | ((~(b)) & (d)))
+#define	F1(b, c, d)	(((b) ^ (c)) ^ (d))
+#define	F2(b, c, d)	(((b) & (c)) | ((b) & (d)) | ((c) & (d)))
+#define	F3(b, c, d)	(((b) ^ (c)) ^ (d))
+
+#define	S(n, x)		(((x) << (n)) | ((x) >> (32 - n)))
+
+#undef H
+#define	H(n)	(ctxt->h.b32[(n)])
+#define	COUNT	(ctxt->count)
+#define	BCOUNT	(ctxt->c.b64[0] / 8)
+#define	W(n)	(ctxt->m.b32[(n)])
+
+#define	PUTBYTE(x)	{ \
+	ctxt->m.b8[(COUNT % 64)] = (x);		\
+	COUNT++;				\
+	COUNT %= 64;				\
+	ctxt->c.b64[0] += 8;			\
+	if (COUNT % 64 == 0)			\
+		sha1_step(ctxt);		\
+     }
+
+#define	PUTPAD(x)	{ \
+	ctxt->m.b8[(COUNT % 64)] = (x);		\
+	COUNT++;				\
+	COUNT %= 64;				\
+	if (COUNT % 64 == 0)			\
+		sha1_step(ctxt);		\
+     }
+
+static void sha1_step(struct sha1_ctxt *);
+
+static void
+sha1_step(ctxt)
+	struct sha1_ctxt *ctxt;
+{
+	u_int32_t	a, b, c, d, e;
+	size_t t, s;
+	u_int32_t	tmp;
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+	struct sha1_ctxt tctxt;
+	bcopy(&ctxt->m.b8[0], &tctxt.m.b8[0], 64);
+	ctxt->m.b8[0] = tctxt.m.b8[3]; ctxt->m.b8[1] = tctxt.m.b8[2];
+	ctxt->m.b8[2] = tctxt.m.b8[1]; ctxt->m.b8[3] = tctxt.m.b8[0];
+	ctxt->m.b8[4] = tctxt.m.b8[7]; ctxt->m.b8[5] = tctxt.m.b8[6];
+	ctxt->m.b8[6] = tctxt.m.b8[5]; ctxt->m.b8[7] = tctxt.m.b8[4];
+	ctxt->m.b8[8] = tctxt.m.b8[11]; ctxt->m.b8[9] = tctxt.m.b8[10];
+	ctxt->m.b8[10] = tctxt.m.b8[9]; ctxt->m.b8[11] = tctxt.m.b8[8];
+	ctxt->m.b8[12] = tctxt.m.b8[15]; ctxt->m.b8[13] = tctxt.m.b8[14];
+	ctxt->m.b8[14] = tctxt.m.b8[13]; ctxt->m.b8[15] = tctxt.m.b8[12];
+	ctxt->m.b8[16] = tctxt.m.b8[19]; ctxt->m.b8[17] = tctxt.m.b8[18];
+	ctxt->m.b8[18] = tctxt.m.b8[17]; ctxt->m.b8[19] = tctxt.m.b8[16];
+	ctxt->m.b8[20] = tctxt.m.b8[23]; ctxt->m.b8[21] = tctxt.m.b8[22];
+	ctxt->m.b8[22] = tctxt.m.b8[21]; ctxt->m.b8[23] = tctxt.m.b8[20];
+	ctxt->m.b8[24] = tctxt.m.b8[27]; ctxt->m.b8[25] = tctxt.m.b8[26];
+	ctxt->m.b8[26] = tctxt.m.b8[25]; ctxt->m.b8[27] = tctxt.m.b8[24];
+	ctxt->m.b8[28] = tctxt.m.b8[31]; ctxt->m.b8[29] = tctxt.m.b8[30];
+	ctxt->m.b8[30] = tctxt.m.b8[29]; ctxt->m.b8[31] = tctxt.m.b8[28];
+	ctxt->m.b8[32] = tctxt.m.b8[35]; ctxt->m.b8[33] = tctxt.m.b8[34];
+	ctxt->m.b8[34] = tctxt.m.b8[33]; ctxt->m.b8[35] = tctxt.m.b8[32];
+	ctxt->m.b8[36] = tctxt.m.b8[39]; ctxt->m.b8[37] = tctxt.m.b8[38];
+	ctxt->m.b8[38] = tctxt.m.b8[37]; ctxt->m.b8[39] = tctxt.m.b8[36];
+	ctxt->m.b8[40] = tctxt.m.b8[43]; ctxt->m.b8[41] = tctxt.m.b8[42];
+	ctxt->m.b8[42] = tctxt.m.b8[41]; ctxt->m.b8[43] = tctxt.m.b8[40];
+	ctxt->m.b8[44] = tctxt.m.b8[47]; ctxt->m.b8[45] = tctxt.m.b8[46];
+	ctxt->m.b8[46] = tctxt.m.b8[45]; ctxt->m.b8[47] = tctxt.m.b8[44];
+	ctxt->m.b8[48] = tctxt.m.b8[51]; ctxt->m.b8[49] = tctxt.m.b8[50];
+	ctxt->m.b8[50] = tctxt.m.b8[49]; ctxt->m.b8[51] = tctxt.m.b8[48];
+	ctxt->m.b8[52] = tctxt.m.b8[55]; ctxt->m.b8[53] = tctxt.m.b8[54];
+	ctxt->m.b8[54] = tctxt.m.b8[53]; ctxt->m.b8[55] = tctxt.m.b8[52];
+	ctxt->m.b8[56] = tctxt.m.b8[59]; ctxt->m.b8[57] = tctxt.m.b8[58];
+	ctxt->m.b8[58] = tctxt.m.b8[57]; ctxt->m.b8[59] = tctxt.m.b8[56];
+	ctxt->m.b8[60] = tctxt.m.b8[63]; ctxt->m.b8[61] = tctxt.m.b8[62];
+	ctxt->m.b8[62] = tctxt.m.b8[61]; ctxt->m.b8[63] = tctxt.m.b8[60];
+#endif
+
+	a = H(0); b = H(1); c = H(2); d = H(3); e = H(4);
+
+	for (t = 0; t < 20; t++) {
+		s = t & 0x0f;
+		if (t >= 16) {
+			W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
+		}
+		tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t);
+		e = d; d = c; c = S(30, b); b = a; a = tmp;
+	}
+	for (t = 20; t < 40; t++) {
+		s = t & 0x0f;
+		W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
+		tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t);
+		e = d; d = c; c = S(30, b); b = a; a = tmp;
+	}
+	for (t = 40; t < 60; t++) {
+		s = t & 0x0f;
+		W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
+		tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t);
+		e = d; d = c; c = S(30, b); b = a; a = tmp;
+	}
+	for (t = 60; t < 80; t++) {
+		s = t & 0x0f;
+		W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
+		tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t);
+		e = d; d = c; c = S(30, b); b = a; a = tmp;
+	}
+
+	H(0) = H(0) + a;
+	H(1) = H(1) + b;
+	H(2) = H(2) + c;
+	H(3) = H(3) + d;
+	H(4) = H(4) + e;
+
+	bzero(&ctxt->m.b8[0], 64);
+}
+
+/*------------------------------------------------------------*/
+
+void
+sha1_init(ctxt)
+	struct sha1_ctxt *ctxt;
+{
+	bzero(ctxt, sizeof(struct sha1_ctxt));
+	H(0) = 0x67452301;
+	H(1) = 0xefcdab89;
+	H(2) = 0x98badcfe;
+	H(3) = 0x10325476;
+	H(4) = 0xc3d2e1f0;
+}
+
+void
+sha1_pad(ctxt)
+	struct sha1_ctxt *ctxt;
+{
+	size_t padlen;		/*pad length in bytes*/
+	size_t padstart;
+
+	PUTPAD(0x80);
+
+	padstart = COUNT % 64;
+	padlen = 64 - padstart;
+	if (padlen < 8) {
+		bzero(&ctxt->m.b8[padstart], padlen);
+		COUNT += padlen;
+		COUNT %= 64;
+		sha1_step(ctxt);
+		padstart = COUNT % 64;	/* should be 0 */
+		padlen = 64 - padstart;	/* should be 64 */
+	}
+	bzero(&ctxt->m.b8[padstart], padlen - 8);
+	COUNT += (padlen - 8);
+	COUNT %= 64;
+#if BYTE_ORDER == BIG_ENDIAN
+	PUTPAD(ctxt->c.b8[0]); PUTPAD(ctxt->c.b8[1]);
+	PUTPAD(ctxt->c.b8[2]); PUTPAD(ctxt->c.b8[3]);
+	PUTPAD(ctxt->c.b8[4]); PUTPAD(ctxt->c.b8[5]);
+	PUTPAD(ctxt->c.b8[6]); PUTPAD(ctxt->c.b8[7]);
+#else
+	PUTPAD(ctxt->c.b8[7]); PUTPAD(ctxt->c.b8[6]);
+	PUTPAD(ctxt->c.b8[5]); PUTPAD(ctxt->c.b8[4]);
+	PUTPAD(ctxt->c.b8[3]); PUTPAD(ctxt->c.b8[2]);
+	PUTPAD(ctxt->c.b8[1]); PUTPAD(ctxt->c.b8[0]);
+#endif
+}
+
+void
+sha1_loop(ctxt, input, len)
+	struct sha1_ctxt *ctxt;
+	const u_int8_t *input;
+	size_t len;
+{
+	size_t gaplen;
+	size_t gapstart;
+	size_t off;
+	size_t copysiz;
+
+	off = 0;
+
+	while (off < len) {
+		gapstart = COUNT % 64;
+		gaplen = 64 - gapstart;
+
+		copysiz = (gaplen < len - off) ? gaplen : len - off;
+		bcopy(&input[off], &ctxt->m.b8[gapstart], copysiz);
+		COUNT += copysiz;
+		COUNT %= 64;
+		ctxt->c.b64[0] += copysiz * 8;
+		if (COUNT % 64 == 0)
+			sha1_step(ctxt);
+		off += copysiz;
+	}
+}
+
+void
+sha1_result(ctxt, digest0)
+	struct sha1_ctxt *ctxt;
+	caddr_t digest0;
+{
+	u_int8_t *digest;
+
+	digest = (u_int8_t *)digest0;
+	sha1_pad(ctxt);
+#if BYTE_ORDER == BIG_ENDIAN
+	bcopy(&ctxt->h.b8[0], digest, 20);
+#else
+	digest[0] = ctxt->h.b8[3]; digest[1] = ctxt->h.b8[2];
+	digest[2] = ctxt->h.b8[1]; digest[3] = ctxt->h.b8[0];
+	digest[4] = ctxt->h.b8[7]; digest[5] = ctxt->h.b8[6];
+	digest[6] = ctxt->h.b8[5]; digest[7] = ctxt->h.b8[4];
+	digest[8] = ctxt->h.b8[11]; digest[9] = ctxt->h.b8[10];
+	digest[10] = ctxt->h.b8[9]; digest[11] = ctxt->h.b8[8];
+	digest[12] = ctxt->h.b8[15]; digest[13] = ctxt->h.b8[14];
+	digest[14] = ctxt->h.b8[13]; digest[15] = ctxt->h.b8[12];
+	digest[16] = ctxt->h.b8[19]; digest[17] = ctxt->h.b8[18];
+	digest[18] = ctxt->h.b8[17]; digest[19] = ctxt->h.b8[16];
+#endif
+}
+
+#endif /*unsupported*/
diff --git a/trunk/target/linux/generic/files/crypto/ocf/safe/sha1.h b/trunk/target/linux/generic/files/crypto/ocf/safe/sha1.h
new file mode 100644
index 00000000..0e19d907
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/safe/sha1.h
@@ -0,0 +1,72 @@
+/*	$FreeBSD: src/sys/crypto/sha1.h,v 1.8 2002/03/20 05:13:50 alfred Exp $	*/
+/*	$KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
+ * based on: http://csrc.nist.gov/fips/fip180-1.txt
+ * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
+ */
+
+#ifndef _NETINET6_SHA1_H_
+#define _NETINET6_SHA1_H_
+
+struct sha1_ctxt {
+	union {
+		u_int8_t	b8[20];
+		u_int32_t	b32[5];
+	} h;
+	union {
+		u_int8_t	b8[8];
+		u_int64_t	b64[1];
+	} c;
+	union {
+		u_int8_t	b8[64];
+		u_int32_t	b32[16];
+	} m;
+	u_int8_t	count;
+};
+
+#ifdef __KERNEL__
+extern void sha1_init(struct sha1_ctxt *);
+extern void sha1_pad(struct sha1_ctxt *);
+extern void sha1_loop(struct sha1_ctxt *, const u_int8_t *, size_t);
+extern void sha1_result(struct sha1_ctxt *, caddr_t);
+
+/* compatibilty with other SHA1 source codes */
+typedef struct sha1_ctxt SHA1_CTX;
+#define SHA1Init(x)		sha1_init((x))
+#define SHA1Update(x, y, z)	sha1_loop((x), (y), (z))
+#define SHA1Final(x, y)		sha1_result((y), (x))
+#endif /* __KERNEL__ */
+
+#define	SHA1_RESULTLEN	(160/8)
+
+#endif /*_NETINET6_SHA1_H_*/
diff --git a/trunk/target/linux/generic/files/crypto/ocf/talitos/Makefile b/trunk/target/linux/generic/files/crypto/ocf/talitos/Makefile
new file mode 100644
index 00000000..2591b8ae
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/talitos/Makefile
@@ -0,0 +1,12 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_TALITOS) += talitos.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos.c b/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos.c
new file mode 100644
index 00000000..c4bc8c0f
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos.c
@@ -0,0 +1,1355 @@
+/*
+ * crypto/ocf/talitos/talitos.c
+ *
+ * An OCF-Linux module that uses Freescale's SEC to do the crypto.
+ * Based on crypto/ocf/hifn and crypto/ocf/safe OCF drivers
+ *
+ * Copyright (c) 2006 Freescale Semiconductor, Inc.
+ *
+ * This code written by Kim A. B. Phillips <kim.phillips@freescale.com>
+ * some code copied from files with the following:
+ * Copyright (C) 2004-2007 David McCullough <david_mccullough@mcafee.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ---------------------------------------------------------------------------
+ *
+ * NOTES:
+ *
+ * The Freescale SEC (also known as 'talitos') resides on the
+ * internal bus, and runs asynchronous to the processor core.  It has
+ * a wide gamut of cryptographic acceleration features, including single-
+ * pass IPsec (also known as algorithm chaining).  To properly utilize 
+ * all of the SEC's performance enhancing features, further reworking 
+ * of higher level code (framework, applications) will be necessary.
+ *
+ * The following table shows which SEC version is present in which devices:
+ * 
+ * Devices       SEC version
+ *
+ * 8272, 8248    SEC 1.0
+ * 885, 875      SEC 1.2
+ * 8555E, 8541E  SEC 2.0
+ * 8349E         SEC 2.01
+ * 8548E         SEC 2.1
+ *
+ * The following table shows the features offered by each SEC version:
+ *
+ * 	                       Max.   chan-
+ * version  Bus I/F       Clock  nels  DEU AESU AFEU MDEU PKEU RNG KEU
+ *
+ * SEC 1.0  internal 64b  100MHz   4     1    1    1    1    1   1   0
+ * SEC 1.2  internal 32b   66MHz   1     1    1    0    1    0   0   0
+ * SEC 2.0  internal 64b  166MHz   4     1    1    1    1    1   1   0
+ * SEC 2.01 internal 64b  166MHz   4     1    1    1    1    1   1   0
+ * SEC 2.1  internal 64b  333MHz   4     1    1    1    1    1   1   1
+ *
+ * Each execution unit in the SEC has two modes of execution; channel and
+ * slave/debug.  This driver employs the channel infrastructure in the
+ * device for convenience.  Only the RNG is directly accessed due to the
+ * convenience of its random fifo pool.  The relationship between the
+ * channels and execution units is depicted in the following diagram:
+ *
+ *    -------   ------------
+ * ---| ch0 |---|          |
+ *    -------   |          |
+ *              |          |------+-------+-------+-------+------------
+ *    -------   |          |      |       |       |       |           |
+ * ---| ch1 |---|          |      |       |       |       |           |
+ *    -------   |          |   ------  ------  ------  ------      ------
+ *              |controller|   |DEU |  |AESU|  |MDEU|  |PKEU| ...  |RNG |
+ *    -------   |          |   ------  ------  ------  ------      ------
+ * ---| ch2 |---|          |      |       |       |       |           |
+ *    -------   |          |      |       |       |       |           |
+ *              |          |------+-------+-------+-------+------------
+ *    -------   |          |
+ * ---| ch3 |---|          |
+ *    -------   ------------
+ *
+ * Channel ch0 may drive an aes operation to the aes unit (AESU),
+ * and, at the same time, ch1 may drive a message digest operation
+ * to the mdeu. Each channel has an input descriptor FIFO, and the 
+ * FIFO can contain, e.g. on the 8541E, up to 24 entries, before a
+ * a buffer overrun error is triggered. The controller is responsible
+ * for fetching the data from descriptor pointers, and passing the 
+ * data to the appropriate EUs. The controller also writes the 
+ * cryptographic operation's result to memory. The SEC notifies 
+ * completion by triggering an interrupt and/or setting the 1st byte 
+ * of the hdr field to 0xff.
+ *
+ * TODO:
+ * o support more algorithms
+ * o support more versions of the SEC
+ * o add support for linux 2.4
+ * o scatter-gather (sg) support
+ * o add support for public key ops (PKEU)
+ * o add statistics
+ */
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
+#include <linux/config.h>
+#endif
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <asm/scatterlist.h>
+#include <linux/dma-mapping.h>  /* dma_map_single() */
+#include <linux/moduleparam.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+#include <linux/platform_device.h>
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+#include <linux/of_platform.h>
+#endif
+
+#include <cryptodev.h>
+#include <uio.h>
+
+#define DRV_NAME "talitos" 
+
+#include "talitos_dev.h"
+#include "talitos_soft.h"
+
+#define read_random(p,l) get_random_bytes(p,l)
+
+const char talitos_driver_name[] = "Talitos OCF";
+const char talitos_driver_version[] = "0.2";
+
+static int talitos_newsession(device_t dev, u_int32_t *sidp,
+								struct cryptoini *cri);
+static int talitos_freesession(device_t dev, u_int64_t tid);
+static int talitos_process(device_t dev, struct cryptop *crp, int hint);
+static void dump_talitos_status(struct talitos_softc *sc);
+static int talitos_submit(struct talitos_softc *sc, struct talitos_desc *td, 
+								int chsel);
+static void talitos_doneprocessing(struct talitos_softc *sc);
+static void talitos_init_device(struct talitos_softc *sc);
+static void talitos_reset_device_master(struct talitos_softc *sc);
+static void talitos_reset_device(struct talitos_softc *sc);
+static void talitos_errorprocessing(struct talitos_softc *sc);
+#ifdef CONFIG_PPC_MERGE
+static int talitos_probe(struct of_device *ofdev, const struct of_device_id *match);
+static int talitos_remove(struct of_device *ofdev);
+#else
+static int talitos_probe(struct platform_device *pdev);
+static int talitos_remove(struct platform_device *pdev);
+#endif
+#ifdef CONFIG_OCF_RANDOMHARVEST
+static int talitos_read_random(void *arg, u_int32_t *buf, int maxwords);
+static void talitos_rng_init(struct talitos_softc *sc);
+#endif
+
+static device_method_t talitos_methods = {
+	/* crypto device methods */
+	DEVMETHOD(cryptodev_newsession,	talitos_newsession),
+	DEVMETHOD(cryptodev_freesession,talitos_freesession),
+	DEVMETHOD(cryptodev_process,	talitos_process),
+};
+
+#define debug talitos_debug
+int talitos_debug = 0;
+module_param(talitos_debug, int, 0644);
+MODULE_PARM_DESC(talitos_debug, "Enable debug");
+
+static inline void talitos_write(volatile unsigned *addr, u32 val)
+{
+        out_be32(addr, val);
+}
+
+static inline u32 talitos_read(volatile unsigned *addr)
+{
+        u32 val;
+        val = in_be32(addr);
+        return val;
+}
+
+static void dump_talitos_status(struct talitos_softc *sc)
+{
+	unsigned int v, v_hi, i, *ptr;
+	v = talitos_read(sc->sc_base_addr + TALITOS_MCR);
+	v_hi = talitos_read(sc->sc_base_addr + TALITOS_MCR_HI);
+	printk(KERN_INFO "%s: MCR          0x%08x_%08x\n",
+			device_get_nameunit(sc->sc_cdev), v, v_hi);
+	v = talitos_read(sc->sc_base_addr + TALITOS_IMR);
+	v_hi = talitos_read(sc->sc_base_addr + TALITOS_IMR_HI);
+	printk(KERN_INFO "%s: IMR          0x%08x_%08x\n",
+			device_get_nameunit(sc->sc_cdev), v, v_hi);
+	v = talitos_read(sc->sc_base_addr + TALITOS_ISR);
+	v_hi = talitos_read(sc->sc_base_addr + TALITOS_ISR_HI);
+	printk(KERN_INFO "%s: ISR          0x%08x_%08x\n",
+			device_get_nameunit(sc->sc_cdev), v, v_hi);
+	for (i = 0; i < sc->sc_num_channels; i++) { 
+		v = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
+			TALITOS_CH_CDPR);
+		v_hi = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
+			TALITOS_CH_CDPR_HI);
+		printk(KERN_INFO "%s: CDPR     ch%d 0x%08x_%08x\n", 
+				device_get_nameunit(sc->sc_cdev), i, v, v_hi);
+	}
+	for (i = 0; i < sc->sc_num_channels; i++) { 
+		v = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
+			TALITOS_CH_CCPSR);
+		v_hi = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
+			TALITOS_CH_CCPSR_HI);
+		printk(KERN_INFO "%s: CCPSR    ch%d 0x%08x_%08x\n", 
+				device_get_nameunit(sc->sc_cdev), i, v, v_hi);
+	}
+	ptr = sc->sc_base_addr + TALITOS_CH_DESCBUF;
+	for (i = 0; i < 16; i++) { 
+		v = talitos_read(ptr++); v_hi = talitos_read(ptr++);
+		printk(KERN_INFO "%s: DESCBUF  ch0 0x%08x_%08x (tdp%02d)\n", 
+				device_get_nameunit(sc->sc_cdev), v, v_hi, i);
+	}
+	return;
+}
+
+
+#ifdef CONFIG_OCF_RANDOMHARVEST
+/* 
+ * pull random numbers off the RNG FIFO, not exceeding amount available
+ */
+static int
+talitos_read_random(void *arg, u_int32_t *buf, int maxwords)
+{
+	struct talitos_softc *sc = (struct talitos_softc *) arg;
+	int rc;
+	u_int32_t v;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	/* check for things like FIFO underflow */
+	v = talitos_read(sc->sc_base_addr + TALITOS_RNGISR_HI);
+	if (unlikely(v)) {
+		printk(KERN_ERR "%s: RNGISR_HI error %08x\n",
+				device_get_nameunit(sc->sc_cdev), v);
+		return 0;
+	}
+	/*
+	 * OFL is number of available 64-bit words, 
+	 * shift and convert to a 32-bit word count
+	 */
+	v = talitos_read(sc->sc_base_addr + TALITOS_RNGSR_HI);
+	v = (v & TALITOS_RNGSR_HI_OFL) >> (16 - 1);
+	if (maxwords > v)
+		maxwords = v;
+	for (rc = 0; rc < maxwords; rc++) {
+		buf[rc] = talitos_read(sc->sc_base_addr + 
+			TALITOS_RNG_FIFO + rc*sizeof(u_int32_t));
+	}
+	if (maxwords & 1) {
+		/* 
+		 * RNG will complain with an AE in the RNGISR
+		 * if we don't complete the pairs of 32-bit reads
+		 * to its 64-bit register based FIFO
+		 */
+		v = talitos_read(sc->sc_base_addr + 
+			TALITOS_RNG_FIFO + rc*sizeof(u_int32_t));
+	}
+
+	return rc;
+}
+
+static void
+talitos_rng_init(struct talitos_softc *sc)
+{
+	u_int32_t v;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+	/* reset RNG EU */
+	v = talitos_read(sc->sc_base_addr + TALITOS_RNGRCR_HI);
+	v |= TALITOS_RNGRCR_HI_SR;
+	talitos_write(sc->sc_base_addr + TALITOS_RNGRCR_HI, v);
+	while ((talitos_read(sc->sc_base_addr + TALITOS_RNGSR_HI) 
+		& TALITOS_RNGSR_HI_RD) == 0)
+			cpu_relax();
+	/*
+	 * we tell the RNG to start filling the RNG FIFO
+	 * by writing the RNGDSR 
+	 */
+	v = talitos_read(sc->sc_base_addr + TALITOS_RNGDSR_HI);
+	talitos_write(sc->sc_base_addr + TALITOS_RNGDSR_HI, v);
+	/*
+	 * 64 bits of data will be pushed onto the FIFO every 
+	 * 256 SEC cycles until the FIFO is full.  The RNG then 
+	 * attempts to keep the FIFO full.
+	 */
+	v = talitos_read(sc->sc_base_addr + TALITOS_RNGISR_HI);
+	if (v) {
+		printk(KERN_ERR "%s: RNGISR_HI error %08x\n",
+			device_get_nameunit(sc->sc_cdev), v);
+		return;
+	}
+	/*
+	 * n.b. we need to add a FIPS test here - if the RNG is going 
+	 * to fail, it's going to fail at reset time
+	 */
+	return;
+}
+#endif /* CONFIG_OCF_RANDOMHARVEST */
+
+/*
+ * Generate a new software session.
+ */
+static int
+talitos_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
+{
+	struct cryptoini *c, *encini = NULL, *macini = NULL;
+	struct talitos_softc *sc = device_get_softc(dev);
+	struct talitos_session *ses = NULL;
+	int sesn;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+	if (sidp == NULL || cri == NULL || sc == NULL) {
+		DPRINTF("%s,%d - EINVAL\n", __FILE__, __LINE__);
+		return EINVAL;
+	}
+	for (c = cri; c != NULL; c = c->cri_next) {
+		if (c->cri_alg == CRYPTO_MD5 ||
+		    c->cri_alg == CRYPTO_MD5_HMAC ||
+		    c->cri_alg == CRYPTO_SHA1 ||
+		    c->cri_alg == CRYPTO_SHA1_HMAC ||
+		    c->cri_alg == CRYPTO_NULL_HMAC) {
+			if (macini)
+				return EINVAL;
+			macini = c;
+		} else if (c->cri_alg == CRYPTO_DES_CBC ||
+		    c->cri_alg == CRYPTO_3DES_CBC ||
+		    c->cri_alg == CRYPTO_AES_CBC ||
+		    c->cri_alg == CRYPTO_NULL_CBC) {
+			if (encini)
+				return EINVAL;
+			encini = c;
+		} else {
+			DPRINTF("UNKNOWN c->cri_alg %d\n", encini->cri_alg);
+			return EINVAL;
+		}
+	}
+	if (encini == NULL && macini == NULL)
+		return EINVAL;
+	if (encini) {	
+		/* validate key length */
+		switch (encini->cri_alg) {
+		case CRYPTO_DES_CBC:
+			if (encini->cri_klen != 64)
+				return EINVAL;
+			break;
+		case CRYPTO_3DES_CBC:
+			if (encini->cri_klen != 192) {
+				return EINVAL;
+			}
+			break;
+		case CRYPTO_AES_CBC:
+			if (encini->cri_klen != 128 &&
+			    encini->cri_klen != 192 &&
+			    encini->cri_klen != 256)
+				return EINVAL;
+			break;
+		default:
+			DPRINTF("UNKNOWN encini->cri_alg %d\n", 
+				encini->cri_alg);
+			return EINVAL;
+		}
+	}
+
+	if (sc->sc_sessions == NULL) {
+		ses = sc->sc_sessions = (struct talitos_session *)
+			kmalloc(sizeof(struct talitos_session), SLAB_ATOMIC);
+		if (ses == NULL)
+			return ENOMEM;
+		memset(ses, 0, sizeof(struct talitos_session));
+		sesn = 0;
+		sc->sc_nsessions = 1;
+	} else {
+		for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
+			if (sc->sc_sessions[sesn].ses_used == 0) {
+				ses = &sc->sc_sessions[sesn];
+				break;
+			}
+		}
+
+		if (ses == NULL) {
+			/* allocating session */
+			sesn = sc->sc_nsessions;
+			ses = (struct talitos_session *) kmalloc(
+				(sesn + 1) * sizeof(struct talitos_session), 
+				SLAB_ATOMIC);
+			if (ses == NULL)
+				return ENOMEM;
+			memset(ses, 0,
+				(sesn + 1) * sizeof(struct talitos_session));
+			memcpy(ses, sc->sc_sessions, 
+				sesn * sizeof(struct talitos_session));
+			memset(sc->sc_sessions, 0,
+				sesn * sizeof(struct talitos_session));
+			kfree(sc->sc_sessions);
+			sc->sc_sessions = ses;
+			ses = &sc->sc_sessions[sesn];
+			sc->sc_nsessions++;
+		}
+	}
+
+	ses->ses_used = 1;
+
+	if (encini) {
+		ses->ses_klen = (encini->cri_klen + 7) / 8;
+		memcpy(ses->ses_key, encini->cri_key, ses->ses_klen);
+		if (macini) {
+			/* doing hash on top of cipher */
+			ses->ses_hmac_len = (macini->cri_klen + 7) / 8;
+			memcpy(ses->ses_hmac, macini->cri_key,
+				ses->ses_hmac_len);
+		}
+	} else if (macini) {
+		/* doing hash */
+		ses->ses_klen = (macini->cri_klen + 7) / 8;
+		memcpy(ses->ses_key, macini->cri_key, ses->ses_klen);
+	}
+
+	/* back compat way of determining MSC result len */
+	if (macini) {
+		ses->ses_mlen = macini->cri_mlen;
+		if (ses->ses_mlen == 0) {
+			if (macini->cri_alg == CRYPTO_MD5_HMAC)
+				ses->ses_mlen = MD5_HASH_LEN;
+			else
+				ses->ses_mlen = SHA1_HASH_LEN;
+		}
+	}
+
+	/* really should make up a template td here, 
+	 * and only fill things like i/o and direction in process() */
+
+	/* assign session ID */
+	*sidp = TALITOS_SID(sc->sc_num, sesn);
+	return 0;
+}
+
+/*
+ * Deallocate a session.
+ */
+static int
+talitos_freesession(device_t dev, u_int64_t tid)
+{
+	struct talitos_softc *sc = device_get_softc(dev);
+	int session, ret;
+	u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
+
+	if (sc == NULL)
+		return EINVAL;
+	session = TALITOS_SESSION(sid);
+	if (session < sc->sc_nsessions) {
+		memset(&sc->sc_sessions[session], 0,
+			sizeof(sc->sc_sessions[session]));
+		ret = 0;
+	} else
+		ret = EINVAL;
+	return ret;
+}
+
+/*
+ * launch device processing - it will come back with done notification 
+ * in the form of an interrupt and/or HDR_DONE_BITS in header 
+ */
+static int 
+talitos_submit(
+	struct talitos_softc *sc,
+	struct talitos_desc *td,
+	int chsel)
+{
+	u_int32_t v;
+
+	v = dma_map_single(NULL, td, sizeof(*td), DMA_TO_DEVICE);
+	talitos_write(sc->sc_base_addr + 
+		chsel*TALITOS_CH_OFFSET + TALITOS_CH_FF, 0);
+	talitos_write(sc->sc_base_addr + 
+		chsel*TALITOS_CH_OFFSET + TALITOS_CH_FF_HI, v);
+	return 0;
+}
+
+static int
+talitos_process(device_t dev, struct cryptop *crp, int hint)
+{
+	int i, err = 0, ivsize;
+	struct talitos_softc *sc = device_get_softc(dev);
+	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
+	caddr_t iv;
+	struct talitos_session *ses;
+	struct talitos_desc *td;
+	unsigned long flags;
+	/* descriptor mappings */
+	int hmac_key, hmac_data, cipher_iv, cipher_key, 
+		in_fifo, out_fifo, cipher_iv_out;
+	static int chsel = -1;
+	u_int32_t rand_iv[4];
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	if (crp == NULL || crp->crp_callback == NULL || sc == NULL) {
+		return EINVAL;
+	}
+	crp->crp_etype = 0;
+	if (TALITOS_SESSION(crp->crp_sid) >= sc->sc_nsessions) {
+		return EINVAL;
+	}
+
+	ses = &sc->sc_sessions[TALITOS_SESSION(crp->crp_sid)];
+
+        /* enter the channel scheduler */ 
+	spin_lock_irqsave(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
+
+	/* reuse channel that already had/has requests for the required EU */
+	for (i = 0; i < sc->sc_num_channels; i++) {
+		if (sc->sc_chnlastalg[i] == crp->crp_desc->crd_alg)
+			break;
+	}
+	if (i == sc->sc_num_channels) {
+		/*
+		 * haven't seen this algo the last sc_num_channels or more
+		 * use round robin in this case
+	 	 * nb: sc->sc_num_channels must be power of 2 
+		 */
+		chsel = (chsel + 1) & (sc->sc_num_channels - 1);
+	} else {
+		/*
+		 * matches channel with same target execution unit; 
+		 * use same channel in this case
+		 */
+		chsel = i;
+	}
+	sc->sc_chnlastalg[chsel] = crp->crp_desc->crd_alg;
+
+        /* release the channel scheduler lock */ 
+	spin_unlock_irqrestore(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
+
+	/* acquire the selected channel fifo lock */
+	spin_lock_irqsave(&sc->sc_chnfifolock[chsel], flags);
+
+	/* find and reserve next available descriptor-cryptop pair */
+	for (i = 0; i < sc->sc_chfifo_len; i++) {
+		if (sc->sc_chnfifo[chsel][i].cf_desc.hdr == 0) {
+			/* 
+			 * ensure correct descriptor formation by
+			 * avoiding inadvertently setting "optional" entries
+			 * e.g. not using "optional" dptr2 for MD/HMAC descs
+			 */
+			memset(&sc->sc_chnfifo[chsel][i].cf_desc,
+				0, sizeof(*td));
+			/* reserve it with done notification request bit */
+			sc->sc_chnfifo[chsel][i].cf_desc.hdr |= 
+				TALITOS_DONE_NOTIFY;
+			break;
+		}
+	}
+	spin_unlock_irqrestore(&sc->sc_chnfifolock[chsel], flags);
+
+	if (i == sc->sc_chfifo_len) {
+		/* fifo full */
+		err = ERESTART;
+		goto errout;
+	}
+	
+	td = &sc->sc_chnfifo[chsel][i].cf_desc;
+	sc->sc_chnfifo[chsel][i].cf_crp = crp;
+
+	crd1 = crp->crp_desc;
+	if (crd1 == NULL) {
+		err = EINVAL;
+		goto errout;
+	}
+	crd2 = crd1->crd_next;
+	/* prevent compiler warning */
+	hmac_key = 0;
+	hmac_data = 0;
+	if (crd2 == NULL) {
+		td->hdr |= TD_TYPE_COMMON_NONSNOOP_NO_AFEU;
+		/* assign descriptor dword ptr mappings for this desc. type */
+		cipher_iv = 1;
+		cipher_key = 2;
+		in_fifo = 3;
+		cipher_iv_out = 5;
+		if (crd1->crd_alg == CRYPTO_MD5_HMAC ||
+		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
+		    crd1->crd_alg == CRYPTO_SHA1 ||
+		    crd1->crd_alg == CRYPTO_MD5) {
+			out_fifo = 5;
+			maccrd = crd1;
+			enccrd = NULL;
+		} else if (crd1->crd_alg == CRYPTO_DES_CBC ||
+		    crd1->crd_alg == CRYPTO_3DES_CBC ||
+		    crd1->crd_alg == CRYPTO_AES_CBC ||
+		    crd1->crd_alg == CRYPTO_ARC4) {
+			out_fifo = 4;
+			maccrd = NULL;
+			enccrd = crd1;
+		} else {
+			DPRINTF("UNKNOWN crd1->crd_alg %d\n", crd1->crd_alg);
+			err = EINVAL;
+			goto errout;
+		}
+	} else {
+		if (sc->sc_desc_types & TALITOS_HAS_DT_IPSEC_ESP) {
+			td->hdr |= TD_TYPE_IPSEC_ESP;
+		} else {
+			DPRINTF("unimplemented: multiple descriptor ipsec\n");
+			err = EINVAL;
+			goto errout;
+		}
+		/* assign descriptor dword ptr mappings for this desc. type */
+		hmac_key = 0;
+		hmac_data = 1;
+		cipher_iv = 2;
+		cipher_key = 3;
+		in_fifo = 4;
+		out_fifo = 5;
+		cipher_iv_out = 6;
+		if ((crd1->crd_alg == CRYPTO_MD5_HMAC ||
+                     crd1->crd_alg == CRYPTO_SHA1_HMAC ||
+                     crd1->crd_alg == CRYPTO_MD5 ||
+                     crd1->crd_alg == CRYPTO_SHA1) &&
+		    (crd2->crd_alg == CRYPTO_DES_CBC ||
+		     crd2->crd_alg == CRYPTO_3DES_CBC ||
+		     crd2->crd_alg == CRYPTO_AES_CBC ||
+		     crd2->crd_alg == CRYPTO_ARC4) &&
+		    ((crd2->crd_flags & CRD_F_ENCRYPT) == 0)) {
+			maccrd = crd1;
+			enccrd = crd2;
+		} else if ((crd1->crd_alg == CRYPTO_DES_CBC ||
+		     crd1->crd_alg == CRYPTO_ARC4 ||
+		     crd1->crd_alg == CRYPTO_3DES_CBC ||
+		     crd1->crd_alg == CRYPTO_AES_CBC) &&
+		    (crd2->crd_alg == CRYPTO_MD5_HMAC ||
+                     crd2->crd_alg == CRYPTO_SHA1_HMAC ||
+                     crd2->crd_alg == CRYPTO_MD5 ||
+                     crd2->crd_alg == CRYPTO_SHA1) &&
+		    (crd1->crd_flags & CRD_F_ENCRYPT)) {
+			enccrd = crd1;
+			maccrd = crd2;
+		} else {
+			/* We cannot order the SEC as requested */
+			printk("%s: cannot do the order\n",
+					device_get_nameunit(sc->sc_cdev));
+			err = EINVAL;
+			goto errout;
+		}
+	}
+	/* assign in_fifo and out_fifo based on input/output struct type */
+	if (crp->crp_flags & CRYPTO_F_SKBUF) {
+		/* using SKB buffers */
+		struct sk_buff *skb = (struct sk_buff *)crp->crp_buf;
+		if (skb_shinfo(skb)->nr_frags) {
+			printk("%s: skb frags unimplemented\n",
+					device_get_nameunit(sc->sc_cdev));
+			err = EINVAL;
+			goto errout;
+		}
+		td->ptr[in_fifo].ptr = dma_map_single(NULL, skb->data, 
+			skb->len, DMA_TO_DEVICE);
+		td->ptr[in_fifo].len = skb->len;
+		td->ptr[out_fifo].ptr = dma_map_single(NULL, skb->data, 
+			skb->len, DMA_TO_DEVICE);
+		td->ptr[out_fifo].len = skb->len;
+		td->ptr[hmac_data].ptr = dma_map_single(NULL, skb->data,
+			skb->len, DMA_TO_DEVICE);
+	} else if (crp->crp_flags & CRYPTO_F_IOV) {
+		/* using IOV buffers */
+		struct uio *uiop = (struct uio *)crp->crp_buf;
+		if (uiop->uio_iovcnt > 1) {
+			printk("%s: iov frags unimplemented\n",
+					device_get_nameunit(sc->sc_cdev));
+			err = EINVAL;
+			goto errout;
+		}
+		td->ptr[in_fifo].ptr = dma_map_single(NULL,
+			uiop->uio_iov->iov_base, crp->crp_ilen, DMA_TO_DEVICE);
+		td->ptr[in_fifo].len = crp->crp_ilen;
+		/* crp_olen is never set; always use crp_ilen */
+		td->ptr[out_fifo].ptr = dma_map_single(NULL,
+			uiop->uio_iov->iov_base,
+			crp->crp_ilen, DMA_TO_DEVICE);
+		td->ptr[out_fifo].len = crp->crp_ilen;
+	} else {
+		/* using contig buffers */
+		td->ptr[in_fifo].ptr = dma_map_single(NULL,
+			crp->crp_buf, crp->crp_ilen, DMA_TO_DEVICE);
+		td->ptr[in_fifo].len = crp->crp_ilen;
+		td->ptr[out_fifo].ptr = dma_map_single(NULL,
+			crp->crp_buf, crp->crp_ilen, DMA_TO_DEVICE);
+		td->ptr[out_fifo].len = crp->crp_ilen;
+	}
+	if (enccrd) {
+		switch (enccrd->crd_alg) {
+		case CRYPTO_3DES_CBC:
+			td->hdr |= TALITOS_MODE0_DEU_3DES;
+			/* FALLTHROUGH */
+		case CRYPTO_DES_CBC:
+			td->hdr |= TALITOS_SEL0_DEU
+				|  TALITOS_MODE0_DEU_CBC;
+			if (enccrd->crd_flags & CRD_F_ENCRYPT)
+				td->hdr |= TALITOS_MODE0_DEU_ENC;
+			ivsize = 2*sizeof(u_int32_t);
+			DPRINTF("%cDES ses %d ch %d len %d\n",
+				(td->hdr & TALITOS_MODE0_DEU_3DES)?'3':'1',
+				(u32)TALITOS_SESSION(crp->crp_sid),
+				chsel, td->ptr[in_fifo].len);
+			break;
+		case CRYPTO_AES_CBC:
+			td->hdr |= TALITOS_SEL0_AESU
+				|  TALITOS_MODE0_AESU_CBC;
+			if (enccrd->crd_flags & CRD_F_ENCRYPT)
+				td->hdr |= TALITOS_MODE0_AESU_ENC;
+			ivsize = 4*sizeof(u_int32_t);
+			DPRINTF("AES  ses %d ch %d len %d\n",
+				(u32)TALITOS_SESSION(crp->crp_sid),
+				chsel, td->ptr[in_fifo].len);
+			break;
+		default:
+			printk("%s: unimplemented enccrd->crd_alg %d\n",
+					device_get_nameunit(sc->sc_cdev), enccrd->crd_alg);
+			err = EINVAL;
+			goto errout;
+		}
+		/*
+		 * Setup encrypt/decrypt state.  When using basic ops
+		 * we can't use an inline IV because hash/crypt offset
+		 * must be from the end of the IV to the start of the
+		 * crypt data and this leaves out the preceding header
+		 * from the hash calculation.  Instead we place the IV
+		 * in the state record and set the hash/crypt offset to
+		 * copy both the header+IV.
+		 */
+		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
+			td->hdr |= TALITOS_DIR_OUTBOUND; 
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+				iv = enccrd->crd_iv;
+			else
+				read_random((iv = (caddr_t) rand_iv), sizeof(rand_iv));
+			if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+				crypto_copyback(crp->crp_flags, crp->crp_buf,
+				    enccrd->crd_inject, ivsize, iv);
+			}
+		} else {
+			td->hdr |= TALITOS_DIR_INBOUND; 
+			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
+				iv = enccrd->crd_iv;
+			} else {
+				iv = (caddr_t) rand_iv;
+				crypto_copydata(crp->crp_flags, crp->crp_buf,
+				    enccrd->crd_inject, ivsize, iv);
+			}
+		}
+		td->ptr[cipher_iv].ptr = dma_map_single(NULL, iv, ivsize, 
+			DMA_TO_DEVICE);
+		td->ptr[cipher_iv].len = ivsize;
+		/*
+		 * we don't need the cipher iv out length/pointer
+		 * field to do ESP IPsec. Therefore we set the len field as 0,
+		 * which tells the SEC not to do anything with this len/ptr
+		 * field. Previously, when length/pointer as pointing to iv,
+		 * it gave us corruption of packets.
+		 */
+		td->ptr[cipher_iv_out].len = 0;
+	}
+	if (enccrd && maccrd) {
+		/* this is ipsec only for now */
+		td->hdr |= TALITOS_SEL1_MDEU
+			|  TALITOS_MODE1_MDEU_INIT
+			|  TALITOS_MODE1_MDEU_PAD;
+		switch (maccrd->crd_alg) {
+			case	CRYPTO_MD5:	
+				td->hdr |= TALITOS_MODE1_MDEU_MD5;
+				break;
+			case	CRYPTO_MD5_HMAC:	
+				td->hdr |= TALITOS_MODE1_MDEU_MD5_HMAC;
+				break;
+			case	CRYPTO_SHA1:	
+				td->hdr |= TALITOS_MODE1_MDEU_SHA1;
+				break;
+			case	CRYPTO_SHA1_HMAC:	
+				td->hdr |= TALITOS_MODE1_MDEU_SHA1_HMAC;
+				break;
+			default:
+				/* We cannot order the SEC as requested */
+				printk("%s: cannot do the order\n",
+						device_get_nameunit(sc->sc_cdev));
+				err = EINVAL;
+				goto errout;
+		}
+		if ((maccrd->crd_alg == CRYPTO_MD5_HMAC) ||
+		   (maccrd->crd_alg == CRYPTO_SHA1_HMAC)) {
+			/*
+			 * The offset from hash data to the start of
+			 * crypt data is the difference in the skips.
+			 */
+			/* ipsec only for now */
+			td->ptr[hmac_key].ptr = dma_map_single(NULL, 
+				ses->ses_hmac, ses->ses_hmac_len, DMA_TO_DEVICE);
+			td->ptr[hmac_key].len = ses->ses_hmac_len;
+			td->ptr[in_fifo].ptr  += enccrd->crd_skip;
+			td->ptr[in_fifo].len  =  enccrd->crd_len;
+			td->ptr[out_fifo].ptr += enccrd->crd_skip;
+			td->ptr[out_fifo].len =  enccrd->crd_len;
+			/* bytes of HMAC to postpend to ciphertext */
+			td->ptr[out_fifo].extent =  ses->ses_mlen;
+			td->ptr[hmac_data].ptr += maccrd->crd_skip; 
+			td->ptr[hmac_data].len = enccrd->crd_skip - maccrd->crd_skip;
+		}
+		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
+			printk("%s: CRD_F_KEY_EXPLICIT unimplemented\n",
+					device_get_nameunit(sc->sc_cdev));
+		}
+	}
+	if (!enccrd && maccrd) {
+		/* single MD5 or SHA */
+		td->hdr |= TALITOS_SEL0_MDEU
+				|  TALITOS_MODE0_MDEU_INIT
+				|  TALITOS_MODE0_MDEU_PAD;
+		switch (maccrd->crd_alg) {
+			case	CRYPTO_MD5:	
+				td->hdr |= TALITOS_MODE0_MDEU_MD5;
+				DPRINTF("MD5  ses %d ch %d len %d\n",
+					(u32)TALITOS_SESSION(crp->crp_sid), 
+					chsel, td->ptr[in_fifo].len);
+				break;
+			case	CRYPTO_MD5_HMAC:	
+				td->hdr |= TALITOS_MODE0_MDEU_MD5_HMAC;
+				break;
+			case	CRYPTO_SHA1:	
+				td->hdr |= TALITOS_MODE0_MDEU_SHA1;
+				DPRINTF("SHA1 ses %d ch %d len %d\n",
+					(u32)TALITOS_SESSION(crp->crp_sid), 
+					chsel, td->ptr[in_fifo].len);
+				break;
+			case	CRYPTO_SHA1_HMAC:	
+				td->hdr |= TALITOS_MODE0_MDEU_SHA1_HMAC;
+				break;
+			default:
+				/* We cannot order the SEC as requested */
+				DPRINTF("cannot do the order\n");
+				err = EINVAL;
+				goto errout;
+		}
+
+		if (crp->crp_flags & CRYPTO_F_IOV)
+			td->ptr[out_fifo].ptr += maccrd->crd_inject;
+
+		if ((maccrd->crd_alg == CRYPTO_MD5_HMAC) ||
+		   (maccrd->crd_alg == CRYPTO_SHA1_HMAC)) {
+			td->ptr[hmac_key].ptr = dma_map_single(NULL, 
+				ses->ses_hmac, ses->ses_hmac_len, 
+				DMA_TO_DEVICE);
+			td->ptr[hmac_key].len = ses->ses_hmac_len;
+		}
+	} 
+	else {
+		/* using process key (session data has duplicate) */
+		td->ptr[cipher_key].ptr = dma_map_single(NULL, 
+			enccrd->crd_key, (enccrd->crd_klen + 7) / 8, 
+			DMA_TO_DEVICE);
+		td->ptr[cipher_key].len = (enccrd->crd_klen + 7) / 8;
+	}
+	/* descriptor complete - GO! */
+	return talitos_submit(sc, td, chsel);
+
+errout:
+	if (err != ERESTART) {
+		crp->crp_etype = err;
+		crypto_done(crp);
+	}
+	return err;
+}
+
+/* go through all channels descriptors, notifying OCF what has 
+ * _and_hasn't_ successfully completed and reset the device 
+ * (otherwise it's up to decoding desc hdrs!)
+ */
+static void talitos_errorprocessing(struct talitos_softc *sc)
+{
+	unsigned long flags;
+	int i, j;
+
+	/* disable further scheduling until under control */
+	spin_lock_irqsave(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
+
+	if (debug) dump_talitos_status(sc);
+	/* go through descriptors, try and salvage those successfully done, 
+	 * and EIO those that weren't
+	 */
+	for (i = 0; i < sc->sc_num_channels; i++) {
+		spin_lock_irqsave(&sc->sc_chnfifolock[i], flags);
+		for (j = 0; j < sc->sc_chfifo_len; j++) {
+			if (sc->sc_chnfifo[i][j].cf_desc.hdr) {
+				if ((sc->sc_chnfifo[i][j].cf_desc.hdr 
+					& TALITOS_HDR_DONE_BITS) 
+					!= TALITOS_HDR_DONE_BITS) {
+					/* this one didn't finish */
+					/* signify in crp->etype */
+					sc->sc_chnfifo[i][j].cf_crp->crp_etype 
+						= EIO;
+				}
+			} else
+				continue; /* free entry */
+			/* either way, notify ocf */
+			crypto_done(sc->sc_chnfifo[i][j].cf_crp);
+			/* and tag it available again
+			 *
+			 * memset to ensure correct descriptor formation by
+			 * avoiding inadvertently setting "optional" entries
+			 * e.g. not using "optional" dptr2 MD/HMAC processing
+			 */
+			memset(&sc->sc_chnfifo[i][j].cf_desc,
+				0, sizeof(struct talitos_desc));
+		}
+		spin_unlock_irqrestore(&sc->sc_chnfifolock[i], flags);
+	}
+	/* reset and initialize the SEC h/w device */
+	talitos_reset_device(sc);
+	talitos_init_device(sc);
+#ifdef CONFIG_OCF_RANDOMHARVEST
+	if (sc->sc_exec_units & TALITOS_HAS_EU_RNG)
+		talitos_rng_init(sc);
+#endif
+
+	/* Okay. Stand by. */
+	spin_unlock_irqrestore(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
+
+	return;
+}
+
+/* go through all channels descriptors, notifying OCF what's been done */
+static void talitos_doneprocessing(struct talitos_softc *sc)
+{
+	unsigned long flags;
+	int i, j;
+
+	/* go through descriptors looking for done bits */
+	for (i = 0; i < sc->sc_num_channels; i++) {
+		spin_lock_irqsave(&sc->sc_chnfifolock[i], flags);
+		for (j = 0; j < sc->sc_chfifo_len; j++) {
+			/* descriptor has done bits set? */
+			if ((sc->sc_chnfifo[i][j].cf_desc.hdr 
+				& TALITOS_HDR_DONE_BITS) 
+				== TALITOS_HDR_DONE_BITS) {
+				/* notify ocf */
+				crypto_done(sc->sc_chnfifo[i][j].cf_crp);
+				/* and tag it available again
+				 *
+				 * memset to ensure correct descriptor formation by
+				 * avoiding inadvertently setting "optional" entries
+				 * e.g. not using "optional" dptr2 MD/HMAC processing
+				 */
+				memset(&sc->sc_chnfifo[i][j].cf_desc,
+					0, sizeof(struct talitos_desc));
+			}
+		}
+		spin_unlock_irqrestore(&sc->sc_chnfifolock[i], flags);
+	}
+	return;
+}
+
+static irqreturn_t
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+talitos_intr(int irq, void *arg)
+#else
+talitos_intr(int irq, void *arg, struct pt_regs *regs)
+#endif
+{
+	struct talitos_softc *sc = arg;
+	u_int32_t v, v_hi;
+	
+	/* ack */
+	v = talitos_read(sc->sc_base_addr + TALITOS_ISR);
+	v_hi = talitos_read(sc->sc_base_addr + TALITOS_ISR_HI);
+	talitos_write(sc->sc_base_addr + TALITOS_ICR, v);
+	talitos_write(sc->sc_base_addr + TALITOS_ICR_HI, v_hi);
+
+	if (unlikely(v & TALITOS_ISR_ERROR)) {
+		/* Okay, Houston, we've had a problem here. */
+		printk(KERN_DEBUG "%s: got error interrupt - ISR 0x%08x_%08x\n",
+				device_get_nameunit(sc->sc_cdev), v, v_hi);
+		talitos_errorprocessing(sc);
+	} else
+	if (likely(v & TALITOS_ISR_DONE)) {
+		talitos_doneprocessing(sc);
+	}
+	return IRQ_HANDLED;
+}
+
+/*
+ * Initialize registers we need to touch only once.
+ */
+static void
+talitos_init_device(struct talitos_softc *sc)
+{
+	u_int32_t v;
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	/* init all channels */
+	for (i = 0; i < sc->sc_num_channels; i++) {
+		v = talitos_read(sc->sc_base_addr + 
+			i*TALITOS_CH_OFFSET + TALITOS_CH_CCCR_HI);
+		v |= TALITOS_CH_CCCR_HI_CDWE
+		  |  TALITOS_CH_CCCR_HI_CDIE;  /* invoke interrupt if done */
+		talitos_write(sc->sc_base_addr + 
+			i*TALITOS_CH_OFFSET + TALITOS_CH_CCCR_HI, v);
+	}
+	/* enable all interrupts */
+	v = talitos_read(sc->sc_base_addr + TALITOS_IMR);
+	v |= TALITOS_IMR_ALL;
+	talitos_write(sc->sc_base_addr + TALITOS_IMR, v);
+	v = talitos_read(sc->sc_base_addr + TALITOS_IMR_HI);
+	v |= TALITOS_IMR_HI_ERRONLY;
+	talitos_write(sc->sc_base_addr + TALITOS_IMR_HI, v);
+	return;
+}
+
+/*
+ * set the master reset bit on the device.
+ */
+static void
+talitos_reset_device_master(struct talitos_softc *sc)
+{
+	u_int32_t v;
+
+	/* Reset the device by writing 1 to MCR:SWR and waiting 'til cleared */
+	v = talitos_read(sc->sc_base_addr + TALITOS_MCR);
+	talitos_write(sc->sc_base_addr + TALITOS_MCR, v | TALITOS_MCR_SWR);
+
+	while (talitos_read(sc->sc_base_addr + TALITOS_MCR) & TALITOS_MCR_SWR)
+		cpu_relax();
+
+	return;
+}
+
+/*
+ * Resets the device.  Values in the registers are left as is
+ * from the reset (i.e. initial values are assigned elsewhere).
+ */
+static void
+talitos_reset_device(struct talitos_softc *sc)
+{
+	u_int32_t v;
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	/*
+	 * Master reset
+	 * errata documentation: warning: certain SEC interrupts 
+	 * are not fully cleared by writing the MCR:SWR bit, 
+	 * set bit twice to completely reset 
+	 */
+	talitos_reset_device_master(sc);	/* once */
+	talitos_reset_device_master(sc);	/* and once again */
+	
+	/* reset all channels */
+	for (i = 0; i < sc->sc_num_channels; i++) {
+		v = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET +
+			TALITOS_CH_CCCR);
+		talitos_write(sc->sc_base_addr + i*TALITOS_CH_OFFSET +
+			TALITOS_CH_CCCR, v | TALITOS_CH_CCCR_RESET);
+	}
+}
+
+/* Set up the crypto device structure, private data,
+ * and anything else we need before we start */
+#ifdef CONFIG_PPC_MERGE
+static int talitos_probe(struct of_device *ofdev, const struct of_device_id *match)
+#else
+static int talitos_probe(struct platform_device *pdev)
+#endif
+{
+	struct talitos_softc *sc = NULL;
+	struct resource *r;
+#ifdef CONFIG_PPC_MERGE
+	struct device *device = &ofdev->dev;
+	struct device_node *np = ofdev->node;
+	const unsigned int *prop;
+	int err;
+	struct resource res;
+#endif
+	static int num_chips = 0;
+	int rc;
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+
+	sc = (struct talitos_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
+	if (!sc)
+		return -ENOMEM;
+	memset(sc, 0, sizeof(*sc));
+
+	softc_device_init(sc, DRV_NAME, num_chips, talitos_methods);
+
+	sc->sc_irq = -1;
+	sc->sc_cid = -1;
+#ifndef CONFIG_PPC_MERGE
+	sc->sc_dev = pdev;
+#endif
+	sc->sc_num = num_chips++;
+
+#ifdef CONFIG_PPC_MERGE
+	dev_set_drvdata(device, sc);
+#else
+	platform_set_drvdata(sc->sc_dev, sc);
+#endif
+
+	/* get the irq line */
+#ifdef CONFIG_PPC_MERGE
+	err = of_address_to_resource(np, 0, &res);
+	if (err)
+		return -EINVAL;
+	r = &res;
+
+	sc->sc_irq = irq_of_parse_and_map(np, 0);
+#else
+	/* get a pointer to the register memory */
+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+	sc->sc_irq = platform_get_irq(pdev, 0);
+#endif
+	rc = request_irq(sc->sc_irq, talitos_intr, 0,
+			device_get_nameunit(sc->sc_cdev), sc);
+	if (rc) {
+		printk(KERN_ERR "%s: failed to hook irq %d\n", 
+				device_get_nameunit(sc->sc_cdev), sc->sc_irq);
+		sc->sc_irq = -1;
+		goto out;
+	}
+
+	sc->sc_base_addr = (ocf_iomem_t) ioremap(r->start, (r->end - r->start));
+	if (!sc->sc_base_addr) {
+		printk(KERN_ERR "%s: failed to ioremap\n",
+				device_get_nameunit(sc->sc_cdev));
+		goto out;
+	}
+
+	/* figure out our SEC's properties and capabilities */
+	sc->sc_chiprev = (u64)talitos_read(sc->sc_base_addr + TALITOS_ID) << 32
+		 | talitos_read(sc->sc_base_addr + TALITOS_ID_HI);
+	DPRINTF("sec id 0x%llx\n", sc->sc_chiprev);
+
+#ifdef CONFIG_PPC_MERGE
+	/* get SEC properties from device tree, defaulting to SEC 2.0 */
+
+	prop = of_get_property(np, "num-channels", NULL);
+	sc->sc_num_channels = prop ? *prop : TALITOS_NCHANNELS_SEC_2_0;
+
+	prop = of_get_property(np, "channel-fifo-len", NULL);
+	sc->sc_chfifo_len = prop ? *prop : TALITOS_CHFIFOLEN_SEC_2_0;
+
+	prop = of_get_property(np, "exec-units-mask", NULL);
+	sc->sc_exec_units = prop ? *prop : TALITOS_HAS_EUS_SEC_2_0;
+
+	prop = of_get_property(np, "descriptor-types-mask", NULL);
+	sc->sc_desc_types = prop ? *prop : TALITOS_HAS_DESCTYPES_SEC_2_0;
+#else
+	/* bulk should go away with openfirmware flat device tree support */
+	if (sc->sc_chiprev & TALITOS_ID_SEC_2_0) {
+		sc->sc_num_channels = TALITOS_NCHANNELS_SEC_2_0;
+		sc->sc_chfifo_len = TALITOS_CHFIFOLEN_SEC_2_0;
+		sc->sc_exec_units = TALITOS_HAS_EUS_SEC_2_0;
+		sc->sc_desc_types = TALITOS_HAS_DESCTYPES_SEC_2_0;
+	} else {
+		printk(KERN_ERR "%s: failed to id device\n",
+				device_get_nameunit(sc->sc_cdev));
+		goto out;
+	}
+#endif
+
+	/* + 1 is for the meta-channel lock used by the channel scheduler */
+	sc->sc_chnfifolock = (spinlock_t *) kmalloc(
+		(sc->sc_num_channels + 1) * sizeof(spinlock_t), GFP_KERNEL);
+	if (!sc->sc_chnfifolock)
+		goto out;
+	for (i = 0; i < sc->sc_num_channels + 1; i++) {
+		spin_lock_init(&sc->sc_chnfifolock[i]);
+	}
+
+	sc->sc_chnlastalg = (int *) kmalloc(
+		sc->sc_num_channels * sizeof(int), GFP_KERNEL);
+	if (!sc->sc_chnlastalg)
+		goto out;
+	memset(sc->sc_chnlastalg, 0, sc->sc_num_channels * sizeof(int));
+
+	sc->sc_chnfifo = (struct desc_cryptop_pair **) kmalloc(
+		sc->sc_num_channels * sizeof(struct desc_cryptop_pair *), 
+		GFP_KERNEL);
+	if (!sc->sc_chnfifo)
+		goto out;
+	for (i = 0; i < sc->sc_num_channels; i++) {
+		sc->sc_chnfifo[i] = (struct desc_cryptop_pair *) kmalloc(
+			sc->sc_chfifo_len * sizeof(struct desc_cryptop_pair), 
+			GFP_KERNEL);
+		if (!sc->sc_chnfifo[i])
+			goto out;
+		memset(sc->sc_chnfifo[i], 0, 
+			sc->sc_chfifo_len * sizeof(struct desc_cryptop_pair));
+	}
+
+	/* reset and initialize the SEC h/w device */
+	talitos_reset_device(sc);
+	talitos_init_device(sc);
+
+	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),CRYPTOCAP_F_HARDWARE);
+	if (sc->sc_cid < 0) {
+		printk(KERN_ERR "%s: could not get crypto driver id\n",
+				device_get_nameunit(sc->sc_cdev));
+		goto out;
+	}
+
+	/* register algorithms with the framework */
+	printk("%s:", device_get_nameunit(sc->sc_cdev));
+
+	if (sc->sc_exec_units & TALITOS_HAS_EU_RNG)  {
+		printk(" rng");
+#ifdef CONFIG_OCF_RANDOMHARVEST
+		talitos_rng_init(sc);
+		crypto_rregister(sc->sc_cid, talitos_read_random, sc);
+#endif
+	}
+	if (sc->sc_exec_units & TALITOS_HAS_EU_DEU) {
+		printk(" des/3des");
+		crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
+		crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
+	}
+	if (sc->sc_exec_units & TALITOS_HAS_EU_AESU) {
+		printk(" aes");
+		crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
+	}
+	if (sc->sc_exec_units & TALITOS_HAS_EU_MDEU) {
+		printk(" md5");
+		crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0);
+		/* HMAC support only with IPsec for now */
+		crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
+		printk(" sha1");
+		crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0);
+		/* HMAC support only with IPsec for now */
+		crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
+	}
+	printk("\n");
+	return 0;
+
+out:
+#ifndef CONFIG_PPC_MERGE
+	talitos_remove(pdev);
+#endif
+	return -ENOMEM;
+}
+
+#ifdef CONFIG_PPC_MERGE
+static int talitos_remove(struct of_device *ofdev)
+#else
+static int talitos_remove(struct platform_device *pdev)
+#endif
+{
+#ifdef CONFIG_PPC_MERGE
+	struct talitos_softc *sc = dev_get_drvdata(&ofdev->dev);
+#else
+	struct talitos_softc *sc = platform_get_drvdata(pdev);
+#endif
+	int i;
+
+	DPRINTF("%s()\n", __FUNCTION__);
+	if (sc->sc_cid >= 0)
+		crypto_unregister_all(sc->sc_cid);
+	if (sc->sc_chnfifo) {
+		for (i = 0; i < sc->sc_num_channels; i++)
+			if (sc->sc_chnfifo[i])
+				kfree(sc->sc_chnfifo[i]);
+		kfree(sc->sc_chnfifo);
+	}
+	if (sc->sc_chnlastalg)
+		kfree(sc->sc_chnlastalg);
+	if (sc->sc_chnfifolock)
+		kfree(sc->sc_chnfifolock);
+	if (sc->sc_irq != -1)
+		free_irq(sc->sc_irq, sc);
+	if (sc->sc_base_addr)
+		iounmap((void *) sc->sc_base_addr);
+	kfree(sc);
+	return 0;
+}
+
+#ifdef CONFIG_PPC_MERGE
+static struct of_device_id talitos_match[] = {
+	{
+		.type = "crypto",
+		.compatible = "talitos",
+	},
+	{},
+};
+
+MODULE_DEVICE_TABLE(of, talitos_match);
+
+static struct of_platform_driver talitos_driver = {
+	.name		= DRV_NAME,
+	.match_table	= talitos_match,
+	.probe		= talitos_probe,
+	.remove		= talitos_remove,
+};
+
+static int __init talitos_init(void)
+{
+	return of_register_platform_driver(&talitos_driver);
+}
+
+static void __exit talitos_exit(void)
+{
+	of_unregister_platform_driver(&talitos_driver);
+}
+#else
+/* Structure for a platform device driver */
+static struct platform_driver talitos_driver = {
+	.probe = talitos_probe,
+	.remove = talitos_remove,
+	.driver = {
+		.name = "fsl-sec2",
+	}
+};
+
+static int __init talitos_init(void)
+{
+	return platform_driver_register(&talitos_driver);
+}
+
+static void __exit talitos_exit(void)
+{
+	platform_driver_unregister(&talitos_driver);
+}
+#endif
+
+module_init(talitos_init);
+module_exit(talitos_exit);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_AUTHOR("kim.phillips@freescale.com");
+MODULE_DESCRIPTION("OCF driver for Freescale SEC (talitos)");
diff --git a/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_dev.h b/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_dev.h
new file mode 100644
index 00000000..a8b04799
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_dev.h
@@ -0,0 +1,277 @@
+/*
+ * Freescale SEC (talitos) device dependent data structures
+ *
+ * Copyright (c) 2006 Freescale Semiconductor, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/* device ID register values */
+#define TALITOS_ID_SEC_2_0	0x40
+#define TALITOS_ID_SEC_2_1	0x40 /* cross ref with IP block revision reg */
+
+/*
+ * following num_channels, channel-fifo-depth, exec-unit-mask, and 
+ * descriptor-types-mask are for forward-compatibility with openfirmware
+ * flat device trees
+ */
+
+/*
+ *  num_channels : the number of channels available in each SEC version.
+ */
+
+/* n.b. this driver requires these values be a power of 2 */
+#define TALITOS_NCHANNELS_SEC_1_0	4
+#define TALITOS_NCHANNELS_SEC_1_2	1
+#define TALITOS_NCHANNELS_SEC_2_0	4
+#define TALITOS_NCHANNELS_SEC_2_01	4
+#define TALITOS_NCHANNELS_SEC_2_1	4
+#define TALITOS_NCHANNELS_SEC_2_4	4
+
+/*
+ *  channel-fifo-depth : The number of descriptor
+ *  pointers a channel fetch fifo can hold.
+ */
+#define TALITOS_CHFIFOLEN_SEC_1_0	1
+#define TALITOS_CHFIFOLEN_SEC_1_2	1
+#define TALITOS_CHFIFOLEN_SEC_2_0	24
+#define TALITOS_CHFIFOLEN_SEC_2_01	24
+#define TALITOS_CHFIFOLEN_SEC_2_1	24
+#define TALITOS_CHFIFOLEN_SEC_2_4	24
+
+/* 
+ *  exec-unit-mask : The bitmask representing what Execution Units (EUs)
+ *  are available. EU information should be encoded following the SEC's 
+ *  EU_SEL0 bitfield documentation, i.e. as follows:
+ * 
+ *    bit 31 = set if SEC permits no-EU selection (should be always set)
+ *    bit 30 = set if SEC has the ARC4 EU (AFEU)
+ *    bit 29 = set if SEC has the des/3des EU (DEU)
+ *    bit 28 = set if SEC has the message digest EU (MDEU)
+ *    bit 27 = set if SEC has the random number generator EU (RNG)
+ *    bit 26 = set if SEC has the public key EU (PKEU)
+ *    bit 25 = set if SEC has the aes EU (AESU)
+ *    bit 24 = set if SEC has the Kasumi EU (KEU)
+ * 
+ */
+#define TALITOS_HAS_EU_NONE		(1<<0)
+#define TALITOS_HAS_EU_AFEU		(1<<1)
+#define TALITOS_HAS_EU_DEU		(1<<2)
+#define TALITOS_HAS_EU_MDEU		(1<<3)
+#define TALITOS_HAS_EU_RNG		(1<<4)
+#define TALITOS_HAS_EU_PKEU		(1<<5)
+#define TALITOS_HAS_EU_AESU		(1<<6)
+#define TALITOS_HAS_EU_KEU		(1<<7)
+
+/* the corresponding masks for each SEC version */
+#define TALITOS_HAS_EUS_SEC_1_0		0x7f
+#define TALITOS_HAS_EUS_SEC_1_2		0x4d
+#define TALITOS_HAS_EUS_SEC_2_0		0x7f
+#define TALITOS_HAS_EUS_SEC_2_01	0x7f
+#define TALITOS_HAS_EUS_SEC_2_1		0xff
+#define TALITOS_HAS_EUS_SEC_2_4		0x7f
+
+/*
+ *  descriptor-types-mask : The bitmask representing what descriptors
+ *  are available. Descriptor type information should be encoded 
+ *  following the SEC's Descriptor Header Dword DESC_TYPE field 
+ *  documentation, i.e. as follows:
+ *
+ *    bit 0  = set if SEC supports the aesu_ctr_nonsnoop desc. type
+ *    bit 1  = set if SEC supports the ipsec_esp descriptor type
+ *    bit 2  = set if SEC supports the common_nonsnoop desc. type
+ *    bit 3  = set if SEC supports the 802.11i AES ccmp desc. type
+ *    bit 4  = set if SEC supports the hmac_snoop_no_afeu desc. type
+ *    bit 5  = set if SEC supports the srtp descriptor type
+ *    bit 6  = set if SEC supports the non_hmac_snoop_no_afeu desc.type
+ *    bit 7  = set if SEC supports the pkeu_assemble descriptor type
+ *    bit 8  = set if SEC supports the aesu_key_expand_output desc.type
+ *    bit 9  = set if SEC supports the pkeu_ptmul descriptor type
+ *    bit 10 = set if SEC supports the common_nonsnoop_afeu desc. type
+ *    bit 11 = set if SEC supports the pkeu_ptadd_dbl descriptor type
+ *
+ *  ..and so on and so forth.
+ */
+#define TALITOS_HAS_DT_AESU_CTR_NONSNOOP	(1<<0)
+#define TALITOS_HAS_DT_IPSEC_ESP		(1<<1)
+#define TALITOS_HAS_DT_COMMON_NONSNOOP		(1<<2)
+
+/* the corresponding masks for each SEC version */
+#define TALITOS_HAS_DESCTYPES_SEC_2_0	0x01010ebf
+#define TALITOS_HAS_DESCTYPES_SEC_2_1	0x012b0ebf
+
+/* 
+ * a TALITOS_xxx_HI address points to the low data bits (32-63) of the register
+ */
+
+/* global register offset addresses */
+#define TALITOS_ID		0x1020
+#define TALITOS_ID_HI		0x1024
+#define TALITOS_MCR		0x1030		/* master control register */
+#define TALITOS_MCR_HI		0x1038		/* master control register */
+#define TALITOS_MCR_SWR		0x1
+#define TALITOS_IMR		0x1008		/* interrupt mask register */
+#define TALITOS_IMR_ALL		0x00010fff	/* enable all interrupts mask */
+#define TALITOS_IMR_ERRONLY	0x00010aaa	/* enable error interrupts */
+#define TALITOS_IMR_HI		0x100C		/* interrupt mask register */
+#define TALITOS_IMR_HI_ALL	0x00323333	/* enable all interrupts mask */
+#define TALITOS_IMR_HI_ERRONLY	0x00222222	/* enable error interrupts */
+#define TALITOS_ISR		0x1010		/* interrupt status register */
+#define TALITOS_ISR_ERROR	0x00010faa	/* errors mask */
+#define TALITOS_ISR_DONE	0x00000055	/* channel(s) done mask */
+#define TALITOS_ISR_HI		0x1014		/* interrupt status register */
+#define TALITOS_ICR		0x1018		/* interrupt clear register */
+#define TALITOS_ICR_HI		0x101C		/* interrupt clear register */
+
+/* channel register address stride */
+#define TALITOS_CH_OFFSET	0x100
+
+/* channel register offset addresses and bits */
+#define TALITOS_CH_CCCR		0x1108	/* Crypto-Channel Config Register */
+#define TALITOS_CH_CCCR_RESET	0x1	/* Channel Reset bit */
+#define TALITOS_CH_CCCR_HI	0x110c	/* Crypto-Channel Config Register */
+#define TALITOS_CH_CCCR_HI_CDWE	0x10	/* Channel done writeback enable bit */
+#define TALITOS_CH_CCCR_HI_NT	0x4	/* Notification type bit */
+#define TALITOS_CH_CCCR_HI_CDIE	0x2	/* Channel Done Interrupt Enable bit */
+#define TALITOS_CH_CCPSR	0x1110	/* Crypto-Channel Pointer Status Reg */
+#define TALITOS_CH_CCPSR_HI	0x1114	/* Crypto-Channel Pointer Status Reg */
+#define TALITOS_CH_FF		0x1148	/* Fetch FIFO */
+#define TALITOS_CH_FF_HI	0x114c	/* Fetch FIFO's FETCH_ADRS */
+#define TALITOS_CH_CDPR		0x1140	/* Crypto-Channel Pointer Status Reg */
+#define TALITOS_CH_CDPR_HI	0x1144	/* Crypto-Channel Pointer Status Reg */
+#define TALITOS_CH_DESCBUF	0x1180	/* (thru 11bf) Crypto-Channel 
+					 * Descriptor Buffer (debug) */
+
+/* execution unit register offset addresses and bits */
+#define TALITOS_DEUSR		0x2028	/* DEU status register */
+#define TALITOS_DEUSR_HI	0x202c	/* DEU status register */
+#define TALITOS_DEUISR		0x2030	/* DEU interrupt status register */
+#define TALITOS_DEUISR_HI	0x2034	/* DEU interrupt status register */
+#define TALITOS_DEUICR		0x2038	/* DEU interrupt control register */
+#define TALITOS_DEUICR_HI	0x203c	/* DEU interrupt control register */
+#define TALITOS_AESUISR		0x4030	/* AESU interrupt status register */
+#define TALITOS_AESUISR_HI	0x4034	/* AESU interrupt status register */
+#define TALITOS_AESUICR		0x4038	/* AESU interrupt control register */
+#define TALITOS_AESUICR_HI	0x403c	/* AESU interrupt control register */
+#define TALITOS_MDEUISR		0x6030	/* MDEU interrupt status register */
+#define TALITOS_MDEUISR_HI	0x6034	/* MDEU interrupt status register */
+#define TALITOS_RNGSR		0xa028	/* RNG status register */
+#define TALITOS_RNGSR_HI	0xa02c	/* RNG status register */
+#define TALITOS_RNGSR_HI_RD	0x1	/* RNG Reset done */
+#define TALITOS_RNGSR_HI_OFL	0xff0000/* number of dwords in RNG output FIFO*/
+#define TALITOS_RNGDSR		0xa010	/* RNG data size register */
+#define TALITOS_RNGDSR_HI	0xa014	/* RNG data size register */
+#define TALITOS_RNG_FIFO	0xa800	/* RNG FIFO - pool of random numbers */
+#define TALITOS_RNGISR		0xa030	/* RNG Interrupt status register */
+#define TALITOS_RNGISR_HI	0xa034	/* RNG Interrupt status register */
+#define TALITOS_RNGRCR		0xa018	/* RNG Reset control register */
+#define TALITOS_RNGRCR_HI	0xa01c	/* RNG Reset control register */
+#define TALITOS_RNGRCR_HI_SR	0x1	/* RNG RNGRCR:Software Reset */
+
+/* descriptor pointer entry */
+struct talitos_desc_ptr {
+	u16	len;		/* length */
+	u8	extent;		/* jump (to s/g link table) and extent */
+	u8	res;		/* reserved */
+	u32	ptr;		/* pointer */
+};
+
+/* descriptor */
+struct talitos_desc {
+	u32	hdr;				/* header */
+	u32	res;				/* reserved */
+	struct talitos_desc_ptr		ptr[7];	/* ptr/len pair array */
+};
+
+/* talitos descriptor header (hdr) bits */
+
+/* primary execution unit select */
+#define	TALITOS_SEL0_AFEU	0x10000000
+#define	TALITOS_SEL0_DEU	0x20000000
+#define	TALITOS_SEL0_MDEU	0x30000000
+#define	TALITOS_SEL0_RNG	0x40000000
+#define	TALITOS_SEL0_PKEU	0x50000000
+#define	TALITOS_SEL0_AESU	0x60000000
+
+/* primary execution unit mode (MODE0) and derivatives */
+#define	TALITOS_MODE0_AESU_CBC		0x00200000
+#define	TALITOS_MODE0_AESU_ENC		0x00100000
+#define	TALITOS_MODE0_DEU_CBC		0x00400000
+#define	TALITOS_MODE0_DEU_3DES		0x00200000
+#define	TALITOS_MODE0_DEU_ENC		0x00100000
+#define	TALITOS_MODE0_MDEU_INIT		0x01000000	/* init starting regs */
+#define	TALITOS_MODE0_MDEU_HMAC		0x00800000
+#define	TALITOS_MODE0_MDEU_PAD		0x00400000	/* PD */
+#define	TALITOS_MODE0_MDEU_MD5		0x00200000
+#define	TALITOS_MODE0_MDEU_SHA256	0x00100000
+#define	TALITOS_MODE0_MDEU_SHA1		0x00000000	/* SHA-160 */
+#define	TALITOS_MODE0_MDEU_MD5_HMAC	\
+		(TALITOS_MODE0_MDEU_MD5 | TALITOS_MODE0_MDEU_HMAC)
+#define	TALITOS_MODE0_MDEU_SHA256_HMAC	\
+		(TALITOS_MODE0_MDEU_SHA256 | TALITOS_MODE0_MDEU_HMAC)
+#define	TALITOS_MODE0_MDEU_SHA1_HMAC	\
+		(TALITOS_MODE0_MDEU_SHA1 | TALITOS_MODE0_MDEU_HMAC)
+
+/* secondary execution unit select (SEL1) */
+/* it's MDEU or nothing */
+#define	TALITOS_SEL1_MDEU	0x00030000
+
+/* secondary execution unit mode (MODE1) and derivatives */
+#define	TALITOS_MODE1_MDEU_INIT		0x00001000	/* init starting regs */
+#define	TALITOS_MODE1_MDEU_HMAC		0x00000800
+#define	TALITOS_MODE1_MDEU_PAD		0x00000400	/* PD */
+#define	TALITOS_MODE1_MDEU_MD5		0x00000200
+#define	TALITOS_MODE1_MDEU_SHA256	0x00000100
+#define	TALITOS_MODE1_MDEU_SHA1		0x00000000	/* SHA-160 */
+#define	TALITOS_MODE1_MDEU_MD5_HMAC	\
+	(TALITOS_MODE1_MDEU_MD5 | TALITOS_MODE1_MDEU_HMAC)
+#define	TALITOS_MODE1_MDEU_SHA256_HMAC	\
+	(TALITOS_MODE1_MDEU_SHA256 | TALITOS_MODE1_MDEU_HMAC)
+#define	TALITOS_MODE1_MDEU_SHA1_HMAC	\
+	(TALITOS_MODE1_MDEU_SHA1 | TALITOS_MODE1_MDEU_HMAC)
+
+/* direction of overall data flow (DIR) */
+#define	TALITOS_DIR_OUTBOUND	0x00000000
+#define	TALITOS_DIR_INBOUND	0x00000002
+
+/* done notification (DN) */
+#define	TALITOS_DONE_NOTIFY	0x00000001
+
+/* descriptor types */
+/* odd numbers here are valid on SEC2 and greater only (e.g. ipsec_esp) */
+#define TD_TYPE_AESU_CTR_NONSNOOP	(0 << 3)
+#define TD_TYPE_IPSEC_ESP		(1 << 3)
+#define TD_TYPE_COMMON_NONSNOOP_NO_AFEU	(2 << 3)
+#define TD_TYPE_HMAC_SNOOP_NO_AFEU	(4 << 3)
+
+#define TALITOS_HDR_DONE_BITS	0xff000000
+
+#define	DPRINTF(a...)	do { \
+						if (debug) { \
+							printk("%s: ", sc ? \
+								device_get_nameunit(sc->sc_cdev) : "talitos"); \
+							printk(a); \
+						} \
+					} while (0)
diff --git a/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_soft.h b/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_soft.h
new file mode 100644
index 00000000..eda9c2ef
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/talitos/talitos_soft.h
@@ -0,0 +1,76 @@
+/*
+ * Freescale SEC data structures for integration with ocf-linux
+ *
+ * Copyright (c) 2006 Freescale Semiconductor, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * paired descriptor and associated crypto operation
+ */
+struct desc_cryptop_pair {
+	struct talitos_desc	cf_desc;	/* descriptor ptr */
+	struct cryptop		*cf_crp;	/* cryptop ptr */
+};
+
+/*
+ * Holds data specific to a single talitos device.
+ */
+struct talitos_softc {
+	softc_device_decl	sc_cdev;
+	struct platform_device	*sc_dev;	/* device backpointer */
+	ocf_iomem_t		sc_base_addr;
+	int			sc_irq;
+	int			sc_num;		/* if we have multiple chips */
+	int32_t			sc_cid;		/* crypto tag */
+	u64			sc_chiprev;	/* major/minor chip revision */
+	int			sc_nsessions;
+	struct talitos_session	*sc_sessions;
+	int			sc_num_channels;/* number of crypto channels */
+	int			sc_chfifo_len;	/* channel fetch fifo len */
+	int			sc_exec_units;	/* execution units mask */
+	int			sc_desc_types;	/* descriptor types mask */
+	/*
+	 * mutual exclusion for intra-channel resources, e.g. fetch fifos
+	 * the last entry is a meta-channel lock used by the channel scheduler
+	 */
+	spinlock_t		*sc_chnfifolock;
+	/* sc_chnlastalgo contains last algorithm for that channel */
+	int			*sc_chnlastalg;
+	/* sc_chnfifo holds pending descriptor--crypto operation pairs */
+	struct desc_cryptop_pair	**sc_chnfifo;
+};
+
+struct talitos_session {
+	u_int32_t	ses_used;
+	u_int32_t	ses_klen;		/* key length in bits */
+	u_int32_t	ses_key[8];		/* DES/3DES/AES key */
+	u_int32_t	ses_hmac[5];		/* hmac inner state */
+	u_int32_t	ses_hmac_len;		/* hmac length */
+	u_int32_t	ses_mlen;		/* desired hash result len (12=ipsec or 16) */
+};
+
+#define	TALITOS_SESSION(sid)	((sid) & 0x0fffffff)
+#define	TALITOS_SID(crd, sesn)	(((crd) << 28) | ((sesn) & 0x0fffffff))
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/Makefile b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/Makefile
new file mode 100644
index 00000000..f973efd7
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/Makefile
@@ -0,0 +1,12 @@
+# for SGlinux builds
+-include $(ROOTDIR)/modules/.config
+
+obj-$(CONFIG_OCF_UBSEC_SSB) += ubsec_ssb.o
+
+obj ?= .
+EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
+
+ifdef TOPDIR
+-include $(TOPDIR)/Rules.make
+endif
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/bsdqueue.h b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/bsdqueue.h
new file mode 100644
index 00000000..60105526
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/bsdqueue.h
@@ -0,0 +1,527 @@
+/*  $OpenBSD: queue.h,v 1.32 2007/04/30 18:42:34 pedro Exp $    */
+/*  $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $   */
+
+/*
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)queue.h 8.5 (Berkeley) 8/20/94
+ */
+
+#ifndef _BSD_SYS_QUEUE_H_
+#define _BSD_SYS_QUEUE_H_
+
+/*
+ * This file defines five types of data structures: singly-linked lists, 
+ * lists, simple queues, tail queues, and circular queues.
+ *
+ *
+ * A singly-linked list is headed by a single forward pointer. The elements
+ * are singly linked for minimum space and pointer manipulation overhead at
+ * the expense of O(n) removal for arbitrary elements. New elements can be
+ * added to the list after an existing element or at the head of the list.
+ * Elements being removed from the head of the list should use the explicit
+ * macro for this purpose for optimum efficiency. A singly-linked list may
+ * only be traversed in the forward direction.  Singly-linked lists are ideal
+ * for applications with large datasets and few or no removals or for
+ * implementing a LIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may only be traversed in the forward direction.
+ *
+ * A simple queue is headed by a pair of pointers, one the head of the
+ * list and the other to the tail of the list. The elements are singly
+ * linked to save space, so elements can only be removed from the
+ * head of the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the
+ * list. A simple queue may only be traversed in the forward direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * A circle queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the list.
+ * A circle queue may be traversed in either direction, but has a more
+ * complex end of list detection.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ */
+
+#if defined(QUEUE_MACRO_DEBUG) || (defined(_KERNEL) && defined(DIAGNOSTIC))
+#define _Q_INVALIDATE(a) (a) = ((void *)-1)
+#else
+#define _Q_INVALIDATE(a)
+#endif
+
+/*
+ * Singly-linked List definitions.
+ */
+#define BSD_SLIST_HEAD(name, type)                      \
+struct name {                               \
+    struct type *slh_first; /* first element */         \
+}
+ 
+#define BSD_SLIST_HEAD_INITIALIZER(head)                    \
+    { NULL }
+ 
+#define BSD_SLIST_ENTRY(type)                       \
+struct {                                \
+    struct type *sle_next;  /* next element */          \
+}
+ 
+/*
+ * Singly-linked List access methods.
+ */
+#define BSD_SLIST_FIRST(head)   ((head)->slh_first)
+#define BSD_SLIST_END(head)     NULL
+#define BSD_SLIST_EMPTY(head)   (BSD_SLIST_FIRST(head) == BSD_SLIST_END(head))
+#define BSD_SLIST_NEXT(elm, field)  ((elm)->field.sle_next)
+
+#define BSD_SLIST_FOREACH(var, head, field)                 \
+    for((var) = BSD_SLIST_FIRST(head);                  \
+        (var) != BSD_SLIST_END(head);                   \
+        (var) = BSD_SLIST_NEXT(var, field))
+
+#define BSD_SLIST_FOREACH_PREVPTR(var, varp, head, field)           \
+    for ((varp) = &BSD_SLIST_FIRST((head));             \
+        ((var) = *(varp)) != BSD_SLIST_END(head);           \
+        (varp) = &BSD_SLIST_NEXT((var), field))
+
+/*
+ * Singly-linked List functions.
+ */
+#define BSD_SLIST_INIT(head) {                      \
+    BSD_SLIST_FIRST(head) = BSD_SLIST_END(head);                \
+}
+
+#define BSD_SLIST_INSERT_AFTER(slistelm, elm, field) do {           \
+    (elm)->field.sle_next = (slistelm)->field.sle_next;     \
+    (slistelm)->field.sle_next = (elm);             \
+} while (0)
+
+#define BSD_SLIST_INSERT_HEAD(head, elm, field) do {            \
+    (elm)->field.sle_next = (head)->slh_first;          \
+    (head)->slh_first = (elm);                  \
+} while (0)
+
+#define BSD_SLIST_REMOVE_NEXT(head, elm, field) do {            \
+    (elm)->field.sle_next = (elm)->field.sle_next->field.sle_next;  \
+} while (0)
+
+#define BSD_SLIST_REMOVE_HEAD(head, field) do {             \
+    (head)->slh_first = (head)->slh_first->field.sle_next;      \
+} while (0)
+
+#define BSD_SLIST_REMOVE(head, elm, type, field) do {           \
+    if ((head)->slh_first == (elm)) {               \
+        BSD_SLIST_REMOVE_HEAD((head), field);           \
+    } else {                            \
+        struct type *curelm = (head)->slh_first;        \
+                                    \
+        while (curelm->field.sle_next != (elm))         \
+            curelm = curelm->field.sle_next;        \
+        curelm->field.sle_next =                \
+            curelm->field.sle_next->field.sle_next;     \
+        _Q_INVALIDATE((elm)->field.sle_next);           \
+    }                               \
+} while (0)
+
+/*
+ * List definitions.
+ */
+#define BSD_LIST_HEAD(name, type)                       \
+struct name {                               \
+    struct type *lh_first;  /* first element */         \
+}
+
+#define BSD_LIST_HEAD_INITIALIZER(head)                 \
+    { NULL }
+
+#define BSD_LIST_ENTRY(type)                        \
+struct {                                \
+    struct type *le_next;   /* next element */          \
+    struct type **le_prev;  /* address of previous next element */  \
+}
+
+/*
+ * List access methods
+ */
+#define BSD_LIST_FIRST(head)        ((head)->lh_first)
+#define BSD_LIST_END(head)          NULL
+#define BSD_LIST_EMPTY(head)        (BSD_LIST_FIRST(head) == BSD_LIST_END(head))
+#define BSD_LIST_NEXT(elm, field)       ((elm)->field.le_next)
+
+#define BSD_LIST_FOREACH(var, head, field)                  \
+    for((var) = BSD_LIST_FIRST(head);                   \
+        (var)!= BSD_LIST_END(head);                 \
+        (var) = BSD_LIST_NEXT(var, field))
+
+/*
+ * List functions.
+ */
+#define BSD_LIST_INIT(head) do {                        \
+    BSD_LIST_FIRST(head) = BSD_LIST_END(head);              \
+} while (0)
+
+#define BSD_LIST_INSERT_AFTER(listelm, elm, field) do {         \
+    if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)  \
+        (listelm)->field.le_next->field.le_prev =       \
+            &(elm)->field.le_next;              \
+    (listelm)->field.le_next = (elm);               \
+    (elm)->field.le_prev = &(listelm)->field.le_next;       \
+} while (0)
+
+#define BSD_LIST_INSERT_BEFORE(listelm, elm, field) do {            \
+    (elm)->field.le_prev = (listelm)->field.le_prev;        \
+    (elm)->field.le_next = (listelm);               \
+    *(listelm)->field.le_prev = (elm);              \
+    (listelm)->field.le_prev = &(elm)->field.le_next;       \
+} while (0)
+
+#define BSD_LIST_INSERT_HEAD(head, elm, field) do {             \
+    if (((elm)->field.le_next = (head)->lh_first) != NULL)      \
+        (head)->lh_first->field.le_prev = &(elm)->field.le_next;\
+    (head)->lh_first = (elm);                   \
+    (elm)->field.le_prev = &(head)->lh_first;           \
+} while (0)
+
+#define BSD_LIST_REMOVE(elm, field) do {                    \
+    if ((elm)->field.le_next != NULL)               \
+        (elm)->field.le_next->field.le_prev =           \
+            (elm)->field.le_prev;               \
+    *(elm)->field.le_prev = (elm)->field.le_next;           \
+    _Q_INVALIDATE((elm)->field.le_prev);                \
+    _Q_INVALIDATE((elm)->field.le_next);                \
+} while (0)
+
+#define BSD_LIST_REPLACE(elm, elm2, field) do {             \
+    if (((elm2)->field.le_next = (elm)->field.le_next) != NULL) \
+        (elm2)->field.le_next->field.le_prev =          \
+            &(elm2)->field.le_next;             \
+    (elm2)->field.le_prev = (elm)->field.le_prev;           \
+    *(elm2)->field.le_prev = (elm2);                \
+    _Q_INVALIDATE((elm)->field.le_prev);                \
+    _Q_INVALIDATE((elm)->field.le_next);                \
+} while (0)
+
+/*
+ * Simple queue definitions.
+ */
+#define BSD_SIMPLEQ_HEAD(name, type)                    \
+struct name {                               \
+    struct type *sqh_first; /* first element */         \
+    struct type **sqh_last; /* addr of last next element */     \
+}
+
+#define BSD_SIMPLEQ_HEAD_INITIALIZER(head)                  \
+    { NULL, &(head).sqh_first }
+
+#define BSD_SIMPLEQ_ENTRY(type)                     \
+struct {                                \
+    struct type *sqe_next;  /* next element */          \
+}
+
+/*
+ * Simple queue access methods.
+ */
+#define BSD_SIMPLEQ_FIRST(head)     ((head)->sqh_first)
+#define BSD_SIMPLEQ_END(head)       NULL
+#define BSD_SIMPLEQ_EMPTY(head)     (BSD_SIMPLEQ_FIRST(head) == BSD_SIMPLEQ_END(head))
+#define BSD_SIMPLEQ_NEXT(elm, field)    ((elm)->field.sqe_next)
+
+#define BSD_SIMPLEQ_FOREACH(var, head, field)               \
+    for((var) = BSD_SIMPLEQ_FIRST(head);                \
+        (var) != BSD_SIMPLEQ_END(head);                 \
+        (var) = BSD_SIMPLEQ_NEXT(var, field))
+
+/*
+ * Simple queue functions.
+ */
+#define BSD_SIMPLEQ_INIT(head) do {                     \
+    (head)->sqh_first = NULL;                   \
+    (head)->sqh_last = &(head)->sqh_first;              \
+} while (0)
+
+#define BSD_SIMPLEQ_INSERT_HEAD(head, elm, field) do {          \
+    if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)    \
+        (head)->sqh_last = &(elm)->field.sqe_next;      \
+    (head)->sqh_first = (elm);                  \
+} while (0)
+
+#define BSD_SIMPLEQ_INSERT_TAIL(head, elm, field) do {          \
+    (elm)->field.sqe_next = NULL;                   \
+    *(head)->sqh_last = (elm);                  \
+    (head)->sqh_last = &(elm)->field.sqe_next;          \
+} while (0)
+
+#define BSD_SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {        \
+    if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
+        (head)->sqh_last = &(elm)->field.sqe_next;      \
+    (listelm)->field.sqe_next = (elm);              \
+} while (0)
+
+#define BSD_SIMPLEQ_REMOVE_HEAD(head, field) do {           \
+    if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
+        (head)->sqh_last = &(head)->sqh_first;          \
+} while (0)
+
+/*
+ * Tail queue definitions.
+ */
+#define BSD_TAILQ_HEAD(name, type)                      \
+struct name {                               \
+    struct type *tqh_first; /* first element */         \
+    struct type **tqh_last; /* addr of last next element */     \
+}
+
+#define BSD_TAILQ_HEAD_INITIALIZER(head)                    \
+    { NULL, &(head).tqh_first }
+
+#define BSD_TAILQ_ENTRY(type)                       \
+struct {                                \
+    struct type *tqe_next;  /* next element */          \
+    struct type **tqe_prev; /* address of previous next element */  \
+}
+
+/* 
+ * tail queue access methods 
+ */
+#define BSD_TAILQ_FIRST(head)       ((head)->tqh_first)
+#define BSD_TAILQ_END(head)         NULL
+#define BSD_TAILQ_NEXT(elm, field)      ((elm)->field.tqe_next)
+#define BSD_TAILQ_LAST(head, headname)                  \
+    (*(((struct headname *)((head)->tqh_last))->tqh_last))
+/* XXX */
+#define BSD_TAILQ_PREV(elm, headname, field)                \
+    (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
+#define BSD_TAILQ_EMPTY(head)                       \
+    (BSD_TAILQ_FIRST(head) == BSD_TAILQ_END(head))
+
+#define BSD_TAILQ_FOREACH(var, head, field)                 \
+    for((var) = BSD_TAILQ_FIRST(head);                  \
+        (var) != BSD_TAILQ_END(head);                   \
+        (var) = BSD_TAILQ_NEXT(var, field))
+
+#define BSD_TAILQ_FOREACH_REVERSE(var, head, headname, field)       \
+    for((var) = BSD_TAILQ_LAST(head, headname);             \
+        (var) != BSD_TAILQ_END(head);                   \
+        (var) = BSD_TAILQ_PREV(var, headname, field))
+
+/*
+ * Tail queue functions.
+ */
+#define BSD_TAILQ_INIT(head) do {                       \
+    (head)->tqh_first = NULL;                   \
+    (head)->tqh_last = &(head)->tqh_first;              \
+} while (0)
+
+#define BSD_TAILQ_INSERT_HEAD(head, elm, field) do {            \
+    if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)    \
+        (head)->tqh_first->field.tqe_prev =         \
+            &(elm)->field.tqe_next;             \
+    else                                \
+        (head)->tqh_last = &(elm)->field.tqe_next;      \
+    (head)->tqh_first = (elm);                  \
+    (elm)->field.tqe_prev = &(head)->tqh_first;         \
+} while (0)
+
+#define BSD_TAILQ_INSERT_TAIL(head, elm, field) do {            \
+    (elm)->field.tqe_next = NULL;                   \
+    (elm)->field.tqe_prev = (head)->tqh_last;           \
+    *(head)->tqh_last = (elm);                  \
+    (head)->tqh_last = &(elm)->field.tqe_next;          \
+} while (0)
+
+#define BSD_TAILQ_INSERT_AFTER(head, listelm, elm, field) do {      \
+    if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
+        (elm)->field.tqe_next->field.tqe_prev =         \
+            &(elm)->field.tqe_next;             \
+    else                                \
+        (head)->tqh_last = &(elm)->field.tqe_next;      \
+    (listelm)->field.tqe_next = (elm);              \
+    (elm)->field.tqe_prev = &(listelm)->field.tqe_next;     \
+} while (0)
+
+#define BSD_TAILQ_INSERT_BEFORE(listelm, elm, field) do {           \
+    (elm)->field.tqe_prev = (listelm)->field.tqe_prev;      \
+    (elm)->field.tqe_next = (listelm);              \
+    *(listelm)->field.tqe_prev = (elm);             \
+    (listelm)->field.tqe_prev = &(elm)->field.tqe_next;     \
+} while (0)
+
+#define BSD_TAILQ_REMOVE(head, elm, field) do {             \
+    if (((elm)->field.tqe_next) != NULL)                \
+        (elm)->field.tqe_next->field.tqe_prev =         \
+            (elm)->field.tqe_prev;              \
+    else                                \
+        (head)->tqh_last = (elm)->field.tqe_prev;       \
+    *(elm)->field.tqe_prev = (elm)->field.tqe_next;         \
+    _Q_INVALIDATE((elm)->field.tqe_prev);               \
+    _Q_INVALIDATE((elm)->field.tqe_next);               \
+} while (0)
+
+#define BSD_TAILQ_REPLACE(head, elm, elm2, field) do {          \
+    if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != NULL)   \
+        (elm2)->field.tqe_next->field.tqe_prev =        \
+            &(elm2)->field.tqe_next;                \
+    else                                \
+        (head)->tqh_last = &(elm2)->field.tqe_next;     \
+    (elm2)->field.tqe_prev = (elm)->field.tqe_prev;         \
+    *(elm2)->field.tqe_prev = (elm2);               \
+    _Q_INVALIDATE((elm)->field.tqe_prev);               \
+    _Q_INVALIDATE((elm)->field.tqe_next);               \
+} while (0)
+
+/*
+ * Circular queue definitions.
+ */
+#define BSD_CIRCLEQ_HEAD(name, type)                    \
+struct name {                               \
+    struct type *cqh_first;     /* first element */     \
+    struct type *cqh_last;      /* last element */      \
+}
+
+#define BSD_CIRCLEQ_HEAD_INITIALIZER(head)                  \
+    { BSD_CIRCLEQ_END(&head), BSD_CIRCLEQ_END(&head) }
+
+#define BSD_CIRCLEQ_ENTRY(type)                     \
+struct {                                \
+    struct type *cqe_next;      /* next element */      \
+    struct type *cqe_prev;      /* previous element */      \
+}
+
+/*
+ * Circular queue access methods 
+ */
+#define BSD_CIRCLEQ_FIRST(head)     ((head)->cqh_first)
+#define BSD_CIRCLEQ_LAST(head)      ((head)->cqh_last)
+#define BSD_CIRCLEQ_END(head)       ((void *)(head))
+#define BSD_CIRCLEQ_NEXT(elm, field)    ((elm)->field.cqe_next)
+#define BSD_CIRCLEQ_PREV(elm, field)    ((elm)->field.cqe_prev)
+#define BSD_CIRCLEQ_EMPTY(head)                     \
+    (BSD_CIRCLEQ_FIRST(head) == BSD_CIRCLEQ_END(head))
+
+#define BSD_CIRCLEQ_FOREACH(var, head, field)               \
+    for((var) = BSD_CIRCLEQ_FIRST(head);                \
+        (var) != BSD_CIRCLEQ_END(head);                 \
+        (var) = BSD_CIRCLEQ_NEXT(var, field))
+
+#define BSD_CIRCLEQ_FOREACH_REVERSE(var, head, field)           \
+    for((var) = BSD_CIRCLEQ_LAST(head);                 \
+        (var) != BSD_CIRCLEQ_END(head);                 \
+        (var) = BSD_CIRCLEQ_PREV(var, field))
+
+/*
+ * Circular queue functions.
+ */
+#define BSD_CIRCLEQ_INIT(head) do {                     \
+    (head)->cqh_first = BSD_CIRCLEQ_END(head);              \
+    (head)->cqh_last = BSD_CIRCLEQ_END(head);               \
+} while (0)
+
+#define BSD_CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {        \
+    (elm)->field.cqe_next = (listelm)->field.cqe_next;      \
+    (elm)->field.cqe_prev = (listelm);              \
+    if ((listelm)->field.cqe_next == BSD_CIRCLEQ_END(head))     \
+        (head)->cqh_last = (elm);               \
+    else                                \
+        (listelm)->field.cqe_next->field.cqe_prev = (elm);  \
+    (listelm)->field.cqe_next = (elm);              \
+} while (0)
+
+#define BSD_CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {       \
+    (elm)->field.cqe_next = (listelm);              \
+    (elm)->field.cqe_prev = (listelm)->field.cqe_prev;      \
+    if ((listelm)->field.cqe_prev == BSD_CIRCLEQ_END(head))     \
+        (head)->cqh_first = (elm);              \
+    else                                \
+        (listelm)->field.cqe_prev->field.cqe_next = (elm);  \
+    (listelm)->field.cqe_prev = (elm);              \
+} while (0)
+
+#define BSD_CIRCLEQ_INSERT_HEAD(head, elm, field) do {          \
+    (elm)->field.cqe_next = (head)->cqh_first;          \
+    (elm)->field.cqe_prev = BSD_CIRCLEQ_END(head);          \
+    if ((head)->cqh_last == BSD_CIRCLEQ_END(head))          \
+        (head)->cqh_last = (elm);               \
+    else                                \
+        (head)->cqh_first->field.cqe_prev = (elm);      \
+    (head)->cqh_first = (elm);                  \
+} while (0)
+
+#define BSD_CIRCLEQ_INSERT_TAIL(head, elm, field) do {          \
+    (elm)->field.cqe_next = BSD_CIRCLEQ_END(head);          \
+    (elm)->field.cqe_prev = (head)->cqh_last;           \
+    if ((head)->cqh_first == BSD_CIRCLEQ_END(head))         \
+        (head)->cqh_first = (elm);              \
+    else                                \
+        (head)->cqh_last->field.cqe_next = (elm);       \
+    (head)->cqh_last = (elm);                   \
+} while (0)
+
+#define BSD_CIRCLEQ_REMOVE(head, elm, field) do {               \
+    if ((elm)->field.cqe_next == BSD_CIRCLEQ_END(head))         \
+        (head)->cqh_last = (elm)->field.cqe_prev;       \
+    else                                \
+        (elm)->field.cqe_next->field.cqe_prev =         \
+            (elm)->field.cqe_prev;              \
+    if ((elm)->field.cqe_prev == BSD_CIRCLEQ_END(head))         \
+        (head)->cqh_first = (elm)->field.cqe_next;      \
+    else                                \
+        (elm)->field.cqe_prev->field.cqe_next =         \
+            (elm)->field.cqe_next;              \
+    _Q_INVALIDATE((elm)->field.cqe_prev);               \
+    _Q_INVALIDATE((elm)->field.cqe_next);               \
+} while (0)
+
+#define BSD_CIRCLEQ_REPLACE(head, elm, elm2, field) do {            \
+    if (((elm2)->field.cqe_next = (elm)->field.cqe_next) ==     \
+        BSD_CIRCLEQ_END(head))                      \
+        (head).cqh_last = (elm2);               \
+    else                                \
+        (elm2)->field.cqe_next->field.cqe_prev = (elm2);    \
+    if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) ==     \
+        BSD_CIRCLEQ_END(head))                      \
+        (head).cqh_first = (elm2);              \
+    else                                \
+        (elm2)->field.cqe_prev->field.cqe_next = (elm2);    \
+    _Q_INVALIDATE((elm)->field.cqe_prev);               \
+    _Q_INVALIDATE((elm)->field.cqe_next);               \
+} while (0)
+
+#endif  /* !_BSD_SYS_QUEUE_H_ */
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
new file mode 100644
index 00000000..6dc22c7e
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
@@ -0,0 +1,2220 @@
+
+/*
+ * Copyright (c) 2008 Daniel Mueller (daniel@danm.de)
+ * Copyright (c) 2007 David McCullough (david_mccullough@securecomputing.com)
+ * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
+ * Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
+ * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+#undef UBSEC_DEBUG
+#undef UBSEC_VERBOSE_DEBUG
+
+#ifdef UBSEC_VERBOSE_DEBUG
+#define UBSEC_DEBUG
+#endif
+
+/*
+ * uBsec BCM5365 hardware crypto accelerator
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/proc_fs.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fs.h>
+#include <linux/random.h>
+#include <linux/skbuff.h>
+#include <linux/stat.h>
+#include <asm/io.h>
+
+#include <linux/ssb/ssb.h>
+
+/*
+ * BSD queue
+ */
+//#include "bsdqueue.h"
+
+/* 
+ * OCF
+ */
+#include <cryptodev.h>
+#include <uio.h>
+
+#define HMAC_HACK 1
+
+#define HMAC_HACK 1
+#ifdef HMAC_HACK
+#include <safe/hmachack.h>
+#include <safe/md5.h>
+#include <safe/md5.c>
+#include <safe/sha1.h>
+#include <safe/sha1.c>
+#endif
+
+#include "bsdqueue.h"
+#include "ubsecreg.h"
+#include "ubsecvar.h"
+
+#define DRV_MODULE_NAME     "ubsec_ssb"
+#define PFX DRV_MODULE_NAME ": "
+#define DRV_MODULE_VERSION  "0.02"
+#define DRV_MODULE_RELDATE  "Feb 21, 2009"
+
+#if 1
+#define DPRINTF(a...) \
+    if (debug) \
+    { \
+        printk(DRV_MODULE_NAME ": " a); \
+    }
+#else
+#define DPRINTF(a...)
+#endif
+
+/*
+ * Prototypes 
+ */
+static irqreturn_t ubsec_ssb_isr(int, void *, struct pt_regs *);
+static int ubsec_ssb_probe(struct ssb_device *sdev,
+    const struct ssb_device_id *ent);
+static void ubsec_ssb_remove(struct ssb_device *sdev);
+int ubsec_attach(struct ssb_device *sdev, const struct ssb_device_id *ent, 
+    struct device *self);
+static void ubsec_setup_mackey(struct ubsec_session *ses, int algo, 
+    caddr_t key, int klen);
+static int dma_map_skb(struct ubsec_softc *sc, 
+    struct ubsec_dma_alloc* q_map, struct sk_buff *skb, int *mlen);
+static int dma_map_uio(struct ubsec_softc *sc, 
+    struct ubsec_dma_alloc *q_map, struct uio *uio, int *mlen);
+static void dma_unmap(struct ubsec_softc *sc, 
+    struct ubsec_dma_alloc *q_map, int mlen);
+static int ubsec_dmamap_aligned(struct ubsec_softc *sc, 
+    const struct ubsec_dma_alloc *q_map, int mlen);
+
+#ifdef UBSEC_DEBUG
+static int proc_read(char *buf, char **start, off_t offset,
+    int size, int *peof, void *data);
+#endif
+
+void ubsec_reset_board(struct ubsec_softc *);
+void ubsec_init_board(struct ubsec_softc *);
+void ubsec_cleanchip(struct ubsec_softc *);
+void ubsec_totalreset(struct ubsec_softc *);
+int  ubsec_free_q(struct ubsec_softc*, struct ubsec_q *);
+
+static int ubsec_newsession(device_t, u_int32_t *, struct cryptoini *);
+static int ubsec_freesession(device_t, u_int64_t);
+static int ubsec_process(device_t, struct cryptop *, int);
+
+void    ubsec_callback(struct ubsec_softc *, struct ubsec_q *);
+void    ubsec_feed(struct ubsec_softc *);
+void    ubsec_mcopy(struct sk_buff *, struct sk_buff *, int, int);
+void    ubsec_dma_free(struct ubsec_softc *, struct ubsec_dma_alloc *);
+int     ubsec_dma_malloc(struct ubsec_softc *, struct ubsec_dma_alloc *,
+        size_t, int);
+
+/* DEBUG crap... */
+void ubsec_dump_pb(struct ubsec_pktbuf *);
+void ubsec_dump_mcr(struct ubsec_mcr *);
+
+#define READ_REG(sc,r) \
+    ssb_read32((sc)->sdev, (r));
+#define WRITE_REG(sc,r,val) \
+    ssb_write32((sc)->sdev, (r), (val));
+#define READ_REG_SDEV(sdev,r) \
+    ssb_read32((sdev), (r));
+#define WRITE_REG_SDEV(sdev,r,val) \
+    ssb_write32((sdev), (r), (val));
+
+#define SWAP32(x) (x) = htole32(ntohl((x)))
+#define HTOLE32(x) (x) = htole32(x)
+
+#ifdef __LITTLE_ENDIAN
+#define letoh16(x) (x)
+#define letoh32(x) (x)
+#endif
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Enable debug output");
+
+#define UBSEC_SSB_MAX_CHIPS 1
+static struct ubsec_softc *ubsec_chip_idx[UBSEC_SSB_MAX_CHIPS];
+static struct ubsec_stats ubsecstats;
+
+#ifdef UBSEC_DEBUG
+static struct proc_dir_entry *procdebug;
+#endif
+
+static struct ssb_device_id ubsec_ssb_tbl[] = {
+    /* Broadcom BCM5365P IPSec Core */
+    SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_IPSEC, SSB_ANY_REV),
+    SSB_DEVTABLE_END
+};
+
+static struct ssb_driver ubsec_ssb_driver = {
+    .name       = DRV_MODULE_NAME,
+    .id_table   = ubsec_ssb_tbl,
+    .probe      = ubsec_ssb_probe,
+    .remove     = ubsec_ssb_remove,
+     /*
+    .suspend    = ubsec_ssb_suspend,
+    .resume     = ubsec_ssb_resume
+    */
+};
+
+static device_method_t ubsec_ssb_methods = {
+    /* crypto device methods */
+    DEVMETHOD(cryptodev_newsession, ubsec_newsession),
+    DEVMETHOD(cryptodev_freesession,ubsec_freesession),
+    DEVMETHOD(cryptodev_process,    ubsec_process),
+};
+
+#ifdef UBSEC_DEBUG
+static int 
+proc_read(char *buf, char **start, off_t offset,
+    int size, int *peof, void *data)
+{
+    int i = 0, byteswritten = 0, ret;
+    unsigned int stat, ctrl;
+#ifdef UBSEC_VERBOSE_DEBUG
+    struct ubsec_q *q;
+    struct ubsec_dma *dmap;
+#endif
+   
+    while ((i < UBSEC_SSB_MAX_CHIPS) && (ubsec_chip_idx[i] != NULL))
+    {
+        struct ubsec_softc *sc = ubsec_chip_idx[i];
+        
+        stat = READ_REG(sc, BS_STAT);
+        ctrl = READ_REG(sc, BS_CTRL);
+        ret = snprintf((buf + byteswritten), 
+            (size - byteswritten) , 
+            "DEV %d, DMASTAT %08x, DMACTRL %08x\n", i, stat, ctrl);
+
+        byteswritten += ret;
+
+#ifdef UBSEC_VERBOSE_DEBUG
+        printf("DEV %d, DMASTAT %08x, DMACTRL %08x\n", i, stat, ctrl);
+
+        /* Dump all queues MCRs */
+        if (!BSD_SIMPLEQ_EMPTY(&sc->sc_qchip)) {
+            BSD_SIMPLEQ_FOREACH(q, &sc->sc_qchip, q_next)
+            {
+                dmap = q->q_dma;
+                ubsec_dump_mcr(&dmap->d_dma->d_mcr);
+            }
+        }
+#endif
+
+        i++;
+    }
+
+    *peof = 1;
+
+    return byteswritten;
+}
+#endif
+
+/*
+ * map in a given sk_buff
+ */
+static int
+dma_map_skb(struct ubsec_softc *sc, struct ubsec_dma_alloc* q_map, struct sk_buff *skb, int *mlen)
+{
+    int i = 0;
+    dma_addr_t tmp;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    /*
+     * We support only a limited number of fragments.
+     */
+    if (unlikely((skb_shinfo(skb)->nr_frags + 1) >= UBS_MAX_SCATTER))
+    {
+        printk(KERN_ERR "Only %d scatter fragments are supported.\n", UBS_MAX_SCATTER);
+        return (-ENOMEM);
+    }
+
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("%s - map %d 0x%x %d\n", __FUNCTION__, 0, (unsigned int)skb->data, skb_headlen(skb));
+#endif
+
+    /* first data package */
+    tmp = dma_map_single(sc->sc_dv,
+                         skb->data,
+                         skb_headlen(skb),
+                         DMA_BIDIRECTIONAL);
+    
+    q_map[i].dma_paddr = tmp;
+    q_map[i].dma_vaddr = skb->data;
+    q_map[i].dma_size = skb_headlen(skb);
+
+    if (unlikely(tmp == 0))
+    {
+        printk(KERN_ERR "Could not map memory region for dma.\n");
+        return (-EINVAL);
+    }
+
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("%s - map %d done physical addr 0x%x\n", __FUNCTION__, 0, (unsigned int)tmp);
+#endif
+
+
+    /* all other data packages */    
+    for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("%s - map %d 0x%x %d\n", __FUNCTION__, i + 1, 
+            (unsigned int)page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
+            skb_shinfo(skb)->frags[i].page_offset, skb_shinfo(skb)->frags[i].size);
+#endif
+
+        tmp = dma_map_single(sc->sc_dv,
+                             page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
+                                 skb_shinfo(skb)->frags[i].page_offset, 
+                             skb_shinfo(skb)->frags[i].size,
+                             DMA_BIDIRECTIONAL);
+
+        q_map[i + 1].dma_paddr = tmp;
+        q_map[i + 1].dma_vaddr = (void*)(page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
+                                  skb_shinfo(skb)->frags[i].page_offset);
+        q_map[i + 1].dma_size = skb_shinfo(skb)->frags[i].size;
+
+        if (unlikely(tmp == 0))
+        {
+            printk(KERN_ERR "Could not map memory region for dma.\n");
+            return (-EINVAL);
+        }
+
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("%s - map %d done physical addr 0x%x\n", __FUNCTION__, i + 1, (unsigned int)tmp);
+#endif
+
+    }
+    *mlen = i + 1;
+
+    return(0);
+}
+
+/*
+ * map in a given uio buffer
+ */
+
+static int
+dma_map_uio(struct ubsec_softc *sc, struct ubsec_dma_alloc *q_map, struct uio *uio, int *mlen)
+{
+    struct iovec *iov = uio->uio_iov;
+    int n;
+    dma_addr_t tmp;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    /*
+     * We support only a limited number of fragments.
+     */
+    if (unlikely(uio->uio_iovcnt >= UBS_MAX_SCATTER))
+    {
+        printk(KERN_ERR "Only %d scatter fragments are supported.\n", UBS_MAX_SCATTER);
+        return (-ENOMEM);
+    }
+
+    for (n = 0; n < uio->uio_iovcnt; n++) {
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("%s - map %d 0x%x %d\n", __FUNCTION__, n, (unsigned int)iov->iov_base, iov->iov_len);
+#endif
+        tmp = dma_map_single(sc->sc_dv,
+                             iov->iov_base,
+                             iov->iov_len,
+                             DMA_BIDIRECTIONAL);
+
+        q_map[n].dma_paddr = tmp;
+        q_map[n].dma_vaddr = iov->iov_base;
+        q_map[n].dma_size = iov->iov_len;
+
+        if (unlikely(tmp == 0))
+                       {
+            printk(KERN_ERR "Could not map memory region for dma.\n");
+            return (-EINVAL);
+        }
+
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("%s - map %d done physical addr 0x%x\n", __FUNCTION__, n, (unsigned int)tmp);
+#endif
+
+        iov++;
+    }
+    *mlen = n;
+
+    return(0);
+}
+
+static void
+dma_unmap(struct ubsec_softc *sc, struct ubsec_dma_alloc *q_map, int mlen)
+{
+    int i;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    for(i = 0; i < mlen; i++)
+    {
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("%s - unmap %d 0x%x %d\n", __FUNCTION__, i, (unsigned int)q_map[i].dma_paddr, q_map[i].dma_size);
+#endif
+        dma_unmap_single(sc->sc_dv,
+                         q_map[i].dma_paddr,
+                         q_map[i].dma_size,
+                         DMA_BIDIRECTIONAL);
+    }
+    return;
+}
+
+/*
+ * Is the operand suitable aligned for direct DMA.  Each
+ * segment must be aligned on a 32-bit boundary and all
+ * but the last segment must be a multiple of 4 bytes.
+ */
+static int
+ubsec_dmamap_aligned(struct ubsec_softc *sc, const struct ubsec_dma_alloc *q_map, int mlen)
+{
+    int i;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    for (i = 0; i < mlen; i++) {
+        if (q_map[i].dma_paddr & 3)
+            return (0);
+        if (i != (mlen - 1) && (q_map[i].dma_size & 3))
+            return (0);
+    }
+    return (1);
+}
+
+
+#define N(a)    (sizeof(a) / sizeof (a[0]))
+static void
+ubsec_setup_mackey(struct ubsec_session *ses, int algo, caddr_t key, int klen)
+{
+#ifdef HMAC_HACK
+    MD5_CTX md5ctx;
+    SHA1_CTX sha1ctx;
+    int i;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    for (i = 0; i < klen; i++)
+        key[i] ^= HMAC_IPAD_VAL;
+
+    if (algo == CRYPTO_MD5_HMAC) {
+        MD5Init(&md5ctx);
+        MD5Update(&md5ctx, key, klen);
+        MD5Update(&md5ctx, hmac_ipad_buffer, MD5_HMAC_BLOCK_LEN - klen);
+        bcopy(md5ctx.md5_st8, ses->ses_hminner, sizeof(md5ctx.md5_st8));
+    } else {
+        SHA1Init(&sha1ctx);
+        SHA1Update(&sha1ctx, key, klen);
+        SHA1Update(&sha1ctx, hmac_ipad_buffer,
+            SHA1_HMAC_BLOCK_LEN - klen);
+        bcopy(sha1ctx.h.b32, ses->ses_hminner, sizeof(sha1ctx.h.b32));
+    }
+
+    for (i = 0; i < klen; i++)
+        key[i] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL);
+
+    if (algo == CRYPTO_MD5_HMAC) {
+        MD5Init(&md5ctx);
+        MD5Update(&md5ctx, key, klen);
+        MD5Update(&md5ctx, hmac_opad_buffer, MD5_HMAC_BLOCK_LEN - klen);
+        bcopy(md5ctx.md5_st8, ses->ses_hmouter, sizeof(md5ctx.md5_st8));
+    } else {
+        SHA1Init(&sha1ctx);
+        SHA1Update(&sha1ctx, key, klen);
+        SHA1Update(&sha1ctx, hmac_opad_buffer,
+            SHA1_HMAC_BLOCK_LEN - klen);
+        bcopy(sha1ctx.h.b32, ses->ses_hmouter, sizeof(sha1ctx.h.b32));
+    }
+
+    for (i = 0; i < klen; i++)
+        key[i] ^= HMAC_OPAD_VAL;
+
+#else /* HMAC_HACK */
+    DPRINTF("md5/sha not implemented\n");
+#endif /* HMAC_HACK */
+}
+#undef N
+
+static int
+ubsec_ssb_probe(struct ssb_device *sdev, 
+    const struct ssb_device_id *ent) 
+{
+    int err;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    err = ssb_bus_powerup(sdev->bus, 0);
+    if (err) {
+        dev_err(sdev->dev, "Failed to powerup the bus\n");
+	goto err_out;
+    }
+
+    err = request_irq(sdev->irq, (irq_handler_t)ubsec_ssb_isr, 
+        IRQF_DISABLED | IRQF_SHARED, DRV_MODULE_NAME, sdev);
+    if (err) {
+        dev_err(sdev->dev, "Could not request irq\n");
+        goto err_out_powerdown;
+    }
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+    err = dma_set_mask(sdev->dma_dev, DMA_BIT_MASK(32)) || 
+	  dma_set_coherent_mask(sdev->dma_dev, DMA_BIT_MASK(32));
+#else
+    err = ssb_dma_set_mask(sdev, DMA_32BIT_MASK);
+#endif
+    if (err) {
+        dev_err(sdev->dev,
+        "Required 32BIT DMA mask unsupported by the system.\n");
+        goto err_out_free_irq;
+    }
+
+    printk(KERN_INFO "Sentry5(tm) ROBOGateway(tm) IPSec Core at IRQ %u\n",
+        sdev->irq);
+
+    DPRINTF("Vendor: %x, core id: %x, revision: %x\n",
+        sdev->id.vendor, sdev->id.coreid, sdev->id.revision);
+
+    ssb_device_enable(sdev, 0);
+
+    if (ubsec_attach(sdev, ent, sdev->dev) != 0)
+        goto err_out_disable;
+
+#ifdef UBSEC_DEBUG
+    procdebug = create_proc_entry(DRV_MODULE_NAME, S_IRUSR, NULL);
+    if (procdebug)
+    {
+        procdebug->read_proc = proc_read;
+        procdebug->data = NULL;
+    } else 
+        DPRINTF("Unable to create proc file.\n");
+#endif
+
+    return 0;
+
+err_out_disable:
+    ssb_device_disable(sdev, 0);
+
+err_out_free_irq:
+    free_irq(sdev->irq, sdev);
+
+err_out_powerdown:
+    ssb_bus_may_powerdown(sdev->bus);
+
+err_out:
+    return err;
+}
+
+static void ubsec_ssb_remove(struct ssb_device *sdev) {
+
+    struct ubsec_softc *sc;
+    unsigned int ctrlflgs;
+    struct ubsec_dma *dmap;
+    u_int32_t i;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    ctrlflgs = READ_REG_SDEV(sdev, BS_CTRL);
+    /* disable all IPSec Core interrupts globally */
+    ctrlflgs ^= (BS_CTRL_MCR1INT | BS_CTRL_MCR2INT |
+        BS_CTRL_DMAERR);
+    WRITE_REG_SDEV(sdev, BS_CTRL, ctrlflgs);
+
+    free_irq(sdev->irq, sdev);
+
+    sc = (struct ubsec_softc *)ssb_get_drvdata(sdev);
+
+    /* unregister all crypto algorithms */
+    crypto_unregister_all(sc->sc_cid);
+
+    /* Free queue / dma memory */
+    for (i = 0; i < UBS_MAX_NQUEUE; i++) {
+        struct ubsec_q *q;
+
+        q = sc->sc_queuea[i];
+        if (q != NULL)
+        {
+            dmap = q->q_dma;
+            if (dmap != NULL)
+            {
+                ubsec_dma_free(sc, &dmap->d_alloc);
+                q->q_dma = NULL;
+            }
+            kfree(q);
+        }
+        sc->sc_queuea[i] = NULL;
+    }
+
+    ssb_device_disable(sdev, 0);
+    ssb_bus_may_powerdown(sdev->bus);
+    ssb_set_drvdata(sdev, NULL);
+
+#ifdef UBSEC_DEBUG
+    if (procdebug)
+        remove_proc_entry(DRV_MODULE_NAME, NULL);
+#endif
+
+}
+
+
+int
+ubsec_attach(struct ssb_device *sdev, const struct ssb_device_id *ent, 
+    struct device *self)
+{
+    struct ubsec_softc *sc = NULL;
+    struct ubsec_dma *dmap;
+    u_int32_t i;
+    static int num_chips = 0;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    sc = (struct ubsec_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
+    if (!sc)
+        return(-ENOMEM);
+    memset(sc, 0, sizeof(*sc));
+
+    sc->sc_dv = sdev->dev;
+    sc->sdev = sdev;
+
+    spin_lock_init(&sc->sc_ringmtx);
+
+    softc_device_init(sc, "ubsec_ssb", num_chips, ubsec_ssb_methods);
+
+    /* Maybe someday there are boards with more than one chip available */
+    if (num_chips < UBSEC_SSB_MAX_CHIPS) {
+        ubsec_chip_idx[device_get_unit(sc->sc_dev)] = sc;
+        num_chips++;
+    }
+
+    ssb_set_drvdata(sdev, sc);
+
+    BSD_SIMPLEQ_INIT(&sc->sc_queue);
+    BSD_SIMPLEQ_INIT(&sc->sc_qchip);
+    BSD_SIMPLEQ_INIT(&sc->sc_queue2);
+    BSD_SIMPLEQ_INIT(&sc->sc_qchip2);
+    BSD_SIMPLEQ_INIT(&sc->sc_q2free);
+
+    sc->sc_statmask = BS_STAT_MCR1_DONE | BS_STAT_DMAERR;
+
+    sc->sc_cid = crypto_get_driverid(softc_get_device(sc), CRYPTOCAP_F_HARDWARE);
+    if (sc->sc_cid < 0) {
+        device_printf(sc->sc_dev, "could not get crypto driver id\n");
+        return -1;
+    }
+
+    BSD_SIMPLEQ_INIT(&sc->sc_freequeue);
+    dmap = sc->sc_dmaa;
+    for (i = 0; i < UBS_MAX_NQUEUE; i++, dmap++) {
+        struct ubsec_q *q;
+
+        q = (struct ubsec_q *)kmalloc(sizeof(struct ubsec_q), GFP_KERNEL);
+        if (q == NULL) {
+            printf(": can't allocate queue buffers\n");
+            break;
+        }
+
+        if (ubsec_dma_malloc(sc, &dmap->d_alloc, sizeof(struct ubsec_dmachunk),0)) {
+            printf(": can't allocate dma buffers\n");
+            kfree(q);
+            break;
+        }
+        dmap->d_dma = (struct ubsec_dmachunk *)dmap->d_alloc.dma_vaddr;
+
+        q->q_dma = dmap;
+        sc->sc_queuea[i] = q;
+
+        BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q, q_next);
+    }
+
+    /*
+     * Reset Broadcom chip
+     */
+    ubsec_reset_board(sc);
+
+    /*
+     * Init Broadcom chip
+     */
+    ubsec_init_board(sc);
+
+    /* supported crypto algorithms */
+    crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
+    crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
+
+    if (sc->sc_flags & UBS_FLAGS_AES) {
+        crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
+        printf(KERN_INFO DRV_MODULE_NAME ": DES 3DES AES128 AES192 AES256 MD5_HMAC SHA1_HMAC\n");
+    }
+    else
+        printf(KERN_INFO DRV_MODULE_NAME ": DES 3DES MD5_HMAC SHA1_HMAC\n");
+
+    crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
+    crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
+
+    return 0;
+}
+
+/*
+ * UBSEC Interrupt routine
+ */
+static irqreturn_t 
+ubsec_ssb_isr(int irq, void *arg, struct pt_regs *regs) 
+{
+    struct ubsec_softc *sc = NULL;
+    volatile u_int32_t stat;
+    struct ubsec_q *q;
+    struct ubsec_dma *dmap;
+    int npkts = 0, i;
+
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    sc = (struct ubsec_softc *)ssb_get_drvdata(arg);
+
+    stat = READ_REG(sc, BS_STAT);
+
+    stat &= sc->sc_statmask;
+    if (stat == 0)
+        return IRQ_NONE;
+
+    WRITE_REG(sc, BS_STAT, stat);       /* IACK */
+
+    /*
+     * Check to see if we have any packets waiting for us
+     */
+    if ((stat & BS_STAT_MCR1_DONE)) {
+        while (!BSD_SIMPLEQ_EMPTY(&sc->sc_qchip)) {
+            q = BSD_SIMPLEQ_FIRST(&sc->sc_qchip);
+            dmap = q->q_dma;
+
+            if ((dmap->d_dma->d_mcr.mcr_flags & htole16(UBS_MCR_DONE)) == 0)
+            {
+                DPRINTF("error while processing MCR. Flags = %x\n", dmap->d_dma->d_mcr.mcr_flags);
+                break;
+            }
+
+            BSD_SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip, q_next);
+
+            npkts = q->q_nstacked_mcrs;
+            /*
+             * search for further sc_qchip ubsec_q's that share
+             * the same MCR, and complete them too, they must be
+             * at the top.
+             */
+            for (i = 0; i < npkts; i++) {
+                if(q->q_stacked_mcr[i])
+                    ubsec_callback(sc, q->q_stacked_mcr[i]);
+                else
+                    break;
+            }
+            ubsec_callback(sc, q);
+        }
+
+        /*
+         * Don't send any more packet to chip if there has been
+         * a DMAERR.
+         */
+        if (likely(!(stat & BS_STAT_DMAERR)))
+            ubsec_feed(sc);
+        else
+            DPRINTF("DMA error occurred. Stop feeding crypto chip.\n");
+    }
+
+    /*
+     * Check to see if we got any DMA Error
+     */
+    if (stat & BS_STAT_DMAERR) {
+        volatile u_int32_t a = READ_REG(sc, BS_ERR);
+
+        printf(KERN_ERR "%s: dmaerr %s@%08x\n", DRV_MODULE_NAME,
+            (a & BS_ERR_READ) ? "read" : "write", a & BS_ERR_ADDR);
+
+        ubsecstats.hst_dmaerr++;
+        ubsec_totalreset(sc);
+        ubsec_feed(sc);
+    }
+
+    return IRQ_HANDLED;
+}
+
+/*
+ * ubsec_feed() - aggregate and post requests to chip
+ *        It is assumed that the caller set splnet()
+ */
+void
+ubsec_feed(struct ubsec_softc *sc)
+{
+#ifdef UBSEC_VERBOSE_DEBUG
+    static int max;
+#endif 
+    struct ubsec_q *q, *q2;
+    int npkts, i;
+    void *v;
+    u_int32_t stat;
+
+    npkts = sc->sc_nqueue;
+    if (npkts > UBS_MAX_AGGR)
+        npkts = UBS_MAX_AGGR;
+    if (npkts < 2)
+        goto feed1;
+
+    stat = READ_REG(sc, BS_STAT);
+
+    if (stat & (BS_STAT_MCR1_FULL | BS_STAT_DMAERR)) {
+        if(stat & BS_STAT_DMAERR) {
+            ubsec_totalreset(sc);
+            ubsecstats.hst_dmaerr++;
+        }
+        return;
+    }
+
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("merging %d records\n", npkts);
+
+    /* XXX temporary aggregation statistics reporting code */
+    if (max < npkts) {
+        max = npkts;
+        DPRINTF("%s: new max aggregate %d\n", DRV_MODULE_NAME, max);
+    }
+#endif /* UBSEC_VERBOSE_DEBUG */
+
+    q = BSD_SIMPLEQ_FIRST(&sc->sc_queue);
+    BSD_SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
+    --sc->sc_nqueue;
+
+#if 0
+    /* 
+     * XXX 
+     * We use dma_map_single() - no sync required!
+     */
+
+    bus_dmamap_sync(sc->sc_dmat, q->q_src_map,
+        0, q->q_src_map->dm_mapsize, BUS_DMASYNC_PREWRITE);
+    if (q->q_dst_map != NULL)
+        bus_dmamap_sync(sc->sc_dmat, q->q_dst_map,
+            0, q->q_dst_map->dm_mapsize, BUS_DMASYNC_PREREAD);
+#endif
+
+    q->q_nstacked_mcrs = npkts - 1;     /* Number of packets stacked */
+
+    for (i = 0; i < q->q_nstacked_mcrs; i++) {
+        q2 = BSD_SIMPLEQ_FIRST(&sc->sc_queue);
+
+#if 0
+        bus_dmamap_sync(sc->sc_dmat, q2->q_src_map,
+            0, q2->q_src_map->dm_mapsize, BUS_DMASYNC_PREWRITE);
+        if (q2->q_dst_map != NULL)
+            bus_dmamap_sync(sc->sc_dmat, q2->q_dst_map,
+                0, q2->q_dst_map->dm_mapsize, BUS_DMASYNC_PREREAD);
+#endif
+        BSD_SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
+        --sc->sc_nqueue;
+
+        v = ((char *)&q2->q_dma->d_dma->d_mcr) + sizeof(struct ubsec_mcr) -
+            sizeof(struct ubsec_mcr_add);
+        bcopy(v, &q->q_dma->d_dma->d_mcradd[i], sizeof(struct ubsec_mcr_add));
+        q->q_stacked_mcr[i] = q2;
+    }
+    q->q_dma->d_dma->d_mcr.mcr_pkts = htole16(npkts);
+    BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_qchip, q, q_next);
+#if 0
+    bus_dmamap_sync(sc->sc_dmat, q->q_dma->d_alloc.dma_map,
+        0, q->q_dma->d_alloc.dma_map->dm_mapsize,
+        BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+#endif
+    WRITE_REG(sc, BS_MCR1, q->q_dma->d_alloc.dma_paddr +
+        offsetof(struct ubsec_dmachunk, d_mcr));
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("feed (1): q->chip %p %08x %08x\n", q,
+        (u_int32_t)q->q_dma->d_alloc.dma_paddr,
+        (u_int32_t)(q->q_dma->d_alloc.dma_paddr +
+        offsetof(struct ubsec_dmachunk, d_mcr)));
+#endif /* UBSEC_DEBUG */
+    return;
+
+feed1:
+    while (!BSD_SIMPLEQ_EMPTY(&sc->sc_queue)) {
+        stat = READ_REG(sc, BS_STAT);
+
+        if (stat & (BS_STAT_MCR1_FULL | BS_STAT_DMAERR)) {
+            if(stat & BS_STAT_DMAERR) {
+                ubsec_totalreset(sc);
+                ubsecstats.hst_dmaerr++;
+            }
+            break;
+        }
+
+        q = BSD_SIMPLEQ_FIRST(&sc->sc_queue);
+
+#if 0
+        bus_dmamap_sync(sc->sc_dmat, q->q_src_map,
+            0, q->q_src_map->dm_mapsize, BUS_DMASYNC_PREWRITE);
+        if (q->q_dst_map != NULL)
+            bus_dmamap_sync(sc->sc_dmat, q->q_dst_map,
+                0, q->q_dst_map->dm_mapsize, BUS_DMASYNC_PREREAD);
+        bus_dmamap_sync(sc->sc_dmat, q->q_dma->d_alloc.dma_map,
+            0, q->q_dma->d_alloc.dma_map->dm_mapsize,
+            BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+#endif
+
+        WRITE_REG(sc, BS_MCR1, q->q_dma->d_alloc.dma_paddr +
+            offsetof(struct ubsec_dmachunk, d_mcr));
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("feed (2): q->chip %p %08x %08x\n", q, 
+            (u_int32_t)q->q_dma->d_alloc.dma_paddr,
+            (u_int32_t)(q->q_dma->d_alloc.dma_paddr +
+            offsetof(struct ubsec_dmachunk, d_mcr)));
+#endif /* UBSEC_DEBUG */
+        BSD_SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
+        --sc->sc_nqueue;
+        BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_qchip, q, q_next);
+    }
+}
+
+/*
+ * Allocate a new 'session' and return an encoded session id.  'sidp'
+ * contains our registration id, and should contain an encoded session
+ * id on successful allocation.
+ */
+static int
+ubsec_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
+{
+    struct cryptoini *c, *encini = NULL, *macini = NULL;
+    struct ubsec_softc *sc = NULL;
+    struct ubsec_session *ses = NULL;
+    int sesn, i;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    if (sidp == NULL || cri == NULL)
+        return (EINVAL);
+
+    sc = device_get_softc(dev);
+
+    if (sc == NULL)
+        return (EINVAL);
+
+    for (c = cri; c != NULL; c = c->cri_next) {
+        if (c->cri_alg == CRYPTO_MD5_HMAC ||
+            c->cri_alg == CRYPTO_SHA1_HMAC) {
+            if (macini)
+                return (EINVAL);
+            macini = c;
+        } else if (c->cri_alg == CRYPTO_DES_CBC ||
+            c->cri_alg == CRYPTO_3DES_CBC ||
+            c->cri_alg == CRYPTO_AES_CBC) {
+            if (encini)
+                return (EINVAL);
+            encini = c;
+        } else
+            return (EINVAL);
+    }
+    if (encini == NULL && macini == NULL)
+        return (EINVAL);
+
+    if (sc->sc_sessions == NULL) {
+        ses = sc->sc_sessions = (struct ubsec_session *)kmalloc(
+            sizeof(struct ubsec_session), SLAB_ATOMIC);
+        if (ses == NULL)
+            return (ENOMEM);
+        memset(ses, 0, sizeof(struct ubsec_session));
+        sesn = 0;
+        sc->sc_nsessions = 1;
+    } else {
+        for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
+            if (sc->sc_sessions[sesn].ses_used == 0) {
+                ses = &sc->sc_sessions[sesn];
+                break;
+            }
+        }
+
+        if (ses == NULL) {
+            sesn = sc->sc_nsessions;
+            ses = (struct ubsec_session *)kmalloc((sesn + 1) *
+                sizeof(struct ubsec_session), SLAB_ATOMIC);
+            if (ses == NULL)
+                return (ENOMEM);
+            memset(ses, 0, (sesn + 1) * sizeof(struct ubsec_session));
+            bcopy(sc->sc_sessions, ses, sesn *
+                sizeof(struct ubsec_session));
+            bzero(sc->sc_sessions, sesn *
+                sizeof(struct ubsec_session));
+            kfree(sc->sc_sessions);
+            sc->sc_sessions = ses;
+            ses = &sc->sc_sessions[sesn];
+            sc->sc_nsessions++;
+        }
+    }
+
+    bzero(ses, sizeof(struct ubsec_session));
+    ses->ses_used = 1;
+    if (encini) {
+        /* get an IV */
+        /* XXX may read fewer than requested */
+        read_random(ses->ses_iv, sizeof(ses->ses_iv));
+
+        /* Go ahead and compute key in ubsec's byte order */
+        if (encini->cri_alg == CRYPTO_DES_CBC) {
+            /* DES uses the same key three times:
+             * 1st encrypt -> 2nd decrypt -> 3nd encrypt */
+            bcopy(encini->cri_key, &ses->ses_key[0], 8);
+            bcopy(encini->cri_key, &ses->ses_key[2], 8);
+            bcopy(encini->cri_key, &ses->ses_key[4], 8);
+            ses->ses_keysize = 192; /* Fake! Actually its only 64bits .. 
+                                       oh no it is even less: 54bits. */
+        } else if(encini->cri_alg == CRYPTO_3DES_CBC) {
+            bcopy(encini->cri_key, ses->ses_key, 24);
+            ses->ses_keysize = 192;
+        } else if(encini->cri_alg == CRYPTO_AES_CBC) {
+            ses->ses_keysize = encini->cri_klen;
+
+            if (ses->ses_keysize != 128 &&
+                ses->ses_keysize != 192 &&
+                ses->ses_keysize != 256)
+            {
+                DPRINTF("unsupported AES key size: %d\n", ses->ses_keysize);
+                return (EINVAL);
+            }
+            bcopy(encini->cri_key, ses->ses_key, (ses->ses_keysize / 8));
+        }
+
+        /* Hardware requires the keys in little endian byte order */
+        for (i=0; i < (ses->ses_keysize / 32); i++)
+            SWAP32(ses->ses_key[i]);
+    }
+
+    if (macini) {
+        ses->ses_mlen = macini->cri_mlen;
+
+        if (ses->ses_mlen == 0 ||
+            ses->ses_mlen > SHA1_HASH_LEN) {
+
+            if (macini->cri_alg == CRYPTO_MD5_HMAC ||
+                macini->cri_alg == CRYPTO_SHA1_HMAC)
+            {
+                ses->ses_mlen = DEFAULT_HMAC_LEN;
+            } else
+            {
+                /*
+                 * Reserved for future usage. MD5/SHA1 calculations have
+                 * different hash sizes.
+                 */
+                printk(KERN_ERR DRV_MODULE_NAME ": unsupported hash operation with mac/hash len: %d\n", ses->ses_mlen);
+                return (EINVAL);
+            }
+            
+        }
+
+        if (macini->cri_key != NULL) {
+            ubsec_setup_mackey(ses, macini->cri_alg, macini->cri_key,
+                macini->cri_klen / 8);
+        }
+    }
+
+    *sidp = UBSEC_SID(device_get_unit(sc->sc_dev), sesn);
+    return (0);
+}
+
+/*
+ * Deallocate a session.
+ */
+static int
+ubsec_freesession(device_t dev, u_int64_t tid)
+{
+    struct ubsec_softc *sc = device_get_softc(dev);
+    int session;
+    u_int32_t sid = ((u_int32_t)tid) & 0xffffffff;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    if (sc == NULL)
+        return (EINVAL);
+
+    session = UBSEC_SESSION(sid);
+    if (session < sc->sc_nsessions) {
+        bzero(&sc->sc_sessions[session], sizeof(sc->sc_sessions[session]));
+        return (0);
+    } else
+        return (EINVAL);
+}
+
+static int
+ubsec_process(device_t dev, struct cryptop *crp, int hint)
+{
+    struct ubsec_q *q = NULL;
+    int err = 0, i, j, nicealign;
+    struct ubsec_softc *sc = device_get_softc(dev);
+    struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
+    int encoffset = 0, macoffset = 0, cpskip, cpoffset;
+    int sskip, dskip, stheend, dtheend, ivsize = 8;
+    int16_t coffset;
+    struct ubsec_session *ses;
+    struct ubsec_generic_ctx ctx;
+    struct ubsec_dma *dmap = NULL;
+    unsigned long flags;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    if (unlikely(crp == NULL || crp->crp_callback == NULL)) {
+        ubsecstats.hst_invalid++;
+        return (EINVAL);
+    }
+
+    if (unlikely(sc == NULL))
+        return (EINVAL);
+
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("spin_lock_irqsave\n");
+#endif
+    spin_lock_irqsave(&sc->sc_ringmtx, flags);
+    //spin_lock_irq(&sc->sc_ringmtx);
+
+    if (BSD_SIMPLEQ_EMPTY(&sc->sc_freequeue)) {
+        ubsecstats.hst_queuefull++;
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("spin_unlock_irqrestore\n");
+#endif
+        spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+        //spin_unlock_irq(&sc->sc_ringmtx);
+        err = ENOMEM;
+        goto errout2;
+    }
+
+    q = BSD_SIMPLEQ_FIRST(&sc->sc_freequeue);
+    BSD_SIMPLEQ_REMOVE_HEAD(&sc->sc_freequeue, q_next);
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("spin_unlock_irqrestore\n");
+#endif
+    spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+    //spin_unlock_irq(&sc->sc_ringmtx);
+
+    dmap = q->q_dma; /* Save dma pointer */
+    bzero(q, sizeof(struct ubsec_q));
+    bzero(&ctx, sizeof(ctx));
+
+    q->q_sesn = UBSEC_SESSION(crp->crp_sid);
+    q->q_dma = dmap;
+    ses = &sc->sc_sessions[q->q_sesn];
+
+    if (crp->crp_flags & CRYPTO_F_SKBUF) {
+        q->q_src_m = (struct sk_buff *)crp->crp_buf;
+        q->q_dst_m = (struct sk_buff *)crp->crp_buf;
+    } else if (crp->crp_flags & CRYPTO_F_IOV) {
+        q->q_src_io = (struct uio *)crp->crp_buf;
+        q->q_dst_io = (struct uio *)crp->crp_buf;
+    } else {
+        err = EINVAL;
+        goto errout;    /* XXX we don't handle contiguous blocks! */
+    }
+
+    bzero(&dmap->d_dma->d_mcr, sizeof(struct ubsec_mcr));
+
+    dmap->d_dma->d_mcr.mcr_pkts = htole16(1);
+    dmap->d_dma->d_mcr.mcr_flags = 0;
+    q->q_crp = crp;
+
+    crd1 = crp->crp_desc;
+    if (crd1 == NULL) {
+        err = EINVAL;
+        goto errout;
+    }
+    crd2 = crd1->crd_next;
+
+    if (crd2 == NULL) {
+        if (crd1->crd_alg == CRYPTO_MD5_HMAC ||
+            crd1->crd_alg == CRYPTO_SHA1_HMAC) {
+            maccrd = crd1;
+            enccrd = NULL;
+        } else if (crd1->crd_alg == CRYPTO_DES_CBC ||
+            crd1->crd_alg == CRYPTO_3DES_CBC || 
+            crd1->crd_alg == CRYPTO_AES_CBC) {
+            maccrd = NULL;
+            enccrd = crd1;
+        } else {
+            err = EINVAL;
+            goto errout;
+        }
+    } else {
+        if ((crd1->crd_alg == CRYPTO_MD5_HMAC ||
+            crd1->crd_alg == CRYPTO_SHA1_HMAC) &&
+            (crd2->crd_alg == CRYPTO_DES_CBC ||
+            crd2->crd_alg == CRYPTO_3DES_CBC ||
+            crd2->crd_alg == CRYPTO_AES_CBC) &&
+            ((crd2->crd_flags & CRD_F_ENCRYPT) == 0)) {
+            maccrd = crd1;
+            enccrd = crd2;
+        } else if ((crd1->crd_alg == CRYPTO_DES_CBC ||
+            crd1->crd_alg == CRYPTO_3DES_CBC ||
+            crd1->crd_alg == CRYPTO_AES_CBC) &&
+            (crd2->crd_alg == CRYPTO_MD5_HMAC ||
+            crd2->crd_alg == CRYPTO_SHA1_HMAC) &&
+            (crd1->crd_flags & CRD_F_ENCRYPT)) {
+            enccrd = crd1;
+            maccrd = crd2;
+        } else {
+            /*
+             * We cannot order the ubsec as requested
+             */
+            printk(KERN_ERR DRV_MODULE_NAME ": got wrong algorithm/signature order.\n");
+            err = EINVAL;
+            goto errout;
+        }
+    }
+
+    /* Encryption/Decryption requested */
+    if (enccrd) {
+        encoffset = enccrd->crd_skip;
+
+        if (enccrd->crd_alg == CRYPTO_DES_CBC ||
+            enccrd->crd_alg == CRYPTO_3DES_CBC)
+        {
+            ctx.pc_flags |= htole16(UBS_PKTCTX_ENC_3DES);
+            ctx.pc_type = htole16(UBS_PKTCTX_TYPE_IPSEC_DES);
+            ivsize = 8;     /* [3]DES uses 64bit IVs */
+        } else {
+            ctx.pc_flags |= htole16(UBS_PKTCTX_ENC_AES);
+            ctx.pc_type = htole16(UBS_PKTCTX_TYPE_IPSEC_AES);
+            ivsize = 16;    /* AES uses 128bit IVs / [3]DES 64bit IVs */
+
+            switch(ses->ses_keysize)
+            {
+                case 128:
+                    ctx.pc_flags |= htole16(UBS_PKTCTX_AES128);
+                    break;
+                case 192:
+                    ctx.pc_flags |= htole16(UBS_PKTCTX_AES192);
+                    break;
+                case 256:
+                    ctx.pc_flags |= htole16(UBS_PKTCTX_AES256);
+                    break;
+                default:
+                    DPRINTF("invalid AES key size: %d\n", ses->ses_keysize);
+                    err = EINVAL;
+                    goto errout;
+            }
+        }
+
+        if (enccrd->crd_flags & CRD_F_ENCRYPT) {
+            /* Direction: Outbound */
+
+            q->q_flags |= UBSEC_QFLAGS_COPYOUTIV;
+
+            if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
+                bcopy(enccrd->crd_iv, ctx.pc_iv, ivsize);
+            } else {
+                for(i=0; i < (ivsize / 4); i++)
+                    ctx.pc_iv[i] = ses->ses_iv[i];
+            }
+
+            /* If there is no IV in the buffer -> copy it here */
+            if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) {
+                if (crp->crp_flags & CRYPTO_F_SKBUF)
+                    /*
+                    m_copyback(q->q_src_m,
+                        enccrd->crd_inject,
+                        8, ctx.pc_iv);
+                    */
+                    crypto_copyback(crp->crp_flags, (caddr_t)q->q_src_m,
+                        enccrd->crd_inject, ivsize, (caddr_t)ctx.pc_iv);
+                else if (crp->crp_flags & CRYPTO_F_IOV)
+                    /*
+                    cuio_copyback(q->q_src_io,
+                        enccrd->crd_inject,
+                        8, ctx.pc_iv);
+                    */
+                    crypto_copyback(crp->crp_flags, (caddr_t)q->q_src_io,
+                        enccrd->crd_inject, ivsize, (caddr_t)ctx.pc_iv);
+            }
+        } else {
+            /* Direction: Inbound */
+
+            ctx.pc_flags |= htole16(UBS_PKTCTX_INBOUND);
+
+            if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+                bcopy(enccrd->crd_iv, ctx.pc_iv, ivsize);
+            else if (crp->crp_flags & CRYPTO_F_SKBUF)
+                /*
+                m_copydata(q->q_src_m, enccrd->crd_inject,
+                    8, (caddr_t)ctx.pc_iv);
+                */
+                crypto_copydata(crp->crp_flags, (caddr_t)q->q_src_m,
+                    enccrd->crd_inject, ivsize,
+                    (caddr_t)ctx.pc_iv);
+            else if (crp->crp_flags & CRYPTO_F_IOV)
+                /*
+                cuio_copydata(q->q_src_io,
+                    enccrd->crd_inject, 8,
+                    (caddr_t)ctx.pc_iv);
+                */
+                crypto_copydata(crp->crp_flags, (caddr_t)q->q_src_io,
+                    enccrd->crd_inject, ivsize,
+                    (caddr_t)ctx.pc_iv);
+
+        }
+
+        /* Even though key & IV sizes differ from cipher to cipher
+         * copy / swap the full array lengths. Let the compiler unroll
+         * the loop to increase the cpu pipeline performance... */
+        for(i=0; i < 8; i++)
+            ctx.pc_key[i] = ses->ses_key[i];
+        for(i=0; i < 4; i++)
+            SWAP32(ctx.pc_iv[i]);
+    }
+
+    /* Authentication requested */
+    if (maccrd) {
+        macoffset = maccrd->crd_skip;
+
+        if (maccrd->crd_alg == CRYPTO_MD5_HMAC)
+            ctx.pc_flags |= htole16(UBS_PKTCTX_AUTH_MD5);
+        else
+            ctx.pc_flags |= htole16(UBS_PKTCTX_AUTH_SHA1);
+
+        for (i = 0; i < 5; i++) {
+            ctx.pc_hminner[i] = ses->ses_hminner[i];
+            ctx.pc_hmouter[i] = ses->ses_hmouter[i];
+
+            HTOLE32(ctx.pc_hminner[i]);
+            HTOLE32(ctx.pc_hmouter[i]);
+        }
+    }
+
+    if (enccrd && maccrd) {
+        /*
+         * ubsec cannot handle packets where the end of encryption
+         * and authentication are not the same, or where the
+         * encrypted part begins before the authenticated part.
+         */
+        if (((encoffset + enccrd->crd_len) !=
+            (macoffset + maccrd->crd_len)) ||
+            (enccrd->crd_skip < maccrd->crd_skip)) {
+            err = EINVAL;
+            goto errout;
+        }
+        sskip = maccrd->crd_skip;
+        cpskip = dskip = enccrd->crd_skip;
+        stheend = maccrd->crd_len;
+        dtheend = enccrd->crd_len;
+        coffset = enccrd->crd_skip - maccrd->crd_skip;
+        cpoffset = cpskip + dtheend;
+#ifdef UBSEC_DEBUG
+        DPRINTF("mac: skip %d, len %d, inject %d\n",
+            maccrd->crd_skip, maccrd->crd_len, maccrd->crd_inject);
+        DPRINTF("enc: skip %d, len %d, inject %d\n",
+            enccrd->crd_skip, enccrd->crd_len, enccrd->crd_inject);
+        DPRINTF("src: skip %d, len %d\n", sskip, stheend);
+        DPRINTF("dst: skip %d, len %d\n", dskip, dtheend);
+        DPRINTF("ubs: coffset %d, pktlen %d, cpskip %d, cpoffset %d\n",
+            coffset, stheend, cpskip, cpoffset);
+#endif
+    } else {
+        cpskip = dskip = sskip = macoffset + encoffset;
+        dtheend = stheend = (enccrd)?enccrd->crd_len:maccrd->crd_len;
+        cpoffset = cpskip + dtheend;
+        coffset = 0;
+    }
+    ctx.pc_offset = htole16(coffset >> 2);
+
+#if 0
+    if (bus_dmamap_create(sc->sc_dmat, 0xfff0, UBS_MAX_SCATTER,
+        0xfff0, 0, BUS_DMA_NOWAIT, &q->q_src_map) != 0) {
+        err = ENOMEM;
+        goto errout;
+    }
+#endif
+
+    if (crp->crp_flags & CRYPTO_F_SKBUF) {
+#if 0
+        if (bus_dmamap_load_mbuf(sc->sc_dmat, q->q_src_map,
+            q->q_src_m, BUS_DMA_NOWAIT) != 0) {
+            bus_dmamap_destroy(sc->sc_dmat, q->q_src_map);
+            q->q_src_map = NULL;
+            err = ENOMEM;
+            goto errout;
+        }
+#endif
+        err = dma_map_skb(sc, q->q_src_map, q->q_src_m, &q->q_src_len);
+        if (unlikely(err != 0))
+            goto errout;
+
+    } else if (crp->crp_flags & CRYPTO_F_IOV) {
+#if 0
+        if (bus_dmamap_load_uio(sc->sc_dmat, q->q_src_map,
+            q->q_src_io, BUS_DMA_NOWAIT) != 0) {
+            bus_dmamap_destroy(sc->sc_dmat, q->q_src_map);
+            q->q_src_map = NULL;
+            err = ENOMEM;
+            goto errout;
+        }
+#endif
+        err = dma_map_uio(sc, q->q_src_map, q->q_src_io, &q->q_src_len);
+        if (unlikely(err != 0))
+           goto errout;
+    }
+
+    /* 
+     * Check alignment 
+     */
+    nicealign = ubsec_dmamap_aligned(sc, q->q_src_map, q->q_src_len);
+
+    dmap->d_dma->d_mcr.mcr_pktlen = htole16(stheend);
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("src skip: %d\n", sskip);
+#endif
+    for (i = j = 0; i < q->q_src_len; i++) {
+        struct ubsec_pktbuf *pb;
+        size_t packl = q->q_src_map[i].dma_size;
+        dma_addr_t packp = q->q_src_map[i].dma_paddr;
+
+        if (sskip >= packl) {
+            sskip -= packl;
+            continue;
+        }
+
+        packl -= sskip;
+        packp += sskip;
+        sskip = 0;
+
+        /* maximum fragment size is 0xfffc */
+        if (packl > 0xfffc) {
+            DPRINTF("Error: fragment size is bigger than 0xfffc.\n");
+            err = EIO;
+            goto errout;
+        }
+
+        if (j == 0)
+            pb = &dmap->d_dma->d_mcr.mcr_ipktbuf;
+        else
+            pb = &dmap->d_dma->d_sbuf[j - 1];
+
+        pb->pb_addr = htole32(packp);
+
+        if (stheend) {
+            if (packl > stheend) {
+                pb->pb_len = htole32(stheend);
+                stheend = 0;
+            } else {
+                pb->pb_len = htole32(packl);
+                stheend -= packl;
+            }
+        } else
+            pb->pb_len = htole32(packl);
+
+        if ((i + 1) == q->q_src_len)
+            pb->pb_next = 0;
+        else
+            pb->pb_next = htole32(dmap->d_alloc.dma_paddr +
+                offsetof(struct ubsec_dmachunk, d_sbuf[j]));
+        j++;
+    }
+
+    if (enccrd == NULL && maccrd != NULL) {
+        /* Authentication only */
+        dmap->d_dma->d_mcr.mcr_opktbuf.pb_addr = 0;
+        dmap->d_dma->d_mcr.mcr_opktbuf.pb_len = 0;
+        dmap->d_dma->d_mcr.mcr_opktbuf.pb_next =
+            htole32(dmap->d_alloc.dma_paddr +
+            offsetof(struct ubsec_dmachunk, d_macbuf[0]));
+#ifdef UBSEC_DEBUG
+        DPRINTF("opkt: %x %x %x\n",
+            dmap->d_dma->d_mcr.mcr_opktbuf.pb_addr,
+            dmap->d_dma->d_mcr.mcr_opktbuf.pb_len,
+            dmap->d_dma->d_mcr.mcr_opktbuf.pb_next);
+#endif
+    } else {
+        if (crp->crp_flags & CRYPTO_F_IOV) {
+            if (!nicealign) {
+                err = EINVAL;
+                goto errout;
+            }
+#if 0
+            if (bus_dmamap_create(sc->sc_dmat, 0xfff0,
+                UBS_MAX_SCATTER, 0xfff0, 0, BUS_DMA_NOWAIT,
+                &q->q_dst_map) != 0) {
+                err = ENOMEM;
+                goto errout;
+            }
+            if (bus_dmamap_load_uio(sc->sc_dmat, q->q_dst_map,
+                q->q_dst_io, BUS_DMA_NOWAIT) != 0) {
+                bus_dmamap_destroy(sc->sc_dmat, q->q_dst_map);
+                q->q_dst_map = NULL;
+                goto errout;
+            }
+#endif
+
+            /* HW shall copy the result into the source memory */
+            for(i = 0; i < q->q_src_len; i++)
+                q->q_dst_map[i] = q->q_src_map[i];
+
+            q->q_dst_len = q->q_src_len;
+            q->q_has_dst = 0;
+
+        } else if (crp->crp_flags & CRYPTO_F_SKBUF) {
+            if (nicealign) {
+
+                /* HW shall copy the result into the source memory */
+                q->q_dst_m = q->q_src_m;
+                for(i = 0; i < q->q_src_len; i++)
+                    q->q_dst_map[i] = q->q_src_map[i];
+
+                q->q_dst_len = q->q_src_len;
+                q->q_has_dst = 0;
+
+            } else {
+#ifdef NOTYET
+                int totlen, len;
+                struct sk_buff *m, *top, **mp;
+
+                totlen = q->q_src_map->dm_mapsize;
+                if (q->q_src_m->m_flags & M_PKTHDR) {
+                    len = MHLEN;
+                    MGETHDR(m, M_DONTWAIT, MT_DATA);
+                } else {
+                    len = MLEN;
+                    MGET(m, M_DONTWAIT, MT_DATA);
+                }
+                if (m == NULL) {
+                    err = ENOMEM;
+                    goto errout;
+                }
+                if (len == MHLEN)
+                    M_DUP_PKTHDR(m, q->q_src_m);
+                if (totlen >= MINCLSIZE) {
+                    MCLGET(m, M_DONTWAIT);
+                    if (m->m_flags & M_EXT)
+                        len = MCLBYTES;
+                }
+                m->m_len = len;
+                top = NULL;
+                mp = &top;
+
+                while (totlen > 0) {
+                    if (top) {
+                        MGET(m, M_DONTWAIT, MT_DATA);
+                        if (m == NULL) {
+                            m_freem(top);
+                            err = ENOMEM;
+                            goto errout;
+                        }
+                        len = MLEN;
+                    }
+                    if (top && totlen >= MINCLSIZE) {
+                        MCLGET(m, M_DONTWAIT);
+                        if (m->m_flags & M_EXT)
+                            len = MCLBYTES;
+                    }
+                    m->m_len = len = min(totlen, len);
+                    totlen -= len;
+                    *mp = m;
+                    mp = &m->m_next;
+                }
+                q->q_dst_m = top;
+                ubsec_mcopy(q->q_src_m, q->q_dst_m,
+                    cpskip, cpoffset);
+                if (bus_dmamap_create(sc->sc_dmat, 0xfff0,
+                    UBS_MAX_SCATTER, 0xfff0, 0, BUS_DMA_NOWAIT,
+                    &q->q_dst_map) != 0) {
+                    err = ENOMEM;
+                    goto errout;
+                }
+                if (bus_dmamap_load_mbuf(sc->sc_dmat,
+                    q->q_dst_map, q->q_dst_m,
+                    BUS_DMA_NOWAIT) != 0) {
+                    bus_dmamap_destroy(sc->sc_dmat,
+                    q->q_dst_map);
+                    q->q_dst_map = NULL;
+                    err = ENOMEM;
+                    goto errout;
+                }
+#else
+                device_printf(sc->sc_dev,
+                    "%s,%d: CRYPTO_F_SKBUF unaligned not implemented\n",
+                    __FILE__, __LINE__);
+                err = EINVAL;
+                goto errout;
+#endif
+            }
+        } else {
+            err = EINVAL;
+            goto errout;
+        }
+
+#ifdef UBSEC_DEBUG
+        DPRINTF("dst skip: %d\n", dskip);
+#endif
+        for (i = j = 0; i < q->q_dst_len; i++) {
+            struct ubsec_pktbuf *pb;
+            size_t packl = q->q_dst_map[i].dma_size;
+            dma_addr_t packp = q->q_dst_map[i].dma_paddr;
+
+            if (dskip >= packl) {
+                dskip -= packl;
+                continue;
+            }
+
+            packl -= dskip;
+            packp += dskip;
+            dskip = 0;
+
+            if (packl > 0xfffc) {
+                DPRINTF("Error: fragment size is bigger than 0xfffc.\n");
+                err = EIO;
+                goto errout;
+            }
+
+            if (j == 0)
+                pb = &dmap->d_dma->d_mcr.mcr_opktbuf;
+            else
+                pb = &dmap->d_dma->d_dbuf[j - 1];
+
+            pb->pb_addr = htole32(packp);
+
+            if (dtheend) {
+                if (packl > dtheend) {
+                    pb->pb_len = htole32(dtheend);
+                    dtheend = 0;
+                } else {
+                    pb->pb_len = htole32(packl);
+                    dtheend -= packl;
+                }
+            } else
+                pb->pb_len = htole32(packl);
+
+            if ((i + 1) == q->q_dst_len) {
+                if (maccrd)
+                    /* Authentication:
+                     * The last fragment of the output buffer 
+                     * contains the HMAC. */
+                    pb->pb_next = htole32(dmap->d_alloc.dma_paddr +
+                        offsetof(struct ubsec_dmachunk, d_macbuf[0]));
+                else
+                    pb->pb_next = 0;
+            } else
+                pb->pb_next = htole32(dmap->d_alloc.dma_paddr +
+                    offsetof(struct ubsec_dmachunk, d_dbuf[j]));
+            j++;
+        }
+    }
+
+    dmap->d_dma->d_mcr.mcr_cmdctxp = htole32(dmap->d_alloc.dma_paddr +
+        offsetof(struct ubsec_dmachunk, d_ctx));
+
+    if (sc->sc_flags & UBS_FLAGS_LONGCTX) {
+        /* new Broadcom cards with dynamic long command context structure */
+
+        if (enccrd != NULL &&
+            enccrd->crd_alg == CRYPTO_AES_CBC)
+        {
+            struct ubsec_pktctx_aes128 *ctxaes128;    
+            struct ubsec_pktctx_aes192 *ctxaes192;    
+            struct ubsec_pktctx_aes256 *ctxaes256;    
+
+            switch(ses->ses_keysize)
+            {
+                /* AES 128bit */
+                case 128:
+                ctxaes128 = (struct ubsec_pktctx_aes128 *)
+                    (dmap->d_alloc.dma_vaddr + 
+                    offsetof(struct ubsec_dmachunk, d_ctx));
+
+                ctxaes128->pc_len = htole16(sizeof(struct ubsec_pktctx_aes128));
+                ctxaes128->pc_type = ctx.pc_type;
+                ctxaes128->pc_flags = ctx.pc_flags;
+                ctxaes128->pc_offset = ctx.pc_offset;
+                for (i = 0; i < 4; i++)
+                    ctxaes128->pc_aeskey[i] = ctx.pc_key[i];
+                for (i = 0; i < 5; i++)
+                    ctxaes128->pc_hminner[i] = ctx.pc_hminner[i];
+                for (i = 0; i < 5; i++)
+                    ctxaes128->pc_hmouter[i] = ctx.pc_hmouter[i];
+                for (i = 0; i < 4; i++)
+                    ctxaes128->pc_iv[i] = ctx.pc_iv[i];
+                break;
+
+                /* AES 192bit */
+                case 192:
+                ctxaes192 = (struct ubsec_pktctx_aes192 *)
+                    (dmap->d_alloc.dma_vaddr + 
+                    offsetof(struct ubsec_dmachunk, d_ctx));
+
+                ctxaes192->pc_len = htole16(sizeof(struct ubsec_pktctx_aes192));
+                ctxaes192->pc_type = ctx.pc_type;
+                ctxaes192->pc_flags = ctx.pc_flags;
+                ctxaes192->pc_offset = ctx.pc_offset;
+                for (i = 0; i < 6; i++)
+                    ctxaes192->pc_aeskey[i] = ctx.pc_key[i];
+                for (i = 0; i < 5; i++)
+                    ctxaes192->pc_hminner[i] = ctx.pc_hminner[i];
+                for (i = 0; i < 5; i++)
+                    ctxaes192->pc_hmouter[i] = ctx.pc_hmouter[i];
+                for (i = 0; i < 4; i++)
+                    ctxaes192->pc_iv[i] = ctx.pc_iv[i];
+                break;
+
+                /* AES 256bit */
+                case 256:
+                ctxaes256 = (struct ubsec_pktctx_aes256 *)
+                    (dmap->d_alloc.dma_vaddr + 
+                    offsetof(struct ubsec_dmachunk, d_ctx));
+
+                ctxaes256->pc_len = htole16(sizeof(struct ubsec_pktctx_aes256));
+                ctxaes256->pc_type = ctx.pc_type;
+                ctxaes256->pc_flags = ctx.pc_flags;
+                ctxaes256->pc_offset = ctx.pc_offset;
+                for (i = 0; i < 8; i++)
+                    ctxaes256->pc_aeskey[i] = ctx.pc_key[i];
+                for (i = 0; i < 5; i++)
+                    ctxaes256->pc_hminner[i] = ctx.pc_hminner[i];
+                for (i = 0; i < 5; i++)
+                    ctxaes256->pc_hmouter[i] = ctx.pc_hmouter[i];
+                for (i = 0; i < 4; i++)
+                    ctxaes256->pc_iv[i] = ctx.pc_iv[i];
+                break;
+
+            }
+        } else {
+            /* 
+             * [3]DES / MD5_HMAC / SHA1_HMAC
+             *
+             * MD5_HMAC / SHA1_HMAC can use the IPSEC 3DES operation without
+             * encryption.
+             */
+            struct ubsec_pktctx_des *ctxdes;
+
+            ctxdes = (struct ubsec_pktctx_des *)(dmap->d_alloc.dma_vaddr +
+                offsetof(struct ubsec_dmachunk, d_ctx));
+            
+            ctxdes->pc_len = htole16(sizeof(struct ubsec_pktctx_des));
+            ctxdes->pc_type = ctx.pc_type;
+            ctxdes->pc_flags = ctx.pc_flags;
+            ctxdes->pc_offset = ctx.pc_offset;
+            for (i = 0; i < 6; i++)
+                ctxdes->pc_deskey[i] = ctx.pc_key[i];
+            for (i = 0; i < 5; i++)
+                ctxdes->pc_hminner[i] = ctx.pc_hminner[i];
+            for (i = 0; i < 5; i++)
+                ctxdes->pc_hmouter[i] = ctx.pc_hmouter[i];   
+            ctxdes->pc_iv[0] = ctx.pc_iv[0];
+            ctxdes->pc_iv[1] = ctx.pc_iv[1];
+        }
+    } else
+    {
+        /* old Broadcom card with fixed small command context structure */
+
+        /*
+         * [3]DES / MD5_HMAC / SHA1_HMAC
+         */
+        struct ubsec_pktctx *ctxs;
+
+        ctxs = (struct ubsec_pktctx *)(dmap->d_alloc.dma_vaddr +
+                    offsetof(struct ubsec_dmachunk, d_ctx));
+ 
+        /* transform generic context into small context */
+        for (i = 0; i < 6; i++)
+            ctxs->pc_deskey[i] = ctx.pc_key[i];
+        for (i = 0; i < 5; i++)
+            ctxs->pc_hminner[i] = ctx.pc_hminner[i];
+        for (i = 0; i < 5; i++)
+            ctxs->pc_hmouter[i] = ctx.pc_hmouter[i];
+        ctxs->pc_iv[0] = ctx.pc_iv[0];
+        ctxs->pc_iv[1] = ctx.pc_iv[1];
+        ctxs->pc_flags = ctx.pc_flags;
+        ctxs->pc_offset = ctx.pc_offset;
+    }
+
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("spin_lock_irqsave\n");
+#endif
+    spin_lock_irqsave(&sc->sc_ringmtx, flags);
+    //spin_lock_irq(&sc->sc_ringmtx);
+
+    BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_queue, q, q_next);
+    sc->sc_nqueue++;
+    ubsecstats.hst_ipackets++;
+    ubsecstats.hst_ibytes += stheend;
+    ubsec_feed(sc);
+
+#ifdef UBSEC_VERBOSE_DEBUG
+    DPRINTF("spin_unlock_irqrestore\n");
+#endif
+    spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+    //spin_unlock_irq(&sc->sc_ringmtx);
+    
+    return (0);
+
+errout:
+    if (q != NULL) {
+#ifdef NOTYET
+        if ((q->q_dst_m != NULL) && (q->q_src_m != q->q_dst_m))
+            m_freem(q->q_dst_m);
+#endif
+
+        if ((q->q_has_dst == 1) && q->q_dst_len > 0) {
+#if 0
+            bus_dmamap_unload(sc->sc_dmat, q->q_dst_map);
+            bus_dmamap_destroy(sc->sc_dmat, q->q_dst_map);
+#endif
+            dma_unmap(sc, q->q_dst_map, q->q_dst_len);
+        }
+        if (q->q_src_len > 0) {
+#if 0
+            bus_dmamap_unload(sc->sc_dmat, q->q_src_map);
+            bus_dmamap_destroy(sc->sc_dmat, q->q_src_map);
+#endif
+            dma_unmap(sc, q->q_src_map, q->q_src_len);
+        }
+
+#ifdef UBSEC_VERBOSE_DEBUG
+        DPRINTF("spin_lock_irqsave\n");
+#endif
+        spin_lock_irqsave(&sc->sc_ringmtx, flags);
+        //spin_lock_irq(&sc->sc_ringmtx);
+
+        BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q, q_next);
+
+#ifdef UBSEC_VERBOSE_DEBUG
+       DPRINTF("spin_unlock_irqrestore\n");
+#endif
+        spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
+        //spin_unlock_irq(&sc->sc_ringmtx);
+
+    }
+    if (err == EINVAL)
+        ubsecstats.hst_invalid++;
+    else
+        ubsecstats.hst_nomem++;
+errout2:
+    crp->crp_etype = err;
+    crypto_done(crp);
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s() err = %x\n", __FUNCTION__, err);
+#endif
+
+    return (0);
+}
+
+void
+ubsec_callback(struct ubsec_softc *sc, struct ubsec_q *q)
+{
+    struct cryptop *crp = (struct cryptop *)q->q_crp;
+    struct cryptodesc *crd;
+    struct ubsec_dma *dmap = q->q_dma;
+    int ivsize = 8;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    ubsecstats.hst_opackets++;
+    ubsecstats.hst_obytes += dmap->d_alloc.dma_size;
+
+#if 0
+    bus_dmamap_sync(sc->sc_dmat, dmap->d_alloc.dma_map, 0,
+        dmap->d_alloc.dma_map->dm_mapsize,
+        BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
+    if (q->q_dst_map != NULL && q->q_dst_map != q->q_src_map) {
+        bus_dmamap_sync(sc->sc_dmat, q->q_dst_map,
+            0, q->q_dst_map->dm_mapsize, BUS_DMASYNC_POSTREAD);
+        bus_dmamap_unload(sc->sc_dmat, q->q_dst_map);
+        bus_dmamap_destroy(sc->sc_dmat, q->q_dst_map);
+    }
+    bus_dmamap_sync(sc->sc_dmat, q->q_src_map,
+        0, q->q_src_map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
+    bus_dmamap_unload(sc->sc_dmat, q->q_src_map);
+    bus_dmamap_destroy(sc->sc_dmat, q->q_src_map);
+#endif
+
+    if ((q->q_has_dst == 1) && q->q_dst_len > 0)
+        dma_unmap(sc, q->q_dst_map, q->q_dst_len);
+
+    dma_unmap(sc, q->q_src_map, q->q_src_len);
+
+#ifdef NOTYET
+    if ((crp->crp_flags & CRYPTO_F_SKBUF) && (q->q_src_m != q->q_dst_m)) {
+        m_freem(q->q_src_m);
+        crp->crp_buf = (caddr_t)q->q_dst_m;
+    }
+#endif
+
+    /* copy out IV for future use */
+    if (q->q_flags & UBSEC_QFLAGS_COPYOUTIV) {
+        for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
+            if (crd->crd_alg != CRYPTO_DES_CBC &&
+                crd->crd_alg != CRYPTO_3DES_CBC &&
+                crd->crd_alg != CRYPTO_AES_CBC)
+                continue;
+
+            if (crd->crd_alg == CRYPTO_AES_CBC)
+                ivsize = 16;
+            else
+                ivsize = 8;
+
+            if (crp->crp_flags & CRYPTO_F_SKBUF)
+#if 0
+                m_copydata((struct sk_buff *)crp->crp_buf,
+                    crd->crd_skip + crd->crd_len - 8, 8,
+                    (caddr_t)sc->sc_sessions[q->q_sesn].ses_iv);
+#endif
+                crypto_copydata(crp->crp_flags, (caddr_t)crp->crp_buf,
+                    crd->crd_skip + crd->crd_len - ivsize, ivsize,
+                    (caddr_t)sc->sc_sessions[q->q_sesn].ses_iv);
+
+            else if (crp->crp_flags & CRYPTO_F_IOV) {
+#if 0
+                cuio_copydata((struct uio *)crp->crp_buf,
+                    crd->crd_skip + crd->crd_len - 8, 8,
+                    (caddr_t)sc->sc_sessions[q->q_sesn].ses_iv);
+#endif
+                crypto_copydata(crp->crp_flags, (caddr_t)crp->crp_buf,
+                    crd->crd_skip + crd->crd_len - ivsize, ivsize,
+                    (caddr_t)sc->sc_sessions[q->q_sesn].ses_iv);
+                    
+            }
+            break;
+        }
+    }
+
+    for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
+        if (crd->crd_alg != CRYPTO_MD5_HMAC &&
+            crd->crd_alg != CRYPTO_SHA1_HMAC)
+            continue;
+#if 0
+        if (crp->crp_flags & CRYPTO_F_SKBUF)
+            m_copyback((struct sk_buff *)crp->crp_buf,
+                crd->crd_inject, 12,
+                dmap->d_dma->d_macbuf);
+#endif
+#if 0
+            /* BUG? it does not honor the mac len.. */
+            crypto_copyback(crp->crp_flags, crp->crp_buf,
+                crd->crd_inject, 12,
+                (caddr_t)dmap->d_dma->d_macbuf);
+#endif
+            crypto_copyback(crp->crp_flags, crp->crp_buf,
+                crd->crd_inject, 
+                sc->sc_sessions[q->q_sesn].ses_mlen,
+                (caddr_t)dmap->d_dma->d_macbuf);
+#if 0
+        else if (crp->crp_flags & CRYPTO_F_IOV && crp->crp_mac)
+            bcopy((caddr_t)dmap->d_dma->d_macbuf,
+                crp->crp_mac, 12);
+#endif
+        break;
+    }
+    BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q, q_next);
+    crypto_done(crp);
+}
+
+void
+ubsec_mcopy(struct sk_buff *srcm, struct sk_buff *dstm, int hoffset, int toffset)
+{
+    int i, j, dlen, slen;
+    caddr_t dptr, sptr;
+
+    j = 0;
+    sptr = srcm->data;
+    slen = srcm->len;
+    dptr = dstm->data;
+    dlen = dstm->len;
+
+    while (1) {
+        for (i = 0; i < min(slen, dlen); i++) {
+            if (j < hoffset || j >= toffset)
+                *dptr++ = *sptr++;
+            slen--;
+            dlen--;
+            j++;
+        }
+        if (slen == 0) {
+            srcm = srcm->next;
+            if (srcm == NULL)
+                return;
+            sptr = srcm->data;
+            slen = srcm->len;
+        }
+        if (dlen == 0) {
+            dstm = dstm->next;
+            if (dstm == NULL)
+                return;
+            dptr = dstm->data;
+            dlen = dstm->len;
+        }
+    }
+}
+
+int
+ubsec_dma_malloc(struct ubsec_softc *sc, struct ubsec_dma_alloc *dma, 
+    size_t size, int mapflags)
+{
+    dma->dma_vaddr = dma_alloc_coherent(sc->sc_dv, 
+        size, &dma->dma_paddr, GFP_KERNEL);
+
+    if (likely(dma->dma_vaddr))
+    {
+        dma->dma_size = size;
+        return (0);
+    }
+
+    DPRINTF("could not allocate %d bytes of coherent memory.\n", size);
+
+    return (1);
+}
+
+void
+ubsec_dma_free(struct ubsec_softc *sc, struct ubsec_dma_alloc *dma)
+{
+    dma_free_coherent(sc->sc_dv, dma->dma_size, dma->dma_vaddr, 
+        dma->dma_paddr);
+}
+
+/*
+ * Resets the board.  Values in the regesters are left as is
+ * from the reset (i.e. initial values are assigned elsewhere).
+ */
+void
+ubsec_reset_board(struct ubsec_softc *sc)
+{
+    volatile u_int32_t ctrl;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+    DPRINTF("Send reset signal to chip.\n");
+
+    ctrl = READ_REG(sc, BS_CTRL);
+    ctrl |= BS_CTRL_RESET;
+    WRITE_REG(sc, BS_CTRL, ctrl);
+
+    /*
+     * Wait aprox. 30 PCI clocks = 900 ns = 0.9 us
+     */
+    DELAY(10);
+}
+
+/*
+ * Init Broadcom registers
+ */
+void
+ubsec_init_board(struct ubsec_softc *sc)
+{
+    u_int32_t ctrl;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+    DPRINTF("Initialize chip.\n");
+
+    ctrl = READ_REG(sc, BS_CTRL);
+    ctrl &= ~(BS_CTRL_BE32 | BS_CTRL_BE64);
+    ctrl |= BS_CTRL_LITTLE_ENDIAN | BS_CTRL_MCR1INT | BS_CTRL_DMAERR;
+
+    WRITE_REG(sc, BS_CTRL, ctrl);
+
+    /* Set chip capabilities (BCM5365P) */
+    sc->sc_flags |= UBS_FLAGS_LONGCTX | UBS_FLAGS_AES;
+}
+
+/*
+ * Clean up after a chip crash.
+ * It is assumed that the caller has spin_lock_irq(sc_ringmtx).
+ */
+void
+ubsec_cleanchip(struct ubsec_softc *sc)
+{
+    struct ubsec_q *q;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+    DPRINTF("Clean up queues after chip crash.\n");
+
+    while (!BSD_SIMPLEQ_EMPTY(&sc->sc_qchip)) {
+        q = BSD_SIMPLEQ_FIRST(&sc->sc_qchip);
+        BSD_SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip, q_next);
+        ubsec_free_q(sc, q);
+    }
+}
+
+/*
+ * free a ubsec_q
+ * It is assumed that the caller has spin_lock_irq(sc_ringmtx).
+ */
+int
+ubsec_free_q(struct ubsec_softc *sc, struct ubsec_q *q)
+{
+    struct ubsec_q *q2;
+    struct cryptop *crp;
+    int npkts;
+    int i;
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+
+    npkts = q->q_nstacked_mcrs;
+
+    for (i = 0; i < npkts; i++) {
+        if(q->q_stacked_mcr[i]) {
+            q2 = q->q_stacked_mcr[i];
+
+            if ((q2->q_dst_m != NULL) && (q2->q_src_m != q2->q_dst_m)) 
+#ifdef NOTYET
+                m_freem(q2->q_dst_m);
+#else
+                printk(KERN_ERR "%s,%d: SKB not supported\n", __FILE__, __LINE__);
+#endif
+
+            crp = (struct cryptop *)q2->q_crp;
+            
+            BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q2, q_next);
+            
+            crp->crp_etype = EFAULT;
+            crypto_done(crp);
+        } else {
+            break;
+        }
+    }
+
+    /*
+     * Free header MCR
+     */
+    if ((q->q_dst_m != NULL) && (q->q_src_m != q->q_dst_m))
+#ifdef NOTYET
+        m_freem(q->q_dst_m);
+#else
+        printk(KERN_ERR "%s,%d: SKB not supported\n", __FILE__, __LINE__);
+#endif
+
+    crp = (struct cryptop *)q->q_crp;
+    
+    BSD_SIMPLEQ_INSERT_TAIL(&sc->sc_freequeue, q, q_next);
+    
+    crp->crp_etype = EFAULT;
+    crypto_done(crp);
+    return(0);
+}
+
+/*
+ * Routine to reset the chip and clean up.
+ * It is assumed that the caller has spin_lock_irq(sc_ringmtx).
+ */
+void
+ubsec_totalreset(struct ubsec_softc *sc)
+{
+
+#ifdef UBSEC_DEBUG
+    DPRINTF("%s()\n", __FUNCTION__);
+#endif
+    DPRINTF("initiate total chip reset.. \n");
+    ubsec_reset_board(sc);
+    ubsec_init_board(sc);
+    ubsec_cleanchip(sc);
+}
+
+void
+ubsec_dump_pb(struct ubsec_pktbuf *pb)
+{
+    printf("addr 0x%x (0x%x) next 0x%x\n",
+        pb->pb_addr, pb->pb_len, pb->pb_next);
+}
+
+void
+ubsec_dump_mcr(struct ubsec_mcr *mcr)
+{
+    struct ubsec_mcr_add *ma;
+    int i;
+
+    printf("MCR:\n");
+    printf(" pkts: %u, flags 0x%x\n",
+        letoh16(mcr->mcr_pkts), letoh16(mcr->mcr_flags));
+    ma = (struct ubsec_mcr_add *)&mcr->mcr_cmdctxp;
+    for (i = 0; i < letoh16(mcr->mcr_pkts); i++) {
+        printf(" %d: ctx 0x%x len 0x%x rsvd 0x%x\n", i,
+            letoh32(ma->mcr_cmdctxp), letoh16(ma->mcr_pktlen),
+            letoh16(ma->mcr_reserved));
+        printf(" %d: ipkt ", i);
+        ubsec_dump_pb(&ma->mcr_ipktbuf);
+        printf(" %d: opkt ", i);
+        ubsec_dump_pb(&ma->mcr_opktbuf);
+        ma++;
+    }
+    printf("END MCR\n");
+}
+
+static int __init mod_init(void) {
+        return ssb_driver_register(&ubsec_ssb_driver);
+}
+
+static void __exit mod_exit(void) {
+        ssb_driver_unregister(&ubsec_ssb_driver);
+}
+
+module_init(mod_init);
+module_exit(mod_exit);
+
+// Meta information
+MODULE_AUTHOR("Daniel Mueller <daniel@danm.de>");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("OCF driver for BCM5365P IPSec Core");
+MODULE_VERSION(DRV_MODULE_VERSION);
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecreg.h b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecreg.h
new file mode 100644
index 00000000..dafac5b4
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecreg.h
@@ -0,0 +1,233 @@
+
+/*
+ * Copyright (c) 2008 Daniel Mueller (daniel@danm.de)
+ * Copyright (c) 2000 Theo de Raadt
+ * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+/*
+ * Register definitions for 5601 BlueSteel Networks Ubiquitous Broadband
+ * Security "uBSec" chip.  Definitions from revision 2.8 of the product
+ * datasheet.
+ */
+
+#define BS_BAR          0x10    /* DMA base address register */
+#define BS_TRDY_TIMEOUT     0x40    /* TRDY timeout */
+#define BS_RETRY_TIMEOUT    0x41    /* DMA retry timeout */
+
+#define UBS_PCI_RTY_SHIFT           8
+#define UBS_PCI_RTY_MASK            0xff
+#define UBS_PCI_RTY(misc) \
+    (((misc) >> UBS_PCI_RTY_SHIFT) & UBS_PCI_RTY_MASK)
+
+#define UBS_PCI_TOUT_SHIFT          0
+#define UBS_PCI_TOUT_MASK           0xff
+#define UBS_PCI_TOUT(misc) \
+    (((misc) >> PCI_TOUT_SHIFT) & PCI_TOUT_MASK)
+
+/*
+ * DMA Control & Status Registers (offset from BS_BAR)
+ */
+#define BS_MCR1     0x20    /* DMA Master Command Record 1 */
+#define BS_CTRL     0x24    /* DMA Control */
+#define BS_STAT     0x28    /* DMA Status */
+#define BS_ERR      0x2c    /* DMA Error Address */
+#define BS_DEV_ID   0x34    /* IPSec Device ID */
+
+/* BS_CTRL - DMA Control */
+#define BS_CTRL_RESET       0x80000000  /* hardware reset, 5805/5820 */
+#define BS_CTRL_MCR2INT     0x40000000  /* enable intr MCR for MCR2 */
+#define BS_CTRL_MCR1INT     0x20000000  /* enable intr MCR for MCR1 */
+#define BS_CTRL_OFM     0x10000000  /* Output fragment mode */
+#define BS_CTRL_BE32        0x08000000  /* big-endian, 32bit bytes */
+#define BS_CTRL_BE64        0x04000000  /* big-endian, 64bit bytes */
+#define BS_CTRL_DMAERR      0x02000000  /* enable intr DMA error */
+#define BS_CTRL_RNG_M       0x01800000  /* RNG mode */
+#define BS_CTRL_RNG_1       0x00000000  /* 1bit rn/one slow clock */
+#define BS_CTRL_RNG_4       0x00800000  /* 1bit rn/four slow clocks */
+#define BS_CTRL_RNG_8       0x01000000  /* 1bit rn/eight slow clocks */
+#define BS_CTRL_RNG_16      0x01800000  /* 1bit rn/16 slow clocks */
+#define BS_CTRL_SWNORM      0x00400000  /* 582[01], sw normalization */
+#define BS_CTRL_FRAG_M      0x0000ffff  /* output fragment size mask */
+#define BS_CTRL_LITTLE_ENDIAN   (BS_CTRL_BE32 | BS_CTRL_BE64)
+
+/* BS_STAT - DMA Status */
+#define BS_STAT_MCR1_BUSY   0x80000000  /* MCR1 is busy */
+#define BS_STAT_MCR1_FULL   0x40000000  /* MCR1 is full */
+#define BS_STAT_MCR1_DONE   0x20000000  /* MCR1 is done */
+#define BS_STAT_DMAERR      0x10000000  /* DMA error */
+#define BS_STAT_MCR2_FULL   0x08000000  /* MCR2 is full */
+#define BS_STAT_MCR2_DONE   0x04000000  /* MCR2 is done */
+#define BS_STAT_MCR1_ALLEMPTY   0x02000000  /* 5821, MCR1 is empty */
+#define BS_STAT_MCR2_ALLEMPTY   0x01000000  /* 5821, MCR2 is empty */
+
+/* BS_ERR - DMA Error Address */
+#define BS_ERR_ADDR     0xfffffffc  /* error address mask */
+#define BS_ERR_READ     0x00000002  /* fault was on read */
+
+struct ubsec_pktctx {
+    u_int32_t   pc_deskey[6];       /* 3DES key */
+    u_int32_t   pc_hminner[5];      /* hmac inner state */
+    u_int32_t   pc_hmouter[5];      /* hmac outer state */
+    u_int32_t   pc_iv[2];       /* [3]DES iv */
+    u_int16_t   pc_flags;       /* flags, below */
+    u_int16_t   pc_offset;      /* crypto offset */
+} __attribute__ ((packed));
+
+#define UBS_PKTCTX_ENC_3DES 0x8000      /* use 3des */
+#define UBS_PKTCTX_ENC_AES  0x8000      /* use aes */
+#define UBS_PKTCTX_ENC_NONE 0x0000      /* no encryption */
+#define UBS_PKTCTX_INBOUND  0x4000      /* inbound packet */
+#define UBS_PKTCTX_AUTH     0x3000      /* authentication mask */
+#define UBS_PKTCTX_AUTH_NONE    0x0000      /* no authentication */
+#define UBS_PKTCTX_AUTH_MD5 0x1000      /* use hmac-md5 */
+#define UBS_PKTCTX_AUTH_SHA1    0x2000      /* use hmac-sha1 */
+#define UBS_PKTCTX_AES128   0x0         /* AES 128bit keys */
+#define UBS_PKTCTX_AES192   0x100       /* AES 192bit keys */
+#define UBS_PKTCTX_AES256   0x200       /* AES 256bit keys */
+
+struct ubsec_pktctx_des {
+    volatile u_int16_t  pc_len;     /* length of ctx struct */
+    volatile u_int16_t  pc_type;    /* context type */
+    volatile u_int16_t  pc_flags;   /* flags, same as above */
+    volatile u_int16_t  pc_offset;  /* crypto/auth offset */
+    volatile u_int32_t  pc_deskey[6];   /* 3DES key */
+    volatile u_int32_t  pc_iv[2];   /* [3]DES iv */
+    volatile u_int32_t  pc_hminner[5];  /* hmac inner state */
+    volatile u_int32_t  pc_hmouter[5];  /* hmac outer state */
+} __attribute__ ((packed));
+
+struct ubsec_pktctx_aes128 {
+    volatile u_int16_t  pc_len;         /* length of ctx struct */
+    volatile u_int16_t  pc_type;        /* context type */
+    volatile u_int16_t  pc_flags;       /* flags, same as above */
+    volatile u_int16_t  pc_offset;      /* crypto/auth offset */
+    volatile u_int32_t  pc_aeskey[4];   /* AES 128bit key */
+    volatile u_int32_t  pc_iv[4];       /* AES iv */
+    volatile u_int32_t  pc_hminner[5];  /* hmac inner state */
+    volatile u_int32_t  pc_hmouter[5];  /* hmac outer state */
+} __attribute__ ((packed));
+
+struct ubsec_pktctx_aes192 {
+    volatile u_int16_t  pc_len;         /* length of ctx struct */
+    volatile u_int16_t  pc_type;        /* context type */
+    volatile u_int16_t  pc_flags;       /* flags, same as above */
+    volatile u_int16_t  pc_offset;      /* crypto/auth offset */
+    volatile u_int32_t  pc_aeskey[6];   /* AES 192bit key */
+    volatile u_int32_t  pc_iv[4];       /* AES iv */
+    volatile u_int32_t  pc_hminner[5];  /* hmac inner state */
+    volatile u_int32_t  pc_hmouter[5];  /* hmac outer state */
+} __attribute__ ((packed));
+
+struct ubsec_pktctx_aes256 {
+    volatile u_int16_t  pc_len;         /* length of ctx struct */
+    volatile u_int16_t  pc_type;        /* context type */
+    volatile u_int16_t  pc_flags;       /* flags, same as above */
+    volatile u_int16_t  pc_offset;      /* crypto/auth offset */
+    volatile u_int32_t  pc_aeskey[8];   /* AES 256bit key */
+    volatile u_int32_t  pc_iv[4];       /* AES iv */
+    volatile u_int32_t  pc_hminner[5];  /* hmac inner state */
+    volatile u_int32_t  pc_hmouter[5];  /* hmac outer state */
+} __attribute__ ((packed));
+
+#define UBS_PKTCTX_TYPE_IPSEC_DES   0x0000
+#define UBS_PKTCTX_TYPE_IPSEC_AES   0x0040
+
+struct ubsec_pktbuf {
+    volatile u_int32_t  pb_addr;    /* address of buffer start */
+    volatile u_int32_t  pb_next;    /* pointer to next pktbuf */
+    volatile u_int32_t  pb_len;     /* packet length */
+} __attribute__ ((packed));
+#define UBS_PKTBUF_LEN      0x0000ffff  /* length mask */
+
+struct ubsec_mcr {
+    volatile u_int16_t  mcr_pkts;   /* #pkts in this mcr */
+    volatile u_int16_t  mcr_flags;  /* mcr flags (below) */
+    volatile u_int32_t  mcr_cmdctxp;    /* command ctx pointer */
+    struct ubsec_pktbuf mcr_ipktbuf;    /* input chain header */
+    volatile u_int16_t  mcr_reserved;
+    volatile u_int16_t  mcr_pktlen;
+    struct ubsec_pktbuf mcr_opktbuf;    /* output chain header */
+} __attribute__ ((packed));
+
+struct ubsec_mcr_add {
+    volatile u_int32_t  mcr_cmdctxp;    /* command ctx pointer */
+    struct ubsec_pktbuf mcr_ipktbuf;    /* input chain header */
+    volatile u_int16_t  mcr_reserved;
+    volatile u_int16_t  mcr_pktlen;
+    struct ubsec_pktbuf mcr_opktbuf;    /* output chain header */
+} __attribute__ ((packed));
+
+#define UBS_MCR_DONE        0x0001      /* mcr has been processed */
+#define UBS_MCR_ERROR       0x0002      /* error in processing */
+#define UBS_MCR_ERRORCODE   0xff00      /* error type */
+
+struct ubsec_ctx_keyop {
+    volatile u_int16_t  ctx_len;    /* command length */
+    volatile u_int16_t  ctx_op;     /* operation code */
+    volatile u_int8_t   ctx_pad[60];    /* padding */
+} __attribute__ ((packed));
+#define UBS_CTXOP_DHPKGEN   0x01        /* dh public key generation */
+#define UBS_CTXOP_DHSSGEN   0x02        /* dh shared secret gen. */
+#define UBS_CTXOP_RSAPUB    0x03        /* rsa public key op */
+#define UBS_CTXOP_RSAPRIV   0x04        /* rsa private key op */
+#define UBS_CTXOP_DSASIGN   0x05        /* dsa signing op */
+#define UBS_CTXOP_DSAVRFY   0x06        /* dsa verification */
+#define UBS_CTXOP_RNGBYPASS 0x41        /* rng direct test mode */
+#define UBS_CTXOP_RNGSHA1   0x42        /* rng sha1 test mode */
+#define UBS_CTXOP_MODADD    0x43        /* modular addition */
+#define UBS_CTXOP_MODSUB    0x44        /* modular subtraction */
+#define UBS_CTXOP_MODMUL    0x45        /* modular multiplication */
+#define UBS_CTXOP_MODRED    0x46        /* modular reduction */
+#define UBS_CTXOP_MODEXP    0x47        /* modular exponentiation */
+#define UBS_CTXOP_MODINV    0x48        /* modular inverse */
+
+struct ubsec_ctx_rngbypass {
+    volatile u_int16_t  rbp_len;    /* command length, 64 */
+    volatile u_int16_t  rbp_op;     /* rng bypass, 0x41 */
+    volatile u_int8_t   rbp_pad[60];    /* padding */
+} __attribute__ ((packed));
+
+/* modexp: C = (M ^ E) mod N */
+struct ubsec_ctx_modexp {
+    volatile u_int16_t  me_len;     /* command length */
+    volatile u_int16_t  me_op;      /* modexp, 0x47 */
+    volatile u_int16_t  me_E_len;   /* E (bits) */
+    volatile u_int16_t  me_N_len;   /* N (bits) */
+    u_int8_t        me_N[2048/8];   /* N */
+} __attribute__ ((packed));
+
+struct ubsec_ctx_rsapriv {
+    volatile u_int16_t  rpr_len;    /* command length */
+    volatile u_int16_t  rpr_op;     /* rsaprivate, 0x04 */
+    volatile u_int16_t  rpr_q_len;  /* q (bits) */
+    volatile u_int16_t  rpr_p_len;  /* p (bits) */
+    u_int8_t        rpr_buf[5 * 1024 / 8];  /* parameters: */
+                        /* p, q, dp, dq, pinv */
+} __attribute__ ((packed));
diff --git a/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecvar.h b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecvar.h
new file mode 100644
index 00000000..c808f955
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsecvar.h
@@ -0,0 +1,228 @@
+
+/*
+ * Copyright (c) 2008 Daniel Mueller (daniel@danm.de)
+ * Copyright (c) 2000 Theo de Raadt
+ * Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+/* Maximum queue length */
+#ifndef UBS_MAX_NQUEUE
+#define UBS_MAX_NQUEUE      60
+#endif
+
+#define UBS_MAX_SCATTER     64  /* Maximum scatter/gather depth */
+
+#ifndef UBS_MAX_AGGR
+#define UBS_MAX_AGGR        5   /* Maximum aggregation count */
+#endif
+
+#define UBSEC_CARD(sid)     (((sid) & 0xf0000000) >> 28)
+#define UBSEC_SESSION(sid)  ( (sid) & 0x0fffffff)
+#define UBSEC_SID(crd, sesn)    (((crd) << 28) | ((sesn) & 0x0fffffff))
+
+#define UBS_DEF_RTY     0xff    /* PCI Retry Timeout */
+#define UBS_DEF_TOUT        0xff    /* PCI TRDY Timeout */
+#define UBS_DEF_CACHELINE   0x01    /* Cache Line setting */
+
+#define DEFAULT_HMAC_LEN     12
+
+struct ubsec_dma_alloc {
+    dma_addr_t      dma_paddr;
+    void            *dma_vaddr;
+    /*
+    bus_dmamap_t            dma_map;
+    bus_dma_segment_t       dma_seg;
+    */
+    size_t          dma_size;
+    /*
+    int             dma_nseg;
+    */
+};
+
+struct ubsec_q2 {
+    BSD_SIMPLEQ_ENTRY(ubsec_q2)     q_next;
+    struct ubsec_dma_alloc      q_mcr;
+    struct ubsec_dma_alloc      q_ctx;
+    u_int               q_type;
+};
+
+struct ubsec_q2_rng {
+    struct ubsec_q2         rng_q;
+    struct ubsec_dma_alloc      rng_buf;
+    int             rng_used;
+};
+
+/* C = (M ^ E) mod N */
+#define UBS_MODEXP_PAR_M    0
+#define UBS_MODEXP_PAR_E    1
+#define UBS_MODEXP_PAR_N    2
+struct ubsec_q2_modexp {
+    struct ubsec_q2         me_q;
+    struct cryptkop *       me_krp;
+    struct ubsec_dma_alloc      me_M;
+    struct ubsec_dma_alloc      me_E;
+    struct ubsec_dma_alloc      me_C;
+    struct ubsec_dma_alloc      me_epb;
+    int             me_modbits;
+    int             me_shiftbits;
+    int             me_normbits;
+};
+
+#define UBS_RSAPRIV_PAR_P   0
+#define UBS_RSAPRIV_PAR_Q   1
+#define UBS_RSAPRIV_PAR_DP  2
+#define UBS_RSAPRIV_PAR_DQ  3
+#define UBS_RSAPRIV_PAR_PINV    4
+#define UBS_RSAPRIV_PAR_MSGIN   5
+#define UBS_RSAPRIV_PAR_MSGOUT  6
+struct ubsec_q2_rsapriv {
+    struct ubsec_q2         rpr_q;
+    struct cryptkop *       rpr_krp;
+    struct ubsec_dma_alloc      rpr_msgin;
+    struct ubsec_dma_alloc      rpr_msgout;
+};
+
+#define UBSEC_RNG_BUFSIZ    16      /* measured in 32bit words */
+
+struct ubsec_dmachunk {
+    struct ubsec_mcr    d_mcr;
+    struct ubsec_mcr_add    d_mcradd[UBS_MAX_AGGR-1];
+    struct ubsec_pktbuf d_sbuf[UBS_MAX_SCATTER-1];
+    struct ubsec_pktbuf d_dbuf[UBS_MAX_SCATTER-1];
+    u_int32_t       d_macbuf[5];
+    union {
+        struct ubsec_pktctx_aes256 ctxaes256;
+        struct ubsec_pktctx_aes192 ctxaes192;
+        struct ubsec_pktctx_des ctxdes;
+        struct ubsec_pktctx_aes128 ctxaes128;
+        struct ubsec_pktctx     ctx;
+    } d_ctx;
+};
+
+struct ubsec_dma {
+    BSD_SIMPLEQ_ENTRY(ubsec_dma)    d_next;
+    struct ubsec_dmachunk       *d_dma;
+    struct ubsec_dma_alloc      d_alloc;
+};
+
+#define UBS_FLAGS_KEY       0x01        /* has key accelerator */
+#define UBS_FLAGS_LONGCTX   0x02        /* uses long ipsec ctx */
+#define UBS_FLAGS_BIGKEY    0x04        /* 2048bit keys */
+#define UBS_FLAGS_HWNORM    0x08        /* hardware normalization */
+#define UBS_FLAGS_RNG       0x10        /* hardware rng */
+#define UBS_FLAGS_AES       0x20        /* hardware AES support */
+
+struct ubsec_q {
+    BSD_SIMPLEQ_ENTRY(ubsec_q)      q_next;
+    int             q_nstacked_mcrs;
+    struct ubsec_q          *q_stacked_mcr[UBS_MAX_AGGR-1];
+    struct cryptop          *q_crp;
+    struct ubsec_dma        *q_dma;
+
+    //struct mbuf           *q_src_m, *q_dst_m;
+    struct sk_buff      *q_src_m, *q_dst_m;
+    struct uio          *q_src_io, *q_dst_io;
+
+    /*
+    bus_dmamap_t            q_src_map;
+    bus_dmamap_t            q_dst_map;
+    */
+
+    /* DMA addresses for In-/Out packages */
+    int q_src_len;
+    int q_dst_len;
+    struct ubsec_dma_alloc  q_src_map[UBS_MAX_SCATTER];
+    struct ubsec_dma_alloc  q_dst_map[UBS_MAX_SCATTER];
+    int q_has_dst;
+
+    int             q_sesn;
+    int             q_flags;
+};
+
+struct ubsec_softc {
+    softc_device_decl   sc_dev;
+    struct ssb_device   *sdev;      /* device backpointer */
+
+    struct device       *sc_dv;     /* generic device */
+    void                *sc_ih;     /* interrupt handler cookie */
+    int                 sc_flags;   /* device specific flags */
+    u_int32_t           sc_statmask;    /* interrupt status mask */
+    int32_t             sc_cid;     /* crypto tag */
+    BSD_SIMPLEQ_HEAD(,ubsec_q)  sc_queue;   /* packet queue, mcr1 */
+    int                 sc_nqueue;  /* count enqueued, mcr1 */
+    BSD_SIMPLEQ_HEAD(,ubsec_q)  sc_qchip;   /* on chip, mcr1 */
+    BSD_SIMPLEQ_HEAD(,ubsec_q)  sc_freequeue;   /* list of free queue elements */
+    BSD_SIMPLEQ_HEAD(,ubsec_q2) sc_queue2;  /* packet queue, mcr2 */
+    int                 sc_nqueue2; /* count enqueued, mcr2 */
+    BSD_SIMPLEQ_HEAD(,ubsec_q2) sc_qchip2;  /* on chip, mcr2 */
+    int                 sc_nsessions;   /* # of sessions */
+    struct ubsec_session        *sc_sessions;   /* sessions */
+    int                 sc_rnghz;   /* rng poll time */
+    struct ubsec_q2_rng sc_rng;
+    struct ubsec_dma    sc_dmaa[UBS_MAX_NQUEUE];
+    struct ubsec_q      *sc_queuea[UBS_MAX_NQUEUE];
+    BSD_SIMPLEQ_HEAD(,ubsec_q2) sc_q2free;  /* free list */
+    spinlock_t          sc_ringmtx; /* PE ring lock */
+};
+
+#define UBSEC_QFLAGS_COPYOUTIV      0x1
+
+struct ubsec_session {
+    u_int32_t   ses_used;
+    u_int32_t   ses_key[8];         /* 3DES/AES key */
+    u_int32_t   ses_hminner[5];     /* hmac inner state */
+    u_int32_t   ses_hmouter[5];     /* hmac outer state */
+    u_int32_t   ses_iv[4];          /* [3]DES/AES iv */
+    u_int32_t   ses_keysize;        /* AES key size */
+    u_int32_t   ses_mlen;           /* hmac/hash length */
+};
+
+struct ubsec_stats {
+    u_int64_t hst_ibytes;
+    u_int64_t hst_obytes;
+    u_int32_t hst_ipackets;
+    u_int32_t hst_opackets;
+    u_int32_t hst_invalid;
+    u_int32_t hst_nomem;
+    u_int32_t hst_queuefull;
+    u_int32_t hst_dmaerr;
+    u_int32_t hst_mcrerr;
+    u_int32_t hst_nodmafree;
+};
+
+struct ubsec_generic_ctx {
+    u_int32_t   pc_key[8];      /* [3]DES/AES key */
+    u_int32_t   pc_hminner[5];  /* hmac inner state */
+    u_int32_t   pc_hmouter[5];  /* hmac outer state */
+    u_int32_t   pc_iv[4];       /* [3]DES/AES iv */
+    u_int16_t   pc_flags;       /* flags, below */
+    u_int16_t   pc_offset;      /* crypto offset */
+    u_int16_t   pc_type;        /* Cryptographic operation */
+};
+
diff --git a/trunk/target/linux/generic/files/crypto/ocf/uio.h b/trunk/target/linux/generic/files/crypto/ocf/uio.h
new file mode 100644
index 00000000..03a62491
--- /dev/null
+++ b/trunk/target/linux/generic/files/crypto/ocf/uio.h
@@ -0,0 +1,54 @@
+#ifndef _OCF_UIO_H_
+#define _OCF_UIO_H_
+
+#include <linux/uio.h>
+
+/*
+ * The linux uio.h doesn't have all we need.  To be fully api compatible
+ * with the BSD cryptodev,  we need to keep this around.  Perhaps this can
+ * be moved back into the linux/uio.h
+ *
+ * Linux port done by David McCullough <david_mccullough@mcafee.com>
+ * Copyright (C) 2006-2010 David McCullough
+ * Copyright (C) 2004-2005 Intel Corporation.
+ *
+ * LICENSE TERMS
+ *
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
+ *
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
+ *
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
+ * ---------------------------------------------------------------------------
+ */
+
+struct uio {
+	struct	iovec *uio_iov;
+	int		uio_iovcnt;
+	off_t	uio_offset;
+	int		uio_resid;
+#if 0
+	enum	uio_seg uio_segflg;
+	enum	uio_rw uio_rw;
+	struct  thread *uio_td;
+#endif
+};
+
+#endif
diff --git a/trunk/target/linux/generic/files/drivers/leds/ledtrig-morse.c b/trunk/target/linux/generic/files/drivers/leds/ledtrig-morse.c
new file mode 100644
index 00000000..bc58afe4
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/leds/ledtrig-morse.c
@@ -0,0 +1,366 @@
+/*
+ *  LED Morse Trigger
+ *
+ *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *
+ *  This file was based on: drivers/led/ledtrig-timer.c
+ *	Copyright 2005-2006 Openedhand Ltd.
+ *	Author: Richard Purdie <rpurdie@openedhand.com>
+ *
+ *  also based on the patch '[PATCH] 2.5.59 morse code panics' posted
+ *  in the LKML by Tomas Szepe at Thu, 30 Jan 2003
+ *	Copyright (C) 2002 Andrew Rodland <arodland@noln.com>
+ *	Copyright (C) 2003 Tomas Szepe <szepe@pinerecords.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/device.h>
+#include <linux/sysdev.h>
+#include <linux/timer.h>
+#include <linux/ctype.h>
+#include <linux/leds.h>
+#include <linux/slab.h>
+
+#include "leds.h"
+
+#define MORSE_DELAY_BASE	(HZ/2)
+
+#define MORSE_STATE_BLINK_START	0
+#define MORSE_STATE_BLINK_STOP	1
+
+#define MORSE_DIT_LEN	1
+#define MORSE_DAH_LEN	3
+#define MORSE_SPACE_LEN	7
+
+struct morse_trig_data {
+	unsigned long delay;
+	char *msg;
+
+	unsigned char morse;
+	unsigned char state;
+	char *msgpos;
+	struct timer_list timer;
+};
+
+const unsigned char morsetable[] = {
+	0122, 0, 0310, 0, 0, 0163,				/* "#$%&' */
+	055, 0155, 0, 0, 0163, 0141, 0152, 0051, 		/* ()*+,-./ */
+	077, 076, 074, 070, 060, 040, 041, 043, 047, 057,	/* 0-9 */
+	0107, 0125, 0, 0061, 0, 0114, 0, 			/* :;<=>?@ */
+	006, 021, 025, 011, 002, 024, 013, 020, 004,		/* A-I */
+	036, 015, 022, 007, 005, 017, 026, 033, 012,		/* J-R */
+	010, 003, 014, 030, 016, 031, 035, 023,			/* S-Z */
+	0, 0, 0, 0, 0154					/* [\]^_ */
+};
+
+static inline unsigned char tomorse(char c) {
+	if (c >= 'a' && c <= 'z')
+		c = c - 'a' + 'A';
+	if (c >= '"' && c <= '_') {
+		return morsetable[c - '"'];
+	} else
+		return 0;
+}
+
+static inline unsigned long dit_len(struct morse_trig_data *morse_data)
+{
+	return MORSE_DIT_LEN*morse_data->delay;
+}
+
+static inline unsigned long dah_len(struct morse_trig_data *morse_data)
+{
+	return MORSE_DAH_LEN*morse_data->delay;
+}
+
+static inline unsigned long space_len(struct morse_trig_data *morse_data)
+{
+	return MORSE_SPACE_LEN*morse_data->delay;
+}
+
+static void morse_timer_function(unsigned long data)
+{
+	struct led_classdev *led_cdev = (struct led_classdev *)data;
+	struct morse_trig_data *morse_data = led_cdev->trigger_data;
+	unsigned long brightness = LED_OFF;
+	unsigned long delay = 0;
+
+	if (!morse_data->msg)
+		goto set_led;
+
+	switch (morse_data->state) {
+	case MORSE_STATE_BLINK_START:
+		/* Starting a new blink.  We have a valid code in morse. */
+		delay = (morse_data->morse & 001) ? dah_len(morse_data):
+			dit_len(morse_data);
+		brightness = LED_FULL;
+		morse_data->state = MORSE_STATE_BLINK_STOP;
+		morse_data->morse >>= 1;
+		break;
+	case MORSE_STATE_BLINK_STOP:
+		/* Coming off of a blink. */
+		morse_data->state = MORSE_STATE_BLINK_START;
+
+		if (morse_data->morse > 1) {
+			/* Not done yet, just a one-dit pause. */
+			delay = dit_len(morse_data);
+			break;
+		}
+
+		/* Get a new char, figure out how much space. */
+		/* First time through */
+		if (!morse_data->msgpos)
+			morse_data->msgpos = (char *)morse_data->msg;
+
+		if (!*morse_data->msgpos) {
+			/* Repeating */
+			morse_data->msgpos = (char *)morse_data->msg;
+			delay = space_len(morse_data);
+		} else {
+			/* Inter-letter space */
+			delay = dah_len(morse_data);
+		}
+
+		if (!(morse_data->morse = tomorse(*morse_data->msgpos))) {
+			delay = space_len(morse_data);
+			/* And get us back here */
+			morse_data->state = MORSE_STATE_BLINK_STOP;
+		}
+		morse_data->msgpos++;
+		break;
+	}
+
+	mod_timer(&morse_data->timer, jiffies + msecs_to_jiffies(delay));
+
+set_led:
+	led_set_brightness(led_cdev, brightness);
+}
+
+static ssize_t _morse_delay_show(struct led_classdev *led_cdev, char *buf)
+{
+	struct morse_trig_data *morse_data = led_cdev->trigger_data;
+
+	sprintf(buf, "%lu\n", morse_data->delay);
+
+	return strlen(buf) + 1;
+}
+
+static ssize_t _morse_delay_store(struct led_classdev *led_cdev,
+		const char *buf, size_t size)
+{
+	struct morse_trig_data *morse_data = led_cdev->trigger_data;
+	char *after;
+	unsigned long state = simple_strtoul(buf, &after, 10);
+	size_t count = after - buf;
+	int ret = -EINVAL;
+
+	if (*after && isspace(*after))
+		count++;
+
+	if (count == size) {
+		morse_data->delay = state;
+		mod_timer(&morse_data->timer, jiffies + 1);
+		ret = count;
+	}
+
+	return ret;
+}
+
+static ssize_t _morse_msg_show(struct led_classdev *led_cdev, char *buf)
+{
+	struct morse_trig_data *morse_data = led_cdev->trigger_data;
+
+	if (!morse_data->msg)
+		sprintf(buf, "<none>\n");
+	else
+		sprintf(buf, "%s\n", morse_data->msg);
+
+	return strlen(buf) + 1;
+}
+
+static ssize_t _morse_msg_store(struct led_classdev *led_cdev,
+		const char *buf, size_t size)
+{
+	struct morse_trig_data *morse_data = led_cdev->trigger_data;
+	char *m;
+
+	m = kmalloc(size, GFP_KERNEL);
+	if (!m)
+		return -ENOMEM;
+
+	memcpy(m,buf,size);
+	m[size]='\0';
+
+	if (morse_data->msg)
+		kfree(morse_data->msg);
+
+	morse_data->msg = m;
+	morse_data->msgpos = NULL;
+	morse_data->state = MORSE_STATE_BLINK_STOP;
+
+	mod_timer(&morse_data->timer, jiffies + 1);
+
+	return size;
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
+static ssize_t morse_delay_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+
+	return _morse_delay_show(led_cdev, buf);
+}
+
+static ssize_t morse_delay_store(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+
+	return _morse_delay_store(led_cdev, buf, size);
+}
+
+static ssize_t morse_msg_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+
+	return _morse_msg_show(led_cdev, buf);
+}
+
+static ssize_t morse_msg_store(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+
+	return _morse_msg_store(led_cdev, buf, size);
+}
+
+static DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
+static DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
+
+#define led_device_create_file(leddev, attr) \
+	device_create_file(leddev->dev, &dev_attr_ ## attr)
+#define led_device_remove_file(leddev, attr) \
+	device_remove_file(leddev->dev, &dev_attr_ ## attr)
+
+#else
+static ssize_t morse_delay_show(struct class_device *dev, char *buf)
+{
+	struct led_classdev *led_cdev = class_get_devdata(dev);
+
+	return _morse_delay_show(led_cdev, buf);
+}
+
+static ssize_t morse_delay_store(struct class_device *dev, const char *buf,
+		size_t size)
+{
+	struct led_classdev *led_cdev = class_get_devdata(dev);
+
+	return _morse_delay_store(led_cdev, buf, size);
+}
+
+static ssize_t morse_msg_show(struct class_device *dev, char *buf)
+{
+	struct led_classdev *led_cdev = class_get_devdata(dev);
+
+	return _morse_msg_show(led_cdev, buf);
+}
+
+static ssize_t morse_msg_store(struct class_device *dev, const char *buf,
+				size_t size)
+{
+	struct led_classdev *led_cdev = class_get_devdata(dev);
+
+	return _morse_msg_store(led_cdev, buf, size);
+}
+
+static CLASS_DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
+static CLASS_DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
+
+#define led_device_create_file(leddev, attr) \
+	class_device_create_file(leddev->class_dev, &class_device_attr_ ## attr)
+#define led_device_remove_file(leddev, attr) \
+	class_device_remove_file(leddev->class_dev, &class_device_attr_ ## attr)
+
+#endif
+
+static void morse_trig_activate(struct led_classdev *led_cdev)
+{
+	struct morse_trig_data *morse_data;
+	int rc;
+
+	morse_data = kzalloc(sizeof(*morse_data), GFP_KERNEL);
+	if (!morse_data)
+		return;
+
+	morse_data->delay = MORSE_DELAY_BASE;
+	init_timer(&morse_data->timer);
+	morse_data->timer.function = morse_timer_function;
+	morse_data->timer.data = (unsigned long)led_cdev;
+
+	rc = led_device_create_file(led_cdev, delay);
+	if (rc) goto err;
+
+	rc = led_device_create_file(led_cdev, message);
+	if (rc) goto err_delay;
+
+	led_cdev->trigger_data = morse_data;
+
+	return;
+
+err_delay:
+	led_device_remove_file(led_cdev, delay);
+err:
+	kfree(morse_data);
+}
+
+static void morse_trig_deactivate(struct led_classdev *led_cdev)
+{
+	struct morse_trig_data *morse_data = led_cdev->trigger_data;
+
+	if (!morse_data)
+		return;
+
+	led_device_remove_file(led_cdev, message);
+	led_device_remove_file(led_cdev, delay);
+
+	del_timer_sync(&morse_data->timer);
+	if (morse_data->msg)
+		kfree(morse_data->msg);
+
+	kfree(morse_data);
+}
+
+static struct led_trigger morse_led_trigger = {
+	.name		= "morse",
+	.activate	= morse_trig_activate,
+	.deactivate	= morse_trig_deactivate,
+};
+
+static int __init morse_trig_init(void)
+{
+	return led_trigger_register(&morse_led_trigger);
+}
+
+static void __exit morse_trig_exit(void)
+{
+	led_trigger_unregister(&morse_led_trigger);
+}
+
+module_init(morse_trig_init);
+module_exit(morse_trig_exit);
+
+MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
+MODULE_DESCRIPTION("Morse LED trigger");
+MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/files/drivers/leds/ledtrig-netdev.c b/trunk/target/linux/generic/files/drivers/leds/ledtrig-netdev.c
new file mode 100644
index 00000000..4a20d7c0
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/leds/ledtrig-netdev.c
@@ -0,0 +1,438 @@
+/*
+ * LED Kernel Netdev Trigger
+ *
+ * Toggles the LED to reflect the link and traffic state of a named net device
+ *
+ * Copyright 2007 Oliver Jowett <oliver@opencloud.com>
+ *
+ * Derived from ledtrig-timer.c which is:
+ *  Copyright 2005-2006 Openedhand Ltd.
+ *  Author: Richard Purdie <rpurdie@openedhand.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/device.h>
+#include <linux/sysdev.h>
+#include <linux/netdevice.h>
+#include <linux/timer.h>
+#include <linux/ctype.h>
+#include <linux/leds.h>
+
+#include "leds.h"
+
+/*
+ * Configurable sysfs attributes:
+ *
+ * device_name - network device name to monitor
+ *
+ * interval - duration of LED blink, in milliseconds
+ *
+ * mode - either "none" (LED is off) or a space separated list of one or more of:
+ *   link: LED's normal state reflects whether the link is up (has carrier) or not
+ *   tx:   LED blinks on transmitted data
+ *   rx:   LED blinks on receive data
+ *
+ * Some suggestions:
+ *
+ *  Simple link status LED:
+ *  $ echo netdev >someled/trigger
+ *  $ echo eth0 >someled/device_name
+ *  $ echo link >someled/mode
+ *
+ *  Ethernet-style link/activity LED:
+ *  $ echo netdev >someled/trigger
+ *  $ echo eth0 >someled/device_name
+ *  $ echo "link tx rx" >someled/mode
+ *
+ *  Modem-style tx/rx LEDs:
+ *  $ echo netdev >led1/trigger
+ *  $ echo ppp0 >led1/device_name
+ *  $ echo tx >led1/mode
+ *  $ echo netdev >led2/trigger
+ *  $ echo ppp0 >led2/device_name
+ *  $ echo rx >led2/mode
+ *
+ */
+
+#define MODE_LINK 1
+#define MODE_TX   2
+#define MODE_RX   4
+
+struct led_netdev_data {
+	rwlock_t lock;
+
+	struct timer_list timer;
+	struct notifier_block notifier;
+
+	struct led_classdev *led_cdev;
+	struct net_device *net_dev;
+
+	char device_name[IFNAMSIZ];
+	unsigned interval;
+	unsigned mode;
+	unsigned link_up;
+	unsigned last_activity;
+};
+
+static void set_baseline_state(struct led_netdev_data *trigger_data)
+{
+	if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up)
+		led_set_brightness(trigger_data->led_cdev, LED_FULL);
+	else
+		led_set_brightness(trigger_data->led_cdev, LED_OFF);
+
+	if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up)
+		mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
+	else
+		del_timer(&trigger_data->timer);
+}
+
+static ssize_t led_device_name_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
+
+	read_lock(&trigger_data->lock);
+	sprintf(buf, "%s\n", trigger_data->device_name);
+	read_unlock(&trigger_data->lock);
+
+	return strlen(buf) + 1;
+}
+
+static ssize_t led_device_name_store(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
+
+	if (size < 0 || size >= IFNAMSIZ)
+		return -EINVAL;
+
+	write_lock(&trigger_data->lock);
+
+	strcpy(trigger_data->device_name, buf);
+	if (size > 0 && trigger_data->device_name[size-1] == '\n')
+		trigger_data->device_name[size-1] = 0;
+
+	if (trigger_data->device_name[0] != 0) {
+		/* check for existing device to update from */
+		trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name);
+		if (trigger_data->net_dev != NULL)
+			trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0;
+		set_baseline_state(trigger_data); /* updates LEDs, may start timers */
+	}
+
+	write_unlock(&trigger_data->lock);
+	return size;
+}
+
+static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store);
+
+static ssize_t led_mode_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
+
+	read_lock(&trigger_data->lock);
+
+	if (trigger_data->mode == 0) {
+		strcpy(buf, "none\n");
+	} else {
+		if (trigger_data->mode & MODE_LINK)
+			strcat(buf, "link ");
+		if (trigger_data->mode & MODE_TX)
+			strcat(buf, "tx ");
+		if (trigger_data->mode & MODE_RX)
+			strcat(buf, "rx ");
+		strcat(buf, "\n");
+	}
+
+	read_unlock(&trigger_data->lock);
+
+	return strlen(buf)+1;
+}
+
+static ssize_t led_mode_store(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
+	char copybuf[128];
+	int new_mode = -1;
+	char *p, *token;
+
+	/* take a copy since we don't want to trash the inbound buffer when using strsep */
+	strncpy(copybuf, buf, sizeof(copybuf));
+	copybuf[sizeof(copybuf) - 1] = 0;
+	p = copybuf;
+
+	while ((token = strsep(&p, " \t\n")) != NULL) {
+		if (!*token)
+			continue;
+
+		if (new_mode == -1)
+			new_mode = 0;
+
+		if (!strcmp(token, "none"))
+			new_mode = 0;
+		else if (!strcmp(token, "tx"))
+			new_mode |= MODE_TX;
+		else if (!strcmp(token, "rx"))
+			new_mode |= MODE_RX;
+		else if (!strcmp(token, "link"))
+			new_mode |= MODE_LINK;
+		else
+			return -EINVAL;
+	}
+
+	if (new_mode == -1)
+		return -EINVAL;
+
+	write_lock(&trigger_data->lock);
+	trigger_data->mode = new_mode;
+	set_baseline_state(trigger_data);
+	write_unlock(&trigger_data->lock);
+
+	return size;
+}
+
+static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store);
+
+static ssize_t led_interval_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
+
+	read_lock(&trigger_data->lock);
+	sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval));
+	read_unlock(&trigger_data->lock);
+
+	return strlen(buf) + 1;
+}
+
+static ssize_t led_interval_store(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
+	int ret = -EINVAL;
+	char *after;
+	unsigned long value = simple_strtoul(buf, &after, 10);
+	size_t count = after - buf;
+
+	if (isspace(*after))
+		count++;
+
+	/* impose some basic bounds on the timer interval */
+	if (count == size && value >= 5 && value <= 10000) {
+		write_lock(&trigger_data->lock);
+		trigger_data->interval = msecs_to_jiffies(value);
+		set_baseline_state(trigger_data); /* resets timer */
+		write_unlock(&trigger_data->lock);
+		ret = count;
+	}
+
+	return ret;
+}
+
+static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store);
+
+static int netdev_trig_notify(struct notifier_block *nb,
+			      unsigned long evt,
+			      void *dv)
+{
+	struct net_device *dev = dv;
+	struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
+
+	if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
+		return NOTIFY_DONE;
+
+	write_lock(&trigger_data->lock);
+
+	if (strcmp(dev->name, trigger_data->device_name))
+		goto done;
+
+	if (evt == NETDEV_REGISTER) {
+		if (trigger_data->net_dev != NULL)
+			dev_put(trigger_data->net_dev);
+		dev_hold(dev);
+		trigger_data->net_dev = dev;
+		trigger_data->link_up = 0;
+		goto done;
+	}
+
+	if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) {
+		dev_put(trigger_data->net_dev);
+		trigger_data->net_dev = NULL;
+		goto done;
+	}
+
+	/* UP / DOWN / CHANGE */
+
+	trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev));
+	set_baseline_state(trigger_data);
+
+done:
+	write_unlock(&trigger_data->lock);
+	return NOTIFY_DONE;
+}
+
+/* here's the real work! */
+static void netdev_trig_timer(unsigned long arg)
+{
+	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
+	const struct net_device_stats *dev_stats;
+	unsigned new_activity;
+
+	write_lock(&trigger_data->lock);
+
+	if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) {
+		/* we don't need to do timer work, just reflect link state. */
+		led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
+		goto no_restart;
+	}
+
+	dev_stats = dev_get_stats(trigger_data->net_dev);
+	new_activity =
+		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
+		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
+
+	if (trigger_data->mode & MODE_LINK) {
+		/* base state is ON (link present) */
+		/* if there's no link, we don't get this far and the LED is off */
+
+		/* OFF -> ON always */
+		/* ON -> OFF on activity */
+		if (trigger_data->led_cdev->brightness == LED_OFF) {
+			led_set_brightness(trigger_data->led_cdev, LED_FULL);
+		} else if (trigger_data->last_activity != new_activity) {
+			led_set_brightness(trigger_data->led_cdev, LED_OFF);
+		}
+	} else {
+		/* base state is OFF */
+		/* ON -> OFF always */
+		/* OFF -> ON on activity */
+		if (trigger_data->led_cdev->brightness == LED_FULL) {
+			led_set_brightness(trigger_data->led_cdev, LED_OFF);
+		} else if (trigger_data->last_activity != new_activity) {
+			led_set_brightness(trigger_data->led_cdev, LED_FULL);
+		}
+	}
+
+	trigger_data->last_activity = new_activity;
+	mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
+
+no_restart:
+	write_unlock(&trigger_data->lock);
+}
+
+static void netdev_trig_activate(struct led_classdev *led_cdev)
+{
+	struct led_netdev_data *trigger_data;
+	int rc;
+
+	trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
+	if (!trigger_data)
+		return;
+
+	rwlock_init(&trigger_data->lock);
+
+	trigger_data->notifier.notifier_call = netdev_trig_notify;
+	trigger_data->notifier.priority = 10;
+
+	setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data);
+
+	trigger_data->led_cdev = led_cdev;
+	trigger_data->net_dev = NULL;
+	trigger_data->device_name[0] = 0;
+
+	trigger_data->mode = 0;
+	trigger_data->interval = msecs_to_jiffies(50);
+	trigger_data->link_up = 0;
+	trigger_data->last_activity = 0;
+
+	led_cdev->trigger_data = trigger_data;
+
+	rc = device_create_file(led_cdev->dev, &dev_attr_device_name);
+	if (rc)
+		goto err_out;
+	rc = device_create_file(led_cdev->dev, &dev_attr_mode);
+	if (rc)
+		goto err_out_device_name;
+	rc = device_create_file(led_cdev->dev, &dev_attr_interval);
+	if (rc)
+		goto err_out_mode;
+
+	register_netdevice_notifier(&trigger_data->notifier);
+	return;
+
+err_out_mode:
+	device_remove_file(led_cdev->dev, &dev_attr_mode);
+err_out_device_name:
+	device_remove_file(led_cdev->dev, &dev_attr_device_name);
+err_out:
+	led_cdev->trigger_data = NULL;
+	kfree(trigger_data);
+}
+
+static void netdev_trig_deactivate(struct led_classdev *led_cdev)
+{
+	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
+
+	if (trigger_data) {
+		unregister_netdevice_notifier(&trigger_data->notifier);
+
+		device_remove_file(led_cdev->dev, &dev_attr_device_name);
+		device_remove_file(led_cdev->dev, &dev_attr_mode);
+		device_remove_file(led_cdev->dev, &dev_attr_interval);
+
+		write_lock(&trigger_data->lock);
+
+		if (trigger_data->net_dev) {
+			dev_put(trigger_data->net_dev);
+			trigger_data->net_dev = NULL;
+		}
+
+		write_unlock(&trigger_data->lock);
+
+		del_timer_sync(&trigger_data->timer);
+
+		kfree(trigger_data);
+	}
+}
+
+static struct led_trigger netdev_led_trigger = {
+	.name     = "netdev",
+	.activate = netdev_trig_activate,
+	.deactivate = netdev_trig_deactivate,
+};
+
+static int __init netdev_trig_init(void)
+{
+	return led_trigger_register(&netdev_led_trigger);
+}
+
+static void __exit netdev_trig_exit(void)
+{
+	led_trigger_unregister(&netdev_led_trigger);
+}
+
+module_init(netdev_trig_init);
+module_exit(netdev_trig_exit);
+
+MODULE_AUTHOR("Oliver Jowett <oliver@opencloud.com>");
+MODULE_DESCRIPTION("Netdev LED trigger");
+MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/files/drivers/leds/ledtrig-usbdev.c b/trunk/target/linux/generic/files/drivers/leds/ledtrig-usbdev.c
new file mode 100644
index 00000000..70b0e392
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/leds/ledtrig-usbdev.c
@@ -0,0 +1,348 @@
+/*
+ * LED USB device Trigger
+ *
+ * Toggles the LED to reflect the presence and activity of an USB device
+ * Copyright (C) Gabor Juhos <juhosg@openwrt.org>
+ *
+ * derived from ledtrig-netdev.c:
+ *	Copyright 2007 Oliver Jowett <oliver@opencloud.com>
+ *
+ * ledtrig-netdev.c derived from ledtrig-timer.c:
+ *	Copyright 2005-2006 Openedhand Ltd.
+ *	Author: Richard Purdie <rpurdie@openedhand.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/device.h>
+#include <linux/sysdev.h>
+#include <linux/timer.h>
+#include <linux/ctype.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
+#include <linux/usb.h>
+
+#include "leds.h"
+
+#define DEV_BUS_ID_SIZE		32
+
+/*
+ * Configurable sysfs attributes:
+ *
+ * device_name - name of the USB device to monitor
+ * activity_interval - duration of LED blink, in milliseconds
+ */
+
+struct usbdev_trig_data {
+	rwlock_t lock;
+
+	struct timer_list timer;
+	struct notifier_block notifier;
+
+	struct led_classdev *led_cdev;
+	struct usb_device *usb_dev;
+
+	char device_name[DEV_BUS_ID_SIZE];
+	unsigned interval;
+	int last_urbnum;
+};
+
+static void usbdev_trig_update_state(struct usbdev_trig_data *td)
+{
+	if (td->usb_dev)
+		led_set_brightness(td->led_cdev, LED_FULL);
+	else
+		led_set_brightness(td->led_cdev, LED_OFF);
+
+	if (td->interval && td->usb_dev)
+		mod_timer(&td->timer, jiffies + td->interval);
+	else
+		del_timer(&td->timer);
+}
+
+static ssize_t usbdev_trig_name_show(struct device *dev,
+				     struct device_attribute *attr,
+				     char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct usbdev_trig_data *td = led_cdev->trigger_data;
+
+	read_lock(&td->lock);
+	sprintf(buf, "%s\n", td->device_name);
+	read_unlock(&td->lock);
+
+	return strlen(buf) + 1;
+}
+
+static ssize_t usbdev_trig_name_store(struct device *dev,
+				      struct device_attribute *attr,
+				      const char *buf,
+				      size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct usbdev_trig_data *td = led_cdev->trigger_data;
+
+	if (size < 0 || size >= DEV_BUS_ID_SIZE)
+		return -EINVAL;
+
+	write_lock(&td->lock);
+
+	strcpy(td->device_name, buf);
+	if (size > 0 && td->device_name[size - 1] == '\n')
+		td->device_name[size - 1] = 0;
+
+	if (td->device_name[0] != 0) {
+		struct usb_device *usb_dev;
+
+		/* check for existing device to update from */
+		usb_dev = usb_find_device_by_name(td->device_name);
+		if (usb_dev) {
+			if (td->usb_dev)
+				usb_put_dev(td->usb_dev);
+
+			td->usb_dev = usb_dev;
+			td->last_urbnum = atomic_read(&usb_dev->urbnum);
+		}
+
+		/* updates LEDs, may start timers */
+		usbdev_trig_update_state(td);
+	}
+
+	write_unlock(&td->lock);
+	return size;
+}
+
+static DEVICE_ATTR(device_name, 0644, usbdev_trig_name_show,
+		   usbdev_trig_name_store);
+
+static ssize_t usbdev_trig_interval_show(struct device *dev,
+				 	 struct device_attribute *attr,
+					 char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct usbdev_trig_data *td = led_cdev->trigger_data;
+
+	read_lock(&td->lock);
+	sprintf(buf, "%u\n", jiffies_to_msecs(td->interval));
+	read_unlock(&td->lock);
+
+	return strlen(buf) + 1;
+}
+
+static ssize_t usbdev_trig_interval_store(struct device *dev,
+					  struct device_attribute *attr,
+					  const char *buf,
+					  size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct usbdev_trig_data *td = led_cdev->trigger_data;
+	int ret = -EINVAL;
+	char *after;
+	unsigned long value = simple_strtoul(buf, &after, 10);
+	size_t count = after - buf;
+
+	if (*after && isspace(*after))
+		count++;
+
+	if (count == size && value <= 10000) {
+		write_lock(&td->lock);
+		td->interval = msecs_to_jiffies(value);
+		usbdev_trig_update_state(td); /* resets timer */
+		write_unlock(&td->lock);
+		ret = count;
+	}
+
+	return ret;
+}
+
+static DEVICE_ATTR(activity_interval, 0644, usbdev_trig_interval_show,
+		   usbdev_trig_interval_store);
+
+static int usbdev_trig_notify(struct notifier_block *nb,
+			      unsigned long evt,
+			      void *data)
+{
+	struct usb_device *usb_dev;
+	struct usbdev_trig_data *td;
+
+	if (evt != USB_DEVICE_ADD && evt != USB_DEVICE_REMOVE)
+		return NOTIFY_DONE;
+
+	usb_dev = data;
+	td = container_of(nb, struct usbdev_trig_data, notifier);
+
+	write_lock(&td->lock);
+
+	if (strcmp(dev_name(&usb_dev->dev), td->device_name))
+		goto done;
+
+	if (evt == USB_DEVICE_ADD) {
+		usb_get_dev(usb_dev);
+		if (td->usb_dev != NULL)
+			usb_put_dev(td->usb_dev);
+		td->usb_dev = usb_dev;
+		td->last_urbnum = atomic_read(&usb_dev->urbnum);
+	} else if (evt == USB_DEVICE_REMOVE) {
+		if (td->usb_dev != NULL) {
+			usb_put_dev(td->usb_dev);
+			td->usb_dev = NULL;
+		}
+	}
+
+	usbdev_trig_update_state(td);
+
+done:
+	write_unlock(&td->lock);
+	return NOTIFY_DONE;
+}
+
+/* here's the real work! */
+static void usbdev_trig_timer(unsigned long arg)
+{
+	struct usbdev_trig_data *td = (struct usbdev_trig_data *)arg;
+	int new_urbnum;
+
+	write_lock(&td->lock);
+
+	if (!td->usb_dev || td->interval == 0) {
+		/*
+		 * we don't need to do timer work, just reflect device presence
+		 */
+		if (td->usb_dev)
+			led_set_brightness(td->led_cdev, LED_FULL);
+		else
+			led_set_brightness(td->led_cdev, LED_OFF);
+
+		goto no_restart;
+	}
+
+	if (td->interval)
+		new_urbnum = atomic_read(&td->usb_dev->urbnum);
+	else
+		new_urbnum = 0;
+
+	if (td->usb_dev) {
+		/*
+		 * Base state is ON (device is present). If there's no device,
+		 * we don't get this far and the LED is off.
+		 * OFF -> ON always
+		 * ON -> OFF on activity
+		 */
+		if (td->led_cdev->brightness == LED_OFF)
+			led_set_brightness(td->led_cdev, LED_FULL);
+		else if (td->last_urbnum != new_urbnum)
+			led_set_brightness(td->led_cdev, LED_OFF);
+	} else {
+		/*
+		 * base state is OFF
+		 * ON -> OFF always
+		 * OFF -> ON on activity
+		 */
+		if (td->led_cdev->brightness == LED_FULL)
+			led_set_brightness(td->led_cdev, LED_OFF);
+		else if (td->last_urbnum != new_urbnum)
+			led_set_brightness(td->led_cdev, LED_FULL);
+	}
+
+	td->last_urbnum = new_urbnum;
+	mod_timer(&td->timer, jiffies + td->interval);
+
+no_restart:
+	write_unlock(&td->lock);
+}
+
+static void usbdev_trig_activate(struct led_classdev *led_cdev)
+{
+	struct usbdev_trig_data *td;
+	int rc;
+
+	td = kzalloc(sizeof(struct usbdev_trig_data), GFP_KERNEL);
+	if (!td)
+		return;
+
+	rwlock_init(&td->lock);
+
+	td->notifier.notifier_call = usbdev_trig_notify;
+	td->notifier.priority = 10;
+
+	setup_timer(&td->timer, usbdev_trig_timer, (unsigned long) td);
+
+	td->led_cdev = led_cdev;
+	td->interval = msecs_to_jiffies(50);
+
+	led_cdev->trigger_data = td;
+
+	rc = device_create_file(led_cdev->dev, &dev_attr_device_name);
+	if (rc)
+		goto err_out;
+
+	rc = device_create_file(led_cdev->dev, &dev_attr_activity_interval);
+	if (rc)
+		goto err_out_device_name;
+
+	usb_register_notify(&td->notifier);
+	return;
+
+err_out_device_name:
+	device_remove_file(led_cdev->dev, &dev_attr_device_name);
+err_out:
+	led_cdev->trigger_data = NULL;
+	kfree(td);
+}
+
+static void usbdev_trig_deactivate(struct led_classdev *led_cdev)
+{
+	struct usbdev_trig_data *td = led_cdev->trigger_data;
+
+	if (td) {
+		usb_unregister_notify(&td->notifier);
+
+		device_remove_file(led_cdev->dev, &dev_attr_device_name);
+		device_remove_file(led_cdev->dev, &dev_attr_activity_interval);
+
+		write_lock(&td->lock);
+
+		if (td->usb_dev) {
+			usb_put_dev(td->usb_dev);
+			td->usb_dev = NULL;
+		}
+
+		write_unlock(&td->lock);
+
+		del_timer_sync(&td->timer);
+
+		kfree(td);
+	}
+}
+
+static struct led_trigger usbdev_led_trigger = {
+	.name		= "usbdev",
+	.activate	= usbdev_trig_activate,
+	.deactivate	= usbdev_trig_deactivate,
+};
+
+static int __init usbdev_trig_init(void)
+{
+	return led_trigger_register(&usbdev_led_trigger);
+}
+
+static void __exit usbdev_trig_exit(void)
+{
+	led_trigger_unregister(&usbdev_led_trigger);
+}
+
+module_init(usbdev_trig_init);
+module_exit(usbdev_trig_exit);
+
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("USB device LED trigger");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/generic/files/drivers/mtd/mtdsplit.c b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit.c
new file mode 100644
index 00000000..162739f4
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2009-2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009-2013 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2012 Jonas Gorski <jogo@openwrt.org>
+ * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#define pr_fmt(fmt)	"mtdsplit: " fmt
+
+#include <linux/export.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/magic.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/byteorder/generic.h>
+
+#include "mtdsplit.h"
+
+struct squashfs_super_block {
+	__le32 s_magic;
+	__le32 pad0[9];
+	__le64 bytes_used;
+};
+
+int mtd_get_squashfs_len(struct mtd_info *master,
+			 size_t offset,
+			 size_t *squashfs_len)
+{
+	struct squashfs_super_block sb;
+	size_t retlen;
+	int err;
+
+	err = mtd_read(master, offset, sizeof(sb), &retlen, (void *)&sb);
+	if (err || (retlen != sizeof(sb))) {
+		pr_alert("error occured while reading from \"%s\"\n",
+			 master->name);
+		return -EIO;
+	}
+
+	if (le32_to_cpu(sb.s_magic) != SQUASHFS_MAGIC) {
+		pr_alert("no squashfs found in \"%s\"\n", master->name);
+		return -EINVAL;
+	}
+
+	retlen = le64_to_cpu(sb.bytes_used);
+	if (retlen <= 0) {
+		pr_alert("squashfs is empty in \"%s\"\n", master->name);
+		return -ENODEV;
+	}
+
+	if (offset + retlen > master->size) {
+		pr_alert("squashfs has invalid size in \"%s\"\n",
+			 master->name);
+		return -EINVAL;
+	}
+
+	*squashfs_len = retlen;
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mtd_get_squashfs_len);
+
+static ssize_t mtd_next_eb(struct mtd_info *mtd, size_t offset)
+{
+	return mtd_rounddown_to_eb(offset, mtd) + mtd->erasesize;
+}
+
+int mtd_check_rootfs_magic(struct mtd_info *mtd, size_t offset)
+{
+	u32 magic;
+	size_t retlen;
+	int ret;
+
+	ret = mtd_read(mtd, offset, sizeof(magic), &retlen,
+		       (unsigned char *) &magic);
+	if (ret)
+		return ret;
+
+	if (retlen != sizeof(magic))
+		return -EIO;
+
+	if (le32_to_cpu(magic) != SQUASHFS_MAGIC &&
+	    magic != 0x19852003)
+		return -EINVAL;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mtd_check_rootfs_magic);
+
+int mtd_find_rootfs_from(struct mtd_info *mtd,
+			 size_t from,
+			 size_t limit,
+			 size_t *ret_offset)
+{
+	size_t offset;
+	int err;
+
+	for (offset = from; offset < limit;
+	     offset = mtd_next_eb(mtd, offset)) {
+		err = mtd_check_rootfs_magic(mtd, offset);
+		if (err)
+			continue;
+
+		*ret_offset = offset;
+		return 0;
+	}
+
+	return -ENODEV;
+}
+EXPORT_SYMBOL_GPL(mtd_find_rootfs_from);
+
diff --git a/trunk/target/linux/generic/files/drivers/mtd/mtdsplit.h b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit.h
new file mode 100644
index 00000000..7ee88b0b
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009-2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009-2013 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2012 Jonas Gorski <jogo@openwrt.org>
+ * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#ifndef _MTDSPLIT_H
+#define _MTDSPLIT_H
+
+#define KERNEL_PART_NAME	"kernel"
+#define ROOTFS_PART_NAME	"rootfs"
+
+#define ROOTFS_SPLIT_NAME	"rootfs_data"
+
+#ifdef CONFIG_MTD_SPLIT
+int mtd_get_squashfs_len(struct mtd_info *master,
+			 size_t offset,
+			 size_t *squashfs_len);
+
+int mtd_check_rootfs_magic(struct mtd_info *mtd, size_t offset);
+
+int mtd_find_rootfs_from(struct mtd_info *mtd,
+			 size_t from,
+			 size_t limit,
+			 size_t *ret_offset);
+
+#else
+static inline int mtd_get_squashfs_len(struct mtd_info *master,
+				       size_t offset,
+				       size_t *squashfs_len)
+{
+	return -ENODEV;
+}
+
+static inline int mtd_check_rootfs_magic(struct mtd_info *mtd, size_t offset)
+{
+	return -EINVAL;
+}
+
+static inline int mtd_find_rootfs_from(struct mtd_info *mtd,
+				       size_t from,
+				       size_t limit,
+				       size_t *ret_offset)
+{
+	return -ENODEV;
+}
+#endif /* CONFIG_MTD_SPLIT */
+
+#endif /* _MTDSPLIT_H */
diff --git a/trunk/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig
new file mode 100644
index 00000000..09794f4f
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig
@@ -0,0 +1,24 @@
+comment "Rootfs partition parsers"
+
+config MTD_SPLIT_SQUASHFS_ROOT
+	bool "Squashfs based root partition parser"
+	select MTD_SPLIT
+	default n
+	help
+	  This provides a parsing function which allows to detect the
+	  offset and size of the unused portion of a rootfs partition
+	  containing a squashfs.
+
+comment "Firmware partition parsers"
+
+config MTD_SPLIT_SEAMA_FW
+	bool "Seama firmware parser"
+	select MTD_SPLIT
+
+config MTD_SPLIT_UIMAGE_FW
+	bool "uImage based firmware partition parser"
+	select MTD_SPLIT
+
+config MTD_SPLIT_LZMA_FW
+	bool "LZMA compressed kernel based firmware partition parser"
+	select MTD_SPLIT
diff --git a/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_lzma.c b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_lzma.c
new file mode 100644
index 00000000..64dc7cb3
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_lzma.c
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (C) 2014 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/unaligned.h>
+
+#include "mtdsplit.h"
+
+#define LZMA_NR_PARTS		2
+#define LZMA_PROPERTIES_SIZE	5
+
+struct lzma_header {
+	u8 props[LZMA_PROPERTIES_SIZE];
+	u8 size_low[4];
+	u8 size_high[4];
+};
+
+static int mtdsplit_parse_lzma(struct mtd_info *master,
+			       struct mtd_partition **pparts,
+			       struct mtd_part_parser_data *data)
+{
+	struct lzma_header hdr;
+	size_t hdr_len, retlen;
+	size_t rootfs_offset;
+	u32 t;
+	struct mtd_partition *parts;
+	int err;
+
+	hdr_len = sizeof(hdr);
+	err = mtd_read(master, 0, hdr_len, &retlen, (void *) &hdr);
+	if (err)
+		return err;
+
+	if (retlen != hdr_len)
+		return -EIO;
+
+	/* verify LZMA properties */
+	if (hdr.props[0] >= (9 * 5 * 5))
+		return -EINVAL;
+
+	t = get_unaligned_le32(&hdr.props[1]);
+	if (!is_power_of_2(t))
+		return -EINVAL;
+
+	t = get_unaligned_le32(&hdr.size_high);
+	if (t)
+		return -EINVAL;
+
+	err = mtd_find_rootfs_from(master, master->erasesize,
+				   master->size, &rootfs_offset);
+	if (err)
+		return err;
+
+	parts = kzalloc(LZMA_NR_PARTS * sizeof(*parts), GFP_KERNEL);
+	if (!parts)
+		return -ENOMEM;
+
+	parts[0].name = KERNEL_PART_NAME;
+	parts[0].offset = 0;
+	parts[0].size = rootfs_offset;
+
+	parts[1].name = ROOTFS_PART_NAME;
+	parts[1].offset = rootfs_offset;
+	parts[1].size = master->size - rootfs_offset;
+
+	*pparts = parts;
+	return LZMA_NR_PARTS;
+}
+
+static struct mtd_part_parser mtdsplit_lzma_parser = {
+	.owner = THIS_MODULE,
+	.name = "lzma-fw",
+	.parse_fn = mtdsplit_parse_lzma,
+	.type = MTD_PARSER_TYPE_FIRMWARE,
+};
+
+static int __init mtdsplit_lzma_init(void)
+{
+	register_mtd_parser(&mtdsplit_lzma_parser);
+
+	return 0;
+}
+
+subsys_initcall(mtdsplit_lzma_init);
diff --git a/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_seama.c b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_seama.c
new file mode 100644
index 00000000..6f21f8fb
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_seama.c
@@ -0,0 +1,103 @@
+/*
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/byteorder/generic.h>
+
+#include "mtdsplit.h"
+
+#define SEAMA_MAGIC		0x5EA3A417
+#define SEAMA_NR_PARTS		2
+#define SEAMA_MIN_ROOTFS_OFFS	0x80000	/* 512KiB */
+
+struct seama_header {
+	__be32	magic;		/* should always be SEAMA_MAGIC. */
+	__be16	reserved;	/* reserved for  */
+	__be16	metasize;	/* size of the META data */
+	__be32	size;		/* size of the image */
+};
+
+static int mtdsplit_parse_seama(struct mtd_info *master,
+				struct mtd_partition **pparts,
+				struct mtd_part_parser_data *data)
+{
+	struct seama_header hdr;
+	size_t hdr_len, retlen, kernel_size;
+	size_t rootfs_offset;
+	struct mtd_partition *parts;
+	int err;
+
+	hdr_len = sizeof(hdr);
+	err = mtd_read(master, 0, hdr_len, &retlen, (void *) &hdr);
+	if (err)
+		return err;
+
+	if (retlen != hdr_len)
+		return -EIO;
+
+	/* sanity checks */
+	if (be32_to_cpu(hdr.magic) != SEAMA_MAGIC)
+		return -EINVAL;
+
+	kernel_size = hdr_len + be32_to_cpu(hdr.size) +
+		      be16_to_cpu(hdr.metasize);
+	if (kernel_size > master->size)
+		return -EINVAL;
+
+	/* Find the rootfs after the kernel. */
+	err = mtd_check_rootfs_magic(master, kernel_size);
+	if (!err) {
+		rootfs_offset = kernel_size;
+	} else {
+		/*
+		 * The size in the header might cover the rootfs as well.
+		 * Start the search from an arbitrary offset.
+		 */
+		err = mtd_find_rootfs_from(master, SEAMA_MIN_ROOTFS_OFFS,
+					   master->size, &rootfs_offset);
+		if (err)
+			return err;
+	}
+
+	parts = kzalloc(SEAMA_NR_PARTS * sizeof(*parts), GFP_KERNEL);
+	if (!parts)
+		return -ENOMEM;
+
+	parts[0].name = KERNEL_PART_NAME;
+	parts[0].offset = 0;
+	parts[0].size = rootfs_offset;
+
+	parts[1].name = ROOTFS_PART_NAME;
+	parts[1].offset = rootfs_offset;
+	parts[1].size = master->size - rootfs_offset;
+
+	*pparts = parts;
+	return SEAMA_NR_PARTS;
+}
+
+static struct mtd_part_parser mtdsplit_seama_parser = {
+	.owner = THIS_MODULE,
+	.name = "seama-fw",
+	.parse_fn = mtdsplit_parse_seama,
+	.type = MTD_PARSER_TYPE_FIRMWARE,
+};
+
+static int __init mtdsplit_seama_init(void)
+{
+	register_mtd_parser(&mtdsplit_seama_parser);
+
+	return 0;
+}
+
+subsys_initcall(mtdsplit_seama_init);
diff --git a/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_squashfs.c b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_squashfs.c
new file mode 100644
index 00000000..3d80e078
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_squashfs.c
@@ -0,0 +1,72 @@
+/*
+ *  Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/magic.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/byteorder/generic.h>
+
+#include "mtdsplit.h"
+
+static int
+mtdsplit_parse_squashfs(struct mtd_info *master,
+			struct mtd_partition **pparts,
+			struct mtd_part_parser_data *data)
+{
+	struct mtd_partition *part;
+	struct mtd_info *parent_mtd;
+	size_t part_offset;
+	size_t squashfs_len;
+	int err;
+
+	err = mtd_get_squashfs_len(master, 0, &squashfs_len);
+	if (err)
+		return err;
+
+	parent_mtd = mtdpart_get_master(master);
+	part_offset = mtdpart_get_offset(master);
+
+	part = kzalloc(sizeof(*part), GFP_KERNEL);
+	if (!part) {
+		pr_alert("unable to allocate memory for \"%s\" partition\n",
+			 ROOTFS_SPLIT_NAME);
+		return -ENOMEM;
+	}
+
+	part->name = ROOTFS_SPLIT_NAME;
+	part->offset = mtd_roundup_to_eb(part_offset + squashfs_len,
+					 parent_mtd) - part_offset;
+	part->size = master->size - part->offset;
+
+	*pparts = part;
+	return 1;
+}
+
+static struct mtd_part_parser mtdsplit_squashfs_parser = {
+	.owner = THIS_MODULE,
+	.name = "squashfs-split",
+	.parse_fn = mtdsplit_parse_squashfs,
+	.type = MTD_PARSER_TYPE_ROOTFS,
+};
+
+static int __init mtdsplit_squashfs_init(void)
+{
+	register_mtd_parser(&mtdsplit_squashfs_parser);
+
+	return 0;
+}
+
+subsys_initcall(mtdsplit_squashfs_init);
diff --git a/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c
new file mode 100644
index 00000000..7dad63c9
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c
@@ -0,0 +1,287 @@
+/*
+ *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/byteorder/generic.h>
+
+#include "mtdsplit.h"
+
+#define IH_MAGIC	0x27051956	/* Image Magic Number		*/
+#define IH_NMLEN		32	/* Image Name Length		*/
+
+#define IH_OS_LINUX		5	/* Linux	*/
+
+#define IH_TYPE_KERNEL		2	/* OS Kernel Image		*/
+#define IH_TYPE_FILESYSTEM	7	/* Filesystem Image		*/
+
+/*
+ * Legacy format image header,
+ * all data in network byte order (aka natural aka bigendian).
+ */
+struct uimage_header {
+	uint32_t	ih_magic;	/* Image Header Magic Number	*/
+	uint32_t	ih_hcrc;	/* Image Header CRC Checksum	*/
+	uint32_t	ih_time;	/* Image Creation Timestamp	*/
+	uint32_t	ih_size;	/* Image Data Size		*/
+	uint32_t	ih_load;	/* Data	 Load  Address		*/
+	uint32_t	ih_ep;		/* Entry Point Address		*/
+	uint32_t	ih_dcrc;	/* Image Data CRC Checksum	*/
+	uint8_t		ih_os;		/* Operating System		*/
+	uint8_t		ih_arch;	/* CPU architecture		*/
+	uint8_t		ih_type;	/* Image Type			*/
+	uint8_t		ih_comp;	/* Compression Type		*/
+	uint8_t		ih_name[IH_NMLEN];	/* Image Name		*/
+};
+
+static int
+read_uimage_header(struct mtd_info *mtd, size_t offset,
+		   struct uimage_header *header)
+{
+	size_t header_len;
+	size_t retlen;
+	int ret;
+
+	header_len = sizeof(*header);
+	ret = mtd_read(mtd, offset, header_len, &retlen,
+		       (unsigned char *) header);
+	if (ret) {
+		pr_debug("read error in \"%s\"\n", mtd->name);
+		return ret;
+	}
+
+	if (retlen != header_len) {
+		pr_debug("short read in \"%s\"\n", mtd->name);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int __mtdsplit_parse_uimage(struct mtd_info *master,
+				   struct mtd_partition **pparts,
+				   struct mtd_part_parser_data *data,
+				   bool (*verify)(struct uimage_header *hdr))
+{
+	struct mtd_partition *parts;
+	struct uimage_header *header;
+	int nr_parts;
+	size_t offset;
+	size_t uimage_offset;
+	size_t uimage_size = 0;
+	size_t rootfs_offset;
+	size_t rootfs_size = 0;
+	int uimage_part, rf_part;
+	int ret;
+
+	nr_parts = 2;
+	parts = kzalloc(nr_parts * sizeof(*parts), GFP_KERNEL);
+	if (!parts)
+		return -ENOMEM;
+
+	header = vmalloc(sizeof(*header));
+	if (!header) {
+		ret = -ENOMEM;
+		goto err_free_parts;
+	}
+
+	/* find uImage on erase block boundaries */
+	for (offset = 0; offset < master->size; offset += master->erasesize) {
+		uimage_size = 0;
+
+		ret = read_uimage_header(master, offset, header);
+		if (ret)
+			continue;
+
+		if (!verify(header)) {
+			pr_debug("no valid uImage found in \"%s\" at offset %llx\n",
+				 master->name, (unsigned long long) offset);
+			continue;
+		}
+
+		uimage_size = sizeof(*header) + be32_to_cpu(header->ih_size);
+		if ((offset + uimage_size) > master->size) {
+			pr_debug("uImage exceeds MTD device \"%s\"\n",
+				 master->name);
+			continue;
+		}
+		break;
+	}
+
+	if (uimage_size == 0) {
+		pr_debug("no uImage found in \"%s\"\n", master->name);
+		ret = -ENODEV;
+		goto err_free_header;
+	}
+
+	uimage_offset = offset;
+
+	if (uimage_offset == 0) {
+		uimage_part = 0;
+		rf_part = 1;
+
+		/* find the roots after the uImage */
+		ret = mtd_find_rootfs_from(master,
+					   uimage_offset + uimage_size,
+					   master->size,
+					   &rootfs_offset);
+		if (ret) {
+			pr_debug("no rootfs after uImage in \"%s\"\n",
+				 master->name);
+			goto err_free_header;
+		}
+
+		rootfs_size = master->size - rootfs_offset;
+		uimage_size = rootfs_offset - uimage_offset;
+	} else {
+		rf_part = 0;
+		uimage_part = 1;
+
+		/* check rootfs presence at offset 0 */
+		ret = mtd_check_rootfs_magic(master, 0);
+		if (ret) {
+			pr_debug("no rootfs before uImage in \"%s\"\n",
+				 master->name);
+			goto err_free_header;
+		}
+
+		rootfs_offset = 0;
+		rootfs_size = uimage_offset;
+	}
+
+	if (rootfs_size == 0) {
+		pr_debug("no rootfs found in \"%s\"\n", master->name);
+		ret = -ENODEV;
+		goto err_free_header;
+	}
+
+	parts[uimage_part].name = KERNEL_PART_NAME;
+	parts[uimage_part].offset = uimage_offset;
+	parts[uimage_part].size = uimage_size;
+
+	parts[rf_part].name = ROOTFS_PART_NAME;
+	parts[rf_part].offset = rootfs_offset;
+	parts[rf_part].size = rootfs_size;
+
+	vfree(header);
+
+	*pparts = parts;
+	return nr_parts;
+
+err_free_header:
+	vfree(header);
+
+err_free_parts:
+	kfree(parts);
+	return ret;
+}
+
+static bool uimage_verify_default(struct uimage_header *header)
+{
+	/* default sanity checks */
+	if (be32_to_cpu(header->ih_magic) != IH_MAGIC) {
+		pr_debug("invalid uImage magic: %08x\n",
+			 be32_to_cpu(header->ih_magic));
+		return false;
+	}
+
+	if (header->ih_os != IH_OS_LINUX) {
+		pr_debug("invalid uImage OS: %08x\n",
+			 be32_to_cpu(header->ih_os));
+		return false;
+	}
+
+	if (header->ih_type != IH_TYPE_KERNEL) {
+		pr_debug("invalid uImage type: %08x\n",
+			 be32_to_cpu(header->ih_type));
+		return false;
+	}
+
+	return true;
+}
+
+static int
+mtdsplit_uimage_parse_generic(struct mtd_info *master,
+			      struct mtd_partition **pparts,
+			      struct mtd_part_parser_data *data)
+{
+	return __mtdsplit_parse_uimage(master, pparts, data,
+				      uimage_verify_default);
+}
+
+static struct mtd_part_parser uimage_generic_parser = {
+	.owner = THIS_MODULE,
+	.name = "uimage-fw",
+	.parse_fn = mtdsplit_uimage_parse_generic,
+	.type = MTD_PARSER_TYPE_FIRMWARE,
+};
+
+#define FW_MAGIC_WNR2000V3	0x32303033
+#define FW_MAGIC_WNR2000V4	0x32303034
+#define FW_MAGIC_WNR2200	0x32323030
+#define FW_MAGIC_WNR612V2	0x32303631
+#define FW_MAGIC_WNDR3700	0x33373030
+#define FW_MAGIC_WNDR3700V2	0x33373031
+
+static bool uimage_verify_wndr3700(struct uimage_header *header)
+{
+	uint8_t expected_type = IH_TYPE_FILESYSTEM;
+	switch be32_to_cpu(header->ih_magic) {
+	case FW_MAGIC_WNR612V2:
+	case FW_MAGIC_WNR2000V3:
+	case FW_MAGIC_WNR2200:
+	case FW_MAGIC_WNDR3700:
+	case FW_MAGIC_WNDR3700V2:
+		break;
+	case FW_MAGIC_WNR2000V4:
+		expected_type = IH_TYPE_KERNEL;
+		break;
+	default:
+		return false;
+	}
+
+	if (header->ih_os != IH_OS_LINUX ||
+	    header->ih_type != expected_type)
+		return false;
+
+	return true;
+}
+
+static int
+mtdsplit_uimage_parse_netgear(struct mtd_info *master,
+			      struct mtd_partition **pparts,
+			      struct mtd_part_parser_data *data)
+{
+	return __mtdsplit_parse_uimage(master, pparts, data,
+				      uimage_verify_wndr3700);
+}
+
+static struct mtd_part_parser uimage_netgear_parser = {
+	.owner = THIS_MODULE,
+	.name = "netgear-fw",
+	.parse_fn = mtdsplit_uimage_parse_netgear,
+	.type = MTD_PARSER_TYPE_FIRMWARE,
+};
+
+static int __init mtdsplit_uimage_init(void)
+{
+	register_mtd_parser(&uimage_generic_parser);
+	register_mtd_parser(&uimage_netgear_parser);
+
+	return 0;
+}
+
+module_init(mtdsplit_uimage_init);
diff --git a/trunk/target/linux/generic/files/drivers/mtd/myloader.c b/trunk/target/linux/generic/files/drivers/mtd/myloader.c
new file mode 100644
index 00000000..cd573690
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/mtd/myloader.c
@@ -0,0 +1,182 @@
+/*
+ *  Parse MyLoader-style flash partition tables and produce a Linux partition
+ *  array to match.
+ *
+ *  Copyright (C) 2007-2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This file was based on drivers/mtd/redboot.c
+ *  Author: Red Hat, Inc. - David Woodhouse <dwmw2@cambridge.redhat.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/vmalloc.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/byteorder/generic.h>
+#include <linux/myloader.h>
+
+#define BLOCK_LEN_MIN		0x10000
+#define PART_NAME_LEN		32
+
+struct part_data {
+	struct mylo_partition_table	tab;
+	char names[MYLO_MAX_PARTITIONS][PART_NAME_LEN];
+};
+
+static int myloader_parse_partitions(struct mtd_info *master,
+				     struct mtd_partition **pparts,
+				     struct mtd_part_parser_data *data)
+{
+	struct part_data *buf;
+	struct mylo_partition_table *tab;
+	struct mylo_partition *part;
+	struct mtd_partition *mtd_parts;
+	struct mtd_partition *mtd_part;
+	int num_parts;
+	int ret, i;
+	size_t retlen;
+	char *names;
+	unsigned long offset;
+	unsigned long blocklen;
+
+	buf = vmalloc(sizeof(*buf));
+	if (!buf) {
+		return -ENOMEM;
+		goto out;
+	}
+	tab = &buf->tab;
+
+	blocklen = master->erasesize;
+	if (blocklen < BLOCK_LEN_MIN)
+		blocklen = BLOCK_LEN_MIN;
+
+	offset = blocklen;
+
+	/* Find the partition table */
+	for (i = 0; i < 4; i++, offset += blocklen) {
+		printk(KERN_DEBUG "%s: searching for MyLoader partition table"
+				" at offset 0x%lx\n", master->name, offset);
+
+		ret = mtd_read(master, offset, sizeof(*buf), &retlen,
+			       (void *)buf);
+		if (ret)
+			goto out_free_buf;
+
+		if (retlen != sizeof(*buf)) {
+			ret = -EIO;
+			goto out_free_buf;
+		}
+
+		/* Check for Partition Table magic number */
+		if (tab->magic == le32_to_cpu(MYLO_MAGIC_PARTITIONS))
+			break;
+
+	}
+
+	if (tab->magic != le32_to_cpu(MYLO_MAGIC_PARTITIONS)) {
+		printk(KERN_DEBUG "%s: no MyLoader partition table found\n",
+			master->name);
+		ret = 0;
+		goto out_free_buf;
+	}
+
+	/* The MyLoader and the Partition Table is always present */
+	num_parts = 2;
+
+	/* Detect number of used partitions */
+	for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
+		part = &tab->partitions[i];
+
+		if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
+			continue;
+
+		num_parts++;
+	}
+
+	mtd_parts = kzalloc((num_parts * sizeof(*mtd_part) +
+				num_parts * PART_NAME_LEN), GFP_KERNEL);
+
+	if (!mtd_parts) {
+		ret = -ENOMEM;
+		goto out_free_buf;
+	}
+
+	mtd_part = mtd_parts;
+	names = (char *)&mtd_parts[num_parts];
+
+	strncpy(names, "myloader", PART_NAME_LEN);
+	mtd_part->name = names;
+	mtd_part->offset = 0;
+	mtd_part->size = offset;
+	mtd_part->mask_flags = MTD_WRITEABLE;
+	mtd_part++;
+	names += PART_NAME_LEN;
+
+	strncpy(names, "partition_table", PART_NAME_LEN);
+	mtd_part->name = names;
+	mtd_part->offset = offset;
+	mtd_part->size = blocklen;
+	mtd_part->mask_flags = MTD_WRITEABLE;
+	mtd_part++;
+	names += PART_NAME_LEN;
+
+	for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
+		part = &tab->partitions[i];
+
+		if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
+			continue;
+
+		if ((buf->names[i][0]) && (buf->names[i][0] != '\xff'))
+			strncpy(names, buf->names[i], PART_NAME_LEN);
+		else
+			snprintf(names, PART_NAME_LEN, "partition%d", i);
+
+		mtd_part->offset = le32_to_cpu(part->addr);
+		mtd_part->size = le32_to_cpu(part->size);
+		mtd_part->name = names;
+		mtd_part++;
+		names += PART_NAME_LEN;
+	}
+
+	*pparts = mtd_parts;
+	ret = num_parts;
+
+ out_free_buf:
+	vfree(buf);
+ out:
+	return ret;
+}
+
+static struct mtd_part_parser myloader_mtd_parser = {
+	.owner		= THIS_MODULE,
+	.parse_fn	= myloader_parse_partitions,
+	.name		= "MyLoader",
+};
+
+static int __init myloader_mtd_parser_init(void)
+{
+	register_mtd_parser(&myloader_mtd_parser);
+
+	return 0;
+}
+
+static void __exit myloader_mtd_parser_exit(void)
+{
+	deregister_mtd_parser(&myloader_mtd_parser);
+}
+
+module_init(myloader_mtd_parser_init);
+module_exit(myloader_mtd_parser_exit);
+
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_DESCRIPTION("Parsing code for MyLoader partition tables");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/adm6996.c b/trunk/target/linux/generic/files/drivers/net/phy/adm6996.c
new file mode 100644
index 00000000..cbb3e85f
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/adm6996.c
@@ -0,0 +1,1204 @@
+/*
+ * ADM6996 switch driver
+ *
+ * swconfig interface based on ar8216.c
+ *
+ * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * VLAN support Copyright (c) 2010, 2011 Peter Lebbing <peter@digitalbrains.com>
+ * Copyright (c) 2013 Hauke Mehrtens <hauke@hauke-m.de>
+ * Copyright (c) 2014 Matti Laakso <malaakso@elisanet.fi>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+/*#define DEBUG 1*/
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/mii.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/adm6996-gpio.h>
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+#include <linux/switch.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include "adm6996.h"
+
+MODULE_DESCRIPTION("Infineon ADM6996 Switch");
+MODULE_AUTHOR("Felix Fietkau, Peter Lebbing <peter@digitalbrains.com>");
+MODULE_LICENSE("GPL");
+
+static const char * const adm6996_model_name[] =
+{
+	NULL,
+	"ADM6996FC",
+	"ADM6996M",
+	"ADM6996L"
+};
+
+struct adm6996_mib_desc {
+	unsigned int offset;
+	const char *name;
+};
+
+struct adm6996_priv {
+	struct switch_dev dev;
+	void *priv;
+
+	u8 eecs;
+	u8 eesk;
+	u8 eedi;
+	u8 eerc;
+
+	enum adm6996_model model;
+
+	bool enable_vlan;
+	bool vlan_enabled;	/* Current hardware state */
+
+#ifdef DEBUG
+	u16 addr;		/* Debugging: register address to operate on */
+#endif
+
+	u16 pvid[ADM_NUM_PORTS];	/* Primary VLAN ID */
+	u8 tagged_ports;
+
+	u16 vlan_id[ADM_NUM_VLANS];
+	u8 vlan_table[ADM_NUM_VLANS];	/* bitmap, 1 = port is member */
+	u8 vlan_tagged[ADM_NUM_VLANS];	/* bitmap, 1 = tagged member */
+	
+	struct mutex mib_lock;
+	char buf[2048];
+
+	struct mutex reg_mutex;
+
+	/* use abstraction for regops, we want to add gpio support in the future */
+	u16 (*read)(struct adm6996_priv *priv, enum admreg reg);
+	void (*write)(struct adm6996_priv *priv, enum admreg reg, u16 val);
+};
+
+#define to_adm(_dev) container_of(_dev, struct adm6996_priv, dev)
+#define phy_to_adm(_phy) ((struct adm6996_priv *) (_phy)->priv)
+
+#define MIB_DESC(_o, _n)	\
+	{			\
+		.offset = (_o),	\
+		.name = (_n),	\
+	}
+
+static const struct adm6996_mib_desc adm6996_mibs[] = {
+	MIB_DESC(ADM_CL0, "RxPacket"),
+	MIB_DESC(ADM_CL6, "RxByte"),
+	MIB_DESC(ADM_CL12, "TxPacket"),
+	MIB_DESC(ADM_CL18, "TxByte"),
+	MIB_DESC(ADM_CL24, "Collision"),
+	MIB_DESC(ADM_CL30, "Error"),
+};
+
+static inline u16
+r16(struct adm6996_priv *priv, enum admreg reg)
+{
+	return priv->read(priv, reg);
+}
+
+static inline void
+w16(struct adm6996_priv *priv, enum admreg reg, u16 val)
+{
+	priv->write(priv, reg, val);
+}
+
+/* Minimum timing constants */
+#define EECK_EDGE_TIME  3   /* 3us - max(adm 2.5us, 93c 1us) */
+#define EEDI_SETUP_TIME 1   /* 1us - max(adm 10ns, 93c 400ns) */
+#define EECS_SETUP_TIME 1   /* 1us - max(adm no, 93c 200ns) */
+
+static void adm6996_gpio_write(struct adm6996_priv *priv, int cs, char *buf, unsigned int bits)
+{
+	int i, len = (bits + 7) / 8;
+	u8 mask;
+
+	gpio_set_value(priv->eecs, cs);
+	udelay(EECK_EDGE_TIME);
+
+	/* Byte assemble from MSB to LSB */
+	for (i = 0; i < len; i++) {
+		/* Bit bang from MSB to LSB */
+		for (mask = 0x80; mask && bits > 0; mask >>= 1, bits --) {
+			/* Clock low */
+			gpio_set_value(priv->eesk, 0);
+			udelay(EECK_EDGE_TIME);
+
+			/* Output on rising edge */
+			gpio_set_value(priv->eedi, (mask & buf[i]));
+			udelay(EEDI_SETUP_TIME);
+
+			/* Clock high */
+			gpio_set_value(priv->eesk, 1);
+			udelay(EECK_EDGE_TIME);
+		}
+	}
+
+	/* Clock low */
+	gpio_set_value(priv->eesk, 0);
+	udelay(EECK_EDGE_TIME);
+
+	if (cs)
+		gpio_set_value(priv->eecs, 0);
+}
+
+static void adm6996_gpio_read(struct adm6996_priv *priv, int cs, char *buf, unsigned int bits)
+{
+	int i, len = (bits + 7) / 8;
+	u8 mask;
+
+	gpio_set_value(priv->eecs, cs);
+	udelay(EECK_EDGE_TIME);
+
+	/* Byte assemble from MSB to LSB */
+	for (i = 0; i < len; i++) {
+		u8 byte;
+
+		/* Bit bang from MSB to LSB */
+		for (mask = 0x80, byte = 0; mask && bits > 0; mask >>= 1, bits --) {
+			u8 gp;
+
+			/* Clock low */
+			gpio_set_value(priv->eesk, 0);
+			udelay(EECK_EDGE_TIME);
+
+			/* Input on rising edge */
+			gp = gpio_get_value(priv->eedi);
+			if (gp)
+				byte |= mask;
+
+			/* Clock high */
+			gpio_set_value(priv->eesk, 1);
+			udelay(EECK_EDGE_TIME);
+		}
+
+		*buf++ = byte;
+	}
+
+	/* Clock low */
+	gpio_set_value(priv->eesk, 0);
+	udelay(EECK_EDGE_TIME);
+
+	if (cs)
+		gpio_set_value(priv->eecs, 0);
+}
+
+/* Advance clock(s) */
+static void adm6996_gpio_adclk(struct adm6996_priv *priv, int clocks)
+{
+	int i;
+	for (i = 0; i < clocks; i++) {
+		/* Clock high */
+		gpio_set_value(priv->eesk, 1);
+		udelay(EECK_EDGE_TIME);
+
+		/* Clock low */
+		gpio_set_value(priv->eesk, 0);
+		udelay(EECK_EDGE_TIME);
+	}
+}
+
+static u16
+adm6996_read_gpio_reg(struct adm6996_priv *priv, enum admreg reg)
+{
+	/* cmd: 01 10 T DD R RRRRRR */
+	u8 bits[6] = {
+		0xFF, 0xFF, 0xFF, 0xFF,
+		(0x06 << 4) | ((0 & 0x01) << 3 | (reg&64)>>6),
+		((reg&63)<<2)
+	};
+
+	u8 rbits[4];
+
+	/* Enable GPIO outputs with all pins to 0 */
+	gpio_direction_output(priv->eecs, 0);
+	gpio_direction_output(priv->eesk, 0);
+	gpio_direction_output(priv->eedi, 0);
+
+	adm6996_gpio_write(priv, 0, bits, 46);
+	gpio_direction_input(priv->eedi);
+	adm6996_gpio_adclk(priv, 2);
+	adm6996_gpio_read(priv, 0, rbits, 32);
+
+	/* Extra clock(s) required per datasheet */
+	adm6996_gpio_adclk(priv, 2);
+
+	/* Disable GPIO outputs */
+	gpio_direction_input(priv->eecs);
+	gpio_direction_input(priv->eesk);
+
+	 /* EEPROM has 16-bit registers, but pumps out two registers in one request */
+	return (reg & 0x01 ?  (rbits[0]<<8) | rbits[1] : (rbits[2]<<8) | (rbits[3]));
+}
+
+/* Write chip configuration register */
+/* Follow 93c66 timing and chip's min EEPROM timing requirement */
+static void
+adm6996_write_gpio_reg(struct adm6996_priv *priv, enum admreg reg, u16 val)
+{
+	/* cmd(27bits): sb(1) + opc(01) + addr(bbbbbbbb) + data(bbbbbbbbbbbbbbbb) */
+	u8 bits[4] = {
+		(0x05 << 5) | (reg >> 3),
+		(reg << 5) | (u8)(val >> 11),
+		(u8)(val >> 3),
+		(u8)(val << 5)
+	};
+
+	/* Enable GPIO outputs with all pins to 0 */
+	gpio_direction_output(priv->eecs, 0);
+	gpio_direction_output(priv->eesk, 0);
+	gpio_direction_output(priv->eedi, 0);
+
+	/* Write cmd. Total 27 bits */
+	adm6996_gpio_write(priv, 1, bits, 27);
+
+	/* Extra clock(s) required per datasheet */
+	adm6996_gpio_adclk(priv, 2);
+
+	/* Disable GPIO outputs */
+	gpio_direction_input(priv->eecs);
+	gpio_direction_input(priv->eesk);
+	gpio_direction_input(priv->eedi);
+}
+
+static u16
+adm6996_read_mii_reg(struct adm6996_priv *priv, enum admreg reg)
+{
+	struct phy_device *phydev = priv->priv;
+	struct mii_bus *bus = phydev->bus;
+
+	return bus->read(bus, PHYADDR(reg));
+}
+
+static void
+adm6996_write_mii_reg(struct adm6996_priv *priv, enum admreg reg, u16 val)
+{
+	struct phy_device *phydev = priv->priv;
+	struct mii_bus *bus = phydev->bus;
+
+	bus->write(bus, PHYADDR(reg), val);
+}
+
+static int
+adm6996_set_enable_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	if (val->value.i > 1)
+		return -EINVAL;
+
+	priv->enable_vlan = val->value.i;
+
+	return 0;
+};
+
+static int
+adm6996_get_enable_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	val->value.i = priv->enable_vlan;
+
+	return 0;
+};
+
+#ifdef DEBUG
+
+static int
+adm6996_set_addr(struct switch_dev *dev, const struct switch_attr *attr,
+		 struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	if (val->value.i > 1023)
+		return -EINVAL;
+
+	priv->addr = val->value.i;
+
+	return 0;
+};
+
+static int
+adm6996_get_addr(struct switch_dev *dev, const struct switch_attr *attr,
+		 struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	val->value.i = priv->addr;
+
+	return 0;
+};
+
+static int
+adm6996_set_data(struct switch_dev *dev, const struct switch_attr *attr,
+		 struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	if (val->value.i > 65535)
+		return -EINVAL;
+
+	w16(priv, priv->addr, val->value.i);
+
+	return 0;
+};
+
+static int
+adm6996_get_data(struct switch_dev *dev, const struct switch_attr *attr,
+		 struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	val->value.i = r16(priv, priv->addr);
+
+	return 0;
+};
+
+#endif /* def DEBUG */
+
+static int
+adm6996_set_pvid(struct switch_dev *dev, int port, int vlan)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	pr_devel("set_pvid port %d vlan %d\n", port, vlan);
+
+	if (vlan > ADM_VLAN_MAX_ID)
+		return -EINVAL;
+
+	priv->pvid[port] = vlan;
+
+	return 0;
+}
+
+static int
+adm6996_get_pvid(struct switch_dev *dev, int port, int *vlan)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	pr_devel("get_pvid port %d\n", port);
+	*vlan = priv->pvid[port];
+
+	return 0;
+}
+
+static int
+adm6996_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	pr_devel("set_vid port %d vid %d\n", val->port_vlan, val->value.i);
+
+	if (val->value.i > ADM_VLAN_MAX_ID)
+		return -EINVAL;
+
+	priv->vlan_id[val->port_vlan] = val->value.i;
+
+	return 0;
+};
+
+static int
+adm6996_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	pr_devel("get_vid port %d\n", val->port_vlan);
+
+	val->value.i = priv->vlan_id[val->port_vlan];
+
+	return 0;
+};
+
+static int
+adm6996_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+	u8 ports = priv->vlan_table[val->port_vlan];
+	u8 tagged = priv->vlan_tagged[val->port_vlan];
+	int i;
+
+	pr_devel("get_ports port_vlan %d\n", val->port_vlan);
+
+	val->len = 0;
+
+	for (i = 0; i < ADM_NUM_PORTS; i++) {
+		struct switch_port *p;
+
+		if (!(ports & (1 << i)))
+			continue;
+
+		p = &val->value.ports[val->len++];
+		p->id = i;
+		if (tagged & (1 << i))
+			p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+		else
+			p->flags = 0;
+	}
+
+	return 0;
+};
+
+static int
+adm6996_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+	u8 *ports = &priv->vlan_table[val->port_vlan];
+	u8 *tagged = &priv->vlan_tagged[val->port_vlan];
+	int i;
+
+	pr_devel("set_ports port_vlan %d ports", val->port_vlan);
+
+	*ports = 0;
+	*tagged = 0;
+
+	for (i = 0; i < val->len; i++) {
+		struct switch_port *p = &val->value.ports[i];
+
+#ifdef DEBUG
+		pr_cont(" %d%s", p->id,
+		       ((p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) ? "T" :
+			""));
+#endif
+
+		if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
+			*tagged |= (1 << p->id);
+			priv->tagged_ports |= (1 << p->id);
+		}
+
+		*ports |= (1 << p->id);
+	}
+
+#ifdef DEBUG
+	pr_cont("\n");
+#endif
+
+	return 0;
+};
+
+/*
+ * Precondition: reg_mutex must be held
+ */
+static void
+adm6996_enable_vlan(struct adm6996_priv *priv)
+{
+	u16 reg;
+
+	reg = r16(priv, ADM_OTBE_P2_PVID);
+	reg &= ~(ADM_OTBE_MASK);
+	w16(priv, ADM_OTBE_P2_PVID, reg);
+	reg = r16(priv, ADM_IFNTE);
+	reg &= ~(ADM_IFNTE_MASK);
+	w16(priv, ADM_IFNTE, reg);
+	reg = r16(priv, ADM_VID_CHECK);
+	reg |= ADM_VID_CHECK_MASK;
+	w16(priv, ADM_VID_CHECK, reg);
+	reg = r16(priv, ADM_SYSC0);
+	reg |= ADM_NTTE;
+	reg &= ~(ADM_RVID1);
+	w16(priv, ADM_SYSC0, reg);
+	reg = r16(priv, ADM_SYSC3);
+	reg |= ADM_TBV;
+	w16(priv, ADM_SYSC3, reg);
+}
+
+static void
+adm6996_enable_vlan_6996l(struct adm6996_priv *priv)
+{
+	u16 reg;
+
+	reg = r16(priv, ADM_SYSC3);
+	reg |= ADM_TBV;
+	reg |= ADM_MAC_CLONE;
+	w16(priv, ADM_SYSC3, reg);
+}
+
+/*
+ * Disable VLANs
+ *
+ * Sets VLAN mapping for port-based VLAN with all ports connected to
+ * eachother (this is also the power-on default).
+ *
+ * Precondition: reg_mutex must be held
+ */
+static void
+adm6996_disable_vlan(struct adm6996_priv *priv)
+{
+	u16 reg;
+	int i;
+
+	for (i = 0; i < ADM_NUM_VLANS; i++) {
+		reg = ADM_VLAN_FILT_MEMBER_MASK;
+		w16(priv, ADM_VLAN_FILT_L(i), reg);
+		reg = ADM_VLAN_FILT_VALID | ADM_VLAN_FILT_VID(1);
+		w16(priv, ADM_VLAN_FILT_H(i), reg);
+	}
+
+	reg = r16(priv, ADM_OTBE_P2_PVID);
+	reg |= ADM_OTBE_MASK;
+	w16(priv, ADM_OTBE_P2_PVID, reg);
+	reg = r16(priv, ADM_IFNTE);
+	reg |= ADM_IFNTE_MASK;
+	w16(priv, ADM_IFNTE, reg);
+	reg = r16(priv, ADM_VID_CHECK);
+	reg &= ~(ADM_VID_CHECK_MASK);
+	w16(priv, ADM_VID_CHECK, reg);
+	reg = r16(priv, ADM_SYSC0);
+	reg &= ~(ADM_NTTE);
+	reg |= ADM_RVID1;
+	w16(priv, ADM_SYSC0, reg);
+	reg = r16(priv, ADM_SYSC3);
+	reg &= ~(ADM_TBV);
+	w16(priv, ADM_SYSC3, reg);
+}
+
+/*
+ * Disable VLANs
+ *
+ * Sets VLAN mapping for port-based VLAN with all ports connected to
+ * eachother (this is also the power-on default).
+ *
+ * Precondition: reg_mutex must be held
+ */
+static void
+adm6996_disable_vlan_6996l(struct adm6996_priv *priv)
+{
+	u16 reg;
+	int i;
+
+	for (i = 0; i < ADM_NUM_VLANS; i++) {
+		w16(priv, ADM_VLAN_MAP(i), 0);
+	}
+
+	reg = r16(priv, ADM_SYSC3);
+	reg &= ~(ADM_TBV);
+	reg &= ~(ADM_MAC_CLONE);
+	w16(priv, ADM_SYSC3, reg);
+}
+
+/*
+ * Precondition: reg_mutex must be held
+ */
+static void
+adm6996_apply_port_pvids(struct adm6996_priv *priv)
+{
+	u16 reg;
+	int i;
+
+	for (i = 0; i < ADM_NUM_PORTS; i++) {
+		reg = r16(priv, adm_portcfg[i]);
+		reg &= ~(ADM_PORTCFG_PVID_MASK);
+		reg |= ADM_PORTCFG_PVID(priv->pvid[i]);
+		if (priv->model == ADM6996L) {
+			if (priv->tagged_ports & (1 << i))
+				reg |= (1 << 4);
+			else
+				reg &= ~(1 << 4);
+		}
+		w16(priv, adm_portcfg[i], reg);
+	}
+
+	w16(priv, ADM_P0_PVID, ADM_P0_PVID_VAL(priv->pvid[0]));
+	w16(priv, ADM_P1_PVID, ADM_P1_PVID_VAL(priv->pvid[1]));
+	reg = r16(priv, ADM_OTBE_P2_PVID);
+	reg &= ~(ADM_P2_PVID_MASK);
+	reg |= ADM_P2_PVID_VAL(priv->pvid[2]);
+	w16(priv, ADM_OTBE_P2_PVID, reg);
+	reg = ADM_P3_PVID_VAL(priv->pvid[3]);
+	reg |= ADM_P4_PVID_VAL(priv->pvid[4]);
+	w16(priv, ADM_P3_P4_PVID, reg);
+	reg = r16(priv, ADM_P5_PVID);
+	reg &= ~(ADM_P2_PVID_MASK);
+	reg |= ADM_P5_PVID_VAL(priv->pvid[5]);
+	w16(priv, ADM_P5_PVID, reg);
+}
+
+/*
+ * Precondition: reg_mutex must be held
+ */
+static void
+adm6996_apply_vlan_filters(struct adm6996_priv *priv)
+{
+	u8 ports, tagged;
+	u16 vid, reg;
+	int i;
+
+	for (i = 0; i < ADM_NUM_VLANS; i++) {
+		vid = priv->vlan_id[i];
+		ports = priv->vlan_table[i];
+		tagged = priv->vlan_tagged[i];
+
+		if (ports == 0) {
+			/* Disable VLAN entry */
+			w16(priv, ADM_VLAN_FILT_H(i), 0);
+			w16(priv, ADM_VLAN_FILT_L(i), 0);
+			continue;
+		}
+
+		reg = ADM_VLAN_FILT_MEMBER(ports);
+		reg |= ADM_VLAN_FILT_TAGGED(tagged);
+		w16(priv, ADM_VLAN_FILT_L(i), reg);
+		reg = ADM_VLAN_FILT_VALID | ADM_VLAN_FILT_VID(vid);
+		w16(priv, ADM_VLAN_FILT_H(i), reg);
+	}
+}
+
+static void
+adm6996_apply_vlan_filters_6996l(struct adm6996_priv *priv)
+{
+	u8 ports;
+	u16 reg;
+	int i;
+
+	for (i = 0; i < ADM_NUM_VLANS; i++) {
+		ports = priv->vlan_table[i];
+
+		if (ports == 0) {
+			/* Disable VLAN entry */
+			w16(priv, ADM_VLAN_MAP(i), 0);
+			continue;
+		} else {
+			reg = ADM_VLAN_FILT(ports);
+			w16(priv, ADM_VLAN_MAP(i), reg);
+		}
+	}
+}
+
+static int
+adm6996_hw_apply(struct switch_dev *dev)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	pr_devel("hw_apply\n");
+
+	mutex_lock(&priv->reg_mutex);
+
+	if (!priv->enable_vlan) {
+		if (priv->vlan_enabled) {
+			if (priv->model == ADM6996L)
+				adm6996_disable_vlan_6996l(priv);
+			else
+				adm6996_disable_vlan(priv);
+			priv->vlan_enabled = 0;
+		}
+		goto out;
+	}
+
+	if (!priv->vlan_enabled) {
+		if (priv->model == ADM6996L)
+			adm6996_enable_vlan_6996l(priv);
+		else
+			adm6996_enable_vlan(priv);
+		priv->vlan_enabled = 1;
+	}
+
+	adm6996_apply_port_pvids(priv);
+	if (priv->model == ADM6996L)
+		adm6996_apply_vlan_filters_6996l(priv);
+	else
+		adm6996_apply_vlan_filters(priv);
+
+out:
+	mutex_unlock(&priv->reg_mutex);
+
+	return 0;
+}
+
+/*
+ * Reset the switch
+ *
+ * The ADM6996 can't do a software-initiated reset, so we just initialise the
+ * registers we support in this driver.
+ *
+ * Precondition: reg_mutex must be held
+ */
+static void
+adm6996_perform_reset (struct adm6996_priv *priv)
+{
+	int i;
+
+	/* initialize port and vlan settings */
+	for (i = 0; i < ADM_NUM_PORTS - 1; i++) {
+		w16(priv, adm_portcfg[i], ADM_PORTCFG_INIT |
+			ADM_PORTCFG_PVID(0));
+	}
+	w16(priv, adm_portcfg[5], ADM_PORTCFG_CPU);
+
+	if (priv->model == ADM6996M || priv->model == ADM6996FC) {
+		/* reset all PHY ports */
+		for (i = 0; i < ADM_PHY_PORTS; i++) {
+			w16(priv, ADM_PHY_PORT(i), ADM_PHYCFG_INIT);
+		}
+	}
+
+	priv->enable_vlan = 0;
+	priv->vlan_enabled = 0;
+
+	for (i = 0; i < ADM_NUM_PORTS; i++) {
+		priv->pvid[i] = 0;
+	}
+
+	for (i = 0; i < ADM_NUM_VLANS; i++) {
+		priv->vlan_id[i] = i;
+		priv->vlan_table[i] = 0;
+		priv->vlan_tagged[i] = 0;
+	}
+
+	if (priv->model == ADM6996M) {
+		/* Clear VLAN priority map so prio's are unused */
+		w16 (priv, ADM_VLAN_PRIOMAP, 0);
+
+		adm6996_disable_vlan(priv);
+		adm6996_apply_port_pvids(priv);
+	} else if (priv->model == ADM6996L) {
+		/* Clear VLAN priority map so prio's are unused */
+		w16 (priv, ADM_VLAN_PRIOMAP, 0);
+
+		adm6996_disable_vlan_6996l(priv);
+		adm6996_apply_port_pvids(priv);
+	}
+}
+
+static int
+adm6996_reset_switch(struct switch_dev *dev)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+
+	pr_devel("reset\n");
+
+	mutex_lock(&priv->reg_mutex);
+	adm6996_perform_reset (priv);
+	mutex_unlock(&priv->reg_mutex);
+	return 0;
+}
+
+static int
+adm6996_get_port_link(struct switch_dev *dev, int port,
+		struct switch_port_link *link)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+	
+	u16 reg = 0;
+	
+	if (port >= ADM_NUM_PORTS)
+		return -EINVAL;
+	
+	switch (port) {
+	case 0:
+		reg = r16(priv, ADM_PS0);
+		break;
+	case 1:
+		reg = r16(priv, ADM_PS0);
+		reg = reg >> 8;
+		break;
+	case 2:
+		reg = r16(priv, ADM_PS1);
+		break;
+	case 3:
+		reg = r16(priv, ADM_PS1);
+		reg = reg >> 8;
+		break;
+	case 4:
+		reg = r16(priv, ADM_PS1);
+		reg = reg >> 12;
+		break;
+	case 5:
+		reg = r16(priv, ADM_PS2);
+		/* Bits 0, 1, 3 and 4. */
+		reg = (reg & 3) | ((reg & 24) >> 1);
+		break;
+	default:
+		return -EINVAL;
+	}
+	
+	link->link = reg & ADM_PS_LS;
+	if (!link->link)
+		return 0;
+	link->aneg = true;
+	link->duplex = reg & ADM_PS_DS;
+	link->tx_flow = reg & ADM_PS_FCS;
+	link->rx_flow = reg & ADM_PS_FCS;
+	if (reg & ADM_PS_SS)
+		link->speed = SWITCH_PORT_SPEED_100;
+	else
+		link->speed = SWITCH_PORT_SPEED_10;
+
+	return 0;
+}
+
+static int
+adm6996_sw_get_port_mib(struct switch_dev *dev,
+		       const struct switch_attr *attr,
+		       struct switch_val *val)
+{
+	struct adm6996_priv *priv = to_adm(dev);
+	int port;
+	char *buf = priv->buf;
+	int i, len = 0;
+	u32 reg = 0;
+
+	port = val->port_vlan;
+	if (port >= ADM_NUM_PORTS)
+		return -EINVAL;
+
+	mutex_lock(&priv->mib_lock);
+
+	len += snprintf(buf + len, sizeof(priv->buf) - len,
+			"Port %d MIB counters\n",
+			port);
+
+	for (i = 0; i < ARRAY_SIZE(adm6996_mibs); i++) {
+		reg = r16(priv, adm6996_mibs[i].offset + ADM_OFFSET_PORT(port));
+		reg += r16(priv, adm6996_mibs[i].offset + ADM_OFFSET_PORT(port) + 1) << 16;
+		len += snprintf(buf + len, sizeof(priv->buf) - len,
+				"%-12s: %lu\n",
+				adm6996_mibs[i].name,
+				reg);
+	}
+
+	mutex_unlock(&priv->mib_lock);
+
+	val->value.s = buf;
+	val->len = len;
+
+	return 0;
+}
+
+static struct switch_attr adm6996_globals[] = {
+	{
+	 .type = SWITCH_TYPE_INT,
+	 .name = "enable_vlan",
+	 .description = "Enable VLANs",
+	 .set = adm6996_set_enable_vlan,
+	 .get = adm6996_get_enable_vlan,
+	},
+#ifdef DEBUG
+	{
+	 .type = SWITCH_TYPE_INT,
+	 .name = "addr",
+	 .description =
+	 "Direct register access: set register address (0 - 1023)",
+	 .set = adm6996_set_addr,
+	 .get = adm6996_get_addr,
+	 },
+	{
+	 .type = SWITCH_TYPE_INT,
+	 .name = "data",
+	 .description =
+	 "Direct register access: read/write to register (0 - 65535)",
+	 .set = adm6996_set_data,
+	 .get = adm6996_get_data,
+	 },
+#endif /* def DEBUG */
+};
+
+static struct switch_attr adm6996_port[] = {
+	{
+	 .type = SWITCH_TYPE_STRING,
+	 .name = "mib",
+	 .description = "Get port's MIB counters",
+	 .set = NULL,
+	 .get = adm6996_sw_get_port_mib,
+	},
+};
+
+static struct switch_attr adm6996_vlan[] = {
+	{
+	 .type = SWITCH_TYPE_INT,
+	 .name = "vid",
+	 .description = "VLAN ID",
+	 .set = adm6996_set_vid,
+	 .get = adm6996_get_vid,
+	 },
+};
+
+static struct switch_dev_ops adm6996_ops = {
+	.attr_global = {
+			.attr = adm6996_globals,
+			.n_attr = ARRAY_SIZE(adm6996_globals),
+			},
+	.attr_port = {
+		      .attr = adm6996_port,
+		      .n_attr = ARRAY_SIZE(adm6996_port),
+		      },
+	.attr_vlan = {
+		      .attr = adm6996_vlan,
+		      .n_attr = ARRAY_SIZE(adm6996_vlan),
+		      },
+	.get_port_pvid = adm6996_get_pvid,
+	.set_port_pvid = adm6996_set_pvid,
+	.get_vlan_ports = adm6996_get_ports,
+	.set_vlan_ports = adm6996_set_ports,
+	.apply_config = adm6996_hw_apply,
+	.reset_switch = adm6996_reset_switch,
+	.get_port_link = adm6996_get_port_link,
+};
+
+static int adm6996_switch_init(struct adm6996_priv *priv, const char *alias, struct net_device *netdev)
+{
+	struct switch_dev *swdev;
+	u16 test, old;
+
+	if (!priv->model) {
+		/* Detect type of chip */
+		old = r16(priv, ADM_VID_CHECK);
+		test = old ^ (1 << 12);
+		w16(priv, ADM_VID_CHECK, test);
+		test ^= r16(priv, ADM_VID_CHECK);
+		if (test & (1 << 12)) {
+			/* 
+			 * Bit 12 of this register is read-only. 
+			 * This is the FC model. 
+			 */
+			priv->model = ADM6996FC;
+		} else {
+			/* Bit 12 is read-write. This is the M model. */
+			priv->model = ADM6996M;
+			w16(priv, ADM_VID_CHECK, old);
+		}
+	}
+
+	swdev = &priv->dev;
+	swdev->name = (adm6996_model_name[priv->model]);
+	swdev->cpu_port = ADM_CPU_PORT;
+	swdev->ports = ADM_NUM_PORTS;
+	swdev->vlans = ADM_NUM_VLANS;
+	swdev->ops = &adm6996_ops;
+	swdev->alias = alias;
+
+	/* The ADM6996L connected through GPIOs does not support any switch
+	   status calls */
+	if (priv->model == ADM6996L) {
+		adm6996_ops.attr_port.n_attr = 0;
+		adm6996_ops.get_port_link = NULL;
+	}
+
+	pr_info ("%s: %s model PHY found.\n", alias, swdev->name);
+
+	mutex_lock(&priv->reg_mutex);
+	adm6996_perform_reset (priv);
+	mutex_unlock(&priv->reg_mutex);
+
+	if (priv->model == ADM6996M || priv->model == ADM6996L) {
+		return register_switch(swdev, netdev);
+	}
+
+	return -ENODEV;
+}
+
+static int adm6996_config_init(struct phy_device *pdev)
+{
+	struct adm6996_priv *priv;
+	int ret;
+
+	pdev->supported = ADVERTISED_100baseT_Full;
+	pdev->advertising = ADVERTISED_100baseT_Full;
+
+	if (pdev->addr != 0) {
+		pr_info ("%s: PHY overlaps ADM6996, providing fixed PHY 0x%x.\n"
+				, pdev->attached_dev->name, pdev->addr);
+		return 0;
+	}
+
+	priv = devm_kzalloc(&pdev->dev, sizeof(struct adm6996_priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	mutex_init(&priv->reg_mutex);
+	mutex_init(&priv->mib_lock);
+	priv->priv = pdev;
+	priv->read = adm6996_read_mii_reg;
+	priv->write = adm6996_write_mii_reg;
+
+	ret = adm6996_switch_init(priv, pdev->attached_dev->name, pdev->attached_dev);
+	if (ret < 0)
+		return ret;
+
+	pdev->priv = priv;
+
+	return 0;
+}
+
+/*
+ * Warning: phydev->priv is NULL if phydev->addr != 0
+ */
+static int adm6996_read_status(struct phy_device *phydev)
+{
+	phydev->speed = SPEED_100;
+	phydev->duplex = DUPLEX_FULL;
+	phydev->link = 1;
+	return 0;
+}
+
+/*
+ * Warning: phydev->priv is NULL if phydev->addr != 0
+ */
+static int adm6996_config_aneg(struct phy_device *phydev)
+{
+	return 0;
+}
+
+static int adm6996_fixup(struct phy_device *dev)
+{
+	struct mii_bus *bus = dev->bus;
+	u16 reg;
+
+	/* Our custom registers are at PHY addresses 0-10. Claim those. */
+	if (dev->addr > 10)
+		return 0;
+
+	/* look for the switch on the bus */
+	reg = bus->read(bus, PHYADDR(ADM_SIG0)) & ADM_SIG0_MASK;
+	if (reg != ADM_SIG0_VAL)
+		return 0;
+
+	reg = bus->read(bus, PHYADDR(ADM_SIG1)) & ADM_SIG1_MASK;
+	if (reg != ADM_SIG1_VAL)
+		return 0;
+
+	dev->phy_id = (ADM_SIG0_VAL << 16) | ADM_SIG1_VAL;
+
+	return 0;
+}
+
+static int adm6996_probe(struct phy_device *pdev)
+{
+	return 0;
+}
+
+static void adm6996_remove(struct phy_device *pdev)
+{
+	struct adm6996_priv *priv = phy_to_adm(pdev);
+
+	if (priv && (priv->model == ADM6996M || priv->model == ADM6996L))
+		unregister_switch(&priv->dev);
+}
+
+
+static struct phy_driver adm6996_phy_driver = {
+	.name		= "Infineon ADM6996",
+	.phy_id		= (ADM_SIG0_VAL << 16) | ADM_SIG1_VAL,
+	.phy_id_mask	= 0xffffffff,
+	.features	= PHY_BASIC_FEATURES,
+	.probe		= adm6996_probe,
+	.remove		= adm6996_remove,
+	.config_init	= &adm6996_config_init,
+	.config_aneg	= &adm6996_config_aneg,
+	.read_status	= &adm6996_read_status,
+	.driver		= { .owner = THIS_MODULE,},
+};
+
+static int adm6996_gpio_probe(struct platform_device *pdev)
+{
+	struct adm6996_gpio_platform_data *pdata = pdev->dev.platform_data;
+	struct adm6996_priv *priv;
+	int ret;
+
+	if (!pdata)
+		return -EINVAL;
+				  
+	priv = devm_kzalloc(&pdev->dev, sizeof(struct adm6996_priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	mutex_init(&priv->reg_mutex);
+	mutex_init(&priv->mib_lock);
+
+	priv->eecs = pdata->eecs;
+	priv->eedi = pdata->eedi;
+	priv->eerc = pdata->eerc;
+	priv->eesk = pdata->eesk;
+
+	priv->model = pdata->model;
+	priv->read = adm6996_read_gpio_reg;
+	priv->write = adm6996_write_gpio_reg;
+
+	ret = devm_gpio_request(&pdev->dev, priv->eecs, "adm_eecs");
+	if (ret)
+		return ret;
+	ret = devm_gpio_request(&pdev->dev, priv->eedi, "adm_eedi");
+	if (ret)
+		return ret;
+	ret = devm_gpio_request(&pdev->dev, priv->eerc, "adm_eerc");
+	if (ret)
+		return ret;
+	ret = devm_gpio_request(&pdev->dev, priv->eesk, "adm_eesk");
+	if (ret)
+		return ret;
+
+	ret = adm6996_switch_init(priv, dev_name(&pdev->dev), NULL);
+	if (ret < 0)
+		return ret;
+
+	platform_set_drvdata(pdev, priv);
+
+	return 0;
+}
+
+static int adm6996_gpio_remove(struct platform_device *pdev)
+{
+	struct adm6996_priv *priv = platform_get_drvdata(pdev);
+
+	if (priv && (priv->model == ADM6996M || priv->model == ADM6996L))
+		unregister_switch(&priv->dev);
+
+	return 0;
+}
+
+static struct platform_driver adm6996_gpio_driver = {
+	.probe = adm6996_gpio_probe,
+	.remove = adm6996_gpio_remove,
+	.driver = {
+		.name = "adm6996_gpio",
+	},
+};
+
+static int __init adm6996_init(void)
+{
+	int err;
+
+	phy_register_fixup_for_id(PHY_ANY_ID, adm6996_fixup);
+	err =  phy_driver_register(&adm6996_phy_driver);
+	if (err)
+		return err;
+
+	err = platform_driver_register(&adm6996_gpio_driver);
+	if (err)
+		phy_driver_unregister(&adm6996_phy_driver);
+
+	return err;
+}
+
+static void __exit adm6996_exit(void)
+{
+	platform_driver_unregister(&adm6996_gpio_driver);
+	phy_driver_unregister(&adm6996_phy_driver);
+}
+
+module_init(adm6996_init);
+module_exit(adm6996_exit);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/adm6996.h b/trunk/target/linux/generic/files/drivers/net/phy/adm6996.h
new file mode 100644
index 00000000..66c77a09
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/adm6996.h
@@ -0,0 +1,186 @@
+/*
+ * ADM6996 switch driver
+ *
+ * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (c) 2010,2011 Peter Lebbing <peter@digitalbrains.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+#ifndef __ADM6996_H
+#define __ADM6996_H
+
+/*
+ * ADM_PHY_PORTS: Number of ports with a PHY.
+ * We only control ports 0 to 3, because if 4 is connected, it is most likely
+ * not connected to the switch but to a separate MII and MAC for the WAN port.
+ */
+#define ADM_PHY_PORTS	4
+#define ADM_NUM_PORTS	6
+#define ADM_CPU_PORT	5
+
+#define ADM_NUM_VLANS 16
+#define ADM_VLAN_MAX_ID 4094
+
+enum admreg {
+	ADM_EEPROM_BASE		= 0x0,
+		ADM_P0_CFG		= ADM_EEPROM_BASE + 1,
+		ADM_P1_CFG		= ADM_EEPROM_BASE + 3,
+		ADM_P2_CFG		= ADM_EEPROM_BASE + 5,
+		ADM_P3_CFG		= ADM_EEPROM_BASE + 7,
+		ADM_P4_CFG		= ADM_EEPROM_BASE + 8,
+		ADM_P5_CFG		= ADM_EEPROM_BASE + 9,
+		ADM_SYSC0		= ADM_EEPROM_BASE + 0xa,
+		ADM_VLAN_PRIOMAP	= ADM_EEPROM_BASE + 0xe,
+		ADM_SYSC3		= ADM_EEPROM_BASE + 0x11,
+		/* Input Force No Tag Enable */
+		ADM_IFNTE		= ADM_EEPROM_BASE + 0x20,
+		ADM_VID_CHECK		= ADM_EEPROM_BASE + 0x26,
+		ADM_P0_PVID		= ADM_EEPROM_BASE + 0x28,
+		ADM_P1_PVID		= ADM_EEPROM_BASE + 0x29,
+		/* Output Tag Bypass Enable and P2 PVID */
+		ADM_OTBE_P2_PVID	= ADM_EEPROM_BASE + 0x2a,
+		ADM_P3_P4_PVID		= ADM_EEPROM_BASE + 0x2b,
+		ADM_P5_PVID		= ADM_EEPROM_BASE + 0x2c,
+	ADM_EEPROM_EXT_BASE	= 0x40,
+#define ADM_VLAN_FILT_L(n) (ADM_EEPROM_EXT_BASE + 2 * (n))
+#define ADM_VLAN_FILT_H(n) (ADM_EEPROM_EXT_BASE + 1 + 2 * (n))
+#define ADM_VLAN_MAP(n) (ADM_EEPROM_BASE + 0x13 + n)
+	ADM_COUNTER_BASE	= 0xa0,
+		ADM_SIG0		= ADM_COUNTER_BASE + 0,
+		ADM_SIG1		= ADM_COUNTER_BASE + 1,
+		ADM_PS0		= ADM_COUNTER_BASE + 2,
+		ADM_PS1		= ADM_COUNTER_BASE + 3,
+		ADM_PS2		= ADM_COUNTER_BASE + 4,
+		ADM_CL0		= ADM_COUNTER_BASE + 8, /* RxPacket */
+		ADM_CL6		= ADM_COUNTER_BASE + 0x1a, /* RxByte */
+		ADM_CL12		= ADM_COUNTER_BASE + 0x2c, /* TxPacket */
+		ADM_CL18		= ADM_COUNTER_BASE + 0x3e, /* TxByte */
+		ADM_CL24		= ADM_COUNTER_BASE + 0x50, /* Coll */
+		ADM_CL30		= ADM_COUNTER_BASE + 0x62, /* Err */
+#define ADM_OFFSET_PORT(n) ((n * 4) - (n / 4) * 2 - (n / 5) * 2)
+	ADM_PHY_BASE		= 0x200,
+#define ADM_PHY_PORT(n) (ADM_PHY_BASE + (0x20 * n))
+};
+
+/* Chip identification patterns */
+#define	ADM_SIG0_MASK	0xffff
+#define ADM_SIG0_VAL	0x1023
+#define ADM_SIG1_MASK	0xffff
+#define ADM_SIG1_VAL	0x0007
+
+enum {
+	ADM_PHYCFG_COLTST     = (1 << 7),	/* Enable collision test */
+	ADM_PHYCFG_DPLX       = (1 << 8),	/* Enable full duplex */
+	ADM_PHYCFG_ANEN_RST   = (1 << 9),	/* Restart auto negotiation (self clear) */
+	ADM_PHYCFG_ISO        = (1 << 10),	/* Isolate PHY */
+	ADM_PHYCFG_PDN        = (1 << 11),	/* Power down PHY */
+	ADM_PHYCFG_ANEN       = (1 << 12),	/* Enable auto negotiation */
+	ADM_PHYCFG_SPEED_100  = (1 << 13),	/* Enable 100 Mbit/s */
+	ADM_PHYCFG_LPBK       = (1 << 14),	/* Enable loopback operation */
+	ADM_PHYCFG_RST        = (1 << 15),	/* Reset the port (self clear) */
+	ADM_PHYCFG_INIT = (
+		ADM_PHYCFG_RST |
+		ADM_PHYCFG_SPEED_100 |
+		ADM_PHYCFG_ANEN |
+		ADM_PHYCFG_ANEN_RST
+	)
+};
+
+enum {
+	ADM_PORTCFG_FC        = (1 << 0),	/* Enable 802.x flow control */
+	ADM_PORTCFG_AN        = (1 << 1),	/* Enable auto-negotiation */
+	ADM_PORTCFG_SPEED_100 = (1 << 2),	/* Enable 100 Mbit/s */
+	ADM_PORTCFG_DPLX      = (1 << 3),	/* Enable full duplex */
+	ADM_PORTCFG_OT        = (1 << 4),	/* Output tagged packets */
+	ADM_PORTCFG_PD        = (1 << 5),	/* Port disable */
+	ADM_PORTCFG_TV_PRIO   = (1 << 6),	/* 0 = VLAN based priority
+	                                 	 * 1 = TOS based priority */
+	ADM_PORTCFG_PPE       = (1 << 7),	/* Port based priority enable */
+	ADM_PORTCFG_PP_S      = (1 << 8),	/* Port based priority, 2 bits */
+	ADM_PORTCFG_PVID_BASE = (1 << 10),	/* Primary VLAN id, 4 bits */
+	ADM_PORTCFG_FSE	      = (1 << 14),	/* Fx select enable */
+	ADM_PORTCFG_CAM       = (1 << 15),	/* Crossover Auto MDIX */
+
+	ADM_PORTCFG_INIT = (
+		ADM_PORTCFG_FC |
+		ADM_PORTCFG_AN |
+		ADM_PORTCFG_SPEED_100 |
+		ADM_PORTCFG_DPLX |
+		ADM_PORTCFG_CAM
+	),
+	ADM_PORTCFG_CPU = (
+		ADM_PORTCFG_FC |
+		ADM_PORTCFG_SPEED_100 |
+		ADM_PORTCFG_OT |
+		ADM_PORTCFG_DPLX
+	),
+};
+
+#define ADM_PORTCFG_PPID(n) ((n & 0x3) << 8)
+#define ADM_PORTCFG_PVID(n) ((n & 0xf) << 10)
+#define ADM_PORTCFG_PVID_MASK (0xf << 10)
+
+#define ADM_IFNTE_MASK (0x3f << 9)
+#define ADM_VID_CHECK_MASK (0x3f << 6)
+
+#define ADM_P0_PVID_VAL(n) ((((n) & 0xff0) >> 4) << 0)
+#define ADM_P1_PVID_VAL(n) ((((n) & 0xff0) >> 4) << 0)
+#define ADM_P2_PVID_VAL(n) ((((n) & 0xff0) >> 4) << 0)
+#define ADM_P3_PVID_VAL(n) ((((n) & 0xff0) >> 4) << 0)
+#define ADM_P4_PVID_VAL(n) ((((n) & 0xff0) >> 4) << 8)
+#define ADM_P5_PVID_VAL(n) ((((n) & 0xff0) >> 4) << 0)
+#define ADM_P2_PVID_MASK 0xff
+
+#define ADM_OTBE(n) (((n) & 0x3f) << 8)
+#define ADM_OTBE_MASK (0x3f << 8)
+
+/* ADM_SYSC0 */
+enum {
+	ADM_NTTE	= (1 << 2),	/* New Tag Transmit Enable */
+	ADM_RVID1	= (1 << 8)	/* Replace VLAN ID 1 */
+};
+
+/* Tag Based VLAN in ADM_SYSC3 */
+#define ADM_MAC_CLONE	BIT(4)
+#define ADM_TBV		BIT(5)
+
+static const u8 adm_portcfg[] = {
+	[0] = ADM_P0_CFG,
+	[1] = ADM_P1_CFG,
+	[2] = ADM_P2_CFG,
+	[3] = ADM_P3_CFG,
+	[4] = ADM_P4_CFG,
+	[5] = ADM_P5_CFG,
+};
+
+/* Fields in ADM_VLAN_FILT_L(x) */
+#define ADM_VLAN_FILT_FID(n) (((n) & 0xf) << 12)
+#define ADM_VLAN_FILT_TAGGED(n) (((n) & 0x3f) << 6)
+#define ADM_VLAN_FILT_MEMBER(n) (((n) & 0x3f) << 0)
+#define ADM_VLAN_FILT_MEMBER_MASK 0x3f
+/* Fields in ADM_VLAN_FILT_H(x) */
+#define ADM_VLAN_FILT_VALID (1 << 15)
+#define ADM_VLAN_FILT_VID(n) (((n) & 0xfff) << 0)
+
+/* Convert ports to a form for ADM6996L VLAN map */
+#define ADM_VLAN_FILT(ports) ((ports & 0x01) | ((ports & 0x02) << 1) | \
+			((ports & 0x04) << 2) | ((ports & 0x08) << 3) | \
+			((ports & 0x10) << 3) | ((ports & 0x20) << 3))
+
+/* Port status register */
+enum {
+	ADM_PS_LS = (1 << 0),	/* Link status */
+	ADM_PS_SS = (1 << 1),	/* Speed status */
+	ADM_PS_DS = (1 << 2),	/* Duplex status */
+	ADM_PS_FCS = (1 << 3)	/* Flow control status */
+};
+
+/*
+ * Split the register address in phy id and register
+ * it will get combined again by the mdio bus op
+ */
+#define PHYADDR(_reg)	((_reg >> 5) & 0xff), (_reg & 0x1f)
+
+#endif
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/ar8216.c b/trunk/target/linux/generic/files/drivers/net/phy/ar8216.c
new file mode 100644
index 00000000..558b9f77
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -0,0 +1,3101 @@
+/*
+ * ar8216.c: AR8216 switch driver
+ *
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#include <linux/if.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/netlink.h>
+#include <linux/bitops.h>
+#include <net/genetlink.h>
+#include <linux/switch.h>
+#include <linux/delay.h>
+#include <linux/phy.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/lockdep.h>
+#include <linux/ar8216_platform.h>
+#include <linux/workqueue.h>
+#include <linux/of_device.h>
+#include <linux/leds.h>
+#include <linux/gpio.h>
+#include <linux/version.h>
+
+#include "ar8216.h"
+
+/* size of the vlan table */
+#define AR8X16_MAX_VLANS	128
+#define AR8X16_PROBE_RETRIES	10
+#define AR8X16_MAX_PORTS	8
+
+#define AR8XXX_MIB_WORK_DELAY	2000 /* msecs */
+
+struct ar8xxx_priv;
+
+#define AR8XXX_CAP_GIGE			BIT(0)
+#define AR8XXX_CAP_MIB_COUNTERS		BIT(1)
+
+#define AR8XXX_NUM_PHYS 	5
+
+static void ar8216_set_mirror_regs(struct ar8xxx_priv *priv);
+static void ar8327_set_mirror_regs(struct ar8xxx_priv *priv);
+
+enum {
+	AR8XXX_VER_AR8216 = 0x01,
+	AR8XXX_VER_AR8236 = 0x03,
+	AR8XXX_VER_AR8316 = 0x10,
+	AR8XXX_VER_AR8327 = 0x12,
+	AR8XXX_VER_AR8337 = 0x13,
+};
+
+struct ar8xxx_mib_desc {
+	unsigned int size;
+	unsigned int offset;
+	const char *name;
+};
+
+struct ar8xxx_chip {
+	unsigned long caps;
+	bool config_at_probe;
+	bool mii_lo_first;
+
+	/* parameters to calculate REG_PORT_STATS_BASE */
+	unsigned reg_port_stats_start;
+	unsigned reg_port_stats_length;
+
+	int (*hw_init)(struct ar8xxx_priv *priv);
+	void (*cleanup)(struct ar8xxx_priv *priv);
+
+	void (*init_globals)(struct ar8xxx_priv *priv);
+	void (*init_port)(struct ar8xxx_priv *priv, int port);
+	void (*setup_port)(struct ar8xxx_priv *priv, int port, u32 members);
+	u32 (*read_port_status)(struct ar8xxx_priv *priv, int port);
+	int (*atu_flush)(struct ar8xxx_priv *priv);
+	void (*vtu_flush)(struct ar8xxx_priv *priv);
+	void (*vtu_load_vlan)(struct ar8xxx_priv *priv, u32 vid, u32 port_mask);
+	void (*phy_fixup)(struct ar8xxx_priv *priv, int phy);
+	void (*set_mirror_regs)(struct ar8xxx_priv *priv);
+
+	const struct ar8xxx_mib_desc *mib_decs;
+	unsigned num_mibs;
+	unsigned mib_func;
+};
+
+enum ar8327_led_pattern {
+	AR8327_LED_PATTERN_OFF = 0,
+	AR8327_LED_PATTERN_BLINK,
+	AR8327_LED_PATTERN_ON,
+	AR8327_LED_PATTERN_RULE,
+};
+
+struct ar8327_led_entry {
+	unsigned reg;
+	unsigned shift;
+};
+
+struct ar8327_led {
+	struct led_classdev cdev;
+	struct ar8xxx_priv *sw_priv;
+
+	char *name;
+	bool active_low;
+	u8 led_num;
+	enum ar8327_led_mode mode;
+
+	struct mutex mutex;
+	spinlock_t lock;
+	struct work_struct led_work;
+	bool enable_hw_mode;
+	enum ar8327_led_pattern pattern;
+};
+
+struct ar8327_data {
+	u32 port0_status;
+	u32 port6_status;
+
+	struct ar8327_led **leds;
+	unsigned int num_leds;
+};
+
+struct ar8xxx_priv {
+	struct switch_dev dev;
+	struct mii_bus *mii_bus;
+	struct phy_device *phy;
+
+	u32 (*read)(struct ar8xxx_priv *priv, int reg);
+	void (*write)(struct ar8xxx_priv *priv, int reg, u32 val);
+	u32 (*rmw)(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val);
+
+	int (*get_port_link)(unsigned port);
+
+	const struct net_device_ops *ndo_old;
+	struct net_device_ops ndo;
+	struct mutex reg_mutex;
+	u8 chip_ver;
+	u8 chip_rev;
+	const struct ar8xxx_chip *chip;
+	void *chip_data;
+	bool initialized;
+	bool port4_phy;
+	char buf[2048];
+
+	bool init;
+
+	struct mutex mib_lock;
+	struct delayed_work mib_work;
+	int mib_next_port;
+	u64 *mib_stats;
+
+	struct list_head list;
+	unsigned int use_count;
+
+	/* all fields below are cleared on reset */
+	bool vlan;
+	u16 vlan_id[AR8X16_MAX_VLANS];
+	u8 vlan_table[AR8X16_MAX_VLANS];
+	u8 vlan_tagged;
+	u16 pvid[AR8X16_MAX_PORTS];
+
+	/* mirroring */
+	bool mirror_rx;
+	bool mirror_tx;
+	int source_port;
+	int monitor_port;
+};
+
+#define MIB_DESC(_s , _o, _n)	\
+	{			\
+		.size = (_s),	\
+		.offset = (_o),	\
+		.name = (_n),	\
+	}
+
+static const struct ar8xxx_mib_desc ar8216_mibs[] = {
+	MIB_DESC(1, AR8216_STATS_RXBROAD, "RxBroad"),
+	MIB_DESC(1, AR8216_STATS_RXPAUSE, "RxPause"),
+	MIB_DESC(1, AR8216_STATS_RXMULTI, "RxMulti"),
+	MIB_DESC(1, AR8216_STATS_RXFCSERR, "RxFcsErr"),
+	MIB_DESC(1, AR8216_STATS_RXALIGNERR, "RxAlignErr"),
+	MIB_DESC(1, AR8216_STATS_RXRUNT, "RxRunt"),
+	MIB_DESC(1, AR8216_STATS_RXFRAGMENT, "RxFragment"),
+	MIB_DESC(1, AR8216_STATS_RX64BYTE, "Rx64Byte"),
+	MIB_DESC(1, AR8216_STATS_RX128BYTE, "Rx128Byte"),
+	MIB_DESC(1, AR8216_STATS_RX256BYTE, "Rx256Byte"),
+	MIB_DESC(1, AR8216_STATS_RX512BYTE, "Rx512Byte"),
+	MIB_DESC(1, AR8216_STATS_RX1024BYTE, "Rx1024Byte"),
+	MIB_DESC(1, AR8216_STATS_RXMAXBYTE, "RxMaxByte"),
+	MIB_DESC(1, AR8216_STATS_RXTOOLONG, "RxTooLong"),
+	MIB_DESC(2, AR8216_STATS_RXGOODBYTE, "RxGoodByte"),
+	MIB_DESC(2, AR8216_STATS_RXBADBYTE, "RxBadByte"),
+	MIB_DESC(1, AR8216_STATS_RXOVERFLOW, "RxOverFlow"),
+	MIB_DESC(1, AR8216_STATS_FILTERED, "Filtered"),
+	MIB_DESC(1, AR8216_STATS_TXBROAD, "TxBroad"),
+	MIB_DESC(1, AR8216_STATS_TXPAUSE, "TxPause"),
+	MIB_DESC(1, AR8216_STATS_TXMULTI, "TxMulti"),
+	MIB_DESC(1, AR8216_STATS_TXUNDERRUN, "TxUnderRun"),
+	MIB_DESC(1, AR8216_STATS_TX64BYTE, "Tx64Byte"),
+	MIB_DESC(1, AR8216_STATS_TX128BYTE, "Tx128Byte"),
+	MIB_DESC(1, AR8216_STATS_TX256BYTE, "Tx256Byte"),
+	MIB_DESC(1, AR8216_STATS_TX512BYTE, "Tx512Byte"),
+	MIB_DESC(1, AR8216_STATS_TX1024BYTE, "Tx1024Byte"),
+	MIB_DESC(1, AR8216_STATS_TXMAXBYTE, "TxMaxByte"),
+	MIB_DESC(1, AR8216_STATS_TXOVERSIZE, "TxOverSize"),
+	MIB_DESC(2, AR8216_STATS_TXBYTE, "TxByte"),
+	MIB_DESC(1, AR8216_STATS_TXCOLLISION, "TxCollision"),
+	MIB_DESC(1, AR8216_STATS_TXABORTCOL, "TxAbortCol"),
+	MIB_DESC(1, AR8216_STATS_TXMULTICOL, "TxMultiCol"),
+	MIB_DESC(1, AR8216_STATS_TXSINGLECOL, "TxSingleCol"),
+	MIB_DESC(1, AR8216_STATS_TXEXCDEFER, "TxExcDefer"),
+	MIB_DESC(1, AR8216_STATS_TXDEFER, "TxDefer"),
+	MIB_DESC(1, AR8216_STATS_TXLATECOL, "TxLateCol"),
+};
+
+static const struct ar8xxx_mib_desc ar8236_mibs[] = {
+	MIB_DESC(1, AR8236_STATS_RXBROAD, "RxBroad"),
+	MIB_DESC(1, AR8236_STATS_RXPAUSE, "RxPause"),
+	MIB_DESC(1, AR8236_STATS_RXMULTI, "RxMulti"),
+	MIB_DESC(1, AR8236_STATS_RXFCSERR, "RxFcsErr"),
+	MIB_DESC(1, AR8236_STATS_RXALIGNERR, "RxAlignErr"),
+	MIB_DESC(1, AR8236_STATS_RXRUNT, "RxRunt"),
+	MIB_DESC(1, AR8236_STATS_RXFRAGMENT, "RxFragment"),
+	MIB_DESC(1, AR8236_STATS_RX64BYTE, "Rx64Byte"),
+	MIB_DESC(1, AR8236_STATS_RX128BYTE, "Rx128Byte"),
+	MIB_DESC(1, AR8236_STATS_RX256BYTE, "Rx256Byte"),
+	MIB_DESC(1, AR8236_STATS_RX512BYTE, "Rx512Byte"),
+	MIB_DESC(1, AR8236_STATS_RX1024BYTE, "Rx1024Byte"),
+	MIB_DESC(1, AR8236_STATS_RX1518BYTE, "Rx1518Byte"),
+	MIB_DESC(1, AR8236_STATS_RXMAXBYTE, "RxMaxByte"),
+	MIB_DESC(1, AR8236_STATS_RXTOOLONG, "RxTooLong"),
+	MIB_DESC(2, AR8236_STATS_RXGOODBYTE, "RxGoodByte"),
+	MIB_DESC(2, AR8236_STATS_RXBADBYTE, "RxBadByte"),
+	MIB_DESC(1, AR8236_STATS_RXOVERFLOW, "RxOverFlow"),
+	MIB_DESC(1, AR8236_STATS_FILTERED, "Filtered"),
+	MIB_DESC(1, AR8236_STATS_TXBROAD, "TxBroad"),
+	MIB_DESC(1, AR8236_STATS_TXPAUSE, "TxPause"),
+	MIB_DESC(1, AR8236_STATS_TXMULTI, "TxMulti"),
+	MIB_DESC(1, AR8236_STATS_TXUNDERRUN, "TxUnderRun"),
+	MIB_DESC(1, AR8236_STATS_TX64BYTE, "Tx64Byte"),
+	MIB_DESC(1, AR8236_STATS_TX128BYTE, "Tx128Byte"),
+	MIB_DESC(1, AR8236_STATS_TX256BYTE, "Tx256Byte"),
+	MIB_DESC(1, AR8236_STATS_TX512BYTE, "Tx512Byte"),
+	MIB_DESC(1, AR8236_STATS_TX1024BYTE, "Tx1024Byte"),
+	MIB_DESC(1, AR8236_STATS_TX1518BYTE, "Tx1518Byte"),
+	MIB_DESC(1, AR8236_STATS_TXMAXBYTE, "TxMaxByte"),
+	MIB_DESC(1, AR8236_STATS_TXOVERSIZE, "TxOverSize"),
+	MIB_DESC(2, AR8236_STATS_TXBYTE, "TxByte"),
+	MIB_DESC(1, AR8236_STATS_TXCOLLISION, "TxCollision"),
+	MIB_DESC(1, AR8236_STATS_TXABORTCOL, "TxAbortCol"),
+	MIB_DESC(1, AR8236_STATS_TXMULTICOL, "TxMultiCol"),
+	MIB_DESC(1, AR8236_STATS_TXSINGLECOL, "TxSingleCol"),
+	MIB_DESC(1, AR8236_STATS_TXEXCDEFER, "TxExcDefer"),
+	MIB_DESC(1, AR8236_STATS_TXDEFER, "TxDefer"),
+	MIB_DESC(1, AR8236_STATS_TXLATECOL, "TxLateCol"),
+};
+
+static DEFINE_MUTEX(ar8xxx_dev_list_lock);
+static LIST_HEAD(ar8xxx_dev_list);
+
+static inline struct ar8xxx_priv *
+swdev_to_ar8xxx(struct switch_dev *swdev)
+{
+	return container_of(swdev, struct ar8xxx_priv, dev);
+}
+
+static inline bool ar8xxx_has_gige(struct ar8xxx_priv *priv)
+{
+	return priv->chip->caps & AR8XXX_CAP_GIGE;
+}
+
+static inline bool ar8xxx_has_mib_counters(struct ar8xxx_priv *priv)
+{
+	return priv->chip->caps & AR8XXX_CAP_MIB_COUNTERS;
+}
+
+static inline bool chip_is_ar8216(struct ar8xxx_priv *priv)
+{
+	return priv->chip_ver == AR8XXX_VER_AR8216;
+}
+
+static inline bool chip_is_ar8236(struct ar8xxx_priv *priv)
+{
+	return priv->chip_ver == AR8XXX_VER_AR8236;
+}
+
+static inline bool chip_is_ar8316(struct ar8xxx_priv *priv)
+{
+	return priv->chip_ver == AR8XXX_VER_AR8316;
+}
+
+static inline bool chip_is_ar8327(struct ar8xxx_priv *priv)
+{
+	return priv->chip_ver == AR8XXX_VER_AR8327;
+}
+
+static inline bool chip_is_ar8337(struct ar8xxx_priv *priv)
+{
+	return priv->chip_ver == AR8XXX_VER_AR8337;
+}
+
+static inline void
+split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
+{
+	regaddr >>= 1;
+	*r1 = regaddr & 0x1e;
+
+	regaddr >>= 5;
+	*r2 = regaddr & 0x7;
+
+	regaddr >>= 3;
+	*page = regaddr & 0x1ff;
+}
+
+/* inspired by phy_poll_reset in drivers/net/phy/phy_device.c */
+static int
+ar8xxx_phy_poll_reset(struct mii_bus *bus)
+{
+        unsigned int sleep_msecs = 20;
+        int ret, elapsed, i;
+
+        for (elapsed = sleep_msecs; elapsed <= 600;
+	     elapsed += sleep_msecs) {
+                msleep(sleep_msecs);
+                for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
+                        ret = mdiobus_read(bus, i, MII_BMCR);
+                        if (ret < 0)
+				return ret;
+                        if (ret & BMCR_RESET)
+				break;
+                        if (i == AR8XXX_NUM_PHYS - 1) {
+                                usleep_range(1000, 2000);
+                                return 0;
+                        }
+                }
+        }
+        return -ETIMEDOUT;
+}
+
+static int
+ar8xxx_phy_check_aneg(struct phy_device *phydev)
+{
+	int ret;
+
+	if (phydev->autoneg != AUTONEG_ENABLE)
+		return 0;
+	/*
+	 * BMCR_ANENABLE might have been cleared
+	 * by phy_init_hw in certain kernel versions
+	 * therefore check for it
+	 */
+	ret = phy_read(phydev, MII_BMCR);
+	if (ret < 0)
+		return ret;
+	if (ret & BMCR_ANENABLE)
+		return 0;
+
+	dev_info(&phydev->dev, "ANEG disabled, re-enabling ...\n");
+	ret |= BMCR_ANENABLE | BMCR_ANRESTART;
+	return phy_write(phydev, MII_BMCR, ret);
+}
+
+static void
+ar8xxx_phy_init(struct ar8xxx_priv *priv)
+{
+	int i;
+	struct mii_bus *bus;
+
+	bus = priv->mii_bus;
+	for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
+		if (priv->chip->phy_fixup)
+			priv->chip->phy_fixup(priv, i);
+
+		/* initialize the port itself */
+		mdiobus_write(bus, i, MII_ADVERTISE,
+			ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
+		if (ar8xxx_has_gige(priv))
+			mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
+		mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
+	}
+
+	ar8xxx_phy_poll_reset(bus);
+}
+
+static u32
+ar8xxx_mii_read(struct ar8xxx_priv *priv, int reg)
+{
+	struct mii_bus *bus = priv->mii_bus;
+	u16 r1, r2, page;
+	u16 lo, hi;
+
+	split_addr((u32) reg, &r1, &r2, &page);
+
+	mutex_lock(&bus->mdio_lock);
+
+	bus->write(bus, 0x18, 0, page);
+	usleep_range(1000, 2000); /* wait for the page switch to propagate */
+	lo = bus->read(bus, 0x10 | r2, r1);
+	hi = bus->read(bus, 0x10 | r2, r1 + 1);
+
+	mutex_unlock(&bus->mdio_lock);
+
+	return (hi << 16) | lo;
+}
+
+static void
+ar8xxx_mii_write(struct ar8xxx_priv *priv, int reg, u32 val)
+{
+	struct mii_bus *bus = priv->mii_bus;
+	u16 r1, r2, r3;
+	u16 lo, hi;
+
+	split_addr((u32) reg, &r1, &r2, &r3);
+	lo = val & 0xffff;
+	hi = (u16) (val >> 16);
+
+	mutex_lock(&bus->mdio_lock);
+
+	bus->write(bus, 0x18, 0, r3);
+	usleep_range(1000, 2000); /* wait for the page switch to propagate */
+	if (priv->chip->mii_lo_first) {
+		bus->write(bus, 0x10 | r2, r1, lo);
+		bus->write(bus, 0x10 | r2, r1 + 1, hi);
+	} else {
+		bus->write(bus, 0x10 | r2, r1 + 1, hi);
+		bus->write(bus, 0x10 | r2, r1, lo);
+	}
+
+	mutex_unlock(&bus->mdio_lock);
+}
+
+static u32
+ar8xxx_mii_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
+{
+	struct mii_bus *bus = priv->mii_bus;
+	u16 r1, r2, page;
+	u16 lo, hi;
+	u32 ret;
+
+	split_addr((u32) reg, &r1, &r2, &page);
+
+	mutex_lock(&bus->mdio_lock);
+
+	bus->write(bus, 0x18, 0, page);
+	usleep_range(1000, 2000); /* wait for the page switch to propagate */
+
+	lo = bus->read(bus, 0x10 | r2, r1);
+	hi = bus->read(bus, 0x10 | r2, r1 + 1);
+
+	ret = hi << 16 | lo;
+	ret &= ~mask;
+	ret |= val;
+
+	lo = ret & 0xffff;
+	hi = (u16) (ret >> 16);
+
+	if (priv->chip->mii_lo_first) {
+		bus->write(bus, 0x10 | r2, r1, lo);
+		bus->write(bus, 0x10 | r2, r1 + 1, hi);
+	} else {
+		bus->write(bus, 0x10 | r2, r1 + 1, hi);
+		bus->write(bus, 0x10 | r2, r1, lo);
+	}
+
+	mutex_unlock(&bus->mdio_lock);
+
+	return ret;
+}
+
+
+static void
+ar8xxx_phy_dbg_write(struct ar8xxx_priv *priv, int phy_addr,
+		     u16 dbg_addr, u16 dbg_data)
+{
+	struct mii_bus *bus = priv->mii_bus;
+
+	mutex_lock(&bus->mdio_lock);
+	bus->write(bus, phy_addr, MII_ATH_DBG_ADDR, dbg_addr);
+	bus->write(bus, phy_addr, MII_ATH_DBG_DATA, dbg_data);
+	mutex_unlock(&bus->mdio_lock);
+}
+
+static void
+ar8xxx_phy_mmd_write(struct ar8xxx_priv *priv, int phy_addr, u16 addr, u16 data)
+{
+	struct mii_bus *bus = priv->mii_bus;
+
+	mutex_lock(&bus->mdio_lock);
+	bus->write(bus, phy_addr, MII_ATH_MMD_ADDR, addr);
+	bus->write(bus, phy_addr, MII_ATH_MMD_DATA, data);
+	mutex_unlock(&bus->mdio_lock);
+}
+
+static inline u32
+ar8xxx_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
+{
+	return priv->rmw(priv, reg, mask, val);
+}
+
+static inline void
+ar8xxx_reg_set(struct ar8xxx_priv *priv, int reg, u32 val)
+{
+	priv->rmw(priv, reg, 0, val);
+}
+
+static int
+ar8xxx_reg_wait(struct ar8xxx_priv *priv, u32 reg, u32 mask, u32 val,
+		unsigned timeout)
+{
+	int i;
+
+	for (i = 0; i < timeout; i++) {
+		u32 t;
+
+		t = priv->read(priv, reg);
+		if ((t & mask) == val)
+			return 0;
+
+		usleep_range(1000, 2000);
+	}
+
+	return -ETIMEDOUT;
+}
+
+static int
+ar8xxx_mib_op(struct ar8xxx_priv *priv, u32 op)
+{
+	unsigned mib_func = priv->chip->mib_func;
+	int ret;
+
+	lockdep_assert_held(&priv->mib_lock);
+
+	/* Capture the hardware statistics for all ports */
+	ar8xxx_rmw(priv, mib_func, AR8216_MIB_FUNC, (op << AR8216_MIB_FUNC_S));
+
+	/* Wait for the capturing to complete. */
+	ret = ar8xxx_reg_wait(priv, mib_func, AR8216_MIB_BUSY, 0, 10);
+	if (ret)
+		goto out;
+
+	ret = 0;
+
+out:
+	return ret;
+}
+
+static int
+ar8xxx_mib_capture(struct ar8xxx_priv *priv)
+{
+	return ar8xxx_mib_op(priv, AR8216_MIB_FUNC_CAPTURE);
+}
+
+static int
+ar8xxx_mib_flush(struct ar8xxx_priv *priv)
+{
+	return ar8xxx_mib_op(priv, AR8216_MIB_FUNC_FLUSH);
+}
+
+static void
+ar8xxx_mib_fetch_port_stat(struct ar8xxx_priv *priv, int port, bool flush)
+{
+	unsigned int base;
+	u64 *mib_stats;
+	int i;
+
+	WARN_ON(port >= priv->dev.ports);
+
+	lockdep_assert_held(&priv->mib_lock);
+
+	base = priv->chip->reg_port_stats_start +
+	       priv->chip->reg_port_stats_length * port;
+
+	mib_stats = &priv->mib_stats[port * priv->chip->num_mibs];
+	for (i = 0; i < priv->chip->num_mibs; i++) {
+		const struct ar8xxx_mib_desc *mib;
+		u64 t;
+
+		mib = &priv->chip->mib_decs[i];
+		t = priv->read(priv, base + mib->offset);
+		if (mib->size == 2) {
+			u64 hi;
+
+			hi = priv->read(priv, base + mib->offset + 4);
+			t |= hi << 32;
+		}
+
+		if (flush)
+			mib_stats[i] = 0;
+		else
+			mib_stats[i] += t;
+	}
+}
+
+static void
+ar8216_read_port_link(struct ar8xxx_priv *priv, int port,
+		      struct switch_port_link *link)
+{
+	u32 status;
+	u32 speed;
+
+	memset(link, '\0', sizeof(*link));
+
+	status = priv->chip->read_port_status(priv, port);
+
+	link->aneg = !!(status & AR8216_PORT_STATUS_LINK_AUTO);
+	if (link->aneg) {
+		link->link = !!(status & AR8216_PORT_STATUS_LINK_UP);
+	} else {
+		link->link = true;
+
+		if (priv->get_port_link) {
+			int err;
+
+			err = priv->get_port_link(port);
+			if (err >= 0)
+				link->link = !!err;
+		}
+	}
+
+	if (!link->link)
+		return;
+
+	link->duplex = !!(status & AR8216_PORT_STATUS_DUPLEX);
+	link->tx_flow = !!(status & AR8216_PORT_STATUS_TXFLOW);
+	link->rx_flow = !!(status & AR8216_PORT_STATUS_RXFLOW);
+
+	speed = (status & AR8216_PORT_STATUS_SPEED) >>
+		 AR8216_PORT_STATUS_SPEED_S;
+
+	switch (speed) {
+	case AR8216_PORT_SPEED_10M:
+		link->speed = SWITCH_PORT_SPEED_10;
+		break;
+	case AR8216_PORT_SPEED_100M:
+		link->speed = SWITCH_PORT_SPEED_100;
+		break;
+	case AR8216_PORT_SPEED_1000M:
+		link->speed = SWITCH_PORT_SPEED_1000;
+		break;
+	default:
+		link->speed = SWITCH_PORT_SPEED_UNKNOWN;
+		break;
+	}
+}
+
+static struct sk_buff *
+ar8216_mangle_tx(struct net_device *dev, struct sk_buff *skb)
+{
+	struct ar8xxx_priv *priv = dev->phy_ptr;
+	unsigned char *buf;
+
+	if (unlikely(!priv))
+		goto error;
+
+	if (!priv->vlan)
+		goto send;
+
+	if (unlikely(skb_headroom(skb) < 2)) {
+		if (pskb_expand_head(skb, 2, 0, GFP_ATOMIC) < 0)
+			goto error;
+	}
+
+	buf = skb_push(skb, 2);
+	buf[0] = 0x10;
+	buf[1] = 0x80;
+
+send:
+	return skb;
+
+error:
+	dev_kfree_skb_any(skb);
+	return NULL;
+}
+
+static void
+ar8216_mangle_rx(struct net_device *dev, struct sk_buff *skb)
+{
+	struct ar8xxx_priv *priv;
+	unsigned char *buf;
+	int port, vlan;
+
+	priv = dev->phy_ptr;
+	if (!priv)
+		return;
+
+	/* don't strip the header if vlan mode is disabled */
+	if (!priv->vlan)
+		return;
+
+	/* strip header, get vlan id */
+	buf = skb->data;
+	skb_pull(skb, 2);
+
+	/* check for vlan header presence */
+	if ((buf[12 + 2] != 0x81) || (buf[13 + 2] != 0x00))
+		return;
+
+	port = buf[0] & 0xf;
+
+	/* no need to fix up packets coming from a tagged source */
+	if (priv->vlan_tagged & (1 << port))
+		return;
+
+	/* lookup port vid from local table, the switch passes an invalid vlan id */
+	vlan = priv->vlan_id[priv->pvid[port]];
+
+	buf[14 + 2] &= 0xf0;
+	buf[14 + 2] |= vlan >> 8;
+	buf[15 + 2] = vlan & 0xff;
+}
+
+static int
+ar8216_wait_bit(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
+{
+	int timeout = 20;
+	u32 t = 0;
+
+	while (1) {
+		t = priv->read(priv, reg);
+		if ((t & mask) == val)
+			return 0;
+
+		if (timeout-- <= 0)
+			break;
+
+		udelay(10);
+	}
+
+	pr_err("ar8216: timeout on reg %08x: %08x & %08x != %08x\n",
+	       (unsigned int) reg, t, mask, val);
+	return -ETIMEDOUT;
+}
+
+static void
+ar8216_vtu_op(struct ar8xxx_priv *priv, u32 op, u32 val)
+{
+	if (ar8216_wait_bit(priv, AR8216_REG_VTU, AR8216_VTU_ACTIVE, 0))
+		return;
+	if ((op & AR8216_VTU_OP) == AR8216_VTU_OP_LOAD) {
+		val &= AR8216_VTUDATA_MEMBER;
+		val |= AR8216_VTUDATA_VALID;
+		priv->write(priv, AR8216_REG_VTU_DATA, val);
+	}
+	op |= AR8216_VTU_ACTIVE;
+	priv->write(priv, AR8216_REG_VTU, op);
+}
+
+static void
+ar8216_vtu_flush(struct ar8xxx_priv *priv)
+{
+	ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0);
+}
+
+static void
+ar8216_vtu_load_vlan(struct ar8xxx_priv *priv, u32 vid, u32 port_mask)
+{
+	u32 op;
+
+	op = AR8216_VTU_OP_LOAD | (vid << AR8216_VTU_VID_S);
+	ar8216_vtu_op(priv, op, port_mask);
+}
+
+static int
+ar8216_atu_flush(struct ar8xxx_priv *priv)
+{
+	int ret;
+
+	ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
+	if (!ret)
+		priv->write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH);
+
+	return ret;
+}
+
+static u32
+ar8216_read_port_status(struct ar8xxx_priv *priv, int port)
+{
+	return priv->read(priv, AR8216_REG_PORT_STATUS(port));
+}
+
+static void
+ar8216_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
+{
+	u32 header;
+	u32 egress, ingress;
+	u32 pvid;
+
+	if (priv->vlan) {
+		pvid = priv->vlan_id[priv->pvid[port]];
+		if (priv->vlan_tagged & (1 << port))
+			egress = AR8216_OUT_ADD_VLAN;
+		else
+			egress = AR8216_OUT_STRIP_VLAN;
+		ingress = AR8216_IN_SECURE;
+	} else {
+		pvid = port;
+		egress = AR8216_OUT_KEEP;
+		ingress = AR8216_IN_PORT_ONLY;
+	}
+
+	if (chip_is_ar8216(priv) && priv->vlan && port == AR8216_PORT_CPU)
+		header = AR8216_PORT_CTRL_HEADER;
+	else
+		header = 0;
+
+	ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(port),
+		   AR8216_PORT_CTRL_LEARN | AR8216_PORT_CTRL_VLAN_MODE |
+		   AR8216_PORT_CTRL_SINGLE_VLAN | AR8216_PORT_CTRL_STATE |
+		   AR8216_PORT_CTRL_HEADER | AR8216_PORT_CTRL_LEARN_LOCK,
+		   AR8216_PORT_CTRL_LEARN | header |
+		   (egress << AR8216_PORT_CTRL_VLAN_MODE_S) |
+		   (AR8216_PORT_STATE_FORWARD << AR8216_PORT_CTRL_STATE_S));
+
+	ar8xxx_rmw(priv, AR8216_REG_PORT_VLAN(port),
+		   AR8216_PORT_VLAN_DEST_PORTS | AR8216_PORT_VLAN_MODE |
+		   AR8216_PORT_VLAN_DEFAULT_ID,
+		   (members << AR8216_PORT_VLAN_DEST_PORTS_S) |
+		   (ingress << AR8216_PORT_VLAN_MODE_S) |
+		   (pvid << AR8216_PORT_VLAN_DEFAULT_ID_S));
+}
+
+static int
+ar8216_hw_init(struct ar8xxx_priv *priv)
+{
+	if (priv->initialized)
+		return 0;
+
+	ar8xxx_phy_init(priv);
+
+	priv->initialized = true;
+	return 0;
+}
+
+static void
+ar8216_init_globals(struct ar8xxx_priv *priv)
+{
+	/* standard atheros magic */
+	priv->write(priv, 0x38, 0xc000050e);
+
+	ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
+		   AR8216_GCTRL_MTU, 1518 + 8 + 2);
+}
+
+static void
+ar8216_init_port(struct ar8xxx_priv *priv, int port)
+{
+	/* Enable port learning and tx */
+	priv->write(priv, AR8216_REG_PORT_CTRL(port),
+		AR8216_PORT_CTRL_LEARN |
+		(4 << AR8216_PORT_CTRL_STATE_S));
+
+	priv->write(priv, AR8216_REG_PORT_VLAN(port), 0);
+
+	if (port == AR8216_PORT_CPU) {
+		priv->write(priv, AR8216_REG_PORT_STATUS(port),
+			AR8216_PORT_STATUS_LINK_UP |
+			(ar8xxx_has_gige(priv) ?
+                                AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
+			AR8216_PORT_STATUS_TXMAC |
+			AR8216_PORT_STATUS_RXMAC |
+			(chip_is_ar8316(priv) ? AR8216_PORT_STATUS_RXFLOW : 0) |
+			(chip_is_ar8316(priv) ? AR8216_PORT_STATUS_TXFLOW : 0) |
+			AR8216_PORT_STATUS_DUPLEX);
+	} else {
+		priv->write(priv, AR8216_REG_PORT_STATUS(port),
+			AR8216_PORT_STATUS_LINK_AUTO);
+	}
+}
+
+static const struct ar8xxx_chip ar8216_chip = {
+	.caps = AR8XXX_CAP_MIB_COUNTERS,
+
+	.reg_port_stats_start = 0x19000,
+	.reg_port_stats_length = 0xa0,
+
+	.hw_init = ar8216_hw_init,
+	.init_globals = ar8216_init_globals,
+	.init_port = ar8216_init_port,
+	.setup_port = ar8216_setup_port,
+	.read_port_status = ar8216_read_port_status,
+	.atu_flush = ar8216_atu_flush,
+	.vtu_flush = ar8216_vtu_flush,
+	.vtu_load_vlan = ar8216_vtu_load_vlan,
+	.set_mirror_regs = ar8216_set_mirror_regs,
+
+	.num_mibs = ARRAY_SIZE(ar8216_mibs),
+	.mib_decs = ar8216_mibs,
+	.mib_func = AR8216_REG_MIB_FUNC
+};
+
+static void
+ar8236_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
+{
+	u32 egress, ingress;
+	u32 pvid;
+
+	if (priv->vlan) {
+		pvid = priv->vlan_id[priv->pvid[port]];
+		if (priv->vlan_tagged & (1 << port))
+			egress = AR8216_OUT_ADD_VLAN;
+		else
+			egress = AR8216_OUT_STRIP_VLAN;
+		ingress = AR8216_IN_SECURE;
+	} else {
+		pvid = port;
+		egress = AR8216_OUT_KEEP;
+		ingress = AR8216_IN_PORT_ONLY;
+	}
+
+	ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(port),
+		   AR8216_PORT_CTRL_LEARN | AR8216_PORT_CTRL_VLAN_MODE |
+		   AR8216_PORT_CTRL_SINGLE_VLAN | AR8216_PORT_CTRL_STATE |
+		   AR8216_PORT_CTRL_HEADER | AR8216_PORT_CTRL_LEARN_LOCK,
+		   AR8216_PORT_CTRL_LEARN |
+		   (egress << AR8216_PORT_CTRL_VLAN_MODE_S) |
+		   (AR8216_PORT_STATE_FORWARD << AR8216_PORT_CTRL_STATE_S));
+
+	ar8xxx_rmw(priv, AR8236_REG_PORT_VLAN(port),
+		   AR8236_PORT_VLAN_DEFAULT_ID,
+		   (pvid << AR8236_PORT_VLAN_DEFAULT_ID_S));
+
+	ar8xxx_rmw(priv, AR8236_REG_PORT_VLAN2(port),
+		   AR8236_PORT_VLAN2_VLAN_MODE |
+		   AR8236_PORT_VLAN2_MEMBER,
+		   (ingress << AR8236_PORT_VLAN2_VLAN_MODE_S) |
+		   (members << AR8236_PORT_VLAN2_MEMBER_S));
+}
+
+static void
+ar8236_init_globals(struct ar8xxx_priv *priv)
+{
+	/* enable jumbo frames */
+	ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
+		   AR8316_GCTRL_MTU, 9018 + 8 + 2);
+
+	/* Enable MIB counters */
+	ar8xxx_rmw(priv, AR8216_REG_MIB_FUNC, AR8216_MIB_FUNC | AR8236_MIB_EN,
+		   (AR8216_MIB_FUNC_NO_OP << AR8216_MIB_FUNC_S) |
+		   AR8236_MIB_EN);
+}
+
+static const struct ar8xxx_chip ar8236_chip = {
+	.caps = AR8XXX_CAP_MIB_COUNTERS,
+
+	.reg_port_stats_start = 0x20000,
+	.reg_port_stats_length = 0x100,
+
+	.hw_init = ar8216_hw_init,
+	.init_globals = ar8236_init_globals,
+	.init_port = ar8216_init_port,
+	.setup_port = ar8236_setup_port,
+	.read_port_status = ar8216_read_port_status,
+	.atu_flush = ar8216_atu_flush,
+	.vtu_flush = ar8216_vtu_flush,
+	.vtu_load_vlan = ar8216_vtu_load_vlan,
+	.set_mirror_regs = ar8216_set_mirror_regs,
+
+	.num_mibs = ARRAY_SIZE(ar8236_mibs),
+	.mib_decs = ar8236_mibs,
+	.mib_func = AR8216_REG_MIB_FUNC
+};
+
+static int
+ar8316_hw_init(struct ar8xxx_priv *priv)
+{
+	u32 val, newval;
+
+	val = priv->read(priv, AR8316_REG_POSTRIP);
+
+	if (priv->phy->interface == PHY_INTERFACE_MODE_RGMII) {
+		if (priv->port4_phy) {
+			/* value taken from Ubiquiti RouterStation Pro */
+			newval = 0x81461bea;
+			pr_info("ar8316: Using port 4 as PHY\n");
+		} else {
+			newval = 0x01261be2;
+			pr_info("ar8316: Using port 4 as switch port\n");
+		}
+	} else if (priv->phy->interface == PHY_INTERFACE_MODE_GMII) {
+		/* value taken from AVM Fritz!Box 7390 sources */
+		newval = 0x010e5b71;
+	} else {
+		/* no known value for phy interface */
+		pr_err("ar8316: unsupported mii mode: %d.\n",
+		       priv->phy->interface);
+		return -EINVAL;
+	}
+
+	if (val == newval)
+		goto out;
+
+	priv->write(priv, AR8316_REG_POSTRIP, newval);
+
+	if (priv->port4_phy &&
+	    priv->phy->interface == PHY_INTERFACE_MODE_RGMII) {
+		/* work around for phy4 rgmii mode */
+		ar8xxx_phy_dbg_write(priv, 4, 0x12, 0x480c);
+		/* rx delay */
+		ar8xxx_phy_dbg_write(priv, 4, 0x0, 0x824e);
+		/* tx delay */
+		ar8xxx_phy_dbg_write(priv, 4, 0x5, 0x3d47);
+		msleep(1000);
+	}
+
+	ar8xxx_phy_init(priv);
+
+out:
+	priv->initialized = true;
+	return 0;
+}
+
+static void
+ar8316_init_globals(struct ar8xxx_priv *priv)
+{
+	/* standard atheros magic */
+	priv->write(priv, 0x38, 0xc000050e);
+
+	/* enable cpu port to receive multicast and broadcast frames */
+	priv->write(priv, AR8216_REG_FLOOD_MASK, 0x003f003f);
+
+	/* enable jumbo frames */
+	ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
+		   AR8316_GCTRL_MTU, 9018 + 8 + 2);
+
+	/* Enable MIB counters */
+	ar8xxx_rmw(priv, AR8216_REG_MIB_FUNC, AR8216_MIB_FUNC | AR8236_MIB_EN,
+		   (AR8216_MIB_FUNC_NO_OP << AR8216_MIB_FUNC_S) |
+		   AR8236_MIB_EN);
+}
+
+static const struct ar8xxx_chip ar8316_chip = {
+	.caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+
+	.reg_port_stats_start = 0x20000,
+	.reg_port_stats_length = 0x100,
+
+	.hw_init = ar8316_hw_init,
+	.init_globals = ar8316_init_globals,
+	.init_port = ar8216_init_port,
+	.setup_port = ar8216_setup_port,
+	.read_port_status = ar8216_read_port_status,
+	.atu_flush = ar8216_atu_flush,
+	.vtu_flush = ar8216_vtu_flush,
+	.vtu_load_vlan = ar8216_vtu_load_vlan,
+	.set_mirror_regs = ar8216_set_mirror_regs,
+
+	.num_mibs = ARRAY_SIZE(ar8236_mibs),
+	.mib_decs = ar8236_mibs,
+	.mib_func = AR8216_REG_MIB_FUNC
+};
+
+static u32
+ar8327_get_pad_cfg(struct ar8327_pad_cfg *cfg)
+{
+	u32 t;
+
+	if (!cfg)
+		return 0;
+
+	t = 0;
+	switch (cfg->mode) {
+	case AR8327_PAD_NC:
+		break;
+
+	case AR8327_PAD_MAC2MAC_MII:
+		t = AR8327_PAD_MAC_MII_EN;
+		if (cfg->rxclk_sel)
+			t |= AR8327_PAD_MAC_MII_RXCLK_SEL;
+		if (cfg->txclk_sel)
+			t |= AR8327_PAD_MAC_MII_TXCLK_SEL;
+		break;
+
+	case AR8327_PAD_MAC2MAC_GMII:
+		t = AR8327_PAD_MAC_GMII_EN;
+		if (cfg->rxclk_sel)
+			t |= AR8327_PAD_MAC_GMII_RXCLK_SEL;
+		if (cfg->txclk_sel)
+			t |= AR8327_PAD_MAC_GMII_TXCLK_SEL;
+		break;
+
+	case AR8327_PAD_MAC_SGMII:
+		t = AR8327_PAD_SGMII_EN;
+
+		/*
+		 * WAR for the QUalcomm Atheros AP136 board.
+		 * It seems that RGMII TX/RX delay settings needs to be
+		 * applied for SGMII mode as well, The ethernet is not
+		 * reliable without this.
+		 */
+		t |= cfg->txclk_delay_sel << AR8327_PAD_RGMII_TXCLK_DELAY_SEL_S;
+		t |= cfg->rxclk_delay_sel << AR8327_PAD_RGMII_RXCLK_DELAY_SEL_S;
+		if (cfg->rxclk_delay_en)
+			t |= AR8327_PAD_RGMII_RXCLK_DELAY_EN;
+		if (cfg->txclk_delay_en)
+			t |= AR8327_PAD_RGMII_TXCLK_DELAY_EN;
+
+		if (cfg->sgmii_delay_en)
+			t |= AR8327_PAD_SGMII_DELAY_EN;
+
+		break;
+
+	case AR8327_PAD_MAC2PHY_MII:
+		t = AR8327_PAD_PHY_MII_EN;
+		if (cfg->rxclk_sel)
+			t |= AR8327_PAD_PHY_MII_RXCLK_SEL;
+		if (cfg->txclk_sel)
+			t |= AR8327_PAD_PHY_MII_TXCLK_SEL;
+		break;
+
+	case AR8327_PAD_MAC2PHY_GMII:
+		t = AR8327_PAD_PHY_GMII_EN;
+		if (cfg->pipe_rxclk_sel)
+			t |= AR8327_PAD_PHY_GMII_PIPE_RXCLK_SEL;
+		if (cfg->rxclk_sel)
+			t |= AR8327_PAD_PHY_GMII_RXCLK_SEL;
+		if (cfg->txclk_sel)
+			t |= AR8327_PAD_PHY_GMII_TXCLK_SEL;
+		break;
+
+	case AR8327_PAD_MAC_RGMII:
+		t = AR8327_PAD_RGMII_EN;
+		t |= cfg->txclk_delay_sel << AR8327_PAD_RGMII_TXCLK_DELAY_SEL_S;
+		t |= cfg->rxclk_delay_sel << AR8327_PAD_RGMII_RXCLK_DELAY_SEL_S;
+		if (cfg->rxclk_delay_en)
+			t |= AR8327_PAD_RGMII_RXCLK_DELAY_EN;
+		if (cfg->txclk_delay_en)
+			t |= AR8327_PAD_RGMII_TXCLK_DELAY_EN;
+		break;
+
+	case AR8327_PAD_PHY_GMII:
+		t = AR8327_PAD_PHYX_GMII_EN;
+		break;
+
+	case AR8327_PAD_PHY_RGMII:
+		t = AR8327_PAD_PHYX_RGMII_EN;
+		break;
+
+	case AR8327_PAD_PHY_MII:
+		t = AR8327_PAD_PHYX_MII_EN;
+		break;
+	}
+
+	return t;
+}
+
+static void
+ar8327_phy_fixup(struct ar8xxx_priv *priv, int phy)
+{
+	switch (priv->chip_rev) {
+	case 1:
+		/* For 100M waveform */
+		ar8xxx_phy_dbg_write(priv, phy, 0, 0x02ea);
+		/* Turn on Gigabit clock */
+		ar8xxx_phy_dbg_write(priv, phy, 0x3d, 0x68a0);
+		break;
+
+	case 2:
+		ar8xxx_phy_mmd_write(priv, phy, 0x7, 0x3c);
+		ar8xxx_phy_mmd_write(priv, phy, 0x4007, 0x0);
+		/* fallthrough */
+	case 4:
+		ar8xxx_phy_mmd_write(priv, phy, 0x3, 0x800d);
+		ar8xxx_phy_mmd_write(priv, phy, 0x4003, 0x803f);
+
+		ar8xxx_phy_dbg_write(priv, phy, 0x3d, 0x6860);
+		ar8xxx_phy_dbg_write(priv, phy, 0x5, 0x2c46);
+		ar8xxx_phy_dbg_write(priv, phy, 0x3c, 0x6000);
+		break;
+	}
+}
+
+static u32
+ar8327_get_port_init_status(struct ar8327_port_cfg *cfg)
+{
+	u32 t;
+
+	if (!cfg->force_link)
+		return AR8216_PORT_STATUS_LINK_AUTO;
+
+	t = AR8216_PORT_STATUS_TXMAC | AR8216_PORT_STATUS_RXMAC;
+	t |= cfg->duplex ? AR8216_PORT_STATUS_DUPLEX : 0;
+	t |= cfg->rxpause ? AR8216_PORT_STATUS_RXFLOW : 0;
+	t |= cfg->txpause ? AR8216_PORT_STATUS_TXFLOW : 0;
+
+	switch (cfg->speed) {
+	case AR8327_PORT_SPEED_10:
+		t |= AR8216_PORT_SPEED_10M;
+		break;
+	case AR8327_PORT_SPEED_100:
+		t |= AR8216_PORT_SPEED_100M;
+		break;
+	case AR8327_PORT_SPEED_1000:
+		t |= AR8216_PORT_SPEED_1000M;
+		break;
+	}
+
+	return t;
+}
+
+#define AR8327_LED_ENTRY(_num, _reg, _shift) \
+	[_num] = { .reg = (_reg), .shift = (_shift) }
+
+static const struct ar8327_led_entry
+ar8327_led_map[AR8327_NUM_LEDS] = {
+	AR8327_LED_ENTRY(AR8327_LED_PHY0_0, 0, 14),
+	AR8327_LED_ENTRY(AR8327_LED_PHY0_1, 1, 14),
+	AR8327_LED_ENTRY(AR8327_LED_PHY0_2, 2, 14),
+
+	AR8327_LED_ENTRY(AR8327_LED_PHY1_0, 3, 8),
+	AR8327_LED_ENTRY(AR8327_LED_PHY1_1, 3, 10),
+	AR8327_LED_ENTRY(AR8327_LED_PHY1_2, 3, 12),
+
+	AR8327_LED_ENTRY(AR8327_LED_PHY2_0, 3, 14),
+	AR8327_LED_ENTRY(AR8327_LED_PHY2_1, 3, 16),
+	AR8327_LED_ENTRY(AR8327_LED_PHY2_2, 3, 18),
+
+	AR8327_LED_ENTRY(AR8327_LED_PHY3_0, 3, 20),
+	AR8327_LED_ENTRY(AR8327_LED_PHY3_1, 3, 22),
+	AR8327_LED_ENTRY(AR8327_LED_PHY3_2, 3, 24),
+
+	AR8327_LED_ENTRY(AR8327_LED_PHY4_0, 0, 30),
+	AR8327_LED_ENTRY(AR8327_LED_PHY4_1, 1, 30),
+	AR8327_LED_ENTRY(AR8327_LED_PHY4_2, 2, 30),
+};
+
+static void
+ar8327_set_led_pattern(struct ar8xxx_priv *priv, unsigned int led_num,
+		       enum ar8327_led_pattern pattern)
+{
+	const struct ar8327_led_entry *entry;
+
+	entry = &ar8327_led_map[led_num];
+	ar8xxx_rmw(priv, AR8327_REG_LED_CTRL(entry->reg),
+		   (3 << entry->shift), pattern << entry->shift);
+}
+
+static void
+ar8327_led_work_func(struct work_struct *work)
+{
+	struct ar8327_led *aled;
+	u8 pattern;
+
+	aled = container_of(work, struct ar8327_led, led_work);
+
+	spin_lock(&aled->lock);
+	pattern = aled->pattern;
+	spin_unlock(&aled->lock);
+
+	ar8327_set_led_pattern(aled->sw_priv, aled->led_num,
+			       pattern);
+}
+
+static void
+ar8327_led_schedule_change(struct ar8327_led *aled, u8 pattern)
+{
+	if (aled->pattern == pattern)
+		return;
+
+	aled->pattern = pattern;
+	schedule_work(&aled->led_work);
+}
+
+static inline struct ar8327_led *
+led_cdev_to_ar8327_led(struct led_classdev *led_cdev)
+{
+	return container_of(led_cdev, struct ar8327_led, cdev);
+}
+
+static int
+ar8327_led_blink_set(struct led_classdev *led_cdev,
+		     unsigned long *delay_on,
+		     unsigned long *delay_off)
+{
+	struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+
+	if (*delay_on == 0 && *delay_off == 0) {
+		*delay_on = 125;
+		*delay_off = 125;
+	}
+
+	if (*delay_on != 125 || *delay_off != 125) {
+		/*
+		 * The hardware only supports blinking at 4Hz. Fall back
+		 * to software implementation in other cases.
+		 */
+		return -EINVAL;
+	}
+
+	spin_lock(&aled->lock);
+
+	aled->enable_hw_mode = false;
+	ar8327_led_schedule_change(aled, AR8327_LED_PATTERN_BLINK);
+
+	spin_unlock(&aled->lock);
+
+	return 0;
+}
+
+static void
+ar8327_led_set_brightness(struct led_classdev *led_cdev,
+			  enum led_brightness brightness)
+{
+	struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+	u8 pattern;
+	bool active;
+
+	active = (brightness != LED_OFF);
+	active ^= aled->active_low;
+
+	pattern = (active) ? AR8327_LED_PATTERN_ON :
+			     AR8327_LED_PATTERN_OFF;
+
+	spin_lock(&aled->lock);
+
+	aled->enable_hw_mode = false;
+	ar8327_led_schedule_change(aled, pattern);
+
+	spin_unlock(&aled->lock);
+}
+
+static ssize_t
+ar8327_led_enable_hw_mode_show(struct device *dev,
+			       struct device_attribute *attr,
+			       char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+	ssize_t ret = 0;
+
+	spin_lock(&aled->lock);
+	ret += sprintf(buf, "%d\n", aled->enable_hw_mode);
+	spin_unlock(&aled->lock);
+
+	return ret;
+}
+
+static ssize_t
+ar8327_led_enable_hw_mode_store(struct device *dev,
+				struct device_attribute *attr,
+				const char *buf,
+				size_t size)
+{
+        struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
+	u8 pattern;
+	u8 value;
+	int ret;
+
+	ret = kstrtou8(buf, 10, &value);
+	if (ret < 0)
+		return -EINVAL;
+
+	spin_lock(&aled->lock);
+
+	aled->enable_hw_mode = !!value;
+	if (aled->enable_hw_mode)
+		pattern = AR8327_LED_PATTERN_RULE;
+	else
+		pattern = AR8327_LED_PATTERN_OFF;
+
+	ar8327_led_schedule_change(aled, pattern);
+
+	spin_unlock(&aled->lock);
+
+	return size;
+}
+
+static DEVICE_ATTR(enable_hw_mode,  S_IRUGO | S_IWUSR,
+		   ar8327_led_enable_hw_mode_show,
+		   ar8327_led_enable_hw_mode_store);
+
+static int
+ar8327_led_register(struct ar8xxx_priv *priv, struct ar8327_led *aled)
+{
+	int ret;
+
+	ret = led_classdev_register(NULL, &aled->cdev);
+	if (ret < 0)
+		return ret;
+
+	if (aled->mode == AR8327_LED_MODE_HW) {
+		ret = device_create_file(aled->cdev.dev,
+					 &dev_attr_enable_hw_mode);
+		if (ret)
+			goto err_unregister;
+	}
+
+	return 0;
+
+err_unregister:
+	led_classdev_unregister(&aled->cdev);
+	return ret;
+}
+
+static void
+ar8327_led_unregister(struct ar8327_led *aled)
+{
+	if (aled->mode == AR8327_LED_MODE_HW)
+		device_remove_file(aled->cdev.dev, &dev_attr_enable_hw_mode);
+
+	led_classdev_unregister(&aled->cdev);
+	cancel_work_sync(&aled->led_work);
+}
+
+static int
+ar8327_led_create(struct ar8xxx_priv *priv,
+		  const struct ar8327_led_info *led_info)
+{
+	struct ar8327_data *data = priv->chip_data;
+	struct ar8327_led *aled;
+	int ret;
+
+	if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+		return 0;
+
+	if (!led_info->name)
+		return -EINVAL;
+
+	if (led_info->led_num >= AR8327_NUM_LEDS)
+		return -EINVAL;
+
+	aled = kzalloc(sizeof(*aled) + strlen(led_info->name) + 1,
+		       GFP_KERNEL);
+	if (!aled)
+		return -ENOMEM;
+
+	aled->sw_priv = priv;
+	aled->led_num = led_info->led_num;
+	aled->active_low = led_info->active_low;
+	aled->mode = led_info->mode;
+
+	if (aled->mode == AR8327_LED_MODE_HW)
+		aled->enable_hw_mode = true;
+
+	aled->name = (char *)(aled + 1);
+	strcpy(aled->name, led_info->name);
+
+	aled->cdev.name = aled->name;
+	aled->cdev.brightness_set = ar8327_led_set_brightness;
+	aled->cdev.blink_set = ar8327_led_blink_set;
+	aled->cdev.default_trigger = led_info->default_trigger;
+
+	spin_lock_init(&aled->lock);
+	mutex_init(&aled->mutex);
+	INIT_WORK(&aled->led_work, ar8327_led_work_func);
+
+	ret = ar8327_led_register(priv, aled);
+	if (ret)
+		goto err_free;
+
+	data->leds[data->num_leds++] = aled;
+
+	return 0;
+
+err_free:
+	kfree(aled);
+	return ret;
+}
+
+static void
+ar8327_led_destroy(struct ar8327_led *aled)
+{
+	ar8327_led_unregister(aled);
+	kfree(aled);
+}
+
+static void
+ar8327_leds_init(struct ar8xxx_priv *priv)
+{
+	struct ar8327_data *data = priv->chip_data;
+	unsigned i;
+
+	if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+		return;
+
+	for (i = 0; i < data->num_leds; i++) {
+		struct ar8327_led *aled;
+
+		aled = data->leds[i];
+
+		if (aled->enable_hw_mode)
+			aled->pattern = AR8327_LED_PATTERN_RULE;
+		else
+			aled->pattern = AR8327_LED_PATTERN_OFF;
+
+		ar8327_set_led_pattern(priv, aled->led_num, aled->pattern);
+	}
+}
+
+static void
+ar8327_leds_cleanup(struct ar8xxx_priv *priv)
+{
+	struct ar8327_data *data = priv->chip_data;
+	unsigned i;
+
+	if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+		return;
+
+	for (i = 0; i < data->num_leds; i++) {
+		struct ar8327_led *aled;
+
+		aled = data->leds[i];
+		ar8327_led_destroy(aled);
+	}
+
+	kfree(data->leds);
+}
+
+static int
+ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
+		       struct ar8327_platform_data *pdata)
+{
+	struct ar8327_led_cfg *led_cfg;
+	struct ar8327_data *data = priv->chip_data;
+	u32 pos, new_pos;
+	u32 t;
+
+	if (!pdata)
+		return -EINVAL;
+
+	priv->get_port_link = pdata->get_port_link;
+
+	data->port0_status = ar8327_get_port_init_status(&pdata->port0_cfg);
+	data->port6_status = ar8327_get_port_init_status(&pdata->port6_cfg);
+
+	t = ar8327_get_pad_cfg(pdata->pad0_cfg);
+	if (chip_is_ar8337(priv))
+		t |= AR8337_PAD_MAC06_EXCHANGE_EN;
+
+	priv->write(priv, AR8327_REG_PAD0_MODE, t);
+	t = ar8327_get_pad_cfg(pdata->pad5_cfg);
+	priv->write(priv, AR8327_REG_PAD5_MODE, t);
+	t = ar8327_get_pad_cfg(pdata->pad6_cfg);
+	priv->write(priv, AR8327_REG_PAD6_MODE, t);
+
+	pos = priv->read(priv, AR8327_REG_POWER_ON_STRIP);
+	new_pos = pos;
+
+	led_cfg = pdata->led_cfg;
+	if (led_cfg) {
+		if (led_cfg->open_drain)
+			new_pos |= AR8327_POWER_ON_STRIP_LED_OPEN_EN;
+		else
+			new_pos &= ~AR8327_POWER_ON_STRIP_LED_OPEN_EN;
+
+		priv->write(priv, AR8327_REG_LED_CTRL0, led_cfg->led_ctrl0);
+		priv->write(priv, AR8327_REG_LED_CTRL1, led_cfg->led_ctrl1);
+		priv->write(priv, AR8327_REG_LED_CTRL2, led_cfg->led_ctrl2);
+		priv->write(priv, AR8327_REG_LED_CTRL3, led_cfg->led_ctrl3);
+
+		if (new_pos != pos)
+			new_pos |= AR8327_POWER_ON_STRIP_POWER_ON_SEL;
+	}
+
+	if (pdata->sgmii_cfg) {
+		t = pdata->sgmii_cfg->sgmii_ctrl;
+		if (priv->chip_rev == 1)
+			t |= AR8327_SGMII_CTRL_EN_PLL |
+			     AR8327_SGMII_CTRL_EN_RX |
+			     AR8327_SGMII_CTRL_EN_TX;
+		else
+			t &= ~(AR8327_SGMII_CTRL_EN_PLL |
+			       AR8327_SGMII_CTRL_EN_RX |
+			       AR8327_SGMII_CTRL_EN_TX);
+
+		priv->write(priv, AR8327_REG_SGMII_CTRL, t);
+
+		if (pdata->sgmii_cfg->serdes_aen)
+			new_pos &= ~AR8327_POWER_ON_STRIP_SERDES_AEN;
+		else
+			new_pos |= AR8327_POWER_ON_STRIP_SERDES_AEN;
+	}
+
+	priv->write(priv, AR8327_REG_POWER_ON_STRIP, new_pos);
+
+	if (pdata->leds && pdata->num_leds) {
+		int i;
+
+		data->leds = kzalloc(pdata->num_leds * sizeof(void *),
+				     GFP_KERNEL);
+		if (!data->leds)
+			return -ENOMEM;
+
+		for (i = 0; i < pdata->num_leds; i++)
+			ar8327_led_create(priv, &pdata->leds[i]);
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_OF
+static int
+ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
+{
+	struct ar8327_data *data = priv->chip_data;
+	const __be32 *paddr;
+	int len;
+	int i;
+
+	paddr = of_get_property(np, "qca,ar8327-initvals", &len);
+	if (!paddr || len < (2 * sizeof(*paddr)))
+		return -EINVAL;
+
+	len /= sizeof(*paddr);
+
+	for (i = 0; i < len - 1; i += 2) {
+		u32 reg;
+		u32 val;
+
+		reg = be32_to_cpup(paddr + i);
+		val = be32_to_cpup(paddr + i + 1);
+
+		switch (reg) {
+		case AR8327_REG_PORT_STATUS(0):
+			data->port0_status = val;
+			break;
+		case AR8327_REG_PORT_STATUS(6):
+			data->port6_status = val;
+			break;
+		default:
+			priv->write(priv, reg, val);
+			break;
+		}
+	}
+
+	return 0;
+}
+#else
+static inline int
+ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
+{
+	return -EINVAL;
+}
+#endif
+
+static int
+ar8327_hw_init(struct ar8xxx_priv *priv)
+{
+	int ret;
+
+	priv->chip_data = kzalloc(sizeof(struct ar8327_data), GFP_KERNEL);
+	if (!priv->chip_data)
+		return -ENOMEM;
+
+	if (priv->phy->dev.of_node)
+		ret = ar8327_hw_config_of(priv, priv->phy->dev.of_node);
+	else
+		ret = ar8327_hw_config_pdata(priv,
+					     priv->phy->dev.platform_data);
+
+	if (ret)
+		return ret;
+
+	ar8327_leds_init(priv);
+
+	ar8xxx_phy_init(priv);
+
+	return 0;
+}
+
+static void
+ar8327_cleanup(struct ar8xxx_priv *priv)
+{
+	ar8327_leds_cleanup(priv);
+}
+
+static void
+ar8327_init_globals(struct ar8xxx_priv *priv)
+{
+	u32 t;
+
+	/* enable CPU port and disable mirror port */
+	t = AR8327_FWD_CTRL0_CPU_PORT_EN |
+	    AR8327_FWD_CTRL0_MIRROR_PORT;
+	priv->write(priv, AR8327_REG_FWD_CTRL0, t);
+
+	/* forward multicast and broadcast frames to CPU */
+	t = (AR8327_PORTS_ALL << AR8327_FWD_CTRL1_UC_FLOOD_S) |
+	    (AR8327_PORTS_ALL << AR8327_FWD_CTRL1_MC_FLOOD_S) |
+	    (AR8327_PORTS_ALL << AR8327_FWD_CTRL1_BC_FLOOD_S);
+	priv->write(priv, AR8327_REG_FWD_CTRL1, t);
+
+	/* enable jumbo frames */
+	ar8xxx_rmw(priv, AR8327_REG_MAX_FRAME_SIZE,
+		   AR8327_MAX_FRAME_SIZE_MTU, 9018 + 8 + 2);
+
+	/* Enable MIB counters */
+	ar8xxx_reg_set(priv, AR8327_REG_MODULE_EN,
+		       AR8327_MODULE_EN_MIB);
+
+	/* Disable EEE on all ports due to stability issues */
+	t = priv->read(priv, AR8327_REG_EEE_CTRL);
+	t |= AR8327_EEE_CTRL_DISABLE_PHY(0) |
+	     AR8327_EEE_CTRL_DISABLE_PHY(1) |
+	     AR8327_EEE_CTRL_DISABLE_PHY(2) |
+	     AR8327_EEE_CTRL_DISABLE_PHY(3) |
+	     AR8327_EEE_CTRL_DISABLE_PHY(4);
+	priv->write(priv, AR8327_REG_EEE_CTRL, t);
+}
+
+static void
+ar8327_init_port(struct ar8xxx_priv *priv, int port)
+{
+	struct ar8327_data *data = priv->chip_data;
+	u32 t;
+
+	if (port == AR8216_PORT_CPU)
+		t = data->port0_status;
+	else if (port == 6)
+		t = data->port6_status;
+	else
+		t = AR8216_PORT_STATUS_LINK_AUTO;
+
+	priv->write(priv, AR8327_REG_PORT_STATUS(port), t);
+	priv->write(priv, AR8327_REG_PORT_HEADER(port), 0);
+
+	t = 1 << AR8327_PORT_VLAN0_DEF_SVID_S;
+	t |= 1 << AR8327_PORT_VLAN0_DEF_CVID_S;
+	priv->write(priv, AR8327_REG_PORT_VLAN0(port), t);
+
+	t = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH << AR8327_PORT_VLAN1_OUT_MODE_S;
+	priv->write(priv, AR8327_REG_PORT_VLAN1(port), t);
+
+	t = AR8327_PORT_LOOKUP_LEARN;
+	t |= AR8216_PORT_STATE_FORWARD << AR8327_PORT_LOOKUP_STATE_S;
+	priv->write(priv, AR8327_REG_PORT_LOOKUP(port), t);
+}
+
+static u32
+ar8327_read_port_status(struct ar8xxx_priv *priv, int port)
+{
+	return priv->read(priv, AR8327_REG_PORT_STATUS(port));
+}
+
+static int
+ar8327_atu_flush(struct ar8xxx_priv *priv)
+{
+	int ret;
+
+	ret = ar8216_wait_bit(priv, AR8327_REG_ATU_FUNC,
+			      AR8327_ATU_FUNC_BUSY, 0);
+	if (!ret)
+		priv->write(priv, AR8327_REG_ATU_FUNC,
+			    AR8327_ATU_FUNC_OP_FLUSH);
+
+	return ret;
+}
+
+static void
+ar8327_vtu_op(struct ar8xxx_priv *priv, u32 op, u32 val)
+{
+	if (ar8216_wait_bit(priv, AR8327_REG_VTU_FUNC1,
+			    AR8327_VTU_FUNC1_BUSY, 0))
+		return;
+
+	if ((op & AR8327_VTU_FUNC1_OP) == AR8327_VTU_FUNC1_OP_LOAD)
+		priv->write(priv, AR8327_REG_VTU_FUNC0, val);
+
+	op |= AR8327_VTU_FUNC1_BUSY;
+	priv->write(priv, AR8327_REG_VTU_FUNC1, op);
+}
+
+static void
+ar8327_vtu_flush(struct ar8xxx_priv *priv)
+{
+	ar8327_vtu_op(priv, AR8327_VTU_FUNC1_OP_FLUSH, 0);
+}
+
+static void
+ar8327_vtu_load_vlan(struct ar8xxx_priv *priv, u32 vid, u32 port_mask)
+{
+	u32 op;
+	u32 val;
+	int i;
+
+	op = AR8327_VTU_FUNC1_OP_LOAD | (vid << AR8327_VTU_FUNC1_VID_S);
+	val = AR8327_VTU_FUNC0_VALID | AR8327_VTU_FUNC0_IVL;
+	for (i = 0; i < AR8327_NUM_PORTS; i++) {
+		u32 mode;
+
+		if ((port_mask & BIT(i)) == 0)
+			mode = AR8327_VTU_FUNC0_EG_MODE_NOT;
+		else if (priv->vlan == 0)
+			mode = AR8327_VTU_FUNC0_EG_MODE_KEEP;
+		else if ((priv->vlan_tagged & BIT(i)) || (priv->vlan_id[priv->pvid[i]] != vid))
+			mode = AR8327_VTU_FUNC0_EG_MODE_TAG;
+		else
+			mode = AR8327_VTU_FUNC0_EG_MODE_UNTAG;
+
+		val |= mode << AR8327_VTU_FUNC0_EG_MODE_S(i);
+	}
+	ar8327_vtu_op(priv, op, val);
+}
+
+static void
+ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
+{
+	u32 t;
+	u32 egress, ingress;
+	u32 pvid = priv->vlan_id[priv->pvid[port]];
+
+	if (priv->vlan) {
+		egress = AR8327_PORT_VLAN1_OUT_MODE_UNMOD;
+		ingress = AR8216_IN_SECURE;
+	} else {
+		egress = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH;
+		ingress = AR8216_IN_PORT_ONLY;
+	}
+
+	t = pvid << AR8327_PORT_VLAN0_DEF_SVID_S;
+	t |= pvid << AR8327_PORT_VLAN0_DEF_CVID_S;
+	priv->write(priv, AR8327_REG_PORT_VLAN0(port), t);
+
+	t = AR8327_PORT_VLAN1_PORT_VLAN_PROP;
+	t |= egress << AR8327_PORT_VLAN1_OUT_MODE_S;
+	priv->write(priv, AR8327_REG_PORT_VLAN1(port), t);
+
+	t = members;
+	t |= AR8327_PORT_LOOKUP_LEARN;
+	t |= ingress << AR8327_PORT_LOOKUP_IN_MODE_S;
+	t |= AR8216_PORT_STATE_FORWARD << AR8327_PORT_LOOKUP_STATE_S;
+	priv->write(priv, AR8327_REG_PORT_LOOKUP(port), t);
+}
+
+static const struct ar8xxx_chip ar8327_chip = {
+	.caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+	.config_at_probe = true,
+	.mii_lo_first = true,
+
+	.reg_port_stats_start = 0x1000,
+	.reg_port_stats_length = 0x100,
+
+	.hw_init = ar8327_hw_init,
+	.cleanup = ar8327_cleanup,
+	.init_globals = ar8327_init_globals,
+	.init_port = ar8327_init_port,
+	.setup_port = ar8327_setup_port,
+	.read_port_status = ar8327_read_port_status,
+	.atu_flush = ar8327_atu_flush,
+	.vtu_flush = ar8327_vtu_flush,
+	.vtu_load_vlan = ar8327_vtu_load_vlan,
+	.phy_fixup = ar8327_phy_fixup,
+	.set_mirror_regs = ar8327_set_mirror_regs,
+
+	.num_mibs = ARRAY_SIZE(ar8236_mibs),
+	.mib_decs = ar8236_mibs,
+	.mib_func = AR8327_REG_MIB_FUNC
+};
+
+static int
+ar8xxx_sw_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		   struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	priv->vlan = !!val->value.i;
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		   struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	val->value.i = priv->vlan;
+	return 0;
+}
+
+
+static int
+ar8xxx_sw_set_pvid(struct switch_dev *dev, int port, int vlan)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+	/* make sure no invalid PVIDs get set */
+
+	if (vlan >= dev->vlans)
+		return -EINVAL;
+
+	priv->pvid[port] = vlan;
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_pvid(struct switch_dev *dev, int port, int *vlan)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	*vlan = priv->pvid[port];
+	return 0;
+}
+
+static int
+ar8xxx_sw_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		  struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	priv->vlan_id[val->port_vlan] = val->value.i;
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		  struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	val->value.i = priv->vlan_id[val->port_vlan];
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_port_link(struct switch_dev *dev, int port,
+			struct switch_port_link *link)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+	ar8216_read_port_link(priv, port, link);
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	u8 ports = priv->vlan_table[val->port_vlan];
+	int i;
+
+	val->len = 0;
+	for (i = 0; i < dev->ports; i++) {
+		struct switch_port *p;
+
+		if (!(ports & (1 << i)))
+			continue;
+
+		p = &val->value.ports[val->len++];
+		p->id = i;
+		if (priv->vlan_tagged & (1 << i))
+			p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+		else
+			p->flags = 0;
+	}
+	return 0;
+}
+
+static int
+ar8327_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	u8 ports = priv->vlan_table[val->port_vlan];
+	int i;
+
+	val->len = 0;
+	for (i = 0; i < dev->ports; i++) {
+		struct switch_port *p;
+
+		if (!(ports & (1 << i)))
+			continue;
+
+		p = &val->value.ports[val->len++];
+		p->id = i;
+		if ((priv->vlan_tagged & (1 << i)) || (priv->pvid[i] != val->port_vlan))
+			p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+		else
+			p->flags = 0;
+	}
+	return 0;
+}
+
+static int
+ar8xxx_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	u8 *vt = &priv->vlan_table[val->port_vlan];
+	int i, j;
+
+	*vt = 0;
+	for (i = 0; i < val->len; i++) {
+		struct switch_port *p = &val->value.ports[i];
+
+		if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
+			priv->vlan_tagged |= (1 << p->id);
+		} else {
+			priv->vlan_tagged &= ~(1 << p->id);
+			priv->pvid[p->id] = val->port_vlan;
+
+			/* make sure that an untagged port does not
+			 * appear in other vlans */
+			for (j = 0; j < AR8X16_MAX_VLANS; j++) {
+				if (j == val->port_vlan)
+					continue;
+				priv->vlan_table[j] &= ~(1 << p->id);
+			}
+		}
+
+		*vt |= 1 << p->id;
+	}
+	return 0;
+}
+
+static int
+ar8327_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	u8 *vt = &priv->vlan_table[val->port_vlan];
+	int i;
+
+	*vt = 0;
+	for (i = 0; i < val->len; i++) {
+		struct switch_port *p = &val->value.ports[i];
+
+		if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
+			if (val->port_vlan == priv->pvid[p->id]) {
+				priv->vlan_tagged |= (1 << p->id);
+			}
+		} else {
+			priv->vlan_tagged &= ~(1 << p->id);
+			priv->pvid[p->id] = val->port_vlan;
+		}
+
+		*vt |= 1 << p->id;
+	}
+	return 0;
+}
+
+static void
+ar8327_set_mirror_regs(struct ar8xxx_priv *priv)
+{
+	int port;
+
+	/* reset all mirror registers */
+	ar8xxx_rmw(priv, AR8327_REG_FWD_CTRL0,
+		   AR8327_FWD_CTRL0_MIRROR_PORT,
+		   (0xF << AR8327_FWD_CTRL0_MIRROR_PORT_S));
+	for (port = 0; port < AR8327_NUM_PORTS; port++) {
+		ar8xxx_rmw(priv, AR8327_REG_PORT_LOOKUP(port),
+			   AR8327_PORT_LOOKUP_ING_MIRROR_EN,
+			   0);
+
+		ar8xxx_rmw(priv, AR8327_REG_PORT_HOL_CTRL1(port),
+			   AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN,
+			   0);
+	}
+
+	/* now enable mirroring if necessary */
+	if (priv->source_port >= AR8327_NUM_PORTS ||
+	    priv->monitor_port >= AR8327_NUM_PORTS ||
+	    priv->source_port == priv->monitor_port) {
+		return;
+	}
+
+	ar8xxx_rmw(priv, AR8327_REG_FWD_CTRL0,
+		   AR8327_FWD_CTRL0_MIRROR_PORT,
+		   (priv->monitor_port << AR8327_FWD_CTRL0_MIRROR_PORT_S));
+
+	if (priv->mirror_rx)
+		ar8xxx_rmw(priv, AR8327_REG_PORT_LOOKUP(priv->source_port),
+			   AR8327_PORT_LOOKUP_ING_MIRROR_EN,
+			   AR8327_PORT_LOOKUP_ING_MIRROR_EN);
+
+	if (priv->mirror_tx)
+		ar8xxx_rmw(priv, AR8327_REG_PORT_HOL_CTRL1(priv->source_port),
+			   AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN,
+			   AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN);
+}
+
+static void
+ar8216_set_mirror_regs(struct ar8xxx_priv *priv)
+{
+	int port;
+
+	/* reset all mirror registers */
+	ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CPUPORT,
+		   AR8216_GLOBAL_CPUPORT_MIRROR_PORT,
+		   (0xF << AR8216_GLOBAL_CPUPORT_MIRROR_PORT_S));
+	for (port = 0; port < AR8216_NUM_PORTS; port++) {
+		ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(port),
+			   AR8216_PORT_CTRL_MIRROR_RX,
+			   0);
+
+		ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(port),
+			   AR8216_PORT_CTRL_MIRROR_TX,
+			   0);
+	}
+
+	/* now enable mirroring if necessary */
+	if (priv->source_port >= AR8216_NUM_PORTS ||
+	    priv->monitor_port >= AR8216_NUM_PORTS ||
+	    priv->source_port == priv->monitor_port) {
+		return;
+	}
+
+	ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CPUPORT,
+		   AR8216_GLOBAL_CPUPORT_MIRROR_PORT,
+		   (priv->monitor_port << AR8216_GLOBAL_CPUPORT_MIRROR_PORT_S));
+
+	if (priv->mirror_rx)
+		ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(priv->source_port),
+			   AR8216_PORT_CTRL_MIRROR_RX,
+			   AR8216_PORT_CTRL_MIRROR_RX);
+
+	if (priv->mirror_tx)
+		ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(priv->source_port),
+			   AR8216_PORT_CTRL_MIRROR_TX,
+			   AR8216_PORT_CTRL_MIRROR_TX);
+}
+
+static int
+ar8xxx_sw_hw_apply(struct switch_dev *dev)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	u8 portmask[AR8X16_MAX_PORTS];
+	int i, j;
+
+	mutex_lock(&priv->reg_mutex);
+	/* flush all vlan translation unit entries */
+	priv->chip->vtu_flush(priv);
+
+	memset(portmask, 0, sizeof(portmask));
+	if (!priv->init) {
+		/* calculate the port destination masks and load vlans
+		 * into the vlan translation unit */
+		for (j = 0; j < AR8X16_MAX_VLANS; j++) {
+			u8 vp = priv->vlan_table[j];
+
+			if (!vp)
+				continue;
+
+			for (i = 0; i < dev->ports; i++) {
+				u8 mask = (1 << i);
+				if (vp & mask)
+					portmask[i] |= vp & ~mask;
+			}
+
+			priv->chip->vtu_load_vlan(priv, priv->vlan_id[j],
+						 priv->vlan_table[j]);
+		}
+	} else {
+		/* vlan disabled:
+		 * isolate all ports, but connect them to the cpu port */
+		for (i = 0; i < dev->ports; i++) {
+			if (i == AR8216_PORT_CPU)
+				continue;
+
+			portmask[i] = 1 << AR8216_PORT_CPU;
+			portmask[AR8216_PORT_CPU] |= (1 << i);
+		}
+	}
+
+	/* update the port destination mask registers and tag settings */
+	for (i = 0; i < dev->ports; i++) {
+		priv->chip->setup_port(priv, i, portmask[i]);
+	}
+
+	priv->chip->set_mirror_regs(priv);
+
+	mutex_unlock(&priv->reg_mutex);
+	return 0;
+}
+
+static int
+ar8xxx_sw_reset_switch(struct switch_dev *dev)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	int i;
+
+	mutex_lock(&priv->reg_mutex);
+	memset(&priv->vlan, 0, sizeof(struct ar8xxx_priv) -
+		offsetof(struct ar8xxx_priv, vlan));
+
+	for (i = 0; i < AR8X16_MAX_VLANS; i++)
+		priv->vlan_id[i] = i;
+
+	/* Configure all ports */
+	for (i = 0; i < dev->ports; i++)
+		priv->chip->init_port(priv, i);
+
+	priv->mirror_rx = false;
+	priv->mirror_tx = false;
+	priv->source_port = 0;
+	priv->monitor_port = 0;
+
+	priv->chip->init_globals(priv);
+
+	mutex_unlock(&priv->reg_mutex);
+
+	return ar8xxx_sw_hw_apply(dev);
+}
+
+static int
+ar8xxx_sw_set_reset_mibs(struct switch_dev *dev,
+			 const struct switch_attr *attr,
+			 struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	unsigned int len;
+	int ret;
+
+	if (!ar8xxx_has_mib_counters(priv))
+		return -EOPNOTSUPP;
+
+	mutex_lock(&priv->mib_lock);
+
+	len = priv->dev.ports * priv->chip->num_mibs *
+	      sizeof(*priv->mib_stats);
+	memset(priv->mib_stats, '\0', len);
+	ret = ar8xxx_mib_flush(priv);
+	if (ret)
+		goto unlock;
+
+	ret = 0;
+
+unlock:
+	mutex_unlock(&priv->mib_lock);
+	return ret;
+}
+
+static int
+ar8xxx_sw_set_mirror_rx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+	mutex_lock(&priv->reg_mutex);
+	priv->mirror_rx = !!val->value.i;
+	priv->chip->set_mirror_regs(priv);
+	mutex_unlock(&priv->reg_mutex);
+
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_mirror_rx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	val->value.i = priv->mirror_rx;
+	return 0;
+}
+
+static int
+ar8xxx_sw_set_mirror_tx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+	mutex_lock(&priv->reg_mutex);
+	priv->mirror_tx = !!val->value.i;
+	priv->chip->set_mirror_regs(priv);
+	mutex_unlock(&priv->reg_mutex);
+
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_mirror_tx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	val->value.i = priv->mirror_tx;
+	return 0;
+}
+
+static int
+ar8xxx_sw_set_mirror_monitor_port(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+	mutex_lock(&priv->reg_mutex);
+	priv->monitor_port = val->value.i;
+	priv->chip->set_mirror_regs(priv);
+	mutex_unlock(&priv->reg_mutex);
+
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_mirror_monitor_port(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	val->value.i = priv->monitor_port;
+	return 0;
+}
+
+static int
+ar8xxx_sw_set_mirror_source_port(struct switch_dev *dev,
+				 const struct switch_attr *attr,
+				 struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+	mutex_lock(&priv->reg_mutex);
+	priv->source_port = val->value.i;
+	priv->chip->set_mirror_regs(priv);
+	mutex_unlock(&priv->reg_mutex);
+
+	return 0;
+}
+
+static int
+ar8xxx_sw_get_mirror_source_port(struct switch_dev *dev,
+				 const struct switch_attr *attr,
+				 struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	val->value.i = priv->source_port;
+	return 0;
+}
+
+static int
+ar8xxx_sw_set_port_reset_mib(struct switch_dev *dev,
+			     const struct switch_attr *attr,
+			     struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	int port;
+	int ret;
+
+	if (!ar8xxx_has_mib_counters(priv))
+		return -EOPNOTSUPP;
+
+	port = val->port_vlan;
+	if (port >= dev->ports)
+		return -EINVAL;
+
+	mutex_lock(&priv->mib_lock);
+	ret = ar8xxx_mib_capture(priv);
+	if (ret)
+		goto unlock;
+
+	ar8xxx_mib_fetch_port_stat(priv, port, true);
+
+	ret = 0;
+
+unlock:
+	mutex_unlock(&priv->mib_lock);
+	return ret;
+}
+
+static int
+ar8xxx_sw_get_port_mib(struct switch_dev *dev,
+		       const struct switch_attr *attr,
+		       struct switch_val *val)
+{
+	struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+	const struct ar8xxx_chip *chip = priv->chip;
+	u64 *mib_stats;
+	int port;
+	int ret;
+	char *buf = priv->buf;
+	int i, len = 0;
+
+	if (!ar8xxx_has_mib_counters(priv))
+		return -EOPNOTSUPP;
+
+	port = val->port_vlan;
+	if (port >= dev->ports)
+		return -EINVAL;
+
+	mutex_lock(&priv->mib_lock);
+	ret = ar8xxx_mib_capture(priv);
+	if (ret)
+		goto unlock;
+
+	ar8xxx_mib_fetch_port_stat(priv, port, false);
+
+	len += snprintf(buf + len, sizeof(priv->buf) - len,
+			"Port %d MIB counters\n",
+			port);
+
+	mib_stats = &priv->mib_stats[port * chip->num_mibs];
+	for (i = 0; i < chip->num_mibs; i++)
+		len += snprintf(buf + len, sizeof(priv->buf) - len,
+				"%-12s: %llu\n",
+				chip->mib_decs[i].name,
+				mib_stats[i]);
+
+	val->value.s = buf;
+	val->len = len;
+
+	ret = 0;
+
+unlock:
+	mutex_unlock(&priv->mib_lock);
+	return ret;
+}
+
+static struct switch_attr ar8xxx_sw_attr_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = ar8xxx_sw_set_vlan,
+		.get = ar8xxx_sw_get_vlan,
+		.max = 1
+	},
+	{
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mibs",
+		.description = "Reset all MIB counters",
+		.set = ar8xxx_sw_set_reset_mibs,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_mirror_rx",
+		.description = "Enable mirroring of RX packets",
+		.set = ar8xxx_sw_set_mirror_rx_enable,
+		.get = ar8xxx_sw_get_mirror_rx_enable,
+		.max = 1
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_mirror_tx",
+		.description = "Enable mirroring of TX packets",
+		.set = ar8xxx_sw_set_mirror_tx_enable,
+		.get = ar8xxx_sw_get_mirror_tx_enable,
+		.max = 1
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "mirror_monitor_port",
+		.description = "Mirror monitor port",
+		.set = ar8xxx_sw_set_mirror_monitor_port,
+		.get = ar8xxx_sw_get_mirror_monitor_port,
+		.max = AR8216_NUM_PORTS - 1
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "mirror_source_port",
+		.description = "Mirror source port",
+		.set = ar8xxx_sw_set_mirror_source_port,
+		.get = ar8xxx_sw_get_mirror_source_port,
+		.max = AR8216_NUM_PORTS - 1
+ 	},
+};
+
+static struct switch_attr ar8327_sw_attr_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = ar8xxx_sw_set_vlan,
+		.get = ar8xxx_sw_get_vlan,
+		.max = 1
+	},
+	{
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mibs",
+		.description = "Reset all MIB counters",
+		.set = ar8xxx_sw_set_reset_mibs,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_mirror_rx",
+		.description = "Enable mirroring of RX packets",
+		.set = ar8xxx_sw_set_mirror_rx_enable,
+		.get = ar8xxx_sw_get_mirror_rx_enable,
+		.max = 1
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_mirror_tx",
+		.description = "Enable mirroring of TX packets",
+		.set = ar8xxx_sw_set_mirror_tx_enable,
+		.get = ar8xxx_sw_get_mirror_tx_enable,
+		.max = 1
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "mirror_monitor_port",
+		.description = "Mirror monitor port",
+		.set = ar8xxx_sw_set_mirror_monitor_port,
+		.get = ar8xxx_sw_get_mirror_monitor_port,
+		.max = AR8327_NUM_PORTS - 1
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "mirror_source_port",
+		.description = "Mirror source port",
+		.set = ar8xxx_sw_set_mirror_source_port,
+		.get = ar8xxx_sw_get_mirror_source_port,
+		.max = AR8327_NUM_PORTS - 1
+ 	},
+};
+
+static struct switch_attr ar8xxx_sw_attr_port[] = {
+	{
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mib",
+		.description = "Reset single port MIB counters",
+		.set = ar8xxx_sw_set_port_reset_mib,
+	},
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "mib",
+		.description = "Get port's MIB counters",
+		.set = NULL,
+		.get = ar8xxx_sw_get_port_mib,
+	},
+};
+
+static struct switch_attr ar8xxx_sw_attr_vlan[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "vid",
+		.description = "VLAN ID (0-4094)",
+		.set = ar8xxx_sw_set_vid,
+		.get = ar8xxx_sw_get_vid,
+		.max = 4094,
+	},
+};
+
+static const struct switch_dev_ops ar8xxx_sw_ops = {
+	.attr_global = {
+		.attr = ar8xxx_sw_attr_globals,
+		.n_attr = ARRAY_SIZE(ar8xxx_sw_attr_globals),
+	},
+	.attr_port = {
+		.attr = ar8xxx_sw_attr_port,
+		.n_attr = ARRAY_SIZE(ar8xxx_sw_attr_port),
+	},
+	.attr_vlan = {
+		.attr = ar8xxx_sw_attr_vlan,
+		.n_attr = ARRAY_SIZE(ar8xxx_sw_attr_vlan),
+	},
+	.get_port_pvid = ar8xxx_sw_get_pvid,
+	.set_port_pvid = ar8xxx_sw_set_pvid,
+	.get_vlan_ports = ar8xxx_sw_get_ports,
+	.set_vlan_ports = ar8xxx_sw_set_ports,
+	.apply_config = ar8xxx_sw_hw_apply,
+	.reset_switch = ar8xxx_sw_reset_switch,
+	.get_port_link = ar8xxx_sw_get_port_link,
+};
+
+static const struct switch_dev_ops ar8327_sw_ops = {
+	.attr_global = {
+		.attr = ar8327_sw_attr_globals,
+		.n_attr = ARRAY_SIZE(ar8327_sw_attr_globals),
+	},
+	.attr_port = {
+		.attr = ar8xxx_sw_attr_port,
+		.n_attr = ARRAY_SIZE(ar8xxx_sw_attr_port),
+	},
+	.attr_vlan = {
+		.attr = ar8xxx_sw_attr_vlan,
+		.n_attr = ARRAY_SIZE(ar8xxx_sw_attr_vlan),
+	},
+	.get_port_pvid = ar8xxx_sw_get_pvid,
+	.set_port_pvid = ar8xxx_sw_set_pvid,
+	.get_vlan_ports = ar8327_sw_get_ports,
+	.set_vlan_ports = ar8327_sw_set_ports,
+	.apply_config = ar8xxx_sw_hw_apply,
+	.reset_switch = ar8xxx_sw_reset_switch,
+	.get_port_link = ar8xxx_sw_get_port_link,
+};
+
+static int
+ar8xxx_id_chip(struct ar8xxx_priv *priv)
+{
+	u32 val;
+	u16 id;
+	int i;
+
+	val = priv->read(priv, AR8216_REG_CTRL);
+	if (val == ~0)
+		return -ENODEV;
+
+	id = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
+	for (i = 0; i < AR8X16_PROBE_RETRIES; i++) {
+		u16 t;
+
+		val = priv->read(priv, AR8216_REG_CTRL);
+		if (val == ~0)
+			return -ENODEV;
+
+		t = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
+		if (t != id)
+			return -ENODEV;
+	}
+
+	priv->chip_ver = (id & AR8216_CTRL_VERSION) >> AR8216_CTRL_VERSION_S;
+	priv->chip_rev = (id & AR8216_CTRL_REVISION);
+
+	switch (priv->chip_ver) {
+	case AR8XXX_VER_AR8216:
+		priv->chip = &ar8216_chip;
+		break;
+	case AR8XXX_VER_AR8236:
+		priv->chip = &ar8236_chip;
+		break;
+	case AR8XXX_VER_AR8316:
+		priv->chip = &ar8316_chip;
+		break;
+	case AR8XXX_VER_AR8327:
+		priv->chip = &ar8327_chip;
+		break;
+	case AR8XXX_VER_AR8337:
+		priv->chip = &ar8327_chip;
+		break;
+	default:
+		pr_err("ar8216: Unknown Atheros device [ver=%d, rev=%d]\n",
+		       priv->chip_ver, priv->chip_rev);
+
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static void
+ar8xxx_mib_work_func(struct work_struct *work)
+{
+	struct ar8xxx_priv *priv;
+	int err;
+
+	priv = container_of(work, struct ar8xxx_priv, mib_work.work);
+
+	mutex_lock(&priv->mib_lock);
+
+	err = ar8xxx_mib_capture(priv);
+	if (err)
+		goto next_port;
+
+	ar8xxx_mib_fetch_port_stat(priv, priv->mib_next_port, false);
+
+next_port:
+	priv->mib_next_port++;
+	if (priv->mib_next_port >= priv->dev.ports)
+		priv->mib_next_port = 0;
+
+	mutex_unlock(&priv->mib_lock);
+	schedule_delayed_work(&priv->mib_work,
+			      msecs_to_jiffies(AR8XXX_MIB_WORK_DELAY));
+}
+
+static int
+ar8xxx_mib_init(struct ar8xxx_priv *priv)
+{
+	unsigned int len;
+
+	if (!ar8xxx_has_mib_counters(priv))
+		return 0;
+
+	BUG_ON(!priv->chip->mib_decs || !priv->chip->num_mibs);
+
+	len = priv->dev.ports * priv->chip->num_mibs *
+	      sizeof(*priv->mib_stats);
+	priv->mib_stats = kzalloc(len, GFP_KERNEL);
+
+	if (!priv->mib_stats)
+		return -ENOMEM;
+
+	return 0;
+}
+
+static void
+ar8xxx_mib_start(struct ar8xxx_priv *priv)
+{
+	if (!ar8xxx_has_mib_counters(priv))
+		return;
+
+	schedule_delayed_work(&priv->mib_work,
+			      msecs_to_jiffies(AR8XXX_MIB_WORK_DELAY));
+}
+
+static void
+ar8xxx_mib_stop(struct ar8xxx_priv *priv)
+{
+	if (!ar8xxx_has_mib_counters(priv))
+		return;
+
+	cancel_delayed_work(&priv->mib_work);
+}
+
+static struct ar8xxx_priv *
+ar8xxx_create(void)
+{
+	struct ar8xxx_priv *priv;
+
+	priv = kzalloc(sizeof(struct ar8xxx_priv), GFP_KERNEL);
+	if (priv == NULL)
+		return NULL;
+
+	mutex_init(&priv->reg_mutex);
+	mutex_init(&priv->mib_lock);
+	INIT_DELAYED_WORK(&priv->mib_work, ar8xxx_mib_work_func);
+
+	return priv;
+}
+
+static void
+ar8xxx_free(struct ar8xxx_priv *priv)
+{
+	if (priv->chip && priv->chip->cleanup)
+		priv->chip->cleanup(priv);
+
+	kfree(priv->chip_data);
+	kfree(priv->mib_stats);
+	kfree(priv);
+}
+
+static struct ar8xxx_priv *
+ar8xxx_create_mii(struct mii_bus *bus)
+{
+	struct ar8xxx_priv *priv;
+
+	priv = ar8xxx_create();
+	if (priv) {
+		priv->mii_bus = bus;
+		priv->read = ar8xxx_mii_read;
+		priv->write = ar8xxx_mii_write;
+		priv->rmw = ar8xxx_mii_rmw;
+	}
+
+	return priv;
+}
+
+static int
+ar8xxx_probe_switch(struct ar8xxx_priv *priv)
+{
+	struct switch_dev *swdev;
+	int ret;
+
+	ret = ar8xxx_id_chip(priv);
+	if (ret)
+		return ret;
+
+	swdev = &priv->dev;
+	swdev->cpu_port = AR8216_PORT_CPU;
+	swdev->ops = &ar8xxx_sw_ops;
+
+	if (chip_is_ar8316(priv)) {
+		swdev->name = "Atheros AR8316";
+		swdev->vlans = AR8X16_MAX_VLANS;
+		swdev->ports = AR8216_NUM_PORTS;
+	} else if (chip_is_ar8236(priv)) {
+		swdev->name = "Atheros AR8236";
+		swdev->vlans = AR8216_NUM_VLANS;
+		swdev->ports = AR8216_NUM_PORTS;
+	} else if (chip_is_ar8327(priv)) {
+		swdev->name = "Atheros AR8327";
+		swdev->vlans = AR8X16_MAX_VLANS;
+		swdev->ports = AR8327_NUM_PORTS;
+		swdev->ops = &ar8327_sw_ops;
+	} else if (chip_is_ar8337(priv)) {
+		swdev->name = "Atheros AR8337";
+		swdev->vlans = AR8X16_MAX_VLANS;
+		swdev->ports = AR8327_NUM_PORTS;
+		swdev->ops = &ar8327_sw_ops;
+	} else {
+		swdev->name = "Atheros AR8216";
+		swdev->vlans = AR8216_NUM_VLANS;
+		swdev->ports = AR8216_NUM_PORTS;
+	}
+
+	ret = ar8xxx_mib_init(priv);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int
+ar8xxx_start(struct ar8xxx_priv *priv)
+{
+	int ret;
+
+	priv->init = true;
+
+	ret = priv->chip->hw_init(priv);
+	if (ret)
+		return ret;
+
+	ret = ar8xxx_sw_reset_switch(&priv->dev);
+	if (ret)
+		return ret;
+
+	priv->init = false;
+
+	ar8xxx_mib_start(priv);
+
+	return 0;
+}
+
+static int
+ar8xxx_phy_config_init(struct phy_device *phydev)
+{
+	struct ar8xxx_priv *priv = phydev->priv;
+	struct net_device *dev = phydev->attached_dev;
+	int ret;
+
+	if (WARN_ON(!priv))
+		return -ENODEV;
+
+	if (priv->chip->config_at_probe)
+		return ar8xxx_phy_check_aneg(phydev);
+
+	priv->phy = phydev;
+
+	if (phydev->addr != 0) {
+		if (chip_is_ar8316(priv)) {
+			/* switch device has been initialized, reinit */
+			priv->dev.ports = (AR8216_NUM_PORTS - 1);
+			priv->initialized = false;
+			priv->port4_phy = true;
+			ar8316_hw_init(priv);
+			return 0;
+		}
+
+		return 0;
+	}
+
+	ret = ar8xxx_start(priv);
+	if (ret)
+		return ret;
+
+	/* VID fixup only needed on ar8216 */
+	if (chip_is_ar8216(priv)) {
+		dev->phy_ptr = priv;
+		dev->priv_flags |= IFF_NO_IP_ALIGN;
+		dev->eth_mangle_rx = ar8216_mangle_rx;
+		dev->eth_mangle_tx = ar8216_mangle_tx;
+	}
+
+	return 0;
+}
+
+static int
+ar8xxx_phy_read_status(struct phy_device *phydev)
+{
+	struct ar8xxx_priv *priv = phydev->priv;
+	struct switch_port_link link;
+	int ret;
+
+	if (phydev->addr != 0)
+		return genphy_read_status(phydev);
+
+	ar8216_read_port_link(priv, phydev->addr, &link);
+	phydev->link = !!link.link;
+	if (!phydev->link)
+		return 0;
+
+	switch (link.speed) {
+	case SWITCH_PORT_SPEED_10:
+		phydev->speed = SPEED_10;
+		break;
+	case SWITCH_PORT_SPEED_100:
+		phydev->speed = SPEED_100;
+		break;
+	case SWITCH_PORT_SPEED_1000:
+		phydev->speed = SPEED_1000;
+		break;
+	default:
+		phydev->speed = 0;
+	}
+	phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF;
+
+	/* flush the address translation unit */
+	mutex_lock(&priv->reg_mutex);
+	ret = priv->chip->atu_flush(priv);
+	mutex_unlock(&priv->reg_mutex);
+
+	phydev->state = PHY_RUNNING;
+	netif_carrier_on(phydev->attached_dev);
+	phydev->adjust_link(phydev->attached_dev);
+
+	return ret;
+}
+
+static int
+ar8xxx_phy_config_aneg(struct phy_device *phydev)
+{
+	if (phydev->addr == 0)
+		return 0;
+
+	return genphy_config_aneg(phydev);
+}
+
+static const u32 ar8xxx_phy_ids[] = {
+	0x004dd033,
+	0x004dd034, /* AR8327 */
+	0x004dd036, /* AR8337 */
+	0x004dd041,
+	0x004dd042,
+	0x004dd043, /* AR8236 */
+};
+
+static bool
+ar8xxx_phy_match(u32 phy_id)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(ar8xxx_phy_ids); i++)
+		if (phy_id == ar8xxx_phy_ids[i])
+			return true;
+
+	return false;
+}
+
+static bool
+ar8xxx_is_possible(struct mii_bus *bus)
+{
+	unsigned i;
+
+	for (i = 0; i < 4; i++) {
+		u32 phy_id;
+
+		phy_id = mdiobus_read(bus, i, MII_PHYSID1) << 16;
+		phy_id |= mdiobus_read(bus, i, MII_PHYSID2);
+		if (!ar8xxx_phy_match(phy_id)) {
+			pr_debug("ar8xxx: unknown PHY at %s:%02x id:%08x\n",
+				 dev_name(&bus->dev), i, phy_id);
+			return false;
+		}
+	}
+
+	return true;
+}
+
+static int
+ar8xxx_phy_probe(struct phy_device *phydev)
+{
+	struct ar8xxx_priv *priv;
+	struct switch_dev *swdev;
+	int ret;
+
+	/* skip PHYs at unused adresses */
+	if (phydev->addr != 0 && phydev->addr != 4)
+		return -ENODEV;
+
+	if (!ar8xxx_is_possible(phydev->bus))
+		return -ENODEV;
+
+	mutex_lock(&ar8xxx_dev_list_lock);
+	list_for_each_entry(priv, &ar8xxx_dev_list, list)
+		if (priv->mii_bus == phydev->bus)
+			goto found;
+
+	priv = ar8xxx_create_mii(phydev->bus);
+	if (priv == NULL) {
+		ret = -ENOMEM;
+		goto unlock;
+	}
+
+	ret = ar8xxx_probe_switch(priv);
+	if (ret)
+		goto free_priv;
+
+	swdev = &priv->dev;
+	swdev->alias = dev_name(&priv->mii_bus->dev);
+	ret = register_switch(swdev, NULL);
+	if (ret)
+		goto free_priv;
+
+	pr_info("%s: %s rev. %u switch registered on %s\n",
+		swdev->devname, swdev->name, priv->chip_rev,
+		dev_name(&priv->mii_bus->dev));
+
+found:
+	priv->use_count++;
+
+	if (phydev->addr == 0) {
+		if (ar8xxx_has_gige(priv)) {
+			phydev->supported = SUPPORTED_1000baseT_Full;
+			phydev->advertising = ADVERTISED_1000baseT_Full;
+		} else {
+			phydev->supported = SUPPORTED_100baseT_Full;
+			phydev->advertising = ADVERTISED_100baseT_Full;
+		}
+
+		if (priv->chip->config_at_probe) {
+			priv->phy = phydev;
+
+			ret = ar8xxx_start(priv);
+			if (ret)
+				goto err_unregister_switch;
+		}
+	} else {
+		if (ar8xxx_has_gige(priv)) {
+			phydev->supported |= SUPPORTED_1000baseT_Full;
+			phydev->advertising |= ADVERTISED_1000baseT_Full;
+		}
+	}
+
+	phydev->priv = priv;
+
+	list_add(&priv->list, &ar8xxx_dev_list);
+
+	mutex_unlock(&ar8xxx_dev_list_lock);
+
+	return 0;
+
+err_unregister_switch:
+	if (--priv->use_count)
+		goto unlock;
+
+	unregister_switch(&priv->dev);
+
+free_priv:
+	ar8xxx_free(priv);
+unlock:
+	mutex_unlock(&ar8xxx_dev_list_lock);
+	return ret;
+}
+
+static void
+ar8xxx_phy_detach(struct phy_device *phydev)
+{
+	struct net_device *dev = phydev->attached_dev;
+
+	if (!dev)
+		return;
+
+	dev->phy_ptr = NULL;
+	dev->priv_flags &= ~IFF_NO_IP_ALIGN;
+	dev->eth_mangle_rx = NULL;
+	dev->eth_mangle_tx = NULL;
+}
+
+static void
+ar8xxx_phy_remove(struct phy_device *phydev)
+{
+	struct ar8xxx_priv *priv = phydev->priv;
+
+	if (WARN_ON(!priv))
+		return;
+
+	phydev->priv = NULL;
+	if (--priv->use_count > 0)
+		return;
+
+	mutex_lock(&ar8xxx_dev_list_lock);
+	list_del(&priv->list);
+	mutex_unlock(&ar8xxx_dev_list_lock);
+
+	unregister_switch(&priv->dev);
+	ar8xxx_mib_stop(priv);
+	ar8xxx_free(priv);
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+static int
+ar8xxx_phy_soft_reset(struct phy_device *phydev)
+{
+	/* we don't need an extra reset */
+	return 0;
+}
+#endif
+
+static struct phy_driver ar8xxx_phy_driver = {
+	.phy_id		= 0x004d0000,
+	.name		= "Atheros AR8216/AR8236/AR8316",
+	.phy_id_mask	= 0xffff0000,
+	.features	= PHY_BASIC_FEATURES,
+	.probe		= ar8xxx_phy_probe,
+	.remove		= ar8xxx_phy_remove,
+	.detach		= ar8xxx_phy_detach,
+	.config_init	= ar8xxx_phy_config_init,
+	.config_aneg	= ar8xxx_phy_config_aneg,
+	.read_status	= ar8xxx_phy_read_status,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+	.soft_reset	= ar8xxx_phy_soft_reset,
+#endif
+	.driver		= { .owner = THIS_MODULE },
+};
+
+int __init
+ar8xxx_init(void)
+{
+	return phy_driver_register(&ar8xxx_phy_driver);
+}
+
+void __exit
+ar8xxx_exit(void)
+{
+	phy_driver_unregister(&ar8xxx_phy_driver);
+}
+
+module_init(ar8xxx_init);
+module_exit(ar8xxx_exit);
+MODULE_LICENSE("GPL");
+
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/ar8216.h b/trunk/target/linux/generic/files/drivers/net/phy/ar8216.h
new file mode 100644
index 00000000..f6df7c88
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/ar8216.h
@@ -0,0 +1,488 @@
+/*
+ * ar8216.h: AR8216 switch driver
+ *
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#ifndef __AR8216_H
+#define __AR8216_H
+
+#define BITS(_s, _n)	(((1UL << (_n)) - 1) << _s)
+
+#define AR8216_PORT_CPU	0
+#define AR8216_NUM_PORTS	6
+#define AR8216_NUM_VLANS	16
+#define AR8316_NUM_VLANS	4096
+
+/* Atheros specific MII registers */
+#define MII_ATH_MMD_ADDR		0x0d
+#define MII_ATH_MMD_DATA		0x0e
+#define MII_ATH_DBG_ADDR		0x1d
+#define MII_ATH_DBG_DATA		0x1e
+
+#define AR8216_REG_CTRL			0x0000
+#define   AR8216_CTRL_REVISION		BITS(0, 8)
+#define   AR8216_CTRL_REVISION_S	0
+#define   AR8216_CTRL_VERSION		BITS(8, 8)
+#define   AR8216_CTRL_VERSION_S		8
+#define   AR8216_CTRL_RESET		BIT(31)
+
+#define AR8216_REG_FLOOD_MASK		0x002C
+#define   AR8216_FM_UNI_DEST_PORTS	BITS(0, 6)
+#define   AR8216_FM_MULTI_DEST_PORTS	BITS(16, 6)
+
+#define AR8216_REG_GLOBAL_CTRL		0x0030
+#define   AR8216_GCTRL_MTU		BITS(0, 11)
+#define   AR8236_GCTRL_MTU		BITS(0, 14)
+#define   AR8316_GCTRL_MTU		BITS(0, 14)
+
+#define AR8216_REG_VTU			0x0040
+#define   AR8216_VTU_OP			BITS(0, 3)
+#define   AR8216_VTU_OP_NOOP		0x0
+#define   AR8216_VTU_OP_FLUSH		0x1
+#define   AR8216_VTU_OP_LOAD		0x2
+#define   AR8216_VTU_OP_PURGE		0x3
+#define   AR8216_VTU_OP_REMOVE_PORT	0x4
+#define   AR8216_VTU_ACTIVE		BIT(3)
+#define   AR8216_VTU_FULL		BIT(4)
+#define   AR8216_VTU_PORT		BITS(8, 4)
+#define   AR8216_VTU_PORT_S		8
+#define   AR8216_VTU_VID		BITS(16, 12)
+#define   AR8216_VTU_VID_S		16
+#define   AR8216_VTU_PRIO		BITS(28, 3)
+#define   AR8216_VTU_PRIO_S		28
+#define   AR8216_VTU_PRIO_EN		BIT(31)
+
+#define AR8216_REG_VTU_DATA		0x0044
+#define   AR8216_VTUDATA_MEMBER		BITS(0, 10)
+#define   AR8236_VTUDATA_MEMBER		BITS(0, 7)
+#define   AR8216_VTUDATA_VALID		BIT(11)
+
+#define AR8216_REG_ATU			0x0050
+#define   AR8216_ATU_OP			BITS(0, 3)
+#define   AR8216_ATU_OP_NOOP		0x0
+#define   AR8216_ATU_OP_FLUSH		0x1
+#define   AR8216_ATU_OP_LOAD		0x2
+#define   AR8216_ATU_OP_PURGE		0x3
+#define   AR8216_ATU_OP_FLUSH_LOCKED	0x4
+#define   AR8216_ATU_OP_FLUSH_UNICAST	0x5
+#define   AR8216_ATU_OP_GET_NEXT	0x6
+#define   AR8216_ATU_ACTIVE		BIT(3)
+#define   AR8216_ATU_PORT_NUM		BITS(8, 4)
+#define   AR8216_ATU_FULL_VIO		BIT(12)
+#define   AR8216_ATU_ADDR4		BITS(16, 8)
+#define   AR8216_ATU_ADDR5		BITS(24, 8)
+
+#define AR8216_REG_ATU_DATA		0x0054
+#define   AR8216_ATU_ADDR3		BITS(0, 8)
+#define   AR8216_ATU_ADDR2		BITS(8, 8)
+#define   AR8216_ATU_ADDR1		BITS(16, 8)
+#define   AR8216_ATU_ADDR0		BITS(24, 8)
+
+#define AR8216_REG_ATU_CTRL		0x005C
+#define   AR8216_ATU_CTRL_AGE_EN	BIT(17)
+#define   AR8216_ATU_CTRL_AGE_TIME	BITS(0, 16)
+#define   AR8216_ATU_CTRL_AGE_TIME_S	0
+
+#define AR8216_REG_MIB_FUNC		0x0080
+#define   AR8216_MIB_TIMER		BITS(0, 16)
+#define   AR8216_MIB_AT_HALF_EN		BIT(16)
+#define   AR8216_MIB_BUSY		BIT(17)
+#define   AR8216_MIB_FUNC		BITS(24, 3)
+#define   AR8216_MIB_FUNC_S		24
+#define   AR8216_MIB_FUNC_NO_OP		0x0
+#define   AR8216_MIB_FUNC_FLUSH		0x1
+#define   AR8216_MIB_FUNC_CAPTURE	0x3
+#define   AR8236_MIB_EN			BIT(30)
+
+#define AR8216_REG_GLOBAL_CPUPORT		0x0078
+#define   AR8216_GLOBAL_CPUPORT_MIRROR_PORT	BITS(4, 4)
+#define   AR8216_GLOBAL_CPUPORT_MIRROR_PORT_S	4
+
+#define AR8216_PORT_OFFSET(_i)		(0x0100 * (_i + 1))
+#define AR8216_REG_PORT_STATUS(_i)	(AR8216_PORT_OFFSET(_i) + 0x0000)
+#define   AR8216_PORT_STATUS_SPEED	BITS(0,2)
+#define   AR8216_PORT_STATUS_SPEED_S	0
+#define   AR8216_PORT_STATUS_TXMAC	BIT(2)
+#define   AR8216_PORT_STATUS_RXMAC	BIT(3)
+#define   AR8216_PORT_STATUS_TXFLOW	BIT(4)
+#define   AR8216_PORT_STATUS_RXFLOW	BIT(5)
+#define   AR8216_PORT_STATUS_DUPLEX	BIT(6)
+#define   AR8216_PORT_STATUS_LINK_UP	BIT(8)
+#define   AR8216_PORT_STATUS_LINK_AUTO	BIT(9)
+#define   AR8216_PORT_STATUS_LINK_PAUSE	BIT(10)
+
+#define AR8216_REG_PORT_CTRL(_i)	(AR8216_PORT_OFFSET(_i) + 0x0004)
+
+/* port forwarding state */
+#define   AR8216_PORT_CTRL_STATE	BITS(0, 3)
+#define   AR8216_PORT_CTRL_STATE_S	0
+
+#define   AR8216_PORT_CTRL_LEARN_LOCK	BIT(7)
+
+/* egress 802.1q mode */
+#define   AR8216_PORT_CTRL_VLAN_MODE	BITS(8, 2)
+#define   AR8216_PORT_CTRL_VLAN_MODE_S	8
+
+#define   AR8216_PORT_CTRL_IGMP_SNOOP	BIT(10)
+#define   AR8216_PORT_CTRL_HEADER	BIT(11)
+#define   AR8216_PORT_CTRL_MAC_LOOP	BIT(12)
+#define   AR8216_PORT_CTRL_SINGLE_VLAN	BIT(13)
+#define   AR8216_PORT_CTRL_LEARN	BIT(14)
+#define   AR8216_PORT_CTRL_MIRROR_TX	BIT(16)
+#define   AR8216_PORT_CTRL_MIRROR_RX	BIT(17)
+
+#define AR8216_REG_PORT_VLAN(_i)	(AR8216_PORT_OFFSET(_i) + 0x0008)
+
+#define   AR8216_PORT_VLAN_DEFAULT_ID	BITS(0, 12)
+#define   AR8216_PORT_VLAN_DEFAULT_ID_S	0
+
+#define   AR8216_PORT_VLAN_DEST_PORTS	BITS(16, 9)
+#define   AR8216_PORT_VLAN_DEST_PORTS_S	16
+
+/* bit0 added to the priority field of egress frames */
+#define   AR8216_PORT_VLAN_TX_PRIO	BIT(27)
+
+/* port default priority */
+#define   AR8216_PORT_VLAN_PRIORITY	BITS(28, 2)
+#define   AR8216_PORT_VLAN_PRIORITY_S	28
+
+/* ingress 802.1q mode */
+#define   AR8216_PORT_VLAN_MODE		BITS(30, 2)
+#define   AR8216_PORT_VLAN_MODE_S	30
+
+#define AR8216_REG_PORT_RATE(_i)	(AR8216_PORT_OFFSET(_i) + 0x000c)
+#define AR8216_REG_PORT_PRIO(_i)	(AR8216_PORT_OFFSET(_i) + 0x0010)
+
+#define AR8216_STATS_RXBROAD		0x00
+#define AR8216_STATS_RXPAUSE		0x04
+#define AR8216_STATS_RXMULTI		0x08
+#define AR8216_STATS_RXFCSERR		0x0c
+#define AR8216_STATS_RXALIGNERR		0x10
+#define AR8216_STATS_RXRUNT		0x14
+#define AR8216_STATS_RXFRAGMENT		0x18
+#define AR8216_STATS_RX64BYTE		0x1c
+#define AR8216_STATS_RX128BYTE		0x20
+#define AR8216_STATS_RX256BYTE		0x24
+#define AR8216_STATS_RX512BYTE		0x28
+#define AR8216_STATS_RX1024BYTE		0x2c
+#define AR8216_STATS_RXMAXBYTE		0x30
+#define AR8216_STATS_RXTOOLONG		0x34
+#define AR8216_STATS_RXGOODBYTE		0x38
+#define AR8216_STATS_RXBADBYTE		0x40
+#define AR8216_STATS_RXOVERFLOW		0x48
+#define AR8216_STATS_FILTERED		0x4c
+#define AR8216_STATS_TXBROAD		0x50
+#define AR8216_STATS_TXPAUSE		0x54
+#define AR8216_STATS_TXMULTI		0x58
+#define AR8216_STATS_TXUNDERRUN		0x5c
+#define AR8216_STATS_TX64BYTE		0x60
+#define AR8216_STATS_TX128BYTE		0x64
+#define AR8216_STATS_TX256BYTE		0x68
+#define AR8216_STATS_TX512BYTE		0x6c
+#define AR8216_STATS_TX1024BYTE		0x70
+#define AR8216_STATS_TXMAXBYTE		0x74
+#define AR8216_STATS_TXOVERSIZE		0x78
+#define AR8216_STATS_TXBYTE		0x7c
+#define AR8216_STATS_TXCOLLISION	0x84
+#define AR8216_STATS_TXABORTCOL		0x88
+#define AR8216_STATS_TXMULTICOL		0x8c
+#define AR8216_STATS_TXSINGLECOL	0x90
+#define AR8216_STATS_TXEXCDEFER		0x94
+#define AR8216_STATS_TXDEFER		0x98
+#define AR8216_STATS_TXLATECOL		0x9c
+
+#define AR8236_REG_PORT_VLAN(_i)	(AR8216_PORT_OFFSET((_i)) + 0x0008)
+#define   AR8236_PORT_VLAN_DEFAULT_ID	BITS(16, 12)
+#define   AR8236_PORT_VLAN_DEFAULT_ID_S	16
+#define   AR8236_PORT_VLAN_PRIORITY	BITS(29, 3)
+#define   AR8236_PORT_VLAN_PRIORITY_S	28
+
+#define AR8236_REG_PORT_VLAN2(_i)	(AR8216_PORT_OFFSET((_i)) + 0x000c)
+#define   AR8236_PORT_VLAN2_MEMBER	BITS(16, 7)
+#define   AR8236_PORT_VLAN2_MEMBER_S	16
+#define   AR8236_PORT_VLAN2_TX_PRIO	BIT(23)
+#define   AR8236_PORT_VLAN2_VLAN_MODE	BITS(30, 2)
+#define   AR8236_PORT_VLAN2_VLAN_MODE_S	30
+
+#define AR8236_STATS_RXBROAD		0x00
+#define AR8236_STATS_RXPAUSE		0x04
+#define AR8236_STATS_RXMULTI		0x08
+#define AR8236_STATS_RXFCSERR		0x0c
+#define AR8236_STATS_RXALIGNERR		0x10
+#define AR8236_STATS_RXRUNT		0x14
+#define AR8236_STATS_RXFRAGMENT		0x18
+#define AR8236_STATS_RX64BYTE		0x1c
+#define AR8236_STATS_RX128BYTE		0x20
+#define AR8236_STATS_RX256BYTE		0x24
+#define AR8236_STATS_RX512BYTE		0x28
+#define AR8236_STATS_RX1024BYTE		0x2c
+#define AR8236_STATS_RX1518BYTE		0x30
+#define AR8236_STATS_RXMAXBYTE		0x34
+#define AR8236_STATS_RXTOOLONG		0x38
+#define AR8236_STATS_RXGOODBYTE		0x3c
+#define AR8236_STATS_RXBADBYTE		0x44
+#define AR8236_STATS_RXOVERFLOW		0x4c
+#define AR8236_STATS_FILTERED		0x50
+#define AR8236_STATS_TXBROAD		0x54
+#define AR8236_STATS_TXPAUSE		0x58
+#define AR8236_STATS_TXMULTI		0x5c
+#define AR8236_STATS_TXUNDERRUN		0x60
+#define AR8236_STATS_TX64BYTE		0x64
+#define AR8236_STATS_TX128BYTE		0x68
+#define AR8236_STATS_TX256BYTE		0x6c
+#define AR8236_STATS_TX512BYTE		0x70
+#define AR8236_STATS_TX1024BYTE		0x74
+#define AR8236_STATS_TX1518BYTE		0x78
+#define AR8236_STATS_TXMAXBYTE		0x7c
+#define AR8236_STATS_TXOVERSIZE		0x80
+#define AR8236_STATS_TXBYTE		0x84
+#define AR8236_STATS_TXCOLLISION	0x8c
+#define AR8236_STATS_TXABORTCOL		0x90
+#define AR8236_STATS_TXMULTICOL		0x94
+#define AR8236_STATS_TXSINGLECOL	0x98
+#define AR8236_STATS_TXEXCDEFER		0x9c
+#define AR8236_STATS_TXDEFER		0xa0
+#define AR8236_STATS_TXLATECOL		0xa4
+
+#define AR8316_REG_POSTRIP			0x0008
+#define   AR8316_POSTRIP_MAC0_GMII_EN		BIT(0)
+#define   AR8316_POSTRIP_MAC0_RGMII_EN		BIT(1)
+#define   AR8316_POSTRIP_PHY4_GMII_EN		BIT(2)
+#define   AR8316_POSTRIP_PHY4_RGMII_EN		BIT(3)
+#define   AR8316_POSTRIP_MAC0_MAC_MODE		BIT(4)
+#define   AR8316_POSTRIP_RTL_MODE		BIT(5)
+#define   AR8316_POSTRIP_RGMII_RXCLK_DELAY_EN	BIT(6)
+#define   AR8316_POSTRIP_RGMII_TXCLK_DELAY_EN	BIT(7)
+#define   AR8316_POSTRIP_SERDES_EN		BIT(8)
+#define   AR8316_POSTRIP_SEL_ANA_RST		BIT(9)
+#define   AR8316_POSTRIP_GATE_25M_EN		BIT(10)
+#define   AR8316_POSTRIP_SEL_CLK25M		BIT(11)
+#define   AR8316_POSTRIP_HIB_PULSE_HW		BIT(12)
+#define   AR8316_POSTRIP_DBG_MODE_I		BIT(13)
+#define   AR8316_POSTRIP_MAC5_MAC_MODE		BIT(14)
+#define   AR8316_POSTRIP_MAC5_PHY_MODE		BIT(15)
+#define   AR8316_POSTRIP_POWER_DOWN_HW		BIT(16)
+#define   AR8316_POSTRIP_LPW_STATE_EN		BIT(17)
+#define   AR8316_POSTRIP_MAN_EN			BIT(18)
+#define   AR8316_POSTRIP_PHY_PLL_ON		BIT(19)
+#define   AR8316_POSTRIP_LPW_EXIT		BIT(20)
+#define   AR8316_POSTRIP_TXDELAY_S0		BIT(21)
+#define   AR8316_POSTRIP_TXDELAY_S1		BIT(22)
+#define   AR8316_POSTRIP_RXDELAY_S0		BIT(23)
+#define   AR8316_POSTRIP_LED_OPEN_EN		BIT(24)
+#define   AR8316_POSTRIP_SPI_EN			BIT(25)
+#define   AR8316_POSTRIP_RXDELAY_S1		BIT(26)
+#define   AR8316_POSTRIP_POWER_ON_SEL		BIT(31)
+
+#define AR8327_NUM_PORTS	7
+#define AR8327_NUM_LEDS		15
+#define AR8327_PORTS_ALL	0x7f
+#define AR8327_NUM_LED_CTRL_REGS	4
+
+#define AR8327_REG_MASK				0x000
+
+#define AR8327_REG_PAD0_MODE			0x004
+#define AR8327_REG_PAD5_MODE			0x008
+#define AR8327_REG_PAD6_MODE			0x00c
+#define   AR8327_PAD_MAC_MII_RXCLK_SEL		BIT(0)
+#define   AR8327_PAD_MAC_MII_TXCLK_SEL		BIT(1)
+#define   AR8327_PAD_MAC_MII_EN			BIT(2)
+#define   AR8327_PAD_MAC_GMII_RXCLK_SEL		BIT(4)
+#define   AR8327_PAD_MAC_GMII_TXCLK_SEL		BIT(5)
+#define   AR8327_PAD_MAC_GMII_EN		BIT(6)
+#define   AR8327_PAD_SGMII_EN			BIT(7)
+#define   AR8327_PAD_PHY_MII_RXCLK_SEL		BIT(8)
+#define   AR8327_PAD_PHY_MII_TXCLK_SEL		BIT(9)
+#define   AR8327_PAD_PHY_MII_EN			BIT(10)
+#define   AR8327_PAD_PHY_GMII_PIPE_RXCLK_SEL	BIT(11)
+#define   AR8327_PAD_PHY_GMII_RXCLK_SEL		BIT(12)
+#define   AR8327_PAD_PHY_GMII_TXCLK_SEL		BIT(13)
+#define   AR8327_PAD_PHY_GMII_EN		BIT(14)
+#define   AR8327_PAD_PHYX_GMII_EN		BIT(16)
+#define   AR8327_PAD_PHYX_RGMII_EN		BIT(17)
+#define   AR8327_PAD_PHYX_MII_EN		BIT(18)
+#define   AR8327_PAD_SGMII_DELAY_EN		BIT(19)
+#define   AR8327_PAD_RGMII_RXCLK_DELAY_SEL	BITS(20, 2)
+#define   AR8327_PAD_RGMII_RXCLK_DELAY_SEL_S	20
+#define   AR8327_PAD_RGMII_TXCLK_DELAY_SEL	BITS(22, 2)
+#define   AR8327_PAD_RGMII_TXCLK_DELAY_SEL_S	22
+#define   AR8327_PAD_RGMII_RXCLK_DELAY_EN	BIT(24)
+#define   AR8327_PAD_RGMII_TXCLK_DELAY_EN	BIT(25)
+#define   AR8327_PAD_RGMII_EN			BIT(26)
+
+#define AR8327_REG_POWER_ON_STRIP		0x010
+#define   AR8327_POWER_ON_STRIP_POWER_ON_SEL	BIT(31)
+#define   AR8327_POWER_ON_STRIP_LED_OPEN_EN	BIT(24)
+#define   AR8327_POWER_ON_STRIP_SERDES_AEN	BIT(7)
+
+#define AR8327_REG_INT_STATUS0			0x020
+#define   AR8327_INT0_VT_DONE			BIT(20)
+
+#define AR8327_REG_INT_STATUS1			0x024
+#define AR8327_REG_INT_MASK0			0x028
+#define AR8327_REG_INT_MASK1			0x02c
+
+#define AR8327_REG_MODULE_EN			0x030
+#define   AR8327_MODULE_EN_MIB			BIT(0)
+
+#define AR8327_REG_MIB_FUNC			0x034
+#define   AR8327_MIB_CPU_KEEP			BIT(20)
+
+#define AR8327_REG_SERVICE_TAG			0x048
+#define AR8327_REG_LED_CTRL(_i)			(0x050 + (_i) * 4)
+#define AR8327_REG_LED_CTRL0			0x050
+#define AR8327_REG_LED_CTRL1			0x054
+#define AR8327_REG_LED_CTRL2			0x058
+#define AR8327_REG_LED_CTRL3			0x05c
+#define AR8327_REG_MAC_ADDR0			0x060
+#define AR8327_REG_MAC_ADDR1			0x064
+
+#define AR8327_REG_MAX_FRAME_SIZE		0x078
+#define   AR8327_MAX_FRAME_SIZE_MTU		BITS(0, 14)
+
+#define AR8327_REG_PORT_STATUS(_i)		(0x07c + (_i) * 4)
+
+#define AR8327_REG_HEADER_CTRL			0x098
+#define AR8327_REG_PORT_HEADER(_i)		(0x09c + (_i) * 4)
+
+#define AR8327_REG_SGMII_CTRL			0x0e0
+#define   AR8327_SGMII_CTRL_EN_PLL		BIT(1)
+#define   AR8327_SGMII_CTRL_EN_RX		BIT(2)
+#define   AR8327_SGMII_CTRL_EN_TX		BIT(3)
+
+#define AR8327_REG_EEE_CTRL			0x100
+#define   AR8327_EEE_CTRL_DISABLE_PHY(_i)	BIT(4 + (_i) * 2)
+
+#define AR8327_REG_PORT_VLAN0(_i)		(0x420 + (_i) * 0x8)
+#define   AR8327_PORT_VLAN0_DEF_SVID		BITS(0, 12)
+#define   AR8327_PORT_VLAN0_DEF_SVID_S		0
+#define   AR8327_PORT_VLAN0_DEF_CVID		BITS(16, 12)
+#define   AR8327_PORT_VLAN0_DEF_CVID_S		16
+
+#define AR8327_REG_PORT_VLAN1(_i)		(0x424 + (_i) * 0x8)
+#define   AR8327_PORT_VLAN1_PORT_VLAN_PROP	BIT(6)
+#define   AR8327_PORT_VLAN1_OUT_MODE		BITS(12, 2)
+#define   AR8327_PORT_VLAN1_OUT_MODE_S		12
+#define   AR8327_PORT_VLAN1_OUT_MODE_UNMOD	0
+#define   AR8327_PORT_VLAN1_OUT_MODE_UNTAG	1
+#define   AR8327_PORT_VLAN1_OUT_MODE_TAG	2
+#define   AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH	3
+
+#define AR8327_REG_ATU_DATA0			0x600
+#define AR8327_REG_ATU_DATA1			0x604
+#define AR8327_REG_ATU_DATA2			0x608
+
+#define AR8327_REG_ATU_FUNC			0x60c
+#define   AR8327_ATU_FUNC_OP			BITS(0, 4)
+#define   AR8327_ATU_FUNC_OP_NOOP		0x0
+#define   AR8327_ATU_FUNC_OP_FLUSH		0x1
+#define   AR8327_ATU_FUNC_OP_LOAD		0x2
+#define   AR8327_ATU_FUNC_OP_PURGE		0x3
+#define   AR8327_ATU_FUNC_OP_FLUSH_LOCKED	0x4
+#define   AR8327_ATU_FUNC_OP_FLUSH_UNICAST	0x5
+#define   AR8327_ATU_FUNC_OP_GET_NEXT		0x6
+#define   AR8327_ATU_FUNC_OP_SEARCH_MAC		0x7
+#define   AR8327_ATU_FUNC_OP_CHANGE_TRUNK	0x8
+#define   AR8327_ATU_FUNC_BUSY			BIT(31)
+
+#define AR8327_REG_VTU_FUNC0			0x0610
+#define   AR8327_VTU_FUNC0_EG_MODE		BITS(4, 14)
+#define   AR8327_VTU_FUNC0_EG_MODE_S(_i)	(4 + (_i) * 2)
+#define   AR8327_VTU_FUNC0_EG_MODE_KEEP		0
+#define   AR8327_VTU_FUNC0_EG_MODE_UNTAG	1
+#define   AR8327_VTU_FUNC0_EG_MODE_TAG		2
+#define   AR8327_VTU_FUNC0_EG_MODE_NOT		3
+#define   AR8327_VTU_FUNC0_IVL			BIT(19)
+#define   AR8327_VTU_FUNC0_VALID		BIT(20)
+
+#define AR8327_REG_VTU_FUNC1			0x0614
+#define   AR8327_VTU_FUNC1_OP			BITS(0, 3)
+#define   AR8327_VTU_FUNC1_OP_NOOP		0
+#define   AR8327_VTU_FUNC1_OP_FLUSH		1
+#define   AR8327_VTU_FUNC1_OP_LOAD		2
+#define   AR8327_VTU_FUNC1_OP_PURGE		3
+#define   AR8327_VTU_FUNC1_OP_REMOVE_PORT	4
+#define   AR8327_VTU_FUNC1_OP_GET_NEXT		5
+#define   AR8327_VTU_FUNC1_OP_GET_ONE		6
+#define   AR8327_VTU_FUNC1_FULL			BIT(4)
+#define   AR8327_VTU_FUNC1_PORT			BIT(8, 4)
+#define   AR8327_VTU_FUNC1_PORT_S		8
+#define   AR8327_VTU_FUNC1_VID			BIT(16, 12)
+#define   AR8327_VTU_FUNC1_VID_S		16
+#define   AR8327_VTU_FUNC1_BUSY			BIT(31)
+
+#define AR8327_REG_FWD_CTRL0			0x620
+#define   AR8327_FWD_CTRL0_CPU_PORT_EN		BIT(10)
+#define   AR8327_FWD_CTRL0_MIRROR_PORT		BITS(4, 4)
+#define   AR8327_FWD_CTRL0_MIRROR_PORT_S	4
+
+#define AR8327_REG_FWD_CTRL1			0x624
+#define   AR8327_FWD_CTRL1_UC_FLOOD		BITS(0, 7)
+#define   AR8327_FWD_CTRL1_UC_FLOOD_S		0
+#define   AR8327_FWD_CTRL1_MC_FLOOD		BITS(8, 7)
+#define   AR8327_FWD_CTRL1_MC_FLOOD_S		8
+#define   AR8327_FWD_CTRL1_BC_FLOOD		BITS(16, 7)
+#define   AR8327_FWD_CTRL1_BC_FLOOD_S		16
+#define   AR8327_FWD_CTRL1_IGMP			BITS(24, 7)
+#define   AR8327_FWD_CTRL1_IGMP_S		24
+
+#define AR8327_REG_PORT_LOOKUP(_i)		(0x660 + (_i) * 0xc)
+#define   AR8327_PORT_LOOKUP_MEMBER		BITS(0, 7)
+#define   AR8327_PORT_LOOKUP_IN_MODE		BITS(8, 2)
+#define   AR8327_PORT_LOOKUP_IN_MODE_S		8
+#define   AR8327_PORT_LOOKUP_STATE		BITS(16, 3)
+#define   AR8327_PORT_LOOKUP_STATE_S		16
+#define   AR8327_PORT_LOOKUP_LEARN		BIT(20)
+#define   AR8327_PORT_LOOKUP_ING_MIRROR_EN	BIT(25)
+
+#define AR8327_REG_PORT_PRIO(_i)		(0x664 + (_i) * 0xc)
+
+#define AR8327_REG_PORT_HOL_CTRL1(_i)		(0x974 + (_i) * 0x8)
+#define   AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN	BIT(16)
+
+#define AR8337_PAD_MAC06_EXCHANGE_EN		BIT(31)
+
+/* port speed */
+enum {
+        AR8216_PORT_SPEED_10M = 0,
+        AR8216_PORT_SPEED_100M = 1,
+        AR8216_PORT_SPEED_1000M = 2,
+        AR8216_PORT_SPEED_ERR = 3,
+};
+
+/* ingress 802.1q mode */
+enum {
+	AR8216_IN_PORT_ONLY = 0,
+	AR8216_IN_PORT_FALLBACK = 1,
+	AR8216_IN_VLAN_ONLY = 2,
+	AR8216_IN_SECURE = 3
+};
+
+/* egress 802.1q mode */
+enum {
+	AR8216_OUT_KEEP = 0,
+	AR8216_OUT_STRIP_VLAN = 1,
+	AR8216_OUT_ADD_VLAN = 2
+};
+
+/* port forwarding state */
+enum {
+	AR8216_PORT_STATE_DISABLED = 0,
+	AR8216_PORT_STATE_BLOCK = 1,
+	AR8216_PORT_STATE_LISTEN = 2,
+	AR8216_PORT_STATE_LEARN = 3,
+	AR8216_PORT_STATE_FORWARD = 4
+};
+
+#endif
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/Kconfig b/trunk/target/linux/generic/files/drivers/net/phy/b53/Kconfig
new file mode 100644
index 00000000..67e053ea
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/Kconfig
@@ -0,0 +1,37 @@
+menuconfig B53
+	tristate "Broadcom bcm53xx managed switch support"
+	depends on SWCONFIG
+	help
+	  This driver adds support for Broadcom managed switch chips. It supports
+	  BCM5325E, BCM5365, BCM539x, BCM53115 and BCM53125 as well as BCM63XX
+	  integrated switches.
+
+config B53_SPI_DRIVER
+	tristate "B53 SPI connected switch driver"
+	depends on B53 && SPI
+	help
+	  Select to enable support for registering switches configured through SPI.
+
+config B53_PHY_DRIVER
+	tristate "B53 MDIO connected switch driver"
+	depends on B53
+	select B53_PHY_FIXUP
+	help
+	  Select to enable support for registering switches configured through MDIO.
+
+config B53_MMAP_DRIVER
+	tristate "B53 MMAP connected switch driver"
+	depends on B53
+	help
+	  Select to enable support for memory-mapped switches like the BCM63XX
+	  integrated switches.
+
+config B53_SRAB_DRIVER
+	tristate "B53 SRAB connected switch driver"
+	depends on B53
+	help
+	  Select to enable support for memory-mapped Switch Register Access
+	  Bridge Registers (SRAB) like it is found on the BCM53010
+
+config B53_PHY_FIXUP
+	bool
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/Makefile b/trunk/target/linux/generic/files/drivers/net/phy/b53/Makefile
new file mode 100644
index 00000000..7cc39c76
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/Makefile
@@ -0,0 +1,10 @@
+obj-$(CONFIG_B53)		+= b53_common.o
+
+obj-$(CONFIG_B53_PHY_FIXUP)	+= b53_phy_fixup.o
+
+obj-$(CONFIG_B53_MMAP_DRIVER)	+= b53_mmap.o
+obj-$(CONFIG_B53_SRAB_DRIVER)	+= b53_srab.o
+obj-$(CONFIG_B53_PHY_DRIVER)	+= b53_mdio.o
+obj-$(CONFIG_B53_SPI_DRIVER)	+= b53_spi.o
+
+ccflags-y			+= -Werror
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
new file mode 100644
index 00000000..b82bc937
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
@@ -0,0 +1,1428 @@
+/*
+ * B53 switch driver main logic
+ *
+ * Copyright (C) 2011-2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/delay.h>
+#include <linux/export.h>
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/switch.h>
+#include <linux/platform_data/b53.h>
+
+#include "b53_regs.h"
+#include "b53_priv.h"
+
+/* buffer size needed for displaying all MIBs with max'd values */
+#define B53_BUF_SIZE	1188
+
+struct b53_mib_desc {
+	u8 size;
+	u8 offset;
+	const char *name;
+};
+
+
+/* BCM5365 MIB counters */
+static const struct b53_mib_desc b53_mibs_65[] = {
+	{ 8, 0x00, "TxOctets" },
+	{ 4, 0x08, "TxDropPkts" },
+	{ 4, 0x10, "TxBroadcastPkts" },
+	{ 4, 0x14, "TxMulticastPkts" },
+	{ 4, 0x18, "TxUnicastPkts" },
+	{ 4, 0x1c, "TxCollisions" },
+	{ 4, 0x20, "TxSingleCollision" },
+	{ 4, 0x24, "TxMultipleCollision" },
+	{ 4, 0x28, "TxDeferredTransmit" },
+	{ 4, 0x2c, "TxLateCollision" },
+	{ 4, 0x30, "TxExcessiveCollision" },
+	{ 4, 0x38, "TxPausePkts" },
+	{ 8, 0x44, "RxOctets" },
+	{ 4, 0x4c, "RxUndersizePkts" },
+	{ 4, 0x50, "RxPausePkts" },
+	{ 4, 0x54, "Pkts64Octets" },
+	{ 4, 0x58, "Pkts65to127Octets" },
+	{ 4, 0x5c, "Pkts128to255Octets" },
+	{ 4, 0x60, "Pkts256to511Octets" },
+	{ 4, 0x64, "Pkts512to1023Octets" },
+	{ 4, 0x68, "Pkts1024to1522Octets" },
+	{ 4, 0x6c, "RxOversizePkts" },
+	{ 4, 0x70, "RxJabbers" },
+	{ 4, 0x74, "RxAlignmentErrors" },
+	{ 4, 0x78, "RxFCSErrors" },
+	{ 8, 0x7c, "RxGoodOctets" },
+	{ 4, 0x84, "RxDropPkts" },
+	{ 4, 0x88, "RxUnicastPkts" },
+	{ 4, 0x8c, "RxMulticastPkts" },
+	{ 4, 0x90, "RxBroadcastPkts" },
+	{ 4, 0x94, "RxSAChanges" },
+	{ 4, 0x98, "RxFragments" },
+	{ },
+};
+
+/* BCM63xx MIB counters */
+static const struct b53_mib_desc b53_mibs_63xx[] = {
+	{ 8, 0x00, "TxOctets" },
+	{ 4, 0x08, "TxDropPkts" },
+	{ 4, 0x0c, "TxQoSPkts" },
+	{ 4, 0x10, "TxBroadcastPkts" },
+	{ 4, 0x14, "TxMulticastPkts" },
+	{ 4, 0x18, "TxUnicastPkts" },
+	{ 4, 0x1c, "TxCollisions" },
+	{ 4, 0x20, "TxSingleCollision" },
+	{ 4, 0x24, "TxMultipleCollision" },
+	{ 4, 0x28, "TxDeferredTransmit" },
+	{ 4, 0x2c, "TxLateCollision" },
+	{ 4, 0x30, "TxExcessiveCollision" },
+	{ 4, 0x38, "TxPausePkts" },
+	{ 8, 0x3c, "TxQoSOctets" },
+	{ 8, 0x44, "RxOctets" },
+	{ 4, 0x4c, "RxUndersizePkts" },
+	{ 4, 0x50, "RxPausePkts" },
+	{ 4, 0x54, "Pkts64Octets" },
+	{ 4, 0x58, "Pkts65to127Octets" },
+	{ 4, 0x5c, "Pkts128to255Octets" },
+	{ 4, 0x60, "Pkts256to511Octets" },
+	{ 4, 0x64, "Pkts512to1023Octets" },
+	{ 4, 0x68, "Pkts1024to1522Octets" },
+	{ 4, 0x6c, "RxOversizePkts" },
+	{ 4, 0x70, "RxJabbers" },
+	{ 4, 0x74, "RxAlignmentErrors" },
+	{ 4, 0x78, "RxFCSErrors" },
+	{ 8, 0x7c, "RxGoodOctets" },
+	{ 4, 0x84, "RxDropPkts" },
+	{ 4, 0x88, "RxUnicastPkts" },
+	{ 4, 0x8c, "RxMulticastPkts" },
+	{ 4, 0x90, "RxBroadcastPkts" },
+	{ 4, 0x94, "RxSAChanges" },
+	{ 4, 0x98, "RxFragments" },
+	{ 4, 0xa0, "RxSymbolErrors" },
+	{ 4, 0xa4, "RxQoSPkts" },
+	{ 8, 0xa8, "RxQoSOctets" },
+	{ 4, 0xb0, "Pkts1523to2047Octets" },
+	{ 4, 0xb4, "Pkts2048to4095Octets" },
+	{ 4, 0xb8, "Pkts4096to8191Octets" },
+	{ 4, 0xbc, "Pkts8192to9728Octets" },
+	{ 4, 0xc0, "RxDiscarded" },
+	{ }
+};
+
+/* MIB counters */
+static const struct b53_mib_desc b53_mibs[] = {
+	{ 8, 0x00, "TxOctets" },
+	{ 4, 0x08, "TxDropPkts" },
+	{ 4, 0x10, "TxBroadcastPkts" },
+	{ 4, 0x14, "TxMulticastPkts" },
+	{ 4, 0x18, "TxUnicastPkts" },
+	{ 4, 0x1c, "TxCollisions" },
+	{ 4, 0x20, "TxSingleCollision" },
+	{ 4, 0x24, "TxMultipleCollision" },
+	{ 4, 0x28, "TxDeferredTransmit" },
+	{ 4, 0x2c, "TxLateCollision" },
+	{ 4, 0x30, "TxExcessiveCollision" },
+	{ 4, 0x38, "TxPausePkts" },
+	{ 8, 0x50, "RxOctets" },
+	{ 4, 0x58, "RxUndersizePkts" },
+	{ 4, 0x5c, "RxPausePkts" },
+	{ 4, 0x60, "Pkts64Octets" },
+	{ 4, 0x64, "Pkts65to127Octets" },
+	{ 4, 0x68, "Pkts128to255Octets" },
+	{ 4, 0x6c, "Pkts256to511Octets" },
+	{ 4, 0x70, "Pkts512to1023Octets" },
+	{ 4, 0x74, "Pkts1024to1522Octets" },
+	{ 4, 0x78, "RxOversizePkts" },
+	{ 4, 0x7c, "RxJabbers" },
+	{ 4, 0x80, "RxAlignmentErrors" },
+	{ 4, 0x84, "RxFCSErrors" },
+	{ 8, 0x88, "RxGoodOctets" },
+	{ 4, 0x90, "RxDropPkts" },
+	{ 4, 0x94, "RxUnicastPkts" },
+	{ 4, 0x98, "RxMulticastPkts" },
+	{ 4, 0x9c, "RxBroadcastPkts" },
+	{ 4, 0xa0, "RxSAChanges" },
+	{ 4, 0xa4, "RxFragments" },
+	{ 4, 0xa8, "RxJumboPkts" },
+	{ 4, 0xac, "RxSymbolErrors" },
+	{ 4, 0xc0, "RxDiscarded" },
+	{ }
+};
+
+static int b53_do_vlan_op(struct b53_device *dev, u8 op)
+{
+	unsigned int i;
+
+	b53_write8(dev, B53_ARLIO_PAGE, dev->vta_regs[0], VTA_START_CMD | op);
+
+	for (i = 0; i < 10; i++) {
+		u8 vta;
+
+		b53_read8(dev, B53_ARLIO_PAGE, dev->vta_regs[0], &vta);
+		if (!(vta & VTA_START_CMD))
+			return 0;
+
+		usleep_range(100, 200);
+	}
+
+	return -EIO;
+}
+
+static void b53_set_vlan_entry(struct b53_device *dev, u16 vid, u16 members,
+			       u16 untag)
+{
+	if (is5325(dev)) {
+		u32 entry = 0;
+
+		if (members) {
+			entry = ((untag & VA_UNTAG_MASK_25) << VA_UNTAG_S_25) |
+				members;
+			if (dev->core_rev >= 3)
+				entry |= VA_VALID_25_R4 | vid << VA_VID_HIGH_S;
+			else
+				entry |= VA_VALID_25;
+		}
+
+		b53_write32(dev, B53_VLAN_PAGE, B53_VLAN_WRITE_25, entry);
+		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, vid |
+			    VTA_RW_STATE_WR | VTA_RW_OP_EN);
+	} else if (is5365(dev)) {
+		u16 entry = 0;
+
+		if (members)
+			entry = ((untag & VA_UNTAG_MASK_65) << VA_UNTAG_S_65) |
+				members | VA_VALID_65;
+
+		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_WRITE_65, entry);
+		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_65, vid |
+			    VTA_RW_STATE_WR | VTA_RW_OP_EN);
+	} else {
+		b53_write16(dev, B53_ARLIO_PAGE, dev->vta_regs[1], vid);
+		b53_write32(dev, B53_ARLIO_PAGE, dev->vta_regs[2],
+			    (untag << VTE_UNTAG_S) | members);
+
+		b53_do_vlan_op(dev, VTA_CMD_WRITE);
+	}
+}
+
+void b53_set_forwarding(struct b53_device *dev, int enable)
+{
+	u8 mgmt;
+
+	b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt);
+
+	if (enable)
+		mgmt |= SM_SW_FWD_EN;
+	else
+		mgmt &= ~SM_SW_FWD_EN;
+
+	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
+}
+
+static void b53_enable_vlan(struct b53_device *dev, int enable)
+{
+	u8 mgmt, vc0, vc1, vc4 = 0, vc5;
+
+	b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt);
+	b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL0, &vc0);
+	b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL1, &vc1);
+
+	if (is5325(dev) || is5365(dev)) {
+		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL4_25, &vc4);
+		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5_25, &vc5);
+	} else if (is63xx(dev)) {
+		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL4_63XX, &vc4);
+		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5_63XX, &vc5);
+	} else {
+		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL4, &vc4);
+		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5, &vc5);
+	}
+
+	mgmt &= ~SM_SW_FWD_MODE;
+
+	if (enable) {
+		vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID;
+		vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN;
+		vc4 &= ~VC4_ING_VID_CHECK_MASK;
+		vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S;
+		vc5 |= VC5_DROP_VTABLE_MISS;
+
+		if (is5325(dev))
+			vc0 &= ~VC0_RESERVED_1;
+
+		if (is5325(dev) || is5365(dev))
+			vc1 |= VC1_RX_MCST_TAG_EN;
+
+		if (!is5325(dev) && !is5365(dev)) {
+			if (dev->allow_vid_4095)
+				vc5 |= VC5_VID_FFF_EN;
+			else
+				vc5 &= ~VC5_VID_FFF_EN;
+		}
+	} else {
+		vc0 &= ~(VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID);
+		vc1 &= ~(VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN);
+		vc4 &= ~VC4_ING_VID_CHECK_MASK;
+		vc5 &= ~VC5_DROP_VTABLE_MISS;
+
+		if (is5325(dev) || is5365(dev))
+			vc4 |= VC4_ING_VID_VIO_FWD << VC4_ING_VID_CHECK_S;
+		else
+			vc4 |= VC4_ING_VID_VIO_TO_IMP << VC4_ING_VID_CHECK_S;
+
+		if (is5325(dev) || is5365(dev))
+			vc1 &= ~VC1_RX_MCST_TAG_EN;
+
+		if (!is5325(dev) && !is5365(dev))
+			vc5 &= ~VC5_VID_FFF_EN;
+	}
+
+	b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL0, vc0);
+	b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL1, vc1);
+
+	if (is5325(dev) || is5365(dev)) {
+		/* enable the high 8 bit vid check on 5325 */
+		if (is5325(dev) && enable)
+			b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL3,
+				   VC3_HIGH_8BIT_EN);
+		else
+			b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL3, 0);
+
+		b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL4_25, vc4);
+		b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5_25, vc5);
+	} else if (is63xx(dev)) {
+		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_CTRL3_63XX, 0);
+		b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL4_63XX, vc4);
+		b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5_63XX, vc5);
+	} else {
+		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_CTRL3, 0);
+		b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL4, vc4);
+		b53_write8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5, vc5);
+	}
+
+	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
+}
+
+static int b53_set_jumbo(struct b53_device *dev, int enable, int allow_10_100)
+{
+	u32 port_mask = 0;
+	u16 max_size = JMS_MIN_SIZE;
+
+	if (is5325(dev) || is5365(dev))
+		return -EINVAL;
+
+	if (enable) {
+		port_mask = dev->enabled_ports;
+		max_size = JMS_MAX_SIZE;
+		if (allow_10_100)
+			port_mask |= JPM_10_100_JUMBO_EN;
+	}
+
+	b53_write32(dev, B53_JUMBO_PAGE, dev->jumbo_pm_reg, port_mask);
+	return b53_write16(dev, B53_JUMBO_PAGE, dev->jumbo_size_reg, max_size);
+}
+
+static int b53_flush_arl(struct b53_device *dev)
+{
+	unsigned int i;
+
+	b53_write8(dev, B53_CTRL_PAGE, B53_FAST_AGE_CTRL,
+		   FAST_AGE_DONE | FAST_AGE_DYNAMIC | FAST_AGE_STATIC);
+
+	for (i = 0; i < 10; i++) {
+		u8 fast_age_ctrl;
+
+		b53_read8(dev, B53_CTRL_PAGE, B53_FAST_AGE_CTRL,
+			  &fast_age_ctrl);
+
+		if (!(fast_age_ctrl & FAST_AGE_DONE))
+			return 0;
+
+		mdelay(1);
+	}
+
+	pr_warn("time out while flushing ARL\n");
+
+	return -EINVAL;
+}
+
+static void b53_enable_ports(struct b53_device *dev)
+{
+	unsigned i;
+
+	b53_for_each_port(dev, i) {
+		u8 port_ctrl;
+		u16 pvlan_mask;
+
+		/*
+		 * prevent leaking packets between wan and lan in unmanaged
+		 * mode through port vlans.
+		 */
+		if (dev->enable_vlan || is_cpu_port(dev, i))
+			pvlan_mask = 0x1ff;
+		else if (is531x5(dev) || is5301x(dev))
+			/* BCM53115 may use a different port as cpu port */
+			pvlan_mask = BIT(dev->sw_dev.cpu_port);
+		else
+			pvlan_mask = BIT(B53_CPU_PORT);
+
+		/* BCM5325 CPU port is at 8 */
+		if ((is5325(dev) || is5365(dev)) && i == B53_CPU_PORT_25)
+			i = B53_CPU_PORT;
+
+		if (dev->chip_id == BCM5398_DEVICE_ID && (i == 6 || i == 7))
+			/* disable unused ports 6 & 7 */
+			port_ctrl = PORT_CTRL_RX_DISABLE | PORT_CTRL_TX_DISABLE;
+		else if (i == B53_CPU_PORT)
+			port_ctrl = PORT_CTRL_RX_BCST_EN |
+				    PORT_CTRL_RX_MCST_EN |
+				    PORT_CTRL_RX_UCST_EN;
+		else
+			port_ctrl = 0;
+
+		b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(i),
+			    pvlan_mask);
+
+		/* port state is handled by bcm63xx_enet driver */
+		if (!is63xx(dev) && !(is5301x(dev) && i == 6))
+			b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(i),
+				   port_ctrl);
+	}
+}
+
+static void b53_enable_mib(struct b53_device *dev)
+{
+	u8 gc;
+
+	b53_read8(dev, B53_CTRL_PAGE, B53_GLOBAL_CONFIG, &gc);
+
+	gc &= ~(GC_RESET_MIB | GC_MIB_AC_EN);
+
+	b53_write8(dev, B53_CTRL_PAGE, B53_GLOBAL_CONFIG, gc);
+}
+
+static int b53_apply(struct b53_device *dev)
+{
+	int i;
+
+	/* clear all vlan entries */
+	if (is5325(dev) || is5365(dev)) {
+		for (i = 1; i < dev->sw_dev.vlans; i++)
+			b53_set_vlan_entry(dev, i, 0, 0);
+	} else {
+		b53_do_vlan_op(dev, VTA_CMD_CLEAR);
+	}
+
+	b53_enable_vlan(dev, dev->enable_vlan);
+
+	/* fill VLAN table */
+	if (dev->enable_vlan) {
+		for (i = 0; i < dev->sw_dev.vlans; i++) {
+			struct b53_vlan *vlan = &dev->vlans[i];
+
+			if (!vlan->members)
+				continue;
+
+			b53_set_vlan_entry(dev, i, vlan->members, vlan->untag);
+		}
+
+		b53_for_each_port(dev, i)
+			b53_write16(dev, B53_VLAN_PAGE,
+				    B53_VLAN_PORT_DEF_TAG(i),
+				    dev->ports[i].pvid);
+	} else {
+		b53_for_each_port(dev, i)
+			b53_write16(dev, B53_VLAN_PAGE,
+				    B53_VLAN_PORT_DEF_TAG(i), 1);
+
+	}
+
+	b53_enable_ports(dev);
+
+	if (!is5325(dev) && !is5365(dev))
+		b53_set_jumbo(dev, dev->enable_jumbo, 1);
+
+	return 0;
+}
+
+static void b53_switch_reset_gpio(struct b53_device *dev)
+{
+	int gpio = dev->reset_gpio;
+
+	if (gpio < 0)
+		return;
+
+	/*
+	 * Reset sequence: RESET low(50ms)->high(20ms)
+	 */
+	gpio_set_value(gpio, 0);
+	mdelay(50);
+
+	gpio_set_value(gpio, 1);
+	mdelay(20);
+
+	dev->current_page = 0xff;
+}
+
+static int b53_switch_reset(struct b53_device *dev)
+{
+	u8 mgmt;
+
+	b53_switch_reset_gpio(dev);
+
+	if (is539x(dev)) {
+		b53_write8(dev, B53_CTRL_PAGE, B53_SOFTRESET, 0x83);
+		b53_write8(dev, B53_CTRL_PAGE, B53_SOFTRESET, 0x00);
+	}
+
+	b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt);
+
+	if (!(mgmt & SM_SW_FWD_EN)) {
+		mgmt &= ~SM_SW_FWD_MODE;
+		mgmt |= SM_SW_FWD_EN;
+
+		b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
+		b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt);
+
+		if (!(mgmt & SM_SW_FWD_EN)) {
+			pr_err("Failed to enable switch!\n");
+			return -EINVAL;
+		}
+	}
+
+	/* enable all ports */
+	b53_enable_ports(dev);
+
+	/* configure MII port if necessary */
+	if (is5325(dev)) {
+		u8 mii_port_override;
+
+		b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,
+			  &mii_port_override);
+		/* reverse mii needs to be enabled */
+		if (!(mii_port_override & PORT_OVERRIDE_RV_MII_25)) {
+			b53_write8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,
+				   mii_port_override | PORT_OVERRIDE_RV_MII_25);
+			b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,
+				  &mii_port_override);
+
+			if (!(mii_port_override & PORT_OVERRIDE_RV_MII_25)) {
+				pr_err("Failed to enable reverse MII mode\n");
+				return -EINVAL;
+			}
+		}
+	} else if ((is531x5(dev) || is5301x(dev)) && dev->sw_dev.cpu_port == B53_CPU_PORT) {
+		u8 mii_port_override;
+
+		b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,
+			  &mii_port_override);
+		b53_write8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,
+			   mii_port_override | PORT_OVERRIDE_EN |
+			   PORT_OVERRIDE_LINK);
+	}
+
+	b53_enable_mib(dev);
+
+	return b53_flush_arl(dev);
+}
+
+/*
+ * Swconfig glue functions
+ */
+
+static int b53_global_get_vlan_enable(struct switch_dev *dev,
+				      const struct switch_attr *attr,
+				      struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	val->value.i = priv->enable_vlan;
+
+	return 0;
+}
+
+static int b53_global_set_vlan_enable(struct switch_dev *dev,
+				      const struct switch_attr *attr,
+				      struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	priv->enable_vlan = val->value.i;
+
+	return 0;
+}
+
+static int b53_global_get_jumbo_enable(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	val->value.i = priv->enable_jumbo;
+
+	return 0;
+}
+
+static int b53_global_set_jumbo_enable(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	priv->enable_jumbo = val->value.i;
+
+	return 0;
+}
+
+static int b53_global_get_4095_enable(struct switch_dev *dev,
+				      const struct switch_attr *attr,
+				      struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	val->value.i = priv->allow_vid_4095;
+
+	return 0;
+}
+
+static int b53_global_set_4095_enable(struct switch_dev *dev,
+				      const struct switch_attr *attr,
+				      struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	priv->allow_vid_4095 = val->value.i;
+
+	return 0;
+}
+
+static int b53_global_get_ports(struct switch_dev *dev,
+				const struct switch_attr *attr,
+				struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	val->len = snprintf(priv->buf, B53_BUF_SIZE, "0x%04x",
+			    priv->enabled_ports);
+	val->value.s = priv->buf;
+
+	return 0;
+}
+
+static int b53_port_get_pvid(struct switch_dev *dev, int port, int *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	*val = priv->ports[port].pvid;
+
+	return 0;
+}
+
+static int b53_port_set_pvid(struct switch_dev *dev, int port, int val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	if (val > 15 && is5325(priv))
+		return -EINVAL;
+	if (val == 4095 && !priv->allow_vid_4095)
+		return -EINVAL;
+
+	priv->ports[port].pvid = val;
+
+	return 0;
+}
+
+static int b53_vlan_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+	struct switch_port *port = &val->value.ports[0];
+	struct b53_vlan *vlan = &priv->vlans[val->port_vlan];
+	int i;
+
+	val->len = 0;
+
+	if (!vlan->members)
+		return 0;
+
+	for (i = 0; i < dev->ports; i++) {
+		if (!(vlan->members & BIT(i)))
+			continue;
+
+
+		if (!(vlan->untag & BIT(i)))
+			port->flags = BIT(SWITCH_PORT_FLAG_TAGGED);
+		else
+			port->flags = 0;
+
+		port->id = i;
+		val->len++;
+		port++;
+	}
+
+	return 0;
+}
+
+static int b53_vlan_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+	struct switch_port *port;
+	struct b53_vlan *vlan = &priv->vlans[val->port_vlan];
+	int i;
+
+	/* only BCM5325 and BCM5365 supports VID 0 */
+	if (val->port_vlan == 0 && !is5325(priv) && !is5365(priv))
+		return -EINVAL;
+
+	/* VLAN 4095 needs special handling */
+	if (val->port_vlan == 4095 && !priv->allow_vid_4095)
+		return -EINVAL;
+
+	port = &val->value.ports[0];
+	vlan->members = 0;
+	vlan->untag = 0;
+	for (i = 0; i < val->len; i++, port++) {
+		vlan->members |= BIT(port->id);
+
+		if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED))) {
+			vlan->untag |= BIT(port->id);
+			priv->ports[port->id].pvid = val->port_vlan;
+		};
+	}
+
+	/* ignore disabled ports */
+	vlan->members &= priv->enabled_ports;
+	vlan->untag &= priv->enabled_ports;
+
+	return 0;
+}
+
+static int b53_port_get_link(struct switch_dev *dev, int port,
+			     struct switch_port_link *link)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	if (is_cpu_port(priv, port)) {
+		link->link = 1;
+		link->duplex = 1;
+		link->speed = is5325(priv) || is5365(priv) ?
+				SWITCH_PORT_SPEED_100 : SWITCH_PORT_SPEED_1000;
+		link->aneg = 0;
+	} else if (priv->enabled_ports & BIT(port)) {
+		u32 speed;
+		u16 lnk, duplex;
+
+		b53_read16(priv, B53_STAT_PAGE, B53_LINK_STAT, &lnk);
+		b53_read16(priv, B53_STAT_PAGE, priv->duplex_reg, &duplex);
+
+		lnk = (lnk >> port) & 1;
+		duplex = (duplex >> port) & 1;
+
+		if (is5325(priv) || is5365(priv)) {
+			u16 tmp;
+
+			b53_read16(priv, B53_STAT_PAGE, B53_SPEED_STAT, &tmp);
+			speed = SPEED_PORT_FE(tmp, port);
+		} else {
+			b53_read32(priv, B53_STAT_PAGE, B53_SPEED_STAT, &speed);
+			speed = SPEED_PORT_GE(speed, port);
+		}
+
+		link->link = lnk;
+		if (lnk) {
+			link->duplex = duplex;
+			switch (speed) {
+			case SPEED_STAT_10M:
+				link->speed = SWITCH_PORT_SPEED_10;
+				break;
+			case SPEED_STAT_100M:
+				link->speed = SWITCH_PORT_SPEED_100;
+				break;
+			case SPEED_STAT_1000M:
+				link->speed = SWITCH_PORT_SPEED_1000;
+				break;
+			}
+		}
+
+		link->aneg = 1;
+	} else {
+		link->link = 0;
+	}
+
+	return 0;
+
+}
+
+static int b53_global_reset_switch(struct switch_dev *dev)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	/* reset vlans */
+	priv->enable_vlan = 0;
+	priv->enable_jumbo = 0;
+	priv->allow_vid_4095 = 0;
+
+	memset(priv->vlans, 0, sizeof(priv->vlans) * dev->vlans);
+	memset(priv->ports, 0, sizeof(priv->ports) * dev->ports);
+
+	return b53_switch_reset(priv);
+}
+
+static int b53_global_apply_config(struct switch_dev *dev)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+
+	/* disable switching */
+	b53_set_forwarding(priv, 0);
+
+	b53_apply(priv);
+
+	/* enable switching */
+	b53_set_forwarding(priv, 1);
+
+	return 0;
+}
+
+
+static int b53_global_reset_mib(struct switch_dev *dev,
+				const struct switch_attr *attr,
+				struct switch_val *val)
+{
+	struct b53_device *priv = sw_to_b53(dev);
+	u8 gc;
+
+	b53_read8(priv, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, &gc);
+
+	b53_write8(priv, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc | GC_RESET_MIB);
+	mdelay(1);
+	b53_write8(priv, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc & ~GC_RESET_MIB);
+	mdelay(1);
+
+	return 0;
+}
+
+static int b53_port_get_mib(struct switch_dev *sw_dev,
+			    const struct switch_attr *attr,
+			    struct switch_val *val)
+{
+	struct b53_device *dev = sw_to_b53(sw_dev);
+	const struct b53_mib_desc *mibs;
+	int port = val->port_vlan;
+	int len = 0;
+
+	if (!(BIT(port) & dev->enabled_ports))
+		return -1;
+
+	if (is5365(dev)) {
+		if (port == 5)
+			port = 8;
+
+		mibs = b53_mibs_65;
+	} else if (is63xx(dev)) {
+		mibs = b53_mibs_63xx;
+	} else {
+		mibs = b53_mibs;
+	}
+
+	dev->buf[0] = 0;
+
+	for (; mibs->size > 0; mibs++) {
+		u64 val;
+
+		if (mibs->size == 8) {
+			b53_read64(dev, B53_MIB_PAGE(port), mibs->offset, &val);
+		} else {
+			u32 val32;
+
+			b53_read32(dev, B53_MIB_PAGE(port), mibs->offset,
+				   &val32);
+			val = val32;
+		}
+
+		len += snprintf(dev->buf + len, B53_BUF_SIZE - len,
+				"%-20s: %llu\n", mibs->name, val);
+	}
+
+	val->len = len;
+	val->value.s = dev->buf;
+
+	return 0;
+}
+
+static struct switch_attr b53_global_ops_25[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = b53_global_set_vlan_enable,
+		.get = b53_global_get_vlan_enable,
+		.max = 1,
+	},
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "ports",
+		.description = "Available ports (as bitmask)",
+		.get = b53_global_get_ports,
+	},
+};
+
+static struct switch_attr b53_global_ops_65[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = b53_global_set_vlan_enable,
+		.get = b53_global_get_vlan_enable,
+		.max = 1,
+	},
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "ports",
+		.description = "Available ports (as bitmask)",
+		.get = b53_global_get_ports,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "reset_mib",
+		.description = "Reset MIB counters",
+		.set = b53_global_reset_mib,
+	},
+};
+
+static struct switch_attr b53_global_ops[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = b53_global_set_vlan_enable,
+		.get = b53_global_get_vlan_enable,
+		.max = 1,
+	},
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "ports",
+		.description = "Available Ports (as bitmask)",
+		.get = b53_global_get_ports,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "reset_mib",
+		.description = "Reset MIB counters",
+		.set = b53_global_reset_mib,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_jumbo",
+		.description = "Enable Jumbo Frames",
+		.set = b53_global_set_jumbo_enable,
+		.get = b53_global_get_jumbo_enable,
+		.max = 1,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "allow_vid_4095",
+		.description = "Allow VID 4095",
+		.set = b53_global_set_4095_enable,
+		.get = b53_global_get_4095_enable,
+		.max = 1,
+	},
+};
+
+static struct switch_attr b53_port_ops[] = {
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "mib",
+		.description = "Get port's MIB counters",
+		.get = b53_port_get_mib,
+	},
+};
+
+static struct switch_attr b53_no_ops[] = {
+};
+
+static const struct switch_dev_ops b53_switch_ops_25 = {
+	.attr_global = {
+		.attr = b53_global_ops_25,
+		.n_attr = ARRAY_SIZE(b53_global_ops_25),
+	},
+	.attr_port = {
+		.attr = b53_no_ops,
+		.n_attr = ARRAY_SIZE(b53_no_ops),
+	},
+	.attr_vlan = {
+		.attr = b53_no_ops,
+		.n_attr = ARRAY_SIZE(b53_no_ops),
+	},
+
+	.get_vlan_ports = b53_vlan_get_ports,
+	.set_vlan_ports = b53_vlan_set_ports,
+	.get_port_pvid = b53_port_get_pvid,
+	.set_port_pvid = b53_port_set_pvid,
+	.apply_config = b53_global_apply_config,
+	.reset_switch = b53_global_reset_switch,
+	.get_port_link = b53_port_get_link,
+};
+
+static const struct switch_dev_ops b53_switch_ops_65 = {
+	.attr_global = {
+		.attr = b53_global_ops_65,
+		.n_attr = ARRAY_SIZE(b53_global_ops_65),
+	},
+	.attr_port = {
+		.attr = b53_port_ops,
+		.n_attr = ARRAY_SIZE(b53_port_ops),
+	},
+	.attr_vlan = {
+		.attr = b53_no_ops,
+		.n_attr = ARRAY_SIZE(b53_no_ops),
+	},
+
+	.get_vlan_ports = b53_vlan_get_ports,
+	.set_vlan_ports = b53_vlan_set_ports,
+	.get_port_pvid = b53_port_get_pvid,
+	.set_port_pvid = b53_port_set_pvid,
+	.apply_config = b53_global_apply_config,
+	.reset_switch = b53_global_reset_switch,
+	.get_port_link = b53_port_get_link,
+};
+
+static const struct switch_dev_ops b53_switch_ops = {
+	.attr_global = {
+		.attr = b53_global_ops,
+		.n_attr = ARRAY_SIZE(b53_global_ops),
+	},
+	.attr_port = {
+		.attr = b53_port_ops,
+		.n_attr = ARRAY_SIZE(b53_port_ops),
+	},
+	.attr_vlan = {
+		.attr = b53_no_ops,
+		.n_attr = ARRAY_SIZE(b53_no_ops),
+	},
+
+	.get_vlan_ports = b53_vlan_get_ports,
+	.set_vlan_ports = b53_vlan_set_ports,
+	.get_port_pvid = b53_port_get_pvid,
+	.set_port_pvid = b53_port_set_pvid,
+	.apply_config = b53_global_apply_config,
+	.reset_switch = b53_global_reset_switch,
+	.get_port_link = b53_port_get_link,
+};
+
+struct b53_chip_data {
+	u32 chip_id;
+	const char *dev_name;
+	const char *alias;
+	u16 vlans;
+	u16 enabled_ports;
+	u8 cpu_port;
+	u8 vta_regs[3];
+	u8 duplex_reg;
+	u8 jumbo_pm_reg;
+	u8 jumbo_size_reg;
+	const struct switch_dev_ops *sw_ops;
+};
+
+#define B53_VTA_REGS	\
+	{ B53_VT_ACCESS, B53_VT_INDEX, B53_VT_ENTRY }
+#define B53_VTA_REGS_9798 \
+	{ B53_VT_ACCESS_9798, B53_VT_INDEX_9798, B53_VT_ENTRY_9798 }
+#define B53_VTA_REGS_63XX \
+	{ B53_VT_ACCESS_63XX, B53_VT_INDEX_63XX, B53_VT_ENTRY_63XX }
+
+static const struct b53_chip_data b53_switch_chips[] = {
+	{
+		.chip_id = BCM5325_DEVICE_ID,
+		.dev_name = "BCM5325",
+		.alias = "bcm5325",
+		.vlans = 16,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT_25,
+		.duplex_reg = B53_DUPLEX_STAT_FE,
+		.sw_ops = &b53_switch_ops_25,
+	},
+	{
+		.chip_id = BCM5365_DEVICE_ID,
+		.dev_name = "BCM5365",
+		.alias = "bcm5365",
+		.vlans = 256,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT_25,
+		.duplex_reg = B53_DUPLEX_STAT_FE,
+		.sw_ops = &b53_switch_ops_65,
+	},
+	{
+		.chip_id = BCM5395_DEVICE_ID,
+		.dev_name = "BCM5395",
+		.alias = "bcm5395",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT,
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM5397_DEVICE_ID,
+		.dev_name = "BCM5397",
+		.alias = "bcm5397",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT,
+		.vta_regs = B53_VTA_REGS_9798,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM5398_DEVICE_ID,
+		.dev_name = "BCM5398",
+		.alias = "bcm5398",
+		.vlans = 4096,
+		.enabled_ports = 0x7f,
+		.cpu_port = B53_CPU_PORT,
+		.vta_regs = B53_VTA_REGS_9798,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53115_DEVICE_ID,
+		.dev_name = "BCM53115",
+		.alias = "bcm53115",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.vta_regs = B53_VTA_REGS,
+		.cpu_port = B53_CPU_PORT,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53125_DEVICE_ID,
+		.dev_name = "BCM53125",
+		.alias = "bcm53125",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT,
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53128_DEVICE_ID,
+		.dev_name = "BCM53128",
+		.alias = "bcm53128",
+		.vlans = 4096,
+		.enabled_ports = 0x1ff,
+		.cpu_port = B53_CPU_PORT,
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM63XX_DEVICE_ID,
+		.dev_name = "BCM63xx",
+		.alias = "bcm63xx",
+		.vlans = 4096,
+		.enabled_ports = 0, /* pdata must provide them */
+		.cpu_port = B53_CPU_PORT,
+		.vta_regs = B53_VTA_REGS_63XX,
+		.duplex_reg = B53_DUPLEX_STAT_63XX,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53010_DEVICE_ID,
+		.dev_name = "BCM53010",
+		.alias = "bcm53011",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53011_DEVICE_ID,
+		.dev_name = "BCM53011",
+		.alias = "bcm53011",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53012_DEVICE_ID,
+		.dev_name = "BCM53012",
+		.alias = "bcm53011",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53018_DEVICE_ID,
+		.dev_name = "BCM53018",
+		.alias = "bcm53018",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+	{
+		.chip_id = BCM53019_DEVICE_ID,
+		.dev_name = "BCM53019",
+		.alias = "bcm53019",
+		.vlans = 4096,
+		.enabled_ports = 0x1f,
+		.cpu_port = B53_CPU_PORT_25, // TODO: auto detect
+		.vta_regs = B53_VTA_REGS,
+		.duplex_reg = B53_DUPLEX_STAT_GE,
+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
+		.sw_ops = &b53_switch_ops,
+	},
+};
+
+static int b53_switch_init(struct b53_device *dev)
+{
+	struct switch_dev *sw_dev = &dev->sw_dev;
+	unsigned i;
+	int ret;
+
+	for (i = 0; i < ARRAY_SIZE(b53_switch_chips); i++) {
+		const struct b53_chip_data *chip = &b53_switch_chips[i];
+
+		if (chip->chip_id == dev->chip_id) {
+			sw_dev->name = chip->dev_name;
+			if (!sw_dev->alias)
+				sw_dev->alias = chip->alias;
+			if (!dev->enabled_ports)
+				dev->enabled_ports = chip->enabled_ports;
+			dev->duplex_reg = chip->duplex_reg;
+			dev->vta_regs[0] = chip->vta_regs[0];
+			dev->vta_regs[1] = chip->vta_regs[1];
+			dev->vta_regs[2] = chip->vta_regs[2];
+			dev->jumbo_pm_reg = chip->jumbo_pm_reg;
+			sw_dev->ops = chip->sw_ops;
+			sw_dev->cpu_port = chip->cpu_port;
+			sw_dev->vlans = chip->vlans;
+			break;
+		}
+	}
+
+	if (!sw_dev->name)
+		return -EINVAL;
+
+	/* check which BCM5325x version we have */
+	if (is5325(dev)) {
+		u8 vc4;
+
+		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL4_25, &vc4);
+
+		/* check reserved bits */
+		switch (vc4 & 3) {
+		case 1:
+			/* BCM5325E */
+			break;
+		case 3:
+			/* BCM5325F - do not use port 4 */
+			dev->enabled_ports &= ~BIT(4);
+			break;
+		default:
+/* On the BCM47XX SoCs this is the supported internal switch.*/
+#ifndef CONFIG_BCM47XX
+			/* BCM5325M */
+			return -EINVAL;
+#else
+			break;
+#endif
+		}
+	} else if (dev->chip_id == BCM53115_DEVICE_ID) {
+		u64 strap_value;
+
+		b53_read48(dev, B53_STAT_PAGE, B53_STRAP_VALUE, &strap_value);
+		/* use second IMP port if GMII is enabled */
+		if (strap_value & SV_GMII_CTRL_115)
+			sw_dev->cpu_port = 5;
+	}
+
+	/* cpu port is always last */
+	sw_dev->ports = sw_dev->cpu_port + 1;
+	dev->enabled_ports |= BIT(sw_dev->cpu_port);
+
+	dev->ports = devm_kzalloc(dev->dev,
+				  sizeof(struct b53_port) * sw_dev->ports,
+				  GFP_KERNEL);
+	if (!dev->ports)
+		return -ENOMEM;
+
+	dev->vlans = devm_kzalloc(dev->dev,
+				  sizeof(struct b53_vlan) * sw_dev->vlans,
+				  GFP_KERNEL);
+	if (!dev->vlans)
+		return -ENOMEM;
+
+	dev->buf = devm_kzalloc(dev->dev, B53_BUF_SIZE, GFP_KERNEL);
+	if (!dev->buf)
+		return -ENOMEM;
+
+	dev->reset_gpio = b53_switch_get_reset_gpio(dev);
+	if (dev->reset_gpio >= 0) {
+		ret = devm_gpio_request_one(dev->dev, dev->reset_gpio, GPIOF_OUT_INIT_HIGH, "robo_reset");
+		if (ret)
+			return ret;
+	}
+
+	return b53_switch_reset(dev);
+}
+
+struct b53_device *b53_switch_alloc(struct device *base, struct b53_io_ops *ops,
+				    void *priv)
+{
+	struct b53_device *dev;
+
+	dev = devm_kzalloc(base, sizeof(*dev), GFP_KERNEL);
+	if (!dev)
+		return NULL;
+
+	dev->dev = base;
+	dev->ops = ops;
+	dev->priv = priv;
+	mutex_init(&dev->reg_mutex);
+
+	return dev;
+}
+EXPORT_SYMBOL(b53_switch_alloc);
+
+int b53_switch_detect(struct b53_device *dev)
+{
+	u32 id32;
+	u16 tmp;
+	u8 id8;
+	int ret;
+
+	ret = b53_read8(dev, B53_MGMT_PAGE, B53_DEVICE_ID, &id8);
+	if (ret)
+		return ret;
+
+	switch (id8) {
+	case 0:
+		/*
+		 * BCM5325 and BCM5365 do not have this register so reads
+		 * return 0. But the read operation did succeed, so assume
+		 * this is one of them.
+		 *
+		 * Next check if we can write to the 5325's VTA register; for
+		 * 5365 it is read only.
+		 */
+
+		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, 0xf);
+		b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, &tmp);
+
+		if (tmp == 0xf)
+			dev->chip_id = BCM5325_DEVICE_ID;
+		else
+			dev->chip_id = BCM5365_DEVICE_ID;
+		break;
+	case BCM5395_DEVICE_ID:
+	case BCM5397_DEVICE_ID:
+	case BCM5398_DEVICE_ID:
+		dev->chip_id = id8;
+		break;
+	default:
+		ret = b53_read32(dev, B53_MGMT_PAGE, B53_DEVICE_ID, &id32);
+		if (ret)
+			return ret;
+
+		switch (id32) {
+		case BCM53115_DEVICE_ID:
+		case BCM53125_DEVICE_ID:
+		case BCM53128_DEVICE_ID:
+		case BCM53010_DEVICE_ID:
+		case BCM53011_DEVICE_ID:
+		case BCM53012_DEVICE_ID:
+		case BCM53018_DEVICE_ID:
+		case BCM53019_DEVICE_ID:
+			dev->chip_id = id32;
+			break;
+		default:
+			pr_err("unsupported switch detected (BCM53%02x/BCM%x)\n",
+			       id8, id32);
+			return -ENODEV;
+		}
+	}
+
+	if (dev->chip_id == BCM5325_DEVICE_ID)
+		return b53_read8(dev, B53_STAT_PAGE, B53_REV_ID_25,
+				 &dev->core_rev);
+	else
+		return b53_read8(dev, B53_MGMT_PAGE, B53_REV_ID,
+				 &dev->core_rev);
+}
+EXPORT_SYMBOL(b53_switch_detect);
+
+int b53_switch_register(struct b53_device *dev)
+{
+	int ret;
+
+	if (dev->pdata) {
+		dev->chip_id = dev->pdata->chip_id;
+		dev->enabled_ports = dev->pdata->enabled_ports;
+		dev->sw_dev.alias = dev->pdata->alias;
+	}
+
+	if (!dev->chip_id && b53_switch_detect(dev))
+		return -EINVAL;
+
+	ret = b53_switch_init(dev);
+	if (ret)
+		return ret;
+
+	pr_info("found switch: %s, rev %i\n", dev->sw_dev.name, dev->core_rev);
+
+	return register_switch(&dev->sw_dev, NULL);
+}
+EXPORT_SYMBOL(b53_switch_register);
+
+MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
+MODULE_DESCRIPTION("B53 switch library");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
new file mode 100644
index 00000000..3c25f0ea
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
@@ -0,0 +1,425 @@
+/*
+ * B53 register access through MII registers
+ *
+ * Copyright (C) 2011-2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/phy.h>
+#include <linux/module.h>
+
+#include "b53_priv.h"
+
+#define B53_PSEUDO_PHY	0x1e /* Register Access Pseudo PHY */
+
+/* MII registers */
+#define REG_MII_PAGE    0x10    /* MII Page register */
+#define REG_MII_ADDR    0x11    /* MII Address register */
+#define REG_MII_DATA0   0x18    /* MII Data register 0 */
+#define REG_MII_DATA1   0x19    /* MII Data register 1 */
+#define REG_MII_DATA2   0x1a    /* MII Data register 2 */
+#define REG_MII_DATA3   0x1b    /* MII Data register 3 */
+
+#define REG_MII_PAGE_ENABLE     BIT(0)
+#define REG_MII_ADDR_WRITE      BIT(0)
+#define REG_MII_ADDR_READ       BIT(1)
+
+static int b53_mdio_op(struct b53_device *dev, u8 page, u8 reg, u16 op)
+{
+	int i;
+	u16 v;
+	int ret;
+	struct mii_bus *bus = dev->priv;
+
+	if (dev->current_page != page) {
+		/* set page number */
+		v = (page << 8) | REG_MII_PAGE_ENABLE;
+		ret = mdiobus_write(bus, B53_PSEUDO_PHY, REG_MII_PAGE, v);
+		if (ret)
+			return ret;
+		dev->current_page = page;
+	}
+
+	/* set register address */
+	v = (reg << 8) | op;
+	ret = mdiobus_write(bus, B53_PSEUDO_PHY, REG_MII_ADDR, v);
+	if (ret)
+		return ret;
+
+	/* check if operation completed */
+	for (i = 0; i < 5; ++i) {
+		v = mdiobus_read(bus, B53_PSEUDO_PHY, REG_MII_ADDR);
+		if (!(v & (REG_MII_ADDR_WRITE | REG_MII_ADDR_READ)))
+			break;
+		usleep_range(10, 100);
+	}
+
+	if (WARN_ON(i == 5))
+		return -EIO;
+
+	return 0;
+}
+
+static int b53_mdio_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)
+{
+	struct mii_bus *bus = dev->priv;
+	int ret;
+
+	ret = b53_mdio_op(dev, page, reg, REG_MII_ADDR_READ);
+	if (ret)
+		return ret;
+
+	*val = mdiobus_read(bus, B53_PSEUDO_PHY, REG_MII_DATA0) & 0xff;
+
+	return 0;
+}
+
+static int b53_mdio_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)
+{
+	struct mii_bus *bus = dev->priv;
+	int ret;
+
+	ret = b53_mdio_op(dev, page, reg, REG_MII_ADDR_READ);
+	if (ret)
+		return ret;
+
+	*val = mdiobus_read(bus, B53_PSEUDO_PHY, REG_MII_DATA0);
+
+	return 0;
+}
+
+static int b53_mdio_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)
+{
+	struct mii_bus *bus = dev->priv;
+	int ret;
+
+	ret = b53_mdio_op(dev, page, reg, REG_MII_ADDR_READ);
+	if (ret)
+		return ret;
+
+	*val = mdiobus_read(bus, B53_PSEUDO_PHY, REG_MII_DATA0);
+	*val |= mdiobus_read(bus, B53_PSEUDO_PHY, REG_MII_DATA1) << 16;
+
+	return 0;
+}
+
+static int b53_mdio_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	struct mii_bus *bus = dev->priv;
+	u64 temp = 0;
+	int i;
+	int ret;
+
+	ret = b53_mdio_op(dev, page, reg, REG_MII_ADDR_READ);
+	if (ret)
+		return ret;
+
+	for (i = 2; i >= 0; i--) {
+		temp <<= 16;
+		temp |= mdiobus_read(bus, B53_PSEUDO_PHY, REG_MII_DATA0 + i);
+	}
+
+	*val = temp;
+
+	return 0;
+}
+
+static int b53_mdio_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	struct mii_bus *bus = dev->priv;
+	u64 temp = 0;
+	int i;
+	int ret;
+
+	ret = b53_mdio_op(dev, page, reg, REG_MII_ADDR_READ);
+	if (ret)
+		return ret;
+
+	for (i = 3; i >= 0; i--) {
+		temp <<= 16;
+		temp |= mdiobus_read(bus, B53_PSEUDO_PHY, REG_MII_DATA0 + i);
+	}
+
+	*val = temp;
+
+	return 0;
+}
+
+static int b53_mdio_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)
+{
+	struct mii_bus *bus = dev->priv;
+	int ret;
+
+	ret = mdiobus_write(bus, B53_PSEUDO_PHY, REG_MII_DATA0, value);
+	if (ret)
+		return ret;
+
+	return b53_mdio_op(dev, page, reg, REG_MII_ADDR_WRITE);
+}
+
+static int b53_mdio_write16(struct b53_device *dev, u8 page, u8 reg,
+			     u16 value)
+{
+	struct mii_bus *bus = dev->priv;
+	int ret;
+
+	ret = mdiobus_write(bus, B53_PSEUDO_PHY, REG_MII_DATA0, value);
+	if (ret)
+		return ret;
+
+	return b53_mdio_op(dev, page, reg, REG_MII_ADDR_WRITE);
+}
+
+static int b53_mdio_write32(struct b53_device *dev, u8 page, u8 reg,
+				    u32 value)
+{
+	struct mii_bus *bus = dev->priv;
+	unsigned int i;
+	u32 temp = value;
+
+	for (i = 0; i < 2; i++) {
+		int ret = mdiobus_write(bus, B53_PSEUDO_PHY, REG_MII_DATA0 + i,
+				    temp & 0xffff);
+		if (ret)
+			return ret;
+		temp >>= 16;
+	}
+
+	return b53_mdio_op(dev, page, reg, REG_MII_ADDR_WRITE);
+
+}
+
+static int b53_mdio_write48(struct b53_device *dev, u8 page, u8 reg,
+				    u64 value)
+{
+	struct mii_bus *bus = dev->priv;
+	unsigned i;
+	u64 temp = value;
+
+	for (i = 0; i < 3; i++) {
+		int ret = mdiobus_write(bus, B53_PSEUDO_PHY, REG_MII_DATA0 + i,
+				    temp & 0xffff);
+		if (ret)
+			return ret;
+		temp >>= 16;
+	}
+
+	return b53_mdio_op(dev, page, reg, REG_MII_ADDR_WRITE);
+
+}
+
+static int b53_mdio_write64(struct b53_device *dev, u8 page, u8 reg,
+			     u64 value)
+{
+	struct mii_bus *bus = dev->priv;
+	unsigned i;
+	u64 temp = value;
+
+	for (i = 0; i < 4; i++) {
+		int ret = mdiobus_write(bus, B53_PSEUDO_PHY, REG_MII_DATA0 + i,
+				    temp & 0xffff);
+		if (ret)
+			return ret;
+		temp >>= 16;
+	}
+
+	return b53_mdio_op(dev, page, reg, REG_MII_ADDR_WRITE);
+}
+
+static struct b53_io_ops b53_mdio_ops = {
+	.read8 = b53_mdio_read8,
+	.read16 = b53_mdio_read16,
+	.read32 = b53_mdio_read32,
+	.read48 = b53_mdio_read48,
+	.read64 = b53_mdio_read64,
+	.write8 = b53_mdio_write8,
+	.write16 = b53_mdio_write16,
+	.write32 = b53_mdio_write32,
+	.write48 = b53_mdio_write48,
+	.write64 = b53_mdio_write64,
+};
+
+static int b53_phy_probe(struct phy_device *phydev)
+{
+	struct b53_device dev;
+	int ret;
+
+	/* allow the generic phy driver to take over */
+	if (phydev->addr != B53_PSEUDO_PHY && phydev->addr != 0)
+		return -ENODEV;
+
+	dev.current_page = 0xff;
+	dev.priv = phydev->bus;
+	dev.ops = &b53_mdio_ops;
+	dev.pdata = NULL;
+	mutex_init(&dev.reg_mutex);
+
+	ret = b53_switch_detect(&dev);
+	if (ret)
+		return ret;
+
+	if (is5325(&dev) || is5365(&dev))
+		phydev->supported = SUPPORTED_100baseT_Full;
+	else
+		phydev->supported = SUPPORTED_1000baseT_Full;
+
+	phydev->advertising = phydev->supported;
+
+	return 0;
+}
+
+static int b53_phy_config_init(struct phy_device *phydev)
+{
+	struct b53_device *dev;
+	int ret;
+
+	dev = b53_switch_alloc(&phydev->dev, &b53_mdio_ops, phydev->bus);
+	if (!dev)
+		return -ENOMEM;
+
+	/* we don't use page 0xff, so force a page set */
+	dev->current_page = 0xff;
+	/* force the ethX as alias */
+	dev->sw_dev.alias = phydev->attached_dev->name;
+
+	ret = b53_switch_register(dev);
+	if (ret) {
+		dev_err(dev->dev, "failed to register switch: %i\n", ret);
+		return ret;
+	}
+
+	phydev->priv = dev;
+
+	return 0;
+}
+
+static void b53_phy_remove(struct phy_device *phydev)
+{
+	struct b53_device *priv = phydev->priv;
+
+	if (!priv)
+		return;
+
+	b53_switch_remove(priv);
+
+	phydev->priv = NULL;
+}
+
+static int b53_phy_config_aneg(struct phy_device *phydev)
+{
+	return 0;
+}
+
+static int b53_phy_read_status(struct phy_device *phydev)
+{
+	struct b53_device *priv = phydev->priv;
+
+	if (is5325(priv) || is5365(priv))
+		phydev->speed = 100;
+	else
+		phydev->speed = 1000;
+
+	phydev->duplex = DUPLEX_FULL;
+	phydev->link = 1;
+	phydev->state = PHY_RUNNING;
+
+	netif_carrier_on(phydev->attached_dev);
+	phydev->adjust_link(phydev->attached_dev);
+
+	return 0;
+}
+
+/* BCM5325, BCM539x */
+static struct phy_driver b53_phy_driver_id1 = {
+	.phy_id		= 0x0143bc00,
+	.name		= "Broadcom B53 (1)",
+	.phy_id_mask	= 0x1ffffc00,
+	.features	= 0,
+	.probe		= b53_phy_probe,
+	.remove		= b53_phy_remove,
+	.config_aneg	= b53_phy_config_aneg,
+	.config_init	= b53_phy_config_init,
+	.read_status	= b53_phy_read_status,
+	.driver = {
+		.owner = THIS_MODULE,
+	},
+};
+
+/* BCM53125, BCM53128 */
+static struct phy_driver b53_phy_driver_id2 = {
+	.phy_id		= 0x03625c00,
+	.name		= "Broadcom B53 (2)",
+	.phy_id_mask	= 0x1ffffc00,
+	.features	= 0,
+	.probe		= b53_phy_probe,
+	.remove		= b53_phy_remove,
+	.config_aneg	= b53_phy_config_aneg,
+	.config_init	= b53_phy_config_init,
+	.read_status	= b53_phy_read_status,
+	.driver = {
+		.owner = THIS_MODULE,
+	},
+};
+
+/* BCM5365 */
+static struct phy_driver b53_phy_driver_id3 = {
+	.phy_id		= 0x00406000,
+	.name		= "Broadcom B53 (3)",
+	.phy_id_mask	= 0x1ffffc00,
+	.features	= 0,
+	.probe		= b53_phy_probe,
+	.remove		= b53_phy_remove,
+	.config_aneg	= b53_phy_config_aneg,
+	.config_init	= b53_phy_config_init,
+	.read_status	= b53_phy_read_status,
+	.driver = {
+		.owner = THIS_MODULE,
+	},
+};
+
+int __init b53_phy_driver_register(void)
+{
+	int ret;
+
+	ret = phy_driver_register(&b53_phy_driver_id1);
+	if (ret)
+		return ret;
+
+	ret = phy_driver_register(&b53_phy_driver_id2);
+	if (ret)
+		goto err1;
+
+	ret = phy_driver_register(&b53_phy_driver_id3);
+	if (!ret)
+		return 0;
+
+	phy_driver_unregister(&b53_phy_driver_id2);
+err1:
+	phy_driver_unregister(&b53_phy_driver_id1);
+	return ret;
+}
+
+void __exit b53_phy_driver_unregister(void)
+{
+	phy_driver_unregister(&b53_phy_driver_id3);
+	phy_driver_unregister(&b53_phy_driver_id2);
+	phy_driver_unregister(&b53_phy_driver_id1);
+}
+
+module_init(b53_phy_driver_register);
+module_exit(b53_phy_driver_unregister);
+
+MODULE_DESCRIPTION("B53 MDIO access driver");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
new file mode 100644
index 00000000..272360f6
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
@@ -0,0 +1,240 @@
+/*
+ * B53 register access through memory mapped registers
+ *
+ * Copyright (C) 2012-2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/b53.h>
+
+#include "b53_priv.h"
+
+static int b53_mmap_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)
+{
+	u8 __iomem *regs = dev->priv;
+
+	*val = readb(regs + (page << 8) + reg);
+
+	return 0;
+}
+
+static int b53_mmap_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)
+{
+	u8 __iomem *regs = dev->priv;
+
+	if (WARN_ON(reg % 2))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian)
+		*val = readw_be(regs + (page << 8) + reg);
+	else
+		*val = readw(regs + (page << 8) + reg);
+
+	return 0;
+}
+
+static int b53_mmap_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)
+{
+	u8 __iomem *regs = dev->priv;
+
+	if (WARN_ON(reg % 4))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian)
+		*val = readl_be(regs + (page << 8) + reg);
+	else
+		*val = readl(regs + (page << 8) + reg);
+
+	return 0;
+}
+
+static int b53_mmap_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	u8 __iomem *regs = dev->priv;
+
+	if (WARN_ON(reg % 4))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian) {
+		*val = readl_be(regs + (page << 8) + reg);
+		*val <<= 16;
+		*val |= readw_be(regs + (page << 8) + reg + 4);
+	} else {
+		*val |= readw(regs + (page << 8) + reg + 4);
+		*val <<= 32;
+		*val = readl(regs + (page << 8) + reg);
+	}
+
+	return 0;
+}
+
+static int b53_mmap_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	u8 __iomem *regs = dev->priv;
+	u32 hi, lo;
+
+	if (WARN_ON(reg % 4))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian) {
+		lo = readl_be(regs + (page << 8) + reg);
+		hi = readl_be(regs + (page << 8) + reg + 4);
+	} else {
+		lo = readl(regs + (page << 8) + reg);
+		hi = readl(regs + (page << 8) + reg + 4);
+	}
+
+	*val = ((u64)hi << 32) | lo;
+
+	return 0;
+}
+
+static int b53_mmap_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)
+{
+	u8 __iomem *regs = dev->priv;
+
+	writeb(value, regs + (page << 8) + reg);
+
+	return 0;
+}
+
+static int b53_mmap_write16(struct b53_device *dev, u8 page, u8 reg,
+			     u16 value)
+{
+	u8 __iomem *regs = dev->priv;
+
+	if (WARN_ON(reg % 2))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian)
+		writew_be(value, regs + (page << 8) + reg);
+	else
+		writew(value, regs + (page << 8) + reg);
+
+	return 0;
+}
+
+static int b53_mmap_write32(struct b53_device *dev, u8 page, u8 reg,
+				    u32 value)
+{
+	u8 __iomem *regs = dev->priv;
+
+	if (WARN_ON(reg % 4))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian)
+		writel_be(value, regs + (page << 8) + reg);
+	else
+		writel(value, regs + (page << 8) + reg);
+
+	return 0;
+}
+
+static int b53_mmap_write48(struct b53_device *dev, u8 page, u8 reg,
+				    u64 value)
+{
+	u8 __iomem *regs = dev->priv;
+
+	if (WARN_ON(reg % 4))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian) {
+		writel_be((u32)(value >> 16), regs + (page << 8) + reg);
+		writew_be((u16)value, regs + (page << 8) + reg + 4);
+	} else {
+		writel((u32)value, regs + (page << 8) + reg);
+		writew((u16)(value >> 32), regs + (page << 8) + reg + 4);
+	}
+
+	return 0;
+}
+
+static int b53_mmap_write64(struct b53_device *dev, u8 page, u8 reg,
+			     u64 value)
+{
+	u8 __iomem *regs = dev->priv;
+
+	if (WARN_ON(reg % 4))
+		return -EINVAL;
+
+	if (dev->pdata && dev->pdata->big_endian) {
+		writel_be((u32)(value >> 32), regs + (page << 8) + reg);
+		writel_be((u32)value, regs + (page << 8) + reg + 4);
+	} else {
+		writel((u32)value, regs + (page << 8) + reg);
+		writel((u32)(value >> 32), regs + (page << 8) + reg + 4);
+	}
+
+	return 0;
+}
+
+static struct b53_io_ops b53_mmap_ops = {
+	.read8 = b53_mmap_read8,
+	.read16 = b53_mmap_read16,
+	.read32 = b53_mmap_read32,
+	.read48 = b53_mmap_read48,
+	.read64 = b53_mmap_read64,
+	.write8 = b53_mmap_write8,
+	.write16 = b53_mmap_write16,
+	.write32 = b53_mmap_write32,
+	.write48 = b53_mmap_write48,
+	.write64 = b53_mmap_write64,
+};
+
+static int b53_mmap_probe(struct platform_device *pdev)
+{
+	struct b53_platform_data *pdata = pdev->dev.platform_data;
+	struct b53_device *dev;
+
+	if (!pdata)
+		return -EINVAL;
+
+	dev = b53_switch_alloc(&pdev->dev, &b53_mmap_ops, pdata->regs);
+	if (!dev)
+		return -ENOMEM;
+
+	if (pdata)
+		dev->pdata = pdata;
+
+	platform_set_drvdata(pdev, dev);
+
+	return b53_switch_register(dev);
+}
+
+static int b53_mmap_remove(struct platform_device *pdev)
+{
+	struct b53_device *dev = platform_get_drvdata(pdev);
+
+	if (dev) {
+		b53_switch_remove(dev);
+	}
+
+	return 0;
+}
+
+static struct platform_driver b53_mmap_driver = {
+	.probe = b53_mmap_probe,
+	.remove = b53_mmap_remove,
+	.driver = {
+		.name = "b53-switch",
+	},
+};
+
+module_platform_driver(b53_mmap_driver);
+MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
+MODULE_DESCRIPTION("B53 MMAP access driver");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c
new file mode 100644
index 00000000..72d1373d
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c
@@ -0,0 +1,55 @@
+/*
+ * B53 PHY Fixup call
+ *
+ * Copyright (C) 2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/phy.h>
+
+#define B53_PSEUDO_PHY	0x1e /* Register Access Pseudo PHY */
+
+#define B53_BRCM_OUI_1	0x0143bc00
+#define B53_BRCM_OUI_2	0x03625c00
+#define B53_BRCM_OUI_3	0x00406000
+
+static int b53_phy_fixup(struct phy_device *dev)
+{
+	u32 phy_id;
+	struct mii_bus *bus = dev->bus;
+
+	if (dev->addr != B53_PSEUDO_PHY)
+		return 0;
+
+	/* read the first port's id */
+	phy_id = mdiobus_read(bus, 0, 2) << 16;
+	phy_id |= mdiobus_read(bus, 0, 3);
+
+	if ((phy_id & 0xfffffc00) == B53_BRCM_OUI_1 ||
+	    (phy_id & 0xfffffc00) == B53_BRCM_OUI_2 ||
+	    (phy_id & 0xfffffc00) == B53_BRCM_OUI_3) {
+		dev->phy_id = phy_id;
+	}
+
+	return 0;
+}
+
+int __init b53_phy_fixup_register(void)
+{
+	return phy_register_fixup_for_id(PHY_ANY_ID, b53_phy_fixup);
+}
+
+subsys_initcall(b53_phy_fixup_register);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
new file mode 100644
index 00000000..bc9b5336
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
@@ -0,0 +1,324 @@
+/*
+ * B53 common definitions
+ *
+ * Copyright (C) 2011-2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __B53_PRIV_H
+#define __B53_PRIV_H
+
+#include <linux/kernel.h>
+#include <linux/mutex.h>
+#include <linux/switch.h>
+
+struct b53_device;
+
+struct b53_io_ops {
+	int (*read8)(struct b53_device *dev, u8 page, u8 reg, u8 *value);
+	int (*read16)(struct b53_device *dev, u8 page, u8 reg, u16 *value);
+	int (*read32)(struct b53_device *dev, u8 page, u8 reg, u32 *value);
+	int (*read48)(struct b53_device *dev, u8 page, u8 reg, u64 *value);
+	int (*read64)(struct b53_device *dev, u8 page, u8 reg, u64 *value);
+	int (*write8)(struct b53_device *dev, u8 page, u8 reg, u8 value);
+	int (*write16)(struct b53_device *dev, u8 page, u8 reg, u16 value);
+	int (*write32)(struct b53_device *dev, u8 page, u8 reg, u32 value);
+	int (*write48)(struct b53_device *dev, u8 page, u8 reg, u64 value);
+	int (*write64)(struct b53_device *dev, u8 page, u8 reg, u64 value);
+};
+
+enum {
+	BCM5325_DEVICE_ID = 0x25,
+	BCM5365_DEVICE_ID = 0x65,
+	BCM5395_DEVICE_ID = 0x95,
+	BCM5397_DEVICE_ID = 0x97,
+	BCM5398_DEVICE_ID = 0x98,
+	BCM53115_DEVICE_ID = 0x53115,
+	BCM53125_DEVICE_ID = 0x53125,
+	BCM53128_DEVICE_ID = 0x53128,
+	BCM63XX_DEVICE_ID = 0x6300,
+	BCM53010_DEVICE_ID = 0x53010,
+	BCM53011_DEVICE_ID = 0x53011,
+	BCM53012_DEVICE_ID = 0x53012,
+	BCM53018_DEVICE_ID = 0x53018,
+	BCM53019_DEVICE_ID = 0x53019,
+};
+
+#define B53_N_PORTS	9
+#define B53_N_PORTS_25	6
+
+struct b53_vlan {
+	unsigned int	members:B53_N_PORTS;
+	unsigned int	untag:B53_N_PORTS;
+};
+
+struct b53_port {
+	unsigned int	pvid:12;
+};
+
+struct b53_device {
+	struct switch_dev sw_dev;
+	struct b53_platform_data *pdata;
+
+	struct mutex reg_mutex;
+	const struct b53_io_ops *ops;
+
+	/* chip specific data */
+	u32 chip_id;
+	u8 core_rev;
+	u8 vta_regs[3];
+	u8 duplex_reg;
+	u8 jumbo_pm_reg;
+	u8 jumbo_size_reg;
+	int reset_gpio;
+
+	/* used ports mask */
+	u16 enabled_ports;
+
+	/* connect specific data */
+	u8 current_page;
+	struct device *dev;
+	void *priv;
+
+	/* run time configuration */
+	unsigned enable_vlan:1;
+	unsigned enable_jumbo:1;
+	unsigned allow_vid_4095:1;
+
+	struct b53_port *ports;
+	struct b53_vlan *vlans;
+
+	char *buf;
+};
+
+#define b53_for_each_port(dev, i) \
+	for (i = 0; i < B53_N_PORTS; i++) \
+		if (dev->enabled_ports & BIT(i))
+
+
+
+static inline int is5325(struct b53_device *dev)
+{
+	return dev->chip_id == BCM5325_DEVICE_ID;
+}
+
+static inline int is5365(struct b53_device *dev)
+{
+#ifdef CONFIG_BCM47XX
+	return dev->chip_id == BCM5365_DEVICE_ID;
+#else
+	return 0;
+#endif
+}
+
+static inline int is5397_98(struct b53_device *dev)
+{
+	return dev->chip_id == BCM5397_DEVICE_ID ||
+		dev->chip_id == BCM5398_DEVICE_ID;
+}
+
+static inline int is539x(struct b53_device *dev)
+{
+	return dev->chip_id == BCM5395_DEVICE_ID ||
+		dev->chip_id == BCM5397_DEVICE_ID ||
+		dev->chip_id == BCM5398_DEVICE_ID;
+}
+
+static inline int is531x5(struct b53_device *dev)
+{
+	return dev->chip_id == BCM53115_DEVICE_ID ||
+		dev->chip_id == BCM53125_DEVICE_ID ||
+		dev->chip_id == BCM53128_DEVICE_ID;
+}
+
+static inline int is63xx(struct b53_device *dev)
+{
+#ifdef CONFIG_BCM63XX
+	return dev->chip_id == BCM63XX_DEVICE_ID;
+#else
+	return 0;
+#endif
+}
+	
+static inline int is5301x(struct b53_device *dev)
+{
+	return dev->chip_id == BCM53010_DEVICE_ID ||
+		dev->chip_id == BCM53011_DEVICE_ID ||
+		dev->chip_id == BCM53012_DEVICE_ID ||
+		dev->chip_id == BCM53018_DEVICE_ID ||
+		dev->chip_id == BCM53019_DEVICE_ID;
+}
+
+#define B53_CPU_PORT_25	5
+#define B53_CPU_PORT	8
+
+static inline int is_cpu_port(struct b53_device *dev, int port)
+{
+	return dev->sw_dev.cpu_port == port;
+}
+
+static inline struct b53_device *sw_to_b53(struct switch_dev *sw)
+{
+	return container_of(sw, struct b53_device, sw_dev);
+}
+
+struct b53_device *b53_switch_alloc(struct device *base, struct b53_io_ops *ops,
+				    void *priv);
+
+int b53_switch_detect(struct b53_device *dev);
+
+int b53_switch_register(struct b53_device *dev);
+
+static inline void b53_switch_remove(struct b53_device *dev)
+{
+	unregister_switch(&dev->sw_dev);
+}
+
+static inline int b53_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->read8(dev, page, reg, val);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->read16(dev, page, reg, val);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->read32(dev, page, reg, val);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->read48(dev, page, reg, val);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->read64(dev, page, reg, val);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->write8(dev, page, reg, value);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_write16(struct b53_device *dev, u8 page, u8 reg,
+			      u16 value)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->write16(dev, page, reg, value);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_write32(struct b53_device *dev, u8 page, u8 reg,
+			      u32 value)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->write32(dev, page, reg, value);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_write48(struct b53_device *dev, u8 page, u8 reg,
+			      u64 value)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->write48(dev, page, reg, value);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+static inline int b53_write64(struct b53_device *dev, u8 page, u8 reg,
+			       u64 value)
+{
+	int ret;
+
+	mutex_lock(&dev->reg_mutex);
+	ret = dev->ops->write64(dev, page, reg, value);
+	mutex_unlock(&dev->reg_mutex);
+
+	return ret;
+}
+
+#ifdef CONFIG_BCM47XX
+
+#include <bcm47xx_nvram.h>
+#include <bcm47xx_board.h>
+static inline int b53_switch_get_reset_gpio(struct b53_device *dev)
+{
+	enum bcm47xx_board board = bcm47xx_board_get();
+
+	switch (board) {
+	case BCM47XX_BOARD_LINKSYS_WRT300NV11:
+	case BCM47XX_BOARD_LINKSYS_WRT310NV1:
+		return 8;
+	default:
+		return bcm47xx_nvram_gpio_pin("robo_reset");
+	}
+}
+#else
+static inline int b53_switch_get_reset_gpio(struct b53_device *dev)
+{
+	return -ENOENT;
+}
+#endif
+#endif
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_regs.h b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_regs.h
new file mode 100644
index 00000000..ba509154
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_regs.h
@@ -0,0 +1,313 @@
+/*
+ * B53 register definitions
+ *
+ * Copyright (C) 2004 Broadcom Corporation
+ * Copyright (C) 2011-2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __B53_REGS_H
+#define __B53_REGS_H
+
+/* Management Port (SMP) Page offsets */
+#define B53_CTRL_PAGE			0x00 /* Control */
+#define B53_STAT_PAGE			0x01 /* Status */
+#define B53_MGMT_PAGE			0x02 /* Management Mode */
+#define B53_MIB_AC_PAGE			0x03 /* MIB Autocast */
+#define B53_ARLCTRL_PAGE		0x04 /* ARL Control */
+#define B53_ARLIO_PAGE			0x05 /* ARL Access */
+#define B53_FRAMEBUF_PAGE		0x06 /* Management frame access */
+#define B53_MEM_ACCESS_PAGE		0x08 /* Memory access */
+
+/* PHY Registers */
+#define B53_PORT_MII_PAGE(i)		(0x10 + i) /* Port i MII Registers */
+#define B53_IM_PORT_PAGE		0x18 /* Inverse MII Port (to EMAC) */
+#define B53_ALL_PORT_PAGE		0x19 /* All ports MII (broadcast) */
+
+/* MIB registers */
+#define B53_MIB_PAGE(i)			(0x20 + i)
+
+/* Quality of Service (QoS) Registers */
+#define B53_QOS_PAGE			0x30
+
+/* Port VLAN Page */
+#define B53_PVLAN_PAGE			0x31
+
+/* VLAN Registers */
+#define B53_VLAN_PAGE			0x34
+
+/* Jumbo Frame Registers */
+#define B53_JUMBO_PAGE			0x40
+
+/*************************************************************************
+ * Control Page registers
+ *************************************************************************/
+
+/* Port Control Register (8 bit) */
+#define B53_PORT_CTRL(i)		(0x00 + i)
+#define   PORT_CTRL_RX_DISABLE		BIT(0)
+#define   PORT_CTRL_TX_DISABLE		BIT(1)
+#define   PORT_CTRL_RX_BCST_EN		BIT(2) /* Broadcast RX (P8 only) */
+#define   PORT_CTRL_RX_MCST_EN		BIT(3) /* Multicast RX (P8 only) */
+#define   PORT_CTRL_RX_UCST_EN		BIT(4) /* Unicast RX (P8 only) */
+#define	  PORT_CTRL_STP_STATE_S		5
+#define   PORT_CTRL_STP_STATE_MASK	(0x3 << PORT_CTRL_STP_STATE_S)
+
+/* SMP Control Register (8 bit) */
+#define B53_SMP_CTRL			0x0a
+
+/* Switch Mode Control Register (8 bit) */
+#define B53_SWITCH_MODE			0x0b
+#define   SM_SW_FWD_MODE		BIT(0)	/* 1 = Managed Mode */
+#define   SM_SW_FWD_EN			BIT(1)	/* Forwarding Enable */
+
+/* IMP Port state override register (8 bit) */
+#define B53_PORT_OVERRIDE_CTRL		0x0e
+#define   PORT_OVERRIDE_LINK		BIT(0)
+#define   PORT_OVERRIDE_HALF_DUPLEX	BIT(1) /* 0 = Full Duplex */
+#define   PORT_OVERRIDE_SPEED_S		2
+#define   PORT_OVERRIDE_SPEED_10M	(0 << PORT_OVERRIDE_SPEED_S)
+#define   PORT_OVERRIDE_SPEED_100M	(1 << PORT_OVERRIDE_SPEED_S)
+#define   PORT_OVERRIDE_SPEED_1000M	(2 << PORT_OVERRIDE_SPEED_S)
+#define   PORT_OVERRIDE_RV_MII_25	BIT(4) /* BCM5325 only */
+#define   PORT_OVERRIDE_RX_FLOW		BIT(4)
+#define   PORT_OVERRIDE_TX_FLOW		BIT(5)
+#define   PORT_OVERRIDE_EN		BIT(7) /* Use the register contents */
+
+/* Power-down mode control */
+#define B53_PD_MODE_CTRL_25		0x0f
+
+/* IP Multicast control (8 bit) */
+#define B53_IP_MULTICAST_CTRL		0x21
+#define  B53_IPMC_FWD_EN		BIT(1)
+#define  B53_UC_FWD_EN			BIT(6)
+#define  B53_MC_FWD_EN			BIT(7)
+
+/* (16 bit) */
+#define B53_UC_FLOOD_MASK		0x32
+#define B53_MC_FLOOD_MASK		0x34
+#define B53_IPMC_FLOOD_MASK		0x36
+
+/* Software reset register (8 bit) */
+#define B53_SOFTRESET			0x79
+
+/* Fast Aging Control register (8 bit) */
+#define B53_FAST_AGE_CTRL		0x88
+#define   FAST_AGE_STATIC		BIT(0)
+#define   FAST_AGE_DYNAMIC		BIT(1)
+#define   FAST_AGE_PORT			BIT(2)
+#define   FAST_AGE_VLAN			BIT(3)
+#define   FAST_AGE_STP			BIT(4)
+#define   FAST_AGE_MC			BIT(5)
+#define   FAST_AGE_DONE			BIT(7)
+
+/*************************************************************************
+ * Status Page registers
+ *************************************************************************/
+
+/* Link Status Summary Register (16bit) */
+#define B53_LINK_STAT			0x00
+
+/* Link Status Change Register (16 bit) */
+#define B53_LINK_STAT_CHANGE		0x02
+
+/* Port Speed Summary Register (16 bit for FE, 32 bit for GE) */
+#define B53_SPEED_STAT			0x04
+#define  SPEED_PORT_FE(reg, port)	(((reg) >> (port)) & 1)
+#define  SPEED_PORT_GE(reg, port)	(((reg) >> 2 * (port)) & 3)
+#define  SPEED_STAT_10M			0
+#define  SPEED_STAT_100M		1
+#define  SPEED_STAT_1000M		2
+
+/* Duplex Status Summary (16 bit) */
+#define B53_DUPLEX_STAT_FE		0x06
+#define B53_DUPLEX_STAT_GE		0x08
+#define B53_DUPLEX_STAT_63XX		0x0c
+
+/* Revision ID register for BCM5325 */
+#define B53_REV_ID_25			0x50
+
+/* Strap Value (48 bit) */
+#define B53_STRAP_VALUE			0x70
+#define   SV_GMII_CTRL_115		BIT(27)
+
+/*************************************************************************
+ * Management Mode Page Registers
+ *************************************************************************/
+
+/* Global Management Config Register (8 bit) */
+#define B53_GLOBAL_CONFIG		0x00
+#define   GC_RESET_MIB			0x01
+#define   GC_RX_BPDU_EN			0x02
+#define   GC_MIB_AC_HDR_EN		0x10
+#define   GC_MIB_AC_EN			0x20
+#define   GC_FRM_MGMT_PORT_M		0xC0
+#define   GC_FRM_MGMT_PORT_04		0x00
+#define   GC_FRM_MGMT_PORT_MII		0x80
+
+/* Device ID register (8 or 32 bit) */
+#define B53_DEVICE_ID			0x30
+
+/* Revision ID register (8 bit) */
+#define B53_REV_ID			0x40
+
+/*************************************************************************
+ * ARL Access Page Registers
+ *************************************************************************/
+
+/* VLAN Table Access Register (8 bit) */
+#define B53_VT_ACCESS			0x80
+#define B53_VT_ACCESS_9798		0x60 /* for BCM5397/BCM5398 */
+#define B53_VT_ACCESS_63XX		0x60 /* for BCM6328/62/68 */
+#define   VTA_CMD_WRITE			0
+#define   VTA_CMD_READ			1
+#define   VTA_CMD_CLEAR			2
+#define   VTA_START_CMD			BIT(7)
+
+/* VLAN Table Index Register (16 bit) */
+#define B53_VT_INDEX			0x81
+#define B53_VT_INDEX_9798		0x61
+#define B53_VT_INDEX_63XX		0x62
+
+/* VLAN Table Entry Register (32 bit) */
+#define B53_VT_ENTRY			0x83
+#define B53_VT_ENTRY_9798		0x63
+#define B53_VT_ENTRY_63XX		0x64
+#define   VTE_MEMBERS			0x1ff
+#define   VTE_UNTAG_S			9
+#define   VTE_UNTAG			(0x1ff << 9)
+
+/*************************************************************************
+ * Port VLAN Registers
+ *************************************************************************/
+
+/* Port VLAN mask (16 bit) IMP port is always 8, also on 5325 & co */
+#define B53_PVLAN_PORT_MASK(i)		((i) * 2)
+
+/*************************************************************************
+ * 802.1Q Page Registers
+ *************************************************************************/
+
+/* Global QoS Control (8 bit) */
+#define B53_QOS_GLOBAL_CTL		0x00
+
+/* Enable 802.1Q for individual Ports (16 bit) */
+#define B53_802_1P_EN			0x04
+
+/*************************************************************************
+ * VLAN Page Registers
+ *************************************************************************/
+
+/* VLAN Control 0 (8 bit) */
+#define B53_VLAN_CTRL0			0x00
+#define   VC0_8021PF_CTRL_MASK		0x3
+#define   VC0_8021PF_CTRL_NONE		0x0
+#define   VC0_8021PF_CTRL_CHANGE_PRI	0x1
+#define   VC0_8021PF_CTRL_CHANGE_VID	0x2
+#define   VC0_8021PF_CTRL_CHANGE_BOTH	0x3
+#define   VC0_8021QF_CTRL_MASK		0xc
+#define   VC0_8021QF_CTRL_CHANGE_PRI	0x1
+#define   VC0_8021QF_CTRL_CHANGE_VID	0x2
+#define   VC0_8021QF_CTRL_CHANGE_BOTH	0x3
+#define   VC0_RESERVED_1		BIT(1)
+#define   VC0_DROP_VID_MISS		BIT(4)
+#define   VC0_VID_HASH_VID		BIT(5)
+#define   VC0_VID_CHK_EN		BIT(6)	/* Use VID,DA or VID,SA */
+#define   VC0_VLAN_EN			BIT(7)	/* 802.1Q VLAN Enabled */
+
+/* VLAN Control 1 (8 bit) */
+#define B53_VLAN_CTRL1			0x01
+#define   VC1_RX_MCST_TAG_EN		BIT(1)
+#define   VC1_RX_MCST_FWD_EN		BIT(2)
+#define   VC1_RX_MCST_UNTAG_EN		BIT(3)
+
+/* VLAN Control 2 (8 bit) */
+#define B53_VLAN_CTRL2			0x02
+
+/* VLAN Control 3 (8 bit when BCM5325, 16 bit else) */
+#define B53_VLAN_CTRL3			0x03
+#define B53_VLAN_CTRL3_63XX		0x04
+#define   VC3_MAXSIZE_1532		BIT(6) /* 5325 only */
+#define   VC3_HIGH_8BIT_EN		BIT(7) /* 5325 only */
+
+/* VLAN Control 4 (8 bit) */
+#define B53_VLAN_CTRL4			0x05
+#define B53_VLAN_CTRL4_25		0x04
+#define B53_VLAN_CTRL4_63XX		0x06
+#define   VC4_ING_VID_CHECK_S		6
+#define   VC4_ING_VID_CHECK_MASK	(0x3 << VC4_ING_VID_CHECK_S)
+#define   VC4_ING_VID_VIO_FWD		0 /* forward, but do not learn */
+#define   VC4_ING_VID_VIO_DROP		1 /* drop VID violations */
+#define   VC4_NO_ING_VID_CHK		2 /* do not check */
+#define   VC4_ING_VID_VIO_TO_IMP	3 /* redirect to MII port */
+
+/* VLAN Control 5 (8 bit) */
+#define B53_VLAN_CTRL5			0x06
+#define B53_VLAN_CTRL5_25		0x05
+#define B53_VLAN_CTRL5_63XX		0x07
+#define   VC5_VID_FFF_EN		BIT(2)
+#define   VC5_DROP_VTABLE_MISS		BIT(3)
+
+/* VLAN Control 6 (8 bit) */
+#define B53_VLAN_CTRL6			0x07
+#define B53_VLAN_CTRL6_63XX		0x08
+
+/* VLAN Table Access Register (16 bit) */
+#define B53_VLAN_TABLE_ACCESS_25	0x06	/* BCM5325E/5350 */
+#define B53_VLAN_TABLE_ACCESS_65	0x08	/* BCM5365 */
+#define   VTA_VID_LOW_MASK_25		0xf
+#define   VTA_VID_LOW_MASK_65		0xff
+#define   VTA_VID_HIGH_S_25		4
+#define   VTA_VID_HIGH_S_65		8
+#define   VTA_VID_HIGH_MASK_25		(0xff << VTA_VID_HIGH_S_25E)
+#define   VTA_VID_HIGH_MASK_65		(0xf << VTA_VID_HIGH_S_65)
+#define   VTA_RW_STATE			BIT(12)
+#define   VTA_RW_STATE_RD		0
+#define   VTA_RW_STATE_WR		BIT(12)
+#define   VTA_RW_OP_EN			BIT(13)
+
+/* VLAN Read/Write Registers for (16/32 bit) */
+#define B53_VLAN_WRITE_25		0x08
+#define B53_VLAN_WRITE_65		0x0a
+#define B53_VLAN_READ			0x0c
+#define   VA_MEMBER_MASK		0x3f
+#define   VA_UNTAG_S_25			6
+#define   VA_UNTAG_MASK_25		0x3f
+#define   VA_UNTAG_S_65			7
+#define   VA_UNTAG_MASK_65		0x1f
+#define   VA_VID_HIGH_S			12
+#define   VA_VID_HIGH_MASK		(0xffff << VA_VID_HIGH_S)
+#define   VA_VALID_25			BIT(20)
+#define   VA_VALID_25_R4		BIT(24)
+#define   VA_VALID_65			BIT(14)
+
+/* VLAN Port Default Tag (16 bit) */
+#define B53_VLAN_PORT_DEF_TAG(i)	(0x10 + 2 * (i))
+
+/*************************************************************************
+ * Jumbo Frame Page Registers
+ *************************************************************************/
+
+/* Jumbo Enable Port Mask (bit i == port i enabled) (32 bit) */
+#define B53_JUMBO_PORT_MASK		0x01
+#define B53_JUMBO_PORT_MASK_63XX	0x04
+#define   JPM_10_100_JUMBO_EN		BIT(24) /* GigE always enabled */
+
+/* Good Frame Max Size without 802.1Q TAG (16 bit) */
+#define B53_JUMBO_MAX_SIZE		0x05
+#define B53_JUMBO_MAX_SIZE_63XX		0x08
+#define   JMS_MIN_SIZE			1518
+#define   JMS_MAX_SIZE			9724
+
+#endif /* !__B53_REGS_H */
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
new file mode 100644
index 00000000..8c6b171e
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
@@ -0,0 +1,327 @@
+/*
+ * B53 register access through SPI
+ *
+ * Copyright (C) 2011-2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <asm/unaligned.h>
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/spi/spi.h>
+#include <linux/platform_data/b53.h>
+
+#include "b53_priv.h"
+
+#define B53_SPI_DATA		0xf0
+
+#define B53_SPI_STATUS		0xfe
+#define B53_SPI_CMD_SPIF	BIT(7)
+#define B53_SPI_CMD_RACK	BIT(5)
+
+#define B53_SPI_CMD_READ	0x00
+#define B53_SPI_CMD_WRITE	0x01
+#define B53_SPI_CMD_NORMAL	0x60
+#define B53_SPI_CMD_FAST	0x10
+
+#define B53_SPI_PAGE_SELECT	0xff
+
+static inline int b53_spi_read_reg(struct spi_device *spi, u8 reg, u8 *val,
+				     unsigned len)
+{
+	u8 txbuf[2];
+
+	txbuf[0] = B53_SPI_CMD_NORMAL | B53_SPI_CMD_READ;
+	txbuf[1] = reg;
+
+	return spi_write_then_read(spi, txbuf, 2, val, len);
+}
+
+static inline int b53_spi_clear_status(struct spi_device *spi)
+{
+	unsigned int i;
+	u8 rxbuf;
+	int ret;
+
+	for (i = 0; i < 10; i++) {
+		ret = b53_spi_read_reg(spi, B53_SPI_STATUS, &rxbuf, 1);
+		if (ret)
+			return ret;
+
+		if (!(rxbuf & B53_SPI_CMD_SPIF))
+			break;
+
+		mdelay(1);
+	}
+
+	if (i == 10)
+		return -EIO;
+
+	return 0;
+}
+
+static inline int b53_spi_set_page(struct spi_device *spi, u8 page)
+{
+	u8 txbuf[3];
+
+	txbuf[0] = B53_SPI_CMD_NORMAL | B53_SPI_CMD_WRITE;
+	txbuf[1] = B53_SPI_PAGE_SELECT;
+	txbuf[2] = page;
+
+	return spi_write(spi, txbuf, sizeof(txbuf));
+}
+
+static inline int b53_prepare_reg_access(struct spi_device *spi, u8 page)
+{
+	int ret = b53_spi_clear_status(spi);
+	if (ret)
+		return ret;
+
+	return b53_spi_set_page(spi, page);
+}
+
+static int b53_spi_prepare_reg_read(struct spi_device *spi, u8 reg)
+{
+	u8 rxbuf;
+	int retry_count;
+	int ret;
+
+	ret = b53_spi_read_reg(spi, reg, &rxbuf, 1);
+	if (ret)
+		return ret;
+
+	for (retry_count = 0; retry_count < 10; retry_count++) {
+		ret = b53_spi_read_reg(spi, B53_SPI_STATUS, &rxbuf, 1);
+		if (ret)
+			return ret;
+
+		if (rxbuf & B53_SPI_CMD_RACK)
+			break;
+
+		mdelay(1);
+	}
+
+	if (retry_count == 10)
+		return -EIO;
+
+	return 0;
+}
+
+static int b53_spi_read(struct b53_device *dev, u8 page, u8 reg, u8 *data,
+			unsigned len)
+{
+	struct spi_device *spi = dev->priv;
+	int ret;
+
+	ret = b53_prepare_reg_access(spi, page);
+	if (ret)
+		return ret;
+
+	ret = b53_spi_prepare_reg_read(spi, reg);
+	if (ret)
+		return ret;
+
+	return b53_spi_read_reg(spi, B53_SPI_DATA, data, len);
+}
+
+static int b53_spi_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)
+{
+	return b53_spi_read(dev, page, reg, val, 1);
+}
+
+static int b53_spi_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)
+{
+	int ret = b53_spi_read(dev, page, reg, (u8 *)val, 2);
+	if (!ret)
+		*val = le16_to_cpu(*val);
+
+	return ret;
+}
+
+static int b53_spi_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)
+{
+	int ret = b53_spi_read(dev, page, reg, (u8 *)val, 4);
+	if (!ret)
+		*val = le32_to_cpu(*val);
+
+	return ret;
+}
+
+static int b53_spi_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	int ret;
+
+	*val = 0;
+	ret = b53_spi_read(dev, page, reg, (u8 *)val, 6);
+	if (!ret)
+		*val = le64_to_cpu(*val);
+
+	return ret;
+}
+
+static int b53_spi_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	int ret = b53_spi_read(dev, page, reg, (u8 *)val, 8);
+	if (!ret)
+		*val = le64_to_cpu(*val);
+
+	return ret;
+}
+
+static int b53_spi_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)
+{
+	struct spi_device *spi = dev->priv;
+	int ret;
+	u8 txbuf[3];
+
+	ret = b53_prepare_reg_access(spi, page);
+	if (ret)
+		return ret;
+
+	txbuf[0] = B53_SPI_CMD_NORMAL | B53_SPI_CMD_WRITE;
+	txbuf[1] = reg;
+	txbuf[2] = value;
+
+	return spi_write(spi, txbuf, sizeof(txbuf));
+}
+
+static int b53_spi_write16(struct b53_device *dev, u8 page, u8 reg, u16 value)
+{
+	struct spi_device *spi = dev->priv;
+	int ret;
+	u8 txbuf[4];
+
+	ret = b53_prepare_reg_access(spi, page);
+	if (ret)
+		return ret;
+
+	txbuf[0] = B53_SPI_CMD_NORMAL | B53_SPI_CMD_WRITE;
+	txbuf[1] = reg;
+	put_unaligned_le16(value, &txbuf[2]);
+
+	return spi_write(spi, txbuf, sizeof(txbuf));
+}
+
+static int b53_spi_write32(struct b53_device *dev, u8 page, u8 reg, u32 value)
+{
+	struct spi_device *spi = dev->priv;
+	int ret;
+	u8 txbuf[6];
+
+	ret = b53_prepare_reg_access(spi, page);
+	if (ret)
+		return ret;
+
+	txbuf[0] = B53_SPI_CMD_NORMAL | B53_SPI_CMD_WRITE;
+	txbuf[1] = reg;
+	put_unaligned_le32(value, &txbuf[2]);
+
+	return spi_write(spi, txbuf, sizeof(txbuf));
+}
+
+static int b53_spi_write48(struct b53_device *dev, u8 page, u8 reg, u64 value)
+{
+	struct spi_device *spi = dev->priv;
+	int ret;
+	u8 txbuf[10];
+
+	ret = b53_prepare_reg_access(spi, page);
+	if (ret)
+		return ret;
+
+	txbuf[0] = B53_SPI_CMD_NORMAL | B53_SPI_CMD_WRITE;
+	txbuf[1] = reg;
+	put_unaligned_le64(value, &txbuf[2]);
+
+	return spi_write(spi, txbuf, sizeof(txbuf) - 2);
+}
+
+static int b53_spi_write64(struct b53_device *dev, u8 page, u8 reg, u64 value)
+{
+	struct spi_device *spi = dev->priv;
+	int ret;
+	u8 txbuf[10];
+
+	ret = b53_prepare_reg_access(spi, page);
+	if (ret)
+		return ret;
+
+	txbuf[0] = B53_SPI_CMD_NORMAL | B53_SPI_CMD_WRITE;
+	txbuf[1] = reg;
+	put_unaligned_le64(value, &txbuf[2]);
+
+	return spi_write(spi, txbuf, sizeof(txbuf));
+}
+
+static struct b53_io_ops b53_spi_ops = {
+	.read8 = b53_spi_read8,
+	.read16 = b53_spi_read16,
+	.read32 = b53_spi_read32,
+	.read48 = b53_spi_read48,
+	.read64 = b53_spi_read64,
+	.write8 = b53_spi_write8,
+	.write16 = b53_spi_write16,
+	.write32 = b53_spi_write32,
+	.write48 = b53_spi_write48,
+	.write64 = b53_spi_write64,
+};
+
+static int b53_spi_probe(struct spi_device *spi)
+{
+	struct b53_device *dev;
+	int ret;
+
+	dev = b53_switch_alloc(&spi->dev, &b53_spi_ops, spi);
+	if (!dev)
+		return -ENOMEM;
+
+	if (spi->dev.platform_data)
+		dev->pdata = spi->dev.platform_data;
+
+	ret = b53_switch_register(dev);
+	if (ret)
+		return ret;
+
+	spi_set_drvdata(spi, dev);
+
+	return 0;
+}
+
+static int b53_spi_remove(struct spi_device *spi)
+{
+	struct b53_device *dev = spi_get_drvdata(spi);
+
+	if (dev) {
+		b53_switch_remove(dev);
+	}
+
+	return 0;
+}
+
+static struct spi_driver b53_spi_driver = {
+	.driver = {
+		.name	= "b53-switch",
+		.bus	= &spi_bus_type,
+		.owner	= THIS_MODULE,
+	},
+	.probe	= b53_spi_probe,
+	.remove	= b53_spi_remove,
+};
+
+module_spi_driver(b53_spi_driver);
+
+MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
+MODULE_DESCRIPTION("B53 SPI access driver");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
new file mode 100644
index 00000000..a68e2754
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
@@ -0,0 +1,379 @@
+/*
+ * B53 register access through Switch Register Access Bridge Registers
+ *
+ * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/b53.h>
+
+#include "b53_priv.h"
+
+/* command and status register of the SRAB */
+#define B53_SRAB_CMDSTAT		0x2c
+#define  B53_SRAB_CMDSTAT_RST		BIT(2)
+#define  B53_SRAB_CMDSTAT_WRITE		BIT(1)
+#define  B53_SRAB_CMDSTAT_GORDYN	BIT(0)
+#define  B53_SRAB_CMDSTAT_PAGE		24
+#define  B53_SRAB_CMDSTAT_REG		16
+
+/* high order word of write data to switch registe */
+#define B53_SRAB_WD_H			0x30
+
+/* low order word of write data to switch registe */
+#define B53_SRAB_WD_L			0x34
+
+/* high order word of read data from switch register */
+#define B53_SRAB_RD_H			0x38
+
+/* low order word of read data from switch register */
+#define B53_SRAB_RD_L			0x3c
+
+/* command and status register of the SRAB */
+#define B53_SRAB_CTRLS			0x40
+#define  B53_SRAB_CTRLS_RCAREQ		BIT(3)
+#define  B53_SRAB_CTRLS_RCAGNT		BIT(4)
+#define  B53_SRAB_CTRLS_SW_INIT_DONE	BIT(6)
+
+/* the register captures interrupt pulses from the switch */
+#define B53_SRAB_INTR			0x44
+
+static int b53_srab_request_grant(struct b53_device *dev)
+{
+	u8 __iomem *regs = dev->priv;
+	u32 ctrls;
+	int i;
+
+	ctrls = readl(regs + B53_SRAB_CTRLS);
+	ctrls |= B53_SRAB_CTRLS_RCAREQ;
+	writel(ctrls, regs + B53_SRAB_CTRLS);
+
+	for (i = 0; i < 20; i++) {
+		ctrls = readl(regs + B53_SRAB_CTRLS);
+		if (ctrls & B53_SRAB_CTRLS_RCAGNT)
+			break;
+		usleep_range(10, 100);
+	}
+	if (WARN_ON(i == 5))
+		return -EIO;
+
+	return 0;
+}
+
+static void b53_srab_release_grant(struct b53_device *dev)
+{
+	u8 __iomem *regs = dev->priv;
+	u32 ctrls;
+
+	ctrls = readl(regs + B53_SRAB_CTRLS);
+	ctrls &= ~B53_SRAB_CTRLS_RCAREQ;
+	writel(ctrls, regs + B53_SRAB_CTRLS);
+}
+
+static int b53_srab_op(struct b53_device *dev, u8 page, u8 reg, u32 op)
+{
+	int i;
+	u32 cmdstat;
+	u8 __iomem *regs = dev->priv;
+
+	/* set register address */
+	cmdstat = (page << B53_SRAB_CMDSTAT_PAGE) |
+		  (reg << B53_SRAB_CMDSTAT_REG) |
+		  B53_SRAB_CMDSTAT_GORDYN |
+		  op;
+	writel(cmdstat, regs + B53_SRAB_CMDSTAT);
+	
+	/* check if operation completed */
+	for (i = 0; i < 5; ++i) {
+		cmdstat = readl(regs + B53_SRAB_CMDSTAT);
+		if (!(cmdstat & B53_SRAB_CMDSTAT_GORDYN))
+			break;
+		usleep_range(10, 100);
+	}
+
+	if (WARN_ON(i == 5))
+		return -EIO;
+
+	return 0;
+}
+
+static int b53_srab_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	ret = b53_srab_op(dev, page, reg, 0);
+	if (ret)
+		goto err;
+
+	*val = readl(regs + B53_SRAB_RD_L) & 0xff;
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static int b53_srab_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	ret = b53_srab_op(dev, page, reg, 0);
+	if (ret)
+		goto err;
+
+	*val = readl(regs + B53_SRAB_RD_L) & 0xffff;
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static int b53_srab_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	ret = b53_srab_op(dev, page, reg, 0);
+	if (ret)
+		goto err;
+
+	*val = readl(regs + B53_SRAB_RD_L);
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static int b53_srab_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	ret = b53_srab_op(dev, page, reg, 0);
+	if (ret)
+		goto err;
+
+	*val = readl(regs + B53_SRAB_RD_L);
+	*val += ((u64)readl(regs + B53_SRAB_RD_H) & 0xffff) << 32;
+	
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static int b53_srab_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	ret = b53_srab_op(dev, page, reg, 0);
+	if (ret)
+		goto err;
+
+	*val = readl(regs + B53_SRAB_RD_L);
+	*val += (u64)readl(regs + B53_SRAB_RD_H) << 32;
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static int b53_srab_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	writel(value, regs + B53_SRAB_WD_L);
+
+	ret = b53_srab_op(dev, page, reg, B53_SRAB_CMDSTAT_WRITE);
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static int b53_srab_write16(struct b53_device *dev, u8 page, u8 reg,
+			     u16 value)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	writel(value, regs + B53_SRAB_WD_L);
+
+	ret = b53_srab_op(dev, page, reg, B53_SRAB_CMDSTAT_WRITE);
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static int b53_srab_write32(struct b53_device *dev, u8 page, u8 reg,
+				    u32 value)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	writel(value, regs + B53_SRAB_WD_L);
+
+	ret = b53_srab_op(dev, page, reg, B53_SRAB_CMDSTAT_WRITE);
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+
+}
+
+static int b53_srab_write48(struct b53_device *dev, u8 page, u8 reg,
+				    u64 value)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	writel((u32)value, regs + B53_SRAB_WD_L);
+	writel((u16)(value >> 32), regs + B53_SRAB_WD_H);
+
+	ret = b53_srab_op(dev, page, reg, B53_SRAB_CMDSTAT_WRITE);
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+
+}
+
+static int b53_srab_write64(struct b53_device *dev, u8 page, u8 reg,
+			     u64 value)
+{
+	u8 __iomem *regs = dev->priv;
+	int ret = 0;
+
+	ret = b53_srab_request_grant(dev);
+	if (ret)
+		goto err;
+
+	writel((u32)value, regs + B53_SRAB_WD_L);
+	writel((u32)(value >> 32), regs + B53_SRAB_WD_H);
+
+	ret = b53_srab_op(dev, page, reg, B53_SRAB_CMDSTAT_WRITE);
+
+err:
+	b53_srab_release_grant(dev);
+
+	return ret;
+}
+
+static struct b53_io_ops b53_srab_ops = {
+	.read8 = b53_srab_read8,
+	.read16 = b53_srab_read16,
+	.read32 = b53_srab_read32,
+	.read48 = b53_srab_read48,
+	.read64 = b53_srab_read64,
+	.write8 = b53_srab_write8,
+	.write16 = b53_srab_write16,
+	.write32 = b53_srab_write32,
+	.write48 = b53_srab_write48,
+	.write64 = b53_srab_write64,
+};
+
+static int b53_srab_probe(struct platform_device *pdev)
+{
+	struct b53_platform_data *pdata = pdev->dev.platform_data;
+	struct b53_device *dev;
+
+	if (!pdata)
+		return -EINVAL;
+
+	dev = b53_switch_alloc(&pdev->dev, &b53_srab_ops, pdata->regs);
+	if (!dev)
+		return -ENOMEM;
+
+	if (pdata)
+		dev->pdata = pdata;
+
+	platform_set_drvdata(pdev, dev);
+
+	return b53_switch_register(dev);
+}
+
+static int b53_srab_remove(struct platform_device *pdev)
+{
+	struct b53_device *dev = platform_get_drvdata(pdev);
+
+	if (dev) {
+		b53_switch_remove(dev);
+	}
+
+	return 0;
+}
+
+static struct platform_driver b53_srab_driver = {
+	.probe = b53_srab_probe,
+	.remove = b53_srab_remove,
+	.driver = {
+		.name = "b53-srab-switch",
+	},
+};
+
+module_platform_driver(b53_srab_driver);
+MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>");
+MODULE_DESCRIPTION("B53 Switch Register Access Bridge Registers (SRAB) access driver");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/ip17xx.c b/trunk/target/linux/generic/files/drivers/net/phy/ip17xx.c
new file mode 100644
index 00000000..c82c39e0
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/ip17xx.c
@@ -0,0 +1,1410 @@
+/*
+ * ip17xx.c: Swconfig configuration for IC+ IP17xx switch family
+ *
+ * Copyright (C) 2008 Patrick Horn <patrick.horn@gmail.com>
+ * Copyright (C) 2008, 2010 Martin Mares <mj@ucw.cz>
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/skbuff.h>
+#include <linux/mii.h>
+#include <linux/phy.h>
+#include <linux/delay.h>
+#include <linux/switch.h>
+#include <linux/device.h>
+
+#define MAX_VLANS 16
+#define MAX_PORTS 9
+#undef DUMP_MII_IO
+
+typedef struct ip17xx_reg {
+	u16 p;			// phy
+	u16 m;			// mii
+} reg;
+typedef char bitnum;
+
+#define NOTSUPPORTED {-1,-1}
+
+#define REG_SUPP(x) (((x).m != ((u16)-1)) && ((x).p != (u16)-1))
+
+struct ip17xx_state;
+
+/*********** CONSTANTS ***********/
+struct register_mappings {
+	char *NAME;
+	u16 MODEL_NO;			// Compare to bits 4-9 of MII register 0,3.
+	bitnum NUM_PORTS;
+	bitnum CPU_PORT;
+
+/* The default VLAN for each port.
+	 Default: 0x0001 for Ports 0,1,2,3
+		  0x0002 for Ports 4,5 */
+	reg VLAN_DEFAULT_TAG_REG[MAX_PORTS];
+
+/* These ports are tagged.
+	 Default: 0x00 */
+	reg ADD_TAG_REG;
+	reg REMOVE_TAG_REG;
+	bitnum ADD_TAG_BIT[MAX_PORTS];
+/* These ports are untagged.
+	 Default: 0x00 (i.e. do not alter any VLAN tags...)
+	 Maybe set to 0 if user disables VLANs. */
+	bitnum REMOVE_TAG_BIT[MAX_PORTS];
+
+/* Port M and Port N are on the same VLAN.
+	 Default: All ports on all VLANs. */
+// Use register {29, 19+N/2}
+	reg VLAN_LOOKUP_REG;
+// Port 5 uses register {30, 18} but same as odd bits.
+	reg VLAN_LOOKUP_REG_5;		// in a different register on IP175C.
+	bitnum VLAN_LOOKUP_EVEN_BIT[MAX_PORTS];
+	bitnum VLAN_LOOKUP_ODD_BIT[MAX_PORTS];
+
+/* This VLAN corresponds to which ports.
+	 Default: 0x2f,0x30,0x3f,0x3f... */
+	reg TAG_VLAN_MASK_REG;
+	bitnum TAG_VLAN_MASK_EVEN_BIT[MAX_PORTS];
+	bitnum TAG_VLAN_MASK_ODD_BIT[MAX_PORTS];
+
+	int RESET_VAL;
+	reg RESET_REG;
+
+	reg MODE_REG;
+	int MODE_VAL;
+
+/* General flags */
+	reg ROUTER_CONTROL_REG;
+	reg VLAN_CONTROL_REG;
+	bitnum TAG_VLAN_BIT;
+	bitnum ROUTER_EN_BIT;
+	bitnum NUMLAN_GROUPS_MAX;
+	bitnum NUMLAN_GROUPS_BIT;
+
+	reg MII_REGISTER_EN;
+	bitnum MII_REGISTER_EN_BIT;
+
+	// set to 1 for 178C, 0 for 175C.
+	bitnum SIMPLE_VLAN_REGISTERS;	// 175C has two vlans per register but 178C has only one.
+
+	// Pointers to functions which manipulate hardware state
+	int (*update_state)(struct ip17xx_state *state);
+	int (*set_vlan_mode)(struct ip17xx_state *state);
+	int (*reset)(struct ip17xx_state *state);
+};
+
+static int ip175c_update_state(struct ip17xx_state *state);
+static int ip175c_set_vlan_mode(struct ip17xx_state *state);
+static int ip175c_reset(struct ip17xx_state *state);
+
+static const struct register_mappings IP178C = {
+	.NAME = "IP178C",
+	.MODEL_NO = 0x18,
+	.VLAN_DEFAULT_TAG_REG = {
+		{30,3},{30,4},{30,5},{30,6},{30,7},{30,8},
+		{30,9},{30,10},{30,11},
+	},
+
+	.ADD_TAG_REG = {30,12},
+	.ADD_TAG_BIT = {0,1,2,3,4,5,6,7,8},
+	.REMOVE_TAG_REG = {30,13},
+	.REMOVE_TAG_BIT = {4,5,6,7,8,9,10,11,12},
+
+	.SIMPLE_VLAN_REGISTERS = 1,
+
+	.VLAN_LOOKUP_REG = {31,0},// +N
+	.VLAN_LOOKUP_REG_5 = NOTSUPPORTED, // not used with SIMPLE_VLAN_REGISTERS
+	.VLAN_LOOKUP_EVEN_BIT = {0,1,2,3,4,5,6,7,8},
+	.VLAN_LOOKUP_ODD_BIT = {0,1,2,3,4,5,6,7,8},
+
+	.TAG_VLAN_MASK_REG = {30,14}, // +N
+	.TAG_VLAN_MASK_EVEN_BIT = {0,1,2,3,4,5,6,7,8},
+	.TAG_VLAN_MASK_ODD_BIT = {0,1,2,3,4,5,6,7,8},
+
+	.RESET_VAL = 0x55AA,
+	.RESET_REG = {30,0},
+	.MODE_VAL = 0,
+	.MODE_REG = NOTSUPPORTED,
+
+	.ROUTER_CONTROL_REG = {30,30},
+	.ROUTER_EN_BIT = 11,
+	.NUMLAN_GROUPS_MAX = 8,
+	.NUMLAN_GROUPS_BIT = 8, // {0-2}
+
+	.VLAN_CONTROL_REG = {30,13},
+	.TAG_VLAN_BIT = 3,
+
+	.CPU_PORT = 8,
+	.NUM_PORTS = 9,
+
+	.MII_REGISTER_EN = NOTSUPPORTED,
+
+	.update_state = ip175c_update_state,
+	.set_vlan_mode = ip175c_set_vlan_mode,
+	.reset = ip175c_reset,
+};
+
+static const struct register_mappings IP175C = {
+	.NAME = "IP175C",
+	.MODEL_NO = 0x18,
+	.VLAN_DEFAULT_TAG_REG = {
+		{29,24},{29,25},{29,26},{29,27},{29,28},{29,30},
+		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED
+	},
+
+	.ADD_TAG_REG = {29,23},
+	.REMOVE_TAG_REG = {29,23},
+	.ADD_TAG_BIT = {11,12,13,14,15,1,-1,-1,-1},
+	.REMOVE_TAG_BIT = {6,7,8,9,10,0,-1,-1,-1},
+
+	.SIMPLE_VLAN_REGISTERS = 0,
+
+	.VLAN_LOOKUP_REG = {29,19},// +N/2
+	.VLAN_LOOKUP_REG_5 = {30,18},
+	.VLAN_LOOKUP_EVEN_BIT = {8,9,10,11,12,15,-1,-1,-1},
+	.VLAN_LOOKUP_ODD_BIT = {0,1,2,3,4,7,-1,-1,-1},
+
+	.TAG_VLAN_MASK_REG = {30,1}, // +N/2
+	.TAG_VLAN_MASK_EVEN_BIT = {0,1,2,3,4,5,-1,-1,-1},
+	.TAG_VLAN_MASK_ODD_BIT = {8,9,10,11,12,13,-1,-1,-1},
+
+	.RESET_VAL = 0x175C,
+	.RESET_REG = {30,0},
+	.MODE_VAL = 0x175C,
+	.MODE_REG = {29,31},
+
+	.ROUTER_CONTROL_REG = {30,9},
+	.ROUTER_EN_BIT = 3,
+	.NUMLAN_GROUPS_MAX = 8,
+	.NUMLAN_GROUPS_BIT = 0, // {0-2}
+
+	.VLAN_CONTROL_REG = {30,9},
+	.TAG_VLAN_BIT = 7,
+
+	.NUM_PORTS = 6,
+	.CPU_PORT = 5,
+
+	.MII_REGISTER_EN = NOTSUPPORTED,
+
+	.update_state = ip175c_update_state,
+	.set_vlan_mode = ip175c_set_vlan_mode,
+	.reset = ip175c_reset,
+};
+
+static const struct register_mappings IP175A = {
+	.NAME = "IP175A",
+	.MODEL_NO = 0x05,
+	.VLAN_DEFAULT_TAG_REG = {
+		{0,24},{0,25},{0,26},{0,27},{0,28},NOTSUPPORTED,
+		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED
+	},
+
+	.ADD_TAG_REG = {0,23},
+	.REMOVE_TAG_REG = {0,23},
+	.ADD_TAG_BIT = {11,12,13,14,15,-1,-1,-1,-1},
+	.REMOVE_TAG_BIT = {6,7,8,9,10,-1,-1,-1,-1},
+
+	.SIMPLE_VLAN_REGISTERS = 0,
+
+	// Only programmable via EEPROM
+	.VLAN_LOOKUP_REG = NOTSUPPORTED,// +N/2
+	.VLAN_LOOKUP_REG_5 = NOTSUPPORTED,
+	.VLAN_LOOKUP_EVEN_BIT = {8,9,10,11,12,-1,-1,-1,-1},
+	.VLAN_LOOKUP_ODD_BIT = {0,1,2,3,4,-1,-1,-1,-1},
+
+	.TAG_VLAN_MASK_REG = NOTSUPPORTED, // +N/2,
+	.TAG_VLAN_MASK_EVEN_BIT = {-1,-1,-1,-1,-1,-1,-1,-1,-1},
+	.TAG_VLAN_MASK_ODD_BIT = {-1,-1,-1,-1,-1,-1,-1,-1,-1},
+
+	.RESET_VAL = -1,
+	.RESET_REG = NOTSUPPORTED,
+	.MODE_VAL = 0,
+	.MODE_REG = NOTSUPPORTED,
+
+	.ROUTER_CONTROL_REG = NOTSUPPORTED,
+	.VLAN_CONTROL_REG = NOTSUPPORTED,
+	.TAG_VLAN_BIT = -1,
+	.ROUTER_EN_BIT = -1,
+	.NUMLAN_GROUPS_MAX = -1,
+	.NUMLAN_GROUPS_BIT = -1, // {0-2}
+
+	.NUM_PORTS = 5,
+	.CPU_PORT = 4,
+
+	.MII_REGISTER_EN = {0, 18},
+	.MII_REGISTER_EN_BIT = 7,
+
+	.update_state = ip175c_update_state,
+	.set_vlan_mode = ip175c_set_vlan_mode,
+	.reset = ip175c_reset,
+};
+
+
+static int ip175d_update_state(struct ip17xx_state *state);
+static int ip175d_set_vlan_mode(struct ip17xx_state *state);
+static int ip175d_reset(struct ip17xx_state *state);
+
+static const struct register_mappings IP175D = {
+	.NAME = "IP175D",
+	.MODEL_NO = 0x18,
+
+	// The IP175D has a completely different interface, so we leave most
+	// of the registers undefined and switch to different code paths.
+
+	.VLAN_DEFAULT_TAG_REG = {
+		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,
+		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,
+	},
+
+	.ADD_TAG_REG = NOTSUPPORTED,
+	.REMOVE_TAG_REG = NOTSUPPORTED,
+
+	.SIMPLE_VLAN_REGISTERS = 0,
+
+	.VLAN_LOOKUP_REG = NOTSUPPORTED,
+	.VLAN_LOOKUP_REG_5 = NOTSUPPORTED,
+	.TAG_VLAN_MASK_REG = NOTSUPPORTED,
+
+	.RESET_VAL = 0x175D,
+	.RESET_REG = {20,2},
+	.MODE_REG = NOTSUPPORTED,
+
+	.ROUTER_CONTROL_REG = NOTSUPPORTED,
+	.ROUTER_EN_BIT = -1,
+	.NUMLAN_GROUPS_BIT = -1,
+
+	.VLAN_CONTROL_REG = NOTSUPPORTED,
+	.TAG_VLAN_BIT = -1,
+
+	.NUM_PORTS = 6,
+	.CPU_PORT = 5,
+
+	.MII_REGISTER_EN = NOTSUPPORTED,
+
+	.update_state = ip175d_update_state,
+	.set_vlan_mode = ip175d_set_vlan_mode,
+	.reset = ip175d_reset,
+};
+
+struct ip17xx_state {
+	struct switch_dev dev;
+	struct mii_bus *mii_bus;
+	bool registered;
+
+	int router_mode;		// ROUTER_EN
+	int vlan_enabled;		// TAG_VLAN_EN
+	struct port_state {
+		u16 pvid;
+		unsigned int shareports;
+	} ports[MAX_PORTS];
+	unsigned int add_tag;
+	unsigned int remove_tag;
+	int num_vlans;
+	struct vlan_state {
+		unsigned int ports;
+		unsigned int tag;	// VLAN tag (IP175D only)
+	} vlans[MAX_VLANS];
+	const struct register_mappings *regs;
+	reg proc_mii; 	// phy/reg for the low level register access via swconfig
+
+	char buf[80];
+};
+
+#define get_state(_dev) container_of((_dev), struct ip17xx_state, dev)
+
+static int ip_phy_read(struct ip17xx_state *state, int port, int reg)
+{
+	int val = mdiobus_read(state->mii_bus, port, reg);
+	if (val < 0)
+		pr_warning("IP17xx: Unable to get MII register %d,%d: error %d\n", port, reg, -val);
+#ifdef DUMP_MII_IO
+	else
+		pr_debug("IP17xx: Read MII(%d,%d) -> %04x\n", port, reg, val);
+#endif
+	return val;
+}
+
+static int ip_phy_write(struct ip17xx_state *state, int port, int reg, u16 val)
+{
+	int err;
+
+#ifdef DUMP_MII_IO
+	pr_debug("IP17xx: Write MII(%d,%d) <- %04x\n", port, reg, val);
+#endif
+	err = mdiobus_write(state->mii_bus, port, reg, val);
+	if (err < 0)
+		pr_warning("IP17xx: Unable to write MII register %d,%d: error %d\n", port, reg, -err);
+	return err;
+}
+
+static int ip_phy_write_masked(struct ip17xx_state *state, int port, int reg, unsigned int mask, unsigned int data)
+{
+	int val = ip_phy_read(state, port, reg);
+	if (val < 0)
+		return 0;
+	return ip_phy_write(state, port, reg, (val & ~mask) | data);
+}
+
+static int getPhy(struct ip17xx_state *state, reg mii)
+{
+	if (!REG_SUPP(mii))
+		return -EFAULT;
+	return ip_phy_read(state, mii.p, mii.m);
+}
+
+static int setPhy(struct ip17xx_state *state, reg mii, u16 value)
+{
+	int err;
+
+	if (!REG_SUPP(mii))
+		return -EFAULT;
+	err = ip_phy_write(state, mii.p, mii.m, value);
+	if (err < 0)
+		return err;
+	mdelay(2);
+	getPhy(state, mii);
+	return 0;
+}
+
+
+/**
+ * These two macros are to simplify the mapping of logical bits to the bits in hardware.
+ * NOTE: these macros will return if there is an error!
+ */
+
+#define GET_PORT_BITS(state, bits, addr, bit_lookup)		\
+	do {							\
+		int i, val = getPhy((state), (addr));		\
+		if (val < 0)					\
+			return val;				\
+		(bits) = 0;					\
+		for (i = 0; i < MAX_PORTS; i++) {		\
+			if ((bit_lookup)[i] == -1) continue;	\
+			if (val & (1<<(bit_lookup)[i]))		\
+				(bits) |= (1<<i);		\
+		}						\
+	} while (0)
+
+#define SET_PORT_BITS(state, bits, addr, bit_lookup)		\
+	do {							\
+		int i, val = getPhy((state), (addr));		\
+		if (val < 0)					\
+			return val;				\
+		for (i = 0; i < MAX_PORTS; i++) {		\
+			unsigned int newmask = ((bits)&(1<<i));	\
+			if ((bit_lookup)[i] == -1) continue;	\
+			val &= ~(1<<(bit_lookup)[i]);		\
+			val |= ((newmask>>i)<<(bit_lookup)[i]);	\
+		}						\
+		val = setPhy((state), (addr), val);		\
+		if (val < 0)					\
+			return val;				\
+	} while (0)
+
+
+static int get_model(struct ip17xx_state *state)
+{
+	int id1, id2;
+	int oui_id, model_no, rev_no, chip_no;
+
+	id1 = ip_phy_read(state, 0, 2);
+	id2 = ip_phy_read(state, 0, 3);
+	oui_id = (id1 << 6) | ((id2 >> 10) & 0x3f);
+	model_no = (id2 >> 4) & 0x3f;
+	rev_no = id2 & 0xf;
+	pr_debug("IP17xx: Identified oui=%06x model=%02x rev=%X\n", oui_id, model_no, rev_no);
+
+	if (oui_id != 0x0090c3)  // No other oui_id should have reached us anyway
+		return -ENODEV;
+
+	if (model_no == IP175A.MODEL_NO) {
+		state->regs = &IP175A;
+	} else if (model_no == IP175C.MODEL_NO) {
+		/*
+		 *  Several models share the same model_no:
+		 *  178C has more PHYs, so we try whether the device responds to a read from PHY5
+		 *  175D has a new chip ID register
+		 *  175C has neither
+		 */
+		if (ip_phy_read(state, 5, 2) == 0x0243) {
+			state->regs = &IP178C;
+		} else {
+			chip_no = ip_phy_read(state, 20, 0);
+			pr_debug("IP17xx: Chip ID register reads %04x\n", chip_no);
+			if (chip_no == 0x175d) {
+				state->regs = &IP175D;
+			} else {
+				state->regs = &IP175C;
+			}
+		}
+	} else {
+		pr_warning("IP17xx: Found an unknown IC+ switch with model number %02x, revision %X.\n", model_no, rev_no);
+		return -EPERM;
+	}
+	return 0;
+}
+
+/*** Low-level functions for the older models ***/
+
+/** Only set vlan and router flags in the switch **/
+static int ip175c_set_flags(struct ip17xx_state *state)
+{
+	int val;
+
+	if (!REG_SUPP(state->regs->ROUTER_CONTROL_REG)) {
+		return 0;
+	}
+
+	val = getPhy(state, state->regs->ROUTER_CONTROL_REG);
+	if (val < 0) {
+		return val;
+	}
+	if (state->regs->ROUTER_EN_BIT >= 0) {
+		if (state->router_mode) {
+			val |= (1<<state->regs->ROUTER_EN_BIT);
+		} else {
+			val &= (~(1<<state->regs->ROUTER_EN_BIT));
+		}
+	}
+	if (state->regs->TAG_VLAN_BIT >= 0) {
+		if (state->vlan_enabled) {
+			val |= (1<<state->regs->TAG_VLAN_BIT);
+		} else {
+			val &= (~(1<<state->regs->TAG_VLAN_BIT));
+		}
+	}
+	if (state->regs->NUMLAN_GROUPS_BIT >= 0) {
+		val &= (~((state->regs->NUMLAN_GROUPS_MAX-1)<<state->regs->NUMLAN_GROUPS_BIT));
+		if (state->num_vlans > state->regs->NUMLAN_GROUPS_MAX) {
+			val |= state->regs->NUMLAN_GROUPS_MAX << state->regs->NUMLAN_GROUPS_BIT;
+		} else if (state->num_vlans >= 1) {
+			val |= (state->num_vlans-1) << state->regs->NUMLAN_GROUPS_BIT;
+		}
+	}
+	return setPhy(state, state->regs->ROUTER_CONTROL_REG, val);
+}
+
+/** Set all VLAN and port state.  Usually you should call "correct_vlan_state" first. **/
+static int ip175c_set_state(struct ip17xx_state *state)
+{
+	int j;
+	int i;
+	SET_PORT_BITS(state, state->add_tag,
+				  state->regs->ADD_TAG_REG, state->regs->ADD_TAG_BIT);
+	SET_PORT_BITS(state, state->remove_tag,
+				  state->regs->REMOVE_TAG_REG, state->regs->REMOVE_TAG_BIT);
+
+	if (REG_SUPP(state->regs->VLAN_LOOKUP_REG)) {
+		for (j=0; j<state->regs->NUM_PORTS; j++) {
+			reg addr;
+			const bitnum *bit_lookup = (j%2==0)?
+				state->regs->VLAN_LOOKUP_EVEN_BIT:
+				state->regs->VLAN_LOOKUP_ODD_BIT;
+
+			addr = state->regs->VLAN_LOOKUP_REG;
+			if (state->regs->SIMPLE_VLAN_REGISTERS) {
+				addr.m += j;
+			} else {
+				switch (j) {
+				case 0:
+				case 1:
+					break;
+				case 2:
+				case 3:
+					addr.m+=1;
+					break;
+				case 4:
+					addr.m+=2;
+					break;
+				case 5:
+					addr = state->regs->VLAN_LOOKUP_REG_5;
+					break;
+				default:
+					addr.m = -1; // shouldn't get here, but...
+					break;
+				}
+			}
+			//printf("shareports for %d is %02X\n",j,state->ports[j].shareports);
+			if (REG_SUPP(addr)) {
+				SET_PORT_BITS(state, state->ports[j].shareports, addr, bit_lookup);
+			}
+		}
+	}
+	if (REG_SUPP(state->regs->TAG_VLAN_MASK_REG)) {
+		for (j=0; j<MAX_VLANS; j++) {
+			reg addr = state->regs->TAG_VLAN_MASK_REG;
+			const bitnum *bit_lookup = (j%2==0)?
+				state->regs->TAG_VLAN_MASK_EVEN_BIT:
+				state->regs->TAG_VLAN_MASK_ODD_BIT;
+			unsigned int vlan_mask;
+			if (state->regs->SIMPLE_VLAN_REGISTERS) {
+				addr.m += j;
+			} else {
+				addr.m += j/2;
+			}
+			vlan_mask = state->vlans[j].ports;
+			SET_PORT_BITS(state, vlan_mask, addr, bit_lookup);
+		}
+	}
+
+	for (i=0; i<MAX_PORTS; i++) {
+		if (REG_SUPP(state->regs->VLAN_DEFAULT_TAG_REG[i])) {
+			int err = setPhy(state, state->regs->VLAN_DEFAULT_TAG_REG[i],
+					state->ports[i].pvid);
+			if (err < 0) {
+				return err;
+			}
+		}
+	}
+
+	return ip175c_set_flags(state);
+}
+
+/**
+ *  Uses only the VLAN port mask and the add tag mask to generate the other fields:
+ *  which ports are part of the same VLAN, removing vlan tags, and VLAN tag ids.
+ */
+static void ip175c_correct_vlan_state(struct ip17xx_state *state)
+{
+	int i, j;
+	state->num_vlans = 0;
+	for (i=0; i<MAX_VLANS; i++) {
+		if (state->vlans[i].ports != 0) {
+			state->num_vlans = i+1; // Hack -- we need to store the "set" vlans somewhere...
+		}
+	}
+
+	for (i=0; i<state->regs->NUM_PORTS; i++) {
+		unsigned int portmask = (1<<i);
+		if (!state->vlan_enabled) {
+			// Share with everybody!
+			state->ports[i].shareports = (1<<state->regs->NUM_PORTS)-1;
+			continue;
+		}
+		state->ports[i].shareports = portmask;
+		for (j=0; j<MAX_VLANS; j++) {
+			if (state->vlans[j].ports & portmask)
+				state->ports[i].shareports |= state->vlans[j].ports;
+		}
+	}
+}
+
+static int ip175c_update_state(struct ip17xx_state *state)
+{
+	ip175c_correct_vlan_state(state);
+	return ip175c_set_state(state);
+}
+
+static int ip175c_set_vlan_mode(struct ip17xx_state *state)
+{
+	return ip175c_update_state(state);
+}
+
+static int ip175c_reset(struct ip17xx_state *state)
+{
+	int err;
+
+	if (REG_SUPP(state->regs->MODE_REG)) {
+		err = setPhy(state, state->regs->MODE_REG, state->regs->MODE_VAL);
+		if (err < 0)
+			return err;
+		err = getPhy(state, state->regs->MODE_REG);
+		if (err < 0)
+			return err;
+	}
+
+	return ip175c_update_state(state);
+}
+
+/*** Low-level functions for IP175D ***/
+
+static int ip175d_update_state(struct ip17xx_state *state)
+{
+	unsigned int filter_mask = 0;
+	unsigned int ports[16], add[16], rem[16];
+	int i, j;
+	int err = 0;
+
+	for (i = 0; i < 16; i++) {
+		ports[i] = 0;
+		add[i] = 0;
+		rem[i] = 0;
+		if (!state->vlan_enabled) {
+			err |= ip_phy_write(state, 22, 14+i, i+1);	// default tags
+			ports[i] = 0x3f;
+			continue;
+		}
+		if (!state->vlans[i].tag) {
+			// Reset the filter
+			err |= ip_phy_write(state, 22, 14+i, 0);	// tag
+			continue;
+		}
+		filter_mask |= 1 << i;
+		err |= ip_phy_write(state, 22, 14+i, state->vlans[i].tag);
+		ports[i] = state->vlans[i].ports;
+		for (j = 0; j < 6; j++) {
+			if (ports[i] & (1 << j)) {
+				if (state->add_tag & (1 << j))
+					add[i] |= 1 << j;
+				if (state->remove_tag & (1 << j))
+					rem[i] |= 1 << j;
+			}
+		}
+	}
+
+	// Port masks, tag adds and removals
+	for (i = 0; i < 8; i++) {
+		err |= ip_phy_write(state, 23, i, ports[2*i] | (ports[2*i+1] << 8));
+		err |= ip_phy_write(state, 23, 8+i, add[2*i] | (add[2*i+1] << 8));
+		err |= ip_phy_write(state, 23, 16+i, rem[2*i] | (rem[2*i+1] << 8));
+	}
+	err |= ip_phy_write(state, 22, 10, filter_mask);
+
+	// Default VLAN tag for each port
+	for (i = 0; i < 6; i++)
+		err |= ip_phy_write(state, 22, 4+i, state->vlans[state->ports[i].pvid].tag);
+
+	return (err ? -EIO : 0);
+}
+
+static int ip175d_set_vlan_mode(struct ip17xx_state *state)
+{
+	int i;
+	int err = 0;
+
+	if (state->vlan_enabled) {
+		// VLAN classification rules: tag-based VLANs, use VID to classify,
+		// drop packets that cannot be classified.
+		err |= ip_phy_write_masked(state, 22, 0, 0x3fff, 0x003f);
+
+		// Ingress rules: CFI=1 dropped, null VID is untagged, VID=1 passed,
+		// VID=0xfff discarded, admin both tagged and untagged, ingress
+		// filters enabled.
+		err |= ip_phy_write_masked(state, 22, 1, 0x0fff, 0x0c3f);
+
+		// Egress rules: IGMP processing off, keep VLAN header off
+		err |= ip_phy_write_masked(state, 22, 2, 0x0fff, 0x0000);
+	} else {
+		// VLAN classification rules: everything off & clear table
+		err |= ip_phy_write_masked(state, 22, 0, 0xbfff, 0x8000);
+
+		// Ingress and egress rules: set to defaults
+		err |= ip_phy_write_masked(state, 22, 1, 0x0fff, 0x0c3f);
+		err |= ip_phy_write_masked(state, 22, 2, 0x0fff, 0x0000);
+	}
+
+	// Reset default VLAN for each port to 0
+	for (i = 0; i < 6; i++)
+		state->ports[i].pvid = 0;
+
+	err |= ip175d_update_state(state);
+
+	return (err ? -EIO : 0);
+}
+
+static int ip175d_reset(struct ip17xx_state *state)
+{
+	int err = 0;
+
+	// Disable the special tagging mode
+	err |= ip_phy_write_masked(state, 21, 22, 0x0003, 0x0000);
+
+	// Set 802.1q protocol type
+	err |= ip_phy_write(state, 22, 3, 0x8100);
+
+	state->vlan_enabled = 0;
+	err |= ip175d_set_vlan_mode(state);
+
+	return (err ? -EIO : 0);
+}
+
+/*** High-level functions ***/
+
+static int ip17xx_get_enable_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	val->value.i = state->vlan_enabled;
+	return 0;
+}
+
+static void ip17xx_reset_vlan_config(struct ip17xx_state *state)
+{
+	int i;
+
+	state->remove_tag = (state->vlan_enabled ? ((1<<state->regs->NUM_PORTS)-1) : 0x0000);
+	state->add_tag = 0x0000;
+	for (i = 0; i < MAX_VLANS; i++) {
+		state->vlans[i].ports = 0x0000;
+		state->vlans[i].tag = (i ? i : 16);
+	}
+	for (i = 0; i < MAX_PORTS; i++)
+		state->ports[i].pvid = 0;
+}
+
+static int ip17xx_set_enable_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int enable;
+
+	enable = val->value.i;
+	if (state->vlan_enabled == enable) {
+		// Do not change any state.
+		return 0;
+	}
+	state->vlan_enabled = enable;
+
+	// Otherwise, if we are switching state, set fields to a known default.
+	ip17xx_reset_vlan_config(state);
+
+	return state->regs->set_vlan_mode(state);
+}
+
+static int ip17xx_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int b;
+	int ind;
+	unsigned int ports;
+
+	if (val->port_vlan >= dev->vlans || val->port_vlan < 0)
+		return -EINVAL;
+
+	ports = state->vlans[val->port_vlan].ports;
+	b = 0;
+	ind = 0;
+	while (b < MAX_PORTS) {
+		if (ports&1) {
+			int istagged = ((state->add_tag >> b) & 1);
+			val->value.ports[ind].id = b;
+			val->value.ports[ind].flags = (istagged << SWITCH_PORT_FLAG_TAGGED);
+			ind++;
+		}
+		b++;
+		ports >>= 1;
+	}
+	val->len = ind;
+
+	return 0;
+}
+
+static int ip17xx_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int i;
+
+	if (val->port_vlan >= dev->vlans || val->port_vlan < 0)
+		return -EINVAL;
+
+	state->vlans[val->port_vlan].ports = 0;
+	for (i = 0; i < val->len; i++) {
+		unsigned int bitmask = (1<<val->value.ports[i].id);
+		state->vlans[val->port_vlan].ports |= bitmask;
+		if (val->value.ports[i].flags & (1<<SWITCH_PORT_FLAG_TAGGED)) {
+			state->add_tag |= bitmask;
+			state->remove_tag &= (~bitmask);
+		} else {
+			state->add_tag &= (~bitmask);
+			state->remove_tag |= bitmask;
+		}
+	}
+
+	return state->regs->update_state(state);
+}
+
+static int ip17xx_apply(struct switch_dev *dev)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	if (REG_SUPP(state->regs->MII_REGISTER_EN)) {
+		int val = getPhy(state, state->regs->MII_REGISTER_EN);
+		if (val < 0) {
+			return val;
+		}
+		val |= (1<<state->regs->MII_REGISTER_EN_BIT);
+		return setPhy(state, state->regs->MII_REGISTER_EN, val);
+	}
+	return 0;
+}
+
+static int ip17xx_reset(struct switch_dev *dev)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int i, err;
+
+	if (REG_SUPP(state->regs->RESET_REG)) {
+		err = setPhy(state, state->regs->RESET_REG, state->regs->RESET_VAL);
+		if (err < 0)
+			return err;
+		err = getPhy(state, state->regs->RESET_REG);
+
+		/*
+		 *  Data sheet specifies reset period to be 2 msec.
+		 *  (I don't see any mention of the 2ms delay in the IP178C spec, only
+		 *  in IP175C, but it can't hurt.)
+		 */
+		mdelay(2);
+	}
+
+	/* reset switch ports */
+	for (i = 0; i < state->regs->NUM_PORTS-1; i++) {
+		err = ip_phy_write(state, i, MII_BMCR, BMCR_RESET);
+		if (err < 0)
+			return err;
+	}
+
+	state->router_mode = 0;
+	state->vlan_enabled = 0;
+	ip17xx_reset_vlan_config(state);
+
+	return state->regs->reset(state);
+}
+
+static int ip17xx_get_tagged(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	if (state->add_tag & (1<<val->port_vlan)) {
+		if (state->remove_tag & (1<<val->port_vlan))
+			val->value.i = 3; // shouldn't ever happen.
+		else
+			val->value.i = 1;
+	} else {
+		if (state->remove_tag & (1<<val->port_vlan))
+			val->value.i = 0;
+		else
+			val->value.i = 2;
+	}
+	return 0;
+}
+
+static int ip17xx_set_tagged(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	state->add_tag &= ~(1<<val->port_vlan);
+	state->remove_tag &= ~(1<<val->port_vlan);
+
+	if (val->value.i == 0)
+		state->remove_tag |= (1<<val->port_vlan);
+	if (val->value.i == 1)
+		state->add_tag |= (1<<val->port_vlan);
+
+	return state->regs->update_state(state);
+}
+
+/** Get the current phy address */
+static int ip17xx_get_phy(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	val->value.i = state->proc_mii.p;
+	return 0;
+}
+
+/** Set a new phy address for low level access to registers */
+static int ip17xx_set_phy(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int new_reg = val->value.i;
+
+	if (new_reg < 0 || new_reg > 31)
+		state->proc_mii.p = (u16)-1;
+	else
+		state->proc_mii.p = (u16)new_reg;
+	return 0;
+}
+
+/** Get the current register number */
+static int ip17xx_get_reg(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	val->value.i = state->proc_mii.m;
+	return 0;
+}
+
+/** Set a new register address for low level access to registers */
+static int ip17xx_set_reg(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int new_reg = val->value.i;
+
+	if (new_reg < 0 || new_reg > 31)
+		state->proc_mii.m = (u16)-1;
+	else
+		state->proc_mii.m = (u16)new_reg;
+	return 0;
+}
+
+/** Get the register content of state->proc_mii */
+static int ip17xx_get_val(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int retval = -EINVAL;
+	if (REG_SUPP(state->proc_mii))
+		retval = getPhy(state, state->proc_mii);
+
+	if (retval < 0) {
+		return retval;
+	} else {
+		val->value.i = retval;
+		return 0;
+	}
+}
+
+/** Write a value to the register defined by phy/reg above */
+static int ip17xx_set_val(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int myval, err = -EINVAL;
+
+	myval = val->value.i;
+	if (myval <= 0xffff && myval >= 0 && REG_SUPP(state->proc_mii)) {
+		err = setPhy(state, state->proc_mii, (u16)myval);
+	}
+	return err;
+}
+
+static int ip17xx_read_name(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	val->value.s = state->regs->NAME; // Just a const pointer, won't be freed by swconfig.
+	return 0;
+}
+
+static int ip17xx_get_tag(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int vlan = val->port_vlan;
+
+	if (vlan < 0 || vlan >= MAX_VLANS)
+		return -EINVAL;
+
+	val->value.i = state->vlans[vlan].tag;
+	return 0;
+}
+
+static int ip17xx_set_tag(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int vlan = val->port_vlan;
+	int tag = val->value.i;
+
+	if (vlan < 0 || vlan >= MAX_VLANS)
+		return -EINVAL;
+
+	if (tag < 0 || tag > 4095)
+		return -EINVAL;
+
+	state->vlans[vlan].tag = tag;
+	return state->regs->update_state(state);
+}
+
+static int ip17xx_set_port_speed(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int nr = val->port_vlan;
+	int ctrl;
+	int autoneg;
+	int speed;
+	if (val->value.i == 100) {
+		speed = 1;
+		autoneg = 0;
+	} else if (val->value.i == 10) {
+		speed = 0;
+		autoneg = 0;
+	} else {
+		autoneg = 1;
+		speed = 1;
+	}
+
+	/* Can't set speed for cpu port */
+	if (nr == state->regs->CPU_PORT)
+		return -EINVAL;
+
+	if (nr >= dev->ports || nr < 0)
+		return -EINVAL;
+
+	ctrl = ip_phy_read(state, nr, 0);
+	if (ctrl < 0)
+		return -EIO;
+
+	ctrl &= (~(1<<12));
+	ctrl &= (~(1<<13));
+	ctrl |= (autoneg<<12);
+	ctrl |= (speed<<13);
+
+	return ip_phy_write(state, nr, 0, ctrl);
+}
+
+static int ip17xx_get_port_speed(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int nr = val->port_vlan;
+	int speed, status;
+
+	if (nr == state->regs->CPU_PORT) {
+		val->value.i = 100;
+		return 0;
+	}
+
+	if (nr >= dev->ports || nr < 0)
+		return -EINVAL;
+
+	status = ip_phy_read(state, nr, 1);
+	speed = ip_phy_read(state, nr, 18);
+	if (status < 0 || speed < 0)
+		return -EIO;
+
+	if (status & 4)
+		val->value.i = ((speed & (1<<11)) ? 100 : 10);
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int ip17xx_get_port_status(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+	int ctrl, speed, status;
+	int nr = val->port_vlan;
+	int len;
+	char *buf = state->buf; // fixed-length at 80.
+
+	if (nr == state->regs->CPU_PORT) {
+		sprintf(buf, "up, 100 Mbps, cpu port");
+		val->value.s = buf;
+		return 0;
+	}
+
+	if (nr >= dev->ports || nr < 0)
+		return -EINVAL;
+
+	ctrl = ip_phy_read(state, nr, 0);
+	status = ip_phy_read(state, nr, 1);
+	speed = ip_phy_read(state, nr, 18);
+	if (ctrl < 0 || status < 0 || speed < 0)
+		return -EIO;
+
+	if (status & 4)
+		len = sprintf(buf, "up, %d Mbps, %s duplex",
+			((speed & (1<<11)) ? 100 : 10),
+			((speed & (1<<10)) ? "full" : "half"));
+	else
+		len = sprintf(buf, "down");
+
+	if (ctrl & (1<<12)) {
+		len += sprintf(buf+len, ", auto-negotiate");
+		if (!(status & (1<<5)))
+			len += sprintf(buf+len, " (in progress)");
+	} else {
+		len += sprintf(buf+len, ", fixed speed (%d)",
+			((ctrl & (1<<13)) ? 100 : 10));
+	}
+
+	buf[len] = '\0';
+	val->value.s = buf;
+	return 0;
+}
+
+static int ip17xx_get_pvid(struct switch_dev *dev, int port, int *val)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	*val = state->ports[port].pvid;
+	return 0;
+}
+
+static int ip17xx_set_pvid(struct switch_dev *dev, int port, int val)
+{
+	struct ip17xx_state *state = get_state(dev);
+
+	if (val < 0 || val >= MAX_VLANS)
+		return -EINVAL;
+
+	state->ports[port].pvid = val;
+	return state->regs->update_state(state);
+}
+
+
+enum Ports {
+	IP17XX_PORT_STATUS,
+	IP17XX_PORT_LINK,
+	IP17XX_PORT_TAGGED,
+	IP17XX_PORT_PVID,
+};
+
+enum Globals {
+	IP17XX_ENABLE_VLAN,
+	IP17XX_GET_NAME,
+	IP17XX_REGISTER_PHY,
+	IP17XX_REGISTER_MII,
+	IP17XX_REGISTER_VALUE,
+	IP17XX_REGISTER_ERRNO,
+};
+
+enum Vlans {
+	IP17XX_VLAN_TAG,
+};
+
+static const struct switch_attr ip17xx_global[] = {
+	[IP17XX_ENABLE_VLAN] = {
+		.id = IP17XX_ENABLE_VLAN,
+		.type = SWITCH_TYPE_INT,
+		.name  = "enable_vlan",
+		.description = "Flag to enable or disable VLANs and tagging",
+		.get  = ip17xx_get_enable_vlan,
+		.set = ip17xx_set_enable_vlan,
+	},
+	[IP17XX_GET_NAME] = {
+		.id = IP17XX_GET_NAME,
+		.type = SWITCH_TYPE_STRING,
+		.description = "Returns the type of IC+ chip.",
+		.name  = "name",
+		.get  = ip17xx_read_name,
+		.set = NULL,
+	},
+	/* jal: added for low level debugging etc. */
+	[IP17XX_REGISTER_PHY] = {
+		.id = IP17XX_REGISTER_PHY,
+		.type = SWITCH_TYPE_INT,
+		.description = "Direct register access: set PHY (0-4, or 29,30,31)",
+		.name  = "phy",
+		.get  = ip17xx_get_phy,
+		.set = ip17xx_set_phy,
+	},
+	[IP17XX_REGISTER_MII] = {
+		.id = IP17XX_REGISTER_MII,
+		.type = SWITCH_TYPE_INT,
+		.description = "Direct register access: set MII register number (0-31)",
+		.name  = "reg",
+		.get  = ip17xx_get_reg,
+		.set = ip17xx_set_reg,
+	},
+	[IP17XX_REGISTER_VALUE] = {
+		.id = IP17XX_REGISTER_VALUE,
+		.type = SWITCH_TYPE_INT,
+		.description = "Direct register access: read/write to register (0-65535)",
+		.name  = "val",
+		.get  = ip17xx_get_val,
+		.set = ip17xx_set_val,
+	},
+};
+
+static const struct switch_attr ip17xx_vlan[] = {
+	[IP17XX_VLAN_TAG] = {
+		.id = IP17XX_VLAN_TAG,
+		.type = SWITCH_TYPE_INT,
+		.description = "VLAN ID (0-4095) [IP175D only]",
+		.name = "vid",
+		.get = ip17xx_get_tag,
+		.set = ip17xx_set_tag,
+	}
+};
+
+static const struct switch_attr ip17xx_port[] = {
+	[IP17XX_PORT_STATUS] = {
+		.id = IP17XX_PORT_STATUS,
+		.type = SWITCH_TYPE_STRING,
+		.description = "Returns Detailed port status",
+		.name  = "status",
+		.get  = ip17xx_get_port_status,
+		.set = NULL,
+	},
+	[IP17XX_PORT_LINK] = {
+		.id = IP17XX_PORT_LINK,
+		.type = SWITCH_TYPE_INT,
+		.description = "Link speed. Can write 0 for auto-negotiate, or 10 or 100",
+		.name  = "link",
+		.get  = ip17xx_get_port_speed,
+		.set = ip17xx_set_port_speed,
+	},
+	[IP17XX_PORT_TAGGED] = {
+		.id = IP17XX_PORT_LINK,
+		.type = SWITCH_TYPE_INT,
+		.description = "0 = untag, 1 = add tags, 2 = do not alter (This value is reset if vlans are altered)",
+		.name  = "tagged",
+		.get  = ip17xx_get_tagged,
+		.set = ip17xx_set_tagged,
+	},
+};
+
+static const struct switch_dev_ops ip17xx_ops = {
+	.attr_global = {
+		.attr = ip17xx_global,
+		.n_attr = ARRAY_SIZE(ip17xx_global),
+	},
+	.attr_port = {
+		.attr = ip17xx_port,
+		.n_attr = ARRAY_SIZE(ip17xx_port),
+	},
+	.attr_vlan = {
+		.attr = ip17xx_vlan,
+		.n_attr = ARRAY_SIZE(ip17xx_vlan),
+	},
+
+	.get_port_pvid = ip17xx_get_pvid,
+	.set_port_pvid = ip17xx_set_pvid,
+	.get_vlan_ports = ip17xx_get_ports,
+	.set_vlan_ports = ip17xx_set_ports,
+	.apply_config = ip17xx_apply,
+	.reset_switch = ip17xx_reset,
+};
+
+static int ip17xx_probe(struct phy_device *pdev)
+{
+	struct ip17xx_state *state;
+	struct switch_dev *dev;
+	int err;
+
+	/* We only attach to PHY 0, but use all available PHYs */
+	if (pdev->addr != 0)
+		return -ENODEV;
+
+	state = kzalloc(sizeof(*state), GFP_KERNEL);
+	if (!state)
+		return -ENOMEM;
+
+	dev = &state->dev;
+
+	pdev->priv = state;
+	state->mii_bus = pdev->bus;
+
+	err = get_model(state);
+	if (err < 0)
+		goto error;
+
+	dev->vlans = MAX_VLANS;
+	dev->cpu_port = state->regs->CPU_PORT;
+	dev->ports = state->regs->NUM_PORTS;
+	dev->name = state->regs->NAME;
+	dev->ops = &ip17xx_ops;
+
+	pr_info("IP17xx: Found %s at %s\n", dev->name, dev_name(&pdev->dev));
+	return 0;
+
+error:
+	kfree(state);
+	return err;
+}
+
+static int ip17xx_config_init(struct phy_device *pdev)
+{
+	struct ip17xx_state *state = pdev->priv;
+	struct net_device *dev = pdev->attached_dev;
+	int err;
+
+	err = register_switch(&state->dev, dev);
+	if (err < 0)
+		return err;
+
+	state->registered = true;
+	ip17xx_reset(&state->dev);
+	return 0;
+}
+
+static void ip17xx_remove(struct phy_device *pdev)
+{
+	struct ip17xx_state *state = pdev->priv;
+
+	if (state->registered)
+		unregister_switch(&state->dev);
+	kfree(state);
+}
+
+static int ip17xx_config_aneg(struct phy_device *pdev)
+{
+	return 0;
+}
+
+static int ip17xx_aneg_done(struct phy_device *pdev)
+{
+	return BMSR_ANEGCOMPLETE;
+}
+
+static int ip17xx_update_link(struct phy_device *pdev)
+{
+	pdev->link = 1;
+	return 0;
+}
+
+static int ip17xx_read_status(struct phy_device *pdev)
+{
+	pdev->speed = SPEED_100;
+	pdev->duplex = DUPLEX_FULL;
+	pdev->pause = pdev->asym_pause = 0;
+	pdev->link = 1;
+
+	return 0;
+}
+
+static struct phy_driver ip17xx_driver = {
+	.name		= "IC+ IP17xx",
+	.phy_id		= 0x02430c00,
+	.phy_id_mask	= 0x0ffffc00,
+	.features	= PHY_BASIC_FEATURES,
+	.probe		= ip17xx_probe,
+	.remove		= ip17xx_remove,
+	.config_init	= ip17xx_config_init,
+	.config_aneg	= ip17xx_config_aneg,
+	.aneg_done	= ip17xx_aneg_done,
+	.update_link	= ip17xx_update_link,
+	.read_status	= ip17xx_read_status,
+	.driver		= { .owner = THIS_MODULE },
+};
+
+static struct phy_driver ip175a_driver = {
+	.name		= "IC+ IP175A",
+	.phy_id		= 0x02430c50,
+	.phy_id_mask	= 0x0ffffff0,
+	.features	= PHY_BASIC_FEATURES,
+	.probe		= ip17xx_probe,
+	.remove		= ip17xx_remove,
+	.config_init	= ip17xx_config_init,
+	.config_aneg	= ip17xx_config_aneg,
+	.aneg_done	= ip17xx_aneg_done,
+	.update_link	= ip17xx_update_link,
+	.read_status	= ip17xx_read_status,
+	.driver		= { .owner = THIS_MODULE },
+};
+
+
+int __init ip17xx_init(void)
+{
+	int ret;
+
+	ret = phy_driver_register(&ip175a_driver);
+	if (ret < 0)
+		return ret;
+
+	return phy_driver_register(&ip17xx_driver);
+}
+
+void __exit ip17xx_exit(void)
+{
+	phy_driver_unregister(&ip17xx_driver);
+	phy_driver_unregister(&ip175a_driver);
+}
+
+MODULE_AUTHOR("Patrick Horn <patrick.horn@gmail.com>");
+MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_AUTHOR("Martin Mares <mj@ucw.cz>");
+MODULE_LICENSE("GPL");
+
+module_init(ip17xx_init);
+module_exit(ip17xx_exit);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/micrel.c b/trunk/target/linux/generic/files/drivers/net/phy/micrel.c
new file mode 100644
index 00000000..1499d4ac
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/micrel.c
@@ -0,0 +1,83 @@
+/*
+ *  Driver for Micrel/Kendin PHYs
+ *
+ *  Copyright (c) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/phy.h>
+
+#define KSZ_REG_INT_CTRL	0x1b
+
+#define KSZ_INT_LU_EN	(1 << 8)	/* enable Link Up interrupt */
+#define KSZ_INT_RF_EN	(1 << 9)	/* enable Remote Fault interrupt */
+#define KSZ_INT_LD_EN	(1 << 10)	/* enable Link Down interrupt */
+
+#define KSZ_INT_INIT	(KSZ_INT_LU_EN | KSZ_INT_LD_EN)
+
+static int ksz8041_ack_interrupt(struct phy_device *phydev)
+{
+	int err;
+
+	err = phy_read(phydev, KSZ_REG_INT_CTRL);
+
+	return (err < 0) ? err : 0;
+}
+
+static int ksz8041_config_intr(struct phy_device *phydev)
+{
+	int err;
+
+	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+		err = phy_write(phydev, KSZ_REG_INT_CTRL,
+				KSZ_INT_INIT);
+	else
+		err = phy_write(phydev, KSZ_REG_INT_CTRL, 0);
+
+	return err;
+}
+
+static struct phy_driver ksz8041_phy_driver = {
+	.phy_id		= 0x00221512,
+	.name		= "Micrel KSZ8041",
+	.phy_id_mask	= 0x001fffff,
+	.features	= PHY_BASIC_FEATURES,
+	.flags		= PHY_HAS_INTERRUPT,
+	.config_aneg	= genphy_config_aneg,
+	.read_status	= genphy_read_status,
+	.ack_interrupt	= ksz8041_ack_interrupt,
+	.config_intr	= ksz8041_config_intr,
+	.driver	= {
+		.owner	= THIS_MODULE,
+	},
+};
+
+static int __init micrel_phy_init(void)
+{
+	return phy_driver_register(&ksz8041_phy_driver);
+}
+
+static void __exit micrel_phy_exit(void)
+{
+	phy_driver_unregister(&ksz8041_phy_driver);
+}
+
+#ifdef MODULE
+module_init(micrel_phy_init);
+module_exit(micrel_phy_exit);
+#else
+subsys_initcall(micrel_phy_init);
+#endif
+
+MODULE_DESCRIPTION("Micrel/Kendin PHY driver");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.c b/trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.c
new file mode 100644
index 00000000..48bb3fcb
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.c
@@ -0,0 +1,866 @@
+/*
+ * Marvell 88E6171 switch driver
+ *
+ * Copyright (c) 2014 Claudio Leite <leitec@staticky.com>
+ *
+ * Based on code (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/mii.h>
+#include <linux/phy.h>
+#include <linux/of.h>
+#include <linux/of_mdio.h>
+#include <linux/delay.h>
+#include <linux/switch.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
+#include "mvsw6171.h"
+
+MODULE_DESCRIPTION("Marvell 88E6171 Switch driver");
+MODULE_AUTHOR("Claudio Leite <leitec@staticky.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:mvsw6171");
+
+/*
+ * Register access is done through direct or indirect addressing,
+ * depending on how the switch is physically connected.
+ *
+ * Direct addressing: all port and global registers directly
+ *   accessible via an address/register pair
+ *
+ * Indirect addressing: switch is mapped at a single address,
+ *   port and global registers accessible via a single command/data
+ *   register pair
+ */
+
+static int
+mvsw6171_wait_mask_raw(struct mii_bus *bus, int addr,
+		int reg, u16 mask, u16 val)
+{
+	int i = 100;
+	u16 r;
+
+	do {
+		r = bus->read(bus, addr, reg);
+		if ((r & mask) == val)
+			return 0;
+	} while (--i > 0);
+
+	return -ETIMEDOUT;
+}
+
+static u16
+r16(struct mii_bus *bus, bool indirect, int base_addr, int addr, int reg)
+{
+	u16 ind_addr;
+
+	if (!indirect)
+		return bus->read(bus, addr, reg);
+
+	/* Indirect read: First, make sure switch is free */
+	mvsw6171_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+			MV_INDIRECT_INPROGRESS, 0);
+
+	/* Load address and request read */
+	ind_addr = MV_INDIRECT_READ | (addr << MV_INDIRECT_ADDR_S) | reg;
+	bus->write(bus, base_addr, MV_INDIRECT_REG_CMD,
+			ind_addr);
+
+	/* Wait until it's ready */
+	mvsw6171_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+			MV_INDIRECT_INPROGRESS, 0);
+
+	/* Read the requested data */
+	return bus->read(bus, base_addr, MV_INDIRECT_REG_DATA);
+}
+
+static void
+w16(struct mii_bus *bus, bool indirect, int base_addr, int addr,
+		int reg, u16 val)
+{
+	u16 ind_addr;
+
+	if (!indirect) {
+		bus->write(bus, addr, reg, val);
+		return;
+	}
+
+	/* Indirect write: First, make sure switch is free */
+	mvsw6171_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+			MV_INDIRECT_INPROGRESS, 0);
+
+	/* Load the data to be written */
+	bus->write(bus, base_addr, MV_INDIRECT_REG_DATA, val);
+
+	/* Wait again for switch to be free */
+	mvsw6171_wait_mask_raw(bus, base_addr, MV_INDIRECT_REG_CMD,
+			MV_INDIRECT_INPROGRESS, 0);
+
+	/* Load address, and issue write command */
+	ind_addr = MV_INDIRECT_WRITE | (addr << MV_INDIRECT_ADDR_S) | reg;
+	bus->write(bus, base_addr, MV_INDIRECT_REG_CMD,
+			ind_addr);
+}
+
+/* swconfig support */
+
+static inline u16
+sr16(struct switch_dev *dev, int addr, int reg)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	return r16(state->bus, state->is_indirect, state->base_addr, addr, reg);
+}
+
+static inline void
+sw16(struct switch_dev *dev, int addr, int reg, u16 val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	w16(state->bus, state->is_indirect, state->base_addr, addr, reg, val);
+}
+
+static int
+mvsw6171_wait_mask_s(struct switch_dev *dev, int addr,
+		int reg, u16 mask, u16 val)
+{
+	int i = 100;
+	u16 r;
+
+	do {
+		r = sr16(dev, addr, reg) & mask;
+		if (r == val)
+			return 0;
+	} while (--i > 0);
+
+	return -ETIMEDOUT;
+}
+
+static int
+mvsw6171_get_port_mask(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	char *buf = state->buf;
+	int port, len, i;
+	u16 reg;
+
+	port = val->port_vlan;
+	reg = sr16(dev, MV_PORTREG(VLANMAP, port)) & MV_PORTS_MASK;
+
+	len = sprintf(buf, "0x%04x: ", reg);
+
+	for (i = 0; i < MV_PORTS; i++) {
+		if (reg & (1 << i))
+			len += sprintf(buf + len, "%d ", i);
+		else if (i == port)
+			len += sprintf(buf + len, "(%d) ", i);
+	}
+
+	val->value.s = buf;
+
+	return 0;
+}
+
+static int
+mvsw6171_get_port_qmode(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	val->value.i = state->ports[val->port_vlan].qmode;
+
+	return 0;
+}
+
+static int
+mvsw6171_set_port_qmode(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	state->ports[val->port_vlan].qmode = val->value.i;
+
+	return 0;
+}
+
+static int
+mvsw6171_get_pvid(struct switch_dev *dev, int port, int *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	*val = state->ports[port].pvid;
+
+	return 0;
+}
+
+static int
+mvsw6171_set_pvid(struct switch_dev *dev, int port, int val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	if (val < 0 || val >= MV_VLANS)
+		return -EINVAL;
+
+	state->ports[port].pvid = (u16)val;
+
+	return 0;
+}
+
+static int
+mvsw6171_get_port_status(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	char *buf = state->buf;
+	u16 status, speed;
+	int len;
+
+	status = sr16(dev, MV_PORTREG(STATUS, val->port_vlan));
+	speed = (status & MV_PORT_STATUS_SPEED_MASK) >>
+			MV_PORT_STATUS_SPEED_SHIFT;
+
+	len = sprintf(buf, "link: ");
+	if (status & MV_PORT_STATUS_LINK) {
+		len += sprintf(buf + len, "up, speed: ");
+
+		switch (speed) {
+		case MV_PORT_STATUS_SPEED_10:
+			len += sprintf(buf + len, "10");
+			break;
+		case MV_PORT_STATUS_SPEED_100:
+			len += sprintf(buf + len, "100");
+			break;
+		case MV_PORT_STATUS_SPEED_1000:
+			len += sprintf(buf + len, "1000");
+			break;
+		}
+
+		len += sprintf(buf + len, " Mbps, duplex: ");
+
+		if (status & MV_PORT_STATUS_FDX)
+			len += sprintf(buf + len, "full");
+		else
+			len += sprintf(buf + len, "half");
+	} else {
+		len += sprintf(buf + len, "down");
+	}
+
+	val->value.s = buf;
+
+	return 0;
+}
+
+static int
+mvsw6171_get_port_speed(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	u16 status, speed;
+
+	status = sr16(dev, MV_PORTREG(STATUS, val->port_vlan));
+	speed = (status & MV_PORT_STATUS_SPEED_MASK) >>
+			MV_PORT_STATUS_SPEED_SHIFT;
+
+	val->value.i = 0;
+
+	if (status & MV_PORT_STATUS_LINK) {
+		switch (speed) {
+		case MV_PORT_STATUS_SPEED_10:
+			val->value.i = 10;
+			break;
+		case MV_PORT_STATUS_SPEED_100:
+			val->value.i = 100;
+			break;
+		case MV_PORT_STATUS_SPEED_1000:
+			val->value.i = 1000;
+			break;
+		}
+	}
+
+	return 0;
+}
+
+static int mvsw6171_get_vlan_ports(struct switch_dev *dev,
+		struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int i, j, mode, vno;
+
+	vno = val->port_vlan;
+
+	if (vno <= 0 || vno >= dev->vlans)
+		return -EINVAL;
+
+	for (i = 0, j = 0; i < dev->ports; i++) {
+		if (state->vlans[vno].mask & (1 << i)) {
+			val->value.ports[j].id = i;
+
+			mode = (state->vlans[vno].port_mode >> (i * 4)) & 0xf;
+			if (mode == MV_VTUCTL_EGRESS_TAGGED)
+				val->value.ports[j].flags =
+					(1 << SWITCH_PORT_FLAG_TAGGED);
+			else
+				val->value.ports[j].flags = 0;
+
+			j++;
+		}
+	}
+
+	val->len = j;
+
+	return 0;
+}
+
+static int mvsw6171_set_vlan_ports(struct switch_dev *dev,
+		struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int i, mode, pno, vno;
+
+	vno = val->port_vlan;
+
+	if (vno <= 0 || vno >= dev->vlans)
+		return -EINVAL;
+
+	state->vlans[vno].mask = 0;
+	state->vlans[vno].port_mode = 0;
+
+	if(state->vlans[vno].vid == 0)
+		state->vlans[vno].vid = vno;
+
+	for (i = 0; i < val->len; i++) {
+		pno = val->value.ports[i].id;
+
+		state->vlans[vno].mask |= (1 << pno);
+		if (val->value.ports[i].flags &
+				(1 << SWITCH_PORT_FLAG_TAGGED))
+			mode = MV_VTUCTL_EGRESS_TAGGED;
+		else
+			mode = MV_VTUCTL_EGRESS_UNTAGGED;
+
+		state->vlans[vno].port_mode |= mode << (pno * 4);
+	}
+
+	/*
+	 * DISCARD is nonzero, so it must be explicitly
+	 * set on ports not in the VLAN.
+	 */
+	for (i = 0; i < dev->ports; i++)
+		if (!(state->vlans[vno].mask & (1 << i)))
+			state->vlans[vno].port_mode |=
+				MV_VTUCTL_DISCARD << (i * 4);
+
+	return 0;
+}
+
+static int mvsw6171_get_vlan_port_based(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int vno = val->port_vlan;
+
+	if (vno <= 0 || vno >= dev->vlans)
+		return -EINVAL;
+
+	if (state->vlans[vno].port_based)
+		val->value.i = 1;
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int mvsw6171_set_vlan_port_based(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int vno = val->port_vlan;
+
+	if (vno <= 0 || vno >= dev->vlans)
+		return -EINVAL;
+
+	if (val->value.i == 1)
+		state->vlans[vno].port_based = true;
+	else
+		state->vlans[vno].port_based = false;
+
+	return 0;
+}
+
+static int mvsw6171_get_vid(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int vno = val->port_vlan;
+
+	if (vno <= 0 || vno >= dev->vlans)
+		return -EINVAL;
+
+	val->value.i = state->vlans[vno].vid;
+
+	return 0;
+}
+
+static int mvsw6171_set_vid(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int vno = val->port_vlan;
+
+	if (vno <= 0 || vno >= dev->vlans)
+		return -EINVAL;
+
+	state->vlans[vno].vid = val->value.i;
+
+	return 0;
+}
+
+static int mvsw6171_get_enable_vlan(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	val->value.i = state->vlan_enabled;
+
+	return 0;
+}
+
+static int mvsw6171_set_enable_vlan(struct switch_dev *dev,
+		const struct switch_attr *attr, struct switch_val *val)
+{
+	struct mvsw6171_state *state = get_state(dev);
+
+	state->vlan_enabled = val->value.i;
+
+	return 0;
+}
+
+static int mvsw6171_vtu_program(struct switch_dev *dev)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	u16 v1, v2;
+	int i;
+
+	/* Flush */
+	mvsw6171_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+			MV_VTUOP_INPROGRESS, 0);
+	sw16(dev, MV_GLOBALREG(VTU_OP),
+			MV_VTUOP_INPROGRESS | MV_VTUOP_VALID);
+
+	/* Write VLAN table */
+	for (i = 1; i < dev->vlans; i++) {
+		if (state->vlans[i].mask == 0 ||
+				state->vlans[i].vid == 0 ||
+				state->vlans[i].port_based == true)
+			continue;
+
+		mvsw6171_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+				MV_VTUOP_INPROGRESS, 0);
+
+		sw16(dev, MV_GLOBALREG(VTU_VID),
+				MV_VTUOP_VALID | state->vlans[i].vid);
+
+		v1 = (u16)(state->vlans[i].port_mode & 0xffff);
+		v2 = (u16)((state->vlans[i].port_mode >> 16) & 0xffff);
+
+		sw16(dev, MV_GLOBALREG(VTU_DATA1), v1);
+		sw16(dev, MV_GLOBALREG(VTU_DATA2), v2);
+
+		sw16(dev, MV_GLOBALREG(VTU_OP),
+				MV_VTUOP_INPROGRESS | MV_VTUOP_LOAD);
+		mvsw6171_wait_mask_s(dev, MV_GLOBALREG(VTU_OP),
+				MV_VTUOP_INPROGRESS, 0);
+	}
+
+	return 0;
+}
+
+static void mvsw6171_vlan_port_config(struct switch_dev *dev, int vno)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int i, mode;
+
+	for (i = 0; i < dev->ports; i++) {
+		if (!(state->vlans[vno].mask & (1 << i)))
+			continue;
+
+		mode = (state->vlans[vno].port_mode >> (i * 4)) & 0xf;
+
+		if(mode != MV_VTUCTL_EGRESS_TAGGED)
+			state->ports[i].pvid = state->vlans[vno].vid;
+
+		if (state->vlans[vno].port_based)
+			state->ports[i].mask |= state->vlans[vno].mask;
+		else
+			state->ports[i].qmode = MV_8021Q_MODE_SECURE;
+	}
+}
+
+static int mvsw6171_update_state(struct switch_dev *dev)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int i;
+	u16 reg;
+
+	if (!state->registered)
+		return -EINVAL;
+
+	mvsw6171_vtu_program(dev);
+
+	/*
+	 * Set 802.1q-only mode if vlan_enabled is true.
+	 *
+	 * Without this, even if 802.1q is enabled for
+	 * a port/VLAN, it still depends on the port-based
+	 * VLAN mask being set.
+	 *
+	 * With this setting, port-based VLANs are still
+	 * functional, provided the VID is not in the VTU.
+	 */
+	reg = sr16(dev, MV_GLOBAL2REG(SDET_POLARITY));
+
+	if (state->vlan_enabled)
+		reg |= MV_8021Q_VLAN_ONLY;
+	else
+		reg &= ~MV_8021Q_VLAN_ONLY;
+
+	sw16(dev, MV_GLOBAL2REG(SDET_POLARITY), reg);
+
+	/*
+	 * Set port-based VLAN masks on each port
+	 * based only on VLAN definitions known to
+	 * the driver (i.e. in state).
+	 *
+	 * This means any pre-existing port mapping is
+	 * wiped out once our driver is initialized.
+	 */
+	for (i = 0; i < dev->ports; i++) {
+		state->ports[i].mask = 0;
+		state->ports[i].qmode = MV_8021Q_MODE_DISABLE;
+	}
+
+	for (i = 0; i < dev->vlans; i++)
+		mvsw6171_vlan_port_config(dev, i);
+
+	for (i = 0; i < dev->ports; i++) {
+		reg = sr16(dev, MV_PORTREG(VLANID, i)) & ~MV_PVID_MASK;
+		reg |= state->ports[i].pvid;
+		sw16(dev, MV_PORTREG(VLANID, i), reg);
+
+		state->ports[i].mask &= ~(1 << i);
+
+		reg = sr16(dev, MV_PORTREG(VLANMAP, i)) & ~MV_PORTS_MASK;
+		reg |= state->ports[i].mask;
+		sw16(dev, MV_PORTREG(VLANMAP, i), reg);
+
+		reg = sr16(dev, MV_PORTREG(CONTROL2, i)) &
+			~MV_8021Q_MODE_MASK;
+		reg |= state->ports[i].qmode << MV_8021Q_MODE_SHIFT;
+		sw16(dev, MV_PORTREG(CONTROL2, i), reg);
+	}
+
+	return 0;
+}
+
+static int mvsw6171_apply(struct switch_dev *dev)
+{
+	return mvsw6171_update_state(dev);
+}
+
+static int mvsw6171_reset(struct switch_dev *dev)
+{
+	struct mvsw6171_state *state = get_state(dev);
+	int i;
+	u16 reg;
+
+	/* Disable all ports before reset */
+	for (i = 0; i < dev->ports; i++) {
+		reg = sr16(dev, MV_PORTREG(CONTROL, i)) &
+			~MV_PORTCTRL_ENABLED;
+		sw16(dev, MV_PORTREG(CONTROL, i), reg);
+	}
+
+	reg = sr16(dev, MV_GLOBALREG(CONTROL)) | MV_CONTROL_RESET;
+
+	sw16(dev, MV_GLOBALREG(CONTROL), reg);
+	if (mvsw6171_wait_mask_s(dev, MV_GLOBALREG(CONTROL),
+				MV_CONTROL_RESET, 0) < 0)
+		return -ETIMEDOUT;
+
+	for (i = 0; i < dev->ports; i++) {
+		state->ports[i].qmode = 0;
+		state->ports[i].mask = 0;
+		state->ports[i].pvid = 0;
+
+		/* Force flow control off */
+		reg = sr16(dev, MV_PORTREG(FORCE, i)) & ~MV_FORCE_FC_MASK;
+		reg |= MV_FORCE_FC_DISABLE;
+		sw16(dev, MV_PORTREG(FORCE, i), reg);
+
+		/* Set port association vector */
+		sw16(dev, MV_PORTREG(ASSOC, i), (1 << i));
+	}
+
+	for (i = 0; i < dev->vlans; i++) {
+		state->vlans[i].port_based = false;
+		state->vlans[i].mask = 0;
+		state->vlans[i].vid = 0;
+		state->vlans[i].port_mode = 0;
+	}
+
+	state->vlan_enabled = 0;
+
+	mvsw6171_update_state(dev);
+
+	/* Re-enable ports */
+	for (i = 0; i < dev->ports; i++) {
+		reg = sr16(dev, MV_PORTREG(CONTROL, i)) |
+			MV_PORTCTRL_ENABLED;
+		sw16(dev, MV_PORTREG(CONTROL, i), reg);
+	}
+
+	return 0;
+}
+
+enum {
+	MVSW6171_ENABLE_VLAN,
+};
+
+enum {
+	MVSW6171_VLAN_PORT_BASED,
+	MVSW6171_VLAN_ID,
+};
+
+enum {
+	MVSW6171_PORT_MASK,
+	MVSW6171_PORT_QMODE,
+	MVSW6171_PORT_STATUS,
+	MVSW6171_PORT_LINK,
+};
+
+static const struct switch_attr mvsw6171_global[] = {
+	[MVSW6171_ENABLE_VLAN] = {
+		.id = MVSW6171_ENABLE_VLAN,
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable 802.1q VLAN support",
+		.get = mvsw6171_get_enable_vlan,
+		.set = mvsw6171_set_enable_vlan,
+	},
+};
+
+static const struct switch_attr mvsw6171_vlan[] = {
+	[MVSW6171_VLAN_PORT_BASED] = {
+		.id = MVSW6171_VLAN_PORT_BASED,
+		.type = SWITCH_TYPE_INT,
+		.name = "port_based",
+		.description = "Use port-based (non-802.1q) VLAN only",
+		.get = mvsw6171_get_vlan_port_based,
+		.set = mvsw6171_set_vlan_port_based,
+	},
+	[MVSW6171_VLAN_ID] = {
+		.id = MVSW6171_VLAN_ID,
+		.type = SWITCH_TYPE_INT,
+		.name = "vid",
+		.description = "Get/set VLAN ID",
+		.get = mvsw6171_get_vid,
+		.set = mvsw6171_set_vid,
+	},
+};
+
+static const struct switch_attr mvsw6171_port[] = {
+	[MVSW6171_PORT_MASK] = {
+		.id = MVSW6171_PORT_MASK,
+		.type = SWITCH_TYPE_STRING,
+		.description = "Port-based VLAN mask",
+		.name = "mask",
+		.get = mvsw6171_get_port_mask,
+		.set = NULL,
+	},
+	[MVSW6171_PORT_QMODE] = {
+		.id = MVSW6171_PORT_QMODE,
+		.type = SWITCH_TYPE_INT,
+		.description = "802.1q mode: 0=off/1=fallback/2=check/3=secure",
+		.name = "qmode",
+		.get = mvsw6171_get_port_qmode,
+		.set = mvsw6171_set_port_qmode,
+	},
+	[MVSW6171_PORT_STATUS] = {
+		.id = MVSW6171_PORT_STATUS,
+		.type = SWITCH_TYPE_STRING,
+		.description = "Return port status",
+		.name = "status",
+		.get = mvsw6171_get_port_status,
+		.set = NULL,
+	},
+	[MVSW6171_PORT_LINK] = {
+		.id = MVSW6171_PORT_LINK,
+		.type = SWITCH_TYPE_INT,
+		.description = "Get link speed",
+		.name = "link",
+		.get = mvsw6171_get_port_speed,
+		.set = NULL,
+	},
+};
+
+static const struct switch_dev_ops mvsw6171_ops = {
+	.attr_global = {
+		.attr = mvsw6171_global,
+		.n_attr = ARRAY_SIZE(mvsw6171_global),
+	},
+	.attr_vlan = {
+		.attr = mvsw6171_vlan,
+		.n_attr = ARRAY_SIZE(mvsw6171_vlan),
+	},
+	.attr_port = {
+		.attr = mvsw6171_port,
+		.n_attr = ARRAY_SIZE(mvsw6171_port),
+	},
+	.get_port_pvid = mvsw6171_get_pvid,
+	.set_port_pvid = mvsw6171_set_pvid,
+	.get_vlan_ports = mvsw6171_get_vlan_ports,
+	.set_vlan_ports = mvsw6171_set_vlan_ports,
+	.apply_config = mvsw6171_apply,
+	.reset_switch = mvsw6171_reset,
+};
+
+/* end swconfig stuff */
+
+static int mvsw6171_probe(struct platform_device *pdev)
+{
+	struct mvsw6171_state *state;
+	struct device_node *np = pdev->dev.of_node;
+	struct device_node *mdio;
+	u32 val;
+	u16 reg;
+	int err;
+
+	state = kzalloc(sizeof(*state), GFP_KERNEL);
+	if (!state)
+		return -ENOMEM;
+
+	mdio = of_parse_phandle(np, "mii-bus", 0);
+	if (!mdio) {
+		dev_err(&pdev->dev, "Couldn't get MII bus handle\n");
+		err = -ENODEV;
+		goto out_err;
+	}
+
+	state->bus = of_mdio_find_bus(mdio);
+	if (!state->bus) {
+		dev_err(&pdev->dev, "Couldn't find MII bus from handle\n");
+		err = -ENODEV;
+		goto out_err;
+	}
+
+	state->is_indirect = of_property_read_bool(np, "is-indirect");
+
+	if (state->is_indirect) {
+		if (of_property_read_u32(np, "reg", &val)) {
+			dev_err(&pdev->dev, "Switch address not specified\n");
+			err = -ENODEV;
+			goto out_err;
+		}
+
+		state->base_addr = val;
+	} else {
+		state->base_addr = MV_BASE;
+	}
+
+	reg = r16(state->bus, state->is_indirect, state->base_addr,
+			MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK;
+	if (reg != MV_IDENT_VALUE) {
+		dev_err(&pdev->dev, "No switch found at 0x%02x\n",
+				state->base_addr);
+		err = -ENODEV;
+		goto out_err;
+	}
+
+	platform_set_drvdata(pdev, state);
+	dev_info(&pdev->dev, "Found %s at %s:%02x\n", MV_IDENT_STR,
+			state->bus->id, state->base_addr);
+
+	dev_info(&pdev->dev, "Using %sdirect addressing\n",
+			(state->is_indirect ? "in" : ""));
+
+	if (of_property_read_u32(np, "cpu-port-0", &val)) {
+		dev_err(&pdev->dev, "CPU port not set\n");
+		err = -ENODEV;
+		goto out_err;
+	}
+
+	state->cpu_port0 = val;
+
+	if (!of_property_read_u32(np, "cpu-port-1", &val))
+		state->cpu_port1 = val;
+	else
+		state->cpu_port1 = -1;
+
+	state->dev.vlans = MV_VLANS;
+	state->dev.cpu_port = state->cpu_port0;
+	state->dev.ports = MV_PORTS;
+	state->dev.name = MV_IDENT_STR;
+	state->dev.ops = &mvsw6171_ops;
+	state->dev.alias = dev_name(&pdev->dev);
+
+	err = register_switch(&state->dev, NULL);
+	if (err < 0)
+		goto out_err;
+
+	state->registered = true;
+
+	return 0;
+out_err:
+	kfree(state);
+	return err;
+}
+
+static int
+mvsw6171_remove(struct platform_device *pdev)
+{
+	struct mvsw6171_state *state = platform_get_drvdata(pdev);
+
+	if (state->registered)
+		unregister_switch(&state->dev);
+
+	kfree(state);
+
+	return 0;
+}
+
+static const struct of_device_id mvsw6171_match[] = {
+	{ .compatible = "marvell,88e6171" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, mvsw6171_match);
+
+static struct platform_driver mvsw6171_driver = {
+	.probe = mvsw6171_probe,
+	.remove = mvsw6171_remove,
+	.driver = {
+		.name = "mvsw6171",
+		.of_match_table = of_match_ptr(mvsw6171_match),
+		.owner = THIS_MODULE,
+	},
+};
+
+static int __init mvsw6171_module_init(void)
+{
+	return platform_driver_register(&mvsw6171_driver);
+}
+late_initcall(mvsw6171_module_init);
+
+static void __exit mvsw6171_module_exit(void)
+{
+	platform_driver_unregister(&mvsw6171_driver);
+}
+module_exit(mvsw6171_module_exit);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.h b/trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.h
new file mode 100644
index 00000000..2b9ef97a
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/mvsw6171.h
@@ -0,0 +1,230 @@
+/*
+ * Marvell 88E6171 switch driver
+ *
+ * Copyright (c) 2014 Claudio Leite <leitec@staticky.com>
+ *
+ * Based on code (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+
+#ifndef __MVSW6171_H
+#define __MVSW6171_H
+
+#define MV_PORTS			7
+#define MV_PORTS_MASK			((1 << MV_PORTS) - 1)
+
+#define MV_CPUPORT			6
+
+#define MV_BASE				0x10
+
+#define MV_SWITCHPORT_BASE		0x10
+#define MV_SWITCHPORT(_n)		(MV_SWITCHPORT_BASE + (_n))
+#define MV_SWITCHREGS			(MV_BASE + 0xb)
+
+#define MV_VLANS			64
+
+enum {
+	MV_PORT_STATUS			= 0x00,
+	MV_PORT_FORCE			= 0x01,
+	MV_PORT_PAUSE			= 0x02,
+	MV_PORT_IDENT			= 0x03,
+	MV_PORT_CONTROL			= 0x04,
+	MV_PORT_CONTROL1		= 0x05,
+	MV_PORT_VLANMAP			= 0x06,
+	MV_PORT_VLANID			= 0x07,
+	MV_PORT_CONTROL2		= 0x08,
+	MV_PORT_ASSOC			= 0x0b,
+	MV_PORT_RXCOUNT			= 0x10,
+	MV_PORT_TXCOUNT			= 0x11,
+};
+#define MV_PORTREG(_type, _port) MV_SWITCHPORT(_port), MV_PORT_##_type
+
+enum {
+	MV_PORT_STATUS_FDX		= (1 << 10),
+	MV_PORT_STATUS_LINK		= (1 << 11),
+};
+
+enum {
+	MV_PORT_STATUS_SPEED_10		= 0x00,
+	MV_PORT_STATUS_SPEED_100	= 0x01,
+	MV_PORT_STATUS_SPEED_1000	= 0x02,
+};
+#define MV_PORT_STATUS_SPEED_SHIFT	8
+#define MV_PORT_STATUS_SPEED_MASK	(3 << 8)
+
+enum {
+	MV_PORTCTRL_BLOCK		= (1 << 0),
+	MV_PORTCTRL_LEARN		= (2 << 0),
+	MV_PORTCTRL_ENABLED		= (3 << 0),
+	MV_PORTCTRL_VLANTUN		= (1 << 7),
+	MV_PORTCTRL_EGRESS		= (1 << 12),
+};
+
+#define MV_FORCE_FC_MASK		(3 << 6)
+
+enum {
+	MV_FORCE_FC_ENABLE		= (3 << 6),
+	MV_FORCE_FC_DISABLE		= (1 << 6),
+};
+
+enum {
+	MV_8021Q_EGRESS_UNMODIFIED	= 0x00,
+	MV_8021Q_EGRESS_UNTAGGED	= 0x01,
+	MV_8021Q_EGRESS_TAGGED		= 0x02,
+	MV_8021Q_EGRESS_ADDTAG		= 0x03,
+};
+
+#define MV_8021Q_MODE_SHIFT		10
+#define MV_8021Q_MODE_MASK		(0x3 << MV_8021Q_MODE_SHIFT)
+
+enum {
+	MV_8021Q_MODE_DISABLE		= 0x00,
+	MV_8021Q_MODE_FALLBACK		= 0x01,
+	MV_8021Q_MODE_CHECK		= 0x02,
+	MV_8021Q_MODE_SECURE		= 0x03,
+};
+
+#define MV_PORTASSOC_MONITOR		(1 << 15)
+
+enum {
+	MV_SWITCH_MAC0			= 0x01,
+	MV_SWITCH_MAC1			= 0x02,
+	MV_SWITCH_MAC2			= 0x03,
+	MV_SWITCH_CTRL			= 0x04,
+	MV_SWITCH_ATU_CTRL		= 0x0a,
+	MV_SWITCH_ATU_OP		= 0x0b,
+	MV_SWITCH_ATU_DATA		= 0x0c,
+	MV_SWITCH_ATU_MAC0		= 0x0d,
+	MV_SWITCH_ATU_MAC1		= 0x0e,
+	MV_SWITCH_ATU_MAC2		= 0x0f,
+	MV_SWITCH_GLOBAL		= 0x1b,
+	MV_SWITCH_GLOBAL2		= 0x1c,
+};
+#define MV_SWITCHREG(_type) MV_SWITCHREGS, MV_SWITCH_##_type
+
+enum {
+	MV_SWITCHCTL_EEIE		= (1 << 0),
+	MV_SWITCHCTL_PHYIE		= (1 << 1),
+	MV_SWITCHCTL_ATUDONE		= (1 << 2),
+	MV_SWITCHCTL_ATUIE		= (1 << 3),
+	MV_SWITCHCTL_CTRMODE		= (1 << 8),
+	MV_SWITCHCTL_RELOAD		= (1 << 9),
+	MV_SWITCHCTL_MSIZE		= (1 << 10),
+	MV_SWITCHCTL_DROP		= (1 << 13),
+};
+
+enum {
+#define MV_ATUCTL_AGETIME_MIN		16
+#define MV_ATUCTL_AGETIME_MAX		4080
+#define MV_ATUCTL_AGETIME(_n)		((((_n) / 16) & 0xff) << 4)
+	MV_ATUCTL_ATU_256		= (0 << 12),
+	MV_ATUCTL_ATU_512		= (1 << 12),
+	MV_ATUCTL_ATU_1K		= (2 << 12),
+	MV_ATUCTL_ATUMASK		= (3 << 12),
+	MV_ATUCTL_NO_LEARN		= (1 << 14),
+	MV_ATUCTL_RESET			= (1 << 15),
+};
+
+enum {
+#define MV_ATUOP_DBNUM(_n)		((_n) & 0x0f)
+	MV_ATUOP_NOOP			= (0 << 12),
+	MV_ATUOP_FLUSH_ALL		= (1 << 12),
+	MV_ATUOP_FLUSH_U		= (2 << 12),
+	MV_ATUOP_LOAD_DB		= (3 << 12),
+	MV_ATUOP_GET_NEXT		= (4 << 12),
+	MV_ATUOP_FLUSH_DB		= (5 << 12),
+	MV_ATUOP_FLUSH_DB_UU		= (6 << 12),
+	MV_ATUOP_INPROGRESS		= (1 << 15),
+};
+
+enum {
+	MV_GLOBAL_STATUS		= 0x00,
+	MV_GLOBAL_CONTROL		= 0x04,
+	MV_GLOBAL_VTU_OP		= 0x05,
+	MV_GLOBAL_VTU_VID		= 0x06,
+	MV_GLOBAL_VTU_DATA1		= 0x07,
+	MV_GLOBAL_VTU_DATA2		= 0x08,
+	MV_GLOBAL_VTU_DATA3		= 0x09,
+};
+#define MV_GLOBALREG(_type) MV_SWITCH_GLOBAL, MV_GLOBAL_##_type
+
+enum {
+	MV_GLOBAL2_SDET_POLARITY	= 0x1D,
+};
+#define MV_GLOBAL2REG(_type) MV_SWITCH_GLOBAL2, MV_GLOBAL2_##_type
+
+enum {
+	MV_VTUOP_VALID			= (1 << 12),
+	MV_VTUOP_LOAD			= (3 << 12),
+	MV_VTUOP_INPROGRESS		= (1 << 15),
+};
+
+enum {
+	MV_CONTROL_RESET		= (1 << 15),
+	MV_CONTROL_PPU_ENABLE		= (1 << 14),
+};
+
+enum {
+	MV_VTUCTL_EGRESS_UNMODIFIED	= 0x00,
+	MV_VTUCTL_EGRESS_UNTAGGED	= 0x01,
+	MV_VTUCTL_EGRESS_TAGGED		= 0x02,
+	MV_VTUCTL_DISCARD		= 0x03,
+};
+
+enum {
+	MV_8021Q_VLAN_ONLY		= (1 << 15),
+};
+
+enum {
+	MV_INDIRECT_REG_CMD		= 0,
+	MV_INDIRECT_REG_DATA		= 1,
+};
+
+enum {
+	MV_INDIRECT_INPROGRESS		= 0x8000,
+	MV_INDIRECT_WRITE		= 0x9400,
+	MV_INDIRECT_READ		= 0x9800,
+};
+#define MV_INDIRECT_ADDR_S		5
+
+#define MV_IDENT_MASK			0xffc0
+#define MV_IDENT_VALUE			0x1700
+#define MV_IDENT_STR			"MV88E6171"
+
+#define MV_PVID_MASK			0x0fff
+
+struct mvsw6171_state {
+	struct switch_dev dev;
+	struct mii_bus *bus;
+	int base_addr;
+
+	bool registered;
+	bool is_indirect;
+
+	int cpu_port0;
+	int cpu_port1;
+
+	int vlan_enabled;
+	struct port_state {
+		u16 pvid;
+		u16 mask;
+		u8 qmode;
+	} ports[MV_PORTS];
+
+	struct vlan_state {
+		bool port_based;
+
+		u16 mask;
+		u16 vid;
+		u32 port_mode;
+	} vlans[MV_VLANS];
+
+	char buf[128];
+};
+
+#define get_state(_dev) container_of((_dev), struct mvsw6171_state, dev)
+
+#endif
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/mvswitch.c b/trunk/target/linux/generic/files/drivers/net/phy/mvswitch.c
new file mode 100644
index 00000000..af73ec22
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/mvswitch.c
@@ -0,0 +1,433 @@
+/*
+ * Marvell 88E6060 switch driver
+ * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+#include <linux/if_vlan.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include "mvswitch.h"
+
+/* Undefine this to use trailer mode instead.
+ * I don't know if header mode works with all chips */
+#define HEADER_MODE	1
+
+MODULE_DESCRIPTION("Marvell 88E6060 Switch driver");
+MODULE_AUTHOR("Felix Fietkau");
+MODULE_LICENSE("GPL");
+
+#define MVSWITCH_MAGIC 0x88E6060
+
+struct mvswitch_priv {
+	netdev_features_t orig_features;
+	u8 vlans[16];
+};
+
+#define to_mvsw(_phy) ((struct mvswitch_priv *) (_phy)->priv)
+
+static inline u16
+r16(struct phy_device *phydev, int addr, int reg)
+{
+	return phydev->bus->read(phydev->bus, addr, reg);
+}
+
+static inline void
+w16(struct phy_device *phydev, int addr, int reg, u16 val)
+{
+	phydev->bus->write(phydev->bus, addr, reg, val);
+}
+
+
+static struct sk_buff *
+mvswitch_mangle_tx(struct net_device *dev, struct sk_buff *skb)
+{
+	struct mvswitch_priv *priv;
+	char *buf = NULL;
+	u16 vid;
+
+	priv = dev->phy_ptr;
+	if (unlikely(!priv))
+		goto error;
+
+	if (unlikely(skb->len < 16))
+		goto error;
+
+#ifdef HEADER_MODE
+	if (__vlan_hwaccel_get_tag(skb, &vid))
+		goto error;
+
+	if (skb_cloned(skb) || (skb->len <= 62) || (skb_headroom(skb) < MV_HEADER_SIZE)) {
+		if (pskb_expand_head(skb, MV_HEADER_SIZE, (skb->len < 62 ? 62 - skb->len : 0), GFP_ATOMIC))
+			goto error_expand;
+		if (skb->len < 62)
+			skb->len = 62;
+	}
+	buf = skb_push(skb, MV_HEADER_SIZE);
+#else
+	if (__vlan_get_tag(skb, &vid))
+		goto error;
+
+	if (unlikely((vid > 15 || !priv->vlans[vid])))
+		goto error;
+
+	if (skb->len <= 64) {
+		if (pskb_expand_head(skb, 0, 64 + MV_TRAILER_SIZE - skb->len, GFP_ATOMIC))
+			goto error_expand;
+
+		buf = skb->data + 64;
+		skb->len = 64 + MV_TRAILER_SIZE;
+	} else {
+		if (skb_cloned(skb) || unlikely(skb_tailroom(skb) < 4)) {
+			if (pskb_expand_head(skb, 0, 4, GFP_ATOMIC))
+				goto error_expand;
+		}
+		buf = skb_put(skb, 4);
+	}
+
+	/* move the ethernet header 4 bytes forward, overwriting the vlan tag */
+	memmove(skb->data + 4, skb->data, 12);
+	skb->data += 4;
+	skb->len -= 4;
+	skb->mac_header += 4;
+#endif
+
+	if (!buf)
+		goto error;
+
+
+#ifdef HEADER_MODE
+	/* prepend the tag */
+	*((__be16 *) buf) = cpu_to_be16(
+		((vid << MV_HEADER_VLAN_S) & MV_HEADER_VLAN_M) |
+		((priv->vlans[vid] << MV_HEADER_PORTS_S) & MV_HEADER_PORTS_M)
+	);
+#else
+	/* append the tag */
+	*((__be32 *) buf) = cpu_to_be32((
+		(MV_TRAILER_OVERRIDE << MV_TRAILER_FLAGS_S) |
+		((priv->vlans[vid] & MV_TRAILER_PORTS_M) << MV_TRAILER_PORTS_S)
+	));
+#endif
+
+	return skb;
+
+error_expand:
+	if (net_ratelimit())
+		printk("%s: failed to expand/update skb for the switch\n", dev->name);
+
+error:
+	/* any errors? drop the packet! */
+	dev_kfree_skb_any(skb);
+	return NULL;
+}
+
+static void
+mvswitch_mangle_rx(struct net_device *dev, struct sk_buff *skb)
+{
+	struct mvswitch_priv *priv;
+	unsigned char *buf;
+	int vlan = -1;
+	int i;
+
+	priv = dev->phy_ptr;
+	if (WARN_ON_ONCE(!priv))
+		return;
+
+#ifdef HEADER_MODE
+	buf = skb->data;
+	skb_pull(skb, MV_HEADER_SIZE);
+#else
+	buf = skb->data + skb->len - MV_TRAILER_SIZE;
+	if (buf[0] != 0x80)
+		return;
+#endif
+
+	/* look for the vlan matching the incoming port */
+	for (i = 0; i < ARRAY_SIZE(priv->vlans); i++) {
+		if ((1 << buf[1]) & priv->vlans[i])
+			vlan = i;
+	}
+
+	if (vlan == -1)
+		return;
+
+	__vlan_hwaccel_put_tag(skb, vlan);
+}
+
+
+static int
+mvswitch_wait_mask(struct phy_device *pdev, int addr, int reg, u16 mask, u16 val)
+{
+	int i = 100;
+	u16 r;
+
+	do {
+		r = r16(pdev, addr, reg) & mask;
+		if (r == val)
+			return 0;
+	} while(--i > 0);
+	return -ETIMEDOUT;
+}
+
+static int
+mvswitch_config_init(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv = to_mvsw(pdev);
+	struct net_device *dev = pdev->attached_dev;
+	u8 vlmap = 0;
+	int i;
+
+	if (!dev)
+		return -EINVAL;
+
+	printk("%s: Marvell 88E6060 PHY driver attached.\n", dev->name);
+	pdev->supported = ADVERTISED_100baseT_Full;
+	pdev->advertising = ADVERTISED_100baseT_Full;
+	dev->phy_ptr = priv;
+	pdev->irq = PHY_POLL;
+#ifdef HEADER_MODE
+	dev->flags |= IFF_PROMISC;
+#endif
+
+	/* initialize default vlans */
+	for (i = 0; i < MV_PORTS; i++)
+		priv->vlans[(i == MV_WANPORT ? 2 : 1)] |= (1 << i);
+
+	/* before entering reset, disable all ports */
+	for (i = 0; i < MV_PORTS; i++)
+		w16(pdev, MV_PORTREG(CONTROL, i), 0x00);
+
+	msleep(2); /* wait for the status change to settle in */
+
+	/* put the ATU in reset */
+	w16(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET);
+
+	i = mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET, 0);
+	if (i < 0) {
+		printk("%s: Timeout waiting for the switch to reset.\n", dev->name);
+		return i;
+	}
+
+	/* set the ATU flags */
+	w16(pdev, MV_SWITCHREG(ATU_CTRL),
+		MV_ATUCTL_NO_LEARN |
+		MV_ATUCTL_ATU_1K |
+		MV_ATUCTL_AGETIME(MV_ATUCTL_AGETIME_MIN) /* minimum without disabling ageing */
+	);
+
+	/* initialize the cpu port */
+	w16(pdev, MV_PORTREG(CONTROL, MV_CPUPORT),
+#ifdef HEADER_MODE
+		MV_PORTCTRL_HEADER |
+#else
+		MV_PORTCTRL_RXTR |
+		MV_PORTCTRL_TXTR |
+#endif
+		MV_PORTCTRL_ENABLED
+	);
+	/* wait for the phy change to settle in */
+	msleep(2);
+	for (i = 0; i < MV_PORTS; i++) {
+		u8 pvid = 0;
+		int j;
+
+		vlmap = 0;
+
+		/* look for the matching vlan */
+		for (j = 0; j < ARRAY_SIZE(priv->vlans); j++) {
+			if (priv->vlans[j] & (1 << i)) {
+				vlmap = priv->vlans[j];
+				pvid = j;
+			}
+		}
+		/* leave port unconfigured if it's not part of a vlan */
+		if (!vlmap)
+			continue;
+
+		/* add the cpu port to the allowed destinations list */
+		vlmap |= (1 << MV_CPUPORT);
+
+		/* take port out of its own vlan destination map */
+		vlmap &= ~(1 << i);
+
+		/* apply vlan settings */
+		w16(pdev, MV_PORTREG(VLANMAP, i),
+			MV_PORTVLAN_PORTS(vlmap) |
+			MV_PORTVLAN_ID(i)
+		);
+
+		/* re-enable port */
+		w16(pdev, MV_PORTREG(CONTROL, i),
+			MV_PORTCTRL_ENABLED
+		);
+	}
+
+	w16(pdev, MV_PORTREG(VLANMAP, MV_CPUPORT),
+		MV_PORTVLAN_ID(MV_CPUPORT)
+	);
+
+	/* set the port association vector */
+	for (i = 0; i <= MV_PORTS; i++) {
+		w16(pdev, MV_PORTREG(ASSOC, i),
+			MV_PORTASSOC_PORTS(1 << i)
+		);
+	}
+
+	/* init switch control */
+	w16(pdev, MV_SWITCHREG(CTRL),
+		MV_SWITCHCTL_MSIZE |
+		MV_SWITCHCTL_DROP
+	);
+
+	dev->eth_mangle_rx = mvswitch_mangle_rx;
+	dev->eth_mangle_tx = mvswitch_mangle_tx;
+	priv->orig_features = dev->features;
+
+#ifdef HEADER_MODE
+	dev->priv_flags |= IFF_NO_IP_ALIGN;
+	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
+#else
+	dev->features |= NETIF_F_HW_VLAN_RX;
+#endif
+
+	return 0;
+}
+
+static int
+mvswitch_read_status(struct phy_device *pdev)
+{
+	pdev->speed = SPEED_100;
+	pdev->duplex = DUPLEX_FULL;
+	pdev->link = 1;
+
+	/* XXX ugly workaround: we can't force the switch
+	 * to gracefully handle hosts moving from one port to another,
+	 * so we have to regularly clear the ATU database */
+
+	/* wait for the ATU to become available */
+	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
+
+	/* flush the ATU */
+	w16(pdev, MV_SWITCHREG(ATU_OP),
+		MV_ATUOP_INPROGRESS |
+		MV_ATUOP_FLUSH_ALL
+	);
+
+	/* wait for operation to complete */
+	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
+
+	return 0;
+}
+
+static int
+mvswitch_config_aneg(struct phy_device *phydev)
+{
+	return 0;
+}
+
+static void
+mvswitch_detach(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv = to_mvsw(pdev);
+	struct net_device *dev = pdev->attached_dev;
+
+	if (!dev)
+		return;
+
+	dev->phy_ptr = NULL;
+	dev->eth_mangle_rx = NULL;
+	dev->eth_mangle_tx = NULL;
+	dev->features = priv->orig_features;
+	dev->priv_flags &= ~IFF_NO_IP_ALIGN;
+}
+
+static void
+mvswitch_remove(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv = to_mvsw(pdev);
+
+	kfree(priv);
+}
+
+static int
+mvswitch_probe(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv;
+
+	priv = kzalloc(sizeof(struct mvswitch_priv), GFP_KERNEL);
+	if (priv == NULL)
+		return -ENOMEM;
+
+	pdev->priv = priv;
+
+	return 0;
+}
+
+static int
+mvswitch_fixup(struct phy_device *dev)
+{
+	u16 reg;
+
+	if (dev->addr != 0x10)
+		return 0;
+
+	reg = dev->bus->read(dev->bus, MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK;
+	if (reg != MV_IDENT_VALUE)
+		return 0;
+
+	dev->phy_id = MVSWITCH_MAGIC;
+	return 0;
+}
+
+
+static struct phy_driver mvswitch_driver = {
+	.name		= "Marvell 88E6060",
+	.phy_id		= MVSWITCH_MAGIC,
+	.phy_id_mask	= 0xffffffff,
+	.features	= PHY_BASIC_FEATURES,
+	.probe		= &mvswitch_probe,
+	.remove		= &mvswitch_remove,
+	.detach		= &mvswitch_detach,
+	.config_init	= &mvswitch_config_init,
+	.config_aneg	= &mvswitch_config_aneg,
+	.read_status	= &mvswitch_read_status,
+	.driver		= { .owner = THIS_MODULE,},
+};
+
+static int __init
+mvswitch_init(void)
+{
+	phy_register_fixup_for_id(PHY_ANY_ID, mvswitch_fixup);
+	return phy_driver_register(&mvswitch_driver);
+}
+
+static void __exit
+mvswitch_exit(void)
+{
+	phy_driver_unregister(&mvswitch_driver);
+}
+
+module_init(mvswitch_init);
+module_exit(mvswitch_exit);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/mvswitch.h b/trunk/target/linux/generic/files/drivers/net/phy/mvswitch.h
new file mode 100644
index 00000000..1563eec4
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/mvswitch.h
@@ -0,0 +1,145 @@
+/*
+ * Marvell 88E6060 switch driver
+ * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+#ifndef __MVSWITCH_H
+#define __MVSWITCH_H
+
+#define MV_HEADER_SIZE	2
+#define MV_HEADER_PORTS_M	0x001f
+#define MV_HEADER_PORTS_S	0
+#define MV_HEADER_VLAN_M	0xf000
+#define MV_HEADER_VLAN_S	12
+
+#define MV_TRAILER_SIZE	4
+#define MV_TRAILER_PORTS_M	0x1f
+#define MV_TRAILER_PORTS_S	16
+#define MV_TRAILER_FLAGS_S	24
+#define MV_TRAILER_OVERRIDE	0x80
+
+
+#define MV_PORTS	5
+#define MV_WANPORT	4
+#define MV_CPUPORT	5
+
+#define MV_BASE		0x10
+
+#define MV_PHYPORT_BASE		(MV_BASE + 0x0)
+#define MV_PHYPORT(_n)		(MV_PHYPORT_BASE + (_n))
+#define MV_SWITCHPORT_BASE	(MV_BASE + 0x8)
+#define MV_SWITCHPORT(_n)	(MV_SWITCHPORT_BASE + (_n))
+#define MV_SWITCHREGS		(MV_BASE + 0xf)
+
+enum {
+	MV_PHY_CONTROL      = 0x00,
+	MV_PHY_STATUS       = 0x01,
+	MV_PHY_IDENT0       = 0x02,
+	MV_PHY_IDENT1       = 0x03,
+	MV_PHY_ANEG         = 0x04,
+	MV_PHY_LINK_ABILITY = 0x05,
+	MV_PHY_ANEG_EXPAND  = 0x06,
+	MV_PHY_XMIT_NEXTP   = 0x07,
+	MV_PHY_LINK_NEXTP   = 0x08,
+	MV_PHY_CONTROL1     = 0x10,
+	MV_PHY_STATUS1      = 0x11,
+	MV_PHY_INTR_EN      = 0x12,
+	MV_PHY_INTR_STATUS  = 0x13,
+	MV_PHY_INTR_PORT    = 0x14,
+	MV_PHY_RECV_COUNTER = 0x16,
+	MV_PHY_LED_PARALLEL = 0x16,
+	MV_PHY_LED_STREAM   = 0x17,
+	MV_PHY_LED_CTRL     = 0x18,
+	MV_PHY_LED_OVERRIDE = 0x19,
+	MV_PHY_VCT_CTRL     = 0x1a,
+	MV_PHY_VCT_STATUS   = 0x1b,
+	MV_PHY_CONTROL2     = 0x1e
+};
+#define MV_PHYREG(_type, _port) MV_PHYPORT(_port), MV_PHY_##_type
+
+enum {
+	MV_PORT_STATUS      = 0x00,
+	MV_PORT_IDENT       = 0x03,
+	MV_PORT_CONTROL     = 0x04,
+	MV_PORT_VLANMAP     = 0x06,
+	MV_PORT_ASSOC       = 0x0b,
+	MV_PORT_RXCOUNT     = 0x10,
+	MV_PORT_TXCOUNT     = 0x11,
+};
+#define MV_PORTREG(_type, _port) MV_SWITCHPORT(_port), MV_PORT_##_type
+
+enum {
+	MV_PORTCTRL_BLOCK   =  (1 << 0),
+	MV_PORTCTRL_LEARN   =  (2 << 0),
+	MV_PORTCTRL_ENABLED =  (3 << 0),
+	MV_PORTCTRL_VLANTUN =  (1 << 7),	/* Enforce VLANs on packets */
+	MV_PORTCTRL_RXTR    =  (1 << 8),	/* Enable Marvell packet trailer for ingress */
+	MV_PORTCTRL_HEADER	= (1 << 11),	/* Enable Marvell packet header mode for port */
+	MV_PORTCTRL_TXTR    = (1 << 14),	/* Enable Marvell packet trailer for egress */
+	MV_PORTCTRL_FORCEFL = (1 << 15),	/* force flow control */
+};
+
+#define MV_PORTVLAN_ID(_n) (((_n) & 0xf) << 12)
+#define MV_PORTVLAN_PORTS(_n) ((_n) & 0x3f)
+
+#define MV_PORTASSOC_PORTS(_n) ((_n) & 0x1f)
+#define MV_PORTASSOC_MONITOR	(1 << 15)
+
+enum {
+	MV_SWITCH_MAC0      = 0x01,
+	MV_SWITCH_MAC1      = 0x02,
+	MV_SWITCH_MAC2      = 0x03,
+	MV_SWITCH_CTRL      = 0x04,
+	MV_SWITCH_ATU_CTRL  = 0x0a,
+	MV_SWITCH_ATU_OP    = 0x0b,
+	MV_SWITCH_ATU_DATA  = 0x0c,
+	MV_SWITCH_ATU_MAC0  = 0x0d,
+	MV_SWITCH_ATU_MAC1  = 0x0e,
+	MV_SWITCH_ATU_MAC2  = 0x0f,
+};
+#define MV_SWITCHREG(_type) MV_SWITCHREGS, MV_SWITCH_##_type
+
+enum {
+	MV_SWITCHCTL_EEIE   =  (1 << 0),	/* EEPROM interrupt enable */
+	MV_SWITCHCTL_PHYIE  =  (1 << 1),	/* PHY interrupt enable */
+	MV_SWITCHCTL_ATUDONE=  (1 << 2),	/* ATU done interrupt enable */
+	MV_SWITCHCTL_ATUIE  =  (1 << 3),	/* ATU interrupt enable */
+	MV_SWITCHCTL_CTRMODE=  (1 << 8),	/* statistics for rx and tx errors */
+	MV_SWITCHCTL_RELOAD =  (1 << 9),	/* reload registers from eeprom */
+	MV_SWITCHCTL_MSIZE  = (1 << 10),	/* increase maximum frame size */
+	MV_SWITCHCTL_DROP   = (1 << 13),	/* discard frames with excessive collisions */
+};
+
+enum {
+#define MV_ATUCTL_AGETIME_MIN	16
+#define MV_ATUCTL_AGETIME_MAX	4080
+#define MV_ATUCTL_AGETIME(_n)	((((_n) / 16) & 0xff) << 4)
+	MV_ATUCTL_ATU_256   = (0 << 12),
+	MV_ATUCTL_ATU_512   = (1 << 12),
+	MV_ATUCTL_ATU_1K	= (2 << 12),
+	MV_ATUCTL_ATUMASK   = (3 << 12),
+	MV_ATUCTL_NO_LEARN  = (1 << 14),
+	MV_ATUCTL_RESET     = (1 << 15),
+};
+
+enum {
+#define MV_ATUOP_DBNUM(_n)	((_n) & 0x0f)
+
+	MV_ATUOP_NOOP       = (0 << 12),
+	MV_ATUOP_FLUSH_ALL  = (1 << 12),
+	MV_ATUOP_FLUSH_U    = (2 << 12),
+	MV_ATUOP_LOAD_DB    = (3 << 12),
+	MV_ATUOP_GET_NEXT   = (4 << 12),
+	MV_ATUOP_FLUSH_DB   = (5 << 12),
+	MV_ATUOP_FLUSH_DB_UU= (6 << 12),
+
+	MV_ATUOP_INPROGRESS = (1 << 15),
+};
+
+#define MV_IDENT_MASK		0xfff0
+#define MV_IDENT_VALUE		0x0600
+
+#endif
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/psb6970.c b/trunk/target/linux/generic/files/drivers/net/phy/psb6970.c
new file mode 100644
index 00000000..2fcd2990
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/psb6970.c
@@ -0,0 +1,438 @@
+/*
+ * Lantiq PSB6970 (Tantos) Switch driver
+ *
+ * Copyright (c) 2009,2010 Team Embedded.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation.
+ *
+ * The switch programming done in this driver follows the 
+ * "Ethernet Traffic Separation using VLAN" Application Note as
+ * published by Lantiq.
+ */
+
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/switch.h>
+#include <linux/phy.h>
+
+#define PSB6970_MAX_VLANS		16
+#define PSB6970_NUM_PORTS		7
+#define PSB6970_DEFAULT_PORT_CPU	6
+#define PSB6970_IS_CPU_PORT(x)		((x) > 4)
+
+#define PHYADDR(_reg)		((_reg >> 5) & 0xff), (_reg & 0x1f)
+
+/* --- Identification --- */
+#define PSB6970_CI0		0x0100
+#define PSB6970_CI0_MASK	0x000f
+#define PSB6970_CI1		0x0101
+#define PSB6970_CI1_VAL		0x2599
+#define PSB6970_CI1_MASK	0xffff
+
+/* --- VLAN filter table --- */
+#define PSB6970_VFxL(i)		((i)*2+0x10)	/* VLAN Filter Low */
+#define PSB6970_VFxL_VV		(1 << 15)	/* VLAN_Valid */
+
+#define PSB6970_VFxH(i)		((i)*2+0x11)	/* VLAN Filter High */
+#define PSB6970_VFxH_TM_SHIFT	7		/* Tagged Member */
+
+/* --- Port registers --- */
+#define PSB6970_EC(p)		((p)*0x20+2)	/* Extended Control */
+#define PSB6970_EC_IFNTE	(1 << 1)	/* Input Force No Tag Enable */
+
+#define PSB6970_PBVM(p)		((p)*0x20+3)	/* Port Base VLAN Map */
+#define PSB6970_PBVM_VMCE	(1 << 8)
+#define PSB6970_PBVM_AOVTP	(1 << 9)
+#define PSB6970_PBVM_VSD	(1 << 10)
+#define PSB6970_PBVM_VC		(1 << 11)	/* VID Check with VID table */
+#define PSB6970_PBVM_TBVE	(1 << 13)	/* Tag-Based VLAN enable */
+
+#define PSB6970_DVID(p)		((p)*0x20+4)	/* Default VLAN ID & Priority */
+
+struct psb6970_priv {
+	struct switch_dev dev;
+	struct phy_device *phy;
+	u16 (*read) (struct phy_device* phydev, int reg);
+	void (*write) (struct phy_device* phydev, int reg, u16 val);
+	struct mutex reg_mutex;
+
+	/* all fields below are cleared on reset */
+	bool vlan;
+	u16 vlan_id[PSB6970_MAX_VLANS];
+	u8 vlan_table[PSB6970_MAX_VLANS];
+	u8 vlan_tagged;
+	u16 pvid[PSB6970_NUM_PORTS];
+};
+
+#define to_psb6970(_dev) container_of(_dev, struct psb6970_priv, dev)
+
+static u16 psb6970_mii_read(struct phy_device *phydev, int reg)
+{
+	return phydev->bus->read(phydev->bus, PHYADDR(reg));
+}
+
+static void psb6970_mii_write(struct phy_device *phydev, int reg, u16 val)
+{
+	phydev->bus->write(phydev->bus, PHYADDR(reg), val);
+}
+
+static int
+psb6970_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		 struct switch_val *val)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	priv->vlan = !!val->value.i;
+	return 0;
+}
+
+static int
+psb6970_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		 struct switch_val *val)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	val->value.i = priv->vlan;
+	return 0;
+}
+
+static int psb6970_set_pvid(struct switch_dev *dev, int port, int vlan)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+
+	/* make sure no invalid PVIDs get set */
+	if (vlan >= dev->vlans)
+		return -EINVAL;
+
+	priv->pvid[port] = vlan;
+	return 0;
+}
+
+static int psb6970_get_pvid(struct switch_dev *dev, int port, int *vlan)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	*vlan = priv->pvid[port];
+	return 0;
+}
+
+static int
+psb6970_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	priv->vlan_id[val->port_vlan] = val->value.i;
+	return 0;
+}
+
+static int
+psb6970_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
+		struct switch_val *val)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	val->value.i = priv->vlan_id[val->port_vlan];
+	return 0;
+}
+
+static struct switch_attr psb6970_globals[] = {
+	{
+	 .type = SWITCH_TYPE_INT,
+	 .name = "enable_vlan",
+	 .description = "Enable VLAN mode",
+	 .set = psb6970_set_vlan,
+	 .get = psb6970_get_vlan,
+	 .max = 1},
+};
+
+static struct switch_attr psb6970_port[] = {
+};
+
+static struct switch_attr psb6970_vlan[] = {
+	{
+	 .type = SWITCH_TYPE_INT,
+	 .name = "vid",
+	 .description = "VLAN ID (0-4094)",
+	 .set = psb6970_set_vid,
+	 .get = psb6970_get_vid,
+	 .max = 4094,
+	 },
+};
+
+static int psb6970_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	u8 ports = priv->vlan_table[val->port_vlan];
+	int i;
+
+	val->len = 0;
+	for (i = 0; i < PSB6970_NUM_PORTS; i++) {
+		struct switch_port *p;
+
+		if (!(ports & (1 << i)))
+			continue;
+
+		p = &val->value.ports[val->len++];
+		p->id = i;
+		if (priv->vlan_tagged & (1 << i))
+			p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+		else
+			p->flags = 0;
+	}
+	return 0;
+}
+
+static int psb6970_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	u8 *vt = &priv->vlan_table[val->port_vlan];
+	int i, j;
+
+	*vt = 0;
+	for (i = 0; i < val->len; i++) {
+		struct switch_port *p = &val->value.ports[i];
+
+		if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED))
+			priv->vlan_tagged |= (1 << p->id);
+		else {
+			priv->vlan_tagged &= ~(1 << p->id);
+			priv->pvid[p->id] = val->port_vlan;
+
+			/* make sure that an untagged port does not
+			 * appear in other vlans */
+			for (j = 0; j < PSB6970_MAX_VLANS; j++) {
+				if (j == val->port_vlan)
+					continue;
+				priv->vlan_table[j] &= ~(1 << p->id);
+			}
+		}
+
+		*vt |= 1 << p->id;
+	}
+	return 0;
+}
+
+static int psb6970_hw_apply(struct switch_dev *dev)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	int i, j;
+
+	mutex_lock(&priv->reg_mutex);
+
+	if (priv->vlan) {
+		/* into the vlan translation unit */
+		for (j = 0; j < PSB6970_MAX_VLANS; j++) {
+			u8 vp = priv->vlan_table[j];
+
+			if (vp) {
+				priv->write(priv->phy, PSB6970_VFxL(j),
+					    PSB6970_VFxL_VV | priv->vlan_id[j]);
+				priv->write(priv->phy, PSB6970_VFxH(j),
+					    ((vp & priv->
+					      vlan_tagged) <<
+					     PSB6970_VFxH_TM_SHIFT) | vp);
+			} else	/* clear VLAN Valid flag for unused vlans */
+				priv->write(priv->phy, PSB6970_VFxL(j), 0);
+
+		}
+	}
+
+	/* update the port destination mask registers and tag settings */
+	for (i = 0; i < PSB6970_NUM_PORTS; i++) {
+		int dvid = 1, pbvm = 0x7f | PSB6970_PBVM_VSD, ec = 0;
+
+		if (priv->vlan) {
+			ec = PSB6970_EC_IFNTE;
+			dvid = priv->vlan_id[priv->pvid[i]];
+			pbvm |= PSB6970_PBVM_TBVE | PSB6970_PBVM_VMCE;
+
+			if ((i << 1) & priv->vlan_tagged)
+				pbvm |= PSB6970_PBVM_AOVTP | PSB6970_PBVM_VC;
+		}
+
+		priv->write(priv->phy, PSB6970_PBVM(i), pbvm);
+
+		if (!PSB6970_IS_CPU_PORT(i)) {
+			priv->write(priv->phy, PSB6970_EC(i), ec);
+			priv->write(priv->phy, PSB6970_DVID(i), dvid);
+		}
+	}
+
+	mutex_unlock(&priv->reg_mutex);
+	return 0;
+}
+
+static int psb6970_reset_switch(struct switch_dev *dev)
+{
+	struct psb6970_priv *priv = to_psb6970(dev);
+	int i;
+
+	mutex_lock(&priv->reg_mutex);
+
+	memset(&priv->vlan, 0, sizeof(struct psb6970_priv) -
+	       offsetof(struct psb6970_priv, vlan));
+
+	for (i = 0; i < PSB6970_MAX_VLANS; i++)
+		priv->vlan_id[i] = i;
+
+	mutex_unlock(&priv->reg_mutex);
+
+	return psb6970_hw_apply(dev);
+}
+
+static const struct switch_dev_ops psb6970_ops = {
+	.attr_global = {
+			.attr = psb6970_globals,
+			.n_attr = ARRAY_SIZE(psb6970_globals),
+			},
+	.attr_port = {
+		      .attr = psb6970_port,
+		      .n_attr = ARRAY_SIZE(psb6970_port),
+		      },
+	.attr_vlan = {
+		      .attr = psb6970_vlan,
+		      .n_attr = ARRAY_SIZE(psb6970_vlan),
+		      },
+	.get_port_pvid = psb6970_get_pvid,
+	.set_port_pvid = psb6970_set_pvid,
+	.get_vlan_ports = psb6970_get_ports,
+	.set_vlan_ports = psb6970_set_ports,
+	.apply_config = psb6970_hw_apply,
+	.reset_switch = psb6970_reset_switch,
+};
+
+static int psb6970_config_init(struct phy_device *pdev)
+{
+	struct psb6970_priv *priv;
+	struct net_device *dev = pdev->attached_dev;
+	struct switch_dev *swdev;
+	int ret;
+
+	priv = kzalloc(sizeof(struct psb6970_priv), GFP_KERNEL);
+	if (priv == NULL)
+		return -ENOMEM;
+
+	priv->phy = pdev;
+
+	if (pdev->addr == 0)
+		printk(KERN_INFO "%s: psb6970 switch driver attached.\n",
+		       pdev->attached_dev->name);
+
+	if (pdev->addr != 0) {
+		kfree(priv);
+		return 0;
+	}
+
+	pdev->supported = pdev->advertising = SUPPORTED_100baseT_Full;
+
+	mutex_init(&priv->reg_mutex);
+	priv->read = psb6970_mii_read;
+	priv->write = psb6970_mii_write;
+
+	pdev->priv = priv;
+
+	swdev = &priv->dev;
+	swdev->cpu_port = PSB6970_DEFAULT_PORT_CPU;
+	swdev->ops = &psb6970_ops;
+
+	swdev->name = "Lantiq PSB6970";
+	swdev->vlans = PSB6970_MAX_VLANS;
+	swdev->ports = PSB6970_NUM_PORTS;
+
+	if ((ret = register_switch(&priv->dev, pdev->attached_dev)) < 0) {
+		kfree(priv);
+		goto done;
+	}
+
+	ret = psb6970_reset_switch(&priv->dev);
+	if (ret) {
+		kfree(priv);
+		goto done;
+	}
+
+	dev->phy_ptr = priv;
+
+done:
+	return ret;
+}
+
+static int psb6970_read_status(struct phy_device *phydev)
+{
+	phydev->speed = SPEED_100;
+	phydev->duplex = DUPLEX_FULL;
+	phydev->link = 1;
+
+	phydev->state = PHY_RUNNING;
+	netif_carrier_on(phydev->attached_dev);
+	phydev->adjust_link(phydev->attached_dev);
+
+	return 0;
+}
+
+static int psb6970_config_aneg(struct phy_device *phydev)
+{
+	return 0;
+}
+
+static int psb6970_probe(struct phy_device *pdev)
+{
+	return 0;
+}
+
+static void psb6970_remove(struct phy_device *pdev)
+{
+	struct psb6970_priv *priv = pdev->priv;
+
+	if (!priv)
+		return;
+
+	if (pdev->addr == 0)
+		unregister_switch(&priv->dev);
+	kfree(priv);
+}
+
+static int psb6970_fixup(struct phy_device *dev)
+{
+	struct mii_bus *bus = dev->bus;
+	u16 reg;
+
+	/* look for the switch on the bus */
+	reg = bus->read(bus, PHYADDR(PSB6970_CI1)) & PSB6970_CI1_MASK;
+	if (reg != PSB6970_CI1_VAL)
+		return 0;
+
+	dev->phy_id = (reg << 16);
+	dev->phy_id |= bus->read(bus, PHYADDR(PSB6970_CI0)) & PSB6970_CI0_MASK;
+
+	return 0;
+}
+
+static struct phy_driver psb6970_driver = {
+	.name = "Lantiq PSB6970",
+	.phy_id = PSB6970_CI1_VAL << 16,
+	.phy_id_mask = 0xffff0000,
+	.features = PHY_BASIC_FEATURES,
+	.probe = psb6970_probe,
+	.remove = psb6970_remove,
+	.config_init = &psb6970_config_init,
+	.config_aneg = &psb6970_config_aneg,
+	.read_status = &psb6970_read_status,
+	.driver = {.owner = THIS_MODULE},
+};
+
+int __init psb6970_init(void)
+{
+	phy_register_fixup_for_id(PHY_ANY_ID, psb6970_fixup);
+	return phy_driver_register(&psb6970_driver);
+}
+
+module_init(psb6970_init);
+
+void __exit psb6970_exit(void)
+{
+	phy_driver_unregister(&psb6970_driver);
+}
+
+module_exit(psb6970_exit);
+
+MODULE_DESCRIPTION("Lantiq PSB6970 Switch");
+MODULE_AUTHOR("Ithamar R. Adema <ithamar.adema@team-embedded.nl>");
+MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/rtl8306.c b/trunk/target/linux/generic/files/drivers/net/phy/rtl8306.c
new file mode 100644
index 00000000..e280e936
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/rtl8306.c
@@ -0,0 +1,1060 @@
+/*
+ * rtl8306.c: RTL8306S switch driver
+ *
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+#include <linux/if.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/netlink.h>
+#include <net/genetlink.h>
+#include <linux/switch.h>
+#include <linux/delay.h>
+#include <linux/phy.h>
+
+//#define DEBUG 1
+
+/* Global (PHY0) */
+#define RTL8306_REG_PAGE		16
+#define RTL8306_REG_PAGE_LO		(1 << 15)
+#define RTL8306_REG_PAGE_HI		(1 << 1) /* inverted */
+
+#define RTL8306_NUM_VLANS		16
+#define RTL8306_NUM_PORTS		6
+#define RTL8306_PORT_CPU		5
+#define RTL8306_NUM_PAGES		4
+#define RTL8306_NUM_REGS		32
+
+#define RTL_NAME_S          "RTL8306S"
+#define RTL_NAME_SD         "RTL8306SD"
+#define RTL_NAME_SDM        "RTL8306SDM"
+#define RTL_NAME_UNKNOWN    "RTL8306(unknown)"
+
+#define RTL8306_MAGIC	0x8306
+
+static LIST_HEAD(phydevs);
+
+struct rtl_priv {
+	struct list_head list;
+	struct switch_dev dev;
+	int page;
+	int type;
+	int do_cpu;
+	struct mii_bus *bus;
+	char hwname[sizeof(RTL_NAME_UNKNOWN)];
+	bool fixup;
+};
+
+struct rtl_phyregs {
+	int nway;
+	int speed;
+	int duplex;
+};
+
+#define to_rtl(_dev) container_of(_dev, struct rtl_priv, dev)
+
+enum {
+	RTL_TYPE_S,
+	RTL_TYPE_SD,
+	RTL_TYPE_SDM,
+};
+
+struct rtl_reg {
+	int page;
+	int phy;
+	int reg;
+	int bits;
+	int shift;
+	int inverted;
+};
+
+#define RTL_VLAN_REGOFS(name) \
+	(RTL_REG_VLAN1_##name - RTL_REG_VLAN0_##name)
+
+#define RTL_PORT_REGOFS(name) \
+	(RTL_REG_PORT1_##name - RTL_REG_PORT0_##name)
+
+#define RTL_PORT_REG(id, reg) \
+	(RTL_REG_PORT0_##reg + (id * RTL_PORT_REGOFS(reg)))
+
+#define RTL_VLAN_REG(id, reg) \
+	(RTL_REG_VLAN0_##reg + (id * RTL_VLAN_REGOFS(reg)))
+
+#define RTL_GLOBAL_REGATTR(reg) \
+	.id = RTL_REG_##reg, \
+	.type = SWITCH_TYPE_INT, \
+	.ofs = 0, \
+	.set = rtl_attr_set_int, \
+	.get = rtl_attr_get_int
+
+#define RTL_PORT_REGATTR(reg) \
+	.id = RTL_REG_PORT0_##reg, \
+	.type = SWITCH_TYPE_INT, \
+	.ofs = RTL_PORT_REGOFS(reg), \
+	.set = rtl_attr_set_port_int, \
+	.get = rtl_attr_get_port_int
+
+#define RTL_VLAN_REGATTR(reg) \
+	.id = RTL_REG_VLAN0_##reg, \
+	.type = SWITCH_TYPE_INT, \
+	.ofs = RTL_VLAN_REGOFS(reg), \
+	.set = rtl_attr_set_vlan_int, \
+	.get = rtl_attr_get_vlan_int
+
+enum rtl_regidx {
+	RTL_REG_CHIPID,
+	RTL_REG_CHIPVER,
+	RTL_REG_CHIPTYPE,
+	RTL_REG_CPUPORT,
+
+	RTL_REG_EN_CPUPORT,
+	RTL_REG_EN_TAG_OUT,
+	RTL_REG_EN_TAG_CLR,
+	RTL_REG_EN_TAG_IN,
+	RTL_REG_TRAP_CPU,
+	RTL_REG_CPU_LINKUP,
+	RTL_REG_TRUNK_PORTSEL,
+	RTL_REG_EN_TRUNK,
+	RTL_REG_RESET,
+
+	RTL_REG_VLAN_ENABLE,
+	RTL_REG_VLAN_FILTER,
+	RTL_REG_VLAN_TAG_ONLY,
+	RTL_REG_VLAN_TAG_AWARE,
+#define RTL_VLAN_ENUM(id) \
+	RTL_REG_VLAN##id##_VID, \
+	RTL_REG_VLAN##id##_PORTMASK
+	RTL_VLAN_ENUM(0),
+	RTL_VLAN_ENUM(1),
+	RTL_VLAN_ENUM(2),
+	RTL_VLAN_ENUM(3),
+	RTL_VLAN_ENUM(4),
+	RTL_VLAN_ENUM(5),
+	RTL_VLAN_ENUM(6),
+	RTL_VLAN_ENUM(7),
+	RTL_VLAN_ENUM(8),
+	RTL_VLAN_ENUM(9),
+	RTL_VLAN_ENUM(10),
+	RTL_VLAN_ENUM(11),
+	RTL_VLAN_ENUM(12),
+	RTL_VLAN_ENUM(13),
+	RTL_VLAN_ENUM(14),
+	RTL_VLAN_ENUM(15),
+#define RTL_PORT_ENUM(id) \
+	RTL_REG_PORT##id##_PVID, \
+	RTL_REG_PORT##id##_NULL_VID_REPLACE, \
+	RTL_REG_PORT##id##_NON_PVID_DISCARD, \
+	RTL_REG_PORT##id##_VID_INSERT, \
+	RTL_REG_PORT##id##_TAG_INSERT, \
+	RTL_REG_PORT##id##_LINK, \
+	RTL_REG_PORT##id##_SPEED, \
+	RTL_REG_PORT##id##_NWAY, \
+	RTL_REG_PORT##id##_NRESTART, \
+	RTL_REG_PORT##id##_DUPLEX, \
+	RTL_REG_PORT##id##_RXEN, \
+	RTL_REG_PORT##id##_TXEN
+	RTL_PORT_ENUM(0),
+	RTL_PORT_ENUM(1),
+	RTL_PORT_ENUM(2),
+	RTL_PORT_ENUM(3),
+	RTL_PORT_ENUM(4),
+	RTL_PORT_ENUM(5),
+};
+
+static const struct rtl_reg rtl_regs[] = {
+	[RTL_REG_CHIPID]         = { 0, 4, 30, 16,  0, 0 },
+	[RTL_REG_CHIPVER]        = { 0, 4, 31,  8,  0, 0 },
+	[RTL_REG_CHIPTYPE]       = { 0, 4, 31,  2,  8, 0 },
+
+	/* CPU port number */
+	[RTL_REG_CPUPORT]        = { 2, 4, 21,  3,  0, 0 },
+	/* Enable CPU port function */
+	[RTL_REG_EN_CPUPORT]     = { 3, 2, 21,  1, 15, 1 },
+	/* Enable CPU port tag insertion */
+	[RTL_REG_EN_TAG_OUT]     = { 3, 2, 21,  1, 12, 0 },
+	/* Enable CPU port tag removal */
+	[RTL_REG_EN_TAG_CLR]     = { 3, 2, 21,  1, 11, 0 },
+	/* Enable CPU port tag checking */
+	[RTL_REG_EN_TAG_IN]      = { 0, 4, 21,  1,  7, 0 },
+	[RTL_REG_EN_TRUNK]       = { 0, 0, 19,  1, 11, 1 },
+	[RTL_REG_TRUNK_PORTSEL]  = { 0, 0, 16,  1,  6, 1 },
+	[RTL_REG_RESET]          = { 0, 0, 16,  1, 12, 0 },
+
+	[RTL_REG_TRAP_CPU]       = { 3, 2, 22,  1,  6, 0 },
+	[RTL_REG_CPU_LINKUP]     = { 0, 6, 22,  1, 15, 0 },
+
+	[RTL_REG_VLAN_TAG_ONLY]  = { 0, 0, 16,  1,  8, 1 },
+	[RTL_REG_VLAN_FILTER]    = { 0, 0, 16,  1,  9, 1 },
+	[RTL_REG_VLAN_TAG_AWARE] = { 0, 0, 16,  1, 10, 1 },
+	[RTL_REG_VLAN_ENABLE]    = { 0, 0, 18,  1,  8, 1 },
+
+#define RTL_VLAN_REGS(id, phy, page, regofs) \
+	[RTL_REG_VLAN##id##_VID] = { page, phy, 25 + regofs, 12, 0, 0 }, \
+	[RTL_REG_VLAN##id##_PORTMASK] = { page, phy, 24 + regofs, 6, 0, 0 }
+	RTL_VLAN_REGS( 0, 0, 0, 0),
+	RTL_VLAN_REGS( 1, 1, 0, 0),
+	RTL_VLAN_REGS( 2, 2, 0, 0),
+	RTL_VLAN_REGS( 3, 3, 0, 0),
+	RTL_VLAN_REGS( 4, 4, 0, 0),
+	RTL_VLAN_REGS( 5, 0, 1, 2),
+	RTL_VLAN_REGS( 6, 1, 1, 2),
+	RTL_VLAN_REGS( 7, 2, 1, 2),
+	RTL_VLAN_REGS( 8, 3, 1, 2),
+	RTL_VLAN_REGS( 9, 4, 1, 2),
+	RTL_VLAN_REGS(10, 0, 1, 4),
+	RTL_VLAN_REGS(11, 1, 1, 4),
+	RTL_VLAN_REGS(12, 2, 1, 4),
+	RTL_VLAN_REGS(13, 3, 1, 4),
+	RTL_VLAN_REGS(14, 4, 1, 4),
+	RTL_VLAN_REGS(15, 0, 1, 6),
+
+#define REG_PORT_SETTING(port, phy) \
+	[RTL_REG_PORT##port##_SPEED] = { 0, phy, 0, 1, 13, 0 }, \
+	[RTL_REG_PORT##port##_NWAY] = { 0, phy, 0, 1, 12, 0 }, \
+	[RTL_REG_PORT##port##_NRESTART] = { 0, phy, 0, 1, 9, 0 }, \
+	[RTL_REG_PORT##port##_DUPLEX] = { 0, phy, 0, 1, 8, 0 }, \
+	[RTL_REG_PORT##port##_TXEN] = { 0, phy, 24, 1, 11, 0 }, \
+	[RTL_REG_PORT##port##_RXEN] = { 0, phy, 24, 1, 10, 0 }, \
+	[RTL_REG_PORT##port##_LINK] = { 0, phy, 1, 1, 2, 0 }, \
+	[RTL_REG_PORT##port##_NULL_VID_REPLACE] = { 0, phy, 22, 1, 12, 0 }, \
+	[RTL_REG_PORT##port##_NON_PVID_DISCARD] = { 0, phy, 22, 1, 11, 0 }, \
+	[RTL_REG_PORT##port##_VID_INSERT] = { 0, phy, 22, 2, 9, 0 }, \
+	[RTL_REG_PORT##port##_TAG_INSERT] = { 0, phy, 22, 2, 0, 0 }
+
+	REG_PORT_SETTING(0, 0),
+	REG_PORT_SETTING(1, 1),
+	REG_PORT_SETTING(2, 2),
+	REG_PORT_SETTING(3, 3),
+	REG_PORT_SETTING(4, 4),
+	REG_PORT_SETTING(5, 6),
+
+#define REG_PORT_PVID(phy, page, regofs) \
+	{ page, phy, 24 + regofs, 4, 12, 0 }
+	[RTL_REG_PORT0_PVID] = REG_PORT_PVID(0, 0, 0),
+	[RTL_REG_PORT1_PVID] = REG_PORT_PVID(1, 0, 0),
+	[RTL_REG_PORT2_PVID] = REG_PORT_PVID(2, 0, 0),
+	[RTL_REG_PORT3_PVID] = REG_PORT_PVID(3, 0, 0),
+	[RTL_REG_PORT4_PVID] = REG_PORT_PVID(4, 0, 0),
+	[RTL_REG_PORT5_PVID] = REG_PORT_PVID(0, 1, 2),
+};
+
+
+static inline void
+rtl_set_page(struct rtl_priv *priv, unsigned int page)
+{
+	struct mii_bus *bus = priv->bus;
+	u16 pgsel;
+
+	if (priv->fixup)
+		return;
+
+	if (priv->page == page)
+		return;
+
+	BUG_ON(page > RTL8306_NUM_PAGES);
+	pgsel = bus->read(bus, 0, RTL8306_REG_PAGE);
+	pgsel &= ~(RTL8306_REG_PAGE_LO | RTL8306_REG_PAGE_HI);
+	if (page & (1 << 0))
+		pgsel |= RTL8306_REG_PAGE_LO;
+	if (!(page & (1 << 1))) /* bit is inverted */
+		pgsel |= RTL8306_REG_PAGE_HI;
+	bus->write(bus, 0, RTL8306_REG_PAGE, pgsel);
+}
+
+static inline int
+rtl_w16(struct switch_dev *dev, unsigned int page, unsigned int phy, unsigned int reg, u16 val)
+{
+	struct rtl_priv *priv = to_rtl(dev);
+	struct mii_bus *bus = priv->bus;
+
+	rtl_set_page(priv, page);
+	bus->write(bus, phy, reg, val);
+	bus->read(bus, phy, reg); /* flush */
+	return 0;
+}
+
+static inline int
+rtl_r16(struct switch_dev *dev, unsigned int page, unsigned int phy, unsigned int reg)
+{
+	struct rtl_priv *priv = to_rtl(dev);
+	struct mii_bus *bus = priv->bus;
+
+	rtl_set_page(priv, page);
+	return bus->read(bus, phy, reg);
+}
+
+static inline u16
+rtl_rmw(struct switch_dev *dev, unsigned int page, unsigned int phy, unsigned int reg, u16 mask, u16 val)
+{
+	struct rtl_priv *priv = to_rtl(dev);
+	struct mii_bus *bus = priv->bus;
+	u16 r;
+
+	rtl_set_page(priv, page);
+	r = bus->read(bus, phy, reg);
+	r &= ~mask;
+	r |= val;
+	bus->write(bus, phy, reg, r);
+	return bus->read(bus, phy, reg); /* flush */
+}
+
+
+static inline int
+rtl_get(struct switch_dev *dev, enum rtl_regidx s)
+{
+	const struct rtl_reg *r = &rtl_regs[s];
+	u16 val;
+
+	BUG_ON(s >= ARRAY_SIZE(rtl_regs));
+	if (r->bits == 0) /* unimplemented */
+		return 0;
+
+	val = rtl_r16(dev, r->page, r->phy, r->reg);
+
+	if (r->shift > 0)
+		val >>= r->shift;
+
+	if (r->inverted)
+		val = ~val;
+
+	val &= (1 << r->bits) - 1;
+
+	return val;
+}
+
+static int
+rtl_set(struct switch_dev *dev, enum rtl_regidx s, unsigned int val)
+{
+	const struct rtl_reg *r = &rtl_regs[s];
+	u16 mask = 0xffff;
+
+	BUG_ON(s >= ARRAY_SIZE(rtl_regs));
+
+	if (r->bits == 0) /* unimplemented */
+		return 0;
+
+	if (r->shift > 0)
+		val <<= r->shift;
+
+	if (r->inverted)
+		val = ~val;
+
+	if (r->bits != 16) {
+		mask = (1 << r->bits) - 1;
+		mask <<= r->shift;
+	}
+	val &= mask;
+	return rtl_rmw(dev, r->page, r->phy, r->reg, mask, val);
+}
+
+static void
+rtl_phy_save(struct switch_dev *dev, int port, struct rtl_phyregs *regs)
+{
+	regs->nway = rtl_get(dev, RTL_PORT_REG(port, NWAY));
+	regs->speed = rtl_get(dev, RTL_PORT_REG(port, SPEED));
+	regs->duplex = rtl_get(dev, RTL_PORT_REG(port, DUPLEX));
+}
+
+static void
+rtl_phy_restore(struct switch_dev *dev, int port, struct rtl_phyregs *regs)
+{
+	rtl_set(dev, RTL_PORT_REG(port, NWAY), regs->nway);
+	rtl_set(dev, RTL_PORT_REG(port, SPEED), regs->speed);
+	rtl_set(dev, RTL_PORT_REG(port, DUPLEX), regs->duplex);
+}
+
+static void
+rtl_port_set_enable(struct switch_dev *dev, int port, int enabled)
+{
+	rtl_set(dev, RTL_PORT_REG(port, RXEN), enabled);
+	rtl_set(dev, RTL_PORT_REG(port, TXEN), enabled);
+
+	if ((port >= 5) || !enabled)
+		return;
+
+	/* restart autonegotiation if enabled */
+	rtl_set(dev, RTL_PORT_REG(port, NRESTART), 1);
+}
+
+static int
+rtl_hw_apply(struct switch_dev *dev)
+{
+	int i;
+	int trunk_en, trunk_psel;
+	struct rtl_phyregs port5;
+
+	rtl_phy_save(dev, 5, &port5);
+
+	/* disable rx/tx from PHYs */
+	for (i = 0; i < RTL8306_NUM_PORTS - 1; i++) {
+		rtl_port_set_enable(dev, i, 0);
+	}
+
+	/* save trunking status */
+	trunk_en = rtl_get(dev, RTL_REG_EN_TRUNK);
+	trunk_psel = rtl_get(dev, RTL_REG_TRUNK_PORTSEL);
+
+	/* trunk port 3 and 4
+	 * XXX: Big WTF, but RealTek seems to do it */
+	rtl_set(dev, RTL_REG_EN_TRUNK, 1);
+	rtl_set(dev, RTL_REG_TRUNK_PORTSEL, 1);
+
+	/* execute the software reset */
+	rtl_set(dev, RTL_REG_RESET, 1);
+
+	/* wait for the reset to complete,
+	 * but don't wait for too long */
+	for (i = 0; i < 10; i++) {
+		if (rtl_get(dev, RTL_REG_RESET) == 0)
+			break;
+
+		msleep(1);
+	}
+
+	/* enable rx/tx from PHYs */
+	for (i = 0; i < RTL8306_NUM_PORTS - 1; i++) {
+		rtl_port_set_enable(dev, i, 1);
+	}
+
+	/* restore trunking settings */
+	rtl_set(dev, RTL_REG_EN_TRUNK, trunk_en);
+	rtl_set(dev, RTL_REG_TRUNK_PORTSEL, trunk_psel);
+	rtl_phy_restore(dev, 5, &port5);
+
+	rtl_set(dev, RTL_REG_CPU_LINKUP, 1);
+
+	return 0;
+}
+
+static void
+rtl_hw_init(struct switch_dev *dev)
+{
+	struct rtl_priv *priv = to_rtl(dev);
+	int cpu_mask = 1 << dev->cpu_port;
+	int i;
+
+	rtl_set(dev, RTL_REG_VLAN_ENABLE, 0);
+	rtl_set(dev, RTL_REG_VLAN_FILTER, 0);
+	rtl_set(dev, RTL_REG_EN_TRUNK, 0);
+	rtl_set(dev, RTL_REG_TRUNK_PORTSEL, 0);
+
+	/* initialize cpu port settings */
+	if (priv->do_cpu) {
+		rtl_set(dev, RTL_REG_CPUPORT, dev->cpu_port);
+		rtl_set(dev, RTL_REG_EN_CPUPORT, 1);
+	} else {
+		rtl_set(dev, RTL_REG_CPUPORT, 7);
+		rtl_set(dev, RTL_REG_EN_CPUPORT, 0);
+	}
+	rtl_set(dev, RTL_REG_EN_TAG_OUT, 0);
+	rtl_set(dev, RTL_REG_EN_TAG_IN, 0);
+	rtl_set(dev, RTL_REG_EN_TAG_CLR, 0);
+
+	/* reset all vlans */
+	for (i = 0; i < RTL8306_NUM_VLANS; i++) {
+		rtl_set(dev, RTL_VLAN_REG(i, VID), i);
+		rtl_set(dev, RTL_VLAN_REG(i, PORTMASK), 0);
+	}
+
+	/* default to port isolation */
+	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
+		unsigned long mask;
+
+		if ((1 << i) == cpu_mask)
+			mask = ((1 << RTL8306_NUM_PORTS) - 1) & ~cpu_mask; /* all bits set */
+		else
+			mask = cpu_mask | (1 << i);
+
+		rtl_set(dev, RTL_VLAN_REG(i, PORTMASK), mask);
+		rtl_set(dev, RTL_PORT_REG(i, PVID), i);
+		rtl_set(dev, RTL_PORT_REG(i, NULL_VID_REPLACE), 1);
+		rtl_set(dev, RTL_PORT_REG(i, VID_INSERT), 1);
+		rtl_set(dev, RTL_PORT_REG(i, TAG_INSERT), 3);
+	}
+	rtl_hw_apply(dev);
+}
+
+#ifdef DEBUG
+static int
+rtl_set_use_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct rtl_priv *priv = to_rtl(dev);
+	priv->do_cpu = val->value.i;
+	rtl_hw_init(dev);
+	return 0;
+}
+
+static int
+rtl_get_use_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct rtl_priv *priv = to_rtl(dev);
+	val->value.i = priv->do_cpu;
+	return 0;
+}
+
+static int
+rtl_set_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	dev->cpu_port = val->value.i;
+	rtl_hw_init(dev);
+	return 0;
+}
+
+static int
+rtl_get_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	val->value.i = dev->cpu_port;
+	return 0;
+}
+#endif
+
+static int
+rtl_reset(struct switch_dev *dev)
+{
+	rtl_hw_init(dev);
+	return 0;
+}
+
+static int
+rtl_attr_set_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	int idx = attr->id + (val->port_vlan * attr->ofs);
+	struct rtl_phyregs port;
+
+	if (attr->id >= ARRAY_SIZE(rtl_regs))
+		return -EINVAL;
+
+	if ((attr->max > 0) && (val->value.i > attr->max))
+		return -EINVAL;
+
+	/* access to phy register 22 on port 4/5
+	 * needs phy status save/restore */
+	if ((val->port_vlan > 3) &&
+		(rtl_regs[idx].reg == 22) &&
+		(rtl_regs[idx].page == 0)) {
+
+		rtl_phy_save(dev, val->port_vlan, &port);
+		rtl_set(dev, idx, val->value.i);
+		rtl_phy_restore(dev, val->port_vlan, &port);
+	} else {
+		rtl_set(dev, idx, val->value.i);
+	}
+
+	return 0;
+}
+
+static int
+rtl_attr_get_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	int idx = attr->id + (val->port_vlan * attr->ofs);
+
+	if (idx >= ARRAY_SIZE(rtl_regs))
+		return -EINVAL;
+
+	val->value.i = rtl_get(dev, idx);
+	return 0;
+}
+
+static int
+rtl_attr_set_port_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	if (val->port_vlan >= RTL8306_NUM_PORTS)
+		return -EINVAL;
+
+	return rtl_attr_set_int(dev, attr, val);
+}
+
+static int
+rtl_attr_get_port_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	if (val->port_vlan >= RTL8306_NUM_PORTS)
+		return -EINVAL;
+	return rtl_attr_get_int(dev, attr, val);
+}
+
+static int 
+rtl_get_port_link(struct switch_dev *dev, int port, struct switch_port_link *link)
+{
+	if (port >= RTL8306_NUM_PORTS)
+		return -EINVAL;
+
+	link->link = rtl_get(dev, RTL_PORT_REG(port, LINK));
+	if (!link->link)
+		return 0;
+
+	link->duplex = rtl_get(dev, RTL_PORT_REG(port, DUPLEX));
+	link->aneg = rtl_get(dev, RTL_PORT_REG(port, NWAY));
+
+	if (rtl_get(dev, RTL_PORT_REG(port, SPEED)))
+		link->speed = SWITCH_PORT_SPEED_100;
+	else
+		link->speed = SWITCH_PORT_SPEED_10;
+
+	return 0;
+}
+
+static int
+rtl_attr_set_vlan_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	if (val->port_vlan >= dev->vlans)
+		return -EINVAL;
+
+	return rtl_attr_set_int(dev, attr, val);
+}
+
+static int
+rtl_attr_get_vlan_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	if (val->port_vlan >= dev->vlans)
+		return -EINVAL;
+
+	return rtl_attr_get_int(dev, attr, val);
+}
+
+static int
+rtl_get_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	unsigned int i, mask;
+
+	mask = rtl_get(dev, RTL_VLAN_REG(val->port_vlan, PORTMASK));
+	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
+		struct switch_port *port;
+
+		if (!(mask & (1 << i)))
+			continue;
+
+		port = &val->value.ports[val->len];
+		port->id = i;
+		if (rtl_get(dev, RTL_PORT_REG(i, TAG_INSERT)) == 2 || i == dev->cpu_port)
+			port->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
+		val->len++;
+	}
+
+	return 0;
+}
+
+static int
+rtl_set_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	struct rtl_priv *priv = to_rtl(dev);
+	struct rtl_phyregs port;
+	int en = val->value.i;
+	int i;
+
+	rtl_set(dev, RTL_REG_EN_TAG_OUT, en && priv->do_cpu);
+	rtl_set(dev, RTL_REG_EN_TAG_IN, en && priv->do_cpu);
+	rtl_set(dev, RTL_REG_EN_TAG_CLR, en && priv->do_cpu);
+	rtl_set(dev, RTL_REG_VLAN_TAG_AWARE, en);
+	if (en)
+		rtl_set(dev, RTL_REG_VLAN_FILTER, en);
+
+	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
+		if (i > 3)
+			rtl_phy_save(dev, val->port_vlan, &port);
+		rtl_set(dev, RTL_PORT_REG(i, NULL_VID_REPLACE), 1);
+		rtl_set(dev, RTL_PORT_REG(i, VID_INSERT), (en ? (i == dev->cpu_port ? 0 : 1) : 1));
+		rtl_set(dev, RTL_PORT_REG(i, TAG_INSERT), (en ? (i == dev->cpu_port ? 2 : 1) : 3));
+		if (i > 3)
+			rtl_phy_restore(dev, val->port_vlan, &port);
+	}
+	rtl_set(dev, RTL_REG_VLAN_ENABLE, en);
+
+	return 0;
+}
+
+static int
+rtl_get_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
+{
+	val->value.i = rtl_get(dev, RTL_REG_VLAN_ENABLE);
+	return 0;
+}
+
+static int
+rtl_set_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	unsigned int mask = 0;
+	unsigned int oldmask;
+	int i;
+
+	for(i = 0; i < val->len; i++)
+	{
+		struct switch_port *port = &val->value.ports[i];
+		bool tagged = false;
+
+		mask |= (1 << port->id);
+
+		if (port->id == dev->cpu_port)
+			continue;
+
+		if ((i == dev->cpu_port) ||
+			(port->flags & (1 << SWITCH_PORT_FLAG_TAGGED)))
+			tagged = true;
+
+		/* fix up PVIDs for added ports */
+		if (!tagged)
+			rtl_set(dev, RTL_PORT_REG(port->id, PVID), val->port_vlan);
+
+		rtl_set(dev, RTL_PORT_REG(port->id, NON_PVID_DISCARD), (tagged ? 0 : 1));
+		rtl_set(dev, RTL_PORT_REG(port->id, VID_INSERT), (tagged ? 0 : 1));
+		rtl_set(dev, RTL_PORT_REG(port->id, TAG_INSERT), (tagged ? 2 : 1));
+	}
+
+	oldmask = rtl_get(dev, RTL_VLAN_REG(val->port_vlan, PORTMASK));
+	rtl_set(dev, RTL_VLAN_REG(val->port_vlan, PORTMASK), mask);
+
+	/* fix up PVIDs for removed ports, default to last vlan */
+	oldmask &= ~mask;
+	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
+		if (!(oldmask & (1 << i)))
+			continue;
+
+		if (i == dev->cpu_port)
+			continue;
+
+		if (rtl_get(dev, RTL_PORT_REG(i, PVID)) == val->port_vlan)
+			rtl_set(dev, RTL_PORT_REG(i, PVID), dev->vlans - 1);
+	}
+
+	return 0;
+}
+
+static struct switch_attr rtl_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.max = 1,
+		.set = rtl_set_vlan,
+		.get = rtl_get_vlan,
+	},
+	{
+		RTL_GLOBAL_REGATTR(EN_TRUNK),
+		.name = "trunk",
+		.description = "Enable port trunking",
+		.max = 1,
+	},
+	{
+		RTL_GLOBAL_REGATTR(TRUNK_PORTSEL),
+		.name = "trunk_sel",
+		.description = "Select ports for trunking (0: 0,1 - 1: 3,4)",
+		.max = 1,
+	},
+#ifdef DEBUG
+	{
+		RTL_GLOBAL_REGATTR(VLAN_FILTER),
+		.name = "vlan_filter",
+		.description = "Filter incoming packets for allowed VLANS",
+		.max = 1,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "cpuport",
+		.description = "CPU Port",
+		.set = rtl_set_cpuport,
+		.get = rtl_get_cpuport,
+		.max = RTL8306_NUM_PORTS,
+	},
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "use_cpuport",
+		.description = "CPU Port handling flag",
+		.set = rtl_set_use_cpuport,
+		.get = rtl_get_use_cpuport,
+		.max = RTL8306_NUM_PORTS,
+	},
+	{
+		RTL_GLOBAL_REGATTR(TRAP_CPU),
+		.name = "trap_cpu",
+		.description = "VLAN trap to CPU",
+		.max = 1,
+	},
+	{
+		RTL_GLOBAL_REGATTR(VLAN_TAG_AWARE),
+		.name = "vlan_tag_aware",
+		.description = "Enable VLAN tag awareness",
+		.max = 1,
+	},
+	{
+		RTL_GLOBAL_REGATTR(VLAN_TAG_ONLY),
+		.name = "tag_only",
+		.description = "Only accept tagged packets",
+		.max = 1,
+	},
+#endif
+};
+static struct switch_attr rtl_port[] = {
+	{
+		RTL_PORT_REGATTR(PVID),
+		.name = "pvid",
+		.description = "Port VLAN ID",
+		.max = RTL8306_NUM_VLANS - 1,
+	},
+#ifdef DEBUG
+	{
+		RTL_PORT_REGATTR(NULL_VID_REPLACE),
+		.name = "null_vid",
+		.description = "NULL VID gets replaced by port default vid",
+		.max = 1,
+	},
+	{
+		RTL_PORT_REGATTR(NON_PVID_DISCARD),
+		.name = "non_pvid_discard",
+		.description = "discard packets with VID != PVID",
+		.max = 1,
+	},
+	{
+		RTL_PORT_REGATTR(VID_INSERT),
+		.name = "vid_insert_remove",
+		.description = "how should the switch insert and remove vids ?",
+		.max = 3,
+	},
+	{
+		RTL_PORT_REGATTR(TAG_INSERT),
+		.name = "tag_insert",
+		.description = "tag insertion handling",
+		.max = 3,
+	},
+#endif
+};
+
+static struct switch_attr rtl_vlan[] = {
+	{
+		RTL_VLAN_REGATTR(VID),
+		.name = "vid",
+		.description = "VLAN ID (1-4095)",
+		.max = 4095,
+	},
+};
+
+static const struct switch_dev_ops rtl8306_ops = {
+	.attr_global = {
+		.attr = rtl_globals,
+		.n_attr = ARRAY_SIZE(rtl_globals),
+	},
+	.attr_port = {
+		.attr = rtl_port,
+		.n_attr = ARRAY_SIZE(rtl_port),
+	},
+	.attr_vlan = {
+		.attr = rtl_vlan,
+		.n_attr = ARRAY_SIZE(rtl_vlan),
+	},
+
+	.get_vlan_ports = rtl_get_ports,
+	.set_vlan_ports = rtl_set_ports,
+	.apply_config = rtl_hw_apply,
+	.reset_switch = rtl_reset,
+	.get_port_link = rtl_get_port_link,
+};
+
+static int
+rtl8306_config_init(struct phy_device *pdev)
+{
+	struct net_device *netdev = pdev->attached_dev;
+	struct rtl_priv *priv = pdev->priv;
+	struct switch_dev *dev = &priv->dev;
+	struct switch_val val;
+	unsigned int chipid, chipver, chiptype;
+	int err;
+
+	/* Only init the switch for the primary PHY */
+	if (pdev->addr != 0)
+		return 0;
+
+	val.value.i = 1;
+	priv->dev.cpu_port = RTL8306_PORT_CPU;
+	priv->dev.ports = RTL8306_NUM_PORTS;
+	priv->dev.vlans = RTL8306_NUM_VLANS;
+	priv->dev.ops = &rtl8306_ops;
+	priv->do_cpu = 0;
+	priv->page = -1;
+	priv->bus = pdev->bus;
+
+	chipid = rtl_get(dev, RTL_REG_CHIPID);
+	chipver = rtl_get(dev, RTL_REG_CHIPVER);
+	chiptype = rtl_get(dev, RTL_REG_CHIPTYPE);
+	switch(chiptype) {
+	case 0:
+	case 2:
+		strncpy(priv->hwname, RTL_NAME_S, sizeof(priv->hwname));
+		priv->type = RTL_TYPE_S;
+		break;
+	case 1:
+		strncpy(priv->hwname, RTL_NAME_SD, sizeof(priv->hwname));
+		priv->type = RTL_TYPE_SD;
+		break;
+	case 3:
+		strncpy(priv->hwname, RTL_NAME_SDM, sizeof(priv->hwname));
+		priv->type = RTL_TYPE_SDM;
+		break;
+	default:
+		strncpy(priv->hwname, RTL_NAME_UNKNOWN, sizeof(priv->hwname));
+		break;
+	}
+
+	dev->name = priv->hwname;
+	rtl_hw_init(dev);
+
+	printk(KERN_INFO "Registering %s switch with Chip ID: 0x%04x, version: 0x%04x\n", priv->hwname, chipid, chipver);
+
+	err = register_switch(dev, netdev);
+	if (err < 0) {
+		kfree(priv);
+		return err;
+	}
+
+	return 0;
+}
+
+
+static int
+rtl8306_fixup(struct phy_device *pdev)
+{
+	struct rtl_priv priv;
+	u16 chipid;
+
+	/* Attach to primary LAN port and WAN port */
+	if (pdev->addr != 0 && pdev->addr != 4)
+		return 0;
+
+	memset(&priv, 0, sizeof(priv));
+	priv.fixup = true;
+	priv.page = -1;
+	priv.bus = pdev->bus;
+	chipid = rtl_get(&priv.dev, RTL_REG_CHIPID);
+	if (chipid == 0x5988)
+		pdev->phy_id = RTL8306_MAGIC;
+
+	return 0;
+}
+
+static int
+rtl8306_probe(struct phy_device *pdev)
+{
+	struct rtl_priv *priv;
+
+	list_for_each_entry(priv, &phydevs, list) {
+		/*
+		 * share one rtl_priv instance between virtual phy
+		 * devices on the same bus
+		 */
+		if (priv->bus == pdev->bus)
+			goto found;
+	}
+	priv = kzalloc(sizeof(struct rtl_priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	priv->bus = pdev->bus;
+
+found:
+	pdev->priv = priv;
+	return 0;
+}
+
+static void
+rtl8306_remove(struct phy_device *pdev)
+{
+	struct rtl_priv *priv = pdev->priv;
+	unregister_switch(&priv->dev);
+	kfree(priv);
+}
+
+static int
+rtl8306_config_aneg(struct phy_device *pdev)
+{
+	struct rtl_priv *priv = pdev->priv;
+
+	/* Only for WAN */
+	if (pdev->addr == 0)
+		return 0;
+
+	/* Restart autonegotiation */
+	rtl_set(&priv->dev, RTL_PORT_REG(4, NWAY), 1);
+	rtl_set(&priv->dev, RTL_PORT_REG(4, NRESTART), 1);
+
+	return 0;
+}
+
+static int
+rtl8306_read_status(struct phy_device *pdev)
+{
+	struct rtl_priv *priv = pdev->priv;
+	struct switch_dev *dev = &priv->dev;
+
+	if (pdev->addr == 4) {
+		/* WAN */
+		pdev->speed = rtl_get(dev, RTL_PORT_REG(4, SPEED)) ? SPEED_100 : SPEED_10;
+		pdev->duplex = rtl_get(dev, RTL_PORT_REG(4, DUPLEX)) ? DUPLEX_FULL : DUPLEX_HALF;
+		pdev->link = !!rtl_get(dev, RTL_PORT_REG(4, LINK));
+	} else {
+		/* LAN */
+		pdev->speed = SPEED_100;
+		pdev->duplex = DUPLEX_FULL;
+		pdev->link = 1;
+	}
+
+	/*
+	 * Bypass generic PHY status read,
+	 * it doesn't work with this switch
+	 */
+	if (pdev->link) {
+		pdev->state = PHY_RUNNING;
+		netif_carrier_on(pdev->attached_dev);
+		pdev->adjust_link(pdev->attached_dev);
+	} else {
+		pdev->state = PHY_NOLINK;
+		netif_carrier_off(pdev->attached_dev);
+		pdev->adjust_link(pdev->attached_dev);
+	}
+
+	return 0;
+}
+
+
+static struct phy_driver rtl8306_driver = {
+	.name		= "Realtek RTL8306S",
+	.flags		= PHY_HAS_MAGICANEG,
+	.phy_id		= RTL8306_MAGIC,
+	.phy_id_mask	= 0xffffffff,
+	.features	= PHY_BASIC_FEATURES,
+	.probe		= &rtl8306_probe,
+	.remove		= &rtl8306_remove,
+	.config_init	= &rtl8306_config_init,
+	.config_aneg	= &rtl8306_config_aneg,
+	.read_status	= &rtl8306_read_status,
+	.driver		= { .owner = THIS_MODULE,},
+};
+
+
+static int __init
+rtl_init(void)
+{
+	phy_register_fixup_for_id(PHY_ANY_ID, rtl8306_fixup);
+	return phy_driver_register(&rtl8306_driver);
+}
+
+static void __exit
+rtl_exit(void)
+{
+	phy_driver_unregister(&rtl8306_driver);
+}
+
+module_init(rtl_init);
+module_exit(rtl_exit);
+MODULE_LICENSE("GPL");
+
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
new file mode 100644
index 00000000..699234d2
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -0,0 +1,1449 @@
+/*
+ * Realtek RTL8366 SMI interface driver
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/spinlock.h>
+#include <linux/skbuff.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+#include <linux/rtl8366.h>
+
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
+#include <linux/debugfs.h>
+#endif
+
+#include "rtl8366_smi.h"
+
+#define RTL8366_SMI_ACK_RETRY_COUNT         5
+
+#define RTL8366_SMI_HW_STOP_DELAY		25	/* msecs */
+#define RTL8366_SMI_HW_START_DELAY		100	/* msecs */
+
+static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
+{
+	ndelay(smi->clk_delay);
+}
+
+static void rtl8366_smi_start(struct rtl8366_smi *smi)
+{
+	unsigned int sda = smi->gpio_sda;
+	unsigned int sck = smi->gpio_sck;
+
+	/*
+	 * Set GPIO pins to output mode, with initial state:
+	 * SCK = 0, SDA = 1
+	 */
+	gpio_direction_output(sck, 0);
+	gpio_direction_output(sda, 1);
+	rtl8366_smi_clk_delay(smi);
+
+	/* CLK 1: 0 -> 1, 1 -> 0 */
+	gpio_set_value(sck, 1);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sck, 0);
+	rtl8366_smi_clk_delay(smi);
+
+	/* CLK 2: */
+	gpio_set_value(sck, 1);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sda, 0);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sck, 0);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sda, 1);
+}
+
+static void rtl8366_smi_stop(struct rtl8366_smi *smi)
+{
+	unsigned int sda = smi->gpio_sda;
+	unsigned int sck = smi->gpio_sck;
+
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sda, 0);
+	gpio_set_value(sck, 1);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sda, 1);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sck, 1);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sck, 0);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sck, 1);
+
+	/* add a click */
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sck, 0);
+	rtl8366_smi_clk_delay(smi);
+	gpio_set_value(sck, 1);
+
+	/* set GPIO pins to input mode */
+	gpio_direction_input(sda);
+	gpio_direction_input(sck);
+}
+
+static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len)
+{
+	unsigned int sda = smi->gpio_sda;
+	unsigned int sck = smi->gpio_sck;
+
+	for (; len > 0; len--) {
+		rtl8366_smi_clk_delay(smi);
+
+		/* prepare data */
+		gpio_set_value(sda, !!(data & ( 1 << (len - 1))));
+		rtl8366_smi_clk_delay(smi);
+
+		/* clocking */
+		gpio_set_value(sck, 1);
+		rtl8366_smi_clk_delay(smi);
+		gpio_set_value(sck, 0);
+	}
+}
+
+static void rtl8366_smi_read_bits(struct rtl8366_smi *smi, u32 len, u32 *data)
+{
+	unsigned int sda = smi->gpio_sda;
+	unsigned int sck = smi->gpio_sck;
+
+	gpio_direction_input(sda);
+
+	for (*data = 0; len > 0; len--) {
+		u32 u;
+
+		rtl8366_smi_clk_delay(smi);
+
+		/* clocking */
+		gpio_set_value(sck, 1);
+		rtl8366_smi_clk_delay(smi);
+		u = !!gpio_get_value(sda);
+		gpio_set_value(sck, 0);
+
+		*data |= (u << (len - 1));
+	}
+
+	gpio_direction_output(sda, 0);
+}
+
+static int rtl8366_smi_wait_for_ack(struct rtl8366_smi *smi)
+{
+	int retry_cnt;
+
+	retry_cnt = 0;
+	do {
+		u32 ack;
+
+		rtl8366_smi_read_bits(smi, 1, &ack);
+		if (ack == 0)
+			break;
+
+		if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT) {
+			dev_err(smi->parent, "ACK timeout\n");
+			return -ETIMEDOUT;
+		}
+	} while (1);
+
+	return 0;
+}
+
+static int rtl8366_smi_write_byte(struct rtl8366_smi *smi, u8 data)
+{
+	rtl8366_smi_write_bits(smi, data, 8);
+	return rtl8366_smi_wait_for_ack(smi);
+}
+
+static int rtl8366_smi_write_byte_noack(struct rtl8366_smi *smi, u8 data)
+{
+	rtl8366_smi_write_bits(smi, data, 8);
+	return 0;
+}
+
+static int rtl8366_smi_read_byte0(struct rtl8366_smi *smi, u8 *data)
+{
+	u32 t;
+
+	/* read data */
+	rtl8366_smi_read_bits(smi, 8, &t);
+	*data = (t & 0xff);
+
+	/* send an ACK */
+	rtl8366_smi_write_bits(smi, 0x00, 1);
+
+	return 0;
+}
+
+static int rtl8366_smi_read_byte1(struct rtl8366_smi *smi, u8 *data)
+{
+	u32 t;
+
+	/* read data */
+	rtl8366_smi_read_bits(smi, 8, &t);
+	*data = (t & 0xff);
+
+	/* send an ACK */
+	rtl8366_smi_write_bits(smi, 0x01, 1);
+
+	return 0;
+}
+
+int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+{
+	unsigned long flags;
+	u8 lo = 0;
+	u8 hi = 0;
+	int ret;
+
+	spin_lock_irqsave(&smi->lock, flags);
+
+	rtl8366_smi_start(smi);
+
+	/* send READ command */
+	ret = rtl8366_smi_write_byte(smi, smi->cmd_read);
+	if (ret)
+		goto out;
+
+	/* set ADDR[7:0] */
+	ret = rtl8366_smi_write_byte(smi, addr & 0xff);
+	if (ret)
+		goto out;
+
+	/* set ADDR[15:8] */
+	ret = rtl8366_smi_write_byte(smi, addr >> 8);
+	if (ret)
+		goto out;
+
+	/* read DATA[7:0] */
+	rtl8366_smi_read_byte0(smi, &lo);
+	/* read DATA[15:8] */
+	rtl8366_smi_read_byte1(smi, &hi);
+
+	*data = ((u32) lo) | (((u32) hi) << 8);
+
+	ret = 0;
+
+ out:
+	rtl8366_smi_stop(smi);
+	spin_unlock_irqrestore(&smi->lock, flags);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_read_reg);
+
+static int __rtl8366_smi_write_reg(struct rtl8366_smi *smi,
+				   u32 addr, u32 data, bool ack)
+{
+	unsigned long flags;
+	int ret;
+
+	spin_lock_irqsave(&smi->lock, flags);
+
+	rtl8366_smi_start(smi);
+
+	/* send WRITE command */
+	ret = rtl8366_smi_write_byte(smi, smi->cmd_write);
+	if (ret)
+		goto out;
+
+	/* set ADDR[7:0] */
+	ret = rtl8366_smi_write_byte(smi, addr & 0xff);
+	if (ret)
+		goto out;
+
+	/* set ADDR[15:8] */
+	ret = rtl8366_smi_write_byte(smi, addr >> 8);
+	if (ret)
+		goto out;
+
+	/* write DATA[7:0] */
+	ret = rtl8366_smi_write_byte(smi, data & 0xff);
+	if (ret)
+		goto out;
+
+	/* write DATA[15:8] */
+	if (ack)
+		ret = rtl8366_smi_write_byte(smi, data >> 8);
+	else
+		ret = rtl8366_smi_write_byte_noack(smi, data >> 8);
+	if (ret)
+		goto out;
+
+	ret = 0;
+
+ out:
+	rtl8366_smi_stop(smi);
+	spin_unlock_irqrestore(&smi->lock, flags);
+
+	return ret;
+}
+
+int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
+{
+	return __rtl8366_smi_write_reg(smi, addr, data, true);
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg);
+
+int rtl8366_smi_write_reg_noack(struct rtl8366_smi *smi, u32 addr, u32 data)
+{
+	return __rtl8366_smi_write_reg(smi, addr, data, false);
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg_noack);
+
+int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data)
+{
+	u32 t;
+	int err;
+
+	err = rtl8366_smi_read_reg(smi, addr, &t);
+	if (err)
+		return err;
+
+	err = rtl8366_smi_write_reg(smi, addr, (t & ~mask) | data);
+	return err;
+
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_rmwr);
+
+static int rtl8366_reset(struct rtl8366_smi *smi)
+{
+	if (smi->hw_reset) {
+		smi->hw_reset(true);
+		msleep(RTL8366_SMI_HW_STOP_DELAY);
+		smi->hw_reset(false);
+		msleep(RTL8366_SMI_HW_START_DELAY);
+		return 0;
+	}
+
+	return smi->ops->reset_chip(smi);
+}
+
+static int rtl8366_mc_is_used(struct rtl8366_smi *smi, int mc_index, int *used)
+{
+	int err;
+	int i;
+
+	*used = 0;
+	for (i = 0; i < smi->num_ports; i++) {
+		int index = 0;
+
+		err = smi->ops->get_mc_index(smi, i, &index);
+		if (err)
+			return err;
+
+		if (mc_index == index) {
+			*used = 1;
+			break;
+		}
+	}
+
+	return 0;
+}
+
+static int rtl8366_set_vlan(struct rtl8366_smi *smi, int vid, u32 member,
+			    u32 untag, u32 fid)
+{
+	struct rtl8366_vlan_4k vlan4k;
+	int err;
+	int i;
+
+	/* Update the 4K table */
+	err = smi->ops->get_vlan_4k(smi, vid, &vlan4k);
+	if (err)
+		return err;
+
+	vlan4k.member = member;
+	vlan4k.untag = untag;
+	vlan4k.fid = fid;
+	err = smi->ops->set_vlan_4k(smi, &vlan4k);
+	if (err)
+		return err;
+
+	/* Try to find an existing MC entry for this VID */
+	for (i = 0; i < smi->num_vlan_mc; i++) {
+		struct rtl8366_vlan_mc vlanmc;
+
+		err = smi->ops->get_vlan_mc(smi, i, &vlanmc);
+		if (err)
+			return err;
+
+		if (vid == vlanmc.vid) {
+			/* update the MC entry */
+			vlanmc.member = member;
+			vlanmc.untag = untag;
+			vlanmc.fid = fid;
+
+			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
+			break;
+		}
+	}
+
+	return err;
+}
+
+static int rtl8366_get_pvid(struct rtl8366_smi *smi, int port, int *val)
+{
+	struct rtl8366_vlan_mc vlanmc;
+	int err;
+	int index;
+
+	err = smi->ops->get_mc_index(smi, port, &index);
+	if (err)
+		return err;
+
+	err = smi->ops->get_vlan_mc(smi, index, &vlanmc);
+	if (err)
+		return err;
+
+	*val = vlanmc.vid;
+	return 0;
+}
+
+static int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port,
+			    unsigned vid)
+{
+	struct rtl8366_vlan_mc vlanmc;
+	struct rtl8366_vlan_4k vlan4k;
+	int err;
+	int i;
+
+	/* Try to find an existing MC entry for this VID */
+	for (i = 0; i < smi->num_vlan_mc; i++) {
+		err = smi->ops->get_vlan_mc(smi, i, &vlanmc);
+		if (err)
+			return err;
+
+		if (vid == vlanmc.vid) {
+			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
+			if (err)
+				return err;
+
+			err = smi->ops->set_mc_index(smi, port, i);
+			return err;
+		}
+	}
+
+	/* We have no MC entry for this VID, try to find an empty one */
+	for (i = 0; i < smi->num_vlan_mc; i++) {
+		err = smi->ops->get_vlan_mc(smi, i, &vlanmc);
+		if (err)
+			return err;
+
+		if (vlanmc.vid == 0 && vlanmc.member == 0) {
+			/* Update the entry from the 4K table */
+			err = smi->ops->get_vlan_4k(smi, vid, &vlan4k);
+			if (err)
+				return err;
+
+			vlanmc.vid = vid;
+			vlanmc.member = vlan4k.member;
+			vlanmc.untag = vlan4k.untag;
+			vlanmc.fid = vlan4k.fid;
+			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
+			if (err)
+				return err;
+
+			err = smi->ops->set_mc_index(smi, port, i);
+			return err;
+		}
+	}
+
+	/* MC table is full, try to find an unused entry and replace it */
+	for (i = 0; i < smi->num_vlan_mc; i++) {
+		int used;
+
+		err = rtl8366_mc_is_used(smi, i, &used);
+		if (err)
+			return err;
+
+		if (!used) {
+			/* Update the entry from the 4K table */
+			err = smi->ops->get_vlan_4k(smi, vid, &vlan4k);
+			if (err)
+				return err;
+
+			vlanmc.vid = vid;
+			vlanmc.member = vlan4k.member;
+			vlanmc.untag = vlan4k.untag;
+			vlanmc.fid = vlan4k.fid;
+			err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
+			if (err)
+				return err;
+
+			err = smi->ops->set_mc_index(smi, port, i);
+			return err;
+		}
+	}
+
+	dev_err(smi->parent,
+		"all VLAN member configurations are in use\n");
+
+	return -ENOSPC;
+}
+
+int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
+{
+	int err;
+
+	err = smi->ops->enable_vlan(smi, enable);
+	if (err)
+		return err;
+
+	smi->vlan_enabled = enable;
+
+	if (!enable) {
+		smi->vlan4k_enabled = 0;
+		err = smi->ops->enable_vlan4k(smi, enable);
+	}
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);
+
+static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+{
+	int err;
+
+	if (enable) {
+		err = smi->ops->enable_vlan(smi, enable);
+		if (err)
+			return err;
+
+		smi->vlan_enabled = enable;
+	}
+
+	err = smi->ops->enable_vlan4k(smi, enable);
+	if (err)
+		return err;
+
+	smi->vlan4k_enabled = enable;
+	return 0;
+}
+
+int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable)
+{
+	int port;
+	int err;
+
+	for (port = 0; port < smi->num_ports; port++) {
+		err = smi->ops->enable_port(smi, port, enable);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_enable_all_ports);
+
+int rtl8366_reset_vlan(struct rtl8366_smi *smi)
+{
+	struct rtl8366_vlan_mc vlanmc;
+	int err;
+	int i;
+
+	rtl8366_enable_vlan(smi, 0);
+	rtl8366_enable_vlan4k(smi, 0);
+
+	/* clear VLAN member configurations */
+	vlanmc.vid = 0;
+	vlanmc.priority = 0;
+	vlanmc.member = 0;
+	vlanmc.untag = 0;
+	vlanmc.fid = 0;
+	for (i = 0; i < smi->num_vlan_mc; i++) {
+		err = smi->ops->set_vlan_mc(smi, i, &vlanmc);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);
+
+static int rtl8366_init_vlan(struct rtl8366_smi *smi)
+{
+	int port;
+	int err;
+
+	err = rtl8366_reset_vlan(smi);
+	if (err)
+		return err;
+
+	for (port = 0; port < smi->num_ports; port++) {
+		u32 mask;
+
+		if (port == smi->cpu_port)
+			mask = (1 << smi->num_ports) - 1;
+		else
+			mask = (1 << port) | (1 << smi->cpu_port);
+
+		err = rtl8366_set_vlan(smi, (port + 1), mask, mask, 0);
+		if (err)
+			return err;
+
+		err = rtl8366_set_pvid(smi, port, (port + 1));
+		if (err)
+			return err;
+	}
+
+	return rtl8366_enable_vlan(smi, 1);
+}
+
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
+int rtl8366_debugfs_open(struct inode *inode, struct file *file)
+{
+	file->private_data = inode->i_private;
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_debugfs_open);
+
+static ssize_t rtl8366_read_debugfs_vlan_mc(struct file *file,
+					      char __user *user_buf,
+					      size_t count, loff_t *ppos)
+{
+	struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+	int i, len = 0;
+	char *buf = smi->buf;
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
+			"%2s %6s %4s %6s %6s %3s\n",
+			"id", "vid","prio", "member", "untag", "fid");
+
+	for (i = 0; i < smi->num_vlan_mc; ++i) {
+		struct rtl8366_vlan_mc vlanmc;
+
+		smi->ops->get_vlan_mc(smi, i, &vlanmc);
+
+		len += snprintf(buf + len, sizeof(smi->buf) - len,
+				"%2d %6d %4d 0x%04x 0x%04x %3d\n",
+				i, vlanmc.vid, vlanmc.priority,
+				vlanmc.member, vlanmc.untag, vlanmc.fid);
+	}
+
+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+#define RTL8366_VLAN4K_PAGE_SIZE	64
+#define RTL8366_VLAN4K_NUM_PAGES	(4096 / RTL8366_VLAN4K_PAGE_SIZE)
+
+static ssize_t rtl8366_read_debugfs_vlan_4k(struct file *file,
+					    char __user *user_buf,
+					    size_t count, loff_t *ppos)
+{
+	struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+	int i, len = 0;
+	int offset;
+	char *buf = smi->buf;
+
+	if (smi->dbg_vlan_4k_page >= RTL8366_VLAN4K_NUM_PAGES) {
+		len += snprintf(buf + len, sizeof(smi->buf) - len,
+				"invalid page: %u\n", smi->dbg_vlan_4k_page);
+		return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+	}
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
+			"%4s %6s %6s %3s\n",
+			"vid", "member", "untag", "fid");
+
+	offset = RTL8366_VLAN4K_PAGE_SIZE * smi->dbg_vlan_4k_page;
+	for (i = 0; i < RTL8366_VLAN4K_PAGE_SIZE; i++) {
+		struct rtl8366_vlan_4k vlan4k;
+
+		smi->ops->get_vlan_4k(smi, offset + i, &vlan4k);
+
+		len += snprintf(buf + len, sizeof(smi->buf) - len,
+				"%4d 0x%04x 0x%04x %3d\n",
+				vlan4k.vid, vlan4k.member,
+				vlan4k.untag, vlan4k.fid);
+	}
+
+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t rtl8366_read_debugfs_pvid(struct file *file,
+					 char __user *user_buf,
+					 size_t count, loff_t *ppos)
+{
+	struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+	char *buf = smi->buf;
+	int len = 0;
+	int i;
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len, "%4s %4s\n",
+			"port", "pvid");
+
+	for (i = 0; i < smi->num_ports; i++) {
+		int pvid;
+		int err;
+
+		err = rtl8366_get_pvid(smi, i, &pvid);
+		if (err)
+			len += snprintf(buf + len, sizeof(smi->buf) - len,
+				"%4d error\n", i);
+		else
+			len += snprintf(buf + len, sizeof(smi->buf) - len,
+				"%4d %4d\n", i, pvid);
+	}
+
+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t rtl8366_read_debugfs_reg(struct file *file,
+					 char __user *user_buf,
+					 size_t count, loff_t *ppos)
+{
+	struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+	u32 t, reg = smi->dbg_reg;
+	int err, len = 0;
+	char *buf = smi->buf;
+
+	memset(buf, '\0', sizeof(smi->buf));
+
+	err = rtl8366_smi_read_reg(smi, reg, &t);
+	if (err) {
+		len += snprintf(buf, sizeof(smi->buf),
+				"Read failed (reg: 0x%04x)\n", reg);
+		return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+	}
+
+	len += snprintf(buf, sizeof(smi->buf), "reg = 0x%04x, val = 0x%04x\n",
+			reg, t);
+
+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t rtl8366_write_debugfs_reg(struct file *file,
+					  const char __user *user_buf,
+					  size_t count, loff_t *ppos)
+{
+	struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+	unsigned long data;
+	u32 reg = smi->dbg_reg;
+	int err;
+	size_t len;
+	char *buf = smi->buf;
+
+	len = min(count, sizeof(smi->buf) - 1);
+	if (copy_from_user(buf, user_buf, len)) {
+		dev_err(smi->parent, "copy from user failed\n");
+		return -EFAULT;
+	}
+
+	buf[len] = '\0';
+	if (len > 0 && buf[len - 1] == '\n')
+		buf[len - 1] = '\0';
+
+
+	if (kstrtoul(buf, 16, &data)) {
+		dev_err(smi->parent, "Invalid reg value %s\n", buf);
+	} else {
+		err = rtl8366_smi_write_reg(smi, reg, data);
+		if (err) {
+			dev_err(smi->parent,
+				"writing reg 0x%04x val 0x%04lx failed\n",
+				reg, data);
+		}
+	}
+
+	return count;
+}
+
+static ssize_t rtl8366_read_debugfs_mibs(struct file *file,
+					 char __user *user_buf,
+					 size_t count, loff_t *ppos)
+{
+	struct rtl8366_smi *smi = file->private_data;
+	int i, j, len = 0;
+	char *buf = smi->buf;
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len, "%-36s",
+			"Counter");
+
+	for (i = 0; i < smi->num_ports; i++) {
+		char port_buf[10];
+
+		snprintf(port_buf, sizeof(port_buf), "Port %d", i);
+		len += snprintf(buf + len, sizeof(smi->buf) - len, " %12s",
+				port_buf);
+	}
+	len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
+
+	for (i = 0; i < smi->num_mib_counters; i++) {
+		len += snprintf(buf + len, sizeof(smi->buf) - len, "%-36s ",
+				smi->mib_counters[i].name);
+		for (j = 0; j < smi->num_ports; j++) {
+			unsigned long long counter = 0;
+
+			if (!smi->ops->get_mib_counter(smi, i, j, &counter))
+				len += snprintf(buf + len,
+						sizeof(smi->buf) - len,
+						"%12llu ", counter);
+			else
+				len += snprintf(buf + len,
+						sizeof(smi->buf) - len,
+						"%12s ", "error");
+		}
+		len += snprintf(buf + len, sizeof(smi->buf) - len, "\n");
+	}
+
+	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static const struct file_operations fops_rtl8366_regs = {
+	.read	= rtl8366_read_debugfs_reg,
+	.write	= rtl8366_write_debugfs_reg,
+	.open	= rtl8366_debugfs_open,
+	.owner	= THIS_MODULE
+};
+
+static const struct file_operations fops_rtl8366_vlan_mc = {
+	.read	= rtl8366_read_debugfs_vlan_mc,
+	.open	= rtl8366_debugfs_open,
+	.owner	= THIS_MODULE
+};
+
+static const struct file_operations fops_rtl8366_vlan_4k = {
+	.read	= rtl8366_read_debugfs_vlan_4k,
+	.open	= rtl8366_debugfs_open,
+	.owner	= THIS_MODULE
+};
+
+static const struct file_operations fops_rtl8366_pvid = {
+	.read	= rtl8366_read_debugfs_pvid,
+	.open	= rtl8366_debugfs_open,
+	.owner	= THIS_MODULE
+};
+
+static const struct file_operations fops_rtl8366_mibs = {
+	.read = rtl8366_read_debugfs_mibs,
+	.open = rtl8366_debugfs_open,
+	.owner = THIS_MODULE
+};
+
+static void rtl8366_debugfs_init(struct rtl8366_smi *smi)
+{
+	struct dentry *node;
+	struct dentry *root;
+
+	if (!smi->debugfs_root)
+		smi->debugfs_root = debugfs_create_dir(dev_name(smi->parent),
+						       NULL);
+
+	if (!smi->debugfs_root) {
+		dev_err(smi->parent, "Unable to create debugfs dir\n");
+		return;
+	}
+	root = smi->debugfs_root;
+
+	node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root,
+				  &smi->dbg_reg);
+	if (!node) {
+		dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+			"reg");
+		return;
+	}
+
+	node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, smi,
+				   &fops_rtl8366_regs);
+	if (!node) {
+		dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+			"val");
+		return;
+	}
+
+	node = debugfs_create_file("vlan_mc", S_IRUSR, root, smi,
+				   &fops_rtl8366_vlan_mc);
+	if (!node) {
+		dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+			"vlan_mc");
+		return;
+	}
+
+	node = debugfs_create_u8("vlan_4k_page", S_IRUGO | S_IWUSR, root,
+				  &smi->dbg_vlan_4k_page);
+	if (!node) {
+		dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+			"vlan_4k_page");
+		return;
+	}
+
+	node = debugfs_create_file("vlan_4k", S_IRUSR, root, smi,
+				   &fops_rtl8366_vlan_4k);
+	if (!node) {
+		dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+			"vlan_4k");
+		return;
+	}
+
+	node = debugfs_create_file("pvid", S_IRUSR, root, smi,
+				   &fops_rtl8366_pvid);
+	if (!node) {
+		dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+			"pvid");
+		return;
+	}
+
+	node = debugfs_create_file("mibs", S_IRUSR, smi->debugfs_root, smi,
+				   &fops_rtl8366_mibs);
+	if (!node)
+		dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+			"mibs");
+}
+
+static void rtl8366_debugfs_remove(struct rtl8366_smi *smi)
+{
+	if (smi->debugfs_root) {
+		debugfs_remove_recursive(smi->debugfs_root);
+		smi->debugfs_root = NULL;
+	}
+}
+#else
+static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {}
+static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
+#endif /* CONFIG_RTL8366_SMI_DEBUG_FS */
+
+static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
+{
+	int ret;
+	int i;
+
+	smi->mii_bus = mdiobus_alloc();
+	if (smi->mii_bus == NULL) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	smi->mii_bus->priv = (void *) smi;
+	smi->mii_bus->name = dev_name(smi->parent);
+	smi->mii_bus->read = smi->ops->mii_read;
+	smi->mii_bus->write = smi->ops->mii_write;
+	snprintf(smi->mii_bus->id, MII_BUS_ID_SIZE, "%s",
+		 dev_name(smi->parent));
+	smi->mii_bus->parent = smi->parent;
+	smi->mii_bus->phy_mask = ~(0x1f);
+	smi->mii_bus->irq = smi->mii_irq;
+	for (i = 0; i < PHY_MAX_ADDR; i++)
+		smi->mii_irq[i] = PHY_POLL;
+
+	ret = mdiobus_register(smi->mii_bus);
+	if (ret)
+		goto err_free;
+
+	return 0;
+
+ err_free:
+	mdiobus_free(smi->mii_bus);
+ err:
+	return ret;
+}
+
+static void rtl8366_smi_mii_cleanup(struct rtl8366_smi *smi)
+{
+	mdiobus_unregister(smi->mii_bus);
+	mdiobus_free(smi->mii_bus);
+}
+
+int rtl8366_sw_reset_switch(struct switch_dev *dev)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	int err;
+
+	err = rtl8366_reset(smi);
+	if (err)
+		return err;
+
+	err = smi->ops->setup(smi);
+	if (err)
+		return err;
+
+	err = rtl8366_reset_vlan(smi);
+	if (err)
+		return err;
+
+	err = rtl8366_enable_vlan(smi, 1);
+	if (err)
+		return err;
+
+	return rtl8366_enable_all_ports(smi, 1);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_reset_switch);
+
+int rtl8366_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	return rtl8366_get_pvid(smi, port, val);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_port_pvid);
+
+int rtl8366_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	return rtl8366_set_pvid(smi, port, val);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_set_port_pvid);
+
+int rtl8366_sw_get_port_mib(struct switch_dev *dev,
+			    const struct switch_attr *attr,
+			    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	int i, len = 0;
+	unsigned long long counter = 0;
+	char *buf = smi->buf;
+
+	if (val->port_vlan >= smi->num_ports)
+		return -EINVAL;
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
+			"Port %d MIB counters\n",
+			val->port_vlan);
+
+	for (i = 0; i < smi->num_mib_counters; ++i) {
+		len += snprintf(buf + len, sizeof(smi->buf) - len,
+				"%-36s: ", smi->mib_counters[i].name);
+		if (!smi->ops->get_mib_counter(smi, i, val->port_vlan,
+					       &counter))
+			len += snprintf(buf + len, sizeof(smi->buf) - len,
+					"%llu\n", counter);
+		else
+			len += snprintf(buf + len, sizeof(smi->buf) - len,
+					"%s\n", "error");
+	}
+
+	val->value.s = buf;
+	val->len = len;
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_port_mib);
+
+int rtl8366_sw_get_vlan_info(struct switch_dev *dev,
+			     const struct switch_attr *attr,
+			     struct switch_val *val)
+{
+	int i;
+	u32 len = 0;
+	struct rtl8366_vlan_4k vlan4k;
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	char *buf = smi->buf;
+	int err;
+
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+		return -EINVAL;
+
+	memset(buf, '\0', sizeof(smi->buf));
+
+	err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+	if (err)
+		return err;
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
+			"VLAN %d: Ports: '", vlan4k.vid);
+
+	for (i = 0; i < smi->num_ports; i++) {
+		if (!(vlan4k.member & (1 << i)))
+			continue;
+
+		len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i,
+				(vlan4k.untag & (1 << i)) ? "" : "t");
+	}
+
+	len += snprintf(buf + len, sizeof(smi->buf) - len,
+			"', members=%04x, untag=%04x, fid=%u",
+			vlan4k.member, vlan4k.untag, vlan4k.fid);
+
+	val->value.s = buf;
+	val->len = len;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_info);
+
+int rtl8366_sw_get_vlan_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	struct switch_port *port;
+	struct rtl8366_vlan_4k vlan4k;
+	int i;
+
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+		return -EINVAL;
+
+	smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+
+	port = &val->value.ports[0];
+	val->len = 0;
+	for (i = 0; i < smi->num_ports; i++) {
+		if (!(vlan4k.member & BIT(i)))
+			continue;
+
+		port->id = i;
+		port->flags = (vlan4k.untag & BIT(i)) ?
+					0 : BIT(SWITCH_PORT_FLAG_TAGGED);
+		val->len++;
+		port++;
+	}
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_ports);
+
+int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	struct switch_port *port;
+	u32 member = 0;
+	u32 untag = 0;
+	int err;
+	int i;
+
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+		return -EINVAL;
+
+	port = &val->value.ports[0];
+	for (i = 0; i < val->len; i++, port++) {
+		int pvid = 0;
+		member |= BIT(port->id);
+
+		if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
+			untag |= BIT(port->id);
+
+		/*
+		 * To ensure that we have a valid MC entry for this VLAN,
+		 * initialize the port VLAN ID here.
+		 */
+		err = rtl8366_get_pvid(smi, port->id, &pvid);
+		if (err < 0)
+			return err;
+		if (pvid == 0) {
+			err = rtl8366_set_pvid(smi, port->id, val->port_vlan);
+			if (err < 0)
+				return err;
+		}
+	}
+
+	return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_ports);
+
+int rtl8366_sw_get_vlan_fid(struct switch_dev *dev,
+			    const struct switch_attr *attr,
+			    struct switch_val *val)
+{
+	struct rtl8366_vlan_4k vlan4k;
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	int err;
+
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+		return -EINVAL;
+
+	err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+	if (err)
+		return err;
+
+	val->value.i = vlan4k.fid;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_fid);
+
+int rtl8366_sw_set_vlan_fid(struct switch_dev *dev,
+			    const struct switch_attr *attr,
+			    struct switch_val *val)
+{
+	struct rtl8366_vlan_4k vlan4k;
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	int err;
+
+	if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+		return -EINVAL;
+
+	if (val->value.i < 0 || val->value.i > attr->max)
+		return -EINVAL;
+
+	err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+	if (err)
+		return err;
+
+	return rtl8366_set_vlan(smi, val->port_vlan,
+				vlan4k.member,
+				vlan4k.untag,
+				val->value.i);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_fid);
+
+int rtl8366_sw_get_vlan_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	if (attr->ofs > 2)
+		return -EINVAL;
+
+	if (attr->ofs == 1)
+		val->value.i = smi->vlan_enabled;
+	else
+		val->value.i = smi->vlan4k_enabled;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_enable);
+
+int rtl8366_sw_set_vlan_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	int err;
+
+	if (attr->ofs > 2)
+		return -EINVAL;
+
+	if (attr->ofs == 1)
+		err = rtl8366_enable_vlan(smi, val->value.i);
+	else
+		err = rtl8366_enable_vlan4k(smi, val->value.i);
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_enable);
+
+struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent)
+{
+	struct rtl8366_smi *smi;
+
+	BUG_ON(!parent);
+
+	smi = kzalloc(sizeof(*smi), GFP_KERNEL);
+	if (!smi) {
+		dev_err(parent, "no memory for private data\n");
+		return NULL;
+	}
+
+	smi->parent = parent;
+	return smi;
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_alloc);
+
+static int __rtl8366_smi_init(struct rtl8366_smi *smi, const char *name)
+{
+	int err;
+
+	err = gpio_request(smi->gpio_sda, name);
+	if (err) {
+		printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
+			smi->gpio_sda, err);
+		goto err_out;
+	}
+
+	err = gpio_request(smi->gpio_sck, name);
+	if (err) {
+		printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
+			smi->gpio_sck, err);
+		goto err_free_sda;
+	}
+
+	spin_lock_init(&smi->lock);
+
+	/* start the switch */
+	if (smi->hw_reset) {
+		smi->hw_reset(false);
+		msleep(RTL8366_SMI_HW_START_DELAY);
+	}
+
+	return 0;
+
+ err_free_sda:
+	gpio_free(smi->gpio_sda);
+ err_out:
+	return err;
+}
+
+static void __rtl8366_smi_cleanup(struct rtl8366_smi *smi)
+{
+	if (smi->hw_reset)
+		smi->hw_reset(true);
+
+	gpio_free(smi->gpio_sck);
+	gpio_free(smi->gpio_sda);
+}
+
+enum rtl8366_type rtl8366_smi_detect(struct rtl8366_platform_data *pdata)
+{
+	static struct rtl8366_smi smi;
+	enum rtl8366_type type = RTL8366_TYPE_UNKNOWN;
+	u32 reg = 0;
+
+	memset(&smi, 0, sizeof(smi));
+	smi.gpio_sda = pdata->gpio_sda;
+	smi.gpio_sck = pdata->gpio_sck;
+	smi.clk_delay = 10;
+	smi.cmd_read  = 0xa9;
+	smi.cmd_write = 0xa8;
+
+	if (__rtl8366_smi_init(&smi, "rtl8366"))
+		goto out;
+
+	if (rtl8366_smi_read_reg(&smi, 0x5c, &reg))
+		goto cleanup;
+
+	switch(reg) {
+	case 0x6027:
+		printk("Found an RTL8366S switch\n");
+		type = RTL8366_TYPE_S;
+		break;
+	case 0x5937:
+		printk("Found an RTL8366RB switch\n");
+		type = RTL8366_TYPE_RB;
+		break;
+	default:
+		printk("Found an Unknown RTL8366 switch (id=0x%04x)\n", reg);
+		break;
+	}
+
+cleanup:
+	__rtl8366_smi_cleanup(&smi);
+out:
+	return type;
+}
+
+int rtl8366_smi_init(struct rtl8366_smi *smi)
+{
+	int err;
+
+	if (!smi->ops)
+		return -EINVAL;
+
+	err = __rtl8366_smi_init(smi, dev_name(smi->parent));
+	if (err)
+		goto err_out;
+
+	dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
+		 smi->gpio_sda, smi->gpio_sck);
+
+	err = smi->ops->detect(smi);
+	if (err) {
+		dev_err(smi->parent, "chip detection failed, err=%d\n", err);
+		goto err_free_sck;
+	}
+
+	err = rtl8366_reset(smi);
+	if (err)
+		goto err_free_sck;
+
+	err = smi->ops->setup(smi);
+	if (err) {
+		dev_err(smi->parent, "chip setup failed, err=%d\n", err);
+		goto err_free_sck;
+	}
+
+	err = rtl8366_init_vlan(smi);
+	if (err) {
+		dev_err(smi->parent, "VLAN initialization failed, err=%d\n",
+			err);
+		goto err_free_sck;
+	}
+
+	err = rtl8366_enable_all_ports(smi, 1);
+	if (err)
+		goto err_free_sck;
+
+	err = rtl8366_smi_mii_init(smi);
+	if (err)
+		goto err_free_sck;
+
+	rtl8366_debugfs_init(smi);
+
+	return 0;
+
+ err_free_sck:
+	__rtl8366_smi_cleanup(smi);
+ err_out:
+	return err;
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_init);
+
+void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
+{
+	rtl8366_debugfs_remove(smi);
+	rtl8366_smi_mii_cleanup(smi);
+	__rtl8366_smi_cleanup(smi);
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_cleanup);
+
+#ifdef CONFIG_OF
+int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
+{
+	int sck = of_get_named_gpio(pdev->dev.of_node, "gpio-sck", 0);
+	int sda = of_get_named_gpio(pdev->dev.of_node, "gpio-sda", 0);
+
+	if (!gpio_is_valid(sck) || !gpio_is_valid(sda)) {
+		dev_err(&pdev->dev, "gpios missing in devictree\n");
+		return -EINVAL;
+	}
+
+	smi->gpio_sda = sda;
+	smi->gpio_sck = sck;
+
+	return 0;
+}
+#else
+static inline int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
+{
+	return -ENODEV;
+}
+#endif
+
+int rtl8366_smi_probe_plat(struct platform_device *pdev, struct rtl8366_smi *smi)
+{
+	struct rtl8366_platform_data *pdata = pdev->dev.platform_data;
+
+	if (!pdev->dev.platform_data) {
+		dev_err(&pdev->dev, "no platform data specified\n");
+		return -EINVAL;
+	}
+
+	smi->gpio_sda = pdata->gpio_sda;
+	smi->gpio_sck = pdata->gpio_sck;
+	smi->hw_reset = pdata->hw_reset;
+
+	return 0;
+}
+
+
+struct rtl8366_smi *rtl8366_smi_probe(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi;
+	int err;
+
+	smi = rtl8366_smi_alloc(&pdev->dev);
+	if (!smi)
+		return NULL;
+
+	if (pdev->dev.of_node)
+		err = rtl8366_smi_probe_of(pdev, smi);
+	else
+		err = rtl8366_smi_probe_plat(pdev, smi);
+
+	if (err)
+		goto free_smi;
+
+	return smi;
+
+free_smi:
+	kfree(smi);
+	return NULL;
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_probe);
+
+MODULE_DESCRIPTION("Realtek RTL8366 SMI interface driver");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
new file mode 100644
index 00000000..bd41385b
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -0,0 +1,152 @@
+/*
+ * Realtek RTL8366 SMI interface driver defines
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _RTL8366_SMI_H
+#define _RTL8366_SMI_H
+
+#include <linux/phy.h>
+#include <linux/switch.h>
+#include <linux/platform_device.h>
+
+struct rtl8366_smi_ops;
+struct rtl8366_vlan_ops;
+struct mii_bus;
+struct dentry;
+struct inode;
+struct file;
+
+struct rtl8366_mib_counter {
+	unsigned	base;
+	unsigned	offset;
+	unsigned	length;
+	const char	*name;
+};
+
+struct rtl8366_smi {
+	struct device		*parent;
+	unsigned int		gpio_sda;
+	unsigned int		gpio_sck;
+	void			(*hw_reset)(bool active);
+	unsigned int		clk_delay;	/* ns */
+	u8			cmd_read;
+	u8			cmd_write;
+	spinlock_t		lock;
+	struct mii_bus		*mii_bus;
+	int			mii_irq[PHY_MAX_ADDR];
+	struct switch_dev	sw_dev;
+
+	unsigned int		cpu_port;
+	unsigned int		num_ports;
+	unsigned int		num_vlan_mc;
+	unsigned int		num_mib_counters;
+	struct rtl8366_mib_counter *mib_counters;
+
+	struct rtl8366_smi_ops	*ops;
+
+	int			vlan_enabled;
+	int			vlan4k_enabled;
+
+	char			buf[4096];
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
+	struct dentry           *debugfs_root;
+	u16			dbg_reg;
+	u8			dbg_vlan_4k_page;
+#endif
+};
+
+struct rtl8366_vlan_mc {
+	u16	vid;
+	u16	untag;
+	u16	member;
+	u8	fid;
+	u8	priority;
+};
+
+struct rtl8366_vlan_4k {
+	u16	vid;
+	u16	untag;
+	u16	member;
+	u8	fid;
+};
+
+struct rtl8366_smi_ops {
+	int	(*detect)(struct rtl8366_smi *smi);
+	int	(*reset_chip)(struct rtl8366_smi *smi);
+	int	(*setup)(struct rtl8366_smi *smi);
+
+	int	(*mii_read)(struct mii_bus *bus, int addr, int reg);
+	int	(*mii_write)(struct mii_bus *bus, int addr, int reg, u16 val);
+
+	int	(*get_vlan_mc)(struct rtl8366_smi *smi, u32 index,
+			       struct rtl8366_vlan_mc *vlanmc);
+	int	(*set_vlan_mc)(struct rtl8366_smi *smi, u32 index,
+			       const struct rtl8366_vlan_mc *vlanmc);
+	int	(*get_vlan_4k)(struct rtl8366_smi *smi, u32 vid,
+			       struct rtl8366_vlan_4k *vlan4k);
+	int	(*set_vlan_4k)(struct rtl8366_smi *smi,
+			       const struct rtl8366_vlan_4k *vlan4k);
+	int	(*get_mc_index)(struct rtl8366_smi *smi, int port, int *val);
+	int	(*set_mc_index)(struct rtl8366_smi *smi, int port, int index);
+	int	(*get_mib_counter)(struct rtl8366_smi *smi, int counter,
+				   int port, unsigned long long *val);
+	int	(*is_vlan_valid)(struct rtl8366_smi *smi, unsigned vlan);
+	int	(*enable_vlan)(struct rtl8366_smi *smi, int enable);
+	int	(*enable_vlan4k)(struct rtl8366_smi *smi, int enable);
+	int	(*enable_port)(struct rtl8366_smi *smi, int port, int enable);
+};
+
+struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent);
+int rtl8366_smi_init(struct rtl8366_smi *smi);
+void rtl8366_smi_cleanup(struct rtl8366_smi *smi);
+int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data);
+int rtl8366_smi_write_reg_noack(struct rtl8366_smi *smi, u32 addr, u32 data);
+int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data);
+int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data);
+
+int rtl8366_reset_vlan(struct rtl8366_smi *smi);
+int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable);
+int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);
+
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
+int rtl8366_debugfs_open(struct inode *inode, struct file *file);
+#endif
+
+static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
+{
+	return container_of(sw, struct rtl8366_smi, sw_dev);
+}
+
+int rtl8366_sw_reset_switch(struct switch_dev *dev);
+int rtl8366_sw_get_port_pvid(struct switch_dev *dev, int port, int *val);
+int rtl8366_sw_set_port_pvid(struct switch_dev *dev, int port, int val);
+int rtl8366_sw_get_port_mib(struct switch_dev *dev,
+			    const struct switch_attr *attr,
+			    struct switch_val *val);
+int rtl8366_sw_get_vlan_info(struct switch_dev *dev,
+			     const struct switch_attr *attr,
+			     struct switch_val *val);
+int rtl8366_sw_get_vlan_fid(struct switch_dev *dev,
+			     const struct switch_attr *attr,
+			     struct switch_val *val);
+int rtl8366_sw_set_vlan_fid(struct switch_dev *dev,
+			     const struct switch_attr *attr,
+			     struct switch_val *val);
+int rtl8366_sw_get_vlan_ports(struct switch_dev *dev, struct switch_val *val);
+int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val);
+int rtl8366_sw_get_vlan_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val);
+int rtl8366_sw_set_vlan_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val);
+
+struct rtl8366_smi* rtl8366_smi_probe(struct platform_device *pdev);
+
+#endif /*  _RTL8366_SMI_H */
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
new file mode 100644
index 00000000..f4ec7483
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -0,0 +1,1496 @@
+/*
+ * Platform driver for the Realtek RTL8366RB ethernet switch
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>
+ * Copyright (C) 2010 Roman Yeryomin <roman@advem.lv>
+ * Copyright (C) 2011 Colin Leitner <colin.leitner@googlemail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/rtl8366.h>
+
+#include "rtl8366_smi.h"
+
+#define RTL8366RB_DRIVER_DESC	"Realtek RTL8366RB ethernet switch driver"
+#define RTL8366RB_DRIVER_VER	"0.2.4"
+
+#define RTL8366RB_PHY_NO_MAX	4
+#define RTL8366RB_PHY_PAGE_MAX	7
+#define RTL8366RB_PHY_ADDR_MAX	31
+
+/* Switch Global Configuration register */
+#define RTL8366RB_SGCR				0x0000
+#define RTL8366RB_SGCR_EN_BC_STORM_CTRL		BIT(0)
+#define RTL8366RB_SGCR_MAX_LENGTH(_x)		(_x << 4)
+#define RTL8366RB_SGCR_MAX_LENGTH_MASK		RTL8366RB_SGCR_MAX_LENGTH(0x3)
+#define RTL8366RB_SGCR_MAX_LENGTH_1522		RTL8366RB_SGCR_MAX_LENGTH(0x0)
+#define RTL8366RB_SGCR_MAX_LENGTH_1536		RTL8366RB_SGCR_MAX_LENGTH(0x1)
+#define RTL8366RB_SGCR_MAX_LENGTH_1552		RTL8366RB_SGCR_MAX_LENGTH(0x2)
+#define RTL8366RB_SGCR_MAX_LENGTH_9216		RTL8366RB_SGCR_MAX_LENGTH(0x3)
+#define RTL8366RB_SGCR_EN_VLAN			BIT(13)
+#define RTL8366RB_SGCR_EN_VLAN_4KTB		BIT(14)
+
+/* Port Enable Control register */
+#define RTL8366RB_PECR				0x0001
+
+/* Port Mirror Control Register */
+#define RTL8366RB_PMCR				0x0007
+#define RTL8366RB_PMCR_SOURCE_PORT(_x)		(_x)
+#define RTL8366RB_PMCR_SOURCE_PORT_MASK		0x000f
+#define RTL8366RB_PMCR_MONITOR_PORT(_x)		((_x) << 4)
+#define RTL8366RB_PMCR_MONITOR_PORT_MASK	0x00f0
+#define RTL8366RB_PMCR_MIRROR_RX		BIT(8)
+#define RTL8366RB_PMCR_MIRROR_TX		BIT(9)
+#define RTL8366RB_PMCR_MIRROR_SPC		BIT(10)
+#define RTL8366RB_PMCR_MIRROR_ISO		BIT(11)
+
+/* Switch Security Control registers */
+#define RTL8366RB_SSCR0				0x0002
+#define RTL8366RB_SSCR1				0x0003
+#define RTL8366RB_SSCR2				0x0004
+#define RTL8366RB_SSCR2_DROP_UNKNOWN_DA		BIT(0)
+
+#define RTL8366RB_RESET_CTRL_REG		0x0100
+#define RTL8366RB_CHIP_CTRL_RESET_HW		1
+#define RTL8366RB_CHIP_CTRL_RESET_SW		(1 << 1)
+
+#define RTL8366RB_CHIP_VERSION_CTRL_REG		0x050A
+#define RTL8366RB_CHIP_VERSION_MASK		0xf
+#define RTL8366RB_CHIP_ID_REG			0x0509
+#define RTL8366RB_CHIP_ID_8366			0x5937
+
+/* PHY registers control */
+#define RTL8366RB_PHY_ACCESS_CTRL_REG		0x8000
+#define RTL8366RB_PHY_ACCESS_DATA_REG		0x8002
+
+#define RTL8366RB_PHY_CTRL_READ			1
+#define RTL8366RB_PHY_CTRL_WRITE		0
+
+#define RTL8366RB_PHY_REG_MASK			0x1f
+#define RTL8366RB_PHY_PAGE_OFFSET		5
+#define RTL8366RB_PHY_PAGE_MASK			(0xf << 5)
+#define RTL8366RB_PHY_NO_OFFSET			9
+#define RTL8366RB_PHY_NO_MASK			(0x1f << 9)
+
+#define RTL8366RB_VLAN_INGRESS_CTRL2_REG	0x037f
+
+/* LED control registers */
+#define RTL8366RB_LED_BLINKRATE_REG		0x0430
+#define RTL8366RB_LED_BLINKRATE_BIT		0
+#define RTL8366RB_LED_BLINKRATE_MASK		0x0007
+
+#define RTL8366RB_LED_CTRL_REG			0x0431
+#define RTL8366RB_LED_0_1_CTRL_REG		0x0432
+#define RTL8366RB_LED_2_3_CTRL_REG		0x0433
+
+#define RTL8366RB_MIB_COUNT			33
+#define RTL8366RB_GLOBAL_MIB_COUNT		1
+#define RTL8366RB_MIB_COUNTER_PORT_OFFSET	0x0050
+#define RTL8366RB_MIB_COUNTER_BASE		0x1000
+#define RTL8366RB_MIB_CTRL_REG			0x13F0
+#define RTL8366RB_MIB_CTRL_USER_MASK		0x0FFC
+#define RTL8366RB_MIB_CTRL_BUSY_MASK		BIT(0)
+#define RTL8366RB_MIB_CTRL_RESET_MASK		BIT(1)
+#define RTL8366RB_MIB_CTRL_PORT_RESET(_p)	BIT(2 + (_p))
+#define RTL8366RB_MIB_CTRL_GLOBAL_RESET		BIT(11)
+
+#define RTL8366RB_PORT_VLAN_CTRL_BASE		0x0063
+#define RTL8366RB_PORT_VLAN_CTRL_REG(_p)  \
+		(RTL8366RB_PORT_VLAN_CTRL_BASE + (_p) / 4)
+#define RTL8366RB_PORT_VLAN_CTRL_MASK		0xf
+#define RTL8366RB_PORT_VLAN_CTRL_SHIFT(_p)	(4 * ((_p) % 4))
+
+
+#define RTL8366RB_VLAN_TABLE_READ_BASE		0x018C
+#define RTL8366RB_VLAN_TABLE_WRITE_BASE		0x0185
+
+
+#define RTL8366RB_TABLE_ACCESS_CTRL_REG		0x0180
+#define RTL8366RB_TABLE_VLAN_READ_CTRL		0x0E01
+#define RTL8366RB_TABLE_VLAN_WRITE_CTRL		0x0F01
+
+#define RTL8366RB_VLAN_MC_BASE(_x)		(0x0020 + (_x) * 3)
+
+
+#define RTL8366RB_PORT_LINK_STATUS_BASE		0x0014
+#define RTL8366RB_PORT_STATUS_SPEED_MASK	0x0003
+#define RTL8366RB_PORT_STATUS_DUPLEX_MASK	0x0004
+#define RTL8366RB_PORT_STATUS_LINK_MASK		0x0010
+#define RTL8366RB_PORT_STATUS_TXPAUSE_MASK	0x0020
+#define RTL8366RB_PORT_STATUS_RXPAUSE_MASK	0x0040
+#define RTL8366RB_PORT_STATUS_AN_MASK		0x0080
+
+
+#define RTL8366RB_PORT_NUM_CPU		5
+#define RTL8366RB_NUM_PORTS		6
+#define RTL8366RB_NUM_VLANS		16
+#define RTL8366RB_NUM_LEDGROUPS		4
+#define RTL8366RB_NUM_VIDS		4096
+#define RTL8366RB_PRIORITYMAX		7
+#define RTL8366RB_FIDMAX		7
+
+
+#define RTL8366RB_PORT_1		(1 << 0) /* In userspace port 0 */
+#define RTL8366RB_PORT_2		(1 << 1) /* In userspace port 1 */
+#define RTL8366RB_PORT_3		(1 << 2) /* In userspace port 2 */
+#define RTL8366RB_PORT_4		(1 << 3) /* In userspace port 3 */
+#define RTL8366RB_PORT_5		(1 << 4) /* In userspace port 4 */
+
+#define RTL8366RB_PORT_CPU		(1 << 5) /* CPU port */
+
+#define RTL8366RB_PORT_ALL		(RTL8366RB_PORT_1 |	\
+					 RTL8366RB_PORT_2 |	\
+					 RTL8366RB_PORT_3 |	\
+					 RTL8366RB_PORT_4 |	\
+					 RTL8366RB_PORT_5 |	\
+					 RTL8366RB_PORT_CPU)
+
+#define RTL8366RB_PORT_ALL_BUT_CPU	(RTL8366RB_PORT_1 |	\
+					 RTL8366RB_PORT_2 |	\
+					 RTL8366RB_PORT_3 |	\
+					 RTL8366RB_PORT_4 |	\
+					 RTL8366RB_PORT_5)
+
+#define RTL8366RB_PORT_ALL_EXTERNAL	(RTL8366RB_PORT_1 |	\
+					 RTL8366RB_PORT_2 |	\
+					 RTL8366RB_PORT_3 |	\
+					 RTL8366RB_PORT_4)
+
+#define RTL8366RB_PORT_ALL_INTERNAL	 RTL8366RB_PORT_CPU
+
+#define RTL8366RB_VLAN_VID_MASK		0xfff
+#define RTL8366RB_VLAN_PRIORITY_SHIFT	12
+#define RTL8366RB_VLAN_PRIORITY_MASK	0x7
+#define RTL8366RB_VLAN_UNTAG_SHIFT	8
+#define RTL8366RB_VLAN_UNTAG_MASK	0xff
+#define RTL8366RB_VLAN_MEMBER_MASK	0xff
+#define RTL8366RB_VLAN_FID_MASK		0x7
+
+
+/* Port ingress bandwidth control */
+#define RTL8366RB_IB_BASE		0x0200
+#define RTL8366RB_IB_REG(pnum)		(RTL8366RB_IB_BASE + pnum)
+#define RTL8366RB_IB_BDTH_MASK		0x3fff
+#define RTL8366RB_IB_PREIFG_OFFSET	14
+#define RTL8366RB_IB_PREIFG_MASK	(1 << RTL8366RB_IB_PREIFG_OFFSET)
+
+/* Port egress bandwidth control */
+#define RTL8366RB_EB_BASE		0x02d1
+#define RTL8366RB_EB_REG(pnum)		(RTL8366RB_EB_BASE + pnum)
+#define RTL8366RB_EB_BDTH_MASK		0x3fff
+#define RTL8366RB_EB_PREIFG_REG	0x02f8
+#define RTL8366RB_EB_PREIFG_OFFSET	9
+#define RTL8366RB_EB_PREIFG_MASK	(1 << RTL8366RB_EB_PREIFG_OFFSET)
+
+#define RTL8366RB_BDTH_SW_MAX		1048512
+#define RTL8366RB_BDTH_UNIT		64
+#define RTL8366RB_BDTH_REG_DEFAULT	16383
+
+/* QOS */
+#define RTL8366RB_QOS_BIT		15
+#define RTL8366RB_QOS_MASK		(1 << RTL8366RB_QOS_BIT)
+/* Include/Exclude Preamble and IFG (20 bytes). 0:Exclude, 1:Include. */
+#define RTL8366RB_QOS_DEFAULT_PREIFG	1
+
+
+static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
+	{ 0,  0, 4, "IfInOctets"				},
+	{ 0,  4, 4, "EtherStatsOctets"				},
+	{ 0,  8, 2, "EtherStatsUnderSizePkts"			},
+	{ 0, 10, 2, "EtherFragments"				},
+	{ 0, 12, 2, "EtherStatsPkts64Octets"			},
+	{ 0, 14, 2, "EtherStatsPkts65to127Octets"		},
+	{ 0, 16, 2, "EtherStatsPkts128to255Octets"		},
+	{ 0, 18, 2, "EtherStatsPkts256to511Octets"		},
+	{ 0, 20, 2, "EtherStatsPkts512to1023Octets"		},
+	{ 0, 22, 2, "EtherStatsPkts1024to1518Octets"		},
+	{ 0, 24, 2, "EtherOversizeStats"			},
+	{ 0, 26, 2, "EtherStatsJabbers"				},
+	{ 0, 28, 2, "IfInUcastPkts"				},
+	{ 0, 30, 2, "EtherStatsMulticastPkts"			},
+	{ 0, 32, 2, "EtherStatsBroadcastPkts"			},
+	{ 0, 34, 2, "EtherStatsDropEvents"			},
+	{ 0, 36, 2, "Dot3StatsFCSErrors"			},
+	{ 0, 38, 2, "Dot3StatsSymbolErrors"			},
+	{ 0, 40, 2, "Dot3InPauseFrames"				},
+	{ 0, 42, 2, "Dot3ControlInUnknownOpcodes"		},
+	{ 0, 44, 4, "IfOutOctets"				},
+	{ 0, 48, 2, "Dot3StatsSingleCollisionFrames"		},
+	{ 0, 50, 2, "Dot3StatMultipleCollisionFrames"		},
+	{ 0, 52, 2, "Dot3sDeferredTransmissions"		},
+	{ 0, 54, 2, "Dot3StatsLateCollisions"			},
+	{ 0, 56, 2, "EtherStatsCollisions"			},
+	{ 0, 58, 2, "Dot3StatsExcessiveCollisions"		},
+	{ 0, 60, 2, "Dot3OutPauseFrames"			},
+	{ 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"	},
+	{ 0, 64, 2, "Dot1dTpPortInDiscards"			},
+	{ 0, 66, 2, "IfOutUcastPkts"				},
+	{ 0, 68, 2, "IfOutMulticastPkts"			},
+	{ 0, 70, 2, "IfOutBroadcastPkts"			},
+};
+
+#define REG_WR(_smi, _reg, _val)					\
+	do {								\
+		err = rtl8366_smi_write_reg(_smi, _reg, _val);		\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+#define REG_RMW(_smi, _reg, _mask, _val)				\
+	do {								\
+		err = rtl8366_smi_rmwr(_smi, _reg, _mask, _val);	\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
+{
+	int timeout = 10;
+	u32 data;
+
+	rtl8366_smi_write_reg_noack(smi, RTL8366RB_RESET_CTRL_REG,
+			 	    RTL8366RB_CHIP_CTRL_RESET_HW);
+	do {
+		msleep(1);
+		if (rtl8366_smi_read_reg(smi, RTL8366RB_RESET_CTRL_REG, &data))
+			return -EIO;
+
+		if (!(data & RTL8366RB_CHIP_CTRL_RESET_HW))
+			break;
+	} while (--timeout);
+
+	if (!timeout) {
+		printk("Timeout waiting for the switch to reset\n");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int rtl8366rb_setup(struct rtl8366_smi *smi)
+{
+	int err;
+
+	/* set maximum packet length to 1536 bytes */
+	REG_RMW(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_MAX_LENGTH_MASK,
+		RTL8366RB_SGCR_MAX_LENGTH_1536);
+
+	/* enable learning for all ports */
+	REG_WR(smi, RTL8366RB_SSCR0, 0);
+
+	/* enable auto ageing for all ports */
+	REG_WR(smi, RTL8366RB_SSCR1, 0);
+
+	/*
+	 * discard VLAN tagged packets if the port is not a member of
+	 * the VLAN with which the packets is associated.
+	 */
+	REG_WR(smi, RTL8366RB_VLAN_INGRESS_CTRL2_REG, RTL8366RB_PORT_ALL);
+
+	/* don't drop packets whose DA has not been learned */
+	REG_RMW(smi, RTL8366RB_SSCR2, RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0);
+
+	return 0;
+}
+
+static int rtl8366rb_read_phy_reg(struct rtl8366_smi *smi,
+				 u32 phy_no, u32 page, u32 addr, u32 *data)
+{
+	u32 reg;
+	int ret;
+
+	if (phy_no > RTL8366RB_PHY_NO_MAX)
+		return -EINVAL;
+
+	if (page > RTL8366RB_PHY_PAGE_MAX)
+		return -EINVAL;
+
+	if (addr > RTL8366RB_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	ret = rtl8366_smi_write_reg(smi, RTL8366RB_PHY_ACCESS_CTRL_REG,
+				    RTL8366RB_PHY_CTRL_READ);
+	if (ret)
+		return ret;
+
+	reg = 0x8000 | (1 << (phy_no + RTL8366RB_PHY_NO_OFFSET)) |
+	      ((page << RTL8366RB_PHY_PAGE_OFFSET) & RTL8366RB_PHY_PAGE_MASK) |
+	      (addr & RTL8366RB_PHY_REG_MASK);
+
+	ret = rtl8366_smi_write_reg(smi, reg, 0);
+	if (ret)
+		return ret;
+
+	ret = rtl8366_smi_read_reg(smi, RTL8366RB_PHY_ACCESS_DATA_REG, data);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int rtl8366rb_write_phy_reg(struct rtl8366_smi *smi,
+				  u32 phy_no, u32 page, u32 addr, u32 data)
+{
+	u32 reg;
+	int ret;
+
+	if (phy_no > RTL8366RB_PHY_NO_MAX)
+		return -EINVAL;
+
+	if (page > RTL8366RB_PHY_PAGE_MAX)
+		return -EINVAL;
+
+	if (addr > RTL8366RB_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	ret = rtl8366_smi_write_reg(smi, RTL8366RB_PHY_ACCESS_CTRL_REG,
+				    RTL8366RB_PHY_CTRL_WRITE);
+	if (ret)
+		return ret;
+
+	reg = 0x8000 | (1 << (phy_no + RTL8366RB_PHY_NO_OFFSET)) |
+	      ((page << RTL8366RB_PHY_PAGE_OFFSET) & RTL8366RB_PHY_PAGE_MASK) |
+	      (addr & RTL8366RB_PHY_REG_MASK);
+
+	ret = rtl8366_smi_write_reg(smi, reg, data);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int rtl8366rb_get_mib_counter(struct rtl8366_smi *smi, int counter,
+				     int port, unsigned long long *val)
+{
+	int i;
+	int err;
+	u32 addr, data;
+	u64 mibvalue;
+
+	if (port > RTL8366RB_NUM_PORTS || counter >= RTL8366RB_MIB_COUNT)
+		return -EINVAL;
+
+	addr = RTL8366RB_MIB_COUNTER_BASE +
+	       RTL8366RB_MIB_COUNTER_PORT_OFFSET * (port) +
+	       rtl8366rb_mib_counters[counter].offset;
+
+	/*
+	 * Writing access counter address first
+	 * then ASIC will prepare 64bits counter wait for being retrived
+	 */
+	data = 0; /* writing data will be discard by ASIC */
+	err = rtl8366_smi_write_reg(smi, addr, data);
+	if (err)
+		return err;
+
+	/* read MIB control register */
+	err =  rtl8366_smi_read_reg(smi, RTL8366RB_MIB_CTRL_REG, &data);
+	if (err)
+		return err;
+
+	if (data & RTL8366RB_MIB_CTRL_BUSY_MASK)
+		return -EBUSY;
+
+	if (data & RTL8366RB_MIB_CTRL_RESET_MASK)
+		return -EIO;
+
+	mibvalue = 0;
+	for (i = rtl8366rb_mib_counters[counter].length; i > 0; i--) {
+		err = rtl8366_smi_read_reg(smi, addr + (i - 1), &data);
+		if (err)
+			return err;
+
+		mibvalue = (mibvalue << 16) | (data & 0xFFFF);
+	}
+
+	*val = mibvalue;
+	return 0;
+}
+
+static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
+				 struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[3];
+	int err;
+	int i;
+
+	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
+
+	if (vid >= RTL8366RB_NUM_VIDS)
+		return -EINVAL;
+
+	/* write VID */
+	err = rtl8366_smi_write_reg(smi, RTL8366RB_VLAN_TABLE_WRITE_BASE,
+				    vid & RTL8366RB_VLAN_VID_MASK);
+	if (err)
+		return err;
+
+	/* write table access control word */
+	err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG,
+				    RTL8366RB_TABLE_VLAN_READ_CTRL);
+	if (err)
+		return err;
+
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_read_reg(smi,
+					   RTL8366RB_VLAN_TABLE_READ_BASE + i,
+					   &data[i]);
+		if (err)
+			return err;
+	}
+
+	vlan4k->vid = vid;
+	vlan4k->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) &
+			RTL8366RB_VLAN_UNTAG_MASK;
+	vlan4k->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK;
+	vlan4k->fid = data[2] & RTL8366RB_VLAN_FID_MASK;
+
+	return 0;
+}
+
+static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
+				 const struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[3];
+	int err;
+	int i;
+
+	if (vlan4k->vid >= RTL8366RB_NUM_VIDS ||
+	    vlan4k->member > RTL8366RB_VLAN_MEMBER_MASK ||
+	    vlan4k->untag > RTL8366RB_VLAN_UNTAG_MASK ||
+	    vlan4k->fid > RTL8366RB_FIDMAX)
+		return -EINVAL;
+
+	data[0] = vlan4k->vid & RTL8366RB_VLAN_VID_MASK;
+	data[1] = (vlan4k->member & RTL8366RB_VLAN_MEMBER_MASK) |
+		  ((vlan4k->untag & RTL8366RB_VLAN_UNTAG_MASK) <<
+			RTL8366RB_VLAN_UNTAG_SHIFT);
+	data[2] = vlan4k->fid & RTL8366RB_VLAN_FID_MASK;
+
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_write_reg(smi,
+					    RTL8366RB_VLAN_TABLE_WRITE_BASE + i,
+					    data[i]);
+		if (err)
+			return err;
+	}
+
+	/* write table access control word */
+	err = rtl8366_smi_write_reg(smi, RTL8366RB_TABLE_ACCESS_CTRL_REG,
+				    RTL8366RB_TABLE_VLAN_WRITE_CTRL);
+
+	return err;
+}
+
+static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				 struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[3];
+	int err;
+	int i;
+
+	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
+
+	if (index >= RTL8366RB_NUM_VLANS)
+		return -EINVAL;
+
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_read_reg(smi,
+					   RTL8366RB_VLAN_MC_BASE(index) + i,
+					   &data[i]);
+		if (err)
+			return err;
+	}
+
+	vlanmc->vid = data[0] & RTL8366RB_VLAN_VID_MASK;
+	vlanmc->priority = (data[0] >> RTL8366RB_VLAN_PRIORITY_SHIFT) &
+			   RTL8366RB_VLAN_PRIORITY_MASK;
+	vlanmc->untag = (data[1] >> RTL8366RB_VLAN_UNTAG_SHIFT) &
+			RTL8366RB_VLAN_UNTAG_MASK;
+	vlanmc->member = data[1] & RTL8366RB_VLAN_MEMBER_MASK;
+	vlanmc->fid = data[2] & RTL8366RB_VLAN_FID_MASK;
+
+	return 0;
+}
+
+static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				 const struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[3];
+	int err;
+	int i;
+
+	if (index >= RTL8366RB_NUM_VLANS ||
+	    vlanmc->vid >= RTL8366RB_NUM_VIDS ||
+	    vlanmc->priority > RTL8366RB_PRIORITYMAX ||
+	    vlanmc->member > RTL8366RB_VLAN_MEMBER_MASK ||
+	    vlanmc->untag > RTL8366RB_VLAN_UNTAG_MASK ||
+	    vlanmc->fid > RTL8366RB_FIDMAX)
+		return -EINVAL;
+
+	data[0] = (vlanmc->vid & RTL8366RB_VLAN_VID_MASK) |
+		  ((vlanmc->priority & RTL8366RB_VLAN_PRIORITY_MASK) <<
+			RTL8366RB_VLAN_PRIORITY_SHIFT);
+	data[1] = (vlanmc->member & RTL8366RB_VLAN_MEMBER_MASK) |
+		  ((vlanmc->untag & RTL8366RB_VLAN_UNTAG_MASK) <<
+			RTL8366RB_VLAN_UNTAG_SHIFT);
+	data[2] = vlanmc->fid & RTL8366RB_VLAN_FID_MASK;
+
+	for (i = 0; i < 3; i++) {
+		err = rtl8366_smi_write_reg(smi,
+					    RTL8366RB_VLAN_MC_BASE(index) + i,
+					    data[i]);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+static int rtl8366rb_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
+{
+	u32 data;
+	int err;
+
+	if (port >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	err = rtl8366_smi_read_reg(smi, RTL8366RB_PORT_VLAN_CTRL_REG(port),
+				   &data);
+	if (err)
+		return err;
+
+	*val = (data >> RTL8366RB_PORT_VLAN_CTRL_SHIFT(port)) &
+	       RTL8366RB_PORT_VLAN_CTRL_MASK;
+
+	return 0;
+
+}
+
+static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index)
+{
+	if (port >= RTL8366RB_NUM_PORTS || index >= RTL8366RB_NUM_VLANS)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PORT_VLAN_CTRL_REG(port),
+				RTL8366RB_PORT_VLAN_CTRL_MASK <<
+					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port),
+				(index & RTL8366RB_PORT_VLAN_CTRL_MASK) <<
+					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port));
+}
+
+static int rtl8366rb_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
+{
+	unsigned max = RTL8366RB_NUM_VLANS;
+
+	if (smi->vlan4k_enabled)
+		max = RTL8366RB_NUM_VIDS - 1;
+
+	if (vlan == 0 || vlan >= max)
+		return 0;
+
+	return 1;
+}
+
+static int rtl8366rb_enable_vlan(struct rtl8366_smi *smi, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN,
+				(enable) ? RTL8366RB_SGCR_EN_VLAN : 0);
+}
+
+static int rtl8366rb_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR,
+				RTL8366RB_SGCR_EN_VLAN_4KTB,
+				(enable) ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);
+}
+
+static int rtl8366rb_enable_port(struct rtl8366_smi *smi, int port, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PECR, (1 << port),
+				(enable) ? 0 : (1 << port));
+}
+
+static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_MIB_CTRL_REG, 0,
+			        RTL8366RB_MIB_CTRL_GLOBAL_RESET);
+}
+
+static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,
+				     const struct switch_attr *attr,
+				     struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_LED_BLINKRATE_REG, &data);
+
+	val->value.i = (data & (RTL8366RB_LED_BLINKRATE_MASK));
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_blinkrate(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	if (val->value.i >= 6)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_LED_BLINKRATE_REG,
+				RTL8366RB_LED_BLINKRATE_MASK,
+				val->value.i);
+}
+
+static int rtl8366rb_sw_get_learning_enable(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_SSCR0, &data);
+	val->value.i = !data;
+
+	return 0;
+}
+
+
+static int rtl8366rb_sw_set_learning_enable(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 portmask = 0;
+	int err = 0;
+
+	if (!val->value.i)
+		portmask = RTL8366RB_PORT_ALL;
+
+	/* set learning for all ports */
+	REG_WR(smi, RTL8366RB_SSCR0, portmask);
+
+	/* set auto ageing for all ports */
+	REG_WR(smi, RTL8366RB_SSCR1, portmask);
+
+	return 0;
+}
+
+static int rtl8366rb_sw_get_port_link(struct switch_dev *dev,
+				     int port,
+				     struct switch_port_link *link)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data = 0;
+	u32 speed;
+
+	if (port >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PORT_LINK_STATUS_BASE + (port / 2),
+			     &data);
+
+	if (port % 2)
+		data = data >> 8;
+
+	link->link = !!(data & RTL8366RB_PORT_STATUS_LINK_MASK);
+	if (!link->link)
+		return 0;
+
+	link->duplex = !!(data & RTL8366RB_PORT_STATUS_DUPLEX_MASK);
+	link->rx_flow = !!(data & RTL8366RB_PORT_STATUS_RXPAUSE_MASK);
+	link->tx_flow = !!(data & RTL8366RB_PORT_STATUS_TXPAUSE_MASK);
+	link->aneg = !!(data & RTL8366RB_PORT_STATUS_AN_MASK);
+
+	speed = (data & RTL8366RB_PORT_STATUS_SPEED_MASK);
+	switch (speed) {
+	case 0:
+		link->speed = SWITCH_PORT_SPEED_10;
+		break;
+	case 1:
+		link->speed = SWITCH_PORT_SPEED_100;
+		break;
+	case 2:
+		link->speed = SWITCH_PORT_SPEED_1000;
+		break;
+	default:
+		link->speed = SWITCH_PORT_SPEED_UNKNOWN;
+		break;
+	}
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_port_led(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+	u32 mask;
+	u32 reg;
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	if (val->port_vlan == RTL8366RB_PORT_NUM_CPU) {
+		reg = RTL8366RB_LED_BLINKRATE_REG;
+		mask = 0xF << 4;
+		data = val->value.i << 4;
+	} else {
+		reg = RTL8366RB_LED_CTRL_REG;
+		mask = 0xF << (val->port_vlan * 4),
+		data = val->value.i << (val->port_vlan * 4);
+	}
+
+	return rtl8366_smi_rmwr(smi, reg, mask, data);
+}
+
+static int rtl8366rb_sw_get_port_led(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data = 0;
+
+	if (val->port_vlan >= RTL8366RB_NUM_LEDGROUPS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_LED_CTRL_REG, &data);
+	val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_port_disable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 mask, data;
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	mask = 1 << val->port_vlan ;
+	if (val->value.i)
+		data = mask;
+	else
+		data = 0;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PECR, mask, data);
+}
+
+static int rtl8366rb_sw_get_port_disable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PECR, &data);
+	if (data & (1 << val->port_vlan))
+		val->value.i = 1;
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_port_rate_in(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	if (val->value.i > 0 && val->value.i < RTL8366RB_BDTH_SW_MAX)
+		val->value.i = (val->value.i - 1) / RTL8366RB_BDTH_UNIT;
+	else
+		val->value.i = RTL8366RB_BDTH_REG_DEFAULT;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_IB_REG(val->port_vlan),
+		RTL8366RB_IB_BDTH_MASK | RTL8366RB_IB_PREIFG_MASK,
+		val->value.i |
+		(RTL8366RB_QOS_DEFAULT_PREIFG << RTL8366RB_IB_PREIFG_OFFSET));
+
+}
+
+static int rtl8366rb_sw_get_port_rate_in(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_IB_REG(val->port_vlan), &data);
+	data &= RTL8366RB_IB_BDTH_MASK;
+	if (data < RTL8366RB_IB_BDTH_MASK)
+		data += 1;
+
+	val->value.i = (int)data * RTL8366RB_BDTH_UNIT;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_port_rate_out(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_rmwr(smi, RTL8366RB_EB_PREIFG_REG,
+		RTL8366RB_EB_PREIFG_MASK,
+		(RTL8366RB_QOS_DEFAULT_PREIFG << RTL8366RB_EB_PREIFG_OFFSET));
+
+	if (val->value.i > 0 && val->value.i < RTL8366RB_BDTH_SW_MAX)
+		val->value.i = (val->value.i - 1) / RTL8366RB_BDTH_UNIT;
+	else
+		val->value.i = RTL8366RB_BDTH_REG_DEFAULT;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_EB_REG(val->port_vlan),
+			RTL8366RB_EB_BDTH_MASK, val->value.i );
+
+}
+
+static int rtl8366rb_sw_get_port_rate_out(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_EB_REG(val->port_vlan), &data);
+	data &= RTL8366RB_EB_BDTH_MASK;
+	if (data < RTL8366RB_EB_BDTH_MASK)
+		data += 1;
+
+	val->value.i = (int)data * RTL8366RB_BDTH_UNIT;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_qos_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->value.i)
+		data = RTL8366RB_QOS_MASK;
+	else
+		data = 0;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_QOS_MASK, data);
+}
+
+static int rtl8366rb_sw_get_qos_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_SGCR, &data);
+	if (data & RTL8366RB_QOS_MASK)
+		val->value.i = 1;
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_mirror_rx_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->value.i)
+		data = RTL8366RB_PMCR_MIRROR_RX;
+	else
+		data = 0;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PMCR, RTL8366RB_PMCR_MIRROR_RX, data);
+}
+
+static int rtl8366rb_sw_get_mirror_rx_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PMCR, &data);
+	if (data & RTL8366RB_PMCR_MIRROR_RX)
+		val->value.i = 1;
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_mirror_tx_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->value.i)
+		data = RTL8366RB_PMCR_MIRROR_TX;
+	else
+		data = 0;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PMCR, RTL8366RB_PMCR_MIRROR_TX, data);
+}
+
+static int rtl8366rb_sw_get_mirror_tx_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PMCR, &data);
+	if (data & RTL8366RB_PMCR_MIRROR_TX)
+		val->value.i = 1;
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_monitor_isolation_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->value.i)
+		data = RTL8366RB_PMCR_MIRROR_ISO;
+	else
+		data = 0;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PMCR, RTL8366RB_PMCR_MIRROR_ISO, data);
+}
+
+static int rtl8366rb_sw_get_monitor_isolation_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PMCR, &data);
+	if (data & RTL8366RB_PMCR_MIRROR_ISO)
+		val->value.i = 1;
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_mirror_pause_frames_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	if (val->value.i)
+		data = RTL8366RB_PMCR_MIRROR_SPC;
+	else
+		data = 0;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PMCR, RTL8366RB_PMCR_MIRROR_SPC, data);
+}
+
+static int rtl8366rb_sw_get_mirror_pause_frames_enable(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PMCR, &data);
+	if (data & RTL8366RB_PMCR_MIRROR_SPC)
+		val->value.i = 1;
+	else
+		val->value.i = 0;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_mirror_monitor_port(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	data = RTL8366RB_PMCR_MONITOR_PORT(val->value.i);
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PMCR, RTL8366RB_PMCR_MONITOR_PORT_MASK, data);
+}
+
+static int rtl8366rb_sw_get_mirror_monitor_port(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PMCR, &data);
+	val->value.i = (data & RTL8366RB_PMCR_MONITOR_PORT_MASK) >> 4;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_set_mirror_source_port(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	data = RTL8366RB_PMCR_SOURCE_PORT(val->value.i);
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_PMCR, RTL8366RB_PMCR_SOURCE_PORT_MASK, data);
+}
+
+static int rtl8366rb_sw_get_mirror_source_port(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366RB_PMCR, &data);
+	val->value.i = data & RTL8366RB_PMCR_SOURCE_PORT_MASK;
+
+	return 0;
+}
+
+static int rtl8366rb_sw_reset_port_mibs(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	if (val->port_vlan >= RTL8366RB_NUM_PORTS)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8366RB_MIB_CTRL_REG, 0,
+				RTL8366RB_MIB_CTRL_PORT_RESET(val->port_vlan));
+}
+
+static struct switch_attr rtl8366rb_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_learning",
+		.description = "Enable learning, enable aging",
+		.set = rtl8366rb_sw_set_learning_enable,
+		.get = rtl8366rb_sw_get_learning_enable,
+		.max = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan4k",
+		.description = "Enable VLAN 4K mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 2
+	}, {
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mibs",
+		.description = "Reset all MIB counters",
+		.set = rtl8366rb_sw_reset_mibs,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "blinkrate",
+		.description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms,"
+		" 2 = 120ms, 3 = 170ms, 4 = 340ms, 5 = 670ms)",
+		.set = rtl8366rb_sw_set_blinkrate,
+		.get = rtl8366rb_sw_get_blinkrate,
+		.max = 5
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_qos",
+		.description = "Enable QOS",
+		.set = rtl8366rb_sw_set_qos_enable,
+		.get = rtl8366rb_sw_get_qos_enable,
+		.max = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_mirror_rx",
+		.description = "Enable mirroring of RX packets",
+		.set = rtl8366rb_sw_set_mirror_rx_enable,
+		.get = rtl8366rb_sw_get_mirror_rx_enable,
+		.max = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_mirror_tx",
+		.description = "Enable mirroring of TX packets",
+		.set = rtl8366rb_sw_set_mirror_tx_enable,
+		.get = rtl8366rb_sw_get_mirror_tx_enable,
+		.max = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_monitor_isolation",
+		.description = "Enable isolation of monitor port (TX packets will be dropped)",
+		.set = rtl8366rb_sw_set_monitor_isolation_enable,
+		.get = rtl8366rb_sw_get_monitor_isolation_enable,
+		.max = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_mirror_pause_frames",
+		.description = "Enable mirroring of RX pause frames",
+		.set = rtl8366rb_sw_set_mirror_pause_frames_enable,
+		.get = rtl8366rb_sw_get_mirror_pause_frames_enable,
+		.max = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "mirror_monitor_port",
+		.description = "Mirror monitor port",
+		.set = rtl8366rb_sw_set_mirror_monitor_port,
+		.get = rtl8366rb_sw_get_mirror_monitor_port,
+		.max = 5
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "mirror_source_port",
+		.description = "Mirror source port",
+		.set = rtl8366rb_sw_set_mirror_source_port,
+		.get = rtl8366rb_sw_get_mirror_source_port,
+		.max = 5
+	},
+};
+
+static struct switch_attr rtl8366rb_port[] = {
+	{
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mib",
+		.description = "Reset single port MIB counters",
+		.set = rtl8366rb_sw_reset_port_mibs,
+	}, {
+		.type = SWITCH_TYPE_STRING,
+		.name = "mib",
+		.description = "Get MIB counters for port",
+		.max = 33,
+		.set = NULL,
+		.get = rtl8366_sw_get_port_mib,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "led",
+		.description = "Get/Set port group (0 - 3) led mode (0 - 15)",
+		.max = 15,
+		.set = rtl8366rb_sw_set_port_led,
+		.get = rtl8366rb_sw_get_port_led,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "disable",
+		.description = "Get/Set port state (enabled or disabled)",
+		.max = 1,
+		.set = rtl8366rb_sw_set_port_disable,
+		.get = rtl8366rb_sw_get_port_disable,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "rate_in",
+		.description = "Get/Set port ingress (incoming) bandwidth limit in kbps",
+		.max = RTL8366RB_BDTH_SW_MAX,
+		.set = rtl8366rb_sw_set_port_rate_in,
+		.get = rtl8366rb_sw_get_port_rate_in,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "rate_out",
+		.description = "Get/Set port egress (outgoing) bandwidth limit in kbps",
+		.max = RTL8366RB_BDTH_SW_MAX,
+		.set = rtl8366rb_sw_set_port_rate_out,
+		.get = rtl8366rb_sw_get_port_rate_out,
+	},
+};
+
+static struct switch_attr rtl8366rb_vlan[] = {
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "info",
+		.description = "Get vlan information",
+		.max = 1,
+		.set = NULL,
+		.get = rtl8366_sw_get_vlan_info,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "fid",
+		.description = "Get/Set vlan FID",
+		.max = RTL8366RB_FIDMAX,
+		.set = rtl8366_sw_set_vlan_fid,
+		.get = rtl8366_sw_get_vlan_fid,
+	},
+};
+
+static const struct switch_dev_ops rtl8366_ops = {
+	.attr_global = {
+		.attr = rtl8366rb_globals,
+		.n_attr = ARRAY_SIZE(rtl8366rb_globals),
+	},
+	.attr_port = {
+		.attr = rtl8366rb_port,
+		.n_attr = ARRAY_SIZE(rtl8366rb_port),
+	},
+	.attr_vlan = {
+		.attr = rtl8366rb_vlan,
+		.n_attr = ARRAY_SIZE(rtl8366rb_vlan),
+	},
+
+	.get_vlan_ports = rtl8366_sw_get_vlan_ports,
+	.set_vlan_ports = rtl8366_sw_set_vlan_ports,
+	.get_port_pvid = rtl8366_sw_get_port_pvid,
+	.set_port_pvid = rtl8366_sw_set_port_pvid,
+	.reset_switch = rtl8366_sw_reset_switch,
+	.get_port_link = rtl8366rb_sw_get_port_link,
+};
+
+static int rtl8366rb_switch_init(struct rtl8366_smi *smi)
+{
+	struct switch_dev *dev = &smi->sw_dev;
+	int err;
+
+	dev->name = "RTL8366RB";
+	dev->cpu_port = RTL8366RB_PORT_NUM_CPU;
+	dev->ports = RTL8366RB_NUM_PORTS;
+	dev->vlans = RTL8366RB_NUM_VIDS;
+	dev->ops = &rtl8366_ops;
+	dev->alias = dev_name(smi->parent);
+
+	err = register_switch(dev, NULL);
+	if (err)
+		dev_err(smi->parent, "switch registration failed\n");
+
+	return err;
+}
+
+static void rtl8366rb_switch_cleanup(struct rtl8366_smi *smi)
+{
+	unregister_switch(&smi->sw_dev);
+}
+
+static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 val = 0;
+	int err;
+
+	err = rtl8366rb_read_phy_reg(smi, addr, 0, reg, &val);
+	if (err)
+		return 0xffff;
+
+	return val;
+}
+
+static int rtl8366rb_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 t;
+	int err;
+
+	err = rtl8366rb_write_phy_reg(smi, addr, 0, reg, val);
+	/* flush write */
+	(void) rtl8366rb_read_phy_reg(smi, addr, 0, reg, &t);
+
+	return err;
+}
+
+static int rtl8366rb_detect(struct rtl8366_smi *smi)
+{
+	u32 chip_id = 0;
+	u32 chip_ver = 0;
+	int ret;
+
+	ret = rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_ID_REG, &chip_id);
+	if (ret) {
+		dev_err(smi->parent, "unable to read chip id\n");
+		return ret;
+	}
+
+	switch (chip_id) {
+	case RTL8366RB_CHIP_ID_8366:
+		break;
+	default:
+		dev_err(smi->parent, "unknown chip id (%04x)\n", chip_id);
+		return -ENODEV;
+	}
+
+	ret = rtl8366_smi_read_reg(smi, RTL8366RB_CHIP_VERSION_CTRL_REG,
+				   &chip_ver);
+	if (ret) {
+		dev_err(smi->parent, "unable to read chip version\n");
+		return ret;
+	}
+
+	dev_info(smi->parent, "RTL%04x ver. %u chip found\n",
+		 chip_id, chip_ver & RTL8366RB_CHIP_VERSION_MASK);
+
+	return 0;
+}
+
+static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
+	.detect		= rtl8366rb_detect,
+	.reset_chip	= rtl8366rb_reset_chip,
+	.setup		= rtl8366rb_setup,
+
+	.mii_read	= rtl8366rb_mii_read,
+	.mii_write	= rtl8366rb_mii_write,
+
+	.get_vlan_mc	= rtl8366rb_get_vlan_mc,
+	.set_vlan_mc	= rtl8366rb_set_vlan_mc,
+	.get_vlan_4k	= rtl8366rb_get_vlan_4k,
+	.set_vlan_4k	= rtl8366rb_set_vlan_4k,
+	.get_mc_index	= rtl8366rb_get_mc_index,
+	.set_mc_index	= rtl8366rb_set_mc_index,
+	.get_mib_counter = rtl8366rb_get_mib_counter,
+	.is_vlan_valid	= rtl8366rb_is_vlan_valid,
+	.enable_vlan	= rtl8366rb_enable_vlan,
+	.enable_vlan4k	= rtl8366rb_enable_vlan4k,
+	.enable_port	= rtl8366rb_enable_port,
+};
+
+static int rtl8366rb_probe(struct platform_device *pdev)
+{
+	static int rtl8366_smi_version_printed;
+	struct rtl8366_smi *smi;
+	int err;
+
+	if (!rtl8366_smi_version_printed++)
+		printk(KERN_NOTICE RTL8366RB_DRIVER_DESC
+		       " version " RTL8366RB_DRIVER_VER"\n");
+
+	smi = rtl8366_smi_probe(pdev);
+	if (!smi)
+		return -ENODEV;
+
+	smi->clk_delay = 10;
+	smi->cmd_read = 0xa9;
+	smi->cmd_write = 0xa8;
+	smi->ops = &rtl8366rb_smi_ops;
+	smi->cpu_port = RTL8366RB_PORT_NUM_CPU;
+	smi->num_ports = RTL8366RB_NUM_PORTS;
+	smi->num_vlan_mc = RTL8366RB_NUM_VLANS;
+	smi->mib_counters = rtl8366rb_mib_counters;
+	smi->num_mib_counters = ARRAY_SIZE(rtl8366rb_mib_counters);
+
+	err = rtl8366_smi_init(smi);
+	if (err)
+		goto err_free_smi;
+
+	platform_set_drvdata(pdev, smi);
+
+	err = rtl8366rb_switch_init(smi);
+	if (err)
+		goto err_clear_drvdata;
+
+	return 0;
+
+ err_clear_drvdata:
+	platform_set_drvdata(pdev, NULL);
+	rtl8366_smi_cleanup(smi);
+ err_free_smi:
+	kfree(smi);
+	return err;
+}
+
+static int rtl8366rb_remove(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
+
+	if (smi) {
+		rtl8366rb_switch_cleanup(smi);
+		platform_set_drvdata(pdev, NULL);
+		rtl8366_smi_cleanup(smi);
+		kfree(smi);
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id rtl8366rb_match[] = {
+	{ .compatible = "rtl8366rb" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, rtl8366rb_match);
+#endif
+
+static struct platform_driver rtl8366rb_driver = {
+	.driver = {
+		.name		= RTL8366RB_DRIVER_NAME,
+		.owner		= THIS_MODULE,
+		.of_match_table = of_match_ptr(rtl8366rb_match),
+	},
+	.probe		= rtl8366rb_probe,
+	.remove		= rtl8366rb_remove,
+};
+
+static int __init rtl8366rb_module_init(void)
+{
+	return platform_driver_register(&rtl8366rb_driver);
+}
+module_init(rtl8366rb_module_init);
+
+static void __exit rtl8366rb_module_exit(void)
+{
+	platform_driver_unregister(&rtl8366rb_driver);
+}
+module_exit(rtl8366rb_module_exit);
+
+MODULE_DESCRIPTION(RTL8366RB_DRIVER_DESC);
+MODULE_VERSION(RTL8366RB_DRIVER_VER);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");
+MODULE_AUTHOR("Roman Yeryomin <roman@advem.lv>");
+MODULE_AUTHOR("Colin Leitner <colin.leitner@googlemail.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" RTL8366RB_DRIVER_NAME);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366s.c
new file mode 100644
index 00000000..3dc2a87a
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -0,0 +1,1148 @@
+/*
+ * Platform driver for the Realtek RTL8366S ethernet switch
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/rtl8366.h>
+
+#include "rtl8366_smi.h"
+
+#define RTL8366S_DRIVER_DESC	"Realtek RTL8366S ethernet switch driver"
+#define RTL8366S_DRIVER_VER	"0.2.2"
+
+#define RTL8366S_PHY_NO_MAX	4
+#define RTL8366S_PHY_PAGE_MAX	7
+#define RTL8366S_PHY_ADDR_MAX	31
+
+/* Switch Global Configuration register */
+#define RTL8366S_SGCR				0x0000
+#define RTL8366S_SGCR_EN_BC_STORM_CTRL		BIT(0)
+#define RTL8366S_SGCR_MAX_LENGTH(_x)		(_x << 4)
+#define RTL8366S_SGCR_MAX_LENGTH_MASK		RTL8366S_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR_MAX_LENGTH_1522		RTL8366S_SGCR_MAX_LENGTH(0x0)
+#define RTL8366S_SGCR_MAX_LENGTH_1536		RTL8366S_SGCR_MAX_LENGTH(0x1)
+#define RTL8366S_SGCR_MAX_LENGTH_1552		RTL8366S_SGCR_MAX_LENGTH(0x2)
+#define RTL8366S_SGCR_MAX_LENGTH_16000		RTL8366S_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR_EN_VLAN			BIT(13)
+
+/* Port Enable Control register */
+#define RTL8366S_PECR				0x0001
+
+/* Switch Security Control registers */
+#define RTL8366S_SSCR0				0x0002
+#define RTL8366S_SSCR1				0x0003
+#define RTL8366S_SSCR2				0x0004
+#define RTL8366S_SSCR2_DROP_UNKNOWN_DA		BIT(0)
+
+#define RTL8366S_RESET_CTRL_REG			0x0100
+#define RTL8366S_CHIP_CTRL_RESET_HW		1
+#define RTL8366S_CHIP_CTRL_RESET_SW		(1 << 1)
+
+#define RTL8366S_CHIP_VERSION_CTRL_REG		0x0104
+#define RTL8366S_CHIP_VERSION_MASK		0xf
+#define RTL8366S_CHIP_ID_REG			0x0105
+#define RTL8366S_CHIP_ID_8366			0x8366
+
+/* PHY registers control */
+#define RTL8366S_PHY_ACCESS_CTRL_REG		0x8028
+#define RTL8366S_PHY_ACCESS_DATA_REG		0x8029
+
+#define RTL8366S_PHY_CTRL_READ			1
+#define RTL8366S_PHY_CTRL_WRITE			0
+
+#define RTL8366S_PHY_REG_MASK			0x1f
+#define RTL8366S_PHY_PAGE_OFFSET		5
+#define RTL8366S_PHY_PAGE_MASK			(0x7 << 5)
+#define RTL8366S_PHY_NO_OFFSET			9
+#define RTL8366S_PHY_NO_MASK			(0x1f << 9)
+
+/* LED control registers */
+#define RTL8366S_LED_BLINKRATE_REG		0x0420
+#define RTL8366S_LED_BLINKRATE_BIT		0
+#define RTL8366S_LED_BLINKRATE_MASK		0x0007
+
+#define RTL8366S_LED_CTRL_REG			0x0421
+#define RTL8366S_LED_0_1_CTRL_REG		0x0422
+#define RTL8366S_LED_2_3_CTRL_REG		0x0423
+
+#define RTL8366S_MIB_COUNT			33
+#define RTL8366S_GLOBAL_MIB_COUNT		1
+#define RTL8366S_MIB_COUNTER_PORT_OFFSET	0x0040
+#define RTL8366S_MIB_COUNTER_BASE		0x1000
+#define RTL8366S_MIB_COUNTER_PORT_OFFSET2	0x0008
+#define RTL8366S_MIB_COUNTER_BASE2		0x1180
+#define RTL8366S_MIB_CTRL_REG			0x11F0
+#define RTL8366S_MIB_CTRL_USER_MASK		0x01FF
+#define RTL8366S_MIB_CTRL_BUSY_MASK		0x0001
+#define RTL8366S_MIB_CTRL_RESET_MASK		0x0002
+
+#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK	0x0004
+#define RTL8366S_MIB_CTRL_PORT_RESET_BIT	0x0003
+#define RTL8366S_MIB_CTRL_PORT_RESET_MASK	0x01FC
+
+
+#define RTL8366S_PORT_VLAN_CTRL_BASE		0x0058
+#define RTL8366S_PORT_VLAN_CTRL_REG(_p)  \
+		(RTL8366S_PORT_VLAN_CTRL_BASE + (_p) / 4)
+#define RTL8366S_PORT_VLAN_CTRL_MASK		0xf
+#define RTL8366S_PORT_VLAN_CTRL_SHIFT(_p)	(4 * ((_p) % 4))
+
+
+#define RTL8366S_VLAN_TABLE_READ_BASE		0x018B
+#define RTL8366S_VLAN_TABLE_WRITE_BASE		0x0185
+
+#define RTL8366S_VLAN_TB_CTRL_REG		0x010F
+
+#define RTL8366S_TABLE_ACCESS_CTRL_REG		0x0180
+#define RTL8366S_TABLE_VLAN_READ_CTRL		0x0E01
+#define RTL8366S_TABLE_VLAN_WRITE_CTRL		0x0F01
+
+#define RTL8366S_VLAN_MC_BASE(_x)		(0x0016 + (_x) * 2)
+
+#define RTL8366S_VLAN_MEMBERINGRESS_REG		0x0379
+
+#define RTL8366S_PORT_LINK_STATUS_BASE		0x0060
+#define RTL8366S_PORT_STATUS_SPEED_MASK		0x0003
+#define RTL8366S_PORT_STATUS_DUPLEX_MASK	0x0004
+#define RTL8366S_PORT_STATUS_LINK_MASK		0x0010
+#define RTL8366S_PORT_STATUS_TXPAUSE_MASK	0x0020
+#define RTL8366S_PORT_STATUS_RXPAUSE_MASK	0x0040
+#define RTL8366S_PORT_STATUS_AN_MASK		0x0080
+
+
+#define RTL8366S_PORT_NUM_CPU		5
+#define RTL8366S_NUM_PORTS		6
+#define RTL8366S_NUM_VLANS		16
+#define RTL8366S_NUM_LEDGROUPS		4
+#define RTL8366S_NUM_VIDS		4096
+#define RTL8366S_PRIORITYMAX		7
+#define RTL8366S_FIDMAX			7
+
+
+#define RTL8366S_PORT_1			(1 << 0) /* In userspace port 0 */
+#define RTL8366S_PORT_2			(1 << 1) /* In userspace port 1 */
+#define RTL8366S_PORT_3			(1 << 2) /* In userspace port 2 */
+#define RTL8366S_PORT_4			(1 << 3) /* In userspace port 3 */
+
+#define RTL8366S_PORT_UNKNOWN		(1 << 4) /* No known connection */
+#define RTL8366S_PORT_CPU		(1 << 5) /* CPU port */
+
+#define RTL8366S_PORT_ALL		(RTL8366S_PORT_1 |	\
+					 RTL8366S_PORT_2 |	\
+					 RTL8366S_PORT_3 |	\
+					 RTL8366S_PORT_4 |	\
+					 RTL8366S_PORT_UNKNOWN | \
+					 RTL8366S_PORT_CPU)
+
+#define RTL8366S_PORT_ALL_BUT_CPU	(RTL8366S_PORT_1 |	\
+					 RTL8366S_PORT_2 |	\
+					 RTL8366S_PORT_3 |	\
+					 RTL8366S_PORT_4 |	\
+					 RTL8366S_PORT_UNKNOWN)
+
+#define RTL8366S_PORT_ALL_EXTERNAL	(RTL8366S_PORT_1 |	\
+					 RTL8366S_PORT_2 |	\
+					 RTL8366S_PORT_3 |	\
+					 RTL8366S_PORT_4)
+
+#define RTL8366S_PORT_ALL_INTERNAL	(RTL8366S_PORT_UNKNOWN | \
+					 RTL8366S_PORT_CPU)
+
+#define RTL8366S_VLAN_VID_MASK		0xfff
+#define RTL8366S_VLAN_PRIORITY_SHIFT	12
+#define RTL8366S_VLAN_PRIORITY_MASK	0x7
+#define RTL8366S_VLAN_MEMBER_MASK	0x3f
+#define RTL8366S_VLAN_UNTAG_SHIFT	6
+#define RTL8366S_VLAN_UNTAG_MASK	0x3f
+#define RTL8366S_VLAN_FID_SHIFT		12
+#define RTL8366S_VLAN_FID_MASK		0x7
+
+static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
+	{ 0,  0, 4, "IfInOctets"				},
+	{ 0,  4, 4, "EtherStatsOctets"				},
+	{ 0,  8, 2, "EtherStatsUnderSizePkts"			},
+	{ 0, 10, 2, "EtherFragments"				},
+	{ 0, 12, 2, "EtherStatsPkts64Octets"			},
+	{ 0, 14, 2, "EtherStatsPkts65to127Octets"		},
+	{ 0, 16, 2, "EtherStatsPkts128to255Octets"		},
+	{ 0, 18, 2, "EtherStatsPkts256to511Octets"		},
+	{ 0, 20, 2, "EtherStatsPkts512to1023Octets"		},
+	{ 0, 22, 2, "EtherStatsPkts1024to1518Octets"		},
+	{ 0, 24, 2, "EtherOversizeStats"			},
+	{ 0, 26, 2, "EtherStatsJabbers"				},
+	{ 0, 28, 2, "IfInUcastPkts"				},
+	{ 0, 30, 2, "EtherStatsMulticastPkts"			},
+	{ 0, 32, 2, "EtherStatsBroadcastPkts"			},
+	{ 0, 34, 2, "EtherStatsDropEvents"			},
+	{ 0, 36, 2, "Dot3StatsFCSErrors"			},
+	{ 0, 38, 2, "Dot3StatsSymbolErrors"			},
+	{ 0, 40, 2, "Dot3InPauseFrames"				},
+	{ 0, 42, 2, "Dot3ControlInUnknownOpcodes"		},
+	{ 0, 44, 4, "IfOutOctets"				},
+	{ 0, 48, 2, "Dot3StatsSingleCollisionFrames"		},
+	{ 0, 50, 2, "Dot3StatMultipleCollisionFrames"		},
+	{ 0, 52, 2, "Dot3sDeferredTransmissions"		},
+	{ 0, 54, 2, "Dot3StatsLateCollisions"			},
+	{ 0, 56, 2, "EtherStatsCollisions"			},
+	{ 0, 58, 2, "Dot3StatsExcessiveCollisions"		},
+	{ 0, 60, 2, "Dot3OutPauseFrames"			},
+	{ 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"	},
+
+	/*
+	 * The following counters are accessible at a different
+	 * base address.
+	 */
+	{ 1,  0, 2, "Dot1dTpPortInDiscards"			},
+	{ 1,  2, 2, "IfOutUcastPkts"				},
+	{ 1,  4, 2, "IfOutMulticastPkts"			},
+	{ 1,  6, 2, "IfOutBroadcastPkts"			},
+};
+
+#define REG_WR(_smi, _reg, _val)					\
+	do {								\
+		err = rtl8366_smi_write_reg(_smi, _reg, _val);		\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+#define REG_RMW(_smi, _reg, _mask, _val)				\
+	do {								\
+		err = rtl8366_smi_rmwr(_smi, _reg, _mask, _val);	\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
+{
+	int timeout = 10;
+	u32 data;
+
+	rtl8366_smi_write_reg_noack(smi, RTL8366S_RESET_CTRL_REG,
+				    RTL8366S_CHIP_CTRL_RESET_HW);
+	do {
+		msleep(1);
+		if (rtl8366_smi_read_reg(smi, RTL8366S_RESET_CTRL_REG, &data))
+			return -EIO;
+
+		if (!(data & RTL8366S_CHIP_CTRL_RESET_HW))
+			break;
+	} while (--timeout);
+
+	if (!timeout) {
+		printk("Timeout waiting for the switch to reset\n");
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int rtl8366s_setup(struct rtl8366_smi *smi)
+{
+	struct rtl8366_platform_data *pdata;
+	int err;
+
+	pdata = smi->parent->platform_data;
+	if (pdata && pdata->num_initvals && pdata->initvals) {
+		unsigned i;
+
+		dev_info(smi->parent, "applying initvals\n");
+		for (i = 0; i < pdata->num_initvals; i++)
+			REG_WR(smi, pdata->initvals[i].reg,
+			       pdata->initvals[i].val);
+	}
+
+	/* set maximum packet length to 1536 bytes */
+	REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
+		RTL8366S_SGCR_MAX_LENGTH_1536);
+
+	/* enable learning for all ports */
+	REG_WR(smi, RTL8366S_SSCR0, 0);
+
+	/* enable auto ageing for all ports */
+	REG_WR(smi, RTL8366S_SSCR1, 0);
+
+	/*
+	 * discard VLAN tagged packets if the port is not a member of
+	 * the VLAN with which the packets is associated.
+	 */
+	REG_WR(smi, RTL8366S_VLAN_MEMBERINGRESS_REG, RTL8366S_PORT_ALL);
+
+	/* don't drop packets whose DA has not been learned */
+	REG_RMW(smi, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);
+
+	return 0;
+}
+
+static int rtl8366s_read_phy_reg(struct rtl8366_smi *smi,
+				 u32 phy_no, u32 page, u32 addr, u32 *data)
+{
+	u32 reg;
+	int ret;
+
+	if (phy_no > RTL8366S_PHY_NO_MAX)
+		return -EINVAL;
+
+	if (page > RTL8366S_PHY_PAGE_MAX)
+		return -EINVAL;
+
+	if (addr > RTL8366S_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
+				    RTL8366S_PHY_CTRL_READ);
+	if (ret)
+		return ret;
+
+	reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
+	      ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
+	      (addr & RTL8366S_PHY_REG_MASK);
+
+	ret = rtl8366_smi_write_reg(smi, reg, 0);
+	if (ret)
+		return ret;
+
+	ret = rtl8366_smi_read_reg(smi, RTL8366S_PHY_ACCESS_DATA_REG, data);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int rtl8366s_write_phy_reg(struct rtl8366_smi *smi,
+				  u32 phy_no, u32 page, u32 addr, u32 data)
+{
+	u32 reg;
+	int ret;
+
+	if (phy_no > RTL8366S_PHY_NO_MAX)
+		return -EINVAL;
+
+	if (page > RTL8366S_PHY_PAGE_MAX)
+		return -EINVAL;
+
+	if (addr > RTL8366S_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
+				    RTL8366S_PHY_CTRL_WRITE);
+	if (ret)
+		return ret;
+
+	reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
+	      ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
+	      (addr & RTL8366S_PHY_REG_MASK);
+
+	ret = rtl8366_smi_write_reg(smi, reg, data);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
+				   int port, unsigned long long *val)
+{
+	int i;
+	int err;
+	u32 addr, data;
+	u64 mibvalue;
+
+	if (port > RTL8366S_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
+		return -EINVAL;
+
+	switch (rtl8366s_mib_counters[counter].base) {
+	case 0:
+		addr = RTL8366S_MIB_COUNTER_BASE +
+		       RTL8366S_MIB_COUNTER_PORT_OFFSET * port;
+		break;
+
+	case 1:
+		addr = RTL8366S_MIB_COUNTER_BASE2 +
+			RTL8366S_MIB_COUNTER_PORT_OFFSET2 * port;
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	addr += rtl8366s_mib_counters[counter].offset;
+
+	/*
+	 * Writing access counter address first
+	 * then ASIC will prepare 64bits counter wait for being retrived
+	 */
+	data = 0; /* writing data will be discard by ASIC */
+	err = rtl8366_smi_write_reg(smi, addr, data);
+	if (err)
+		return err;
+
+	/* read MIB control register */
+	err =  rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
+	if (err)
+		return err;
+
+	if (data & RTL8366S_MIB_CTRL_BUSY_MASK)
+		return -EBUSY;
+
+	if (data & RTL8366S_MIB_CTRL_RESET_MASK)
+		return -EIO;
+
+	mibvalue = 0;
+	for (i = rtl8366s_mib_counters[counter].length; i > 0; i--) {
+		err = rtl8366_smi_read_reg(smi, addr + (i - 1), &data);
+		if (err)
+			return err;
+
+		mibvalue = (mibvalue << 16) | (data & 0xFFFF);
+	}
+
+	*val = mibvalue;
+	return 0;
+}
+
+static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
+				struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[2];
+	int err;
+	int i;
+
+	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
+
+	if (vid >= RTL8366S_NUM_VIDS)
+		return -EINVAL;
+
+	/* write VID */
+	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE,
+				    vid & RTL8366S_VLAN_VID_MASK);
+	if (err)
+		return err;
+
+	/* write table access control word */
+	err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
+				    RTL8366S_TABLE_VLAN_READ_CTRL);
+	if (err)
+		return err;
+
+	for (i = 0; i < 2; i++) {
+		err = rtl8366_smi_read_reg(smi,
+					   RTL8366S_VLAN_TABLE_READ_BASE + i,
+					   &data[i]);
+		if (err)
+			return err;
+	}
+
+	vlan4k->vid = vid;
+	vlan4k->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) &
+			RTL8366S_VLAN_UNTAG_MASK;
+	vlan4k->member = data[1] & RTL8366S_VLAN_MEMBER_MASK;
+	vlan4k->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) &
+			RTL8366S_VLAN_FID_MASK;
+
+	return 0;
+}
+
+static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
+				const struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[2];
+	int err;
+	int i;
+
+	if (vlan4k->vid >= RTL8366S_NUM_VIDS ||
+	    vlan4k->member > RTL8366S_VLAN_MEMBER_MASK ||
+	    vlan4k->untag > RTL8366S_VLAN_UNTAG_MASK ||
+	    vlan4k->fid > RTL8366S_FIDMAX)
+		return -EINVAL;
+
+	data[0] = vlan4k->vid & RTL8366S_VLAN_VID_MASK;
+	data[1] = (vlan4k->member & RTL8366S_VLAN_MEMBER_MASK) |
+		  ((vlan4k->untag & RTL8366S_VLAN_UNTAG_MASK) <<
+			RTL8366S_VLAN_UNTAG_SHIFT) |
+		  ((vlan4k->fid & RTL8366S_VLAN_FID_MASK) <<
+			RTL8366S_VLAN_FID_SHIFT);
+
+	for (i = 0; i < 2; i++) {
+		err = rtl8366_smi_write_reg(smi,
+					    RTL8366S_VLAN_TABLE_WRITE_BASE + i,
+					    data[i]);
+		if (err)
+			return err;
+	}
+
+	/* write table access control word */
+	err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
+				    RTL8366S_TABLE_VLAN_WRITE_CTRL);
+
+	return err;
+}
+
+static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[2];
+	int err;
+	int i;
+
+	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
+
+	if (index >= RTL8366S_NUM_VLANS)
+		return -EINVAL;
+
+	for (i = 0; i < 2; i++) {
+		err = rtl8366_smi_read_reg(smi,
+					   RTL8366S_VLAN_MC_BASE(index) + i,
+					   &data[i]);
+		if (err)
+			return err;
+	}
+
+	vlanmc->vid = data[0] & RTL8366S_VLAN_VID_MASK;
+	vlanmc->priority = (data[0] >> RTL8366S_VLAN_PRIORITY_SHIFT) &
+			   RTL8366S_VLAN_PRIORITY_MASK;
+	vlanmc->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) &
+			RTL8366S_VLAN_UNTAG_MASK;
+	vlanmc->member = data[1] & RTL8366S_VLAN_MEMBER_MASK;
+	vlanmc->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) &
+		      RTL8366S_VLAN_FID_MASK;
+
+	return 0;
+}
+
+static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				const struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[2];
+	int err;
+	int i;
+
+	if (index >= RTL8366S_NUM_VLANS ||
+	    vlanmc->vid >= RTL8366S_NUM_VIDS ||
+	    vlanmc->priority > RTL8366S_PRIORITYMAX ||
+	    vlanmc->member > RTL8366S_VLAN_MEMBER_MASK ||
+	    vlanmc->untag > RTL8366S_VLAN_UNTAG_MASK ||
+	    vlanmc->fid > RTL8366S_FIDMAX)
+		return -EINVAL;
+
+	data[0] = (vlanmc->vid & RTL8366S_VLAN_VID_MASK) |
+		  ((vlanmc->priority & RTL8366S_VLAN_PRIORITY_MASK) <<
+			RTL8366S_VLAN_PRIORITY_SHIFT);
+	data[1] = (vlanmc->member & RTL8366S_VLAN_MEMBER_MASK) |
+		  ((vlanmc->untag & RTL8366S_VLAN_UNTAG_MASK) <<
+			RTL8366S_VLAN_UNTAG_SHIFT) |
+		  ((vlanmc->fid & RTL8366S_VLAN_FID_MASK) <<
+			RTL8366S_VLAN_FID_SHIFT);
+
+	for (i = 0; i < 2; i++) {
+		err = rtl8366_smi_write_reg(smi,
+					    RTL8366S_VLAN_MC_BASE(index) + i,
+					    data[i]);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+static int rtl8366s_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
+{
+	u32 data;
+	int err;
+
+	if (port >= RTL8366S_NUM_PORTS)
+		return -EINVAL;
+
+	err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+				   &data);
+	if (err)
+		return err;
+
+	*val = (data >> RTL8366S_PORT_VLAN_CTRL_SHIFT(port)) &
+	       RTL8366S_PORT_VLAN_CTRL_MASK;
+
+	return 0;
+}
+
+static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
+{
+	if (port >= RTL8366S_NUM_PORTS || index >= RTL8366S_NUM_VLANS)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
+				RTL8366S_PORT_VLAN_CTRL_MASK <<
+					RTL8366S_PORT_VLAN_CTRL_SHIFT(port),
+				(index & RTL8366S_PORT_VLAN_CTRL_MASK) <<
+					RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
+}
+
+static int rtl8366s_enable_vlan(struct rtl8366_smi *smi, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8366S_SGCR, RTL8366S_SGCR_EN_VLAN,
+				(enable) ? RTL8366S_SGCR_EN_VLAN : 0);
+}
+
+static int rtl8366s_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8366S_VLAN_TB_CTRL_REG,
+				1, (enable) ? 1 : 0);
+}
+
+static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
+{
+	unsigned max = RTL8366S_NUM_VLANS;
+
+	if (smi->vlan4k_enabled)
+		max = RTL8366S_NUM_VIDS - 1;
+
+	if (vlan == 0 || vlan >= max)
+		return 0;
+
+	return 1;
+}
+
+static int rtl8366s_enable_port(struct rtl8366_smi *smi, int port, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8366S_PECR, (1 << port),
+				(enable) ? 0 : (1 << port));
+}
+
+static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
+}
+
+static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
+				     const struct switch_attr *attr,
+				     struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366S_LED_BLINKRATE_REG, &data);
+
+	val->value.i = (data & (RTL8366S_LED_BLINKRATE_MASK));
+
+	return 0;
+}
+
+static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	if (val->value.i >= 6)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8366S_LED_BLINKRATE_REG,
+				RTL8366S_LED_BLINKRATE_MASK,
+				val->value.i);
+}
+
+static int rtl8366s_sw_get_max_length(struct switch_dev *dev,
+					const struct switch_attr *attr,
+					struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8366S_SGCR, &data);
+
+	val->value.i = ((data & (RTL8366S_SGCR_MAX_LENGTH_MASK)) >> 4);
+
+	return 0;
+}
+
+static int rtl8366s_sw_set_max_length(struct switch_dev *dev,
+					const struct switch_attr *attr,
+					struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	char length_code;
+
+	switch (val->value.i) {
+		case 0:
+			length_code = RTL8366S_SGCR_MAX_LENGTH_1522;
+			break;
+		case 1:
+			length_code = RTL8366S_SGCR_MAX_LENGTH_1536;
+			break;
+		case 2:
+			length_code = RTL8366S_SGCR_MAX_LENGTH_1552;
+			break;
+		case 3:
+			length_code = RTL8366S_SGCR_MAX_LENGTH_16000;
+			break;
+		default:
+			return -EINVAL;
+	}
+
+	return rtl8366_smi_rmwr(smi, RTL8366S_SGCR,
+			RTL8366S_SGCR_MAX_LENGTH_MASK,
+			length_code);
+}
+
+static int rtl8366s_sw_get_learning_enable(struct switch_dev *dev,
+					   const struct switch_attr *attr,
+					   struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi,RTL8366S_SSCR0, &data);
+	val->value.i = !data;
+
+	return 0;
+}
+
+
+static int rtl8366s_sw_set_learning_enable(struct switch_dev *dev,
+					   const struct switch_attr *attr,
+					   struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 portmask = 0;
+	int err = 0;
+
+	if (!val->value.i)
+		portmask = RTL8366S_PORT_ALL;
+
+	/* set learning for all ports */
+	REG_WR(smi, RTL8366S_SSCR0, portmask);
+
+	/* set auto ageing for all ports */
+	REG_WR(smi, RTL8366S_SSCR1, portmask);
+
+	return 0;
+}
+
+static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
+				     int port,
+				     struct switch_port_link *link)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data = 0;
+	u32 speed;
+
+	if (port >= RTL8366S_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE + (port / 2),
+			     &data);
+
+	if (port % 2)
+		data = data >> 8;
+
+	link->link = !!(data & RTL8366S_PORT_STATUS_LINK_MASK);
+	if (!link->link)
+		return 0;
+
+	link->duplex = !!(data & RTL8366S_PORT_STATUS_DUPLEX_MASK);
+	link->rx_flow = !!(data & RTL8366S_PORT_STATUS_RXPAUSE_MASK);
+	link->tx_flow = !!(data & RTL8366S_PORT_STATUS_TXPAUSE_MASK);
+	link->aneg = !!(data & RTL8366S_PORT_STATUS_AN_MASK);
+
+	speed = (data & RTL8366S_PORT_STATUS_SPEED_MASK);
+	switch (speed) {
+	case 0:
+		link->speed = SWITCH_PORT_SPEED_10;
+		break;
+	case 1:
+		link->speed = SWITCH_PORT_SPEED_100;
+		break;
+	case 2:
+		link->speed = SWITCH_PORT_SPEED_1000;
+		break;
+	default:
+		link->speed = SWITCH_PORT_SPEED_UNKNOWN;
+		break;
+	}
+
+	return 0;
+}
+
+static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+	u32 mask;
+	u32 reg;
+
+	if (val->port_vlan >= RTL8366S_NUM_PORTS ||
+	    (1 << val->port_vlan) == RTL8366S_PORT_UNKNOWN)
+		return -EINVAL;
+
+	if (val->port_vlan == RTL8366S_PORT_NUM_CPU) {
+		reg = RTL8366S_LED_BLINKRATE_REG;
+		mask = 0xF << 4;
+		data = val->value.i << 4;
+	} else {
+		reg = RTL8366S_LED_CTRL_REG;
+		mask = 0xF << (val->port_vlan * 4),
+		data = val->value.i << (val->port_vlan * 4);
+	}
+
+	return rtl8366_smi_rmwr(smi, reg, mask, data);
+}
+
+static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
+				    const struct switch_attr *attr,
+				    struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data = 0;
+
+	if (val->port_vlan >= RTL8366S_NUM_LEDGROUPS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8366S_LED_CTRL_REG, &data);
+	val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
+
+	return 0;
+}
+
+static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	if (val->port_vlan >= RTL8366S_NUM_PORTS)
+		return -EINVAL;
+
+
+	return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG,
+				0, (1 << (val->port_vlan + 3)));
+}
+
+static struct switch_attr rtl8366s_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_learning",
+		.description = "Enable learning, enable aging",
+		.set = rtl8366s_sw_set_learning_enable,
+		.get = rtl8366s_sw_get_learning_enable,
+		.max = 1,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan4k",
+		.description = "Enable VLAN 4K mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 2
+	}, {
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mibs",
+		.description = "Reset all MIB counters",
+		.set = rtl8366s_sw_reset_mibs,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "blinkrate",
+		.description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms,"
+		" 2 = 120ms, 3 = 170ms, 4 = 340ms, 5 = 670ms)",
+		.set = rtl8366s_sw_set_blinkrate,
+		.get = rtl8366s_sw_get_blinkrate,
+		.max = 5
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "max_length",
+		.description = "Get/Set the maximum length of valid packets"
+		" (0 = 1522, 1 = 1536, 2 = 1552, 3 = 16000 (9216?))",
+		.set = rtl8366s_sw_set_max_length,
+		.get = rtl8366s_sw_get_max_length,
+		.max = 3,
+	},
+};
+
+static struct switch_attr rtl8366s_port[] = {
+	{
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mib",
+		.description = "Reset single port MIB counters",
+		.set = rtl8366s_sw_reset_port_mibs,
+	}, {
+		.type = SWITCH_TYPE_STRING,
+		.name = "mib",
+		.description = "Get MIB counters for port",
+		.max = 33,
+		.set = NULL,
+		.get = rtl8366_sw_get_port_mib,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "led",
+		.description = "Get/Set port group (0 - 3) led mode (0 - 15)",
+		.max = 15,
+		.set = rtl8366s_sw_set_port_led,
+		.get = rtl8366s_sw_get_port_led,
+	},
+};
+
+static struct switch_attr rtl8366s_vlan[] = {
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "info",
+		.description = "Get vlan information",
+		.max = 1,
+		.set = NULL,
+		.get = rtl8366_sw_get_vlan_info,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "fid",
+		.description = "Get/Set vlan FID",
+		.max = RTL8366S_FIDMAX,
+		.set = rtl8366_sw_set_vlan_fid,
+		.get = rtl8366_sw_get_vlan_fid,
+	},
+};
+
+static const struct switch_dev_ops rtl8366_ops = {
+	.attr_global = {
+		.attr = rtl8366s_globals,
+		.n_attr = ARRAY_SIZE(rtl8366s_globals),
+	},
+	.attr_port = {
+		.attr = rtl8366s_port,
+		.n_attr = ARRAY_SIZE(rtl8366s_port),
+	},
+	.attr_vlan = {
+		.attr = rtl8366s_vlan,
+		.n_attr = ARRAY_SIZE(rtl8366s_vlan),
+	},
+
+	.get_vlan_ports = rtl8366_sw_get_vlan_ports,
+	.set_vlan_ports = rtl8366_sw_set_vlan_ports,
+	.get_port_pvid = rtl8366_sw_get_port_pvid,
+	.set_port_pvid = rtl8366_sw_set_port_pvid,
+	.reset_switch = rtl8366_sw_reset_switch,
+	.get_port_link = rtl8366s_sw_get_port_link,
+};
+
+static int rtl8366s_switch_init(struct rtl8366_smi *smi)
+{
+	struct switch_dev *dev = &smi->sw_dev;
+	int err;
+
+	dev->name = "RTL8366S";
+	dev->cpu_port = RTL8366S_PORT_NUM_CPU;
+	dev->ports = RTL8366S_NUM_PORTS;
+	dev->vlans = RTL8366S_NUM_VIDS;
+	dev->ops = &rtl8366_ops;
+	dev->alias = dev_name(smi->parent);
+
+	err = register_switch(dev, NULL);
+	if (err)
+		dev_err(smi->parent, "switch registration failed\n");
+
+	return err;
+}
+
+static void rtl8366s_switch_cleanup(struct rtl8366_smi *smi)
+{
+	unregister_switch(&smi->sw_dev);
+}
+
+static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 val = 0;
+	int err;
+
+	err = rtl8366s_read_phy_reg(smi, addr, 0, reg, &val);
+	if (err)
+		return 0xffff;
+
+	return val;
+}
+
+static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 t;
+	int err;
+
+	err = rtl8366s_write_phy_reg(smi, addr, 0, reg, val);
+	/* flush write */
+	(void) rtl8366s_read_phy_reg(smi, addr, 0, reg, &t);
+
+	return err;
+}
+
+static int rtl8366s_detect(struct rtl8366_smi *smi)
+{
+	u32 chip_id = 0;
+	u32 chip_ver = 0;
+	int ret;
+
+	ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_ID_REG, &chip_id);
+	if (ret) {
+		dev_err(smi->parent, "unable to read chip id\n");
+		return ret;
+	}
+
+	switch (chip_id) {
+	case RTL8366S_CHIP_ID_8366:
+		break;
+	default:
+		dev_err(smi->parent, "unknown chip id (%04x)\n", chip_id);
+		return -ENODEV;
+	}
+
+	ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_VERSION_CTRL_REG,
+				   &chip_ver);
+	if (ret) {
+		dev_err(smi->parent, "unable to read chip version\n");
+		return ret;
+	}
+
+	dev_info(smi->parent, "RTL%04x ver. %u chip found\n",
+		 chip_id, chip_ver & RTL8366S_CHIP_VERSION_MASK);
+
+	return 0;
+}
+
+static struct rtl8366_smi_ops rtl8366s_smi_ops = {
+	.detect		= rtl8366s_detect,
+	.reset_chip	= rtl8366s_reset_chip,
+	.setup		= rtl8366s_setup,
+
+	.mii_read	= rtl8366s_mii_read,
+	.mii_write	= rtl8366s_mii_write,
+
+	.get_vlan_mc	= rtl8366s_get_vlan_mc,
+	.set_vlan_mc	= rtl8366s_set_vlan_mc,
+	.get_vlan_4k	= rtl8366s_get_vlan_4k,
+	.set_vlan_4k	= rtl8366s_set_vlan_4k,
+	.get_mc_index	= rtl8366s_get_mc_index,
+	.set_mc_index	= rtl8366s_set_mc_index,
+	.get_mib_counter = rtl8366_get_mib_counter,
+	.is_vlan_valid	= rtl8366s_is_vlan_valid,
+	.enable_vlan	= rtl8366s_enable_vlan,
+	.enable_vlan4k	= rtl8366s_enable_vlan4k,
+	.enable_port	= rtl8366s_enable_port,
+};
+
+static int rtl8366s_probe(struct platform_device *pdev)
+{
+	static int rtl8366_smi_version_printed;
+	struct rtl8366_smi *smi;
+	int err;
+
+	if (!rtl8366_smi_version_printed++)
+		printk(KERN_NOTICE RTL8366S_DRIVER_DESC
+		       " version " RTL8366S_DRIVER_VER"\n");
+
+	smi = rtl8366_smi_probe(pdev);
+	if (!smi)
+		return -ENODEV;
+
+	smi->clk_delay = 10;
+	smi->cmd_read = 0xa9;
+	smi->cmd_write = 0xa8;
+	smi->ops = &rtl8366s_smi_ops;
+	smi->cpu_port = RTL8366S_PORT_NUM_CPU;
+	smi->num_ports = RTL8366S_NUM_PORTS;
+	smi->num_vlan_mc = RTL8366S_NUM_VLANS;
+	smi->mib_counters = rtl8366s_mib_counters;
+	smi->num_mib_counters = ARRAY_SIZE(rtl8366s_mib_counters);
+
+	err = rtl8366_smi_init(smi);
+	if (err)
+		goto err_free_smi;
+
+	platform_set_drvdata(pdev, smi);
+
+	err = rtl8366s_switch_init(smi);
+	if (err)
+		goto err_clear_drvdata;
+
+	return 0;
+
+ err_clear_drvdata:
+	platform_set_drvdata(pdev, NULL);
+	rtl8366_smi_cleanup(smi);
+ err_free_smi:
+	kfree(smi);
+	return err;
+}
+
+static int rtl8366s_remove(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
+
+	if (smi) {
+		rtl8366s_switch_cleanup(smi);
+		platform_set_drvdata(pdev, NULL);
+		rtl8366_smi_cleanup(smi);
+		kfree(smi);
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id rtl8366s_match[] = {
+	{ .compatible = "realtek,rtl8366s" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, rtl8366s_match);
+#endif
+
+static struct platform_driver rtl8366s_driver = {
+	.driver = {
+		.name		= RTL8366S_DRIVER_NAME,
+		.owner		= THIS_MODULE,
+#ifdef CONFIG_OF
+		.of_match_table = of_match_ptr(rtl8366s_match),
+#endif
+	},
+	.probe		= rtl8366s_probe,
+	.remove		= rtl8366s_remove,
+};
+
+static int __init rtl8366s_module_init(void)
+{
+	return platform_driver_register(&rtl8366s_driver);
+}
+module_init(rtl8366s_module_init);
+
+static void __exit rtl8366s_module_exit(void)
+{
+	platform_driver_unregister(&rtl8366s_driver);
+}
+module_exit(rtl8366s_module_exit);
+
+MODULE_DESCRIPTION(RTL8366S_DRIVER_DESC);
+MODULE_VERSION(RTL8366S_DRIVER_VER);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" RTL8366S_DRIVER_NAME);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/rtl8367.c b/trunk/target/linux/generic/files/drivers/net/phy/rtl8367.c
new file mode 100644
index 00000000..4978a8cb
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/rtl8367.c
@@ -0,0 +1,1835 @@
+/*
+ * Platform driver for the Realtek RTL8367R/M ethernet switches
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/rtl8367.h>
+
+#include "rtl8366_smi.h"
+
+#define RTL8367_RESET_DELAY	1000	/* msecs*/
+
+#define RTL8367_PHY_ADDR_MAX	8
+#define RTL8367_PHY_REG_MAX	31
+
+#define RTL8367_VID_MASK	0xffff
+#define RTL8367_FID_MASK	0xfff
+#define RTL8367_UNTAG_MASK	0xffff
+#define RTL8367_MEMBER_MASK	0xffff
+
+#define RTL8367_PORT_CFG_REG(_p)		(0x000e + 0x20 * (_p))
+#define   RTL8367_PORT_CFG_EGRESS_MODE_SHIFT	4
+#define   RTL8367_PORT_CFG_EGRESS_MODE_MASK	0x3
+#define   RTL8367_PORT_CFG_EGRESS_MODE_ORIGINAL	0
+#define   RTL8367_PORT_CFG_EGRESS_MODE_KEEP	1
+#define   RTL8367_PORT_CFG_EGRESS_MODE_PRI	2
+#define   RTL8367_PORT_CFG_EGRESS_MODE_REAL	3
+
+#define RTL8367_BYPASS_LINE_RATE_REG		0x03f7
+
+#define RTL8367_TA_CTRL_REG			0x0500
+#define   RTL8367_TA_CTRL_STATUS		BIT(12)
+#define   RTL8367_TA_CTRL_METHOD		BIT(5)
+#define   RTL8367_TA_CTRL_CMD_SHIFT		4
+#define   RTL8367_TA_CTRL_CMD_READ		0
+#define   RTL8367_TA_CTRL_CMD_WRITE		1
+#define   RTL8367_TA_CTRL_TABLE_SHIFT		0
+#define   RTL8367_TA_CTRL_TABLE_ACLRULE		1
+#define   RTL8367_TA_CTRL_TABLE_ACLACT		2
+#define   RTL8367_TA_CTRL_TABLE_CVLAN		3
+#define   RTL8367_TA_CTRL_TABLE_L2		4
+#define   RTL8367_TA_CTRL_CVLAN_READ \
+		((RTL8367_TA_CTRL_CMD_READ << RTL8367_TA_CTRL_CMD_SHIFT) | \
+		 RTL8367_TA_CTRL_TABLE_CVLAN)
+#define   RTL8367_TA_CTRL_CVLAN_WRITE \
+		((RTL8367_TA_CTRL_CMD_WRITE << RTL8367_TA_CTRL_CMD_SHIFT) | \
+		 RTL8367_TA_CTRL_TABLE_CVLAN)
+
+#define RTL8367_TA_ADDR_REG			0x0501
+#define   RTL8367_TA_ADDR_MASK			0x3fff
+
+#define RTL8367_TA_DATA_REG(_x)			(0x0503 + (_x))
+#define   RTL8367_TA_VLAN_DATA_SIZE		4
+#define   RTL8367_TA_VLAN_VID_MASK		RTL8367_VID_MASK
+#define   RTL8367_TA_VLAN_MEMBER_SHIFT		0
+#define   RTL8367_TA_VLAN_MEMBER_MASK		RTL8367_MEMBER_MASK
+#define   RTL8367_TA_VLAN_FID_SHIFT		0
+#define   RTL8367_TA_VLAN_FID_MASK		RTL8367_FID_MASK
+#define   RTL8367_TA_VLAN_UNTAG1_SHIFT		14
+#define   RTL8367_TA_VLAN_UNTAG1_MASK		0x3
+#define   RTL8367_TA_VLAN_UNTAG2_SHIFT		0
+#define   RTL8367_TA_VLAN_UNTAG2_MASK		0x3fff
+
+#define RTL8367_VLAN_PVID_CTRL_REG(_p)		(0x0700 + (_p) / 2)
+#define RTL8367_VLAN_PVID_CTRL_MASK		0x1f
+#define RTL8367_VLAN_PVID_CTRL_SHIFT(_p)	(8 * ((_p) % 2))
+
+#define RTL8367_VLAN_MC_BASE(_x)		(0x0728 + (_x) * 4)
+#define   RTL8367_VLAN_MC_DATA_SIZE		4
+#define   RTL8367_VLAN_MC_MEMBER_SHIFT		0
+#define   RTL8367_VLAN_MC_MEMBER_MASK		RTL8367_MEMBER_MASK
+#define   RTL8367_VLAN_MC_FID_SHIFT		0
+#define   RTL8367_VLAN_MC_FID_MASK		RTL8367_FID_MASK
+#define   RTL8367_VLAN_MC_EVID_SHIFT		0
+#define   RTL8367_VLAN_MC_EVID_MASK		RTL8367_VID_MASK
+
+#define RTL8367_VLAN_CTRL_REG			0x07a8
+#define   RTL8367_VLAN_CTRL_ENABLE		BIT(0)
+
+#define RTL8367_VLAN_INGRESS_REG		0x07a9
+
+#define RTL8367_PORT_ISOLATION_REG(_p)		(0x08a2 + (_p))
+
+#define RTL8367_MIB_COUNTER_REG(_x)		(0x1000 + (_x))
+
+#define RTL8367_MIB_ADDRESS_REG			0x1004
+
+#define RTL8367_MIB_CTRL_REG(_x)		(0x1005 + (_x))
+#define   RTL8367_MIB_CTRL_GLOBAL_RESET_MASK	BIT(11)
+#define   RTL8367_MIB_CTRL_QM_RESET_MASK	BIT(10)
+#define   RTL8367_MIB_CTRL_PORT_RESET_MASK(_p)	BIT(2 + (_p))
+#define   RTL8367_MIB_CTRL_RESET_MASK		BIT(1)
+#define   RTL8367_MIB_CTRL_BUSY_MASK		BIT(0)
+
+#define RTL8367_MIB_COUNT			36
+#define RTL8367_MIB_COUNTER_PORT_OFFSET		0x0050
+
+#define RTL8367_SWC0_REG			0x1200
+#define   RTL8367_SWC0_MAX_LENGTH_SHIFT		13
+#define   RTL8367_SWC0_MAX_LENGTH(_x)		((_x) << 13)
+#define   RTL8367_SWC0_MAX_LENGTH_MASK		RTL8367_SWC0_MAX_LENGTH(0x3)
+#define   RTL8367_SWC0_MAX_LENGTH_1522		RTL8367_SWC0_MAX_LENGTH(0)
+#define   RTL8367_SWC0_MAX_LENGTH_1536		RTL8367_SWC0_MAX_LENGTH(1)
+#define   RTL8367_SWC0_MAX_LENGTH_1552		RTL8367_SWC0_MAX_LENGTH(2)
+#define   RTL8367_SWC0_MAX_LENGTH_16000		RTL8367_SWC0_MAX_LENGTH(3)
+
+#define RTL8367_CHIP_NUMBER_REG			0x1300
+
+#define RTL8367_CHIP_VER_REG			0x1301
+#define   RTL8367_CHIP_VER_RLVID_SHIFT		12
+#define   RTL8367_CHIP_VER_RLVID_MASK		0xf
+#define   RTL8367_CHIP_VER_MCID_SHIFT		8
+#define   RTL8367_CHIP_VER_MCID_MASK		0xf
+#define   RTL8367_CHIP_VER_BOID_SHIFT		4
+#define   RTL8367_CHIP_VER_BOID_MASK		0xf
+
+#define RTL8367_CHIP_MODE_REG			0x1302
+#define   RTL8367_CHIP_MODE_MASK		0x7
+
+#define RTL8367_CHIP_DEBUG0_REG			0x1303
+#define   RTL8367_CHIP_DEBUG0_DUMMY0(_x)	BIT(8 + (_x))
+
+#define RTL8367_CHIP_DEBUG1_REG			0x1304
+
+#define RTL8367_DIS_REG				0x1305
+#define   RTL8367_DIS_SKIP_MII_RXER(_x)		BIT(12 + (_x))
+#define   RTL8367_DIS_RGMII_SHIFT(_x)		(4 * (_x))
+#define   RTL8367_DIS_RGMII_MASK		0x7
+
+#define RTL8367_EXT_RGMXF_REG(_x)		(0x1306 + (_x))
+#define   RTL8367_EXT_RGMXF_DUMMY0_SHIFT	5
+#define   RTL8367_EXT_RGMXF_DUMMY0_MASK	0x7ff
+#define   RTL8367_EXT_RGMXF_TXDELAY_SHIFT	3
+#define   RTL8367_EXT_RGMXF_TXDELAY_MASK	1
+#define   RTL8367_EXT_RGMXF_RXDELAY_MASK	0x7
+
+#define RTL8367_DI_FORCE_REG(_x)		(0x1310 + (_x))
+#define   RTL8367_DI_FORCE_MODE			BIT(12)
+#define   RTL8367_DI_FORCE_NWAY			BIT(7)
+#define   RTL8367_DI_FORCE_TXPAUSE		BIT(6)
+#define   RTL8367_DI_FORCE_RXPAUSE		BIT(5)
+#define   RTL8367_DI_FORCE_LINK			BIT(4)
+#define   RTL8367_DI_FORCE_DUPLEX		BIT(2)
+#define   RTL8367_DI_FORCE_SPEED_MASK		3
+#define   RTL8367_DI_FORCE_SPEED_10		0
+#define   RTL8367_DI_FORCE_SPEED_100		1
+#define   RTL8367_DI_FORCE_SPEED_1000		2
+
+#define RTL8367_MAC_FORCE_REG(_x)		(0x1312 + (_x))
+
+#define RTL8367_CHIP_RESET_REG			0x1322
+#define   RTL8367_CHIP_RESET_SW			BIT(1)
+#define   RTL8367_CHIP_RESET_HW			BIT(0)
+
+#define RTL8367_PORT_STATUS_REG(_p)		(0x1352 + (_p))
+#define   RTL8367_PORT_STATUS_NWAY		BIT(7)
+#define   RTL8367_PORT_STATUS_TXPAUSE		BIT(6)
+#define   RTL8367_PORT_STATUS_RXPAUSE		BIT(5)
+#define   RTL8367_PORT_STATUS_LINK		BIT(4)
+#define   RTL8367_PORT_STATUS_DUPLEX		BIT(2)
+#define   RTL8367_PORT_STATUS_SPEED_MASK	0x0003
+#define   RTL8367_PORT_STATUS_SPEED_10		0
+#define   RTL8367_PORT_STATUS_SPEED_100		1
+#define   RTL8367_PORT_STATUS_SPEED_1000	2
+
+#define RTL8367_RTL_NO_REG			0x13c0
+#define   RTL8367_RTL_NO_8367R			0x3670
+#define   RTL8367_RTL_NO_8367M			0x3671
+
+#define RTL8367_RTL_VER_REG			0x13c1
+#define   RTL8367_RTL_VER_MASK			0xf
+
+#define RTL8367_RTL_MAGIC_ID_REG		0x13c2
+#define   RTL8367_RTL_MAGIC_ID_VAL		0x0249
+
+#define RTL8367_LED_SYS_CONFIG_REG		0x1b00
+#define RTL8367_LED_MODE_REG			0x1b02
+#define   RTL8367_LED_MODE_RATE_M		0x7
+#define   RTL8367_LED_MODE_RATE_S		1
+
+#define RTL8367_LED_CONFIG_REG			0x1b03
+#define   RTL8367_LED_CONFIG_DATA_S		12
+#define   RTL8367_LED_CONFIG_DATA_M		0x3
+#define   RTL8367_LED_CONFIG_SEL		BIT(14)
+#define   RTL8367_LED_CONFIG_LED_CFG_M		0xf
+
+#define RTL8367_PARA_LED_IO_EN1_REG		0x1b24
+#define RTL8367_PARA_LED_IO_EN2_REG		0x1b25
+#define   RTL8367_PARA_LED_IO_EN_PMASK		0xff
+
+#define RTL8367_IA_CTRL_REG			0x1f00
+#define   RTL8367_IA_CTRL_RW(_x)		((_x) << 1)
+#define   RTL8367_IA_CTRL_RW_READ		RTL8367_IA_CTRL_RW(0)
+#define   RTL8367_IA_CTRL_RW_WRITE		RTL8367_IA_CTRL_RW(1)
+#define   RTL8367_IA_CTRL_CMD_MASK		BIT(0)
+
+#define RTL8367_IA_STATUS_REG			0x1f01
+#define   RTL8367_IA_STATUS_PHY_BUSY		BIT(2)
+#define   RTL8367_IA_STATUS_SDS_BUSY		BIT(1)
+#define   RTL8367_IA_STATUS_MDX_BUSY		BIT(0)
+
+#define RTL8367_IA_ADDRESS_REG			0x1f02
+
+#define RTL8367_IA_WRITE_DATA_REG		0x1f03
+#define RTL8367_IA_READ_DATA_REG		0x1f04
+
+#define RTL8367_INTERNAL_PHY_REG(_a, _r)	(0x2000 + 32 * (_a) + (_r))
+
+#define RTL8367_CPU_PORT_NUM		9
+#define RTL8367_NUM_PORTS		10
+#define RTL8367_NUM_VLANS		32
+#define RTL8367_NUM_LEDGROUPS		4
+#define RTL8367_NUM_VIDS		4096
+#define RTL8367_PRIORITYMAX		7
+#define RTL8367_FIDMAX			7
+
+#define RTL8367_PORT_0			BIT(0)
+#define RTL8367_PORT_1			BIT(1)
+#define RTL8367_PORT_2			BIT(2)
+#define RTL8367_PORT_3			BIT(3)
+#define RTL8367_PORT_4			BIT(4)
+#define RTL8367_PORT_5			BIT(5)
+#define RTL8367_PORT_6			BIT(6)
+#define RTL8367_PORT_7			BIT(7)
+#define RTL8367_PORT_E1			BIT(8)	/* external port 1 */
+#define RTL8367_PORT_E0			BIT(9)	/* external port 0 */
+
+#define RTL8367_PORTS_ALL					\
+	(RTL8367_PORT_0 | RTL8367_PORT_1 | RTL8367_PORT_2 |	\
+	 RTL8367_PORT_3 | RTL8367_PORT_4 | RTL8367_PORT_5 |	\
+	 RTL8367_PORT_6 | RTL8367_PORT_7 | RTL8367_PORT_E1 |	\
+	 RTL8367_PORT_E0)
+
+#define RTL8367_PORTS_ALL_BUT_CPU				\
+	(RTL8367_PORT_0 | RTL8367_PORT_1 | RTL8367_PORT_2 |	\
+	 RTL8367_PORT_3 | RTL8367_PORT_4 | RTL8367_PORT_5 |	\
+	 RTL8367_PORT_6 | RTL8367_PORT_7 | RTL8367_PORT_E1)
+
+struct rtl8367_initval {
+	u16 reg;
+	u16 val;
+};
+
+static struct rtl8366_mib_counter rtl8367_mib_counters[] = {
+	{ 0,  0, 4, "IfInOctets"				},
+	{ 0,  4, 2, "Dot3StatsFCSErrors"			},
+	{ 0,  6, 2, "Dot3StatsSymbolErrors"			},
+	{ 0,  8, 2, "Dot3InPauseFrames"				},
+	{ 0, 10, 2, "Dot3ControlInUnknownOpcodes"		},
+	{ 0, 12, 2, "EtherStatsFragments"			},
+	{ 0, 14, 2, "EtherStatsJabbers"				},
+	{ 0, 16, 2, "IfInUcastPkts"				},
+	{ 0, 18, 2, "EtherStatsDropEvents"			},
+	{ 0, 20, 4, "EtherStatsOctets"				},
+
+	{ 0, 24, 2, "EtherStatsUnderSizePkts"			},
+	{ 0, 26, 2, "EtherOversizeStats"			},
+	{ 0, 28, 2, "EtherStatsPkts64Octets"			},
+	{ 0, 30, 2, "EtherStatsPkts65to127Octets"		},
+	{ 0, 32, 2, "EtherStatsPkts128to255Octets"		},
+	{ 0, 34, 2, "EtherStatsPkts256to511Octets"		},
+	{ 0, 36, 2, "EtherStatsPkts512to1023Octets"		},
+	{ 0, 38, 2, "EtherStatsPkts1024to1518Octets"		},
+	{ 0, 40, 2, "EtherStatsMulticastPkts"			},
+	{ 0, 42, 2, "EtherStatsBroadcastPkts"			},
+
+	{ 0, 44, 4, "IfOutOctets"				},
+
+	{ 0, 48, 2, "Dot3StatsSingleCollisionFrames"		},
+	{ 0, 50, 2, "Dot3StatMultipleCollisionFrames"		},
+	{ 0, 52, 2, "Dot3sDeferredTransmissions"		},
+	{ 0, 54, 2, "Dot3StatsLateCollisions"			},
+	{ 0, 56, 2, "EtherStatsCollisions"			},
+	{ 0, 58, 2, "Dot3StatsExcessiveCollisions"		},
+	{ 0, 60, 2, "Dot3OutPauseFrames"			},
+	{ 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"	},
+	{ 0, 64, 2, "Dot1dTpPortInDiscards"			},
+	{ 0, 66, 2, "IfOutUcastPkts"				},
+	{ 0, 68, 2, "IfOutMulticastPkts"			},
+	{ 0, 70, 2, "IfOutBroadcastPkts"			},
+	{ 0, 72, 2, "OutOampduPkts"				},
+	{ 0, 74, 2, "InOampduPkts"				},
+	{ 0, 76, 2, "PktgenPkts"				},
+};
+
+#define REG_RD(_smi, _reg, _val)					\
+	do {								\
+		err = rtl8366_smi_read_reg(_smi, _reg, _val);		\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+#define REG_WR(_smi, _reg, _val)					\
+	do {								\
+		err = rtl8366_smi_write_reg(_smi, _reg, _val);		\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+#define REG_RMW(_smi, _reg, _mask, _val)				\
+	do {								\
+		err = rtl8366_smi_rmwr(_smi, _reg, _mask, _val);	\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+static const struct rtl8367_initval rtl8367_initvals_0_0[] = {
+	{0x133f, 0x0030}, {0x133e, 0x000e}, {0x221f, 0x0000}, {0x2215, 0x1006},
+	{0x221f, 0x0005}, {0x2200, 0x00c6}, {0x221f, 0x0007}, {0x221e, 0x0048},
+	{0x2215, 0x6412}, {0x2216, 0x6412}, {0x2217, 0x6412}, {0x2218, 0x6412},
+	{0x2219, 0x6412}, {0x221A, 0x6412}, {0x221f, 0x0001}, {0x220c, 0xdbf0},
+	{0x2209, 0x2576}, {0x2207, 0x287E}, {0x220A, 0x68E5}, {0x221D, 0x3DA4},
+	{0x221C, 0xE7F7}, {0x2214, 0x7F52}, {0x2218, 0x7FCE}, {0x2208, 0x04B7},
+	{0x2206, 0x4072}, {0x2210, 0xF05E}, {0x221B, 0xB414}, {0x221F, 0x0003},
+	{0x221A, 0x06A6}, {0x2210, 0xF05E}, {0x2213, 0x06EB}, {0x2212, 0xF4D2},
+	{0x220E, 0xE120}, {0x2200, 0x7C00}, {0x2202, 0x5FD0}, {0x220D, 0x0207},
+	{0x221f, 0x0002}, {0x2205, 0x0978}, {0x2202, 0x8C01}, {0x2207, 0x3620},
+	{0x221C, 0x0001}, {0x2203, 0x0420}, {0x2204, 0x80C8}, {0x133e, 0x0ede},
+	{0x221f, 0x0002}, {0x220c, 0x0073}, {0x220d, 0xEB65}, {0x220e, 0x51d1},
+	{0x220f, 0x5dcb}, {0x2210, 0x3044}, {0x2211, 0x1800}, {0x2212, 0x7E00},
+	{0x2213, 0x0000}, {0x133f, 0x0010}, {0x133e, 0x0ffe}, {0x207f, 0x0002},
+	{0x2074, 0x3D22}, {0x2075, 0x2000}, {0x2076, 0x6040}, {0x2077, 0x0000},
+	{0x2078, 0x0f0a}, {0x2079, 0x50AB}, {0x207a, 0x0000}, {0x207b, 0x0f0f},
+	{0x205f, 0x0002}, {0x2054, 0xFF00}, {0x2055, 0x000A}, {0x2056, 0x000A},
+	{0x2057, 0x0005}, {0x2058, 0x0005}, {0x2059, 0x0000}, {0x205A, 0x0005},
+	{0x205B, 0x0005}, {0x205C, 0x0005}, {0x209f, 0x0002}, {0x2094, 0x00AA},
+	{0x2095, 0x00AA}, {0x2096, 0x00AA}, {0x2097, 0x00AA}, {0x2098, 0x0055},
+	{0x2099, 0x00AA}, {0x209A, 0x00AA}, {0x209B, 0x00AA}, {0x1363, 0x8354},
+	{0x1270, 0x3333}, {0x1271, 0x3333}, {0x1272, 0x3333}, {0x1330, 0x00DB},
+	{0x1203, 0xff00}, {0x1200, 0x7fc4}, {0x121d, 0x1006}, {0x121e, 0x03e8},
+	{0x121f, 0x02b3}, {0x1220, 0x028f}, {0x1221, 0x029b}, {0x1222, 0x0277},
+	{0x1223, 0x02b3}, {0x1224, 0x028f}, {0x1225, 0x029b}, {0x1226, 0x0277},
+	{0x1227, 0x00c0}, {0x1228, 0x00b4}, {0x122f, 0x00c0}, {0x1230, 0x00b4},
+	{0x1229, 0x0020}, {0x122a, 0x000c}, {0x1231, 0x0030}, {0x1232, 0x0024},
+	{0x0219, 0x0032}, {0x0200, 0x03e8}, {0x0201, 0x03e8}, {0x0202, 0x03e8},
+	{0x0203, 0x03e8}, {0x0204, 0x03e8}, {0x0205, 0x03e8}, {0x0206, 0x03e8},
+	{0x0207, 0x03e8}, {0x0218, 0x0032}, {0x0208, 0x029b}, {0x0209, 0x029b},
+	{0x020a, 0x029b}, {0x020b, 0x029b}, {0x020c, 0x029b}, {0x020d, 0x029b},
+	{0x020e, 0x029b}, {0x020f, 0x029b}, {0x0210, 0x029b}, {0x0211, 0x029b},
+	{0x0212, 0x029b}, {0x0213, 0x029b}, {0x0214, 0x029b}, {0x0215, 0x029b},
+	{0x0216, 0x029b}, {0x0217, 0x029b}, {0x0900, 0x0000}, {0x0901, 0x0000},
+	{0x0902, 0x0000}, {0x0903, 0x0000}, {0x0865, 0x3210}, {0x087b, 0x0000},
+	{0x087c, 0xff00}, {0x087d, 0x0000}, {0x087e, 0x0000}, {0x0801, 0x0100},
+	{0x0802, 0x0100}, {0x1700, 0x014C}, {0x0301, 0x00FF}, {0x12AA, 0x0096},
+	{0x133f, 0x0030}, {0x133e, 0x000e}, {0x221f, 0x0005}, {0x2200, 0x00C4},
+	{0x221f, 0x0000}, {0x2210, 0x05EF}, {0x2204, 0x05E1}, {0x2200, 0x1340},
+	{0x133f, 0x0010}, {0x20A0, 0x1940}, {0x20C0, 0x1940}, {0x20E0, 0x1940},
+};
+
+static const struct rtl8367_initval rtl8367_initvals_0_1[] = {
+	{0x133f, 0x0030}, {0x133e, 0x000e}, {0x221f, 0x0000}, {0x2215, 0x1006},
+	{0x221f, 0x0005}, {0x2200, 0x00c6}, {0x221f, 0x0007}, {0x221e, 0x0048},
+	{0x2215, 0x6412}, {0x2216, 0x6412}, {0x2217, 0x6412}, {0x2218, 0x6412},
+	{0x2219, 0x6412}, {0x221A, 0x6412}, {0x221f, 0x0001}, {0x220c, 0xdbf0},
+	{0x2209, 0x2576}, {0x2207, 0x287E}, {0x220A, 0x68E5}, {0x221D, 0x3DA4},
+	{0x221C, 0xE7F7}, {0x2214, 0x7F52}, {0x2218, 0x7FCE}, {0x2208, 0x04B7},
+	{0x2206, 0x4072}, {0x2210, 0xF05E}, {0x221B, 0xB414}, {0x221F, 0x0003},
+	{0x221A, 0x06A6}, {0x2210, 0xF05E}, {0x2213, 0x06EB}, {0x2212, 0xF4D2},
+	{0x220E, 0xE120}, {0x2200, 0x7C00}, {0x2202, 0x5FD0}, {0x220D, 0x0207},
+	{0x221f, 0x0002}, {0x2205, 0x0978}, {0x2202, 0x8C01}, {0x2207, 0x3620},
+	{0x221C, 0x0001}, {0x2203, 0x0420}, {0x2204, 0x80C8}, {0x133e, 0x0ede},
+	{0x221f, 0x0002}, {0x220c, 0x0073}, {0x220d, 0xEB65}, {0x220e, 0x51d1},
+	{0x220f, 0x5dcb}, {0x2210, 0x3044}, {0x2211, 0x1800}, {0x2212, 0x7E00},
+	{0x2213, 0x0000}, {0x133f, 0x0010}, {0x133e, 0x0ffe}, {0x207f, 0x0002},
+	{0x2074, 0x3D22}, {0x2075, 0x2000}, {0x2076, 0x6040}, {0x2077, 0x0000},
+	{0x2078, 0x0f0a}, {0x2079, 0x50AB}, {0x207a, 0x0000}, {0x207b, 0x0f0f},
+	{0x205f, 0x0002}, {0x2054, 0xFF00}, {0x2055, 0x000A}, {0x2056, 0x000A},
+	{0x2057, 0x0005}, {0x2058, 0x0005}, {0x2059, 0x0000}, {0x205A, 0x0005},
+	{0x205B, 0x0005}, {0x205C, 0x0005}, {0x209f, 0x0002}, {0x2094, 0x00AA},
+	{0x2095, 0x00AA}, {0x2096, 0x00AA}, {0x2097, 0x00AA}, {0x2098, 0x0055},
+	{0x2099, 0x00AA}, {0x209A, 0x00AA}, {0x209B, 0x00AA}, {0x1363, 0x8354},
+	{0x1270, 0x3333}, {0x1271, 0x3333}, {0x1272, 0x3333}, {0x1330, 0x00DB},
+	{0x1203, 0xff00}, {0x1200, 0x7fc4}, {0x121d, 0x1b06}, {0x121e, 0x07f0},
+	{0x121f, 0x0438}, {0x1220, 0x040f}, {0x1221, 0x040f}, {0x1222, 0x03eb},
+	{0x1223, 0x0438}, {0x1224, 0x040f}, {0x1225, 0x040f}, {0x1226, 0x03eb},
+	{0x1227, 0x0144}, {0x1228, 0x0138}, {0x122f, 0x0144}, {0x1230, 0x0138},
+	{0x1229, 0x0020}, {0x122a, 0x000c}, {0x1231, 0x0030}, {0x1232, 0x0024},
+	{0x0219, 0x0032}, {0x0200, 0x07d0}, {0x0201, 0x07d0}, {0x0202, 0x07d0},
+	{0x0203, 0x07d0}, {0x0204, 0x07d0}, {0x0205, 0x07d0}, {0x0206, 0x07d0},
+	{0x0207, 0x07d0}, {0x0218, 0x0032}, {0x0208, 0x0190}, {0x0209, 0x0190},
+	{0x020a, 0x0190}, {0x020b, 0x0190}, {0x020c, 0x0190}, {0x020d, 0x0190},
+	{0x020e, 0x0190}, {0x020f, 0x0190}, {0x0210, 0x0190}, {0x0211, 0x0190},
+	{0x0212, 0x0190}, {0x0213, 0x0190}, {0x0214, 0x0190}, {0x0215, 0x0190},
+	{0x0216, 0x0190}, {0x0217, 0x0190}, {0x0900, 0x0000}, {0x0901, 0x0000},
+	{0x0902, 0x0000}, {0x0903, 0x0000}, {0x0865, 0x3210}, {0x087b, 0x0000},
+	{0x087c, 0xff00}, {0x087d, 0x0000}, {0x087e, 0x0000}, {0x0801, 0x0100},
+	{0x0802, 0x0100}, {0x1700, 0x0125}, {0x0301, 0x00FF}, {0x12AA, 0x0096},
+	{0x133f, 0x0030}, {0x133e, 0x000e}, {0x221f, 0x0005}, {0x2200, 0x00C4},
+	{0x221f, 0x0000}, {0x2210, 0x05EF}, {0x2204, 0x05E1}, {0x2200, 0x1340},
+	{0x133f, 0x0010},
+};
+
+static const struct rtl8367_initval rtl8367_initvals_1_0[] = {
+	{0x1B24, 0x0000}, {0x1B25, 0x0000}, {0x1B26, 0x0000}, {0x1B27, 0x0000},
+	{0x207F, 0x0002}, {0x2079, 0x0200}, {0x207F, 0x0000}, {0x133F, 0x0030},
+	{0x133E, 0x000E}, {0x221F, 0x0005}, {0x2201, 0x0700}, {0x2205, 0x8B82},
+	{0x2206, 0x05CB}, {0x221F, 0x0002}, {0x2204, 0x80C2}, {0x2205, 0x0938},
+	{0x221F, 0x0003}, {0x2212, 0xC4D2}, {0x220D, 0x0207}, {0x221F, 0x0001},
+	{0x2207, 0x267E}, {0x221C, 0xE5F7}, {0x221B, 0x0424}, {0x221F, 0x0007},
+	{0x221E, 0x0040}, {0x2218, 0x0000}, {0x221F, 0x0007}, {0x221E, 0x002C},
+	{0x2218, 0x008B}, {0x221F, 0x0005}, {0x2205, 0xFFF6}, {0x2206, 0x0080},
+	{0x2205, 0x8000}, {0x2206, 0xF8E0}, {0x2206, 0xE000}, {0x2206, 0xE1E0},
+	{0x2206, 0x01AC}, {0x2206, 0x2408}, {0x2206, 0xE08B}, {0x2206, 0x84F7},
+	{0x2206, 0x20E4}, {0x2206, 0x8B84}, {0x2206, 0xFC05}, {0x2206, 0xF8FA},
+	{0x2206, 0xEF69}, {0x2206, 0xE08B}, {0x2206, 0x86AC}, {0x2206, 0x201A},
+	{0x2206, 0xBF80}, {0x2206, 0x59D0}, {0x2206, 0x2402}, {0x2206, 0x803D},
+	{0x2206, 0xE0E0}, {0x2206, 0xE4E1}, {0x2206, 0xE0E5}, {0x2206, 0x5806},
+	{0x2206, 0x68C0}, {0x2206, 0xD1D2}, {0x2206, 0xE4E0}, {0x2206, 0xE4E5},
+	{0x2206, 0xE0E5}, {0x2206, 0xEF96}, {0x2206, 0xFEFC}, {0x2206, 0x05FB},
+	{0x2206, 0x0BFB}, {0x2206, 0x58FF}, {0x2206, 0x9E11}, {0x2206, 0x06F0},
+	{0x2206, 0x0C81}, {0x2206, 0x8AE0}, {0x2206, 0x0019}, {0x2206, 0x1B89},
+	{0x2206, 0xCFEB}, {0x2206, 0x19EB}, {0x2206, 0x19B0}, {0x2206, 0xEFFF},
+	{0x2206, 0x0BFF}, {0x2206, 0x0425}, {0x2206, 0x0807}, {0x2206, 0x2640},
+	{0x2206, 0x7227}, {0x2206, 0x267E}, {0x2206, 0x2804}, {0x2206, 0xB729},
+	{0x2206, 0x2576}, {0x2206, 0x2A68}, {0x2206, 0xE52B}, {0x2206, 0xAD00},
+	{0x2206, 0x2CDB}, {0x2206, 0xF02D}, {0x2206, 0x67BB}, {0x2206, 0x2E7B},
+	{0x2206, 0x0F2F}, {0x2206, 0x7365}, {0x2206, 0x31AC}, {0x2206, 0xCC32},
+	{0x2206, 0x2300}, {0x2206, 0x332D}, {0x2206, 0x1734}, {0x2206, 0x7F52},
+	{0x2206, 0x3510}, {0x2206, 0x0036}, {0x2206, 0x0600}, {0x2206, 0x370C},
+	{0x2206, 0xC038}, {0x2206, 0x7FCE}, {0x2206, 0x3CE5}, {0x2206, 0xF73D},
+	{0x2206, 0x3DA4}, {0x2206, 0x6530}, {0x2206, 0x3E67}, {0x2206, 0x0053},
+	{0x2206, 0x69D2}, {0x2206, 0x0F6A}, {0x2206, 0x012C}, {0x2206, 0x6C2B},
+	{0x2206, 0x136E}, {0x2206, 0xE100}, {0x2206, 0x6F12}, {0x2206, 0xF771},
+	{0x2206, 0x006B}, {0x2206, 0x7306}, {0x2206, 0xEB74}, {0x2206, 0x94C7},
+	{0x2206, 0x7698}, {0x2206, 0x0A77}, {0x2206, 0x5000}, {0x2206, 0x788A},
+	{0x2206, 0x1579}, {0x2206, 0x7F6F}, {0x2206, 0x7A06}, {0x2206, 0xA600},
+	{0x2205, 0x8B90}, {0x2206, 0x8000}, {0x2205, 0x8B92}, {0x2206, 0x8000},
+	{0x2205, 0x8B94}, {0x2206, 0x8014}, {0x2208, 0xFFFA}, {0x2202, 0x3C65},
+	{0x2205, 0xFFF6}, {0x2206, 0x00F7}, {0x221F, 0x0000}, {0x221F, 0x0007},
+	{0x221E, 0x0042}, {0x2218, 0x0000}, {0x221E, 0x002D}, {0x2218, 0xF010},
+	{0x221E, 0x0020}, {0x2215, 0x0000}, {0x221E, 0x0023}, {0x2216, 0x8000},
+	{0x221F, 0x0000}, {0x133F, 0x0010}, {0x133E, 0x0FFE}, {0x1362, 0x0115},
+	{0x1363, 0x0002}, {0x1363, 0x0000}, {0x1306, 0x000C}, {0x1307, 0x000C},
+	{0x1303, 0x0067}, {0x1304, 0x4444}, {0x1203, 0xFF00}, {0x1200, 0x7FC4},
+	{0x121D, 0x7D16}, {0x121E, 0x03E8}, {0x121F, 0x024E}, {0x1220, 0x0230},
+	{0x1221, 0x0244}, {0x1222, 0x0226}, {0x1223, 0x024E}, {0x1224, 0x0230},
+	{0x1225, 0x0244}, {0x1226, 0x0226}, {0x1227, 0x00C0}, {0x1228, 0x00B4},
+	{0x122F, 0x00C0}, {0x1230, 0x00B4}, {0x0208, 0x03E8}, {0x0209, 0x03E8},
+	{0x020A, 0x03E8}, {0x020B, 0x03E8}, {0x020C, 0x03E8}, {0x020D, 0x03E8},
+	{0x020E, 0x03E8}, {0x020F, 0x03E8}, {0x0210, 0x03E8}, {0x0211, 0x03E8},
+	{0x0212, 0x03E8}, {0x0213, 0x03E8}, {0x0214, 0x03E8}, {0x0215, 0x03E8},
+	{0x0216, 0x03E8}, {0x0217, 0x03E8}, {0x0900, 0x0000}, {0x0901, 0x0000},
+	{0x0902, 0x0000}, {0x0903, 0x0000}, {0x0865, 0x3210}, {0x087B, 0x0000},
+	{0x087C, 0xFF00}, {0x087D, 0x0000}, {0x087E, 0x0000}, {0x0801, 0x0100},
+	{0x0802, 0x0100}, {0x0A20, 0x2040}, {0x0A21, 0x2040}, {0x0A22, 0x2040},
+	{0x0A23, 0x2040}, {0x0A24, 0x2040}, {0x0A28, 0x2040}, {0x0A29, 0x2040},
+	{0x133F, 0x0030}, {0x133E, 0x000E}, {0x221F, 0x0000}, {0x2200, 0x1340},
+	{0x221F, 0x0000}, {0x133F, 0x0010}, {0x133E, 0x0FFE}, {0x20A0, 0x1940},
+	{0x20C0, 0x1940}, {0x20E0, 0x1940}, {0x130c, 0x0050},
+};
+
+static const struct rtl8367_initval rtl8367_initvals_1_1[] = {
+	{0x1B24, 0x0000}, {0x1B25, 0x0000}, {0x1B26, 0x0000}, {0x1B27, 0x0000},
+	{0x207F, 0x0002}, {0x2079, 0x0200}, {0x207F, 0x0000}, {0x133F, 0x0030},
+	{0x133E, 0x000E}, {0x221F, 0x0005}, {0x2201, 0x0700}, {0x2205, 0x8B82},
+	{0x2206, 0x05CB}, {0x221F, 0x0002}, {0x2204, 0x80C2}, {0x2205, 0x0938},
+	{0x221F, 0x0003}, {0x2212, 0xC4D2}, {0x220D, 0x0207}, {0x221F, 0x0001},
+	{0x2207, 0x267E}, {0x221C, 0xE5F7}, {0x221B, 0x0424}, {0x221F, 0x0007},
+	{0x221E, 0x0040}, {0x2218, 0x0000}, {0x221F, 0x0007}, {0x221E, 0x002C},
+	{0x2218, 0x008B}, {0x221F, 0x0005}, {0x2205, 0xFFF6}, {0x2206, 0x0080},
+	{0x2205, 0x8000}, {0x2206, 0xF8E0}, {0x2206, 0xE000}, {0x2206, 0xE1E0},
+	{0x2206, 0x01AC}, {0x2206, 0x2408}, {0x2206, 0xE08B}, {0x2206, 0x84F7},
+	{0x2206, 0x20E4}, {0x2206, 0x8B84}, {0x2206, 0xFC05}, {0x2206, 0xF8FA},
+	{0x2206, 0xEF69}, {0x2206, 0xE08B}, {0x2206, 0x86AC}, {0x2206, 0x201A},
+	{0x2206, 0xBF80}, {0x2206, 0x59D0}, {0x2206, 0x2402}, {0x2206, 0x803D},
+	{0x2206, 0xE0E0}, {0x2206, 0xE4E1}, {0x2206, 0xE0E5}, {0x2206, 0x5806},
+	{0x2206, 0x68C0}, {0x2206, 0xD1D2}, {0x2206, 0xE4E0}, {0x2206, 0xE4E5},
+	{0x2206, 0xE0E5}, {0x2206, 0xEF96}, {0x2206, 0xFEFC}, {0x2206, 0x05FB},
+	{0x2206, 0x0BFB}, {0x2206, 0x58FF}, {0x2206, 0x9E11}, {0x2206, 0x06F0},
+	{0x2206, 0x0C81}, {0x2206, 0x8AE0}, {0x2206, 0x0019}, {0x2206, 0x1B89},
+	{0x2206, 0xCFEB}, {0x2206, 0x19EB}, {0x2206, 0x19B0}, {0x2206, 0xEFFF},
+	{0x2206, 0x0BFF}, {0x2206, 0x0425}, {0x2206, 0x0807}, {0x2206, 0x2640},
+	{0x2206, 0x7227}, {0x2206, 0x267E}, {0x2206, 0x2804}, {0x2206, 0xB729},
+	{0x2206, 0x2576}, {0x2206, 0x2A68}, {0x2206, 0xE52B}, {0x2206, 0xAD00},
+	{0x2206, 0x2CDB}, {0x2206, 0xF02D}, {0x2206, 0x67BB}, {0x2206, 0x2E7B},
+	{0x2206, 0x0F2F}, {0x2206, 0x7365}, {0x2206, 0x31AC}, {0x2206, 0xCC32},
+	{0x2206, 0x2300}, {0x2206, 0x332D}, {0x2206, 0x1734}, {0x2206, 0x7F52},
+	{0x2206, 0x3510}, {0x2206, 0x0036}, {0x2206, 0x0600}, {0x2206, 0x370C},
+	{0x2206, 0xC038}, {0x2206, 0x7FCE}, {0x2206, 0x3CE5}, {0x2206, 0xF73D},
+	{0x2206, 0x3DA4}, {0x2206, 0x6530}, {0x2206, 0x3E67}, {0x2206, 0x0053},
+	{0x2206, 0x69D2}, {0x2206, 0x0F6A}, {0x2206, 0x012C}, {0x2206, 0x6C2B},
+	{0x2206, 0x136E}, {0x2206, 0xE100}, {0x2206, 0x6F12}, {0x2206, 0xF771},
+	{0x2206, 0x006B}, {0x2206, 0x7306}, {0x2206, 0xEB74}, {0x2206, 0x94C7},
+	{0x2206, 0x7698}, {0x2206, 0x0A77}, {0x2206, 0x5000}, {0x2206, 0x788A},
+	{0x2206, 0x1579}, {0x2206, 0x7F6F}, {0x2206, 0x7A06}, {0x2206, 0xA600},
+	{0x2205, 0x8B90}, {0x2206, 0x8000}, {0x2205, 0x8B92}, {0x2206, 0x8000},
+	{0x2205, 0x8B94}, {0x2206, 0x8014}, {0x2208, 0xFFFA}, {0x2202, 0x3C65},
+	{0x2205, 0xFFF6}, {0x2206, 0x00F7}, {0x221F, 0x0000}, {0x221F, 0x0007},
+	{0x221E, 0x0042}, {0x2218, 0x0000}, {0x221E, 0x002D}, {0x2218, 0xF010},
+	{0x221E, 0x0020}, {0x2215, 0x0000}, {0x221E, 0x0023}, {0x2216, 0x8000},
+	{0x221F, 0x0000}, {0x133F, 0x0010}, {0x133E, 0x0FFE}, {0x1362, 0x0115},
+	{0x1363, 0x0002}, {0x1363, 0x0000}, {0x1306, 0x000C}, {0x1307, 0x000C},
+	{0x1303, 0x0067}, {0x1304, 0x4444}, {0x1203, 0xFF00}, {0x1200, 0x7FC4},
+	{0x0900, 0x0000}, {0x0901, 0x0000}, {0x0902, 0x0000}, {0x0903, 0x0000},
+	{0x0865, 0x3210}, {0x087B, 0x0000}, {0x087C, 0xFF00}, {0x087D, 0x0000},
+	{0x087E, 0x0000}, {0x0801, 0x0100}, {0x0802, 0x0100}, {0x0A20, 0x2040},
+	{0x0A21, 0x2040}, {0x0A22, 0x2040}, {0x0A23, 0x2040}, {0x0A24, 0x2040},
+	{0x0A25, 0x2040}, {0x0A26, 0x2040}, {0x0A27, 0x2040}, {0x0A28, 0x2040},
+	{0x0A29, 0x2040}, {0x133F, 0x0030}, {0x133E, 0x000E}, {0x221F, 0x0000},
+	{0x2200, 0x1340}, {0x221F, 0x0000}, {0x133F, 0x0010}, {0x133E, 0x0FFE},
+	{0x1B03, 0x0876},
+};
+
+static const struct rtl8367_initval rtl8367_initvals_2_0[] = {
+	{0x1b24, 0x0000}, {0x1b25, 0x0000}, {0x1b26, 0x0000}, {0x1b27, 0x0000},
+	{0x133f, 0x0030}, {0x133e, 0x000e}, {0x221f, 0x0007}, {0x221e, 0x0048},
+	{0x2219, 0x4012}, {0x221f, 0x0003}, {0x2201, 0x3554}, {0x2202, 0x63e8},
+	{0x2203, 0x99c2}, {0x2204, 0x0113}, {0x2205, 0x303e}, {0x220d, 0x0207},
+	{0x220e, 0xe100}, {0x221f, 0x0007}, {0x221e, 0x0040}, {0x2218, 0x0000},
+	{0x221f, 0x0007}, {0x221e, 0x002c}, {0x2218, 0x008b}, {0x221f, 0x0005},
+	{0x2205, 0xfff6}, {0x2206, 0x0080}, {0x221f, 0x0005}, {0x2205, 0x8000},
+	{0x2206, 0x0280}, {0x2206, 0x2bf7}, {0x2206, 0x00e0}, {0x2206, 0xfff7},
+	{0x2206, 0xa080}, {0x2206, 0x02ae}, {0x2206, 0xf602}, {0x2206, 0x804e},
+	{0x2206, 0x0201}, {0x2206, 0x5002}, {0x2206, 0x0163}, {0x2206, 0x0201},
+	{0x2206, 0x79e0}, {0x2206, 0x8b8c}, {0x2206, 0xe18b}, {0x2206, 0x8d1e},
+	{0x2206, 0x01e1}, {0x2206, 0x8b8e}, {0x2206, 0x1e01}, {0x2206, 0xa000},
+	{0x2206, 0xe4ae}, {0x2206, 0xd8bf}, {0x2206, 0x8b88}, {0x2206, 0xec00},
+	{0x2206, 0x19a9}, {0x2206, 0x8b90}, {0x2206, 0xf9ee}, {0x2206, 0xfff6},
+	{0x2206, 0x00ee}, {0x2206, 0xfff7}, {0x2206, 0xfce0}, {0x2206, 0xe140},
+	{0x2206, 0xe1e1}, {0x2206, 0x41f7}, {0x2206, 0x2ff6}, {0x2206, 0x28e4},
+	{0x2206, 0xe140}, {0x2206, 0xe5e1}, {0x2206, 0x4104}, {0x2206, 0xf8fa},
+	{0x2206, 0xef69}, {0x2206, 0xe08b}, {0x2206, 0x86ac}, {0x2206, 0x201a},
+	{0x2206, 0xbf80}, {0x2206, 0x77d0}, {0x2206, 0x6c02}, {0x2206, 0x2978},
+	{0x2206, 0xe0e0}, {0x2206, 0xe4e1}, {0x2206, 0xe0e5}, {0x2206, 0x5806},
+	{0x2206, 0x68c0}, {0x2206, 0xd1d2}, {0x2206, 0xe4e0}, {0x2206, 0xe4e5},
+	{0x2206, 0xe0e5}, {0x2206, 0xef96}, {0x2206, 0xfefc}, {0x2206, 0x0425},
+	{0x2206, 0x0807}, {0x2206, 0x2640}, {0x2206, 0x7227}, {0x2206, 0x267e},
+	{0x2206, 0x2804}, {0x2206, 0xb729}, {0x2206, 0x2576}, {0x2206, 0x2a68},
+	{0x2206, 0xe52b}, {0x2206, 0xad00}, {0x2206, 0x2cdb}, {0x2206, 0xf02d},
+	{0x2206, 0x67bb}, {0x2206, 0x2e7b}, {0x2206, 0x0f2f}, {0x2206, 0x7365},
+	{0x2206, 0x31ac}, {0x2206, 0xcc32}, {0x2206, 0x2300}, {0x2206, 0x332d},
+	{0x2206, 0x1734}, {0x2206, 0x7f52}, {0x2206, 0x3510}, {0x2206, 0x0036},
+	{0x2206, 0x0600}, {0x2206, 0x370c}, {0x2206, 0xc038}, {0x2206, 0x7fce},
+	{0x2206, 0x3ce5}, {0x2206, 0xf73d}, {0x2206, 0x3da4}, {0x2206, 0x6530},
+	{0x2206, 0x3e67}, {0x2206, 0x0053}, {0x2206, 0x69d2}, {0x2206, 0x0f6a},
+	{0x2206, 0x012c}, {0x2206, 0x6c2b}, {0x2206, 0x136e}, {0x2206, 0xe100},
+	{0x2206, 0x6f12}, {0x2206, 0xf771}, {0x2206, 0x006b}, {0x2206, 0x7306},
+	{0x2206, 0xeb74}, {0x2206, 0x94c7}, {0x2206, 0x7698}, {0x2206, 0x0a77},
+	{0x2206, 0x5000}, {0x2206, 0x788a}, {0x2206, 0x1579}, {0x2206, 0x7f6f},
+	{0x2206, 0x7a06}, {0x2206, 0xa600}, {0x2201, 0x0701}, {0x2200, 0x0405},
+	{0x221f, 0x0000}, {0x2200, 0x1340}, {0x221f, 0x0000}, {0x133f, 0x0010},
+	{0x133e, 0x0ffe}, {0x1203, 0xff00}, {0x1200, 0x7fc4}, {0x121d, 0x7D16},
+	{0x121e, 0x03e8}, {0x121f, 0x024e}, {0x1220, 0x0230}, {0x1221, 0x0244},
+	{0x1222, 0x0226}, {0x1223, 0x024e}, {0x1224, 0x0230}, {0x1225, 0x0244},
+	{0x1226, 0x0226}, {0x1227, 0x00c0}, {0x1228, 0x00b4}, {0x122f, 0x00c0},
+	{0x1230, 0x00b4}, {0x0208, 0x03e8}, {0x0209, 0x03e8}, {0x020a, 0x03e8},
+	{0x020b, 0x03e8}, {0x020c, 0x03e8}, {0x020d, 0x03e8}, {0x020e, 0x03e8},
+	{0x020f, 0x03e8}, {0x0210, 0x03e8}, {0x0211, 0x03e8}, {0x0212, 0x03e8},
+	{0x0213, 0x03e8}, {0x0214, 0x03e8}, {0x0215, 0x03e8}, {0x0216, 0x03e8},
+	{0x0217, 0x03e8}, {0x0900, 0x0000}, {0x0901, 0x0000}, {0x0902, 0x0000},
+	{0x0903, 0x0000}, {0x0865, 0x3210}, {0x087b, 0x0000}, {0x087c, 0xff00},
+	{0x087d, 0x0000}, {0x087e, 0x0000}, {0x0801, 0x0100}, {0x0802, 0x0100},
+	{0x0A20, 0x2040}, {0x0A21, 0x2040}, {0x0A22, 0x2040}, {0x0A23, 0x2040},
+	{0x0A24, 0x2040}, {0x0A28, 0x2040}, {0x0A29, 0x2040}, {0x20A0, 0x1940},
+	{0x20C0, 0x1940}, {0x20E0, 0x1940}, {0x130c, 0x0050},
+};
+
+static const struct rtl8367_initval rtl8367_initvals_2_1[] = {
+	{0x1b24, 0x0000}, {0x1b25, 0x0000}, {0x1b26, 0x0000}, {0x1b27, 0x0000},
+	{0x133f, 0x0030}, {0x133e, 0x000e}, {0x221f, 0x0007}, {0x221e, 0x0048},
+	{0x2219, 0x4012}, {0x221f, 0x0003}, {0x2201, 0x3554}, {0x2202, 0x63e8},
+	{0x2203, 0x99c2}, {0x2204, 0x0113}, {0x2205, 0x303e}, {0x220d, 0x0207},
+	{0x220e, 0xe100}, {0x221f, 0x0007}, {0x221e, 0x0040}, {0x2218, 0x0000},
+	{0x221f, 0x0007}, {0x221e, 0x002c}, {0x2218, 0x008b}, {0x221f, 0x0005},
+	{0x2205, 0xfff6}, {0x2206, 0x0080}, {0x221f, 0x0005}, {0x2205, 0x8000},
+	{0x2206, 0x0280}, {0x2206, 0x2bf7}, {0x2206, 0x00e0}, {0x2206, 0xfff7},
+	{0x2206, 0xa080}, {0x2206, 0x02ae}, {0x2206, 0xf602}, {0x2206, 0x804e},
+	{0x2206, 0x0201}, {0x2206, 0x5002}, {0x2206, 0x0163}, {0x2206, 0x0201},
+	{0x2206, 0x79e0}, {0x2206, 0x8b8c}, {0x2206, 0xe18b}, {0x2206, 0x8d1e},
+	{0x2206, 0x01e1}, {0x2206, 0x8b8e}, {0x2206, 0x1e01}, {0x2206, 0xa000},
+	{0x2206, 0xe4ae}, {0x2206, 0xd8bf}, {0x2206, 0x8b88}, {0x2206, 0xec00},
+	{0x2206, 0x19a9}, {0x2206, 0x8b90}, {0x2206, 0xf9ee}, {0x2206, 0xfff6},
+	{0x2206, 0x00ee}, {0x2206, 0xfff7}, {0x2206, 0xfce0}, {0x2206, 0xe140},
+	{0x2206, 0xe1e1}, {0x2206, 0x41f7}, {0x2206, 0x2ff6}, {0x2206, 0x28e4},
+	{0x2206, 0xe140}, {0x2206, 0xe5e1}, {0x2206, 0x4104}, {0x2206, 0xf8fa},
+	{0x2206, 0xef69}, {0x2206, 0xe08b}, {0x2206, 0x86ac}, {0x2206, 0x201a},
+	{0x2206, 0xbf80}, {0x2206, 0x77d0}, {0x2206, 0x6c02}, {0x2206, 0x2978},
+	{0x2206, 0xe0e0}, {0x2206, 0xe4e1}, {0x2206, 0xe0e5}, {0x2206, 0x5806},
+	{0x2206, 0x68c0}, {0x2206, 0xd1d2}, {0x2206, 0xe4e0}, {0x2206, 0xe4e5},
+	{0x2206, 0xe0e5}, {0x2206, 0xef96}, {0x2206, 0xfefc}, {0x2206, 0x0425},
+	{0x2206, 0x0807}, {0x2206, 0x2640}, {0x2206, 0x7227}, {0x2206, 0x267e},
+	{0x2206, 0x2804}, {0x2206, 0xb729}, {0x2206, 0x2576}, {0x2206, 0x2a68},
+	{0x2206, 0xe52b}, {0x2206, 0xad00}, {0x2206, 0x2cdb}, {0x2206, 0xf02d},
+	{0x2206, 0x67bb}, {0x2206, 0x2e7b}, {0x2206, 0x0f2f}, {0x2206, 0x7365},
+	{0x2206, 0x31ac}, {0x2206, 0xcc32}, {0x2206, 0x2300}, {0x2206, 0x332d},
+	{0x2206, 0x1734}, {0x2206, 0x7f52}, {0x2206, 0x3510}, {0x2206, 0x0036},
+	{0x2206, 0x0600}, {0x2206, 0x370c}, {0x2206, 0xc038}, {0x2206, 0x7fce},
+	{0x2206, 0x3ce5}, {0x2206, 0xf73d}, {0x2206, 0x3da4}, {0x2206, 0x6530},
+	{0x2206, 0x3e67}, {0x2206, 0x0053}, {0x2206, 0x69d2}, {0x2206, 0x0f6a},
+	{0x2206, 0x012c}, {0x2206, 0x6c2b}, {0x2206, 0x136e}, {0x2206, 0xe100},
+	{0x2206, 0x6f12}, {0x2206, 0xf771}, {0x2206, 0x006b}, {0x2206, 0x7306},
+	{0x2206, 0xeb74}, {0x2206, 0x94c7}, {0x2206, 0x7698}, {0x2206, 0x0a77},
+	{0x2206, 0x5000}, {0x2206, 0x788a}, {0x2206, 0x1579}, {0x2206, 0x7f6f},
+	{0x2206, 0x7a06}, {0x2206, 0xa600}, {0x2201, 0x0701}, {0x2200, 0x0405},
+	{0x221f, 0x0000}, {0x2200, 0x1340}, {0x221f, 0x0000}, {0x133f, 0x0010},
+	{0x133e, 0x0ffe}, {0x1203, 0xff00}, {0x1200, 0x7fc4}, {0x0900, 0x0000},
+	{0x0901, 0x0000}, {0x0902, 0x0000}, {0x0903, 0x0000}, {0x0865, 0x3210},
+	{0x087b, 0x0000}, {0x087c, 0xff00}, {0x087d, 0x0000}, {0x087e, 0x0000},
+	{0x0801, 0x0100}, {0x0802, 0x0100}, {0x0A20, 0x2040}, {0x0A21, 0x2040},
+	{0x0A22, 0x2040}, {0x0A23, 0x2040}, {0x0A24, 0x2040}, {0x0A25, 0x2040},
+	{0x0A26, 0x2040}, {0x0A27, 0x2040}, {0x0A28, 0x2040}, {0x0A29, 0x2040},
+	{0x130c, 0x0050},
+};
+
+static int rtl8367_write_initvals(struct rtl8366_smi *smi,
+				  const struct rtl8367_initval *initvals,
+				  int count)
+{
+	int err;
+	int i;
+
+	for (i = 0; i < count; i++)
+		REG_WR(smi, initvals[i].reg, initvals[i].val);
+
+	return 0;
+}
+
+static int rtl8367_read_phy_reg(struct rtl8366_smi *smi,
+				u32 phy_addr, u32 phy_reg, u32 *val)
+{
+	int timeout;
+	u32 data;
+	int err;
+
+	if (phy_addr > RTL8367_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	if (phy_reg > RTL8367_PHY_REG_MAX)
+		return -EINVAL;
+
+	REG_RD(smi, RTL8367_IA_STATUS_REG, &data);
+	if (data & RTL8367_IA_STATUS_PHY_BUSY)
+		return -ETIMEDOUT;
+
+	/* prepare address */
+	REG_WR(smi, RTL8367_IA_ADDRESS_REG,
+	       RTL8367_INTERNAL_PHY_REG(phy_addr, phy_reg));
+
+	/* send read command */
+	REG_WR(smi, RTL8367_IA_CTRL_REG,
+	       RTL8367_IA_CTRL_CMD_MASK | RTL8367_IA_CTRL_RW_READ);
+
+	timeout = 5;
+	do {
+		REG_RD(smi, RTL8367_IA_STATUS_REG, &data);
+		if ((data & RTL8367_IA_STATUS_PHY_BUSY) == 0)
+			break;
+
+		if (timeout--) {
+			dev_err(smi->parent, "phy read timed out\n");
+			return -ETIMEDOUT;
+		}
+
+		udelay(1);
+	} while (1);
+
+	/* read data */
+	REG_RD(smi, RTL8367_IA_READ_DATA_REG, val);
+
+	dev_dbg(smi->parent, "phy_read: addr:%02x, reg:%02x, val:%04x\n",
+		phy_addr, phy_reg, *val);
+	return 0;
+}
+
+static int rtl8367_write_phy_reg(struct rtl8366_smi *smi,
+				 u32 phy_addr, u32 phy_reg, u32 val)
+{
+	int timeout;
+	u32 data;
+	int err;
+
+	dev_dbg(smi->parent, "phy_write: addr:%02x, reg:%02x, val:%04x\n",
+		phy_addr, phy_reg, val);
+
+	if (phy_addr > RTL8367_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	if (phy_reg > RTL8367_PHY_REG_MAX)
+		return -EINVAL;
+
+	REG_RD(smi, RTL8367_IA_STATUS_REG, &data);
+	if (data & RTL8367_IA_STATUS_PHY_BUSY)
+		return -ETIMEDOUT;
+
+	/* preapre data */
+	REG_WR(smi, RTL8367_IA_WRITE_DATA_REG, val);
+
+	/* prepare address */
+	REG_WR(smi, RTL8367_IA_ADDRESS_REG,
+	       RTL8367_INTERNAL_PHY_REG(phy_addr, phy_reg));
+
+	/* send write command */
+	REG_WR(smi, RTL8367_IA_CTRL_REG,
+	       RTL8367_IA_CTRL_CMD_MASK | RTL8367_IA_CTRL_RW_WRITE);
+
+	timeout = 5;
+	do {
+		REG_RD(smi, RTL8367_IA_STATUS_REG, &data);
+		if ((data & RTL8367_IA_STATUS_PHY_BUSY) == 0)
+			break;
+
+		if (timeout--) {
+			dev_err(smi->parent, "phy write timed out\n");
+			return -ETIMEDOUT;
+		}
+
+		udelay(1);
+	} while (1);
+
+	return 0;
+}
+
+static int rtl8367_init_regs0(struct rtl8366_smi *smi, unsigned mode)
+{
+	const struct rtl8367_initval *initvals;
+	int count;
+	int err;
+
+	switch (mode) {
+	case 0:
+		initvals = rtl8367_initvals_0_0;
+		count = ARRAY_SIZE(rtl8367_initvals_0_0);
+		break;
+
+	case 1:
+	case 2:
+		initvals = rtl8367_initvals_0_1;
+		count = ARRAY_SIZE(rtl8367_initvals_0_1);
+		break;
+
+	default:
+		dev_err(smi->parent, "%s: unknow mode %u\n", __func__, mode);
+		return -ENODEV;
+	}
+
+	err = rtl8367_write_initvals(smi, initvals, count);
+	if (err)
+		return err;
+
+	/* TODO: complete this */
+
+	return 0;
+}
+
+static int rtl8367_init_regs1(struct rtl8366_smi *smi, unsigned mode)
+{
+	const struct rtl8367_initval *initvals;
+	int count;
+
+	switch (mode) {
+	case 0:
+		initvals = rtl8367_initvals_1_0;
+		count = ARRAY_SIZE(rtl8367_initvals_1_0);
+		break;
+
+	case 1:
+	case 2:
+		initvals = rtl8367_initvals_1_1;
+		count = ARRAY_SIZE(rtl8367_initvals_1_1);
+		break;
+
+	default:
+		dev_err(smi->parent, "%s: unknow mode %u\n", __func__, mode);
+		return -ENODEV;
+	}
+
+	return rtl8367_write_initvals(smi, initvals, count);
+}
+
+static int rtl8367_init_regs2(struct rtl8366_smi *smi, unsigned mode)
+{
+	const struct rtl8367_initval *initvals;
+	int count;
+
+	switch (mode) {
+	case 0:
+		initvals = rtl8367_initvals_2_0;
+		count = ARRAY_SIZE(rtl8367_initvals_2_0);
+		break;
+
+	case 1:
+	case 2:
+		initvals = rtl8367_initvals_2_1;
+		count = ARRAY_SIZE(rtl8367_initvals_2_1);
+		break;
+
+	default:
+		dev_err(smi->parent, "%s: unknow mode %u\n", __func__, mode);
+		return -ENODEV;
+	}
+
+	return rtl8367_write_initvals(smi, initvals, count);
+}
+
+static int rtl8367_init_regs(struct rtl8366_smi *smi)
+{
+	u32 data;
+	u32 rlvid;
+	u32 mode;
+	int err;
+
+	REG_WR(smi, RTL8367_RTL_MAGIC_ID_REG, RTL8367_RTL_MAGIC_ID_VAL);
+
+	REG_RD(smi, RTL8367_CHIP_VER_REG, &data);
+	rlvid = (data >> RTL8367_CHIP_VER_RLVID_SHIFT) &
+		RTL8367_CHIP_VER_RLVID_MASK;
+
+	REG_RD(smi, RTL8367_CHIP_MODE_REG, &data);
+	mode = data & RTL8367_CHIP_MODE_MASK;
+
+	switch (rlvid) {
+	case 0:
+		err = rtl8367_init_regs0(smi, mode);
+		break;
+
+	case 1:
+		err = rtl8367_write_phy_reg(smi, 0, 31, 5);
+		if (err)
+			break;
+
+		err = rtl8367_write_phy_reg(smi, 0, 5, 0x3ffe);
+		if (err)
+			break;
+
+		err = rtl8367_read_phy_reg(smi, 0, 6, &data);
+		if (err)
+			break;
+
+		if (data == 0x94eb) {
+			err = rtl8367_init_regs1(smi, mode);
+		} else if (data == 0x2104) {
+			err = rtl8367_init_regs2(smi, mode);
+		} else {
+			dev_err(smi->parent, "unknow phy data %04x\n", data);
+			return -ENODEV;
+		}
+
+		break;
+
+	default:
+		dev_err(smi->parent, "unknow rlvid %u\n", rlvid);
+		err = -ENODEV;
+		break;
+	}
+
+	return err;
+}
+
+static int rtl8367_reset_chip(struct rtl8366_smi *smi)
+{
+	int timeout = 10;
+	int err;
+	u32 data;
+
+	REG_WR(smi, RTL8367_CHIP_RESET_REG, RTL8367_CHIP_RESET_HW);
+	msleep(RTL8367_RESET_DELAY);
+
+	do {
+		REG_RD(smi, RTL8367_CHIP_RESET_REG, &data);
+		if (!(data & RTL8367_CHIP_RESET_HW))
+			break;
+
+		msleep(1);
+	} while (--timeout);
+
+	if (!timeout) {
+		dev_err(smi->parent, "chip reset timed out\n");
+		return -ETIMEDOUT;
+	}
+
+	return 0;
+}
+
+static int rtl8367_extif_set_mode(struct rtl8366_smi *smi, int id,
+				  enum rtl8367_extif_mode mode)
+{
+	int err;
+
+	/* set port mode */
+	switch (mode) {
+	case RTL8367_EXTIF_MODE_RGMII:
+	case RTL8367_EXTIF_MODE_RGMII_33V:
+		REG_WR(smi, RTL8367_CHIP_DEBUG0_REG, 0x0367);
+		REG_WR(smi, RTL8367_CHIP_DEBUG1_REG, 0x7777);
+		break;
+
+	case RTL8367_EXTIF_MODE_TMII_MAC:
+	case RTL8367_EXTIF_MODE_TMII_PHY:
+		REG_RMW(smi, RTL8367_BYPASS_LINE_RATE_REG,
+			BIT((id + 1) % 2), BIT((id + 1) % 2));
+		break;
+
+	case RTL8367_EXTIF_MODE_GMII:
+		REG_RMW(smi, RTL8367_CHIP_DEBUG0_REG,
+		        RTL8367_CHIP_DEBUG0_DUMMY0(id),
+			RTL8367_CHIP_DEBUG0_DUMMY0(id));
+		REG_RMW(smi, RTL8367_EXT_RGMXF_REG(id), BIT(6), BIT(6));
+		break;
+
+	case RTL8367_EXTIF_MODE_MII_MAC:
+	case RTL8367_EXTIF_MODE_MII_PHY:
+	case RTL8367_EXTIF_MODE_DISABLED:
+		REG_RMW(smi, RTL8367_BYPASS_LINE_RATE_REG,
+			BIT((id + 1) % 2), 0);
+		REG_RMW(smi, RTL8367_EXT_RGMXF_REG(id), BIT(6), 0);
+		break;
+
+	default:
+		dev_err(smi->parent,
+			"invalid mode for external interface %d\n", id);
+		return -EINVAL;
+	}
+
+	REG_RMW(smi, RTL8367_DIS_REG,
+		RTL8367_DIS_RGMII_MASK << RTL8367_DIS_RGMII_SHIFT(id),
+		mode << RTL8367_DIS_RGMII_SHIFT(id));
+
+	return 0;
+}
+
+static int rtl8367_extif_set_force(struct rtl8366_smi *smi, int id,
+				   struct rtl8367_port_ability *pa)
+{
+	u32 mask;
+	u32 val;
+	int err;
+
+	mask = (RTL8367_DI_FORCE_MODE |
+		RTL8367_DI_FORCE_NWAY |
+		RTL8367_DI_FORCE_TXPAUSE |
+		RTL8367_DI_FORCE_RXPAUSE |
+		RTL8367_DI_FORCE_LINK |
+		RTL8367_DI_FORCE_DUPLEX |
+		RTL8367_DI_FORCE_SPEED_MASK);
+
+	val = pa->speed;
+	val |= pa->force_mode ? RTL8367_DI_FORCE_MODE : 0;
+	val |= pa->nway ? RTL8367_DI_FORCE_NWAY : 0;
+	val |= pa->txpause ? RTL8367_DI_FORCE_TXPAUSE : 0;
+	val |= pa->rxpause ? RTL8367_DI_FORCE_RXPAUSE : 0;
+	val |= pa->link ? RTL8367_DI_FORCE_LINK : 0;
+	val |= pa->duplex ? RTL8367_DI_FORCE_DUPLEX : 0;
+
+	REG_RMW(smi, RTL8367_DI_FORCE_REG(id), mask, val);
+
+	return 0;
+}
+
+static int rtl8367_extif_set_rgmii_delay(struct rtl8366_smi *smi, int id,
+					 unsigned txdelay, unsigned rxdelay)
+{
+	u32 mask;
+	u32 val;
+	int err;
+
+	mask = (RTL8367_EXT_RGMXF_RXDELAY_MASK |
+		(RTL8367_EXT_RGMXF_TXDELAY_MASK <<
+			RTL8367_EXT_RGMXF_TXDELAY_SHIFT));
+
+	val = rxdelay;
+	val |= txdelay << RTL8367_EXT_RGMXF_TXDELAY_SHIFT;
+
+	REG_RMW(smi, RTL8367_EXT_RGMXF_REG(id), mask, val);
+
+	return 0;
+}
+
+static int rtl8367_extif_init(struct rtl8366_smi *smi, int id,
+			      struct rtl8367_extif_config *cfg)
+{
+	enum rtl8367_extif_mode mode;
+	int err;
+
+	mode = (cfg) ? cfg->mode : RTL8367_EXTIF_MODE_DISABLED;
+
+	err = rtl8367_extif_set_mode(smi, id, mode);
+	if (err)
+		return err;
+
+	if (mode != RTL8367_EXTIF_MODE_DISABLED) {
+		err = rtl8367_extif_set_force(smi, id, &cfg->ability);
+		if (err)
+			return err;
+
+		err = rtl8367_extif_set_rgmii_delay(smi, id, cfg->txdelay,
+						     cfg->rxdelay);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+static int rtl8367_led_group_set_ports(struct rtl8366_smi *smi,
+				       unsigned int group, u16 port_mask)
+{
+	u32 reg;
+	u32 s;
+	int err;
+
+	port_mask &= RTL8367_PARA_LED_IO_EN_PMASK;
+	s = (group % 2) * 8;
+	reg = RTL8367_PARA_LED_IO_EN1_REG + (group / 2);
+
+	REG_RMW(smi, reg, (RTL8367_PARA_LED_IO_EN_PMASK << s), port_mask << s);
+
+	return 0;
+}
+
+static int rtl8367_led_group_set_mode(struct rtl8366_smi *smi,
+				      unsigned int mode)
+{
+	u16 mask;
+	u16 set;
+	int err;
+
+	mode &= RTL8367_LED_CONFIG_DATA_M;
+
+	mask = (RTL8367_LED_CONFIG_DATA_M << RTL8367_LED_CONFIG_DATA_S) |
+		RTL8367_LED_CONFIG_SEL;
+	set = (mode << RTL8367_LED_CONFIG_DATA_S) | RTL8367_LED_CONFIG_SEL;
+
+	REG_RMW(smi, RTL8367_LED_CONFIG_REG, mask, set);
+
+	return 0;
+}
+
+static int rtl8367_led_group_set_config(struct rtl8366_smi *smi,
+				        unsigned int led, unsigned int cfg)
+{
+	u16 mask;
+	u16 set;
+	int err;
+
+	mask = (RTL8367_LED_CONFIG_LED_CFG_M << (led * 4)) |
+		RTL8367_LED_CONFIG_SEL;
+	set = (cfg & RTL8367_LED_CONFIG_LED_CFG_M) << (led * 4);
+
+	REG_RMW(smi, RTL8367_LED_CONFIG_REG, mask, set);
+	return 0;
+}
+
+static int rtl8367_led_op_select_parallel(struct rtl8366_smi *smi)
+{
+	int err;
+
+	REG_WR(smi, RTL8367_LED_SYS_CONFIG_REG, 0x1472);
+	return 0;
+}
+
+static int rtl8367_led_blinkrate_set(struct rtl8366_smi *smi, unsigned int rate)
+{
+	u16 mask;
+	u16 set;
+	int err;
+
+	mask = RTL8367_LED_MODE_RATE_M << RTL8367_LED_MODE_RATE_S;
+	set = (rate & RTL8367_LED_MODE_RATE_M) << RTL8367_LED_MODE_RATE_S;
+	REG_RMW(smi, RTL8367_LED_MODE_REG, mask, set);
+
+	return 0;
+}
+
+#ifdef CONFIG_OF
+static int rtl8367_extif_init_of(struct rtl8366_smi *smi, int id,
+				 const char *name)
+{
+	struct rtl8367_extif_config *cfg;
+	const __be32 *prop;
+	int size;
+	int err;
+
+	prop = of_get_property(smi->parent->of_node, name, &size);
+	if (!prop)
+		return rtl8367_extif_init(smi, id, NULL);
+
+	if (size != (9 * sizeof(*prop))) {
+		dev_err(smi->parent, "%s property is invalid\n", name);
+		return -EINVAL;
+	}
+
+	cfg = kzalloc(sizeof(struct rtl8367_extif_config), GFP_KERNEL);
+	if (!cfg)
+		return -ENOMEM;
+
+	cfg->txdelay = be32_to_cpup(prop++);
+	cfg->rxdelay = be32_to_cpup(prop++);
+	cfg->mode = be32_to_cpup(prop++);
+	cfg->ability.force_mode = be32_to_cpup(prop++);
+	cfg->ability.txpause = be32_to_cpup(prop++);
+	cfg->ability.rxpause = be32_to_cpup(prop++);
+	cfg->ability.link = be32_to_cpup(prop++);
+	cfg->ability.duplex = be32_to_cpup(prop++);
+	cfg->ability.speed = be32_to_cpup(prop++);
+
+	err = rtl8367_extif_init(smi, id, cfg);
+	kfree(cfg);
+
+	return err;
+}
+#else
+static int rtl8367_extif_init_of(struct rtl8366_smi *smi, int id,
+				 const char *name)
+{
+	return -EINVAL;
+}
+#endif
+
+static int rtl8367_setup(struct rtl8366_smi *smi)
+{
+	struct rtl8367_platform_data *pdata;
+	int err;
+	int i;
+
+	pdata = smi->parent->platform_data;
+
+	err = rtl8367_init_regs(smi);
+	if (err)
+		return err;
+
+	/* initialize external interfaces */
+	if (smi->parent->of_node) {
+		err = rtl8367_extif_init_of(smi, 0, "realtek,extif0");
+		if (err)
+			return err;
+
+		err = rtl8367_extif_init_of(smi, 1, "realtek,extif1");
+		if (err)
+			return err;
+	} else {
+		err = rtl8367_extif_init(smi, 0, pdata->extif0_cfg);
+		if (err)
+			return err;
+
+		err = rtl8367_extif_init(smi, 1, pdata->extif1_cfg);
+		if (err)
+			return err;
+	}
+
+	/* set maximum packet length to 1536 bytes */
+	REG_RMW(smi, RTL8367_SWC0_REG, RTL8367_SWC0_MAX_LENGTH_MASK,
+		RTL8367_SWC0_MAX_LENGTH_1536);
+
+	/*
+	 * discard VLAN tagged packets if the port is not a member of
+	 * the VLAN with which the packets is associated.
+	 */
+	REG_WR(smi, RTL8367_VLAN_INGRESS_REG, RTL8367_PORTS_ALL);
+
+	/*
+	 * Setup egress tag mode for each port.
+	 */
+	for (i = 0; i < RTL8367_NUM_PORTS; i++)
+		REG_RMW(smi,
+			RTL8367_PORT_CFG_REG(i),
+			RTL8367_PORT_CFG_EGRESS_MODE_MASK <<
+				RTL8367_PORT_CFG_EGRESS_MODE_SHIFT,
+			RTL8367_PORT_CFG_EGRESS_MODE_ORIGINAL <<
+				RTL8367_PORT_CFG_EGRESS_MODE_SHIFT);
+
+	/* setup LEDs */
+	err = rtl8367_led_group_set_ports(smi, 0, RTL8367_PORTS_ALL);
+	if (err)
+		return err;
+
+	err = rtl8367_led_group_set_mode(smi, 0);
+	if (err)
+		return err;
+
+	err = rtl8367_led_op_select_parallel(smi);
+	if (err)
+		return err;
+
+	err = rtl8367_led_blinkrate_set(smi, 1);
+	if (err)
+		return err;
+
+	err = rtl8367_led_group_set_config(smi, 0, 2);
+	if (err)
+		return err;
+
+	return 0;
+}
+
+static int rtl8367_get_mib_counter(struct rtl8366_smi *smi, int counter,
+				   int port, unsigned long long *val)
+{
+	struct rtl8366_mib_counter *mib;
+	int offset;
+	int i;
+	int err;
+	u32 addr, data;
+	u64 mibvalue;
+
+	if (port > RTL8367_NUM_PORTS || counter >= RTL8367_MIB_COUNT)
+		return -EINVAL;
+
+	mib = &rtl8367_mib_counters[counter];
+	addr = RTL8367_MIB_COUNTER_PORT_OFFSET * port + mib->offset;
+
+	/*
+	 * Writing access counter address first
+	 * then ASIC will prepare 64bits counter wait for being retrived
+	 */
+	REG_WR(smi, RTL8367_MIB_ADDRESS_REG, addr >> 2);
+
+	/* read MIB control register */
+	REG_RD(smi, RTL8367_MIB_CTRL_REG(0), &data);
+
+	if (data & RTL8367_MIB_CTRL_BUSY_MASK)
+		return -EBUSY;
+
+	if (data & RTL8367_MIB_CTRL_RESET_MASK)
+		return -EIO;
+
+	if (mib->length == 4)
+		offset = 3;
+	else
+		offset = (mib->offset + 1) % 4;
+
+	mibvalue = 0;
+	for (i = 0; i < mib->length; i++) {
+		REG_RD(smi, RTL8367_MIB_COUNTER_REG(offset - i), &data);
+		mibvalue = (mibvalue << 16) | (data & 0xFFFF);
+	}
+
+	*val = mibvalue;
+	return 0;
+}
+
+static int rtl8367_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
+				struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[RTL8367_TA_VLAN_DATA_SIZE];
+	int err;
+	int i;
+
+	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
+
+	if (vid >= RTL8367_NUM_VIDS)
+		return -EINVAL;
+
+	/* write VID */
+	REG_WR(smi, RTL8367_TA_ADDR_REG, vid);
+
+	/* write table access control word */
+	REG_WR(smi, RTL8367_TA_CTRL_REG, RTL8367_TA_CTRL_CVLAN_READ);
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_RD(smi, RTL8367_TA_DATA_REG(i), &data[i]);
+
+	vlan4k->vid = vid;
+	vlan4k->member = (data[0] >> RTL8367_TA_VLAN_MEMBER_SHIFT) &
+			 RTL8367_TA_VLAN_MEMBER_MASK;
+	vlan4k->fid = (data[1] >> RTL8367_TA_VLAN_FID_SHIFT) &
+		      RTL8367_TA_VLAN_FID_MASK;
+	vlan4k->untag = (data[2] >> RTL8367_TA_VLAN_UNTAG1_SHIFT) &
+			RTL8367_TA_VLAN_UNTAG1_MASK;
+	vlan4k->untag |= ((data[3] >> RTL8367_TA_VLAN_UNTAG2_SHIFT) &
+			  RTL8367_TA_VLAN_UNTAG2_MASK) << 2;
+
+	return 0;
+}
+
+static int rtl8367_set_vlan_4k(struct rtl8366_smi *smi,
+				const struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[RTL8367_TA_VLAN_DATA_SIZE];
+	int err;
+	int i;
+
+	if (vlan4k->vid >= RTL8367_NUM_VIDS ||
+	    vlan4k->member > RTL8367_TA_VLAN_MEMBER_MASK ||
+	    vlan4k->untag > RTL8367_UNTAG_MASK ||
+	    vlan4k->fid > RTL8367_FIDMAX)
+		return -EINVAL;
+
+	data[0] = (vlan4k->member & RTL8367_TA_VLAN_MEMBER_MASK) <<
+		  RTL8367_TA_VLAN_MEMBER_SHIFT;
+	data[1] = (vlan4k->fid & RTL8367_TA_VLAN_FID_MASK) <<
+		  RTL8367_TA_VLAN_FID_SHIFT;
+	data[2] = (vlan4k->untag & RTL8367_TA_VLAN_UNTAG1_MASK) <<
+		  RTL8367_TA_VLAN_UNTAG1_SHIFT;
+	data[3] = ((vlan4k->untag >> 2) & RTL8367_TA_VLAN_UNTAG2_MASK) <<
+		  RTL8367_TA_VLAN_UNTAG2_SHIFT;
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_WR(smi, RTL8367_TA_DATA_REG(i), data[i]);
+
+	/* write VID */
+	REG_WR(smi, RTL8367_TA_ADDR_REG,
+	       vlan4k->vid & RTL8367_TA_VLAN_VID_MASK);
+
+	/* write table access control word */
+	REG_WR(smi, RTL8367_TA_CTRL_REG, RTL8367_TA_CTRL_CVLAN_WRITE);
+
+	return 0;
+}
+
+static int rtl8367_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[RTL8367_VLAN_MC_DATA_SIZE];
+	int err;
+	int i;
+
+	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
+
+	if (index >= RTL8367_NUM_VLANS)
+		return -EINVAL;
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_RD(smi, RTL8367_VLAN_MC_BASE(index) + i, &data[i]);
+
+	vlanmc->member = (data[0] >> RTL8367_VLAN_MC_MEMBER_SHIFT) &
+			 RTL8367_VLAN_MC_MEMBER_MASK;
+	vlanmc->fid = (data[1] >> RTL8367_VLAN_MC_FID_SHIFT) &
+		      RTL8367_VLAN_MC_FID_MASK;
+	vlanmc->vid = (data[3] >> RTL8367_VLAN_MC_EVID_SHIFT) &
+		      RTL8367_VLAN_MC_EVID_MASK;
+
+	return 0;
+}
+
+static int rtl8367_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				const struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[RTL8367_VLAN_MC_DATA_SIZE];
+	int err;
+	int i;
+
+	if (index >= RTL8367_NUM_VLANS ||
+	    vlanmc->vid >= RTL8367_NUM_VIDS ||
+	    vlanmc->priority > RTL8367_PRIORITYMAX ||
+	    vlanmc->member > RTL8367_VLAN_MC_MEMBER_MASK ||
+	    vlanmc->untag > RTL8367_UNTAG_MASK ||
+	    vlanmc->fid > RTL8367_FIDMAX)
+		return -EINVAL;
+
+	data[0] = (vlanmc->member & RTL8367_VLAN_MC_MEMBER_MASK) <<
+		  RTL8367_VLAN_MC_MEMBER_SHIFT;
+	data[1] = (vlanmc->fid & RTL8367_VLAN_MC_FID_MASK) <<
+		  RTL8367_VLAN_MC_FID_SHIFT;
+	data[2] = 0;
+	data[3] = (vlanmc->vid & RTL8367_VLAN_MC_EVID_MASK) <<
+		   RTL8367_VLAN_MC_EVID_SHIFT;
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_WR(smi, RTL8367_VLAN_MC_BASE(index) + i, data[i]);
+
+	return 0;
+}
+
+static int rtl8367_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
+{
+	u32 data;
+	int err;
+
+	if (port >= RTL8367_NUM_PORTS)
+		return -EINVAL;
+
+	REG_RD(smi, RTL8367_VLAN_PVID_CTRL_REG(port), &data);
+
+	*val = (data >> RTL8367_VLAN_PVID_CTRL_SHIFT(port)) &
+	       RTL8367_VLAN_PVID_CTRL_MASK;
+
+	return 0;
+}
+
+static int rtl8367_set_mc_index(struct rtl8366_smi *smi, int port, int index)
+{
+	if (port >= RTL8367_NUM_PORTS || index >= RTL8367_NUM_VLANS)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8367_VLAN_PVID_CTRL_REG(port),
+				RTL8367_VLAN_PVID_CTRL_MASK <<
+					RTL8367_VLAN_PVID_CTRL_SHIFT(port),
+				(index & RTL8367_VLAN_PVID_CTRL_MASK) <<
+					RTL8367_VLAN_PVID_CTRL_SHIFT(port));
+}
+
+static int rtl8367_enable_vlan(struct rtl8366_smi *smi, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8367_VLAN_CTRL_REG,
+				RTL8367_VLAN_CTRL_ENABLE,
+				(enable) ? RTL8367_VLAN_CTRL_ENABLE : 0);
+}
+
+static int rtl8367_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+{
+	return 0;
+}
+
+static int rtl8367_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
+{
+	unsigned max = RTL8367_NUM_VLANS;
+
+	if (smi->vlan4k_enabled)
+		max = RTL8367_NUM_VIDS - 1;
+
+	if (vlan == 0 || vlan >= max)
+		return 0;
+
+	return 1;
+}
+
+static int rtl8367_enable_port(struct rtl8366_smi *smi, int port, int enable)
+{
+	int err;
+
+	REG_WR(smi, RTL8367_PORT_ISOLATION_REG(port),
+	       (enable) ? RTL8367_PORTS_ALL : 0);
+
+	return 0;
+}
+
+static int rtl8367_sw_reset_mibs(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	return rtl8366_smi_rmwr(smi, RTL8367_MIB_CTRL_REG(0), 0,
+				RTL8367_MIB_CTRL_GLOBAL_RESET_MASK);
+}
+
+static int rtl8367_sw_get_port_link(struct switch_dev *dev,
+				    int port,
+				    struct switch_port_link *link)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data = 0;
+	u32 speed;
+
+	if (port >= RTL8367_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8367_PORT_STATUS_REG(port), &data);
+
+	link->link = !!(data & RTL8367_PORT_STATUS_LINK);
+	if (!link->link)
+		return 0;
+
+	link->duplex = !!(data & RTL8367_PORT_STATUS_DUPLEX);
+	link->rx_flow = !!(data & RTL8367_PORT_STATUS_RXPAUSE);
+	link->tx_flow = !!(data & RTL8367_PORT_STATUS_TXPAUSE);
+	link->aneg = !!(data & RTL8367_PORT_STATUS_NWAY);
+
+	speed = (data & RTL8367_PORT_STATUS_SPEED_MASK);
+	switch (speed) {
+	case 0:
+		link->speed = SWITCH_PORT_SPEED_10;
+		break;
+	case 1:
+		link->speed = SWITCH_PORT_SPEED_100;
+		break;
+	case 2:
+		link->speed = SWITCH_PORT_SPEED_1000;
+		break;
+	default:
+		link->speed = SWITCH_PORT_SPEED_UNKNOWN;
+		break;
+	}
+
+	return 0;
+}
+
+static int rtl8367_sw_get_max_length(struct switch_dev *dev,
+				     const struct switch_attr *attr,
+				     struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8367_SWC0_REG, &data);
+	val->value.i = (data & RTL8367_SWC0_MAX_LENGTH_MASK) >>
+			RTL8367_SWC0_MAX_LENGTH_SHIFT;
+
+	return 0;
+}
+
+static int rtl8367_sw_set_max_length(struct switch_dev *dev,
+				     const struct switch_attr *attr,
+				     struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 max_len;
+
+	switch (val->value.i) {
+	case 0:
+		max_len = RTL8367_SWC0_MAX_LENGTH_1522;
+		break;
+	case 1:
+		max_len = RTL8367_SWC0_MAX_LENGTH_1536;
+		break;
+	case 2:
+		max_len = RTL8367_SWC0_MAX_LENGTH_1552;
+		break;
+	case 3:
+		max_len = RTL8367_SWC0_MAX_LENGTH_16000;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return rtl8366_smi_rmwr(smi, RTL8367_SWC0_REG,
+			        RTL8367_SWC0_MAX_LENGTH_MASK, max_len);
+}
+
+
+static int rtl8367_sw_reset_port_mibs(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	int port;
+
+	port = val->port_vlan;
+	if (port >= RTL8367_NUM_PORTS)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8367_MIB_CTRL_REG(port / 8), 0,
+				RTL8367_MIB_CTRL_PORT_RESET_MASK(port % 8));
+}
+
+static struct switch_attr rtl8367_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan4k",
+		.description = "Enable VLAN 4K mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 2
+	}, {
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mibs",
+		.description = "Reset all MIB counters",
+		.set = rtl8367_sw_reset_mibs,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "max_length",
+		.description = "Get/Set the maximum length of valid packets"
+			       "(0:1522, 1:1536, 2:1552, 3:16000)",
+		.set = rtl8367_sw_set_max_length,
+		.get = rtl8367_sw_get_max_length,
+		.max = 3,
+	}
+};
+
+static struct switch_attr rtl8367_port[] = {
+	{
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mib",
+		.description = "Reset single port MIB counters",
+		.set = rtl8367_sw_reset_port_mibs,
+	}, {
+		.type = SWITCH_TYPE_STRING,
+		.name = "mib",
+		.description = "Get MIB counters for port",
+		.max = 33,
+		.set = NULL,
+		.get = rtl8366_sw_get_port_mib,
+	},
+};
+
+static struct switch_attr rtl8367_vlan[] = {
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "info",
+		.description = "Get vlan information",
+		.max = 1,
+		.set = NULL,
+		.get = rtl8366_sw_get_vlan_info,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "fid",
+		.description = "Get/Set vlan FID",
+		.max = RTL8367_FIDMAX,
+		.set = rtl8366_sw_set_vlan_fid,
+		.get = rtl8366_sw_get_vlan_fid,
+	},
+};
+
+static const struct switch_dev_ops rtl8367_sw_ops = {
+	.attr_global = {
+		.attr = rtl8367_globals,
+		.n_attr = ARRAY_SIZE(rtl8367_globals),
+	},
+	.attr_port = {
+		.attr = rtl8367_port,
+		.n_attr = ARRAY_SIZE(rtl8367_port),
+	},
+	.attr_vlan = {
+		.attr = rtl8367_vlan,
+		.n_attr = ARRAY_SIZE(rtl8367_vlan),
+	},
+
+	.get_vlan_ports = rtl8366_sw_get_vlan_ports,
+	.set_vlan_ports = rtl8366_sw_set_vlan_ports,
+	.get_port_pvid = rtl8366_sw_get_port_pvid,
+	.set_port_pvid = rtl8366_sw_set_port_pvid,
+	.reset_switch = rtl8366_sw_reset_switch,
+	.get_port_link = rtl8367_sw_get_port_link,
+};
+
+static int rtl8367_switch_init(struct rtl8366_smi *smi)
+{
+	struct switch_dev *dev = &smi->sw_dev;
+	int err;
+
+	dev->name = "RTL8367";
+	dev->cpu_port = RTL8367_CPU_PORT_NUM;
+	dev->ports = RTL8367_NUM_PORTS;
+	dev->vlans = RTL8367_NUM_VIDS;
+	dev->ops = &rtl8367_sw_ops;
+	dev->alias = dev_name(smi->parent);
+
+	err = register_switch(dev, NULL);
+	if (err)
+		dev_err(smi->parent, "switch registration failed\n");
+
+	return err;
+}
+
+static void rtl8367_switch_cleanup(struct rtl8366_smi *smi)
+{
+	unregister_switch(&smi->sw_dev);
+}
+
+static int rtl8367_mii_read(struct mii_bus *bus, int addr, int reg)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 val = 0;
+	int err;
+
+	err = rtl8367_read_phy_reg(smi, addr, reg, &val);
+	if (err)
+		return 0xffff;
+
+	return val;
+}
+
+static int rtl8367_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 t;
+	int err;
+
+	err = rtl8367_write_phy_reg(smi, addr, reg, val);
+	if (err)
+		return err;
+
+	/* flush write */
+	(void) rtl8367_read_phy_reg(smi, addr, reg, &t);
+
+	return err;
+}
+
+static int rtl8367_detect(struct rtl8366_smi *smi)
+{
+	u32 rtl_no = 0;
+	u32 rtl_ver = 0;
+	char *chip_name;
+	int ret;
+
+	ret = rtl8366_smi_read_reg(smi, RTL8367_RTL_NO_REG, &rtl_no);
+	if (ret) {
+		dev_err(smi->parent, "unable to read chip number\n");
+		return ret;
+	}
+
+	switch (rtl_no) {
+	case RTL8367_RTL_NO_8367R:
+		chip_name = "8367R";
+		break;
+	case RTL8367_RTL_NO_8367M:
+		chip_name = "8367M";
+		break;
+	default:
+		dev_err(smi->parent, "unknown chip number (%04x)\n", rtl_no);
+		return -ENODEV;
+	}
+
+	ret = rtl8366_smi_read_reg(smi, RTL8367_RTL_VER_REG, &rtl_ver);
+	if (ret) {
+		dev_err(smi->parent, "unable to read chip version\n");
+		return ret;
+	}
+
+	dev_info(smi->parent, "RTL%s ver. %u chip found\n",
+		 chip_name, rtl_ver & RTL8367_RTL_VER_MASK);
+
+	return 0;
+}
+
+static struct rtl8366_smi_ops rtl8367_smi_ops = {
+	.detect		= rtl8367_detect,
+	.reset_chip	= rtl8367_reset_chip,
+	.setup		= rtl8367_setup,
+
+	.mii_read	= rtl8367_mii_read,
+	.mii_write	= rtl8367_mii_write,
+
+	.get_vlan_mc	= rtl8367_get_vlan_mc,
+	.set_vlan_mc	= rtl8367_set_vlan_mc,
+	.get_vlan_4k	= rtl8367_get_vlan_4k,
+	.set_vlan_4k	= rtl8367_set_vlan_4k,
+	.get_mc_index	= rtl8367_get_mc_index,
+	.set_mc_index	= rtl8367_set_mc_index,
+	.get_mib_counter = rtl8367_get_mib_counter,
+	.is_vlan_valid	= rtl8367_is_vlan_valid,
+	.enable_vlan	= rtl8367_enable_vlan,
+	.enable_vlan4k	= rtl8367_enable_vlan4k,
+	.enable_port	= rtl8367_enable_port,
+};
+
+static int rtl8367_probe(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi;
+	int err;
+
+	smi = rtl8366_smi_probe(pdev);
+	if (!smi)
+		return -ENODEV;
+
+	smi->clk_delay = 1500;
+	smi->cmd_read = 0xb9;
+	smi->cmd_write = 0xb8;
+	smi->ops = &rtl8367_smi_ops;
+	smi->cpu_port = RTL8367_CPU_PORT_NUM;
+	smi->num_ports = RTL8367_NUM_PORTS;
+	smi->num_vlan_mc = RTL8367_NUM_VLANS;
+	smi->mib_counters = rtl8367_mib_counters;
+	smi->num_mib_counters = ARRAY_SIZE(rtl8367_mib_counters);
+
+	err = rtl8366_smi_init(smi);
+	if (err)
+		goto err_free_smi;
+
+	platform_set_drvdata(pdev, smi);
+
+	err = rtl8367_switch_init(smi);
+	if (err)
+		goto err_clear_drvdata;
+
+	return 0;
+
+ err_clear_drvdata:
+	platform_set_drvdata(pdev, NULL);
+	rtl8366_smi_cleanup(smi);
+ err_free_smi:
+	kfree(smi);
+	return err;
+}
+
+static int rtl8367_remove(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
+
+	if (smi) {
+		rtl8367_switch_cleanup(smi);
+		platform_set_drvdata(pdev, NULL);
+		rtl8366_smi_cleanup(smi);
+		kfree(smi);
+	}
+
+	return 0;
+}
+
+static void rtl8367_shutdown(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
+
+	if (smi)
+		rtl8367_reset_chip(smi);
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id rtl8367_match[] = {
+       { .compatible = "realtek,rtl8367" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, rtl8367_match);
+#endif
+
+static struct platform_driver rtl8367_driver = {
+	.driver = {
+		.name		= RTL8367_DRIVER_NAME,
+		.owner		= THIS_MODULE,
+#ifdef CONFIG_OF
+		.of_match_table = of_match_ptr(rtl8367_match),
+#endif
+	},
+	.probe		= rtl8367_probe,
+	.remove		= rtl8367_remove,
+	.shutdown	= rtl8367_shutdown,
+};
+
+static int __init rtl8367_module_init(void)
+{
+	return platform_driver_register(&rtl8367_driver);
+}
+module_init(rtl8367_module_init);
+
+static void __exit rtl8367_module_exit(void)
+{
+	platform_driver_unregister(&rtl8367_driver);
+}
+module_exit(rtl8367_module_exit);
+
+MODULE_DESCRIPTION(RTL8367_DRIVER_DESC);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" RTL8367_DRIVER_NAME);
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/rtl8367b.c b/trunk/target/linux/generic/files/drivers/net/phy/rtl8367b.c
new file mode 100644
index 00000000..a82f696d
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -0,0 +1,1602 @@
+/*
+ * Platform driver for the Realtek RTL8367R-VB ethernet switches
+ *
+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/rtl8367.h>
+
+#include "rtl8366_smi.h"
+
+#define RTL8367B_RESET_DELAY	1000	/* msecs*/
+
+#define RTL8367B_PHY_ADDR_MAX	8
+#define RTL8367B_PHY_REG_MAX	31
+
+#define RTL8367B_VID_MASK	0x3fff
+#define RTL8367B_FID_MASK	0xf
+#define RTL8367B_UNTAG_MASK	0xff
+#define RTL8367B_MEMBER_MASK	0xff
+
+#define RTL8367B_PORT_MISC_CFG_REG(_p)		(0x000e + 0x20 * (_p))
+#define   RTL8367B_PORT_MISC_CFG_EGRESS_MODE_SHIFT	4
+#define   RTL8367B_PORT_MISC_CFG_EGRESS_MODE_MASK	0x3
+#define   RTL8367B_PORT_MISC_CFG_EGRESS_MODE_ORIGINAL	0
+#define   RTL8367B_PORT_MISC_CFG_EGRESS_MODE_KEEP	1
+#define   RTL8367B_PORT_MISC_CFG_EGRESS_MODE_PRI	2
+#define   RTL8367B_PORT_MISC_CFG_EGRESS_MODE_REAL	3
+
+#define RTL8367B_BYPASS_LINE_RATE_REG		0x03f7
+
+#define RTL8367B_TA_CTRL_REG			0x0500 /*GOOD*/
+#define   RTL8367B_TA_CTRL_SPA_SHIFT		8
+#define   RTL8367B_TA_CTRL_SPA_MASK		0x7
+#define   RTL8367B_TA_CTRL_METHOD		BIT(4)/*GOOD*/
+#define   RTL8367B_TA_CTRL_CMD_SHIFT		3
+#define   RTL8367B_TA_CTRL_CMD_READ		0
+#define   RTL8367B_TA_CTRL_CMD_WRITE		1
+#define   RTL8367B_TA_CTRL_TABLE_SHIFT		0 /*GOOD*/
+#define   RTL8367B_TA_CTRL_TABLE_ACLRULE	1
+#define   RTL8367B_TA_CTRL_TABLE_ACLACT		2
+#define   RTL8367B_TA_CTRL_TABLE_CVLAN		3
+#define   RTL8367B_TA_CTRL_TABLE_L2		4
+#define   RTL8367B_TA_CTRL_CVLAN_READ \
+		((RTL8367B_TA_CTRL_CMD_READ << RTL8367B_TA_CTRL_CMD_SHIFT) | \
+		 RTL8367B_TA_CTRL_TABLE_CVLAN)
+#define   RTL8367B_TA_CTRL_CVLAN_WRITE \
+		((RTL8367B_TA_CTRL_CMD_WRITE << RTL8367B_TA_CTRL_CMD_SHIFT) | \
+		 RTL8367B_TA_CTRL_TABLE_CVLAN)
+
+#define RTL8367B_TA_ADDR_REG			0x0501/*GOOD*/
+#define   RTL8367B_TA_ADDR_MASK			0x3fff/*GOOD*/
+
+#define RTL8367B_TA_LUT_REG			0x0502/*GOOD*/
+
+#define RTL8367B_TA_WRDATA_REG(_x)		(0x0510 + (_x))/*GOOD*/
+#define   RTL8367B_TA_VLAN_NUM_WORDS		2
+#define   RTL8367B_TA_VLAN_VID_MASK		RTL8367B_VID_MASK
+#define   RTL8367B_TA_VLAN0_MEMBER_SHIFT	0
+#define   RTL8367B_TA_VLAN0_MEMBER_MASK		RTL8367B_MEMBER_MASK
+#define   RTL8367B_TA_VLAN0_UNTAG_SHIFT		8
+#define   RTL8367B_TA_VLAN0_UNTAG_MASK		RTL8367B_MEMBER_MASK
+#define   RTL8367B_TA_VLAN1_FID_SHIFT		0
+#define   RTL8367B_TA_VLAN1_FID_MASK		RTL8367B_FID_MASK
+
+#define RTL8367B_TA_RDDATA_REG(_x)		(0x0520 + (_x))/*GOOD*/
+
+#define RTL8367B_VLAN_PVID_CTRL_REG(_p)		(0x0700 + (_p) / 2) /*GOOD*/
+#define RTL8367B_VLAN_PVID_CTRL_MASK		0x1f /*GOOD*/
+#define RTL8367B_VLAN_PVID_CTRL_SHIFT(_p)	(8 * ((_p) % 2)) /*GOOD*/
+
+#define RTL8367B_VLAN_MC_BASE(_x)		(0x0728 + (_x) * 4) /*GOOD*/
+#define   RTL8367B_VLAN_MC_NUM_WORDS		4 /*GOOD*/
+#define   RTL8367B_VLAN_MC0_MEMBER_SHIFT	0/*GOOD*/
+#define   RTL8367B_VLAN_MC0_MEMBER_MASK		RTL8367B_MEMBER_MASK/*GOOD*/
+#define   RTL8367B_VLAN_MC1_FID_SHIFT		0/*GOOD*/
+#define   RTL8367B_VLAN_MC1_FID_MASK		RTL8367B_FID_MASK/*GOOD*/
+#define   RTL8367B_VLAN_MC3_EVID_SHIFT		0/*GOOD*/
+#define   RTL8367B_VLAN_MC3_EVID_MASK		RTL8367B_VID_MASK/*GOOD*/
+
+#define RTL8367B_VLAN_CTRL_REG			0x07a8 /*GOOD*/
+#define   RTL8367B_VLAN_CTRL_ENABLE		BIT(0)
+
+#define RTL8367B_VLAN_INGRESS_REG		0x07a9 /*GOOD*/
+
+#define RTL8367B_PORT_ISOLATION_REG(_p)		(0x08a2 + (_p)) /*GOOD*/
+
+#define RTL8367B_MIB_COUNTER_REG(_x)		(0x1000 + (_x))	/*GOOD*/
+#define RTL8367B_MIB_COUNTER_PORT_OFFSET	0x007c /*GOOD*/
+
+#define RTL8367B_MIB_ADDRESS_REG		0x1004 /*GOOD*/
+
+#define RTL8367B_MIB_CTRL0_REG(_x)		(0x1005 + (_x)) /*GOOD*/
+#define   RTL8367B_MIB_CTRL0_GLOBAL_RESET_MASK	BIT(11)	/*GOOD*/
+#define   RTL8367B_MIB_CTRL0_QM_RESET_MASK	BIT(10) /*GOOD*/
+#define   RTL8367B_MIB_CTRL0_PORT_RESET_MASK(_p) BIT(2 + (_p)) /*GOOD*/
+#define   RTL8367B_MIB_CTRL0_RESET_MASK		BIT(1) /*GOOD*/
+#define   RTL8367B_MIB_CTRL0_BUSY_MASK		BIT(0) /*GOOD*/
+
+#define RTL8367B_SWC0_REG			0x1200/*GOOD*/
+#define   RTL8367B_SWC0_MAX_LENGTH_SHIFT	13/*GOOD*/
+#define   RTL8367B_SWC0_MAX_LENGTH(_x)		((_x) << 13) /*GOOD*/
+#define   RTL8367B_SWC0_MAX_LENGTH_MASK		RTL8367B_SWC0_MAX_LENGTH(0x3)
+#define   RTL8367B_SWC0_MAX_LENGTH_1522		RTL8367B_SWC0_MAX_LENGTH(0)
+#define   RTL8367B_SWC0_MAX_LENGTH_1536		RTL8367B_SWC0_MAX_LENGTH(1)
+#define   RTL8367B_SWC0_MAX_LENGTH_1552		RTL8367B_SWC0_MAX_LENGTH(2)
+#define   RTL8367B_SWC0_MAX_LENGTH_16000	RTL8367B_SWC0_MAX_LENGTH(3)
+
+#define RTL8367B_CHIP_NUMBER_REG		0x1300/*GOOD*/
+
+#define RTL8367B_CHIP_VER_REG			0x1301/*GOOD*/
+#define   RTL8367B_CHIP_VER_RLVID_SHIFT		12/*GOOD*/
+#define   RTL8367B_CHIP_VER_RLVID_MASK		0xf/*GOOD*/
+#define   RTL8367B_CHIP_VER_MCID_SHIFT		8/*GOOD*/
+#define   RTL8367B_CHIP_VER_MCID_MASK		0xf/*GOOD*/
+#define   RTL8367B_CHIP_VER_BOID_SHIFT		4/*GOOD*/
+#define   RTL8367B_CHIP_VER_BOID_MASK		0xf/*GOOD*/
+#define   RTL8367B_CHIP_VER_AFE_SHIFT		0/*GOOD*/
+#define   RTL8367B_CHIP_VER_AFE_MASK		0x1/*GOOD*/
+
+#define RTL8367B_CHIP_MODE_REG			0x1302
+#define   RTL8367B_CHIP_MODE_MASK		0x7
+
+#define RTL8367B_CHIP_DEBUG0_REG		0x1303
+#define   RTL8367B_CHIP_DEBUG0_DUMMY0(_x)	BIT(8 + (_x))
+
+#define RTL8367B_CHIP_DEBUG1_REG		0x1304
+
+#define RTL8367B_DIS_REG			0x1305
+#define   RTL8367B_DIS_SKIP_MII_RXER(_x)	BIT(12 + (_x))
+#define   RTL8367B_DIS_RGMII_SHIFT(_x)		(4 * (_x))
+#define   RTL8367B_DIS_RGMII_MASK		0x7
+
+#define RTL8367B_EXT_RGMXF_REG(_x)		(0x1306 + (_x))
+#define   RTL8367B_EXT_RGMXF_DUMMY0_SHIFT	5
+#define   RTL8367B_EXT_RGMXF_DUMMY0_MASK	0x7ff
+#define   RTL8367B_EXT_RGMXF_TXDELAY_SHIFT	3
+#define   RTL8367B_EXT_RGMXF_TXDELAY_MASK	1
+#define   RTL8367B_EXT_RGMXF_RXDELAY_MASK	0x7
+
+#define RTL8367B_DI_FORCE_REG(_x)		(0x1310 + (_x))
+#define   RTL8367B_DI_FORCE_MODE		BIT(12)
+#define   RTL8367B_DI_FORCE_NWAY		BIT(7)
+#define   RTL8367B_DI_FORCE_TXPAUSE		BIT(6)
+#define   RTL8367B_DI_FORCE_RXPAUSE		BIT(5)
+#define   RTL8367B_DI_FORCE_LINK		BIT(4)
+#define   RTL8367B_DI_FORCE_DUPLEX		BIT(2)
+#define   RTL8367B_DI_FORCE_SPEED_MASK		3
+#define   RTL8367B_DI_FORCE_SPEED_10		0
+#define   RTL8367B_DI_FORCE_SPEED_100		1
+#define   RTL8367B_DI_FORCE_SPEED_1000		2
+
+#define RTL8367B_MAC_FORCE_REG(_x)		(0x1312 + (_x))
+
+#define RTL8367B_CHIP_RESET_REG			0x1322 /*GOOD*/
+#define   RTL8367B_CHIP_RESET_SW		BIT(1) /*GOOD*/
+#define   RTL8367B_CHIP_RESET_HW		BIT(0) /*GOOD*/
+
+#define RTL8367B_PORT_STATUS_REG(_p)		(0x1352 + (_p)) /*GOOD*/
+#define   RTL8367B_PORT_STATUS_EN_1000_SPI	BIT(11) /*GOOD*/
+#define   RTL8367B_PORT_STATUS_EN_100_SPI	BIT(10)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_NWAY_FAULT	BIT(9)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_LINK_MASTER	BIT(8)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_NWAY		BIT(7)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_TXPAUSE		BIT(6)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_RXPAUSE		BIT(5)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_LINK		BIT(4)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_DUPLEX		BIT(2)/*GOOD*/
+#define   RTL8367B_PORT_STATUS_SPEED_MASK	0x0003/*GOOD*/
+#define   RTL8367B_PORT_STATUS_SPEED_10		0/*GOOD*/
+#define   RTL8367B_PORT_STATUS_SPEED_100	1/*GOOD*/
+#define   RTL8367B_PORT_STATUS_SPEED_1000	2/*GOOD*/
+
+#define RTL8367B_RTL_MAGIC_ID_REG		0x13c2
+#define   RTL8367B_RTL_MAGIC_ID_VAL		0x0249
+
+#define RTL8367B_IA_CTRL_REG			0x1f00
+#define   RTL8367B_IA_CTRL_RW(_x)		((_x) << 1)
+#define   RTL8367B_IA_CTRL_RW_READ		RTL8367B_IA_CTRL_RW(0)
+#define   RTL8367B_IA_CTRL_RW_WRITE		RTL8367B_IA_CTRL_RW(1)
+#define   RTL8367B_IA_CTRL_CMD_MASK		BIT(0)
+
+#define RTL8367B_IA_STATUS_REG			0x1f01
+#define   RTL8367B_IA_STATUS_PHY_BUSY		BIT(2)
+#define   RTL8367B_IA_STATUS_SDS_BUSY		BIT(1)
+#define   RTL8367B_IA_STATUS_MDX_BUSY		BIT(0)
+
+#define RTL8367B_IA_ADDRESS_REG			0x1f02
+#define RTL8367B_IA_WRITE_DATA_REG		0x1f03
+#define RTL8367B_IA_READ_DATA_REG		0x1f04
+
+#define RTL8367B_INTERNAL_PHY_REG(_a, _r)	(0x2000 + 32 * (_a) + (_r))
+
+#define RTL8367B_NUM_MIB_COUNTERS	58
+
+#define RTL8367B_CPU_PORT_NUM		5
+#define RTL8367B_NUM_PORTS		8
+#define RTL8367B_NUM_VLANS		32
+#define RTL8367B_NUM_VIDS		4096
+#define RTL8367B_PRIORITYMAX		7
+#define RTL8367B_FIDMAX			7
+
+#define RTL8367B_PORT_0			BIT(0)
+#define RTL8367B_PORT_1			BIT(1)
+#define RTL8367B_PORT_2			BIT(2)
+#define RTL8367B_PORT_3			BIT(3)
+#define RTL8367B_PORT_4			BIT(4)
+#define RTL8367B_PORT_E0		BIT(5)	/* External port 0 */
+#define RTL8367B_PORT_E1		BIT(6)	/* External port 1 */
+#define RTL8367B_PORT_E2		BIT(7)	/* External port 2 */
+
+#define RTL8367B_PORTS_ALL					\
+	(RTL8367B_PORT_0 | RTL8367B_PORT_1 | RTL8367B_PORT_2 |	\
+	 RTL8367B_PORT_3 | RTL8367B_PORT_4 | RTL8367B_PORT_E0 | \
+	 RTL8367B_PORT_E1 | RTL8367B_PORT_E2)
+
+#define RTL8367B_PORTS_ALL_BUT_CPU				\
+	(RTL8367B_PORT_0 | RTL8367B_PORT_1 | RTL8367B_PORT_2 |	\
+	 RTL8367B_PORT_3 | RTL8367B_PORT_4 | RTL8367B_PORT_E1 |	\
+	 RTL8367B_PORT_E2)
+
+struct rtl8367b_initval {
+	u16 reg;
+	u16 val;
+};
+
+static struct rtl8366_mib_counter
+rtl8367b_mib_counters[RTL8367B_NUM_MIB_COUNTERS] = {
+	{0,   0, 4, "ifInOctets"			},
+	{0,   4, 2, "dot3StatsFCSErrors"		},
+	{0,   6, 2, "dot3StatsSymbolErrors"		},
+	{0,   8, 2, "dot3InPauseFrames"			},
+	{0,  10, 2, "dot3ControlInUnknownOpcodes"	},
+	{0,  12, 2, "etherStatsFragments"		},
+	{0,  14, 2, "etherStatsJabbers"			},
+	{0,  16, 2, "ifInUcastPkts"			},
+	{0,  18, 2, "etherStatsDropEvents"		},
+	{0,  20, 2, "ifInMulticastPkts"			},
+	{0,  22, 2, "ifInBroadcastPkts"			},
+	{0,  24, 2, "inMldChecksumError"		},
+	{0,  26, 2, "inIgmpChecksumError"		},
+	{0,  28, 2, "inMldSpecificQuery"		},
+	{0,  30, 2, "inMldGeneralQuery"			},
+	{0,  32, 2, "inIgmpSpecificQuery"		},
+	{0,  34, 2, "inIgmpGeneralQuery"		},
+	{0,  36, 2, "inMldLeaves"			},
+	{0,  38, 2, "inIgmpLeaves"			},
+
+	{0,  40, 4, "etherStatsOctets"			},
+	{0,  44, 2, "etherStatsUnderSizePkts"		},
+	{0,  46, 2, "etherOversizeStats"		},
+	{0,  48, 2, "etherStatsPkts64Octets"		},
+	{0,  50, 2, "etherStatsPkts65to127Octets"	},
+	{0,  52, 2, "etherStatsPkts128to255Octets"	},
+	{0,  54, 2, "etherStatsPkts256to511Octets"	},
+	{0,  56, 2, "etherStatsPkts512to1023Octets"	},
+	{0,  58, 2, "etherStatsPkts1024to1518Octets"	},
+
+	{0,  60, 4, "ifOutOctets"			},
+	{0,  64, 2, "dot3StatsSingleCollisionFrames"	},
+	{0,  66, 2, "dot3StatMultipleCollisionFrames"	},
+	{0,  68, 2, "dot3sDeferredTransmissions"	},
+	{0,  70, 2, "dot3StatsLateCollisions"		},
+	{0,  72, 2, "etherStatsCollisions"		},
+	{0,  74, 2, "dot3StatsExcessiveCollisions"	},
+	{0,  76, 2, "dot3OutPauseFrames"		},
+	{0,  78, 2, "ifOutDiscards"			},
+	{0,  80, 2, "dot1dTpPortInDiscards"		},
+	{0,  82, 2, "ifOutUcastPkts"			},
+	{0,  84, 2, "ifOutMulticastPkts"		},
+	{0,  86, 2, "ifOutBroadcastPkts"		},
+	{0,  88, 2, "outOampduPkts"			},
+	{0,  90, 2, "inOampduPkts"			},
+	{0,  92, 2, "inIgmpJoinsSuccess"		},
+	{0,  94, 2, "inIgmpJoinsFail"			},
+	{0,  96, 2, "inMldJoinsSuccess"			},
+	{0,  98, 2, "inMldJoinsFail"			},
+	{0, 100, 2, "inReportSuppressionDrop"		},
+	{0, 102, 2, "inLeaveSuppressionDrop"		},
+	{0, 104, 2, "outIgmpReports"			},
+	{0, 106, 2, "outIgmpLeaves"			},
+	{0, 108, 2, "outIgmpGeneralQuery"		},
+	{0, 110, 2, "outIgmpSpecificQuery"		},
+	{0, 112, 2, "outMldReports"			},
+	{0, 114, 2, "outMldLeaves"			},
+	{0, 116, 2, "outMldGeneralQuery"		},
+	{0, 118, 2, "outMldSpecificQuery"		},
+	{0, 120, 2, "inKnownMulticastPkts"		},
+};
+
+#define REG_RD(_smi, _reg, _val)					\
+	do {								\
+		err = rtl8366_smi_read_reg(_smi, _reg, _val);		\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+#define REG_WR(_smi, _reg, _val)					\
+	do {								\
+		err = rtl8366_smi_write_reg(_smi, _reg, _val);		\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+#define REG_RMW(_smi, _reg, _mask, _val)				\
+	do {								\
+		err = rtl8366_smi_rmwr(_smi, _reg, _mask, _val);	\
+		if (err)						\
+			return err;					\
+	} while (0)
+
+static const struct rtl8367b_initval rtl8367r_vb_initvals_0[] = {
+	{0x1B03, 0x0876}, {0x1200, 0x7FC4}, {0x0301, 0x0026}, {0x1722, 0x0E14},
+	{0x205F, 0x0002}, {0x2059, 0x1A00}, {0x205F, 0x0000}, {0x207F, 0x0002},
+	{0x2077, 0x0000}, {0x2078, 0x0000}, {0x2079, 0x0000}, {0x207A, 0x0000},
+	{0x207B, 0x0000}, {0x207F, 0x0000}, {0x205F, 0x0002}, {0x2053, 0x0000},
+	{0x2054, 0x0000}, {0x2055, 0x0000}, {0x2056, 0x0000}, {0x2057, 0x0000},
+	{0x205F, 0x0000}, {0x12A4, 0x110A}, {0x12A6, 0x150A}, {0x13F1, 0x0013},
+	{0x13F4, 0x0010}, {0x13F5, 0x0000}, {0x0018, 0x0F00}, {0x0038, 0x0F00},
+	{0x0058, 0x0F00}, {0x0078, 0x0F00}, {0x0098, 0x0F00}, {0x12B6, 0x0C02},
+	{0x12B7, 0x030F}, {0x12B8, 0x11FF}, {0x12BC, 0x0004}, {0x1362, 0x0115},
+	{0x1363, 0x0002}, {0x1363, 0x0000}, {0x133F, 0x0030}, {0x133E, 0x000E},
+	{0x221F, 0x0007}, {0x221E, 0x002D}, {0x2218, 0xF030}, {0x221F, 0x0007},
+	{0x221E, 0x0023}, {0x2216, 0x0005}, {0x2215, 0x00B9}, {0x2219, 0x0044},
+	{0x2215, 0x00BA}, {0x2219, 0x0020}, {0x2215, 0x00BB}, {0x2219, 0x00C1},
+	{0x2215, 0x0148}, {0x2219, 0x0096}, {0x2215, 0x016E}, {0x2219, 0x0026},
+	{0x2216, 0x0000}, {0x2216, 0x0000}, {0x221E, 0x002D}, {0x2218, 0xF010},
+	{0x221F, 0x0007}, {0x221E, 0x0020}, {0x2215, 0x0D00}, {0x221F, 0x0000},
+	{0x221F, 0x0000}, {0x2217, 0x2160}, {0x221F, 0x0001}, {0x2210, 0xF25E},
+	{0x221F, 0x0007}, {0x221E, 0x0042}, {0x2215, 0x0F00}, {0x2215, 0x0F00},
+	{0x2216, 0x7408}, {0x2215, 0x0E00}, {0x2215, 0x0F00}, {0x2215, 0x0F01},
+	{0x2216, 0x4000}, {0x2215, 0x0E01}, {0x2215, 0x0F01}, {0x2215, 0x0F02},
+	{0x2216, 0x9400}, {0x2215, 0x0E02}, {0x2215, 0x0F02}, {0x2215, 0x0F03},
+	{0x2216, 0x7408}, {0x2215, 0x0E03}, {0x2215, 0x0F03}, {0x2215, 0x0F04},
+	{0x2216, 0x4008}, {0x2215, 0x0E04}, {0x2215, 0x0F04}, {0x2215, 0x0F05},
+	{0x2216, 0x9400}, {0x2215, 0x0E05}, {0x2215, 0x0F05}, {0x2215, 0x0F06},
+	{0x2216, 0x0803}, {0x2215, 0x0E06}, {0x2215, 0x0F06}, {0x2215, 0x0D00},
+	{0x2215, 0x0100}, {0x221F, 0x0001}, {0x2210, 0xF05E}, {0x221F, 0x0000},
+	{0x2217, 0x2100}, {0x221F, 0x0000}, {0x220D, 0x0003}, {0x220E, 0x0015},
+	{0x220D, 0x4003}, {0x220E, 0x0006}, {0x221F, 0x0000}, {0x2200, 0x1340},
+	{0x133F, 0x0010}, {0x12A0, 0x0058}, {0x12A1, 0x0058}, {0x133E, 0x000E},
+	{0x133F, 0x0030}, {0x221F, 0x0000}, {0x2210, 0x0166}, {0x221F, 0x0000},
+	{0x133E, 0x000E}, {0x133F, 0x0010}, {0x133F, 0x0030}, {0x133E, 0x000E},
+	{0x221F, 0x0005}, {0x2205, 0xFFF6}, {0x2206, 0x0080}, {0x2205, 0x8B6E},
+	{0x2206, 0x0000}, {0x220F, 0x0100}, {0x2205, 0x8000}, {0x2206, 0x0280},
+	{0x2206, 0x28F7}, {0x2206, 0x00E0}, {0x2206, 0xFFF7}, {0x2206, 0xA080},
+	{0x2206, 0x02AE}, {0x2206, 0xF602}, {0x2206, 0x0153}, {0x2206, 0x0201},
+	{0x2206, 0x6602}, {0x2206, 0x80B9}, {0x2206, 0xE08B}, {0x2206, 0x8CE1},
+	{0x2206, 0x8B8D}, {0x2206, 0x1E01}, {0x2206, 0xE18B}, {0x2206, 0x8E1E},
+	{0x2206, 0x01A0}, {0x2206, 0x00E7}, {0x2206, 0xAEDB}, {0x2206, 0xEEE0},
+	{0x2206, 0x120E}, {0x2206, 0xEEE0}, {0x2206, 0x1300}, {0x2206, 0xEEE0},
+	{0x2206, 0x2001}, {0x2206, 0xEEE0}, {0x2206, 0x2166}, {0x2206, 0xEEE0},
+	{0x2206, 0xC463}, {0x2206, 0xEEE0}, {0x2206, 0xC5E8}, {0x2206, 0xEEE0},
+	{0x2206, 0xC699}, {0x2206, 0xEEE0}, {0x2206, 0xC7C2}, {0x2206, 0xEEE0},
+	{0x2206, 0xC801}, {0x2206, 0xEEE0}, {0x2206, 0xC913}, {0x2206, 0xEEE0},
+	{0x2206, 0xCA30}, {0x2206, 0xEEE0}, {0x2206, 0xCB3E}, {0x2206, 0xEEE0},
+	{0x2206, 0xDCE1}, {0x2206, 0xEEE0}, {0x2206, 0xDD00}, {0x2206, 0xEEE2},
+	{0x2206, 0x0001}, {0x2206, 0xEEE2}, {0x2206, 0x0100}, {0x2206, 0xEEE4},
+	{0x2206, 0x8860}, {0x2206, 0xEEE4}, {0x2206, 0x8902}, {0x2206, 0xEEE4},
+	{0x2206, 0x8C00}, {0x2206, 0xEEE4}, {0x2206, 0x8D30}, {0x2206, 0xEEEA},
+	{0x2206, 0x1480}, {0x2206, 0xEEEA}, {0x2206, 0x1503}, {0x2206, 0xEEEA},
+	{0x2206, 0xC600}, {0x2206, 0xEEEA}, {0x2206, 0xC706}, {0x2206, 0xEE85},
+	{0x2206, 0xEE00}, {0x2206, 0xEE85}, {0x2206, 0xEF00}, {0x2206, 0xEE8B},
+	{0x2206, 0x6750}, {0x2206, 0xEE8B}, {0x2206, 0x6632}, {0x2206, 0xEE8A},
+	{0x2206, 0xD448}, {0x2206, 0xEE8A}, {0x2206, 0xD548}, {0x2206, 0xEE8A},
+	{0x2206, 0xD649}, {0x2206, 0xEE8A}, {0x2206, 0xD7F8}, {0x2206, 0xEE8B},
+	{0x2206, 0x85E2}, {0x2206, 0xEE8B}, {0x2206, 0x8700}, {0x2206, 0xEEFF},
+	{0x2206, 0xF600}, {0x2206, 0xEEFF}, {0x2206, 0xF7FC}, {0x2206, 0x04F8},
+	{0x2206, 0xE08B}, {0x2206, 0x8EAD}, {0x2206, 0x2023}, {0x2206, 0xF620},
+	{0x2206, 0xE48B}, {0x2206, 0x8E02}, {0x2206, 0x2877}, {0x2206, 0x0225},
+	{0x2206, 0xC702}, {0x2206, 0x26A1}, {0x2206, 0x0281}, {0x2206, 0xB302},
+	{0x2206, 0x8496}, {0x2206, 0x0202}, {0x2206, 0xA102}, {0x2206, 0x27F1},
+	{0x2206, 0x0228}, {0x2206, 0xF902}, {0x2206, 0x2AA0}, {0x2206, 0x0282},
+	{0x2206, 0xB8E0}, {0x2206, 0x8B8E}, {0x2206, 0xAD21}, {0x2206, 0x08F6},
+	{0x2206, 0x21E4}, {0x2206, 0x8B8E}, {0x2206, 0x0202}, {0x2206, 0x80E0},
+	{0x2206, 0x8B8E}, {0x2206, 0xAD22}, {0x2206, 0x05F6}, {0x2206, 0x22E4},
+	{0x2206, 0x8B8E}, {0x2206, 0xE08B}, {0x2206, 0x8EAD}, {0x2206, 0x2305},
+	{0x2206, 0xF623}, {0x2206, 0xE48B}, {0x2206, 0x8EE0}, {0x2206, 0x8B8E},
+	{0x2206, 0xAD24}, {0x2206, 0x08F6}, {0x2206, 0x24E4}, {0x2206, 0x8B8E},
+	{0x2206, 0x0227}, {0x2206, 0x6AE0}, {0x2206, 0x8B8E}, {0x2206, 0xAD25},
+	{0x2206, 0x05F6}, {0x2206, 0x25E4}, {0x2206, 0x8B8E}, {0x2206, 0xE08B},
+	{0x2206, 0x8EAD}, {0x2206, 0x260B}, {0x2206, 0xF626}, {0x2206, 0xE48B},
+	{0x2206, 0x8E02}, {0x2206, 0x830D}, {0x2206, 0x021D}, {0x2206, 0x6BE0},
+	{0x2206, 0x8B8E}, {0x2206, 0xAD27}, {0x2206, 0x05F6}, {0x2206, 0x27E4},
+	{0x2206, 0x8B8E}, {0x2206, 0x0281}, {0x2206, 0x4402}, {0x2206, 0x045C},
+	{0x2206, 0xFC04}, {0x2206, 0xF8E0}, {0x2206, 0x8B83}, {0x2206, 0xAD23},
+	{0x2206, 0x30E0}, {0x2206, 0xE022}, {0x2206, 0xE1E0}, {0x2206, 0x2359},
+	{0x2206, 0x02E0}, {0x2206, 0x85EF}, {0x2206, 0xE585}, {0x2206, 0xEFAC},
+	{0x2206, 0x2907}, {0x2206, 0x1F01}, {0x2206, 0x9E51}, {0x2206, 0xAD29},
+	{0x2206, 0x20E0}, {0x2206, 0x8B83}, {0x2206, 0xAD21}, {0x2206, 0x06E1},
+	{0x2206, 0x8B84}, {0x2206, 0xAD28}, {0x2206, 0x42E0}, {0x2206, 0x8B85},
+	{0x2206, 0xAD21}, {0x2206, 0x06E1}, {0x2206, 0x8B84}, {0x2206, 0xAD29},
+	{0x2206, 0x36BF}, {0x2206, 0x34BF}, {0x2206, 0x022C}, {0x2206, 0x31AE},
+	{0x2206, 0x2EE0}, {0x2206, 0x8B83}, {0x2206, 0xAD21}, {0x2206, 0x10E0},
+	{0x2206, 0x8B84}, {0x2206, 0xF620}, {0x2206, 0xE48B}, {0x2206, 0x84EE},
+	{0x2206, 0x8ADA}, {0x2206, 0x00EE}, {0x2206, 0x8ADB}, {0x2206, 0x00E0},
+	{0x2206, 0x8B85}, {0x2206, 0xAD21}, {0x2206, 0x0CE0}, {0x2206, 0x8B84},
+	{0x2206, 0xF621}, {0x2206, 0xE48B}, {0x2206, 0x84EE}, {0x2206, 0x8B72},
+	{0x2206, 0xFFBF}, {0x2206, 0x34C2}, {0x2206, 0x022C}, {0x2206, 0x31FC},
+	{0x2206, 0x04F8}, {0x2206, 0xFAEF}, {0x2206, 0x69E0}, {0x2206, 0x8B85},
+	{0x2206, 0xAD21}, {0x2206, 0x42E0}, {0x2206, 0xE022}, {0x2206, 0xE1E0},
+	{0x2206, 0x2358}, {0x2206, 0xC059}, {0x2206, 0x021E}, {0x2206, 0x01E1},
+	{0x2206, 0x8B72}, {0x2206, 0x1F10}, {0x2206, 0x9E2F}, {0x2206, 0xE48B},
+	{0x2206, 0x72AD}, {0x2206, 0x2123}, {0x2206, 0xE18B}, {0x2206, 0x84F7},
+	{0x2206, 0x29E5}, {0x2206, 0x8B84}, {0x2206, 0xAC27}, {0x2206, 0x10AC},
+	{0x2206, 0x2605}, {0x2206, 0x0205}, {0x2206, 0x23AE}, {0x2206, 0x1602},
+	{0x2206, 0x0535}, {0x2206, 0x0282}, {0x2206, 0x30AE}, {0x2206, 0x0E02},
+	{0x2206, 0x056A}, {0x2206, 0x0282}, {0x2206, 0x75AE}, {0x2206, 0x0602},
+	{0x2206, 0x04DC}, {0x2206, 0x0282}, {0x2206, 0x04EF}, {0x2206, 0x96FE},
+	{0x2206, 0xFC04}, {0x2206, 0xF8F9}, {0x2206, 0xE08B}, {0x2206, 0x87AD},
+	{0x2206, 0x2321}, {0x2206, 0xE0EA}, {0x2206, 0x14E1}, {0x2206, 0xEA15},
+	{0x2206, 0xAD26}, {0x2206, 0x18F6}, {0x2206, 0x27E4}, {0x2206, 0xEA14},
+	{0x2206, 0xE5EA}, {0x2206, 0x15F6}, {0x2206, 0x26E4}, {0x2206, 0xEA14},
+	{0x2206, 0xE5EA}, {0x2206, 0x15F7}, {0x2206, 0x27E4}, {0x2206, 0xEA14},
+	{0x2206, 0xE5EA}, {0x2206, 0x15FD}, {0x2206, 0xFC04}, {0x2206, 0xF8F9},
+	{0x2206, 0xE08B}, {0x2206, 0x87AD}, {0x2206, 0x233A}, {0x2206, 0xAD22},
+	{0x2206, 0x37E0}, {0x2206, 0xE020}, {0x2206, 0xE1E0}, {0x2206, 0x21AC},
+	{0x2206, 0x212E}, {0x2206, 0xE0EA}, {0x2206, 0x14E1}, {0x2206, 0xEA15},
+	{0x2206, 0xF627}, {0x2206, 0xE4EA}, {0x2206, 0x14E5}, {0x2206, 0xEA15},
+	{0x2206, 0xE2EA}, {0x2206, 0x12E3}, {0x2206, 0xEA13}, {0x2206, 0x5A8F},
+	{0x2206, 0x6A20}, {0x2206, 0xE6EA}, {0x2206, 0x12E7}, {0x2206, 0xEA13},
+	{0x2206, 0xF726}, {0x2206, 0xE4EA}, {0x2206, 0x14E5}, {0x2206, 0xEA15},
+	{0x2206, 0xF727}, {0x2206, 0xE4EA}, {0x2206, 0x14E5}, {0x2206, 0xEA15},
+	{0x2206, 0xFDFC}, {0x2206, 0x04F8}, {0x2206, 0xF9E0}, {0x2206, 0x8B87},
+	{0x2206, 0xAD23}, {0x2206, 0x38AD}, {0x2206, 0x2135}, {0x2206, 0xE0E0},
+	{0x2206, 0x20E1}, {0x2206, 0xE021}, {0x2206, 0xAC21}, {0x2206, 0x2CE0},
+	{0x2206, 0xEA14}, {0x2206, 0xE1EA}, {0x2206, 0x15F6}, {0x2206, 0x27E4},
+	{0x2206, 0xEA14}, {0x2206, 0xE5EA}, {0x2206, 0x15E2}, {0x2206, 0xEA12},
+	{0x2206, 0xE3EA}, {0x2206, 0x135A}, {0x2206, 0x8FE6}, {0x2206, 0xEA12},
+	{0x2206, 0xE7EA}, {0x2206, 0x13F7}, {0x2206, 0x26E4}, {0x2206, 0xEA14},
+	{0x2206, 0xE5EA}, {0x2206, 0x15F7}, {0x2206, 0x27E4}, {0x2206, 0xEA14},
+	{0x2206, 0xE5EA}, {0x2206, 0x15FD}, {0x2206, 0xFC04}, {0x2206, 0xF8FA},
+	{0x2206, 0xEF69}, {0x2206, 0xE08B}, {0x2206, 0x86AD}, {0x2206, 0x2146},
+	{0x2206, 0xE0E0}, {0x2206, 0x22E1}, {0x2206, 0xE023}, {0x2206, 0x58C0},
+	{0x2206, 0x5902}, {0x2206, 0x1E01}, {0x2206, 0xE18B}, {0x2206, 0x651F},
+	{0x2206, 0x109E}, {0x2206, 0x33E4}, {0x2206, 0x8B65}, {0x2206, 0xAD21},
+	{0x2206, 0x22AD}, {0x2206, 0x272A}, {0x2206, 0xD400}, {0x2206, 0x01BF},
+	{0x2206, 0x34F2}, {0x2206, 0x022C}, {0x2206, 0xA2BF}, {0x2206, 0x34F5},
+	{0x2206, 0x022C}, {0x2206, 0xE0E0}, {0x2206, 0x8B67}, {0x2206, 0x1B10},
+	{0x2206, 0xAA14}, {0x2206, 0xE18B}, {0x2206, 0x660D}, {0x2206, 0x1459},
+	{0x2206, 0x0FAE}, {0x2206, 0x05E1}, {0x2206, 0x8B66}, {0x2206, 0x590F},
+	{0x2206, 0xBF85}, {0x2206, 0x6102}, {0x2206, 0x2CA2}, {0x2206, 0xEF96},
+	{0x2206, 0xFEFC}, {0x2206, 0x04F8}, {0x2206, 0xF9FA}, {0x2206, 0xFBEF},
+	{0x2206, 0x79E2}, {0x2206, 0x8AD2}, {0x2206, 0xAC19}, {0x2206, 0x2DE0},
+	{0x2206, 0xE036}, {0x2206, 0xE1E0}, {0x2206, 0x37EF}, {0x2206, 0x311F},
+	{0x2206, 0x325B}, {0x2206, 0x019E}, {0x2206, 0x1F7A}, {0x2206, 0x0159},
+	{0x2206, 0x019F}, {0x2206, 0x0ABF}, {0x2206, 0x348E}, {0x2206, 0x022C},
+	{0x2206, 0x31F6}, {0x2206, 0x06AE}, {0x2206, 0x0FF6}, {0x2206, 0x0302},
+	{0x2206, 0x0470}, {0x2206, 0xF703}, {0x2206, 0xF706}, {0x2206, 0xBF34},
+	{0x2206, 0x9302}, {0x2206, 0x2C31}, {0x2206, 0xAC1A}, {0x2206, 0x25E0},
+	{0x2206, 0xE022}, {0x2206, 0xE1E0}, {0x2206, 0x23EF}, {0x2206, 0x300D},
+	{0x2206, 0x311F}, {0x2206, 0x325B}, {0x2206, 0x029E}, {0x2206, 0x157A},
+	{0x2206, 0x0258}, {0x2206, 0xC4A0}, {0x2206, 0x0408}, {0x2206, 0xBF34},
+	{0x2206, 0x9E02}, {0x2206, 0x2C31}, {0x2206, 0xAE06}, {0x2206, 0xBF34},
+	{0x2206, 0x9C02}, {0x2206, 0x2C31}, {0x2206, 0xAC1B}, {0x2206, 0x4AE0},
+	{0x2206, 0xE012}, {0x2206, 0xE1E0}, {0x2206, 0x13EF}, {0x2206, 0x300D},
+	{0x2206, 0x331F}, {0x2206, 0x325B}, {0x2206, 0x1C9E}, {0x2206, 0x3AEF},
+	{0x2206, 0x325B}, {0x2206, 0x1C9F}, {0x2206, 0x09BF}, {0x2206, 0x3498},
+	{0x2206, 0x022C}, {0x2206, 0x3102}, {0x2206, 0x83C5}, {0x2206, 0x5A03},
+	{0x2206, 0x0D03}, {0x2206, 0x581C}, {0x2206, 0x1E20}, {0x2206, 0x0207},
+	{0x2206, 0xA0A0}, {0x2206, 0x000E}, {0x2206, 0x0284}, {0x2206, 0x17AD},
+	{0x2206, 0x1817}, {0x2206, 0xBF34}, {0x2206, 0x9A02}, {0x2206, 0x2C31},
+	{0x2206, 0xAE0F}, {0x2206, 0xBF34}, {0x2206, 0xC802}, {0x2206, 0x2C31},
+	{0x2206, 0xBF34}, {0x2206, 0xC502}, {0x2206, 0x2C31}, {0x2206, 0x0284},
+	{0x2206, 0x52E6}, {0x2206, 0x8AD2}, {0x2206, 0xEF97}, {0x2206, 0xFFFE},
+	{0x2206, 0xFDFC}, {0x2206, 0x04F8}, {0x2206, 0xBF34}, {0x2206, 0xDA02},
+	{0x2206, 0x2CE0}, {0x2206, 0xE58A}, {0x2206, 0xD3BF}, {0x2206, 0x34D4},
+	{0x2206, 0x022C}, {0x2206, 0xE00C}, {0x2206, 0x1159}, {0x2206, 0x02E0},
+	{0x2206, 0x8AD3}, {0x2206, 0x1E01}, {0x2206, 0xE48A}, {0x2206, 0xD3D1},
+	{0x2206, 0x00BF}, {0x2206, 0x34DA}, {0x2206, 0x022C}, {0x2206, 0xA2D1},
+	{0x2206, 0x01BF}, {0x2206, 0x34D4}, {0x2206, 0x022C}, {0x2206, 0xA2BF},
+	{0x2206, 0x34CB}, {0x2206, 0x022C}, {0x2206, 0xE0E5}, {0x2206, 0x8ACE},
+	{0x2206, 0xBF85}, {0x2206, 0x6702}, {0x2206, 0x2CE0}, {0x2206, 0xE58A},
+	{0x2206, 0xCFBF}, {0x2206, 0x8564}, {0x2206, 0x022C}, {0x2206, 0xE0E5},
+	{0x2206, 0x8AD0}, {0x2206, 0xBF85}, {0x2206, 0x6A02}, {0x2206, 0x2CE0},
+	{0x2206, 0xE58A}, {0x2206, 0xD1FC}, {0x2206, 0x04F8}, {0x2206, 0xE18A},
+	{0x2206, 0xD1BF}, {0x2206, 0x856A}, {0x2206, 0x022C}, {0x2206, 0xA2E1},
+	{0x2206, 0x8AD0}, {0x2206, 0xBF85}, {0x2206, 0x6402}, {0x2206, 0x2CA2},
+	{0x2206, 0xE18A}, {0x2206, 0xCFBF}, {0x2206, 0x8567}, {0x2206, 0x022C},
+	{0x2206, 0xA2E1}, {0x2206, 0x8ACE}, {0x2206, 0xBF34}, {0x2206, 0xCB02},
+	{0x2206, 0x2CA2}, {0x2206, 0xE18A}, {0x2206, 0xD3BF}, {0x2206, 0x34DA},
+	{0x2206, 0x022C}, {0x2206, 0xA2E1}, {0x2206, 0x8AD3}, {0x2206, 0x0D11},
+	{0x2206, 0xBF34}, {0x2206, 0xD402}, {0x2206, 0x2CA2}, {0x2206, 0xFC04},
+	{0x2206, 0xF9A0}, {0x2206, 0x0405}, {0x2206, 0xE38A}, {0x2206, 0xD4AE},
+	{0x2206, 0x13A0}, {0x2206, 0x0805}, {0x2206, 0xE38A}, {0x2206, 0xD5AE},
+	{0x2206, 0x0BA0}, {0x2206, 0x0C05}, {0x2206, 0xE38A}, {0x2206, 0xD6AE},
+	{0x2206, 0x03E3}, {0x2206, 0x8AD7}, {0x2206, 0xEF13}, {0x2206, 0xBF34},
+	{0x2206, 0xCB02}, {0x2206, 0x2CA2}, {0x2206, 0xEF13}, {0x2206, 0x0D11},
+	{0x2206, 0xBF85}, {0x2206, 0x6702}, {0x2206, 0x2CA2}, {0x2206, 0xEF13},
+	{0x2206, 0x0D14}, {0x2206, 0xBF85}, {0x2206, 0x6402}, {0x2206, 0x2CA2},
+	{0x2206, 0xEF13}, {0x2206, 0x0D17}, {0x2206, 0xBF85}, {0x2206, 0x6A02},
+	{0x2206, 0x2CA2}, {0x2206, 0xFD04}, {0x2206, 0xF8E0}, {0x2206, 0x8B85},
+	{0x2206, 0xAD27}, {0x2206, 0x2DE0}, {0x2206, 0xE036}, {0x2206, 0xE1E0},
+	{0x2206, 0x37E1}, {0x2206, 0x8B73}, {0x2206, 0x1F10}, {0x2206, 0x9E20},
+	{0x2206, 0xE48B}, {0x2206, 0x73AC}, {0x2206, 0x200B}, {0x2206, 0xAC21},
+	{0x2206, 0x0DAC}, {0x2206, 0x250F}, {0x2206, 0xAC27}, {0x2206, 0x0EAE},
+	{0x2206, 0x0F02}, {0x2206, 0x84CC}, {0x2206, 0xAE0A}, {0x2206, 0x0284},
+	{0x2206, 0xD1AE}, {0x2206, 0x05AE}, {0x2206, 0x0302}, {0x2206, 0x84D8},
+	{0x2206, 0xFC04}, {0x2206, 0xEE8B}, {0x2206, 0x6800}, {0x2206, 0x0402},
+	{0x2206, 0x84E5}, {0x2206, 0x0285}, {0x2206, 0x2804}, {0x2206, 0x0285},
+	{0x2206, 0x4904}, {0x2206, 0xEE8B}, {0x2206, 0x6800}, {0x2206, 0xEE8B},
+	{0x2206, 0x6902}, {0x2206, 0x04F8}, {0x2206, 0xF9E0}, {0x2206, 0x8B85},
+	{0x2206, 0xAD26}, {0x2206, 0x38D0}, {0x2206, 0x0B02}, {0x2206, 0x2B4D},
+	{0x2206, 0x5882}, {0x2206, 0x7882}, {0x2206, 0x9F2D}, {0x2206, 0xE08B},
+	{0x2206, 0x68E1}, {0x2206, 0x8B69}, {0x2206, 0x1F10}, {0x2206, 0x9EC8},
+	{0x2206, 0x10E4}, {0x2206, 0x8B68}, {0x2206, 0xE0E0}, {0x2206, 0x00E1},
+	{0x2206, 0xE001}, {0x2206, 0xF727}, {0x2206, 0xE4E0}, {0x2206, 0x00E5},
+	{0x2206, 0xE001}, {0x2206, 0xE2E0}, {0x2206, 0x20E3}, {0x2206, 0xE021},
+	{0x2206, 0xAD30}, {0x2206, 0xF7F6}, {0x2206, 0x27E4}, {0x2206, 0xE000},
+	{0x2206, 0xE5E0}, {0x2206, 0x01FD}, {0x2206, 0xFC04}, {0x2206, 0xF8FA},
+	{0x2206, 0xEF69}, {0x2206, 0xE08B}, {0x2206, 0x86AD}, {0x2206, 0x2212},
+	{0x2206, 0xE0E0}, {0x2206, 0x14E1}, {0x2206, 0xE015}, {0x2206, 0xAD26},
+	{0x2206, 0x9CE1}, {0x2206, 0x85E0}, {0x2206, 0xBF85}, {0x2206, 0x6D02},
+	{0x2206, 0x2CA2}, {0x2206, 0xEF96}, {0x2206, 0xFEFC}, {0x2206, 0x04F8},
+	{0x2206, 0xFAEF}, {0x2206, 0x69E0}, {0x2206, 0x8B86}, {0x2206, 0xAD22},
+	{0x2206, 0x09E1}, {0x2206, 0x85E1}, {0x2206, 0xBF85}, {0x2206, 0x6D02},
+	{0x2206, 0x2CA2}, {0x2206, 0xEF96}, {0x2206, 0xFEFC}, {0x2206, 0x0464},
+	{0x2206, 0xE48C}, {0x2206, 0xFDE4}, {0x2206, 0x80CA}, {0x2206, 0xE480},
+	{0x2206, 0x66E0}, {0x2206, 0x8E70}, {0x2206, 0xE076}, {0x2205, 0xE142},
+	{0x2206, 0x0701}, {0x2205, 0xE140}, {0x2206, 0x0405}, {0x220F, 0x0000},
+	{0x221F, 0x0000}, {0x2200, 0x1340}, {0x133E, 0x000E}, {0x133F, 0x0010},
+	{0x13EB, 0x11BB}
+};
+
+static const struct rtl8367b_initval rtl8367r_vb_initvals_1[] = {
+	{0x1B03, 0x0876}, {0x1200, 0x7FC4}, {0x1305, 0xC000}, {0x121E, 0x03CA},
+	{0x1233, 0x0352}, {0x1234, 0x0064}, {0x1237, 0x0096}, {0x1238, 0x0078},
+	{0x1239, 0x0084}, {0x123A, 0x0030}, {0x205F, 0x0002}, {0x2059, 0x1A00},
+	{0x205F, 0x0000}, {0x207F, 0x0002}, {0x2077, 0x0000}, {0x2078, 0x0000},
+	{0x2079, 0x0000}, {0x207A, 0x0000}, {0x207B, 0x0000}, {0x207F, 0x0000},
+	{0x205F, 0x0002}, {0x2053, 0x0000}, {0x2054, 0x0000}, {0x2055, 0x0000},
+	{0x2056, 0x0000}, {0x2057, 0x0000}, {0x205F, 0x0000}, {0x133F, 0x0030},
+	{0x133E, 0x000E}, {0x221F, 0x0005}, {0x2205, 0x8B86}, {0x2206, 0x800E},
+	{0x221F, 0x0000}, {0x133F, 0x0010}, {0x12A3, 0x2200}, {0x6107, 0xE58B},
+	{0x6103, 0xA970}, {0x0018, 0x0F00}, {0x0038, 0x0F00}, {0x0058, 0x0F00},
+	{0x0078, 0x0F00}, {0x0098, 0x0F00}, {0x133F, 0x0030}, {0x133E, 0x000E},
+	{0x221F, 0x0005}, {0x2205, 0x8B6E}, {0x2206, 0x0000}, {0x220F, 0x0100},
+	{0x2205, 0xFFF6}, {0x2206, 0x0080}, {0x2205, 0x8000}, {0x2206, 0x0280},
+	{0x2206, 0x2BF7}, {0x2206, 0x00E0}, {0x2206, 0xFFF7}, {0x2206, 0xA080},
+	{0x2206, 0x02AE}, {0x2206, 0xF602}, {0x2206, 0x0153}, {0x2206, 0x0201},
+	{0x2206, 0x6602}, {0x2206, 0x8044}, {0x2206, 0x0201}, {0x2206, 0x7CE0},
+	{0x2206, 0x8B8C}, {0x2206, 0xE18B}, {0x2206, 0x8D1E}, {0x2206, 0x01E1},
+	{0x2206, 0x8B8E}, {0x2206, 0x1E01}, {0x2206, 0xA000}, {0x2206, 0xE4AE},
+	{0x2206, 0xD8EE}, {0x2206, 0x85C0}, {0x2206, 0x00EE}, {0x2206, 0x85C1},
+	{0x2206, 0x00EE}, {0x2206, 0x8AFC}, {0x2206, 0x07EE}, {0x2206, 0x8AFD},
+	{0x2206, 0x73EE}, {0x2206, 0xFFF6}, {0x2206, 0x00EE}, {0x2206, 0xFFF7},
+	{0x2206, 0xFC04}, {0x2206, 0xF8E0}, {0x2206, 0x8B8E}, {0x2206, 0xAD20},
+	{0x2206, 0x0302}, {0x2206, 0x8050}, {0x2206, 0xFC04}, {0x2206, 0xF8F9},
+	{0x2206, 0xE08B}, {0x2206, 0x85AD}, {0x2206, 0x2548}, {0x2206, 0xE08A},
+	{0x2206, 0xE4E1}, {0x2206, 0x8AE5}, {0x2206, 0x7C00}, {0x2206, 0x009E},
+	{0x2206, 0x35EE}, {0x2206, 0x8AE4}, {0x2206, 0x00EE}, {0x2206, 0x8AE5},
+	{0x2206, 0x00E0}, {0x2206, 0x8AFC}, {0x2206, 0xE18A}, {0x2206, 0xFDE2},
+	{0x2206, 0x85C0}, {0x2206, 0xE385}, {0x2206, 0xC102}, {0x2206, 0x2DAC},
+	{0x2206, 0xAD20}, {0x2206, 0x12EE}, {0x2206, 0x8AE4}, {0x2206, 0x03EE},
+	{0x2206, 0x8AE5}, {0x2206, 0xB7EE}, {0x2206, 0x85C0}, {0x2206, 0x00EE},
+	{0x2206, 0x85C1}, {0x2206, 0x00AE}, {0x2206, 0x1115}, {0x2206, 0xE685},
+	{0x2206, 0xC0E7}, {0x2206, 0x85C1}, {0x2206, 0xAE08}, {0x2206, 0xEE85},
+	{0x2206, 0xC000}, {0x2206, 0xEE85}, {0x2206, 0xC100}, {0x2206, 0xFDFC},
+	{0x2206, 0x0400}, {0x2205, 0xE142}, {0x2206, 0x0701}, {0x2205, 0xE140},
+	{0x2206, 0x0405}, {0x220F, 0x0000}, {0x221F, 0x0000}, {0x133E, 0x000E},
+	{0x133F, 0x0010}, {0x13EB, 0x11BB}, {0x207F, 0x0002}, {0x2073, 0x1D22},
+	{0x207F, 0x0000}, {0x133F, 0x0030}, {0x133E, 0x000E}, {0x2200, 0x1340},
+	{0x133E, 0x000E}, {0x133F, 0x0010},
+};
+
+static int rtl8367b_write_initvals(struct rtl8366_smi *smi,
+				  const struct rtl8367b_initval *initvals,
+				  int count)
+{
+	int err;
+	int i;
+
+	for (i = 0; i < count; i++)
+		REG_WR(smi, initvals[i].reg, initvals[i].val);
+
+	return 0;
+}
+
+static int rtl8367b_read_phy_reg(struct rtl8366_smi *smi,
+				u32 phy_addr, u32 phy_reg, u32 *val)
+{
+	int timeout;
+	u32 data;
+	int err;
+
+	if (phy_addr > RTL8367B_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	if (phy_reg > RTL8367B_PHY_REG_MAX)
+		return -EINVAL;
+
+	REG_RD(smi, RTL8367B_IA_STATUS_REG, &data);
+	if (data & RTL8367B_IA_STATUS_PHY_BUSY)
+		return -ETIMEDOUT;
+
+	/* prepare address */
+	REG_WR(smi, RTL8367B_IA_ADDRESS_REG,
+	       RTL8367B_INTERNAL_PHY_REG(phy_addr, phy_reg));
+
+	/* send read command */
+	REG_WR(smi, RTL8367B_IA_CTRL_REG,
+	       RTL8367B_IA_CTRL_CMD_MASK | RTL8367B_IA_CTRL_RW_READ);
+
+	timeout = 5;
+	do {
+		REG_RD(smi, RTL8367B_IA_STATUS_REG, &data);
+		if ((data & RTL8367B_IA_STATUS_PHY_BUSY) == 0)
+			break;
+
+		if (timeout--) {
+			dev_err(smi->parent, "phy read timed out\n");
+			return -ETIMEDOUT;
+		}
+
+		udelay(1);
+	} while (1);
+
+	/* read data */
+	REG_RD(smi, RTL8367B_IA_READ_DATA_REG, val);
+
+	dev_dbg(smi->parent, "phy_read: addr:%02x, reg:%02x, val:%04x\n",
+		phy_addr, phy_reg, *val);
+	return 0;
+}
+
+static int rtl8367b_write_phy_reg(struct rtl8366_smi *smi,
+				 u32 phy_addr, u32 phy_reg, u32 val)
+{
+	int timeout;
+	u32 data;
+	int err;
+
+	dev_dbg(smi->parent, "phy_write: addr:%02x, reg:%02x, val:%04x\n",
+		phy_addr, phy_reg, val);
+
+	if (phy_addr > RTL8367B_PHY_ADDR_MAX)
+		return -EINVAL;
+
+	if (phy_reg > RTL8367B_PHY_REG_MAX)
+		return -EINVAL;
+
+	REG_RD(smi, RTL8367B_IA_STATUS_REG, &data);
+	if (data & RTL8367B_IA_STATUS_PHY_BUSY)
+		return -ETIMEDOUT;
+
+	/* preapre data */
+	REG_WR(smi, RTL8367B_IA_WRITE_DATA_REG, val);
+
+	/* prepare address */
+	REG_WR(smi, RTL8367B_IA_ADDRESS_REG,
+	       RTL8367B_INTERNAL_PHY_REG(phy_addr, phy_reg));
+
+	/* send write command */
+	REG_WR(smi, RTL8367B_IA_CTRL_REG,
+	       RTL8367B_IA_CTRL_CMD_MASK | RTL8367B_IA_CTRL_RW_WRITE);
+
+	timeout = 5;
+	do {
+		REG_RD(smi, RTL8367B_IA_STATUS_REG, &data);
+		if ((data & RTL8367B_IA_STATUS_PHY_BUSY) == 0)
+			break;
+
+		if (timeout--) {
+			dev_err(smi->parent, "phy write timed out\n");
+			return -ETIMEDOUT;
+		}
+
+		udelay(1);
+	} while (1);
+
+	return 0;
+}
+
+static int rtl8367b_init_regs(struct rtl8366_smi *smi)
+{
+	const struct rtl8367b_initval *initvals;
+	u32 chip_ver;
+	u32 rlvid;
+	int count;
+	int err;
+
+	REG_WR(smi, RTL8367B_RTL_MAGIC_ID_REG, RTL8367B_RTL_MAGIC_ID_VAL);
+	REG_RD(smi, RTL8367B_CHIP_VER_REG, &chip_ver);
+
+	rlvid = (chip_ver >> RTL8367B_CHIP_VER_RLVID_SHIFT) &
+		RTL8367B_CHIP_VER_RLVID_MASK;
+
+	switch (rlvid) {
+	case 0:
+		initvals = rtl8367r_vb_initvals_0;
+		count = ARRAY_SIZE(rtl8367r_vb_initvals_0);
+		break;
+
+	case 1:
+		initvals = rtl8367r_vb_initvals_1;
+		count = ARRAY_SIZE(rtl8367r_vb_initvals_1);
+		break;
+
+	default:
+		dev_err(smi->parent, "unknow rlvid %u\n", rlvid);
+		return -ENODEV;
+	}
+
+	/* TODO: disable RLTP */
+
+	return rtl8367b_write_initvals(smi, initvals, count);
+}
+
+static int rtl8367b_reset_chip(struct rtl8366_smi *smi)
+{
+	int timeout = 10;
+	int err;
+	u32 data;
+
+	REG_WR(smi, RTL8367B_CHIP_RESET_REG, RTL8367B_CHIP_RESET_HW);
+	msleep(RTL8367B_RESET_DELAY);
+
+	do {
+		REG_RD(smi, RTL8367B_CHIP_RESET_REG, &data);
+		if (!(data & RTL8367B_CHIP_RESET_HW))
+			break;
+
+		msleep(1);
+	} while (--timeout);
+
+	if (!timeout) {
+		dev_err(smi->parent, "chip reset timed out\n");
+		return -ETIMEDOUT;
+	}
+
+	return 0;
+}
+
+static int rtl8367b_extif_set_mode(struct rtl8366_smi *smi, int id,
+				   enum rtl8367_extif_mode mode)
+{
+	int err;
+
+	/* set port mode */
+	switch (mode) {
+	case RTL8367_EXTIF_MODE_RGMII:
+	case RTL8367_EXTIF_MODE_RGMII_33V:
+		REG_WR(smi, RTL8367B_CHIP_DEBUG0_REG, 0x0367);
+		REG_WR(smi, RTL8367B_CHIP_DEBUG1_REG, 0x7777);
+		break;
+
+	case RTL8367_EXTIF_MODE_TMII_MAC:
+	case RTL8367_EXTIF_MODE_TMII_PHY:
+		REG_RMW(smi, RTL8367B_BYPASS_LINE_RATE_REG,
+			BIT((id + 1) % 2), BIT((id + 1) % 2));
+		break;
+
+	case RTL8367_EXTIF_MODE_GMII:
+		REG_RMW(smi, RTL8367B_CHIP_DEBUG0_REG,
+		        RTL8367B_CHIP_DEBUG0_DUMMY0(id),
+			RTL8367B_CHIP_DEBUG0_DUMMY0(id));
+		REG_RMW(smi, RTL8367B_EXT_RGMXF_REG(id), BIT(6), BIT(6));
+		break;
+
+	case RTL8367_EXTIF_MODE_MII_MAC:
+	case RTL8367_EXTIF_MODE_MII_PHY:
+	case RTL8367_EXTIF_MODE_DISABLED:
+		REG_RMW(smi, RTL8367B_BYPASS_LINE_RATE_REG,
+			BIT((id + 1) % 2), 0);
+		REG_RMW(smi, RTL8367B_EXT_RGMXF_REG(id), BIT(6), 0);
+		break;
+
+	default:
+		dev_err(smi->parent,
+			"invalid mode for external interface %d\n", id);
+		return -EINVAL;
+	}
+
+	REG_RMW(smi, RTL8367B_DIS_REG,
+		RTL8367B_DIS_RGMII_MASK << RTL8367B_DIS_RGMII_SHIFT(id),
+		mode << RTL8367B_DIS_RGMII_SHIFT(id));
+
+	return 0;
+}
+
+static int rtl8367b_extif_set_force(struct rtl8366_smi *smi, int id,
+				    struct rtl8367_port_ability *pa)
+{
+	u32 mask;
+	u32 val;
+	int err;
+
+	mask = (RTL8367B_DI_FORCE_MODE |
+		RTL8367B_DI_FORCE_NWAY |
+		RTL8367B_DI_FORCE_TXPAUSE |
+		RTL8367B_DI_FORCE_RXPAUSE |
+		RTL8367B_DI_FORCE_LINK |
+		RTL8367B_DI_FORCE_DUPLEX |
+		RTL8367B_DI_FORCE_SPEED_MASK);
+
+	val = pa->speed;
+	val |= pa->force_mode ? RTL8367B_DI_FORCE_MODE : 0;
+	val |= pa->nway ? RTL8367B_DI_FORCE_NWAY : 0;
+	val |= pa->txpause ? RTL8367B_DI_FORCE_TXPAUSE : 0;
+	val |= pa->rxpause ? RTL8367B_DI_FORCE_RXPAUSE : 0;
+	val |= pa->link ? RTL8367B_DI_FORCE_LINK : 0;
+	val |= pa->duplex ? RTL8367B_DI_FORCE_DUPLEX : 0;
+
+	REG_RMW(smi, RTL8367B_DI_FORCE_REG(id), mask, val);
+
+	return 0;
+}
+
+static int rtl8367b_extif_set_rgmii_delay(struct rtl8366_smi *smi, int id,
+					 unsigned txdelay, unsigned rxdelay)
+{
+	u32 mask;
+	u32 val;
+	int err;
+
+	mask = (RTL8367B_EXT_RGMXF_RXDELAY_MASK |
+		(RTL8367B_EXT_RGMXF_TXDELAY_MASK <<
+			RTL8367B_EXT_RGMXF_TXDELAY_SHIFT));
+
+	val = rxdelay;
+	val |= txdelay << RTL8367B_EXT_RGMXF_TXDELAY_SHIFT;
+
+	REG_RMW(smi, RTL8367B_EXT_RGMXF_REG(id), mask, val);
+
+	return 0;
+}
+
+static int rtl8367b_extif_init(struct rtl8366_smi *smi, int id,
+			       struct rtl8367_extif_config *cfg)
+{
+	enum rtl8367_extif_mode mode;
+	int err;
+
+	mode = (cfg) ? cfg->mode : RTL8367_EXTIF_MODE_DISABLED;
+
+	err = rtl8367b_extif_set_mode(smi, id, mode);
+	if (err)
+		return err;
+
+	if (mode != RTL8367_EXTIF_MODE_DISABLED) {
+		err = rtl8367b_extif_set_force(smi, id, &cfg->ability);
+		if (err)
+			return err;
+
+		err = rtl8367b_extif_set_rgmii_delay(smi, id, cfg->txdelay,
+						     cfg->rxdelay);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+#ifdef CONFIG_OF
+static int rtl8367b_extif_init_of(struct rtl8366_smi *smi, int id,
+				  const char *name)
+{
+	struct rtl8367_extif_config *cfg;
+	const __be32 *prop;
+	int size;
+	int err;
+
+	prop = of_get_property(smi->parent->of_node, name, &size);
+	if (!prop)
+		return rtl8367b_extif_init(smi, id, NULL);
+
+	if (size != (9 * sizeof(*prop))) {
+		dev_err(smi->parent, "%s property is invalid\n", name);
+		return -EINVAL;
+	}
+
+	cfg = kzalloc(sizeof(struct rtl8367_extif_config), GFP_KERNEL);
+	if (!cfg)
+		return -ENOMEM;
+
+	cfg->txdelay = be32_to_cpup(prop++);
+	cfg->rxdelay = be32_to_cpup(prop++);
+	cfg->mode = be32_to_cpup(prop++);
+	cfg->ability.force_mode = be32_to_cpup(prop++);
+	cfg->ability.txpause = be32_to_cpup(prop++);
+	cfg->ability.rxpause = be32_to_cpup(prop++);
+	cfg->ability.link = be32_to_cpup(prop++);
+	cfg->ability.duplex = be32_to_cpup(prop++);
+	cfg->ability.speed = be32_to_cpup(prop++);
+
+	err = rtl8367b_extif_init(smi, id, cfg);
+	kfree(cfg);
+
+	return err;
+}
+#else
+static int rtl8367b_extif_init_of(struct rtl8366_smi *smi, int id,
+				  const char *name)
+{
+	return -EINVAL;
+}
+#endif
+
+static int rtl8367b_setup(struct rtl8366_smi *smi)
+{
+	struct rtl8367_platform_data *pdata;
+	int err;
+	int i;
+
+	pdata = smi->parent->platform_data;
+
+	err = rtl8367b_init_regs(smi);
+	if (err)
+		return err;
+
+	/* initialize external interfaces */
+	if (smi->parent->of_node) {
+		err = rtl8367b_extif_init_of(smi, 0, "realtek,extif0");
+		if (err)
+			return err;
+
+		err = rtl8367b_extif_init_of(smi, 1, "realtek,extif1");
+		if (err)
+			return err;
+	} else {
+		err = rtl8367b_extif_init(smi, 0, pdata->extif0_cfg);
+		if (err)
+			return err;
+
+		err = rtl8367b_extif_init(smi, 1, pdata->extif1_cfg);
+		if (err)
+			return err;
+	}
+
+	/* set maximum packet length to 1536 bytes */
+	REG_RMW(smi, RTL8367B_SWC0_REG, RTL8367B_SWC0_MAX_LENGTH_MASK,
+		RTL8367B_SWC0_MAX_LENGTH_1536);
+
+	/*
+	 * discard VLAN tagged packets if the port is not a member of
+	 * the VLAN with which the packets is associated.
+	 */
+	REG_WR(smi, RTL8367B_VLAN_INGRESS_REG, RTL8367B_PORTS_ALL);
+
+	/*
+	 * Setup egress tag mode for each port.
+	 */
+	for (i = 0; i < RTL8367B_NUM_PORTS; i++)
+		REG_RMW(smi,
+			RTL8367B_PORT_MISC_CFG_REG(i),
+			RTL8367B_PORT_MISC_CFG_EGRESS_MODE_MASK <<
+				RTL8367B_PORT_MISC_CFG_EGRESS_MODE_SHIFT,
+			RTL8367B_PORT_MISC_CFG_EGRESS_MODE_ORIGINAL <<
+				RTL8367B_PORT_MISC_CFG_EGRESS_MODE_SHIFT);
+
+	return 0;
+}
+
+static int rtl8367b_get_mib_counter(struct rtl8366_smi *smi, int counter,
+				    int port, unsigned long long *val)
+{
+	struct rtl8366_mib_counter *mib;
+	int offset;
+	int i;
+	int err;
+	u32 addr, data;
+	u64 mibvalue;
+
+	if (port > RTL8367B_NUM_PORTS ||
+	    counter >= RTL8367B_NUM_MIB_COUNTERS)
+		return -EINVAL;
+
+	mib = &rtl8367b_mib_counters[counter];
+	addr = RTL8367B_MIB_COUNTER_PORT_OFFSET * port + mib->offset;
+
+	/*
+	 * Writing access counter address first
+	 * then ASIC will prepare 64bits counter wait for being retrived
+	 */
+	REG_WR(smi, RTL8367B_MIB_ADDRESS_REG, addr >> 2);
+
+	/* read MIB control register */
+	REG_RD(smi, RTL8367B_MIB_CTRL0_REG(0), &data);
+
+	if (data & RTL8367B_MIB_CTRL0_BUSY_MASK)
+		return -EBUSY;
+
+	if (data & RTL8367B_MIB_CTRL0_RESET_MASK)
+		return -EIO;
+
+	if (mib->length == 4)
+		offset = 3;
+	else
+		offset = (mib->offset + 1) % 4;
+
+	mibvalue = 0;
+	for (i = 0; i < mib->length; i++) {
+		REG_RD(smi, RTL8367B_MIB_COUNTER_REG(offset - i), &data);
+		mibvalue = (mibvalue << 16) | (data & 0xFFFF);
+	}
+
+	*val = mibvalue;
+	return 0;
+}
+
+static int rtl8367b_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
+				struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[RTL8367B_TA_VLAN_NUM_WORDS];
+	int err;
+	int i;
+
+	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
+
+	if (vid >= RTL8367B_NUM_VIDS)
+		return -EINVAL;
+
+	/* write VID */
+	REG_WR(smi, RTL8367B_TA_ADDR_REG, vid);
+
+	/* write table access control word */
+	REG_WR(smi, RTL8367B_TA_CTRL_REG, RTL8367B_TA_CTRL_CVLAN_READ);
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_RD(smi, RTL8367B_TA_RDDATA_REG(i), &data[i]);
+
+	vlan4k->vid = vid;
+	vlan4k->member = (data[0] >> RTL8367B_TA_VLAN0_MEMBER_SHIFT) &
+			 RTL8367B_TA_VLAN0_MEMBER_MASK;
+	vlan4k->untag = (data[0] >> RTL8367B_TA_VLAN0_UNTAG_SHIFT) &
+			RTL8367B_TA_VLAN0_UNTAG_MASK;
+	vlan4k->fid = (data[1] >> RTL8367B_TA_VLAN1_FID_SHIFT) &
+		      RTL8367B_TA_VLAN1_FID_MASK;
+
+	return 0;
+}
+
+static int rtl8367b_set_vlan_4k(struct rtl8366_smi *smi,
+				const struct rtl8366_vlan_4k *vlan4k)
+{
+	u32 data[RTL8367B_TA_VLAN_NUM_WORDS];
+	int err;
+	int i;
+
+	if (vlan4k->vid >= RTL8367B_NUM_VIDS ||
+	    vlan4k->member > RTL8367B_TA_VLAN0_MEMBER_MASK ||
+	    vlan4k->untag > RTL8367B_UNTAG_MASK ||
+	    vlan4k->fid > RTL8367B_FIDMAX)
+		return -EINVAL;
+
+	memset(data, 0, sizeof(data));
+
+	data[0] = (vlan4k->member & RTL8367B_TA_VLAN0_MEMBER_MASK) <<
+		  RTL8367B_TA_VLAN0_MEMBER_SHIFT;
+	data[0] |= (vlan4k->untag & RTL8367B_TA_VLAN0_UNTAG_MASK) <<
+		   RTL8367B_TA_VLAN0_UNTAG_SHIFT;
+	data[1] = (vlan4k->fid & RTL8367B_TA_VLAN1_FID_MASK) <<
+		  RTL8367B_TA_VLAN1_FID_SHIFT;
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_WR(smi, RTL8367B_TA_WRDATA_REG(i), data[i]);
+
+	/* write VID */
+	REG_WR(smi, RTL8367B_TA_ADDR_REG,
+	       vlan4k->vid & RTL8367B_TA_VLAN_VID_MASK);
+
+	/* write table access control word */
+	REG_WR(smi, RTL8367B_TA_CTRL_REG, RTL8367B_TA_CTRL_CVLAN_WRITE);
+
+	return 0;
+}
+
+static int rtl8367b_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[RTL8367B_VLAN_MC_NUM_WORDS];
+	int err;
+	int i;
+
+	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
+
+	if (index >= RTL8367B_NUM_VLANS)
+		return -EINVAL;
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_RD(smi, RTL8367B_VLAN_MC_BASE(index) + i, &data[i]);
+
+	vlanmc->member = (data[0] >> RTL8367B_VLAN_MC0_MEMBER_SHIFT) &
+			 RTL8367B_VLAN_MC0_MEMBER_MASK;
+	vlanmc->fid = (data[1] >> RTL8367B_VLAN_MC1_FID_SHIFT) &
+		      RTL8367B_VLAN_MC1_FID_MASK;
+	vlanmc->vid = (data[3] >> RTL8367B_VLAN_MC3_EVID_SHIFT) &
+		      RTL8367B_VLAN_MC3_EVID_MASK;
+
+	return 0;
+}
+
+static int rtl8367b_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
+				const struct rtl8366_vlan_mc *vlanmc)
+{
+	u32 data[RTL8367B_VLAN_MC_NUM_WORDS];
+	int err;
+	int i;
+
+	if (index >= RTL8367B_NUM_VLANS ||
+	    vlanmc->vid >= RTL8367B_NUM_VIDS ||
+	    vlanmc->priority > RTL8367B_PRIORITYMAX ||
+	    vlanmc->member > RTL8367B_VLAN_MC0_MEMBER_MASK ||
+	    vlanmc->untag > RTL8367B_UNTAG_MASK ||
+	    vlanmc->fid > RTL8367B_FIDMAX)
+		return -EINVAL;
+
+	data[0] = (vlanmc->member & RTL8367B_VLAN_MC0_MEMBER_MASK) <<
+		  RTL8367B_VLAN_MC0_MEMBER_SHIFT;
+	data[1] = (vlanmc->fid & RTL8367B_VLAN_MC1_FID_MASK) <<
+		  RTL8367B_VLAN_MC1_FID_SHIFT;
+	data[2] = 0;
+	data[3] = (vlanmc->vid & RTL8367B_VLAN_MC3_EVID_MASK) <<
+		   RTL8367B_VLAN_MC3_EVID_SHIFT;
+
+	for (i = 0; i < ARRAY_SIZE(data); i++)
+		REG_WR(smi, RTL8367B_VLAN_MC_BASE(index) + i, data[i]);
+
+	return 0;
+}
+
+static int rtl8367b_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
+{
+	u32 data;
+	int err;
+
+	if (port >= RTL8367B_NUM_PORTS)
+		return -EINVAL;
+
+	REG_RD(smi, RTL8367B_VLAN_PVID_CTRL_REG(port), &data);
+
+	*val = (data >> RTL8367B_VLAN_PVID_CTRL_SHIFT(port)) &
+	       RTL8367B_VLAN_PVID_CTRL_MASK;
+
+	return 0;
+}
+
+static int rtl8367b_set_mc_index(struct rtl8366_smi *smi, int port, int index)
+{
+	if (port >= RTL8367B_NUM_PORTS || index >= RTL8367B_NUM_VLANS)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8367B_VLAN_PVID_CTRL_REG(port),
+				RTL8367B_VLAN_PVID_CTRL_MASK <<
+					RTL8367B_VLAN_PVID_CTRL_SHIFT(port),
+				(index & RTL8367B_VLAN_PVID_CTRL_MASK) <<
+					RTL8367B_VLAN_PVID_CTRL_SHIFT(port));
+}
+
+static int rtl8367b_enable_vlan(struct rtl8366_smi *smi, int enable)
+{
+	return rtl8366_smi_rmwr(smi, RTL8367B_VLAN_CTRL_REG,
+				RTL8367B_VLAN_CTRL_ENABLE,
+				(enable) ? RTL8367B_VLAN_CTRL_ENABLE : 0);
+}
+
+static int rtl8367b_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+{
+	return 0;
+}
+
+static int rtl8367b_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
+{
+	unsigned max = RTL8367B_NUM_VLANS;
+
+	if (smi->vlan4k_enabled)
+		max = RTL8367B_NUM_VIDS - 1;
+
+	if (vlan == 0 || vlan >= max)
+		return 0;
+
+	return 1;
+}
+
+static int rtl8367b_enable_port(struct rtl8366_smi *smi, int port, int enable)
+{
+	int err;
+
+	REG_WR(smi, RTL8367B_PORT_ISOLATION_REG(port),
+	       (enable) ? RTL8367B_PORTS_ALL : 0);
+
+	return 0;
+}
+
+static int rtl8367b_sw_reset_mibs(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+
+	return rtl8366_smi_rmwr(smi, RTL8367B_MIB_CTRL0_REG(0), 0,
+				RTL8367B_MIB_CTRL0_GLOBAL_RESET_MASK);
+}
+
+static int rtl8367b_sw_get_port_link(struct switch_dev *dev,
+				    int port,
+				    struct switch_port_link *link)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data = 0;
+	u32 speed;
+
+	if (port >= RTL8367B_NUM_PORTS)
+		return -EINVAL;
+
+	rtl8366_smi_read_reg(smi, RTL8367B_PORT_STATUS_REG(port), &data);
+
+	link->link = !!(data & RTL8367B_PORT_STATUS_LINK);
+	if (!link->link)
+		return 0;
+
+	link->duplex = !!(data & RTL8367B_PORT_STATUS_DUPLEX);
+	link->rx_flow = !!(data & RTL8367B_PORT_STATUS_RXPAUSE);
+	link->tx_flow = !!(data & RTL8367B_PORT_STATUS_TXPAUSE);
+	link->aneg = !!(data & RTL8367B_PORT_STATUS_NWAY);
+
+	speed = (data & RTL8367B_PORT_STATUS_SPEED_MASK);
+	switch (speed) {
+	case 0:
+		link->speed = SWITCH_PORT_SPEED_10;
+		break;
+	case 1:
+		link->speed = SWITCH_PORT_SPEED_100;
+		break;
+	case 2:
+		link->speed = SWITCH_PORT_SPEED_1000;
+		break;
+	default:
+		link->speed = SWITCH_PORT_SPEED_UNKNOWN;
+		break;
+	}
+
+	return 0;
+}
+
+static int rtl8367b_sw_get_max_length(struct switch_dev *dev,
+				     const struct switch_attr *attr,
+				     struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 data;
+
+	rtl8366_smi_read_reg(smi, RTL8367B_SWC0_REG, &data);
+	val->value.i = (data & RTL8367B_SWC0_MAX_LENGTH_MASK) >>
+			RTL8367B_SWC0_MAX_LENGTH_SHIFT;
+
+	return 0;
+}
+
+static int rtl8367b_sw_set_max_length(struct switch_dev *dev,
+				     const struct switch_attr *attr,
+				     struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	u32 max_len;
+
+	switch (val->value.i) {
+	case 0:
+		max_len = RTL8367B_SWC0_MAX_LENGTH_1522;
+		break;
+	case 1:
+		max_len = RTL8367B_SWC0_MAX_LENGTH_1536;
+		break;
+	case 2:
+		max_len = RTL8367B_SWC0_MAX_LENGTH_1552;
+		break;
+	case 3:
+		max_len = RTL8367B_SWC0_MAX_LENGTH_16000;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return rtl8366_smi_rmwr(smi, RTL8367B_SWC0_REG,
+			        RTL8367B_SWC0_MAX_LENGTH_MASK, max_len);
+}
+
+
+static int rtl8367b_sw_reset_port_mibs(struct switch_dev *dev,
+				       const struct switch_attr *attr,
+				       struct switch_val *val)
+{
+	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	int port;
+
+	port = val->port_vlan;
+	if (port >= RTL8367B_NUM_PORTS)
+		return -EINVAL;
+
+	return rtl8366_smi_rmwr(smi, RTL8367B_MIB_CTRL0_REG(port / 8), 0,
+				RTL8367B_MIB_CTRL0_PORT_RESET_MASK(port % 8));
+}
+
+static struct switch_attr rtl8367b_globals[] = {
+	{
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan",
+		.description = "Enable VLAN mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 1
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "enable_vlan4k",
+		.description = "Enable VLAN 4K mode",
+		.set = rtl8366_sw_set_vlan_enable,
+		.get = rtl8366_sw_get_vlan_enable,
+		.max = 1,
+		.ofs = 2
+	}, {
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mibs",
+		.description = "Reset all MIB counters",
+		.set = rtl8367b_sw_reset_mibs,
+	}, {
+		.type = SWITCH_TYPE_INT,
+		.name = "max_length",
+		.description = "Get/Set the maximum length of valid packets"
+			       "(0:1522, 1:1536, 2:1552, 3:16000)",
+		.set = rtl8367b_sw_set_max_length,
+		.get = rtl8367b_sw_get_max_length,
+		.max = 3,
+	}
+};
+
+static struct switch_attr rtl8367b_port[] = {
+	{
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset_mib",
+		.description = "Reset single port MIB counters",
+		.set = rtl8367b_sw_reset_port_mibs,
+	}, {
+		.type = SWITCH_TYPE_STRING,
+		.name = "mib",
+		.description = "Get MIB counters for port",
+		.max = 33,
+		.set = NULL,
+		.get = rtl8366_sw_get_port_mib,
+	},
+};
+
+static struct switch_attr rtl8367b_vlan[] = {
+	{
+		.type = SWITCH_TYPE_STRING,
+		.name = "info",
+		.description = "Get vlan information",
+		.max = 1,
+		.set = NULL,
+		.get = rtl8366_sw_get_vlan_info,
+	},
+};
+
+static const struct switch_dev_ops rtl8367b_sw_ops = {
+	.attr_global = {
+		.attr = rtl8367b_globals,
+		.n_attr = ARRAY_SIZE(rtl8367b_globals),
+	},
+	.attr_port = {
+		.attr = rtl8367b_port,
+		.n_attr = ARRAY_SIZE(rtl8367b_port),
+	},
+	.attr_vlan = {
+		.attr = rtl8367b_vlan,
+		.n_attr = ARRAY_SIZE(rtl8367b_vlan),
+	},
+
+	.get_vlan_ports = rtl8366_sw_get_vlan_ports,
+	.set_vlan_ports = rtl8366_sw_set_vlan_ports,
+	.get_port_pvid = rtl8366_sw_get_port_pvid,
+	.set_port_pvid = rtl8366_sw_set_port_pvid,
+	.reset_switch = rtl8366_sw_reset_switch,
+	.get_port_link = rtl8367b_sw_get_port_link,
+};
+
+static int rtl8367b_switch_init(struct rtl8366_smi *smi)
+{
+	struct switch_dev *dev = &smi->sw_dev;
+	int err;
+
+	dev->name = "RTL8367B";
+	dev->cpu_port = RTL8367B_CPU_PORT_NUM;
+	dev->ports = RTL8367B_NUM_PORTS;
+	dev->vlans = RTL8367B_NUM_VIDS;
+	dev->ops = &rtl8367b_sw_ops;
+	dev->alias = dev_name(smi->parent);
+
+	err = register_switch(dev, NULL);
+	if (err)
+		dev_err(smi->parent, "switch registration failed\n");
+
+	return err;
+}
+
+static void rtl8367b_switch_cleanup(struct rtl8366_smi *smi)
+{
+	unregister_switch(&smi->sw_dev);
+}
+
+static int rtl8367b_mii_read(struct mii_bus *bus, int addr, int reg)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 val = 0;
+	int err;
+
+	err = rtl8367b_read_phy_reg(smi, addr, reg, &val);
+	if (err)
+		return 0xffff;
+
+	return val;
+}
+
+static int rtl8367b_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
+{
+	struct rtl8366_smi *smi = bus->priv;
+	u32 t;
+	int err;
+
+	err = rtl8367b_write_phy_reg(smi, addr, reg, val);
+	if (err)
+		return err;
+
+	/* flush write */
+	(void) rtl8367b_read_phy_reg(smi, addr, reg, &t);
+
+	return err;
+}
+
+static int rtl8367b_detect(struct rtl8366_smi *smi)
+{
+	const char *chip_name;
+	u32 chip_num;
+	u32 chip_ver;
+	u32 chip_mode;
+	int ret;
+
+	/* TODO: improve chip detection */
+	rtl8366_smi_write_reg(smi, RTL8367B_RTL_MAGIC_ID_REG,
+			      RTL8367B_RTL_MAGIC_ID_VAL);
+
+	ret = rtl8366_smi_read_reg(smi, RTL8367B_CHIP_NUMBER_REG, &chip_num);
+	if (ret) {
+		dev_err(smi->parent, "unable to read %s register\n",
+			"chip number");
+		return ret;
+	}
+
+	ret = rtl8366_smi_read_reg(smi, RTL8367B_CHIP_VER_REG, &chip_ver);
+	if (ret) {
+		dev_err(smi->parent, "unable to read %s register\n",
+			"chip version");
+		return ret;
+	}
+
+	ret = rtl8366_smi_read_reg(smi, RTL8367B_CHIP_MODE_REG, &chip_mode);
+	if (ret) {
+		dev_err(smi->parent, "unable to read %s register\n",
+			"chip mode");
+		return ret;
+	}
+
+	switch (chip_ver) {
+	case 0x1000:
+		chip_name = "8367RB";
+		break;
+	case 0x1010:
+		chip_name = "8367R-VB";
+		break;
+	default:
+		dev_err(smi->parent,
+			"unknown chip num:%04x ver:%04x, mode:%04x\n",
+			chip_num, chip_ver, chip_mode);
+		return -ENODEV;
+	}
+
+	dev_info(smi->parent, "RTL%s chip found\n", chip_name);
+
+	return 0;
+}
+
+static struct rtl8366_smi_ops rtl8367b_smi_ops = {
+	.detect		= rtl8367b_detect,
+	.reset_chip	= rtl8367b_reset_chip,
+	.setup		= rtl8367b_setup,
+
+	.mii_read	= rtl8367b_mii_read,
+	.mii_write	= rtl8367b_mii_write,
+
+	.get_vlan_mc	= rtl8367b_get_vlan_mc,
+	.set_vlan_mc	= rtl8367b_set_vlan_mc,
+	.get_vlan_4k	= rtl8367b_get_vlan_4k,
+	.set_vlan_4k	= rtl8367b_set_vlan_4k,
+	.get_mc_index	= rtl8367b_get_mc_index,
+	.set_mc_index	= rtl8367b_set_mc_index,
+	.get_mib_counter = rtl8367b_get_mib_counter,
+	.is_vlan_valid	= rtl8367b_is_vlan_valid,
+	.enable_vlan	= rtl8367b_enable_vlan,
+	.enable_vlan4k	= rtl8367b_enable_vlan4k,
+	.enable_port	= rtl8367b_enable_port,
+};
+
+static int  rtl8367b_probe(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi;
+	int err;
+
+	smi = rtl8366_smi_probe(pdev);
+	if (!smi)
+		return -ENODEV;
+
+	smi->clk_delay = 1500;
+	smi->cmd_read = 0xb9;
+	smi->cmd_write = 0xb8;
+	smi->ops = &rtl8367b_smi_ops;
+	smi->cpu_port = RTL8367B_CPU_PORT_NUM;
+	smi->num_ports = RTL8367B_NUM_PORTS;
+	smi->num_vlan_mc = RTL8367B_NUM_VLANS;
+	smi->mib_counters = rtl8367b_mib_counters;
+	smi->num_mib_counters = ARRAY_SIZE(rtl8367b_mib_counters);
+
+	err = rtl8366_smi_init(smi);
+	if (err)
+		goto err_free_smi;
+
+	platform_set_drvdata(pdev, smi);
+
+	err = rtl8367b_switch_init(smi);
+	if (err)
+		goto err_clear_drvdata;
+
+	return 0;
+
+ err_clear_drvdata:
+	platform_set_drvdata(pdev, NULL);
+	rtl8366_smi_cleanup(smi);
+ err_free_smi:
+	kfree(smi);
+	return err;
+}
+
+static int rtl8367b_remove(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
+
+	if (smi) {
+		rtl8367b_switch_cleanup(smi);
+		platform_set_drvdata(pdev, NULL);
+		rtl8366_smi_cleanup(smi);
+		kfree(smi);
+	}
+
+	return 0;
+}
+
+static void rtl8367b_shutdown(struct platform_device *pdev)
+{
+	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
+
+	if (smi)
+		rtl8367b_reset_chip(smi);
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id rtl8367b_match[] = {
+	{ .compatible = "realtek,rtl8367b" },
+	{ .compatible = "rtl8367b" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, rtl8367b_match);
+#endif
+
+static struct platform_driver rtl8367b_driver = {
+	.driver = {
+		.name		= RTL8367B_DRIVER_NAME,
+		.owner		= THIS_MODULE,
+#ifdef CONFIG_OF
+		.of_match_table = of_match_ptr(rtl8367b_match),
+#endif
+	},
+	.probe		= rtl8367b_probe,
+	.remove		= rtl8367b_remove,
+	.shutdown	= rtl8367b_shutdown,
+};
+
+module_platform_driver(rtl8367b_driver);
+
+MODULE_DESCRIPTION(RTL8367B_DRIVER_DESC);
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" RTL8367B_DRIVER_NAME);
+
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/swconfig.c b/trunk/target/linux/generic/files/drivers/net/phy/swconfig.c
new file mode 100644
index 00000000..4f2df4cf
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -0,0 +1,1148 @@
+/*
+ * swconfig.c: Switch configuration API
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/if.h>
+#include <linux/if_ether.h>
+#include <linux/capability.h>
+#include <linux/skbuff.h>
+#include <linux/switch.h>
+#include <linux/of.h>
+#include <linux/version.h>
+
+#define SWCONFIG_DEVNAME	"switch%d"
+
+#include "swconfig_leds.c"
+
+MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_LICENSE("GPL");
+
+static int swdev_id;
+static struct list_head swdevs;
+static DEFINE_SPINLOCK(swdevs_lock);
+struct swconfig_callback;
+
+struct swconfig_callback {
+	struct sk_buff *msg;
+	struct genlmsghdr *hdr;
+	struct genl_info *info;
+	int cmd;
+
+	/* callback for filling in the message data */
+	int (*fill)(struct swconfig_callback *cb, void *arg);
+
+	/* callback for closing the message before sending it */
+	int (*close)(struct swconfig_callback *cb, void *arg);
+
+	struct nlattr *nest[4];
+	int args[4];
+};
+
+/* defaults */
+
+static int
+swconfig_get_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	int ret;
+	if (val->port_vlan >= dev->vlans)
+		return -EINVAL;
+
+	if (!dev->ops->get_vlan_ports)
+		return -EOPNOTSUPP;
+
+	ret = dev->ops->get_vlan_ports(dev, val);
+	return ret;
+}
+
+static int
+swconfig_set_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	struct switch_port *ports = val->value.ports;
+	const struct switch_dev_ops *ops = dev->ops;
+	int i;
+
+	if (val->port_vlan >= dev->vlans)
+		return -EINVAL;
+
+	/* validate ports */
+	if (val->len > dev->ports)
+		return -EINVAL;
+
+	if (!ops->set_vlan_ports)
+		return -EOPNOTSUPP;
+
+	for (i = 0; i < val->len; i++) {
+		if (ports[i].id >= dev->ports)
+			return -EINVAL;
+
+		if (ops->set_port_pvid &&
+		    !(ports[i].flags & (1 << SWITCH_PORT_FLAG_TAGGED)))
+			ops->set_port_pvid(dev, ports[i].id, val->port_vlan);
+	}
+
+	return ops->set_vlan_ports(dev, val);
+}
+
+static int
+swconfig_set_pvid(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	if (val->port_vlan >= dev->ports)
+		return -EINVAL;
+
+	if (!dev->ops->set_port_pvid)
+		return -EOPNOTSUPP;
+
+	return dev->ops->set_port_pvid(dev, val->port_vlan, val->value.i);
+}
+
+static int
+swconfig_get_pvid(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	if (val->port_vlan >= dev->ports)
+		return -EINVAL;
+
+	if (!dev->ops->get_port_pvid)
+		return -EOPNOTSUPP;
+
+	return dev->ops->get_port_pvid(dev, val->port_vlan, &val->value.i);
+}
+
+static const char *
+swconfig_speed_str(enum switch_port_speed speed)
+{
+	switch (speed) {
+	case SWITCH_PORT_SPEED_10:
+		return "10baseT";
+	case SWITCH_PORT_SPEED_100:
+		return "100baseT";
+	case SWITCH_PORT_SPEED_1000:
+		return "1000baseT";
+	default:
+		break;
+	}
+
+	return "unknown";
+}
+
+static int
+swconfig_get_link(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	struct switch_port_link link;
+	int len;
+	int ret;
+
+	if (val->port_vlan >= dev->ports)
+		return -EINVAL;
+
+	if (!dev->ops->get_port_link)
+		return -EOPNOTSUPP;
+
+	memset(&link, 0, sizeof(link));
+	ret = dev->ops->get_port_link(dev, val->port_vlan, &link);
+	if (ret)
+		return ret;
+
+	memset(dev->buf, 0, sizeof(dev->buf));
+
+	if (link.link)
+		len = snprintf(dev->buf, sizeof(dev->buf),
+			       "port:%d link:up speed:%s %s-duplex %s%s%s",
+			       val->port_vlan,
+			       swconfig_speed_str(link.speed),
+			       link.duplex ? "full" : "half",
+			       link.tx_flow ? "txflow " : "",
+			       link.rx_flow ?	"rxflow " : "",
+			       link.aneg ? "auto" : "");
+	else
+		len = snprintf(dev->buf, sizeof(dev->buf), "port:%d link:down",
+			       val->port_vlan);
+
+	val->value.s = dev->buf;
+	val->len = len;
+
+	return 0;
+}
+
+static int
+swconfig_apply_config(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	/* don't complain if not supported by the switch driver */
+	if (!dev->ops->apply_config)
+		return 0;
+
+	return dev->ops->apply_config(dev);
+}
+
+static int
+swconfig_reset_switch(struct switch_dev *dev, const struct switch_attr *attr,
+			struct switch_val *val)
+{
+	/* don't complain if not supported by the switch driver */
+	if (!dev->ops->reset_switch)
+		return 0;
+
+	return dev->ops->reset_switch(dev);
+}
+
+enum global_defaults {
+	GLOBAL_APPLY,
+	GLOBAL_RESET,
+};
+
+enum vlan_defaults {
+	VLAN_PORTS,
+};
+
+enum port_defaults {
+	PORT_PVID,
+	PORT_LINK,
+};
+
+static struct switch_attr default_global[] = {
+	[GLOBAL_APPLY] = {
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "apply",
+		.description = "Activate changes in the hardware",
+		.set = swconfig_apply_config,
+	},
+	[GLOBAL_RESET] = {
+		.type = SWITCH_TYPE_NOVAL,
+		.name = "reset",
+		.description = "Reset the switch",
+		.set = swconfig_reset_switch,
+	}
+};
+
+static struct switch_attr default_port[] = {
+	[PORT_PVID] = {
+		.type = SWITCH_TYPE_INT,
+		.name = "pvid",
+		.description = "Primary VLAN ID",
+		.set = swconfig_set_pvid,
+		.get = swconfig_get_pvid,
+	},
+	[PORT_LINK] = {
+		.type = SWITCH_TYPE_STRING,
+		.name = "link",
+		.description = "Get port link information",
+		.set = NULL,
+		.get = swconfig_get_link,
+	}
+};
+
+static struct switch_attr default_vlan[] = {
+	[VLAN_PORTS] = {
+		.type = SWITCH_TYPE_PORTS,
+		.name = "ports",
+		.description = "VLAN port mapping",
+		.set = swconfig_set_vlan_ports,
+		.get = swconfig_get_vlan_ports,
+	},
+};
+
+static const struct switch_attr *
+swconfig_find_attr_by_name(const struct switch_attrlist *alist,
+				const char *name)
+{
+	int i;
+
+	for (i = 0; i < alist->n_attr; i++)
+		if (strcmp(name, alist->attr[i].name) == 0)
+			return &alist->attr[i];
+
+	return NULL;
+}
+
+static void swconfig_defaults_init(struct switch_dev *dev)
+{
+	const struct switch_dev_ops *ops = dev->ops;
+
+	dev->def_global = 0;
+	dev->def_vlan = 0;
+	dev->def_port = 0;
+
+	if (ops->get_vlan_ports || ops->set_vlan_ports)
+		set_bit(VLAN_PORTS, &dev->def_vlan);
+
+	if (ops->get_port_pvid || ops->set_port_pvid)
+		set_bit(PORT_PVID, &dev->def_port);
+
+	if (ops->get_port_link &&
+	    !swconfig_find_attr_by_name(&ops->attr_port, "link"))
+		set_bit(PORT_LINK, &dev->def_port);
+
+	/* always present, can be no-op */
+	set_bit(GLOBAL_APPLY, &dev->def_global);
+	set_bit(GLOBAL_RESET, &dev->def_global);
+}
+
+
+static struct genl_family switch_fam = {
+	.id = GENL_ID_GENERATE,
+	.name = "switch",
+	.hdrsize = 0,
+	.version = 1,
+	.maxattr = SWITCH_ATTR_MAX,
+};
+
+static const struct nla_policy switch_policy[SWITCH_ATTR_MAX+1] = {
+	[SWITCH_ATTR_ID] = { .type = NLA_U32 },
+	[SWITCH_ATTR_OP_ID] = { .type = NLA_U32 },
+	[SWITCH_ATTR_OP_PORT] = { .type = NLA_U32 },
+	[SWITCH_ATTR_OP_VLAN] = { .type = NLA_U32 },
+	[SWITCH_ATTR_OP_VALUE_INT] = { .type = NLA_U32 },
+	[SWITCH_ATTR_OP_VALUE_STR] = { .type = NLA_NUL_STRING },
+	[SWITCH_ATTR_OP_VALUE_PORTS] = { .type = NLA_NESTED },
+	[SWITCH_ATTR_TYPE] = { .type = NLA_U32 },
+};
+
+static const struct nla_policy port_policy[SWITCH_PORT_ATTR_MAX+1] = {
+	[SWITCH_PORT_ID] = { .type = NLA_U32 },
+	[SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
+};
+
+static inline void
+swconfig_lock(void)
+{
+	spin_lock(&swdevs_lock);
+}
+
+static inline void
+swconfig_unlock(void)
+{
+	spin_unlock(&swdevs_lock);
+}
+
+static struct switch_dev *
+swconfig_get_dev(struct genl_info *info)
+{
+	struct switch_dev *dev = NULL;
+	struct switch_dev *p;
+	int id;
+
+	if (!info->attrs[SWITCH_ATTR_ID])
+		goto done;
+
+	id = nla_get_u32(info->attrs[SWITCH_ATTR_ID]);
+	swconfig_lock();
+	list_for_each_entry(p, &swdevs, dev_list) {
+		if (id != p->id)
+			continue;
+
+		dev = p;
+		break;
+	}
+	if (dev)
+		mutex_lock(&dev->sw_mutex);
+	else
+		pr_debug("device %d not found\n", id);
+	swconfig_unlock();
+done:
+	return dev;
+}
+
+static inline void
+swconfig_put_dev(struct switch_dev *dev)
+{
+	mutex_unlock(&dev->sw_mutex);
+}
+
+static int
+swconfig_dump_attr(struct swconfig_callback *cb, void *arg)
+{
+	struct switch_attr *op = arg;
+	struct genl_info *info = cb->info;
+	struct sk_buff *msg = cb->msg;
+	int id = cb->args[0];
+	void *hdr;
+
+	hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
+			NLM_F_MULTI, SWITCH_CMD_NEW_ATTR);
+	if (IS_ERR(hdr))
+		return -1;
+
+	if (nla_put_u32(msg, SWITCH_ATTR_OP_ID, id))
+		goto nla_put_failure;
+	if (nla_put_u32(msg, SWITCH_ATTR_OP_TYPE, op->type))
+		goto nla_put_failure;
+	if (nla_put_string(msg, SWITCH_ATTR_OP_NAME, op->name))
+		goto nla_put_failure;
+	if (op->description)
+		if (nla_put_string(msg, SWITCH_ATTR_OP_DESCRIPTION,
+			op->description))
+			goto nla_put_failure;
+
+	return genlmsg_end(msg, hdr);
+nla_put_failure:
+	genlmsg_cancel(msg, hdr);
+	return -EMSGSIZE;
+}
+
+/* spread multipart messages across multiple message buffers */
+static int
+swconfig_send_multipart(struct swconfig_callback *cb, void *arg)
+{
+	struct genl_info *info = cb->info;
+	int restart = 0;
+	int err;
+
+	do {
+		if (!cb->msg) {
+			cb->msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+			if (cb->msg == NULL)
+				goto error;
+		}
+
+		if (!(cb->fill(cb, arg) < 0))
+			break;
+
+		/* fill failed, check if this was already the second attempt */
+		if (restart)
+			goto error;
+
+		/* try again in a new message, send the current one */
+		restart = 1;
+		if (cb->close) {
+			if (cb->close(cb, arg) < 0)
+				goto error;
+		}
+		err = genlmsg_reply(cb->msg, info);
+		cb->msg = NULL;
+		if (err < 0)
+			goto error;
+
+	} while (restart);
+
+	return 0;
+
+error:
+	if (cb->msg)
+		nlmsg_free(cb->msg);
+	return -1;
+}
+
+static int
+swconfig_list_attrs(struct sk_buff *skb, struct genl_info *info)
+{
+	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
+	const struct switch_attrlist *alist;
+	struct switch_dev *dev;
+	struct swconfig_callback cb;
+	int err = -EINVAL;
+	int i;
+
+	/* defaults */
+	struct switch_attr *def_list;
+	unsigned long *def_active;
+	int n_def;
+
+	dev = swconfig_get_dev(info);
+	if (!dev)
+		return -EINVAL;
+
+	switch (hdr->cmd) {
+	case SWITCH_CMD_LIST_GLOBAL:
+		alist = &dev->ops->attr_global;
+		def_list = default_global;
+		def_active = &dev->def_global;
+		n_def = ARRAY_SIZE(default_global);
+		break;
+	case SWITCH_CMD_LIST_VLAN:
+		alist = &dev->ops->attr_vlan;
+		def_list = default_vlan;
+		def_active = &dev->def_vlan;
+		n_def = ARRAY_SIZE(default_vlan);
+		break;
+	case SWITCH_CMD_LIST_PORT:
+		alist = &dev->ops->attr_port;
+		def_list = default_port;
+		def_active = &dev->def_port;
+		n_def = ARRAY_SIZE(default_port);
+		break;
+	default:
+		WARN_ON(1);
+		goto out;
+	}
+
+	memset(&cb, 0, sizeof(cb));
+	cb.info = info;
+	cb.fill = swconfig_dump_attr;
+	for (i = 0; i < alist->n_attr; i++) {
+		if (alist->attr[i].disabled)
+			continue;
+		cb.args[0] = i;
+		err = swconfig_send_multipart(&cb, (void *) &alist->attr[i]);
+		if (err < 0)
+			goto error;
+	}
+
+	/* defaults */
+	for (i = 0; i < n_def; i++) {
+		if (!test_bit(i, def_active))
+			continue;
+		cb.args[0] = SWITCH_ATTR_DEFAULTS_OFFSET + i;
+		err = swconfig_send_multipart(&cb, (void *) &def_list[i]);
+		if (err < 0)
+			goto error;
+	}
+	swconfig_put_dev(dev);
+
+	if (!cb.msg)
+		return 0;
+
+	return genlmsg_reply(cb.msg, info);
+
+error:
+	if (cb.msg)
+		nlmsg_free(cb.msg);
+out:
+	swconfig_put_dev(dev);
+	return err;
+}
+
+static const struct switch_attr *
+swconfig_lookup_attr(struct switch_dev *dev, struct genl_info *info,
+		struct switch_val *val)
+{
+	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
+	const struct switch_attrlist *alist;
+	const struct switch_attr *attr = NULL;
+	int attr_id;
+
+	/* defaults */
+	struct switch_attr *def_list;
+	unsigned long *def_active;
+	int n_def;
+
+	if (!info->attrs[SWITCH_ATTR_OP_ID])
+		goto done;
+
+	switch (hdr->cmd) {
+	case SWITCH_CMD_SET_GLOBAL:
+	case SWITCH_CMD_GET_GLOBAL:
+		alist = &dev->ops->attr_global;
+		def_list = default_global;
+		def_active = &dev->def_global;
+		n_def = ARRAY_SIZE(default_global);
+		break;
+	case SWITCH_CMD_SET_VLAN:
+	case SWITCH_CMD_GET_VLAN:
+		alist = &dev->ops->attr_vlan;
+		def_list = default_vlan;
+		def_active = &dev->def_vlan;
+		n_def = ARRAY_SIZE(default_vlan);
+		if (!info->attrs[SWITCH_ATTR_OP_VLAN])
+			goto done;
+		val->port_vlan = nla_get_u32(info->attrs[SWITCH_ATTR_OP_VLAN]);
+		if (val->port_vlan >= dev->vlans)
+			goto done;
+		break;
+	case SWITCH_CMD_SET_PORT:
+	case SWITCH_CMD_GET_PORT:
+		alist = &dev->ops->attr_port;
+		def_list = default_port;
+		def_active = &dev->def_port;
+		n_def = ARRAY_SIZE(default_port);
+		if (!info->attrs[SWITCH_ATTR_OP_PORT])
+			goto done;
+		val->port_vlan = nla_get_u32(info->attrs[SWITCH_ATTR_OP_PORT]);
+		if (val->port_vlan >= dev->ports)
+			goto done;
+		break;
+	default:
+		WARN_ON(1);
+		goto done;
+	}
+
+	if (!alist)
+		goto done;
+
+	attr_id = nla_get_u32(info->attrs[SWITCH_ATTR_OP_ID]);
+	if (attr_id >= SWITCH_ATTR_DEFAULTS_OFFSET) {
+		attr_id -= SWITCH_ATTR_DEFAULTS_OFFSET;
+		if (attr_id >= n_def)
+			goto done;
+		if (!test_bit(attr_id, def_active))
+			goto done;
+		attr = &def_list[attr_id];
+	} else {
+		if (attr_id >= alist->n_attr)
+			goto done;
+		attr = &alist->attr[attr_id];
+	}
+
+	if (attr->disabled)
+		attr = NULL;
+
+done:
+	if (!attr)
+		pr_debug("attribute lookup failed\n");
+	val->attr = attr;
+	return attr;
+}
+
+static int
+swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
+		struct switch_val *val, int max)
+{
+	struct nlattr *nla;
+	int rem;
+
+	val->len = 0;
+	nla_for_each_nested(nla, head, rem) {
+		struct nlattr *tb[SWITCH_PORT_ATTR_MAX+1];
+		struct switch_port *port = &val->value.ports[val->len];
+
+		if (val->len >= max)
+			return -EINVAL;
+
+		if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
+				port_policy))
+			return -EINVAL;
+
+		if (!tb[SWITCH_PORT_ID])
+			return -EINVAL;
+
+		port->id = nla_get_u32(tb[SWITCH_PORT_ID]);
+		if (tb[SWITCH_PORT_FLAG_TAGGED])
+			port->flags |= (1 << SWITCH_PORT_FLAG_TAGGED);
+		val->len++;
+	}
+
+	return 0;
+}
+
+static int
+swconfig_set_attr(struct sk_buff *skb, struct genl_info *info)
+{
+	const struct switch_attr *attr;
+	struct switch_dev *dev;
+	struct switch_val val;
+	int err = -EINVAL;
+
+	dev = swconfig_get_dev(info);
+	if (!dev)
+		return -EINVAL;
+
+	memset(&val, 0, sizeof(val));
+	attr = swconfig_lookup_attr(dev, info, &val);
+	if (!attr || !attr->set)
+		goto error;
+
+	val.attr = attr;
+	switch (attr->type) {
+	case SWITCH_TYPE_NOVAL:
+		break;
+	case SWITCH_TYPE_INT:
+		if (!info->attrs[SWITCH_ATTR_OP_VALUE_INT])
+			goto error;
+		val.value.i =
+			nla_get_u32(info->attrs[SWITCH_ATTR_OP_VALUE_INT]);
+		break;
+	case SWITCH_TYPE_STRING:
+		if (!info->attrs[SWITCH_ATTR_OP_VALUE_STR])
+			goto error;
+		val.value.s =
+			nla_data(info->attrs[SWITCH_ATTR_OP_VALUE_STR]);
+		break;
+	case SWITCH_TYPE_PORTS:
+		val.value.ports = dev->portbuf;
+		memset(dev->portbuf, 0,
+			sizeof(struct switch_port) * dev->ports);
+
+		/* TODO: implement multipart? */
+		if (info->attrs[SWITCH_ATTR_OP_VALUE_PORTS]) {
+			err = swconfig_parse_ports(skb,
+				info->attrs[SWITCH_ATTR_OP_VALUE_PORTS],
+				&val, dev->ports);
+			if (err < 0)
+				goto error;
+		} else {
+			val.len = 0;
+			err = 0;
+		}
+		break;
+	default:
+		goto error;
+	}
+
+	err = attr->set(dev, attr, &val);
+error:
+	swconfig_put_dev(dev);
+	return err;
+}
+
+static int
+swconfig_close_portlist(struct swconfig_callback *cb, void *arg)
+{
+	if (cb->nest[0])
+		nla_nest_end(cb->msg, cb->nest[0]);
+	return 0;
+}
+
+static int
+swconfig_send_port(struct swconfig_callback *cb, void *arg)
+{
+	const struct switch_port *port = arg;
+	struct nlattr *p = NULL;
+
+	if (!cb->nest[0]) {
+		cb->nest[0] = nla_nest_start(cb->msg, cb->cmd);
+		if (!cb->nest[0])
+			return -1;
+	}
+
+	p = nla_nest_start(cb->msg, SWITCH_ATTR_PORT);
+	if (!p)
+		goto error;
+
+	if (nla_put_u32(cb->msg, SWITCH_PORT_ID, port->id))
+		goto nla_put_failure;
+	if (port->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
+		if (nla_put_flag(cb->msg, SWITCH_PORT_FLAG_TAGGED))
+			goto nla_put_failure;
+	}
+
+	nla_nest_end(cb->msg, p);
+	return 0;
+
+nla_put_failure:
+		nla_nest_cancel(cb->msg, p);
+error:
+	nla_nest_cancel(cb->msg, cb->nest[0]);
+	return -1;
+}
+
+static int
+swconfig_send_ports(struct sk_buff **msg, struct genl_info *info, int attr,
+		const struct switch_val *val)
+{
+	struct swconfig_callback cb;
+	int err = 0;
+	int i;
+
+	if (!val->value.ports)
+		return -EINVAL;
+
+	memset(&cb, 0, sizeof(cb));
+	cb.cmd = attr;
+	cb.msg = *msg;
+	cb.info = info;
+	cb.fill = swconfig_send_port;
+	cb.close = swconfig_close_portlist;
+
+	cb.nest[0] = nla_nest_start(cb.msg, cb.cmd);
+	for (i = 0; i < val->len; i++) {
+		err = swconfig_send_multipart(&cb, &val->value.ports[i]);
+		if (err)
+			goto done;
+	}
+	err = val->len;
+	swconfig_close_portlist(&cb, NULL);
+	*msg = cb.msg;
+
+done:
+	return err;
+}
+
+static int
+swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
+{
+	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
+	const struct switch_attr *attr;
+	struct switch_dev *dev;
+	struct sk_buff *msg = NULL;
+	struct switch_val val;
+	int err = -EINVAL;
+	int cmd = hdr->cmd;
+
+	dev = swconfig_get_dev(info);
+	if (!dev)
+		return -EINVAL;
+
+	memset(&val, 0, sizeof(val));
+	attr = swconfig_lookup_attr(dev, info, &val);
+	if (!attr || !attr->get)
+		goto error;
+
+	if (attr->type == SWITCH_TYPE_PORTS) {
+		val.value.ports = dev->portbuf;
+		memset(dev->portbuf, 0,
+			sizeof(struct switch_port) * dev->ports);
+	}
+
+	err = attr->get(dev, attr, &val);
+	if (err)
+		goto error;
+
+	msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+	if (!msg)
+		goto error;
+
+	hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
+			0, cmd);
+	if (IS_ERR(hdr))
+		goto nla_put_failure;
+
+	switch (attr->type) {
+	case SWITCH_TYPE_INT:
+		if (nla_put_u32(msg, SWITCH_ATTR_OP_VALUE_INT, val.value.i))
+			goto nla_put_failure;
+		break;
+	case SWITCH_TYPE_STRING:
+		if (nla_put_string(msg, SWITCH_ATTR_OP_VALUE_STR, val.value.s))
+			goto nla_put_failure;
+		break;
+	case SWITCH_TYPE_PORTS:
+		err = swconfig_send_ports(&msg, info,
+				SWITCH_ATTR_OP_VALUE_PORTS, &val);
+		if (err < 0)
+			goto nla_put_failure;
+		break;
+	default:
+		pr_debug("invalid type in attribute\n");
+		err = -EINVAL;
+		goto error;
+	}
+	err = genlmsg_end(msg, hdr);
+	if (err < 0)
+		goto nla_put_failure;
+
+	swconfig_put_dev(dev);
+	return genlmsg_reply(msg, info);
+
+nla_put_failure:
+	if (msg)
+		nlmsg_free(msg);
+error:
+	swconfig_put_dev(dev);
+	if (!err)
+		err = -ENOMEM;
+	return err;
+}
+
+static int
+swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
+		const struct switch_dev *dev)
+{
+	struct nlattr *p = NULL, *m = NULL;
+	void *hdr;
+	int i;
+
+	hdr = genlmsg_put(msg, pid, seq, &switch_fam, flags,
+			SWITCH_CMD_NEW_ATTR);
+	if (IS_ERR(hdr))
+		return -1;
+
+	if (nla_put_u32(msg, SWITCH_ATTR_ID, dev->id))
+		goto nla_put_failure;
+	if (nla_put_string(msg, SWITCH_ATTR_DEV_NAME, dev->devname))
+		goto nla_put_failure;
+	if (nla_put_string(msg, SWITCH_ATTR_ALIAS, dev->alias))
+		goto nla_put_failure;
+	if (nla_put_string(msg, SWITCH_ATTR_NAME, dev->name))
+		goto nla_put_failure;
+	if (nla_put_u32(msg, SWITCH_ATTR_VLANS, dev->vlans))
+		goto nla_put_failure;
+	if (nla_put_u32(msg, SWITCH_ATTR_PORTS, dev->ports))
+		goto nla_put_failure;
+	if (nla_put_u32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port))
+		goto nla_put_failure;
+
+	m = nla_nest_start(msg, SWITCH_ATTR_PORTMAP);
+	if (!m)
+		goto nla_put_failure;
+	for (i = 0; i < dev->ports; i++) {
+		p = nla_nest_start(msg, SWITCH_ATTR_PORTS);
+		if (!p)
+			continue;
+		if (dev->portmap[i].s) {
+			if (nla_put_string(msg, SWITCH_PORTMAP_SEGMENT,
+						dev->portmap[i].s))
+				goto nla_put_failure;
+			if (nla_put_u32(msg, SWITCH_PORTMAP_VIRT,
+						dev->portmap[i].virt))
+				goto nla_put_failure;
+		}
+		nla_nest_end(msg, p);
+	}
+	nla_nest_end(msg, m);
+	return genlmsg_end(msg, hdr);
+nla_put_failure:
+	genlmsg_cancel(msg, hdr);
+	return -EMSGSIZE;
+}
+
+static int swconfig_dump_switches(struct sk_buff *skb,
+		struct netlink_callback *cb)
+{
+	struct switch_dev *dev;
+	int start = cb->args[0];
+	int idx = 0;
+
+	swconfig_lock();
+	list_for_each_entry(dev, &swdevs, dev_list) {
+		if (++idx <= start)
+			continue;
+		if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).portid,
+				cb->nlh->nlmsg_seq, NLM_F_MULTI,
+				dev) < 0)
+			break;
+	}
+	swconfig_unlock();
+	cb->args[0] = idx;
+
+	return skb->len;
+}
+
+static int
+swconfig_done(struct netlink_callback *cb)
+{
+	return 0;
+}
+
+static struct genl_ops swconfig_ops[] = {
+	{
+		.cmd = SWITCH_CMD_LIST_GLOBAL,
+		.doit = swconfig_list_attrs,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_LIST_VLAN,
+		.doit = swconfig_list_attrs,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_LIST_PORT,
+		.doit = swconfig_list_attrs,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_GET_GLOBAL,
+		.doit = swconfig_get_attr,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_GET_VLAN,
+		.doit = swconfig_get_attr,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_GET_PORT,
+		.doit = swconfig_get_attr,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_SET_GLOBAL,
+		.doit = swconfig_set_attr,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_SET_VLAN,
+		.doit = swconfig_set_attr,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_SET_PORT,
+		.doit = swconfig_set_attr,
+		.policy = switch_policy,
+	},
+	{
+		.cmd = SWITCH_CMD_GET_SWITCH,
+		.dumpit = swconfig_dump_switches,
+		.policy = switch_policy,
+		.done = swconfig_done,
+	}
+};
+
+#ifdef CONFIG_OF
+void
+of_switch_load_portmap(struct switch_dev *dev)
+{
+	struct device_node *port;
+
+	if (!dev->of_node)
+		return;
+
+	for_each_child_of_node(dev->of_node, port) {
+		const __be32 *prop;
+		const char *segment;
+		int size, phys;
+
+		if (!of_device_is_compatible(port, "swconfig,port"))
+			continue;
+
+		if (of_property_read_string(port, "swconfig,segment", &segment))
+			continue;
+
+		prop = of_get_property(port, "swconfig,portmap", &size);
+		if (!prop)
+			continue;
+
+		if (size != (2 * sizeof(*prop))) {
+			pr_err("%s: failed to parse port mapping\n",
+					port->name);
+			continue;
+		}
+
+		phys = be32_to_cpup(prop++);
+		if ((phys < 0) | (phys >= dev->ports)) {
+			pr_err("%s: physical port index out of range\n",
+					port->name);
+			continue;
+		}
+
+		dev->portmap[phys].s = kstrdup(segment, GFP_KERNEL);
+		dev->portmap[phys].virt = be32_to_cpup(prop);
+		pr_debug("Found port: %s, physical: %d, virtual: %d\n",
+			segment, phys, dev->portmap[phys].virt);
+	}
+}
+#endif
+
+int
+register_switch(struct switch_dev *dev, struct net_device *netdev)
+{
+	struct switch_dev *sdev;
+	const int max_switches = 8 * sizeof(unsigned long);
+	unsigned long in_use = 0;
+	int err;
+	int i;
+
+	INIT_LIST_HEAD(&dev->dev_list);
+	if (netdev) {
+		dev->netdev = netdev;
+		if (!dev->alias)
+			dev->alias = netdev->name;
+	}
+	BUG_ON(!dev->alias);
+
+	if (dev->ports > 0) {
+		dev->portbuf = kzalloc(sizeof(struct switch_port) *
+				dev->ports, GFP_KERNEL);
+		if (!dev->portbuf)
+			return -ENOMEM;
+		dev->portmap = kzalloc(sizeof(struct switch_portmap) *
+				dev->ports, GFP_KERNEL);
+		if (!dev->portmap) {
+			kfree(dev->portbuf);
+			return -ENOMEM;
+		}
+	}
+	swconfig_defaults_init(dev);
+	mutex_init(&dev->sw_mutex);
+	swconfig_lock();
+	dev->id = ++swdev_id;
+
+	list_for_each_entry(sdev, &swdevs, dev_list) {
+		if (!sscanf(sdev->devname, SWCONFIG_DEVNAME, &i))
+			continue;
+		if (i < 0 || i > max_switches)
+			continue;
+
+		set_bit(i, &in_use);
+	}
+	i = find_first_zero_bit(&in_use, max_switches);
+
+	if (i == max_switches) {
+		swconfig_unlock();
+		return -ENFILE;
+	}
+
+#ifdef CONFIG_OF
+	if (dev->ports)
+		of_switch_load_portmap(dev);
+#endif
+
+	/* fill device name */
+	snprintf(dev->devname, IFNAMSIZ, SWCONFIG_DEVNAME, i);
+
+	list_add_tail(&dev->dev_list, &swdevs);
+	swconfig_unlock();
+
+	err = swconfig_create_led_trigger(dev);
+	if (err)
+		return err;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(register_switch);
+
+void
+unregister_switch(struct switch_dev *dev)
+{
+	swconfig_destroy_led_trigger(dev);
+	kfree(dev->portbuf);
+	mutex_lock(&dev->sw_mutex);
+	swconfig_lock();
+	list_del(&dev->dev_list);
+	swconfig_unlock();
+	mutex_unlock(&dev->sw_mutex);
+}
+EXPORT_SYMBOL_GPL(unregister_switch);
+
+
+static int __init
+swconfig_init(void)
+{
+	int err;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0))
+	int i;
+#endif
+
+	INIT_LIST_HEAD(&swdevs);
+	
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0))
+	err = genl_register_family(&switch_fam);
+	if (err)
+		return err;
+
+	for (i = 0; i < ARRAY_SIZE(swconfig_ops); i++) {
+		err = genl_register_ops(&switch_fam, &swconfig_ops[i]);
+		if (err)
+			goto unregister;
+	}
+	return 0;
+
+unregister:
+	genl_unregister_family(&switch_fam);
+	return err;
+#else
+	err = genl_register_family_with_ops(&switch_fam, swconfig_ops);
+	if (err)
+		return err;
+	return 0;
+#endif
+}
+
+static void __exit
+swconfig_exit(void)
+{
+	genl_unregister_family(&switch_fam);
+}
+
+module_init(swconfig_init);
+module_exit(swconfig_exit);
+
diff --git a/trunk/target/linux/generic/files/drivers/net/phy/swconfig_leds.c b/trunk/target/linux/generic/files/drivers/net/phy/swconfig_leds.c
new file mode 100644
index 00000000..abd7bed4
--- /dev/null
+++ b/trunk/target/linux/generic/files/drivers/net/phy/swconfig_leds.c
@@ -0,0 +1,354 @@
+/*
+ * swconfig_led.c: LED trigger support for the switch configuration API
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ */
+
+#ifdef CONFIG_SWCONFIG_LEDS
+
+#include <linux/leds.h>
+#include <linux/ctype.h>
+#include <linux/device.h>
+#include <linux/workqueue.h>
+
+#define SWCONFIG_LED_TIMER_INTERVAL	(HZ / 10)
+#define SWCONFIG_LED_NUM_PORTS		32
+
+struct switch_led_trigger {
+	struct led_trigger trig;
+	struct switch_dev *swdev;
+
+	struct delayed_work sw_led_work;
+	u32 port_mask;
+	u32 port_link;
+	unsigned long port_traffic[SWCONFIG_LED_NUM_PORTS];
+};
+
+struct swconfig_trig_data {
+	struct led_classdev *led_cdev;
+	struct switch_dev *swdev;
+
+	rwlock_t lock;
+	u32 port_mask;
+
+	bool prev_link;
+	unsigned long prev_traffic;
+	enum led_brightness prev_brightness;
+};
+
+static void
+swconfig_trig_set_brightness(struct swconfig_trig_data *trig_data,
+			     enum led_brightness brightness)
+{
+	led_set_brightness(trig_data->led_cdev, brightness);
+	trig_data->prev_brightness = brightness;
+}
+
+static void
+swconfig_trig_update_port_mask(struct led_trigger *trigger)
+{
+	struct list_head *entry;
+	struct switch_led_trigger *sw_trig;
+	u32 port_mask;
+
+	if (!trigger)
+		return;
+
+	sw_trig = (void *) trigger;
+
+	port_mask = 0;
+	read_lock(&trigger->leddev_list_lock);
+	list_for_each(entry, &trigger->led_cdevs) {
+		struct led_classdev *led_cdev;
+		struct swconfig_trig_data *trig_data;
+
+		led_cdev = list_entry(entry, struct led_classdev, trig_list);
+		trig_data = led_cdev->trigger_data;
+		if (trig_data) {
+			read_lock(&trig_data->lock);
+			port_mask |= trig_data->port_mask;
+			read_unlock(&trig_data->lock);
+		}
+	}
+	read_unlock(&trigger->leddev_list_lock);
+
+	sw_trig->port_mask = port_mask;
+
+	if (port_mask)
+		schedule_delayed_work(&sw_trig->sw_led_work,
+				      SWCONFIG_LED_TIMER_INTERVAL);
+	else
+		cancel_delayed_work_sync(&sw_trig->sw_led_work);
+}
+
+static ssize_t
+swconfig_trig_port_mask_store(struct device *dev, struct device_attribute *attr,
+			      const char *buf, size_t size)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
+	unsigned long port_mask;
+	ssize_t ret = -EINVAL;
+	char *after;
+	size_t count;
+
+	port_mask = simple_strtoul(buf, &after, 16);
+	count =	after - buf;
+
+	if (*after && isspace(*after))
+		count++;
+
+	if (count == size) {
+		bool changed;
+
+		write_lock(&trig_data->lock);
+
+		changed = (trig_data->port_mask != port_mask);
+		if (changed) {
+			trig_data->port_mask = port_mask;
+			if (port_mask == 0)
+				swconfig_trig_set_brightness(trig_data, LED_OFF);
+		}
+
+		write_unlock(&trig_data->lock);
+
+		if (changed)
+			swconfig_trig_update_port_mask(led_cdev->trigger);
+
+		ret = count;
+	}
+
+	return ret;
+}
+
+static ssize_t
+swconfig_trig_port_mask_show(struct device *dev, struct device_attribute *attr,
+			     char *buf)
+{
+	struct led_classdev *led_cdev = dev_get_drvdata(dev);
+	struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
+
+	read_lock(&trig_data->lock);
+	sprintf(buf, "%#x\n", trig_data->port_mask);
+	read_unlock(&trig_data->lock);
+
+	return strlen(buf) + 1;
+}
+
+static DEVICE_ATTR(port_mask, 0644, swconfig_trig_port_mask_show,
+		   swconfig_trig_port_mask_store);
+
+static void
+swconfig_trig_activate(struct led_classdev *led_cdev)
+{
+	struct switch_led_trigger *sw_trig;
+	struct swconfig_trig_data *trig_data;
+	int err;
+
+	if (led_cdev->trigger->activate != swconfig_trig_activate)
+		return;
+
+	trig_data = kzalloc(sizeof(struct swconfig_trig_data), GFP_KERNEL);
+	if (!trig_data)
+		return;
+
+	sw_trig = (void *) led_cdev->trigger;
+
+	rwlock_init(&trig_data->lock);
+	trig_data->led_cdev = led_cdev;
+	trig_data->swdev = sw_trig->swdev;
+	led_cdev->trigger_data = trig_data;
+
+	err = device_create_file(led_cdev->dev, &dev_attr_port_mask);
+	if (err)
+		goto err_free;
+
+	return;
+
+err_free:
+	led_cdev->trigger_data = NULL;
+	kfree(trig_data);
+}
+
+static void
+swconfig_trig_deactivate(struct led_classdev *led_cdev)
+{
+	struct swconfig_trig_data *trig_data;
+
+	swconfig_trig_update_port_mask(led_cdev->trigger);
+
+	trig_data = (void *) led_cdev->trigger_data;
+	if (trig_data) {
+		device_remove_file(led_cdev->dev, &dev_attr_port_mask);
+		kfree(trig_data);
+	}
+}
+
+static void
+swconfig_trig_led_event(struct switch_led_trigger *sw_trig,
+			struct led_classdev *led_cdev)
+{
+	struct swconfig_trig_data *trig_data;
+	u32 port_mask;
+	bool link;
+
+	trig_data = led_cdev->trigger_data;
+	if (!trig_data)
+		return;
+
+	read_lock(&trig_data->lock);
+	port_mask = trig_data->port_mask;
+	read_unlock(&trig_data->lock);
+
+	link = !!(sw_trig->port_link & port_mask);
+	if (!link) {
+		if (link != trig_data->prev_link)
+			swconfig_trig_set_brightness(trig_data, LED_OFF);
+	} else {
+		unsigned long traffic;
+		int i;
+
+		traffic = 0;
+		for (i = 0; i < SWCONFIG_LED_NUM_PORTS; i++) {
+			if (port_mask & (1 << i))
+				traffic += sw_trig->port_traffic[i];
+		}
+
+		if (trig_data->prev_brightness != LED_FULL)
+			swconfig_trig_set_brightness(trig_data, LED_FULL);
+		else if (traffic != trig_data->prev_traffic)
+			swconfig_trig_set_brightness(trig_data, LED_OFF);
+
+		trig_data->prev_traffic = traffic;
+	}
+
+	trig_data->prev_link = link;
+}
+
+static void
+swconfig_trig_update_leds(struct switch_led_trigger *sw_trig)
+{
+	struct list_head *entry;
+	struct led_trigger *trigger;
+
+	trigger = &sw_trig->trig;
+	read_lock(&trigger->leddev_list_lock);
+	list_for_each(entry, &trigger->led_cdevs) {
+		struct led_classdev *led_cdev;
+
+		led_cdev = list_entry(entry, struct led_classdev, trig_list);
+		swconfig_trig_led_event(sw_trig, led_cdev);
+	}
+	read_unlock(&trigger->leddev_list_lock);
+}
+
+static void
+swconfig_led_work_func(struct work_struct *work)
+{
+	struct switch_led_trigger *sw_trig;
+	struct switch_dev *swdev;
+	u32 port_mask;
+	u32 link;
+	int i;
+
+	sw_trig = container_of(work, struct switch_led_trigger,
+			       sw_led_work.work);
+
+	port_mask = sw_trig->port_mask;
+	swdev = sw_trig->swdev;
+
+	link = 0;
+	for (i = 0; i < SWCONFIG_LED_NUM_PORTS; i++) {
+		u32 port_bit;
+
+		port_bit = BIT(i);
+		if ((port_mask & port_bit) == 0)
+			continue;
+
+		if (swdev->ops->get_port_link) {
+			struct switch_port_link port_link;
+
+			memset(&port_link, '\0', sizeof(port_link));
+			swdev->ops->get_port_link(swdev, i, &port_link);
+
+			if (port_link.link)
+				link |= port_bit;
+		}
+
+		if (swdev->ops->get_port_stats) {
+			struct switch_port_stats port_stats;
+
+			memset(&port_stats, '\0', sizeof(port_stats));
+			swdev->ops->get_port_stats(swdev, i, &port_stats);
+			sw_trig->port_traffic[i] = port_stats.tx_bytes +
+						   port_stats.rx_bytes;
+		}
+	}
+
+	sw_trig->port_link = link;
+
+	swconfig_trig_update_leds(sw_trig);
+
+	schedule_delayed_work(&sw_trig->sw_led_work,
+			      SWCONFIG_LED_TIMER_INTERVAL);
+}
+
+static int
+swconfig_create_led_trigger(struct switch_dev *swdev)
+{
+	struct switch_led_trigger *sw_trig;
+	int err;
+
+	if (!swdev->ops->get_port_link)
+		return 0;
+
+	sw_trig = kzalloc(sizeof(struct switch_led_trigger), GFP_KERNEL);
+	if (!sw_trig)
+		return -ENOMEM;
+
+	sw_trig->swdev = swdev;
+	sw_trig->trig.name = swdev->devname;
+	sw_trig->trig.activate = swconfig_trig_activate;
+	sw_trig->trig.deactivate = swconfig_trig_deactivate;
+
+	INIT_DELAYED_WORK(&sw_trig->sw_led_work, swconfig_led_work_func);
+
+	err = led_trigger_register(&sw_trig->trig);
+	if (err)
+		goto err_free;
+
+	swdev->led_trigger = sw_trig;
+
+	return 0;
+
+err_free:
+	kfree(sw_trig);
+	return err;
+}
+
+static void
+swconfig_destroy_led_trigger(struct switch_dev *swdev)
+{
+	struct switch_led_trigger *sw_trig;
+
+	sw_trig = swdev->led_trigger;
+	if (sw_trig) {
+		cancel_delayed_work_sync(&sw_trig->sw_led_work);
+		led_trigger_unregister(&sw_trig->trig);
+		kfree(sw_trig);
+	}
+}
+
+#else /* SWCONFIG_LEDS */
+static inline int
+swconfig_create_led_trigger(struct switch_dev *swdev) { return 0; }
+
+static inline void
+swconfig_destroy_led_trigger(struct switch_dev *swdev) { }
+#endif /* CONFIG_SWCONFIG_LEDS */
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/Kconfig b/trunk/target/linux/generic/files/fs/yaffs2/Kconfig
new file mode 100644
index 00000000..408570fc
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/Kconfig
@@ -0,0 +1,171 @@
+#
+# yaffs file system configurations
+#
+
+config YAFFS_FS
+	tristate "yaffs2 file system support"
+	default n
+	depends on MTD_BLOCK
+	select YAFFS_YAFFS1
+	select YAFFS_YAFFS2
+	help
+	  yaffs2, or Yet Another Flash File System, is a file system
+	  optimised for NAND Flash chips.
+
+	  To compile the yaffs2 file system support as a module, choose M
+	  here: the module will be called yaffs2.
+
+	  If unsure, say N.
+
+	  Further information on yaffs2 is available at
+	  <http://www.aleph1.co.uk/yaffs/>.
+
+config YAFFS_YAFFS1
+	bool "512 byte / page devices"
+	depends on YAFFS_FS
+	default y
+	help
+	  Enable yaffs1 support -- yaffs for 512 byte / page devices
+
+	  Not needed for 2K-page devices.
+
+	  If unsure, say Y.
+
+config YAFFS_9BYTE_TAGS
+	bool "Use older-style on-NAND data format with pageStatus byte"
+	depends on YAFFS_YAFFS1
+	default n
+	help
+
+	  Older-style on-NAND data format has a "pageStatus" byte to record
+	  chunk/page state.  This byte is zero when the page is discarded.
+	  Choose this option if you have existing on-NAND data using this
+	  format that you need to continue to support.  New data written
+	  also uses the older-style format.  Note: Use of this option
+	  generally requires that MTD's oob layout be adjusted to use the
+	  older-style format.  See notes on tags formats and MTD versions
+	  in yaffs_mtdif1.c.
+
+	  If unsure, say N.
+
+config YAFFS_DOES_ECC
+	bool "Lets yaffs do its own ECC"
+	depends on YAFFS_FS && YAFFS_YAFFS1 && !YAFFS_9BYTE_TAGS
+	default n
+	help
+	  This enables yaffs to use its own ECC functions instead of using
+	  the ones from the generic MTD-NAND driver.
+
+	  If unsure, say N.
+
+config YAFFS_ECC_WRONG_ORDER
+	bool "Use the same ecc byte order as Steven Hill's nand_ecc.c"
+	depends on YAFFS_FS && YAFFS_DOES_ECC && !YAFFS_9BYTE_TAGS
+	default n
+	help
+	  This makes yaffs_ecc.c use the same ecc byte order as Steven
+	  Hill's nand_ecc.c. If not set, then you get the same ecc byte
+	  order as SmartMedia.
+
+	  If unsure, say N.
+
+config YAFFS_YAFFS2
+	bool "2048 byte (or larger) / page devices"
+	depends on YAFFS_FS
+	default y
+	help
+	  Enable yaffs2 support -- yaffs for >= 2K bytes per page devices
+
+	  If unsure, say Y.
+
+config YAFFS_AUTO_YAFFS2
+	bool "Autoselect yaffs2 format"
+	depends on YAFFS_YAFFS2
+	default y
+	help
+	  Without this, you need to explicitely use yaffs2 as the file
+	  system type. With this, you can say "yaffs" and yaffs or yaffs2
+	  will be used depending on the device page size (yaffs on
+	  512-byte page devices, yaffs2 on 2K page devices).
+
+	  If unsure, say Y.
+
+config YAFFS_DISABLE_TAGS_ECC
+	bool "Disable yaffs from doing ECC on tags by default"
+	depends on YAFFS_FS && YAFFS_YAFFS2
+	default n
+	help
+	  This defaults yaffs to using its own ECC calculations on tags instead of
+	  just relying on the MTD.
+	  This behavior can also be overridden with tags_ecc_on and
+	  tags_ecc_off mount options.
+
+	  If unsure, say N.
+
+config YAFFS_ALWAYS_CHECK_CHUNK_ERASED
+	bool "Force chunk erase check"
+	depends on YAFFS_FS
+	default n
+	help
+          Normally yaffs only checks chunks before writing until an erased
+	  chunk is found. This helps to detect any partially written
+	  chunks that might have happened due to power loss.
+
+	  Enabling this forces on the test that chunks are erased in flash
+	  before writing to them. This takes more time but is potentially
+	  a bit more secure.
+
+	  Suggest setting Y during development and ironing out driver
+	  issues etc. Suggest setting to N if you want faster writing.
+
+	  If unsure, say Y.
+
+config YAFFS_EMPTY_LOST_AND_FOUND
+	bool "Empty lost and found on boot"
+	depends on YAFFS_FS
+	default n
+	help
+	  If this is enabled then the contents of lost and found is
+	  automatically dumped at mount.
+
+	  If unsure, say N.
+
+config YAFFS_DISABLE_BLOCK_REFRESHING
+	bool "Disable yaffs2 block refreshing"
+	depends on YAFFS_FS
+	default n
+	help
+	 If this is set, then block refreshing is disabled.
+	 Block refreshing infrequently refreshes the oldest block in
+	 a yaffs2 file system. This mechanism helps to refresh flash to
+	 mitigate against data loss. This is particularly useful for MLC.
+
+	  If unsure, say N.
+
+config YAFFS_DISABLE_BACKGROUND
+	bool "Disable yaffs2 background processing"
+	depends on YAFFS_FS
+	default n
+	help
+	 If this is set, then background processing is disabled.
+	 Background processing makes many foreground activities faster.
+
+	 If unsure, say N.
+
+config YAFFS_DISABLE_BAD_BLOCK_MARKING
+	bool "Disable yaffs2 bad block marking"
+	depends on YAFFS_FS
+	default n
+	help
+	 Useful during early flash bring up to prevent problems causing
+	 lots of bad block marking.
+
+	 If unsure, say N.
+
+config YAFFS_XATTR
+	bool "Enable yaffs2 xattr support"
+	depends on YAFFS_FS
+	default y
+	help
+	 If this is set then yaffs2 will provide xattr support.
+	 If unsure, say Y.
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/Makefile b/trunk/target/linux/generic/files/fs/yaffs2/Makefile
new file mode 100644
index 00000000..f9a9fb1b
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/Makefile
@@ -0,0 +1,18 @@
+#
+# Makefile for the linux YAFFS filesystem routines.
+#
+
+obj-$(CONFIG_YAFFS_FS) += yaffs.o
+
+yaffs-y := yaffs_ecc.o yaffs_vfs.o yaffs_guts.o yaffs_checkptrw.o
+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o
+yaffs-y += yaffs_tagscompat.o yaffs_tagsmarshall.o
+yaffs-y += yaffs_mtdif.o
+yaffs-y += yaffs_nameval.o yaffs_attribs.o
+yaffs-y += yaffs_allocator.o
+yaffs-y += yaffs_yaffs1.o
+yaffs-y += yaffs_yaffs2.o
+yaffs-y += yaffs_bitmap.o
+yaffs-y += yaffs_summary.o
+yaffs-y += yaffs_verify.o
+
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/NOTE.openwrt b/trunk/target/linux/generic/files/fs/yaffs2/NOTE.openwrt
new file mode 100644
index 00000000..0be479d6
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/NOTE.openwrt
@@ -0,0 +1,4 @@
+The yaffs2 source has been fetched from the yaffs2 GIT tree.
+
+URL: git://www.aleph1.co.uk/yaffs2
+Version: bc76682d93955cfb33051beb503ad9f8a5450578 (2013-12-03)
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.c
new file mode 100644
index 00000000..c8f2861c
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.c
@@ -0,0 +1,357 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_allocator.h"
+#include "yaffs_guts.h"
+#include "yaffs_trace.h"
+#include "yportenv.h"
+
+/*
+ * Each entry in yaffs_tnode_list and yaffs_obj_list hold blocks
+ * of approx 100 objects that are themn allocated singly.
+ * This is basically a simplified slab allocator.
+ *
+ * We don't use the Linux slab allocator because slab does not allow
+ * us to dump all the objects in one hit when we do a umount and tear
+ * down  all the tnodes and objects. slab requires that we first free
+ * the individual objects.
+ *
+ * Once yaffs has been mainlined I shall try to motivate for a change
+ * to slab to provide the extra features we need here.
+ */
+
+struct yaffs_tnode_list {
+	struct yaffs_tnode_list *next;
+	struct yaffs_tnode *tnodes;
+};
+
+struct yaffs_obj_list {
+	struct yaffs_obj_list *next;
+	struct yaffs_obj *objects;
+};
+
+struct yaffs_allocator {
+	int n_tnodes_created;
+	struct yaffs_tnode *free_tnodes;
+	int n_free_tnodes;
+	struct yaffs_tnode_list *alloc_tnode_list;
+
+	int n_obj_created;
+	struct list_head free_objs;
+	int n_free_objects;
+
+	struct yaffs_obj_list *allocated_obj_list;
+};
+
+static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
+{
+	struct yaffs_allocator *allocator =
+	    (struct yaffs_allocator *)dev->allocator;
+	struct yaffs_tnode_list *tmp;
+
+	if (!allocator) {
+		BUG();
+		return;
+	}
+
+	while (allocator->alloc_tnode_list) {
+		tmp = allocator->alloc_tnode_list->next;
+
+		kfree(allocator->alloc_tnode_list->tnodes);
+		kfree(allocator->alloc_tnode_list);
+		allocator->alloc_tnode_list = tmp;
+	}
+
+	allocator->free_tnodes = NULL;
+	allocator->n_free_tnodes = 0;
+	allocator->n_tnodes_created = 0;
+}
+
+static void yaffs_init_raw_tnodes(struct yaffs_dev *dev)
+{
+	struct yaffs_allocator *allocator = dev->allocator;
+
+	if (!allocator) {
+		BUG();
+		return;
+	}
+
+	allocator->alloc_tnode_list = NULL;
+	allocator->free_tnodes = NULL;
+	allocator->n_free_tnodes = 0;
+	allocator->n_tnodes_created = 0;
+}
+
+static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
+{
+	struct yaffs_allocator *allocator =
+	    (struct yaffs_allocator *)dev->allocator;
+	int i;
+	struct yaffs_tnode *new_tnodes;
+	u8 *mem;
+	struct yaffs_tnode *curr;
+	struct yaffs_tnode *next;
+	struct yaffs_tnode_list *tnl;
+
+	if (!allocator) {
+		BUG();
+		return YAFFS_FAIL;
+	}
+
+	if (n_tnodes < 1)
+		return YAFFS_OK;
+
+	/* make these things */
+	new_tnodes = kmalloc(n_tnodes * dev->tnode_size, GFP_NOFS);
+	mem = (u8 *) new_tnodes;
+
+	if (!new_tnodes) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"yaffs: Could not allocate Tnodes");
+		return YAFFS_FAIL;
+	}
+
+	/* New hookup for wide tnodes */
+	for (i = 0; i < n_tnodes - 1; i++) {
+		curr = (struct yaffs_tnode *)&mem[i * dev->tnode_size];
+		next = (struct yaffs_tnode *)&mem[(i + 1) * dev->tnode_size];
+		curr->internal[0] = next;
+	}
+
+	curr = (struct yaffs_tnode *)&mem[(n_tnodes - 1) * dev->tnode_size];
+	curr->internal[0] = allocator->free_tnodes;
+	allocator->free_tnodes = (struct yaffs_tnode *)mem;
+
+	allocator->n_free_tnodes += n_tnodes;
+	allocator->n_tnodes_created += n_tnodes;
+
+	/* Now add this bunch of tnodes to a list for freeing up.
+	 * NB If we can't add this to the management list it isn't fatal
+	 * but it just means we can't free this bunch of tnodes later.
+	 */
+	tnl = kmalloc(sizeof(struct yaffs_tnode_list), GFP_NOFS);
+	if (!tnl) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"Could not add tnodes to management list");
+		return YAFFS_FAIL;
+	} else {
+		tnl->tnodes = new_tnodes;
+		tnl->next = allocator->alloc_tnode_list;
+		allocator->alloc_tnode_list = tnl;
+	}
+
+	yaffs_trace(YAFFS_TRACE_ALLOCATE, "Tnodes added");
+
+	return YAFFS_OK;
+}
+
+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
+{
+	struct yaffs_allocator *allocator =
+	    (struct yaffs_allocator *)dev->allocator;
+	struct yaffs_tnode *tn = NULL;
+
+	if (!allocator) {
+		BUG();
+		return NULL;
+	}
+
+	/* If there are none left make more */
+	if (!allocator->free_tnodes)
+		yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES);
+
+	if (allocator->free_tnodes) {
+		tn = allocator->free_tnodes;
+		allocator->free_tnodes = allocator->free_tnodes->internal[0];
+		allocator->n_free_tnodes--;
+	}
+
+	return tn;
+}
+
+/* FreeTnode frees up a tnode and puts it back on the free list */
+void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
+{
+	struct yaffs_allocator *allocator = dev->allocator;
+
+	if (!allocator) {
+		BUG();
+		return;
+	}
+
+	if (tn) {
+		tn->internal[0] = allocator->free_tnodes;
+		allocator->free_tnodes = tn;
+		allocator->n_free_tnodes++;
+	}
+	dev->checkpoint_blocks_required = 0;	/* force recalculation */
+}
+
+/*--------------- yaffs_obj alloaction ------------------------
+ *
+ * Free yaffs_objs are stored in a list using obj->siblings.
+ * The blocks of allocated objects are stored in a linked list.
+ */
+
+static void yaffs_init_raw_objs(struct yaffs_dev *dev)
+{
+	struct yaffs_allocator *allocator = dev->allocator;
+
+	if (!allocator) {
+		BUG();
+		return;
+	}
+
+	allocator->allocated_obj_list = NULL;
+	INIT_LIST_HEAD(&allocator->free_objs);
+	allocator->n_free_objects = 0;
+}
+
+static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
+{
+	struct yaffs_allocator *allocator = dev->allocator;
+	struct yaffs_obj_list *tmp;
+
+	if (!allocator) {
+		BUG();
+		return;
+	}
+
+	while (allocator->allocated_obj_list) {
+		tmp = allocator->allocated_obj_list->next;
+		kfree(allocator->allocated_obj_list->objects);
+		kfree(allocator->allocated_obj_list);
+		allocator->allocated_obj_list = tmp;
+	}
+
+	INIT_LIST_HEAD(&allocator->free_objs);
+	allocator->n_free_objects = 0;
+	allocator->n_obj_created = 0;
+}
+
+static int yaffs_create_free_objs(struct yaffs_dev *dev, int n_obj)
+{
+	struct yaffs_allocator *allocator = dev->allocator;
+	int i;
+	struct yaffs_obj *new_objs;
+	struct yaffs_obj_list *list;
+
+	if (!allocator) {
+		BUG();
+		return YAFFS_FAIL;
+	}
+
+	if (n_obj < 1)
+		return YAFFS_OK;
+
+	/* make these things */
+	new_objs = kmalloc(n_obj * sizeof(struct yaffs_obj), GFP_NOFS);
+	list = kmalloc(sizeof(struct yaffs_obj_list), GFP_NOFS);
+
+	if (!new_objs || !list) {
+		kfree(new_objs);
+		new_objs = NULL;
+		kfree(list);
+		list = NULL;
+		yaffs_trace(YAFFS_TRACE_ALLOCATE,
+			"Could not allocate more objects");
+		return YAFFS_FAIL;
+	}
+
+	/* Hook them into the free list */
+	for (i = 0; i < n_obj; i++)
+		list_add(&new_objs[i].siblings, &allocator->free_objs);
+
+	allocator->n_free_objects += n_obj;
+	allocator->n_obj_created += n_obj;
+
+	/* Now add this bunch of Objects to a list for freeing up. */
+
+	list->objects = new_objs;
+	list->next = allocator->allocated_obj_list;
+	allocator->allocated_obj_list = list;
+
+	return YAFFS_OK;
+}
+
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
+{
+	struct yaffs_obj *obj = NULL;
+	struct list_head *lh;
+	struct yaffs_allocator *allocator = dev->allocator;
+
+	if (!allocator) {
+		BUG();
+		return obj;
+	}
+
+	/* If there are none left make more */
+	if (list_empty(&allocator->free_objs))
+		yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS);
+
+	if (!list_empty(&allocator->free_objs)) {
+		lh = allocator->free_objs.next;
+		obj = list_entry(lh, struct yaffs_obj, siblings);
+		list_del_init(lh);
+		allocator->n_free_objects--;
+	}
+
+	return obj;
+}
+
+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
+{
+
+	struct yaffs_allocator *allocator = dev->allocator;
+
+	if (!allocator) {
+		BUG();
+		return;
+	}
+
+	/* Link into the free list. */
+	list_add(&obj->siblings, &allocator->free_objs);
+	allocator->n_free_objects++;
+}
+
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
+{
+
+	if (!dev->allocator) {
+		BUG();
+		return;
+	}
+
+	yaffs_deinit_raw_tnodes(dev);
+	yaffs_deinit_raw_objs(dev);
+	kfree(dev->allocator);
+	dev->allocator = NULL;
+}
+
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
+{
+	struct yaffs_allocator *allocator;
+
+	if (dev->allocator) {
+		BUG();
+		return;
+	}
+
+	allocator = kmalloc(sizeof(struct yaffs_allocator), GFP_NOFS);
+	if (allocator) {
+		dev->allocator = allocator;
+		yaffs_init_raw_tnodes(dev);
+		yaffs_init_raw_objs(dev);
+	}
+}
+
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.h
new file mode 100644
index 00000000..a8cc3226
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_allocator.h
@@ -0,0 +1,30 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_ALLOCATOR_H__
+#define __YAFFS_ALLOCATOR_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev);
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev);
+
+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev);
+void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn);
+
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev);
+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c
new file mode 100644
index 00000000..3d778f22
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c
@@ -0,0 +1,124 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_guts.h"
+#include "yaffs_attribs.h"
+
+void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
+{
+	obj->yst_uid = oh->yst_uid;
+	obj->yst_gid = oh->yst_gid;
+	obj->yst_atime = oh->yst_atime;
+	obj->yst_mtime = oh->yst_mtime;
+	obj->yst_ctime = oh->yst_ctime;
+	obj->yst_rdev = oh->yst_rdev;
+}
+
+void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
+{
+	oh->yst_uid = obj->yst_uid;
+	oh->yst_gid = obj->yst_gid;
+	oh->yst_atime = obj->yst_atime;
+	oh->yst_mtime = obj->yst_mtime;
+	oh->yst_ctime = obj->yst_ctime;
+	oh->yst_rdev = obj->yst_rdev;
+
+}
+
+void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
+{
+	obj->yst_mtime = Y_CURRENT_TIME;
+	if (do_a)
+		obj->yst_atime = obj->yst_mtime;
+	if (do_c)
+		obj->yst_ctime = obj->yst_mtime;
+}
+
+void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
+{
+	yaffs_load_current_time(obj, 1, 1);
+	obj->yst_rdev = rdev;
+	obj->yst_uid = uid;
+	obj->yst_gid = gid;
+}
+
+static loff_t yaffs_get_file_size(struct yaffs_obj *obj)
+{
+	YCHAR *alias = NULL;
+	obj = yaffs_get_equivalent_obj(obj);
+
+	switch (obj->variant_type) {
+	case YAFFS_OBJECT_TYPE_FILE:
+		return obj->variant.file_variant.file_size;
+	case YAFFS_OBJECT_TYPE_SYMLINK:
+		alias = obj->variant.symlink_variant.alias;
+		if (!alias)
+			return 0;
+		return strnlen(alias, YAFFS_MAX_ALIAS_LENGTH);
+	default:
+		return 0;
+	}
+}
+
+int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr)
+{
+	unsigned int valid = attr->ia_valid;
+
+	if (valid & ATTR_MODE)
+		obj->yst_mode = attr->ia_mode;
+	if (valid & ATTR_UID)
+		obj->yst_uid = attr->ia_uid;
+	if (valid & ATTR_GID)
+		obj->yst_gid = attr->ia_gid;
+
+	if (valid & ATTR_ATIME)
+		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
+	if (valid & ATTR_CTIME)
+		obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
+	if (valid & ATTR_MTIME)
+		obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
+
+	if (valid & ATTR_SIZE)
+		yaffs_resize_file(obj, attr->ia_size);
+
+	yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
+
+	return YAFFS_OK;
+
+}
+
+int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr)
+{
+	unsigned int valid = 0;
+
+	attr->ia_mode = obj->yst_mode;
+	valid |= ATTR_MODE;
+	attr->ia_uid = obj->yst_uid;
+	valid |= ATTR_UID;
+	attr->ia_gid = obj->yst_gid;
+	valid |= ATTR_GID;
+
+	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
+	valid |= ATTR_ATIME;
+	Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
+	valid |= ATTR_CTIME;
+	Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
+	valid |= ATTR_MTIME;
+
+	attr->ia_size = yaffs_get_file_size(obj);
+	valid |= ATTR_SIZE;
+
+	attr->ia_valid = valid;
+
+	return YAFFS_OK;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.h
new file mode 100644
index 00000000..5b21b085
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_attribs.h
@@ -0,0 +1,28 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_ATTRIBS_H__
+#define __YAFFS_ATTRIBS_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh);
+void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj);
+void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev);
+void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c);
+int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr);
+int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.c
new file mode 100644
index 00000000..4440e930
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.c
@@ -0,0 +1,97 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_bitmap.h"
+#include "yaffs_trace.h"
+/*
+ * Chunk bitmap manipulations
+ */
+
+static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
+{
+	if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"BlockBits block %d is not valid",
+			blk);
+		BUG();
+	}
+	return dev->chunk_bits +
+	    (dev->chunk_bit_stride * (blk - dev->internal_start_block));
+}
+
+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk)
+{
+	if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
+	    chunk < 0 || chunk >= dev->param.chunks_per_block) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"Chunk Id (%d:%d) invalid",
+			blk, chunk);
+		BUG();
+	}
+}
+
+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk)
+{
+	u8 *blk_bits = yaffs_block_bits(dev, blk);
+
+	memset(blk_bits, 0, dev->chunk_bit_stride);
+}
+
+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
+{
+	u8 *blk_bits = yaffs_block_bits(dev, blk);
+
+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
+	blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
+}
+
+void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
+{
+	u8 *blk_bits = yaffs_block_bits(dev, blk);
+
+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
+	blk_bits[chunk / 8] |= (1 << (chunk & 7));
+}
+
+int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
+{
+	u8 *blk_bits = yaffs_block_bits(dev, blk);
+
+	yaffs_verify_chunk_bit_id(dev, blk, chunk);
+	return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
+}
+
+int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
+{
+	u8 *blk_bits = yaffs_block_bits(dev, blk);
+	int i;
+
+	for (i = 0; i < dev->chunk_bit_stride; i++) {
+		if (*blk_bits)
+			return 1;
+		blk_bits++;
+	}
+	return 0;
+}
+
+int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk)
+{
+	u8 *blk_bits = yaffs_block_bits(dev, blk);
+	int i;
+	int n = 0;
+
+	for (i = 0; i < dev->chunk_bit_stride; i++, blk_bits++)
+		n += hweight8(*blk_bits);
+
+	return n;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.h
new file mode 100644
index 00000000..e26b37d8
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_bitmap.h
@@ -0,0 +1,33 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+/*
+ * Chunk bitmap manipulations
+ */
+
+#ifndef __YAFFS_BITMAP_H__
+#define __YAFFS_BITMAP_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk);
+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk);
+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
+void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
+int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
+int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk);
+int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.c
new file mode 100644
index 00000000..e739fb4a
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.c
@@ -0,0 +1,474 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_checkptrw.h"
+#include "yaffs_getblockinfo.h"
+
+struct yaffs_checkpt_chunk_hdr {
+	int version;
+	int seq;
+	u32 sum;
+	u32 xor;
+} ;
+
+
+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
+{
+	return chunk - dev->chunk_offset;
+}
+
+static int apply_block_offset(struct yaffs_dev *dev, int block)
+{
+	return block - dev->block_offset;
+}
+
+static void yaffs2_checkpt_init_chunk_hdr(struct yaffs_dev *dev)
+{
+	struct yaffs_checkpt_chunk_hdr hdr;
+
+	hdr.version = YAFFS_CHECKPOINT_VERSION;
+	hdr.seq = dev->checkpt_page_seq;
+	hdr.sum = dev->checkpt_sum;
+	hdr.xor = dev->checkpt_xor;
+
+	dev->checkpt_byte_offs = sizeof(hdr);
+
+	memcpy(dev->checkpt_buffer, &hdr, sizeof(hdr));
+}
+
+static int yaffs2_checkpt_check_chunk_hdr(struct yaffs_dev *dev)
+{
+	struct yaffs_checkpt_chunk_hdr hdr;
+
+	memcpy(&hdr, dev->checkpt_buffer, sizeof(hdr));
+
+	dev->checkpt_byte_offs = sizeof(hdr);
+
+	return hdr.version == YAFFS_CHECKPOINT_VERSION &&
+		hdr.seq == dev->checkpt_page_seq &&
+		hdr.sum == dev->checkpt_sum &&
+		hdr.xor == dev->checkpt_xor;
+}
+
+static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
+{
+	int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"checkpt blocks_avail = %d", blocks_avail);
+
+	return (blocks_avail <= 0) ? 0 : 1;
+}
+
+static int yaffs_checkpt_erase(struct yaffs_dev *dev)
+{
+	int i;
+
+	if (!dev->drv.drv_erase_fn)
+		return 0;
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"checking blocks %d to %d",
+		dev->internal_start_block, dev->internal_end_block);
+
+	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
+		int offset_i = apply_block_offset(dev, i);
+		int result;
+
+		if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
+			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"erasing checkpt block %d", i);
+
+			dev->n_erasures++;
+
+			result = dev->drv.drv_erase_fn(dev, offset_i);
+			if(result) {
+				bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
+				dev->n_erased_blocks++;
+				dev->n_free_chunks +=
+				    dev->param.chunks_per_block;
+			} else {
+				dev->drv.drv_mark_bad_fn(dev, offset_i);
+				bi->block_state = YAFFS_BLOCK_STATE_DEAD;
+			}
+		}
+	}
+
+	dev->blocks_in_checkpt = 0;
+
+	return 1;
+}
+
+static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
+{
+	int i;
+	int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"allocating checkpt block: erased %d reserved %d avail %d next %d ",
+		dev->n_erased_blocks, dev->param.n_reserved_blocks,
+		blocks_avail, dev->checkpt_next_block);
+
+	if (dev->checkpt_next_block >= 0 &&
+	    dev->checkpt_next_block <= dev->internal_end_block &&
+	    blocks_avail > 0) {
+
+		for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
+		     i++) {
+			struct yaffs_block_info *bi;
+
+			bi = yaffs_get_block_info(dev, i);
+			if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
+				dev->checkpt_next_block = i + 1;
+				dev->checkpt_cur_block = i;
+				yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+					"allocating checkpt block %d", i);
+				return;
+			}
+		}
+	}
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT, "out of checkpt blocks");
+
+	dev->checkpt_next_block = -1;
+	dev->checkpt_cur_block = -1;
+}
+
+static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
+{
+	int i;
+	struct yaffs_ext_tags tags;
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"find next checkpt block: start:  blocks %d next %d",
+		dev->blocks_in_checkpt, dev->checkpt_next_block);
+
+	if (dev->blocks_in_checkpt < dev->checkpt_max_blocks)
+		for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
+		     i++) {
+			int chunk = i * dev->param.chunks_per_block;
+			enum yaffs_block_state state;
+			u32 seq;
+
+			dev->tagger.read_chunk_tags_fn(dev,
+					apply_chunk_offset(dev, chunk),
+					NULL, &tags);
+			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+				"find next checkpt block: search: block %d state %d oid %d seq %d eccr %d",
+				i, (int) state,
+				tags.obj_id, tags.seq_number,
+				tags.ecc_result);
+
+			if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
+				continue;
+
+			dev->tagger.query_block_fn(dev,
+						apply_block_offset(dev, i),
+						&state, &seq);
+			if (state == YAFFS_BLOCK_STATE_DEAD)
+				continue;
+
+			/* Right kind of block */
+			dev->checkpt_next_block = tags.obj_id;
+			dev->checkpt_cur_block = i;
+			dev->checkpt_block_list[dev->blocks_in_checkpt] = i;
+			dev->blocks_in_checkpt++;
+			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+				"found checkpt block %d", i);
+			return;
+		}
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT, "found no more checkpt blocks");
+
+	dev->checkpt_next_block = -1;
+	dev->checkpt_cur_block = -1;
+}
+
+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
+{
+	int i;
+
+	dev->checkpt_open_write = writing;
+
+	/* Got the functions we need? */
+	if (!dev->tagger.write_chunk_tags_fn ||
+	    !dev->tagger.read_chunk_tags_fn ||
+	    !dev->drv.drv_erase_fn ||
+	    !dev->drv.drv_mark_bad_fn)
+		return 0;
+
+	if (writing && !yaffs2_checkpt_space_ok(dev))
+		return 0;
+
+	if (!dev->checkpt_buffer)
+		dev->checkpt_buffer =
+		    kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
+	if (!dev->checkpt_buffer)
+		return 0;
+
+	dev->checkpt_page_seq = 0;
+	dev->checkpt_byte_count = 0;
+	dev->checkpt_sum = 0;
+	dev->checkpt_xor = 0;
+	dev->checkpt_cur_block = -1;
+	dev->checkpt_cur_chunk = -1;
+	dev->checkpt_next_block = dev->internal_start_block;
+
+	if (writing) {
+		memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
+		yaffs2_checkpt_init_chunk_hdr(dev);
+		return yaffs_checkpt_erase(dev);
+	}
+
+	/* Opening for a read */
+	/* Set to a value that will kick off a read */
+	dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
+	/* A checkpoint block list of 1 checkpoint block per 16 block is
+	 * (hopefully) going to be way more than we need */
+	dev->blocks_in_checkpt = 0;
+	dev->checkpt_max_blocks =
+	    (dev->internal_end_block - dev->internal_start_block) / 16 + 2;
+	dev->checkpt_block_list =
+	    kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS);
+
+	if (!dev->checkpt_block_list)
+		return 0;
+
+	for (i = 0; i < dev->checkpt_max_blocks; i++)
+		dev->checkpt_block_list[i] = -1;
+
+	return 1;
+}
+
+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum)
+{
+	u32 composite_sum;
+
+	composite_sum = (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xff);
+	*sum = composite_sum;
+	return 1;
+}
+
+static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
+{
+	int chunk;
+	int offset_chunk;
+	struct yaffs_ext_tags tags;
+
+	if (dev->checkpt_cur_block < 0) {
+		yaffs2_checkpt_find_erased_block(dev);
+		dev->checkpt_cur_chunk = 0;
+	}
+
+	if (dev->checkpt_cur_block < 0)
+		return 0;
+
+	tags.is_deleted = 0;
+	tags.obj_id = dev->checkpt_next_block;	/* Hint to next place to look */
+	tags.chunk_id = dev->checkpt_page_seq + 1;
+	tags.seq_number = YAFFS_SEQUENCE_CHECKPOINT_DATA;
+	tags.n_bytes = dev->data_bytes_per_chunk;
+	if (dev->checkpt_cur_chunk == 0) {
+		/* First chunk we write for the block? Set block state to
+		   checkpoint */
+		struct yaffs_block_info *bi =
+		    yaffs_get_block_info(dev, dev->checkpt_cur_block);
+		bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
+		dev->blocks_in_checkpt++;
+	}
+
+	chunk =
+	    dev->checkpt_cur_block * dev->param.chunks_per_block +
+	    dev->checkpt_cur_chunk;
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"checkpoint wite buffer nand %d(%d:%d) objid %d chId %d",
+		chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk,
+		tags.obj_id, tags.chunk_id);
+
+	offset_chunk = apply_chunk_offset(dev, chunk);
+
+	dev->n_page_writes++;
+
+	dev->tagger.write_chunk_tags_fn(dev, offset_chunk,
+				       dev->checkpt_buffer, &tags);
+	dev->checkpt_page_seq++;
+	dev->checkpt_cur_chunk++;
+	if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) {
+		dev->checkpt_cur_chunk = 0;
+		dev->checkpt_cur_block = -1;
+	}
+	memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
+
+	yaffs2_checkpt_init_chunk_hdr(dev);
+
+
+	return 1;
+}
+
+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
+{
+	int i = 0;
+	int ok = 1;
+	u8 *data_bytes = (u8 *) data;
+
+	if (!dev->checkpt_buffer)
+		return 0;
+
+	if (!dev->checkpt_open_write)
+		return -1;
+
+	while (i < n_bytes && ok) {
+		dev->checkpt_buffer[dev->checkpt_byte_offs] = *data_bytes;
+		dev->checkpt_sum += *data_bytes;
+		dev->checkpt_xor ^= *data_bytes;
+
+		dev->checkpt_byte_offs++;
+		i++;
+		data_bytes++;
+		dev->checkpt_byte_count++;
+
+		if (dev->checkpt_byte_offs < 0 ||
+		    dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
+			ok = yaffs2_checkpt_flush_buffer(dev);
+	}
+
+	return i;
+}
+
+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
+{
+	int i = 0;
+	int ok = 1;
+	struct yaffs_ext_tags tags;
+	int chunk;
+	int offset_chunk;
+	u8 *data_bytes = (u8 *) data;
+
+	if (!dev->checkpt_buffer)
+		return 0;
+
+	if (dev->checkpt_open_write)
+		return -1;
+
+	while (i < n_bytes && ok) {
+
+		if (dev->checkpt_byte_offs < 0 ||
+		    dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
+
+			if (dev->checkpt_cur_block < 0) {
+				yaffs2_checkpt_find_block(dev);
+				dev->checkpt_cur_chunk = 0;
+			}
+
+			if (dev->checkpt_cur_block < 0) {
+				ok = 0;
+				break;
+			}
+
+			chunk = dev->checkpt_cur_block *
+			    dev->param.chunks_per_block +
+			    dev->checkpt_cur_chunk;
+
+			offset_chunk = apply_chunk_offset(dev, chunk);
+			dev->n_page_reads++;
+
+			/* read in the next chunk */
+			dev->tagger.read_chunk_tags_fn(dev,
+						offset_chunk,
+						dev->checkpt_buffer,
+						&tags);
+
+			if (tags.chunk_id != (dev->checkpt_page_seq + 1) ||
+			    tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
+			    tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA) {
+				ok = 0;
+				break;
+			}
+			if(!yaffs2_checkpt_check_chunk_hdr(dev)) {
+				ok = 0;
+				break;
+			}
+
+			dev->checkpt_page_seq++;
+			dev->checkpt_cur_chunk++;
+
+			if (dev->checkpt_cur_chunk >=
+					dev->param.chunks_per_block)
+				dev->checkpt_cur_block = -1;
+
+		}
+
+		*data_bytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
+		dev->checkpt_sum += *data_bytes;
+		dev->checkpt_xor ^= *data_bytes;
+		dev->checkpt_byte_offs++;
+		i++;
+		data_bytes++;
+		dev->checkpt_byte_count++;
+	}
+
+	return i;
+}
+
+int yaffs_checkpt_close(struct yaffs_dev *dev)
+{
+	int i;
+
+	if (dev->checkpt_open_write) {
+		if (dev->checkpt_byte_offs !=
+			sizeof(sizeof(struct yaffs_checkpt_chunk_hdr)))
+			yaffs2_checkpt_flush_buffer(dev);
+	} else if (dev->checkpt_block_list) {
+		for (i = 0;
+		     i < dev->blocks_in_checkpt &&
+		     dev->checkpt_block_list[i] >= 0; i++) {
+			int blk = dev->checkpt_block_list[i];
+			struct yaffs_block_info *bi = NULL;
+
+			if (dev->internal_start_block <= blk &&
+			    blk <= dev->internal_end_block)
+				bi = yaffs_get_block_info(dev, blk);
+			if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
+				bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
+		}
+		kfree(dev->checkpt_block_list);
+		dev->checkpt_block_list = NULL;
+	}
+
+	dev->n_free_chunks -=
+		dev->blocks_in_checkpt * dev->param.chunks_per_block;
+	dev->n_erased_blocks -= dev->blocks_in_checkpt;
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d",
+		dev->checkpt_byte_count);
+
+	if (dev->checkpt_buffer) {
+		/* free the buffer */
+		kfree(dev->checkpt_buffer);
+		dev->checkpt_buffer = NULL;
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
+{
+	/* Erase the checkpoint data */
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"checkpoint invalidate of %d blocks",
+		dev->blocks_in_checkpt);
+
+	return yaffs_checkpt_erase(dev);
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.h
new file mode 100644
index 00000000..cdbaba71
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.h
@@ -0,0 +1,33 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_CHECKPTRW_H__
+#define __YAFFS_CHECKPTRW_H__
+
+#include "yaffs_guts.h"
+
+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing);
+
+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes);
+
+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes);
+
+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum);
+
+int yaffs_checkpt_close(struct yaffs_dev *dev);
+
+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.c
new file mode 100644
index 00000000..9294107c
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.c
@@ -0,0 +1,281 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * This code implements the ECC algorithm used in SmartMedia.
+ *
+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
+ * The two unused bit are set to 1.
+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two
+ * such ECC blocks are used on a 512-byte NAND page.
+ *
+ */
+
+#include "yportenv.h"
+
+#include "yaffs_ecc.h"
+
+/* Table generated by gen-ecc.c
+ * Using a table means we do not have to calculate p1..p4 and p1'..p4'
+ * for each byte of data. These are instead provided in a table in bits7..2.
+ * Bit 0 of each entry indicates whether the entry has an odd or even parity,
+ * and therefore this bytes influence on the line parity.
+ */
+
+static const unsigned char column_parity_table[] = {
+	0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
+	0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
+	0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
+	0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
+	0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
+	0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
+	0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
+	0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
+	0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
+	0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
+	0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
+	0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
+	0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
+	0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
+	0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
+	0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
+	0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
+	0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
+	0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
+	0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
+	0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
+	0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
+	0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
+	0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
+	0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
+	0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
+	0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
+	0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
+	0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
+	0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
+	0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
+	0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
+};
+
+
+/* Calculate the ECC for a 256-byte block of data */
+void yaffs_ecc_calc(const unsigned char *data, unsigned char *ecc)
+{
+	unsigned int i;
+	unsigned char col_parity = 0;
+	unsigned char line_parity = 0;
+	unsigned char line_parity_prime = 0;
+	unsigned char t;
+	unsigned char b;
+
+	for (i = 0; i < 256; i++) {
+		b = column_parity_table[*data++];
+		col_parity ^= b;
+
+		if (b & 0x01) {	/* odd number of bits in the byte */
+			line_parity ^= i;
+			line_parity_prime ^= ~i;
+		}
+	}
+
+	ecc[2] = (~col_parity) | 0x03;
+
+	t = 0;
+	if (line_parity & 0x80)
+		t |= 0x80;
+	if (line_parity_prime & 0x80)
+		t |= 0x40;
+	if (line_parity & 0x40)
+		t |= 0x20;
+	if (line_parity_prime & 0x40)
+		t |= 0x10;
+	if (line_parity & 0x20)
+		t |= 0x08;
+	if (line_parity_prime & 0x20)
+		t |= 0x04;
+	if (line_parity & 0x10)
+		t |= 0x02;
+	if (line_parity_prime & 0x10)
+		t |= 0x01;
+	ecc[1] = ~t;
+
+	t = 0;
+	if (line_parity & 0x08)
+		t |= 0x80;
+	if (line_parity_prime & 0x08)
+		t |= 0x40;
+	if (line_parity & 0x04)
+		t |= 0x20;
+	if (line_parity_prime & 0x04)
+		t |= 0x10;
+	if (line_parity & 0x02)
+		t |= 0x08;
+	if (line_parity_prime & 0x02)
+		t |= 0x04;
+	if (line_parity & 0x01)
+		t |= 0x02;
+	if (line_parity_prime & 0x01)
+		t |= 0x01;
+	ecc[0] = ~t;
+
+}
+
+/* Correct the ECC on a 256 byte block of data */
+
+int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
+		      const unsigned char *test_ecc)
+{
+	unsigned char d0, d1, d2;	/* deltas */
+
+	d0 = read_ecc[0] ^ test_ecc[0];
+	d1 = read_ecc[1] ^ test_ecc[1];
+	d2 = read_ecc[2] ^ test_ecc[2];
+
+	if ((d0 | d1 | d2) == 0)
+		return 0;	/* no error */
+
+	if (((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&
+	    ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&
+	    ((d2 ^ (d2 >> 1)) & 0x54) == 0x54) {
+		/* Single bit (recoverable) error in data */
+
+		unsigned byte;
+		unsigned bit;
+
+		bit = byte = 0;
+
+		if (d1 & 0x80)
+			byte |= 0x80;
+		if (d1 & 0x20)
+			byte |= 0x40;
+		if (d1 & 0x08)
+			byte |= 0x20;
+		if (d1 & 0x02)
+			byte |= 0x10;
+		if (d0 & 0x80)
+			byte |= 0x08;
+		if (d0 & 0x20)
+			byte |= 0x04;
+		if (d0 & 0x08)
+			byte |= 0x02;
+		if (d0 & 0x02)
+			byte |= 0x01;
+
+		if (d2 & 0x80)
+			bit |= 0x04;
+		if (d2 & 0x20)
+			bit |= 0x02;
+		if (d2 & 0x08)
+			bit |= 0x01;
+
+		data[byte] ^= (1 << bit);
+
+		return 1;	/* Corrected the error */
+	}
+
+	if ((hweight8(d0) + hweight8(d1) + hweight8(d2)) == 1) {
+		/* Reccoverable error in ecc */
+
+		read_ecc[0] = test_ecc[0];
+		read_ecc[1] = test_ecc[1];
+		read_ecc[2] = test_ecc[2];
+
+		return 1;	/* Corrected the error */
+	}
+
+	/* Unrecoverable error */
+
+	return -1;
+
+}
+
+/*
+ * ECCxxxOther does ECC calcs on arbitrary n bytes of data
+ */
+void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
+			  struct yaffs_ecc_other *ecc_other)
+{
+	unsigned int i;
+	unsigned char col_parity = 0;
+	unsigned line_parity = 0;
+	unsigned line_parity_prime = 0;
+	unsigned char b;
+
+	for (i = 0; i < n_bytes; i++) {
+		b = column_parity_table[*data++];
+		col_parity ^= b;
+
+		if (b & 0x01) {
+			/* odd number of bits in the byte */
+			line_parity ^= i;
+			line_parity_prime ^= ~i;
+		}
+
+	}
+
+	ecc_other->col_parity = (col_parity >> 2) & 0x3f;
+	ecc_other->line_parity = line_parity;
+	ecc_other->line_parity_prime = line_parity_prime;
+}
+
+int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
+			    struct yaffs_ecc_other *read_ecc,
+			    const struct yaffs_ecc_other *test_ecc)
+{
+	unsigned char delta_col;	/* column parity delta */
+	unsigned delta_line;	/* line parity delta */
+	unsigned delta_line_prime;	/* line parity delta */
+	unsigned bit;
+
+	delta_col = read_ecc->col_parity ^ test_ecc->col_parity;
+	delta_line = read_ecc->line_parity ^ test_ecc->line_parity;
+	delta_line_prime =
+	    read_ecc->line_parity_prime ^ test_ecc->line_parity_prime;
+
+	if ((delta_col | delta_line | delta_line_prime) == 0)
+		return 0;	/* no error */
+
+	if (delta_line == ~delta_line_prime &&
+	    (((delta_col ^ (delta_col >> 1)) & 0x15) == 0x15)) {
+		/* Single bit (recoverable) error in data */
+
+		bit = 0;
+
+		if (delta_col & 0x20)
+			bit |= 0x04;
+		if (delta_col & 0x08)
+			bit |= 0x02;
+		if (delta_col & 0x02)
+			bit |= 0x01;
+
+		if (delta_line >= n_bytes)
+			return -1;
+
+		data[delta_line] ^= (1 << bit);
+
+		return 1;	/* corrected */
+	}
+
+	if ((hweight32(delta_line) +
+	     hweight32(delta_line_prime) +
+	     hweight8(delta_col)) == 1) {
+		/* Reccoverable error in ecc */
+
+		*read_ecc = *test_ecc;
+		return 1;	/* corrected */
+	}
+
+	/* Unrecoverable error */
+
+	return -1;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.h
new file mode 100644
index 00000000..17d47bd8
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_ecc.h
@@ -0,0 +1,44 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+/*
+ * This code implements the ECC algorithm used in SmartMedia.
+ *
+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
+ * The two unused bit are set to 1.
+ * The ECC can correct single bit errors in a 256-byte page of data.
+ * Thus, two such ECC blocks are used on a 512-byte NAND page.
+ *
+ */
+
+#ifndef __YAFFS_ECC_H__
+#define __YAFFS_ECC_H__
+
+struct yaffs_ecc_other {
+	unsigned char col_parity;
+	unsigned line_parity;
+	unsigned line_parity_prime;
+};
+
+void yaffs_ecc_calc(const unsigned char *data, unsigned char *ecc);
+int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
+		      const unsigned char *test_ecc);
+
+void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
+			  struct yaffs_ecc_other *ecc);
+int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
+			    struct yaffs_ecc_other *read_ecc,
+			    const struct yaffs_ecc_other *test_ecc);
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h
new file mode 100644
index 00000000..8fd0802b
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h
@@ -0,0 +1,35 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_GETBLOCKINFO_H__
+#define __YAFFS_GETBLOCKINFO_H__
+
+#include "yaffs_guts.h"
+#include "yaffs_trace.h"
+
+/* Function to manipulate block info */
+static inline struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
+							      *dev, int blk)
+{
+	if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"**>> yaffs: get_block_info block %d is not valid",
+			blk);
+		BUG();
+	}
+	return &dev->block_info[blk - dev->internal_start_block];
+}
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.c
new file mode 100644
index 00000000..1fd464d6
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.c
@@ -0,0 +1,5082 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yportenv.h"
+#include "yaffs_trace.h"
+
+#include "yaffs_guts.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_tagscompat.h"
+#include "yaffs_tagsmarshall.h"
+#include "yaffs_nand.h"
+#include "yaffs_yaffs1.h"
+#include "yaffs_yaffs2.h"
+#include "yaffs_bitmap.h"
+#include "yaffs_verify.h"
+#include "yaffs_nand.h"
+#include "yaffs_packedtags2.h"
+#include "yaffs_nameval.h"
+#include "yaffs_allocator.h"
+#include "yaffs_attribs.h"
+#include "yaffs_summary.h"
+
+/* Note YAFFS_GC_GOOD_ENOUGH must be <= YAFFS_GC_PASSIVE_THRESHOLD */
+#define YAFFS_GC_GOOD_ENOUGH 2
+#define YAFFS_GC_PASSIVE_THRESHOLD 4
+
+#include "yaffs_ecc.h"
+
+/* Forward declarations */
+
+static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
+			     const u8 *buffer, int n_bytes, int use_reserve);
+
+static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name,
+				int buffer_size);
+
+/* Function to calculate chunk and offset */
+
+void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
+				int *chunk_out, u32 *offset_out)
+{
+	int chunk;
+	u32 offset;
+
+	chunk = (u32) (addr >> dev->chunk_shift);
+
+	if (dev->chunk_div == 1) {
+		/* easy power of 2 case */
+		offset = (u32) (addr & dev->chunk_mask);
+	} else {
+		/* Non power-of-2 case */
+
+		loff_t chunk_base;
+
+		chunk /= dev->chunk_div;
+
+		chunk_base = ((loff_t) chunk) * dev->data_bytes_per_chunk;
+		offset = (u32) (addr - chunk_base);
+	}
+
+	*chunk_out = chunk;
+	*offset_out = offset;
+}
+
+/* Function to return the number of shifts for a power of 2 greater than or
+ * equal to the given number
+ * Note we don't try to cater for all possible numbers and this does not have to
+ * be hellishly efficient.
+ */
+
+static inline u32 calc_shifts_ceiling(u32 x)
+{
+	int extra_bits;
+	int shifts;
+
+	shifts = extra_bits = 0;
+
+	while (x > 1) {
+		if (x & 1)
+			extra_bits++;
+		x >>= 1;
+		shifts++;
+	}
+
+	if (extra_bits)
+		shifts++;
+
+	return shifts;
+}
+
+/* Function to return the number of shifts to get a 1 in bit 0
+ */
+
+static inline u32 calc_shifts(u32 x)
+{
+	u32 shifts;
+
+	shifts = 0;
+
+	if (!x)
+		return 0;
+
+	while (!(x & 1)) {
+		x >>= 1;
+		shifts++;
+	}
+
+	return shifts;
+}
+
+/*
+ * Temporary buffer manipulations.
+ */
+
+static int yaffs_init_tmp_buffers(struct yaffs_dev *dev)
+{
+	int i;
+	u8 *buf = (u8 *) 1;
+
+	memset(dev->temp_buffer, 0, sizeof(dev->temp_buffer));
+
+	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
+		dev->temp_buffer[i].in_use = 0;
+		buf = kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
+		dev->temp_buffer[i].buffer = buf;
+	}
+
+	return buf ? YAFFS_OK : YAFFS_FAIL;
+}
+
+u8 *yaffs_get_temp_buffer(struct yaffs_dev * dev)
+{
+	int i;
+
+	dev->temp_in_use++;
+	if (dev->temp_in_use > dev->max_temp)
+		dev->max_temp = dev->temp_in_use;
+
+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
+		if (dev->temp_buffer[i].in_use == 0) {
+			dev->temp_buffer[i].in_use = 1;
+			return dev->temp_buffer[i].buffer;
+		}
+	}
+
+	yaffs_trace(YAFFS_TRACE_BUFFERS, "Out of temp buffers");
+	/*
+	 * If we got here then we have to allocate an unmanaged one
+	 * This is not good.
+	 */
+
+	dev->unmanaged_buffer_allocs++;
+	return kmalloc(dev->data_bytes_per_chunk, GFP_NOFS);
+
+}
+
+void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer)
+{
+	int i;
+
+	dev->temp_in_use--;
+
+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
+		if (dev->temp_buffer[i].buffer == buffer) {
+			dev->temp_buffer[i].in_use = 0;
+			return;
+		}
+	}
+
+	if (buffer) {
+		/* assume it is an unmanaged one. */
+		yaffs_trace(YAFFS_TRACE_BUFFERS,
+			"Releasing unmanaged temp buffer");
+		kfree(buffer);
+		dev->unmanaged_buffer_deallocs++;
+	}
+
+}
+
+/*
+ * Functions for robustisizing TODO
+ *
+ */
+
+static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk,
+				     const u8 *data,
+				     const struct yaffs_ext_tags *tags)
+{
+	(void) dev;
+	(void) nand_chunk;
+	(void) data;
+	(void) tags;
+}
+
+static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
+				      const struct yaffs_ext_tags *tags)
+{
+	(void) dev;
+	(void) nand_chunk;
+	(void) tags;
+}
+
+void yaffs_handle_chunk_error(struct yaffs_dev *dev,
+			      struct yaffs_block_info *bi)
+{
+	if (!bi->gc_prioritise) {
+		bi->gc_prioritise = 1;
+		dev->has_pending_prioritised_gc = 1;
+		bi->chunk_error_strikes++;
+
+		if (bi->chunk_error_strikes > 3) {
+			bi->needs_retiring = 1;	/* Too many stikes, so retire */
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"yaffs: Block struck out");
+
+		}
+	}
+}
+
+static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk,
+					int erased_ok)
+{
+	int flash_block = nand_chunk / dev->param.chunks_per_block;
+	struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
+
+	yaffs_handle_chunk_error(dev, bi);
+
+	if (erased_ok) {
+		/* Was an actual write failure,
+		 * so mark the block for retirement.*/
+		bi->needs_retiring = 1;
+		yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+		  "**>> Block %d needs retiring", flash_block);
+	}
+
+	/* Delete the chunk */
+	yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+	yaffs_skip_rest_of_block(dev);
+}
+
+/*
+ * Verification code
+ */
+
+/*
+ *  Simple hash function. Needs to have a reasonable spread
+ */
+
+static inline int yaffs_hash_fn(int n)
+{
+	if (n < 0)
+		n = -n;
+	return n % YAFFS_NOBJECT_BUCKETS;
+}
+
+/*
+ * Access functions to useful fake objects.
+ * Note that root might have a presence in NAND if permissions are set.
+ */
+
+struct yaffs_obj *yaffs_root(struct yaffs_dev *dev)
+{
+	return dev->root_dir;
+}
+
+struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev)
+{
+	return dev->lost_n_found;
+}
+
+/*
+ *  Erased NAND checking functions
+ */
+
+int yaffs_check_ff(u8 *buffer, int n_bytes)
+{
+	/* Horrible, slow implementation */
+	while (n_bytes--) {
+		if (*buffer != 0xff)
+			return 0;
+		buffer++;
+	}
+	return 1;
+}
+
+static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk)
+{
+	int retval = YAFFS_OK;
+	u8 *data = yaffs_get_temp_buffer(dev);
+	struct yaffs_ext_tags tags;
+	int result;
+
+	result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, data, &tags);
+
+	if (tags.ecc_result > YAFFS_ECC_RESULT_NO_ERROR)
+		retval = YAFFS_FAIL;
+
+	if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) ||
+		tags.chunk_used) {
+		yaffs_trace(YAFFS_TRACE_NANDACCESS,
+			"Chunk %d not erased", nand_chunk);
+		retval = YAFFS_FAIL;
+	}
+
+	yaffs_release_temp_buffer(dev, data);
+
+	return retval;
+
+}
+
+static int yaffs_verify_chunk_written(struct yaffs_dev *dev,
+				      int nand_chunk,
+				      const u8 *data,
+				      struct yaffs_ext_tags *tags)
+{
+	int retval = YAFFS_OK;
+	struct yaffs_ext_tags temp_tags;
+	u8 *buffer = yaffs_get_temp_buffer(dev);
+	int result;
+
+	result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, buffer, &temp_tags);
+	if (memcmp(buffer, data, dev->data_bytes_per_chunk) ||
+	    temp_tags.obj_id != tags->obj_id ||
+	    temp_tags.chunk_id != tags->chunk_id ||
+	    temp_tags.n_bytes != tags->n_bytes)
+		retval = YAFFS_FAIL;
+
+	yaffs_release_temp_buffer(dev, buffer);
+
+	return retval;
+}
+
+
+int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks)
+{
+	int reserved_chunks;
+	int reserved_blocks = dev->param.n_reserved_blocks;
+	int checkpt_blocks;
+
+	checkpt_blocks = yaffs_calc_checkpt_blocks_required(dev);
+
+	reserved_chunks =
+	    (reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block;
+
+	return (dev->n_free_chunks > (reserved_chunks + n_chunks));
+}
+
+static int yaffs_find_alloc_block(struct yaffs_dev *dev)
+{
+	int i;
+	struct yaffs_block_info *bi;
+
+	if (dev->n_erased_blocks < 1) {
+		/* Hoosterman we've got a problem.
+		 * Can't get space to gc
+		 */
+		yaffs_trace(YAFFS_TRACE_ERROR,
+		  "yaffs tragedy: no more erased blocks");
+
+		return -1;
+	}
+
+	/* Find an empty block. */
+
+	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		dev->alloc_block_finder++;
+		if (dev->alloc_block_finder < dev->internal_start_block
+		    || dev->alloc_block_finder > dev->internal_end_block) {
+			dev->alloc_block_finder = dev->internal_start_block;
+		}
+
+		bi = yaffs_get_block_info(dev, dev->alloc_block_finder);
+
+		if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
+			bi->block_state = YAFFS_BLOCK_STATE_ALLOCATING;
+			dev->seq_number++;
+			bi->seq_number = dev->seq_number;
+			dev->n_erased_blocks--;
+			yaffs_trace(YAFFS_TRACE_ALLOCATE,
+			  "Allocated block %d, seq  %d, %d left" ,
+			   dev->alloc_block_finder, dev->seq_number,
+			   dev->n_erased_blocks);
+			return dev->alloc_block_finder;
+		}
+	}
+
+	yaffs_trace(YAFFS_TRACE_ALWAYS,
+		"yaffs tragedy: no more erased blocks, but there should have been %d",
+		dev->n_erased_blocks);
+
+	return -1;
+}
+
+static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver,
+			     struct yaffs_block_info **block_ptr)
+{
+	int ret_val;
+	struct yaffs_block_info *bi;
+
+	if (dev->alloc_block < 0) {
+		/* Get next block to allocate off */
+		dev->alloc_block = yaffs_find_alloc_block(dev);
+		dev->alloc_page = 0;
+	}
+
+	if (!use_reserver && !yaffs_check_alloc_available(dev, 1)) {
+		/* No space unless we're allowed to use the reserve. */
+		return -1;
+	}
+
+	if (dev->n_erased_blocks < dev->param.n_reserved_blocks
+	    && dev->alloc_page == 0)
+		yaffs_trace(YAFFS_TRACE_ALLOCATE, "Allocating reserve");
+
+	/* Next page please.... */
+	if (dev->alloc_block >= 0) {
+		bi = yaffs_get_block_info(dev, dev->alloc_block);
+
+		ret_val = (dev->alloc_block * dev->param.chunks_per_block) +
+		    dev->alloc_page;
+		bi->pages_in_use++;
+		yaffs_set_chunk_bit(dev, dev->alloc_block, dev->alloc_page);
+
+		dev->alloc_page++;
+
+		dev->n_free_chunks--;
+
+		/* If the block is full set the state to full */
+		if (dev->alloc_page >= dev->param.chunks_per_block) {
+			bi->block_state = YAFFS_BLOCK_STATE_FULL;
+			dev->alloc_block = -1;
+		}
+
+		if (block_ptr)
+			*block_ptr = bi;
+
+		return ret_val;
+	}
+
+	yaffs_trace(YAFFS_TRACE_ERROR,
+		"!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!");
+
+	return -1;
+}
+
+static int yaffs_get_erased_chunks(struct yaffs_dev *dev)
+{
+	int n;
+
+	n = dev->n_erased_blocks * dev->param.chunks_per_block;
+
+	if (dev->alloc_block > 0)
+		n += (dev->param.chunks_per_block - dev->alloc_page);
+
+	return n;
+
+}
+
+/*
+ * yaffs_skip_rest_of_block() skips over the rest of the allocation block
+ * if we don't want to write to it.
+ */
+void yaffs_skip_rest_of_block(struct yaffs_dev *dev)
+{
+	struct yaffs_block_info *bi;
+
+	if (dev->alloc_block > 0) {
+		bi = yaffs_get_block_info(dev, dev->alloc_block);
+		if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING) {
+			bi->block_state = YAFFS_BLOCK_STATE_FULL;
+			dev->alloc_block = -1;
+		}
+	}
+}
+
+static int yaffs_write_new_chunk(struct yaffs_dev *dev,
+				 const u8 *data,
+				 struct yaffs_ext_tags *tags, int use_reserver)
+{
+	int attempts = 0;
+	int write_ok = 0;
+	int chunk;
+
+	yaffs2_checkpt_invalidate(dev);
+
+	do {
+		struct yaffs_block_info *bi = 0;
+		int erased_ok = 0;
+
+		chunk = yaffs_alloc_chunk(dev, use_reserver, &bi);
+		if (chunk < 0) {
+			/* no space */
+			break;
+		}
+
+		/* First check this chunk is erased, if it needs
+		 * checking.  The checking policy (unless forced
+		 * always on) is as follows:
+		 *
+		 * Check the first page we try to write in a block.
+		 * If the check passes then we don't need to check any
+		 * more.        If the check fails, we check again...
+		 * If the block has been erased, we don't need to check.
+		 *
+		 * However, if the block has been prioritised for gc,
+		 * then we think there might be something odd about
+		 * this block and stop using it.
+		 *
+		 * Rationale: We should only ever see chunks that have
+		 * not been erased if there was a partially written
+		 * chunk due to power loss.  This checking policy should
+		 * catch that case with very few checks and thus save a
+		 * lot of checks that are most likely not needed.
+		 *
+		 * Mods to the above
+		 * If an erase check fails or the write fails we skip the
+		 * rest of the block.
+		 */
+
+		/* let's give it a try */
+		attempts++;
+
+		if (dev->param.always_check_erased)
+			bi->skip_erased_check = 0;
+
+		if (!bi->skip_erased_check) {
+			erased_ok = yaffs_check_chunk_erased(dev, chunk);
+			if (erased_ok != YAFFS_OK) {
+				yaffs_trace(YAFFS_TRACE_ERROR,
+				  "**>> yaffs chunk %d was not erased",
+				  chunk);
+
+				/* If not erased, delete this one,
+				 * skip rest of block and
+				 * try another chunk */
+				yaffs_chunk_del(dev, chunk, 1, __LINE__);
+				yaffs_skip_rest_of_block(dev);
+				continue;
+			}
+		}
+
+		write_ok = yaffs_wr_chunk_tags_nand(dev, chunk, data, tags);
+
+		if (!bi->skip_erased_check)
+			write_ok =
+			    yaffs_verify_chunk_written(dev, chunk, data, tags);
+
+		if (write_ok != YAFFS_OK) {
+			/* Clean up aborted write, skip to next block and
+			 * try another chunk */
+			yaffs_handle_chunk_wr_error(dev, chunk, erased_ok);
+			continue;
+		}
+
+		bi->skip_erased_check = 1;
+
+		/* Copy the data into the robustification buffer */
+		yaffs_handle_chunk_wr_ok(dev, chunk, data, tags);
+
+	} while (write_ok != YAFFS_OK &&
+		 (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
+
+	if (!write_ok)
+		chunk = -1;
+
+	if (attempts > 1) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"**>> yaffs write required %d attempts",
+			attempts);
+		dev->n_retried_writes += (attempts - 1);
+	}
+
+	return chunk;
+}
+
+/*
+ * Block retiring for handling a broken block.
+ */
+
+static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block)
+{
+	struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
+
+	yaffs2_checkpt_invalidate(dev);
+
+	yaffs2_clear_oldest_dirty_seq(dev, bi);
+
+	if (yaffs_mark_bad(dev, flash_block) != YAFFS_OK) {
+		if (yaffs_erase_block(dev, flash_block) != YAFFS_OK) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"yaffs: Failed to mark bad and erase block %d",
+				flash_block);
+		} else {
+			struct yaffs_ext_tags tags;
+			int chunk_id =
+			    flash_block * dev->param.chunks_per_block;
+
+			u8 *buffer = yaffs_get_temp_buffer(dev);
+
+			memset(buffer, 0xff, dev->data_bytes_per_chunk);
+			memset(&tags, 0, sizeof(tags));
+			tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK;
+			if (dev->tagger.write_chunk_tags_fn(dev, chunk_id -
+							dev->chunk_offset,
+							buffer,
+							&tags) != YAFFS_OK)
+				yaffs_trace(YAFFS_TRACE_ALWAYS,
+					"yaffs: Failed to write bad block marker to block %d",
+					flash_block);
+
+			yaffs_release_temp_buffer(dev, buffer);
+		}
+	}
+
+	bi->block_state = YAFFS_BLOCK_STATE_DEAD;
+	bi->gc_prioritise = 0;
+	bi->needs_retiring = 0;
+
+	dev->n_retired_blocks++;
+}
+
+/*---------------- Name handling functions ------------*/
+
+static u16 yaffs_calc_name_sum(const YCHAR *name)
+{
+	u16 sum = 0;
+	u16 i = 1;
+
+	if (!name)
+		return 0;
+
+	while ((*name) && i < (YAFFS_MAX_NAME_LENGTH / 2)) {
+
+		/* 0x1f mask is case insensitive */
+		sum += ((*name) & 0x1f) * i;
+		i++;
+		name++;
+	}
+	return sum;
+}
+
+
+void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
+{
+	memset(obj->short_name, 0, sizeof(obj->short_name));
+
+	if (name && !name[0]) {
+		yaffs_fix_null_name(obj, obj->short_name,
+				YAFFS_SHORT_NAME_LENGTH);
+		name = obj->short_name;
+	} else if (name &&
+		strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <=
+		YAFFS_SHORT_NAME_LENGTH)  {
+		strcpy(obj->short_name, name);
+	}
+
+	obj->sum = yaffs_calc_name_sum(name);
+}
+
+void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
+				const struct yaffs_obj_hdr *oh)
+{
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
+	YCHAR tmp_name[YAFFS_MAX_NAME_LENGTH + 1];
+	memset(tmp_name, 0, sizeof(tmp_name));
+	yaffs_load_name_from_oh(obj->my_dev, tmp_name, oh->name,
+				YAFFS_MAX_NAME_LENGTH + 1);
+	yaffs_set_obj_name(obj, tmp_name);
+#else
+	yaffs_set_obj_name(obj, oh->name);
+#endif
+}
+
+loff_t yaffs_max_file_size(struct yaffs_dev *dev)
+{
+	if(sizeof(loff_t) < 8)
+		return YAFFS_MAX_FILE_SIZE_32;
+	else
+		return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
+}
+
+/*-------------------- TNODES -------------------
+
+ * List of spare tnodes
+ * The list is hooked together using the first pointer
+ * in the tnode.
+ */
+
+struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev)
+{
+	struct yaffs_tnode *tn = yaffs_alloc_raw_tnode(dev);
+
+	if (tn) {
+		memset(tn, 0, dev->tnode_size);
+		dev->n_tnodes++;
+	}
+
+	dev->checkpoint_blocks_required = 0;	/* force recalculation */
+
+	return tn;
+}
+
+/* FreeTnode frees up a tnode and puts it back on the free list */
+static void yaffs_free_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
+{
+	yaffs_free_raw_tnode(dev, tn);
+	dev->n_tnodes--;
+	dev->checkpoint_blocks_required = 0;	/* force recalculation */
+}
+
+static void yaffs_deinit_tnodes_and_objs(struct yaffs_dev *dev)
+{
+	yaffs_deinit_raw_tnodes_and_objs(dev);
+	dev->n_obj = 0;
+	dev->n_tnodes = 0;
+}
+
+static void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
+			unsigned pos, unsigned val)
+{
+	u32 *map = (u32 *) tn;
+	u32 bit_in_map;
+	u32 bit_in_word;
+	u32 word_in_map;
+	u32 mask;
+
+	pos &= YAFFS_TNODES_LEVEL0_MASK;
+	val >>= dev->chunk_grp_bits;
+
+	bit_in_map = pos * dev->tnode_width;
+	word_in_map = bit_in_map / 32;
+	bit_in_word = bit_in_map & (32 - 1);
+
+	mask = dev->tnode_mask << bit_in_word;
+
+	map[word_in_map] &= ~mask;
+	map[word_in_map] |= (mask & (val << bit_in_word));
+
+	if (dev->tnode_width > (32 - bit_in_word)) {
+		bit_in_word = (32 - bit_in_word);
+		word_in_map++;
+		mask =
+		    dev->tnode_mask >> bit_in_word;
+		map[word_in_map] &= ~mask;
+		map[word_in_map] |= (mask & (val >> bit_in_word));
+	}
+}
+
+u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
+			 unsigned pos)
+{
+	u32 *map = (u32 *) tn;
+	u32 bit_in_map;
+	u32 bit_in_word;
+	u32 word_in_map;
+	u32 val;
+
+	pos &= YAFFS_TNODES_LEVEL0_MASK;
+
+	bit_in_map = pos * dev->tnode_width;
+	word_in_map = bit_in_map / 32;
+	bit_in_word = bit_in_map & (32 - 1);
+
+	val = map[word_in_map] >> bit_in_word;
+
+	if (dev->tnode_width > (32 - bit_in_word)) {
+		bit_in_word = (32 - bit_in_word);
+		word_in_map++;
+		val |= (map[word_in_map] << bit_in_word);
+	}
+
+	val &= dev->tnode_mask;
+	val <<= dev->chunk_grp_bits;
+
+	return val;
+}
+
+/* ------------------- End of individual tnode manipulation -----------------*/
+
+/* ---------Functions to manipulate the look-up tree (made up of tnodes) ------
+ * The look up tree is represented by the top tnode and the number of top_level
+ * in the tree. 0 means only the level 0 tnode is in the tree.
+ */
+
+/* FindLevel0Tnode finds the level 0 tnode, if one exists. */
+struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
+				       struct yaffs_file_var *file_struct,
+				       u32 chunk_id)
+{
+	struct yaffs_tnode *tn = file_struct->top;
+	u32 i;
+	int required_depth;
+	int level = file_struct->top_level;
+
+	(void) dev;
+
+	/* Check sane level and chunk Id */
+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
+		return NULL;
+
+	if (chunk_id > YAFFS_MAX_CHUNK_ID)
+		return NULL;
+
+	/* First check we're tall enough (ie enough top_level) */
+
+	i = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
+	required_depth = 0;
+	while (i) {
+		i >>= YAFFS_TNODES_INTERNAL_BITS;
+		required_depth++;
+	}
+
+	if (required_depth > file_struct->top_level)
+		return NULL;	/* Not tall enough, so we can't find it */
+
+	/* Traverse down to level 0 */
+	while (level > 0 && tn) {
+		tn = tn->internal[(chunk_id >>
+				   (YAFFS_TNODES_LEVEL0_BITS +
+				    (level - 1) *
+				    YAFFS_TNODES_INTERNAL_BITS)) &
+				  YAFFS_TNODES_INTERNAL_MASK];
+		level--;
+	}
+
+	return tn;
+}
+
+/* add_find_tnode_0 finds the level 0 tnode if it exists,
+ * otherwise first expands the tree.
+ * This happens in two steps:
+ *  1. If the tree isn't tall enough, then make it taller.
+ *  2. Scan down the tree towards the level 0 tnode adding tnodes if required.
+ *
+ * Used when modifying the tree.
+ *
+ *  If the tn argument is NULL, then a fresh tnode will be added otherwise the
+ *  specified tn will be plugged into the ttree.
+ */
+
+struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev,
+					   struct yaffs_file_var *file_struct,
+					   u32 chunk_id,
+					   struct yaffs_tnode *passed_tn)
+{
+	int required_depth;
+	int i;
+	int l;
+	struct yaffs_tnode *tn;
+	u32 x;
+
+	/* Check sane level and page Id */
+	if (file_struct->top_level < 0 ||
+	    file_struct->top_level > YAFFS_TNODES_MAX_LEVEL)
+		return NULL;
+
+	if (chunk_id > YAFFS_MAX_CHUNK_ID)
+		return NULL;
+
+	/* First check we're tall enough (ie enough top_level) */
+
+	x = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
+	required_depth = 0;
+	while (x) {
+		x >>= YAFFS_TNODES_INTERNAL_BITS;
+		required_depth++;
+	}
+
+	if (required_depth > file_struct->top_level) {
+		/* Not tall enough, gotta make the tree taller */
+		for (i = file_struct->top_level; i < required_depth; i++) {
+
+			tn = yaffs_get_tnode(dev);
+
+			if (tn) {
+				tn->internal[0] = file_struct->top;
+				file_struct->top = tn;
+				file_struct->top_level++;
+			} else {
+				yaffs_trace(YAFFS_TRACE_ERROR,
+					"yaffs: no more tnodes");
+				return NULL;
+			}
+		}
+	}
+
+	/* Traverse down to level 0, adding anything we need */
+
+	l = file_struct->top_level;
+	tn = file_struct->top;
+
+	if (l > 0) {
+		while (l > 0 && tn) {
+			x = (chunk_id >>
+			     (YAFFS_TNODES_LEVEL0_BITS +
+			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
+			    YAFFS_TNODES_INTERNAL_MASK;
+
+			if ((l > 1) && !tn->internal[x]) {
+				/* Add missing non-level-zero tnode */
+				tn->internal[x] = yaffs_get_tnode(dev);
+				if (!tn->internal[x])
+					return NULL;
+			} else if (l == 1) {
+				/* Looking from level 1 at level 0 */
+				if (passed_tn) {
+					/* If we already have one, release it */
+					if (tn->internal[x])
+						yaffs_free_tnode(dev,
+							tn->internal[x]);
+					tn->internal[x] = passed_tn;
+
+				} else if (!tn->internal[x]) {
+					/* Don't have one, none passed in */
+					tn->internal[x] = yaffs_get_tnode(dev);
+					if (!tn->internal[x])
+						return NULL;
+				}
+			}
+
+			tn = tn->internal[x];
+			l--;
+		}
+	} else {
+		/* top is level 0 */
+		if (passed_tn) {
+			memcpy(tn, passed_tn,
+			       (dev->tnode_width * YAFFS_NTNODES_LEVEL0) / 8);
+			yaffs_free_tnode(dev, passed_tn);
+		}
+	}
+
+	return tn;
+}
+
+static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id,
+			    int chunk_obj)
+{
+	return (tags->chunk_id == chunk_obj &&
+		tags->obj_id == obj_id &&
+		!tags->is_deleted) ? 1 : 0;
+
+}
+
+static int yaffs_find_chunk_in_group(struct yaffs_dev *dev, int the_chunk,
+					struct yaffs_ext_tags *tags, int obj_id,
+					int inode_chunk)
+{
+	int j;
+
+	for (j = 0; the_chunk && j < dev->chunk_grp_size; j++) {
+		if (yaffs_check_chunk_bit
+		    (dev, the_chunk / dev->param.chunks_per_block,
+		     the_chunk % dev->param.chunks_per_block)) {
+
+			if (dev->chunk_grp_size == 1)
+				return the_chunk;
+			else {
+				yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
+							 tags);
+				if (yaffs_tags_match(tags,
+							obj_id, inode_chunk)) {
+					/* found it; */
+					return the_chunk;
+				}
+			}
+		}
+		the_chunk++;
+	}
+	return -1;
+}
+
+int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
+				    struct yaffs_ext_tags *tags)
+{
+	/*Get the Tnode, then get the level 0 offset chunk offset */
+	struct yaffs_tnode *tn;
+	int the_chunk = -1;
+	struct yaffs_ext_tags local_tags;
+	int ret_val = -1;
+	struct yaffs_dev *dev = in->my_dev;
+
+	if (!tags) {
+		/* Passed a NULL, so use our own tags space */
+		tags = &local_tags;
+	}
+
+	tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
+
+	if (!tn)
+		return ret_val;
+
+	the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
+	ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
+					      inode_chunk);
+	return ret_val;
+}
+
+static int yaffs_find_del_file_chunk(struct yaffs_obj *in, int inode_chunk,
+				     struct yaffs_ext_tags *tags)
+{
+	/* Get the Tnode, then get the level 0 offset chunk offset */
+	struct yaffs_tnode *tn;
+	int the_chunk = -1;
+	struct yaffs_ext_tags local_tags;
+	struct yaffs_dev *dev = in->my_dev;
+	int ret_val = -1;
+
+	if (!tags) {
+		/* Passed a NULL, so use our own tags space */
+		tags = &local_tags;
+	}
+
+	tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
+
+	if (!tn)
+		return ret_val;
+
+	the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
+	ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
+					      inode_chunk);
+
+	/* Delete the entry in the filestructure (if found) */
+	if (ret_val != -1)
+		yaffs_load_tnode_0(dev, tn, inode_chunk, 0);
+
+	return ret_val;
+}
+
+int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
+			    int nand_chunk, int in_scan)
+{
+	/* NB in_scan is zero unless scanning.
+	 * For forward scanning, in_scan is > 0;
+	 * for backward scanning in_scan is < 0
+	 *
+	 * nand_chunk = 0 is a dummy insert to make sure the tnodes are there.
+	 */
+
+	struct yaffs_tnode *tn;
+	struct yaffs_dev *dev = in->my_dev;
+	int existing_cunk;
+	struct yaffs_ext_tags existing_tags;
+	struct yaffs_ext_tags new_tags;
+	unsigned existing_serial, new_serial;
+
+	if (in->variant_type != YAFFS_OBJECT_TYPE_FILE) {
+		/* Just ignore an attempt at putting a chunk into a non-file
+		 * during scanning.
+		 * If it is not during Scanning then something went wrong!
+		 */
+		if (!in_scan) {
+			yaffs_trace(YAFFS_TRACE_ERROR,
+				"yaffs tragedy:attempt to put data chunk into a non-file"
+				);
+			BUG();
+		}
+
+		yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+		return YAFFS_OK;
+	}
+
+	tn = yaffs_add_find_tnode_0(dev,
+				    &in->variant.file_variant,
+				    inode_chunk, NULL);
+	if (!tn)
+		return YAFFS_FAIL;
+
+	if (!nand_chunk)
+		/* Dummy insert, bail now */
+		return YAFFS_OK;
+
+	existing_cunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
+	if (in_scan != 0) {
+		/* If we're scanning then we need to test for duplicates
+		 * NB This does not need to be efficient since it should only
+		 * happen when the power fails during a write, then only one
+		 * chunk should ever be affected.
+		 *
+		 * Correction for YAFFS2: This could happen quite a lot and we
+		 * need to think about efficiency! TODO
+		 * Update: For backward scanning we don't need to re-read tags
+		 * so this is quite cheap.
+		 */
+
+		if (existing_cunk > 0) {
+			/* NB Right now existing chunk will not be real
+			 * chunk_id if the chunk group size > 1
+			 * thus we have to do a FindChunkInFile to get the
+			 * real chunk id.
+			 *
+			 * We have a duplicate now we need to decide which
+			 * one to use:
+			 *
+			 * Backwards scanning YAFFS2: The old one is what
+			 * we use, dump the new one.
+			 * YAFFS1: Get both sets of tags and compare serial
+			 * numbers.
+			 */
+
+			if (in_scan > 0) {
+				/* Only do this for forward scanning */
+				yaffs_rd_chunk_tags_nand(dev,
+							 nand_chunk,
+							 NULL, &new_tags);
+
+				/* Do a proper find */
+				existing_cunk =
+				    yaffs_find_chunk_in_file(in, inode_chunk,
+							     &existing_tags);
+			}
+
+			if (existing_cunk <= 0) {
+				/*Hoosterman - how did this happen? */
+
+				yaffs_trace(YAFFS_TRACE_ERROR,
+					"yaffs tragedy: existing chunk < 0 in scan"
+					);
+
+			}
+
+			/* NB The deleted flags should be false, otherwise
+			 * the chunks will not be loaded during a scan
+			 */
+
+			if (in_scan > 0) {
+				new_serial = new_tags.serial_number;
+				existing_serial = existing_tags.serial_number;
+			}
+
+			if ((in_scan > 0) &&
+			    (existing_cunk <= 0 ||
+			     ((existing_serial + 1) & 3) == new_serial)) {
+				/* Forward scanning.
+				 * Use new
+				 * Delete the old one and drop through to
+				 * update the tnode
+				 */
+				yaffs_chunk_del(dev, existing_cunk, 1,
+						__LINE__);
+			} else {
+				/* Backward scanning or we want to use the
+				 * existing one
+				 * Delete the new one and return early so that
+				 * the tnode isn't changed
+				 */
+				yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+				return YAFFS_OK;
+			}
+		}
+
+	}
+
+	if (existing_cunk == 0)
+		in->n_data_chunks++;
+
+	yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk);
+
+	return YAFFS_OK;
+}
+
+static void yaffs_soft_del_chunk(struct yaffs_dev *dev, int chunk)
+{
+	struct yaffs_block_info *the_block;
+	unsigned block_no;
+
+	yaffs_trace(YAFFS_TRACE_DELETION, "soft delete chunk %d", chunk);
+
+	block_no = chunk / dev->param.chunks_per_block;
+	the_block = yaffs_get_block_info(dev, block_no);
+	if (the_block) {
+		the_block->soft_del_pages++;
+		dev->n_free_chunks++;
+		yaffs2_update_oldest_dirty_seq(dev, block_no, the_block);
+	}
+}
+
+/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all
+ * the chunks in the file.
+ * All soft deleting does is increment the block's softdelete count and pulls
+ * the chunk out of the tnode.
+ * Thus, essentially this is the same as DeleteWorker except that the chunks
+ * are soft deleted.
+ */
+
+static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn,
+				 u32 level, int chunk_offset)
+{
+	int i;
+	int the_chunk;
+	int all_done = 1;
+	struct yaffs_dev *dev = in->my_dev;
+
+	if (!tn)
+		return 1;
+
+	if (level > 0) {
+		for (i = YAFFS_NTNODES_INTERNAL - 1;
+			all_done && i >= 0;
+			i--) {
+			if (tn->internal[i]) {
+				all_done =
+				    yaffs_soft_del_worker(in,
+					tn->internal[i],
+					level - 1,
+					(chunk_offset <<
+					YAFFS_TNODES_INTERNAL_BITS)
+					+ i);
+				if (all_done) {
+					yaffs_free_tnode(dev,
+						tn->internal[i]);
+					tn->internal[i] = NULL;
+				} else {
+					/* Can this happen? */
+				}
+			}
+		}
+		return (all_done) ? 1 : 0;
+	}
+
+	/* level 0 */
+	 for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
+		the_chunk = yaffs_get_group_base(dev, tn, i);
+		if (the_chunk) {
+			yaffs_soft_del_chunk(dev, the_chunk);
+			yaffs_load_tnode_0(dev, tn, i, 0);
+		}
+	}
+	return 1;
+}
+
+static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj)
+{
+	struct yaffs_dev *dev = obj->my_dev;
+	struct yaffs_obj *parent;
+
+	yaffs_verify_obj_in_dir(obj);
+	parent = obj->parent;
+
+	yaffs_verify_dir(parent);
+
+	if (dev && dev->param.remove_obj_fn)
+		dev->param.remove_obj_fn(obj);
+
+	list_del_init(&obj->siblings);
+	obj->parent = NULL;
+
+	yaffs_verify_dir(parent);
+}
+
+void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj)
+{
+	if (!directory) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"tragedy: Trying to add an object to a null pointer directory"
+			);
+		BUG();
+		return;
+	}
+	if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"tragedy: Trying to add an object to a non-directory"
+			);
+		BUG();
+	}
+
+	if (obj->siblings.prev == NULL) {
+		/* Not initialised */
+		BUG();
+	}
+
+	yaffs_verify_dir(directory);
+
+	yaffs_remove_obj_from_dir(obj);
+
+	/* Now add it */
+	list_add(&obj->siblings, &directory->variant.dir_variant.children);
+	obj->parent = directory;
+
+	if (directory == obj->my_dev->unlinked_dir
+	    || directory == obj->my_dev->del_dir) {
+		obj->unlinked = 1;
+		obj->my_dev->n_unlinked_files++;
+		obj->rename_allowed = 0;
+	}
+
+	yaffs_verify_dir(directory);
+	yaffs_verify_obj_in_dir(obj);
+}
+
+static int yaffs_change_obj_name(struct yaffs_obj *obj,
+				 struct yaffs_obj *new_dir,
+				 const YCHAR *new_name, int force, int shadows)
+{
+	int unlink_op;
+	int del_op;
+	struct yaffs_obj *existing_target;
+
+	if (new_dir == NULL)
+		new_dir = obj->parent;	/* use the old directory */
+
+	if (new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"tragedy: yaffs_change_obj_name: new_dir is not a directory"
+			);
+		BUG();
+	}
+
+	unlink_op = (new_dir == obj->my_dev->unlinked_dir);
+	del_op = (new_dir == obj->my_dev->del_dir);
+
+	existing_target = yaffs_find_by_name(new_dir, new_name);
+
+	/* If the object is a file going into the unlinked directory,
+	 *   then it is OK to just stuff it in since duplicate names are OK.
+	 *   else only proceed if the new name does not exist and we're putting
+	 *   it into a directory.
+	 */
+	if (!(unlink_op || del_op || force ||
+	      shadows > 0 || !existing_target) ||
+	      new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+		return YAFFS_FAIL;
+
+	yaffs_set_obj_name(obj, new_name);
+	obj->dirty = 1;
+	yaffs_add_obj_to_dir(new_dir, obj);
+
+	if (unlink_op)
+		obj->unlinked = 1;
+
+	/* If it is a deletion then we mark it as a shrink for gc  */
+	if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >= 0)
+		return YAFFS_OK;
+
+	return YAFFS_FAIL;
+}
+
+/*------------------------ Short Operations Cache ------------------------------
+ *   In many situations where there is no high level buffering  a lot of
+ *   reads might be short sequential reads, and a lot of writes may be short
+ *   sequential writes. eg. scanning/writing a jpeg file.
+ *   In these cases, a short read/write cache can provide a huge perfomance
+ *   benefit with dumb-as-a-rock code.
+ *   In Linux, the page cache provides read buffering and the short op cache
+ *   provides write buffering.
+ *
+ *   There are a small number (~10) of cache chunks per device so that we don't
+ *   need a very intelligent search.
+ */
+
+static int yaffs_obj_cache_dirty(struct yaffs_obj *obj)
+{
+	struct yaffs_dev *dev = obj->my_dev;
+	int i;
+	struct yaffs_cache *cache;
+	int n_caches = obj->my_dev->param.n_caches;
+
+	for (i = 0; i < n_caches; i++) {
+		cache = &dev->cache[i];
+		if (cache->object == obj && cache->dirty)
+			return 1;
+	}
+
+	return 0;
+}
+
+static void yaffs_flush_file_cache(struct yaffs_obj *obj)
+{
+	struct yaffs_dev *dev = obj->my_dev;
+	int lowest = -99;	/* Stop compiler whining. */
+	int i;
+	struct yaffs_cache *cache;
+	int chunk_written = 0;
+	int n_caches = obj->my_dev->param.n_caches;
+
+	if (n_caches < 1)
+		return;
+	do {
+		cache = NULL;
+
+		/* Find the lowest dirty chunk for this object */
+		for (i = 0; i < n_caches; i++) {
+			if (dev->cache[i].object == obj &&
+			    dev->cache[i].dirty) {
+				if (!cache ||
+				    dev->cache[i].chunk_id < lowest) {
+					cache = &dev->cache[i];
+					lowest = cache->chunk_id;
+				}
+			}
+		}
+
+		if (cache && !cache->locked) {
+			/* Write it out and free it up */
+			chunk_written =
+			    yaffs_wr_data_obj(cache->object,
+					      cache->chunk_id,
+					      cache->data,
+					      cache->n_bytes, 1);
+			cache->dirty = 0;
+			cache->object = NULL;
+		}
+	} while (cache && chunk_written > 0);
+
+	if (cache)
+		/* Hoosterman, disk full while writing cache out. */
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"yaffs tragedy: no space during cache write");
+}
+
+/*yaffs_flush_whole_cache(dev)
+ *
+ *
+ */
+
+void yaffs_flush_whole_cache(struct yaffs_dev *dev)
+{
+	struct yaffs_obj *obj;
+	int n_caches = dev->param.n_caches;
+	int i;
+
+	/* Find a dirty object in the cache and flush it...
+	 * until there are no further dirty objects.
+	 */
+	do {
+		obj = NULL;
+		for (i = 0; i < n_caches && !obj; i++) {
+			if (dev->cache[i].object && dev->cache[i].dirty)
+				obj = dev->cache[i].object;
+		}
+		if (obj)
+			yaffs_flush_file_cache(obj);
+	} while (obj);
+
+}
+
+/* Grab us a cache chunk for use.
+ * First look for an empty one.
+ * Then look for the least recently used non-dirty one.
+ * Then look for the least recently used dirty one...., flush and look again.
+ */
+static struct yaffs_cache *yaffs_grab_chunk_worker(struct yaffs_dev *dev)
+{
+	int i;
+
+	if (dev->param.n_caches > 0) {
+		for (i = 0; i < dev->param.n_caches; i++) {
+			if (!dev->cache[i].object)
+				return &dev->cache[i];
+		}
+	}
+	return NULL;
+}
+
+static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev)
+{
+	struct yaffs_cache *cache;
+	struct yaffs_obj *the_obj;
+	int usage;
+	int i;
+	int pushout;
+
+	if (dev->param.n_caches < 1)
+		return NULL;
+
+	/* Try find a non-dirty one... */
+
+	cache = yaffs_grab_chunk_worker(dev);
+
+	if (!cache) {
+		/* They were all dirty, find the LRU object and flush
+		 * its cache, then  find again.
+		 * NB what's here is not very accurate,
+		 * we actually flush the object with the LRU chunk.
+		 */
+
+		/* With locking we can't assume we can use entry zero,
+		 * Set the_obj to a valid pointer for Coverity. */
+		the_obj = dev->cache[0].object;
+		usage = -1;
+		cache = NULL;
+		pushout = -1;
+
+		for (i = 0; i < dev->param.n_caches; i++) {
+			if (dev->cache[i].object &&
+			    !dev->cache[i].locked &&
+			    (dev->cache[i].last_use < usage ||
+			    !cache)) {
+				usage = dev->cache[i].last_use;
+				the_obj = dev->cache[i].object;
+				cache = &dev->cache[i];
+				pushout = i;
+			}
+		}
+
+		if (!cache || cache->dirty) {
+			/* Flush and try again */
+			yaffs_flush_file_cache(the_obj);
+			cache = yaffs_grab_chunk_worker(dev);
+		}
+	}
+	return cache;
+}
+
+/* Find a cached chunk */
+static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj,
+						  int chunk_id)
+{
+	struct yaffs_dev *dev = obj->my_dev;
+	int i;
+
+	if (dev->param.n_caches < 1)
+		return NULL;
+
+	for (i = 0; i < dev->param.n_caches; i++) {
+		if (dev->cache[i].object == obj &&
+		    dev->cache[i].chunk_id == chunk_id) {
+			dev->cache_hits++;
+
+			return &dev->cache[i];
+		}
+	}
+	return NULL;
+}
+
+/* Mark the chunk for the least recently used algorithym */
+static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache,
+			    int is_write)
+{
+	int i;
+
+	if (dev->param.n_caches < 1)
+		return;
+
+	if (dev->cache_last_use < 0 ||
+		dev->cache_last_use > 100000000) {
+		/* Reset the cache usages */
+		for (i = 1; i < dev->param.n_caches; i++)
+			dev->cache[i].last_use = 0;
+
+		dev->cache_last_use = 0;
+	}
+	dev->cache_last_use++;
+	cache->last_use = dev->cache_last_use;
+
+	if (is_write)
+		cache->dirty = 1;
+}
+
+/* Invalidate a single cache page.
+ * Do this when a whole page gets written,
+ * ie the short cache for this page is no longer valid.
+ */
+static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object, int chunk_id)
+{
+	struct yaffs_cache *cache;
+
+	if (object->my_dev->param.n_caches > 0) {
+		cache = yaffs_find_chunk_cache(object, chunk_id);
+
+		if (cache)
+			cache->object = NULL;
+	}
+}
+
+/* Invalidate all the cache pages associated with this object
+ * Do this whenever ther file is deleted or resized.
+ */
+static void yaffs_invalidate_whole_cache(struct yaffs_obj *in)
+{
+	int i;
+	struct yaffs_dev *dev = in->my_dev;
+
+	if (dev->param.n_caches > 0) {
+		/* Invalidate it. */
+		for (i = 0; i < dev->param.n_caches; i++) {
+			if (dev->cache[i].object == in)
+				dev->cache[i].object = NULL;
+		}
+	}
+}
+
+static void yaffs_unhash_obj(struct yaffs_obj *obj)
+{
+	int bucket;
+	struct yaffs_dev *dev = obj->my_dev;
+
+	/* If it is still linked into the bucket list, free from the list */
+	if (!list_empty(&obj->hash_link)) {
+		list_del_init(&obj->hash_link);
+		bucket = yaffs_hash_fn(obj->obj_id);
+		dev->obj_bucket[bucket].count--;
+	}
+}
+
+/*  FreeObject frees up a Object and puts it back on the free list */
+static void yaffs_free_obj(struct yaffs_obj *obj)
+{
+	struct yaffs_dev *dev;
+
+	if (!obj) {
+		BUG();
+		return;
+	}
+	dev = obj->my_dev;
+	yaffs_trace(YAFFS_TRACE_OS, "FreeObject %p inode %p",
+		obj, obj->my_inode);
+	if (obj->parent)
+		BUG();
+	if (!list_empty(&obj->siblings))
+		BUG();
+
+	if (obj->my_inode) {
+		/* We're still hooked up to a cached inode.
+		 * Don't delete now, but mark for later deletion
+		 */
+		obj->defered_free = 1;
+		return;
+	}
+
+	yaffs_unhash_obj(obj);
+
+	yaffs_free_raw_obj(dev, obj);
+	dev->n_obj--;
+	dev->checkpoint_blocks_required = 0;	/* force recalculation */
+}
+
+void yaffs_handle_defered_free(struct yaffs_obj *obj)
+{
+	if (obj->defered_free)
+		yaffs_free_obj(obj);
+}
+
+static int yaffs_generic_obj_del(struct yaffs_obj *in)
+{
+	/* Iinvalidate the file's data in the cache, without flushing. */
+	yaffs_invalidate_whole_cache(in);
+
+	if (in->my_dev->param.is_yaffs2 && in->parent != in->my_dev->del_dir) {
+		/* Move to unlinked directory so we have a deletion record */
+		yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0,
+				      0);
+	}
+
+	yaffs_remove_obj_from_dir(in);
+	yaffs_chunk_del(in->my_dev, in->hdr_chunk, 1, __LINE__);
+	in->hdr_chunk = 0;
+
+	yaffs_free_obj(in);
+	return YAFFS_OK;
+
+}
+
+static void yaffs_soft_del_file(struct yaffs_obj *obj)
+{
+	if (!obj->deleted ||
+	    obj->variant_type != YAFFS_OBJECT_TYPE_FILE ||
+	    obj->soft_del)
+		return;
+
+	if (obj->n_data_chunks <= 0) {
+		/* Empty file with no duplicate object headers,
+		 * just delete it immediately */
+		yaffs_free_tnode(obj->my_dev, obj->variant.file_variant.top);
+		obj->variant.file_variant.top = NULL;
+		yaffs_trace(YAFFS_TRACE_TRACING,
+			"yaffs: Deleting empty file %d",
+			obj->obj_id);
+		yaffs_generic_obj_del(obj);
+	} else {
+		yaffs_soft_del_worker(obj,
+				      obj->variant.file_variant.top,
+				      obj->variant.
+				      file_variant.top_level, 0);
+		obj->soft_del = 1;
+	}
+}
+
+/* Pruning removes any part of the file structure tree that is beyond the
+ * bounds of the file (ie that does not point to chunks).
+ *
+ * A file should only get pruned when its size is reduced.
+ *
+ * Before pruning, the chunks must be pulled from the tree and the
+ * level 0 tnode entries must be zeroed out.
+ * Could also use this for file deletion, but that's probably better handled
+ * by a special case.
+ *
+ * This function is recursive. For levels > 0 the function is called again on
+ * any sub-tree. For level == 0 we just check if the sub-tree has data.
+ * If there is no data in a subtree then it is pruned.
+ */
+
+static struct yaffs_tnode *yaffs_prune_worker(struct yaffs_dev *dev,
+					      struct yaffs_tnode *tn, u32 level,
+					      int del0)
+{
+	int i;
+	int has_data;
+
+	if (!tn)
+		return tn;
+
+	has_data = 0;
+
+	if (level > 0) {
+		for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
+			if (tn->internal[i]) {
+				tn->internal[i] =
+				    yaffs_prune_worker(dev,
+						tn->internal[i],
+						level - 1,
+						(i == 0) ? del0 : 1);
+			}
+
+			if (tn->internal[i])
+				has_data++;
+		}
+	} else {
+		int tnode_size_u32 = dev->tnode_size / sizeof(u32);
+		u32 *map = (u32 *) tn;
+
+		for (i = 0; !has_data && i < tnode_size_u32; i++) {
+			if (map[i])
+				has_data++;
+		}
+	}
+
+	if (has_data == 0 && del0) {
+		/* Free and return NULL */
+		yaffs_free_tnode(dev, tn);
+		tn = NULL;
+	}
+	return tn;
+}
+
+static int yaffs_prune_tree(struct yaffs_dev *dev,
+			    struct yaffs_file_var *file_struct)
+{
+	int i;
+	int has_data;
+	int done = 0;
+	struct yaffs_tnode *tn;
+
+	if (file_struct->top_level < 1)
+		return YAFFS_OK;
+
+	file_struct->top =
+	   yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 0);
+
+	/* Now we have a tree with all the non-zero branches NULL but
+	 * the height is the same as it was.
+	 * Let's see if we can trim internal tnodes to shorten the tree.
+	 * We can do this if only the 0th element in the tnode is in use
+	 * (ie all the non-zero are NULL)
+	 */
+
+	while (file_struct->top_level && !done) {
+		tn = file_struct->top;
+
+		has_data = 0;
+		for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
+			if (tn->internal[i])
+				has_data++;
+		}
+
+		if (!has_data) {
+			file_struct->top = tn->internal[0];
+			file_struct->top_level--;
+			yaffs_free_tnode(dev, tn);
+		} else {
+			done = 1;
+		}
+	}
+
+	return YAFFS_OK;
+}
+
+/*-------------------- End of File Structure functions.-------------------*/
+
+/* alloc_empty_obj gets us a clean Object.*/
+static struct yaffs_obj *yaffs_alloc_empty_obj(struct yaffs_dev *dev)
+{
+	struct yaffs_obj *obj = yaffs_alloc_raw_obj(dev);
+
+	if (!obj)
+		return obj;
+
+	dev->n_obj++;
+
+	/* Now sweeten it up... */
+
+	memset(obj, 0, sizeof(struct yaffs_obj));
+	obj->being_created = 1;
+
+	obj->my_dev = dev;
+	obj->hdr_chunk = 0;
+	obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN;
+	INIT_LIST_HEAD(&(obj->hard_links));
+	INIT_LIST_HEAD(&(obj->hash_link));
+	INIT_LIST_HEAD(&obj->siblings);
+
+	/* Now make the directory sane */
+	if (dev->root_dir) {
+		obj->parent = dev->root_dir;
+		list_add(&(obj->siblings),
+			 &dev->root_dir->variant.dir_variant.children);
+	}
+
+	/* Add it to the lost and found directory.
+	 * NB Can't put root or lost-n-found in lost-n-found so
+	 * check if lost-n-found exists first
+	 */
+	if (dev->lost_n_found)
+		yaffs_add_obj_to_dir(dev->lost_n_found, obj);
+
+	obj->being_created = 0;
+
+	dev->checkpoint_blocks_required = 0;	/* force recalculation */
+
+	return obj;
+}
+
+static int yaffs_find_nice_bucket(struct yaffs_dev *dev)
+{
+	int i;
+	int l = 999;
+	int lowest = 999999;
+
+	/* Search for the shortest list or one that
+	 * isn't too long.
+	 */
+
+	for (i = 0; i < 10 && lowest > 4; i++) {
+		dev->bucket_finder++;
+		dev->bucket_finder %= YAFFS_NOBJECT_BUCKETS;
+		if (dev->obj_bucket[dev->bucket_finder].count < lowest) {
+			lowest = dev->obj_bucket[dev->bucket_finder].count;
+			l = dev->bucket_finder;
+		}
+	}
+
+	return l;
+}
+
+static int yaffs_new_obj_id(struct yaffs_dev *dev)
+{
+	int bucket = yaffs_find_nice_bucket(dev);
+	int found = 0;
+	struct list_head *i;
+	u32 n = (u32) bucket;
+
+	/* Now find an object value that has not already been taken
+	 * by scanning the list.
+	 */
+
+	while (!found) {
+		found = 1;
+		n += YAFFS_NOBJECT_BUCKETS;
+		if (1 || dev->obj_bucket[bucket].count > 0) {
+			list_for_each(i, &dev->obj_bucket[bucket].list) {
+				/* If there is already one in the list */
+				if (i && list_entry(i, struct yaffs_obj,
+						    hash_link)->obj_id == n) {
+					found = 0;
+				}
+			}
+		}
+	}
+	return n;
+}
+
+static void yaffs_hash_obj(struct yaffs_obj *in)
+{
+	int bucket = yaffs_hash_fn(in->obj_id);
+	struct yaffs_dev *dev = in->my_dev;
+
+	list_add(&in->hash_link, &dev->obj_bucket[bucket].list);
+	dev->obj_bucket[bucket].count++;
+}
+
+struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number)
+{
+	int bucket = yaffs_hash_fn(number);
+	struct list_head *i;
+	struct yaffs_obj *in;
+
+	list_for_each(i, &dev->obj_bucket[bucket].list) {
+		/* Look if it is in the list */
+		in = list_entry(i, struct yaffs_obj, hash_link);
+		if (in->obj_id == number) {
+			/* Don't show if it is defered free */
+			if (in->defered_free)
+				return NULL;
+			return in;
+		}
+	}
+
+	return NULL;
+}
+
+static struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
+				enum yaffs_obj_type type)
+{
+	struct yaffs_obj *the_obj = NULL;
+	struct yaffs_tnode *tn = NULL;
+
+	if (number < 0)
+		number = yaffs_new_obj_id(dev);
+
+	if (type == YAFFS_OBJECT_TYPE_FILE) {
+		tn = yaffs_get_tnode(dev);
+		if (!tn)
+			return NULL;
+	}
+
+	the_obj = yaffs_alloc_empty_obj(dev);
+	if (!the_obj) {
+		if (tn)
+			yaffs_free_tnode(dev, tn);
+		return NULL;
+	}
+
+	the_obj->fake = 0;
+	the_obj->rename_allowed = 1;
+	the_obj->unlink_allowed = 1;
+	the_obj->obj_id = number;
+	yaffs_hash_obj(the_obj);
+	the_obj->variant_type = type;
+	yaffs_load_current_time(the_obj, 1, 1);
+
+	switch (type) {
+	case YAFFS_OBJECT_TYPE_FILE:
+		the_obj->variant.file_variant.file_size = 0;
+		the_obj->variant.file_variant.scanned_size = 0;
+		the_obj->variant.file_variant.shrink_size =
+						yaffs_max_file_size(dev);
+		the_obj->variant.file_variant.top_level = 0;
+		the_obj->variant.file_variant.top = tn;
+		break;
+	case YAFFS_OBJECT_TYPE_DIRECTORY:
+		INIT_LIST_HEAD(&the_obj->variant.dir_variant.children);
+		INIT_LIST_HEAD(&the_obj->variant.dir_variant.dirty);
+		break;
+	case YAFFS_OBJECT_TYPE_SYMLINK:
+	case YAFFS_OBJECT_TYPE_HARDLINK:
+	case YAFFS_OBJECT_TYPE_SPECIAL:
+		/* No action required */
+		break;
+	case YAFFS_OBJECT_TYPE_UNKNOWN:
+		/* todo this should not happen */
+		break;
+	}
+	return the_obj;
+}
+
+static struct yaffs_obj *yaffs_create_fake_dir(struct yaffs_dev *dev,
+					       int number, u32 mode)
+{
+
+	struct yaffs_obj *obj =
+	    yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
+
+	if (!obj)
+		return NULL;
+
+	obj->fake = 1;	/* it is fake so it might not use NAND */
+	obj->rename_allowed = 0;
+	obj->unlink_allowed = 0;
+	obj->deleted = 0;
+	obj->unlinked = 0;
+	obj->yst_mode = mode;
+	obj->my_dev = dev;
+	obj->hdr_chunk = 0;	/* Not a valid chunk. */
+	return obj;
+
+}
+
+
+static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev)
+{
+	int i;
+
+	dev->n_obj = 0;
+	dev->n_tnodes = 0;
+	yaffs_init_raw_tnodes_and_objs(dev);
+
+	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+		INIT_LIST_HEAD(&dev->obj_bucket[i].list);
+		dev->obj_bucket[i].count = 0;
+	}
+}
+
+struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
+						 int number,
+						 enum yaffs_obj_type type)
+{
+	struct yaffs_obj *the_obj = NULL;
+
+	if (number > 0)
+		the_obj = yaffs_find_by_number(dev, number);
+
+	if (!the_obj)
+		the_obj = yaffs_new_obj(dev, number, type);
+
+	return the_obj;
+
+}
+
+YCHAR *yaffs_clone_str(const YCHAR *str)
+{
+	YCHAR *new_str = NULL;
+	int len;
+
+	if (!str)
+		str = _Y("");
+
+	len = strnlen(str, YAFFS_MAX_ALIAS_LENGTH);
+	new_str = kmalloc((len + 1) * sizeof(YCHAR), GFP_NOFS);
+	if (new_str) {
+		strncpy(new_str, str, len);
+		new_str[len] = 0;
+	}
+	return new_str;
+
+}
+/*
+ *yaffs_update_parent() handles fixing a directories mtime and ctime when a new
+ * link (ie. name) is created or deleted in the directory.
+ *
+ * ie.
+ *   create dir/a : update dir's mtime/ctime
+ *   rm dir/a:   update dir's mtime/ctime
+ *   modify dir/a: don't update dir's mtimme/ctime
+ *
+ * This can be handled immediately or defered. Defering helps reduce the number
+ * of updates when many files in a directory are changed within a brief period.
+ *
+ * If the directory updating is defered then yaffs_update_dirty_dirs must be
+ * called periodically.
+ */
+
+static void yaffs_update_parent(struct yaffs_obj *obj)
+{
+	struct yaffs_dev *dev;
+
+	if (!obj)
+		return;
+	dev = obj->my_dev;
+	obj->dirty = 1;
+	yaffs_load_current_time(obj, 0, 1);
+	if (dev->param.defered_dir_update) {
+		struct list_head *link = &obj->variant.dir_variant.dirty;
+
+		if (list_empty(link)) {
+			list_add(link, &dev->dirty_dirs);
+			yaffs_trace(YAFFS_TRACE_BACKGROUND,
+			  "Added object %d to dirty directories",
+			   obj->obj_id);
+		}
+
+	} else {
+		yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
+	}
+}
+
+void yaffs_update_dirty_dirs(struct yaffs_dev *dev)
+{
+	struct list_head *link;
+	struct yaffs_obj *obj;
+	struct yaffs_dir_var *d_s;
+	union yaffs_obj_var *o_v;
+
+	yaffs_trace(YAFFS_TRACE_BACKGROUND, "Update dirty directories");
+
+	while (!list_empty(&dev->dirty_dirs)) {
+		link = dev->dirty_dirs.next;
+		list_del_init(link);
+
+		d_s = list_entry(link, struct yaffs_dir_var, dirty);
+		o_v = list_entry(d_s, union yaffs_obj_var, dir_variant);
+		obj = list_entry(o_v, struct yaffs_obj, variant);
+
+		yaffs_trace(YAFFS_TRACE_BACKGROUND, "Update directory %d",
+			obj->obj_id);
+
+		if (obj->dirty)
+			yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
+	}
+}
+
+/*
+ * Mknod (create) a new object.
+ * equiv_obj only has meaning for a hard link;
+ * alias_str only has meaning for a symlink.
+ * rdev only has meaning for devices (a subset of special objects)
+ */
+
+static struct yaffs_obj *yaffs_create_obj(enum yaffs_obj_type type,
+					  struct yaffs_obj *parent,
+					  const YCHAR *name,
+					  u32 mode,
+					  u32 uid,
+					  u32 gid,
+					  struct yaffs_obj *equiv_obj,
+					  const YCHAR *alias_str, u32 rdev)
+{
+	struct yaffs_obj *in;
+	YCHAR *str = NULL;
+	struct yaffs_dev *dev = parent->my_dev;
+
+	/* Check if the entry exists.
+	 * If it does then fail the call since we don't want a dup. */
+	if (yaffs_find_by_name(parent, name))
+		return NULL;
+
+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
+		str = yaffs_clone_str(alias_str);
+		if (!str)
+			return NULL;
+	}
+
+	in = yaffs_new_obj(dev, -1, type);
+
+	if (!in) {
+		kfree(str);
+		return NULL;
+	}
+
+	in->hdr_chunk = 0;
+	in->valid = 1;
+	in->variant_type = type;
+
+	in->yst_mode = mode;
+
+	yaffs_attribs_init(in, gid, uid, rdev);
+
+	in->n_data_chunks = 0;
+
+	yaffs_set_obj_name(in, name);
+	in->dirty = 1;
+
+	yaffs_add_obj_to_dir(parent, in);
+
+	in->my_dev = parent->my_dev;
+
+	switch (type) {
+	case YAFFS_OBJECT_TYPE_SYMLINK:
+		in->variant.symlink_variant.alias = str;
+		break;
+	case YAFFS_OBJECT_TYPE_HARDLINK:
+		in->variant.hardlink_variant.equiv_obj = equiv_obj;
+		in->variant.hardlink_variant.equiv_id = equiv_obj->obj_id;
+		list_add(&in->hard_links, &equiv_obj->hard_links);
+		break;
+	case YAFFS_OBJECT_TYPE_FILE:
+	case YAFFS_OBJECT_TYPE_DIRECTORY:
+	case YAFFS_OBJECT_TYPE_SPECIAL:
+	case YAFFS_OBJECT_TYPE_UNKNOWN:
+		/* do nothing */
+		break;
+	}
+
+	if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) {
+		/* Could not create the object header, fail */
+		yaffs_del_obj(in);
+		in = NULL;
+	}
+
+	if (in)
+		yaffs_update_parent(parent);
+
+	return in;
+}
+
+struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
+				    const YCHAR *name, u32 mode, u32 uid,
+				    u32 gid)
+{
+	return yaffs_create_obj(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
+				uid, gid, NULL, NULL, 0);
+}
+
+struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR *name,
+				   u32 mode, u32 uid, u32 gid)
+{
+	return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
+				mode, uid, gid, NULL, NULL, 0);
+}
+
+struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent,
+				       const YCHAR *name, u32 mode, u32 uid,
+				       u32 gid, u32 rdev)
+{
+	return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
+				uid, gid, NULL, NULL, rdev);
+}
+
+struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
+				       const YCHAR *name, u32 mode, u32 uid,
+				       u32 gid, const YCHAR *alias)
+{
+	return yaffs_create_obj(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
+				uid, gid, NULL, alias, 0);
+}
+
+/* yaffs_link_obj returns the object id of the equivalent object.*/
+struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR * name,
+				 struct yaffs_obj *equiv_obj)
+{
+	/* Get the real object in case we were fed a hard link obj */
+	equiv_obj = yaffs_get_equivalent_obj(equiv_obj);
+
+	if (yaffs_create_obj(YAFFS_OBJECT_TYPE_HARDLINK,
+			parent, name, 0, 0, 0,
+			equiv_obj, NULL, 0))
+		return equiv_obj;
+
+	return NULL;
+
+}
+
+
+
+/*---------------------- Block Management and Page Allocation -------------*/
+
+static void yaffs_deinit_blocks(struct yaffs_dev *dev)
+{
+	if (dev->block_info_alt && dev->block_info)
+		vfree(dev->block_info);
+	else
+		kfree(dev->block_info);
+
+	dev->block_info_alt = 0;
+
+	dev->block_info = NULL;
+
+	if (dev->chunk_bits_alt && dev->chunk_bits)
+		vfree(dev->chunk_bits);
+	else
+		kfree(dev->chunk_bits);
+	dev->chunk_bits_alt = 0;
+	dev->chunk_bits = NULL;
+}
+
+static int yaffs_init_blocks(struct yaffs_dev *dev)
+{
+	int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
+
+	dev->block_info = NULL;
+	dev->chunk_bits = NULL;
+	dev->alloc_block = -1;	/* force it to get a new one */
+
+	/* If the first allocation strategy fails, thry the alternate one */
+	dev->block_info =
+		kmalloc(n_blocks * sizeof(struct yaffs_block_info), GFP_NOFS);
+	if (!dev->block_info) {
+		dev->block_info =
+		    vmalloc(n_blocks * sizeof(struct yaffs_block_info));
+		dev->block_info_alt = 1;
+	} else {
+		dev->block_info_alt = 0;
+	}
+
+	if (!dev->block_info)
+		goto alloc_error;
+
+	/* Set up dynamic blockinfo stuff. Round up bytes. */
+	dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8;
+	dev->chunk_bits =
+		kmalloc(dev->chunk_bit_stride * n_blocks, GFP_NOFS);
+	if (!dev->chunk_bits) {
+		dev->chunk_bits =
+		    vmalloc(dev->chunk_bit_stride * n_blocks);
+		dev->chunk_bits_alt = 1;
+	} else {
+		dev->chunk_bits_alt = 0;
+	}
+	if (!dev->chunk_bits)
+		goto alloc_error;
+
+
+	memset(dev->block_info, 0, n_blocks * sizeof(struct yaffs_block_info));
+	memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks);
+	return YAFFS_OK;
+
+alloc_error:
+	yaffs_deinit_blocks(dev);
+	return YAFFS_FAIL;
+}
+
+
+void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no)
+{
+	struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no);
+	int erased_ok = 0;
+	int i;
+
+	/* If the block is still healthy erase it and mark as clean.
+	 * If the block has had a data failure, then retire it.
+	 */
+
+	yaffs_trace(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
+		"yaffs_block_became_dirty block %d state %d %s",
+		block_no, bi->block_state,
+		(bi->needs_retiring) ? "needs retiring" : "");
+
+	yaffs2_clear_oldest_dirty_seq(dev, bi);
+
+	bi->block_state = YAFFS_BLOCK_STATE_DIRTY;
+
+	/* If this is the block being garbage collected then stop gc'ing */
+	if (block_no == dev->gc_block)
+		dev->gc_block = 0;
+
+	/* If this block is currently the best candidate for gc
+	 * then drop as a candidate */
+	if (block_no == dev->gc_dirtiest) {
+		dev->gc_dirtiest = 0;
+		dev->gc_pages_in_use = 0;
+	}
+
+	if (!bi->needs_retiring) {
+		yaffs2_checkpt_invalidate(dev);
+		erased_ok = yaffs_erase_block(dev, block_no);
+		if (!erased_ok) {
+			dev->n_erase_failures++;
+			yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+			  "**>> Erasure failed %d", block_no);
+		}
+	}
+
+	/* Verify erasure if needed */
+	if (erased_ok &&
+	    ((yaffs_trace_mask & YAFFS_TRACE_ERASE) ||
+	     !yaffs_skip_verification(dev))) {
+		for (i = 0; i < dev->param.chunks_per_block; i++) {
+			if (!yaffs_check_chunk_erased(dev,
+				block_no * dev->param.chunks_per_block + i)) {
+				yaffs_trace(YAFFS_TRACE_ERROR,
+					">>Block %d erasure supposedly OK, but chunk %d not erased",
+					block_no, i);
+			}
+		}
+	}
+
+	if (!erased_ok) {
+		/* We lost a block of free space */
+		dev->n_free_chunks -= dev->param.chunks_per_block;
+		yaffs_retire_block(dev, block_no);
+		yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+			"**>> Block %d retired", block_no);
+		return;
+	}
+
+	/* Clean it up... */
+	bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
+	bi->seq_number = 0;
+	dev->n_erased_blocks++;
+	bi->pages_in_use = 0;
+	bi->soft_del_pages = 0;
+	bi->has_shrink_hdr = 0;
+	bi->skip_erased_check = 1;	/* Clean, so no need to check */
+	bi->gc_prioritise = 0;
+	bi->has_summary = 0;
+
+	yaffs_clear_chunk_bits(dev, block_no);
+
+	yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no);
+}
+
+static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev,
+					struct yaffs_block_info *bi,
+					int old_chunk, u8 *buffer)
+{
+	int new_chunk;
+	int mark_flash = 1;
+	struct yaffs_ext_tags tags;
+	struct yaffs_obj *object;
+	int matching_chunk;
+	int ret_val = YAFFS_OK;
+
+	memset(&tags, 0, sizeof(tags));
+	yaffs_rd_chunk_tags_nand(dev, old_chunk,
+				 buffer, &tags);
+	object = yaffs_find_by_number(dev, tags.obj_id);
+
+	yaffs_trace(YAFFS_TRACE_GC_DETAIL,
+		"Collecting chunk in block %d, %d %d %d ",
+		dev->gc_chunk, tags.obj_id,
+		tags.chunk_id, tags.n_bytes);
+
+	if (object && !yaffs_skip_verification(dev)) {
+		if (tags.chunk_id == 0)
+			matching_chunk =
+			    object->hdr_chunk;
+		else if (object->soft_del)
+			/* Defeat the test */
+			matching_chunk = old_chunk;
+		else
+			matching_chunk =
+			    yaffs_find_chunk_in_file
+			    (object, tags.chunk_id,
+			     NULL);
+
+		if (old_chunk != matching_chunk)
+			yaffs_trace(YAFFS_TRACE_ERROR,
+				"gc: page in gc mismatch: %d %d %d %d",
+				old_chunk,
+				matching_chunk,
+				tags.obj_id,
+				tags.chunk_id);
+	}
+
+	if (!object) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"page %d in gc has no object: %d %d %d ",
+			old_chunk,
+			tags.obj_id, tags.chunk_id,
+			tags.n_bytes);
+	}
+
+	if (object &&
+	    object->deleted &&
+	    object->soft_del && tags.chunk_id != 0) {
+		/* Data chunk in a soft deleted file,
+		 * throw it away.
+		 * It's a soft deleted data chunk,
+		 * No need to copy this, just forget
+		 * about it and fix up the object.
+		 */
+
+		/* Free chunks already includes
+		 * softdeleted chunks, how ever this
+		 * chunk is going to soon be really
+		 * deleted which will increment free
+		 * chunks. We have to decrement free
+		 * chunks so this works out properly.
+		 */
+		dev->n_free_chunks--;
+		bi->soft_del_pages--;
+
+		object->n_data_chunks--;
+		if (object->n_data_chunks <= 0) {
+			/* remeber to clean up obj */
+			dev->gc_cleanup_list[dev->n_clean_ups] = tags.obj_id;
+			dev->n_clean_ups++;
+		}
+		mark_flash = 0;
+	} else if (object) {
+		/* It's either a data chunk in a live
+		 * file or an ObjectHeader, so we're
+		 * interested in it.
+		 * NB Need to keep the ObjectHeaders of
+		 * deleted files until the whole file
+		 * has been deleted off
+		 */
+		tags.serial_number++;
+		dev->n_gc_copies++;
+
+		if (tags.chunk_id == 0) {
+			/* It is an object Id,
+			 * We need to nuke the
+			 * shrinkheader flags since its
+			 * work is done.
+			 * Also need to clean up
+			 * shadowing.
+			 */
+			struct yaffs_obj_hdr *oh;
+			oh = (struct yaffs_obj_hdr *) buffer;
+
+			oh->is_shrink = 0;
+			tags.extra_is_shrink = 0;
+			oh->shadows_obj = 0;
+			oh->inband_shadowed_obj_id = 0;
+			tags.extra_shadows = 0;
+
+			/* Update file size */
+			if (object->variant_type == YAFFS_OBJECT_TYPE_FILE) {
+				yaffs_oh_size_load(oh,
+				    object->variant.file_variant.file_size);
+				tags.extra_file_size =
+				    object->variant.file_variant.file_size;
+			}
+
+			yaffs_verify_oh(object, oh, &tags, 1);
+			new_chunk =
+			    yaffs_write_new_chunk(dev, (u8 *) oh, &tags, 1);
+		} else {
+			new_chunk =
+			    yaffs_write_new_chunk(dev, buffer, &tags, 1);
+		}
+
+		if (new_chunk < 0) {
+			ret_val = YAFFS_FAIL;
+		} else {
+
+			/* Now fix up the Tnodes etc. */
+
+			if (tags.chunk_id == 0) {
+				/* It's a header */
+				object->hdr_chunk = new_chunk;
+				object->serial = tags.serial_number;
+			} else {
+				/* It's a data chunk */
+				yaffs_put_chunk_in_file(object, tags.chunk_id,
+							new_chunk, 0);
+			}
+		}
+	}
+	if (ret_val == YAFFS_OK)
+		yaffs_chunk_del(dev, old_chunk, mark_flash, __LINE__);
+	return ret_val;
+}
+
+static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block)
+{
+	int old_chunk;
+	int ret_val = YAFFS_OK;
+	int i;
+	int is_checkpt_block;
+	int max_copies;
+	int chunks_before = yaffs_get_erased_chunks(dev);
+	int chunks_after;
+	struct yaffs_block_info *bi = yaffs_get_block_info(dev, block);
+
+	is_checkpt_block = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT);
+
+	yaffs_trace(YAFFS_TRACE_TRACING,
+		"Collecting block %d, in use %d, shrink %d, whole_block %d",
+		block, bi->pages_in_use, bi->has_shrink_hdr,
+		whole_block);
+
+	/*yaffs_verify_free_chunks(dev); */
+
+	if (bi->block_state == YAFFS_BLOCK_STATE_FULL)
+		bi->block_state = YAFFS_BLOCK_STATE_COLLECTING;
+
+	bi->has_shrink_hdr = 0;	/* clear the flag so that the block can erase */
+
+	dev->gc_disable = 1;
+
+	yaffs_summary_gc(dev, block);
+
+	if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) {
+		yaffs_trace(YAFFS_TRACE_TRACING,
+			"Collecting block %d that has no chunks in use",
+			block);
+		yaffs_block_became_dirty(dev, block);
+	} else {
+
+		u8 *buffer = yaffs_get_temp_buffer(dev);
+
+		yaffs_verify_blk(dev, bi, block);
+
+		max_copies = (whole_block) ? dev->param.chunks_per_block : 5;
+		old_chunk = block * dev->param.chunks_per_block + dev->gc_chunk;
+
+		for (/* init already done */ ;
+		     ret_val == YAFFS_OK &&
+		     dev->gc_chunk < dev->param.chunks_per_block &&
+		     (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) &&
+		     max_copies > 0;
+		     dev->gc_chunk++, old_chunk++) {
+			if (yaffs_check_chunk_bit(dev, block, dev->gc_chunk)) {
+				/* Page is in use and might need to be copied */
+				max_copies--;
+				ret_val = yaffs_gc_process_chunk(dev, bi,
+							old_chunk, buffer);
+			}
+		}
+		yaffs_release_temp_buffer(dev, buffer);
+	}
+
+	yaffs_verify_collected_blk(dev, bi, block);
+
+	if (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
+		/*
+		 * The gc did not complete. Set block state back to FULL
+		 * because checkpointing does not restore gc.
+		 */
+		bi->block_state = YAFFS_BLOCK_STATE_FULL;
+	} else {
+		/* The gc completed. */
+		/* Do any required cleanups */
+		for (i = 0; i < dev->n_clean_ups; i++) {
+			/* Time to delete the file too */
+			struct yaffs_obj *object =
+			    yaffs_find_by_number(dev, dev->gc_cleanup_list[i]);
+			if (object) {
+				yaffs_free_tnode(dev,
+					  object->variant.file_variant.top);
+				object->variant.file_variant.top = NULL;
+				yaffs_trace(YAFFS_TRACE_GC,
+					"yaffs: About to finally delete object %d",
+					object->obj_id);
+				yaffs_generic_obj_del(object);
+				object->my_dev->n_deleted_files--;
+			}
+
+		}
+		chunks_after = yaffs_get_erased_chunks(dev);
+		if (chunks_before >= chunks_after)
+			yaffs_trace(YAFFS_TRACE_GC,
+				"gc did not increase free chunks before %d after %d",
+				chunks_before, chunks_after);
+		dev->gc_block = 0;
+		dev->gc_chunk = 0;
+		dev->n_clean_ups = 0;
+	}
+
+	dev->gc_disable = 0;
+
+	return ret_val;
+}
+
+/*
+ * find_gc_block() selects the dirtiest block (or close enough)
+ * for garbage collection.
+ */
+
+static unsigned yaffs_find_gc_block(struct yaffs_dev *dev,
+				    int aggressive, int background)
+{
+	int i;
+	int iterations;
+	unsigned selected = 0;
+	int prioritised = 0;
+	int prioritised_exist = 0;
+	struct yaffs_block_info *bi;
+	int threshold;
+
+	/* First let's see if we need to grab a prioritised block */
+	if (dev->has_pending_prioritised_gc && !aggressive) {
+		dev->gc_dirtiest = 0;
+		bi = dev->block_info;
+		for (i = dev->internal_start_block;
+		     i <= dev->internal_end_block && !selected; i++) {
+
+			if (bi->gc_prioritise) {
+				prioritised_exist = 1;
+				if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
+				    yaffs_block_ok_for_gc(dev, bi)) {
+					selected = i;
+					prioritised = 1;
+				}
+			}
+			bi++;
+		}
+
+		/*
+		 * If there is a prioritised block and none was selected then
+		 * this happened because there is at least one old dirty block
+		 * gumming up the works. Let's gc the oldest dirty block.
+		 */
+
+		if (prioritised_exist &&
+		    !selected && dev->oldest_dirty_block > 0)
+			selected = dev->oldest_dirty_block;
+
+		if (!prioritised_exist)	/* None found, so we can clear this */
+			dev->has_pending_prioritised_gc = 0;
+	}
+
+	/* If we're doing aggressive GC then we are happy to take a less-dirty
+	 * block, and search harder.
+	 * else (leasurely gc), then we only bother to do this if the
+	 * block has only a few pages in use.
+	 */
+
+	if (!selected) {
+		int pages_used;
+		int n_blocks =
+		    dev->internal_end_block - dev->internal_start_block + 1;
+		if (aggressive) {
+			threshold = dev->param.chunks_per_block;
+			iterations = n_blocks;
+		} else {
+			int max_threshold;
+
+			if (background)
+				max_threshold = dev->param.chunks_per_block / 2;
+			else
+				max_threshold = dev->param.chunks_per_block / 8;
+
+			if (max_threshold < YAFFS_GC_PASSIVE_THRESHOLD)
+				max_threshold = YAFFS_GC_PASSIVE_THRESHOLD;
+
+			threshold = background ? (dev->gc_not_done + 2) * 2 : 0;
+			if (threshold < YAFFS_GC_PASSIVE_THRESHOLD)
+				threshold = YAFFS_GC_PASSIVE_THRESHOLD;
+			if (threshold > max_threshold)
+				threshold = max_threshold;
+
+			iterations = n_blocks / 16 + 1;
+			if (iterations > 100)
+				iterations = 100;
+		}
+
+		for (i = 0;
+		     i < iterations &&
+		     (dev->gc_dirtiest < 1 ||
+		      dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH);
+		     i++) {
+			dev->gc_block_finder++;
+			if (dev->gc_block_finder < dev->internal_start_block ||
+			    dev->gc_block_finder > dev->internal_end_block)
+				dev->gc_block_finder =
+				    dev->internal_start_block;
+
+			bi = yaffs_get_block_info(dev, dev->gc_block_finder);
+
+			pages_used = bi->pages_in_use - bi->soft_del_pages;
+
+			if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
+			    pages_used < dev->param.chunks_per_block &&
+			    (dev->gc_dirtiest < 1 ||
+			     pages_used < dev->gc_pages_in_use) &&
+			    yaffs_block_ok_for_gc(dev, bi)) {
+				dev->gc_dirtiest = dev->gc_block_finder;
+				dev->gc_pages_in_use = pages_used;
+			}
+		}
+
+		if (dev->gc_dirtiest > 0 && dev->gc_pages_in_use <= threshold)
+			selected = dev->gc_dirtiest;
+	}
+
+	/*
+	 * If nothing has been selected for a while, try the oldest dirty
+	 * because that's gumming up the works.
+	 */
+
+	if (!selected && dev->param.is_yaffs2 &&
+	    dev->gc_not_done >= (background ? 10 : 20)) {
+		yaffs2_find_oldest_dirty_seq(dev);
+		if (dev->oldest_dirty_block > 0) {
+			selected = dev->oldest_dirty_block;
+			dev->gc_dirtiest = selected;
+			dev->oldest_dirty_gc_count++;
+			bi = yaffs_get_block_info(dev, selected);
+			dev->gc_pages_in_use =
+			    bi->pages_in_use - bi->soft_del_pages;
+		} else {
+			dev->gc_not_done = 0;
+		}
+	}
+
+	if (selected) {
+		yaffs_trace(YAFFS_TRACE_GC,
+			"GC Selected block %d with %d free, prioritised:%d",
+			selected,
+			dev->param.chunks_per_block - dev->gc_pages_in_use,
+			prioritised);
+
+		dev->n_gc_blocks++;
+		if (background)
+			dev->bg_gcs++;
+
+		dev->gc_dirtiest = 0;
+		dev->gc_pages_in_use = 0;
+		dev->gc_not_done = 0;
+		if (dev->refresh_skip > 0)
+			dev->refresh_skip--;
+	} else {
+		dev->gc_not_done++;
+		yaffs_trace(YAFFS_TRACE_GC,
+			"GC none: finder %d skip %d threshold %d dirtiest %d using %d oldest %d%s",
+			dev->gc_block_finder, dev->gc_not_done, threshold,
+			dev->gc_dirtiest, dev->gc_pages_in_use,
+			dev->oldest_dirty_block, background ? " bg" : "");
+	}
+
+	return selected;
+}
+
+/* New garbage collector
+ * If we're very low on erased blocks then we do aggressive garbage collection
+ * otherwise we do "leasurely" garbage collection.
+ * Aggressive gc looks further (whole array) and will accept less dirty blocks.
+ * Passive gc only inspects smaller areas and only accepts more dirty blocks.
+ *
+ * The idea is to help clear out space in a more spread-out manner.
+ * Dunno if it really does anything useful.
+ */
+static int yaffs_check_gc(struct yaffs_dev *dev, int background)
+{
+	int aggressive = 0;
+	int gc_ok = YAFFS_OK;
+	int max_tries = 0;
+	int min_erased;
+	int erased_chunks;
+	int checkpt_block_adjust;
+
+	if (dev->param.gc_control_fn &&
+		(dev->param.gc_control_fn(dev) & 1) == 0)
+		return YAFFS_OK;
+
+	if (dev->gc_disable)
+		/* Bail out so we don't get recursive gc */
+		return YAFFS_OK;
+
+	/* This loop should pass the first time.
+	 * Only loops here if the collection does not increase space.
+	 */
+
+	do {
+		max_tries++;
+
+		checkpt_block_adjust = yaffs_calc_checkpt_blocks_required(dev);
+
+		min_erased =
+		    dev->param.n_reserved_blocks + checkpt_block_adjust + 1;
+		erased_chunks =
+		    dev->n_erased_blocks * dev->param.chunks_per_block;
+
+		/* If we need a block soon then do aggressive gc. */
+		if (dev->n_erased_blocks < min_erased)
+			aggressive = 1;
+		else {
+			if (!background
+			    && erased_chunks > (dev->n_free_chunks / 4))
+				break;
+
+			if (dev->gc_skip > 20)
+				dev->gc_skip = 20;
+			if (erased_chunks < dev->n_free_chunks / 2 ||
+			    dev->gc_skip < 1 || background)
+				aggressive = 0;
+			else {
+				dev->gc_skip--;
+				break;
+			}
+		}
+
+		dev->gc_skip = 5;
+
+		/* If we don't already have a block being gc'd then see if we
+		 * should start another */
+
+		if (dev->gc_block < 1 && !aggressive) {
+			dev->gc_block = yaffs2_find_refresh_block(dev);
+			dev->gc_chunk = 0;
+			dev->n_clean_ups = 0;
+		}
+		if (dev->gc_block < 1) {
+			dev->gc_block =
+			    yaffs_find_gc_block(dev, aggressive, background);
+			dev->gc_chunk = 0;
+			dev->n_clean_ups = 0;
+		}
+
+		if (dev->gc_block > 0) {
+			dev->all_gcs++;
+			if (!aggressive)
+				dev->passive_gc_count++;
+
+			yaffs_trace(YAFFS_TRACE_GC,
+				"yaffs: GC n_erased_blocks %d aggressive %d",
+				dev->n_erased_blocks, aggressive);
+
+			gc_ok = yaffs_gc_block(dev, dev->gc_block, aggressive);
+		}
+
+		if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) &&
+		    dev->gc_block > 0) {
+			yaffs_trace(YAFFS_TRACE_GC,
+				"yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d",
+				dev->n_erased_blocks, max_tries,
+				dev->gc_block);
+		}
+	} while ((dev->n_erased_blocks < dev->param.n_reserved_blocks) &&
+		 (dev->gc_block > 0) && (max_tries < 2));
+
+	return aggressive ? gc_ok : YAFFS_OK;
+}
+
+/*
+ * yaffs_bg_gc()
+ * Garbage collects. Intended to be called from a background thread.
+ * Returns non-zero if at least half the free chunks are erased.
+ */
+int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency)
+{
+	int erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block;
+
+	yaffs_trace(YAFFS_TRACE_BACKGROUND, "Background gc %u", urgency);
+
+	yaffs_check_gc(dev, 1);
+	return erased_chunks > dev->n_free_chunks / 2;
+}
+
+/*-------------------- Data file manipulation -----------------*/
+
+static int yaffs_rd_data_obj(struct yaffs_obj *in, int inode_chunk, u8 * buffer)
+{
+	int nand_chunk = yaffs_find_chunk_in_file(in, inode_chunk, NULL);
+
+	if (nand_chunk >= 0)
+		return yaffs_rd_chunk_tags_nand(in->my_dev, nand_chunk,
+						buffer, NULL);
+	else {
+		yaffs_trace(YAFFS_TRACE_NANDACCESS,
+			"Chunk %d not found zero instead",
+			nand_chunk);
+		/* get sane (zero) data if you read a hole */
+		memset(buffer, 0, in->my_dev->data_bytes_per_chunk);
+		return 0;
+	}
+
+}
+
+void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
+		     int lyn)
+{
+	int block;
+	int page;
+	struct yaffs_ext_tags tags;
+	struct yaffs_block_info *bi;
+
+	if (chunk_id <= 0)
+		return;
+
+	dev->n_deletions++;
+	block = chunk_id / dev->param.chunks_per_block;
+	page = chunk_id % dev->param.chunks_per_block;
+
+	if (!yaffs_check_chunk_bit(dev, block, page))
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Deleting invalid chunk %d", chunk_id);
+
+	bi = yaffs_get_block_info(dev, block);
+
+	yaffs2_update_oldest_dirty_seq(dev, block, bi);
+
+	yaffs_trace(YAFFS_TRACE_DELETION,
+		"line %d delete of chunk %d",
+		lyn, chunk_id);
+
+	if (!dev->param.is_yaffs2 && mark_flash &&
+	    bi->block_state != YAFFS_BLOCK_STATE_COLLECTING) {
+
+		memset(&tags, 0, sizeof(tags));
+		tags.is_deleted = 1;
+		yaffs_wr_chunk_tags_nand(dev, chunk_id, NULL, &tags);
+		yaffs_handle_chunk_update(dev, chunk_id, &tags);
+	} else {
+		dev->n_unmarked_deletions++;
+	}
+
+	/* Pull out of the management area.
+	 * If the whole block became dirty, this will kick off an erasure.
+	 */
+	if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING ||
+	    bi->block_state == YAFFS_BLOCK_STATE_FULL ||
+	    bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN ||
+	    bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
+		dev->n_free_chunks++;
+		yaffs_clear_chunk_bit(dev, block, page);
+		bi->pages_in_use--;
+
+		if (bi->pages_in_use == 0 &&
+		    !bi->has_shrink_hdr &&
+		    bi->block_state != YAFFS_BLOCK_STATE_ALLOCATING &&
+		    bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCAN) {
+			yaffs_block_became_dirty(dev, block);
+		}
+	}
+}
+
+static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
+			     const u8 *buffer, int n_bytes, int use_reserve)
+{
+	/* Find old chunk Need to do this to get serial number
+	 * Write new one and patch into tree.
+	 * Invalidate old tags.
+	 */
+
+	int prev_chunk_id;
+	struct yaffs_ext_tags prev_tags;
+	int new_chunk_id;
+	struct yaffs_ext_tags new_tags;
+	struct yaffs_dev *dev = in->my_dev;
+
+	yaffs_check_gc(dev, 0);
+
+	/* Get the previous chunk at this location in the file if it exists.
+	 * If it does not exist then put a zero into the tree. This creates
+	 * the tnode now, rather than later when it is harder to clean up.
+	 */
+	prev_chunk_id = yaffs_find_chunk_in_file(in, inode_chunk, &prev_tags);
+	if (prev_chunk_id < 1 &&
+	    !yaffs_put_chunk_in_file(in, inode_chunk, 0, 0))
+		return 0;
+
+	/* Set up new tags */
+	memset(&new_tags, 0, sizeof(new_tags));
+
+	new_tags.chunk_id = inode_chunk;
+	new_tags.obj_id = in->obj_id;
+	new_tags.serial_number =
+	    (prev_chunk_id > 0) ? prev_tags.serial_number + 1 : 1;
+	new_tags.n_bytes = n_bytes;
+
+	if (n_bytes < 1 || n_bytes > dev->param.total_bytes_per_chunk) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+		  "Writing %d bytes to chunk!!!!!!!!!",
+		   n_bytes);
+		BUG();
+	}
+
+	new_chunk_id =
+	    yaffs_write_new_chunk(dev, buffer, &new_tags, use_reserve);
+
+	if (new_chunk_id > 0) {
+		yaffs_put_chunk_in_file(in, inode_chunk, new_chunk_id, 0);
+
+		if (prev_chunk_id > 0)
+			yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__);
+
+		yaffs_verify_file_sane(in);
+	}
+	return new_chunk_id;
+
+}
+
+
+
+static int yaffs_do_xattrib_mod(struct yaffs_obj *obj, int set,
+				const YCHAR *name, const void *value, int size,
+				int flags)
+{
+	struct yaffs_xattr_mod xmod;
+	int result;
+
+	xmod.set = set;
+	xmod.name = name;
+	xmod.data = value;
+	xmod.size = size;
+	xmod.flags = flags;
+	xmod.result = -ENOSPC;
+
+	result = yaffs_update_oh(obj, NULL, 0, 0, 0, &xmod);
+
+	if (result > 0)
+		return xmod.result;
+	else
+		return -ENOSPC;
+}
+
+static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer,
+				   struct yaffs_xattr_mod *xmod)
+{
+	int retval = 0;
+	int x_offs = sizeof(struct yaffs_obj_hdr);
+	struct yaffs_dev *dev = obj->my_dev;
+	int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
+	char *x_buffer = buffer + x_offs;
+
+	if (xmod->set)
+		retval =
+		    nval_set(x_buffer, x_size, xmod->name, xmod->data,
+			     xmod->size, xmod->flags);
+	else
+		retval = nval_del(x_buffer, x_size, xmod->name);
+
+	obj->has_xattr = nval_hasvalues(x_buffer, x_size);
+	obj->xattr_known = 1;
+	xmod->result = retval;
+
+	return retval;
+}
+
+static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR *name,
+				  void *value, int size)
+{
+	char *buffer = NULL;
+	int result;
+	struct yaffs_ext_tags tags;
+	struct yaffs_dev *dev = obj->my_dev;
+	int x_offs = sizeof(struct yaffs_obj_hdr);
+	int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
+	char *x_buffer;
+	int retval = 0;
+
+	if (obj->hdr_chunk < 1)
+		return -ENODATA;
+
+	/* If we know that the object has no xattribs then don't do all the
+	 * reading and parsing.
+	 */
+	if (obj->xattr_known && !obj->has_xattr) {
+		if (name)
+			return -ENODATA;
+		else
+			return 0;
+	}
+
+	buffer = (char *)yaffs_get_temp_buffer(dev);
+	if (!buffer)
+		return -ENOMEM;
+
+	result =
+	    yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, (u8 *) buffer, &tags);
+
+	if (result != YAFFS_OK)
+		retval = -ENOENT;
+	else {
+		x_buffer = buffer + x_offs;
+
+		if (!obj->xattr_known) {
+			obj->has_xattr = nval_hasvalues(x_buffer, x_size);
+			obj->xattr_known = 1;
+		}
+
+		if (name)
+			retval = nval_get(x_buffer, x_size, name, value, size);
+		else
+			retval = nval_list(x_buffer, x_size, value, size);
+	}
+	yaffs_release_temp_buffer(dev, (u8 *) buffer);
+	return retval;
+}
+
+int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR * name,
+		      const void *value, int size, int flags)
+{
+	return yaffs_do_xattrib_mod(obj, 1, name, value, size, flags);
+}
+
+int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR * name)
+{
+	return yaffs_do_xattrib_mod(obj, 0, name, NULL, 0, 0);
+}
+
+int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR * name, void *value,
+		      int size)
+{
+	return yaffs_do_xattrib_fetch(obj, name, value, size);
+}
+
+int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size)
+{
+	return yaffs_do_xattrib_fetch(obj, NULL, buffer, size);
+}
+
+static void yaffs_check_obj_details_loaded(struct yaffs_obj *in)
+{
+	u8 *buf;
+	struct yaffs_obj_hdr *oh;
+	struct yaffs_dev *dev;
+	struct yaffs_ext_tags tags;
+	int result;
+	int alloc_failed = 0;
+
+	if (!in || !in->lazy_loaded || in->hdr_chunk < 1)
+		return;
+
+	dev = in->my_dev;
+	in->lazy_loaded = 0;
+	buf = yaffs_get_temp_buffer(dev);
+
+	result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, buf, &tags);
+	oh = (struct yaffs_obj_hdr *)buf;
+
+	in->yst_mode = oh->yst_mode;
+	yaffs_load_attribs(in, oh);
+	yaffs_set_obj_name_from_oh(in, oh);
+
+	if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
+		in->variant.symlink_variant.alias =
+		    yaffs_clone_str(oh->alias);
+		if (!in->variant.symlink_variant.alias)
+			alloc_failed = 1;	/* Not returned */
+	}
+	yaffs_release_temp_buffer(dev, buf);
+}
+
+static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name,
+				    const YCHAR *oh_name, int buff_size)
+{
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
+	if (dev->param.auto_unicode) {
+		if (*oh_name) {
+			/* It is an ASCII name, do an ASCII to
+			 * unicode conversion */
+			const char *ascii_oh_name = (const char *)oh_name;
+			int n = buff_size - 1;
+			while (n > 0 && *ascii_oh_name) {
+				*name = *ascii_oh_name;
+				name++;
+				ascii_oh_name++;
+				n--;
+			}
+		} else {
+			strncpy(name, oh_name + 1, buff_size - 1);
+		}
+	} else {
+#else
+	(void) dev;
+	{
+#endif
+		strncpy(name, oh_name, buff_size - 1);
+	}
+}
+
+static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name,
+				    const YCHAR *name)
+{
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
+
+	int is_ascii;
+	YCHAR *w;
+
+	if (dev->param.auto_unicode) {
+
+		is_ascii = 1;
+		w = name;
+
+		/* Figure out if the name will fit in ascii character set */
+		while (is_ascii && *w) {
+			if ((*w) & 0xff00)
+				is_ascii = 0;
+			w++;
+		}
+
+		if (is_ascii) {
+			/* It is an ASCII name, so convert unicode to ascii */
+			char *ascii_oh_name = (char *)oh_name;
+			int n = YAFFS_MAX_NAME_LENGTH - 1;
+			while (n > 0 && *name) {
+				*ascii_oh_name = *name;
+				name++;
+				ascii_oh_name++;
+				n--;
+			}
+		} else {
+			/* Unicode name, so save starting at the second YCHAR */
+			*oh_name = 0;
+			strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2);
+		}
+	} else {
+#else
+	dev = dev;
+	{
+#endif
+		strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1);
+	}
+}
+
+/* UpdateObjectHeader updates the header on NAND for an object.
+ * If name is not NULL, then that new name is used.
+ */
+int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
+		    int is_shrink, int shadows, struct yaffs_xattr_mod *xmod)
+{
+
+	struct yaffs_block_info *bi;
+	struct yaffs_dev *dev = in->my_dev;
+	int prev_chunk_id;
+	int ret_val = 0;
+	int result = 0;
+	int new_chunk_id;
+	struct yaffs_ext_tags new_tags;
+	struct yaffs_ext_tags old_tags;
+	const YCHAR *alias = NULL;
+	u8 *buffer = NULL;
+	YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1];
+	struct yaffs_obj_hdr *oh = NULL;
+	loff_t file_size = 0;
+
+	strcpy(old_name, _Y("silly old name"));
+
+	if (in->fake && in != dev->root_dir && !force && !xmod)
+		return ret_val;
+
+	yaffs_check_gc(dev, 0);
+	yaffs_check_obj_details_loaded(in);
+
+	buffer = yaffs_get_temp_buffer(in->my_dev);
+	oh = (struct yaffs_obj_hdr *)buffer;
+
+	prev_chunk_id = in->hdr_chunk;
+
+	if (prev_chunk_id > 0) {
+		result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id,
+						  buffer, &old_tags);
+
+		yaffs_verify_oh(in, oh, &old_tags, 0);
+		memcpy(old_name, oh->name, sizeof(oh->name));
+		memset(buffer, 0xff, sizeof(struct yaffs_obj_hdr));
+	} else {
+		memset(buffer, 0xff, dev->data_bytes_per_chunk);
+	}
+
+	oh->type = in->variant_type;
+	oh->yst_mode = in->yst_mode;
+	oh->shadows_obj = oh->inband_shadowed_obj_id = shadows;
+
+	yaffs_load_attribs_oh(oh, in);
+
+	if (in->parent)
+		oh->parent_obj_id = in->parent->obj_id;
+	else
+		oh->parent_obj_id = 0;
+
+	if (name && *name) {
+		memset(oh->name, 0, sizeof(oh->name));
+		yaffs_load_oh_from_name(dev, oh->name, name);
+	} else if (prev_chunk_id > 0) {
+		memcpy(oh->name, old_name, sizeof(oh->name));
+	} else {
+		memset(oh->name, 0, sizeof(oh->name));
+	}
+
+	oh->is_shrink = is_shrink;
+
+	switch (in->variant_type) {
+	case YAFFS_OBJECT_TYPE_UNKNOWN:
+		/* Should not happen */
+		break;
+	case YAFFS_OBJECT_TYPE_FILE:
+		if (oh->parent_obj_id != YAFFS_OBJECTID_DELETED &&
+		    oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED)
+			file_size = in->variant.file_variant.file_size;
+		yaffs_oh_size_load(oh, file_size);
+		break;
+	case YAFFS_OBJECT_TYPE_HARDLINK:
+		oh->equiv_id = in->variant.hardlink_variant.equiv_id;
+		break;
+	case YAFFS_OBJECT_TYPE_SPECIAL:
+		/* Do nothing */
+		break;
+	case YAFFS_OBJECT_TYPE_DIRECTORY:
+		/* Do nothing */
+		break;
+	case YAFFS_OBJECT_TYPE_SYMLINK:
+		alias = in->variant.symlink_variant.alias;
+		if (!alias)
+			alias = _Y("no alias");
+		strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH);
+		oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
+		break;
+	}
+
+	/* process any xattrib modifications */
+	if (xmod)
+		yaffs_apply_xattrib_mod(in, (char *)buffer, xmod);
+
+	/* Tags */
+	memset(&new_tags, 0, sizeof(new_tags));
+	in->serial++;
+	new_tags.chunk_id = 0;
+	new_tags.obj_id = in->obj_id;
+	new_tags.serial_number = in->serial;
+
+	/* Add extra info for file header */
+	new_tags.extra_available = 1;
+	new_tags.extra_parent_id = oh->parent_obj_id;
+	new_tags.extra_file_size = file_size;
+	new_tags.extra_is_shrink = oh->is_shrink;
+	new_tags.extra_equiv_id = oh->equiv_id;
+	new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0;
+	new_tags.extra_obj_type = in->variant_type;
+	yaffs_verify_oh(in, oh, &new_tags, 1);
+
+	/* Create new chunk in NAND */
+	new_chunk_id =
+	    yaffs_write_new_chunk(dev, buffer, &new_tags,
+				  (prev_chunk_id > 0) ? 1 : 0);
+
+	if (buffer)
+		yaffs_release_temp_buffer(dev, buffer);
+
+	if (new_chunk_id < 0)
+		return new_chunk_id;
+
+	in->hdr_chunk = new_chunk_id;
+
+	if (prev_chunk_id > 0)
+		yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__);
+
+	if (!yaffs_obj_cache_dirty(in))
+		in->dirty = 0;
+
+	/* If this was a shrink, then mark the block
+	 * that the chunk lives on */
+	if (is_shrink) {
+		bi = yaffs_get_block_info(in->my_dev,
+					  new_chunk_id /
+					  in->my_dev->param.chunks_per_block);
+		bi->has_shrink_hdr = 1;
+	}
+
+
+	return new_chunk_id;
+}
+
+/*--------------------- File read/write ------------------------
+ * Read and write have very similar structures.
+ * In general the read/write has three parts to it
+ * An incomplete chunk to start with (if the read/write is not chunk-aligned)
+ * Some complete chunks
+ * An incomplete chunk to end off with
+ *
+ * Curve-balls: the first chunk might also be the last chunk.
+ */
+
+int yaffs_file_rd(struct yaffs_obj *in, u8 * buffer, loff_t offset, int n_bytes)
+{
+	int chunk;
+	u32 start;
+	int n_copy;
+	int n = n_bytes;
+	int n_done = 0;
+	struct yaffs_cache *cache;
+	struct yaffs_dev *dev;
+
+	dev = in->my_dev;
+
+	while (n > 0) {
+		yaffs_addr_to_chunk(dev, offset, &chunk, &start);
+		chunk++;
+
+		/* OK now check for the curveball where the start and end are in
+		 * the same chunk.
+		 */
+		if ((start + n) < dev->data_bytes_per_chunk)
+			n_copy = n;
+		else
+			n_copy = dev->data_bytes_per_chunk - start;
+
+		cache = yaffs_find_chunk_cache(in, chunk);
+
+		/* If the chunk is already in the cache or it is less than
+		 * a whole chunk or we're using inband tags then use the cache
+		 * (if there is caching) else bypass the cache.
+		 */
+		if (cache || n_copy != dev->data_bytes_per_chunk ||
+		    dev->param.inband_tags) {
+			if (dev->param.n_caches > 0) {
+
+				/* If we can't find the data in the cache,
+				 * then load it up. */
+
+				if (!cache) {
+					cache =
+					    yaffs_grab_chunk_cache(in->my_dev);
+					cache->object = in;
+					cache->chunk_id = chunk;
+					cache->dirty = 0;
+					cache->locked = 0;
+					yaffs_rd_data_obj(in, chunk,
+							  cache->data);
+					cache->n_bytes = 0;
+				}
+
+				yaffs_use_cache(dev, cache, 0);
+
+				cache->locked = 1;
+
+				memcpy(buffer, &cache->data[start], n_copy);
+
+				cache->locked = 0;
+			} else {
+				/* Read into the local buffer then copy.. */
+
+				u8 *local_buffer =
+				    yaffs_get_temp_buffer(dev);
+				yaffs_rd_data_obj(in, chunk, local_buffer);
+
+				memcpy(buffer, &local_buffer[start], n_copy);
+
+				yaffs_release_temp_buffer(dev, local_buffer);
+			}
+		} else {
+			/* A full chunk. Read directly into the buffer. */
+			yaffs_rd_data_obj(in, chunk, buffer);
+		}
+		n -= n_copy;
+		offset += n_copy;
+		buffer += n_copy;
+		n_done += n_copy;
+	}
+	return n_done;
+}
+
+int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
+		     int n_bytes, int write_through)
+{
+
+	int chunk;
+	u32 start;
+	int n_copy;
+	int n = n_bytes;
+	int n_done = 0;
+	int n_writeback;
+	loff_t start_write = offset;
+	int chunk_written = 0;
+	u32 n_bytes_read;
+	loff_t chunk_start;
+	struct yaffs_dev *dev;
+
+	dev = in->my_dev;
+
+	while (n > 0 && chunk_written >= 0) {
+		yaffs_addr_to_chunk(dev, offset, &chunk, &start);
+
+		if (((loff_t)chunk) *
+		    dev->data_bytes_per_chunk + start != offset ||
+		    start >= dev->data_bytes_per_chunk) {
+			yaffs_trace(YAFFS_TRACE_ERROR,
+				"AddrToChunk of offset %lld gives chunk %d start %d",
+				offset, chunk, start);
+		}
+		chunk++;	/* File pos to chunk in file offset */
+
+		/* OK now check for the curveball where the start and end are in
+		 * the same chunk.
+		 */
+
+		if ((start + n) < dev->data_bytes_per_chunk) {
+			n_copy = n;
+
+			/* Now calculate how many bytes to write back....
+			 * If we're overwriting and not writing to then end of
+			 * file then we need to write back as much as was there
+			 * before.
+			 */
+
+			chunk_start = (((loff_t)(chunk - 1)) *
+					dev->data_bytes_per_chunk);
+
+			if (chunk_start > in->variant.file_variant.file_size)
+				n_bytes_read = 0;	/* Past end of file */
+			else
+				n_bytes_read =
+				    in->variant.file_variant.file_size -
+				    chunk_start;
+
+			if (n_bytes_read > dev->data_bytes_per_chunk)
+				n_bytes_read = dev->data_bytes_per_chunk;
+
+			n_writeback =
+			    (n_bytes_read >
+			     (start + n)) ? n_bytes_read : (start + n);
+
+			if (n_writeback < 0 ||
+			    n_writeback > dev->data_bytes_per_chunk)
+				BUG();
+
+		} else {
+			n_copy = dev->data_bytes_per_chunk - start;
+			n_writeback = dev->data_bytes_per_chunk;
+		}
+
+		if (n_copy != dev->data_bytes_per_chunk ||
+		    !dev->param.cache_bypass_aligned ||
+		    dev->param.inband_tags) {
+			/* An incomplete start or end chunk (or maybe both
+			 * start and end chunk), or we're using inband tags,
+			 * or we're forcing writes through the cache,
+			 * so we want to use the cache buffers.
+			 */
+			if (dev->param.n_caches > 0) {
+				struct yaffs_cache *cache;
+
+				/* If we can't find the data in the cache, then
+				 * load the cache */
+				cache = yaffs_find_chunk_cache(in, chunk);
+
+				if (!cache &&
+				    yaffs_check_alloc_available(dev, 1)) {
+					cache = yaffs_grab_chunk_cache(dev);
+					cache->object = in;
+					cache->chunk_id = chunk;
+					cache->dirty = 0;
+					cache->locked = 0;
+					yaffs_rd_data_obj(in, chunk,
+							  cache->data);
+				} else if (cache &&
+					   !cache->dirty &&
+					   !yaffs_check_alloc_available(dev,
+									1)) {
+					/* Drop the cache if it was a read cache
+					 * item and no space check has been made
+					 * for it.
+					 */
+					cache = NULL;
+				}
+
+				if (cache) {
+					yaffs_use_cache(dev, cache, 1);
+					cache->locked = 1;
+
+					memcpy(&cache->data[start], buffer,
+					       n_copy);
+
+					cache->locked = 0;
+					cache->n_bytes = n_writeback;
+
+					if (write_through) {
+						chunk_written =
+						    yaffs_wr_data_obj
+						    (cache->object,
+						     cache->chunk_id,
+						     cache->data,
+						     cache->n_bytes, 1);
+						cache->dirty = 0;
+					}
+				} else {
+					chunk_written = -1;	/* fail write */
+				}
+			} else {
+				/* An incomplete start or end chunk (or maybe
+				 * both start and end chunk). Read into the
+				 * local buffer then copy over and write back.
+				 */
+
+				u8 *local_buffer = yaffs_get_temp_buffer(dev);
+
+				yaffs_rd_data_obj(in, chunk, local_buffer);
+				memcpy(&local_buffer[start], buffer, n_copy);
+
+				chunk_written =
+				    yaffs_wr_data_obj(in, chunk,
+						      local_buffer,
+						      n_writeback, 0);
+
+				yaffs_release_temp_buffer(dev, local_buffer);
+			}
+		} else {
+			/* A full chunk. Write directly from the buffer. */
+
+			chunk_written =
+			    yaffs_wr_data_obj(in, chunk, buffer,
+					      dev->data_bytes_per_chunk, 0);
+
+			/* Since we've overwritten the cached data,
+			 * we better invalidate it. */
+			yaffs_invalidate_chunk_cache(in, chunk);
+		}
+
+		if (chunk_written >= 0) {
+			n -= n_copy;
+			offset += n_copy;
+			buffer += n_copy;
+			n_done += n_copy;
+		}
+	}
+
+	/* Update file object */
+
+	if ((start_write + n_done) > in->variant.file_variant.file_size)
+		in->variant.file_variant.file_size = (start_write + n_done);
+
+	in->dirty = 1;
+	return n_done;
+}
+
+int yaffs_wr_file(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
+		  int n_bytes, int write_through)
+{
+	yaffs2_handle_hole(in, offset);
+	return yaffs_do_file_wr(in, buffer, offset, n_bytes, write_through);
+}
+
+/* ---------------------- File resizing stuff ------------------ */
+
+static void yaffs_prune_chunks(struct yaffs_obj *in, loff_t new_size)
+{
+
+	struct yaffs_dev *dev = in->my_dev;
+	loff_t old_size = in->variant.file_variant.file_size;
+	int i;
+	int chunk_id;
+	u32 dummy;
+	int last_del;
+	int start_del;
+
+	if (old_size > 0)
+		yaffs_addr_to_chunk(dev, old_size - 1, &last_del, &dummy);
+	else
+		last_del = 0;
+
+	yaffs_addr_to_chunk(dev, new_size + dev->data_bytes_per_chunk - 1,
+				&start_del, &dummy);
+	last_del++;
+	start_del++;
+
+	/* Delete backwards so that we don't end up with holes if
+	 * power is lost part-way through the operation.
+	 */
+	for (i = last_del; i >= start_del; i--) {
+		/* NB this could be optimised somewhat,
+		 * eg. could retrieve the tags and write them without
+		 * using yaffs_chunk_del
+		 */
+
+		chunk_id = yaffs_find_del_file_chunk(in, i, NULL);
+
+		if (chunk_id < 1)
+			continue;
+
+		if (chunk_id <
+		    (dev->internal_start_block * dev->param.chunks_per_block) ||
+		    chunk_id >=
+		    ((dev->internal_end_block + 1) *
+		      dev->param.chunks_per_block)) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"Found daft chunk_id %d for %d",
+				chunk_id, i);
+		} else {
+			in->n_data_chunks--;
+			yaffs_chunk_del(dev, chunk_id, 1, __LINE__);
+		}
+	}
+}
+
+void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size)
+{
+	int new_full;
+	u32 new_partial;
+	struct yaffs_dev *dev = obj->my_dev;
+
+	yaffs_addr_to_chunk(dev, new_size, &new_full, &new_partial);
+
+	yaffs_prune_chunks(obj, new_size);
+
+	if (new_partial != 0) {
+		int last_chunk = 1 + new_full;
+		u8 *local_buffer = yaffs_get_temp_buffer(dev);
+
+		/* Rewrite the last chunk with its new size and zero pad */
+		yaffs_rd_data_obj(obj, last_chunk, local_buffer);
+		memset(local_buffer + new_partial, 0,
+		       dev->data_bytes_per_chunk - new_partial);
+
+		yaffs_wr_data_obj(obj, last_chunk, local_buffer,
+				  new_partial, 1);
+
+		yaffs_release_temp_buffer(dev, local_buffer);
+	}
+
+	obj->variant.file_variant.file_size = new_size;
+
+	yaffs_prune_tree(dev, &obj->variant.file_variant);
+}
+
+int yaffs_resize_file(struct yaffs_obj *in, loff_t new_size)
+{
+	struct yaffs_dev *dev = in->my_dev;
+	loff_t old_size = in->variant.file_variant.file_size;
+
+	yaffs_flush_file_cache(in);
+	yaffs_invalidate_whole_cache(in);
+
+	yaffs_check_gc(dev, 0);
+
+	if (in->variant_type != YAFFS_OBJECT_TYPE_FILE)
+		return YAFFS_FAIL;
+
+	if (new_size == old_size)
+		return YAFFS_OK;
+
+	if (new_size > old_size) {
+		yaffs2_handle_hole(in, new_size);
+		in->variant.file_variant.file_size = new_size;
+	} else {
+		/* new_size < old_size */
+		yaffs_resize_file_down(in, new_size);
+	}
+
+	/* Write a new object header to reflect the resize.
+	 * show we've shrunk the file, if need be
+	 * Do this only if the file is not in the deleted directories
+	 * and is not shadowed.
+	 */
+	if (in->parent &&
+	    !in->is_shadowed &&
+	    in->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
+	    in->parent->obj_id != YAFFS_OBJECTID_DELETED)
+		yaffs_update_oh(in, NULL, 0, 0, 0, NULL);
+
+	return YAFFS_OK;
+}
+
+int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync)
+{
+	if (!in->dirty)
+		return YAFFS_OK;
+
+	yaffs_flush_file_cache(in);
+
+	if (data_sync)
+		return YAFFS_OK;
+
+	if (update_time)
+		yaffs_load_current_time(in, 0, 0);
+
+	return (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= 0) ?
+				YAFFS_OK : YAFFS_FAIL;
+}
+
+
+/* yaffs_del_file deletes the whole file data
+ * and the inode associated with the file.
+ * It does not delete the links associated with the file.
+ */
+static int yaffs_unlink_file_if_needed(struct yaffs_obj *in)
+{
+	int ret_val;
+	int del_now = 0;
+	struct yaffs_dev *dev = in->my_dev;
+
+	if (!in->my_inode)
+		del_now = 1;
+
+	if (del_now) {
+		ret_val =
+		    yaffs_change_obj_name(in, in->my_dev->del_dir,
+					  _Y("deleted"), 0, 0);
+		yaffs_trace(YAFFS_TRACE_TRACING,
+			"yaffs: immediate deletion of file %d",
+			in->obj_id);
+		in->deleted = 1;
+		in->my_dev->n_deleted_files++;
+		if (dev->param.disable_soft_del || dev->param.is_yaffs2)
+			yaffs_resize_file(in, 0);
+		yaffs_soft_del_file(in);
+	} else {
+		ret_val =
+		    yaffs_change_obj_name(in, in->my_dev->unlinked_dir,
+					  _Y("unlinked"), 0, 0);
+	}
+	return ret_val;
+}
+
+static int yaffs_del_file(struct yaffs_obj *in)
+{
+	int ret_val = YAFFS_OK;
+	int deleted;	/* Need to cache value on stack if in is freed */
+	struct yaffs_dev *dev = in->my_dev;
+
+	if (dev->param.disable_soft_del || dev->param.is_yaffs2)
+		yaffs_resize_file(in, 0);
+
+	if (in->n_data_chunks > 0) {
+		/* Use soft deletion if there is data in the file.
+		 * That won't be the case if it has been resized to zero.
+		 */
+		if (!in->unlinked)
+			ret_val = yaffs_unlink_file_if_needed(in);
+
+		deleted = in->deleted;
+
+		if (ret_val == YAFFS_OK && in->unlinked && !in->deleted) {
+			in->deleted = 1;
+			deleted = 1;
+			in->my_dev->n_deleted_files++;
+			yaffs_soft_del_file(in);
+		}
+		return deleted ? YAFFS_OK : YAFFS_FAIL;
+	} else {
+		/* The file has no data chunks so we toss it immediately */
+		yaffs_free_tnode(in->my_dev, in->variant.file_variant.top);
+		in->variant.file_variant.top = NULL;
+		yaffs_generic_obj_del(in);
+
+		return YAFFS_OK;
+	}
+}
+
+int yaffs_is_non_empty_dir(struct yaffs_obj *obj)
+{
+	return (obj &&
+		obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) &&
+		!(list_empty(&obj->variant.dir_variant.children));
+}
+
+static int yaffs_del_dir(struct yaffs_obj *obj)
+{
+	/* First check that the directory is empty. */
+	if (yaffs_is_non_empty_dir(obj))
+		return YAFFS_FAIL;
+
+	return yaffs_generic_obj_del(obj);
+}
+
+static int yaffs_del_symlink(struct yaffs_obj *in)
+{
+	kfree(in->variant.symlink_variant.alias);
+	in->variant.symlink_variant.alias = NULL;
+
+	return yaffs_generic_obj_del(in);
+}
+
+static int yaffs_del_link(struct yaffs_obj *in)
+{
+	/* remove this hardlink from the list associated with the equivalent
+	 * object
+	 */
+	list_del_init(&in->hard_links);
+	return yaffs_generic_obj_del(in);
+}
+
+int yaffs_del_obj(struct yaffs_obj *obj)
+{
+	int ret_val = -1;
+
+	switch (obj->variant_type) {
+	case YAFFS_OBJECT_TYPE_FILE:
+		ret_val = yaffs_del_file(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_DIRECTORY:
+		if (!list_empty(&obj->variant.dir_variant.dirty)) {
+			yaffs_trace(YAFFS_TRACE_BACKGROUND,
+				"Remove object %d from dirty directories",
+				obj->obj_id);
+			list_del_init(&obj->variant.dir_variant.dirty);
+		}
+		return yaffs_del_dir(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_SYMLINK:
+		ret_val = yaffs_del_symlink(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_HARDLINK:
+		ret_val = yaffs_del_link(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_SPECIAL:
+		ret_val = yaffs_generic_obj_del(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_UNKNOWN:
+		ret_val = 0;
+		break;		/* should not happen. */
+	}
+	return ret_val;
+}
+
+static int yaffs_unlink_worker(struct yaffs_obj *obj)
+{
+	int del_now = 0;
+
+	if (!obj)
+		return YAFFS_FAIL;
+
+	if (!obj->my_inode)
+		del_now = 1;
+
+	yaffs_update_parent(obj->parent);
+
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
+		return yaffs_del_link(obj);
+	} else if (!list_empty(&obj->hard_links)) {
+		/* Curve ball: We're unlinking an object that has a hardlink.
+		 *
+		 * This problem arises because we are not strictly following
+		 * The Linux link/inode model.
+		 *
+		 * We can't really delete the object.
+		 * Instead, we do the following:
+		 * - Select a hardlink.
+		 * - Unhook it from the hard links
+		 * - Move it from its parent directory so that the rename works.
+		 * - Rename the object to the hardlink's name.
+		 * - Delete the hardlink
+		 */
+
+		struct yaffs_obj *hl;
+		struct yaffs_obj *parent;
+		int ret_val;
+		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+
+		hl = list_entry(obj->hard_links.next, struct yaffs_obj,
+				hard_links);
+
+		yaffs_get_obj_name(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
+		parent = hl->parent;
+
+		list_del_init(&hl->hard_links);
+
+		yaffs_add_obj_to_dir(obj->my_dev->unlinked_dir, hl);
+
+		ret_val = yaffs_change_obj_name(obj, parent, name, 0, 0);
+
+		if (ret_val == YAFFS_OK)
+			ret_val = yaffs_generic_obj_del(hl);
+
+		return ret_val;
+
+	} else if (del_now) {
+		switch (obj->variant_type) {
+		case YAFFS_OBJECT_TYPE_FILE:
+			return yaffs_del_file(obj);
+			break;
+		case YAFFS_OBJECT_TYPE_DIRECTORY:
+			list_del_init(&obj->variant.dir_variant.dirty);
+			return yaffs_del_dir(obj);
+			break;
+		case YAFFS_OBJECT_TYPE_SYMLINK:
+			return yaffs_del_symlink(obj);
+			break;
+		case YAFFS_OBJECT_TYPE_SPECIAL:
+			return yaffs_generic_obj_del(obj);
+			break;
+		case YAFFS_OBJECT_TYPE_HARDLINK:
+		case YAFFS_OBJECT_TYPE_UNKNOWN:
+		default:
+			return YAFFS_FAIL;
+		}
+	} else if (yaffs_is_non_empty_dir(obj)) {
+		return YAFFS_FAIL;
+	} else {
+		return yaffs_change_obj_name(obj, obj->my_dev->unlinked_dir,
+						_Y("unlinked"), 0, 0);
+	}
+}
+
+static int yaffs_unlink_obj(struct yaffs_obj *obj)
+{
+	if (obj && obj->unlink_allowed)
+		return yaffs_unlink_worker(obj);
+
+	return YAFFS_FAIL;
+}
+
+int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR *name)
+{
+	struct yaffs_obj *obj;
+
+	obj = yaffs_find_by_name(dir, name);
+	return yaffs_unlink_obj(obj);
+}
+
+/* Note:
+ * If old_name is NULL then we take old_dir as the object to be renamed.
+ */
+int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR *old_name,
+		     struct yaffs_obj *new_dir, const YCHAR *new_name)
+{
+	struct yaffs_obj *obj = NULL;
+	struct yaffs_obj *existing_target = NULL;
+	int force = 0;
+	int result;
+	struct yaffs_dev *dev;
+
+	if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		BUG();
+		return YAFFS_FAIL;
+	}
+	if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		BUG();
+		return YAFFS_FAIL;
+	}
+
+	dev = old_dir->my_dev;
+
+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
+	/* Special case for case insemsitive systems.
+	 * While look-up is case insensitive, the name isn't.
+	 * Therefore we might want to change x.txt to X.txt
+	 */
+	if (old_dir == new_dir &&
+		old_name && new_name &&
+		strcmp(old_name, new_name) == 0)
+		force = 1;
+#endif
+
+	if (strnlen(new_name, YAFFS_MAX_NAME_LENGTH + 1) >
+	    YAFFS_MAX_NAME_LENGTH)
+		/* ENAMETOOLONG */
+		return YAFFS_FAIL;
+
+	if (old_name)
+		obj = yaffs_find_by_name(old_dir, old_name);
+	else{
+		obj = old_dir;
+		old_dir = obj->parent;
+	}
+
+	if (obj && obj->rename_allowed) {
+		/* Now handle an existing target, if there is one */
+		existing_target = yaffs_find_by_name(new_dir, new_name);
+		if (yaffs_is_non_empty_dir(existing_target)) {
+			return YAFFS_FAIL;	/* ENOTEMPTY */
+		} else if (existing_target && existing_target != obj) {
+			/* Nuke the target first, using shadowing,
+			 * but only if it isn't the same object.
+			 *
+			 * Note we must disable gc here otherwise it can mess
+			 * up the shadowing.
+			 *
+			 */
+			dev->gc_disable = 1;
+			yaffs_change_obj_name(obj, new_dir, new_name, force,
+					      existing_target->obj_id);
+			existing_target->is_shadowed = 1;
+			yaffs_unlink_obj(existing_target);
+			dev->gc_disable = 0;
+		}
+
+		result = yaffs_change_obj_name(obj, new_dir, new_name, 1, 0);
+
+		yaffs_update_parent(old_dir);
+		if (new_dir != old_dir)
+			yaffs_update_parent(new_dir);
+
+		return result;
+	}
+	return YAFFS_FAIL;
+}
+
+/*----------------------- Initialisation Scanning ---------------------- */
+
+void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id,
+			       int backward_scanning)
+{
+	struct yaffs_obj *obj;
+
+	if (backward_scanning) {
+		/* Handle YAFFS2 case (backward scanning)
+		 * If the shadowed object exists then ignore.
+		 */
+		obj = yaffs_find_by_number(dev, obj_id);
+		if (obj)
+			return;
+	}
+
+	/* Let's create it (if it does not exist) assuming it is a file so that
+	 * it can do shrinking etc.
+	 * We put it in unlinked dir to be cleaned up after the scanning
+	 */
+	obj =
+	    yaffs_find_or_create_by_number(dev, obj_id, YAFFS_OBJECT_TYPE_FILE);
+	if (!obj)
+		return;
+	obj->is_shadowed = 1;
+	yaffs_add_obj_to_dir(dev->unlinked_dir, obj);
+	obj->variant.file_variant.shrink_size = 0;
+	obj->valid = 1;		/* So that we don't read any other info. */
+}
+
+void yaffs_link_fixup(struct yaffs_dev *dev, struct list_head *hard_list)
+{
+	struct list_head *lh;
+	struct list_head *save;
+	struct yaffs_obj *hl;
+	struct yaffs_obj *in;
+
+	list_for_each_safe(lh, save, hard_list) {
+		hl = list_entry(lh, struct yaffs_obj, hard_links);
+		in = yaffs_find_by_number(dev,
+					hl->variant.hardlink_variant.equiv_id);
+
+		if (in) {
+			/* Add the hardlink pointers */
+			hl->variant.hardlink_variant.equiv_obj = in;
+			list_add(&hl->hard_links, &in->hard_links);
+		} else {
+			/* Todo Need to report/handle this better.
+			 * Got a problem... hardlink to a non-existant object
+			 */
+			hl->variant.hardlink_variant.equiv_obj = NULL;
+			INIT_LIST_HEAD(&hl->hard_links);
+		}
+	}
+}
+
+static void yaffs_strip_deleted_objs(struct yaffs_dev *dev)
+{
+	/*
+	 *  Sort out state of unlinked and deleted objects after scanning.
+	 */
+	struct list_head *i;
+	struct list_head *n;
+	struct yaffs_obj *l;
+
+	if (dev->read_only)
+		return;
+
+	/* Soft delete all the unlinked files */
+	list_for_each_safe(i, n,
+			   &dev->unlinked_dir->variant.dir_variant.children) {
+		l = list_entry(i, struct yaffs_obj, siblings);
+		yaffs_del_obj(l);
+	}
+
+	list_for_each_safe(i, n, &dev->del_dir->variant.dir_variant.children) {
+		l = list_entry(i, struct yaffs_obj, siblings);
+		yaffs_del_obj(l);
+	}
+}
+
+/*
+ * This code iterates through all the objects making sure that they are rooted.
+ * Any unrooted objects are re-rooted in lost+found.
+ * An object needs to be in one of:
+ * - Directly under deleted, unlinked
+ * - Directly or indirectly under root.
+ *
+ * Note:
+ *  This code assumes that we don't ever change the current relationships
+ *  between directories:
+ *   root_dir->parent == unlinked_dir->parent == del_dir->parent == NULL
+ *   lost-n-found->parent == root_dir
+ *
+ * This fixes the problem where directories might have inadvertently been
+ * deleted leaving the object "hanging" without being rooted in the
+ * directory tree.
+ */
+
+static int yaffs_has_null_parent(struct yaffs_dev *dev, struct yaffs_obj *obj)
+{
+	return (obj == dev->del_dir ||
+		obj == dev->unlinked_dir || obj == dev->root_dir);
+}
+
+static void yaffs_fix_hanging_objs(struct yaffs_dev *dev)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_obj *parent;
+	int i;
+	struct list_head *lh;
+	struct list_head *n;
+	int depth_limit;
+	int hanging;
+
+	if (dev->read_only)
+		return;
+
+	/* Iterate through the objects in each hash entry,
+	 * looking at each object.
+	 * Make sure it is rooted.
+	 */
+
+	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+		list_for_each_safe(lh, n, &dev->obj_bucket[i].list) {
+			obj = list_entry(lh, struct yaffs_obj, hash_link);
+			parent = obj->parent;
+
+			if (yaffs_has_null_parent(dev, obj)) {
+				/* These directories are not hanging */
+				hanging = 0;
+			} else if (!parent ||
+				   parent->variant_type !=
+				   YAFFS_OBJECT_TYPE_DIRECTORY) {
+				hanging = 1;
+			} else if (yaffs_has_null_parent(dev, parent)) {
+				hanging = 0;
+			} else {
+				/*
+				 * Need to follow the parent chain to
+				 * see if it is hanging.
+				 */
+				hanging = 0;
+				depth_limit = 100;
+
+				while (parent != dev->root_dir &&
+				       parent->parent &&
+				       parent->parent->variant_type ==
+				       YAFFS_OBJECT_TYPE_DIRECTORY &&
+				       depth_limit > 0) {
+					parent = parent->parent;
+					depth_limit--;
+				}
+				if (parent != dev->root_dir)
+					hanging = 1;
+			}
+			if (hanging) {
+				yaffs_trace(YAFFS_TRACE_SCAN,
+					"Hanging object %d moved to lost and found",
+					obj->obj_id);
+				yaffs_add_obj_to_dir(dev->lost_n_found, obj);
+			}
+		}
+	}
+}
+
+/*
+ * Delete directory contents for cleaning up lost and found.
+ */
+static void yaffs_del_dir_contents(struct yaffs_obj *dir)
+{
+	struct yaffs_obj *obj;
+	struct list_head *lh;
+	struct list_head *n;
+
+	if (dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+		BUG();
+
+	list_for_each_safe(lh, n, &dir->variant.dir_variant.children) {
+		obj = list_entry(lh, struct yaffs_obj, siblings);
+		if (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
+			yaffs_del_dir_contents(obj);
+		yaffs_trace(YAFFS_TRACE_SCAN,
+			"Deleting lost_found object %d",
+			obj->obj_id);
+		yaffs_unlink_obj(obj);
+	}
+}
+
+static void yaffs_empty_l_n_f(struct yaffs_dev *dev)
+{
+	yaffs_del_dir_contents(dev->lost_n_found);
+}
+
+
+struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory,
+				     const YCHAR *name)
+{
+	int sum;
+	struct list_head *i;
+	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
+	struct yaffs_obj *l;
+
+	if (!name)
+		return NULL;
+
+	if (!directory) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"tragedy: yaffs_find_by_name: null pointer directory"
+			);
+		BUG();
+		return NULL;
+	}
+	if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"tragedy: yaffs_find_by_name: non-directory"
+			);
+		BUG();
+	}
+
+	sum = yaffs_calc_name_sum(name);
+
+	list_for_each(i, &directory->variant.dir_variant.children) {
+		l = list_entry(i, struct yaffs_obj, siblings);
+
+		if (l->parent != directory)
+			BUG();
+
+		yaffs_check_obj_details_loaded(l);
+
+		/* Special case for lost-n-found */
+		if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
+			if (!strcmp(name, YAFFS_LOSTNFOUND_NAME))
+				return l;
+		} else if (l->sum == sum || l->hdr_chunk <= 0) {
+			/* LostnFound chunk called Objxxx
+			 * Do a real check
+			 */
+			yaffs_get_obj_name(l, buffer,
+				YAFFS_MAX_NAME_LENGTH + 1);
+			if (!strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH))
+				return l;
+		}
+	}
+	return NULL;
+}
+
+/* GetEquivalentObject dereferences any hard links to get to the
+ * actual object.
+ */
+
+struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj)
+{
+	if (obj && obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
+		obj = obj->variant.hardlink_variant.equiv_obj;
+		yaffs_check_obj_details_loaded(obj);
+	}
+	return obj;
+}
+
+/*
+ *  A note or two on object names.
+ *  * If the object name is missing, we then make one up in the form objnnn
+ *
+ *  * ASCII names are stored in the object header's name field from byte zero
+ *  * Unicode names are historically stored starting from byte zero.
+ *
+ * Then there are automatic Unicode names...
+ * The purpose of these is to save names in a way that can be read as
+ * ASCII or Unicode names as appropriate, thus allowing a Unicode and ASCII
+ * system to share files.
+ *
+ * These automatic unicode are stored slightly differently...
+ *  - If the name can fit in the ASCII character space then they are saved as
+ *    ascii names as per above.
+ *  - If the name needs Unicode then the name is saved in Unicode
+ *    starting at oh->name[1].
+
+ */
+static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name,
+				int buffer_size)
+{
+	/* Create an object name if we could not find one. */
+	if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) {
+		YCHAR local_name[20];
+		YCHAR num_string[20];
+		YCHAR *x = &num_string[19];
+		unsigned v = obj->obj_id;
+		num_string[19] = 0;
+		while (v > 0) {
+			x--;
+			*x = '0' + (v % 10);
+			v /= 10;
+		}
+		/* make up a name */
+		strcpy(local_name, YAFFS_LOSTNFOUND_PREFIX);
+		strcat(local_name, x);
+		strncpy(name, local_name, buffer_size - 1);
+	}
+}
+
+int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size)
+{
+	memset(name, 0, buffer_size * sizeof(YCHAR));
+	yaffs_check_obj_details_loaded(obj);
+	if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
+		strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1);
+	} else if (obj->short_name[0]) {
+		strcpy(name, obj->short_name);
+	} else if (obj->hdr_chunk > 0) {
+		int result;
+		u8 *buffer = yaffs_get_temp_buffer(obj->my_dev);
+
+		struct yaffs_obj_hdr *oh = (struct yaffs_obj_hdr *)buffer;
+
+		memset(buffer, 0, obj->my_dev->data_bytes_per_chunk);
+
+		if (obj->hdr_chunk > 0) {
+			result = yaffs_rd_chunk_tags_nand(obj->my_dev,
+							  obj->hdr_chunk,
+							  buffer, NULL);
+		}
+		yaffs_load_name_from_oh(obj->my_dev, name, oh->name,
+					buffer_size);
+
+		yaffs_release_temp_buffer(obj->my_dev, buffer);
+	}
+
+	yaffs_fix_null_name(obj, name, buffer_size);
+
+	return strnlen(name, YAFFS_MAX_NAME_LENGTH);
+}
+
+loff_t yaffs_get_obj_length(struct yaffs_obj *obj)
+{
+	/* Dereference any hard linking */
+	obj = yaffs_get_equivalent_obj(obj);
+
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
+		return obj->variant.file_variant.file_size;
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
+		if (!obj->variant.symlink_variant.alias)
+			return 0;
+		return strnlen(obj->variant.symlink_variant.alias,
+				     YAFFS_MAX_ALIAS_LENGTH);
+	} else {
+		/* Only a directory should drop through to here */
+		return obj->my_dev->data_bytes_per_chunk;
+	}
+}
+
+int yaffs_get_obj_link_count(struct yaffs_obj *obj)
+{
+	int count = 0;
+	struct list_head *i;
+
+	if (!obj->unlinked)
+		count++;	/* the object itself */
+
+	list_for_each(i, &obj->hard_links)
+	    count++;		/* add the hard links; */
+
+	return count;
+}
+
+int yaffs_get_obj_inode(struct yaffs_obj *obj)
+{
+	obj = yaffs_get_equivalent_obj(obj);
+
+	return obj->obj_id;
+}
+
+unsigned yaffs_get_obj_type(struct yaffs_obj *obj)
+{
+	obj = yaffs_get_equivalent_obj(obj);
+
+	switch (obj->variant_type) {
+	case YAFFS_OBJECT_TYPE_FILE:
+		return DT_REG;
+		break;
+	case YAFFS_OBJECT_TYPE_DIRECTORY:
+		return DT_DIR;
+		break;
+	case YAFFS_OBJECT_TYPE_SYMLINK:
+		return DT_LNK;
+		break;
+	case YAFFS_OBJECT_TYPE_HARDLINK:
+		return DT_REG;
+		break;
+	case YAFFS_OBJECT_TYPE_SPECIAL:
+		if (S_ISFIFO(obj->yst_mode))
+			return DT_FIFO;
+		if (S_ISCHR(obj->yst_mode))
+			return DT_CHR;
+		if (S_ISBLK(obj->yst_mode))
+			return DT_BLK;
+		if (S_ISSOCK(obj->yst_mode))
+			return DT_SOCK;
+		return DT_REG;
+		break;
+	default:
+		return DT_REG;
+		break;
+	}
+}
+
+YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj)
+{
+	obj = yaffs_get_equivalent_obj(obj);
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK)
+		return yaffs_clone_str(obj->variant.symlink_variant.alias);
+	else
+		return yaffs_clone_str(_Y(""));
+}
+
+/*--------------------------- Initialisation code -------------------------- */
+
+static int yaffs_check_dev_fns(struct yaffs_dev *dev)
+{
+	struct yaffs_driver *drv = &dev->drv;
+	struct yaffs_tags_handler *tagger = &dev->tagger;
+
+	/* Common functions, gotta have */
+	if (!drv->drv_read_chunk_fn ||
+	    !drv->drv_write_chunk_fn ||
+	    !drv->drv_erase_fn)
+		return 0;
+
+	if (dev->param.is_yaffs2 &&
+	     (!drv->drv_mark_bad_fn  || !drv->drv_check_bad_fn))
+		return 0;
+
+	/* Install the default tags marshalling functions if needed. */
+	yaffs_tags_compat_install(dev);
+	yaffs_tags_marshall_install(dev);
+
+	/* Check we now have the marshalling functions required. */
+	if (!tagger->write_chunk_tags_fn ||
+	    !tagger->read_chunk_tags_fn ||
+	    !tagger->query_block_fn ||
+	    !tagger->mark_bad_fn)
+		return 0;
+
+	return 1;
+}
+
+static int yaffs_create_initial_dir(struct yaffs_dev *dev)
+{
+	/* Initialise the unlinked, deleted, root and lost+found directories */
+	dev->lost_n_found = dev->root_dir = NULL;
+	dev->unlinked_dir = dev->del_dir = NULL;
+	dev->unlinked_dir =
+	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
+	dev->del_dir =
+	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
+	dev->root_dir =
+	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_ROOT,
+				  YAFFS_ROOT_MODE | S_IFDIR);
+	dev->lost_n_found =
+	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_LOSTNFOUND,
+				  YAFFS_LOSTNFOUND_MODE | S_IFDIR);
+
+	if (dev->lost_n_found && dev->root_dir && dev->unlinked_dir
+	    && dev->del_dir) {
+		yaffs_add_obj_to_dir(dev->root_dir, dev->lost_n_found);
+		return YAFFS_OK;
+	}
+	return YAFFS_FAIL;
+}
+
+/* Low level init.
+ * Typically only used by yaffs_guts_initialise, but also used by the
+ * Low level yaffs driver tests.
+ */
+
+int yaffs_guts_ll_init(struct yaffs_dev *dev)
+{
+
+
+	yaffs_trace(YAFFS_TRACE_TRACING, "yaffs: yaffs_ll_init()");
+
+	if (!dev) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"yaffs: Need a device"
+			);
+		return YAFFS_FAIL;
+	}
+
+	if (dev->ll_init)
+		return YAFFS_OK;
+
+	dev->internal_start_block = dev->param.start_block;
+	dev->internal_end_block = dev->param.end_block;
+	dev->block_offset = 0;
+	dev->chunk_offset = 0;
+	dev->n_free_chunks = 0;
+
+	dev->gc_block = 0;
+
+	if (dev->param.start_block == 0) {
+		dev->internal_start_block = dev->param.start_block + 1;
+		dev->internal_end_block = dev->param.end_block + 1;
+		dev->block_offset = 1;
+		dev->chunk_offset = dev->param.chunks_per_block;
+	}
+
+	/* Check geometry parameters. */
+
+	if ((!dev->param.inband_tags && dev->param.is_yaffs2 &&
+		dev->param.total_bytes_per_chunk < 1024) ||
+		(!dev->param.is_yaffs2 &&
+			dev->param.total_bytes_per_chunk < 512) ||
+		(dev->param.inband_tags && !dev->param.is_yaffs2) ||
+		 dev->param.chunks_per_block < 2 ||
+		 dev->param.n_reserved_blocks < 2 ||
+		dev->internal_start_block <= 0 ||
+		dev->internal_end_block <= 0 ||
+		dev->internal_end_block <=
+		(dev->internal_start_block + dev->param.n_reserved_blocks + 2)
+		) {
+		/* otherwise it is too small */
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"NAND geometry problems: chunk size %d, type is yaffs%s, inband_tags %d ",
+			dev->param.total_bytes_per_chunk,
+			dev->param.is_yaffs2 ? "2" : "",
+			dev->param.inband_tags);
+		return YAFFS_FAIL;
+	}
+
+	/* Sort out space for inband tags, if required */
+	if (dev->param.inband_tags)
+		dev->data_bytes_per_chunk =
+		    dev->param.total_bytes_per_chunk -
+		    sizeof(struct yaffs_packed_tags2_tags_only);
+	else
+		dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk;
+
+	/* Got the right mix of functions? */
+	if (!yaffs_check_dev_fns(dev)) {
+		/* Function missing */
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"device function(s) missing or wrong");
+
+		return YAFFS_FAIL;
+	}
+
+	if (yaffs_init_nand(dev) != YAFFS_OK) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "InitialiseNAND failed");
+		return YAFFS_FAIL;
+	}
+
+	return YAFFS_OK;
+}
+
+
+int yaffs_format_dev(struct yaffs_dev *dev)
+{
+	int i;
+	enum yaffs_block_state state;
+	u32 dummy;
+
+	if(yaffs_guts_ll_init(dev) != YAFFS_OK)
+		return YAFFS_FAIL;
+
+	if(dev->is_mounted)
+		return YAFFS_FAIL;
+
+	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		yaffs_query_init_block_state(dev, i, &state, &dummy);
+		if (state != YAFFS_BLOCK_STATE_DEAD)
+			yaffs_erase_block(dev, i);
+	}
+
+	return YAFFS_OK;
+}
+
+
+int yaffs_guts_initialise(struct yaffs_dev *dev)
+{
+	int init_failed = 0;
+	unsigned x;
+	int bits;
+
+	if(yaffs_guts_ll_init(dev) != YAFFS_OK)
+		return YAFFS_FAIL;
+
+	if (dev->is_mounted) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "device already mounted");
+		return YAFFS_FAIL;
+	}
+
+	dev->is_mounted = 1;
+
+	/* OK now calculate a few things for the device */
+
+	/*
+	 *  Calculate all the chunk size manipulation numbers:
+	 */
+	x = dev->data_bytes_per_chunk;
+	/* We always use dev->chunk_shift and dev->chunk_div */
+	dev->chunk_shift = calc_shifts(x);
+	x >>= dev->chunk_shift;
+	dev->chunk_div = x;
+	/* We only use chunk mask if chunk_div is 1 */
+	dev->chunk_mask = (1 << dev->chunk_shift) - 1;
+
+	/*
+	 * Calculate chunk_grp_bits.
+	 * We need to find the next power of 2 > than internal_end_block
+	 */
+
+	x = dev->param.chunks_per_block * (dev->internal_end_block + 1);
+
+	bits = calc_shifts_ceiling(x);
+
+	/* Set up tnode width if wide tnodes are enabled. */
+	if (!dev->param.wide_tnodes_disabled) {
+		/* bits must be even so that we end up with 32-bit words */
+		if (bits & 1)
+			bits++;
+		if (bits < 16)
+			dev->tnode_width = 16;
+		else
+			dev->tnode_width = bits;
+	} else {
+		dev->tnode_width = 16;
+	}
+
+	dev->tnode_mask = (1 << dev->tnode_width) - 1;
+
+	/* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled),
+	 * so if the bitwidth of the
+	 * chunk range we're using is greater than 16 we need
+	 * to figure out chunk shift and chunk_grp_size
+	 */
+
+	if (bits <= dev->tnode_width)
+		dev->chunk_grp_bits = 0;
+	else
+		dev->chunk_grp_bits = bits - dev->tnode_width;
+
+	dev->tnode_size = (dev->tnode_width * YAFFS_NTNODES_LEVEL0) / 8;
+	if (dev->tnode_size < sizeof(struct yaffs_tnode))
+		dev->tnode_size = sizeof(struct yaffs_tnode);
+
+	dev->chunk_grp_size = 1 << dev->chunk_grp_bits;
+
+	if (dev->param.chunks_per_block < dev->chunk_grp_size) {
+		/* We have a problem because the soft delete won't work if
+		 * the chunk group size > chunks per block.
+		 * This can be remedied by using larger "virtual blocks".
+		 */
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "chunk group too large");
+
+		return YAFFS_FAIL;
+	}
+
+	/* Finished verifying the device, continue with initialisation */
+
+	/* More device initialisation */
+	dev->all_gcs = 0;
+	dev->passive_gc_count = 0;
+	dev->oldest_dirty_gc_count = 0;
+	dev->bg_gcs = 0;
+	dev->gc_block_finder = 0;
+	dev->buffered_block = -1;
+	dev->doing_buffered_block_rewrite = 0;
+	dev->n_deleted_files = 0;
+	dev->n_bg_deletions = 0;
+	dev->n_unlinked_files = 0;
+	dev->n_ecc_fixed = 0;
+	dev->n_ecc_unfixed = 0;
+	dev->n_tags_ecc_fixed = 0;
+	dev->n_tags_ecc_unfixed = 0;
+	dev->n_erase_failures = 0;
+	dev->n_erased_blocks = 0;
+	dev->gc_disable = 0;
+	dev->has_pending_prioritised_gc = 1;
+		/* Assume the worst for now, will get fixed on first GC */
+	INIT_LIST_HEAD(&dev->dirty_dirs);
+	dev->oldest_dirty_seq = 0;
+	dev->oldest_dirty_block = 0;
+
+	/* Initialise temporary buffers and caches. */
+	if (!yaffs_init_tmp_buffers(dev))
+		init_failed = 1;
+
+	dev->cache = NULL;
+	dev->gc_cleanup_list = NULL;
+
+	if (!init_failed && dev->param.n_caches > 0) {
+		int i;
+		void *buf;
+		int cache_bytes =
+		    dev->param.n_caches * sizeof(struct yaffs_cache);
+
+		if (dev->param.n_caches > YAFFS_MAX_SHORT_OP_CACHES)
+			dev->param.n_caches = YAFFS_MAX_SHORT_OP_CACHES;
+
+		dev->cache = kmalloc(cache_bytes, GFP_NOFS);
+
+		buf = (u8 *) dev->cache;
+
+		if (dev->cache)
+			memset(dev->cache, 0, cache_bytes);
+
+		for (i = 0; i < dev->param.n_caches && buf; i++) {
+			dev->cache[i].object = NULL;
+			dev->cache[i].last_use = 0;
+			dev->cache[i].dirty = 0;
+			dev->cache[i].data = buf =
+			    kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
+		}
+		if (!buf)
+			init_failed = 1;
+
+		dev->cache_last_use = 0;
+	}
+
+	dev->cache_hits = 0;
+
+	if (!init_failed) {
+		dev->gc_cleanup_list =
+		    kmalloc(dev->param.chunks_per_block * sizeof(u32),
+					GFP_NOFS);
+		if (!dev->gc_cleanup_list)
+			init_failed = 1;
+	}
+
+	if (dev->param.is_yaffs2)
+		dev->param.use_header_file_size = 1;
+
+	if (!init_failed && !yaffs_init_blocks(dev))
+		init_failed = 1;
+
+	yaffs_init_tnodes_and_objs(dev);
+
+	if (!init_failed && !yaffs_create_initial_dir(dev))
+		init_failed = 1;
+
+	if (!init_failed && dev->param.is_yaffs2 &&
+		!dev->param.disable_summary &&
+		!yaffs_summary_init(dev))
+		init_failed = 1;
+
+	if (!init_failed) {
+		/* Now scan the flash. */
+		if (dev->param.is_yaffs2) {
+			if (yaffs2_checkpt_restore(dev)) {
+				yaffs_check_obj_details_loaded(dev->root_dir);
+				yaffs_trace(YAFFS_TRACE_CHECKPOINT |
+					YAFFS_TRACE_MOUNT,
+					"yaffs: restored from checkpoint"
+					);
+			} else {
+
+				/* Clean up the mess caused by an aborted
+				 * checkpoint load then scan backwards.
+				 */
+				yaffs_deinit_blocks(dev);
+
+				yaffs_deinit_tnodes_and_objs(dev);
+
+				dev->n_erased_blocks = 0;
+				dev->n_free_chunks = 0;
+				dev->alloc_block = -1;
+				dev->alloc_page = -1;
+				dev->n_deleted_files = 0;
+				dev->n_unlinked_files = 0;
+				dev->n_bg_deletions = 0;
+
+				if (!init_failed && !yaffs_init_blocks(dev))
+					init_failed = 1;
+
+				yaffs_init_tnodes_and_objs(dev);
+
+				if (!init_failed
+				    && !yaffs_create_initial_dir(dev))
+					init_failed = 1;
+
+				if (!init_failed && !yaffs2_scan_backwards(dev))
+					init_failed = 1;
+			}
+		} else if (!yaffs1_scan(dev)) {
+			init_failed = 1;
+		}
+
+		yaffs_strip_deleted_objs(dev);
+		yaffs_fix_hanging_objs(dev);
+		if (dev->param.empty_lost_n_found)
+			yaffs_empty_l_n_f(dev);
+	}
+
+	if (init_failed) {
+		/* Clean up the mess */
+		yaffs_trace(YAFFS_TRACE_TRACING,
+		  "yaffs: yaffs_guts_initialise() aborted.");
+
+		yaffs_deinitialise(dev);
+		return YAFFS_FAIL;
+	}
+
+	/* Zero out stats */
+	dev->n_page_reads = 0;
+	dev->n_page_writes = 0;
+	dev->n_erasures = 0;
+	dev->n_gc_copies = 0;
+	dev->n_retried_writes = 0;
+
+	dev->n_retired_blocks = 0;
+
+	yaffs_verify_free_chunks(dev);
+	yaffs_verify_blocks(dev);
+
+	/* Clean up any aborted checkpoint data */
+	if (!dev->is_checkpointed && dev->blocks_in_checkpt > 0)
+		yaffs2_checkpt_invalidate(dev);
+
+	yaffs_trace(YAFFS_TRACE_TRACING,
+	  "yaffs: yaffs_guts_initialise() done.");
+	return YAFFS_OK;
+}
+
+void yaffs_deinitialise(struct yaffs_dev *dev)
+{
+	if (dev->is_mounted) {
+		int i;
+
+		yaffs_deinit_blocks(dev);
+		yaffs_deinit_tnodes_and_objs(dev);
+		yaffs_summary_deinit(dev);
+
+		if (dev->param.n_caches > 0 && dev->cache) {
+
+			for (i = 0; i < dev->param.n_caches; i++) {
+				kfree(dev->cache[i].data);
+				dev->cache[i].data = NULL;
+			}
+
+			kfree(dev->cache);
+			dev->cache = NULL;
+		}
+
+		kfree(dev->gc_cleanup_list);
+
+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
+			kfree(dev->temp_buffer[i].buffer);
+
+		dev->is_mounted = 0;
+
+		yaffs_deinit_nand(dev);
+	}
+}
+
+int yaffs_count_free_chunks(struct yaffs_dev *dev)
+{
+	int n_free = 0;
+	int b;
+	struct yaffs_block_info *blk;
+
+	blk = dev->block_info;
+	for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) {
+		switch (blk->block_state) {
+		case YAFFS_BLOCK_STATE_EMPTY:
+		case YAFFS_BLOCK_STATE_ALLOCATING:
+		case YAFFS_BLOCK_STATE_COLLECTING:
+		case YAFFS_BLOCK_STATE_FULL:
+			n_free +=
+			    (dev->param.chunks_per_block - blk->pages_in_use +
+			     blk->soft_del_pages);
+			break;
+		default:
+			break;
+		}
+		blk++;
+	}
+	return n_free;
+}
+
+int yaffs_get_n_free_chunks(struct yaffs_dev *dev)
+{
+	/* This is what we report to the outside world */
+	int n_free;
+	int n_dirty_caches;
+	int blocks_for_checkpt;
+	int i;
+
+	n_free = dev->n_free_chunks;
+	n_free += dev->n_deleted_files;
+
+	/* Now count and subtract the number of dirty chunks in the cache. */
+
+	for (n_dirty_caches = 0, i = 0; i < dev->param.n_caches; i++) {
+		if (dev->cache[i].dirty)
+			n_dirty_caches++;
+	}
+
+	n_free -= n_dirty_caches;
+
+	n_free -=
+	    ((dev->param.n_reserved_blocks + 1) * dev->param.chunks_per_block);
+
+	/* Now figure checkpoint space and report that... */
+	blocks_for_checkpt = yaffs_calc_checkpt_blocks_required(dev);
+
+	n_free -= (blocks_for_checkpt * dev->param.chunks_per_block);
+
+	if (n_free < 0)
+		n_free = 0;
+
+	return n_free;
+}
+
+
+
+/*
+ * Marshalling functions to get loff_t file sizes into and out of
+ * object headers.
+ */
+void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize)
+{
+	oh->file_size_low = (fsize & 0xFFFFFFFF);
+	oh->file_size_high = ((fsize >> 32) & 0xFFFFFFFF);
+}
+
+loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh)
+{
+	loff_t retval;
+
+	if (sizeof(loff_t) >= 8 && ~(oh->file_size_high))
+		retval = (((loff_t) oh->file_size_high) << 32) |
+			(((loff_t) oh->file_size_low) & 0xFFFFFFFF);
+	else
+		retval = (loff_t) oh->file_size_low;
+
+	return retval;
+}
+
+
+void yaffs_count_blocks_by_state(struct yaffs_dev *dev, int bs[10])
+{
+	int i;
+	struct yaffs_block_info *bi;
+	int s;
+
+	for(i = 0; i < 10; i++)
+		bs[i] = 0;
+
+	for(i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		bi = yaffs_get_block_info(dev, i);
+		s = bi->block_state;
+		if(s > YAFFS_BLOCK_STATE_DEAD || s < YAFFS_BLOCK_STATE_UNKNOWN)
+			bs[0]++;
+		else
+			bs[s]++;
+	}
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.h
new file mode 100644
index 00000000..05785367
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_guts.h
@@ -0,0 +1,1003 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_GUTS_H__
+#define __YAFFS_GUTS_H__
+
+#include "yportenv.h"
+
+#define YAFFS_OK	1
+#define YAFFS_FAIL  0
+
+/* Give us a  Y=0x59,
+ * Give us an A=0x41,
+ * Give us an FF=0xff
+ * Give us an S=0x53
+ * And what have we got...
+ */
+#define YAFFS_MAGIC			0x5941ff53
+
+/*
+ * Tnodes form a tree with the tnodes in "levels"
+ * Levels greater than 0 hold 8 slots which point to other tnodes.
+ * Those at level 0 hold 16 slots which point to chunks in NAND.
+ *
+ * A maximum level of 8 thust supports files of size up to:
+ *
+ * 2^(3*MAX_LEVEL+4)
+ *
+ * Thus a max level of 8 supports files with up to 2^^28 chunks which gives
+ * a maximum file size of around 512Gbytees with 2k chunks.
+ */
+#define YAFFS_NTNODES_LEVEL0		16
+#define YAFFS_TNODES_LEVEL0_BITS	4
+#define YAFFS_TNODES_LEVEL0_MASK	0xf
+
+#define YAFFS_NTNODES_INTERNAL		(YAFFS_NTNODES_LEVEL0 / 2)
+#define YAFFS_TNODES_INTERNAL_BITS	(YAFFS_TNODES_LEVEL0_BITS - 1)
+#define YAFFS_TNODES_INTERNAL_MASK	0x7
+#define YAFFS_TNODES_MAX_LEVEL		8
+#define YAFFS_TNODES_MAX_BITS		(YAFFS_TNODES_LEVEL0_BITS + \
+					YAFFS_TNODES_INTERNAL_BITS * \
+					YAFFS_TNODES_MAX_LEVEL)
+#define YAFFS_MAX_CHUNK_ID		((1 << YAFFS_TNODES_MAX_BITS) - 1)
+
+#define YAFFS_MAX_FILE_SIZE_32		0x7fffffff
+
+/* Constants for YAFFS1 mode */
+#define YAFFS_BYTES_PER_SPARE		16
+#define YAFFS_BYTES_PER_CHUNK		512
+#define YAFFS_CHUNK_SIZE_SHIFT		9
+#define YAFFS_CHUNKS_PER_BLOCK		32
+#define YAFFS_BYTES_PER_BLOCK	(YAFFS_CHUNKS_PER_BLOCK*YAFFS_BYTES_PER_CHUNK)
+
+#define YAFFS_MIN_YAFFS2_CHUNK_SIZE	1024
+#define YAFFS_MIN_YAFFS2_SPARE_SIZE	32
+
+
+
+#define YAFFS_ALLOCATION_NOBJECTS	100
+#define YAFFS_ALLOCATION_NTNODES	100
+#define YAFFS_ALLOCATION_NLINKS		100
+
+#define YAFFS_NOBJECT_BUCKETS		256
+
+#define YAFFS_OBJECT_SPACE		0x40000
+#define YAFFS_MAX_OBJECT_ID		(YAFFS_OBJECT_SPACE - 1)
+
+/* Binary data version stamps */
+#define YAFFS_SUMMARY_VERSION		1
+#define YAFFS_CHECKPOINT_VERSION	7
+
+#ifdef CONFIG_YAFFS_UNICODE
+#define YAFFS_MAX_NAME_LENGTH		127
+#define YAFFS_MAX_ALIAS_LENGTH		79
+#else
+#define YAFFS_MAX_NAME_LENGTH		255
+#define YAFFS_MAX_ALIAS_LENGTH		159
+#endif
+
+#define YAFFS_SHORT_NAME_LENGTH		15
+
+/* Some special object ids for pseudo objects */
+#define YAFFS_OBJECTID_ROOT		1
+#define YAFFS_OBJECTID_LOSTNFOUND	2
+#define YAFFS_OBJECTID_UNLINKED		3
+#define YAFFS_OBJECTID_DELETED		4
+
+/* Fake object Id for summary data */
+#define YAFFS_OBJECTID_SUMMARY		0x10
+
+/* Pseudo object ids for checkpointing */
+#define YAFFS_OBJECTID_CHECKPOINT_DATA	0x20
+#define YAFFS_SEQUENCE_CHECKPOINT_DATA	0x21
+
+#define YAFFS_MAX_SHORT_OP_CACHES	20
+
+#define YAFFS_N_TEMP_BUFFERS		6
+
+/* We limit the number attempts at sucessfully saving a chunk of data.
+ * Small-page devices have 32 pages per block; large-page devices have 64.
+ * Default to something in the order of 5 to 10 blocks worth of chunks.
+ */
+#define YAFFS_WR_ATTEMPTS		(5*64)
+
+/* Sequence numbers are used in YAFFS2 to determine block allocation order.
+ * The range is limited slightly to help distinguish bad numbers from good.
+ * This also allows us to perhaps in the future use special numbers for
+ * special purposes.
+ * EFFFFF00 allows the allocation of 8 blocks/second (~1Mbytes) for 15 years,
+ * and is a larger number than the lifetime of a 2GB device.
+ */
+#define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
+#define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xefffff00
+
+/* Special sequence number for bad block that failed to be marked bad */
+#define YAFFS_SEQUENCE_BAD_BLOCK	0xffff0000
+
+/* ChunkCache is used for short read/write operations.*/
+struct yaffs_cache {
+	struct yaffs_obj *object;
+	int chunk_id;
+	int last_use;
+	int dirty;
+	int n_bytes;		/* Only valid if the cache is dirty */
+	int locked;		/* Can't push out or flush while locked. */
+	u8 *data;
+};
+
+/* yaffs1 tags structures in RAM
+ * NB This uses bitfield. Bitfields should not straddle a u32 boundary
+ * otherwise the structure size will get blown out.
+ */
+
+struct yaffs_tags {
+	unsigned chunk_id:20;
+	unsigned serial_number:2;
+	unsigned n_bytes_lsb:10;
+	unsigned obj_id:18;
+	unsigned ecc:12;
+	unsigned n_bytes_msb:2;
+};
+
+union yaffs_tags_union {
+	struct yaffs_tags as_tags;
+	u8 as_bytes[8];
+};
+
+
+/* Stuff used for extended tags in YAFFS2 */
+
+enum yaffs_ecc_result {
+	YAFFS_ECC_RESULT_UNKNOWN,
+	YAFFS_ECC_RESULT_NO_ERROR,
+	YAFFS_ECC_RESULT_FIXED,
+	YAFFS_ECC_RESULT_UNFIXED
+};
+
+enum yaffs_obj_type {
+	YAFFS_OBJECT_TYPE_UNKNOWN,
+	YAFFS_OBJECT_TYPE_FILE,
+	YAFFS_OBJECT_TYPE_SYMLINK,
+	YAFFS_OBJECT_TYPE_DIRECTORY,
+	YAFFS_OBJECT_TYPE_HARDLINK,
+	YAFFS_OBJECT_TYPE_SPECIAL
+};
+
+#define YAFFS_OBJECT_TYPE_MAX YAFFS_OBJECT_TYPE_SPECIAL
+
+struct yaffs_ext_tags {
+	unsigned chunk_used;	/*  Status of the chunk: used or unused */
+	unsigned obj_id;	/* If 0 this is not used */
+	unsigned chunk_id;	/* If 0 this is a header, else a data chunk */
+	unsigned n_bytes;	/* Only valid for data chunks */
+
+	/* The following stuff only has meaning when we read */
+	enum yaffs_ecc_result ecc_result;
+	unsigned block_bad;
+
+	/* YAFFS 1 stuff */
+	unsigned is_deleted;	/* The chunk is marked deleted */
+	unsigned serial_number;	/* Yaffs1 2-bit serial number */
+
+	/* YAFFS2 stuff */
+	unsigned seq_number;	/* The sequence number of this block */
+
+	/* Extra info if this is an object header (YAFFS2 only) */
+
+	unsigned extra_available;	/* Extra info available if not zero */
+	unsigned extra_parent_id;	/* The parent object */
+	unsigned extra_is_shrink;	/* Is it a shrink header? */
+	unsigned extra_shadows;	/* Does this shadow another object? */
+
+	enum yaffs_obj_type extra_obj_type;	/* What object type? */
+
+	loff_t extra_file_size;		/* Length if it is a file */
+	unsigned extra_equiv_id;	/* Equivalent object for a hard link */
+};
+
+/* Spare structure for YAFFS1 */
+struct yaffs_spare {
+	u8 tb0;
+	u8 tb1;
+	u8 tb2;
+	u8 tb3;
+	u8 page_status;		/* set to 0 to delete the chunk */
+	u8 block_status;
+	u8 tb4;
+	u8 tb5;
+	u8 ecc1[3];
+	u8 tb6;
+	u8 tb7;
+	u8 ecc2[3];
+};
+
+/*Special structure for passing through to mtd */
+struct yaffs_nand_spare {
+	struct yaffs_spare spare;
+	int eccres1;
+	int eccres2;
+};
+
+/* Block data in RAM */
+
+enum yaffs_block_state {
+	YAFFS_BLOCK_STATE_UNKNOWN = 0,
+
+	YAFFS_BLOCK_STATE_SCANNING,
+	/* Being scanned */
+
+	YAFFS_BLOCK_STATE_NEEDS_SCAN,
+	/* The block might have something on it (ie it is allocating or full,
+	 * perhaps empty) but it needs to be scanned to determine its true
+	 * state.
+	 * This state is only valid during scanning.
+	 * NB We tolerate empty because the pre-scanner might be incapable of
+	 * deciding
+	 * However, if this state is returned on a YAFFS2 device,
+	 * then we expect a sequence number
+	 */
+
+	YAFFS_BLOCK_STATE_EMPTY,
+	/* This block is empty */
+
+	YAFFS_BLOCK_STATE_ALLOCATING,
+	/* This block is partially allocated.
+	 * At least one page holds valid data.
+	 * This is the one currently being used for page
+	 * allocation. Should never be more than one of these.
+	 * If a block is only partially allocated at mount it is treated as
+	 * full.
+	 */
+
+	YAFFS_BLOCK_STATE_FULL,
+	/* All the pages in this block have been allocated.
+	 * If a block was only partially allocated when mounted we treat
+	 * it as fully allocated.
+	 */
+
+	YAFFS_BLOCK_STATE_DIRTY,
+	/* The block was full and now all chunks have been deleted.
+	 * Erase me, reuse me.
+	 */
+
+	YAFFS_BLOCK_STATE_CHECKPOINT,
+	/* This block is assigned to holding checkpoint data. */
+
+	YAFFS_BLOCK_STATE_COLLECTING,
+	/* This block is being garbage collected */
+
+	YAFFS_BLOCK_STATE_DEAD
+	    /* This block has failed and is not in use */
+};
+
+#define	YAFFS_NUMBER_OF_BLOCK_STATES (YAFFS_BLOCK_STATE_DEAD + 1)
+
+struct yaffs_block_info {
+
+	int soft_del_pages:10;	/* number of soft deleted pages */
+	int pages_in_use:10;	/* number of pages in use */
+	unsigned block_state:4;	/* One of the above block states. */
+				/* NB use unsigned because enum is sometimes
+				 * an int */
+	u32 needs_retiring:1;	/* Data has failed on this block, */
+				/*need to get valid data off and retire*/
+	u32 skip_erased_check:1;/* Skip the erased check on this block */
+	u32 gc_prioritise:1;	/* An ECC check or blank check has failed.
+				   Block should be prioritised for GC */
+	u32 chunk_error_strikes:3;	/* How many times we've had ecc etc
+				failures on this block and tried to reuse it */
+	u32 has_summary:1;	/* The block has a summary */
+
+	u32 has_shrink_hdr:1;	/* This block has at least one shrink header */
+	u32 seq_number;		/* block sequence number for yaffs2 */
+
+};
+
+/* -------------------------- Object structure -------------------------------*/
+/* This is the object structure as stored on NAND */
+
+struct yaffs_obj_hdr {
+	enum yaffs_obj_type type;
+
+	/* Apply to everything  */
+	int parent_obj_id;
+	u16 sum_no_longer_used;	/* checksum of name. No longer used */
+	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+
+	/* The following apply to all object types except for hard links */
+	u32 yst_mode;		/* protection */
+
+	u32 yst_uid;
+	u32 yst_gid;
+	u32 yst_atime;
+	u32 yst_mtime;
+	u32 yst_ctime;
+
+	/* File size  applies to files only */
+	u32 file_size_low;
+
+	/* Equivalent object id applies to hard links only. */
+	int equiv_id;
+
+	/* Alias is for symlinks only. */
+	YCHAR alias[YAFFS_MAX_ALIAS_LENGTH + 1];
+
+	u32 yst_rdev;	/* stuff for block and char devices (major/min) */
+
+	u32 win_ctime[2];
+	u32 win_atime[2];
+	u32 win_mtime[2];
+
+	u32 inband_shadowed_obj_id;
+	u32 inband_is_shrink;
+
+	u32 file_size_high;
+	u32 reserved[1];
+	int shadows_obj;	/* This object header shadows the
+				specified object if > 0 */
+
+	/* is_shrink applies to object headers written when wemake a hole. */
+	u32 is_shrink;
+
+};
+
+/*--------------------------- Tnode -------------------------- */
+
+struct yaffs_tnode {
+	struct yaffs_tnode *internal[YAFFS_NTNODES_INTERNAL];
+};
+
+/*------------------------  Object -----------------------------*/
+/* An object can be one of:
+ * - a directory (no data, has children links
+ * - a regular file (data.... not prunes :->).
+ * - a symlink [symbolic link] (the alias).
+ * - a hard link
+ */
+
+struct yaffs_file_var {
+	loff_t file_size;
+	loff_t scanned_size;
+	loff_t shrink_size;
+	int top_level;
+	struct yaffs_tnode *top;
+};
+
+struct yaffs_dir_var {
+	struct list_head children;	/* list of child links */
+	struct list_head dirty;	/* Entry for list of dirty directories */
+};
+
+struct yaffs_symlink_var {
+	YCHAR *alias;
+};
+
+struct yaffs_hardlink_var {
+	struct yaffs_obj *equiv_obj;
+	u32 equiv_id;
+};
+
+union yaffs_obj_var {
+	struct yaffs_file_var file_variant;
+	struct yaffs_dir_var dir_variant;
+	struct yaffs_symlink_var symlink_variant;
+	struct yaffs_hardlink_var hardlink_variant;
+};
+
+struct yaffs_obj {
+	u8 deleted:1;		/* This should only apply to unlinked files. */
+	u8 soft_del:1;		/* it has also been soft deleted */
+	u8 unlinked:1;		/* An unlinked file.*/
+	u8 fake:1;		/* A fake object has no presence on NAND. */
+	u8 rename_allowed:1;	/* Some objects cannot be renamed. */
+	u8 unlink_allowed:1;
+	u8 dirty:1;		/* the object needs to be written to flash */
+	u8 valid:1;		/* When the file system is being loaded up, this
+				 * object might be created before the data
+				 * is available
+				 * ie. file data chunks encountered before
+				* the header.
+				 */
+	u8 lazy_loaded:1;	/* This object has been lazy loaded and
+				 * is missing some detail */
+
+	u8 defered_free:1;	/* Object is removed from NAND, but is
+				 * still in the inode cache.
+				 * Free of object is defered.
+				 * until the inode is released.
+				 */
+	u8 being_created:1;	/* This object is still being created
+				 * so skip some verification checks. */
+	u8 is_shadowed:1;	/* This object is shadowed on the way
+				 * to being renamed. */
+
+	u8 xattr_known:1;	/* We know if this has object has xattribs
+				 * or not. */
+	u8 has_xattr:1;		/* This object has xattribs.
+				 * Only valid if xattr_known. */
+
+	u8 serial;		/* serial number of chunk in NAND.*/
+	u16 sum;		/* sum of the name to speed searching */
+
+	struct yaffs_dev *my_dev;	/* The device I'm on */
+
+	struct list_head hash_link;	/* list of objects in hash bucket */
+
+	struct list_head hard_links;	/* hard linked object chain*/
+
+	/* directory structure stuff */
+	/* also used for linking up the free list */
+	struct yaffs_obj *parent;
+	struct list_head siblings;
+
+	/* Where's my object header in NAND? */
+	int hdr_chunk;
+
+	int n_data_chunks;	/* Number of data chunks for this file. */
+
+	u32 obj_id;		/* the object id value */
+
+	u32 yst_mode;
+
+	YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1];
+
+#ifdef CONFIG_YAFFS_WINCE
+	u32 win_ctime[2];
+	u32 win_mtime[2];
+	u32 win_atime[2];
+#else
+	u32 yst_uid;
+	u32 yst_gid;
+	u32 yst_atime;
+	u32 yst_mtime;
+	u32 yst_ctime;
+#endif
+
+	u32 yst_rdev;
+
+	void *my_inode;
+
+	enum yaffs_obj_type variant_type;
+
+	union yaffs_obj_var variant;
+
+};
+
+struct yaffs_obj_bucket {
+	struct list_head list;
+	int count;
+};
+
+/* yaffs_checkpt_obj holds the definition of an object as dumped
+ * by checkpointing.
+ */
+
+struct yaffs_checkpt_obj {
+	int struct_type;
+	u32 obj_id;
+	u32 parent_id;
+	int hdr_chunk;
+	enum yaffs_obj_type variant_type:3;
+	u8 deleted:1;
+	u8 soft_del:1;
+	u8 unlinked:1;
+	u8 fake:1;
+	u8 rename_allowed:1;
+	u8 unlink_allowed:1;
+	u8 serial;
+	int n_data_chunks;
+	loff_t size_or_equiv_obj;
+};
+
+/*--------------------- Temporary buffers ----------------
+ *
+ * These are chunk-sized working buffers. Each device has a few.
+ */
+
+struct yaffs_buffer {
+	u8 *buffer;
+	int in_use;
+};
+
+/*----------------- Device ---------------------------------*/
+
+struct yaffs_param {
+	const YCHAR *name;
+
+	/*
+	 * Entry parameters set up way early. Yaffs sets up the rest.
+	 * The structure should be zeroed out before use so that unused
+	 * and default values are zero.
+	 */
+
+	int inband_tags;	/* Use unband tags */
+	u32 total_bytes_per_chunk;	/* Should be >= 512, does not need to
+					 be a power of 2 */
+	int chunks_per_block;	/* does not need to be a power of 2 */
+	int spare_bytes_per_chunk;	/* spare area size */
+	int start_block;	/* Start block we're allowed to use */
+	int end_block;		/* End block we're allowed to use */
+	int n_reserved_blocks;	/* Tuneable so that we can reduce
+				 * reserved blocks on NOR and RAM. */
+
+	int n_caches;		/* If <= 0, then short op caching is disabled,
+				 * else the number of short op caches.
+				 */
+	int cache_bypass_aligned; /* If non-zero then bypass the cache for
+				   * aligned writes.
+				   */
+
+	int use_nand_ecc;	/* Flag to decide whether or not to use
+				 * NAND driver ECC on data (yaffs1) */
+	int tags_9bytes;	/* Use 9 byte tags */
+	int no_tags_ecc;	/* Flag to decide whether or not to do ECC
+				 * on packed tags (yaffs2) */
+
+	int is_yaffs2;		/* Use yaffs2 mode on this device */
+
+	int empty_lost_n_found;	/* Auto-empty lost+found directory on mount */
+
+	int refresh_period;	/* How often to check for a block refresh */
+
+	/* Checkpoint control. Can be set before or after initialisation */
+	u8 skip_checkpt_rd;
+	u8 skip_checkpt_wr;
+
+	int enable_xattr;	/* Enable xattribs */
+
+	int max_objects;	/*
+				 * Set to limit the number of objects created.
+				 * 0 = no limit.
+				*/
+
+	/* The remove_obj_fn function must be supplied by OS flavours that
+	 * need it.
+	 * yaffs direct uses it to implement the faster readdir.
+	 * Linux uses it to protect the directory during unlocking.
+	 */
+	void (*remove_obj_fn) (struct yaffs_obj *obj);
+
+	/* Callback to mark the superblock dirty */
+	void (*sb_dirty_fn) (struct yaffs_dev *dev);
+
+	/*  Callback to control garbage collection. */
+	unsigned (*gc_control_fn) (struct yaffs_dev *dev);
+
+	/* Debug control flags. Don't use unless you know what you're doing */
+	int use_header_file_size;	/* Flag to determine if we should use
+					 * file sizes from the header */
+	int disable_lazy_load;	/* Disable lazy loading on this device */
+	int wide_tnodes_disabled;	/* Set to disable wide tnodes */
+	int disable_soft_del;	/* yaffs 1 only: Set to disable the use of
+				 * softdeletion. */
+
+	int defered_dir_update;	/* Set to defer directory updates */
+
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
+	int auto_unicode;
+#endif
+	int always_check_erased;	/* Force chunk erased check always on */
+
+	int disable_summary;
+	int disable_bad_block_marking;
+
+};
+
+struct yaffs_driver {
+	int (*drv_write_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
+				   const u8 *data, int data_len,
+				   const u8 *oob, int oob_len);
+	int (*drv_read_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
+				   u8 *data, int data_len,
+				   u8 *oob, int oob_len,
+				   enum yaffs_ecc_result *ecc_result);
+	int (*drv_erase_fn) (struct yaffs_dev *dev, int block_no);
+	int (*drv_mark_bad_fn) (struct yaffs_dev *dev, int block_no);
+	int (*drv_check_bad_fn) (struct yaffs_dev *dev, int block_no);
+	int (*drv_initialise_fn) (struct yaffs_dev *dev);
+	int (*drv_deinitialise_fn) (struct yaffs_dev *dev);
+};
+
+struct yaffs_tags_handler {
+	int (*write_chunk_tags_fn) (struct yaffs_dev *dev,
+				    int nand_chunk, const u8 *data,
+				    const struct yaffs_ext_tags *tags);
+	int (*read_chunk_tags_fn) (struct yaffs_dev *dev,
+				   int nand_chunk, u8 *data,
+				   struct yaffs_ext_tags *tags);
+
+	int (*query_block_fn) (struct yaffs_dev *dev, int block_no,
+			       enum yaffs_block_state *state,
+			       u32 *seq_number);
+	int (*mark_bad_fn) (struct yaffs_dev *dev, int block_no);
+};
+
+struct yaffs_dev {
+	struct yaffs_param param;
+	struct yaffs_driver drv;
+	struct yaffs_tags_handler tagger;
+
+	/* Context storage. Holds extra OS specific data for this device */
+
+	void *os_context;
+	void *driver_context;
+
+	struct list_head dev_list;
+
+	int ll_init;
+	/* Runtime parameters. Set up by YAFFS. */
+	int data_bytes_per_chunk;
+
+	/* Non-wide tnode stuff */
+	u16 chunk_grp_bits;	/* Number of bits that need to be resolved if
+				 * the tnodes are not wide enough.
+				 */
+	u16 chunk_grp_size;	/* == 2^^chunk_grp_bits */
+
+	/* Stuff to support wide tnodes */
+	u32 tnode_width;
+	u32 tnode_mask;
+	u32 tnode_size;
+
+	/* Stuff for figuring out file offset to chunk conversions */
+	u32 chunk_shift;	/* Shift value */
+	u32 chunk_div;		/* Divisor after shifting: 1 for 2^n sizes */
+	u32 chunk_mask;		/* Mask to use for power-of-2 case */
+
+	int is_mounted;
+	int read_only;
+	int is_checkpointed;
+
+	/* Stuff to support block offsetting to support start block zero */
+	int internal_start_block;
+	int internal_end_block;
+	int block_offset;
+	int chunk_offset;
+
+	/* Runtime checkpointing stuff */
+	int checkpt_page_seq;	/* running sequence number of checkpt pages */
+	int checkpt_byte_count;
+	int checkpt_byte_offs;
+	u8 *checkpt_buffer;
+	int checkpt_open_write;
+	int blocks_in_checkpt;
+	int checkpt_cur_chunk;
+	int checkpt_cur_block;
+	int checkpt_next_block;
+	int *checkpt_block_list;
+	int checkpt_max_blocks;
+	u32 checkpt_sum;
+	u32 checkpt_xor;
+
+	int checkpoint_blocks_required;	/* Number of blocks needed to store
+					 * current checkpoint set */
+
+	/* Block Info */
+	struct yaffs_block_info *block_info;
+	u8 *chunk_bits;		/* bitmap of chunks in use */
+	unsigned block_info_alt:1;	/* allocated using alternative alloc */
+	unsigned chunk_bits_alt:1;	/* allocated using alternative alloc */
+	int chunk_bit_stride;	/* Number of bytes of chunk_bits per block.
+				 * Must be consistent with chunks_per_block.
+				 */
+
+	int n_erased_blocks;
+	int alloc_block;	/* Current block being allocated off */
+	u32 alloc_page;
+	int alloc_block_finder;	/* Used to search for next allocation block */
+
+	/* Object and Tnode memory management */
+	void *allocator;
+	int n_obj;
+	int n_tnodes;
+
+	int n_hardlinks;
+
+	struct yaffs_obj_bucket obj_bucket[YAFFS_NOBJECT_BUCKETS];
+	u32 bucket_finder;
+
+	int n_free_chunks;
+
+	/* Garbage collection control */
+	u32 *gc_cleanup_list;	/* objects to delete at the end of a GC. */
+	u32 n_clean_ups;
+
+	unsigned has_pending_prioritised_gc;	/* We think this device might
+						have pending prioritised gcs */
+	unsigned gc_disable;
+	unsigned gc_block_finder;
+	unsigned gc_dirtiest;
+	unsigned gc_pages_in_use;
+	unsigned gc_not_done;
+	unsigned gc_block;
+	unsigned gc_chunk;
+	unsigned gc_skip;
+	struct yaffs_summary_tags *gc_sum_tags;
+
+	/* Special directories */
+	struct yaffs_obj *root_dir;
+	struct yaffs_obj *lost_n_found;
+
+	int buffered_block;	/* Which block is buffered here? */
+	int doing_buffered_block_rewrite;
+
+	struct yaffs_cache *cache;
+	int cache_last_use;
+
+	/* Stuff for background deletion and unlinked files. */
+	struct yaffs_obj *unlinked_dir;	/* Directory where unlinked and deleted
+					 files live. */
+	struct yaffs_obj *del_dir;	/* Directory where deleted objects are
+					sent to disappear. */
+	struct yaffs_obj *unlinked_deletion;	/* Current file being
+							background deleted. */
+	int n_deleted_files;	/* Count of files awaiting deletion; */
+	int n_unlinked_files;	/* Count of unlinked files. */
+	int n_bg_deletions;	/* Count of background deletions. */
+
+	/* Temporary buffer management */
+	struct yaffs_buffer temp_buffer[YAFFS_N_TEMP_BUFFERS];
+	int max_temp;
+	int temp_in_use;
+	int unmanaged_buffer_allocs;
+	int unmanaged_buffer_deallocs;
+
+	/* yaffs2 runtime stuff */
+	unsigned seq_number;	/* Sequence number of currently
+					allocating block */
+	unsigned oldest_dirty_seq;
+	unsigned oldest_dirty_block;
+
+	/* Block refreshing */
+	int refresh_skip;	/* A skip down counter.
+				 * Refresh happens when this gets to zero. */
+
+	/* Dirty directory handling */
+	struct list_head dirty_dirs;	/* List of dirty directories */
+
+	/* Summary */
+	int chunks_per_summary;
+	struct yaffs_summary_tags *sum_tags;
+
+	/* Statistics */
+	u32 n_page_writes;
+	u32 n_page_reads;
+	u32 n_erasures;
+	u32 n_bad_markings;
+	u32 n_erase_failures;
+	u32 n_gc_copies;
+	u32 all_gcs;
+	u32 passive_gc_count;
+	u32 oldest_dirty_gc_count;
+	u32 n_gc_blocks;
+	u32 bg_gcs;
+	u32 n_retried_writes;
+	u32 n_retired_blocks;
+	u32 n_ecc_fixed;
+	u32 n_ecc_unfixed;
+	u32 n_tags_ecc_fixed;
+	u32 n_tags_ecc_unfixed;
+	u32 n_deletions;
+	u32 n_unmarked_deletions;
+	u32 refresh_count;
+	u32 cache_hits;
+	u32 tags_used;
+	u32 summary_used;
+
+};
+
+/* The CheckpointDevice structure holds the device information that changes
+ *at runtime and must be preserved over unmount/mount cycles.
+ */
+struct yaffs_checkpt_dev {
+	int struct_type;
+	int n_erased_blocks;
+	int alloc_block;	/* Current block being allocated off */
+	u32 alloc_page;
+	int n_free_chunks;
+
+	int n_deleted_files;	/* Count of files awaiting deletion; */
+	int n_unlinked_files;	/* Count of unlinked files. */
+	int n_bg_deletions;	/* Count of background deletions. */
+
+	/* yaffs2 runtime stuff */
+	unsigned seq_number;	/* Sequence number of currently
+				 * allocating block */
+
+};
+
+struct yaffs_checkpt_validity {
+	int struct_type;
+	u32 magic;
+	u32 version;
+	u32 head;
+};
+
+struct yaffs_shadow_fixer {
+	int obj_id;
+	int shadowed_id;
+	struct yaffs_shadow_fixer *next;
+};
+
+/* Structure for doing xattr modifications */
+struct yaffs_xattr_mod {
+	int set;		/* If 0 then this is a deletion */
+	const YCHAR *name;
+	const void *data;
+	int size;
+	int flags;
+	int result;
+};
+
+/*----------------------- YAFFS Functions -----------------------*/
+
+int yaffs_guts_initialise(struct yaffs_dev *dev);
+void yaffs_deinitialise(struct yaffs_dev *dev);
+
+int yaffs_get_n_free_chunks(struct yaffs_dev *dev);
+
+int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name,
+		     struct yaffs_obj *new_dir, const YCHAR * new_name);
+
+int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR * name);
+int yaffs_del_obj(struct yaffs_obj *obj);
+
+int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size);
+loff_t yaffs_get_obj_length(struct yaffs_obj *obj);
+int yaffs_get_obj_inode(struct yaffs_obj *obj);
+unsigned yaffs_get_obj_type(struct yaffs_obj *obj);
+int yaffs_get_obj_link_count(struct yaffs_obj *obj);
+
+/* File operations */
+int yaffs_file_rd(struct yaffs_obj *obj, u8 * buffer, loff_t offset,
+		  int n_bytes);
+int yaffs_wr_file(struct yaffs_obj *obj, const u8 * buffer, loff_t offset,
+		  int n_bytes, int write_trhrough);
+int yaffs_resize_file(struct yaffs_obj *obj, loff_t new_size);
+
+struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
+				    const YCHAR *name, u32 mode, u32 uid,
+				    u32 gid);
+
+int yaffs_flush_file(struct yaffs_obj *obj, int update_time, int data_sync);
+
+/* Flushing and checkpointing */
+void yaffs_flush_whole_cache(struct yaffs_dev *dev);
+
+int yaffs_checkpoint_save(struct yaffs_dev *dev);
+int yaffs_checkpoint_restore(struct yaffs_dev *dev);
+
+/* Directory operations */
+struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR *name,
+				   u32 mode, u32 uid, u32 gid);
+struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *the_dir,
+				     const YCHAR *name);
+struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number);
+
+/* Link operations */
+struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR *name,
+				 struct yaffs_obj *equiv_obj);
+
+struct yaffs_obj *yaffs_get_equivalent_obj(struct yaffs_obj *obj);
+
+/* Symlink operations */
+struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
+				       const YCHAR *name, u32 mode, u32 uid,
+				       u32 gid, const YCHAR *alias);
+YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj);
+
+/* Special inodes (fifos, sockets and devices) */
+struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent,
+				       const YCHAR *name, u32 mode, u32 uid,
+				       u32 gid, u32 rdev);
+
+int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR *name,
+		      const void *value, int size, int flags);
+int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR *name, void *value,
+		      int size);
+int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size);
+int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR *name);
+
+/* Special directories */
+struct yaffs_obj *yaffs_root(struct yaffs_dev *dev);
+struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev);
+
+void yaffs_handle_defered_free(struct yaffs_obj *obj);
+
+void yaffs_update_dirty_dirs(struct yaffs_dev *dev);
+
+int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency);
+
+/* Debug dump  */
+int yaffs_dump_obj(struct yaffs_obj *obj);
+
+void yaffs_guts_test(struct yaffs_dev *dev);
+int yaffs_guts_ll_init(struct yaffs_dev *dev);
+
+
+/* A few useful functions to be used within the core files*/
+void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
+		     int lyn);
+int yaffs_check_ff(u8 *buffer, int n_bytes);
+void yaffs_handle_chunk_error(struct yaffs_dev *dev,
+			      struct yaffs_block_info *bi);
+
+u8 *yaffs_get_temp_buffer(struct yaffs_dev *dev);
+void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer);
+
+struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
+						 int number,
+						 enum yaffs_obj_type type);
+int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
+			    int nand_chunk, int in_scan);
+void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR *name);
+void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
+				const struct yaffs_obj_hdr *oh);
+void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj);
+YCHAR *yaffs_clone_str(const YCHAR *str);
+void yaffs_link_fixup(struct yaffs_dev *dev, struct list_head *hard_list);
+void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no);
+int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name,
+		    int force, int is_shrink, int shadows,
+		    struct yaffs_xattr_mod *xop);
+void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id,
+			       int backward_scanning);
+int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks);
+struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev);
+struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev,
+					   struct yaffs_file_var *file_struct,
+					   u32 chunk_id,
+					   struct yaffs_tnode *passed_tn);
+
+int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
+		     int n_bytes, int write_trhrough);
+void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size);
+void yaffs_skip_rest_of_block(struct yaffs_dev *dev);
+
+int yaffs_count_free_chunks(struct yaffs_dev *dev);
+
+struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
+				       struct yaffs_file_var *file_struct,
+				       u32 chunk_id);
+
+u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
+			 unsigned pos);
+
+int yaffs_is_non_empty_dir(struct yaffs_obj *obj);
+
+int yaffs_format_dev(struct yaffs_dev *dev);
+
+void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
+				int *chunk_out, u32 *offset_out);
+/*
+ * Marshalling functions to get loff_t file sizes into aand out of
+ * object headers.
+ */
+void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize);
+loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh);
+loff_t yaffs_max_file_size(struct yaffs_dev *dev);
+
+/*
+ * Debug function to count number of blocks in each state
+ * NB Needs to be called with correct number of integers
+ */
+
+void yaffs_count_blocks_by_state(struct yaffs_dev *dev, int bs[10]);
+
+int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
+				    struct yaffs_ext_tags *tags);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_linux.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_linux.h
new file mode 100644
index 00000000..c20ab14b
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_linux.h
@@ -0,0 +1,48 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_LINUX_H__
+#define __YAFFS_LINUX_H__
+
+#include "yportenv.h"
+
+struct yaffs_linux_context {
+	struct list_head context_list;	/* List of these we have mounted */
+	struct yaffs_dev *dev;
+	struct super_block *super;
+	struct task_struct *bg_thread;	/* Background thread for this device */
+	int bg_running;
+	struct mutex gross_lock;	/* Gross locking mutex*/
+	u8 *spare_buffer;	/* For mtdif2 use. Don't know the buffer size
+				 * at compile time so we have to allocate it.
+				 */
+	struct list_head search_contexts;
+	struct task_struct *readdir_process;
+	unsigned mount_id;
+	int dirty;
+};
+
+#define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
+#define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+#define WRITE_SIZE_STR "writesize"
+#define WRITE_SIZE(mtd) ((mtd)->writesize)
+#else
+#define WRITE_SIZE_STR "oobblock"
+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
+#endif
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.c
new file mode 100644
index 00000000..7ae63c54
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.c
@@ -0,0 +1,308 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yportenv.h"
+
+#include "yaffs_mtdif.h"
+
+#include "linux/mtd/mtd.h"
+#include "linux/types.h"
+#include "linux/time.h"
+#include "linux/mtd/nand.h"
+#include "linux/kernel.h"
+#include "linux/version.h"
+#include "linux/types.h"
+
+#include "yaffs_trace.h"
+#include "yaffs_guts.h"
+#include "yaffs_linux.h"
+
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
+#define MTD_OPS_AUTO_OOB MTD_OOB_AUTO
+#endif
+
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+#define mtd_erase(m, ei) (m)->erase(m, ei)
+#define mtd_write_oob(m, addr, pops) (m)->write_oob(m, addr, pops)
+#define mtd_read_oob(m, addr, pops) (m)->read_oob(m, addr, pops)
+#define mtd_block_isbad(m, offs) (m)->block_isbad(m, offs)
+#define mtd_block_markbad(m, offs) (m)->block_markbad(m, offs)
+#endif
+
+
+
+int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
+{
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+	u32 addr =
+	    ((loff_t) block_no) * dev->param.total_bytes_per_chunk *
+	    dev->param.chunks_per_block;
+	struct erase_info ei;
+	int retval = 0;
+
+	ei.mtd = mtd;
+	ei.addr = addr;
+	ei.len = dev->param.total_bytes_per_chunk * dev->param.chunks_per_block;
+	ei.time = 1000;
+	ei.retries = 2;
+	ei.callback = NULL;
+	ei.priv = (u_long) dev;
+
+	retval = mtd_erase(mtd, &ei);
+
+	if (retval == 0)
+		return YAFFS_OK;
+
+	return YAFFS_FAIL;
+}
+
+
+static 	int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk,
+				   const u8 *data, int data_len,
+				   const u8 *oob, int oob_len)
+{
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+	loff_t addr;
+	struct mtd_oob_ops ops;
+	int retval;
+
+	yaffs_trace(YAFFS_TRACE_MTD,
+			"yaffs_mtd_write(%p, %d, %p, %d, %p, %d)\n",
+			dev, nand_chunk, data, data_len, oob, oob_len);
+
+	if (!data || !data_len) {
+		data = NULL;
+		data_len = 0;
+	}
+
+	if (!oob || !oob_len) {
+		oob = NULL;
+		oob_len = 0;
+	}
+
+	addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
+	memset(&ops, 0, sizeof(ops));
+	ops.mode = MTD_OPS_AUTO_OOB;
+	ops.len = (data) ? data_len : 0;
+	ops.ooblen = oob_len;
+	ops.datbuf = (u8 *)data;
+	ops.oobbuf = (u8 *)oob;
+
+	retval = mtd_write_oob(mtd, addr, &ops);
+	if (retval) {
+		yaffs_trace(YAFFS_TRACE_MTD,
+			"write_oob failed, chunk %d, mtd error %d",
+			nand_chunk, retval);
+	}
+	return retval ? YAFFS_FAIL : YAFFS_OK;
+}
+
+static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk,
+				   u8 *data, int data_len,
+				   u8 *oob, int oob_len,
+				   enum yaffs_ecc_result *ecc_result)
+{
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+	loff_t addr;
+	struct mtd_oob_ops ops;
+	int retval;
+
+	addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
+	memset(&ops, 0, sizeof(ops));
+	ops.mode = MTD_OPS_AUTO_OOB;
+	ops.len = (data) ? data_len : 0;
+	ops.ooblen = oob_len;
+	ops.datbuf = data;
+	ops.oobbuf = oob;
+
+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
+	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
+	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
+	 */
+	ops.len = (ops.datbuf) ? ops.len : ops.ooblen;
+#endif
+	/* Read page and oob using MTD.
+	 * Check status and determine ECC result.
+	 */
+	retval = mtd_read_oob(mtd, addr, &ops);
+	if (retval)
+		yaffs_trace(YAFFS_TRACE_MTD,
+			"read_oob failed, chunk %d, mtd error %d",
+			nand_chunk, retval);
+
+	switch (retval) {
+	case 0:
+		/* no error */
+		if(ecc_result)
+			*ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+		break;
+
+	case -EUCLEAN:
+		/* MTD's ECC fixed the data */
+		if(ecc_result)
+			*ecc_result = YAFFS_ECC_RESULT_FIXED;
+		dev->n_ecc_fixed++;
+		break;
+
+	case -EBADMSG:
+	default:
+		/* MTD's ECC could not fix the data */
+		dev->n_ecc_unfixed++;
+		if(ecc_result)
+			*ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+		return YAFFS_FAIL;
+	}
+
+	return YAFFS_OK;
+}
+
+static 	int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no)
+{
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+
+	loff_t addr;
+	struct erase_info ei;
+	int retval = 0;
+	u32 block_size;
+
+	block_size = dev->param.total_bytes_per_chunk *
+		     dev->param.chunks_per_block;
+	addr = ((loff_t) block_no) * block_size;
+
+	ei.mtd = mtd;
+	ei.addr = addr;
+	ei.len = block_size;
+	ei.time = 1000;
+	ei.retries = 2;
+	ei.callback = NULL;
+	ei.priv = (u_long) dev;
+
+	retval = mtd_erase(mtd, &ei);
+
+	if (retval == 0)
+		return YAFFS_OK;
+
+	return YAFFS_FAIL;
+}
+
+static int yaffs_mtd_mark_bad(struct yaffs_dev *dev, int block_no)
+{
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+	int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk;
+	int retval;
+
+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", block_no);
+
+	retval = mtd_block_markbad(mtd, (loff_t) blocksize * block_no);
+	return (retval) ? YAFFS_FAIL : YAFFS_OK;
+}
+
+static int yaffs_mtd_check_bad(struct yaffs_dev *dev, int block_no)
+{
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+	int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk;
+	int retval;
+
+	yaffs_trace(YAFFS_TRACE_MTD, "checking block %d bad", block_no);
+
+	retval = mtd_block_isbad(mtd, (loff_t) blocksize * block_no);
+	return (retval) ? YAFFS_FAIL : YAFFS_OK;
+}
+
+static int yaffs_mtd_initialise(struct yaffs_dev *dev)
+{
+	return YAFFS_OK;
+}
+
+static int yaffs_mtd_deinitialise(struct yaffs_dev *dev)
+{
+	return YAFFS_OK;
+}
+
+
+void yaffs_mtd_drv_install(struct yaffs_dev *dev)
+{
+	struct yaffs_driver *drv = &dev->drv;
+
+	drv->drv_write_chunk_fn = yaffs_mtd_write;
+	drv->drv_read_chunk_fn = yaffs_mtd_read;
+	drv->drv_erase_fn = yaffs_mtd_erase;
+	drv->drv_mark_bad_fn = yaffs_mtd_mark_bad;
+	drv->drv_check_bad_fn = yaffs_mtd_check_bad;
+	drv->drv_initialise_fn = yaffs_mtd_initialise;
+	drv->drv_deinitialise_fn = yaffs_mtd_deinitialise;
+}
+
+
+struct mtd_info * yaffs_get_mtd_device(dev_t sdev)
+{
+	struct mtd_info *mtd;
+
+	mtd = yaffs_get_mtd_device(sdev);
+
+	/* Check it's an mtd device..... */
+	if (MAJOR(sdev) != MTD_BLOCK_MAJOR)
+		return NULL;	/* This isn't an mtd device */
+
+	/* Check it's NAND */
+	if (mtd->type != MTD_NANDFLASH) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"yaffs: MTD device is not NAND it's type %d",
+			mtd->type);
+		return NULL;
+	}
+
+	yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd));
+	yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize);
+	yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+	yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size);
+#else
+	yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size);
+#endif
+
+	return mtd;
+}
+
+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
+{
+	if (yaffs_version == 2) {
+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+		     mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
+		    !inband_tags) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"MTD device does not have the right page sizes"
+			);
+			return -1;
+		}
+	} else {
+		if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
+		    mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"MTD device does not support have the right page sizes"
+			);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+
+void yaffs_put_mtd_device(struct mtd_info *mtd)
+{
+	if(mtd)
+		put_mtd_device(mtd);
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.h
new file mode 100644
index 00000000..9cff224c
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_mtdif.h
@@ -0,0 +1,25 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_MTDIF_H__
+#define __YAFFS_MTDIF_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_mtd_drv_install(struct yaffs_dev *dev);
+struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
+void yaffs_put_mtd_device(struct mtd_info *mtd);
+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.c
new file mode 100644
index 00000000..4bdf4ed7
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.c
@@ -0,0 +1,208 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * This simple implementation of a name-value store assumes a small number of
+* values and fits into a small finite buffer.
+ *
+ * Each attribute is stored as a record:
+ *  sizeof(int) bytes   record size.
+ *  strnlen+1 bytes name null terminated.
+ *  nbytes    value.
+ *  ----------
+ *  total size  stored in record size
+ *
+ * This code has not been tested with unicode yet.
+ */
+
+#include "yaffs_nameval.h"
+
+#include "yportenv.h"
+
+static int nval_find(const char *xb, int xb_size, const YCHAR *name,
+		     int *exist_size)
+{
+	int pos = 0;
+	int size;
+
+	memcpy(&size, xb, sizeof(int));
+	while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
+		if (!strncmp((YCHAR *) (xb + pos + sizeof(int)),
+				name, size)) {
+			if (exist_size)
+				*exist_size = size;
+			return pos;
+		}
+		pos += size;
+		if (pos < xb_size - sizeof(int))
+			memcpy(&size, xb + pos, sizeof(int));
+		else
+			size = 0;
+	}
+	if (exist_size)
+		*exist_size = 0;
+	return -ENODATA;
+}
+
+static int nval_used(const char *xb, int xb_size)
+{
+	int pos = 0;
+	int size;
+
+	memcpy(&size, xb + pos, sizeof(int));
+	while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
+		pos += size;
+		if (pos < xb_size - sizeof(int))
+			memcpy(&size, xb + pos, sizeof(int));
+		else
+			size = 0;
+	}
+	return pos;
+}
+
+int nval_del(char *xb, int xb_size, const YCHAR *name)
+{
+	int pos = nval_find(xb, xb_size, name, NULL);
+	int size;
+
+	if (pos < 0 || pos >= xb_size)
+		return -ENODATA;
+
+	/* Find size, shift rest over this record,
+	 * then zero out the rest of buffer */
+	memcpy(&size, xb + pos, sizeof(int));
+	memcpy(xb + pos, xb + pos + size, xb_size - (pos + size));
+	memset(xb + (xb_size - size), 0, size);
+	return 0;
+}
+
+int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf,
+		int bsize, int flags)
+{
+	int pos;
+	int namelen = strnlen(name, xb_size);
+	int reclen;
+	int size_exist = 0;
+	int space;
+	int start;
+
+	pos = nval_find(xb, xb_size, name, &size_exist);
+
+	if (flags & XATTR_CREATE && pos >= 0)
+		return -EEXIST;
+	if (flags & XATTR_REPLACE && pos < 0)
+		return -ENODATA;
+
+	start = nval_used(xb, xb_size);
+	space = xb_size - start + size_exist;
+
+	reclen = (sizeof(int) + namelen + 1 + bsize);
+
+	if (reclen > space)
+		return -ENOSPC;
+
+	if (pos >= 0) {
+		nval_del(xb, xb_size, name);
+		start = nval_used(xb, xb_size);
+	}
+
+	pos = start;
+
+	memcpy(xb + pos, &reclen, sizeof(int));
+	pos += sizeof(int);
+	strncpy((YCHAR *) (xb + pos), name, reclen);
+	pos += (namelen + 1);
+	memcpy(xb + pos, buf, bsize);
+	return 0;
+}
+
+int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf,
+	     int bsize)
+{
+	int pos = nval_find(xb, xb_size, name, NULL);
+	int size;
+
+	if (pos >= 0 && pos < xb_size) {
+
+		memcpy(&size, xb + pos, sizeof(int));
+		pos += sizeof(int);	/* advance past record length */
+		size -= sizeof(int);
+
+		/* Advance over name string */
+		while (xb[pos] && size > 0 && pos < xb_size) {
+			pos++;
+			size--;
+		}
+		/*Advance over NUL */
+		pos++;
+		size--;
+
+		/* If bsize is zero then this is a size query.
+		 * Return the size, but don't copy.
+		 */
+		if (!bsize)
+			return size;
+
+		if (size <= bsize) {
+			memcpy(buf, xb + pos, size);
+			return size;
+		}
+	}
+	if (pos >= 0)
+		return -ERANGE;
+
+	return -ENODATA;
+}
+
+int nval_list(const char *xb, int xb_size, char *buf, int bsize)
+{
+	int pos = 0;
+	int size;
+	int name_len;
+	int ncopied = 0;
+	int filled = 0;
+
+	memcpy(&size, xb + pos, sizeof(int));
+	while (size > sizeof(int) &&
+		size <= xb_size &&
+		(pos + size) < xb_size &&
+		!filled) {
+		pos += sizeof(int);
+		size -= sizeof(int);
+		name_len = strnlen((YCHAR *) (xb + pos), size);
+		if (ncopied + name_len + 1 < bsize) {
+			memcpy(buf, xb + pos, name_len * sizeof(YCHAR));
+			buf += name_len;
+			*buf = '\0';
+			buf++;
+			if (sizeof(YCHAR) > 1) {
+				*buf = '\0';
+				buf++;
+			}
+			ncopied += (name_len + 1);
+		} else {
+			filled = 1;
+		}
+		pos += size;
+		if (pos < xb_size - sizeof(int))
+			memcpy(&size, xb + pos, sizeof(int));
+		else
+			size = 0;
+	}
+	return ncopied;
+}
+
+int nval_hasvalues(const char *xb, int xb_size)
+{
+	return nval_used(xb, xb_size) > 0;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.h
new file mode 100644
index 00000000..951e64f8
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nameval.h
@@ -0,0 +1,28 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __NAMEVAL_H__
+#define __NAMEVAL_H__
+
+#include "yportenv.h"
+
+int nval_del(char *xb, int xb_size, const YCHAR * name);
+int nval_set(char *xb, int xb_size, const YCHAR * name, const char *buf,
+	     int bsize, int flags);
+int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf,
+	     int bsize);
+int nval_list(const char *xb, int xb_size, char *buf, int bsize);
+int nval_hasvalues(const char *xb, int xb_size);
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.c
new file mode 100644
index 00000000..0d8499bd
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.c
@@ -0,0 +1,122 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_nand.h"
+#include "yaffs_tagscompat.h"
+
+#include "yaffs_getblockinfo.h"
+#include "yaffs_summary.h"
+
+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
+{
+	return chunk - dev->chunk_offset;
+}
+
+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
+			     u8 *buffer, struct yaffs_ext_tags *tags)
+{
+	int result;
+	struct yaffs_ext_tags local_tags;
+	int flash_chunk = apply_chunk_offset(dev, nand_chunk);
+
+	dev->n_page_reads++;
+
+	/* If there are no tags provided use local tags. */
+	if (!tags)
+		tags = &local_tags;
+
+	result = dev->tagger.read_chunk_tags_fn(dev, flash_chunk, buffer, tags);
+	if (tags && tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
+
+		struct yaffs_block_info *bi;
+		bi = yaffs_get_block_info(dev,
+					  nand_chunk /
+					  dev->param.chunks_per_block);
+		yaffs_handle_chunk_error(dev, bi);
+	}
+	return result;
+}
+
+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
+				int nand_chunk,
+				const u8 *buffer, struct yaffs_ext_tags *tags)
+{
+	int result;
+	int flash_chunk = apply_chunk_offset(dev, nand_chunk);
+
+	dev->n_page_writes++;
+
+	if (!tags) {
+		yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags");
+		BUG();
+		return YAFFS_FAIL;
+	}
+
+	tags->seq_number = dev->seq_number;
+	tags->chunk_used = 1;
+	yaffs_trace(YAFFS_TRACE_WRITE,
+		"Writing chunk %d tags %d %d",
+		nand_chunk, tags->obj_id, tags->chunk_id);
+
+	result = dev->tagger.write_chunk_tags_fn(dev, flash_chunk,
+							buffer, tags);
+
+	yaffs_summary_add(dev, tags, nand_chunk);
+
+	return result;
+}
+
+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
+{
+	block_no -= dev->block_offset;
+	dev->n_bad_markings++;
+
+	if (dev->param.disable_bad_block_marking)
+		return YAFFS_OK;
+
+	return dev->tagger.mark_bad_fn(dev, block_no);
+}
+
+
+int yaffs_query_init_block_state(struct yaffs_dev *dev,
+				 int block_no,
+				 enum yaffs_block_state *state,
+				 u32 *seq_number)
+{
+	block_no -= dev->block_offset;
+	return dev->tagger.query_block_fn(dev, block_no, state, seq_number);
+}
+
+int yaffs_erase_block(struct yaffs_dev *dev, int block_no)
+{
+	int result;
+
+	block_no -= dev->block_offset;
+	dev->n_erasures++;
+	result = dev->drv.drv_erase_fn(dev, block_no);
+	return result;
+}
+
+int yaffs_init_nand(struct yaffs_dev *dev)
+{
+	if (dev->drv.drv_initialise_fn)
+		return dev->drv.drv_initialise_fn(dev);
+	return YAFFS_OK;
+}
+
+int yaffs_deinit_nand(struct yaffs_dev *dev)
+{
+	if (dev->drv.drv_deinitialise_fn)
+		return dev->drv.drv_deinitialise_fn(dev);
+	return YAFFS_OK;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.h
new file mode 100644
index 00000000..804e97ad
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_nand.h
@@ -0,0 +1,39 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_NAND_H__
+#define __YAFFS_NAND_H__
+#include "yaffs_guts.h"
+
+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
+			     u8 *buffer, struct yaffs_ext_tags *tags);
+
+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
+			     int nand_chunk,
+			     const u8 *buffer, struct yaffs_ext_tags *tags);
+
+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no);
+
+int yaffs_query_init_block_state(struct yaffs_dev *dev,
+				 int block_no,
+				 enum yaffs_block_state *state,
+				 unsigned *seq_number);
+
+int yaffs_erase_block(struct yaffs_dev *dev, int flash_block);
+
+int yaffs_init_nand(struct yaffs_dev *dev);
+int yaffs_deinit_nand(struct yaffs_dev *dev);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c
new file mode 100644
index 00000000..dd9a331d
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c
@@ -0,0 +1,56 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_packedtags1.h"
+#include "yportenv.h"
+
+static const u8 all_ff[20] = {
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff
+};
+
+void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
+		      const struct yaffs_ext_tags *t)
+{
+	pt->chunk_id = t->chunk_id;
+	pt->serial_number = t->serial_number;
+	pt->n_bytes = t->n_bytes;
+	pt->obj_id = t->obj_id;
+	pt->ecc = 0;
+	pt->deleted = (t->is_deleted) ? 0 : 1;
+	pt->unused_stuff = 0;
+	pt->should_be_ff = 0xffffffff;
+}
+
+void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
+			const struct yaffs_packed_tags1 *pt)
+{
+
+	if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) {
+		t->block_bad = 0;
+		if (pt->should_be_ff != 0xffffffff)
+			t->block_bad = 1;
+		t->chunk_used = 1;
+		t->obj_id = pt->obj_id;
+		t->chunk_id = pt->chunk_id;
+		t->n_bytes = pt->n_bytes;
+		t->ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+		t->is_deleted = (pt->deleted) ? 0 : 1;
+		t->serial_number = pt->serial_number;
+	} else {
+		memset(t, 0, sizeof(struct yaffs_ext_tags));
+	}
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.h
new file mode 100644
index 00000000..b80f0a5b
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.h
@@ -0,0 +1,39 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+/* This is used to pack YAFFS1 tags, not YAFFS2 tags. */
+
+#ifndef __YAFFS_PACKEDTAGS1_H__
+#define __YAFFS_PACKEDTAGS1_H__
+
+#include "yaffs_guts.h"
+
+struct yaffs_packed_tags1 {
+	unsigned chunk_id:20;
+	unsigned serial_number:2;
+	unsigned n_bytes:10;
+	unsigned obj_id:18;
+	unsigned ecc:12;
+	unsigned deleted:1;
+	unsigned unused_stuff:1;
+	unsigned should_be_ff;
+
+};
+
+void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
+		      const struct yaffs_ext_tags *t);
+void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
+			const struct yaffs_packed_tags1 *pt);
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c
new file mode 100644
index 00000000..e1d18cc3
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c
@@ -0,0 +1,197 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_packedtags2.h"
+#include "yportenv.h"
+#include "yaffs_trace.h"
+
+/* This code packs a set of extended tags into a binary structure for
+ * NAND storage
+ */
+
+/* Some of the information is "extra" struff which can be packed in to
+ * speed scanning
+ * This is defined by having the EXTRA_HEADER_INFO_FLAG set.
+ */
+
+/* Extra flags applied to chunk_id */
+
+#define EXTRA_HEADER_INFO_FLAG	0x80000000
+#define EXTRA_SHRINK_FLAG	0x40000000
+#define EXTRA_SHADOWS_FLAG	0x20000000
+#define EXTRA_SPARE_FLAGS	0x10000000
+
+#define ALL_EXTRA_FLAGS		0xf0000000
+
+/* Also, the top 4 bits of the object Id are set to the object type. */
+#define EXTRA_OBJECT_TYPE_SHIFT (28)
+#define EXTRA_OBJECT_TYPE_MASK  ((0x0f) << EXTRA_OBJECT_TYPE_SHIFT)
+
+static void yaffs_dump_packed_tags2_tags_only(
+				const struct yaffs_packed_tags2_tags_only *ptt)
+{
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"packed tags obj %d chunk %d byte %d seq %d",
+		ptt->obj_id, ptt->chunk_id, ptt->n_bytes, ptt->seq_number);
+}
+
+static void yaffs_dump_packed_tags2(const struct yaffs_packed_tags2 *pt)
+{
+	yaffs_dump_packed_tags2_tags_only(&pt->t);
+}
+
+static void yaffs_dump_tags2(const struct yaffs_ext_tags *t)
+{
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d",
+		t->ecc_result, t->block_bad, t->chunk_used, t->obj_id,
+		t->chunk_id, t->n_bytes, t->is_deleted, t->serial_number,
+		t->seq_number);
+
+}
+
+static int yaffs_check_tags_extra_packable(const struct yaffs_ext_tags *t)
+{
+	if (t->chunk_id != 0 || !t->extra_available)
+		return 0;
+
+	/* Check if the file size is too long to store */
+	if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE &&
+	    (t->extra_file_size >> 31) != 0)
+		return 0;
+	return 1;
+}
+
+void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
+				const struct yaffs_ext_tags *t)
+{
+	ptt->chunk_id = t->chunk_id;
+	ptt->seq_number = t->seq_number;
+	ptt->n_bytes = t->n_bytes;
+	ptt->obj_id = t->obj_id;
+
+	/* Only store extra tags for object headers.
+	 * If it is a file then only store  if the file size is short\
+	 * enough to fit.
+	 */
+	if (yaffs_check_tags_extra_packable(t)) {
+		/* Store the extra header info instead */
+		/* We save the parent object in the chunk_id */
+		ptt->chunk_id = EXTRA_HEADER_INFO_FLAG | t->extra_parent_id;
+		if (t->extra_is_shrink)
+			ptt->chunk_id |= EXTRA_SHRINK_FLAG;
+		if (t->extra_shadows)
+			ptt->chunk_id |= EXTRA_SHADOWS_FLAG;
+
+		ptt->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
+		ptt->obj_id |= (t->extra_obj_type << EXTRA_OBJECT_TYPE_SHIFT);
+
+		if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
+			ptt->n_bytes = t->extra_equiv_id;
+		else if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE)
+			ptt->n_bytes = (unsigned) t->extra_file_size;
+		else
+			ptt->n_bytes = 0;
+	}
+
+	yaffs_dump_packed_tags2_tags_only(ptt);
+	yaffs_dump_tags2(t);
+}
+
+void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
+		      const struct yaffs_ext_tags *t, int tags_ecc)
+{
+	yaffs_pack_tags2_tags_only(&pt->t, t);
+
+	if (tags_ecc)
+		yaffs_ecc_calc_other((unsigned char *)&pt->t,
+				    sizeof(struct yaffs_packed_tags2_tags_only),
+				    &pt->ecc);
+}
+
+void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
+				  struct yaffs_packed_tags2_tags_only *ptt)
+{
+	memset(t, 0, sizeof(struct yaffs_ext_tags));
+
+	if (ptt->seq_number == 0xffffffff)
+		return;
+
+	t->block_bad = 0;
+	t->chunk_used = 1;
+	t->obj_id = ptt->obj_id;
+	t->chunk_id = ptt->chunk_id;
+	t->n_bytes = ptt->n_bytes;
+	t->is_deleted = 0;
+	t->serial_number = 0;
+	t->seq_number = ptt->seq_number;
+
+	/* Do extra header info stuff */
+	if (ptt->chunk_id & EXTRA_HEADER_INFO_FLAG) {
+		t->chunk_id = 0;
+		t->n_bytes = 0;
+
+		t->extra_available = 1;
+		t->extra_parent_id = ptt->chunk_id & (~(ALL_EXTRA_FLAGS));
+		t->extra_is_shrink = ptt->chunk_id & EXTRA_SHRINK_FLAG ? 1 : 0;
+		t->extra_shadows = ptt->chunk_id & EXTRA_SHADOWS_FLAG ? 1 : 0;
+		t->extra_obj_type = ptt->obj_id >> EXTRA_OBJECT_TYPE_SHIFT;
+		t->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
+
+		if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
+			t->extra_equiv_id = ptt->n_bytes;
+		else
+			t->extra_file_size = ptt->n_bytes;
+	}
+	yaffs_dump_packed_tags2_tags_only(ptt);
+	yaffs_dump_tags2(t);
+}
+
+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
+			int tags_ecc)
+{
+	enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+
+	if (pt->t.seq_number != 0xffffffff && tags_ecc) {
+		/* Chunk is in use and we need to do ECC */
+
+		struct yaffs_ecc_other ecc;
+		int result;
+		yaffs_ecc_calc_other((unsigned char *)&pt->t,
+				sizeof(struct yaffs_packed_tags2_tags_only),
+				&ecc);
+		result =
+		    yaffs_ecc_correct_other((unsigned char *)&pt->t,
+				sizeof(struct yaffs_packed_tags2_tags_only),
+				&pt->ecc, &ecc);
+		switch (result) {
+		case 0:
+			ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+			break;
+		case 1:
+			ecc_result = YAFFS_ECC_RESULT_FIXED;
+			break;
+		case -1:
+			ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+			break;
+		default:
+			ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
+		}
+	}
+	yaffs_unpack_tags2_tags_only(t, &pt->t);
+
+	t->ecc_result = ecc_result;
+
+	yaffs_dump_packed_tags2(pt);
+	yaffs_dump_tags2(t);
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.h
new file mode 100644
index 00000000..675e7194
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.h
@@ -0,0 +1,47 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+/* This is used to pack YAFFS2 tags, not YAFFS1tags. */
+
+#ifndef __YAFFS_PACKEDTAGS2_H__
+#define __YAFFS_PACKEDTAGS2_H__
+
+#include "yaffs_guts.h"
+#include "yaffs_ecc.h"
+
+struct yaffs_packed_tags2_tags_only {
+	unsigned seq_number;
+	unsigned obj_id;
+	unsigned chunk_id;
+	unsigned n_bytes;
+};
+
+struct yaffs_packed_tags2 {
+	struct yaffs_packed_tags2_tags_only t;
+	struct yaffs_ecc_other ecc;
+};
+
+/* Full packed tags with ECC, used for oob tags */
+void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
+		      const struct yaffs_ext_tags *t, int tags_ecc);
+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
+			int tags_ecc);
+
+/* Only the tags part (no ECC for use with inband tags */
+void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *pt,
+				const struct yaffs_ext_tags *t);
+void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
+				  struct yaffs_packed_tags2_tags_only *pt);
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.c
new file mode 100644
index 00000000..6f3c7839
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.c
@@ -0,0 +1,313 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* Summaries write the useful part of the tags for the chunks in a block into an
+ * an array which is written to the last n chunks of the block.
+ * Reading the summaries gives all the tags for the block in one read. Much
+ * faster.
+ *
+ * Chunks holding summaries are marked with tags making it look like
+ * they are part of a fake file.
+ *
+ * The summary could also be used during gc.
+ *
+ */
+
+#include "yaffs_summary.h"
+#include "yaffs_packedtags2.h"
+#include "yaffs_nand.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_bitmap.h"
+
+/*
+ * The summary is built up in an array of summary tags.
+ * This gets written to the last one or two (maybe more) chunks in a block.
+ * A summary header is written as the first part of each chunk of summary data.
+ * The summary header must match or the summary is rejected.
+ */
+
+/* Summary tags don't need the sequence number because that is redundant. */
+struct yaffs_summary_tags {
+	unsigned obj_id;
+	unsigned chunk_id;
+	unsigned n_bytes;
+};
+
+/* Summary header */
+struct yaffs_summary_header {
+	unsigned version;	/* Must match current version */
+	unsigned block;		/* Must be this block */
+	unsigned seq;		/* Must be this sequence number */
+	unsigned sum;		/* Just add up all the bytes in the tags */
+};
+
+
+static void yaffs_summary_clear(struct yaffs_dev *dev)
+{
+	if (!dev->sum_tags)
+		return;
+	memset(dev->sum_tags, 0, dev->chunks_per_summary *
+		sizeof(struct yaffs_summary_tags));
+}
+
+
+void yaffs_summary_deinit(struct yaffs_dev *dev)
+{
+	kfree(dev->sum_tags);
+	dev->sum_tags = NULL;
+	kfree(dev->gc_sum_tags);
+	dev->gc_sum_tags = NULL;
+	dev->chunks_per_summary = 0;
+}
+
+int yaffs_summary_init(struct yaffs_dev *dev)
+{
+	int sum_bytes;
+	int chunks_used; /* Number of chunks used by summary */
+	int sum_tags_bytes;
+
+	sum_bytes = dev->param.chunks_per_block *
+			sizeof(struct yaffs_summary_tags);
+
+	chunks_used = (sum_bytes + dev->data_bytes_per_chunk - 1)/
+			(dev->data_bytes_per_chunk -
+				sizeof(struct yaffs_summary_header));
+
+	dev->chunks_per_summary = dev->param.chunks_per_block - chunks_used;
+	sum_tags_bytes = sizeof(struct yaffs_summary_tags) *
+				dev->chunks_per_summary;
+	dev->sum_tags = kmalloc(sum_tags_bytes, GFP_NOFS);
+	dev->gc_sum_tags = kmalloc(sum_tags_bytes, GFP_NOFS);
+	if (!dev->sum_tags || !dev->gc_sum_tags) {
+		yaffs_summary_deinit(dev);
+		return YAFFS_FAIL;
+	}
+
+	yaffs_summary_clear(dev);
+
+	return YAFFS_OK;
+}
+
+static unsigned yaffs_summary_sum(struct yaffs_dev *dev)
+{
+	u8 *sum_buffer = (u8 *)dev->sum_tags;
+	int i;
+	unsigned sum = 0;
+
+	i = sizeof(struct yaffs_summary_tags) *
+				dev->chunks_per_summary;
+	while (i > 0) {
+		sum += *sum_buffer;
+		sum_buffer++;
+		i--;
+	}
+
+	return sum;
+}
+
+static int yaffs_summary_write(struct yaffs_dev *dev, int blk)
+{
+	struct yaffs_ext_tags tags;
+	u8 *buffer;
+	u8 *sum_buffer = (u8 *)dev->sum_tags;
+	int n_bytes;
+	int chunk_in_nand;
+	int chunk_in_block;
+	int result;
+	int this_tx;
+	struct yaffs_summary_header hdr;
+	int sum_bytes_per_chunk = dev->data_bytes_per_chunk - sizeof(hdr);
+	struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
+
+	buffer = yaffs_get_temp_buffer(dev);
+	n_bytes = sizeof(struct yaffs_summary_tags) *
+				dev->chunks_per_summary;
+	memset(&tags, 0, sizeof(struct yaffs_ext_tags));
+	tags.obj_id = YAFFS_OBJECTID_SUMMARY;
+	tags.chunk_id = 1;
+	chunk_in_block = dev->chunks_per_summary;
+	chunk_in_nand = dev->alloc_block * dev->param.chunks_per_block +
+						dev->chunks_per_summary;
+	hdr.version = YAFFS_SUMMARY_VERSION;
+	hdr.block = blk;
+	hdr.seq = bi->seq_number;
+	hdr.sum = yaffs_summary_sum(dev);
+
+	do {
+		this_tx = n_bytes;
+		if (this_tx > sum_bytes_per_chunk)
+			this_tx = sum_bytes_per_chunk;
+		memcpy(buffer, &hdr, sizeof(hdr));
+		memcpy(buffer + sizeof(hdr), sum_buffer, this_tx);
+		tags.n_bytes = this_tx + sizeof(hdr);
+		result = yaffs_wr_chunk_tags_nand(dev, chunk_in_nand,
+						buffer, &tags);
+
+		if (result != YAFFS_OK)
+			break;
+		yaffs_set_chunk_bit(dev, blk, chunk_in_block);
+		bi->pages_in_use++;
+		dev->n_free_chunks--;
+
+		n_bytes -= this_tx;
+		sum_buffer += this_tx;
+		chunk_in_nand++;
+		chunk_in_block++;
+		tags.chunk_id++;
+	} while (result == YAFFS_OK && n_bytes > 0);
+	yaffs_release_temp_buffer(dev, buffer);
+
+
+	if (result == YAFFS_OK)
+		bi->has_summary = 1;
+
+
+	return result;
+}
+
+int yaffs_summary_read(struct yaffs_dev *dev,
+			struct yaffs_summary_tags *st,
+			int blk)
+{
+	struct yaffs_ext_tags tags;
+	u8 *buffer;
+	u8 *sum_buffer = (u8 *)st;
+	int n_bytes;
+	int chunk_id;
+	int chunk_in_nand;
+	int chunk_in_block;
+	int result;
+	int this_tx;
+	struct yaffs_summary_header hdr;
+	struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
+	int sum_bytes_per_chunk = dev->data_bytes_per_chunk - sizeof(hdr);
+	int sum_tags_bytes;
+
+	sum_tags_bytes = sizeof(struct yaffs_summary_tags) *
+				dev->chunks_per_summary;
+	buffer = yaffs_get_temp_buffer(dev);
+	n_bytes = sizeof(struct yaffs_summary_tags) * dev->chunks_per_summary;
+	chunk_in_block = dev->chunks_per_summary;
+	chunk_in_nand = blk * dev->param.chunks_per_block +
+							dev->chunks_per_summary;
+	chunk_id = 1;
+	do {
+		this_tx = n_bytes;
+		if (this_tx > sum_bytes_per_chunk)
+			this_tx = sum_bytes_per_chunk;
+		result = yaffs_rd_chunk_tags_nand(dev, chunk_in_nand,
+						buffer, &tags);
+
+		if (tags.chunk_id != chunk_id ||
+			tags.obj_id != YAFFS_OBJECTID_SUMMARY ||
+			tags.chunk_used == 0 ||
+			tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
+			tags.n_bytes != (this_tx + sizeof(hdr)))
+				result = YAFFS_FAIL;
+		if (result != YAFFS_OK)
+			break;
+
+		if (st == dev->sum_tags) {
+			/* If we're scanning then update the block info */
+			yaffs_set_chunk_bit(dev, blk, chunk_in_block);
+			bi->pages_in_use++;
+		}
+		memcpy(&hdr, buffer, sizeof(hdr));
+		memcpy(sum_buffer, buffer + sizeof(hdr), this_tx);
+		n_bytes -= this_tx;
+		sum_buffer += this_tx;
+		chunk_in_nand++;
+		chunk_in_block++;
+		chunk_id++;
+	} while (result == YAFFS_OK && n_bytes > 0);
+	yaffs_release_temp_buffer(dev, buffer);
+
+	if (result == YAFFS_OK) {
+		/* Verify header */
+		if (hdr.version != YAFFS_SUMMARY_VERSION ||
+		    hdr.block != blk ||
+		    hdr.seq != bi->seq_number ||
+		    hdr.sum != yaffs_summary_sum(dev))
+			result = YAFFS_FAIL;
+	}
+
+	if (st == dev->sum_tags && result == YAFFS_OK)
+		bi->has_summary = 1;
+
+	return result;
+}
+
+int yaffs_summary_add(struct yaffs_dev *dev,
+			struct yaffs_ext_tags *tags,
+			int chunk_in_nand)
+{
+	struct yaffs_packed_tags2_tags_only tags_only;
+	struct yaffs_summary_tags *sum_tags;
+	int block_in_nand = chunk_in_nand / dev->param.chunks_per_block;
+	int chunk_in_block = chunk_in_nand % dev->param.chunks_per_block;
+
+	if (!dev->sum_tags)
+		return YAFFS_OK;
+
+	if (chunk_in_block >= 0 && chunk_in_block < dev->chunks_per_summary) {
+		yaffs_pack_tags2_tags_only(&tags_only, tags);
+		sum_tags = &dev->sum_tags[chunk_in_block];
+		sum_tags->chunk_id = tags_only.chunk_id;
+		sum_tags->n_bytes = tags_only.n_bytes;
+		sum_tags->obj_id = tags_only.obj_id;
+
+		if (chunk_in_block == dev->chunks_per_summary - 1) {
+			/* Time to write out the summary */
+			yaffs_summary_write(dev, block_in_nand);
+			yaffs_summary_clear(dev);
+			yaffs_skip_rest_of_block(dev);
+		}
+	}
+	return YAFFS_OK;
+}
+
+int yaffs_summary_fetch(struct yaffs_dev *dev,
+			struct yaffs_ext_tags *tags,
+			int chunk_in_block)
+{
+	struct yaffs_packed_tags2_tags_only tags_only;
+	struct yaffs_summary_tags *sum_tags;
+	if (chunk_in_block >= 0 && chunk_in_block < dev->chunks_per_summary) {
+		sum_tags = &dev->sum_tags[chunk_in_block];
+		tags_only.chunk_id = sum_tags->chunk_id;
+		tags_only.n_bytes = sum_tags->n_bytes;
+		tags_only.obj_id = sum_tags->obj_id;
+		yaffs_unpack_tags2_tags_only(tags, &tags_only);
+		return YAFFS_OK;
+	}
+	return YAFFS_FAIL;
+}
+
+void yaffs_summary_gc(struct yaffs_dev *dev, int blk)
+{
+	struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
+	int i;
+
+	if (!bi->has_summary)
+		return;
+
+	for (i = dev->chunks_per_summary;
+	     i < dev->param.chunks_per_block;
+	     i++) {
+		if (yaffs_check_chunk_bit(dev, blk, i)) {
+			yaffs_clear_chunk_bit(dev, blk, i);
+			bi->pages_in_use--;
+			dev->n_free_chunks++;
+		}
+	}
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.h
new file mode 100644
index 00000000..be141d07
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_summary.h
@@ -0,0 +1,37 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_SUMMARY_H__
+#define __YAFFS_SUMMARY_H__
+
+#include "yaffs_packedtags2.h"
+
+
+int yaffs_summary_init(struct yaffs_dev *dev);
+void yaffs_summary_deinit(struct yaffs_dev *dev);
+
+int yaffs_summary_add(struct yaffs_dev *dev,
+			struct yaffs_ext_tags *tags,
+			int chunk_in_block);
+int yaffs_summary_fetch(struct yaffs_dev *dev,
+			struct yaffs_ext_tags *tags,
+			int chunk_in_block);
+int yaffs_summary_read(struct yaffs_dev *dev,
+			struct yaffs_summary_tags *st,
+			int blk);
+void yaffs_summary_gc(struct yaffs_dev *dev, int blk);
+
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.c
new file mode 100644
index 00000000..092430be
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.c
@@ -0,0 +1,381 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_guts.h"
+#include "yaffs_tagscompat.h"
+#include "yaffs_ecc.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_trace.h"
+
+static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
+
+
+/********** Tags ECC calculations  *********/
+
+
+void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
+{
+	/* Calculate an ecc */
+	unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
+	unsigned i, j;
+	unsigned ecc = 0;
+	unsigned bit = 0;
+
+	tags->ecc = 0;
+
+	for (i = 0; i < 8; i++) {
+		for (j = 1; j & 0xff; j <<= 1) {
+			bit++;
+			if (b[i] & j)
+				ecc ^= bit;
+		}
+	}
+	tags->ecc = ecc;
+}
+
+int yaffs_check_tags_ecc(struct yaffs_tags *tags)
+{
+	unsigned ecc = tags->ecc;
+
+	yaffs_calc_tags_ecc(tags);
+
+	ecc ^= tags->ecc;
+
+	if (ecc && ecc <= 64) {
+		/* TODO: Handle the failure better. Retire? */
+		unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
+
+		ecc--;
+
+		b[ecc / 8] ^= (1 << (ecc & 7));
+
+		/* Now recvalc the ecc */
+		yaffs_calc_tags_ecc(tags);
+
+		return 1;	/* recovered error */
+	} else if (ecc) {
+		/* Wierd ecc failure value */
+		/* TODO Need to do somethiong here */
+		return -1;	/* unrecovered error */
+	}
+	return 0;
+}
+
+/********** Tags **********/
+
+static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
+				     struct yaffs_tags *tags_ptr)
+{
+	union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
+
+	yaffs_calc_tags_ecc(tags_ptr);
+
+	spare_ptr->tb0 = tu->as_bytes[0];
+	spare_ptr->tb1 = tu->as_bytes[1];
+	spare_ptr->tb2 = tu->as_bytes[2];
+	spare_ptr->tb3 = tu->as_bytes[3];
+	spare_ptr->tb4 = tu->as_bytes[4];
+	spare_ptr->tb5 = tu->as_bytes[5];
+	spare_ptr->tb6 = tu->as_bytes[6];
+	spare_ptr->tb7 = tu->as_bytes[7];
+}
+
+static void yaffs_get_tags_from_spare(struct yaffs_dev *dev,
+				      struct yaffs_spare *spare_ptr,
+				      struct yaffs_tags *tags_ptr)
+{
+	union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
+	int result;
+
+	tu->as_bytes[0] = spare_ptr->tb0;
+	tu->as_bytes[1] = spare_ptr->tb1;
+	tu->as_bytes[2] = spare_ptr->tb2;
+	tu->as_bytes[3] = spare_ptr->tb3;
+	tu->as_bytes[4] = spare_ptr->tb4;
+	tu->as_bytes[5] = spare_ptr->tb5;
+	tu->as_bytes[6] = spare_ptr->tb6;
+	tu->as_bytes[7] = spare_ptr->tb7;
+
+	result = yaffs_check_tags_ecc(tags_ptr);
+	if (result > 0)
+		dev->n_tags_ecc_fixed++;
+	else if (result < 0)
+		dev->n_tags_ecc_unfixed++;
+}
+
+static void yaffs_spare_init(struct yaffs_spare *spare)
+{
+	memset(spare, 0xff, sizeof(struct yaffs_spare));
+}
+
+static int yaffs_wr_nand(struct yaffs_dev *dev,
+			 int nand_chunk, const u8 *data,
+			 struct yaffs_spare *spare)
+{
+	int data_size = dev->data_bytes_per_chunk;
+
+	return dev->drv.drv_write_chunk_fn(dev, nand_chunk,
+				data, data_size,
+				(u8 *) spare, sizeof(*spare));
+}
+
+static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
+			       int nand_chunk,
+			       u8 *data,
+			       struct yaffs_spare *spare,
+			       enum yaffs_ecc_result *ecc_result,
+			       int correct_errors)
+{
+	int ret_val;
+	struct yaffs_spare local_spare;
+	int data_size;
+	int spare_size;
+	int ecc_result1, ecc_result2;
+	u8 calc_ecc[3];
+
+	if (!spare) {
+		/* If we don't have a real spare, then we use a local one. */
+		/* Need this for the calculation of the ecc */
+		spare = &local_spare;
+	}
+	data_size = dev->data_bytes_per_chunk;
+	spare_size = sizeof(struct yaffs_spare);
+
+	if (dev->param.use_nand_ecc)
+		return dev->drv.drv_read_chunk_fn(dev, nand_chunk,
+						data, data_size,
+						(u8 *) spare, spare_size,
+						ecc_result);
+
+
+	/* Handle the ECC at this level. */
+
+	ret_val = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
+						 data, data_size,
+						 (u8 *)spare, spare_size,
+						NULL);
+	if (!data || !correct_errors)
+		return ret_val;
+
+	/* Do ECC correction if needed. */
+	yaffs_ecc_calc(data, calc_ecc);
+	ecc_result1 = yaffs_ecc_correct(data, spare->ecc1, calc_ecc);
+	yaffs_ecc_calc(&data[256], calc_ecc);
+	ecc_result2 = yaffs_ecc_correct(&data[256], spare->ecc2, calc_ecc);
+
+	if (ecc_result1 > 0) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"**>>yaffs ecc error fix performed on chunk %d:0",
+			nand_chunk);
+		dev->n_ecc_fixed++;
+	} else if (ecc_result1 < 0) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"**>>yaffs ecc error unfixed on chunk %d:0",
+			nand_chunk);
+		dev->n_ecc_unfixed++;
+	}
+
+	if (ecc_result2 > 0) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"**>>yaffs ecc error fix performed on chunk %d:1",
+			nand_chunk);
+		dev->n_ecc_fixed++;
+	} else if (ecc_result2 < 0) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"**>>yaffs ecc error unfixed on chunk %d:1",
+			nand_chunk);
+		dev->n_ecc_unfixed++;
+	}
+
+	if (ecc_result1 || ecc_result2) {
+		/* We had a data problem on this page */
+		yaffs_handle_rd_data_error(dev, nand_chunk);
+	}
+
+	if (ecc_result1 < 0 || ecc_result2 < 0)
+		*ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+	else if (ecc_result1 > 0 || ecc_result2 > 0)
+		*ecc_result = YAFFS_ECC_RESULT_FIXED;
+	else
+		*ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+
+	return ret_val;
+}
+
+/*
+ * Functions for robustisizing
+ */
+
+static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
+{
+	int flash_block = nand_chunk / dev->param.chunks_per_block;
+
+	/* Mark the block for retirement */
+	yaffs_get_block_info(dev, flash_block + dev->block_offset)->
+		needs_retiring = 1;
+	yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+		"**>>Block %d marked for retirement",
+		flash_block);
+
+	/* TODO:
+	 * Just do a garbage collection on the affected block
+	 * then retire the block
+	 * NB recursion
+	 */
+}
+
+static int yaffs_tags_compat_wr(struct yaffs_dev *dev,
+			 int nand_chunk,
+			 const u8 *data, const struct yaffs_ext_tags *ext_tags)
+{
+	struct yaffs_spare spare;
+	struct yaffs_tags tags;
+
+	yaffs_spare_init(&spare);
+
+	if (ext_tags->is_deleted)
+		spare.page_status = 0;
+	else {
+		tags.obj_id = ext_tags->obj_id;
+		tags.chunk_id = ext_tags->chunk_id;
+
+		tags.n_bytes_lsb = ext_tags->n_bytes & (1024 - 1);
+
+		if (dev->data_bytes_per_chunk >= 1024)
+			tags.n_bytes_msb = (ext_tags->n_bytes >> 10) & 3;
+		else
+			tags.n_bytes_msb = 3;
+
+		tags.serial_number = ext_tags->serial_number;
+
+		if (!dev->param.use_nand_ecc && data) {
+			yaffs_ecc_calc(data, spare.ecc1);
+			yaffs_ecc_calc(&data[256], spare.ecc2);
+		}
+
+		yaffs_load_tags_to_spare(&spare, &tags);
+	}
+	return yaffs_wr_nand(dev, nand_chunk, data, &spare);
+}
+
+static int yaffs_tags_compat_rd(struct yaffs_dev *dev,
+			 int nand_chunk,
+			 u8 *data, struct yaffs_ext_tags *ext_tags)
+{
+	struct yaffs_spare spare;
+	struct yaffs_tags tags;
+	enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
+	static struct yaffs_spare spare_ff;
+	static int init;
+	int deleted;
+
+	if (!init) {
+		memset(&spare_ff, 0xff, sizeof(spare_ff));
+		init = 1;
+	}
+
+	if (!yaffs_rd_chunk_nand(dev, nand_chunk,
+					data, &spare, &ecc_result, 1))
+		return YAFFS_FAIL;
+
+	/* ext_tags may be NULL */
+	if (!ext_tags)
+		return YAFFS_OK;
+
+	deleted = (hweight8(spare.page_status) < 7) ? 1 : 0;
+
+	ext_tags->is_deleted = deleted;
+	ext_tags->ecc_result = ecc_result;
+	ext_tags->block_bad = 0;	/* We're reading it */
+	/* therefore it is not a bad block */
+	ext_tags->chunk_used =
+		memcmp(&spare_ff, &spare, sizeof(spare_ff)) ? 1 : 0;
+
+	if (ext_tags->chunk_used) {
+		yaffs_get_tags_from_spare(dev, &spare, &tags);
+		ext_tags->obj_id = tags.obj_id;
+		ext_tags->chunk_id = tags.chunk_id;
+		ext_tags->n_bytes = tags.n_bytes_lsb;
+
+		if (dev->data_bytes_per_chunk >= 1024)
+			ext_tags->n_bytes |=
+				(((unsigned)tags.n_bytes_msb) << 10);
+
+		ext_tags->serial_number = tags.serial_number;
+	}
+
+	return YAFFS_OK;
+}
+
+static int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
+{
+	struct yaffs_spare spare;
+
+	memset(&spare, 0xff, sizeof(struct yaffs_spare));
+
+	spare.block_status = 'Y';
+
+	yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block, NULL,
+		      &spare);
+	yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block + 1,
+		      NULL, &spare);
+
+	return YAFFS_OK;
+}
+
+static int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
+				  int block_no,
+				  enum yaffs_block_state *state,
+				  u32 *seq_number)
+{
+	struct yaffs_spare spare0, spare1;
+	static struct yaffs_spare spare_ff;
+	static int init;
+	enum yaffs_ecc_result dummy;
+
+	if (!init) {
+		memset(&spare_ff, 0xff, sizeof(spare_ff));
+		init = 1;
+	}
+
+	*seq_number = 0;
+
+	/* Look for bad block markers in the first two chunks */
+	yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block,
+			    NULL, &spare0, &dummy, 0);
+	yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block + 1,
+			    NULL, &spare1, &dummy, 0);
+
+	if (hweight8(spare0.block_status & spare1.block_status) < 7)
+		*state = YAFFS_BLOCK_STATE_DEAD;
+	else if (memcmp(&spare_ff, &spare0, sizeof(spare_ff)) == 0)
+		*state = YAFFS_BLOCK_STATE_EMPTY;
+	else
+		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
+
+	return YAFFS_OK;
+}
+
+void yaffs_tags_compat_install(struct yaffs_dev *dev)
+{
+	if(dev->param.is_yaffs2)
+		return;
+	if(!dev->tagger.write_chunk_tags_fn)
+		dev->tagger.write_chunk_tags_fn = yaffs_tags_compat_wr;
+	if(!dev->tagger.read_chunk_tags_fn)
+		dev->tagger.read_chunk_tags_fn = yaffs_tags_compat_rd;
+	if(!dev->tagger.query_block_fn)
+		dev->tagger.query_block_fn = yaffs_tags_compat_query_block;
+	if(!dev->tagger.mark_bad_fn)
+		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.h
new file mode 100644
index 00000000..92d298a6
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.h
@@ -0,0 +1,44 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_TAGSCOMPAT_H__
+#define __YAFFS_TAGSCOMPAT_H__
+
+
+#include "yaffs_guts.h"
+
+#if 0
+
+
+int yaffs_tags_compat_wr(struct yaffs_dev *dev,
+			 int nand_chunk,
+			 const u8 *data, const struct yaffs_ext_tags *tags);
+int yaffs_tags_compat_rd(struct yaffs_dev *dev,
+			 int nand_chunk,
+			 u8 *data, struct yaffs_ext_tags *tags);
+int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no);
+int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
+				  int block_no,
+				  enum yaffs_block_state *state,
+				  u32 *seq_number);
+
+#endif
+
+
+void yaffs_tags_compat_install(struct yaffs_dev *dev);
+void yaffs_calc_tags_ecc(struct yaffs_tags *tags);
+int yaffs_check_tags_ecc(struct yaffs_tags *tags);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.c
new file mode 100644
index 00000000..44a83b12
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.c
@@ -0,0 +1,199 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_guts.h"
+#include "yaffs_trace.h"
+#include "yaffs_packedtags2.h"
+
+static int yaffs_tags_marshall_write(struct yaffs_dev *dev,
+				    int nand_chunk, const u8 *data,
+				    const struct yaffs_ext_tags *tags)
+{
+	struct yaffs_packed_tags2 pt;
+	int retval;
+
+	int packed_tags_size =
+	    dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
+	void *packed_tags_ptr =
+	    dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
+
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"yaffs_tags_marshall_write chunk %d data %p tags %p",
+		nand_chunk, data, tags);
+
+	/* For yaffs2 writing there must be both data and tags.
+	 * If we're using inband tags, then the tags are stuffed into
+	 * the end of the data buffer.
+	 */
+	if (!data || !tags)
+		BUG();
+	else if (dev->param.inband_tags) {
+		struct yaffs_packed_tags2_tags_only *pt2tp;
+		pt2tp =
+		    (struct yaffs_packed_tags2_tags_only *)(data +
+							dev->
+							data_bytes_per_chunk);
+		yaffs_pack_tags2_tags_only(pt2tp, tags);
+	} else {
+		yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
+	}
+
+	retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk,
+			data, dev->param.total_bytes_per_chunk,
+			(dev->param.inband_tags) ? NULL : packed_tags_ptr,
+			(dev->param.inband_tags) ? 0 : packed_tags_size);
+
+	return retval;
+}
+
+static int yaffs_tags_marshall_read(struct yaffs_dev *dev,
+				   int nand_chunk, u8 *data,
+				   struct yaffs_ext_tags *tags)
+{
+	int retval = 0;
+	int local_data = 0;
+	u8 spare_buffer[100];
+	enum yaffs_ecc_result ecc_result;
+
+	struct yaffs_packed_tags2 pt;
+
+	int packed_tags_size =
+	    dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
+	void *packed_tags_ptr =
+	    dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
+
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"yaffs_tags_marshall_read chunk %d data %p tags %p",
+		nand_chunk, data, tags);
+
+	if (dev->param.inband_tags) {
+		if (!data) {
+			local_data = 1;
+			data = yaffs_get_temp_buffer(dev);
+		}
+	}
+
+	if (dev->param.inband_tags || (data && !tags))
+		retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
+					data, dev->param.total_bytes_per_chunk,
+					NULL, 0,
+					&ecc_result);
+	else if (tags)
+		retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
+					data, dev->param.total_bytes_per_chunk,
+					spare_buffer, packed_tags_size,
+					&ecc_result);
+	else
+		BUG();
+
+
+	if (dev->param.inband_tags) {
+		if (tags) {
+			struct yaffs_packed_tags2_tags_only *pt2tp;
+			pt2tp =
+				(struct yaffs_packed_tags2_tags_only *)
+				&data[dev->data_bytes_per_chunk];
+			yaffs_unpack_tags2_tags_only(tags, pt2tp);
+		}
+	} else if (tags) {
+		memcpy(packed_tags_ptr, spare_buffer, packed_tags_size);
+		yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
+	}
+
+	if (local_data)
+		yaffs_release_temp_buffer(dev, data);
+
+	if (tags && ecc_result == YAFFS_ECC_RESULT_UNFIXED) {
+		tags->ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+		dev->n_ecc_unfixed++;
+	}
+
+	if (tags && ecc_result == -YAFFS_ECC_RESULT_FIXED) {
+		if (tags->ecc_result <= YAFFS_ECC_RESULT_NO_ERROR)
+			tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
+		dev->n_ecc_fixed++;
+	}
+
+	if (ecc_result < YAFFS_ECC_RESULT_UNFIXED)
+		return YAFFS_OK;
+	else
+		return YAFFS_FAIL;
+}
+
+static int yaffs_tags_marshall_query_block(struct yaffs_dev *dev, int block_no,
+			       enum yaffs_block_state *state,
+			       u32 *seq_number)
+{
+	int retval;
+
+	yaffs_trace(YAFFS_TRACE_MTD, "yaffs_tags_marshall_query_block %d",
+			block_no);
+
+	retval = dev->drv.drv_check_bad_fn(dev, block_no);
+
+	if (retval== YAFFS_FAIL) {
+		yaffs_trace(YAFFS_TRACE_MTD, "block is bad");
+
+		*state = YAFFS_BLOCK_STATE_DEAD;
+		*seq_number = 0;
+	} else {
+		struct yaffs_ext_tags t;
+
+		yaffs_tags_marshall_read(dev,
+				    block_no * dev->param.chunks_per_block,
+				    NULL, &t);
+
+		if (t.chunk_used) {
+			*seq_number = t.seq_number;
+			*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
+		} else {
+			*seq_number = 0;
+			*state = YAFFS_BLOCK_STATE_EMPTY;
+		}
+	}
+
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"block query returns  seq %d state %d",
+		*seq_number, *state);
+
+	if (retval == 0)
+		return YAFFS_OK;
+	else
+		return YAFFS_FAIL;
+}
+
+static int yaffs_tags_marshall_mark_bad(struct yaffs_dev *dev, int block_no)
+{
+	return dev->drv.drv_mark_bad_fn(dev, block_no);
+
+}
+
+
+void yaffs_tags_marshall_install(struct yaffs_dev *dev)
+{
+	if (!dev->param.is_yaffs2)
+		return;
+
+	if (!dev->tagger.write_chunk_tags_fn)
+		dev->tagger.write_chunk_tags_fn = yaffs_tags_marshall_write;
+
+	if (!dev->tagger.read_chunk_tags_fn)
+		dev->tagger.read_chunk_tags_fn = yaffs_tags_marshall_read;
+
+	if (!dev->tagger.query_block_fn)
+		dev->tagger.query_block_fn = yaffs_tags_marshall_query_block;
+
+	if (!dev->tagger.mark_bad_fn)
+		dev->tagger.mark_bad_fn = yaffs_tags_marshall_mark_bad;
+
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.h
new file mode 100644
index 00000000..bf3e68a1
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.h
@@ -0,0 +1,22 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_TAGSMARSHALL_H__
+#define __YAFFS_TAGSMARSHALL_H__
+
+#include "yaffs_guts.h"
+void yaffs_tags_marshall_install(struct yaffs_dev *dev);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_trace.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_trace.h
new file mode 100644
index 00000000..fd26054d
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_trace.h
@@ -0,0 +1,57 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YTRACE_H__
+#define __YTRACE_H__
+
+extern unsigned int yaffs_trace_mask;
+extern unsigned int yaffs_wr_attempts;
+
+/*
+ * Tracing flags.
+ * The flags masked in YAFFS_TRACE_ALWAYS are always traced.
+ */
+
+#define YAFFS_TRACE_OS			0x00000002
+#define YAFFS_TRACE_ALLOCATE		0x00000004
+#define YAFFS_TRACE_SCAN		0x00000008
+#define YAFFS_TRACE_BAD_BLOCKS		0x00000010
+#define YAFFS_TRACE_ERASE		0x00000020
+#define YAFFS_TRACE_GC			0x00000040
+#define YAFFS_TRACE_WRITE		0x00000080
+#define YAFFS_TRACE_TRACING		0x00000100
+#define YAFFS_TRACE_DELETION		0x00000200
+#define YAFFS_TRACE_BUFFERS		0x00000400
+#define YAFFS_TRACE_NANDACCESS		0x00000800
+#define YAFFS_TRACE_GC_DETAIL		0x00001000
+#define YAFFS_TRACE_SCAN_DEBUG		0x00002000
+#define YAFFS_TRACE_MTD			0x00004000
+#define YAFFS_TRACE_CHECKPOINT		0x00008000
+
+#define YAFFS_TRACE_VERIFY		0x00010000
+#define YAFFS_TRACE_VERIFY_NAND		0x00020000
+#define YAFFS_TRACE_VERIFY_FULL		0x00040000
+#define YAFFS_TRACE_VERIFY_ALL		0x000f0000
+
+#define YAFFS_TRACE_SYNC		0x00100000
+#define YAFFS_TRACE_BACKGROUND		0x00200000
+#define YAFFS_TRACE_LOCK		0x00400000
+#define YAFFS_TRACE_MOUNT		0x00800000
+
+#define YAFFS_TRACE_ERROR		0x40000000
+#define YAFFS_TRACE_BUG			0x80000000
+#define YAFFS_TRACE_ALWAYS		0xf0000000
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.c
new file mode 100644
index 00000000..e8f2f0a6
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.c
@@ -0,0 +1,529 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_verify.h"
+#include "yaffs_trace.h"
+#include "yaffs_bitmap.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_nand.h"
+
+int yaffs_skip_verification(struct yaffs_dev *dev)
+{
+	(void) dev;
+	return !(yaffs_trace_mask &
+		 (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
+}
+
+static int yaffs_skip_full_verification(struct yaffs_dev *dev)
+{
+	(void) dev;
+	return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
+}
+
+static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
+{
+	(void) dev;
+	return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
+}
+
+static const char * const block_state_name[] = {
+	"Unknown",
+	"Needs scan",
+	"Scanning",
+	"Empty",
+	"Allocating",
+	"Full",
+	"Dirty",
+	"Checkpoint",
+	"Collecting",
+	"Dead"
+};
+
+void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
+{
+	int actually_used;
+	int in_use;
+
+	if (yaffs_skip_verification(dev))
+		return;
+
+	/* Report illegal runtime states */
+	if (bi->block_state >= YAFFS_NUMBER_OF_BLOCK_STATES)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Block %d has undefined state %d",
+			n, bi->block_state);
+
+	switch (bi->block_state) {
+	case YAFFS_BLOCK_STATE_UNKNOWN:
+	case YAFFS_BLOCK_STATE_SCANNING:
+	case YAFFS_BLOCK_STATE_NEEDS_SCAN:
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Block %d has bad run-state %s",
+			n, block_state_name[bi->block_state]);
+	}
+
+	/* Check pages in use and soft deletions are legal */
+
+	actually_used = bi->pages_in_use - bi->soft_del_pages;
+
+	if (bi->pages_in_use < 0 ||
+	    bi->pages_in_use > dev->param.chunks_per_block ||
+	    bi->soft_del_pages < 0 ||
+	    bi->soft_del_pages > dev->param.chunks_per_block ||
+	    actually_used < 0 || actually_used > dev->param.chunks_per_block)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Block %d has illegal values pages_in_used %d soft_del_pages %d",
+			n, bi->pages_in_use, bi->soft_del_pages);
+
+	/* Check chunk bitmap legal */
+	in_use = yaffs_count_chunk_bits(dev, n);
+	if (in_use != bi->pages_in_use)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Block %d has inconsistent values pages_in_use %d counted chunk bits %d",
+			n, bi->pages_in_use, in_use);
+}
+
+void yaffs_verify_collected_blk(struct yaffs_dev *dev,
+				struct yaffs_block_info *bi, int n)
+{
+	yaffs_verify_blk(dev, bi, n);
+
+	/* After collection the block should be in the erased state */
+
+	if (bi->block_state != YAFFS_BLOCK_STATE_COLLECTING &&
+	    bi->block_state != YAFFS_BLOCK_STATE_EMPTY) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"Block %d is in state %d after gc, should be erased",
+			n, bi->block_state);
+	}
+}
+
+void yaffs_verify_blocks(struct yaffs_dev *dev)
+{
+	int i;
+	int state_count[YAFFS_NUMBER_OF_BLOCK_STATES];
+	int illegal_states = 0;
+
+	if (yaffs_skip_verification(dev))
+		return;
+
+	memset(state_count, 0, sizeof(state_count));
+
+	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
+		yaffs_verify_blk(dev, bi, i);
+
+		if (bi->block_state < YAFFS_NUMBER_OF_BLOCK_STATES)
+			state_count[bi->block_state]++;
+		else
+			illegal_states++;
+	}
+
+	yaffs_trace(YAFFS_TRACE_VERIFY,	"Block summary");
+
+	yaffs_trace(YAFFS_TRACE_VERIFY,
+		"%d blocks have illegal states",
+		illegal_states);
+	if (state_count[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Too many allocating blocks");
+
+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"%s %d blocks",
+			block_state_name[i], state_count[i]);
+
+	if (dev->blocks_in_checkpt != state_count[YAFFS_BLOCK_STATE_CHECKPOINT])
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Checkpoint block count wrong dev %d count %d",
+			dev->blocks_in_checkpt,
+			state_count[YAFFS_BLOCK_STATE_CHECKPOINT]);
+
+	if (dev->n_erased_blocks != state_count[YAFFS_BLOCK_STATE_EMPTY])
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Erased block count wrong dev %d count %d",
+			dev->n_erased_blocks,
+			state_count[YAFFS_BLOCK_STATE_EMPTY]);
+
+	if (state_count[YAFFS_BLOCK_STATE_COLLECTING] > 1)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Too many collecting blocks %d (max is 1)",
+			state_count[YAFFS_BLOCK_STATE_COLLECTING]);
+}
+
+/*
+ * Verify the object header. oh must be valid, but obj and tags may be NULL in
+ * which case those tests will not be performed.
+ */
+void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
+		     struct yaffs_ext_tags *tags, int parent_check)
+{
+	if (obj && yaffs_skip_verification(obj->my_dev))
+		return;
+
+	if (!(tags && obj && oh)) {
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Verifying object header tags %p obj %p oh %p",
+			tags, obj, oh);
+		return;
+	}
+
+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
+	    oh->type > YAFFS_OBJECT_TYPE_MAX)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d header type is illegal value 0x%x",
+			tags->obj_id, oh->type);
+
+	if (tags->obj_id != obj->obj_id)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d header mismatch obj_id %d",
+			tags->obj_id, obj->obj_id);
+
+	/*
+	 * Check that the object's parent ids match if parent_check requested.
+	 *
+	 * Tests do not apply to the root object.
+	 */
+
+	if (parent_check && tags->obj_id > 1 && !obj->parent)
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d header mismatch parent_id %d obj->parent is NULL",
+			tags->obj_id, oh->parent_obj_id);
+
+	if (parent_check && obj->parent &&
+	    oh->parent_obj_id != obj->parent->obj_id &&
+	    (oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
+	     obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d header mismatch parent_id %d parent_obj_id %d",
+			tags->obj_id, oh->parent_obj_id,
+			obj->parent->obj_id);
+
+	if (tags->obj_id > 1 && oh->name[0] == 0)	/* Null name */
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d header name is NULL",
+			obj->obj_id);
+
+	if (tags->obj_id > 1 && ((u8) (oh->name[0])) == 0xff)	/* Junk name */
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d header name is 0xff",
+			obj->obj_id);
+}
+
+void yaffs_verify_file(struct yaffs_obj *obj)
+{
+	u32 x;
+	int required_depth;
+	int actual_depth;
+	int last_chunk;
+	u32 offset_in_chunk;
+	u32 the_chunk;
+
+	u32 i;
+	struct yaffs_dev *dev;
+	struct yaffs_ext_tags tags;
+	struct yaffs_tnode *tn;
+	u32 obj_id;
+
+	if (!obj)
+		return;
+
+	if (yaffs_skip_verification(obj->my_dev))
+		return;
+
+	dev = obj->my_dev;
+	obj_id = obj->obj_id;
+
+
+	/* Check file size is consistent with tnode depth */
+	yaffs_addr_to_chunk(dev, obj->variant.file_variant.file_size,
+				&last_chunk, &offset_in_chunk);
+	last_chunk++;
+	x = last_chunk >> YAFFS_TNODES_LEVEL0_BITS;
+	required_depth = 0;
+	while (x > 0) {
+		x >>= YAFFS_TNODES_INTERNAL_BITS;
+		required_depth++;
+	}
+
+	actual_depth = obj->variant.file_variant.top_level;
+
+	/* Check that the chunks in the tnode tree are all correct.
+	 * We do this by scanning through the tnode tree and
+	 * checking the tags for every chunk match.
+	 */
+
+	if (yaffs_skip_nand_verification(dev))
+		return;
+
+	for (i = 1; i <= last_chunk; i++) {
+		tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
+
+		if (!tn)
+			continue;
+
+		the_chunk = yaffs_get_group_base(dev, tn, i);
+		if (the_chunk > 0) {
+			yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
+						 &tags);
+			if (tags.obj_id != obj_id || tags.chunk_id != i)
+				yaffs_trace(YAFFS_TRACE_VERIFY,
+					"Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)",
+					obj_id, i, the_chunk,
+					tags.obj_id, tags.chunk_id);
+		}
+	}
+}
+
+void yaffs_verify_link(struct yaffs_obj *obj)
+{
+	if (obj && yaffs_skip_verification(obj->my_dev))
+		return;
+
+	/* Verify sane equivalent object */
+}
+
+void yaffs_verify_symlink(struct yaffs_obj *obj)
+{
+	if (obj && yaffs_skip_verification(obj->my_dev))
+		return;
+
+	/* Verify symlink string */
+}
+
+void yaffs_verify_special(struct yaffs_obj *obj)
+{
+	if (obj && yaffs_skip_verification(obj->my_dev))
+		return;
+}
+
+void yaffs_verify_obj(struct yaffs_obj *obj)
+{
+	struct yaffs_dev *dev;
+	u32 chunk_min;
+	u32 chunk_max;
+	u32 chunk_id_ok;
+	u32 chunk_in_range;
+	u32 chunk_wrongly_deleted;
+	u32 chunk_valid;
+
+	if (!obj)
+		return;
+
+	if (obj->being_created)
+		return;
+
+	dev = obj->my_dev;
+
+	if (yaffs_skip_verification(dev))
+		return;
+
+	/* Check sane object header chunk */
+
+	chunk_min = dev->internal_start_block * dev->param.chunks_per_block;
+	chunk_max =
+	    (dev->internal_end_block + 1) * dev->param.chunks_per_block - 1;
+
+	chunk_in_range = (((unsigned)(obj->hdr_chunk)) >= chunk_min &&
+			  ((unsigned)(obj->hdr_chunk)) <= chunk_max);
+	chunk_id_ok = chunk_in_range || (obj->hdr_chunk == 0);
+	chunk_valid = chunk_in_range &&
+	    yaffs_check_chunk_bit(dev,
+				  obj->hdr_chunk / dev->param.chunks_per_block,
+				  obj->hdr_chunk % dev->param.chunks_per_block);
+	chunk_wrongly_deleted = chunk_in_range && !chunk_valid;
+
+	if (!obj->fake && (!chunk_id_ok || chunk_wrongly_deleted))
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d has chunk_id %d %s %s",
+			obj->obj_id, obj->hdr_chunk,
+			chunk_id_ok ? "" : ",out of range",
+			chunk_wrongly_deleted ? ",marked as deleted" : "");
+
+	if (chunk_valid && !yaffs_skip_nand_verification(dev)) {
+		struct yaffs_ext_tags tags;
+		struct yaffs_obj_hdr *oh;
+		u8 *buffer = yaffs_get_temp_buffer(dev);
+
+		oh = (struct yaffs_obj_hdr *)buffer;
+
+		yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, buffer, &tags);
+
+		yaffs_verify_oh(obj, oh, &tags, 1);
+
+		yaffs_release_temp_buffer(dev, buffer);
+	}
+
+	/* Verify it has a parent */
+	if (obj && !obj->fake && (!obj->parent || obj->parent->my_dev != dev)) {
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d has parent pointer %p which does not look like an object",
+			obj->obj_id, obj->parent);
+	}
+
+	/* Verify parent is a directory */
+	if (obj->parent &&
+	    obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d's parent is not a directory (type %d)",
+			obj->obj_id, obj->parent->variant_type);
+	}
+
+	switch (obj->variant_type) {
+	case YAFFS_OBJECT_TYPE_FILE:
+		yaffs_verify_file(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_SYMLINK:
+		yaffs_verify_symlink(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_DIRECTORY:
+		yaffs_verify_dir(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_HARDLINK:
+		yaffs_verify_link(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_SPECIAL:
+		yaffs_verify_special(obj);
+		break;
+	case YAFFS_OBJECT_TYPE_UNKNOWN:
+	default:
+		yaffs_trace(YAFFS_TRACE_VERIFY,
+			"Obj %d has illegaltype %d",
+		   obj->obj_id, obj->variant_type);
+		break;
+	}
+}
+
+void yaffs_verify_objects(struct yaffs_dev *dev)
+{
+	struct yaffs_obj *obj;
+	int i;
+	struct list_head *lh;
+
+	if (yaffs_skip_verification(dev))
+		return;
+
+	/* Iterate through the objects in each hash entry */
+
+	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+		list_for_each(lh, &dev->obj_bucket[i].list) {
+			obj = list_entry(lh, struct yaffs_obj, hash_link);
+			yaffs_verify_obj(obj);
+		}
+	}
+}
+
+void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
+{
+	struct list_head *lh;
+	struct yaffs_obj *list_obj;
+	int count = 0;
+
+	if (!obj) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "No object to verify");
+		BUG();
+		return;
+	}
+
+	if (yaffs_skip_verification(obj->my_dev))
+		return;
+
+	if (!obj->parent) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "Object does not have parent");
+		BUG();
+		return;
+	}
+
+	if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "Parent is not directory");
+		BUG();
+	}
+
+	/* Iterate through the objects in each hash entry */
+
+	list_for_each(lh, &obj->parent->variant.dir_variant.children) {
+		list_obj = list_entry(lh, struct yaffs_obj, siblings);
+		yaffs_verify_obj(list_obj);
+		if (obj == list_obj)
+			count++;
+	}
+
+	if (count != 1) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"Object in directory %d times",
+			count);
+		BUG();
+	}
+}
+
+void yaffs_verify_dir(struct yaffs_obj *directory)
+{
+	struct list_head *lh;
+	struct yaffs_obj *list_obj;
+
+	if (!directory) {
+		BUG();
+		return;
+	}
+
+	if (yaffs_skip_full_verification(directory->my_dev))
+		return;
+
+	if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"Directory has wrong type: %d",
+			directory->variant_type);
+		BUG();
+	}
+
+	/* Iterate through the objects in each hash entry */
+
+	list_for_each(lh, &directory->variant.dir_variant.children) {
+		list_obj = list_entry(lh, struct yaffs_obj, siblings);
+		if (list_obj->parent != directory) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"Object in directory list has wrong parent %p",
+				list_obj->parent);
+			BUG();
+		}
+		yaffs_verify_obj_in_dir(list_obj);
+	}
+}
+
+static int yaffs_free_verification_failures;
+
+void yaffs_verify_free_chunks(struct yaffs_dev *dev)
+{
+	int counted;
+	int difference;
+
+	if (yaffs_skip_verification(dev))
+		return;
+
+	counted = yaffs_count_free_chunks(dev);
+
+	difference = dev->n_free_chunks - counted;
+
+	if (difference) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"Freechunks verification failure %d %d %d",
+			dev->n_free_chunks, counted, difference);
+		yaffs_free_verification_failures++;
+	}
+}
+
+int yaffs_verify_file_sane(struct yaffs_obj *in)
+{
+	(void) in;
+	return YAFFS_OK;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.h
new file mode 100644
index 00000000..4f4af8d2
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_verify.h
@@ -0,0 +1,43 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_VERIFY_H__
+#define __YAFFS_VERIFY_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi,
+		      int n);
+void yaffs_verify_collected_blk(struct yaffs_dev *dev,
+				struct yaffs_block_info *bi, int n);
+void yaffs_verify_blocks(struct yaffs_dev *dev);
+
+void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
+		     struct yaffs_ext_tags *tags, int parent_check);
+void yaffs_verify_file(struct yaffs_obj *obj);
+void yaffs_verify_link(struct yaffs_obj *obj);
+void yaffs_verify_symlink(struct yaffs_obj *obj);
+void yaffs_verify_special(struct yaffs_obj *obj);
+void yaffs_verify_obj(struct yaffs_obj *obj);
+void yaffs_verify_objects(struct yaffs_dev *dev);
+void yaffs_verify_obj_in_dir(struct yaffs_obj *obj);
+void yaffs_verify_dir(struct yaffs_obj *directory);
+void yaffs_verify_free_chunks(struct yaffs_dev *dev);
+
+int yaffs_verify_file_sane(struct yaffs_obj *obj);
+
+int yaffs_skip_verification(struct yaffs_dev *dev);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_vfs.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_vfs.c
new file mode 100644
index 00000000..67050d4e
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_vfs.c
@@ -0,0 +1,3462 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ * Acknowledgements:
+ * Luc van OostenRyck for numerous patches.
+ * Nick Bane for numerous patches.
+ * Nick Bane for 2.5/2.6 integration.
+ * Andras Toth for mknod rdev issue.
+ * Michael Fischer for finding the problem with inode inconsistency.
+ * Some code bodily lifted from JFFS
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ *
+ * This is the file system front-end to YAFFS that hooks it up to
+ * the VFS.
+ *
+ * Special notes:
+ * >> 2.4: sb->u.generic_sbp points to the struct yaffs_dev associated with
+ *         this superblock
+ * >> 2.6: sb->s_fs_info  points to the struct yaffs_dev associated with this
+ *         superblock
+ * >> inode->u.generic_ip points to the associated struct yaffs_obj.
+ */
+
+/*
+ * There are two variants of the VFS glue code. This variant should compile
+ * for any version of Linux.
+ */
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
+#define YAFFS_COMPILE_BACKGROUND
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23))
+#define YAFFS_COMPILE_FREEZER
+#endif
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28))
+#define YAFFS_COMPILE_EXPORTFS
+#endif
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
+#define YAFFS_USE_SETATTR_COPY
+#define YAFFS_USE_TRUNCATE_SETSIZE
+#endif
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
+#define YAFFS_HAS_EVICT_INODE
+#endif
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
+#define YAFFS_NEW_FOLLOW_LINK 1
+#else
+#define YAFFS_NEW_FOLLOW_LINK 0
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
+#define YAFFS_HAS_WRITE_SUPER
+#endif
+
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+#include <linux/config.h>
+#endif
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/proc_fs.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39))
+#include <linux/smp_lock.h>
+#endif
+#include <linux/pagemap.h>
+#include <linux/mtd/mtd.h>
+#include <linux/interrupt.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+#include <linux/namei.h>
+#endif
+
+#ifdef YAFFS_COMPILE_EXPORTFS
+#include <linux/exportfs.h>
+#endif
+
+#ifdef YAFFS_COMPILE_BACKGROUND
+#include <linux/kthread.h>
+#include <linux/delay.h>
+#endif
+#ifdef YAFFS_COMPILE_FREEZER
+#include <linux/freezer.h>
+#endif
+
+#include <asm/div64.h>
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+
+#include <linux/statfs.h>
+
+#define UnlockPage(p) unlock_page(p)
+#define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
+
+/* FIXME: use sb->s_id instead ? */
+#define yaffs_devname(sb, buf)	bdevname(sb->s_bdev, buf)
+
+#else
+
+#include <linux/locks.h>
+#define	BDEVNAME_SIZE		0
+#define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
+/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
+#define __user
+#endif
+
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
+#define YPROC_ROOT  (&proc_root)
+#else
+#define YPROC_ROOT  NULL
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
+#define Y_INIT_TIMER(a)	init_timer(a)
+#else
+#define Y_INIT_TIMER(a)	init_timer_on_stack(a)
+#endif
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
+#define YAFFS_USE_WRITE_BEGIN_END 1
+#else
+#define YAFFS_USE_WRITE_BEGIN_END 0
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
+#define YAFFS_SUPER_HAS_DIRTY
+#endif
+
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
+#define set_nlink(inode, count)  do { (inode)->i_nlink = (count); } while(0)
+#endif
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
+{
+	uint64_t result = partition_size;
+	do_div(result, block_size);
+	return (uint32_t) result;
+}
+#else
+#define YCALCBLOCKS(s, b) ((s)/(b))
+#endif
+
+#include <linux/uaccess.h>
+#include <linux/mtd/mtd.h>
+
+#include "yportenv.h"
+#include "yaffs_trace.h"
+#include "yaffs_guts.h"
+#include "yaffs_attribs.h"
+
+#include "yaffs_linux.h"
+
+#include "yaffs_mtdif.h"
+#include "yaffs_packedtags2.h"
+#include "yaffs_getblockinfo.h"
+
+unsigned int yaffs_trace_mask =
+		YAFFS_TRACE_BAD_BLOCKS |
+		YAFFS_TRACE_ALWAYS |
+		0;
+
+unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
+unsigned int yaffs_auto_checkpoint = 1;
+unsigned int yaffs_gc_control = 1;
+unsigned int yaffs_bg_enable = 1;
+unsigned int yaffs_auto_select = 1;
+/* Module Parameters */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+module_param(yaffs_trace_mask, uint, 0644);
+module_param(yaffs_wr_attempts, uint, 0644);
+module_param(yaffs_auto_checkpoint, uint, 0644);
+module_param(yaffs_gc_control, uint, 0644);
+module_param(yaffs_bg_enable, uint, 0644);
+#else
+MODULE_PARM(yaffs_trace_mask, "i");
+MODULE_PARM(yaffs_wr_attempts, "i");
+MODULE_PARM(yaffs_auto_checkpoint, "i");
+MODULE_PARM(yaffs_gc_control, "i");
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
+/* use iget and read_inode */
+#define Y_IGET(sb, inum) iget((sb), (inum))
+
+#else
+/* Call local equivalent */
+#define YAFFS_USE_OWN_IGET
+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
+
+#endif
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
+#define yaffs_inode_to_obj_lv(iptr) ((iptr)->i_private)
+#else
+#define yaffs_inode_to_obj_lv(iptr) ((iptr)->u.generic_ip)
+#endif
+
+#define yaffs_inode_to_obj(iptr) \
+	((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr)))
+#define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode)
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+#define yaffs_super_to_dev(sb)	((struct yaffs_dev *)sb->s_fs_info)
+#else
+#define yaffs_super_to_dev(sb)	((struct yaffs_dev *)sb->u.generic_sbp)
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
+#define Y_CLEAR_INODE(i) clear_inode(i)
+#else
+#define Y_CLEAR_INODE(i) end_writeback(i)
+#endif
+
+
+#define update_dir_time(dir) do {\
+			(dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
+		} while (0)
+
+static void yaffs_fill_inode_from_obj(struct inode *inode,
+				      struct yaffs_obj *obj);
+
+
+static void yaffs_gross_lock(struct yaffs_dev *dev)
+{
+	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current);
+	mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
+	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current);
+}
+
+static void yaffs_gross_unlock(struct yaffs_dev *dev)
+{
+	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current);
+	mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
+}
+
+
+static int yaffs_readpage_nolock(struct file *f, struct page *pg)
+{
+	/* Lifted from jffs2 */
+
+	struct yaffs_obj *obj;
+	unsigned char *pg_buf;
+	int ret;
+	loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
+	struct yaffs_dev *dev;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_readpage_nolock at %lld, size %08x",
+		(long long)pos,
+		(unsigned)PAGE_CACHE_SIZE);
+
+	obj = yaffs_dentry_to_obj(f->f_dentry);
+
+	dev = obj->my_dev;
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+	BUG_ON(!PageLocked(pg));
+#else
+	if (!PageLocked(pg))
+		PAGE_BUG(pg);
+#endif
+
+	pg_buf = kmap(pg);
+	/* FIXME: Can kmap fail? */
+
+	yaffs_gross_lock(dev);
+
+	ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);
+
+	yaffs_gross_unlock(dev);
+
+	if (ret >= 0)
+		ret = 0;
+
+	if (ret) {
+		ClearPageUptodate(pg);
+		SetPageError(pg);
+	} else {
+		SetPageUptodate(pg);
+		ClearPageError(pg);
+	}
+
+	flush_dcache_page(pg);
+	kunmap(pg);
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done");
+	return ret;
+}
+
+static int yaffs_readpage_unlock(struct file *f, struct page *pg)
+{
+	int ret = yaffs_readpage_nolock(f, pg);
+	UnlockPage(pg);
+	return ret;
+}
+
+static int yaffs_readpage(struct file *f, struct page *pg)
+{
+	int ret;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage");
+	ret = yaffs_readpage_unlock(f, pg);
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done");
+	return ret;
+}
+
+
+static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+{
+	struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
+
+	if (lc)
+		lc->dirty = val;
+
+# ifdef YAFFS_SUPER_HAS_DIRTY
+	{
+		struct super_block *sb = lc->super;
+
+		if (sb)
+			sb->s_dirt = val;
+	}
+#endif
+
+}
+
+static void yaffs_set_super_dirty(struct yaffs_dev *dev)
+{
+	yaffs_set_super_dirty_val(dev, 1);
+}
+
+static void yaffs_clear_super_dirty(struct yaffs_dev *dev)
+{
+	yaffs_set_super_dirty_val(dev, 0);
+}
+
+static int yaffs_check_super_dirty(struct yaffs_dev *dev)
+{
+	struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
+
+	if (lc && lc->dirty)
+		return 1;
+
+# ifdef YAFFS_SUPER_HAS_DIRTY
+	{
+		struct super_block *sb = lc->super;
+
+		if (sb && sb->s_dirt)
+			return 1;
+	}
+#endif
+	return 0;
+
+}
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
+#else
+static int yaffs_writepage(struct page *page)
+#endif
+{
+	struct yaffs_dev *dev;
+	struct address_space *mapping = page->mapping;
+	struct inode *inode;
+	unsigned long end_index;
+	char *buffer;
+	struct yaffs_obj *obj;
+	int n_written = 0;
+	unsigned n_bytes;
+	loff_t i_size;
+
+	if (!mapping)
+		BUG();
+	inode = mapping->host;
+	if (!inode)
+		BUG();
+	i_size = i_size_read(inode);
+
+	end_index = i_size >> PAGE_CACHE_SHIFT;
+
+	if (page->index < end_index)
+		n_bytes = PAGE_CACHE_SIZE;
+	else {
+		n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
+
+		if (page->index > end_index || !n_bytes) {
+			yaffs_trace(YAFFS_TRACE_OS,
+				"yaffs_writepage at %lld, inode size = %lld!!",
+				((loff_t)page->index) << PAGE_CACHE_SHIFT,
+				inode->i_size);
+			yaffs_trace(YAFFS_TRACE_OS,
+				"                -> don't care!!");
+
+			zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+			set_page_writeback(page);
+			unlock_page(page);
+			end_page_writeback(page);
+			return 0;
+		}
+	}
+
+	if (n_bytes != PAGE_CACHE_SIZE)
+		zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE);
+
+	get_page(page);
+
+	buffer = kmap(page);
+
+	obj = yaffs_inode_to_obj(inode);
+	dev = obj->my_dev;
+	yaffs_gross_lock(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_writepage at %lld, size %08x",
+		((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes);
+	yaffs_trace(YAFFS_TRACE_OS,
+		"writepag0: obj = %lld, ino = %lld",
+		obj->variant.file_variant.file_size, inode->i_size);
+
+	n_written = yaffs_wr_file(obj, buffer,
+				  ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);
+
+	yaffs_set_super_dirty(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"writepag1: obj = %lld, ino = %lld",
+		obj->variant.file_variant.file_size, inode->i_size);
+
+	yaffs_gross_unlock(dev);
+
+	kunmap(page);
+	set_page_writeback(page);
+	unlock_page(page);
+	end_page_writeback(page);
+	put_page(page);
+
+	return (n_written == n_bytes) ? 0 : -ENOSPC;
+}
+
+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
+/* For now we just assume few parallel writes and check against a small number. */
+/* Todo: need to do this with a counter to handle parallel reads better */
+
+static ssize_t yaffs_hold_space(struct file *f)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+
+	int n_free_chunks;
+
+	obj = yaffs_dentry_to_obj(f->f_dentry);
+
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	n_free_chunks = yaffs_get_n_free_chunks(dev);
+
+	yaffs_gross_unlock(dev);
+
+	return (n_free_chunks > 20) ? 1 : 0;
+}
+
+static void yaffs_release_space(struct file *f)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+
+	obj = yaffs_dentry_to_obj(f->f_dentry);
+
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	yaffs_gross_unlock(dev);
+}
+
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
+			     loff_t pos, unsigned len, unsigned flags,
+			     struct page **pagep, void **fsdata)
+{
+	struct page *pg = NULL;
+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+
+	int ret = 0;
+	int space_held = 0;
+
+	/* Get a page */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+	pg = grab_cache_page_write_begin(mapping, index, flags);
+#else
+	pg = __grab_cache_page(mapping, index);
+#endif
+
+	*pagep = pg;
+	if (!pg) {
+		ret = -ENOMEM;
+		goto out;
+	}
+	yaffs_trace(YAFFS_TRACE_OS,
+		"start yaffs_write_begin index %d(%x) uptodate %d",
+		(int)index, (int)index, Page_Uptodate(pg) ? 1 : 0);
+
+	/* Get fs space */
+	space_held = yaffs_hold_space(filp);
+
+	if (!space_held) {
+		ret = -ENOSPC;
+		goto out;
+	}
+
+	/* Update page if required */
+
+	if (!Page_Uptodate(pg))
+		ret = yaffs_readpage_nolock(filp, pg);
+
+	if (ret)
+		goto out;
+
+	/* Happy path return */
+	yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok");
+
+	return 0;
+
+out:
+	yaffs_trace(YAFFS_TRACE_OS,
+		"end yaffs_write_begin fail returning %d", ret);
+	if (space_held)
+		yaffs_release_space(filp);
+	if (pg) {
+		unlock_page(pg);
+		page_cache_release(pg);
+	}
+	return ret;
+}
+
+#else
+
+static int yaffs_prepare_write(struct file *f, struct page *pg,
+			       unsigned offset, unsigned to)
+{
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write");
+
+	if (!Page_Uptodate(pg))
+		return yaffs_readpage_nolock(f, pg);
+	return 0;
+}
+#endif
+
+
+static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
+				loff_t * pos)
+{
+	struct yaffs_obj *obj;
+	int n_written;
+	loff_t ipos;
+	struct inode *inode;
+	struct yaffs_dev *dev;
+
+	obj = yaffs_dentry_to_obj(f->f_dentry);
+
+	if (!obj) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_file_write: hey obj is null!");
+                return -EINVAL;
+        }
+
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	inode = f->f_dentry->d_inode;
+
+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
+		ipos = inode->i_size;
+	else
+		ipos = *pos;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld",
+		(unsigned)n, (unsigned)n, obj->obj_id, ipos);
+
+	n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
+
+	yaffs_set_super_dirty(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_file_write: %d(%x) bytes written",
+		(unsigned)n, (unsigned)n);
+
+	if (n_written > 0) {
+		ipos += n_written;
+		*pos = ipos;
+		if (ipos > inode->i_size) {
+			inode->i_size = ipos;
+			inode->i_blocks = (ipos + 511) >> 9;
+
+			yaffs_trace(YAFFS_TRACE_OS,
+				"yaffs_file_write size updated to %lld bytes, %d blocks",
+				ipos, (int)(inode->i_blocks));
+		}
+
+	}
+	yaffs_gross_unlock(dev);
+	return (n_written == 0) && (n > 0) ? -ENOSPC : n_written;
+}
+
+
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
+			   loff_t pos, unsigned len, unsigned copied,
+			   struct page *pg, void *fsdadata)
+{
+	int ret = 0;
+	void *addr, *kva;
+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
+
+	kva = kmap(pg);
+	addr = kva + offset_into_page;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_write_end addr %p pos %lld n_bytes %d",
+		addr, pos, copied);
+
+	ret = yaffs_file_write(filp, addr, copied, &pos);
+
+	if (ret != copied) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_write_end not same size ret %d  copied %d",
+			ret, copied);
+		SetPageError(pg);
+	}
+
+	kunmap(pg);
+
+	yaffs_release_space(filp);
+	unlock_page(pg);
+	page_cache_release(pg);
+	return ret;
+}
+#else
+
+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
+			      unsigned to)
+{
+	void *addr, *kva;
+
+	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
+	int n_bytes = to - offset;
+	int n_written;
+
+	kva = kmap(pg);
+	addr = kva + offset;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_commit_write addr %p pos %lld n_bytes %d",
+		addr, pos, n_bytes);
+
+	n_written = yaffs_file_write(f, addr, n_bytes, &pos);
+
+	if (n_written != n_bytes) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_commit_write not same size n_written %d  n_bytes %d",
+			n_written, n_bytes);
+		SetPageError(pg);
+	}
+	kunmap(pg);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_commit_write returning %d",
+		n_written == n_bytes ? 0 : n_written);
+
+	return n_written == n_bytes ? 0 : n_written;
+}
+#endif
+
+static struct address_space_operations yaffs_file_address_operations = {
+	.readpage = yaffs_readpage,
+	.writepage = yaffs_writepage,
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+	.write_begin = yaffs_write_begin,
+	.write_end = yaffs_write_end,
+#else
+	.prepare_write = yaffs_prepare_write,
+	.commit_write = yaffs_commit_write,
+#endif
+};
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+static int yaffs_file_flush(struct file *file, fl_owner_t id)
+#else
+static int yaffs_file_flush(struct file *file)
+#endif
+{
+	struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry);
+
+	struct yaffs_dev *dev = obj->my_dev;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_file_flush object %d (%s)",
+		obj->obj_id,
+		obj->dirty ? "dirty" : "clean");
+
+	yaffs_gross_lock(dev);
+
+	yaffs_flush_file(obj, 1, 0);
+
+	yaffs_gross_unlock(dev);
+
+	return 0;
+}
+
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
+static int yaffs_sync_object(struct file *file, int datasync)
+#else
+static int yaffs_sync_object(struct file *file, struct dentry *dentry,
+			     int datasync)
+#endif
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
+	struct dentry *dentry = file->f_path.dentry;
+#endif
+
+	obj = yaffs_dentry_to_obj(dentry);
+
+	dev = obj->my_dev;
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+		"yaffs_sync_object");
+	yaffs_gross_lock(dev);
+	yaffs_flush_file(obj, 1, datasync);
+	yaffs_gross_unlock(dev);
+	return 0;
+}
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
+static const struct file_operations yaffs_file_operations = {
+	.read = do_sync_read,
+	.write = do_sync_write,
+	.aio_read = generic_file_aio_read,
+	.aio_write = generic_file_aio_write,
+	.mmap = generic_file_mmap,
+	.flush = yaffs_file_flush,
+	.fsync = yaffs_sync_object,
+	.splice_read = generic_file_splice_read,
+	.splice_write = generic_file_splice_write,
+	.llseek = generic_file_llseek,
+};
+
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
+
+static const struct file_operations yaffs_file_operations = {
+	.read = do_sync_read,
+	.write = do_sync_write,
+	.aio_read = generic_file_aio_read,
+	.aio_write = generic_file_aio_write,
+	.mmap = generic_file_mmap,
+	.flush = yaffs_file_flush,
+	.fsync = yaffs_sync_object,
+	.sendfile = generic_file_sendfile,
+};
+
+#else
+
+static const struct file_operations yaffs_file_operations = {
+	.read = generic_file_read,
+	.write = generic_file_write,
+	.mmap = generic_file_mmap,
+	.flush = yaffs_file_flush,
+	.fsync = yaffs_sync_object,
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+	.sendfile = generic_file_sendfile,
+#endif
+};
+#endif
+
+
+
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
+static void zero_user_segment(struct page *page, unsigned start, unsigned end)
+{
+	void *kaddr = kmap_atomic(page, KM_USER0);
+	memset(kaddr + start, 0, end - start);
+	kunmap_atomic(kaddr, KM_USER0);
+	flush_dcache_page(page);
+}
+#endif
+
+
+static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
+{
+#ifdef YAFFS_USE_TRUNCATE_SETSIZE
+	truncate_setsize(inode, newsize);
+	return 0;
+#else
+	truncate_inode_pages(&inode->i_data, newsize);
+	return 0;
+#endif
+
+}
+
+
+static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
+{
+#ifdef YAFFS_USE_SETATTR_COPY
+	setattr_copy(inode, attr);
+	return 0;
+#else
+	return inode_setattr(inode, attr);
+#endif
+
+}
+
+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_setattr of object %d",
+		yaffs_inode_to_obj(inode)->obj_id);
+#if 0
+	/* Fail if a requested resize >= 2GB */
+	if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31))
+		error = -EINVAL;
+#endif
+
+	if (error == 0)
+		error = inode_change_ok(inode, attr);
+	if (error == 0) {
+		int result;
+		if (!error) {
+			error = yaffs_vfs_setattr(inode, attr);
+			yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called");
+			if (attr->ia_valid & ATTR_SIZE) {
+				yaffs_vfs_setsize(inode, attr->ia_size);
+				inode->i_blocks = (inode->i_size + 511) >> 9;
+			}
+		}
+		dev = yaffs_inode_to_obj(inode)->my_dev;
+		if (attr->ia_valid & ATTR_SIZE) {
+			yaffs_trace(YAFFS_TRACE_OS,
+				"resize to %d(%x)",
+				(int)(attr->ia_size),
+				(int)(attr->ia_size));
+		}
+		yaffs_gross_lock(dev);
+		result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr);
+		if (result == YAFFS_OK) {
+			error = 0;
+		} else {
+			error = -EPERM;
+		}
+		yaffs_gross_unlock(dev);
+
+	}
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error);
+
+	return error;
+}
+
+static int yaffs_setxattr(struct dentry *dentry, const char *name,
+		   const void *value, size_t size, int flags)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id);
+
+	if (error == 0) {
+		int result;
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		result = yaffs_set_xattrib(obj, name, value, size, flags);
+		if (result == YAFFS_OK)
+			error = 0;
+		else if (result < 0)
+			error = result;
+		yaffs_gross_unlock(dev);
+
+	}
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error);
+
+	return error;
+}
+
+static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name,
+			void *buff, size_t size)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_getxattr \"%s\" from object %d",
+		name, obj->obj_id);
+
+	if (error == 0) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		error = yaffs_get_xattrib(obj, name, buff, size);
+		yaffs_gross_unlock(dev);
+
+	}
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error);
+
+	return error;
+}
+
+static int yaffs_removexattr(struct dentry *dentry, const char *name)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_removexattr of object %d", obj->obj_id);
+
+	if (error == 0) {
+		int result;
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		result = yaffs_remove_xattrib(obj, name);
+		if (result == YAFFS_OK)
+			error = 0;
+		else if (result < 0)
+			error = result;
+		yaffs_gross_unlock(dev);
+
+	}
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_removexattr done returning %d", error);
+
+	return error;
+}
+
+static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_listxattr of object %d", obj->obj_id);
+
+	if (error == 0) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		error = yaffs_list_xattrib(obj, buff, size);
+		yaffs_gross_unlock(dev);
+
+	}
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_listxattr done returning %d", error);
+
+	return error;
+}
+
+
+static const struct inode_operations yaffs_file_inode_operations = {
+	.setattr = yaffs_setattr,
+	.setxattr = yaffs_setxattr,
+	.getxattr = yaffs_getxattr,
+	.listxattr = yaffs_listxattr,
+	.removexattr = yaffs_removexattr,
+};
+
+
+static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
+			  int buflen)
+{
+	unsigned char *alias;
+	int ret;
+
+	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
+
+	yaffs_gross_unlock(dev);
+
+	if (!alias)
+		return -ENOMEM;
+
+	ret = vfs_readlink(dentry, buffer, buflen, alias);
+	kfree(alias);
+	return ret;
+}
+
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+{
+	void *ret;
+#else
+static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+{
+	int ret
+#endif
+	unsigned char *alias;
+	int ret_int = 0;
+	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
+	yaffs_gross_unlock(dev);
+
+	if (!alias) {
+		ret_int = -ENOMEM;
+		goto out;
+	}
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+	nd_set_link(nd, alias);
+	ret = alias;
+out:
+	if (ret_int)
+		ret = ERR_PTR(ret_int);
+	return ret;
+#else
+	ret = vfs_follow_link(nd, alias);
+	kfree(alias);
+out:
+	if (ret_int)
+		ret = ret_int;
+	return ret;
+#endif
+}
+
+
+#ifdef YAFFS_HAS_PUT_INODE
+
+/* For now put inode is just for debugging
+ * Put inode is called when the inode **structure** is put.
+ */
+static void yaffs_put_inode(struct inode *inode)
+{
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_put_inode: ino %d, count %d"),
+		(int)inode->i_ino, atomic_read(&inode->i_count);
+
+}
+#endif
+
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
+{
+	kfree(alias);
+}
+#endif
+
+static const struct inode_operations yaffs_symlink_inode_operations = {
+	.readlink = yaffs_readlink,
+	.follow_link = yaffs_follow_link,
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+	.put_link = yaffs_put_link,
+#endif
+	.setattr = yaffs_setattr,
+	.setxattr = yaffs_setxattr,
+	.getxattr = yaffs_getxattr,
+	.listxattr = yaffs_listxattr,
+	.removexattr = yaffs_removexattr,
+};
+
+#ifdef YAFFS_USE_OWN_IGET
+
+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
+{
+	struct inode *inode;
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino);
+
+	inode = iget_locked(sb, ino);
+	if (!inode)
+		return ERR_PTR(-ENOMEM);
+	if (!(inode->i_state & I_NEW))
+		return inode;
+
+	/* NB This is called as a side effect of other functions, but
+	 * we had to release the lock to prevent deadlocks, so
+	 * need to lock again.
+	 */
+
+	yaffs_gross_lock(dev);
+
+	obj = yaffs_find_by_number(dev, inode->i_ino);
+
+	yaffs_fill_inode_from_obj(inode, obj);
+
+	yaffs_gross_unlock(dev);
+
+	unlock_new_inode(inode);
+	return inode;
+}
+
+#else
+
+static void yaffs_read_inode(struct inode *inode)
+{
+	/* NB This is called as a side effect of other functions, but
+	 * we had to release the lock to prevent deadlocks, so
+	 * need to lock again.
+	 */
+
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_read_inode for %d", (int)inode->i_ino);
+
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
+		yaffs_gross_lock(dev);
+
+	obj = yaffs_find_by_number(dev, inode->i_ino);
+
+	yaffs_fill_inode_from_obj(inode, obj);
+
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
+		yaffs_gross_unlock(dev);
+}
+
+#endif
+
+
+
+struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
+			      struct yaffs_obj *obj)
+{
+	struct inode *inode;
+
+	if (!sb) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_get_inode for NULL super_block!!");
+		return NULL;
+
+	}
+
+	if (!obj) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_get_inode for NULL object!!");
+		return NULL;
+
+	}
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_get_inode for object %d", obj->obj_id);
+
+	inode = Y_IGET(sb, obj->obj_id);
+	if (IS_ERR(inode))
+		return NULL;
+
+	/* NB Side effect: iget calls back to yaffs_read_inode(). */
+	/* iget also increments the inode's i_count */
+	/* NB You can't be holding gross_lock or deadlock will happen! */
+
+	return inode;
+}
+
+
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+#define YCRED(x) x
+#else
+#define YCRED(x) (x->cred)
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
+		       dev_t rdev)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+		       dev_t rdev)
+#else
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+		       int rdev)
+#endif
+{
+	struct inode *inode;
+
+	struct yaffs_obj *obj = NULL;
+	struct yaffs_dev *dev;
+
+	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
+
+	int error = -ENOSPC;
+	uid_t uid = YCRED(current)->fsuid;
+	gid_t gid =
+	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
+
+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+		mode |= S_ISGID;
+
+	if (parent) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_mknod: parent object %d type %d",
+			parent->obj_id, parent->variant_type);
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_mknod: could not get parent object");
+		return -EPERM;
+	}
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_mknod: making oject for %s, mode %x dev %x",
+		dentry->d_name.name, mode, rdev);
+
+	dev = parent->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	switch (mode & S_IFMT) {
+	default:
+		/* Special (socket, fifo, device...) */
+		yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making special");
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+		obj =
+		    yaffs_create_special(parent, dentry->d_name.name, mode, uid,
+					 gid, old_encode_dev(rdev));
+#else
+		obj =
+		    yaffs_create_special(parent, dentry->d_name.name, mode, uid,
+					 gid, rdev);
+#endif
+		break;
+	case S_IFREG:		/* file          */
+		yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making file");
+		obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid,
+					gid);
+		break;
+	case S_IFDIR:		/* directory */
+		yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making directory");
+		obj = yaffs_create_dir(parent, dentry->d_name.name, mode,
+				       uid, gid);
+		break;
+	case S_IFLNK:		/* symlink */
+		yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making symlink");
+		obj = NULL;	/* Do we ever get here? */
+		break;
+	}
+
+	/* Can not call yaffs_get_inode() with gross lock held */
+	yaffs_gross_unlock(dev);
+
+	if (obj) {
+		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
+		d_instantiate(dentry, inode);
+		update_dir_time(dir);
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_mknod created object %d count = %d",
+			obj->obj_id, atomic_read(&inode->i_count));
+		error = 0;
+		yaffs_fill_inode_from_obj(dir, parent);
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod failed making object");
+		error = -ENOMEM;
+	}
+
+	return error;
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+#else
+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+#endif
+{
+	int ret_val;
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir");
+	ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
+	return ret_val;
+}
+
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+			bool dummy)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+			struct nameidata *n)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
+			struct nameidata *n)
+#else
+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
+#endif
+{
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_create");
+	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
+				   unsigned int dummy)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
+				   struct nameidata *n)
+#else
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
+#endif
+{
+	struct yaffs_obj *obj;
+	struct inode *inode = NULL;	/* NCB 2.5/2.6 needs NULL here */
+
+	struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev;
+
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
+		yaffs_gross_lock(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s",
+		yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name);
+
+	obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
+
+	obj = yaffs_get_equivalent_obj(obj);	/* in case it was a hardlink */
+
+	/* Can't hold gross lock when calling yaffs_get_inode() */
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
+		yaffs_gross_unlock(dev);
+
+	if (obj) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_lookup found %d", obj->obj_id);
+
+		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found");
+
+	}
+
+/* added NCB for 2.5/6 compatability - forces add even if inode is
+ * NULL which creates dentry hash */
+	d_add(dentry, inode);
+
+	return NULL;
+}
+
+/*
+ * Create a link...
+ */
+static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
+		      struct dentry *dentry)
+{
+	struct inode *inode = old_dentry->d_inode;
+	struct yaffs_obj *obj = NULL;
+	struct yaffs_obj *link = NULL;
+	struct yaffs_dev *dev;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_link");
+
+	obj = yaffs_inode_to_obj(inode);
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
+		link =
+		    yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name,
+				   obj);
+
+	if (link) {
+		set_nlink(old_dentry->d_inode, yaffs_get_obj_link_count(obj));
+		d_instantiate(dentry, old_dentry->d_inode);
+		atomic_inc(&old_dentry->d_inode->i_count);
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_link link count %d i_count %d",
+			old_dentry->d_inode->i_nlink,
+			atomic_read(&old_dentry->d_inode->i_count));
+	}
+
+	yaffs_gross_unlock(dev);
+
+	if (link) {
+		update_dir_time(dir);
+		return 0;
+	}
+
+	return -EPERM;
+}
+
+static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
+			 const char *symname)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+	uid_t uid = YCRED(current)->fsuid;
+	gid_t gid =
+	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
+
+	if (strnlen(dentry->d_name.name, YAFFS_MAX_NAME_LENGTH + 1) >
+				YAFFS_MAX_NAME_LENGTH)
+		return -ENAMETOOLONG;
+
+	if (strnlen(symname, YAFFS_MAX_ALIAS_LENGTH + 1) >
+				YAFFS_MAX_ALIAS_LENGTH)
+		return -ENAMETOOLONG;
+
+	dev = yaffs_inode_to_obj(dir)->my_dev;
+	yaffs_gross_lock(dev);
+	obj = yaffs_create_symlink(yaffs_inode_to_obj(dir), dentry->d_name.name,
+				   S_IFLNK | S_IRWXUGO, uid, gid, symname);
+	yaffs_gross_unlock(dev);
+
+	if (obj) {
+		struct inode *inode;
+
+		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
+		d_instantiate(dentry, inode);
+		update_dir_time(dir);
+		yaffs_trace(YAFFS_TRACE_OS, "symlink created OK");
+		return 0;
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS, "symlink not created");
+	}
+
+	return -ENOMEM;
+}
+
+/*
+ * The VFS layer already does all the dentry stuff for rename.
+ *
+ * NB: POSIX says you can rename an object over an old object of the same name
+ */
+static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
+			struct inode *new_dir, struct dentry *new_dentry)
+{
+	struct yaffs_dev *dev;
+	int ret_val = YAFFS_FAIL;
+	struct yaffs_obj *target;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename");
+	dev = yaffs_inode_to_obj(old_dir)->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	/* Check if the target is an existing directory that is not empty. */
+	target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir),
+				    new_dentry->d_name.name);
+
+	if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
+	    !list_empty(&target->variant.dir_variant.children)) {
+
+		yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir");
+
+		ret_val = YAFFS_FAIL;
+	} else {
+		/* Now does unlinking internally using shadowing mechanism */
+		yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj");
+
+		ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir),
+					   old_dentry->d_name.name,
+					   yaffs_inode_to_obj(new_dir),
+					   new_dentry->d_name.name);
+	}
+	yaffs_gross_unlock(dev);
+
+	if (ret_val == YAFFS_OK) {
+		if (target)
+			inode_dec_link_count(new_dentry->d_inode);
+
+		update_dir_time(old_dir);
+		if (old_dir != new_dir)
+			update_dir_time(new_dir);
+		return 0;
+	} else {
+		return -ENOTEMPTY;
+	}
+}
+
+
+
+
+static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
+{
+	int ret_val;
+
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s",
+		(int)(dir->i_ino), dentry->d_name.name);
+	obj = yaffs_inode_to_obj(dir);
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	ret_val = yaffs_unlinker(obj, dentry->d_name.name);
+
+	if (ret_val == YAFFS_OK) {
+		inode_dec_link_count(dentry->d_inode);
+		dir->i_version++;
+		yaffs_gross_unlock(dev);
+		update_dir_time(dir);
+		return 0;
+	}
+	yaffs_gross_unlock(dev);
+	return -ENOTEMPTY;
+}
+
+
+
+static const struct inode_operations yaffs_dir_inode_operations = {
+	.create = yaffs_create,
+	.lookup = yaffs_lookup,
+	.link = yaffs_link,
+	.unlink = yaffs_unlink,
+	.symlink = yaffs_symlink,
+	.mkdir = yaffs_mkdir,
+	.rmdir = yaffs_unlink,
+	.mknod = yaffs_mknod,
+	.rename = yaffs_rename,
+	.setattr = yaffs_setattr,
+	.setxattr = yaffs_setxattr,
+	.getxattr = yaffs_getxattr,
+	.listxattr = yaffs_listxattr,
+	.removexattr = yaffs_removexattr,
+};
+
+/*-----------------------------------------------------------------*/
+/* Directory search context allows us to unlock access to yaffs during
+ * filldir without causing problems with the directory being modified.
+ * This is similar to the tried and tested mechanism used in yaffs direct.
+ *
+ * A search context iterates along a doubly linked list of siblings in the
+ * directory. If the iterating object is deleted then this would corrupt
+ * the list iteration, likely causing a crash. The search context avoids
+ * this by using the remove_obj_fn to move the search context to the
+ * next object before the object is deleted.
+ *
+ * Many readdirs (and thus seach conexts) may be alive simulateously so
+ * each struct yaffs_dev has a list of these.
+ *
+ * A seach context lives for the duration of a readdir.
+ *
+ * All these functions must be called while yaffs is locked.
+ */
+
+struct yaffs_search_context {
+	struct yaffs_dev *dev;
+	struct yaffs_obj *dir_obj;
+	struct yaffs_obj *next_return;
+	struct list_head others;
+};
+
+/*
+ * yaffs_new_search() creates a new search context, initialises it and
+ * adds it to the device's search context list.
+ *
+ * Called at start of readdir.
+ */
+static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
+{
+	struct yaffs_dev *dev = dir->my_dev;
+	struct yaffs_search_context *sc =
+	    kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS);
+	if (sc) {
+		sc->dir_obj = dir;
+		sc->dev = dev;
+		if (list_empty(&sc->dir_obj->variant.dir_variant.children))
+			sc->next_return = NULL;
+		else
+			sc->next_return =
+			    list_entry(dir->variant.dir_variant.children.next,
+				       struct yaffs_obj, siblings);
+		INIT_LIST_HEAD(&sc->others);
+		list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts));
+	}
+	return sc;
+}
+
+/*
+ * yaffs_search_end() disposes of a search context and cleans up.
+ */
+static void yaffs_search_end(struct yaffs_search_context *sc)
+{
+	if (sc) {
+		list_del(&sc->others);
+		kfree(sc);
+	}
+}
+
+/*
+ * yaffs_search_advance() moves a search context to the next object.
+ * Called when the search iterates or when an object removal causes
+ * the search context to be moved to the next object.
+ */
+static void yaffs_search_advance(struct yaffs_search_context *sc)
+{
+	if (!sc)
+		return;
+
+	if (sc->next_return == NULL ||
+	    list_empty(&sc->dir_obj->variant.dir_variant.children))
+		sc->next_return = NULL;
+	else {
+		struct list_head *next = sc->next_return->siblings.next;
+
+		if (next == &sc->dir_obj->variant.dir_variant.children)
+			sc->next_return = NULL;	/* end of list */
+		else
+			sc->next_return =
+			    list_entry(next, struct yaffs_obj, siblings);
+	}
+}
+
+/*
+ * yaffs_remove_obj_callback() is called when an object is unlinked.
+ * We check open search contexts and advance any which are currently
+ * on the object being iterated.
+ */
+static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
+{
+
+	struct list_head *i;
+	struct yaffs_search_context *sc;
+	struct list_head *search_contexts =
+	    &(yaffs_dev_to_lc(obj->my_dev)->search_contexts);
+
+	/* Iterate through the directory search contexts.
+	 * If any are currently on the object being removed, then advance
+	 * the search context to the next object to prevent a hanging pointer.
+	 */
+	list_for_each(i, search_contexts) {
+		sc = list_entry(i, struct yaffs_search_context, others);
+		if (sc->next_return == obj)
+			yaffs_search_advance(sc);
+	}
+
+}
+
+
+/*-----------------------------------------------------------------*/
+
+static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+	struct yaffs_search_context *sc;
+	struct inode *inode = f->f_dentry->d_inode;
+	unsigned long offset, curoffs;
+	struct yaffs_obj *l;
+	int ret_val = 0;
+
+	char name[YAFFS_MAX_NAME_LENGTH + 1];
+
+	obj = yaffs_dentry_to_obj(f->f_dentry);
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	yaffs_dev_to_lc(dev)->readdir_process = current;
+
+	offset = f->f_pos;
+
+	sc = yaffs_new_search(obj);
+	if (!sc) {
+		ret_val = -ENOMEM;
+		goto out;
+	}
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_readdir: starting at %d", (int)offset);
+
+	if (offset == 0) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_readdir: entry . ino %d",
+			(int)inode->i_ino);
+		yaffs_gross_unlock(dev);
+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) {
+			yaffs_gross_lock(dev);
+			goto out;
+		}
+		yaffs_gross_lock(dev);
+		offset++;
+		f->f_pos++;
+	}
+	if (offset == 1) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_readdir: entry .. ino %d",
+			(int)f->f_dentry->d_parent->d_inode->i_ino);
+		yaffs_gross_unlock(dev);
+		if (filldir(dirent, "..", 2, offset,
+			    f->f_dentry->d_parent->d_inode->i_ino,
+			    DT_DIR) < 0) {
+			yaffs_gross_lock(dev);
+			goto out;
+		}
+		yaffs_gross_lock(dev);
+		offset++;
+		f->f_pos++;
+	}
+
+	curoffs = 1;
+
+	/* If the directory has changed since the open or last call to
+	   readdir, rewind to after the 2 canned entries. */
+	if (f->f_version != inode->i_version) {
+		offset = 2;
+		f->f_pos = offset;
+		f->f_version = inode->i_version;
+	}
+
+	while (sc->next_return) {
+		curoffs++;
+		l = sc->next_return;
+		if (curoffs >= offset) {
+			int this_inode = yaffs_get_obj_inode(l);
+			int this_type = yaffs_get_obj_type(l);
+
+			yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
+			yaffs_trace(YAFFS_TRACE_OS,
+				"yaffs_readdir: %s inode %d",
+				name, yaffs_get_obj_inode(l));
+
+			yaffs_gross_unlock(dev);
+
+			if (filldir(dirent,
+				    name,
+				    strlen(name),
+				    offset, this_inode, this_type) < 0) {
+				yaffs_gross_lock(dev);
+				goto out;
+			}
+
+			yaffs_gross_lock(dev);
+
+			offset++;
+			f->f_pos++;
+		}
+		yaffs_search_advance(sc);
+	}
+
+out:
+	yaffs_search_end(sc);
+	yaffs_dev_to_lc(dev)->readdir_process = NULL;
+	yaffs_gross_unlock(dev);
+
+	return ret_val;
+}
+
+static const struct file_operations yaffs_dir_operations = {
+	.read = generic_read_dir,
+	.readdir = yaffs_readdir,
+	.fsync = yaffs_sync_object,
+	.llseek = generic_file_llseek,
+};
+
+static void yaffs_fill_inode_from_obj(struct inode *inode,
+				      struct yaffs_obj *obj)
+{
+	if (inode && obj) {
+
+		/* Check mode against the variant type and attempt to repair if broken. */
+		u32 mode = obj->yst_mode;
+		switch (obj->variant_type) {
+		case YAFFS_OBJECT_TYPE_FILE:
+			if (!S_ISREG(mode)) {
+				obj->yst_mode &= ~S_IFMT;
+				obj->yst_mode |= S_IFREG;
+			}
+
+			break;
+		case YAFFS_OBJECT_TYPE_SYMLINK:
+			if (!S_ISLNK(mode)) {
+				obj->yst_mode &= ~S_IFMT;
+				obj->yst_mode |= S_IFLNK;
+			}
+
+			break;
+		case YAFFS_OBJECT_TYPE_DIRECTORY:
+			if (!S_ISDIR(mode)) {
+				obj->yst_mode &= ~S_IFMT;
+				obj->yst_mode |= S_IFDIR;
+			}
+
+			break;
+		case YAFFS_OBJECT_TYPE_UNKNOWN:
+		case YAFFS_OBJECT_TYPE_HARDLINK:
+		case YAFFS_OBJECT_TYPE_SPECIAL:
+		default:
+			/* TODO? */
+			break;
+		}
+
+		inode->i_flags |= S_NOATIME;
+
+		inode->i_ino = obj->obj_id;
+		inode->i_mode = obj->yst_mode;
+		inode->i_uid = obj->yst_uid;
+		inode->i_gid = obj->yst_gid;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+		inode->i_blksize = inode->i_sb->s_blocksize;
+#endif
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+
+		inode->i_rdev = old_decode_dev(obj->yst_rdev);
+		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
+		inode->i_atime.tv_nsec = 0;
+		inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
+		inode->i_mtime.tv_nsec = 0;
+		inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
+		inode->i_ctime.tv_nsec = 0;
+#else
+		inode->i_rdev = obj->yst_rdev;
+		inode->i_atime = obj->yst_atime;
+		inode->i_mtime = obj->yst_mtime;
+		inode->i_ctime = obj->yst_ctime;
+#endif
+		inode->i_size = yaffs_get_obj_length(obj);
+		inode->i_blocks = (inode->i_size + 511) >> 9;
+
+		set_nlink(inode, yaffs_get_obj_link_count(obj));
+
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+			inode->i_mode, inode->i_uid, inode->i_gid,
+			inode->i_size, atomic_read(&inode->i_count));
+
+		switch (obj->yst_mode & S_IFMT) {
+		default:	/* fifo, device or socket */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+			init_special_inode(inode, obj->yst_mode,
+					   old_decode_dev(obj->yst_rdev));
+#else
+			init_special_inode(inode, obj->yst_mode,
+					   (dev_t) (obj->yst_rdev));
+#endif
+			break;
+		case S_IFREG:	/* file */
+			inode->i_op = &yaffs_file_inode_operations;
+			inode->i_fop = &yaffs_file_operations;
+			inode->i_mapping->a_ops =
+			    &yaffs_file_address_operations;
+			break;
+		case S_IFDIR:	/* directory */
+			inode->i_op = &yaffs_dir_inode_operations;
+			inode->i_fop = &yaffs_dir_operations;
+			break;
+		case S_IFLNK:	/* symlink */
+			inode->i_op = &yaffs_symlink_inode_operations;
+			break;
+		}
+
+		yaffs_inode_to_obj_lv(inode) = obj;
+
+		obj->my_inode = inode;
+
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_fill_inode invalid parameters");
+	}
+
+}
+
+
+
+/*
+ * yaffs background thread functions .
+ * yaffs_bg_thread_fn() the thread function
+ * yaffs_bg_start() launches the background thread.
+ * yaffs_bg_stop() cleans up the background thread.
+ *
+ * NB:
+ * The thread should only run after the yaffs is initialised
+ * The thread should be stopped before yaffs is unmounted.
+ * The thread should not do any writing while the fs is in read only.
+ */
+
+static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev)
+{
+	unsigned erased_chunks =
+	    dev->n_erased_blocks * dev->param.chunks_per_block;
+	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+	unsigned scattered = 0;	/* Free chunks not in an erased block */
+
+	if (erased_chunks < dev->n_free_chunks)
+		scattered = (dev->n_free_chunks - erased_chunks);
+
+	if (!context->bg_running)
+		return 0;
+	else if (scattered < (dev->param.chunks_per_block * 2))
+		return 0;
+	else if (erased_chunks > dev->n_free_chunks / 2)
+		return 0;
+	else if (erased_chunks > dev->n_free_chunks / 4)
+		return 1;
+	else
+		return 2;
+}
+
+#ifdef YAFFS_COMPILE_BACKGROUND
+
+void yaffs_background_waker(unsigned long data)
+{
+	wake_up_process((struct task_struct *)data);
+}
+
+static int yaffs_bg_thread_fn(void *data)
+{
+	struct yaffs_dev *dev = (struct yaffs_dev *)data;
+	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+	unsigned long now = jiffies;
+	unsigned long next_dir_update = now;
+	unsigned long next_gc = now;
+	unsigned long expires;
+	unsigned int urgency;
+
+	int gc_result;
+	struct timer_list timer;
+
+	yaffs_trace(YAFFS_TRACE_BACKGROUND,
+		"yaffs_background starting for dev %p", (void *)dev);
+
+#ifdef YAFFS_COMPILE_FREEZER
+	set_freezable();
+#endif
+	while (context->bg_running) {
+		yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background");
+
+		if (kthread_should_stop())
+			break;
+
+#ifdef YAFFS_COMPILE_FREEZER
+		if (try_to_freeze())
+			continue;
+#endif
+		yaffs_gross_lock(dev);
+
+		now = jiffies;
+
+		if (time_after(now, next_dir_update) && yaffs_bg_enable) {
+			yaffs_update_dirty_dirs(dev);
+			next_dir_update = now + HZ;
+		}
+
+		if (time_after(now, next_gc) && yaffs_bg_enable) {
+			if (!dev->is_checkpointed) {
+				urgency = yaffs_bg_gc_urgency(dev);
+				gc_result = yaffs_bg_gc(dev, urgency);
+				if (urgency > 1)
+					next_gc = now + HZ / 20 + 1;
+				else if (urgency > 0)
+					next_gc = now + HZ / 10 + 1;
+				else
+					next_gc = now + HZ * 2;
+			} else	{
+			        /*
+				 * gc not running so set to next_dir_update
+				 * to cut down on wake ups
+				 */
+				next_gc = next_dir_update;
+                        }
+		}
+		yaffs_gross_unlock(dev);
+#if 1
+		expires = next_dir_update;
+		if (time_before(next_gc, expires))
+			expires = next_gc;
+		if (time_before(expires, now))
+			expires = now + HZ;
+
+		Y_INIT_TIMER(&timer);
+		timer.expires = expires + 1;
+		timer.data = (unsigned long)current;
+		timer.function = yaffs_background_waker;
+
+		set_current_state(TASK_INTERRUPTIBLE);
+		add_timer(&timer);
+		schedule();
+		del_timer_sync(&timer);
+#else
+		msleep(10);
+#endif
+	}
+
+	return 0;
+}
+
+static int yaffs_bg_start(struct yaffs_dev *dev)
+{
+	int retval = 0;
+	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+
+	if (dev->read_only)
+		return -1;
+
+	context->bg_running = 1;
+
+	context->bg_thread = kthread_run(yaffs_bg_thread_fn,
+					 (void *)dev, "yaffs-bg-%d",
+					 context->mount_id);
+
+	if (IS_ERR(context->bg_thread)) {
+		retval = PTR_ERR(context->bg_thread);
+		context->bg_thread = NULL;
+		context->bg_running = 0;
+	}
+	return retval;
+}
+
+static void yaffs_bg_stop(struct yaffs_dev *dev)
+{
+	struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev);
+
+	ctxt->bg_running = 0;
+
+	if (ctxt->bg_thread) {
+		kthread_stop(ctxt->bg_thread);
+		ctxt->bg_thread = NULL;
+	}
+}
+#else
+static int yaffs_bg_thread_fn(void *data)
+{
+	return 0;
+}
+
+static int yaffs_bg_start(struct yaffs_dev *dev)
+{
+	return 0;
+}
+
+static void yaffs_bg_stop(struct yaffs_dev *dev)
+{
+}
+#endif
+
+
+static void yaffs_flush_inodes(struct super_block *sb)
+{
+	struct inode *iptr;
+	struct yaffs_obj *obj;
+
+	list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
+		obj = yaffs_inode_to_obj(iptr);
+		if (obj) {
+			yaffs_trace(YAFFS_TRACE_OS,
+				"flushing obj %d",
+				obj->obj_id);
+			yaffs_flush_file(obj, 1, 0);
+		}
+	}
+}
+
+static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
+{
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+	if (!dev)
+		return;
+
+	yaffs_flush_inodes(sb);
+	yaffs_update_dirty_dirs(dev);
+	yaffs_flush_whole_cache(dev);
+	if (do_checkpoint)
+		yaffs_checkpoint_save(dev);
+}
+
+static LIST_HEAD(yaffs_context_list);
+struct mutex yaffs_context_lock;
+
+static void yaffs_put_super(struct super_block *sb)
+{
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+			"yaffs_put_super");
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+		"Shutting down yaffs background thread");
+	yaffs_bg_stop(dev);
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+		"yaffs background thread shut down");
+
+	yaffs_gross_lock(dev);
+
+	yaffs_flush_super(sb, 1);
+
+	yaffs_deinitialise(dev);
+
+	yaffs_gross_unlock(dev);
+
+	mutex_lock(&yaffs_context_lock);
+	list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
+	mutex_unlock(&yaffs_context_lock);
+
+	if (yaffs_dev_to_lc(dev)->spare_buffer) {
+		kfree(yaffs_dev_to_lc(dev)->spare_buffer);
+		yaffs_dev_to_lc(dev)->spare_buffer = NULL;
+	}
+
+	kfree(dev);
+
+	yaffs_put_mtd_device(mtd);
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+			"yaffs_put_super done");
+}
+
+
+static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
+{
+	return yaffs_gc_control;
+}
+
+
+#ifdef YAFFS_COMPILE_EXPORTFS
+
+static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino,
+					  uint32_t generation)
+{
+	return Y_IGET(sb, ino);
+}
+
+static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb,
+					  struct fid *fid, int fh_len,
+					  int fh_type)
+{
+	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
+				    yaffs2_nfs_get_inode);
+}
+
+static struct dentry *yaffs2_fh_to_parent(struct super_block *sb,
+					  struct fid *fid, int fh_len,
+					  int fh_type)
+{
+	return generic_fh_to_parent(sb, fid, fh_len, fh_type,
+				    yaffs2_nfs_get_inode);
+}
+
+struct dentry *yaffs2_get_parent(struct dentry *dentry)
+{
+
+	struct super_block *sb = dentry->d_inode->i_sb;
+	struct dentry *parent = ERR_PTR(-ENOENT);
+	struct inode *inode;
+	unsigned long parent_ino;
+	struct yaffs_obj *d_obj;
+	struct yaffs_obj *parent_obj;
+
+	d_obj = yaffs_inode_to_obj(dentry->d_inode);
+
+	if (d_obj) {
+		parent_obj = d_obj->parent;
+		if (parent_obj) {
+			parent_ino = yaffs_get_obj_inode(parent_obj);
+			inode = Y_IGET(sb, parent_ino);
+
+			if (IS_ERR(inode)) {
+				parent = ERR_CAST(inode);
+			} else {
+				parent = d_obtain_alias(inode);
+				if (!IS_ERR(parent)) {
+					parent = ERR_PTR(-ENOMEM);
+					iput(inode);
+				}
+			}
+		}
+	}
+
+	return parent;
+}
+
+/* Just declare a zero structure as a NULL value implies
+ * using the default functions of exportfs.
+ */
+
+static struct export_operations yaffs_export_ops = {
+	.fh_to_dentry = yaffs2_fh_to_dentry,
+	.fh_to_parent = yaffs2_fh_to_parent,
+	.get_parent = yaffs2_get_parent,
+};
+
+#endif
+
+static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj)
+{
+	/* Clear the association between the inode and
+	 * the struct yaffs_obj.
+	 */
+	obj->my_inode = NULL;
+	yaffs_inode_to_obj_lv(inode) = NULL;
+
+	/* If the object freeing was deferred, then the real
+	 * free happens now.
+	 * This should fix the inode inconsistency problem.
+	 */
+	yaffs_handle_defered_free(obj);
+}
+
+#ifdef YAFFS_HAS_EVICT_INODE
+/* yaffs_evict_inode combines into one operation what was previously done in
+ * yaffs_clear_inode() and yaffs_delete_inode()
+ *
+ */
+static void yaffs_evict_inode(struct inode *inode)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+	int deleteme = 0;
+
+	obj = yaffs_inode_to_obj(inode);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_evict_inode: ino %d, count %d %s",
+		(int)inode->i_ino, atomic_read(&inode->i_count),
+		obj ? "object exists" : "null object");
+
+	if (!inode->i_nlink && !is_bad_inode(inode))
+		deleteme = 1;
+	truncate_inode_pages(&inode->i_data, 0);
+	Y_CLEAR_INODE(inode);
+
+	if (deleteme && obj) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		yaffs_del_obj(obj);
+		yaffs_gross_unlock(dev);
+	}
+	if (obj) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		yaffs_unstitch_obj(inode, obj);
+		yaffs_gross_unlock(dev);
+	}
+}
+#else
+
+/* clear is called to tell the fs to release any per-inode data it holds.
+ * The object might still exist on disk and is just being thrown out of the cache
+ * or else the object has actually been deleted and we're being called via
+ * the chain
+ *   yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode()
+ */
+
+static void yaffs_clear_inode(struct inode *inode)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+
+	obj = yaffs_inode_to_obj(inode);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_clear_inode: ino %d, count %d %s",
+		(int)inode->i_ino, atomic_read(&inode->i_count),
+		obj ? "object exists" : "null object");
+
+	if (obj) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		yaffs_unstitch_obj(inode, obj);
+		yaffs_gross_unlock(dev);
+	}
+
+}
+
+/* delete is called when the link count is zero and the inode
+ * is put (ie. nobody wants to know about it anymore, time to
+ * delete the file).
+ * NB Must call clear_inode()
+ */
+static void yaffs_delete_inode(struct inode *inode)
+{
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+	struct yaffs_dev *dev;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_delete_inode: ino %d, count %d %s",
+		(int)inode->i_ino, atomic_read(&inode->i_count),
+		obj ? "object exists" : "null object");
+
+	if (obj) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		yaffs_del_obj(obj);
+		yaffs_gross_unlock(dev);
+	}
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
+	truncate_inode_pages(&inode->i_data, 0);
+#endif
+	clear_inode(inode);
+}
+#endif
+
+
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
+{
+	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+	struct super_block *sb = dentry->d_sb;
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
+{
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+#else
+static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
+{
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+#endif
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_statfs");
+
+	yaffs_gross_lock(dev);
+
+	buf->f_type = YAFFS_MAGIC;
+	buf->f_bsize = sb->s_blocksize;
+	buf->f_namelen = 255;
+
+	if (dev->data_bytes_per_chunk & (dev->data_bytes_per_chunk - 1)) {
+		/* Do this if chunk size is not a power of 2 */
+
+		uint64_t bytes_in_dev;
+		uint64_t bytes_free;
+
+		bytes_in_dev =
+		    ((uint64_t)
+		     ((dev->param.end_block - dev->param.start_block +
+		       1))) * ((uint64_t) (dev->param.chunks_per_block *
+					   dev->data_bytes_per_chunk));
+
+		do_div(bytes_in_dev, sb->s_blocksize);	/* bytes_in_dev becomes the number of blocks */
+		buf->f_blocks = bytes_in_dev;
+
+		bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) *
+		    ((uint64_t) (dev->data_bytes_per_chunk));
+
+		do_div(bytes_free, sb->s_blocksize);
+
+		buf->f_bfree = bytes_free;
+
+	} else if (sb->s_blocksize > dev->data_bytes_per_chunk) {
+
+		buf->f_blocks =
+		    (dev->param.end_block - dev->param.start_block + 1) *
+		    dev->param.chunks_per_block /
+		    (sb->s_blocksize / dev->data_bytes_per_chunk);
+		buf->f_bfree =
+		    yaffs_get_n_free_chunks(dev) /
+		    (sb->s_blocksize / dev->data_bytes_per_chunk);
+	} else {
+		buf->f_blocks =
+		    (dev->param.end_block - dev->param.start_block + 1) *
+		    dev->param.chunks_per_block *
+		    (dev->data_bytes_per_chunk / sb->s_blocksize);
+
+		buf->f_bfree =
+		    yaffs_get_n_free_chunks(dev) *
+		    (dev->data_bytes_per_chunk / sb->s_blocksize);
+	}
+
+	buf->f_files = 0;
+	buf->f_ffree = 0;
+	buf->f_bavail = buf->f_bfree;
+
+	yaffs_gross_unlock(dev);
+	return 0;
+}
+
+
+
+static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
+{
+
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+	unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
+	unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
+	int do_checkpoint;
+	int dirty = yaffs_check_super_dirty(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+		"yaffs_do_sync_fs: gc-urgency %d %s %s%s",
+		gc_urgent,
+		dirty ? "dirty" : "clean",
+		request_checkpoint ? "checkpoint requested" : "no checkpoint",
+		oneshot_checkpoint ? " one-shot" : "");
+
+	yaffs_gross_lock(dev);
+	do_checkpoint = ((request_checkpoint && !gc_urgent) ||
+			 oneshot_checkpoint) && !dev->is_checkpointed;
+
+	if (dirty || do_checkpoint) {
+		yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint);
+		yaffs_clear_super_dirty(dev);
+		if (oneshot_checkpoint)
+			yaffs_auto_checkpoint &= ~4;
+	}
+	yaffs_gross_unlock(dev);
+
+	return 0;
+}
+
+
+#ifdef YAFFS_HAS_WRITE_SUPER
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+static void yaffs_write_super(struct super_block *sb)
+#else
+static int yaffs_write_super(struct super_block *sb)
+#endif
+{
+	unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+		"yaffs_write_super %s",
+		request_checkpoint ? " checkpt" : "");
+
+	yaffs_do_sync_fs(sb, request_checkpoint);
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
+	return 0;
+#endif
+}
+#endif
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+static int yaffs_sync_fs(struct super_block *sb, int wait)
+#else
+static int yaffs_sync_fs(struct super_block *sb)
+#endif
+{
+	unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+		"yaffs_sync_fs%s", request_checkpoint ? " checkpt" : "");
+
+	yaffs_do_sync_fs(sb, request_checkpoint);
+
+	return 0;
+}
+
+
+
+static const struct super_operations yaffs_super_ops = {
+	.statfs = yaffs_statfs,
+
+#ifndef YAFFS_USE_OWN_IGET
+	.read_inode = yaffs_read_inode,
+#endif
+#ifdef YAFFS_HAS_PUT_INODE
+	.put_inode = yaffs_put_inode,
+#endif
+	.put_super = yaffs_put_super,
+#ifdef YAFFS_HAS_EVICT_INODE
+	.evict_inode = yaffs_evict_inode,
+#else
+	.delete_inode = yaffs_delete_inode,
+	.clear_inode = yaffs_clear_inode,
+#endif
+	.sync_fs = yaffs_sync_fs,
+#ifdef YAFFS_HAS_WRITE_SUPER
+	.write_super = yaffs_write_super,
+#endif
+};
+
+struct yaffs_options {
+	int inband_tags;
+	int skip_checkpoint_read;
+	int skip_checkpoint_write;
+	int no_cache;
+	int tags_ecc_on;
+	int tags_ecc_overridden;
+	int lazy_loading_enabled;
+	int lazy_loading_overridden;
+	int empty_lost_and_found;
+	int empty_lost_and_found_overridden;
+	int disable_summary;
+};
+
+#define MAX_OPT_LEN 30
+static int yaffs_parse_options(struct yaffs_options *options,
+			       const char *options_str)
+{
+	char cur_opt[MAX_OPT_LEN + 1];
+	int p;
+	int error = 0;
+
+	/* Parse through the options which is a comma seperated list */
+
+	while (options_str && *options_str && !error) {
+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
+		p = 0;
+
+		while (*options_str == ',')
+			options_str++;
+
+		while (*options_str && *options_str != ',') {
+			if (p < MAX_OPT_LEN) {
+				cur_opt[p] = *options_str;
+				p++;
+			}
+			options_str++;
+		}
+
+		if (!strcmp(cur_opt, "inband-tags")) {
+			options->inband_tags = 1;
+		} else if (!strcmp(cur_opt, "tags-ecc-off")) {
+			options->tags_ecc_on = 0;
+			options->tags_ecc_overridden = 1;
+		} else if (!strcmp(cur_opt, "tags-ecc-on")) {
+			options->tags_ecc_on = 1;
+			options->tags_ecc_overridden = 1;
+		} else if (!strcmp(cur_opt, "lazy-loading-off")) {
+			options->lazy_loading_enabled = 0;
+			options->lazy_loading_overridden = 1;
+		} else if (!strcmp(cur_opt, "lazy-loading-on")) {
+			options->lazy_loading_enabled = 1;
+			options->lazy_loading_overridden = 1;
+		} else if (!strcmp(cur_opt, "disable-summary")) {
+			options->disable_summary = 1;
+		} else if (!strcmp(cur_opt, "empty-lost-and-found-off")) {
+			options->empty_lost_and_found = 0;
+			options->empty_lost_and_found_overridden = 1;
+		} else if (!strcmp(cur_opt, "empty-lost-and-found-on")) {
+			options->empty_lost_and_found = 1;
+			options->empty_lost_and_found_overridden = 1;
+		} else if (!strcmp(cur_opt, "no-cache")) {
+			options->no_cache = 1;
+		} else if (!strcmp(cur_opt, "no-checkpoint-read")) {
+			options->skip_checkpoint_read = 1;
+		} else if (!strcmp(cur_opt, "no-checkpoint-write")) {
+			options->skip_checkpoint_write = 1;
+		} else if (!strcmp(cur_opt, "no-checkpoint")) {
+			options->skip_checkpoint_read = 1;
+			options->skip_checkpoint_write = 1;
+		} else {
+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
+			       cur_opt);
+			error = 1;
+		}
+	}
+
+	return error;
+}
+
+
+static struct dentry *yaffs_make_root(struct inode *inode)
+{
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+	struct dentry *root = d_alloc_root(inode);
+
+	if (!root)
+		iput(inode);
+
+        return root;
+#else
+        return d_make_root(inode);
+#endif
+}
+
+
+
+
+static struct super_block *yaffs_internal_read_super(int yaffs_version,
+						     struct super_block *sb,
+						     void *data, int silent)
+{
+	int n_blocks;
+	struct inode *inode = NULL;
+	struct dentry *root;
+	struct yaffs_dev *dev = 0;
+	char devname_buf[BDEVNAME_SIZE + 1];
+	struct mtd_info *mtd;
+	int err;
+	char *data_str = (char *)data;
+	struct yaffs_linux_context *context = NULL;
+	struct yaffs_param *param;
+
+	int read_only = 0;
+	int inband_tags = 0;
+
+	struct yaffs_options options;
+
+	unsigned mount_id;
+	int found;
+	struct yaffs_linux_context *context_iterator;
+	struct list_head *l;
+
+	if (!sb) {
+		printk(KERN_INFO "yaffs: sb is NULL\n");
+		return NULL;
+        }
+
+	sb->s_magic = YAFFS_MAGIC;
+	sb->s_op = &yaffs_super_ops;
+	sb->s_flags |= MS_NOATIME;
+
+	read_only = ((sb->s_flags & MS_RDONLY) != 0);
+
+#ifdef YAFFS_COMPILE_EXPORTFS
+	sb->s_export_op = &yaffs_export_ops;
+#endif
+
+	if (!sb->s_dev)
+		printk(KERN_INFO "yaffs: sb->s_dev is NULL\n");
+	else if (!yaffs_devname(sb, devname_buf))
+		printk(KERN_INFO "yaffs: devname is NULL\n");
+	else
+		printk(KERN_INFO "yaffs: dev is %d name is \"%s\" %s\n",
+		       sb->s_dev,
+		       yaffs_devname(sb, devname_buf), read_only ? "ro" : "rw");
+
+	if (!data_str)
+		data_str = "";
+
+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
+
+	memset(&options, 0, sizeof(options));
+
+	if (yaffs_parse_options(&options, data_str)) {
+		/* Option parsing failed */
+		return NULL;
+	}
+
+	sb->s_blocksize = PAGE_CACHE_SIZE;
+	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_read_super: Using yaffs%d", yaffs_version);
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_read_super: block size %d", (int)(sb->s_blocksize));
+
+	yaffs_trace(YAFFS_TRACE_ALWAYS,
+		"yaffs: Attempting MTD mount of %u.%u,\"%s\"",
+		MAJOR(sb->s_dev), MINOR(sb->s_dev),
+		yaffs_devname(sb, devname_buf));
+
+	/* Get the device */
+	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
+	if (!mtd) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"yaffs: MTD device %u either not valid or unavailable",
+			MINOR(sb->s_dev));
+		return NULL;
+	}
+
+	if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2");
+		yaffs_version = 2;
+	}
+
+	/* Added NCB 26/5/2006 for completeness */
+	if (yaffs_version == 2 && !options.inband_tags
+	    && WRITE_SIZE(mtd) == 512) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1");
+		yaffs_version = 1;
+	}
+
+	if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) ||
+	    options.inband_tags)
+		inband_tags = 1;
+
+	if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0)
+		return NULL;
+
+	/* OK, so if we got here, we have an MTD that's NAND and looks
+	 * like it has the right capabilities
+	 * Set the struct yaffs_dev up for mtd
+	 */
+
+	if (!read_only && !(mtd->flags & MTD_WRITEABLE)) {
+		read_only = 1;
+		printk(KERN_INFO
+		       "yaffs: mtd is read only, setting superblock read only\n"
+		);
+		sb->s_flags |= MS_RDONLY;
+	}
+
+	dev = kmalloc(sizeof(struct yaffs_dev), GFP_KERNEL);
+	context = kmalloc(sizeof(struct yaffs_linux_context), GFP_KERNEL);
+
+	if (!dev || !context) {
+		if (dev)
+			kfree(dev);
+		if (context)
+			kfree(context);
+		dev = NULL;
+		context = NULL;
+	}
+
+	if (!dev) {
+		/* Deep shit could not allocate device structure */
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"yaffs_read_super: Failed trying to allocate struct yaffs_dev."
+		);
+		return NULL;
+	}
+	memset(dev, 0, sizeof(struct yaffs_dev));
+	param = &(dev->param);
+
+	memset(context, 0, sizeof(struct yaffs_linux_context));
+	dev->os_context = context;
+	INIT_LIST_HEAD(&(context->context_list));
+	context->dev = dev;
+	context->super = sb;
+
+	dev->read_only = read_only;
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+	sb->s_fs_info = dev;
+#else
+	sb->u.generic_sbp = dev;
+#endif
+
+
+	dev->driver_context = mtd;
+	param->name = mtd->name;
+
+	/* Set up the memory size parameters.... */
+
+
+	param->n_reserved_blocks = 5;
+	param->n_caches = (options.no_cache) ? 0 : 10;
+	param->inband_tags = inband_tags;
+
+	param->enable_xattr = 1;
+	if (options.lazy_loading_overridden)
+		param->disable_lazy_load = !options.lazy_loading_enabled;
+
+	param->defered_dir_update = 1;
+
+	if (options.tags_ecc_overridden)
+		param->no_tags_ecc = !options.tags_ecc_on;
+
+	param->empty_lost_n_found = 1;
+	param->refresh_period = 500;
+	param->disable_summary = options.disable_summary;
+
+
+#ifdef CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING
+	param->disable_bad_block_marking  = 1;
+#endif
+	if (options.empty_lost_and_found_overridden)
+		param->empty_lost_n_found = options.empty_lost_and_found;
+
+	/* ... and the functions. */
+	if (yaffs_version == 2) {
+		param->is_yaffs2 = 1;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+		param->total_bytes_per_chunk = mtd->writesize;
+		param->chunks_per_block = mtd->erasesize / mtd->writesize;
+#else
+		param->total_bytes_per_chunk = mtd->oobblock;
+		param->chunks_per_block = mtd->erasesize / mtd->oobblock;
+#endif
+		n_blocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
+
+		param->start_block = 0;
+		param->end_block = n_blocks - 1;
+	} else {
+		param->is_yaffs2 = 0;
+		n_blocks = YCALCBLOCKS(mtd->size,
+			     YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+
+		param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK;
+		param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK;
+	}
+
+	param->start_block = 0;
+	param->end_block = n_blocks - 1;
+
+	yaffs_mtd_drv_install(dev);
+
+	param->sb_dirty_fn = yaffs_set_super_dirty;
+	param->gc_control_fn = yaffs_gc_control_callback;
+
+	yaffs_dev_to_lc(dev)->super = sb;
+
+	param->use_nand_ecc = 1;
+
+	param->skip_checkpt_rd = options.skip_checkpoint_read;
+	param->skip_checkpt_wr = options.skip_checkpoint_write;
+
+	mutex_lock(&yaffs_context_lock);
+	/* Get a mount id */
+	found = 0;
+	for (mount_id = 0; !found; mount_id++) {
+		found = 1;
+		list_for_each(l, &yaffs_context_list) {
+			context_iterator =
+			    list_entry(l, struct yaffs_linux_context,
+				       context_list);
+			if (context_iterator->mount_id == mount_id)
+				found = 0;
+		}
+	}
+	context->mount_id = mount_id;
+
+	list_add_tail(&(yaffs_dev_to_lc(dev)->context_list),
+		      &yaffs_context_list);
+	mutex_unlock(&yaffs_context_lock);
+
+	/* Directory search handling... */
+	INIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->search_contexts));
+	param->remove_obj_fn = yaffs_remove_obj_callback;
+
+	mutex_init(&(yaffs_dev_to_lc(dev)->gross_lock));
+
+	yaffs_gross_lock(dev);
+
+	err = yaffs_guts_initialise(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_read_super: guts initialised %s",
+		(err == YAFFS_OK) ? "OK" : "FAILED");
+
+	if (err == YAFFS_OK)
+		yaffs_bg_start(dev);
+
+	if (!context->bg_thread)
+		param->defered_dir_update = 0;
+
+	sb->s_maxbytes = yaffs_max_file_size(dev);
+
+	/* Release lock before yaffs_get_inode() */
+	yaffs_gross_unlock(dev);
+
+	/* Create root inode */
+	if (err == YAFFS_OK)
+		inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0, yaffs_root(dev));
+
+	if (!inode)
+		return NULL;
+
+	inode->i_op = &yaffs_dir_inode_operations;
+	inode->i_fop = &yaffs_dir_operations;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode");
+
+	root = yaffs_make_root(inode);
+
+	if (!root)
+		return NULL;
+
+	sb->s_root = root;
+	if(!dev->is_checkpointed)
+		yaffs_set_super_dirty(dev);
+
+	yaffs_trace(YAFFS_TRACE_ALWAYS,
+		"yaffs_read_super: is_checkpointed %d",
+		dev->is_checkpointed);
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: done");
+	return sb;
+}
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
+					 int silent)
+{
+	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static struct dentry *yaffs_mount(struct file_system_type *fs_type, int flags,
+        const char *dev_name, void *data)
+{
+    return mount_bdev(fs_type, flags, dev_name, data, yaffs_internal_read_super_mtd);
+}
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+static int yaffs_read_super(struct file_system_type *fs,
+			    int flags, const char *dev_name,
+			    void *data, struct vfsmount *mnt)
+{
+
+	return get_sb_bdev(fs, flags, dev_name, data,
+			   yaffs_internal_read_super_mtd, mnt);
+}
+#else
+static struct super_block *yaffs_read_super(struct file_system_type *fs,
+					    int flags, const char *dev_name,
+					    void *data)
+{
+
+	return get_sb_bdev(fs, flags, dev_name, data,
+			   yaffs_internal_read_super_mtd);
+}
+#endif
+
+static struct file_system_type yaffs_fs_type = {
+	.owner = THIS_MODULE,
+	.name = "yaffs",
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+        .mount = yaffs_mount,
+#else
+        .get_sb = yaffs_read_super,
+#endif
+     	.kill_sb = kill_block_super,
+	.fs_flags = FS_REQUIRES_DEV,
+};
+#else
+static struct super_block *yaffs_read_super(struct super_block *sb, void *data,
+					    int silent)
+{
+	return yaffs_internal_read_super(1, sb, data, silent);
+}
+
+static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super,
+		      FS_REQUIRES_DEV);
+#endif
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
+					  int silent)
+{
+	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static struct dentry *yaffs2_mount(struct file_system_type *fs_type, int flags,
+        const char *dev_name, void *data)
+{
+        return mount_bdev(fs_type, flags, dev_name, data, yaffs2_internal_read_super_mtd);
+}
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+static int yaffs2_read_super(struct file_system_type *fs,
+			     int flags, const char *dev_name, void *data,
+			     struct vfsmount *mnt)
+{
+	return get_sb_bdev(fs, flags, dev_name, data,
+			   yaffs2_internal_read_super_mtd, mnt);
+}
+#else
+static struct super_block *yaffs2_read_super(struct file_system_type *fs,
+					     int flags, const char *dev_name,
+					     void *data)
+{
+
+	return get_sb_bdev(fs, flags, dev_name, data,
+			   yaffs2_internal_read_super_mtd);
+}
+#endif
+
+static struct file_system_type yaffs2_fs_type = {
+	.owner = THIS_MODULE,
+	.name = "yaffs2",
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+        .mount = yaffs2_mount,
+#else
+        .get_sb = yaffs2_read_super,
+#endif
+     	.kill_sb = kill_block_super,
+	.fs_flags = FS_REQUIRES_DEV,
+};
+#else
+static struct super_block *yaffs2_read_super(struct super_block *sb,
+					     void *data, int silent)
+{
+	return yaffs_internal_read_super(2, sb, data, silent);
+}
+
+static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super,
+		      FS_REQUIRES_DEV);
+#endif
+
+
+static struct proc_dir_entry *my_proc_entry;
+
+static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
+{
+	struct yaffs_param *param = &dev->param;
+	int bs[10];
+
+	yaffs_count_blocks_by_state(dev,bs);
+
+	buf += sprintf(buf, "start_block.......... %d\n", param->start_block);
+	buf += sprintf(buf, "end_block............ %d\n", param->end_block);
+	buf += sprintf(buf, "total_bytes_per_chunk %d\n",
+				param->total_bytes_per_chunk);
+	buf += sprintf(buf, "use_nand_ecc......... %d\n", param->use_nand_ecc);
+	buf += sprintf(buf, "no_tags_ecc.......... %d\n", param->no_tags_ecc);
+	buf += sprintf(buf, "is_yaffs2............ %d\n", param->is_yaffs2);
+	buf += sprintf(buf, "inband_tags.......... %d\n", param->inband_tags);
+	buf += sprintf(buf, "empty_lost_n_found... %d\n",
+				param->empty_lost_n_found);
+	buf += sprintf(buf, "disable_lazy_load.... %d\n",
+				param->disable_lazy_load);
+	buf += sprintf(buf, "disable_bad_block_mrk %d\n",
+				param->disable_bad_block_marking);
+	buf += sprintf(buf, "refresh_period....... %d\n",
+				param->refresh_period);
+	buf += sprintf(buf, "n_caches............. %d\n", param->n_caches);
+	buf += sprintf(buf, "n_reserved_blocks.... %d\n",
+				param->n_reserved_blocks);
+	buf += sprintf(buf, "always_check_erased.. %d\n",
+				param->always_check_erased);
+	buf += sprintf(buf, "\n");
+	buf += sprintf(buf, "block count by state\n");
+	buf += sprintf(buf, "0:%d 1:%d 2:%d 3:%d 4:%d\n",
+				bs[0], bs[1], bs[2], bs[3], bs[4]);
+	buf += sprintf(buf, "5:%d 6:%d 7:%d 8:%d 9:%d\n",
+				bs[5], bs[6], bs[7], bs[8], bs[9]);
+
+	return buf;
+}
+
+static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev)
+{
+	buf += sprintf(buf, "max file size....... %lld\n",
+				(long long) yaffs_max_file_size(dev));
+	buf += sprintf(buf, "data_bytes_per_chunk. %d\n",
+				dev->data_bytes_per_chunk);
+	buf += sprintf(buf, "chunk_grp_bits....... %d\n", dev->chunk_grp_bits);
+	buf += sprintf(buf, "chunk_grp_size....... %d\n", dev->chunk_grp_size);
+	buf += sprintf(buf, "n_erased_blocks...... %d\n", dev->n_erased_blocks);
+	buf += sprintf(buf, "blocks_in_checkpt.... %d\n",
+				dev->blocks_in_checkpt);
+	buf += sprintf(buf, "\n");
+	buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes);
+	buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj);
+	buf += sprintf(buf, "n_free_chunks........ %d\n", dev->n_free_chunks);
+	buf += sprintf(buf, "\n");
+	buf += sprintf(buf, "n_page_writes........ %u\n", dev->n_page_writes);
+	buf += sprintf(buf, "n_page_reads......... %u\n", dev->n_page_reads);
+	buf += sprintf(buf, "n_erasures........... %u\n", dev->n_erasures);
+	buf += sprintf(buf, "n_gc_copies.......... %u\n", dev->n_gc_copies);
+	buf += sprintf(buf, "all_gcs.............. %u\n", dev->all_gcs);
+	buf += sprintf(buf, "passive_gc_count..... %u\n",
+				dev->passive_gc_count);
+	buf += sprintf(buf, "oldest_dirty_gc_count %u\n",
+				dev->oldest_dirty_gc_count);
+	buf += sprintf(buf, "n_gc_blocks.......... %u\n", dev->n_gc_blocks);
+	buf += sprintf(buf, "bg_gcs............... %u\n", dev->bg_gcs);
+	buf += sprintf(buf, "n_retried_writes..... %u\n",
+				dev->n_retried_writes);
+	buf += sprintf(buf, "n_retired_blocks..... %u\n",
+				dev->n_retired_blocks);
+	buf += sprintf(buf, "n_ecc_fixed.......... %u\n", dev->n_ecc_fixed);
+	buf += sprintf(buf, "n_ecc_unfixed........ %u\n", dev->n_ecc_unfixed);
+	buf += sprintf(buf, "n_tags_ecc_fixed..... %u\n",
+				dev->n_tags_ecc_fixed);
+	buf += sprintf(buf, "n_tags_ecc_unfixed... %u\n",
+				dev->n_tags_ecc_unfixed);
+	buf += sprintf(buf, "cache_hits........... %u\n", dev->cache_hits);
+	buf += sprintf(buf, "n_deleted_files...... %u\n", dev->n_deleted_files);
+	buf += sprintf(buf, "n_unlinked_files..... %u\n",
+				dev->n_unlinked_files);
+	buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count);
+	buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions);
+	buf += sprintf(buf, "tags_used............ %u\n", dev->tags_used);
+	buf += sprintf(buf, "summary_used......... %u\n", dev->summary_used);
+
+	return buf;
+}
+
+static int yaffs_proc_read(char *page,
+			   char **start,
+			   off_t offset, int count, int *eof, void *data)
+{
+	struct list_head *item;
+	char *buf = page;
+	int step = offset;
+	int n = 0;
+
+	/* Get proc_file_read() to step 'offset' by one on each sucessive call.
+	 * We use 'offset' (*ppos) to indicate where we are in dev_list.
+	 * This also assumes the user has posted a read buffer large
+	 * enough to hold the complete output; but that's life in /proc.
+	 */
+
+	*(int *)start = 1;
+
+	/* Print header first */
+	if (step == 0)
+		buf +=
+		    sprintf(buf,
+			    "Multi-version YAFFS built:" __DATE__ " " __TIME__
+			    "\n");
+	else if (step == 1)
+		buf += sprintf(buf, "\n");
+	else {
+		step -= 2;
+
+		mutex_lock(&yaffs_context_lock);
+
+		/* Locate and print the Nth entry.  Order N-squared but N is small. */
+		list_for_each(item, &yaffs_context_list) {
+			struct yaffs_linux_context *dc =
+			    list_entry(item, struct yaffs_linux_context,
+				       context_list);
+			struct yaffs_dev *dev = dc->dev;
+
+			if (n < (step & ~1)) {
+				n += 2;
+				continue;
+			}
+			if ((step & 1) == 0) {
+				buf +=
+				    sprintf(buf, "\nDevice %d \"%s\"\n", n,
+					    dev->param.name);
+				buf = yaffs_dump_dev_part0(buf, dev);
+			} else {
+				buf = yaffs_dump_dev_part1(buf, dev);
+                        }
+
+			break;
+		}
+		mutex_unlock(&yaffs_context_lock);
+	}
+
+	return buf - page < count ? buf - page : count;
+}
+
+/**
+ * Set the verbosity of the warnings and error messages.
+ *
+ * Note that the names can only be a..z or _ with the current code.
+ */
+
+static struct {
+	char *mask_name;
+	unsigned mask_bitfield;
+} mask_flags[] = {
+	{"allocate", YAFFS_TRACE_ALLOCATE},
+	{"always", YAFFS_TRACE_ALWAYS},
+	{"background", YAFFS_TRACE_BACKGROUND},
+	{"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
+	{"buffers", YAFFS_TRACE_BUFFERS},
+	{"bug", YAFFS_TRACE_BUG},
+	{"checkpt", YAFFS_TRACE_CHECKPOINT},
+	{"deletion", YAFFS_TRACE_DELETION},
+	{"erase", YAFFS_TRACE_ERASE},
+	{"error", YAFFS_TRACE_ERROR},
+	{"gc_detail", YAFFS_TRACE_GC_DETAIL},
+	{"gc", YAFFS_TRACE_GC},
+	{"lock", YAFFS_TRACE_LOCK},
+	{"mtd", YAFFS_TRACE_MTD},
+	{"nandaccess", YAFFS_TRACE_NANDACCESS},
+	{"os", YAFFS_TRACE_OS},
+	{"scan_debug", YAFFS_TRACE_SCAN_DEBUG},
+	{"scan", YAFFS_TRACE_SCAN},
+	{"mount", YAFFS_TRACE_MOUNT},
+	{"tracing", YAFFS_TRACE_TRACING},
+	{"sync", YAFFS_TRACE_SYNC},
+	{"write", YAFFS_TRACE_WRITE},
+	{"verify", YAFFS_TRACE_VERIFY},
+	{"verify_nand", YAFFS_TRACE_VERIFY_NAND},
+	{"verify_full", YAFFS_TRACE_VERIFY_FULL},
+	{"verify_all", YAFFS_TRACE_VERIFY_ALL},
+	{"all", 0xffffffff},
+	{"none", 0},
+	{NULL, 0},
+};
+
+#define MAX_MASK_NAME_LENGTH 40
+static int yaffs_proc_write_trace_options(struct file *file, const char *buf,
+					  unsigned long count, void *data)
+{
+	unsigned rg = 0, mask_bitfield;
+	char *end;
+	char *mask_name;
+	const char *x;
+	char substring[MAX_MASK_NAME_LENGTH + 1];
+	int i;
+	int done = 0;
+	int add, len = 0;
+	int pos = 0;
+
+	rg = yaffs_trace_mask;
+
+	while (!done && (pos < count)) {
+		done = 1;
+		while ((pos < count) && isspace(buf[pos]))
+			pos++;
+
+		switch (buf[pos]) {
+		case '+':
+		case '-':
+		case '=':
+			add = buf[pos];
+			pos++;
+			break;
+
+		default:
+			add = ' ';
+			break;
+		}
+		mask_name = NULL;
+
+		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
+
+		if (end > buf + pos) {
+			mask_name = "numeral";
+			len = end - (buf + pos);
+			pos += len;
+			done = 0;
+		} else {
+			for (x = buf + pos, i = 0;
+			     (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
+			     i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
+				substring[i] = *x;
+			substring[i] = '\0';
+
+			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
+				if (strcmp(substring, mask_flags[i].mask_name)
+				    == 0) {
+					mask_name = mask_flags[i].mask_name;
+					mask_bitfield =
+					    mask_flags[i].mask_bitfield;
+					done = 0;
+					break;
+				}
+			}
+		}
+
+		if (mask_name != NULL) {
+			done = 0;
+			switch (add) {
+			case '-':
+				rg &= ~mask_bitfield;
+				break;
+			case '+':
+				rg |= mask_bitfield;
+				break;
+			case '=':
+				rg = mask_bitfield;
+				break;
+			default:
+				rg |= mask_bitfield;
+				break;
+			}
+		}
+	}
+
+	yaffs_trace_mask = rg | YAFFS_TRACE_ALWAYS;
+
+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_trace_mask);
+
+	if (rg & YAFFS_TRACE_ALWAYS) {
+		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
+			char flag;
+			flag = ((rg & mask_flags[i].mask_bitfield) ==
+				mask_flags[i].mask_bitfield) ? '+' : '-';
+			printk(KERN_DEBUG "%c%s\n", flag,
+			       mask_flags[i].mask_name);
+		}
+	}
+
+	return count;
+}
+
+/* Debug strings are of the form:
+ * .bnnn         print info on block n
+ * .cobjn,chunkn print nand chunk id for objn:chunkn
+ */
+
+static int yaffs_proc_debug_write(struct file *file, const char *buf,
+					  unsigned long count, void *data)
+{
+
+	char str[100];
+	char *p0;
+	char *p1;
+	long p1_val;
+	long p0_val;
+	char cmd;
+	struct list_head *item;
+
+	memset(str, 0, sizeof(str));
+	memcpy(str, buf, min(count, sizeof(str) -1));
+
+	cmd = str[1];
+
+	p0 = str + 2;
+
+	p1 = p0;
+
+	while (*p1 && *p1 != ',') {
+		p1++;
+	}
+	*p1 = '\0';
+	p1++;
+
+	p0_val = simple_strtol(p0, NULL, 0);
+	p1_val = simple_strtol(p1, NULL, 0);
+
+
+	mutex_lock(&yaffs_context_lock);
+
+	/* Locate and print the Nth entry.  Order N-squared but N is small. */
+	list_for_each(item, &yaffs_context_list) {
+		struct yaffs_linux_context *dc =
+		    list_entry(item, struct yaffs_linux_context,
+			       context_list);
+		struct yaffs_dev *dev = dc->dev;
+
+		if (cmd == 'b') {
+			struct yaffs_block_info *bi;
+
+			bi = yaffs_get_block_info(dev,p0_val);
+
+			if(bi) {
+				printk("Block %d: state %d, retire %d, use %d, seq %d\n",
+					(int)p0_val, bi->block_state,
+					bi->needs_retiring, bi->pages_in_use,
+					bi->seq_number);
+			}
+		} else if (cmd == 'c') {
+			struct yaffs_obj *obj;
+			int nand_chunk;
+
+			obj = yaffs_find_by_number(dev, p0_val);
+			if (!obj)
+				printk("No obj %d\n", (int)p0_val);
+			else {
+				if(p1_val == 0)
+					nand_chunk = obj->hdr_chunk;
+				else
+					nand_chunk =
+						yaffs_find_chunk_in_file(obj,
+							p1_val, NULL);
+				printk("Nand chunk for %d:%d is %d\n",
+					(int)p0_val, (int)p1_val, nand_chunk);
+			}
+		}
+	}
+
+	mutex_unlock(&yaffs_context_lock);
+
+	return count;
+}
+
+static int yaffs_proc_write(struct file *file, const char *buf,
+			    unsigned long count, void *data)
+{
+	if (buf[0] == '.')
+		return yaffs_proc_debug_write(file, buf, count, data);
+	return yaffs_proc_write_trace_options(file, buf, count, data);
+}
+
+/* Stuff to handle installation of file systems */
+struct file_system_to_install {
+	struct file_system_type *fst;
+	int installed;
+};
+
+static struct file_system_to_install fs_to_install[] = {
+	{&yaffs_fs_type, 0},
+	{&yaffs2_fs_type, 0},
+	{NULL, 0}
+};
+
+static int __init init_yaffs_fs(void)
+{
+	int error = 0;
+	struct file_system_to_install *fsinst;
+
+	yaffs_trace(YAFFS_TRACE_ALWAYS,
+		"yaffs built " __DATE__ " " __TIME__ " Installing.");
+
+	mutex_init(&yaffs_context_lock);
+
+	/* Install the proc_fs entries */
+	my_proc_entry = create_proc_entry("yaffs",
+					  S_IRUGO | S_IFREG, YPROC_ROOT);
+
+	if (my_proc_entry) {
+		my_proc_entry->write_proc = yaffs_proc_write;
+		my_proc_entry->read_proc = yaffs_proc_read;
+		my_proc_entry->data = NULL;
+	} else {
+		return -ENOMEM;
+        }
+
+	/* Now add the file system entries */
+
+	fsinst = fs_to_install;
+
+	while (fsinst->fst && !error) {
+		error = register_filesystem(fsinst->fst);
+		if (!error)
+			fsinst->installed = 1;
+		fsinst++;
+	}
+
+	/* Any errors? uninstall  */
+	if (error) {
+		fsinst = fs_to_install;
+
+		while (fsinst->fst) {
+			if (fsinst->installed) {
+				unregister_filesystem(fsinst->fst);
+				fsinst->installed = 0;
+			}
+			fsinst++;
+		}
+	}
+
+	return error;
+}
+
+static void __exit exit_yaffs_fs(void)
+{
+
+	struct file_system_to_install *fsinst;
+
+	yaffs_trace(YAFFS_TRACE_ALWAYS,
+		"yaffs built " __DATE__ " " __TIME__ " removing.");
+
+	remove_proc_entry("yaffs", YPROC_ROOT);
+
+	fsinst = fs_to_install;
+
+	while (fsinst->fst) {
+		if (fsinst->installed) {
+			unregister_filesystem(fsinst->fst);
+			fsinst->installed = 0;
+		}
+		fsinst++;
+	}
+}
+
+module_init(init_yaffs_fs)
+    module_exit(exit_yaffs_fs)
+
+    MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2011");
+MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.c
new file mode 100644
index 00000000..d277e20e
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.c
@@ -0,0 +1,422 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_yaffs1.h"
+#include "yportenv.h"
+#include "yaffs_trace.h"
+#include "yaffs_bitmap.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_nand.h"
+#include "yaffs_attribs.h"
+
+int yaffs1_scan(struct yaffs_dev *dev)
+{
+	struct yaffs_ext_tags tags;
+	int blk;
+	int result;
+	int chunk;
+	int c;
+	int deleted;
+	enum yaffs_block_state state;
+	LIST_HEAD(hard_list);
+	struct yaffs_block_info *bi;
+	u32 seq_number;
+	struct yaffs_obj_hdr *oh;
+	struct yaffs_obj *in;
+	struct yaffs_obj *parent;
+	int alloc_failed = 0;
+	struct yaffs_shadow_fixer *shadow_fixers = NULL;
+	u8 *chunk_data;
+
+	yaffs_trace(YAFFS_TRACE_SCAN,
+		"yaffs1_scan starts  intstartblk %d intendblk %d...",
+		dev->internal_start_block, dev->internal_end_block);
+
+	chunk_data = yaffs_get_temp_buffer(dev);
+
+	dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
+
+	/* Scan all the blocks to determine their state */
+	bi = dev->block_info;
+	for (blk = dev->internal_start_block; blk <= dev->internal_end_block;
+	     blk++) {
+		yaffs_clear_chunk_bits(dev, blk);
+		bi->pages_in_use = 0;
+		bi->soft_del_pages = 0;
+
+		yaffs_query_init_block_state(dev, blk, &state, &seq_number);
+
+		bi->block_state = state;
+		bi->seq_number = seq_number;
+
+		if (bi->seq_number == YAFFS_SEQUENCE_BAD_BLOCK)
+			bi->block_state = state = YAFFS_BLOCK_STATE_DEAD;
+
+		yaffs_trace(YAFFS_TRACE_SCAN_DEBUG,
+			"Block scanning block %d state %d seq %d",
+			blk, state, seq_number);
+
+		if (state == YAFFS_BLOCK_STATE_DEAD) {
+			yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
+				"block %d is bad", blk);
+		} else if (state == YAFFS_BLOCK_STATE_EMPTY) {
+			yaffs_trace(YAFFS_TRACE_SCAN_DEBUG, "Block empty ");
+			dev->n_erased_blocks++;
+			dev->n_free_chunks += dev->param.chunks_per_block;
+		}
+		bi++;
+	}
+
+	/* For each block.... */
+	for (blk = dev->internal_start_block;
+	     !alloc_failed && blk <= dev->internal_end_block; blk++) {
+
+		cond_resched();
+
+		bi = yaffs_get_block_info(dev, blk);
+		state = bi->block_state;
+
+		deleted = 0;
+
+		/* For each chunk in each block that needs scanning.... */
+		for (c = 0;
+			!alloc_failed && c < dev->param.chunks_per_block &&
+			state == YAFFS_BLOCK_STATE_NEEDS_SCAN; c++) {
+			/* Read the tags and decide what to do */
+			chunk = blk * dev->param.chunks_per_block + c;
+
+			result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
+							  &tags);
+
+			/* Let's have a good look at this chunk... */
+
+			if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED ||
+			    tags.is_deleted) {
+				/* YAFFS1 only...
+				 * A deleted chunk
+				 */
+				deleted++;
+				dev->n_free_chunks++;
+			} else if (!tags.chunk_used) {
+				/* An unassigned chunk in the block
+				 * This means that either the block is empty or
+				 * this is the one being allocated from
+				 */
+
+				if (c == 0) {
+					/* We're looking at the first chunk in
+					 *the block so the block is unused */
+					state = YAFFS_BLOCK_STATE_EMPTY;
+					dev->n_erased_blocks++;
+				} else {
+					/* this is the block being allocated */
+					yaffs_trace(YAFFS_TRACE_SCAN,
+						" Allocating from %d %d",
+						blk, c);
+					state = YAFFS_BLOCK_STATE_ALLOCATING;
+					dev->alloc_block = blk;
+					dev->alloc_page = c;
+					dev->alloc_block_finder = blk;
+
+				}
+
+				dev->n_free_chunks +=
+				    (dev->param.chunks_per_block - c);
+			} else if (tags.chunk_id > 0) {
+				/* chunk_id > 0 so it is a data chunk... */
+				unsigned int endpos;
+
+				yaffs_set_chunk_bit(dev, blk, c);
+				bi->pages_in_use++;
+
+				in = yaffs_find_or_create_by_number(dev,
+							tags.obj_id,
+							YAFFS_OBJECT_TYPE_FILE);
+				/* PutChunkIntoFile checks for a clash
+				 * (two data chunks with the same chunk_id).
+				 */
+
+				if (!in)
+					alloc_failed = 1;
+
+				if (in) {
+					if (!yaffs_put_chunk_in_file
+					    (in, tags.chunk_id, chunk, 1))
+						alloc_failed = 1;
+				}
+
+				endpos =
+				    (tags.chunk_id - 1) *
+				    dev->data_bytes_per_chunk +
+				    tags.n_bytes;
+				if (in &&
+				    in->variant_type ==
+				     YAFFS_OBJECT_TYPE_FILE &&
+				    in->variant.file_variant.scanned_size <
+				      endpos) {
+					in->variant.file_variant.scanned_size =
+					    endpos;
+					if (!dev->param.use_header_file_size) {
+						in->variant.
+						    file_variant.file_size =
+						    in->variant.
+						    file_variant.scanned_size;
+					}
+
+				}
+			} else {
+				/* chunk_id == 0, so it is an ObjectHeader.
+				 * Make the object
+				 */
+				yaffs_set_chunk_bit(dev, blk, c);
+				bi->pages_in_use++;
+
+				result = yaffs_rd_chunk_tags_nand(dev, chunk,
+								  chunk_data,
+								  NULL);
+
+				oh = (struct yaffs_obj_hdr *)chunk_data;
+
+				in = yaffs_find_by_number(dev, tags.obj_id);
+				if (in && in->variant_type != oh->type) {
+					/* This should not happen, but somehow
+					 * Wev'e ended up with an obj_id that
+					 * has been reused but not yet deleted,
+					 * and worse still it has changed type.
+					 * Delete the old object.
+					 */
+
+					yaffs_del_obj(in);
+					in = NULL;
+				}
+
+				in = yaffs_find_or_create_by_number(dev,
+								tags.obj_id,
+								oh->type);
+
+				if (!in)
+					alloc_failed = 1;
+
+				if (in && oh->shadows_obj > 0) {
+
+					struct yaffs_shadow_fixer *fixer;
+					fixer =
+						kmalloc(sizeof
+						(struct yaffs_shadow_fixer),
+						GFP_NOFS);
+					if (fixer) {
+						fixer->next = shadow_fixers;
+						shadow_fixers = fixer;
+						fixer->obj_id = tags.obj_id;
+						fixer->shadowed_id =
+						    oh->shadows_obj;
+						yaffs_trace(YAFFS_TRACE_SCAN,
+							" Shadow fixer: %d shadows %d",
+							fixer->obj_id,
+							fixer->shadowed_id);
+
+					}
+
+				}
+
+				if (in && in->valid) {
+					/* We have already filled this one.
+					 * We have a duplicate and need to
+					 * resolve it. */
+
+					unsigned existing_serial = in->serial;
+					unsigned new_serial =
+					    tags.serial_number;
+
+					if (((existing_serial + 1) & 3) ==
+					    new_serial) {
+						/* Use new one - destroy the
+						 * exisiting one */
+						yaffs_chunk_del(dev,
+								in->hdr_chunk,
+								1, __LINE__);
+						in->valid = 0;
+					} else {
+						/* Use existing - destroy
+						 * this one. */
+						yaffs_chunk_del(dev, chunk, 1,
+								__LINE__);
+					}
+				}
+
+				if (in && !in->valid &&
+				    (tags.obj_id == YAFFS_OBJECTID_ROOT ||
+				     tags.obj_id ==
+				     YAFFS_OBJECTID_LOSTNFOUND)) {
+					/* We only load some info, don't fiddle
+					 * with directory structure */
+					in->valid = 1;
+					in->variant_type = oh->type;
+
+					in->yst_mode = oh->yst_mode;
+					yaffs_load_attribs(in, oh);
+					in->hdr_chunk = chunk;
+					in->serial = tags.serial_number;
+
+				} else if (in && !in->valid) {
+					/* we need to load this info */
+
+					in->valid = 1;
+					in->variant_type = oh->type;
+
+					in->yst_mode = oh->yst_mode;
+					yaffs_load_attribs(in, oh);
+					in->hdr_chunk = chunk;
+					in->serial = tags.serial_number;
+
+					yaffs_set_obj_name_from_oh(in, oh);
+					in->dirty = 0;
+
+					/* directory stuff...
+					 * hook up to parent
+					 */
+
+					parent =
+					    yaffs_find_or_create_by_number
+					    (dev, oh->parent_obj_id,
+					     YAFFS_OBJECT_TYPE_DIRECTORY);
+					if (!parent)
+						alloc_failed = 1;
+					if (parent && parent->variant_type ==
+					    YAFFS_OBJECT_TYPE_UNKNOWN) {
+						/* Set up as a directory */
+						parent->variant_type =
+						    YAFFS_OBJECT_TYPE_DIRECTORY;
+						INIT_LIST_HEAD(&parent->
+							variant.dir_variant.
+							children);
+					} else if (!parent ||
+						parent->variant_type !=
+						YAFFS_OBJECT_TYPE_DIRECTORY) {
+						/* Hoosterman, a problem....
+						 * We're trying to use a
+						 * non-directory as a directory
+						 */
+
+						yaffs_trace(YAFFS_TRACE_ERROR,
+							"yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
+							);
+						parent = dev->lost_n_found;
+					}
+
+					yaffs_add_obj_to_dir(parent, in);
+
+					switch (in->variant_type) {
+					case YAFFS_OBJECT_TYPE_UNKNOWN:
+						/* Todo got a problem */
+						break;
+					case YAFFS_OBJECT_TYPE_FILE:
+						if (dev->param.
+						    use_header_file_size)
+							in->variant.
+							file_variant.file_size
+							= yaffs_oh_to_size(oh);
+						break;
+					case YAFFS_OBJECT_TYPE_HARDLINK:
+						in->variant.
+						    hardlink_variant.equiv_id =
+						    oh->equiv_id;
+						list_add(&in->hard_links,
+								&hard_list);
+						break;
+					case YAFFS_OBJECT_TYPE_DIRECTORY:
+						/* Do nothing */
+						break;
+					case YAFFS_OBJECT_TYPE_SPECIAL:
+						/* Do nothing */
+						break;
+					case YAFFS_OBJECT_TYPE_SYMLINK:
+						in->variant.symlink_variant.
+						    alias =
+						    yaffs_clone_str(oh->alias);
+						if (!in->variant.
+						    symlink_variant.alias)
+							alloc_failed = 1;
+						break;
+					}
+				}
+			}
+		}
+
+		if (state == YAFFS_BLOCK_STATE_NEEDS_SCAN) {
+			/* If we got this far while scanning,
+			 * then the block is fully allocated. */
+			state = YAFFS_BLOCK_STATE_FULL;
+		}
+
+		if (state == YAFFS_BLOCK_STATE_ALLOCATING) {
+			/* If the block was partially allocated then
+			 * treat it as fully allocated. */
+			state = YAFFS_BLOCK_STATE_FULL;
+			dev->alloc_block = -1;
+		}
+
+		bi->block_state = state;
+
+		/* Now let's see if it was dirty */
+		if (bi->pages_in_use == 0 &&
+		    !bi->has_shrink_hdr &&
+		    bi->block_state == YAFFS_BLOCK_STATE_FULL)
+			yaffs_block_became_dirty(dev, blk);
+	}
+
+	/* Ok, we've done all the scanning.
+	 * Fix up the hard link chains.
+	 * We should now have scanned all the objects, now it's time to add
+	 * these hardlinks.
+	 */
+
+	yaffs_link_fixup(dev, &hard_list);
+
+	/*
+	 * Fix up any shadowed objects.
+	 * There should not be more than one of these.
+	 */
+	{
+		struct yaffs_shadow_fixer *fixer;
+		struct yaffs_obj *obj;
+
+		while (shadow_fixers) {
+			fixer = shadow_fixers;
+			shadow_fixers = fixer->next;
+			/* Complete the rename transaction by deleting the
+			 * shadowed object then setting the object header
+			 to unshadowed.
+			 */
+			obj = yaffs_find_by_number(dev, fixer->shadowed_id);
+			if (obj)
+				yaffs_del_obj(obj);
+
+			obj = yaffs_find_by_number(dev, fixer->obj_id);
+
+			if (obj)
+				yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
+
+			kfree(fixer);
+		}
+	}
+
+	yaffs_release_temp_buffer(dev, chunk_data);
+
+	if (alloc_failed)
+		return YAFFS_FAIL;
+
+	yaffs_trace(YAFFS_TRACE_SCAN, "yaffs1_scan ends");
+
+	return YAFFS_OK;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.h
new file mode 100644
index 00000000..97e2fdd0
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.h
@@ -0,0 +1,22 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_YAFFS1_H__
+#define __YAFFS_YAFFS1_H__
+
+#include "yaffs_guts.h"
+int yaffs1_scan(struct yaffs_dev *dev);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c
new file mode 100644
index 00000000..f1dc9722
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c
@@ -0,0 +1,1532 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_guts.h"
+#include "yaffs_trace.h"
+#include "yaffs_yaffs2.h"
+#include "yaffs_checkptrw.h"
+#include "yaffs_bitmap.h"
+#include "yaffs_nand.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_verify.h"
+#include "yaffs_attribs.h"
+#include "yaffs_summary.h"
+
+/*
+ * Checkpoints are really no benefit on very small partitions.
+ *
+ * To save space on small partitions don't bother with checkpoints unless
+ * the partition is at least this big.
+ */
+#define YAFFS_CHECKPOINT_MIN_BLOCKS 60
+#define YAFFS_SMALL_HOLE_THRESHOLD 4
+
+/*
+ * Oldest Dirty Sequence Number handling.
+ */
+
+/* yaffs_calc_oldest_dirty_seq()
+ * yaffs2_find_oldest_dirty_seq()
+ * Calculate the oldest dirty sequence number if we don't know it.
+ */
+void yaffs_calc_oldest_dirty_seq(struct yaffs_dev *dev)
+{
+	int i;
+	unsigned seq;
+	unsigned block_no = 0;
+	struct yaffs_block_info *b;
+
+	if (!dev->param.is_yaffs2)
+		return;
+
+	/* Find the oldest dirty sequence number. */
+	seq = dev->seq_number + 1;
+	b = dev->block_info;
+	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		if (b->block_state == YAFFS_BLOCK_STATE_FULL &&
+		    (b->pages_in_use - b->soft_del_pages) <
+		    dev->param.chunks_per_block &&
+		    b->seq_number < seq) {
+			seq = b->seq_number;
+			block_no = i;
+		}
+		b++;
+	}
+
+	if (block_no) {
+		dev->oldest_dirty_seq = seq;
+		dev->oldest_dirty_block = block_no;
+	}
+}
+
+void yaffs2_find_oldest_dirty_seq(struct yaffs_dev *dev)
+{
+	if (!dev->param.is_yaffs2)
+		return;
+
+	if (!dev->oldest_dirty_seq)
+		yaffs_calc_oldest_dirty_seq(dev);
+}
+
+/*
+ * yaffs_clear_oldest_dirty_seq()
+ * Called when a block is erased or marked bad. (ie. when its seq_number
+ * becomes invalid). If the value matches the oldest then we clear
+ * dev->oldest_dirty_seq to force its recomputation.
+ */
+void yaffs2_clear_oldest_dirty_seq(struct yaffs_dev *dev,
+				   struct yaffs_block_info *bi)
+{
+
+	if (!dev->param.is_yaffs2)
+		return;
+
+	if (!bi || bi->seq_number == dev->oldest_dirty_seq) {
+		dev->oldest_dirty_seq = 0;
+		dev->oldest_dirty_block = 0;
+	}
+}
+
+/*
+ * yaffs2_update_oldest_dirty_seq()
+ * Update the oldest dirty sequence number whenever we dirty a block.
+ * Only do this if the oldest_dirty_seq is actually being tracked.
+ */
+void yaffs2_update_oldest_dirty_seq(struct yaffs_dev *dev, unsigned block_no,
+				    struct yaffs_block_info *bi)
+{
+	if (!dev->param.is_yaffs2)
+		return;
+
+	if (dev->oldest_dirty_seq) {
+		if (dev->oldest_dirty_seq > bi->seq_number) {
+			dev->oldest_dirty_seq = bi->seq_number;
+			dev->oldest_dirty_block = block_no;
+		}
+	}
+}
+
+int yaffs_block_ok_for_gc(struct yaffs_dev *dev, struct yaffs_block_info *bi)
+{
+
+	if (!dev->param.is_yaffs2)
+		return 1;	/* disqualification only applies to yaffs2. */
+
+	if (!bi->has_shrink_hdr)
+		return 1;	/* can gc */
+
+	yaffs2_find_oldest_dirty_seq(dev);
+
+	/* Can't do gc of this block if there are any blocks older than this
+	 * one that have discarded pages.
+	 */
+	return (bi->seq_number <= dev->oldest_dirty_seq);
+}
+
+/*
+ * yaffs2_find_refresh_block()
+ * periodically finds the oldest full block by sequence number for refreshing.
+ * Only for yaffs2.
+ */
+u32 yaffs2_find_refresh_block(struct yaffs_dev *dev)
+{
+	u32 b;
+	u32 oldest = 0;
+	u32 oldest_seq = 0;
+	struct yaffs_block_info *bi;
+
+	if (!dev->param.is_yaffs2)
+		return oldest;
+
+	/*
+	 * If refresh period < 10 then refreshing is disabled.
+	 */
+	if (dev->param.refresh_period < 10)
+		return oldest;
+
+	/*
+	 * Fix broken values.
+	 */
+	if (dev->refresh_skip > dev->param.refresh_period)
+		dev->refresh_skip = dev->param.refresh_period;
+
+	if (dev->refresh_skip > 0)
+		return oldest;
+
+	/*
+	 * Refresh skip is now zero.
+	 * We'll do a refresh this time around....
+	 * Update the refresh skip and find the oldest block.
+	 */
+	dev->refresh_skip = dev->param.refresh_period;
+	dev->refresh_count++;
+	bi = dev->block_info;
+	for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) {
+
+		if (bi->block_state == YAFFS_BLOCK_STATE_FULL) {
+
+			if (oldest < 1 || bi->seq_number < oldest_seq) {
+				oldest = b;
+				oldest_seq = bi->seq_number;
+			}
+		}
+		bi++;
+	}
+
+	if (oldest > 0) {
+		yaffs_trace(YAFFS_TRACE_GC,
+			"GC refresh count %d selected block %d with seq_number %d",
+			dev->refresh_count, oldest, oldest_seq);
+	}
+
+	return oldest;
+}
+
+int yaffs2_checkpt_required(struct yaffs_dev *dev)
+{
+	int nblocks;
+
+	if (!dev->param.is_yaffs2)
+		return 0;
+
+	nblocks = dev->internal_end_block - dev->internal_start_block + 1;
+
+	return !dev->param.skip_checkpt_wr &&
+	    !dev->read_only && (nblocks >= YAFFS_CHECKPOINT_MIN_BLOCKS);
+}
+
+int yaffs_calc_checkpt_blocks_required(struct yaffs_dev *dev)
+{
+	int retval;
+	int n_bytes = 0;
+	int n_blocks;
+	int dev_blocks;
+
+	if (!dev->param.is_yaffs2)
+		return 0;
+
+	if (!dev->checkpoint_blocks_required && yaffs2_checkpt_required(dev)) {
+		/* Not a valid value so recalculate */
+		dev_blocks = dev->param.end_block - dev->param.start_block + 1;
+		n_bytes += sizeof(struct yaffs_checkpt_validity);
+		n_bytes += sizeof(struct yaffs_checkpt_dev);
+		n_bytes += dev_blocks * sizeof(struct yaffs_block_info);
+		n_bytes += dev_blocks * dev->chunk_bit_stride;
+		n_bytes +=
+		    (sizeof(struct yaffs_checkpt_obj) + sizeof(u32)) *
+		    dev->n_obj;
+		n_bytes += (dev->tnode_size + sizeof(u32)) * dev->n_tnodes;
+		n_bytes += sizeof(struct yaffs_checkpt_validity);
+		n_bytes += sizeof(u32);	/* checksum */
+
+		/* Round up and add 2 blocks to allow for some bad blocks,
+		 * so add 3 */
+
+		n_blocks =
+		    (n_bytes /
+		     (dev->data_bytes_per_chunk *
+		      dev->param.chunks_per_block)) + 3;
+
+		dev->checkpoint_blocks_required = n_blocks;
+	}
+
+	retval = dev->checkpoint_blocks_required - dev->blocks_in_checkpt;
+	if (retval < 0)
+		retval = 0;
+	return retval;
+}
+
+/*--------------------- Checkpointing --------------------*/
+
+static int yaffs2_wr_checkpt_validity_marker(struct yaffs_dev *dev, int head)
+{
+	struct yaffs_checkpt_validity cp;
+
+	memset(&cp, 0, sizeof(cp));
+
+	cp.struct_type = sizeof(cp);
+	cp.magic = YAFFS_MAGIC;
+	cp.version = YAFFS_CHECKPOINT_VERSION;
+	cp.head = (head) ? 1 : 0;
+
+	return (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)) ? 1 : 0;
+}
+
+static int yaffs2_rd_checkpt_validity_marker(struct yaffs_dev *dev, int head)
+{
+	struct yaffs_checkpt_validity cp;
+	int ok;
+
+	ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
+
+	if (ok)
+		ok = (cp.struct_type == sizeof(cp)) &&
+		    (cp.magic == YAFFS_MAGIC) &&
+		    (cp.version == YAFFS_CHECKPOINT_VERSION) &&
+		    (cp.head == ((head) ? 1 : 0));
+	return ok ? 1 : 0;
+}
+
+static void yaffs2_dev_to_checkpt_dev(struct yaffs_checkpt_dev *cp,
+				      struct yaffs_dev *dev)
+{
+	cp->n_erased_blocks = dev->n_erased_blocks;
+	cp->alloc_block = dev->alloc_block;
+	cp->alloc_page = dev->alloc_page;
+	cp->n_free_chunks = dev->n_free_chunks;
+
+	cp->n_deleted_files = dev->n_deleted_files;
+	cp->n_unlinked_files = dev->n_unlinked_files;
+	cp->n_bg_deletions = dev->n_bg_deletions;
+	cp->seq_number = dev->seq_number;
+
+}
+
+static void yaffs_checkpt_dev_to_dev(struct yaffs_dev *dev,
+				     struct yaffs_checkpt_dev *cp)
+{
+	dev->n_erased_blocks = cp->n_erased_blocks;
+	dev->alloc_block = cp->alloc_block;
+	dev->alloc_page = cp->alloc_page;
+	dev->n_free_chunks = cp->n_free_chunks;
+
+	dev->n_deleted_files = cp->n_deleted_files;
+	dev->n_unlinked_files = cp->n_unlinked_files;
+	dev->n_bg_deletions = cp->n_bg_deletions;
+	dev->seq_number = cp->seq_number;
+}
+
+static int yaffs2_wr_checkpt_dev(struct yaffs_dev *dev)
+{
+	struct yaffs_checkpt_dev cp;
+	u32 n_bytes;
+	u32 n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
+	int ok;
+
+	/* Write device runtime values */
+	yaffs2_dev_to_checkpt_dev(&cp, dev);
+	cp.struct_type = sizeof(cp);
+
+	ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp));
+	if (!ok)
+		return 0;
+
+	/* Write block info */
+	n_bytes = n_blocks * sizeof(struct yaffs_block_info);
+	ok = (yaffs2_checkpt_wr(dev, dev->block_info, n_bytes) == n_bytes);
+	if (!ok)
+		return 0;
+
+	/* Write chunk bits */
+	n_bytes = n_blocks * dev->chunk_bit_stride;
+	ok = (yaffs2_checkpt_wr(dev, dev->chunk_bits, n_bytes) == n_bytes);
+
+	return ok ? 1 : 0;
+}
+
+static int yaffs2_rd_checkpt_dev(struct yaffs_dev *dev)
+{
+	struct yaffs_checkpt_dev cp;
+	u32 n_bytes;
+	u32 n_blocks =
+	    (dev->internal_end_block - dev->internal_start_block + 1);
+	int ok;
+
+	ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
+	if (!ok)
+		return 0;
+
+	if (cp.struct_type != sizeof(cp))
+		return 0;
+
+	yaffs_checkpt_dev_to_dev(dev, &cp);
+
+	n_bytes = n_blocks * sizeof(struct yaffs_block_info);
+
+	ok = (yaffs2_checkpt_rd(dev, dev->block_info, n_bytes) == n_bytes);
+
+	if (!ok)
+		return 0;
+
+	n_bytes = n_blocks * dev->chunk_bit_stride;
+
+	ok = (yaffs2_checkpt_rd(dev, dev->chunk_bits, n_bytes) == n_bytes);
+
+	return ok ? 1 : 0;
+}
+
+static void yaffs2_obj_checkpt_obj(struct yaffs_checkpt_obj *cp,
+				   struct yaffs_obj *obj)
+{
+	cp->obj_id = obj->obj_id;
+	cp->parent_id = (obj->parent) ? obj->parent->obj_id : 0;
+	cp->hdr_chunk = obj->hdr_chunk;
+	cp->variant_type = obj->variant_type;
+	cp->deleted = obj->deleted;
+	cp->soft_del = obj->soft_del;
+	cp->unlinked = obj->unlinked;
+	cp->fake = obj->fake;
+	cp->rename_allowed = obj->rename_allowed;
+	cp->unlink_allowed = obj->unlink_allowed;
+	cp->serial = obj->serial;
+	cp->n_data_chunks = obj->n_data_chunks;
+
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
+		cp->size_or_equiv_obj = obj->variant.file_variant.file_size;
+	else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK)
+		cp->size_or_equiv_obj = obj->variant.hardlink_variant.equiv_id;
+}
+
+static int yaffs2_checkpt_obj_to_obj(struct yaffs_obj *obj,
+				     struct yaffs_checkpt_obj *cp)
+{
+	struct yaffs_obj *parent;
+
+	if (obj->variant_type != cp->variant_type) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"Checkpoint read object %d type %d chunk %d does not match existing object type %d",
+			cp->obj_id, cp->variant_type, cp->hdr_chunk,
+			obj->variant_type);
+		return 0;
+	}
+
+	obj->obj_id = cp->obj_id;
+
+	if (cp->parent_id)
+		parent = yaffs_find_or_create_by_number(obj->my_dev,
+						cp->parent_id,
+						YAFFS_OBJECT_TYPE_DIRECTORY);
+	else
+		parent = NULL;
+
+	if (parent) {
+		if (parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"Checkpoint read object %d parent %d type %d chunk %d Parent type, %d, not directory",
+				cp->obj_id, cp->parent_id,
+				cp->variant_type, cp->hdr_chunk,
+				parent->variant_type);
+			return 0;
+		}
+		yaffs_add_obj_to_dir(parent, obj);
+	}
+
+	obj->hdr_chunk = cp->hdr_chunk;
+	obj->variant_type = cp->variant_type;
+	obj->deleted = cp->deleted;
+	obj->soft_del = cp->soft_del;
+	obj->unlinked = cp->unlinked;
+	obj->fake = cp->fake;
+	obj->rename_allowed = cp->rename_allowed;
+	obj->unlink_allowed = cp->unlink_allowed;
+	obj->serial = cp->serial;
+	obj->n_data_chunks = cp->n_data_chunks;
+
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
+		obj->variant.file_variant.file_size = cp->size_or_equiv_obj;
+	else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK)
+		obj->variant.hardlink_variant.equiv_id = cp->size_or_equiv_obj;
+
+	if (obj->hdr_chunk > 0)
+		obj->lazy_loaded = 1;
+	return 1;
+}
+
+static int yaffs2_checkpt_tnode_worker(struct yaffs_obj *in,
+				       struct yaffs_tnode *tn, u32 level,
+				       int chunk_offset)
+{
+	int i;
+	struct yaffs_dev *dev = in->my_dev;
+	int ok = 1;
+	u32 base_offset;
+
+	if (!tn)
+		return 1;
+
+	if (level > 0) {
+		for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
+			if (!tn->internal[i])
+				continue;
+			ok = yaffs2_checkpt_tnode_worker(in,
+				 tn->internal[i],
+				 level - 1,
+				 (chunk_offset <<
+				  YAFFS_TNODES_INTERNAL_BITS) + i);
+		}
+		return ok;
+	}
+
+	/* Level 0 tnode */
+	base_offset = chunk_offset << YAFFS_TNODES_LEVEL0_BITS;
+	ok = (yaffs2_checkpt_wr(dev, &base_offset, sizeof(base_offset)) ==
+			sizeof(base_offset));
+	if (ok)
+		ok = (yaffs2_checkpt_wr(dev, tn, dev->tnode_size) ==
+			dev->tnode_size);
+
+	return ok;
+}
+
+static int yaffs2_wr_checkpt_tnodes(struct yaffs_obj *obj)
+{
+	u32 end_marker = ~0;
+	int ok = 1;
+
+	if (obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
+		return ok;
+
+	ok = yaffs2_checkpt_tnode_worker(obj,
+					 obj->variant.file_variant.top,
+					 obj->variant.file_variant.
+					 top_level, 0);
+	if (ok)
+		ok = (yaffs2_checkpt_wr(obj->my_dev, &end_marker,
+				sizeof(end_marker)) == sizeof(end_marker));
+
+	return ok ? 1 : 0;
+}
+
+static int yaffs2_rd_checkpt_tnodes(struct yaffs_obj *obj)
+{
+	u32 base_chunk;
+	int ok = 1;
+	struct yaffs_dev *dev = obj->my_dev;
+	struct yaffs_file_var *file_stuct_ptr = &obj->variant.file_variant;
+	struct yaffs_tnode *tn;
+	int nread = 0;
+
+	ok = (yaffs2_checkpt_rd(dev, &base_chunk, sizeof(base_chunk)) ==
+	      sizeof(base_chunk));
+
+	while (ok && (~base_chunk)) {
+		nread++;
+		/* Read level 0 tnode */
+
+		tn = yaffs_get_tnode(dev);
+		if (tn)
+			ok = (yaffs2_checkpt_rd(dev, tn, dev->tnode_size) ==
+				dev->tnode_size);
+		else
+			ok = 0;
+
+		if (tn && ok)
+			ok = yaffs_add_find_tnode_0(dev,
+						    file_stuct_ptr,
+						    base_chunk, tn) ? 1 : 0;
+
+		if (ok)
+			ok = (yaffs2_checkpt_rd
+			      (dev, &base_chunk,
+			       sizeof(base_chunk)) == sizeof(base_chunk));
+	}
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"Checkpoint read tnodes %d records, last %d. ok %d",
+		nread, base_chunk, ok);
+
+	return ok ? 1 : 0;
+}
+
+static int yaffs2_wr_checkpt_objs(struct yaffs_dev *dev)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_checkpt_obj cp;
+	int i;
+	int ok = 1;
+	struct list_head *lh;
+
+	/* Iterate through the objects in each hash entry,
+	 * dumping them to the checkpointing stream.
+	 */
+
+	for (i = 0; ok && i < YAFFS_NOBJECT_BUCKETS; i++) {
+		list_for_each(lh, &dev->obj_bucket[i].list) {
+			obj = list_entry(lh, struct yaffs_obj, hash_link);
+			if (!obj->defered_free) {
+				yaffs2_obj_checkpt_obj(&cp, obj);
+				cp.struct_type = sizeof(cp);
+
+				yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+					"Checkpoint write object %d parent %d type %d chunk %d obj addr %p",
+					cp.obj_id, cp.parent_id,
+					cp.variant_type, cp.hdr_chunk, obj);
+
+				ok = (yaffs2_checkpt_wr(dev, &cp,
+						sizeof(cp)) == sizeof(cp));
+
+				if (ok &&
+					obj->variant_type ==
+					YAFFS_OBJECT_TYPE_FILE)
+					ok = yaffs2_wr_checkpt_tnodes(obj);
+			}
+		}
+	}
+
+	/* Dump end of list */
+	memset(&cp, 0xff, sizeof(struct yaffs_checkpt_obj));
+	cp.struct_type = sizeof(cp);
+
+	if (ok)
+		ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp));
+
+	return ok ? 1 : 0;
+}
+
+static int yaffs2_rd_checkpt_objs(struct yaffs_dev *dev)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_checkpt_obj cp;
+	int ok = 1;
+	int done = 0;
+	LIST_HEAD(hard_list);
+
+
+	while (ok && !done) {
+		ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp));
+		if (cp.struct_type != sizeof(cp)) {
+			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+				"struct size %d instead of %d ok %d",
+				cp.struct_type, (int)sizeof(cp), ok);
+			ok = 0;
+		}
+
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"Checkpoint read object %d parent %d type %d chunk %d ",
+			cp.obj_id, cp.parent_id, cp.variant_type,
+			cp.hdr_chunk);
+
+		if (ok && cp.obj_id == ~0) {
+			done = 1;
+		} else if (ok) {
+			obj =
+			    yaffs_find_or_create_by_number(dev, cp.obj_id,
+							   cp.variant_type);
+			if (obj) {
+				ok = yaffs2_checkpt_obj_to_obj(obj, &cp);
+				if (!ok)
+					break;
+				if (obj->variant_type ==
+					YAFFS_OBJECT_TYPE_FILE) {
+					ok = yaffs2_rd_checkpt_tnodes(obj);
+				} else if (obj->variant_type ==
+					YAFFS_OBJECT_TYPE_HARDLINK) {
+					list_add(&obj->hard_links, &hard_list);
+				}
+			} else {
+				ok = 0;
+			}
+		}
+	}
+
+	if (ok)
+		yaffs_link_fixup(dev, &hard_list);
+
+	return ok ? 1 : 0;
+}
+
+static int yaffs2_wr_checkpt_sum(struct yaffs_dev *dev)
+{
+	u32 checkpt_sum;
+	int ok;
+
+	yaffs2_get_checkpt_sum(dev, &checkpt_sum);
+
+	ok = (yaffs2_checkpt_wr(dev, &checkpt_sum, sizeof(checkpt_sum)) ==
+		sizeof(checkpt_sum));
+
+	if (!ok)
+		return 0;
+
+	return 1;
+}
+
+static int yaffs2_rd_checkpt_sum(struct yaffs_dev *dev)
+{
+	u32 checkpt_sum0;
+	u32 checkpt_sum1;
+	int ok;
+
+	yaffs2_get_checkpt_sum(dev, &checkpt_sum0);
+
+	ok = (yaffs2_checkpt_rd(dev, &checkpt_sum1, sizeof(checkpt_sum1)) ==
+		sizeof(checkpt_sum1));
+
+	if (!ok)
+		return 0;
+
+	if (checkpt_sum0 != checkpt_sum1)
+		return 0;
+
+	return 1;
+}
+
+static int yaffs2_wr_checkpt_data(struct yaffs_dev *dev)
+{
+	int ok = 1;
+
+	if (!yaffs2_checkpt_required(dev)) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"skipping checkpoint write");
+		ok = 0;
+	}
+
+	if (ok)
+		ok = yaffs2_checkpt_open(dev, 1);
+
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"write checkpoint validity");
+		ok = yaffs2_wr_checkpt_validity_marker(dev, 1);
+	}
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"write checkpoint device");
+		ok = yaffs2_wr_checkpt_dev(dev);
+	}
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"write checkpoint objects");
+		ok = yaffs2_wr_checkpt_objs(dev);
+	}
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"write checkpoint validity");
+		ok = yaffs2_wr_checkpt_validity_marker(dev, 0);
+	}
+
+	if (ok)
+		ok = yaffs2_wr_checkpt_sum(dev);
+
+	if (!yaffs_checkpt_close(dev))
+		ok = 0;
+
+	if (ok)
+		dev->is_checkpointed = 1;
+	else
+		dev->is_checkpointed = 0;
+
+	return dev->is_checkpointed;
+}
+
+static int yaffs2_rd_checkpt_data(struct yaffs_dev *dev)
+{
+	int ok = 1;
+
+	if (!dev->param.is_yaffs2)
+		ok = 0;
+
+	if (ok && dev->param.skip_checkpt_rd) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"skipping checkpoint read");
+		ok = 0;
+	}
+
+	if (ok)
+		ok = yaffs2_checkpt_open(dev, 0); /* open for read */
+
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"read checkpoint validity");
+		ok = yaffs2_rd_checkpt_validity_marker(dev, 1);
+	}
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"read checkpoint device");
+		ok = yaffs2_rd_checkpt_dev(dev);
+	}
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"read checkpoint objects");
+		ok = yaffs2_rd_checkpt_objs(dev);
+	}
+	if (ok) {
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"read checkpoint validity");
+		ok = yaffs2_rd_checkpt_validity_marker(dev, 0);
+	}
+
+	if (ok) {
+		ok = yaffs2_rd_checkpt_sum(dev);
+		yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+			"read checkpoint checksum %d", ok);
+	}
+
+	if (!yaffs_checkpt_close(dev))
+		ok = 0;
+
+	if (ok)
+		dev->is_checkpointed = 1;
+	else
+		dev->is_checkpointed = 0;
+
+	return ok ? 1 : 0;
+}
+
+void yaffs2_checkpt_invalidate(struct yaffs_dev *dev)
+{
+	if (dev->is_checkpointed || dev->blocks_in_checkpt > 0) {
+		dev->is_checkpointed = 0;
+		yaffs2_checkpt_invalidate_stream(dev);
+	}
+	if (dev->param.sb_dirty_fn)
+		dev->param.sb_dirty_fn(dev);
+}
+
+int yaffs_checkpoint_save(struct yaffs_dev *dev)
+{
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"save entry: is_checkpointed %d",
+		dev->is_checkpointed);
+
+	yaffs_verify_objects(dev);
+	yaffs_verify_blocks(dev);
+	yaffs_verify_free_chunks(dev);
+
+	if (!dev->is_checkpointed) {
+		yaffs2_checkpt_invalidate(dev);
+		yaffs2_wr_checkpt_data(dev);
+	}
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT | YAFFS_TRACE_MOUNT,
+		"save exit: is_checkpointed %d",
+		dev->is_checkpointed);
+
+	return dev->is_checkpointed;
+}
+
+int yaffs2_checkpt_restore(struct yaffs_dev *dev)
+{
+	int retval;
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"restore entry: is_checkpointed %d",
+		dev->is_checkpointed);
+
+	retval = yaffs2_rd_checkpt_data(dev);
+
+	if (dev->is_checkpointed) {
+		yaffs_verify_objects(dev);
+		yaffs_verify_blocks(dev);
+		yaffs_verify_free_chunks(dev);
+	}
+
+	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+		"restore exit: is_checkpointed %d",
+		dev->is_checkpointed);
+
+	return retval;
+}
+
+int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size)
+{
+	/* if new_size > old_file_size.
+	 * We're going to be writing a hole.
+	 * If the hole is small then write zeros otherwise write a start
+	 * of hole marker.
+	 */
+	loff_t old_file_size;
+	loff_t increase;
+	int small_hole;
+	int result = YAFFS_OK;
+	struct yaffs_dev *dev = NULL;
+	u8 *local_buffer = NULL;
+	int small_increase_ok = 0;
+
+	if (!obj)
+		return YAFFS_FAIL;
+
+	if (obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
+		return YAFFS_FAIL;
+
+	dev = obj->my_dev;
+
+	/* Bail out if not yaffs2 mode */
+	if (!dev->param.is_yaffs2)
+		return YAFFS_OK;
+
+	old_file_size = obj->variant.file_variant.file_size;
+
+	if (new_size <= old_file_size)
+		return YAFFS_OK;
+
+	increase = new_size - old_file_size;
+
+	if (increase < YAFFS_SMALL_HOLE_THRESHOLD * dev->data_bytes_per_chunk &&
+	    yaffs_check_alloc_available(dev, YAFFS_SMALL_HOLE_THRESHOLD + 1))
+		small_hole = 1;
+	else
+		small_hole = 0;
+
+	if (small_hole)
+		local_buffer = yaffs_get_temp_buffer(dev);
+
+	if (local_buffer) {
+		/* fill hole with zero bytes */
+		loff_t pos = old_file_size;
+		int this_write;
+		int written;
+		memset(local_buffer, 0, dev->data_bytes_per_chunk);
+		small_increase_ok = 1;
+
+		while (increase > 0 && small_increase_ok) {
+			this_write = increase;
+			if (this_write > dev->data_bytes_per_chunk)
+				this_write = dev->data_bytes_per_chunk;
+			written =
+			    yaffs_do_file_wr(obj, local_buffer, pos, this_write,
+					     0);
+			if (written == this_write) {
+				pos += this_write;
+				increase -= this_write;
+			} else {
+				small_increase_ok = 0;
+			}
+		}
+
+		yaffs_release_temp_buffer(dev, local_buffer);
+
+		/* If out of space then reverse any chunks we've added */
+		if (!small_increase_ok)
+			yaffs_resize_file_down(obj, old_file_size);
+	}
+
+	if (!small_increase_ok &&
+	    obj->parent &&
+	    obj->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
+	    obj->parent->obj_id != YAFFS_OBJECTID_DELETED) {
+		/* Write a hole start header with the old file size */
+		yaffs_update_oh(obj, NULL, 0, 1, 0, NULL);
+	}
+
+	return result;
+}
+
+struct yaffs_block_index {
+	int seq;
+	int block;
+};
+
+static int yaffs2_ybicmp(const void *a, const void *b)
+{
+	int aseq = ((struct yaffs_block_index *)a)->seq;
+	int bseq = ((struct yaffs_block_index *)b)->seq;
+	int ablock = ((struct yaffs_block_index *)a)->block;
+	int bblock = ((struct yaffs_block_index *)b)->block;
+
+	if (aseq == bseq)
+		return ablock - bblock;
+
+	return aseq - bseq;
+}
+
+static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
+		struct yaffs_block_info *bi,
+		int blk, int chunk_in_block,
+		int *found_chunks,
+		u8 *chunk_data,
+		struct list_head *hard_list,
+		int summary_available)
+{
+	struct yaffs_obj_hdr *oh;
+	struct yaffs_obj *in;
+	struct yaffs_obj *parent;
+	int equiv_id;
+	loff_t file_size;
+	int is_shrink;
+	int is_unlinked;
+	struct yaffs_ext_tags tags;
+	int result;
+	int alloc_failed = 0;
+	int chunk = blk * dev->param.chunks_per_block + chunk_in_block;
+	struct yaffs_file_var *file_var;
+	struct yaffs_hardlink_var *hl_var;
+	struct yaffs_symlink_var *sl_var;
+
+	if (summary_available) {
+		result = yaffs_summary_fetch(dev, &tags, chunk_in_block);
+		tags.seq_number = bi->seq_number;
+	}
+
+	if (!summary_available || tags.obj_id == 0) {
+		result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags);
+		dev->tags_used++;
+	} else {
+		dev->summary_used++;
+	}
+
+	/* Let's have a good look at this chunk... */
+
+	if (!tags.chunk_used) {
+		/* An unassigned chunk in the block.
+		 * If there are used chunks after this one, then
+		 * it is a chunk that was skipped due to failing
+		 * the erased check. Just skip it so that it can
+		 * be deleted.
+		 * But, more typically, We get here when this is
+		 * an unallocated chunk and his means that
+		 * either the block is empty or this is the one
+		 * being allocated from
+		 */
+
+		if (*found_chunks) {
+			/* This is a chunk that was skipped due
+			 * to failing the erased check */
+		} else if (chunk_in_block == 0) {
+			/* We're looking at the first chunk in
+			 * the block so the block is unused */
+			bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
+			dev->n_erased_blocks++;
+		} else {
+			if (bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN ||
+			    bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING) {
+				if (dev->seq_number == bi->seq_number) {
+					/* Allocating from this block*/
+					yaffs_trace(YAFFS_TRACE_SCAN,
+					    " Allocating from %d %d",
+					    blk, chunk_in_block);
+
+					bi->block_state =
+						YAFFS_BLOCK_STATE_ALLOCATING;
+					dev->alloc_block = blk;
+					dev->alloc_page = chunk_in_block;
+					dev->alloc_block_finder = blk;
+				} else {
+					/* This is a partially written block
+					 * that is not the current
+					 * allocation block.
+					 */
+					yaffs_trace(YAFFS_TRACE_SCAN,
+						"Partially written block %d detected. gc will fix this.",
+						blk);
+				}
+			}
+		}
+
+		dev->n_free_chunks++;
+
+	} else if (tags.ecc_result ==
+		YAFFS_ECC_RESULT_UNFIXED) {
+		yaffs_trace(YAFFS_TRACE_SCAN,
+			" Unfixed ECC in chunk(%d:%d), chunk ignored",
+			blk, chunk_in_block);
+			dev->n_free_chunks++;
+	} else if (tags.obj_id > YAFFS_MAX_OBJECT_ID ||
+		   tags.chunk_id > YAFFS_MAX_CHUNK_ID ||
+		   tags.obj_id == YAFFS_OBJECTID_SUMMARY ||
+		   (tags.chunk_id > 0 &&
+		     tags.n_bytes > dev->data_bytes_per_chunk) ||
+		   tags.seq_number != bi->seq_number) {
+		yaffs_trace(YAFFS_TRACE_SCAN,
+			"Chunk (%d:%d) with bad tags:obj = %d, chunk_id = %d, n_bytes = %d, ignored",
+			blk, chunk_in_block, tags.obj_id,
+			tags.chunk_id, tags.n_bytes);
+		dev->n_free_chunks++;
+	} else if (tags.chunk_id > 0) {
+		/* chunk_id > 0 so it is a data chunk... */
+		loff_t endpos;
+		loff_t chunk_base = (tags.chunk_id - 1) *
+					dev->data_bytes_per_chunk;
+
+		*found_chunks = 1;
+
+		yaffs_set_chunk_bit(dev, blk, chunk_in_block);
+		bi->pages_in_use++;
+
+		in = yaffs_find_or_create_by_number(dev,
+					tags.obj_id,
+					YAFFS_OBJECT_TYPE_FILE);
+		if (!in)
+			/* Out of memory */
+			alloc_failed = 1;
+
+		if (in &&
+		    in->variant_type == YAFFS_OBJECT_TYPE_FILE &&
+		    chunk_base < in->variant.file_variant.shrink_size) {
+			/* This has not been invalidated by
+			 * a resize */
+			if (!yaffs_put_chunk_in_file(in, tags.chunk_id,
+								chunk, -1))
+				alloc_failed = 1;
+
+			/* File size is calculated by looking at
+			 * the data chunks if we have not
+			 * seen an object header yet.
+			 * Stop this practice once we find an
+			 * object header.
+			 */
+			endpos = chunk_base + tags.n_bytes;
+
+			if (!in->valid &&
+			    in->variant.file_variant.scanned_size < endpos) {
+				in->variant.file_variant.
+				    scanned_size = endpos;
+				in->variant.file_variant.
+				    file_size = endpos;
+			}
+		} else if (in) {
+			/* This chunk has been invalidated by a
+			 * resize, or a past file deletion
+			 * so delete the chunk*/
+			yaffs_chunk_del(dev, chunk, 1, __LINE__);
+		}
+	} else {
+		/* chunk_id == 0, so it is an ObjectHeader.
+		 * Thus, we read in the object header and make
+		 * the object
+		 */
+		*found_chunks = 1;
+
+		yaffs_set_chunk_bit(dev, blk, chunk_in_block);
+		bi->pages_in_use++;
+
+		oh = NULL;
+		in = NULL;
+
+		if (tags.extra_available) {
+			in = yaffs_find_or_create_by_number(dev,
+					tags.obj_id,
+					tags.extra_obj_type);
+			if (!in)
+				alloc_failed = 1;
+		}
+
+		if (!in ||
+		    (!in->valid && dev->param.disable_lazy_load) ||
+		    tags.extra_shadows ||
+		    (!in->valid && (tags.obj_id == YAFFS_OBJECTID_ROOT ||
+				 tags.obj_id == YAFFS_OBJECTID_LOSTNFOUND))) {
+
+			/* If we don't have  valid info then we
+			 * need to read the chunk
+			 * TODO In future we can probably defer
+			 * reading the chunk and living with
+			 * invalid data until needed.
+			 */
+
+			result = yaffs_rd_chunk_tags_nand(dev,
+						  chunk,
+						  chunk_data,
+						  NULL);
+
+			oh = (struct yaffs_obj_hdr *)chunk_data;
+
+			if (dev->param.inband_tags) {
+				/* Fix up the header if they got
+				 * corrupted by inband tags */
+				oh->shadows_obj =
+				    oh->inband_shadowed_obj_id;
+				oh->is_shrink =
+				    oh->inband_is_shrink;
+			}
+
+			if (!in) {
+				in = yaffs_find_or_create_by_number(dev,
+							tags.obj_id, oh->type);
+				if (!in)
+					alloc_failed = 1;
+			}
+		}
+
+		if (!in) {
+			/* TODO Hoosterman we have a problem! */
+			yaffs_trace(YAFFS_TRACE_ERROR,
+				"yaffs tragedy: Could not make object for object  %d at chunk %d during scan",
+				tags.obj_id, chunk);
+			return YAFFS_FAIL;
+		}
+
+		if (in->valid) {
+			/* We have already filled this one.
+			 * We have a duplicate that will be
+			 * discarded, but we first have to suck
+			 * out resize info if it is a file.
+			 */
+			if ((in->variant_type == YAFFS_OBJECT_TYPE_FILE) &&
+				((oh && oh->type == YAFFS_OBJECT_TYPE_FILE) ||
+				 (tags.extra_available &&
+				  tags.extra_obj_type == YAFFS_OBJECT_TYPE_FILE)
+				)) {
+				loff_t this_size = (oh) ?
+					yaffs_oh_to_size(oh) :
+					tags.extra_file_size;
+				u32 parent_obj_id = (oh) ?
+					oh->parent_obj_id :
+					tags.extra_parent_id;
+
+				is_shrink = (oh) ?
+					oh->is_shrink :
+					tags.extra_is_shrink;
+
+				/* If it is deleted (unlinked
+				 * at start also means deleted)
+				 * we treat the file size as
+				 * being zeroed at this point.
+				 */
+				if (parent_obj_id == YAFFS_OBJECTID_DELETED ||
+				    parent_obj_id == YAFFS_OBJECTID_UNLINKED) {
+					this_size = 0;
+					is_shrink = 1;
+				}
+
+				if (is_shrink &&
+				    in->variant.file_variant.shrink_size >
+				    this_size)
+					in->variant.file_variant.shrink_size =
+					this_size;
+
+				if (is_shrink)
+					bi->has_shrink_hdr = 1;
+			}
+			/* Use existing - destroy this one. */
+			yaffs_chunk_del(dev, chunk, 1, __LINE__);
+		}
+
+		if (!in->valid && in->variant_type !=
+		    (oh ? oh->type : tags.extra_obj_type))
+			yaffs_trace(YAFFS_TRACE_ERROR,
+				"yaffs tragedy: Bad object type, %d != %d, for object %d at chunk %d during scan",
+				oh ? oh->type : tags.extra_obj_type,
+				in->variant_type, tags.obj_id,
+				chunk);
+
+		if (!in->valid &&
+		    (tags.obj_id == YAFFS_OBJECTID_ROOT ||
+		     tags.obj_id == YAFFS_OBJECTID_LOSTNFOUND)) {
+			/* We only load some info, don't fiddle
+			 * with directory structure */
+			in->valid = 1;
+
+			if (oh) {
+				in->yst_mode = oh->yst_mode;
+				yaffs_load_attribs(in, oh);
+				in->lazy_loaded = 0;
+			} else {
+				in->lazy_loaded = 1;
+			}
+			in->hdr_chunk = chunk;
+
+		} else if (!in->valid) {
+			/* we need to load this info */
+			in->valid = 1;
+			in->hdr_chunk = chunk;
+			if (oh) {
+				in->variant_type = oh->type;
+				in->yst_mode = oh->yst_mode;
+				yaffs_load_attribs(in, oh);
+
+				if (oh->shadows_obj > 0)
+					yaffs_handle_shadowed_obj(dev,
+					     oh->shadows_obj, 1);
+
+				yaffs_set_obj_name_from_oh(in, oh);
+				parent = yaffs_find_or_create_by_number(dev,
+						oh->parent_obj_id,
+						YAFFS_OBJECT_TYPE_DIRECTORY);
+				file_size = yaffs_oh_to_size(oh);
+				is_shrink = oh->is_shrink;
+				equiv_id = oh->equiv_id;
+			} else {
+				in->variant_type = tags.extra_obj_type;
+				parent = yaffs_find_or_create_by_number(dev,
+						tags.extra_parent_id,
+						YAFFS_OBJECT_TYPE_DIRECTORY);
+				file_size = tags.extra_file_size;
+				is_shrink = tags.extra_is_shrink;
+				equiv_id = tags.extra_equiv_id;
+				in->lazy_loaded = 1;
+			}
+			in->dirty = 0;
+
+			if (!parent)
+				alloc_failed = 1;
+
+			/* directory stuff...
+			 * hook up to parent
+			 */
+
+			if (parent &&
+			    parent->variant_type == YAFFS_OBJECT_TYPE_UNKNOWN) {
+				/* Set up as a directory */
+				parent->variant_type =
+					YAFFS_OBJECT_TYPE_DIRECTORY;
+				INIT_LIST_HEAD(&parent->
+						variant.dir_variant.children);
+			} else if (!parent ||
+				   parent->variant_type !=
+					YAFFS_OBJECT_TYPE_DIRECTORY) {
+				/* Hoosterman, another problem....
+				 * Trying to use a non-directory as a directory
+				 */
+
+				yaffs_trace(YAFFS_TRACE_ERROR,
+					"yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
+					);
+				parent = dev->lost_n_found;
+			}
+			yaffs_add_obj_to_dir(parent, in);
+
+			is_unlinked = (parent == dev->del_dir) ||
+					(parent == dev->unlinked_dir);
+
+			if (is_shrink)
+				/* Mark the block */
+				bi->has_shrink_hdr = 1;
+
+			/* Note re hardlinks.
+			 * Since we might scan a hardlink before its equivalent
+			 * object is scanned we put them all in a list.
+			 * After scanning is complete, we should have all the
+			 * objects, so we run through this list and fix up all
+			 * the chains.
+			 */
+
+			switch (in->variant_type) {
+			case YAFFS_OBJECT_TYPE_UNKNOWN:
+				/* Todo got a problem */
+				break;
+			case YAFFS_OBJECT_TYPE_FILE:
+				file_var = &in->variant.file_variant;
+				if (file_var->scanned_size < file_size) {
+					/* This covers the case where the file
+					 * size is greater than the data held.
+					 * This will happen if the file is
+					 * resized to be larger than its
+					 * current data extents.
+					 */
+					file_var->file_size = file_size;
+					file_var->scanned_size = file_size;
+				}
+
+				if (file_var->shrink_size > file_size)
+					file_var->shrink_size = file_size;
+
+				break;
+			case YAFFS_OBJECT_TYPE_HARDLINK:
+				hl_var = &in->variant.hardlink_variant;
+				if (!is_unlinked) {
+					hl_var->equiv_id = equiv_id;
+					list_add(&in->hard_links, hard_list);
+				}
+				break;
+			case YAFFS_OBJECT_TYPE_DIRECTORY:
+				/* Do nothing */
+				break;
+			case YAFFS_OBJECT_TYPE_SPECIAL:
+				/* Do nothing */
+				break;
+			case YAFFS_OBJECT_TYPE_SYMLINK:
+				sl_var = &in->variant.symlink_variant;
+				if (oh) {
+					sl_var->alias =
+					    yaffs_clone_str(oh->alias);
+					if (!sl_var->alias)
+						alloc_failed = 1;
+				}
+				break;
+			}
+		}
+	}
+	return alloc_failed ? YAFFS_FAIL : YAFFS_OK;
+}
+
+int yaffs2_scan_backwards(struct yaffs_dev *dev)
+{
+	int blk;
+	int block_iter;
+	int start_iter;
+	int end_iter;
+	int n_to_scan = 0;
+	enum yaffs_block_state state;
+	int c;
+	int deleted;
+	LIST_HEAD(hard_list);
+	struct yaffs_block_info *bi;
+	u32 seq_number;
+	int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
+	u8 *chunk_data;
+	int found_chunks;
+	int alloc_failed = 0;
+	struct yaffs_block_index *block_index = NULL;
+	int alt_block_index = 0;
+	int summary_available;
+
+	yaffs_trace(YAFFS_TRACE_SCAN,
+		"yaffs2_scan_backwards starts  intstartblk %d intendblk %d...",
+		dev->internal_start_block, dev->internal_end_block);
+
+	dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
+
+	block_index =
+		kmalloc(n_blocks * sizeof(struct yaffs_block_index), GFP_NOFS);
+
+	if (!block_index) {
+		block_index =
+		    vmalloc(n_blocks * sizeof(struct yaffs_block_index));
+		alt_block_index = 1;
+	}
+
+	if (!block_index) {
+		yaffs_trace(YAFFS_TRACE_SCAN,
+			"yaffs2_scan_backwards() could not allocate block index!"
+			);
+		return YAFFS_FAIL;
+	}
+
+	dev->blocks_in_checkpt = 0;
+
+	chunk_data = yaffs_get_temp_buffer(dev);
+
+	/* Scan all the blocks to determine their state */
+	bi = dev->block_info;
+	for (blk = dev->internal_start_block; blk <= dev->internal_end_block;
+	     blk++) {
+		yaffs_clear_chunk_bits(dev, blk);
+		bi->pages_in_use = 0;
+		bi->soft_del_pages = 0;
+
+		yaffs_query_init_block_state(dev, blk, &state, &seq_number);
+
+		bi->block_state = state;
+		bi->seq_number = seq_number;
+
+		if (bi->seq_number == YAFFS_SEQUENCE_CHECKPOINT_DATA)
+			bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
+		if (bi->seq_number == YAFFS_SEQUENCE_BAD_BLOCK)
+			bi->block_state = YAFFS_BLOCK_STATE_DEAD;
+
+		yaffs_trace(YAFFS_TRACE_SCAN_DEBUG,
+			"Block scanning block %d state %d seq %d",
+			blk, bi->block_state, seq_number);
+
+		if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
+			dev->blocks_in_checkpt++;
+
+		} else if (bi->block_state == YAFFS_BLOCK_STATE_DEAD) {
+			yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
+				"block %d is bad", blk);
+		} else if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
+			yaffs_trace(YAFFS_TRACE_SCAN_DEBUG, "Block empty ");
+			dev->n_erased_blocks++;
+			dev->n_free_chunks += dev->param.chunks_per_block;
+		} else if (bi->block_state ==
+				YAFFS_BLOCK_STATE_NEEDS_SCAN) {
+			/* Determine the highest sequence number */
+			if (seq_number >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
+			    seq_number < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
+				block_index[n_to_scan].seq = seq_number;
+				block_index[n_to_scan].block = blk;
+				n_to_scan++;
+				if (seq_number >= dev->seq_number)
+					dev->seq_number = seq_number;
+			} else {
+				/* TODO: Nasty sequence number! */
+				yaffs_trace(YAFFS_TRACE_SCAN,
+					"Block scanning block %d has bad sequence number %d",
+					blk, seq_number);
+			}
+		}
+		bi++;
+	}
+
+	yaffs_trace(YAFFS_TRACE_SCAN, "%d blocks to be sorted...", n_to_scan);
+
+	cond_resched();
+
+	/* Sort the blocks by sequence number */
+	sort(block_index, n_to_scan, sizeof(struct yaffs_block_index),
+		   yaffs2_ybicmp, NULL);
+
+	cond_resched();
+
+	yaffs_trace(YAFFS_TRACE_SCAN, "...done");
+
+	/* Now scan the blocks looking at the data. */
+	start_iter = 0;
+	end_iter = n_to_scan - 1;
+	yaffs_trace(YAFFS_TRACE_SCAN_DEBUG, "%d blocks to scan", n_to_scan);
+
+	/* For each block.... backwards */
+	for (block_iter = end_iter;
+	     !alloc_failed && block_iter >= start_iter;
+	     block_iter--) {
+		/* Cooperative multitasking! This loop can run for so
+		   long that watchdog timers expire. */
+		cond_resched();
+
+		/* get the block to scan in the correct order */
+		blk = block_index[block_iter].block;
+		bi = yaffs_get_block_info(dev, blk);
+		deleted = 0;
+
+		summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);
+
+		/* For each chunk in each block that needs scanning.... */
+		found_chunks = 0;
+		if (summary_available)
+			c = dev->chunks_per_summary - 1;
+		else
+			c = dev->param.chunks_per_block - 1;
+
+		for (/* c is already initialised */;
+		     !alloc_failed && c >= 0 &&
+		     (bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN ||
+		      bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING);
+		      c--) {
+			/* Scan backwards...
+			 * Read the tags and decide what to do
+			 */
+			if (yaffs2_scan_chunk(dev, bi, blk, c,
+					&found_chunks, chunk_data,
+					&hard_list, summary_available) ==
+					YAFFS_FAIL)
+				alloc_failed = 1;
+		}
+
+		if (bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN) {
+			/* If we got this far while scanning, then the block
+			 * is fully allocated. */
+			bi->block_state = YAFFS_BLOCK_STATE_FULL;
+		}
+
+		/* Now let's see if it was dirty */
+		if (bi->pages_in_use == 0 &&
+		    !bi->has_shrink_hdr &&
+		    bi->block_state == YAFFS_BLOCK_STATE_FULL) {
+			yaffs_block_became_dirty(dev, blk);
+		}
+	}
+
+	yaffs_skip_rest_of_block(dev);
+
+	if (alt_block_index)
+		vfree(block_index);
+	else
+		kfree(block_index);
+
+	/* Ok, we've done all the scanning.
+	 * Fix up the hard link chains.
+	 * We have scanned all the objects, now it's time to add these
+	 * hardlinks.
+	 */
+	yaffs_link_fixup(dev, &hard_list);
+
+	yaffs_release_temp_buffer(dev, chunk_data);
+
+	if (alloc_failed)
+		return YAFFS_FAIL;
+
+	yaffs_trace(YAFFS_TRACE_SCAN, "yaffs2_scan_backwards ends");
+
+	return YAFFS_OK;
+}
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.h b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.h
new file mode 100644
index 00000000..2363bfd8
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.h
@@ -0,0 +1,39 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_YAFFS2_H__
+#define __YAFFS_YAFFS2_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_calc_oldest_dirty_seq(struct yaffs_dev *dev);
+void yaffs2_find_oldest_dirty_seq(struct yaffs_dev *dev);
+void yaffs2_clear_oldest_dirty_seq(struct yaffs_dev *dev,
+				   struct yaffs_block_info *bi);
+void yaffs2_update_oldest_dirty_seq(struct yaffs_dev *dev, unsigned block_no,
+				    struct yaffs_block_info *bi);
+int yaffs_block_ok_for_gc(struct yaffs_dev *dev, struct yaffs_block_info *bi);
+u32 yaffs2_find_refresh_block(struct yaffs_dev *dev);
+int yaffs2_checkpt_required(struct yaffs_dev *dev);
+int yaffs_calc_checkpt_blocks_required(struct yaffs_dev *dev);
+
+void yaffs2_checkpt_invalidate(struct yaffs_dev *dev);
+int yaffs2_checkpt_save(struct yaffs_dev *dev);
+int yaffs2_checkpt_restore(struct yaffs_dev *dev);
+
+int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size);
+int yaffs2_scan_backwards(struct yaffs_dev *dev);
+
+#endif
diff --git a/trunk/target/linux/generic/files/fs/yaffs2/yportenv.h b/trunk/target/linux/generic/files/fs/yaffs2/yportenv.h
new file mode 100644
index 00000000..8975af33
--- /dev/null
+++ b/trunk/target/linux/generic/files/fs/yaffs2/yportenv.h
@@ -0,0 +1,85 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YPORTENV_H__
+#define __YPORTENV_H__
+
+/*
+ * Define the MTD version in terms of Linux Kernel versions
+ * This allows yaffs to be used independantly of the kernel
+ * as well as with it.
+ */
+
+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
+
+#ifdef YAFFS_OUT_OF_TREE
+#include "moduleconfig.h"
+#endif
+
+#include <linux/version.h>
+#define MTD_VERSION_CODE LINUX_VERSION_CODE
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+#include <linux/config.h>
+#endif
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/xattr.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/stat.h>
+#include <linux/sort.h>
+#include <linux/bitops.h>
+
+/*  These type wrappings are used to support Unicode names in WinCE. */
+#define YCHAR char
+#define YUCHAR unsigned char
+#define _Y(x)     x
+
+#define YAFFS_LOSTNFOUND_NAME		"lost+found"
+#define YAFFS_LOSTNFOUND_PREFIX		"obj"
+
+
+#define YAFFS_ROOT_MODE			0755
+#define YAFFS_LOSTNFOUND_MODE		0700
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
+#define Y_TIME_CONVERT(x) (x).tv_sec
+#else
+#define Y_CURRENT_TIME CURRENT_TIME
+#define Y_TIME_CONVERT(x) (x)
+#endif
+
+#define compile_time_assertion(assertion) \
+	({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
+
+
+#define yaffs_printf(msk, fmt, ...) \
+	printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__)
+
+#define yaffs_trace(msk, fmt, ...) do { \
+	if (yaffs_trace_mask & (msk)) \
+		printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
+} while (0)
+
+
+#endif
diff --git a/trunk/target/linux/generic/files/include/linux/ar8216_platform.h b/trunk/target/linux/generic/files/include/linux/ar8216_platform.h
new file mode 100644
index 00000000..4935ad33
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/ar8216_platform.h
@@ -0,0 +1,131 @@
+/*
+ * AR8216 switch driver platform data
+ *
+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#ifndef AR8216_PLATFORM_H
+#define AR8216_PLATFORM_H
+
+enum ar8327_pad_mode {
+	AR8327_PAD_NC = 0,
+	AR8327_PAD_MAC2MAC_MII,
+	AR8327_PAD_MAC2MAC_GMII,
+	AR8327_PAD_MAC_SGMII,
+	AR8327_PAD_MAC2PHY_MII,
+	AR8327_PAD_MAC2PHY_GMII,
+	AR8327_PAD_MAC_RGMII,
+	AR8327_PAD_PHY_GMII,
+	AR8327_PAD_PHY_RGMII,
+	AR8327_PAD_PHY_MII,
+};
+
+enum ar8327_clk_delay_sel {
+	AR8327_CLK_DELAY_SEL0 = 0,
+	AR8327_CLK_DELAY_SEL1,
+	AR8327_CLK_DELAY_SEL2,
+	AR8327_CLK_DELAY_SEL3,
+};
+
+struct ar8327_pad_cfg {
+	enum ar8327_pad_mode mode;
+	bool rxclk_sel;
+	bool txclk_sel;
+	bool pipe_rxclk_sel;
+	bool txclk_delay_en;
+	bool rxclk_delay_en;
+	bool sgmii_delay_en;
+	enum ar8327_clk_delay_sel txclk_delay_sel;
+	enum ar8327_clk_delay_sel rxclk_delay_sel;
+};
+
+enum ar8327_port_speed {
+	AR8327_PORT_SPEED_10 = 0,
+	AR8327_PORT_SPEED_100,
+	AR8327_PORT_SPEED_1000,
+};
+
+struct ar8327_port_cfg {
+	int force_link:1;
+	enum ar8327_port_speed speed;
+	int txpause:1;
+	int rxpause:1;
+	int duplex:1;
+};
+
+struct ar8327_sgmii_cfg {
+	u32 sgmii_ctrl;
+	bool serdes_aen;
+};
+
+struct ar8327_led_cfg {
+	u32 led_ctrl0;
+	u32 led_ctrl1;
+	u32 led_ctrl2;
+	u32 led_ctrl3;
+	bool open_drain;
+};
+
+enum ar8327_led_num {
+	AR8327_LED_PHY0_0 = 0,
+	AR8327_LED_PHY0_1,
+	AR8327_LED_PHY0_2,
+	AR8327_LED_PHY1_0,
+	AR8327_LED_PHY1_1,
+	AR8327_LED_PHY1_2,
+	AR8327_LED_PHY2_0,
+	AR8327_LED_PHY2_1,
+	AR8327_LED_PHY2_2,
+	AR8327_LED_PHY3_0,
+	AR8327_LED_PHY3_1,
+	AR8327_LED_PHY3_2,
+	AR8327_LED_PHY4_0,
+	AR8327_LED_PHY4_1,
+	AR8327_LED_PHY4_2,
+};
+
+enum ar8327_led_mode {
+	AR8327_LED_MODE_HW = 0,
+	AR8327_LED_MODE_SW,
+};
+
+struct ar8327_led_info {
+	const char *name;
+	const char *default_trigger;
+	bool active_low;
+	enum ar8327_led_num led_num;
+	enum ar8327_led_mode mode;
+};
+
+#define AR8327_LED_INFO(_led, _mode, _name) {	\
+	.name = (_name), 	   		\
+	.led_num = AR8327_LED_ ## _led,		\
+	.mode = AR8327_LED_MODE_ ## _mode 	\
+}
+
+struct ar8327_platform_data {
+	struct ar8327_pad_cfg *pad0_cfg;
+	struct ar8327_pad_cfg *pad5_cfg;
+	struct ar8327_pad_cfg *pad6_cfg;
+	struct ar8327_sgmii_cfg *sgmii_cfg;
+	struct ar8327_port_cfg port0_cfg;
+	struct ar8327_port_cfg port6_cfg;
+	struct ar8327_led_cfg *led_cfg;
+
+	int (*get_port_link)(unsigned port);
+
+	unsigned num_leds;
+	const struct ar8327_led_info *leds;
+};
+
+#endif /* AR8216_PLATFORM_H */
\ No newline at end of file
diff --git a/trunk/target/linux/generic/files/include/linux/ath5k_platform.h b/trunk/target/linux/generic/files/include/linux/ath5k_platform.h
new file mode 100644
index 00000000..ec852245
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/ath5k_platform.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2008 Atheros Communications Inc.
+ * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
+ * Copyright (c) 2010 Daniel Golle <daniel.golle@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _LINUX_ATH5K_PLATFORM_H
+#define _LINUX_ATH5K_PLATFORM_H
+
+#define ATH5K_PLAT_EEP_MAX_WORDS	2048
+
+struct ath5k_platform_data {
+	u16 *eeprom_data;
+	u8 *macaddr;
+};
+
+#endif /* _LINUX_ATH5K_PLATFORM_H */
diff --git a/trunk/target/linux/generic/files/include/linux/ath9k_platform.h b/trunk/target/linux/generic/files/include/linux/ath9k_platform.h
new file mode 100644
index 00000000..9fa70167
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/ath9k_platform.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2008 Atheros Communications Inc.
+ * Copyright (c) 2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (c) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _LINUX_ATH9K_PLATFORM_H
+#define _LINUX_ATH9K_PLATFORM_H
+
+#define ATH9K_PLAT_EEP_MAX_WORDS	2048
+
+struct ath9k_platform_data {
+	const char *eeprom_name;
+
+	u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS];
+	u8 *macaddr;
+
+	int led_pin;
+	u32 gpio_mask;
+	u32 gpio_val;
+
+	bool endian_check;
+	bool is_clk_25mhz;
+	bool tx_gain_buffalo;
+	bool disable_2ghz;
+	bool disable_5ghz;
+
+	int (*get_mac_revision)(void);
+	int (*external_reset)(void);
+
+	bool use_eeprom;
+
+	int num_leds;
+	const struct gpio_led *leds;
+};
+
+#endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/trunk/target/linux/generic/files/include/linux/myloader.h b/trunk/target/linux/generic/files/include/linux/myloader.h
new file mode 100644
index 00000000..d89e415f
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/myloader.h
@@ -0,0 +1,121 @@
+/*
+ *  Compex's MyLoader specific definitions
+ *
+ *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#ifndef _MYLOADER_H_
+#define _MYLOADER_H_
+
+/* Myloader specific magic numbers */
+#define MYLO_MAGIC_SYS_PARAMS	0x20021107
+#define MYLO_MAGIC_PARTITIONS	0x20021103
+#define MYLO_MAGIC_BOARD_PARAMS	0x20021103
+
+/* Vendor ID's (seems to be same as the PCI vendor ID's) */
+#define VENID_COMPEX		0x11F6
+
+/* Devices based on the ADM5120 */
+#define DEVID_COMPEX_NP27G	0x0078
+#define DEVID_COMPEX_NP28G	0x044C
+#define DEVID_COMPEX_NP28GHS	0x044E
+#define DEVID_COMPEX_WP54Gv1C	0x0514
+#define DEVID_COMPEX_WP54G	0x0515
+#define DEVID_COMPEX_WP54AG	0x0546
+#define DEVID_COMPEX_WPP54AG	0x0550
+#define DEVID_COMPEX_WPP54G	0x0555
+
+/* Devices based on the Atheros AR2317 */
+#define DEVID_COMPEX_NP25G	0x05E6
+#define DEVID_COMPEX_WPE53G	0x05DC
+
+/* Devices based on the Atheros AR71xx */
+#define DEVID_COMPEX_WP543	0x0640
+#define DEVID_COMPEX_WPE72	0x0672
+
+/* Devices based on the IXP422 */
+#define DEVID_COMPEX_WP18	0x047E
+#define DEVID_COMPEX_NP18A	0x0489
+
+/* Other devices */
+#define DEVID_COMPEX_NP26G8M	0x03E8
+#define DEVID_COMPEX_NP26G16M	0x03E9
+
+struct mylo_partition {
+	uint16_t	flags;	/* partition flags */
+	uint16_t	type;	/* type of the partition */
+	uint32_t	addr;	/* relative address of the partition from the
+				   flash start */
+	uint32_t	size;	/* size of the partition in bytes */
+	uint32_t	param;	/* if this is the active partition, the
+				   MyLoader load code to this address */
+};
+
+#define PARTITION_FLAG_ACTIVE	0x8000 /* this is the active partition,
+					* MyLoader loads firmware from here */
+#define PARTITION_FLAG_ISRAM	0x2000 /* FIXME: this is a RAM partition? */
+#define PARTIIION_FLAG_RAMLOAD	0x1000 /* FIXME: load this partition into the RAM? */
+#define PARTITION_FLAG_PRELOAD	0x0800 /* the partition data preloaded to RAM
+					* before decompression */
+#define PARTITION_FLAG_LZMA	0x0100 /* partition data compressed by LZMA */
+#define PARTITION_FLAG_HAVEHDR  0x0002 /* the partition data have a header */
+
+#define PARTITION_TYPE_FREE	0
+#define PARTITION_TYPE_USED	1
+
+#define MYLO_MAX_PARTITIONS	8	/* maximum number of partitions in the
+					   partition table */
+
+struct mylo_partition_table {
+	uint32_t	magic;		/* must be MYLO_MAGIC_PARTITIONS */
+	uint32_t	res0;		/* unknown/unused */
+	uint32_t	res1;		/* unknown/unused */
+	uint32_t 	res2;		/* unknown/unused */
+	struct mylo_partition partitions[MYLO_MAX_PARTITIONS];
+};
+
+struct mylo_partition_header {
+	uint32_t	len;		/* length of the partition data */
+	uint32_t	crc;		/* CRC value of the partition data */
+};
+
+struct mylo_system_params {
+	uint32_t	magic;		/* must be MYLO_MAGIC_SYS_PARAMS */
+	uint32_t	res0;
+	uint32_t	res1;
+	uint32_t	mylo_ver;
+	uint16_t	vid;		/* Vendor ID */
+	uint16_t	did;		/* Device ID */
+	uint16_t	svid;		/* Sub Vendor ID */
+	uint16_t	sdid;		/* Sub Device ID */
+	uint32_t	rev;		/* device revision */
+	uint32_t	fwhi;
+	uint32_t	fwlo;
+	uint32_t	tftp_addr;
+	uint32_t	prog_start;
+	uint32_t	flash_size;	/* size of boot FLASH in bytes */
+	uint32_t	dram_size;	/* size of onboard RAM in bytes */
+};
+
+struct mylo_eth_addr {
+	uint8_t	mac[6];
+	uint8_t	csum[2];
+};
+
+#define MYLO_ETHADDR_COUNT	8	/* maximum number of ethernet address
+					   in the board parameters */
+
+struct mylo_board_params {
+	uint32_t	magic;	/* must be MYLO_MAGIC_BOARD_PARAMS */
+	uint32_t	res0;
+	uint32_t	res1;
+	uint32_t	res2;
+	struct mylo_eth_addr addr[MYLO_ETHADDR_COUNT];
+};
+
+#endif /* _MYLOADER_H_*/
diff --git a/trunk/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h b/trunk/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h
new file mode 100644
index 00000000..e4fcfafa
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/platform_data/adm6996-gpio.h
@@ -0,0 +1,30 @@
+/*
+ * ADM6996 GPIO platform data
+ *
+ * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+
+#ifndef __PLATFORM_ADM6996_GPIO_H
+#define __PLATFORM_ADM6996_GPIO_H
+
+#include <linux/kernel.h>
+
+enum adm6996_model {
+	ADM6996FC = 1,
+	ADM6996M = 2,
+	ADM6996L = 3,
+};
+
+struct adm6996_gpio_platform_data {
+	u8 eecs;
+	u8 eesk;
+	u8 eedi;
+	u8 eerc;
+	enum adm6996_model model;
+};
+
+#endif
diff --git a/trunk/target/linux/generic/files/include/linux/platform_data/b53.h b/trunk/target/linux/generic/files/include/linux/platform_data/b53.h
new file mode 100644
index 00000000..78427417
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/platform_data/b53.h
@@ -0,0 +1,36 @@
+/*
+ * B53 platform data
+ *
+ * Copyright (C) 2013 Jonas Gorski <jogo@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __B53_H
+#define __B53_H
+
+#include <linux/kernel.h>
+
+struct b53_platform_data {
+	u32 chip_id;
+	u16 enabled_ports;
+
+	/* allow to specify an ethX alias */
+	const char *alias;
+
+	/* only used by MMAP'd driver */
+	unsigned big_endian:1;
+	void __iomem *regs;
+};
+
+#endif
diff --git a/trunk/target/linux/generic/files/include/linux/platform_data/brcmfmac-sdio.h b/trunk/target/linux/generic/files/include/linux/platform_data/brcmfmac-sdio.h
new file mode 100644
index 00000000..1ade657d
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/platform_data/brcmfmac-sdio.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _LINUX_BRCMFMAC_PLATFORM_H
+#define _LINUX_BRCMFMAC_PLATFORM_H
+
+/*
+ * Platform specific driver functions and data. Through the platform specific
+ * device data functions can be provided to help the brcmfmac driver to
+ * operate with the device in combination with the used platform.
+ *
+ * Use the platform data in the following (similar) way:
+ *
+ *
+#include <brcmfmac_platform.h>
+
+
+static void brcmfmac_power_on(void)
+{
+}
+
+static void brcmfmac_power_off(void)
+{
+}
+
+static void brcmfmac_reset(void)
+{
+}
+
+static struct brcmfmac_sdio_platform_data brcmfmac_sdio_pdata = {
+	.power_on		= brcmfmac_power_on,
+	.power_off		= brcmfmac_power_off,
+	.reset			= brcmfmac_reset
+};
+
+static struct platform_device brcmfmac_device = {
+	.name			= BRCMFMAC_SDIO_PDATA_NAME,
+	.id			= PLATFORM_DEVID_NONE,
+	.dev.platform_data	= &brcmfmac_sdio_pdata
+};
+
+void __init brcmfmac_init_pdata(void)
+{
+	brcmfmac_sdio_pdata.oob_irq_supported = true;
+	brcmfmac_sdio_pdata.oob_irq_nr = gpio_to_irq(GPIO_BRCMF_SDIO_OOB);
+	brcmfmac_sdio_pdata.oob_irq_flags = IORESOURCE_IRQ |
+					    IORESOURCE_IRQ_HIGHLEVEL;
+	platform_device_register(&brcmfmac_device);
+}
+ *
+ *
+ * Note: the brcmfmac can be loaded as module or be statically built-in into
+ * the kernel. If built-in then do note that it uses module_init (and
+ * module_exit) routines which equal device_initcall. So if you intend to
+ * create a module with the platform specific data for the brcmfmac and have
+ * it built-in to the kernel then use a higher initcall then device_initcall
+ * (see init.h). If this is not done then brcmfmac will load without problems
+ * but will not pickup the platform data.
+ *
+ * When the driver does not "detect" platform driver data then it will continue
+ * without reporting anything and just assume there is no data needed. Which is
+ * probably true for most platforms.
+ *
+ * Explanation of the platform_data fields:
+ *
+ * drive_strength: is the preferred drive_strength to be used for the SDIO
+ * pins. If 0 then a default value will be used. This is the target drive
+ * strength, the exact drive strength which will be used depends on the
+ * capabilities of the device.
+ *
+ * oob_irq_supported: does the board have support for OOB interrupts. SDIO
+ * in-band interrupts are relatively slow and for having less overhead on
+ * interrupt processing an out of band interrupt can be used. If the HW
+ * supports this then enable this by setting this field to true and configure
+ * the oob related fields.
+ *
+ * oob_irq_nr, oob_irq_flags: the OOB interrupt information. The values are
+ * used for registering the irq using request_irq function.
+ *
+ * power_on: This function is called by the brcmfmac when the module gets
+ * loaded. This can be particularly useful for low power devices. The platform
+ * spcific routine may for example decide to power up the complete device.
+ * If there is no use-case for this function then provide NULL.
+ *
+ * power_off: This function is called by the brcmfmac when the module gets
+ * unloaded. At this point the device can be powered down or otherwise be reset.
+ * So if an actual power_off is not supported but reset is then reset the device
+ * when this function gets called. This can be particularly useful for low power
+ * devices. If there is no use-case for this function (either power-down or
+ * reset) then provide NULL.
+ *
+ * reset: This function can get called if the device communication broke down.
+ * This functionality is particularly useful in case of SDIO type devices. It is
+ * possible to reset a dongle via sdio data interface, but it requires that
+ * this is fully functional. This function is chip/module specific and this
+ * function should return only after the complete reset has completed.
+ */
+
+#define BRCMFMAC_SDIO_PDATA_NAME	"brcmfmac_sdio"
+
+struct brcmfmac_sdio_platform_data {
+	unsigned int drive_strength;
+	bool oob_irq_supported;
+	unsigned int oob_irq_nr;
+	unsigned long oob_irq_flags;
+	void (*power_on)(void);
+	void (*power_off)(void);
+	void (*reset)(void);
+};
+
+#endif /* _LINUX_BRCMFMAC_PLATFORM_H */
diff --git a/trunk/target/linux/generic/files/include/linux/routerboot.h b/trunk/target/linux/generic/files/include/linux/routerboot.h
new file mode 100644
index 00000000..3cda858c
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/routerboot.h
@@ -0,0 +1,106 @@
+/*
+ *  Mikrotik's RouterBOOT definitions
+ *
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#ifndef _ROUTERBOOT_H
+#define _ROUTERBOOT_H
+
+#define RB_MAC_SIZE		6
+
+/*
+ * Magic numbers
+ */
+#define RB_MAGIC_HARD	0x64726148 /* "Hard" */
+#define RB_MAGIC_SOFT	0x74666F53 /* "Soft" */
+#define RB_MAGIC_DAWN	0x6E776144 /* "Dawn" */
+
+#define RB_ID_TERMINATOR	0
+
+/*
+ * ID values for Hardware settings
+ */
+#define RB_ID_HARD_01		1
+#define RB_ID_HARD_02		2
+#define RB_ID_FLASH_INFO	3
+#define RB_ID_MAC_ADDRESS_PACK	4
+#define RB_ID_BOARD_NAME	5
+#define RB_ID_BIOS_VERSION	6
+#define RB_ID_HARD_07		7
+#define RB_ID_SDRAM_TIMINGS	8
+#define RB_ID_DEVICE_TIMINGS	9
+#define RB_ID_SOFTWARE_ID	10
+#define RB_ID_SERIAL_NUMBER	11
+#define RB_ID_HARD_12		12
+#define RB_ID_MEMORY_SIZE	13
+#define RB_ID_MAC_ADDRESS_COUNT	14
+#define RB_ID_HW_OPTIONS	21
+#define RB_ID_WLAN_DATA		22
+
+/*
+ * ID values for Software settings
+ */
+#define RB_ID_UART_SPEED	1
+#define RB_ID_BOOT_DELAY	2
+#define RB_ID_BOOT_DEVICE	3
+#define RB_ID_BOOT_KEY		4
+#define RB_ID_CPU_MODE		5
+#define RB_ID_FW_VERSION	6
+#define RB_ID_SOFT_07		7
+#define RB_ID_SOFT_08		8
+#define RB_ID_BOOT_PROTOCOL	9
+#define RB_ID_SOFT_10		10
+#define RB_ID_SOFT_11		11
+
+/*
+ * UART_SPEED values
+ */
+#define RB_UART_SPEED_115200	0
+#define RB_UART_SPEED_57600	1
+#define RB_UART_SPEED_38400	2
+#define RB_UART_SPEED_19200	3
+#define RB_UART_SPEED_9600	4
+#define RB_UART_SPEED_4800	5
+#define RB_UART_SPEED_2400	6
+#define RB_UART_SPEED_1200	7
+
+/*
+ * BOOT_DELAY values
+ */
+#define RB_BOOT_DELAY_0SEC	0
+#define RB_BOOT_DELAY_1SEC	1
+#define RB_BOOT_DELAY_2SEC	2
+
+/*
+ * BOOT_DEVICE values
+ */
+#define RB_BOOT_DEVICE_ETHER	0
+#define RB_BOOT_DEVICE_NANDETH	1
+#define RB_BOOT_DEVICE_ETHONCE	2
+#define RB_BOOT_DEVICE_NANDONLY	3
+
+/*
+ * BOOT_KEY values
+ */
+#define RB_BOOT_KEY_ANY		0
+#define RB_BOOT_KEY_DEL		1
+
+/*
+ * CPU_MODE values
+ */
+#define RB_CPU_MODE_POWERSAVE	0
+#define RB_CPU_MODE_REGULAR	1
+
+/*
+ * BOOT_PROTOCOL values
+ */
+#define RB_BOOT_PROTOCOL_BOOTP	0
+#define RB_BOOT_PROTOCOL_DHCP	1
+
+#endif /* _ROUTERBOOT_H */
diff --git a/trunk/target/linux/generic/files/include/linux/rt2x00_platform.h b/trunk/target/linux/generic/files/include/linux/rt2x00_platform.h
new file mode 100644
index 00000000..80483ef3
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/rt2x00_platform.h
@@ -0,0 +1,24 @@
+/*
+ * Platform data definition for the rt2x00 driver
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#ifndef _RT2X00_PLATFORM_H
+#define _RT2X00_PLATFORM_H
+
+struct rt2x00_platform_data {
+	char *eeprom_file_name;
+	const u8 *mac_address;
+
+	int disable_2ghz;
+	int disable_5ghz;
+	int clk_is_20mhz;
+};
+
+#endif /* _RT2X00_PLATFORM_H */
diff --git a/trunk/target/linux/generic/files/include/linux/rtl8366.h b/trunk/target/linux/generic/files/include/linux/rtl8366.h
new file mode 100644
index 00000000..78daed22
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/rtl8366.h
@@ -0,0 +1,40 @@
+/*
+ * Platform data definition for the Realtek RTL8366RB/S ethernet switch driver
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _RTL8366_H
+#define _RTL8366_H
+
+#define RTL8366_DRIVER_NAME	"rtl8366"
+#define RTL8366S_DRIVER_NAME	"rtl8366s"
+#define RTL8366RB_DRIVER_NAME	"rtl8366rb"
+
+enum rtl8366_type {
+	RTL8366_TYPE_UNKNOWN,
+	RTL8366_TYPE_S,
+	RTL8366_TYPE_RB,
+};
+
+struct rtl8366_initval {
+	unsigned	reg;
+	u16		val;
+};
+
+struct rtl8366_platform_data {
+	unsigned	gpio_sda;
+	unsigned	gpio_sck;
+	void		(*hw_reset)(bool active);
+
+	unsigned	num_initvals;
+	struct rtl8366_initval *initvals;
+};
+
+enum rtl8366_type rtl8366_smi_detect(struct rtl8366_platform_data *pdata);
+
+#endif /*  _RTL8366_H */
diff --git a/trunk/target/linux/generic/files/include/linux/rtl8367.h b/trunk/target/linux/generic/files/include/linux/rtl8367.h
new file mode 100644
index 00000000..855de6a5
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/rtl8367.h
@@ -0,0 +1,60 @@
+/*
+ * Platform data definition for the Realtek RTL8367 ethernet switch driver
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _RTL8367_H
+#define _RTL8367_H
+
+#define RTL8367_DRIVER_NAME	"rtl8367"
+#define RTL8367B_DRIVER_NAME	"rtl8367b"
+
+enum rtl8367_port_speed {
+	RTL8367_PORT_SPEED_10 = 0,
+	RTL8367_PORT_SPEED_100,
+	RTL8367_PORT_SPEED_1000,
+};
+
+struct rtl8367_port_ability {
+	int force_mode;
+	int nway;
+	int txpause;
+	int rxpause;
+	int link;
+	int duplex;
+	enum rtl8367_port_speed speed;
+};
+
+enum rtl8367_extif_mode {
+	RTL8367_EXTIF_MODE_DISABLED = 0,
+	RTL8367_EXTIF_MODE_RGMII,
+	RTL8367_EXTIF_MODE_MII_MAC,
+	RTL8367_EXTIF_MODE_MII_PHY,
+	RTL8367_EXTIF_MODE_TMII_MAC,
+	RTL8367_EXTIF_MODE_TMII_PHY,
+	RTL8367_EXTIF_MODE_GMII,
+	RTL8367_EXTIF_MODE_RGMII_33V,
+};
+
+struct rtl8367_extif_config {
+	unsigned int txdelay;
+	unsigned int rxdelay;
+	enum rtl8367_extif_mode mode;
+	struct rtl8367_port_ability ability;
+};
+
+struct rtl8367_platform_data {
+	unsigned gpio_sda;
+	unsigned gpio_sck;
+	void (*hw_reset)(bool active);
+
+	struct rtl8367_extif_config *extif0_cfg;
+	struct rtl8367_extif_config *extif1_cfg;
+};
+
+#endif /*  _RTL8367_H */
diff --git a/trunk/target/linux/generic/files/include/linux/switch.h b/trunk/target/linux/generic/files/include/linux/switch.h
new file mode 100644
index 00000000..b53431e0
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/linux/switch.h
@@ -0,0 +1,167 @@
+/*
+ * switch.h: Switch configuration API
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+#ifndef _LINUX_SWITCH_H
+#define _LINUX_SWITCH_H
+
+#include <net/genetlink.h>
+#include <uapi/linux/switch.h>
+
+struct switch_dev;
+struct switch_op;
+struct switch_val;
+struct switch_attr;
+struct switch_attrlist;
+struct switch_led_trigger;
+
+int register_switch(struct switch_dev *dev, struct net_device *netdev);
+void unregister_switch(struct switch_dev *dev);
+
+/**
+ * struct switch_attrlist - attribute list
+ *
+ * @n_attr: number of attributes
+ * @attr: pointer to the attributes array
+ */
+struct switch_attrlist {
+	int n_attr;
+	const struct switch_attr *attr;
+};
+
+enum switch_port_speed {
+	SWITCH_PORT_SPEED_UNKNOWN = 0,
+	SWITCH_PORT_SPEED_10 = 10,
+	SWITCH_PORT_SPEED_100 = 100,
+	SWITCH_PORT_SPEED_1000 = 1000,
+};
+
+struct switch_port_link {
+	bool link;
+	bool duplex;
+	bool aneg;
+	bool tx_flow;
+	bool rx_flow;
+	enum switch_port_speed speed;
+};
+
+struct switch_port_stats {
+	unsigned long tx_bytes;
+	unsigned long rx_bytes;
+};
+
+/**
+ * struct switch_dev_ops - switch driver operations
+ *
+ * @attr_global: global switch attribute list
+ * @attr_port: port attribute list
+ * @attr_vlan: vlan attribute list
+ *
+ * Callbacks:
+ *
+ * @get_vlan_ports: read the port list of a VLAN
+ * @set_vlan_ports: set the port list of a VLAN
+ *
+ * @get_port_pvid: get the primary VLAN ID of a port
+ * @set_port_pvid: set the primary VLAN ID of a port
+ *
+ * @apply_config: apply all changed settings to the switch
+ * @reset_switch: resetting the switch
+ */
+struct switch_dev_ops {
+	struct switch_attrlist attr_global, attr_port, attr_vlan;
+
+	int (*get_vlan_ports)(struct switch_dev *dev, struct switch_val *val);
+	int (*set_vlan_ports)(struct switch_dev *dev, struct switch_val *val);
+
+	int (*get_port_pvid)(struct switch_dev *dev, int port, int *val);
+	int (*set_port_pvid)(struct switch_dev *dev, int port, int val);
+
+	int (*apply_config)(struct switch_dev *dev);
+	int (*reset_switch)(struct switch_dev *dev);
+
+	int (*get_port_link)(struct switch_dev *dev, int port,
+			     struct switch_port_link *link);
+	int (*get_port_stats)(struct switch_dev *dev, int port,
+			      struct switch_port_stats *stats);
+};
+
+struct switch_dev {
+	struct device_node *of_node;
+	const struct switch_dev_ops *ops;
+	/* will be automatically filled */
+	char devname[IFNAMSIZ];
+
+	const char *name;
+	/* NB: either alias or netdev must be set */
+	const char *alias;
+	struct net_device *netdev;
+
+	int ports;
+	int vlans;
+	int cpu_port;
+
+	/* the following fields are internal for swconfig */
+	int id;
+	struct list_head dev_list;
+	unsigned long def_global, def_port, def_vlan;
+
+	struct mutex sw_mutex;
+	struct switch_port *portbuf;
+	struct switch_portmap *portmap;
+
+	char buf[128];
+
+#ifdef CONFIG_SWCONFIG_LEDS
+	struct switch_led_trigger *led_trigger;
+#endif
+};
+
+struct switch_port {
+	u32 id;
+	u32 flags;
+};
+
+struct switch_portmap {
+	u32 virt;
+	const char *s;
+};
+
+struct switch_val {
+	const struct switch_attr *attr;
+	int port_vlan;
+	int len;
+	union {
+		const char *s;
+		u32 i;
+		struct switch_port *ports;
+	} value;
+};
+
+struct switch_attr {
+	int disabled;
+	int type;
+	const char *name;
+	const char *description;
+
+	int (*set)(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val);
+	int (*get)(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val);
+
+	/* for driver internal use */
+	int id;
+	int ofs;
+	int max;
+};
+
+#endif /* _LINUX_SWITCH_H */
diff --git a/trunk/target/linux/generic/files/include/uapi/linux/switch.h b/trunk/target/linux/generic/files/include/uapi/linux/switch.h
new file mode 100644
index 00000000..a59b2395
--- /dev/null
+++ b/trunk/target/linux/generic/files/include/uapi/linux/switch.h
@@ -0,0 +1,103 @@
+/*
+ * switch.h: Switch configuration API
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#ifndef _UAPI_LINUX_SWITCH_H
+#define _UAPI_LINUX_SWITCH_H
+
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/netlink.h>
+#include <linux/genetlink.h>
+#ifndef __KERNEL__
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#endif
+
+/* main attributes */
+enum {
+	SWITCH_ATTR_UNSPEC,
+	/* global */
+	SWITCH_ATTR_TYPE,
+	/* device */
+	SWITCH_ATTR_ID,
+	SWITCH_ATTR_DEV_NAME,
+	SWITCH_ATTR_ALIAS,
+	SWITCH_ATTR_NAME,
+	SWITCH_ATTR_VLANS,
+	SWITCH_ATTR_PORTS,
+	SWITCH_ATTR_PORTMAP,
+	SWITCH_ATTR_CPU_PORT,
+	/* attributes */
+	SWITCH_ATTR_OP_ID,
+	SWITCH_ATTR_OP_TYPE,
+	SWITCH_ATTR_OP_NAME,
+	SWITCH_ATTR_OP_PORT,
+	SWITCH_ATTR_OP_VLAN,
+	SWITCH_ATTR_OP_VALUE_INT,
+	SWITCH_ATTR_OP_VALUE_STR,
+	SWITCH_ATTR_OP_VALUE_PORTS,
+	SWITCH_ATTR_OP_DESCRIPTION,
+	/* port lists */
+	SWITCH_ATTR_PORT,
+	SWITCH_ATTR_MAX
+};
+
+enum {
+	/* port map */
+	SWITCH_PORTMAP_PORTS,
+	SWITCH_PORTMAP_SEGMENT,
+	SWITCH_PORTMAP_VIRT,
+	SWITCH_PORTMAP_MAX
+};
+
+/* commands */
+enum {
+	SWITCH_CMD_UNSPEC,
+	SWITCH_CMD_GET_SWITCH,
+	SWITCH_CMD_NEW_ATTR,
+	SWITCH_CMD_LIST_GLOBAL,
+	SWITCH_CMD_GET_GLOBAL,
+	SWITCH_CMD_SET_GLOBAL,
+	SWITCH_CMD_LIST_PORT,
+	SWITCH_CMD_GET_PORT,
+	SWITCH_CMD_SET_PORT,
+	SWITCH_CMD_LIST_VLAN,
+	SWITCH_CMD_GET_VLAN,
+	SWITCH_CMD_SET_VLAN
+};
+
+/* data types */
+enum switch_val_type {
+	SWITCH_TYPE_UNSPEC,
+	SWITCH_TYPE_INT,
+	SWITCH_TYPE_STRING,
+	SWITCH_TYPE_PORTS,
+	SWITCH_TYPE_NOVAL,
+};
+
+/* port nested attributes */
+enum {
+	SWITCH_PORT_UNSPEC,
+	SWITCH_PORT_ID,
+	SWITCH_PORT_FLAG_TAGGED,
+	SWITCH_PORT_ATTR_MAX
+};
+
+#define SWITCH_ATTR_DEFAULTS_OFFSET	0x1000
+
+
+#endif /* _UAPI_LINUX_SWITCH_H */
diff --git a/trunk/target/linux/generic/image/Makefile b/trunk/target/linux/generic/image/Makefile
new file mode 100644
index 00000000..e733e0a3
--- /dev/null
+++ b/trunk/target/linux/generic/image/Makefile
@@ -0,0 +1,12 @@
+# 
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+
+# use default targets for everything
+
+$(eval $(call BuildImage))
diff --git a/trunk/target/linux/generic/image/initramfs-base-files.txt b/trunk/target/linux/generic/image/initramfs-base-files.txt
new file mode 100644
index 00000000..eda5d0d2
--- /dev/null
+++ b/trunk/target/linux/generic/image/initramfs-base-files.txt
@@ -0,0 +1,9 @@
+nod /dev/console 600 0 0 c 5 1
+nod /dev/null 666 0 0 c 1 3
+nod /dev/zero 666 0 0 c 1 5
+nod /dev/tty 666 0 0 c 5 0
+nod /dev/tty0 660 0 0 c 4 0
+nod /dev/tty1 660 0 0 c 4 1
+nod /dev/random 666 0 0 c 1 8
+nod /dev/urandom 666 0 0 c 1 9
+dir /dev/pts 755 0 0
diff --git a/trunk/target/linux/generic/image/lzma-loader/Makefile b/trunk/target/linux/generic/image/lzma-loader/Makefile
new file mode 100644
index 00000000..d75a4468
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/Makefile
@@ -0,0 +1,46 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := loader
+PKG_VERSION := 0.05
+
+PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)$(LOADER_TYPE)
+
+$(PKG_BUILD_DIR)/.prepared:
+	mkdir $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+	touch $@
+
+$(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma
+	PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" \
+		RAMSIZE=$(RAMSIZE) \
+		LOADADDR=$(LOADADDR) \
+		KERNEL_ENTRY=$(KERNEL_ENTRY) \
+		IMAGE_COPY=$(IMAGE_COPY)
+
+
+$(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma
+	$(CP) $< $@
+
+$(KDIR)/loader$(LOADER_TYPE).elf: $(PKG_BUILD_DIR)/lzma.elf
+	$(CP) $< $@
+
+$(KDIR)/loader$(LOADER_TYPE).bin: $(PKG_BUILD_DIR)/lzma.bin
+	$(CP) $< $@
+
+download: 
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: $(KDIR)/loader$(LOADER_TYPE).elf $(KDIR)/loader$(LOADER_TYPE).bin
+install:
+
+clean:
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(KDIR)/loader.elf
+	rm -f $(KDIR)/loader.bin
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.c b/trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.c
new file mode 100644
index 00000000..c90a0d3e
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.c
@@ -0,0 +1,590 @@
+/*
+  LzmaDecode.c
+  LZMA Decoder (optimized for Speed version)
+  
+  LZMA SDK 4.22 Copyright (c) 1999-2005 Igor Pavlov (2005-06-10)
+  http://www.7-zip.org/
+
+  LZMA SDK is licensed under two licenses:
+  1) GNU Lesser General Public License (GNU LGPL)
+  2) Common Public License (CPL)
+  It means that you can select one of these two licenses and 
+  follow rules of that license.
+
+  SPECIAL EXCEPTION:
+  Igor Pavlov, as the author of this Code, expressly permits you to 
+  statically or dynamically link your Code (or bind by name) to the 
+  interfaces of this file without subjecting your linked Code to the 
+  terms of the CPL or GNU LGPL. Any modifications or additions 
+  to this file, however, are subject to the LGPL or CPL terms.
+*/
+
+#include "LzmaDecode.h"
+
+#ifndef Byte
+#define Byte unsigned char
+#endif
+
+#define kNumTopBits 24
+#define kTopValue ((UInt32)1 << kNumTopBits)
+
+#define kNumBitModelTotalBits 11
+#define kBitModelTotal (1 << kNumBitModelTotalBits)
+#define kNumMoveBits 5
+
+#define RC_READ_BYTE (*Buffer++)
+
+#define RC_INIT2 Code = 0; Range = 0xFFFFFFFF; \
+  { int i; for(i = 0; i < 5; i++) { RC_TEST; Code = (Code << 8) | RC_READ_BYTE; }}
+
+#ifdef _LZMA_IN_CB
+
+#define RC_TEST { if (Buffer == BufferLim) \
+  { SizeT size; int result = InCallback->Read(InCallback, &Buffer, &size); if (result != LZMA_RESULT_OK) return result; \
+  BufferLim = Buffer + size; if (size == 0) return LZMA_RESULT_DATA_ERROR; }}
+
+#define RC_INIT Buffer = BufferLim = 0; RC_INIT2
+
+#else
+
+#define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; }
+
+#define RC_INIT(buffer, bufferSize) Buffer = buffer; BufferLim = buffer + bufferSize; RC_INIT2
+ 
+#endif
+
+#define RC_NORMALIZE if (Range < kTopValue) { RC_TEST; Range <<= 8; Code = (Code << 8) | RC_READ_BYTE; }
+
+#define IfBit0(p) RC_NORMALIZE; bound = (Range >> kNumBitModelTotalBits) * *(p); if (Code < bound)
+#define UpdateBit0(p) Range = bound; *(p) += (kBitModelTotal - *(p)) >> kNumMoveBits;
+#define UpdateBit1(p) Range -= bound; Code -= bound; *(p) -= (*(p)) >> kNumMoveBits;
+
+#define RC_GET_BIT2(p, mi, A0, A1) IfBit0(p) \
+  { UpdateBit0(p); mi <<= 1; A0; } else \
+  { UpdateBit1(p); mi = (mi + mi) + 1; A1; } 
+  
+#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;)               
+
+#define RangeDecoderBitTreeDecode(probs, numLevels, res) \
+  { int i = numLevels; res = 1; \
+  do { CProb *p = probs + res; RC_GET_BIT(p, res) } while(--i != 0); \
+  res -= (1 << numLevels); }
+
+
+#define kNumPosBitsMax 4
+#define kNumPosStatesMax (1 << kNumPosBitsMax)
+
+#define kLenNumLowBits 3
+#define kLenNumLowSymbols (1 << kLenNumLowBits)
+#define kLenNumMidBits 3
+#define kLenNumMidSymbols (1 << kLenNumMidBits)
+#define kLenNumHighBits 8
+#define kLenNumHighSymbols (1 << kLenNumHighBits)
+
+#define LenChoice 0
+#define LenChoice2 (LenChoice + 1)
+#define LenLow (LenChoice2 + 1)
+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
+#define kNumLenProbs (LenHigh + kLenNumHighSymbols) 
+
+
+#define kNumStates 12
+#define kNumLitStates 7
+
+#define kStartPosModelIndex 4
+#define kEndPosModelIndex 14
+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
+
+#define kNumPosSlotBits 6
+#define kNumLenToPosStates 4
+
+#define kNumAlignBits 4
+#define kAlignTableSize (1 << kNumAlignBits)
+
+#define kMatchMinLen 2
+
+#define IsMatch 0
+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
+#define IsRepG0 (IsRep + kNumStates)
+#define IsRepG1 (IsRepG0 + kNumStates)
+#define IsRepG2 (IsRepG1 + kNumStates)
+#define IsRep0Long (IsRepG2 + kNumStates)
+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
+#define LenCoder (Align + kAlignTableSize)
+#define RepLenCoder (LenCoder + kNumLenProbs)
+#define Literal (RepLenCoder + kNumLenProbs)
+
+#if Literal != LZMA_BASE_SIZE
+StopCompilingDueBUG
+#endif
+
+#if 0
+int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size)
+{
+  unsigned char prop0;
+  if (size < LZMA_PROPERTIES_SIZE)
+    return LZMA_RESULT_DATA_ERROR;
+  prop0 = propsData[0];
+  if (prop0 >= (9 * 5 * 5))
+    return LZMA_RESULT_DATA_ERROR;
+  {
+    for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 5));
+    for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9);
+    propsRes->lc = prop0;
+    /*
+    unsigned char remainder = (unsigned char)(prop0 / 9);
+    propsRes->lc = prop0 % 9;
+    propsRes->pb = remainder / 5;
+    propsRes->lp = remainder % 5;
+    */
+  }
+
+  #ifdef _LZMA_OUT_READ
+  {
+    int i;
+    propsRes->DictionarySize = 0;
+    for (i = 0; i < 4; i++)
+      propsRes->DictionarySize += (UInt32)(propsData[1 + i]) << (i * 8);
+    if (propsRes->DictionarySize == 0)
+      propsRes->DictionarySize = 1;
+  }
+  #endif
+  return LZMA_RESULT_OK;
+}
+#endif
+
+#define kLzmaStreamWasFinishedId (-1)
+
+int LzmaDecode(CLzmaDecoderState *vs,
+    #ifdef _LZMA_IN_CB
+    ILzmaInCallback *InCallback,
+    #else
+    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
+    #endif
+    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed)
+{
+  CProb *p = vs->Probs;
+  SizeT nowPos = 0;
+  Byte previousByte = 0;
+  UInt32 posStateMask = (1 << (vs->Properties.pb)) - 1;
+  UInt32 literalPosMask = (1 << (vs->Properties.lp)) - 1;
+  int lc = vs->Properties.lc;
+
+  #ifdef _LZMA_OUT_READ
+  
+  UInt32 Range = vs->Range;
+  UInt32 Code = vs->Code;
+  #ifdef _LZMA_IN_CB
+  const Byte *Buffer = vs->Buffer;
+  const Byte *BufferLim = vs->BufferLim;
+  #else
+  const Byte *Buffer = inStream;
+  const Byte *BufferLim = inStream + inSize;
+  #endif
+  int state = vs->State;
+  UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3];
+  int len = vs->RemainLen;
+  UInt32 globalPos = vs->GlobalPos;
+  UInt32 distanceLimit = vs->DistanceLimit;
+
+  Byte *dictionary = vs->Dictionary;
+  UInt32 dictionarySize = vs->Properties.DictionarySize;
+  UInt32 dictionaryPos = vs->DictionaryPos;
+
+  Byte tempDictionary[4];
+
+  #ifndef _LZMA_IN_CB
+  *inSizeProcessed = 0;
+  #endif
+  *outSizeProcessed = 0;
+  if (len == kLzmaStreamWasFinishedId)
+    return LZMA_RESULT_OK;
+
+  if (dictionarySize == 0)
+  {
+    dictionary = tempDictionary;
+    dictionarySize = 1;
+    tempDictionary[0] = vs->TempDictionary[0];
+  }
+
+  if (len == kLzmaNeedInitId)
+  {
+    {
+      UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
+      UInt32 i;
+      for (i = 0; i < numProbs; i++)
+        p[i] = kBitModelTotal >> 1; 
+      rep0 = rep1 = rep2 = rep3 = 1;
+      state = 0;
+      globalPos = 0;
+      distanceLimit = 0;
+      dictionaryPos = 0;
+      dictionary[dictionarySize - 1] = 0;
+      #ifdef _LZMA_IN_CB
+      RC_INIT;
+      #else
+      RC_INIT(inStream, inSize);
+      #endif
+    }
+    len = 0;
+  }
+  while(len != 0 && nowPos < outSize)
+  {
+    UInt32 pos = dictionaryPos - rep0;
+    if (pos >= dictionarySize)
+      pos += dictionarySize;
+    outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos];
+    if (++dictionaryPos == dictionarySize)
+      dictionaryPos = 0;
+    len--;
+  }
+  if (dictionaryPos == 0)
+    previousByte = dictionary[dictionarySize - 1];
+  else
+    previousByte = dictionary[dictionaryPos - 1];
+
+  #else /* if !_LZMA_OUT_READ */
+
+  int state = 0;
+  UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
+  int len = 0;
+  const Byte *Buffer;
+  const Byte *BufferLim;
+  UInt32 Range;
+  UInt32 Code;
+
+  #ifndef _LZMA_IN_CB
+  *inSizeProcessed = 0;
+  #endif
+  *outSizeProcessed = 0;
+
+  {
+    UInt32 i;
+    UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
+    for (i = 0; i < numProbs; i++)
+      p[i] = kBitModelTotal >> 1;
+  }
+  
+  #ifdef _LZMA_IN_CB
+  RC_INIT;
+  #else
+  RC_INIT(inStream, inSize);
+  #endif
+
+  #endif /* _LZMA_OUT_READ */
+
+  while(nowPos < outSize)
+  {
+    CProb *prob;
+    UInt32 bound;
+    int posState = (int)(
+        (nowPos 
+        #ifdef _LZMA_OUT_READ
+        + globalPos
+        #endif
+        )
+        & posStateMask);
+
+    prob = p + IsMatch + (state << kNumPosBitsMax) + posState;
+    IfBit0(prob)
+    {
+      int symbol = 1;
+      UpdateBit0(prob)
+      prob = p + Literal + (LZMA_LIT_SIZE * 
+        (((
+        (nowPos 
+        #ifdef _LZMA_OUT_READ
+        + globalPos
+        #endif
+        )
+        & literalPosMask) << lc) + (previousByte >> (8 - lc))));
+
+      if (state >= kNumLitStates)
+      {
+        int matchByte;
+        #ifdef _LZMA_OUT_READ
+        UInt32 pos = dictionaryPos - rep0;
+        if (pos >= dictionarySize)
+          pos += dictionarySize;
+        matchByte = dictionary[pos];
+        #else
+        matchByte = outStream[nowPos - rep0];
+        #endif
+        do
+        {
+          int bit;
+          CProb *probLit;
+          matchByte <<= 1;
+          bit = (matchByte & 0x100);
+          probLit = prob + 0x100 + bit + symbol;
+          RC_GET_BIT2(probLit, symbol, if (bit != 0) break, if (bit == 0) break)
+        }
+        while (symbol < 0x100);
+      }
+      while (symbol < 0x100)
+      {
+        CProb *probLit = prob + symbol;
+        RC_GET_BIT(probLit, symbol)
+      }
+      previousByte = (Byte)symbol;
+
+      outStream[nowPos++] = previousByte;
+      #ifdef _LZMA_OUT_READ
+      if (distanceLimit < dictionarySize)
+        distanceLimit++;
+
+      dictionary[dictionaryPos] = previousByte;
+      if (++dictionaryPos == dictionarySize)
+        dictionaryPos = 0;
+      #endif
+      if (state < 4) state = 0;
+      else if (state < 10) state -= 3;
+      else state -= 6;
+    }
+    else             
+    {
+      UpdateBit1(prob);
+      prob = p + IsRep + state;
+      IfBit0(prob)
+      {
+        UpdateBit0(prob);
+        rep3 = rep2;
+        rep2 = rep1;
+        rep1 = rep0;
+        state = state < kNumLitStates ? 0 : 3;
+        prob = p + LenCoder;
+      }
+      else
+      {
+        UpdateBit1(prob);
+        prob = p + IsRepG0 + state;
+        IfBit0(prob)
+        {
+          UpdateBit0(prob);
+          prob = p + IsRep0Long + (state << kNumPosBitsMax) + posState;
+          IfBit0(prob)
+          {
+            #ifdef _LZMA_OUT_READ
+            UInt32 pos;
+            #endif
+            UpdateBit0(prob);
+            
+            #ifdef _LZMA_OUT_READ
+            if (distanceLimit == 0)
+            #else
+            if (nowPos == 0)
+            #endif
+              return LZMA_RESULT_DATA_ERROR;
+            
+            state = state < kNumLitStates ? 9 : 11;
+            #ifdef _LZMA_OUT_READ
+            pos = dictionaryPos - rep0;
+            if (pos >= dictionarySize)
+              pos += dictionarySize;
+            previousByte = dictionary[pos];
+            dictionary[dictionaryPos] = previousByte;
+            if (++dictionaryPos == dictionarySize)
+              dictionaryPos = 0;
+            #else
+            previousByte = outStream[nowPos - rep0];
+            #endif
+            outStream[nowPos++] = previousByte;
+            #ifdef _LZMA_OUT_READ
+            if (distanceLimit < dictionarySize)
+              distanceLimit++;
+            #endif
+
+            continue;
+          }
+          else
+          {
+            UpdateBit1(prob);
+          }
+        }
+        else
+        {
+          UInt32 distance;
+          UpdateBit1(prob);
+          prob = p + IsRepG1 + state;
+          IfBit0(prob)
+          {
+            UpdateBit0(prob);
+            distance = rep1;
+          }
+          else 
+          {
+            UpdateBit1(prob);
+            prob = p + IsRepG2 + state;
+            IfBit0(prob)
+            {
+              UpdateBit0(prob);
+              distance = rep2;
+            }
+            else
+            {
+              UpdateBit1(prob);
+              distance = rep3;
+              rep3 = rep2;
+            }
+            rep2 = rep1;
+          }
+          rep1 = rep0;
+          rep0 = distance;
+        }
+        state = state < kNumLitStates ? 8 : 11;
+        prob = p + RepLenCoder;
+      }
+      {
+        int numBits, offset;
+        CProb *probLen = prob + LenChoice;
+        IfBit0(probLen)
+        {
+          UpdateBit0(probLen);
+          probLen = prob + LenLow + (posState << kLenNumLowBits);
+          offset = 0;
+          numBits = kLenNumLowBits;
+        }
+        else
+        {
+          UpdateBit1(probLen);
+          probLen = prob + LenChoice2;
+          IfBit0(probLen)
+          {
+            UpdateBit0(probLen);
+            probLen = prob + LenMid + (posState << kLenNumMidBits);
+            offset = kLenNumLowSymbols;
+            numBits = kLenNumMidBits;
+          }
+          else
+          {
+            UpdateBit1(probLen);
+            probLen = prob + LenHigh;
+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
+            numBits = kLenNumHighBits;
+          }
+        }
+        RangeDecoderBitTreeDecode(probLen, numBits, len);
+        len += offset;
+      }
+
+      if (state < 4)
+      {
+        int posSlot;
+        state += kNumLitStates;
+        prob = p + PosSlot +
+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << 
+            kNumPosSlotBits);
+        RangeDecoderBitTreeDecode(prob, kNumPosSlotBits, posSlot);
+        if (posSlot >= kStartPosModelIndex)
+        {
+          int numDirectBits = ((posSlot >> 1) - 1);
+          rep0 = (2 | ((UInt32)posSlot & 1));
+          if (posSlot < kEndPosModelIndex)
+          {
+            rep0 <<= numDirectBits;
+            prob = p + SpecPos + rep0 - posSlot - 1;
+          }
+          else
+          {
+            numDirectBits -= kNumAlignBits;
+            do
+            {
+              RC_NORMALIZE
+              Range >>= 1;
+              rep0 <<= 1;
+              if (Code >= Range)
+              {
+                Code -= Range;
+                rep0 |= 1;
+              }
+            }
+            while (--numDirectBits != 0);
+            prob = p + Align;
+            rep0 <<= kNumAlignBits;
+            numDirectBits = kNumAlignBits;
+          }
+          {
+            int i = 1;
+            int mi = 1;
+            do
+            {
+              CProb *prob3 = prob + mi;
+              RC_GET_BIT2(prob3, mi, ; , rep0 |= i);
+              i <<= 1;
+            }
+            while(--numDirectBits != 0);
+          }
+        }
+        else
+          rep0 = posSlot;
+        if (++rep0 == (UInt32)(0))
+        {
+          /* it's for stream version */
+          len = kLzmaStreamWasFinishedId;
+          break;
+        }
+      }
+
+      len += kMatchMinLen;
+      #ifdef _LZMA_OUT_READ
+      if (rep0 > distanceLimit) 
+      #else
+      if (rep0 > nowPos)
+      #endif
+        return LZMA_RESULT_DATA_ERROR;
+
+      #ifdef _LZMA_OUT_READ
+      if (dictionarySize - distanceLimit > (UInt32)len)
+        distanceLimit += len;
+      else
+        distanceLimit = dictionarySize;
+      #endif
+
+      do
+      {
+        #ifdef _LZMA_OUT_READ
+        UInt32 pos = dictionaryPos - rep0;
+        if (pos >= dictionarySize)
+          pos += dictionarySize;
+        previousByte = dictionary[pos];
+        dictionary[dictionaryPos] = previousByte;
+        if (++dictionaryPos == dictionarySize)
+          dictionaryPos = 0;
+        #else
+        previousByte = outStream[nowPos - rep0];
+        #endif
+        len--;
+        outStream[nowPos++] = previousByte;
+      }
+      while(len != 0 && nowPos < outSize);
+    }
+  }
+  RC_NORMALIZE;
+
+  #ifdef _LZMA_OUT_READ
+  vs->Range = Range;
+  vs->Code = Code;
+  vs->DictionaryPos = dictionaryPos;
+  vs->GlobalPos = globalPos + (UInt32)nowPos;
+  vs->DistanceLimit = distanceLimit;
+  vs->Reps[0] = rep0;
+  vs->Reps[1] = rep1;
+  vs->Reps[2] = rep2;
+  vs->Reps[3] = rep3;
+  vs->State = state;
+  vs->RemainLen = len;
+  vs->TempDictionary[0] = tempDictionary[0];
+  #endif
+
+  #ifdef _LZMA_IN_CB
+  vs->Buffer = Buffer;
+  vs->BufferLim = BufferLim;
+  #else
+  *inSizeProcessed = (SizeT)(Buffer - inStream);
+  #endif
+  *outSizeProcessed = nowPos;
+  return LZMA_RESULT_OK;
+}
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.h b/trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.h
new file mode 100644
index 00000000..213062af
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/LzmaDecode.h
@@ -0,0 +1,131 @@
+/* 
+  LzmaDecode.h
+  LZMA Decoder interface
+
+  LZMA SDK 4.21 Copyright (c) 1999-2005 Igor Pavlov (2005-06-08)
+  http://www.7-zip.org/
+
+  LZMA SDK is licensed under two licenses:
+  1) GNU Lesser General Public License (GNU LGPL)
+  2) Common Public License (CPL)
+  It means that you can select one of these two licenses and 
+  follow rules of that license.
+
+  SPECIAL EXCEPTION:
+  Igor Pavlov, as the author of this code, expressly permits you to 
+  statically or dynamically link your code (or bind by name) to the 
+  interfaces of this file without subjecting your linked code to the 
+  terms of the CPL or GNU LGPL. Any modifications or additions 
+  to this file, however, are subject to the LGPL or CPL terms.
+*/
+
+#ifndef __LZMADECODE_H
+#define __LZMADECODE_H
+
+/* #define _LZMA_IN_CB */
+/* Use callback for input data */
+
+/* #define _LZMA_OUT_READ */
+/* Use read function for output data */
+
+/* #define _LZMA_PROB32 */
+/* It can increase speed on some 32-bit CPUs, 
+   but memory usage will be doubled in that case */
+
+/* #define _LZMA_LOC_OPT */
+/* Enable local speed optimizations inside code */
+
+/* #define _LZMA_SYSTEM_SIZE_T */
+/* Use system's size_t. You can use it to enable 64-bit sizes supporting*/
+
+#ifndef UInt32
+#ifdef _LZMA_UINT32_IS_ULONG
+#define UInt32 unsigned long
+#else
+#define UInt32 unsigned int
+#endif
+#endif
+
+#ifndef SizeT
+#ifdef _LZMA_SYSTEM_SIZE_T
+#include <stddef.h>
+#define SizeT size_t
+#else
+#define SizeT UInt32
+#endif
+#endif
+
+#ifdef _LZMA_PROB32
+#define CProb UInt32
+#else
+#define CProb unsigned short
+#endif
+
+#define LZMA_RESULT_OK 0
+#define LZMA_RESULT_DATA_ERROR 1
+
+#ifdef _LZMA_IN_CB
+typedef struct _ILzmaInCallback
+{
+  int (*Read)(void *object, const unsigned char **buffer, SizeT *bufferSize);
+} ILzmaInCallback;
+#endif
+
+#define LZMA_BASE_SIZE 1846
+#define LZMA_LIT_SIZE 768
+
+#define LZMA_PROPERTIES_SIZE 5
+
+typedef struct _CLzmaProperties
+{
+  int lc;
+  int lp;
+  int pb;
+  #ifdef _LZMA_OUT_READ
+  UInt32 DictionarySize;
+  #endif
+}CLzmaProperties;
+
+int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size);
+
+#define LzmaGetNumProbs(Properties) (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((Properties)->lc + (Properties)->lp)))
+
+#define kLzmaNeedInitId (-2)
+
+typedef struct _CLzmaDecoderState
+{
+  CLzmaProperties Properties;
+  CProb *Probs;
+
+  #ifdef _LZMA_IN_CB
+  const unsigned char *Buffer;
+  const unsigned char *BufferLim;
+  #endif
+
+  #ifdef _LZMA_OUT_READ
+  unsigned char *Dictionary;
+  UInt32 Range;
+  UInt32 Code;
+  UInt32 DictionaryPos;
+  UInt32 GlobalPos;
+  UInt32 DistanceLimit;
+  UInt32 Reps[4];
+  int State;
+  int RemainLen;
+  unsigned char TempDictionary[4];
+  #endif
+} CLzmaDecoderState;
+
+#ifdef _LZMA_OUT_READ
+#define LzmaDecoderInit(vs) { (vs)->RemainLen = kLzmaNeedInitId; }
+#endif
+
+int LzmaDecode(CLzmaDecoderState *vs,
+    #ifdef _LZMA_IN_CB
+    ILzmaInCallback *inCallback,
+    #else
+    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
+    #endif
+    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed);
+
+#endif
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/Makefile b/trunk/target/linux/generic/image/lzma-loader/src/Makefile
new file mode 100644
index 00000000..910172c4
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/Makefile
@@ -0,0 +1,68 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+RAMSTART = 0x80000000
+RAMSIZE = 0x00100000		# 1MB
+LOADADDR = 0x80400000		# RAM start + 4M
+KERNEL_ENTRY = 0x80001000
+IMAGE_COPY:=0
+
+CROSS_COMPILE = mips-linux-
+
+OBJCOPY:= $(CROSS_COMPILE)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S
+CFLAGS := -fno-builtin -Os -G 0 -ffunction-sections -mno-abicalls -fno-pic -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -Wall -DRAMSTART=${RAMSTART} -DRAMSIZE=${RAMSIZE} -DKERNEL_ENTRY=${KERNEL_ENTRY} -D_LZMA_IN_CB
+ifeq ($(IMAGE_COPY),1)
+CFLAGS += -DLOADADDR=${LOADADDR} -DIMAGE_COPY=1
+endif
+
+.S.s:
+	$(CPP) $(CFLAGS) $< -o $*.s
+.S.o:
+	$(CC) $(CFLAGS) -c $< -o $*.o
+.c.o:
+	$(CC) $(CFLAGS) -c $< -o $*.o
+
+CC =       $(CROSS_COMPILE)gcc
+LD =       $(CROSS_COMPILE)ld
+OBJDUMP =  $(CROSS_COMPILE)objdump
+
+O_FORMAT = $(shell $(OBJDUMP) -i | head -2 | grep elf32)
+
+# Drop some uninteresting sections in the kernel.
+# This is only relevant for ELF kernels but doesn't hurt a.out
+drop-sections   = .reginfo .mdebug .comment
+strip-flags     = $(addprefix --remove-section=,$(drop-sections))
+
+all : lzma.elf lzma.bin
+
+lzma.lds: lzma.lds.in
+	sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,_start,g' $< >$@
+
+kernel.o: vmlinux.lzma lzma.lds
+	$(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
+
+lzma.bin: lzma.elf
+	$(OBJCOPY) $< $@
+
+ifeq ($(IMAGE_COPY),1)
+LOADER_ENTRY ?= $(KERNEL_ENTRY)
+lzma.o: decompress.o LzmaDecode.o kernel.o
+	sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,entry,g' lzma.lds.in >lzma-stage2.lds
+	$(LD) -static --no-warn-mismatch -e entry -Tlzma-stage2.lds -o temp-$@ $^
+	$(OBJCOPY) temp-$@ lzma.tmp
+	@echo "SECTIONS { .data : { code_start = .; *(.data) code_stop = .; }}" > lzma-data.lds
+	$(LD) -no-warn-mismatch -T lzma-data.lds -r -o $@ -b binary lzma.tmp --oformat $(O_FORMAT)
+	
+lzma.elf: start.o lzma.o
+	sed -e 's,@LOADADDR@,$(LOADER_ENTRY),g' lzma-copy.lds.in >lzma-copy.lds
+	$(LD) -s -Tlzma-copy.lds -o $@ $^
+else
+lzma.elf: start.o decompress.o LzmaDecode.o kernel.o
+	$(LD) -s -Tlzma.lds -o $@ $^
+endif
+
+clean:
+	rm -f *.o lzma.elf lzma.bin *.tmp *.lds
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/decompress.c b/trunk/target/linux/generic/image/lzma-loader/src/decompress.c
new file mode 100644
index 00000000..45ac509c
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/decompress.c
@@ -0,0 +1,157 @@
+/*
+ * LZMA compressed kernel decompressor for bcm947xx boards
+ *
+ * Copyright (C) 2005 by Oleg I. Vdovikin <oleg@cs.msu.su>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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
+ *
+ *
+ * Please note, this was code based on the bunzip2 decompressor code
+ * by Manuel Novoa III  (mjn3@codepoet.org), although the only thing left
+ * is an idea and part of original vendor code
+ *
+ *
+ * 12-Mar-2005  Mineharu Takahara <mtakahar@yahoo.com>
+ *   pass actual output size to decoder (stream mode
+ *   compressed input is not a requirement anymore)
+ *
+ * 24-Apr-2005 Oleg I. Vdovikin
+ *   reordered functions using lds script, removed forward decl
+ *
+ * ??-Nov-2005 Mike Baker
+ *   reorder the script as an lzma wrapper; do not depend on flash access
+ */
+
+#include "LzmaDecode.h"
+
+#define KSEG0			0x80000000
+#define KSEG1			0xa0000000
+
+#define KSEG1ADDR(a)		((((unsigned)(a)) & 0x1fffffffU) | KSEG1)
+
+#define Index_Invalidate_I	0x00
+#define Index_Writeback_Inv_D   0x01
+
+#define cache_unroll(base,op)	\
+	__asm__ __volatile__(		\
+		".set noreorder;\n"		\
+		".set mips3;\n"			\
+		"cache %1, (%0);\n"		\
+		".set mips0;\n"			\
+		".set reorder\n"		\
+		:						\
+		: "r" (base),			\
+		  "i" (op));
+
+
+static __inline__ void blast_icache(unsigned long size, unsigned long lsize)
+{
+	unsigned long start = KSEG0;
+	unsigned long end = (start + size);
+
+	while(start < end) {
+		cache_unroll(start,Index_Invalidate_I);
+		start += lsize;
+	}
+}
+
+static __inline__ void blast_dcache(unsigned long size, unsigned long lsize)
+{
+	unsigned long start = KSEG0;
+	unsigned long end = (start + size);
+
+	while(start < end) {
+		cache_unroll(start,Index_Writeback_Inv_D);
+		start += lsize;
+	}
+}
+
+unsigned char *data;
+
+static int read_byte(void *object, unsigned char **buffer, UInt32 *bufferSize)
+{
+	*bufferSize = 1;
+	*buffer = data;
+	++data;
+	return LZMA_RESULT_OK;
+}
+
+static __inline__ unsigned char get_byte(void)
+{
+	unsigned char *buffer;
+	UInt32 fake;
+	
+	return read_byte(0, &buffer, &fake), *buffer;
+}
+
+/* This puts lzma workspace 128k below RAM end. 
+ * That should be enough for both lzma and stack
+ */
+static char *buffer = (char *)(RAMSTART + RAMSIZE - 0x00020000);
+extern char lzma_start[];
+extern char lzma_end[];
+
+/* should be the first function */
+void entry(unsigned long icache_size, unsigned long icache_lsize, 
+	unsigned long dcache_size, unsigned long dcache_lsize)
+{
+	unsigned int i;  /* temp value */
+	unsigned int osize; /* uncompressed size */
+	volatile unsigned int arg0, arg1, arg2, arg3;
+
+	/* restore argument registers */
+	__asm__ __volatile__ ("ori %0, $12, 0":"=r"(arg0));
+	__asm__ __volatile__ ("ori %0, $13, 0":"=r"(arg1));
+	__asm__ __volatile__ ("ori %0, $14, 0":"=r"(arg2));
+	__asm__ __volatile__ ("ori %0, $15, 0":"=r"(arg3));
+
+	ILzmaInCallback callback;
+	CLzmaDecoderState vs;
+	callback.Read = read_byte;
+
+	data = lzma_start;
+
+	/* lzma args */
+	i = get_byte();
+	vs.Properties.lc = i % 9, i = i / 9;
+	vs.Properties.lp = i % 5, vs.Properties.pb = i / 5;
+
+	vs.Probs = (CProb *)buffer;
+
+	/* skip rest of the LZMA coder property */
+	for (i = 0; i < 4; i++)
+		get_byte();
+
+	/* read the lower half of uncompressed size in the header */
+	osize = ((unsigned int)get_byte()) +
+		((unsigned int)get_byte() << 8) +
+		((unsigned int)get_byte() << 16) +
+		((unsigned int)get_byte() << 24);
+
+	/* skip rest of the header (upper half of uncompressed size) */
+	for (i = 0; i < 4; i++) 
+		get_byte();
+
+	/* decompress kernel */
+	if ((i = LzmaDecode(&vs, &callback,
+	(unsigned char*)KERNEL_ENTRY, osize, &osize)) == LZMA_RESULT_OK)
+	{
+		blast_dcache(dcache_size, dcache_lsize);
+		blast_icache(icache_size, icache_lsize);
+
+		/* Jump to load address */
+		((void (*)(int a0, int a1, int a2, int a3)) KERNEL_ENTRY)(arg0, arg1, arg2, arg3);
+	}
+}
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/lzma-copy.lds.in b/trunk/target/linux/generic/image/lzma-loader/src/lzma-copy.lds.in
new file mode 100644
index 00000000..fbc87ab8
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/lzma-copy.lds.in
@@ -0,0 +1,20 @@
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  . = @LOADADDR@;
+  .text      :
+  {
+    _ftext = . ;
+    *(.text)
+    *(.rodata)
+  } =0
+
+  .reginfo : { *(.reginfo) }
+
+  .bss       :
+  {
+   *(.bss)
+  }
+}
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/lzma.lds.in b/trunk/target/linux/generic/image/lzma-loader/src/lzma.lds.in
new file mode 100644
index 00000000..6021cec0
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/lzma.lds.in
@@ -0,0 +1,24 @@
+OUTPUT_ARCH(mips)
+ENTRY(@ENTRY@)
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  . = @LOADADDR@;
+  .text      :
+  {
+    _ftext = . ;
+    *(.text.entry)
+    *(.text)
+    *(.rodata)
+    lzma_start = .;
+    kernel.o
+    lzma_end = .;
+  } =0
+
+  .reginfo : { *(.reginfo) }
+
+  .bss       :
+  {
+   *(.bss)
+  }
+}
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/print.c b/trunk/target/linux/generic/image/lzma-loader/src/print.c
new file mode 100644
index 00000000..950687be
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/print.c
@@ -0,0 +1,324 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include	"print.h"
+
+/* macros */
+#define		IsDigit(x)	( ((x) >= '0') && ((x) <= '9') )
+#define		Ctod(x)		( (x) - '0')
+
+/* forward declaration */
+extern int PrintChar(char *, char, int, int);
+extern int PrintString(char *, char *, int, int);
+extern int PrintNum(char *, unsigned long, int, int, int, int, char, int);
+
+/* private variable */
+static const char theFatalMsg[] = "fatal error in lp_Print!";
+
+/* -*-
+ * A low level printf() function.
+ */
+void
+lp_Print(void (*output)(void *, char *, int), 
+	 void * arg,
+	 char *fmt, 
+	 va_list ap)
+{
+
+#define 	OUTPUT(arg, s, l)  \
+  { if (((l) < 0) || ((l) > LP_MAX_BUF)) { \
+       (*output)(arg, (char*)theFatalMsg, sizeof(theFatalMsg)-1); for(;;); \
+    } else { \
+      (*output)(arg, s, l); \
+    } \
+  }
+    
+    char buf[LP_MAX_BUF];
+
+    char c;
+    char *s;
+    long int num;
+
+    int longFlag;
+    int negFlag;
+    int width;
+    int prec;
+    int ladjust;
+    char padc;
+
+    int length;
+
+    for(;;) {
+	{ 
+	    /* scan for the next '%' */
+	    char *fmtStart = fmt;
+	    while ( (*fmt != '\0') && (*fmt != '%')) {
+		fmt ++;
+	    }
+
+	    /* flush the string found so far */
+	    OUTPUT(arg, fmtStart, fmt-fmtStart);
+
+	    /* are we hitting the end? */
+	    if (*fmt == '\0') break;
+	}
+
+	/* we found a '%' */
+	fmt ++;
+	
+	/* check for long */
+	if (*fmt == 'l') {
+	    longFlag = 1;
+	    fmt ++;
+	} else {
+	    longFlag = 0;
+	}
+
+	/* check for other prefixes */
+	width = 0;
+	prec = -1;
+	ladjust = 0;
+	padc = ' ';
+
+	if (*fmt == '-') {
+	    ladjust = 1;
+	    fmt ++;
+	}
+
+	if (*fmt == '0') {
+	    padc = '0';
+	    fmt++;
+	}
+
+	if (IsDigit(*fmt)) {
+	    while (IsDigit(*fmt)) {
+		width = 10 * width + Ctod(*fmt++);
+	    }
+	}
+
+	if (*fmt == '.') {
+	    fmt ++;
+	    if (IsDigit(*fmt)) {
+		prec = 0;
+		while (IsDigit(*fmt)) {
+		    prec = prec*10 + Ctod(*fmt++);
+		}
+	    }
+	}
+
+
+	/* check format flag */
+	negFlag = 0;
+	switch (*fmt) {
+	 case 'b':
+	    if (longFlag) { 
+		num = va_arg(ap, long int); 
+	    } else { 
+		num = va_arg(ap, int);
+	    }
+	    length = PrintNum(buf, num, 2, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'd':
+	 case 'D':
+	    if (longFlag) { 
+		num = va_arg(ap, long int);
+	    } else { 
+		num = va_arg(ap, int); 
+	    }
+	    if (num < 0) {
+		num = - num;
+		negFlag = 1;
+	    }
+	    length = PrintNum(buf, num, 10, negFlag, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'o':
+	 case 'O':
+	    if (longFlag) { 
+		num = va_arg(ap, long int);
+	    } else { 
+		num = va_arg(ap, int); 
+	    }
+	    length = PrintNum(buf, num, 8, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'u':
+	 case 'U':
+	    if (longFlag) { 
+		num = va_arg(ap, long int);
+	    } else { 
+		num = va_arg(ap, int); 
+	    }
+	    length = PrintNum(buf, num, 10, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+	    
+	 case 'x':
+	    if (longFlag) { 
+		num = va_arg(ap, long int);
+	    } else { 
+		num = va_arg(ap, int); 
+	    }
+	    length = PrintNum(buf, num, 16, 0, width, ladjust, padc, 0);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'X':
+	    if (longFlag) { 
+		num = va_arg(ap, long int);
+	    } else { 
+		num = va_arg(ap, int); 
+	    }
+	    length = PrintNum(buf, num, 16, 0, width, ladjust, padc, 1);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 'c':
+	    c = (char)va_arg(ap, int);
+	    length = PrintChar(buf, c, width, ladjust);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case 's':
+	    s = (char*)va_arg(ap, char *);
+	    length = PrintString(buf, s, width, ladjust);
+	    OUTPUT(arg, buf, length);
+	    break;
+
+	 case '\0':
+	    fmt --;
+	    break;
+
+	 default:
+	    /* output this char as it is */
+	    OUTPUT(arg, fmt, 1);
+	}	/* switch (*fmt) */
+
+	fmt ++;
+    }		/* for(;;) */
+
+    /* special termination call */
+    OUTPUT(arg, "\0", 1);
+}
+
+
+/* --------------- local help functions --------------------- */
+int
+PrintChar(char * buf, char c, int length, int ladjust)
+{
+    int i;
+    
+    if (length < 1) length = 1;
+    if (ladjust) {
+	*buf = c;
+	for (i=1; i< length; i++) buf[i] = ' ';
+    } else {
+	for (i=0; i< length-1; i++) buf[i] = ' ';
+	buf[length - 1] = c;
+    }
+    return length;
+}
+
+int
+PrintString(char * buf, char* s, int length, int ladjust)
+{
+    int i;
+    int len=0;
+    char* s1 = s;
+    while (*s1++) len++;
+    if (length < len) length = len;
+
+    if (ladjust) {
+	for (i=0; i< len; i++) buf[i] = s[i];
+	for (i=len; i< length; i++) buf[i] = ' ';
+    } else {
+	for (i=0; i< length-len; i++) buf[i] = ' ';
+	for (i=length-len; i < length; i++) buf[i] = s[i-length+len];
+    }
+    return length;
+}
+
+int
+PrintNum(char * buf, unsigned long u, int base, int negFlag, 
+	 int length, int ladjust, char padc, int upcase)
+{
+    /* algorithm :
+     *  1. prints the number from left to right in reverse form.
+     *  2. fill the remaining spaces with padc if length is longer than
+     *     the actual length
+     *     TRICKY : if left adjusted, no "0" padding.
+     *		    if negtive, insert  "0" padding between "0" and number.
+     *  3. if (!ladjust) we reverse the whole string including paddings
+     *  4. otherwise we only reverse the actual string representing the num.
+     */
+
+    int actualLength =0;
+    char *p = buf;
+    int i;
+
+    do {
+	int tmp = u %base;
+	if (tmp <= 9) {
+	    *p++ = '0' + tmp;
+	} else if (upcase) {
+	    *p++ = 'A' + tmp - 10;
+	} else {
+	    *p++ = 'a' + tmp - 10;
+	}
+	u /= base;
+    } while (u != 0);
+
+    if (negFlag) {
+	*p++ = '-';
+    }
+
+    /* figure out actual length and adjust the maximum length */
+    actualLength = p - buf;
+    if (length < actualLength) length = actualLength;
+
+    /* add padding */
+    if (ladjust) {
+	padc = ' ';
+    }
+    if (negFlag && !ladjust && (padc == '0')) {
+	for (i = actualLength-1; i< length-1; i++) buf[i] = padc;
+	buf[length -1] = '-';
+    } else {
+	for (i = actualLength; i< length; i++) buf[i] = padc;
+    }
+	    
+
+    /* prepare to reverse the string */
+    {
+	int begin = 0;
+	int end;
+	if (ladjust) {
+	    end = actualLength - 1;
+	} else {
+	    end = length -1;
+	}
+
+	while (end > begin) {
+	    char tmp = buf[begin];
+	    buf[begin] = buf[end];
+	    buf[end] = tmp;
+	    begin ++;
+	    end --;
+	}
+    }
+
+    /* adjust the string pointer */
+    return length;
+}
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/print.h b/trunk/target/linux/generic/image/lzma-loader/src/print.h
new file mode 100644
index 00000000..b0514639
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/print.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#ifndef _print_h_
+#define _print_h_
+
+#include <stdarg.h>
+
+/* this is the maximum width for a variable */
+#define		LP_MAX_BUF	80
+
+/* -*-
+ * output function takes an void pointer which is passed in as the
+ * second argument in lp_Print().  This black-box argument gives output
+ * function a way to track state.
+ *
+ * The second argument in output function is a pointer to char buffer.
+ * The third argument specifies the number of chars to outputed.
+ *
+ * output function cannot assume the buffer is null-terminated after
+ * l number of chars.
+ */
+void lp_Print(void (*output)(void *, char *, int), 
+	      void * arg,
+	      char *fmt, 
+	      va_list ap);
+
+#endif
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/printf.c b/trunk/target/linux/generic/image/lzma-loader/src/printf.c
new file mode 100644
index 00000000..49bd50d7
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/printf.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include "printf.h"
+#include "print.h"
+#include "uart16550.h"
+
+static void myoutput(void *arg, char *s, int l)
+{
+    int i;
+
+    // special termination call
+    if ((l==1) && (s[0] == '\0')) return;
+    
+    for (i=0; i< l; i++) {
+	Uart16550Put(s[i]);
+	if (s[i] == '\n') Uart16550Put('\r');
+    }
+}
+
+void printf(char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    lp_Print(myoutput, 0, fmt, ap);
+    va_end(ap);
+}
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/printf.h b/trunk/target/linux/generic/image/lzma-loader/src/printf.h
new file mode 100644
index 00000000..9b1c1df2
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/printf.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#ifndef _printf_h_
+#define _printf_h_
+
+#include <stdarg.h>
+void printf(char *fmt, ...);
+
+#endif /* _printf_h_ */
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/start.S b/trunk/target/linux/generic/image/lzma-loader/src/start.S
new file mode 100644
index 00000000..86429337
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/start.S
@@ -0,0 +1,160 @@
+#include <asm/asm.h>
+#include <asm/regdef.h>
+
+#define KSEG0		0x80000000
+
+#define C0_CONFIG	$16
+#define C0_TAGLO	$28
+#define C0_TAGHI	$29
+
+#define	CONF1_DA_SHIFT	7			/* D$ associativity */
+#define CONF1_DA_MASK	0x00000380
+#define CONF1_DA_BASE	1
+#define CONF1_DL_SHIFT	10			/* D$ line size */
+#define CONF1_DL_MASK	0x00001c00
+#define CONF1_DL_BASE	2
+#define CONF1_DS_SHIFT	13			/* D$ sets/way */
+#define CONF1_DS_MASK	0x0000e000
+#define CONF1_DS_BASE	64
+#define CONF1_IA_SHIFT	16			/* I$ associativity */
+#define CONF1_IA_MASK	0x00070000
+#define CONF1_IA_BASE	1
+#define CONF1_IL_SHIFT	19			/* I$ line size */
+#define CONF1_IL_MASK	0x00380000
+#define CONF1_IL_BASE	2
+#define CONF1_IS_SHIFT	22			/* Instruction cache sets/way */
+#define CONF1_IS_MASK	0x01c00000
+#define CONF1_IS_BASE	64
+
+#define Index_Invalidate_I	0x00
+#define Index_Writeback_Inv_D   0x01
+
+LEAF(_start)
+	
+	.set	mips32
+	.set noreorder
+
+	/* save argument registers */
+	move t4, a0
+	move t5, a1
+	move t6, a2
+	move t7, a3
+	
+	/* set up stack */
+	li	sp, RAMSTART + RAMSIZE - 16
+
+#ifdef IMAGE_COPY
+	/* Copy decompressor code to the right place */
+	li  t2, LOADADDR
+	add a0, t2, 0
+	la  a1, code_start
+	la  a2, code_stop
+$L1:
+	lw  t0, 0(a1)
+	sw  t0, 0(a0)
+	add a1, 4
+	add a0, 4
+	blt a1, a2, $L1
+	nop
+#endif
+
+	/* At this point we need to invalidate dcache and */
+	/* icache before jumping to new code */
+
+1:	/* Get cache sizes */
+	mfc0	s0,C0_CONFIG,1
+
+	li	s1,CONF1_DL_MASK
+	and	s1,s0
+	beq	s1,zero,nodc
+	nop
+
+	srl	s1,CONF1_DL_SHIFT
+	li	t0,CONF1_DL_BASE
+	sll	s1,t0,s1		/* s1 has D$ cache line size */
+
+	li	s2,CONF1_DA_MASK
+	and	s2,s0
+	srl	s2,CONF1_DA_SHIFT
+	addiu	s2,CONF1_DA_BASE	/* s2 now has D$ associativity */
+
+	li	t0,CONF1_DS_MASK
+	and	t0,s0
+	srl	t0,CONF1_DS_SHIFT
+	li	s3,CONF1_DS_BASE
+	sll	s3,s3,t0		/* s3 has D$ sets per way */
+
+	multu	s2,s3			/* sets/way * associativity */
+	mflo	t0			/* total cache lines */
+
+	multu	s1,t0			/* D$ linesize * lines */
+	mflo	s2			/* s2 is now D$ size in bytes */
+
+	/* Initilize the D$: */
+	mtc0	zero,C0_TAGLO
+	mtc0	zero,C0_TAGHI
+
+	li	t0,KSEG0		/* Just an address for the first $ line */
+	addu	t1,t0,s2		/*  + size of cache == end */
+
+1:	cache	Index_Writeback_Inv_D,0(t0)
+	bne	t0,t1,1b
+	addu	t0,s1
+	
+nodc:
+	/* Now we get to do it all again for the I$ */
+	
+	move	s3,zero			/* just in case there is no icache */
+	move	s4,zero
+
+	li	t0,CONF1_IL_MASK
+	and	t0,s0
+	beq	t0,zero,noic
+	nop
+
+	srl	t0,CONF1_IL_SHIFT
+	li	s3,CONF1_IL_BASE
+	sll	s3,t0			/* s3 has I$ cache line size */
+
+	li	t0,CONF1_IA_MASK
+	and	t0,s0
+	srl	t0,CONF1_IA_SHIFT
+	addiu	s4,t0,CONF1_IA_BASE	/* s4 now has I$ associativity */
+
+	li	t0,CONF1_IS_MASK
+	and	t0,s0
+	srl	t0,CONF1_IS_SHIFT
+	li	s5,CONF1_IS_BASE
+	sll	s5,t0			/* s5 has I$ sets per way */
+
+	multu	s4,s5			/* sets/way * associativity */
+	mflo	t0			/* s4 is now total cache lines */
+
+	multu	s3,t0			/* I$ linesize * lines */
+	mflo	s4			/* s4 is cache size in bytes */
+
+	/* Initilize the I$: */
+	mtc0	zero,C0_TAGLO
+	mtc0	zero,C0_TAGHI
+
+	li	t0,KSEG0		/* Just an address for the first $ line */
+	addu	t1,t0,s4		/*  + size of cache == end */
+
+1:	cache	Index_Invalidate_I,0(t0)
+	bne	t0,t1,1b
+	addu	t0,s3
+noic:
+	/* jump to main */
+	move    a0,s3                   /* icache line size */
+	move    a1,s4                   /* icache size */
+	move    a2,s1                   /* dcache line size */
+#ifdef IMAGE_COPY
+	jal		t2
+#else
+	jal     entry
+#endif
+	move    a3,s2                   /* dcache size */
+
+	.set reorder
+END(_start)
+
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/uart16550.c b/trunk/target/linux/generic/image/lzma-loader/src/uart16550.c
new file mode 100644
index 00000000..7df57276
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/uart16550.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+
+#include "uart16550.h"
+
+/* === CONFIG === */
+
+#define         BASE                    0xb8058000
+#define         MAX_BAUD                1152000
+#define         REG_OFFSET              4
+
+/* === END OF CONFIG === */
+
+/* register offset */
+#define         OFS_RCV_BUFFER          (0*REG_OFFSET)
+#define         OFS_TRANS_HOLD          (0*REG_OFFSET)
+#define         OFS_SEND_BUFFER         (0*REG_OFFSET)
+#define         OFS_INTR_ENABLE         (1*REG_OFFSET)
+#define         OFS_INTR_ID             (2*REG_OFFSET)
+#define         OFS_DATA_FORMAT         (3*REG_OFFSET)
+#define         OFS_LINE_CONTROL        (3*REG_OFFSET)
+#define         OFS_MODEM_CONTROL       (4*REG_OFFSET)
+#define         OFS_RS232_OUTPUT        (4*REG_OFFSET)
+#define         OFS_LINE_STATUS         (5*REG_OFFSET)
+#define         OFS_MODEM_STATUS        (6*REG_OFFSET)
+#define         OFS_RS232_INPUT         (6*REG_OFFSET)
+#define         OFS_SCRATCH_PAD         (7*REG_OFFSET)
+
+#define         OFS_DIVISOR_LSB         (0*REG_OFFSET)
+#define         OFS_DIVISOR_MSB         (1*REG_OFFSET)
+
+
+/* memory-mapped read/write of the port */
+#define         UART16550_READ(y)    (*((volatile uint32*)(BASE + y)))
+#define         UART16550_WRITE(y, z)  ((*((volatile uint32*)(BASE + y))) = z)
+
+#define DEBUG_LED (*(unsigned short*)0xb7ffffc0)
+#define OutputLED(x)  (DEBUG_LED = x)
+
+void Uart16550Init(uint32 baud, uint8 data, uint8 parity, uint8 stop)
+{
+    /* disable interrupts */
+    UART16550_WRITE(OFS_INTR_ENABLE, 0);
+
+    /* set up buad rate */
+    { 
+        uint32 divisor;
+       
+        /* set DIAB bit */
+        UART16550_WRITE(OFS_LINE_CONTROL, 0x80);
+        
+        /* set divisor */
+        divisor = MAX_BAUD / baud;
+        UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff);
+        UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00)>>8);
+
+        /* clear DIAB bit */
+        UART16550_WRITE(OFS_LINE_CONTROL, 0x0);
+    }
+
+    /* set data format */
+    UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop);
+}
+
+uint8 Uart16550GetPoll()
+{
+    while((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0);
+    return UART16550_READ(OFS_RCV_BUFFER);
+}
+
+
+void Uart16550Put(uint8 byte)
+{
+    while ((UART16550_READ(OFS_LINE_STATUS) &0x20) == 0);
+    UART16550_WRITE(OFS_SEND_BUFFER, byte);
+}
+
diff --git a/trunk/target/linux/generic/image/lzma-loader/src/uart16550.h b/trunk/target/linux/generic/image/lzma-loader/src/uart16550.h
new file mode 100644
index 00000000..b3fd6fdd
--- /dev/null
+++ b/trunk/target/linux/generic/image/lzma-loader/src/uart16550.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2001 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#ifndef _uart16550_h_
+#define _uart16550_h_
+
+typedef         unsigned char uint8;
+typedef         unsigned int  uint32;
+
+#define         UART16550_BAUD_2400             2400
+#define         UART16550_BAUD_4800             4800
+#define         UART16550_BAUD_9600             9600
+#define         UART16550_BAUD_19200            19200
+#define         UART16550_BAUD_38400            38400
+#define         UART16550_BAUD_57600            57600
+#define         UART16550_BAUD_115200           115200
+
+#define         UART16550_PARITY_NONE           0
+#define         UART16550_PARITY_ODD            0x08
+#define         UART16550_PARITY_EVEN           0x18
+#define         UART16550_PARITY_MARK           0x28
+#define         UART16550_PARITY_SPACE          0x38
+
+#define         UART16550_DATA_5BIT             0x0
+#define         UART16550_DATA_6BIT             0x1
+#define         UART16550_DATA_7BIT             0x2
+#define         UART16550_DATA_8BIT             0x3
+
+#define         UART16550_STOP_1BIT             0x0
+#define         UART16550_STOP_2BIT             0x4
+
+void Uart16550Init(uint32 baud, uint8 data, uint8 parity, uint8 stop);
+
+/* blocking call */
+uint8 Uart16550GetPoll();
+
+void Uart16550Put(uint8 byte);
+
+#endif
diff --git a/trunk/target/linux/generic/patches-3.10/003-11-001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch b/trunk/target/linux/generic/patches-3.10/003-11-001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch
new file mode 100644
index 00000000..30dc0b46
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/003-11-001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch
@@ -0,0 +1,32 @@
+From 2b76d9221a02fa69bbb8c1045616afb923fc6bad Mon Sep 17 00:00:00 2001
+From: David Daney <david.daney@cavium.com>
+Date: Fri, 24 May 2013 20:54:08 +0000
+Subject: [PATCH] MIPS: Declare emulate_load_store_microMIPS as a static
+ function.
+
+commit 74338805ec6869594d583535f941cb478c94dd73 upstream.
+
+It is only used from within a single file, it should not be globally
+visible.
+
+Signed-off-by: David Daney <david.daney@cavium.com>
+Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/5325/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ arch/mips/kernel/unaligned.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/kernel/unaligned.c
++++ b/arch/mips/kernel/unaligned.c
+@@ -683,7 +683,8 @@ const int reg16to32[] = { 16, 17, 2, 3, 
+ /* Recode table from 16-bit STORE register notation to 32-bit GPR. */
+ const int reg16to32st[] = { 0, 17, 2, 3, 4, 5, 6, 7 };
+ 
+-void emulate_load_store_microMIPS(struct pt_regs *regs, void __user * addr)
++static void emulate_load_store_microMIPS(struct pt_regs *regs,
++					 void __user *addr)
+ {
+ 	unsigned long value;
+ 	unsigned int res;
diff --git a/trunk/target/linux/generic/patches-3.10/003-11-002-MIPS-Only-set-cpu_has_mmips-if-SYS_SUPPORTS_MICROMIP.patch b/trunk/target/linux/generic/patches-3.10/003-11-002-MIPS-Only-set-cpu_has_mmips-if-SYS_SUPPORTS_MICROMIP.patch
new file mode 100644
index 00000000..b1eddc6e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/003-11-002-MIPS-Only-set-cpu_has_mmips-if-SYS_SUPPORTS_MICROMIP.patch
@@ -0,0 +1,45 @@
+From 15a051ad98309f71989f9bda4b020fff160f4022 Mon Sep 17 00:00:00 2001
+From: David Daney <david.daney@cavium.com>
+Date: Fri, 24 May 2013 20:54:10 +0000
+Subject: [PATCH 2/2] MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS
+
+commit 3ddc14add5e6341cf8ef4058c34c67ba7fd15317 upstream.
+
+As Jonas Gorske said in his patch:
+
+   Disable cpu_has_mmips for everything but SEAD3 and MALTA. Most of
+   these platforms are from before the micromips introduction, so they
+   are very unlikely to implement it.
+
+   Reduces an -Os compiled, uncompressed kernel image by 8KiB for
+   BCM63XX.
+
+This patch taks a different approach than his, we gate the runtime
+test for microMIPS by the config symbol SYS_SUPPORTS_MICROMIPS.
+
+Signed-off-by: David Daney <david.daney@cavium.com>
+Cc: Jonas Gorski <jogo@openwrt.org>
+Cc: Steven J. Hill <Steven.Hill@imgtec.com>
+Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/5327/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ arch/mips/include/asm/cpu-features.h |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/cpu-features.h
++++ b/arch/mips/include/asm/cpu-features.h
+@@ -99,7 +99,11 @@
+ #define cpu_has_rixi		(cpu_data[0].options & MIPS_CPU_RIXI)
+ #endif
+ #ifndef cpu_has_mmips
+-#define cpu_has_mmips		(cpu_data[0].options & MIPS_CPU_MICROMIPS)
++# ifdef CONFIG_SYS_SUPPORTS_MICROMIPS
++#  define cpu_has_mmips		(cpu_data[0].options & MIPS_CPU_MICROMIPS)
++# else
++#  define cpu_has_mmips		0
++# endif
+ #endif
+ #ifndef cpu_has_vtag_icache
+ #define cpu_has_vtag_icache	(cpu_data[0].icache.flags & MIPS_CACHE_VTAG)
diff --git a/trunk/target/linux/generic/patches-3.10/003-11-003-of-pci-Add-of_pci_get_devfn-function.patch b/trunk/target/linux/generic/patches-3.10/003-11-003-of-pci-Add-of_pci_get_devfn-function.patch
new file mode 100644
index 00000000..4dd15168
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/003-11-003-of-pci-Add-of_pci_get_devfn-function.patch
@@ -0,0 +1,78 @@
+From 45ab9702fb47d18dca116b3a0509efa19fbcb27a Mon Sep 17 00:00:00 2001
+From: Thierry Reding <thierry.reding@avionic-design.de>
+Date: Thu, 16 May 2013 17:55:18 +0200
+Subject: [PATCH] of/pci: Add of_pci_get_devfn() function
+
+commit 45ab9702fb47d18dca116b3a0509efa19fbcb27a upstream.
+
+This function can be used to parse the device and function number from a
+standard 5-cell PCI resource. PCI_SLOT() and PCI_FUNC() can be used on
+the returned value obtain the device and function numbers respectively.
+
+Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Jason Cooper <jason@lakedaemon.net>
+---
+ drivers/of/of_pci.c    |   34 +++++++++++++++++++++++++++++-----
+ include/linux/of_pci.h |    1 +
+ 2 files changed, 30 insertions(+), 5 deletions(-)
+
+--- a/drivers/of/of_pci.c
++++ b/drivers/of/of_pci.c
+@@ -5,14 +5,15 @@
+ #include <asm/prom.h>
+ 
+ static inline int __of_pci_pci_compare(struct device_node *node,
+-				       unsigned int devfn)
++				       unsigned int data)
+ {
+-	unsigned int size;
+-	const __be32 *reg = of_get_property(node, "reg", &size);
++	int devfn;
+ 
+-	if (!reg || size < 5 * sizeof(__be32))
++	devfn = of_pci_get_devfn(node);
++	if (devfn < 0)
+ 		return 0;
+-	return ((be32_to_cpup(&reg[0]) >> 8) & 0xff) == devfn;
++
++	return devfn == data;
+ }
+ 
+ struct device_node *of_pci_find_child_device(struct device_node *parent,
+@@ -40,3 +41,26 @@ struct device_node *of_pci_find_child_de
+ 	return NULL;
+ }
+ EXPORT_SYMBOL_GPL(of_pci_find_child_device);
++
++/**
++ * of_pci_get_devfn() - Get device and function numbers for a device node
++ * @np: device node
++ *
++ * Parses a standard 5-cell PCI resource and returns an 8-bit value that can
++ * be passed to the PCI_SLOT() and PCI_FUNC() macros to extract the device
++ * and function numbers respectively. On error a negative error code is
++ * returned.
++ */
++int of_pci_get_devfn(struct device_node *np)
++{
++	unsigned int size;
++	const __be32 *reg;
++
++	reg = of_get_property(np, "reg", &size);
++
++	if (!reg || size < 5 * sizeof(__be32))
++		return -EINVAL;
++
++	return (be32_to_cpup(reg) >> 8) & 0xff;
++}
++EXPORT_SYMBOL_GPL(of_pci_get_devfn);
+--- a/include/linux/of_pci.h
++++ b/include/linux/of_pci.h
+@@ -10,5 +10,6 @@ int of_irq_map_pci(const struct pci_dev 
+ struct device_node;
+ struct device_node *of_pci_find_child_device(struct device_node *parent,
+ 					     unsigned int devfn);
++int of_pci_get_devfn(struct device_node *np);
+ 
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.10/003-11-004-hso-Earlier-catch-of-error-condition.patch b/trunk/target/linux/generic/patches-3.10/003-11-004-hso-Earlier-catch-of-error-condition.patch
new file mode 100644
index 00000000..04866edb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/003-11-004-hso-Earlier-catch-of-error-condition.patch
@@ -0,0 +1,42 @@
+From 35e57e1b49a351aa804dab6010cd46ae6112a541 Mon Sep 17 00:00:00 2001
+From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Date: Wed, 21 Aug 2013 01:43:07 -0700
+Subject: [PATCH] hso: Earlier catch of error condition
+
+commit 35e57e1b49a351aa804dab6010cd46ae6112a541 upstream.
+
+There is no need to get an interface specification if we know it's the
+wrong one.
+
+Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/hso.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -2886,6 +2886,11 @@ static int hso_probe(struct usb_interfac
+ 	struct hso_shared_int *shared_int;
+ 	struct hso_device *tmp_dev = NULL;
+ 
++	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
++		dev_err(&interface->dev, "Not our interface\n");
++		return -ENODEV;
++	}
++
+ 	if_num = interface->altsetting->desc.bInterfaceNumber;
+ 
+ 	/* Get the interface/port specification from either driver_info or from
+@@ -2895,10 +2900,6 @@ static int hso_probe(struct usb_interfac
+ 	else
+ 		port_spec = hso_get_config_data(interface);
+ 
+-	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
+-		dev_err(&interface->dev, "Not our interface\n");
+-		return -ENODEV;
+-	}
+ 	/* Check if we need to switch to alt interfaces prior to port
+ 	 * configuration */
+ 	if (interface->num_altsetting > 1)
diff --git a/trunk/target/linux/generic/patches-3.10/003-11-008-hso-Fix-stack-corruption-on-some-architectures.patch b/trunk/target/linux/generic/patches-3.10/003-11-008-hso-Fix-stack-corruption-on-some-architectures.patch
new file mode 100644
index 00000000..e44f713d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/003-11-008-hso-Fix-stack-corruption-on-some-architectures.patch
@@ -0,0 +1,50 @@
+From e75dc677ff8d06ffa61bef6fee436227ae5440c6 Mon Sep 17 00:00:00 2001
+From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Date: Wed, 21 Aug 2013 01:43:19 -0700
+Subject: [PATCH] hso: Fix stack corruption on some architectures
+
+commit e75dc677ff8d06ffa61bef6fee436227ae5440c6 upstream.
+
+As Sergei Shtylyov explained in the #mipslinux IRC channel:
+[Mon 2013-08-19 12:28:21 PM PDT] <headless> guys, are you sure it's not "DMA off stack" case?
+[Mon 2013-08-19 12:28:35 PM PDT] <headless> it's a known stack corruptor on non-coherent arches
+[Mon 2013-08-19 12:31:48 PM PDT] <DonkeyHotei> headless: for usb/ehci?
+[Mon 2013-08-19 12:34:11 PM PDT] <DonkeyHotei> headless: explain
+[Mon 2013-08-19 12:35:38 PM PDT] <headless> usb_control_msg() (or other such func) should not use buffer on stack. DMA from/to stack is prohibited
+[Mon 2013-08-19 12:35:58 PM PDT] <headless> and EHCI uses DMA on control xfers (as well as all the others)
+
+Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/hso.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -2816,13 +2816,16 @@ exit:
+ static int hso_get_config_data(struct usb_interface *interface)
+ {
+ 	struct usb_device *usbdev = interface_to_usbdev(interface);
+-	u8 config_data[17];
++	u8 *config_data = kmalloc(17, GFP_KERNEL);
+ 	u32 if_num = interface->altsetting->desc.bInterfaceNumber;
+ 	s32 result;
+ 
++	if (!config_data)
++		return -ENOMEM;
+ 	if (usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
+ 			    0x86, 0xC0, 0, 0, config_data, 17,
+ 			    USB_CTRL_SET_TIMEOUT) != 0x11) {
++		kfree(config_data);
+ 		return -EIO;
+ 	}
+ 
+@@ -2873,6 +2876,7 @@ static int hso_get_config_data(struct us
+ 	if (config_data[16] & 0x1)
+ 		result |= HSO_INFO_CRC_BUG;
+ 
++	kfree(config_data);
+ 	return result;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/003-12-001-mtd-chips-Add-support-for-PMC-SPI-Flash-chips-in-m25.patch b/trunk/target/linux/generic/patches-3.10/003-12-001-mtd-chips-Add-support-for-PMC-SPI-Flash-chips-in-m25.patch
new file mode 100644
index 00000000..8902acb6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/003-12-001-mtd-chips-Add-support-for-PMC-SPI-Flash-chips-in-m25.patch
@@ -0,0 +1,94 @@
+From 6c3b88970175e18a67eb8e55c4eba10614d0d5dc Mon Sep 17 00:00:00 2001
+From: Michel Stempin <michel.stempin@wanadoo.fr>
+Date: Mon, 15 Jul 2013 12:13:56 +0200
+Subject: [PATCH] mtd: chips: Add support for PMC SPI Flash chips in m25p80.c
+
+commit 6c3b88970175e18a67eb8e55c4eba10614d0d5dc upstream.
+
+Add support for PMC (now Chingis, part of ISSI) Pm25LV512 (512 Kib),
+Pm25LV010 (1 Mib) and Pm25LQ032 (32 Mib) SPI Flash chips.
+
+This patch addresses two generations of PMC SPI Flash chips:
+
+ - Pm25LV512 and Pm25LV010: these have 4KiB sectors and 32KiB
+   blocks. The 4KiB sector erase uses a non-standard opcode
+   (0xd7). They do not support JEDEC RDID (0x9f), and so they can only
+   be detected by matching their name string with pre-configured
+   platform data. Because of the cascaded acquisitions, the datasheet
+   is no longer available on the current manufacturer's website,
+   although it is still commonly used in some recent wireless routers
+   (<https://forum.openwrt.org/viewtopic.php?pid=186360#p186360>). The
+   only public datasheet available seems to be on GeoCities:
+   <http://www.geocities.jp/scottle556/pdf/Pm25LV512-010.pdf>
+
+ - Pm25LQ032: a newer generation flash, with 4KiB sectors and 64KiB
+   blocks. It uses the standard erase and JEDEC read-ID
+   opcodes. Manufacturer's datasheet is here:
+   <http://www.chingistek.com/img/Product_Files/Pm25LQ032C%20datasheet%20v1.6.1.pdf>
+
+This patch is resent in order to take into account both Brian Norris
+remarks and this upstream patch:
+
+commit e534ee4f9ca29fdb38eea4b0c53f2154fbd8c1ee
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Fri Feb 22 15:51:05 2013 +0100
+
+    mtd: m25p80: introduce SST_WRITE flag for SST byte programming
+
+    Not all SST devices implement the SST byte programming command.
+    Some devices (like SST25VF064C) implement only standard m25p80 page
+    write command.
+
+    Now SPI flash devices that need sst_write() are explicitly marked
+    with new SST_WRITE flag and the decision to use sst_write() is based
+    on this flag instead of manufacturer id.
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
+[Brian: fixed conflict]
+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
+Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+---
+ drivers/mtd/devices/m25p80.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -43,6 +43,7 @@
+ #define	OPCODE_FAST_READ	0x0b	/* Read data bytes (high frequency) */
+ #define	OPCODE_PP		0x02	/* Page program (up to 256 bytes) */
+ #define	OPCODE_BE_4K		0x20	/* Erase 4KiB block */
++#define	OPCODE_BE_4K_PMC	0xd7	/* Erase 4KiB block on PMC chips */
+ #define	OPCODE_BE_32K		0x52	/* Erase 32KiB block */
+ #define	OPCODE_CHIP_ERASE	0xc7	/* Erase whole flash chip */
+ #define	OPCODE_SE		0xd8	/* Sector erase (usually 64KiB) */
+@@ -682,6 +683,7 @@ struct flash_info {
+ #define	SECT_4K		0x01		/* OPCODE_BE_4K works uniformly */
+ #define	M25P_NO_ERASE	0x02		/* No erase command needed */
+ #define	SST_WRITE	0x04		/* use SST byte programming */
++#define	SECT_4K_PMC	0x10		/* OPCODE_BE_4K_PMC works uniformly */
+ };
+ 
+ #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)	\
+@@ -762,6 +764,11 @@ static const struct spi_device_id m25p_i
+ 	{ "n25q128a13",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
+ 	{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
+ 
++	/* PMC */
++	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
++	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
++	{ "pm25lq032", INFO(0x7f9d46, 0, 64 * 1024,  64, SECT_4K) },
++
+ 	/* Spansion -- single (large) sector size only, at least
+ 	 * for the chips listed here (without boot sectors).
+ 	 */
+@@ -1014,6 +1021,9 @@ static int m25p_probe(struct spi_device 
+ 	if (info->flags & SECT_4K) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
++	} else if (info->flags & SECT_4K_PMC) {
++		flash->erase_opcode = OPCODE_BE_4K_PMC;
++		flash->mtd.erasesize = 4096;
+ 	} else {
+ 		flash->erase_opcode = OPCODE_SE;
+ 		flash->mtd.erasesize = info->sector_size;
diff --git a/trunk/target/linux/generic/patches-3.10/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch b/trunk/target/linux/generic/patches-3.10/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch
new file mode 100644
index 00000000..4aed4095
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch
@@ -0,0 +1,37 @@
+From 7d75ef5f56dbc2bedb9a893eb9ecfd03c456338d Mon Sep 17 00:00:00 2001
+From: Flavio Silveira <fggs@terra.com.br>
+Date: Thu, 29 Aug 2013 08:51:48 -0300
+Subject: [PATCH v2] mtd: m25p80: Add support for ESMT F25L32PA
+
+This flashchip is used in D-Link DIR-610 A1 router board 
+and maybe several others, yet is not kernel upstream.
+
+So add support for it according to datasheet [0], making it easier
+to support other boards using this flashchip in the future.
+
+Changelog v2:
+ - Better description
+ - Datasheet link at the bottom, similar to other patches.
+
+[0] http://www.esmt.com.tw/DB/manager/upload/F25L32PA.pdf 
+
+Signed-off-by: Flavio Silveira <fggs@terra.com.br>
+---
+ drivers/mtd/devices/m25p80.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+ http://patchwork.ozlabs.org/patch/272438/
+ http://lists.infradead.org/pipermail/linux-mtd/2013-September/048511.html
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -733,6 +733,9 @@ static const struct spi_device_id m25p_i
+ 	{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
+ 	{ "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) },
+ 
++	/* ESMT */
++	{ "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) },
++
+ 	/* Everspin */
+ 	{ "mr25h256", CAT25_INFO(  32 * 1024, 1, 256, 2) },
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/020-ssb_update.patch b/trunk/target/linux/generic/patches-3.10/020-ssb_update.patch
new file mode 100644
index 00000000..a85ab109
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/020-ssb_update.patch
@@ -0,0 +1,981 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -138,13 +138,13 @@ config SSB_DRIVER_MIPS
+ 
+ config SSB_SFLASH
+ 	bool "SSB serial flash support"
+-	depends on SSB_DRIVER_MIPS && BROKEN
++	depends on SSB_DRIVER_MIPS
+ 	default y
+ 
+ # Assumption: We are on embedded, if we compile the MIPS core.
+ config SSB_EMBEDDED
+ 	bool
+-	depends on SSB_DRIVER_MIPS
++	depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
+ 	default y
+ 
+ config SSB_DRIVER_EXTIF
+@@ -168,6 +168,7 @@ config SSB_DRIVER_GIGE
+ config SSB_DRIVER_GPIO
+ 	bool "SSB GPIO driver"
+ 	depends on SSB && GPIOLIB
++	select IRQ_DOMAIN if SSB_EMBEDDED
+ 	help
+ 	  Driver to provide access to the GPIO pins on the bus.
+ 
+--- a/drivers/ssb/b43_pci_bridge.c
++++ b/drivers/ssb/b43_pci_bridge.c
+@@ -38,6 +38,7 @@ static const struct pci_device_id b43_pc
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) },
+ 	{ 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
+--- a/drivers/ssb/driver_chipcommon_sflash.c
++++ b/drivers/ssb/driver_chipcommon_sflash.c
+@@ -9,6 +9,19 @@
+ 
+ #include "ssb_private.h"
+ 
++static struct resource ssb_sflash_resource = {
++	.name	= "ssb_sflash",
++	.start	= SSB_FLASH2,
++	.end	= 0,
++	.flags  = IORESOURCE_MEM | IORESOURCE_READONLY,
++};
++
++struct platform_device ssb_sflash_dev = {
++	.name		= "ssb_sflash",
++	.resource	= &ssb_sflash_resource,
++	.num_resources	= 1,
++};
++
+ struct ssb_sflash_tbl_e {
+ 	char *name;
+ 	u32 id;
+@@ -16,7 +29,7 @@ struct ssb_sflash_tbl_e {
+ 	u16 numblocks;
+ };
+ 
+-static struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
++static const struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
+ 	{ "M25P20", 0x11, 0x10000, 4, },
+ 	{ "M25P40", 0x12, 0x10000, 8, },
+ 
+@@ -24,10 +37,10 @@ static struct ssb_sflash_tbl_e ssb_sflas
+ 	{ "M25P32", 0x15, 0x10000, 64, },
+ 	{ "M25P64", 0x16, 0x10000, 128, },
+ 	{ "M25FL128", 0x17, 0x10000, 256, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+-static struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
++static const struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
+ 	{ "SST25WF512", 1, 0x1000, 16, },
+ 	{ "SST25VF512", 0x48, 0x1000, 16, },
+ 	{ "SST25WF010", 2, 0x1000, 32, },
+@@ -42,10 +55,10 @@ static struct ssb_sflash_tbl_e ssb_sflas
+ 	{ "SST25VF016", 0x41, 0x1000, 512, },
+ 	{ "SST25VF032", 0x4a, 0x1000, 1024, },
+ 	{ "SST25VF064", 0x4b, 0x1000, 2048, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+-static struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
++static const struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
+ 	{ "AT45DB011", 0xc, 256, 512, },
+ 	{ "AT45DB021", 0x14, 256, 1024, },
+ 	{ "AT45DB041", 0x1c, 256, 2048, },
+@@ -53,7 +66,7 @@ static struct ssb_sflash_tbl_e ssb_sflas
+ 	{ "AT45DB161", 0x2c, 512, 4096, },
+ 	{ "AT45DB321", 0x34, 512, 8192, },
+ 	{ "AT45DB642", 0x3c, 1024, 8192, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode)
+@@ -73,7 +86,8 @@ static void ssb_sflash_cmd(struct ssb_ch
+ /* Initialize serial flash access */
+ int ssb_sflash_init(struct ssb_chipcommon *cc)
+ {
+-	struct ssb_sflash_tbl_e *e;
++	struct ssb_sflash *sflash = &cc->dev->bus->mipscore.sflash;
++	const struct ssb_sflash_tbl_e *e;
+ 	u32 id, id2;
+ 
+ 	switch (cc->capabilities & SSB_CHIPCO_CAP_FLASHT) {
+@@ -131,10 +145,20 @@ int ssb_sflash_init(struct ssb_chipcommo
+ 		return -ENOTSUPP;
+ 	}
+ 
+-	pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n",
+-		e->name, e->blocksize, e->numblocks);
+-
+-	pr_err("Serial flash support is not implemented yet!\n");
++	sflash->window = SSB_FLASH2;
++	sflash->blocksize = e->blocksize;
++	sflash->numblocks = e->numblocks;
++	sflash->size = sflash->blocksize * sflash->numblocks;
++	sflash->present = true;
++
++	pr_info("Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n",
++		e->name, sflash->size / 1024, e->blocksize, e->numblocks);
++
++	/* Prepare platform device, but don't register it yet. It's too early,
++	 * malloc (required by device_private_init) is not available yet. */
++	ssb_sflash_dev.resource[0].end = ssb_sflash_dev.resource[0].start +
++					 sflash->size;
++	ssb_sflash_dev.dev.platform_data = sflash;
+ 
+-	return -ENOTSUPP;
++	return 0;
+ }
+--- a/drivers/ssb/driver_gpio.c
++++ b/drivers/ssb/driver_gpio.c
+@@ -9,16 +9,40 @@
+  */
+ 
+ #include <linux/gpio.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/irqdomain.h>
+ #include <linux/export.h>
+ #include <linux/ssb/ssb.h>
+ 
+ #include "ssb_private.h"
+ 
++
++/**************************************************
++ * Shared
++ **************************************************/
++
+ static struct ssb_bus *ssb_gpio_get_bus(struct gpio_chip *chip)
+ {
+ 	return container_of(chip, struct ssb_bus, gpio);
+ }
+ 
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++static int ssb_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		return irq_find_mapping(bus->irq_domain, gpio);
++	else
++		return -EINVAL;
++}
++#endif
++
++/**************************************************
++ * ChipCommon
++ **************************************************/
++
+ static int ssb_gpio_chipco_get_value(struct gpio_chip *chip, unsigned gpio)
+ {
+ 	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
+@@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct
+ 	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);
+ }
+ 
+-static int ssb_gpio_chipco_to_irq(struct gpio_chip *chip, unsigned gpio)
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++static void ssb_gpio_irq_chipco_mask(struct irq_data *d)
+ {
+-	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
+ 
+-	if (bus->bustype == SSB_BUSTYPE_SSB)
+-		return ssb_mips_irq(bus->chipco.dev) + 2;
+-	else
+-		return -EINVAL;
++	ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), 0);
++}
++
++static void ssb_gpio_irq_chipco_unmask(struct irq_data *d)
++{
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++	u32 val = ssb_chipco_gpio_in(&bus->chipco, BIT(gpio));
++
++	ssb_chipco_gpio_polarity(&bus->chipco, BIT(gpio), val);
++	ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), BIT(gpio));
++}
++
++static struct irq_chip ssb_gpio_irq_chipco_chip = {
++	.name		= "SSB-GPIO-CC",
++	.irq_mask	= ssb_gpio_irq_chipco_mask,
++	.irq_unmask	= ssb_gpio_irq_chipco_unmask,
++};
++
++static irqreturn_t ssb_gpio_irq_chipco_handler(int irq, void *dev_id)
++{
++	struct ssb_bus *bus = dev_id;
++	struct ssb_chipcommon *chipco = &bus->chipco;
++	u32 val = chipco_read32(chipco, SSB_CHIPCO_GPIOIN);
++	u32 mask = chipco_read32(chipco, SSB_CHIPCO_GPIOIRQ);
++	u32 pol = chipco_read32(chipco, SSB_CHIPCO_GPIOPOL);
++	unsigned long irqs = (val ^ pol) & mask;
++	int gpio;
++
++	if (!irqs)
++		return IRQ_NONE;
++
++	for_each_set_bit(gpio, &irqs, bus->gpio.ngpio)
++		generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));
++	ssb_chipco_gpio_polarity(chipco, irqs, val & irqs);
++
++	return IRQ_HANDLED;
++}
++
++static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)
++{
++	struct ssb_chipcommon *chipco = &bus->chipco;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio, hwirq, err;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return 0;
++
++	bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
++						&irq_domain_simple_ops, chipco);
++	if (!bus->irq_domain) {
++		err = -ENODEV;
++		goto err_irq_domain;
++	}
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_create_mapping(bus->irq_domain, gpio);
++
++		irq_set_chip_data(irq, bus);
++		irq_set_chip_and_handler(irq, &ssb_gpio_irq_chipco_chip,
++					 handle_simple_irq);
++	}
++
++	hwirq = ssb_mips_irq(bus->chipco.dev) + 2;
++	err = request_irq(hwirq, ssb_gpio_irq_chipco_handler, IRQF_SHARED,
++			  "gpio", bus);
++	if (err)
++		goto err_req_irq;
++
++	ssb_chipco_gpio_intmask(&bus->chipco, ~0, 0);
++	chipco_set32(chipco, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO);
++
++	return 0;
++
++err_req_irq:
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++err_irq_domain:
++	return err;
++}
++
++static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)
++{
++	struct ssb_chipcommon *chipco = &bus->chipco;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return;
++
++	chipco_mask32(chipco, SSB_CHIPCO_IRQMASK, ~SSB_CHIPCO_IRQ_GPIO);
++	free_irq(ssb_mips_irq(bus->chipco.dev) + 2, chipco);
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++}
++#else
++static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)
++{
++	return 0;
++}
++
++static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)
++{
+ }
++#endif
+ 
+ static int ssb_gpio_chipco_init(struct ssb_bus *bus)
+ {
+ 	struct gpio_chip *chip = &bus->gpio;
++	int err;
+ 
+ 	chip->label		= "ssb_chipco_gpio";
+ 	chip->owner		= THIS_MODULE;
+@@ -96,7 +230,9 @@ static int ssb_gpio_chipco_init(struct s
+ 	chip->set		= ssb_gpio_chipco_set_value;
+ 	chip->direction_input	= ssb_gpio_chipco_direction_input;
+ 	chip->direction_output	= ssb_gpio_chipco_direction_output;
+-	chip->to_irq		= ssb_gpio_chipco_to_irq;
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++	chip->to_irq		= ssb_gpio_to_irq;
++#endif
+ 	chip->ngpio		= 16;
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+@@ -106,9 +242,23 @@ static int ssb_gpio_chipco_init(struct s
+ 	else
+ 		chip->base		= -1;
+ 
+-	return gpiochip_add(chip);
++	err = ssb_gpio_irq_chipco_domain_init(bus);
++	if (err)
++		return err;
++
++	err = gpiochip_add(chip);
++	if (err) {
++		ssb_gpio_irq_chipco_domain_exit(bus);
++		return err;
++	}
++
++	return 0;
+ }
+ 
++/**************************************************
++ * EXTIF
++ **************************************************/
++
+ #ifdef CONFIG_SSB_DRIVER_EXTIF
+ 
+ static int ssb_gpio_extif_get_value(struct gpio_chip *chip, unsigned gpio)
+@@ -145,19 +295,127 @@ static int ssb_gpio_extif_direction_outp
+ 	return 0;
+ }
+ 
+-static int ssb_gpio_extif_to_irq(struct gpio_chip *chip, unsigned gpio)
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++static void ssb_gpio_irq_extif_mask(struct irq_data *d)
+ {
+-	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
+ 
+-	if (bus->bustype == SSB_BUSTYPE_SSB)
+-		return ssb_mips_irq(bus->extif.dev) + 2;
+-	else
+-		return -EINVAL;
++	ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), 0);
++}
++
++static void ssb_gpio_irq_extif_unmask(struct irq_data *d)
++{
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++	u32 val = ssb_extif_gpio_in(&bus->extif, BIT(gpio));
++
++	ssb_extif_gpio_polarity(&bus->extif, BIT(gpio), val);
++	ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), BIT(gpio));
++}
++
++static struct irq_chip ssb_gpio_irq_extif_chip = {
++	.name		= "SSB-GPIO-EXTIF",
++	.irq_mask	= ssb_gpio_irq_extif_mask,
++	.irq_unmask	= ssb_gpio_irq_extif_unmask,
++};
++
++static irqreturn_t ssb_gpio_irq_extif_handler(int irq, void *dev_id)
++{
++	struct ssb_bus *bus = dev_id;
++	struct ssb_extif *extif = &bus->extif;
++	u32 val = ssb_read32(extif->dev, SSB_EXTIF_GPIO_IN);
++	u32 mask = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTMASK);
++	u32 pol = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTPOL);
++	unsigned long irqs = (val ^ pol) & mask;
++	int gpio;
++
++	if (!irqs)
++		return IRQ_NONE;
++
++	for_each_set_bit(gpio, &irqs, bus->gpio.ngpio)
++		generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));
++	ssb_extif_gpio_polarity(extif, irqs, val & irqs);
++
++	return IRQ_HANDLED;
++}
++
++static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)
++{
++	struct ssb_extif *extif = &bus->extif;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio, hwirq, err;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return 0;
++
++	bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
++						&irq_domain_simple_ops, extif);
++	if (!bus->irq_domain) {
++		err = -ENODEV;
++		goto err_irq_domain;
++	}
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_create_mapping(bus->irq_domain, gpio);
++
++		irq_set_chip_data(irq, bus);
++		irq_set_chip_and_handler(irq, &ssb_gpio_irq_extif_chip,
++					 handle_simple_irq);
++	}
++
++	hwirq = ssb_mips_irq(bus->extif.dev) + 2;
++	err = request_irq(hwirq, ssb_gpio_irq_extif_handler, IRQF_SHARED,
++			  "gpio", bus);
++	if (err)
++		goto err_req_irq;
++
++	ssb_extif_gpio_intmask(&bus->extif, ~0, 0);
++
++	return 0;
++
++err_req_irq:
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++err_irq_domain:
++	return err;
+ }
+ 
++static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)
++{
++	struct ssb_extif *extif = &bus->extif;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return;
++
++	free_irq(ssb_mips_irq(bus->extif.dev) + 2, extif);
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++}
++#else
++static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)
++{
++	return 0;
++}
++
++static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)
++{
++}
++#endif
++
+ static int ssb_gpio_extif_init(struct ssb_bus *bus)
+ {
+ 	struct gpio_chip *chip = &bus->gpio;
++	int err;
+ 
+ 	chip->label		= "ssb_extif_gpio";
+ 	chip->owner		= THIS_MODULE;
+@@ -165,7 +423,9 @@ static int ssb_gpio_extif_init(struct ss
+ 	chip->set		= ssb_gpio_extif_set_value;
+ 	chip->direction_input	= ssb_gpio_extif_direction_input;
+ 	chip->direction_output	= ssb_gpio_extif_direction_output;
+-	chip->to_irq		= ssb_gpio_extif_to_irq;
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++	chip->to_irq		= ssb_gpio_to_irq;
++#endif
+ 	chip->ngpio		= 5;
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+@@ -175,7 +435,17 @@ static int ssb_gpio_extif_init(struct ss
+ 	else
+ 		chip->base		= -1;
+ 
+-	return gpiochip_add(chip);
++	err = ssb_gpio_irq_extif_domain_init(bus);
++	if (err)
++		return err;
++
++	err = gpiochip_add(chip);
++	if (err) {
++		ssb_gpio_irq_extif_domain_exit(bus);
++		return err;
++	}
++
++	return 0;
+ }
+ 
+ #else
+@@ -185,6 +455,10 @@ static int ssb_gpio_extif_init(struct ss
+ }
+ #endif
+ 
++/**************************************************
++ * Init
++ **************************************************/
++
+ int ssb_gpio_init(struct ssb_bus *bus)
+ {
+ 	if (ssb_chipco_available(&bus->chipco))
+@@ -201,7 +475,8 @@ int ssb_gpio_unregister(struct ssb_bus *
+ {
+ 	if (ssb_chipco_available(&bus->chipco) ||
+ 	    ssb_extif_available(&bus->extif)) {
+-		return gpiochip_remove(&bus->gpio);
++		gpiochip_remove(&bus->gpio);
++		return 0;
+ 	} else {
+ 		SSB_WARN_ON(1);
+ 	}
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -553,6 +553,14 @@ static int ssb_devices_register(struct s
+ 	}
+ #endif
+ 
++#ifdef CONFIG_SSB_SFLASH
++	if (bus->mipscore.sflash.present) {
++		err = platform_device_register(&ssb_sflash_dev);
++		if (err)
++			pr_err("Error registering serial flash\n");
++	}
++#endif
++
+ 	return 0;
+ error:
+ 	/* Unwind the already registered devices. */
+@@ -582,6 +590,13 @@ static int ssb_attach_queued_buses(void)
+ 		ssb_pcicore_init(&bus->pcicore);
+ 		if (bus->bustype == SSB_BUSTYPE_SSB)
+ 			ssb_watchdog_register(bus);
++
++		err = ssb_gpio_init(bus);
++		if (err == -ENOTSUPP)
++			ssb_dbg("GPIO driver not activated\n");
++		else if (err)
++			ssb_dbg("Error registering GPIO driver: %i\n", err);
++
+ 		ssb_bus_may_powerdown(bus);
+ 
+ 		err = ssb_devices_register(bus);
+@@ -819,11 +834,6 @@ static int ssb_bus_register(struct ssb_b
+ 	ssb_chipcommon_init(&bus->chipco);
+ 	ssb_extif_init(&bus->extif);
+ 	ssb_mipscore_init(&bus->mipscore);
+-	err = ssb_gpio_init(bus);
+-	if (err == -ENOTSUPP)
+-		ssb_dbg("GPIO driver not activated\n");
+-	else if (err)
+-		ssb_dbg("Error registering GPIO driver: %i\n", err);
+ 	err = ssb_fetch_invariants(bus, get_invariants);
+ 	if (err) {
+ 		ssb_bus_may_powerdown(bus);
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -326,13 +326,13 @@ err_ctlreg:
+ 	return err;
+ }
+ 
+-static s8 r123_extract_antgain(u8 sprom_revision, const u16 *in,
+-			       u16 mask, u16 shift)
++static s8 sprom_extract_antgain(u8 sprom_revision, const u16 *in, u16 offset,
++				u16 mask, u16 shift)
+ {
+ 	u16 v;
+ 	u8 gain;
+ 
+-	v = in[SPOFF(SSB_SPROM1_AGAIN)];
++	v = in[SPOFF(offset)];
+ 	gain = (v & mask) >> shift;
+ 	if (gain == 0xFF)
+ 		gain = 2; /* If unset use 2dBm */
+@@ -416,12 +416,14 @@ static void sprom_extract_r123(struct ss
+ 	SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
+-						    SSB_SPROM1_AGAIN_BG,
+-						    SSB_SPROM1_AGAIN_BG_SHIFT);
+-	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
+-						    SSB_SPROM1_AGAIN_A,
+-						    SSB_SPROM1_AGAIN_A_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM1_AGAIN,
++						     SSB_SPROM1_AGAIN_BG,
++						     SSB_SPROM1_AGAIN_BG_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM1_AGAIN,
++						     SSB_SPROM1_AGAIN_A,
++						     SSB_SPROM1_AGAIN_A_SHIFT);
+ 	if (out->revision >= 2)
+ 		sprom_extract_r23(out, in);
+ }
+@@ -468,7 +470,15 @@ static void sprom_extract_r458(struct ss
+ 
+ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
+ {
++	static const u16 pwr_info_offset[] = {
++		SSB_SPROM4_PWR_INFO_CORE0, SSB_SPROM4_PWR_INFO_CORE1,
++		SSB_SPROM4_PWR_INFO_CORE2, SSB_SPROM4_PWR_INFO_CORE3
++	};
+ 	u16 il0mac_offset;
++	int i;
++
++	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
++		     ARRAY_SIZE(out->core_pwr_info));
+ 
+ 	if (out->revision == 4)
+ 		il0mac_offset = SSB_SPROM4_IL0MAC;
+@@ -524,14 +534,59 @@ static void sprom_extract_r45(struct ssb
+ 	}
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
+-	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
+-	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
+-	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
+-	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN01,
++						     SSB_SPROM4_AGAIN0,
++						     SSB_SPROM4_AGAIN0_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN01,
++						     SSB_SPROM4_AGAIN1,
++						     SSB_SPROM4_AGAIN1_SHIFT);
++	out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN23,
++						     SSB_SPROM4_AGAIN2,
++						     SSB_SPROM4_AGAIN2_SHIFT);
++	out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN23,
++						     SSB_SPROM4_AGAIN3,
++						     SSB_SPROM4_AGAIN3_SHIFT);
++
++	/* Extract cores power info info */
++	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
++		u16 o = pwr_info_offset[i];
++
++		SPEX(core_pwr_info[i].itssi_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
++			SSB_SPROM4_2G_ITSSI, SSB_SPROM4_2G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
++			SSB_SPROM4_2G_MAXP, 0);
++
++		SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SPROM4_2G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SPROM4_2G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SPROM4_2G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[3], o + SSB_SPROM4_2G_PA_3, ~0, 0);
++
++		SPEX(core_pwr_info[i].itssi_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
++			SSB_SPROM4_5G_ITSSI, SSB_SPROM4_5G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
++			SSB_SPROM4_5G_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM4_5GHL_MAXP,
++			SSB_SPROM4_5GH_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM4_5GHL_MAXP,
++			SSB_SPROM4_5GL_MAXP, SSB_SPROM4_5GL_MAXP_SHIFT);
++
++		SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SPROM4_5GL_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SPROM4_5GL_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SPROM4_5GL_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[3], o + SSB_SPROM4_5GL_PA_3, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SPROM4_5G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SPROM4_5G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SPROM4_5G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[3], o + SSB_SPROM4_5G_PA_3, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SPROM4_5GH_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SPROM4_5GH_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SPROM4_5GH_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[3], o + SSB_SPROM4_5GH_PA_3, ~0, 0);
++	}
+ 
+ 	sprom_extract_r458(out, in);
+ 
+@@ -621,14 +676,22 @@ static void sprom_extract_r8(struct ssb_
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN01,
++						     SSB_SPROM8_AGAIN0,
++						     SSB_SPROM8_AGAIN0_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN01,
++						     SSB_SPROM8_AGAIN1,
++						     SSB_SPROM8_AGAIN1_SHIFT);
++	out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN23,
++						     SSB_SPROM8_AGAIN2,
++						     SSB_SPROM8_AGAIN2_SHIFT);
++	out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN23,
++						     SSB_SPROM8_AGAIN3,
++						     SSB_SPROM8_AGAIN3_SHIFT);
+ 
+ 	/* Extract cores power info info */
+ 	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
+--- a/drivers/ssb/pcihost_wrapper.c
++++ b/drivers/ssb/pcihost_wrapper.c
+@@ -11,15 +11,17 @@
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
++#include <linux/pm.h>
+ #include <linux/pci.h>
+ #include <linux/export.h>
+ #include <linux/slab.h>
+ #include <linux/ssb/ssb.h>
+ 
+ 
+-#ifdef CONFIG_PM
+-static int ssb_pcihost_suspend(struct pci_dev *dev, pm_message_t state)
++#ifdef CONFIG_PM_SLEEP
++static int ssb_pcihost_suspend(struct device *d)
+ {
++	struct pci_dev *dev = to_pci_dev(d);
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+@@ -28,17 +30,23 @@ static int ssb_pcihost_suspend(struct pc
+ 		return err;
+ 	pci_save_state(dev);
+ 	pci_disable_device(dev);
+-	pci_set_power_state(dev, pci_choose_state(dev, state));
++
++	/* if there is a wakeup enabled child device on ssb bus,
++	   enable pci wakeup posibility. */
++	device_set_wakeup_enable(d, d->power.wakeup_path);
++
++	pci_prepare_to_sleep(dev);
+ 
+ 	return 0;
+ }
+ 
+-static int ssb_pcihost_resume(struct pci_dev *dev)
++static int ssb_pcihost_resume(struct device *d)
+ {
++	struct pci_dev *dev = to_pci_dev(d);
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+-	pci_set_power_state(dev, 0);
++	pci_back_from_sleep(dev);
+ 	err = pci_enable_device(dev);
+ 	if (err)
+ 		return err;
+@@ -49,10 +57,12 @@ static int ssb_pcihost_resume(struct pci
+ 
+ 	return 0;
+ }
+-#else /* CONFIG_PM */
+-# define ssb_pcihost_suspend	NULL
+-# define ssb_pcihost_resume	NULL
+-#endif /* CONFIG_PM */
++
++static const struct dev_pm_ops ssb_pcihost_pm_ops = {
++	SET_SYSTEM_SLEEP_PM_OPS(ssb_pcihost_suspend, ssb_pcihost_resume)
++};
++
++#endif /* CONFIG_PM_SLEEP */
+ 
+ static int ssb_pcihost_probe(struct pci_dev *dev,
+ 			     const struct pci_device_id *id)
+@@ -115,8 +125,9 @@ int ssb_pcihost_register(struct pci_driv
+ {
+ 	driver->probe = ssb_pcihost_probe;
+ 	driver->remove = ssb_pcihost_remove;
+-	driver->suspend = ssb_pcihost_suspend;
+-	driver->resume = ssb_pcihost_resume;
++#ifdef CONFIG_PM_SLEEP
++	driver->driver.pm = &ssb_pcihost_pm_ops;
++#endif
+ 
+ 	return pci_register_driver(driver);
+ }
+--- a/drivers/ssb/sprom.c
++++ b/drivers/ssb/sprom.c
+@@ -54,7 +54,7 @@ static int hex2sprom(u16 *sprom, const c
+ 	while (cnt < sprom_size_words) {
+ 		memcpy(tmp, dump, 4);
+ 		dump += 4;
+-		err = strict_strtoul(tmp, 16, &parsed);
++		err = kstrtoul(tmp, 16, &parsed);
+ 		if (err)
+ 			return err;
+ 		sprom[cnt++] = swab16((u16)parsed);
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
+@@ -243,6 +243,10 @@ static inline int ssb_sflash_init(struct
+ extern struct platform_device ssb_pflash_dev;
+ #endif
+ 
++#ifdef CONFIG_SSB_SFLASH
++extern struct platform_device ssb_sflash_dev;
++#endif
++
+ #ifdef CONFIG_SSB_DRIVER_EXTIF
+ extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);
+ extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -33,6 +33,7 @@ struct ssb_sprom {
+ 	u8 et1phyaddr;		/* MII address for enet1 */
+ 	u8 et0mdcport;		/* MDIO for enet0 */
+ 	u8 et1mdcport;		/* MDIO for enet1 */
++	u16 dev_id;		/* Device ID overriding e.g. PCI ID */
+ 	u16 board_rev;		/* Board revision number from SPROM. */
+ 	u16 board_num;		/* Board number from SPROM. */
+ 	u16 board_type;		/* Board type from SPROM. */
+@@ -486,6 +487,7 @@ struct ssb_bus {
+ #endif /* EMBEDDED */
+ #ifdef CONFIG_SSB_DRIVER_GPIO
+ 	struct gpio_chip gpio;
++	struct irq_domain *irq_domain;
+ #endif /* DRIVER_GPIO */
+ 
+ 	/* Internal-only stuff follows. Do not touch. */
+--- a/include/linux/ssb/ssb_driver_gige.h
++++ b/include/linux/ssb/ssb_driver_gige.h
+@@ -108,6 +108,16 @@ static inline int ssb_gige_get_macaddr(s
+ 	return 0;
+ }
+ 
++/* Get the device phy address */
++static inline int ssb_gige_get_phyaddr(struct pci_dev *pdev)
++{
++	struct ssb_gige *dev = pdev_to_ssb_gige(pdev);
++	if (!dev)
++		return -ENODEV;
++
++	return dev->dev->bus->sprom.et0phyaddr;
++}
++
+ extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
+ 					  struct pci_dev *pdev);
+ extern int ssb_gige_map_irq(struct ssb_device *sdev,
+@@ -174,6 +184,10 @@ static inline int ssb_gige_get_macaddr(s
+ {
+ 	return -ENODEV;
+ }
++static inline int ssb_gige_get_phyaddr(struct pci_dev *pdev)
++{
++	return -ENODEV;
++}
+ 
+ #endif /* CONFIG_SSB_DRIVER_GIGE */
+ #endif /* LINUX_SSB_DRIVER_GIGE_H_ */
+--- a/include/linux/ssb/ssb_driver_mips.h
++++ b/include/linux/ssb/ssb_driver_mips.h
+@@ -20,6 +20,18 @@ struct ssb_pflash {
+ 	u32 window_size;
+ };
+ 
++#ifdef CONFIG_SSB_SFLASH
++struct ssb_sflash {
++	bool present;
++	u32 window;
++	u32 blocksize;
++	u16 numblocks;
++	u32 size;
++
++	void *priv;
++};
++#endif
++
+ struct ssb_mipscore {
+ 	struct ssb_device *dev;
+ 
+@@ -27,6 +39,9 @@ struct ssb_mipscore {
+ 	struct ssb_serial_port serial_ports[4];
+ 
+ 	struct ssb_pflash pflash;
++#ifdef CONFIG_SSB_SFLASH
++	struct ssb_sflash sflash;
++#endif
+ };
+ 
+ extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
+--- a/include/linux/ssb/ssb_regs.h
++++ b/include/linux/ssb/ssb_regs.h
+@@ -172,6 +172,7 @@
+ #define SSB_SPROMSIZE_WORDS_R4		220
+ #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
+ #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
++#define SSB_SPROMSIZE_WORDS_R10		230
+ #define SSB_SPROM_BASE1			0x1000
+ #define SSB_SPROM_BASE31		0x0800
+ #define SSB_SPROM_REVISION		0x007E
+@@ -344,6 +345,43 @@
+ #define  SSB_SPROM4_TXPID5GH2_SHIFT	0
+ #define  SSB_SPROM4_TXPID5GH3		0xFF00
+ #define  SSB_SPROM4_TXPID5GH3_SHIFT	8
++
++/* There are 4 blocks with power info sharing the same layout */
++#define SSB_SPROM4_PWR_INFO_CORE0	0x0080
++#define SSB_SPROM4_PWR_INFO_CORE1	0x00AE
++#define SSB_SPROM4_PWR_INFO_CORE2	0x00DC
++#define SSB_SPROM4_PWR_INFO_CORE3	0x010A
++
++#define SSB_SPROM4_2G_MAXP_ITSSI	0x00	/* 2 GHz ITSSI and 2 GHz Max Power */
++#define  SSB_SPROM4_2G_MAXP		0x00FF
++#define  SSB_SPROM4_2G_ITSSI		0xFF00
++#define  SSB_SPROM4_2G_ITSSI_SHIFT	8
++#define SSB_SPROM4_2G_PA_0		0x02	/* 2 GHz power amp */
++#define SSB_SPROM4_2G_PA_1		0x04
++#define SSB_SPROM4_2G_PA_2		0x06
++#define SSB_SPROM4_2G_PA_3		0x08
++#define SSB_SPROM4_5G_MAXP_ITSSI	0x0A	/* 5 GHz ITSSI and 5.3 GHz Max Power */
++#define  SSB_SPROM4_5G_MAXP		0x00FF
++#define  SSB_SPROM4_5G_ITSSI		0xFF00
++#define  SSB_SPROM4_5G_ITSSI_SHIFT	8
++#define SSB_SPROM4_5GHL_MAXP		0x0C	/* 5.2 GHz and 5.8 GHz Max Power */
++#define  SSB_SPROM4_5GH_MAXP		0x00FF
++#define  SSB_SPROM4_5GL_MAXP		0xFF00
++#define  SSB_SPROM4_5GL_MAXP_SHIFT	8
++#define SSB_SPROM4_5G_PA_0		0x0E	/* 5.3 GHz power amp */
++#define SSB_SPROM4_5G_PA_1		0x10
++#define SSB_SPROM4_5G_PA_2		0x12
++#define SSB_SPROM4_5G_PA_3		0x14
++#define SSB_SPROM4_5GL_PA_0		0x16	/* 5.2 GHz power amp */
++#define SSB_SPROM4_5GL_PA_1		0x18
++#define SSB_SPROM4_5GL_PA_2		0x1A
++#define SSB_SPROM4_5GL_PA_3		0x1C
++#define SSB_SPROM4_5GH_PA_0		0x1E	/* 5.8 GHz power amp */
++#define SSB_SPROM4_5GH_PA_1		0x20
++#define SSB_SPROM4_5GH_PA_2		0x22
++#define SSB_SPROM4_5GH_PA_3		0x24
++
++/* TODO: Make it deprecated */
+ #define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
+ #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
+ #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
+--- a/arch/mips/bcm47xx/sprom.c
++++ b/arch/mips/bcm47xx/sprom.c
+@@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char
+ static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
+ 					const char *prefix, bool fallback)
+ {
++	nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);
diff --git a/trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch b/trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch
new file mode 100644
index 00000000..3ae8fd54
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch
@@ -0,0 +1,2716 @@
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -26,6 +26,7 @@ config BCMA_HOST_PCI_POSSIBLE
+ config BCMA_HOST_PCI
+ 	bool "Support for BCMA on PCI-host bus"
+ 	depends on BCMA_HOST_PCI_POSSIBLE
++	default y
+ 
+ config BCMA_DRIVER_PCI_HOSTMODE
+ 	bool "Driver for PCI core working in hostmode"
+@@ -34,8 +35,14 @@ config BCMA_DRIVER_PCI_HOSTMODE
+ 	  PCI core hostmode operation (external PCI bus).
+ 
+ config BCMA_HOST_SOC
+-	bool
+-	depends on BCMA_DRIVER_MIPS
++	bool "Support for BCMA in a SoC"
++	depends on BCMA
++	help
++	  Host interface for a Broadcom AIX bus directly mapped into
++	  the memory. This only works with the Broadcom SoCs from the
++	  BCM47XX line.
++
++	  If unsure, say N
+ 
+ config BCMA_DRIVER_MIPS
+ 	bool "BCMA Broadcom MIPS core driver"
+@@ -68,6 +75,7 @@ config BCMA_DRIVER_GMAC_CMN
+ config BCMA_DRIVER_GPIO
+ 	bool "BCMA GPIO driver"
+ 	depends on BCMA && GPIOLIB
++	select IRQ_DOMAIN if BCMA_HOST_SOC
+ 	help
+ 	  Driver to provide access to the GPIO pins of the bcma bus.
+ 
+--- a/drivers/bcma/Makefile
++++ b/drivers/bcma/Makefile
+@@ -1,8 +1,10 @@
+ bcma-y					+= main.o scan.o core.o sprom.o
+ bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
++bcma-y					+= driver_chipcommon_b.o
+ bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o
+ bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o
+ bcma-y					+= driver_pci.o
++bcma-y					+= driver_pcie2.o
+ bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)	+= driver_pci_host.o
+ bcma-$(CONFIG_BCMA_DRIVER_MIPS)		+= driver_mips.o
+ bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)	+= driver_gmac_cmn.o
+--- a/drivers/bcma/bcma_private.h
++++ b/drivers/bcma/bcma_private.h
+@@ -22,6 +22,9 @@
+ struct bcma_bus;
+ 
+ /* main.c */
++bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
++		     int timeout);
++void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);
+ int bcma_bus_register(struct bcma_bus *bus);
+ void bcma_bus_unregister(struct bcma_bus *bus);
+ int __init bcma_bus_early_register(struct bcma_bus *bus,
+@@ -31,8 +34,6 @@ int __init bcma_bus_early_register(struc
+ int bcma_bus_suspend(struct bcma_bus *bus);
+ int bcma_bus_resume(struct bcma_bus *bus);
+ #endif
+-struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+-					u8 unit);
+ 
+ /* scan.c */
+ int bcma_bus_scan(struct bcma_bus *bus);
+@@ -50,6 +51,10 @@ void bcma_chipco_serial_init(struct bcma
+ extern struct platform_device bcma_pflash_dev;
+ #endif /* CONFIG_BCMA_DRIVER_MIPS */
+ 
++/* driver_chipcommon_b.c */
++int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);
++void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb);
++
+ /* driver_chipcommon_pmu.c */
+ u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);
+ u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);
+@@ -84,6 +89,20 @@ extern int __init bcma_host_pci_init(voi
+ extern void __exit bcma_host_pci_exit(void);
+ #endif /* CONFIG_BCMA_HOST_PCI */
+ 
++/* host_soc.c */
++#if defined(CONFIG_BCMA_HOST_SOC) && defined(CONFIG_OF)
++extern int __init bcma_host_soc_register_driver(void);
++extern void __exit bcma_host_soc_unregister_driver(void);
++#else
++static inline int __init bcma_host_soc_register_driver(void)
++{
++	return 0;
++}
++static inline void __exit bcma_host_soc_unregister_driver(void)
++{
++}
++#endif /* CONFIG_BCMA_HOST_SOC && CONFIG_OF */
++
+ /* driver_pci.c */
+ u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
+ 
+--- a/drivers/bcma/core.c
++++ b/drivers/bcma/core.c
+@@ -9,6 +9,25 @@
+ #include <linux/export.h>
+ #include <linux/bcma/bcma.h>
+ 
++static bool bcma_core_wait_value(struct bcma_device *core, u16 reg, u32 mask,
++				 u32 value, int timeout)
++{
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
++
++	do {
++		val = bcma_aread32(core, reg);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);
++
++	return false;
++}
++
+ bool bcma_core_is_enabled(struct bcma_device *core)
+ {
+ 	if ((bcma_aread32(core, BCMA_IOCTL) & (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC))
+@@ -25,13 +44,15 @@ void bcma_core_disable(struct bcma_devic
+ 	if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)
+ 		return;
+ 
+-	bcma_awrite32(core, BCMA_IOCTL, flags);
+-	bcma_aread32(core, BCMA_IOCTL);
+-	udelay(10);
++	bcma_core_wait_value(core, BCMA_RESET_ST, ~0, 0, 300);
+ 
+ 	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
+ 	bcma_aread32(core, BCMA_RESET_CTL);
+ 	udelay(1);
++
++	bcma_awrite32(core, BCMA_IOCTL, flags);
++	bcma_aread32(core, BCMA_IOCTL);
++	udelay(10);
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_disable);
+ 
+@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device
+ 	bcma_aread32(core, BCMA_IOCTL);
+ 
+ 	bcma_awrite32(core, BCMA_RESET_CTL, 0);
++	bcma_aread32(core, BCMA_RESET_CTL);
+ 	udelay(1);
+ 
+ 	bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));
+--- a/drivers/bcma/driver_chipcommon.c
++++ b/drivers/bcma/driver_chipcommon.c
+@@ -140,8 +140,15 @@ void bcma_core_chipcommon_init(struct bc
+ 	bcma_core_chipcommon_early_init(cc);
+ 
+ 	if (cc->core->id.rev >= 20) {
+-		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, 0);
+-		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, 0);
++		u32 pullup = 0, pulldown = 0;
++
++		if (cc->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM43142) {
++			pullup = 0x402e0;
++			pulldown = 0x20500;
++		}
++
++		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, pullup);
++		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, pulldown);
+ 	}
+ 
+ 	if (cc->capabilities & BCMA_CC_CAP_PMU)
+@@ -332,7 +339,7 @@ void bcma_chipco_serial_init(struct bcma
+ 		return;
+ 	}
+ 
+-	irq = bcma_core_irq(cc->core);
++	irq = bcma_core_irq(cc->core, 0);
+ 
+ 	/* Determine the registers of the UARTs */
+ 	cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
+--- a/drivers/bcma/driver_chipcommon_pmu.c
++++ b/drivers/bcma/driver_chipcommon_pmu.c
+@@ -56,6 +56,109 @@ void bcma_chipco_regctl_maskset(struct b
+ }
+ EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset);
+ 
++static u32 bcma_pmu_xtalfreq(struct bcma_drv_cc *cc)
++{
++	u32 ilp_ctl, alp_hz;
++
++	if (!(bcma_cc_read32(cc, BCMA_CC_PMU_STAT) &
++	      BCMA_CC_PMU_STAT_EXT_LPO_AVAIL))
++		return 0;
++
++	bcma_cc_write32(cc, BCMA_CC_PMU_XTAL_FREQ,
++			BIT(BCMA_CC_PMU_XTAL_FREQ_MEASURE_SHIFT));
++	usleep_range(1000, 2000);
++
++	ilp_ctl = bcma_cc_read32(cc, BCMA_CC_PMU_XTAL_FREQ);
++	ilp_ctl &= BCMA_CC_PMU_XTAL_FREQ_ILPCTL_MASK;
++
++	bcma_cc_write32(cc, BCMA_CC_PMU_XTAL_FREQ, 0);
++
++	alp_hz = ilp_ctl * 32768 / 4;
++	return (alp_hz + 50000) / 100000 * 100;
++}
++
++static void bcma_pmu2_pll_init0(struct bcma_drv_cc *cc, u32 xtalfreq)
++{
++	struct bcma_bus *bus = cc->core->bus;
++	u32 freq_tgt_target = 0, freq_tgt_current;
++	u32 pll0, mask;
++
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		/* pmu2_xtaltab0_adfll_485 */
++		switch (xtalfreq) {
++		case 12000:
++			freq_tgt_target = 0x50D52;
++			break;
++		case 20000:
++			freq_tgt_target = 0x307FE;
++			break;
++		case 26000:
++			freq_tgt_target = 0x254EA;
++			break;
++		case 37400:
++			freq_tgt_target = 0x19EF8;
++			break;
++		case 52000:
++			freq_tgt_target = 0x12A75;
++			break;
++		}
++		break;
++	}
++
++	if (!freq_tgt_target) {
++		bcma_err(bus, "Unknown TGT frequency for xtalfreq %d\n",
++			 xtalfreq);
++		return;
++	}
++
++	pll0 = bcma_chipco_pll_read(cc, BCMA_CC_PMU15_PLL_PLLCTL0);
++	freq_tgt_current = (pll0 & BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK) >>
++		BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT;
++
++	if (freq_tgt_current == freq_tgt_target) {
++		bcma_debug(bus, "Target TGT frequency already set\n");
++		return;
++	}
++
++	/* Turn off PLL */
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		mask = (u32)~(BCMA_RES_4314_HT_AVAIL |
++			      BCMA_RES_4314_MACPHY_CLK_AVAIL);
++
++		bcma_cc_mask32(cc, BCMA_CC_PMU_MINRES_MSK, mask);
++		bcma_cc_mask32(cc, BCMA_CC_PMU_MAXRES_MSK, mask);
++		bcma_wait_value(cc->core, BCMA_CLKCTLST,
++				BCMA_CLKCTLST_HAVEHT, 0, 20000);
++		break;
++	}
++
++	pll0 &= ~BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK;
++	pll0 |= freq_tgt_target << BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT;
++	bcma_chipco_pll_write(cc, BCMA_CC_PMU15_PLL_PLLCTL0, pll0);
++
++	/* Flush */
++	if (cc->pmu.rev >= 2)
++		bcma_cc_set32(cc, BCMA_CC_PMU_CTL, BCMA_CC_PMU_CTL_PLL_UPD);
++
++	/* TODO: Do we need to update OTP? */
++}
++
++static void bcma_pmu_pll_init(struct bcma_drv_cc *cc)
++{
++	struct bcma_bus *bus = cc->core->bus;
++	u32 xtalfreq = bcma_pmu_xtalfreq(cc);
++
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		if (xtalfreq == 0)
++			xtalfreq = 20000;
++		bcma_pmu2_pll_init0(cc, xtalfreq);
++		break;
++	}
++}
++
+ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+@@ -66,6 +169,25 @@ static void bcma_pmu_resources_init(stru
+ 		min_msk = 0x200D;
+ 		max_msk = 0xFFFF;
+ 		break;
++	case BCMA_CHIP_ID_BCM43142:
++		min_msk = BCMA_RES_4314_LPLDO_PU |
++			  BCMA_RES_4314_PMU_SLEEP_DIS |
++			  BCMA_RES_4314_PMU_BG_PU |
++			  BCMA_RES_4314_CBUCK_LPOM_PU |
++			  BCMA_RES_4314_CBUCK_PFM_PU |
++			  BCMA_RES_4314_CLDO_PU |
++			  BCMA_RES_4314_LPLDO2_LVM |
++			  BCMA_RES_4314_WL_PMU_PU |
++			  BCMA_RES_4314_LDO3P3_PU |
++			  BCMA_RES_4314_OTP_PU |
++			  BCMA_RES_4314_WL_PWRSW_PU |
++			  BCMA_RES_4314_LQ_AVAIL |
++			  BCMA_RES_4314_LOGIC_RET |
++			  BCMA_RES_4314_MEM_SLEEP |
++			  BCMA_RES_4314_MACPHY_RET |
++			  BCMA_RES_4314_WL_CORE_READY;
++		max_msk = 0x3FFFFFFF;
++		break;
+ 	default:
+ 		bcma_debug(bus, "PMU resource config unknown or not needed for device 0x%04X\n",
+ 			   bus->chipinfo.id);
+@@ -165,6 +287,7 @@ void bcma_pmu_init(struct bcma_drv_cc *c
+ 		bcma_cc_set32(cc, BCMA_CC_PMU_CTL,
+ 			     BCMA_CC_PMU_CTL_NOILPONW);
+ 
++	bcma_pmu_pll_init(cc);
+ 	bcma_pmu_resources_init(cc);
+ 	bcma_pmu_workarounds(cc);
+ }
+@@ -480,6 +603,8 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;
+ 		break;
+ 
++	case BCMA_CHIP_ID_BCM43131:
++	case BCMA_CHIP_ID_BCM43217:
+ 	case BCMA_CHIP_ID_BCM43227:
+ 	case BCMA_CHIP_ID_BCM43228:
+ 	case BCMA_CHIP_ID_BCM43428:
+--- a/drivers/bcma/driver_chipcommon_sflash.c
++++ b/drivers/bcma/driver_chipcommon_sflash.c
+@@ -30,7 +30,7 @@ struct bcma_sflash_tbl_e {
+ 	u16 numblocks;
+ };
+ 
+-static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
++static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
+ 	{ "M25P20", 0x11, 0x10000, 4, },
+ 	{ "M25P40", 0x12, 0x10000, 8, },
+ 
+@@ -38,10 +38,10 @@ static struct bcma_sflash_tbl_e bcma_sfl
+ 	{ "M25P32", 0x15, 0x10000, 64, },
+ 	{ "M25P64", 0x16, 0x10000, 128, },
+ 	{ "M25FL128", 0x17, 0x10000, 256, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+-static struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
++static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
+ 	{ "SST25WF512", 1, 0x1000, 16, },
+ 	{ "SST25VF512", 0x48, 0x1000, 16, },
+ 	{ "SST25WF010", 2, 0x1000, 32, },
+@@ -56,10 +56,10 @@ static struct bcma_sflash_tbl_e bcma_sfl
+ 	{ "SST25VF016", 0x41, 0x1000, 512, },
+ 	{ "SST25VF032", 0x4a, 0x1000, 1024, },
+ 	{ "SST25VF064", 0x4b, 0x1000, 2048, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+-static struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
++static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
+ 	{ "AT45DB011", 0xc, 256, 512, },
+ 	{ "AT45DB021", 0x14, 256, 1024, },
+ 	{ "AT45DB041", 0x1c, 256, 2048, },
+@@ -67,7 +67,7 @@ static struct bcma_sflash_tbl_e bcma_sfl
+ 	{ "AT45DB161", 0x2c, 512, 4096, },
+ 	{ "AT45DB321", 0x34, 512, 8192, },
+ 	{ "AT45DB642", 0x3c, 1024, 8192, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode)
+@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+ 	struct bcma_sflash *sflash = &cc->sflash;
+-	struct bcma_sflash_tbl_e *e;
++	const struct bcma_sflash_tbl_e *e;
+ 	u32 id, id2;
+ 
+ 	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -9,6 +9,9 @@
+  */
+ 
+ #include <linux/gpio.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/irqdomain.h>
+ #include <linux/export.h>
+ #include <linux/bcma/bcma.h>
+ 
+@@ -73,19 +76,136 @@ static void bcma_gpio_free(struct gpio_c
+ 	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
+ }
+ 
++#if IS_BUILTIN(CONFIG_BCM47XX)
+ static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
+ {
+ 	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+ 
+ 	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
+-		return bcma_core_irq(cc->core);
++		return irq_find_mapping(cc->irq_domain, gpio);
+ 	else
+ 		return -EINVAL;
+ }
+ 
++static void bcma_gpio_irq_unmask(struct irq_data *d)
++{
++	struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++	u32 val = bcma_chipco_gpio_in(cc, BIT(gpio));
++
++	bcma_chipco_gpio_polarity(cc, BIT(gpio), val);
++	bcma_chipco_gpio_intmask(cc, BIT(gpio), BIT(gpio));
++}
++
++static void bcma_gpio_irq_mask(struct irq_data *d)
++{
++	struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++
++	bcma_chipco_gpio_intmask(cc, BIT(gpio), 0);
++}
++
++static struct irq_chip bcma_gpio_irq_chip = {
++	.name		= "BCMA-GPIO",
++	.irq_mask	= bcma_gpio_irq_mask,
++	.irq_unmask	= bcma_gpio_irq_unmask,
++};
++
++static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)
++{
++	struct bcma_drv_cc *cc = dev_id;
++	u32 val = bcma_cc_read32(cc, BCMA_CC_GPIOIN);
++	u32 mask = bcma_cc_read32(cc, BCMA_CC_GPIOIRQ);
++	u32 pol = bcma_cc_read32(cc, BCMA_CC_GPIOPOL);
++	unsigned long irqs = (val ^ pol) & mask;
++	int gpio;
++
++	if (!irqs)
++		return IRQ_NONE;
++
++	for_each_set_bit(gpio, &irqs, cc->gpio.ngpio)
++		generic_handle_irq(bcma_gpio_to_irq(&cc->gpio, gpio));
++	bcma_chipco_gpio_polarity(cc, irqs, val & irqs);
++
++	return IRQ_HANDLED;
++}
++
++static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc)
++{
++	struct gpio_chip *chip = &cc->gpio;
++	int gpio, hwirq, err;
++
++	if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
++		return 0;
++
++	cc->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
++					       &irq_domain_simple_ops, cc);
++	if (!cc->irq_domain) {
++		err = -ENODEV;
++		goto err_irq_domain;
++	}
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_create_mapping(cc->irq_domain, gpio);
++
++		irq_set_chip_data(irq, cc);
++		irq_set_chip_and_handler(irq, &bcma_gpio_irq_chip,
++					 handle_simple_irq);
++	}
++
++	hwirq = bcma_core_irq(cc->core, 0);
++	err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio",
++			  cc);
++	if (err)
++		goto err_req_irq;
++
++	bcma_chipco_gpio_intmask(cc, ~0, 0);
++	bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO);
++
++	return 0;
++
++err_req_irq:
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(cc->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(cc->irq_domain);
++err_irq_domain:
++	return err;
++}
++
++static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc)
++{
++	struct gpio_chip *chip = &cc->gpio;
++	int gpio;
++
++	if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
++		return;
++
++	bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO);
++	free_irq(bcma_core_irq(cc->core, 0), cc);
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(cc->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(cc->irq_domain);
++}
++#else
++static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc)
++{
++	return 0;
++}
++
++static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc)
++{
++}
++#endif
++
+ int bcma_gpio_init(struct bcma_drv_cc *cc)
+ {
+ 	struct gpio_chip *chip = &cc->gpio;
++	int err;
+ 
+ 	chip->label		= "bcma_gpio";
+ 	chip->owner		= THIS_MODULE;
+@@ -95,8 +215,22 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ 	chip->set		= bcma_gpio_set_value;
+ 	chip->direction_input	= bcma_gpio_direction_input;
+ 	chip->direction_output	= bcma_gpio_direction_output;
++#if IS_BUILTIN(CONFIG_BCM47XX)
+ 	chip->to_irq		= bcma_gpio_to_irq;
+-	chip->ngpio		= 16;
++#endif
++#if IS_BUILTIN(CONFIG_OF)
++	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
++		chip->of_node	= cc->core->dev.of_node;
++#endif
++	switch (cc->core->bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM53572:
++		chip->ngpio	= 32;
++		break;
++	default:
++		chip->ngpio	= 16;
++	}
++
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+ 	 * a random base number. */
+@@ -105,10 +239,22 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ 	else
+ 		chip->base		= -1;
+ 
+-	return gpiochip_add(chip);
++	err = bcma_gpio_irq_domain_init(cc);
++	if (err)
++		return err;
++
++	err = gpiochip_add(chip);
++	if (err) {
++		bcma_gpio_irq_domain_exit(cc);
++		return err;
++	}
++
++	return 0;
+ }
+ 
+ int bcma_gpio_unregister(struct bcma_drv_cc *cc)
+ {
+-	return gpiochip_remove(&cc->gpio);
++	bcma_gpio_irq_domain_exit(cc);
++	gpiochip_remove(&cc->gpio);
++	return 0;
+ }
+--- a/drivers/bcma/driver_pci.c
++++ b/drivers/bcma/driver_pci.c
+@@ -31,7 +31,7 @@ static void bcma_pcie_write(struct bcma_
+ 	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_DATA, data);
+ }
+ 
+-static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy)
++static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u16 phy)
+ {
+ 	u32 v;
+ 	int i;
+@@ -55,7 +55,7 @@ static void bcma_pcie_mdio_set_phy(struc
+ 	}
+ }
+ 
+-static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address)
++static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address)
+ {
+ 	int max_retries = 10;
+ 	u16 ret = 0;
+@@ -98,7 +98,7 @@ static u16 bcma_pcie_mdio_read(struct bc
+ 	return ret;
+ }
+ 
+-static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device,
++static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device,
+ 				u8 address, u16 data)
+ {
+ 	int max_retries = 10;
+@@ -137,6 +137,13 @@ static void bcma_pcie_mdio_write(struct
+ 	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
+ }
+ 
++static u16 bcma_pcie_mdio_writeread(struct bcma_drv_pci *pc, u16 device,
++				    u8 address, u16 data)
++{
++	bcma_pcie_mdio_write(pc, device, address, data);
++	return bcma_pcie_mdio_read(pc, device, address);
++}
++
+ /**************************************************
+  * Workarounds.
+  **************************************************/
+@@ -229,6 +236,32 @@ void bcma_core_pci_init(struct bcma_drv_
+ 		bcma_core_pci_clientmode_init(pc);
+ }
+ 
++void bcma_core_pci_power_save(struct bcma_bus *bus, bool up)
++{
++	struct bcma_drv_pci *pc;
++	u16 data;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	if (pc->core->id.rev >= 15 && pc->core->id.rev <= 20) {
++		data = up ? 0x74 : 0x7C;
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7F64);
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);
++	} else if (pc->core->id.rev >= 21 && pc->core->id.rev <= 22) {
++		data = up ? 0x75 : 0x7D;
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7E65);
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);
++	}
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);
++
+ int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
+ 			  bool enable)
+ {
+@@ -262,7 +295,7 @@ out:
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);
+ 
+-void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)
++static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)
+ {
+ 	u32 w;
+ 
+@@ -274,4 +307,29 @@ void bcma_core_pci_extend_L1timer(struct
+ 	bcma_pcie_write(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG, w);
+ 	bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);
+ }
+-EXPORT_SYMBOL_GPL(bcma_core_pci_extend_L1timer);
++
++void bcma_core_pci_up(struct bcma_bus *bus)
++{
++	struct bcma_drv_pci *pc;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	bcma_core_pci_extend_L1timer(pc, true);
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_up);
++
++void bcma_core_pci_down(struct bcma_bus *bus)
++{
++	struct bcma_drv_pci *pc;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	bcma_core_pci_extend_L1timer(pc, false);
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_down);
+--- a/drivers/bcma/driver_pci_host.c
++++ b/drivers/bcma/driver_pci_host.c
+@@ -581,6 +581,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI
+ int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
+ {
+ 	struct bcma_drv_pci_host *pc_host;
++	int readrq;
+ 
+ 	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
+ 		/* This is not a device on the PCI-core bridge. */
+@@ -592,9 +593,14 @@ int bcma_core_pci_plat_dev_init(struct p
+ 	pr_info("PCI: Fixing up device %s\n", pci_name(dev));
+ 
+ 	/* Fix up interrupt lines */
+-	dev->irq = bcma_core_irq(pc_host->pdev->core);
++	dev->irq = bcma_core_irq(pc_host->pdev->core, 0);
+ 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+ 
++	readrq = pcie_get_readrq(dev);
++	if (readrq > 128) {
++		pr_info("change PCIe max read request size from %i to 128\n", readrq);
++		pcie_set_readrq(dev, 128);
++	}
+ 	return 0;
+ }
+ EXPORT_SYMBOL(bcma_core_pci_plat_dev_init);
+@@ -611,6 +617,6 @@ int bcma_core_pci_pcibios_map_irq(const
+ 
+ 	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
+ 			       pci_ops);
+-	return bcma_core_irq(pc_host->pdev->core);
++	return bcma_core_irq(pc_host->pdev->core, 0);
+ }
+ EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
+--- /dev/null
++++ b/drivers/bcma/driver_pcie2.c
+@@ -0,0 +1,175 @@
++/*
++ * Broadcom specific AMBA
++ * PCIe Gen 2 Core
++ *
++ * Copyright 2014, Broadcom Corporation
++ * Copyright 2014, Rafał Miłecki <zajec5@gmail.com>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++#include <linux/bcma/bcma.h>
++
++/**************************************************
++ * R/W ops.
++ **************************************************/
++
++#if 0
++static u32 bcma_core_pcie2_cfg_read(struct bcma_drv_pcie2 *pcie2, u32 addr)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, addr);
++	pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR);
++	return pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA);
++}
++#endif
++
++static void bcma_core_pcie2_cfg_write(struct bcma_drv_pcie2 *pcie2, u32 addr,
++				      u32 val)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, addr);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, val);
++}
++
++/**************************************************
++ * Init.
++ **************************************************/
++
++static u32 bcma_core_pcie2_war_delay_perst_enab(struct bcma_drv_pcie2 *pcie2,
++						bool enable)
++{
++	u32 val;
++
++	/* restore back to default */
++	val = pcie2_read32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL);
++	val |= PCIE2_CLKC_DLYPERST;
++	val &= ~PCIE2_CLKC_DISSPROMLD;
++	if (enable) {
++		val &= ~PCIE2_CLKC_DLYPERST;
++		val |= PCIE2_CLKC_DISSPROMLD;
++	}
++	pcie2_write32(pcie2, (BCMA_CORE_PCIE2_CLK_CONTROL), val);
++	/* flush */
++	return pcie2_read32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL);
++}
++
++static void bcma_core_pcie2_set_ltr_vals(struct bcma_drv_pcie2 *pcie2)
++{
++	/* LTR0 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x844);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x883c883c);
++	/* LTR1 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x848);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x88648864);
++	/* LTR2 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x84C);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x90039003);
++}
++
++static void bcma_core_pcie2_hw_ltr_war(struct bcma_drv_pcie2 *pcie2)
++{
++	u8 core_rev = pcie2->core->id.rev;
++	u32 devstsctr2;
++
++	if (core_rev < 2 || core_rev == 10 || core_rev > 13)
++		return;
++
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++		      PCIE2_CAP_DEVSTSCTRL2_OFFSET);
++	devstsctr2 = pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA);
++	if (devstsctr2 & PCIE2_CAP_DEVSTSCTRL2_LTRENAB) {
++		/* force the right LTR values */
++		bcma_core_pcie2_set_ltr_vals(pcie2);
++
++		/* TODO:
++		si_core_wrapperreg(pcie2, 3, 0x60, 0x8080, 0); */
++
++		/* enable the LTR */
++		devstsctr2 |= PCIE2_CAP_DEVSTSCTRL2_LTRENAB;
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++			      PCIE2_CAP_DEVSTSCTRL2_OFFSET);
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, devstsctr2);
++
++		/* set the LTR state to be active */
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_LTR_STATE,
++			      PCIE2_LTR_ACTIVE);
++		usleep_range(1000, 2000);
++
++		/* set the LTR state to be sleep */
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_LTR_STATE,
++			      PCIE2_LTR_SLEEP);
++		usleep_range(1000, 2000);
++	}
++}
++
++static void pciedev_crwlpciegen2(struct bcma_drv_pcie2 *pcie2)
++{
++	u8 core_rev = pcie2->core->id.rev;
++	bool pciewar160, pciewar162;
++
++	pciewar160 = core_rev == 7 || core_rev == 9 || core_rev == 11;
++	pciewar162 = core_rev == 5 || core_rev == 7 || core_rev == 8 ||
++		     core_rev == 9 || core_rev == 11;
++
++	if (!pciewar160 && !pciewar162)
++		return;
++
++/* TODO */
++#if 0
++	pcie2_set32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL,
++		    PCIE_DISABLE_L1CLK_GATING);
++#if 0
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++		      PCIEGEN2_COE_PVT_TL_CTRL_0);
++	pcie2_mask32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA,
++		     ~(1 << COE_PVT_TL_CTRL_0_PM_DIS_L1_REENTRY_BIT));
++#endif
++#endif
++}
++
++static void pciedev_crwlpciegen2_180(struct bcma_drv_pcie2 *pcie2)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, PCIE2_PMCR_REFUP);
++	pcie2_set32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x1f);
++}
++
++static void pciedev_crwlpciegen2_182(struct bcma_drv_pcie2 *pcie2)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, PCIE2_SBMBX);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 1 << 0);
++}
++
++static void pciedev_reg_pm_clk_period(struct bcma_drv_pcie2 *pcie2)
++{
++	struct bcma_drv_cc *drv_cc = &pcie2->core->bus->drv_cc;
++	u8 core_rev = pcie2->core->id.rev;
++	u32 alp_khz, pm_value;
++
++	if (core_rev <= 13) {
++		alp_khz = bcma_pmu_get_alp_clock(drv_cc) / 1000;
++		pm_value = (1000000 * 2) / alp_khz;
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++			      PCIE2_PVT_REG_PM_CLK_PERIOD);
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, pm_value);
++	}
++}
++
++void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2)
++{
++	struct bcma_chipinfo *ci = &pcie2->core->bus->chipinfo;
++	u32 tmp;
++
++	tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54));
++	if ((tmp & 0xe) >> 1 == 2)
++		bcma_core_pcie2_cfg_write(pcie2, 0x4e0, 0x17);
++
++	/* TODO: Do we need pcie_reqsize? */
++
++	if (ci->id == BCMA_CHIP_ID_BCM4360 && ci->rev > 3)
++		bcma_core_pcie2_war_delay_perst_enab(pcie2, true);
++	bcma_core_pcie2_hw_ltr_war(pcie2);
++	pciedev_crwlpciegen2(pcie2);
++	pciedev_reg_pm_clk_period(pcie2);
++	pciedev_crwlpciegen2_180(pcie2);
++	pciedev_crwlpciegen2_182(pcie2);
++}
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -188,8 +188,11 @@ static int bcma_host_pci_probe(struct pc
+ 		pci_write_config_dword(dev, 0x40, val & 0xffff00ff);
+ 
+ 	/* SSB needed additional powering up, do we have any AMBA PCI cards? */
+-	if (!pci_is_pcie(dev))
+-		bcma_err(bus, "PCI card detected, report problems.\n");
++	if (!pci_is_pcie(dev)) {
++		bcma_err(bus, "PCI card detected, they are not supported.\n");
++		err = -ENXIO;
++		goto err_pci_release_regions;
++	}
+ 
+ 	/* Map MMIO */
+ 	err = -ENOMEM;
+@@ -205,6 +208,9 @@ static int bcma_host_pci_probe(struct pc
+ 	bus->boardinfo.vendor = bus->host_pci->subsystem_vendor;
+ 	bus->boardinfo.type = bus->host_pci->subsystem_device;
+ 
++	/* Initialize struct, detect chip */
++	bcma_init_bus(bus);
++
+ 	/* Register */
+ 	err = bcma_bus_register(bus);
+ 	if (err)
+@@ -235,7 +241,6 @@ static void bcma_host_pci_remove(struct
+ 	pci_release_regions(dev);
+ 	pci_disable_device(dev);
+ 	kfree(bus);
+-	pci_set_drvdata(dev, NULL);
+ }
+ 
+ #ifdef CONFIG_PM_SLEEP
+@@ -267,15 +272,21 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc
+ 
+ #endif /* CONFIG_PM_SLEEP */
+ 
+-static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
++static const struct pci_device_id bcma_pci_bridge_tbl[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
+-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },	/* 0xa8d8 */
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xa8db, BCM43217 (sic!) */
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43228) },	/* 0xa8dc */
+ 	{ 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -10,6 +10,8 @@
+ #include <linux/platform_device.h>
+ #include <linux/bcma/bcma.h>
+ #include <linux/slab.h>
++#include <linux/of_address.h>
++#include <linux/of_irq.h>
+ 
+ MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
+ MODULE_LICENSE("GPL");
+@@ -69,28 +71,36 @@ static u16 bcma_cc_core_id(struct bcma_b
+ 	return BCMA_CORE_CHIPCOMMON;
+ }
+ 
+-struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
++struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
++					u8 unit)
+ {
+ 	struct bcma_device *core;
+ 
+ 	list_for_each_entry(core, &bus->cores, list) {
+-		if (core->id.id == coreid)
++		if (core->id.id == coreid && core->core_unit == unit)
+ 			return core;
+ 	}
+ 	return NULL;
+ }
+-EXPORT_SYMBOL_GPL(bcma_find_core);
++EXPORT_SYMBOL_GPL(bcma_find_core_unit);
+ 
+-struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+-					u8 unit)
++bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
++		     int timeout)
+ {
+-	struct bcma_device *core;
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
+ 
+-	list_for_each_entry(core, &bus->cores, list) {
+-		if (core->id.id == coreid && core->core_unit == unit)
+-			return core;
+-	}
+-	return NULL;
++	do {
++		val = bcma_read32(core, reg);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);
++
++	return false;
+ }
+ 
+ static void bcma_release_core_dev(struct device *dev)
+@@ -103,55 +113,195 @@ static void bcma_release_core_dev(struct
+ 	kfree(core);
+ }
+ 
+-static int bcma_register_cores(struct bcma_bus *bus)
++static bool bcma_is_core_needed_early(u16 core_id)
++{
++	switch (core_id) {
++	case BCMA_CORE_NS_NAND:
++	case BCMA_CORE_NS_QSPI:
++		return true;
++	}
++
++	return false;
++}
++
++#if defined(CONFIG_OF) && defined(CONFIG_OF_ADDRESS)
++static struct device_node *bcma_of_find_child_device(struct platform_device *parent,
++						     struct bcma_device *core)
++{
++	struct device_node *node;
++	u64 size;
++	const __be32 *reg;
++
++	if (!parent || !parent->dev.of_node)
++		return NULL;
++
++	for_each_child_of_node(parent->dev.of_node, node) {
++		reg = of_get_address(node, 0, &size, NULL);
++		if (!reg)
++			continue;
++		if (of_translate_address(node, reg) == core->addr)
++			return node;
++	}
++	return NULL;
++}
++
++static int bcma_of_irq_parse(struct platform_device *parent,
++			     struct bcma_device *core,
++			     struct of_phandle_args *out_irq, int num)
++{
++	__be32 laddr[1];
++	int rc;
++
++	if (core->dev.of_node) {
++		rc = of_irq_parse_one(core->dev.of_node, num, out_irq);
++		if (!rc)
++			return rc;
++	}
++
++	out_irq->np = parent->dev.of_node;
++	out_irq->args_count = 1;
++	out_irq->args[0] = num;
++
++	laddr[0] = cpu_to_be32(core->addr);
++	return of_irq_parse_raw(laddr, out_irq);
++}
++
++static unsigned int bcma_of_get_irq(struct platform_device *parent,
++				    struct bcma_device *core, int num)
++{
++	struct of_phandle_args out_irq;
++	int ret;
++
++	if (!parent || !parent->dev.of_node)
++		return 0;
++
++	ret = bcma_of_irq_parse(parent, core, &out_irq, num);
++	if (ret) {
++		bcma_debug(core->bus, "bcma_of_get_irq() failed with rc=%d\n",
++			   ret);
++		return 0;
++	}
++
++	return irq_create_of_mapping(&out_irq);
++}
++
++static void bcma_of_fill_device(struct platform_device *parent,
++				struct bcma_device *core)
++{
++	struct device_node *node;
++
++	node = bcma_of_find_child_device(parent, core);
++	if (node)
++		core->dev.of_node = node;
++
++	core->irq = bcma_of_get_irq(parent, core, 0);
++}
++#else
++static void bcma_of_fill_device(struct platform_device *parent,
++				struct bcma_device *core)
++{
++}
++static inline unsigned int bcma_of_get_irq(struct platform_device *parent,
++					   struct bcma_device *core, int num)
++{
++	return 0;
++}
++#endif /* CONFIG_OF */
++
++unsigned int bcma_core_irq(struct bcma_device *core, int num)
++{
++	struct bcma_bus *bus = core->bus;
++	unsigned int mips_irq;
++
++	switch (bus->hosttype) {
++	case BCMA_HOSTTYPE_PCI:
++		return bus->host_pci->irq;
++	case BCMA_HOSTTYPE_SOC:
++		if (bus->drv_mips.core && num == 0) {
++			mips_irq = bcma_core_mips_irq(core);
++			return mips_irq <= 4 ? mips_irq + 2 : 0;
++		}
++		if (bus->host_pdev)
++			return bcma_of_get_irq(bus->host_pdev, core, num);
++		return 0;
++	case BCMA_HOSTTYPE_SDIO:
++		return 0;
++	}
++
++	return 0;
++}
++EXPORT_SYMBOL(bcma_core_irq);
++
++void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
++{
++	core->dev.release = bcma_release_core_dev;
++	core->dev.bus = &bcma_bus_type;
++	dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
++
++	switch (bus->hosttype) {
++	case BCMA_HOSTTYPE_PCI:
++		core->dev.parent = &bus->host_pci->dev;
++		core->dma_dev = &bus->host_pci->dev;
++		core->irq = bus->host_pci->irq;
++		break;
++	case BCMA_HOSTTYPE_SOC:
++		core->dev.dma_mask = &core->dev.coherent_dma_mask;
++		if (bus->host_pdev) {
++			core->dma_dev = &bus->host_pdev->dev;
++			core->dev.parent = &bus->host_pdev->dev;
++			bcma_of_fill_device(bus->host_pdev, core);
++		} else {
++			core->dma_dev = &core->dev;
++		}
++		break;
++	case BCMA_HOSTTYPE_SDIO:
++		break;
++	}
++}
++
++static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
++{
++	int err;
++
++	err = device_register(&core->dev);
++	if (err) {
++		bcma_err(bus, "Could not register dev for core 0x%03X\n",
++			 core->id.id);
++		put_device(&core->dev);
++		return;
++	}
++	core->dev_registered = true;
++}
++
++static int bcma_register_devices(struct bcma_bus *bus)
+ {
+ 	struct bcma_device *core;
+-	int err, dev_id = 0;
++	int err;
+ 
+ 	list_for_each_entry(core, &bus->cores, list) {
+ 		/* We support that cores ourself */
+ 		switch (core->id.id) {
+ 		case BCMA_CORE_4706_CHIPCOMMON:
+ 		case BCMA_CORE_CHIPCOMMON:
++		case BCMA_CORE_NS_CHIPCOMMON_B:
+ 		case BCMA_CORE_PCI:
+ 		case BCMA_CORE_PCIE:
++		case BCMA_CORE_PCIE2:
+ 		case BCMA_CORE_MIPS_74K:
+ 		case BCMA_CORE_4706_MAC_GBIT_COMMON:
+ 			continue;
+ 		}
+ 
++		/* Early cores were already registered */
++		if (bcma_is_core_needed_early(core->id.id))
++			continue;
++
+ 		/* Only first GMAC core on BCM4706 is connected and working */
+ 		if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
+ 		    core->core_unit > 0)
+ 			continue;
+ 
+-		core->dev.release = bcma_release_core_dev;
+-		core->dev.bus = &bcma_bus_type;
+-		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
+-
+-		switch (bus->hosttype) {
+-		case BCMA_HOSTTYPE_PCI:
+-			core->dev.parent = &bus->host_pci->dev;
+-			core->dma_dev = &bus->host_pci->dev;
+-			core->irq = bus->host_pci->irq;
+-			break;
+-		case BCMA_HOSTTYPE_SOC:
+-			core->dev.dma_mask = &core->dev.coherent_dma_mask;
+-			core->dma_dev = &core->dev;
+-			break;
+-		case BCMA_HOSTTYPE_SDIO:
+-			break;
+-		}
+-
+-		err = device_register(&core->dev);
+-		if (err) {
+-			bcma_err(bus,
+-				 "Could not register dev for core 0x%03X\n",
+-				 core->id.id);
+-			continue;
+-		}
+-		core->dev_registered = true;
+-		dev_id++;
++		bcma_register_core(bus, core);
+ 	}
+ 
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+@@ -218,7 +368,7 @@ int bcma_bus_register(struct bcma_bus *b
+ 	err = bcma_bus_scan(bus);
+ 	if (err) {
+ 		bcma_err(bus, "Failed to scan: %d\n", err);
+-		return -1;
++		return err;
+ 	}
+ 
+ 	/* Early init CC core */
+@@ -228,6 +378,12 @@ int bcma_bus_register(struct bcma_bus *b
+ 		bcma_core_chipcommon_early_init(&bus->drv_cc);
+ 	}
+ 
++	/* Cores providing flash access go before SPROM init */
++	list_for_each_entry(core, &bus->cores, list) {
++		if (bcma_is_core_needed_early(core->id.id))
++			bcma_register_core(bus, core);
++	}
++
+ 	/* Try to get SPROM */
+ 	err = bcma_sprom_get(bus);
+ 	if (err == -ENOENT) {
+@@ -242,6 +398,13 @@ int bcma_bus_register(struct bcma_bus *b
+ 		bcma_core_chipcommon_init(&bus->drv_cc);
+ 	}
+ 
++	/* Init CC core */
++	core = bcma_find_core(bus, BCMA_CORE_NS_CHIPCOMMON_B);
++	if (core) {
++		bus->drv_cc_b.core = core;
++		bcma_core_chipcommon_b_init(&bus->drv_cc_b);
++	}
++
+ 	/* Init MIPS core */
+ 	core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+ 	if (core) {
+@@ -263,6 +426,13 @@ int bcma_bus_register(struct bcma_bus *b
+ 		bcma_core_pci_init(&bus->drv_pci[1]);
+ 	}
+ 
++	/* Init PCIe Gen 2 core */
++	core = bcma_find_core_unit(bus, BCMA_CORE_PCIE2, 0);
++	if (core) {
++		bus->drv_pcie2.core = core;
++		bcma_core_pcie2_init(&bus->drv_pcie2);
++	}
++
+ 	/* Init GBIT MAC COMMON core */
+ 	core = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
+ 	if (core) {
+@@ -271,7 +441,7 @@ int bcma_bus_register(struct bcma_bus *b
+ 	}
+ 
+ 	/* Register found cores */
+-	bcma_register_cores(bus);
++	bcma_register_devices(bus);
+ 
+ 	bcma_info(bus, "Bus registered\n");
+ 
+@@ -289,6 +459,8 @@ void bcma_bus_unregister(struct bcma_bus
+ 	else if (err)
+ 		bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
+ 
++	bcma_core_chipcommon_b_free(&bus->drv_cc_b);
++
+ 	cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+ 	cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);
+ 	cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
+@@ -308,8 +480,6 @@ int __init bcma_bus_early_register(struc
+ 	struct bcma_device *core;
+ 	struct bcma_device_id match;
+ 
+-	bcma_init_bus(bus);
+-
+ 	match.manuf = BCMA_MANUF_BCM;
+ 	match.id = bcma_cc_core_id(bus);
+ 	match.class = BCMA_CL_SIM;
+@@ -468,6 +638,11 @@ static int __init bcma_modinit(void)
+ 	if (err)
+ 		return err;
+ 
++	err = bcma_host_soc_register_driver();
++	if (err) {
++		pr_err("SoC host initialization failed\n");
++		err = 0;
++	}
+ #ifdef CONFIG_BCMA_HOST_PCI
+ 	err = bcma_host_pci_init();
+ 	if (err) {
+@@ -485,6 +660,7 @@ static void __exit bcma_modexit(void)
+ #ifdef CONFIG_BCMA_HOST_PCI
+ 	bcma_host_pci_exit();
+ #endif
++	bcma_host_soc_unregister_driver();
+ 	bus_unregister(&bcma_bus_type);
+ }
+ module_exit(bcma_modexit)
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -32,6 +32,18 @@ static const struct bcma_device_id_name
+ 	{ BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
+ 	{ BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
+ 	{ BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
++	{ BCMA_CORE_NS_PCIEG2, "PCIe Gen 2" },
++	{ BCMA_CORE_NS_DMA, "DMA" },
++	{ BCMA_CORE_NS_SDIO3, "SDIO3" },
++	{ BCMA_CORE_NS_USB20, "USB 2.0" },
++	{ BCMA_CORE_NS_USB30, "USB 3.0" },
++	{ BCMA_CORE_NS_A9JTAG, "ARM Cortex A9 JTAG" },
++	{ BCMA_CORE_NS_DDR23, "Denali DDR2/DDR3 memory controller" },
++	{ BCMA_CORE_NS_ROM, "ROM" },
++	{ BCMA_CORE_NS_NAND, "NAND flash controller" },
++	{ BCMA_CORE_NS_QSPI, "SPI flash controller" },
++	{ BCMA_CORE_NS_CHIPCOMMON_B, "Chipcommon B" },
++	{ BCMA_CORE_ARMCA9, "ARM Cortex A9 core (ihost)" },
+ 	{ BCMA_CORE_AMEMC, "AMEMC (DDR)" },
+ 	{ BCMA_CORE_ALTA, "ALTA (I2S)" },
+ 	{ BCMA_CORE_INVALID, "Invalid" },
+@@ -201,7 +213,7 @@ static s32 bcma_erom_get_mst_port(struct
+ 	return ent;
+ }
+ 
+-static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
++static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
+ 				  u32 type, u8 port)
+ {
+ 	u32 addrl, addrh, sizel, sizeh = 0;
+@@ -213,7 +225,7 @@ static s32 bcma_erom_get_addr_desc(struc
+ 	    ((ent & SCAN_ADDR_TYPE) != type) ||
+ 	    (((ent & SCAN_ADDR_PORT) >> SCAN_ADDR_PORT_SHIFT) != port)) {
+ 		bcma_erom_push_ent(eromptr);
+-		return -EINVAL;
++		return (u32)-EINVAL;
+ 	}
+ 
+ 	addrl = ent & SCAN_ADDR_ADDR;
+@@ -257,12 +269,14 @@ static struct bcma_device *bcma_find_cor
+ 	return NULL;
+ }
+ 
++#define IS_ERR_VALUE_U32(x) ((x) >= (u32)-MAX_ERRNO)
++
+ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
+ 			      struct bcma_device_id *match, int core_num,
+ 			      struct bcma_device *core)
+ {
+-	s32 tmp;
+-	u8 i, j;
++	u32 tmp;
++	u8 i, j, k;
+ 	s32 cia, cib;
+ 	u8 ports[2], wrappers[2];
+ 
+@@ -300,6 +314,7 @@ static int bcma_get_next_core(struct bcm
+ 		/* Some specific cores don't need wrappers */
+ 		switch (core->id.id) {
+ 		case BCMA_CORE_4706_MAC_GBIT_COMMON:
++		case BCMA_CORE_NS_CHIPCOMMON_B:
+ 		/* Not used yet: case BCMA_CORE_OOB_ROUTER: */
+ 			break;
+ 		default:
+@@ -339,11 +354,11 @@ static int bcma_get_next_core(struct bcm
+ 	 * the main register space for the core
+ 	 */
+ 	tmp = bcma_erom_get_addr_desc(bus, eromptr, SCAN_ADDR_TYPE_SLAVE, 0);
+-	if (tmp <= 0) {
++	if (tmp == 0 || IS_ERR_VALUE_U32(tmp)) {
+ 		/* Try again to see if it is a bridge */
+ 		tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 					      SCAN_ADDR_TYPE_BRIDGE, 0);
+-		if (tmp <= 0) {
++		if (tmp == 0 || IS_ERR_VALUE_U32(tmp)) {
+ 			return -EILSEQ;
+ 		} else {
+ 			bcma_info(bus, "Bridge found\n");
+@@ -353,18 +368,19 @@ static int bcma_get_next_core(struct bcm
+ 	core->addr = tmp;
+ 
+ 	/* get & parse slave ports */
++	k = 0;
+ 	for (i = 0; i < ports[1]; i++) {
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_SLAVE, i);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: slave port %d "
+ 				 * "has %d descriptors\n", i, j); */
+ 				break;
+-			} else {
+-				if (i == 0 && j == 0)
+-					core->addr1 = tmp;
++			} else if (k < ARRAY_SIZE(core->addr_s)) {
++				core->addr_s[k] = tmp;
++				k++;
+ 			}
+ 		}
+ 	}
+@@ -374,7 +390,7 @@ static int bcma_get_next_core(struct bcm
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_MWRAP, i);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: master wrapper %d "
+ 				 * "has %d descriptors\n", i, j); */
+@@ -392,7 +408,7 @@ static int bcma_get_next_core(struct bcm
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_SWRAP, i + hack);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: master wrapper %d "
+ 				 * has %d descriptors\n", i, j); */
+@@ -407,10 +423,13 @@ static int bcma_get_next_core(struct bcm
+ 		core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
+ 		if (!core->io_addr)
+ 			return -ENOMEM;
+-		core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);
+-		if (!core->io_wrap) {
+-			iounmap(core->io_addr);
+-			return -ENOMEM;
++		if (core->wrap) {
++			core->io_wrap = ioremap_nocache(core->wrap,
++							BCMA_CORE_SIZE);
++			if (!core->io_wrap) {
++				iounmap(core->io_addr);
++				return -ENOMEM;
++			}
+ 		}
+ 	}
+ 	return 0;
+@@ -420,9 +439,7 @@ void bcma_init_bus(struct bcma_bus *bus)
+ {
+ 	s32 tmp;
+ 	struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
+-
+-	if (bus->init_done)
+-		return;
++	char chip_id[8];
+ 
+ 	INIT_LIST_HEAD(&bus->cores);
+ 	bus->nr_cores = 0;
+@@ -433,10 +450,11 @@ void bcma_init_bus(struct bcma_bus *bus)
+ 	chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
+ 	chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
+ 	chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
+-	bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
+-		  chipinfo->id, chipinfo->rev, chipinfo->pkg);
+ 
+-	bus->init_done = true;
++	snprintf(chip_id, ARRAY_SIZE(chip_id),
++		 (chipinfo->id > 0x9999) ? "%d" : "0x%04X", chipinfo->id);
++	bcma_info(bus, "Found chip with id %s, rev 0x%02X and package 0x%02X\n",
++		  chip_id, chipinfo->rev, chipinfo->pkg);
+ }
+ 
+ int bcma_bus_scan(struct bcma_bus *bus)
+@@ -446,8 +464,6 @@ int bcma_bus_scan(struct bcma_bus *bus)
+ 
+ 	int err, core_num = 0;
+ 
+-	bcma_init_bus(bus);
+-
+ 	erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
+ 	if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
+ 		eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
+@@ -489,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
+ 		bus->nr_cores++;
+ 		other_core = bcma_find_core_reverse(bus, core->id.id);
+ 		core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
++		bcma_prepare_core(bus, core);
+ 
+ 		bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
+ 			  core->core_index, bcma_device_name(&core->id),
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -72,12 +72,12 @@ fail:
+  * R/W ops.
+  **************************************************/
+ 
+-static void bcma_sprom_read(struct bcma_bus *bus, u16 offset, u16 *sprom)
++static void bcma_sprom_read(struct bcma_bus *bus, u16 offset, u16 *sprom,
++			    size_t words)
+ {
+ 	int i;
+-	for (i = 0; i < SSB_SPROMSIZE_WORDS_R4; i++)
+-		sprom[i] = bcma_read16(bus->drv_cc.core,
+-				       offset + (i * 2));
++	for (i = 0; i < words; i++)
++		sprom[i] = bcma_read16(bus->drv_cc.core, offset + (i * 2));
+ }
+ 
+ /**************************************************
+@@ -124,29 +124,29 @@ static inline u8 bcma_crc8(u8 crc, u8 da
+ 	return t[crc ^ data];
+ }
+ 
+-static u8 bcma_sprom_crc(const u16 *sprom)
++static u8 bcma_sprom_crc(const u16 *sprom, size_t words)
+ {
+ 	int word;
+ 	u8 crc = 0xFF;
+ 
+-	for (word = 0; word < SSB_SPROMSIZE_WORDS_R4 - 1; word++) {
++	for (word = 0; word < words - 1; word++) {
+ 		crc = bcma_crc8(crc, sprom[word] & 0x00FF);
+ 		crc = bcma_crc8(crc, (sprom[word] & 0xFF00) >> 8);
+ 	}
+-	crc = bcma_crc8(crc, sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & 0x00FF);
++	crc = bcma_crc8(crc, sprom[words - 1] & 0x00FF);
+ 	crc ^= 0xFF;
+ 
+ 	return crc;
+ }
+ 
+-static int bcma_sprom_check_crc(const u16 *sprom)
++static int bcma_sprom_check_crc(const u16 *sprom, size_t words)
+ {
+ 	u8 crc;
+ 	u8 expected_crc;
+ 	u16 tmp;
+ 
+-	crc = bcma_sprom_crc(sprom);
+-	tmp = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_CRC;
++	crc = bcma_sprom_crc(sprom, words);
++	tmp = sprom[words - 1] & SSB_SPROM_REVISION_CRC;
+ 	expected_crc = tmp >> SSB_SPROM_REVISION_CRC_SHIFT;
+ 	if (crc != expected_crc)
+ 		return -EPROTO;
+@@ -154,21 +154,25 @@ static int bcma_sprom_check_crc(const u1
+ 	return 0;
+ }
+ 
+-static int bcma_sprom_valid(const u16 *sprom)
++static int bcma_sprom_valid(struct bcma_bus *bus, const u16 *sprom,
++			    size_t words)
+ {
+ 	u16 revision;
+ 	int err;
+ 
+-	err = bcma_sprom_check_crc(sprom);
++	err = bcma_sprom_check_crc(sprom, words);
+ 	if (err)
+ 		return err;
+ 
+-	revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_REV;
+-	if (revision != 8 && revision != 9) {
++	revision = sprom[words - 1] & SSB_SPROM_REVISION_REV;
++	if (revision != 8 && revision != 9 && revision != 10) {
+ 		pr_err("Unsupported SPROM revision: %d\n", revision);
+ 		return -ENOENT;
+ 	}
+ 
++	bus->sprom.revision = revision;
++	bcma_debug(bus, "Found SPROM revision %d\n", revision);
++
+ 	return 0;
+ }
+ 
+@@ -197,6 +201,23 @@ static int bcma_sprom_valid(const u16 *s
+ 		SPEX(_field[7], _offset + 14, _mask, _shift);	\
+ 	} while (0)
+ 
++static s8 sprom_extract_antgain(const u16 *in, u16 offset, u16 mask, u16 shift)
++{
++	u16 v;
++	u8 gain;
++
++	v = in[SPOFF(offset)];
++	gain = (v & mask) >> shift;
++	if (gain == 0xFF) {
++		gain = 8; /* If unset use 2dBm */
++	} else {
++		/* Q5.2 Fractional part is stored in 0xC0 */
++		gain = ((gain & 0xC0) >> 6) | ((gain & 0x3F) << 2);
++	}
++
++	return (s8)gain;
++}
++
+ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
+ {
+ 	u16 v, o;
+@@ -208,9 +229,6 @@ static void bcma_sprom_extract_r8(struct
+ 	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
+ 			ARRAY_SIZE(bus->sprom.core_pwr_info));
+ 
+-	bus->sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &
+-		SSB_SPROM_REVISION_REV;
+-
+ 	for (i = 0; i < 3; i++) {
+ 		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];
+ 		*(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
+@@ -380,14 +398,22 @@ static void bcma_sprom_extract_r8(struct
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, ~0, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
++	bus->sprom.antenna_gain.a0 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN01,
++							   SSB_SPROM8_AGAIN0,
++							   SSB_SPROM8_AGAIN0_SHIFT);
++	bus->sprom.antenna_gain.a1 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN01,
++							   SSB_SPROM8_AGAIN1,
++							   SSB_SPROM8_AGAIN1_SHIFT);
++	bus->sprom.antenna_gain.a2 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN23,
++							   SSB_SPROM8_AGAIN2,
++							   SSB_SPROM8_AGAIN2_SHIFT);
++	bus->sprom.antenna_gain.a3 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN23,
++							   SSB_SPROM8_AGAIN3,
++							   SSB_SPROM8_AGAIN3_SHIFT);
+ 
+ 	SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
+ 	     SSB_SPROM8_LEDDC_ON_SHIFT);
+@@ -502,12 +528,14 @@ static bool bcma_sprom_onchip_available(
+ 	case BCMA_CHIP_ID_BCM4331:
+ 		present = chip_status & BCMA_CC_CHIPST_4331_OTP_PRESENT;
+ 		break;
+-
++	case BCMA_CHIP_ID_BCM43142:
+ 	case BCMA_CHIP_ID_BCM43224:
+ 	case BCMA_CHIP_ID_BCM43225:
+ 		/* for these chips OTP is always available */
+ 		present = true;
+ 		break;
++	case BCMA_CHIP_ID_BCM43131:
++	case BCMA_CHIP_ID_BCM43217:
+ 	case BCMA_CHIP_ID_BCM43227:
+ 	case BCMA_CHIP_ID_BCM43228:
+ 	case BCMA_CHIP_ID_BCM43428:
+@@ -550,7 +578,9 @@ int bcma_sprom_get(struct bcma_bus *bus)
+ {
+ 	u16 offset = BCMA_CC_SPROM;
+ 	u16 *sprom;
+-	int err = 0;
++	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4,
++				 SSB_SPROMSIZE_WORDS_R10, };
++	int i, err = 0;
+ 
+ 	if (!bus->drv_cc.core)
+ 		return -EOPNOTSUPP;
+@@ -579,32 +609,37 @@ int bcma_sprom_get(struct bcma_bus *bus)
+ 		}
+ 	}
+ 
+-	sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
+-			GFP_KERNEL);
+-	if (!sprom)
+-		return -ENOMEM;
+-
+ 	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 ||
+ 	    bus->chipinfo.id == BCMA_CHIP_ID_BCM43431)
+ 		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);
+ 
+ 	bcma_debug(bus, "SPROM offset 0x%x\n", offset);
+-	bcma_sprom_read(bus, offset, sprom);
++	for (i = 0; i < ARRAY_SIZE(sprom_sizes); i++) {
++		size_t words = sprom_sizes[i];
++
++		sprom = kcalloc(words, sizeof(u16), GFP_KERNEL);
++		if (!sprom)
++			return -ENOMEM;
++
++		bcma_sprom_read(bus, offset, sprom, words);
++		err = bcma_sprom_valid(bus, sprom, words);
++		if (!err)
++			break;
++
++		kfree(sprom);
++	}
+ 
+ 	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 ||
+ 	    bus->chipinfo.id == BCMA_CHIP_ID_BCM43431)
+ 		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
+ 
+-	err = bcma_sprom_valid(sprom);
+ 	if (err) {
+-		bcma_warn(bus, "invalid sprom read from the PCIe card, try to use fallback sprom\n");
++		bcma_warn(bus, "Invalid SPROM read from the PCIe card, trying to use fallback SPROM\n");
+ 		err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
+-		goto out;
++	} else {
++		bcma_sprom_extract_r8(bus, sprom);
++		kfree(sprom);
+ 	}
+ 
+-	bcma_sprom_extract_r8(bus, sprom);
+-
+-out:
+-	kfree(sprom);
+ 	return err;
+ }
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -6,6 +6,7 @@
+ 
+ #include <linux/bcma/bcma_driver_chipcommon.h>
+ #include <linux/bcma/bcma_driver_pci.h>
++#include <linux/bcma/bcma_driver_pcie2.h>
+ #include <linux/bcma/bcma_driver_mips.h>
+ #include <linux/bcma/bcma_driver_gmac_cmn.h>
+ #include <linux/ssb/ssb.h> /* SPROM sharing */
+@@ -72,7 +73,19 @@ struct bcma_host_ops {
+ /* Core-ID values. */
+ #define BCMA_CORE_OOB_ROUTER		0x367	/* Out of band */
+ #define BCMA_CORE_4706_CHIPCOMMON	0x500
++#define BCMA_CORE_NS_PCIEG2		0x501
++#define BCMA_CORE_NS_DMA		0x502
++#define BCMA_CORE_NS_SDIO3		0x503
++#define BCMA_CORE_NS_USB20		0x504
++#define BCMA_CORE_NS_USB30		0x505
++#define BCMA_CORE_NS_A9JTAG		0x506
++#define BCMA_CORE_NS_DDR23		0x507
++#define BCMA_CORE_NS_ROM		0x508
++#define BCMA_CORE_NS_NAND		0x509
++#define BCMA_CORE_NS_QSPI		0x50A
++#define BCMA_CORE_NS_CHIPCOMMON_B	0x50B
+ #define BCMA_CORE_4706_SOC_RAM		0x50E
++#define BCMA_CORE_ARMCA9		0x510
+ #define BCMA_CORE_4706_MAC_GBIT		0x52D
+ #define BCMA_CORE_AMEMC			0x52E	/* DDR1/2 memory controller core */
+ #define BCMA_CORE_ALTA			0x534	/* I2S core */
+@@ -144,6 +157,10 @@ struct bcma_host_ops {
+ 
+ /* Chip IDs of PCIe devices */
+ #define BCMA_CHIP_ID_BCM4313	0x4313
++#define BCMA_CHIP_ID_BCM43142	43142
++#define BCMA_CHIP_ID_BCM43131	43131
++#define BCMA_CHIP_ID_BCM43217	43217
++#define BCMA_CHIP_ID_BCM43222	43222
+ #define BCMA_CHIP_ID_BCM43224	43224
+ #define  BCMA_PKG_ID_BCM43224_FAB_CSM	0x8
+ #define  BCMA_PKG_ID_BCM43224_FAB_SMIC	0xa
+@@ -176,6 +193,11 @@ struct bcma_host_ops {
+ #define  BCMA_PKG_ID_BCM5357	11
+ #define BCMA_CHIP_ID_BCM53572	53572
+ #define  BCMA_PKG_ID_BCM47188	9
++#define BCMA_CHIP_ID_BCM4707	53010
++#define  BCMA_PKG_ID_BCM4707	1
++#define  BCMA_PKG_ID_BCM4708	2
++#define  BCMA_PKG_ID_BCM4709	0
++#define BCMA_CHIP_ID_BCM53018	53018
+ 
+ /* Board types (on PCI usually equals to the subsystem dev id) */
+ /* BCM4313 */
+@@ -245,7 +267,7 @@ struct bcma_device {
+ 	u8 core_unit;
+ 
+ 	u32 addr;
+-	u32 addr1;
++	u32 addr_s[8];
+ 	u32 wrap;
+ 
+ 	void __iomem *io_addr;
+@@ -301,6 +323,8 @@ struct bcma_bus {
+ 		struct pci_dev *host_pci;
+ 		/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
+ 		struct sdio_func *host_sdio;
++		/* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
++		struct platform_device *host_pdev;
+ 	};
+ 
+ 	struct bcma_chipinfo chipinfo;
+@@ -310,11 +334,12 @@ struct bcma_bus {
+ 	struct bcma_device *mapped_core;
+ 	struct list_head cores;
+ 	u8 nr_cores;
+-	u8 init_done:1;
+ 	u8 num;
+ 
+ 	struct bcma_drv_cc drv_cc;
++	struct bcma_drv_cc_b drv_cc_b;
+ 	struct bcma_drv_pci drv_pci[2];
++	struct bcma_drv_pcie2 drv_pcie2;
+ 	struct bcma_drv_mips drv_mips;
+ 	struct bcma_drv_gmac_cmn drv_gmac_cmn;
+ 
+@@ -400,7 +425,14 @@ static inline void bcma_maskset16(struct
+ 	bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set);
+ }
+ 
+-extern struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid);
++extern struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
++					       u8 unit);
++static inline struct bcma_device *bcma_find_core(struct bcma_bus *bus,
++						 u16 coreid)
++{
++	return bcma_find_core_unit(bus, coreid, 0);
++}
++
+ extern bool bcma_core_is_enabled(struct bcma_device *core);
+ extern void bcma_core_disable(struct bcma_device *core, u32 flags);
+ extern int bcma_core_enable(struct bcma_device *core, u32 flags);
+@@ -415,4 +447,6 @@ extern u32 bcma_chipco_pll_read(struct b
+ #define  BCMA_DMA_TRANSLATION_DMA64_CMT	0x80000000 /* Client Mode Translation for 64-bit DMA */
+ extern u32 bcma_core_dma_translation(struct bcma_device *core);
+ 
++extern unsigned int bcma_core_irq(struct bcma_device *core, int num);
++
+ #endif /* LINUX_BCMA_H_ */
+--- a/include/linux/bcma/bcma_driver_chipcommon.h
++++ b/include/linux/bcma/bcma_driver_chipcommon.h
+@@ -330,6 +330,8 @@
+ #define BCMA_CC_PMU_CAP			0x0604 /* PMU capabilities */
+ #define  BCMA_CC_PMU_CAP_REVISION	0x000000FF /* Revision mask */
+ #define BCMA_CC_PMU_STAT		0x0608 /* PMU status */
++#define  BCMA_CC_PMU_STAT_EXT_LPO_AVAIL	0x00000100
++#define  BCMA_CC_PMU_STAT_WDRESET	0x00000080
+ #define  BCMA_CC_PMU_STAT_INTPEND	0x00000040 /* Interrupt pending */
+ #define  BCMA_CC_PMU_STAT_SBCLKST	0x00000030 /* Backplane clock status? */
+ #define  BCMA_CC_PMU_STAT_HAVEALP	0x00000008 /* ALP available */
+@@ -355,6 +357,11 @@
+ #define BCMA_CC_REGCTL_DATA		0x065C
+ #define BCMA_CC_PLLCTL_ADDR		0x0660
+ #define BCMA_CC_PLLCTL_DATA		0x0664
++#define BCMA_CC_PMU_STRAPOPT		0x0668 /* (corerev >= 28) */
++#define BCMA_CC_PMU_XTAL_FREQ		0x066C /* (pmurev >= 10) */
++#define  BCMA_CC_PMU_XTAL_FREQ_ILPCTL_MASK	0x00001FFF
++#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_MASK	0x80000000
++#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_SHIFT	31
+ #define BCMA_CC_SPROM			0x0800 /* SPROM beginning */
+ /* NAND flash MLC controller registers (corerev >= 38) */
+ #define BCMA_CC_NAND_REVISION		0x0C00
+@@ -435,6 +442,23 @@
+ #define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_MASK	0x00000007
+ #define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_SHIFT	0
+ 
++/* PMU rev 15 */
++#define BCMA_CC_PMU15_PLL_PLLCTL0	0
++#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_MASK	0x00000003
++#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_SHIFT	0
++#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK	0x003FFFFC
++#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT	2
++#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_MASK	0x00C00000
++#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_SHIFT	22
++#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_MASK	0x07000000
++#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_SHIFT	24
++#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_MASK	0x38000000
++#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_SHIFT	27
++#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_MASK	0x40000000
++#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_SHIFT	30
++#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_MASK	0x80000000
++#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_SHIFT	31
++
+ /* ALP clock on pre-PMU chips */
+ #define BCMA_CC_PMU_ALP_CLOCK		20000000
+ /* HT clock for systems with PMU-enabled chipcommon */
+@@ -507,6 +531,37 @@
+ #define BCMA_CHIPCTL_5357_I2S_PINS_ENABLE	BIT(18)
+ #define BCMA_CHIPCTL_5357_I2CSPI_PINS_ENABLE	BIT(19)
+ 
++#define BCMA_RES_4314_LPLDO_PU			BIT(0)
++#define BCMA_RES_4314_PMU_SLEEP_DIS		BIT(1)
++#define BCMA_RES_4314_PMU_BG_PU			BIT(2)
++#define BCMA_RES_4314_CBUCK_LPOM_PU		BIT(3)
++#define BCMA_RES_4314_CBUCK_PFM_PU		BIT(4)
++#define BCMA_RES_4314_CLDO_PU			BIT(5)
++#define BCMA_RES_4314_LPLDO2_LVM		BIT(6)
++#define BCMA_RES_4314_WL_PMU_PU			BIT(7)
++#define BCMA_RES_4314_LNLDO_PU			BIT(8)
++#define BCMA_RES_4314_LDO3P3_PU			BIT(9)
++#define BCMA_RES_4314_OTP_PU			BIT(10)
++#define BCMA_RES_4314_XTAL_PU			BIT(11)
++#define BCMA_RES_4314_WL_PWRSW_PU		BIT(12)
++#define BCMA_RES_4314_LQ_AVAIL			BIT(13)
++#define BCMA_RES_4314_LOGIC_RET			BIT(14)
++#define BCMA_RES_4314_MEM_SLEEP			BIT(15)
++#define BCMA_RES_4314_MACPHY_RET		BIT(16)
++#define BCMA_RES_4314_WL_CORE_READY		BIT(17)
++#define BCMA_RES_4314_ILP_REQ			BIT(18)
++#define BCMA_RES_4314_ALP_AVAIL			BIT(19)
++#define BCMA_RES_4314_MISC_PWRSW_PU		BIT(20)
++#define BCMA_RES_4314_SYNTH_PWRSW_PU		BIT(21)
++#define BCMA_RES_4314_RX_PWRSW_PU		BIT(22)
++#define BCMA_RES_4314_RADIO_PU			BIT(23)
++#define BCMA_RES_4314_VCO_LDO_PU		BIT(24)
++#define BCMA_RES_4314_AFE_LDO_PU		BIT(25)
++#define BCMA_RES_4314_RX_LDO_PU			BIT(26)
++#define BCMA_RES_4314_TX_LDO_PU			BIT(27)
++#define BCMA_RES_4314_HT_AVAIL			BIT(28)
++#define BCMA_RES_4314_MACPHY_CLK_AVAIL		BIT(29)
++
+ /* Data for the PMU, if available.
+  * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
+  */
+@@ -585,9 +640,16 @@ struct bcma_drv_cc {
+ 	spinlock_t gpio_lock;
+ #ifdef CONFIG_BCMA_DRIVER_GPIO
+ 	struct gpio_chip gpio;
++	struct irq_domain *irq_domain;
+ #endif
+ };
+ 
++struct bcma_drv_cc_b {
++	struct bcma_device *core;
++	u8 setup_done:1;
++	void __iomem *mii;
++};
++
+ /* Register access */
+ #define bcma_cc_read32(cc, offset) \
+ 	bcma_read32((cc)->core, offset)
+@@ -643,4 +705,6 @@ extern void bcma_pmu_spuravoid_pllupdate
+ 
+ extern u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc);
+ 
++void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value);
++
+ #endif /* LINUX_BCMA_DRIVER_CC_H_ */
+--- a/include/linux/bcma/bcma_driver_mips.h
++++ b/include/linux/bcma/bcma_driver_mips.h
+@@ -43,12 +43,12 @@ struct bcma_drv_mips {
+ extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
+ extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);
+ 
+-extern unsigned int bcma_core_irq(struct bcma_device *core);
++extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
+ #else
+ static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
+ static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
+ 
+-static inline unsigned int bcma_core_irq(struct bcma_device *core)
++static inline unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	return 0;
+ }
+--- a/include/linux/bcma/bcma_driver_pci.h
++++ b/include/linux/bcma/bcma_driver_pci.h
+@@ -181,10 +181,31 @@ struct pci_dev;
+ 
+ #define BCMA_CORE_PCI_CFG_DEVCTRL		0xd8
+ 
++#define BCMA_CORE_PCI_
++
++/* MDIO devices (SERDES modules) */
++#define BCMA_CORE_PCI_MDIO_IEEE0		0x000
++#define BCMA_CORE_PCI_MDIO_IEEE1		0x001
++#define BCMA_CORE_PCI_MDIO_BLK0			0x800
++#define BCMA_CORE_PCI_MDIO_BLK1			0x801
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT0		0x16
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT1		0x17
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT2		0x18
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT3		0x19
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT4		0x1A
++#define BCMA_CORE_PCI_MDIO_BLK2			0x802
++#define BCMA_CORE_PCI_MDIO_BLK3			0x803
++#define BCMA_CORE_PCI_MDIO_BLK4			0x804
++#define BCMA_CORE_PCI_MDIO_TXPLL		0x808	/* TXPLL register block idx */
++#define BCMA_CORE_PCI_MDIO_TXCTRL0		0x820
++#define BCMA_CORE_PCI_MDIO_SERDESID		0x831
++#define BCMA_CORE_PCI_MDIO_RXCTRL0		0x840
++
+ /* PCIE Root Capability Register bits (Host mode only) */
+ #define BCMA_CORE_PCI_RC_CRS_VISIBILITY		0x0001
+ 
+ struct bcma_drv_pci;
++struct bcma_bus;
+ 
+ #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
+ struct bcma_drv_pci_host {
+@@ -219,7 +240,9 @@ struct bcma_drv_pci {
+ extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
+ extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
+ 				 struct bcma_device *core, bool enable);
+-extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend);
++extern void bcma_core_pci_up(struct bcma_bus *bus);
++extern void bcma_core_pci_down(struct bcma_bus *bus);
++extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up);
+ 
+ extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
+ extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
+--- /dev/null
++++ b/include/linux/bcma/bcma_driver_pcie2.h
+@@ -0,0 +1,158 @@
++#ifndef LINUX_BCMA_DRIVER_PCIE2_H_
++#define LINUX_BCMA_DRIVER_PCIE2_H_
++
++#define BCMA_CORE_PCIE2_CLK_CONTROL		0x0000
++#define  PCIE2_CLKC_RST_OE			0x0001 /* When set, drives PCI_RESET out to pin */
++#define  PCIE2_CLKC_RST				0x0002 /* Value driven out to pin */
++#define  PCIE2_CLKC_SPERST			0x0004 /* SurvivePeRst */
++#define  PCIE2_CLKC_DISABLE_L1CLK_GATING	0x0010
++#define  PCIE2_CLKC_DLYPERST			0x0100 /* Delay PeRst to CoE Core */
++#define  PCIE2_CLKC_DISSPROMLD			0x0200 /* DisableSpromLoadOnPerst */
++#define  PCIE2_CLKC_WAKE_MODE_L2		0x1000 /* Wake on L2 */
++#define BCMA_CORE_PCIE2_RC_PM_CONTROL		0x0004
++#define BCMA_CORE_PCIE2_RC_PM_STATUS		0x0008
++#define BCMA_CORE_PCIE2_EP_PM_CONTROL		0x000C
++#define BCMA_CORE_PCIE2_EP_PM_STATUS		0x0010
++#define BCMA_CORE_PCIE2_EP_LTR_CONTROL		0x0014
++#define BCMA_CORE_PCIE2_EP_LTR_STATUS		0x0018
++#define BCMA_CORE_PCIE2_EP_OBFF_STATUS		0x001C
++#define BCMA_CORE_PCIE2_PCIE_ERR_STATUS		0x0020
++#define BCMA_CORE_PCIE2_RC_AXI_CONFIG		0x0100
++#define BCMA_CORE_PCIE2_EP_AXI_CONFIG		0x0104
++#define BCMA_CORE_PCIE2_RXDEBUG_STATUS0		0x0108
++#define BCMA_CORE_PCIE2_RXDEBUG_CONTROL0	0x010C
++#define BCMA_CORE_PCIE2_CONFIGINDADDR		0x0120
++#define BCMA_CORE_PCIE2_CONFIGINDDATA		0x0124
++#define BCMA_CORE_PCIE2_MDIOCONTROL		0x0128
++#define BCMA_CORE_PCIE2_MDIOWRDATA		0x012C
++#define BCMA_CORE_PCIE2_MDIORDDATA		0x0130
++#define BCMA_CORE_PCIE2_DATAINTF		0x0180
++#define BCMA_CORE_PCIE2_D2H_INTRLAZY_0		0x0188
++#define BCMA_CORE_PCIE2_H2D_INTRLAZY_0		0x018c
++#define BCMA_CORE_PCIE2_H2D_INTSTAT_0		0x0190
++#define BCMA_CORE_PCIE2_H2D_INTMASK_0		0x0194
++#define BCMA_CORE_PCIE2_D2H_INTSTAT_0		0x0198
++#define BCMA_CORE_PCIE2_D2H_INTMASK_0		0x019c
++#define BCMA_CORE_PCIE2_LTR_STATE		0x01A0 /* Latency Tolerance Reporting */
++#define  PCIE2_LTR_ACTIVE			2
++#define  PCIE2_LTR_ACTIVE_IDLE			1
++#define  PCIE2_LTR_SLEEP			0
++#define  PCIE2_LTR_FINAL_MASK			0x300
++#define  PCIE2_LTR_FINAL_SHIFT			8
++#define BCMA_CORE_PCIE2_PWR_INT_STATUS		0x01A4
++#define BCMA_CORE_PCIE2_PWR_INT_MASK		0x01A8
++#define BCMA_CORE_PCIE2_CFG_ADDR		0x01F8
++#define BCMA_CORE_PCIE2_CFG_DATA		0x01FC
++#define BCMA_CORE_PCIE2_SYS_EQ_PAGE		0x0200
++#define BCMA_CORE_PCIE2_SYS_MSI_PAGE		0x0204
++#define BCMA_CORE_PCIE2_SYS_MSI_INTREN		0x0208
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL0		0x0210
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL1		0x0214
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL2		0x0218
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL3		0x021C
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL4		0x0220
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL5		0x0224
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD0		0x0250
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL0		0x0254
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD1		0x0258
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL1		0x025C
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD2		0x0260
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL2		0x0264
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD3		0x0268
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL3		0x026C
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD4		0x0270
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL4		0x0274
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD5		0x0278
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL5		0x027C
++#define BCMA_CORE_PCIE2_SYS_RC_INTX_EN		0x0330
++#define BCMA_CORE_PCIE2_SYS_RC_INTX_CSR		0x0334
++#define BCMA_CORE_PCIE2_SYS_MSI_REQ		0x0340
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR_EN	0x0344
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR_CSR	0x0348
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR0		0x0350
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR1		0x0354
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR2		0x0358
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR3		0x035C
++#define BCMA_CORE_PCIE2_SYS_EP_INT_EN0		0x0360
++#define BCMA_CORE_PCIE2_SYS_EP_INT_EN1		0x0364
++#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR0		0x0370
++#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR1		0x0374
++#define BCMA_CORE_PCIE2_SPROM(wordoffset)	(0x0800 + ((wordoffset) * 2))
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_0		0x0C00
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_1		0x0C04
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_2		0x0C08
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_3		0x0C0C
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_4		0x0C10
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_5		0x0C14
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_6		0x0C18
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_7		0x0C1C
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_0		0x0C20
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_1		0x0C24
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_2		0x0C28
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_3		0x0C2C
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_4		0x0C30
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_5		0x0C34
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_6		0x0C38
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_7		0x0C3C
++#define BCMA_CORE_PCIE2_FUNC0_IMAP1		0x0C80
++#define BCMA_CORE_PCIE2_FUNC1_IMAP1		0x0C88
++#define BCMA_CORE_PCIE2_FUNC0_IMAP2		0x0CC0
++#define BCMA_CORE_PCIE2_FUNC1_IMAP2		0x0CC8
++#define BCMA_CORE_PCIE2_IARR0_LOWER		0x0D00
++#define BCMA_CORE_PCIE2_IARR0_UPPER		0x0D04
++#define BCMA_CORE_PCIE2_IARR1_LOWER		0x0D08
++#define BCMA_CORE_PCIE2_IARR1_UPPER		0x0D0C
++#define BCMA_CORE_PCIE2_IARR2_LOWER		0x0D10
++#define BCMA_CORE_PCIE2_IARR2_UPPER		0x0D14
++#define BCMA_CORE_PCIE2_OARR0			0x0D20
++#define BCMA_CORE_PCIE2_OARR1			0x0D28
++#define BCMA_CORE_PCIE2_OARR2			0x0D30
++#define BCMA_CORE_PCIE2_OMAP0_LOWER		0x0D40
++#define BCMA_CORE_PCIE2_OMAP0_UPPER		0x0D44
++#define BCMA_CORE_PCIE2_OMAP1_LOWER		0x0D48
++#define BCMA_CORE_PCIE2_OMAP1_UPPER		0x0D4C
++#define BCMA_CORE_PCIE2_OMAP2_LOWER		0x0D50
++#define BCMA_CORE_PCIE2_OMAP2_UPPER		0x0D54
++#define BCMA_CORE_PCIE2_FUNC1_IARR1_SIZE	0x0D58
++#define BCMA_CORE_PCIE2_FUNC1_IARR2_SIZE	0x0D5C
++#define BCMA_CORE_PCIE2_MEM_CONTROL		0x0F00
++#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG0		0x0F04
++#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG1		0x0F08
++#define BCMA_CORE_PCIE2_LINK_STATUS		0x0F0C
++#define BCMA_CORE_PCIE2_STRAP_STATUS		0x0F10
++#define BCMA_CORE_PCIE2_RESET_STATUS		0x0F14
++#define BCMA_CORE_PCIE2_RESETEN_IN_LINKDOWN	0x0F18
++#define BCMA_CORE_PCIE2_MISC_INTR_EN		0x0F1C
++#define BCMA_CORE_PCIE2_TX_DEBUG_CFG		0x0F20
++#define BCMA_CORE_PCIE2_MISC_CONFIG		0x0F24
++#define BCMA_CORE_PCIE2_MISC_STATUS		0x0F28
++#define BCMA_CORE_PCIE2_INTR_EN			0x0F30
++#define BCMA_CORE_PCIE2_INTR_CLEAR		0x0F34
++#define BCMA_CORE_PCIE2_INTR_STATUS		0x0F38
++
++/* PCIE gen2 config regs */
++#define PCIE2_INTSTATUS				0x090
++#define PCIE2_INTMASK				0x094
++#define PCIE2_SBMBX				0x098
++
++#define PCIE2_PMCR_REFUP			0x1814 /* Trefup time */
++
++#define PCIE2_CAP_DEVSTSCTRL2_OFFSET		0xD4
++#define PCIE2_CAP_DEVSTSCTRL2_LTRENAB		0x400
++#define PCIE2_PVT_REG_PM_CLK_PERIOD		0x184c
++
++struct bcma_drv_pcie2 {
++	struct bcma_device *core;
++};
++
++#define pcie2_read16(pcie2, offset)		bcma_read16((pcie2)->core, offset)
++#define pcie2_read32(pcie2, offset)		bcma_read32((pcie2)->core, offset)
++#define pcie2_write16(pcie2, offset, val)	bcma_write16((pcie2)->core, offset, val)
++#define pcie2_write32(pcie2, offset, val)	bcma_write32((pcie2)->core, offset, val)
++
++#define pcie2_set32(pcie2, offset, set)		bcma_set32((pcie2)->core, offset, set)
++#define pcie2_mask32(pcie2, offset, mask)	bcma_mask32((pcie2)->core, offset, mask)
++
++void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2);
++
++#endif /* LINUX_BCMA_DRIVER_PCIE2_H_ */
+--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+@@ -679,27 +679,6 @@ bool ai_clkctl_cc(struct si_pub *sih, en
+ 	return mode == BCMA_CLKMODE_FAST;
+ }
+ 
+-void ai_pci_up(struct si_pub *sih)
+-{
+-	struct si_info *sii;
+-
+-	sii = container_of(sih, struct si_info, pub);
+-
+-	if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
+-		bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);
+-}
+-
+-/* Unconfigure and/or apply various WARs when going down */
+-void ai_pci_down(struct si_pub *sih)
+-{
+-	struct si_info *sii;
+-
+-	sii = container_of(sih, struct si_info, pub);
+-
+-	if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
+-		bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);
+-}
+-
+ /* Enable BT-COEX & Ex-PA for 4313 */
+ void ai_epa_4313war(struct si_pub *sih)
+ {
+--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
++++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+@@ -183,9 +183,6 @@ extern u16 ai_clkctl_fast_pwrup_delay(st
+ extern bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode);
+ extern bool ai_deviceremoved(struct si_pub *sih);
+ 
+-extern void ai_pci_down(struct si_pub *sih);
+-extern void ai_pci_up(struct si_pub *sih);
+-
+ /* Enable Ex-PA for 4313 */
+ extern void ai_epa_4313war(struct si_pub *sih);
+ 
+--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
+@@ -4667,7 +4667,7 @@ static int brcms_b_attach(struct brcms_c
+ 	brcms_c_coredisable(wlc_hw);
+ 
+ 	/* Match driver "down" state */
+-	ai_pci_down(wlc_hw->sih);
++	bcma_core_pci_down(wlc_hw->d11core->bus);
+ 
+ 	/* turn off pll and xtal to match driver "down" state */
+ 	brcms_b_xtal(wlc_hw, OFF);
+@@ -5010,12 +5010,12 @@ static int brcms_b_up_prep(struct brcms_
+ 	 */
+ 	if (brcms_b_radio_read_hwdisabled(wlc_hw)) {
+ 		/* put SB PCI in down state again */
+-		ai_pci_down(wlc_hw->sih);
++		bcma_core_pci_down(wlc_hw->d11core->bus);
+ 		brcms_b_xtal(wlc_hw, OFF);
+ 		return -ENOMEDIUM;
+ 	}
+ 
+-	ai_pci_up(wlc_hw->sih);
++	bcma_core_pci_up(wlc_hw->d11core->bus);
+ 
+ 	/* reset the d11 core */
+ 	brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
+@@ -5212,7 +5212,7 @@ static int brcms_b_down_finish(struct br
+ 
+ 		/* turn off primary xtal and pll */
+ 		if (!wlc_hw->noreset) {
+-			ai_pci_down(wlc_hw->sih);
++			bcma_core_pci_down(wlc_hw->d11core->bus);
+ 			brcms_b_xtal(wlc_hw, OFF);
+ 		}
+ 	}
+--- a/drivers/bcma/driver_mips.c
++++ b/drivers/bcma/driver_mips.c
+@@ -21,6 +21,14 @@
+ #include <linux/serial_reg.h>
+ #include <linux/time.h>
+ 
++enum bcma_boot_dev {
++	BCMA_BOOT_DEV_UNK = 0,
++	BCMA_BOOT_DEV_ROM,
++	BCMA_BOOT_DEV_PARALLEL,
++	BCMA_BOOT_DEV_SERIAL,
++	BCMA_BOOT_DEV_NAND,
++};
++
+ static const char * const part_probes[] = { "bcm47xxpart", NULL };
+ 
+ static struct physmap_flash_data bcma_pflash_data = {
+@@ -107,7 +115,7 @@ static u32 bcma_core_mips_irqflag(struct
+  * If disabled, 5 is returned.
+  * If not supported, 6 is returned.
+  */
+-static unsigned int bcma_core_mips_irq(struct bcma_device *dev)
++unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	struct bcma_device *mdev = dev->bus->drv_mips.core;
+ 	u32 irqflag;
+@@ -125,13 +133,6 @@ static unsigned int bcma_core_mips_irq(s
+ 	return 5;
+ }
+ 
+-unsigned int bcma_core_irq(struct bcma_device *dev)
+-{
+-	unsigned int mips_irq = bcma_core_mips_irq(dev);
+-	return mips_irq <= 4 ? mips_irq + 2 : 0;
+-}
+-EXPORT_SYMBOL(bcma_core_irq);
+-
+ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
+ {
+ 	unsigned int oldirq = bcma_core_mips_irq(dev);
+@@ -229,11 +230,51 @@ u32 bcma_cpu_clock(struct bcma_drv_mips
+ }
+ EXPORT_SYMBOL(bcma_cpu_clock);
+ 
++static enum bcma_boot_dev bcma_boot_dev(struct bcma_bus *bus)
++{
++	struct bcma_drv_cc *cc = &bus->drv_cc;
++	u8 cc_rev = cc->core->id.rev;
++
++	if (cc_rev == 42) {
++		struct bcma_device *core;
++
++		core = bcma_find_core(bus, BCMA_CORE_NS_ROM);
++		if (core) {
++			switch (bcma_aread32(core, BCMA_IOST) &
++				BCMA_NS_ROM_IOST_BOOT_DEV_MASK) {
++			case BCMA_NS_ROM_IOST_BOOT_DEV_NOR:
++				return BCMA_BOOT_DEV_SERIAL;
++			case BCMA_NS_ROM_IOST_BOOT_DEV_NAND:
++				return BCMA_BOOT_DEV_NAND;
++			case BCMA_NS_ROM_IOST_BOOT_DEV_ROM:
++			default:
++				return BCMA_BOOT_DEV_ROM;
++			}
++		}
++	} else {
++		if (cc_rev == 38) {
++			if (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT)
++				return BCMA_BOOT_DEV_NAND;
++			else if (cc->status & BIT(5))
++				return BCMA_BOOT_DEV_ROM;
++		}
++
++		if ((cc->capabilities & BCMA_CC_CAP_FLASHT) ==
++		    BCMA_CC_FLASHT_PARA)
++			return BCMA_BOOT_DEV_PARALLEL;
++		else
++			return BCMA_BOOT_DEV_SERIAL;
++	}
++
++	return BCMA_BOOT_DEV_SERIAL;
++}
++
+ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
+ {
+ 	struct bcma_bus *bus = mcore->core->bus;
+ 	struct bcma_drv_cc *cc = &bus->drv_cc;
+ 	struct bcma_pflash *pflash = &cc->pflash;
++	enum bcma_boot_dev boot_dev;
+ 
+ 	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
+ 	case BCMA_CC_FLASHT_STSER:
+@@ -269,6 +310,20 @@ static void bcma_core_mips_flash_detect(
+ 			bcma_nflash_init(cc);
+ 		}
+ 	}
++
++	/* Determine flash type this SoC boots from */
++	boot_dev = bcma_boot_dev(bus);
++	switch (boot_dev) {
++	case BCMA_BOOT_DEV_PARALLEL:
++	case BCMA_BOOT_DEV_SERIAL:
++		/* TODO: Init NVRAM using BCMA_SOC_FLASH2 window */
++		break;
++	case BCMA_BOOT_DEV_NAND:
++		/* TODO: Init NVRAM using BCMA_SOC_FLASH1 window */
++		break;
++	default:
++		break;
++	}
+ }
+ 
+ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
+@@ -361,7 +416,7 @@ void bcma_core_mips_init(struct bcma_drv
+ 		break;
+ 	default:
+ 		list_for_each_entry(core, &bus->cores, list) {
+-			core->irq = bcma_core_irq(core);
++			core->irq = bcma_core_irq(core, 0);
+ 		}
+ 		bcma_err(bus,
+ 			 "Unknown device (0x%x) found, can not configure IRQs\n",
+--- a/drivers/bcma/host_soc.c
++++ b/drivers/bcma/host_soc.c
+@@ -7,6 +7,9 @@
+ 
+ #include "bcma_private.h"
+ #include "scan.h"
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/of_address.h>
+ #include <linux/bcma/bcma.h>
+ #include <linux/bcma/bcma_soc.h>
+ 
+@@ -134,12 +137,16 @@ static void bcma_host_soc_block_write(st
+ 
+ static u32 bcma_host_soc_aread32(struct bcma_device *core, u16 offset)
+ {
++	if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
++		return ~0;
+ 	return readl(core->io_wrap + offset);
+ }
+ 
+ static void bcma_host_soc_awrite32(struct bcma_device *core, u16 offset,
+ 				  u32 value)
+ {
++	if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
++		return;
+ 	writel(value, core->io_wrap + offset);
+ }
+ 
+@@ -161,7 +168,6 @@ static const struct bcma_host_ops bcma_h
+ int __init bcma_host_soc_register(struct bcma_soc *soc)
+ {
+ 	struct bcma_bus *bus = &soc->bus;
+-	int err;
+ 
+ 	/* iomap only first core. We have to read some register on this core
+ 	 * to scan the bus.
+@@ -173,11 +179,100 @@ int __init bcma_host_soc_register(struct
+ 	/* Host specific */
+ 	bus->hosttype = BCMA_HOSTTYPE_SOC;
+ 	bus->ops = &bcma_host_soc_ops;
++	bus->host_pdev = NULL;
+ 
+-	/* Register */
++	/* Initialize struct, detect chip */
++	bcma_init_bus(bus);
++
++	return 0;
++}
++
++int __init bcma_host_soc_init(struct bcma_soc *soc)
++{
++	struct bcma_bus *bus = &soc->bus;
++	int err;
++
++	/* Scan bus and initialize it */
+ 	err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
+ 	if (err)
+ 		iounmap(bus->mmio);
+ 
+ 	return err;
+ }
++
++#ifdef CONFIG_OF
++static int bcma_host_soc_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct device_node *np = dev->of_node;
++	struct bcma_bus *bus;
++	int err;
++
++	/* Alloc */
++	bus = devm_kzalloc(dev, sizeof(*bus), GFP_KERNEL);
++	if (!bus)
++		return -ENOMEM;
++
++	/* Map MMIO */
++	bus->mmio = of_iomap(np, 0);
++	if (!bus->mmio)
++		return -ENOMEM;
++
++	/* Host specific */
++	bus->hosttype = BCMA_HOSTTYPE_SOC;
++	bus->ops = &bcma_host_soc_ops;
++	bus->host_pdev = pdev;
++
++	/* Initialize struct, detect chip */
++	bcma_init_bus(bus);
++
++	/* Register */
++	err = bcma_bus_register(bus);
++	if (err)
++		goto err_unmap_mmio;
++
++	platform_set_drvdata(pdev, bus);
++
++	return err;
++
++err_unmap_mmio:
++	iounmap(bus->mmio);
++	return err;
++}
++
++static int bcma_host_soc_remove(struct platform_device *pdev)
++{
++	struct bcma_bus *bus = platform_get_drvdata(pdev);
++
++	bcma_bus_unregister(bus);
++	iounmap(bus->mmio);
++	platform_set_drvdata(pdev, NULL);
++
++	return 0;
++}
++
++static const struct of_device_id bcma_host_soc_of_match[] = {
++	{ .compatible = "brcm,bus-axi", },
++	{},
++};
++MODULE_DEVICE_TABLE(of, bcma_host_soc_of_match);
++
++static struct platform_driver bcma_host_soc_driver = {
++	.driver = {
++		.name = "bcma-host-soc",
++		.of_match_table = bcma_host_soc_of_match,
++	},
++	.probe		= bcma_host_soc_probe,
++	.remove		= bcma_host_soc_remove,
++};
++
++int __init bcma_host_soc_register_driver(void)
++{
++	return platform_driver_register(&bcma_host_soc_driver);
++}
++
++void __exit bcma_host_soc_unregister_driver(void)
++{
++	platform_driver_unregister(&bcma_host_soc_driver);
++}
++#endif /* CONFIG_OF */
+--- a/include/linux/bcma/bcma_regs.h
++++ b/include/linux/bcma/bcma_regs.h
+@@ -39,6 +39,11 @@
+ #define  BCMA_RESET_CTL_RESET		0x0001
+ #define BCMA_RESET_ST			0x0804
+ 
++#define BCMA_NS_ROM_IOST_BOOT_DEV_MASK	0x0003
++#define BCMA_NS_ROM_IOST_BOOT_DEV_NOR	0x0000
++#define BCMA_NS_ROM_IOST_BOOT_DEV_NAND	0x0001
++#define BCMA_NS_ROM_IOST_BOOT_DEV_ROM	0x0002
++
+ /* BCMA PCI config space registers. */
+ #define BCMA_PCI_PMCSR			0x44
+ #define  BCMA_PCI_PE			0x100
+--- a/drivers/usb/host/bcma-hcd.c
++++ b/drivers/usb/host/bcma-hcd.c
+@@ -238,7 +238,7 @@ static int bcma_hcd_probe(struct bcma_de
+ 	bcma_hcd_init_chip(dev);
+ 
+ 	/* In AI chips EHCI is addrspace 0, OHCI is 1 */
+-	ohci_addr = dev->addr1;
++	ohci_addr = dev->addr_s[0];
+ 	if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749)
+ 	    && chipinfo->rev == 0)
+ 		ohci_addr = 0x18009000;
+--- /dev/null
++++ b/drivers/bcma/driver_chipcommon_b.c
+@@ -0,0 +1,61 @@
++/*
++ * Broadcom specific AMBA
++ * ChipCommon B Unit driver
++ *
++ * Copyright 2014, Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++#include <linux/export.h>
++#include <linux/bcma/bcma.h>
++
++static bool bcma_wait_reg(struct bcma_bus *bus, void __iomem *addr, u32 mask,
++			  u32 value, int timeout)
++{
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
++
++	do {
++		val = readl(addr);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_err(bus, "Timeout waiting for register %p\n", addr);
++
++	return false;
++}
++
++void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value)
++{
++	struct bcma_bus *bus = ccb->core->bus;
++
++	writel(offset, ccb->mii + 0x00);
++	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);
++	writel(value, ccb->mii + 0x04);
++	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);
++}
++EXPORT_SYMBOL_GPL(bcma_chipco_b_mii_write);
++
++int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb)
++{
++	if (ccb->setup_done)
++		return 0;
++
++	ccb->setup_done = 1;
++	ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);
++	if (!ccb->mii)
++		return -ENOMEM;
++
++	return 0;
++}
++
++void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb)
++{
++	if (ccb->mii)
++		iounmap(ccb->mii);
++}
+--- a/include/linux/bcma/bcma_soc.h
++++ b/include/linux/bcma/bcma_soc.h
+@@ -10,6 +10,7 @@ struct bcma_soc {
+ };
+ 
+ int __init bcma_host_soc_register(struct bcma_soc *soc);
++int __init bcma_host_soc_init(struct bcma_soc *soc);
+ 
+ int bcma_bus_register(struct bcma_bus *bus);
+ 
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -194,6 +194,10 @@ static void __init bcm47xx_register_bcma
+ 
+ 	err = bcma_host_soc_register(&bcm47xx_bus.bcma);
+ 	if (err)
++		panic("Failed to register BCMA bus (err %d)", err);
++
++	err = bcma_host_soc_init(&bcm47xx_bus.bcma);
++	if (err)
+ 		panic("Failed to initialize BCMA bus (err %d)", err);
+ 
+ 	bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
+--- /dev/null
++++ b/Documentation/devicetree/bindings/bus/bcma.txt
+@@ -0,0 +1,53 @@
++Driver for ARM AXI Bus with Broadcom Plugins (bcma)
++
++Required properties:
++
++- compatible : brcm,bus-axi
++
++- reg : iomem address range of chipcommon core
++
++The cores on the AXI bus are automatically detected by bcma with the
++memory ranges they are using and they get registered afterwards.
++Automatic detection of the IRQ number is not working on
++BCM47xx/BCM53xx ARM SoCs. To assign IRQ numbers to the cores, provide
++them manually through device tree. Use an interrupt-map to specify the
++IRQ used by the devices on the bus. The first address is just an index,
++because we do not have any special register.
++
++The top-level axi bus may contain children representing attached cores
++(devices). This is needed since some hardware details can't be auto
++detected (e.g. IRQ numbers). Also some of the cores may be responsible
++for extra things, e.g. ChipCommon providing access to the GPIO chip.
++
++Example:
++
++	axi@18000000 {
++		compatible = "brcm,bus-axi";
++		reg = <0x18000000 0x1000>;
++		ranges = <0x00000000 0x18000000 0x00100000>;
++		#address-cells = <1>;
++		#size-cells = <1>;
++		#interrupt-cells = <1>;
++		interrupt-map-mask = <0x000fffff 0xffff>;
++		interrupt-map =
++			/* Ethernet Controller 0 */
++			<0x00024000 0 &gic GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
++
++			/* Ethernet Controller 1 */
++			<0x00025000 0 &gic GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
++
++			/* PCIe Controller 0 */
++			<0x00012000 0 &gic GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 1 &gic GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 2 &gic GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 3 &gic GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 4 &gic GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 5 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
++
++		chipcommon {
++			reg = <0x00000000 0x1000>;
++
++			gpio-controller;
++			#gpio-cells = <2>;
++		};
++	};
diff --git a/trunk/target/linux/generic/patches-3.10/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch b/trunk/target/linux/generic/patches-3.10/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch
new file mode 100644
index 00000000..b629466d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch
@@ -0,0 +1,829 @@
+From 9d54c8a33eec78289b1b3f6e10874719c27ce0a7 Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Tue, 25 Feb 2014 13:25:22 -0300
+Subject: [PATCH] UBI: R/O block driver on top of UBI volumes
+
+This commit introduces read-only block device emulation on top of UBI volumes.
+
+Given UBI takes care of wear leveling and bad block management it's possible
+to add a thin layer to enable block device access to UBI volumes.
+This allows to use a block-oriented filesystem on a flash device.
+
+The UBI block devices are meant to be used in conjunction with any
+regular, block-oriented file system (e.g. ext4), although it's primarily
+targeted at read-only file systems, such as squashfs.
+
+Block devices are created upon user request through new ioctls:
+UBI_IOCVOLATTBLK to attach and UBI_IOCVOLDETBLK to detach.
+Also, a new UBI module parameter is added 'ubi.block'. This parameter is
+needed in order to attach a block device on boot-up time, allowing to
+mount the rootfs on a ubiblock device.
+For instance, you could have these kernel parameters:
+
+  ubi.mtd=5 ubi.block=0,0 root=/dev/ubiblock0_0
+
+Or, if you compile ubi as a module:
+
+  $ modprobe ubi mtd=/dev/mtd5 block=/dev/ubi0_0
+
+Artem: amend commentaries and massage the patch a little bit.
+
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/Kconfig     |  15 +
+ drivers/mtd/ubi/Makefile    |   1 +
+ drivers/mtd/ubi/block.c     | 646 ++++++++++++++++++++++++++++++++++++++++++++
+ drivers/mtd/ubi/build.c     |  11 +
+ drivers/mtd/ubi/cdev.c      |  20 ++
+ drivers/mtd/ubi/ubi.h       |  14 +
+ include/uapi/mtd/ubi-user.h |  11 +
+ 7 files changed, 718 insertions(+)
+ create mode 100644 drivers/mtd/ubi/block.c
+
+--- a/drivers/mtd/ubi/Kconfig
++++ b/drivers/mtd/ubi/Kconfig
+@@ -87,4 +87,19 @@ config MTD_UBI_GLUEBI
+ 	   work on top of UBI. Do not enable this unless you use legacy
+ 	   software.
+ 
++config MTD_UBI_BLOCK
++	bool "Read-only block devices on top of UBI volumes"
++	default n
++	help
++	   This option enables read-only UBI block devices support. UBI block
++	   devices will be layered on top of UBI volumes, which means that the
++	   UBI driver will transparently handle things like bad eraseblocks and
++	   bit-flips. You can put any block-oriented file system on top of UBI
++	   volumes in read-only mode (e.g., ext4), but it is probably most
++	   practical for read-only file systems, like squashfs.
++
++	   When selected, this feature will be built in the UBI driver.
++
++	   If in doubt, say "N".
++
+ endif # MTD_UBI
+--- a/drivers/mtd/ubi/Makefile
++++ b/drivers/mtd/ubi/Makefile
+@@ -3,5 +3,6 @@ obj-$(CONFIG_MTD_UBI) += ubi.o
+ ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o attach.o
+ ubi-y += misc.o debug.o
+ ubi-$(CONFIG_MTD_UBI_FASTMAP) += fastmap.o
++ubi-$(CONFIG_MTD_UBI_BLOCK) += block.o
+ 
+ obj-$(CONFIG_MTD_UBI_GLUEBI) += gluebi.o
+--- /dev/null
++++ b/drivers/mtd/ubi/block.c
+@@ -0,0 +1,646 @@
++/*
++ * Copyright (c) 2014 Ezequiel Garcia
++ * Copyright (c) 2011 Free Electrons
++ *
++ * Driver parameter handling strongly based on drivers/mtd/ubi/build.c
++ *   Copyright (c) International Business Machines Corp., 2006
++ *   Copyright (c) Nokia Corporation, 2007
++ *   Authors: Artem Bityutskiy, Frank Haverkamp
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, version 2.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++/*
++ * Read-only block devices on top of UBI volumes
++ *
++ * A simple implementation to allow a block device to be layered on top of a
++ * UBI volume. The implementation is provided by creating a static 1-to-1
++ * mapping between the block device and the UBI volume.
++ *
++ * The addressed byte is obtained from the addressed block sector, which is
++ * mapped linearly into the corresponding LEB:
++ *
++ *   LEB number = addressed byte / LEB size
++ *
++ * This feature is compiled in the UBI core, and adds a new 'block' parameter
++ * to allow early block device attaching. Runtime  block attach/detach for UBI
++ * volumes is provided through two new UBI ioctls: UBI_IOCVOLATTBLK and
++ * UBI_IOCVOLDETBLK.
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <linux/kernel.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/mtd/ubi.h>
++#include <linux/workqueue.h>
++#include <linux/blkdev.h>
++#include <linux/hdreg.h>
++#include <asm/div64.h>
++
++#include "ubi-media.h"
++#include "ubi.h"
++
++/* Maximum number of supported devices */
++#define UBIBLOCK_MAX_DEVICES 32
++
++/* Maximum length of the 'block=' parameter */
++#define UBIBLOCK_PARAM_LEN 63
++
++/* Maximum number of comma-separated items in the 'block=' parameter */
++#define UBIBLOCK_PARAM_COUNT 2
++
++struct ubiblock_param {
++	int ubi_num;
++	int vol_id;
++	char name[UBIBLOCK_PARAM_LEN+1];
++};
++
++/* Numbers of elements set in the @ubiblock_param array */
++static int ubiblock_devs __initdata;
++
++/* MTD devices specification parameters */
++static struct ubiblock_param ubiblock_param[UBIBLOCK_MAX_DEVICES] __initdata;
++
++struct ubiblock {
++	struct ubi_volume_desc *desc;
++	int ubi_num;
++	int vol_id;
++	int refcnt;
++	int leb_size;
++
++	struct gendisk *gd;
++	struct request_queue *rq;
++
++	struct workqueue_struct *wq;
++	struct work_struct work;
++
++	struct mutex dev_mutex;
++	spinlock_t queue_lock;
++	struct list_head list;
++};
++
++/* Linked list of all ubiblock instances */
++static LIST_HEAD(ubiblock_devices);
++static DEFINE_MUTEX(devices_mutex);
++static int ubiblock_major;
++
++static int __init ubiblock_set_param(const char *val,
++				     const struct kernel_param *kp)
++{
++	int i, ret;
++	size_t len;
++	struct ubiblock_param *param;
++	char buf[UBIBLOCK_PARAM_LEN];
++	char *pbuf = &buf[0];
++	char *tokens[UBIBLOCK_PARAM_COUNT];
++
++	if (!val)
++		return -EINVAL;
++
++	len = strnlen(val, UBIBLOCK_PARAM_LEN);
++	if (len == 0) {
++		ubi_warn("block: empty 'block=' parameter - ignored\n");
++		return 0;
++	}
++
++	if (len == UBIBLOCK_PARAM_LEN) {
++		ubi_err("block: parameter \"%s\" is too long, max. is %d\n",
++			val, UBIBLOCK_PARAM_LEN);
++		return -EINVAL;
++	}
++
++	strcpy(buf, val);
++
++	/* Get rid of the final newline */
++	if (buf[len - 1] == '\n')
++		buf[len - 1] = '\0';
++
++	for (i = 0; i < UBIBLOCK_PARAM_COUNT; i++)
++		tokens[i] = strsep(&pbuf, ",");
++
++	param = &ubiblock_param[ubiblock_devs];
++	if (tokens[1]) {
++		/* Two parameters: can be 'ubi, vol_id' or 'ubi, vol_name' */
++		ret = kstrtoint(tokens[0], 10, &param->ubi_num);
++		if (ret < 0)
++			return -EINVAL;
++
++		/* Second param can be a number or a name */
++		ret = kstrtoint(tokens[1], 10, &param->vol_id);
++		if (ret < 0) {
++			param->vol_id = -1;
++			strcpy(param->name, tokens[1]);
++		}
++
++	} else {
++		/* One parameter: must be device path */
++		strcpy(param->name, tokens[0]);
++		param->ubi_num = -1;
++		param->vol_id = -1;
++	}
++
++	ubiblock_devs++;
++
++	return 0;
++}
++
++static const struct kernel_param_ops ubiblock_param_ops = {
++	.set    = ubiblock_set_param,
++};
++module_param_cb(block, &ubiblock_param_ops, NULL, 0);
++MODULE_PARM_DESC(block, "Attach block devices to UBI volumes. Parameter format: block=<path|dev,num|dev,name>.\n"
++			"Multiple \"block\" parameters may be specified.\n"
++			"UBI volumes may be specified by their number, name, or path to the device node.\n"
++			"Examples\n"
++			"Using the UBI volume path:\n"
++			"ubi.block=/dev/ubi0_0\n"
++			"Using the UBI device, and the volume name:\n"
++			"ubi.block=0,rootfs\n"
++			"Using both UBI device number and UBI volume number:\n"
++			"ubi.block=0,0\n");
++
++static struct ubiblock *find_dev_nolock(int ubi_num, int vol_id)
++{
++	struct ubiblock *dev;
++
++	list_for_each_entry(dev, &ubiblock_devices, list)
++		if (dev->ubi_num == ubi_num && dev->vol_id == vol_id)
++			return dev;
++	return NULL;
++}
++
++static int ubiblock_read_to_buf(struct ubiblock *dev, char *buffer,
++				int leb, int offset, int len)
++{
++	int ret;
++
++	ret = ubi_read(dev->desc, leb, buffer, offset, len);
++	if (ret) {
++		ubi_err("%s ubi_read error %d",
++			dev->gd->disk_name, ret);
++		return ret;
++	}
++	return 0;
++}
++
++static int ubiblock_read(struct ubiblock *dev, char *buffer,
++			 sector_t sec, int len)
++{
++	int ret, leb, offset;
++	int bytes_left = len;
++	int to_read = len;
++	loff_t pos = sec << 9;
++
++	/* Get LEB:offset address to read from */
++	offset = do_div(pos, dev->leb_size);
++	leb = pos;
++
++	while (bytes_left) {
++		/*
++		 * We can only read one LEB at a time. Therefore if the read
++		 * length is larger than one LEB size, we split the operation.
++		 */
++		if (offset + to_read > dev->leb_size)
++			to_read = dev->leb_size - offset;
++
++		ret = ubiblock_read_to_buf(dev, buffer, leb, offset, to_read);
++		if (ret)
++			return ret;
++
++		buffer += to_read;
++		bytes_left -= to_read;
++		to_read = bytes_left;
++		leb += 1;
++		offset = 0;
++	}
++	return 0;
++}
++
++static int do_ubiblock_request(struct ubiblock *dev, struct request *req)
++{
++	int len, ret;
++	sector_t sec;
++
++	if (req->cmd_type != REQ_TYPE_FS)
++		return -EIO;
++
++	if (blk_rq_pos(req) + blk_rq_cur_sectors(req) >
++	    get_capacity(req->rq_disk))
++		return -EIO;
++
++	if (rq_data_dir(req) != READ)
++		return -ENOSYS; /* Write not implemented */
++
++	sec = blk_rq_pos(req);
++	len = blk_rq_cur_bytes(req);
++
++	/*
++	 * Let's prevent the device from being removed while we're doing I/O
++	 * work. Notice that this means we serialize all the I/O operations,
++	 * but it's probably of no impact given the NAND core serializes
++	 * flash access anyway.
++	 */
++	mutex_lock(&dev->dev_mutex);
++	ret = ubiblock_read(dev, req->buffer, sec, len);
++	mutex_unlock(&dev->dev_mutex);
++
++	return ret;
++}
++
++static void ubiblock_do_work(struct work_struct *work)
++{
++	struct ubiblock *dev =
++		container_of(work, struct ubiblock, work);
++	struct request_queue *rq = dev->rq;
++	struct request *req;
++	int res;
++
++	spin_lock_irq(rq->queue_lock);
++
++	req = blk_fetch_request(rq);
++	while (req) {
++
++		spin_unlock_irq(rq->queue_lock);
++		res = do_ubiblock_request(dev, req);
++		spin_lock_irq(rq->queue_lock);
++
++		/*
++		 * If we're done with this request,
++		 * we need to fetch a new one
++		 */
++		if (!__blk_end_request_cur(req, res))
++			req = blk_fetch_request(rq);
++	}
++
++	spin_unlock_irq(rq->queue_lock);
++}
++
++static void ubiblock_request(struct request_queue *rq)
++{
++	struct ubiblock *dev;
++	struct request *req;
++
++	dev = rq->queuedata;
++
++	if (!dev)
++		while ((req = blk_fetch_request(rq)) != NULL)
++			__blk_end_request_all(req, -ENODEV);
++	else
++		queue_work(dev->wq, &dev->work);
++}
++
++static int ubiblock_open(struct block_device *bdev, fmode_t mode)
++{
++	struct ubiblock *dev = bdev->bd_disk->private_data;
++	int ret;
++
++	mutex_lock(&dev->dev_mutex);
++	if (dev->refcnt > 0) {
++		/*
++		 * The volume is already open, just increase the reference
++		 * counter.
++		 */
++		goto out_done;
++	}
++
++	/*
++	 * We want users to be aware they should only mount us as read-only.
++	 * It's just a paranoid check, as write requests will get rejected
++	 * in any case.
++	 */
++	if (mode & FMODE_WRITE) {
++		ret = -EPERM;
++		goto out_unlock;
++	}
++
++	dev->desc = ubi_open_volume(dev->ubi_num, dev->vol_id, UBI_READONLY);
++	if (IS_ERR(dev->desc)) {
++		ubi_err("%s failed to open ubi volume %d_%d",
++			dev->gd->disk_name, dev->ubi_num, dev->vol_id);
++		ret = PTR_ERR(dev->desc);
++		dev->desc = NULL;
++		goto out_unlock;
++	}
++
++out_done:
++	dev->refcnt++;
++	mutex_unlock(&dev->dev_mutex);
++	return 0;
++
++out_unlock:
++	mutex_unlock(&dev->dev_mutex);
++	return ret;
++}
++
++static void ubiblock_release(struct gendisk *gd, fmode_t mode)
++{
++	struct ubiblock *dev = gd->private_data;
++
++	mutex_lock(&dev->dev_mutex);
++	dev->refcnt--;
++	if (dev->refcnt == 0) {
++		ubi_close_volume(dev->desc);
++		dev->desc = NULL;
++	}
++	mutex_unlock(&dev->dev_mutex);
++}
++
++static int ubiblock_getgeo(struct block_device *bdev, struct hd_geometry *geo)
++{
++	/* Some tools might require this information */
++	geo->heads = 1;
++	geo->cylinders = 1;
++	geo->sectors = get_capacity(bdev->bd_disk);
++	geo->start = 0;
++	return 0;
++}
++
++static const struct block_device_operations ubiblock_ops = {
++	.owner = THIS_MODULE,
++	.open = ubiblock_open,
++	.release = ubiblock_release,
++	.getgeo	= ubiblock_getgeo,
++};
++
++int ubiblock_add(struct ubi_volume_info *vi)
++{
++	struct ubiblock *dev;
++	struct gendisk *gd;
++	int disk_capacity;
++	int ret;
++
++	/* Check that the volume isn't already handled */
++	mutex_lock(&devices_mutex);
++	if (find_dev_nolock(vi->ubi_num, vi->vol_id)) {
++		mutex_unlock(&devices_mutex);
++		return -EEXIST;
++	}
++	mutex_unlock(&devices_mutex);
++
++	dev = kzalloc(sizeof(struct ubiblock), GFP_KERNEL);
++	if (!dev)
++		return -ENOMEM;
++
++	mutex_init(&dev->dev_mutex);
++
++	dev->ubi_num = vi->ubi_num;
++	dev->vol_id = vi->vol_id;
++	dev->leb_size = vi->usable_leb_size;
++
++	/* Initialize the gendisk of this ubiblock device */
++	gd = alloc_disk(1);
++	if (!gd) {
++		ubi_err("block: alloc_disk failed");
++		ret = -ENODEV;
++		goto out_free_dev;
++	}
++
++	gd->fops = &ubiblock_ops;
++	gd->major = ubiblock_major;
++	gd->first_minor = dev->ubi_num * UBI_MAX_VOLUMES + dev->vol_id;
++	gd->private_data = dev;
++	sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);
++	disk_capacity = (vi->size * vi->usable_leb_size) >> 9;
++	set_capacity(gd, disk_capacity);
++	dev->gd = gd;
++
++	spin_lock_init(&dev->queue_lock);
++	dev->rq = blk_init_queue(ubiblock_request, &dev->queue_lock);
++	if (!dev->rq) {
++		ubi_err("block: blk_init_queue failed");
++		ret = -ENODEV;
++		goto out_put_disk;
++	}
++
++	dev->rq->queuedata = dev;
++	dev->gd->queue = dev->rq;
++
++	/*
++	 * Create one workqueue per volume (per registered block device).
++	 * Rembember workqueues are cheap, they're not threads.
++	 */
++	dev->wq = alloc_workqueue(gd->disk_name, 0, 0);
++	if (!dev->wq)
++		goto out_free_queue;
++	INIT_WORK(&dev->work, ubiblock_do_work);
++
++	mutex_lock(&devices_mutex);
++	list_add_tail(&dev->list, &ubiblock_devices);
++	mutex_unlock(&devices_mutex);
++
++	/* Must be the last step: anyone can call file ops from now on */
++	add_disk(dev->gd);
++	ubi_msg("%s created from ubi%d:%d(%s)",
++		dev->gd->disk_name, dev->ubi_num, dev->vol_id, vi->name);
++	return 0;
++
++out_free_queue:
++	blk_cleanup_queue(dev->rq);
++out_put_disk:
++	put_disk(dev->gd);
++out_free_dev:
++	kfree(dev);
++
++	return ret;
++}
++
++static void ubiblock_cleanup(struct ubiblock *dev)
++{
++	del_gendisk(dev->gd);
++	blk_cleanup_queue(dev->rq);
++	ubi_msg("%s released", dev->gd->disk_name);
++	put_disk(dev->gd);
++}
++
++int ubiblock_del(struct ubi_volume_info *vi)
++{
++	struct ubiblock *dev;
++
++	mutex_lock(&devices_mutex);
++	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
++	if (!dev) {
++		mutex_unlock(&devices_mutex);
++		return -ENODEV;
++	}
++
++	/* Found a device, let's lock it so we can check if it's busy */
++	mutex_lock(&dev->dev_mutex);
++	if (dev->refcnt > 0) {
++		mutex_unlock(&dev->dev_mutex);
++		mutex_unlock(&devices_mutex);
++		return -EBUSY;
++	}
++
++	/* Remove from device list */
++	list_del(&dev->list);
++	mutex_unlock(&devices_mutex);
++
++	/* Flush pending work and stop this workqueue */
++	destroy_workqueue(dev->wq);
++
++	ubiblock_cleanup(dev);
++	mutex_unlock(&dev->dev_mutex);
++	kfree(dev);
++	return 0;
++}
++
++static void ubiblock_resize(struct ubi_volume_info *vi)
++{
++	struct ubiblock *dev;
++	int disk_capacity;
++
++	/*
++	 * Need to lock the device list until we stop using the device,
++	 * otherwise the device struct might get released in 'ubiblock_del()'.
++	 */
++	mutex_lock(&devices_mutex);
++	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
++	if (!dev) {
++		mutex_unlock(&devices_mutex);
++		return;
++	}
++
++	mutex_lock(&dev->dev_mutex);
++	disk_capacity = (vi->size * vi->usable_leb_size) >> 9;
++	set_capacity(dev->gd, disk_capacity);
++	ubi_msg("%s resized to %d LEBs", dev->gd->disk_name, vi->size);
++	mutex_unlock(&dev->dev_mutex);
++	mutex_unlock(&devices_mutex);
++}
++
++static int ubiblock_notify(struct notifier_block *nb,
++			 unsigned long notification_type, void *ns_ptr)
++{
++	struct ubi_notification *nt = ns_ptr;
++
++	switch (notification_type) {
++	case UBI_VOLUME_ADDED:
++		/*
++		 * We want to enforce explicit block device attaching for
++		 * volumes, so when a volume is added we do nothing.
++		 */
++		break;
++	case UBI_VOLUME_REMOVED:
++		ubiblock_del(&nt->vi);
++		break;
++	case UBI_VOLUME_RESIZED:
++		ubiblock_resize(&nt->vi);
++		break;
++	default:
++		break;
++	}
++	return NOTIFY_OK;
++}
++
++static struct notifier_block ubiblock_notifier = {
++	.notifier_call = ubiblock_notify,
++};
++
++static struct ubi_volume_desc * __init
++open_volume_desc(const char *name, int ubi_num, int vol_id)
++{
++	if (ubi_num == -1)
++		/* No ubi num, name must be a vol device path */
++		return ubi_open_volume_path(name, UBI_READONLY);
++	else if (vol_id == -1)
++		/* No vol_id, must be vol_name */
++		return ubi_open_volume_nm(ubi_num, name, UBI_READONLY);
++	else
++		return ubi_open_volume(ubi_num, vol_id, UBI_READONLY);
++}
++
++static int __init ubiblock_attach_from_param(void)
++{
++	int i, ret;
++	struct ubiblock_param *p;
++	struct ubi_volume_desc *desc;
++	struct ubi_volume_info vi;
++
++	for (i = 0; i < ubiblock_devs; i++) {
++		p = &ubiblock_param[i];
++
++		desc = open_volume_desc(p->name, p->ubi_num, p->vol_id);
++		if (IS_ERR(desc)) {
++			ubi_err("block: can't open volume, err=%ld\n",
++				PTR_ERR(desc));
++			ret = PTR_ERR(desc);
++			break;
++		}
++
++		ubi_get_volume_info(desc, &vi);
++		ubi_close_volume(desc);
++
++		ret = ubiblock_add(&vi);
++		if (ret) {
++			ubi_err("block: can't add '%s' volume, err=%d\n",
++				vi.name, ret);
++			break;
++		}
++	}
++	return ret;
++}
++
++static void ubiblock_detach_all(void)
++{
++	struct ubiblock *next;
++	struct ubiblock *dev;
++
++	list_for_each_entry_safe(dev, next, &ubiblock_devices, list) {
++		/* Flush pending work and stop workqueue */
++		destroy_workqueue(dev->wq);
++		/* The module is being forcefully removed */
++		WARN_ON(dev->desc);
++		/* Remove from device list */
++		list_del(&dev->list);
++		ubiblock_cleanup(dev);
++		kfree(dev);
++	}
++}
++
++int __init ubiblock_init(void)
++{
++	int ret;
++
++	ubiblock_major = register_blkdev(0, "ubiblock");
++	if (ubiblock_major < 0)
++		return ubiblock_major;
++
++	/* Attach block devices from 'block=' module param */
++	ret = ubiblock_attach_from_param();
++	if (ret)
++		goto err_detach;
++
++	/*
++	 * Block devices needs to be attached to volumes explicitly
++	 * upon user request. So we ignore existing volumes.
++	 */
++	ret = ubi_register_volume_notifier(&ubiblock_notifier, 1);
++	if (ret)
++		goto err_unreg;
++	return 0;
++
++err_unreg:
++	unregister_blkdev(ubiblock_major, "ubiblock");
++err_detach:
++	ubiblock_detach_all();
++	return ret;
++}
++
++void __exit ubiblock_exit(void)
++{
++	ubi_unregister_volume_notifier(&ubiblock_notifier);
++	ubiblock_detach_all();
++	unregister_blkdev(ubiblock_major, "ubiblock");
++}
+--- a/drivers/mtd/ubi/build.c
++++ b/drivers/mtd/ubi/build.c
+@@ -1290,6 +1290,15 @@ static int __init ubi_init(void)
+ 		}
+ 	}
+ 
++	err = ubiblock_init();
++	if (err) {
++		ubi_err("block: cannot initialize, error %d", err);
++
++		/* See comment above re-ubi_is_module(). */
++		if (ubi_is_module())
++			goto out_detach;
++	}
++
+ 	return 0;
+ 
+ out_detach:
+@@ -1318,6 +1327,8 @@ static void __exit ubi_exit(void)
+ {
+ 	int i;
+ 
++	ubiblock_exit();
++
+ 	for (i = 0; i < UBI_MAX_DEVICES; i++)
+ 		if (ubi_devices[i]) {
+ 			mutex_lock(&ubi_devices_mutex);
+--- a/drivers/mtd/ubi/cdev.c
++++ b/drivers/mtd/ubi/cdev.c
+@@ -585,6 +585,26 @@ static long vol_cdev_ioctl(struct file *
+ 		break;
+ 	}
+ 
++	/* Attach a block device to an UBI volume */
++	case UBI_IOCVOLATTBLK:
++	{
++		struct ubi_volume_info vi;
++
++		ubi_get_volume_info(desc, &vi);
++		err = ubiblock_add(&vi);
++		break;
++	}
++
++	/* Dettach a block device from an UBI volume */
++	case UBI_IOCVOLDETBLK:
++	{
++		struct ubi_volume_info vi;
++
++		ubi_get_volume_info(desc, &vi);
++		err = ubiblock_del(&vi);
++		break;
++	}
++
+ 	default:
+ 		err = -ENOTTY;
+ 		break;
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -864,6 +864,20 @@ int ubi_update_fastmap(struct ubi_device
+ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
+ 		     int fm_anchor);
+ 
++/* block.c */
++#ifdef CONFIG_MTD_UBI_BLOCK
++int ubiblock_init(void);
++void ubiblock_exit(void);
++int ubiblock_add(struct ubi_volume_info *vi);
++int ubiblock_del(struct ubi_volume_info *vi);
++#else
++static inline int ubiblock_init(void) { return 0; }
++static inline void ubiblock_exit(void) {}
++static inline int ubiblock_add(struct ubi_volume_info *vi) { return -ENOTTY; }
++static inline int ubiblock_del(struct ubi_volume_info *vi) { return -ENOTTY; }
++#endif
++
++
+ /*
+  * ubi_rb_for_each_entry - walk an RB-tree.
+  * @rb: a pointer to type 'struct rb_node' to use as a loop counter
+--- a/include/uapi/mtd/ubi-user.h
++++ b/include/uapi/mtd/ubi-user.h
+@@ -134,6 +134,13 @@
+  * used. A pointer to a &struct ubi_set_vol_prop_req object is expected to be
+  * passed. The object describes which property should be set, and to which value
+  * it should be set.
++ *
++ * Block devices on UBI volumes
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ *
++ * To attach or detach a block device from an UBI volume the %UBI_IOCVOLATTBLK
++ * and %UBI_IOCVOLDETBLK ioctl commands should be used, respectively.
++ * These commands take no arguments.
+  */
+ 
+ /*
+@@ -188,6 +195,10 @@
+ /* Set an UBI volume property */
+ #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
+ 			       struct ubi_set_vol_prop_req)
++/* Attach a block device to an UBI volume */
++#define UBI_IOCVOLATTBLK _IO(UBI_VOL_IOC_MAGIC, 7)
++/* Detach a block device from an UBI volume */
++#define UBI_IOCVOLDETBLK _IO(UBI_VOL_IOC_MAGIC, 8)
+ 
+ /* Maximum MTD device name length supported by UBI */
+ #define MAX_UBI_MTD_NAME_LEN 127
diff --git a/trunk/target/linux/generic/patches-3.10/041-UBI-block-do-not-use-term-attach.patch b/trunk/target/linux/generic/patches-3.10/041-UBI-block-do-not-use-term-attach.patch
new file mode 100644
index 00000000..08b38dae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/041-UBI-block-do-not-use-term-attach.patch
@@ -0,0 +1,185 @@
+From 4d283ee2517303afa54ad6cbd9342a2f748cf509 Mon Sep 17 00:00:00 2001
+From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Date: Tue, 4 Mar 2014 12:00:26 +0200
+Subject: [PATCH] UBI: block: do not use term "attach"
+
+We already use term attach/detach for UBI->MTD relations, let's not use this
+for UBI->ubiblock relations to avoid confusion. Just use 'create' and 'remove'
+instead. E.g., "create a R/O block device on top of a UBI volume".
+
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 39 ++++++++++++++++++++-------------------
+ drivers/mtd/ubi/cdev.c  |  4 ++--
+ drivers/mtd/ubi/ubi.h   | 14 ++++++++++----
+ 3 files changed, 32 insertions(+), 25 deletions(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -29,10 +29,10 @@
+  *
+  *   LEB number = addressed byte / LEB size
+  *
+- * This feature is compiled in the UBI core, and adds a new 'block' parameter
+- * to allow early block device attaching. Runtime  block attach/detach for UBI
+- * volumes is provided through two new UBI ioctls: UBI_IOCVOLATTBLK and
+- * UBI_IOCVOLDETBLK.
++ * This feature is compiled in the UBI core, and adds a 'block' parameter
++ * to allow early creation of block devices on top of UBI volumes. Runtime
++ * block creation/removal for UBI volumes is provided through two UBI ioctls:
++ * UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK.
+  */
+ 
+ #include <linux/module.h>
+@@ -374,7 +374,7 @@ static const struct block_device_operati
+ 	.getgeo	= ubiblock_getgeo,
+ };
+ 
+-int ubiblock_add(struct ubi_volume_info *vi)
++int ubiblock_create(struct ubi_volume_info *vi)
+ {
+ 	struct ubiblock *dev;
+ 	struct gendisk *gd;
+@@ -464,7 +464,7 @@ static void ubiblock_cleanup(struct ubib
+ 	put_disk(dev->gd);
+ }
+ 
+-int ubiblock_del(struct ubi_volume_info *vi)
++int ubiblock_remove(struct ubi_volume_info *vi)
+ {
+ 	struct ubiblock *dev;
+ 
+@@ -503,7 +503,8 @@ static void ubiblock_resize(struct ubi_v
+ 
+ 	/*
+ 	 * Need to lock the device list until we stop using the device,
+-	 * otherwise the device struct might get released in 'ubiblock_del()'.
++	 * otherwise the device struct might get released in
++	 * 'ubiblock_remove()'.
+ 	 */
+ 	mutex_lock(&devices_mutex);
+ 	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
+@@ -528,12 +529,12 @@ static int ubiblock_notify(struct notifi
+ 	switch (notification_type) {
+ 	case UBI_VOLUME_ADDED:
+ 		/*
+-		 * We want to enforce explicit block device attaching for
++		 * We want to enforce explicit block device creation for
+ 		 * volumes, so when a volume is added we do nothing.
+ 		 */
+ 		break;
+ 	case UBI_VOLUME_REMOVED:
+-		ubiblock_del(&nt->vi);
++		ubiblock_remove(&nt->vi);
+ 		break;
+ 	case UBI_VOLUME_RESIZED:
+ 		ubiblock_resize(&nt->vi);
+@@ -561,7 +562,7 @@ open_volume_desc(const char *name, int u
+ 		return ubi_open_volume(ubi_num, vol_id, UBI_READONLY);
+ }
+ 
+-static int __init ubiblock_attach_from_param(void)
++static int __init ubiblock_create_from_param(void)
+ {
+ 	int i, ret;
+ 	struct ubiblock_param *p;
+@@ -582,7 +583,7 @@ static int __init ubiblock_attach_from_p
+ 		ubi_get_volume_info(desc, &vi);
+ 		ubi_close_volume(desc);
+ 
+-		ret = ubiblock_add(&vi);
++		ret = ubiblock_create(&vi);
+ 		if (ret) {
+ 			ubi_err("block: can't add '%s' volume, err=%d\n",
+ 				vi.name, ret);
+@@ -592,7 +593,7 @@ static int __init ubiblock_attach_from_p
+ 	return ret;
+ }
+ 
+-static void ubiblock_detach_all(void)
++static void ubiblock_remove_all(void)
+ {
+ 	struct ubiblock *next;
+ 	struct ubiblock *dev;
+@@ -618,13 +619,13 @@ int __init ubiblock_init(void)
+ 		return ubiblock_major;
+ 
+ 	/* Attach block devices from 'block=' module param */
+-	ret = ubiblock_attach_from_param();
++	ret = ubiblock_create_from_param();
+ 	if (ret)
+-		goto err_detach;
++		goto err_remove;
+ 
+ 	/*
+-	 * Block devices needs to be attached to volumes explicitly
+-	 * upon user request. So we ignore existing volumes.
++	 * Block devices are only created upon user requests, so we ignore
++	 * existing volumes.
+ 	 */
+ 	ret = ubi_register_volume_notifier(&ubiblock_notifier, 1);
+ 	if (ret)
+@@ -633,14 +634,14 @@ int __init ubiblock_init(void)
+ 
+ err_unreg:
+ 	unregister_blkdev(ubiblock_major, "ubiblock");
+-err_detach:
+-	ubiblock_detach_all();
++err_remove:
++	ubiblock_remove_all();
+ 	return ret;
+ }
+ 
+ void __exit ubiblock_exit(void)
+ {
+ 	ubi_unregister_volume_notifier(&ubiblock_notifier);
+-	ubiblock_detach_all();
++	ubiblock_remove_all();
+ 	unregister_blkdev(ubiblock_major, "ubiblock");
+ }
+--- a/drivers/mtd/ubi/cdev.c
++++ b/drivers/mtd/ubi/cdev.c
+@@ -591,7 +591,7 @@ static long vol_cdev_ioctl(struct file *
+ 		struct ubi_volume_info vi;
+ 
+ 		ubi_get_volume_info(desc, &vi);
+-		err = ubiblock_add(&vi);
++		err = ubiblock_create(&vi);
+ 		break;
+ 	}
+ 
+@@ -601,7 +601,7 @@ static long vol_cdev_ioctl(struct file *
+ 		struct ubi_volume_info vi;
+ 
+ 		ubi_get_volume_info(desc, &vi);
+-		err = ubiblock_del(&vi);
++		err = ubiblock_remove(&vi);
+ 		break;
+ 	}
+ 
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -868,13 +868,19 @@ int ubi_scan_fastmap(struct ubi_device *
+ #ifdef CONFIG_MTD_UBI_BLOCK
+ int ubiblock_init(void);
+ void ubiblock_exit(void);
+-int ubiblock_add(struct ubi_volume_info *vi);
+-int ubiblock_del(struct ubi_volume_info *vi);
++int ubiblock_create(struct ubi_volume_info *vi);
++int ubiblock_remove(struct ubi_volume_info *vi);
+ #else
+ static inline int ubiblock_init(void) { return 0; }
+ static inline void ubiblock_exit(void) {}
+-static inline int ubiblock_add(struct ubi_volume_info *vi) { return -ENOTTY; }
+-static inline int ubiblock_del(struct ubi_volume_info *vi) { return -ENOTTY; }
++static inline int ubiblock_create(struct ubi_volume_info *vi)
++{
++	return -ENOTTY;
++}
++static inline int ubiblock_remove(struct ubi_volume_info *vi)
++{
++	return -ENOTTY;
++}
+ #endif
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch b/trunk/target/linux/generic/patches-3.10/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
new file mode 100644
index 00000000..54660992
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
@@ -0,0 +1,37 @@
+From ca2b722d1ab5bc3ffc34b5995248968cd8a7cb6f Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Mon, 3 Mar 2014 13:42:38 -0300
+Subject: [PATCH] UBI: block: Mark init-only symbol as __initdata
+
+ubiblock_param_ops should be marked as __init as it's only used to set
+a driver parameter on insertion time. This commit fixes the following:
+
+  WARNING: drivers/mtd/built-in.o(.text+0x653ac): Section mismatch in
+  reference from the variable ubiblock_param_ops to the function
+  .init.text:ubiblock_set_param()
+
+  The function ubiblock_param_ops() references the function __init
+  ubiblock_set_param(). This is often because ubiblock_param_ops lacks a
+  __init annotation or the annotation of ubiblock_set_param is wrong.
+
+Given gcc errors if the struct is marked const __initdata, this commit
+drops the const mark from it.
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(con
+ 	return 0;
+ }
+ 
+-static const struct kernel_param_ops ubiblock_param_ops = {
++static struct kernel_param_ops ubiblock_param_ops __initdata = {
+ 	.set    = ubiblock_set_param,
+ };
+ module_param_cb(block, &ubiblock_param_ops, NULL, 0);
diff --git a/trunk/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch b/trunk/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
new file mode 100644
index 00000000..260927d0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
@@ -0,0 +1,28 @@
+From 9981e14ab2f7c6a4d2bb45e51a6371964919837d Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Mon, 3 Mar 2014 13:42:39 -0300
+Subject: [PATCH] UBI: block: Use 'u64' for the 64-bit dividend
+
+Fixes the following warning on ARCH=avr32:
+
+  drivers/mtd/ubi/block.c: In function 'ubiblock_read':
+  drivers/mtd/ubi/block.c:207: warning: comparison of distinct pointer types lacks a cast
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -201,7 +201,7 @@ static int ubiblock_read(struct ubiblock
+ 	int ret, leb, offset;
+ 	int bytes_left = len;
+ 	int to_read = len;
+-	loff_t pos = sec << 9;
++	u64 pos = sec << 9;
+ 
+ 	/* Get LEB:offset address to read from */
+ 	offset = do_div(pos, dev->leb_size);
diff --git a/trunk/target/linux/generic/patches-3.10/044-UBI-rename-block-device-ioctls.patch b/trunk/target/linux/generic/patches-3.10/044-UBI-rename-block-device-ioctls.patch
new file mode 100644
index 00000000..c784dceb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/044-UBI-rename-block-device-ioctls.patch
@@ -0,0 +1,83 @@
+From 8af871887fcba470ff9265c65cff7d14d9e0e3f9 Mon Sep 17 00:00:00 2001
+From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Date: Wed, 5 Mar 2014 13:01:56 +0200
+Subject: [PATCH] UBI: rename block device ioctls
+
+Rename the UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK to UBI_IOCVOLCRBLK and
+UBI_IOCVOLRMBLK, because we do not use terms "attach" and "detach" for the R/O
+block devices on top of UBI volumes. Instead, we use terms "create" and
+"remove". This patch also amends the related commentaries.
+
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+---
+ drivers/mtd/ubi/block.c     |  2 +-
+ drivers/mtd/ubi/cdev.c      |  8 ++++----
+ include/uapi/mtd/ubi-user.h | 14 +++++++-------
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -32,7 +32,7 @@
+  * This feature is compiled in the UBI core, and adds a 'block' parameter
+  * to allow early creation of block devices on top of UBI volumes. Runtime
+  * block creation/removal for UBI volumes is provided through two UBI ioctls:
+- * UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK.
++ * UBI_IOCVOLCRBLK and UBI_IOCVOLRMBLK.
+  */
+ 
+ #include <linux/module.h>
+--- a/drivers/mtd/ubi/cdev.c
++++ b/drivers/mtd/ubi/cdev.c
+@@ -585,8 +585,8 @@ static long vol_cdev_ioctl(struct file *
+ 		break;
+ 	}
+ 
+-	/* Attach a block device to an UBI volume */
+-	case UBI_IOCVOLATTBLK:
++	/* Create a R/O block device on top of the UBI volume */
++	case UBI_IOCVOLCRBLK:
+ 	{
+ 		struct ubi_volume_info vi;
+ 
+@@ -595,8 +595,8 @@ static long vol_cdev_ioctl(struct file *
+ 		break;
+ 	}
+ 
+-	/* Dettach a block device from an UBI volume */
+-	case UBI_IOCVOLDETBLK:
++	/* Remove the R/O block device */
++	case UBI_IOCVOLRMBLK:
+ 	{
+ 		struct ubi_volume_info vi;
+ 
+--- a/include/uapi/mtd/ubi-user.h
++++ b/include/uapi/mtd/ubi-user.h
+@@ -138,9 +138,9 @@
+  * Block devices on UBI volumes
+  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  *
+- * To attach or detach a block device from an UBI volume the %UBI_IOCVOLATTBLK
+- * and %UBI_IOCVOLDETBLK ioctl commands should be used, respectively.
+- * These commands take no arguments.
++ * To create or remove a R/O block device on top of an UBI volume the
++ * %UBI_IOCVOLCRBLK and %UBI_IOCVOLRMBLK ioctl commands should be used,
++ * respectively. These commands take no arguments.
+  */
+ 
+ /*
+@@ -195,10 +195,10 @@
+ /* Set an UBI volume property */
+ #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
+ 			       struct ubi_set_vol_prop_req)
+-/* Attach a block device to an UBI volume */
+-#define UBI_IOCVOLATTBLK _IO(UBI_VOL_IOC_MAGIC, 7)
+-/* Detach a block device from an UBI volume */
+-#define UBI_IOCVOLDETBLK _IO(UBI_VOL_IOC_MAGIC, 8)
++/* Create a R/O block device on top of an UBI volume */
++#define UBI_IOCVOLCRBLK _IO(UBI_VOL_IOC_MAGIC, 7)
++/* Remove the R/O block device */
++#define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8)
+ 
+ /* Maximum MTD device name length supported by UBI */
+ #define MAX_UBI_MTD_NAME_LEN 127
diff --git a/trunk/target/linux/generic/patches-3.10/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch b/trunk/target/linux/generic/patches-3.10/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch
new file mode 100644
index 00000000..badfcb0a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch
@@ -0,0 +1,30 @@
+From d56030ac25d383218045c5d87e98e0494d6af3ad Mon Sep 17 00:00:00 2001
+From: Richard Weinberger <richard@nod.at>
+Date: Wed, 19 Mar 2014 11:43:22 +0100
+Subject: [PATCH] UBI: block: Remove __initdata from ubiblock_param_ops
+
+You cannot mark these parameters as __initdata.
+Otherwise the data is gone upon module exit.
+
+Fixes:
+[  172.045465] BUG: unable to handle kernel paging request at ffffffffa001db38
+[  172.046020] IP: [<ffffffff81067aa4>] destroy_params+0x24/0x50
+
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(con
+ 	return 0;
+ }
+ 
+-static struct kernel_param_ops ubiblock_param_ops __initdata = {
++static struct kernel_param_ops ubiblock_param_ops = {
+ 	.set    = ubiblock_set_param,
+ };
+ module_param_cb(block, &ubiblock_param_ops, NULL, 0);
diff --git a/trunk/target/linux/generic/patches-3.10/046-UBI-avoid-workqueue-format-string-leak.patch b/trunk/target/linux/generic/patches-3.10/046-UBI-avoid-workqueue-format-string-leak.patch
new file mode 100644
index 00000000..41ef6b84
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/046-UBI-avoid-workqueue-format-string-leak.patch
@@ -0,0 +1,25 @@
+From bebfef150e0b8fa68704cddacf05b8c26462d565 Mon Sep 17 00:00:00 2001
+From: Kees Cook <keescook@chromium.org>
+Date: Mon, 7 Apr 2014 21:44:07 -0700
+Subject: [PATCH] UBI: avoid workqueue format string leak
+
+When building the name for the workqueue thread, make sure a format
+string cannot leak in from the disk name.
+
+Signed-off-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -431,7 +431,7 @@ int ubiblock_create(struct ubi_volume_in
+ 	 * Create one workqueue per volume (per registered block device).
+ 	 * Rembember workqueues are cheap, they're not threads.
+ 	 */
+-	dev->wq = alloc_workqueue(gd->disk_name, 0, 0);
++	dev->wq = alloc_workqueue("%s", 0, 0, gd->disk_name);
+ 	if (!dev->wq)
+ 		goto out_free_queue;
+ 	INIT_WORK(&dev->work, ubiblock_do_work);
diff --git a/trunk/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch b/trunk/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
new file mode 100644
index 00000000..e7cba446
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
@@ -0,0 +1,58 @@
+From 463c5eedb4a13b9aa91f05498a0f2c20bd03f8c4 Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Wed, 5 Mar 2014 11:16:14 -0300
+Subject: [PATCH] UBI: make UBI_IOCVOLCRBLK take a parameter for future usage
+
+In order to allow a future ioctl parameter, such as a creation flag,
+we change the UBI_IOCVOLCRBLK so it accepts a struct ubi_blkcreate_req.
+For the time being the structure is not in use, but fully reserved.
+
+This ABI change is still possible and harmless, because the ioctl has just
+been introduced and there's no userspace program which uses it.
+
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ include/uapi/mtd/ubi-user.h | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+--- a/include/uapi/mtd/ubi-user.h
++++ b/include/uapi/mtd/ubi-user.h
+@@ -138,9 +138,12 @@
+  * Block devices on UBI volumes
+  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  *
+- * To create or remove a R/O block device on top of an UBI volume the
+- * %UBI_IOCVOLCRBLK and %UBI_IOCVOLRMBLK ioctl commands should be used,
+- * respectively. These commands take no arguments.
++ * To create a R/O block device on top of an UBI volume the %UBI_IOCVOLCRBLK
++ * should be used. A pointer to a &struct ubi_blkcreate_req object is expected
++ * to be passed, which is not used and reserved for future usage.
++ *
++ * Conversely, to remove a block device the %UBI_IOCVOLRMBLK should be used,
++ * which takes no arguments.
+  */
+ 
+ /*
+@@ -196,7 +199,7 @@
+ #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
+ 			       struct ubi_set_vol_prop_req)
+ /* Create a R/O block device on top of an UBI volume */
+-#define UBI_IOCVOLCRBLK _IO(UBI_VOL_IOC_MAGIC, 7)
++#define UBI_IOCVOLCRBLK _IOW(UBI_VOL_IOC_MAGIC, 7, struct ubi_blkcreate_req)
+ /* Remove the R/O block device */
+ #define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8)
+ 
+@@ -428,4 +431,12 @@ struct ubi_set_vol_prop_req {
+ 	__u64 value;
+ }  __packed;
+ 
++/**
++ * struct ubi_blkcreate_req - a data structure used in block creation requests.
++ * @padding: reserved for future, not used, has to be zeroed
++ */
++struct ubi_blkcreate_req {
++	__s8  padding[128];
++}  __packed;
++
+ #endif /* __UBI_USER_H__ */
diff --git a/trunk/target/linux/generic/patches-3.10/060-hso_devices.patch b/trunk/target/linux/generic/patches-3.10/060-hso_devices.patch
new file mode 100644
index 00000000..376abfbe
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/060-hso_devices.patch
@@ -0,0 +1,36 @@
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -468,8 +468,10 @@ static const struct usb_device_id hso_id
+ 	{USB_DEVICE(0x0af0, 0x8400)},
+ 	{USB_DEVICE(0x0af0, 0x8600)},
+ 	{USB_DEVICE(0x0af0, 0x8800)},
+-	{USB_DEVICE(0x0af0, 0x8900)},
+-	{USB_DEVICE(0x0af0, 0x9000)},
++	{USB_DEVICE(0x0af0, 0x8900)},  /* GTM 67xx */
++	{USB_DEVICE(0x0af0, 0x9000)},  /* GTM 66xx */
++	{USB_DEVICE(0x0af0, 0x9200)},  /* GTM 67xxWFS */
++	{USB_DEVICE(0x0af0, 0x9300)},  /* GTM 66xxWFS */
+ 	{USB_DEVICE(0x0af0, 0xd035)},
+ 	{USB_DEVICE(0x0af0, 0xd055)},
+ 	{USB_DEVICE(0x0af0, 0xd155)},
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1304,6 +1304,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		0 ),
+ 
++UNUSUAL_DEV( 0x0af0, 0x9200, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 67xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
++UNUSUAL_DEV( 0x0af0, 0x9300, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 66xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
+ UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000,
+ 		"Option",
+ 		"GI 070x SD-Card",
diff --git a/trunk/target/linux/generic/patches-3.10/061-arm_xz_decompressor_build_fix.patch b/trunk/target/linux/generic/patches-3.10/061-arm_xz_decompressor_build_fix.patch
new file mode 100644
index 00000000..e69ca259
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/061-arm_xz_decompressor_build_fix.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -48,6 +48,7 @@ extern char * strstr(const char * s1, co
+ #ifdef CONFIG_KERNEL_XZ
+ #define memmove memmove
+ #define memcpy memcpy
++extern char * strstr(const char *, const char *);
+ #include "../../../../lib/decompress_unxz.c"
+ #endif
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch b/trunk/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch
new file mode 100644
index 00000000..8c2d3da8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/063-arm-fix-fiq-vivt.patch
@@ -0,0 +1,50 @@
+From 2ba85e7af4c639d933c9a87a6d7363f2983d5ada Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Thu, 08 Aug 2013 10:51:21 +0000
+Subject: ARM: Fix FIQ code on VIVT CPUs
+
+Aaro Koskinen reports the following oops:
+Installing fiq handler from c001b110, length 0x164
+Unable to handle kernel paging request at virtual address ffff1224
+pgd = c0004000
+[ffff1224] *pgd=00000000, *pte=11fff0cb, *ppte=11fff00a
+...
+[<c0013154>] (set_fiq_handler+0x0/0x6c) from [<c0365d38>] (ams_delta_init_fiq+0xa8/0x160)
+ r6:00000164 r5:c001b110 r4:00000000 r3:fefecb4c
+[<c0365c90>] (ams_delta_init_fiq+0x0/0x160) from [<c0365b14>] (ams_delta_init+0xd4/0x114)
+ r6:00000000 r5:fffece10 r4:c037a9e0
+[<c0365a40>] (ams_delta_init+0x0/0x114) from [<c03613b4>] (customize_machine+0x24/0x30)
+
+This is because the vectors page is now write-protected, and to change
+code in there we must write to its original alias.  Make that change,
+and adjust the cache flushing such that the code will become visible
+to the instruction stream on VIVT CPUs.
+
+Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+(limited to 'arch/arm/kernel/fiq.c')
+
+--- a/arch/arm/kernel/fiq.c
++++ b/arch/arm/kernel/fiq.c
+@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, in
+ 
+ void set_fiq_handler(void *start, unsigned int length)
+ {
+-#if defined(CONFIG_CPU_USE_DOMAINS)
+-	void *base = (void *)0xffff0000;
+-#else
+ 	void *base = vectors_page;
+-#endif
+ 	unsigned offset = FIQ_OFFSET;
+ 
+ 	memcpy(base + offset, start, length);
++	if (!cache_is_vipt_nonaliasing())
++		flush_icache_range(base + offset, offset + length);
+ 	flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);
+-	if (!vectors_high())
+-		flush_icache_range(offset, offset + length);
+ }
+ 
+ int claim_fiq(struct fiq_handler *f)
diff --git a/trunk/target/linux/generic/patches-3.10/065-iio_ad799x_backport_fixes.patch b/trunk/target/linux/generic/patches-3.10/065-iio_ad799x_backport_fixes.patch
new file mode 100644
index 00000000..38f8cbc2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/065-iio_ad799x_backport_fixes.patch
@@ -0,0 +1,157 @@
+Backport essential fixes from 3.15
+
+From Linux 3.10 on this driver required platform data to load, which makes it
+unusable in libreCMC. This commit backports the following fixes:
+  * Move to regulator framework for scaling
+  * Set endianness of the ADC to Big endian
+  * Fix device-removal path
+This commit should not be moved to newer kernel versions!
+
+Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
+---
+--- a/drivers/staging/iio/adc/ad799x_core.c
++++ b/drivers/staging/iio/adc/ad799x_core.c
+@@ -163,7 +163,6 @@ static int ad799x_read_raw(struct iio_de
+ {
+ 	int ret;
+ 	struct ad799x_state *st = iio_priv(indio_dev);
+-	unsigned int scale_uv;
+ 
+ 	switch (m) {
+ 	case IIO_CHAN_INFO_RAW:
+@@ -180,10 +179,12 @@ static int ad799x_read_raw(struct iio_de
+ 			RES_MASK(chan->scan_type.realbits);
+ 		return IIO_VAL_INT;
+ 	case IIO_CHAN_INFO_SCALE:
+-		scale_uv = (st->int_vref_mv * 1000) >> chan->scan_type.realbits;
+-		*val =  scale_uv / 1000;
+-		*val2 = (scale_uv % 1000) * 1000;
+-		return IIO_VAL_INT_PLUS_MICRO;
++		ret = regulator_get_voltage(st->vref);
++		if (ret < 0)
++			return ret;
++		*val =  ret / 1000;
++		*val2 = chan->scan_type.realbits;
++		return IIO_VAL_FRACTIONAL_LOG2;
+ 	}
+ 	return -EINVAL;
+ }
+@@ -474,7 +475,13 @@ static const struct iio_info ad7993_4_7_
+ 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+ 	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+ 	.scan_index = (_index), \
+-	.scan_type = IIO_ST('u', _realbits, 16, 12 - (_realbits)), \
++	.scan_type = { \
++		.sign = 'u', \
++		.realbits = (_realbits), \
++		.storagebits = 16, \
++		.shift = 12 - (_realbits), \
++		.endianness = IIO_BE, \
++		}, \
+ 	.event_mask = (_evmask), \
+ }
+ 
+@@ -584,7 +591,6 @@ static int ad799x_probe(struct i2c_clien
+ 				   const struct i2c_device_id *id)
+ {
+ 	int ret;
+-	struct ad799x_platform_data *pdata = client->dev.platform_data;
+ 	struct ad799x_state *st;
+ 	struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));
+ 
+@@ -601,17 +607,21 @@ static int ad799x_probe(struct i2c_clien
+ 
+ 	/* TODO: Add pdata options for filtering and bit delay */
+ 
+-	if (!pdata)
+-		return -EINVAL;
+-
+-	st->int_vref_mv = pdata->vref_mv;
+-
+-	st->reg = regulator_get(&client->dev, "vcc");
+-	if (!IS_ERR(st->reg)) {
+-		ret = regulator_enable(st->reg);
+-		if (ret)
+-			goto error_put_reg;
++	st->reg = devm_regulator_get(&client->dev, "vcc");
++	if (IS_ERR(st->reg))
++		return PTR_ERR(st->reg);
++	ret = regulator_enable(st->reg);
++	if (ret)
++		return ret;
++	st->vref = devm_regulator_get(&client->dev, "vref");
++	if (IS_ERR(st->vref)) {
++		ret = PTR_ERR(st->vref);
++		goto error_disable_reg;
+ 	}
++	ret = regulator_enable(st->vref);
++	if (ret)
++		goto error_disable_reg;
++
+ 	st->client = client;
+ 
+ 	indio_dev->dev.parent = &client->dev;
+@@ -624,7 +634,7 @@ static int ad799x_probe(struct i2c_clien
+ 
+ 	ret = ad799x_register_ring_funcs_and_init(indio_dev);
+ 	if (ret)
+-		goto error_disable_reg;
++		goto error_disable_vref;
+ 
+ 	if (client->irq > 0) {
+ 		ret = request_threaded_irq(client->irq,
+@@ -648,12 +658,10 @@ error_free_irq:
+ 		free_irq(client->irq, indio_dev);
+ error_cleanup_ring:
+ 	ad799x_ring_cleanup(indio_dev);
++error_disable_vref:
++	regulator_disable(st->vref);
+ error_disable_reg:
+-	if (!IS_ERR(st->reg))
+-		regulator_disable(st->reg);
+-error_put_reg:
+-	if (!IS_ERR(st->reg))
+-		regulator_put(st->reg);
++	regulator_disable(st->reg);
+ 	iio_device_free(indio_dev);
+ 
+ 	return ret;
+@@ -669,10 +677,8 @@ static int ad799x_remove(struct i2c_clie
+ 		free_irq(client->irq, indio_dev);
+ 
+ 	ad799x_ring_cleanup(indio_dev);
+-	if (!IS_ERR(st->reg)) {
+-		regulator_disable(st->reg);
+-		regulator_put(st->reg);
+-	}
++	regulator_disable(st->vref);
++	regulator_disable(st->reg);
+ 	kfree(st->rx_buf);
+ 	iio_device_free(indio_dev);
+ 
+--- a/drivers/staging/iio/adc/ad799x.h
++++ b/drivers/staging/iio/adc/ad799x.h
+@@ -103,7 +103,7 @@ struct ad799x_state {
+ 	struct i2c_client		*client;
+ 	const struct ad799x_chip_info	*chip_info;
+ 	struct regulator		*reg;
+-	u16				int_vref_mv;
++	struct regulator		*vref;
+ 	unsigned			id;
+ 	u16				config;
+ 
+@@ -111,14 +111,6 @@ struct ad799x_state {
+ 	unsigned int			transfer_size;
+ };
+ 
+-/*
+- * TODO: struct ad799x_platform_data needs to go into include/linux/iio
+- */
+-
+-struct ad799x_platform_data {
+-	u16				vref_mv;
+-};
+-
+ #ifdef CONFIG_AD799X_RING_BUFFER
+ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev);
+ void ad799x_ring_cleanup(struct iio_dev *indio_dev);
diff --git a/trunk/target/linux/generic/patches-3.10/070-net_bridge_backports.patch b/trunk/target/linux/generic/patches-3.10/070-net_bridge_backports.patch
new file mode 100644
index 00000000..f303c3a0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/070-net_bridge_backports.patch
@@ -0,0 +1,973 @@
+commit 3c3769e63301fd92fcaf51870c371583dd0282ce
+Author: Linus Lüssing <linus.luessing@web.de>
+Date:   Wed Sep 4 02:13:39 2013 +0200
+
+    bridge: apply multicast snooping to IPv6 link-local, too
+    
+    The multicast snooping code should have matured enough to be safely
+    applicable to IPv6 link-local multicast addresses (excluding the
+    link-local all nodes address, ff02::1), too.
+    
+    Signed-off-by: Linus Lüssing <linus.luessing@web.de>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 8fad9c39f31f9ed7bf3526c43a4537b2fcf1a5d5
+Author: Linus Lüssing <linus.luessing@web.de>
+Date:   Wed Sep 4 02:13:38 2013 +0200
+
+    bridge: prevent flooding IPv6 packets that do not have a listener
+    
+    Currently if there is no listener for a certain group then IPv6 packets
+    for that group are flooded on all ports, even though there might be no
+    host and router interested in it on a port.
+    
+    With this commit they are only forwarded to ports with a multicast
+    router.
+    
+    Just like commit bd4265fe36 ("bridge: Only flood unregistered groups
+    to routers") did for IPv4, let's do the same for IPv6 with the same
+    reasoning.
+    
+    Signed-off-by: Linus Lüssing <linus.luessing@web.de>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit cc0fdd802859eaeb00e1c87dbb655594bed2844c
+Author: Linus Lüssing <linus.luessing@web.de>
+Date:   Fri Aug 30 17:28:17 2013 +0200
+
+    bridge: separate querier and query timer into IGMP/IPv4 and MLD/IPv6 ones
+    
+    Currently we would still potentially suffer multicast packet loss if there
+    is just either an IGMP or an MLD querier: For the former case, we would
+    possibly drop IPv6 multicast packets, for the latter IPv4 ones. This is
+    because we are currently assuming that if either an IGMP or MLD querier
+    is present that the other one is present, too.
+    
+    This patch makes the behaviour and fix added in
+    "bridge: disable snooping if there is no querier" (b00589af3b04)
+    to also work if there is either just an IGMP or an MLD querier on the
+    link: It refines the deactivation of the snooping to be protocol
+    specific by using separate timers for the snooped IGMP and MLD queries
+    as well as separate timers for our internal IGMP and MLD queriers.
+    
+    Signed-off-by: Linus Lüssing <linus.luessing@web.de>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit b00589af3b04736376f24625ab0b394642e89e29
+Author: Linus Lüssing <linus.luessing@web.de>
+Date:   Thu Aug 1 01:06:20 2013 +0200
+
+    bridge: disable snooping if there is no querier
+    
+    If there is no querier on a link then we won't get periodic reports and
+    therefore won't be able to learn about multicast listeners behind ports,
+    potentially leading to lost multicast packets, especially for multicast
+    listeners that joined before the creation of the bridge.
+    
+    These lost multicast packets can appear since c5c23260594
+    ("bridge: Add multicast_querier toggle and disable queries by default")
+    in particular.
+    
+    With this patch we are flooding multicast packets if our querier is
+    disabled and if we didn't detect any other querier.
+    
+    A grace period of the Maximum Response Delay of the querier is added to
+    give multicast responses enough time to arrive and to be learned from
+    before disabling the flooding behaviour again.
+    
+    Signed-off-by: Linus Lüssing <linus.luessing@web.de>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 6b7df111ece130fa979a0c4f58e53674c1e47d3e
+Author: Cong Wang <amwang@redhat.com>
+Date:   Tue May 21 21:52:56 2013 +0000
+
+    bridge: send query as soon as leave is received
+    
+    Continue sending queries when leave is received if the user marks
+    it as a querier.
+    
+    Cc: Herbert Xu <herbert@gondor.apana.org.au>
+    Cc: Stephen Hemminger <stephen@networkplumber.org>
+    Cc: "David S. Miller" <davem@davemloft.net>
+    Cc: Adam Baker <linux@baker-net.org.uk>
+    Signed-off-by: Cong Wang <amwang@redhat.com>
+    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 1c8ad5bfa2be5025b0c81e3c2decd0574d453ab1
+Author: Cong Wang <amwang@redhat.com>
+Date:   Tue May 21 21:52:54 2013 +0000
+
+    bridge: use the bridge IP addr as source addr for querier
+    
+    Quote from Adam:
+    "If it is believed that the use of 0.0.0.0
+    as the IP address is what is causing strange behaviour on other devices
+    then is there a good reason that a bridge rather than a router shouldn't
+    be the active querier? If not then using the bridge IP address and
+    having the querier enabled by default may be a reasonable solution
+    (provided that our querier obeys the election rules and shuts up if it
+    sees a query from a lower IP address that isn't 0.0.0.0). Just because a
+    device is the elected querier for IGMP doesn't appear to mean it is
+    required to perform any other routing functions."
+    
+    And introduce a new troggle for it, as suggested by Herbert.
+    
+    Suggested-by: Adam Baker <linux@baker-net.org.uk>
+    Cc: Herbert Xu <herbert@gondor.apana.org.au>
+    Cc: Stephen Hemminger <stephen@networkplumber.org>
+    Cc: "David S. Miller" <davem@davemloft.net>
+    Cc: Adam Baker <linux@baker-net.org.uk>
+    Signed-off-by: Cong Wang <amwang@redhat.com>
+    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+--- a/net/bridge/br_device.c
++++ b/net/bridge/br_device.c
+@@ -67,7 +67,8 @@ netdev_tx_t br_dev_xmit(struct sk_buff *
+ 		}
+ 
+ 		mdst = br_mdb_get(br, skb, vid);
+-		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))
++		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
++		    br_multicast_querier_exists(br, eth_hdr(skb)))
+ 			br_multicast_deliver(mdst, skb);
+ 		else
+ 			br_flood_deliver(br, skb);
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -98,7 +98,8 @@ int br_handle_frame_finish(struct sk_buf
+ 		skb2 = skb;
+ 	else if (is_multicast_ether_addr(dest)) {
+ 		mdst = br_mdb_get(br, skb, vid);
+-		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
++		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
++		    br_multicast_querier_exists(br, eth_hdr(skb))) {
+ 			if ((mdst && mdst->mglist) ||
+ 			    br_multicast_is_router(br))
+ 				skb2 = skb;
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -23,16 +23,19 @@
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+ #include <linux/timer.h>
++#include <linux/inetdevice.h>
+ #include <net/ip.h>
+ #if IS_ENABLED(CONFIG_IPV6)
+ #include <net/ipv6.h>
+ #include <net/mld.h>
+ #include <net/ip6_checksum.h>
++#include <net/addrconf.h>
+ #endif
+ 
+ #include "br_private.h"
+ 
+-static void br_multicast_start_querier(struct net_bridge *br);
++static void br_multicast_start_querier(struct net_bridge *br,
++				       struct bridge_mcast_query *query);
+ unsigned int br_mdb_rehash_seq;
+ 
+ static inline int br_ip_equal(const struct br_ip *a, const struct br_ip *b)
+@@ -381,7 +384,8 @@ static struct sk_buff *br_ip4_multicast_
+ 	iph->frag_off = htons(IP_DF);
+ 	iph->ttl = 1;
+ 	iph->protocol = IPPROTO_IGMP;
+-	iph->saddr = 0;
++	iph->saddr = br->multicast_query_use_ifaddr ?
++		     inet_select_addr(br->dev, 0, RT_SCOPE_LINK) : 0;
+ 	iph->daddr = htonl(INADDR_ALLHOSTS_GROUP);
+ 	((u8 *)&iph[1])[0] = IPOPT_RA;
+ 	((u8 *)&iph[1])[1] = 4;
+@@ -724,7 +728,7 @@ static int br_ip6_multicast_add_group(st
+ {
+ 	struct br_ip br_group;
+ 
+-	if (!ipv6_is_transient_multicast(group))
++	if (ipv6_addr_is_ll_all_nodes(group))
+ 		return 0;
+ 
+ 	br_group.u.ip6 = *group;
+@@ -756,20 +760,35 @@ static void br_multicast_local_router_ex
+ {
+ }
+ 
+-static void br_multicast_querier_expired(unsigned long data)
++static void br_multicast_querier_expired(struct net_bridge *br,
++					 struct bridge_mcast_query *query)
+ {
+-	struct net_bridge *br = (void *)data;
+-
+ 	spin_lock(&br->multicast_lock);
+ 	if (!netif_running(br->dev) || br->multicast_disabled)
+ 		goto out;
+ 
+-	br_multicast_start_querier(br);
++	br_multicast_start_querier(br, query);
+ 
+ out:
+ 	spin_unlock(&br->multicast_lock);
+ }
+ 
++static void br_ip4_multicast_querier_expired(unsigned long data)
++{
++	struct net_bridge *br = (void *)data;
++
++	br_multicast_querier_expired(br, &br->ip4_query);
++}
++
++#if IS_ENABLED(CONFIG_IPV6)
++static void br_ip6_multicast_querier_expired(unsigned long data)
++{
++	struct net_bridge *br = (void *)data;
++
++	br_multicast_querier_expired(br, &br->ip6_query);
++}
++#endif
++
+ static void __br_multicast_send_query(struct net_bridge *br,
+ 				      struct net_bridge_port *port,
+ 				      struct br_ip *ip)
+@@ -790,37 +809,45 @@ static void __br_multicast_send_query(st
+ }
+ 
+ static void br_multicast_send_query(struct net_bridge *br,
+-				    struct net_bridge_port *port, u32 sent)
++				    struct net_bridge_port *port,
++				    struct bridge_mcast_query *query)
+ {
+ 	unsigned long time;
+ 	struct br_ip br_group;
++	struct bridge_mcast_querier *querier = NULL;
+ 
+ 	if (!netif_running(br->dev) || br->multicast_disabled ||
+-	    !br->multicast_querier ||
+-	    timer_pending(&br->multicast_querier_timer))
++	    !br->multicast_querier)
+ 		return;
+ 
+ 	memset(&br_group.u, 0, sizeof(br_group.u));
+ 
+-	br_group.proto = htons(ETH_P_IP);
+-	__br_multicast_send_query(br, port, &br_group);
+-
++	if (port ? (query == &port->ip4_query) :
++		   (query == &br->ip4_query)) {
++		querier = &br->ip4_querier;
++		br_group.proto = htons(ETH_P_IP);
+ #if IS_ENABLED(CONFIG_IPV6)
+-	br_group.proto = htons(ETH_P_IPV6);
+-	__br_multicast_send_query(br, port, &br_group);
++	} else {
++		querier = &br->ip6_querier;
++		br_group.proto = htons(ETH_P_IPV6);
+ #endif
++	}
++
++	if (!querier || timer_pending(&querier->timer))
++		return;
++
++	__br_multicast_send_query(br, port, &br_group);
+ 
+ 	time = jiffies;
+-	time += sent < br->multicast_startup_query_count ?
++	time += query->startup_sent < br->multicast_startup_query_count ?
+ 		br->multicast_startup_query_interval :
+ 		br->multicast_query_interval;
+-	mod_timer(port ? &port->multicast_query_timer :
+-			 &br->multicast_query_timer, time);
++	mod_timer(&query->timer, time);
+ }
+ 
+-static void br_multicast_port_query_expired(unsigned long data)
++static void br_multicast_port_query_expired(struct net_bridge_port *port,
++					    struct bridge_mcast_query *query)
+ {
+-	struct net_bridge_port *port = (void *)data;
+ 	struct net_bridge *br = port->br;
+ 
+ 	spin_lock(&br->multicast_lock);
+@@ -828,25 +855,43 @@ static void br_multicast_port_query_expi
+ 	    port->state == BR_STATE_BLOCKING)
+ 		goto out;
+ 
+-	if (port->multicast_startup_queries_sent <
+-	    br->multicast_startup_query_count)
+-		port->multicast_startup_queries_sent++;
++	if (query->startup_sent < br->multicast_startup_query_count)
++		query->startup_sent++;
+ 
+-	br_multicast_send_query(port->br, port,
+-				port->multicast_startup_queries_sent);
++	br_multicast_send_query(port->br, port, query);
+ 
+ out:
+ 	spin_unlock(&br->multicast_lock);
+ }
+ 
++static void br_ip4_multicast_port_query_expired(unsigned long data)
++{
++	struct net_bridge_port *port = (void *)data;
++
++	br_multicast_port_query_expired(port, &port->ip4_query);
++}
++
++#if IS_ENABLED(CONFIG_IPV6)
++static void br_ip6_multicast_port_query_expired(unsigned long data)
++{
++	struct net_bridge_port *port = (void *)data;
++
++	br_multicast_port_query_expired(port, &port->ip6_query);
++}
++#endif
++
+ void br_multicast_add_port(struct net_bridge_port *port)
+ {
+ 	port->multicast_router = 1;
+ 
+ 	setup_timer(&port->multicast_router_timer, br_multicast_router_expired,
+ 		    (unsigned long)port);
+-	setup_timer(&port->multicast_query_timer,
+-		    br_multicast_port_query_expired, (unsigned long)port);
++	setup_timer(&port->ip4_query.timer, br_ip4_multicast_port_query_expired,
++		    (unsigned long)port);
++#if IS_ENABLED(CONFIG_IPV6)
++	setup_timer(&port->ip6_query.timer, br_ip6_multicast_port_query_expired,
++		    (unsigned long)port);
++#endif
+ }
+ 
+ void br_multicast_del_port(struct net_bridge_port *port)
+@@ -854,13 +899,13 @@ void br_multicast_del_port(struct net_br
+ 	del_timer_sync(&port->multicast_router_timer);
+ }
+ 
+-static void __br_multicast_enable_port(struct net_bridge_port *port)
++static void br_multicast_enable(struct bridge_mcast_query *query)
+ {
+-	port->multicast_startup_queries_sent = 0;
++	query->startup_sent = 0;
+ 
+-	if (try_to_del_timer_sync(&port->multicast_query_timer) >= 0 ||
+-	    del_timer(&port->multicast_query_timer))
+-		mod_timer(&port->multicast_query_timer, jiffies);
++	if (try_to_del_timer_sync(&query->timer) >= 0 ||
++	    del_timer(&query->timer))
++		mod_timer(&query->timer, jiffies);
+ }
+ 
+ void br_multicast_enable_port(struct net_bridge_port *port)
+@@ -871,7 +916,10 @@ void br_multicast_enable_port(struct net
+ 	if (br->multicast_disabled || !netif_running(br->dev))
+ 		goto out;
+ 
+-	__br_multicast_enable_port(port);
++	br_multicast_enable(&port->ip4_query);
++#if IS_ENABLED(CONFIG_IPV6)
++	br_multicast_enable(&port->ip6_query);
++#endif
+ 
+ out:
+ 	spin_unlock(&br->multicast_lock);
+@@ -890,7 +938,10 @@ void br_multicast_disable_port(struct ne
+ 	if (!hlist_unhashed(&port->rlist))
+ 		hlist_del_init_rcu(&port->rlist);
+ 	del_timer(&port->multicast_router_timer);
+-	del_timer(&port->multicast_query_timer);
++	del_timer(&port->ip4_query.timer);
++#if IS_ENABLED(CONFIG_IPV6)
++	del_timer(&port->ip6_query.timer);
++#endif
+ 	spin_unlock(&br->multicast_lock);
+ }
+ 
+@@ -1015,6 +1066,17 @@ static int br_ip6_multicast_mld2_report(
+ }
+ #endif
+ 
++static void
++br_multicast_update_querier_timer(struct net_bridge *br,
++				  struct bridge_mcast_querier *querier,
++				  unsigned long max_delay)
++{
++	if (!timer_pending(&querier->timer))
++		querier->delay_time = jiffies + max_delay;
++
++	mod_timer(&querier->timer, jiffies + br->multicast_querier_interval);
++}
++
+ /*
+  * Add port to rotuer_list
+  *  list is maintained ordered by pointer value
+@@ -1065,12 +1127,13 @@ timer:
+ 
+ static void br_multicast_query_received(struct net_bridge *br,
+ 					struct net_bridge_port *port,
+-					int saddr)
++					struct bridge_mcast_querier *querier,
++					int saddr,
++					unsigned long max_delay)
+ {
+ 	if (saddr)
+-		mod_timer(&br->multicast_querier_timer,
+-			  jiffies + br->multicast_querier_interval);
+-	else if (timer_pending(&br->multicast_querier_timer))
++		br_multicast_update_querier_timer(br, querier, max_delay);
++	else if (timer_pending(&querier->timer))
+ 		return;
+ 
+ 	br_multicast_mark_router(br, port);
+@@ -1097,8 +1160,6 @@ static int br_ip4_multicast_query(struct
+ 	    (port && port->state == BR_STATE_DISABLED))
+ 		goto out;
+ 
+-	br_multicast_query_received(br, port, !!iph->saddr);
+-
+ 	group = ih->group;
+ 
+ 	if (skb->len == sizeof(*ih)) {
+@@ -1122,6 +1183,9 @@ static int br_ip4_multicast_query(struct
+ 			    IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE) : 1;
+ 	}
+ 
++	br_multicast_query_received(br, port, &br->ip4_querier, !!iph->saddr,
++				    max_delay);
++
+ 	if (!group)
+ 		goto out;
+ 
+@@ -1174,8 +1238,6 @@ static int br_ip6_multicast_query(struct
+ 	    (port && port->state == BR_STATE_DISABLED))
+ 		goto out;
+ 
+-	br_multicast_query_received(br, port, !ipv6_addr_any(&ip6h->saddr));
+-
+ 	/* RFC2710+RFC3810 (MLDv1+MLDv2) require link-local source addresses */
+ 	if (!(ipv6_addr_type(&ip6h->saddr) & IPV6_ADDR_LINKLOCAL)) {
+ 		err = -EINVAL;
+@@ -1203,6 +1265,9 @@ static int br_ip6_multicast_query(struct
+ 		max_delay = max(msecs_to_jiffies(MLDV2_MRC(ntohs(mld2q->mld2q_mrc))), 1UL);
+ 	}
+ 
++	br_multicast_query_received(br, port, &br->ip6_querier,
++				    !ipv6_addr_any(&ip6h->saddr), max_delay);
++
+ 	if (!group)
+ 		goto out;
+ 
+@@ -1235,7 +1300,9 @@ out:
+ 
+ static void br_multicast_leave_group(struct net_bridge *br,
+ 				     struct net_bridge_port *port,
+-				     struct br_ip *group)
++				     struct br_ip *group,
++				     struct bridge_mcast_querier *querier,
++				     struct bridge_mcast_query *query)
+ {
+ 	struct net_bridge_mdb_htable *mdb;
+ 	struct net_bridge_mdb_entry *mp;
+@@ -1246,7 +1313,7 @@ static void br_multicast_leave_group(str
+ 	spin_lock(&br->multicast_lock);
+ 	if (!netif_running(br->dev) ||
+ 	    (port && port->state == BR_STATE_DISABLED) ||
+-	    timer_pending(&br->multicast_querier_timer))
++	    timer_pending(&querier->timer))
+ 		goto out;
+ 
+ 	mdb = mlock_dereference(br->mdb, br);
+@@ -1254,6 +1321,31 @@ static void br_multicast_leave_group(str
+ 	if (!mp)
+ 		goto out;
+ 
++	if (br->multicast_querier) {
++		__br_multicast_send_query(br, port, &mp->addr);
++
++		time = jiffies + br->multicast_last_member_count *
++				 br->multicast_last_member_interval;
++
++		mod_timer(&query->timer, time);
++
++		for (p = mlock_dereference(mp->ports, br);
++		     p != NULL;
++		     p = mlock_dereference(p->next, br)) {
++			if (p->port != port)
++				continue;
++
++			if (!hlist_unhashed(&p->mglist) &&
++			    (timer_pending(&p->timer) ?
++			     time_after(p->timer.expires, time) :
++			     try_to_del_timer_sync(&p->timer) >= 0)) {
++				mod_timer(&p->timer, time);
++			}
++
++			break;
++		}
++	}
++
+ 	if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) {
+ 		struct net_bridge_port_group __rcu **pp;
+ 
+@@ -1306,7 +1398,6 @@ static void br_multicast_leave_group(str
+ 
+ 		break;
+ 	}
+-
+ out:
+ 	spin_unlock(&br->multicast_lock);
+ }
+@@ -1317,6 +1408,8 @@ static void br_ip4_multicast_leave_group
+ 					 __u16 vid)
+ {
+ 	struct br_ip br_group;
++	struct bridge_mcast_query *query = port ? &port->ip4_query :
++						  &br->ip4_query;
+ 
+ 	if (ipv4_is_local_multicast(group))
+ 		return;
+@@ -1325,7 +1418,7 @@ static void br_ip4_multicast_leave_group
+ 	br_group.proto = htons(ETH_P_IP);
+ 	br_group.vid = vid;
+ 
+-	br_multicast_leave_group(br, port, &br_group);
++	br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query);
+ }
+ 
+ #if IS_ENABLED(CONFIG_IPV6)
+@@ -1335,15 +1428,18 @@ static void br_ip6_multicast_leave_group
+ 					 __u16 vid)
+ {
+ 	struct br_ip br_group;
++	struct bridge_mcast_query *query = port ? &port->ip6_query :
++						  &br->ip6_query;
+ 
+-	if (!ipv6_is_transient_multicast(group))
++
++	if (ipv6_addr_is_ll_all_nodes(group))
+ 		return;
+ 
+ 	br_group.u.ip6 = *group;
+ 	br_group.proto = htons(ETH_P_IPV6);
+ 	br_group.vid = vid;
+ 
+-	br_multicast_leave_group(br, port, &br_group);
++	br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query);
+ }
+ #endif
+ 
+@@ -1473,8 +1569,14 @@ static int br_multicast_ipv6_rcv(struct 
+ 	 *  - MLD has always Router Alert hop-by-hop option
+ 	 *  - But we do not support jumbrograms.
+ 	 */
+-	if (ip6h->version != 6 ||
+-	    ip6h->nexthdr != IPPROTO_HOPOPTS ||
++	if (ip6h->version != 6)
++		return 0;
++
++	/* Prevent flooding this packet if there is no listener present */
++	if (!ipv6_addr_is_ll_all_nodes(&ip6h->daddr))
++		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
++
++	if (ip6h->nexthdr != IPPROTO_HOPOPTS ||
+ 	    ip6h->payload_len == 0)
+ 		return 0;
+ 
+@@ -1605,19 +1707,32 @@ int br_multicast_rcv(struct net_bridge *
+ 	return 0;
+ }
+ 
+-static void br_multicast_query_expired(unsigned long data)
++static void br_multicast_query_expired(struct net_bridge *br,
++				       struct bridge_mcast_query *query)
++{
++	spin_lock(&br->multicast_lock);
++	if (query->startup_sent < br->multicast_startup_query_count)
++		query->startup_sent++;
++
++	br_multicast_send_query(br, NULL, query);
++	spin_unlock(&br->multicast_lock);
++}
++
++static void br_ip4_multicast_query_expired(unsigned long data)
+ {
+ 	struct net_bridge *br = (void *)data;
+ 
+-	spin_lock(&br->multicast_lock);
+-	if (br->multicast_startup_queries_sent <
+-	    br->multicast_startup_query_count)
+-		br->multicast_startup_queries_sent++;
++	br_multicast_query_expired(br, &br->ip4_query);
++}
+ 
+-	br_multicast_send_query(br, NULL, br->multicast_startup_queries_sent);
++#if IS_ENABLED(CONFIG_IPV6)
++static void br_ip6_multicast_query_expired(unsigned long data)
++{
++	struct net_bridge *br = (void *)data;
+ 
+-	spin_unlock(&br->multicast_lock);
++	br_multicast_query_expired(br, &br->ip6_query);
+ }
++#endif
+ 
+ void br_multicast_init(struct net_bridge *br)
+ {
+@@ -1626,6 +1741,7 @@ void br_multicast_init(struct net_bridge
+ 
+ 	br->multicast_router = 1;
+ 	br->multicast_querier = 0;
++	br->multicast_query_use_ifaddr = 0;
+ 	br->multicast_last_member_count = 2;
+ 	br->multicast_startup_query_count = 2;
+ 
+@@ -1636,23 +1752,43 @@ void br_multicast_init(struct net_bridge
+ 	br->multicast_querier_interval = 255 * HZ;
+ 	br->multicast_membership_interval = 260 * HZ;
+ 
++	br->ip4_querier.delay_time = 0;
++#if IS_ENABLED(CONFIG_IPV6)
++	br->ip6_querier.delay_time = 0;
++#endif
++
+ 	spin_lock_init(&br->multicast_lock);
+ 	setup_timer(&br->multicast_router_timer,
+ 		    br_multicast_local_router_expired, 0);
+-	setup_timer(&br->multicast_querier_timer,
+-		    br_multicast_querier_expired, (unsigned long)br);
+-	setup_timer(&br->multicast_query_timer, br_multicast_query_expired,
++	setup_timer(&br->ip4_querier.timer, br_ip4_multicast_querier_expired,
+ 		    (unsigned long)br);
++	setup_timer(&br->ip4_query.timer, br_ip4_multicast_query_expired,
++		    (unsigned long)br);
++#if IS_ENABLED(CONFIG_IPV6)
++	setup_timer(&br->ip6_querier.timer, br_ip6_multicast_querier_expired,
++		    (unsigned long)br);
++	setup_timer(&br->ip6_query.timer, br_ip6_multicast_query_expired,
++		    (unsigned long)br);
++#endif
+ }
+ 
+-void br_multicast_open(struct net_bridge *br)
++static void __br_multicast_open(struct net_bridge *br,
++				struct bridge_mcast_query *query)
+ {
+-	br->multicast_startup_queries_sent = 0;
++	query->startup_sent = 0;
+ 
+ 	if (br->multicast_disabled)
+ 		return;
+ 
+-	mod_timer(&br->multicast_query_timer, jiffies);
++	mod_timer(&query->timer, jiffies);
++}
++
++void br_multicast_open(struct net_bridge *br)
++{
++	__br_multicast_open(br, &br->ip4_query);
++#if IS_ENABLED(CONFIG_IPV6)
++	__br_multicast_open(br, &br->ip6_query);
++#endif
+ }
+ 
+ void br_multicast_stop(struct net_bridge *br)
+@@ -1664,8 +1800,12 @@ void br_multicast_stop(struct net_bridge
+ 	int i;
+ 
+ 	del_timer_sync(&br->multicast_router_timer);
+-	del_timer_sync(&br->multicast_querier_timer);
+-	del_timer_sync(&br->multicast_query_timer);
++	del_timer_sync(&br->ip4_querier.timer);
++	del_timer_sync(&br->ip4_query.timer);
++#if IS_ENABLED(CONFIG_IPV6)
++	del_timer_sync(&br->ip6_querier.timer);
++	del_timer_sync(&br->ip6_query.timer);
++#endif
+ 
+ 	spin_lock_bh(&br->multicast_lock);
+ 	mdb = mlock_dereference(br->mdb, br);
+@@ -1767,18 +1907,24 @@ unlock:
+ 	return err;
+ }
+ 
+-static void br_multicast_start_querier(struct net_bridge *br)
++static void br_multicast_start_querier(struct net_bridge *br,
++				       struct bridge_mcast_query *query)
+ {
+ 	struct net_bridge_port *port;
+ 
+-	br_multicast_open(br);
++	__br_multicast_open(br, query);
+ 
+ 	list_for_each_entry(port, &br->port_list, list) {
+ 		if (port->state == BR_STATE_DISABLED ||
+ 		    port->state == BR_STATE_BLOCKING)
+ 			continue;
+ 
+-		__br_multicast_enable_port(port);
++		if (query == &br->ip4_query)
++			br_multicast_enable(&port->ip4_query);
++#if IS_ENABLED(CONFIG_IPV6)
++		else
++			br_multicast_enable(&port->ip6_query);
++#endif
+ 	}
+ }
+ 
+@@ -1813,7 +1959,10 @@ rollback:
+ 			goto rollback;
+ 	}
+ 
+-	br_multicast_start_querier(br);
++	br_multicast_start_querier(br, &br->ip4_query);
++#if IS_ENABLED(CONFIG_IPV6)
++	br_multicast_start_querier(br, &br->ip6_query);
++#endif
+ 
+ unlock:
+ 	spin_unlock_bh(&br->multicast_lock);
+@@ -1823,6 +1972,8 @@ unlock:
+ 
+ int br_multicast_set_querier(struct net_bridge *br, unsigned long val)
+ {
++	unsigned long max_delay;
++
+ 	val = !!val;
+ 
+ 	spin_lock_bh(&br->multicast_lock);
+@@ -1830,8 +1981,22 @@ int br_multicast_set_querier(struct net_
+ 		goto unlock;
+ 
+ 	br->multicast_querier = val;
+-	if (val)
+-		br_multicast_start_querier(br);
++	if (!val)
++		goto unlock;
++
++	max_delay = br->multicast_query_response_interval;
++
++	if (!timer_pending(&br->ip4_querier.timer))
++		br->ip4_querier.delay_time = jiffies + max_delay;
++
++	br_multicast_start_querier(br, &br->ip4_query);
++
++#if IS_ENABLED(CONFIG_IPV6)
++	if (!timer_pending(&br->ip6_querier.timer))
++		br->ip6_querier.delay_time = jiffies + max_delay;
++
++	br_multicast_start_querier(br, &br->ip6_query);
++#endif
+ 
+ unlock:
+ 	spin_unlock_bh(&br->multicast_lock);
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -66,6 +66,20 @@ struct br_ip
+ 	__u16		vid;
+ };
+ 
++#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
++/* our own querier */
++struct bridge_mcast_query {
++	struct timer_list	timer;
++	u32			startup_sent;
++};
++
++/* other querier */
++struct bridge_mcast_querier {
++	struct timer_list		timer;
++	unsigned long			delay_time;
++};
++#endif
++
+ struct net_port_vlans {
+ 	u16				port_idx;
+ 	u16				pvid;
+@@ -159,10 +173,12 @@ struct net_bridge_port
+ #define BR_ADMIN_COST		0x00000010
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+-	u32				multicast_startup_queries_sent;
++	struct bridge_mcast_query	ip4_query;
++#if IS_ENABLED(CONFIG_IPV6)
++	struct bridge_mcast_query	ip6_query;
++#endif /* IS_ENABLED(CONFIG_IPV6) */
+ 	unsigned char			multicast_router;
+ 	struct timer_list		multicast_router_timer;
+-	struct timer_list		multicast_query_timer;
+ 	struct hlist_head		mglist;
+ 	struct hlist_node		rlist;
+ #endif
+@@ -246,12 +262,12 @@ struct net_bridge
+ 
+ 	u8				multicast_disabled:1;
+ 	u8				multicast_querier:1;
++	u8				multicast_query_use_ifaddr:1;
+ 
+ 	u32				hash_elasticity;
+ 	u32				hash_max;
+ 
+ 	u32				multicast_last_member_count;
+-	u32				multicast_startup_queries_sent;
+ 	u32				multicast_startup_query_count;
+ 
+ 	unsigned long			multicast_last_member_interval;
+@@ -266,8 +282,12 @@ struct net_bridge
+ 	struct hlist_head		router_list;
+ 
+ 	struct timer_list		multicast_router_timer;
+-	struct timer_list		multicast_querier_timer;
+-	struct timer_list		multicast_query_timer;
++	struct bridge_mcast_querier	ip4_querier;
++	struct bridge_mcast_query	ip4_query;
++#if IS_ENABLED(CONFIG_IPV6)
++	struct bridge_mcast_querier	ip6_querier;
++	struct bridge_mcast_query	ip6_query;
++#endif /* IS_ENABLED(CONFIG_IPV6) */
+ #endif
+ 
+ 	struct timer_list		hello_timer;
+@@ -477,22 +497,35 @@ extern void br_mdb_notify(struct net_dev
+ #define mlock_dereference(X, br) \
+ 	rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))
+ 
+-#if IS_ENABLED(CONFIG_IPV6)
+-#include <net/addrconf.h>
+-static inline int ipv6_is_transient_multicast(const struct in6_addr *addr)
+-{
+-	if (ipv6_addr_is_multicast(addr) && IPV6_ADDR_MC_FLAG_TRANSIENT(addr))
+-		return 1;
+-	return 0;
+-}
+-#endif
+-
+ static inline bool br_multicast_is_router(struct net_bridge *br)
+ {
+ 	return br->multicast_router == 2 ||
+ 	       (br->multicast_router == 1 &&
+ 		timer_pending(&br->multicast_router_timer));
+ }
++
++static inline bool
++__br_multicast_querier_exists(struct net_bridge *br,
++			      struct bridge_mcast_querier *querier)
++{
++	return time_is_before_jiffies(querier->delay_time) &&
++	       (br->multicast_querier || timer_pending(&querier->timer));
++}
++
++static inline bool br_multicast_querier_exists(struct net_bridge *br,
++					       struct ethhdr *eth)
++{
++	switch (eth->h_proto) {
++	case (htons(ETH_P_IP)):
++		return __br_multicast_querier_exists(br, &br->ip4_querier);
++#if IS_ENABLED(CONFIG_IPV6)
++	case (htons(ETH_P_IPV6)):
++		return __br_multicast_querier_exists(br, &br->ip6_querier);
++#endif
++	default:
++		return false;
++	}
++}
+ #else
+ static inline int br_multicast_rcv(struct net_bridge *br,
+ 				   struct net_bridge_port *port,
+@@ -549,6 +582,11 @@ static inline bool br_multicast_is_route
+ {
+ 	return 0;
+ }
++static inline bool br_multicast_querier_exists(struct net_bridge *br,
++					       struct ethhdr *eth)
++{
++	return false;
++}
+ static inline void br_mdb_init(void)
+ {
+ }
+--- a/net/bridge/br_sysfs_br.c
++++ b/net/bridge/br_sysfs_br.c
+@@ -375,6 +375,31 @@ static ssize_t store_multicast_snooping(
+ static DEVICE_ATTR(multicast_snooping, S_IRUGO | S_IWUSR,
+ 		   show_multicast_snooping, store_multicast_snooping);
+ 
++static ssize_t show_multicast_query_use_ifaddr(struct device *d,
++				      struct device_attribute *attr,
++				      char *buf)
++{
++	struct net_bridge *br = to_bridge(d);
++	return sprintf(buf, "%d\n", br->multicast_query_use_ifaddr);
++}
++
++static int set_query_use_ifaddr(struct net_bridge *br, unsigned long val)
++{
++	br->multicast_query_use_ifaddr = !!val;
++	return 0;
++}
++
++static ssize_t
++store_multicast_query_use_ifaddr(struct device *d,
++				 struct device_attribute *attr,
++				 const char *buf, size_t len)
++{
++	return store_bridge_parm(d, buf, len, set_query_use_ifaddr);
++}
++static DEVICE_ATTR(multicast_query_use_ifaddr, S_IRUGO | S_IWUSR,
++		   show_multicast_query_use_ifaddr,
++		   store_multicast_query_use_ifaddr);
++
+ static ssize_t show_multicast_querier(struct device *d,
+ 				      struct device_attribute *attr,
+ 				      char *buf)
+@@ -734,6 +759,7 @@ static struct attribute *bridge_attrs[] 
+ 	&dev_attr_multicast_router.attr,
+ 	&dev_attr_multicast_snooping.attr,
+ 	&dev_attr_multicast_querier.attr,
++	&dev_attr_multicast_query_use_ifaddr.attr,
+ 	&dev_attr_hash_elasticity.attr,
+ 	&dev_attr_hash_max.attr,
+ 	&dev_attr_multicast_last_member_count.attr,
+--- a/net/bridge/br_mdb.c
++++ b/net/bridge/br_mdb.c
+@@ -9,6 +9,7 @@
+ #include <net/netlink.h>
+ #if IS_ENABLED(CONFIG_IPV6)
+ #include <net/ipv6.h>
++#include <net/addrconf.h>
+ #endif
+ 
+ #include "br_private.h"
+@@ -253,7 +254,7 @@ static bool is_valid_mdb_entry(struct br
+ 			return false;
+ #if IS_ENABLED(CONFIG_IPV6)
+ 	} else if (entry->addr.proto == htons(ETH_P_IPV6)) {
+-		if (!ipv6_is_transient_multicast(&entry->addr.u.ip6))
++		if (ipv6_addr_is_ll_all_nodes(&entry->addr.u.ip6))
+ 			return false;
+ #endif
+ 	} else
+@@ -414,16 +415,20 @@ static int __br_mdb_del(struct net_bridg
+ 	if (!netif_running(br->dev) || br->multicast_disabled)
+ 		return -EINVAL;
+ 
+-	if (timer_pending(&br->multicast_querier_timer))
+-		return -EBUSY;
+-
+ 	ip.proto = entry->addr.proto;
+-	if (ip.proto == htons(ETH_P_IP))
++	if (ip.proto == htons(ETH_P_IP)) {
++		if (timer_pending(&br->ip4_querier.timer))
++			return -EBUSY;
++
+ 		ip.u.ip4 = entry->addr.u.ip4;
+ #if IS_ENABLED(CONFIG_IPV6)
+-	else
++	} else {
++		if (timer_pending(&br->ip6_querier.timer))
++			return -EBUSY;
++
+ 		ip.u.ip6 = entry->addr.u.ip6;
+ #endif
++	}
+ 
+ 	spin_lock_bh(&br->multicast_lock);
+ 	mdb = mlock_dereference(br->mdb, br);
diff --git a/trunk/target/linux/generic/patches-3.10/100-overlayfs.patch b/trunk/target/linux/generic/patches-3.10/100-overlayfs.patch
new file mode 100644
index 00000000..47da90bc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/100-overlayfs.patch
@@ -0,0 +1,3232 @@
+--- a/Documentation/filesystems/Locking
++++ b/Documentation/filesystems/Locking
+@@ -66,6 +66,7 @@ prototypes:
+ 	int (*atomic_open)(struct inode *, struct dentry *,
+ 				struct file *, unsigned open_flag,
+ 				umode_t create_mode, int *opened);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ 
+ locking rules:
+ 	all may block
+@@ -93,6 +94,7 @@ removexattr:	yes
+ fiemap:		no
+ update_time:	no
+ atomic_open:	yes
++dentry_open:	no
+ 
+ 	Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
+ victim.
+--- /dev/null
++++ b/Documentation/filesystems/overlayfs.txt
+@@ -0,0 +1,199 @@
++Written by: Neil Brown <neilb@suse.de>
++
++Overlay Filesystem
++==================
++
++This document describes a prototype for a new approach to providing
++overlay-filesystem functionality in Linux (sometimes referred to as
++union-filesystems).  An overlay-filesystem tries to present a
++filesystem which is the result over overlaying one filesystem on top
++of the other.
++
++The result will inevitably fail to look exactly like a normal
++filesystem for various technical reasons.  The expectation is that
++many use cases will be able to ignore these differences.
++
++This approach is 'hybrid' because the objects that appear in the
++filesystem do not all appear to belong to that filesystem.  In many
++cases an object accessed in the union will be indistinguishable
++from accessing the corresponding object from the original filesystem.
++This is most obvious from the 'st_dev' field returned by stat(2).
++
++While directories will report an st_dev from the overlay-filesystem,
++all non-directory objects will report an st_dev from the lower or
++upper filesystem that is providing the object.  Similarly st_ino will
++only be unique when combined with st_dev, and both of these can change
++over the lifetime of a non-directory object.  Many applications and
++tools ignore these values and will not be affected.
++
++Upper and Lower
++---------------
++
++An overlay filesystem combines two filesystems - an 'upper' filesystem
++and a 'lower' filesystem.  When a name exists in both filesystems, the
++object in the 'upper' filesystem is visible while the object in the
++'lower' filesystem is either hidden or, in the case of directories,
++merged with the 'upper' object.
++
++It would be more correct to refer to an upper and lower 'directory
++tree' rather than 'filesystem' as it is quite possible for both
++directory trees to be in the same filesystem and there is no
++requirement that the root of a filesystem be given for either upper or
++lower.
++
++The lower filesystem can be any filesystem supported by Linux and does
++not need to be writable.  The lower filesystem can even be another
++overlayfs.  The upper filesystem will normally be writable and if it
++is it must support the creation of trusted.* extended attributes, and
++must provide valid d_type in readdir responses, at least for symbolic
++links - so NFS is not suitable.
++
++A read-only overlay of two read-only filesystems may use any
++filesystem type.
++
++Directories
++-----------
++
++Overlaying mainly involves directories.  If a given name appears in both
++upper and lower filesystems and refers to a non-directory in either,
++then the lower object is hidden - the name refers only to the upper
++object.
++
++Where both upper and lower objects are directories, a merged directory
++is formed.
++
++At mount time, the two directories given as mount options are combined
++into a merged directory:
++
++  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper /overlay
++
++Then whenever a lookup is requested in such a merged directory, the
++lookup is performed in each actual directory and the combined result
++is cached in the dentry belonging to the overlay filesystem.  If both
++actual lookups find directories, both are stored and a merged
++directory is created, otherwise only one is stored: the upper if it
++exists, else the lower.
++
++Only the lists of names from directories are merged.  Other content
++such as metadata and extended attributes are reported for the upper
++directory only.  These attributes of the lower directory are hidden.
++
++whiteouts and opaque directories
++--------------------------------
++
++In order to support rm and rmdir without changing the lower
++filesystem, an overlay filesystem needs to record in the upper filesystem
++that files have been removed.  This is done using whiteouts and opaque
++directories (non-directories are always opaque).
++
++The overlay filesystem uses extended attributes with a
++"trusted.overlay."  prefix to record these details.
++
++A whiteout is created as a symbolic link with target
++"(overlay-whiteout)" and with xattr "trusted.overlay.whiteout" set to "y".
++When a whiteout is found in the upper level of a merged directory, any
++matching name in the lower level is ignored, and the whiteout itself
++is also hidden.
++
++A directory is made opaque by setting the xattr "trusted.overlay.opaque"
++to "y".  Where the upper filesystem contains an opaque directory, any
++directory in the lower filesystem with the same name is ignored.
++
++readdir
++-------
++
++When a 'readdir' request is made on a merged directory, the upper and
++lower directories are each read and the name lists merged in the
++obvious way (upper is read first, then lower - entries that already
++exist are not re-added).  This merged name list is cached in the
++'struct file' and so remains as long as the file is kept open.  If the
++directory is opened and read by two processes at the same time, they
++will each have separate caches.  A seekdir to the start of the
++directory (offset 0) followed by a readdir will cause the cache to be
++discarded and rebuilt.
++
++This means that changes to the merged directory do not appear while a
++directory is being read.  This is unlikely to be noticed by many
++programs.
++
++seek offsets are assigned sequentially when the directories are read.
++Thus if
++  - read part of a directory
++  - remember an offset, and close the directory
++  - re-open the directory some time later
++  - seek to the remembered offset
++
++there may be little correlation between the old and new locations in
++the list of filenames, particularly if anything has changed in the
++directory.
++
++Readdir on directories that are not merged is simply handled by the
++underlying directory (upper or lower).
++
++
++Non-directories
++---------------
++
++Objects that are not directories (files, symlinks, device-special
++files etc.) are presented either from the upper or lower filesystem as
++appropriate.  When a file in the lower filesystem is accessed in a way
++the requires write-access, such as opening for write access, changing
++some metadata etc., the file is first copied from the lower filesystem
++to the upper filesystem (copy_up).  Note that creating a hard-link
++also requires copy_up, though of course creation of a symlink does
++not.
++
++The copy_up may turn out to be unnecessary, for example if the file is
++opened for read-write but the data is not modified.
++
++The copy_up process first makes sure that the containing directory
++exists in the upper filesystem - creating it and any parents as
++necessary.  It then creates the object with the same metadata (owner,
++mode, mtime, symlink-target etc.) and then if the object is a file, the
++data is copied from the lower to the upper filesystem.  Finally any
++extended attributes are copied up.
++
++Once the copy_up is complete, the overlay filesystem simply
++provides direct access to the newly created file in the upper
++filesystem - future operations on the file are barely noticed by the
++overlay filesystem (though an operation on the name of the file such as
++rename or unlink will of course be noticed and handled).
++
++
++Non-standard behavior
++---------------------
++
++The copy_up operation essentially creates a new, identical file and
++moves it over to the old name.  The new file may be on a different
++filesystem, so both st_dev and st_ino of the file may change.
++
++Any open files referring to this inode will access the old data and
++metadata.  Similarly any file locks obtained before copy_up will not
++apply to the copied up file.
++
++On a file opened with O_RDONLY fchmod(2), fchown(2), futimesat(2) and
++fsetxattr(2) will fail with EROFS.
++
++If a file with multiple hard links is copied up, then this will
++"break" the link.  Changes will not be propagated to other names
++referring to the same inode.
++
++Symlinks in /proc/PID/ and /proc/PID/fd which point to a non-directory
++object in overlayfs will not contain valid absolute paths, only
++relative paths leading up to the filesystem's root.  This will be
++fixed in the future.
++
++Some operations are not atomic, for example a crash during copy_up or
++rename will leave the filesystem in an inconsistent state.  This will
++be addressed in the future.
++
++Changes to underlying filesystems
++---------------------------------
++
++Offline changes, when the overlay is not mounted, are allowed to either
++the upper or the lower trees.
++
++Changes to the underlying filesystems while part of a mounted overlay
++filesystem are not allowed.  If the underlying filesystem is changed,
++the behavior of the overlay is undefined, though it will not result in
++a crash or deadlock.
+--- a/Documentation/filesystems/vfs.txt
++++ b/Documentation/filesystems/vfs.txt
+@@ -362,6 +362,7 @@ struct inode_operations {
+ 	int (*atomic_open)(struct inode *, struct dentry *,
+ 				struct file *, unsigned open_flag,
+ 				umode_t create_mode, int *opened);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ };
+ 
+ Again, all methods are called without any locks being held, unless
+@@ -681,6 +682,12 @@ struct address_space_operations {
+   	but instead uses bmap to find out where the blocks in the file
+   	are and uses those addresses directly.
+ 
++  dentry_open: this is an alternative to f_op->open(), the difference is that
++	this method may open a file not necessarily originating from the same
++	filesystem as the one i_op->open() was called on.  It may be
++	useful for stacking filesystems which want to allow native I/O directly
++	on underlying files.
++
+ 
+   invalidatepage: If a page has PagePrivate set, then invalidatepage
+         will be called when part or all of the page is to be removed
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -6019,6 +6019,13 @@ F:	drivers/scsi/osd/
+ F:	include/scsi/osd_*
+ F:	fs/exofs/
+ 
++OVERLAYFS FILESYSTEM
++M:	Miklos Szeredi <miklos@szeredi.hu>
++L:	linux-fsdevel@vger.kernel.org
++S:	Supported
++F:	fs/overlayfs/*
++F:	Documentation/filesystems/overlayfs.txt
++
+ P54 WIRELESS DRIVER
+ M:	Christian Lamparter <chunkeey@googlemail.com>
+ L:	linux-wireless@vger.kernel.org
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -67,6 +67,7 @@ source "fs/quota/Kconfig"
+ 
+ source "fs/autofs4/Kconfig"
+ source "fs/fuse/Kconfig"
++source "fs/overlayfs/Kconfig"
+ 
+ config GENERIC_ACL
+ 	bool
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -105,6 +105,7 @@ obj-$(CONFIG_QNX6FS_FS)		+= qnx6/
+ obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
+ obj-$(CONFIG_ADFS_FS)		+= adfs/
+ obj-$(CONFIG_FUSE_FS)		+= fuse/
++obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/
+ obj-$(CONFIG_UDF_FS)		+= udf/
+ obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
+ obj-$(CONFIG_OMFS_FS)		+= omfs/
+--- a/fs/ecryptfs/main.c
++++ b/fs/ecryptfs/main.c
+@@ -567,6 +567,13 @@ static struct dentry *ecryptfs_mount(str
+ 	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
+ 	s->s_blocksize = path.dentry->d_sb->s_blocksize;
+ 	s->s_magic = ECRYPTFS_SUPER_MAGIC;
++	s->s_stack_depth = path.dentry->d_sb->s_stack_depth + 1;
++
++	rc = -EINVAL;
++	if (s->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		pr_err("eCryptfs: maximum fs stacking depth exceeded\n");
++		goto out_free;
++	}
+ 
+ 	inode = ecryptfs_get_inode(path.dentry->d_inode, s);
+ 	rc = PTR_ERR(inode);
+--- a/fs/internal.h
++++ b/fs/internal.h
+@@ -42,11 +42,6 @@ static inline int __sync_blockdev(struct
+ extern void __init chrdev_init(void);
+ 
+ /*
+- * namei.c
+- */
+-extern int __inode_permission(struct inode *, int);
+-
+-/*
+  * namespace.c
+  */
+ extern int copy_mount_options(const void __user *, unsigned long *);
+@@ -132,12 +127,6 @@ extern struct dentry *__d_alloc(struct s
+ extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
+ 
+ /*
+- * splice.c
+- */
+-extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
+-		loff_t *opos, size_t len, unsigned int flags);
+-
+-/*
+  * pipe.c
+  */
+ extern const struct file_operations pipefifo_fops;
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -404,6 +404,7 @@ int __inode_permission(struct inode *ino
+ 
+ 	return security_inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(__inode_permission);
+ 
+ /**
+  * sb_permission - Check superblock-level permissions
+@@ -2869,9 +2870,12 @@ finish_open_created:
+ 	error = may_open(&nd->path, acc_mode, open_flag);
+ 	if (error)
+ 		goto out;
+-	file->f_path.mnt = nd->path.mnt;
+-	error = finish_open(file, nd->path.dentry, NULL, opened);
+-	if (error) {
++
++	BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
++	error = vfs_open(&nd->path, file, current_cred());
++	if (!error) {
++		*opened |= FILE_OPENED;
++	} else {
+ 		if (error == -EOPENSTALE)
+ 			goto stale_open;
+ 		goto out;
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1455,6 +1455,33 @@ void drop_collected_mounts(struct vfsmou
+ 	namespace_unlock();
+ }
+ 
++/**
++ * clone_private_mount - create a private clone of a path
++ *
++ * This creates a new vfsmount, which will be the clone of @path.  The new will
++ * not be attached anywhere in the namespace and will be private (i.e. changes
++ * to the originating mount won't be propagated into this).
++ *
++ * Release with mntput().
++ */
++struct vfsmount *clone_private_mount(struct path *path)
++{
++	struct mount *old_mnt = real_mount(path->mnt);
++	struct mount *new_mnt;
++
++	if (IS_MNT_UNBINDABLE(old_mnt))
++		return ERR_PTR(-EINVAL);
++
++	down_read(&namespace_sem);
++	new_mnt = clone_mnt(old_mnt, path->dentry, CL_PRIVATE);
++	up_read(&namespace_sem);
++	if (IS_ERR(new_mnt))
++		return ERR_CAST(new_mnt);
++
++	return &new_mnt->mnt;
++}
++EXPORT_SYMBOL_GPL(clone_private_mount);
++
+ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 		   struct vfsmount *root)
+ {
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -788,8 +788,7 @@ struct file *dentry_open(const struct pa
+ 	f = get_empty_filp();
+ 	if (!IS_ERR(f)) {
+ 		f->f_flags = flags;
+-		f->f_path = *path;
+-		error = do_dentry_open(f, NULL, cred);
++		error = vfs_open(path, f, cred);
+ 		if (!error) {
+ 			/* from now on we need fput() to dispose of f */
+ 			error = open_check_o_direct(f);
+@@ -806,6 +805,26 @@ struct file *dentry_open(const struct pa
+ }
+ EXPORT_SYMBOL(dentry_open);
+ 
++/**
++ * vfs_open - open the file at the given path
++ * @path: path to open
++ * @filp: newly allocated file with f_flag initialized
++ * @cred: credentials to use
++ */
++int vfs_open(const struct path *path, struct file *filp,
++	     const struct cred *cred)
++{
++	struct inode *inode = path->dentry->d_inode;
++
++	if (inode->i_op->dentry_open)
++		return inode->i_op->dentry_open(path->dentry, filp, cred);
++	else {
++		filp->f_path = *path;
++		return do_dentry_open(filp, NULL, cred);
++	}
++}
++EXPORT_SYMBOL(vfs_open);
++
+ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op)
+ {
+ 	int lookup_flags = 0;
+--- /dev/null
++++ b/fs/overlayfs/Kconfig
+@@ -0,0 +1,10 @@
++config OVERLAYFS_FS
++	tristate "Overlay filesystem support"
++	help
++	  An overlay filesystem combines two filesystems - an 'upper' filesystem
++	  and a 'lower' filesystem.  When a name exists in both filesystems, the
++	  object in the 'upper' filesystem is visible while the object in the
++	  'lower' filesystem is either hidden or, in the case of directories,
++	  merged with the 'upper' object.
++
++	  For more information see Documentation/filesystems/overlayfs.txt
+--- /dev/null
++++ b/fs/overlayfs/Makefile
+@@ -0,0 +1,7 @@
++#
++# Makefile for the overlay filesystem.
++#
++
++obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
++
++overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
+--- /dev/null
++++ b/fs/overlayfs/copy_up.c
+@@ -0,0 +1,387 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/file.h>
++#include <linux/splice.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/uaccess.h>
++#include <linux/sched.h>
++#include "overlayfs.h"
++
++#define OVL_COPY_UP_CHUNK_SIZE (1 << 20)
++
++static int ovl_copy_up_xattr(struct dentry *old, struct dentry *new)
++{
++	ssize_t list_size, size;
++	char *buf, *name, *value;
++	int error;
++
++	if (!old->d_inode->i_op->getxattr ||
++	    !new->d_inode->i_op->getxattr)
++		return 0;
++
++	list_size = vfs_listxattr(old, NULL, 0);
++	if (list_size <= 0) {
++		if (list_size == -EOPNOTSUPP)
++			return 0;
++		return list_size;
++	}
++
++	buf = kzalloc(list_size, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++
++	error = -ENOMEM;
++	value = kmalloc(XATTR_SIZE_MAX, GFP_KERNEL);
++	if (!value)
++		goto out;
++
++	list_size = vfs_listxattr(old, buf, list_size);
++	if (list_size <= 0) {
++		error = list_size;
++		goto out_free_value;
++	}
++
++	for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
++		size = vfs_getxattr(old, name, value, XATTR_SIZE_MAX);
++		if (size <= 0) {
++			error = size;
++			goto out_free_value;
++		}
++		error = vfs_setxattr(new, name, value, size, 0);
++		if (error)
++			goto out_free_value;
++	}
++
++out_free_value:
++	kfree(value);
++out:
++	kfree(buf);
++	return error;
++}
++
++static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
++{
++	struct file *old_file;
++	struct file *new_file;
++	loff_t old_pos = 0;
++	loff_t new_pos = 0;
++	int error = 0;
++
++	if (len == 0)
++		return 0;
++
++	old_file = ovl_path_open(old, O_RDONLY);
++	if (IS_ERR(old_file))
++		return PTR_ERR(old_file);
++
++	new_file = ovl_path_open(new, O_WRONLY);
++	if (IS_ERR(new_file)) {
++		error = PTR_ERR(new_file);
++		goto out_fput;
++	}
++
++	/* FIXME: copy up sparse files efficiently */
++	while (len) {
++		size_t this_len = OVL_COPY_UP_CHUNK_SIZE;
++		long bytes;
++
++		if (len < this_len)
++			this_len = len;
++
++		if (signal_pending_state(TASK_KILLABLE, current)) {
++			error = -EINTR;
++			break;
++		}
++
++		bytes = do_splice_direct(old_file, &old_pos,
++					 new_file, &new_pos,
++					 this_len, SPLICE_F_MOVE);
++		if (bytes <= 0) {
++			error = bytes;
++			break;
++		}
++
++		len -= bytes;
++	}
++
++	fput(new_file);
++out_fput:
++	fput(old_file);
++	return error;
++}
++
++static char *ovl_read_symlink(struct dentry *realdentry)
++{
++	int res;
++	char *buf;
++	struct inode *inode = realdentry->d_inode;
++	mm_segment_t old_fs;
++
++	res = -EINVAL;
++	if (!inode->i_op->readlink)
++		goto err;
++
++	res = -ENOMEM;
++	buf = (char *) __get_free_page(GFP_KERNEL);
++	if (!buf)
++		goto err;
++
++	old_fs = get_fs();
++	set_fs(get_ds());
++	/* The cast to a user pointer is valid due to the set_fs() */
++	res = inode->i_op->readlink(realdentry,
++				    (char __user *)buf, PAGE_SIZE - 1);
++	set_fs(old_fs);
++	if (res < 0) {
++		free_page((unsigned long) buf);
++		goto err;
++	}
++	buf[res] = '\0';
++
++	return buf;
++
++err:
++	return ERR_PTR(res);
++}
++
++static int ovl_set_timestamps(struct dentry *upperdentry, struct kstat *stat)
++{
++	struct iattr attr = {
++		.ia_valid =
++		     ATTR_ATIME | ATTR_MTIME | ATTR_ATIME_SET | ATTR_MTIME_SET,
++		.ia_atime = stat->atime,
++		.ia_mtime = stat->mtime,
++	};
++
++	return notify_change(upperdentry, &attr);
++}
++
++static int ovl_set_mode(struct dentry *upperdentry, umode_t mode)
++{
++	struct iattr attr = {
++		.ia_valid = ATTR_MODE,
++		.ia_mode = mode,
++	};
++
++	return notify_change(upperdentry, &attr);
++}
++
++static int ovl_copy_up_locked(struct dentry *upperdir, struct dentry *dentry,
++			      struct path *lowerpath, struct kstat *stat,
++			      const char *link)
++{
++	int err;
++	struct path newpath;
++	umode_t mode = stat->mode;
++
++	/* Can't properly set mode on creation because of the umask */
++	stat->mode &= S_IFMT;
++
++	ovl_path_upper(dentry, &newpath);
++	WARN_ON(newpath.dentry);
++	newpath.dentry = ovl_upper_create(upperdir, dentry, stat, link);
++	if (IS_ERR(newpath.dentry))
++		return PTR_ERR(newpath.dentry);
++
++	if (S_ISREG(stat->mode)) {
++		err = ovl_copy_up_data(lowerpath, &newpath, stat->size);
++		if (err)
++			goto err_remove;
++	}
++
++	err = ovl_copy_up_xattr(lowerpath->dentry, newpath.dentry);
++	if (err)
++		goto err_remove;
++
++	mutex_lock(&newpath.dentry->d_inode->i_mutex);
++	if (!S_ISLNK(stat->mode))
++		err = ovl_set_mode(newpath.dentry, mode);
++	if (!err)
++		err = ovl_set_timestamps(newpath.dentry, stat);
++	mutex_unlock(&newpath.dentry->d_inode->i_mutex);
++	if (err)
++		goto err_remove;
++
++	ovl_dentry_update(dentry, newpath.dentry);
++
++	/*
++	 * Easiest way to get rid of the lower dentry reference is to
++	 * drop this dentry.  This is neither needed nor possible for
++	 * directories.
++	 */
++	if (!S_ISDIR(stat->mode))
++		d_drop(dentry);
++
++	return 0;
++
++err_remove:
++	if (S_ISDIR(stat->mode))
++		vfs_rmdir(upperdir->d_inode, newpath.dentry);
++	else
++		vfs_unlink(upperdir->d_inode, newpath.dentry);
++
++	dput(newpath.dentry);
++
++	return err;
++}
++
++/*
++ * Copy up a single dentry
++ *
++ * Directory renames only allowed on "pure upper" (already created on
++ * upper filesystem, never copied up).  Directories which are on lower or
++ * are merged may not be renamed.  For these -EXDEV is returned and
++ * userspace has to deal with it.  This means, when copying up a
++ * directory we can rely on it and ancestors being stable.
++ *
++ * Non-directory renames start with copy up of source if necessary.  The
++ * actual rename will only proceed once the copy up was successful.  Copy
++ * up uses upper parent i_mutex for exclusion.  Since rename can change
++ * d_parent it is possible that the copy up will lock the old parent.  At
++ * that point the file will have already been copied up anyway.
++ */
++static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,
++			   struct path *lowerpath, struct kstat *stat)
++{
++	int err;
++	struct kstat pstat;
++	struct path parentpath;
++	struct dentry *upperdir;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	char *link = NULL;
++
++	ovl_path_upper(parent, &parentpath);
++	upperdir = parentpath.dentry;
++
++	err = vfs_getattr(&parentpath, &pstat);
++	if (err)
++		return err;
++
++	if (S_ISLNK(stat->mode)) {
++		link = ovl_read_symlink(lowerpath->dentry);
++		if (IS_ERR(link))
++			return PTR_ERR(link);
++	}
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out_free_link;
++
++	override_cred->fsuid = stat->uid;
++	override_cred->fsgid = stat->gid;
++	/*
++	 * CAP_SYS_ADMIN for copying up extended attributes
++	 * CAP_DAC_OVERRIDE for create
++	 * CAP_FOWNER for chmod, timestamp update
++	 * CAP_FSETID for chmod
++	 * CAP_MKNOD for mknod
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	cap_raise(override_cred->cap_effective, CAP_FSETID);
++	cap_raise(override_cred->cap_effective, CAP_MKNOD);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	if (ovl_path_type(dentry) != OVL_PATH_LOWER) {
++		err = 0;
++	} else {
++		err = ovl_copy_up_locked(upperdir, dentry, lowerpath,
++					 stat, link);
++		if (!err) {
++			/* Restore timestamps on parent (best effort) */
++			ovl_set_timestamps(upperdir, &pstat);
++		}
++	}
++
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++out_free_link:
++	if (link)
++		free_page((unsigned long) link);
++
++	return err;
++}
++
++int ovl_copy_up(struct dentry *dentry)
++{
++	int err;
++
++	err = 0;
++	while (!err) {
++		struct dentry *next;
++		struct dentry *parent;
++		struct path lowerpath;
++		struct kstat stat;
++		enum ovl_path_type type = ovl_path_type(dentry);
++
++		if (type != OVL_PATH_LOWER)
++			break;
++
++		next = dget(dentry);
++		/* find the topmost dentry not yet copied up */
++		for (;;) {
++			parent = dget_parent(next);
++
++			type = ovl_path_type(parent);
++			if (type != OVL_PATH_LOWER)
++				break;
++
++			dput(next);
++			next = parent;
++		}
++
++		ovl_path_lower(next, &lowerpath);
++		err = vfs_getattr(&lowerpath, &stat);
++		if (!err)
++			err = ovl_copy_up_one(parent, next, &lowerpath, &stat);
++
++		dput(parent);
++		dput(next);
++	}
++
++	return err;
++}
++
++/* Optimize by not copying up the file first and truncating later */
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size)
++{
++	int err;
++	struct kstat stat;
++	struct path lowerpath;
++	struct dentry *parent = dget_parent(dentry);
++
++	err = ovl_copy_up(parent);
++	if (err)
++		goto out_dput_parent;
++
++	ovl_path_lower(dentry, &lowerpath);
++	err = vfs_getattr(&lowerpath, &stat);
++	if (err)
++		goto out_dput_parent;
++
++	if (size < stat.size)
++		stat.size = size;
++
++	err = ovl_copy_up_one(parent, dentry, &lowerpath, &stat);
++
++out_dput_parent:
++	dput(parent);
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/dir.c
+@@ -0,0 +1,605 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++static const char *ovl_whiteout_symlink = "(overlay-whiteout)";
++
++static int ovl_whiteout(struct dentry *upperdir, struct dentry *dentry)
++{
++	int err;
++	struct dentry *newdentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	/* FIXME: recheck lower dentry to see if whiteout is really needed */
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out;
++
++	/*
++	 * CAP_SYS_ADMIN for setxattr
++	 * CAP_DAC_OVERRIDE for symlink creation
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	override_cred->fsuid = GLOBAL_ROOT_UID;
++	override_cred->fsgid = GLOBAL_ROOT_GID;
++	old_cred = override_creds(override_cred);
++
++	newdentry = lookup_one_len(dentry->d_name.name, upperdir,
++				   dentry->d_name.len);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_put_cred;
++
++	/* Just been removed within the same locked region */
++	WARN_ON(newdentry->d_inode);
++
++	err = vfs_symlink(upperdir->d_inode, newdentry, ovl_whiteout_symlink);
++	if (err)
++		goto out_dput;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++
++	err = vfs_setxattr(newdentry, ovl_whiteout_xattr, "y", 1, 0);
++	if (err)
++		vfs_unlink(upperdir->d_inode, newdentry);
++
++out_dput:
++	dput(newdentry);
++out_put_cred:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++out:
++	if (err) {
++		/*
++		 * There's no way to recover from failure to whiteout.
++		 * What should we do?  Log a big fat error and... ?
++		 */
++		pr_err("overlayfs: ERROR - failed to whiteout '%s'\n",
++		       dentry->d_name.name);
++	}
++
++	return err;
++}
++
++static struct dentry *ovl_lookup_create(struct dentry *upperdir,
++					struct dentry *template)
++{
++	int err;
++	struct dentry *newdentry;
++	struct qstr *name = &template->d_name;
++
++	newdentry = lookup_one_len(name->name, upperdir, name->len);
++	if (IS_ERR(newdentry))
++		return newdentry;
++
++	if (newdentry->d_inode) {
++		const struct cred *old_cred;
++		struct cred *override_cred;
++
++		/* No need to check whiteout if lower parent is non-existent */
++		err = -EEXIST;
++		if (!ovl_dentry_lower(template->d_parent))
++			goto out_dput;
++
++		if (!S_ISLNK(newdentry->d_inode->i_mode))
++			goto out_dput;
++
++		err = -ENOMEM;
++		override_cred = prepare_creds();
++		if (!override_cred)
++			goto out_dput;
++
++		/*
++		 * CAP_SYS_ADMIN for getxattr
++		 * CAP_FOWNER for unlink in sticky directory
++		 */
++		cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++		cap_raise(override_cred->cap_effective, CAP_FOWNER);
++		old_cred = override_creds(override_cred);
++
++		err = -EEXIST;
++		if (ovl_is_whiteout(newdentry))
++			err = vfs_unlink(upperdir->d_inode, newdentry);
++
++		revert_creds(old_cred);
++		put_cred(override_cred);
++		if (err)
++			goto out_dput;
++
++		dput(newdentry);
++		newdentry = lookup_one_len(name->name, upperdir, name->len);
++		if (IS_ERR(newdentry)) {
++			ovl_whiteout(upperdir, template);
++			return newdentry;
++		}
++
++		/*
++		 * Whiteout just been successfully removed, parent
++		 * i_mutex is still held, there's no way the lookup
++		 * could return positive.
++		 */
++		WARN_ON(newdentry->d_inode);
++	}
++
++	return newdentry;
++
++out_dput:
++	dput(newdentry);
++	return ERR_PTR(err);
++}
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct inode *dir = upperdir->d_inode;
++
++	newdentry = ovl_lookup_create(upperdir, dentry);
++	if (IS_ERR(newdentry))
++		goto out;
++
++	switch (stat->mode & S_IFMT) {
++	case S_IFREG:
++		err = vfs_create(dir, newdentry, stat->mode, NULL);
++		break;
++
++	case S_IFDIR:
++		err = vfs_mkdir(dir, newdentry, stat->mode);
++		break;
++
++	case S_IFCHR:
++	case S_IFBLK:
++	case S_IFIFO:
++	case S_IFSOCK:
++		err = vfs_mknod(dir, newdentry, stat->mode, stat->rdev);
++		break;
++
++	case S_IFLNK:
++		err = vfs_symlink(dir, newdentry, link);
++		break;
++
++	default:
++		err = -EPERM;
++	}
++	if (err) {
++		if (ovl_dentry_is_opaque(dentry))
++			ovl_whiteout(upperdir, dentry);
++		dput(newdentry);
++		newdentry = ERR_PTR(err);
++	} else if (WARN_ON(!newdentry->d_inode)) {
++		/*
++		 * Not quite sure if non-instantiated dentry is legal or not.
++		 * VFS doesn't seem to care so check and warn here.
++		 */
++		dput(newdentry);
++		newdentry = ERR_PTR(-ENOENT);
++	}
++
++out:
++	return newdentry;
++
++}
++
++static int ovl_set_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for setxattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_setxattr(upperdentry, ovl_opaque_xattr, "y", 1, 0);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_remove_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for removexattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_removexattr(upperdentry, ovl_opaque_xattr);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_dir_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++
++	type = ovl_path_real(dentry, &realpath);
++	err = vfs_getattr(&realpath, stat);
++	if (err)
++		return err;
++
++	stat->dev = dentry->d_sb->s_dev;
++	stat->ino = dentry->d_inode->i_ino;
++
++	/*
++	 * It's probably not worth it to count subdirs to get the
++	 * correct link count.  nlink=1 seems to pacify 'find' and
++	 * other utilities.
++	 */
++	if (type == OVL_PATH_MERGE)
++		stat->nlink = 1;
++
++	return 0;
++}
++
++static int ovl_create_object(struct dentry *dentry, int mode, dev_t rdev,
++			     const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *inode;
++	struct kstat stat = {
++		.mode = mode,
++		.rdev = rdev,
++	};
++
++	err = -ENOMEM;
++	inode = ovl_new_inode(dentry->d_sb, mode, dentry->d_fsdata);
++	if (!inode)
++		goto out;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		goto out_iput;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++
++	newdentry = ovl_upper_create(upperdir, dentry, &stat, link);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++	if (ovl_dentry_is_opaque(dentry) && S_ISDIR(mode)) {
++		err = ovl_set_opaque(newdentry);
++		if (err) {
++			vfs_rmdir(upperdir->d_inode, newdentry);
++			ovl_whiteout(upperdir, dentry);
++			goto out_dput;
++		}
++	}
++	ovl_dentry_update(dentry, newdentry);
++	ovl_copyattr(newdentry->d_inode, inode);
++	d_instantiate(dentry, inode);
++	inode = NULL;
++	newdentry = NULL;
++	err = 0;
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out_iput:
++	iput(inode);
++out:
++	return err;
++}
++
++static int ovl_create(struct inode *dir, struct dentry *dentry, umode_t mode,
++		      bool excl)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFREG, 0, NULL);
++}
++
++static int ovl_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFDIR, 0, NULL);
++}
++
++static int ovl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
++		     dev_t rdev)
++{
++	return ovl_create_object(dentry, mode, rdev, NULL);
++}
++
++static int ovl_symlink(struct inode *dir, struct dentry *dentry,
++			 const char *link)
++{
++	return ovl_create_object(dentry, S_IFLNK, 0, link);
++}
++
++static int ovl_do_remove(struct dentry *dentry, bool is_dir)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++	struct dentry *upperdir;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		return err;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	type = ovl_path_real(dentry, &realpath);
++	if (type != OVL_PATH_LOWER) {
++		err = -ESTALE;
++		if (realpath.dentry->d_parent != upperdir)
++			goto out_d_drop;
++
++		/* FIXME: create whiteout up front and rename to target */
++
++		if (is_dir)
++			err = vfs_rmdir(upperdir->d_inode, realpath.dentry);
++		else
++			err = vfs_unlink(upperdir->d_inode, realpath.dentry);
++		if (err)
++			goto out_d_drop;
++
++		ovl_dentry_version_inc(dentry->d_parent);
++	}
++
++	if (type != OVL_PATH_UPPER || ovl_dentry_is_opaque(dentry))
++		err = ovl_whiteout(upperdir, dentry);
++
++	/*
++	 * Keeping this dentry hashed would mean having to release
++	 * upperpath/lowerpath, which could only be done if we are the
++	 * sole user of this dentry.  Too tricky...  Just unhash for
++	 * now.
++	 */
++out_d_drop:
++	d_drop(dentry);
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_unlink(struct inode *dir, struct dentry *dentry)
++{
++	return ovl_do_remove(dentry, false);
++}
++
++
++static int ovl_rmdir(struct inode *dir, struct dentry *dentry)
++{
++	int err;
++	enum ovl_path_type type;
++
++	type = ovl_path_type(dentry);
++	if (type != OVL_PATH_UPPER) {
++		err = ovl_check_empty_and_clear(dentry, type);
++		if (err)
++			return err;
++	}
++
++	return ovl_do_remove(dentry, true);
++}
++
++static int ovl_link(struct dentry *old, struct inode *newdir,
++		    struct dentry *new)
++{
++	int err;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *newinode;
++
++	err = ovl_copy_up(old);
++	if (err)
++		goto out;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		goto out;
++
++	upperdir = ovl_dentry_upper(new->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	newdentry = ovl_lookup_create(upperdir, new);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	olddentry = ovl_dentry_upper(old);
++	err = vfs_link(olddentry, upperdir->d_inode, newdentry);
++	if (!err) {
++		if (WARN_ON(!newdentry->d_inode)) {
++			dput(newdentry);
++			err = -ENOENT;
++			goto out_unlock;
++		}
++		newinode = ovl_new_inode(old->d_sb, newdentry->d_inode->i_mode,
++				new->d_fsdata);
++		if (!newinode) {
++			err = -ENOMEM;
++			goto link_fail;
++		}
++		ovl_copyattr(upperdir->d_inode, newinode);
++
++		ovl_dentry_version_inc(new->d_parent);
++		ovl_dentry_update(new, newdentry);
++
++		d_instantiate(new, newinode);
++	} else {
++link_fail:
++		if (ovl_dentry_is_opaque(new))
++			ovl_whiteout(upperdir, new);
++		dput(newdentry);
++	}
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out:
++	return err;
++}
++
++static int ovl_rename(struct inode *olddir, struct dentry *old,
++			struct inode *newdir, struct dentry *new)
++{
++	int err;
++	enum ovl_path_type old_type;
++	enum ovl_path_type new_type;
++	struct dentry *old_upperdir;
++	struct dentry *new_upperdir;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *trap;
++	bool old_opaque;
++	bool new_opaque;
++	bool new_create = false;
++	bool is_dir = S_ISDIR(old->d_inode->i_mode);
++
++	/* Don't copy up directory trees */
++	old_type = ovl_path_type(old);
++	if (old_type != OVL_PATH_UPPER && is_dir)
++		return -EXDEV;
++
++	if (new->d_inode) {
++		new_type = ovl_path_type(new);
++
++		if (new_type == OVL_PATH_LOWER && old_type == OVL_PATH_LOWER) {
++			if (ovl_dentry_lower(old)->d_inode ==
++			    ovl_dentry_lower(new)->d_inode)
++				return 0;
++		}
++		if (new_type != OVL_PATH_LOWER && old_type != OVL_PATH_LOWER) {
++			if (ovl_dentry_upper(old)->d_inode ==
++			    ovl_dentry_upper(new)->d_inode)
++				return 0;
++		}
++
++		if (new_type != OVL_PATH_UPPER &&
++		    S_ISDIR(new->d_inode->i_mode)) {
++			err = ovl_check_empty_and_clear(new, new_type);
++			if (err)
++				return err;
++		}
++	} else {
++		new_type = OVL_PATH_UPPER;
++	}
++
++	err = ovl_copy_up(old);
++	if (err)
++		return err;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		return err;
++
++	old_upperdir = ovl_dentry_upper(old->d_parent);
++	new_upperdir = ovl_dentry_upper(new->d_parent);
++
++	trap = lock_rename(new_upperdir, old_upperdir);
++
++	olddentry = ovl_dentry_upper(old);
++	newdentry = ovl_dentry_upper(new);
++	if (newdentry) {
++		dget(newdentry);
++	} else {
++		new_create = true;
++		newdentry = ovl_lookup_create(new_upperdir, new);
++		err = PTR_ERR(newdentry);
++		if (IS_ERR(newdentry))
++			goto out_unlock;
++	}
++
++	err = -ESTALE;
++	if (olddentry->d_parent != old_upperdir)
++		goto out_dput;
++	if (newdentry->d_parent != new_upperdir)
++		goto out_dput;
++	if (olddentry == trap)
++		goto out_dput;
++	if (newdentry == trap)
++		goto out_dput;
++
++	old_opaque = ovl_dentry_is_opaque(old);
++	new_opaque = ovl_dentry_is_opaque(new) || new_type != OVL_PATH_UPPER;
++
++	if (is_dir && !old_opaque && new_opaque) {
++		err = ovl_set_opaque(olddentry);
++		if (err)
++			goto out_dput;
++	}
++
++	err = vfs_rename(old_upperdir->d_inode, olddentry,
++			 new_upperdir->d_inode, newdentry);
++
++	if (err) {
++		if (new_create && ovl_dentry_is_opaque(new))
++			ovl_whiteout(new_upperdir, new);
++		if (is_dir && !old_opaque && new_opaque)
++			ovl_remove_opaque(olddentry);
++		goto out_dput;
++	}
++
++	if (old_type != OVL_PATH_UPPER || old_opaque)
++		err = ovl_whiteout(old_upperdir, old);
++	if (is_dir && old_opaque && !new_opaque)
++		ovl_remove_opaque(olddentry);
++
++	if (old_opaque != new_opaque)
++		ovl_dentry_set_opaque(old, new_opaque);
++
++	ovl_dentry_version_inc(old->d_parent);
++	ovl_dentry_version_inc(new->d_parent);
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	unlock_rename(new_upperdir, old_upperdir);
++	return err;
++}
++
++const struct inode_operations ovl_dir_inode_operations = {
++	.lookup		= ovl_lookup,
++	.mkdir		= ovl_mkdir,
++	.symlink	= ovl_symlink,
++	.unlink		= ovl_unlink,
++	.rmdir		= ovl_rmdir,
++	.rename		= ovl_rename,
++	.link		= ovl_link,
++	.setattr	= ovl_setattr,
++	.create		= ovl_create,
++	.mknod		= ovl_mknod,
++	.permission	= ovl_permission,
++	.getattr	= ovl_dir_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
+--- /dev/null
++++ b/fs/overlayfs/inode.c
+@@ -0,0 +1,372 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/xattr.h>
++#include "overlayfs.h"
++
++int ovl_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct dentry *upperdentry;
++	int err;
++
++	if ((attr->ia_valid & ATTR_SIZE) && !ovl_dentry_upper(dentry))
++		err = ovl_copy_up_truncate(dentry, attr->ia_size);
++	else
++		err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++
++	if (attr->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
++		attr->ia_valid &= ~ATTR_MODE;
++
++	mutex_lock(&upperdentry->d_inode->i_mutex);
++	err = notify_change(upperdentry, attr);
++	if (!err)
++		ovl_copyattr(upperdentry->d_inode, dentry->d_inode);
++	mutex_unlock(&upperdentry->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	struct path realpath;
++
++	ovl_path_real(dentry, &realpath);
++	return vfs_getattr(&realpath, stat);
++}
++
++int ovl_permission(struct inode *inode, int mask)
++{
++	struct ovl_entry *oe;
++	struct dentry *alias = NULL;
++	struct inode *realinode;
++	struct dentry *realdentry;
++	bool is_upper;
++	int err;
++
++	if (S_ISDIR(inode->i_mode)) {
++		oe = inode->i_private;
++	} else if (mask & MAY_NOT_BLOCK) {
++		return -ECHILD;
++	} else {
++		/*
++		 * For non-directories find an alias and get the info
++		 * from there.
++		 */
++		alias = d_find_any_alias(inode);
++		if (WARN_ON(!alias))
++			return -ENOENT;
++
++		oe = alias->d_fsdata;
++	}
++
++	realdentry = ovl_entry_real(oe, &is_upper);
++
++	/* Careful in RCU walk mode */
++	realinode = ACCESS_ONCE(realdentry->d_inode);
++	if (!realinode) {
++		WARN_ON(!(mask & MAY_NOT_BLOCK));
++		err = -ENOENT;
++		goto out_dput;
++	}
++
++	if (mask & MAY_WRITE) {
++		umode_t mode = realinode->i_mode;
++
++		/*
++		 * Writes will always be redirected to upper layer, so
++		 * ignore lower layer being read-only.
++		 *
++		 * If the overlay itself is read-only then proceed
++		 * with the permission check, don't return EROFS.
++		 * This will only happen if this is the lower layer of
++		 * another overlayfs.
++		 *
++		 * If upper fs becomes read-only after the overlay was
++		 * constructed return EROFS to prevent modification of
++		 * upper layer.
++		 */
++		err = -EROFS;
++		if (is_upper && !IS_RDONLY(inode) && IS_RDONLY(realinode) &&
++		    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
++			goto out_dput;
++	}
++
++	err = __inode_permission(realinode, mask);
++out_dput:
++	dput(alias);
++	return err;
++}
++
++
++struct ovl_link_data {
++	struct dentry *realdentry;
++	void *cookie;
++};
++
++static void *ovl_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	void *ret;
++	struct dentry *realdentry;
++	struct inode *realinode;
++
++	realdentry = ovl_dentry_real(dentry);
++	realinode = realdentry->d_inode;
++
++	if (WARN_ON(!realinode->i_op->follow_link))
++		return ERR_PTR(-EPERM);
++
++	ret = realinode->i_op->follow_link(realdentry, nd);
++	if (IS_ERR(ret))
++		return ret;
++
++	if (realinode->i_op->put_link) {
++		struct ovl_link_data *data;
++
++		data = kmalloc(sizeof(struct ovl_link_data), GFP_KERNEL);
++		if (!data) {
++			realinode->i_op->put_link(realdentry, nd, ret);
++			return ERR_PTR(-ENOMEM);
++		}
++		data->realdentry = realdentry;
++		data->cookie = ret;
++
++		return data;
++	} else {
++		return NULL;
++	}
++}
++
++static void ovl_put_link(struct dentry *dentry, struct nameidata *nd, void *c)
++{
++	struct inode *realinode;
++	struct ovl_link_data *data = c;
++
++	if (!data)
++		return;
++
++	realinode = data->realdentry->d_inode;
++	realinode->i_op->put_link(data->realdentry, nd, data->cookie);
++	kfree(data);
++}
++
++static int ovl_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
++{
++	struct path realpath;
++	struct inode *realinode;
++
++	ovl_path_real(dentry, &realpath);
++	realinode = realpath.dentry->d_inode;
++
++	if (!realinode->i_op->readlink)
++		return -EINVAL;
++
++	touch_atime(&realpath);
++
++	return realinode->i_op->readlink(realpath.dentry, buf, bufsiz);
++}
++
++
++static bool ovl_is_private_xattr(const char *name)
++{
++	return strncmp(name, "trusted.overlay.", 14) == 0;
++}
++
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags)
++{
++	int err;
++	struct dentry *upperdentry;
++
++	if (ovl_is_private_xattr(name))
++		return -EPERM;
++
++	err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++	return  vfs_setxattr(upperdentry, name, value, size, flags);
++}
++
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size)
++{
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	return vfs_getxattr(ovl_dentry_real(dentry), name, value, size);
++}
++
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
++{
++	ssize_t res;
++	int off;
++
++	res = vfs_listxattr(ovl_dentry_real(dentry), list, size);
++	if (res <= 0 || size == 0)
++		return res;
++
++	if (ovl_path_type(dentry->d_parent) != OVL_PATH_MERGE)
++		return res;
++
++	/* filter out private xattrs */
++	for (off = 0; off < res;) {
++		char *s = list + off;
++		size_t slen = strlen(s) + 1;
++
++		BUG_ON(off + slen > res);
++
++		if (ovl_is_private_xattr(s)) {
++			res -= slen;
++			memmove(s, s + slen, res - off);
++		} else {
++			off += slen;
++		}
++	}
++
++	return res;
++}
++
++int ovl_removexattr(struct dentry *dentry, const char *name)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (type == OVL_PATH_LOWER) {
++		err = vfs_getxattr(realpath.dentry, name, NULL, 0);
++		if (err < 0)
++			return err;
++
++		err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_removexattr(realpath.dentry, name);
++}
++
++static bool ovl_open_need_copy_up(int flags, enum ovl_path_type type,
++				  struct dentry *realdentry)
++{
++	if (type != OVL_PATH_LOWER)
++		return false;
++
++	if (special_file(realdentry->d_inode->i_mode))
++		return false;
++
++	if (!(OPEN_FMODE(flags) & FMODE_WRITE) && !(flags & O_TRUNC))
++		return false;
++
++	return true;
++}
++
++static int ovl_dentry_open(struct dentry *dentry, struct file *file,
++		    const struct cred *cred)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
++		if (file->f_flags & O_TRUNC)
++			err = ovl_copy_up_truncate(dentry, 0);
++		else
++			err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_open(&realpath, file, cred);
++}
++
++static const struct inode_operations ovl_file_inode_operations = {
++	.setattr	= ovl_setattr,
++	.permission	= ovl_permission,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++	.dentry_open	= ovl_dentry_open,
++};
++
++static const struct inode_operations ovl_symlink_inode_operations = {
++	.setattr	= ovl_setattr,
++	.follow_link	= ovl_follow_link,
++	.put_link	= ovl_put_link,
++	.readlink	= ovl_readlink,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe)
++{
++	struct inode *inode;
++
++	inode = new_inode(sb);
++	if (!inode)
++		return NULL;
++
++	mode &= S_IFMT;
++
++	inode->i_ino = get_next_ino();
++	inode->i_mode = mode;
++	inode->i_flags |= S_NOATIME | S_NOCMTIME;
++
++	switch (mode) {
++	case S_IFDIR:
++		inode->i_private = oe;
++		inode->i_op = &ovl_dir_inode_operations;
++		inode->i_fop = &ovl_dir_operations;
++		break;
++
++	case S_IFLNK:
++		inode->i_op = &ovl_symlink_inode_operations;
++		break;
++
++	case S_IFREG:
++	case S_IFSOCK:
++	case S_IFBLK:
++	case S_IFCHR:
++	case S_IFIFO:
++		inode->i_op = &ovl_file_inode_operations;
++		break;
++
++	default:
++		WARN(1, "illegal file type: %i\n", mode);
++		iput(inode);
++		inode = NULL;
++	}
++
++	return inode;
++
++}
+--- /dev/null
++++ b/fs/overlayfs/overlayfs.h
+@@ -0,0 +1,70 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++struct ovl_entry;
++
++enum ovl_path_type {
++	OVL_PATH_UPPER,
++	OVL_PATH_MERGE,
++	OVL_PATH_LOWER,
++};
++
++extern const char *ovl_opaque_xattr;
++extern const char *ovl_whiteout_xattr;
++extern const struct dentry_operations ovl_dentry_operations;
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry);
++u64 ovl_dentry_version_get(struct dentry *dentry);
++void ovl_dentry_version_inc(struct dentry *dentry);
++void ovl_path_upper(struct dentry *dentry, struct path *path);
++void ovl_path_lower(struct dentry *dentry, struct path *path);
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path);
++struct dentry *ovl_dentry_upper(struct dentry *dentry);
++struct dentry *ovl_dentry_lower(struct dentry *dentry);
++struct dentry *ovl_dentry_real(struct dentry *dentry);
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper);
++bool ovl_dentry_is_opaque(struct dentry *dentry);
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque);
++bool ovl_is_whiteout(struct dentry *dentry);
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry);
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags);
++struct file *ovl_path_open(struct path *path, int flags);
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link);
++
++/* readdir.c */
++extern const struct file_operations ovl_dir_operations;
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type);
++
++/* inode.c */
++int ovl_setattr(struct dentry *dentry, struct iattr *attr);
++int ovl_permission(struct inode *inode, int mask);
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags);
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size);
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
++int ovl_removexattr(struct dentry *dentry, const char *name);
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe);
++static inline void ovl_copyattr(struct inode *from, struct inode *to)
++{
++	to->i_uid = from->i_uid;
++	to->i_gid = from->i_gid;
++}
++
++/* dir.c */
++extern const struct inode_operations ovl_dir_inode_operations;
++
++/* copy_up.c */
++int ovl_copy_up(struct dentry *dentry);
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size);
+--- /dev/null
++++ b/fs/overlayfs/readdir.c
+@@ -0,0 +1,566 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/namei.h>
++#include <linux/file.h>
++#include <linux/xattr.h>
++#include <linux/rbtree.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++struct ovl_cache_entry {
++	const char *name;
++	unsigned int len;
++	unsigned int type;
++	u64 ino;
++	bool is_whiteout;
++	struct list_head l_node;
++	struct rb_node node;
++};
++
++struct ovl_readdir_data {
++	struct rb_root *root;
++	struct list_head *list;
++	struct list_head *middle;
++	struct dentry *dir;
++	int count;
++	int err;
++};
++
++struct ovl_dir_file {
++	bool is_real;
++	bool is_cached;
++	struct list_head cursor;
++	u64 cache_version;
++	struct list_head cache;
++	struct file *realfile;
++};
++
++static struct ovl_cache_entry *ovl_cache_entry_from_node(struct rb_node *n)
++{
++	return container_of(n, struct ovl_cache_entry, node);
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_find(struct rb_root *root,
++						    const char *name, int len)
++{
++	struct rb_node *node = root->rb_node;
++	int cmp;
++
++	while (node) {
++		struct ovl_cache_entry *p = ovl_cache_entry_from_node(node);
++
++		cmp = strncmp(name, p->name, len);
++		if (cmp > 0)
++			node = p->node.rb_right;
++		else if (cmp < 0 || len < p->len)
++			node = p->node.rb_left;
++		else
++			return p;
++	}
++
++	return NULL;
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_new(const char *name, int len,
++						   u64 ino, unsigned int d_type)
++{
++	struct ovl_cache_entry *p;
++
++	p = kmalloc(sizeof(*p) + len + 1, GFP_KERNEL);
++	if (p) {
++		char *name_copy = (char *) (p + 1);
++		memcpy(name_copy, name, len);
++		name_copy[len] = '\0';
++		p->name = name_copy;
++		p->len = len;
++		p->type = d_type;
++		p->ino = ino;
++		p->is_whiteout = false;
++	}
++
++	return p;
++}
++
++static int ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,
++				  const char *name, int len, u64 ino,
++				  unsigned int d_type)
++{
++	struct rb_node **newp = &rdd->root->rb_node;
++	struct rb_node *parent = NULL;
++	struct ovl_cache_entry *p;
++
++	while (*newp) {
++		int cmp;
++		struct ovl_cache_entry *tmp;
++
++		parent = *newp;
++		tmp = ovl_cache_entry_from_node(*newp);
++		cmp = strncmp(name, tmp->name, len);
++		if (cmp > 0)
++			newp = &tmp->node.rb_right;
++		else if (cmp < 0 || len < tmp->len)
++			newp = &tmp->node.rb_left;
++		else
++			return 0;
++	}
++
++	p = ovl_cache_entry_new(name, len, ino, d_type);
++	if (p == NULL)
++		return -ENOMEM;
++
++	list_add_tail(&p->l_node, rdd->list);
++	rb_link_node(&p->node, parent, newp);
++	rb_insert_color(&p->node, rdd->root);
++
++	return 0;
++}
++
++static int ovl_fill_lower(void *buf, const char *name, int namelen,
++			    loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++	struct ovl_cache_entry *p;
++
++	rdd->count++;
++	p = ovl_cache_entry_find(rdd->root, name, namelen);
++	if (p) {
++		list_move_tail(&p->l_node, rdd->middle);
++	} else {
++		p = ovl_cache_entry_new(name, namelen, ino, d_type);
++		if (p == NULL)
++			rdd->err = -ENOMEM;
++		else
++			list_add_tail(&p->l_node, rdd->middle);
++	}
++
++	return rdd->err;
++}
++
++static void ovl_cache_free(struct list_head *list)
++{
++	struct ovl_cache_entry *p;
++	struct ovl_cache_entry *n;
++
++	list_for_each_entry_safe(p, n, list, l_node)
++		kfree(p);
++
++	INIT_LIST_HEAD(list);
++}
++
++static int ovl_fill_upper(void *buf, const char *name, int namelen,
++			  loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++
++	rdd->count++;
++	return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);
++}
++
++static inline int ovl_dir_read(struct path *realpath,
++			       struct ovl_readdir_data *rdd, filldir_t filler)
++{
++	struct file *realfile;
++	int err;
++
++	realfile = ovl_path_open(realpath, O_RDONLY | O_DIRECTORY);
++	if (IS_ERR(realfile))
++		return PTR_ERR(realfile);
++
++	do {
++		rdd->count = 0;
++		rdd->err = 0;
++		err = vfs_readdir(realfile, filler, rdd);
++		if (err >= 0)
++			err = rdd->err;
++	} while (!err && rdd->count);
++	fput(realfile);
++
++	return 0;
++}
++
++static void ovl_dir_reset(struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++	enum ovl_path_type type = ovl_path_type(file->f_path.dentry);
++
++	if (ovl_dentry_version_get(file->f_path.dentry) != od->cache_version) {
++		list_del_init(&od->cursor);
++		ovl_cache_free(&od->cache);
++		od->is_cached = false;
++	}
++	WARN_ON(!od->is_real && type != OVL_PATH_MERGE);
++	if (od->is_real && type == OVL_PATH_MERGE) {
++		fput(od->realfile);
++		od->realfile = NULL;
++		od->is_real = false;
++	}
++}
++
++static int ovl_dir_mark_whiteouts(struct ovl_readdir_data *rdd)
++{
++	struct ovl_cache_entry *p;
++	struct dentry *dentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred) {
++		ovl_cache_free(rdd->list);
++		return -ENOMEM;
++	}
++
++	/*
++	 * CAP_SYS_ADMIN for getxattr
++	 * CAP_DAC_OVERRIDE for lookup
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock(&rdd->dir->d_inode->i_mutex);
++	list_for_each_entry(p, rdd->list, l_node) {
++		if (p->type != DT_LNK)
++			continue;
++
++		dentry = lookup_one_len(p->name, rdd->dir, p->len);
++		if (IS_ERR(dentry))
++			continue;
++
++		p->is_whiteout = ovl_is_whiteout(dentry);
++		dput(dentry);
++	}
++	mutex_unlock(&rdd->dir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return 0;
++}
++
++static inline int ovl_dir_read_merged(struct path *upperpath,
++				      struct path *lowerpath,
++				      struct ovl_readdir_data *rdd)
++{
++	int err;
++	struct rb_root root = RB_ROOT;
++	struct list_head middle;
++
++	rdd->root = &root;
++	if (upperpath->dentry) {
++		rdd->dir = upperpath->dentry;
++		err = ovl_dir_read(upperpath, rdd, ovl_fill_upper);
++		if (err)
++			goto out;
++
++		err = ovl_dir_mark_whiteouts(rdd);
++		if (err)
++			goto out;
++	}
++	/*
++	 * Insert lowerpath entries before upperpath ones, this allows
++	 * offsets to be reasonably constant
++	 */
++	list_add(&middle, rdd->list);
++	rdd->middle = &middle;
++	err = ovl_dir_read(lowerpath, rdd, ovl_fill_lower);
++	list_del(&middle);
++out:
++	rdd->root = NULL;
++
++	return err;
++}
++
++static void ovl_seek_cursor(struct ovl_dir_file *od, loff_t pos)
++{
++	struct list_head *l;
++	loff_t off;
++
++	l = od->cache.next;
++	for (off = 0; off < pos; off++) {
++		if (l == &od->cache)
++			break;
++		l = l->next;
++	}
++	list_move_tail(&od->cursor, l);
++}
++
++static int ovl_readdir(struct file *file, void *buf, filldir_t filler)
++{
++	struct ovl_dir_file *od = file->private_data;
++	int res;
++
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_readdir(od->realfile, filler, buf);
++		file->f_pos = od->realfile->f_pos;
++
++		return res;
++	}
++
++	if (!od->is_cached) {
++		struct path lowerpath;
++		struct path upperpath;
++		struct ovl_readdir_data rdd = { .list = &od->cache };
++
++		ovl_path_lower(file->f_path.dentry, &lowerpath);
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++
++		res = ovl_dir_read_merged(&upperpath, &lowerpath, &rdd);
++		if (res) {
++			ovl_cache_free(rdd.list);
++			return res;
++		}
++
++		od->cache_version = ovl_dentry_version_get(file->f_path.dentry);
++		od->is_cached = true;
++
++		ovl_seek_cursor(od, file->f_pos);
++	}
++
++	while (od->cursor.next != &od->cache) {
++		int over;
++		loff_t off;
++		struct ovl_cache_entry *p;
++
++		p = list_entry(od->cursor.next, struct ovl_cache_entry, l_node);
++		off = file->f_pos;
++		if (!p->is_whiteout) {
++			over = filler(buf, p->name, p->len, off, p->ino,
++				      p->type);
++			if (over)
++				break;
++		}
++		file->f_pos++;
++		list_move(&od->cursor, &p->l_node);
++	}
++
++	return 0;
++}
++
++static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
++{
++	loff_t res;
++	struct ovl_dir_file *od = file->private_data;
++
++	mutex_lock(&file_inode(file)->i_mutex);
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_llseek(od->realfile, offset, origin);
++		file->f_pos = od->realfile->f_pos;
++	} else {
++		res = -EINVAL;
++
++		switch (origin) {
++		case SEEK_CUR:
++			offset += file->f_pos;
++			break;
++		case SEEK_SET:
++			break;
++		default:
++			goto out_unlock;
++		}
++		if (offset < 0)
++			goto out_unlock;
++
++		if (offset != file->f_pos) {
++			file->f_pos = offset;
++			if (od->is_cached)
++				ovl_seek_cursor(od, offset);
++		}
++		res = offset;
++	}
++out_unlock:
++	mutex_unlock(&file_inode(file)->i_mutex);
++
++	return res;
++}
++
++static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
++			 int datasync)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	/* May need to reopen directory if it got copied up */
++	if (!od->realfile) {
++		struct path upperpath;
++
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++		od->realfile = ovl_path_open(&upperpath, O_RDONLY);
++		if (IS_ERR(od->realfile))
++			return PTR_ERR(od->realfile);
++	}
++
++	return vfs_fsync_range(od->realfile, start, end, datasync);
++}
++
++static int ovl_dir_release(struct inode *inode, struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	list_del(&od->cursor);
++	ovl_cache_free(&od->cache);
++	if (od->realfile)
++		fput(od->realfile);
++	kfree(od);
++
++	return 0;
++}
++
++static int ovl_dir_open(struct inode *inode, struct file *file)
++{
++	struct path realpath;
++	struct file *realfile;
++	struct ovl_dir_file *od;
++	enum ovl_path_type type;
++
++	od = kzalloc(sizeof(struct ovl_dir_file), GFP_KERNEL);
++	if (!od)
++		return -ENOMEM;
++
++	type = ovl_path_real(file->f_path.dentry, &realpath);
++	realfile = ovl_path_open(&realpath, file->f_flags);
++	if (IS_ERR(realfile)) {
++		kfree(od);
++		return PTR_ERR(realfile);
++	}
++	INIT_LIST_HEAD(&od->cache);
++	INIT_LIST_HEAD(&od->cursor);
++	od->is_cached = false;
++	od->realfile = realfile;
++	od->is_real = (type != OVL_PATH_MERGE);
++	file->private_data = od;
++
++	return 0;
++}
++
++const struct file_operations ovl_dir_operations = {
++	.read		= generic_read_dir,
++	.open		= ovl_dir_open,
++	.readdir	= ovl_readdir,
++	.llseek		= ovl_dir_llseek,
++	.fsync		= ovl_dir_fsync,
++	.release	= ovl_dir_release,
++};
++
++static int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
++{
++	int err;
++	struct path lowerpath;
++	struct path upperpath;
++	struct ovl_cache_entry *p;
++	struct ovl_readdir_data rdd = { .list = list };
++
++	ovl_path_upper(dentry, &upperpath);
++	ovl_path_lower(dentry, &lowerpath);
++
++	err = ovl_dir_read_merged(&upperpath, &lowerpath, &rdd);
++	if (err)
++		return err;
++
++	err = 0;
++
++	list_for_each_entry(p, list, l_node) {
++		if (p->is_whiteout)
++			continue;
++
++		if (p->name[0] == '.') {
++			if (p->len == 1)
++				continue;
++			if (p->len == 2 && p->name[1] == '.')
++				continue;
++		}
++		err = -ENOTEMPTY;
++		break;
++	}
++
++	return err;
++}
++
++static int ovl_remove_whiteouts(struct dentry *dir, struct list_head *list)
++{
++	struct path upperpath;
++	struct dentry *upperdir;
++	struct ovl_cache_entry *p;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	int err;
++
++	ovl_path_upper(dir, &upperpath);
++	upperdir = upperpath.dentry;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/*
++	 * CAP_DAC_OVERRIDE for lookup and unlink
++	 * CAP_SYS_ADMIN for setxattr of "trusted" namespace
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	old_cred = override_creds(override_cred);
++
++	err = vfs_setxattr(upperdir, ovl_opaque_xattr, "y", 1, 0);
++	if (err)
++		goto out_revert_creds;
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	list_for_each_entry(p, list, l_node) {
++		struct dentry *dentry;
++		int ret;
++
++		if (!p->is_whiteout)
++			continue;
++
++		dentry = lookup_one_len(p->name, upperdir, p->len);
++		if (IS_ERR(dentry)) {
++			pr_warn(
++			    "overlayfs: failed to lookup whiteout %.*s: %li\n",
++			    p->len, p->name, PTR_ERR(dentry));
++			continue;
++		}
++		ret = vfs_unlink(upperdir->d_inode, dentry);
++		dput(dentry);
++		if (ret)
++			pr_warn(
++			    "overlayfs: failed to unlink whiteout %.*s: %i\n",
++			    p->len, p->name, ret);
++	}
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++out_revert_creds:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type)
++{
++	int err;
++	LIST_HEAD(list);
++
++	err = ovl_check_empty_dir(dentry, &list);
++	if (!err && type == OVL_PATH_MERGE)
++		err = ovl_remove_whiteouts(dentry, &list);
++
++	ovl_cache_free(&list);
++
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/super.c
+@@ -0,0 +1,685 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/mount.h>
++#include <linux/slab.h>
++#include <linux/parser.h>
++#include <linux/module.h>
++#include <linux/cred.h>
++#include <linux/sched.h>
++#include <linux/statfs.h>
++#include <linux/seq_file.h>
++#include "overlayfs.h"
++
++MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
++MODULE_DESCRIPTION("Overlay filesystem");
++MODULE_LICENSE("GPL");
++
++#define OVERLAYFS_SUPER_MAGIC 0x794c764f
++
++struct ovl_config {
++	char *lowerdir;
++	char *upperdir;
++};
++
++/* private information held for overlayfs's superblock */
++struct ovl_fs {
++	struct vfsmount *upper_mnt;
++	struct vfsmount *lower_mnt;
++	long lower_namelen;
++	/* pathnames of lower and upper dirs, for show_options */
++	struct ovl_config config;
++};
++
++/* private information held for every overlayfs dentry */
++struct ovl_entry {
++	/*
++	 * Keep "double reference" on upper dentries, so that
++	 * d_delete() doesn't think it's OK to reset d_inode to NULL.
++	 */
++	struct dentry *__upperdentry;
++	struct dentry *lowerdentry;
++	union {
++		struct {
++			u64 version;
++			bool opaque;
++		};
++		struct rcu_head rcu;
++	};
++};
++
++const char *ovl_whiteout_xattr = "trusted.overlay.whiteout";
++const char *ovl_opaque_xattr = "trusted.overlay.opaque";
++
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe->__upperdentry) {
++		if (oe->lowerdentry && S_ISDIR(dentry->d_inode->i_mode))
++			return OVL_PATH_MERGE;
++		else
++			return OVL_PATH_UPPER;
++	} else {
++		return OVL_PATH_LOWER;
++	}
++}
++
++static struct dentry *ovl_upperdentry_dereference(struct ovl_entry *oe)
++{
++	struct dentry *upperdentry = ACCESS_ONCE(oe->__upperdentry);
++	smp_read_barrier_depends();
++	return upperdentry;
++}
++
++void ovl_path_upper(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->upper_mnt;
++	path->dentry = ovl_upperdentry_dereference(oe);
++}
++
++void ovl_path_lower(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->lower_mnt;
++	path->dentry = oe->lowerdentry;
++}
++
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)
++{
++
++	enum ovl_path_type type = ovl_path_type(dentry);
++
++	if (type == OVL_PATH_LOWER)
++		ovl_path_lower(dentry, path);
++	else
++		ovl_path_upper(dentry, path);
++
++	return type;
++}
++
++struct dentry *ovl_dentry_upper(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return ovl_upperdentry_dereference(oe);
++}
++
++struct dentry *ovl_dentry_lower(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return oe->lowerdentry;
++}
++
++struct dentry *ovl_dentry_real(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (!realdentry)
++		realdentry = oe->lowerdentry;
++
++	return realdentry;
++}
++
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper)
++{
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (realdentry) {
++		*is_upper = true;
++	} else {
++		realdentry = oe->lowerdentry;
++		*is_upper = false;
++	}
++	return realdentry;
++}
++
++bool ovl_dentry_is_opaque(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	return oe->opaque;
++}
++
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	oe->opaque = opaque;
++}
++
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&upperdentry->d_parent->d_inode->i_mutex));
++	WARN_ON(oe->__upperdentry);
++	BUG_ON(!upperdentry->d_inode);
++	smp_wmb();
++	oe->__upperdentry = dget(upperdentry);
++}
++
++void ovl_dentry_version_inc(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	oe->version++;
++}
++
++u64 ovl_dentry_version_get(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	return oe->version;
++}
++
++bool ovl_is_whiteout(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!dentry)
++		return false;
++	if (!dentry->d_inode)
++		return false;
++	if (!S_ISLNK(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_whiteout_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static bool ovl_is_opaquedir(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!S_ISDIR(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_opaque_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static void ovl_entry_free(struct rcu_head *head)
++{
++	struct ovl_entry *oe = container_of(head, struct ovl_entry, rcu);
++	kfree(oe);
++}
++
++static void ovl_dentry_release(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe) {
++		dput(oe->__upperdentry);
++		dput(oe->__upperdentry);
++		dput(oe->lowerdentry);
++		call_rcu(&oe->rcu, ovl_entry_free);
++	}
++}
++
++const struct dentry_operations ovl_dentry_operations = {
++	.d_release = ovl_dentry_release,
++};
++
++static struct ovl_entry *ovl_alloc_entry(void)
++{
++	return kzalloc(sizeof(struct ovl_entry), GFP_KERNEL);
++}
++
++static inline struct dentry *ovl_lookup_real(struct dentry *dir,
++					     struct qstr *name)
++{
++	struct dentry *dentry;
++
++	mutex_lock(&dir->d_inode->i_mutex);
++	dentry = lookup_one_len(name->name, dir, name->len);
++	mutex_unlock(&dir->d_inode->i_mutex);
++
++	if (IS_ERR(dentry)) {
++		if (PTR_ERR(dentry) == -ENOENT)
++			dentry = NULL;
++	} else if (!dentry->d_inode) {
++		dput(dentry);
++		dentry = NULL;
++	}
++	return dentry;
++}
++
++static int ovl_do_lookup(struct dentry *dentry)
++{
++	struct ovl_entry *oe;
++	struct dentry *upperdir;
++	struct dentry *lowerdir;
++	struct dentry *upperdentry = NULL;
++	struct dentry *lowerdentry = NULL;
++	struct inode *inode = NULL;
++	int err;
++
++	err = -ENOMEM;
++	oe = ovl_alloc_entry();
++	if (!oe)
++		goto out;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	lowerdir = ovl_dentry_lower(dentry->d_parent);
++
++	if (upperdir) {
++		upperdentry = ovl_lookup_real(upperdir, &dentry->d_name);
++		err = PTR_ERR(upperdentry);
++		if (IS_ERR(upperdentry))
++			goto out_put_dir;
++
++		if (lowerdir && upperdentry &&
++		    (S_ISLNK(upperdentry->d_inode->i_mode) ||
++		     S_ISDIR(upperdentry->d_inode->i_mode))) {
++			const struct cred *old_cred;
++			struct cred *override_cred;
++
++			err = -ENOMEM;
++			override_cred = prepare_creds();
++			if (!override_cred)
++				goto out_dput_upper;
++
++			/* CAP_SYS_ADMIN needed for getxattr */
++			cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++			old_cred = override_creds(override_cred);
++
++			if (ovl_is_opaquedir(upperdentry)) {
++				oe->opaque = true;
++			} else if (ovl_is_whiteout(upperdentry)) {
++				dput(upperdentry);
++				upperdentry = NULL;
++				oe->opaque = true;
++			}
++			revert_creds(old_cred);
++			put_cred(override_cred);
++		}
++	}
++	if (lowerdir && !oe->opaque) {
++		lowerdentry = ovl_lookup_real(lowerdir, &dentry->d_name);
++		err = PTR_ERR(lowerdentry);
++		if (IS_ERR(lowerdentry))
++			goto out_dput_upper;
++	}
++
++	if (lowerdentry && upperdentry &&
++	    (!S_ISDIR(upperdentry->d_inode->i_mode) ||
++	     !S_ISDIR(lowerdentry->d_inode->i_mode))) {
++		dput(lowerdentry);
++		lowerdentry = NULL;
++		oe->opaque = true;
++	}
++
++	if (lowerdentry || upperdentry) {
++		struct dentry *realdentry;
++
++		realdentry = upperdentry ? upperdentry : lowerdentry;
++		err = -ENOMEM;
++		inode = ovl_new_inode(dentry->d_sb, realdentry->d_inode->i_mode,
++				      oe);
++		if (!inode)
++			goto out_dput;
++		ovl_copyattr(realdentry->d_inode, inode);
++	}
++
++	if (upperdentry)
++		oe->__upperdentry = dget(upperdentry);
++
++	if (lowerdentry)
++		oe->lowerdentry = lowerdentry;
++
++	dentry->d_fsdata = oe;
++	dentry->d_op = &ovl_dentry_operations;
++	d_add(dentry, inode);
++
++	return 0;
++
++out_dput:
++	dput(lowerdentry);
++out_dput_upper:
++	dput(upperdentry);
++out_put_dir:
++	kfree(oe);
++out:
++	return err;
++}
++
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags)
++{
++	int err = ovl_do_lookup(dentry);
++
++	if (err)
++		return ERR_PTR(err);
++
++	return NULL;
++}
++
++struct file *ovl_path_open(struct path *path, int flags)
++{
++	return dentry_open(path, flags, current_cred());
++}
++
++static void ovl_put_super(struct super_block *sb)
++{
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++
++	mntput(ufs->upper_mnt);
++	mntput(ufs->lower_mnt);
++
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++	kfree(ufs);
++}
++
++static int ovl_remount_fs(struct super_block *sb, int *flagsp, char *data)
++{
++	int flags = *flagsp;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	/* When remounting rw or ro, we need to adjust the write access to the
++	 * upper fs.
++	 */
++	if (((flags ^ sb->s_flags) & MS_RDONLY) == 0)
++		/* No change to readonly status */
++		return 0;
++
++	if (flags & MS_RDONLY) {
++		mnt_drop_write(ufs->upper_mnt);
++		return 0;
++	} else
++		return mnt_want_write(ufs->upper_mnt);
++}
++
++/**
++ * ovl_statfs
++ * @sb: The overlayfs super block
++ * @buf: The struct kstatfs to fill in with stats
++ *
++ * Get the filesystem statistics.  As writes always target the upper layer
++ * filesystem pass the statfs to the same filesystem.
++ */
++static int ovl_statfs(struct dentry *dentry, struct kstatfs *buf)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct dentry *root_dentry = dentry->d_sb->s_root;
++	struct path path;
++	int err;
++
++	ovl_path_upper(root_dentry, &path);
++
++	err = vfs_statfs(&path, buf);
++	if (!err) {
++		buf->f_namelen = max(buf->f_namelen, ofs->lower_namelen);
++		buf->f_type = OVERLAYFS_SUPER_MAGIC;
++	}
++
++	return err;
++}
++
++/**
++ * ovl_show_options
++ *
++ * Prints the mount options for a given superblock.
++ * Returns zero; does not fail.
++ */
++static int ovl_show_options(struct seq_file *m, struct dentry *dentry)
++{
++	struct super_block *sb = dentry->d_sb;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	seq_printf(m, ",lowerdir=%s", ufs->config.lowerdir);
++	seq_printf(m, ",upperdir=%s", ufs->config.upperdir);
++	return 0;
++}
++
++static const struct super_operations ovl_super_operations = {
++	.put_super	= ovl_put_super,
++	.remount_fs	= ovl_remount_fs,
++	.statfs		= ovl_statfs,
++	.show_options	= ovl_show_options,
++};
++
++enum {
++	OPT_LOWERDIR,
++	OPT_UPPERDIR,
++	OPT_ERR,
++};
++
++static const match_table_t ovl_tokens = {
++	{OPT_LOWERDIR,			"lowerdir=%s"},
++	{OPT_UPPERDIR,			"upperdir=%s"},
++	{OPT_ERR,			NULL}
++};
++
++static int ovl_parse_opt(char *opt, struct ovl_config *config)
++{
++	char *p;
++
++	config->upperdir = NULL;
++	config->lowerdir = NULL;
++
++	while ((p = strsep(&opt, ",")) != NULL) {
++		int token;
++		substring_t args[MAX_OPT_ARGS];
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, ovl_tokens, args);
++		switch (token) {
++		case OPT_UPPERDIR:
++			kfree(config->upperdir);
++			config->upperdir = match_strdup(&args[0]);
++			if (!config->upperdir)
++				return -ENOMEM;
++			break;
++
++		case OPT_LOWERDIR:
++			kfree(config->lowerdir);
++			config->lowerdir = match_strdup(&args[0]);
++			if (!config->lowerdir)
++				return -ENOMEM;
++			break;
++
++		default:
++			return -EINVAL;
++		}
++	}
++	return 0;
++}
++
++static int ovl_fill_super(struct super_block *sb, void *data, int silent)
++{
++	struct path lowerpath;
++	struct path upperpath;
++	struct inode *root_inode;
++	struct dentry *root_dentry;
++	struct ovl_entry *oe;
++	struct ovl_fs *ufs;
++	struct kstatfs statfs;
++	int err;
++
++	err = -ENOMEM;
++	ufs = kmalloc(sizeof(struct ovl_fs), GFP_KERNEL);
++	if (!ufs)
++		goto out;
++
++	err = ovl_parse_opt((char *) data, &ufs->config);
++	if (err)
++		goto out_free_ufs;
++
++	err = -EINVAL;
++	if (!ufs->config.upperdir || !ufs->config.lowerdir) {
++		pr_err("overlayfs: missing upperdir or lowerdir\n");
++		goto out_free_config;
++	}
++
++	oe = ovl_alloc_entry();
++	if (oe == NULL)
++		goto out_free_config;
++
++	err = kern_path(ufs->config.upperdir, LOOKUP_FOLLOW, &upperpath);
++	if (err)
++		goto out_free_oe;
++
++	err = kern_path(ufs->config.lowerdir, LOOKUP_FOLLOW, &lowerpath);
++	if (err)
++		goto out_put_upperpath;
++
++	err = -ENOTDIR;
++	if (!S_ISDIR(upperpath.dentry->d_inode->i_mode) ||
++	    !S_ISDIR(lowerpath.dentry->d_inode->i_mode))
++		goto out_put_lowerpath;
++
++	err = vfs_statfs(&lowerpath, &statfs);
++	if (err) {
++		pr_err("overlayfs: statfs failed on lowerpath\n");
++		goto out_put_lowerpath;
++	}
++	ufs->lower_namelen = statfs.f_namelen;
++
++	sb->s_stack_depth = max(upperpath.mnt->mnt_sb->s_stack_depth,
++				lowerpath.mnt->mnt_sb->s_stack_depth) + 1;
++
++	err = -EINVAL;
++	if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		pr_err("overlayfs: maximum fs stacking depth exceeded\n");
++		goto out_put_lowerpath;
++	}
++
++
++	ufs->upper_mnt = clone_private_mount(&upperpath);
++	err = PTR_ERR(ufs->upper_mnt);
++	if (IS_ERR(ufs->upper_mnt)) {
++		pr_err("overlayfs: failed to clone upperpath\n");
++		goto out_put_lowerpath;
++	}
++
++	ufs->lower_mnt = clone_private_mount(&lowerpath);
++	err = PTR_ERR(ufs->lower_mnt);
++	if (IS_ERR(ufs->lower_mnt)) {
++		pr_err("overlayfs: failed to clone lowerpath\n");
++		goto out_put_upper_mnt;
++	}
++
++	/*
++	 * Make lower_mnt R/O.  That way fchmod/fchown on lower file
++	 * will fail instead of modifying lower fs.
++	 */
++	ufs->lower_mnt->mnt_flags |= MNT_READONLY;
++
++	/* If the upper fs is r/o, we mark overlayfs r/o too */
++	if (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY)
++		sb->s_flags |= MS_RDONLY;
++
++	if (!(sb->s_flags & MS_RDONLY)) {
++		err = mnt_want_write(ufs->upper_mnt);
++		if (err)
++			goto out_put_lower_mnt;
++	}
++
++	err = -ENOMEM;
++	root_inode = ovl_new_inode(sb, S_IFDIR, oe);
++	if (!root_inode)
++		goto out_drop_write;
++
++	root_dentry = d_make_root(root_inode);
++	if (!root_dentry)
++		goto out_drop_write;
++
++	mntput(upperpath.mnt);
++	mntput(lowerpath.mnt);
++
++	oe->__upperdentry = dget(upperpath.dentry);
++	oe->lowerdentry = lowerpath.dentry;
++
++	root_dentry->d_fsdata = oe;
++	root_dentry->d_op = &ovl_dentry_operations;
++
++	sb->s_magic = OVERLAYFS_SUPER_MAGIC;
++	sb->s_op = &ovl_super_operations;
++	sb->s_root = root_dentry;
++	sb->s_fs_info = ufs;
++
++	return 0;
++
++out_drop_write:
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++out_put_lower_mnt:
++	mntput(ufs->lower_mnt);
++out_put_upper_mnt:
++	mntput(ufs->upper_mnt);
++out_put_lowerpath:
++	path_put(&lowerpath);
++out_put_upperpath:
++	path_put(&upperpath);
++out_free_oe:
++	kfree(oe);
++out_free_config:
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++out_free_ufs:
++	kfree(ufs);
++out:
++	return err;
++}
++
++static struct dentry *ovl_mount(struct file_system_type *fs_type, int flags,
++				const char *dev_name, void *raw_data)
++{
++	return mount_nodev(fs_type, flags, raw_data, ovl_fill_super);
++}
++
++static struct file_system_type ovl_fs_type = {
++	.owner		= THIS_MODULE,
++	.name		= "overlayfs",
++	.mount		= ovl_mount,
++	.kill_sb	= kill_anon_super,
++};
++MODULE_ALIAS_FS("overlayfs");
++
++static int __init ovl_init(void)
++{
++	return register_filesystem(&ovl_fs_type);
++}
++
++static void __exit ovl_exit(void)
++{
++	unregister_filesystem(&ovl_fs_type);
++}
++
++module_init(ovl_init);
++module_exit(ovl_exit);
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1331,6 +1331,7 @@ long do_splice_direct(struct file *in, l
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_splice_direct);
+ 
+ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
+ 			       struct pipe_inode_info *opipe,
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -244,6 +244,12 @@ struct iattr {
+  */
+ #include <linux/quota.h>
+ 
++/*
++ * Maximum number of layers of fs stack.  Needs to be limited to
++ * prevent kernel stack overflow
++ */
++#define FILESYSTEM_MAX_STACK_DEPTH 2
++
+ /** 
+  * enum positive_aop_returns - aop return codes with specific semantics
+  *
+@@ -1322,6 +1328,11 @@ struct super_block {
+ 
+ 	/* Being remounted read-only */
+ 	int s_readonly_remount;
++
++	/*
++	 * Indicates how deep in a filesystem stack this SB is
++	 */
++	int s_stack_depth;
+ };
+ 
+ /* superblock cache pruning functions */
+@@ -1575,6 +1586,7 @@ struct inode_operations {
+ 	int (*atomic_open)(struct inode *, struct dentry *,
+ 			   struct file *, unsigned open_flag,
+ 			   umode_t create_mode, int *opened);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ } ____cacheline_aligned;
+ 
+ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -2008,6 +2020,7 @@ extern struct file *file_open_name(struc
+ extern struct file *filp_open(const char *, int, umode_t);
+ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
+ 				   const char *, int);
++extern int vfs_open(const struct path *, struct file *, const struct cred *);
+ extern struct file * dentry_open(const struct path *, int, const struct cred *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ 
+@@ -2208,6 +2221,7 @@ extern sector_t bmap(struct inode *, sec
+ #endif
+ extern int notify_change(struct dentry *, struct iattr *);
+ extern int inode_permission(struct inode *, int);
++extern int __inode_permission(struct inode *, int);
+ extern int generic_permission(struct inode *, int);
+ 
+ static inline bool execute_ok(struct inode *inode)
+@@ -2414,6 +2428,9 @@ extern ssize_t generic_file_splice_write
+ 		struct file *, loff_t *, size_t, unsigned int);
+ extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+ 		struct file *out, loff_t *, size_t len, unsigned int flags);
++extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
++		loff_t *opos, size_t len, unsigned int flags);
++
+ 
+ extern void
+ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
+--- a/include/linux/mount.h
++++ b/include/linux/mount.h
+@@ -75,6 +75,9 @@ extern void mnt_pin(struct vfsmount *mnt
+ extern void mnt_unpin(struct vfsmount *mnt);
+ extern int __mnt_is_readonly(struct vfsmount *mnt);
+ 
++struct path;
++extern struct vfsmount *clone_private_mount(struct path *path);
++
+ struct file_system_type;
+ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
+ 				      int flags, const char *name,
diff --git a/trunk/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch b/trunk/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch
new file mode 100644
index 00000000..85b592fe
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch
@@ -0,0 +1,81 @@
+From 1e311820ec3055e3f08e687de6564692a7cec675 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 28 Jan 2013 20:06:29 +0100
+Subject: [PATCH 11/12] USB: EHCI: add ignore_oc flag to disable overcurrent
+ checking
+
+This patch adds an ignore_oc flag which can be set by EHCI controller
+not supporting or wanting to disable overcurrent checking. The EHCI
+platform data in include/linux/usb/ehci_pdriver.h is also augmented to
+take advantage of this new flag.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ drivers/usb/host/ehci-hcd.c      |    2 +-
+ drivers/usb/host/ehci-hub.c      |    4 ++--
+ drivers/usb/host/ehci-platform.c |    1 +
+ drivers/usb/host/ehci.h          |    1 +
+ include/linux/usb/ehci_pdriver.h |    1 +
+ 5 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -634,7 +634,7 @@ static int ehci_run (struct usb_hcd *hcd
+ 		"USB %x.%x started, EHCI %x.%02x%s\n",
+ 		((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
+ 		temp >> 8, temp & 0xff,
+-		ignore_oc ? ", overcurrent ignored" : "");
++		(ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
+ 
+ 	ehci_writel(ehci, INTR_MASK,
+ 		    &ehci->regs->intr_enable); /* Turn On Interrupts */
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -611,7 +611,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+ 	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
+ 	 * PORT_POWER; that's surprising, but maybe within-spec.
+ 	 */
+-	if (!ignore_oc)
++	if (!ignore_oc && !ehci->ignore_oc)
+ 		mask = PORT_CSC | PORT_PEC | PORT_OCC;
+ 	else
+ 		mask = PORT_CSC | PORT_PEC;
+@@ -830,7 +830,7 @@ static int ehci_hub_control (
+ 		if (temp & PORT_PEC)
+ 			status |= USB_PORT_STAT_C_ENABLE << 16;
+ 
+-		if ((temp & PORT_OCC) && !ignore_oc){
++		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
+ 			status |= USB_PORT_STAT_C_OVERCURRENT << 16;
+ 
+ 			/*
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -47,6 +47,7 @@ static int ehci_platform_reset(struct us
+ 	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
+ 	ehci->big_endian_desc = pdata->big_endian_desc;
+ 	ehci->big_endian_mmio = pdata->big_endian_mmio;
++	ehci->ignore_oc = pdata->ignore_oc;
+ 
+ 	ehci->caps = hcd->regs + pdata->caps_offset;
+ 	retval = ehci_setup(hcd);
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -201,6 +201,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
+ 	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */
+ 	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */
++	unsigned		ignore_oc:1;
+ 
+ 	/* required for usb32 quirk */
+ 	#define OHCI_CTRL_HCFS          (3 << 6)
+--- a/include/linux/usb/ehci_pdriver.h
++++ b/include/linux/usb/ehci_pdriver.h
+@@ -42,6 +42,7 @@ struct usb_ehci_pdata {
+ 	unsigned	big_endian_desc:1;
+ 	unsigned	big_endian_mmio:1;
+ 	unsigned	no_io_watchdog:1;
++	unsigned	ignore_oc:1;
+ 
+ 	/* Turn on all power and clocks */
+ 	int (*power_on)(struct platform_device *pdev);
diff --git a/trunk/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch b/trunk/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
new file mode 100644
index 00000000..7fe4bfd4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/120-bridge_allow_receiption_on_disabled_port.patch
@@ -0,0 +1,54 @@
+From: Stephen Hemminger <stephen@networkplumber.org>
+Subject: bridge: allow receiption on disabled port
+
+When an ethernet device is enslaved to a bridge, and the bridge STP
+detects loss of carrier (or operational state down), then normally
+packet receiption is blocked.
+
+This breaks control applications like WPA which maybe expecting to
+receive packets to negotiate to bring link up. The bridge needs to
+block forwarding packets from these disabled ports, but there is no
+hard requirement to not allow local packet delivery.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -140,10 +140,14 @@ drop:
+ static int br_handle_local_finish(struct sk_buff *skb)
+ {
+ 	struct net_bridge_port *p = br_port_get_rcu(skb->dev);
+-	u16 vid = 0;
+ 
+-	br_vlan_get_tag(skb, &vid);
+-	br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);
++	if (p->state != BR_STATE_DISABLED) {
++		u16 vid = 0;
++
++		br_vlan_get_tag(skb, &vid);
++		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);
++	}
++
+ 	return 0;	 /* process further */
+ }
+ 
+@@ -213,6 +217,18 @@ rx_handler_result_t br_handle_frame(stru
+ 
+ forward:
+ 	switch (p->state) {
++	case BR_STATE_DISABLED:
++		if (ether_addr_equal(p->br->dev->dev_addr, dest))
++			skb->pkt_type = PACKET_HOST;
++
++		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++			br_handle_local_finish))
++			break;
++
++		BR_INPUT_SKB_CB(skb)->brdev = p->br->dev;
++		br_pass_frame_up(skb);
++		break;
++
+ 	case BR_STATE_FORWARDING:
+ 		rhook = rcu_dereference(br_should_route_hook);
+ 		if (rhook) {
diff --git a/trunk/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch b/trunk/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch
new file mode 100644
index 00000000..1dec364f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch
@@ -0,0 +1,184 @@
+From 151c4e4a06b0b8d16c2fd392bb0e33868b12357f Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 12 Aug 2013 12:45:52 +0200
+Subject: [PATCH] MIPS: remove unnecessary platform dma helper functions
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h | 12 ------------
+ arch/mips/include/asm/mach-generic/dma-coherence.h       | 10 ----------
+ arch/mips/include/asm/mach-ip27/dma-coherence.h          | 10 ----------
+ arch/mips/include/asm/mach-ip32/dma-coherence.h          | 11 -----------
+ arch/mips/include/asm/mach-jazz/dma-coherence.h          | 10 ----------
+ arch/mips/include/asm/mach-loongson/dma-coherence.h      | 10 ----------
+ arch/mips/include/asm/mach-powertv/dma-coherence.h       | 10 ----------
+ arch/mips/mm/dma-default.c                               |  4 +---
+ 8 files changed, 1 insertion(+), 76 deletions(-)
+
+--- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
++++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
+@@ -46,22 +46,11 @@ static inline int plat_dma_supported(str
+ 	BUG();
+ }
+ 
+-static inline void plat_extra_sync_for_device(struct device *dev)
+-{
+-	BUG();
+-}
+-
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+ 	return 1;
+ }
+ 
+-static inline int plat_dma_mapping_error(struct device *dev,
+-					 dma_addr_t dma_addr)
+-{
+-	BUG();
+-}
+-
+ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
+ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
+ 
+--- a/arch/mips/include/asm/mach-generic/dma-coherence.h
++++ b/arch/mips/include/asm/mach-generic/dma-coherence.h
+@@ -47,16 +47,6 @@ static inline int plat_dma_supported(str
+ 	return 1;
+ }
+ 
+-static inline void plat_extra_sync_for_device(struct device *dev)
+-{
+-}
+-
+-static inline int plat_dma_mapping_error(struct device *dev,
+-					 dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+ #ifdef CONFIG_DMA_COHERENT
+--- a/arch/mips/include/asm/mach-ip27/dma-coherence.h
++++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h
+@@ -58,16 +58,6 @@ static inline int plat_dma_supported(str
+ 	return 1;
+ }
+ 
+-static inline void plat_extra_sync_for_device(struct device *dev)
+-{
+-}
+-
+-static inline int plat_dma_mapping_error(struct device *dev,
+-					 dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+ 	return 1;		/* IP27 non-cohernet mode is unsupported */
+--- a/arch/mips/include/asm/mach-ip32/dma-coherence.h
++++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h
+@@ -80,17 +80,6 @@ static inline int plat_dma_supported(str
+ 	return 1;
+ }
+ 
+-static inline void plat_extra_sync_for_device(struct device *dev)
+-{
+-	return;
+-}
+-
+-static inline int plat_dma_mapping_error(struct device *dev,
+-					 dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+ 	return 0;		/* IP32 is non-cohernet */
+--- a/arch/mips/include/asm/mach-jazz/dma-coherence.h
++++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h
+@@ -48,16 +48,6 @@ static inline int plat_dma_supported(str
+ 	return 1;
+ }
+ 
+-static inline void plat_extra_sync_for_device(struct device *dev)
+-{
+-}
+-
+-static inline int plat_dma_mapping_error(struct device *dev,
+-					 dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+ 	return 0;
+--- a/arch/mips/include/asm/mach-loongson/dma-coherence.h
++++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h
+@@ -53,16 +53,6 @@ static inline int plat_dma_supported(str
+ 	return 1;
+ }
+ 
+-static inline void plat_extra_sync_for_device(struct device *dev)
+-{
+-}
+-
+-static inline int plat_dma_mapping_error(struct device *dev,
+-					 dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+ 	return 0;
+--- a/arch/mips/include/asm/mach-powertv/dma-coherence.h
++++ b/arch/mips/include/asm/mach-powertv/dma-coherence.h
+@@ -99,16 +99,6 @@ static inline int plat_dma_supported(str
+ 	return 1;
+ }
+ 
+-static inline void plat_extra_sync_for_device(struct device *dev)
+-{
+-}
+-
+-static inline int plat_dma_mapping_error(struct device *dev,
+-					 dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+ 	return 0;
+--- a/arch/mips/mm/dma-default.c
++++ b/arch/mips/mm/dma-default.c
+@@ -293,7 +293,6 @@ static void mips_dma_sync_single_for_cpu
+ static void mips_dma_sync_single_for_device(struct device *dev,
+ 	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+ {
+-	plat_extra_sync_for_device(dev);
+ 	if (!plat_device_is_coherent(dev))
+ 		__dma_sync(dma_addr_to_page(dev, dma_handle),
+ 			   dma_handle & ~PAGE_MASK, size, direction);
+@@ -327,7 +326,7 @@ static void mips_dma_sync_sg_for_device(
+ 
+ int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+ {
+-	return plat_dma_mapping_error(dev, dma_addr);
++	return 0;
+ }
+ 
+ int mips_dma_supported(struct device *dev, u64 mask)
+@@ -340,7 +339,6 @@ void dma_cache_sync(struct device *dev, 
+ {
+ 	BUG_ON(direction == DMA_NONE);
+ 
+-	plat_extra_sync_for_device(dev);
+ 	if (!plat_device_is_coherent(dev))
+ 		__dma_sync_virtual(vaddr, size, direction);
+ }
diff --git a/trunk/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch b/trunk/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
new file mode 100644
index 00000000..a20d3d96
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
@@ -0,0 +1,91 @@
+From d593f8fc627f8cdaee9c14e4d22b0770a09baaf1 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Thu, 15 Aug 2013 10:47:47 +0200
+Subject: [PATCH] MIPS: improve checks for noncoherent DMA
+
+Only one MIPS development board actually supports enabling/disabling DMA
+coherency at runtime, so it's not a good idea to push the overhead of
+checking that configuration setting onto every other supported target as
+well.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/Kconfig                                  | 6 +++++-
+ arch/mips/include/asm/dma-coherence.h              | 7 +++++++
+ arch/mips/include/asm/mach-generic/dma-coherence.h | 4 ----
+ arch/mips/mm/dma-default.c                         | 2 ++
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -297,7 +297,7 @@ config MIPS_MALTA
+ 	select CEVT_R4K
+ 	select CSRC_R4K
+ 	select CSRC_GIC
+-	select DMA_NONCOHERENT
++	select DMA_MAYBE_COHERENT
+ 	select GENERIC_ISA_DMA
+ 	select HAVE_PCSPKR_PLATFORM
+ 	select IRQ_CPU
+@@ -948,6 +948,10 @@ config FW_CFE
+ config ARCH_DMA_ADDR_T_64BIT
+ 	def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
+ 
++config DMA_MAYBE_COHERENT
++	select DMA_NONCOHERENT
++	bool
++
+ config DMA_COHERENT
+ 	bool
+ 
+--- a/arch/mips/include/asm/dma-coherence.h
++++ b/arch/mips/include/asm/dma-coherence.h
+@@ -9,7 +9,16 @@
+ #ifndef __ASM_DMA_COHERENCE_H
+ #define __ASM_DMA_COHERENCE_H
+ 
++#ifdef CONFIG_DMA_MAYBE_COHERENT
+ extern int coherentio;
+ extern int hw_coherentio;
++#else
++#ifdef CONFIG_DMA_COHERENT
++#define coherentio	1
++#else
++#define coherentio	0
++#endif
++#define hw_coherentio	0
++#endif /* CONFIG_DMA_MAYBE_COHERENT */
+ 
+ #endif
+--- a/arch/mips/include/asm/mach-generic/dma-coherence.h
++++ b/arch/mips/include/asm/mach-generic/dma-coherence.h
+@@ -49,11 +49,7 @@ static inline int plat_dma_supported(str
+ 
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+-#ifdef CONFIG_DMA_COHERENT
+-	return 1;
+-#else
+ 	return coherentio;
+-#endif
+ }
+ 
+ #endif /* __ASM_MACH_GENERIC_DMA_COHERENCE_H */
+--- a/arch/mips/mm/dma-default.c
++++ b/arch/mips/mm/dma-default.c
+@@ -22,6 +22,7 @@
+ 
+ #include <dma-coherence.h>
+ 
++#ifdef CONFIG_DMA_MAYBE_COHERENT
+ int coherentio = 0;	/* User defined DMA coherency from command line. */
+ EXPORT_SYMBOL_GPL(coherentio);
+ int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */
+@@ -41,6 +42,7 @@ static int __init setnocoherentio(char *
+ 	return 0;
+ }
+ early_param("nocoherentio", setnocoherentio);
++#endif
+ 
+ static inline struct page *dma_addr_to_page(struct device *dev,
+ 	dma_addr_t dma_addr)
diff --git a/trunk/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch b/trunk/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch
new file mode 100644
index 00000000..01db5193
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch
@@ -0,0 +1,662 @@
+From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 12 Aug 2013 12:50:22 +0200
+Subject: [PATCH] MIPS: partially inline dma ops
+
+Several DMA ops are no-op on many platforms, and the indirection through
+the mips_dma_map_ops function table is causing the compiler to emit
+unnecessary code.
+
+Inlining visibly improves network performance in my tests (on a 24Kc
+based system), and also slightly reduces code size of a few drivers.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/Kconfig                   |   4 +
+ arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
+ arch/mips/mm/dma-default.c          | 163 ++--------------
+ 3 files changed, 373 insertions(+), 154 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -1431,6 +1431,7 @@ config CPU_CAVIUM_OCTEON
+ 	select LIBFDT
+ 	select USE_OF
+ 	select USB_EHCI_BIG_ENDIAN_MMIO
++	select SYS_HAS_DMA_OPS
+ 	help
+ 	  The Cavium Octeon processor is a highly integrated chip containing
+ 	  many ethernet hardware widgets for networking tasks. The processor
+@@ -1651,6 +1652,9 @@ config SYS_HAS_CPU_XLR
+ config SYS_HAS_CPU_XLP
+ 	bool
+ 
++config SYS_HAS_DMA_OPS
++	bool
++
+ #
+ # CPU may reorder R->R, R->W, W->R, W->W
+ # Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
+--- a/arch/mips/include/asm/dma-mapping.h
++++ b/arch/mips/include/asm/dma-mapping.h
+@@ -1,6 +1,12 @@
+ #ifndef _ASM_DMA_MAPPING_H
+ #define _ASM_DMA_MAPPING_H
+ 
++#include <linux/kmemcheck.h>
++#include <linux/bug.h>
++#include <linux/scatterlist.h>
++#include <linux/dma-debug.h>
++#include <linux/dma-attrs.h>
++
+ #include <asm/scatterlist.h>
+ #include <asm/dma-coherence.h>
+ #include <asm/cache.h>
+@@ -12,12 +18,47 @@
+ 
+ extern struct dma_map_ops *mips_dma_map_ops;
+ 
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction);
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs);
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs);
++
+ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
++#ifdef CONFIG_SYS_HAS_DMA_OPS
+ 	if (dev && dev->archdata.dma_ops)
+ 		return dev->archdata.dma_ops;
+ 	else
+ 		return mips_dma_map_ops;
++#else
++	return NULL;
++#endif
++}
++
++/*
++ * Warning on the terminology - Linux calls an uncached area coherent;
++ * MIPS terminology calls memory areas with hardware maintained coherency
++ * coherent.
++ */
++
++static inline int cpu_is_noncoherent_r10000(struct device *dev)
++{
++#ifndef CONFIG_SYS_HAS_CPU_R10000
++	return 0;
++#endif
++	return !plat_device_is_coherent(dev) &&
++	       (current_cpu_type() == CPU_R10000 ||
++	       current_cpu_type() == CPU_R12000);
++}
++
++static inline struct page *dma_addr_to_page(struct device *dev,
++	dma_addr_t dma_addr)
++{
++	return pfn_to_page(
++		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+ }
+ 
+ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
+@@ -30,12 +71,309 @@ static inline bool dma_capable(struct de
+ 
+ static inline void dma_mark_clean(void *addr, size_t size) {}
+ 
+-#include <asm-generic/dma-mapping-common.h>
++static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
++					      size_t size,
++					      enum dma_data_direction dir,
++					      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	unsigned long offset = (unsigned long)ptr & ~PAGE_MASK;
++	struct page *page = virt_to_page(ptr);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(ptr, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, attrs);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, true);
++	return addr;
++}
++
++static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
++					  size_t size,
++					  enum dma_data_direction dir,
++					  struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, attrs);
++	} else {
++		if (cpu_is_noncoherent_r10000(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, true);
++}
++
++static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
++				   int nents, enum dma_data_direction dir,
++				   struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	int i, ents;
++	struct scatterlist *s;
++
++	for_each_sg(sg, s, nents, i)
++		kmemcheck_mark_initialized(sg_virt(s), s->length);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ents = ops->map_sg(dev, sg, nents, dir, attrs);
++	} else {
++		for_each_sg(sg, s, nents, i) {
++			struct page *page = sg_page(s);
++
++			if (!plat_device_is_coherent(dev))
++				__dma_sync(page, s->offset, s->length, dir);
++			s->dma_address =
++				plat_map_dma_mem_page(dev, page) + s->offset;
++		}
++		ents = nents;
++	}
++	debug_dma_map_sg(dev, sg, nents, ents, dir);
++
++	return ents;
++}
++
++static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,
++				      int nents, enum dma_data_direction dir,
++				      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	debug_dma_unmap_sg(dev, sg, nents, dir);
++	if (ops) {
++		ops->unmap_sg(dev, sg, nents, dir, attrs);
++		return;
++	}
++
++	for_each_sg(sg, s, nents, i) {
++		if (!plat_device_is_coherent(dev) && dir != DMA_TO_DEVICE)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++		plat_unmap_dma_mem(dev, s->dma_address, s->length, dir);
++	}
++}
++
++static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
++				      size_t offset, size_t size,
++				      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(page_address(page) + offset, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, NULL);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, false);
++
++	return addr;
++}
++
++static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
++				  size_t size, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, NULL);
++	} else {
++		if (cpu_is_noncoherent_r10000(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, false);
++}
++
++static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
++					   size_t size,
++					   enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr, size, dir);
++	else if (cpu_is_noncoherent_r10000(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_cpu(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_for_device(struct device *dev,
++					      dma_addr_t addr, size_t size,
++					      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_device(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_range_for_cpu(struct device *dev,
++						 dma_addr_t addr,
++						 unsigned long offset,
++						 size_t size,
++						 enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr + offset, size, dir);
++	else if (cpu_is_noncoherent_r10000(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir);
++}
++
++static inline void dma_sync_single_range_for_device(struct device *dev,
++						    dma_addr_t addr,
++						    unsigned long offset,
++						    size_t size,
++						    enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr + offset, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir);
++}
++
++static inline void
++dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
++		    int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_cpu(dev, sg, nelems, dir);
++	else if (cpu_is_noncoherent_r10000(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_cpu(dev, sg, nelems, dir);
++}
++
++static inline void
++dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
++		       int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_device(dev, sg, nelems, dir);
++	else if (!plat_device_is_coherent(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_device(dev, sg, nelems, dir);
++
++}
++
++#define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)
++#define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
++#define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL)
++#define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, NULL)
++
++extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
++			   void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++/**
++ * dma_mmap_attrs - map a coherent DMA allocation into user space
++ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
++ * @vma: vm_area_struct describing requested user mapping
++ * @cpu_addr: kernel CPU-view address returned from dma_alloc_attrs
++ * @handle: device-view address returned from dma_alloc_attrs
++ * @size: size of memory originally requested in dma_alloc_attrs
++ * @attrs: attributes of mapping properties requested in dma_alloc_attrs
++ *
++ * Map a coherent DMA buffer previously allocated by dma_alloc_attrs
++ * into user space.  The coherent DMA buffer must not be freed by the
++ * driver until the user space mapping has been released.
++ */
++static inline int
++dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, void *cpu_addr,
++	       dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->mmap)
++		return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
++	return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size);
++}
++
++#define dma_mmap_coherent(d, v, c, h, s) dma_mmap_attrs(d, v, c, h, s, NULL)
++
++static inline int dma_mmap_writecombine(struct device *dev, struct vm_area_struct *vma,
++		      void *cpu_addr, dma_addr_t dma_addr, size_t size)
++{
++	DEFINE_DMA_ATTRS(attrs);
++	dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
++	return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, &attrs);
++}
++
++int
++dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
++		       void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++static inline int
++dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
++		      dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->get_sgtable)
++		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
++					attrs);
++	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
++}
++
++#define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, NULL)
++
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+-	return ops->dma_supported(dev, mask);
++	if (ops)
++		return ops->dma_supported(dev, mask);
++	return plat_dma_supported(dev, mask);
+ }
+ 
+ static inline int dma_mapping_error(struct device *dev, u64 mask)
+@@ -43,7 +381,9 @@ static inline int dma_mapping_error(stru
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	debug_dma_mapping_error(dev, mask);
+-	return ops->mapping_error(dev, mask);
++	if (ops)
++		return ops->mapping_error(dev, mask);
++	return 0;
+ }
+ 
+ static inline int
+@@ -69,7 +409,11 @@ static inline void *dma_alloc_attrs(stru
+ 	void *ret;
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	if (ops)
++		ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	else
++		ret = mips_dma_alloc_coherent(dev, size, dma_handle, gfp,
++					      attrs);
+ 
+ 	debug_dma_alloc_coherent(dev, size, *dma_handle, ret);
+ 
+@@ -84,7 +428,10 @@ static inline void dma_free_attrs(struct
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ops->free(dev, size, vaddr, dma_handle, attrs);
++	if (ops)
++		ops->free(dev, size, vaddr, dma_handle, attrs);
++	else
++		mips_dma_free_coherent(dev, size, vaddr, dma_handle, attrs);
+ 
+ 	debug_dma_free_coherent(dev, size, vaddr, dma_handle);
+ }
+--- a/arch/mips/mm/dma-default.c
++++ b/arch/mips/mm/dma-default.c
+@@ -24,7 +24,7 @@
+ 
+ #ifdef CONFIG_DMA_MAYBE_COHERENT
+ int coherentio = 0;	/* User defined DMA coherency from command line. */
+-EXPORT_SYMBOL_GPL(coherentio);
++EXPORT_SYMBOL(coherentio);
+ int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */
+ 
+ static int __init setcoherentio(char *str)
+@@ -44,13 +44,6 @@ static int __init setnocoherentio(char *
+ early_param("nocoherentio", setnocoherentio);
+ #endif
+ 
+-static inline struct page *dma_addr_to_page(struct device *dev,
+-	dma_addr_t dma_addr)
+-{
+-	return pfn_to_page(
+-		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+-}
+-
+ /*
+  * The affected CPUs below in 'cpu_needs_post_dma_flush()' can
+  * speculatively fill random cachelines with stale data at any time,
+@@ -123,8 +116,9 @@ void *dma_alloc_noncoherent(struct devic
+ }
+ EXPORT_SYMBOL(dma_alloc_noncoherent);
+ 
+-static void *mips_dma_alloc_coherent(struct device *dev, size_t size,
+-	dma_addr_t * dma_handle, gfp_t gfp, struct dma_attrs *attrs)
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs)
+ {
+ 	void *ret;
+ 
+@@ -148,6 +142,7 @@ static void *mips_dma_alloc_coherent(str
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(mips_dma_alloc_coherent);
+ 
+ 
+ void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
+@@ -158,8 +153,8 @@ void dma_free_noncoherent(struct device 
+ }
+ EXPORT_SYMBOL(dma_free_noncoherent);
+ 
+-static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
+-	dma_addr_t dma_handle, struct dma_attrs *attrs)
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs)
+ {
+ 	unsigned long addr = (unsigned long) vaddr;
+ 	int order = get_order(size);
+@@ -174,6 +169,7 @@ static void mips_dma_free_coherent(struc
+ 
+ 	free_pages(addr, get_order(size));
+ }
++EXPORT_SYMBOL(mips_dma_free_coherent);
+ 
+ static inline void __dma_sync_virtual(void *addr, size_t size,
+ 	enum dma_data_direction direction)
+@@ -202,8 +198,8 @@ static inline void __dma_sync_virtual(vo
+  * If highmem is not configured then the bulk of this loop gets
+  * optimized out.
+  */
+-static inline void __dma_sync(struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction)
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction)
+ {
+ 	size_t left = size;
+ 
+@@ -233,108 +229,7 @@ static inline void __dma_sync(struct pag
+ 	} while (left);
+ }
+ 
+-static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
+-	size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_addr),
+-			   dma_addr & ~PAGE_MASK, size, direction);
+-
+-	plat_unmap_dma_mem(dev, dma_addr, size, direction);
+-}
+-
+-static int mips_dma_map_sg(struct device *dev, struct scatterlist *sg,
+-	int nents, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nents; i++, sg++) {
+-		if (!plat_device_is_coherent(dev))
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-		sg->dma_address = plat_map_dma_mem_page(dev, sg_page(sg)) +
+-				  sg->offset;
+-	}
+-
+-	return nents;
+-}
+-
+-static dma_addr_t mips_dma_map_page(struct device *dev, struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(page, offset, size, direction);
+-
+-	return plat_map_dma_mem_page(dev, page) + offset;
+-}
+-
+-static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
+-	int nhwentries, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nhwentries; i++, sg++) {
+-		if (!plat_device_is_coherent(dev) &&
+-		    direction != DMA_TO_DEVICE)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-		plat_unmap_dma_mem(dev, sg->dma_address, sg->length, direction);
+-	}
+-}
+-
+-static void mips_dma_sync_single_for_cpu(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_single_for_device(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_sg_for_cpu(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	/* Make sure that gcc doesn't leave the empty loop body.  */
+-	for (i = 0; i < nelems; i++, sg++) {
+-		if (cpu_needs_post_dma_flush(dev))
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-	}
+-}
+-
+-static void mips_dma_sync_sg_for_device(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	/* Make sure that gcc doesn't leave the empty loop body.  */
+-	for (i = 0; i < nelems; i++, sg++) {
+-		if (!plat_device_is_coherent(dev))
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-	}
+-}
+-
+-int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+-int mips_dma_supported(struct device *dev, u64 mask)
+-{
+-	return plat_dma_supported(dev, mask);
+-}
++EXPORT_SYMBOL(__dma_sync);
+ 
+ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+ 			 enum dma_data_direction direction)
+@@ -347,23 +242,10 @@ void dma_cache_sync(struct device *dev, 
+ 
+ EXPORT_SYMBOL(dma_cache_sync);
+ 
+-static struct dma_map_ops mips_default_dma_map_ops = {
+-	.alloc = mips_dma_alloc_coherent,
+-	.free = mips_dma_free_coherent,
+-	.map_page = mips_dma_map_page,
+-	.unmap_page = mips_dma_unmap_page,
+-	.map_sg = mips_dma_map_sg,
+-	.unmap_sg = mips_dma_unmap_sg,
+-	.sync_single_for_cpu = mips_dma_sync_single_for_cpu,
+-	.sync_single_for_device = mips_dma_sync_single_for_device,
+-	.sync_sg_for_cpu = mips_dma_sync_sg_for_cpu,
+-	.sync_sg_for_device = mips_dma_sync_sg_for_device,
+-	.mapping_error = mips_dma_mapping_error,
+-	.dma_supported = mips_dma_supported
+-};
+-
+-struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
++#ifdef CONFIG_SYS_HAS_DMA_OPS
++struct dma_map_ops *mips_dma_map_ops = NULL;
+ EXPORT_SYMBOL(mips_dma_map_ops);
++#endif
+ 
+ #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch b/trunk/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
new file mode 100644
index 00000000..382a6bdd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
@@ -0,0 +1,206 @@
+commit 032f44791457d9aa50c6a194a2d475f07e311afd
+Author: Felix Fietkau <nbd@openwrt.org>
+Date:   Wed Jul 9 12:08:23 2014 +0200
+
+    Revert "USB: unbind all interfaces before rebinding any"
+    
+    This reverts commit 59f0103d74e4a32cbaa054d5011ea287fcfb83e4.
+    The commit has been found to cause USB regressions on AR933x and
+    BCM4705.
+
+--- a/drivers/usb/core/driver.c
++++ b/drivers/usb/core/driver.c
+@@ -953,7 +953,8 @@ EXPORT_SYMBOL_GPL(usb_deregister);
+  * it doesn't support pre_reset/post_reset/reset_resume or
+  * because it doesn't support suspend/resume.
+  *
+- * The caller must hold @intf's device's lock, but not @intf's lock.
++ * The caller must hold @intf's device's lock, but not its pm_mutex
++ * and not @intf->dev.sem.
+  */
+ void usb_forced_unbind_intf(struct usb_interface *intf)
+ {
+@@ -966,37 +967,16 @@ void usb_forced_unbind_intf(struct usb_i
+ 	intf->needs_binding = 1;
+ }
+ 
+-/*
+- * Unbind drivers for @udev's marked interfaces.  These interfaces have
+- * the needs_binding flag set, for example by usb_resume_interface().
+- *
+- * The caller must hold @udev's device lock.
+- */
+-static void unbind_marked_interfaces(struct usb_device *udev)
+-{
+-	struct usb_host_config	*config;
+-	int			i;
+-	struct usb_interface	*intf;
+-
+-	config = udev->actconfig;
+-	if (config) {
+-		for (i = 0; i < config->desc.bNumInterfaces; ++i) {
+-			intf = config->interface[i];
+-			if (intf->dev.driver && intf->needs_binding)
+-				usb_forced_unbind_intf(intf);
+-		}
+-	}
+-}
+-
+ /* Delayed forced unbinding of a USB interface driver and scan
+  * for rebinding.
+  *
+- * The caller must hold @intf's device's lock, but not @intf's lock.
++ * The caller must hold @intf's device's lock, but not its pm_mutex
++ * and not @intf->dev.sem.
+  *
+  * Note: Rebinds will be skipped if a system sleep transition is in
+  * progress and the PM "complete" callback hasn't occurred yet.
+  */
+-static void usb_rebind_intf(struct usb_interface *intf)
++void usb_rebind_intf(struct usb_interface *intf)
+ {
+ 	int rc;
+ 
+@@ -1013,66 +993,68 @@ static void usb_rebind_intf(struct usb_i
+ 	}
+ }
+ 
+-/*
+- * Rebind drivers to @udev's marked interfaces.  These interfaces have
+- * the needs_binding flag set.
++#ifdef CONFIG_PM
++
++/* Unbind drivers for @udev's interfaces that don't support suspend/resume
++ * There is no check for reset_resume here because it can be determined
++ * only during resume whether reset_resume is needed.
+  *
+  * The caller must hold @udev's device lock.
+  */
+-static void rebind_marked_interfaces(struct usb_device *udev)
++static void unbind_no_pm_drivers_interfaces(struct usb_device *udev)
+ {
+ 	struct usb_host_config	*config;
+ 	int			i;
+ 	struct usb_interface	*intf;
++	struct usb_driver	*drv;
+ 
+ 	config = udev->actconfig;
+ 	if (config) {
+ 		for (i = 0; i < config->desc.bNumInterfaces; ++i) {
+ 			intf = config->interface[i];
+-			if (intf->needs_binding)
+-				usb_rebind_intf(intf);
++
++			if (intf->dev.driver) {
++				drv = to_usb_driver(intf->dev.driver);
++				if (!drv->suspend || !drv->resume)
++					usb_forced_unbind_intf(intf);
++			}
+ 		}
+ 	}
+ }
+ 
+-/*
+- * Unbind all of @udev's marked interfaces and then rebind all of them.
+- * This ordering is necessary because some drivers claim several interfaces
+- * when they are first probed.
++/* Unbind drivers for @udev's interfaces that failed to support reset-resume.
++ * These interfaces have the needs_binding flag set by usb_resume_interface().
+  *
+  * The caller must hold @udev's device lock.
+  */
+-void usb_unbind_and_rebind_marked_interfaces(struct usb_device *udev)
++static void unbind_no_reset_resume_drivers_interfaces(struct usb_device *udev)
+ {
+-	unbind_marked_interfaces(udev);
+-	rebind_marked_interfaces(udev);
+-}
++	struct usb_host_config	*config;
++	int			i;
++	struct usb_interface	*intf;
+ 
+-#ifdef CONFIG_PM
++	config = udev->actconfig;
++	if (config) {
++		for (i = 0; i < config->desc.bNumInterfaces; ++i) {
++			intf = config->interface[i];
++			if (intf->dev.driver && intf->needs_binding)
++				usb_forced_unbind_intf(intf);
++		}
++	}
++}
+ 
+-/* Unbind drivers for @udev's interfaces that don't support suspend/resume
+- * There is no check for reset_resume here because it can be determined
+- * only during resume whether reset_resume is needed.
+- *
+- * The caller must hold @udev's device lock.
+- */
+-static void unbind_no_pm_drivers_interfaces(struct usb_device *udev)
++static void do_rebind_interfaces(struct usb_device *udev)
+ {
+ 	struct usb_host_config	*config;
+ 	int			i;
+ 	struct usb_interface	*intf;
+-	struct usb_driver	*drv;
+ 
+ 	config = udev->actconfig;
+ 	if (config) {
+ 		for (i = 0; i < config->desc.bNumInterfaces; ++i) {
+ 			intf = config->interface[i];
+-
+-			if (intf->dev.driver) {
+-				drv = to_usb_driver(intf->dev.driver);
+-				if (!drv->suspend || !drv->resume)
+-					usb_forced_unbind_intf(intf);
+-			}
++			if (intf->needs_binding)
++				usb_rebind_intf(intf);
+ 		}
+ 	}
+ }
+@@ -1397,7 +1379,7 @@ int usb_resume_complete(struct device *d
+ 	 * whose needs_binding flag is set
+ 	 */
+ 	if (udev->state != USB_STATE_NOTATTACHED)
+-		rebind_marked_interfaces(udev);
++		do_rebind_interfaces(udev);
+ 	return 0;
+ }
+ 
+@@ -1419,7 +1401,7 @@ int usb_resume(struct device *dev, pm_me
+ 		pm_runtime_disable(dev);
+ 		pm_runtime_set_active(dev);
+ 		pm_runtime_enable(dev);
+-		unbind_marked_interfaces(udev);
++		unbind_no_reset_resume_drivers_interfaces(udev);
+ 	}
+ 
+ 	/* Avoid PM error messages for devices disconnected while suspended
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -5334,11 +5334,10 @@ int usb_reset_device(struct usb_device *
+ 				else if (cintf->condition ==
+ 						USB_INTERFACE_BOUND)
+ 					rebind = 1;
+-				if (rebind)
+-					cintf->needs_binding = 1;
+ 			}
++			if (ret == 0 && rebind)
++				usb_rebind_intf(cintf);
+ 		}
+-		usb_unbind_and_rebind_marked_interfaces(udev);
+ 	}
+ 
+ 	usb_autosuspend_device(udev);
+--- a/drivers/usb/core/usb.h
++++ b/drivers/usb/core/usb.h
+@@ -55,7 +55,7 @@ extern int usb_match_one_id_intf(struct 
+ extern int usb_match_device(struct usb_device *dev,
+ 			    const struct usb_device_id *id);
+ extern void usb_forced_unbind_intf(struct usb_interface *intf);
+-extern void usb_unbind_and_rebind_marked_interfaces(struct usb_device *udev);
++extern void usb_rebind_intf(struct usb_interface *intf);
+ 
+ extern int usb_hub_claim_port(struct usb_device *hdev, unsigned port,
+ 		struct dev_state *owner);
diff --git a/trunk/target/linux/generic/patches-3.10/200-fix_localversion.patch b/trunk/target/linux/generic/patches-3.10/200-fix_localversion.patch
new file mode 100644
index 00000000..6c16dd1b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- a/scripts/setlocalversion
++++ b/scripts/setlocalversion
+@@ -167,7 +167,7 @@ else
+ 	# annotated or signed tagged state (as git describe only
+ 	# looks at signed or annotated tags - git tag -a/-s) and
+ 	# LOCALVERSION= is not specified
+-	if test "${LOCALVERSION+set}" != "set"; then
++	if test "${CONFIG_LOCALVERSION+set}" != "set"; then
+ 		scm=$(scm_version --short)
+ 		res="$res${scm:++}"
+ 	fi
diff --git a/trunk/target/linux/generic/patches-3.10/201-extra_optimization.patch b/trunk/target/linux/generic/patches-3.10/201-extra_optimization.patch
new file mode 100644
index 00000000..ccb7fcfb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/201-extra_optimization.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -571,9 +571,9 @@ endif # $(dot-config)
+ all: vmlinux
+ 
+ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+-KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)
++KBUILD_CFLAGS	+= -Os $(EXTRA_OPTIMIZATION) $(call cc-disable-warning,maybe-uninitialized,)
+ else
+-KBUILD_CFLAGS	+= -O2
++KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
+ endif
+ 
+ include $(srctree)/arch/$(SRCARCH)/Makefile
diff --git a/trunk/target/linux/generic/patches-3.10/202-reduce_module_size.patch b/trunk/target/linux/generic/patches-3.10/202-reduce_module_size.patch
new file mode 100644
index 00000000..dee60198
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/202-reduce_module_size.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -379,7 +379,7 @@ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+ KBUILD_AFLAGS_MODULE  := -DMODULE
+ KBUILD_CFLAGS_MODULE  := -DMODULE
+-KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
++KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s)
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/trunk/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch b/trunk/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch
new file mode 100644
index 00000000..42f3fa22
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/203-kallsyms_uncompressed.patch
@@ -0,0 +1,108 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -54,6 +54,7 @@ static struct text_range text_ranges[] =
+ static struct sym_entry *table;
+ static unsigned int table_size, table_cnt;
+ static int all_symbols = 0;
++static int uncompressed = 0;
+ static char symbol_prefix_char = '\0';
+ static unsigned long long kernel_start_addr = 0;
+ 
+@@ -367,6 +368,9 @@ static void write_src(void)
+ 
+ 	free(markers);
+ 
++	if (uncompressed)
++		return;
++
+ 	output_label("kallsyms_token_table");
+ 	off = 0;
+ 	for (i = 0; i < 256; i++) {
+@@ -425,6 +429,9 @@ static void *find_token(unsigned char *s
+ {
+ 	int i;
+ 
++	if (uncompressed)
++		return NULL;
++
+ 	for (i = 0; i < len - 1; i++) {
+ 		if (str[i] == token[0] && str[i+1] == token[1])
+ 			return &str[i];
+@@ -497,6 +504,9 @@ static void optimize_result(void)
+ {
+ 	int i, best;
+ 
++	if (uncompressed)
++		return;
++
+ 	/* using the '\0' symbol last allows compress_symbols to use standard
+ 	 * fast string functions */
+ 	for (i = 255; i >= 0; i--) {
+@@ -656,7 +666,9 @@ int main(int argc, char **argv)
+ 			} else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+ 				const char *p = &argv[i][14];
+ 				kernel_start_addr = strtoull(p, NULL, 16);
+-			} else
++			} else if (strcmp(argv[i], "--uncompressed") == 0)
++				uncompressed = 1;
++			else
+ 				usage();
+ 		}
+ 	} else if (argc != 1)
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1245,6 +1245,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+ 	  the unaligned access emulation.
+ 	  see arch/parisc/kernel/unaligned.c for reference
+ 
++config KALLSYMS_UNCOMPRESSED
++	bool "Keep kallsyms uncompressed"
++	depends on KALLSYMS
++	help
++		Normally kallsyms contains compressed symbols (using a token table),
++		reducing the uncompressed kernel image size. Keeping the symbol table
++		uncompressed significantly improves the size of this part in compressed
++		kernel images.
++
++		Say N unless you need compressed kernel images to be small.
++
+ config HOTPLUG
+ 	def_bool y
+ 
+--- a/scripts/link-vmlinux.sh
++++ b/scripts/link-vmlinux.sh
+@@ -84,6 +84,10 @@ kallsyms()
+ 
+ 	kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+ 
++	if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
++		kallsymopt="${kallsymopt} --uncompressed"
++	fi
++
+ 	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
+ 		      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+ 
+--- a/kernel/kallsyms.c
++++ b/kernel/kallsyms.c
+@@ -108,6 +108,11 @@ static unsigned int kallsyms_expand_symb
+ 	 * For every byte on the compressed symbol data, copy the table
+ 	 * entry for that byte.
+ 	 */
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	memcpy(result, data + 1, len - 1);
++	result += len - 1;
++	len = 0;
++#endif
+ 	while (len) {
+ 		tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
+ 		data++;
+@@ -140,6 +145,9 @@ tail:
+  */
+ static char kallsyms_get_symbol_type(unsigned int off)
+ {
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	return kallsyms_names[off + 1];
++#endif
+ 	/*
+ 	 * Get just the first code, look it up in the token table,
+ 	 * and return the first char from this token.
diff --git a/trunk/target/linux/generic/patches-3.10/204-module_strip.patch b/trunk/target/linux/generic/patches-3.10/204-module_strip.patch
new file mode 100644
index 00000000..684415bb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/204-module_strip.patch
@@ -0,0 +1,200 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] build: add a hack for removing non-essential module info
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -82,7 +82,7 @@ void sort_extable(struct exception_table
+ void sort_main_extable(void);
+ void trim_init_extable(struct module *m);
+ 
+-#ifdef MODULE
++#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
+ #define MODULE_GENERIC_TABLE(gtype,name)			\
+ extern const struct gtype##_id __mod_##gtype##_table		\
+   __attribute__ ((unused, alias(__stringify(name))))
+@@ -93,9 +93,10 @@ extern const struct gtype##_id __mod_##g
+ 
+ /* Generic info of form tag = "info" */
+ #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
++#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
+ 
+ /* For userspace: you can also call me... */
+-#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
++#define MODULE_ALIAS(_alias) MODULE_INFO_STRIP(alias, _alias)
+ 
+ /*
+  * The following license idents are currently accepted as indicating free
+@@ -131,10 +132,10 @@ extern const struct gtype##_id __mod_##g
+  * Author(s), use "Name <email>" or just "Name", for multiple
+  * authors use multiple MODULE_AUTHOR() statements/lines.
+  */
+-#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
++#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
+   
+ /* What your module does. */
+-#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
++#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
+ 
+ #define MODULE_DEVICE_TABLE(type,name)		\
+   MODULE_GENERIC_TABLE(type##_device,name)
+@@ -155,7 +156,9 @@ extern const struct gtype##_id __mod_##g
+ */
+ 
+ #if defined(MODULE) || !defined(CONFIG_SYSFS)
+-#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
++#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
++#elif defined(CONFIG_MODULE_STRIPPED)
++#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
+ #else
+ #define MODULE_VERSION(_version)					\
+ 	static struct module_version_attribute ___modver_attr = {	\
+@@ -177,7 +180,7 @@ extern const struct gtype##_id __mod_##g
+ /* Optional firmware file (or files) needed by the module
+  * format is simply firmware file name.  Multiple firmware
+  * files require multiple MODULE_FIRMWARE() specifiers */
+-#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
++#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
+ 
+ /* Given an address, look for it in the exception tables */
+ const struct exception_table_entry *search_exception_tables(unsigned long add);
+--- a/include/linux/moduleparam.h
++++ b/include/linux/moduleparam.h
+@@ -16,6 +16,16 @@
+ /* Chosen so that structs with an unsigned long line up. */
+ #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
+ 
++/* This struct is here for syntactic coherency, it is not used */
++#define __MODULE_INFO_DISABLED(name)					  \
++  struct __UNIQUE_ID(name) {}
++
++#ifdef CONFIG_MODULE_STRIPPED
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
++#else
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
++#endif
++
+ #ifdef MODULE
+ #define __MODULE_INFO(tag, name, info)					  \
+ static const char __UNIQUE_ID(name)[]					  \
+@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]			
+   = __stringify(tag) "=" info
+ #else  /* !MODULE */
+ /* This struct is here for syntactic coherency, it is not used */
+-#define __MODULE_INFO(tag, name, info)					  \
+-  struct __UNIQUE_ID(name) {}
++#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name)
+ #endif
+ #define __MODULE_PARM_TYPE(name, _type)					  \
+   __MODULE_INFO(parmtype, name##type, #name ":" _type)
+@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]			
+ /* One for each parameter, describing how to use it.  Some files do
+    multiple of these per line, so can't just use MODULE_INFO. */
+ #define MODULE_PARM_DESC(_parm, desc) \
+-	__MODULE_INFO(parm, _parm, #_parm ":" desc)
++	__MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
+ 
+ struct kernel_param;
+ 
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1784,6 +1784,13 @@ config MODULE_SIG_HASH
+ 	default "sha384" if MODULE_SIG_SHA384
+ 	default "sha512" if MODULE_SIG_SHA512
+ 
++config MODULE_STRIPPED
++	bool "Reduce module size"
++	depends on MODULES
++	help
++	  Remove module parameter descriptions, author info, version, aliases,
++	  device tables, etc.
++
+ endif # MODULES
+ 
+ config INIT_ALL_POSSIBLE
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2690,6 +2690,7 @@ static struct module *setup_load_info(st
+ 
+ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	const char *modmagic = get_modinfo(info, "vermagic");
+ 	int err;
+ 
+@@ -2716,6 +2717,7 @@ static int check_modinfo(struct module *
+ 		       " the quality is unknown, you have been warned.\n",
+ 		       mod->name);
+ 	}
++#endif
+ 
+ 	/* Set up license info based on the info section */
+ 	set_license(mod, get_modinfo(info, "license"));
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -1744,7 +1744,9 @@ static void read_symbols(char *modname)
+ 		symname = info.strtab + sym->st_name;
+ 
+ 		handle_modversions(mod, &info, sym, symname);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		handle_moddevtable(mod, &info, sym, symname);
++#endif
+ 	}
+ 	if (!is_vmlinux(modname) ||
+ 	     (is_vmlinux(modname) && vmlinux_section_warnings))
+@@ -1888,7 +1890,9 @@ static void add_header(struct buffer *b,
+ 	buf_printf(b, "#include <linux/vermagic.h>\n");
+ 	buf_printf(b, "#include <linux/compiler.h>\n");
+ 	buf_printf(b, "\n");
++#ifndef CONFIG_MODULE_STRIPPED
+ 	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
++#endif
+ 	buf_printf(b, "\n");
+ 	buf_printf(b, "struct module __this_module\n");
+ 	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
+@@ -1905,16 +1909,20 @@ static void add_header(struct buffer *b,
+ 
+ static void add_intree_flag(struct buffer *b, int is_intree)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (is_intree)
+ 		buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
++#endif
+ }
+ 
+ static void add_staging_flag(struct buffer *b, const char *name)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	static const char *staging_dir = "drivers/staging";
+ 
+ 	if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
+ 		buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
++#endif
+ }
+ 
+ /**
+@@ -2007,11 +2015,13 @@ static void add_depends(struct buffer *b
+ 
+ static void add_srcversion(struct buffer *b, struct module *mod)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (mod->srcversion[0]) {
+ 		buf_printf(b, "\n");
+ 		buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
+ 			   mod->srcversion);
+ 	}
++#endif
+ }
+ 
+ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -2237,7 +2247,9 @@ int main(int argc, char **argv)
+ 		add_staging_flag(&buf, mod->name);
+ 		err |= add_versions(&buf, mod);
+ 		add_depends(&buf, mod, modules);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		add_moddevtable(&buf, mod);
++#endif
+ 		add_srcversion(&buf, mod);
+ 
+ 		sprintf(fname, "%s.mod.c", mod->name);
diff --git a/trunk/target/linux/generic/patches-3.10/210-darwin_scripts_include.patch b/trunk/target/linux/generic/patches-3.10/210-darwin_scripts_include.patch
new file mode 100644
index 00000000..f358e0a0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/210-darwin_scripts_include.patch
@@ -0,0 +1,3088 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -22,6 +22,35 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef __APPLE__
++/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
++void *memmem (const void *haystack, size_t haystack_len,
++                          const void *needle,  size_t needle_len)
++{
++  const char *begin;
++  const char *const last_possible
++    = (const char *) haystack + haystack_len - needle_len;
++
++  if (needle_len == 0)
++    /* The first occurrence of the empty string is deemed to occur at
++       the beginning of the string.  */
++    return (void *) haystack;
++
++  /* Sanity check, otherwise the loop might search through the whole
++     memory.  */
++  if (__builtin_expect (haystack_len < needle_len, 0))
++    return NULL;
++
++  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
++    if (begin[0] == ((const char *) needle)[0] &&
++        !memcmp ((const void *) &begin[1],
++                 (const void *) ((const char *) needle + 1),
++                 needle_len - 1))
++      return (void *) begin;
++
++  return NULL;
++}
++#endif
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -132,6 +132,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
+ # we really need to do so. (Do not call gcc as part of make mrproper)
+ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
+                     -DLOCALE
++ifeq ($(shell uname -s),Darwin)
++HOST_LOADLIBES  += -lncurses
++endif
+ 
+ # ===========================================================================
+ # Shared Makefile for the various kconfig executables:
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c
+@@ -1,7 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __APPLE__
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ int
+ main(int argc, char **argv)
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -7,7 +7,11 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ #include "elfconfig.h"
+ 
+--- /dev/null
++++ b/scripts/mod/elf.h
+@@ -0,0 +1,3007 @@
++/* This file defines standard ELF types, structures, and macros.
++   Copyright (C) 1995-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _ELF_H
++#define	_ELF_H 1
++
++/* Standard ELF types.  */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity.  */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities.  */
++typedef uint32_t Elf32_Word;
++typedef	int32_t  Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef	int32_t  Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities.  */
++typedef uint64_t Elf32_Xword;
++typedef	int64_t  Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef	int64_t  Elf64_Sxword;
++
++/* Type of addresses.  */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets.  */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities.  */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information.  */
++typedef Elf32_Half Elf32_Versym;
++typedef Elf64_Half Elf64_Versym;
++
++
++/* The ELF file header.  This appears at the start of every ELF file.  */
++
++#define EI_NIDENT (16)
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf32_Half	e_type;			/* Object file type */
++  Elf32_Half	e_machine;		/* Architecture */
++  Elf32_Word	e_version;		/* Object file version */
++  Elf32_Addr	e_entry;		/* Entry point virtual address */
++  Elf32_Off	e_phoff;		/* Program header table file offset */
++  Elf32_Off	e_shoff;		/* Section header table file offset */
++  Elf32_Word	e_flags;		/* Processor-specific flags */
++  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf32_Half	e_phentsize;		/* Program header table entry size */
++  Elf32_Half	e_phnum;		/* Program header table entry count */
++  Elf32_Half	e_shentsize;		/* Section header table entry size */
++  Elf32_Half	e_shnum;		/* Section header table entry count */
++  Elf32_Half	e_shstrndx;		/* Section header string table index */
++} Elf32_Ehdr;
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf64_Half	e_type;			/* Object file type */
++  Elf64_Half	e_machine;		/* Architecture */
++  Elf64_Word	e_version;		/* Object file version */
++  Elf64_Addr	e_entry;		/* Entry point virtual address */
++  Elf64_Off	e_phoff;		/* Program header table file offset */
++  Elf64_Off	e_shoff;		/* Section header table file offset */
++  Elf64_Word	e_flags;		/* Processor-specific flags */
++  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf64_Half	e_phentsize;		/* Program header table entry size */
++  Elf64_Half	e_phnum;		/* Program header table entry count */
++  Elf64_Half	e_shentsize;		/* Section header table entry size */
++  Elf64_Half	e_shnum;		/* Section header table entry count */
++  Elf64_Half	e_shstrndx;		/* Section header string table index */
++} Elf64_Ehdr;
++
++/* Fields in the e_ident array.  The EI_* macros are indices into the
++   array.  The macros under each EI_* macro are the values the byte
++   may have.  */
++
++#define EI_MAG0		0		/* File identification byte 0 index */
++#define ELFMAG0		0x7f		/* Magic number byte 0 */
++
++#define EI_MAG1		1		/* File identification byte 1 index */
++#define ELFMAG1		'E'		/* Magic number byte 1 */
++
++#define EI_MAG2		2		/* File identification byte 2 index */
++#define ELFMAG2		'L'		/* Magic number byte 2 */
++
++#define EI_MAG3		3		/* File identification byte 3 index */
++#define ELFMAG3		'F'		/* Magic number byte 3 */
++
++/* Conglomeration of the identification bytes, for easy testing as a word.  */
++#define	ELFMAG		"\177ELF"
++#define	SELFMAG		4
++
++#define EI_CLASS	4		/* File class byte index */
++#define ELFCLASSNONE	0		/* Invalid class */
++#define ELFCLASS32	1		/* 32-bit objects */
++#define ELFCLASS64	2		/* 64-bit objects */
++#define ELFCLASSNUM	3
++
++#define EI_DATA		5		/* Data encoding byte index */
++#define ELFDATANONE	0		/* Invalid data encoding */
++#define ELFDATA2LSB	1		/* 2's complement, little endian */
++#define ELFDATA2MSB	2		/* 2's complement, big endian */
++#define ELFDATANUM	3
++
++#define EI_VERSION	6		/* File version byte index */
++					/* Value must be EV_CURRENT */
++
++#define EI_OSABI	7		/* OS ABI identification */
++#define ELFOSABI_NONE		0	/* UNIX System V ABI */
++#define ELFOSABI_SYSV		0	/* Alias.  */
++#define ELFOSABI_HPUX		1	/* HP-UX */
++#define ELFOSABI_NETBSD		2	/* NetBSD.  */
++#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
++#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
++#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
++#define ELFOSABI_AIX		7	/* IBM AIX.  */
++#define ELFOSABI_IRIX		8	/* SGI Irix.  */
++#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
++#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
++#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
++#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
++#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
++#define ELFOSABI_ARM		97	/* ARM */
++#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
++
++#define EI_ABIVERSION	8		/* ABI version */
++
++#define EI_PAD		9		/* Byte index of padding bytes */
++
++/* Legal values for e_type (object file type).  */
++
++#define ET_NONE		0		/* No file type */
++#define ET_REL		1		/* Relocatable file */
++#define ET_EXEC		2		/* Executable file */
++#define ET_DYN		3		/* Shared object file */
++#define ET_CORE		4		/* Core file */
++#define	ET_NUM		5		/* Number of defined types */
++#define ET_LOOS		0xfe00		/* OS-specific range start */
++#define ET_HIOS		0xfeff		/* OS-specific range end */
++#define ET_LOPROC	0xff00		/* Processor-specific range start */
++#define ET_HIPROC	0xffff		/* Processor-specific range end */
++
++/* Legal values for e_machine (architecture).  */
++
++#define EM_NONE		 0		/* No machine */
++#define EM_M32		 1		/* AT&T WE 32100 */
++#define EM_SPARC	 2		/* SUN SPARC */
++#define EM_386		 3		/* Intel 80386 */
++#define EM_68K		 4		/* Motorola m68k family */
++#define EM_88K		 5		/* Motorola m88k family */
++#define EM_860		 7		/* Intel 80860 */
++#define EM_MIPS		 8		/* MIPS R3000 big-endian */
++#define EM_S370		 9		/* IBM System/370 */
++#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
++
++#define EM_PARISC	15		/* HPPA */
++#define EM_VPP500	17		/* Fujitsu VPP500 */
++#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
++#define EM_960		19		/* Intel 80960 */
++#define EM_PPC		20		/* PowerPC */
++#define EM_PPC64	21		/* PowerPC 64-bit */
++#define EM_S390		22		/* IBM S390 */
++
++#define EM_V800		36		/* NEC V800 series */
++#define EM_FR20		37		/* Fujitsu FR20 */
++#define EM_RH32		38		/* TRW RH-32 */
++#define EM_RCE		39		/* Motorola RCE */
++#define EM_ARM		40		/* ARM */
++#define EM_FAKE_ALPHA	41		/* Digital Alpha */
++#define EM_SH		42		/* Hitachi SH */
++#define EM_SPARCV9	43		/* SPARC v9 64-bit */
++#define EM_TRICORE	44		/* Siemens Tricore */
++#define EM_ARC		45		/* Argonaut RISC Core */
++#define EM_H8_300	46		/* Hitachi H8/300 */
++#define EM_H8_300H	47		/* Hitachi H8/300H */
++#define EM_H8S		48		/* Hitachi H8S */
++#define EM_H8_500	49		/* Hitachi H8/500 */
++#define EM_IA_64	50		/* Intel Merced */
++#define EM_MIPS_X	51		/* Stanford MIPS-X */
++#define EM_COLDFIRE	52		/* Motorola Coldfire */
++#define EM_68HC12	53		/* Motorola M68HC12 */
++#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP		55		/* Siemens PCP */
++#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
++#define EM_NDR1		57		/* Denso NDR1 microprocessor */
++#define EM_STARCORE	58		/* Motorola Start*Core processor */
++#define EM_ME16		59		/* Toyota ME16 processor */
++#define EM_ST100	60		/* STMicroelectronic ST100 processor */
++#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64	62		/* AMD x86-64 architecture */
++#define EM_PDSP		63		/* Sony DSP Processor */
++
++#define EM_FX66		66		/* Siemens FX66 microcontroller */
++#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
++#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
++#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
++#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
++#define EM_SVX		73		/* Silicon Graphics SVx */
++#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX		75		/* Digital VAX */
++#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
++#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY	81		/* Harvard University machine-independent object files */
++#define EM_PRISM	82		/* SiTera Prism */
++#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
++#define EM_FR30		84		/* Fujitsu FR30 */
++#define EM_D10V		85		/* Mitsubishi D10V */
++#define EM_D30V		86		/* Mitsubishi D30V */
++#define EM_V850		87		/* NEC v850 */
++#define EM_M32R		88		/* Mitsubishi M32R */
++#define EM_MN10300	89		/* Matsushita MN10300 */
++#define EM_MN10200	90		/* Matsushita MN10200 */
++#define EM_PJ		91		/* picoJava */
++#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
++#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
++#define EM_TILEPRO	188		/* Tilera TILEPro */
++#define EM_TILEGX	191		/* Tilera TILE-Gx */
++#define EM_NUM		192
++
++/* If it is necessary to assign new unofficial EM_* values, please
++   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
++   chances of collision with official or non-GNU unofficial values.  */
++
++#define EM_ALPHA	0x9026
++
++/* Legal values for e_version (version).  */
++
++#define EV_NONE		0		/* Invalid ELF version */
++#define EV_CURRENT	1		/* Current version */
++#define EV_NUM		2
++
++/* Section header.  */
++
++typedef struct
++{
++  Elf32_Word	sh_name;		/* Section name (string tbl index) */
++  Elf32_Word	sh_type;		/* Section type */
++  Elf32_Word	sh_flags;		/* Section flags */
++  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf32_Off	sh_offset;		/* Section file offset */
++  Elf32_Word	sh_size;		/* Section size in bytes */
++  Elf32_Word	sh_link;		/* Link to another section */
++  Elf32_Word	sh_info;		/* Additional section information */
++  Elf32_Word	sh_addralign;		/* Section alignment */
++  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
++} Elf32_Shdr;
++
++typedef struct
++{
++  Elf64_Word	sh_name;		/* Section name (string tbl index) */
++  Elf64_Word	sh_type;		/* Section type */
++  Elf64_Xword	sh_flags;		/* Section flags */
++  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf64_Off	sh_offset;		/* Section file offset */
++  Elf64_Xword	sh_size;		/* Section size in bytes */
++  Elf64_Word	sh_link;		/* Link to another section */
++  Elf64_Word	sh_info;		/* Additional section information */
++  Elf64_Xword	sh_addralign;		/* Section alignment */
++  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
++} Elf64_Shdr;
++
++/* Special section indices.  */
++
++#define SHN_UNDEF	0		/* Undefined section */
++#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
++#define SHN_LOPROC	0xff00		/* Start of processor-specific */
++#define SHN_BEFORE	0xff00		/* Order section before all others
++					   (Solaris).  */
++#define SHN_AFTER	0xff01		/* Order section after all others
++					   (Solaris).  */
++#define SHN_HIPROC	0xff1f		/* End of processor-specific */
++#define SHN_LOOS	0xff20		/* Start of OS-specific */
++#define SHN_HIOS	0xff3f		/* End of OS-specific */
++#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
++#define SHN_COMMON	0xfff2		/* Associated symbol is common */
++#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
++#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
++
++/* Legal values for sh_type (section type).  */
++
++#define SHT_NULL	  0		/* Section header table entry unused */
++#define SHT_PROGBITS	  1		/* Program data */
++#define SHT_SYMTAB	  2		/* Symbol table */
++#define SHT_STRTAB	  3		/* String table */
++#define SHT_RELA	  4		/* Relocation entries with addends */
++#define SHT_HASH	  5		/* Symbol hash table */
++#define SHT_DYNAMIC	  6		/* Dynamic linking information */
++#define SHT_NOTE	  7		/* Notes */
++#define SHT_NOBITS	  8		/* Program space with no data (bss) */
++#define SHT_REL		  9		/* Relocation entries, no addends */
++#define SHT_SHLIB	  10		/* Reserved */
++#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
++#define SHT_INIT_ARRAY	  14		/* Array of constructors */
++#define SHT_FINI_ARRAY	  15		/* Array of destructors */
++#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
++#define SHT_GROUP	  17		/* Section group */
++#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
++#define	SHT_NUM		  19		/* Number of defined types.  */
++#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
++#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
++#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
++#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
++#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
++#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
++#define SHT_SUNW_move	  0x6ffffffa
++#define SHT_SUNW_COMDAT   0x6ffffffb
++#define SHT_SUNW_syminfo  0x6ffffffc
++#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
++#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
++#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
++#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
++#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
++#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
++#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
++#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
++#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
++
++/* Legal values for sh_flags (section flags).  */
++
++#define SHF_WRITE	     (1 << 0)	/* Writable */
++#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
++#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
++#define SHF_MERGE	     (1 << 4)	/* Might be merged */
++#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
++#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
++#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
++#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
++					   required */
++#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
++#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
++#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
++#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
++#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
++					   (Solaris).  */
++#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
++					   referenced or allocated (Solaris).*/
++
++/* Section group handling.  */
++#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
++
++/* Symbol table entry.  */
++
++typedef struct
++{
++  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
++  Elf32_Addr	st_value;		/* Symbol value */
++  Elf32_Word	st_size;		/* Symbol size */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char	st_other;		/* Symbol visibility */
++  Elf32_Section	st_shndx;		/* Section index */
++} Elf32_Sym;
++
++typedef struct
++{
++  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char st_other;		/* Symbol visibility */
++  Elf64_Section	st_shndx;		/* Section index */
++  Elf64_Addr	st_value;		/* Symbol value */
++  Elf64_Xword	st_size;		/* Symbol size */
++} Elf64_Sym;
++
++/* The syminfo section if available contains additional information about
++   every dynamic symbol.  */
++
++typedef struct
++{
++  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf32_Half si_flags;			/* Per symbol flags */
++} Elf32_Syminfo;
++
++typedef struct
++{
++  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf64_Half si_flags;			/* Per symbol flags */
++} Elf64_Syminfo;
++
++/* Possible values for si_boundto.  */
++#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
++#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
++#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
++
++/* Possible bitmasks for si_flags.  */
++#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
++#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
++#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
++#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
++					   loaded */
++/* Syminfo version values.  */
++#define SYMINFO_NONE		0
++#define SYMINFO_CURRENT		1
++#define SYMINFO_NUM		2
++
++
++/* How to extract and insert information held in the st_info field.  */
++
++#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
++#define ELF32_ST_TYPE(val)		((val) & 0xf)
++#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
++
++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
++#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
++#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
++#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
++
++/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
++
++#define STB_LOCAL	0		/* Local symbol */
++#define STB_GLOBAL	1		/* Global symbol */
++#define STB_WEAK	2		/* Weak symbol */
++#define	STB_NUM		3		/* Number of defined types.  */
++#define STB_LOOS	10		/* Start of OS-specific */
++#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
++#define STB_HIOS	12		/* End of OS-specific */
++#define STB_LOPROC	13		/* Start of processor-specific */
++#define STB_HIPROC	15		/* End of processor-specific */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_NOTYPE	0		/* Symbol type is unspecified */
++#define STT_OBJECT	1		/* Symbol is a data object */
++#define STT_FUNC	2		/* Symbol is a code object */
++#define STT_SECTION	3		/* Symbol associated with a section */
++#define STT_FILE	4		/* Symbol's name is file name */
++#define STT_COMMON	5		/* Symbol is a common data object */
++#define STT_TLS		6		/* Symbol is thread-local data object*/
++#define	STT_NUM		7		/* Number of defined types.  */
++#define STT_LOOS	10		/* Start of OS-specific */
++#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
++#define STT_HIOS	12		/* End of OS-specific */
++#define STT_LOPROC	13		/* Start of processor-specific */
++#define STT_HIPROC	15		/* End of processor-specific */
++
++
++/* Symbol table indices are found in the hash buckets and chain table
++   of a symbol hash table section.  This special index value indicates
++   the end of a chain, meaning no further symbols are found in that bucket.  */
++
++#define STN_UNDEF	0		/* End of a chain.  */
++
++
++/* How to extract and insert information held in the st_other field.  */
++
++#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
++
++/* For ELF64 the definitions are the same.  */
++#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
++
++/* Symbol visibility specification encoded in the st_other field.  */
++#define STV_DEFAULT	0		/* Default symbol visibility rules */
++#define STV_INTERNAL	1		/* Processor specific hidden class */
++#define STV_HIDDEN	2		/* Sym unavailable in other modules */
++#define STV_PROTECTED	3		/* Not preemptible, not exported */
++
++
++/* Relocation table entry without addend (in section of type SHT_REL).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++} Elf32_Rel;
++
++/* I have seen two different definitions of the Elf64_Rel and
++   Elf64_Rela structures, so we'll leave them out until Novell (or
++   whoever) gets their act together.  */
++/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++} Elf64_Rel;
++
++/* Relocation table entry with addend (in section of type SHT_RELA).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++  Elf32_Sword	r_addend;		/* Addend */
++} Elf32_Rela;
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++  Elf64_Sxword	r_addend;		/* Addend */
++} Elf64_Rela;
++
++/* How to extract and insert information held in the r_info field.  */
++
++#define ELF32_R_SYM(val)		((val) >> 8)
++#define ELF32_R_TYPE(val)		((val) & 0xff)
++#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
++
++#define ELF64_R_SYM(i)			((i) >> 32)
++#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
++#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
++
++/* Program segment header.  */
++
++typedef struct
++{
++  Elf32_Word	p_type;			/* Segment type */
++  Elf32_Off	p_offset;		/* Segment file offset */
++  Elf32_Addr	p_vaddr;		/* Segment virtual address */
++  Elf32_Addr	p_paddr;		/* Segment physical address */
++  Elf32_Word	p_filesz;		/* Segment size in file */
++  Elf32_Word	p_memsz;		/* Segment size in memory */
++  Elf32_Word	p_flags;		/* Segment flags */
++  Elf32_Word	p_align;		/* Segment alignment */
++} Elf32_Phdr;
++
++typedef struct
++{
++  Elf64_Word	p_type;			/* Segment type */
++  Elf64_Word	p_flags;		/* Segment flags */
++  Elf64_Off	p_offset;		/* Segment file offset */
++  Elf64_Addr	p_vaddr;		/* Segment virtual address */
++  Elf64_Addr	p_paddr;		/* Segment physical address */
++  Elf64_Xword	p_filesz;		/* Segment size in file */
++  Elf64_Xword	p_memsz;		/* Segment size in memory */
++  Elf64_Xword	p_align;		/* Segment alignment */
++} Elf64_Phdr;
++
++/* Special value for e_phnum.  This indicates that the real number of
++   program headers is too large to fit into e_phnum.  Instead the real
++   value is in the field sh_info of section 0.  */
++
++#define PN_XNUM		0xffff
++
++/* Legal values for p_type (segment type).  */
++
++#define	PT_NULL		0		/* Program header table entry unused */
++#define PT_LOAD		1		/* Loadable program segment */
++#define PT_DYNAMIC	2		/* Dynamic linking information */
++#define PT_INTERP	3		/* Program interpreter */
++#define PT_NOTE		4		/* Auxiliary information */
++#define PT_SHLIB	5		/* Reserved */
++#define PT_PHDR		6		/* Entry for header table itself */
++#define PT_TLS		7		/* Thread-local storage segment */
++#define	PT_NUM		8		/* Number of defined types */
++#define PT_LOOS		0x60000000	/* Start of OS-specific */
++#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
++#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
++#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
++#define PT_LOSUNW	0x6ffffffa
++#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
++#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
++#define PT_HISUNW	0x6fffffff
++#define PT_HIOS		0x6fffffff	/* End of OS-specific */
++#define PT_LOPROC	0x70000000	/* Start of processor-specific */
++#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
++
++/* Legal values for p_flags (segment flags).  */
++
++#define PF_X		(1 << 0)	/* Segment is executable */
++#define PF_W		(1 << 1)	/* Segment is writable */
++#define PF_R		(1 << 2)	/* Segment is readable */
++#define PF_MASKOS	0x0ff00000	/* OS-specific */
++#define PF_MASKPROC	0xf0000000	/* Processor-specific */
++
++/* Legal values for note segment descriptor types for core files. */
++
++#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
++#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
++#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
++#define NT_PRXREG	4		/* Contains copy of prxregset struct */
++#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
++#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
++#define NT_AUXV		6		/* Contains copy of auxv array */
++#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
++#define NT_ASRS		8		/* Contains copy of asrset struct */
++#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
++#define NT_PSINFO	13		/* Contains copy of psinfo struct */
++#define NT_PRCRED	14		/* Contains copy of prcred struct */
++#define NT_UTSNAME	15		/* Contains copy of utsname struct */
++#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
++#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
++#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
++#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
++#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
++#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
++#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
++#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
++#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
++#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
++
++/* Legal values for the note segment descriptor types for object files.  */
++
++#define NT_VERSION	1		/* Contains a version string.  */
++
++
++/* Dynamic section entry.  */
++
++typedef struct
++{
++  Elf32_Sword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf32_Word d_val;			/* Integer value */
++      Elf32_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf32_Dyn;
++
++typedef struct
++{
++  Elf64_Sxword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf64_Xword d_val;		/* Integer value */
++      Elf64_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf64_Dyn;
++
++/* Legal values for d_tag (dynamic entry type).  */
++
++#define DT_NULL		0		/* Marks end of dynamic section */
++#define DT_NEEDED	1		/* Name of needed library */
++#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
++#define DT_PLTGOT	3		/* Processor defined value */
++#define DT_HASH		4		/* Address of symbol hash table */
++#define DT_STRTAB	5		/* Address of string table */
++#define DT_SYMTAB	6		/* Address of symbol table */
++#define DT_RELA		7		/* Address of Rela relocs */
++#define DT_RELASZ	8		/* Total size of Rela relocs */
++#define DT_RELAENT	9		/* Size of one Rela reloc */
++#define DT_STRSZ	10		/* Size of string table */
++#define DT_SYMENT	11		/* Size of one symbol table entry */
++#define DT_INIT		12		/* Address of init function */
++#define DT_FINI		13		/* Address of termination function */
++#define DT_SONAME	14		/* Name of shared object */
++#define DT_RPATH	15		/* Library search path (deprecated) */
++#define DT_SYMBOLIC	16		/* Start symbol search here */
++#define DT_REL		17		/* Address of Rel relocs */
++#define DT_RELSZ	18		/* Total size of Rel relocs */
++#define DT_RELENT	19		/* Size of one Rel reloc */
++#define DT_PLTREL	20		/* Type of reloc in PLT */
++#define DT_DEBUG	21		/* For debugging; unspecified */
++#define DT_TEXTREL	22		/* Reloc might modify .text */
++#define DT_JMPREL	23		/* Address of PLT relocs */
++#define	DT_BIND_NOW	24		/* Process relocations of object */
++#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
++#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
++#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
++#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
++#define DT_RUNPATH	29		/* Library search path */
++#define DT_FLAGS	30		/* Flags for the object being loaded */
++#define DT_ENCODING	32		/* Start of encoded range */
++#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
++#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
++#define	DT_NUM		34		/* Number used */
++#define DT_LOOS		0x6000000d	/* Start of OS-specific */
++#define DT_HIOS		0x6ffff000	/* End of OS-specific */
++#define DT_LOPROC	0x70000000	/* Start of processor-specific */
++#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
++#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
++
++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
++   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
++   approach.  */
++#define DT_VALRNGLO	0x6ffffd00
++#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
++#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
++#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
++#define DT_CHECKSUM	0x6ffffdf8
++#define DT_PLTPADSZ	0x6ffffdf9
++#define DT_MOVEENT	0x6ffffdfa
++#define DT_MOVESZ	0x6ffffdfb
++#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
++#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
++					   the following DT_* entry.  */
++#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
++#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
++#define DT_VALRNGHI	0x6ffffdff
++#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
++#define DT_VALNUM 12
++
++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
++   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
++
++   If any adjustment is made to the ELF object after it has been
++   built these entries will need to be adjusted.  */
++#define DT_ADDRRNGLO	0x6ffffe00
++#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
++#define DT_TLSDESC_PLT	0x6ffffef6
++#define DT_TLSDESC_GOT	0x6ffffef7
++#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
++#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
++#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
++#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
++#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
++#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
++#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
++#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
++#define DT_ADDRRNGHI	0x6ffffeff
++#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
++#define DT_ADDRNUM 11
++
++/* The versioning entry types.  The next are defined as part of the
++   GNU extension.  */
++#define DT_VERSYM	0x6ffffff0
++
++#define DT_RELACOUNT	0x6ffffff9
++#define DT_RELCOUNT	0x6ffffffa
++
++/* These were chosen by Sun.  */
++#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
++#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
++					   table */
++#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
++#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
++					   versions */
++#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
++#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
++#define DT_VERSIONTAGNUM 16
++
++/* Sun added these machine-independent extensions in the "processor-specific"
++   range.  Be compatible.  */
++#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
++#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
++#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
++#define DT_EXTRANUM	3
++
++/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
++#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
++#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
++#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
++#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
++#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
++
++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
++   entry in the dynamic section.  */
++#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
++#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
++#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
++#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
++#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
++#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
++#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
++#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
++#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
++#define DF_1_TRANS	0x00000200
++#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
++#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
++#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
++#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
++#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
++#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
++#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
++
++/* Flags for the feature selection in DT_FEATURE_1.  */
++#define DTF_1_PARINIT	0x00000001
++#define DTF_1_CONFEXP	0x00000002
++
++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
++#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
++#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
++					   generally available.  */
++
++/* Version definition sections.  */
++
++typedef struct
++{
++  Elf32_Half	vd_version;		/* Version revision */
++  Elf32_Half	vd_flags;		/* Version information */
++  Elf32_Half	vd_ndx;			/* Version Index */
++  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vd_hash;		/* Version name hash value */
++  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf32_Verdef;
++
++typedef struct
++{
++  Elf64_Half	vd_version;		/* Version revision */
++  Elf64_Half	vd_flags;		/* Version information */
++  Elf64_Half	vd_ndx;			/* Version Index */
++  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vd_hash;		/* Version name hash value */
++  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf64_Verdef;
++
++
++/* Legal values for vd_version (version revision).  */
++#define VER_DEF_NONE	0		/* No version */
++#define VER_DEF_CURRENT	1		/* Current version */
++#define VER_DEF_NUM	2		/* Given version number */
++
++/* Legal values for vd_flags (version information flags).  */
++#define VER_FLG_BASE	0x1		/* Version definition of file itself */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++/* Versym symbol index values.  */
++#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
++#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
++#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
++#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
++
++/* Auxialiary version information.  */
++
++typedef struct
++{
++  Elf32_Word	vda_name;		/* Version or dependency names */
++  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf32_Verdaux;
++
++typedef struct
++{
++  Elf64_Word	vda_name;		/* Version or dependency names */
++  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf64_Verdaux;
++
++
++/* Version dependency section.  */
++
++typedef struct
++{
++  Elf32_Half	vn_version;		/* Version of structure */
++  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf32_Verneed;
++
++typedef struct
++{
++  Elf64_Half	vn_version;		/* Version of structure */
++  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf64_Verneed;
++
++
++/* Legal values for vn_version (version revision).  */
++#define VER_NEED_NONE	 0		/* No version */
++#define VER_NEED_CURRENT 1		/* Current version */
++#define VER_NEED_NUM	 2		/* Given version number */
++
++/* Auxiliary needed version information.  */
++
++typedef struct
++{
++  Elf32_Word	vna_hash;		/* Hash value of dependency name */
++  Elf32_Half	vna_flags;		/* Dependency specific information */
++  Elf32_Half	vna_other;		/* Unused */
++  Elf32_Word	vna_name;		/* Dependency name string offset */
++  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf32_Vernaux;
++
++typedef struct
++{
++  Elf64_Word	vna_hash;		/* Hash value of dependency name */
++  Elf64_Half	vna_flags;		/* Dependency specific information */
++  Elf64_Half	vna_other;		/* Unused */
++  Elf64_Word	vna_name;		/* Dependency name string offset */
++  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf64_Vernaux;
++
++
++/* Legal values for vna_flags.  */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++
++/* Auxiliary vector.  */
++
++/* This vector is normally only used by the program interpreter.  The
++   usual definition in an ABI supplement uses the name auxv_t.  The
++   vector is not usually defined in a standard <elf.h> file, but it
++   can't hurt.  We rename it to avoid conflicts.  The sizes of these
++   types are an arrangement between the exec server and the program
++   interpreter, so we don't fully specify them here.  */
++
++typedef struct
++{
++  uint32_t a_type;		/* Entry type */
++  union
++    {
++      uint32_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf32_auxv_t;
++
++typedef struct
++{
++  uint64_t a_type;		/* Entry type */
++  union
++    {
++      uint64_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf64_auxv_t;
++
++/* Legal values for a_type (entry type).  */
++
++#define AT_NULL		0		/* End of vector */
++#define AT_IGNORE	1		/* Entry should be ignored */
++#define AT_EXECFD	2		/* File descriptor of program */
++#define AT_PHDR		3		/* Program headers for program */
++#define AT_PHENT	4		/* Size of program header entry */
++#define AT_PHNUM	5		/* Number of program headers */
++#define AT_PAGESZ	6		/* System page size */
++#define AT_BASE		7		/* Base address of interpreter */
++#define AT_FLAGS	8		/* Flags */
++#define AT_ENTRY	9		/* Entry point of program */
++#define AT_NOTELF	10		/* Program is not ELF */
++#define AT_UID		11		/* Real uid */
++#define AT_EUID		12		/* Effective uid */
++#define AT_GID		13		/* Real gid */
++#define AT_EGID		14		/* Effective gid */
++#define AT_CLKTCK	17		/* Frequency of times() */
++
++/* Some more special a_type values describing the hardware.  */
++#define AT_PLATFORM	15		/* String identifying platform.  */
++#define AT_HWCAP	16		/* Machine dependent hints about
++					   processor capabilities.  */
++
++/* This entry gives some information about the FPU initialization
++   performed by the kernel.  */
++#define AT_FPUCW	18		/* Used FPU control word.  */
++
++/* Cache block sizes.  */
++#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
++#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
++#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
++
++/* A special ignored value for PPC, used by the kernel to control the
++   interpretation of the AUXV. Must be > 16.  */
++#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
++
++#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
++
++#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
++
++#define AT_RANDOM	25		/* Address of 16 random bytes.  */
++
++#define AT_EXECFN	31		/* Filename of executable.  */
++
++/* Pointer to the global system page used for system calls and other
++   nice things.  */
++#define AT_SYSINFO	32
++#define AT_SYSINFO_EHDR	33
++
++/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
++   log2 of line size; mask those to get cache size.  */
++#define AT_L1I_CACHESHAPE	34
++#define AT_L1D_CACHESHAPE	35
++#define AT_L2_CACHESHAPE	36
++#define AT_L3_CACHESHAPE	37
++
++/* Note section contents.  Each entry in the note section begins with
++   a header of a fixed form.  */
++
++typedef struct
++{
++  Elf32_Word n_namesz;			/* Length of the note's name.  */
++  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf32_Word n_type;			/* Type of the note.  */
++} Elf32_Nhdr;
++
++typedef struct
++{
++  Elf64_Word n_namesz;			/* Length of the note's name.  */
++  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf64_Word n_type;			/* Type of the note.  */
++} Elf64_Nhdr;
++
++/* Known names of notes.  */
++
++/* Solaris entries in the note section have this name.  */
++#define ELF_NOTE_SOLARIS	"SUNW Solaris"
++
++/* Note entries for GNU systems have this name.  */
++#define ELF_NOTE_GNU		"GNU"
++
++
++/* Defined types of notes for Solaris.  */
++
++/* Value of descriptor (one word) is desired pagesize for the binary.  */
++#define ELF_NOTE_PAGESIZE_HINT	1
++
++
++/* Defined note types for GNU systems.  */
++
++/* ABI information.  The descriptor consists of words:
++   word 0: OS descriptor
++   word 1: major version of the ABI
++   word 2: minor version of the ABI
++   word 3: subminor version of the ABI
++*/
++#define NT_GNU_ABI_TAG	1
++#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
++
++/* Known OSes.  These values can appear in word 0 of an
++   NT_GNU_ABI_TAG note section entry.  */
++#define ELF_NOTE_OS_LINUX	0
++#define ELF_NOTE_OS_GNU		1
++#define ELF_NOTE_OS_SOLARIS2	2
++#define ELF_NOTE_OS_FREEBSD	3
++
++/* Synthetic hwcap information.  The descriptor begins with two words:
++   word 0: number of entries
++   word 1: bitmask of enabled entries
++   Then follow variable-length entries, one byte followed by a
++   '\0'-terminated hwcap name string.  The byte gives the bit
++   number to test if enabled, (1U << bit) & bitmask.  */
++#define NT_GNU_HWCAP	2
++
++/* Build ID bits as generated by ld --build-id.
++   The descriptor consists of any nonzero number of bytes.  */
++#define NT_GNU_BUILD_ID	3
++
++/* Version note generated by GNU gold containing a version string.  */
++#define NT_GNU_GOLD_VERSION	4
++
++
++/* Move records.  */
++typedef struct
++{
++  Elf32_Xword m_value;		/* Symbol value.  */
++  Elf32_Word m_info;		/* Size and index.  */
++  Elf32_Word m_poffset;		/* Symbol offset.  */
++  Elf32_Half m_repeat;		/* Repeat count.  */
++  Elf32_Half m_stride;		/* Stride info.  */
++} Elf32_Move;
++
++typedef struct
++{
++  Elf64_Xword m_value;		/* Symbol value.  */
++  Elf64_Xword m_info;		/* Size and index.  */
++  Elf64_Xword m_poffset;	/* Symbol offset.  */
++  Elf64_Half m_repeat;		/* Repeat count.  */
++  Elf64_Half m_stride;		/* Stride info.  */
++} Elf64_Move;
++
++/* Macro to construct move records.  */
++#define ELF32_M_SYM(info)	((info) >> 8)
++#define ELF32_M_SIZE(info)	((unsigned char) (info))
++#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
++
++#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
++#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
++#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
++
++
++/* Motorola 68k specific definitions.  */
++
++/* Values for Elf32_Ehdr.e_flags.  */
++#define EF_CPU32	0x00810000
++
++/* m68k relocs.  */
++
++#define R_68K_NONE	0		/* No reloc */
++#define R_68K_32	1		/* Direct 32 bit  */
++#define R_68K_16	2		/* Direct 16 bit  */
++#define R_68K_8		3		/* Direct 8 bit  */
++#define R_68K_PC32	4		/* PC relative 32 bit */
++#define R_68K_PC16	5		/* PC relative 16 bit */
++#define R_68K_PC8	6		/* PC relative 8 bit */
++#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
++#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
++#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
++#define R_68K_GOT32O	10		/* 32 bit GOT offset */
++#define R_68K_GOT16O	11		/* 16 bit GOT offset */
++#define R_68K_GOT8O	12		/* 8 bit GOT offset */
++#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
++#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
++#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
++#define R_68K_PLT32O	16		/* 32 bit PLT offset */
++#define R_68K_PLT16O	17		/* 16 bit PLT offset */
++#define R_68K_PLT8O	18		/* 8 bit PLT offset */
++#define R_68K_COPY	19		/* Copy symbol at runtime */
++#define R_68K_GLOB_DAT	20		/* Create GOT entry */
++#define R_68K_JMP_SLOT	21		/* Create PLT entry */
++#define R_68K_RELATIVE	22		/* Adjust by program base */
++#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
++#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
++#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
++#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
++#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
++#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
++#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
++#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
++#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
++#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
++#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
++#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
++#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
++#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
++#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
++/* Keep this the last entry.  */
++#define R_68K_NUM	43
++
++/* Intel 80386 specific definitions.  */
++
++/* i386 relocs.  */
++
++#define R_386_NONE	   0		/* No reloc */
++#define R_386_32	   1		/* Direct 32 bit  */
++#define R_386_PC32	   2		/* PC relative 32 bit */
++#define R_386_GOT32	   3		/* 32 bit GOT entry */
++#define R_386_PLT32	   4		/* 32 bit PLT address */
++#define R_386_COPY	   5		/* Copy symbol at runtime */
++#define R_386_GLOB_DAT	   6		/* Create GOT entry */
++#define R_386_JMP_SLOT	   7		/* Create PLT entry */
++#define R_386_RELATIVE	   8		/* Adjust by program base */
++#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
++#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
++#define R_386_32PLT	   11
++#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
++#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
++					   block offset */
++#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
++					   offset */
++#define R_386_TLS_LE	   17		/* Offset relative to static TLS
++					   block */
++#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
++					   general dynamic thread local data */
++#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
++					   local dynamic thread local data
++					   in LE code */
++#define R_386_16	   20
++#define R_386_PC16	   21
++#define R_386_8		   22
++#define R_386_PC8	   23
++#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
++					   thread local data */
++#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
++#define R_386_TLS_GD_CALL  26		/* Relocation for call to
++					   __tls_get_addr() */
++#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
++#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
++					   thread local data in LE code */
++#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
++#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
++					   __tls_get_addr() in LDM code */
++#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
++#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
++#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
++					   block offset */
++#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
++					   TLS block */
++#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
++#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
++#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
++/* 38? */
++#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
++#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
++					   descriptor for
++					   relaxation.  */
++#define R_386_TLS_DESC     41		/* TLS descriptor containing
++					   pointer to code and to
++					   argument, returning the TLS
++					   offset for the symbol.  */
++#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
++/* Keep this the last entry.  */
++#define R_386_NUM	   43
++
++/* SUN SPARC specific definitions.  */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
++
++/* Values for Elf64_Ehdr.e_flags.  */
++
++#define EF_SPARCV9_MM		3
++#define EF_SPARCV9_TSO		0
++#define EF_SPARCV9_PSO		1
++#define EF_SPARCV9_RMO		2
++#define EF_SPARC_LEDATA		0x800000 /* little endian data */
++#define EF_SPARC_EXT_MASK	0xFFFF00
++#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
++#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
++#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
++#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
++
++/* SPARC relocs.  */
++
++#define R_SPARC_NONE		0	/* No reloc */
++#define R_SPARC_8		1	/* Direct 8 bit */
++#define R_SPARC_16		2	/* Direct 16 bit */
++#define R_SPARC_32		3	/* Direct 32 bit */
++#define R_SPARC_DISP8		4	/* PC relative 8 bit */
++#define R_SPARC_DISP16		5	/* PC relative 16 bit */
++#define R_SPARC_DISP32		6	/* PC relative 32 bit */
++#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
++#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
++#define R_SPARC_HI22		9	/* High 22 bit */
++#define R_SPARC_22		10	/* Direct 22 bit */
++#define R_SPARC_13		11	/* Direct 13 bit */
++#define R_SPARC_LO10		12	/* Truncated 10 bit */
++#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
++#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
++#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
++#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
++#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
++#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
++#define R_SPARC_COPY		19	/* Copy symbol at runtime */
++#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
++#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
++#define R_SPARC_RELATIVE	22	/* Adjust by program base */
++#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
++
++/* Additional Sparc64 relocs.  */
++
++#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
++#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
++#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
++#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
++#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
++#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
++#define R_SPARC_10		30	/* Direct 10 bit */
++#define R_SPARC_11		31	/* Direct 11 bit */
++#define R_SPARC_64		32	/* Direct 64 bit */
++#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
++#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
++#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
++#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
++#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
++#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
++#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
++#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
++#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
++#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
++#define R_SPARC_7		43	/* Direct 7 bit */
++#define R_SPARC_5		44	/* Direct 5 bit */
++#define R_SPARC_6		45	/* Direct 6 bit */
++#define R_SPARC_DISP64		46	/* PC relative 64 bit */
++#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
++#define R_SPARC_HIX22		48	/* High 22 bit complemented */
++#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
++#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
++#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
++#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
++#define R_SPARC_REGISTER	53	/* Global register usage */
++#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
++#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
++#define R_SPARC_TLS_GD_HI22	56
++#define R_SPARC_TLS_GD_LO10	57
++#define R_SPARC_TLS_GD_ADD	58
++#define R_SPARC_TLS_GD_CALL	59
++#define R_SPARC_TLS_LDM_HI22	60
++#define R_SPARC_TLS_LDM_LO10	61
++#define R_SPARC_TLS_LDM_ADD	62
++#define R_SPARC_TLS_LDM_CALL	63
++#define R_SPARC_TLS_LDO_HIX22	64
++#define R_SPARC_TLS_LDO_LOX10	65
++#define R_SPARC_TLS_LDO_ADD	66
++#define R_SPARC_TLS_IE_HI22	67
++#define R_SPARC_TLS_IE_LO10	68
++#define R_SPARC_TLS_IE_LD	69
++#define R_SPARC_TLS_IE_LDX	70
++#define R_SPARC_TLS_IE_ADD	71
++#define R_SPARC_TLS_LE_HIX22	72
++#define R_SPARC_TLS_LE_LOX10	73
++#define R_SPARC_TLS_DTPMOD32	74
++#define R_SPARC_TLS_DTPMOD64	75
++#define R_SPARC_TLS_DTPOFF32	76
++#define R_SPARC_TLS_DTPOFF64	77
++#define R_SPARC_TLS_TPOFF32	78
++#define R_SPARC_TLS_TPOFF64	79
++#define R_SPARC_GOTDATA_HIX22	80
++#define R_SPARC_GOTDATA_LOX10	81
++#define R_SPARC_GOTDATA_OP_HIX22	82
++#define R_SPARC_GOTDATA_OP_LOX10	83
++#define R_SPARC_GOTDATA_OP	84
++#define R_SPARC_H34		85
++#define R_SPARC_SIZE32		86
++#define R_SPARC_SIZE64		87
++#define R_SPARC_WDISP10		88
++#define R_SPARC_JMP_IREL	248
++#define R_SPARC_IRELATIVE	249
++#define R_SPARC_GNU_VTINHERIT	250
++#define R_SPARC_GNU_VTENTRY	251
++#define R_SPARC_REV32		252
++/* Keep this the last entry.  */
++#define R_SPARC_NUM		253
++
++/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
++
++#define DT_SPARC_REGISTER 0x70000001
++#define DT_SPARC_NUM	2
++
++/* MIPS R3000 specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
++#define EF_MIPS_PIC	    2		/* Contains PIC code */
++#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
++#define EF_MIPS_XGOT	    8
++#define EF_MIPS_64BIT_WHIRL 16
++#define EF_MIPS_ABI2	    32
++#define EF_MIPS_ABI_ON32    64
++#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
++
++/* Legal values for MIPS architecture level.  */
++
++#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
++#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
++#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
++#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
++#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
++#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
++#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
++
++/* The following are non-official names and should not be used.  */
++
++#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
++#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
++#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
++#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
++#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
++#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
++#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
++
++/* Special section indices.  */
++
++#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
++#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
++#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
++#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
++#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
++#define SHT_MIPS_MSYM	       0x70000001
++#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
++#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
++#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
++#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
++#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
++#define SHT_MIPS_PACKAGE       0x70000007
++#define SHT_MIPS_PACKSYM       0x70000008
++#define SHT_MIPS_RELD	       0x70000009
++#define SHT_MIPS_IFACE         0x7000000b
++#define SHT_MIPS_CONTENT       0x7000000c
++#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
++#define SHT_MIPS_SHDR	       0x70000010
++#define SHT_MIPS_FDESC	       0x70000011
++#define SHT_MIPS_EXTSYM	       0x70000012
++#define SHT_MIPS_DENSE	       0x70000013
++#define SHT_MIPS_PDESC	       0x70000014
++#define SHT_MIPS_LOCSYM	       0x70000015
++#define SHT_MIPS_AUXSYM	       0x70000016
++#define SHT_MIPS_OPTSYM	       0x70000017
++#define SHT_MIPS_LOCSTR	       0x70000018
++#define SHT_MIPS_LINE	       0x70000019
++#define SHT_MIPS_RFDESC	       0x7000001a
++#define SHT_MIPS_DELTASYM      0x7000001b
++#define SHT_MIPS_DELTAINST     0x7000001c
++#define SHT_MIPS_DELTACLASS    0x7000001d
++#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
++#define SHT_MIPS_DELTADECL     0x7000001f
++#define SHT_MIPS_SYMBOL_LIB    0x70000020
++#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
++#define SHT_MIPS_TRANSLATE     0x70000022
++#define SHT_MIPS_PIXIE	       0x70000023
++#define SHT_MIPS_XLATE	       0x70000024
++#define SHT_MIPS_XLATE_DEBUG   0x70000025
++#define SHT_MIPS_WHIRL	       0x70000026
++#define SHT_MIPS_EH_REGION     0x70000027
++#define SHT_MIPS_XLATE_OLD     0x70000028
++#define SHT_MIPS_PDR_EXCEPTION 0x70000029
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
++#define SHF_MIPS_MERGE	 0x20000000
++#define SHF_MIPS_ADDR	 0x40000000
++#define SHF_MIPS_STRINGS 0x80000000
++#define SHF_MIPS_NOSTRIP 0x08000000
++#define SHF_MIPS_LOCAL	 0x04000000
++#define SHF_MIPS_NAMES	 0x02000000
++#define SHF_MIPS_NODUPE	 0x01000000
++
++
++/* Symbol tables.  */
++
++/* MIPS specific values for `st_other'.  */
++#define STO_MIPS_DEFAULT		0x0
++#define STO_MIPS_INTERNAL		0x1
++#define STO_MIPS_HIDDEN			0x2
++#define STO_MIPS_PROTECTED		0x3
++#define STO_MIPS_PLT			0x8
++#define STO_MIPS_SC_ALIGN_UNUSED	0xff
++
++/* MIPS specific values for `st_info'.  */
++#define STB_MIPS_SPLIT_COMMON		13
++
++/* Entries found in sections of type SHT_MIPS_GPTAB.  */
++
++typedef union
++{
++  struct
++    {
++      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
++      Elf32_Word gt_unused;		/* Not used */
++    } gt_header;			/* First entry in section */
++  struct
++    {
++      Elf32_Word gt_g_value;		/* If this value were used for -G */
++      Elf32_Word gt_bytes;		/* This many bytes would be used */
++    } gt_entry;				/* Subsequent entries in section */
++} Elf32_gptab;
++
++/* Entry found in sections of type SHT_MIPS_REGINFO.  */
++
++typedef struct
++{
++  Elf32_Word	ri_gprmask;		/* General registers used */
++  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
++  Elf32_Sword	ri_gp_value;		/* $gp register value */
++} Elf32_RegInfo;
++
++/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
++
++typedef struct
++{
++  unsigned char kind;		/* Determines interpretation of the
++				   variable part of descriptor.  */
++  unsigned char size;		/* Size of descriptor, including header.  */
++  Elf32_Section section;	/* Section header index of section affected,
++				   0 for global options.  */
++  Elf32_Word info;		/* Kind-specific information.  */
++} Elf_Options;
++
++/* Values for `kind' field in Elf_Options.  */
++
++#define ODK_NULL	0	/* Undefined.  */
++#define ODK_REGINFO	1	/* Register usage information.  */
++#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
++#define ODK_PAD		3	/* Section padding options.  */
++#define ODK_HWPATCH	4	/* Hardware workarounds performed */
++#define ODK_FILL	5	/* record the fill value used by the linker. */
++#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
++#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
++#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
++
++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
++
++#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
++#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
++#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
++#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
++#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
++#define OEX_PRECISEFP	OEX_FPDBUG
++#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
++
++#define OEX_FPU_INVAL	0x10
++#define OEX_FPU_DIV0	0x08
++#define OEX_FPU_OFLO	0x04
++#define OEX_FPU_UFLO	0x02
++#define OEX_FPU_INEX	0x01
++
++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
++
++#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
++#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
++#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
++#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
++
++#define OPAD_PREFIX	0x1
++#define OPAD_POSTFIX	0x2
++#define OPAD_SYMBOL	0x4
++
++/* Entry found in `.options' section.  */
++
++typedef struct
++{
++  Elf32_Word hwp_flags1;	/* Extra flags.  */
++  Elf32_Word hwp_flags2;	/* Extra flags.  */
++} Elf_Options_Hw;
++
++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
++
++#define OHWA0_R4KEOP_CHECKED	0x00000001
++#define OHWA1_R4KEOP_CLEAN	0x00000002
++
++/* MIPS relocs.  */
++
++#define R_MIPS_NONE		0	/* No reloc */
++#define R_MIPS_16		1	/* Direct 16 bit */
++#define R_MIPS_32		2	/* Direct 32 bit */
++#define R_MIPS_REL32		3	/* PC relative 32 bit */
++#define R_MIPS_26		4	/* Direct 26 bit shifted */
++#define R_MIPS_HI16		5	/* High 16 bit */
++#define R_MIPS_LO16		6	/* Low 16 bit */
++#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
++#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
++#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
++#define R_MIPS_PC16		10	/* PC relative 16 bit */
++#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
++#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
++
++#define R_MIPS_SHIFT5		16
++#define R_MIPS_SHIFT6		17
++#define R_MIPS_64		18
++#define R_MIPS_GOT_DISP		19
++#define R_MIPS_GOT_PAGE		20
++#define R_MIPS_GOT_OFST		21
++#define R_MIPS_GOT_HI16		22
++#define R_MIPS_GOT_LO16		23
++#define R_MIPS_SUB		24
++#define R_MIPS_INSERT_A		25
++#define R_MIPS_INSERT_B		26
++#define R_MIPS_DELETE		27
++#define R_MIPS_HIGHER		28
++#define R_MIPS_HIGHEST		29
++#define R_MIPS_CALL_HI16	30
++#define R_MIPS_CALL_LO16	31
++#define R_MIPS_SCN_DISP		32
++#define R_MIPS_REL16		33
++#define R_MIPS_ADD_IMMEDIATE	34
++#define R_MIPS_PJUMP		35
++#define R_MIPS_RELGOT		36
++#define R_MIPS_JALR		37
++#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
++#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
++#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
++#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
++#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
++#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
++#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
++#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
++#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
++#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
++#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
++#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
++#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
++#define R_MIPS_GLOB_DAT		51
++#define R_MIPS_COPY		126
++#define R_MIPS_JUMP_SLOT        127
++/* Keep this the last entry.  */
++#define R_MIPS_NUM		128
++
++/* Legal values for p_type field of Elf32_Phdr.  */
++
++#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
++#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
++#define PT_MIPS_OPTIONS 0x70000002
++
++/* Special program header types.  */
++
++#define PF_MIPS_LOCAL	0x10000000
++
++/* Legal values for d_tag field of Elf32_Dyn.  */
++
++#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
++#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
++#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
++#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
++#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
++#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
++#define DT_MIPS_MSYM	     0x70000007
++#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
++#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
++#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
++#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
++#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
++#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
++#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
++#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
++#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
++#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
++#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
++#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
++						DT_MIPS_DELTA_CLASS.  */
++#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
++						DT_MIPS_DELTA_INSTANCE.  */
++#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
++					     DT_MIPS_DELTA_RELOC.  */
++#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
++					   relocations refer to.  */
++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
++					   DT_MIPS_DELTA_SYM.  */
++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
++					     class declaration.  */
++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
++						DT_MIPS_DELTA_CLASSSYM.  */
++#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
++#define DT_MIPS_PIXIE_INIT   0x70000023
++#define DT_MIPS_SYMBOL_LIB   0x70000024
++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
++#define DT_MIPS_LOCAL_GOTIDX 0x70000026
++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
++#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
++#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
++						    function stored in GOT.  */
++#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
++					   by rld on dlopen() calls.  */
++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
++#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
++#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
++/* The address of .got.plt in an executable using the new non-PIC ABI.  */
++#define DT_MIPS_PLTGOT	     0x70000032
++/* The base of the PLT in an executable using the new non-PIC ABI if that
++   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
++   value.  */
++#define DT_MIPS_RWPLT        0x70000034
++#define DT_MIPS_NUM	     0x35
++
++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
++
++#define RHF_NONE		   0		/* No flags */
++#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
++#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
++#define RHF_NO_MOVE		   (1 << 3)
++#define RHF_SGI_ONLY		   (1 << 4)
++#define RHF_GUARANTEE_INIT	   (1 << 5)
++#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
++#define RHF_GUARANTEE_START_INIT   (1 << 7)
++#define RHF_PIXIE		   (1 << 8)
++#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
++#define RHF_REQUICKSTART	   (1 << 10)
++#define RHF_REQUICKSTARTED	   (1 << 11)
++#define RHF_CORD		   (1 << 12)
++#define RHF_NO_UNRES_UNDEF	   (1 << 13)
++#define RHF_RLD_ORDER_SAFE	   (1 << 14)
++
++/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
++
++typedef struct
++{
++  Elf32_Word l_name;		/* Name (string table index) */
++  Elf32_Word l_time_stamp;	/* Timestamp */
++  Elf32_Word l_checksum;	/* Checksum */
++  Elf32_Word l_version;		/* Interface version */
++  Elf32_Word l_flags;		/* Flags */
++} Elf32_Lib;
++
++typedef struct
++{
++  Elf64_Word l_name;		/* Name (string table index) */
++  Elf64_Word l_time_stamp;	/* Timestamp */
++  Elf64_Word l_checksum;	/* Checksum */
++  Elf64_Word l_version;		/* Interface version */
++  Elf64_Word l_flags;		/* Flags */
++} Elf64_Lib;
++
++
++/* Legal values for l_flags.  */
++
++#define LL_NONE		  0
++#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
++#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
++#define LL_REQUIRE_MINOR  (1 << 2)
++#define LL_EXPORTS	  (1 << 3)
++#define LL_DELAY_LOAD	  (1 << 4)
++#define LL_DELTA	  (1 << 5)
++
++/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
++
++typedef Elf32_Addr Elf32_Conflict;
++
++
++/* HPPA specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
++#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
++#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
++#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
++#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
++					      prediction.  */
++#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
++#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
++
++/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
++
++#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
++#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
++#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
++
++/* Additional section indeces.  */
++
++#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
++					      symbols in ANSI C.  */
++#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
++#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
++#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
++#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
++#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
++
++#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
++#define STT_HP_STUB		(STT_LOOS + 0x2)
++
++/* HPPA relocs.  */
++
++#define R_PARISC_NONE		0	/* No reloc.  */
++#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
++#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
++#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
++#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
++#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
++#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
++#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
++#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
++#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
++#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
++#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
++#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
++#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
++#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
++#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
++#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
++#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
++#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
++#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
++#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
++#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
++#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
++#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
++#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
++#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
++#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
++#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
++#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
++#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
++#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
++#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
++#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
++#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
++#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
++#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
++#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
++#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
++#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
++#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
++#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
++#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
++#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LORESERVE	128
++#define R_PARISC_COPY		128	/* Copy relocation.  */
++#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
++#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
++#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
++#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
++#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
++#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
++#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
++#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
++#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_GNU_VTENTRY	232
++#define R_PARISC_GNU_VTINHERIT	233
++#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
++#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
++#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
++#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
++#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
++#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
++#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
++#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
++#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
++#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
++#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
++#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
++#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
++#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
++#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
++#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
++#define R_PARISC_HIRESERVE	255
++
++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PT_HP_TLS		(PT_LOOS + 0x0)
++#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
++#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
++#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
++#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
++#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
++#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
++#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
++#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
++#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
++#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
++#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
++#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
++#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
++#define PT_HP_STACK		(PT_LOOS + 0x14)
++
++#define PT_PARISC_ARCHEXT	0x70000000
++#define PT_PARISC_UNWIND	0x70000001
++
++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PF_PARISC_SBP		0x08000000
++
++#define PF_HP_PAGE_SIZE		0x00100000
++#define PF_HP_FAR_SHARED	0x00200000
++#define PF_HP_NEAR_SHARED	0x00400000
++#define PF_HP_CODE		0x01000000
++#define PF_HP_MODIFY		0x02000000
++#define PF_HP_LAZYSWAP		0x04000000
++#define PF_HP_SBP		0x08000000
++
++
++/* Alpha specific definitions.  */
++
++/* Legal values for e_flags field of Elf64_Ehdr.  */
++
++#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
++#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
++
++/* Legal values for sh_type field of Elf64_Shdr.  */
++
++/* These two are primerily concerned with ECOFF debugging info.  */
++#define SHT_ALPHA_DEBUG		0x70000001
++#define SHT_ALPHA_REGINFO	0x70000002
++
++/* Legal values for sh_flags field of Elf64_Shdr.  */
++
++#define SHF_ALPHA_GPREL		0x10000000
++
++/* Legal values for st_other field of Elf64_Sym.  */
++#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
++#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
++
++/* Alpha relocs.  */
++
++#define R_ALPHA_NONE		0	/* No reloc */
++#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
++#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
++#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
++#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
++#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
++#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
++#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
++#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
++#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
++#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
++#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
++#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
++#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
++#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
++#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
++#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
++#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
++#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
++#define R_ALPHA_TLS_GD_HI	28
++#define R_ALPHA_TLSGD		29
++#define R_ALPHA_TLS_LDM		30
++#define R_ALPHA_DTPMOD64	31
++#define R_ALPHA_GOTDTPREL	32
++#define R_ALPHA_DTPREL64	33
++#define R_ALPHA_DTPRELHI	34
++#define R_ALPHA_DTPRELLO	35
++#define R_ALPHA_DTPREL16	36
++#define R_ALPHA_GOTTPREL	37
++#define R_ALPHA_TPREL64		38
++#define R_ALPHA_TPRELHI		39
++#define R_ALPHA_TPRELLO		40
++#define R_ALPHA_TPREL16		41
++/* Keep this the last entry.  */
++#define R_ALPHA_NUM		46
++
++/* Magic values of the LITUSE relocation addend.  */
++#define LITUSE_ALPHA_ADDR	0
++#define LITUSE_ALPHA_BASE	1
++#define LITUSE_ALPHA_BYTOFF	2
++#define LITUSE_ALPHA_JSR	3
++#define LITUSE_ALPHA_TLS_GD	4
++#define LITUSE_ALPHA_TLS_LDM	5
++
++/* Legal values for d_tag of Elf64_Dyn.  */
++#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
++#define DT_ALPHA_NUM		1
++
++/* PowerPC specific declarations */
++
++/* Values for Elf32/64_Ehdr.e_flags.  */
++#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
++
++/* Cygnus local bits below */
++#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
++#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
++						   flag */
++
++/* PowerPC relocations defined by the ABIs */
++#define R_PPC_NONE		0
++#define R_PPC_ADDR32		1	/* 32bit absolute address */
++#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
++#define R_PPC_ADDR16		3	/* 16bit absolute address */
++#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
++#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
++#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
++#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
++#define R_PPC_ADDR14_BRTAKEN	8
++#define R_PPC_ADDR14_BRNTAKEN	9
++#define R_PPC_REL24		10	/* PC relative 26 bit */
++#define R_PPC_REL14		11	/* PC relative 16 bit */
++#define R_PPC_REL14_BRTAKEN	12
++#define R_PPC_REL14_BRNTAKEN	13
++#define R_PPC_GOT16		14
++#define R_PPC_GOT16_LO		15
++#define R_PPC_GOT16_HI		16
++#define R_PPC_GOT16_HA		17
++#define R_PPC_PLTREL24		18
++#define R_PPC_COPY		19
++#define R_PPC_GLOB_DAT		20
++#define R_PPC_JMP_SLOT		21
++#define R_PPC_RELATIVE		22
++#define R_PPC_LOCAL24PC		23
++#define R_PPC_UADDR32		24
++#define R_PPC_UADDR16		25
++#define R_PPC_REL32		26
++#define R_PPC_PLT32		27
++#define R_PPC_PLTREL32		28
++#define R_PPC_PLT16_LO		29
++#define R_PPC_PLT16_HI		30
++#define R_PPC_PLT16_HA		31
++#define R_PPC_SDAREL16		32
++#define R_PPC_SECTOFF		33
++#define R_PPC_SECTOFF_LO	34
++#define R_PPC_SECTOFF_HI	35
++#define R_PPC_SECTOFF_HA	36
++
++/* PowerPC relocations defined for the TLS access ABI.  */
++#define R_PPC_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
++#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
++#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
++#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
++#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
++#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
++#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
++#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
++#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
++#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
++
++/* The remaining relocs are from the Embedded ELF ABI, and are not
++   in the SVR4 ELF ABI.  */
++#define R_PPC_EMB_NADDR32	101
++#define R_PPC_EMB_NADDR16	102
++#define R_PPC_EMB_NADDR16_LO	103
++#define R_PPC_EMB_NADDR16_HI	104
++#define R_PPC_EMB_NADDR16_HA	105
++#define R_PPC_EMB_SDAI16	106
++#define R_PPC_EMB_SDA2I16	107
++#define R_PPC_EMB_SDA2REL	108
++#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
++#define R_PPC_EMB_MRKREF	110
++#define R_PPC_EMB_RELSEC16	111
++#define R_PPC_EMB_RELST_LO	112
++#define R_PPC_EMB_RELST_HI	113
++#define R_PPC_EMB_RELST_HA	114
++#define R_PPC_EMB_BIT_FLD	115
++#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
++
++/* Diab tool relocations.  */
++#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
++#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
++#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
++#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
++#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
++#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC_IRELATIVE		248
++
++/* GNU relocs used in PIC code sequences.  */
++#define R_PPC_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
++#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
++#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
++
++/* This is a phony reloc to handle any old fashioned TOC16 references
++   that may still be in object files.  */
++#define R_PPC_TOC16		255
++
++/* PowerPC specific values for the Dyn d_tag field.  */
++#define DT_PPC_GOT		(DT_LOPROC + 0)
++#define DT_PPC_NUM		1
++
++/* PowerPC64 relocations defined by the ABIs */
++#define R_PPC64_NONE		R_PPC_NONE
++#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
++#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
++#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
++#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
++#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
++#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
++#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
++#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
++#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
++#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
++#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
++#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
++#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
++#define R_PPC64_GOT16		R_PPC_GOT16
++#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
++#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
++#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
++
++#define R_PPC64_COPY		R_PPC_COPY
++#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
++#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
++#define R_PPC64_RELATIVE	R_PPC_RELATIVE
++
++#define R_PPC64_UADDR32		R_PPC_UADDR32
++#define R_PPC64_UADDR16		R_PPC_UADDR16
++#define R_PPC64_REL32		R_PPC_REL32
++#define R_PPC64_PLT32		R_PPC_PLT32
++#define R_PPC64_PLTREL32	R_PPC_PLTREL32
++#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
++#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
++#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
++
++#define R_PPC64_SECTOFF		R_PPC_SECTOFF
++#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
++#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
++#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
++#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
++#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
++#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
++#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
++#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
++#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
++#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
++#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
++#define R_PPC64_PLT64		45 /* doubleword64 L + A */
++#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
++#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
++#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
++#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
++#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
++#define R_PPC64_TOC		51 /* doubleword64 .TOC */
++#define R_PPC64_PLTGOT16	52 /* half16* M + A */
++#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
++#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
++#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
++
++#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
++#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
++#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
++#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
++#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
++#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
++#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
++#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
++#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
++#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
++#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
++
++/* PowerPC64 relocations defined for the TLS access ABI.  */
++#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
++#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
++#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
++#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
++#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
++#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
++#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
++#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
++#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
++#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
++#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC64_JMP_IREL	247
++#define R_PPC64_IRELATIVE	248
++#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
++#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
++#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
++
++/* PowerPC64 specific values for the Dyn d_tag field.  */
++#define DT_PPC64_GLINK  (DT_LOPROC + 0)
++#define DT_PPC64_OPD	(DT_LOPROC + 1)
++#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
++#define DT_PPC64_NUM    3
++
++
++/* ARM specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_ARM_RELEXEC		0x01
++#define EF_ARM_HASENTRY		0x02
++#define EF_ARM_INTERWORK	0x04
++#define EF_ARM_APCS_26		0x08
++#define EF_ARM_APCS_FLOAT	0x10
++#define EF_ARM_PIC		0x20
++#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
++#define EF_ARM_NEW_ABI		0x80
++#define EF_ARM_OLD_ABI		0x100
++#define EF_ARM_SOFT_FLOAT	0x200
++#define EF_ARM_VFP_FLOAT	0x400
++#define EF_ARM_MAVERICK_FLOAT	0x800
++
++
++/* Other constants defined in the ARM ELF spec. version B-01.  */
++/* NB. These conflict with values defined above.  */
++#define EF_ARM_SYMSARESORTED	0x04
++#define EF_ARM_DYNSYMSUSESEGIDX	0x08
++#define EF_ARM_MAPSYMSFIRST	0x10
++#define EF_ARM_EABIMASK		0XFF000000
++
++/* Constants defined in AAELF.  */
++#define EF_ARM_BE8	    0x00800000
++#define EF_ARM_LE8	    0x00400000
++
++#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
++#define EF_ARM_EABI_UNKNOWN	0x00000000
++#define EF_ARM_EABI_VER1	0x01000000
++#define EF_ARM_EABI_VER2	0x02000000
++#define EF_ARM_EABI_VER3	0x03000000
++#define EF_ARM_EABI_VER4	0x04000000
++#define EF_ARM_EABI_VER5	0x05000000
++
++/* Additional symbol types for Thumb.  */
++#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
++#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
++
++/* ARM-specific values for sh_flags */
++#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
++#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
++					      in the input to a link step.  */
++
++/* ARM-specific program header flags */
++#define PF_ARM_SB		0x10000000 /* Segment contains the location
++					      addressed by the static base. */
++#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
++#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
++#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
++#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
++
++
++/* ARM relocs.  */
++
++#define R_ARM_NONE		0	/* No reloc */
++#define R_ARM_PC24		1	/* PC relative 26 bit branch */
++#define R_ARM_ABS32		2	/* Direct 32 bit  */
++#define R_ARM_REL32		3	/* PC relative 32 bit */
++#define R_ARM_PC13		4
++#define R_ARM_ABS16		5	/* Direct 16 bit */
++#define R_ARM_ABS12		6	/* Direct 12 bit */
++#define R_ARM_THM_ABS5		7
++#define R_ARM_ABS8		8	/* Direct 8 bit */
++#define R_ARM_SBREL32		9
++#define R_ARM_THM_PC22		10
++#define R_ARM_THM_PC8		11
++#define R_ARM_AMP_VCALL9	12
++#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
++#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
++#define R_ARM_THM_SWI8		14
++#define R_ARM_XPC25		15
++#define R_ARM_THM_XPC22		16
++#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
++#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
++#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
++#define R_ARM_COPY		20	/* Copy symbol at runtime */
++#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
++#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
++#define R_ARM_RELATIVE		23	/* Adjust by program base */
++#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
++#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
++#define R_ARM_GOT32		26	/* 32 bit GOT entry */
++#define R_ARM_PLT32		27	/* 32 bit PLT address */
++#define R_ARM_ALU_PCREL_7_0	32
++#define R_ARM_ALU_PCREL_15_8	33
++#define R_ARM_ALU_PCREL_23_15	34
++#define R_ARM_LDR_SBREL_11_0	35
++#define R_ARM_ALU_SBREL_19_12	36
++#define R_ARM_ALU_SBREL_27_20	37
++#define R_ARM_TLS_GOTDESC	90
++#define R_ARM_TLS_CALL		91
++#define R_ARM_TLS_DESCSEQ	92
++#define R_ARM_THM_TLS_CALL	93
++#define R_ARM_GNU_VTENTRY	100
++#define R_ARM_GNU_VTINHERIT	101
++#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
++#define R_ARM_THM_PC9		103	/* thumb conditional branch */
++#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
++					   thread local data */
++#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
++					   thread local data */
++#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
++					   block */
++#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
++					   static TLS block offset */
++#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
++					   TLS block */
++#define	R_ARM_THM_TLS_DESCSEQ	129
++#define R_ARM_IRELATIVE		160
++#define R_ARM_RXPC25		249
++#define R_ARM_RSBREL32		250
++#define R_ARM_THM_RPC22		251
++#define R_ARM_RREL32		252
++#define R_ARM_RABS22		253
++#define R_ARM_RPC24		254
++#define R_ARM_RBASE		255
++/* Keep this the last entry.  */
++#define R_ARM_NUM		256
++
++/* IA-64 specific declarations.  */
++
++/* Processor specific flags for the Ehdr e_flags field.  */
++#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
++#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
++#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
++#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
++#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
++#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
++#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
++
++/* Processor specific flags for the Phdr p_flags field.  */
++#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
++#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
++
++/* Processor specific flags for the Shdr sh_flags field.  */
++#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
++#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Dyn d_tag field.  */
++#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
++#define DT_IA_64_NUM		1
++
++/* IA-64 relocations.  */
++#define R_IA64_NONE		0x00	/* none */
++#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
++#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
++#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
++#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
++#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
++#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
++#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
++#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
++#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
++#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
++#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
++#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
++#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
++#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
++#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
++#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
++#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
++#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
++#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
++#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
++#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
++#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
++#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
++#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
++#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
++#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
++#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
++#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
++#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
++#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
++#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
++#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
++#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
++#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
++#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
++#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
++#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
++#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
++#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
++#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
++#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
++#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
++#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
++#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
++#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
++#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
++#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
++#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
++#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
++#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
++#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
++#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
++#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
++#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
++#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
++#define R_IA64_COPY		0x84	/* copy relocation */
++#define R_IA64_SUB		0x85	/* Addend and symbol difference */
++#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
++#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
++#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
++#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
++#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
++#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
++#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
++#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
++#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
++#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
++#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
++#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
++#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
++#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
++#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
++#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
++
++/* SH specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_SH_MACH_MASK		0x1f
++#define EF_SH_UNKNOWN		0x0
++#define EF_SH1			0x1
++#define EF_SH2			0x2
++#define EF_SH3			0x3
++#define EF_SH_DSP		0x4
++#define EF_SH3_DSP		0x5
++#define EF_SH4AL_DSP		0x6
++#define EF_SH3E			0x8
++#define EF_SH4			0x9
++#define EF_SH2E			0xb
++#define EF_SH4A			0xc
++#define EF_SH2A			0xd
++#define EF_SH4_NOFPU		0x10
++#define EF_SH4A_NOFPU		0x11
++#define EF_SH4_NOMMU_NOFPU	0x12
++#define EF_SH2A_NOFPU		0x13
++#define EF_SH3_NOMMU		0x14
++#define EF_SH2A_SH4_NOFPU	0x15
++#define EF_SH2A_SH3_NOFPU	0x16
++#define EF_SH2A_SH4		0x17
++#define EF_SH2A_SH3E		0x18
++
++/* SH relocs.  */
++#define	R_SH_NONE		0
++#define	R_SH_DIR32		1
++#define	R_SH_REL32		2
++#define	R_SH_DIR8WPN		3
++#define	R_SH_IND12W		4
++#define	R_SH_DIR8WPL		5
++#define	R_SH_DIR8WPZ		6
++#define	R_SH_DIR8BP		7
++#define	R_SH_DIR8W		8
++#define	R_SH_DIR8L		9
++#define	R_SH_SWITCH16		25
++#define	R_SH_SWITCH32		26
++#define	R_SH_USES		27
++#define	R_SH_COUNT		28
++#define	R_SH_ALIGN		29
++#define	R_SH_CODE		30
++#define	R_SH_DATA		31
++#define	R_SH_LABEL		32
++#define	R_SH_SWITCH8		33
++#define	R_SH_GNU_VTINHERIT	34
++#define	R_SH_GNU_VTENTRY	35
++#define	R_SH_TLS_GD_32		144
++#define	R_SH_TLS_LD_32		145
++#define	R_SH_TLS_LDO_32		146
++#define	R_SH_TLS_IE_32		147
++#define	R_SH_TLS_LE_32		148
++#define	R_SH_TLS_DTPMOD32	149
++#define	R_SH_TLS_DTPOFF32	150
++#define	R_SH_TLS_TPOFF32	151
++#define	R_SH_GOT32		160
++#define	R_SH_PLT32		161
++#define	R_SH_COPY		162
++#define	R_SH_GLOB_DAT		163
++#define	R_SH_JMP_SLOT		164
++#define	R_SH_RELATIVE		165
++#define	R_SH_GOTOFF		166
++#define	R_SH_GOTPC		167
++/* Keep this the last entry.  */
++#define	R_SH_NUM		256
++
++/* S/390 specific definitions.  */
++
++/* Valid values for the e_flags field.  */
++
++#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
++
++/* Additional s390 relocs */
++
++#define R_390_NONE		0	/* No reloc.  */
++#define R_390_8			1	/* Direct 8 bit.  */
++#define R_390_12		2	/* Direct 12 bit.  */
++#define R_390_16		3	/* Direct 16 bit.  */
++#define R_390_32		4	/* Direct 32 bit.  */
++#define R_390_PC32		5	/* PC relative 32 bit.	*/
++#define R_390_GOT12		6	/* 12 bit GOT offset.  */
++#define R_390_GOT32		7	/* 32 bit GOT offset.  */
++#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
++#define R_390_COPY		9	/* Copy symbol at runtime.  */
++#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
++#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
++#define R_390_RELATIVE		12	/* Adjust by program base.  */
++#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
++#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
++#define R_390_GOT16		15	/* 16 bit GOT offset.  */
++#define R_390_PC16		16	/* PC relative 16 bit.	*/
++#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
++#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
++#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
++#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
++#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
++#define R_390_64		22	/* Direct 64 bit.  */
++#define R_390_PC64		23	/* PC relative 64 bit.	*/
++#define R_390_GOT64		24	/* 64 bit GOT offset.  */
++#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
++#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
++#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
++#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
++#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
++#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
++#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
++#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
++#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
++#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
++#define R_390_TLS_GDCALL	38	/* Tag for function call in general
++					   dynamic TLS code. */
++#define R_390_TLS_LDCALL	39	/* Tag for function call in local
++					   dynamic TLS code. */
++#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
++					   thread local data.  */
++#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
++					  thread local data.  */
++#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
++					   block offset. */
++#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
++#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
++#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
++					   block.  */
++#define R_390_20		57	/* Direct 20 bit.  */
++#define R_390_GOT20		58	/* 20 bit GOT offset.  */
++#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
++#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
++/* Keep this the last entry.  */
++#define R_390_NUM		62
++
++
++/* CRIS relocations.  */
++#define R_CRIS_NONE		0
++#define R_CRIS_8		1
++#define R_CRIS_16		2
++#define R_CRIS_32		3
++#define R_CRIS_8_PCREL		4
++#define R_CRIS_16_PCREL		5
++#define R_CRIS_32_PCREL		6
++#define R_CRIS_GNU_VTINHERIT	7
++#define R_CRIS_GNU_VTENTRY	8
++#define R_CRIS_COPY		9
++#define R_CRIS_GLOB_DAT		10
++#define R_CRIS_JUMP_SLOT	11
++#define R_CRIS_RELATIVE		12
++#define R_CRIS_16_GOT		13
++#define R_CRIS_32_GOT		14
++#define R_CRIS_16_GOTPLT	15
++#define R_CRIS_32_GOTPLT	16
++#define R_CRIS_32_GOTREL	17
++#define R_CRIS_32_PLT_GOTREL	18
++#define R_CRIS_32_PLT_PCREL	19
++
++#define R_CRIS_NUM		20
++
++
++/* AMD x86-64 relocations.  */
++#define R_X86_64_NONE		0	/* No reloc */
++#define R_X86_64_64		1	/* Direct 64 bit  */
++#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
++#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
++#define R_X86_64_PLT32		4	/* 32 bit PLT address */
++#define R_X86_64_COPY		5	/* Copy symbol at runtime */
++#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
++#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
++#define R_X86_64_RELATIVE	8	/* Adjust by program base */
++#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
++					   offset to GOT */
++#define R_X86_64_32		10	/* Direct 32 bit zero extended */
++#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
++#define R_X86_64_16		12	/* Direct 16 bit zero extended */
++#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
++#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
++#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
++#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
++#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
++#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
++#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
++					   to two GOT entries for GD symbol */
++#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
++					   to two GOT entries for LD symbol */
++#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
++#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
++					   to GOT entry for IE symbol */
++#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
++#define R_X86_64_PC64		24	/* PC relative 64 bit */
++#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
++#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
++					   offset to GOT */
++#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
++#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
++					   to GOT entry */
++#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
++#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
++#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
++					   to PLT entry */
++#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
++#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
++#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
++#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
++					   descriptor.  */
++#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
++#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
++#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
++
++#define R_X86_64_NUM		39
++
++
++/* AM33 relocations.  */
++#define R_MN10300_NONE		0	/* No reloc.  */
++#define R_MN10300_32		1	/* Direct 32 bit.  */
++#define R_MN10300_16		2	/* Direct 16 bit.  */
++#define R_MN10300_8		3	/* Direct 8 bit.  */
++#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
++#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
++#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
++#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
++#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
++#define R_MN10300_24		9	/* Direct 24 bit.  */
++#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
++#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
++#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
++#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
++#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
++#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
++#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
++#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
++#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
++#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
++#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
++#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
++
++#define R_MN10300_NUM		24
++
++
++/* M32R relocs.  */
++#define R_M32R_NONE		0	/* No reloc. */
++#define R_M32R_16		1	/* Direct 16 bit. */
++#define R_M32R_32		2	/* Direct 32 bit. */
++#define R_M32R_24		3	/* Direct 24 bit. */
++#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
++#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
++#define R_M32R_LO16		9	/* Low 16 bit. */
++#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
++#define R_M32R_GNU_VTINHERIT	11
++#define R_M32R_GNU_VTENTRY	12
++/* M32R relocs use SHT_RELA.  */
++#define R_M32R_16_RELA		33	/* Direct 16 bit. */
++#define R_M32R_32_RELA		34	/* Direct 32 bit. */
++#define R_M32R_24_RELA		35	/* Direct 24 bit. */
++#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
++#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
++#define R_M32R_LO16_RELA	41	/* Low 16 bit */
++#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
++#define R_M32R_RELA_GNU_VTINHERIT	43
++#define R_M32R_RELA_GNU_VTENTRY	44
++#define R_M32R_REL32		45	/* PC relative 32 bit.  */
++
++#define R_M32R_GOT24		48	/* 24 bit GOT entry */
++#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
++#define R_M32R_COPY		50	/* Copy symbol at runtime */
++#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
++#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
++#define R_M32R_RELATIVE		53	/* Adjust by program base */
++#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
++#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
++#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
++					   low */
++#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
++					   low */
++#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
++#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
++					   GOT with unsigned low */
++#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
++					   GOT with signed low */
++#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
++					   GOT */
++#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
++					   with unsigned low */
++#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
++					   with signed low */
++#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
++#define R_M32R_NUM		256	/* Keep this the last entry. */
++
++
++/* TILEPro relocations.  */
++#define R_TILEPRO_NONE		0	/* No reloc */
++#define R_TILEPRO_32		1	/* Direct 32 bit */
++#define R_TILEPRO_16		2	/* Direct 16 bit */
++#define R_TILEPRO_8		3	/* Direct 8 bit */
++#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
++#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
++#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
++#define R_TILEPRO_LO16		7	/* Low 16 bit */
++#define R_TILEPRO_HI16		8	/* High 16 bit */
++#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
++#define R_TILEPRO_COPY		10	/* Copy relocation */
++#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
++#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
++#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
++#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
++#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
++#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
++#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
++#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
++#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
++#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
++#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
++#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
++#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
++#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
++#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
++#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
++#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
++#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
++#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
++/* Relocs 56-59 are currently not defined.  */
++#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
++#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
++#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
++#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
++#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
++#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
++
++#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEPRO_NUM		130
++
++
++/* TILE-Gx relocations.  */
++#define R_TILEGX_NONE		0	/* No reloc */
++#define R_TILEGX_64		1	/* Direct 64 bit */
++#define R_TILEGX_32		2	/* Direct 32 bit */
++#define R_TILEGX_16		3	/* Direct 16 bit */
++#define R_TILEGX_8		4	/* Direct 8 bit */
++#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
++#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
++#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
++#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
++#define R_TILEGX_HW0		9	/* hword 0 16-bit */
++#define R_TILEGX_HW1		10	/* hword 1 16-bit */
++#define R_TILEGX_HW2		11	/* hword 2 16-bit */
++#define R_TILEGX_HW3		12	/* hword 3 16-bit */
++#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
++#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
++#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
++#define R_TILEGX_COPY		16	/* Copy relocation */
++#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
++#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
++#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
++#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
++#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
++#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
++#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
++#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
++#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
++#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
++#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
++#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
++#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
++#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
++#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
++#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
++#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
++#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
++#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
++#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
++#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
++#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
++#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
++#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
++#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
++#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
++#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
++/* Relocs 66-71 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
++#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
++/* Relocs 76-77 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
++/* Relocs 90-91 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
++/* Relocs 94-99 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
++/* Relocs 104-105 are currently not defined.  */
++#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
++#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
++#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
++#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
++#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
++
++#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEGX_NUM		130
++
++#endif	/* elf.h */
diff --git a/trunk/target/linux/generic/patches-3.10/212-byteshift_portability.patch b/trunk/target/linux/generic/patches-3.10/212-byteshift_portability.patch
new file mode 100644
index 00000000..bba55f53
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/212-byteshift_portability.patch
@@ -0,0 +1,53 @@
+--- a/tools/include/tools/be_byteshift.h
++++ b/tools/include/tools/be_byteshift.h
+@@ -1,7 +1,11 @@
+ #ifndef _TOOLS_BE_BYTESHIFT_H
+ #define _TOOLS_BE_BYTESHIFT_H
+ 
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#include "linux_types.h"
++#endif
+ 
+ static inline __u16 __get_unaligned_be16(const __u8 *p)
+ {
+--- a/tools/include/tools/le_byteshift.h
++++ b/tools/include/tools/le_byteshift.h
+@@ -1,7 +1,11 @@
+ #ifndef _TOOLS_LE_BYTESHIFT_H
+ #define _TOOLS_LE_BYTESHIFT_H
+ 
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#include "linux_types.h"
++#endif
+ 
+ static inline __u16 __get_unaligned_le16(const __u8 *p)
+ {
+--- /dev/null
++++ b/tools/include/tools/linux_types.h
+@@ -0,0 +1,22 @@
++#ifndef __LINUX_TYPES_H
++#define __LINUX_TYPES_H
++
++#include <stdint.h>
++
++typedef uint8_t __u8;
++typedef uint8_t __be8;
++typedef uint8_t __le8;
++
++typedef uint16_t __u16;
++typedef uint16_t __be16;
++typedef uint16_t __le16;
++
++typedef uint32_t __u32;
++typedef uint32_t __be32;
++typedef uint32_t __le32;
++
++typedef uint64_t __u64;
++typedef uint64_t __be64;
++typedef uint64_t __le64;
++
++#endif
diff --git a/trunk/target/linux/generic/patches-3.10/220-gc_sections.patch b/trunk/target/linux/generic/patches-3.10/220-gc_sections.patch
new file mode 100644
index 00000000..22f85ba7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/220-gc_sections.patch
@@ -0,0 +1,545 @@
+From: Felix Fietkau <nbd@openwrt.org>
+
+use -ffunction-sections, -fdata-sections and --gc-sections --sort-section=name
+
+In combination with kernel symbol export stripping this significantly reduces
+the kernel image size. Used on both ARM and MIPS architectures.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -89,10 +89,14 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ #
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y			+= -msoft-float
+-LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
++LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
++endif
++
+ cflags-y += -ffreestanding
+ 
+ #
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -67,7 +67,7 @@ SECTIONS
+ 	/* Exception table for data bus errors */
+ 	__dbe_table : {
+ 		__start___dbe_table = .;
+-		*(__dbe_table)
++		KEEP(*(__dbe_table))
+ 		__stop___dbe_table = .;
+ 	}
+ 
+@@ -112,7 +112,7 @@ SECTIONS
+ 	. = ALIGN(4);
+ 	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
+ 		__mips_machines_start = .;
+-		*(.mips.machines.init)
++		KEEP(*(.mips.machines.init))
+ 		__mips_machines_end = .;
+ 	}
+ 
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -95,7 +95,7 @@
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ #define MCOUNT_REC()	. = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__start_mcount_loc) = .; \
+-			*(__mcount_loc)				\
++			KEEP(*(__mcount_loc))			\
+ 			VMLINUX_SYMBOL(__stop_mcount_loc) = .;
+ #else
+ #define MCOUNT_REC()
+@@ -103,7 +103,7 @@
+ 
+ #ifdef CONFIG_TRACE_BRANCH_PROFILING
+ #define LIKELY_PROFILE()	VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
+-				*(_ftrace_annotated_branch)			      \
++				KEEP(*(_ftrace_annotated_branch))		      \
+ 				VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
+ #else
+ #define LIKELY_PROFILE()
+@@ -111,7 +111,7 @@
+ 
+ #ifdef CONFIG_PROFILE_ALL_BRANCHES
+ #define BRANCH_PROFILE()	VMLINUX_SYMBOL(__start_branch_profile) = .;   \
+-				*(_ftrace_branch)			      \
++				KEEP(*(_ftrace_branch))			      \
+ 				VMLINUX_SYMBOL(__stop_branch_profile) = .;
+ #else
+ #define BRANCH_PROFILE()
+@@ -120,7 +120,7 @@
+ #ifdef CONFIG_EVENT_TRACING
+ #define FTRACE_EVENTS()	. = ALIGN(8);					\
+ 			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\
+-			*(_ftrace_events)				\
++			KEEP(*(_ftrace_events))				\
+ 			VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+ #else
+ #define FTRACE_EVENTS()
+@@ -128,7 +128,7 @@
+ 
+ #ifdef CONFIG_TRACING
+ #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .;      \
+-			 *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
++			 KEEP(*(__trace_printk_fmt)) /* Trace_printk fmt' pointer */ \
+ 			 VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
+ #else
+ #define TRACE_PRINTKS()
+@@ -137,7 +137,7 @@
+ #ifdef CONFIG_FTRACE_SYSCALLS
+ #define TRACE_SYSCALLS() . = ALIGN(8);					\
+ 			 VMLINUX_SYMBOL(__start_syscalls_metadata) = .;	\
+-			 *(__syscalls_metadata)				\
++			 KEEP(*(__syscalls_metadata))			\
+ 			 VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
+ #else
+ #define TRACE_SYSCALLS()
+@@ -146,8 +146,8 @@
+ #ifdef CONFIG_CLKSRC_OF
+ #define CLKSRC_OF_TABLES() . = ALIGN(8);				\
+ 			   VMLINUX_SYMBOL(__clksrc_of_table) = .;	\
+-			   *(__clksrc_of_table)				\
+-			   *(__clksrc_of_table_end)
++			   KEEP(*(__clksrc_of_table))			\
++			   KEEP(*(__clksrc_of_table_end))
+ #else
+ #define CLKSRC_OF_TABLES()
+ #endif
+@@ -156,8 +156,8 @@
+ #define IRQCHIP_OF_MATCH_TABLE()					\
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__irqchip_begin) = .;				\
+-	*(__irqchip_of_table)		  				\
+-	*(__irqchip_of_end)
++	KEEP(*(__irqchip_of_table))	  				\
++	KEEP(*(__irqchip_of_end))
+ #else
+ #define IRQCHIP_OF_MATCH_TABLE()
+ #endif
+@@ -165,8 +165,8 @@
+ #ifdef CONFIG_COMMON_CLK
+ #define CLK_OF_TABLES() . = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__clk_of_table) = .;	\
+-			*(__clk_of_table)			\
+-			*(__clk_of_table_end)
++			KEEP(*(__clk_of_table))			\
++			KEEP(*(__clk_of_table_end))
+ #else
+ #define CLK_OF_TABLES()
+ #endif
+@@ -174,7 +174,7 @@
+ #define KERNEL_DTB()							\
+ 	STRUCT_ALIGN();							\
+ 	VMLINUX_SYMBOL(__dtb_start) = .;				\
+-	*(.dtb.init.rodata)						\
++	KEEP(*(.dtb.init.rodata))					\
+ 	VMLINUX_SYMBOL(__dtb_end) = .;
+ 
+ /* .data section */
+@@ -194,15 +194,16 @@
+ 	/* implement dynamic printk debug */				\
+ 	. = ALIGN(8);                                                   \
+ 	VMLINUX_SYMBOL(__start___jump_table) = .;                       \
+-	*(__jump_table)                                                 \
++	KEEP(*(__jump_table))                                           \
+ 	VMLINUX_SYMBOL(__stop___jump_table) = .;                        \
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__start___verbose) = .;                          \
+-	*(__verbose)                                                    \
++	KEEP(*(__verbose))                                              \
+ 	VMLINUX_SYMBOL(__stop___verbose) = .;				\
+ 	LIKELY_PROFILE()		       				\
+ 	BRANCH_PROFILE()						\
+-	TRACE_PRINTKS()
++	TRACE_PRINTKS()							\
++	*(.data.[a-zA-Z_]*)
+ 
+ /*
+  * Data section helpers
+@@ -256,39 +257,39 @@
+ 	/* PCI quirks */						\
+ 	.pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_early) = .;		\
+-		*(.pci_fixup_early)					\
++		KEEP(*(.pci_fixup_early))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_early) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_header) = .;		\
+-		*(.pci_fixup_header)					\
++		KEEP(*(.pci_fixup_header))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_header) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_final) = .;		\
+-		*(.pci_fixup_final)					\
++		KEEP(*(.pci_fixup_final))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_final) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;		\
+-		*(.pci_fixup_enable)					\
++		KEEP(*(.pci_fixup_enable))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;		\
+-		*(.pci_fixup_resume)					\
++		KEEP(*(.pci_fixup_resume))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;	\
+-		*(.pci_fixup_resume_early)				\
++		KEEP(*(.pci_fixup_resume_early))			\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;		\
+-		*(.pci_fixup_suspend)					\
++		KEEP(*(.pci_fixup_suspend))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;		\
+ 	}								\
+ 									\
+ 	/* Built-in firmware blobs */					\
+ 	.builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_builtin_fw) = .;			\
+-		*(.builtin_fw)						\
++		KEEP(*(.builtin_fw))					\
+ 		VMLINUX_SYMBOL(__end_builtin_fw) = .;			\
+ 	}								\
+ 									\
+ 	/* RapidIO route ops */						\
+ 	.rio_ops        : AT(ADDR(.rio_ops) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start_rio_switch_ops) = .;		\
+-		*(.rio_switch_ops)					\
++		KEEP(*(.rio_switch_ops))				\
+ 		VMLINUX_SYMBOL(__end_rio_switch_ops) = .;		\
+ 	}								\
+ 									\
+@@ -297,49 +298,49 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		*(SORT(___ksymtab+*))					\
++		KEEP(*(SORT(___ksymtab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		*(SORT(___ksymtab_gpl+*))				\
++		KEEP(*(SORT(___ksymtab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal unused symbols */		\
+ 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
+-		*(SORT(___ksymtab_unused+*))				\
++		KEEP(*(SORT(___ksymtab_unused+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
+-		*(SORT(___ksymtab_unused_gpl+*))			\
++		KEEP(*(SORT(___ksymtab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
+-		*(SORT(___ksymtab_gpl_future+*))			\
++		KEEP(*(SORT(___ksymtab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__kcrctab         : AT(ADDR(__kcrctab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___kcrctab) = .;			\
+-		*(SORT(___kcrctab+*))					\
++		KEEP(*(SORT(___kcrctab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__kcrctab_gpl     : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl) = .;		\
+-		*(SORT(___kcrctab_gpl+*))				\
++		KEEP(*(SORT(___kcrctab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -353,14 +354,14 @@
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .;	\
+-		*(SORT(___kcrctab_unused_gpl+*))			\
++		KEEP(*(SORT(___kcrctab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .;	\
+-		*(SORT(___kcrctab_gpl_future+*))			\
++		KEEP(*(SORT(___kcrctab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .;	\
+ 	}								\
+ 									\
+@@ -383,14 +384,14 @@
+ 	/* Built-in module parameters. */				\
+ 	__param : AT(ADDR(__param) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___param) = .;			\
+-		*(__param)						\
++		KEEP(*(__param))					\
+ 		VMLINUX_SYMBOL(__stop___param) = .;			\
+ 	}								\
+ 									\
+ 	/* Built-in module versions. */					\
+ 	__modver : AT(ADDR(__modver) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___modver) = .;			\
+-		*(__modver)						\
++		KEEP(*(__modver))					\
+ 		VMLINUX_SYMBOL(__stop___modver) = .;			\
+ 		. = ALIGN((align));					\
+ 		VMLINUX_SYMBOL(__end_rodata) = .;			\
+@@ -450,7 +451,7 @@
+ #define ENTRY_TEXT							\
+ 		ALIGN_FUNCTION();					\
+ 		VMLINUX_SYMBOL(__entry_text_start) = .;			\
+-		*(.entry.text)						\
++		KEEP(*(.entry.text))					\
+ 		VMLINUX_SYMBOL(__entry_text_end) = .;
+ 
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+@@ -478,7 +479,7 @@
+ 	. = ALIGN(align);						\
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ex_table) = .;			\
+-		*(__ex_table)						\
++		KEEP(*(__ex_table))						\
+ 		VMLINUX_SYMBOL(__stop___ex_table) = .;			\
+ 	}
+ 
+@@ -494,7 +495,7 @@
+ #ifdef CONFIG_CONSTRUCTORS
+ #define KERNEL_CTORS()	. = ALIGN(8);			   \
+ 			VMLINUX_SYMBOL(__ctors_start) = .; \
+-			*(.ctors)			   \
++			KEEP(*(.ctors))			   \
+ 			VMLINUX_SYMBOL(__ctors_end) = .;
+ #else
+ #define KERNEL_CTORS()
+@@ -550,7 +551,7 @@
+ #define SBSS(sbss_align)						\
+ 	. = ALIGN(sbss_align);						\
+ 	.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {				\
+-		*(.sbss)						\
++		*(.sbss .sbss.*)					\
+ 		*(.scommon)						\
+ 	}
+ 
+@@ -568,7 +569,7 @@
+ 		BSS_FIRST_SECTIONS					\
+ 		*(.bss..page_aligned)					\
+ 		*(.dynbss)						\
+-		*(.bss)							\
++		*(.bss .bss.*)						\
+ 		*(COMMON)						\
+ 	}
+ 
+@@ -617,7 +618,7 @@
+ 	. = ALIGN(8);							\
+ 	__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___bug_table) = .;		\
+-		*(__bug_table)						\
++		KEEP(*(__bug_table))					\
+ 		VMLINUX_SYMBOL(__stop___bug_table) = .;			\
+ 	}
+ #else
+@@ -629,7 +630,7 @@
+ 	. = ALIGN(4);							\
+ 	.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__tracedata_start) = .;			\
+-		*(.tracedata)						\
++		KEEP(*(.tracedata))					\
+ 		VMLINUX_SYMBOL(__tracedata_end) = .;			\
+ 	}
+ #else
+@@ -646,17 +647,17 @@
+ #define INIT_SETUP(initsetup_align)					\
+ 		. = ALIGN(initsetup_align);				\
+ 		VMLINUX_SYMBOL(__setup_start) = .;			\
+-		*(.init.setup)						\
++		KEEP(*(.init.setup))					\
+ 		VMLINUX_SYMBOL(__setup_end) = .;
+ 
+ #define INIT_CALLS_LEVEL(level)						\
+ 		VMLINUX_SYMBOL(__initcall##level##_start) = .;		\
+-		*(.initcall##level##.init)				\
+-		*(.initcall##level##s.init)				\
++		KEEP(*(.initcall##level##.init))			\
++		KEEP(*(.initcall##level##s.init))			\
+ 
+ #define INIT_CALLS							\
+ 		VMLINUX_SYMBOL(__initcall_start) = .;			\
+-		*(.initcallearly.init)					\
++		KEEP(*(.initcallearly.init))				\
+ 		INIT_CALLS_LEVEL(0)					\
+ 		INIT_CALLS_LEVEL(1)					\
+ 		INIT_CALLS_LEVEL(2)					\
+@@ -670,21 +671,21 @@
+ 
+ #define CON_INITCALL							\
+ 		VMLINUX_SYMBOL(__con_initcall_start) = .;		\
+-		*(.con_initcall.init)					\
++		KEEP(*(.con_initcall.init))				\
+ 		VMLINUX_SYMBOL(__con_initcall_end) = .;
+ 
+ #define SECURITY_INITCALL						\
+ 		VMLINUX_SYMBOL(__security_initcall_start) = .;		\
+-		*(.security_initcall.init)				\
++		KEEP(*(.security_initcall.init))			\
+ 		VMLINUX_SYMBOL(__security_initcall_end) = .;
+ 
+ #ifdef CONFIG_BLK_DEV_INITRD
+ #define INIT_RAM_FS							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__initramfs_start) = .;				\
+-	*(.init.ramfs)							\
++	KEEP(*(.init.ramfs))						\
+ 	. = ALIGN(8);							\
+-	*(.init.ramfs.info)
++	KEEP(*(.init.ramfs.info))
+ #else
+ #define INIT_RAM_FS
+ #endif
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
+@@ -17,11 +17,16 @@ LDFLAGS_vmlinux	:=-p --no-undefined -X
+ ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
+ LDFLAGS_vmlinux	+= --be8
+ endif
++LDFLAGS_vmlinux += --gc-sections --sort-section=name
+ 
+ OBJCOPYFLAGS	:=-O binary -R .comment -S
+ GZFLAGS		:=-9
+ #KBUILD_CFLAGS	+=-pipe
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
++endif
++
+ # Never generate .eh_frame
+ KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
+ 
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -12,13 +12,13 @@
+ #define PROC_INFO							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__proc_info_begin) = .;				\
+-	*(.proc.info.init)						\
++	KEEP(*(.proc.info.init))					\
+ 	VMLINUX_SYMBOL(__proc_info_end) = .;
+ 
+ #define IDMAP_TEXT							\
+ 	ALIGN_FUNCTION();						\
+ 	VMLINUX_SYMBOL(__idmap_text_start) = .;				\
+-	*(.idmap.text)							\
++	KEEP(*(.idmap.text))						\
+ 	VMLINUX_SYMBOL(__idmap_text_end) = .;				\
+ 	. = ALIGN(32);							\
+ 	VMLINUX_SYMBOL(__hyp_idmap_text_start) = .;			\
+@@ -97,7 +97,7 @@ SECTIONS
+ 	.text : {			/* Real text segment		*/
+ 		_stext = .;		/* Text and read-only data	*/
+ 			__exception_text_start = .;
+-			*(.exception.text)
++			KEEP(*(.exception.text))
+ 			__exception_text_end = .;
+ 			IRQENTRY_TEXT
+ 			TEXT_TEXT
+@@ -122,7 +122,7 @@ SECTIONS
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+ 		__start___ex_table = .;
+ #ifdef CONFIG_MMU
+-		*(__ex_table)
++		KEEP(*(__ex_table))
+ #endif
+ 		__stop___ex_table = .;
+ 	}
+@@ -134,12 +134,12 @@ SECTIONS
+ 	. = ALIGN(8);
+ 	.ARM.unwind_idx : {
+ 		__start_unwind_idx = .;
+-		*(.ARM.exidx*)
++		KEEP(*(.ARM.exidx*))
+ 		__stop_unwind_idx = .;
+ 	}
+ 	.ARM.unwind_tab : {
+ 		__start_unwind_tab = .;
+-		*(.ARM.extab*)
++		KEEP(*(.ARM.extab*))
+ 		__stop_unwind_tab = .;
+ 	}
+ #endif
+@@ -158,14 +158,14 @@ SECTIONS
+ 	 */
+ 	__vectors_start = .;
+ 	.vectors 0 : AT(__vectors_start) {
+-		*(.vectors)
++		KEEP(*(.vectors))
+ 	}
+ 	. = __vectors_start + SIZEOF(.vectors);
+ 	__vectors_end = .;
+ 
+ 	__stubs_start = .;
+ 	.stubs 0x1000 : AT(__stubs_start) {
+-		*(.stubs)
++		KEEP(*(.stubs))
+ 	}
+ 	. = __stubs_start + SIZEOF(.stubs);
+ 	__stubs_end = .;
+@@ -179,24 +179,24 @@ SECTIONS
+ 	}
+ 	.init.arch.info : {
+ 		__arch_info_begin = .;
+-		*(.arch.info.init)
++		KEEP(*(.arch.info.init))
+ 		__arch_info_end = .;
+ 	}
+ 	.init.tagtable : {
+ 		__tagtable_begin = .;
+-		*(.taglist.init)
++		KEEP(*(.taglist.init))
+ 		__tagtable_end = .;
+ 	}
+ #ifdef CONFIG_SMP_ON_UP
+ 	.init.smpalt : {
+ 		__smpalt_begin = .;
+-		*(.alt.smp.init)
++		KEEP(*(.alt.smp.init))
+ 		__smpalt_end = .;
+ 	}
+ #endif
+ 	.init.pv_table : {
+ 		__pv_table_begin = .;
+-		*(.pv_table)
++		KEEP(*(.pv_table))
+ 		__pv_table_end = .;
+ 	}
+ 	.init.data : {
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -123,6 +123,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
+ endif
++KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
+ 
+ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)
+ asflags-y := -DZIMAGE
diff --git a/trunk/target/linux/generic/patches-3.10/221-module_exports.patch b/trunk/target/linux/generic/patches-3.10/221-module_exports.patch
new file mode 100644
index 00000000..19680f6b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/221-module_exports.patch
@@ -0,0 +1,88 @@
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -52,6 +52,16 @@
+ #define LOAD_OFFSET 0
+ #endif
+ 
++#ifndef SYMTAB_KEEP
++#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*)))
++#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*)))
++#endif
++
++#ifndef SYMTAB_DISCARD
++#define SYMTAB_DISCARD
++#define SYMTAB_DISCARD_GPL
++#endif
++
+ #include <linux/export.h>
+ 
+ /* Align . to a 8 byte boundary equals to maximum function alignment. */
+@@ -298,14 +308,14 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		KEEP(*(SORT(___ksymtab+*)))				\
++		SYMTAB_KEEP						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		KEEP(*(SORT(___ksymtab_gpl+*)))				\
++		SYMTAB_KEEP_GPL						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -367,7 +377,7 @@
+ 									\
+ 	/* Kernel symbol table: strings */				\
+         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
+-		*(__ksymtab_strings)					\
++		*(__ksymtab_strings+*)					\
+ 	}								\
+ 									\
+ 	/* __*init sections */						\
+@@ -704,6 +714,8 @@
+ 	EXIT_TEXT							\
+ 	EXIT_DATA							\
+ 	EXIT_CALL							\
++	SYMTAB_DISCARD							\
++	SYMTAB_DISCARD_GPL						\
+ 	*(.discard)							\
+ 	*(.discard.*)							\
+ 	}
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -349,7 +349,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
+ # Linker scripts preprocessor (.lds.S -> .lds)
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds_S = LDS     $@
+-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
++      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \
+ 	                     -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
+ 
+ $(obj)/%.lds: $(src)/%.lds.S FORCE
+--- a/include/linux/export.h
++++ b/include/linux/export.h
+@@ -52,12 +52,19 @@ extern struct module __this_module;
+ #define __CRC_SYMBOL(sym, sec)
+ #endif
+ 
++#ifdef MODULE
++#define __EXPORT_SUFFIX(sym)
++#else
++#define __EXPORT_SUFFIX(sym) "+" #sym
++#endif
++
+ /* For every exported symbol, place a struct in the __ksymtab section */
+ #define __EXPORT_SYMBOL(sym, sec)				\
+ 	extern typeof(sym) sym;					\
+ 	__CRC_SYMBOL(sym, sec)					\
+ 	static const char __kstrtab_##sym[]			\
+-	__attribute__((section("__ksymtab_strings"), aligned(1))) \
++	__attribute__((section("__ksymtab_strings"		\
++	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
+ 	= VMLINUX_SYMBOL_STR(sym);				\
+ 	static const struct kernel_symbol __ksymtab_##sym	\
+ 	__used							\
diff --git a/trunk/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch b/trunk/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch
new file mode 100644
index 00000000..a02f14c2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch
@@ -0,0 +1,54 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -226,7 +226,7 @@ cpio_list=
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -n -9 -f"
++compr="gzip -n -9 -f -"
+ 
+ arg="$1"
+ case "$arg" in
+@@ -240,9 +240,9 @@ case "$arg" in
+ 		output_file="$1"
+ 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
+ 		output=${cpio_list}
+-		echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f"
+-		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+-		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
++		echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f -"
++		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
++		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
+ 		echo "$output_file" | grep -q "\.xz$" && \
+ 				compr="xz --check=crc32 --lzma2=dict=1MiB"
+ 		echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
+@@ -303,7 +303,7 @@ if [ ! -z ${output_file} ]; then
+ 	if [ "${is_cpio_compressed}" = "compressed" ]; then
+ 		cat ${cpio_tfile} > ${output_file}
+ 	else
+-		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
++		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
+ 		|| (rm -f ${output_file} ; false)
+ 	fi
+ 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
+--- a/lib/decompress.c
++++ b/lib/decompress.c
+@@ -43,6 +43,7 @@ static const struct compress_format comp
+ 	{ {037, 0236}, "gzip", gunzip },
+ 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
+ 	{ {0x5d, 0x00}, "lzma", unlzma },
++	{ {0x6d, 0x00}, "lzma-librecmc", unlzma },
+ 	{ {0xfd, 0x37}, "xz", unxz },
+ 	{ {0x89, 0x4c}, "lzo", unlzo },
+ 	{ {0, 0}, NULL, NULL }
diff --git a/trunk/target/linux/generic/patches-3.10/250-netfilter_depends.patch b/trunk/target/linux/generic/patches-3.10/250-netfilter_depends.patch
new file mode 100644
index 00000000..884b6868
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/250-netfilter_depends.patch
@@ -0,0 +1,18 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -195,7 +195,6 @@ config NF_CONNTRACK_FTP
+ 
+ config NF_CONNTRACK_H323
+ 	tristate "H.323 protocol support"
+-	depends on (IPV6 || IPV6=n)
+ 	depends on NETFILTER_ADVANCED
+ 	help
+ 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
+@@ -758,7 +757,6 @@ config NETFILTER_XT_TARGET_SECMARK
+ 
+ config NETFILTER_XT_TARGET_TCPMSS
+ 	tristate '"TCPMSS" target support'
+-	depends on (IPV6 || IPV6=n)
+ 	default m if NETFILTER_ADVANCED=n
+ 	---help---
+ 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/trunk/target/linux/generic/patches-3.10/251-sound_kconfig.patch b/trunk/target/linux/generic/patches-3.10/251-sound_kconfig.patch
new file mode 100644
index 00000000..916363c8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/251-sound_kconfig.patch
@@ -0,0 +1,18 @@
+--- a/sound/core/Kconfig
++++ b/sound/core/Kconfig
+@@ -7,13 +7,13 @@ config SND_PCM
+ 	select SND_TIMER
+ 
+ config SND_HWDEP
+-	tristate
++	tristate "Sound hardware support"
+ 
+ config SND_RAWMIDI
+ 	tristate
+ 
+ config SND_COMPRESS_OFFLOAD
+-	tristate
++	tristate "Compression offloading support"
+ 
+ # To be effective this also requires INPUT - users should say:
+ #    select SND_JACK if INPUT=y || INPUT=SND
diff --git a/trunk/target/linux/generic/patches-3.10/252-mv_cesa_depends.patch b/trunk/target/linux/generic/patches-3.10/252-mv_cesa_depends.patch
new file mode 100644
index 00000000..fee28db1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/252-mv_cesa_depends.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
+ 	depends on PLAT_ORION
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES
++	select CRYPTO_HASH2
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_HASH
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.10/253-ssb_b43_default_on.patch b/trunk/target/linux/generic/patches-3.10/253-ssb_b43_default_on.patch
new file mode 100644
index 00000000..29d2a41a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/253-ssb_b43_default_on.patch
@@ -0,0 +1,29 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+ 	bool
+ 	depends on SSB
++	default y
+ 
+ config SSB_PCIHOST_POSSIBLE
+ 	bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
+ config SSB_B43_PCI_BRIDGE
+ 	bool
+ 	depends on SSB_PCIHOST
+-	default n
++	default y
+ 
+ config SSB_PCMCIAHOST_POSSIBLE
+ 	bool
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -17,6 +17,7 @@ config BCMA
+ config BCMA_BLOCKIO
+ 	bool
+ 	depends on BCMA
++	default y
+ 
+ config BCMA_HOST_PCI_POSSIBLE
+ 	bool
diff --git a/trunk/target/linux/generic/patches-3.10/254-textsearch_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.10/254-textsearch_kconfig_hacks.patch
new file mode 100644
index 00000000..9b0ed648
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/254-textsearch_kconfig_hacks.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -280,16 +280,16 @@ config BCH_CONST_T
+ # Textsearch support is select'ed if needed
+ #
+ config TEXTSEARCH
+-	boolean
++	boolean	"Textsearch support"
+ 
+ config TEXTSEARCH_KMP
+-	tristate
++	tristate "Textsearch KMP"
+ 
+ config TEXTSEARCH_BM
+-	tristate
++	tristate "Textsearch BM"
+ 
+ config TEXTSEARCH_FSM
+-	tristate
++	tristate "Textsearch FSM"
+ 
+ config BTREE
+ 	boolean
diff --git a/trunk/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch
new file mode 100644
index 00000000..36281930
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch
@@ -0,0 +1,31 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -140,7 +140,7 @@ config CFG80211_WEXT
+ 	  extensions with cfg80211-based drivers.
+ 
+ config LIB80211
+-	tristate
++	tristate "LIB80211"
+ 	default n
+ 	help
+ 	  This options enables a library of common routines used
+@@ -149,13 +149,16 @@ config LIB80211
+ 	  Drivers should select this themselves if needed.
+ 
+ config LIB80211_CRYPT_WEP
+-	tristate
++	tristate "LIB80211_CRYPT_WEP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_CCMP
+-	tristate
++	tristate "LIB80211_CRYPT_CCMP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_TKIP
+-	tristate
++	tristate "LIB80211_CRYPT_TKIP"
++	select LIB80211
+ 
+ config LIB80211_DEBUG
+ 	bool "lib80211 debugging messages"
diff --git a/trunk/target/linux/generic/patches-3.10/256-crypto_add_kconfig_prompts.patch b/trunk/target/linux/generic/patches-3.10/256-crypto_add_kconfig_prompts.patch
new file mode 100644
index 00000000..8462c711
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/256-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -31,7 +31,7 @@ config CRYPTO_FIPS
+ 	  this is.
+ 
+ config CRYPTO_ALGAPI
+-	tristate
++	tristate "ALGAPI"
+ 	select CRYPTO_ALGAPI2
+ 	help
+ 	  This option provides the API for cryptographic algorithms.
+@@ -40,7 +40,7 @@ config CRYPTO_ALGAPI2
+ 	tristate
+ 
+ config CRYPTO_AEAD
+-	tristate
++	tristate "AEAD"
+ 	select CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -49,7 +49,7 @@ config CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_BLKCIPHER
+-	tristate
++	tristate "BLKCIPHER"
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -60,7 +60,7 @@ config CRYPTO_BLKCIPHER2
+ 	select CRYPTO_WORKQUEUE
+ 
+ config CRYPTO_HASH
+-	tristate
++	tristate "HASH"
+ 	select CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -69,7 +69,7 @@ config CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_RNG
+-	tristate
++	tristate "RNG"
+ 	select CRYPTO_RNG2
+ 	select CRYPTO_ALGAPI
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/257-wireless_ext_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.10/257-wireless_ext_kconfig_hack.patch
new file mode 100644
index 00000000..daac5898
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/257-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-	bool
++	bool "Wireless extensions"
+ 
+ config WEXT_CORE
+ 	def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+ 	depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-	bool
++	bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-	bool
++	bool "WEXT_PRIV"
+ 
+ config CFG80211
+ 	tristate "cfg80211 - wireless configuration API"
diff --git a/trunk/target/linux/generic/patches-3.10/258-netfilter_netlink_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.10/258-netfilter_netlink_kconfig_hack.patch
new file mode 100644
index 00000000..9d827c25
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/258-netfilter_netlink_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -2,7 +2,7 @@ menu "Core Netfilter Configuration"
+ 	depends on NET && INET && NETFILTER
+ 
+ config NETFILTER_NETLINK
+-	tristate
++	tristate "Netfilter NFNETLINK interface"
+ 
+ config NETFILTER_NETLINK_ACCT
+ tristate "Netfilter NFACCT over NFNETLINK interface"
diff --git a/trunk/target/linux/generic/patches-3.10/259-regmap_dynamic.patch b/trunk/target/linux/generic/patches-3.10/259-regmap_dynamic.patch
new file mode 100644
index 00000000..8627bcc3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/259-regmap_dynamic.patch
@@ -0,0 +1,72 @@
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
+@@ -3,20 +3,24 @@
+ # subsystems should select the appropriate symbols.
+ 
+ config REGMAP
+-	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_MMIO || REGMAP_IRQ)
+ 	select LZO_COMPRESS
+ 	select LZO_DECOMPRESS
+ 	select IRQ_DOMAIN if REGMAP_IRQ
+-	bool
++	tristate "Regmap"
+ 
+ config REGMAP_I2C
+-	tristate
++	select REGMAP
++	tristate "Regmap I2C"
+ 
+ config REGMAP_SPI
+-	tristate
++	select REGMAP
++	depends on SPI_MASTER
++	tristate "Regmap SPI"
+ 
+ config REGMAP_MMIO
++	select REGMAP
+ 	tristate
+ 
+ config REGMAP_IRQ
++	select REGMAP
+ 	bool
+--- a/include/linux/regmap.h
++++ b/include/linux/regmap.h
+@@ -47,7 +47,7 @@ struct reg_default {
+ 	unsigned int def;
+ };
+ 
+-#ifdef CONFIG_REGMAP
++#if IS_ENABLED(CONFIG_REGMAP)
+ 
+ enum regmap_endian {
+ 	/* Unspecified -> 0 -> Backwards compatible default */
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
+@@ -1,6 +1,8 @@
+-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
+-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
+-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o
++ifdef CONFIG_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_MMIO) += regmap-mmio.o
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/device.h>
+ #include <linux/slab.h>
+ #include <linux/export.h>
++#include <linux/module.h>
+ #include <linux/mutex.h>
+ #include <linux/err.h>
+ #include <linux/rbtree.h>
+@@ -1815,3 +1816,5 @@ static int __init regmap_initcall(void)
+ 	return 0;
+ }
+ postcore_initcall(regmap_initcall);
++
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch b/trunk/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch
new file mode 100644
index 00000000..a28f6930
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch
@@ -0,0 +1,37 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -95,10 +95,10 @@ config CRYPTO_MANAGER
+ 
+ config CRYPTO_MANAGER2
+ 	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+-	select CRYPTO_AEAD2
+-	select CRYPTO_HASH2
+-	select CRYPTO_BLKCIPHER2
+-	select CRYPTO_PCOMP2
++	select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
+ 
+ config CRYPTO_USER
+ 	tristate "Userspace cryptographic algorithm configuration"
+--- a/crypto/algboss.c
++++ b/crypto/algboss.c
+@@ -248,6 +248,9 @@ static int cryptomgr_schedule_test(struc
+ 	type = alg->cra_flags;
+ 
+ 	/* This piece of crap needs to disappear into per-type test hooks. */
++#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
++	type |= CRYPTO_ALG_TESTED;
++#else
+ 	if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
+ 	       CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
+ 	     ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+@@ -256,6 +259,7 @@ static int cryptomgr_schedule_test(struc
+ 	    (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
+ 	     alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
+ 		type |= CRYPTO_ALG_TESTED;
++#endif
+ 
+ 	param->type = type;
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/262-compressor_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.10/262-compressor_kconfig_hack.patch
new file mode 100644
index 00000000..0a89a090
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/262-compressor_kconfig_hack.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -178,16 +178,16 @@ config AUDIT_GENERIC
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++	tristate "ZLIB inflate support"
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "ZLIB deflate support"
+ 
+ config LZO_COMPRESS
+-	tristate
++	tristate "LZO compress support"
+ 
+ config LZO_DECOMPRESS
+-	tristate
++	tristate "LZO decompress support"
+ 
+ source "lib/xz/Kconfig"
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch b/trunk/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch
new file mode 100644
index 00000000..de5e9b8e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch
@@ -0,0 +1,39 @@
+From: Mark Miller <mark@mirell.org>
+
+This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
+certain Broadcom chipsets running CFE in order to load the kernel.
+
+Signed-off-by: Mark Miller <mark@mirell.org>
+Acked-by: Rob Landley <rob@landley.net>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -896,9 +896,6 @@ config FW_ARC
+ config ARCH_MAY_HAVE_PC_FDC
+ 	bool
+ 
+-config BOOT_RAW
+-	bool
+-
+ config CEVT_BCM1480
+ 	bool
+ 
+@@ -2396,6 +2393,18 @@ config USE_OF
+ 	select OF_EARLY_FLATTREE
+ 	select IRQ_DOMAIN
+ 
++config BOOT_RAW
++	bool "Enable the kernel to be executed from the load address"
++	default n
++	help
++	 Allow the kernel to be executed from the load address for
++	 bootloaders which cannot read the ELF format. This places
++	 a jump to start_kernel at the load address.
++
++	 If unsure, say N.
++
++
++
+ endmenu
+ 
+ config LOCKDEP_SUPPORT
diff --git a/trunk/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch b/trunk/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch
new file mode 100644
index 00000000..a6d0c309
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -993,6 +993,10 @@ config SYNC_R4K
+ config MIPS_MACHINE
+ 	def_bool n
+ 
++config IMAGE_CMDLINE_HACK
++	bool "libreCMC specific image command line hack"
++	default n
++
+ config NO_IOPORT
+ 	def_bool n
+ 
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -140,6 +140,12 @@ FEXPORT(__kernel_entry)
+ 	j	kernel_entry
+ #endif
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++	.ascii	"CMDLINE:"
++EXPORT(__image_cmdline)
++	.fill	0x400
++#endif /* CONFIG_IMAGE_CMDLINE_HACK */
++
+ 	__REF
+ 
+ NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/trunk/target/linux/generic/patches-3.10/302-mips_no_branch_likely.patch b/trunk/target/linux/generic/patches-3.10/302-mips_no_branch_likely.patch
new file mode 100644
index 00000000..19adcb80
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/302-mips_no_branch_likely.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -87,7 +87,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ # machines may also.  Since BFD is incredibly buggy with respect to
+ # crossformat linking we rely on the elf2ecoff tool for format conversion.
+ #
+-cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
++cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
diff --git a/trunk/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch b/trunk/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch
new file mode 100644
index 00000000..89e6edcf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch
@@ -0,0 +1,160 @@
+MIPS: allow disabling the kernel FPU emulator
+
+This patch allows turning off the in-kernel Algorithmics
+FPU emulator support, which allows one to save a couple of
+precious blocks on an embedded system.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+--
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -981,6 +981,17 @@ config I8259
+ config MIPS_BONITO64
+ 	bool
+ 
++config MIPS_FPU_EMU
++	bool "Enable FPU emulation"
++	default y
++	help
++	   This option allows building a kernel with or without the Algorithmics
++	   FPU emulator enabled. Turning off this option results in a kernel which
++	   does not catch floating operations exceptions. Make sure that your toolchain
++	   is configured to enable software floating point emulation in that case.
++
++	   If unsure say Y here.
++
+ config MIPS_MSC
+ 	bool
+ 
+--- a/arch/mips/math-emu/Makefile
++++ b/arch/mips/math-emu/Makefile
+@@ -2,10 +2,12 @@
+ # Makefile for the Linux/MIPS kernel FPU emulation.
+ #
+ 
+-obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
++obj-y	:= kernel_linkage.o
++
++obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
+ 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
+ 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
+ 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
+ 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
+ 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
+-	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
++	   dp_sqrt.o sp_sqrt.o dsemul.o cp1emu.o
+--- a/arch/mips/math-emu/kernel_linkage.c
++++ b/arch/mips/math-emu/kernel_linkage.c
+@@ -29,6 +29,7 @@
+ 
+ #define SIGNALLING_NAN 0x7ff800007ff80000LL
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ void fpu_emulator_init_fpu(void)
+ {
+ 	static int first = 1;
+@@ -113,3 +114,36 @@ int fpu_emulator_restore_context32(struc
+ 	return err;
+ }
+ #endif
++
++#else
++
++void fpu_emulator_init_fpu(void)
++{
++	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
++		"was compiled with software floating point support (soft-float)\n");
++	return;
++}
++
++int fpu_emulator_save_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++#ifdef CONFIG_64BIT
++int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++#endif /* CONFIG_64BIT */
++
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/include/asm/fpu_emulator.h
++++ b/arch/mips/include/asm/fpu_emulator.h
+@@ -27,6 +27,8 @@
+ #include <asm/inst.h>
+ #include <asm/local.h>
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
++
+ #ifdef CONFIG_DEBUG_FS
+ 
+ struct mips_fpu_emulator_stats {
+@@ -60,6 +62,38 @@ extern int fpu_emulator_cop1Handler(stru
+ int process_fpemu_return(int sig, void __user *fault_addr);
+ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
+ 		     unsigned long *contpc);
++#else
++static inline int mips_dsemul(struct pt_regs *regs, mips_instruction ir,
++			      unsigned long cpc)
++{
++	return 0;
++}
++
++static inline int do_dsemulret(struct pt_regs *xcp)
++{
++	return 0;
++}
++
++static inline int fpu_emulator_cop1Handler(struct pt_regs *xcp,
++					   struct mips_fpu_struct *ctx,
++					   int has_fpu,
++					   void *__user *fault_addr)
++{
++	return 0;
++}
++
++static inline int process_fpemu_return(int sig, void __user *fault_addr)
++{
++	return -EINVAL;
++}
++
++static inline int mm_isBranchInstr(struct pt_regs *regs,
++				   struct mm_decoded_insn dec_insn,
++				   unsigned long *contpc)
++{
++	return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+ 
+ /*
+  * Instruction inserted following the badinst to further tag the sequence
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -684,6 +684,7 @@ asmlinkage void do_ov(struct pt_regs *re
+ 	force_sig_info(SIGFPE, &info, current);
+ }
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ int process_fpemu_return(int sig, void __user *fault_addr)
+ {
+ 	if (sig == SIGSEGV || sig == SIGBUS) {
+@@ -707,6 +708,7 @@ int process_fpemu_return(int sig, void _
+ 		return 0;
+ 	}
+ }
++#endif /* CONFIG_MIPS_FPU_EMU */
+ 
+ /*
+  * XXX Delayed fp exceptions when doing a lazy ctx switch XXX
diff --git a/trunk/target/linux/generic/patches-3.10/305-mips_module_reloc.patch b/trunk/target/linux/generic/patches-3.10/305-mips_module_reloc.patch
new file mode 100644
index 00000000..0566eef1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/305-mips_module_reloc.patch
@@ -0,0 +1,352 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
++ifdef CONFIG_64BIT
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
++else
++KBUILD_AFLAGS_MODULE		+= -mno-long-calls
++KBUILD_CFLAGS_MODULE		+= -mno-long-calls
++endif
+ 
+ ifndef CONFIG_FUNCTION_TRACER
+ KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -11,6 +11,11 @@ struct mod_arch_specific {
+ 	const struct exception_table_entry *dbe_start;
+ 	const struct exception_table_entry *dbe_end;
+ 	struct mips_hi16 *r_mips_hi16_list;
++
++	void *phys_plt_tbl;
++	void *virt_plt_tbl;
++	unsigned int phys_plt_offset;
++	unsigned int virt_plt_offset;
+ };
+ 
+ typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -42,14 +42,222 @@ struct mips_hi16 {
+ static LIST_HEAD(dbe_list);
+ static DEFINE_SPINLOCK(dbe_lock);
+ 
+-#ifdef MODULE_START
++/*
++ * Get the potential max trampolines size required of the init and
++ * non-init sections. Only used if we cannot find enough contiguous
++ * physically mapped memory to put the module into.
++ */
++static unsigned int
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
++             const char *secstrings, unsigned int symindex, bool is_init)
++{
++	unsigned long ret = 0;
++	unsigned int i, j;
++	Elf_Sym *syms;
++
++	/* Everything marked ALLOC (this includes the exported symbols) */
++	for (i = 1; i < hdr->e_shnum; ++i) {
++		unsigned int info = sechdrs[i].sh_info;
++
++		if (sechdrs[i].sh_type != SHT_REL
++		    && sechdrs[i].sh_type != SHT_RELA)
++			continue;
++
++		/* Not a valid relocation section? */
++		if (info >= hdr->e_shnum)
++			continue;
++
++		/* Don't bother with non-allocated sections */
++		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
++			continue;
++
++		/* If it's called *.init*, and we're not init, we're
++                   not interested */
++		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
++		    != is_init)
++			continue;
++
++		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
++		if (sechdrs[i].sh_type == SHT_REL) {
++			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rel[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		} else {
++			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rela[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		}
++	}
++
++	return ret;
++}
++
++#ifndef MODULE_START
++static void *alloc_phys(unsigned long size)
++{
++	unsigned order;
++	struct page *page;
++	struct page *p;
++
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
++
++	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
++			__GFP_THISNODE, order);
++	if (!page)
++		return NULL;
++
++	split_page(page, order);
++
++	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
++		__free_page(p);
++
++	return page_address(page);
++}
++#endif
++
++static void free_phys(void *ptr, unsigned long size)
++{
++	struct page *page;
++	struct page *end;
++
++	page = virt_to_page(ptr);
++	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
++
++	for (; page < end; ++page)
++		__free_page(page);
++}
++
++
+ void *module_alloc(unsigned long size)
+ {
++#ifdef MODULE_START
+ 	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+ 				GFP_KERNEL, PAGE_KERNEL, -1,
+ 				__builtin_return_address(0));
++#else
++	void *ptr;
++
++	if (size == 0)
++		return NULL;
++
++	ptr = alloc_phys(size);
++
++	/* If we failed to allocate physically contiguous memory,
++	 * fall back to regular vmalloc. The module loader code will
++	 * create jump tables to handle long jumps */
++	if (!ptr)
++		return vmalloc(size);
++
++	return ptr;
++#endif
+ }
++
++static inline bool is_phys_addr(void *ptr)
++{
++#ifdef CONFIG_64BIT
++	return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else
++	return (KSEGX(ptr) == KSEG0);
+ #endif
++}
++
++/* Free memory returned from module_alloc */
++void module_free(struct module *mod, void *module_region)
++{
++	if (is_phys_addr(module_region)) {
++		if (mod->module_init == module_region)
++			free_phys(module_region, mod->init_size);
++		else if (mod->module_core == module_region)
++			free_phys(module_region, mod->core_size);
++		else
++			BUG();
++	} else {
++		vfree(module_region);
++	}
++}
++
++static void *__module_alloc(int size, bool phys)
++{
++	void *ptr;
++
++	if (phys)
++		ptr = kmalloc(size, GFP_KERNEL);
++	else
++		ptr = vmalloc(size);
++	return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++	if (is_phys_addr(ptr))
++		kfree(ptr);
++	else
++		vfree(ptr);
++}
++
++int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
++			      char *secstrings, struct module *mod)
++{
++	unsigned int symindex = 0;
++	unsigned int core_size, init_size;
++	int i;
++
++	mod->arch.phys_plt_offset = 0;
++	mod->arch.virt_plt_offset = 0;
++	mod->arch.phys_plt_tbl = NULL;
++	mod->arch.virt_plt_tbl = NULL;
++
++	if (IS_ENABLED(CONFIG_64BIT))
++		return 0;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (sechdrs[i].sh_type == SHT_SYMTAB)
++			symindex = i;
++
++	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
++	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
++
++	if ((core_size + init_size) == 0)
++		return 0;
++
++	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++	if (!mod->arch.phys_plt_tbl)
++		return -ENOMEM;
++
++	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++	if (!mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++		return -ENOMEM;
++	}
++
++	return 0;
++}
+ 
+ int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+ {
+@@ -63,8 +271,39 @@ static int apply_r_mips_32_rel(struct mo
+ 	return 0;
+ }
+ 
++static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
++				 void *start, Elf_Addr v)
++{
++	unsigned *tramp = start + *plt_offset;
++	*plt_offset += 4 * sizeof(int);
++
++	/* adjust carry for addiu */
++	if (v & 0x00008000)
++		v += 0x10000;
++
++	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
++	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
++	tramp[2] = 0x03200008;                  /* jr t9 */
++	tramp[3] = 0x00000000;                  /* nop */
++
++	return (Elf_Addr) tramp;
++}
++
++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++	if (is_phys_addr(location))
++		return add_plt_entry_to(&me->arch.phys_plt_offset,
++				me->arch.phys_plt_tbl, v);
++	else
++		return add_plt_entry_to(&me->arch.virt_plt_offset,
++				me->arch.virt_plt_tbl, v);
++
++}
++
+ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
+ {
++	u32 ofs = *location & 0x03ffffff;
++
+ 	if (v % 4) {
+ 		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
+ 		       me->name);
+@@ -72,14 +311,17 @@ static int apply_r_mips_26_rel(struct mo
+ 	}
+ 
+ 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-		printk(KERN_ERR
+-		       "module %s: relocation overflow\n",
+-		       me->name);
+-		return -ENOEXEC;
++		v = add_plt_entry(me, location, v + (ofs << 2));
++		if (!v) {
++			printk(KERN_ERR
++				"module %s: relocation overflow\n", me->name);
++			return -ENOEXEC;
++		}
++		ofs = 0;
+ 	}
+ 
+ 	*location = (*location & ~0x03ffffff) |
+-		    ((*location + (v >> 2)) & 0x03ffffff);
++		    ((ofs + (v >> 2)) & 0x03ffffff);
+ 
+ 	return 0;
+ }
+@@ -286,11 +528,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		list_add(&me->arch.dbe_list, &dbe_list);
+ 		spin_unlock_irq(&dbe_lock);
+ 	}
++
++	/* Get rid of the fixup trampoline if we're running the module
++	 * from physically mapped address space */
++	if (me->arch.phys_plt_offset == 0) {
++		__module_free(me->arch.phys_plt_tbl);
++		me->arch.phys_plt_tbl = NULL;
++	}
++	if (me->arch.virt_plt_offset == 0) {
++		__module_free(me->arch.virt_plt_tbl);
++		me->arch.virt_plt_tbl = NULL;
++	}
++
+ 	return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++	if (mod->arch.phys_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++	}
++	if (mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.virt_plt_tbl);
++		mod->arch.virt_plt_tbl = NULL;
++	}
++
+ 	spin_lock_irq(&dbe_lock);
+ 	list_del(&mod->arch.dbe_list);
+ 	spin_unlock_irq(&dbe_lock);
diff --git a/trunk/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch b/trunk/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch
new file mode 100644
index 00000000..e6056fa5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch
@@ -0,0 +1,83 @@
+--- a/arch/mips/include/asm/string.h
++++ b/arch/mips/include/asm/string.h
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
+ 
+ #define __HAVE_ARCH_MEMSET
+ extern void *memset(void *__s, int __c, size_t __count);
++#define memset(__s, __c, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memset((__s), (__c), __len);		\
++	else							\
++		__ret = __builtin_memset((__s), (__c), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMCPY
+ extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
++#define memcpy(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memcpy((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memcpy((dst), (src), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMMOVE
+ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
++#define memmove(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memmove((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memmove((dst), (src), __len);	\
++	__ret;							\
++})
++
++#define __HAVE_ARCH_MEMCMP
++#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
+ 
+ #endif /* _ASM_STRING_H */
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
+@@ -4,7 +4,7 @@
+ 
+ lib-y	+= bitops.o csum_partial.o delay.o memcpy.o memset.o \
+ 	   mips-atomic.o strlen_user.o strncpy_user.o \
+-	   strnlen_user.o uncached.o
++	   strnlen_user.o uncached.o memcmp.o
+ 
+ obj-y			+= iomap.o
+ obj-$(CONFIG_PCI)	+= iomap-pci.o
+--- /dev/null
++++ b/arch/mips/lib/memcmp.c
+@@ -0,0 +1,22 @@
++/*
++ *  copied from linux/lib/string.c
++ *
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
++
++#include <linux/module.h>
++#include <linux/string.h>
++
++#undef memcmp
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++	const unsigned char *su1, *su2;
++	int res = 0;
++
++	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
++		if ((res = *su1 - *su2) != 0)
++			break;
++	return res;
++}
++EXPORT_SYMBOL(memcmp);
++
diff --git a/trunk/target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch b/trunk/target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch
new file mode 100644
index 00000000..6a8f5b1b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/307-mips-Reimplement-get_cycles.patch
@@ -0,0 +1,69 @@
+From 9c9b415c50bc298ac61412dff856eae2f54889ee Mon Sep 17 00:00:00 2001
+From: Ralf Baechle <ralf@linux-mips.org>
+Date: Thu, 12 Sep 2013 13:47:32 +0200
+Subject: [PATCH] MIPS: Reimplement get_cycles().
+
+This essentially reverts commit efb9ca08b5a2374b29938cdcab417ce4feb14b54
+(kernel.org) / 58020a106879a8b372068741c81f0015c9b0b96dbv [[MIPS] Change
+get_cycles to always return 0.]
+
+Most users of get_cycles() invoke it as a timing interface.  That's why
+in modern kernels it was never very much missed for.  /dev/random however
+uses get_cycles() in the how the jitter in the interrupt timing contains
+some useful entropy.
+
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ arch/mips/include/asm/timex.h |   33 ++++++++++++++++++++++++++++++++-
+ 1 file changed, 32 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/timex.h
++++ b/arch/mips/include/asm/timex.h
+@@ -10,6 +10,7 @@
+ 
+ #ifdef __KERNEL__
+ 
++#include <asm/cpu-features.h>
+ #include <asm/mipsregs.h>
+ 
+ /*
+@@ -33,9 +34,38 @@
+ 
+ typedef unsigned int cycles_t;
+ 
++/*
++ * On R4000/R4400 before version 5.0 an erratum exists such that if the
++ * cycle counter is read in the exact moment that it is matching the
++ * compare register, no interrupt will be generated.
++ *
++ * There is a suggested workaround and also the erratum can't strike if
++ * the compare interrupt isn't being used as the clock source device.
++ * However for now the implementaton of this function doesn't get these
++ * fine details right.
++ */
+ static inline cycles_t get_cycles(void)
+ {
+-	return 0;
++	switch (cpu_data[0].cputype) {
++	case CPU_R4400PC:
++	case CPU_R4400SC:
++	case CPU_R4400MC:
++		if ((read_c0_prid() & 0xff) >= 0x0050)
++			return read_c0_count();
++		break;
++
++        case CPU_R4000PC:
++        case CPU_R4000SC:
++        case CPU_R4000MC:
++		break;
++
++	default:
++		if (cpu_has_counter)
++			return read_c0_count();
++		break;
++	}
++
++	return 0;	/* no usable counter */
+ }
+ 
+ #endif /* __KERNEL__ */
diff --git a/trunk/target/linux/generic/patches-3.10/309-mips_fuse_workaround.patch b/trunk/target/linux/generic/patches-3.10/309-mips_fuse_workaround.patch
new file mode 100644
index 00000000..1975215a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/309-mips_fuse_workaround.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -39,6 +39,7 @@ void (*__flush_kernel_vmap_range)(unsign
+ void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);
+ 
+ EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
++EXPORT_SYMBOL(__flush_cache_all);
+ 
+ /* MIPS specific cache operations */
+ void (*flush_cache_sigtramp)(unsigned long addr);
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -20,6 +20,9 @@
+ #include <linux/swap.h>
+ #include <linux/splice.h>
+ #include <linux/aio.h>
++#ifdef CONFIG_MIPS
++#include <asm/cacheflush.h>
++#endif
+ 
+ MODULE_ALIAS_MISCDEV(FUSE_MINOR);
+ MODULE_ALIAS("devname:fuse");
+@@ -759,6 +762,9 @@ static int fuse_copy_fill(struct fuse_co
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
++#ifdef CONFIG_MIPS
++	__flush_cache_all();
++#endif
+ 	if (val) {
+ 		if (cs->write)
+ 			memcpy(cs->buf, *val, ncpy);
diff --git a/trunk/target/linux/generic/patches-3.10/310-arm_module_unresolved_weak_sym.patch b/trunk/target/linux/generic/patches-3.10/310-arm_module_unresolved_weak_sym.patch
new file mode 100644
index 00000000..d1eba550
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/310-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -81,6 +81,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+ 			return -ENOEXEC;
+ 		}
+ 
++		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
++			continue;
++
+ 		loc = dstsec->sh_addr + rel->r_offset;
+ 
+ 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/trunk/target/linux/generic/patches-3.10/320-ppc4xx_optimization.patch b/trunk/target/linux/generic/patches-3.10/320-ppc4xx_optimization.patch
new file mode 100644
index 00000000..2974a7c7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/320-ppc4xx_optimization.patch
@@ -0,0 +1,31 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -139,7 +139,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS		+= -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++cpu-as-$(CONFIG_40x)		+= -Wa,-m405
++cpu-as-$(CONFIG_44x)		+= -Wa,-m440
+ cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec
+ cpu-as-$(CONFIG_E500)		+= -Wa,-me500
+ cpu-as-$(CONFIG_E200)		+= -Wa,-me200
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
+ DTC_FLAGS	?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
diff --git a/trunk/target/linux/generic/patches-3.10/321-powerpc_crtsavres_prereq.patch b/trunk/target/linux/generic/patches-3.10/321-powerpc_crtsavres_prereq.patch
new file mode 100644
index 00000000..b360d2bd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/321-powerpc_crtsavres_prereq.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -106,7 +106,6 @@ CPP		= $(CC) -E $(KBUILD_CFLAGS)
+ 
+ CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
+ 
+-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
+ 
+ # No AltiVec or VSX instructions when building kernel
+ KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
diff --git a/trunk/target/linux/generic/patches-3.10/322-ppc4xx-crypto-compile-fix.patch b/trunk/target/linux/generic/patches-3.10/322-ppc4xx-crypto-compile-fix.patch
new file mode 100644
index 00000000..226e4115
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/322-ppc4xx-crypto-compile-fix.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/amcc/crypto4xx_core.c
++++ b/drivers/crypto/amcc/crypto4xx_core.c
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/interrupt.h>
+ #include <linux/spinlock_types.h>
+ #include <linux/random.h>
diff --git a/trunk/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch b/trunk/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch
new file mode 100644
index 00000000..683e218f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch
@@ -0,0 +1,285 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -12,6 +12,32 @@ menuconfig MTD
+ 
+ if MTD
+ 
++menu "libreCMC specific MTD options"
++
++config MTD_ROOTFS_ROOT_DEV
++	bool "Automatically set 'rootfs' partition to be root filesystem"
++	default y
++
++config MTD_ROOTFS_SPLIT
++	bool "Automatically split 'rootfs' partition for squashfs"
++	default y
++
++config MTD_SPLIT_FIRMWARE
++	bool "Automatically split firmware partition for kernel+rootfs"
++	default y
++
++config MTD_SPLIT_FIRMWARE_NAME
++	string "Firmware partition name"
++	depends on MTD_SPLIT_FIRMWARE
++	default "firmware"
++
++config MTD_UIMAGE_SPLIT
++	bool "Enable split support for firmware partitions containing a uImage"
++	depends on MTD_SPLIT_FIRMWARE
++	default y
++
++endmenu
++
+ config MTD_TESTS
+ 	tristate "MTD tests support (DANGEROUS)"
+ 	depends on m
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -29,6 +29,7 @@
+ #include <linux/kmod.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/magic.h>
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
+@@ -45,13 +46,14 @@ struct mtd_part {
+ 	struct list_head list;
+ };
+ 
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
++
+ /*
+  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
+  * the pointer to that structure with this macro.
+  */
+ #define PART(x)  ((struct mtd_part *)(x))
+ 
+-
+ /*
+  * MTD methods which simply translate the effective address and pass through
+  * to the _real_ device.
+@@ -533,8 +535,10 @@ out_register:
+ 	return slave;
+ }
+ 
+-int mtd_add_partition(struct mtd_info *master, char *name,
+-		      long long offset, long long length)
++
++static int
++__mtd_add_partition(struct mtd_info *master, char *name,
++		    long long offset, long long length, bool dup_check)
+ {
+ 	struct mtd_partition part;
+ 	struct mtd_part *p, *new;
+@@ -566,21 +570,24 @@ int mtd_add_partition(struct mtd_info *m
+ 	end = offset + length;
+ 
+ 	mutex_lock(&mtd_partitions_mutex);
+-	list_for_each_entry(p, &mtd_partitions, list)
+-		if (p->master == master) {
+-			if ((start >= p->offset) &&
+-			    (start < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-
+-			if ((end >= p->offset) &&
+-			    (end < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-		}
++	if (dup_check) {
++		list_for_each_entry(p, &mtd_partitions, list)
++			if (p->master == master) {
++				if ((start >= p->offset) &&
++				    (start < (p->offset + p->mtd.size)))
++					goto err_inv;
++
++				if ((end >= p->offset) &&
++				    (end < (p->offset + p->mtd.size)))
++					goto err_inv;
++			}
++	}
+ 
+ 	list_add(&new->list, &mtd_partitions);
+ 	mutex_unlock(&mtd_partitions_mutex);
+ 
+ 	add_mtd_device(&new->mtd);
++	mtd_partition_split(master, new);
+ 
+ 	return ret;
+ err_inv:
+@@ -590,6 +597,12 @@ err_inv:
+ }
+ EXPORT_SYMBOL_GPL(mtd_add_partition);
+ 
++int mtd_add_partition(struct mtd_info *master, char *name,
++		      long long offset, long long length)
++{
++	return __mtd_add_partition(master, name, offset, length, true);
++}
++
+ int mtd_del_partition(struct mtd_info *master, int partno)
+ {
+ 	struct mtd_part *slave, *next;
+@@ -613,6 +626,144 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static inline unsigned long
++mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
++{
++	unsigned long mask = mtd->erasesize - 1;
++
++	len += offset & mask;
++	len = (len + mask) & ~mask;
++	len -= offset & mask;
++	return len;
++}
++
++#define ROOTFS_SPLIT_NAME "rootfs_data"
++
++struct squashfs_super_block {
++	__le32 s_magic;
++	__le32 pad0[9];
++	__le64 bytes_used;
++};
++
++
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++	struct squashfs_super_block sb;
++	int len, ret;
++
++	ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
++	if (ret || (len != sizeof(sb))) {
++		printk(KERN_ALERT "split_squashfs: error occured while reading "
++			"from \"%s\"\n", master->name);
++		return -EINVAL;
++	}
++
++	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
++		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	if (le64_to_cpu((sb.bytes_used)) <= 0) {
++		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	len = (u32) le64_to_cpu(sb.bytes_used);
++	len = mtd_pad_erasesize(master, offset, len);
++	*split_offset = offset + len;
++
++	return 0;
++}
++
++static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
++{
++	unsigned int split_offset = 0;
++	unsigned int split_size;
++	int ret;
++
++	ret = split_squashfs(master, part->offset, &split_offset);
++	if (ret)
++		return;
++
++	if (split_offset <= 0)
++		return;
++
++	split_size = part->mtd.size - (split_offset - part->offset);
++	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
++		ROOTFS_SPLIT_NAME, split_offset, split_size);
++
++	__mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
++			    split_size, false);
++}
++
++#define UBOOT_MAGIC	0x27051956
++
++static void split_uimage(struct mtd_info *master, struct mtd_part *part)
++{
++	struct {
++		__be32 magic;
++		__be32 pad[2];
++		__be32 size;
++	} hdr;
++	size_t len;
++
++	if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
++		return;
++
++	if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
++		return;
++
++	len = be32_to_cpu(hdr.size) + 0x40;
++	len = mtd_pad_erasesize(master, part->offset, len);
++	if (len + master->erasesize > part->mtd.size)
++		return;
++
++	__mtd_add_partition(master, "rootfs", part->offset + len,
++			    part->mtd.size - len, false);
++}
++
++#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#define SPLIT_FIRMWARE_NAME	CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#else
++#define SPLIT_FIRMWARE_NAME	"unused"
++#endif
++
++static void split_firmware(struct mtd_info *master, struct mtd_part *part)
++{
++	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
++		split_uimage(master, part);
++}
++
++void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
++                                int offset, int size)
++{
++}
++
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
++{
++	static int rootfs_found = 0;
++
++	if (rootfs_found)
++		return;
++
++	if (!strcmp(part->mtd.name, "rootfs")) {
++		rootfs_found = 1;
++
++		if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
++			split_rootfs_data(master, part);
++	}
++
++	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
++	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
++		split_firmware(master, part);
++
++	arch_split_mtd_part(master, part->mtd.name, part->offset,
++			    part->mtd.size);
++}
+ /*
+  * This function, given a master MTD object and a partition table, creates
+  * and registers slave MTD objects which are bound to the master according to
+@@ -642,6 +793,7 @@ int add_mtd_partitions(struct mtd_info *
+ 		mutex_unlock(&mtd_partitions_mutex);
+ 
+ 		add_mtd_device(&slave->mtd);
++		mtd_partition_split(master, slave);
+ 
+ 		cur_offset = slave->offset + slave->mtd.size;
+ 	}
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
++extern void __weak arch_split_mtd_part(struct mtd_info *master,
++				       const char *name, int offset, int size);
+ 
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.10/401-mtd-add-support-for-different-partition-parser-types.patch b/trunk/target/linux/generic/patches-3.10/401-mtd-add-support-for-different-partition-parser-types.patch
new file mode 100644
index 00000000..bd35aa7d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -0,0 +1,113 @@
+From 02cff0ccaa6d364f5c1eeea83f47ac80ccc967d4 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Tue, 3 Sep 2013 18:11:50 +0200
+Subject: [PATCH] mtd: add support for different partition parser types
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/mtdpart.c          |   56 ++++++++++++++++++++++++++++++++++++++++
+ include/linux/mtd/partitions.h |   11 ++++++++
+ 2 files changed, 67 insertions(+)
+
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -823,6 +823,30 @@ static struct mtd_part_parser *get_parti
+ 
+ #define put_partition_parser(p) do { module_put((p)->owner); } while (0)
+ 
++static struct mtd_part_parser *
++get_partition_parser_by_type(enum mtd_parser_type type,
++			     struct mtd_part_parser *start)
++{
++	struct mtd_part_parser *p, *ret = NULL;
++
++	spin_lock(&part_parser_lock);
++
++	p = list_prepare_entry(start, &part_parsers, list);
++	if (start)
++		put_partition_parser(start);
++
++	list_for_each_entry_continue(p, &part_parsers, list) {
++		if (p->type == type && try_module_get(p->owner)) {
++			ret = p;
++			break;
++		}
++	}
++
++	spin_unlock(&part_parser_lock);
++
++	return ret;
++}
++
+ int register_mtd_parser(struct mtd_part_parser *p)
+ {
+ 	spin_lock(&part_parser_lock);
+@@ -899,6 +923,38 @@ int parse_mtd_partitions(struct mtd_info
+ 	return ret;
+ }
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data)
++{
++	struct mtd_part_parser *prev = NULL;
++	int ret = 0;
++
++	while (1) {
++		struct mtd_part_parser *parser;
++
++		parser = get_partition_parser_by_type(type, prev);
++		if (!parser)
++			break;
++
++		ret = (*parser->parse_fn)(master, pparts, data);
++
++		if (ret > 0) {
++			put_partition_parser(parser);
++			printk(KERN_NOTICE
++			       "%d %s partitions found on MTD device %s\n",
++			       ret, parser->name, master->name);
++			break;
++		}
++
++		prev = parser;
++	}
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(parse_mtd_partitions_by_type);
++
+ int mtd_is_partition(const struct mtd_info *mtd)
+ {
+ 	struct mtd_part *part;
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -68,12 +68,17 @@ struct mtd_part_parser_data {
+  * Functions dealing with the various ways of partitioning the space
+  */
+ 
++enum mtd_parser_type {
++	MTD_PARSER_TYPE_DEVICE = 0,
++};
++
+ struct mtd_part_parser {
+ 	struct list_head list;
+ 	struct module *owner;
+ 	const char *name;
+ 	int (*parse_fn)(struct mtd_info *, struct mtd_partition **,
+ 			struct mtd_part_parser_data *);
++	enum mtd_parser_type type;
+ };
+ 
+ extern int register_mtd_parser(struct mtd_part_parser *parser);
+@@ -87,4 +92,9 @@ uint64_t mtd_get_device_size(const struc
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data);
++
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.10/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/trunk/target/linux/generic/patches-3.10/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
new file mode 100644
index 00000000..649693ff
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -0,0 +1,75 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -626,6 +626,37 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static int
++run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
++{
++	struct mtd_partition *parts;
++	int nr_parts;
++	int i;
++
++	nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, &parts,
++						NULL);
++	if (nr_parts <= 0)
++		return nr_parts;
++
++	if (WARN_ON(!parts))
++		return 0;
++
++	for (i = 0; i < nr_parts; i++) {
++		/* adjust partition offsets */
++		parts[i].offset += slave->offset;
++
++		__mtd_add_partition(slave->master,
++				    parts[i].name,
++				    parts[i].offset,
++				    parts[i].size,
++				    false);
++	}
++
++	kfree(parts);
++
++	return nr_parts;
++}
++
+ static inline unsigned long
+ mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
+ {
+@@ -685,6 +716,10 @@ static void split_rootfs_data(struct mtd
+ 	unsigned int split_size;
+ 	int ret;
+ 
++	ret = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++	if (ret > 0)
++		return;
++
+ 	ret = split_squashfs(master, part->offset, &split_offset);
+ 	if (ret)
+ 		return;
+@@ -734,6 +769,12 @@ static void split_uimage(struct mtd_info
+ 
+ static void split_firmware(struct mtd_info *master, struct mtd_part *part)
+ {
++	int ret;
++
++	ret = run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
++	if (ret > 0)
++		return;
++
+ 	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
+ 		split_uimage(master, part);
+ }
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -70,6 +70,8 @@ struct mtd_part_parser_data {
+ 
+ enum mtd_parser_type {
+ 	MTD_PARSER_TYPE_DEVICE = 0,
++	MTD_PARSER_TYPE_ROOTFS,
++	MTD_PARSER_TYPE_FIRMWARE,
+ };
+ 
+ struct mtd_part_parser {
diff --git a/trunk/target/linux/generic/patches-3.10/403-mtd-hook-mtdsplit-to-Kbuild.patch b/trunk/target/linux/generic/patches-3.10/403-mtd-hook-mtdsplit-to-Kbuild.patch
new file mode 100644
index 00000000..c24f34c5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/403-mtd-hook-mtdsplit-to-Kbuild.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -36,6 +36,11 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++config MTD_SPLIT
++	def_bool n
++	help 
++	  Generic MTD split support.
++
+ endmenu
+ 
+ config MTD_TESTS
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -6,6 +6,8 @@
+ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
++mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
+ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
diff --git a/trunk/target/linux/generic/patches-3.10/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch b/trunk/target/linux/generic/patches-3.10/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch
new file mode 100644
index 00000000..02e4e038
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch
@@ -0,0 +1,69 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -33,6 +33,7 @@
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
++#include "mtdsplit.h"
+ 
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+@@ -668,43 +669,16 @@ mtd_pad_erasesize(struct mtd_info *mtd, 
+ 	return len;
+ }
+ 
+-#define ROOTFS_SPLIT_NAME "rootfs_data"
+-
+-struct squashfs_super_block {
+-	__le32 s_magic;
+-	__le32 pad0[9];
+-	__le64 bytes_used;
+-};
+-
+-
+ static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
+ {
+-	struct squashfs_super_block sb;
++	size_t squashfs_len;
+ 	int len, ret;
+ 
+-	ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
+-	if (ret || (len != sizeof(sb))) {
+-		printk(KERN_ALERT "split_squashfs: error occured while reading "
+-			"from \"%s\"\n", master->name);
+-		return -EINVAL;
+-	}
+-
+-	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
+-		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
+-			master->name);
+-		*split_offset = 0;
+-		return 0;
+-	}
+-
+-	if (le64_to_cpu((sb.bytes_used)) <= 0) {
+-		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
+-			master->name);
+-		*split_offset = 0;
+-		return 0;
+-	}
++	ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
++	if (ret)
++		return ret;
+ 
+-	len = (u32) le64_to_cpu(sb.bytes_used);
+-	len = mtd_pad_erasesize(master, offset, len);
++	len = mtd_pad_erasesize(master, offset, squashfs_len);
+ 	*split_offset = offset + len;
+ 
+ 	return 0;
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -20,6 +20,7 @@ config MTD_ROOTFS_ROOT_DEV
+ 
+ config MTD_ROOTFS_SPLIT
+ 	bool "Automatically split 'rootfs' partition for squashfs"
++	select MTD_SPLIT
+ 	default y
+ 
+ config MTD_SPLIT_FIRMWARE
diff --git a/trunk/target/linux/generic/patches-3.10/405-mtd-add-more-helper-functions.patch b/trunk/target/linux/generic/patches-3.10/405-mtd-add-more-helper-functions.patch
new file mode 100644
index 00000000..9c75e5cb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/405-mtd-add-more-helper-functions.patch
@@ -0,0 +1,83 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -434,14 +434,12 @@ static struct mtd_part *allocate_partiti
+ 	if (slave->offset == MTDPART_OFS_APPEND)
+ 		slave->offset = cur_offset;
+ 	if (slave->offset == MTDPART_OFS_NXTBLK) {
+-		slave->offset = cur_offset;
+-		if (mtd_mod_by_eb(cur_offset, master) != 0) {
+-			/* Round up to next erasesize */
+-			slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
++		/* Round up to next erasesize */
++		slave->offset = mtd_roundup_to_eb(cur_offset, master);
++		if (slave->offset != cur_offset)
+ 			printk(KERN_NOTICE "Moving partition %d: "
+ 			       "0x%012llx -> 0x%012llx\n", partno,
+ 			       (unsigned long long)cur_offset, (unsigned long long)slave->offset);
+-		}
+ 	}
+ 	if (slave->offset == MTDPART_OFS_RETAIN) {
+ 		slave->offset = cur_offset;
+@@ -987,6 +985,24 @@ int mtd_is_partition(const struct mtd_in
+ }
+ EXPORT_SYMBOL_GPL(mtd_is_partition);
+ 
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return (struct mtd_info *)mtd;
++
++	return PART(mtd)->master;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_master);
++
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return 0;
++
++	return PART(mtd)->offset;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_offset);
++
+ /* Returns the size of the entire flash chip */
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd)
+ {
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -90,6 +90,8 @@ int mtd_is_partition(const struct mtd_in
+ int mtd_add_partition(struct mtd_info *master, char *name,
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -331,6 +331,24 @@ static inline uint32_t mtd_mod_by_eb(uin
+ 	return do_div(sz, mtd->erasesize);
+ }
+ 
++static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round up to next erase block */
++	return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize;
++}
++
++static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round down to the start of the current erase block */
++	return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize;
++}
++
+ static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
+ {
+ 	if (mtd->writesize_shift)
diff --git a/trunk/target/linux/generic/patches-3.10/406-mtd-add-squashfs-parser.patch b/trunk/target/linux/generic/patches-3.10/406-mtd-add-squashfs-parser.patch
new file mode 100644
index 00000000..b3ff9d9a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/406-mtd-add-squashfs-parser.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -37,6 +37,17 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++comment "Rootfs partition parsers"
++
++config MTD_SPLIT_SQUASHFS_ROOT
++	bool "Squashfs based root partition parser"
++	select MTD_SPLIT
++	default n
++	help
++	  This provides a parsing function which allows to detect the
++	  offset and size of the unused portion of a rootfs partition
++	  containing a squashfs.
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.10/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.10/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch
new file mode 100644
index 00000000..02697f64
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -48,6 +48,12 @@ config MTD_SPLIT_SQUASHFS_ROOT
+ 	  offset and size of the unused portion of a rootfs partition
+ 	  containing a squashfs.
+ 
++comment "Firmware partition parsers"
++
++config MTD_SPLIT_UIMAGE_FW
++	bool "uImage based firmware partition parser"
++	select MTD_SPLIT
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -8,6 +8,7 @@ mtd-y				:= mtdcore.o mtdsuper.o mtdconc
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
+ mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
++mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.10/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.10/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch
new file mode 100644
index 00000000..016a9b6e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -50,6 +50,10 @@ config MTD_SPLIT_SQUASHFS_ROOT
+ 
+ comment "Firmware partition parsers"
+ 
++config MTD_SPLIT_SEAMA_FW
++	bool "Seama firmware parser"
++	select MTD_SPLIT
++
+ config MTD_SPLIT_UIMAGE_FW
+ 	bool "uImage based firmware partition parser"
+ 	select MTD_SPLIT
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++mtd-$(CONFIG_MTD_SPLIT_SEAMA_FW) += mtdsplit_seama.o
+ mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
+ mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.10/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch
new file mode 100644
index 00000000..cc9a9715
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -58,6 +58,10 @@ config MTD_SPLIT_UIMAGE_FW
+ 	bool "uImage based firmware partition parser"
+ 	select MTD_SPLIT
+ 
++config MTD_SPLIT_LZMA_FW
++	bool "LZMA compressed kernel based firmware partition parser"
++	select MTD_SPLIT
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -10,6 +10,7 @@ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
+ mtd-$(CONFIG_MTD_SPLIT_SEAMA_FW) += mtdsplit_seama.o
+ mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
+ mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
++mtd-$(CONFIG_MTD_SPLIT_LZMA_FW) += mtdsplit_lzma.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.10/410-mtd-move-forward-declaration-of-struct-mtd_info.patch b/trunk/target/linux/generic/patches-3.10/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
new file mode 100644
index 00000000..4657b43a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
@@ -0,0 +1,18 @@
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -35,6 +35,7 @@
+  * Note: writeable partitions require their size and offset be
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
++struct mtd_info;
+ 
+ struct mtd_partition {
+ 	char *name;			/* identifier string */
+@@ -50,7 +51,6 @@ struct mtd_partition {
+ #define MTDPART_SIZ_FULL	(0)
+ 
+ 
+-struct mtd_info;
+ struct device_node;
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch b/trunk/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch
new file mode 100644
index 00000000..94074112
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch
@@ -0,0 +1,146 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -35,6 +35,8 @@
+ #include "mtdcore.h"
+ #include "mtdsplit.h"
+ 
++#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
++
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+ static DEFINE_MUTEX(mtd_partitions_mutex);
+@@ -231,13 +233,61 @@ static int part_erase(struct mtd_info *m
+ 	struct mtd_part *part = PART(mtd);
+ 	int ret;
+ 
++
++	instr->partial_start = false;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		size_t readlen = 0;
++		u64 mtd_ofs;
++
++		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
++		if (!instr->erase_buf)
++			return -ENOMEM;
++
++		mtd_ofs = part->offset + instr->addr;
++		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
++
++		if (instr->erase_buf_ofs > 0) {
++			instr->addr -= instr->erase_buf_ofs;
++			ret = mtd_read(part->master,
++				instr->addr + part->offset,
++				part->master->erasesize,
++				&readlen, instr->erase_buf);
++
++			instr->len += instr->erase_buf_ofs;
++			instr->partial_start = true;
++		} else {
++			mtd_ofs = part->offset + part->mtd.size;
++			instr->erase_buf_ofs = part->master->erasesize -
++				do_div(mtd_ofs, part->master->erasesize);
++
++			if (instr->erase_buf_ofs > 0) {
++				instr->len += instr->erase_buf_ofs;
++				ret = mtd_read(part->master,
++					part->offset + instr->addr +
++					instr->len - part->master->erasesize,
++					part->master->erasesize, &readlen,
++					instr->erase_buf);
++			} else {
++				ret = 0;
++			}
++		}
++		if (ret < 0) {
++			kfree(instr->erase_buf);
++			return ret;
++		}
++
++	}
++
+ 	instr->addr += part->offset;
+ 	ret = part->master->_erase(part->master, instr);
+ 	if (ret) {
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
++		if (mtd->flags & MTD_ERASE_PARTIAL)
++			kfree(instr->erase_buf);
+ 	}
++
+ 	return ret;
+ }
+ 
+@@ -245,7 +295,25 @@ void mtd_erase_callback(struct erase_inf
+ {
+ 	if (instr->mtd->_erase == part_erase) {
+ 		struct mtd_part *part = PART(instr->mtd);
++		size_t wrlen = 0;
+ 
++		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
++			if (instr->partial_start) {
++				part->master->_write(part->master,
++					instr->addr, instr->erase_buf_ofs,
++					&wrlen, instr->erase_buf);
++				instr->addr += instr->erase_buf_ofs;
++			} else {
++				instr->len -= instr->erase_buf_ofs;
++				part->master->_write(part->master,
++					instr->addr + instr->len,
++					instr->erase_buf_ofs, &wrlen,
++					instr->erase_buf +
++					part->master->erasesize -
++					instr->erase_buf_ofs);
++			}
++			kfree(instr->erase_buf);
++		}
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
+@@ -503,18 +571,24 @@ static struct mtd_part *allocate_partiti
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+ 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
+ 		/* Doesn't start on a boundary of major erase size */
+-		/* FIXME: Let it be writable if it is on a boundary of
+-		 * _minor_ erase size though */
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
+-			part->name);
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++		if (((u32) slave->mtd.size) > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+-	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
+-			part->name);
++	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++
++		if ((u32) slave->mtd.size > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
++	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
++		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
++				part->name);
+ 
+ 	slave->mtd.ecclayout = master->ecclayout;
+ 	slave->mtd.ecc_strength = master->ecc_strength;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -58,6 +58,10 @@ struct erase_info {
+ 	u_long priv;
+ 	u_char state;
+ 	struct erase_info *next;
++
++	u8 *erase_buf;
++	u32 erase_buf_ofs;
++	bool partial_start;
+ };
+ 
+ struct mtd_erase_region_info {
diff --git a/trunk/target/linux/generic/patches-3.10/412-mtd-partial_eraseblock_unlock.patch b/trunk/target/linux/generic/patches-3.10/412-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 00000000..87c8257f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/412-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -332,7 +332,14 @@ static int part_lock(struct mtd_info *mt
+ static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+ {
+ 	struct mtd_part *part = PART(mtd);
+-	return part->master->_unlock(part->master, ofs + part->offset, len);
++
++	ofs += part->offset;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		/* round up len to next erasesize and round down offset to prev block */
++		len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++		ofs &= ~(part->master->erasesize - 1);
++	}
++	return part->master->_unlock(part->master, ofs, len);
+ }
+ 
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/trunk/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch b/trunk/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch
new file mode 100644
index 00000000..f74affce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/420-mtd-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru
+ #endif
+ 		names += strlen(names)+1;
+ 
+-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+-			i++;
+-			parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-			parts[i].size = fl->next->img->flash_base - parts[i].offset;
+-			parts[i].name = nullname;
+-		}
++			if (!strcmp(parts[i].name, "rootfs")) {
++				parts[i].size = fl->next->img->flash_base;
++				parts[i].size &= ~(master->erasesize - 1);
++				parts[i].size -= parts[i].offset;
++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
++				nrparts--;
++			} else {
++				i++;
++				parts[i].offset = parts[i-1].size + parts[i-1].offset;
++				parts[i].size = fl->next->img->flash_base - parts[i].offset;
++				parts[i].name = nullname;
+ #endif
++			}
++		}
+ 		tmp_fl = fl;
+ 		fl = fl->next;
+ 		kfree(tmp_fl);
diff --git a/trunk/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch b/trunk/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch
new file mode 100644
index 00000000..fc352d27
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch
@@ -0,0 +1,35 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -212,6 +212,22 @@ config MTD_BCM47XX_PARTS
+ 	  This provides partitions parser for devices based on BCM47xx
+ 	  boards.
+ 
++config MTD_MYLOADER_PARTS
++	tristate "MyLoader partition parsing"
++	depends on ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX || ATH79
++	---help---
++	  MyLoader is a bootloader which allows the user to define partitions
++	  in flash devices, by putting a table in the second erase block
++	  on the device, similar to a partition table. This table gives the 
++	  offsets and lengths of the user defined partitions.
++
++	  If you need code which can detect and parse these tables, and
++	  register MTD 'partitions' corresponding to each image detected,
++	  enable this option.
++
++	  You will still need the parsing functions to be called by the driver
++	  for your particular device. It won't happen automatically.
++
+ comment "User Modules And Translation Layers"
+ 
+ config MTD_BLKDEVS
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
++obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_BLKDEVS)	+= mtd_blkdevs.o
diff --git a/trunk/target/linux/generic/patches-3.10/440-block2mtd_init.patch b/trunk/target/linux/generic/patches-3.10/440-block2mtd_init.patch
new file mode 100644
index 00000000..169d6ddf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/440-block2mtd_init.patch
@@ -0,0 +1,106 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -14,6 +14,7 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
+ #include <linux/mutex.h>
+ #include <linux/mount.h>
+ #include <linux/slab.h>
+@@ -210,11 +211,12 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+ 	struct block_device *bdev;
+ 	struct block2mtd_dev *dev;
++	struct mtd_partition *part;
+ 	char *name;
+ 
+ 	if (!devname)
+@@ -253,13 +255,16 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+-	name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
++	if (!mtdname)
++		mtdname = devname;
++	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
+ 	if (!name)
+ 		goto devinit_err;
+ 
++	strcpy(name, mtdname);
+ 	dev->mtd.name = name;
+ 
+-	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
++	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
+ 	dev->mtd.erasesize = erase_size;
+ 	dev->mtd.writesize = 1;
+ 	dev->mtd.writebufsize = PAGE_SIZE;
+@@ -272,14 +277,17 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
+ 
+-	if (mtd_device_register(&dev->mtd, NULL, 0)) {
++	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
++	part->name = name;
++	part->offset = 0;
++	part->size = dev->mtd.size;
++	if (mtd_device_register(&dev->mtd, part, 1)) {
+ 		/* Device didn't get added, so free the entry */
+ 		goto devinit_err;
+ 	}
+ 	list_add(&dev->list, &blkmtd_device_list);
+ 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
+-			dev->mtd.name + strlen("block2mtd: "),
+-			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
++			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+ 	return dev;
+ 
+ devinit_err:
+@@ -352,9 +360,9 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12]; /* 80 for device, 12 for erase size */
++	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
+ 	char *str = buf;
+-	char *token[2];
++	char *token[3];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
+ 	int i, ret;
+@@ -365,7 +373,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 2; i++)
++	for (i = 0; i < 3; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str)
+@@ -384,8 +392,10 @@ static int block2mtd_setup2(const char *
+ 			parse_err("illegal erase size");
+ 		}
+ 	}
++	if (token[2] && (strlen(token[2]) + 1 > 80))
++		parse_err("mtd device name too long");
+ 
+-	add_device(name, erase_size);
++	add_device(name, erase_size, token[2]);
+ 
+ 	return 0;
+ }
+@@ -419,7 +429,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
diff --git a/trunk/target/linux/generic/patches-3.10/441-block2mtd_probe.patch b/trunk/target/linux/generic/patches-3.10/441-block2mtd_probe.patch
new file mode 100644
index 00000000..a9c100da
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/441-block2mtd_probe.patch
@@ -0,0 +1,108 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -7,6 +7,7 @@
+  * Licence: GPL
+  */
+ #include <linux/module.h>
++#include <linux/delay.h>
+ #include <linux/fs.h>
+ #include <linux/blkdev.h>
+ #include <linux/bio.h>
+@@ -211,13 +212,14 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname, int timeout)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+-	struct block_device *bdev;
++	struct block_device *bdev = ERR_PTR(-ENODEV);
+ 	struct block2mtd_dev *dev;
+ 	struct mtd_partition *part;
+ 	char *name;
++	int i;
+ 
+ 	if (!devname)
+ 		return NULL;
+@@ -228,15 +230,20 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Get a handle on the device */
+ 	bdev = blkdev_get_by_path(devname, mode, dev);
++
+ #ifndef MODULE
+-	if (IS_ERR(bdev)) {
++	for (i = 0; IS_ERR(bdev) && i <= timeout; i++) {
++		dev_t devt;
+ 
+-		/* We might not have rootfs mounted at this point. Try
+-		   to resolve the device name by other means. */
++		if (i)
++			msleep(1000);
++		wait_for_device_probe();
++
++		devt = name_to_dev_t(devname);
++		if (!devt)
++			continue;
+ 
+-		dev_t devt = name_to_dev_t(devname);
+-		if (devt)
+-			bdev = blkdev_get_by_dev(devt, mode, dev);
++		bdev = blkdev_get_by_dev(devt, mode, dev);
+ 	}
+ #endif
+ 
+@@ -360,11 +367,12 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
++	char buf[80 + 12 + 80 + 8]; /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
+ 	char *str = buf;
+-	char *token[3];
++	char *token[4];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
++	unsigned long timeout = 0;
+ 	int i, ret;
+ 
+ 	if (strnlen(val, sizeof(buf)) >= sizeof(buf))
+@@ -373,7 +381,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 3; i++)
++	for (i = 0; i < 4; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str)
+@@ -395,7 +403,10 @@ static int block2mtd_setup2(const char *
+ 	if (token[2] && (strlen(token[2]) + 1 > 80))
+ 		parse_err("mtd device name too long");
+ 
+-	add_device(name, erase_size, token[2]);
++	if (token[3] && kstrtoul(token[3], 0, &timeout))
++		parse_err("invalid timeout");
++
++	add_device(name, erase_size, token[2], timeout);
+ 
+ 	return 0;
+ }
+@@ -429,7 +440,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
+@@ -462,7 +473,7 @@ static void block2mtd_exit(void)
+ }
+ 
+ 
+-module_init(block2mtd_init);
++late_initcall(block2mtd_init);
+ module_exit(block2mtd_exit);
+ 
+ MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch b/trunk/target/linux/generic/patches-3.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
new file mode 100644
index 00000000..af9389b5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
@@ -0,0 +1,37 @@
+---
+ drivers/mtd/nand/plat_nand.c |   13 ++++++++++++-
+ include/linux/mtd/nand.h     |    1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -655,6 +655,7 @@ struct platform_nand_chip {
+ 	unsigned int options;
+ 	unsigned int bbt_options;
+ 	const char **part_probe_types;
++	int (*chip_fixup)(struct mtd_info *mtd);
+ };
+ 
+ /* Keep gcc happy */
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -103,7 +103,18 @@ static int plat_nand_probe(struct platfo
+ 	}
+ 
+ 	/* Scan to find existence of the device */
+-	if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
++	if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
++		err = -ENXIO;
++		goto out;
++	}
++
++	if (pdata->chip.chip_fixup) {
++		err = pdata->chip.chip_fixup(&data->mtd);
++		if (err)
++			goto out;
++	}
++
++	if (nand_scan_tail(&data->mtd)) {
+ 		err = -ENXIO;
+ 		goto out;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.10/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch b/trunk/target/linux/generic/patches-3.10/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
new file mode 100644
index 00000000..fa673059
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -507,7 +507,7 @@ int __nand_correct_data(unsigned char *b
+ 		return 1;	/* error in ECC data; no action needed */
+ 
+ 	pr_err("%s: uncorrectable ECC error", __func__);
+-	return -1;
++	return -EBADMSG;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/trunk/target/linux/generic/patches-3.10/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
new file mode 100644
index 00000000..0854a564
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -780,7 +780,7 @@ static int get_chip(struct map_info *map
+ 		return 0;
+ 
+ 	case FL_ERASING:
+-		if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
++		if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+ 		    !(mode == FL_READY || mode == FL_POINT ||
+ 		    (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
+ 			goto sleep;
diff --git a/trunk/target/linux/generic/patches-3.10/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/trunk/target/linux/generic/patches-3.10/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
new file mode 100644
index 00000000..b5fae8ae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
@@ -0,0 +1,18 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Issue map read after Write Buffer Load command to ensure chip is ready
+to receive data.
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
+ 1 file changed, 1 insertion(+)
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1498,6 +1498,7 @@ static int __xipram do_write_buffer(stru
+ 
+ 	/* Write Buffer Load */
+ 	map_write(map, CMD(0x25), cmd_adr);
++	(void) map_read(map, cmd_adr);
+ 
+ 	chip->state = FL_WRITING_TO_BUFFER;
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/trunk/target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
new file mode 100644
index 00000000..92a20a98
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -0,0 +1,41 @@
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
+@@ -109,6 +109,14 @@ config MTD_SPEAR_SMI
+ 	help
+ 	  This enable SNOR support on SPEAR platforms using SMI controller
+ 
++config M25PXX_PREFER_SMALL_SECTOR_ERASE
++	bool "Prefer small sector erase"
++	depends on MTD_M25P80
++	default y
++	help
++	  This option enables use of the small erase sectors if that is
++	  supported by the flash chip.
++
+ config MTD_SST25L
+ 	tristate "Support SST25L (non JEDEC) SPI Flash chips"
+ 	depends on SPI_MASTER
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -76,6 +76,12 @@
+ 
+ #define JEDEC_MFR(_jedec_id)	((_jedec_id) >> 16)
+ 
++#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE
++#define PREFER_SMALL_SECTOR_ERASE 1
++#else
++#define PREFER_SMALL_SECTOR_ERASE 0
++#endif
++
+ /****************************************************************************/
+ 
+ struct m25p {
+@@ -1021,7 +1027,7 @@ static int m25p_probe(struct spi_device 
+ 		flash->mtd._write = m25p80_write;
+ 
+ 	/* prefer "small sector" erase if possible */
+-	if (info->flags & SECT_4K) {
++	if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
+ 	} else if (info->flags & SECT_4K_PMC) {
diff --git a/trunk/target/linux/generic/patches-3.10/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch b/trunk/target/linux/generic/patches-3.10/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
new file mode 100644
index 00000000..a63b9532
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
@@ -0,0 +1,20 @@
+From eef9dfc4e821408af1af13aa0cc707fc496fb7c6 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Wed, 11 Dec 2013 19:05:59 +0100
+Subject: [PATCH] m25p80: add support for the Winbond W25X05 flash
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/devices/m25p80.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -846,6 +846,7 @@ static const struct spi_device_id m25p_i
+ 	{ "m25px64",    INFO(0x207117,  0, 64 * 1024, 128, 0) },
+ 
+ 	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
++	{ "w25x05", INFO(0xef3010, 0, 64 * 1024,  1,  SECT_4K) },
+ 	{ "w25x10", INFO(0xef3011, 0, 64 * 1024,  2,  SECT_4K) },
+ 	{ "w25x20", INFO(0xef3012, 0, 64 * 1024,  4,  SECT_4K) },
+ 	{ "w25x40", INFO(0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
diff --git a/trunk/target/linux/generic/patches-3.10/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch b/trunk/target/linux/generic/patches-3.10/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
new file mode 100644
index 00000000..7b5ca980
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
@@ -0,0 +1,20 @@
+From 0233dcb52eefa0b29250a6d8a58b3143790df57d Mon Sep 17 00:00:00 2001
+From: Sergey Ryazanov <ryazanov.s.a@gmail.com>
+Date: Wed, 11 Jun 2014 02:23:00 +0400
+Subject: [PATCH] mtd: m25p80: add support for EON EN25QH128
+
+Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
+---
+ drivers/mtd/devices/m25p80.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -737,6 +737,7 @@ static const struct spi_device_id m25p_i
+ 	{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024,  64, 0) },
+ 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
+ 	{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
++	{ "en25qh128", INFO(0x1c7018, 0, 64 * 1024, 256, 0) },
+ 	{ "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) },
+ 
+ 	/* ESMT */
diff --git a/trunk/target/linux/generic/patches-3.10/480-mtd-set-rootfs-to-be-root-dev.patch b/trunk/target/linux/generic/patches-3.10/480-mtd-set-rootfs-to-be-root-dev.patch
new file mode 100644
index 00000000..58c4a8ae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/480-mtd-set-rootfs-to-be-root-dev.patch
@@ -0,0 +1,26 @@
+--- a/drivers/mtd/mtdcore.c
++++ b/drivers/mtd/mtdcore.c
+@@ -37,6 +37,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/gfp.h>
+ #include <linux/slab.h>
++#include <linux/root_dev.h>
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+@@ -408,6 +409,15 @@ int add_mtd_device(struct mtd_info *mtd)
+ 	   of this try_ nonsense, and no bitching about it
+ 	   either. :) */
+ 	__module_get(THIS_MODULE);
++
++	if (!strcmp(mtd->name, "rootfs") &&
++	    config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    ROOT_DEV == 0) {
++		pr_notice("mtd: device %d (%s) set to be root filesystem\n",
++			  mtd->index, mtd->name);
++		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
++	}
++
+ 	return 0;
+ 
+ fail_added:
diff --git a/trunk/target/linux/generic/patches-3.10/490-mtd-ubi-add-EOF-marker-support.patch b/trunk/target/linux/generic/patches-3.10/490-mtd-ubi-add-EOF-marker-support.patch
new file mode 100644
index 00000000..cd02c13e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/490-mtd-ubi-add-EOF-marker-support.patch
@@ -0,0 +1,51 @@
+--- a/drivers/mtd/ubi/attach.c
++++ b/drivers/mtd/ubi/attach.c
+@@ -800,6 +800,13 @@ out_unlock:
+ 	return err;
+ }
+ 
++static bool ec_hdr_has_eof(struct ubi_ec_hdr *ech)
++{
++	return ech->padding1[0] == 'E' &&
++	       ech->padding1[1] == 'O' &&
++	       ech->padding1[2] == 'F';
++}
++
+ /**
+  * scan_peb - scan and process UBI headers of a PEB.
+  * @ubi: UBI device description object
+@@ -830,9 +837,21 @@ static int scan_peb(struct ubi_device *u
+ 		return 0;
+ 	}
+ 
+-	err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
+-	if (err < 0)
+-		return err;
++	if (!ai->eof_found) {
++		err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
++		if (err < 0)
++			return err;
++
++		if (ec_hdr_has_eof(ech)) {
++			ubi_msg("EOF marker found, PEBs from %d will be erased",
++				pnum);
++			ai->eof_found = true;
++		}
++	}
++
++	if (ai->eof_found)
++		err = UBI_IO_FF_BITFLIPS;
++
+ 	switch (err) {
+ 	case 0:
+ 		break;
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -701,6 +701,7 @@ struct ubi_attach_info {
+ 	int mean_ec;
+ 	uint64_t ec_sum;
+ 	int ec_count;
++	bool eof_found;
+ 	struct kmem_cache *aeb_slab_cache;
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/trunk/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
new file mode 100644
index 00000000..574b8ebc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -0,0 +1,75 @@
+From 8a52e4100d7c3a4a1dfddfa02b8864a9b0068c13 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 17 May 2014 03:36:18 +0200
+Subject: [PATCH 1/5] ubi: auto-attach mtd device named "ubi" or "data" on boot
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+--- a/drivers/mtd/ubi/build.c
++++ b/drivers/mtd/ubi/build.c
+@@ -1209,6 +1209,48 @@
+ 	return mtd;
+ }
+ 
++/*
++ * This function tries attaching mtd partitions named either "ubi" or "data"
++ * during boot.
++ */
++static void __init ubi_auto_attach(void)
++{
++	int err;
++	struct mtd_info *mtd;
++
++	/* try attaching mtd device named "ubi" or "data" */
++	mtd = open_mtd_device("ubi");
++	if (IS_ERR(mtd))
++		mtd = open_mtd_device("data");
++
++	if (!IS_ERR(mtd)) {
++		size_t len;
++		char magic[4];
++
++		/* check for a valid ubi magic */
++		err = mtd_read(mtd, 0, 4, &len, (void *) magic);
++		if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
++			ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
++			put_mtd_device(mtd);
++			return;
++		}
++
++		/* auto-add only media types where UBI makes sense */
++		if (mtd->type == MTD_NANDFLASH ||
++		    mtd->type == MTD_DATAFLASH ||
++		    mtd->type == MTD_MLCNANDFLASH) {
++			mutex_lock(&ubi_devices_mutex);
++			ubi_msg("auto-attach mtd%d", mtd->index);
++			err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
++			mutex_unlock(&ubi_devices_mutex);
++			if (err < 0) {
++				ubi_err("cannot attach mtd%d", mtd->index);
++				put_mtd_device(mtd);
++			}
++		}
++	}
++}
++
+ static int __init ubi_init(void)
+ {
+ 	int err, i, k;
+@@ -1298,6 +1340,12 @@
+ 		}
+ 	}
+ 
++	/* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd
++	 * parameter was given */
++	if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    !ubi_is_module() && !mtd_devs)
++		ubi_auto_attach();
++
+ 	err = ubiblock_init();
+ 	if (err) {
+ 		ubi_err("block: cannot initialize, error %d", err);
diff --git a/trunk/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/trunk/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
new file mode 100644
index 00000000..f2c44268
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -0,0 +1,69 @@
+From 0f3966579815f889bb2fcb4846152c35f65e79c4 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 15 May 2014 21:06:33 +0200
+Subject: [PATCH 2/5] ubi: auto-create ubiblock device for rootfs
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -593,6 +593,44 @@ static int __init ubiblock_create_from_p
+ 	return ret;
+ }
+ 
++#define UBIFS_NODE_MAGIC  0x06101831
++static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc)
++{
++	int ret;
++	uint32_t magic_of, magic;
++	ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4);
++	if (ret)
++		return 0;
++	magic = le32_to_cpu(magic_of);
++	return magic == UBIFS_NODE_MAGIC;
++}
++
++static void __init ubiblock_create_auto_rootfs(void)
++{
++	int ubi_num, ret, is_ubifs;
++	struct ubi_volume_desc *desc;
++	struct ubi_volume_info vi;
++
++	for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++) {
++		desc = ubi_open_volume_nm(ubi_num, "rootfs", UBI_READONLY);
++		if (IS_ERR(desc))
++			continue;
++
++		ubi_get_volume_info(desc, &vi);
++		is_ubifs = ubi_vol_is_ubifs(desc);
++		ubi_close_volume(desc);
++		if (is_ubifs)
++			break;
++
++		ret = ubiblock_create(&vi);
++		if (ret)
++			ubi_err("block: can't add '%s' volume, err=%d\n",
++				vi.name, ret);
++		/* always break if we get here */
++		break;
++	}
++}
++
+ static void ubiblock_remove_all(void)
+ {
+ 	struct ubiblock *next;
+@@ -623,6 +661,10 @@ int __init ubiblock_init(void)
+ 	if (ret)
+ 		goto err_remove;
+ 
++	/* auto-attach "rootfs" volume if existing and non-ubifs */
++	if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))
++		ubiblock_create_auto_rootfs();
++
+ 	/*
+ 	 * Block devices are only created upon user requests, so we ignore
+ 	 * existing volumes.
diff --git a/trunk/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/trunk/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
new file mode 100644
index 00000000..b55385eb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -0,0 +1,53 @@
+From eea9e1785e4c05c2a3444506aabafa0ae958538f Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 17 May 2014 03:35:02 +0200
+Subject: [PATCH 4/5] try auto-mounting ubi0:rootfs in init/do_mounts.c
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ init/do_mounts.c | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -428,7 +428,27 @@ retry:
+ out:
+ 	put_page(page);
+ }
+- 
++
++static int __init mount_ubi_rootfs(void)
++{
++	int flags = MS_SILENT;
++	int err, tried = 0;
++
++	while (tried < 2) {
++		err = do_mount_root("ubi0:rootfs", "ubifs", flags, \
++					root_mount_data);
++		switch (err) {
++			case -EACCES:
++				flags |= MS_RDONLY;
++				tried++;
++			default:
++				return err;
++		}
++	}
++
++	return -EINVAL;
++}
++
+ #ifdef CONFIG_ROOT_NFS
+ 
+ #define NFSROOT_TIMEOUT_MIN	5
+@@ -522,6 +542,10 @@ void __init mount_root(void)
+ 			change_floppy("root floppy");
+ 	}
+ #endif
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++	if (!mount_ubi_rootfs())
++		return;
++#endif
+ #ifdef CONFIG_BLOCK
+ 	create_dev("/dev/root", ROOT_DEV);
+ 	mount_block_root("/dev/root", root_mountflags);
diff --git a/trunk/target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/trunk/target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
new file mode 100644
index 00000000..15d37f88
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
@@ -0,0 +1,37 @@
+From cd68d1b12b5ea4c01a664c064179ada42bf55d3d Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 15 May 2014 20:55:42 +0200
+Subject: [PATCH 5/5] ubi: set ROOT_DEV to ubiblock "rootfs" if unset
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/block.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -48,6 +48,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/hdreg.h>
+ #include <asm/div64.h>
++#include <linux/root_dev.h>
+ 
+ #include "ubi-media.h"
+ #include "ubi.h"
+@@ -444,6 +445,15 @@ int ubiblock_create(struct ubi_volume_in
+ 	add_disk(dev->gd);
+ 	ubi_msg("%s created from ubi%d:%d(%s)",
+ 		dev->gd->disk_name, dev->ubi_num, dev->vol_id, vi->name);
++
++	if (!strcmp(vi->name, "rootfs") &&
++	    config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    ROOT_DEV == 0) {
++		pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n",
++			  dev->ubi_num, dev->vol_id, vi->name);
++		ROOT_DEV = MKDEV(gd->major, gd->first_minor);
++	}
++
+ 	return 0;
+ 
+ out_free_queue:
diff --git a/trunk/target/linux/generic/patches-3.10/500-yaffs-Kbuild-integration.patch b/trunk/target/linux/generic/patches-3.10/500-yaffs-Kbuild-integration.patch
new file mode 100644
index 00000000..3742e541
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/500-yaffs-Kbuild-integration.patch
@@ -0,0 +1,18 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -39,6 +39,7 @@ source "fs/gfs2/Kconfig"
+ source "fs/ocfs2/Kconfig"
+ source "fs/btrfs/Kconfig"
+ source "fs/nilfs2/Kconfig"
++source "fs/yaffs2/Kconfig"
+ 
+ endif # BLOCK
+ 
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -127,3 +127,5 @@ obj-y				+= exofs/ # Multiple modules
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
+ obj-$(CONFIG_PSTORE)		+= pstore/
+ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
++obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
++
diff --git a/trunk/target/linux/generic/patches-3.10/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch b/trunk/target/linux/generic/patches-3.10/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
new file mode 100644
index 00000000..c1f7367d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
@@ -0,0 +1,155 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -329,6 +329,33 @@ static int yaffs_readpage(struct file *f
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++#define YCRED_FSUID()	from_kuid(&init_user_ns, current_fsuid())
++#define YCRED_FSGID()	from_kgid(&init_user_ns, current_fsgid())
++#else
++#define YCRED_FSUID()	YCRED(current)->fsuid
++#define YCRED_FSGID()	YCRED(current)->fsgid
++
++static inline uid_t i_uid_read(const struct inode *inode)
++{
++	return inode->i_uid;
++}
++
++static inline gid_t i_gid_read(const struct inode *inode)
++{
++	return inode->i_gid;
++}
++
++static inline void i_uid_write(struct inode *inode, uid_t uid)
++{
++	inode->i_uid = uid;
++}
++
++static inline void i_gid_write(struct inode *inode, gid_t gid)
++{
++	inode->i_gid = gid;
++}
++#endif
+ 
+ static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+ {
+@@ -1225,9 +1252,9 @@ static int yaffs_mknod(struct inode *dir
+ 	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
+ 
+ 	int error = -ENOSPC;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+ 		mode |= S_ISGID;
+@@ -1424,9 +1451,9 @@ static int yaffs_symlink(struct inode *d
+ {
+ 	struct yaffs_obj *obj;
+ 	struct yaffs_dev *dev;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
+ 
+@@ -1829,8 +1856,8 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		inode->i_ino = obj->obj_id;
+ 		inode->i_mode = obj->yst_mode;
+-		inode->i_uid = obj->yst_uid;
+-		inode->i_gid = obj->yst_gid;
++		i_uid_write(inode, obj->yst_uid);
++		i_gid_write(inode, obj->yst_gid);
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+ 		inode->i_blksize = inode->i_sb->s_blocksize;
+ #endif
+@@ -1856,7 +1883,7 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		yaffs_trace(YAFFS_TRACE_OS,
+ 			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+-			inode->i_mode, inode->i_uid, inode->i_gid,
++			inode->i_mode, i_uid_read(inode), i_gid_read(inode),
+ 			inode->i_size, atomic_read(&inode->i_count));
+ 
+ 		switch (obj->yst_mode & S_IFMT) {
+--- a/fs/yaffs2/yaffs_attribs.c
++++ b/fs/yaffs2/yaffs_attribs.c
+@@ -14,6 +14,48 @@
+ #include "yaffs_guts.h"
+ #include "yaffs_attribs.h"
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return from_kuid(&init_user_ns, iattr->ia_uid);
++}
++
++static inline gid_t ia_gid_read(const struct iattr *iattr)
++{
++	return from_kgid(&init_user_ns, iattr->ia_gid);
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = make_kuid(&init_user_ns, uid);
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = make_kgid(&init_user_ns, gid);
++}
++#else
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return iattr->ia_uid;
++}
++
++static inline gid_t ia_gid_read(const struct iattr *inode)
++{
++	return iattr->ia_gid;
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = uid;
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = gid;
++}
++#endif
++
+ void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
+ {
+ 	obj->yst_uid = oh->yst_uid;
+@@ -77,9 +119,9 @@ int yaffs_set_attribs(struct yaffs_obj *
+ 	if (valid & ATTR_MODE)
+ 		obj->yst_mode = attr->ia_mode;
+ 	if (valid & ATTR_UID)
+-		obj->yst_uid = attr->ia_uid;
++		obj->yst_uid =  ia_uid_read(attr);
+ 	if (valid & ATTR_GID)
+-		obj->yst_gid = attr->ia_gid;
++		obj->yst_gid =  ia_gid_read(attr);
+ 
+ 	if (valid & ATTR_ATIME)
+ 		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
+@@ -103,9 +145,9 @@ int yaffs_get_attribs(struct yaffs_obj *
+ 
+ 	attr->ia_mode = obj->yst_mode;
+ 	valid |= ATTR_MODE;
+-	attr->ia_uid = obj->yst_uid;
++	ia_uid_write(attr, obj->yst_uid);
+ 	valid |= ATTR_UID;
+-	attr->ia_gid = obj->yst_gid;
++	ia_gid_write(attr, obj->yst_gid);
+ 	valid |= ATTR_GID;
+ 
+ 	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
diff --git a/trunk/target/linux/generic/patches-3.10/502-yaffs-3.10-disable-proc-entry.patch b/trunk/target/linux/generic/patches-3.10/502-yaffs-3.10-disable-proc-entry.patch
new file mode 100644
index 00000000..5345678c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/502-yaffs-3.10-disable-proc-entry.patch
@@ -0,0 +1,44 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -3025,6 +3025,7 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "y
+ #endif
+ 
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ static struct proc_dir_entry *my_proc_entry;
+ 
+ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
+@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file 
+ 		return yaffs_proc_debug_write(file, buf, count, data);
+ 	return yaffs_proc_write_trace_options(file, buf, count, data);
+ }
++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) */
+ 
+ /* Stuff to handle installation of file systems */
+ struct file_system_to_install {
+@@ -3421,6 +3423,7 @@ static int __init init_yaffs_fs(void)
+ 
+ 	mutex_init(&yaffs_context_lock);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	/* Install the proc_fs entries */
+ 	my_proc_entry = create_proc_entry("yaffs",
+ 					  S_IRUGO | S_IFREG, YPROC_ROOT);
+@@ -3432,6 +3435,7 @@ static int __init init_yaffs_fs(void)
+ 	} else {
+ 		return -ENOMEM;
+         }
++#endif
+ 
+ 	/* Now add the file system entries */
+ 
+@@ -3468,7 +3472,9 @@ static void __exit exit_yaffs_fs(void)
+ 	yaffs_trace(YAFFS_TRACE_ALWAYS,
+ 		"yaffs built " __DATE__ " " __TIME__ " removing.");
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	remove_proc_entry("yaffs", YPROC_ROOT);
++#endif
+ 
+ 	fsinst = fs_to_install;
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/503-yaffs-add-tags-9bytes-mount-option.patch b/trunk/target/linux/generic/patches-3.10/503-yaffs-add-tags-9bytes-mount-option.patch
new file mode 100644
index 00000000..904ad7ec
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/503-yaffs-add-tags-9bytes-mount-option.patch
@@ -0,0 +1,115 @@
+Subject: yaffs: add support for tags-9bytes mount option
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -2525,6 +2525,7 @@ static const struct super_operations yaf
+ 
+ struct yaffs_options {
+ 	int inband_tags;
++	int tags_9bytes;
+ 	int skip_checkpoint_read;
+ 	int skip_checkpoint_write;
+ 	int no_cache;
+@@ -2564,6 +2565,8 @@ static int yaffs_parse_options(struct ya
+ 
+ 		if (!strcmp(cur_opt, "inband-tags")) {
+ 			options->inband_tags = 1;
++		} else if (!strcmp(cur_opt, "tags-9bytes")) {
++			options->tags_9bytes = 1;
+ 		} else if (!strcmp(cur_opt, "tags-ecc-off")) {
+ 			options->tags_ecc_on = 0;
+ 			options->tags_ecc_overridden = 1;
+@@ -2637,7 +2640,6 @@ static struct super_block *yaffs_interna
+ 	struct yaffs_param *param;
+ 
+ 	int read_only = 0;
+-	int inband_tags = 0;
+ 
+ 	struct yaffs_options options;
+ 
+@@ -2677,6 +2679,9 @@ static struct super_block *yaffs_interna
+ 
+ 	memset(&options, 0, sizeof(options));
+ 
++	if (IS_ENABLED(CONFIG_YAFFS_9BYTE_TAGS))
++		options.tags_9bytes = 1;
++
+ 	if (yaffs_parse_options(&options, data_str)) {
+ 		/* Option parsing failed */
+ 		return NULL;
+@@ -2710,17 +2715,22 @@ static struct super_block *yaffs_interna
+ 	}
+ 
+ 	/* Added NCB 26/5/2006 for completeness */
+-	if (yaffs_version == 2 && !options.inband_tags
+-	    && WRITE_SIZE(mtd) == 512) {
++	if (yaffs_version == 2 &&
++	    (!options.inband_tags || options.tags_9bytes) &&
++	    WRITE_SIZE(mtd) == 512) {
+ 		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1");
+ 		yaffs_version = 1;
+ 	}
+ 
+-	if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) ||
+-	    options.inband_tags)
+-		inband_tags = 1;
++	if (yaffs_version == 2 &&
++	    mtd->oobavail < sizeof(struct yaffs_packed_tags2)) {
++		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting inband tags");
++		options.inband_tags = 1;
++	}
+ 
+-	if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0)
++	err = yaffs_verify_mtd(mtd, yaffs_version, options.inband_tags,
++			       options.tags_9bytes);
++	if (err < 0)
+ 		return NULL;
+ 
+ 	/* OK, so if we got here, we have an MTD that's NAND and looks
+@@ -2781,7 +2791,8 @@ static struct super_block *yaffs_interna
+ 
+ 	param->n_reserved_blocks = 5;
+ 	param->n_caches = (options.no_cache) ? 0 : 10;
+-	param->inband_tags = inband_tags;
++	param->inband_tags = options.inband_tags;
++	param->tags_9bytes = options.tags_9bytes;
+ 
+ 	param->enable_xattr = 1;
+ 	if (options.lazy_loading_overridden)
+--- a/fs/yaffs2/yaffs_mtdif.c
++++ b/fs/yaffs2/yaffs_mtdif.c
+@@ -276,7 +276,8 @@ struct mtd_info * yaffs_get_mtd_device(d
+ 	return mtd;
+ }
+ 
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes)
+ {
+ 	if (yaffs_version == 2) {
+ 		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+@@ -295,6 +296,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
+ 			);
+ 			return -1;
+ 		}
++
++		if (tags_9bytes && mtd->oobavail < 9) {
++			yaffs_trace(YAFFS_TRACE_ALWAYS,
++				    "MTD device does not support 9-byte tags");
++			return -1;
++		}
+ 	}
+ 
+ 	return 0;
+--- a/fs/yaffs2/yaffs_mtdif.h
++++ b/fs/yaffs2/yaffs_mtdif.h
+@@ -21,5 +21,6 @@
+ void yaffs_mtd_drv_install(struct yaffs_dev *dev);
+ struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
+ void yaffs_put_mtd_device(struct mtd_info *mtd);
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes);
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.10/504-yaffs-fix-compat-tags-handling.patch b/trunk/target/linux/generic/patches-3.10/504-yaffs-fix-compat-tags-handling.patch
new file mode 100644
index 00000000..a18cf6fd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/504-yaffs-fix-compat-tags-handling.patch
@@ -0,0 +1,239 @@
+Subject: yaffs: fix compat tags handling
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_tagscompat.c
++++ b/fs/yaffs2/yaffs_tagscompat.c
+@@ -17,7 +17,9 @@
+ #include "yaffs_getblockinfo.h"
+ #include "yaffs_trace.h"
+ 
++#if 0
+ static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
++#endif
+ 
+ 
+ /********** Tags ECC calculations  *********/
+@@ -71,6 +73,7 @@ int yaffs_check_tags_ecc(struct yaffs_ta
+ 	return 0;
+ }
+ 
++#if 0
+ /********** Tags **********/
+ 
+ static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
+@@ -379,3 +382,214 @@ void yaffs_tags_compat_install(struct ya
+ 	if(!dev->tagger.mark_bad_fn)
+ 		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
+ }
++#else
++
++#include "yaffs_packedtags1.h"
++
++static int yaffs_tags_compat_write(struct yaffs_dev *dev,
++				   int nand_chunk,
++				   const u8 *data,
++				   const struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	u8 tag_buf[9];
++	int retval;
++
++	/* we assume that yaffs_packed_tags1 and yaffs_tags are compatible */
++	compile_time_assertion(sizeof(struct yaffs_packed_tags1) == 12);
++	compile_time_assertion(sizeof(struct yaffs_tags) == 8);
++
++	yaffs_pack_tags1(&pt1, tags);
++	yaffs_calc_tags_ecc((struct yaffs_tags *)&pt1);
++
++	/* When deleting a chunk, the upper layer provides only skeletal
++	 * tags, one with is_deleted set.  However, we need to update the
++	 * tags, not erase them completely.  So we use the NAND write property
++	 * that only zeroed-bits stick and set tag bytes to all-ones and
++	 * zero just the (not) deleted bit.
++	 */
++	if (!dev->param.tags_9bytes) {
++		if (tags->is_deleted) {
++			memset(&pt1, 0xff, 8);
++			/* clear delete status bit to indicate deleted */
++			pt1.deleted = 0;
++		}
++		memcpy(tag_buf, &pt1, 8);
++	} else {
++		if (tags->is_deleted) {
++			memset(tag_buf, 0xff, 8);
++			tag_buf[8] = 0;
++		} else {
++			memcpy(tag_buf, &pt1, 8);
++			tag_buf[8] = 0xff;
++		}
++	}
++
++	retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk,
++			data,
++			(data) ? dev->data_bytes_per_chunk : 0,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8);
++
++	return retval;
++}
++
++/* Return with empty extended tags but add ecc_result.
++ */
++static int return_empty_tags(struct yaffs_ext_tags *tags,
++			     enum yaffs_ecc_result ecc_result,
++			     int retval)
++{
++	if (tags) {
++		memset(tags, 0, sizeof(*tags));
++		tags->ecc_result = ecc_result;
++	}
++
++	return retval;
++}
++
++static int yaffs_tags_compat_read(struct yaffs_dev *dev,
++				  int nand_chunk,
++				  u8 *data,
++				  struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	enum yaffs_ecc_result ecc_result;
++	int retval;
++	int deleted;
++	u8 tag_buf[9];
++
++	retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
++			data, dev->param.total_bytes_per_chunk,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8,
++			&ecc_result);
++
++	switch (ecc_result) {
++	case YAFFS_ECC_RESULT_NO_ERROR:
++	case YAFFS_ECC_RESULT_FIXED:
++		break;
++
++	case YAFFS_ECC_RESULT_UNFIXED:
++	default:
++		return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED, 0);
++		tags->block_bad = dev->drv.drv_check_bad_fn(dev, nand_chunk);
++		return YAFFS_FAIL;
++	}
++
++	/* Check for a blank/erased chunk. */
++	if (yaffs_check_ff(tag_buf, 8)) {
++		/* when blank, upper layers want ecc_result to be <= NO_ERROR */
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_NO_ERROR,
++					 YAFFS_OK);
++	}
++
++	memcpy(&pt1, tag_buf, 8);
++
++	if (!dev->param.tags_9bytes) {
++		/* Read deleted status (bit) then return it to it's non-deleted
++		 * state before performing tags mini-ECC check. pt1.deleted is
++		 * inverted.
++		 */
++		deleted = !pt1.deleted;
++		pt1.deleted = 1;
++	} else {
++		deleted = (hweight8(tag_buf[8]) < 7) ? 1 : 0;
++	}
++
++	/* Check the packed tags mini-ECC and correct if necessary/possible. */
++	retval = yaffs_check_tags_ecc((struct yaffs_tags *)&pt1);
++	switch (retval) {
++	case 0:
++		/* no tags error, use MTD result */
++		break;
++	case 1:
++		/* recovered tags-ECC error */
++		dev->n_tags_ecc_fixed++;
++		if (ecc_result == YAFFS_ECC_RESULT_NO_ERROR)
++			ecc_result = YAFFS_ECC_RESULT_FIXED;
++		break;
++	default:
++		/* unrecovered tags-ECC error */
++		dev->n_tags_ecc_unfixed++;
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED,
++					 YAFFS_FAIL);
++	}
++
++	/* Unpack the tags to extended form and set ECC result.
++	 * [set should_be_ff just to keep yaffs_unpack_tags1 happy]
++	 */
++	pt1.should_be_ff = 0xffffffff;
++	yaffs_unpack_tags1(tags, &pt1);
++	tags->ecc_result = ecc_result;
++
++	/* Set deleted state */
++	tags->is_deleted = deleted;
++	return YAFFS_OK;
++}
++
++static int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no)
++{
++	return dev->drv.drv_mark_bad_fn(dev, block_no);
++}
++
++static int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
++					 int block_no,
++					 enum yaffs_block_state *state,
++					 u32 *seq_number)
++{
++	struct yaffs_ext_tags tags;
++	int retval;
++
++	yaffs_trace(YAFFS_TRACE_MTD, "%s %d", __func__, block_no);
++
++	*seq_number = 0;
++
++	retval = dev->drv.drv_check_bad_fn(dev, block_no);
++	if (retval == YAFFS_FAIL) {
++		*state = YAFFS_BLOCK_STATE_DEAD;
++		goto out;
++	}
++
++	yaffs_tags_compat_read(dev, block_no * dev->param.chunks_per_block,
++			       NULL, &tags);
++
++	if (tags.ecc_result != YAFFS_ECC_RESULT_NO_ERROR) {
++		yaffs_trace(YAFFS_TRACE_MTD, "block %d is marked bad",
++			    block_no);
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else if (tags.chunk_used) {
++		*seq_number = tags.seq_number;
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else {
++		*state = YAFFS_BLOCK_STATE_EMPTY;
++	}
++
++	retval = YAFFS_OK;
++
++out:
++	yaffs_trace(YAFFS_TRACE_MTD,
++		    "block query returns seq %u state %d",
++		    *seq_number, *state);
++
++	return retval;
++}
++
++void yaffs_tags_compat_install(struct yaffs_dev *dev)
++{
++	if (dev->param.is_yaffs2)
++		return;
++
++	if (!dev->tagger.write_chunk_tags_fn)
++		dev->tagger.write_chunk_tags_fn = yaffs_tags_compat_write;
++
++	if (!dev->tagger.read_chunk_tags_fn)
++		dev->tagger.read_chunk_tags_fn = yaffs_tags_compat_read;
++
++	if (!dev->tagger.query_block_fn)
++		dev->tagger.query_block_fn = yaffs_tags_compat_query_block;
++
++	if (!dev->tagger.mark_bad_fn)
++		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
++}
++#endif
diff --git a/trunk/target/linux/generic/patches-3.10/520-squashfs_update_xz_comp_opts.patch b/trunk/target/linux/generic/patches-3.10/520-squashfs_update_xz_comp_opts.patch
new file mode 100644
index 00000000..523b89f9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/520-squashfs_update_xz_comp_opts.patch
@@ -0,0 +1,25 @@
+From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 12 Apr 2011 19:55:41 +0200
+Subject: [PATCH] squashfs: update xz compressor options struct.
+
+Update the xz compressor options struct to match the squashfs userspace
+one.
+---
+ fs/squashfs/xz_wrapper.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/fs/squashfs/xz_wrapper.c
++++ b/fs/squashfs/xz_wrapper.c
+@@ -39,8 +39,10 @@ struct squashfs_xz {
+ };
+ 
+ struct comp_opts {
+-	__le32 dictionary_size;
+ 	__le32 flags;
++	__le16 bit_opts;
++	__le16 fb;
++	__le32 dictionary_size;
+ };
+ 
+ static void *squashfs_xz_init(struct squashfs_sb_info *msblk, void *buff,
diff --git a/trunk/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch b/trunk/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch
new file mode 100644
index 00000000..6385f015
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch
@@ -0,0 +1,5142 @@
+--- a/fs/jffs2/Kconfig
++++ b/fs/jffs2/Kconfig
+@@ -139,6 +139,15 @@ config JFFS2_LZO
+ 	  This feature was added in July, 2007. Say 'N' if you need
+ 	  compatibility with older bootloaders or kernels.
+ 
++config JFFS2_LZMA
++	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
++	select LZMA_COMPRESS
++	select LZMA_DECOMPRESS
++	depends on JFFS2_FS
++	default n
++	help
++	  JFFS2 wrapper to the LZMA C SDK
++
+ config JFFS2_RTIME
+ 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
+ 	depends on JFFS2_FS
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
+@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
+ jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
+ jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
+ jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
++jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
+ jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
++
++CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
+--- a/fs/jffs2/compr.c
++++ b/fs/jffs2/compr.c
+@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ /* Setting default compression mode */
+ #ifdef CONFIG_JFFS2_CMODE_NONE
+ 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
+@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
+ int jffs2_compressors_exit(void)
+ {
+ /* Unregistering compressors */
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
+--- a/fs/jffs2/compr.h
++++ b/fs/jffs2/compr.h
+@@ -29,9 +29,9 @@
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_LZARI_PRIORITY     30
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
+-
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
+ #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
+@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/fs/jffs2/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
+ 
+-	pr_info("version 2.2."
++	pr_info("version 2.2"
+ #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+ 	       " (NAND)"
+ #endif
+ #ifdef CONFIG_JFFS2_SUMMARY
+-	       " (SUMMARY) "
++	       " (SUMMARY)"
+ #endif
+-	       " © 2001-2006 Red Hat, Inc.\n");
++#ifdef CONFIG_JFFS2_ZLIB
++	       " (ZLIB)"
++#endif
++#ifdef CONFIG_JFFS2_LZO
++	       " (LZO)"
++#endif
++#ifdef CONFIG_JFFS2_LZMA
++	       " (LZMA)"
++#endif
++#ifdef CONFIG_JFFS2_RTIME
++	       " (RTIME)"
++#endif
++#ifdef CONFIG_JFFS2_RUBIN
++	       " (RUBIN)"
++#endif
++#ifdef  CONFIG_JFFS2_CMODE_NONE
++	       " (CMODE_NONE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_PRIORITY
++	       " (CMODE_PRIORITY)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_SIZE
++	       " (CMODE_SIZE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
++	       " (CMODE_FAVOURLZO)"
++#endif
++	       " (c) 2001-2006 Red Hat, Inc.\n");
+ 
+ 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
+ 					     sizeof(struct jffs2_inode_info),
+--- a/include/uapi/linux/jffs2.h
++++ b/include/uapi/linux/jffs2.h
+@@ -46,6 +46,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,62 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <asm/types.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,115 @@
++/* LzFind.h -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_FIND_H
++#define __LZ_FIND_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  size_t directInputRem;
++  int btMode;
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
++    UInt32 *distances, UInt32 maxLen);
++
++/*
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,54 @@
++/* LzHash.h -- HASH functions for LZ algorithms
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_HASH_H
++#define __LZ_HASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,231 @@
++/* LzmaDec.h -- LZMA Decoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_DEC_H
++#define __LZMA_DEC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs,
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum
++{
++  LZMA_FINISH_ANY,   /* finish at any point */
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
++        You must use correct finish mode in that case. */
++
++typedef enum
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually.
++   For Buffer Interface you must always use variant 1.
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */
++
++/* You can use it, if you want to eliminate the overhead for data copying from
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,80 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_ENC_H
++#define __LZMA_ENC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */
++  int lp;          /* 0 <= lp <= 4, default = 0 */
++  int pb;          /* 0 <= pb <= 4, default = 2 */
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,226 @@
++/* Types.h -- Basic types
++2009-11-23 : Igor Pavlov : Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#include <stddef.h>
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
++
++#ifndef EXTERN_C_BEGIN
++#ifdef __cplusplus
++#define EXTERN_C_BEGIN extern "C" {
++#define EXTERN_C_END }
++#else
++#define EXTERN_C_BEGIN
++#define EXTERN_C_END
++#endif
++#endif
++
++EXTERN_C_BEGIN
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifdef _WIN32
++typedef DWORD WRes;
++#else
++typedef int WRes;
++#endif
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++#ifdef _SZ_NO_INT_64
++
++/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
++   NOTES: Some code will work incorrectly in that case! */
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _WIN32
++#define MY_STD_CALL __stdcall
++#else
++#define MY_STD_CALL
++#endif
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_FAST_CALL __fastcall
++
++#else
++
++#define MY_CDECL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++/* it can return SZ_ERROR_INPUT_EOF */
++SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
++SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
++SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++       (result < size) means error */
++} ISeqOutStream;
++
++typedef enum
++{
++  SZ_SEEK_SET = 0,
++  SZ_SEEK_CUR = 1,
++  SZ_SEEK_END = 2
++} ESzSeek;
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ISeekInStream;
++
++typedef struct
++{
++  SRes (*Look)(void *p, void **buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) > input(*size)) is not allowed
++       (output(*size) < input(*size)) is allowed */
++  SRes (*Skip)(void *p, size_t offset);
++    /* offset must be <= output(*size) of Look */
++
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* reads directly (without buffer). It's same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ILookInStream;
++
++SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
++SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
++
++/* reads via ILookInStream::Read */
++SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
++SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
++
++#define LookToRead_BUF_SIZE (1 << 14)
++
++typedef struct
++{
++  ILookInStream s;
++  ISeekInStream *realStream;
++  size_t pos;
++  size_t size;
++  Byte buf[LookToRead_BUF_SIZE];
++} CLookToRead;
++
++void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
++void LookToRead_Init(CLookToRead *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToLook;
++
++void SecToLook_CreateVTable(CSecToLook *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToRead;
++
++void SecToRead_CreateVTable(CSecToRead *p);
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++EXTERN_C_END
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -191,6 +191,12 @@ config LZO_DECOMPRESS
+ 
+ source "lib/xz/Kconfig"
+ 
++config LZMA_COMPRESS
++    tristate
++
++config LZMA_DECOMPRESS
++    tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,6 +2,16 @@
+ # Makefile for some libs needed in the kernel.
+ #
+ 
++ifdef CONFIG_JFFS2_ZLIB
++	CONFIG_ZLIB_INFLATE:=y
++	CONFIG_ZLIB_DEFLATE:=y
++endif
++
++ifdef CONFIG_JFFS2_LZMA
++	CONFIG_LZMA_DECOMPRESS:=y
++	CONFIG_LZMA_COMPRESS:=y
++endif
++
+ ifdef CONFIG_FUNCTION_TRACER
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+@@ -78,6 +88,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/
+ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
+ obj-$(CONFIG_XZ_DEC) += xz/
+ obj-$(CONFIG_RAID6_PQ) += raid6/
++obj-$(CONFIG_LZMA_COMPRESS) += lzma/
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/lib/lzma/LzFind.c
+@@ -0,0 +1,761 @@
++/* LzFind.c -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  if (p->directInput)
++  {
++    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
++    if (curSize > p->directInputRem)
++      curSize = (UInt32)p->directInputRem;
++    p->directInputRem -= curSize;
++    p->streamPos += curSize;
++    if (p->directInputRem == 0)
++      p->streamEndWasReached = 1;
++    return;
++  }
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase,
++    p->buffer - p->keepSizeBefore,
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  if (p->directInput)
++    return 0;
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached)
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = historySize + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit)
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit)
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for (i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
++{
++  return (p->pos - p->historySize - 1) & kNormalizeMask;
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while (++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] =
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2)
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lib/lzma/LzmaDec.c
+@@ -0,0 +1,999 @@
++/* LzmaDec.c -- LZMA Decoder
++2009-09-20 : Igor Pavlov : Public domain */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; }
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded.
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
++Out:
++  Result:
++    SZ_OK - OK
++    SZ_ERROR_DATA - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        state -= (state < 4) ? state : 3;
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        state -= (state < 10) ? 3 : 6;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++      continue;
++    }
++    else
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance;
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while (--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1;
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++      }
++
++      len += kMatchMinLen;
++
++      if (limit == dicPos)
++        return SZ_ERROR_DATA;
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do
++            *(dest) = (Byte)*(dest + src);
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE *
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while (--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++{
++  p->needFlush = 1;
++  p->remainLen = 0;
++  p->tempBufSize = 0;
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p)
++{
++  p->dicPos = 0;
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1;
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = (SizeT)(p->buf - src);
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0)
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->probs);
++  p->probs = 0;
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->dic);
++  p->dic = 0;
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize;
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/LzmaEnc.c
+@@ -0,0 +1,2271 @@
++/* LzmaEnc.c -- LZMA Encoder
++2009-11-24 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include "LzmaEnc.h"
++
++/* disable MT */
++#define _7ZIP_ST
++
++#include "LzFind.h"
++#ifndef _7ZIP_ST
++#include "LzFindMt.h"
++#endif
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3;
++  if (p->lp < 0) p->lp = 0;
++  if (p->pb < 0) p->pb = 2;
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
++  if (p->numHashBytes < 0) p->numHashBytes = 4;
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0)
++    p->numThreads =
++      #ifndef _7ZIP_ST
++      ((p->btMode && p->algo) ? 2 : 1);
++      #else
++      1;
++      #endif
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos)
++{
++  UInt32 res;
++  BSR2_RET(pos, res);
++  return res;
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct
++{
++  UInt32 price;
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;
++
++  UInt32 posPrev;
++  UInt32 backPrev;
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6
++#define kDicLogSizeMin 0
++#define kDicLogSizeMax 32
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifndef _7ZIP_ST
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifndef _7ZIP_ST
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  UInt32 longestMatchLength;
++  UInt32 numPairs;
++  UInt32 numAvail;
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  int needInit;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifndef _7ZIP_ST
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++#define IsCharState(s) ((s) < 7)
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);
++  }
++  p->cacheSize++;
++  p->low = (UInt32)p->low << 8;
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++}
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numPairs;
++  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
++  ttt++;
++  {
++    UInt32 i;
++    for (i = 0; i < numPairs; i += 2)
++      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
++  }
++  #endif
++  if (numPairs > 0)
++  {
++    lenRes = p->matches[numPairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matches[numPairs - 1] + 1;
++      UInt32 numAvail = p->numAvail;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numPairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex;
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
++  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
++  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
++  UInt32 *matches;
++  const Byte *data;
++  Byte curByte, matchByte;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  if (numAvail < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++  curByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
++        (!IsCharState(p->state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == curByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= mainLen)
++  {
++    UInt32 offs = 0;
++    while (len > matches[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matches[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matches[offs])
++      {
++        offs += 2;
++        if (offs == numPairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
++    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
++    Bool nextIsChar;
++    Byte curByte, matchByte;
++    const Byte *data;
++    COptimal *curOpt;
++    COptimal *nextOpt;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    newLen = ReadMatchDistances(p, &numPairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numPairs = numPairs;
++      p->longestMatchLength = newLen;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price;
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    curByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price +=
++        (!IsCharState(state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++    }
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price)
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++    numAvailFull = p->numAvail;
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp < numAvailFull)
++        numAvailFull = temp;
++    }
++
++    if (numAvailFull < 2)
++      continue;
++    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
++
++    if (!nextIsChar && matchByte != curByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailFull)
++        limit = numAvailFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price +
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price)
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice =
++                price + p->repLenEnc.prices[posState][lenTest - 2] +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvail)
++    {
++      newLen = numAvail;
++      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
++      matches[numPairs] = newLen;
++      numPairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matches[offs])
++        offs += 2;
++      curBack = matches[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matches[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numPairs)
++            break;
++          curBack = matches[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
++  const Byte *data;
++  const UInt32 *matches;
++
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  *backRes = (UInt32)-1;
++  if (numAvail < 2)
++    return 1;
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++
++  repLen = repIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    if (len > repLen)
++    {
++      repIndex = i;
++      repLen = len;
++    }
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++
++  mainDist = 0; /* for GCC */
++  if (mainLen >= 2)
++  {
++    mainDist = matches[numPairs - 1];
++    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
++    {
++      if (!ChangePair(matches[numPairs - 3], mainDist))
++        break;
++      numPairs -= 2;
++      mainLen = matches[numPairs - 2];
++      mainDist = matches[numPairs - 1];
++    }
++    if (mainLen == 2 && mainDist >= 0x80)
++      mainLen = 1;
++  }
++
++  if (repLen >= 2 && (
++        (repLen + 1 >= mainLen) ||
++        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
++        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
++  {
++    *backRes = repIndex;
++    MovePos(p, repLen - 1);
++    return repLen;
++  }
++  
++  if (mainLen < 2 || numAvail <= 2)
++    return 1;
++
++  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
++  if (p->longestMatchLength >= 2)
++  {
++    UInt32 newDistance = matches[p->numPairs - 1];
++    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
++        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
++        (p->longestMatchLength > mainLen + 1) ||
++        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
++      return 1;
++  }
++  
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len, limit;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    limit = mainLen - 1;
++    for (len = 2; len < limit && data[len] == data2[len]; len++);
++    if (len >= limit)
++      return 1;
++  }
++  *backRes = mainDist + LZMA_NUM_REPS;
++  MovePos(p, mainLen - 2);
++  return mainLen;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  {
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->needInit)
++  {
++    p->matchFinder.Init(p->matchFinderObj);
++    p->needInit = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numPairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numPairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == (UInt32)-1)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifndef _7ZIP_ST
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifndef _7ZIP_ST
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for (i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize =
++  p->repLenEnc.tableSize =
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->matchFinderBase.directInput = 1;
++  p->matchFinderBase.bufferBase = (Byte *)src;
++  p->matchFinderBase.directInputRem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->needInit = 1;
++
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifndef _7ZIP_ST
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #else
++  pp = pp;
++  #endif
++}
++
++typedef struct
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
++{
++  SRes res = SZ_OK;
++
++  #ifndef _7ZIP_ST
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(p);
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
++  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++
++  p->rc.outStream = &outStream.funcTable;
++  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
++  if (res == SZ_OK)
++    res = LzmaEnc_Encode2(p, progress);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/Makefile
+@@ -0,0 +1,7 @@
++lzma_compress-objs := LzFind.o LzmaEnc.o
++lzma_decompress-objs := LzmaDec.o
++
++obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
++
++EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/trunk/target/linux/generic/patches-3.10/531-debloat_lzma.patch b/trunk/target/linux/generic/patches-3.10/531-debloat_lzma.patch
new file mode 100644
index 00000000..9f9690f1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/531-debloat_lzma.patch
@@ -0,0 +1,1021 @@
+--- a/include/linux/lzma/LzmaDec.h
++++ b/include/linux/lzma/LzmaDec.h
+@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
+   UInt32 dicSize;
+ } CLzmaProps;
+ 
+-/* LzmaProps_Decode - decodes properties
+-Returns:
+-  SZ_OK
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+-
+ 
+ /* ---------- LZMA Decoder state ---------- */
+ 
+@@ -70,8 +62,6 @@ typedef struct
+ 
+ #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
+ 
+-void LzmaDec_Init(CLzmaDec *p);
+-
+ /* There are two types of LZMA streams:
+      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
+      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+@@ -108,97 +98,6 @@ typedef enum
+ 
+ /* ELzmaStatus is used only as output value for function call */
+ 
+-
+-/* ---------- Interfaces ---------- */
+-
+-/* There are 3 levels of interfaces:
+-     1) Dictionary Interface
+-     2) Buffer Interface
+-     3) One Call Interface
+-   You can select any of these interfaces, but don't mix functions from different
+-   groups for same object. */
+-
+-
+-/* There are two variants to allocate state for Dictionary Interface:
+-     1) LzmaDec_Allocate / LzmaDec_Free
+-     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+-   You can use variant 2, if you set dictionary buffer manually.
+-   For Buffer Interface you must always use variant 1.
+-
+-LzmaDec_Allocate* can return:
+-  SZ_OK
+-  SZ_ERROR_MEM         - Memory allocation error
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-   
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
+-
+-SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
+-
+-/* ---------- Dictionary Interface ---------- */
+-
+-/* You can use it, if you want to eliminate the overhead for data copying from
+-   dictionary to some other external buffer.
+-   You must work with CLzmaDec variables directly in this interface.
+-
+-   STEPS:
+-     LzmaDec_Constr()
+-     LzmaDec_Allocate()
+-     for (each new stream)
+-     {
+-       LzmaDec_Init()
+-       while (it needs more decompression)
+-       {
+-         LzmaDec_DecodeToDic()
+-         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+-       }
+-     }
+-     LzmaDec_Free()
+-*/
+-
+-/* LzmaDec_DecodeToDic
+-   
+-   The decoding to internal dictionary buffer (CLzmaDec::dic).
+-   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (dicLimit).
+-  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+-  LZMA_FINISH_END - Stream must be finished after dicLimit.
+-
+-Returns:
+-  SZ_OK
+-    status:
+-      LZMA_STATUS_FINISHED_WITH_MARK
+-      LZMA_STATUS_NOT_FINISHED
+-      LZMA_STATUS_NEEDS_MORE_INPUT
+-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+-  SZ_ERROR_DATA - Data error
+-*/
+-
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+-/* ---------- Buffer Interface ---------- */
+-
+-/* It's zlib-like interface.
+-   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+-   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+-   to work with CLzmaDec variables manually.
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (*destLen).
+-  LZMA_FINISH_ANY - Decode just destLen bytes.
+-  LZMA_FINISH_END - Stream must be finished after (*destLen).
+-*/
+-
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+ /* ---------- One Call Interface ---------- */
+ 
+ /* LzmaDecode
+--- a/lib/lzma/LzmaDec.c
++++ b/lib/lzma/LzmaDec.c
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 
+   p->needFlush = 0;
+ }
+ 
+-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+ {
+   p->needFlush = 1;
+   p->remainLen = 0;
+@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
+     p->needInitState = 1;
+ }
+ 
+-void LzmaDec_Init(CLzmaDec *p)
++static void LzmaDec_Init(CLzmaDec *p)
+ {
+   p->dicPos = 0;
+   LzmaDec_InitDicAndState(p, True, True);
+@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
+   p->needInitState = 0;
+ }
+ 
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+     ELzmaFinishMode finishMode, ELzmaStatus *status)
+ {
+   SizeT inSize = *srcLen;
+@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
+   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
+ }
+ 
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+-{
+-  SizeT outSize = *destLen;
+-  SizeT inSize = *srcLen;
+-  *srcLen = *destLen = 0;
+-  for (;;)
+-  {
+-    SizeT inSizeCur = inSize, outSizeCur, dicPos;
+-    ELzmaFinishMode curFinishMode;
+-    SRes res;
+-    if (p->dicPos == p->dicBufSize)
+-      p->dicPos = 0;
+-    dicPos = p->dicPos;
+-    if (outSize > p->dicBufSize - dicPos)
+-    {
+-      outSizeCur = p->dicBufSize;
+-      curFinishMode = LZMA_FINISH_ANY;
+-    }
+-    else
+-    {
+-      outSizeCur = dicPos + outSize;
+-      curFinishMode = finishMode;
+-    }
+-
+-    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
+-    src += inSizeCur;
+-    inSize -= inSizeCur;
+-    *srcLen += inSizeCur;
+-    outSizeCur = p->dicPos - dicPos;
+-    memcpy(dest, p->dic + dicPos, outSizeCur);
+-    dest += outSizeCur;
+-    outSize -= outSizeCur;
+-    *destLen += outSizeCur;
+-    if (res != 0)
+-      return res;
+-    if (outSizeCur == 0 || outSize == 0)
+-      return SZ_OK;
+-  }
+-}
+-
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->probs);
+   p->probs = 0;
+ }
+ 
+-static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  alloc->Free(alloc, p->dic);
+-  p->dic = 0;
+-}
+-
+-void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  LzmaDec_FreeProbs(p, alloc);
+-  LzmaDec_FreeDict(p, alloc);
+-}
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+ {
+   UInt32 dicSize;
+   Byte d;
+@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+   return SZ_OK;
+ }
+ 
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+-{
+-  CLzmaProps propNew;
+-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  p->prop = propNew;
+-  return SZ_OK;
+-}
+-
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+ {
+   CLzmaProps propNew;
+-  SizeT dicBufSize;
+   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+   RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  dicBufSize = propNew.dicSize;
+-  if (p->dic == 0 || dicBufSize != p->dicBufSize)
+-  {
+-    LzmaDec_FreeDict(p, alloc);
+-    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
+-    if (p->dic == 0)
+-    {
+-      LzmaDec_FreeProbs(p, alloc);
+-      return SZ_ERROR_MEM;
+-    }
+-  }
+-  p->dicBufSize = dicBufSize;
+   p->prop = propNew;
+   return SZ_OK;
+ }
+--- a/include/linux/lzma/LzmaEnc.h
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
+ } CLzmaEncProps;
+ 
+ void LzmaEncProps_Init(CLzmaEncProps *p);
+-void LzmaEncProps_Normalize(CLzmaEncProps *p);
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+-
+ 
+ /* ---------- CLzmaEncHandle Interface ---------- */
+ 
+@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+ void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ 
+-/* ---------- One Call Interface ---------- */
+-
+-/* LzmaEncode
+-Return code:
+-  SZ_OK               - OK
+-  SZ_ERROR_MEM        - Memory allocation error
+-  SZ_ERROR_PARAM      - Incorrect paramater
+-  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+-  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+-*/
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzmaEnc.c
++++ b/lib/lzma/LzmaEnc.c
+@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
+   p->writeEndMark = 0;
+ }
+ 
+-void LzmaEncProps_Normalize(CLzmaEncProps *p)
++static void LzmaEncProps_Normalize(CLzmaEncProps *p)
+ {
+   int level = p->level;
+   if (level < 0) level = 5;
+@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
+       #endif
+ }
+ 
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+ {
+   CLzmaEncProps props = *props2;
+   LzmaEncProps_Normalize(&props);
+@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
+ 
+ #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
+ 
+-UInt32 GetPosSlot1(UInt32 pos)
++static UInt32 GetPosSlot1(UInt32 pos)
+ {
+   UInt32 res;
+   BSR2_RET(pos, res);
+@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
+ #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
+ #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+ 
+-void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
+ {
+   int c = 2, slotFast;
+   g_FastPos[0] = 0;
+@@ -339,58 +339,6 @@ typedef struct
+   CSaveState saveState;
+ } CLzmaEnc;
+ 
+-void LzmaEnc_SaveState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  CSaveState *dest = &p->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
+-}
+-
+-void LzmaEnc_RestoreState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *dest = (CLzmaEnc *)pp;
+-  const CSaveState *p = &dest->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
+-}
+-
+ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE
+   while (symbol < 0x10000);
+ }
+ 
+-void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
+ {
+   UInt32 i;
+   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
+@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc
+   p->matchPriceCount = 0;
+ }
+ 
+-void LzmaEnc_Construct(CLzmaEnc *p)
++static void LzmaEnc_Construct(CLzmaEnc *p)
+ {
+   RangeEnc_Construct(&p->rc);
+   MatchFinder_Construct(&p->matchFinderBase);
+@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+   return p;
+ }
+ 
+-void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->litProbs);
+   alloc->Free(alloc, p->saveState.litProbs);
+@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl
+   p->saveState.litProbs = 0;
+ }
+ 
+-void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   #ifndef _7ZIP_ST
+   MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
+@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U
+   return SZ_OK;
+ }
+ 
+-void LzmaEnc_Init(CLzmaEnc *p)
++static void LzmaEnc_Init(CLzmaEnc *p)
+ {
+   UInt32 i;
+   p->state = 0;
+@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p)
+   p->lpMask = (1 << p->lp) - 1;
+ }
+ 
+-void LzmaEnc_InitPrices(CLzmaEnc *p)
++static void LzmaEnc_InitPrices(CLzmaEnc *p)
+ {
+   if (!p->fastMode)
+   {
+@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
+   return SZ_OK;
+ }
+ 
+-static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  p->rc.outStream = outStream;
+-  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
+-}
+-
+-SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
+-    ISeqInStream *inStream, UInt32 keepWindowSize,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+-}
+-
+ static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
+ {
+   p->matchFinderBase.directInput = 1;
+@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc
+   p->matchFinderBase.directInputRem = srcLen;
+ }
+ 
+-SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+     UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
+   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+ }
+ 
+-void LzmaEnc_Finish(CLzmaEncHandle pp)
++static void LzmaEnc_Finish(CLzmaEncHandle pp)
+ {
+   #ifndef _7ZIP_ST
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo
+   return size;
+ }
+ 
+-
+-UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+-}
+-
+-const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+-}
+-
+-SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
+-    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  UInt64 nowPos64;
+-  SRes res;
+-  CSeqOutStreamBuf outStream;
+-
+-  outStream.funcTable.Write = MyWrite;
+-  outStream.data = dest;
+-  outStream.rem = *destLen;
+-  outStream.overflow = False;
+-
+-  p->writeEndMark = False;
+-  p->finished = False;
+-  p->result = SZ_OK;
+-
+-  if (reInit)
+-    LzmaEnc_Init(p);
+-  LzmaEnc_InitPrices(p);
+-  nowPos64 = p->nowPos64;
+-  RangeEnc_Init(&p->rc);
+-  p->rc.outStream = &outStream.funcTable;
+-
+-  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
+-  
+-  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+-  *destLen -= outStream.rem;
+-  if (outStream.overflow)
+-    return SZ_ERROR_OUTPUT_EOF;
+-
+-  return res;
+-}
+-
+ static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
+ {
+   SRes res = SZ_OK;
+@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p,
+   return res;
+ }
+ 
+-SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
+-  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
+-}
+-
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
+     return SZ_ERROR_OUTPUT_EOF;
+   return res;
+ }
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
+-  SRes res;
+-  if (p == 0)
+-    return SZ_ERROR_MEM;
+-
+-  res = LzmaEnc_SetProps(p, props);
+-  if (res == SZ_OK)
+-  {
+-    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
+-    if (res == SZ_OK)
+-      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
+-          writeEndMark, progress, alloc, allocBig);
+-  }
+-
+-  LzmaEnc_Destroy(p, alloc, allocBig);
+-  return res;
+-}
+--- a/include/linux/lzma/LzFind.h
++++ b/include/linux/lzma/LzFind.h
+@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
+ 
+ #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p);
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+-void MatchFinder_MoveBlock(CMatchFinder *p);
+-void MatchFinder_ReadIfRequired(CMatchFinder *p);
+-
+ void MatchFinder_Construct(CMatchFinder *p);
+ 
+ /* Conditions:
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 
+     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+     ISzAlloc *alloc);
+ void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+-    UInt32 *distances, UInt32 maxLen);
+ 
+ /*
+ Conditions:
+@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
+ 
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+ 
+-void MatchFinder_Init(CMatchFinder *p);
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzFind.c
++++ b/lib/lzma/LzFind.c
+@@ -14,9 +14,15 @@
+ 
+ #define kStartMaxLen 3
+ 
++#if 0
++#define DIRECT_INPUT	p->directInput
++#else
++#define DIRECT_INPUT	1
++#endif
++
+ static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
+ {
+-  if (!p->directInput)
++  if (!DIRECT_INPUT)
+   {
+     alloc->Free(alloc, p->bufferBase);
+     p->bufferBase = 0;
+@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder
+ static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
+ {
+   UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     p->blockSize = blockSize;
+     return 1;
+@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde
+   return (p->bufferBase != 0);
+ }
+ 
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+-Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
+ 
+-UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+ 
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+ {
+   p->posLimit -= subValue;
+   p->pos -= subValue;
+@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch
+ {
+   if (p->streamEndWasReached || p->result != SZ_OK)
+     return;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     UInt32 curSize = 0xFFFFFFFF - p->streamPos;
+     if (curSize > p->directInputRem)
+@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch
+   }
+ }
+ 
+-void MatchFinder_MoveBlock(CMatchFinder *p)
++static void MatchFinder_MoveBlock(CMatchFinder *p)
+ {
+   memmove(p->bufferBase,
+     p->buffer - p->keepSizeBefore,
+@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder 
+   p->buffer = p->bufferBase + p->keepSizeBefore;
+ }
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p)
++static int MatchFinder_NeedMove(CMatchFinder *p)
+ {
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+     return 0;
+   /* if (p->streamEndWasReached) return 0; */
+   return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
+ }
+ 
+-void MatchFinder_ReadIfRequired(CMatchFinder *p)
+-{
+-  if (p->streamEndWasReached)
+-    return;
+-  if (p->keepSizeAfter >= p->streamPos - p->pos)
+-    MatchFinder_ReadBlock(p);
+-}
+-
+ static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
+ {
+   if (MatchFinder_NeedMove(p))
+@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch
+   p->posLimit = p->pos + limit;
+ }
+ 
+-void MatchFinder_Init(CMatchFinder *p)
++static void MatchFinder_Init(CMatchFinder *p)
+ {
+   UInt32 i;
+   for (i = 0; i < p->hashSizeSum; i++)
+@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM
+   return (p->pos - p->historySize - 1) & kNormalizeMask;
+ }
+ 
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
+ {
+   UInt32 i;
+   for (i = 0; i < numItems; i++)
+@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat
+   MatchFinder_SetLimits(p);
+ }
+ 
+-static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+-    UInt32 *distances, UInt32 maxLen)
+-{
+-  son[_cyclicBufferPos] = curMatch;
+-  for (;;)
+-  {
+-    UInt32 delta = pos - curMatch;
+-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+-      return distances;
+-    {
+-      const Byte *pb = cur - delta;
+-      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+-      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
+-      {
+-        UInt32 len = 0;
+-        while (++len != lenLimit)
+-          if (pb[len] != cur[len])
+-            break;
+-        if (maxLen < len)
+-        {
+-          *distances++ = maxLen = len;
+-          *distances++ = delta - 1;
+-          if (len == lenLimit)
+-            return distances;
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+     UInt32 *distances, UInt32 maxLen)
+ {
+@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi
+   p->buffer++; \
+   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
+ 
+-#define MOVE_POS_RET MOVE_POS return offset;
+-
+ static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
+ 
++#define MOVE_POS_RET MatchFinder_MovePos(p); return offset;
++
+ #define GET_MATCHES_HEADER2(minLen, ret_op) \
+   UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
+   lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
+@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi
+   distances + offset, maxLen) - distances); MOVE_POS_RET;
+ 
+ #define SKIP_FOOTER \
+-  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
+-
+-static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(2)
+-  HASH2_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 1)
+-}
+-
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 2)
+-}
+-
+-static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, delta2, maxLen, offset;
+-  GET_MATCHES_HEADER(3)
+-
+-  HASH3_CALC;
+-
+-  delta2 = p->pos - p->hash[hash2Value];
+-  curMatch = p->hash[kFix3HashSize + hashValue];
+-  
+-  p->hash[hash2Value] =
+-  p->hash[kFix3HashSize + hashValue] = p->pos;
+-
+-
+-  maxLen = 2;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[0] = maxLen;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-    if (maxLen == lenLimit)
+-    {
+-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+-      MOVE_POS_RET;
+-    }
+-  }
+-  GET_MATCHES_FOOTER(offset, maxLen)
+-}
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p);
+ 
+ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+ {
+@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches
+   GET_MATCHES_FOOTER(offset, maxLen)
+ }
+ 
+-static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
+-  GET_MATCHES_HEADER(4)
+-
+-  HASH4_CALC;
+-
+-  delta2 = p->pos - p->hash[                hash2Value];
+-  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
+-  curMatch = p->hash[kFix4HashSize + hashValue];
+-
+-  p->hash[                hash2Value] =
+-  p->hash[kFix3HashSize + hash3Value] =
+-  p->hash[kFix4HashSize + hashValue] = p->pos;
+-
+-  maxLen = 1;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    distances[0] = maxLen = 2;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-  }
+-  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
+-  {
+-    maxLen = 3;
+-    distances[offset + 1] = delta3 - 1;
+-    offset += 2;
+-    delta2 = delta3;
+-  }
+-  if (offset != 0)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[offset - 2] = maxLen;
+-    if (maxLen == lenLimit)
+-    {
+-      p->son[p->cyclicBufferPos] = curMatch;
+-      MOVE_POS_RET;
+-    }
+-  }
+-  if (maxLen < 3)
+-    maxLen = 3;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances + offset, maxLen) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances, 2) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(2)
+-    HASH2_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value;
+-    SKIP_HEADER(3)
+-    HASH3_CALC;
+-    curMatch = p->hash[kFix3HashSize + hashValue];
+-    p->hash[hash2Value] =
+-    p->hash[kFix3HashSize + hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+ static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+ {
+   do
+@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF
+   while (--num != 0);
+ }
+ 
+-static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value, hash3Value;
+-    SKIP_HEADER(4)
+-    HASH4_CALC;
+-    curMatch = p->hash[kFix4HashSize + hashValue];
+-    p->hash[                hash2Value] =
+-    p->hash[kFix3HashSize + hash3Value] =
+-    p->hash[kFix4HashSize + hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
+ {
+   vTable->Init = (Mf_Init_Func)MatchFinder_Init;
+   vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
+   vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
+   vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
+-  if (!p->btMode)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 2)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 3)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
+-  }
+-  else
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+-  }
++  vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++  vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+ }
diff --git a/trunk/target/linux/generic/patches-3.10/532-jffs2_eofdetect.patch b/trunk/target/linux/generic/patches-3.10/532-jffs2_eofdetect.patch
new file mode 100644
index 00000000..26917906
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/532-jffs2_eofdetect.patch
@@ -0,0 +1,56 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
+ 	dbg_fsbuild("scanned flash completely\n");
+ 	jffs2_dbg_dump_block_lists_nolock(c);
+ 
++	if (c->flags & (1 << 7)) {
++		printk("%s(): unlocking the mtd device... ", __func__);
++		mtd_unlock(c->mtd, 0, c->mtd->size);
++		printk("done.\n");
++
++		printk("%s(): erasing all blocks after the end marker... ", __func__);
++		jffs2_erase_pending_blocks(c, -1);
++		printk("done.\n");
++	}
++
+ 	dbg_fsbuild("pass 1 starting\n");
+ 	c->flags |= JFFS2_SB_FLAG_BUILDING;
+ 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in
+ 		/* reset summary info for next eraseblock scan */
+ 		jffs2_sum_reset_collected(s);
+ 
+-		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
+-						buf_size, s);
++		if (c->flags & (1 << 7)) {
++			if (mtd_block_isbad(c->mtd, jeb->offset))
++				ret = BLK_STATE_BADBLOCK;
++			else
++				ret = BLK_STATE_ALLFF;
++		} else
++			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
++							buf_size, s);
+ 
+ 		if (ret < 0)
+ 			goto out;
+@@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct
+ 			return err;
+ 	}
+ 
++	if ((buf[0] == 0xde) &&
++		(buf[1] == 0xad) &&
++		(buf[2] == 0xc0) &&
++		(buf[3] == 0xde)) {
++		/* end of filesystem. erase everything after this point */
++		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
++		c->flags |= (1 << 7);
++
++		return BLK_STATE_ALLFF;
++	}
++
+ 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+ 	ofs = 0;
+ 	max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
diff --git a/trunk/target/linux/generic/patches-3.10/540-crypto-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.10/540-crypto-xz-decompression-support.patch
new file mode 100644
index 00000000..c1384b33
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/540-crypto-xz-decompression-support.patch
@@ -0,0 +1,146 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1361,6 +1361,13 @@ config CRYPTO_842
+ 	help
+ 	  This is the 842 algorithm.
+ 
++config CRYPTO_XZ
++	tristate "XZ compression algorithm"
++	select CRYPTO_ALGAPI
++	select XZ_DEC
++	help
++	  This is the XZ algorithm. Only decompression is supported for now.
++
+ comment "Random Number Generation"
+ 
+ config CRYPTO_ANSI_CPRNG
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -85,6 +85,7 @@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+ obj-$(CONFIG_CRYPTO_CRC32) += crc32.o
+ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
+ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
++obj-$(CONFIG_CRYPTO_XZ) += xz.o
+ obj-$(CONFIG_CRYPTO_842) += 842.o
+ obj-$(CONFIG_CRYPTO_RNG2) += rng.o
+ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
+--- /dev/null
++++ b/crypto/xz.c
+@@ -0,0 +1,117 @@
++/*
++ * Cryptographic API.
++ *
++ * XZ decompression support.
++ *
++ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ *
++ */
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/crypto.h>
++#include <linux/xz.h>
++#include <linux/interrupt.h>
++#include <linux/mm.h>
++#include <linux/net.h>
++
++struct xz_comp_ctx {
++	struct xz_dec	*decomp_state;
++	struct xz_buf	decomp_buf;
++};
++
++static int crypto_xz_decomp_init(struct xz_comp_ctx *ctx)
++{
++	ctx->decomp_state = xz_dec_init(XZ_SINGLE, 0);
++	if (!ctx->decomp_state)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void crypto_xz_decomp_exit(struct xz_comp_ctx *ctx)
++{
++	xz_dec_end(ctx->decomp_state);
++}
++
++static int crypto_xz_init(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	return crypto_xz_decomp_init(ctx);
++}
++
++static void crypto_xz_exit(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	crypto_xz_decomp_exit(ctx);
++}
++
++static int crypto_xz_compress(struct crypto_tfm *tfm, const u8 *src,
++			      unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	return -EOPNOTSUPP;
++}
++
++static int crypto_xz_decompress(struct crypto_tfm *tfm, const u8 *src,
++				unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	struct xz_comp_ctx *dctx = crypto_tfm_ctx(tfm);
++	struct xz_buf *xz_buf = &dctx->decomp_buf;
++	int ret;
++
++	memset(xz_buf, '\0', sizeof(struct xz_buf));
++
++	xz_buf->in = (u8 *) src;
++	xz_buf->in_pos = 0;
++	xz_buf->in_size = slen;
++	xz_buf->out = (u8 *) dst;
++	xz_buf->out_pos = 0;
++	xz_buf->out_size = *dlen;
++
++	ret = xz_dec_run(dctx->decomp_state, xz_buf);
++	if (ret != XZ_STREAM_END) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	*dlen = xz_buf->out_pos;
++	ret = 0;
++
++out:
++	return ret;
++}
++
++static struct crypto_alg crypto_xz_alg = {
++	.cra_name		= "xz",
++	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,
++	.cra_ctxsize		= sizeof(struct xz_comp_ctx),
++	.cra_module		= THIS_MODULE,
++	.cra_list		= LIST_HEAD_INIT(crypto_xz_alg.cra_list),
++	.cra_init		= crypto_xz_init,
++	.cra_exit		= crypto_xz_exit,
++	.cra_u			= { .compress = {
++	.coa_compress 		= crypto_xz_compress,
++	.coa_decompress  	= crypto_xz_decompress } }
++};
++
++static int __init crypto_xz_mod_init(void)
++{
++	return crypto_register_alg(&crypto_xz_alg);
++}
++
++static void __exit crypto_xz_mod_exit(void)
++{
++	crypto_unregister_alg(&crypto_xz_alg);
++}
++
++module_init(crypto_xz_mod_init);
++module_exit(crypto_xz_mod_exit);
++
++MODULE_LICENSE("GPL v2");
++MODULE_DESCRIPTION("Crypto XZ decompression support");
++MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/trunk/target/linux/generic/patches-3.10/541-ubifs-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.10/541-ubifs-xz-decompression-support.patch
new file mode 100644
index 00000000..f85689c5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/541-ubifs-xz-decompression-support.patch
@@ -0,0 +1,92 @@
+--- a/fs/ubifs/Kconfig
++++ b/fs/ubifs/Kconfig
+@@ -5,8 +5,10 @@ config UBIFS_FS
+ 	select CRYPTO if UBIFS_FS_ADVANCED_COMPR
+ 	select CRYPTO if UBIFS_FS_LZO
+ 	select CRYPTO if UBIFS_FS_ZLIB
++	select CRYPTO if UBIFS_FS_XZ
+ 	select CRYPTO_LZO if UBIFS_FS_LZO
+ 	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
++	select CRYPTO_XZ if UBIFS_FS_XZ
+ 	depends on MTD_UBI
+ 	help
+ 	  UBIFS is a file system for flash devices which works on top of UBI.
+@@ -35,3 +37,12 @@ config UBIFS_FS_ZLIB
+ 	default y
+ 	help
+ 	  Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
++
++config UBIFS_FS_XZ
++	bool "XZ decompression support" if UBIFS_FS_ADVANCED_COMPR
++	depends on UBIFS_FS
++	default y
++	help
++	  XZ compresses better the ZLIB but it is slower..
++	  Say 'Y' if unsure.
++
+--- a/fs/ubifs/compress.c
++++ b/fs/ubifs/compress.c
+@@ -71,6 +71,24 @@ static struct ubifs_compressor zlib_comp
+ };
+ #endif
+ 
++#ifdef CONFIG_UBIFS_FS_XZ
++static DEFINE_MUTEX(xz_enc_mutex);
++static DEFINE_MUTEX(xz_dec_mutex);
++
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.comp_mutex = &xz_enc_mutex,
++	.decomp_mutex = &xz_dec_mutex,
++	.name = "xz",
++	.capi_name = "xz",
++};
++#else
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.name = "xz",
++};
++#endif
++
+ /* All UBIFS compressors */
+ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
+ 
+@@ -232,9 +250,15 @@ int __init ubifs_compressors_init(void)
+ 	if (err)
+ 		goto out_lzo;
+ 
++	err = compr_init(&xz_compr);
++	if (err)
++		goto out_zlib;
++
+ 	ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+ 	return 0;
+ 
++out_zlib:
++	compr_exit(&zlib_compr);
+ out_lzo:
+ 	compr_exit(&lzo_compr);
+ 	return err;
+@@ -247,4 +271,5 @@ void ubifs_compressors_exit(void)
+ {
+ 	compr_exit(&lzo_compr);
+ 	compr_exit(&zlib_compr);
++	compr_exit(&xz_compr);
+ }
+--- a/fs/ubifs/ubifs-media.h
++++ b/fs/ubifs/ubifs-media.h
+@@ -332,12 +332,14 @@ enum {
+  * UBIFS_COMPR_NONE: no compression
+  * UBIFS_COMPR_LZO: LZO compression
+  * UBIFS_COMPR_ZLIB: ZLIB compression
++ * UBIFS_COMPR_XZ: XZ compression
+  * UBIFS_COMPR_TYPES_CNT: count of supported compression types
+  */
+ enum {
+ 	UBIFS_COMPR_NONE,
+ 	UBIFS_COMPR_LZO,
+ 	UBIFS_COMPR_ZLIB,
++	UBIFS_COMPR_XZ,
+ 	UBIFS_COMPR_TYPES_CNT,
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch b/trunk/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch
new file mode 100644
index 00000000..8b86cf86
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch
@@ -0,0 +1,65 @@
+--- a/fs/ubifs/file.c
++++ b/fs/ubifs/file.c
+@@ -1575,6 +1575,10 @@ const struct inode_operations ubifs_syml
+ 	.follow_link = ubifs_follow_link,
+ 	.setattr     = ubifs_setattr,
+ 	.getattr     = ubifs_getattr,
++	.setxattr    = ubifs_setxattr,
++	.getxattr    = ubifs_getxattr,
++	.listxattr   = ubifs_listxattr,
++	.removexattr = ubifs_removexattr,
+ };
+ 
+ const struct file_operations ubifs_file_operations = {
+--- a/fs/ubifs/journal.c
++++ b/fs/ubifs/journal.c
+@@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu",
+ 		inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino);
+-	ubifs_assert(dir_ui->data_len == 0);
++	if (!xent)
++		ubifs_assert(dir_ui->data_len == 0);
+ 	ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex));
+ 
+ 	dlen = UBIFS_DENT_NODE_SZ + nm->len + 1;
+@@ -573,6 +574,13 @@ int ubifs_jnl_update(struct ubifs_info *
+ 	aligned_dlen = ALIGN(dlen, 8);
+ 	aligned_ilen = ALIGN(ilen, 8);
+ 	len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
++	if (xent) {
++		/*
++		 * Make sure to account for dir_ui->data_len in
++		 * length calculation in case there is extended attribute.
++		 */
++		len += dir_ui->data_len;
++	}
+ 	dent = kmalloc(len, GFP_NOFS);
+ 	if (!dent)
+ 		return -ENOMEM;
+@@ -649,7 +657,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	ino_key_init(c, &ino_key, dir->i_ino);
+ 	ino_offs += aligned_ilen;
+-	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ);
++	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs,
++			    UBIFS_INO_NODE_SZ + dir_ui->data_len);
+ 	if (err)
+ 		goto out_ro;
+ 
+--- a/fs/ubifs/xattr.c
++++ b/fs/ubifs/xattr.c
+@@ -209,12 +209,12 @@ static int change_xattr(struct ubifs_inf
+ 		goto out_free;
+ 	}
+ 	inode->i_size = ui->ui_size = size;
+-	ui->data_len = size;
+ 
+ 	mutex_lock(&host_ui->ui_mutex);
+ 	host->i_ctime = ubifs_current_time(host);
+ 	host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len);
+ 	host_ui->xattr_size += CALC_XATTR_BYTES(size);
++	ui->data_len = size;
+ 
+ 	/*
+ 	 * It is important to write the host inode after the xattr inode
diff --git a/trunk/target/linux/generic/patches-3.10/551-ubifs-fix-default-compression-selection.patch b/trunk/target/linux/generic/patches-3.10/551-ubifs-fix-default-compression-selection.patch
new file mode 100644
index 00000000..1b0f3071
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/551-ubifs-fix-default-compression-selection.patch
@@ -0,0 +1,29 @@
+--- a/fs/ubifs/sb.c
++++ b/fs/ubifs/sb.c
+@@ -63,6 +63,17 @@
+ /* Default time granularity in nanoseconds */
+ #define DEFAULT_TIME_GRAN 1000000000
+ 
++static int get_default_compressor(void)
++{
++	if (ubifs_compr_present(UBIFS_COMPR_LZO))
++		return UBIFS_COMPR_LZO;
++
++	if (ubifs_compr_present(UBIFS_COMPR_ZLIB))
++		return UBIFS_COMPR_ZLIB;
++
++	return UBIFS_COMPR_NONE;
++}
++
+ /**
+  * create_default_filesystem - format empty UBI volume.
+  * @c: UBIFS file-system description object
+@@ -183,7 +194,7 @@ static int create_default_filesystem(str
+ 	if (c->mount_opts.override_compr)
+ 		sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
+ 	else
+-		sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO);
++		sup->default_compr = cpu_to_le16(get_default_compressor());
+ 
+ 	generate_random_uuid(sup->uuid);
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch b/trunk/target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch
new file mode 100644
index 00000000..85dd8f0c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/552-ubifs-respect-silent-mount-flag.patch
@@ -0,0 +1,122 @@
+From 90bea5a3f0bf680b87b90516f3c231997f4b8f3b Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Mon, 2 Jun 2014 15:51:10 +0200
+X-Git-Url: http://git.infradead.org/linux-ubifs.git/commitdiff_plain/90bea5a3f0bf680b87b90516f3c231997f4b8f3b
+X-Git-Url: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=90bea5a3f0bf680b87b90516f3c231997f4b8f3b
+Subject: UBIFS: respect MS_SILENT mount flag
+
+When attempting to mount a non-ubifs formatted volume, lots of error
+messages (including a stack dump) are thrown to the kernel log even if
+the MS_SILENT mount flag is set.
+Fix this by introducing adding an additional state-variable in
+struct ubifs_info and suppress error messages in ubifs_read_node if
+MS_SILENT is set.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ fs/ubifs/io.c    | 18 ++++++++++--------
+ fs/ubifs/super.c |  5 +++++
+ fs/ubifs/ubifs.h | 11 +++++++++++
+ 3 files changed, 26 insertions(+), 8 deletions(-)
+
+---
+
+--- a/fs/ubifs/io.c
++++ b/fs/ubifs/io.c
+@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_i
+ 		return err;
+ 
+ 	if (type != ch->node_type) {
+-		ubifs_err("bad node type (%d but expected %d)",
+-			  ch->node_type, type);
++		ubifs_errc(c, "bad node type (%d but expected %d)",
++			   ch->node_type, type);
+ 		goto out;
+ 	}
+ 
+ 	err = ubifs_check_node(c, buf, lnum, offs, 0, 0);
+ 	if (err) {
+-		ubifs_err("expected node type %d", type);
++		ubifs_errc(c, "expected node type %d", type);
+ 		return err;
+ 	}
+ 
+ 	l = le32_to_cpu(ch->len);
+ 	if (l != len) {
+-		ubifs_err("bad node length %d, expected %d", l, len);
++		ubifs_errc(c, "bad node length %d, expected %d", l, len);
+ 		goto out;
+ 	}
+ 
+ 	return 0;
+ 
+ out:
+-	ubifs_err("bad node at LEB %d:%d, LEB mapping status %d", lnum, offs,
+-		  ubi_is_mapped(c->ubi, lnum));
+-	ubifs_dump_node(c, buf);
+-	dump_stack();
++	ubifs_errc(c, "bad node at LEB %d:%d, LEB mapping status %d", lnum,
++		   offs, ubi_is_mapped(c->ubi, lnum));
++	if (!c->probing) {
++		ubifs_dump_node(c, buf);
++		dump_stack();
++	}
+ 	return -EINVAL;
+ }
+ 
+--- a/fs/ubifs/super.c
++++ b/fs/ubifs/super.c
+@@ -1164,6 +1164,9 @@ static int mount_ubifs(struct ubifs_info
+ 	size_t sz;
+ 
+ 	c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
++	/* Suppress error messages while probing if MS_SILENT is set */
++	c->probing = !!(c->vfs_sb->s_flags & MS_SILENT);
++
+ 	err = init_constants_early(c);
+ 	if (err)
+ 		return err;
+@@ -1229,6 +1232,8 @@ static int mount_ubifs(struct ubifs_info
+ 	if (err)
+ 		goto out_free;
+ 
++	c->probing = 0;
++
+ 	/*
+ 	 * Make sure the compressor which is set as default in the superblock
+ 	 * or overridden by mount options is actually compiled in.
+--- a/fs/ubifs/ubifs.h
++++ b/fs/ubifs/ubifs.h
+@@ -51,6 +51,15 @@
+ #define ubifs_warn(fmt, ...)                                        \
+ 	pr_warn("UBIFS warning (pid %d): %s: " fmt "\n",            \
+ 		current->pid, __func__, ##__VA_ARGS__)
++/*
++ * A variant of 'ubifs_err()' which takes the UBIFS file-sytem description
++ * object as an argument.
++ */
++#define ubifs_errc(c, fmt, ...)                                     \
++	do {                                                        \
++		if (!(c)->probing)                                  \
++			ubifs_err(fmt, ##__VA_ARGS__);              \
++	} while (0)
+ 
+ /* UBIFS file system VFS magic number */
+ #define UBIFS_SUPER_MAGIC 0x24051905
+@@ -1209,6 +1218,7 @@ struct ubifs_debug_info;
+  * @need_recovery: %1 if the file-system needs recovery
+  * @replaying: %1 during journal replay
+  * @mounting: %1 while mounting
++ * @probing: %1 while attempting to mount if MS_SILENT mount flag is set
+  * @remounting_rw: %1 while re-mounting from R/O mode to R/W mode
+  * @replay_list: temporary list used during journal replay
+  * @replay_buds: list of buds to replay
+@@ -1441,6 +1451,7 @@ struct ubifs_info {
+ 	unsigned int replaying:1;
+ 	unsigned int mounting:1;
+ 	unsigned int remounting_rw:1;
++	unsigned int probing:1;
+ 	struct list_head replay_list;
+ 	struct list_head replay_buds;
+ 	unsigned long long cs_sqnum;
diff --git a/trunk/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch b/trunk/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch
new file mode 100644
index 00000000..bcdc58fc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch
@@ -0,0 +1,2141 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1203,6 +1203,27 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on NETFILTER_XTABLES
++	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
++       depends on NETFILTER_ADVANCED
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++        bool 'Layer 7 debugging output'
++        depends on NETFILTER_XT_MATCH_LAYER7
++        help
++          Say Y to get lots of debugging output.
++
++
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -134,6 +134,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
+--- /dev/null
++++ b/net/netfilter/xt_layer7.c
+@@ -0,0 +1,666 @@
++/*
++  Kernel module to match application layer (OSI layer 7) data in connections.
++
++  http://l7-filter.sf.net
++
++  (C) 2003-2009 Matthew Strait and Ethan Sommer.
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU General Public License
++  as published by the Free Software Foundation; either version
++  2 of the License, or (at your option) any later version.
++  http://www.gnu.org/licenses/gpl.txt
++
++  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
++  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
++  Ethan Sommer, Justin Levandoski.
++*/
++
++#include <linux/spinlock.h>
++#include <linux/version.h>
++#include <net/ip.h>
++#include <net/tcp.h>
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_acct.h>
++#endif
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_layer7.h>
++#include <linux/ctype.h>
++#include <linux/proc_fs.h>
++
++#include "regexp/regexp.c"
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
++MODULE_DESCRIPTION("iptables application layer match module");
++MODULE_ALIAS("ipt_layer7");
++MODULE_VERSION("2.21");
++
++static int maxdatalen = 2048; // this is the default
++module_param(maxdatalen, int, 0444);
++MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
++#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
++	#define DPRINTK(format,args...) printk(format,##args)
++#else
++	#define DPRINTK(format,args...)
++#endif
++
++/* Number of packets whose data we look at.
++This can be modified through /proc/net/layer7_numpackets */
++static int num_packets = 10;
++
++static struct pattern_cache {
++	char * regex_string;
++	regexp * pattern;
++	struct pattern_cache * next;
++} * first_pattern_cache = NULL;
++
++DEFINE_SPINLOCK(l7_lock);
++
++static int total_acct_packets(struct nf_conn *ct)
++{
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
++	BUG_ON(ct == NULL);
++	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
++#else
++	struct nf_conn_counter *acct;
++
++	BUG_ON(ct == NULL);
++	acct = nf_conn_acct_find(ct);
++	if (!acct)
++		return 0;
++	return (atomic64_read(&acct[IP_CT_DIR_ORIGINAL].packets) + atomic64_read(&acct[IP_CT_DIR_REPLY].packets));
++#endif
++}
++
++#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++/* Converts an unfriendly string into a friendly one by
++replacing unprintables with periods and all whitespace with " ". */
++static char * friendly_print(unsigned char * s)
++{
++	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
++	int i;
++
++	if(!f) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"friendly_print, bailing.\n");
++		return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++){
++		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
++		else if(isspace(s[i]))		f[i] = ' ';
++		else 				f[i] = '.';
++	}
++	f[i] = '\0';
++	return f;
++}
++
++static char dec2hex(int i)
++{
++	switch (i) {
++		case 0 ... 9:
++			return (i + '0');
++			break;
++		case 10 ... 15:
++			return (i - 10 + 'a');
++			break;
++		default:
++			if (net_ratelimit())
++				printk("layer7: Problem in dec2hex\n");
++			return '\0';
++	}
++}
++
++static char * hex_print(unsigned char * s)
++{
++	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
++	int i;
++
++	if(!g) {
++	       if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in hex_print, "
++					"bailing.\n");
++	       return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++) {
++		g[i*3    ] = dec2hex(s[i]/16);
++		g[i*3 + 1] = dec2hex(s[i]%16);
++		g[i*3 + 2] = ' ';
++	}
++	g[i*3] = '\0';
++
++	return g;
++}
++#endif // DEBUG
++
++/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
++over again, it make sense to cache the results. */
++static regexp * compile_and_cache(const char * regex_string, 
++                                  const char * protocol)
++{
++	struct pattern_cache * node               = first_pattern_cache;
++	struct pattern_cache * last_pattern_cache = first_pattern_cache;
++	struct pattern_cache * tmp;
++	unsigned int len;
++
++	while (node != NULL) {
++		if (!strcmp(node->regex_string, regex_string))
++		return node->pattern;
++
++		last_pattern_cache = node;/* points at the last non-NULL node */
++		node = node->next;
++	}
++
++	/* If we reach the end of the list, then we have not yet cached
++	   the pattern for this regex. Let's do that now.
++	   Be paranoid about running out of memory to avoid list corruption. */
++	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
++
++	if(!tmp) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		return NULL;
++	}
++
++	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
++	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
++	tmp->next = NULL;
++
++	if(!tmp->regex_string || !tmp->pattern) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		kfree(tmp->regex_string);
++		kfree(tmp->pattern);
++		kfree(tmp);
++		return NULL;
++	}
++
++	/* Ok.  The new node is all ready now. */
++	node = tmp;
++
++	if(first_pattern_cache == NULL) /* list is empty */
++		first_pattern_cache = node; /* make node the beginning */
++	else
++		last_pattern_cache->next = node; /* attach node to the end */
++
++	/* copy the string and compile the regex */
++	len = strlen(regex_string);
++	DPRINTK("About to compile this: \"%s\"\n", regex_string);
++	node->pattern = regcomp((char *)regex_string, &len);
++	if ( !node->pattern ) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: Error compiling regexp "
++					"\"%s\" (%s)\n", 
++					regex_string, protocol);
++		/* pattern is now cached as NULL, so we won't try again. */
++	}
++
++	strcpy(node->regex_string, regex_string);
++	return node->pattern;
++}
++
++static int can_handle(const struct sk_buff *skb)
++{
++	if(!ip_hdr(skb)) /* not IP */
++		return 0;
++	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
++	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
++	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
++		return 0;
++	return 1;
++}
++
++/* Returns offset the into the skb->data that the application data starts */
++static int app_data_offset(const struct sk_buff *skb)
++{
++	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
++	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
++	int ip_hl = 4*ip_hdr(skb)->ihl;
++
++	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
++		/* 12 == offset into TCP header for the header length field.
++		Can't get this with skb->h.th->doff because the tcphdr
++		struct doesn't get set when routing (this is confirmed to be
++		true in Netfilter as well as QoS.) */
++		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
++
++		return ip_hl + tcp_hl;
++	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
++		return ip_hl + 8; /* UDP header is always 8 bytes */
++	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
++		return ip_hl + 8; /* ICMP header is 8 bytes */
++	} else {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: tried to handle unknown "
++					"protocol!\n");
++		return ip_hl + 8; /* something reasonable */
++	}
++}
++
++/* handles whether there's a match when we aren't appending data anymore */
++static int match_no_append(struct nf_conn * conntrack, 
++                           struct nf_conn * master_conntrack, 
++                           enum ip_conntrack_info ctinfo,
++                           enum ip_conntrack_info master_ctinfo,
++                           const struct xt_layer7_info * info)
++{
++	/* If we're in here, throw the app data away */
++	if(master_conntrack->layer7.app_data != NULL) {
++
++	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++		if(!master_conntrack->layer7.app_proto) {
++			char * f = 
++			  friendly_print(master_conntrack->layer7.app_data);
++			char * g = 
++			  hex_print(master_conntrack->layer7.app_data);
++			DPRINTK("\nl7-filter gave up after %d bytes "
++				"(%d packets):\n%s\n",
++				strlen(f), total_acct_packets(master_conntrack), f);
++			kfree(f);
++			DPRINTK("In hex: %s\n", g);
++			kfree(g);
++		}
++	#endif
++
++		kfree(master_conntrack->layer7.app_data);
++		master_conntrack->layer7.app_data = NULL; /* don't free again */
++	}
++
++	if(master_conntrack->layer7.app_proto){
++		/* Here child connections set their .app_proto (for /proc) */
++		if(!conntrack->layer7.app_proto) {
++			conntrack->layer7.app_proto = 
++			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
++			    GFP_ATOMIC);
++			if(!conntrack->layer7.app_proto){
++				if (net_ratelimit())
++					printk(KERN_ERR "layer7: out of memory "
++							"in match_no_append, "
++							"bailing.\n");
++				return 1;
++			}
++			strcpy(conntrack->layer7.app_proto, 
++				master_conntrack->layer7.app_proto);
++		}
++
++		return (!strcmp(master_conntrack->layer7.app_proto, 
++				info->protocol));
++	}
++	else {
++		/* If not classified, set to "unknown" to distinguish from
++		connections that are still being tested. */
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match_no_append, bailing.\n");
++			return 1;
++		}
++		strcpy(master_conntrack->layer7.app_proto, "unknown");
++		return 0;
++	}
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length = 0, i;
++	int oldlength = master_conntrack->layer7.app_data_len;
++
++	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
++	   clear on whether the race condition exists or whether this really 
++	   fixes it.  I might just be being dense... Anyway, if it's not really 
++	   a fix, all it does is waste a very small amount of time. */
++	if(!master_conntrack->layer7.app_data) return 0;
++
++	/* Strip nulls. Make everything lower case (our regex lib doesn't
++	do case insensitivity).  Add it to the end of the current data. */
++	for(i = 0; i < maxdatalen-oldlength-1 &&
++		   i < appdatalen; i++) {
++		if(app_data[i] != '\0') {
++			/* the kernel version of tolower mungs 'upper ascii' */
++			master_conntrack->layer7.app_data[length+oldlength] =
++				isascii(app_data[i])? 
++					tolower(app_data[i]) : app_data[i];
++			length++;
++		}
++	}
++
++	master_conntrack->layer7.app_data[length+oldlength] = '\0';
++	master_conntrack->layer7.app_data_len = length + oldlength;
++
++	return length;
++}
++
++/* taken from drivers/video/modedb.c */
++static int my_atoi(const char *s)
++{
++	int val = 0;
++
++	for (;; s++) {
++		switch (*s) {
++			case '0'...'9':
++			val = 10*val+(*s-'0');
++			break;
++		default:
++			return val;
++		}
++	}
++}
++
++/* write out num_packets to userland. */
++static int layer7_read_proc(char* page, char ** start, off_t off, int count,
++                            int* eof, void * data)
++{
++	if(num_packets > 99 && net_ratelimit())
++		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
++
++	page[0] = num_packets/10 + '0';
++	page[1] = num_packets%10 + '0';
++	page[2] = '\n';
++	page[3] = '\0';
++
++	*eof=1;
++
++	return 3;
++}
++
++/* Read in num_packets from userland */
++static int layer7_write_proc(struct file* file, const char* buffer,
++                             unsigned long count, void *data)
++{
++	char * foo = kmalloc(count, GFP_ATOMIC);
++
++	if(!foo){
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory, bailing. "
++					"num_packets unchanged.\n");
++		return count;
++	}
++
++	if(copy_from_user(foo, buffer, count)) {
++		return -EFAULT;
++	}
++
++
++	num_packets = my_atoi(foo);
++	kfree (foo);
++
++	/* This has an arbitrary limit to make the math easier. I'm lazy.
++	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
++	if(num_packets > 99) {
++		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
++		num_packets = 99;
++	} else if(num_packets < 1) {
++		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
++		num_packets = 1;
++	}
++
++	return count;
++}
++
++static bool
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++match(const struct sk_buff *skbin, const struct xt_match_param *par)
++#else
++match(const struct sk_buff *skbin,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      bool *hotdrop)
++#endif
++{
++	/* sidestep const without getting a compiler warning... */
++	struct sk_buff * skb = (struct sk_buff *)skbin; 
++
++	const struct xt_layer7_info * info = 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++		par->matchinfo;
++	#else
++		matchinfo;
++	#endif
++
++	enum ip_conntrack_info master_ctinfo, ctinfo;
++	struct nf_conn *master_conntrack, *conntrack;
++	unsigned char * app_data;
++	unsigned int pattern_result, appdatalen;
++	regexp * comppattern;
++
++	/* Be paranoid/incompetent - lock the entire match function. */
++	spin_lock_bh(&l7_lock);
++
++	if(!can_handle(skb)){
++		DPRINTK("layer7: This is some protocol I can't handle.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Treat parent & all its children together as one connection, except
++	for the purpose of setting conntrack->layer7.app_proto in the actual
++	connection. This makes /proc/net/ip_conntrack more satisfying. */
++	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
++	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
++		DPRINTK("layer7: couldn't get conntrack.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
++	while (master_ct(master_conntrack) != NULL)
++		master_conntrack = master_ct(master_conntrack);
++
++	/* if we've classified it or seen too many packets */
++	if(total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto) {
++
++		pattern_result = match_no_append(conntrack, master_conntrack, 
++						 ctinfo, master_ctinfo, info);
++
++		/* skb->cb[0] == seen. Don't do things twice if there are 
++		multiple l7 rules. I'm not sure that using cb for this purpose 
++		is correct, even though it says "put your private variables 
++		there". But it doesn't look like it is being used for anything
++		else in the skbs that make it here. */
++		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
++
++		spin_unlock_bh(&l7_lock);
++		return (pattern_result ^ info->invert);
++	}
++
++	if(skb_is_nonlinear(skb)){
++		if(skb_linearize(skb) != 0){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: failed to linearize "
++						"packet, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* now that the skb is linearized, it's safe to set these. */
++	app_data = skb->data + app_data_offset(skb);
++	appdatalen = skb_tail_pointer(skb) - app_data;
++
++	/* the return value gets checked later, when we're ready to use it */
++	comppattern = compile_and_cache(info->pattern, info->protocol);
++
++	/* On the first packet of a connection, allocate space for app data */
++	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
++	   !master_conntrack->layer7.app_data){
++		master_conntrack->layer7.app_data = 
++			kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++
++		master_conntrack->layer7.app_data[0] = '\0';
++	}
++
++	/* Can be here, but unallocated, if numpackets is increased near
++	the beginning of a connection */
++	if(master_conntrack->layer7.app_data == NULL){
++		spin_unlock_bh(&l7_lock);
++		return info->invert; /* unmatched */
++	}
++
++	if(!skb->cb[0]){
++		int newbytes;
++		newbytes = add_data(master_conntrack, app_data, appdatalen);
++
++		if(newbytes == 0) { /* didn't add any data */
++			skb->cb[0] = 1;
++			/* Didn't match before, not going to match now */
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* If looking for "unknown", then never match.  "Unknown" means that
++	we've given up; we're still trying with these packets. */
++	if(!strcmp(info->protocol, "unknown")) {
++		pattern_result = 0;
++	/* If looking for "unset", then always match. "Unset" means that we
++	haven't yet classified the connection. */
++	} else if(!strcmp(info->protocol, "unset")) {
++		pattern_result = 2;
++		DPRINTK("layer7: matched unset: not yet classified "
++			"(%d/%d packets)\n",
++                        total_acct_packets(master_conntrack), num_packets);
++	/* If the regexp failed to compile, don't bother running it */
++	} else if(comppattern && 
++		  regexec(comppattern, master_conntrack->layer7.app_data)){
++		DPRINTK("layer7: matched %s\n", info->protocol);
++		pattern_result = 1;
++	} else pattern_result = 0;
++
++	if(pattern_result == 1) {
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return (pattern_result ^ info->invert);
++		}
++		strcpy(master_conntrack->layer7.app_proto, info->protocol);
++	} else if(pattern_result > 1) { /* cleanup from "unset" */
++		pattern_result = 1;
++	}
++
++	/* mark the packet seen */
++	skb->cb[0] = 1;
++
++	spin_unlock_bh(&l7_lock);
++	return (pattern_result ^ info->invert);
++}
++
++// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++static bool check(const struct xt_mtchk_param *par)
++{
++        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", par->match->family);
++#else
++static bool check(const char *tablename, const void *inf,
++		 const struct xt_match *match, void *matchinfo,
++		 unsigned int hook_mask)
++{
++        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", match->family);
++#endif
++                return 0;
++        }
++	return 1;
++}
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++	static void destroy(const struct xt_mtdtor_param *par)
++	{
++		nf_ct_l3proto_module_put(par->match->family);
++	}
++#else
++	static void destroy(const struct xt_match *match, void *matchinfo)
++	{
++		nf_ct_l3proto_module_put(match->family);
++	}
++#endif
++
++static struct xt_match xt_layer7_match[] __read_mostly = {
++{
++	.name		= "layer7",
++	.family		= AF_INET,
++	.checkentry	= check,
++	.match		= match,
++	.destroy	= destroy,
++	.matchsize	= sizeof(struct xt_layer7_info),
++	.me		= THIS_MODULE
++}
++};
++
++static void layer7_cleanup_proc(void)
++{
++	remove_proc_entry("layer7_numpackets", init_net.proc_net);
++}
++
++/* register the proc file */
++static void layer7_init_proc(void)
++{
++	struct proc_dir_entry* entry;
++	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
++	entry->read_proc = layer7_read_proc;
++	entry->write_proc = layer7_write_proc;
++}
++
++static int __init xt_layer7_init(void)
++{
++	need_conntrack();
++
++	layer7_init_proc();
++	if(maxdatalen < 1) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
++			"using 1\n");
++		maxdatalen = 1;
++	}
++	/* This is not a hard limit.  It's just here to prevent people from
++	bringing their slow machines to a grinding halt. */
++	else if(maxdatalen > 65536) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
++			"using 65536\n");
++		maxdatalen = 65536;
++	}
++	return xt_register_matches(xt_layer7_match,
++				   ARRAY_SIZE(xt_layer7_match));
++}
++
++static void __exit xt_layer7_fini(void)
++{
++	layer7_cleanup_proc();
++	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
++}
++
++module_init(xt_layer7_init);
++module_exit(xt_layer7_fini);
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.c
+@@ -0,0 +1,1197 @@
++/*
++ * regcomp and regexec -- regsub and regerror are elsewhere
++ * @(#)regexp.c	1.3 of 18 April 87
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ * Beware that some of this code is subtly aware of the way operator
++ * precedence is structured in regular expressions.  Serious changes in
++ * regular-expression syntax might require a total rethink.
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ * Modified slightly by Matthew Strait to use more modern C.
++ */
++
++#include "regexp.h"
++#include "regmagic.h"
++
++/* added by ethan and matt.  Lets it work in both kernel and user space.
++(So iptables can use it, for instance.)  Yea, it goes both ways... */
++#if __KERNEL__
++  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
++#else
++  #define printk(format,args...) printf(format,##args)
++#endif
++
++void regerror(char * s)
++{
++        printk("<3>Regexp: %s\n", s);
++        /* NOTREACHED */
++}
++
++/*
++ * The "internal use only" fields in regexp.h are present to pass info from
++ * compile to execute that permits the execute phase to run lots faster on
++ * simple cases.  They are:
++ *
++ * regstart	char that must begin a match; '\0' if none obvious
++ * reganch	is the match anchored (at beginning-of-line only)?
++ * regmust	string (pointer into program) that match must include, or NULL
++ * regmlen	length of regmust string
++ *
++ * Regstart and reganch permit very fast decisions on suitable starting points
++ * for a match, cutting down the work a lot.  Regmust permits fast rejection
++ * of lines that cannot possibly match.  The regmust tests are costly enough
++ * that regcomp() supplies a regmust only if the r.e. contains something
++ * potentially expensive (at present, the only such thing detected is * or +
++ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
++ * supplied because the test in regexec() needs it and regcomp() is computing
++ * it anyway.
++ */
++
++/*
++ * Structure for regexp "program".  This is essentially a linear encoding
++ * of a nondeterministic finite-state machine (aka syntax charts or
++ * "railroad normal form" in parsing technology).  Each node is an opcode
++ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
++ * all nodes except BRANCH implement concatenation; a "next" pointer with
++ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
++ * have one of the subtle syntax dependencies:  an individual BRANCH (as
++ * opposed to a collection of them) is never concatenated with anything
++ * because of operator precedence.)  The operand of some types of node is
++ * a literal string; for others, it is a node leading into a sub-FSM.  In
++ * particular, the operand of a BRANCH node is the first node of the branch.
++ * (NB this is *not* a tree structure:  the tail of the branch connects
++ * to the thing following the set of BRANCHes.)  The opcodes are:
++ */
++
++/* definition	number	opnd?	meaning */
++#define	END	0	/* no	End of program. */
++#define	BOL	1	/* no	Match "" at beginning of line. */
++#define	EOL	2	/* no	Match "" at end of line. */
++#define	ANY	3	/* no	Match any one character. */
++#define	ANYOF	4	/* str	Match any character in this string. */
++#define	ANYBUT	5	/* str	Match any character not in this string. */
++#define	BRANCH	6	/* node	Match this alternative, or the next... */
++#define	BACK	7	/* no	Match "", "next" ptr points backward. */
++#define	EXACTLY	8	/* str	Match this string. */
++#define	NOTHING	9	/* no	Match empty string. */
++#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
++#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
++#define	OPEN	20	/* no	Mark this point in input as start of #n. */
++			/*	OPEN+1 is number 1, etc. */
++#define	CLOSE	30	/* no	Analogous to OPEN. */
++
++/*
++ * Opcode notes:
++ *
++ * BRANCH	The set of branches constituting a single choice are hooked
++ *		together with their "next" pointers, since precedence prevents
++ *		anything being concatenated to any individual branch.  The
++ *		"next" pointer of the last BRANCH in a choice points to the
++ *		thing following the whole choice.  This is also where the
++ *		final "next" pointer of each individual branch points; each
++ *		branch starts with the operand node of a BRANCH node.
++ *
++ * BACK		Normal "next" pointers all implicitly point forward; BACK
++ *		exists to make loop structures possible.
++ *
++ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
++ *		BRANCH structures using BACK.  Simple cases (one character
++ *		per match) are implemented with STAR and PLUS for speed
++ *		and to minimize recursive plunges.
++ *
++ * OPEN,CLOSE	...are numbered at compile time.
++ */
++
++/*
++ * A node is one char of opcode followed by two chars of "next" pointer.
++ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
++ * value is a positive offset from the opcode of the node containing it.
++ * An operand, if any, simply follows the node.  (Note that much of the
++ * code generation knows about this implicit relationship.)
++ *
++ * Using two bytes for the "next" pointer is vast overkill for most things,
++ * but allows patterns to get big without disasters.
++ */
++#define	OP(p)	(*(p))
++#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
++#define	OPERAND(p)	((p) + 3)
++
++/*
++ * See regmagic.h for one further detail of program structure.
++ */
++
++
++/*
++ * Utility definitions.
++ */
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#define	FAIL(m)	{ regerror(m); return(NULL); }
++#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
++#define	META	"^$.[()|?+*\\"
++
++/*
++ * Flags to be passed up and down.
++ */
++#define	HASWIDTH	01	/* Known never to match null string. */
++#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
++#define	SPSTART		04	/* Starts with * or +. */
++#define	WORST		0	/* Worst case. */
++
++/*
++ * Global work variables for regcomp().
++ */
++struct match_globals {
++char *reginput;		/* String-input pointer. */
++char *regbol;		/* Beginning of input, for ^ check. */
++char **regstartp;	/* Pointer to startp array. */
++char **regendp;		/* Ditto for endp. */
++char *regparse;		/* Input-scan pointer. */
++int regnpar;		/* () count. */
++char regdummy;
++char *regcode;		/* Code-emit pointer; &regdummy = don't. */
++long regsize;		/* Code size. */
++};
++
++/*
++ * Forward declarations for regcomp()'s friends.
++ */
++#ifndef STATIC
++#define	STATIC	static
++#endif
++STATIC char *reg(struct match_globals *g, int paren,int *flagp);
++STATIC char *regbranch(struct match_globals *g, int *flagp);
++STATIC char *regpiece(struct match_globals *g, int *flagp);
++STATIC char *regatom(struct match_globals *g, int *flagp);
++STATIC char *regnode(struct match_globals *g, char op);
++STATIC char *regnext(struct match_globals *g, char *p);
++STATIC void regc(struct match_globals *g, char b);
++STATIC void reginsert(struct match_globals *g, char op, char *opnd);
++STATIC void regtail(struct match_globals *g, char *p, char *val);
++STATIC void regoptail(struct match_globals *g, char *p, char *val);
++
++
++__kernel_size_t my_strcspn(const char *s1,const char *s2)
++{
++        char *scan1;
++        char *scan2;
++        int count;
++
++        count = 0;
++        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
++                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
++                        if (*scan1 == *scan2++)
++                                return(count);
++                count++;
++        }
++        return(count);
++}
++
++/*
++ - regcomp - compile a regular expression into internal code
++ *
++ * We can't allocate space until we know how big the compiled form will be,
++ * but we can't compile it (and thus know how big it is) until we've got a
++ * place to put the code.  So we cheat:  we compile it twice, once with code
++ * generation turned off and size counting turned on, and once "for real".
++ * This also means that we don't allocate space until we are sure that the
++ * thing really will compile successfully, and we never have to move the
++ * code and thus invalidate pointers into it.  (Note that it has to be in
++ * one piece because free() must be able to free it all.)
++ *
++ * Beware that the optimization-preparation code in here knows about some
++ * of the structure of the compiled regexp.
++ */
++regexp *
++regcomp(char *exp,int *patternsize)
++{
++	register regexp *r;
++	register char *scan;
++	register char *longest;
++	register int len;
++	int flags;
++	struct match_globals g;
++	
++	/* commented out by ethan
++	   extern char *malloc();
++	*/
++
++	if (exp == NULL)
++		FAIL("NULL argument");
++
++	/* First pass: determine size, legality. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regsize = 0L;
++	g.regcode = &g.regdummy;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Small enough for pointer-storage convention? */
++	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
++		FAIL("regexp too big");
++
++	/* Allocate space. */
++	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
++	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
++	if (r == NULL)
++		FAIL("out of space");
++
++	/* Second pass: emit code. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regcode = r->program;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Dig out information for optimizations. */
++	r->regstart = '\0';	/* Worst-case defaults. */
++	r->reganch = 0;
++	r->regmust = NULL;
++	r->regmlen = 0;
++	scan = r->program+1;			/* First BRANCH. */
++	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
++		scan = OPERAND(scan);
++
++		/* Starting-point info. */
++		if (OP(scan) == EXACTLY)
++			r->regstart = *OPERAND(scan);
++		else if (OP(scan) == BOL)
++			r->reganch++;
++
++		/*
++		 * If there's something expensive in the r.e., find the
++		 * longest literal string that must appear and make it the
++		 * regmust.  Resolve ties in favor of later strings, since
++		 * the regstart check works with the beginning of the r.e.
++		 * and avoiding duplication strengthens checking.  Not a
++		 * strong reason, but sufficient in the absence of others.
++		 */
++		if (flags&SPSTART) {
++			longest = NULL;
++			len = 0;
++			for (; scan != NULL; scan = regnext(&g, scan))
++				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
++					longest = OPERAND(scan);
++					len = strlen(OPERAND(scan));
++				}
++			r->regmust = longest;
++			r->regmlen = len;
++		}
++	}
++
++	return(r);
++}
++
++/*
++ - reg - regular expression, i.e. main body or parenthesized thing
++ *
++ * Caller must absorb opening parenthesis.
++ *
++ * Combining parenthesis handling with the base level of regular expression
++ * is a trifle forced, but the need to tie the tails of the branches to what
++ * follows makes it hard to avoid.
++ */
++static char *
++reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
++{
++	register char *ret;
++	register char *br;
++	register char *ender;
++	register int parno = 0; /* 0 makes gcc happy */
++	int flags;
++
++	*flagp = HASWIDTH;	/* Tentatively. */
++
++	/* Make an OPEN node, if parenthesized. */
++	if (paren) {
++		if (g->regnpar >= NSUBEXP)
++			FAIL("too many ()");
++		parno = g->regnpar;
++		g->regnpar++;
++		ret = regnode(g, OPEN+parno);
++	} else
++		ret = NULL;
++
++	/* Pick up the branches, linking them together. */
++	br = regbranch(g, &flags);
++	if (br == NULL)
++		return(NULL);
++	if (ret != NULL)
++		regtail(g, ret, br);	/* OPEN -> first. */
++	else
++		ret = br;
++	if (!(flags&HASWIDTH))
++		*flagp &= ~HASWIDTH;
++	*flagp |= flags&SPSTART;
++	while (*g->regparse == '|') {
++		g->regparse++;
++		br = regbranch(g, &flags);
++		if (br == NULL)
++			return(NULL);
++		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
++		if (!(flags&HASWIDTH))
++			*flagp &= ~HASWIDTH;
++		*flagp |= flags&SPSTART;
++	}
++
++	/* Make a closing node, and hook it on the end. */
++	ender = regnode(g, (paren) ? CLOSE+parno : END);	
++	regtail(g, ret, ender);
++
++	/* Hook the tails of the branches to the closing node. */
++	for (br = ret; br != NULL; br = regnext(g, br))
++		regoptail(g, br, ender);
++
++	/* Check for proper termination. */
++	if (paren && *g->regparse++ != ')') {
++		FAIL("unmatched ()");
++	} else if (!paren && *g->regparse != '\0') {
++		if (*g->regparse == ')') {
++			FAIL("unmatched ()");
++		} else
++			FAIL("junk on end");	/* "Can't happen". */
++		/* NOTREACHED */
++	}
++
++	return(ret);
++}
++
++/*
++ - regbranch - one alternative of an | operator
++ *
++ * Implements the concatenation operator.
++ */
++static char *
++regbranch(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char *chain;
++	register char *latest;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	ret = regnode(g, BRANCH);
++	chain = NULL;
++	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
++		latest = regpiece(g, &flags);
++		if (latest == NULL)
++			return(NULL);
++		*flagp |= flags&HASWIDTH;
++		if (chain == NULL)	/* First piece. */
++			*flagp |= flags&SPSTART;
++		else
++			regtail(g, chain, latest);
++		chain = latest;
++	}
++	if (chain == NULL)	/* Loop ran zero times. */
++		(void) regnode(g, NOTHING);
++
++	return(ret);
++}
++
++/*
++ - regpiece - something followed by possible [*+?]
++ *
++ * Note that the branching code sequences used for ? and the general cases
++ * of * and + are somewhat optimized:  they use the same NOTHING node as
++ * both the endmarker for their branch list and the body of the last branch.
++ * It might seem that this node could be dispensed with entirely, but the
++ * endmarker role is not redundant.
++ */
++static char *
++regpiece(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char op;
++	register char *next;
++	int flags;
++
++	ret = regatom(g, &flags);
++	if (ret == NULL)
++		return(NULL);
++
++	op = *g->regparse;
++	if (!ISMULT(op)) {
++		*flagp = flags;
++		return(ret);
++	}
++
++	if (!(flags&HASWIDTH) && op != '?')
++		FAIL("*+ operand could be empty");
++	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
++
++	if (op == '*' && (flags&SIMPLE))
++		reginsert(g, STAR, ret);
++	else if (op == '*') {
++		/* Emit x* as (x&|), where & means "self". */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regoptail(g, ret, regnode(g, BACK));		/* and loop */
++		regoptail(g, ret, ret);			/* back */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '+' && (flags&SIMPLE))
++		reginsert(g, PLUS, ret);
++	else if (op == '+') {
++		/* Emit x+ as x(&|), where & means "self". */
++		next = regnode(g, BRANCH);			/* Either */
++		regtail(g, ret, next);
++		regtail(g, regnode(g, BACK), ret);		/* loop back */
++		regtail(g, next, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '?') {
++		/* Emit x? as (x|) */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		next = regnode(g, NOTHING);		/* null. */
++		regtail(g, ret, next);
++		regoptail(g, ret, next);
++	}
++	g->regparse++;
++	if (ISMULT(*g->regparse))
++		FAIL("nested *?+");
++
++	return(ret);
++}
++
++/*
++ - regatom - the lowest level
++ *
++ * Optimization:  gobbles an entire sequence of ordinary characters so that
++ * it can turn them into a single node, which is smaller to store and
++ * faster to run.  Backslashed characters are exceptions, each becoming a
++ * separate node; the code is simpler that way and it's not worth fixing.
++ */
++static char *
++regatom(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	switch (*g->regparse++) {
++	case '^':
++		ret = regnode(g, BOL);
++		break;
++	case '$':
++		ret = regnode(g, EOL);
++		break;
++	case '.':
++		ret = regnode(g, ANY);
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	case '[': {
++			register int class;
++			register int classend;
++
++			if (*g->regparse == '^') {	/* Complement of range. */
++				ret = regnode(g, ANYBUT);
++				g->regparse++;
++			} else
++				ret = regnode(g, ANYOF);
++			if (*g->regparse == ']' || *g->regparse == '-')
++				regc(g, *g->regparse++);
++			while (*g->regparse != '\0' && *g->regparse != ']') {
++				if (*g->regparse == '-') {
++					g->regparse++;
++					if (*g->regparse == ']' || *g->regparse == '\0')
++						regc(g, '-');
++					else {
++						class = UCHARAT(g->regparse-2)+1;
++						classend = UCHARAT(g->regparse);
++						if (class > classend+1)
++							FAIL("invalid [] range");
++						for (; class <= classend; class++)
++							regc(g, class);
++						g->regparse++;
++					}
++				} else
++					regc(g, *g->regparse++);
++			}
++			regc(g, '\0');
++			if (*g->regparse != ']')
++				FAIL("unmatched []");
++			g->regparse++;
++			*flagp |= HASWIDTH|SIMPLE;
++		}
++		break;
++	case '(':
++		ret = reg(g, 1, &flags);
++		if (ret == NULL)
++			return(NULL);
++		*flagp |= flags&(HASWIDTH|SPSTART);
++		break;
++	case '\0':
++	case '|':
++	case ')':
++		FAIL("internal urp");	/* Supposed to be caught earlier. */
++		break;
++	case '?':
++	case '+':
++	case '*':
++		FAIL("?+* follows nothing");
++		break;
++	case '\\':
++		if (*g->regparse == '\0')
++			FAIL("trailing \\");
++		ret = regnode(g, EXACTLY);
++		regc(g, *g->regparse++);
++		regc(g, '\0');
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	default: {
++			register int len;
++			register char ender;
++
++			g->regparse--;
++			len = my_strcspn((const char *)g->regparse, (const char *)META);
++			if (len <= 0)
++				FAIL("internal disaster");
++			ender = *(g->regparse+len);
++			if (len > 1 && ISMULT(ender))
++				len--;		/* Back off clear of ?+* operand. */
++			*flagp |= HASWIDTH;
++			if (len == 1)
++				*flagp |= SIMPLE;
++			ret = regnode(g, EXACTLY);
++			while (len > 0) {
++				regc(g, *g->regparse++);
++				len--;
++			}
++			regc(g, '\0');
++		}
++		break;
++	}
++
++	return(ret);
++}
++
++/*
++ - regnode - emit a node
++ */
++static char *			/* Location. */
++regnode(struct match_globals *g, char op)
++{
++	register char *ret;
++	register char *ptr;
++
++	ret = g->regcode;
++	if (ret == &g->regdummy) {
++		g->regsize += 3;
++		return(ret);
++	}
++
++	ptr = ret;
++	*ptr++ = op;
++	*ptr++ = '\0';		/* Null "next" pointer. */
++	*ptr++ = '\0';
++	g->regcode = ptr;
++
++	return(ret);
++}
++
++/*
++ - regc - emit (if appropriate) a byte of code
++ */
++static void
++regc(struct match_globals *g, char b)
++{
++	if (g->regcode != &g->regdummy)
++		*g->regcode++ = b;
++	else
++		g->regsize++;
++}
++
++/*
++ - reginsert - insert an operator in front of already-emitted operand
++ *
++ * Means relocating the operand.
++ */
++static void
++reginsert(struct match_globals *g, char op, char* opnd)
++{
++	register char *src;
++	register char *dst;
++	register char *place;
++
++	if (g->regcode == &g->regdummy) {
++		g->regsize += 3;
++		return;
++	}
++
++	src = g->regcode;
++	g->regcode += 3;
++	dst = g->regcode;
++	while (src > opnd)
++		*--dst = *--src;
++
++	place = opnd;		/* Op node, where operand used to be. */
++	*place++ = op;
++	*place++ = '\0';
++	*place++ = '\0';
++}
++
++/*
++ - regtail - set the next-pointer at the end of a node chain
++ */
++static void
++regtail(struct match_globals *g, char *p, char *val)
++{
++	register char *scan;
++	register char *temp;
++	register int offset;
++
++	if (p == &g->regdummy)
++		return;
++
++	/* Find last node. */
++	scan = p;
++	for (;;) {
++		temp = regnext(g, scan);
++		if (temp == NULL)
++			break;
++		scan = temp;
++	}
++
++	if (OP(scan) == BACK)
++		offset = scan - val;
++	else
++		offset = val - scan;
++	*(scan+1) = (offset>>8)&0377;
++	*(scan+2) = offset&0377;
++}
++
++/*
++ - regoptail - regtail on operand of first argument; nop if operandless
++ */
++static void
++regoptail(struct match_globals *g, char *p, char *val)
++{
++	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
++	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
++		return;
++	regtail(g, OPERAND(p), val);
++}
++
++/*
++ * regexec and friends
++ */
++
++
++/*
++ * Forwards.
++ */
++STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
++STATIC int regmatch(struct match_globals *g, char *prog);
++STATIC int regrepeat(struct match_globals *g, char *p);
++
++#ifdef DEBUG
++int regnarrate = 0;
++void regdump();
++STATIC char *regprop(char *op);
++#endif
++
++/*
++ - regexec - match a regexp against a string
++ */
++int
++regexec(regexp *prog, char *string)
++{
++	register char *s;
++	struct match_globals g;
++
++	/* Be paranoid... */
++	if (prog == NULL || string == NULL) {
++		printk("<3>Regexp: NULL parameter\n");
++		return(0);
++	}
++
++	/* Check validity of program. */
++	if (UCHARAT(prog->program) != MAGIC) {
++		printk("<3>Regexp: corrupted program\n");
++		return(0);
++	}
++
++	/* If there is a "must appear" string, look for it. */
++	if (prog->regmust != NULL) {
++		s = string;
++		while ((s = strchr(s, prog->regmust[0])) != NULL) {
++			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
++				break;	/* Found it. */
++			s++;
++		}
++		if (s == NULL)	/* Not present. */
++			return(0);
++	}
++
++	/* Mark beginning of line for ^ . */
++	g.regbol = string;
++
++	/* Simplest case:  anchored match need be tried only once. */
++	if (prog->reganch)
++		return(regtry(&g, prog, string));
++
++	/* Messy cases:  unanchored match. */
++	s = string;
++	if (prog->regstart != '\0')
++		/* We know what char it must start with. */
++		while ((s = strchr(s, prog->regstart)) != NULL) {
++			if (regtry(&g, prog, s))
++				return(1);
++			s++;
++		}
++	else
++		/* We don't -- general case. */
++		do {
++			if (regtry(&g, prog, s))
++				return(1);
++		} while (*s++ != '\0');
++
++	/* Failure. */
++	return(0);
++}
++
++/*
++ - regtry - try match at specific point
++ */
++static int			/* 0 failure, 1 success */
++regtry(struct match_globals *g, regexp *prog, char *string)
++{
++	register int i;
++	register char **sp;
++	register char **ep;
++
++	g->reginput = string;
++	g->regstartp = prog->startp;
++	g->regendp = prog->endp;
++
++	sp = prog->startp;
++	ep = prog->endp;
++	for (i = NSUBEXP; i > 0; i--) {
++		*sp++ = NULL;
++		*ep++ = NULL;
++	}
++	if (regmatch(g, prog->program + 1)) {
++		prog->startp[0] = string;
++		prog->endp[0] = g->reginput;
++		return(1);
++	} else
++		return(0);
++}
++
++/*
++ - regmatch - main matching routine
++ *
++ * Conceptually the strategy is simple:  check to see whether the current
++ * node matches, call self recursively to see whether the rest matches,
++ * and then act accordingly.  In practice we make some effort to avoid
++ * recursion, in particular by going through "ordinary" nodes (that don't
++ * need to know whether the rest of the match failed) by a loop instead of
++ * by recursion.
++ */
++static int			/* 0 failure, 1 success */
++regmatch(struct match_globals *g, char *prog)
++{
++	register char *scan = prog; /* Current node. */
++	char *next;		    /* Next node. */
++
++#ifdef DEBUG
++	if (scan != NULL && regnarrate)
++		fprintf(stderr, "%s(\n", regprop(scan));
++#endif
++	while (scan != NULL) {
++#ifdef DEBUG
++		if (regnarrate)
++			fprintf(stderr, "%s...\n", regprop(scan));
++#endif
++		next = regnext(g, scan);
++
++		switch (OP(scan)) {
++		case BOL:
++			if (g->reginput != g->regbol)
++				return(0);
++			break;
++		case EOL:
++			if (*g->reginput != '\0')
++				return(0);
++			break;
++		case ANY:
++			if (*g->reginput == '\0')
++				return(0);
++			g->reginput++;
++			break;
++		case EXACTLY: {
++				register int len;
++				register char *opnd;
++
++				opnd = OPERAND(scan);
++				/* Inline the first character, for speed. */
++				if (*opnd != *g->reginput)
++					return(0);
++				len = strlen(opnd);
++				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
++					return(0);
++				g->reginput += len;
++			}
++			break;
++		case ANYOF:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case ANYBUT:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case NOTHING:
++		case BACK:
++			break;
++		case OPEN+1:
++		case OPEN+2:
++		case OPEN+3:
++		case OPEN+4:
++		case OPEN+5:
++		case OPEN+6:
++		case OPEN+7:
++		case OPEN+8:
++		case OPEN+9: {
++				register int no;
++				register char *save;
++
++				no = OP(scan) - OPEN;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set startp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regstartp[no] == NULL)
++						g->regstartp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case CLOSE+1:
++		case CLOSE+2:
++		case CLOSE+3:
++		case CLOSE+4:
++		case CLOSE+5:
++		case CLOSE+6:
++		case CLOSE+7:
++		case CLOSE+8:
++		case CLOSE+9:
++			{
++				register int no;
++				register char *save;
++
++				no = OP(scan) - CLOSE;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set endp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regendp[no] == NULL)
++						g->regendp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case BRANCH: {
++				register char *save;
++
++				if (OP(next) != BRANCH)		/* No choice. */
++					next = OPERAND(scan);	/* Avoid recursion. */
++				else {
++					do {
++						save = g->reginput;
++						if (regmatch(g, OPERAND(scan)))
++							return(1);
++						g->reginput = save;
++						scan = regnext(g, scan);
++					} while (scan != NULL && OP(scan) == BRANCH);
++					return(0);
++					/* NOTREACHED */
++				}
++			}
++			break;
++		case STAR:
++		case PLUS: {
++				register char nextch;
++				register int no;
++				register char *save;
++				register int min;
++
++				/*
++				 * Lookahead to avoid useless match attempts
++				 * when we know what character comes next.
++				 */
++				nextch = '\0';
++				if (OP(next) == EXACTLY)
++					nextch = *OPERAND(next);
++				min = (OP(scan) == STAR) ? 0 : 1;
++				save = g->reginput;
++				no = regrepeat(g, OPERAND(scan));
++				while (no >= min) {
++					/* If it could work, try it. */
++					if (nextch == '\0' || *g->reginput == nextch)
++						if (regmatch(g, next))
++							return(1);
++					/* Couldn't or didn't -- back up. */
++					no--;
++					g->reginput = save + no;
++				}
++				return(0);
++			}
++			break;
++		case END:
++			return(1);	/* Success! */
++			break;
++		default:
++			printk("<3>Regexp: memory corruption\n");
++			return(0);
++			break;
++		}
++
++		scan = next;
++	}
++
++	/*
++	 * We get here only if there's trouble -- normally "case END" is
++	 * the terminating point.
++	 */
++	printk("<3>Regexp: corrupted pointers\n");
++	return(0);
++}
++
++/*
++ - regrepeat - repeatedly match something simple, report how many
++ */
++static int
++regrepeat(struct match_globals *g, char *p)
++{
++	register int count = 0;
++	register char *scan;
++	register char *opnd;
++
++	scan = g->reginput;
++	opnd = OPERAND(p);
++	switch (OP(p)) {
++	case ANY:
++		count = strlen(scan);
++		scan += count;
++		break;
++	case EXACTLY:
++		while (*opnd == *scan) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYOF:
++		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYBUT:
++		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	default:		/* Oh dear.  Called inappropriately. */
++		printk("<3>Regexp: internal foulup\n");
++		count = 0;	/* Best compromise. */
++		break;
++	}
++	g->reginput = scan;
++
++	return(count);
++}
++
++/*
++ - regnext - dig the "next" pointer out of a node
++ */
++static char*
++regnext(struct match_globals *g, char *p)
++{
++	register int offset;
++
++	if (p == &g->regdummy)
++		return(NULL);
++
++	offset = NEXT(p);
++	if (offset == 0)
++		return(NULL);
++
++	if (OP(p) == BACK)
++		return(p-offset);
++	else
++		return(p+offset);
++}
++
++#ifdef DEBUG
++
++STATIC char *regprop();
++
++/*
++ - regdump - dump a regexp onto stdout in vaguely comprehensible form
++ */
++void
++regdump(regexp *r)
++{
++	register char *s;
++	register char op = EXACTLY;	/* Arbitrary non-END op. */
++	register char *next;
++	/* extern char *strchr(); */
++
++
++	s = r->program + 1;
++	while (op != END) {	/* While that wasn't END last time... */
++		op = OP(s);
++		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
++		next = regnext(s);
++		if (next == NULL)		/* Next ptr. */
++			printf("(0)");
++		else
++			printf("(%d)", (s-r->program)+(next-s));
++		s += 3;
++		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
++			/* Literal string, where present. */
++			while (*s != '\0') {
++				putchar(*s);
++				s++;
++			}
++			s++;
++		}
++		putchar('\n');
++	}
++
++	/* Header fields of interest. */
++	if (r->regstart != '\0')
++		printf("start `%c' ", r->regstart);
++	if (r->reganch)
++		printf("anchored ");
++	if (r->regmust != NULL)
++		printf("must have \"%s\"", r->regmust);
++	printf("\n");
++}
++
++/*
++ - regprop - printable representation of opcode
++ */
++static char *
++regprop(char *op)
++{
++#define BUFLEN 50
++	register char *p;
++	static char buf[BUFLEN];
++
++	strcpy(buf, ":");
++
++	switch (OP(op)) {
++	case BOL:
++		p = "BOL";
++		break;
++	case EOL:
++		p = "EOL";
++		break;
++	case ANY:
++		p = "ANY";
++		break;
++	case ANYOF:
++		p = "ANYOF";
++		break;
++	case ANYBUT:
++		p = "ANYBUT";
++		break;
++	case BRANCH:
++		p = "BRANCH";
++		break;
++	case EXACTLY:
++		p = "EXACTLY";
++		break;
++	case NOTHING:
++		p = "NOTHING";
++		break;
++	case BACK:
++		p = "BACK";
++		break;
++	case END:
++		p = "END";
++		break;
++	case OPEN+1:
++	case OPEN+2:
++	case OPEN+3:
++	case OPEN+4:
++	case OPEN+5:
++	case OPEN+6:
++	case OPEN+7:
++	case OPEN+8:
++	case OPEN+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
++		p = NULL;
++		break;
++	case CLOSE+1:
++	case CLOSE+2:
++	case CLOSE+3:
++	case CLOSE+4:
++	case CLOSE+5:
++	case CLOSE+6:
++	case CLOSE+7:
++	case CLOSE+8:
++	case CLOSE+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
++		p = NULL;
++		break;
++	case STAR:
++		p = "STAR";
++		break;
++	case PLUS:
++		p = "PLUS";
++		break;
++	default:
++		printk("<3>Regexp: corrupted opcode\n");
++		break;
++	}
++	if (p != NULL)
++		strncat(buf, p, BUFLEN-strlen(buf));
++	return(buf);
++}
++#endif
++
++
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.h
+@@ -0,0 +1,41 @@
++/*
++ * Definitions etc. for regexp(3) routines.
++ *
++ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
++ * not the System V one.
++ */
++
++#ifndef REGEXP_H
++#define REGEXP_H
++
++
++/*
++http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
++which contains a version of this library, says:
++
++ *
++ * NSUBEXP must be at least 10, and no greater than 117 or the parser
++ * will not work properly.
++ *
++
++However, it looks rather like this library is limited to 10.  If you think
++otherwise, let us know.
++*/
++
++#define NSUBEXP  10
++typedef struct regexp {
++	char *startp[NSUBEXP];
++	char *endp[NSUBEXP];
++	char regstart;		/* Internal use only. */
++	char reganch;		/* Internal use only. */
++	char *regmust;		/* Internal use only. */
++	int regmlen;		/* Internal use only. */
++	char program[1];	/* Unwarranted chumminess with compiler. */
++} regexp;
++
++regexp * regcomp(char *exp, int *patternsize);
++int regexec(regexp *prog, char *string);
++void regsub(regexp *prog, char *source, char *dest);
++void regerror(char *s);
++
++#endif
+--- /dev/null
++++ b/net/netfilter/regexp/regmagic.h
+@@ -0,0 +1,5 @@
++/*
++ * The first byte of the regexp internal "program" is actually this magic
++ * number; the start node begins in the second byte.
++ */
++#define	MAGIC	0234
+--- /dev/null
++++ b/net/netfilter/regexp/regsub.c
+@@ -0,0 +1,95 @@
++/*
++ * regsub
++ * @(#)regsub.c	1.3 of 2 April 86
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ */
++#include "regexp.h"
++#include "regmagic.h"
++#include <linux/string.h>
++
++
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#if 0
++//void regerror(char * s)
++//{
++//        printk("regexp(3): %s", s);
++//        /* NOTREACHED */
++//}
++#endif
++
++/*
++ - regsub - perform substitutions after a regexp match
++ */
++void
++regsub(regexp * prog, char * source, char * dest)
++{
++	register char *src;
++	register char *dst;
++	register char c;
++	register int no;
++	register int len;
++	
++	/* Not necessary and gcc doesn't like it -MLS */
++	/*extern char *strncpy();*/
++
++	if (prog == NULL || source == NULL || dest == NULL) {
++		regerror("NULL parm to regsub");
++		return;
++	}
++	if (UCHARAT(prog->program) != MAGIC) {
++		regerror("damaged regexp fed to regsub");
++		return;
++	}
++
++	src = source;
++	dst = dest;
++	while ((c = *src++) != '\0') {
++		if (c == '&')
++			no = 0;
++		else if (c == '\\' && '0' <= *src && *src <= '9')
++			no = *src++ - '0';
++		else
++			no = -1;
++
++		if (no < 0) {	/* Ordinary character. */
++			if (c == '\\' && (*src == '\\' || *src == '&'))
++				c = *src++;
++			*dst++ = c;
++		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
++			len = prog->endp[no] - prog->startp[no];
++			(void) strncpy(dst, prog->startp[no], len);
++			dst += len;
++			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
++				regerror("damaged match string");
++				return;
++			}
++		}
++	}
++	*dst++ = '\0';
++}
+--- a/net/netfilter/nf_conntrack_core.c
++++ b/net/netfilter/nf_conntrack_core.c
+@@ -224,6 +224,13 @@ destroy_conntrack(struct nf_conntrack *n
+ 	 * too. */
+ 	nf_ct_remove_expectations(ct);
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto)
++		kfree(ct->layer7.app_proto);
++	if(ct->layer7.app_data)
++		kfree(ct->layer7.app_data);
++#endif
++
+ 	/* We overload first tuple to link into unconfirmed or dying list.*/
+ 	BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
+ 	hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -240,6 +240,12 @@ static int ct_seq_show(struct seq_file *
+ 	if (ct_show_delta_time(s, ct))
+ 		goto release;
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto &&
++           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
++		return -ENOSPC;
++#endif
++
+ 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
+ 		goto release;
+ 
+--- a/include/net/netfilter/nf_conntrack.h
++++ b/include/net/netfilter/nf_conntrack.h
+@@ -105,6 +105,22 @@ struct nf_conn {
+ 	struct net *ct_net;
+ #endif
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
++    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	struct {
++		/*
++		 * e.g. "http". NULL before decision. "unknown" after decision
++		 * if no match.
++		 */
++		char *app_proto;
++		/*
++		 * application layer data so far. NULL after match decision.
++		 */
++		char *app_data;
++		unsigned int app_data_len;
++	} layer7;
++#endif
++
+ 	/* Storage reserved for other modules, must be the last member */
+ 	union nf_conntrack_proto proto;
+ };
+--- /dev/null
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -0,0 +1,13 @@
++#ifndef _XT_LAYER7_H
++#define _XT_LAYER7_H
++
++#define MAX_PATTERN_LEN 8192
++#define MAX_PROTOCOL_LEN 256
++
++struct xt_layer7_info {
++    char protocol[MAX_PROTOCOL_LEN];
++    char pattern[MAX_PATTERN_LEN];
++    u_int8_t invert;
++};
++
++#endif /* _XT_LAYER7_H */
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -53,6 +53,7 @@ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
++header-y += xt_layer7.h
+ header-y += xt_length.h
+ header-y += xt_limit.h
+ header-y += xt_mac.h
diff --git a/trunk/target/linux/generic/patches-3.10/601-netfilter_layer7_pktmatch.patch b/trunk/target/linux/generic/patches-3.10/601-netfilter_layer7_pktmatch.patch
new file mode 100644
index 00000000..f65e301f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/601-netfilter_layer7_pktmatch.patch
@@ -0,0 +1,108 @@
+--- a/include/linux/netfilter/xt_layer7.h
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
+     char protocol[MAX_PROTOCOL_LEN];
+     char pattern[MAX_PATTERN_LEN];
+     u_int8_t invert;
++    u_int8_t pkt;
+ };
+ 
+ #endif /* _XT_LAYER7_H */
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
+ }
+ 
+ /* add the new app data to the conntrack.  Return number of bytes added. */
+-static int add_data(struct nf_conn * master_conntrack,
+-                    char * app_data, int appdatalen)
++static int add_datastr(char *target, int offset, char *app_data, int len)
+ {
+ 	int length = 0, i;
+-	int oldlength = master_conntrack->layer7.app_data_len;
+-
+-	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
+-	   clear on whether the race condition exists or whether this really 
+-	   fixes it.  I might just be being dense... Anyway, if it's not really 
+-	   a fix, all it does is waste a very small amount of time. */
+-	if(!master_conntrack->layer7.app_data) return 0;
++	if (!target) return 0;
+ 
+ 	/* Strip nulls. Make everything lower case (our regex lib doesn't
+ 	do case insensitivity).  Add it to the end of the current data. */
+-	for(i = 0; i < maxdatalen-oldlength-1 &&
+-		   i < appdatalen; i++) {
++ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
+ 		if(app_data[i] != '\0') {
+ 			/* the kernel version of tolower mungs 'upper ascii' */
+-			master_conntrack->layer7.app_data[length+oldlength] =
++			target[length+offset] =
+ 				isascii(app_data[i])? 
+ 					tolower(app_data[i]) : app_data[i];
+ 			length++;
+ 		}
+ 	}
++	target[length+offset] = '\0';
++
++	return length;
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length;
+ 
+-	master_conntrack->layer7.app_data[length+oldlength] = '\0';
+-	master_conntrack->layer7.app_data_len = length + oldlength;
++	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
++	master_conntrack->layer7.app_data_len += length;
+ 
+ 	return length;
+ }
+@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
+ 
+ 	enum ip_conntrack_info master_ctinfo, ctinfo;
+ 	struct nf_conn *master_conntrack, *conntrack;
+-	unsigned char * app_data;
++	unsigned char *app_data, *tmp_data;
+ 	unsigned int pattern_result, appdatalen;
+ 	regexp * comppattern;
+ 
+@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
+ 		master_conntrack = master_ct(master_conntrack);
+ 
+ 	/* if we've classified it or seen too many packets */
+-	if(total_acct_packets(master_conntrack) > num_packets ||
+-	   master_conntrack->layer7.app_proto) {
++	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto)) {
+ 
+ 		pattern_result = match_no_append(conntrack, master_conntrack, 
+ 						 ctinfo, master_ctinfo, info);
+@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
+ 	/* the return value gets checked later, when we're ready to use it */
+ 	comppattern = compile_and_cache(info->pattern, info->protocol);
+ 
++	if (info->pkt) {
++		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!tmp_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
++			return info->invert;
++		}
++
++		tmp_data[0] = '\0';
++		add_datastr(tmp_data, 0, app_data, appdatalen);
++		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
++
++		kfree(tmp_data);
++		tmp_data = NULL;
++		spin_unlock_bh(&l7_lock);
++
++		return (pattern_result ^ info->invert);
++	}
++
+ 	/* On the first packet of a connection, allocate space for app data */
+ 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
+ 	   !master_conntrack->layer7.app_data){
diff --git a/trunk/target/linux/generic/patches-3.10/602-netfilter_layer7_match.patch b/trunk/target/linux/generic/patches-3.10/602-netfilter_layer7_match.patch
new file mode 100644
index 00000000..b2e48c82
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/602-netfilter_layer7_match.patch
@@ -0,0 +1,51 @@
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
+ 
+ static bool
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
+ #else
+ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
+ 
+ // load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
+ {
+         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ 		 const struct xt_match *match, void *matchinfo,
+ 		 unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++		return -EINVAL;
++	}
++	return 0;
++#else
+                 return 0;
+         }
+ 	return 1;
++#endif
+ }
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/603-netfilter_layer7_2.6.36_fix.patch b/trunk/target/linux/generic/patches-3.10/603-netfilter_layer7_2.6.36_fix.patch
new file mode 100644
index 00000000..5ed9f5a6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/603-netfilter_layer7_2.6.36_fix.patch
@@ -0,0 +1,61 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1009,6 +1009,27 @@ config NETFILTER_XT_MATCH_IPVS
+ 
+ 	  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on EXPERIMENTAL
++	depends on NETFILTER_XTABLES
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
++
+ config NETFILTER_XT_MATCH_LENGTH
+ 	tristate '"length" match support'
+ 	depends on NETFILTER_ADVANCED
+@@ -1203,26 +1224,11 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
+-config NETFILTER_XT_MATCH_LAYER7
+-	tristate '"layer7" match support'
+-	depends on NETFILTER_XTABLES
+-	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
+-       depends on NETFILTER_ADVANCED
+-	help
+-	  Say Y if you want to be able to classify connections (and their
+-	  packets) based on regular expression matching of their application
+-	  layer data.   This is one way to classify applications such as
+-	  peer-to-peer filesharing systems that do not always use the same
+-	  port.
+-
+-	  To compile it as a module, choose M here.  If unsure, say N.
+-
+ config NETFILTER_XT_MATCH_LAYER7_DEBUG
+-        bool 'Layer 7 debugging output'
+-        depends on NETFILTER_XT_MATCH_LAYER7
+-        help
+-          Say Y to get lots of debugging output.
+-
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
+ 
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
diff --git a/trunk/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch b/trunk/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch
new file mode 100644
index 00000000..d2fcf690
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,86 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -17,6 +17,7 @@
+ #include <linux/percpu.h>
+ #include <linux/netdevice.h>
+ #include <linux/security.h>
++#include <linux/inet.h>
+ #include <net/net_namespace.h>
+ #ifdef CONFIG_SYSCTL
+ #include <linux/sysctl.h>
+@@ -268,10 +269,66 @@ static int ct_open(struct inode *inode, 
+ 			sizeof(struct ct_iter_state));
+ }
+ 
++struct kill_request {
++	u16 family;
++	union nf_inet_addr addr;
++};
++
++static int kill_matching(struct nf_conn *i, void *data)
++{
++	struct kill_request *kr = data;
++	struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
++	struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
++
++	if (!kr->family)
++		return 1;
++
++	if (t1->src.l3num != kr->family)
++		return 0;
++
++	return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++			     size_t count, loff_t *ppos)
++{
++	struct seq_file *seq = file->private_data;
++	struct net *net = seq_file_net(seq);
++	struct kill_request kr = { };
++	char req[INET6_ADDRSTRLEN] = { };
++
++	if (count == 0)
++		return 0;
++
++	if (count >= INET6_ADDRSTRLEN)
++		count = INET6_ADDRSTRLEN - 1;
++
++	if (copy_from_user(req, buf, count))
++		return -EFAULT;
++
++	if (strnchr(req, count, ':')) {
++		kr.family = AF_INET6;
++		if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	} else if (strnchr(req, count, '.')) {
++		kr.family = AF_INET;
++		if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	}
++
++	nf_ct_iterate_cleanup(net, kill_matching, &kr);
++
++	return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ 	.owner   = THIS_MODULE,
+ 	.open    = ct_open,
+ 	.read    = seq_read,
++	.write	 = ct_file_write,
+ 	.llseek  = seq_lseek,
+ 	.release = seq_release_net,
+ };
+@@ -373,7 +430,7 @@ static int nf_conntrack_standalone_init_
+ {
+ 	struct proc_dir_entry *pde;
+ 
+-	pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops);
++	pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops);
+ 	if (!pde)
+ 		goto out_nf_conntrack;
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch b/trunk/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
new file mode 100644
index 00000000..140889d8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
@@ -0,0 +1,93 @@
+--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
++++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
+@@ -87,6 +87,7 @@ struct ipt_ip {
+ #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
+ #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
+ #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
++#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
+ 
+ /* Values for "inv" field in struct ipt_ip. */
+ #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -82,6 +82,9 @@ ip_packet_match(const struct iphdr *ip,
+ 
+ #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
+ 
++	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
++		return true;
++
+ 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+ 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+@@ -135,6 +138,29 @@ ip_packet_match(const struct iphdr *ip,
+ 	return true;
+ }
+ 
++static void
++ip_checkdefault(struct ipt_ip *ip)
++{
++	static const char iface_mask[IFNAMSIZ] = {};
++
++	if (ip->invflags || ip->flags & IPT_F_FRAG)
++		return;
++
++	if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (ip->smsk.s_addr || ip->dmsk.s_addr)
++		return;
++
++	if (ip->proto)
++		return;
++
++	ip->flags |= IPT_F_NO_DEF_MATCH;
++}
++
+ static bool
+ ip_checkentry(const struct ipt_ip *ip)
+ {
+@@ -560,7 +586,7 @@ static void cleanup_match(struct xt_entr
+ }
+ 
+ static int
+-check_entry(const struct ipt_entry *e, const char *name)
++check_entry(struct ipt_entry *e, const char *name)
+ {
+ 	const struct xt_entry_target *t;
+ 
+@@ -569,6 +595,8 @@ check_entry(const struct ipt_entry *e, c
+ 		return -EINVAL;
+ 	}
+ 
++	ip_checkdefault(&e->ip);
++
+ 	if (e->target_offset + sizeof(struct xt_entry_target) >
+ 	    e->next_offset)
+ 		return -EINVAL;
+@@ -930,6 +958,7 @@ copy_entries_to_user(unsigned int total_
+ 	const struct xt_table_info *private = table->private;
+ 	int ret = 0;
+ 	const void *loc_cpu_entry;
++	u8 flags;
+ 
+ 	counters = alloc_counters(table);
+ 	if (IS_ERR(counters))
+@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
+ 			goto free_counters;
+ 		}
+ 
++		flags = e->ip.flags & IPT_F_MASK;
++		if (copy_to_user(userptr + off
++				 + offsetof(struct ipt_entry, ip.flags),
++				 &flags, sizeof(flags)) != 0) {
++			ret = -EFAULT;
++			goto free_counters;
++		}
++
+ 		for (i = sizeof(struct ipt_entry);
+ 		     i < e->target_offset;
+ 		     i += m->u.match_size) {
diff --git a/trunk/target/linux/generic/patches-3.10/611-netfilter_match_bypass_default_table.patch b/trunk/target/linux/generic/patches-3.10/611-netfilter_match_bypass_default_table.patch
new file mode 100644
index 00000000..2e032434
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/611-netfilter_match_bypass_default_table.patch
@@ -0,0 +1,83 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -310,6 +310,33 @@ struct ipt_entry *ipt_next_entry(const s
+ 	return (void *)entry + entry->next_offset;
+ }
+ 
++static bool
++ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
++{
++	struct xt_entry_target *t;
++	struct xt_standard_target *st;
++
++	if (e->target_offset != sizeof(struct ipt_entry))
++		return false;
++
++	if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
++		return false;
++
++	t = ipt_get_target(e);
++	if (t->u.kernel.target->target)
++		return false;
++
++	st = (struct xt_standard_target *) t;
++	if (st->verdict == XT_RETURN)
++		return false;
++
++	if (st->verdict >= 0)
++		return false;
++
++	*verdict = (unsigned)(-st->verdict) - 1;
++	return true;
++}
++
+ /* Returns one of the generic firewall policies, like NF_ACCEPT. */
+ unsigned int
+ ipt_do_table(struct sk_buff *skb,
+@@ -331,9 +358,27 @@ ipt_do_table(struct sk_buff *skb,
+ 	unsigned int addend;
+ 
+ 	/* Initialization */
++	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++	local_bh_disable();
++	private = table->private;
++	cpu        = smp_processor_id();
++	table_base = private->entries[cpu];
++	e = get_entry(table_base, private->hook_entry[hook]);
++	if (ipt_handle_default_rule(e, &verdict)) {
++		ADD_COUNTER(e->counters, skb->len, 1);
++		local_bh_enable();
++		return verdict;
++	}
++
+ 	ip = ip_hdr(skb);
+ 	indev = in ? in->name : nulldevname;
+ 	outdev = out ? out->name : nulldevname;
++
++	addend = xt_write_recseq_begin();
++	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
++	stackptr   = per_cpu_ptr(private->stackptr, cpu);
++	origptr    = *stackptr;
++
+ 	/* We handle fragments by dealing with the first fragment as
+ 	 * if it was a normal packet.  All other fragments are treated
+ 	 * normally, except that they will NEVER match rules that ask
+@@ -348,18 +393,6 @@ ipt_do_table(struct sk_buff *skb,
+ 	acpar.family  = NFPROTO_IPV4;
+ 	acpar.hooknum = hook;
+ 
+-	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+-	local_bh_disable();
+-	addend = xt_write_recseq_begin();
+-	private = table->private;
+-	cpu        = smp_processor_id();
+-	table_base = private->entries[cpu];
+-	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
+-	stackptr   = per_cpu_ptr(private->stackptr, cpu);
+-	origptr    = *stackptr;
+-
+-	e = get_entry(table_base, private->hook_entry[hook]);
+-
+ 	pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n",
+ 		 table->name, hook, origptr,
+ 		 get_entry(table_base, private->underflow[hook]));
diff --git a/trunk/target/linux/generic/patches-3.10/612-netfilter_match_reduce_memory_access.patch b/trunk/target/linux/generic/patches-3.10/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 00000000..72172d8b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/612-netfilter_match_reduce_memory_access.patch
@@ -0,0 +1,16 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -85,9 +85,11 @@ ip_packet_match(const struct iphdr *ip,
+ 	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
+ 		return true;
+ 
+-	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
++	if (FWINV(ipinfo->smsk.s_addr &&
++		  (ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+-	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
++	    FWINV(ipinfo->dmsk.s_addr &&
++		  (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+ 		  IPT_INV_DSTIP)) {
+ 		dprintf("Source or dest mismatch.\n");
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/613-netfilter_optional_tcp_window_check.patch b/trunk/target/linux/generic/patches-3.10/613-netfilter_optional_tcp_window_check.patch
new file mode 100644
index 00000000..c6193da5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/613-netfilter_optional_tcp_window_check.patch
@@ -0,0 +1,36 @@
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -31,6 +31,9 @@
+ #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
+ #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
+ 
++/* Do not check the TCP window for incoming packets  */
++static int nf_ct_tcp_no_window_check __read_mostly = 1;
++
+ /* "Be conservative in what you do,
+     be liberal in what you accept from others."
+     If it's non-zero, we mark only out of window RST segments as INVALID. */
+@@ -528,6 +531,9 @@ static bool tcp_in_window(const struct n
+ 	s16 receiver_offset;
+ 	bool res;
+ 
++	if (nf_ct_tcp_no_window_check)
++		return true;
++
+ 	/*
+ 	 * Get the required data from the packet.
+ 	 */
+@@ -1446,6 +1452,13 @@ static struct ctl_table tcp_sysctl_table
+ 		.mode		= 0644,
+ 		.proc_handler	= proc_dointvec,
+ 	},
++	{
++		.procname       = "nf_conntrack_tcp_no_window_check",
++		.data           = &nf_ct_tcp_no_window_check,
++		.maxlen         = sizeof(unsigned int),
++		.mode           = 0644,
++		.proc_handler   = proc_dointvec,
++	},
+ 	{ }
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/614-netfilter_arpt_arp_padding_fix.patch b/trunk/target/linux/generic/patches-3.10/614-netfilter_arpt_arp_padding_fix.patch
new file mode 100644
index 00000000..70a8d04f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/614-netfilter_arpt_arp_padding_fix.patch
@@ -0,0 +1,16 @@
+--- a/include/uapi/linux/netfilter_arp/arp_tables.h
++++ b/include/uapi/linux/netfilter_arp/arp_tables.h
+@@ -68,6 +68,13 @@ struct arpt_arp {
+ 	__u8 flags;
+ 	/* Inverse flags */
+ 	__u16 invflags;
++
++	/* For some reason Linaro GCC 4.6-2013.05 omits the two
++	 * byte padding here when building for MIPS 34kc, leading to
++	 * userspace abi mismatches.
++	 * Add a dummy field to align this struct to 4 bytes
++	 */
++	__u16 padding;
+ };
+ 
+ /* Values for "flag" field in struct arpt_ip (general arp structure).
diff --git a/trunk/target/linux/generic/patches-3.10/615-netfilter_add_xt_id_match.patch b/trunk/target/linux/generic/patches-3.10/615-netfilter_add_xt_id_match.patch
new file mode 100644
index 00000000..b44dcd16
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/615-netfilter_add_xt_id_match.patch
@@ -0,0 +1,95 @@
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -51,6 +51,7 @@ header-y += xt_ecn.h
+ header-y += xt_esp.h
+ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
++header-y += xt_id.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+ header-y += xt_layer7.h
+--- /dev/null
++++ b/include/uapi/linux/netfilter/xt_id.h
+@@ -0,0 +1,8 @@
++#ifndef _XT_ID_H
++#define _XT_ID_H
++
++struct xt_id_info {
++	u32 id;
++};
++
++#endif /* XT_ID_H */
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -989,6 +989,13 @@ config NETFILTER_XT_MATCH_HL
+ 	in the IPv6 header, or the time-to-live field in the IPv4
+ 	header of the packet.
+ 
++config NETFILTER_XT_MATCH_ID
++	tristate '"id" match support'
++	depends on NETFILTER_ADVANCED
++	---help---
++	This option adds a `id' dummy-match, which allows you to put
++	numeric IDs into your iptables ruleset.
++
+ config NETFILTER_XT_MATCH_IPRANGE
+ 	tristate '"iprange" address range match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -115,6 +115,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += 
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_ID) += xt_id.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o
+--- /dev/null
++++ b/net/netfilter/xt_id.c
+@@ -0,0 +1,45 @@
++/*
++ * Implements a dummy match to allow attaching IDs to rules
++ *
++ * 2014-08-01 Jo-Philipp Wich <jow@openwrt.org>
++ */
++
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_id.h>
++
++MODULE_AUTHOR("Jo-Philipp Wich <jow@openwrt.org>");
++MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_id");
++MODULE_ALIAS("ip6t_id");
++
++static bool
++id_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++	/* We always match */
++	return true;
++}
++
++static struct xt_match id_mt_reg __read_mostly = {
++	.name      = "id",
++	.revision  = 0,
++	.family    = NFPROTO_UNSPEC,
++	.match     = id_mt,
++	.matchsize = sizeof(struct xt_id_info),
++	.me        = THIS_MODULE,
++};
++
++static int __init id_mt_init(void)
++{
++	return xt_register_match(&id_mt_reg);
++}
++
++static void __exit id_mt_exit(void)
++{
++	xt_unregister_match(&id_mt_reg);
++}
++
++module_init(id_mt_init);
++module_exit(id_mt_exit);
diff --git a/trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch b/trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch
new file mode 100644
index 00000000..1caf1ef5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch
@@ -0,0 +1,12 @@
+--- a/net/netfilter/nf_nat_core.c
++++ b/net/netfilter/nf_nat_core.c
+@@ -89,6 +89,9 @@ int nf_xfrm_me_harder(struct sk_buff *sk
+ 	struct dst_entry *dst;
+ 	int err;
+ 
++	if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++		return 0;
++
+ 	err = xfrm_decode_session(skb, &fl, family);
+ 	if (err < 0)
+ 		return err;
diff --git a/trunk/target/linux/generic/patches-3.10/617-netfilter_skip_filter_sysctl.patch b/trunk/target/linux/generic/patches-3.10/617-netfilter_skip_filter_sysctl.patch
new file mode 100644
index 00000000..be0dd3df
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/617-netfilter_skip_filter_sysctl.patch
@@ -0,0 +1,87 @@
+--- a/include/net/netns/conntrack.h
++++ b/include/net/netns/conntrack.h
+@@ -80,6 +80,7 @@ struct netns_ct {
+ 	int			sysctl_acct;
+ 	int			sysctl_tstamp;
+ 	int			sysctl_checksum;
++	int			skip_filter;
+ 	unsigned int		sysctl_log_invalid; /* Log invalid packets */
+ 	int			sysctl_auto_assign_helper;
+ 	bool			auto_assign_helper_warned;
+--- a/net/ipv4/netfilter/iptable_filter.c
++++ b/net/ipv4/netfilter/iptable_filter.c
+@@ -15,6 +15,7 @@
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ #include <linux/slab.h>
+ #include <net/ip.h>
++#include <net/netfilter/nf_conntrack.h>
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+@@ -37,6 +38,7 @@ iptable_filter_hook(unsigned int hook, s
+ 		    const struct net_device *in, const struct net_device *out,
+ 		    int (*okfn)(struct sk_buff *))
+ {
++	enum ip_conntrack_info ctinfo;
+ 	const struct net *net;
+ 
+ 	if (hook == NF_INET_LOCAL_OUT &&
+@@ -46,6 +48,11 @@ iptable_filter_hook(unsigned int hook, s
+ 		return NF_ACCEPT;
+ 
+ 	net = dev_net((in != NULL) ? in : out);
++	nf_ct_get(skb, &ctinfo);
++	if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) &&
++	    net->ct.skip_filter)
++	    return NF_ACCEPT;
++
+ 	return ipt_do_table(skb, hook, in, out, net->ipv4.iptable_filter);
+ }
+ 
+--- a/net/ipv6/netfilter/ip6table_filter.c
++++ b/net/ipv6/netfilter/ip6table_filter.c
+@@ -13,6 +13,7 @@
+ #include <linux/moduleparam.h>
+ #include <linux/netfilter_ipv6/ip6_tables.h>
+ #include <linux/slab.h>
++#include <net/netfilter/nf_conntrack.h>
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+@@ -37,6 +38,12 @@ ip6table_filter_hook(unsigned int hook, 
+ 		     int (*okfn)(struct sk_buff *))
+ {
+ 	const struct net *net = dev_net((in != NULL) ? in : out);
++	enum ip_conntrack_info ctinfo;
++
++	nf_ct_get(skb, &ctinfo);
++	if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) &&
++	    net->ct.skip_filter)
++	    return NF_ACCEPT;
+ 
+ 	return ip6t_do_table(skb, hook, in, out, net->ipv6.ip6table_filter);
+ }
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -510,6 +510,13 @@ static ctl_table nf_ct_sysctl_table[] = 
+ 		.extra2		= &log_invalid_proto_max,
+ 	},
+ 	{
++		.procname	= "nf_conntrack_skip_filter",
++		.data		= &init_net.ct.skip_filter,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec,
++	},
++	{
+ 		.procname	= "nf_conntrack_expect_max",
+ 		.data		= &nf_ct_expect_max,
+ 		.maxlen		= sizeof(int),
+@@ -545,6 +552,7 @@ static int nf_conntrack_standalone_init_
+ 	table[2].data = &net->ct.htable_size;
+ 	table[3].data = &net->ct.sysctl_checksum;
+ 	table[4].data = &net->ct.sysctl_log_invalid;
++	table[5].data = &net->ct.skip_filter;
+ 
+ 	/* Don't export sysctls to unprivileged users */
+ 	if (net->user_ns != &init_user_ns)
diff --git a/trunk/target/linux/generic/patches-3.10/620-sched_esfq.patch b/trunk/target/linux/generic/patches-3.10/620-sched_esfq.patch
new file mode 100644
index 00000000..41969865
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/620-sched_esfq.patch
@@ -0,0 +1,791 @@
+--- a/include/uapi/linux/pkt_sched.h
++++ b/include/uapi/linux/pkt_sched.h
+@@ -222,6 +222,33 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++	TCA_SFQ_HASH_CLASSIC,
++	TCA_SFQ_HASH_DST,
++	TCA_SFQ_HASH_SRC,
++	TCA_SFQ_HASH_FWMARK,
++	/* conntrack */
++	TCA_SFQ_HASH_CTORIGDST,
++	TCA_SFQ_HASH_CTORIGSRC,
++	TCA_SFQ_HASH_CTREPLDST,
++	TCA_SFQ_HASH_CTREPLSRC,
++	TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++	unsigned	quantum;	/* Bytes per round allocated to flow */
++	int		perturb_period;	/* Period of hash perturbation */
++	__u32		limit;		/* Maximal packets in queue */
++	unsigned	divisor;	/* Hash divisor  */
++	unsigned	flows;		/* Maximal number of flows  */
++	unsigned	hash_kind;	/* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -148,6 +148,37 @@ config NET_SCH_SFQ
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called sch_sfq.
+ 
++config NET_SCH_ESFQ
++	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
++	---help---
++	  Say Y here if you want to use the Enhanced Stochastic Fairness
++	  Queueing (ESFQ) packet scheduling algorithm for some of your network
++	  devices or as a leaf discipline for a classful qdisc such as HTB or
++	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
++	  references to the SFQ algorithm).
++
++	  This is an enchanced SFQ version which allows you to control some
++	  hardcoded values in the SFQ scheduler.
++
++	  ESFQ also adds control of the hash function used to identify packet
++	  flows. The original SFQ discipline hashes by connection; ESFQ add
++	  several other hashing methods, such as by src IP or by dst IP, which
++	  can be more fair to users in some networking situations.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called sch_esfq.
++
++config NET_SCH_ESFQ_NFCT
++	bool "Connection Tracking Hash Types"
++	depends on NET_SCH_ESFQ && NF_CONNTRACK
++	---help---
++	  Say Y here to enable support for hashing based on netfilter connection
++	  tracking information. This is useful for a router that is also using
++	  NAT to connect privately-addressed hosts to the Internet. If you want
++	  to provide fair distribution of upstream bandwidth, ESFQ must use
++	  connection tracking information, since all outgoing packets will share
++	  the same source address.
++
+ config NET_SCH_TEQL
+ 	tristate "True Link Equalizer (TEQL)"
+ 	---help---
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ing
+ obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
+ obj-$(CONFIG_NET_SCH_SFB)	+= sch_sfb.o
+ obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
++obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
+ obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
+ obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
+ obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
+--- /dev/null
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,702 @@
++/*
++ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:	Alexander Atanasov, <alex@ssi.bg>
++ *		Added dynamic depth,limit,divisor,hash_kind options.
++ *		Added dst and src hashes.
++ *
++ * 		Alexander Clouter, <alex@digriz.org.uk>
++ *		Ported ESFQ to Linux 2.6.
++ *
++ * 		Corey Hickey, <bugfood-c@fatooh.org>
++ *		Maintenance of the Linux 2.6 port.
++ *		Added fwmark hash (thanks to Robert Kurjata).
++ *		Added usage of jhash.
++ *		Added conntrack support.
++ *		Added ctnatchg hash (thanks to Ben Pfountz).
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <linux/bitops.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/socket.h>
++#include <linux/sockios.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/if_ether.h>
++#include <linux/inet.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/notifier.h>
++#include <linux/init.h>
++#include <net/ip.h>
++#include <net/netlink.h>
++#include <linux/ipv6.h>
++#include <net/route.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/pkt_sched.h>
++#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++#include <net/netfilter/nf_conntrack.h>
++#endif
++
++/*	Stochastic Fairness Queuing algorithm.
++	For more comments look at sch_sfq.c.
++	The difference is that you can change limit, depth,
++	hash table size and choose alternate hash types.
++
++	classic:	same as in sch_sfq.c
++	dst:		destination IP address
++	src:		source IP address
++	fwmark:		netfilter mark value
++	ctorigdst:	original destination IP address
++	ctorigsrc:	original source IP address
++	ctrepldst:	reply destination IP address
++	ctreplsrc:	reply source IP
++
++*/
++
++#define ESFQ_HEAD 0
++#define ESFQ_TAIL 1
++
++/* This type should contain at least SFQ_DEPTH*2 values */
++typedef unsigned int esfq_index;
++
++struct esfq_head
++{
++	esfq_index	next;
++	esfq_index	prev;
++};
++
++struct esfq_sched_data
++{
++/* Parameters */
++	int		perturb_period;
++	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
++	int		limit;
++	unsigned	depth;
++	unsigned	hash_divisor;
++	unsigned	hash_kind;
++/* Variables */
++	struct timer_list perturb_timer;
++	int		perturbation;
++	esfq_index	tail;		/* Index of current slot in round */
++	esfq_index	max_depth;	/* Maximal depth */
++
++	esfq_index	*ht;			/* Hash table */
++	esfq_index	*next;			/* Active slots link */
++	short		*allot;			/* Current allotment per slot */
++	unsigned short	*hash;			/* Hash value indexed by slots */
++	struct sk_buff_head	*qs;		/* Slot queue */
++	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
++};
++
++/* This contains the info we will hash. */
++struct esfq_packet_info
++{
++	u32	proto;		/* protocol or port */
++	u32	src;		/* source from packet header */
++	u32	dst;		/* destination from packet header */
++	u32	ctorigsrc;	/* original source from conntrack */
++	u32	ctorigdst;	/* original destination from conntrack */
++	u32	ctreplsrc;	/* reply source from conntrack */
++	u32	ctrepldst;	/* reply destination from conntrack */
++	u32	mark;		/* netfilter mark (fwmark) */
++};
++
++static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
++{
++	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
++{
++	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
++{
++	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
++}
++
++static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
++{
++	struct esfq_packet_info info;
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	enum ip_conntrack_info ctinfo;
++	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
++#endif
++
++	switch (skb->protocol) {
++	case __constant_htons(ETH_P_IP):
++	{
++		struct iphdr *iph = ip_hdr(skb);
++		info.dst = iph->daddr;
++		info.src = iph->saddr;
++		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
++		    (iph->protocol == IPPROTO_TCP ||
++		     iph->protocol == IPPROTO_UDP ||
++		     iph->protocol == IPPROTO_SCTP ||
++		     iph->protocol == IPPROTO_DCCP ||
++		     iph->protocol == IPPROTO_ESP))
++			info.proto = *(((u32*)iph) + iph->ihl);
++		else
++			info.proto = iph->protocol;
++		break;
++	}
++	case __constant_htons(ETH_P_IPV6):
++	{
++		struct ipv6hdr *iph = ipv6_hdr(skb);
++		/* Hash ipv6 addresses into a u32. This isn't ideal,
++		 * but the code is simple. */
++		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
++		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
++		if (iph->nexthdr == IPPROTO_TCP ||
++		    iph->nexthdr == IPPROTO_UDP ||
++		    iph->nexthdr == IPPROTO_SCTP ||
++		    iph->nexthdr == IPPROTO_DCCP ||
++		    iph->nexthdr == IPPROTO_ESP)
++			info.proto = *(u32*)&iph[1];
++		else
++			info.proto = iph->nexthdr;
++		break;
++	}
++	default:
++		info.dst   = (u32)(unsigned long)skb_dst(skb);
++		info.src   = (u32)(unsigned long)skb->sk;
++		info.proto = skb->protocol;
++	}
++
++	info.mark = skb->mark;
++
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	/* defaults if there is no conntrack info */
++	info.ctorigsrc = info.src;
++	info.ctorigdst = info.dst;
++	info.ctreplsrc = info.dst;
++	info.ctrepldst = info.src;
++	/* collect conntrack info */
++	if (ct && ct != &nf_conntrack_untracked) {
++		if (skb->protocol == __constant_htons(ETH_P_IP)) {
++			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
++			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
++			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++		}
++		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
++			/* Again, hash ipv6 addresses into a single u32. */
++			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
++			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
++		}
++
++	}
++#endif
++
++	switch(q->hash_kind) {
++	case TCA_SFQ_HASH_CLASSIC:
++		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++	case TCA_SFQ_HASH_DST:
++		return esfq_jhash_1word(q, info.dst);
++	case TCA_SFQ_HASH_SRC:
++		return esfq_jhash_1word(q, info.src);
++	case TCA_SFQ_HASH_FWMARK:
++		return esfq_jhash_1word(q, info.mark);
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	case TCA_SFQ_HASH_CTORIGDST:
++		return esfq_jhash_1word(q, info.ctorigdst);
++	case TCA_SFQ_HASH_CTORIGSRC:
++		return esfq_jhash_1word(q, info.ctorigsrc);
++	case TCA_SFQ_HASH_CTREPLDST:
++		return esfq_jhash_1word(q, info.ctrepldst);
++	case TCA_SFQ_HASH_CTREPLSRC:
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	case TCA_SFQ_HASH_CTNATCHG:
++	{
++		if (info.ctorigdst == info.ctreplsrc)
++			return esfq_jhash_1word(q, info.ctorigsrc);
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	}
++#endif
++	default:
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
++	}
++	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++}
++
++static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d = q->qs[x].qlen + q->depth;
++
++	p = d;
++	n = q->dep[d].next;
++	q->dep[x].next = n;
++	q->dep[x].prev = p;
++	q->dep[p].next = q->dep[n].prev = x;
++}
++
++static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++
++	if (n == p && q->max_depth == q->qs[x].qlen + 1)
++		q->max_depth--;
++
++	esfq_link(q, x);
++}
++
++static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++	d = q->qs[x].qlen;
++	if (q->max_depth < d)
++		q->max_depth = d;
++
++	esfq_link(q, x);
++}
++
++static unsigned int esfq_drop(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index d = q->max_depth;
++	struct sk_buff *skb;
++	unsigned int len;
++
++	/* Queue is full! Find the longest slot and
++	   drop a packet from it */
++
++	if (d > 1) {
++		esfq_index x = q->dep[d+q->depth].next;
++		skb = q->qs[x].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[x]);
++		kfree_skb(skb);
++		esfq_dec(q, x);
++		sch->q.qlen--;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	if (d == 1) {
++		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
++		d = q->next[q->tail];
++		q->next[q->tail] = q->next[d];
++		q->allot[q->next[d]] += q->quantum;
++		skb = q->qs[d].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[d]);
++		kfree_skb(skb);
++		esfq_dec(q, d);
++		sch->q.qlen--;
++		q->ht[q->hash[d]] = q->depth;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	return 0;
++}
++
++static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
++{
++	unsigned hash = esfq_hash(q, skb);
++	unsigned depth = q->depth;
++	esfq_index x;
++
++	x = q->ht[hash];
++	if (x == depth) {
++		q->ht[hash] = x = q->dep[depth].next;
++		q->hash[x] = hash;
++	}
++
++	if (end == ESFQ_TAIL)
++		__skb_queue_tail(&q->qs[x], skb);
++	else
++		__skb_queue_head(&q->qs[x], skb);
++
++	esfq_inc(q, x);
++	if (q->qs[x].qlen == 1) {		/* The flow is new */
++		if (q->tail == depth) {	/* It is the first flow */
++			q->tail = x;
++			q->next[x] = x;
++			q->allot[x] = q->quantum;
++		} else {
++			q->next[x] = q->next[q->tail];
++			q->next[q->tail] = x;
++			q->tail = x;
++		}
++	}
++}
++
++static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_enqueue(skb, q, ESFQ_TAIL);
++	sch->qstats.backlog += skb->len;
++	if (++sch->q.qlen < q->limit-1) {
++		sch->bstats.bytes += skb->len;
++		sch->bstats.packets++;
++		return 0;
++	}
++
++	sch->qstats.drops++;
++	esfq_drop(sch);
++	return NET_XMIT_CN;
++}
++
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index a;
++
++	/* No active slots */
++	if (q->tail == q->depth)
++		return NULL;
++
++	a = q->next[q->tail];
++	return skb_peek(&q->qs[a]);
++}
++
++static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
++{
++	struct sk_buff *skb;
++	unsigned depth = q->depth;
++	esfq_index a, old_a;
++
++	/* No active slots */
++	if (q->tail == depth)
++		return NULL;
++
++	a = old_a = q->next[q->tail];
++
++	/* Grab packet */
++	skb = __skb_dequeue(&q->qs[a]);
++	esfq_dec(q, a);
++
++	/* Is the slot empty? */
++	if (q->qs[a].qlen == 0) {
++		q->ht[q->hash[a]] = depth;
++		a = q->next[a];
++		if (a == old_a) {
++			q->tail = depth;
++			return skb;
++		}
++		q->next[q->tail] = a;
++		q->allot[a] += q->quantum;
++	} else if ((q->allot[a] -= skb->len) <= 0) {
++		q->tail = a;
++		a = q->next[a];
++		q->allot[a] += q->quantum;
++	}
++
++	return skb;
++}
++
++static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++
++	skb = esfq_q_dequeue(q);
++	if (skb == NULL)
++		return NULL;
++	sch->q.qlen--;
++	sch->qstats.backlog -= skb->len;
++	return skb;
++}
++
++static void esfq_q_destroy(struct esfq_sched_data *q)
++{
++	del_timer(&q->perturb_timer);
++	if(q->ht)
++		kfree(q->ht);
++	if(q->dep)
++		kfree(q->dep);
++	if(q->next)
++		kfree(q->next);
++	if(q->allot)
++		kfree(q->allot);
++	if(q->hash)
++		kfree(q->hash);
++	if(q->qs)
++		kfree(q->qs);
++}
++
++static void esfq_destroy(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_destroy(q);
++}
++
++
++static void esfq_reset(struct Qdisc* sch)
++{
++	struct sk_buff *skb;
++
++	while ((skb = esfq_dequeue(sch)) != NULL)
++		kfree_skb(skb);
++}
++
++static void esfq_perturbation(unsigned long arg)
++{
++	struct Qdisc *sch = (struct Qdisc*)arg;
++	struct esfq_sched_data *q = qdisc_priv(sch);
++
++	q->perturbation = net_random()&0x1F;
++
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++}
++
++static unsigned int esfq_check_hash(unsigned int kind)
++{
++	switch (kind) {
++	case TCA_SFQ_HASH_CTORIGDST:
++	case TCA_SFQ_HASH_CTORIGSRC:
++	case TCA_SFQ_HASH_CTREPLDST:
++	case TCA_SFQ_HASH_CTREPLSRC:
++	case TCA_SFQ_HASH_CTNATCHG:
++#ifndef CONFIG_NET_SCH_ESFQ_NFCT
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++#endif
++	case TCA_SFQ_HASH_CLASSIC:
++	case TCA_SFQ_HASH_DST:
++	case TCA_SFQ_HASH_SRC:
++	case TCA_SFQ_HASH_FWMARK:
++		return kind;
++	default:
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++	}
++}
++
++static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
++{
++	struct tc_esfq_qopt *ctl = nla_data(opt);
++	esfq_index p = ~0U/2;
++	int i;
++
++	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
++		return -EINVAL;
++
++	q->perturbation = 0;
++	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
++	q->max_depth = 0;
++	if (opt == NULL) {
++		q->perturb_period = 0;
++		q->hash_divisor = 1024;
++		q->tail = q->limit = q->depth = 128;
++
++	} else {
++		struct tc_esfq_qopt *ctl = nla_data(opt);
++		if (ctl->quantum)
++			q->quantum = ctl->quantum;
++		q->perturb_period = ctl->perturb_period*HZ;
++		q->hash_divisor = ctl->divisor ? : 1024;
++		q->tail = q->limit = q->depth = ctl->flows ? : 128;
++
++		if ( q->depth > p - 1 )
++			return -EINVAL;
++
++		if (ctl->limit)
++			q->limit = min_t(u32, ctl->limit, q->depth);
++
++		if (ctl->hash_kind) {
++			q->hash_kind = esfq_check_hash(ctl->hash_kind);
++		}
++	}
++
++	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->ht)
++		goto err_case;
++	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
++	if (!q->dep)
++		goto err_case;
++	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->next)
++		goto err_case;
++	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
++	if (!q->allot)
++		goto err_case;
++	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
++	if (!q->hash)
++		goto err_case;
++	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
++	if (!q->qs)
++		goto err_case;
++
++	for (i=0; i< q->hash_divisor; i++)
++		q->ht[i] = q->depth;
++	for (i=0; i<q->depth; i++) {
++		skb_queue_head_init(&q->qs[i]);
++		q->dep[i+q->depth].next = i+q->depth;
++		q->dep[i+q->depth].prev = i+q->depth;
++	}
++
++	for (i=0; i<q->depth; i++)
++		esfq_link(q, i);
++	return 0;
++err_case:
++	esfq_q_destroy(q);
++	return -ENOBUFS;
++}
++
++static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	int err;
++
++	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(q, opt)))
++		return err;
++
++	init_timer(&q->perturb_timer);
++	q->perturb_timer.data = (unsigned long)sch;
++	q->perturb_timer.function = esfq_perturbation;
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++
++	return 0;
++}
++
++static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct esfq_sched_data new;
++	struct sk_buff *skb;
++	int err;
++
++	/* set up new queue */
++	memset(&new, 0, sizeof(struct esfq_sched_data));
++	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(&new, opt)))
++		return err;
++
++	/* copy all packets from the old queue to the new queue */
++	sch_tree_lock(sch);
++	while ((skb = esfq_q_dequeue(q)) != NULL)
++		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
++
++	/* clean up the old queue */
++	esfq_q_destroy(q);
++
++	/* copy elements of the new queue into the old queue */
++	q->perturb_period = new.perturb_period;
++	q->quantum        = new.quantum;
++	q->limit          = new.limit;
++	q->depth          = new.depth;
++	q->hash_divisor   = new.hash_divisor;
++	q->hash_kind      = new.hash_kind;
++	q->tail           = new.tail;
++	q->max_depth      = new.max_depth;
++	q->ht    = new.ht;
++	q->dep   = new.dep;
++	q->next  = new.next;
++	q->allot = new.allot;
++	q->hash  = new.hash;
++	q->qs    = new.qs;
++
++	/* finish up */
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	} else {
++		q->perturbation = 0;
++	}
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	unsigned char *b = skb_tail_pointer(skb);
++	struct tc_esfq_qopt opt;
++
++	opt.quantum = q->quantum;
++	opt.perturb_period = q->perturb_period/HZ;
++
++	opt.limit = q->limit;
++	opt.divisor = q->hash_divisor;
++	opt.flows = q->depth;
++	opt.hash_kind = q->hash_kind;
++
++	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
++		goto nla_put_failure;
++
++	return skb->len;
++
++nla_put_failure:
++	nlmsg_trim(skb, b);
++	return -1;
++}
++
++static struct Qdisc_ops esfq_qdisc_ops =
++{
++	.next		=	NULL,
++	.cl_ops		=	NULL,
++	.id		=	"esfq",
++	.priv_size	=	sizeof(struct esfq_sched_data),
++	.enqueue	=	esfq_enqueue,
++	.dequeue	=	esfq_dequeue,
++	.peek		=	esfq_peek,
++	.drop		=	esfq_drop,
++	.init		=	esfq_init,
++	.reset		=	esfq_reset,
++	.destroy	=	esfq_destroy,
++	.change		=	esfq_change,
++	.dump		=	esfq_dump,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init esfq_module_init(void)
++{
++	return register_qdisc(&esfq_qdisc_ops);
++}
++static void __exit esfq_module_exit(void)
++{
++	unregister_qdisc(&esfq_qdisc_ops);
++}
++module_init(esfq_module_init)
++module_exit(esfq_module_exit)
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.10/621-sched_act_connmark.patch b/trunk/target/linux/generic/patches-3.10/621-sched_act_connmark.patch
new file mode 100644
index 00000000..e6c050aa
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/621-sched_act_connmark.patch
@@ -0,0 +1,183 @@
+--- /dev/null
++++ b/net/sched/act_connmark.c
+@@ -0,0 +1,148 @@
++/*
++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/skbuff.h>
++#include <linux/rtnetlink.h>
++#include <linux/pkt_cls.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <net/netlink.h>
++#include <net/pkt_sched.h>
++#include <net/act_api.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++
++#define TCA_ACT_CONNMARK	20
++
++#define CONNMARK_TAB_MASK     3
++static struct tcf_common *tcf_connmark_ht[CONNMARK_TAB_MASK + 1];
++static u32 connmark_idx_gen;
++static DEFINE_RWLOCK(connmark_lock);
++
++static struct tcf_hashinfo connmark_hash_info = {
++	.htab	=	tcf_connmark_ht,
++	.hmask	=	CONNMARK_TAB_MASK,
++	.lock	=	&connmark_lock,
++};
++
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
++		       struct tcf_result *res)
++{
++	struct nf_conn *c;
++	enum ip_conntrack_info ctinfo;
++	int proto;
++	int r;
++
++	if (skb->protocol == htons(ETH_P_IP)) {
++		if (skb->len < sizeof(struct iphdr))
++			goto out;
++		proto = PF_INET;
++	} else if (skb->protocol == htons(ETH_P_IPV6)) {
++		if (skb->len < sizeof(struct ipv6hdr))
++			goto out;
++		proto = PF_INET6;
++	} else
++		goto out;
++
++	r = nf_conntrack_in(dev_net(skb->dev), proto, NF_INET_PRE_ROUTING, skb);
++	if (r != NF_ACCEPT)
++		goto out;
++
++	c = nf_ct_get(skb, &ctinfo);
++	if (!c)
++		goto out;
++
++	skb->mark = c->mark;
++	nf_conntrack_put(skb->nfct);
++	skb->nfct = NULL;
++
++out:
++	return TC_ACT_PIPE;
++}
++
++static int tcf_connmark_init(struct net *net, struct nlattr *nla,
++			     struct nlattr *est, struct tc_action *a,
++			     int ovr, int bind)
++{
++	struct tcf_common *pc;
++	int ret = 0;
++
++	pc = tcf_hash_check(0, a, bind, &connmark_hash_info);
++	if (!pc) {
++		pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
++				     &connmark_idx_gen, &connmark_hash_info);
++		if (IS_ERR(pc))
++		    return PTR_ERR(pc);
++
++		tcf_hash_insert(pc, &connmark_hash_info);
++		ret = ACT_P_CREATED;
++	} else {
++		if (!ovr) {
++			tcf_hash_release(pc, bind, &connmark_hash_info);
++			return -EEXIST;
++		}
++	}
++
++	return ret;
++}
++
++static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)
++{
++	if (a->priv)
++		return tcf_hash_release(a->priv, bind, &connmark_hash_info);
++	return 0;
++}
++
++static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
++				int bind, int ref)
++{
++	return skb->len;
++}
++
++static struct tc_action_ops act_connmark_ops = {
++	.kind		=	"connmark",
++	.hinfo		=	&connmark_hash_info,
++	.type		=	TCA_ACT_CONNMARK,
++	.capab		=	TCA_CAP_NONE,
++	.owner		=	THIS_MODULE,
++	.act		=	tcf_connmark,
++	.dump		=	tcf_connmark_dump,
++	.cleanup	=	tcf_connmark_cleanup,
++	.init		=	tcf_connmark_init,
++	.walk		=	tcf_generic_walker,
++};
++
++MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_DESCRIPTION("Connection tracking mark restoring");
++MODULE_LICENSE("GPL");
++
++static int __init connmark_init_module(void)
++{
++	return tcf_register_action(&act_connmark_ops);
++}
++
++static void __exit connmark_cleanup_module(void)
++{
++	tcf_unregister_action(&act_connmark_ops);
++}
++
++module_init(connmark_init_module);
++module_exit(connmark_cleanup_module);
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -670,6 +670,19 @@ config NET_ACT_CSUM
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called act_csum.
+ 
++config NET_ACT_CONNMARK
++        tristate "Connection Tracking Marking"
++        depends on NET_CLS_ACT
++        depends on NF_CONNTRACK
++	 depends on NF_CONNTRACK_MARK
++        ---help---
++	  Say Y here to restore the connmark from a scheduler action
++
++	  If unsure, say N.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called act_connmark.
++
+ config NET_CLS_IND
+ 	bool "Incoming device classification"
+ 	depends on NET_CLS_U32 || NET_CLS_FW
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit
+ obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+ obj-$(CONFIG_NET_ACT_SKBEDIT)	+= act_skbedit.o
+ obj-$(CONFIG_NET_ACT_CSUM)	+= act_csum.o
++obj-$(CONFIG_NET_ACT_CONNMARK)	+= act_connmark.o
+ obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
+ obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
+ obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
diff --git a/trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch b/trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch
new file mode 100644
index 00000000..88ede891
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/630-packet_socket_type.patch
@@ -0,0 +1,134 @@
+This patch allows the user to specify desired packet types (outgoing,
+broadcast, unicast, etc.) on packet sockets via setsockopt.
+This can reduce the load in situations where only a limited number
+of packet types are necessary
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/include/uapi/linux/if_packet.h
++++ b/include/uapi/linux/if_packet.h
+@@ -29,6 +29,8 @@ struct sockaddr_ll {
+ /* These ones are invisible by user level */
+ #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
+ #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
++#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
++
+ 
+ /* Packet socket options */
+ 
+@@ -51,6 +53,7 @@ struct sockaddr_ll {
+ #define PACKET_TIMESTAMP		17
+ #define PACKET_FANOUT			18
+ #define PACKET_TX_HAS_OFF		19
++#define PACKET_RECV_TYPE		20
+ 
+ #define PACKET_FANOUT_HASH		0
+ #define PACKET_FANOUT_LB		1
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -1404,6 +1404,7 @@ static int packet_rcv_spkt(struct sk_buf
+ {
+ 	struct sock *sk;
+ 	struct sockaddr_pkt *spkt;
++	struct packet_sock *po;
+ 
+ 	/*
+ 	 *	When we registered the protocol we saved the socket in the data
+@@ -1411,6 +1412,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 */
+ 
+ 	sk = pt->af_packet_priv;
++	po = pkt_sk(sk);
+ 
+ 	/*
+ 	 *	Yank back the headers [hope the device set this
+@@ -1423,7 +1425,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 *	so that this procedure is noop.
+ 	 */
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
+ 		goto out;
+ 
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+@@ -1630,12 +1632,12 @@ static int packet_rcv(struct sk_buff *sk
+ 	int skb_len = skb->len;
+ 	unsigned int snaplen, res;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -1748,12 +1750,12 @@ static int tpacket_rcv(struct sk_buff *s
+ 	struct timespec ts;
+ 	__u32 ts_status;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -2654,6 +2656,7 @@ static int packet_create(struct net *net
+ 	spin_lock_init(&po->bind_lock);
+ 	mutex_init(&po->pg_vec_lock);
+ 	po->prot_hook.func = packet_rcv;
++	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
+ 
+ 	if (sock->type == SOCK_PACKET)
+ 		po->prot_hook.func = packet_rcv_spkt;
+@@ -3264,6 +3267,16 @@ packet_setsockopt(struct socket *sock, i
+ 		po->tp_tx_has_off = !!val;
+ 		return 0;
+ 	}
++        case PACKET_RECV_TYPE:
++        {
++                unsigned int val;
++                if (optlen != sizeof(val))
++                        return -EINVAL;
++                if (copy_from_user(&val, optval, sizeof(val)))
++                        return -EFAULT;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
++                return 0;
++        }
+ 	default:
+ 		return -ENOPROTOOPT;
+ 	}
+@@ -3315,6 +3328,13 @@ static int packet_getsockopt(struct sock
+ 	case PACKET_VNET_HDR:
+ 		val = po->has_vnet_hdr;
+ 		break;
++	case PACKET_RECV_TYPE:
++		if (len > sizeof(unsigned int))
++			len = sizeof(unsigned int);
++		val = po->pkt_type;
++
++		data = &val;
++		break;
+ 	case PACKET_VERSION:
+ 		val = po->tp_version;
+ 		break;
+--- a/net/packet/internal.h
++++ b/net/packet/internal.h
+@@ -116,6 +116,7 @@ struct packet_sock {
+ 	unsigned int		tp_tstamp;
+ 	struct net_device __rcu	*cached_dev;
+ 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
++	unsigned int		pkt_type;
+ };
+ 
+ static struct packet_sock *pkt_sk(struct sock *sk)
diff --git a/trunk/target/linux/generic/patches-3.10/640-bridge_no_eap_forward.patch b/trunk/target/linux/generic/patches-3.10/640-bridge_no_eap_forward.patch
new file mode 100644
index 00000000..50e35c0f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/640-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -94,7 +94,11 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 	dst = NULL;
+ 
+-	if (is_broadcast_ether_addr(dest))
++	if (skb->protocol == htons(ETH_P_PAE)) {
++		skb2 = skb;
++		/* Do not forward 802.1x/EAP frames */
++		skb = NULL;
++	} else if (is_broadcast_ether_addr(dest))
+ 		skb2 = skb;
+ 	else if (is_multicast_ether_addr(dest)) {
+ 		mdst = br_mdb_get(br, skb, vid);
diff --git a/trunk/target/linux/generic/patches-3.10/641-bridge_always_accept_eap.patch b/trunk/target/linux/generic/patches-3.10/641-bridge_always_accept_eap.patch
new file mode 100644
index 00000000..18b4b6c3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/641-bridge_always_accept_eap.patch
@@ -0,0 +1,11 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -81,7 +81,7 @@ int br_handle_frame_finish(struct sk_buf
+ 	    br_multicast_rcv(br, p, skb))
+ 		goto drop;
+ 
+-	if (p->state == BR_STATE_LEARNING)
++	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
+ 		goto drop;
+ 
+ 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
diff --git a/trunk/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch b/trunk/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch
new file mode 100644
index 00000000..e25479d2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch
@@ -0,0 +1,104 @@
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -171,6 +171,7 @@ struct net_bridge_port
+ #define BR_ROOT_BLOCK		0x00000004
+ #define BR_MULTICAST_FAST_LEAVE	0x00000008
+ #define BR_ADMIN_COST		0x00000010
++#define BR_ISOLATE_MODE		0x00000020
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	struct bridge_mcast_query	ip4_query;
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -159,6 +159,22 @@ BRPORT_ATTR_FLAG(hairpin_mode, BR_HAIRPI
+ BRPORT_ATTR_FLAG(bpdu_guard, BR_BPDU_GUARD);
+ BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLOCK);
+ 
++static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
++{
++	int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
++	return sprintf(buf, "%d\n", isolate_mode);
++}
++static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
++{
++	if (v)
++		p->flags |= BR_ISOLATE_MODE;
++	else
++		p->flags &= ~BR_ISOLATE_MODE;
++	return 0;
++}
++static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
++		   show_isolate_mode, store_isolate_mode);
++
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+ {
+@@ -199,6 +215,7 @@ static const struct brport_attribute *br
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
+ #endif
++	&brport_attr_isolate_mode,
+ 	NULL
+ };
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -115,8 +115,8 @@ int br_handle_frame_finish(struct sk_buf
+ 			skb2 = skb;
+ 
+ 		br->dev->stats.multicast++;
+-	} else if ((dst = __br_fdb_get(br, dest, vid)) &&
+-			dst->is_local) {
++	} else if ((p->flags & BR_ISOLATE_MODE) ||
++		   ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local)) {
+ 		skb2 = skb;
+ 		/* Do not forward the packet since it's local. */
+ 		skb = NULL;
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -119,7 +119,7 @@ void br_deliver(const struct net_bridge_
+ /* called with rcu_read_lock */
+ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
+ {
+-	if (should_deliver(to, skb)) {
++	if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
+ 		if (skb0)
+ 			deliver_clone(to, skb, __br_forward);
+ 		else
+@@ -174,7 +174,8 @@ out:
+ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 		     struct sk_buff *skb0,
+ 		     void (*__packet_hook)(const struct net_bridge_port *p,
+-					   struct sk_buff *skb))
++					   struct sk_buff *skb),
++		     bool forward)
+ {
+ 	struct net_bridge_port *p;
+ 	struct net_bridge_port *prev;
+@@ -182,6 +183,9 @@ static void br_flood(struct net_bridge *
+ 	prev = NULL;
+ 
+ 	list_for_each_entry_rcu(p, &br->port_list, list) {
++		if (forward && (p->flags & BR_ISOLATE_MODE))
++			continue;
++
+ 		prev = maybe_deliver(prev, p, skb, __packet_hook);
+ 		if (IS_ERR(prev))
+ 			goto out;
+@@ -205,14 +209,14 @@ out:
+ /* called with rcu_read_lock */
+ void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
+ {
+-	br_flood(br, skb, NULL, __br_deliver);
++	br_flood(br, skb, NULL, __br_deliver, false);
+ }
+ 
+ /* called under bridge lock */
+ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
+ 		      struct sk_buff *skb2)
+ {
+-	br_flood(br, skb, skb2, __br_forward);
++	br_flood(br, skb, skb2, __br_forward, true);
+ }
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
diff --git a/trunk/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch b/trunk/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch
new file mode 100644
index 00000000..7bb0ee8d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch
@@ -0,0 +1,107 @@
+--- a/include/net/addrconf.h
++++ b/include/net/addrconf.h
+@@ -103,6 +103,12 @@ extern void			addrconf_join_solict(struc
+ extern void			addrconf_leave_solict(struct inet6_dev *idev,
+ 					const struct in6_addr *addr);
+ 
++extern int			(*ipv6_dev_get_saddr_hook)(struct net *net,
++						const struct net_device *dev,
++						const struct in6_addr *daddr,
++						unsigned int prefs,
++						struct in6_addr *saddr);
++
+ static inline unsigned long addrconf_timeout_fixup(u32 timeout,
+ 						   unsigned int unit)
+ {
+--- a/net/bridge/Kconfig
++++ b/net/bridge/Kconfig
+@@ -6,7 +6,6 @@ config BRIDGE
+ 	tristate "802.1d Ethernet Bridging"
+ 	select LLC
+ 	select STP
+-	depends on IPV6 || IPV6=n
+ 	---help---
+ 	  If you say Y here, then your Linux box will be able to act as an
+ 	  Ethernet bridge, which means that the different Ethernet segments it
+--- a/net/ipv6/Makefile
++++ b/net/ipv6/Makefile
+@@ -44,3 +44,4 @@ obj-y += addrconf_core.o exthdrs_core.o 
+ obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
+ 
+ obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
++obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1322,7 +1322,7 @@ out:
+ 	return ret;
+ }
+ 
+-int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++static int __ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+ 		       struct in6_addr *saddr)
+ {
+@@ -1447,7 +1447,6 @@ try_nextdev:
+ 	in6_ifa_put(hiscore->ifa);
+ 	return 0;
+ }
+-EXPORT_SYMBOL(ipv6_dev_get_saddr);
+ 
+ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
+ 		      unsigned char banned_flags)
+@@ -5183,6 +5182,9 @@ int __init addrconf_init(void)
+ 
+ 	ipv6_addr_label_rtnl_register();
+ 
++	BUG_ON(ipv6_dev_get_saddr_hook != NULL);
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, __ipv6_dev_get_saddr);
++
+ 	return 0;
+ errout:
+ 	rtnl_af_unregister(&inet6_ops);
+@@ -5201,6 +5203,9 @@ void addrconf_cleanup(void)
+ 	struct net_device *dev;
+ 	int i;
+ 
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, NULL);
++	synchronize_rcu();
++
+ 	unregister_netdevice_notifier(&ipv6_dev_notf);
+ 	unregister_pernet_subsys(&addrconf_ops);
+ 	ipv6_addr_label_cleanup();
+--- /dev/null
++++ b/net/ipv6/inet6_stubs.c
+@@ -0,0 +1,33 @@
++/*
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ */
++#include <linux/export.h>
++#include <net/ipv6.h>
++
++int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr);
++
++EXPORT_SYMBOL(ipv6_dev_get_saddr_hook);
++
++int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr)
++{
++	int ret = -EADDRNOTAVAIL;
++	typeof(ipv6_dev_get_saddr_hook) dev_get_saddr;
++
++	rcu_read_lock();
++	dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook);
++
++	if (dev_get_saddr)
++		ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr);
++
++	rcu_read_unlock();
++	return ret;
++}
++EXPORT_SYMBOL(ipv6_dev_get_saddr);
++
diff --git a/trunk/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch b/trunk/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
new file mode 100644
index 00000000..a9c5d689
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch
@@ -0,0 +1,155 @@
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -57,7 +57,7 @@ int br_dev_queue_push_xmit(struct sk_buf
+ 
+ int br_forward_finish(struct sk_buff *skb)
+ {
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ 		       br_dev_queue_push_xmit);
+ 
+ }
+@@ -80,7 +80,7 @@ static void __br_deliver(const struct ne
+ 		return;
+ 	}
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+@@ -101,7 +101,7 @@ static void __br_forward(const struct ne
+ 	skb->dev = to->dev;
+ 	skb_forward_csum(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -52,7 +52,7 @@ static int br_pass_frame_up(struct sk_bu
+ 	indev = skb->dev;
+ 	skb->dev = brdev;
+ 
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+ 		       netif_receive_skb);
+ }
+ 
+@@ -210,7 +210,7 @@ rx_handler_result_t br_handle_frame(stru
+ 		}
+ 
+ 		/* Deliver packet to local host only */
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+ 			    NULL, br_handle_local_finish)) {
+ 			return RX_HANDLER_CONSUMED; /* consumed by filter */
+ 		} else {
+@@ -225,7 +225,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_local_finish))
+ 			break;
+ 
+@@ -247,7 +247,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_frame_finish);
+ 		break;
+ 	default:
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -802,7 +802,7 @@ static void __br_multicast_send_query(st
+ 	if (port) {
+ 		__skb_push(skb, sizeof(struct ethhdr));
+ 		skb->dev = port->dev;
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 			dev_queue_xmit);
+ 	} else
+ 		netif_rx(skb);
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -73,6 +73,15 @@ static int brnf_pass_vlan_indev __read_m
+ #define IS_ARP(skb) \
+ 	(!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
+ 
++int brnf_call_ebtables __read_mostly = 0;
++EXPORT_SYMBOL_GPL(brnf_call_ebtables);
++
++bool br_netfilter_run_hooks(void)
++{
++	return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables |
++	       brnf_call_ebtables;
++}
++
+ static inline __be16 vlan_proto(const struct sk_buff *skb)
+ {
+ 	if (vlan_tx_tag_present(skb))
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -734,15 +734,29 @@ static inline u16 br_get_pvid(const stru
+ 
+ /* br_netfilter.c */
+ #ifdef CONFIG_BRIDGE_NETFILTER
++extern int brnf_call_ebtables;
+ extern int br_netfilter_init(void);
+ extern void br_netfilter_fini(void);
+ extern void br_netfilter_rtable_init(struct net_bridge *);
++extern bool br_netfilter_run_hooks(void);
+ #else
+ #define br_netfilter_init()	(0)
+ #define br_netfilter_fini()	do { } while(0)
+ #define br_netfilter_rtable_init(x)
++#define br_netfilter_run_hooks()	false
+ #endif
+ 
++static inline int
++BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
++	struct net_device *in, struct net_device *out,
++	int (*okfn)(struct sk_buff *))
++{
++	if (!br_netfilter_run_hooks())
++		return okfn(skb);
++
++	return NF_HOOK(pf, hook, skb, in, out, okfn);
++}
++
+ /* br_stp.c */
+ extern void br_log_state(const struct net_bridge_port *p);
+ extern struct net_bridge_port *br_get_port(struct net_bridge *br,
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid
+ 
+ 	skb_reset_mac_header(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		dev_queue_xmit);
+ }
+ 
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -2406,11 +2406,13 @@ static int __init ebtables_init(void)
+ 	}
+ 
+ 	printk(KERN_INFO "Ebtables v2.0 registered\n");
++	brnf_call_ebtables = 1;
+ 	return 0;
+ }
+ 
+ static void __exit ebtables_fini(void)
+ {
++	brnf_call_ebtables = 0;
+ 	nf_unregister_sockopt(&ebt_sockopts);
+ 	xt_unregister_target(&ebt_standard_target);
+ 	printk(KERN_INFO "Ebtables v2.0 unregistered\n");
diff --git a/trunk/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch b/trunk/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch
new file mode 100644
index 00000000..9ee6b01d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/645-bridge_multicast_to_unicast.patch
@@ -0,0 +1,375 @@
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -634,7 +634,8 @@ struct net_bridge_port_group *br_multica
+ 			struct net_bridge_port *port,
+ 			struct br_ip *group,
+ 			struct net_bridge_port_group __rcu *next,
+-			unsigned char state)
++			unsigned char state,
++			const unsigned char *src)
+ {
+ 	struct net_bridge_port_group *p;
+ 
+@@ -649,12 +650,33 @@ struct net_bridge_port_group *br_multica
+ 	hlist_add_head(&p->mglist, &port->mglist);
+ 	setup_timer(&p->timer, br_multicast_port_group_expired,
+ 		    (unsigned long)p);
++	if ((port->flags & BR_MULTICAST_TO_UCAST) && src) {
++		memcpy(p->eth_addr, src, ETH_ALEN);
++		p->unicast = true;
++	}
+ 	return p;
+ }
+ 
++static bool br_port_group_equal(struct net_bridge_port_group *p,
++				struct net_bridge_port *port,
++				const unsigned char *src)
++{
++	if (p->port != port)
++		return false;
++
++	if (!p->unicast)
++		return true;
++
++	if (!src)
++		return false;
++
++	return ether_addr_equal(src, p->eth_addr);
++}
++
+ static int br_multicast_add_group(struct net_bridge *br,
+ 				  struct net_bridge_port *port,
+-				  struct br_ip *group)
++				  struct br_ip *group,
++				  const unsigned char *src)
+ {
+ 	struct net_bridge_mdb_entry *mp;
+ 	struct net_bridge_port_group *p;
+@@ -681,13 +703,13 @@ static int br_multicast_add_group(struct
+ 	for (pp = &mp->ports;
+ 	     (p = mlock_dereference(*pp, br)) != NULL;
+ 	     pp = &p->next) {
+-		if (p->port == port)
++		if (br_port_group_equal(p, port, src))
+ 			goto found;
+ 		if ((unsigned long)p->port < (unsigned long)port)
+ 			break;
+ 	}
+ 
+-	p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);
++	p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY, src);
+ 	if (unlikely(!p))
+ 		goto err;
+ 	rcu_assign_pointer(*pp, p);
+@@ -706,7 +728,7 @@ err:
+ static int br_ip4_multicast_add_group(struct net_bridge *br,
+ 				      struct net_bridge_port *port,
+ 				      __be32 group,
+-				      __u16 vid)
++				      __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 
+@@ -717,14 +739,14 @@ static int br_ip4_multicast_add_group(st
+ 	br_group.proto = htons(ETH_P_IP);
+ 	br_group.vid = vid;
+ 
+-	return br_multicast_add_group(br, port, &br_group);
++	return br_multicast_add_group(br, port, &br_group, src);
+ }
+ 
+ #if IS_ENABLED(CONFIG_IPV6)
+ static int br_ip6_multicast_add_group(struct net_bridge *br,
+ 				      struct net_bridge_port *port,
+ 				      const struct in6_addr *group,
+-				      __u16 vid)
++				      __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 
+@@ -735,7 +757,7 @@ static int br_ip6_multicast_add_group(st
+ 	br_group.proto = htons(ETH_P_IPV6);
+ 	br_group.vid = vid;
+ 
+-	return br_multicast_add_group(br, port, &br_group);
++	return br_multicast_add_group(br, port, &br_group, src);
+ }
+ #endif
+ 
+@@ -949,6 +971,7 @@ static int br_ip4_multicast_igmp3_report
+ 					 struct net_bridge_port *port,
+ 					 struct sk_buff *skb)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct igmpv3_report *ih;
+ 	struct igmpv3_grec *grec;
+ 	int i;
+@@ -994,7 +1017,7 @@ static int br_ip4_multicast_igmp3_report
+ 			continue;
+ 		}
+ 
+-		err = br_ip4_multicast_add_group(br, port, group, vid);
++		err = br_ip4_multicast_add_group(br, port, group, vid, src);
+ 		if (err)
+ 			break;
+ 	}
+@@ -1007,6 +1030,7 @@ static int br_ip6_multicast_mld2_report(
+ 					struct net_bridge_port *port,
+ 					struct sk_buff *skb)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct icmp6hdr *icmp6h;
+ 	struct mld2_grec *grec;
+ 	int i;
+@@ -1057,7 +1081,7 @@ static int br_ip6_multicast_mld2_report(
+ 		}
+ 
+ 		err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
+-						 vid);
++						 vid, src);
+ 		if (!err)
+ 			break;
+ 	}
+@@ -1302,7 +1326,8 @@ static void br_multicast_leave_group(str
+ 				     struct net_bridge_port *port,
+ 				     struct br_ip *group,
+ 				     struct bridge_mcast_querier *querier,
+-				     struct bridge_mcast_query *query)
++				     struct bridge_mcast_query *query,
++				     const unsigned char *src)
+ {
+ 	struct net_bridge_mdb_htable *mdb;
+ 	struct net_bridge_mdb_entry *mp;
+@@ -1352,7 +1377,7 @@ static void br_multicast_leave_group(str
+ 		for (pp = &mp->ports;
+ 		     (p = mlock_dereference(*pp, br)) != NULL;
+ 		     pp = &p->next) {
+-			if (p->port != port)
++			if (!br_port_group_equal(p, port, src))
+ 				continue;
+ 
+ 			rcu_assign_pointer(*pp, p->next);
+@@ -1386,7 +1411,7 @@ static void br_multicast_leave_group(str
+ 	for (p = mlock_dereference(mp->ports, br);
+ 	     p != NULL;
+ 	     p = mlock_dereference(p->next, br)) {
+-		if (p->port != port)
++		if (!br_port_group_equal(p, port, src))
+ 			continue;
+ 
+ 		if (!hlist_unhashed(&p->mglist) &&
+@@ -1404,8 +1429,8 @@ out:
+ 
+ static void br_ip4_multicast_leave_group(struct net_bridge *br,
+ 					 struct net_bridge_port *port,
+-					 __be32 group,
+-					 __u16 vid)
++					 __be32 group, __u16 vid,
++					 const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 	struct bridge_mcast_query *query = port ? &port->ip4_query :
+@@ -1418,14 +1443,15 @@ static void br_ip4_multicast_leave_group
+ 	br_group.proto = htons(ETH_P_IP);
+ 	br_group.vid = vid;
+ 
+-	br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query);
++	br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query,
++				 src);
+ }
+ 
+ #if IS_ENABLED(CONFIG_IPV6)
+ static void br_ip6_multicast_leave_group(struct net_bridge *br,
+ 					 struct net_bridge_port *port,
+ 					 const struct in6_addr *group,
+-					 __u16 vid)
++					 __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 	struct bridge_mcast_query *query = port ? &port->ip6_query :
+@@ -1439,7 +1465,8 @@ static void br_ip6_multicast_leave_group
+ 	br_group.proto = htons(ETH_P_IPV6);
+ 	br_group.vid = vid;
+ 
+-	br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query);
++	br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query,
++				 src);
+ }
+ #endif
+ 
+@@ -1447,6 +1474,7 @@ static int br_multicast_ipv4_rcv(struct 
+ 				 struct net_bridge_port *port,
+ 				 struct sk_buff *skb)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct sk_buff *skb2 = skb;
+ 	const struct iphdr *iph;
+ 	struct igmphdr *ih;
+@@ -1522,7 +1550,7 @@ static int br_multicast_ipv4_rcv(struct 
+ 	case IGMP_HOST_MEMBERSHIP_REPORT:
+ 	case IGMPV2_HOST_MEMBERSHIP_REPORT:
+ 		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
+-		err = br_ip4_multicast_add_group(br, port, ih->group, vid);
++		err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
+ 		break;
+ 	case IGMPV3_HOST_MEMBERSHIP_REPORT:
+ 		err = br_ip4_multicast_igmp3_report(br, port, skb2);
+@@ -1531,7 +1559,7 @@ static int br_multicast_ipv4_rcv(struct 
+ 		err = br_ip4_multicast_query(br, port, skb2);
+ 		break;
+ 	case IGMP_HOST_LEAVE_MESSAGE:
+-		br_ip4_multicast_leave_group(br, port, ih->group, vid);
++		br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
+ 		break;
+ 	}
+ 
+@@ -1548,6 +1576,7 @@ static int br_multicast_ipv6_rcv(struct 
+ 				 struct net_bridge_port *port,
+ 				 struct sk_buff *skb)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct sk_buff *skb2;
+ 	const struct ipv6hdr *ip6h;
+ 	u8 icmp6_type;
+@@ -1659,7 +1688,8 @@ static int br_multicast_ipv6_rcv(struct 
+ 		}
+ 		mld = (struct mld_msg *)skb_transport_header(skb2);
+ 		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
+-		err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
++		err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
++						 src);
+ 		break;
+ 	    }
+ 	case ICMPV6_MLD2_REPORT:
+@@ -1676,7 +1706,7 @@ static int br_multicast_ipv6_rcv(struct 
+ 			goto out;
+ 		}
+ 		mld = (struct mld_msg *)skb_transport_header(skb2);
+-		br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
++		br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
+ 	    }
+ 	}
+ 
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -115,6 +115,9 @@ struct net_bridge_port_group {
+ 	struct timer_list		timer;
+ 	struct br_ip			addr;
+ 	unsigned char			state;
++
++	unsigned char			eth_addr[ETH_ALEN];
++	bool				unicast;
+ };
+ 
+ struct net_bridge_mdb_entry
+@@ -172,6 +175,7 @@ struct net_bridge_port
+ #define BR_MULTICAST_FAST_LEAVE	0x00000008
+ #define BR_ADMIN_COST		0x00000010
+ #define BR_ISOLATE_MODE		0x00000020
++#define BR_MULTICAST_TO_UCAST	0x00000040
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	struct bridge_mcast_query	ip4_query;
+@@ -489,7 +493,8 @@ extern struct net_bridge_port_group *br_
+ 				struct net_bridge_port *port,
+ 				struct br_ip *group,
+ 				struct net_bridge_port_group *next,
+-				unsigned char state);
++				unsigned char state,
++				const unsigned char *src);
+ extern void br_mdb_init(void);
+ extern void br_mdb_uninit(void);
+ extern void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
+--- a/net/bridge/br_mdb.c
++++ b/net/bridge/br_mdb.c
+@@ -341,7 +341,7 @@ static int br_mdb_add_group(struct net_b
+ 			break;
+ 	}
+ 
+-	p = br_multicast_new_port_group(port, group, *pp, state);
++	p = br_multicast_new_port_group(port, group, *pp, state, NULL);
+ 	if (unlikely(!p))
+ 		return -ENOMEM;
+ 	rcu_assign_pointer(*pp, p);
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -170,6 +170,29 @@ out:
+ 	return p;
+ }
+ 
++static struct net_bridge_port *maybe_deliver_addr(
++	struct net_bridge_port *prev, struct net_bridge_port *p,
++	struct sk_buff *skb, const unsigned char *addr,
++	void (*__packet_hook)(const struct net_bridge_port *p,
++			      struct sk_buff *skb))
++{
++	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
++
++	if (!should_deliver(p, skb))
++		return prev;
++
++	skb = skb_copy(skb, GFP_ATOMIC);
++	if (!skb) {
++		dev->stats.tx_dropped++;
++		return prev;
++	}
++
++	memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
++	__packet_hook(p, skb);
++
++	return prev;
++}
++
+ /* called under bridge lock */
+ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 		     struct sk_buff *skb0,
+@@ -232,6 +255,7 @@ static void br_multicast_flood(struct ne
+ 	struct net_bridge_port *prev = NULL;
+ 	struct net_bridge_port_group *p;
+ 	struct hlist_node *rp;
++	const unsigned char *addr;
+ 
+ 	rp = rcu_dereference(hlist_first_rcu(&br->router_list));
+ 	p = mdst ? rcu_dereference(mdst->ports) : NULL;
+@@ -242,10 +266,19 @@ static void br_multicast_flood(struct ne
+ 		rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
+ 			     NULL;
+ 
+-		port = (unsigned long)lport > (unsigned long)rport ?
+-		       lport : rport;
+-
+-		prev = maybe_deliver(prev, port, skb, __packet_hook);
++		if ((unsigned long)lport > (unsigned long)rport) {
++			port = lport;
++			addr = p->unicast ? p->eth_addr : NULL;
++		} else {
++			port = rport;
++			addr = NULL;
++		}
++
++		if (addr)
++			prev = maybe_deliver_addr(prev, port, skb, addr,
++						  __packet_hook);
++		else
++			prev = maybe_deliver(prev, port, skb, __packet_hook);
+ 		if (IS_ERR(prev))
+ 			goto out;
+ 
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -190,6 +190,7 @@ static BRPORT_ATTR(multicast_router, S_I
+ 		   store_multicast_router);
+ 
+ BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
++BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
+ #endif
+ 
+ static const struct brport_attribute *brport_attrs[] = {
+@@ -214,6 +215,7 @@ static const struct brport_attribute *br
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
++	&brport_attr_multicast_to_unicast,
+ #endif
+ 	&brport_attr_isolate_mode,
+ 	NULL
diff --git a/trunk/target/linux/generic/patches-3.10/650-pppoe_header_pad.patch b/trunk/target/linux/generic/patches-3.10/650-pppoe_header_pad.patch
new file mode 100644
index 00000000..a89a9f3b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/ppp/pppoe.c
++++ b/drivers/net/ppp/pppoe.c
+@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 		goto end;
+ 
+ 
+-	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
++	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
+ 			   0, GFP_KERNEL);
+ 	if (!skb) {
+ 		error = -ENOMEM;
+@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 	}
+ 
+ 	/* Reserve space for headers. */
+-	skb_reserve(skb, dev->hard_header_len);
++	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
+ 	skb_reset_network_header(skb);
+ 
+ 	skb->dev = dev;
diff --git a/trunk/target/linux/generic/patches-3.10/651-wireless_mesh_header.patch b/trunk/target/linux/generic/patches-3.10/651-wireless_mesh_header.patch
new file mode 100644
index 00000000..d2d40f53
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/651-wireless_mesh_header.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -139,7 +139,7 @@ static inline bool dev_xmit_complete(int
+  */
+ 
+ #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ #  define LL_MAX_HEADER 128
+ # else
+ #  define LL_MAX_HEADER 96
diff --git a/trunk/target/linux/generic/patches-3.10/652-atm_header_changes.patch b/trunk/target/linux/generic/patches-3.10/652-atm_header_changes.patch
new file mode 100644
index 00000000..7e568592
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/652-atm_header_changes.patch
@@ -0,0 +1,12 @@
+--- a/include/uapi/linux/atm.h
++++ b/include/uapi/linux/atm.h
+@@ -139,6 +139,9 @@ struct atm_trafprm {
+ 	int		min_pcr;	/* minimum PCR in cells per second */
+ 	int		max_cdv;	/* maximum CDV in microseconds */
+ 	int		max_sdu;	/* maximum SDU in bytes */
++	int		scr;		/* sustained rate in cells per second */
++	int		mbs;		/* maximum burst size (MBS) in cells */
++	int		cdv;		/* Cell delay varition */
+         /* extra params for ABR */
+         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
+         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/trunk/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch b/trunk/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
new file mode 100644
index 00000000..65fbd410
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch
@@ -0,0 +1,30 @@
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -1570,27 +1570,7 @@ void netlink_detachskb(struct sock *sk, 
+ 
+ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
+ {
+-	int delta;
+-
+ 	WARN_ON(skb->sk != NULL);
+-	if (netlink_skb_is_mmaped(skb))
+-		return skb;
+-
+-	delta = skb->end - skb->tail;
+-	if (delta * 2 < skb->truesize)
+-		return skb;
+-
+-	if (skb_shared(skb)) {
+-		struct sk_buff *nskb = skb_clone(skb, allocation);
+-		if (!nskb)
+-			return skb;
+-		consume_skb(skb);
+-		skb = nskb;
+-	}
+-
+-	if (!pskb_expand_head(skb, 0, -delta, allocation))
+-		skb->truesize -= delta;
+-
+ 	return skb;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/655-increase_skb_pad.patch b/trunk/target/linux/generic/patches-3.10/655-increase_skb_pad.patch
new file mode 100644
index 00000000..f5b30fbf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/655-increase_skb_pad.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1849,7 +1849,7 @@ static inline int pskb_network_may_pull(
+  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
+  */
+ #ifndef NET_SKB_PAD
+-#define NET_SKB_PAD	max(32, L1_CACHE_BYTES)
++#define NET_SKB_PAD	max(64, L1_CACHE_BYTES)
+ #endif
+ 
+ extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/trunk/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch b/trunk/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch
new file mode 100644
index 00000000..0a20f6ba
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/656-skb_reduce_truesize-helper.patch
@@ -0,0 +1,41 @@
+From 4593a806e31119c5bd3faa00c7210ad862d515af Mon Sep 17 00:00:00 2001
+From: Dave Taht <dave.taht@bufferbloat.net>
+Date: Mon, 31 Dec 2012 10:02:21 -0800
+Subject: [PATCH 3/7] skb_reduce_truesize: helper function for shrinking skbs
+ whenever needed
+
+On embedded devices in particular, large queues of small packets from the rx
+path with a large truesize can exist. Reducing their size can reduce
+memory pressure. skb_reduce_truesize is a helper function for doing this,
+when needed.
+---
+ include/linux/skbuff.h |   18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1894,6 +1894,24 @@ static inline void pskb_trim_unique(stru
+ 	BUG_ON(err);
+ }
+ 
++/*
++ * Caller wants to reduce memory needs before queueing skb
++ * The (expensive) copy should not be be done in fast path.
++ */
++static inline struct sk_buff *skb_reduce_truesize(struct sk_buff *skb)
++{
++	if (skb->truesize > 2 * SKB_TRUESIZE(skb->len)) {
++		struct sk_buff *nskb;
++		nskb = skb_copy_expand(skb, skb_headroom(skb), 0,
++			GFP_ATOMIC | __GFP_NOWARN);
++		if (nskb) {
++			__kfree_skb(skb);
++			skb = nskb;
++		}
++	}
++	return skb;
++}
++
+ /**
+  *	skb_orphan - orphan a buffer
+  *	@skb: buffer to orphan
diff --git a/trunk/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch b/trunk/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch
new file mode 100644
index 00000000..e27d0a04
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch
@@ -0,0 +1,63 @@
+From bc9fec2f87d57bdbff30d296605e24504513f65c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dave=20T=C3=A4ht?= <dave.taht@bufferbloat.net>
+Date: Mon, 17 Sep 2012 19:20:22 -0700
+Subject: [PATCH 4/7] net: add skb_reduce_truesize support to common qdiscs
+
+Reduce skb size under load when queues begin to fill on the
+commont qdiscs.
+---
+ net/sched/sch_codel.c    |    2 ++
+ net/sched/sch_fifo.c     |   12 ++++++++----
+ net/sched/sch_fq_codel.c |    2 ++
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+--- a/net/sched/sch_codel.c
++++ b/net/sched/sch_codel.c
+@@ -96,6 +96,8 @@ static int codel_qdisc_enqueue(struct sk
+ 	struct codel_sched_data *q;
+ 
+ 	if (likely(qdisc_qlen(sch) < sch->limit)) {
++		if(qdisc_qlen(sch) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		codel_set_enqueue_time(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+ 	}
+--- a/net/sched/sch_fifo.c
++++ b/net/sched/sch_fifo.c
+@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff 
+ 
+ static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	return qdisc_reshape_fail(skb, sch);
+ }
+ 
+ static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	/* queue full, remove one skb to fulfill the limit */
+ 	__qdisc_queue_drop_head(sch, &sch->q);
+ 	sch->qstats.drops++;
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -182,6 +182,8 @@ static int fq_codel_enqueue(struct sk_bu
+ 		return ret;
+ 	}
+ 	idx--;
++	if (sch->q.qlen > 128)
++		skb = skb_reduce_truesize(skb);
+ 
+ 	codel_set_enqueue_time(skb);
+ 	flow = &q->flows[idx];
diff --git a/trunk/target/linux/generic/patches-3.10/660-fq_codel_defaults.patch b/trunk/target/linux/generic/patches-3.10/660-fq_codel_defaults.patch
new file mode 100644
index 00000000..c08b2191
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/660-fq_codel_defaults.patch
@@ -0,0 +1,14 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -389,9 +389,9 @@ static int fq_codel_init(struct Qdisc *s
+ 	struct fq_codel_sched_data *q = qdisc_priv(sch);
+ 	int i;
+ 
+-	sch->limit = 10*1024;
++	sch->limit = 1024;
+ 	q->flows_cnt = 1024;
+-	q->quantum = psched_mtu(qdisc_dev(sch));
++	q->quantum = 300;
+ 	q->perturbation = net_random();
+ 	INIT_LIST_HEAD(&q->new_flows);
+ 	INIT_LIST_HEAD(&q->old_flows);
diff --git a/trunk/target/linux/generic/patches-3.10/661-fq_codel_keep_dropped_stats.patch b/trunk/target/linux/generic/patches-3.10/661-fq_codel_keep_dropped_stats.patch
new file mode 100644
index 00000000..d51c7e58
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/661-fq_codel_keep_dropped_stats.patch
@@ -0,0 +1,10 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -195,7 +195,6 @@ static int fq_codel_enqueue(struct sk_bu
+ 		list_add_tail(&flow->flowchain, &q->new_flows);
+ 		q->new_flow_count++;
+ 		flow->deficit = q->quantum;
+-		flow->dropped = 0;
+ 	}
+ 	if (++sch->q.qlen <= sch->limit)
+ 		return NET_XMIT_SUCCESS;
diff --git a/trunk/target/linux/generic/patches-3.10/662-use_fq_codel_by_default.patch b/trunk/target/linux/generic/patches-3.10/662-use_fq_codel_by_default.patch
new file mode 100644
index 00000000..21c5e43f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/662-use_fq_codel_by_default.patch
@@ -0,0 +1,75 @@
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -3,8 +3,9 @@
+ # 
+ 
+ menuconfig NET_SCHED
+-	bool "QoS and/or fair queueing"
++	def_bool y
+ 	select NET_SCH_FIFO
++	select NET_SCH_FQ_CODEL
+ 	---help---
+ 	  When the kernel has several packets to send out over a network
+ 	  device, it has to decide which ones to send first, which ones to
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -594,7 +594,7 @@ static const struct Qdisc_class_ops fq_c
+ 	.walk		=	fq_codel_walk,
+ };
+ 
+-static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
++struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
+ 	.cl_ops		=	&fq_codel_class_ops,
+ 	.id		=	"fq_codel",
+ 	.priv_size	=	sizeof(struct fq_codel_sched_data),
+@@ -610,6 +610,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+ 	.dump_stats =	fq_codel_dump_stats,
+ 	.owner		=	THIS_MODULE,
+ };
++EXPORT_SYMBOL(fq_codel_qdisc_ops);
+ 
+ static int __init fq_codel_module_init(void)
+ {
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -315,6 +315,7 @@ extern struct Qdisc noop_qdisc;
+ extern struct Qdisc_ops noop_qdisc_ops;
+ extern struct Qdisc_ops pfifo_fast_ops;
+ extern struct Qdisc_ops mq_qdisc_ops;
++extern struct Qdisc_ops fq_codel_qdisc_ops;
+ 
+ struct Qdisc_class_common {
+ 	u32			classid;
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -681,7 +681,7 @@ static void attach_one_default_qdisc(str
+ 
+ 	if (dev->tx_queue_len) {
+ 		qdisc = qdisc_create_dflt(dev_queue,
+-					  &pfifo_fast_ops, TC_H_ROOT);
++					  &fq_codel_qdisc_ops, TC_H_ROOT);
+ 		if (!qdisc) {
+ 			netdev_info(dev, "activation failed\n");
+ 			return;
+--- a/net/sched/sch_mq.c
++++ b/net/sched/sch_mq.c
+@@ -57,7 +57,7 @@ static int mq_init(struct Qdisc *sch, st
+ 
+ 	for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
+ 		dev_queue = netdev_get_tx_queue(dev, ntx);
+-		qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(ntx + 1)));
+ 		if (qdisc == NULL)
+--- a/net/sched/sch_mqprio.c
++++ b/net/sched/sch_mqprio.c
+@@ -124,7 +124,7 @@ static int mqprio_init(struct Qdisc *sch
+ 
+ 	for (i = 0; i < dev->num_tx_queues; i++) {
+ 		dev_queue = netdev_get_tx_queue(dev, i);
+-		qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(i + 1)));
+ 		if (qdisc == NULL) {
diff --git a/trunk/target/linux/generic/patches-3.10/663-remove_pfifo_fast.patch b/trunk/target/linux/generic/patches-3.10/663-remove_pfifo_fast.patch
new file mode 100644
index 00000000..36f11ced
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/663-remove_pfifo_fast.patch
@@ -0,0 +1,144 @@
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -392,141 +392,6 @@ static struct Qdisc noqueue_qdisc = {
+ 	.busylock	=	__SPIN_LOCK_UNLOCKED(noqueue_qdisc.busylock),
+ };
+ 
+-
+-static const u8 prio2band[TC_PRIO_MAX + 1] = {
+-	1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
+-};
+-
+-/* 3-band FIFO queue: old style, but should be a bit faster than
+-   generic prio+fifo combination.
+- */
+-
+-#define PFIFO_FAST_BANDS 3
+-
+-/*
+- * Private data for a pfifo_fast scheduler containing:
+- * 	- queues for the three band
+- * 	- bitmap indicating which of the bands contain skbs
+- */
+-struct pfifo_fast_priv {
+-	u32 bitmap;
+-	struct sk_buff_head q[PFIFO_FAST_BANDS];
+-};
+-
+-/*
+- * Convert a bitmap to the first band number where an skb is queued, where:
+- * 	bitmap=0 means there are no skbs on any band.
+- * 	bitmap=1 means there is an skb on band 0.
+- *	bitmap=7 means there are skbs on all 3 bands, etc.
+- */
+-static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
+-
+-static inline struct sk_buff_head *band2list(struct pfifo_fast_priv *priv,
+-					     int band)
+-{
+-	return priv->q + band;
+-}
+-
+-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc)
+-{
+-	if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
+-		int band = prio2band[skb->priority & TC_PRIO_MAX];
+-		struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		priv->bitmap |= (1 << band);
+-		qdisc->q.qlen++;
+-		return __qdisc_enqueue_tail(skb, qdisc, list);
+-	}
+-
+-	return qdisc_drop(skb, qdisc);
+-}
+-
+-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (likely(band >= 0)) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-		struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
+-
+-		qdisc->q.qlen--;
+-		if (skb_queue_empty(list))
+-			priv->bitmap &= ~(1 << band);
+-
+-		return skb;
+-	}
+-
+-	return NULL;
+-}
+-
+-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (band >= 0) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		return skb_peek(list);
+-	}
+-
+-	return NULL;
+-}
+-
+-static void pfifo_fast_reset(struct Qdisc *qdisc)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		__qdisc_reset_queue(qdisc, band2list(priv, prio));
+-
+-	priv->bitmap = 0;
+-	qdisc->qstats.backlog = 0;
+-	qdisc->q.qlen = 0;
+-}
+-
+-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
+-{
+-	struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
+-
+-	memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
+-	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
+-		goto nla_put_failure;
+-	return skb->len;
+-
+-nla_put_failure:
+-	return -1;
+-}
+-
+-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		skb_queue_head_init(band2list(priv, prio));
+-
+-	/* Can by-pass the queue discipline */
+-	qdisc->flags |= TCQ_F_CAN_BYPASS;
+-	return 0;
+-}
+-
+-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
+-	.id		=	"pfifo_fast",
+-	.priv_size	=	sizeof(struct pfifo_fast_priv),
+-	.enqueue	=	pfifo_fast_enqueue,
+-	.dequeue	=	pfifo_fast_dequeue,
+-	.peek		=	pfifo_fast_peek,
+-	.init		=	pfifo_fast_init,
+-	.reset		=	pfifo_fast_reset,
+-	.dump		=	pfifo_fast_dump,
+-	.owner		=	THIS_MODULE,
+-};
+-EXPORT_SYMBOL(pfifo_fast_ops);
+-
+ static struct lock_class_key qdisc_tx_busylock;
+ 
+ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
diff --git a/trunk/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/trunk/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
new file mode 100644
index 00000000..783a421b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -0,0 +1,481 @@
+From 775d6fe74d1eaec2ba387535b068dde2dc89de9e Mon Sep 17 00:00:00 2001
+From: Steven Barth <steven@midlink.org>
+Date: Thu, 22 May 2014 09:49:05 +0200
+Subject: [PATCH] Add support for MAP-E FMRs (mesh mode)
+
+MAP-E FMRs (draft-ietf-softwire-map-10) are rules for IPv4-communication
+between MAP CEs (mesh mode) without the need to forward such data to a
+border relay. This is similar to how 6rd works but for IPv4 over IPv6.
+
+Signed-off-by: Steven Barth <cyrus@openwrt.org>
+---
+ include/net/ip6_tunnel.h       |  13 ++
+ include/uapi/linux/if_tunnel.h |  13 ++
+ net/ipv6/ip6_tunnel.c          | 276 +++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 291 insertions(+), 11 deletions(-)
+
+--- a/include/net/ip6_tunnel.h
++++ b/include/net/ip6_tunnel.h
+@@ -15,6 +15,18 @@
+ /* determine capability on a per-packet basis */
+ #define IP6_TNL_F_CAP_PER_PACKET 0x40000
+ 
++/* IPv6 tunnel FMR */
++struct __ip6_tnl_fmr {
++	struct __ip6_tnl_fmr *next; /* next fmr in list */
++	struct in6_addr ip6_prefix;
++	struct in_addr ip4_prefix;
++
++	__u8 ip6_prefix_len;
++	__u8 ip4_prefix_len;
++	__u8 ea_len;
++	__u8 offset;
++};
++
+ struct __ip6_tnl_parm {
+ 	char name[IFNAMSIZ];	/* name of tunnel device */
+ 	int link;		/* ifindex of underlying L2 interface */
+@@ -25,6 +37,7 @@ struct __ip6_tnl_parm {
+ 	__u32 flags;		/* tunnel flags */
+ 	struct in6_addr laddr;	/* local tunnel end-point address */
+ 	struct in6_addr raddr;	/* remote tunnel end-point address */
++	struct __ip6_tnl_fmr *fmrs;	/* FMRs */
+ 
+ 	__be16			i_flags;
+ 	__be16			o_flags;
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -53,10 +53,23 @@ enum {
+ 	IFLA_IPTUN_6RD_RELAY_PREFIX,
+ 	IFLA_IPTUN_6RD_PREFIXLEN,
+ 	IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
++	IFLA_IPTUN_FMRS,
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+ 
++enum {
++	IFLA_IPTUN_FMR_UNSPEC,
++	IFLA_IPTUN_FMR_IP6_PREFIX,
++	IFLA_IPTUN_FMR_IP4_PREFIX,
++	IFLA_IPTUN_FMR_IP6_PREFIX_LEN,
++	IFLA_IPTUN_FMR_IP4_PREFIX_LEN,
++	IFLA_IPTUN_FMR_EA_LEN,
++	IFLA_IPTUN_FMR_OFFSET,
++	__IFLA_IPTUN_FMR_MAX,
++};
++#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1)
++
+ /* SIT-mode i_flags */
+ #define	SIT_ISATAP	0x0001
+ 
+--- a/net/ipv6/ip6_tunnel.c
++++ b/net/ipv6/ip6_tunnel.c
+@@ -16,6 +16,8 @@
+  *      as published by the Free Software Foundation; either version
+  *      2 of the License, or (at your option) any later version.
+  *
++ *	Changes:
++ * Steven Barth <cyrus@openwrt.org>:		MAP-E FMR support
+  */
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+@@ -80,11 +82,9 @@ static bool log_ecn_error = true;
+ module_param(log_ecn_error, bool, 0644);
+ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
+ 
+-static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
++static u32 HASH(const struct in6_addr *addr)
+ {
+-	u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2);
+-
+-	return hash_32(hash, HASH_SIZE_SHIFT);
++	return hash_32(ipv6_addr_hash(addr), HASH_SIZE_SHIFT);
+ }
+ 
+ static int ip6_tnl_dev_init(struct net_device *dev);
+@@ -173,15 +173,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store);
+ static struct ip6_tnl *
+ ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
+ {
+-	unsigned int hash = HASH(remote, local);
++	unsigned int hash = HASH(local);
+ 	struct ip6_tnl *t;
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
+-		if (ipv6_addr_equal(local, &t->parms.laddr) &&
+-		    ipv6_addr_equal(remote, &t->parms.raddr) &&
+-		    (t->dev->flags & IFF_UP))
++		if (!ipv6_addr_equal(local, &t->parms.laddr) ||
++				!(t->dev->flags & IFF_UP))
++			continue;
++
++		if (ipv6_addr_equal(remote, &t->parms.raddr))
+ 			return t;
++
++		for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++			if (ipv6_prefix_equal(remote, &fmr->ip6_prefix,
++					fmr->ip6_prefix_len))
++				return t;
++		}
+ 	}
+ 	t = rcu_dereference(ip6n->tnls_wc[0]);
+ 	if (t && (t->dev->flags & IFF_UP))
+@@ -211,7 +220,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
+ 
+ 	if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
+ 		prio = 1;
+-		h = HASH(remote, local);
++		h = HASH(local);
+ 	}
+ 	return &ip6n->tnls[prio][h];
+ }
+@@ -378,6 +387,12 @@ ip6_tnl_dev_uninit(struct net_device *de
+ 	struct net *net = dev_net(dev);
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
+ 
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++
+ 	if (dev == ip6n->fb_tnl_dev)
+ 		RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
+ 	else
+@@ -761,6 +776,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+ }
+ EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
+ 
++
++/**
++ * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR
++ *   @dest: destination IPv6 address buffer
++ *   @skb: received socket buffer
++ *   @fmr: MAP FMR
++ *   @xmit: Calculate for xmit or rcv
++ **/
++static void ip4ip6_fmr_calc(struct in6_addr *dest,
++		const struct iphdr *iph, const uint8_t *end,
++		const struct __ip6_tnl_fmr *fmr, bool xmit)
++{
++	int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len);
++	u8 *portp = NULL;
++	bool use_dest_addr;
++	const struct iphdr *dsth = iph;
++
++	if ((u8*)dsth >= end)
++		return;
++
++	/* find significant IP header */
++	if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++		if (ih && ((u8*)&ih[1]) <= end && (
++			ih->type == ICMP_DEST_UNREACH ||
++			ih->type == ICMP_SOURCE_QUENCH ||
++			ih->type == ICMP_TIME_EXCEEDED ||
++			ih->type == ICMP_PARAMETERPROB ||
++			ih->type == ICMP_REDIRECT))
++				dsth = (const struct iphdr*)&ih[1];
++	}
++
++	/* in xmit-path use dest port by default and source port only if
++		this is an ICMP reply to something else; vice versa in rcv-path */
++	use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph);
++
++	/* get dst port */
++	if (((u8*)&dsth[1]) <= end && (
++		dsth->protocol == IPPROTO_UDP ||
++		dsth->protocol == IPPROTO_TCP ||
++		dsth->protocol == IPPROTO_SCTP ||
++		dsth->protocol == IPPROTO_DCCP)) {
++			/* for UDP, TCP, SCTP and DCCP source and dest port
++			follow IPv4 header directly */
++			portp = ((u8*)dsth) + dsth->ihl * 4;
++
++			if (use_dest_addr)
++				portp += sizeof(u16);
++	} else if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++
++		/* use icmp identifier as port */
++		if (((u8*)&ih) <= end && (
++		    (use_dest_addr && (
++		    ih->type == ICMP_ECHOREPLY ||
++			ih->type == ICMP_TIMESTAMPREPLY ||
++			ih->type == ICMP_INFO_REPLY ||
++			ih->type == ICMP_ADDRESSREPLY)) ||
++			(!use_dest_addr && (
++			ih->type == ICMP_ECHO ||
++			ih->type == ICMP_TIMESTAMP ||
++			ih->type == ICMP_INFO_REQUEST ||
++			ih->type == ICMP_ADDRESS)
++			)))
++				portp = (u8*)&ih->un.echo.id;
++	}
++
++	if ((portp && &portp[2] <= end) || psidlen == 0) {
++		int frombyte = fmr->ip6_prefix_len / 8;
++		int fromrem = fmr->ip6_prefix_len % 8;
++		int bytes = sizeof(struct in6_addr) - frombyte;
++		const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr;
++		u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len);
++		u64 t = 0;
++
++		/* extract PSID from port and add it to eabits */
++		u16 psidbits = 0;
++		if (psidlen > 0) {
++			psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]);
++			psidbits >>= 16 - psidlen - fmr->offset;
++			psidbits = (u16)(psidbits << (16 - psidlen));
++			eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen));
++		}
++
++		/* rewrite destination address */
++		*dest = fmr->ip6_prefix;
++		memcpy(&dest->s6_addr[10], addr, sizeof(*addr));
++		dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen));
++
++		if (bytes > sizeof(u64))
++			bytes = sizeof(u64);
++
++		/* insert eabits */
++		memcpy(&t, &dest->s6_addr[frombyte], bytes);
++		t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1)
++			<< (64 - fmr->ea_len - fromrem));
++		t = cpu_to_be64(t | (eabits >> fromrem));
++		memcpy(&dest->s6_addr[frombyte], &t, bytes);
++	}
++}
++
++
+ /**
+  * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally
+  *   @skb: received socket buffer
+@@ -807,6 +924,26 @@ static int ip6_tnl_rcv(struct sk_buff *s
+ 		skb->protocol = htons(protocol);
+ 		skb->pkt_type = PACKET_HOST;
+ 		memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
++		if (protocol == ETH_P_IP &&
++			!ipv6_addr_equal(&ipv6h->saddr, &t->parms.raddr)) {
++				/* Packet didn't come from BR, so lookup FMR */
++				struct __ip6_tnl_fmr *fmr;
++				struct in6_addr expected = t->parms.raddr;
++				for (fmr = t->parms.fmrs; fmr; fmr = fmr->next)
++					if (ipv6_prefix_equal(&ipv6h->saddr,
++						&fmr->ip6_prefix, fmr->ip6_prefix_len))
++							break;
++
++				/* Check that IPv6 matches IPv4 source to prevent spoofing */
++				if (fmr)
++					ip4ip6_fmr_calc(&expected, ip_hdr(skb),
++							skb_tail_pointer(skb), fmr, false);
++
++				if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) {
++					rcu_read_unlock();
++					goto discard;
++				}
++		}
+ 
+ 		__skb_tunnel_rx(skb, t->dev);
+ 
+@@ -1058,6 +1195,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	__u8 dsfield;
+ 	__u32 mtu;
+ 	int err;
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
+ 	    !ip6_tnl_xmit_ctl(t))
+@@ -1077,6 +1215,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
+ 		fl6.flowi6_mark = skb->mark;
+ 
++	/* try to find matching FMR */
++	for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++		unsigned mshift = 32 - fmr->ip4_prefix_len;
++		if (ntohl(fmr->ip4_prefix.s_addr) >> mshift ==
++				ntohl(iph->daddr) >> mshift)
++			break;
++	}
++
++	/* change dstaddr according to FMR */
++	if (fmr)
++		ip4ip6_fmr_calc(&fl6.daddr, iph, skb_tail_pointer(skb), fmr, true);
++
+ 	err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
+ 	if (err != 0) {
+ 		/* XXX: send ICMP error even if DF is not set. */
+@@ -1245,6 +1395,14 @@ ip6_tnl_change(struct ip6_tnl *t, const 
+ 	t->parms.flowinfo = p->flowinfo;
+ 	t->parms.link = p->link;
+ 	t->parms.proto = p->proto;
++
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++	t->parms.fmrs = p->fmrs;
++
+ 	ip6_tnl_dst_reset(t);
+ 	ip6_tnl_link_config(t);
+ 	return 0;
+@@ -1275,6 +1433,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+ 	p->flowinfo = u->flowinfo;
+ 	p->link = u->link;
+ 	p->proto = u->proto;
++	p->fmrs = NULL;
+ 	memcpy(p->name, u->name, sizeof(u->name));
+ }
+ 
+@@ -1544,6 +1703,15 @@ static int ip6_tnl_validate(struct nlatt
+ 	return 0;
+ }
+ 
++static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = {
++	[IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) },
++	[IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) },
++	[IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 }
++};
++
+ static void ip6_tnl_netlink_parms(struct nlattr *data[],
+ 				  struct __ip6_tnl_parm *parms)
+ {
+@@ -1577,6 +1745,46 @@ static void ip6_tnl_netlink_parms(struct
+ 
+ 	if (data[IFLA_IPTUN_PROTO])
+ 		parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
++
++	if (data[IFLA_IPTUN_FMRS]) {
++		unsigned rem;
++		struct nlattr *fmr;
++		nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) {
++			struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c;
++			struct __ip6_tnl_fmr *nfmr;
++
++			nla_parse_nested(fmrd, IFLA_IPTUN_FMR_MAX,
++				fmr, ip6_tnl_fmr_policy);
++
++			if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL)))
++				continue;
++
++			nfmr->offset = 6;
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX]))
++				nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX],
++					sizeof(nfmr->ip6_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX]))
++				nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX],
++					sizeof(nfmr->ip4_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN]))
++				nfmr->ip6_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN]))
++				nfmr->ip4_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN]))
++				nfmr->ea_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET]))
++				nfmr->offset = nla_get_u8(c);
++
++			nfmr->next = parms->fmrs;
++			parms->fmrs = nfmr;
++		}
++	}
+ }
+ 
+ static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
+@@ -1629,6 +1837,12 @@ static void ip6_tnl_dellink(struct net_d
+ 
+ static size_t ip6_tnl_get_size(const struct net_device *dev)
+ {
++	const struct ip6_tnl *t = netdev_priv(dev);
++	struct __ip6_tnl_fmr *c;
++	int fmrs = 0;
++	for (c = t->parms.fmrs; c; c = c->next)
++		++fmrs;
++
+ 	return
+ 		/* IFLA_IPTUN_LINK */
+ 		nla_total_size(4) +
+@@ -1646,6 +1860,24 @@ static size_t ip6_tnl_get_size(const str
+ 		nla_total_size(4) +
+ 		/* IFLA_IPTUN_PROTO */
+ 		nla_total_size(1) +
++		/* IFLA_IPTUN_FMRS */
++		nla_total_size(0) +
++		(
++			/* nest */
++			nla_total_size(0) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX */
++			nla_total_size(sizeof(struct in6_addr)) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX */
++			nla_total_size(sizeof(struct in_addr)) +
++			/* IFLA_IPTUN_FMR_EA_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_OFFSET */
++			nla_total_size(1)
++		) * fmrs +
+ 		0;
+ }
+ 
+@@ -1653,6 +1885,9 @@ static int ip6_tnl_fill_info(struct sk_b
+ {
+ 	struct ip6_tnl *tunnel = netdev_priv(dev);
+ 	struct __ip6_tnl_parm *parm = &tunnel->parms;
++	struct __ip6_tnl_fmr *c;
++	int fmrcnt = 0;
++	struct nlattr *fmrs;
+ 
+ 	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
+ 	    nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
+@@ -1663,8 +1898,27 @@ static int ip6_tnl_fill_info(struct sk_b
+ 	    nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
+ 	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
+ 	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
+-	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto))
++	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
++	    !(fmrs = nla_nest_start(skb, IFLA_IPTUN_FMRS)))
+ 		goto nla_put_failure;
++
++	for (c = parm->fmrs; c; c = c->next) {
++		struct nlattr *fmr = nla_nest_start(skb, ++fmrcnt);
++		if (!fmr ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX,
++				sizeof(c->ip6_prefix), &c->ip6_prefix) ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX,
++				sizeof(c->ip4_prefix), &c->ip4_prefix) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset))
++				goto nla_put_failure;
++
++		nla_nest_end(skb, fmr);
++	}
++	nla_nest_end(skb, fmrs);
++
+ 	return 0;
+ 
+ nla_put_failure:
+@@ -1680,6 +1934,7 @@ static const struct nla_policy ip6_tnl_p
+ 	[IFLA_IPTUN_FLOWINFO]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_FLAGS]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_PROTO]		= { .type = NLA_U8 },
++	[IFLA_IPTUN_FMRS]		= { .type = NLA_NESTED },
+ };
+ 
+ static struct rtnl_link_ops ip6_link_ops __read_mostly = {
diff --git a/trunk/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/trunk/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
new file mode 100644
index 00000000..cb3839fc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -0,0 +1,233 @@
+--- a/include/net/netns/ipv6.h
++++ b/include/net/netns/ipv6.h
+@@ -55,6 +55,7 @@ struct netns_ipv6 {
+ 	unsigned long		 ip6_rt_last_gc;
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	struct rt6_info         *ip6_prohibit_entry;
++	struct rt6_info		*ip6_failed_policy_entry;
+ 	struct rt6_info         *ip6_blk_hole_entry;
+ 	struct fib6_table       *fib6_local_tbl;
+ 	struct fib_rules_ops    *fib6_rules_ops;
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -64,6 +64,10 @@ enum {
+ 	FR_ACT_BLACKHOLE,	/* Drop without notification */
+ 	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
+ 	FR_ACT_PROHIBIT,	/* Drop with EACCES */
++	FR_ACT_RES9,
++	FR_ACT_RES10,
++	FR_ACT_RES11,
++	FR_ACT_FAILED_POLICY,	/* Drop with EPERM */
+ 	__FR_ACT_MAX,
+ };
+ 
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -203,6 +203,7 @@ enum {
+ 	RTN_THROW,		/* Not in this table		*/
+ 	RTN_NAT,		/* Translate this address	*/
+ 	RTN_XRESOLVE,		/* Use external resolver	*/
++	RTN_FAILED_POLICY,	/* Failed ingress/egress policy */
+ 	__RTN_MAX
+ };
+ 
+--- a/net/ipv4/fib_rules.c
++++ b/net/ipv4/fib_rules.c
+@@ -84,6 +84,10 @@ static int fib4_rule_action(struct fib_r
+ 		err = -EACCES;
+ 		goto errout;
+ 
++	case FR_ACT_FAILED_POLICY:
++		err = -EPERM;
++		goto errout;
++
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+ 		err = -EINVAL;
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX 
+ 		.error	= -EINVAL,
+ 		.scope	= RT_SCOPE_NOWHERE,
+ 	},
++	[RTN_FAILED_POLICY] = {
++		.error	= -EPERM,
++		.scope	= RT_SCOPE_UNIVERSE,
++	},
+ };
+ 
+ static void rt_fibinfo_free(struct rtable __rcu **rtp)
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2331,6 +2331,7 @@ static const char *const rtn_type_names[
+ 	[RTN_THROW] = "THROW",
+ 	[RTN_NAT] = "NAT",
+ 	[RTN_XRESOLVE] = "XRESOLVE",
++	[RTN_FAILED_POLICY] = "FAILED_POLICY",
+ };
+ 
+ static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
+--- a/net/ipv4/ipmr.c
++++ b/net/ipv4/ipmr.c
+@@ -184,6 +184,7 @@ static int ipmr_rule_action(struct fib_r
+ 	case FR_ACT_UNREACHABLE:
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
++	case FR_ACT_FAILED_POLICY:
+ 		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+--- a/net/ipv6/fib6_rules.c
++++ b/net/ipv6/fib6_rules.c
+@@ -69,6 +69,9 @@ static int fib6_rule_action(struct fib_r
+ 	case FR_ACT_PROHIBIT:
+ 		rt = net->ipv6.ip6_prohibit_entry;
+ 		goto discard_pkt;
++	case FR_ACT_FAILED_POLICY:
++		rt = net->ipv6.ip6_failed_policy_entry;
++		goto discard_pkt;
+ 	}
+ 
+ 	table = fib6_get_table(net, rule->table);
+--- a/net/ipv6/ip6mr.c
++++ b/net/ipv6/ip6mr.c
+@@ -169,6 +169,8 @@ static int ip6mr_rule_action(struct fib_
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
+ 		return -EACCES;
++	case FR_ACT_FAILED_POLICY:
++		return -EPERM;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+ 		return -EINVAL;
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -250,6 +250,24 @@ static const struct rt6_info ip6_prohibi
+ 	.rt6i_ref	= ATOMIC_INIT(1),
+ };
+ 
++static int ip6_pkt_failed_policy(struct sk_buff *skb);
++static int ip6_pkt_failed_policy_out(struct sk_buff *skb);
++
++static const struct rt6_info ip6_failed_policy_entry_template = {
++	.dst = {
++		.__refcnt	= ATOMIC_INIT(1),
++		.__use		= 1,
++		.obsolete	= DST_OBSOLETE_FORCE_CHK,
++		.error		= -EPERM,
++		.input		= ip6_pkt_failed_policy,
++		.output		= ip6_pkt_failed_policy_out,
++	},
++	.rt6i_flags	= (RTF_REJECT | RTF_NONEXTHOP),
++	.rt6i_protocol	= RTPROT_KERNEL,
++	.rt6i_metric	= ~(u32) 0,
++	.rt6i_ref	= ATOMIC_INIT(1),
++};
++
+ static const struct rt6_info ip6_blk_hole_entry_template = {
+ 	.dst = {
+ 		.__refcnt	= ATOMIC_INIT(1),
+@@ -1510,6 +1528,11 @@ int ip6_route_add(struct fib6_config *cf
+ 			rt->dst.output = ip6_pkt_prohibit_out;
+ 			rt->dst.input = ip6_pkt_prohibit;
+ 			break;
++		case RTN_FAILED_POLICY:
++			rt->dst.error = -EPERM;
++			rt->dst.output = ip6_pkt_failed_policy_out;
++			rt->dst.input = ip6_pkt_failed_policy;
++			break;
+ 		case RTN_THROW:
+ 		default:
+ 			rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN
+@@ -2089,6 +2112,17 @@ static int ip6_pkt_prohibit_out(struct s
+ 	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
+ }
+ 
++static int ip6_pkt_failed_policy(struct sk_buff *skb)
++{
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES);
++}
++
++static int ip6_pkt_failed_policy_out(struct sk_buff *skb)
++{
++	skb->dev = skb_dst(skb)->dev;
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES);
++}
++
+ /*
+  *	Allocate a dst for local (unicast / anycast) address.
+  */
+@@ -2291,7 +2325,8 @@ static int rtm_to_fib6_config(struct sk_
+ 	if (rtm->rtm_type == RTN_UNREACHABLE ||
+ 	    rtm->rtm_type == RTN_BLACKHOLE ||
+ 	    rtm->rtm_type == RTN_PROHIBIT ||
+-	    rtm->rtm_type == RTN_THROW)
++	    rtm->rtm_type == RTN_THROW ||
++	    rtm->rtm_type == RTN_FAILED_POLICY)
+ 		cfg->fc_flags |= RTF_REJECT;
+ 
+ 	if (rtm->rtm_type == RTN_LOCAL)
+@@ -2493,6 +2528,9 @@ static int rt6_fill_node(struct net *net
+ 		case -EACCES:
+ 			rtm->rtm_type = RTN_PROHIBIT;
+ 			break;
++		case -EPERM:
++			rtm->rtm_type = RTN_FAILED_POLICY;
++			break;
+ 		case -EAGAIN:
+ 			rtm->rtm_type = RTN_THROW;
+ 			break;
+@@ -2743,6 +2781,8 @@ static int ip6_route_dev_notify(struct n
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
+ 		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
++		net->ipv6.ip6_failed_policy_entry->dst.dev = dev;
++		net->ipv6.ip6_failed_policy_entry->rt6i_idev = in6_dev_get(dev);
+ 		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
+ 		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
+ #endif
+@@ -3003,6 +3043,17 @@ static int __net_init ip6_route_net_init
+ 	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
+ 	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
+ 			 ip6_template_metrics, true);
++
++	net->ipv6.ip6_failed_policy_entry =
++		kmemdup(&ip6_failed_policy_entry_template,
++			sizeof(*net->ipv6.ip6_failed_policy_entry), GFP_KERNEL);
++	if (!net->ipv6.ip6_failed_policy_entry)
++		goto out_ip6_blk_hole_entry;
++	net->ipv6.ip6_failed_policy_entry->dst.path =
++		(struct dst_entry *)net->ipv6.ip6_failed_policy_entry;
++	net->ipv6.ip6_failed_policy_entry->dst.ops = &net->ipv6.ip6_dst_ops;
++	dst_init_metrics(&net->ipv6.ip6_failed_policy_entry->dst,
++			 ip6_template_metrics, true);
+ #endif
+ 
+ 	net->ipv6.sysctl.flush_delay = 0;
+@@ -3021,6 +3072,8 @@ out:
+ 	return ret;
+ 
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
++out_ip6_blk_hole_entry:
++	kfree(net->ipv6.ip6_blk_hole_entry);
+ out_ip6_prohibit_entry:
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ out_ip6_null_entry:
+@@ -3038,6 +3091,7 @@ static void __net_exit ip6_route_net_exi
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ 	kfree(net->ipv6.ip6_blk_hole_entry);
++	kfree(net->ipv6.ip6_failed_policy_entry);
+ #endif
+ 	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
+ }
+@@ -3134,6 +3188,9 @@ int __init ip6_route_init(void)
+ 	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
+ 	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
+ 	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
++	init_net.ipv6.ip6_failed_policy_entry->dst.dev = init_net.loopback_dev;
++	init_net.ipv6.ip6_failed_policy_entry->rt6i_idev =
++		in6_dev_get(init_net.loopback_dev);
+   #endif
+ 	ret = fib6_init();
+ 	if (ret)
diff --git a/trunk/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch b/trunk/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch
new file mode 100644
index 00000000..467ca00f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch
@@ -0,0 +1,25 @@
+From de03a7f8eddba389668e3c35d4a31d985d29778f Mon Sep 17 00:00:00 2001
+From: Tom Herbert <therbert@google.com>
+Date: Mon, 29 Jul 2013 11:07:36 -0700
+Subject: [PATCH 3/5] flow_dissector: clean up IPIP case
+
+Explicitly set proto to ETH_P_IP and jump directly to ip processing.
+
+Signed-off-by: Tom Herbert <therbert@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/core/flow_dissector.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/net/core/flow_dissector.c
++++ b/net/core/flow_dissector.c
+@@ -139,7 +139,8 @@ ipv6:
+ 		break;
+ 	}
+ 	case IPPROTO_IPIP:
+-		goto again;
++		proto = htons(ETH_P_IP);
++		goto ip;
+ 	default:
+ 		break;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch b/trunk/target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch
new file mode 100644
index 00000000..8c807d89
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/687-flow_dissector-add-support-for-IPPROTO_IPV6.patch
@@ -0,0 +1,25 @@
+From 9c60237cd842c337539b1d72582b8cc410aeb3a6 Mon Sep 17 00:00:00 2001
+From: Tom Herbert <therbert@google.com>
+Date: Mon, 29 Jul 2013 11:07:42 -0700
+Subject: [PATCH 4/5] flow_dissector: add support for IPPROTO_IPV6
+
+Support IPPROTO_IPV6 similar to IPPROTO_IPIP
+
+Signed-off-by: Tom Herbert <therbert@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/core/flow_dissector.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/net/core/flow_dissector.c
++++ b/net/core/flow_dissector.c
+@@ -141,6 +141,9 @@ ipv6:
+ 	case IPPROTO_IPIP:
+ 		proto = htons(ETH_P_IP);
+ 		goto ip;
++	case IPPROTO_IPV6:
++		proto = htons(ETH_P_IPV6);
++		goto ipv6;
+ 	default:
+ 		break;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch b/trunk/target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch
new file mode 100644
index 00000000..e020d61b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/688-net-flow_dissector-add-802.1ad-support.patch
@@ -0,0 +1,24 @@
+From 017879b546ee5f85d13f90236a251d56605c9e86 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Tue, 6 Aug 2013 04:35:06 -0700
+Subject: [PATCH 5/5] net: flow_dissector: add 802.1ad support
+
+Same behavior than 802.1q : finds the encapsulated protocol and
+skip 32bit header.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/core/flow_dissector.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/core/flow_dissector.c
++++ b/net/core/flow_dissector.c
+@@ -65,6 +65,7 @@ ipv6:
+ 		nhoff += sizeof(struct ipv6hdr);
+ 		break;
+ 	}
++	case __constant_htons(ETH_P_8021AD):
+ 	case __constant_htons(ETH_P_8021Q): {
+ 		const struct vlan_hdr *vlan;
+ 		struct vlan_hdr _vlan;
diff --git a/trunk/target/linux/generic/patches-3.10/700-swconfig.patch b/trunk/target/linux/generic/patches-3.10/700-swconfig.patch
new file mode 100644
index 00000000..d7eb1b07
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/700-swconfig.patch
@@ -0,0 +1,39 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,16 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config SWCONFIG
++	tristate "Switch configuration API"
++	---help---
++	  Switch configuration API using netlink. This allows
++	  you to configure the VLAN features of certain switches.
++
++config SWCONFIG_LEDS
++	bool "Switch LED trigger support"
++	depends on (SWCONFIG && LEDS_TRIGGERS)
++
+ comment "MII PHY device drivers"
+ 
+ config AT803X_PHY
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -3,6 +3,7 @@
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
++obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
+ obj-$(CONFIG_CICADA_PHY)	+= cicada.o
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -361,6 +361,7 @@ header-y += stddef.h
+ header-y += string.h
+ header-y += suspend_ioctls.h
+ header-y += swab.h
++header-y += switch.h
+ header-y += synclink.h
+ header-y += sysctl.h
+ header-y += sysinfo.h
diff --git a/trunk/target/linux/generic/patches-3.10/701-phy_extension.patch b/trunk/target/linux/generic/patches-3.10/701-phy_extension.patch
new file mode 100644
index 00000000..3284f25e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/701-phy_extension.patch
@@ -0,0 +1,63 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -301,6 +301,50 @@ int phy_ethtool_gset(struct phy_device *
+ }
+ EXPORT_SYMBOL(phy_ethtool_gset);
+ 
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
++{
++	u32 cmd;
++	int tmp;
++	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
++	struct ethtool_value edata = { ETHTOOL_GLINK };
++
++	if (get_user(cmd, (u32 *) useraddr))
++		return -EFAULT;
++
++	switch (cmd) {
++	case ETHTOOL_GSET:
++		phy_ethtool_gset(phydev, &ecmd);
++		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
++			return -EFAULT;
++		return 0;
++
++	case ETHTOOL_SSET:
++		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
++			return -EFAULT;
++		return phy_ethtool_sset(phydev, &ecmd);
++
++	case ETHTOOL_NWAY_RST:
++		/* if autoneg is off, it's an error */
++		tmp = phy_read(phydev, MII_BMCR);
++		if (tmp & BMCR_ANENABLE) {
++			tmp |= (BMCR_ANRESTART);
++			phy_write(phydev, MII_BMCR, tmp);
++			return 0;
++		}
++		return -EINVAL;
++
++	case ETHTOOL_GLINK:
++		edata.data = (phy_read(phydev,
++				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
++		if (copy_to_user(useraddr, &edata, sizeof(edata)))
++			return -EFAULT;
++		return 0;
++	}
++
++	return -EOPNOTSUPP;
++}
++EXPORT_SYMBOL(phy_ethtool_ioctl);
++
+ /**
+  * phy_mii_ioctl - generic PHY MII ioctl interface
+  * @phydev: the phy_device struct
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -550,6 +550,7 @@ void phy_start_machine(struct phy_device
+ void phy_stop_machine(struct phy_device *phydev);
+ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
+ int phy_mii_ioctl(struct phy_device *phydev,
+ 		struct ifreq *ifr, int cmd);
+ int phy_start_interrupts(struct phy_device *phydev);
diff --git a/trunk/target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch b/trunk/target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch
new file mode 100644
index 00000000..e802b0bf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,45 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -408,9 +408,18 @@ struct phy_driver {
+ 	 */
+ 	int (*config_aneg)(struct phy_device *phydev);
+ 
++	/* Determine if autonegotiation is done */
++	int (*aneg_done)(struct phy_device *phydev);
++
+ 	/* Determines the negotiated speed and duplex */
+ 	int (*read_status)(struct phy_device *phydev);
+ 
++	/* 
++	 * Update the value in phydev->link to reflect the 
++	 * current link value
++	 */
++	int (*update_link)(struct phy_device *phydev);
++
+ 	/* Clears any pending interrupts */
+ 	int (*ack_interrupt)(struct phy_device *phydev);
+ 
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -795,6 +795,9 @@ int genphy_update_link(struct phy_device
+ {
+ 	int status;
+ 
++	if (phydev->drv->update_link)
++		return phydev->drv->update_link(phydev);
++
+ 	/* Do a fake read */
+ 	status = phy_read(phydev, MII_BMSR);
+ 
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -108,6 +108,9 @@ static inline int phy_aneg_done(struct p
+ {
+ 	int retval;
+ 
++	if (phydev->drv->aneg_done)
++		return phydev->drv->aneg_done(phydev);
++
+ 	retval = phy_read(phydev, MII_BMSR);
+ 
+ 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/trunk/target/linux/generic/patches-3.10/703-phy-add-detach-callback-to-struct-phy_driver.patch b/trunk/target/linux/generic/patches-3.10/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 00000000..5d178e62
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -612,6 +612,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++	if (phydev->drv && phydev->drv->detach)
++		phydev->drv->detach(phydev);
++
+ 	phydev->attached_dev->phydev = NULL;
+ 	phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+ 	 */
+ 	int (*did_interrupt)(struct phy_device *phydev);
+ 
++	/*
++	 * Called before an ethernet device is detached
++	 * from the PHY.
++	 */
++	void (*detach)(struct phy_device *phydev);
++
+ 	/* Clears up any memory if needed */
+ 	void (*remove)(struct phy_device *phydev);
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/710-phy-add-mdio_register_board_info.patch b/trunk/target/linux/generic/patches-3.10/710-phy-add-mdio_register_board_info.patch
new file mode 100644
index 00000000..b4006e47
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/710-phy-add-mdio_register_board_info.patch
@@ -0,0 +1,191 @@
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -41,6 +41,8 @@
+ #include <asm/irq.h>
+ #include <asm/uaccess.h>
+ 
++#include "mdio-boardinfo.h"
++
+ /**
+  * mdiobus_alloc_size - allocate a mii_bus structure
+  * @size: extra amount of memory to allocate for private storage.
+@@ -229,15 +231,33 @@ void mdiobus_free(struct mii_bus *bus)
+ }
+ EXPORT_SYMBOL(mdiobus_free);
+ 
++static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus,
++						struct phy_device *phydev,
++						struct mdio_board_info *bi)
++{
++	if (strcmp(bus->id, bi->bus_id) ||
++	    bi->phy_addr != phydev->addr)
++	    return;
++
++	phydev->dev.platform_data = (void *) bi->platform_data;
++}
++
+ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
+ {
+ 	struct phy_device *phydev;
++	struct mdio_board_entry *be;
+ 	int err;
+ 
+ 	phydev = get_phy_device(bus, addr, false);
+ 	if (IS_ERR(phydev) || phydev == NULL)
+ 		return phydev;
+ 
++	mutex_lock(&__mdio_board_lock);
++	list_for_each_entry(be, &__mdio_board_list, list)
++		mdiobus_setup_phydev_from_boardinfo(bus, phydev,
++						    &be->board_info);
++	mutex_unlock(&__mdio_board_lock);
++
+ 	err = phy_device_register(phydev);
+ 	if (err) {
+ 		phy_device_free(phydev);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -591,4 +591,22 @@ int __init mdio_bus_init(void);
+ void mdio_bus_exit(void);
+ 
+ extern struct bus_type mdio_bus_type;
++
++struct mdio_board_info {
++	const char	*bus_id;
++	int		phy_addr;
++
++	const void	*platform_data;
++};
++
++#ifdef CONFIG_MDIO_BOARDINFO
++int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n);
++#else
++static inline int
++mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n)
++{
++	return 0;
++}
++#endif
++
+ #endif /* __PHY_H */
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,10 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config MDIO_BOARDINFO
++	bool
++	default y
++
+ config SWCONFIG
+ 	tristate "Switch configuration API"
+ 	---help---
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -2,6 +2,8 @@
+ 
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
++obj-$(CONFIG_MDIO_BOARDINFO)	+= mdio-boardinfo.o
++
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
+ obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.c
+@@ -0,0 +1,58 @@
++/*
++ * mdio-boardinfo.c - collect pre-declarations of PHY devices
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/phy.h>
++#include <linux/slab.h>
++#include <linux/export.h>
++#include <linux/mutex.h>
++#include <linux/phy.h>
++
++#include "mdio-boardinfo.h"
++
++/*
++ * These symbols are exported ONLY FOR the mdio_bus component.
++ * No other users will be supported.
++ */
++
++LIST_HEAD(__mdio_board_list);
++EXPORT_SYMBOL_GPL(__mdio_board_list);
++
++DEFINE_MUTEX(__mdio_board_lock);
++EXPORT_SYMBOL_GPL(__mdio_board_lock);
++
++/**
++ * mdio_register_board_info - register PHY devices for a given board
++ * @info: array of chip descriptors
++ * @n: how many descriptors are provided
++ * Context: can sleep
++ *
++ * The board info passed can safely be __initdata ... but be careful of
++ * any embedded pointers (platform_data, etc), they're copied as-is.
++ */
++int __init
++mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n)
++{
++	struct mdio_board_entry *be;
++	int i;
++
++	be = kzalloc(n * sizeof(*be), GFP_KERNEL);
++	if (!be)
++		return -ENOMEM;
++
++	for (i = 0; i < n; i++, be++, info++) {
++		memcpy(&be->board_info, info, sizeof(*info));
++		mutex_lock(&__mdio_board_lock);
++		list_add_tail(&be->list, &__mdio_board_list);
++		mutex_unlock(&__mdio_board_lock);
++	}
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.h
+@@ -0,0 +1,22 @@
++/*
++ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/mutex.h>
++
++struct mdio_board_entry {
++	struct list_head	list;
++	struct mdio_board_info	board_info;
++};
++
++/* __mdio_board_lock protects __mdio_board_list
++ * only mdio_bus components are allowed to use these symbols.
++ */
++extern struct mutex __mdio_board_lock;
++extern struct list_head __mdio_board_list;
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -15,7 +15,7 @@ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_NET) += Space.o loopback.o
+ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+-obj-$(CONFIG_PHYLIB) += phy/
++obj-y += phy/
+ obj-$(CONFIG_RIONET) += rionet.o
+ obj-$(CONFIG_NET_TEAM) += team/
+ obj-$(CONFIG_TUN) += tun.o
diff --git a/trunk/target/linux/generic/patches-3.10/720-phy_adm6996.patch b/trunk/target/linux/generic/patches-3.10/720-phy_adm6996.patch
new file mode 100644
index 00000000..65b206da
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/720-phy_adm6996.patch
@@ -0,0 +1,26 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -120,6 +120,13 @@ config MICREL_PHY
+ 	---help---
+ 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
+ 
++config ADM6996_PHY
++	tristate "Driver for ADM6996 switches"
++	select SWCONFIG
++	---help---
++	  Currently supports the ADM6996FC and ADM6996M switches.
++	  Support for FC is very limited.
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
++obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.10/721-phy_packets.patch b/trunk/target/linux/generic/patches-3.10/721-phy_packets.patch
new file mode 100644
index 00000000..dcdd1028
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/721-phy_packets.patch
@@ -0,0 +1,175 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -1109,6 +1109,11 @@ struct net_device {
+ 	const struct net_device_ops *netdev_ops;
+ 	const struct ethtool_ops *ethtool_ops;
+ 
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
++	struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
++#endif
++
+ 	/* Hardware header description */
+ 	const struct header_ops *header_ops;
+ 
+@@ -1172,6 +1177,9 @@ struct net_device {
+ 	void			*ax25_ptr;	/* AX.25 specific data */
+ 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
+ 						   assign before registering */
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void			*phy_ptr; /* PHY device specific data */
++#endif
+ 
+ /*
+  * Cache lines mostly used on receive path (including eth_type_trans())
+--- a/include/uapi/linux/if.h
++++ b/include/uapi/linux/if.h
+@@ -83,6 +83,7 @@
+ #define IFF_SUPP_NOFCS	0x80000		/* device supports sending custom FCS */
+ #define IFF_LIVE_ADDR_CHANGE 0x100000	/* device supports hardware address
+ 					 * change when it's running */
++#define IFF_NO_IP_ALIGN	0x200000	/* do not ip-align allocated rx pkts */
+ 
+ 
+ #define IF_GET_IFACE	0x0001		/* for querying only */
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1879,6 +1879,10 @@ static inline int pskb_trim(struct sk_bu
+ 	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
+ }
+ 
++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp);
++
++
+ /**
+  *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
+  *	@skb: buffer to alter
+@@ -2003,16 +2007,6 @@ static inline struct sk_buff *dev_alloc_
+ }
+ 
+ 
+-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
+-		unsigned int length, gfp_t gfp)
+-{
+-	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
+-
+-	if (NET_IP_ALIGN && skb)
+-		skb_reserve(skb, NET_IP_ALIGN);
+-	return skb;
+-}
+-
+ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+ 		unsigned int length)
+ {
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -23,6 +23,12 @@ menuconfig NET
+ 
+ if NET
+ 
++config ETHERNET_PACKET_MANGLE
++	bool
++	help
++	  This option can be selected by phy drivers that need to mangle
++	  packets going in or out of an ethernet device.
++
+ config WANT_COMPAT_NETLINK_MESSAGES
+ 	bool
+ 	help
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2581,9 +2581,19 @@ int dev_hard_start_xmit(struct sk_buff *
+ 		if (!list_empty(&ptype_all))
+ 			dev_queue_xmit_nit(skb, dev);
+ 
+-		skb_len = skb->len;
+-		rc = ops->ndo_start_xmit(skb, dev);
+-		trace_net_dev_xmit(skb, rc, dev, skb_len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = skb->len;
++			rc = ops->ndo_start_xmit(skb, dev);
++			trace_net_dev_xmit(skb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (rc == NETDEV_TX_OK)
+ 			txq_trans_update(txq);
+ 		return rc;
+@@ -2599,9 +2609,19 @@ gso:
+ 		if (!list_empty(&ptype_all))
+ 			dev_queue_xmit_nit(nskb, dev);
+ 
+-		skb_len = nskb->len;
+-		rc = ops->ndo_start_xmit(nskb, dev);
+-		trace_net_dev_xmit(nskb, rc, dev, skb_len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (nskb = dev->eth_mangle_tx(dev, nskb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = nskb->len;
++			rc = ops->ndo_start_xmit(nskb, dev);
++			trace_net_dev_xmit(nskb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (unlikely(rc != NETDEV_TX_OK)) {
+ 			if (rc & ~NETDEV_TX_MASK)
+ 				goto out_kfree_gso_skb;
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -62,6 +62,7 @@
+ #include <linux/scatterlist.h>
+ #include <linux/errqueue.h>
+ #include <linux/prefetch.h>
++#include <linux/if.h>
+ 
+ #include <net/protocol.h>
+ #include <net/dst.h>
+@@ -443,6 +444,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+ }
+ EXPORT_SYMBOL(__netdev_alloc_skb);
+ 
++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp)
++{
++	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
++		return skb;
++#endif
++
++	if (NET_IP_ALIGN && skb)
++		skb_reserve(skb, NET_IP_ALIGN);
++	return skb;
++}
++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
++
+ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 		     int size, unsigned int truesize)
+ {
+--- a/net/ethernet/eth.c
++++ b/net/ethernet/eth.c
+@@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+ 	struct ethhdr *eth;
+ 
+ 	skb->dev = dev;
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev->eth_mangle_rx)
++		dev->eth_mangle_rx(dev, skb);
++#endif
++
+ 	skb_reset_mac_header(skb);
+ 	skb_pull_inline(skb, ETH_HLEN);
+ 	eth = eth_hdr(skb);
diff --git a/trunk/target/linux/generic/patches-3.10/722-phy_mvswitch.patch b/trunk/target/linux/generic/patches-3.10/722-phy_mvswitch.patch
new file mode 100644
index 00000000..d7c3d759
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/722-phy_mvswitch.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -127,6 +127,10 @@ config ADM6996_PHY
+ 	  Currently supports the ADM6996FC and ADM6996M switches.
+ 	  Support for FC is very limited.
+ 
++config MVSWITCH_PHY
++	tristate "Driver for Marvell 88E6060 switches"
++	select ETHERNET_PACKET_MANGLE
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
++obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.10/723-phy_ip175c.patch b/trunk/target/linux/generic/patches-3.10/723-phy_ip175c.patch
new file mode 100644
index 00000000..5e3f6b46
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/723-phy_ip175c.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -131,6 +131,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config IP17XX_PHY
++	tristate "Driver for IC+ IP17xx switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.10/724-phy_ar8216.patch b/trunk/target/linux/generic/patches-3.10/724-phy_ar8216.patch
new file mode 100644
index 00000000..d3b238ef
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/724-phy_ar8216.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -135,6 +135,11 @@ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+ 
++config AR8216_PHY
++	tristate "Driver for Atheros AR8216 switches"
++	select ETHERNET_PACKET_MANGLE
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.10/725-phy_rtl8306.patch b/trunk/target/linux/generic/patches-3.10/725-phy_rtl8306.patch
new file mode 100644
index 00000000..56899a70
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/725-phy_rtl8306.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -140,6 +140,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config RTL8306_PHY
++	tristate "Driver for Realtek RTL8306S switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.10/726-phy_rtl8366.patch b/trunk/target/linux/generic/patches-3.10/726-phy_rtl8366.patch
new file mode 100644
index 00000000..cbb5ce19
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/726-phy_rtl8366.patch
@@ -0,0 +1,45 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -214,6 +214,30 @@ config MDIO_BUS_MUX_MMIOREG
+ 
+ 	  Currently, only 8-bit registers are supported.
+ 
++config RTL8366_SMI
++	tristate "Driver for the RTL8366 SMI interface"
++	depends on GPIOLIB
++	---help---
++	  This module implements the SMI interface protocol which is used
++	  by some RTL8366 ethernet switch devices via the generic GPIO API.
++
++if RTL8366_SMI
++
++config RTL8366_SMI_DEBUG_FS
++	bool "RTL8366 SMI interface debugfs support"
++        depends on DEBUG_FS
++        default n
++
++config RTL8366S_PHY
++	tristate "Driver for the Realtek RTL8366S switch"
++	select SWCONFIG
++
++config RTL8366RB_PHY
++	tristate "Driver for the Realtek RTL8366RB switch"
++	select SWCONFIG
++
++endif # RTL8366_SMI
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
++obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
++obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.10/727-phy-rtl8367.patch b/trunk/target/linux/generic/patches-3.10/727-phy-rtl8367.patch
new file mode 100644
index 00000000..26093df9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/727-phy-rtl8367.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -236,6 +236,10 @@ config RTL8366RB_PHY
+ 	tristate "Driver for the Realtek RTL8366RB switch"
+ 	select SWCONFIG
+ 
++config RTL8367_PHY
++	tristate "Driver for the Realtek RTL8367R/M switches"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
++obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.10/728-phy-micrel.patch b/trunk/target/linux/generic/patches-3.10/728-phy-micrel.patch
new file mode 100644
index 00000000..baf5a4a7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/728-phy-micrel.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -144,6 +144,11 @@ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
+ 
++config MICREL_PHY
++	tristate "Drivers for Micrel/Kendin PHYs"
++	---help---
++	  Currently has a driver for the KSZ8041
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
++obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.10/729-phy-rtl8367b.patch b/trunk/target/linux/generic/patches-3.10/729-phy-rtl8367b.patch
new file mode 100644
index 00000000..33d37fdb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/729-phy-rtl8367b.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -245,6 +245,10 @@ config RTL8367_PHY
+ 	tristate "Driver for the Realtek RTL8367R/M switches"
+ 	select SWCONFIG
+ 
++config RTL8367B_PHY
++	tristate "Driver fot the Realtek RTL8367R-VB switch"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
++obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.10/729-phy-tantos.patch b/trunk/target/linux/generic/patches-3.10/729-phy-tantos.patch
new file mode 100644
index 00000000..13e687b7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/729-phy-tantos.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -256,3 +256,8 @@ endif # PHYLIB
+ config MICREL_KS8995MA
+ 	tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
+ 	depends on SPI
++
++config PSB6970_PHY
++	tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
++	select SWCONFIG
++	select ETHERNET_PACKET_MANGLE
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -30,6 +30,7 @@ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
++obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.10/730-phy_b53.patch b/trunk/target/linux/generic/patches-3.10/730-phy_b53.patch
new file mode 100644
index 00000000..c3b9de5f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/730-phy_b53.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -251,6 +251,8 @@ config RTL8367B_PHY
+ 
+ endif # RTL8366_SMI
+ 
++source "drivers/net/phy/b53/Kconfig"
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -31,6 +31,7 @@ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
++obj-$(CONFIG_B53)		+= b53/
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.10/731-phy_mvswitch_3.10_compilation.patch b/trunk/target/linux/generic/patches-3.10/731-phy_mvswitch_3.10_compilation.patch
new file mode 100644
index 00000000..2053bd2f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/731-phy_mvswitch_3.10_compilation.patch
@@ -0,0 +1,35 @@
+From e6a5abb9a02be0bceb4782d9f736bfb4ae217505 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sat, 21 Sep 2013 13:56:51 +0200
+Subject: [PATCH] phy: mvswitch: fix 3.10 compilation
+
+Update to API changes in 3.10.
+
+Signed-off-by: Jonas Gorsi <jogo@openwrt.org>
+---
+ target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/phy/mvswitch.c
++++ b/drivers/net/phy/mvswitch.c
+@@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de
+ 	if (vlan == -1)
+ 		return;
+ 
+-	__vlan_hwaccel_put_tag(skb, vlan);
++	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
+ }
+ 
+ 
+@@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
+ 
+ #ifdef HEADER_MODE
+ 	dev->priv_flags |= IFF_NO_IP_ALIGN;
+-	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
+ #else
+-	dev->features |= NETIF_F_HW_VLAN_RX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
+ #endif
+ 
+ 	return 0;
diff --git a/trunk/target/linux/generic/patches-3.10/732-phy-ar8216-led-support.patch b/trunk/target/linux/generic/patches-3.10/732-phy-ar8216-led-support.patch
new file mode 100644
index 00000000..76c4afcd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/732-phy-ar8216-led-support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -140,6 +140,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config AR8216_PHY_LEDS
++	bool "Atheros AR8216 switch LED support"
++	depends on (AR8216_PHY && LEDS_CLASS)
++
+ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
diff --git a/trunk/target/linux/generic/patches-3.10/750-hostap_txpower.patch b/trunk/target/linux/generic/patches-3.10/750-hostap_txpower.patch
new file mode 100644
index 00000000..fc032a93
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/750-hostap_txpower.patch
@@ -0,0 +1,154 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t 
+ 		addr[count].sa_family = ARPHRD_ETHER;
+ 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+ 		if (sta->last_rx_silence == 0)
+-			qual[count].qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			qual[count].qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+ 		qual[count].updated = sta->last_rx_updated;
+ 
+ 		sta->last_rx_updated = IW_QUAL_DBM;
+@@ -2475,13 +2475,13 @@ int prism2_ap_translate_scan(struct net_
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = IWEVQUAL;
+ 		if (sta->last_rx_silence == 0)
+-			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			iwe.u.qual.qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+ 		iwe.u.qual.updated = sta->last_rx_updated;
+ 		iwe.len = IW_EV_QUAL_LEN;
+ 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++#define RAW_TXPOWER_SETTING
++
+ #endif /* HOSTAP_CONFIG_H */
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;
+ 
+ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++int hostap_restore_power(struct net_device *dev);
+ 
+ 
+ #endif /* HOSTAP_H */
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -928,6 +928,7 @@ static int hfa384x_set_rid(struct net_de
+ 			prism2_hw_reset(dev);
+ 	}
+ 
++	hostap_restore_power(dev);
+ 	return res;
+ }
+ 
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -435,6 +435,11 @@ static void handle_info_queue_linkstatus
+ 	}
+ 
+ 	/* Get BSSID if we have a valid AP address */
++
++	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++	     val == HFA384X_LINKSTATUS_DISCONNECTED )
++			hostap_restore_power(local->dev);
++
+ 	if (connected) {
+ 		netif_carrier_on(local->dev);
+ 		netif_carrier_on(local->ddev);
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1479,23 +1479,20 @@ static int prism2_txpower_hfa386x_to_dBm
+ 		val = 255;
+ 
+ 	tmp = val;
+-	tmp >>= 2;
+ 
+-	return -12 - tmp;
++	return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+ 	signed char tmp;
+ 
+-	if (val > 20)
+-		return 128;
+-	else if (val < -43)
++	if (val > 127)
+ 		return 127;
++	else if (val < -128)
++		return 128;
+ 
+ 	tmp = val;
+-	tmp = -12 - tmp;
+-	tmp <<= 2;
+ 
+ 	return (unsigned char) tmp;
+ }
+@@ -4052,3 +4049,35 @@ int hostap_ioctl(struct net_device *dev,
+ 
+ 	return ret;
+ }
++
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = netdev_priv(dev);
++       local_info_t *local = iface->local;
++
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
++EXPORT_SYMBOL(hostap_restore_power);
diff --git a/trunk/target/linux/generic/patches-3.10/770-bgmac-backport.patch b/trunk/target/linux/generic/patches-3.10/770-bgmac-backport.patch
new file mode 100644
index 00000000..0c0233b9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/770-bgmac-backport.patch
@@ -0,0 +1,1101 @@
+--- a/drivers/net/ethernet/broadcom/Kconfig
++++ b/drivers/net/ethernet/broadcom/Kconfig
+@@ -132,7 +132,8 @@ config BNX2X_SRIOV
+ 
+ config BGMAC
+ 	tristate "BCMA bus GBit core support"
+-	depends on BCMA_HOST_SOC && HAS_DMA
++	depends on BCMA_HOST_SOC && HAS_DMA && BCM47XX
++	select PHYLIB
+ 	---help---
+ 	  This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.
+ 	  They can be found on BCM47xx SoCs and provide gigabit ethernet.
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -96,6 +96,19 @@ static void bgmac_dma_tx_enable(struct b
+ 	u32 ctl;
+ 
+ 	ctl = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_TX_CTL);
++	if (bgmac->core->id.rev >= 4) {
++		ctl &= ~BGMAC_DMA_TX_BL_MASK;
++		ctl |= BGMAC_DMA_TX_BL_128 << BGMAC_DMA_TX_BL_SHIFT;
++
++		ctl &= ~BGMAC_DMA_TX_MR_MASK;
++		ctl |= BGMAC_DMA_TX_MR_2 << BGMAC_DMA_TX_MR_SHIFT;
++
++		ctl &= ~BGMAC_DMA_TX_PC_MASK;
++		ctl |= BGMAC_DMA_TX_PC_16 << BGMAC_DMA_TX_PC_SHIFT;
++
++		ctl &= ~BGMAC_DMA_TX_PT_MASK;
++		ctl |= BGMAC_DMA_TX_PT_8 << BGMAC_DMA_TX_PT_SHIFT;
++	}
+ 	ctl |= BGMAC_DMA_TX_ENABLE;
+ 	ctl |= BGMAC_DMA_TX_PARITY_DISABLE;
+ 	bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_TX_CTL, ctl);
+@@ -149,6 +162,8 @@ static netdev_tx_t bgmac_dma_tx_add(stru
+ 	dma_desc->ctl0 = cpu_to_le32(ctl0);
+ 	dma_desc->ctl1 = cpu_to_le32(ctl1);
+ 
++	netdev_sent_queue(net_dev, skb->len);
++
+ 	wmb();
+ 
+ 	/* Increase ring->end to point empty slot. We tell hardware the first
+@@ -157,6 +172,7 @@ static netdev_tx_t bgmac_dma_tx_add(stru
+ 	if (++ring->end >= BGMAC_TX_RING_SLOTS)
+ 		ring->end = 0;
+ 	bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_TX_INDEX,
++		    ring->index_base +
+ 		    ring->end * sizeof(struct bgmac_dma_desc));
+ 
+ 	/* Always keep one slot free to allow detecting bugged calls. */
+@@ -177,10 +193,13 @@ static void bgmac_dma_tx_free(struct bgm
+ 	struct device *dma_dev = bgmac->core->dma_dev;
+ 	int empty_slot;
+ 	bool freed = false;
++	unsigned bytes_compl = 0, pkts_compl = 0;
+ 
+ 	/* The last slot that hardware didn't consume yet */
+ 	empty_slot = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_TX_STATUS);
+ 	empty_slot &= BGMAC_DMA_TX_STATDPTR;
++	empty_slot -= ring->index_base;
++	empty_slot &= BGMAC_DMA_TX_STATDPTR;
+ 	empty_slot /= sizeof(struct bgmac_dma_desc);
+ 
+ 	while (ring->start != empty_slot) {
+@@ -192,6 +211,9 @@ static void bgmac_dma_tx_free(struct bgm
+ 					 slot->skb->len, DMA_TO_DEVICE);
+ 			slot->dma_addr = 0;
+ 
++			bytes_compl += slot->skb->len;
++			pkts_compl++;
++
+ 			/* Free memory! :) */
+ 			dev_kfree_skb(slot->skb);
+ 			slot->skb = NULL;
+@@ -205,6 +227,8 @@ static void bgmac_dma_tx_free(struct bgm
+ 		freed = true;
+ 	}
+ 
++	netdev_completed_queue(bgmac->net_dev, pkts_compl, bytes_compl);
++
+ 	if (freed && netif_queue_stopped(bgmac->net_dev))
+ 		netif_wake_queue(bgmac->net_dev);
+ }
+@@ -229,6 +253,16 @@ static void bgmac_dma_rx_enable(struct b
+ 	u32 ctl;
+ 
+ 	ctl = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL);
++	if (bgmac->core->id.rev >= 4) {
++		ctl &= ~BGMAC_DMA_RX_BL_MASK;
++		ctl |= BGMAC_DMA_RX_BL_128 << BGMAC_DMA_RX_BL_SHIFT;
++
++		ctl &= ~BGMAC_DMA_RX_PC_MASK;
++		ctl |= BGMAC_DMA_RX_PC_8 << BGMAC_DMA_RX_PC_SHIFT;
++
++		ctl &= ~BGMAC_DMA_RX_PT_MASK;
++		ctl |= BGMAC_DMA_RX_PT_1 << BGMAC_DMA_RX_PT_SHIFT;
++	}
+ 	ctl &= BGMAC_DMA_RX_ADDREXT_MASK;
+ 	ctl |= BGMAC_DMA_RX_ENABLE;
+ 	ctl |= BGMAC_DMA_RX_PARITY_DISABLE;
+@@ -241,31 +275,59 @@ static int bgmac_dma_rx_skb_for_slot(str
+ 				     struct bgmac_slot_info *slot)
+ {
+ 	struct device *dma_dev = bgmac->core->dma_dev;
++	struct sk_buff *skb;
++	dma_addr_t dma_addr;
+ 	struct bgmac_rx_header *rx;
+ 
+ 	/* Alloc skb */
+-	slot->skb = netdev_alloc_skb(bgmac->net_dev, BGMAC_RX_BUF_SIZE);
+-	if (!slot->skb)
++	skb = netdev_alloc_skb(bgmac->net_dev, BGMAC_RX_BUF_SIZE);
++	if (!skb)
+ 		return -ENOMEM;
+ 
+ 	/* Poison - if everything goes fine, hardware will overwrite it */
+-	rx = (struct bgmac_rx_header *)slot->skb->data;
++	rx = (struct bgmac_rx_header *)skb->data;
+ 	rx->len = cpu_to_le16(0xdead);
+ 	rx->flags = cpu_to_le16(0xbeef);
+ 
+ 	/* Map skb for the DMA */
+-	slot->dma_addr = dma_map_single(dma_dev, slot->skb->data,
+-					BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
+-	if (dma_mapping_error(dma_dev, slot->dma_addr)) {
++	dma_addr = dma_map_single(dma_dev, skb->data,
++				  BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
++	if (dma_mapping_error(dma_dev, dma_addr)) {
+ 		bgmac_err(bgmac, "DMA mapping error\n");
++		dev_kfree_skb(skb);
+ 		return -ENOMEM;
+ 	}
++
++	/* Update the slot */
++	slot->skb = skb;
++	slot->dma_addr = dma_addr;
++
+ 	if (slot->dma_addr & 0xC0000000)
+ 		bgmac_warn(bgmac, "DMA address using 0xC0000000 bit(s), it may need translation trick\n");
+ 
+ 	return 0;
+ }
+ 
++static void bgmac_dma_rx_setup_desc(struct bgmac *bgmac,
++				    struct bgmac_dma_ring *ring, int desc_idx)
++{
++	struct bgmac_dma_desc *dma_desc = ring->cpu_base + desc_idx;
++	u32 ctl0 = 0, ctl1 = 0;
++
++	if (desc_idx == ring->num_slots - 1)
++		ctl0 |= BGMAC_DESC_CTL0_EOT;
++	ctl1 |= BGMAC_RX_BUF_SIZE & BGMAC_DESC_CTL1_LEN;
++	/* Is there any BGMAC device that requires extension? */
++	/* ctl1 |= (addrext << B43_DMA64_DCTL1_ADDREXT_SHIFT) &
++	 * B43_DMA64_DCTL1_ADDREXT_MASK;
++	 */
++
++	dma_desc->addr_low = cpu_to_le32(lower_32_bits(ring->slots[desc_idx].dma_addr));
++	dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[desc_idx].dma_addr));
++	dma_desc->ctl0 = cpu_to_le32(ctl0);
++	dma_desc->ctl1 = cpu_to_le32(ctl1);
++}
++
+ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,
+ 			     int weight)
+ {
+@@ -274,6 +336,8 @@ static int bgmac_dma_rx_read(struct bgma
+ 
+ 	end_slot = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_STATUS);
+ 	end_slot &= BGMAC_DMA_RX_STATDPTR;
++	end_slot -= ring->index_base;
++	end_slot &= BGMAC_DMA_RX_STATDPTR;
+ 	end_slot /= sizeof(struct bgmac_dma_desc);
+ 
+ 	ring->end = end_slot;
+@@ -282,7 +346,6 @@ static int bgmac_dma_rx_read(struct bgma
+ 		struct device *dma_dev = bgmac->core->dma_dev;
+ 		struct bgmac_slot_info *slot = &ring->slots[ring->start];
+ 		struct sk_buff *skb = slot->skb;
+-		struct sk_buff *new_skb;
+ 		struct bgmac_rx_header *rx;
+ 		u16 len, flags;
+ 
+@@ -295,38 +358,51 @@ static int bgmac_dma_rx_read(struct bgma
+ 		len = le16_to_cpu(rx->len);
+ 		flags = le16_to_cpu(rx->flags);
+ 
+-		/* Check for poison and drop or pass the packet */
+-		if (len == 0xdead && flags == 0xbeef) {
+-			bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
+-				  ring->start);
+-		} else {
++		do {
++			dma_addr_t old_dma_addr = slot->dma_addr;
++			int err;
++
++			/* Check for poison and drop or pass the packet */
++			if (len == 0xdead && flags == 0xbeef) {
++				bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
++					  ring->start);
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
++			}
++
+ 			/* Omit CRC. */
+ 			len -= ETH_FCS_LEN;
+ 
+-			new_skb = netdev_alloc_skb_ip_align(bgmac->net_dev, len);
+-			if (new_skb) {
+-				skb_put(new_skb, len);
+-				skb_copy_from_linear_data_offset(skb, BGMAC_RX_FRAME_OFFSET,
+-								 new_skb->data,
+-								 len);
+-				skb_checksum_none_assert(skb);
+-				new_skb->protocol =
+-					eth_type_trans(new_skb, bgmac->net_dev);
+-				netif_receive_skb(new_skb);
+-				handled++;
+-			} else {
+-				bgmac->net_dev->stats.rx_dropped++;
+-				bgmac_err(bgmac, "Allocation of skb for copying packet failed!\n");
++			/* Prepare new skb as replacement */
++			err = bgmac_dma_rx_skb_for_slot(bgmac, slot);
++			if (err) {
++				/* Poison the old skb */
++				rx->len = cpu_to_le16(0xdead);
++				rx->flags = cpu_to_le16(0xbeef);
++
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
+ 			}
++			bgmac_dma_rx_setup_desc(bgmac, ring, ring->start);
+ 
+-			/* Poison the old skb */
+-			rx->len = cpu_to_le16(0xdead);
+-			rx->flags = cpu_to_le16(0xbeef);
+-		}
+-
+-		/* Make it back accessible to the hardware */
+-		dma_sync_single_for_device(dma_dev, slot->dma_addr,
+-					   BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
++			/* Unmap old skb, we'll pass it to the netfif */
++			dma_unmap_single(dma_dev, old_dma_addr,
++					 BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
++
++			skb_put(skb, BGMAC_RX_FRAME_OFFSET + len);
++			skb_pull(skb, BGMAC_RX_FRAME_OFFSET);
++
++			skb_checksum_none_assert(skb);
++			skb->protocol = eth_type_trans(skb, bgmac->net_dev);
++			netif_receive_skb(skb);
++			handled++;
++		} while (0);
+ 
+ 		if (++ring->start >= BGMAC_RX_RING_SLOTS)
+ 			ring->start = 0;
+@@ -418,9 +494,6 @@ static int bgmac_dma_alloc(struct bgmac 
+ 		ring = &bgmac->tx_ring[i];
+ 		ring->num_slots = BGMAC_TX_RING_SLOTS;
+ 		ring->mmio_base = ring_base[i];
+-		if (bgmac_dma_unaligned(bgmac, ring, BGMAC_DMA_RING_TX))
+-			bgmac_warn(bgmac, "TX on ring 0x%X supports unaligned addressing but this feature is not implemented\n",
+-				   ring->mmio_base);
+ 
+ 		/* Alloc ring of descriptors */
+ 		size = ring->num_slots * sizeof(struct bgmac_dma_desc);
+@@ -435,6 +508,13 @@ static int bgmac_dma_alloc(struct bgmac 
+ 		if (ring->dma_base & 0xC0000000)
+ 			bgmac_warn(bgmac, "DMA address using 0xC0000000 bit(s), it may need translation trick\n");
+ 
++		ring->unaligned = bgmac_dma_unaligned(bgmac, ring,
++						      BGMAC_DMA_RING_TX);
++		if (ring->unaligned)
++			ring->index_base = lower_32_bits(ring->dma_base);
++		else
++			ring->index_base = 0;
++
+ 		/* No need to alloc TX slots yet */
+ 	}
+ 
+@@ -444,9 +524,6 @@ static int bgmac_dma_alloc(struct bgmac 
+ 		ring = &bgmac->rx_ring[i];
+ 		ring->num_slots = BGMAC_RX_RING_SLOTS;
+ 		ring->mmio_base = ring_base[i];
+-		if (bgmac_dma_unaligned(bgmac, ring, BGMAC_DMA_RING_RX))
+-			bgmac_warn(bgmac, "RX on ring 0x%X supports unaligned addressing but this feature is not implemented\n",
+-				   ring->mmio_base);
+ 
+ 		/* Alloc ring of descriptors */
+ 		size = ring->num_slots * sizeof(struct bgmac_dma_desc);
+@@ -462,6 +539,13 @@ static int bgmac_dma_alloc(struct bgmac 
+ 		if (ring->dma_base & 0xC0000000)
+ 			bgmac_warn(bgmac, "DMA address using 0xC0000000 bit(s), it may need translation trick\n");
+ 
++		ring->unaligned = bgmac_dma_unaligned(bgmac, ring,
++						      BGMAC_DMA_RING_RX);
++		if (ring->unaligned)
++			ring->index_base = lower_32_bits(ring->dma_base);
++		else
++			ring->index_base = 0;
++
+ 		/* Alloc RX slots */
+ 		for (j = 0; j < ring->num_slots; j++) {
+ 			err = bgmac_dma_rx_skb_for_slot(bgmac, &ring->slots[j]);
+@@ -482,19 +566,19 @@ err_dma_free:
+ static void bgmac_dma_init(struct bgmac *bgmac)
+ {
+ 	struct bgmac_dma_ring *ring;
+-	struct bgmac_dma_desc *dma_desc;
+-	u32 ctl0, ctl1;
+ 	int i;
+ 
+ 	for (i = 0; i < BGMAC_MAX_TX_RINGS; i++) {
+ 		ring = &bgmac->tx_ring[i];
+ 
+-		/* We don't implement unaligned addressing, so enable first */
+-		bgmac_dma_tx_enable(bgmac, ring);
++		if (!ring->unaligned)
++			bgmac_dma_tx_enable(bgmac, ring);
+ 		bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_TX_RINGLO,
+ 			    lower_32_bits(ring->dma_base));
+ 		bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_TX_RINGHI,
+ 			    upper_32_bits(ring->dma_base));
++		if (ring->unaligned)
++			bgmac_dma_tx_enable(bgmac, ring);
+ 
+ 		ring->start = 0;
+ 		ring->end = 0;	/* Points the slot that should *not* be read */
+@@ -505,32 +589,20 @@ static void bgmac_dma_init(struct bgmac 
+ 
+ 		ring = &bgmac->rx_ring[i];
+ 
+-		/* We don't implement unaligned addressing, so enable first */
+-		bgmac_dma_rx_enable(bgmac, ring);
++		if (!ring->unaligned)
++			bgmac_dma_rx_enable(bgmac, ring);
+ 		bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGLO,
+ 			    lower_32_bits(ring->dma_base));
+ 		bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGHI,
+ 			    upper_32_bits(ring->dma_base));
++		if (ring->unaligned)
++			bgmac_dma_rx_enable(bgmac, ring);
+ 
+-		for (j = 0, dma_desc = ring->cpu_base; j < ring->num_slots;
+-		     j++, dma_desc++) {
+-			ctl0 = ctl1 = 0;
+-
+-			if (j == ring->num_slots - 1)
+-				ctl0 |= BGMAC_DESC_CTL0_EOT;
+-			ctl1 |= BGMAC_RX_BUF_SIZE & BGMAC_DESC_CTL1_LEN;
+-			/* Is there any BGMAC device that requires extension? */
+-			/* ctl1 |= (addrext << B43_DMA64_DCTL1_ADDREXT_SHIFT) &
+-			 * B43_DMA64_DCTL1_ADDREXT_MASK;
+-			 */
+-
+-			dma_desc->addr_low = cpu_to_le32(lower_32_bits(ring->slots[j].dma_addr));
+-			dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[j].dma_addr));
+-			dma_desc->ctl0 = cpu_to_le32(ctl0);
+-			dma_desc->ctl1 = cpu_to_le32(ctl1);
+-		}
++		for (j = 0; j < ring->num_slots; j++)
++			bgmac_dma_rx_setup_desc(bgmac, ring, j);
+ 
+ 		bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX,
++			    ring->index_base +
+ 			    ring->num_slots * sizeof(struct bgmac_dma_desc));
+ 
+ 		ring->start = 0;
+@@ -633,70 +705,6 @@ static int bgmac_phy_write(struct bgmac 
+ 	return 0;
+ }
+ 
+-/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyforce */
+-static void bgmac_phy_force(struct bgmac *bgmac)
+-{
+-	u16 ctl;
+-	u16 mask = ~(BGMAC_PHY_CTL_SPEED | BGMAC_PHY_CTL_SPEED_MSB |
+-		     BGMAC_PHY_CTL_ANENAB | BGMAC_PHY_CTL_DUPLEX);
+-
+-	if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+-		return;
+-
+-	if (bgmac->autoneg)
+-		return;
+-
+-	ctl = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL);
+-	ctl &= mask;
+-	if (bgmac->full_duplex)
+-		ctl |= BGMAC_PHY_CTL_DUPLEX;
+-	if (bgmac->speed == BGMAC_SPEED_100)
+-		ctl |= BGMAC_PHY_CTL_SPEED_100;
+-	else if (bgmac->speed == BGMAC_SPEED_1000)
+-		ctl |= BGMAC_PHY_CTL_SPEED_1000;
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL, ctl);
+-}
+-
+-/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyadvertise */
+-static void bgmac_phy_advertise(struct bgmac *bgmac)
+-{
+-	u16 adv;
+-
+-	if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+-		return;
+-
+-	if (!bgmac->autoneg)
+-		return;
+-
+-	/* Adv selected 10/100 speeds */
+-	adv = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV);
+-	adv &= ~(BGMAC_PHY_ADV_10HALF | BGMAC_PHY_ADV_10FULL |
+-		 BGMAC_PHY_ADV_100HALF | BGMAC_PHY_ADV_100FULL);
+-	if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_10)
+-		adv |= BGMAC_PHY_ADV_10HALF;
+-	if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_100)
+-		adv |= BGMAC_PHY_ADV_100HALF;
+-	if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_10)
+-		adv |= BGMAC_PHY_ADV_10FULL;
+-	if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_100)
+-		adv |= BGMAC_PHY_ADV_100FULL;
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV, adv);
+-
+-	/* Adv selected 1000 speeds */
+-	adv = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV2);
+-	adv &= ~(BGMAC_PHY_ADV2_1000HALF | BGMAC_PHY_ADV2_1000FULL);
+-	if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_1000)
+-		adv |= BGMAC_PHY_ADV2_1000HALF;
+-	if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_1000)
+-		adv |= BGMAC_PHY_ADV2_1000FULL;
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV2, adv);
+-
+-	/* Restart */
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL,
+-			bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL) |
+-			BGMAC_PHY_CTL_RESTART);
+-}
+-
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyinit */
+ static void bgmac_phy_init(struct bgmac *bgmac)
+ {
+@@ -740,11 +748,9 @@ static void bgmac_phy_reset(struct bgmac
+ 	if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+ 		return;
+ 
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL,
+-			BGMAC_PHY_CTL_RESET);
++	bgmac_phy_write(bgmac, bgmac->phyaddr, MII_BMCR, BMCR_RESET);
+ 	udelay(100);
+-	if (bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL) &
+-	    BGMAC_PHY_CTL_RESET)
++	if (bgmac_phy_read(bgmac, bgmac->phyaddr, MII_BMCR) & BMCR_RESET)
+ 		bgmac_err(bgmac, "PHY reset failed\n");
+ 	bgmac_phy_init(bgmac);
+ }
+@@ -762,13 +768,13 @@ static void bgmac_cmdcfg_maskset(struct 
+ 	u32 cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);
+ 	u32 new_val = (cmdcfg & mask) | set;
+ 
+-	bgmac_set(bgmac, BGMAC_CMDCFG, BGMAC_CMDCFG_SR);
++	bgmac_set(bgmac, BGMAC_CMDCFG, BGMAC_CMDCFG_SR(bgmac->core->id.rev));
+ 	udelay(2);
+ 
+ 	if (new_val != cmdcfg || force)
+ 		bgmac_write(bgmac, BGMAC_CMDCFG, new_val);
+ 
+-	bgmac_mask(bgmac, BGMAC_CMDCFG, ~BGMAC_CMDCFG_SR);
++	bgmac_mask(bgmac, BGMAC_CMDCFG, ~BGMAC_CMDCFG_SR(bgmac->core->id.rev));
+ 	udelay(2);
+ }
+ 
+@@ -827,31 +833,56 @@ static void bgmac_clear_mib(struct bgmac
+ }
+ 
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_speed */
+-static void bgmac_speed(struct bgmac *bgmac, int speed)
++static void bgmac_mac_speed(struct bgmac *bgmac)
+ {
+ 	u32 mask = ~(BGMAC_CMDCFG_ES_MASK | BGMAC_CMDCFG_HD);
+ 	u32 set = 0;
+ 
+-	if (speed & BGMAC_SPEED_10)
++	switch (bgmac->mac_speed) {
++	case SPEED_10:
+ 		set |= BGMAC_CMDCFG_ES_10;
+-	if (speed & BGMAC_SPEED_100)
++		break;
++	case SPEED_100:
+ 		set |= BGMAC_CMDCFG_ES_100;
+-	if (speed & BGMAC_SPEED_1000)
++		break;
++	case SPEED_1000:
+ 		set |= BGMAC_CMDCFG_ES_1000;
+-	if (!bgmac->full_duplex)
++		break;
++	case SPEED_2500:
++		set |= BGMAC_CMDCFG_ES_2500;
++		break;
++	default:
++		bgmac_err(bgmac, "Unsupported speed: %d\n", bgmac->mac_speed);
++	}
++
++	if (bgmac->mac_duplex == DUPLEX_HALF)
+ 		set |= BGMAC_CMDCFG_HD;
++
+ 	bgmac_cmdcfg_maskset(bgmac, mask, set, true);
+ }
+ 
+ static void bgmac_miiconfig(struct bgmac *bgmac)
+ {
+-	u8 imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
+-			BGMAC_DS_MM_SHIFT;
+-	if (imode == 0 || imode == 1) {
+-		if (bgmac->autoneg)
+-			bgmac_speed(bgmac, BGMAC_SPEED_100);
+-		else
+-			bgmac_speed(bgmac, bgmac->speed);
++	struct bcma_device *core = bgmac->core;
++	struct bcma_chipinfo *ci = &core->bus->chipinfo;
++	u8 imode;
++
++	if (ci->id == BCMA_CHIP_ID_BCM4707 ||
++	    ci->id == BCMA_CHIP_ID_BCM53018) {
++		bcma_awrite32(core, BCMA_IOCTL,
++			      bcma_aread32(core, BCMA_IOCTL) | 0x40 |
++			      BGMAC_BCMA_IOCTL_SW_CLKEN);
++		bgmac->mac_speed = SPEED_2500;
++		bgmac->mac_duplex = DUPLEX_FULL;
++		bgmac_mac_speed(bgmac);
++	} else {
++		imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) &
++			BGMAC_DS_MM_MASK) >> BGMAC_DS_MM_SHIFT;
++		if (imode == 0 || imode == 1) {
++			bgmac->mac_speed = SPEED_100;
++			bgmac->mac_duplex = DUPLEX_FULL;
++			bgmac_mac_speed(bgmac);
++		}
+ 	}
+ }
+ 
+@@ -861,7 +892,7 @@ static void bgmac_chip_reset(struct bgma
+ 	struct bcma_device *core = bgmac->core;
+ 	struct bcma_bus *bus = core->bus;
+ 	struct bcma_chipinfo *ci = &bus->chipinfo;
+-	u32 flags = 0;
++	u32 flags;
+ 	u32 iost;
+ 	int i;
+ 
+@@ -884,44 +915,55 @@ static void bgmac_chip_reset(struct bgma
+ 	}
+ 
+ 	iost = bcma_aread32(core, BCMA_IOST);
+-	if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 10) ||
++	if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) ||
+ 	    (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg == 10) ||
+-	    (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9))
++	    (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
+ 		iost &= ~BGMAC_BCMA_IOST_ATTACHED;
+ 
+-	if (iost & BGMAC_BCMA_IOST_ATTACHED) {
+-		flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
+-		if (!bgmac->has_robosw)
+-			flags |= BGMAC_BCMA_IOCTL_SW_RESET;
++	/* 3GMAC: for BCM4707, only do core reset at bgmac_probe() */
++	if (ci->id != BCMA_CHIP_ID_BCM4707) {
++		flags = 0;
++		if (iost & BGMAC_BCMA_IOST_ATTACHED) {
++			flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
++			if (!bgmac->has_robosw)
++				flags |= BGMAC_BCMA_IOCTL_SW_RESET;
++		}
++		bcma_core_enable(core, flags);
+ 	}
+ 
+-	bcma_core_enable(core, flags);
+-
+-	if (core->id.rev > 2) {
+-		bgmac_set(bgmac, BCMA_CLKCTLST, 1 << 8);
+-		bgmac_wait_value(bgmac->core, BCMA_CLKCTLST, 1 << 24, 1 << 24,
++	/* Request Misc PLL for corerev > 2 */
++	if (core->id.rev > 2 &&
++	    ci->id != BCMA_CHIP_ID_BCM4707 &&
++	    ci->id != BCMA_CHIP_ID_BCM53018) {
++		bgmac_set(bgmac, BCMA_CLKCTLST,
++			  BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ);
++		bgmac_wait_value(bgmac->core, BCMA_CLKCTLST,
++				 BGMAC_BCMA_CLKCTLST_MISC_PLL_ST,
++				 BGMAC_BCMA_CLKCTLST_MISC_PLL_ST,
+ 				 1000);
+ 	}
+ 
+-	if (ci->id == BCMA_CHIP_ID_BCM5357 || ci->id == BCMA_CHIP_ID_BCM4749 ||
++	if (ci->id == BCMA_CHIP_ID_BCM5357 ||
++	    ci->id == BCMA_CHIP_ID_BCM4749 ||
+ 	    ci->id == BCMA_CHIP_ID_BCM53572) {
+ 		struct bcma_drv_cc *cc = &bgmac->core->bus->drv_cc;
+ 		u8 et_swtype = 0;
+ 		u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY |
+ 			     BGMAC_CHIPCTL_1_IF_TYPE_MII;
+-		char buf[2];
++		char buf[4];
+ 
+-		if (bcm47xx_nvram_getenv("et_swtype", buf, 1) > 0) {
++		if (bcm47xx_nvram_getenv("et_swtype", buf, sizeof(buf)) > 0) {
+ 			if (kstrtou8(buf, 0, &et_swtype))
+ 				bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n",
+ 					  buf);
+ 			et_swtype &= 0x0f;
+ 			et_swtype <<= 4;
+ 			sw_type = et_swtype;
+-		} else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 9) {
++		} else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM5358) {
+ 			sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII;
+-		} else if ((ci->id != BCMA_CHIP_ID_BCM53572 && ci->pkg == 10) ||
+-			   (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9)) {
++		} else if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) ||
++			   (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg == 10) ||
++			   (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188)) {
+ 			sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
+ 				  BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
+ 		}
+@@ -958,8 +1000,10 @@ static void bgmac_chip_reset(struct bgma
+ 			     BGMAC_CMDCFG_PROM |
+ 			     BGMAC_CMDCFG_NLC |
+ 			     BGMAC_CMDCFG_CFE |
+-			     BGMAC_CMDCFG_SR,
++			     BGMAC_CMDCFG_SR(core->id.rev),
+ 			     false);
++	bgmac->mac_speed = SPEED_UNKNOWN;
++	bgmac->mac_duplex = DUPLEX_UNKNOWN;
+ 
+ 	bgmac_clear_mib(bgmac);
+ 	if (core->id.id == BCMA_CORE_4706_MAC_GBIT)
+@@ -970,6 +1014,8 @@ static void bgmac_chip_reset(struct bgma
+ 	bgmac_miiconfig(bgmac);
+ 	bgmac_phy_init(bgmac);
+ 
++	netdev_reset_queue(bgmac->net_dev);
++
+ 	bgmac->int_status = 0;
+ }
+ 
+@@ -997,7 +1043,7 @@ static void bgmac_enable(struct bgmac *b
+ 
+ 	cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);
+ 	bgmac_cmdcfg_maskset(bgmac, ~(BGMAC_CMDCFG_TE | BGMAC_CMDCFG_RE),
+-			     BGMAC_CMDCFG_SR, true);
++			     BGMAC_CMDCFG_SR(bgmac->core->id.rev), true);
+ 	udelay(2);
+ 	cmdcfg |= BGMAC_CMDCFG_TE | BGMAC_CMDCFG_RE;
+ 	bgmac_write(bgmac, BGMAC_CMDCFG, cmdcfg);
+@@ -1026,12 +1072,16 @@ static void bgmac_enable(struct bgmac *b
+ 		break;
+ 	}
+ 
+-	rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
+-	rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
+-	bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) / 1000000;
+-	mdp = (bp_clk * 128 / 1000) - 3;
+-	rxq_ctl |= (mdp << BGMAC_RXQ_CTL_MDP_SHIFT);
+-	bgmac_write(bgmac, BGMAC_RXQ_CTL, rxq_ctl);
++	if (ci->id != BCMA_CHIP_ID_BCM4707 &&
++	    ci->id != BCMA_CHIP_ID_BCM53018) {
++		rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
++		rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
++		bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) /
++				1000000;
++		mdp = (bp_clk * 128 / 1000) - 3;
++		rxq_ctl |= (mdp << BGMAC_RXQ_CTL_MDP_SHIFT);
++		bgmac_write(bgmac, BGMAC_RXQ_CTL, rxq_ctl);
++	}
+ }
+ 
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipinit */
+@@ -1057,13 +1107,6 @@ static void bgmac_chip_init(struct bgmac
+ 
+ 	bgmac_write(bgmac, BGMAC_RXMAX_LENGTH, 32 + ETHER_MAX_LEN);
+ 
+-	if (!bgmac->autoneg) {
+-		bgmac_speed(bgmac, bgmac->speed);
+-		bgmac_phy_force(bgmac);
+-	} else if (bgmac->speed) { /* if there is anything to adv */
+-		bgmac_phy_advertise(bgmac);
+-	}
+-
+ 	if (full_init) {
+ 		bgmac_dma_init(bgmac);
+ 		if (1) /* FIXME: is there any case we don't want IRQs? */
+@@ -1153,6 +1196,8 @@ static int bgmac_open(struct net_device 
+ 	}
+ 	napi_enable(&bgmac->napi);
+ 
++	phy_start(bgmac->phy_dev);
++
+ 	netif_carrier_on(net_dev);
+ 
+ err_out:
+@@ -1165,6 +1210,8 @@ static int bgmac_stop(struct net_device 
+ 
+ 	netif_carrier_off(net_dev);
+ 
++	phy_stop(bgmac->phy_dev);
++
+ 	napi_disable(&bgmac->napi);
+ 	bgmac_chip_intrs_off(bgmac);
+ 	free_irq(bgmac->core->irq, net_dev);
+@@ -1201,27 +1248,11 @@ static int bgmac_set_mac_address(struct 
+ static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
+ {
+ 	struct bgmac *bgmac = netdev_priv(net_dev);
+-	struct mii_ioctl_data *data = if_mii(ifr);
+ 
+-	switch (cmd) {
+-	case SIOCGMIIPHY:
+-		data->phy_id = bgmac->phyaddr;
+-		/* fallthru */
+-	case SIOCGMIIREG:
+-		if (!netif_running(net_dev))
+-			return -EAGAIN;
+-		data->val_out = bgmac_phy_read(bgmac, data->phy_id,
+-					       data->reg_num & 0x1f);
+-		return 0;
+-	case SIOCSMIIREG:
+-		if (!netif_running(net_dev))
+-			return -EAGAIN;
+-		bgmac_phy_write(bgmac, data->phy_id, data->reg_num & 0x1f,
+-				data->val_in);
+-		return 0;
+-	default:
+-		return -EOPNOTSUPP;
+-	}
++	if (!netif_running(net_dev))
++		return -EINVAL;
++
++	return phy_mii_ioctl(bgmac->phy_dev, ifr, cmd);
+ }
+ 
+ static const struct net_device_ops bgmac_netdev_ops = {
+@@ -1243,61 +1274,16 @@ static int bgmac_get_settings(struct net
+ {
+ 	struct bgmac *bgmac = netdev_priv(net_dev);
+ 
+-	cmd->supported = SUPPORTED_10baseT_Half |
+-			 SUPPORTED_10baseT_Full |
+-			 SUPPORTED_100baseT_Half |
+-			 SUPPORTED_100baseT_Full |
+-			 SUPPORTED_1000baseT_Half |
+-			 SUPPORTED_1000baseT_Full |
+-			 SUPPORTED_Autoneg;
+-
+-	if (bgmac->autoneg) {
+-		WARN_ON(cmd->advertising);
+-		if (bgmac->full_duplex) {
+-			if (bgmac->speed & BGMAC_SPEED_10)
+-				cmd->advertising |= ADVERTISED_10baseT_Full;
+-			if (bgmac->speed & BGMAC_SPEED_100)
+-				cmd->advertising |= ADVERTISED_100baseT_Full;
+-			if (bgmac->speed & BGMAC_SPEED_1000)
+-				cmd->advertising |= ADVERTISED_1000baseT_Full;
+-		} else {
+-			if (bgmac->speed & BGMAC_SPEED_10)
+-				cmd->advertising |= ADVERTISED_10baseT_Half;
+-			if (bgmac->speed & BGMAC_SPEED_100)
+-				cmd->advertising |= ADVERTISED_100baseT_Half;
+-			if (bgmac->speed & BGMAC_SPEED_1000)
+-				cmd->advertising |= ADVERTISED_1000baseT_Half;
+-		}
+-	} else {
+-		switch (bgmac->speed) {
+-		case BGMAC_SPEED_10:
+-			ethtool_cmd_speed_set(cmd, SPEED_10);
+-			break;
+-		case BGMAC_SPEED_100:
+-			ethtool_cmd_speed_set(cmd, SPEED_100);
+-			break;
+-		case BGMAC_SPEED_1000:
+-			ethtool_cmd_speed_set(cmd, SPEED_1000);
+-			break;
+-		}
+-	}
+-
+-	cmd->duplex = bgmac->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
+-
+-	cmd->autoneg = bgmac->autoneg;
+-
+-	return 0;
++	return phy_ethtool_gset(bgmac->phy_dev, cmd);
+ }
+ 
+-#if 0
+ static int bgmac_set_settings(struct net_device *net_dev,
+ 			      struct ethtool_cmd *cmd)
+ {
+ 	struct bgmac *bgmac = netdev_priv(net_dev);
+ 
+-	return -1;
++	return phy_ethtool_sset(bgmac->phy_dev, cmd);
+ }
+-#endif
+ 
+ static void bgmac_get_drvinfo(struct net_device *net_dev,
+ 			      struct ethtool_drvinfo *info)
+@@ -1308,6 +1294,7 @@ static void bgmac_get_drvinfo(struct net
+ 
+ static const struct ethtool_ops bgmac_ethtool_ops = {
+ 	.get_settings		= bgmac_get_settings,
++	.set_settings		= bgmac_set_settings,
+ 	.get_drvinfo		= bgmac_get_drvinfo,
+ };
+ 
+@@ -1326,9 +1313,35 @@ static int bgmac_mii_write(struct mii_bu
+ 	return bgmac_phy_write(bus->priv, mii_id, regnum, value);
+ }
+ 
++static void bgmac_adjust_link(struct net_device *net_dev)
++{
++	struct bgmac *bgmac = netdev_priv(net_dev);
++	struct phy_device *phy_dev = bgmac->phy_dev;
++	bool update = false;
++
++	if (phy_dev->link) {
++		if (phy_dev->speed != bgmac->mac_speed) {
++			bgmac->mac_speed = phy_dev->speed;
++			update = true;
++		}
++
++		if (phy_dev->duplex != bgmac->mac_duplex) {
++			bgmac->mac_duplex = phy_dev->duplex;
++			update = true;
++		}
++	}
++
++	if (update) {
++		bgmac_mac_speed(bgmac);
++		phy_print_status(phy_dev);
++	}
++}
++
+ static int bgmac_mii_register(struct bgmac *bgmac)
+ {
+ 	struct mii_bus *mii_bus;
++	struct phy_device *phy_dev;
++	char bus_id[MII_BUS_ID_SIZE + 3];
+ 	int i, err = 0;
+ 
+ 	mii_bus = mdiobus_alloc();
+@@ -1360,8 +1373,22 @@ static int bgmac_mii_register(struct bgm
+ 
+ 	bgmac->mii_bus = mii_bus;
+ 
++	/* Connect to the PHY */
++	snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, mii_bus->id,
++		 bgmac->phyaddr);
++	phy_dev = phy_connect(bgmac->net_dev, bus_id, &bgmac_adjust_link,
++			      PHY_INTERFACE_MODE_MII);
++	if (IS_ERR(phy_dev)) {
++		bgmac_err(bgmac, "PHY connecton failed\n");
++		err = PTR_ERR(phy_dev);
++		goto err_unregister_bus;
++	}
++	bgmac->phy_dev = phy_dev;
++
+ 	return err;
+ 
++err_unregister_bus:
++	mdiobus_unregister(mii_bus);
+ err_free_irq:
+ 	kfree(mii_bus->irq);
+ err_free_bus:
+@@ -1416,9 +1443,6 @@ static int bgmac_probe(struct bcma_devic
+ 	bcma_set_drvdata(core, bgmac);
+ 
+ 	/* Defaults */
+-	bgmac->autoneg = true;
+-	bgmac->full_duplex = true;
+-	bgmac->speed = BGMAC_SPEED_10 | BGMAC_SPEED_100 | BGMAC_SPEED_1000;
+ 	memcpy(bgmac->net_dev->dev_addr, mac, ETH_ALEN);
+ 
+ 	/* On BCM4706 we need common core to access PHY */
+@@ -1449,6 +1473,27 @@ static int bgmac_probe(struct bcma_devic
+ 
+ 	bgmac_chip_reset(bgmac);
+ 
++	/* For Northstar, we have to take all GMAC core out of reset */
++	if (core->id.id == BCMA_CHIP_ID_BCM4707 ||
++	    core->id.id == BCMA_CHIP_ID_BCM53018) {
++		struct bcma_device *ns_core;
++		int ns_gmac;
++
++		/* Northstar has 4 GMAC cores */
++		for (ns_gmac = 0; ns_gmac < 4; ns_gmac++) {
++			/* As Northstar requirement, we have to reset all GMACs
++			 * before accessing one. bgmac_chip_reset() call
++			 * bcma_core_enable() for this core. Then the other
++			 * three GMACs didn't reset.  We do it here.
++			 */
++			ns_core = bcma_find_core_unit(core->bus,
++						      BCMA_CORE_MAC_GBIT,
++						      ns_gmac);
++			if (ns_core && !bcma_core_is_enabled(ns_core))
++				bcma_core_enable(ns_core, 0);
++		}
++	}
++
+ 	err = bgmac_dma_alloc(bgmac);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Unable to alloc memory for DMA\n");
+@@ -1473,14 +1518,12 @@ static int bgmac_probe(struct bcma_devic
+ 	err = bgmac_mii_register(bgmac);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register MDIO\n");
+-		err = -ENOTSUPP;
+ 		goto err_dma_free;
+ 	}
+ 
+ 	err = register_netdev(bgmac->net_dev);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register net device\n");
+-		err = -ENOTSUPP;
+ 		goto err_mii_unregister;
+ 	}
+ 
+--- a/drivers/net/ethernet/broadcom/bgmac.h
++++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -95,7 +95,11 @@
+ #define  BGMAC_RXQ_CTL_MDP_SHIFT		24
+ #define BGMAC_GPIO_SELECT			0x194
+ #define BGMAC_GPIO_OUTPUT_EN			0x198
+-/* For 0x1e0 see BCMA_CLKCTLST */
++
++/* For 0x1e0 see BCMA_CLKCTLST. Below are BGMAC specific bits */
++#define  BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ	0x00000100
++#define  BGMAC_BCMA_CLKCTLST_MISC_PLL_ST	0x01000000
++
+ #define BGMAC_HW_WAR				0x1e4
+ #define BGMAC_PWR_CTL				0x1e8
+ #define BGMAC_DMA_BASE0				0x200		/* Tx and Rx controller */
+@@ -185,6 +189,7 @@
+ #define   BGMAC_CMDCFG_ES_10			0x00000000
+ #define   BGMAC_CMDCFG_ES_100			0x00000004
+ #define   BGMAC_CMDCFG_ES_1000			0x00000008
++#define   BGMAC_CMDCFG_ES_2500			0x0000000C
+ #define  BGMAC_CMDCFG_PROM			0x00000010	/* Set to activate promiscuous mode */
+ #define  BGMAC_CMDCFG_PAD_EN			0x00000020
+ #define  BGMAC_CMDCFG_CF			0x00000040
+@@ -193,7 +198,9 @@
+ #define  BGMAC_CMDCFG_TAI			0x00000200
+ #define  BGMAC_CMDCFG_HD			0x00000400	/* Set if in half duplex mode */
+ #define  BGMAC_CMDCFG_HD_SHIFT			10
+-#define  BGMAC_CMDCFG_SR			0x00000800	/* Set to reset mode */
++#define  BGMAC_CMDCFG_SR_REV0			0x00000800	/* Set to reset mode, for other revs */
++#define  BGMAC_CMDCFG_SR_REV4			0x00002000	/* Set to reset mode, only for core rev 4 */
++#define  BGMAC_CMDCFG_SR(rev)  ((rev == 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0)
+ #define  BGMAC_CMDCFG_ML			0x00008000	/* Set to activate mac loopback mode */
+ #define  BGMAC_CMDCFG_AE			0x00400000
+ #define  BGMAC_CMDCFG_CFE			0x00800000
+@@ -216,27 +223,6 @@
+ #define BGMAC_RX_STATUS				0xb38
+ #define BGMAC_TX_STATUS				0xb3c
+ 
+-#define BGMAC_PHY_CTL				0x00
+-#define  BGMAC_PHY_CTL_SPEED_MSB		0x0040
+-#define  BGMAC_PHY_CTL_DUPLEX			0x0100		/* duplex mode */
+-#define  BGMAC_PHY_CTL_RESTART			0x0200		/* restart autonegotiation */
+-#define  BGMAC_PHY_CTL_ANENAB			0x1000		/* enable autonegotiation */
+-#define  BGMAC_PHY_CTL_SPEED			0x2000
+-#define  BGMAC_PHY_CTL_LOOP			0x4000		/* loopback */
+-#define  BGMAC_PHY_CTL_RESET			0x8000		/* reset */
+-/* Helpers */
+-#define  BGMAC_PHY_CTL_SPEED_10			0
+-#define  BGMAC_PHY_CTL_SPEED_100		BGMAC_PHY_CTL_SPEED
+-#define  BGMAC_PHY_CTL_SPEED_1000		BGMAC_PHY_CTL_SPEED_MSB
+-#define BGMAC_PHY_ADV				0x04
+-#define  BGMAC_PHY_ADV_10HALF			0x0020		/* advertise 10MBits/s half duplex */
+-#define  BGMAC_PHY_ADV_10FULL			0x0040		/* advertise 10MBits/s full duplex */
+-#define  BGMAC_PHY_ADV_100HALF			0x0080		/* advertise 100MBits/s half duplex */
+-#define  BGMAC_PHY_ADV_100FULL			0x0100		/* advertise 100MBits/s full duplex */
+-#define BGMAC_PHY_ADV2				0x09
+-#define  BGMAC_PHY_ADV2_1000HALF		0x0100		/* advertise 1000MBits/s half duplex */
+-#define  BGMAC_PHY_ADV2_1000FULL		0x0200		/* advertise 1000MBits/s full duplex */
+-
+ /* BCMA GMAC core specific IO Control (BCMA_IOCTL) flags */
+ #define BGMAC_BCMA_IOCTL_SW_CLKEN		0x00000004	/* PHY Clock Enable */
+ #define BGMAC_BCMA_IOCTL_SW_RESET		0x00000008	/* PHY Reset */
+@@ -254,9 +240,34 @@
+ #define  BGMAC_DMA_TX_SUSPEND			0x00000002
+ #define  BGMAC_DMA_TX_LOOPBACK			0x00000004
+ #define  BGMAC_DMA_TX_FLUSH			0x00000010
++#define  BGMAC_DMA_TX_MR_MASK			0x000000C0	/* Multiple outstanding reads */
++#define  BGMAC_DMA_TX_MR_SHIFT			6
++#define   BGMAC_DMA_TX_MR_1			0
++#define   BGMAC_DMA_TX_MR_2			1
+ #define  BGMAC_DMA_TX_PARITY_DISABLE		0x00000800
+ #define  BGMAC_DMA_TX_ADDREXT_MASK		0x00030000
+ #define  BGMAC_DMA_TX_ADDREXT_SHIFT		16
++#define  BGMAC_DMA_TX_BL_MASK			0x001C0000	/* BurstLen bits */
++#define  BGMAC_DMA_TX_BL_SHIFT			18
++#define   BGMAC_DMA_TX_BL_16			0
++#define   BGMAC_DMA_TX_BL_32			1
++#define   BGMAC_DMA_TX_BL_64			2
++#define   BGMAC_DMA_TX_BL_128			3
++#define   BGMAC_DMA_TX_BL_256			4
++#define   BGMAC_DMA_TX_BL_512			5
++#define   BGMAC_DMA_TX_BL_1024			6
++#define  BGMAC_DMA_TX_PC_MASK			0x00E00000	/* Prefetch control */
++#define  BGMAC_DMA_TX_PC_SHIFT			21
++#define   BGMAC_DMA_TX_PC_0			0
++#define   BGMAC_DMA_TX_PC_4			1
++#define   BGMAC_DMA_TX_PC_8			2
++#define   BGMAC_DMA_TX_PC_16			3
++#define  BGMAC_DMA_TX_PT_MASK			0x03000000	/* Prefetch threshold */
++#define  BGMAC_DMA_TX_PT_SHIFT			24
++#define   BGMAC_DMA_TX_PT_1			0
++#define   BGMAC_DMA_TX_PT_2			1
++#define   BGMAC_DMA_TX_PT_4			2
++#define   BGMAC_DMA_TX_PT_8			3
+ #define BGMAC_DMA_TX_INDEX			0x04
+ #define BGMAC_DMA_TX_RINGLO			0x08
+ #define BGMAC_DMA_TX_RINGHI			0x0C
+@@ -284,8 +295,33 @@
+ #define  BGMAC_DMA_RX_DIRECT_FIFO		0x00000100
+ #define  BGMAC_DMA_RX_OVERFLOW_CONT		0x00000400
+ #define  BGMAC_DMA_RX_PARITY_DISABLE		0x00000800
++#define  BGMAC_DMA_RX_MR_MASK			0x000000C0	/* Multiple outstanding reads */
++#define  BGMAC_DMA_RX_MR_SHIFT			6
++#define   BGMAC_DMA_TX_MR_1			0
++#define   BGMAC_DMA_TX_MR_2			1
+ #define  BGMAC_DMA_RX_ADDREXT_MASK		0x00030000
+ #define  BGMAC_DMA_RX_ADDREXT_SHIFT		16
++#define  BGMAC_DMA_RX_BL_MASK			0x001C0000	/* BurstLen bits */
++#define  BGMAC_DMA_RX_BL_SHIFT			18
++#define   BGMAC_DMA_RX_BL_16			0
++#define   BGMAC_DMA_RX_BL_32			1
++#define   BGMAC_DMA_RX_BL_64			2
++#define   BGMAC_DMA_RX_BL_128			3
++#define   BGMAC_DMA_RX_BL_256			4
++#define   BGMAC_DMA_RX_BL_512			5
++#define   BGMAC_DMA_RX_BL_1024			6
++#define  BGMAC_DMA_RX_PC_MASK			0x00E00000	/* Prefetch control */
++#define  BGMAC_DMA_RX_PC_SHIFT			21
++#define   BGMAC_DMA_RX_PC_0			0
++#define   BGMAC_DMA_RX_PC_4			1
++#define   BGMAC_DMA_RX_PC_8			2
++#define   BGMAC_DMA_RX_PC_16			3
++#define  BGMAC_DMA_RX_PT_MASK			0x03000000	/* Prefetch threshold */
++#define  BGMAC_DMA_RX_PT_SHIFT			24
++#define   BGMAC_DMA_RX_PT_1			0
++#define   BGMAC_DMA_RX_PT_2			1
++#define   BGMAC_DMA_RX_PT_4			2
++#define   BGMAC_DMA_RX_PT_8			3
+ #define BGMAC_DMA_RX_INDEX			0x24
+ #define BGMAC_DMA_RX_RINGLO			0x28
+ #define BGMAC_DMA_RX_RINGHI			0x2C
+@@ -342,10 +378,6 @@
+ #define BGMAC_CHIPCTL_1_SW_TYPE_RGMII		0x000000C0
+ #define BGMAC_CHIPCTL_1_RXC_DLL_BYPASS		0x00010000
+ 
+-#define BGMAC_SPEED_10				0x0001
+-#define BGMAC_SPEED_100				0x0002
+-#define BGMAC_SPEED_1000			0x0004
+-
+ #define BGMAC_WEIGHT	64
+ 
+ #define ETHER_MAX_LEN   1518
+@@ -384,6 +416,8 @@ struct bgmac_dma_ring {
+ 	u16 mmio_base;
+ 	struct bgmac_dma_desc *cpu_base;
+ 	dma_addr_t dma_base;
++	u32 index_base; /* Used for unaligned rings only, otherwise 0 */
++	bool unaligned;
+ 
+ 	struct bgmac_slot_info slots[BGMAC_RX_RING_SLOTS];
+ };
+@@ -400,6 +434,7 @@ struct bgmac {
+ 	struct net_device *net_dev;
+ 	struct napi_struct napi;
+ 	struct mii_bus *mii_bus;
++	struct phy_device *phy_dev;
+ 
+ 	/* DMA */
+ 	struct bgmac_dma_ring tx_ring[BGMAC_MAX_TX_RINGS];
+@@ -414,10 +449,9 @@ struct bgmac {
+ 	u32 int_mask;
+ 	u32 int_status;
+ 
+-	/* Speed-related */
+-	int speed;
+-	bool autoneg;
+-	bool full_duplex;
++	/* Current MAC state */
++	int mac_speed;
++	int mac_duplex;
+ 
+ 	u8 phyaddr;
+ 	bool has_robosw;
diff --git a/trunk/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch b/trunk/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
new file mode 100644
index 00000000..c2eef699
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
@@ -0,0 +1,72 @@
+Register switch connected to srab
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -16,6 +16,7 @@
+ #include <linux/phy.h>
+ #include <linux/interrupt.h>
+ #include <linux/dma-mapping.h>
++#include <linux/platform_data/b53.h>
+ #include <bcm47xx_nvram.h>
+ 
+ static const struct bcma_device_id bgmac_bcma_tbl[] = {
+@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct 
+ 	mdiobus_free(mii_bus);
+ }
+ 
++static struct b53_platform_data bgmac_b53_pdata = {
++};
++
++static struct platform_device bgmac_b53_dev = {
++	.name		= "b53-srab-switch",
++	.id		= -1,
++	.dev		= {
++		.platform_data = &bgmac_b53_pdata,
++	},
++};
++
+ /**************************************************
+  * BCMA bus ops
+  **************************************************/
+@@ -1521,6 +1533,16 @@ static int bgmac_probe(struct bcma_devic
+ 		goto err_dma_free;
+ 	}
+ 
++	if (core->id.id != BCMA_CHIP_ID_BCM4707 &&
++	    core->id.id != BCMA_CHIP_ID_BCM53018 &&
++	    !bgmac_b53_pdata.regs) {
++		bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
++
++		err = platform_device_register(&bgmac_b53_dev);
++		if (!err)
++			bgmac->b53_device = &bgmac_b53_dev;
++	}
++
+ 	err = register_netdev(bgmac->net_dev);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register net device\n");
+@@ -1549,6 +1571,10 @@ static void bgmac_remove(struct bcma_dev
+ {
+ 	struct bgmac *bgmac = bcma_get_drvdata(core);
+ 
++	if (bgmac->b53_device)
++		platform_device_unregister(&bgmac_b53_dev);
++	bgmac->b53_device = NULL;
++
+ 	netif_napi_del(&bgmac->napi);
+ 	unregister_netdev(bgmac->net_dev);
+ 	bgmac_mii_unregister(bgmac);
+--- a/drivers/net/ethernet/broadcom/bgmac.h
++++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -457,6 +457,9 @@ struct bgmac {
+ 	bool has_robosw;
+ 
+ 	bool loopback;
++
++	/* platform device for associated switch */
++	struct platform_device *b53_device;
+ };
+ 
+ static inline u32 bgmac_read(struct bgmac *bgmac, u16 offset)
diff --git a/trunk/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch b/trunk/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
new file mode 100644
index 00000000..c3d63b65
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
@@ -0,0 +1,39 @@
+From 2d12a9abf3f81de5b51852e3cfcba8cedac82642 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 6 Dec 2013 01:14:52 +0100
+Subject: [PATCH] bgmac: check length of received frame
+
+---
+ drivers/net/ethernet/broadcom/bgmac.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma
+ 			dma_addr_t old_dma_addr = slot->dma_addr;
+ 			int err;
+ 
++			if (len > BGMAC_RX_MAX_FRAME_SIZE) {
++				struct bgmac_dma_desc *dma_desc = ring->cpu_base + ring->start;
++
++				bgmac_err(bgmac, "Hardware reported invalid packet length %d for slot %d!\n", len, ring->start);
++				bgmac_err(bgmac, "flags: 0x%04X\n", flags);
++				bgmac_err(bgmac, "ctl0: 0x%08X\tctl1: 0x%08X\n", le32_to_cpu(dma_desc->ctl0), le32_to_cpu(dma_desc->ctl1));
++
++				bgmac_err(bgmac, "   BGMAC_DMA_RX_CTL: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_INDEX: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGLO: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGLO));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGHI: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGHI));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_STATUS: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_STATUS));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_ERROR: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_ERROR));
++
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
++			}
++
+ 			/* Check for poison and drop or pass the packet */
+ 			if (len == 0xdead && flags == 0xbeef) {
+ 				bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
diff --git a/trunk/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch b/trunk/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch
new file mode 100644
index 00000000..8a8aeb5d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch
@@ -0,0 +1,51 @@
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -63,6 +63,12 @@ config XEN_PCIDEV_FRONTEND
+           The PCI device frontend driver allows the kernel to import arbitrary
+           PCI devices from a PCI backend to support PCI driver domains.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++	bool "PCI disable common quirks"
++	depends on PCI
++	help
++	  If you don't know what to do here, say N.
++
+ config HT_IRQ
+ 	bool "Interrupts on hypertransport devices"
+ 	default y
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -44,6 +44,7 @@ static void quirk_mmio_always_on(struct 
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
+ 				PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -2866,6 +2867,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ static ktime_t fixup_debug_start(struct pci_dev *dev,
+ 				 void (*fn)(struct pci_dev *dev))
+@@ -2897,6 +2899,8 @@ static void fixup_debug_report(struct pc
+ 	}
+ }
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ /*
+  * Some BIOS implementations leave the Intel GPU interrupts enabled,
+  * even though no one is handling them (f.e. i915 driver is never loaded).
+@@ -2932,6 +2936,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
+ /*
+  * Some devices may pass our check in pci_intx_mask_supported if
+  * PCI_COMMAND_INTX_DISABLE works though they actually do not properly
diff --git a/trunk/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch b/trunk/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 00000000..05299982
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,80 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -79,6 +79,8 @@
+ #define USB_INTEL_USB3_PSSEN   0xD8
+ #define USB_INTEL_USB3PRM      0xDC
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static struct amd_chipset_info {
+ 	struct pci_dev	*nb_dev;
+ 	struct pci_dev	*smbus_dev;
+@@ -353,6 +355,10 @@ void usb_amd_dev_put(void)
+ }
+ EXPORT_SYMBOL_GPL(usb_amd_dev_put);
+ 
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
++#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
++
+ /*
+  * Make sure the controller is completely inactive, unable to
+  * generate interrupts or do DMA.
+@@ -432,8 +438,17 @@ reset_needed:
+ 	uhci_reset_hc(pdev, base);
+ 	return 1;
+ }
++#else
++int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
++{
++	return 0;
++}
++
++#endif
+ EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ {
+ 	u16 cmd;
+@@ -987,3 +1002,4 @@ static void quirk_usb_early_handoff(stru
+ }
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+ 			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+--- a/drivers/usb/host/pci-quirks.h
++++ b/drivers/usb/host/pci-quirks.h
+@@ -4,6 +4,9 @@
+ #ifdef CONFIG_PCI
+ void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
+ int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
++#endif  /* CONFIG_PCI */
++
++#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ int usb_amd_find_chipset_info(void);
+ void usb_amd_dev_put(void);
+ void usb_amd_quirk_pll_disable(void);
+@@ -12,10 +15,20 @@ bool usb_is_intel_switchable_xhci(struct
+ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
+ void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
+ #else
++static inline int usb_amd_find_chipset_info(void)
++{
++	return 0;
++}
+ static inline void usb_amd_quirk_pll_disable(void) {}
+ static inline void usb_amd_quirk_pll_enable(void) {}
+ static inline void usb_amd_dev_put(void) {}
++
++static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
++{
++	return false;
++}
++static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {}
+ static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
+-#endif  /* CONFIG_PCI */
++#endif
+ 
+ #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
diff --git a/trunk/target/linux/generic/patches-3.10/820-usb_add_usb_find_device_by_name.patch b/trunk/target/linux/generic/patches-3.10/820-usb_add_usb_find_device_by_name.patch
new file mode 100644
index 00000000..720b740c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/820-usb_add_usb_find_device_by_name.patch
@@ -0,0 +1,84 @@
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -645,6 +645,71 @@ int __usb_get_extra_descriptor(char *buf
+ }
+ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
+ 
++static struct usb_device *match_device_name(struct usb_device *dev,
++					    const char *name)
++{
++	struct usb_device *ret_dev = NULL;
++	struct usb_device *childdev = NULL;
++	int child;
++
++	dev_dbg(&dev->dev, "check for name %s ...\n", name);
++
++	/* see if this device matches */
++	if (strcmp(dev_name(&dev->dev), name) == 0 ) {
++		dev_dbg(&dev->dev, "matched this device!\n");
++		ret_dev = usb_get_dev(dev);
++		goto exit;
++	}
++	/* look through all of the children of this device */
++	usb_hub_for_each_child(dev, child, childdev) {
++		if (childdev) {
++			usb_lock_device(childdev);
++			ret_dev = match_device_name(childdev, name);
++			usb_unlock_device(childdev);
++			if (ret_dev)
++				goto exit;
++		}
++	}
++exit:
++	return ret_dev;
++}
++
++/**
++ * usb_find_device_by_name - find a specific usb device in the system
++ * @name: the name of the device to find
++ *
++ * Returns a pointer to a struct usb_device if such a specified usb
++ * device is present in the system currently.  The usage count of the
++ * device will be incremented if a device is found.  Make sure to call
++ * usb_put_dev() when the caller is finished with the device.
++ *
++ * If a device with the specified bus id is not found, NULL is returned.
++ */
++struct usb_device *usb_find_device_by_name(const char *name)
++{
++	struct list_head *buslist;
++	struct usb_bus *bus;
++	struct usb_device *dev = NULL;
++
++	mutex_lock(&usb_bus_list_lock);
++	for (buslist = usb_bus_list.next;
++	     buslist != &usb_bus_list;
++	     buslist = buslist->next) {
++		bus = container_of(buslist, struct usb_bus, bus_list);
++		if (!bus->root_hub)
++			continue;
++		usb_lock_device(bus->root_hub);
++		dev = match_device_name(bus->root_hub, name);
++		usb_unlock_device(bus->root_hub);
++		if (dev)
++			goto exit;
++	}
++exit:
++	mutex_unlock(&usb_bus_list_lock);
++	return dev;
++}
++EXPORT_SYMBOL_GPL(usb_find_device_by_name);
++
+ /**
+  * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP
+  * @dev: device the buffer will be used with
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -675,6 +675,7 @@ static inline bool usb_device_supports_l
+ 	return udev->bos->ss_cap->bmAttributes & USB_LTM_SUPPORT;
+ }
+ 
++extern struct usb_device *usb_find_device_by_name(const char *name);
+ 
+ /*-------------------------------------------------------------------------*/
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/830-ledtrig_morse.patch b/trunk/target/linux/generic/patches-3.10/830-ledtrig_morse.patch
new file mode 100644
index 00000000..11b6b543
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/830-ledtrig_morse.patch
@@ -0,0 +1,28 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA
+ 	  This enables direct flash/torch on/off by the driver, kernel space.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_MORSE
++	tristate "LED Morse Trigger"
++	depends on LEDS_TRIGGERS
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -59,3 +59,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ 
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
++obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+--- a/drivers/leds/ledtrig-morse.c
++++ b/drivers/leds/ledtrig-morse.c
+@@ -26,7 +26,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/leds.h>
diff --git a/trunk/target/linux/generic/patches-3.10/831-ledtrig_netdev.patch b/trunk/target/linux/generic/patches-3.10/831-ledtrig_netdev.patch
new file mode 100644
index 00000000..e90befd1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/831-ledtrig_netdev.patch
@@ -0,0 +1,51 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE
+ 	tristate "LED Morse Trigger"
+ 	depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_NETDEV
++	tristate "LED Netdev Trigger"
++	depends on NET && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by network device activity.
++	  If unsure, say Y.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -60,3 +60,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
++obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+--- a/drivers/leds/ledtrig-netdev.c
++++ b/drivers/leds/ledtrig-netdev.c
+@@ -22,7 +22,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/netdevice.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+@@ -294,8 +293,9 @@ done:
+ static void netdev_trig_timer(unsigned long arg)
+ {
+ 	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
+-	const struct net_device_stats *dev_stats;
++	struct rtnl_link_stats64 *dev_stats;
+ 	unsigned new_activity;
++	struct rtnl_link_stats64 temp;
+ 
+ 	write_lock(&trigger_data->lock);
+ 
+@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
+ 		goto no_restart;
+ 	}
+ 
+-	dev_stats = dev_get_stats(trigger_data->net_dev);
++	dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
+ 	new_activity =
+ 		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
+ 		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
diff --git a/trunk/target/linux/generic/patches-3.10/832-ledtrig_usbdev.patch b/trunk/target/linux/generic/patches-3.10/832-ledtrig_usbdev.patch
new file mode 100644
index 00000000..27149c6d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/832-ledtrig_usbdev.patch
@@ -0,0 +1,31 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV
+ 	  This allows LEDs to be controlled by network device activity.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_USBDEV
++	tristate "LED USB device Trigger"
++	depends on USB && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by the presence/activity of
++	  an USB device. If unsure, say N.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -61,3 +61,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
++obj-$(CONFIG_LEDS_TRIGGER_USBDEV)	+= ledtrig-usbdev.o
+--- a/drivers/leds/ledtrig-usbdev.c
++++ b/drivers/leds/ledtrig-usbdev.c
+@@ -24,7 +24,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/slab.h>
diff --git a/trunk/target/linux/generic/patches-3.10/840-rtc7301.patch b/trunk/target/linux/generic/patches-3.10/840-rtc7301.patch
new file mode 100644
index 00000000..a84bf93d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/840-rtc7301.patch
@@ -0,0 +1,250 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -841,6 +841,15 @@ config RTC_DRV_NUC900
+ 	  If you say yes here you get support for the RTC subsystem of the
+ 	  NUC910/NUC920 used in embedded systems.
+ 
++config RTC_DRV_RTC7301
++	tristate "Epson RTC-7301 SF/DG"
++	help
++	  If you say Y here you will get support for the
++	  Epson RTC-7301 SF/DG RTC chips.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-7301.
++
+ comment "on-CPU RTC drivers"
+ 
+ config RTC_DRV_DAVINCI
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -100,6 +100,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
+ obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
+ obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
+ obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
++obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
+ obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o
+ obj-$(CONFIG_RTC_DRV_RX4581)	+= rtc-rx4581.o
+ obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
+--- /dev/null
++++ b/drivers/rtc/rtc-rtc7301.c
+@@ -0,0 +1,219 @@
++/*
++ * Driver for Epson RTC-7301SF/DG
++ *
++ * Copyright (C) 2009 Jose Vasconcellos
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/rtc.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/bcd.h>
++
++#define RTC_NAME "rtc7301"
++#define RTC_VERSION "0.1"
++
++/* Epson RTC-7301 register addresses */
++#define RTC7301_SEC		0x00
++#define RTC7301_SEC10		0x01
++#define RTC7301_MIN		0x02
++#define RTC7301_MIN10		0x03
++#define RTC7301_HOUR		0x04
++#define RTC7301_HOUR10		0x05
++#define RTC7301_WEEKDAY		0x06
++#define RTC7301_DAY		0x07
++#define RTC7301_DAY10		0x08
++#define RTC7301_MON		0x09
++#define RTC7301_MON10		0x0A
++#define RTC7301_YEAR		0x0B
++#define RTC7301_YEAR10		0x0C
++#define RTC7301_YEAR100		0x0D
++#define RTC7301_YEAR1000	0x0E
++#define RTC7301_CTRLREG		0x0F
++
++static uint8_t __iomem *rtc7301_base;
++
++#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
++#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
++
++#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
++
++static void rtc7301_init_settings(void)
++{
++	int i;
++
++	write_reg(RTC7301_CTRLREG, 2);
++	write_reg(RTC7301_YEAR1000, 2);
++	udelay(122);
++
++	/* bank 1 */
++	write_reg(RTC7301_CTRLREG, 6);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++
++	/* bank 2 */
++	write_reg(RTC7301_CTRLREG, 14);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++	write_reg(RTC7301_CTRLREG, 0);
++}
++
++static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int cnt;
++	uint8_t buf[16];
++
++	cnt = 0;
++	while (rtc7301_isbusy()) {
++		udelay(244);
++		if (cnt++ > 100) {
++			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
++			return -EIO;
++		}
++	}
++
++	for (cnt=0; cnt<16; cnt++)
++		buf[cnt] = read_reg(cnt);
++
++	if (buf[RTC7301_SEC10] & 8) {
++		dev_err(dev, "%s: RTC not set\n", __func__);
++		return -EINVAL;
++	}
++
++	memset(dt, 0, sizeof(*dt));
++
++	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
++	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
++	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
++
++	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
++	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
++	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
++		      buf[RTC7301_YEAR100]*100 +
++		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
++
++	/* the rtc device may contain illegal values on power up
++	 * according to the data sheet. make sure they are valid.
++	 */
++
++	return rtc_valid_tm(dt);
++}
++
++static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int data;
++
++	data = dt->tm_year + 1900;
++	if (data >= 2100 || data < 1900)
++		return -EINVAL;
++
++	write_reg(RTC7301_CTRLREG, 2);
++       	udelay(122);
++
++	data = bin2bcd(dt->tm_sec);
++	write_reg(RTC7301_SEC, data);
++	write_reg(RTC7301_SEC10, (data >> 4));
++
++	data = bin2bcd(dt->tm_min);
++	write_reg(RTC7301_MIN, data );
++	write_reg(RTC7301_MIN10, (data >> 4));
++
++	data = bin2bcd(dt->tm_hour);
++	write_reg(RTC7301_HOUR, data);
++	write_reg(RTC7301_HOUR10, (data >> 4));
++
++	data = bin2bcd(dt->tm_mday);
++	write_reg(RTC7301_DAY, data);
++	write_reg(RTC7301_DAY10, (data>> 4));
++
++	data = bin2bcd(dt->tm_mon + 1);
++	write_reg(RTC7301_MON, data);
++	write_reg(RTC7301_MON10, (data >> 4));
++
++	data = bin2bcd(dt->tm_year % 100);
++	write_reg(RTC7301_YEAR, data);
++	write_reg(RTC7301_YEAR10, (data >> 4));
++	data = bin2bcd((1900 + dt->tm_year) / 100);
++	write_reg(RTC7301_YEAR100, data);
++
++	data = bin2bcd(dt->tm_wday);
++	write_reg(RTC7301_WEEKDAY, data);
++
++	write_reg(RTC7301_CTRLREG, 0);
++
++	return 0;
++}
++
++static const struct rtc_class_ops rtc7301_rtc_ops = {
++	.read_time	= rtc7301_get_datetime,
++	.set_time	= rtc7301_set_datetime,
++};
++
++static int rtc7301_probe(struct platform_device *pdev)
++{
++	struct rtc_device *rtc;
++	struct resource *res;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENOENT;
++
++	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
++	if (!rtc7301_base)
++		return -EINVAL;
++
++	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
++				&rtc7301_rtc_ops, THIS_MODULE);
++	if (IS_ERR(rtc)) {
++		iounmap(rtc7301_base);
++		return PTR_ERR(rtc);
++	}
++
++	platform_set_drvdata(pdev, rtc);
++
++	rtc7301_init_settings();
++	return 0;
++}
++
++static int rtc7301_remove(struct platform_device *pdev)
++{
++	struct rtc_device *rtc = platform_get_drvdata(pdev);
++
++	if (rtc)
++		rtc_device_unregister(rtc);
++	if (rtc7301_base)
++		iounmap(rtc7301_base);
++	return 0;
++}
++
++static struct platform_driver rtc7301_driver = {
++	.driver = {
++		.name	= RTC_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe	= rtc7301_probe,
++	.remove = rtc7301_remove,
++};
++
++static __init int rtc7301_init(void)
++{
++	return platform_driver_register(&rtc7301_driver);
++}
++module_init(rtc7301_init);
++
++static __exit void rtc7301_exit(void)
++{
++	platform_driver_unregister(&rtc7301_driver);
++}
++module_exit(rtc7301_exit);
++
++MODULE_DESCRIPTION("Epson 7301 RTC driver");
++MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" RTC_NAME);
++MODULE_VERSION(RTC_VERSION);
diff --git a/trunk/target/linux/generic/patches-3.10/841-rtc_pt7c4338.patch b/trunk/target/linux/generic/patches-3.10/841-rtc_pt7c4338.patch
new file mode 100644
index 00000000..8ed968ed
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/841-rtc_pt7c4338.patch
@@ -0,0 +1,247 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -488,6 +488,15 @@ config RTC_DRV_RV3029C2
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-rv3029c2.
+ 
++config RTC_DRV_PT7C4338
++	tristate "Pericom Technology Inc. PT7C4338 RTC"
++	help
++	  If you say yes here you get support for the Pericom Technology
++	  Inc. PT7C4338 RTC chip.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-pt7c4338.
++
+ endif # I2C
+ 
+ comment "SPI RTC drivers"
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -92,6 +92,7 @@ obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030
+ obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
+ obj-$(CONFIG_RTC_DRV_PM8XXX)	+= rtc-pm8xxx.o
+ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
++obj-$(CONFIG_RTC_DRV_PT7C4338)	+= rtc-pt7c4338.o
+ obj-$(CONFIG_RTC_DRV_PUV3)	+= rtc-puv3.o
+ obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
+ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
+--- /dev/null
++++ b/drivers/rtc/rtc-pt7c4338.c
+@@ -0,0 +1,216 @@
++/*
++ * Copyright 2010 Freescale Semiconductor, Inc.
++ *
++ * Author:	Priyanka Jain <Priyanka.Jain@freescale.com>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++
++/*
++ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
++ *
++ * This file is based on drivers/rtc/rtc-ds1307.c
++ *
++ * PT7C4338 chip is manufactured by Pericom Technology Inc.
++ * It is a serial real-time clock which provides
++ * 1)Low-power clock/calendar.
++ * 2)Programmable square-wave output.
++ * It has 56 bytes of nonvolatile RAM.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++
++/* RTC register addresses */
++#define PT7C4338_REG_SECONDS          0x00
++#define PT7C4338_REG_MINUTES          0x01
++#define PT7C4338_REG_HOURS            0x02
++#define PT7C4338_REG_AMPM             0x02
++#define PT7C4338_REG_DAY              0x03
++#define PT7C4338_REG_DATE             0x04
++#define PT7C4338_REG_MONTH            0x05
++#define PT7C4338_REG_YEAR             0x06
++#define PT7C4338_REG_CTRL_STAT        0x07
++
++/* RTC second register address bit */
++#define PT7C4338_SEC_BIT_CH           0x80	/*Clock Halt (in Register 0)*/
++
++/* RTC control and status register bits */
++#define PT7C4338_CTRL_STAT_BIT_RS0    0x1	/*Rate select 0*/
++#define PT7C4338_CTRL_STAT_BIT_RS1    0x2	/*Rate select 1*/
++#define PT7C4338_CTRL_STAT_BIT_SQWE   0x10	/*Square Wave Enable*/
++#define PT7C4338_CTRL_STAT_BIT_OSF    0x20	/*Oscillator Stop Flag*/
++#define PT7C4338_CTRL_STAT_BIT_OUT    0x80	/*Output Level Control*/
++
++static const struct i2c_device_id pt7c4338_id[] = {
++	{ "pt7c4338", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, pt7c4338_id);
++
++struct pt7c4338{
++	struct i2c_client *client;
++	struct rtc_device *rtc;
++};
++
++static int pt7c4338_read_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	int ret;
++	u8 buf[7];
++	u8 year, month, day, hour, minute, second;
++	u8 week, twelve_hr, am_pm;
++
++	ret = i2c_smbus_read_i2c_block_data(client,
++			PT7C4338_REG_SECONDS, 7, buf);
++	if (ret < 0)
++		return ret;
++	if (ret < 7)
++		return -EIO;
++
++	second = buf[0];
++	minute = buf[1];
++	hour = buf[2];
++	week = buf[3];
++	day = buf[4];
++	month = buf[5];
++	year = buf[6];
++
++	/* Extract additional information for AM/PM */
++	twelve_hr = hour & 0x40;
++	am_pm = hour & 0x20;
++
++	/* Write to rtc_time structure */
++	time->tm_sec = bcd2bin(second & 0x7f);
++	time->tm_min = bcd2bin(minute & 0x7f);
++	if (twelve_hr) {
++		/* Convert to 24 hr */
++		if (am_pm)
++			time->tm_hour = bcd2bin(hour & 0x10) + 12;
++		else
++			time->tm_hour = bcd2bin(hour & 0xBF);
++	} else {
++		time->tm_hour = bcd2bin(hour);
++	}
++
++	time->tm_wday = bcd2bin(week & 0x07) - 1;
++	time->tm_mday = bcd2bin(day & 0x3f);
++	time->tm_mon = bcd2bin(month & 0x1F) - 1;
++	/* assume 20YY not 19YY */
++	time->tm_year = bcd2bin(year) + 100;
++
++	return 0;
++}
++
++static int pt7c4338_set_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	u8 buf[7];
++
++	/* Extract time from rtc_time and load into pt7c4338*/
++	buf[0] = bin2bcd(time->tm_sec);
++	buf[1] = bin2bcd(time->tm_min);
++	buf[2] = bin2bcd(time->tm_hour);
++	buf[3] = bin2bcd(time->tm_wday + 1); /* Day of the week */
++	buf[4] = bin2bcd(time->tm_mday); /* Date */
++	buf[5] = bin2bcd(time->tm_mon + 1);
++
++	/* assume 20YY not 19YY */
++	if (time->tm_year >= 100)
++		buf[6] = bin2bcd(time->tm_year - 100);
++	else
++		buf[6] = bin2bcd(time->tm_year);
++
++	return i2c_smbus_write_i2c_block_data(client,
++					PT7C4338_REG_SECONDS, 7, buf);
++}
++
++static const struct rtc_class_ops pt7c4338_rtc_ops = {
++	.read_time = pt7c4338_read_time,
++	.set_time = pt7c4338_set_time,
++};
++
++static int pt7c4338_probe(struct i2c_client *client,
++		const struct i2c_device_id *id)
++{
++	struct pt7c4338 *pt7c4338;
++	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
++	int ret;
++
++	pt7c4338 = kzalloc(sizeof(struct pt7c4338), GFP_KERNEL);
++	if (!pt7c4338)
++		return -ENOMEM;
++
++	pt7c4338->client = client;
++	i2c_set_clientdata(client, pt7c4338);
++	pt7c4338->rtc = rtc_device_register(client->name, &client->dev,
++					&pt7c4338_rtc_ops, THIS_MODULE);
++	if (IS_ERR(pt7c4338->rtc)) {
++		ret = PTR_ERR(pt7c4338->rtc);
++		dev_err(&client->dev, "unable to register the class device\n");
++		goto out_free;
++	}
++
++	return 0;
++out_free:
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return ret;
++}
++
++static int pt7c4338_remove(struct i2c_client *client)
++{
++	struct pt7c4338 *pt7c4338 = i2c_get_clientdata(client);
++
++	rtc_device_unregister(pt7c4338->rtc);
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return 0;
++}
++
++static struct i2c_driver pt7c4338_driver = {
++	.driver = {
++		.name = "rtc-pt7c4338",
++		.owner = THIS_MODULE,
++	},
++	.probe = pt7c4338_probe,
++	.remove = pt7c4338_remove,
++	.id_table = pt7c4338_id,
++};
++
++static int __init pt7c4338_init(void)
++{
++	return i2c_add_driver(&pt7c4338_driver);
++}
++
++static void __exit pt7c4338_exit(void)
++{
++	i2c_del_driver(&pt7c4338_driver);
++}
++
++module_init(pt7c4338_init);
++module_exit(pt7c4338_exit);
++
++MODULE_AUTHOR("Priyanka Jain <Priyanka.Jain@freescale.com>");
++MODULE_DESCRIPTION("pericom Technology Inc. PT7C4338 RTC Driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.10/861-04_spi_gpio_implement_spi_delay.patch b/trunk/target/linux/generic/patches-3.10/861-04_spi_gpio_implement_spi_delay.patch
new file mode 100644
index 00000000..4be08956
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/861-04_spi_gpio_implement_spi_delay.patch
@@ -0,0 +1,58 @@
+Implement the SPI-GPIO delay function for busses that need speed limitation.
+
+--mb
+
+
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -22,6 +22,7 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/delay.h>
+ #include <linux/of_device.h>
+ #include <linux/of_gpio.h>
+ 
+@@ -73,6 +74,7 @@ struct spi_gpio {
+  *		#define	SPI_MOSI_GPIO	120
+  *		#define	SPI_SCK_GPIO	121
+  *		#define	SPI_N_CHIPSEL	4
++ *		#undef NEED_SPIDELAY
+  *		#include "spi-gpio.c"
+  */
+ 
+@@ -80,6 +82,7 @@ struct spi_gpio {
+ #define DRIVER_NAME	"spi_gpio"
+ 
+ #define GENERIC_BITBANG	/* vs tight inlines */
++#define NEED_SPIDELAY	1
+ 
+ /* all functions referencing these symbols must define pdata */
+ #define SPI_MISO_GPIO	((pdata)->miso)
+@@ -130,12 +133,20 @@ static inline int getmiso(const struct s
+ #undef pdata
+ 
+ /*
+- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
+- * requested device clock.  Software overhead means we usually have trouble
+- * reaching even one Mbit/sec (except when we can inline bitops), so for now
+- * we'll just assume we never need additional per-bit slowdowns.
++ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
++ * and spi_transfer.speed_hz to 0.
++ * Otherwise this is a function of the requested device clock.
++ * Software overhead means we usually have trouble
++ * reaching even one Mbit/sec (except when we can inline bitops). So on small
++ * embedded devices with fast SPI slaves you usually don't need a delay.
+  */
+-#define spidelay(nsecs)	do {} while (0)
++static inline void spidelay(unsigned nsecs)
++{
++#ifdef NEED_SPIDELAY
++	if (unlikely(nsecs))
++		ndelay(nsecs);
++#endif /* NEED_SPIDELAY */
++}
+ 
+ #include "spi-bitbang-txrx.h"
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/862-gpio_spi_driver.patch b/trunk/target/linux/generic/patches-3.10/862-gpio_spi_driver.patch
new file mode 100644
index 00000000..2d79cdee
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/862-gpio_spi_driver.patch
@@ -0,0 +1,373 @@
+THIS CODE IS DEPRECATED.
+
+Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+--mb
+
+
+
+---
+ drivers/spi/Kconfig              |    9 +
+ drivers/spi/Makefile             |    1 
+ drivers/spi/spi_gpio_old.c       |  251 +++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi_gpio_old.h |   73 +++++++++++
+ 4 files changed, 334 insertions(+)
+
+--- /dev/null
++++ b/include/linux/spi/spi_gpio_old.h
+@@ -0,0 +1,73 @@
++/*
++ * spi_gpio interface to platform code
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++#ifndef _LINUX_SPI_SPI_GPIO
++#define _LINUX_SPI_SPI_GPIO
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++
++
++/**
++ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
++ *
++ * This structure holds information about a GPIO-based SPI device.
++ *
++ * @pin_clk: The GPIO pin number of the CLOCK pin.
++ *
++ * @pin_miso: The GPIO pin number of the MISO pin.
++ *
++ * @pin_mosi: The GPIO pin number of the MOSI pin.
++ *
++ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
++ *
++ * @cs_activelow: If true, the chip is selected when the CS line is low.
++ *
++ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
++ *                Note that doing no delay is not standards compliant,
++ *                but it might be needed to speed up transfers on some
++ *                slow embedded machines.
++ *
++ * @boardinfo_setup: This callback is called after the
++ *                   SPI master device was registered, but before the
++ *                   device is registered.
++ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
++ */
++struct spi_gpio_platform_data {
++	unsigned int pin_clk;
++	unsigned int pin_miso;
++	unsigned int pin_mosi;
++	unsigned int pin_cs;
++	bool cs_activelow;
++	bool no_spi_delay;
++	int (*boardinfo_setup)(struct spi_board_info *bi,
++			       struct spi_master *master,
++			       void *data);
++	void *boardinfo_setup_data;
++};
++
++/**
++ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a spi-gpio device.
++ */
++#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
++
++/**
++ * spi_gpio_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int spi_gpio_next_id(void);
++
++#endif /* _LINUX_SPI_SPI_GPIO */
+--- /dev/null
++++ b/drivers/spi/spi_gpio_old.c
+@@ -0,0 +1,251 @@
++/*
++ * Bitbanging SPI bus driver using GPIO API
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * based on spi_s3c2410_gpio.c
++ *   Copyright (c) 2006 Ben Dooks
++ *   Copyright (c) 2006 Simtec Electronics
++ * and on i2c-gpio.c
++ *   Copyright (C) 2007 Atmel Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/spi_bitbang.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++struct spi_gpio {
++	struct spi_bitbang bitbang;
++	struct spi_gpio_platform_data *info;
++	struct platform_device *pdev;
++	struct spi_board_info bi;
++};
++
++
++static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
++{
++	return dev->controller_data;
++}
++
++static inline void setsck(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
++}
++
++static inline void setmosi(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
++}
++
++static inline u32 getmiso(struct spi_device *dev)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
++}
++
++static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (!sp->info->no_spi_delay)
++		ndelay(nsecs);
++}
++
++#define spidelay(nsecs) do {					\
++	/* Steal the spi_device pointer from our caller.	\
++	 * The bitbang-API should probably get fixed here... */	\
++	do_spidelay(spi, nsecs);				\
++  } while (0)
++
++#define EXPAND_BITBANG_TXRX
++#include "spi-bitbang-txrx.h"
++
++static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
++}
++
++static void spi_gpio_chipselect(struct spi_device *dev, int on)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (sp->info->cs_activelow)
++		on = !on;
++	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
++}
++
++static int spi_gpio_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct spi_gpio_platform_data *pdata;
++	struct spi_gpio *sp;
++	struct spi_device *spidev;
++	int err;
++
++	pdata = pdev->dev.platform_data;
++	if (!pdata)
++		return -ENXIO;
++
++	err = -ENOMEM;
++	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
++	if (!master)
++		goto err_alloc_master;
++
++	sp = spi_master_get_devdata(master);
++	platform_set_drvdata(pdev, sp);
++	sp->info = pdata;
++
++	err = gpio_request(pdata->pin_clk, "spi_clock");
++	if (err)
++		goto err_request_clk;
++	err = gpio_request(pdata->pin_mosi, "spi_mosi");
++	if (err)
++		goto err_request_mosi;
++	err = gpio_request(pdata->pin_miso, "spi_miso");
++	if (err)
++		goto err_request_miso;
++	err = gpio_request(pdata->pin_cs, "spi_cs");
++	if (err)
++		goto err_request_cs;
++
++	sp->bitbang.master = spi_master_get(master);
++	sp->bitbang.master->bus_num = -1;
++	sp->bitbang.master->num_chipselect = 1;
++	sp->bitbang.chipselect = spi_gpio_chipselect;
++	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
++	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
++	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
++	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
++
++	gpio_direction_output(pdata->pin_clk, 0);
++	gpio_direction_output(pdata->pin_mosi, 0);
++	gpio_direction_output(pdata->pin_cs,
++			      pdata->cs_activelow ? 1 : 0);
++	gpio_direction_input(pdata->pin_miso);
++
++	err = spi_bitbang_start(&sp->bitbang);
++	if (err)
++		goto err_no_bitbang;
++	err = pdata->boardinfo_setup(&sp->bi, master,
++				     pdata->boardinfo_setup_data);
++	if (err)
++		goto err_bi_setup;
++	sp->bi.controller_data = sp;
++	spidev = spi_new_device(master, &sp->bi);
++	if (!spidev)
++		goto err_new_dev;
++
++	return 0;
++
++err_new_dev:
++err_bi_setup:
++	spi_bitbang_stop(&sp->bitbang);
++err_no_bitbang:
++	spi_master_put(sp->bitbang.master);
++	gpio_free(pdata->pin_cs);
++err_request_cs:
++	gpio_free(pdata->pin_miso);
++err_request_miso:
++	gpio_free(pdata->pin_mosi);
++err_request_mosi:
++	gpio_free(pdata->pin_clk);
++err_request_clk:
++	kfree(master);
++
++err_alloc_master:
++	return err;
++}
++
++static int spi_gpio_remove(struct platform_device *pdev)
++{
++	struct spi_gpio *sp;
++	struct spi_gpio_platform_data *pdata;
++
++	pdata = pdev->dev.platform_data;
++	sp = platform_get_drvdata(pdev);
++
++	gpio_free(pdata->pin_clk);
++	gpio_free(pdata->pin_mosi);
++	gpio_free(pdata->pin_miso);
++	gpio_free(pdata->pin_cs);
++	spi_bitbang_stop(&sp->bitbang);
++	spi_master_put(sp->bitbang.master);
++
++	return 0;
++}
++
++static struct platform_driver spi_gpio_driver = {
++	.driver		= {
++		.name	= SPI_GPIO_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe		= spi_gpio_probe,
++	.remove		= spi_gpio_remove,
++};
++
++int spi_gpio_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(spi_gpio_next_id);
++
++static int __init spi_gpio_init(void)
++{
++	int err;
++
++	err = platform_driver_register(&spi_gpio_driver);
++	if (err)
++		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
++
++	return err;
++}
++module_init(spi_gpio_init);
++
++static void __exit spi_gpio_exit(void)
++{
++	platform_driver_unregister(&spi_gpio_driver);
++}
++module_exit(spi_gpio_exit);
++
++MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
++MODULE_LICENSE("GPL v2");
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -189,6 +189,15 @@ config SPI_GPIO
+ 	  GPIO operations, you should be able to leverage that for better
+ 	  speed with a custom version of this driver; see the source code.
+ 
++config SPI_GPIO_OLD
++	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
++	depends on SPI_MASTER && GPIOLIB
++	select SPI_BITBANG
++	help
++	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
++
++	  If unsure, say N.
++
+ config SPI_IMX
+ 	tristate "Freescale i.MX SPI controllers"
+ 	depends on ARCH_MXC
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -34,6 +34,7 @@ obj-$(CONFIG_SPI_FSL_LIB)		+= spi-fsl-li
+ obj-$(CONFIG_SPI_FSL_ESPI)		+= spi-fsl-espi.o
+ obj-$(CONFIG_SPI_FSL_SPI)		+= spi-fsl-spi.o
+ obj-$(CONFIG_SPI_GPIO)			+= spi-gpio.o
++obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
+ obj-$(CONFIG_SPI_IMX)			+= spi-imx.o
+ obj-$(CONFIG_SPI_LM70_LLP)		+= spi-lm70llp.o
+ obj-$(CONFIG_SPI_MPC512x_PSC)		+= spi-mpc512x-psc.o
diff --git a/trunk/target/linux/generic/patches-3.10/863-gpiommc.patch b/trunk/target/linux/generic/patches-3.10/863-gpiommc.patch
new file mode 100644
index 00000000..00f7c8d2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/863-gpiommc.patch
@@ -0,0 +1,844 @@
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
+@@ -0,0 +1,609 @@
++/*
++ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
++ * This module hooks up the mmc_spi and spi_gpio modules and also
++ * provides a configfs interface.
++ *
++ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/module.h>
++#include <linux/mmc/gpiommc.h>
++#include <linux/platform_device.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/configfs.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++#define PFX				"gpio-mmc: "
++
++
++struct gpiommc_device {
++	struct platform_device *pdev;
++	struct platform_device *spi_pdev;
++	struct spi_board_info boardinfo;
++};
++
++
++MODULE_DESCRIPTION("GPIO based MMC driver");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_LICENSE("GPL");
++
++
++static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
++				   struct spi_master *master,
++				   void *data)
++{
++	struct gpiommc_device *d = data;
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	/* Bind the SPI master to the MMC-SPI host driver. */
++	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
++
++	bi->max_speed_hz = pdata->max_bus_speed;
++	bi->bus_num = master->bus_num;
++	bi->mode = pdata->mode;
++
++	return 0;
++}
++
++static int gpiommc_probe(struct platform_device *pdev)
++{
++	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
++	struct spi_gpio_platform_data spi_pdata;
++	struct gpiommc_device *d;
++	int err;
++
++	err = -ENXIO;
++	if (!mmc_pdata)
++		goto error;
++
++#ifdef CONFIG_MMC_SPI_MODULE
++	err = request_module("mmc_spi");
++	if (err) {
++		printk(KERN_WARNING PFX
++		       "Failed to request mmc_spi module.\n");
++	}
++#endif /* CONFIG_MMC_SPI_MODULE */
++
++	/* Allocate the GPIO-MMC device */
++	err = -ENOMEM;
++	d = kzalloc(sizeof(*d), GFP_KERNEL);
++	if (!d)
++		goto error;
++	d->pdev = pdev;
++
++	/* Create the SPI-GPIO device */
++	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
++					    spi_gpio_next_id());
++	if (!d->spi_pdev)
++		goto err_free_d;
++
++	memset(&spi_pdata, 0, sizeof(spi_pdata));
++	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
++	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
++	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
++	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
++	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
++	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
++	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
++	spi_pdata.boardinfo_setup_data = d;
++
++	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
++				       sizeof(spi_pdata));
++	if (err)
++		goto err_free_pdev;
++	err = platform_device_add(d->spi_pdev);
++	if (err)
++		goto err_free_pdata;
++	platform_set_drvdata(pdev, d);
++
++	printk(KERN_INFO PFX "MMC-Card \"%s\" "
++	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
++	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
++	       mmc_pdata->pins.gpio_do,
++	       mmc_pdata->pins.gpio_clk,
++	       mmc_pdata->pins.gpio_cs);
++
++	return 0;
++
++err_free_pdata:
++	kfree(d->spi_pdev->dev.platform_data);
++	d->spi_pdev->dev.platform_data = NULL;
++err_free_pdev:
++	platform_device_put(d->spi_pdev);
++err_free_d:
++	kfree(d);
++error:
++	return err;
++}
++
++static int gpiommc_remove(struct platform_device *pdev)
++{
++	struct gpiommc_device *d = platform_get_drvdata(pdev);
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	platform_device_unregister(d->spi_pdev);
++	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
++	       pdata->name);
++	platform_device_put(d->spi_pdev);
++
++	return 0;
++}
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++
++/* A device that was created through configfs */
++struct gpiommc_configfs_device {
++	struct config_item item;
++	/* The platform device, after registration. */
++	struct platform_device *pdev;
++	/* The configuration */
++	struct gpiommc_platform_data pdata;
++};
++
++#define GPIO_INVALID	-1
++
++static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
++{
++	return (dev->pdev != NULL);
++}
++
++static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
++{
++	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
++}
++
++static struct configfs_attribute gpiommc_attr_DI = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_in",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_DO = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_out",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CLK = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_clock",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS_activelow = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect_activelow",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spimode = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_mode",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spidelay = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_delay",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_max_bus_speed = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "max_bus_speed",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_register = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "register",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute *gpiommc_config_attrs[] = {
++	&gpiommc_attr_DI,
++	&gpiommc_attr_DO,
++	&gpiommc_attr_CLK,
++	&gpiommc_attr_CS,
++	&gpiommc_attr_CS_activelow,
++	&gpiommc_attr_spimode,
++	&gpiommc_attr_spidelay,
++	&gpiommc_attr_max_bus_speed,
++	&gpiommc_attr_register,
++	NULL,
++};
++
++static ssize_t gpiommc_config_attr_show(struct config_item *item,
++					struct configfs_attribute *attr,
++					char *page)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	ssize_t count = 0;
++	unsigned int gpio;
++	int err = 0;
++
++	if (attr == &gpiommc_attr_DI) {
++		gpio = dev->pdata.pins.gpio_di;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		gpio = dev->pdata.pins.gpio_do;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		gpio = dev->pdata.pins.gpio_clk;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		gpio = dev->pdata.pins.gpio_cs;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.pins.cs_activelow);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.mode);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 !dev->pdata.no_spi_delay);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.max_bus_speed);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_register) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 gpiommc_is_registered(dev));
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
++			       const char *name)
++{
++	int err;
++
++	if (gpiommc_is_registered(dev))
++		return 0;
++
++	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
++		printk(KERN_ERR PFX
++		       "configfs: Invalid GPIO pin number(s)\n");
++		return -EINVAL;
++	}
++
++	strlcpy(dev->pdata.name, name,
++		sizeof(dev->pdata.name));
++
++	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
++					  gpiommc_next_id());
++	if (!dev->pdev)
++		return -ENOMEM;
++	err = platform_device_add_data(dev->pdev, &dev->pdata,
++				       sizeof(dev->pdata));
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++	err = platform_device_add(dev->pdev);
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++
++	return 0;
++}
++
++static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
++{
++	if (!gpiommc_is_registered(dev))
++		return;
++
++	platform_device_unregister(dev->pdev);
++	dev->pdev = NULL;
++}
++
++static ssize_t gpiommc_config_attr_store(struct config_item *item,
++					 struct configfs_attribute *attr,
++					 const char *page, size_t count)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	int err = -EINVAL;
++	unsigned long data;
++
++	if (attr == &gpiommc_attr_register) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data == 1)
++			err = gpiommc_do_register(dev, item->ci_name);
++		if (data == 0) {
++			gpiommc_do_unregister(dev);
++			err = 0;
++		}
++		goto out;
++	}
++
++	if (gpiommc_is_registered(dev)) {
++		/* The rest of the config parameters can only be set
++		 * as long as the device is not registered, yet. */
++		err = -EBUSY;
++		goto out;
++	}
++
++	if (attr == &gpiommc_attr_DI) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_di = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_do = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_clk = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_cs = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.pins.cs_activelow = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		switch (data) {
++		case 0:
++			dev->pdata.mode = SPI_MODE_0;
++			break;
++		case 1:
++			dev->pdata.mode = SPI_MODE_1;
++			break;
++		case 2:
++			dev->pdata.mode = SPI_MODE_2;
++			break;
++		case 3:
++			dev->pdata.mode = SPI_MODE_3;
++			break;
++		default:
++			goto out;
++		}
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.no_spi_delay = !data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data > UINT_MAX)
++			goto out;
++		dev->pdata.max_bus_speed = data;
++		err = 0;
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static void gpiommc_config_item_release(struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	kfree(dev);
++}
++
++static struct configfs_item_operations gpiommc_config_item_ops = {
++	.release		= gpiommc_config_item_release,
++	.show_attribute		= gpiommc_config_attr_show,
++	.store_attribute	= gpiommc_config_attr_store,
++};
++
++static struct config_item_type gpiommc_dev_ci_type = {
++	.ct_item_ops	= &gpiommc_config_item_ops,
++	.ct_attrs	= gpiommc_config_attrs,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct config_item *gpiommc_make_item(struct config_group *group,
++					     const char *name)
++{
++	struct gpiommc_configfs_device *dev;
++
++	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
++		printk(KERN_ERR PFX "configfs: device name too long\n");
++		return NULL;
++	}
++
++	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++	if (!dev)
++		return NULL;
++
++	config_item_init_type_name(&dev->item, name,
++				   &gpiommc_dev_ci_type);
++
++	/* Assign default configuration */
++	dev->pdata.pins.gpio_di = GPIO_INVALID;
++	dev->pdata.pins.gpio_do = GPIO_INVALID;
++	dev->pdata.pins.gpio_clk = GPIO_INVALID;
++	dev->pdata.pins.gpio_cs = GPIO_INVALID;
++	dev->pdata.pins.cs_activelow = 1;
++	dev->pdata.mode = SPI_MODE_0;
++	dev->pdata.no_spi_delay = 0;
++	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
++
++	return &(dev->item);
++}
++
++static void gpiommc_drop_item(struct config_group *group,
++			      struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	gpiommc_do_unregister(dev);
++	kfree(dev);
++}
++
++static struct configfs_group_operations gpiommc_ct_group_ops = {
++	.make_item	= gpiommc_make_item,
++	.drop_item	= gpiommc_drop_item,
++};
++
++static struct config_item_type gpiommc_ci_type = {
++	.ct_group_ops	= &gpiommc_ct_group_ops,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct configfs_subsystem gpiommc_subsys = {
++	.su_group = {
++		.cg_item = {
++			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
++			.ci_type = &gpiommc_ci_type,
++		},
++	},
++	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
++};
++
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++static struct platform_driver gpiommc_plat_driver = {
++	.probe	= gpiommc_probe,
++	.remove	= gpiommc_remove,
++	.driver	= {
++		.name	= GPIOMMC_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++};
++
++int gpiommc_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(gpiommc_next_id);
++
++static int __init gpiommc_modinit(void)
++{
++	int err;
++
++	err = platform_driver_register(&gpiommc_plat_driver);
++	if (err)
++		return err;
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	config_group_init(&gpiommc_subsys.su_group);
++	err = configfs_register_subsystem(&gpiommc_subsys);
++	if (err) {
++		platform_driver_unregister(&gpiommc_plat_driver);
++		return err;
++	}
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++	return 0;
++}
++module_init(gpiommc_modinit);
++
++static void __exit gpiommc_modexit(void)
++{
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	configfs_unregister_subsystem(&gpiommc_subsys);
++#endif
++	platform_driver_unregister(&gpiommc_plat_driver);
++}
++module_exit(gpiommc_modexit);
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -474,6 +474,31 @@ config MMC_SDHI
+ 	  This provides support for the SDHI SD/SDIO controller found in
+ 	  SuperH and ARM SH-Mobile SoCs
+ 
++config GPIOMMC
++	tristate "MMC/SD over GPIO-based SPI"
++	depends on MMC && MMC_SPI && SPI_GPIO_OLD
++	help
++	  This driver hooks up the mmc_spi and spi_gpio modules so that
++	  MMC/SD cards can be used on a GPIO based bus by bitbanging
++	  the SPI protocol in software.
++
++	  This driver provides a configfs interface to dynamically create
++	  and destroy GPIO-based MMC/SD card devices. It also provides
++	  a platform device interface API.
++	  See Documentation/gpiommc.txt for details.
++
++	  The module will be called gpiommc.
++
++	  If unsure, say N.
++
++config GPIOMMC_CONFIGFS
++	bool
++	depends on GPIOMMC && CONFIGFS_FS
++	default y
++	help
++	  This option automatically enables configfs support for gpiommc
++	  if configfs is available.
++
+ config MMC_CB710
+ 	tristate "ENE CB710 MMC/SD Interface support"
+ 	depends on PCI && GENERIC_HARDIRQS
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -38,6 +38,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
+ obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o
+ obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
++obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
+ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
+ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
+ obj-$(CONFIG_MMC_DW_PLTFM)	+= dw_mmc-pltfm.o
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
+@@ -0,0 +1,71 @@
++/*
++ * Device driver for MMC/SD cards driven over a GPIO bus.
++ *
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * Licensed under the GNU/GPL version 2.
++ */
++#ifndef LINUX_GPIOMMC_H_
++#define LINUX_GPIOMMC_H_
++
++#include <linux/types.h>
++
++
++#define GPIOMMC_MAX_NAMELEN		15
++#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
++
++/**
++ * struct gpiommc_pins - Hardware pin assignments
++ *
++ * @gpio_di: The GPIO number of the DATA IN pin
++ * @gpio_do: The GPIO number of the DATA OUT pin
++ * @gpio_clk: The GPIO number of the CLOCK pin
++ * @gpio_cs: The GPIO number of the CHIPSELECT pin
++ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
++ */
++struct gpiommc_pins {
++	unsigned int gpio_di;
++	unsigned int gpio_do;
++	unsigned int gpio_clk;
++	unsigned int gpio_cs;
++	bool cs_activelow;
++};
++
++/**
++ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
++ *
++ * @name: The unique name string of the device.
++ * @pins: The hardware pin assignments.
++ * @mode: The hardware mode. This is either SPI_MODE_0,
++ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
++ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
++ *                This is not standards compliant, but may be required for some
++ *                embedded machines to gain reasonable speed.
++ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
++ */
++struct gpiommc_platform_data {
++	char name[GPIOMMC_MAX_NAMELEN + 1];
++	struct gpiommc_pins pins;
++	u8 mode;
++	bool no_spi_delay;
++	unsigned int max_bus_speed;
++};
++
++/**
++ * GPIOMMC_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a gpiommc device.
++ */
++#define GPIOMMC_PLATDEV_NAME	"gpiommc"
++
++/**
++ * gpiommc_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int gpiommc_next_id(void);
++
++#endif /* LINUX_GPIOMMC_H_ */
+--- /dev/null
++++ b/Documentation/gpiommc.txt
+@@ -0,0 +1,97 @@
++GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
++================================================================
++
++The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
++MMC or SD card on GPIO pins.
++
++Two interfaces for registering a new MMC/SD card device are provided:
++A static platform-device based mechanism and a dynamic configfs based interface.
++
++
++Registering devices via platform-device
++=======================================
++
++The platform-device interface is used for registering MMC/SD devices that are
++part of the hardware platform. This is most useful only for embedded machines
++with MMC/SD devices statically connected to the platform GPIO bus.
++
++The data structures are declared in <linux/mmc/gpiommc.h>.
++
++To register a new device, define an instance of struct gpiommc_platform_data.
++This structure holds any information about how the device is hooked up to the
++GPIO pins and what hardware modes the device supports. See the docbook-style
++documentation in the header file for more information on the struct fields.
++
++Then allocate a new instance of a platform device by doing:
++
++	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
++
++This will allocate the platform device data structures and hook it up to the
++gpiommc driver.
++Then add the gpiommc_platform_data to the platform device.
++
++	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
++
++You may free the local instance of struct gpiommc_platform_data now. (So the
++struct may be allocated on the stack, too).
++Now simply register the platform device.
++
++	err = platform_device_add(pdev);
++
++Done. The gpiommc probe routine will be invoked now and you should see a kernel
++log message for the added device.
++
++
++Registering devices via configfs
++================================
++
++MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
++selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
++hardware are a common situation.
++So we provide a dynamic interface to conveniently handle adding and removing
++devices from userspace, without the need to recompile the kernel.
++
++The "gpiommc" subdirectory at the configfs mountpoint is used for handling
++the dynamic configuration.
++
++To create a new device, it must first be allocated with mkdir.
++The following command will allocate a device named "my_mmc":
++	mkdir /config/gpiommc/my_mmc
++
++There are several configuration files available in the new
++/config/gpiommc/my_mmc/ directory:
++
++gpio_data_in			= The SPI data-IN GPIO pin number.
++gpio_data_out			= The SPI data-OUT GPIO pin number.
++gpio_clock			= The SPI Clock GPIO pin number.
++gpio_chipselect			= The SPI Chipselect GPIO pin number.
++gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
++				  If 1, Chipselect is active-LOW.
++spi_mode			= The SPI data mode. Can be 0-3.
++spi_delay			= Enable all delays in the lowlevel bitbanging.
++max_bus_speed			= The maximum SPI bus speed. In Hertz.
++
++register			= Not a configuration parameter.
++				  Used to register the configured card
++				  with the kernel.
++
++The device must first get configured and then registered by writing "1" to
++the "register" file.
++The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
++and "gpio_chipselect" are essential and _must_ be configured before writing
++"1" to the "register" file. The registration will fail, otherwise.
++
++The default values for the other parameters are:
++gpio_chipselect_activelow	= 1		(CS active-LOW)
++spi_mode			= 0		(SPI_MODE_0)
++spi_delay			= 1		(enabled)
++max_bus_speed			= 5000000	(5 Mhz)
++
++Configuration values can not be changed after registration. To unregister
++the device, write a "0" to the "register" file. The configuration can be
++changed again after unregistering.
++
++To completely remove the device, simply rmdir the directory
++(/config/gpiommc/my_mmc in this example).
++There's no need to first unregister the device before removing it. That will
++be done automatically.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3670,6 +3670,11 @@ L:	linuxppc-dev@lists.ozlabs.org
+ S:	Odd Fixes
+ F:	drivers/tty/hvc/
+ 
++GPIOMMC DRIVER
++P:	Michael Buesch
++M:	mb@bu3sch.de
++S:	Maintained
++
+ HARDWARE MONITORING
+ M:	Jean Delvare <khali@linux-fr.org>
+ M:	Guenter Roeck <linux@roeck-us.net>
diff --git a/trunk/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch b/trunk/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch
new file mode 100644
index 00000000..92815d91
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch
@@ -0,0 +1,58 @@
+The gpiommc configfs context structure needs locking, as configfs
+does not lock access between files.
+
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
+ 	struct platform_device *pdev;
+ 	/* The configuration */
+ 	struct gpiommc_platform_data pdata;
++	/* Mutex to protect this structure */
++	struct mutex mutex;
+ };
+ 
+ #define GPIO_INVALID	-1
+@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	unsigned int gpio;
+ 	int err = 0;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_DI) {
+ 		gpio = dev->pdata.pins.gpio_di;
+ 		if (gpio == GPIO_INVALID)
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
+ 	int err = -EINVAL;
+ 	unsigned long data;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_register) {
+ 		err = kstrtoul(page, 10, &data);
+ 		if (err)
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
+ 	if (!dev)
+ 		return NULL;
+ 
++	mutex_init(&dev->mutex);
+ 	config_item_init_type_name(&dev->item, name,
+ 				   &gpiommc_dev_ci_type);
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/870-hifn795x_byteswap.patch b/trunk/target/linux/generic/patches-3.10/870-hifn795x_byteswap.patch
new file mode 100644
index 00000000..3a37c951
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/870-hifn795x_byteswap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/crypto/hifn_795x.c
++++ b/drivers/crypto/hifn_795x.c
+@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
+ 
+ static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
++	writel(val, dev->bar[0] + reg);
+ }
+ 
+ static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
++	writel(val, dev->bar[1] + reg);
+ }
+ 
+ static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/trunk/target/linux/generic/patches-3.10/880-gateworks_system_controller.patch b/trunk/target/linux/generic/patches-3.10/880-gateworks_system_controller.patch
new file mode 100644
index 00000000..d9234850
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/880-gateworks_system_controller.patch
@@ -0,0 +1,339 @@
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -477,6 +477,15 @@ config SENSORS_GL520SM
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called gl520sm.
+ 
++config SENSORS_GSC
++	tristate "Gateworks System Controller"
++	depends on I2C
++	help
++	  If you say yes here you get support for the Gateworks System Controller.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called gsc.
++
+ config SENSORS_GPIO_FAN
+ 	tristate "GPIO fan"
+ 	depends on GPIOLIB
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -140,6 +140,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l7
+ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
+ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
+ obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
++obj-$(CONFIG_SENSORS_GSC)	+= gsc.o
+ 
+ obj-$(CONFIG_PMBUS)		+= pmbus/
+ 
+--- /dev/null
++++ b/drivers/hwmon/gsc.c
+@@ -0,0 +1,308 @@
++/*
++ * A hwmon driver for the Gateworks System Controller 
++ * Copyright (C) 2009 Gateworks Corporation
++ *
++ * Author: Chris Lang <clang@gateworks.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License,
++ * as published by the Free Software Foundation - version 2.
++ */
++
++#include <linux/module.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++
++#define DRV_VERSION "0.2"
++
++enum chips { gsp };
++
++/* AD7418 registers */
++#define GSP_REG_TEMP_IN		0x00
++#define GSP_REG_VIN		0x02
++#define GSP_REG_3P3		0x05
++#define GSP_REG_BAT		0x08
++#define GSP_REG_5P0		0x0b
++#define GSP_REG_CORE		0x0e
++#define GSP_REG_CPU1		0x11
++#define GSP_REG_CPU2		0x14
++#define GSP_REG_DRAM		0x17
++#define GSP_REG_EXT_BAT		0x1a
++#define GSP_REG_IO1		0x1d
++#define GSP_REG_IO2 		0x20
++#define GSP_REG_PCIE		0x23
++#define GSP_REG_CURRENT		0x26
++#define GSP_FAN_0		0x2C
++#define GSP_FAN_1		0x2E
++#define GSP_FAN_2		0x30
++#define GSP_FAN_3		0x32
++#define GSP_FAN_4		0x34
++#define GSP_FAN_5		0x36
++
++struct gsp_sensor_info {
++	const char* name;
++	int reg;
++};
++
++static const struct gsp_sensor_info gsp_sensors[] = {
++	{"temp", GSP_REG_TEMP_IN},
++	{"vin", GSP_REG_VIN},
++	{"3p3", GSP_REG_3P3},
++	{"bat", GSP_REG_BAT},
++	{"5p0", GSP_REG_5P0},
++	{"core", GSP_REG_CORE},
++	{"cpu1", GSP_REG_CPU1},
++	{"cpu2", GSP_REG_CPU2},
++	{"dram", GSP_REG_DRAM},
++	{"ext_bat", GSP_REG_EXT_BAT},
++	{"io1", GSP_REG_IO1},
++	{"io2", GSP_REG_IO2},
++	{"pci2", GSP_REG_PCIE},
++	{"current", GSP_REG_CURRENT},
++	{"fan_point0", GSP_FAN_0},
++	{"fan_point1", GSP_FAN_1},
++	{"fan_point2", GSP_FAN_2},
++	{"fan_point3", GSP_FAN_3},
++	{"fan_point4", GSP_FAN_4},
++	{"fan_point5", GSP_FAN_5},
++};
++
++struct gsp_data {
++	struct device		*hwmon_dev;
++	struct attribute_group	attrs;
++	enum chips		type;
++};
++
++static int gsp_probe(struct i2c_client *client,
++			const struct i2c_device_id *id);
++static int gsp_remove(struct i2c_client *client);
++
++static const struct i2c_device_id gsp_id[] = {
++	{ "gsp", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, gsp_id);
++
++static struct i2c_driver gsp_driver = {
++	.driver = {
++		.name	= "gsp",
++	},
++	.probe		= gsp_probe,
++	.remove		= gsp_remove,
++	.id_table	= gsp_id,
++};
++
++/* All registers are word-sized, except for the configuration registers.
++ * AD7418 uses a high-byte first convention. Do NOT use those functions to
++ * access the configuration registers CONF and CONF2, as they are byte-sized.
++ */
++static inline int gsp_read(struct i2c_client *client, u8 reg)
++{
++	unsigned int adc = 0;
++	if (reg == GSP_REG_TEMP_IN || reg > GSP_REG_CURRENT)
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		return adc;
++	}
++	else
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		adc |= i2c_smbus_read_byte_data(client, reg + 2) << 16;
++		return adc;
++	}
++}
++
++static inline int gsp_write(struct i2c_client *client, u8 reg, u16 value)
++{
++	i2c_smbus_write_byte_data(client, reg, value & 0xff);
++	i2c_smbus_write_byte_data(client, reg + 1, ((value >> 8) & 0xff));
++	return 1;
++}
++
++static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
++			char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	return sprintf(buf, "%d\n", gsp_read(client, gsp_sensors[attr->index].reg));
++}
++
++static ssize_t show_label(struct device *dev,
++			struct device_attribute *devattr, char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++
++	return sprintf(buf, "%s\n", gsp_sensors[attr->index].name);
++}
++
++static ssize_t store_fan(struct device *dev,
++			struct device_attribute *devattr, const char *buf, size_t count)
++{
++	u16 val;
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	val = simple_strtoul(buf, NULL, 10);
++	gsp_write(client, gsp_sensors[attr->index].reg, val);
++	return count;
++}
++
++static SENSOR_DEVICE_ATTR(temp0_input, S_IRUGO, show_adc, NULL, 0);
++static SENSOR_DEVICE_ATTR(temp0_label, S_IRUGO, show_label, NULL, 0);
++
++static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_adc, NULL, 1);
++static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, show_label, NULL, 1);
++static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 2);
++static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, show_label, NULL, 2);
++static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 3);
++static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, show_label, NULL, 3);
++static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 4);
++static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 4);
++static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 5);
++static SENSOR_DEVICE_ATTR(in4_label, S_IRUGO, show_label, NULL, 5);
++static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_adc, NULL, 6);
++static SENSOR_DEVICE_ATTR(in5_label, S_IRUGO, show_label, NULL, 6);
++static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_adc, NULL, 7);
++static SENSOR_DEVICE_ATTR(in6_label, S_IRUGO, show_label, NULL, 7);
++static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_adc, NULL, 8);
++static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 8);
++static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, show_adc, NULL, 9);
++static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 9);
++static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_adc, NULL, 10);
++static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 10);
++static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_adc, NULL, 11);
++static SENSOR_DEVICE_ATTR(in10_label, S_IRUGO, show_label, NULL, 11);
++static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, show_adc, NULL, 12);
++static SENSOR_DEVICE_ATTR(in11_label, S_IRUGO, show_label, NULL, 12);
++static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, show_adc, NULL, 13);
++static SENSOR_DEVICE_ATTR(in12_label, S_IRUGO, show_label, NULL, 13);
++
++static SENSOR_DEVICE_ATTR(fan0_point0, S_IRUGO | S_IWUSR, show_adc, store_fan, 14);
++static SENSOR_DEVICE_ATTR(fan0_point1, S_IRUGO | S_IWUSR, show_adc, store_fan, 15);
++static SENSOR_DEVICE_ATTR(fan0_point2, S_IRUGO | S_IWUSR, show_adc, store_fan, 16);
++static SENSOR_DEVICE_ATTR(fan0_point3, S_IRUGO | S_IWUSR, show_adc, store_fan, 17);
++static SENSOR_DEVICE_ATTR(fan0_point4, S_IRUGO | S_IWUSR, show_adc, store_fan, 18);
++static SENSOR_DEVICE_ATTR(fan0_point5, S_IRUGO | S_IWUSR, show_adc, store_fan, 19);
++
++static struct attribute *gsp_attributes[] = {
++	&sensor_dev_attr_temp0_input.dev_attr.attr,
++	&sensor_dev_attr_in0_input.dev_attr.attr,
++	&sensor_dev_attr_in1_input.dev_attr.attr,
++	&sensor_dev_attr_in2_input.dev_attr.attr,
++	&sensor_dev_attr_in3_input.dev_attr.attr,
++	&sensor_dev_attr_in4_input.dev_attr.attr,
++	&sensor_dev_attr_in5_input.dev_attr.attr,
++	&sensor_dev_attr_in6_input.dev_attr.attr,
++	&sensor_dev_attr_in7_input.dev_attr.attr,
++	&sensor_dev_attr_in8_input.dev_attr.attr,
++	&sensor_dev_attr_in9_input.dev_attr.attr,
++	&sensor_dev_attr_in10_input.dev_attr.attr,
++	&sensor_dev_attr_in11_input.dev_attr.attr,
++	&sensor_dev_attr_in12_input.dev_attr.attr,
++
++	&sensor_dev_attr_temp0_label.dev_attr.attr,
++	&sensor_dev_attr_in0_label.dev_attr.attr,
++	&sensor_dev_attr_in1_label.dev_attr.attr,
++	&sensor_dev_attr_in2_label.dev_attr.attr,
++	&sensor_dev_attr_in3_label.dev_attr.attr,
++	&sensor_dev_attr_in4_label.dev_attr.attr,
++	&sensor_dev_attr_in5_label.dev_attr.attr,
++	&sensor_dev_attr_in6_label.dev_attr.attr,
++	&sensor_dev_attr_in7_label.dev_attr.attr,
++	&sensor_dev_attr_in8_label.dev_attr.attr,
++	&sensor_dev_attr_in9_label.dev_attr.attr,
++	&sensor_dev_attr_in10_label.dev_attr.attr,
++	&sensor_dev_attr_in11_label.dev_attr.attr,
++	&sensor_dev_attr_in12_label.dev_attr.attr,
++
++	&sensor_dev_attr_fan0_point0.dev_attr.attr,
++	&sensor_dev_attr_fan0_point1.dev_attr.attr,
++	&sensor_dev_attr_fan0_point2.dev_attr.attr,
++	&sensor_dev_attr_fan0_point3.dev_attr.attr,
++	&sensor_dev_attr_fan0_point4.dev_attr.attr,
++	&sensor_dev_attr_fan0_point5.dev_attr.attr,
++	NULL
++};
++
++
++static int gsp_probe(struct i2c_client *client,
++			 const struct i2c_device_id *id)
++{
++	struct i2c_adapter *adapter = client->adapter;
++	struct gsp_data *data;
++	int err;
++
++	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
++					I2C_FUNC_SMBUS_WORD_DATA)) {
++		err = -EOPNOTSUPP;
++		goto exit;
++	}
++
++	if (!(data = kzalloc(sizeof(struct gsp_data), GFP_KERNEL))) {
++		err = -ENOMEM;
++		goto exit;
++	}
++
++	i2c_set_clientdata(client, data);
++
++	data->type = id->driver_data;
++
++	switch (data->type) {
++	case 0:
++		data->attrs.attrs = gsp_attributes;
++		break;
++	}
++
++	dev_info(&client->dev, "%s chip found\n", client->name);
++
++	/* Register sysfs hooks */
++	if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
++		goto exit_free;
++
++	data->hwmon_dev = hwmon_device_register(&client->dev);
++	if (IS_ERR(data->hwmon_dev)) {
++		err = PTR_ERR(data->hwmon_dev);
++		goto exit_remove;
++	}
++
++	return 0;
++
++exit_remove:
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++exit_free:
++	kfree(data);
++exit:
++	return err;
++}
++
++static int gsp_remove(struct i2c_client *client)
++{
++	struct gsp_data *data = i2c_get_clientdata(client);
++	hwmon_device_unregister(data->hwmon_dev);
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++	kfree(data);
++	return 0;
++}
++
++static int __init gsp_init(void)
++{
++	return i2c_add_driver(&gsp_driver);
++}
++
++static void __exit gsp_exit(void)
++{
++	i2c_del_driver(&gsp_driver);
++}
++
++module_init(gsp_init);
++module_exit(gsp_exit);
++
++MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
++MODULE_DESCRIPTION("GSC HWMON driver");
++MODULE_LICENSE("GPL");
++MODULE_VERSION(DRV_VERSION);
++
diff --git a/trunk/target/linux/generic/patches-3.10/890-8250_optional_sysrq.patch b/trunk/target/linux/generic/patches-3.10/890-8250_optional_sysrq.patch
new file mode 100644
index 00000000..fcfffbb6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/890-8250_optional_sysrq.patch
@@ -0,0 +1,24 @@
+--- a/drivers/tty/serial/8250/8250_core.c
++++ b/drivers/tty/serial/8250/8250_core.c
+@@ -16,7 +16,7 @@
+  *  membase is an 'ioremapped' cookie.
+  */
+ 
+-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
++#if defined(CONFIG_SERIAL_8250_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ)
+ #define SUPPORT_SYSRQ
+ #endif
+ 
+--- a/drivers/tty/serial/8250/Kconfig
++++ b/drivers/tty/serial/8250/Kconfig
+@@ -91,6 +91,10 @@ config SERIAL_8250_CONSOLE
+ 
+ 	  If unsure, say N.
+ 
++config SERIAL_8250_SYSRQ
++	bool "Magic sysrq support on 8250/16550 devices"
++	depends on SERIAL_8250_CONSOLE
++
+ config FIX_EARLYCON_MEM
+ 	bool
+ 	depends on X86
diff --git a/trunk/target/linux/generic/patches-3.10/900-slab_maxsize.patch b/trunk/target/linux/generic/patches-3.10/900-slab_maxsize.patch
new file mode 100644
index 00000000..9e63d028
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/900-slab_maxsize.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -189,8 +189,8 @@ struct kmem_cache {
+  * to do various tricks to work around compiler limitations in order to
+  * ensure proper constant folding.
+  */
+-#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
+-				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
++#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
++				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
+ #define KMALLOC_SHIFT_MAX	KMALLOC_SHIFT_HIGH
+ #ifndef KMALLOC_SHIFT_LOW
+ #define KMALLOC_SHIFT_LOW	5
diff --git a/trunk/target/linux/generic/patches-3.10/901-debloat_sock_diag.patch b/trunk/target/linux/generic/patches-3.10/901-debloat_sock_diag.patch
new file mode 100644
index 00000000..bb4fb885
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/901-debloat_sock_diag.patch
@@ -0,0 +1,45 @@
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -87,6 +87,9 @@ source "net/netlabel/Kconfig"
+ 
+ endif # if INET
+ 
++config SOCK_DIAG
++	bool
++
+ config NETWORK_SECMARK
+ 	bool "Security Marking"
+ 	help
+--- a/net/core/Makefile
++++ b/net/core/Makefile
+@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
+ 
+ obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
+ 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
+-			sock_diag.o dev_ioctl.o
++			dev_ioctl.o
+ 
++obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
+ obj-$(CONFIG_XFRM) += flow.o
+ obj-y += net-sysfs.o
+ obj-$(CONFIG_PROC_FS) += net-procfs.o
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -411,6 +411,7 @@ config INET_LRO
+ 
+ config INET_DIAG
+ 	tristate "INET: socket monitoring interface"
++	select SOCK_DIAG
+ 	default y
+ 	---help---
+ 	  Support for INET (TCP, DCCP, etc) socket monitoring interface used by
+--- a/net/unix/Kconfig
++++ b/net/unix/Kconfig
+@@ -22,6 +22,7 @@ config UNIX
+ config UNIX_DIAG
+ 	tristate "UNIX: socket monitoring interface"
+ 	depends on UNIX
++	select SOCK_DIAG
+ 	default n
+ 	---help---
+ 	  Support for UNIX socket monitoring interface used by the ss tool.
diff --git a/trunk/target/linux/generic/patches-3.10/902-debloat_proc.patch b/trunk/target/linux/generic/patches-3.10/902-debloat_proc.patch
new file mode 100644
index 00000000..1f747a3b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/902-debloat_proc.patch
@@ -0,0 +1,341 @@
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -2266,6 +2266,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_locks_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("locks", 0, NULL, &proc_locks_operations);
+ 	return 0;
+ }
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -67,3 +67,8 @@ config PROC_PAGE_MONITOR
+ 	  /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
+ 	  /proc/kpagecount, and /proc/kpageflags. Disabling these
+           interfaces will reduce the size of the kernel by approximately 4kb.
++
++config PROC_STRIPPED
++	default n
++	depends on EXPERT
++	bool "Strip non-essential /proc functionality to reduce code size"
+--- a/fs/proc/consoles.c
++++ b/fs/proc/consoles.c
+@@ -108,6 +108,9 @@ static const struct file_operations proc
+ 
+ static int __init proc_consoles_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	proc_create("consoles", 0, NULL, &proc_consoles_operations);
+ 	return 0;
+ }
+--- a/fs/proc/proc_tty.c
++++ b/fs/proc/proc_tty.c
+@@ -143,7 +143,10 @@ static const struct file_operations proc
+ void proc_tty_register_driver(struct tty_driver *driver)
+ {
+ 	struct proc_dir_entry *ent;
+-		
++
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!driver->driver_name || driver->proc_entry ||
+ 	    !driver->ops->proc_fops)
+ 		return;
+@@ -160,6 +163,9 @@ void proc_tty_unregister_driver(struct t
+ {
+ 	struct proc_dir_entry *ent;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ent = driver->proc_entry;
+ 	if (!ent)
+ 		return;
+@@ -174,6 +180,9 @@ void proc_tty_unregister_driver(struct t
+  */
+ void __init proc_tty_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!proc_mkdir("tty", NULL))
+ 		return;
+ 	proc_tty_ldisc = proc_mkdir("tty/ldisc", NULL);
+--- a/kernel/exec_domain.c
++++ b/kernel/exec_domain.c
+@@ -173,6 +173,8 @@ static const struct file_operations exec
+ 
+ static int __init proc_execdomains_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
+ 	return 0;
+ }
+--- a/kernel/irq/proc.c
++++ b/kernel/irq/proc.c
+@@ -311,6 +311,9 @@ void register_irq_proc(unsigned int irq,
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
+ 		return;
+ 
+@@ -347,6 +350,9 @@ void unregister_irq_proc(unsigned int ir
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || !desc->dir)
+ 		return;
+ #ifdef CONFIG_SMP
+@@ -382,6 +388,9 @@ void init_irq_proc(void)
+ 	unsigned int irq;
+ 	struct irq_desc *desc;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	/* create /proc/irq */
+ 	root_irq_dir = proc_mkdir("irq", NULL);
+ 	if (!root_irq_dir)
+--- a/kernel/time/timer_list.c
++++ b/kernel/time/timer_list.c
+@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs
+ {
+ 	struct proc_dir_entry *pe;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
+ 	if (!pe)
+ 		return -ENOMEM;
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -2692,6 +2692,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_vmalloc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
+ 	return 0;
+ }
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -1242,10 +1242,12 @@ static int __init setup_vmstat(void)
+ 		start_cpu_timer(cpu);
+ #endif
+ #ifdef CONFIG_PROC_FS
+-	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
+-	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
++		proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++		proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
++	}
+ 	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
+-	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
+ #endif
+ 	return 0;
+ }
+--- a/net/8021q/vlanproc.c
++++ b/net/8021q/vlanproc.c
+@@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net)
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (vn->proc_vlan_conf)
+ 		remove_proc_entry(name_conf, vn->proc_vlan_dir);
+ 
+@@ -146,6 +149,9 @@ int __net_init vlan_proc_init(struct net
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
+ 	if (!vn->proc_vlan_dir)
+ 		goto err;
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2891,6 +2891,8 @@ static __net_initdata struct pernet_oper
+ 
+ static int __init proto_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	return register_pernet_subsys(&proto_net_ops);
+ }
+ 
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2587,10 +2587,12 @@ static const struct file_operations fib_
+ 
+ int __net_init fib_proc_init(struct net *net)
+ {
+-	if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
+ 		goto out1;
+ 
+-	if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_triestat", S_IRUGO, net->proc_net,
+ 			 &fib_triestat_fops))
+ 		goto out2;
+ 
+@@ -2600,17 +2602,21 @@ int __net_init fib_proc_init(struct net 
+ 	return 0;
+ 
+ out3:
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_triestat", net->proc_net);
+ out2:
+-	remove_proc_entry("fib_trie", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_trie", net->proc_net);
+ out1:
+ 	return -ENOMEM;
+ }
+ 
+ void __net_exit fib_proc_exit(struct net *net)
+ {
+-	remove_proc_entry("fib_trie", net->proc_net);
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("fib_trie", net->proc_net);
++		remove_proc_entry("fib_triestat", net->proc_net);
++	}
+ 	remove_proc_entry("route", net->proc_net);
+ }
+ 
+--- a/net/ipv4/proc.c
++++ b/net/ipv4/proc.c
+@@ -510,6 +510,9 @@ static __net_initdata struct pernet_oper
+ 
+ int __init ip_misc_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_proc_ops);
+ }
+ 
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -424,6 +424,9 @@ static struct pernet_operations ip_rt_pr
+ 
+ static int __init ip_rt_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_rt_proc_ops);
+ }
+ 
+--- a/ipc/msg.c
++++ b/ipc/msg.c
+@@ -134,6 +134,9 @@ void __init msg_init(void)
+ 	printk(KERN_INFO "msgmni has been set to %d\n",
+ 		init_ipc_ns.msg_ctlmni);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ipc_init_proc_interface("sysvipc/msg",
+ 				"       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
+ 				IPC_MSG_IDS, sysvipc_msg_proc_show);
+--- a/ipc/sem.c
++++ b/ipc/sem.c
+@@ -191,6 +191,8 @@ void sem_exit_ns(struct ipc_namespace *n
+ void __init sem_init (void)
+ {
+ 	sem_init_ns(&init_ipc_ns);
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/sem",
+ 				"       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
+ 				IPC_SEM_IDS, sysvipc_sem_proc_show);
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init);
+ 
+ void __init shm_init (void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/shm",
+ #if BITS_PER_LONG <= 32
+ 				"       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
+--- a/ipc/util.c
++++ b/ipc/util.c
+@@ -173,6 +173,9 @@ void __init ipc_init_proc_interface(cons
+ 	struct proc_dir_entry *pde;
+ 	struct ipc_proc_iface *iface;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	iface = kmalloc(sizeof(*iface), GFP_KERNEL);
+ 	if (!iface)
+ 		return;
+--- a/net/core/net-procfs.c
++++ b/net/core/net-procfs.c
+@@ -306,10 +306,12 @@ static int __net_init dev_proc_net_init(
+ 
+ 	if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
+ 		goto out;
+-	if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("softnet_stat", S_IRUGO, net->proc_net,
+ 			 &softnet_seq_fops))
+ 		goto out_dev;
+-	if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
+ 		goto out_softnet;
+ 
+ 	if (wext_proc_init(net))
+@@ -318,9 +320,11 @@ static int __net_init dev_proc_net_init(
+ out:
+ 	return rc;
+ out_ptype:
+-	remove_proc_entry("ptype", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("ptype", net->proc_net);
+ out_softnet:
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("softnet_stat", net->proc_net);
+ out_dev:
+ 	remove_proc_entry("dev", net->proc_net);
+ 	goto out;
+@@ -330,8 +334,10 @@ static void __net_exit dev_proc_net_exit
+ {
+ 	wext_proc_exit(net);
+ 
+-	remove_proc_entry("ptype", net->proc_net);
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("ptype", net->proc_net);
++		remove_proc_entry("softnet_stat", net->proc_net);
++	}
+ 	remove_proc_entry("dev", net->proc_net);
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/903-debloat_direct_io.patch b/trunk/target/linux/generic/patches-3.10/903-debloat_direct_io.patch
new file mode 100644
index 00000000..61925268
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/903-debloat_direct_io.patch
@@ -0,0 +1,84 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -62,6 +62,11 @@ config FILE_LOCKING
+           for filesystems like NFS and for the flock() system
+           call. Disabling this option saves about 11k.
+ 
++config DIRECT_IO
++	bool "Enable O_DIRECT support" if EXPERT
++	depends on BLOCK
++	default y
++
+ source "fs/notify/Kconfig"
+ 
+ source "fs/quota/Kconfig"
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -14,7 +14,8 @@ obj-y :=	open.o read_write.o file_table.
+ 		stack.o fs_struct.o statfs.o
+ 
+ ifeq ($(CONFIG_BLOCK),y)
+-obj-y +=	buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
++obj-y +=	buffer.o bio.o block_dev.o mpage.o ioprio.o
++obj-$(CONFIG_DIRECT_IO) += direct-io.o
+ else
+ obj-y +=	no-block.o
+ endif
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2468,12 +2468,26 @@ enum {
+ 	DIO_SKIP_HOLES	= 0x02,
+ };
+ 
++#ifdef CONFIG_DIRECT_IO
+ void dio_end_io(struct bio *bio, int error);
+ 
+ ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
+ 	struct block_device *bdev, const struct iovec *iov, loff_t offset,
+ 	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
+ 	dio_submit_t submit_io,	int flags);
++#else
++static inline void dio_end_io(struct bio *bio, int error)
++{
++}
++static inline ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
++	struct block_device *bdev, const struct iovec *iov, loff_t offset,
++	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
++	dio_submit_t submit_io,	int flags)
++{
++	return -EOPNOTSUPP;
++}
++#endif
++
+ 
+ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
+ 		struct inode *inode, const struct iovec *iov, loff_t offset,
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -51,8 +51,10 @@ static int setfl(int fd, struct file * f
+ 		   arg |= O_NONBLOCK;
+ 
+ 	if (arg & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!filp->f_mapping || !filp->f_mapping->a_ops ||
+ 			!filp->f_mapping->a_ops->direct_IO)
++#endif
+ 				return -EINVAL;
+ 	}
+ 
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -641,9 +641,12 @@ int open_check_o_direct(struct file *f)
+ {
+ 	/* NB: we're sure to have correct a_ops only after f_op->open */
+ 	if (f->f_flags & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!f->f_mapping->a_ops ||
+ 		    ((!f->f_mapping->a_ops->direct_IO) &&
+-		    (!f->f_mapping->a_ops->get_xip_mem))) {
++		    (!f->f_mapping->a_ops->get_xip_mem)))
++#endif
++		{
+ 			return -EINVAL;
+ 		}
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.10/910-kobject_uevent.patch b/trunk/target/linux/generic/patches-3.10/910-kobject_uevent.patch
new file mode 100644
index 00000000..9ee9cff6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/910-kobject_uevent.patch
@@ -0,0 +1,21 @@
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -51,6 +51,18 @@ static const char *kobject_actions[] = {
+ 	[KOBJ_OFFLINE] =	"offline",
+ };
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	mutex_lock(&uevent_sock_mutex);
++	seq = ++uevent_seqnum;
++	mutex_unlock(&uevent_sock_mutex);
++
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ /**
+  * kobject_action_type - translate action string to numeric type
+  *
diff --git a/trunk/target/linux/generic/patches-3.10/911-kobject_add_broadcast_uevent.patch b/trunk/target/linux/generic/patches-3.10/911-kobject_add_broadcast_uevent.patch
new file mode 100644
index 00000000..14c55bc6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/911-kobject_add_broadcast_uevent.patch
@@ -0,0 +1,65 @@
+--- a/include/linux/kobject.h
++++ b/include/linux/kobject.h
+@@ -31,6 +31,8 @@
+ #define UEVENT_NUM_ENVP			32	/* number of env pointers */
+ #define UEVENT_BUFFER_SIZE		2048	/* buffer for the variables */
+ 
++struct sk_buff;
++
+ /* path to the userspace helper executed on an event */
+ extern char uevent_helper[];
+ 
+@@ -213,4 +215,7 @@ int add_uevent_var(struct kobj_uevent_en
+ int kobject_action_type(const char *buf, size_t count,
+ 			enum kobject_action *type);
+ 
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation);
++
+ #endif /* _KOBJECT_H_ */
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -382,6 +382,43 @@ int add_uevent_var(struct kobj_uevent_en
+ EXPORT_SYMBOL_GPL(add_uevent_var);
+ 
+ #if defined(CONFIG_NET)
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	struct uevent_sock *ue_sk;
++	int err = 0;
++
++	/* send netlink message */
++	mutex_lock(&uevent_sock_mutex);
++	list_for_each_entry(ue_sk, &uevent_sock_list, list) {
++		struct sock *uevent_sock = ue_sk->sk;
++		struct sk_buff *skb2;
++
++		skb2 = skb_clone(skb, allocation);
++		if (!skb2)
++			break;
++
++		err = netlink_broadcast(uevent_sock, skb2, pid, group,
++					allocation);
++		if (err)
++			break;
++	}
++	mutex_unlock(&uevent_sock_mutex);
++
++	kfree_skb(skb);
++	return err;
++}
++#else
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	kfree_skb(skb);
++	return 0;
++}
++#endif
++EXPORT_SYMBOL_GPL(broadcast_uevent);
++
++#if defined(CONFIG_NET)
+ static int uevent_net_init(struct net *net)
+ {
+ 	struct uevent_sock *ue_sk;
diff --git a/trunk/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch b/trunk/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch
new file mode 100644
index 00000000..2979586b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch
@@ -0,0 +1,12 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -844,7 +844,8 @@ static int __ref kernel_init(void *unuse
+ 		pr_err("Failed to execute %s.  Attempting defaults...\n",
+ 			execute_command);
+ 	}
+-	if (!run_init_process("/sbin/init") ||
++	if (!run_init_process("/etc/preinit") ||
++	    !run_init_process("/sbin/init") ||
+ 	    !run_init_process("/etc/init") ||
+ 	    !run_init_process("/bin/init") ||
+ 	    !run_init_process("/bin/sh"))
diff --git a/trunk/target/linux/generic/patches-3.10/922-always-create-console-node-in-initramfs.patch b/trunk/target/linux/generic/patches-3.10/922-always-create-console-node-in-initramfs.patch
new file mode 100644
index 00000000..3b308dd2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/922-always-create-console-node-in-initramfs.patch
@@ -0,0 +1,30 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -59,6 +59,18 @@ default_initramfs() {
+ 	EOF
+ }
+ 
++list_librecmc_initramfs() {
++	:
++}
++
++librecmc_initramfs() {
++	# make sure that /dev/console exists
++	cat <<-EOF >> ${output}
++		dir /dev 0755 0 0
++		nod /dev/console 0600 0 0 c 5 1
++	EOF
++}
++
+ filetype() {
+ 	local argv1="$1"
+ 
+@@ -177,6 +189,8 @@ dir_filelist() {
+ 	if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
+ 		${dep_list}print_mtime "$1"
+ 
++		${dep_list}librecmc_initramfs
++
+ 		echo "${dirlist}" | \
+ 		while read x; do
+ 			${dep_list}parse ${x}
diff --git a/trunk/target/linux/generic/patches-3.10/930-crashlog.patch b/trunk/target/linux/generic/patches-3.10/930-crashlog.patch
new file mode 100644
index 00000000..4aba013e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/930-crashlog.patch
@@ -0,0 +1,276 @@
+--- /dev/null
++++ b/include/linux/crashlog.h
+@@ -0,0 +1,17 @@
++#ifndef __CRASHLOG_H
++#define __CRASHLOG_H
++
++#ifdef CONFIG_CRASHLOG
++void crashlog_init_bootmem(struct bootmem_data *bdata);
++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
++#else
++static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
++{
++}
++
++static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++}
++#endif
++
++#endif
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1186,6 +1186,10 @@ config RELAY
+ 
+ 	  If unsure, say N.
+ 
++config CRASHLOG
++	bool "Crash logging"
++	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !(ARM || SPARC || PPC)
++
+ config BLK_DEV_INITRD
+ 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+ 	depends on BROKEN || !FRV
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -110,6 +110,7 @@ obj-$(CONFIG_PADATA) += padata.o
+ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
+ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
+ obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
++obj-$(CONFIG_CRASHLOG) += crashlog.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
+--- /dev/null
++++ b/kernel/crashlog.c
+@@ -0,0 +1,181 @@
++/*
++ * Crash information logger
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ *
++ * Based on ramoops.c
++ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
++ *
++ * This program is free software; you can redistribute 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 that 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/bootmem.h>
++#include <linux/memblock.h>
++#include <linux/debugfs.h>
++#include <linux/crashlog.h>
++#include <linux/kmsg_dump.h>
++#include <linux/module.h>
++#include <linux/pfn.h>
++#include <asm/io.h>
++
++#define CRASHLOG_PAGES	4
++#define CRASHLOG_SIZE	(CRASHLOG_PAGES * PAGE_SIZE)
++#define CRASHLOG_MAGIC	0xa1eedead
++
++/*
++ * Start the log at 1M before the end of RAM, as some boot loaders like
++ * to use the end of the RAM for stack usage and other things
++ * If this fails, fall back to using the last part.
++ */
++#define CRASHLOG_OFFSET	(1024 * 1024)
++
++struct crashlog_data {
++	u32 magic;
++	u32 len;
++	u8 data[];
++};
++
++static struct debugfs_blob_wrapper crashlog_blob;
++static unsigned long crashlog_addr = 0;
++static struct crashlog_data *crashlog_buf;
++static struct kmsg_dumper dump;
++static bool first = true;
++
++extern struct list_head *crashlog_modules;
++
++#ifndef CONFIG_NO_BOOTMEM
++void __init crashlog_init_bootmem(bootmem_data_t *bdata)
++{
++	unsigned long addr;
++
++	if (crashlog_addr)
++		return;
++
++	addr = PFN_PHYS(bdata->node_low_pfn) - CRASHLOG_OFFSET;
++	if (reserve_bootmem(addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", addr);
++		bdata->node_low_pfn -= CRASHLOG_PAGES;
++		addr = PFN_PHYS(bdata->node_low_pfn);
++	}
++	crashlog_addr = addr;
++}
++#endif
++
++#ifdef CONFIG_HAVE_MEMBLOCK
++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++	if (crashlog_addr)
++		return;
++
++	addr += size - CRASHLOG_OFFSET;
++	if (memblock_reserve(addr, CRASHLOG_SIZE)) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", (unsigned long) addr);
++		return;
++	}
++
++	crashlog_addr = addr;
++}
++#endif
++
++static void __init crashlog_copy(void)
++{
++	if (crashlog_buf->magic != CRASHLOG_MAGIC)
++		return;
++
++	if (!crashlog_buf->len || crashlog_buf->len >
++	    CRASHLOG_SIZE - sizeof(*crashlog_buf))
++		return;
++
++	crashlog_blob.size = crashlog_buf->len;
++	crashlog_blob.data = kmemdup(crashlog_buf->data,
++		crashlog_buf->len, GFP_KERNEL);
++
++	debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
++}
++
++static int get_maxlen(void)
++{
++	return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
++}
++
++static void crashlog_printf(const char *fmt, ...)
++{
++	va_list args;
++	int len = get_maxlen();
++
++	if (!len)
++		return;
++
++	va_start(args, fmt);
++	crashlog_buf->len += vscnprintf(
++		&crashlog_buf->data[crashlog_buf->len],
++		len, fmt, args);
++	va_end(args);
++}
++
++static void crashlog_do_dump(struct kmsg_dumper *dumper,
++		enum kmsg_dump_reason reason)
++{
++	struct timeval tv;
++	struct module *m;
++	char *buf;
++	size_t len;
++
++	if (!first)
++		crashlog_printf("\n===================================\n");
++
++	do_gettimeofday(&tv);
++	crashlog_printf("Time: %lu.%lu\n",
++		(long)tv.tv_sec, (long)tv.tv_usec);
++
++	if (first) {
++		crashlog_printf("Modules:");
++		list_for_each_entry(m, crashlog_modules, list) {
++			crashlog_printf("\t%s@%p+%x", m->name,
++			m->module_core, m->core_size,
++			m->module_init, m->init_size);
++		}
++		crashlog_printf("\n");
++		first = false;
++	}
++
++	buf = (char *)&crashlog_buf->data[crashlog_buf->len];
++
++	kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
++
++	crashlog_buf->len += len;
++}
++
++
++int __init crashlog_init_fs(void)
++{
++	if (!crashlog_addr)
++		return -ENOMEM;
++
++	crashlog_buf = ioremap(crashlog_addr, CRASHLOG_SIZE);
++
++	crashlog_copy();
++
++	crashlog_buf->magic = CRASHLOG_MAGIC;
++	crashlog_buf->len = 0;
++
++	dump.max_reason = KMSG_DUMP_OOPS;
++	dump.dump = crashlog_do_dump;
++	kmsg_dump_register(&dump);
++
++	return 0;
++}
++module_init(crashlog_init_fs);
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -15,6 +15,7 @@
+ #include <linux/export.h>
+ #include <linux/kmemleak.h>
+ #include <linux/range.h>
++#include <linux/crashlog.h>
+ #include <linux/memblock.h>
+ 
+ #include <asm/bug.h>
+@@ -177,6 +178,7 @@ static unsigned long __init free_all_boo
+ 	if (!bdata->node_bootmem_map)
+ 		return 0;
+ 
++	crashlog_init_bootmem(bdata);
+ 	start = bdata->node_min_pfn;
+ 	end = bdata->node_low_pfn;
+ 
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -106,6 +106,9 @@ static LIST_HEAD(modules);
+ #ifdef CONFIG_KGDB_KDB
+ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+ #endif /* CONFIG_KGDB_KDB */
++#ifdef CONFIG_CRASHLOG
++struct list_head *crashlog_modules = &modules;
++#endif
+ 
+ #ifdef CONFIG_MODULE_SIG
+ #ifdef CONFIG_MODULE_SIG_FORCE
+--- a/mm/memblock.c
++++ b/mm/memblock.c
+@@ -19,6 +19,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+ #include <linux/memblock.h>
++#include <linux/crashlog.h>
+ 
+ static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
+ static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
+@@ -344,6 +345,8 @@ static void __init_memblock memblock_ins
+ 	memblock_set_region_node(rgn, nid);
+ 	type->cnt++;
+ 	type->total_size += size;
++	if (type == &memblock.memory && idx == 0)
++		crashlog_init_memblock(base, size);
+ }
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.10/940-ocf_kbuild_integration.patch b/trunk/target/linux/generic/patches-3.10/940-ocf_kbuild_integration.patch
new file mode 100644
index 00000000..97d5bccd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/940-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1406,3 +1406,6 @@ source "drivers/crypto/Kconfig"
+ source crypto/asymmetric_keys/Kconfig
+ 
+ endif	# if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -96,6 +96,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
+ obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
+ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
+ 
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #
diff --git a/trunk/target/linux/generic/patches-3.10/941-ocf_20120127.patch b/trunk/target/linux/generic/patches-3.10/941-ocf_20120127.patch
new file mode 100644
index 00000000..9c5921a4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/941-ocf_20120127.patch
@@ -0,0 +1,166 @@
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -139,6 +139,9 @@
+  * that might otherwise be identical and have very little entropy
+  * available to them (particularly common in the embedded world).
+  *
++ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++ *      int random_input_wait(void);
++ *
+  * add_input_randomness() uses the input layer interrupt timing, as well as
+  * the event type information from the hardware.
+  *
+@@ -152,6 +155,13 @@
+  * seek times do not make for good sources of entropy, as their seek
+  * times are usually fairly consistent.
+  *
++ * random_input_words() just provides a raw block of entropy to the input
++ * pool, such as from a hardware entropy generator.
++ *
++ * random_input_wait() suspends the caller until such time as the
++ * entropy pool falls below the write threshold, and returns a count of how
++ * much entropy (in bits) is needed to sustain the pool.
++ *
+  * All of these routines try to estimate how many bits of randomness a
+  * particular randomness source.  They do this by keeping track of the
+  * first and second order deltas of the event timings.
+@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk 
+ }
+ #endif
+ 
++/*
++ * random_input_words - add bulk entropy to pool
++ *
++ * @buf: buffer to add
++ * @wordcount: number of __u32 words to add
++ * @ent_count: total amount of entropy (in bits) to credit
++ *
++ * this provides bulk input of entropy to the input pool
++ *
++ */
++void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++{
++	mix_pool_bytes(&input_pool, buf, wordcount*4, NULL);
++
++	credit_entropy_bits(&input_pool, ent_count);
++
++	DEBUG_ENT("crediting %d bits => %d\n",
++		  ent_count, input_pool.entropy_count);
++	/*
++	 * Wake up waiting processes if we have enough
++	 * entropy.
++	 */
++	if (input_pool.entropy_count >= random_read_wakeup_thresh)
++		wake_up_interruptible(&random_read_wait);
++}
++EXPORT_SYMBOL(random_input_words);
++
++/*
++ * random_input_wait - wait until random needs entropy
++ *
++ * this function sleeps until the /dev/random subsystem actually
++ * needs more entropy, and then return the amount of entropy
++ * that it would be nice to have added to the system.
++ */
++int random_input_wait(void)
++{
++	int count;
++
++	wait_event_interruptible(random_write_wait, 
++			 input_pool.entropy_count < random_write_wakeup_thresh);
++
++	count = random_write_wakeup_thresh - input_pool.entropy_count;
++
++        /* likely we got woken up due to a signal */
++	if (count <= 0) count = random_read_wakeup_thresh; 
++
++	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
++		  count,
++		  input_pool.entropy_count, random_write_wakeup_thresh);
++
++	return count;
++}
++EXPORT_SYMBOL(random_input_wait);
++
++
++#define EXTRACT_SIZE 10
++
+ /*********************************************************************
+  *
+  * Entropy extraction routines
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -148,6 +148,7 @@ pid_t f_getown(struct file *filp)
+ 	read_unlock(&filp->f_owner.lock);
+ 	return pid;
+ }
++EXPORT_SYMBOL(sys_dup);
+ 
+ static int f_setown_ex(struct file *filp, unsigned long arg)
+ {
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -19,6 +19,7 @@
+ #define APOLLO_MOUSE_MINOR	7
+ #define PC110PAD_MINOR		9
+ /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
++#define CRYPTODEV_MINOR		70	/* /dev/crypto */
+ #define WATCHDOG_MINOR		130	/* Watchdog timer     */
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+--- a/include/uapi/linux/random.h
++++ b/include/uapi/linux/random.h
+@@ -34,6 +34,30 @@
+ /* Clear the entropy pool and associated counters.  (Superuser only.) */
+ #define RNDCLEARPOOL	_IO( 'R', 0x06 )
+ 
++#ifdef CONFIG_FIPS_RNG
++
++/* Size of seed value - equal to AES blocksize */
++#define AES_BLOCK_SIZE_BYTES	16
++#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
++/* Size of AES key */
++#define KEY_SIZE_BYTES		16
++
++/* ioctl() structure used by FIPS 140-2 Tests */
++struct rand_fips_test {
++	unsigned char key[KEY_SIZE_BYTES];			/* Input */
++	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
++	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
++	unsigned char result[SEED_SIZE_BYTES];		/* Output */
++};
++
++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
++#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
++
++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
++#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
++
++#endif /* #ifdef CONFIG_FIPS_RNG */
++
+ struct rand_pool_info {
+ 	int	entropy_count;
+ 	int	buf_size;
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -14,6 +14,10 @@ extern void add_input_randomness(unsigne
+ 				 unsigned int value);
+ extern void add_interrupt_randomness(int irq, int irq_flags);
+ 
++extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
++extern int random_input_wait(void);
++#define HAS_RANDOM_INPUT_WAIT 1
++
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -423,6 +423,7 @@ void transfer_pid(struct task_struct *ol
+ 	new->pids[type].pid = old->pids[type].pid;
+ 	hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
diff --git a/trunk/target/linux/generic/patches-3.10/960-decompress_unlzo_fix.patch b/trunk/target/linux/generic/patches-3.10/960-decompress_unlzo_fix.patch
new file mode 100644
index 00000000..ee7c118e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/960-decompress_unlzo_fix.patch
@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/include/linux/decompress/unlzo_mm.h
+@@ -0,0 +1,10 @@
++#ifndef UNLZO_MM_H
++#define UNLZO_MM_H
++
++#ifdef STATIC
++#define INIT
++#else
++#define INIT __init
++#endif
++
++#endif
+--- a/lib/decompress_unlzo.c
++++ b/lib/decompress_unlzo.c
+@@ -38,6 +38,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/lzo.h>
++#include <linux/decompress/unlzo_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #include <linux/compiler.h>
diff --git a/trunk/target/linux/generic/patches-3.10/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/trunk/target/linux/generic/patches-3.10/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 00000000..65c6ef7d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/970-remove-unsane-filenames-from-deps_initramfs-list.patch
@@ -0,0 +1,28 @@
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -50,20 +50,22 @@ ifneq ($(wildcard $(obj)/.initramfs_data
+ 	include $(obj)/.initramfs_data.cpio.d
+ endif
+ 
++deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
++
+ quiet_cmd_initfs = GEN     $@
+       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+ 
+ targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.xz initramfs_data.cpio.lzo initramfs_data.cpio
+ # do not try to update files included in initramfs
+-$(deps_initramfs): ;
++$(deps_initramfs_sane): ;
+ 
+-$(deps_initramfs): klibcdirs
++$(deps_initramfs_sane): klibcdirs
+ # We rebuild initramfs_data.cpio if:
+ # 1) Any included file is newer then initramfs_data.cpio
+ # 2) There are changes in which files are included (added or deleted)
+ # 3) If gen_init_cpio are newer than initramfs_data.cpio
+ # 4) arguments to gen_initramfs.sh changes
+-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
++$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
+ 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
+ 	$(call if_changed,initfs)
+ 
diff --git a/trunk/target/linux/generic/patches-3.10/980-arm_openwrt_machtypes.patch b/trunk/target/linux/generic/patches-3.10/980-arm_openwrt_machtypes.patch
new file mode 100644
index 00000000..8303344b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/980-arm_openwrt_machtypes.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1007,3 +1007,29 @@ eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572
+ eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573
+ domotab			MACH_DOMOTAB		DOMOTAB			4574
+ pfla03			MACH_PFLA03		PFLA03			4575
++#
++# Additional mach-types supported by libreCMC
++#
++wg302v1			MACH_WG302V1		WG302V1			889
++pronghorn		MACH_PRONGHORN		PRONGHORN		928
++pronghorn_metro		MACH_PRONGHORNMETRO	PRONGHORNMETRO		1040
++sidewinder		MACH_SIDEWINDER		SIDEWINDER		1041
++wrt300nv2		MACH_WRT300NV2		WRT300NV2		1077
++compex42x		MACH_COMPEXWP18		COMPEXWP18		1273
++goldfish		MACH_GOLDFISH		GOLDFISH		1441
++cambria			MACH_CAMBRIA		CAMBRIA			1468
++dt2			MACH_DT2		DT2			1514
++ap1000			MACH_AP1000		AP1000			1543
++tw2662			MACH_TW2662		TW2662			1658
++tw5334			MACH_TW5334		TW5334			1664
++usr8200			MACH_USR8200		USR8200			1762
++mi424wr			MACH_MI424WR		MI424WR			1778
++gw2388			MACH_GW2388		GW2388			2635
++iconnect		MACH_ICONNECT		ICONNECT		2870
++nsb3ast			MACH_NSB3AST		NSB3AST			2917
++goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089
++nas6210			MACH_NAS6210		NAS6210			3104
++ns_k330			MACH_NS_K330		NS_K330			3108
++bcm2708			MACH_BCM2708		BCM2708			3138
++wn802t			MACH_WN802T		WN802T			3306
++nsa310			MACH_NSA310		NSA310			4022
diff --git a/trunk/target/linux/generic/patches-3.10/990-gpio_wdt.patch b/trunk/target/linux/generic/patches-3.10/990-gpio_wdt.patch
new file mode 100644
index 00000000..4a376c01
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/990-gpio_wdt.patch
@@ -0,0 +1,360 @@
+This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
+
+Signed-off-by: Mathias Adam <m.adam--librecmc@adamis.de>
+
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -1035,6 +1035,15 @@ config WDT_MTX1
+ 	  Hardware driver for the MTX-1 boards. This is a watchdog timer that
+ 	  will reboot the machine after a 100 seconds timer expired.
+ 
++config GPIO_WDT
++	tristate "GPIO Hardware Watchdog"
++ 	help
++	  Hardware driver for GPIO-controlled watchdogs. GPIO pin and
++	  toggle interval settings are platform-specific. The driver
++	  will stop toggling the GPIO (i.e. machine reboots) after a
++	  100 second timer expired and no process has written to
++	  /dev/watchdog during that time.
++
+ config PNX833X_WDT
+ 	tristate "PNX833x Hardware Watchdog"
+ 	depends on SOC_PNX8335
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -127,6 +127,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
+ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
++obj-$(CONFIG_GPIO_WDT) += gpio_wdt.o
+ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
+ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
+ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+--- /dev/null
++++ b/drivers/watchdog/gpio_wdt.c
+@@ -0,0 +1,301 @@
++/*
++ *      Driver for GPIO-controlled Hardware Watchdogs.
++ *
++ *      Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *      Replaces mtx1_wdt (driver for the MTX-1 Watchdog):
++ *
++ *      (C) Copyright 2005 4G Systems <info@4g-systems.biz>,
++ *                              All Rights Reserved.
++ *                              http://www.4g-systems.biz
++ *
++ *      (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
++ *
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ *
++ *      Neither Michael Stickel nor 4G Systems admit liability nor provide
++ *      warranty for any of this software. This material is provided
++ *      "AS-IS" and at no charge.
++ *
++ *      (c) Copyright 2005    4G Systems <info@4g-systems.biz>
++ *
++ *      Release 0.01.
++ *      Author: Michael Stickel  michael.stickel@4g-systems.biz
++ *
++ *      Release 0.02.
++ *      Author: Florian Fainelli florian@openwrt.org
++ *              use the Linux watchdog/timer APIs
++ *
++ *      Release 0.03.
++ *      Author: Mathias Adam <m.adam--linux@adamis.de>
++ *              make it a generic gpio watchdog driver
++ *
++ *      The Watchdog is configured to reset the MTX-1
++ *      if it is not triggered for 100 seconds.
++ *      It should not be triggered more often than 1.6 seconds.
++ *
++ *      A timer triggers the watchdog every 5 seconds, until
++ *      it is opened for the first time. After the first open
++ *      it MUST be triggered every 2..95 seconds.
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/miscdevice.h>
++#include <linux/fs.h>
++#include <linux/init.h>
++#include <linux/ioport.h>
++#include <linux/timer.h>
++#include <linux/completion.h>
++#include <linux/jiffies.h>
++#include <linux/watchdog.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/uaccess.h>
++#include <linux/gpio.h>
++#include <linux/gpio_wdt.h>
++
++static int ticks = 100 * HZ;
++
++static struct {
++	struct completion stop;
++	spinlock_t lock;
++	int running;
++	struct timer_list timer;
++	int queue;
++	int default_ticks;
++	unsigned long inuse;
++	unsigned gpio;
++	unsigned int gstate;
++	int interval;
++	int first_interval;
++} gpio_wdt_device;
++
++static void gpio_wdt_trigger(unsigned long unused)
++{
++	spin_lock(&gpio_wdt_device.lock);
++	if (gpio_wdt_device.running && ticks > 0)
++		ticks -= gpio_wdt_device.interval;
++
++	/* toggle wdt gpio */
++	gpio_wdt_device.gstate = !gpio_wdt_device.gstate;
++	gpio_set_value(gpio_wdt_device.gpio, gpio_wdt_device.gstate);
++
++	if (gpio_wdt_device.queue && ticks > 0)
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.interval);
++	else
++		complete(&gpio_wdt_device.stop);
++	spin_unlock(&gpio_wdt_device.lock);
++}
++
++static void gpio_wdt_reset(void)
++{
++	ticks = gpio_wdt_device.default_ticks;
++}
++
++
++static void gpio_wdt_start(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (!gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 1;
++		gpio_wdt_device.gstate = 1;
++		gpio_set_value(gpio_wdt_device.gpio, 1);
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.first_interval);
++	}
++	gpio_wdt_device.running++;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++}
++
++static int gpio_wdt_stop(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		gpio_wdt_device.gstate = 0;
++		gpio_set_value(gpio_wdt_device.gpio, 0);
++	}
++	ticks = gpio_wdt_device.default_ticks;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++	return 0;
++}
++
++/* Filesystem functions */
++
++static int gpio_wdt_open(struct inode *inode, struct file *file)
++{
++	if (test_and_set_bit(0, &gpio_wdt_device.inuse))
++		return -EBUSY;
++	return nonseekable_open(inode, file);
++}
++
++
++static int gpio_wdt_release(struct inode *inode, struct file *file)
++{
++	clear_bit(0, &gpio_wdt_device.inuse);
++	return 0;
++}
++
++static long gpio_wdt_ioctl(struct file *file, unsigned int cmd,
++							unsigned long arg)
++{
++	void __user *argp = (void __user *)arg;
++	int __user *p = (int __user *)argp;
++	unsigned int value;
++	static const struct watchdog_info ident = {
++		.options = WDIOF_CARDRESET,
++		.identity = "GPIO WDT",
++	};
++
++	switch (cmd) {
++	case WDIOC_GETSUPPORT:
++		if (copy_to_user(argp, &ident, sizeof(ident)))
++			return -EFAULT;
++		break;
++	case WDIOC_GETSTATUS:
++	case WDIOC_GETBOOTSTATUS:
++		put_user(0, p);
++		break;
++	case WDIOC_SETOPTIONS:
++		if (get_user(value, p))
++			return -EFAULT;
++		if (value & WDIOS_ENABLECARD)
++			gpio_wdt_start();
++		else if (value & WDIOS_DISABLECARD)
++			gpio_wdt_stop();
++		else
++			return -EINVAL;
++		return 0;
++	case WDIOC_KEEPALIVE:
++		gpio_wdt_reset();
++		break;
++	default:
++		return -ENOTTY;
++	}
++	return 0;
++}
++
++
++static ssize_t gpio_wdt_write(struct file *file, const char *buf,
++						size_t count, loff_t *ppos)
++{
++	if (!count)
++		return -EIO;
++	gpio_wdt_reset();
++	return count;
++}
++
++static const struct file_operations gpio_wdt_fops = {
++	.owner		= THIS_MODULE,
++	.llseek		= no_llseek,
++	.unlocked_ioctl	= gpio_wdt_ioctl,
++	.open		= gpio_wdt_open,
++	.write		= gpio_wdt_write,
++	.release	= gpio_wdt_release,
++};
++
++
++static struct miscdevice gpio_wdt_misc = {
++	.minor	= WATCHDOG_MINOR,
++	.name	= "watchdog",
++	.fops	= &gpio_wdt_fops,
++};
++
++
++static int gpio_wdt_probe(struct platform_device *pdev)
++{
++	int ret;
++	struct gpio_wdt_platform_data *gpio_wdt_data = pdev->dev.platform_data;
++
++	gpio_wdt_device.gpio = gpio_wdt_data->gpio;
++	gpio_wdt_device.interval = gpio_wdt_data->interval;
++	gpio_wdt_device.first_interval = gpio_wdt_data->first_interval;
++	if (gpio_wdt_device.first_interval <= 0) {
++		gpio_wdt_device.first_interval = gpio_wdt_device.interval;
++	}
++
++	ret = gpio_request(gpio_wdt_device.gpio, "gpio-wdt");
++	if (ret < 0) {
++		dev_err(&pdev->dev, "failed to request gpio");
++		return ret;
++	}
++
++	spin_lock_init(&gpio_wdt_device.lock);
++	init_completion(&gpio_wdt_device.stop);
++	gpio_wdt_device.queue = 0;
++	clear_bit(0, &gpio_wdt_device.inuse);
++	setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
++	gpio_wdt_device.default_ticks = ticks;
++
++	gpio_wdt_start();
++	dev_info(&pdev->dev, "GPIO Hardware Watchdog driver (gpio=%i interval=%i/%i)\n",
++		gpio_wdt_data->gpio, gpio_wdt_data->first_interval, gpio_wdt_data->interval);
++	return 0;
++}
++
++static int gpio_wdt_remove(struct platform_device *pdev)
++{
++	/* FIXME: do we need to lock this test ? */
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		wait_for_completion(&gpio_wdt_device.stop);
++	}
++
++	gpio_free(gpio_wdt_device.gpio);
++	misc_deregister(&gpio_wdt_misc);
++	return 0;
++}
++
++static struct platform_driver gpio_wdt_driver = {
++	.probe = gpio_wdt_probe,
++	.remove = gpio_wdt_remove,
++	.driver.name = "gpio-wdt",
++	.driver.owner = THIS_MODULE,
++};
++
++static int __init gpio_wdt_init(void)
++{
++	return platform_driver_register(&gpio_wdt_driver);
++}
++arch_initcall(gpio_wdt_init);
++
++/*
++ * We do wdt initialization in two steps: arch_initcall probes the wdt
++ * very early to start pinging the watchdog (misc devices are not yet
++ * available), and later module_init() just registers the misc device.
++ */
++static int gpio_wdt_init_late(void)
++{
++	int ret;
++
++	ret = misc_register(&gpio_wdt_misc);
++	if (ret < 0) {
++		pr_err("GPIO_WDT: failed to register misc device\n");
++		return ret;
++	}
++	return 0;
++}
++#ifndef MODULE
++module_init(gpio_wdt_init_late);
++#endif
++
++static void __exit gpio_wdt_exit(void)
++{
++	platform_driver_unregister(&gpio_wdt_driver);
++}
++module_exit(gpio_wdt_exit);
++
++MODULE_AUTHOR("Michael Stickel, Florian Fainelli, Mathias Adam");
++MODULE_DESCRIPTION("Driver for GPIO hardware watchdogs");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
++MODULE_ALIAS("platform:gpio-wdt");
+--- /dev/null
++++ b/include/linux/gpio_wdt.h
+@@ -0,0 +1,21 @@
++/*
++ *  Definitions for the GPIO watchdog driver
++ *
++ *  Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ *
++ */
++
++#ifndef _GPIO_WDT_H_
++#define _GPIO_WDT_H_
++
++struct gpio_wdt_platform_data {
++	int	gpio;		/* GPIO line number */
++	int	interval;	/* watchdog reset interval in system ticks */
++	int	first_interval;	/* first wd reset interval in system ticks */
++};
++
++#endif /* _GPIO_WDT_H_ */
diff --git a/trunk/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/trunk/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch
new file mode 100644
index 00000000..ae81f3f3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch
@@ -0,0 +1,75 @@
+Although the commit "98af057092f8f0dabe63c5df08adc2bbfbddb1d2
+ ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes"
+resolved long standing mpcore_wdt driver build problems, it
+introduced an error in the relationship between the MPcore watchdog
+timer clock rate and mpcore_margin, "MPcore timer margin in seconds",
+such that watchdog timeouts are now arbitrary rather than the number
+of seconds specified by mpcore_margin.
+
+This change restores mpcore_wdt_keepalive() to its equivalent
+implementation prior to commit 98af057 such that watchdog timeouts now
+occur as specified by mpcore_margin.
+
+The variable 'mpcore_timer_rate' which caused that build failure was
+replaced by 'twd_timer_rate'. Adding exported function to obtain
+'twd_timer_rate' value in mpcore_wdt driver.
+
+MPCORE_WATCHDOG needed to build 'mpcore_wdt' already depends on
+HAVE_ARM_TWD needed to build 'smp_twd', so from the point of view of
+'mpcore_wdt' driver the exported function will always exist.
+
+Signed-off-by: Valentine Barshak <vbarshak@mvista.com>
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+
+ arch/arm/include/asm/smp_twd.h |    1 +
+ arch/arm/kernel/smp_twd.c      |    7 +++++++
+ drivers/watchdog/mpcore_wdt.c  |    4 +---
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/include/asm/smp_twd.h
++++ b/arch/arm/include/asm/smp_twd.h
+@@ -33,5 +33,6 @@ struct twd_local_timer name __initdata =
+ };
+ 
+ int twd_local_timer_register(struct twd_local_timer *);
++unsigned long twd_timer_get_rate(void);
+ 
+ #endif
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -10,6 +10,7 @@
+  */
+ #include <linux/init.h>
+ #include <linux/kernel.h>
++#include <linux/export.h>
+ #include <linux/clk.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+@@ -361,6 +362,13 @@ int __init twd_local_timer_register(stru
+ 	return twd_local_timer_common_register(NULL);
+ }
+ 
++/* Needed by mpcore_wdt */
++unsigned long twd_timer_get_rate(void)
++{
++	return twd_timer_rate;
++}
++EXPORT_SYMBOL_GPL(twd_timer_get_rate);
++
+ #ifdef CONFIG_OF
+ static void __init twd_local_timer_of_register(struct device_node *np)
+ {
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct 
+ 
+ 	spin_lock(&wdt_lock);
+ 	/* Assume prescale is set to 256 */
+-	count =  __raw_readl(wdt->base + TWD_WDOG_COUNTER);
+-	count = (0xFFFFFFFFU - count) * (HZ / 5);
+-	count = (count / 256) * mpcore_margin;
++	count = (twd_timer_get_rate() / 256) * mpcore_margin;
+ 
+ 	/* Reload the counter */
+ 	writel(count + wdt->perturb, wdt->base + TWD_WDOG_LOAD);
diff --git a/trunk/target/linux/generic/patches-3.10/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch b/trunk/target/linux/generic/patches-3.10/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
new file mode 100644
index 00000000..c986ac8f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
@@ -0,0 +1,29 @@
+According to the include/linux/watchdog.h WDIOC_SETOPTIONS is
+classified as 'read from device' ioctl call:
+  #define WDIOC_SETOPTIONS        _IOR(WATCHDOG_IOCTL_BASE, 4, int)
+
+However, the driver 'mpcore_wdt' performs 'copy_from_user' only if
+_IOC_WRITE is set, thus the local variable 'uarg' which is used in
+WDIOC_SETOPTIONS handling remains uninitialized.
+
+The proper way to fix this is to bind WDIOC_SETOPTIONS to _IOW,
+but this will break compatibility.
+So adding additional condition for performing 'copy_from_user'.
+
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+ drivers/watchdog/mpcore_wdt.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -235,7 +235,8 @@ static long mpcore_wdt_ioctl(struct file
+ 	if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
+ 		return -ENOTTY;
+ 
+-	if (_IOC_DIR(cmd) & _IOC_WRITE) {
++	if ((_IOC_DIR(cmd) & _IOC_WRITE)
++			|| cmd == WDIOC_SETOPTIONS) {
+ 		ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd));
+ 		if (ret)
+ 			return -EFAULT;
diff --git a/trunk/target/linux/generic/patches-3.10/994-mpcore_wdt_fix_timer_mode_setup.patch b/trunk/target/linux/generic/patches-3.10/994-mpcore_wdt_fix_timer_mode_setup.patch
new file mode 100644
index 00000000..ecc2452c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/994-mpcore_wdt_fix_timer_mode_setup.patch
@@ -0,0 +1,57 @@
+Allow watchdog to set its iterrupt as pending when it is configured
+for timer mode (in other words, allow emitting interrupt).
+Also add macros for all Watchdog Control Register flags.
+
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+ arch/arm/include/asm/smp_twd.h |    6 ++++++
+ drivers/watchdog/mpcore_wdt.c  |   15 +++++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/include/asm/smp_twd.h
++++ b/arch/arm/include/asm/smp_twd.h
+@@ -18,6 +18,12 @@
+ #define TWD_TIMER_CONTROL_PERIODIC	(1 << 1)
+ #define TWD_TIMER_CONTROL_IT_ENABLE	(1 << 2)
+ 
++#define TWD_WDOG_CONTROL_ENABLE		(1 << 0)
++#define TWD_WDOG_CONTROL_PERIODIC	(1 << 1)
++#define TWD_WDOG_CONTROL_IT_ENABLE	(1 << 2)
++#define TWD_WDOG_CONTROL_TIMER_MODE	(0 << 3)
++#define TWD_WDOG_CONTROL_WATCHDOG_MODE	(1 << 3)
++
+ #include <linux/ioport.h>
+ 
+ struct twd_local_timer {
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -120,18 +120,25 @@ static void mpcore_wdt_stop(struct mpcor
+ 
+ static void mpcore_wdt_start(struct mpcore_wdt *wdt)
+ {
++	u32 mode;
++
+ 	dev_info(wdt->dev, "enabling watchdog\n");
+ 
+ 	/* This loads the count register but does NOT start the count yet */
+ 	mpcore_wdt_keepalive(wdt);
+ 
++	/* Setup watchdog - prescale=256, enable=1 */
++	mode = (255 << 8) | TWD_WDOG_CONTROL_ENABLE;
++
+ 	if (mpcore_noboot) {
+-		/* Enable watchdog - prescale=256, watchdog mode=0, enable=1 */
+-		writel(0x0000FF01, wdt->base + TWD_WDOG_CONTROL);
++		/* timer mode, send interrupt */
++		mode |=	TWD_WDOG_CONTROL_TIMER_MODE |
++				TWD_WDOG_CONTROL_IT_ENABLE;
+ 	} else {
+-		/* Enable watchdog - prescale=256, watchdog mode=1, enable=1 */
+-		writel(0x0000FF09, wdt->base + TWD_WDOG_CONTROL);
++		/* watchdog mode */
++		mode |=	TWD_WDOG_CONTROL_WATCHDOG_MODE;
+ 	}
++	writel(mode, wdt->base + TWD_WDOG_CONTROL);
+ }
+ 
+ static int mpcore_wdt_set_heartbeat(int t)
diff --git a/trunk/target/linux/generic/patches-3.10/995-mpcore_twd_calibrate_single_core.patch b/trunk/target/linux/generic/patches-3.10/995-mpcore_twd_calibrate_single_core.patch
new file mode 100644
index 00000000..70411160
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/995-mpcore_twd_calibrate_single_core.patch
@@ -0,0 +1,23 @@
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -188,7 +188,7 @@ core_initcall(twd_cpufreq_init);
+ 
+ #endif
+ 
+-static void __cpuinit twd_calibrate_rate(void)
++static int twd_calibrate_rate(void)
+ {
+ 	unsigned long count;
+ 	u64 waitjiffies;
+@@ -225,8 +225,11 @@ static void __cpuinit twd_calibrate_rate
+ 		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
+ 			(twd_timer_rate / 10000) % 100);
+ 	}
++	return 0;
+ }
+ 
++device_initcall(twd_calibrate_rate);
++
+ static irqreturn_t twd_handler(int irq, void *dev_id)
+ {
+ 	struct clock_event_device *evt = *(struct clock_event_device **)dev_id;
diff --git a/trunk/target/linux/generic/patches-3.10/996-zsmalloc_allow_module_build.patch b/trunk/target/linux/generic/patches-3.10/996-zsmalloc_allow_module_build.patch
new file mode 100644
index 00000000..eaa9fc60
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/996-zsmalloc_allow_module_build.patch
@@ -0,0 +1,9 @@
+--- a/drivers/staging/zsmalloc/Kconfig
++++ b/drivers/staging/zsmalloc/Kconfig
+@@ -1,5 +1,5 @@
+ config ZSMALLOC
+-	bool "Memory allocator for compressed pages"
++	tristate "Memory allocator for compressed pages"
+ 	default n
+ 	help
+ 	  zsmalloc is a slab-based memory allocator designed to store
diff --git a/trunk/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch b/trunk/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch
new file mode 100644
index 00000000..7b8939a0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.10/997-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -679,6 +679,9 @@ int __init early_init_dt_scan_chosen(uns
+ 	p = of_get_flat_dt_prop(node, "bootargs", &l);
+ 	if (p != NULL && l > 0)
+ 		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
++	p = of_get_flat_dt_prop(node, "bootargs-append", &l);
++	if (p != NULL && l > 0)
++		strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE));
+ 
+ 	/*
+ 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
diff --git a/trunk/target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch b/trunk/target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch
new file mode 100644
index 00000000..b5b1955f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/000-keep_initrafs_the_default.patch
@@ -0,0 +1,25 @@
+Upstream changed the default rootfs to tmpfs when none has been passed
+to the kernel - this doesn't fit our purposes, so change it back.
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -622,6 +622,7 @@ int __init init_rootfs(void)
+ 	if (err)
+ 		return err;
+ 
++#if 0
+ 	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+ 		(!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
+ 		err = shmem_init();
+@@ -629,6 +630,9 @@ int __init init_rootfs(void)
+ 	} else {
+ 		err = init_ramfs_fs();
+ 	}
++#else
++	err = init_ramfs_fs();
++#endif
+ 
+ 	if (err)
+ 		unregister_filesystem(&rootfs_fs_type);
diff --git a/trunk/target/linux/generic/patches-3.13/020-ssb_update.patch b/trunk/target/linux/generic/patches-3.13/020-ssb_update.patch
new file mode 100644
index 00000000..ec13f48e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/020-ssb_update.patch
@@ -0,0 +1,686 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -168,6 +168,7 @@ config SSB_DRIVER_GIGE
+ config SSB_DRIVER_GPIO
+ 	bool "SSB GPIO driver"
+ 	depends on SSB && GPIOLIB
++	select IRQ_DOMAIN if SSB_EMBEDDED
+ 	help
+ 	  Driver to provide access to the GPIO pins on the bus.
+ 
+--- a/drivers/ssb/driver_chipcommon_sflash.c
++++ b/drivers/ssb/driver_chipcommon_sflash.c
+@@ -37,7 +37,7 @@ static const struct ssb_sflash_tbl_e ssb
+ 	{ "M25P32", 0x15, 0x10000, 64, },
+ 	{ "M25P64", 0x16, 0x10000, 128, },
+ 	{ "M25FL128", 0x17, 0x10000, 256, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static const struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
+@@ -55,7 +55,7 @@ static const struct ssb_sflash_tbl_e ssb
+ 	{ "SST25VF016", 0x41, 0x1000, 512, },
+ 	{ "SST25VF032", 0x4a, 0x1000, 1024, },
+ 	{ "SST25VF064", 0x4b, 0x1000, 2048, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static const struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
+@@ -66,7 +66,7 @@ static const struct ssb_sflash_tbl_e ssb
+ 	{ "AT45DB161", 0x2c, 512, 4096, },
+ 	{ "AT45DB321", 0x34, 512, 8192, },
+ 	{ "AT45DB642", 0x3c, 1024, 8192, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode)
+--- a/drivers/ssb/driver_gpio.c
++++ b/drivers/ssb/driver_gpio.c
+@@ -9,16 +9,40 @@
+  */
+ 
+ #include <linux/gpio.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/irqdomain.h>
+ #include <linux/export.h>
+ #include <linux/ssb/ssb.h>
+ 
+ #include "ssb_private.h"
+ 
++
++/**************************************************
++ * Shared
++ **************************************************/
++
+ static struct ssb_bus *ssb_gpio_get_bus(struct gpio_chip *chip)
+ {
+ 	return container_of(chip, struct ssb_bus, gpio);
+ }
+ 
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++static int ssb_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		return irq_find_mapping(bus->irq_domain, gpio);
++	else
++		return -EINVAL;
++}
++#endif
++
++/**************************************************
++ * ChipCommon
++ **************************************************/
++
+ static int ssb_gpio_chipco_get_value(struct gpio_chip *chip, unsigned gpio)
+ {
+ 	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
+@@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct
+ 	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);
+ }
+ 
+-static int ssb_gpio_chipco_to_irq(struct gpio_chip *chip, unsigned gpio)
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++static void ssb_gpio_irq_chipco_mask(struct irq_data *d)
+ {
+-	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
+ 
+-	if (bus->bustype == SSB_BUSTYPE_SSB)
+-		return ssb_mips_irq(bus->chipco.dev) + 2;
+-	else
+-		return -EINVAL;
++	ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), 0);
++}
++
++static void ssb_gpio_irq_chipco_unmask(struct irq_data *d)
++{
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++	u32 val = ssb_chipco_gpio_in(&bus->chipco, BIT(gpio));
++
++	ssb_chipco_gpio_polarity(&bus->chipco, BIT(gpio), val);
++	ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), BIT(gpio));
++}
++
++static struct irq_chip ssb_gpio_irq_chipco_chip = {
++	.name		= "SSB-GPIO-CC",
++	.irq_mask	= ssb_gpio_irq_chipco_mask,
++	.irq_unmask	= ssb_gpio_irq_chipco_unmask,
++};
++
++static irqreturn_t ssb_gpio_irq_chipco_handler(int irq, void *dev_id)
++{
++	struct ssb_bus *bus = dev_id;
++	struct ssb_chipcommon *chipco = &bus->chipco;
++	u32 val = chipco_read32(chipco, SSB_CHIPCO_GPIOIN);
++	u32 mask = chipco_read32(chipco, SSB_CHIPCO_GPIOIRQ);
++	u32 pol = chipco_read32(chipco, SSB_CHIPCO_GPIOPOL);
++	unsigned long irqs = (val ^ pol) & mask;
++	int gpio;
++
++	if (!irqs)
++		return IRQ_NONE;
++
++	for_each_set_bit(gpio, &irqs, bus->gpio.ngpio)
++		generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));
++	ssb_chipco_gpio_polarity(chipco, irqs, val & irqs);
++
++	return IRQ_HANDLED;
++}
++
++static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)
++{
++	struct ssb_chipcommon *chipco = &bus->chipco;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio, hwirq, err;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return 0;
++
++	bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
++						&irq_domain_simple_ops, chipco);
++	if (!bus->irq_domain) {
++		err = -ENODEV;
++		goto err_irq_domain;
++	}
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_create_mapping(bus->irq_domain, gpio);
++
++		irq_set_chip_data(irq, bus);
++		irq_set_chip_and_handler(irq, &ssb_gpio_irq_chipco_chip,
++					 handle_simple_irq);
++	}
++
++	hwirq = ssb_mips_irq(bus->chipco.dev) + 2;
++	err = request_irq(hwirq, ssb_gpio_irq_chipco_handler, IRQF_SHARED,
++			  "gpio", bus);
++	if (err)
++		goto err_req_irq;
++
++	ssb_chipco_gpio_intmask(&bus->chipco, ~0, 0);
++	chipco_set32(chipco, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO);
++
++	return 0;
++
++err_req_irq:
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++err_irq_domain:
++	return err;
++}
++
++static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)
++{
++	struct ssb_chipcommon *chipco = &bus->chipco;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return;
++
++	chipco_mask32(chipco, SSB_CHIPCO_IRQMASK, ~SSB_CHIPCO_IRQ_GPIO);
++	free_irq(ssb_mips_irq(bus->chipco.dev) + 2, chipco);
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++}
++#else
++static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)
++{
++	return 0;
++}
++
++static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)
++{
+ }
++#endif
+ 
+ static int ssb_gpio_chipco_init(struct ssb_bus *bus)
+ {
+ 	struct gpio_chip *chip = &bus->gpio;
++	int err;
+ 
+ 	chip->label		= "ssb_chipco_gpio";
+ 	chip->owner		= THIS_MODULE;
+@@ -96,7 +230,9 @@ static int ssb_gpio_chipco_init(struct s
+ 	chip->set		= ssb_gpio_chipco_set_value;
+ 	chip->direction_input	= ssb_gpio_chipco_direction_input;
+ 	chip->direction_output	= ssb_gpio_chipco_direction_output;
+-	chip->to_irq		= ssb_gpio_chipco_to_irq;
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++	chip->to_irq		= ssb_gpio_to_irq;
++#endif
+ 	chip->ngpio		= 16;
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+@@ -106,9 +242,23 @@ static int ssb_gpio_chipco_init(struct s
+ 	else
+ 		chip->base		= -1;
+ 
+-	return gpiochip_add(chip);
++	err = ssb_gpio_irq_chipco_domain_init(bus);
++	if (err)
++		return err;
++
++	err = gpiochip_add(chip);
++	if (err) {
++		ssb_gpio_irq_chipco_domain_exit(bus);
++		return err;
++	}
++
++	return 0;
+ }
+ 
++/**************************************************
++ * EXTIF
++ **************************************************/
++
+ #ifdef CONFIG_SSB_DRIVER_EXTIF
+ 
+ static int ssb_gpio_extif_get_value(struct gpio_chip *chip, unsigned gpio)
+@@ -145,19 +295,127 @@ static int ssb_gpio_extif_direction_outp
+ 	return 0;
+ }
+ 
+-static int ssb_gpio_extif_to_irq(struct gpio_chip *chip, unsigned gpio)
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++static void ssb_gpio_irq_extif_mask(struct irq_data *d)
+ {
+-	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
+ 
+-	if (bus->bustype == SSB_BUSTYPE_SSB)
+-		return ssb_mips_irq(bus->extif.dev) + 2;
+-	else
+-		return -EINVAL;
++	ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), 0);
++}
++
++static void ssb_gpio_irq_extif_unmask(struct irq_data *d)
++{
++	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++	u32 val = ssb_extif_gpio_in(&bus->extif, BIT(gpio));
++
++	ssb_extif_gpio_polarity(&bus->extif, BIT(gpio), val);
++	ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), BIT(gpio));
++}
++
++static struct irq_chip ssb_gpio_irq_extif_chip = {
++	.name		= "SSB-GPIO-EXTIF",
++	.irq_mask	= ssb_gpio_irq_extif_mask,
++	.irq_unmask	= ssb_gpio_irq_extif_unmask,
++};
++
++static irqreturn_t ssb_gpio_irq_extif_handler(int irq, void *dev_id)
++{
++	struct ssb_bus *bus = dev_id;
++	struct ssb_extif *extif = &bus->extif;
++	u32 val = ssb_read32(extif->dev, SSB_EXTIF_GPIO_IN);
++	u32 mask = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTMASK);
++	u32 pol = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTPOL);
++	unsigned long irqs = (val ^ pol) & mask;
++	int gpio;
++
++	if (!irqs)
++		return IRQ_NONE;
++
++	for_each_set_bit(gpio, &irqs, bus->gpio.ngpio)
++		generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));
++	ssb_extif_gpio_polarity(extif, irqs, val & irqs);
++
++	return IRQ_HANDLED;
++}
++
++static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)
++{
++	struct ssb_extif *extif = &bus->extif;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio, hwirq, err;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return 0;
++
++	bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
++						&irq_domain_simple_ops, extif);
++	if (!bus->irq_domain) {
++		err = -ENODEV;
++		goto err_irq_domain;
++	}
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_create_mapping(bus->irq_domain, gpio);
++
++		irq_set_chip_data(irq, bus);
++		irq_set_chip_and_handler(irq, &ssb_gpio_irq_extif_chip,
++					 handle_simple_irq);
++	}
++
++	hwirq = ssb_mips_irq(bus->extif.dev) + 2;
++	err = request_irq(hwirq, ssb_gpio_irq_extif_handler, IRQF_SHARED,
++			  "gpio", bus);
++	if (err)
++		goto err_req_irq;
++
++	ssb_extif_gpio_intmask(&bus->extif, ~0, 0);
++
++	return 0;
++
++err_req_irq:
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++err_irq_domain:
++	return err;
+ }
+ 
++static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)
++{
++	struct ssb_extif *extif = &bus->extif;
++	struct gpio_chip *chip = &bus->gpio;
++	int gpio;
++
++	if (bus->bustype != SSB_BUSTYPE_SSB)
++		return;
++
++	free_irq(ssb_mips_irq(bus->extif.dev) + 2, extif);
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(bus->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(bus->irq_domain);
++}
++#else
++static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)
++{
++	return 0;
++}
++
++static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)
++{
++}
++#endif
++
+ static int ssb_gpio_extif_init(struct ssb_bus *bus)
+ {
+ 	struct gpio_chip *chip = &bus->gpio;
++	int err;
+ 
+ 	chip->label		= "ssb_extif_gpio";
+ 	chip->owner		= THIS_MODULE;
+@@ -165,7 +423,9 @@ static int ssb_gpio_extif_init(struct ss
+ 	chip->set		= ssb_gpio_extif_set_value;
+ 	chip->direction_input	= ssb_gpio_extif_direction_input;
+ 	chip->direction_output	= ssb_gpio_extif_direction_output;
+-	chip->to_irq		= ssb_gpio_extif_to_irq;
++#if IS_ENABLED(CONFIG_SSB_EMBEDDED)
++	chip->to_irq		= ssb_gpio_to_irq;
++#endif
+ 	chip->ngpio		= 5;
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+@@ -175,7 +435,17 @@ static int ssb_gpio_extif_init(struct ss
+ 	else
+ 		chip->base		= -1;
+ 
+-	return gpiochip_add(chip);
++	err = ssb_gpio_irq_extif_domain_init(bus);
++	if (err)
++		return err;
++
++	err = gpiochip_add(chip);
++	if (err) {
++		ssb_gpio_irq_extif_domain_exit(bus);
++		return err;
++	}
++
++	return 0;
+ }
+ 
+ #else
+@@ -185,6 +455,10 @@ static int ssb_gpio_extif_init(struct ss
+ }
+ #endif
+ 
++/**************************************************
++ * Init
++ **************************************************/
++
+ int ssb_gpio_init(struct ssb_bus *bus)
+ {
+ 	if (ssb_chipco_available(&bus->chipco))
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -593,6 +593,13 @@ static int ssb_attach_queued_buses(void)
+ 		ssb_pcicore_init(&bus->pcicore);
+ 		if (bus->bustype == SSB_BUSTYPE_SSB)
+ 			ssb_watchdog_register(bus);
++
++		err = ssb_gpio_init(bus);
++		if (err == -ENOTSUPP)
++			ssb_dbg("GPIO driver not activated\n");
++		else if (err)
++			ssb_dbg("Error registering GPIO driver: %i\n", err);
++
+ 		ssb_bus_may_powerdown(bus);
+ 
+ 		err = ssb_devices_register(bus);
+@@ -830,11 +837,6 @@ static int ssb_bus_register(struct ssb_b
+ 	ssb_chipcommon_init(&bus->chipco);
+ 	ssb_extif_init(&bus->extif);
+ 	ssb_mipscore_init(&bus->mipscore);
+-	err = ssb_gpio_init(bus);
+-	if (err == -ENOTSUPP)
+-		ssb_dbg("GPIO driver not activated\n");
+-	else if (err)
+-		ssb_dbg("Error registering GPIO driver: %i\n", err);
+ 	err = ssb_fetch_invariants(bus, get_invariants);
+ 	if (err) {
+ 		ssb_bus_may_powerdown(bus);
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -326,13 +326,13 @@ err_ctlreg:
+ 	return err;
+ }
+ 
+-static s8 r123_extract_antgain(u8 sprom_revision, const u16 *in,
+-			       u16 mask, u16 shift)
++static s8 sprom_extract_antgain(u8 sprom_revision, const u16 *in, u16 offset,
++				u16 mask, u16 shift)
+ {
+ 	u16 v;
+ 	u8 gain;
+ 
+-	v = in[SPOFF(SSB_SPROM1_AGAIN)];
++	v = in[SPOFF(offset)];
+ 	gain = (v & mask) >> shift;
+ 	if (gain == 0xFF)
+ 		gain = 2; /* If unset use 2dBm */
+@@ -416,12 +416,14 @@ static void sprom_extract_r123(struct ss
+ 	SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
+-						    SSB_SPROM1_AGAIN_BG,
+-						    SSB_SPROM1_AGAIN_BG_SHIFT);
+-	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
+-						    SSB_SPROM1_AGAIN_A,
+-						    SSB_SPROM1_AGAIN_A_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM1_AGAIN,
++						     SSB_SPROM1_AGAIN_BG,
++						     SSB_SPROM1_AGAIN_BG_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM1_AGAIN,
++						     SSB_SPROM1_AGAIN_A,
++						     SSB_SPROM1_AGAIN_A_SHIFT);
+ 	if (out->revision >= 2)
+ 		sprom_extract_r23(out, in);
+ }
+@@ -468,7 +470,15 @@ static void sprom_extract_r458(struct ss
+ 
+ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
+ {
++	static const u16 pwr_info_offset[] = {
++		SSB_SPROM4_PWR_INFO_CORE0, SSB_SPROM4_PWR_INFO_CORE1,
++		SSB_SPROM4_PWR_INFO_CORE2, SSB_SPROM4_PWR_INFO_CORE3
++	};
+ 	u16 il0mac_offset;
++	int i;
++
++	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
++		     ARRAY_SIZE(out->core_pwr_info));
+ 
+ 	if (out->revision == 4)
+ 		il0mac_offset = SSB_SPROM4_IL0MAC;
+@@ -524,14 +534,59 @@ static void sprom_extract_r45(struct ssb
+ 	}
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
+-	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
+-	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
+-	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
+-	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN01,
++						     SSB_SPROM4_AGAIN0,
++						     SSB_SPROM4_AGAIN0_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN01,
++						     SSB_SPROM4_AGAIN1,
++						     SSB_SPROM4_AGAIN1_SHIFT);
++	out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN23,
++						     SSB_SPROM4_AGAIN2,
++						     SSB_SPROM4_AGAIN2_SHIFT);
++	out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN23,
++						     SSB_SPROM4_AGAIN3,
++						     SSB_SPROM4_AGAIN3_SHIFT);
++
++	/* Extract cores power info info */
++	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
++		u16 o = pwr_info_offset[i];
++
++		SPEX(core_pwr_info[i].itssi_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
++			SSB_SPROM4_2G_ITSSI, SSB_SPROM4_2G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
++			SSB_SPROM4_2G_MAXP, 0);
++
++		SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SPROM4_2G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SPROM4_2G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SPROM4_2G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[3], o + SSB_SPROM4_2G_PA_3, ~0, 0);
++
++		SPEX(core_pwr_info[i].itssi_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
++			SSB_SPROM4_5G_ITSSI, SSB_SPROM4_5G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
++			SSB_SPROM4_5G_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM4_5GHL_MAXP,
++			SSB_SPROM4_5GH_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM4_5GHL_MAXP,
++			SSB_SPROM4_5GL_MAXP, SSB_SPROM4_5GL_MAXP_SHIFT);
++
++		SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SPROM4_5GL_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SPROM4_5GL_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SPROM4_5GL_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[3], o + SSB_SPROM4_5GL_PA_3, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SPROM4_5G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SPROM4_5G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SPROM4_5G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[3], o + SSB_SPROM4_5G_PA_3, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SPROM4_5GH_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SPROM4_5GH_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SPROM4_5GH_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[3], o + SSB_SPROM4_5GH_PA_3, ~0, 0);
++	}
+ 
+ 	sprom_extract_r458(out, in);
+ 
+@@ -621,14 +676,22 @@ static void sprom_extract_r8(struct ssb_
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN01,
++						     SSB_SPROM8_AGAIN0,
++						     SSB_SPROM8_AGAIN0_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN01,
++						     SSB_SPROM8_AGAIN1,
++						     SSB_SPROM8_AGAIN1_SHIFT);
++	out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN23,
++						     SSB_SPROM8_AGAIN2,
++						     SSB_SPROM8_AGAIN2_SHIFT);
++	out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN23,
++						     SSB_SPROM8_AGAIN3,
++						     SSB_SPROM8_AGAIN3_SHIFT);
+ 
+ 	/* Extract cores power info info */
+ 	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -33,6 +33,7 @@ struct ssb_sprom {
+ 	u8 et1phyaddr;		/* MII address for enet1 */
+ 	u8 et0mdcport;		/* MDIO for enet0 */
+ 	u8 et1mdcport;		/* MDIO for enet1 */
++	u16 dev_id;		/* Device ID overriding e.g. PCI ID */
+ 	u16 board_rev;		/* Board revision number from SPROM. */
+ 	u16 board_num;		/* Board number from SPROM. */
+ 	u16 board_type;		/* Board type from SPROM. */
+@@ -486,6 +487,7 @@ struct ssb_bus {
+ #endif /* EMBEDDED */
+ #ifdef CONFIG_SSB_DRIVER_GPIO
+ 	struct gpio_chip gpio;
++	struct irq_domain *irq_domain;
+ #endif /* DRIVER_GPIO */
+ 
+ 	/* Internal-only stuff follows. Do not touch. */
+--- a/include/linux/ssb/ssb_regs.h
++++ b/include/linux/ssb/ssb_regs.h
+@@ -345,6 +345,43 @@
+ #define  SSB_SPROM4_TXPID5GH2_SHIFT	0
+ #define  SSB_SPROM4_TXPID5GH3		0xFF00
+ #define  SSB_SPROM4_TXPID5GH3_SHIFT	8
++
++/* There are 4 blocks with power info sharing the same layout */
++#define SSB_SPROM4_PWR_INFO_CORE0	0x0080
++#define SSB_SPROM4_PWR_INFO_CORE1	0x00AE
++#define SSB_SPROM4_PWR_INFO_CORE2	0x00DC
++#define SSB_SPROM4_PWR_INFO_CORE3	0x010A
++
++#define SSB_SPROM4_2G_MAXP_ITSSI	0x00	/* 2 GHz ITSSI and 2 GHz Max Power */
++#define  SSB_SPROM4_2G_MAXP		0x00FF
++#define  SSB_SPROM4_2G_ITSSI		0xFF00
++#define  SSB_SPROM4_2G_ITSSI_SHIFT	8
++#define SSB_SPROM4_2G_PA_0		0x02	/* 2 GHz power amp */
++#define SSB_SPROM4_2G_PA_1		0x04
++#define SSB_SPROM4_2G_PA_2		0x06
++#define SSB_SPROM4_2G_PA_3		0x08
++#define SSB_SPROM4_5G_MAXP_ITSSI	0x0A	/* 5 GHz ITSSI and 5.3 GHz Max Power */
++#define  SSB_SPROM4_5G_MAXP		0x00FF
++#define  SSB_SPROM4_5G_ITSSI		0xFF00
++#define  SSB_SPROM4_5G_ITSSI_SHIFT	8
++#define SSB_SPROM4_5GHL_MAXP		0x0C	/* 5.2 GHz and 5.8 GHz Max Power */
++#define  SSB_SPROM4_5GH_MAXP		0x00FF
++#define  SSB_SPROM4_5GL_MAXP		0xFF00
++#define  SSB_SPROM4_5GL_MAXP_SHIFT	8
++#define SSB_SPROM4_5G_PA_0		0x0E	/* 5.3 GHz power amp */
++#define SSB_SPROM4_5G_PA_1		0x10
++#define SSB_SPROM4_5G_PA_2		0x12
++#define SSB_SPROM4_5G_PA_3		0x14
++#define SSB_SPROM4_5GL_PA_0		0x16	/* 5.2 GHz power amp */
++#define SSB_SPROM4_5GL_PA_1		0x18
++#define SSB_SPROM4_5GL_PA_2		0x1A
++#define SSB_SPROM4_5GL_PA_3		0x1C
++#define SSB_SPROM4_5GH_PA_0		0x1E	/* 5.8 GHz power amp */
++#define SSB_SPROM4_5GH_PA_1		0x20
++#define SSB_SPROM4_5GH_PA_2		0x22
++#define SSB_SPROM4_5GH_PA_3		0x24
++
++/* TODO: Make it deprecated */
+ #define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
+ #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
+ #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
+--- a/arch/mips/bcm47xx/sprom.c
++++ b/arch/mips/bcm47xx/sprom.c
+@@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char
+ static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
+ 					const char *prefix, bool fallback)
+ {
++	nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);
diff --git a/trunk/target/linux/generic/patches-3.13/025-bcma_backport.patch b/trunk/target/linux/generic/patches-3.13/025-bcma_backport.patch
new file mode 100644
index 00000000..49f33ad6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/025-bcma_backport.patch
@@ -0,0 +1,870 @@
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -75,6 +75,7 @@ config BCMA_DRIVER_GMAC_CMN
+ config BCMA_DRIVER_GPIO
+ 	bool "BCMA GPIO driver"
+ 	depends on BCMA && GPIOLIB
++	select IRQ_DOMAIN if BCMA_HOST_SOC
+ 	help
+ 	  Driver to provide access to the GPIO pins of the bcma bus.
+ 
+--- a/drivers/bcma/Makefile
++++ b/drivers/bcma/Makefile
+@@ -3,6 +3,7 @@ bcma-y					+= driver_chipcommon.o driver
+ bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o
+ bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o
+ bcma-y					+= driver_pci.o
++bcma-y					+= driver_pcie2.o
+ bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)	+= driver_pci_host.o
+ bcma-$(CONFIG_BCMA_DRIVER_MIPS)		+= driver_mips.o
+ bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)	+= driver_gmac_cmn.o
+--- a/drivers/bcma/bcma_private.h
++++ b/drivers/bcma/bcma_private.h
+@@ -33,8 +33,6 @@ int __init bcma_bus_early_register(struc
+ int bcma_bus_suspend(struct bcma_bus *bus);
+ int bcma_bus_resume(struct bcma_bus *bus);
+ #endif
+-struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+-					u8 unit);
+ 
+ /* scan.c */
+ int bcma_bus_scan(struct bcma_bus *bus);
+--- a/drivers/bcma/driver_chipcommon_pmu.c
++++ b/drivers/bcma/driver_chipcommon_pmu.c
+@@ -603,6 +603,8 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;
+ 		break;
+ 
++	case BCMA_CHIP_ID_BCM43131:
++	case BCMA_CHIP_ID_BCM43217:
+ 	case BCMA_CHIP_ID_BCM43227:
+ 	case BCMA_CHIP_ID_BCM43228:
+ 	case BCMA_CHIP_ID_BCM43428:
+--- a/drivers/bcma/driver_chipcommon_sflash.c
++++ b/drivers/bcma/driver_chipcommon_sflash.c
+@@ -38,7 +38,7 @@ static const struct bcma_sflash_tbl_e bc
+ 	{ "M25P32", 0x15, 0x10000, 64, },
+ 	{ "M25P64", 0x16, 0x10000, 128, },
+ 	{ "M25FL128", 0x17, 0x10000, 256, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
+@@ -56,7 +56,7 @@ static const struct bcma_sflash_tbl_e bc
+ 	{ "SST25VF016", 0x41, 0x1000, 512, },
+ 	{ "SST25VF032", 0x4a, 0x1000, 1024, },
+ 	{ "SST25VF064", 0x4b, 0x1000, 2048, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
+@@ -67,7 +67,7 @@ static const struct bcma_sflash_tbl_e bc
+ 	{ "AT45DB161", 0x2c, 512, 4096, },
+ 	{ "AT45DB321", 0x34, 512, 8192, },
+ 	{ "AT45DB642", 0x3c, 1024, 8192, },
+-	{ 0 },
++	{ NULL },
+ };
+ 
+ static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode)
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -9,6 +9,9 @@
+  */
+ 
+ #include <linux/gpio.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/irqdomain.h>
+ #include <linux/export.h>
+ #include <linux/bcma/bcma.h>
+ 
+@@ -73,19 +76,136 @@ static void bcma_gpio_free(struct gpio_c
+ 	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
+ }
+ 
++#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
+ static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
+ {
+ 	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+ 
+ 	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
+-		return bcma_core_irq(cc->core);
++		return irq_find_mapping(cc->irq_domain, gpio);
+ 	else
+ 		return -EINVAL;
+ }
+ 
++static void bcma_gpio_irq_unmask(struct irq_data *d)
++{
++	struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++	u32 val = bcma_chipco_gpio_in(cc, BIT(gpio));
++
++	bcma_chipco_gpio_polarity(cc, BIT(gpio), val);
++	bcma_chipco_gpio_intmask(cc, BIT(gpio), BIT(gpio));
++}
++
++static void bcma_gpio_irq_mask(struct irq_data *d)
++{
++	struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d);
++	int gpio = irqd_to_hwirq(d);
++
++	bcma_chipco_gpio_intmask(cc, BIT(gpio), 0);
++}
++
++static struct irq_chip bcma_gpio_irq_chip = {
++	.name		= "BCMA-GPIO",
++	.irq_mask	= bcma_gpio_irq_mask,
++	.irq_unmask	= bcma_gpio_irq_unmask,
++};
++
++static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)
++{
++	struct bcma_drv_cc *cc = dev_id;
++	u32 val = bcma_cc_read32(cc, BCMA_CC_GPIOIN);
++	u32 mask = bcma_cc_read32(cc, BCMA_CC_GPIOIRQ);
++	u32 pol = bcma_cc_read32(cc, BCMA_CC_GPIOPOL);
++	unsigned long irqs = (val ^ pol) & mask;
++	int gpio;
++
++	if (!irqs)
++		return IRQ_NONE;
++
++	for_each_set_bit(gpio, &irqs, cc->gpio.ngpio)
++		generic_handle_irq(bcma_gpio_to_irq(&cc->gpio, gpio));
++	bcma_chipco_gpio_polarity(cc, irqs, val & irqs);
++
++	return IRQ_HANDLED;
++}
++
++static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc)
++{
++	struct gpio_chip *chip = &cc->gpio;
++	int gpio, hwirq, err;
++
++	if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
++		return 0;
++
++	cc->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,
++					       &irq_domain_simple_ops, cc);
++	if (!cc->irq_domain) {
++		err = -ENODEV;
++		goto err_irq_domain;
++	}
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_create_mapping(cc->irq_domain, gpio);
++
++		irq_set_chip_data(irq, cc);
++		irq_set_chip_and_handler(irq, &bcma_gpio_irq_chip,
++					 handle_simple_irq);
++	}
++
++	hwirq = bcma_core_irq(cc->core);
++	err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio",
++			  cc);
++	if (err)
++		goto err_req_irq;
++
++	bcma_chipco_gpio_intmask(cc, ~0, 0);
++	bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO);
++
++	return 0;
++
++err_req_irq:
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(cc->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(cc->irq_domain);
++err_irq_domain:
++	return err;
++}
++
++static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc)
++{
++	struct gpio_chip *chip = &cc->gpio;
++	int gpio;
++
++	if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
++		return;
++
++	bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO);
++	free_irq(bcma_core_irq(cc->core), cc);
++	for (gpio = 0; gpio < chip->ngpio; gpio++) {
++		int irq = irq_find_mapping(cc->irq_domain, gpio);
++
++		irq_dispose_mapping(irq);
++	}
++	irq_domain_remove(cc->irq_domain);
++}
++#else
++static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc)
++{
++	return 0;
++}
++
++static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc)
++{
++}
++#endif
++
+ int bcma_gpio_init(struct bcma_drv_cc *cc)
+ {
+ 	struct gpio_chip *chip = &cc->gpio;
++	int err;
+ 
+ 	chip->label		= "bcma_gpio";
+ 	chip->owner		= THIS_MODULE;
+@@ -95,8 +215,18 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ 	chip->set		= bcma_gpio_set_value;
+ 	chip->direction_input	= bcma_gpio_direction_input;
+ 	chip->direction_output	= bcma_gpio_direction_output;
++#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
+ 	chip->to_irq		= bcma_gpio_to_irq;
+-	chip->ngpio		= 16;
++#endif
++	switch (cc->core->bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM53572:
++		chip->ngpio	= 32;
++		break;
++	default:
++		chip->ngpio	= 16;
++	}
++
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+ 	 * a random base number. */
+@@ -105,10 +235,21 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ 	else
+ 		chip->base		= -1;
+ 
+-	return gpiochip_add(chip);
++	err = bcma_gpio_irq_domain_init(cc);
++	if (err)
++		return err;
++
++	err = gpiochip_add(chip);
++	if (err) {
++		bcma_gpio_irq_domain_exit(cc);
++		return err;
++	}
++
++	return 0;
+ }
+ 
+ int bcma_gpio_unregister(struct bcma_drv_cc *cc)
+ {
++	bcma_gpio_irq_domain_exit(cc);
+ 	return gpiochip_remove(&cc->gpio);
+ }
+--- /dev/null
++++ b/drivers/bcma/driver_pcie2.c
+@@ -0,0 +1,175 @@
++/*
++ * Broadcom specific AMBA
++ * PCIe Gen 2 Core
++ *
++ * Copyright 2014, Broadcom Corporation
++ * Copyright 2014, Rafał Miłecki <zajec5@gmail.com>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++#include <linux/bcma/bcma.h>
++
++/**************************************************
++ * R/W ops.
++ **************************************************/
++
++#if 0
++static u32 bcma_core_pcie2_cfg_read(struct bcma_drv_pcie2 *pcie2, u32 addr)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, addr);
++	pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR);
++	return pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA);
++}
++#endif
++
++static void bcma_core_pcie2_cfg_write(struct bcma_drv_pcie2 *pcie2, u32 addr,
++				      u32 val)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, addr);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, val);
++}
++
++/**************************************************
++ * Init.
++ **************************************************/
++
++static u32 bcma_core_pcie2_war_delay_perst_enab(struct bcma_drv_pcie2 *pcie2,
++						bool enable)
++{
++	u32 val;
++
++	/* restore back to default */
++	val = pcie2_read32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL);
++	val |= PCIE2_CLKC_DLYPERST;
++	val &= ~PCIE2_CLKC_DISSPROMLD;
++	if (enable) {
++		val &= ~PCIE2_CLKC_DLYPERST;
++		val |= PCIE2_CLKC_DISSPROMLD;
++	}
++	pcie2_write32(pcie2, (BCMA_CORE_PCIE2_CLK_CONTROL), val);
++	/* flush */
++	return pcie2_read32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL);
++}
++
++static void bcma_core_pcie2_set_ltr_vals(struct bcma_drv_pcie2 *pcie2)
++{
++	/* LTR0 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x844);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x883c883c);
++	/* LTR1 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x848);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x88648864);
++	/* LTR2 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x84C);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x90039003);
++}
++
++static void bcma_core_pcie2_hw_ltr_war(struct bcma_drv_pcie2 *pcie2)
++{
++	u8 core_rev = pcie2->core->id.rev;
++	u32 devstsctr2;
++
++	if (core_rev < 2 || core_rev == 10 || core_rev > 13)
++		return;
++
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++		      PCIE2_CAP_DEVSTSCTRL2_OFFSET);
++	devstsctr2 = pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA);
++	if (devstsctr2 & PCIE2_CAP_DEVSTSCTRL2_LTRENAB) {
++		/* force the right LTR values */
++		bcma_core_pcie2_set_ltr_vals(pcie2);
++
++		/* TODO:
++		si_core_wrapperreg(pcie2, 3, 0x60, 0x8080, 0); */
++
++		/* enable the LTR */
++		devstsctr2 |= PCIE2_CAP_DEVSTSCTRL2_LTRENAB;
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++			      PCIE2_CAP_DEVSTSCTRL2_OFFSET);
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, devstsctr2);
++
++		/* set the LTR state to be active */
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_LTR_STATE,
++			      PCIE2_LTR_ACTIVE);
++		usleep_range(1000, 2000);
++
++		/* set the LTR state to be sleep */
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_LTR_STATE,
++			      PCIE2_LTR_SLEEP);
++		usleep_range(1000, 2000);
++	}
++}
++
++static void pciedev_crwlpciegen2(struct bcma_drv_pcie2 *pcie2)
++{
++	u8 core_rev = pcie2->core->id.rev;
++	bool pciewar160, pciewar162;
++
++	pciewar160 = core_rev == 7 || core_rev == 9 || core_rev == 11;
++	pciewar162 = core_rev == 5 || core_rev == 7 || core_rev == 8 ||
++		     core_rev == 9 || core_rev == 11;
++
++	if (!pciewar160 && !pciewar162)
++		return;
++
++/* TODO */
++#if 0
++	pcie2_set32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL,
++		    PCIE_DISABLE_L1CLK_GATING);
++#if 0
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++		      PCIEGEN2_COE_PVT_TL_CTRL_0);
++	pcie2_mask32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA,
++		     ~(1 << COE_PVT_TL_CTRL_0_PM_DIS_L1_REENTRY_BIT));
++#endif
++#endif
++}
++
++static void pciedev_crwlpciegen2_180(struct bcma_drv_pcie2 *pcie2)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, PCIE2_PMCR_REFUP);
++	pcie2_set32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x1f);
++}
++
++static void pciedev_crwlpciegen2_182(struct bcma_drv_pcie2 *pcie2)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, PCIE2_SBMBX);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 1 << 0);
++}
++
++static void pciedev_reg_pm_clk_period(struct bcma_drv_pcie2 *pcie2)
++{
++	struct bcma_drv_cc *drv_cc = &pcie2->core->bus->drv_cc;
++	u8 core_rev = pcie2->core->id.rev;
++	u32 alp_khz, pm_value;
++
++	if (core_rev <= 13) {
++		alp_khz = bcma_pmu_get_alp_clock(drv_cc) / 1000;
++		pm_value = (1000000 * 2) / alp_khz;
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++			      PCIE2_PVT_REG_PM_CLK_PERIOD);
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, pm_value);
++	}
++}
++
++void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2)
++{
++	struct bcma_chipinfo *ci = &pcie2->core->bus->chipinfo;
++	u32 tmp;
++
++	tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54));
++	if ((tmp & 0xe) >> 1 == 2)
++		bcma_core_pcie2_cfg_write(pcie2, 0x4e0, 0x17);
++
++	/* TODO: Do we need pcie_reqsize? */
++
++	if (ci->id == BCMA_CHIP_ID_BCM4360 && ci->rev > 3)
++		bcma_core_pcie2_war_delay_perst_enab(pcie2, true);
++	bcma_core_pcie2_hw_ltr_war(pcie2);
++	pciedev_crwlpciegen2(pcie2);
++	pciedev_reg_pm_clk_period(pcie2);
++	pciedev_crwlpciegen2_180(pcie2);
++	pciedev_crwlpciegen2_182(pcie2);
++}
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -238,7 +238,6 @@ static void bcma_host_pci_remove(struct
+ 	pci_release_regions(dev);
+ 	pci_disable_device(dev);
+ 	kfree(bus);
+-	pci_set_drvdata(dev, NULL);
+ }
+ 
+ #ifdef CONFIG_PM_SLEEP
+@@ -270,7 +269,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc
+ 
+ #endif /* CONFIG_PM_SLEEP */
+ 
+-static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
++static const struct pci_device_id bcma_pci_bridge_tbl[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },
+@@ -280,6 +279,8 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
+ 	{ 0, },
+ };
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -78,18 +78,6 @@ static u16 bcma_cc_core_id(struct bcma_b
+ 	return BCMA_CORE_CHIPCOMMON;
+ }
+ 
+-struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
+-{
+-	struct bcma_device *core;
+-
+-	list_for_each_entry(core, &bus->cores, list) {
+-		if (core->id.id == coreid)
+-			return core;
+-	}
+-	return NULL;
+-}
+-EXPORT_SYMBOL_GPL(bcma_find_core);
+-
+ struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+ 					u8 unit)
+ {
+@@ -101,6 +89,7 @@ struct bcma_device *bcma_find_core_unit(
+ 	}
+ 	return NULL;
+ }
++EXPORT_SYMBOL_GPL(bcma_find_core_unit);
+ 
+ bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
+ 		     int timeout)
+@@ -143,6 +132,7 @@ static int bcma_register_cores(struct bc
+ 		case BCMA_CORE_CHIPCOMMON:
+ 		case BCMA_CORE_PCI:
+ 		case BCMA_CORE_PCIE:
++		case BCMA_CORE_PCIE2:
+ 		case BCMA_CORE_MIPS_74K:
+ 		case BCMA_CORE_4706_MAC_GBIT_COMMON:
+ 			continue;
+@@ -176,6 +166,7 @@ static int bcma_register_cores(struct bc
+ 			bcma_err(bus,
+ 				 "Could not register dev for core 0x%03X\n",
+ 				 core->id.id);
++			put_device(&core->dev);
+ 			continue;
+ 		}
+ 		core->dev_registered = true;
+@@ -291,6 +282,13 @@ int bcma_bus_register(struct bcma_bus *b
+ 		bcma_core_pci_init(&bus->drv_pci[1]);
+ 	}
+ 
++	/* Init PCIe Gen 2 core */
++	core = bcma_find_core_unit(bus, BCMA_CORE_PCIE2, 0);
++	if (core) {
++		bus->drv_pcie2.core = core;
++		bcma_core_pcie2_init(&bus->drv_pcie2);
++	}
++
+ 	/* Init GBIT MAC COMMON core */
+ 	core = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
+ 	if (core) {
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -201,6 +201,23 @@ static int bcma_sprom_valid(struct bcma_
+ 		SPEX(_field[7], _offset + 14, _mask, _shift);	\
+ 	} while (0)
+ 
++static s8 sprom_extract_antgain(const u16 *in, u16 offset, u16 mask, u16 shift)
++{
++	u16 v;
++	u8 gain;
++
++	v = in[SPOFF(offset)];
++	gain = (v & mask) >> shift;
++	if (gain == 0xFF) {
++		gain = 8; /* If unset use 2dBm */
++	} else {
++		/* Q5.2 Fractional part is stored in 0xC0 */
++		gain = ((gain & 0xC0) >> 6) | ((gain & 0x3F) << 2);
++	}
++
++	return (s8)gain;
++}
++
+ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
+ {
+ 	u16 v, o;
+@@ -381,14 +398,22 @@ static void bcma_sprom_extract_r8(struct
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, ~0, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
++	bus->sprom.antenna_gain.a0 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN01,
++							   SSB_SPROM8_AGAIN0,
++							   SSB_SPROM8_AGAIN0_SHIFT);
++	bus->sprom.antenna_gain.a1 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN01,
++							   SSB_SPROM8_AGAIN1,
++							   SSB_SPROM8_AGAIN1_SHIFT);
++	bus->sprom.antenna_gain.a2 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN23,
++							   SSB_SPROM8_AGAIN2,
++							   SSB_SPROM8_AGAIN2_SHIFT);
++	bus->sprom.antenna_gain.a3 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN23,
++							   SSB_SPROM8_AGAIN3,
++							   SSB_SPROM8_AGAIN3_SHIFT);
+ 
+ 	SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
+ 	     SSB_SPROM8_LEDDC_ON_SHIFT);
+@@ -509,6 +534,8 @@ static bool bcma_sprom_onchip_available(
+ 		/* for these chips OTP is always available */
+ 		present = true;
+ 		break;
++	case BCMA_CHIP_ID_BCM43131:
++	case BCMA_CHIP_ID_BCM43217:
+ 	case BCMA_CHIP_ID_BCM43227:
+ 	case BCMA_CHIP_ID_BCM43228:
+ 	case BCMA_CHIP_ID_BCM43428:
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -6,6 +6,7 @@
+ 
+ #include <linux/bcma/bcma_driver_chipcommon.h>
+ #include <linux/bcma/bcma_driver_pci.h>
++#include <linux/bcma/bcma_driver_pcie2.h>
+ #include <linux/bcma/bcma_driver_mips.h>
+ #include <linux/bcma/bcma_driver_gmac_cmn.h>
+ #include <linux/ssb/ssb.h> /* SPROM sharing */
+@@ -72,17 +73,17 @@ struct bcma_host_ops {
+ /* Core-ID values. */
+ #define BCMA_CORE_OOB_ROUTER		0x367	/* Out of band */
+ #define BCMA_CORE_4706_CHIPCOMMON	0x500
+-#define BCMA_CORE_PCIEG2		0x501
+-#define BCMA_CORE_DMA			0x502
+-#define BCMA_CORE_SDIO3			0x503
+-#define BCMA_CORE_USB20			0x504
+-#define BCMA_CORE_USB30			0x505
+-#define BCMA_CORE_A9JTAG		0x506
+-#define BCMA_CORE_DDR23			0x507
+-#define BCMA_CORE_ROM			0x508
+-#define BCMA_CORE_NAND			0x509
+-#define BCMA_CORE_QSPI			0x50A
+-#define BCMA_CORE_CHIPCOMMON_B		0x50B
++#define BCMA_CORE_NS_PCIEG2		0x501
++#define BCMA_CORE_NS_DMA		0x502
++#define BCMA_CORE_NS_SDIO3		0x503
++#define BCMA_CORE_NS_USB20		0x504
++#define BCMA_CORE_NS_USB30		0x505
++#define BCMA_CORE_NS_A9JTAG		0x506
++#define BCMA_CORE_NS_DDR23		0x507
++#define BCMA_CORE_NS_ROM		0x508
++#define BCMA_CORE_NS_NAND		0x509
++#define BCMA_CORE_NS_QSPI		0x50A
++#define BCMA_CORE_NS_CHIPCOMMON_B	0x50B
+ #define BCMA_CORE_4706_SOC_RAM		0x50E
+ #define BCMA_CORE_ARMCA9		0x510
+ #define BCMA_CORE_4706_MAC_GBIT		0x52D
+@@ -157,6 +158,9 @@ struct bcma_host_ops {
+ /* Chip IDs of PCIe devices */
+ #define BCMA_CHIP_ID_BCM4313	0x4313
+ #define BCMA_CHIP_ID_BCM43142	43142
++#define BCMA_CHIP_ID_BCM43131	43131
++#define BCMA_CHIP_ID_BCM43217	43217
++#define BCMA_CHIP_ID_BCM43222	43222
+ #define BCMA_CHIP_ID_BCM43224	43224
+ #define  BCMA_PKG_ID_BCM43224_FAB_CSM	0x8
+ #define  BCMA_PKG_ID_BCM43224_FAB_SMIC	0xa
+@@ -333,6 +337,7 @@ struct bcma_bus {
+ 
+ 	struct bcma_drv_cc drv_cc;
+ 	struct bcma_drv_pci drv_pci[2];
++	struct bcma_drv_pcie2 drv_pcie2;
+ 	struct bcma_drv_mips drv_mips;
+ 	struct bcma_drv_gmac_cmn drv_gmac_cmn;
+ 
+@@ -418,7 +423,14 @@ static inline void bcma_maskset16(struct
+ 	bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set);
+ }
+ 
+-extern struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid);
++extern struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
++					       u8 unit);
++static inline struct bcma_device *bcma_find_core(struct bcma_bus *bus,
++						 u16 coreid)
++{
++	return bcma_find_core_unit(bus, coreid, 0);
++}
++
+ extern bool bcma_core_is_enabled(struct bcma_device *core);
+ extern void bcma_core_disable(struct bcma_device *core, u32 flags);
+ extern int bcma_core_enable(struct bcma_device *core, u32 flags);
+--- a/include/linux/bcma/bcma_driver_chipcommon.h
++++ b/include/linux/bcma/bcma_driver_chipcommon.h
+@@ -640,6 +640,7 @@ struct bcma_drv_cc {
+ 	spinlock_t gpio_lock;
+ #ifdef CONFIG_BCMA_DRIVER_GPIO
+ 	struct gpio_chip gpio;
++	struct irq_domain *irq_domain;
+ #endif
+ };
+ 
+--- /dev/null
++++ b/include/linux/bcma/bcma_driver_pcie2.h
+@@ -0,0 +1,158 @@
++#ifndef LINUX_BCMA_DRIVER_PCIE2_H_
++#define LINUX_BCMA_DRIVER_PCIE2_H_
++
++#define BCMA_CORE_PCIE2_CLK_CONTROL		0x0000
++#define  PCIE2_CLKC_RST_OE			0x0001 /* When set, drives PCI_RESET out to pin */
++#define  PCIE2_CLKC_RST				0x0002 /* Value driven out to pin */
++#define  PCIE2_CLKC_SPERST			0x0004 /* SurvivePeRst */
++#define  PCIE2_CLKC_DISABLE_L1CLK_GATING	0x0010
++#define  PCIE2_CLKC_DLYPERST			0x0100 /* Delay PeRst to CoE Core */
++#define  PCIE2_CLKC_DISSPROMLD			0x0200 /* DisableSpromLoadOnPerst */
++#define  PCIE2_CLKC_WAKE_MODE_L2		0x1000 /* Wake on L2 */
++#define BCMA_CORE_PCIE2_RC_PM_CONTROL		0x0004
++#define BCMA_CORE_PCIE2_RC_PM_STATUS		0x0008
++#define BCMA_CORE_PCIE2_EP_PM_CONTROL		0x000C
++#define BCMA_CORE_PCIE2_EP_PM_STATUS		0x0010
++#define BCMA_CORE_PCIE2_EP_LTR_CONTROL		0x0014
++#define BCMA_CORE_PCIE2_EP_LTR_STATUS		0x0018
++#define BCMA_CORE_PCIE2_EP_OBFF_STATUS		0x001C
++#define BCMA_CORE_PCIE2_PCIE_ERR_STATUS		0x0020
++#define BCMA_CORE_PCIE2_RC_AXI_CONFIG		0x0100
++#define BCMA_CORE_PCIE2_EP_AXI_CONFIG		0x0104
++#define BCMA_CORE_PCIE2_RXDEBUG_STATUS0		0x0108
++#define BCMA_CORE_PCIE2_RXDEBUG_CONTROL0	0x010C
++#define BCMA_CORE_PCIE2_CONFIGINDADDR		0x0120
++#define BCMA_CORE_PCIE2_CONFIGINDDATA		0x0124
++#define BCMA_CORE_PCIE2_MDIOCONTROL		0x0128
++#define BCMA_CORE_PCIE2_MDIOWRDATA		0x012C
++#define BCMA_CORE_PCIE2_MDIORDDATA		0x0130
++#define BCMA_CORE_PCIE2_DATAINTF		0x0180
++#define BCMA_CORE_PCIE2_D2H_INTRLAZY_0		0x0188
++#define BCMA_CORE_PCIE2_H2D_INTRLAZY_0		0x018c
++#define BCMA_CORE_PCIE2_H2D_INTSTAT_0		0x0190
++#define BCMA_CORE_PCIE2_H2D_INTMASK_0		0x0194
++#define BCMA_CORE_PCIE2_D2H_INTSTAT_0		0x0198
++#define BCMA_CORE_PCIE2_D2H_INTMASK_0		0x019c
++#define BCMA_CORE_PCIE2_LTR_STATE		0x01A0 /* Latency Tolerance Reporting */
++#define  PCIE2_LTR_ACTIVE			2
++#define  PCIE2_LTR_ACTIVE_IDLE			1
++#define  PCIE2_LTR_SLEEP			0
++#define  PCIE2_LTR_FINAL_MASK			0x300
++#define  PCIE2_LTR_FINAL_SHIFT			8
++#define BCMA_CORE_PCIE2_PWR_INT_STATUS		0x01A4
++#define BCMA_CORE_PCIE2_PWR_INT_MASK		0x01A8
++#define BCMA_CORE_PCIE2_CFG_ADDR		0x01F8
++#define BCMA_CORE_PCIE2_CFG_DATA		0x01FC
++#define BCMA_CORE_PCIE2_SYS_EQ_PAGE		0x0200
++#define BCMA_CORE_PCIE2_SYS_MSI_PAGE		0x0204
++#define BCMA_CORE_PCIE2_SYS_MSI_INTREN		0x0208
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL0		0x0210
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL1		0x0214
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL2		0x0218
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL3		0x021C
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL4		0x0220
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL5		0x0224
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD0		0x0250
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL0		0x0254
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD1		0x0258
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL1		0x025C
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD2		0x0260
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL2		0x0264
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD3		0x0268
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL3		0x026C
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD4		0x0270
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL4		0x0274
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD5		0x0278
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL5		0x027C
++#define BCMA_CORE_PCIE2_SYS_RC_INTX_EN		0x0330
++#define BCMA_CORE_PCIE2_SYS_RC_INTX_CSR		0x0334
++#define BCMA_CORE_PCIE2_SYS_MSI_REQ		0x0340
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR_EN	0x0344
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR_CSR	0x0348
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR0		0x0350
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR1		0x0354
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR2		0x0358
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR3		0x035C
++#define BCMA_CORE_PCIE2_SYS_EP_INT_EN0		0x0360
++#define BCMA_CORE_PCIE2_SYS_EP_INT_EN1		0x0364
++#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR0		0x0370
++#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR1		0x0374
++#define BCMA_CORE_PCIE2_SPROM(wordoffset)	(0x0800 + ((wordoffset) * 2))
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_0		0x0C00
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_1		0x0C04
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_2		0x0C08
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_3		0x0C0C
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_4		0x0C10
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_5		0x0C14
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_6		0x0C18
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_7		0x0C1C
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_0		0x0C20
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_1		0x0C24
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_2		0x0C28
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_3		0x0C2C
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_4		0x0C30
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_5		0x0C34
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_6		0x0C38
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_7		0x0C3C
++#define BCMA_CORE_PCIE2_FUNC0_IMAP1		0x0C80
++#define BCMA_CORE_PCIE2_FUNC1_IMAP1		0x0C88
++#define BCMA_CORE_PCIE2_FUNC0_IMAP2		0x0CC0
++#define BCMA_CORE_PCIE2_FUNC1_IMAP2		0x0CC8
++#define BCMA_CORE_PCIE2_IARR0_LOWER		0x0D00
++#define BCMA_CORE_PCIE2_IARR0_UPPER		0x0D04
++#define BCMA_CORE_PCIE2_IARR1_LOWER		0x0D08
++#define BCMA_CORE_PCIE2_IARR1_UPPER		0x0D0C
++#define BCMA_CORE_PCIE2_IARR2_LOWER		0x0D10
++#define BCMA_CORE_PCIE2_IARR2_UPPER		0x0D14
++#define BCMA_CORE_PCIE2_OARR0			0x0D20
++#define BCMA_CORE_PCIE2_OARR1			0x0D28
++#define BCMA_CORE_PCIE2_OARR2			0x0D30
++#define BCMA_CORE_PCIE2_OMAP0_LOWER		0x0D40
++#define BCMA_CORE_PCIE2_OMAP0_UPPER		0x0D44
++#define BCMA_CORE_PCIE2_OMAP1_LOWER		0x0D48
++#define BCMA_CORE_PCIE2_OMAP1_UPPER		0x0D4C
++#define BCMA_CORE_PCIE2_OMAP2_LOWER		0x0D50
++#define BCMA_CORE_PCIE2_OMAP2_UPPER		0x0D54
++#define BCMA_CORE_PCIE2_FUNC1_IARR1_SIZE	0x0D58
++#define BCMA_CORE_PCIE2_FUNC1_IARR2_SIZE	0x0D5C
++#define BCMA_CORE_PCIE2_MEM_CONTROL		0x0F00
++#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG0		0x0F04
++#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG1		0x0F08
++#define BCMA_CORE_PCIE2_LINK_STATUS		0x0F0C
++#define BCMA_CORE_PCIE2_STRAP_STATUS		0x0F10
++#define BCMA_CORE_PCIE2_RESET_STATUS		0x0F14
++#define BCMA_CORE_PCIE2_RESETEN_IN_LINKDOWN	0x0F18
++#define BCMA_CORE_PCIE2_MISC_INTR_EN		0x0F1C
++#define BCMA_CORE_PCIE2_TX_DEBUG_CFG		0x0F20
++#define BCMA_CORE_PCIE2_MISC_CONFIG		0x0F24
++#define BCMA_CORE_PCIE2_MISC_STATUS		0x0F28
++#define BCMA_CORE_PCIE2_INTR_EN			0x0F30
++#define BCMA_CORE_PCIE2_INTR_CLEAR		0x0F34
++#define BCMA_CORE_PCIE2_INTR_STATUS		0x0F38
++
++/* PCIE gen2 config regs */
++#define PCIE2_INTSTATUS				0x090
++#define PCIE2_INTMASK				0x094
++#define PCIE2_SBMBX				0x098
++
++#define PCIE2_PMCR_REFUP			0x1814 /* Trefup time */
++
++#define PCIE2_CAP_DEVSTSCTRL2_OFFSET		0xD4
++#define PCIE2_CAP_DEVSTSCTRL2_LTRENAB		0x400
++#define PCIE2_PVT_REG_PM_CLK_PERIOD		0x184c
++
++struct bcma_drv_pcie2 {
++	struct bcma_device *core;
++};
++
++#define pcie2_read16(pcie2, offset)		bcma_read16((pcie2)->core, offset)
++#define pcie2_read32(pcie2, offset)		bcma_read32((pcie2)->core, offset)
++#define pcie2_write16(pcie2, offset, val)	bcma_write16((pcie2)->core, offset, val)
++#define pcie2_write32(pcie2, offset, val)	bcma_write32((pcie2)->core, offset, val)
++
++#define pcie2_set32(pcie2, offset, set)		bcma_set32((pcie2)->core, offset, set)
++#define pcie2_mask32(pcie2, offset, mask)	bcma_mask32((pcie2)->core, offset, mask)
++
++void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2);
++
++#endif /* LINUX_BCMA_DRIVER_PCIE2_H_ */
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -32,17 +32,17 @@ static const struct bcma_device_id_name
+ 	{ BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
+ 	{ BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
+ 	{ BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
+-	{ BCMA_CORE_PCIEG2, "PCIe Gen 2" },
+-	{ BCMA_CORE_DMA, "DMA" },
+-	{ BCMA_CORE_SDIO3, "SDIO3" },
+-	{ BCMA_CORE_USB20, "USB 2.0" },
+-	{ BCMA_CORE_USB30, "USB 3.0" },
+-	{ BCMA_CORE_A9JTAG, "ARM Cortex A9 JTAG" },
+-	{ BCMA_CORE_DDR23, "Denali DDR2/DDR3 memory controller" },
+-	{ BCMA_CORE_ROM, "ROM" },
+-	{ BCMA_CORE_NAND, "NAND flash controller" },
+-	{ BCMA_CORE_QSPI, "SPI flash controller" },
+-	{ BCMA_CORE_CHIPCOMMON_B, "Chipcommon B" },
++	{ BCMA_CORE_NS_PCIEG2, "PCIe Gen 2" },
++	{ BCMA_CORE_NS_DMA, "DMA" },
++	{ BCMA_CORE_NS_SDIO3, "SDIO3" },
++	{ BCMA_CORE_NS_USB20, "USB 2.0" },
++	{ BCMA_CORE_NS_USB30, "USB 3.0" },
++	{ BCMA_CORE_NS_A9JTAG, "ARM Cortex A9 JTAG" },
++	{ BCMA_CORE_NS_DDR23, "Denali DDR2/DDR3 memory controller" },
++	{ BCMA_CORE_NS_ROM, "ROM" },
++	{ BCMA_CORE_NS_NAND, "NAND flash controller" },
++	{ BCMA_CORE_NS_QSPI, "SPI flash controller" },
++	{ BCMA_CORE_NS_CHIPCOMMON_B, "Chipcommon B" },
+ 	{ BCMA_CORE_ARMCA9, "ARM Cortex A9 core (ihost)" },
+ 	{ BCMA_CORE_AMEMC, "AMEMC (DDR)" },
+ 	{ BCMA_CORE_ALTA, "ALTA (I2S)" },
diff --git a/trunk/target/linux/generic/patches-3.13/060-hso_devices.patch b/trunk/target/linux/generic/patches-3.13/060-hso_devices.patch
new file mode 100644
index 00000000..367eafb5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/060-hso_devices.patch
@@ -0,0 +1,36 @@
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -467,8 +467,10 @@ static const struct usb_device_id hso_id
+ 	{USB_DEVICE(0x0af0, 0x8400)},
+ 	{USB_DEVICE(0x0af0, 0x8600)},
+ 	{USB_DEVICE(0x0af0, 0x8800)},
+-	{USB_DEVICE(0x0af0, 0x8900)},
+-	{USB_DEVICE(0x0af0, 0x9000)},
++	{USB_DEVICE(0x0af0, 0x8900)},  /* GTM 67xx */
++	{USB_DEVICE(0x0af0, 0x9000)},  /* GTM 66xx */
++	{USB_DEVICE(0x0af0, 0x9200)},  /* GTM 67xxWFS */
++	{USB_DEVICE(0x0af0, 0x9300)},  /* GTM 66xxWFS */
+ 	{USB_DEVICE(0x0af0, 0xd035)},
+ 	{USB_DEVICE(0x0af0, 0xd055)},
+ 	{USB_DEVICE(0x0af0, 0xd155)},
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1266,6 +1266,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		0 ),
+ 
++UNUSUAL_DEV( 0x0af0, 0x9200, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 67xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
++UNUSUAL_DEV( 0x0af0, 0x9300, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 66xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
+ UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000,
+ 		"Option",
+ 		"GI 070x SD-Card",
diff --git a/trunk/target/linux/generic/patches-3.13/061-arm_xz_decompressor_build_fix.patch b/trunk/target/linux/generic/patches-3.13/061-arm_xz_decompressor_build_fix.patch
new file mode 100644
index 00000000..e69ca259
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/061-arm_xz_decompressor_build_fix.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -48,6 +48,7 @@ extern char * strstr(const char * s1, co
+ #ifdef CONFIG_KERNEL_XZ
+ #define memmove memmove
+ #define memcpy memcpy
++extern char * strstr(const char *, const char *);
+ #include "../../../../lib/decompress_unxz.c"
+ #endif
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/062-mips_decompressor_build_fix.patch b/trunk/target/linux/generic/patches-3.13/062-mips_decompressor_build_fix.patch
new file mode 100644
index 00000000..52c45c38
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/062-mips_decompressor_build_fix.patch
@@ -0,0 +1,66 @@
+From 0db3db45f5bd6df4bdc03bbd5dec672e16164c4e Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 12 Nov 2012 12:31:55 +0100
+Subject: [PATCH] MIPS: decompressor: fix build failure on memcpy() in
+ decompress.c
+
+The decompress.c file includes linux/kernel.h which causes the following
+inclusion chain to be pulled:
+linux/kernel.h ->
+	linux/dynamic_debug.h ->
+		linux/string.h ->
+			asm/string.h
+
+We end up having a the GCC builtin + architecture specific memcpy() expanding
+into this:
+
+void *({ size_t __len = (size_t n); void *__ret; if
+(__builtin_constant_p(size_t n) && __len >= 64) __ret = memcpy((void *dest),
+(const void *src), __len); else __ret = __builtin_memcpy((void *dest), (const
+void *src), __len); __ret; })
+{
+ [memcpy implementation in decompress.c starts here]
+ int i;
+ const char *s = src;
+ char *d = dest;
+
+ for (i = 0; i < n; i++)
+  d[i] = s[i];
+ return dest;
+}
+
+raising the following compilation error:
+arch/mips/boot/compressed/decompress.c:46:8: error: expected identifier or '('
+before '{' token
+
+There are at least three possibilities to fix this issue:
+
+1) define _LINUX_STRING_H_ at the beginning of decompress.c to prevent
+   further linux/string.h definitions and declarations from being used, and add
+   an explicit strstr() declaration for linux/dynamic_debug.h
+
+2) remove the inclusion of linux/kernel.h because we actually use no definition
+   or declaration from this header file
+
+3) undefine memcpy or re-define memcpy to memcpy thus resulting in picking up
+   the local memcpy() implementation to this compilation unit
+
+This patch uses the second option which is the less intrusive one.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ arch/mips/boot/compressed/decompress.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/mips/boot/compressed/decompress.c
++++ b/arch/mips/boot/compressed/decompress.c
+@@ -10,9 +10,7 @@
+  * Free Software Foundation;  either version 2 of the  License, or (at your
+  * option) any later version.
+  */
+-
+ #include <linux/types.h>
+-#include <linux/kernel.h>
+ 
+ #include <asm/addrspace.h>
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/065-iio_ad799x_backport_fixes.patch b/trunk/target/linux/generic/patches-3.13/065-iio_ad799x_backport_fixes.patch
new file mode 100644
index 00000000..509eae37
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/065-iio_ad799x_backport_fixes.patch
@@ -0,0 +1,138 @@
+Backport essential fixes from 3.15
+
+From Linux 3.10 on this driver required platform data to load, which makes it
+unusable in libreCMC. This commit backports the following fixes:
+  * Move to regulator framework for scaling
+  * Set endianness of the ADC to Big endian
+  * Fix device-removal path
+This commit should not be moved to newer kernel versions!
+
+Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
+---
+--- a/drivers/staging/iio/adc/ad799x_core.c
++++ b/drivers/staging/iio/adc/ad799x_core.c
+@@ -179,7 +179,10 @@ static int ad799x_read_raw(struct iio_de
+ 			RES_MASK(chan->scan_type.realbits);
+ 		return IIO_VAL_INT;
+ 	case IIO_CHAN_INFO_SCALE:
+-		*val = st->int_vref_mv;
++		ret = regulator_get_voltage(st->vref);
++		if (ret < 0)
++			return ret;
++		*val =  ret / 1000;
+ 		*val2 = chan->scan_type.realbits;
+ 		return IIO_VAL_FRACTIONAL_LOG2;
+ 	}
+@@ -409,7 +412,13 @@ static const struct iio_event_spec ad799
+ 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+ 	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+ 	.scan_index = (_index), \
+-	.scan_type = IIO_ST('u', _realbits, 16, 12 - (_realbits)), \
++	.scan_type = { \
++		.sign = 'u', \
++		.realbits = (_realbits), \
++		.storagebits = 16, \
++		.shift = 12 - (_realbits), \
++		.endianness = IIO_BE, \
++		}, \
+ 	.event_spec = _ev_spec, \
+ 	.num_event_specs = _num_ev_spec, \
+ }
+@@ -527,7 +536,6 @@ static int ad799x_probe(struct i2c_clien
+ 				   const struct i2c_device_id *id)
+ {
+ 	int ret;
+-	struct ad799x_platform_data *pdata = client->dev.platform_data;
+ 	struct ad799x_state *st;
+ 	struct iio_dev *indio_dev;
+ 
+@@ -545,17 +553,21 @@ static int ad799x_probe(struct i2c_clien
+ 
+ 	/* TODO: Add pdata options for filtering and bit delay */
+ 
+-	if (!pdata)
+-		return -EINVAL;
+-
+-	st->int_vref_mv = pdata->vref_mv;
+-
+ 	st->reg = devm_regulator_get(&client->dev, "vcc");
+-	if (!IS_ERR(st->reg)) {
+-		ret = regulator_enable(st->reg);
+-		if (ret)
+-			return ret;
++	if (IS_ERR(st->reg))
++		return PTR_ERR(st->reg);
++	ret = regulator_enable(st->reg);
++	if (ret)
++		return ret;
++	st->vref = devm_regulator_get(&client->dev, "vref");
++	if (IS_ERR(st->vref)) {
++		ret = PTR_ERR(st->vref);
++		goto error_disable_reg;
+ 	}
++	ret = regulator_enable(st->vref);
++	if (ret)
++		goto error_disable_reg;
++
+ 	st->client = client;
+ 
+ 	indio_dev->dev.parent = &client->dev;
+@@ -568,7 +580,7 @@ static int ad799x_probe(struct i2c_clien
+ 
+ 	ret = ad799x_register_ring_funcs_and_init(indio_dev);
+ 	if (ret)
+-		goto error_disable_reg;
++		goto error_disable_vref;
+ 
+ 	if (client->irq > 0) {
+ 		ret = request_threaded_irq(client->irq,
+@@ -592,9 +604,10 @@ error_free_irq:
+ 		free_irq(client->irq, indio_dev);
+ error_cleanup_ring:
+ 	ad799x_ring_cleanup(indio_dev);
++error_disable_vref:
++	regulator_disable(st->vref);
+ error_disable_reg:
+-	if (!IS_ERR(st->reg))
+-		regulator_disable(st->reg);
++	regulator_disable(st->reg);
+ 
+ 	return ret;
+ }
+@@ -609,8 +622,8 @@ static int ad799x_remove(struct i2c_clie
+ 		free_irq(client->irq, indio_dev);
+ 
+ 	ad799x_ring_cleanup(indio_dev);
+-	if (!IS_ERR(st->reg))
+-		regulator_disable(st->reg);
++	regulator_disable(st->vref);
++	regulator_disable(st->reg);
+ 	kfree(st->rx_buf);
+ 
+ 	return 0;
+--- a/drivers/staging/iio/adc/ad799x.h
++++ b/drivers/staging/iio/adc/ad799x.h
+@@ -95,7 +95,7 @@ struct ad799x_state {
+ 	struct i2c_client		*client;
+ 	const struct ad799x_chip_info	*chip_info;
+ 	struct regulator		*reg;
+-	u16				int_vref_mv;
++	struct regulator		*vref;
+ 	unsigned			id;
+ 	u16				config;
+ 
+@@ -103,14 +103,6 @@ struct ad799x_state {
+ 	unsigned int			transfer_size;
+ };
+ 
+-/*
+- * TODO: struct ad799x_platform_data needs to go into include/linux/iio
+- */
+-
+-struct ad799x_platform_data {
+-	u16				vref_mv;
+-};
+-
+ #ifdef CONFIG_AD799X_RING_BUFFER
+ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev);
+ void ad799x_ring_cleanup(struct iio_dev *indio_dev);
diff --git a/trunk/target/linux/generic/patches-3.13/100-overlayfs.patch b/trunk/target/linux/generic/patches-3.13/100-overlayfs.patch
new file mode 100644
index 00000000..368502e1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/100-overlayfs.patch
@@ -0,0 +1,3231 @@
+--- a/Documentation/filesystems/Locking
++++ b/Documentation/filesystems/Locking
+@@ -65,6 +65,7 @@ prototypes:
+ 				struct file *, unsigned open_flag,
+ 				umode_t create_mode, int *opened);
+ 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ 
+ locking rules:
+ 	all may block
+@@ -93,6 +94,7 @@ fiemap:		no
+ update_time:	no
+ atomic_open:	yes
+ tmpfile:	no
++dentry_open:	no
+ 
+ 	Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
+ victim.
+--- /dev/null
++++ b/Documentation/filesystems/overlayfs.txt
+@@ -0,0 +1,199 @@
++Written by: Neil Brown <neilb@suse.de>
++
++Overlay Filesystem
++==================
++
++This document describes a prototype for a new approach to providing
++overlay-filesystem functionality in Linux (sometimes referred to as
++union-filesystems).  An overlay-filesystem tries to present a
++filesystem which is the result over overlaying one filesystem on top
++of the other.
++
++The result will inevitably fail to look exactly like a normal
++filesystem for various technical reasons.  The expectation is that
++many use cases will be able to ignore these differences.
++
++This approach is 'hybrid' because the objects that appear in the
++filesystem do not all appear to belong to that filesystem.  In many
++cases an object accessed in the union will be indistinguishable
++from accessing the corresponding object from the original filesystem.
++This is most obvious from the 'st_dev' field returned by stat(2).
++
++While directories will report an st_dev from the overlay-filesystem,
++all non-directory objects will report an st_dev from the lower or
++upper filesystem that is providing the object.  Similarly st_ino will
++only be unique when combined with st_dev, and both of these can change
++over the lifetime of a non-directory object.  Many applications and
++tools ignore these values and will not be affected.
++
++Upper and Lower
++---------------
++
++An overlay filesystem combines two filesystems - an 'upper' filesystem
++and a 'lower' filesystem.  When a name exists in both filesystems, the
++object in the 'upper' filesystem is visible while the object in the
++'lower' filesystem is either hidden or, in the case of directories,
++merged with the 'upper' object.
++
++It would be more correct to refer to an upper and lower 'directory
++tree' rather than 'filesystem' as it is quite possible for both
++directory trees to be in the same filesystem and there is no
++requirement that the root of a filesystem be given for either upper or
++lower.
++
++The lower filesystem can be any filesystem supported by Linux and does
++not need to be writable.  The lower filesystem can even be another
++overlayfs.  The upper filesystem will normally be writable and if it
++is it must support the creation of trusted.* extended attributes, and
++must provide valid d_type in readdir responses, at least for symbolic
++links - so NFS is not suitable.
++
++A read-only overlay of two read-only filesystems may use any
++filesystem type.
++
++Directories
++-----------
++
++Overlaying mainly involves directories.  If a given name appears in both
++upper and lower filesystems and refers to a non-directory in either,
++then the lower object is hidden - the name refers only to the upper
++object.
++
++Where both upper and lower objects are directories, a merged directory
++is formed.
++
++At mount time, the two directories given as mount options are combined
++into a merged directory:
++
++  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper /overlay
++
++Then whenever a lookup is requested in such a merged directory, the
++lookup is performed in each actual directory and the combined result
++is cached in the dentry belonging to the overlay filesystem.  If both
++actual lookups find directories, both are stored and a merged
++directory is created, otherwise only one is stored: the upper if it
++exists, else the lower.
++
++Only the lists of names from directories are merged.  Other content
++such as metadata and extended attributes are reported for the upper
++directory only.  These attributes of the lower directory are hidden.
++
++whiteouts and opaque directories
++--------------------------------
++
++In order to support rm and rmdir without changing the lower
++filesystem, an overlay filesystem needs to record in the upper filesystem
++that files have been removed.  This is done using whiteouts and opaque
++directories (non-directories are always opaque).
++
++The overlay filesystem uses extended attributes with a
++"trusted.overlay."  prefix to record these details.
++
++A whiteout is created as a symbolic link with target
++"(overlay-whiteout)" and with xattr "trusted.overlay.whiteout" set to "y".
++When a whiteout is found in the upper level of a merged directory, any
++matching name in the lower level is ignored, and the whiteout itself
++is also hidden.
++
++A directory is made opaque by setting the xattr "trusted.overlay.opaque"
++to "y".  Where the upper filesystem contains an opaque directory, any
++directory in the lower filesystem with the same name is ignored.
++
++readdir
++-------
++
++When a 'readdir' request is made on a merged directory, the upper and
++lower directories are each read and the name lists merged in the
++obvious way (upper is read first, then lower - entries that already
++exist are not re-added).  This merged name list is cached in the
++'struct file' and so remains as long as the file is kept open.  If the
++directory is opened and read by two processes at the same time, they
++will each have separate caches.  A seekdir to the start of the
++directory (offset 0) followed by a readdir will cause the cache to be
++discarded and rebuilt.
++
++This means that changes to the merged directory do not appear while a
++directory is being read.  This is unlikely to be noticed by many
++programs.
++
++seek offsets are assigned sequentially when the directories are read.
++Thus if
++  - read part of a directory
++  - remember an offset, and close the directory
++  - re-open the directory some time later
++  - seek to the remembered offset
++
++there may be little correlation between the old and new locations in
++the list of filenames, particularly if anything has changed in the
++directory.
++
++Readdir on directories that are not merged is simply handled by the
++underlying directory (upper or lower).
++
++
++Non-directories
++---------------
++
++Objects that are not directories (files, symlinks, device-special
++files etc.) are presented either from the upper or lower filesystem as
++appropriate.  When a file in the lower filesystem is accessed in a way
++the requires write-access, such as opening for write access, changing
++some metadata etc., the file is first copied from the lower filesystem
++to the upper filesystem (copy_up).  Note that creating a hard-link
++also requires copy_up, though of course creation of a symlink does
++not.
++
++The copy_up may turn out to be unnecessary, for example if the file is
++opened for read-write but the data is not modified.
++
++The copy_up process first makes sure that the containing directory
++exists in the upper filesystem - creating it and any parents as
++necessary.  It then creates the object with the same metadata (owner,
++mode, mtime, symlink-target etc.) and then if the object is a file, the
++data is copied from the lower to the upper filesystem.  Finally any
++extended attributes are copied up.
++
++Once the copy_up is complete, the overlay filesystem simply
++provides direct access to the newly created file in the upper
++filesystem - future operations on the file are barely noticed by the
++overlay filesystem (though an operation on the name of the file such as
++rename or unlink will of course be noticed and handled).
++
++
++Non-standard behavior
++---------------------
++
++The copy_up operation essentially creates a new, identical file and
++moves it over to the old name.  The new file may be on a different
++filesystem, so both st_dev and st_ino of the file may change.
++
++Any open files referring to this inode will access the old data and
++metadata.  Similarly any file locks obtained before copy_up will not
++apply to the copied up file.
++
++On a file opened with O_RDONLY fchmod(2), fchown(2), futimesat(2) and
++fsetxattr(2) will fail with EROFS.
++
++If a file with multiple hard links is copied up, then this will
++"break" the link.  Changes will not be propagated to other names
++referring to the same inode.
++
++Symlinks in /proc/PID/ and /proc/PID/fd which point to a non-directory
++object in overlayfs will not contain valid absolute paths, only
++relative paths leading up to the filesystem's root.  This will be
++fixed in the future.
++
++Some operations are not atomic, for example a crash during copy_up or
++rename will leave the filesystem in an inconsistent state.  This will
++be addressed in the future.
++
++Changes to underlying filesystems
++---------------------------------
++
++Offline changes, when the overlay is not mounted, are allowed to either
++the upper or the lower trees.
++
++Changes to the underlying filesystems while part of a mounted overlay
++filesystem are not allowed.  If the underlying filesystem is changed,
++the behavior of the overlay is undefined, though it will not result in
++a crash or deadlock.
+--- a/Documentation/filesystems/vfs.txt
++++ b/Documentation/filesystems/vfs.txt
+@@ -362,6 +362,7 @@ struct inode_operations {
+ 	int (*atomic_open)(struct inode *, struct dentry *, struct file *,
+ 			unsigned open_flag, umode_t create_mode, int *opened);
+ 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ };
+ 
+ Again, all methods are called without any locks being held, unless
+@@ -681,6 +682,12 @@ struct address_space_operations {
+   	but instead uses bmap to find out where the blocks in the file
+   	are and uses those addresses directly.
+ 
++  dentry_open: this is an alternative to f_op->open(), the difference is that
++	this method may open a file not necessarily originating from the same
++	filesystem as the one i_op->open() was called on.  It may be
++	useful for stacking filesystems which want to allow native I/O directly
++	on underlying files.
++
+ 
+   invalidatepage: If a page has PagePrivate set, then invalidatepage
+         will be called when part or all of the page is to be removed
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -6345,6 +6345,13 @@ F:	drivers/scsi/osd/
+ F:	include/scsi/osd_*
+ F:	fs/exofs/
+ 
++OVERLAYFS FILESYSTEM
++M:	Miklos Szeredi <miklos@szeredi.hu>
++L:	linux-fsdevel@vger.kernel.org
++S:	Supported
++F:	fs/overlayfs/*
++F:	Documentation/filesystems/overlayfs.txt
++
+ P54 WIRELESS DRIVER
+ M:	Christian Lamparter <chunkeey@googlemail.com>
+ L:	linux-wireless@vger.kernel.org
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -67,6 +67,7 @@ source "fs/quota/Kconfig"
+ 
+ source "fs/autofs4/Kconfig"
+ source "fs/fuse/Kconfig"
++source "fs/overlayfs/Kconfig"
+ 
+ config GENERIC_ACL
+ 	bool
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -105,6 +105,7 @@ obj-$(CONFIG_QNX6FS_FS)		+= qnx6/
+ obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
+ obj-$(CONFIG_ADFS_FS)		+= adfs/
+ obj-$(CONFIG_FUSE_FS)		+= fuse/
++obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/
+ obj-$(CONFIG_UDF_FS)		+= udf/
+ obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
+ obj-$(CONFIG_OMFS_FS)		+= omfs/
+--- a/fs/ecryptfs/main.c
++++ b/fs/ecryptfs/main.c
+@@ -566,6 +566,13 @@ static struct dentry *ecryptfs_mount(str
+ 	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
+ 	s->s_blocksize = path.dentry->d_sb->s_blocksize;
+ 	s->s_magic = ECRYPTFS_SUPER_MAGIC;
++	s->s_stack_depth = path.dentry->d_sb->s_stack_depth + 1;
++
++	rc = -EINVAL;
++	if (s->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		pr_err("eCryptfs: maximum fs stacking depth exceeded\n");
++		goto out_free;
++	}
+ 
+ 	inode = ecryptfs_get_inode(path.dentry->d_inode, s);
+ 	rc = PTR_ERR(inode);
+--- a/fs/internal.h
++++ b/fs/internal.h
+@@ -42,7 +42,6 @@ extern void __init chrdev_init(void);
+ /*
+  * namei.c
+  */
+-extern int __inode_permission(struct inode *, int);
+ extern int user_path_mountpoint_at(int, const char __user *, unsigned int, struct path *);
+ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ 			   const char *, unsigned int, struct path *);
+@@ -135,12 +134,6 @@ extern ssize_t __kernel_write(struct fil
+ extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
+ 
+ /*
+- * splice.c
+- */
+-extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
+-		loff_t *opos, size_t len, unsigned int flags);
+-
+-/*
+  * pipe.c
+  */
+ extern const struct file_operations pipefifo_fops;
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -402,6 +402,7 @@ int __inode_permission(struct inode *ino
+ 
+ 	return security_inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(__inode_permission);
+ 
+ /**
+  * sb_permission - Check superblock-level permissions
+@@ -3027,9 +3028,12 @@ finish_open_created:
+ 	error = may_open(&nd->path, acc_mode, open_flag);
+ 	if (error)
+ 		goto out;
+-	file->f_path.mnt = nd->path.mnt;
+-	error = finish_open(file, nd->path.dentry, NULL, opened);
+-	if (error) {
++
++	BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
++	error = vfs_open(&nd->path, file, current_cred());
++	if (!error) {
++		*opened |= FILE_OPENED;
++	} else {
+ 		if (error == -EOPENSTALE)
+ 			goto stale_open;
+ 		goto out;
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1495,6 +1495,33 @@ void drop_collected_mounts(struct vfsmou
+ 	namespace_unlock();
+ }
+ 
++/**
++ * clone_private_mount - create a private clone of a path
++ *
++ * This creates a new vfsmount, which will be the clone of @path.  The new will
++ * not be attached anywhere in the namespace and will be private (i.e. changes
++ * to the originating mount won't be propagated into this).
++ *
++ * Release with mntput().
++ */
++struct vfsmount *clone_private_mount(struct path *path)
++{
++	struct mount *old_mnt = real_mount(path->mnt);
++	struct mount *new_mnt;
++
++	if (IS_MNT_UNBINDABLE(old_mnt))
++		return ERR_PTR(-EINVAL);
++
++	down_read(&namespace_sem);
++	new_mnt = clone_mnt(old_mnt, path->dentry, CL_PRIVATE);
++	up_read(&namespace_sem);
++	if (IS_ERR(new_mnt))
++		return ERR_CAST(new_mnt);
++
++	return &new_mnt->mnt;
++}
++EXPORT_SYMBOL_GPL(clone_private_mount);
++
+ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 		   struct vfsmount *root)
+ {
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -830,8 +830,7 @@ struct file *dentry_open(const struct pa
+ 	f = get_empty_filp();
+ 	if (!IS_ERR(f)) {
+ 		f->f_flags = flags;
+-		f->f_path = *path;
+-		error = do_dentry_open(f, NULL, cred);
++		error = vfs_open(path, f, cred);
+ 		if (!error) {
+ 			/* from now on we need fput() to dispose of f */
+ 			error = open_check_o_direct(f);
+@@ -848,6 +847,26 @@ struct file *dentry_open(const struct pa
+ }
+ EXPORT_SYMBOL(dentry_open);
+ 
++/**
++ * vfs_open - open the file at the given path
++ * @path: path to open
++ * @filp: newly allocated file with f_flag initialized
++ * @cred: credentials to use
++ */
++int vfs_open(const struct path *path, struct file *filp,
++	     const struct cred *cred)
++{
++	struct inode *inode = path->dentry->d_inode;
++
++	if (inode->i_op->dentry_open)
++		return inode->i_op->dentry_open(path->dentry, filp, cred);
++	else {
++		filp->f_path = *path;
++		return do_dentry_open(filp, NULL, cred);
++	}
++}
++EXPORT_SYMBOL(vfs_open);
++
+ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op)
+ {
+ 	int lookup_flags = 0;
+--- /dev/null
++++ b/fs/overlayfs/Kconfig
+@@ -0,0 +1,10 @@
++config OVERLAYFS_FS
++	tristate "Overlay filesystem support"
++	help
++	  An overlay filesystem combines two filesystems - an 'upper' filesystem
++	  and a 'lower' filesystem.  When a name exists in both filesystems, the
++	  object in the 'upper' filesystem is visible while the object in the
++	  'lower' filesystem is either hidden or, in the case of directories,
++	  merged with the 'upper' object.
++
++	  For more information see Documentation/filesystems/overlayfs.txt
+--- /dev/null
++++ b/fs/overlayfs/Makefile
+@@ -0,0 +1,7 @@
++#
++# Makefile for the overlay filesystem.
++#
++
++obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
++
++overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
+--- /dev/null
++++ b/fs/overlayfs/copy_up.c
+@@ -0,0 +1,388 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/file.h>
++#include <linux/splice.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/uaccess.h>
++#include <linux/sched.h>
++#include "overlayfs.h"
++
++#define OVL_COPY_UP_CHUNK_SIZE (1 << 20)
++
++static int ovl_copy_up_xattr(struct dentry *old, struct dentry *new)
++{
++	ssize_t list_size, size;
++	char *buf, *name, *value;
++	int error;
++
++	if (!old->d_inode->i_op->getxattr ||
++	    !new->d_inode->i_op->getxattr)
++		return 0;
++
++	list_size = vfs_listxattr(old, NULL, 0);
++	if (list_size <= 0) {
++		if (list_size == -EOPNOTSUPP)
++			return 0;
++		return list_size;
++	}
++
++	buf = kzalloc(list_size, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++
++	error = -ENOMEM;
++	value = kmalloc(XATTR_SIZE_MAX, GFP_KERNEL);
++	if (!value)
++		goto out;
++
++	list_size = vfs_listxattr(old, buf, list_size);
++	if (list_size <= 0) {
++		error = list_size;
++		goto out_free_value;
++	}
++
++	for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
++		size = vfs_getxattr(old, name, value, XATTR_SIZE_MAX);
++		if (size <= 0) {
++			error = size;
++			goto out_free_value;
++		}
++		error = vfs_setxattr(new, name, value, size, 0);
++		if (error)
++			goto out_free_value;
++	}
++
++out_free_value:
++	kfree(value);
++out:
++	kfree(buf);
++	return error;
++}
++
++static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
++{
++	struct file *old_file;
++	struct file *new_file;
++	loff_t old_pos = 0;
++	loff_t new_pos = 0;
++	int error = 0;
++
++	if (len == 0)
++		return 0;
++
++	old_file = ovl_path_open(old, O_RDONLY);
++	if (IS_ERR(old_file))
++		return PTR_ERR(old_file);
++
++	new_file = ovl_path_open(new, O_WRONLY);
++	if (IS_ERR(new_file)) {
++		error = PTR_ERR(new_file);
++		goto out_fput;
++	}
++
++	/* FIXME: copy up sparse files efficiently */
++	while (len) {
++		size_t this_len = OVL_COPY_UP_CHUNK_SIZE;
++		long bytes;
++
++		if (len < this_len)
++			this_len = len;
++
++		if (signal_pending_state(TASK_KILLABLE, current)) {
++			error = -EINTR;
++			break;
++		}
++
++		bytes = do_splice_direct(old_file, &old_pos,
++					 new_file, &new_pos,
++					 this_len, SPLICE_F_MOVE);
++		if (bytes <= 0) {
++			error = bytes;
++			break;
++		}
++		WARN_ON(old_pos != new_pos);
++
++		len -= bytes;
++	}
++
++	fput(new_file);
++out_fput:
++	fput(old_file);
++	return error;
++}
++
++static char *ovl_read_symlink(struct dentry *realdentry)
++{
++	int res;
++	char *buf;
++	struct inode *inode = realdentry->d_inode;
++	mm_segment_t old_fs;
++
++	res = -EINVAL;
++	if (!inode->i_op->readlink)
++		goto err;
++
++	res = -ENOMEM;
++	buf = (char *) __get_free_page(GFP_KERNEL);
++	if (!buf)
++		goto err;
++
++	old_fs = get_fs();
++	set_fs(get_ds());
++	/* The cast to a user pointer is valid due to the set_fs() */
++	res = inode->i_op->readlink(realdentry,
++				    (char __user *)buf, PAGE_SIZE - 1);
++	set_fs(old_fs);
++	if (res < 0) {
++		free_page((unsigned long) buf);
++		goto err;
++	}
++	buf[res] = '\0';
++
++	return buf;
++
++err:
++	return ERR_PTR(res);
++}
++
++static int ovl_set_timestamps(struct dentry *upperdentry, struct kstat *stat)
++{
++	struct iattr attr = {
++		.ia_valid =
++		     ATTR_ATIME | ATTR_MTIME | ATTR_ATIME_SET | ATTR_MTIME_SET,
++		.ia_atime = stat->atime,
++		.ia_mtime = stat->mtime,
++	};
++
++	return notify_change(upperdentry, &attr, NULL);
++}
++
++static int ovl_set_mode(struct dentry *upperdentry, umode_t mode)
++{
++	struct iattr attr = {
++		.ia_valid = ATTR_MODE,
++		.ia_mode = mode,
++	};
++
++	return notify_change(upperdentry, &attr, NULL);
++}
++
++static int ovl_copy_up_locked(struct dentry *upperdir, struct dentry *dentry,
++			      struct path *lowerpath, struct kstat *stat,
++			      const char *link)
++{
++	int err;
++	struct path newpath;
++	umode_t mode = stat->mode;
++
++	/* Can't properly set mode on creation because of the umask */
++	stat->mode &= S_IFMT;
++
++	ovl_path_upper(dentry, &newpath);
++	WARN_ON(newpath.dentry);
++	newpath.dentry = ovl_upper_create(upperdir, dentry, stat, link);
++	if (IS_ERR(newpath.dentry))
++		return PTR_ERR(newpath.dentry);
++
++	if (S_ISREG(stat->mode)) {
++		err = ovl_copy_up_data(lowerpath, &newpath, stat->size);
++		if (err)
++			goto err_remove;
++	}
++
++	err = ovl_copy_up_xattr(lowerpath->dentry, newpath.dentry);
++	if (err)
++		goto err_remove;
++
++	mutex_lock(&newpath.dentry->d_inode->i_mutex);
++	if (!S_ISLNK(stat->mode))
++		err = ovl_set_mode(newpath.dentry, mode);
++	if (!err)
++		err = ovl_set_timestamps(newpath.dentry, stat);
++	mutex_unlock(&newpath.dentry->d_inode->i_mutex);
++	if (err)
++		goto err_remove;
++
++	ovl_dentry_update(dentry, newpath.dentry);
++
++	/*
++	 * Easiest way to get rid of the lower dentry reference is to
++	 * drop this dentry.  This is neither needed nor possible for
++	 * directories.
++	 */
++	if (!S_ISDIR(stat->mode))
++		d_drop(dentry);
++
++	return 0;
++
++err_remove:
++	if (S_ISDIR(stat->mode))
++		vfs_rmdir(upperdir->d_inode, newpath.dentry);
++	else
++		vfs_unlink(upperdir->d_inode, newpath.dentry, NULL);
++
++	dput(newpath.dentry);
++
++	return err;
++}
++
++/*
++ * Copy up a single dentry
++ *
++ * Directory renames only allowed on "pure upper" (already created on
++ * upper filesystem, never copied up).  Directories which are on lower or
++ * are merged may not be renamed.  For these -EXDEV is returned and
++ * userspace has to deal with it.  This means, when copying up a
++ * directory we can rely on it and ancestors being stable.
++ *
++ * Non-directory renames start with copy up of source if necessary.  The
++ * actual rename will only proceed once the copy up was successful.  Copy
++ * up uses upper parent i_mutex for exclusion.  Since rename can change
++ * d_parent it is possible that the copy up will lock the old parent.  At
++ * that point the file will have already been copied up anyway.
++ */
++static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,
++			   struct path *lowerpath, struct kstat *stat)
++{
++	int err;
++	struct kstat pstat;
++	struct path parentpath;
++	struct dentry *upperdir;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	char *link = NULL;
++
++	ovl_path_upper(parent, &parentpath);
++	upperdir = parentpath.dentry;
++
++	err = vfs_getattr(&parentpath, &pstat);
++	if (err)
++		return err;
++
++	if (S_ISLNK(stat->mode)) {
++		link = ovl_read_symlink(lowerpath->dentry);
++		if (IS_ERR(link))
++			return PTR_ERR(link);
++	}
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out_free_link;
++
++	override_cred->fsuid = stat->uid;
++	override_cred->fsgid = stat->gid;
++	/*
++	 * CAP_SYS_ADMIN for copying up extended attributes
++	 * CAP_DAC_OVERRIDE for create
++	 * CAP_FOWNER for chmod, timestamp update
++	 * CAP_FSETID for chmod
++	 * CAP_MKNOD for mknod
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	cap_raise(override_cred->cap_effective, CAP_FSETID);
++	cap_raise(override_cred->cap_effective, CAP_MKNOD);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	if (ovl_path_type(dentry) != OVL_PATH_LOWER) {
++		err = 0;
++	} else {
++		err = ovl_copy_up_locked(upperdir, dentry, lowerpath,
++					 stat, link);
++		if (!err) {
++			/* Restore timestamps on parent (best effort) */
++			ovl_set_timestamps(upperdir, &pstat);
++		}
++	}
++
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++out_free_link:
++	if (link)
++		free_page((unsigned long) link);
++
++	return err;
++}
++
++int ovl_copy_up(struct dentry *dentry)
++{
++	int err;
++
++	err = 0;
++	while (!err) {
++		struct dentry *next;
++		struct dentry *parent;
++		struct path lowerpath;
++		struct kstat stat;
++		enum ovl_path_type type = ovl_path_type(dentry);
++
++		if (type != OVL_PATH_LOWER)
++			break;
++
++		next = dget(dentry);
++		/* find the topmost dentry not yet copied up */
++		for (;;) {
++			parent = dget_parent(next);
++
++			type = ovl_path_type(parent);
++			if (type != OVL_PATH_LOWER)
++				break;
++
++			dput(next);
++			next = parent;
++		}
++
++		ovl_path_lower(next, &lowerpath);
++		err = vfs_getattr(&lowerpath, &stat);
++		if (!err)
++			err = ovl_copy_up_one(parent, next, &lowerpath, &stat);
++
++		dput(parent);
++		dput(next);
++	}
++
++	return err;
++}
++
++/* Optimize by not copying up the file first and truncating later */
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size)
++{
++	int err;
++	struct kstat stat;
++	struct path lowerpath;
++	struct dentry *parent = dget_parent(dentry);
++
++	err = ovl_copy_up(parent);
++	if (err)
++		goto out_dput_parent;
++
++	ovl_path_lower(dentry, &lowerpath);
++	err = vfs_getattr(&lowerpath, &stat);
++	if (err)
++		goto out_dput_parent;
++
++	if (size < stat.size)
++		stat.size = size;
++
++	err = ovl_copy_up_one(parent, dentry, &lowerpath, &stat);
++
++out_dput_parent:
++	dput(parent);
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/dir.c
+@@ -0,0 +1,606 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++static const char *ovl_whiteout_symlink = "(overlay-whiteout)";
++
++static int ovl_whiteout(struct dentry *upperdir, struct dentry *dentry)
++{
++	int err;
++	struct dentry *newdentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	/* FIXME: recheck lower dentry to see if whiteout is really needed */
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out;
++
++	/*
++	 * CAP_SYS_ADMIN for setxattr
++	 * CAP_DAC_OVERRIDE for symlink creation
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	override_cred->fsuid = GLOBAL_ROOT_UID;
++	override_cred->fsgid = GLOBAL_ROOT_GID;
++	old_cred = override_creds(override_cred);
++
++	newdentry = lookup_one_len(dentry->d_name.name, upperdir,
++				   dentry->d_name.len);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_put_cred;
++
++	/* Just been removed within the same locked region */
++	WARN_ON(newdentry->d_inode);
++
++	err = vfs_symlink(upperdir->d_inode, newdentry, ovl_whiteout_symlink);
++	if (err)
++		goto out_dput;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++
++	err = vfs_setxattr(newdentry, ovl_whiteout_xattr, "y", 1, 0);
++	if (err)
++		vfs_unlink(upperdir->d_inode, newdentry, NULL);
++
++out_dput:
++	dput(newdentry);
++out_put_cred:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++out:
++	if (err) {
++		/*
++		 * There's no way to recover from failure to whiteout.
++		 * What should we do?  Log a big fat error and... ?
++		 */
++		pr_err("overlayfs: ERROR - failed to whiteout '%s'\n",
++		       dentry->d_name.name);
++	}
++
++	return err;
++}
++
++static struct dentry *ovl_lookup_create(struct dentry *upperdir,
++					struct dentry *template)
++{
++	int err;
++	struct dentry *newdentry;
++	struct qstr *name = &template->d_name;
++
++	newdentry = lookup_one_len(name->name, upperdir, name->len);
++	if (IS_ERR(newdentry))
++		return newdentry;
++
++	if (newdentry->d_inode) {
++		const struct cred *old_cred;
++		struct cred *override_cred;
++
++		/* No need to check whiteout if lower parent is non-existent */
++		err = -EEXIST;
++		if (!ovl_dentry_lower(template->d_parent))
++			goto out_dput;
++
++		if (!S_ISLNK(newdentry->d_inode->i_mode))
++			goto out_dput;
++
++		err = -ENOMEM;
++		override_cred = prepare_creds();
++		if (!override_cred)
++			goto out_dput;
++
++		/*
++		 * CAP_SYS_ADMIN for getxattr
++		 * CAP_FOWNER for unlink in sticky directory
++		 */
++		cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++		cap_raise(override_cred->cap_effective, CAP_FOWNER);
++		old_cred = override_creds(override_cred);
++
++		err = -EEXIST;
++		if (ovl_is_whiteout(newdentry))
++			err = vfs_unlink(upperdir->d_inode, newdentry, NULL);
++
++		revert_creds(old_cred);
++		put_cred(override_cred);
++		if (err)
++			goto out_dput;
++
++		dput(newdentry);
++		newdentry = lookup_one_len(name->name, upperdir, name->len);
++		if (IS_ERR(newdentry)) {
++			ovl_whiteout(upperdir, template);
++			return newdentry;
++		}
++
++		/*
++		 * Whiteout just been successfully removed, parent
++		 * i_mutex is still held, there's no way the lookup
++		 * could return positive.
++		 */
++		WARN_ON(newdentry->d_inode);
++	}
++
++	return newdentry;
++
++out_dput:
++	dput(newdentry);
++	return ERR_PTR(err);
++}
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct inode *dir = upperdir->d_inode;
++
++	newdentry = ovl_lookup_create(upperdir, dentry);
++	if (IS_ERR(newdentry))
++		goto out;
++
++	switch (stat->mode & S_IFMT) {
++	case S_IFREG:
++		err = vfs_create(dir, newdentry, stat->mode, NULL);
++		break;
++
++	case S_IFDIR:
++		err = vfs_mkdir(dir, newdentry, stat->mode);
++		break;
++
++	case S_IFCHR:
++	case S_IFBLK:
++	case S_IFIFO:
++	case S_IFSOCK:
++		err = vfs_mknod(dir, newdentry, stat->mode, stat->rdev);
++		break;
++
++	case S_IFLNK:
++		err = vfs_symlink(dir, newdentry, link);
++		break;
++
++	default:
++		err = -EPERM;
++	}
++	if (err) {
++		if (ovl_dentry_is_opaque(dentry))
++			ovl_whiteout(upperdir, dentry);
++		dput(newdentry);
++		newdentry = ERR_PTR(err);
++	} else if (WARN_ON(!newdentry->d_inode)) {
++		/*
++		 * Not quite sure if non-instantiated dentry is legal or not.
++		 * VFS doesn't seem to care so check and warn here.
++		 */
++		dput(newdentry);
++		newdentry = ERR_PTR(-ENOENT);
++	}
++
++out:
++	return newdentry;
++
++}
++
++static int ovl_set_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for setxattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_setxattr(upperdentry, ovl_opaque_xattr, "y", 1, 0);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_remove_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for removexattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_removexattr(upperdentry, ovl_opaque_xattr);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_dir_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++
++	type = ovl_path_real(dentry, &realpath);
++	err = vfs_getattr(&realpath, stat);
++	if (err)
++		return err;
++
++	stat->dev = dentry->d_sb->s_dev;
++	stat->ino = dentry->d_inode->i_ino;
++
++	/*
++	 * It's probably not worth it to count subdirs to get the
++	 * correct link count.  nlink=1 seems to pacify 'find' and
++	 * other utilities.
++	 */
++	if (type == OVL_PATH_MERGE)
++		stat->nlink = 1;
++
++	return 0;
++}
++
++static int ovl_create_object(struct dentry *dentry, int mode, dev_t rdev,
++			     const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *inode;
++	struct kstat stat = {
++		.mode = mode,
++		.rdev = rdev,
++	};
++
++	err = -ENOMEM;
++	inode = ovl_new_inode(dentry->d_sb, mode, dentry->d_fsdata);
++	if (!inode)
++		goto out;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		goto out_iput;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++
++	newdentry = ovl_upper_create(upperdir, dentry, &stat, link);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++	if (ovl_dentry_is_opaque(dentry) && S_ISDIR(mode)) {
++		err = ovl_set_opaque(newdentry);
++		if (err) {
++			vfs_rmdir(upperdir->d_inode, newdentry);
++			ovl_whiteout(upperdir, dentry);
++			goto out_dput;
++		}
++	}
++	ovl_dentry_update(dentry, newdentry);
++	ovl_copyattr(newdentry->d_inode, inode);
++	d_instantiate(dentry, inode);
++	inode = NULL;
++	newdentry = NULL;
++	err = 0;
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out_iput:
++	iput(inode);
++out:
++	return err;
++}
++
++static int ovl_create(struct inode *dir, struct dentry *dentry, umode_t mode,
++		      bool excl)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFREG, 0, NULL);
++}
++
++static int ovl_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFDIR, 0, NULL);
++}
++
++static int ovl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
++		     dev_t rdev)
++{
++	return ovl_create_object(dentry, mode, rdev, NULL);
++}
++
++static int ovl_symlink(struct inode *dir, struct dentry *dentry,
++			 const char *link)
++{
++	return ovl_create_object(dentry, S_IFLNK, 0, link);
++}
++
++static int ovl_do_remove(struct dentry *dentry, bool is_dir)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++	struct dentry *upperdir;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		return err;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	type = ovl_path_real(dentry, &realpath);
++	if (type != OVL_PATH_LOWER) {
++		err = -ESTALE;
++		if (realpath.dentry->d_parent != upperdir)
++			goto out_d_drop;
++
++		/* FIXME: create whiteout up front and rename to target */
++
++		if (is_dir)
++			err = vfs_rmdir(upperdir->d_inode, realpath.dentry);
++		else
++			err = vfs_unlink(upperdir->d_inode, realpath.dentry,
++					 NULL);
++		if (err)
++			goto out_d_drop;
++
++		ovl_dentry_version_inc(dentry->d_parent);
++	}
++
++	if (type != OVL_PATH_UPPER || ovl_dentry_is_opaque(dentry))
++		err = ovl_whiteout(upperdir, dentry);
++
++	/*
++	 * Keeping this dentry hashed would mean having to release
++	 * upperpath/lowerpath, which could only be done if we are the
++	 * sole user of this dentry.  Too tricky...  Just unhash for
++	 * now.
++	 */
++out_d_drop:
++	d_drop(dentry);
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_unlink(struct inode *dir, struct dentry *dentry)
++{
++	return ovl_do_remove(dentry, false);
++}
++
++
++static int ovl_rmdir(struct inode *dir, struct dentry *dentry)
++{
++	int err;
++	enum ovl_path_type type;
++
++	type = ovl_path_type(dentry);
++	if (type != OVL_PATH_UPPER) {
++		err = ovl_check_empty_and_clear(dentry, type);
++		if (err)
++			return err;
++	}
++
++	return ovl_do_remove(dentry, true);
++}
++
++static int ovl_link(struct dentry *old, struct inode *newdir,
++		    struct dentry *new)
++{
++	int err;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *newinode;
++
++	err = ovl_copy_up(old);
++	if (err)
++		goto out;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		goto out;
++
++	upperdir = ovl_dentry_upper(new->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	newdentry = ovl_lookup_create(upperdir, new);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	olddentry = ovl_dentry_upper(old);
++	err = vfs_link(olddentry, upperdir->d_inode, newdentry, NULL);
++	if (!err) {
++		if (WARN_ON(!newdentry->d_inode)) {
++			dput(newdentry);
++			err = -ENOENT;
++			goto out_unlock;
++		}
++		newinode = ovl_new_inode(old->d_sb, newdentry->d_inode->i_mode,
++				new->d_fsdata);
++		if (!newinode) {
++			err = -ENOMEM;
++			goto link_fail;
++		}
++		ovl_copyattr(upperdir->d_inode, newinode);
++
++		ovl_dentry_version_inc(new->d_parent);
++		ovl_dentry_update(new, newdentry);
++
++		d_instantiate(new, newinode);
++	} else {
++link_fail:
++		if (ovl_dentry_is_opaque(new))
++			ovl_whiteout(upperdir, new);
++		dput(newdentry);
++	}
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out:
++	return err;
++}
++
++static int ovl_rename(struct inode *olddir, struct dentry *old,
++			struct inode *newdir, struct dentry *new)
++{
++	int err;
++	enum ovl_path_type old_type;
++	enum ovl_path_type new_type;
++	struct dentry *old_upperdir;
++	struct dentry *new_upperdir;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *trap;
++	bool old_opaque;
++	bool new_opaque;
++	bool new_create = false;
++	bool is_dir = S_ISDIR(old->d_inode->i_mode);
++
++	/* Don't copy up directory trees */
++	old_type = ovl_path_type(old);
++	if (old_type != OVL_PATH_UPPER && is_dir)
++		return -EXDEV;
++
++	if (new->d_inode) {
++		new_type = ovl_path_type(new);
++
++		if (new_type == OVL_PATH_LOWER && old_type == OVL_PATH_LOWER) {
++			if (ovl_dentry_lower(old)->d_inode ==
++			    ovl_dentry_lower(new)->d_inode)
++				return 0;
++		}
++		if (new_type != OVL_PATH_LOWER && old_type != OVL_PATH_LOWER) {
++			if (ovl_dentry_upper(old)->d_inode ==
++			    ovl_dentry_upper(new)->d_inode)
++				return 0;
++		}
++
++		if (new_type != OVL_PATH_UPPER &&
++		    S_ISDIR(new->d_inode->i_mode)) {
++			err = ovl_check_empty_and_clear(new, new_type);
++			if (err)
++				return err;
++		}
++	} else {
++		new_type = OVL_PATH_UPPER;
++	}
++
++	err = ovl_copy_up(old);
++	if (err)
++		return err;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		return err;
++
++	old_upperdir = ovl_dentry_upper(old->d_parent);
++	new_upperdir = ovl_dentry_upper(new->d_parent);
++
++	trap = lock_rename(new_upperdir, old_upperdir);
++
++	olddentry = ovl_dentry_upper(old);
++	newdentry = ovl_dentry_upper(new);
++	if (newdentry) {
++		dget(newdentry);
++	} else {
++		new_create = true;
++		newdentry = ovl_lookup_create(new_upperdir, new);
++		err = PTR_ERR(newdentry);
++		if (IS_ERR(newdentry))
++			goto out_unlock;
++	}
++
++	err = -ESTALE;
++	if (olddentry->d_parent != old_upperdir)
++		goto out_dput;
++	if (newdentry->d_parent != new_upperdir)
++		goto out_dput;
++	if (olddentry == trap)
++		goto out_dput;
++	if (newdentry == trap)
++		goto out_dput;
++
++	old_opaque = ovl_dentry_is_opaque(old);
++	new_opaque = ovl_dentry_is_opaque(new) || new_type != OVL_PATH_UPPER;
++
++	if (is_dir && !old_opaque && new_opaque) {
++		err = ovl_set_opaque(olddentry);
++		if (err)
++			goto out_dput;
++	}
++
++	err = vfs_rename(old_upperdir->d_inode, olddentry,
++			 new_upperdir->d_inode, newdentry, NULL);
++
++	if (err) {
++		if (new_create && ovl_dentry_is_opaque(new))
++			ovl_whiteout(new_upperdir, new);
++		if (is_dir && !old_opaque && new_opaque)
++			ovl_remove_opaque(olddentry);
++		goto out_dput;
++	}
++
++	if (old_type != OVL_PATH_UPPER || old_opaque)
++		err = ovl_whiteout(old_upperdir, old);
++	if (is_dir && old_opaque && !new_opaque)
++		ovl_remove_opaque(olddentry);
++
++	if (old_opaque != new_opaque)
++		ovl_dentry_set_opaque(old, new_opaque);
++
++	ovl_dentry_version_inc(old->d_parent);
++	ovl_dentry_version_inc(new->d_parent);
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	unlock_rename(new_upperdir, old_upperdir);
++	return err;
++}
++
++const struct inode_operations ovl_dir_inode_operations = {
++	.lookup		= ovl_lookup,
++	.mkdir		= ovl_mkdir,
++	.symlink	= ovl_symlink,
++	.unlink		= ovl_unlink,
++	.rmdir		= ovl_rmdir,
++	.rename		= ovl_rename,
++	.link		= ovl_link,
++	.setattr	= ovl_setattr,
++	.create		= ovl_create,
++	.mknod		= ovl_mknod,
++	.permission	= ovl_permission,
++	.getattr	= ovl_dir_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
+--- /dev/null
++++ b/fs/overlayfs/inode.c
+@@ -0,0 +1,372 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/xattr.h>
++#include "overlayfs.h"
++
++int ovl_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct dentry *upperdentry;
++	int err;
++
++	if ((attr->ia_valid & ATTR_SIZE) && !ovl_dentry_upper(dentry))
++		err = ovl_copy_up_truncate(dentry, attr->ia_size);
++	else
++		err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++
++	if (attr->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
++		attr->ia_valid &= ~ATTR_MODE;
++
++	mutex_lock(&upperdentry->d_inode->i_mutex);
++	err = notify_change(upperdentry, attr, NULL);
++	if (!err)
++		ovl_copyattr(upperdentry->d_inode, dentry->d_inode);
++	mutex_unlock(&upperdentry->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	struct path realpath;
++
++	ovl_path_real(dentry, &realpath);
++	return vfs_getattr(&realpath, stat);
++}
++
++int ovl_permission(struct inode *inode, int mask)
++{
++	struct ovl_entry *oe;
++	struct dentry *alias = NULL;
++	struct inode *realinode;
++	struct dentry *realdentry;
++	bool is_upper;
++	int err;
++
++	if (S_ISDIR(inode->i_mode)) {
++		oe = inode->i_private;
++	} else if (mask & MAY_NOT_BLOCK) {
++		return -ECHILD;
++	} else {
++		/*
++		 * For non-directories find an alias and get the info
++		 * from there.
++		 */
++		alias = d_find_any_alias(inode);
++		if (WARN_ON(!alias))
++			return -ENOENT;
++
++		oe = alias->d_fsdata;
++	}
++
++	realdentry = ovl_entry_real(oe, &is_upper);
++
++	/* Careful in RCU walk mode */
++	realinode = ACCESS_ONCE(realdentry->d_inode);
++	if (!realinode) {
++		WARN_ON(!(mask & MAY_NOT_BLOCK));
++		err = -ENOENT;
++		goto out_dput;
++	}
++
++	if (mask & MAY_WRITE) {
++		umode_t mode = realinode->i_mode;
++
++		/*
++		 * Writes will always be redirected to upper layer, so
++		 * ignore lower layer being read-only.
++		 *
++		 * If the overlay itself is read-only then proceed
++		 * with the permission check, don't return EROFS.
++		 * This will only happen if this is the lower layer of
++		 * another overlayfs.
++		 *
++		 * If upper fs becomes read-only after the overlay was
++		 * constructed return EROFS to prevent modification of
++		 * upper layer.
++		 */
++		err = -EROFS;
++		if (is_upper && !IS_RDONLY(inode) && IS_RDONLY(realinode) &&
++		    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
++			goto out_dput;
++	}
++
++	err = __inode_permission(realinode, mask);
++out_dput:
++	dput(alias);
++	return err;
++}
++
++
++struct ovl_link_data {
++	struct dentry *realdentry;
++	void *cookie;
++};
++
++static void *ovl_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	void *ret;
++	struct dentry *realdentry;
++	struct inode *realinode;
++
++	realdentry = ovl_dentry_real(dentry);
++	realinode = realdentry->d_inode;
++
++	if (WARN_ON(!realinode->i_op->follow_link))
++		return ERR_PTR(-EPERM);
++
++	ret = realinode->i_op->follow_link(realdentry, nd);
++	if (IS_ERR(ret))
++		return ret;
++
++	if (realinode->i_op->put_link) {
++		struct ovl_link_data *data;
++
++		data = kmalloc(sizeof(struct ovl_link_data), GFP_KERNEL);
++		if (!data) {
++			realinode->i_op->put_link(realdentry, nd, ret);
++			return ERR_PTR(-ENOMEM);
++		}
++		data->realdentry = realdentry;
++		data->cookie = ret;
++
++		return data;
++	} else {
++		return NULL;
++	}
++}
++
++static void ovl_put_link(struct dentry *dentry, struct nameidata *nd, void *c)
++{
++	struct inode *realinode;
++	struct ovl_link_data *data = c;
++
++	if (!data)
++		return;
++
++	realinode = data->realdentry->d_inode;
++	realinode->i_op->put_link(data->realdentry, nd, data->cookie);
++	kfree(data);
++}
++
++static int ovl_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
++{
++	struct path realpath;
++	struct inode *realinode;
++
++	ovl_path_real(dentry, &realpath);
++	realinode = realpath.dentry->d_inode;
++
++	if (!realinode->i_op->readlink)
++		return -EINVAL;
++
++	touch_atime(&realpath);
++
++	return realinode->i_op->readlink(realpath.dentry, buf, bufsiz);
++}
++
++
++static bool ovl_is_private_xattr(const char *name)
++{
++	return strncmp(name, "trusted.overlay.", 14) == 0;
++}
++
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags)
++{
++	int err;
++	struct dentry *upperdentry;
++
++	if (ovl_is_private_xattr(name))
++		return -EPERM;
++
++	err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++	return  vfs_setxattr(upperdentry, name, value, size, flags);
++}
++
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size)
++{
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	return vfs_getxattr(ovl_dentry_real(dentry), name, value, size);
++}
++
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
++{
++	ssize_t res;
++	int off;
++
++	res = vfs_listxattr(ovl_dentry_real(dentry), list, size);
++	if (res <= 0 || size == 0)
++		return res;
++
++	if (ovl_path_type(dentry->d_parent) != OVL_PATH_MERGE)
++		return res;
++
++	/* filter out private xattrs */
++	for (off = 0; off < res;) {
++		char *s = list + off;
++		size_t slen = strlen(s) + 1;
++
++		BUG_ON(off + slen > res);
++
++		if (ovl_is_private_xattr(s)) {
++			res -= slen;
++			memmove(s, s + slen, res - off);
++		} else {
++			off += slen;
++		}
++	}
++
++	return res;
++}
++
++int ovl_removexattr(struct dentry *dentry, const char *name)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (type == OVL_PATH_LOWER) {
++		err = vfs_getxattr(realpath.dentry, name, NULL, 0);
++		if (err < 0)
++			return err;
++
++		err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_removexattr(realpath.dentry, name);
++}
++
++static bool ovl_open_need_copy_up(int flags, enum ovl_path_type type,
++				  struct dentry *realdentry)
++{
++	if (type != OVL_PATH_LOWER)
++		return false;
++
++	if (special_file(realdentry->d_inode->i_mode))
++		return false;
++
++	if (!(OPEN_FMODE(flags) & FMODE_WRITE) && !(flags & O_TRUNC))
++		return false;
++
++	return true;
++}
++
++static int ovl_dentry_open(struct dentry *dentry, struct file *file,
++		    const struct cred *cred)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
++		if (file->f_flags & O_TRUNC)
++			err = ovl_copy_up_truncate(dentry, 0);
++		else
++			err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_open(&realpath, file, cred);
++}
++
++static const struct inode_operations ovl_file_inode_operations = {
++	.setattr	= ovl_setattr,
++	.permission	= ovl_permission,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++	.dentry_open	= ovl_dentry_open,
++};
++
++static const struct inode_operations ovl_symlink_inode_operations = {
++	.setattr	= ovl_setattr,
++	.follow_link	= ovl_follow_link,
++	.put_link	= ovl_put_link,
++	.readlink	= ovl_readlink,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe)
++{
++	struct inode *inode;
++
++	inode = new_inode(sb);
++	if (!inode)
++		return NULL;
++
++	mode &= S_IFMT;
++
++	inode->i_ino = get_next_ino();
++	inode->i_mode = mode;
++	inode->i_flags |= S_NOATIME | S_NOCMTIME;
++
++	switch (mode) {
++	case S_IFDIR:
++		inode->i_private = oe;
++		inode->i_op = &ovl_dir_inode_operations;
++		inode->i_fop = &ovl_dir_operations;
++		break;
++
++	case S_IFLNK:
++		inode->i_op = &ovl_symlink_inode_operations;
++		break;
++
++	case S_IFREG:
++	case S_IFSOCK:
++	case S_IFBLK:
++	case S_IFCHR:
++	case S_IFIFO:
++		inode->i_op = &ovl_file_inode_operations;
++		break;
++
++	default:
++		WARN(1, "illegal file type: %i\n", mode);
++		iput(inode);
++		inode = NULL;
++	}
++
++	return inode;
++
++}
+--- /dev/null
++++ b/fs/overlayfs/overlayfs.h
+@@ -0,0 +1,70 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++struct ovl_entry;
++
++enum ovl_path_type {
++	OVL_PATH_UPPER,
++	OVL_PATH_MERGE,
++	OVL_PATH_LOWER,
++};
++
++extern const char *ovl_opaque_xattr;
++extern const char *ovl_whiteout_xattr;
++extern const struct dentry_operations ovl_dentry_operations;
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry);
++u64 ovl_dentry_version_get(struct dentry *dentry);
++void ovl_dentry_version_inc(struct dentry *dentry);
++void ovl_path_upper(struct dentry *dentry, struct path *path);
++void ovl_path_lower(struct dentry *dentry, struct path *path);
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path);
++struct dentry *ovl_dentry_upper(struct dentry *dentry);
++struct dentry *ovl_dentry_lower(struct dentry *dentry);
++struct dentry *ovl_dentry_real(struct dentry *dentry);
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper);
++bool ovl_dentry_is_opaque(struct dentry *dentry);
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque);
++bool ovl_is_whiteout(struct dentry *dentry);
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry);
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags);
++struct file *ovl_path_open(struct path *path, int flags);
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link);
++
++/* readdir.c */
++extern const struct file_operations ovl_dir_operations;
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type);
++
++/* inode.c */
++int ovl_setattr(struct dentry *dentry, struct iattr *attr);
++int ovl_permission(struct inode *inode, int mask);
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags);
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size);
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
++int ovl_removexattr(struct dentry *dentry, const char *name);
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe);
++static inline void ovl_copyattr(struct inode *from, struct inode *to)
++{
++	to->i_uid = from->i_uid;
++	to->i_gid = from->i_gid;
++}
++
++/* dir.c */
++extern const struct inode_operations ovl_dir_inode_operations;
++
++/* copy_up.c */
++int ovl_copy_up(struct dentry *dentry);
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size);
+--- /dev/null
++++ b/fs/overlayfs/readdir.c
+@@ -0,0 +1,567 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/namei.h>
++#include <linux/file.h>
++#include <linux/xattr.h>
++#include <linux/rbtree.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++struct ovl_cache_entry {
++	const char *name;
++	unsigned int len;
++	unsigned int type;
++	u64 ino;
++	bool is_whiteout;
++	struct list_head l_node;
++	struct rb_node node;
++};
++
++struct ovl_readdir_data {
++	struct dir_context ctx;
++	bool is_merge;
++	struct rb_root *root;
++	struct list_head *list;
++	struct list_head *middle;
++	struct dentry *dir;
++	int count;
++	int err;
++};
++
++struct ovl_dir_file {
++	bool is_real;
++	bool is_cached;
++	struct list_head cursor;
++	u64 cache_version;
++	struct list_head cache;
++	struct file *realfile;
++};
++
++static struct ovl_cache_entry *ovl_cache_entry_from_node(struct rb_node *n)
++{
++	return container_of(n, struct ovl_cache_entry, node);
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_find(struct rb_root *root,
++						    const char *name, int len)
++{
++	struct rb_node *node = root->rb_node;
++	int cmp;
++
++	while (node) {
++		struct ovl_cache_entry *p = ovl_cache_entry_from_node(node);
++
++		cmp = strncmp(name, p->name, len);
++		if (cmp > 0)
++			node = p->node.rb_right;
++		else if (cmp < 0 || len < p->len)
++			node = p->node.rb_left;
++		else
++			return p;
++	}
++
++	return NULL;
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_new(const char *name, int len,
++						   u64 ino, unsigned int d_type)
++{
++	struct ovl_cache_entry *p;
++
++	p = kmalloc(sizeof(*p) + len + 1, GFP_KERNEL);
++	if (p) {
++		char *name_copy = (char *) (p + 1);
++		memcpy(name_copy, name, len);
++		name_copy[len] = '\0';
++		p->name = name_copy;
++		p->len = len;
++		p->type = d_type;
++		p->ino = ino;
++		p->is_whiteout = false;
++	}
++
++	return p;
++}
++
++static int ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,
++				  const char *name, int len, u64 ino,
++				  unsigned int d_type)
++{
++	struct rb_node **newp = &rdd->root->rb_node;
++	struct rb_node *parent = NULL;
++	struct ovl_cache_entry *p;
++
++	while (*newp) {
++		int cmp;
++		struct ovl_cache_entry *tmp;
++
++		parent = *newp;
++		tmp = ovl_cache_entry_from_node(*newp);
++		cmp = strncmp(name, tmp->name, len);
++		if (cmp > 0)
++			newp = &tmp->node.rb_right;
++		else if (cmp < 0 || len < tmp->len)
++			newp = &tmp->node.rb_left;
++		else
++			return 0;
++	}
++
++	p = ovl_cache_entry_new(name, len, ino, d_type);
++	if (p == NULL)
++		return -ENOMEM;
++
++	list_add_tail(&p->l_node, rdd->list);
++	rb_link_node(&p->node, parent, newp);
++	rb_insert_color(&p->node, rdd->root);
++
++	return 0;
++}
++
++static int ovl_fill_lower(struct ovl_readdir_data *rdd,
++			  const char *name, int namelen,
++			  loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_cache_entry *p;
++
++	p = ovl_cache_entry_find(rdd->root, name, namelen);
++	if (p) {
++		list_move_tail(&p->l_node, rdd->middle);
++	} else {
++		p = ovl_cache_entry_new(name, namelen, ino, d_type);
++		if (p == NULL)
++			rdd->err = -ENOMEM;
++		else
++			list_add_tail(&p->l_node, rdd->middle);
++	}
++
++	return rdd->err;
++}
++
++static void ovl_cache_free(struct list_head *list)
++{
++	struct ovl_cache_entry *p;
++	struct ovl_cache_entry *n;
++
++	list_for_each_entry_safe(p, n, list, l_node)
++		kfree(p);
++
++	INIT_LIST_HEAD(list);
++}
++
++static int ovl_fill_merge(void *buf, const char *name, int namelen,
++			  loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++
++	rdd->count++;
++	if (!rdd->is_merge)
++		return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);
++	else
++		return ovl_fill_lower(rdd, name, namelen, offset, ino, d_type);
++}
++
++static inline int ovl_dir_read(struct path *realpath,
++			       struct ovl_readdir_data *rdd)
++{
++	struct file *realfile;
++	int err;
++
++	realfile = ovl_path_open(realpath, O_RDONLY | O_DIRECTORY);
++	if (IS_ERR(realfile))
++		return PTR_ERR(realfile);
++
++	rdd->ctx.pos = 0;
++	do {
++		rdd->count = 0;
++		rdd->err = 0;
++		err = iterate_dir(realfile, &rdd->ctx);
++		if (err >= 0)
++			err = rdd->err;
++	} while (!err && rdd->count);
++	fput(realfile);
++
++	return 0;
++}
++
++static void ovl_dir_reset(struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++	enum ovl_path_type type = ovl_path_type(file->f_path.dentry);
++
++	if (ovl_dentry_version_get(file->f_path.dentry) != od->cache_version) {
++		list_del_init(&od->cursor);
++		ovl_cache_free(&od->cache);
++		od->is_cached = false;
++	}
++	WARN_ON(!od->is_real && type != OVL_PATH_MERGE);
++	if (od->is_real && type == OVL_PATH_MERGE) {
++		fput(od->realfile);
++		od->realfile = NULL;
++		od->is_real = false;
++	}
++}
++
++static int ovl_dir_mark_whiteouts(struct ovl_readdir_data *rdd)
++{
++	struct ovl_cache_entry *p;
++	struct dentry *dentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred) {
++		ovl_cache_free(rdd->list);
++		return -ENOMEM;
++	}
++
++	/*
++	 * CAP_SYS_ADMIN for getxattr
++	 * CAP_DAC_OVERRIDE for lookup
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock(&rdd->dir->d_inode->i_mutex);
++	list_for_each_entry(p, rdd->list, l_node) {
++		if (p->type != DT_LNK)
++			continue;
++
++		dentry = lookup_one_len(p->name, rdd->dir, p->len);
++		if (IS_ERR(dentry))
++			continue;
++
++		p->is_whiteout = ovl_is_whiteout(dentry);
++		dput(dentry);
++	}
++	mutex_unlock(&rdd->dir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return 0;
++}
++
++static inline int ovl_dir_read_merged(struct path *upperpath,
++				      struct path *lowerpath,
++				      struct list_head *list)
++{
++	int err;
++	struct rb_root root = RB_ROOT;
++	struct list_head middle;
++	struct ovl_readdir_data rdd = {
++		.ctx.actor = ovl_fill_merge,
++		.list = list,
++		.root = &root,
++		.is_merge = false,
++	};
++
++	if (upperpath->dentry) {
++		rdd.dir = upperpath->dentry;
++		err = ovl_dir_read(upperpath, &rdd);
++		if (err)
++			goto out;
++
++		err = ovl_dir_mark_whiteouts(&rdd);
++		if (err)
++			goto out;
++	}
++	/*
++	 * Insert lowerpath entries before upperpath ones, this allows
++	 * offsets to be reasonably constant
++	 */
++	list_add(&middle, rdd.list);
++	rdd.middle = &middle;
++	rdd.is_merge = true;
++	err = ovl_dir_read(lowerpath, &rdd);
++	list_del(&middle);
++out:
++	return err;
++}
++
++static void ovl_seek_cursor(struct ovl_dir_file *od, loff_t pos)
++{
++	struct list_head *l;
++	loff_t off;
++
++	l = od->cache.next;
++	for (off = 0; off < pos; off++) {
++		if (l == &od->cache)
++			break;
++		l = l->next;
++	}
++	list_move_tail(&od->cursor, l);
++}
++
++static int ovl_iterate(struct file *file, struct dir_context *ctx)
++{
++	struct ovl_dir_file *od = file->private_data;
++	int res;
++
++	if (!ctx->pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = iterate_dir(od->realfile, ctx);
++
++		return res;
++	}
++
++	if (!od->is_cached) {
++		struct path lowerpath;
++		struct path upperpath;
++
++		ovl_path_lower(file->f_path.dentry, &lowerpath);
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++
++		res = ovl_dir_read_merged(&upperpath, &lowerpath, &od->cache);
++		if (res) {
++			ovl_cache_free(&od->cache);
++			return res;
++		}
++
++		od->cache_version = ovl_dentry_version_get(file->f_path.dentry);
++		od->is_cached = true;
++
++		ovl_seek_cursor(od, ctx->pos);
++	}
++
++	while (od->cursor.next != &od->cache) {
++		struct ovl_cache_entry *p;
++
++		p = list_entry(od->cursor.next, struct ovl_cache_entry, l_node);
++		if (!p->is_whiteout) {
++			if (!dir_emit(ctx, p->name, p->len, p->ino, p->type))
++				break;
++		}
++		ctx->pos++;
++		list_move(&od->cursor, &p->l_node);
++	}
++
++	return 0;
++}
++
++static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
++{
++	loff_t res;
++	struct ovl_dir_file *od = file->private_data;
++
++	mutex_lock(&file_inode(file)->i_mutex);
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_llseek(od->realfile, offset, origin);
++		file->f_pos = od->realfile->f_pos;
++	} else {
++		res = -EINVAL;
++
++		switch (origin) {
++		case SEEK_CUR:
++			offset += file->f_pos;
++			break;
++		case SEEK_SET:
++			break;
++		default:
++			goto out_unlock;
++		}
++		if (offset < 0)
++			goto out_unlock;
++
++		if (offset != file->f_pos) {
++			file->f_pos = offset;
++			if (od->is_cached)
++				ovl_seek_cursor(od, offset);
++		}
++		res = offset;
++	}
++out_unlock:
++	mutex_unlock(&file_inode(file)->i_mutex);
++
++	return res;
++}
++
++static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
++			 int datasync)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	/* May need to reopen directory if it got copied up */
++	if (!od->realfile) {
++		struct path upperpath;
++
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++		od->realfile = ovl_path_open(&upperpath, O_RDONLY);
++		if (IS_ERR(od->realfile))
++			return PTR_ERR(od->realfile);
++	}
++
++	return vfs_fsync_range(od->realfile, start, end, datasync);
++}
++
++static int ovl_dir_release(struct inode *inode, struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	list_del(&od->cursor);
++	ovl_cache_free(&od->cache);
++	if (od->realfile)
++		fput(od->realfile);
++	kfree(od);
++
++	return 0;
++}
++
++static int ovl_dir_open(struct inode *inode, struct file *file)
++{
++	struct path realpath;
++	struct file *realfile;
++	struct ovl_dir_file *od;
++	enum ovl_path_type type;
++
++	od = kzalloc(sizeof(struct ovl_dir_file), GFP_KERNEL);
++	if (!od)
++		return -ENOMEM;
++
++	type = ovl_path_real(file->f_path.dentry, &realpath);
++	realfile = ovl_path_open(&realpath, file->f_flags);
++	if (IS_ERR(realfile)) {
++		kfree(od);
++		return PTR_ERR(realfile);
++	}
++	INIT_LIST_HEAD(&od->cache);
++	INIT_LIST_HEAD(&od->cursor);
++	od->is_cached = false;
++	od->realfile = realfile;
++	od->is_real = (type != OVL_PATH_MERGE);
++	file->private_data = od;
++
++	return 0;
++}
++
++const struct file_operations ovl_dir_operations = {
++	.read		= generic_read_dir,
++	.open		= ovl_dir_open,
++	.iterate	= ovl_iterate,
++	.llseek		= ovl_dir_llseek,
++	.fsync		= ovl_dir_fsync,
++	.release	= ovl_dir_release,
++};
++
++static int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
++{
++	int err;
++	struct path lowerpath;
++	struct path upperpath;
++	struct ovl_cache_entry *p;
++
++	ovl_path_upper(dentry, &upperpath);
++	ovl_path_lower(dentry, &lowerpath);
++
++	err = ovl_dir_read_merged(&upperpath, &lowerpath, list);
++	if (err)
++		return err;
++
++	err = 0;
++
++	list_for_each_entry(p, list, l_node) {
++		if (p->is_whiteout)
++			continue;
++
++		if (p->name[0] == '.') {
++			if (p->len == 1)
++				continue;
++			if (p->len == 2 && p->name[1] == '.')
++				continue;
++		}
++		err = -ENOTEMPTY;
++		break;
++	}
++
++	return err;
++}
++
++static int ovl_remove_whiteouts(struct dentry *dir, struct list_head *list)
++{
++	struct path upperpath;
++	struct dentry *upperdir;
++	struct ovl_cache_entry *p;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	int err;
++
++	ovl_path_upper(dir, &upperpath);
++	upperdir = upperpath.dentry;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/*
++	 * CAP_DAC_OVERRIDE for lookup and unlink
++	 * CAP_SYS_ADMIN for setxattr of "trusted" namespace
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	old_cred = override_creds(override_cred);
++
++	err = vfs_setxattr(upperdir, ovl_opaque_xattr, "y", 1, 0);
++	if (err)
++		goto out_revert_creds;
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	list_for_each_entry(p, list, l_node) {
++		struct dentry *dentry;
++		int ret;
++
++		if (!p->is_whiteout)
++			continue;
++
++		dentry = lookup_one_len(p->name, upperdir, p->len);
++		if (IS_ERR(dentry)) {
++			pr_warn(
++			    "overlayfs: failed to lookup whiteout %.*s: %li\n",
++			    p->len, p->name, PTR_ERR(dentry));
++			continue;
++		}
++		ret = vfs_unlink(upperdir->d_inode, dentry, NULL);
++		dput(dentry);
++		if (ret)
++			pr_warn(
++			    "overlayfs: failed to unlink whiteout %.*s: %i\n",
++			    p->len, p->name, ret);
++	}
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++out_revert_creds:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type)
++{
++	int err;
++	LIST_HEAD(list);
++
++	err = ovl_check_empty_dir(dentry, &list);
++	if (!err && type == OVL_PATH_MERGE)
++		err = ovl_remove_whiteouts(dentry, &list);
++
++	ovl_cache_free(&list);
++
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/super.c
+@@ -0,0 +1,685 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/mount.h>
++#include <linux/slab.h>
++#include <linux/parser.h>
++#include <linux/module.h>
++#include <linux/cred.h>
++#include <linux/sched.h>
++#include <linux/statfs.h>
++#include <linux/seq_file.h>
++#include "overlayfs.h"
++
++MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
++MODULE_DESCRIPTION("Overlay filesystem");
++MODULE_LICENSE("GPL");
++
++#define OVERLAYFS_SUPER_MAGIC 0x794c764f
++
++struct ovl_config {
++	char *lowerdir;
++	char *upperdir;
++};
++
++/* private information held for overlayfs's superblock */
++struct ovl_fs {
++	struct vfsmount *upper_mnt;
++	struct vfsmount *lower_mnt;
++	long lower_namelen;
++	/* pathnames of lower and upper dirs, for show_options */
++	struct ovl_config config;
++};
++
++/* private information held for every overlayfs dentry */
++struct ovl_entry {
++	/*
++	 * Keep "double reference" on upper dentries, so that
++	 * d_delete() doesn't think it's OK to reset d_inode to NULL.
++	 */
++	struct dentry *__upperdentry;
++	struct dentry *lowerdentry;
++	union {
++		struct {
++			u64 version;
++			bool opaque;
++		};
++		struct rcu_head rcu;
++	};
++};
++
++const char *ovl_whiteout_xattr = "trusted.overlay.whiteout";
++const char *ovl_opaque_xattr = "trusted.overlay.opaque";
++
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe->__upperdentry) {
++		if (oe->lowerdentry && S_ISDIR(dentry->d_inode->i_mode))
++			return OVL_PATH_MERGE;
++		else
++			return OVL_PATH_UPPER;
++	} else {
++		return OVL_PATH_LOWER;
++	}
++}
++
++static struct dentry *ovl_upperdentry_dereference(struct ovl_entry *oe)
++{
++	struct dentry *upperdentry = ACCESS_ONCE(oe->__upperdentry);
++	smp_read_barrier_depends();
++	return upperdentry;
++}
++
++void ovl_path_upper(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->upper_mnt;
++	path->dentry = ovl_upperdentry_dereference(oe);
++}
++
++void ovl_path_lower(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->lower_mnt;
++	path->dentry = oe->lowerdentry;
++}
++
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)
++{
++
++	enum ovl_path_type type = ovl_path_type(dentry);
++
++	if (type == OVL_PATH_LOWER)
++		ovl_path_lower(dentry, path);
++	else
++		ovl_path_upper(dentry, path);
++
++	return type;
++}
++
++struct dentry *ovl_dentry_upper(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return ovl_upperdentry_dereference(oe);
++}
++
++struct dentry *ovl_dentry_lower(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return oe->lowerdentry;
++}
++
++struct dentry *ovl_dentry_real(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (!realdentry)
++		realdentry = oe->lowerdentry;
++
++	return realdentry;
++}
++
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper)
++{
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (realdentry) {
++		*is_upper = true;
++	} else {
++		realdentry = oe->lowerdentry;
++		*is_upper = false;
++	}
++	return realdentry;
++}
++
++bool ovl_dentry_is_opaque(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	return oe->opaque;
++}
++
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	oe->opaque = opaque;
++}
++
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&upperdentry->d_parent->d_inode->i_mutex));
++	WARN_ON(oe->__upperdentry);
++	BUG_ON(!upperdentry->d_inode);
++	smp_wmb();
++	oe->__upperdentry = dget(upperdentry);
++}
++
++void ovl_dentry_version_inc(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	oe->version++;
++}
++
++u64 ovl_dentry_version_get(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	return oe->version;
++}
++
++bool ovl_is_whiteout(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!dentry)
++		return false;
++	if (!dentry->d_inode)
++		return false;
++	if (!S_ISLNK(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_whiteout_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static bool ovl_is_opaquedir(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!S_ISDIR(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_opaque_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static void ovl_entry_free(struct rcu_head *head)
++{
++	struct ovl_entry *oe = container_of(head, struct ovl_entry, rcu);
++	kfree(oe);
++}
++
++static void ovl_dentry_release(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe) {
++		dput(oe->__upperdentry);
++		dput(oe->__upperdentry);
++		dput(oe->lowerdentry);
++		call_rcu(&oe->rcu, ovl_entry_free);
++	}
++}
++
++const struct dentry_operations ovl_dentry_operations = {
++	.d_release = ovl_dentry_release,
++};
++
++static struct ovl_entry *ovl_alloc_entry(void)
++{
++	return kzalloc(sizeof(struct ovl_entry), GFP_KERNEL);
++}
++
++static inline struct dentry *ovl_lookup_real(struct dentry *dir,
++					     struct qstr *name)
++{
++	struct dentry *dentry;
++
++	mutex_lock(&dir->d_inode->i_mutex);
++	dentry = lookup_one_len(name->name, dir, name->len);
++	mutex_unlock(&dir->d_inode->i_mutex);
++
++	if (IS_ERR(dentry)) {
++		if (PTR_ERR(dentry) == -ENOENT)
++			dentry = NULL;
++	} else if (!dentry->d_inode) {
++		dput(dentry);
++		dentry = NULL;
++	}
++	return dentry;
++}
++
++static int ovl_do_lookup(struct dentry *dentry)
++{
++	struct ovl_entry *oe;
++	struct dentry *upperdir;
++	struct dentry *lowerdir;
++	struct dentry *upperdentry = NULL;
++	struct dentry *lowerdentry = NULL;
++	struct inode *inode = NULL;
++	int err;
++
++	err = -ENOMEM;
++	oe = ovl_alloc_entry();
++	if (!oe)
++		goto out;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	lowerdir = ovl_dentry_lower(dentry->d_parent);
++
++	if (upperdir) {
++		upperdentry = ovl_lookup_real(upperdir, &dentry->d_name);
++		err = PTR_ERR(upperdentry);
++		if (IS_ERR(upperdentry))
++			goto out_put_dir;
++
++		if (lowerdir && upperdentry &&
++		    (S_ISLNK(upperdentry->d_inode->i_mode) ||
++		     S_ISDIR(upperdentry->d_inode->i_mode))) {
++			const struct cred *old_cred;
++			struct cred *override_cred;
++
++			err = -ENOMEM;
++			override_cred = prepare_creds();
++			if (!override_cred)
++				goto out_dput_upper;
++
++			/* CAP_SYS_ADMIN needed for getxattr */
++			cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++			old_cred = override_creds(override_cred);
++
++			if (ovl_is_opaquedir(upperdentry)) {
++				oe->opaque = true;
++			} else if (ovl_is_whiteout(upperdentry)) {
++				dput(upperdentry);
++				upperdentry = NULL;
++				oe->opaque = true;
++			}
++			revert_creds(old_cred);
++			put_cred(override_cred);
++		}
++	}
++	if (lowerdir && !oe->opaque) {
++		lowerdentry = ovl_lookup_real(lowerdir, &dentry->d_name);
++		err = PTR_ERR(lowerdentry);
++		if (IS_ERR(lowerdentry))
++			goto out_dput_upper;
++	}
++
++	if (lowerdentry && upperdentry &&
++	    (!S_ISDIR(upperdentry->d_inode->i_mode) ||
++	     !S_ISDIR(lowerdentry->d_inode->i_mode))) {
++		dput(lowerdentry);
++		lowerdentry = NULL;
++		oe->opaque = true;
++	}
++
++	if (lowerdentry || upperdentry) {
++		struct dentry *realdentry;
++
++		realdentry = upperdentry ? upperdentry : lowerdentry;
++		err = -ENOMEM;
++		inode = ovl_new_inode(dentry->d_sb, realdentry->d_inode->i_mode,
++				      oe);
++		if (!inode)
++			goto out_dput;
++		ovl_copyattr(realdentry->d_inode, inode);
++	}
++
++	if (upperdentry)
++		oe->__upperdentry = dget(upperdentry);
++
++	if (lowerdentry)
++		oe->lowerdentry = lowerdentry;
++
++	dentry->d_fsdata = oe;
++	dentry->d_op = &ovl_dentry_operations;
++	d_add(dentry, inode);
++
++	return 0;
++
++out_dput:
++	dput(lowerdentry);
++out_dput_upper:
++	dput(upperdentry);
++out_put_dir:
++	kfree(oe);
++out:
++	return err;
++}
++
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags)
++{
++	int err = ovl_do_lookup(dentry);
++
++	if (err)
++		return ERR_PTR(err);
++
++	return NULL;
++}
++
++struct file *ovl_path_open(struct path *path, int flags)
++{
++	return dentry_open(path, flags, current_cred());
++}
++
++static void ovl_put_super(struct super_block *sb)
++{
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++
++	mntput(ufs->upper_mnt);
++	mntput(ufs->lower_mnt);
++
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++	kfree(ufs);
++}
++
++static int ovl_remount_fs(struct super_block *sb, int *flagsp, char *data)
++{
++	int flags = *flagsp;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	/* When remounting rw or ro, we need to adjust the write access to the
++	 * upper fs.
++	 */
++	if (((flags ^ sb->s_flags) & MS_RDONLY) == 0)
++		/* No change to readonly status */
++		return 0;
++
++	if (flags & MS_RDONLY) {
++		mnt_drop_write(ufs->upper_mnt);
++		return 0;
++	} else
++		return mnt_want_write(ufs->upper_mnt);
++}
++
++/**
++ * ovl_statfs
++ * @sb: The overlayfs super block
++ * @buf: The struct kstatfs to fill in with stats
++ *
++ * Get the filesystem statistics.  As writes always target the upper layer
++ * filesystem pass the statfs to the same filesystem.
++ */
++static int ovl_statfs(struct dentry *dentry, struct kstatfs *buf)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct dentry *root_dentry = dentry->d_sb->s_root;
++	struct path path;
++	int err;
++
++	ovl_path_upper(root_dentry, &path);
++
++	err = vfs_statfs(&path, buf);
++	if (!err) {
++		buf->f_namelen = max(buf->f_namelen, ofs->lower_namelen);
++		buf->f_type = OVERLAYFS_SUPER_MAGIC;
++	}
++
++	return err;
++}
++
++/**
++ * ovl_show_options
++ *
++ * Prints the mount options for a given superblock.
++ * Returns zero; does not fail.
++ */
++static int ovl_show_options(struct seq_file *m, struct dentry *dentry)
++{
++	struct super_block *sb = dentry->d_sb;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	seq_printf(m, ",lowerdir=%s", ufs->config.lowerdir);
++	seq_printf(m, ",upperdir=%s", ufs->config.upperdir);
++	return 0;
++}
++
++static const struct super_operations ovl_super_operations = {
++	.put_super	= ovl_put_super,
++	.remount_fs	= ovl_remount_fs,
++	.statfs		= ovl_statfs,
++	.show_options	= ovl_show_options,
++};
++
++enum {
++	OPT_LOWERDIR,
++	OPT_UPPERDIR,
++	OPT_ERR,
++};
++
++static const match_table_t ovl_tokens = {
++	{OPT_LOWERDIR,			"lowerdir=%s"},
++	{OPT_UPPERDIR,			"upperdir=%s"},
++	{OPT_ERR,			NULL}
++};
++
++static int ovl_parse_opt(char *opt, struct ovl_config *config)
++{
++	char *p;
++
++	config->upperdir = NULL;
++	config->lowerdir = NULL;
++
++	while ((p = strsep(&opt, ",")) != NULL) {
++		int token;
++		substring_t args[MAX_OPT_ARGS];
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, ovl_tokens, args);
++		switch (token) {
++		case OPT_UPPERDIR:
++			kfree(config->upperdir);
++			config->upperdir = match_strdup(&args[0]);
++			if (!config->upperdir)
++				return -ENOMEM;
++			break;
++
++		case OPT_LOWERDIR:
++			kfree(config->lowerdir);
++			config->lowerdir = match_strdup(&args[0]);
++			if (!config->lowerdir)
++				return -ENOMEM;
++			break;
++
++		default:
++			return -EINVAL;
++		}
++	}
++	return 0;
++}
++
++static int ovl_fill_super(struct super_block *sb, void *data, int silent)
++{
++	struct path lowerpath;
++	struct path upperpath;
++	struct inode *root_inode;
++	struct dentry *root_dentry;
++	struct ovl_entry *oe;
++	struct ovl_fs *ufs;
++	struct kstatfs statfs;
++	int err;
++
++	err = -ENOMEM;
++	ufs = kmalloc(sizeof(struct ovl_fs), GFP_KERNEL);
++	if (!ufs)
++		goto out;
++
++	err = ovl_parse_opt((char *) data, &ufs->config);
++	if (err)
++		goto out_free_ufs;
++
++	err = -EINVAL;
++	if (!ufs->config.upperdir || !ufs->config.lowerdir) {
++		pr_err("overlayfs: missing upperdir or lowerdir\n");
++		goto out_free_config;
++	}
++
++	oe = ovl_alloc_entry();
++	if (oe == NULL)
++		goto out_free_config;
++
++	err = kern_path(ufs->config.upperdir, LOOKUP_FOLLOW, &upperpath);
++	if (err)
++		goto out_free_oe;
++
++	err = kern_path(ufs->config.lowerdir, LOOKUP_FOLLOW, &lowerpath);
++	if (err)
++		goto out_put_upperpath;
++
++	err = -ENOTDIR;
++	if (!S_ISDIR(upperpath.dentry->d_inode->i_mode) ||
++	    !S_ISDIR(lowerpath.dentry->d_inode->i_mode))
++		goto out_put_lowerpath;
++
++	err = vfs_statfs(&lowerpath, &statfs);
++	if (err) {
++		pr_err("overlayfs: statfs failed on lowerpath\n");
++		goto out_put_lowerpath;
++	}
++	ufs->lower_namelen = statfs.f_namelen;
++
++	sb->s_stack_depth = max(upperpath.mnt->mnt_sb->s_stack_depth,
++				lowerpath.mnt->mnt_sb->s_stack_depth) + 1;
++
++	err = -EINVAL;
++	if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		pr_err("overlayfs: maximum fs stacking depth exceeded\n");
++		goto out_put_lowerpath;
++	}
++
++
++	ufs->upper_mnt = clone_private_mount(&upperpath);
++	err = PTR_ERR(ufs->upper_mnt);
++	if (IS_ERR(ufs->upper_mnt)) {
++		pr_err("overlayfs: failed to clone upperpath\n");
++		goto out_put_lowerpath;
++	}
++
++	ufs->lower_mnt = clone_private_mount(&lowerpath);
++	err = PTR_ERR(ufs->lower_mnt);
++	if (IS_ERR(ufs->lower_mnt)) {
++		pr_err("overlayfs: failed to clone lowerpath\n");
++		goto out_put_upper_mnt;
++	}
++
++	/*
++	 * Make lower_mnt R/O.  That way fchmod/fchown on lower file
++	 * will fail instead of modifying lower fs.
++	 */
++	ufs->lower_mnt->mnt_flags |= MNT_READONLY;
++
++	/* If the upper fs is r/o, we mark overlayfs r/o too */
++	if (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY)
++		sb->s_flags |= MS_RDONLY;
++
++	if (!(sb->s_flags & MS_RDONLY)) {
++		err = mnt_want_write(ufs->upper_mnt);
++		if (err)
++			goto out_put_lower_mnt;
++	}
++
++	err = -ENOMEM;
++	root_inode = ovl_new_inode(sb, S_IFDIR, oe);
++	if (!root_inode)
++		goto out_drop_write;
++
++	root_dentry = d_make_root(root_inode);
++	if (!root_dentry)
++		goto out_drop_write;
++
++	mntput(upperpath.mnt);
++	mntput(lowerpath.mnt);
++
++	oe->__upperdentry = dget(upperpath.dentry);
++	oe->lowerdentry = lowerpath.dentry;
++
++	root_dentry->d_fsdata = oe;
++	root_dentry->d_op = &ovl_dentry_operations;
++
++	sb->s_magic = OVERLAYFS_SUPER_MAGIC;
++	sb->s_op = &ovl_super_operations;
++	sb->s_root = root_dentry;
++	sb->s_fs_info = ufs;
++
++	return 0;
++
++out_drop_write:
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++out_put_lower_mnt:
++	mntput(ufs->lower_mnt);
++out_put_upper_mnt:
++	mntput(ufs->upper_mnt);
++out_put_lowerpath:
++	path_put(&lowerpath);
++out_put_upperpath:
++	path_put(&upperpath);
++out_free_oe:
++	kfree(oe);
++out_free_config:
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++out_free_ufs:
++	kfree(ufs);
++out:
++	return err;
++}
++
++static struct dentry *ovl_mount(struct file_system_type *fs_type, int flags,
++				const char *dev_name, void *raw_data)
++{
++	return mount_nodev(fs_type, flags, raw_data, ovl_fill_super);
++}
++
++static struct file_system_type ovl_fs_type = {
++	.owner		= THIS_MODULE,
++	.name		= "overlayfs",
++	.mount		= ovl_mount,
++	.kill_sb	= kill_anon_super,
++};
++MODULE_ALIAS_FS("overlayfs");
++
++static int __init ovl_init(void)
++{
++	return register_filesystem(&ovl_fs_type);
++}
++
++static void __exit ovl_exit(void)
++{
++	unregister_filesystem(&ovl_fs_type);
++}
++
++module_init(ovl_init);
++module_exit(ovl_exit);
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1327,6 +1327,7 @@ long do_splice_direct(struct file *in, l
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_splice_direct);
+ 
+ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
+ 			       struct pipe_inode_info *opipe,
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -246,6 +246,12 @@ struct iattr {
+  */
+ #include <linux/quota.h>
+ 
++/*
++ * Maximum number of layers of fs stack.  Needs to be limited to
++ * prevent kernel stack overflow
++ */
++#define FILESYSTEM_MAX_STACK_DEPTH 2
++
+ /** 
+  * enum positive_aop_returns - aop return codes with specific semantics
+  *
+@@ -1325,6 +1331,11 @@ struct super_block {
+ 	struct list_lru		s_dentry_lru ____cacheline_aligned_in_smp;
+ 	struct list_lru		s_inode_lru ____cacheline_aligned_in_smp;
+ 	struct rcu_head		rcu;
++
++	/*
++	 * Indicates how deep in a filesystem stack this SB is
++	 */
++	int s_stack_depth;
+ };
+ 
+ extern struct timespec current_fs_time(struct super_block *sb);
+@@ -1580,6 +1591,7 @@ struct inode_operations {
+ 			   struct file *, unsigned open_flag,
+ 			   umode_t create_mode, int *opened);
+ 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ } ____cacheline_aligned;
+ 
+ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -2074,6 +2086,7 @@ extern struct file *file_open_name(struc
+ extern struct file *filp_open(const char *, int, umode_t);
+ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
+ 				   const char *, int);
++extern int vfs_open(const struct path *, struct file *, const struct cred *);
+ extern struct file * dentry_open(const struct path *, int, const struct cred *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ 
+@@ -2280,6 +2293,7 @@ extern sector_t bmap(struct inode *, sec
+ #endif
+ extern int notify_change(struct dentry *, struct iattr *, struct inode **);
+ extern int inode_permission(struct inode *, int);
++extern int __inode_permission(struct inode *, int);
+ extern int generic_permission(struct inode *, int);
+ 
+ static inline bool execute_ok(struct inode *inode)
+@@ -2488,6 +2502,9 @@ extern ssize_t generic_file_splice_write
+ 		struct file *, loff_t *, size_t, unsigned int);
+ extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+ 		struct file *out, loff_t *, size_t len, unsigned int flags);
++extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
++		loff_t *opos, size_t len, unsigned int flags);
++
+ 
+ extern void
+ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
+--- a/include/linux/mount.h
++++ b/include/linux/mount.h
+@@ -71,6 +71,9 @@ extern void mnt_pin(struct vfsmount *mnt
+ extern void mnt_unpin(struct vfsmount *mnt);
+ extern int __mnt_is_readonly(struct vfsmount *mnt);
+ 
++struct path;
++extern struct vfsmount *clone_private_mount(struct path *path);
++
+ struct file_system_type;
+ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
+ 				      int flags, const char *name,
diff --git a/trunk/target/linux/generic/patches-3.13/102-ehci_hcd_ignore_oc.patch b/trunk/target/linux/generic/patches-3.13/102-ehci_hcd_ignore_oc.patch
new file mode 100644
index 00000000..13ff4460
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/102-ehci_hcd_ignore_oc.patch
@@ -0,0 +1,81 @@
+From 1e311820ec3055e3f08e687de6564692a7cec675 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 28 Jan 2013 20:06:29 +0100
+Subject: [PATCH 11/12] USB: EHCI: add ignore_oc flag to disable overcurrent
+ checking
+
+This patch adds an ignore_oc flag which can be set by EHCI controller
+not supporting or wanting to disable overcurrent checking. The EHCI
+platform data in include/linux/usb/ehci_pdriver.h is also augmented to
+take advantage of this new flag.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ drivers/usb/host/ehci-hcd.c      |    2 +-
+ drivers/usb/host/ehci-hub.c      |    4 ++--
+ drivers/usb/host/ehci-platform.c |    1 +
+ drivers/usb/host/ehci.h          |    1 +
+ include/linux/usb/ehci_pdriver.h |    1 +
+ 5 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -634,7 +634,7 @@ static int ehci_run (struct usb_hcd *hcd
+ 		"USB %x.%x started, EHCI %x.%02x%s\n",
+ 		((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
+ 		temp >> 8, temp & 0xff,
+-		ignore_oc ? ", overcurrent ignored" : "");
++		(ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
+ 
+ 	ehci_writel(ehci, INTR_MASK,
+ 		    &ehci->regs->intr_enable); /* Turn On Interrupts */
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -641,7 +641,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+ 	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
+ 	 * PORT_POWER; that's surprising, but maybe within-spec.
+ 	 */
+-	if (!ignore_oc)
++	if (!ignore_oc && !ehci->ignore_oc)
+ 		mask = PORT_CSC | PORT_PEC | PORT_OCC;
+ 	else
+ 		mask = PORT_CSC | PORT_PEC;
+@@ -1001,7 +1001,7 @@ static int ehci_hub_control (
+ 		if (temp & PORT_PEC)
+ 			status |= USB_PORT_STAT_C_ENABLE << 16;
+ 
+-		if ((temp & PORT_OCC) && !ignore_oc){
++		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
+ 			status |= USB_PORT_STAT_C_OVERCURRENT << 16;
+ 
+ 			/*
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -47,6 +47,7 @@ static int ehci_platform_reset(struct us
+ 	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
+ 	ehci->big_endian_desc = pdata->big_endian_desc;
+ 	ehci->big_endian_mmio = pdata->big_endian_mmio;
++	ehci->ignore_oc = pdata->ignore_oc;
+ 
+ 	if (pdata->pre_setup) {
+ 		retval = pdata->pre_setup(hcd);
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -226,6 +226,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
+ 	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */
+ 	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */
++	unsigned		ignore_oc:1;
+ 
+ 	/* required for usb32 quirk */
+ 	#define OHCI_CTRL_HCFS          (3 << 6)
+--- a/include/linux/usb/ehci_pdriver.h
++++ b/include/linux/usb/ehci_pdriver.h
+@@ -45,6 +45,7 @@ struct usb_ehci_pdata {
+ 	unsigned	big_endian_desc:1;
+ 	unsigned	big_endian_mmio:1;
+ 	unsigned	no_io_watchdog:1;
++	unsigned	ignore_oc:1;
+ 
+ 	/* Turn on all power and clocks */
+ 	int (*power_on)(struct platform_device *pdev);
diff --git a/trunk/target/linux/generic/patches-3.13/120-bridge_allow_receiption_on_disabled_port.patch b/trunk/target/linux/generic/patches-3.13/120-bridge_allow_receiption_on_disabled_port.patch
new file mode 100644
index 00000000..8a2fb41d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/120-bridge_allow_receiption_on_disabled_port.patch
@@ -0,0 +1,54 @@
+From: Stephen Hemminger <stephen@networkplumber.org>
+Subject: bridge: allow receiption on disabled port
+
+When an ethernet device is enslaved to a bridge, and the bridge STP
+detects loss of carrier (or operational state down), then normally
+packet receiption is blocked.
+
+This breaks control applications like WPA which maybe expecting to
+receive packets to negotiate to bring link up. The bridge needs to
+block forwarding packets from these disabled ports, but there is no
+hard requirement to not allow local packet delivery.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -144,11 +144,13 @@ drop:
+ static int br_handle_local_finish(struct sk_buff *skb)
+ {
+ 	struct net_bridge_port *p = br_port_get_rcu(skb->dev);
+-	u16 vid = 0;
++	if (p->state != BR_STATE_DISABLED) {
++		u16 vid = 0;
+ 
+-	br_vlan_get_tag(skb, &vid);
+-	if (p->flags & BR_LEARNING)
+-		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);
++		br_vlan_get_tag(skb, &vid);
++		if (p->flags & BR_LEARNING)
++			br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid);
++	}
+ 	return 0;	 /* process further */
+ }
+ 
+@@ -218,6 +220,18 @@ rx_handler_result_t br_handle_frame(stru
+ 
+ forward:
+ 	switch (p->state) {
++	case BR_STATE_DISABLED:
++		if (ether_addr_equal(p->br->dev->dev_addr, dest))
++			skb->pkt_type = PACKET_HOST;
++
++		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++			br_handle_local_finish))
++			break;
++
++		BR_INPUT_SKB_CB(skb)->brdev = p->br->dev;
++		br_pass_frame_up(skb);
++		break;
++
+ 	case BR_STATE_FORWARDING:
+ 		rhook = rcu_dereference(br_should_route_hook);
+ 		if (rhook) {
diff --git a/trunk/target/linux/generic/patches-3.13/131-improve_noncoherent_dma_checks.patch b/trunk/target/linux/generic/patches-3.13/131-improve_noncoherent_dma_checks.patch
new file mode 100644
index 00000000..47ea50e4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/131-improve_noncoherent_dma_checks.patch
@@ -0,0 +1,91 @@
+From d593f8fc627f8cdaee9c14e4d22b0770a09baaf1 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Thu, 15 Aug 2013 10:47:47 +0200
+Subject: [PATCH] MIPS: improve checks for noncoherent DMA
+
+Only one MIPS development board actually supports enabling/disabling DMA
+coherency at runtime, so it's not a good idea to push the overhead of
+checking that configuration setting onto every other supported target as
+well.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/Kconfig                                  | 6 +++++-
+ arch/mips/include/asm/dma-coherence.h              | 7 +++++++
+ arch/mips/include/asm/mach-generic/dma-coherence.h | 4 ----
+ arch/mips/mm/dma-default.c                         | 2 ++
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -303,7 +303,7 @@ config MIPS_MALTA
+ 	select CEVT_R4K
+ 	select CSRC_R4K
+ 	select CSRC_GIC
+-	select DMA_NONCOHERENT
++	select DMA_MAYBE_COHERENT
+ 	select GENERIC_ISA_DMA
+ 	select HAVE_PCSPKR_PLATFORM
+ 	select IRQ_CPU
+@@ -895,6 +895,10 @@ config FW_CFE
+ config ARCH_DMA_ADDR_T_64BIT
+ 	def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
+ 
++config DMA_MAYBE_COHERENT
++	select DMA_NONCOHERENT
++	bool
++
+ config DMA_COHERENT
+ 	bool
+ 
+--- a/arch/mips/include/asm/dma-coherence.h
++++ b/arch/mips/include/asm/dma-coherence.h
+@@ -9,7 +9,16 @@
+ #ifndef __ASM_DMA_COHERENCE_H
+ #define __ASM_DMA_COHERENCE_H
+ 
++#ifdef CONFIG_DMA_MAYBE_COHERENT
+ extern int coherentio;
+ extern int hw_coherentio;
++#else
++#ifdef CONFIG_DMA_COHERENT
++#define coherentio	1
++#else
++#define coherentio	0
++#endif
++#define hw_coherentio	0
++#endif /* CONFIG_DMA_MAYBE_COHERENT */
+ 
+ #endif
+--- a/arch/mips/include/asm/mach-generic/dma-coherence.h
++++ b/arch/mips/include/asm/mach-generic/dma-coherence.h
+@@ -49,11 +49,7 @@ static inline int plat_dma_supported(str
+ 
+ static inline int plat_device_is_coherent(struct device *dev)
+ {
+-#ifdef CONFIG_DMA_COHERENT
+-	return 1;
+-#else
+ 	return coherentio;
+-#endif
+ }
+ 
+ #ifdef CONFIG_SWIOTLB
+--- a/arch/mips/mm/dma-default.c
++++ b/arch/mips/mm/dma-default.c
+@@ -23,6 +23,7 @@
+ 
+ #include <dma-coherence.h>
+ 
++#ifdef CONFIG_DMA_MAYBE_COHERENT
+ int coherentio = 0;	/* User defined DMA coherency from command line. */
+ EXPORT_SYMBOL_GPL(coherentio);
+ int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */
+@@ -42,6 +43,7 @@ static int __init setnocoherentio(char *
+ 	return 0;
+ }
+ early_param("nocoherentio", setnocoherentio);
++#endif
+ 
+ static inline struct page *dma_addr_to_page(struct device *dev,
+ 	dma_addr_t dma_addr)
diff --git a/trunk/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch b/trunk/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch
new file mode 100644
index 00000000..798d551c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch
@@ -0,0 +1,687 @@
+From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 12 Aug 2013 12:50:22 +0200
+Subject: [PATCH] MIPS: partially inline dma ops
+
+Several DMA ops are no-op on many platforms, and the indirection through
+the mips_dma_map_ops function table is causing the compiler to emit
+unnecessary code.
+
+Inlining visibly improves network performance in my tests (on a 24Kc
+based system), and also slightly reduces code size of a few drivers.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/Kconfig                   |   4 +
+ arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
+ arch/mips/mm/dma-default.c          | 163 ++--------------
+ 3 files changed, 373 insertions(+), 154 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -1377,6 +1377,7 @@ config CPU_CAVIUM_OCTEON
+ 	select LIBFDT
+ 	select USE_OF
+ 	select USB_EHCI_BIG_ENDIAN_MMIO
++	select SYS_HAS_DMA_OPS
+ 	help
+ 	  The Cavium Octeon processor is a highly integrated chip containing
+ 	  many ethernet hardware widgets for networking tasks. The processor
+@@ -1599,6 +1600,9 @@ config SYS_HAS_CPU_XLR
+ config SYS_HAS_CPU_XLP
+ 	bool
+ 
++config SYS_HAS_DMA_OPS
++	bool
++
+ #
+ # CPU may reorder R->R, R->W, W->R, W->W
+ # Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
+--- a/arch/mips/include/asm/dma-mapping.h
++++ b/arch/mips/include/asm/dma-mapping.h
+@@ -1,9 +1,16 @@
+ #ifndef _ASM_DMA_MAPPING_H
+ #define _ASM_DMA_MAPPING_H
+ 
++#include <linux/kmemcheck.h>
++#include <linux/bug.h>
++#include <linux/scatterlist.h>
++#include <linux/dma-debug.h>
++#include <linux/dma-attrs.h>
++
+ #include <asm/scatterlist.h>
+ #include <asm/dma-coherence.h>
+ #include <asm/cache.h>
++#include <asm/cpu-type.h>
+ #include <asm-generic/dma-coherent.h>
+ 
+ #ifndef CONFIG_SGI_IP27 /* Kludge to fix 2.6.39 build for IP27 */
+@@ -12,12 +19,48 @@
+ 
+ extern struct dma_map_ops *mips_dma_map_ops;
+ 
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction);
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs);
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs);
++
+ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
++#ifdef CONFIG_SYS_HAS_DMA_OPS
+ 	if (dev && dev->archdata.dma_ops)
+ 		return dev->archdata.dma_ops;
+ 	else
+ 		return mips_dma_map_ops;
++#else
++	return NULL;
++#endif
++}
++
++/*
++ * Warning on the terminology - Linux calls an uncached area coherent;
++ * MIPS terminology calls memory areas with hardware maintained coherency
++ * coherent.
++ */
++
++static inline int cpu_needs_post_dma_flush(struct device *dev)
++{
++#ifndef CONFIG_SYS_HAS_CPU_R10000
++	return 0;
++#endif
++	return !plat_device_is_coherent(dev) &&
++	       (boot_cpu_type() == CPU_R10000 ||
++		boot_cpu_type() == CPU_R12000 ||
++		boot_cpu_type() == CPU_BMIPS5000);
++}
++
++static inline struct page *dma_addr_to_page(struct device *dev,
++	dma_addr_t dma_addr)
++{
++	return pfn_to_page(
++		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+ }
+ 
+ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
+@@ -30,12 +73,312 @@ static inline bool dma_capable(struct de
+ 
+ static inline void dma_mark_clean(void *addr, size_t size) {}
+ 
+-#include <asm-generic/dma-mapping-common.h>
++static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
++					      size_t size,
++					      enum dma_data_direction dir,
++					      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	unsigned long offset = (unsigned long)ptr & ~PAGE_MASK;
++	struct page *page = virt_to_page(ptr);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(ptr, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, attrs);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, true);
++	return addr;
++}
++
++static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
++					  size_t size,
++					  enum dma_data_direction dir,
++					  struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, attrs);
++	} else {
++		if (cpu_needs_post_dma_flush(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, true);
++}
++
++static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
++				   int nents, enum dma_data_direction dir,
++				   struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	int i, ents;
++	struct scatterlist *s;
++
++	for_each_sg(sg, s, nents, i)
++		kmemcheck_mark_initialized(sg_virt(s), s->length);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ents = ops->map_sg(dev, sg, nents, dir, attrs);
++	} else {
++		for_each_sg(sg, s, nents, i) {
++			struct page *page = sg_page(s);
++
++			if (!plat_device_is_coherent(dev))
++				__dma_sync(page, s->offset, s->length, dir);
++#ifdef CONFIG_NEED_SG_DMA_LENGTH
++			s->dma_length = s->length;
++#endif
++			s->dma_address =
++				plat_map_dma_mem_page(dev, page) + s->offset;
++		}
++		ents = nents;
++	}
++	debug_dma_map_sg(dev, sg, nents, ents, dir);
++
++	return ents;
++}
++
++static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,
++				      int nents, enum dma_data_direction dir,
++				      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	debug_dma_unmap_sg(dev, sg, nents, dir);
++	if (ops) {
++		ops->unmap_sg(dev, sg, nents, dir, attrs);
++		return;
++	}
++
++	for_each_sg(sg, s, nents, i) {
++		if (!plat_device_is_coherent(dev) && dir != DMA_TO_DEVICE)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++		plat_unmap_dma_mem(dev, s->dma_address, s->length, dir);
++	}
++}
++
++static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
++				      size_t offset, size_t size,
++				      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(page_address(page) + offset, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, NULL);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, false);
++
++	return addr;
++}
++
++static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
++				  size_t size, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, NULL);
++	} else {
++		if (cpu_needs_post_dma_flush(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, false);
++}
++
++static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
++					   size_t size,
++					   enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr, size, dir);
++	else if (cpu_needs_post_dma_flush(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_cpu(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_for_device(struct device *dev,
++					      dma_addr_t addr, size_t size,
++					      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_device(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_range_for_cpu(struct device *dev,
++						 dma_addr_t addr,
++						 unsigned long offset,
++						 size_t size,
++						 enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr + offset, size, dir);
++	else if (cpu_needs_post_dma_flush(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir);
++}
++
++static inline void dma_sync_single_range_for_device(struct device *dev,
++						    dma_addr_t addr,
++						    unsigned long offset,
++						    size_t size,
++						    enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr + offset, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir);
++}
++
++static inline void
++dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
++		    int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_cpu(dev, sg, nelems, dir);
++	else if (cpu_needs_post_dma_flush(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_cpu(dev, sg, nelems, dir);
++}
++
++static inline void
++dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
++		       int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_device(dev, sg, nelems, dir);
++	else if (!plat_device_is_coherent(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_device(dev, sg, nelems, dir);
++
++}
++
++#define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)
++#define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
++#define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL)
++#define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, NULL)
++
++extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
++			   void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++/**
++ * dma_mmap_attrs - map a coherent DMA allocation into user space
++ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
++ * @vma: vm_area_struct describing requested user mapping
++ * @cpu_addr: kernel CPU-view address returned from dma_alloc_attrs
++ * @handle: device-view address returned from dma_alloc_attrs
++ * @size: size of memory originally requested in dma_alloc_attrs
++ * @attrs: attributes of mapping properties requested in dma_alloc_attrs
++ *
++ * Map a coherent DMA buffer previously allocated by dma_alloc_attrs
++ * into user space.  The coherent DMA buffer must not be freed by the
++ * driver until the user space mapping has been released.
++ */
++static inline int
++dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, void *cpu_addr,
++	       dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->mmap)
++		return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
++	return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size);
++}
++
++#define dma_mmap_coherent(d, v, c, h, s) dma_mmap_attrs(d, v, c, h, s, NULL)
++
++static inline int dma_mmap_writecombine(struct device *dev, struct vm_area_struct *vma,
++		      void *cpu_addr, dma_addr_t dma_addr, size_t size)
++{
++	DEFINE_DMA_ATTRS(attrs);
++	dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
++	return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, &attrs);
++}
++
++int
++dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
++		       void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++static inline int
++dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
++		      dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->get_sgtable)
++		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
++					attrs);
++	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
++}
++
++#define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, NULL)
++
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+-	return ops->dma_supported(dev, mask);
++	if (ops)
++		return ops->dma_supported(dev, mask);
++	return plat_dma_supported(dev, mask);
+ }
+ 
+ static inline int dma_mapping_error(struct device *dev, u64 mask)
+@@ -43,7 +386,9 @@ static inline int dma_mapping_error(stru
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	debug_dma_mapping_error(dev, mask);
+-	return ops->mapping_error(dev, mask);
++	if (ops)
++		return ops->mapping_error(dev, mask);
++	return 0;
+ }
+ 
+ static inline int
+@@ -69,7 +414,11 @@ static inline void *dma_alloc_attrs(stru
+ 	void *ret;
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	if (ops)
++		ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	else
++		ret = mips_dma_alloc_coherent(dev, size, dma_handle, gfp,
++					      attrs);
+ 
+ 	debug_dma_alloc_coherent(dev, size, *dma_handle, ret);
+ 
+@@ -84,7 +433,10 @@ static inline void dma_free_attrs(struct
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ops->free(dev, size, vaddr, dma_handle, attrs);
++	if (ops)
++		ops->free(dev, size, vaddr, dma_handle, attrs);
++	else
++		mips_dma_free_coherent(dev, size, vaddr, dma_handle, attrs);
+ 
+ 	debug_dma_free_coherent(dev, size, vaddr, dma_handle);
+ }
+--- a/arch/mips/mm/dma-default.c
++++ b/arch/mips/mm/dma-default.c
+@@ -25,7 +25,7 @@
+ 
+ #ifdef CONFIG_DMA_MAYBE_COHERENT
+ int coherentio = 0;	/* User defined DMA coherency from command line. */
+-EXPORT_SYMBOL_GPL(coherentio);
++EXPORT_SYMBOL(coherentio);
+ int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */
+ 
+ static int __init setcoherentio(char *str)
+@@ -45,30 +45,6 @@ static int __init setnocoherentio(char *
+ early_param("nocoherentio", setnocoherentio);
+ #endif
+ 
+-static inline struct page *dma_addr_to_page(struct device *dev,
+-	dma_addr_t dma_addr)
+-{
+-	return pfn_to_page(
+-		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+-}
+-
+-/*
+- * The affected CPUs below in 'cpu_needs_post_dma_flush()' can
+- * speculatively fill random cachelines with stale data at any time,
+- * requiring an extra flush post-DMA.
+- *
+- * Warning on the terminology - Linux calls an uncached area coherent;
+- * MIPS terminology calls memory areas with hardware maintained coherency
+- * coherent.
+- */
+-static inline int cpu_needs_post_dma_flush(struct device *dev)
+-{
+-	return !plat_device_is_coherent(dev) &&
+-	       (boot_cpu_type() == CPU_R10000 ||
+-		boot_cpu_type() == CPU_R12000 ||
+-		boot_cpu_type() == CPU_BMIPS5000);
+-}
+-
+ static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
+ {
+ 	gfp_t dma_flag;
+@@ -124,8 +100,9 @@ void *dma_alloc_noncoherent(struct devic
+ }
+ EXPORT_SYMBOL(dma_alloc_noncoherent);
+ 
+-static void *mips_dma_alloc_coherent(struct device *dev, size_t size,
+-	dma_addr_t * dma_handle, gfp_t gfp, struct dma_attrs *attrs)
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs)
+ {
+ 	void *ret;
+ 
+@@ -149,6 +126,7 @@ static void *mips_dma_alloc_coherent(str
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(mips_dma_alloc_coherent);
+ 
+ 
+ void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
+@@ -159,8 +137,8 @@ void dma_free_noncoherent(struct device
+ }
+ EXPORT_SYMBOL(dma_free_noncoherent);
+ 
+-static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
+-	dma_addr_t dma_handle, struct dma_attrs *attrs)
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs)
+ {
+ 	unsigned long addr = (unsigned long) vaddr;
+ 	int order = get_order(size);
+@@ -175,6 +153,7 @@ static void mips_dma_free_coherent(struc
+ 
+ 	free_pages(addr, get_order(size));
+ }
++EXPORT_SYMBOL(mips_dma_free_coherent);
+ 
+ static inline void __dma_sync_virtual(void *addr, size_t size,
+ 	enum dma_data_direction direction)
+@@ -203,8 +182,8 @@ static inline void __dma_sync_virtual(vo
+  * If highmem is not configured then the bulk of this loop gets
+  * optimized out.
+  */
+-static inline void __dma_sync(struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction)
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction)
+ {
+ 	size_t left = size;
+ 
+@@ -233,108 +212,7 @@ static inline void __dma_sync(struct pag
+ 		left -= len;
+ 	} while (left);
+ }
+-
+-static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
+-	size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_addr),
+-			   dma_addr & ~PAGE_MASK, size, direction);
+-
+-	plat_unmap_dma_mem(dev, dma_addr, size, direction);
+-}
+-
+-static int mips_dma_map_sg(struct device *dev, struct scatterlist *sg,
+-	int nents, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nents; i++, sg++) {
+-		if (!plat_device_is_coherent(dev))
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-#ifdef CONFIG_NEED_SG_DMA_LENGTH
+-		sg->dma_length = sg->length;
+-#endif
+-		sg->dma_address = plat_map_dma_mem_page(dev, sg_page(sg)) +
+-				  sg->offset;
+-	}
+-
+-	return nents;
+-}
+-
+-static dma_addr_t mips_dma_map_page(struct device *dev, struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(page, offset, size, direction);
+-
+-	return plat_map_dma_mem_page(dev, page) + offset;
+-}
+-
+-static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
+-	int nhwentries, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nhwentries; i++, sg++) {
+-		if (!plat_device_is_coherent(dev) &&
+-		    direction != DMA_TO_DEVICE)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-		plat_unmap_dma_mem(dev, sg->dma_address, sg->length, direction);
+-	}
+-}
+-
+-static void mips_dma_sync_single_for_cpu(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_single_for_device(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_sg_for_cpu(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	if (cpu_needs_post_dma_flush(dev))
+-		for (i = 0; i < nelems; i++, sg++)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-}
+-
+-static void mips_dma_sync_sg_for_device(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	if (!plat_device_is_coherent(dev))
+-		for (i = 0; i < nelems; i++, sg++)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-}
+-
+-int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+-int mips_dma_supported(struct device *dev, u64 mask)
+-{
+-	return plat_dma_supported(dev, mask);
+-}
++EXPORT_SYMBOL(__dma_sync);
+ 
+ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+ 			 enum dma_data_direction direction)
+@@ -347,23 +225,10 @@ void dma_cache_sync(struct device *dev,
+ 
+ EXPORT_SYMBOL(dma_cache_sync);
+ 
+-static struct dma_map_ops mips_default_dma_map_ops = {
+-	.alloc = mips_dma_alloc_coherent,
+-	.free = mips_dma_free_coherent,
+-	.map_page = mips_dma_map_page,
+-	.unmap_page = mips_dma_unmap_page,
+-	.map_sg = mips_dma_map_sg,
+-	.unmap_sg = mips_dma_unmap_sg,
+-	.sync_single_for_cpu = mips_dma_sync_single_for_cpu,
+-	.sync_single_for_device = mips_dma_sync_single_for_device,
+-	.sync_sg_for_cpu = mips_dma_sync_sg_for_cpu,
+-	.sync_sg_for_device = mips_dma_sync_sg_for_device,
+-	.mapping_error = mips_dma_mapping_error,
+-	.dma_supported = mips_dma_supported
+-};
+-
+-struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
++#ifdef CONFIG_SYS_HAS_DMA_OPS
++struct dma_map_ops *mips_dma_map_ops = NULL;
+ EXPORT_SYMBOL(mips_dma_map_ops);
++#endif
+ 
+ #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/200-fix_localversion.patch b/trunk/target/linux/generic/patches-3.13/200-fix_localversion.patch
new file mode 100644
index 00000000..70ed0ff3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- a/scripts/setlocalversion
++++ b/scripts/setlocalversion
+@@ -164,7 +164,7 @@ else
+ 	# annotated or signed tagged state (as git describe only
+ 	# looks at signed or annotated tags - git tag -a/-s) and
+ 	# LOCALVERSION= is not specified
+-	if test "${LOCALVERSION+set}" != "set"; then
++	if test "${CONFIG_LOCALVERSION+set}" != "set"; then
+ 		scm=$(scm_version --short)
+ 		res="$res${scm:++}"
+ 	fi
diff --git a/trunk/target/linux/generic/patches-3.13/201-extra_optimization.patch b/trunk/target/linux/generic/patches-3.13/201-extra_optimization.patch
new file mode 100644
index 00000000..79f9e8cf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/201-extra_optimization.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -574,9 +574,9 @@ endif # $(dot-config)
+ all: vmlinux
+ 
+ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+-KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)
++KBUILD_CFLAGS	+= -Os $(EXTRA_OPTIMIZATION) $(call cc-disable-warning,maybe-uninitialized,)
+ else
+-KBUILD_CFLAGS	+= -O2
++KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
+ endif
+ 
+ include $(srctree)/arch/$(SRCARCH)/Makefile
diff --git a/trunk/target/linux/generic/patches-3.13/202-reduce_module_size.patch b/trunk/target/linux/generic/patches-3.13/202-reduce_module_size.patch
new file mode 100644
index 00000000..15b69fdc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/202-reduce_module_size.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -382,7 +382,7 @@ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+ KBUILD_AFLAGS_MODULE  := -DMODULE
+ KBUILD_CFLAGS_MODULE  := -DMODULE
+-KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
++KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s)
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/trunk/target/linux/generic/patches-3.13/203-kallsyms_uncompressed.patch b/trunk/target/linux/generic/patches-3.13/203-kallsyms_uncompressed.patch
new file mode 100644
index 00000000..2b935fe0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/203-kallsyms_uncompressed.patch
@@ -0,0 +1,108 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -54,6 +54,7 @@ static struct text_range text_ranges[] =
+ static struct sym_entry *table;
+ static unsigned int table_size, table_cnt;
+ static int all_symbols = 0;
++static int uncompressed = 0;
+ static char symbol_prefix_char = '\0';
+ static unsigned long long kernel_start_addr = 0;
+ 
+@@ -373,6 +374,9 @@ static void write_src(void)
+ 
+ 	free(markers);
+ 
++	if (uncompressed)
++		return;
++
+ 	output_label("kallsyms_token_table");
+ 	off = 0;
+ 	for (i = 0; i < 256; i++) {
+@@ -431,6 +435,9 @@ static void *find_token(unsigned char *s
+ {
+ 	int i;
+ 
++	if (uncompressed)
++		return NULL;
++
+ 	for (i = 0; i < len - 1; i++) {
+ 		if (str[i] == token[0] && str[i+1] == token[1])
+ 			return &str[i];
+@@ -503,6 +510,9 @@ static void optimize_result(void)
+ {
+ 	int i, best;
+ 
++	if (uncompressed)
++		return;
++
+ 	/* using the '\0' symbol last allows compress_symbols to use standard
+ 	 * fast string functions */
+ 	for (i = 255; i >= 0; i--) {
+@@ -662,7 +672,9 @@ int main(int argc, char **argv)
+ 			} else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+ 				const char *p = &argv[i][14];
+ 				kernel_start_addr = strtoull(p, NULL, 16);
+-			} else
++			} else if (strcmp(argv[i], "--uncompressed") == 0)
++				uncompressed = 1;
++			else
+ 				usage();
+ 		}
+ 	} else if (argc != 1)
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1282,6 +1282,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+ 	  the unaligned access emulation.
+ 	  see arch/parisc/kernel/unaligned.c for reference
+ 
++config KALLSYMS_UNCOMPRESSED
++	bool "Keep kallsyms uncompressed"
++	depends on KALLSYMS
++	help
++		Normally kallsyms contains compressed symbols (using a token table),
++		reducing the uncompressed kernel image size. Keeping the symbol table
++		uncompressed significantly improves the size of this part in compressed
++		kernel images.
++
++		Say N unless you need compressed kernel images to be small.
++
+ config HAVE_PCSPKR_PLATFORM
+ 	bool
+ 
+--- a/scripts/link-vmlinux.sh
++++ b/scripts/link-vmlinux.sh
+@@ -86,6 +86,10 @@ kallsyms()
+ 		kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+ 	fi
+ 
++	if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
++		kallsymopt="${kallsymopt} --uncompressed"
++	fi
++
+ 	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
+ 		      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+ 
+--- a/kernel/kallsyms.c
++++ b/kernel/kallsyms.c
+@@ -108,6 +108,11 @@ static unsigned int kallsyms_expand_symb
+ 	 * For every byte on the compressed symbol data, copy the table
+ 	 * entry for that byte.
+ 	 */
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	memcpy(result, data + 1, len - 1);
++	result += len - 1;
++	len = 0;
++#endif
+ 	while (len) {
+ 		tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
+ 		data++;
+@@ -140,6 +145,9 @@ tail:
+  */
+ static char kallsyms_get_symbol_type(unsigned int off)
+ {
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	return kallsyms_names[off + 1];
++#endif
+ 	/*
+ 	 * Get just the first code, look it up in the token table,
+ 	 * and return the first char from this token.
diff --git a/trunk/target/linux/generic/patches-3.13/204-module_strip.patch b/trunk/target/linux/generic/patches-3.13/204-module_strip.patch
new file mode 100644
index 00000000..eaa26747
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/204-module_strip.patch
@@ -0,0 +1,200 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] build: add a hack for removing non-essential module info
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -83,7 +83,7 @@ void sort_extable(struct exception_table
+ void sort_main_extable(void);
+ void trim_init_extable(struct module *m);
+ 
+-#ifdef MODULE
++#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
+ #define MODULE_GENERIC_TABLE(gtype,name)			\
+ extern const struct gtype##_id __mod_##gtype##_table		\
+   __attribute__ ((unused, alias(__stringify(name))))
+@@ -94,9 +94,10 @@ extern const struct gtype##_id __mod_##g
+ 
+ /* Generic info of form tag = "info" */
+ #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
++#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
+ 
+ /* For userspace: you can also call me... */
+-#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
++#define MODULE_ALIAS(_alias) MODULE_INFO_STRIP(alias, _alias)
+ 
+ /* Soft module dependencies. See man modprobe.d for details.
+  * Example: MODULE_SOFTDEP("pre: module-foo module-bar post: module-baz")
+@@ -137,10 +138,10 @@ extern const struct gtype##_id __mod_##g
+  * Author(s), use "Name <email>" or just "Name", for multiple
+  * authors use multiple MODULE_AUTHOR() statements/lines.
+  */
+-#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
++#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
+   
+ /* What your module does. */
+-#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
++#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
+ 
+ #define MODULE_DEVICE_TABLE(type,name)		\
+   MODULE_GENERIC_TABLE(type##_device,name)
+@@ -161,7 +162,9 @@ extern const struct gtype##_id __mod_##g
+ */
+ 
+ #if defined(MODULE) || !defined(CONFIG_SYSFS)
+-#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
++#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
++#elif defined(CONFIG_MODULE_STRIPPED)
++#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
+ #else
+ #define MODULE_VERSION(_version)					\
+ 	static struct module_version_attribute ___modver_attr = {	\
+@@ -183,7 +186,7 @@ extern const struct gtype##_id __mod_##g
+ /* Optional firmware file (or files) needed by the module
+  * format is simply firmware file name.  Multiple firmware
+  * files require multiple MODULE_FIRMWARE() specifiers */
+-#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
++#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
+ 
+ /* Given an address, look for it in the exception tables */
+ const struct exception_table_entry *search_exception_tables(unsigned long add);
+--- a/include/linux/moduleparam.h
++++ b/include/linux/moduleparam.h
+@@ -16,6 +16,16 @@
+ /* Chosen so that structs with an unsigned long line up. */
+ #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
+ 
++/* This struct is here for syntactic coherency, it is not used */
++#define __MODULE_INFO_DISABLED(name)					  \
++  struct __UNIQUE_ID(name) {}
++
++#ifdef CONFIG_MODULE_STRIPPED
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
++#else
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
++#endif
++
+ #ifdef MODULE
+ #define __MODULE_INFO(tag, name, info)					  \
+ static const char __UNIQUE_ID(name)[]					  \
+@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]
+   = __stringify(tag) "=" info
+ #else  /* !MODULE */
+ /* This struct is here for syntactic coherency, it is not used */
+-#define __MODULE_INFO(tag, name, info)					  \
+-  struct __UNIQUE_ID(name) {}
++#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name)
+ #endif
+ #define __MODULE_PARM_TYPE(name, _type)					  \
+   __MODULE_INFO(parmtype, name##type, #name ":" _type)
+@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]
+ /* One for each parameter, describing how to use it.  Some files do
+    multiple of these per line, so can't just use MODULE_INFO. */
+ #define MODULE_PARM_DESC(_parm, desc) \
+-	__MODULE_INFO(parm, _parm, #_parm ":" desc)
++	__MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
+ 
+ struct kernel_param;
+ 
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1835,6 +1835,13 @@ config MODULE_SIG_HASH
+ 	default "sha384" if MODULE_SIG_SHA384
+ 	default "sha512" if MODULE_SIG_SHA512
+ 
++config MODULE_STRIPPED
++	bool "Reduce module size"
++	depends on MODULES
++	help
++	  Remove module parameter descriptions, author info, version, aliases,
++	  device tables, etc.
++
+ endif # MODULES
+ 
+ config INIT_ALL_POSSIBLE
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2666,6 +2666,7 @@ static struct module *setup_load_info(st
+ 
+ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	const char *modmagic = get_modinfo(info, "vermagic");
+ 	int err;
+ 
+@@ -2691,6 +2692,7 @@ static int check_modinfo(struct module *
+ 		pr_warn("%s: module is from the staging directory, the quality "
+ 			"is unknown, you have been warned.\n", mod->name);
+ 	}
++#endif
+ 
+ 	/* Set up license info based on the info section */
+ 	set_license(mod, get_modinfo(info, "license"));
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -1717,7 +1717,9 @@ static void read_symbols(char *modname)
+ 		symname = info.strtab + sym->st_name;
+ 
+ 		handle_modversions(mod, &info, sym, symname);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		handle_moddevtable(mod, &info, sym, symname);
++#endif
+ 	}
+ 	if (!is_vmlinux(modname) ||
+ 	     (is_vmlinux(modname) && vmlinux_section_warnings))
+@@ -1861,7 +1863,9 @@ static void add_header(struct buffer *b,
+ 	buf_printf(b, "#include <linux/vermagic.h>\n");
+ 	buf_printf(b, "#include <linux/compiler.h>\n");
+ 	buf_printf(b, "\n");
++#ifndef CONFIG_MODULE_STRIPPED
+ 	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
++#endif
+ 	buf_printf(b, "\n");
+ 	buf_printf(b, "__visible struct module __this_module\n");
+ 	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
+@@ -1878,16 +1882,20 @@ static void add_header(struct buffer *b,
+ 
+ static void add_intree_flag(struct buffer *b, int is_intree)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (is_intree)
+ 		buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
++#endif
+ }
+ 
+ static void add_staging_flag(struct buffer *b, const char *name)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	static const char *staging_dir = "drivers/staging";
+ 
+ 	if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
+ 		buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
++#endif
+ }
+ 
+ /**
+@@ -1980,11 +1988,13 @@ static void add_depends(struct buffer *b
+ 
+ static void add_srcversion(struct buffer *b, struct module *mod)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (mod->srcversion[0]) {
+ 		buf_printf(b, "\n");
+ 		buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
+ 			   mod->srcversion);
+ 	}
++#endif
+ }
+ 
+ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -2213,7 +2223,9 @@ int main(int argc, char **argv)
+ 		add_staging_flag(&buf, mod->name);
+ 		err |= add_versions(&buf, mod);
+ 		add_depends(&buf, mod, modules);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		add_moddevtable(&buf, mod);
++#endif
+ 		add_srcversion(&buf, mod);
+ 
+ 		sprintf(fname, "%s.mod.c", mod->name);
diff --git a/trunk/target/linux/generic/patches-3.13/210-darwin_scripts_include.patch b/trunk/target/linux/generic/patches-3.13/210-darwin_scripts_include.patch
new file mode 100644
index 00000000..f358e0a0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/210-darwin_scripts_include.patch
@@ -0,0 +1,3088 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -22,6 +22,35 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef __APPLE__
++/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
++void *memmem (const void *haystack, size_t haystack_len,
++                          const void *needle,  size_t needle_len)
++{
++  const char *begin;
++  const char *const last_possible
++    = (const char *) haystack + haystack_len - needle_len;
++
++  if (needle_len == 0)
++    /* The first occurrence of the empty string is deemed to occur at
++       the beginning of the string.  */
++    return (void *) haystack;
++
++  /* Sanity check, otherwise the loop might search through the whole
++     memory.  */
++  if (__builtin_expect (haystack_len < needle_len, 0))
++    return NULL;
++
++  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
++    if (begin[0] == ((const char *) needle)[0] &&
++        !memcmp ((const void *) &begin[1],
++                 (const void *) ((const char *) needle + 1),
++                 needle_len - 1))
++      return (void *) begin;
++
++  return NULL;
++}
++#endif
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -132,6 +132,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
+ # we really need to do so. (Do not call gcc as part of make mrproper)
+ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
+                     -DLOCALE
++ifeq ($(shell uname -s),Darwin)
++HOST_LOADLIBES  += -lncurses
++endif
+ 
+ # ===========================================================================
+ # Shared Makefile for the various kconfig executables:
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c
+@@ -1,7 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __APPLE__
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ int
+ main(int argc, char **argv)
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -7,7 +7,11 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ #include "elfconfig.h"
+ 
+--- /dev/null
++++ b/scripts/mod/elf.h
+@@ -0,0 +1,3007 @@
++/* This file defines standard ELF types, structures, and macros.
++   Copyright (C) 1995-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _ELF_H
++#define	_ELF_H 1
++
++/* Standard ELF types.  */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity.  */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities.  */
++typedef uint32_t Elf32_Word;
++typedef	int32_t  Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef	int32_t  Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities.  */
++typedef uint64_t Elf32_Xword;
++typedef	int64_t  Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef	int64_t  Elf64_Sxword;
++
++/* Type of addresses.  */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets.  */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities.  */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information.  */
++typedef Elf32_Half Elf32_Versym;
++typedef Elf64_Half Elf64_Versym;
++
++
++/* The ELF file header.  This appears at the start of every ELF file.  */
++
++#define EI_NIDENT (16)
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf32_Half	e_type;			/* Object file type */
++  Elf32_Half	e_machine;		/* Architecture */
++  Elf32_Word	e_version;		/* Object file version */
++  Elf32_Addr	e_entry;		/* Entry point virtual address */
++  Elf32_Off	e_phoff;		/* Program header table file offset */
++  Elf32_Off	e_shoff;		/* Section header table file offset */
++  Elf32_Word	e_flags;		/* Processor-specific flags */
++  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf32_Half	e_phentsize;		/* Program header table entry size */
++  Elf32_Half	e_phnum;		/* Program header table entry count */
++  Elf32_Half	e_shentsize;		/* Section header table entry size */
++  Elf32_Half	e_shnum;		/* Section header table entry count */
++  Elf32_Half	e_shstrndx;		/* Section header string table index */
++} Elf32_Ehdr;
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf64_Half	e_type;			/* Object file type */
++  Elf64_Half	e_machine;		/* Architecture */
++  Elf64_Word	e_version;		/* Object file version */
++  Elf64_Addr	e_entry;		/* Entry point virtual address */
++  Elf64_Off	e_phoff;		/* Program header table file offset */
++  Elf64_Off	e_shoff;		/* Section header table file offset */
++  Elf64_Word	e_flags;		/* Processor-specific flags */
++  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf64_Half	e_phentsize;		/* Program header table entry size */
++  Elf64_Half	e_phnum;		/* Program header table entry count */
++  Elf64_Half	e_shentsize;		/* Section header table entry size */
++  Elf64_Half	e_shnum;		/* Section header table entry count */
++  Elf64_Half	e_shstrndx;		/* Section header string table index */
++} Elf64_Ehdr;
++
++/* Fields in the e_ident array.  The EI_* macros are indices into the
++   array.  The macros under each EI_* macro are the values the byte
++   may have.  */
++
++#define EI_MAG0		0		/* File identification byte 0 index */
++#define ELFMAG0		0x7f		/* Magic number byte 0 */
++
++#define EI_MAG1		1		/* File identification byte 1 index */
++#define ELFMAG1		'E'		/* Magic number byte 1 */
++
++#define EI_MAG2		2		/* File identification byte 2 index */
++#define ELFMAG2		'L'		/* Magic number byte 2 */
++
++#define EI_MAG3		3		/* File identification byte 3 index */
++#define ELFMAG3		'F'		/* Magic number byte 3 */
++
++/* Conglomeration of the identification bytes, for easy testing as a word.  */
++#define	ELFMAG		"\177ELF"
++#define	SELFMAG		4
++
++#define EI_CLASS	4		/* File class byte index */
++#define ELFCLASSNONE	0		/* Invalid class */
++#define ELFCLASS32	1		/* 32-bit objects */
++#define ELFCLASS64	2		/* 64-bit objects */
++#define ELFCLASSNUM	3
++
++#define EI_DATA		5		/* Data encoding byte index */
++#define ELFDATANONE	0		/* Invalid data encoding */
++#define ELFDATA2LSB	1		/* 2's complement, little endian */
++#define ELFDATA2MSB	2		/* 2's complement, big endian */
++#define ELFDATANUM	3
++
++#define EI_VERSION	6		/* File version byte index */
++					/* Value must be EV_CURRENT */
++
++#define EI_OSABI	7		/* OS ABI identification */
++#define ELFOSABI_NONE		0	/* UNIX System V ABI */
++#define ELFOSABI_SYSV		0	/* Alias.  */
++#define ELFOSABI_HPUX		1	/* HP-UX */
++#define ELFOSABI_NETBSD		2	/* NetBSD.  */
++#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
++#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
++#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
++#define ELFOSABI_AIX		7	/* IBM AIX.  */
++#define ELFOSABI_IRIX		8	/* SGI Irix.  */
++#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
++#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
++#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
++#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
++#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
++#define ELFOSABI_ARM		97	/* ARM */
++#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
++
++#define EI_ABIVERSION	8		/* ABI version */
++
++#define EI_PAD		9		/* Byte index of padding bytes */
++
++/* Legal values for e_type (object file type).  */
++
++#define ET_NONE		0		/* No file type */
++#define ET_REL		1		/* Relocatable file */
++#define ET_EXEC		2		/* Executable file */
++#define ET_DYN		3		/* Shared object file */
++#define ET_CORE		4		/* Core file */
++#define	ET_NUM		5		/* Number of defined types */
++#define ET_LOOS		0xfe00		/* OS-specific range start */
++#define ET_HIOS		0xfeff		/* OS-specific range end */
++#define ET_LOPROC	0xff00		/* Processor-specific range start */
++#define ET_HIPROC	0xffff		/* Processor-specific range end */
++
++/* Legal values for e_machine (architecture).  */
++
++#define EM_NONE		 0		/* No machine */
++#define EM_M32		 1		/* AT&T WE 32100 */
++#define EM_SPARC	 2		/* SUN SPARC */
++#define EM_386		 3		/* Intel 80386 */
++#define EM_68K		 4		/* Motorola m68k family */
++#define EM_88K		 5		/* Motorola m88k family */
++#define EM_860		 7		/* Intel 80860 */
++#define EM_MIPS		 8		/* MIPS R3000 big-endian */
++#define EM_S370		 9		/* IBM System/370 */
++#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
++
++#define EM_PARISC	15		/* HPPA */
++#define EM_VPP500	17		/* Fujitsu VPP500 */
++#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
++#define EM_960		19		/* Intel 80960 */
++#define EM_PPC		20		/* PowerPC */
++#define EM_PPC64	21		/* PowerPC 64-bit */
++#define EM_S390		22		/* IBM S390 */
++
++#define EM_V800		36		/* NEC V800 series */
++#define EM_FR20		37		/* Fujitsu FR20 */
++#define EM_RH32		38		/* TRW RH-32 */
++#define EM_RCE		39		/* Motorola RCE */
++#define EM_ARM		40		/* ARM */
++#define EM_FAKE_ALPHA	41		/* Digital Alpha */
++#define EM_SH		42		/* Hitachi SH */
++#define EM_SPARCV9	43		/* SPARC v9 64-bit */
++#define EM_TRICORE	44		/* Siemens Tricore */
++#define EM_ARC		45		/* Argonaut RISC Core */
++#define EM_H8_300	46		/* Hitachi H8/300 */
++#define EM_H8_300H	47		/* Hitachi H8/300H */
++#define EM_H8S		48		/* Hitachi H8S */
++#define EM_H8_500	49		/* Hitachi H8/500 */
++#define EM_IA_64	50		/* Intel Merced */
++#define EM_MIPS_X	51		/* Stanford MIPS-X */
++#define EM_COLDFIRE	52		/* Motorola Coldfire */
++#define EM_68HC12	53		/* Motorola M68HC12 */
++#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP		55		/* Siemens PCP */
++#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
++#define EM_NDR1		57		/* Denso NDR1 microprocessor */
++#define EM_STARCORE	58		/* Motorola Start*Core processor */
++#define EM_ME16		59		/* Toyota ME16 processor */
++#define EM_ST100	60		/* STMicroelectronic ST100 processor */
++#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64	62		/* AMD x86-64 architecture */
++#define EM_PDSP		63		/* Sony DSP Processor */
++
++#define EM_FX66		66		/* Siemens FX66 microcontroller */
++#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
++#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
++#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
++#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
++#define EM_SVX		73		/* Silicon Graphics SVx */
++#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX		75		/* Digital VAX */
++#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
++#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY	81		/* Harvard University machine-independent object files */
++#define EM_PRISM	82		/* SiTera Prism */
++#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
++#define EM_FR30		84		/* Fujitsu FR30 */
++#define EM_D10V		85		/* Mitsubishi D10V */
++#define EM_D30V		86		/* Mitsubishi D30V */
++#define EM_V850		87		/* NEC v850 */
++#define EM_M32R		88		/* Mitsubishi M32R */
++#define EM_MN10300	89		/* Matsushita MN10300 */
++#define EM_MN10200	90		/* Matsushita MN10200 */
++#define EM_PJ		91		/* picoJava */
++#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
++#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
++#define EM_TILEPRO	188		/* Tilera TILEPro */
++#define EM_TILEGX	191		/* Tilera TILE-Gx */
++#define EM_NUM		192
++
++/* If it is necessary to assign new unofficial EM_* values, please
++   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
++   chances of collision with official or non-GNU unofficial values.  */
++
++#define EM_ALPHA	0x9026
++
++/* Legal values for e_version (version).  */
++
++#define EV_NONE		0		/* Invalid ELF version */
++#define EV_CURRENT	1		/* Current version */
++#define EV_NUM		2
++
++/* Section header.  */
++
++typedef struct
++{
++  Elf32_Word	sh_name;		/* Section name (string tbl index) */
++  Elf32_Word	sh_type;		/* Section type */
++  Elf32_Word	sh_flags;		/* Section flags */
++  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf32_Off	sh_offset;		/* Section file offset */
++  Elf32_Word	sh_size;		/* Section size in bytes */
++  Elf32_Word	sh_link;		/* Link to another section */
++  Elf32_Word	sh_info;		/* Additional section information */
++  Elf32_Word	sh_addralign;		/* Section alignment */
++  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
++} Elf32_Shdr;
++
++typedef struct
++{
++  Elf64_Word	sh_name;		/* Section name (string tbl index) */
++  Elf64_Word	sh_type;		/* Section type */
++  Elf64_Xword	sh_flags;		/* Section flags */
++  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf64_Off	sh_offset;		/* Section file offset */
++  Elf64_Xword	sh_size;		/* Section size in bytes */
++  Elf64_Word	sh_link;		/* Link to another section */
++  Elf64_Word	sh_info;		/* Additional section information */
++  Elf64_Xword	sh_addralign;		/* Section alignment */
++  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
++} Elf64_Shdr;
++
++/* Special section indices.  */
++
++#define SHN_UNDEF	0		/* Undefined section */
++#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
++#define SHN_LOPROC	0xff00		/* Start of processor-specific */
++#define SHN_BEFORE	0xff00		/* Order section before all others
++					   (Solaris).  */
++#define SHN_AFTER	0xff01		/* Order section after all others
++					   (Solaris).  */
++#define SHN_HIPROC	0xff1f		/* End of processor-specific */
++#define SHN_LOOS	0xff20		/* Start of OS-specific */
++#define SHN_HIOS	0xff3f		/* End of OS-specific */
++#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
++#define SHN_COMMON	0xfff2		/* Associated symbol is common */
++#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
++#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
++
++/* Legal values for sh_type (section type).  */
++
++#define SHT_NULL	  0		/* Section header table entry unused */
++#define SHT_PROGBITS	  1		/* Program data */
++#define SHT_SYMTAB	  2		/* Symbol table */
++#define SHT_STRTAB	  3		/* String table */
++#define SHT_RELA	  4		/* Relocation entries with addends */
++#define SHT_HASH	  5		/* Symbol hash table */
++#define SHT_DYNAMIC	  6		/* Dynamic linking information */
++#define SHT_NOTE	  7		/* Notes */
++#define SHT_NOBITS	  8		/* Program space with no data (bss) */
++#define SHT_REL		  9		/* Relocation entries, no addends */
++#define SHT_SHLIB	  10		/* Reserved */
++#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
++#define SHT_INIT_ARRAY	  14		/* Array of constructors */
++#define SHT_FINI_ARRAY	  15		/* Array of destructors */
++#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
++#define SHT_GROUP	  17		/* Section group */
++#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
++#define	SHT_NUM		  19		/* Number of defined types.  */
++#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
++#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
++#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
++#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
++#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
++#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
++#define SHT_SUNW_move	  0x6ffffffa
++#define SHT_SUNW_COMDAT   0x6ffffffb
++#define SHT_SUNW_syminfo  0x6ffffffc
++#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
++#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
++#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
++#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
++#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
++#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
++#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
++#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
++#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
++
++/* Legal values for sh_flags (section flags).  */
++
++#define SHF_WRITE	     (1 << 0)	/* Writable */
++#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
++#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
++#define SHF_MERGE	     (1 << 4)	/* Might be merged */
++#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
++#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
++#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
++#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
++					   required */
++#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
++#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
++#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
++#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
++#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
++					   (Solaris).  */
++#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
++					   referenced or allocated (Solaris).*/
++
++/* Section group handling.  */
++#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
++
++/* Symbol table entry.  */
++
++typedef struct
++{
++  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
++  Elf32_Addr	st_value;		/* Symbol value */
++  Elf32_Word	st_size;		/* Symbol size */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char	st_other;		/* Symbol visibility */
++  Elf32_Section	st_shndx;		/* Section index */
++} Elf32_Sym;
++
++typedef struct
++{
++  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char st_other;		/* Symbol visibility */
++  Elf64_Section	st_shndx;		/* Section index */
++  Elf64_Addr	st_value;		/* Symbol value */
++  Elf64_Xword	st_size;		/* Symbol size */
++} Elf64_Sym;
++
++/* The syminfo section if available contains additional information about
++   every dynamic symbol.  */
++
++typedef struct
++{
++  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf32_Half si_flags;			/* Per symbol flags */
++} Elf32_Syminfo;
++
++typedef struct
++{
++  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf64_Half si_flags;			/* Per symbol flags */
++} Elf64_Syminfo;
++
++/* Possible values for si_boundto.  */
++#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
++#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
++#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
++
++/* Possible bitmasks for si_flags.  */
++#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
++#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
++#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
++#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
++					   loaded */
++/* Syminfo version values.  */
++#define SYMINFO_NONE		0
++#define SYMINFO_CURRENT		1
++#define SYMINFO_NUM		2
++
++
++/* How to extract and insert information held in the st_info field.  */
++
++#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
++#define ELF32_ST_TYPE(val)		((val) & 0xf)
++#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
++
++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
++#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
++#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
++#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
++
++/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
++
++#define STB_LOCAL	0		/* Local symbol */
++#define STB_GLOBAL	1		/* Global symbol */
++#define STB_WEAK	2		/* Weak symbol */
++#define	STB_NUM		3		/* Number of defined types.  */
++#define STB_LOOS	10		/* Start of OS-specific */
++#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
++#define STB_HIOS	12		/* End of OS-specific */
++#define STB_LOPROC	13		/* Start of processor-specific */
++#define STB_HIPROC	15		/* End of processor-specific */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_NOTYPE	0		/* Symbol type is unspecified */
++#define STT_OBJECT	1		/* Symbol is a data object */
++#define STT_FUNC	2		/* Symbol is a code object */
++#define STT_SECTION	3		/* Symbol associated with a section */
++#define STT_FILE	4		/* Symbol's name is file name */
++#define STT_COMMON	5		/* Symbol is a common data object */
++#define STT_TLS		6		/* Symbol is thread-local data object*/
++#define	STT_NUM		7		/* Number of defined types.  */
++#define STT_LOOS	10		/* Start of OS-specific */
++#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
++#define STT_HIOS	12		/* End of OS-specific */
++#define STT_LOPROC	13		/* Start of processor-specific */
++#define STT_HIPROC	15		/* End of processor-specific */
++
++
++/* Symbol table indices are found in the hash buckets and chain table
++   of a symbol hash table section.  This special index value indicates
++   the end of a chain, meaning no further symbols are found in that bucket.  */
++
++#define STN_UNDEF	0		/* End of a chain.  */
++
++
++/* How to extract and insert information held in the st_other field.  */
++
++#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
++
++/* For ELF64 the definitions are the same.  */
++#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
++
++/* Symbol visibility specification encoded in the st_other field.  */
++#define STV_DEFAULT	0		/* Default symbol visibility rules */
++#define STV_INTERNAL	1		/* Processor specific hidden class */
++#define STV_HIDDEN	2		/* Sym unavailable in other modules */
++#define STV_PROTECTED	3		/* Not preemptible, not exported */
++
++
++/* Relocation table entry without addend (in section of type SHT_REL).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++} Elf32_Rel;
++
++/* I have seen two different definitions of the Elf64_Rel and
++   Elf64_Rela structures, so we'll leave them out until Novell (or
++   whoever) gets their act together.  */
++/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++} Elf64_Rel;
++
++/* Relocation table entry with addend (in section of type SHT_RELA).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++  Elf32_Sword	r_addend;		/* Addend */
++} Elf32_Rela;
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++  Elf64_Sxword	r_addend;		/* Addend */
++} Elf64_Rela;
++
++/* How to extract and insert information held in the r_info field.  */
++
++#define ELF32_R_SYM(val)		((val) >> 8)
++#define ELF32_R_TYPE(val)		((val) & 0xff)
++#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
++
++#define ELF64_R_SYM(i)			((i) >> 32)
++#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
++#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
++
++/* Program segment header.  */
++
++typedef struct
++{
++  Elf32_Word	p_type;			/* Segment type */
++  Elf32_Off	p_offset;		/* Segment file offset */
++  Elf32_Addr	p_vaddr;		/* Segment virtual address */
++  Elf32_Addr	p_paddr;		/* Segment physical address */
++  Elf32_Word	p_filesz;		/* Segment size in file */
++  Elf32_Word	p_memsz;		/* Segment size in memory */
++  Elf32_Word	p_flags;		/* Segment flags */
++  Elf32_Word	p_align;		/* Segment alignment */
++} Elf32_Phdr;
++
++typedef struct
++{
++  Elf64_Word	p_type;			/* Segment type */
++  Elf64_Word	p_flags;		/* Segment flags */
++  Elf64_Off	p_offset;		/* Segment file offset */
++  Elf64_Addr	p_vaddr;		/* Segment virtual address */
++  Elf64_Addr	p_paddr;		/* Segment physical address */
++  Elf64_Xword	p_filesz;		/* Segment size in file */
++  Elf64_Xword	p_memsz;		/* Segment size in memory */
++  Elf64_Xword	p_align;		/* Segment alignment */
++} Elf64_Phdr;
++
++/* Special value for e_phnum.  This indicates that the real number of
++   program headers is too large to fit into e_phnum.  Instead the real
++   value is in the field sh_info of section 0.  */
++
++#define PN_XNUM		0xffff
++
++/* Legal values for p_type (segment type).  */
++
++#define	PT_NULL		0		/* Program header table entry unused */
++#define PT_LOAD		1		/* Loadable program segment */
++#define PT_DYNAMIC	2		/* Dynamic linking information */
++#define PT_INTERP	3		/* Program interpreter */
++#define PT_NOTE		4		/* Auxiliary information */
++#define PT_SHLIB	5		/* Reserved */
++#define PT_PHDR		6		/* Entry for header table itself */
++#define PT_TLS		7		/* Thread-local storage segment */
++#define	PT_NUM		8		/* Number of defined types */
++#define PT_LOOS		0x60000000	/* Start of OS-specific */
++#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
++#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
++#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
++#define PT_LOSUNW	0x6ffffffa
++#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
++#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
++#define PT_HISUNW	0x6fffffff
++#define PT_HIOS		0x6fffffff	/* End of OS-specific */
++#define PT_LOPROC	0x70000000	/* Start of processor-specific */
++#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
++
++/* Legal values for p_flags (segment flags).  */
++
++#define PF_X		(1 << 0)	/* Segment is executable */
++#define PF_W		(1 << 1)	/* Segment is writable */
++#define PF_R		(1 << 2)	/* Segment is readable */
++#define PF_MASKOS	0x0ff00000	/* OS-specific */
++#define PF_MASKPROC	0xf0000000	/* Processor-specific */
++
++/* Legal values for note segment descriptor types for core files. */
++
++#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
++#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
++#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
++#define NT_PRXREG	4		/* Contains copy of prxregset struct */
++#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
++#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
++#define NT_AUXV		6		/* Contains copy of auxv array */
++#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
++#define NT_ASRS		8		/* Contains copy of asrset struct */
++#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
++#define NT_PSINFO	13		/* Contains copy of psinfo struct */
++#define NT_PRCRED	14		/* Contains copy of prcred struct */
++#define NT_UTSNAME	15		/* Contains copy of utsname struct */
++#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
++#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
++#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
++#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
++#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
++#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
++#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
++#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
++#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
++#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
++
++/* Legal values for the note segment descriptor types for object files.  */
++
++#define NT_VERSION	1		/* Contains a version string.  */
++
++
++/* Dynamic section entry.  */
++
++typedef struct
++{
++  Elf32_Sword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf32_Word d_val;			/* Integer value */
++      Elf32_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf32_Dyn;
++
++typedef struct
++{
++  Elf64_Sxword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf64_Xword d_val;		/* Integer value */
++      Elf64_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf64_Dyn;
++
++/* Legal values for d_tag (dynamic entry type).  */
++
++#define DT_NULL		0		/* Marks end of dynamic section */
++#define DT_NEEDED	1		/* Name of needed library */
++#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
++#define DT_PLTGOT	3		/* Processor defined value */
++#define DT_HASH		4		/* Address of symbol hash table */
++#define DT_STRTAB	5		/* Address of string table */
++#define DT_SYMTAB	6		/* Address of symbol table */
++#define DT_RELA		7		/* Address of Rela relocs */
++#define DT_RELASZ	8		/* Total size of Rela relocs */
++#define DT_RELAENT	9		/* Size of one Rela reloc */
++#define DT_STRSZ	10		/* Size of string table */
++#define DT_SYMENT	11		/* Size of one symbol table entry */
++#define DT_INIT		12		/* Address of init function */
++#define DT_FINI		13		/* Address of termination function */
++#define DT_SONAME	14		/* Name of shared object */
++#define DT_RPATH	15		/* Library search path (deprecated) */
++#define DT_SYMBOLIC	16		/* Start symbol search here */
++#define DT_REL		17		/* Address of Rel relocs */
++#define DT_RELSZ	18		/* Total size of Rel relocs */
++#define DT_RELENT	19		/* Size of one Rel reloc */
++#define DT_PLTREL	20		/* Type of reloc in PLT */
++#define DT_DEBUG	21		/* For debugging; unspecified */
++#define DT_TEXTREL	22		/* Reloc might modify .text */
++#define DT_JMPREL	23		/* Address of PLT relocs */
++#define	DT_BIND_NOW	24		/* Process relocations of object */
++#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
++#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
++#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
++#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
++#define DT_RUNPATH	29		/* Library search path */
++#define DT_FLAGS	30		/* Flags for the object being loaded */
++#define DT_ENCODING	32		/* Start of encoded range */
++#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
++#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
++#define	DT_NUM		34		/* Number used */
++#define DT_LOOS		0x6000000d	/* Start of OS-specific */
++#define DT_HIOS		0x6ffff000	/* End of OS-specific */
++#define DT_LOPROC	0x70000000	/* Start of processor-specific */
++#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
++#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
++
++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
++   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
++   approach.  */
++#define DT_VALRNGLO	0x6ffffd00
++#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
++#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
++#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
++#define DT_CHECKSUM	0x6ffffdf8
++#define DT_PLTPADSZ	0x6ffffdf9
++#define DT_MOVEENT	0x6ffffdfa
++#define DT_MOVESZ	0x6ffffdfb
++#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
++#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
++					   the following DT_* entry.  */
++#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
++#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
++#define DT_VALRNGHI	0x6ffffdff
++#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
++#define DT_VALNUM 12
++
++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
++   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
++
++   If any adjustment is made to the ELF object after it has been
++   built these entries will need to be adjusted.  */
++#define DT_ADDRRNGLO	0x6ffffe00
++#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
++#define DT_TLSDESC_PLT	0x6ffffef6
++#define DT_TLSDESC_GOT	0x6ffffef7
++#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
++#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
++#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
++#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
++#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
++#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
++#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
++#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
++#define DT_ADDRRNGHI	0x6ffffeff
++#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
++#define DT_ADDRNUM 11
++
++/* The versioning entry types.  The next are defined as part of the
++   GNU extension.  */
++#define DT_VERSYM	0x6ffffff0
++
++#define DT_RELACOUNT	0x6ffffff9
++#define DT_RELCOUNT	0x6ffffffa
++
++/* These were chosen by Sun.  */
++#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
++#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
++					   table */
++#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
++#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
++					   versions */
++#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
++#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
++#define DT_VERSIONTAGNUM 16
++
++/* Sun added these machine-independent extensions in the "processor-specific"
++   range.  Be compatible.  */
++#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
++#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
++#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
++#define DT_EXTRANUM	3
++
++/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
++#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
++#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
++#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
++#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
++#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
++
++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
++   entry in the dynamic section.  */
++#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
++#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
++#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
++#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
++#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
++#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
++#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
++#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
++#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
++#define DF_1_TRANS	0x00000200
++#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
++#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
++#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
++#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
++#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
++#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
++#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
++
++/* Flags for the feature selection in DT_FEATURE_1.  */
++#define DTF_1_PARINIT	0x00000001
++#define DTF_1_CONFEXP	0x00000002
++
++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
++#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
++#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
++					   generally available.  */
++
++/* Version definition sections.  */
++
++typedef struct
++{
++  Elf32_Half	vd_version;		/* Version revision */
++  Elf32_Half	vd_flags;		/* Version information */
++  Elf32_Half	vd_ndx;			/* Version Index */
++  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vd_hash;		/* Version name hash value */
++  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf32_Verdef;
++
++typedef struct
++{
++  Elf64_Half	vd_version;		/* Version revision */
++  Elf64_Half	vd_flags;		/* Version information */
++  Elf64_Half	vd_ndx;			/* Version Index */
++  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vd_hash;		/* Version name hash value */
++  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf64_Verdef;
++
++
++/* Legal values for vd_version (version revision).  */
++#define VER_DEF_NONE	0		/* No version */
++#define VER_DEF_CURRENT	1		/* Current version */
++#define VER_DEF_NUM	2		/* Given version number */
++
++/* Legal values for vd_flags (version information flags).  */
++#define VER_FLG_BASE	0x1		/* Version definition of file itself */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++/* Versym symbol index values.  */
++#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
++#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
++#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
++#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
++
++/* Auxialiary version information.  */
++
++typedef struct
++{
++  Elf32_Word	vda_name;		/* Version or dependency names */
++  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf32_Verdaux;
++
++typedef struct
++{
++  Elf64_Word	vda_name;		/* Version or dependency names */
++  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf64_Verdaux;
++
++
++/* Version dependency section.  */
++
++typedef struct
++{
++  Elf32_Half	vn_version;		/* Version of structure */
++  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf32_Verneed;
++
++typedef struct
++{
++  Elf64_Half	vn_version;		/* Version of structure */
++  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf64_Verneed;
++
++
++/* Legal values for vn_version (version revision).  */
++#define VER_NEED_NONE	 0		/* No version */
++#define VER_NEED_CURRENT 1		/* Current version */
++#define VER_NEED_NUM	 2		/* Given version number */
++
++/* Auxiliary needed version information.  */
++
++typedef struct
++{
++  Elf32_Word	vna_hash;		/* Hash value of dependency name */
++  Elf32_Half	vna_flags;		/* Dependency specific information */
++  Elf32_Half	vna_other;		/* Unused */
++  Elf32_Word	vna_name;		/* Dependency name string offset */
++  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf32_Vernaux;
++
++typedef struct
++{
++  Elf64_Word	vna_hash;		/* Hash value of dependency name */
++  Elf64_Half	vna_flags;		/* Dependency specific information */
++  Elf64_Half	vna_other;		/* Unused */
++  Elf64_Word	vna_name;		/* Dependency name string offset */
++  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf64_Vernaux;
++
++
++/* Legal values for vna_flags.  */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++
++/* Auxiliary vector.  */
++
++/* This vector is normally only used by the program interpreter.  The
++   usual definition in an ABI supplement uses the name auxv_t.  The
++   vector is not usually defined in a standard <elf.h> file, but it
++   can't hurt.  We rename it to avoid conflicts.  The sizes of these
++   types are an arrangement between the exec server and the program
++   interpreter, so we don't fully specify them here.  */
++
++typedef struct
++{
++  uint32_t a_type;		/* Entry type */
++  union
++    {
++      uint32_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf32_auxv_t;
++
++typedef struct
++{
++  uint64_t a_type;		/* Entry type */
++  union
++    {
++      uint64_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf64_auxv_t;
++
++/* Legal values for a_type (entry type).  */
++
++#define AT_NULL		0		/* End of vector */
++#define AT_IGNORE	1		/* Entry should be ignored */
++#define AT_EXECFD	2		/* File descriptor of program */
++#define AT_PHDR		3		/* Program headers for program */
++#define AT_PHENT	4		/* Size of program header entry */
++#define AT_PHNUM	5		/* Number of program headers */
++#define AT_PAGESZ	6		/* System page size */
++#define AT_BASE		7		/* Base address of interpreter */
++#define AT_FLAGS	8		/* Flags */
++#define AT_ENTRY	9		/* Entry point of program */
++#define AT_NOTELF	10		/* Program is not ELF */
++#define AT_UID		11		/* Real uid */
++#define AT_EUID		12		/* Effective uid */
++#define AT_GID		13		/* Real gid */
++#define AT_EGID		14		/* Effective gid */
++#define AT_CLKTCK	17		/* Frequency of times() */
++
++/* Some more special a_type values describing the hardware.  */
++#define AT_PLATFORM	15		/* String identifying platform.  */
++#define AT_HWCAP	16		/* Machine dependent hints about
++					   processor capabilities.  */
++
++/* This entry gives some information about the FPU initialization
++   performed by the kernel.  */
++#define AT_FPUCW	18		/* Used FPU control word.  */
++
++/* Cache block sizes.  */
++#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
++#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
++#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
++
++/* A special ignored value for PPC, used by the kernel to control the
++   interpretation of the AUXV. Must be > 16.  */
++#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
++
++#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
++
++#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
++
++#define AT_RANDOM	25		/* Address of 16 random bytes.  */
++
++#define AT_EXECFN	31		/* Filename of executable.  */
++
++/* Pointer to the global system page used for system calls and other
++   nice things.  */
++#define AT_SYSINFO	32
++#define AT_SYSINFO_EHDR	33
++
++/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
++   log2 of line size; mask those to get cache size.  */
++#define AT_L1I_CACHESHAPE	34
++#define AT_L1D_CACHESHAPE	35
++#define AT_L2_CACHESHAPE	36
++#define AT_L3_CACHESHAPE	37
++
++/* Note section contents.  Each entry in the note section begins with
++   a header of a fixed form.  */
++
++typedef struct
++{
++  Elf32_Word n_namesz;			/* Length of the note's name.  */
++  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf32_Word n_type;			/* Type of the note.  */
++} Elf32_Nhdr;
++
++typedef struct
++{
++  Elf64_Word n_namesz;			/* Length of the note's name.  */
++  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf64_Word n_type;			/* Type of the note.  */
++} Elf64_Nhdr;
++
++/* Known names of notes.  */
++
++/* Solaris entries in the note section have this name.  */
++#define ELF_NOTE_SOLARIS	"SUNW Solaris"
++
++/* Note entries for GNU systems have this name.  */
++#define ELF_NOTE_GNU		"GNU"
++
++
++/* Defined types of notes for Solaris.  */
++
++/* Value of descriptor (one word) is desired pagesize for the binary.  */
++#define ELF_NOTE_PAGESIZE_HINT	1
++
++
++/* Defined note types for GNU systems.  */
++
++/* ABI information.  The descriptor consists of words:
++   word 0: OS descriptor
++   word 1: major version of the ABI
++   word 2: minor version of the ABI
++   word 3: subminor version of the ABI
++*/
++#define NT_GNU_ABI_TAG	1
++#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
++
++/* Known OSes.  These values can appear in word 0 of an
++   NT_GNU_ABI_TAG note section entry.  */
++#define ELF_NOTE_OS_LINUX	0
++#define ELF_NOTE_OS_GNU		1
++#define ELF_NOTE_OS_SOLARIS2	2
++#define ELF_NOTE_OS_FREEBSD	3
++
++/* Synthetic hwcap information.  The descriptor begins with two words:
++   word 0: number of entries
++   word 1: bitmask of enabled entries
++   Then follow variable-length entries, one byte followed by a
++   '\0'-terminated hwcap name string.  The byte gives the bit
++   number to test if enabled, (1U << bit) & bitmask.  */
++#define NT_GNU_HWCAP	2
++
++/* Build ID bits as generated by ld --build-id.
++   The descriptor consists of any nonzero number of bytes.  */
++#define NT_GNU_BUILD_ID	3
++
++/* Version note generated by GNU gold containing a version string.  */
++#define NT_GNU_GOLD_VERSION	4
++
++
++/* Move records.  */
++typedef struct
++{
++  Elf32_Xword m_value;		/* Symbol value.  */
++  Elf32_Word m_info;		/* Size and index.  */
++  Elf32_Word m_poffset;		/* Symbol offset.  */
++  Elf32_Half m_repeat;		/* Repeat count.  */
++  Elf32_Half m_stride;		/* Stride info.  */
++} Elf32_Move;
++
++typedef struct
++{
++  Elf64_Xword m_value;		/* Symbol value.  */
++  Elf64_Xword m_info;		/* Size and index.  */
++  Elf64_Xword m_poffset;	/* Symbol offset.  */
++  Elf64_Half m_repeat;		/* Repeat count.  */
++  Elf64_Half m_stride;		/* Stride info.  */
++} Elf64_Move;
++
++/* Macro to construct move records.  */
++#define ELF32_M_SYM(info)	((info) >> 8)
++#define ELF32_M_SIZE(info)	((unsigned char) (info))
++#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
++
++#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
++#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
++#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
++
++
++/* Motorola 68k specific definitions.  */
++
++/* Values for Elf32_Ehdr.e_flags.  */
++#define EF_CPU32	0x00810000
++
++/* m68k relocs.  */
++
++#define R_68K_NONE	0		/* No reloc */
++#define R_68K_32	1		/* Direct 32 bit  */
++#define R_68K_16	2		/* Direct 16 bit  */
++#define R_68K_8		3		/* Direct 8 bit  */
++#define R_68K_PC32	4		/* PC relative 32 bit */
++#define R_68K_PC16	5		/* PC relative 16 bit */
++#define R_68K_PC8	6		/* PC relative 8 bit */
++#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
++#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
++#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
++#define R_68K_GOT32O	10		/* 32 bit GOT offset */
++#define R_68K_GOT16O	11		/* 16 bit GOT offset */
++#define R_68K_GOT8O	12		/* 8 bit GOT offset */
++#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
++#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
++#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
++#define R_68K_PLT32O	16		/* 32 bit PLT offset */
++#define R_68K_PLT16O	17		/* 16 bit PLT offset */
++#define R_68K_PLT8O	18		/* 8 bit PLT offset */
++#define R_68K_COPY	19		/* Copy symbol at runtime */
++#define R_68K_GLOB_DAT	20		/* Create GOT entry */
++#define R_68K_JMP_SLOT	21		/* Create PLT entry */
++#define R_68K_RELATIVE	22		/* Adjust by program base */
++#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
++#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
++#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
++#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
++#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
++#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
++#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
++#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
++#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
++#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
++#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
++#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
++#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
++#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
++#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
++/* Keep this the last entry.  */
++#define R_68K_NUM	43
++
++/* Intel 80386 specific definitions.  */
++
++/* i386 relocs.  */
++
++#define R_386_NONE	   0		/* No reloc */
++#define R_386_32	   1		/* Direct 32 bit  */
++#define R_386_PC32	   2		/* PC relative 32 bit */
++#define R_386_GOT32	   3		/* 32 bit GOT entry */
++#define R_386_PLT32	   4		/* 32 bit PLT address */
++#define R_386_COPY	   5		/* Copy symbol at runtime */
++#define R_386_GLOB_DAT	   6		/* Create GOT entry */
++#define R_386_JMP_SLOT	   7		/* Create PLT entry */
++#define R_386_RELATIVE	   8		/* Adjust by program base */
++#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
++#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
++#define R_386_32PLT	   11
++#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
++#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
++					   block offset */
++#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
++					   offset */
++#define R_386_TLS_LE	   17		/* Offset relative to static TLS
++					   block */
++#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
++					   general dynamic thread local data */
++#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
++					   local dynamic thread local data
++					   in LE code */
++#define R_386_16	   20
++#define R_386_PC16	   21
++#define R_386_8		   22
++#define R_386_PC8	   23
++#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
++					   thread local data */
++#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
++#define R_386_TLS_GD_CALL  26		/* Relocation for call to
++					   __tls_get_addr() */
++#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
++#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
++					   thread local data in LE code */
++#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
++#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
++					   __tls_get_addr() in LDM code */
++#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
++#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
++#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
++					   block offset */
++#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
++					   TLS block */
++#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
++#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
++#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
++/* 38? */
++#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
++#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
++					   descriptor for
++					   relaxation.  */
++#define R_386_TLS_DESC     41		/* TLS descriptor containing
++					   pointer to code and to
++					   argument, returning the TLS
++					   offset for the symbol.  */
++#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
++/* Keep this the last entry.  */
++#define R_386_NUM	   43
++
++/* SUN SPARC specific definitions.  */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
++
++/* Values for Elf64_Ehdr.e_flags.  */
++
++#define EF_SPARCV9_MM		3
++#define EF_SPARCV9_TSO		0
++#define EF_SPARCV9_PSO		1
++#define EF_SPARCV9_RMO		2
++#define EF_SPARC_LEDATA		0x800000 /* little endian data */
++#define EF_SPARC_EXT_MASK	0xFFFF00
++#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
++#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
++#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
++#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
++
++/* SPARC relocs.  */
++
++#define R_SPARC_NONE		0	/* No reloc */
++#define R_SPARC_8		1	/* Direct 8 bit */
++#define R_SPARC_16		2	/* Direct 16 bit */
++#define R_SPARC_32		3	/* Direct 32 bit */
++#define R_SPARC_DISP8		4	/* PC relative 8 bit */
++#define R_SPARC_DISP16		5	/* PC relative 16 bit */
++#define R_SPARC_DISP32		6	/* PC relative 32 bit */
++#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
++#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
++#define R_SPARC_HI22		9	/* High 22 bit */
++#define R_SPARC_22		10	/* Direct 22 bit */
++#define R_SPARC_13		11	/* Direct 13 bit */
++#define R_SPARC_LO10		12	/* Truncated 10 bit */
++#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
++#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
++#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
++#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
++#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
++#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
++#define R_SPARC_COPY		19	/* Copy symbol at runtime */
++#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
++#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
++#define R_SPARC_RELATIVE	22	/* Adjust by program base */
++#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
++
++/* Additional Sparc64 relocs.  */
++
++#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
++#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
++#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
++#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
++#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
++#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
++#define R_SPARC_10		30	/* Direct 10 bit */
++#define R_SPARC_11		31	/* Direct 11 bit */
++#define R_SPARC_64		32	/* Direct 64 bit */
++#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
++#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
++#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
++#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
++#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
++#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
++#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
++#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
++#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
++#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
++#define R_SPARC_7		43	/* Direct 7 bit */
++#define R_SPARC_5		44	/* Direct 5 bit */
++#define R_SPARC_6		45	/* Direct 6 bit */
++#define R_SPARC_DISP64		46	/* PC relative 64 bit */
++#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
++#define R_SPARC_HIX22		48	/* High 22 bit complemented */
++#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
++#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
++#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
++#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
++#define R_SPARC_REGISTER	53	/* Global register usage */
++#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
++#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
++#define R_SPARC_TLS_GD_HI22	56
++#define R_SPARC_TLS_GD_LO10	57
++#define R_SPARC_TLS_GD_ADD	58
++#define R_SPARC_TLS_GD_CALL	59
++#define R_SPARC_TLS_LDM_HI22	60
++#define R_SPARC_TLS_LDM_LO10	61
++#define R_SPARC_TLS_LDM_ADD	62
++#define R_SPARC_TLS_LDM_CALL	63
++#define R_SPARC_TLS_LDO_HIX22	64
++#define R_SPARC_TLS_LDO_LOX10	65
++#define R_SPARC_TLS_LDO_ADD	66
++#define R_SPARC_TLS_IE_HI22	67
++#define R_SPARC_TLS_IE_LO10	68
++#define R_SPARC_TLS_IE_LD	69
++#define R_SPARC_TLS_IE_LDX	70
++#define R_SPARC_TLS_IE_ADD	71
++#define R_SPARC_TLS_LE_HIX22	72
++#define R_SPARC_TLS_LE_LOX10	73
++#define R_SPARC_TLS_DTPMOD32	74
++#define R_SPARC_TLS_DTPMOD64	75
++#define R_SPARC_TLS_DTPOFF32	76
++#define R_SPARC_TLS_DTPOFF64	77
++#define R_SPARC_TLS_TPOFF32	78
++#define R_SPARC_TLS_TPOFF64	79
++#define R_SPARC_GOTDATA_HIX22	80
++#define R_SPARC_GOTDATA_LOX10	81
++#define R_SPARC_GOTDATA_OP_HIX22	82
++#define R_SPARC_GOTDATA_OP_LOX10	83
++#define R_SPARC_GOTDATA_OP	84
++#define R_SPARC_H34		85
++#define R_SPARC_SIZE32		86
++#define R_SPARC_SIZE64		87
++#define R_SPARC_WDISP10		88
++#define R_SPARC_JMP_IREL	248
++#define R_SPARC_IRELATIVE	249
++#define R_SPARC_GNU_VTINHERIT	250
++#define R_SPARC_GNU_VTENTRY	251
++#define R_SPARC_REV32		252
++/* Keep this the last entry.  */
++#define R_SPARC_NUM		253
++
++/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
++
++#define DT_SPARC_REGISTER 0x70000001
++#define DT_SPARC_NUM	2
++
++/* MIPS R3000 specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
++#define EF_MIPS_PIC	    2		/* Contains PIC code */
++#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
++#define EF_MIPS_XGOT	    8
++#define EF_MIPS_64BIT_WHIRL 16
++#define EF_MIPS_ABI2	    32
++#define EF_MIPS_ABI_ON32    64
++#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
++
++/* Legal values for MIPS architecture level.  */
++
++#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
++#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
++#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
++#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
++#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
++#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
++#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
++
++/* The following are non-official names and should not be used.  */
++
++#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
++#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
++#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
++#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
++#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
++#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
++#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
++
++/* Special section indices.  */
++
++#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
++#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
++#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
++#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
++#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
++#define SHT_MIPS_MSYM	       0x70000001
++#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
++#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
++#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
++#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
++#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
++#define SHT_MIPS_PACKAGE       0x70000007
++#define SHT_MIPS_PACKSYM       0x70000008
++#define SHT_MIPS_RELD	       0x70000009
++#define SHT_MIPS_IFACE         0x7000000b
++#define SHT_MIPS_CONTENT       0x7000000c
++#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
++#define SHT_MIPS_SHDR	       0x70000010
++#define SHT_MIPS_FDESC	       0x70000011
++#define SHT_MIPS_EXTSYM	       0x70000012
++#define SHT_MIPS_DENSE	       0x70000013
++#define SHT_MIPS_PDESC	       0x70000014
++#define SHT_MIPS_LOCSYM	       0x70000015
++#define SHT_MIPS_AUXSYM	       0x70000016
++#define SHT_MIPS_OPTSYM	       0x70000017
++#define SHT_MIPS_LOCSTR	       0x70000018
++#define SHT_MIPS_LINE	       0x70000019
++#define SHT_MIPS_RFDESC	       0x7000001a
++#define SHT_MIPS_DELTASYM      0x7000001b
++#define SHT_MIPS_DELTAINST     0x7000001c
++#define SHT_MIPS_DELTACLASS    0x7000001d
++#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
++#define SHT_MIPS_DELTADECL     0x7000001f
++#define SHT_MIPS_SYMBOL_LIB    0x70000020
++#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
++#define SHT_MIPS_TRANSLATE     0x70000022
++#define SHT_MIPS_PIXIE	       0x70000023
++#define SHT_MIPS_XLATE	       0x70000024
++#define SHT_MIPS_XLATE_DEBUG   0x70000025
++#define SHT_MIPS_WHIRL	       0x70000026
++#define SHT_MIPS_EH_REGION     0x70000027
++#define SHT_MIPS_XLATE_OLD     0x70000028
++#define SHT_MIPS_PDR_EXCEPTION 0x70000029
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
++#define SHF_MIPS_MERGE	 0x20000000
++#define SHF_MIPS_ADDR	 0x40000000
++#define SHF_MIPS_STRINGS 0x80000000
++#define SHF_MIPS_NOSTRIP 0x08000000
++#define SHF_MIPS_LOCAL	 0x04000000
++#define SHF_MIPS_NAMES	 0x02000000
++#define SHF_MIPS_NODUPE	 0x01000000
++
++
++/* Symbol tables.  */
++
++/* MIPS specific values for `st_other'.  */
++#define STO_MIPS_DEFAULT		0x0
++#define STO_MIPS_INTERNAL		0x1
++#define STO_MIPS_HIDDEN			0x2
++#define STO_MIPS_PROTECTED		0x3
++#define STO_MIPS_PLT			0x8
++#define STO_MIPS_SC_ALIGN_UNUSED	0xff
++
++/* MIPS specific values for `st_info'.  */
++#define STB_MIPS_SPLIT_COMMON		13
++
++/* Entries found in sections of type SHT_MIPS_GPTAB.  */
++
++typedef union
++{
++  struct
++    {
++      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
++      Elf32_Word gt_unused;		/* Not used */
++    } gt_header;			/* First entry in section */
++  struct
++    {
++      Elf32_Word gt_g_value;		/* If this value were used for -G */
++      Elf32_Word gt_bytes;		/* This many bytes would be used */
++    } gt_entry;				/* Subsequent entries in section */
++} Elf32_gptab;
++
++/* Entry found in sections of type SHT_MIPS_REGINFO.  */
++
++typedef struct
++{
++  Elf32_Word	ri_gprmask;		/* General registers used */
++  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
++  Elf32_Sword	ri_gp_value;		/* $gp register value */
++} Elf32_RegInfo;
++
++/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
++
++typedef struct
++{
++  unsigned char kind;		/* Determines interpretation of the
++				   variable part of descriptor.  */
++  unsigned char size;		/* Size of descriptor, including header.  */
++  Elf32_Section section;	/* Section header index of section affected,
++				   0 for global options.  */
++  Elf32_Word info;		/* Kind-specific information.  */
++} Elf_Options;
++
++/* Values for `kind' field in Elf_Options.  */
++
++#define ODK_NULL	0	/* Undefined.  */
++#define ODK_REGINFO	1	/* Register usage information.  */
++#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
++#define ODK_PAD		3	/* Section padding options.  */
++#define ODK_HWPATCH	4	/* Hardware workarounds performed */
++#define ODK_FILL	5	/* record the fill value used by the linker. */
++#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
++#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
++#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
++
++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
++
++#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
++#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
++#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
++#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
++#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
++#define OEX_PRECISEFP	OEX_FPDBUG
++#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
++
++#define OEX_FPU_INVAL	0x10
++#define OEX_FPU_DIV0	0x08
++#define OEX_FPU_OFLO	0x04
++#define OEX_FPU_UFLO	0x02
++#define OEX_FPU_INEX	0x01
++
++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
++
++#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
++#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
++#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
++#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
++
++#define OPAD_PREFIX	0x1
++#define OPAD_POSTFIX	0x2
++#define OPAD_SYMBOL	0x4
++
++/* Entry found in `.options' section.  */
++
++typedef struct
++{
++  Elf32_Word hwp_flags1;	/* Extra flags.  */
++  Elf32_Word hwp_flags2;	/* Extra flags.  */
++} Elf_Options_Hw;
++
++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
++
++#define OHWA0_R4KEOP_CHECKED	0x00000001
++#define OHWA1_R4KEOP_CLEAN	0x00000002
++
++/* MIPS relocs.  */
++
++#define R_MIPS_NONE		0	/* No reloc */
++#define R_MIPS_16		1	/* Direct 16 bit */
++#define R_MIPS_32		2	/* Direct 32 bit */
++#define R_MIPS_REL32		3	/* PC relative 32 bit */
++#define R_MIPS_26		4	/* Direct 26 bit shifted */
++#define R_MIPS_HI16		5	/* High 16 bit */
++#define R_MIPS_LO16		6	/* Low 16 bit */
++#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
++#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
++#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
++#define R_MIPS_PC16		10	/* PC relative 16 bit */
++#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
++#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
++
++#define R_MIPS_SHIFT5		16
++#define R_MIPS_SHIFT6		17
++#define R_MIPS_64		18
++#define R_MIPS_GOT_DISP		19
++#define R_MIPS_GOT_PAGE		20
++#define R_MIPS_GOT_OFST		21
++#define R_MIPS_GOT_HI16		22
++#define R_MIPS_GOT_LO16		23
++#define R_MIPS_SUB		24
++#define R_MIPS_INSERT_A		25
++#define R_MIPS_INSERT_B		26
++#define R_MIPS_DELETE		27
++#define R_MIPS_HIGHER		28
++#define R_MIPS_HIGHEST		29
++#define R_MIPS_CALL_HI16	30
++#define R_MIPS_CALL_LO16	31
++#define R_MIPS_SCN_DISP		32
++#define R_MIPS_REL16		33
++#define R_MIPS_ADD_IMMEDIATE	34
++#define R_MIPS_PJUMP		35
++#define R_MIPS_RELGOT		36
++#define R_MIPS_JALR		37
++#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
++#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
++#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
++#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
++#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
++#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
++#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
++#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
++#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
++#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
++#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
++#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
++#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
++#define R_MIPS_GLOB_DAT		51
++#define R_MIPS_COPY		126
++#define R_MIPS_JUMP_SLOT        127
++/* Keep this the last entry.  */
++#define R_MIPS_NUM		128
++
++/* Legal values for p_type field of Elf32_Phdr.  */
++
++#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
++#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
++#define PT_MIPS_OPTIONS 0x70000002
++
++/* Special program header types.  */
++
++#define PF_MIPS_LOCAL	0x10000000
++
++/* Legal values for d_tag field of Elf32_Dyn.  */
++
++#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
++#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
++#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
++#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
++#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
++#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
++#define DT_MIPS_MSYM	     0x70000007
++#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
++#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
++#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
++#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
++#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
++#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
++#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
++#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
++#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
++#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
++#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
++#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
++						DT_MIPS_DELTA_CLASS.  */
++#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
++						DT_MIPS_DELTA_INSTANCE.  */
++#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
++					     DT_MIPS_DELTA_RELOC.  */
++#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
++					   relocations refer to.  */
++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
++					   DT_MIPS_DELTA_SYM.  */
++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
++					     class declaration.  */
++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
++						DT_MIPS_DELTA_CLASSSYM.  */
++#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
++#define DT_MIPS_PIXIE_INIT   0x70000023
++#define DT_MIPS_SYMBOL_LIB   0x70000024
++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
++#define DT_MIPS_LOCAL_GOTIDX 0x70000026
++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
++#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
++#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
++						    function stored in GOT.  */
++#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
++					   by rld on dlopen() calls.  */
++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
++#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
++#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
++/* The address of .got.plt in an executable using the new non-PIC ABI.  */
++#define DT_MIPS_PLTGOT	     0x70000032
++/* The base of the PLT in an executable using the new non-PIC ABI if that
++   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
++   value.  */
++#define DT_MIPS_RWPLT        0x70000034
++#define DT_MIPS_NUM	     0x35
++
++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
++
++#define RHF_NONE		   0		/* No flags */
++#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
++#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
++#define RHF_NO_MOVE		   (1 << 3)
++#define RHF_SGI_ONLY		   (1 << 4)
++#define RHF_GUARANTEE_INIT	   (1 << 5)
++#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
++#define RHF_GUARANTEE_START_INIT   (1 << 7)
++#define RHF_PIXIE		   (1 << 8)
++#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
++#define RHF_REQUICKSTART	   (1 << 10)
++#define RHF_REQUICKSTARTED	   (1 << 11)
++#define RHF_CORD		   (1 << 12)
++#define RHF_NO_UNRES_UNDEF	   (1 << 13)
++#define RHF_RLD_ORDER_SAFE	   (1 << 14)
++
++/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
++
++typedef struct
++{
++  Elf32_Word l_name;		/* Name (string table index) */
++  Elf32_Word l_time_stamp;	/* Timestamp */
++  Elf32_Word l_checksum;	/* Checksum */
++  Elf32_Word l_version;		/* Interface version */
++  Elf32_Word l_flags;		/* Flags */
++} Elf32_Lib;
++
++typedef struct
++{
++  Elf64_Word l_name;		/* Name (string table index) */
++  Elf64_Word l_time_stamp;	/* Timestamp */
++  Elf64_Word l_checksum;	/* Checksum */
++  Elf64_Word l_version;		/* Interface version */
++  Elf64_Word l_flags;		/* Flags */
++} Elf64_Lib;
++
++
++/* Legal values for l_flags.  */
++
++#define LL_NONE		  0
++#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
++#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
++#define LL_REQUIRE_MINOR  (1 << 2)
++#define LL_EXPORTS	  (1 << 3)
++#define LL_DELAY_LOAD	  (1 << 4)
++#define LL_DELTA	  (1 << 5)
++
++/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
++
++typedef Elf32_Addr Elf32_Conflict;
++
++
++/* HPPA specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
++#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
++#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
++#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
++#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
++					      prediction.  */
++#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
++#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
++
++/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
++
++#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
++#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
++#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
++
++/* Additional section indeces.  */
++
++#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
++					      symbols in ANSI C.  */
++#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
++#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
++#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
++#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
++#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
++
++#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
++#define STT_HP_STUB		(STT_LOOS + 0x2)
++
++/* HPPA relocs.  */
++
++#define R_PARISC_NONE		0	/* No reloc.  */
++#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
++#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
++#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
++#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
++#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
++#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
++#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
++#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
++#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
++#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
++#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
++#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
++#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
++#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
++#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
++#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
++#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
++#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
++#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
++#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
++#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
++#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
++#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
++#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
++#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
++#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
++#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
++#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
++#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
++#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
++#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
++#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
++#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
++#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
++#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
++#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
++#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
++#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
++#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
++#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
++#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
++#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LORESERVE	128
++#define R_PARISC_COPY		128	/* Copy relocation.  */
++#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
++#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
++#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
++#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
++#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
++#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
++#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
++#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
++#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_GNU_VTENTRY	232
++#define R_PARISC_GNU_VTINHERIT	233
++#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
++#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
++#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
++#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
++#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
++#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
++#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
++#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
++#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
++#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
++#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
++#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
++#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
++#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
++#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
++#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
++#define R_PARISC_HIRESERVE	255
++
++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PT_HP_TLS		(PT_LOOS + 0x0)
++#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
++#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
++#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
++#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
++#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
++#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
++#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
++#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
++#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
++#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
++#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
++#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
++#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
++#define PT_HP_STACK		(PT_LOOS + 0x14)
++
++#define PT_PARISC_ARCHEXT	0x70000000
++#define PT_PARISC_UNWIND	0x70000001
++
++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PF_PARISC_SBP		0x08000000
++
++#define PF_HP_PAGE_SIZE		0x00100000
++#define PF_HP_FAR_SHARED	0x00200000
++#define PF_HP_NEAR_SHARED	0x00400000
++#define PF_HP_CODE		0x01000000
++#define PF_HP_MODIFY		0x02000000
++#define PF_HP_LAZYSWAP		0x04000000
++#define PF_HP_SBP		0x08000000
++
++
++/* Alpha specific definitions.  */
++
++/* Legal values for e_flags field of Elf64_Ehdr.  */
++
++#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
++#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
++
++/* Legal values for sh_type field of Elf64_Shdr.  */
++
++/* These two are primerily concerned with ECOFF debugging info.  */
++#define SHT_ALPHA_DEBUG		0x70000001
++#define SHT_ALPHA_REGINFO	0x70000002
++
++/* Legal values for sh_flags field of Elf64_Shdr.  */
++
++#define SHF_ALPHA_GPREL		0x10000000
++
++/* Legal values for st_other field of Elf64_Sym.  */
++#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
++#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
++
++/* Alpha relocs.  */
++
++#define R_ALPHA_NONE		0	/* No reloc */
++#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
++#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
++#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
++#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
++#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
++#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
++#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
++#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
++#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
++#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
++#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
++#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
++#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
++#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
++#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
++#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
++#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
++#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
++#define R_ALPHA_TLS_GD_HI	28
++#define R_ALPHA_TLSGD		29
++#define R_ALPHA_TLS_LDM		30
++#define R_ALPHA_DTPMOD64	31
++#define R_ALPHA_GOTDTPREL	32
++#define R_ALPHA_DTPREL64	33
++#define R_ALPHA_DTPRELHI	34
++#define R_ALPHA_DTPRELLO	35
++#define R_ALPHA_DTPREL16	36
++#define R_ALPHA_GOTTPREL	37
++#define R_ALPHA_TPREL64		38
++#define R_ALPHA_TPRELHI		39
++#define R_ALPHA_TPRELLO		40
++#define R_ALPHA_TPREL16		41
++/* Keep this the last entry.  */
++#define R_ALPHA_NUM		46
++
++/* Magic values of the LITUSE relocation addend.  */
++#define LITUSE_ALPHA_ADDR	0
++#define LITUSE_ALPHA_BASE	1
++#define LITUSE_ALPHA_BYTOFF	2
++#define LITUSE_ALPHA_JSR	3
++#define LITUSE_ALPHA_TLS_GD	4
++#define LITUSE_ALPHA_TLS_LDM	5
++
++/* Legal values for d_tag of Elf64_Dyn.  */
++#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
++#define DT_ALPHA_NUM		1
++
++/* PowerPC specific declarations */
++
++/* Values for Elf32/64_Ehdr.e_flags.  */
++#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
++
++/* Cygnus local bits below */
++#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
++#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
++						   flag */
++
++/* PowerPC relocations defined by the ABIs */
++#define R_PPC_NONE		0
++#define R_PPC_ADDR32		1	/* 32bit absolute address */
++#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
++#define R_PPC_ADDR16		3	/* 16bit absolute address */
++#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
++#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
++#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
++#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
++#define R_PPC_ADDR14_BRTAKEN	8
++#define R_PPC_ADDR14_BRNTAKEN	9
++#define R_PPC_REL24		10	/* PC relative 26 bit */
++#define R_PPC_REL14		11	/* PC relative 16 bit */
++#define R_PPC_REL14_BRTAKEN	12
++#define R_PPC_REL14_BRNTAKEN	13
++#define R_PPC_GOT16		14
++#define R_PPC_GOT16_LO		15
++#define R_PPC_GOT16_HI		16
++#define R_PPC_GOT16_HA		17
++#define R_PPC_PLTREL24		18
++#define R_PPC_COPY		19
++#define R_PPC_GLOB_DAT		20
++#define R_PPC_JMP_SLOT		21
++#define R_PPC_RELATIVE		22
++#define R_PPC_LOCAL24PC		23
++#define R_PPC_UADDR32		24
++#define R_PPC_UADDR16		25
++#define R_PPC_REL32		26
++#define R_PPC_PLT32		27
++#define R_PPC_PLTREL32		28
++#define R_PPC_PLT16_LO		29
++#define R_PPC_PLT16_HI		30
++#define R_PPC_PLT16_HA		31
++#define R_PPC_SDAREL16		32
++#define R_PPC_SECTOFF		33
++#define R_PPC_SECTOFF_LO	34
++#define R_PPC_SECTOFF_HI	35
++#define R_PPC_SECTOFF_HA	36
++
++/* PowerPC relocations defined for the TLS access ABI.  */
++#define R_PPC_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
++#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
++#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
++#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
++#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
++#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
++#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
++#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
++#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
++#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
++
++/* The remaining relocs are from the Embedded ELF ABI, and are not
++   in the SVR4 ELF ABI.  */
++#define R_PPC_EMB_NADDR32	101
++#define R_PPC_EMB_NADDR16	102
++#define R_PPC_EMB_NADDR16_LO	103
++#define R_PPC_EMB_NADDR16_HI	104
++#define R_PPC_EMB_NADDR16_HA	105
++#define R_PPC_EMB_SDAI16	106
++#define R_PPC_EMB_SDA2I16	107
++#define R_PPC_EMB_SDA2REL	108
++#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
++#define R_PPC_EMB_MRKREF	110
++#define R_PPC_EMB_RELSEC16	111
++#define R_PPC_EMB_RELST_LO	112
++#define R_PPC_EMB_RELST_HI	113
++#define R_PPC_EMB_RELST_HA	114
++#define R_PPC_EMB_BIT_FLD	115
++#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
++
++/* Diab tool relocations.  */
++#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
++#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
++#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
++#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
++#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
++#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC_IRELATIVE		248
++
++/* GNU relocs used in PIC code sequences.  */
++#define R_PPC_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
++#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
++#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
++
++/* This is a phony reloc to handle any old fashioned TOC16 references
++   that may still be in object files.  */
++#define R_PPC_TOC16		255
++
++/* PowerPC specific values for the Dyn d_tag field.  */
++#define DT_PPC_GOT		(DT_LOPROC + 0)
++#define DT_PPC_NUM		1
++
++/* PowerPC64 relocations defined by the ABIs */
++#define R_PPC64_NONE		R_PPC_NONE
++#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
++#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
++#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
++#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
++#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
++#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
++#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
++#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
++#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
++#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
++#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
++#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
++#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
++#define R_PPC64_GOT16		R_PPC_GOT16
++#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
++#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
++#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
++
++#define R_PPC64_COPY		R_PPC_COPY
++#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
++#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
++#define R_PPC64_RELATIVE	R_PPC_RELATIVE
++
++#define R_PPC64_UADDR32		R_PPC_UADDR32
++#define R_PPC64_UADDR16		R_PPC_UADDR16
++#define R_PPC64_REL32		R_PPC_REL32
++#define R_PPC64_PLT32		R_PPC_PLT32
++#define R_PPC64_PLTREL32	R_PPC_PLTREL32
++#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
++#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
++#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
++
++#define R_PPC64_SECTOFF		R_PPC_SECTOFF
++#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
++#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
++#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
++#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
++#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
++#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
++#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
++#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
++#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
++#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
++#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
++#define R_PPC64_PLT64		45 /* doubleword64 L + A */
++#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
++#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
++#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
++#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
++#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
++#define R_PPC64_TOC		51 /* doubleword64 .TOC */
++#define R_PPC64_PLTGOT16	52 /* half16* M + A */
++#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
++#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
++#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
++
++#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
++#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
++#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
++#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
++#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
++#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
++#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
++#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
++#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
++#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
++#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
++
++/* PowerPC64 relocations defined for the TLS access ABI.  */
++#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
++#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
++#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
++#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
++#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
++#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
++#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
++#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
++#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
++#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
++#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC64_JMP_IREL	247
++#define R_PPC64_IRELATIVE	248
++#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
++#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
++#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
++
++/* PowerPC64 specific values for the Dyn d_tag field.  */
++#define DT_PPC64_GLINK  (DT_LOPROC + 0)
++#define DT_PPC64_OPD	(DT_LOPROC + 1)
++#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
++#define DT_PPC64_NUM    3
++
++
++/* ARM specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_ARM_RELEXEC		0x01
++#define EF_ARM_HASENTRY		0x02
++#define EF_ARM_INTERWORK	0x04
++#define EF_ARM_APCS_26		0x08
++#define EF_ARM_APCS_FLOAT	0x10
++#define EF_ARM_PIC		0x20
++#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
++#define EF_ARM_NEW_ABI		0x80
++#define EF_ARM_OLD_ABI		0x100
++#define EF_ARM_SOFT_FLOAT	0x200
++#define EF_ARM_VFP_FLOAT	0x400
++#define EF_ARM_MAVERICK_FLOAT	0x800
++
++
++/* Other constants defined in the ARM ELF spec. version B-01.  */
++/* NB. These conflict with values defined above.  */
++#define EF_ARM_SYMSARESORTED	0x04
++#define EF_ARM_DYNSYMSUSESEGIDX	0x08
++#define EF_ARM_MAPSYMSFIRST	0x10
++#define EF_ARM_EABIMASK		0XFF000000
++
++/* Constants defined in AAELF.  */
++#define EF_ARM_BE8	    0x00800000
++#define EF_ARM_LE8	    0x00400000
++
++#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
++#define EF_ARM_EABI_UNKNOWN	0x00000000
++#define EF_ARM_EABI_VER1	0x01000000
++#define EF_ARM_EABI_VER2	0x02000000
++#define EF_ARM_EABI_VER3	0x03000000
++#define EF_ARM_EABI_VER4	0x04000000
++#define EF_ARM_EABI_VER5	0x05000000
++
++/* Additional symbol types for Thumb.  */
++#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
++#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
++
++/* ARM-specific values for sh_flags */
++#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
++#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
++					      in the input to a link step.  */
++
++/* ARM-specific program header flags */
++#define PF_ARM_SB		0x10000000 /* Segment contains the location
++					      addressed by the static base. */
++#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
++#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
++#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
++#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
++
++
++/* ARM relocs.  */
++
++#define R_ARM_NONE		0	/* No reloc */
++#define R_ARM_PC24		1	/* PC relative 26 bit branch */
++#define R_ARM_ABS32		2	/* Direct 32 bit  */
++#define R_ARM_REL32		3	/* PC relative 32 bit */
++#define R_ARM_PC13		4
++#define R_ARM_ABS16		5	/* Direct 16 bit */
++#define R_ARM_ABS12		6	/* Direct 12 bit */
++#define R_ARM_THM_ABS5		7
++#define R_ARM_ABS8		8	/* Direct 8 bit */
++#define R_ARM_SBREL32		9
++#define R_ARM_THM_PC22		10
++#define R_ARM_THM_PC8		11
++#define R_ARM_AMP_VCALL9	12
++#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
++#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
++#define R_ARM_THM_SWI8		14
++#define R_ARM_XPC25		15
++#define R_ARM_THM_XPC22		16
++#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
++#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
++#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
++#define R_ARM_COPY		20	/* Copy symbol at runtime */
++#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
++#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
++#define R_ARM_RELATIVE		23	/* Adjust by program base */
++#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
++#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
++#define R_ARM_GOT32		26	/* 32 bit GOT entry */
++#define R_ARM_PLT32		27	/* 32 bit PLT address */
++#define R_ARM_ALU_PCREL_7_0	32
++#define R_ARM_ALU_PCREL_15_8	33
++#define R_ARM_ALU_PCREL_23_15	34
++#define R_ARM_LDR_SBREL_11_0	35
++#define R_ARM_ALU_SBREL_19_12	36
++#define R_ARM_ALU_SBREL_27_20	37
++#define R_ARM_TLS_GOTDESC	90
++#define R_ARM_TLS_CALL		91
++#define R_ARM_TLS_DESCSEQ	92
++#define R_ARM_THM_TLS_CALL	93
++#define R_ARM_GNU_VTENTRY	100
++#define R_ARM_GNU_VTINHERIT	101
++#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
++#define R_ARM_THM_PC9		103	/* thumb conditional branch */
++#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
++					   thread local data */
++#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
++					   thread local data */
++#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
++					   block */
++#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
++					   static TLS block offset */
++#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
++					   TLS block */
++#define	R_ARM_THM_TLS_DESCSEQ	129
++#define R_ARM_IRELATIVE		160
++#define R_ARM_RXPC25		249
++#define R_ARM_RSBREL32		250
++#define R_ARM_THM_RPC22		251
++#define R_ARM_RREL32		252
++#define R_ARM_RABS22		253
++#define R_ARM_RPC24		254
++#define R_ARM_RBASE		255
++/* Keep this the last entry.  */
++#define R_ARM_NUM		256
++
++/* IA-64 specific declarations.  */
++
++/* Processor specific flags for the Ehdr e_flags field.  */
++#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
++#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
++#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
++#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
++#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
++#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
++#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
++
++/* Processor specific flags for the Phdr p_flags field.  */
++#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
++#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
++
++/* Processor specific flags for the Shdr sh_flags field.  */
++#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
++#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Dyn d_tag field.  */
++#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
++#define DT_IA_64_NUM		1
++
++/* IA-64 relocations.  */
++#define R_IA64_NONE		0x00	/* none */
++#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
++#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
++#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
++#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
++#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
++#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
++#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
++#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
++#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
++#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
++#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
++#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
++#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
++#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
++#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
++#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
++#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
++#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
++#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
++#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
++#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
++#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
++#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
++#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
++#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
++#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
++#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
++#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
++#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
++#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
++#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
++#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
++#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
++#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
++#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
++#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
++#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
++#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
++#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
++#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
++#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
++#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
++#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
++#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
++#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
++#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
++#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
++#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
++#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
++#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
++#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
++#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
++#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
++#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
++#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
++#define R_IA64_COPY		0x84	/* copy relocation */
++#define R_IA64_SUB		0x85	/* Addend and symbol difference */
++#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
++#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
++#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
++#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
++#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
++#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
++#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
++#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
++#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
++#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
++#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
++#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
++#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
++#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
++#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
++#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
++
++/* SH specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_SH_MACH_MASK		0x1f
++#define EF_SH_UNKNOWN		0x0
++#define EF_SH1			0x1
++#define EF_SH2			0x2
++#define EF_SH3			0x3
++#define EF_SH_DSP		0x4
++#define EF_SH3_DSP		0x5
++#define EF_SH4AL_DSP		0x6
++#define EF_SH3E			0x8
++#define EF_SH4			0x9
++#define EF_SH2E			0xb
++#define EF_SH4A			0xc
++#define EF_SH2A			0xd
++#define EF_SH4_NOFPU		0x10
++#define EF_SH4A_NOFPU		0x11
++#define EF_SH4_NOMMU_NOFPU	0x12
++#define EF_SH2A_NOFPU		0x13
++#define EF_SH3_NOMMU		0x14
++#define EF_SH2A_SH4_NOFPU	0x15
++#define EF_SH2A_SH3_NOFPU	0x16
++#define EF_SH2A_SH4		0x17
++#define EF_SH2A_SH3E		0x18
++
++/* SH relocs.  */
++#define	R_SH_NONE		0
++#define	R_SH_DIR32		1
++#define	R_SH_REL32		2
++#define	R_SH_DIR8WPN		3
++#define	R_SH_IND12W		4
++#define	R_SH_DIR8WPL		5
++#define	R_SH_DIR8WPZ		6
++#define	R_SH_DIR8BP		7
++#define	R_SH_DIR8W		8
++#define	R_SH_DIR8L		9
++#define	R_SH_SWITCH16		25
++#define	R_SH_SWITCH32		26
++#define	R_SH_USES		27
++#define	R_SH_COUNT		28
++#define	R_SH_ALIGN		29
++#define	R_SH_CODE		30
++#define	R_SH_DATA		31
++#define	R_SH_LABEL		32
++#define	R_SH_SWITCH8		33
++#define	R_SH_GNU_VTINHERIT	34
++#define	R_SH_GNU_VTENTRY	35
++#define	R_SH_TLS_GD_32		144
++#define	R_SH_TLS_LD_32		145
++#define	R_SH_TLS_LDO_32		146
++#define	R_SH_TLS_IE_32		147
++#define	R_SH_TLS_LE_32		148
++#define	R_SH_TLS_DTPMOD32	149
++#define	R_SH_TLS_DTPOFF32	150
++#define	R_SH_TLS_TPOFF32	151
++#define	R_SH_GOT32		160
++#define	R_SH_PLT32		161
++#define	R_SH_COPY		162
++#define	R_SH_GLOB_DAT		163
++#define	R_SH_JMP_SLOT		164
++#define	R_SH_RELATIVE		165
++#define	R_SH_GOTOFF		166
++#define	R_SH_GOTPC		167
++/* Keep this the last entry.  */
++#define	R_SH_NUM		256
++
++/* S/390 specific definitions.  */
++
++/* Valid values for the e_flags field.  */
++
++#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
++
++/* Additional s390 relocs */
++
++#define R_390_NONE		0	/* No reloc.  */
++#define R_390_8			1	/* Direct 8 bit.  */
++#define R_390_12		2	/* Direct 12 bit.  */
++#define R_390_16		3	/* Direct 16 bit.  */
++#define R_390_32		4	/* Direct 32 bit.  */
++#define R_390_PC32		5	/* PC relative 32 bit.	*/
++#define R_390_GOT12		6	/* 12 bit GOT offset.  */
++#define R_390_GOT32		7	/* 32 bit GOT offset.  */
++#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
++#define R_390_COPY		9	/* Copy symbol at runtime.  */
++#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
++#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
++#define R_390_RELATIVE		12	/* Adjust by program base.  */
++#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
++#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
++#define R_390_GOT16		15	/* 16 bit GOT offset.  */
++#define R_390_PC16		16	/* PC relative 16 bit.	*/
++#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
++#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
++#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
++#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
++#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
++#define R_390_64		22	/* Direct 64 bit.  */
++#define R_390_PC64		23	/* PC relative 64 bit.	*/
++#define R_390_GOT64		24	/* 64 bit GOT offset.  */
++#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
++#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
++#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
++#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
++#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
++#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
++#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
++#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
++#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
++#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
++#define R_390_TLS_GDCALL	38	/* Tag for function call in general
++					   dynamic TLS code. */
++#define R_390_TLS_LDCALL	39	/* Tag for function call in local
++					   dynamic TLS code. */
++#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
++					   thread local data.  */
++#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
++					  thread local data.  */
++#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
++					   block offset. */
++#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
++#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
++#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
++					   block.  */
++#define R_390_20		57	/* Direct 20 bit.  */
++#define R_390_GOT20		58	/* 20 bit GOT offset.  */
++#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
++#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
++/* Keep this the last entry.  */
++#define R_390_NUM		62
++
++
++/* CRIS relocations.  */
++#define R_CRIS_NONE		0
++#define R_CRIS_8		1
++#define R_CRIS_16		2
++#define R_CRIS_32		3
++#define R_CRIS_8_PCREL		4
++#define R_CRIS_16_PCREL		5
++#define R_CRIS_32_PCREL		6
++#define R_CRIS_GNU_VTINHERIT	7
++#define R_CRIS_GNU_VTENTRY	8
++#define R_CRIS_COPY		9
++#define R_CRIS_GLOB_DAT		10
++#define R_CRIS_JUMP_SLOT	11
++#define R_CRIS_RELATIVE		12
++#define R_CRIS_16_GOT		13
++#define R_CRIS_32_GOT		14
++#define R_CRIS_16_GOTPLT	15
++#define R_CRIS_32_GOTPLT	16
++#define R_CRIS_32_GOTREL	17
++#define R_CRIS_32_PLT_GOTREL	18
++#define R_CRIS_32_PLT_PCREL	19
++
++#define R_CRIS_NUM		20
++
++
++/* AMD x86-64 relocations.  */
++#define R_X86_64_NONE		0	/* No reloc */
++#define R_X86_64_64		1	/* Direct 64 bit  */
++#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
++#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
++#define R_X86_64_PLT32		4	/* 32 bit PLT address */
++#define R_X86_64_COPY		5	/* Copy symbol at runtime */
++#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
++#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
++#define R_X86_64_RELATIVE	8	/* Adjust by program base */
++#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
++					   offset to GOT */
++#define R_X86_64_32		10	/* Direct 32 bit zero extended */
++#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
++#define R_X86_64_16		12	/* Direct 16 bit zero extended */
++#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
++#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
++#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
++#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
++#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
++#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
++#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
++					   to two GOT entries for GD symbol */
++#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
++					   to two GOT entries for LD symbol */
++#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
++#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
++					   to GOT entry for IE symbol */
++#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
++#define R_X86_64_PC64		24	/* PC relative 64 bit */
++#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
++#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
++					   offset to GOT */
++#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
++#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
++					   to GOT entry */
++#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
++#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
++#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
++					   to PLT entry */
++#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
++#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
++#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
++#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
++					   descriptor.  */
++#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
++#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
++#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
++
++#define R_X86_64_NUM		39
++
++
++/* AM33 relocations.  */
++#define R_MN10300_NONE		0	/* No reloc.  */
++#define R_MN10300_32		1	/* Direct 32 bit.  */
++#define R_MN10300_16		2	/* Direct 16 bit.  */
++#define R_MN10300_8		3	/* Direct 8 bit.  */
++#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
++#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
++#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
++#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
++#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
++#define R_MN10300_24		9	/* Direct 24 bit.  */
++#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
++#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
++#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
++#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
++#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
++#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
++#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
++#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
++#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
++#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
++#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
++#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
++
++#define R_MN10300_NUM		24
++
++
++/* M32R relocs.  */
++#define R_M32R_NONE		0	/* No reloc. */
++#define R_M32R_16		1	/* Direct 16 bit. */
++#define R_M32R_32		2	/* Direct 32 bit. */
++#define R_M32R_24		3	/* Direct 24 bit. */
++#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
++#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
++#define R_M32R_LO16		9	/* Low 16 bit. */
++#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
++#define R_M32R_GNU_VTINHERIT	11
++#define R_M32R_GNU_VTENTRY	12
++/* M32R relocs use SHT_RELA.  */
++#define R_M32R_16_RELA		33	/* Direct 16 bit. */
++#define R_M32R_32_RELA		34	/* Direct 32 bit. */
++#define R_M32R_24_RELA		35	/* Direct 24 bit. */
++#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
++#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
++#define R_M32R_LO16_RELA	41	/* Low 16 bit */
++#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
++#define R_M32R_RELA_GNU_VTINHERIT	43
++#define R_M32R_RELA_GNU_VTENTRY	44
++#define R_M32R_REL32		45	/* PC relative 32 bit.  */
++
++#define R_M32R_GOT24		48	/* 24 bit GOT entry */
++#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
++#define R_M32R_COPY		50	/* Copy symbol at runtime */
++#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
++#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
++#define R_M32R_RELATIVE		53	/* Adjust by program base */
++#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
++#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
++#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
++					   low */
++#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
++					   low */
++#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
++#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
++					   GOT with unsigned low */
++#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
++					   GOT with signed low */
++#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
++					   GOT */
++#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
++					   with unsigned low */
++#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
++					   with signed low */
++#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
++#define R_M32R_NUM		256	/* Keep this the last entry. */
++
++
++/* TILEPro relocations.  */
++#define R_TILEPRO_NONE		0	/* No reloc */
++#define R_TILEPRO_32		1	/* Direct 32 bit */
++#define R_TILEPRO_16		2	/* Direct 16 bit */
++#define R_TILEPRO_8		3	/* Direct 8 bit */
++#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
++#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
++#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
++#define R_TILEPRO_LO16		7	/* Low 16 bit */
++#define R_TILEPRO_HI16		8	/* High 16 bit */
++#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
++#define R_TILEPRO_COPY		10	/* Copy relocation */
++#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
++#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
++#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
++#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
++#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
++#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
++#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
++#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
++#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
++#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
++#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
++#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
++#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
++#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
++#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
++#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
++#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
++#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
++#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
++/* Relocs 56-59 are currently not defined.  */
++#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
++#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
++#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
++#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
++#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
++#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
++
++#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEPRO_NUM		130
++
++
++/* TILE-Gx relocations.  */
++#define R_TILEGX_NONE		0	/* No reloc */
++#define R_TILEGX_64		1	/* Direct 64 bit */
++#define R_TILEGX_32		2	/* Direct 32 bit */
++#define R_TILEGX_16		3	/* Direct 16 bit */
++#define R_TILEGX_8		4	/* Direct 8 bit */
++#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
++#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
++#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
++#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
++#define R_TILEGX_HW0		9	/* hword 0 16-bit */
++#define R_TILEGX_HW1		10	/* hword 1 16-bit */
++#define R_TILEGX_HW2		11	/* hword 2 16-bit */
++#define R_TILEGX_HW3		12	/* hword 3 16-bit */
++#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
++#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
++#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
++#define R_TILEGX_COPY		16	/* Copy relocation */
++#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
++#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
++#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
++#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
++#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
++#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
++#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
++#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
++#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
++#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
++#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
++#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
++#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
++#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
++#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
++#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
++#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
++#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
++#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
++#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
++#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
++#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
++#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
++#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
++#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
++#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
++#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
++/* Relocs 66-71 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
++#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
++/* Relocs 76-77 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
++/* Relocs 90-91 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
++/* Relocs 94-99 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
++/* Relocs 104-105 are currently not defined.  */
++#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
++#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
++#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
++#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
++#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
++
++#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEGX_NUM		130
++
++#endif	/* elf.h */
diff --git a/trunk/target/linux/generic/patches-3.13/212-byteshift_portability.patch b/trunk/target/linux/generic/patches-3.13/212-byteshift_portability.patch
new file mode 100644
index 00000000..0f23ba9b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/212-byteshift_portability.patch
@@ -0,0 +1,51 @@
+--- a/tools/include/tools/be_byteshift.h
++++ b/tools/include/tools/be_byteshift.h
+@@ -1,6 +1,10 @@
+ #ifndef _TOOLS_BE_BYTESHIFT_H
+ #define _TOOLS_BE_BYTESHIFT_H
+ 
++#ifndef __linux__
++#include "linux_types.h"
++#endif
++
+ #include <stdint.h>
+ 
+ static inline uint16_t __get_unaligned_be16(const uint8_t *p)
+--- a/tools/include/tools/le_byteshift.h
++++ b/tools/include/tools/le_byteshift.h
+@@ -1,6 +1,10 @@
+ #ifndef _TOOLS_LE_BYTESHIFT_H
+ #define _TOOLS_LE_BYTESHIFT_H
+ 
++#ifndef __linux__
++#include "linux_types.h"
++#endif
++
+ #include <stdint.h>
+ 
+ static inline uint16_t __get_unaligned_le16(const uint8_t *p)
+--- /dev/null
++++ b/tools/include/tools/linux_types.h
+@@ -0,0 +1,22 @@
++#ifndef __LINUX_TYPES_H
++#define __LINUX_TYPES_H
++
++#include <stdint.h>
++
++typedef uint8_t __u8;
++typedef uint8_t __be8;
++typedef uint8_t __le8;
++
++typedef uint16_t __u16;
++typedef uint16_t __be16;
++typedef uint16_t __le16;
++
++typedef uint32_t __u32;
++typedef uint32_t __be32;
++typedef uint32_t __le32;
++
++typedef uint64_t __u64;
++typedef uint64_t __be64;
++typedef uint64_t __le64;
++
++#endif
diff --git a/trunk/target/linux/generic/patches-3.13/220-gc_sections.patch b/trunk/target/linux/generic/patches-3.13/220-gc_sections.patch
new file mode 100644
index 00000000..c105c40b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/220-gc_sections.patch
@@ -0,0 +1,531 @@
+From: Felix Fietkau <nbd@openwrt.org>
+
+use -ffunction-sections, -fdata-sections and --gc-sections --sort-section=name
+
+In combination with kernel symbol export stripping this significantly reduces
+the kernel image size. Used on both ARM and MIPS architectures.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -89,10 +89,14 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ #
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y			+= -msoft-float
+-LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
++LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
++endif
++
+ cflags-y += -ffreestanding
+ 
+ #
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -67,7 +67,7 @@ SECTIONS
+ 	/* Exception table for data bus errors */
+ 	__dbe_table : {
+ 		__start___dbe_table = .;
+-		*(__dbe_table)
++		KEEP(*(__dbe_table))
+ 		__stop___dbe_table = .;
+ 	}
+ 
+@@ -112,7 +112,7 @@ SECTIONS
+ 	. = ALIGN(4);
+ 	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
+ 		__mips_machines_start = .;
+-		*(.mips.machines.init)
++		KEEP(*(.mips.machines.init))
+ 		__mips_machines_end = .;
+ 	}
+ 
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -87,7 +87,7 @@
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ #define MCOUNT_REC()	. = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__start_mcount_loc) = .; \
+-			*(__mcount_loc)				\
++			KEEP(*(__mcount_loc))			\
+ 			VMLINUX_SYMBOL(__stop_mcount_loc) = .;
+ #else
+ #define MCOUNT_REC()
+@@ -95,7 +95,7 @@
+ 
+ #ifdef CONFIG_TRACE_BRANCH_PROFILING
+ #define LIKELY_PROFILE()	VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
+-				*(_ftrace_annotated_branch)			      \
++				KEEP(*(_ftrace_annotated_branch))		      \
+ 				VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
+ #else
+ #define LIKELY_PROFILE()
+@@ -103,7 +103,7 @@
+ 
+ #ifdef CONFIG_PROFILE_ALL_BRANCHES
+ #define BRANCH_PROFILE()	VMLINUX_SYMBOL(__start_branch_profile) = .;   \
+-				*(_ftrace_branch)			      \
++				KEEP(*(_ftrace_branch))			      \
+ 				VMLINUX_SYMBOL(__stop_branch_profile) = .;
+ #else
+ #define BRANCH_PROFILE()
+@@ -112,7 +112,7 @@
+ #ifdef CONFIG_EVENT_TRACING
+ #define FTRACE_EVENTS()	. = ALIGN(8);					\
+ 			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\
+-			*(_ftrace_events)				\
++			KEEP(*(_ftrace_events))				\
+ 			VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+ #else
+ #define FTRACE_EVENTS()
+@@ -120,7 +120,7 @@
+ 
+ #ifdef CONFIG_TRACING
+ #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .;      \
+-			 *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
++			 KEEP(*(__trace_printk_fmt)) /* Trace_printk fmt' pointer */ \
+ 			 VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
+ #define TRACEPOINT_STR() VMLINUX_SYMBOL(__start___tracepoint_str) = .;	\
+ 			 *(__tracepoint_str) /* Trace_printk fmt' pointer */ \
+@@ -133,7 +133,7 @@
+ #ifdef CONFIG_FTRACE_SYSCALLS
+ #define TRACE_SYSCALLS() . = ALIGN(8);					\
+ 			 VMLINUX_SYMBOL(__start_syscalls_metadata) = .;	\
+-			 *(__syscalls_metadata)				\
++			 KEEP(*(__syscalls_metadata))			\
+ 			 VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
+ #else
+ #define TRACE_SYSCALLS()
+@@ -142,8 +142,8 @@
+ #ifdef CONFIG_CLKSRC_OF
+ #define CLKSRC_OF_TABLES() . = ALIGN(8);				\
+ 			   VMLINUX_SYMBOL(__clksrc_of_table) = .;	\
+-			   *(__clksrc_of_table)				\
+-			   *(__clksrc_of_table_end)
++			   KEEP(*(__clksrc_of_table))			\
++			   KEEP(*(__clksrc_of_table_end))
+ #else
+ #define CLKSRC_OF_TABLES()
+ #endif
+@@ -152,8 +152,8 @@
+ #define IRQCHIP_OF_MATCH_TABLE()					\
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__irqchip_begin) = .;				\
+-	*(__irqchip_of_table)		  				\
+-	*(__irqchip_of_end)
++	KEEP(*(__irqchip_of_table))	  				\
++	KEEP(*(__irqchip_of_end))
+ #else
+ #define IRQCHIP_OF_MATCH_TABLE()
+ #endif
+@@ -161,8 +161,8 @@
+ #ifdef CONFIG_COMMON_CLK
+ #define CLK_OF_TABLES() . = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__clk_of_table) = .;	\
+-			*(__clk_of_table)			\
+-			*(__clk_of_table_end)
++			KEEP(*(__clk_of_table))			\
++			KEEP(*(__clk_of_table_end))
+ #else
+ #define CLK_OF_TABLES()
+ #endif
+@@ -170,7 +170,7 @@
+ #define KERNEL_DTB()							\
+ 	STRUCT_ALIGN();							\
+ 	VMLINUX_SYMBOL(__dtb_start) = .;				\
+-	*(.dtb.init.rodata)						\
++	KEEP(*(.dtb.init.rodata))					\
+ 	VMLINUX_SYMBOL(__dtb_end) = .;
+ 
+ /* .data section */
+@@ -186,16 +186,17 @@
+ 	/* implement dynamic printk debug */				\
+ 	. = ALIGN(8);                                                   \
+ 	VMLINUX_SYMBOL(__start___jump_table) = .;                       \
+-	*(__jump_table)                                                 \
++	KEEP(*(__jump_table))                                           \
+ 	VMLINUX_SYMBOL(__stop___jump_table) = .;                        \
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__start___verbose) = .;                          \
+-	*(__verbose)                                                    \
++	KEEP(*(__verbose))                                              \
+ 	VMLINUX_SYMBOL(__stop___verbose) = .;				\
+ 	LIKELY_PROFILE()		       				\
+ 	BRANCH_PROFILE()						\
+ 	TRACE_PRINTKS()							\
+-	TRACEPOINT_STR()
++	TRACEPOINT_STR()                                                \
++	*(.data.[a-zA-Z_]*)
+ 
+ /*
+  * Data section helpers
+@@ -249,32 +250,32 @@
+ 	/* PCI quirks */						\
+ 	.pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_early) = .;		\
+-		*(.pci_fixup_early)					\
++		KEEP(*(.pci_fixup_early))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_early) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_header) = .;		\
+-		*(.pci_fixup_header)					\
++		KEEP(*(.pci_fixup_header))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_header) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_final) = .;		\
+-		*(.pci_fixup_final)					\
++		KEEP(*(.pci_fixup_final))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_final) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;		\
+-		*(.pci_fixup_enable)					\
++		KEEP(*(.pci_fixup_enable))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;		\
+-		*(.pci_fixup_resume)					\
++		KEEP(*(.pci_fixup_resume))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;	\
+-		*(.pci_fixup_resume_early)				\
++		KEEP(*(.pci_fixup_resume_early))			\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;		\
+-		*(.pci_fixup_suspend)					\
++		KEEP(*(.pci_fixup_suspend))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;		\
+ 	}								\
+ 									\
+ 	/* Built-in firmware blobs */					\
+ 	.builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_builtin_fw) = .;			\
+-		*(.builtin_fw)						\
++		KEEP(*(.builtin_fw))					\
+ 		VMLINUX_SYMBOL(__end_builtin_fw) = .;			\
+ 	}								\
+ 									\
+@@ -283,49 +284,49 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		*(SORT(___ksymtab+*))					\
++		KEEP(*(SORT(___ksymtab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		*(SORT(___ksymtab_gpl+*))				\
++		KEEP(*(SORT(___ksymtab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal unused symbols */		\
+ 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
+-		*(SORT(___ksymtab_unused+*))				\
++		KEEP(*(SORT(___ksymtab_unused+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
+-		*(SORT(___ksymtab_unused_gpl+*))			\
++		KEEP(*(SORT(___ksymtab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
+-		*(SORT(___ksymtab_gpl_future+*))			\
++		KEEP(*(SORT(___ksymtab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__kcrctab         : AT(ADDR(__kcrctab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___kcrctab) = .;			\
+-		*(SORT(___kcrctab+*))					\
++		KEEP(*(SORT(___kcrctab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__kcrctab_gpl     : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl) = .;		\
+-		*(SORT(___kcrctab_gpl+*))				\
++		KEEP(*(SORT(___kcrctab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -339,14 +340,14 @@
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .;	\
+-		*(SORT(___kcrctab_unused_gpl+*))			\
++		KEEP(*(SORT(___kcrctab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .;	\
+-		*(SORT(___kcrctab_gpl_future+*))			\
++		KEEP(*(SORT(___kcrctab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .;	\
+ 	}								\
+ 									\
+@@ -365,14 +366,14 @@
+ 	/* Built-in module parameters. */				\
+ 	__param : AT(ADDR(__param) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___param) = .;			\
+-		*(__param)						\
++		KEEP(*(__param))					\
+ 		VMLINUX_SYMBOL(__stop___param) = .;			\
+ 	}								\
+ 									\
+ 	/* Built-in module versions. */					\
+ 	__modver : AT(ADDR(__modver) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___modver) = .;			\
+-		*(__modver)						\
++		KEEP(*(__modver))					\
+ 		VMLINUX_SYMBOL(__stop___modver) = .;			\
+ 		. = ALIGN((align));					\
+ 		VMLINUX_SYMBOL(__end_rodata) = .;			\
+@@ -428,7 +429,7 @@
+ #define ENTRY_TEXT							\
+ 		ALIGN_FUNCTION();					\
+ 		VMLINUX_SYMBOL(__entry_text_start) = .;			\
+-		*(.entry.text)						\
++		KEEP(*(.entry.text))					\
+ 		VMLINUX_SYMBOL(__entry_text_end) = .;
+ 
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+@@ -456,7 +457,7 @@
+ 	. = ALIGN(align);						\
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ex_table) = .;			\
+-		*(__ex_table)						\
++		KEEP(*(__ex_table))						\
+ 		VMLINUX_SYMBOL(__stop___ex_table) = .;			\
+ 	}
+ 
+@@ -472,8 +473,8 @@
+ #ifdef CONFIG_CONSTRUCTORS
+ #define KERNEL_CTORS()	. = ALIGN(8);			   \
+ 			VMLINUX_SYMBOL(__ctors_start) = .; \
+-			*(.ctors)			   \
+-			*(.init_array)			   \
++			KEEP(*(.ctors))			   \
++			KEEP(*(.init_array))		   \
+ 			VMLINUX_SYMBOL(__ctors_end) = .;
+ #else
+ #define KERNEL_CTORS()
+@@ -517,7 +518,7 @@
+ #define SBSS(sbss_align)						\
+ 	. = ALIGN(sbss_align);						\
+ 	.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {				\
+-		*(.sbss)						\
++		*(.sbss .sbss.*)					\
+ 		*(.scommon)						\
+ 	}
+ 
+@@ -535,7 +536,7 @@
+ 		BSS_FIRST_SECTIONS					\
+ 		*(.bss..page_aligned)					\
+ 		*(.dynbss)						\
+-		*(.bss)							\
++		*(.bss .bss.*)						\
+ 		*(COMMON)						\
+ 	}
+ 
+@@ -596,7 +597,7 @@
+ 	. = ALIGN(4);							\
+ 	.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__tracedata_start) = .;			\
+-		*(.tracedata)						\
++		KEEP(*(.tracedata))					\
+ 		VMLINUX_SYMBOL(__tracedata_end) = .;			\
+ 	}
+ #else
+@@ -613,17 +614,17 @@
+ #define INIT_SETUP(initsetup_align)					\
+ 		. = ALIGN(initsetup_align);				\
+ 		VMLINUX_SYMBOL(__setup_start) = .;			\
+-		*(.init.setup)						\
++		KEEP(*(.init.setup))					\
+ 		VMLINUX_SYMBOL(__setup_end) = .;
+ 
+ #define INIT_CALLS_LEVEL(level)						\
+ 		VMLINUX_SYMBOL(__initcall##level##_start) = .;		\
+-		*(.initcall##level##.init)				\
+-		*(.initcall##level##s.init)				\
++		KEEP(*(.initcall##level##.init))			\
++		KEEP(*(.initcall##level##s.init))			\
+ 
+ #define INIT_CALLS							\
+ 		VMLINUX_SYMBOL(__initcall_start) = .;			\
+-		*(.initcallearly.init)					\
++		KEEP(*(.initcallearly.init))				\
+ 		INIT_CALLS_LEVEL(0)					\
+ 		INIT_CALLS_LEVEL(1)					\
+ 		INIT_CALLS_LEVEL(2)					\
+@@ -637,21 +638,21 @@
+ 
+ #define CON_INITCALL							\
+ 		VMLINUX_SYMBOL(__con_initcall_start) = .;		\
+-		*(.con_initcall.init)					\
++		KEEP(*(.con_initcall.init))				\
+ 		VMLINUX_SYMBOL(__con_initcall_end) = .;
+ 
+ #define SECURITY_INITCALL						\
+ 		VMLINUX_SYMBOL(__security_initcall_start) = .;		\
+-		*(.security_initcall.init)				\
++		KEEP(*(.security_initcall.init))			\
+ 		VMLINUX_SYMBOL(__security_initcall_end) = .;
+ 
+ #ifdef CONFIG_BLK_DEV_INITRD
+ #define INIT_RAM_FS							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__initramfs_start) = .;				\
+-	*(.init.ramfs)							\
++	KEEP(*(.init.ramfs))						\
+ 	. = ALIGN(8);							\
+-	*(.init.ramfs.info)
++	KEEP(*(.init.ramfs.info))
+ #else
+ #define INIT_RAM_FS
+ #endif
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
+@@ -18,11 +18,16 @@ ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
+ LDFLAGS_vmlinux	+= --be8
+ LDFLAGS_MODULE	+= --be8
+ endif
++LDFLAGS_vmlinux += --gc-sections --sort-section=name
+ 
+ OBJCOPYFLAGS	:=-O binary -R .comment -S
+ GZFLAGS		:=-9
+ #KBUILD_CFLAGS	+=-pipe
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
++endif
++
+ # Never generate .eh_frame
+ KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
+ 
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -12,13 +12,13 @@
+ #define PROC_INFO							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__proc_info_begin) = .;				\
+-	*(.proc.info.init)						\
++	KEEP(*(.proc.info.init))					\
+ 	VMLINUX_SYMBOL(__proc_info_end) = .;
+ 
+ #define IDMAP_TEXT							\
+ 	ALIGN_FUNCTION();						\
+ 	VMLINUX_SYMBOL(__idmap_text_start) = .;				\
+-	*(.idmap.text)							\
++	KEEP(*(.idmap.text))						\
+ 	VMLINUX_SYMBOL(__idmap_text_end) = .;				\
+ 	. = ALIGN(32);							\
+ 	VMLINUX_SYMBOL(__hyp_idmap_text_start) = .;			\
+@@ -93,7 +93,7 @@ SECTIONS
+ 	.text : {			/* Real text segment		*/
+ 		_stext = .;		/* Text and read-only data	*/
+ 			__exception_text_start = .;
+-			*(.exception.text)
++			KEEP(*(.exception.text))
+ 			__exception_text_end = .;
+ 			IRQENTRY_TEXT
+ 			TEXT_TEXT
+@@ -118,7 +118,7 @@ SECTIONS
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+ 		__start___ex_table = .;
+ #ifdef CONFIG_MMU
+-		*(__ex_table)
++		KEEP(*(__ex_table))
+ #endif
+ 		__stop___ex_table = .;
+ 	}
+@@ -130,12 +130,12 @@ SECTIONS
+ 	. = ALIGN(8);
+ 	.ARM.unwind_idx : {
+ 		__start_unwind_idx = .;
+-		*(.ARM.exidx*)
++		KEEP(*(.ARM.exidx*))
+ 		__stop_unwind_idx = .;
+ 	}
+ 	.ARM.unwind_tab : {
+ 		__start_unwind_tab = .;
+-		*(.ARM.extab*)
++		KEEP(*(.ARM.extab*))
+ 		__stop_unwind_tab = .;
+ 	}
+ #endif
+@@ -154,14 +154,14 @@ SECTIONS
+ 	 */
+ 	__vectors_start = .;
+ 	.vectors 0 : AT(__vectors_start) {
+-		*(.vectors)
++		KEEP(*(.vectors))
+ 	}
+ 	. = __vectors_start + SIZEOF(.vectors);
+ 	__vectors_end = .;
+ 
+ 	__stubs_start = .;
+ 	.stubs 0x1000 : AT(__stubs_start) {
+-		*(.stubs)
++		KEEP(*(.stubs))
+ 	}
+ 	. = __stubs_start + SIZEOF(.stubs);
+ 	__stubs_end = .;
+@@ -175,24 +175,24 @@ SECTIONS
+ 	}
+ 	.init.arch.info : {
+ 		__arch_info_begin = .;
+-		*(.arch.info.init)
++		KEEP(*(.arch.info.init))
+ 		__arch_info_end = .;
+ 	}
+ 	.init.tagtable : {
+ 		__tagtable_begin = .;
+-		*(.taglist.init)
++		KEEP(*(.taglist.init))
+ 		__tagtable_end = .;
+ 	}
+ #ifdef CONFIG_SMP_ON_UP
+ 	.init.smpalt : {
+ 		__smpalt_begin = .;
+-		*(.alt.smp.init)
++		KEEP(*(.alt.smp.init))
+ 		__smpalt_end = .;
+ 	}
+ #endif
+ 	.init.pv_table : {
+ 		__pv_table_begin = .;
+-		*(.pv_table)
++		KEEP(*(.pv_table))
+ 		__pv_table_end = .;
+ 	}
+ 	.init.data : {
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -120,6 +120,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
+ endif
++KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
+ 
+ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)
+ asflags-y := -DZIMAGE
diff --git a/trunk/target/linux/generic/patches-3.13/221-module_exports.patch b/trunk/target/linux/generic/patches-3.13/221-module_exports.patch
new file mode 100644
index 00000000..b5380030
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/221-module_exports.patch
@@ -0,0 +1,88 @@
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -52,6 +52,16 @@
+ #define LOAD_OFFSET 0
+ #endif
+ 
++#ifndef SYMTAB_KEEP
++#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*)))
++#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*)))
++#endif
++
++#ifndef SYMTAB_DISCARD
++#define SYMTAB_DISCARD
++#define SYMTAB_DISCARD_GPL
++#endif
++
+ #include <linux/export.h>
+ 
+ /* Align . to a 8 byte boundary equals to maximum function alignment. */
+@@ -284,14 +294,14 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		KEEP(*(SORT(___ksymtab+*)))				\
++		SYMTAB_KEEP						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		KEEP(*(SORT(___ksymtab_gpl+*)))				\
++		SYMTAB_KEEP_GPL						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -353,7 +363,7 @@
+ 									\
+ 	/* Kernel symbol table: strings */				\
+         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
+-		*(__ksymtab_strings)					\
++		*(__ksymtab_strings+*)					\
+ 	}								\
+ 									\
+ 	/* __*init sections */						\
+@@ -671,6 +681,8 @@
+ 	EXIT_TEXT							\
+ 	EXIT_DATA							\
+ 	EXIT_CALL							\
++	SYMTAB_DISCARD							\
++	SYMTAB_DISCARD_GPL						\
+ 	*(.discard)							\
+ 	*(.discard.*)							\
+ 	}
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -349,7 +349,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
+ # Linker scripts preprocessor (.lds.S -> .lds)
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds_S = LDS     $@
+-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
++      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \
+ 	                     -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
+ 
+ $(obj)/%.lds: $(src)/%.lds.S FORCE
+--- a/include/linux/export.h
++++ b/include/linux/export.h
+@@ -52,12 +52,19 @@ extern struct module __this_module;
+ #define __CRC_SYMBOL(sym, sec)
+ #endif
+ 
++#ifdef MODULE
++#define __EXPORT_SUFFIX(sym)
++#else
++#define __EXPORT_SUFFIX(sym) "+" #sym
++#endif
++
+ /* For every exported symbol, place a struct in the __ksymtab section */
+ #define __EXPORT_SYMBOL(sym, sec)				\
+ 	extern typeof(sym) sym;					\
+ 	__CRC_SYMBOL(sym, sec)					\
+ 	static const char __kstrtab_##sym[]			\
+-	__attribute__((section("__ksymtab_strings"), aligned(1))) \
++	__attribute__((section("__ksymtab_strings"		\
++	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
+ 	= VMLINUX_SYMBOL_STR(sym);				\
+ 	extern const struct kernel_symbol __ksymtab_##sym;	\
+ 	__visible const struct kernel_symbol __ksymtab_##sym	\
diff --git a/trunk/target/linux/generic/patches-3.13/230-openwrt_lzma_options.patch b/trunk/target/linux/generic/patches-3.13/230-openwrt_lzma_options.patch
new file mode 100644
index 00000000..18f900d5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/230-openwrt_lzma_options.patch
@@ -0,0 +1,58 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -226,7 +226,7 @@ cpio_list=
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -n -9 -f"
++compr="gzip -n -9 -f -"
+ 
+ arg="$1"
+ case "$arg" in
+@@ -242,13 +242,13 @@ case "$arg" in
+ 		output=${cpio_list}
+ 		echo "$output_file" | grep -q "\.gz$" \
+                 && [ -x "`which gzip 2> /dev/null`" ] \
+-                && compr="gzip -n -9 -f"
++                && compr="gzip -n -9 -f -"
+ 		echo "$output_file" | grep -q "\.bz2$" \
+                 && [ -x "`which bzip2 2> /dev/null`" ] \
+-                && compr="bzip2 -9 -f"
++                && compr="bzip2 -9 -f -"
+ 		echo "$output_file" | grep -q "\.lzma$" \
+                 && [ -x "`which lzma 2> /dev/null`" ] \
+-                && compr="lzma -9 -f"
++                && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
+ 		echo "$output_file" | grep -q "\.xz$" \
+                 && [ -x "`which xz 2> /dev/null`" ] \
+                 && compr="xz --check=crc32 --lzma2=dict=1MiB"
+@@ -315,7 +315,7 @@ if [ ! -z ${output_file} ]; then
+ 	if [ "${is_cpio_compressed}" = "compressed" ]; then
+ 		cat ${cpio_tfile} > ${output_file}
+ 	else
+-		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
++		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
+ 		|| (rm -f ${output_file} ; false)
+ 	fi
+ 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
+--- a/lib/decompress.c
++++ b/lib/decompress.c
+@@ -47,6 +47,7 @@ static const struct compress_format comp
+ 	{ {037, 0236}, "gzip", gunzip },
+ 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
+ 	{ {0x5d, 0x00}, "lzma", unlzma },
++	{ {0x6d, 0x00}, "lzma-librecmc", unlzma },
+ 	{ {0xfd, 0x37}, "xz", unxz },
+ 	{ {0x89, 0x4c}, "lzo", unlzo },
+ 	{ {0x02, 0x21}, "lz4", unlz4 },
diff --git a/trunk/target/linux/generic/patches-3.13/250-netfilter_depends.patch b/trunk/target/linux/generic/patches-3.13/250-netfilter_depends.patch
new file mode 100644
index 00000000..05a79ea0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/250-netfilter_depends.patch
@@ -0,0 +1,18 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -195,7 +195,6 @@ config NF_CONNTRACK_FTP
+ 
+ config NF_CONNTRACK_H323
+ 	tristate "H.323 protocol support"
+-	depends on (IPV6 || IPV6=n)
+ 	depends on NETFILTER_ADVANCED
+ 	help
+ 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
+@@ -802,7 +801,6 @@ config NETFILTER_XT_TARGET_SECMARK
+ 
+ config NETFILTER_XT_TARGET_TCPMSS
+ 	tristate '"TCPMSS" target support'
+-	depends on (IPV6 || IPV6=n)
+ 	default m if NETFILTER_ADVANCED=n
+ 	---help---
+ 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/trunk/target/linux/generic/patches-3.13/251-sound_kconfig.patch b/trunk/target/linux/generic/patches-3.13/251-sound_kconfig.patch
new file mode 100644
index 00000000..c2ebacec
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/251-sound_kconfig.patch
@@ -0,0 +1,18 @@
+--- a/sound/core/Kconfig
++++ b/sound/core/Kconfig
+@@ -10,13 +10,13 @@ config SND_DMAENGINE_PCM
+ 	tristate
+ 
+ config SND_HWDEP
+-	tristate
++	tristate "Sound hardware support"
+ 
+ config SND_RAWMIDI
+ 	tristate
+ 
+ config SND_COMPRESS_OFFLOAD
+-	tristate
++	tristate "Compression offloading support"
+ 
+ # To be effective this also requires INPUT - users should say:
+ #    select SND_JACK if INPUT=y || INPUT=SND
diff --git a/trunk/target/linux/generic/patches-3.13/252-mv_cesa_depends.patch b/trunk/target/linux/generic/patches-3.13/252-mv_cesa_depends.patch
new file mode 100644
index 00000000..fee28db1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/252-mv_cesa_depends.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
+ 	depends on PLAT_ORION
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES
++	select CRYPTO_HASH2
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_HASH
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.13/253-ssb_b43_default_on.patch b/trunk/target/linux/generic/patches-3.13/253-ssb_b43_default_on.patch
new file mode 100644
index 00000000..29d2a41a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/253-ssb_b43_default_on.patch
@@ -0,0 +1,29 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+ 	bool
+ 	depends on SSB
++	default y
+ 
+ config SSB_PCIHOST_POSSIBLE
+ 	bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
+ config SSB_B43_PCI_BRIDGE
+ 	bool
+ 	depends on SSB_PCIHOST
+-	default n
++	default y
+ 
+ config SSB_PCMCIAHOST_POSSIBLE
+ 	bool
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -17,6 +17,7 @@ config BCMA
+ config BCMA_BLOCKIO
+ 	bool
+ 	depends on BCMA
++	default y
+ 
+ config BCMA_HOST_PCI_POSSIBLE
+ 	bool
diff --git a/trunk/target/linux/generic/patches-3.13/254-textsearch_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.13/254-textsearch_kconfig_hacks.patch
new file mode 100644
index 00000000..00e24b48
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/254-textsearch_kconfig_hacks.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -308,16 +308,16 @@ config BCH_CONST_T
+ # Textsearch support is select'ed if needed
+ #
+ config TEXTSEARCH
+-	boolean
++	boolean	"Textsearch support"
+ 
+ config TEXTSEARCH_KMP
+-	tristate
++	tristate "Textsearch KMP"
+ 
+ config TEXTSEARCH_BM
+-	tristate
++	tristate "Textsearch BM"
+ 
+ config TEXTSEARCH_FSM
+-	tristate
++	tristate "Textsearch FSM"
+ 
+ config BTREE
+ 	boolean
diff --git a/trunk/target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch
new file mode 100644
index 00000000..36281930
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch
@@ -0,0 +1,31 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -140,7 +140,7 @@ config CFG80211_WEXT
+ 	  extensions with cfg80211-based drivers.
+ 
+ config LIB80211
+-	tristate
++	tristate "LIB80211"
+ 	default n
+ 	help
+ 	  This options enables a library of common routines used
+@@ -149,13 +149,16 @@ config LIB80211
+ 	  Drivers should select this themselves if needed.
+ 
+ config LIB80211_CRYPT_WEP
+-	tristate
++	tristate "LIB80211_CRYPT_WEP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_CCMP
+-	tristate
++	tristate "LIB80211_CRYPT_CCMP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_TKIP
+-	tristate
++	tristate "LIB80211_CRYPT_TKIP"
++	select LIB80211
+ 
+ config LIB80211_DEBUG
+ 	bool "lib80211 debugging messages"
diff --git a/trunk/target/linux/generic/patches-3.13/256-crypto_add_kconfig_prompts.patch b/trunk/target/linux/generic/patches-3.13/256-crypto_add_kconfig_prompts.patch
new file mode 100644
index 00000000..8462c711
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/256-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -31,7 +31,7 @@ config CRYPTO_FIPS
+ 	  this is.
+ 
+ config CRYPTO_ALGAPI
+-	tristate
++	tristate "ALGAPI"
+ 	select CRYPTO_ALGAPI2
+ 	help
+ 	  This option provides the API for cryptographic algorithms.
+@@ -40,7 +40,7 @@ config CRYPTO_ALGAPI2
+ 	tristate
+ 
+ config CRYPTO_AEAD
+-	tristate
++	tristate "AEAD"
+ 	select CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -49,7 +49,7 @@ config CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_BLKCIPHER
+-	tristate
++	tristate "BLKCIPHER"
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -60,7 +60,7 @@ config CRYPTO_BLKCIPHER2
+ 	select CRYPTO_WORKQUEUE
+ 
+ config CRYPTO_HASH
+-	tristate
++	tristate "HASH"
+ 	select CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -69,7 +69,7 @@ config CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_RNG
+-	tristate
++	tristate "RNG"
+ 	select CRYPTO_RNG2
+ 	select CRYPTO_ALGAPI
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/257-wireless_ext_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.13/257-wireless_ext_kconfig_hack.patch
new file mode 100644
index 00000000..daac5898
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/257-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-	bool
++	bool "Wireless extensions"
+ 
+ config WEXT_CORE
+ 	def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+ 	depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-	bool
++	bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-	bool
++	bool "WEXT_PRIV"
+ 
+ config CFG80211
+ 	tristate "cfg80211 - wireless configuration API"
diff --git a/trunk/target/linux/generic/patches-3.13/258-netfilter_netlink_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.13/258-netfilter_netlink_kconfig_hack.patch
new file mode 100644
index 00000000..9d827c25
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/258-netfilter_netlink_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -2,7 +2,7 @@ menu "Core Netfilter Configuration"
+ 	depends on NET && INET && NETFILTER
+ 
+ config NETFILTER_NETLINK
+-	tristate
++	tristate "Netfilter NFNETLINK interface"
+ 
+ config NETFILTER_NETLINK_ACCT
+ tristate "Netfilter NFACCT over NFNETLINK interface"
diff --git a/trunk/target/linux/generic/patches-3.13/259-regmap_dynamic.patch b/trunk/target/linux/generic/patches-3.13/259-regmap_dynamic.patch
new file mode 100644
index 00000000..f1324d88
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/259-regmap_dynamic.patch
@@ -0,0 +1,76 @@
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
+@@ -3,23 +3,28 @@
+ # subsystems should select the appropriate symbols.
+ 
+ config REGMAP
+-	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_MMIO || REGMAP_IRQ)
+ 	select LZO_COMPRESS
+ 	select LZO_DECOMPRESS
+ 	select IRQ_DOMAIN if REGMAP_IRQ
+-	bool
++	tristate "Regmap"
+ 
+ config REGMAP_I2C
+-	tristate
++	select REGMAP
++	tristate "Regmap I2C"
+ 
+ config REGMAP_SPI
+-	tristate
++	select REGMAP
++	depends on SPI_MASTER
++	tristate "Regmap SPI"
+ 
+ config REGMAP_SPMI
++	select REGMAP
+ 	tristate
+ 
+ config REGMAP_MMIO
++	select REGMAP
+ 	tristate
+ 
+ config REGMAP_IRQ
++	select REGMAP
+ 	bool
+--- a/include/linux/regmap.h
++++ b/include/linux/regmap.h
+@@ -49,7 +49,7 @@ struct reg_default {
+ 	unsigned int def;
+ };
+ 
+-#ifdef CONFIG_REGMAP
++#if IS_ENABLED(CONFIG_REGMAP)
+ 
+ enum regmap_endian {
+ 	/* Unspecified -> 0 -> Backwards compatible default */
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
+@@ -1,6 +1,8 @@
+-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
+-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
+-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o
++ifdef CONFIG_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/device.h>
+ #include <linux/slab.h>
+ #include <linux/export.h>
++#include <linux/module.h>
+ #include <linux/mutex.h>
+ #include <linux/err.h>
+ #include <linux/rbtree.h>
+@@ -2235,3 +2236,5 @@ static int __init regmap_initcall(void)
+ 	return 0;
+ }
+ postcore_initcall(regmap_initcall);
++
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.13/260-crypto_test_dependencies.patch b/trunk/target/linux/generic/patches-3.13/260-crypto_test_dependencies.patch
new file mode 100644
index 00000000..a28f6930
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/260-crypto_test_dependencies.patch
@@ -0,0 +1,37 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -95,10 +95,10 @@ config CRYPTO_MANAGER
+ 
+ config CRYPTO_MANAGER2
+ 	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+-	select CRYPTO_AEAD2
+-	select CRYPTO_HASH2
+-	select CRYPTO_BLKCIPHER2
+-	select CRYPTO_PCOMP2
++	select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
+ 
+ config CRYPTO_USER
+ 	tristate "Userspace cryptographic algorithm configuration"
+--- a/crypto/algboss.c
++++ b/crypto/algboss.c
+@@ -248,6 +248,9 @@ static int cryptomgr_schedule_test(struc
+ 	type = alg->cra_flags;
+ 
+ 	/* This piece of crap needs to disappear into per-type test hooks. */
++#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
++	type |= CRYPTO_ALG_TESTED;
++#else
+ 	if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
+ 	       CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
+ 	     ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+@@ -256,6 +259,7 @@ static int cryptomgr_schedule_test(struc
+ 	    (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
+ 	     alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
+ 		type |= CRYPTO_ALG_TESTED;
++#endif
+ 
+ 	param->type = type;
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/261-move_bcm963xx_tag.patch b/trunk/target/linux/generic/patches-3.13/261-move_bcm963xx_tag.patch
new file mode 100644
index 00000000..a57d602f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/261-move_bcm963xx_tag.patch
@@ -0,0 +1,219 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
++++ /dev/null
+@@ -1,96 +0,0 @@
+-#ifndef __BCM963XX_TAG_H
+-#define __BCM963XX_TAG_H
+-
+-#define TAGVER_LEN		4	/* Length of Tag Version */
+-#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
+-#define SIG1_LEN		20	/* Company Signature 1 Length */
+-#define SIG2_LEN		14	/* Company Signature 2 Length */
+-#define BOARDID_LEN		16	/* Length of BoardId */
+-#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
+-#define CHIPID_LEN		6	/* Chip Id Length */
+-#define IMAGE_LEN		10	/* Length of Length Field */
+-#define ADDRESS_LEN		12	/* Length of Address field */
+-#define DUALFLAG_LEN		2	/* Dual Image flag Length */
+-#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
+-#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
+-#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
+-#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
+-#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
+-#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
+-
+-#define NUM_PIRELLI		2
+-#define IMAGETAG_CRC_START	0xFFFFFFFF
+-
+-#define PIRELLI_BOARDS { \
+-	"AGPF-S0", \
+-	"DWV-S0", \
+-}
+-
+-/*
+- * The broadcom firmware assumes the rootfs starts the image,
+- * therefore uses the rootfs start (flash_image_address)
+- * to determine where to flash the image.  Since we have the kernel first
+- * we have to give it the kernel address, but the crc uses the length
+- * associated with this address (root_length), which is added to the kernel
+- * length (kernel_length) to determine the length of image to flash and thus
+- * needs to be rootfs + deadcode (jffs2 EOF marker)
+-*/
+-
+-struct bcm_tag {
+-	/* 0-3: Version of the image tag */
+-	char tag_version[TAGVER_LEN];
+-	/* 4-23: Company Line 1 */
+-	char sig_1[SIG1_LEN];
+-	/*  24-37: Company Line 2 */
+-	char sig_2[SIG2_LEN];
+-	/* 38-43: Chip this image is for */
+-	char chip_id[CHIPID_LEN];
+-	/* 44-59: Board name */
+-	char board_id[BOARDID_LEN];
+-	/* 60-61: Map endianness -- 1 BE 0 LE */
+-	char big_endian[ENDIANFLAG_LEN];
+-	/* 62-71: Total length of image */
+-	char total_length[IMAGE_LEN];
+-	/* 72-83: Address in memory of CFE */
+-	char cfe__address[ADDRESS_LEN];
+-	/* 84-93: Size of CFE */
+-	char cfe_length[IMAGE_LEN];
+-	/* 94-105: Address in memory of image start
+-	 * (kernel for libreCMC, rootfs for stock firmware)
+-	 */
+-	char flash_image_start[ADDRESS_LEN];
+-	/* 106-115: Size of rootfs */
+-	char root_length[IMAGE_LEN];
+-	/* 116-127: Address in memory of kernel */
+-	char kernel_address[ADDRESS_LEN];
+-	/* 128-137: Size of kernel */
+-	char kernel_length[IMAGE_LEN];
+-	/* 138-139: Unused at the moment */
+-	char dual_image[DUALFLAG_LEN];
+-	/* 140-141: Unused at the moment */
+-	char inactive_flag[INACTIVEFLAG_LEN];
+-	/* 142-161: RSA Signature (not used; some vendors may use this) */
+-	char rsa_signature[RSASIG_LEN];
+-	/* 162-191: Compilation and related information (not used in libreCMC) */
+-	char information1[TAGINFO1_LEN];
+-	/* 192-195: Version flash layout */
+-	char flash_layout_ver[FLASHLAYOUTVER_LEN];
+-	/* 196-199: kernel+rootfs CRC32 */
+-	__u32 fskernel_crc;
+-	/* 200-215: Unused except on Alice Gate where is is information */
+-	char information2[TAGINFO2_LEN];
+-	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
+-	__u32 image_crc;
+-	/* 220-223: CRC32 of rootfs partition */
+-	__u32 rootfs_crc;
+-	/* 224-227: CRC32 of kernel partition */
+-	__u32 kernel_crc;
+-	/* 228-235: Unused at present */
+-	char reserved1[8];
+-	/* 236-239: CRC32 of header excluding last 20 bytes */
+-	__u32 header_crc;
+-	/* 240-255: Unused at present */
+-	char reserved2[16];
+-};
+-
+-#endif /* __BCM63XX_TAG_H */
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -34,7 +34,7 @@
+ #include <linux/mtd/partitions.h>
+ 
+ #include <asm/mach-bcm63xx/bcm63xx_nvram.h>
+-#include <asm/mach-bcm63xx/bcm963xx_tag.h>
++#include <linux/bcm963xx_tag.h>
+ #include <asm/mach-bcm63xx/board_bcm963xx.h>
+ 
+ #define BCM63XX_EXTENDED_SIZE	0xBFC00000	/* Extended flash address */
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -68,6 +68,7 @@ header-y += binfmts.h
+ header-y += blkpg.h
+ header-y += blktrace_api.h
+ header-y += bpqether.h
++header-y += bcm963xx_tag.h
+ header-y += bsg.h
+ header-y += btrfs.h
+ header-y += can.h
+--- /dev/null
++++ b/include/uapi/linux/bcm963xx_tag.h
+@@ -0,0 +1,96 @@
++#ifndef __BCM963XX_TAG_H
++#define __BCM963XX_TAG_H
++
++#define TAGVER_LEN		4	/* Length of Tag Version */
++#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
++#define SIG1_LEN		20	/* Company Signature 1 Length */
++#define SIG2_LEN		14	/* Company Signature 2 Length */
++#define BOARDID_LEN		16	/* Length of BoardId */
++#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
++#define CHIPID_LEN		6	/* Chip Id Length */
++#define IMAGE_LEN		10	/* Length of Length Field */
++#define ADDRESS_LEN		12	/* Length of Address field */
++#define DUALFLAG_LEN		2	/* Dual Image flag Length */
++#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
++#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
++#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
++#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
++#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
++#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
++
++#define NUM_PIRELLI		2
++#define IMAGETAG_CRC_START	0xFFFFFFFF
++
++#define PIRELLI_BOARDS { \
++	"AGPF-S0", \
++	"DWV-S0", \
++}
++
++/*
++ * The broadcom firmware assumes the rootfs starts the image,
++ * therefore uses the rootfs start (flash_image_address)
++ * to determine where to flash the image.  Since we have the kernel first
++ * we have to give it the kernel address, but the crc uses the length
++ * associated with this address (root_length), which is added to the kernel
++ * length (kernel_length) to determine the length of image to flash and thus
++ * needs to be rootfs + deadcode (jffs2 EOF marker)
++*/
++
++struct bcm_tag {
++	/* 0-3: Version of the image tag */
++	char tag_version[TAGVER_LEN];
++	/* 4-23: Company Line 1 */
++	char sig_1[SIG1_LEN];
++	/*  24-37: Company Line 2 */
++	char sig_2[SIG2_LEN];
++	/* 38-43: Chip this image is for */
++	char chip_id[CHIPID_LEN];
++	/* 44-59: Board name */
++	char board_id[BOARDID_LEN];
++	/* 60-61: Map endianness -- 1 BE 0 LE */
++	char big_endian[ENDIANFLAG_LEN];
++	/* 62-71: Total length of image */
++	char total_length[IMAGE_LEN];
++	/* 72-83: Address in memory of CFE */
++	char cfe__address[ADDRESS_LEN];
++	/* 84-93: Size of CFE */
++	char cfe_length[IMAGE_LEN];
++	/* 94-105: Address in memory of image start
++	 * (kernel for libreCMC, rootfs for stock firmware)
++	 */
++	char flash_image_start[ADDRESS_LEN];
++	/* 106-115: Size of rootfs */
++	char root_length[IMAGE_LEN];
++	/* 116-127: Address in memory of kernel */
++	char kernel_address[ADDRESS_LEN];
++	/* 128-137: Size of kernel */
++	char kernel_length[IMAGE_LEN];
++	/* 138-139: Unused at the moment */
++	char dual_image[DUALFLAG_LEN];
++	/* 140-141: Unused at the moment */
++	char inactive_flag[INACTIVEFLAG_LEN];
++	/* 142-161: RSA Signature (not used; some vendors may use this) */
++	char rsa_signature[RSASIG_LEN];
++	/* 162-191: Compilation and related information (not used in libreCMC) */
++	char information1[TAGINFO1_LEN];
++	/* 192-195: Version flash layout */
++	char flash_layout_ver[FLASHLAYOUTVER_LEN];
++	/* 196-199: kernel+rootfs CRC32 */
++	__u32 fskernel_crc;
++	/* 200-215: Unused except on Alice Gate where is is information */
++	char information2[TAGINFO2_LEN];
++	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
++	__u32 image_crc;
++	/* 220-223: CRC32 of rootfs partition */
++	__u32 rootfs_crc;
++	/* 224-227: CRC32 of kernel partition */
++	__u32 kernel_crc;
++	/* 228-235: Unused at present */
++	char reserved1[8];
++	/* 236-239: CRC32 of header excluding last 20 bytes */
++	__u32 header_crc;
++	/* 240-255: Unused at present */
++	char reserved2[16];
++};
++
++#endif /* __BCM63XX_TAG_H */
diff --git a/trunk/target/linux/generic/patches-3.13/262-compressor_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.13/262-compressor_kconfig_hack.patch
new file mode 100644
index 00000000..654608fc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/262-compressor_kconfig_hack.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -193,16 +193,16 @@ config RANDOM32_SELFTEST
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++	tristate "ZLIB inflate support"
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "ZLIB deflate support"
+ 
+ config LZO_COMPRESS
+-	tristate
++	tristate "LZO compress support"
+ 
+ config LZO_DECOMPRESS
+-	tristate
++	tristate "LZO decompress support"
+ 
+ config LZ4_COMPRESS
+ 	tristate
diff --git a/trunk/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch b/trunk/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch
new file mode 100644
index 00000000..d80fdee7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch
@@ -0,0 +1,39 @@
+From: Mark Miller <mark@mirell.org>
+
+This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
+certain Broadcom chipsets running CFE in order to load the kernel.
+
+Signed-off-by: Mark Miller <mark@mirell.org>
+Acked-by: Rob Landley <rob@landley.net>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -846,9 +846,6 @@ config FW_ARC
+ config ARCH_MAY_HAVE_PC_FDC
+ 	bool
+ 
+-config BOOT_RAW
+-	bool
+-
+ config CEVT_BCM1480
+ 	bool
+ 
+@@ -2349,6 +2346,18 @@ config USE_OF
+ 	select OF_EARLY_FLATTREE
+ 	select IRQ_DOMAIN
+ 
++config BOOT_RAW
++	bool "Enable the kernel to be executed from the load address"
++	default n
++	help
++	 Allow the kernel to be executed from the load address for
++	 bootloaders which cannot read the ELF format. This places
++	 a jump to start_kernel at the load address.
++
++	 If unsure, say N.
++
++
++
+ endmenu
+ 
+ config LOCKDEP_SUPPORT
diff --git a/trunk/target/linux/generic/patches-3.13/301-mips_image_cmdline_hack.patch b/trunk/target/linux/generic/patches-3.13/301-mips_image_cmdline_hack.patch
new file mode 100644
index 00000000..838e3636
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/301-mips_image_cmdline_hack.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -940,6 +940,10 @@ config SYNC_R4K
+ config MIPS_MACHINE
+ 	def_bool n
+ 
++config IMAGE_CMDLINE_HACK
++	bool "libreCMC specific image command line hack"
++	default n
++
+ config NO_IOPORT
+ 	def_bool n
+ 
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -101,6 +101,12 @@ FEXPORT(__kernel_entry)
+ 	j	kernel_entry
+ #endif
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++	.ascii	"CMDLINE:"
++EXPORT(__image_cmdline)
++	.fill	0x400
++#endif /* CONFIG_IMAGE_CMDLINE_HACK */
++
+ 	__REF
+ 
+ NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/trunk/target/linux/generic/patches-3.13/302-mips_no_branch_likely.patch b/trunk/target/linux/generic/patches-3.13/302-mips_no_branch_likely.patch
new file mode 100644
index 00000000..19adcb80
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/302-mips_no_branch_likely.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -87,7 +87,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ # machines may also.  Since BFD is incredibly buggy with respect to
+ # crossformat linking we rely on the elf2ecoff tool for format conversion.
+ #
+-cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
++cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
diff --git a/trunk/target/linux/generic/patches-3.13/304-mips_disable_fpu.patch b/trunk/target/linux/generic/patches-3.13/304-mips_disable_fpu.patch
new file mode 100644
index 00000000..78626182
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/304-mips_disable_fpu.patch
@@ -0,0 +1,160 @@
+MIPS: allow disabling the kernel FPU emulator
+
+This patch allows turning off the in-kernel Algorithmics
+FPU emulator support, which allows one to save a couple of
+precious blocks on an embedded system.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+--
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -928,6 +928,17 @@ config I8259
+ config MIPS_BONITO64
+ 	bool
+ 
++config MIPS_FPU_EMU
++	bool "Enable FPU emulation"
++	default y
++	help
++	   This option allows building a kernel with or without the Algorithmics
++	   FPU emulator enabled. Turning off this option results in a kernel which
++	   does not catch floating operations exceptions. Make sure that your toolchain
++	   is configured to enable software floating point emulation in that case.
++
++	   If unsure say Y here.
++
+ config MIPS_MSC
+ 	bool
+ 
+--- a/arch/mips/math-emu/Makefile
++++ b/arch/mips/math-emu/Makefile
+@@ -2,10 +2,12 @@
+ # Makefile for the Linux/MIPS kernel FPU emulation.
+ #
+ 
+-obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
++obj-y	:= kernel_linkage.o
++
++obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
+ 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
+ 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
+ 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
+ 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
+ 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
+-	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
++	   dp_sqrt.o sp_sqrt.o dsemul.o cp1emu.o
+--- a/arch/mips/math-emu/kernel_linkage.c
++++ b/arch/mips/math-emu/kernel_linkage.c
+@@ -29,6 +29,7 @@
+ 
+ #define SIGNALLING_NAN 0x7ff800007ff80000LL
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ void fpu_emulator_init_fpu(void)
+ {
+ 	static int first = 1;
+@@ -113,3 +114,36 @@ int fpu_emulator_restore_context32(struc
+ 	return err;
+ }
+ #endif
++
++#else
++
++void fpu_emulator_init_fpu(void)
++{
++	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
++		"was compiled with software floating point support (soft-float)\n");
++	return;
++}
++
++int fpu_emulator_save_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++#ifdef CONFIG_64BIT
++int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++#endif /* CONFIG_64BIT */
++
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/include/asm/fpu_emulator.h
++++ b/arch/mips/include/asm/fpu_emulator.h
+@@ -27,6 +27,8 @@
+ #include <asm/inst.h>
+ #include <asm/local.h>
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
++
+ #ifdef CONFIG_DEBUG_FS
+ 
+ struct mips_fpu_emulator_stats {
+@@ -60,6 +62,38 @@ extern int fpu_emulator_cop1Handler(stru
+ int process_fpemu_return(int sig, void __user *fault_addr);
+ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
+ 		     unsigned long *contpc);
++#else
++static inline int mips_dsemul(struct pt_regs *regs, mips_instruction ir,
++			      unsigned long cpc)
++{
++	return 0;
++}
++
++static inline int do_dsemulret(struct pt_regs *xcp)
++{
++	return 0;
++}
++
++static inline int fpu_emulator_cop1Handler(struct pt_regs *xcp,
++					   struct mips_fpu_struct *ctx,
++					   int has_fpu,
++					   void *__user *fault_addr)
++{
++	return 0;
++}
++
++static inline int process_fpemu_return(int sig, void __user *fault_addr)
++{
++	return -EINVAL;
++}
++
++static inline int mm_isBranchInstr(struct pt_regs *regs,
++				   struct mm_decoded_insn dec_insn,
++				   unsigned long *contpc)
++{
++	return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+ 
+ /*
+  * Instruction inserted following the badinst to further tag the sequence
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -700,6 +700,7 @@ asmlinkage void do_ov(struct pt_regs *re
+ 	exception_exit(prev_state);
+ }
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ int process_fpemu_return(int sig, void __user *fault_addr)
+ {
+ 	if (sig == SIGSEGV || sig == SIGBUS) {
+@@ -723,6 +724,7 @@ int process_fpemu_return(int sig, void _
+ 		return 0;
+ 	}
+ }
++#endif /* CONFIG_MIPS_FPU_EMU */
+ 
+ /*
+  * XXX Delayed fp exceptions when doing a lazy ctx switch XXX
diff --git a/trunk/target/linux/generic/patches-3.13/305-mips_module_reloc.patch b/trunk/target/linux/generic/patches-3.13/305-mips_module_reloc.patch
new file mode 100644
index 00000000..2e92916f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/305-mips_module_reloc.patch
@@ -0,0 +1,352 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
++ifdef CONFIG_64BIT
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
++else
++KBUILD_AFLAGS_MODULE		+= -mno-long-calls
++KBUILD_CFLAGS_MODULE		+= -mno-long-calls
++endif
+ 
+ ifndef CONFIG_FUNCTION_TRACER
+ KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -11,6 +11,11 @@ struct mod_arch_specific {
+ 	const struct exception_table_entry *dbe_start;
+ 	const struct exception_table_entry *dbe_end;
+ 	struct mips_hi16 *r_mips_hi16_list;
++
++	void *phys_plt_tbl;
++	void *virt_plt_tbl;
++	unsigned int phys_plt_offset;
++	unsigned int virt_plt_offset;
+ };
+ 
+ typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -43,14 +43,222 @@ struct mips_hi16 {
+ static LIST_HEAD(dbe_list);
+ static DEFINE_SPINLOCK(dbe_lock);
+ 
+-#ifdef MODULE_START
++/*
++ * Get the potential max trampolines size required of the init and
++ * non-init sections. Only used if we cannot find enough contiguous
++ * physically mapped memory to put the module into.
++ */
++static unsigned int
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
++             const char *secstrings, unsigned int symindex, bool is_init)
++{
++	unsigned long ret = 0;
++	unsigned int i, j;
++	Elf_Sym *syms;
++
++	/* Everything marked ALLOC (this includes the exported symbols) */
++	for (i = 1; i < hdr->e_shnum; ++i) {
++		unsigned int info = sechdrs[i].sh_info;
++
++		if (sechdrs[i].sh_type != SHT_REL
++		    && sechdrs[i].sh_type != SHT_RELA)
++			continue;
++
++		/* Not a valid relocation section? */
++		if (info >= hdr->e_shnum)
++			continue;
++
++		/* Don't bother with non-allocated sections */
++		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
++			continue;
++
++		/* If it's called *.init*, and we're not init, we're
++                   not interested */
++		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
++		    != is_init)
++			continue;
++
++		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
++		if (sechdrs[i].sh_type == SHT_REL) {
++			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rel[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		} else {
++			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rela[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		}
++	}
++
++	return ret;
++}
++
++#ifndef MODULE_START
++static void *alloc_phys(unsigned long size)
++{
++	unsigned order;
++	struct page *page;
++	struct page *p;
++
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
++
++	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
++			__GFP_THISNODE, order);
++	if (!page)
++		return NULL;
++
++	split_page(page, order);
++
++	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
++		__free_page(p);
++
++	return page_address(page);
++}
++#endif
++
++static void free_phys(void *ptr, unsigned long size)
++{
++	struct page *page;
++	struct page *end;
++
++	page = virt_to_page(ptr);
++	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
++
++	for (; page < end; ++page)
++		__free_page(page);
++}
++
++
+ void *module_alloc(unsigned long size)
+ {
++#ifdef MODULE_START
+ 	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+ 				GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
+ 				__builtin_return_address(0));
++#else
++	void *ptr;
++
++	if (size == 0)
++		return NULL;
++
++	ptr = alloc_phys(size);
++
++	/* If we failed to allocate physically contiguous memory,
++	 * fall back to regular vmalloc. The module loader code will
++	 * create jump tables to handle long jumps */
++	if (!ptr)
++		return vmalloc(size);
++
++	return ptr;
++#endif
+ }
++
++static inline bool is_phys_addr(void *ptr)
++{
++#ifdef CONFIG_64BIT
++	return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else
++	return (KSEGX(ptr) == KSEG0);
+ #endif
++}
++
++/* Free memory returned from module_alloc */
++void module_free(struct module *mod, void *module_region)
++{
++	if (is_phys_addr(module_region)) {
++		if (mod->module_init == module_region)
++			free_phys(module_region, mod->init_size);
++		else if (mod->module_core == module_region)
++			free_phys(module_region, mod->core_size);
++		else
++			BUG();
++	} else {
++		vfree(module_region);
++	}
++}
++
++static void *__module_alloc(int size, bool phys)
++{
++	void *ptr;
++
++	if (phys)
++		ptr = kmalloc(size, GFP_KERNEL);
++	else
++		ptr = vmalloc(size);
++	return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++	if (is_phys_addr(ptr))
++		kfree(ptr);
++	else
++		vfree(ptr);
++}
++
++int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
++			      char *secstrings, struct module *mod)
++{
++	unsigned int symindex = 0;
++	unsigned int core_size, init_size;
++	int i;
++
++	mod->arch.phys_plt_offset = 0;
++	mod->arch.virt_plt_offset = 0;
++	mod->arch.phys_plt_tbl = NULL;
++	mod->arch.virt_plt_tbl = NULL;
++
++	if (IS_ENABLED(CONFIG_64BIT))
++		return 0;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (sechdrs[i].sh_type == SHT_SYMTAB)
++			symindex = i;
++
++	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
++	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
++
++	if ((core_size + init_size) == 0)
++		return 0;
++
++	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++	if (!mod->arch.phys_plt_tbl)
++		return -ENOMEM;
++
++	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++	if (!mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++		return -ENOMEM;
++	}
++
++	return 0;
++}
+ 
+ int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+ {
+@@ -64,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo
+ 	return 0;
+ }
+ 
++static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
++				 void *start, Elf_Addr v)
++{
++	unsigned *tramp = start + *plt_offset;
++	*plt_offset += 4 * sizeof(int);
++
++	/* adjust carry for addiu */
++	if (v & 0x00008000)
++		v += 0x10000;
++
++	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
++	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
++	tramp[2] = 0x03200008;                  /* jr t9 */
++	tramp[3] = 0x00000000;                  /* nop */
++
++	return (Elf_Addr) tramp;
++}
++
++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++	if (is_phys_addr(location))
++		return add_plt_entry_to(&me->arch.phys_plt_offset,
++				me->arch.phys_plt_tbl, v);
++	else
++		return add_plt_entry_to(&me->arch.virt_plt_offset,
++				me->arch.virt_plt_tbl, v);
++
++}
++
+ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
+ {
++	u32 ofs = *location & 0x03ffffff;
++
+ 	if (v % 4) {
+ 		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
+ 		       me->name);
+@@ -73,14 +312,17 @@ static int apply_r_mips_26_rel(struct mo
+ 	}
+ 
+ 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-		printk(KERN_ERR
+-		       "module %s: relocation overflow\n",
+-		       me->name);
+-		return -ENOEXEC;
++		v = add_plt_entry(me, location, v + (ofs << 2));
++		if (!v) {
++			printk(KERN_ERR
++				"module %s: relocation overflow\n", me->name);
++			return -ENOEXEC;
++		}
++		ofs = 0;
+ 	}
+ 
+ 	*location = (*location & ~0x03ffffff) |
+-		    ((*location + (v >> 2)) & 0x03ffffff);
++		    ((ofs + (v >> 2)) & 0x03ffffff);
+ 
+ 	return 0;
+ }
+@@ -287,11 +529,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		list_add(&me->arch.dbe_list, &dbe_list);
+ 		spin_unlock_irq(&dbe_lock);
+ 	}
++
++	/* Get rid of the fixup trampoline if we're running the module
++	 * from physically mapped address space */
++	if (me->arch.phys_plt_offset == 0) {
++		__module_free(me->arch.phys_plt_tbl);
++		me->arch.phys_plt_tbl = NULL;
++	}
++	if (me->arch.virt_plt_offset == 0) {
++		__module_free(me->arch.virt_plt_tbl);
++		me->arch.virt_plt_tbl = NULL;
++	}
++
+ 	return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++	if (mod->arch.phys_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++	}
++	if (mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.virt_plt_tbl);
++		mod->arch.virt_plt_tbl = NULL;
++	}
++
+ 	spin_lock_irq(&dbe_lock);
+ 	list_del(&mod->arch.dbe_list);
+ 	spin_unlock_irq(&dbe_lock);
diff --git a/trunk/target/linux/generic/patches-3.13/306-mips_mem_functions_performance.patch b/trunk/target/linux/generic/patches-3.13/306-mips_mem_functions_performance.patch
new file mode 100644
index 00000000..98186774
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/306-mips_mem_functions_performance.patch
@@ -0,0 +1,83 @@
+--- a/arch/mips/include/asm/string.h
++++ b/arch/mips/include/asm/string.h
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+ 
+ #define __HAVE_ARCH_MEMSET
+ extern void *memset(void *__s, int __c, size_t __count);
++#define memset(__s, __c, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memset((__s), (__c), __len);		\
++	else							\
++		__ret = __builtin_memset((__s), (__c), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMCPY
+ extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
++#define memcpy(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memcpy((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memcpy((dst), (src), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMMOVE
+ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
++#define memmove(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memmove((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memmove((dst), (src), __len);	\
++	__ret;							\
++})
++
++#define __HAVE_ARCH_MEMCMP
++#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
+ 
+ #endif /* _ASM_STRING_H */
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
+@@ -4,7 +4,7 @@
+ 
+ lib-y	+= bitops.o csum_partial.o delay.o memcpy.o memset.o \
+ 	   mips-atomic.o strlen_user.o strncpy_user.o \
+-	   strnlen_user.o uncached.o
++	   strnlen_user.o uncached.o memcmp.o
+ 
+ obj-y			+= iomap.o
+ obj-$(CONFIG_PCI)	+= iomap-pci.o
+--- /dev/null
++++ b/arch/mips/lib/memcmp.c
+@@ -0,0 +1,22 @@
++/*
++ *  copied from linux/lib/string.c
++ *
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
++
++#include <linux/module.h>
++#include <linux/string.h>
++
++#undef memcmp
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++	const unsigned char *su1, *su2;
++	int res = 0;
++
++	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
++		if ((res = *su1 - *su2) != 0)
++			break;
++	return res;
++}
++EXPORT_SYMBOL(memcmp);
++
diff --git a/trunk/target/linux/generic/patches-3.13/309-mips_fuse_workaround.patch b/trunk/target/linux/generic/patches-3.13/309-mips_fuse_workaround.patch
new file mode 100644
index 00000000..1975215a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/309-mips_fuse_workaround.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -39,6 +39,7 @@ void (*__flush_kernel_vmap_range)(unsign
+ void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);
+ 
+ EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
++EXPORT_SYMBOL(__flush_cache_all);
+ 
+ /* MIPS specific cache operations */
+ void (*flush_cache_sigtramp)(unsigned long addr);
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -20,6 +20,9 @@
+ #include <linux/swap.h>
+ #include <linux/splice.h>
+ #include <linux/aio.h>
++#ifdef CONFIG_MIPS
++#include <asm/cacheflush.h>
++#endif
+ 
+ MODULE_ALIAS_MISCDEV(FUSE_MINOR);
+ MODULE_ALIAS("devname:fuse");
+@@ -759,6 +762,9 @@ static int fuse_copy_fill(struct fuse_co
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
++#ifdef CONFIG_MIPS
++	__flush_cache_all();
++#endif
+ 	if (val) {
+ 		if (cs->write)
+ 			memcpy(cs->buf, *val, ncpy);
diff --git a/trunk/target/linux/generic/patches-3.13/310-arm_module_unresolved_weak_sym.patch b/trunk/target/linux/generic/patches-3.13/310-arm_module_unresolved_weak_sym.patch
new file mode 100644
index 00000000..9210c1d2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/310-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -83,6 +83,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+ 			return -ENOEXEC;
+ 		}
+ 
++		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
++			continue;
++
+ 		loc = dstsec->sh_addr + rel->r_offset;
+ 
+ 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/trunk/target/linux/generic/patches-3.13/320-ppc4xx_optimization.patch b/trunk/target/linux/generic/patches-3.13/320-ppc4xx_optimization.patch
new file mode 100644
index 00000000..e69275d4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/320-ppc4xx_optimization.patch
@@ -0,0 +1,31 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -189,7 +189,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS		+= -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++cpu-as-$(CONFIG_40x)		+= -Wa,-m405
++cpu-as-$(CONFIG_44x)		+= -Wa,-m440
+ cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec
+ cpu-as-$(CONFIG_E200)		+= -Wa,-me200
+ 
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -39,10 +39,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
+ DTC_FLAGS	?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
diff --git a/trunk/target/linux/generic/patches-3.13/321-powerpc_crtsavres_prereq.patch b/trunk/target/linux/generic/patches-3.13/321-powerpc_crtsavres_prereq.patch
new file mode 100644
index 00000000..6a245810
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/321-powerpc_crtsavres_prereq.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -156,7 +156,6 @@ CPP		= $(CC) -E $(KBUILD_CFLAGS)
+ 
+ CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
+ 
+-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
+ 
+ # No AltiVec or VSX instructions when building kernel
+ KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
diff --git a/trunk/target/linux/generic/patches-3.13/400-mtd-add-rootfs-split-support.patch b/trunk/target/linux/generic/patches-3.13/400-mtd-add-rootfs-split-support.patch
new file mode 100644
index 00000000..786c02d0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/400-mtd-add-rootfs-split-support.patch
@@ -0,0 +1,285 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -12,6 +12,32 @@ menuconfig MTD
+ 
+ if MTD
+ 
++menu "libreCMC specific MTD options"
++
++config MTD_ROOTFS_ROOT_DEV
++	bool "Automatically set 'rootfs' partition to be root filesystem"
++	default y
++
++config MTD_ROOTFS_SPLIT
++	bool "Automatically split 'rootfs' partition for squashfs"
++	default y
++
++config MTD_SPLIT_FIRMWARE
++	bool "Automatically split firmware partition for kernel+rootfs"
++	default y
++
++config MTD_SPLIT_FIRMWARE_NAME
++	string "Firmware partition name"
++	depends on MTD_SPLIT_FIRMWARE
++	default "firmware"
++
++config MTD_UIMAGE_SPLIT
++	bool "Enable split support for firmware partitions containing a uImage"
++	depends on MTD_SPLIT_FIRMWARE
++	default y
++
++endmenu
++
+ config MTD_TESTS
+ 	tristate "MTD tests support (DANGEROUS)"
+ 	depends on m
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -29,6 +29,7 @@
+ #include <linux/kmod.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/magic.h>
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
+@@ -45,13 +46,14 @@ struct mtd_part {
+ 	struct list_head list;
+ };
+ 
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
++
+ /*
+  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
+  * the pointer to that structure with this macro.
+  */
+ #define PART(x)  ((struct mtd_part *)(x))
+ 
+-
+ /*
+  * MTD methods which simply translate the effective address and pass through
+  * to the _real_ device.
+@@ -534,8 +536,10 @@ out_register:
+ 	return slave;
+ }
+ 
+-int mtd_add_partition(struct mtd_info *master, char *name,
+-		      long long offset, long long length)
++
++static int
++__mtd_add_partition(struct mtd_info *master, char *name,
++		    long long offset, long long length, bool dup_check)
+ {
+ 	struct mtd_partition part;
+ 	struct mtd_part *p, *new;
+@@ -567,21 +571,24 @@ int mtd_add_partition(struct mtd_info *m
+ 	end = offset + length;
+ 
+ 	mutex_lock(&mtd_partitions_mutex);
+-	list_for_each_entry(p, &mtd_partitions, list)
+-		if (p->master == master) {
+-			if ((start >= p->offset) &&
+-			    (start < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-
+-			if ((end >= p->offset) &&
+-			    (end < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-		}
++	if (dup_check) {
++		list_for_each_entry(p, &mtd_partitions, list)
++			if (p->master == master) {
++				if ((start >= p->offset) &&
++				    (start < (p->offset + p->mtd.size)))
++					goto err_inv;
++
++				if ((end >= p->offset) &&
++				    (end < (p->offset + p->mtd.size)))
++					goto err_inv;
++			}
++	}
+ 
+ 	list_add(&new->list, &mtd_partitions);
+ 	mutex_unlock(&mtd_partitions_mutex);
+ 
+ 	add_mtd_device(&new->mtd);
++	mtd_partition_split(master, new);
+ 
+ 	return ret;
+ err_inv:
+@@ -591,6 +598,12 @@ err_inv:
+ }
+ EXPORT_SYMBOL_GPL(mtd_add_partition);
+ 
++int mtd_add_partition(struct mtd_info *master, char *name,
++		      long long offset, long long length)
++{
++	return __mtd_add_partition(master, name, offset, length, true);
++}
++
+ int mtd_del_partition(struct mtd_info *master, int partno)
+ {
+ 	struct mtd_part *slave, *next;
+@@ -614,6 +627,144 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static inline unsigned long
++mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
++{
++	unsigned long mask = mtd->erasesize - 1;
++
++	len += offset & mask;
++	len = (len + mask) & ~mask;
++	len -= offset & mask;
++	return len;
++}
++
++#define ROOTFS_SPLIT_NAME "rootfs_data"
++
++struct squashfs_super_block {
++	__le32 s_magic;
++	__le32 pad0[9];
++	__le64 bytes_used;
++};
++
++
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++	struct squashfs_super_block sb;
++	int len, ret;
++
++	ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
++	if (ret || (len != sizeof(sb))) {
++		printk(KERN_ALERT "split_squashfs: error occured while reading "
++			"from \"%s\"\n", master->name);
++		return -EINVAL;
++	}
++
++	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
++		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	if (le64_to_cpu((sb.bytes_used)) <= 0) {
++		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	len = (u32) le64_to_cpu(sb.bytes_used);
++	len = mtd_pad_erasesize(master, offset, len);
++	*split_offset = offset + len;
++
++	return 0;
++}
++
++static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
++{
++	unsigned int split_offset = 0;
++	unsigned int split_size;
++	int ret;
++
++	ret = split_squashfs(master, part->offset, &split_offset);
++	if (ret)
++		return;
++
++	if (split_offset <= 0)
++		return;
++
++	split_size = part->mtd.size - (split_offset - part->offset);
++	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
++		ROOTFS_SPLIT_NAME, split_offset, split_size);
++
++	__mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
++			    split_size, false);
++}
++
++#define UBOOT_MAGIC	0x27051956
++
++static void split_uimage(struct mtd_info *master, struct mtd_part *part)
++{
++	struct {
++		__be32 magic;
++		__be32 pad[2];
++		__be32 size;
++	} hdr;
++	size_t len;
++
++	if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
++		return;
++
++	if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
++		return;
++
++	len = be32_to_cpu(hdr.size) + 0x40;
++	len = mtd_pad_erasesize(master, part->offset, len);
++	if (len + master->erasesize > part->mtd.size)
++		return;
++
++	__mtd_add_partition(master, "rootfs", part->offset + len,
++			    part->mtd.size - len, false);
++}
++
++#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#define SPLIT_FIRMWARE_NAME	CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#else
++#define SPLIT_FIRMWARE_NAME	"unused"
++#endif
++
++static void split_firmware(struct mtd_info *master, struct mtd_part *part)
++{
++	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
++		split_uimage(master, part);
++}
++
++void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
++                                int offset, int size)
++{
++}
++
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
++{
++	static int rootfs_found = 0;
++
++	if (rootfs_found)
++		return;
++
++	if (!strcmp(part->mtd.name, "rootfs")) {
++		rootfs_found = 1;
++
++		if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
++			split_rootfs_data(master, part);
++	}
++
++	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
++	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
++		split_firmware(master, part);
++
++	arch_split_mtd_part(master, part->mtd.name, part->offset,
++			    part->mtd.size);
++}
+ /*
+  * This function, given a master MTD object and a partition table, creates
+  * and registers slave MTD objects which are bound to the master according to
+@@ -643,6 +794,7 @@ int add_mtd_partitions(struct mtd_info *
+ 		mutex_unlock(&mtd_partitions_mutex);
+ 
+ 		add_mtd_device(&slave->mtd);
++		mtd_partition_split(master, slave);
+ 
+ 		cur_offset = slave->offset + slave->mtd.size;
+ 	}
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
++extern void __weak arch_split_mtd_part(struct mtd_info *master,
++				       const char *name, int offset, int size);
+ 
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.13/401-mtd-add-support-for-different-partition-parser-types.patch b/trunk/target/linux/generic/patches-3.13/401-mtd-add-support-for-different-partition-parser-types.patch
new file mode 100644
index 00000000..52b87f56
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -0,0 +1,113 @@
+From 02cff0ccaa6d364f5c1eeea83f47ac80ccc967d4 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Tue, 3 Sep 2013 18:11:50 +0200
+Subject: [PATCH] mtd: add support for different partition parser types
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/mtdpart.c          |   56 ++++++++++++++++++++++++++++++++++++++++
+ include/linux/mtd/partitions.h |   11 ++++++++
+ 2 files changed, 67 insertions(+)
+
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -824,6 +824,30 @@ static struct mtd_part_parser *get_parti
+ 
+ #define put_partition_parser(p) do { module_put((p)->owner); } while (0)
+ 
++static struct mtd_part_parser *
++get_partition_parser_by_type(enum mtd_parser_type type,
++			     struct mtd_part_parser *start)
++{
++	struct mtd_part_parser *p, *ret = NULL;
++
++	spin_lock(&part_parser_lock);
++
++	p = list_prepare_entry(start, &part_parsers, list);
++	if (start)
++		put_partition_parser(start);
++
++	list_for_each_entry_continue(p, &part_parsers, list) {
++		if (p->type == type && try_module_get(p->owner)) {
++			ret = p;
++			break;
++		}
++	}
++
++	spin_unlock(&part_parser_lock);
++
++	return ret;
++}
++
+ int register_mtd_parser(struct mtd_part_parser *p)
+ {
+ 	spin_lock(&part_parser_lock);
+@@ -900,6 +924,38 @@ int parse_mtd_partitions(struct mtd_info
+ 	return ret;
+ }
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data)
++{
++	struct mtd_part_parser *prev = NULL;
++	int ret = 0;
++
++	while (1) {
++		struct mtd_part_parser *parser;
++
++		parser = get_partition_parser_by_type(type, prev);
++		if (!parser)
++			break;
++
++		ret = (*parser->parse_fn)(master, pparts, data);
++
++		if (ret > 0) {
++			put_partition_parser(parser);
++			printk(KERN_NOTICE
++			       "%d %s partitions found on MTD device %s\n",
++			       ret, parser->name, master->name);
++			break;
++		}
++
++		prev = parser;
++	}
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(parse_mtd_partitions_by_type);
++
+ int mtd_is_partition(const struct mtd_info *mtd)
+ {
+ 	struct mtd_part *part;
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -68,12 +68,17 @@ struct mtd_part_parser_data {
+  * Functions dealing with the various ways of partitioning the space
+  */
+ 
++enum mtd_parser_type {
++	MTD_PARSER_TYPE_DEVICE = 0,
++};
++
+ struct mtd_part_parser {
+ 	struct list_head list;
+ 	struct module *owner;
+ 	const char *name;
+ 	int (*parse_fn)(struct mtd_info *, struct mtd_partition **,
+ 			struct mtd_part_parser_data *);
++	enum mtd_parser_type type;
+ };
+ 
+ extern int register_mtd_parser(struct mtd_part_parser *parser);
+@@ -87,4 +92,9 @@ uint64_t mtd_get_device_size(const struc
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data);
++
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.13/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/trunk/target/linux/generic/patches-3.13/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
new file mode 100644
index 00000000..a6140948
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -0,0 +1,75 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -627,6 +627,37 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static int
++run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
++{
++	struct mtd_partition *parts;
++	int nr_parts;
++	int i;
++
++	nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, &parts,
++						NULL);
++	if (nr_parts <= 0)
++		return nr_parts;
++
++	if (WARN_ON(!parts))
++		return 0;
++
++	for (i = 0; i < nr_parts; i++) {
++		/* adjust partition offsets */
++		parts[i].offset += slave->offset;
++
++		__mtd_add_partition(slave->master,
++				    parts[i].name,
++				    parts[i].offset,
++				    parts[i].size,
++				    false);
++	}
++
++	kfree(parts);
++
++	return nr_parts;
++}
++
+ static inline unsigned long
+ mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
+ {
+@@ -686,6 +717,10 @@ static void split_rootfs_data(struct mtd
+ 	unsigned int split_size;
+ 	int ret;
+ 
++	ret = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++	if (ret > 0)
++		return;
++
+ 	ret = split_squashfs(master, part->offset, &split_offset);
+ 	if (ret)
+ 		return;
+@@ -735,6 +770,12 @@ static void split_uimage(struct mtd_info
+ 
+ static void split_firmware(struct mtd_info *master, struct mtd_part *part)
+ {
++	int ret;
++
++	ret = run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
++	if (ret > 0)
++		return;
++
+ 	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
+ 		split_uimage(master, part);
+ }
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -70,6 +70,8 @@ struct mtd_part_parser_data {
+ 
+ enum mtd_parser_type {
+ 	MTD_PARSER_TYPE_DEVICE = 0,
++	MTD_PARSER_TYPE_ROOTFS,
++	MTD_PARSER_TYPE_FIRMWARE,
+ };
+ 
+ struct mtd_part_parser {
diff --git a/trunk/target/linux/generic/patches-3.13/403-mtd-hook-mtdsplit-to-Kbuild.patch b/trunk/target/linux/generic/patches-3.13/403-mtd-hook-mtdsplit-to-Kbuild.patch
new file mode 100644
index 00000000..c24f34c5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/403-mtd-hook-mtdsplit-to-Kbuild.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -36,6 +36,11 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++config MTD_SPLIT
++	def_bool n
++	help 
++	  Generic MTD split support.
++
+ endmenu
+ 
+ config MTD_TESTS
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -6,6 +6,8 @@
+ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
++mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
+ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
diff --git a/trunk/target/linux/generic/patches-3.13/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch b/trunk/target/linux/generic/patches-3.13/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch
new file mode 100644
index 00000000..a54b97b0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/404-mtd-use-mtd_get_squashfs_len-in-split_squasfh.patch
@@ -0,0 +1,69 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -33,6 +33,7 @@
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
++#include "mtdsplit.h"
+ 
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+@@ -669,43 +670,16 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+ 	return len;
+ }
+ 
+-#define ROOTFS_SPLIT_NAME "rootfs_data"
+-
+-struct squashfs_super_block {
+-	__le32 s_magic;
+-	__le32 pad0[9];
+-	__le64 bytes_used;
+-};
+-
+-
+ static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
+ {
+-	struct squashfs_super_block sb;
++	size_t squashfs_len;
+ 	int len, ret;
+ 
+-	ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
+-	if (ret || (len != sizeof(sb))) {
+-		printk(KERN_ALERT "split_squashfs: error occured while reading "
+-			"from \"%s\"\n", master->name);
+-		return -EINVAL;
+-	}
+-
+-	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
+-		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
+-			master->name);
+-		*split_offset = 0;
+-		return 0;
+-	}
+-
+-	if (le64_to_cpu((sb.bytes_used)) <= 0) {
+-		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
+-			master->name);
+-		*split_offset = 0;
+-		return 0;
+-	}
++	ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
++	if (ret)
++		return ret;
+ 
+-	len = (u32) le64_to_cpu(sb.bytes_used);
+-	len = mtd_pad_erasesize(master, offset, len);
++	len = mtd_pad_erasesize(master, offset, squashfs_len);
+ 	*split_offset = offset + len;
+ 
+ 	return 0;
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -20,6 +20,7 @@ config MTD_ROOTFS_ROOT_DEV
+ 
+ config MTD_ROOTFS_SPLIT
+ 	bool "Automatically split 'rootfs' partition for squashfs"
++	select MTD_SPLIT
+ 	default y
+ 
+ config MTD_SPLIT_FIRMWARE
diff --git a/trunk/target/linux/generic/patches-3.13/405-mtd-add-more-helper-functions.patch b/trunk/target/linux/generic/patches-3.13/405-mtd-add-more-helper-functions.patch
new file mode 100644
index 00000000..02a00fc6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/405-mtd-add-more-helper-functions.patch
@@ -0,0 +1,83 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -434,14 +434,12 @@ static struct mtd_part *allocate_partiti
+ 	if (slave->offset == MTDPART_OFS_APPEND)
+ 		slave->offset = cur_offset;
+ 	if (slave->offset == MTDPART_OFS_NXTBLK) {
+-		slave->offset = cur_offset;
+-		if (mtd_mod_by_eb(cur_offset, master) != 0) {
+-			/* Round up to next erasesize */
+-			slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
++		/* Round up to next erasesize */
++		slave->offset = mtd_roundup_to_eb(cur_offset, master);
++		if (slave->offset != cur_offset)
+ 			printk(KERN_NOTICE "Moving partition %d: "
+ 			       "0x%012llx -> 0x%012llx\n", partno,
+ 			       (unsigned long long)cur_offset, (unsigned long long)slave->offset);
+-		}
+ 	}
+ 	if (slave->offset == MTDPART_OFS_RETAIN) {
+ 		slave->offset = cur_offset;
+@@ -988,6 +986,24 @@ int mtd_is_partition(const struct mtd_in
+ }
+ EXPORT_SYMBOL_GPL(mtd_is_partition);
+ 
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return (struct mtd_info *)mtd;
++
++	return PART(mtd)->master;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_master);
++
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return 0;
++
++	return PART(mtd)->offset;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_offset);
++
+ /* Returns the size of the entire flash chip */
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd)
+ {
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -90,6 +90,8 @@ int mtd_is_partition(const struct mtd_in
+ int mtd_add_partition(struct mtd_info *master, char *name,
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -331,6 +331,24 @@ static inline uint32_t mtd_mod_by_eb(uin
+ 	return do_div(sz, mtd->erasesize);
+ }
+ 
++static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round up to next erase block */
++	return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize;
++}
++
++static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round down to the start of the current erase block */
++	return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize;
++}
++
+ static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
+ {
+ 	if (mtd->writesize_shift)
diff --git a/trunk/target/linux/generic/patches-3.13/406-mtd-add-squashfs-parser.patch b/trunk/target/linux/generic/patches-3.13/406-mtd-add-squashfs-parser.patch
new file mode 100644
index 00000000..b3ff9d9a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/406-mtd-add-squashfs-parser.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -37,6 +37,17 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++comment "Rootfs partition parsers"
++
++config MTD_SPLIT_SQUASHFS_ROOT
++	bool "Squashfs based root partition parser"
++	select MTD_SPLIT
++	default n
++	help
++	  This provides a parsing function which allows to detect the
++	  offset and size of the unused portion of a rootfs partition
++	  containing a squashfs.
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.13/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.13/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch
new file mode 100644
index 00000000..02697f64
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/407-mtd-hook-mtdsplit_uimage-into-Kbuild.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -48,6 +48,12 @@ config MTD_SPLIT_SQUASHFS_ROOT
+ 	  offset and size of the unused portion of a rootfs partition
+ 	  containing a squashfs.
+ 
++comment "Firmware partition parsers"
++
++config MTD_SPLIT_UIMAGE_FW
++	bool "uImage based firmware partition parser"
++	select MTD_SPLIT
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -8,6 +8,7 @@ mtd-y				:= mtdcore.o mtdsuper.o mtdconc
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
+ mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
++mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.13/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.13/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch
new file mode 100644
index 00000000..016a9b6e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/408-mtd-hook-mtdsplit_seama-into-Kbuild.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -50,6 +50,10 @@ config MTD_SPLIT_SQUASHFS_ROOT
+ 
+ comment "Firmware partition parsers"
+ 
++config MTD_SPLIT_SEAMA_FW
++	bool "Seama firmware parser"
++	select MTD_SPLIT
++
+ config MTD_SPLIT_UIMAGE_FW
+ 	bool "uImage based firmware partition parser"
+ 	select MTD_SPLIT
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++mtd-$(CONFIG_MTD_SPLIT_SEAMA_FW) += mtdsplit_seama.o
+ mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
+ mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.13/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch
new file mode 100644
index 00000000..cc9a9715
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/409-mtd-hook-mtdsplit_lzma-into-Kbuild.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -58,6 +58,10 @@ config MTD_SPLIT_UIMAGE_FW
+ 	bool "uImage based firmware partition parser"
+ 	select MTD_SPLIT
+ 
++config MTD_SPLIT_LZMA_FW
++	bool "LZMA compressed kernel based firmware partition parser"
++	select MTD_SPLIT
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -10,6 +10,7 @@ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
+ mtd-$(CONFIG_MTD_SPLIT_SEAMA_FW) += mtdsplit_seama.o
+ mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
+ mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
++mtd-$(CONFIG_MTD_SPLIT_LZMA_FW) += mtdsplit_lzma.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.13/410-mtd-move-forward-declaration-of-struct-mtd_info.patch b/trunk/target/linux/generic/patches-3.13/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
new file mode 100644
index 00000000..4657b43a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
@@ -0,0 +1,18 @@
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -35,6 +35,7 @@
+  * Note: writeable partitions require their size and offset be
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
++struct mtd_info;
+ 
+ struct mtd_partition {
+ 	char *name;			/* identifier string */
+@@ -50,7 +51,6 @@ struct mtd_partition {
+ #define MTDPART_SIZ_FULL	(0)
+ 
+ 
+-struct mtd_info;
+ struct device_node;
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.13/411-mtd-partial_eraseblock_write.patch b/trunk/target/linux/generic/patches-3.13/411-mtd-partial_eraseblock_write.patch
new file mode 100644
index 00000000..8da080b2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/411-mtd-partial_eraseblock_write.patch
@@ -0,0 +1,146 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -35,6 +35,8 @@
+ #include "mtdcore.h"
+ #include "mtdsplit.h"
+ 
++#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
++
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+ static DEFINE_MUTEX(mtd_partitions_mutex);
+@@ -231,13 +233,61 @@ static int part_erase(struct mtd_info *m
+ 	struct mtd_part *part = PART(mtd);
+ 	int ret;
+ 
++
++	instr->partial_start = false;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		size_t readlen = 0;
++		u64 mtd_ofs;
++
++		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
++		if (!instr->erase_buf)
++			return -ENOMEM;
++
++		mtd_ofs = part->offset + instr->addr;
++		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
++
++		if (instr->erase_buf_ofs > 0) {
++			instr->addr -= instr->erase_buf_ofs;
++			ret = mtd_read(part->master,
++				instr->addr + part->offset,
++				part->master->erasesize,
++				&readlen, instr->erase_buf);
++
++			instr->len += instr->erase_buf_ofs;
++			instr->partial_start = true;
++		} else {
++			mtd_ofs = part->offset + part->mtd.size;
++			instr->erase_buf_ofs = part->master->erasesize -
++				do_div(mtd_ofs, part->master->erasesize);
++
++			if (instr->erase_buf_ofs > 0) {
++				instr->len += instr->erase_buf_ofs;
++				ret = mtd_read(part->master,
++					part->offset + instr->addr +
++					instr->len - part->master->erasesize,
++					part->master->erasesize, &readlen,
++					instr->erase_buf);
++			} else {
++				ret = 0;
++			}
++		}
++		if (ret < 0) {
++			kfree(instr->erase_buf);
++			return ret;
++		}
++
++	}
++
+ 	instr->addr += part->offset;
+ 	ret = part->master->_erase(part->master, instr);
+ 	if (ret) {
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
++		if (mtd->flags & MTD_ERASE_PARTIAL)
++			kfree(instr->erase_buf);
+ 	}
++
+ 	return ret;
+ }
+ 
+@@ -245,7 +295,25 @@ void mtd_erase_callback(struct erase_inf
+ {
+ 	if (instr->mtd->_erase == part_erase) {
+ 		struct mtd_part *part = PART(instr->mtd);
++		size_t wrlen = 0;
+ 
++		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
++			if (instr->partial_start) {
++				part->master->_write(part->master,
++					instr->addr, instr->erase_buf_ofs,
++					&wrlen, instr->erase_buf);
++				instr->addr += instr->erase_buf_ofs;
++			} else {
++				instr->len -= instr->erase_buf_ofs;
++				part->master->_write(part->master,
++					instr->addr + instr->len,
++					instr->erase_buf_ofs, &wrlen,
++					instr->erase_buf +
++					part->master->erasesize -
++					instr->erase_buf_ofs);
++			}
++			kfree(instr->erase_buf);
++		}
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
+@@ -503,18 +571,24 @@ static struct mtd_part *allocate_partiti
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+ 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
+ 		/* Doesn't start on a boundary of major erase size */
+-		/* FIXME: Let it be writable if it is on a boundary of
+-		 * _minor_ erase size though */
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
+-			part->name);
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++		if (((u32) slave->mtd.size) > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+-	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
+-			part->name);
++	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++
++		if ((u32) slave->mtd.size > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
++	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
++		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
++				part->name);
+ 
+ 	slave->mtd.ecclayout = master->ecclayout;
+ 	slave->mtd.ecc_step_size = master->ecc_step_size;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -55,6 +55,10 @@ struct erase_info {
+ 	u_long priv;
+ 	u_char state;
+ 	struct erase_info *next;
++
++	u8 *erase_buf;
++	u32 erase_buf_ofs;
++	bool partial_start;
+ };
+ 
+ struct mtd_erase_region_info {
diff --git a/trunk/target/linux/generic/patches-3.13/412-mtd-partial_eraseblock_unlock.patch b/trunk/target/linux/generic/patches-3.13/412-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 00000000..87c8257f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/412-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -332,7 +332,14 @@ static int part_lock(struct mtd_info *mt
+ static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+ {
+ 	struct mtd_part *part = PART(mtd);
+-	return part->master->_unlock(part->master, ofs + part->offset, len);
++
++	ofs += part->offset;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		/* round up len to next erasesize and round down offset to prev block */
++		len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++		ofs &= ~(part->master->erasesize - 1);
++	}
++	return part->master->_unlock(part->master, ofs, len);
+ }
+ 
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/trunk/target/linux/generic/patches-3.13/420-mtd-redboot_space.patch b/trunk/target/linux/generic/patches-3.13/420-mtd-redboot_space.patch
new file mode 100644
index 00000000..f74affce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/420-mtd-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru
+ #endif
+ 		names += strlen(names)+1;
+ 
+-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+-			i++;
+-			parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-			parts[i].size = fl->next->img->flash_base - parts[i].offset;
+-			parts[i].name = nullname;
+-		}
++			if (!strcmp(parts[i].name, "rootfs")) {
++				parts[i].size = fl->next->img->flash_base;
++				parts[i].size &= ~(master->erasesize - 1);
++				parts[i].size -= parts[i].offset;
++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
++				nrparts--;
++			} else {
++				i++;
++				parts[i].offset = parts[i-1].size + parts[i-1].offset;
++				parts[i].size = fl->next->img->flash_base - parts[i].offset;
++				parts[i].name = nullname;
+ #endif
++			}
++		}
+ 		tmp_fl = fl;
+ 		fl = fl->next;
+ 		kfree(tmp_fl);
diff --git a/trunk/target/linux/generic/patches-3.13/430-mtd-add-myloader-partition-parser.patch b/trunk/target/linux/generic/patches-3.13/430-mtd-add-myloader-partition-parser.patch
new file mode 100644
index 00000000..fc352d27
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/430-mtd-add-myloader-partition-parser.patch
@@ -0,0 +1,35 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -212,6 +212,22 @@ config MTD_BCM47XX_PARTS
+ 	  This provides partitions parser for devices based on BCM47xx
+ 	  boards.
+ 
++config MTD_MYLOADER_PARTS
++	tristate "MyLoader partition parsing"
++	depends on ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX || ATH79
++	---help---
++	  MyLoader is a bootloader which allows the user to define partitions
++	  in flash devices, by putting a table in the second erase block
++	  on the device, similar to a partition table. This table gives the 
++	  offsets and lengths of the user defined partitions.
++
++	  If you need code which can detect and parse these tables, and
++	  register MTD 'partitions' corresponding to each image detected,
++	  enable this option.
++
++	  You will still need the parsing functions to be called by the driver
++	  for your particular device. It won't happen automatically.
++
+ comment "User Modules And Translation Layers"
+ 
+ config MTD_BLKDEVS
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
++obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_BLKDEVS)	+= mtd_blkdevs.o
diff --git a/trunk/target/linux/generic/patches-3.13/440-block2mtd_init.patch b/trunk/target/linux/generic/patches-3.13/440-block2mtd_init.patch
new file mode 100644
index 00000000..a5819984
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/440-block2mtd_init.patch
@@ -0,0 +1,107 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -17,6 +17,7 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
+ #include <linux/mutex.h>
+ #include <linux/mount.h>
+ #include <linux/slab.h>
+@@ -210,11 +211,12 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+ 	struct block_device *bdev;
+ 	struct block2mtd_dev *dev;
++	struct mtd_partition *part;
+ 	char *name;
+ 
+ 	if (!devname)
+@@ -253,13 +255,16 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+-	name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
++	if (!mtdname)
++		mtdname = devname;
++	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
+ 	if (!name)
+ 		goto devinit_err;
+ 
++	strcpy(name, mtdname);
+ 	dev->mtd.name = name;
+ 
+-	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
++	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
+ 	dev->mtd.erasesize = erase_size;
+ 	dev->mtd.writesize = 1;
+ 	dev->mtd.writebufsize = PAGE_SIZE;
+@@ -272,15 +277,18 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
+ 
+-	if (mtd_device_register(&dev->mtd, NULL, 0)) {
++	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
++	part->name = name;
++	part->offset = 0;
++	part->size = dev->mtd.size;
++	if (mtd_device_register(&dev->mtd, part, 1)) {
+ 		/* Device didn't get added, so free the entry */
+ 		goto devinit_err;
+ 	}
+ 	list_add(&dev->list, &blkmtd_device_list);
+ 	pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n",
+ 		dev->mtd.index,
+-		dev->mtd.name + strlen("block2mtd: "),
+-		dev->mtd.erasesize >> 10, dev->mtd.erasesize);
++		mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+ 	return dev;
+ 
+ devinit_err:
+@@ -347,9 +355,9 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12]; /* 80 for device, 12 for erase size */
++	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
+ 	char *str = buf;
+-	char *token[2];
++	char *token[3];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
+ 	int i, ret;
+@@ -362,7 +370,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 2; i++)
++	for (i = 0; i < 3; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str) {
+@@ -388,8 +396,10 @@ static int block2mtd_setup2(const char *
+ 			return 0;
+ 		}
+ 	}
++	if (token[2] && (strlen(token[2]) + 1 > 80))
++		pr_err("mtd device name too long\n");
+ 
+-	add_device(name, erase_size);
++	add_device(name, erase_size, token[2]);
+ 
+ 	return 0;
+ }
+@@ -423,7 +433,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
diff --git a/trunk/target/linux/generic/patches-3.13/441-block2mtd_probe.patch b/trunk/target/linux/generic/patches-3.13/441-block2mtd_probe.patch
new file mode 100644
index 00000000..3ab9d1a3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/441-block2mtd_probe.patch
@@ -0,0 +1,108 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -10,6 +10,7 @@
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/module.h>
++#include <linux/delay.h>
+ #include <linux/fs.h>
+ #include <linux/blkdev.h>
+ #include <linux/bio.h>
+@@ -211,13 +212,14 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname, int timeout)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+-	struct block_device *bdev;
++	struct block_device *bdev = ERR_PTR(-ENODEV);
+ 	struct block2mtd_dev *dev;
+ 	struct mtd_partition *part;
+ 	char *name;
++	int i;
+ 
+ 	if (!devname)
+ 		return NULL;
+@@ -228,15 +230,20 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Get a handle on the device */
+ 	bdev = blkdev_get_by_path(devname, mode, dev);
++
+ #ifndef MODULE
+-	if (IS_ERR(bdev)) {
++	for (i = 0; IS_ERR(bdev) && i <= timeout; i++) {
++		dev_t devt;
+ 
+-		/* We might not have rootfs mounted at this point. Try
+-		   to resolve the device name by other means. */
++		if (i)
++			msleep(1000);
++		wait_for_device_probe();
++
++		devt = name_to_dev_t(devname);
++		if (!devt)
++			continue;
+ 
+-		dev_t devt = name_to_dev_t(devname);
+-		if (devt)
+-			bdev = blkdev_get_by_dev(devt, mode, dev);
++		bdev = blkdev_get_by_dev(devt, mode, dev);
+ 	}
+ #endif
+ 
+@@ -355,11 +362,12 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
++	char buf[80 + 12 + 80 + 8]; /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
+ 	char *str = buf;
+-	char *token[3];
++	char *token[4];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
++	unsigned long timeout = 0;
+ 	int i, ret;
+ 
+ 	if (strnlen(val, sizeof(buf)) >= sizeof(buf)) {
+@@ -370,7 +378,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 3; i++)
++	for (i = 0; i < 4; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str) {
+@@ -399,7 +407,10 @@ static int block2mtd_setup2(const char *
+ 	if (token[2] && (strlen(token[2]) + 1 > 80))
+ 		pr_err("mtd device name too long\n");
+ 
+-	add_device(name, erase_size, token[2]);
++	if (token[3] && kstrtoul(token[3], 0, &timeout))
++		pr_err("invalid timeout\n");
++
++	add_device(name, erase_size, token[2], timeout);
+ 
+ 	return 0;
+ }
+@@ -433,7 +444,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
+@@ -467,7 +478,7 @@ static void block2mtd_exit(void)
+ }
+ 
+ 
+-module_init(block2mtd_init);
++late_initcall(block2mtd_init);
+ module_exit(block2mtd_exit);
+ 
+ MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.13/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch b/trunk/target/linux/generic/patches-3.13/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
new file mode 100644
index 00000000..81a6251c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
@@ -0,0 +1,37 @@
+---
+ drivers/mtd/nand/plat_nand.c |   13 ++++++++++++-
+ include/linux/mtd/nand.h     |    1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -721,6 +721,7 @@ struct platform_nand_chip {
+ 	unsigned int options;
+ 	unsigned int bbt_options;
+ 	const char **part_probe_types;
++	int (*chip_fixup)(struct mtd_info *mtd);
+ };
+ 
+ /* Keep gcc happy */
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -103,7 +103,18 @@ static int plat_nand_probe(struct platfo
+ 	}
+ 
+ 	/* Scan to find existence of the device */
+-	if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
++	if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
++		err = -ENXIO;
++		goto out;
++	}
++
++	if (pdata->chip.chip_fixup) {
++		err = pdata->chip.chip_fixup(&data->mtd);
++		if (err)
++			goto out;
++	}
++
++	if (nand_scan_tail(&data->mtd)) {
+ 		err = -ENXIO;
+ 		goto out;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.13/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch b/trunk/target/linux/generic/patches-3.13/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
new file mode 100644
index 00000000..fa673059
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -507,7 +507,7 @@ int __nand_correct_data(unsigned char *b
+ 		return 1;	/* error in ECC data; no action needed */
+ 
+ 	pr_err("%s: uncorrectable ECC error", __func__);
+-	return -1;
++	return -EBADMSG;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/trunk/target/linux/generic/patches-3.13/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
new file mode 100644
index 00000000..0854a564
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -780,7 +780,7 @@ static int get_chip(struct map_info *map
+ 		return 0;
+ 
+ 	case FL_ERASING:
+-		if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
++		if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+ 		    !(mode == FL_READY || mode == FL_POINT ||
+ 		    (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
+ 			goto sleep;
diff --git a/trunk/target/linux/generic/patches-3.13/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/trunk/target/linux/generic/patches-3.13/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
new file mode 100644
index 00000000..b5fae8ae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
@@ -0,0 +1,18 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Issue map read after Write Buffer Load command to ensure chip is ready
+to receive data.
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
+ 1 file changed, 1 insertion(+)
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1498,6 +1498,7 @@ static int __xipram do_write_buffer(stru
+ 
+ 	/* Write Buffer Load */
+ 	map_write(map, CMD(0x25), cmd_adr);
++	(void) map_read(map, cmd_adr);
+ 
+ 	chip->state = FL_WRITING_TO_BUFFER;
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/trunk/target/linux/generic/patches-3.13/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
new file mode 100644
index 00000000..9bf5e33a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -0,0 +1,41 @@
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
+@@ -102,6 +102,14 @@ config MTD_SPEAR_SMI
+ 	help
+ 	  This enable SNOR support on SPEAR platforms using SMI controller
+ 
++config M25PXX_PREFER_SMALL_SECTOR_ERASE
++	bool "Prefer small sector erase"
++	depends on MTD_M25P80
++	default y
++	help
++	  This option enables use of the small erase sectors if that is
++	  supported by the flash chip.
++
+ config MTD_SST25L
+ 	tristate "Support SST25L (non JEDEC) SPI Flash chips"
+ 	depends on SPI_MASTER
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -82,6 +82,12 @@
+ 
+ #define JEDEC_MFR(_jedec_id)	((_jedec_id) >> 16)
+ 
++#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE
++#define PREFER_SMALL_SECTOR_ERASE 1
++#else
++#define PREFER_SMALL_SECTOR_ERASE 0
++#endif
++
+ /****************************************************************************/
+ 
+ struct m25p {
+@@ -1032,7 +1038,7 @@ static int m25p_probe(struct spi_device
+ 		flash->mtd._write = m25p80_write;
+ 
+ 	/* prefer "small sector" erase if possible */
+-	if (info->flags & SECT_4K) {
++	if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
+ 	} else if (info->flags & SECT_4K_PMC) {
diff --git a/trunk/target/linux/generic/patches-3.13/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch b/trunk/target/linux/generic/patches-3.13/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
new file mode 100644
index 00000000..1ba05359
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
@@ -0,0 +1,20 @@
+From eef9dfc4e821408af1af13aa0cc707fc496fb7c6 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Wed, 11 Dec 2013 19:05:59 +0100
+Subject: [PATCH] m25p80: add support for the Winbond W25X05 flash
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/devices/m25p80.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -863,6 +863,7 @@ static const struct spi_device_id m25p_i
+ 	{ "m25px64",    INFO(0x207117,  0, 64 * 1024, 128, 0) },
+ 
+ 	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
++	{ "w25x05", INFO(0xef3010, 0, 64 * 1024,  1,  SECT_4K) },
+ 	{ "w25x10", INFO(0xef3011, 0, 64 * 1024,  2,  SECT_4K) },
+ 	{ "w25x20", INFO(0xef3012, 0, 64 * 1024,  4,  SECT_4K) },
+ 	{ "w25x40", INFO(0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
diff --git a/trunk/target/linux/generic/patches-3.13/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch b/trunk/target/linux/generic/patches-3.13/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
new file mode 100644
index 00000000..35f84eff
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
@@ -0,0 +1,20 @@
+From 0233dcb52eefa0b29250a6d8a58b3143790df57d Mon Sep 17 00:00:00 2001
+From: Sergey Ryazanov <ryazanov.s.a@gmail.com>
+Date: Wed, 11 Jun 2014 02:23:00 +0400
+Subject: [PATCH] mtd: m25p80: add support for EON EN25QH128
+
+Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
+---
+ drivers/mtd/devices/m25p80.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -751,6 +751,7 @@ static const struct spi_device_id m25p_i
+ 	{ "en25q32b",   INFO(0x1c3016, 0, 64 * 1024,   64, 0) },
+ 	{ "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128, 0) },
+ 	{ "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
++	{ "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },
+ 	{ "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },
+ 
+ 	/* ESMT */
diff --git a/trunk/target/linux/generic/patches-3.13/480-mtd-set-rootfs-to-be-root-dev.patch b/trunk/target/linux/generic/patches-3.13/480-mtd-set-rootfs-to-be-root-dev.patch
new file mode 100644
index 00000000..c4350ef4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/480-mtd-set-rootfs-to-be-root-dev.patch
@@ -0,0 +1,26 @@
+--- a/drivers/mtd/mtdcore.c
++++ b/drivers/mtd/mtdcore.c
+@@ -37,6 +37,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/gfp.h>
+ #include <linux/slab.h>
++#include <linux/root_dev.h>
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+@@ -422,6 +423,15 @@ int add_mtd_device(struct mtd_info *mtd)
+ 	   of this try_ nonsense, and no bitching about it
+ 	   either. :) */
+ 	__module_get(THIS_MODULE);
++
++	if (!strcmp(mtd->name, "rootfs") &&
++	    config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    ROOT_DEV == 0) {
++		pr_notice("mtd: device %d (%s) set to be root filesystem\n",
++			  mtd->index, mtd->name);
++		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
++	}
++
+ 	return 0;
+ 
+ fail_added:
diff --git a/trunk/target/linux/generic/patches-3.13/500-yaffs-Kbuild-integration.patch b/trunk/target/linux/generic/patches-3.13/500-yaffs-Kbuild-integration.patch
new file mode 100644
index 00000000..3742e541
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/500-yaffs-Kbuild-integration.patch
@@ -0,0 +1,18 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -39,6 +39,7 @@ source "fs/gfs2/Kconfig"
+ source "fs/ocfs2/Kconfig"
+ source "fs/btrfs/Kconfig"
+ source "fs/nilfs2/Kconfig"
++source "fs/yaffs2/Kconfig"
+ 
+ endif # BLOCK
+ 
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -127,3 +127,5 @@ obj-y				+= exofs/ # Multiple modules
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
+ obj-$(CONFIG_PSTORE)		+= pstore/
+ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
++obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
++
diff --git a/trunk/target/linux/generic/patches-3.13/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch b/trunk/target/linux/generic/patches-3.13/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
new file mode 100644
index 00000000..c1f7367d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
@@ -0,0 +1,155 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -329,6 +329,33 @@ static int yaffs_readpage(struct file *f
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++#define YCRED_FSUID()	from_kuid(&init_user_ns, current_fsuid())
++#define YCRED_FSGID()	from_kgid(&init_user_ns, current_fsgid())
++#else
++#define YCRED_FSUID()	YCRED(current)->fsuid
++#define YCRED_FSGID()	YCRED(current)->fsgid
++
++static inline uid_t i_uid_read(const struct inode *inode)
++{
++	return inode->i_uid;
++}
++
++static inline gid_t i_gid_read(const struct inode *inode)
++{
++	return inode->i_gid;
++}
++
++static inline void i_uid_write(struct inode *inode, uid_t uid)
++{
++	inode->i_uid = uid;
++}
++
++static inline void i_gid_write(struct inode *inode, gid_t gid)
++{
++	inode->i_gid = gid;
++}
++#endif
+ 
+ static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+ {
+@@ -1225,9 +1252,9 @@ static int yaffs_mknod(struct inode *dir
+ 	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
+ 
+ 	int error = -ENOSPC;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+ 		mode |= S_ISGID;
+@@ -1424,9 +1451,9 @@ static int yaffs_symlink(struct inode *d
+ {
+ 	struct yaffs_obj *obj;
+ 	struct yaffs_dev *dev;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
+ 
+@@ -1829,8 +1856,8 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		inode->i_ino = obj->obj_id;
+ 		inode->i_mode = obj->yst_mode;
+-		inode->i_uid = obj->yst_uid;
+-		inode->i_gid = obj->yst_gid;
++		i_uid_write(inode, obj->yst_uid);
++		i_gid_write(inode, obj->yst_gid);
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+ 		inode->i_blksize = inode->i_sb->s_blocksize;
+ #endif
+@@ -1856,7 +1883,7 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		yaffs_trace(YAFFS_TRACE_OS,
+ 			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+-			inode->i_mode, inode->i_uid, inode->i_gid,
++			inode->i_mode, i_uid_read(inode), i_gid_read(inode),
+ 			inode->i_size, atomic_read(&inode->i_count));
+ 
+ 		switch (obj->yst_mode & S_IFMT) {
+--- a/fs/yaffs2/yaffs_attribs.c
++++ b/fs/yaffs2/yaffs_attribs.c
+@@ -14,6 +14,48 @@
+ #include "yaffs_guts.h"
+ #include "yaffs_attribs.h"
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return from_kuid(&init_user_ns, iattr->ia_uid);
++}
++
++static inline gid_t ia_gid_read(const struct iattr *iattr)
++{
++	return from_kgid(&init_user_ns, iattr->ia_gid);
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = make_kuid(&init_user_ns, uid);
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = make_kgid(&init_user_ns, gid);
++}
++#else
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return iattr->ia_uid;
++}
++
++static inline gid_t ia_gid_read(const struct iattr *inode)
++{
++	return iattr->ia_gid;
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = uid;
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = gid;
++}
++#endif
++
+ void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
+ {
+ 	obj->yst_uid = oh->yst_uid;
+@@ -77,9 +119,9 @@ int yaffs_set_attribs(struct yaffs_obj *
+ 	if (valid & ATTR_MODE)
+ 		obj->yst_mode = attr->ia_mode;
+ 	if (valid & ATTR_UID)
+-		obj->yst_uid = attr->ia_uid;
++		obj->yst_uid =  ia_uid_read(attr);
+ 	if (valid & ATTR_GID)
+-		obj->yst_gid = attr->ia_gid;
++		obj->yst_gid =  ia_gid_read(attr);
+ 
+ 	if (valid & ATTR_ATIME)
+ 		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
+@@ -103,9 +145,9 @@ int yaffs_get_attribs(struct yaffs_obj *
+ 
+ 	attr->ia_mode = obj->yst_mode;
+ 	valid |= ATTR_MODE;
+-	attr->ia_uid = obj->yst_uid;
++	ia_uid_write(attr, obj->yst_uid);
+ 	valid |= ATTR_UID;
+-	attr->ia_gid = obj->yst_gid;
++	ia_gid_write(attr, obj->yst_gid);
+ 	valid |= ATTR_GID;
+ 
+ 	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
diff --git a/trunk/target/linux/generic/patches-3.13/502-yaffs-3.10-disable-proc-entry.patch b/trunk/target/linux/generic/patches-3.13/502-yaffs-3.10-disable-proc-entry.patch
new file mode 100644
index 00000000..5b73d389
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/502-yaffs-3.10-disable-proc-entry.patch
@@ -0,0 +1,44 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -3025,6 +3025,7 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "y
+ #endif
+ 
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ static struct proc_dir_entry *my_proc_entry;
+ 
+ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
+@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file
+ 		return yaffs_proc_debug_write(file, buf, count, data);
+ 	return yaffs_proc_write_trace_options(file, buf, count, data);
+ }
++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) */
+ 
+ /* Stuff to handle installation of file systems */
+ struct file_system_to_install {
+@@ -3421,6 +3423,7 @@ static int __init init_yaffs_fs(void)
+ 
+ 	mutex_init(&yaffs_context_lock);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	/* Install the proc_fs entries */
+ 	my_proc_entry = create_proc_entry("yaffs",
+ 					  S_IRUGO | S_IFREG, YPROC_ROOT);
+@@ -3432,6 +3435,7 @@ static int __init init_yaffs_fs(void)
+ 	} else {
+ 		return -ENOMEM;
+         }
++#endif
+ 
+ 	/* Now add the file system entries */
+ 
+@@ -3468,7 +3472,9 @@ static void __exit exit_yaffs_fs(void)
+ 	yaffs_trace(YAFFS_TRACE_ALWAYS,
+ 		"yaffs built " __DATE__ " " __TIME__ " removing.");
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	remove_proc_entry("yaffs", YPROC_ROOT);
++#endif
+ 
+ 	fsinst = fs_to_install;
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/503-yaffs-3.12-convert-readdir-to-iterate.patch b/trunk/target/linux/generic/patches-3.13/503-yaffs-3.12-convert-readdir-to-iterate.patch
new file mode 100644
index 00000000..586c141e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/503-yaffs-3.12-convert-readdir-to-iterate.patch
@@ -0,0 +1,129 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -1701,6 +1701,110 @@ static void yaffs_remove_obj_callback(st
+ 
+ /*-----------------------------------------------------------------*/
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
++static int yaffs_readdir(struct file *file, struct dir_context *ctx)
++{
++	struct yaffs_obj *obj;
++	struct yaffs_dev *dev;
++	struct yaffs_search_context *sc;
++	struct inode *inode = file->f_dentry->d_inode;
++	unsigned long offset, curoffs;
++	struct yaffs_obj *l;
++	int ret_val = 0;
++
++	char name[YAFFS_MAX_NAME_LENGTH + 1];
++
++	obj = yaffs_dentry_to_obj(file->f_dentry);
++	dev = obj->my_dev;
++
++	yaffs_gross_lock(dev);
++
++	yaffs_dev_to_lc(dev)->readdir_process = current;
++
++	offset = ctx->pos;
++
++	sc = yaffs_new_search(obj);
++	if (!sc) {
++		ret_val = -ENOMEM;
++		goto out;
++	}
++
++	yaffs_trace(YAFFS_TRACE_OS,
++		"yaffs_readdir: starting at %d", (int)offset);
++
++	if (offset == 0) {
++		yaffs_trace(YAFFS_TRACE_OS,
++			"yaffs_readdir: entry . ino %d",
++			(int)inode->i_ino);
++		yaffs_gross_unlock(dev);
++		if (!dir_emit_dot(file, ctx)) {
++			yaffs_gross_lock(dev);
++			goto out;
++		}
++		yaffs_gross_lock(dev);
++		offset++;
++		ctx->pos++;
++	}
++	if (offset == 1) {
++		yaffs_trace(YAFFS_TRACE_OS,
++			"yaffs_readdir: entry .. ino %d",
++			(int)file->f_dentry->d_parent->d_inode->i_ino);
++		yaffs_gross_unlock(dev);
++		if (!dir_emit_dotdot(file, ctx)) {
++			yaffs_gross_lock(dev);
++			goto out;
++		}
++		yaffs_gross_lock(dev);
++		offset++;
++		ctx->pos++;
++	}
++
++	curoffs = 1;
++
++	/* If the directory has changed since the open or last call to
++	   readdir, rewind to after the 2 canned entries. */
++	if (file->f_version != inode->i_version) {
++		offset = 2;
++		ctx->pos = offset;
++		file->f_version = inode->i_version;
++	}
++
++	while (sc->next_return) {
++		curoffs++;
++		l = sc->next_return;
++		if (curoffs >= offset) {
++			int this_inode = yaffs_get_obj_inode(l);
++			int this_type = yaffs_get_obj_type(l);
++
++			yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
++			yaffs_trace(YAFFS_TRACE_OS,
++				"yaffs_readdir: %s inode %d",
++				name, yaffs_get_obj_inode(l));
++
++			yaffs_gross_unlock(dev);
++
++			if (!dir_emit(ctx, name, strlen(name),
++				      this_inode, this_type) < 0) {
++				yaffs_gross_lock(dev);
++				goto out;
++			}
++
++			yaffs_gross_lock(dev);
++
++			offset++;
++			ctx->pos++;
++		}
++		yaffs_search_advance(sc);
++	}
++
++out:
++	yaffs_search_end(sc);
++	yaffs_dev_to_lc(dev)->readdir_process = NULL;
++	yaffs_gross_unlock(dev);
++
++	return ret_val;
++}
++#else
+ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
+ {
+ 	struct yaffs_obj *obj;
+@@ -1807,10 +1911,15 @@ out:
+ 
+ 	return ret_val;
+ }
++#endif
+ 
+ static const struct file_operations yaffs_dir_operations = {
+ 	.read = generic_read_dir,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
++	.iterate = yaffs_readdir,
++#else
+ 	.readdir = yaffs_readdir,
++#endif
+ 	.fsync = yaffs_sync_object,
+ 	.llseek = generic_file_llseek,
+ };
diff --git a/trunk/target/linux/generic/patches-3.13/503-yaffs-add-tags-9bytes-mount-option.patch b/trunk/target/linux/generic/patches-3.13/503-yaffs-add-tags-9bytes-mount-option.patch
new file mode 100644
index 00000000..5a15b516
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/503-yaffs-add-tags-9bytes-mount-option.patch
@@ -0,0 +1,115 @@
+Subject: yaffs: add support for tags-9bytes mount option
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -2634,6 +2634,7 @@ static const struct super_operations yaf
+ 
+ struct yaffs_options {
+ 	int inband_tags;
++	int tags_9bytes;
+ 	int skip_checkpoint_read;
+ 	int skip_checkpoint_write;
+ 	int no_cache;
+@@ -2673,6 +2674,8 @@ static int yaffs_parse_options(struct ya
+ 
+ 		if (!strcmp(cur_opt, "inband-tags")) {
+ 			options->inband_tags = 1;
++		} else if (!strcmp(cur_opt, "tags-9bytes")) {
++			options->tags_9bytes = 1;
+ 		} else if (!strcmp(cur_opt, "tags-ecc-off")) {
+ 			options->tags_ecc_on = 0;
+ 			options->tags_ecc_overridden = 1;
+@@ -2746,7 +2749,6 @@ static struct super_block *yaffs_interna
+ 	struct yaffs_param *param;
+ 
+ 	int read_only = 0;
+-	int inband_tags = 0;
+ 
+ 	struct yaffs_options options;
+ 
+@@ -2786,6 +2788,9 @@ static struct super_block *yaffs_interna
+ 
+ 	memset(&options, 0, sizeof(options));
+ 
++	if (IS_ENABLED(CONFIG_YAFFS_9BYTE_TAGS))
++		options.tags_9bytes = 1;
++
+ 	if (yaffs_parse_options(&options, data_str)) {
+ 		/* Option parsing failed */
+ 		return NULL;
+@@ -2819,17 +2824,22 @@ static struct super_block *yaffs_interna
+ 	}
+ 
+ 	/* Added NCB 26/5/2006 for completeness */
+-	if (yaffs_version == 2 && !options.inband_tags
+-	    && WRITE_SIZE(mtd) == 512) {
++	if (yaffs_version == 2 &&
++	    (!options.inband_tags || options.tags_9bytes) &&
++	    WRITE_SIZE(mtd) == 512) {
+ 		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1");
+ 		yaffs_version = 1;
+ 	}
+ 
+-	if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) ||
+-	    options.inband_tags)
+-		inband_tags = 1;
++	if (yaffs_version == 2 &&
++	    mtd->oobavail < sizeof(struct yaffs_packed_tags2)) {
++		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting inband tags");
++		options.inband_tags = 1;
++	}
+ 
+-	if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0)
++	err = yaffs_verify_mtd(mtd, yaffs_version, options.inband_tags,
++			       options.tags_9bytes);
++	if (err < 0)
+ 		return NULL;
+ 
+ 	/* OK, so if we got here, we have an MTD that's NAND and looks
+@@ -2890,7 +2900,8 @@ static struct super_block *yaffs_interna
+ 
+ 	param->n_reserved_blocks = 5;
+ 	param->n_caches = (options.no_cache) ? 0 : 10;
+-	param->inband_tags = inband_tags;
++	param->inband_tags = options.inband_tags;
++	param->tags_9bytes = options.tags_9bytes;
+ 
+ 	param->enable_xattr = 1;
+ 	if (options.lazy_loading_overridden)
+--- a/fs/yaffs2/yaffs_mtdif.c
++++ b/fs/yaffs2/yaffs_mtdif.c
+@@ -276,7 +276,8 @@ struct mtd_info * yaffs_get_mtd_device(d
+ 	return mtd;
+ }
+ 
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes)
+ {
+ 	if (yaffs_version == 2) {
+ 		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+@@ -295,6 +296,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
+ 			);
+ 			return -1;
+ 		}
++
++		if (tags_9bytes && mtd->oobavail < 9) {
++			yaffs_trace(YAFFS_TRACE_ALWAYS,
++				    "MTD device does not support 9-byte tags");
++			return -1;
++		}
+ 	}
+ 
+ 	return 0;
+--- a/fs/yaffs2/yaffs_mtdif.h
++++ b/fs/yaffs2/yaffs_mtdif.h
+@@ -21,5 +21,6 @@
+ void yaffs_mtd_drv_install(struct yaffs_dev *dev);
+ struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
+ void yaffs_put_mtd_device(struct mtd_info *mtd);
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes);
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.13/504-yaffs-fix-compat-tags-handling.patch b/trunk/target/linux/generic/patches-3.13/504-yaffs-fix-compat-tags-handling.patch
new file mode 100644
index 00000000..a18cf6fd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/504-yaffs-fix-compat-tags-handling.patch
@@ -0,0 +1,239 @@
+Subject: yaffs: fix compat tags handling
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_tagscompat.c
++++ b/fs/yaffs2/yaffs_tagscompat.c
+@@ -17,7 +17,9 @@
+ #include "yaffs_getblockinfo.h"
+ #include "yaffs_trace.h"
+ 
++#if 0
+ static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
++#endif
+ 
+ 
+ /********** Tags ECC calculations  *********/
+@@ -71,6 +73,7 @@ int yaffs_check_tags_ecc(struct yaffs_ta
+ 	return 0;
+ }
+ 
++#if 0
+ /********** Tags **********/
+ 
+ static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
+@@ -379,3 +382,214 @@ void yaffs_tags_compat_install(struct ya
+ 	if(!dev->tagger.mark_bad_fn)
+ 		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
+ }
++#else
++
++#include "yaffs_packedtags1.h"
++
++static int yaffs_tags_compat_write(struct yaffs_dev *dev,
++				   int nand_chunk,
++				   const u8 *data,
++				   const struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	u8 tag_buf[9];
++	int retval;
++
++	/* we assume that yaffs_packed_tags1 and yaffs_tags are compatible */
++	compile_time_assertion(sizeof(struct yaffs_packed_tags1) == 12);
++	compile_time_assertion(sizeof(struct yaffs_tags) == 8);
++
++	yaffs_pack_tags1(&pt1, tags);
++	yaffs_calc_tags_ecc((struct yaffs_tags *)&pt1);
++
++	/* When deleting a chunk, the upper layer provides only skeletal
++	 * tags, one with is_deleted set.  However, we need to update the
++	 * tags, not erase them completely.  So we use the NAND write property
++	 * that only zeroed-bits stick and set tag bytes to all-ones and
++	 * zero just the (not) deleted bit.
++	 */
++	if (!dev->param.tags_9bytes) {
++		if (tags->is_deleted) {
++			memset(&pt1, 0xff, 8);
++			/* clear delete status bit to indicate deleted */
++			pt1.deleted = 0;
++		}
++		memcpy(tag_buf, &pt1, 8);
++	} else {
++		if (tags->is_deleted) {
++			memset(tag_buf, 0xff, 8);
++			tag_buf[8] = 0;
++		} else {
++			memcpy(tag_buf, &pt1, 8);
++			tag_buf[8] = 0xff;
++		}
++	}
++
++	retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk,
++			data,
++			(data) ? dev->data_bytes_per_chunk : 0,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8);
++
++	return retval;
++}
++
++/* Return with empty extended tags but add ecc_result.
++ */
++static int return_empty_tags(struct yaffs_ext_tags *tags,
++			     enum yaffs_ecc_result ecc_result,
++			     int retval)
++{
++	if (tags) {
++		memset(tags, 0, sizeof(*tags));
++		tags->ecc_result = ecc_result;
++	}
++
++	return retval;
++}
++
++static int yaffs_tags_compat_read(struct yaffs_dev *dev,
++				  int nand_chunk,
++				  u8 *data,
++				  struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	enum yaffs_ecc_result ecc_result;
++	int retval;
++	int deleted;
++	u8 tag_buf[9];
++
++	retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
++			data, dev->param.total_bytes_per_chunk,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8,
++			&ecc_result);
++
++	switch (ecc_result) {
++	case YAFFS_ECC_RESULT_NO_ERROR:
++	case YAFFS_ECC_RESULT_FIXED:
++		break;
++
++	case YAFFS_ECC_RESULT_UNFIXED:
++	default:
++		return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED, 0);
++		tags->block_bad = dev->drv.drv_check_bad_fn(dev, nand_chunk);
++		return YAFFS_FAIL;
++	}
++
++	/* Check for a blank/erased chunk. */
++	if (yaffs_check_ff(tag_buf, 8)) {
++		/* when blank, upper layers want ecc_result to be <= NO_ERROR */
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_NO_ERROR,
++					 YAFFS_OK);
++	}
++
++	memcpy(&pt1, tag_buf, 8);
++
++	if (!dev->param.tags_9bytes) {
++		/* Read deleted status (bit) then return it to it's non-deleted
++		 * state before performing tags mini-ECC check. pt1.deleted is
++		 * inverted.
++		 */
++		deleted = !pt1.deleted;
++		pt1.deleted = 1;
++	} else {
++		deleted = (hweight8(tag_buf[8]) < 7) ? 1 : 0;
++	}
++
++	/* Check the packed tags mini-ECC and correct if necessary/possible. */
++	retval = yaffs_check_tags_ecc((struct yaffs_tags *)&pt1);
++	switch (retval) {
++	case 0:
++		/* no tags error, use MTD result */
++		break;
++	case 1:
++		/* recovered tags-ECC error */
++		dev->n_tags_ecc_fixed++;
++		if (ecc_result == YAFFS_ECC_RESULT_NO_ERROR)
++			ecc_result = YAFFS_ECC_RESULT_FIXED;
++		break;
++	default:
++		/* unrecovered tags-ECC error */
++		dev->n_tags_ecc_unfixed++;
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED,
++					 YAFFS_FAIL);
++	}
++
++	/* Unpack the tags to extended form and set ECC result.
++	 * [set should_be_ff just to keep yaffs_unpack_tags1 happy]
++	 */
++	pt1.should_be_ff = 0xffffffff;
++	yaffs_unpack_tags1(tags, &pt1);
++	tags->ecc_result = ecc_result;
++
++	/* Set deleted state */
++	tags->is_deleted = deleted;
++	return YAFFS_OK;
++}
++
++static int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no)
++{
++	return dev->drv.drv_mark_bad_fn(dev, block_no);
++}
++
++static int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
++					 int block_no,
++					 enum yaffs_block_state *state,
++					 u32 *seq_number)
++{
++	struct yaffs_ext_tags tags;
++	int retval;
++
++	yaffs_trace(YAFFS_TRACE_MTD, "%s %d", __func__, block_no);
++
++	*seq_number = 0;
++
++	retval = dev->drv.drv_check_bad_fn(dev, block_no);
++	if (retval == YAFFS_FAIL) {
++		*state = YAFFS_BLOCK_STATE_DEAD;
++		goto out;
++	}
++
++	yaffs_tags_compat_read(dev, block_no * dev->param.chunks_per_block,
++			       NULL, &tags);
++
++	if (tags.ecc_result != YAFFS_ECC_RESULT_NO_ERROR) {
++		yaffs_trace(YAFFS_TRACE_MTD, "block %d is marked bad",
++			    block_no);
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else if (tags.chunk_used) {
++		*seq_number = tags.seq_number;
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else {
++		*state = YAFFS_BLOCK_STATE_EMPTY;
++	}
++
++	retval = YAFFS_OK;
++
++out:
++	yaffs_trace(YAFFS_TRACE_MTD,
++		    "block query returns seq %u state %d",
++		    *seq_number, *state);
++
++	return retval;
++}
++
++void yaffs_tags_compat_install(struct yaffs_dev *dev)
++{
++	if (dev->param.is_yaffs2)
++		return;
++
++	if (!dev->tagger.write_chunk_tags_fn)
++		dev->tagger.write_chunk_tags_fn = yaffs_tags_compat_write;
++
++	if (!dev->tagger.read_chunk_tags_fn)
++		dev->tagger.read_chunk_tags_fn = yaffs_tags_compat_read;
++
++	if (!dev->tagger.query_block_fn)
++		dev->tagger.query_block_fn = yaffs_tags_compat_query_block;
++
++	if (!dev->tagger.mark_bad_fn)
++		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
++}
++#endif
diff --git a/trunk/target/linux/generic/patches-3.13/520-squashfs_update_xz_comp_opts.patch b/trunk/target/linux/generic/patches-3.13/520-squashfs_update_xz_comp_opts.patch
new file mode 100644
index 00000000..ad11b302
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/520-squashfs_update_xz_comp_opts.patch
@@ -0,0 +1,25 @@
+From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 12 Apr 2011 19:55:41 +0200
+Subject: [PATCH] squashfs: update xz compressor options struct.
+
+Update the xz compressor options struct to match the squashfs userspace
+one.
+---
+ fs/squashfs/xz_wrapper.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/fs/squashfs/xz_wrapper.c
++++ b/fs/squashfs/xz_wrapper.c
+@@ -40,8 +40,10 @@ struct squashfs_xz {
+ };
+ 
+ struct disk_comp_opts {
+-	__le32 dictionary_size;
+ 	__le32 flags;
++	__le16 bit_opts;
++	__le16 fb;
++	__le32 dictionary_size;
+ };
+ 
+ struct comp_opts {
diff --git a/trunk/target/linux/generic/patches-3.13/530-jffs2_make_lzma_available.patch b/trunk/target/linux/generic/patches-3.13/530-jffs2_make_lzma_available.patch
new file mode 100644
index 00000000..75bcc2a0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/530-jffs2_make_lzma_available.patch
@@ -0,0 +1,5142 @@
+--- a/fs/jffs2/Kconfig
++++ b/fs/jffs2/Kconfig
+@@ -139,6 +139,15 @@ config JFFS2_LZO
+ 	  This feature was added in July, 2007. Say 'N' if you need
+ 	  compatibility with older bootloaders or kernels.
+ 
++config JFFS2_LZMA
++	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
++	select LZMA_COMPRESS
++	select LZMA_DECOMPRESS
++	depends on JFFS2_FS
++	default n
++	help
++	  JFFS2 wrapper to the LZMA C SDK
++
+ config JFFS2_RTIME
+ 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
+ 	depends on JFFS2_FS
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
+@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
+ jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
+ jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
+ jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
++jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
+ jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
++
++CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
+--- a/fs/jffs2/compr.c
++++ b/fs/jffs2/compr.c
+@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ /* Setting default compression mode */
+ #ifdef CONFIG_JFFS2_CMODE_NONE
+ 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
+@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
+ int jffs2_compressors_exit(void)
+ {
+ /* Unregistering compressors */
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
+--- a/fs/jffs2/compr.h
++++ b/fs/jffs2/compr.h
+@@ -29,9 +29,9 @@
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_LZARI_PRIORITY     30
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
+-
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
+ #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
+@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/fs/jffs2/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
+ 
+-	pr_info("version 2.2."
++	pr_info("version 2.2"
+ #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+ 	       " (NAND)"
+ #endif
+ #ifdef CONFIG_JFFS2_SUMMARY
+-	       " (SUMMARY) "
++	       " (SUMMARY)"
+ #endif
+-	       " © 2001-2006 Red Hat, Inc.\n");
++#ifdef CONFIG_JFFS2_ZLIB
++	       " (ZLIB)"
++#endif
++#ifdef CONFIG_JFFS2_LZO
++	       " (LZO)"
++#endif
++#ifdef CONFIG_JFFS2_LZMA
++	       " (LZMA)"
++#endif
++#ifdef CONFIG_JFFS2_RTIME
++	       " (RTIME)"
++#endif
++#ifdef CONFIG_JFFS2_RUBIN
++	       " (RUBIN)"
++#endif
++#ifdef  CONFIG_JFFS2_CMODE_NONE
++	       " (CMODE_NONE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_PRIORITY
++	       " (CMODE_PRIORITY)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_SIZE
++	       " (CMODE_SIZE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
++	       " (CMODE_FAVOURLZO)"
++#endif
++	       " (c) 2001-2006 Red Hat, Inc.\n");
+ 
+ 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
+ 					     sizeof(struct jffs2_inode_info),
+--- a/include/uapi/linux/jffs2.h
++++ b/include/uapi/linux/jffs2.h
+@@ -46,6 +46,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,62 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <asm/types.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,115 @@
++/* LzFind.h -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_FIND_H
++#define __LZ_FIND_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  size_t directInputRem;
++  int btMode;
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
++    UInt32 *distances, UInt32 maxLen);
++
++/*
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,54 @@
++/* LzHash.h -- HASH functions for LZ algorithms
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_HASH_H
++#define __LZ_HASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,231 @@
++/* LzmaDec.h -- LZMA Decoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_DEC_H
++#define __LZMA_DEC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs,
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum
++{
++  LZMA_FINISH_ANY,   /* finish at any point */
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
++        You must use correct finish mode in that case. */
++
++typedef enum
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually.
++   For Buffer Interface you must always use variant 1.
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */
++
++/* You can use it, if you want to eliminate the overhead for data copying from
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,80 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_ENC_H
++#define __LZMA_ENC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */
++  int lp;          /* 0 <= lp <= 4, default = 0 */
++  int pb;          /* 0 <= pb <= 4, default = 2 */
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,226 @@
++/* Types.h -- Basic types
++2009-11-23 : Igor Pavlov : Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#include <stddef.h>
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
++
++#ifndef EXTERN_C_BEGIN
++#ifdef __cplusplus
++#define EXTERN_C_BEGIN extern "C" {
++#define EXTERN_C_END }
++#else
++#define EXTERN_C_BEGIN
++#define EXTERN_C_END
++#endif
++#endif
++
++EXTERN_C_BEGIN
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifdef _WIN32
++typedef DWORD WRes;
++#else
++typedef int WRes;
++#endif
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++#ifdef _SZ_NO_INT_64
++
++/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
++   NOTES: Some code will work incorrectly in that case! */
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _WIN32
++#define MY_STD_CALL __stdcall
++#else
++#define MY_STD_CALL
++#endif
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_FAST_CALL __fastcall
++
++#else
++
++#define MY_CDECL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++/* it can return SZ_ERROR_INPUT_EOF */
++SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
++SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
++SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++       (result < size) means error */
++} ISeqOutStream;
++
++typedef enum
++{
++  SZ_SEEK_SET = 0,
++  SZ_SEEK_CUR = 1,
++  SZ_SEEK_END = 2
++} ESzSeek;
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ISeekInStream;
++
++typedef struct
++{
++  SRes (*Look)(void *p, void **buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) > input(*size)) is not allowed
++       (output(*size) < input(*size)) is allowed */
++  SRes (*Skip)(void *p, size_t offset);
++    /* offset must be <= output(*size) of Look */
++
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* reads directly (without buffer). It's same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ILookInStream;
++
++SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
++SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
++
++/* reads via ILookInStream::Read */
++SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
++SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
++
++#define LookToRead_BUF_SIZE (1 << 14)
++
++typedef struct
++{
++  ILookInStream s;
++  ISeekInStream *realStream;
++  size_t pos;
++  size_t size;
++  Byte buf[LookToRead_BUF_SIZE];
++} CLookToRead;
++
++void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
++void LookToRead_Init(CLookToRead *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToLook;
++
++void SecToLook_CreateVTable(CSecToLook *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToRead;
++
++void SecToRead_CreateVTable(CSecToRead *p);
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++EXTERN_C_END
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -215,6 +215,12 @@ config LZ4_DECOMPRESS
+ 
+ source "lib/xz/Kconfig"
+ 
++config LZMA_COMPRESS
++    tristate
++
++config LZMA_DECOMPRESS
++    tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,6 +2,16 @@
+ # Makefile for some libs needed in the kernel.
+ #
+ 
++ifdef CONFIG_JFFS2_ZLIB
++	CONFIG_ZLIB_INFLATE:=y
++	CONFIG_ZLIB_DEFLATE:=y
++endif
++
++ifdef CONFIG_JFFS2_LZMA
++	CONFIG_LZMA_DECOMPRESS:=y
++	CONFIG_LZMA_COMPRESS:=y
++endif
++
+ ifdef CONFIG_FUNCTION_TRACER
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+@@ -80,6 +90,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
+ obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
+ obj-$(CONFIG_XZ_DEC) += xz/
+ obj-$(CONFIG_RAID6_PQ) += raid6/
++obj-$(CONFIG_LZMA_COMPRESS) += lzma/
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/lib/lzma/LzFind.c
+@@ -0,0 +1,761 @@
++/* LzFind.c -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  if (p->directInput)
++  {
++    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
++    if (curSize > p->directInputRem)
++      curSize = (UInt32)p->directInputRem;
++    p->directInputRem -= curSize;
++    p->streamPos += curSize;
++    if (p->directInputRem == 0)
++      p->streamEndWasReached = 1;
++    return;
++  }
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase,
++    p->buffer - p->keepSizeBefore,
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  if (p->directInput)
++    return 0;
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached)
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = historySize + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit)
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit)
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for (i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
++{
++  return (p->pos - p->historySize - 1) & kNormalizeMask;
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while (++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] =
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2)
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lib/lzma/LzmaDec.c
+@@ -0,0 +1,999 @@
++/* LzmaDec.c -- LZMA Decoder
++2009-09-20 : Igor Pavlov : Public domain */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; }
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded.
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
++Out:
++  Result:
++    SZ_OK - OK
++    SZ_ERROR_DATA - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        state -= (state < 4) ? state : 3;
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        state -= (state < 10) ? 3 : 6;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++      continue;
++    }
++    else
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance;
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while (--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1;
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++      }
++
++      len += kMatchMinLen;
++
++      if (limit == dicPos)
++        return SZ_ERROR_DATA;
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do
++            *(dest) = (Byte)*(dest + src);
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE *
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while (--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++{
++  p->needFlush = 1;
++  p->remainLen = 0;
++  p->tempBufSize = 0;
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p)
++{
++  p->dicPos = 0;
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1;
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = (SizeT)(p->buf - src);
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0)
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->probs);
++  p->probs = 0;
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->dic);
++  p->dic = 0;
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize;
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/LzmaEnc.c
+@@ -0,0 +1,2271 @@
++/* LzmaEnc.c -- LZMA Encoder
++2009-11-24 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include "LzmaEnc.h"
++
++/* disable MT */
++#define _7ZIP_ST
++
++#include "LzFind.h"
++#ifndef _7ZIP_ST
++#include "LzFindMt.h"
++#endif
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3;
++  if (p->lp < 0) p->lp = 0;
++  if (p->pb < 0) p->pb = 2;
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
++  if (p->numHashBytes < 0) p->numHashBytes = 4;
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0)
++    p->numThreads =
++      #ifndef _7ZIP_ST
++      ((p->btMode && p->algo) ? 2 : 1);
++      #else
++      1;
++      #endif
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos)
++{
++  UInt32 res;
++  BSR2_RET(pos, res);
++  return res;
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct
++{
++  UInt32 price;
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;
++
++  UInt32 posPrev;
++  UInt32 backPrev;
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6
++#define kDicLogSizeMin 0
++#define kDicLogSizeMax 32
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifndef _7ZIP_ST
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifndef _7ZIP_ST
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  UInt32 longestMatchLength;
++  UInt32 numPairs;
++  UInt32 numAvail;
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  int needInit;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifndef _7ZIP_ST
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++#define IsCharState(s) ((s) < 7)
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);
++  }
++  p->cacheSize++;
++  p->low = (UInt32)p->low << 8;
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++}
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numPairs;
++  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
++  ttt++;
++  {
++    UInt32 i;
++    for (i = 0; i < numPairs; i += 2)
++      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
++  }
++  #endif
++  if (numPairs > 0)
++  {
++    lenRes = p->matches[numPairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matches[numPairs - 1] + 1;
++      UInt32 numAvail = p->numAvail;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numPairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex;
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
++  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
++  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
++  UInt32 *matches;
++  const Byte *data;
++  Byte curByte, matchByte;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  if (numAvail < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++  curByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
++        (!IsCharState(p->state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == curByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= mainLen)
++  {
++    UInt32 offs = 0;
++    while (len > matches[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matches[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matches[offs])
++      {
++        offs += 2;
++        if (offs == numPairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
++    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
++    Bool nextIsChar;
++    Byte curByte, matchByte;
++    const Byte *data;
++    COptimal *curOpt;
++    COptimal *nextOpt;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    newLen = ReadMatchDistances(p, &numPairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numPairs = numPairs;
++      p->longestMatchLength = newLen;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price;
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    curByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price +=
++        (!IsCharState(state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++    }
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price)
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++    numAvailFull = p->numAvail;
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp < numAvailFull)
++        numAvailFull = temp;
++    }
++
++    if (numAvailFull < 2)
++      continue;
++    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
++
++    if (!nextIsChar && matchByte != curByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailFull)
++        limit = numAvailFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price +
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price)
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice =
++                price + p->repLenEnc.prices[posState][lenTest - 2] +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvail)
++    {
++      newLen = numAvail;
++      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
++      matches[numPairs] = newLen;
++      numPairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matches[offs])
++        offs += 2;
++      curBack = matches[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matches[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numPairs)
++            break;
++          curBack = matches[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
++  const Byte *data;
++  const UInt32 *matches;
++
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  *backRes = (UInt32)-1;
++  if (numAvail < 2)
++    return 1;
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++
++  repLen = repIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    if (len > repLen)
++    {
++      repIndex = i;
++      repLen = len;
++    }
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++
++  mainDist = 0; /* for GCC */
++  if (mainLen >= 2)
++  {
++    mainDist = matches[numPairs - 1];
++    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
++    {
++      if (!ChangePair(matches[numPairs - 3], mainDist))
++        break;
++      numPairs -= 2;
++      mainLen = matches[numPairs - 2];
++      mainDist = matches[numPairs - 1];
++    }
++    if (mainLen == 2 && mainDist >= 0x80)
++      mainLen = 1;
++  }
++
++  if (repLen >= 2 && (
++        (repLen + 1 >= mainLen) ||
++        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
++        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
++  {
++    *backRes = repIndex;
++    MovePos(p, repLen - 1);
++    return repLen;
++  }
++  
++  if (mainLen < 2 || numAvail <= 2)
++    return 1;
++
++  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
++  if (p->longestMatchLength >= 2)
++  {
++    UInt32 newDistance = matches[p->numPairs - 1];
++    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
++        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
++        (p->longestMatchLength > mainLen + 1) ||
++        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
++      return 1;
++  }
++  
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len, limit;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    limit = mainLen - 1;
++    for (len = 2; len < limit && data[len] == data2[len]; len++);
++    if (len >= limit)
++      return 1;
++  }
++  *backRes = mainDist + LZMA_NUM_REPS;
++  MovePos(p, mainLen - 2);
++  return mainLen;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  {
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->needInit)
++  {
++    p->matchFinder.Init(p->matchFinderObj);
++    p->needInit = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numPairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numPairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == (UInt32)-1)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifndef _7ZIP_ST
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifndef _7ZIP_ST
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for (i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize =
++  p->repLenEnc.tableSize =
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->matchFinderBase.directInput = 1;
++  p->matchFinderBase.bufferBase = (Byte *)src;
++  p->matchFinderBase.directInputRem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->needInit = 1;
++
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifndef _7ZIP_ST
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #else
++  pp = pp;
++  #endif
++}
++
++typedef struct
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
++{
++  SRes res = SZ_OK;
++
++  #ifndef _7ZIP_ST
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(p);
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
++  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++
++  p->rc.outStream = &outStream.funcTable;
++  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
++  if (res == SZ_OK)
++    res = LzmaEnc_Encode2(p, progress);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/Makefile
+@@ -0,0 +1,7 @@
++lzma_compress-objs := LzFind.o LzmaEnc.o
++lzma_decompress-objs := LzmaDec.o
++
++obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
++
++EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/trunk/target/linux/generic/patches-3.13/531-debloat_lzma.patch b/trunk/target/linux/generic/patches-3.13/531-debloat_lzma.patch
new file mode 100644
index 00000000..aa3c4980
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/531-debloat_lzma.patch
@@ -0,0 +1,1024 @@
+--- a/include/linux/lzma/LzmaDec.h
++++ b/include/linux/lzma/LzmaDec.h
+@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
+   UInt32 dicSize;
+ } CLzmaProps;
+ 
+-/* LzmaProps_Decode - decodes properties
+-Returns:
+-  SZ_OK
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+-
+ 
+ /* ---------- LZMA Decoder state ---------- */
+ 
+@@ -70,8 +62,6 @@ typedef struct
+ 
+ #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
+ 
+-void LzmaDec_Init(CLzmaDec *p);
+-
+ /* There are two types of LZMA streams:
+      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
+      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+@@ -108,97 +98,6 @@ typedef enum
+ 
+ /* ELzmaStatus is used only as output value for function call */
+ 
+-
+-/* ---------- Interfaces ---------- */
+-
+-/* There are 3 levels of interfaces:
+-     1) Dictionary Interface
+-     2) Buffer Interface
+-     3) One Call Interface
+-   You can select any of these interfaces, but don't mix functions from different
+-   groups for same object. */
+-
+-
+-/* There are two variants to allocate state for Dictionary Interface:
+-     1) LzmaDec_Allocate / LzmaDec_Free
+-     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+-   You can use variant 2, if you set dictionary buffer manually.
+-   For Buffer Interface you must always use variant 1.
+-
+-LzmaDec_Allocate* can return:
+-  SZ_OK
+-  SZ_ERROR_MEM         - Memory allocation error
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-   
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
+-
+-SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
+-
+-/* ---------- Dictionary Interface ---------- */
+-
+-/* You can use it, if you want to eliminate the overhead for data copying from
+-   dictionary to some other external buffer.
+-   You must work with CLzmaDec variables directly in this interface.
+-
+-   STEPS:
+-     LzmaDec_Constr()
+-     LzmaDec_Allocate()
+-     for (each new stream)
+-     {
+-       LzmaDec_Init()
+-       while (it needs more decompression)
+-       {
+-         LzmaDec_DecodeToDic()
+-         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+-       }
+-     }
+-     LzmaDec_Free()
+-*/
+-
+-/* LzmaDec_DecodeToDic
+-   
+-   The decoding to internal dictionary buffer (CLzmaDec::dic).
+-   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (dicLimit).
+-  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+-  LZMA_FINISH_END - Stream must be finished after dicLimit.
+-
+-Returns:
+-  SZ_OK
+-    status:
+-      LZMA_STATUS_FINISHED_WITH_MARK
+-      LZMA_STATUS_NOT_FINISHED
+-      LZMA_STATUS_NEEDS_MORE_INPUT
+-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+-  SZ_ERROR_DATA - Data error
+-*/
+-
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+-/* ---------- Buffer Interface ---------- */
+-
+-/* It's zlib-like interface.
+-   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+-   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+-   to work with CLzmaDec variables manually.
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (*destLen).
+-  LZMA_FINISH_ANY - Decode just destLen bytes.
+-  LZMA_FINISH_END - Stream must be finished after (*destLen).
+-*/
+-
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+ /* ---------- One Call Interface ---------- */
+ 
+ /* LzmaDecode
+--- a/lib/lzma/LzmaDec.c
++++ b/lib/lzma/LzmaDec.c
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
+   p->needFlush = 0;
+ }
+ 
+-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+ {
+   p->needFlush = 1;
+   p->remainLen = 0;
+@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
+     p->needInitState = 1;
+ }
+ 
+-void LzmaDec_Init(CLzmaDec *p)
++static void LzmaDec_Init(CLzmaDec *p)
+ {
+   p->dicPos = 0;
+   LzmaDec_InitDicAndState(p, True, True);
+@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
+   p->needInitState = 0;
+ }
+ 
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+     ELzmaFinishMode finishMode, ELzmaStatus *status)
+ {
+   SizeT inSize = *srcLen;
+@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
+   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
+ }
+ 
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+-{
+-  SizeT outSize = *destLen;
+-  SizeT inSize = *srcLen;
+-  *srcLen = *destLen = 0;
+-  for (;;)
+-  {
+-    SizeT inSizeCur = inSize, outSizeCur, dicPos;
+-    ELzmaFinishMode curFinishMode;
+-    SRes res;
+-    if (p->dicPos == p->dicBufSize)
+-      p->dicPos = 0;
+-    dicPos = p->dicPos;
+-    if (outSize > p->dicBufSize - dicPos)
+-    {
+-      outSizeCur = p->dicBufSize;
+-      curFinishMode = LZMA_FINISH_ANY;
+-    }
+-    else
+-    {
+-      outSizeCur = dicPos + outSize;
+-      curFinishMode = finishMode;
+-    }
+-
+-    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
+-    src += inSizeCur;
+-    inSize -= inSizeCur;
+-    *srcLen += inSizeCur;
+-    outSizeCur = p->dicPos - dicPos;
+-    memcpy(dest, p->dic + dicPos, outSizeCur);
+-    dest += outSizeCur;
+-    outSize -= outSizeCur;
+-    *destLen += outSizeCur;
+-    if (res != 0)
+-      return res;
+-    if (outSizeCur == 0 || outSize == 0)
+-      return SZ_OK;
+-  }
+-}
+-
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->probs);
+   p->probs = 0;
+ }
+ 
+-static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  alloc->Free(alloc, p->dic);
+-  p->dic = 0;
+-}
+-
+-void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  LzmaDec_FreeProbs(p, alloc);
+-  LzmaDec_FreeDict(p, alloc);
+-}
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+ {
+   UInt32 dicSize;
+   Byte d;
+@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+   return SZ_OK;
+ }
+ 
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+ {
+   CLzmaProps propNew;
+   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
+   p->prop = propNew;
+   return SZ_OK;
+ }
+-
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+-{
+-  CLzmaProps propNew;
+-  SizeT dicBufSize;
+-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  dicBufSize = propNew.dicSize;
+-  if (p->dic == 0 || dicBufSize != p->dicBufSize)
+-  {
+-    LzmaDec_FreeDict(p, alloc);
+-    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
+-    if (p->dic == 0)
+-    {
+-      LzmaDec_FreeProbs(p, alloc);
+-      return SZ_ERROR_MEM;
+-    }
+-  }
+-  p->dicBufSize = dicBufSize;
+-  p->prop = propNew;
+-  return SZ_OK;
+-}
+ 
+ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+     const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
+--- a/include/linux/lzma/LzmaEnc.h
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
+ } CLzmaEncProps;
+ 
+ void LzmaEncProps_Init(CLzmaEncProps *p);
+-void LzmaEncProps_Normalize(CLzmaEncProps *p);
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+-
+ 
+ /* ---------- CLzmaEncHandle Interface ---------- */
+ 
+@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+ void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ 
+-/* ---------- One Call Interface ---------- */
+-
+-/* LzmaEncode
+-Return code:
+-  SZ_OK               - OK
+-  SZ_ERROR_MEM        - Memory allocation error
+-  SZ_ERROR_PARAM      - Incorrect paramater
+-  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+-  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+-*/
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzmaEnc.c
++++ b/lib/lzma/LzmaEnc.c
+@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
+   p->writeEndMark = 0;
+ }
+ 
+-void LzmaEncProps_Normalize(CLzmaEncProps *p)
++static void LzmaEncProps_Normalize(CLzmaEncProps *p)
+ {
+   int level = p->level;
+   if (level < 0) level = 5;
+@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
+       #endif
+ }
+ 
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+ {
+   CLzmaEncProps props = *props2;
+   LzmaEncProps_Normalize(&props);
+@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
+ 
+ #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
+ 
+-UInt32 GetPosSlot1(UInt32 pos)
++static UInt32 GetPosSlot1(UInt32 pos)
+ {
+   UInt32 res;
+   BSR2_RET(pos, res);
+@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
+ #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
+ #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+ 
+-void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
+ {
+   int c = 2, slotFast;
+   g_FastPos[0] = 0;
+@@ -339,58 +339,6 @@ typedef struct
+   CSaveState saveState;
+ } CLzmaEnc;
+ 
+-void LzmaEnc_SaveState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  CSaveState *dest = &p->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
+-}
+-
+-void LzmaEnc_RestoreState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *dest = (CLzmaEnc *)pp;
+-  const CSaveState *p = &dest->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
+-}
+-
+ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE
+   while (symbol < 0x10000);
+ }
+ 
+-void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
+ {
+   UInt32 i;
+   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
+@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc
+   p->matchPriceCount = 0;
+ }
+ 
+-void LzmaEnc_Construct(CLzmaEnc *p)
++static void LzmaEnc_Construct(CLzmaEnc *p)
+ {
+   RangeEnc_Construct(&p->rc);
+   MatchFinder_Construct(&p->matchFinderBase);
+@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+   return p;
+ }
+ 
+-void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->litProbs);
+   alloc->Free(alloc, p->saveState.litProbs);
+@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl
+   p->saveState.litProbs = 0;
+ }
+ 
+-void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   #ifndef _7ZIP_ST
+   MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
+@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U
+   return SZ_OK;
+ }
+ 
+-void LzmaEnc_Init(CLzmaEnc *p)
++static void LzmaEnc_Init(CLzmaEnc *p)
+ {
+   UInt32 i;
+   p->state = 0;
+@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p)
+   p->lpMask = (1 << p->lp) - 1;
+ }
+ 
+-void LzmaEnc_InitPrices(CLzmaEnc *p)
++static void LzmaEnc_InitPrices(CLzmaEnc *p)
+ {
+   if (!p->fastMode)
+   {
+@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
+   return SZ_OK;
+ }
+ 
+-static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  p->rc.outStream = outStream;
+-  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
+-}
+-
+-SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
+-    ISeqInStream *inStream, UInt32 keepWindowSize,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+-}
+-
+ static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
+ {
+   p->matchFinderBase.directInput = 1;
+@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc
+   p->matchFinderBase.directInputRem = srcLen;
+ }
+ 
+-SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+     UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
+   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+ }
+ 
+-void LzmaEnc_Finish(CLzmaEncHandle pp)
++static void LzmaEnc_Finish(CLzmaEncHandle pp)
+ {
+   #ifndef _7ZIP_ST
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo
+   return size;
+ }
+ 
+-
+-UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+-}
+-
+-const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+-}
+-
+-SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
+-    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  UInt64 nowPos64;
+-  SRes res;
+-  CSeqOutStreamBuf outStream;
+-
+-  outStream.funcTable.Write = MyWrite;
+-  outStream.data = dest;
+-  outStream.rem = *destLen;
+-  outStream.overflow = False;
+-
+-  p->writeEndMark = False;
+-  p->finished = False;
+-  p->result = SZ_OK;
+-
+-  if (reInit)
+-    LzmaEnc_Init(p);
+-  LzmaEnc_InitPrices(p);
+-  nowPos64 = p->nowPos64;
+-  RangeEnc_Init(&p->rc);
+-  p->rc.outStream = &outStream.funcTable;
+-
+-  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
+-  
+-  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+-  *destLen -= outStream.rem;
+-  if (outStream.overflow)
+-    return SZ_ERROR_OUTPUT_EOF;
+-
+-  return res;
+-}
+-
+ static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
+ {
+   SRes res = SZ_OK;
+@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p,
+   return res;
+ }
+ 
+-SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
+-  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
+-}
+-
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
+     return SZ_ERROR_OUTPUT_EOF;
+   return res;
+ }
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
+-  SRes res;
+-  if (p == 0)
+-    return SZ_ERROR_MEM;
+-
+-  res = LzmaEnc_SetProps(p, props);
+-  if (res == SZ_OK)
+-  {
+-    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
+-    if (res == SZ_OK)
+-      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
+-          writeEndMark, progress, alloc, allocBig);
+-  }
+-
+-  LzmaEnc_Destroy(p, alloc, allocBig);
+-  return res;
+-}
+--- a/include/linux/lzma/LzFind.h
++++ b/include/linux/lzma/LzFind.h
+@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
+ 
+ #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p);
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+-void MatchFinder_MoveBlock(CMatchFinder *p);
+-void MatchFinder_ReadIfRequired(CMatchFinder *p);
+-
+ void MatchFinder_Construct(CMatchFinder *p);
+ 
+ /* Conditions:
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
+     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+     ISzAlloc *alloc);
+ void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+-    UInt32 *distances, UInt32 maxLen);
+ 
+ /*
+ Conditions:
+@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
+ 
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+ 
+-void MatchFinder_Init(CMatchFinder *p);
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzFind.c
++++ b/lib/lzma/LzFind.c
+@@ -14,9 +14,15 @@
+ 
+ #define kStartMaxLen 3
+ 
++#if 0
++#define DIRECT_INPUT	p->directInput
++#else
++#define DIRECT_INPUT	1
++#endif
++
+ static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
+ {
+-  if (!p->directInput)
++  if (!DIRECT_INPUT)
+   {
+     alloc->Free(alloc, p->bufferBase);
+     p->bufferBase = 0;
+@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder
+ static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
+ {
+   UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     p->blockSize = blockSize;
+     return 1;
+@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde
+   return (p->bufferBase != 0);
+ }
+ 
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+-Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
+ 
+-UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+ 
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+ {
+   p->posLimit -= subValue;
+   p->pos -= subValue;
+@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch
+ {
+   if (p->streamEndWasReached || p->result != SZ_OK)
+     return;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     UInt32 curSize = 0xFFFFFFFF - p->streamPos;
+     if (curSize > p->directInputRem)
+@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch
+   }
+ }
+ 
+-void MatchFinder_MoveBlock(CMatchFinder *p)
++static void MatchFinder_MoveBlock(CMatchFinder *p)
+ {
+   memmove(p->bufferBase,
+     p->buffer - p->keepSizeBefore,
+@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder
+   p->buffer = p->bufferBase + p->keepSizeBefore;
+ }
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p)
++static int MatchFinder_NeedMove(CMatchFinder *p)
+ {
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+     return 0;
+   /* if (p->streamEndWasReached) return 0; */
+   return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
+ }
+ 
+-void MatchFinder_ReadIfRequired(CMatchFinder *p)
+-{
+-  if (p->streamEndWasReached)
+-    return;
+-  if (p->keepSizeAfter >= p->streamPos - p->pos)
+-    MatchFinder_ReadBlock(p);
+-}
+-
+ static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
+ {
+   if (MatchFinder_NeedMove(p))
+@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch
+   p->posLimit = p->pos + limit;
+ }
+ 
+-void MatchFinder_Init(CMatchFinder *p)
++static void MatchFinder_Init(CMatchFinder *p)
+ {
+   UInt32 i;
+   for (i = 0; i < p->hashSizeSum; i++)
+@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM
+   return (p->pos - p->historySize - 1) & kNormalizeMask;
+ }
+ 
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
+ {
+   UInt32 i;
+   for (i = 0; i < numItems; i++)
+@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat
+   MatchFinder_SetLimits(p);
+ }
+ 
+-static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+-    UInt32 *distances, UInt32 maxLen)
+-{
+-  son[_cyclicBufferPos] = curMatch;
+-  for (;;)
+-  {
+-    UInt32 delta = pos - curMatch;
+-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+-      return distances;
+-    {
+-      const Byte *pb = cur - delta;
+-      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+-      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
+-      {
+-        UInt32 len = 0;
+-        while (++len != lenLimit)
+-          if (pb[len] != cur[len])
+-            break;
+-        if (maxLen < len)
+-        {
+-          *distances++ = maxLen = len;
+-          *distances++ = delta - 1;
+-          if (len == lenLimit)
+-            return distances;
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+     UInt32 *distances, UInt32 maxLen)
+ {
+@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi
+   p->buffer++; \
+   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
+ 
+-#define MOVE_POS_RET MOVE_POS return offset;
+-
+ static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
+ 
++#define MOVE_POS_RET MatchFinder_MovePos(p); return offset;
++
+ #define GET_MATCHES_HEADER2(minLen, ret_op) \
+   UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
+   lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
+@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi
+   distances + offset, maxLen) - distances); MOVE_POS_RET;
+ 
+ #define SKIP_FOOTER \
+-  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
+-
+-static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(2)
+-  HASH2_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 1)
+-}
+-
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 2)
+-}
+-
+-static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, delta2, maxLen, offset;
+-  GET_MATCHES_HEADER(3)
+-
+-  HASH3_CALC;
+-
+-  delta2 = p->pos - p->hash[hash2Value];
+-  curMatch = p->hash[kFix3HashSize + hashValue];
+-  
+-  p->hash[hash2Value] =
+-  p->hash[kFix3HashSize + hashValue] = p->pos;
+-
+-
+-  maxLen = 2;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[0] = maxLen;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-    if (maxLen == lenLimit)
+-    {
+-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+-      MOVE_POS_RET;
+-    }
+-  }
+-  GET_MATCHES_FOOTER(offset, maxLen)
+-}
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p);
+ 
+ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+ {
+@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches
+   GET_MATCHES_FOOTER(offset, maxLen)
+ }
+ 
+-static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
+-  GET_MATCHES_HEADER(4)
+-
+-  HASH4_CALC;
+-
+-  delta2 = p->pos - p->hash[                hash2Value];
+-  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
+-  curMatch = p->hash[kFix4HashSize + hashValue];
+-
+-  p->hash[                hash2Value] =
+-  p->hash[kFix3HashSize + hash3Value] =
+-  p->hash[kFix4HashSize + hashValue] = p->pos;
+-
+-  maxLen = 1;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    distances[0] = maxLen = 2;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-  }
+-  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
+-  {
+-    maxLen = 3;
+-    distances[offset + 1] = delta3 - 1;
+-    offset += 2;
+-    delta2 = delta3;
+-  }
+-  if (offset != 0)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[offset - 2] = maxLen;
+-    if (maxLen == lenLimit)
+-    {
+-      p->son[p->cyclicBufferPos] = curMatch;
+-      MOVE_POS_RET;
+-    }
+-  }
+-  if (maxLen < 3)
+-    maxLen = 3;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances + offset, maxLen) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances, 2) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(2)
+-    HASH2_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value;
+-    SKIP_HEADER(3)
+-    HASH3_CALC;
+-    curMatch = p->hash[kFix3HashSize + hashValue];
+-    p->hash[hash2Value] =
+-    p->hash[kFix3HashSize + hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+ static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+ {
+   do
+@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF
+   while (--num != 0);
+ }
+ 
+-static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value, hash3Value;
+-    SKIP_HEADER(4)
+-    HASH4_CALC;
+-    curMatch = p->hash[kFix4HashSize + hashValue];
+-    p->hash[                hash2Value] =
+-    p->hash[kFix3HashSize + hash3Value] =
+-    p->hash[kFix4HashSize + hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
+ {
+   vTable->Init = (Mf_Init_Func)MatchFinder_Init;
+   vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
+   vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
+   vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
+-  if (!p->btMode)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 2)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 3)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
+-  }
+-  else
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+-  }
++  vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++  vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+ }
diff --git a/trunk/target/linux/generic/patches-3.13/532-jffs2_eofdetect.patch b/trunk/target/linux/generic/patches-3.13/532-jffs2_eofdetect.patch
new file mode 100644
index 00000000..26917906
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/532-jffs2_eofdetect.patch
@@ -0,0 +1,56 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
+ 	dbg_fsbuild("scanned flash completely\n");
+ 	jffs2_dbg_dump_block_lists_nolock(c);
+ 
++	if (c->flags & (1 << 7)) {
++		printk("%s(): unlocking the mtd device... ", __func__);
++		mtd_unlock(c->mtd, 0, c->mtd->size);
++		printk("done.\n");
++
++		printk("%s(): erasing all blocks after the end marker... ", __func__);
++		jffs2_erase_pending_blocks(c, -1);
++		printk("done.\n");
++	}
++
+ 	dbg_fsbuild("pass 1 starting\n");
+ 	c->flags |= JFFS2_SB_FLAG_BUILDING;
+ 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in
+ 		/* reset summary info for next eraseblock scan */
+ 		jffs2_sum_reset_collected(s);
+ 
+-		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
+-						buf_size, s);
++		if (c->flags & (1 << 7)) {
++			if (mtd_block_isbad(c->mtd, jeb->offset))
++				ret = BLK_STATE_BADBLOCK;
++			else
++				ret = BLK_STATE_ALLFF;
++		} else
++			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
++							buf_size, s);
+ 
+ 		if (ret < 0)
+ 			goto out;
+@@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct
+ 			return err;
+ 	}
+ 
++	if ((buf[0] == 0xde) &&
++		(buf[1] == 0xad) &&
++		(buf[2] == 0xc0) &&
++		(buf[3] == 0xde)) {
++		/* end of filesystem. erase everything after this point */
++		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
++		c->flags |= (1 << 7);
++
++		return BLK_STATE_ALLFF;
++	}
++
+ 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+ 	ofs = 0;
+ 	max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
diff --git a/trunk/target/linux/generic/patches-3.13/540-crypto-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.13/540-crypto-xz-decompression-support.patch
new file mode 100644
index 00000000..b9f1246d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/540-crypto-xz-decompression-support.patch
@@ -0,0 +1,146 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1367,6 +1367,13 @@ config CRYPTO_LZ4HC
+ 	help
+ 	  This is the LZ4 high compression mode algorithm.
+ 
++config CRYPTO_XZ
++	tristate "XZ compression algorithm"
++	select CRYPTO_ALGAPI
++	select XZ_DEC
++	help
++	  This is the XZ algorithm. Only decompression is supported for now.
++
+ comment "Random Number Generation"
+ 
+ config CRYPTO_ANSI_CPRNG
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -93,6 +93,7 @@ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.
+ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
+ obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
+ obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o
++obj-$(CONFIG_CRYPTO_XZ) += xz.o
+ obj-$(CONFIG_CRYPTO_842) += 842.o
+ obj-$(CONFIG_CRYPTO_RNG2) += rng.o
+ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
+--- /dev/null
++++ b/crypto/xz.c
+@@ -0,0 +1,117 @@
++/*
++ * Cryptographic API.
++ *
++ * XZ decompression support.
++ *
++ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ *
++ */
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/crypto.h>
++#include <linux/xz.h>
++#include <linux/interrupt.h>
++#include <linux/mm.h>
++#include <linux/net.h>
++
++struct xz_comp_ctx {
++	struct xz_dec	*decomp_state;
++	struct xz_buf	decomp_buf;
++};
++
++static int crypto_xz_decomp_init(struct xz_comp_ctx *ctx)
++{
++	ctx->decomp_state = xz_dec_init(XZ_SINGLE, 0);
++	if (!ctx->decomp_state)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void crypto_xz_decomp_exit(struct xz_comp_ctx *ctx)
++{
++	xz_dec_end(ctx->decomp_state);
++}
++
++static int crypto_xz_init(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	return crypto_xz_decomp_init(ctx);
++}
++
++static void crypto_xz_exit(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	crypto_xz_decomp_exit(ctx);
++}
++
++static int crypto_xz_compress(struct crypto_tfm *tfm, const u8 *src,
++			      unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	return -EOPNOTSUPP;
++}
++
++static int crypto_xz_decompress(struct crypto_tfm *tfm, const u8 *src,
++				unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	struct xz_comp_ctx *dctx = crypto_tfm_ctx(tfm);
++	struct xz_buf *xz_buf = &dctx->decomp_buf;
++	int ret;
++
++	memset(xz_buf, '\0', sizeof(struct xz_buf));
++
++	xz_buf->in = (u8 *) src;
++	xz_buf->in_pos = 0;
++	xz_buf->in_size = slen;
++	xz_buf->out = (u8 *) dst;
++	xz_buf->out_pos = 0;
++	xz_buf->out_size = *dlen;
++
++	ret = xz_dec_run(dctx->decomp_state, xz_buf);
++	if (ret != XZ_STREAM_END) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	*dlen = xz_buf->out_pos;
++	ret = 0;
++
++out:
++	return ret;
++}
++
++static struct crypto_alg crypto_xz_alg = {
++	.cra_name		= "xz",
++	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,
++	.cra_ctxsize		= sizeof(struct xz_comp_ctx),
++	.cra_module		= THIS_MODULE,
++	.cra_list		= LIST_HEAD_INIT(crypto_xz_alg.cra_list),
++	.cra_init		= crypto_xz_init,
++	.cra_exit		= crypto_xz_exit,
++	.cra_u			= { .compress = {
++	.coa_compress 		= crypto_xz_compress,
++	.coa_decompress  	= crypto_xz_decompress } }
++};
++
++static int __init crypto_xz_mod_init(void)
++{
++	return crypto_register_alg(&crypto_xz_alg);
++}
++
++static void __exit crypto_xz_mod_exit(void)
++{
++	crypto_unregister_alg(&crypto_xz_alg);
++}
++
++module_init(crypto_xz_mod_init);
++module_exit(crypto_xz_mod_exit);
++
++MODULE_LICENSE("GPL v2");
++MODULE_DESCRIPTION("Crypto XZ decompression support");
++MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/trunk/target/linux/generic/patches-3.13/541-ubifs-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.13/541-ubifs-xz-decompression-support.patch
new file mode 100644
index 00000000..f85689c5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/541-ubifs-xz-decompression-support.patch
@@ -0,0 +1,92 @@
+--- a/fs/ubifs/Kconfig
++++ b/fs/ubifs/Kconfig
+@@ -5,8 +5,10 @@ config UBIFS_FS
+ 	select CRYPTO if UBIFS_FS_ADVANCED_COMPR
+ 	select CRYPTO if UBIFS_FS_LZO
+ 	select CRYPTO if UBIFS_FS_ZLIB
++	select CRYPTO if UBIFS_FS_XZ
+ 	select CRYPTO_LZO if UBIFS_FS_LZO
+ 	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
++	select CRYPTO_XZ if UBIFS_FS_XZ
+ 	depends on MTD_UBI
+ 	help
+ 	  UBIFS is a file system for flash devices which works on top of UBI.
+@@ -35,3 +37,12 @@ config UBIFS_FS_ZLIB
+ 	default y
+ 	help
+ 	  Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
++
++config UBIFS_FS_XZ
++	bool "XZ decompression support" if UBIFS_FS_ADVANCED_COMPR
++	depends on UBIFS_FS
++	default y
++	help
++	  XZ compresses better the ZLIB but it is slower..
++	  Say 'Y' if unsure.
++
+--- a/fs/ubifs/compress.c
++++ b/fs/ubifs/compress.c
+@@ -71,6 +71,24 @@ static struct ubifs_compressor zlib_comp
+ };
+ #endif
+ 
++#ifdef CONFIG_UBIFS_FS_XZ
++static DEFINE_MUTEX(xz_enc_mutex);
++static DEFINE_MUTEX(xz_dec_mutex);
++
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.comp_mutex = &xz_enc_mutex,
++	.decomp_mutex = &xz_dec_mutex,
++	.name = "xz",
++	.capi_name = "xz",
++};
++#else
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.name = "xz",
++};
++#endif
++
+ /* All UBIFS compressors */
+ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
+ 
+@@ -232,9 +250,15 @@ int __init ubifs_compressors_init(void)
+ 	if (err)
+ 		goto out_lzo;
+ 
++	err = compr_init(&xz_compr);
++	if (err)
++		goto out_zlib;
++
+ 	ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+ 	return 0;
+ 
++out_zlib:
++	compr_exit(&zlib_compr);
+ out_lzo:
+ 	compr_exit(&lzo_compr);
+ 	return err;
+@@ -247,4 +271,5 @@ void ubifs_compressors_exit(void)
+ {
+ 	compr_exit(&lzo_compr);
+ 	compr_exit(&zlib_compr);
++	compr_exit(&xz_compr);
+ }
+--- a/fs/ubifs/ubifs-media.h
++++ b/fs/ubifs/ubifs-media.h
+@@ -332,12 +332,14 @@ enum {
+  * UBIFS_COMPR_NONE: no compression
+  * UBIFS_COMPR_LZO: LZO compression
+  * UBIFS_COMPR_ZLIB: ZLIB compression
++ * UBIFS_COMPR_XZ: XZ compression
+  * UBIFS_COMPR_TYPES_CNT: count of supported compression types
+  */
+ enum {
+ 	UBIFS_COMPR_NONE,
+ 	UBIFS_COMPR_LZO,
+ 	UBIFS_COMPR_ZLIB,
++	UBIFS_COMPR_XZ,
+ 	UBIFS_COMPR_TYPES_CNT,
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch b/trunk/target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch
new file mode 100644
index 00000000..9ca8ac14
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch
@@ -0,0 +1,65 @@
+--- a/fs/ubifs/file.c
++++ b/fs/ubifs/file.c
+@@ -1577,6 +1577,10 @@ const struct inode_operations ubifs_syml
+ 	.follow_link = ubifs_follow_link,
+ 	.setattr     = ubifs_setattr,
+ 	.getattr     = ubifs_getattr,
++	.setxattr    = ubifs_setxattr,
++	.getxattr    = ubifs_getxattr,
++	.listxattr   = ubifs_listxattr,
++	.removexattr = ubifs_removexattr,
+ };
+ 
+ const struct file_operations ubifs_file_operations = {
+--- a/fs/ubifs/journal.c
++++ b/fs/ubifs/journal.c
+@@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu",
+ 		inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino);
+-	ubifs_assert(dir_ui->data_len == 0);
++	if (!xent)
++		ubifs_assert(dir_ui->data_len == 0);
+ 	ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex));
+ 
+ 	dlen = UBIFS_DENT_NODE_SZ + nm->len + 1;
+@@ -573,6 +574,13 @@ int ubifs_jnl_update(struct ubifs_info *
+ 	aligned_dlen = ALIGN(dlen, 8);
+ 	aligned_ilen = ALIGN(ilen, 8);
+ 	len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
++	if (xent) {
++		/*
++		 * Make sure to account for dir_ui->data_len in
++		 * length calculation in case there is extended attribute.
++		 */
++		len += dir_ui->data_len;
++	}
+ 	dent = kmalloc(len, GFP_NOFS);
+ 	if (!dent)
+ 		return -ENOMEM;
+@@ -649,7 +657,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	ino_key_init(c, &ino_key, dir->i_ino);
+ 	ino_offs += aligned_ilen;
+-	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ);
++	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs,
++			    UBIFS_INO_NODE_SZ + dir_ui->data_len);
+ 	if (err)
+ 		goto out_ro;
+ 
+--- a/fs/ubifs/xattr.c
++++ b/fs/ubifs/xattr.c
+@@ -209,12 +209,12 @@ static int change_xattr(struct ubifs_inf
+ 		goto out_free;
+ 	}
+ 	inode->i_size = ui->ui_size = size;
+-	ui->data_len = size;
+ 
+ 	mutex_lock(&host_ui->ui_mutex);
+ 	host->i_ctime = ubifs_current_time(host);
+ 	host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len);
+ 	host_ui->xattr_size += CALC_XATTR_BYTES(size);
++	ui->data_len = size;
+ 
+ 	/*
+ 	 * It is important to write the host inode after the xattr inode
diff --git a/trunk/target/linux/generic/patches-3.13/551-ubifs-fix-default-compression-selection.patch b/trunk/target/linux/generic/patches-3.13/551-ubifs-fix-default-compression-selection.patch
new file mode 100644
index 00000000..1b0f3071
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/551-ubifs-fix-default-compression-selection.patch
@@ -0,0 +1,29 @@
+--- a/fs/ubifs/sb.c
++++ b/fs/ubifs/sb.c
+@@ -63,6 +63,17 @@
+ /* Default time granularity in nanoseconds */
+ #define DEFAULT_TIME_GRAN 1000000000
+ 
++static int get_default_compressor(void)
++{
++	if (ubifs_compr_present(UBIFS_COMPR_LZO))
++		return UBIFS_COMPR_LZO;
++
++	if (ubifs_compr_present(UBIFS_COMPR_ZLIB))
++		return UBIFS_COMPR_ZLIB;
++
++	return UBIFS_COMPR_NONE;
++}
++
+ /**
+  * create_default_filesystem - format empty UBI volume.
+  * @c: UBIFS file-system description object
+@@ -183,7 +194,7 @@ static int create_default_filesystem(str
+ 	if (c->mount_opts.override_compr)
+ 		sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
+ 	else
+-		sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO);
++		sup->default_compr = cpu_to_le16(get_default_compressor());
+ 
+ 	generate_random_uuid(sup->uuid);
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/555-gluebi-sysfs-support.patch b/trunk/target/linux/generic/patches-3.13/555-gluebi-sysfs-support.patch
new file mode 100644
index 00000000..2f98de2f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/555-gluebi-sysfs-support.patch
@@ -0,0 +1,86 @@
+--- a/drivers/mtd/ubi/gluebi.c
++++ b/drivers/mtd/ubi/gluebi.c
+@@ -38,6 +38,7 @@
+ #include <linux/mutex.h>
+ #include <linux/mtd/ubi.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/export.h>
+ #include "ubi-media.h"
+ 
+ #define err_msg(fmt, ...)                                   \
+@@ -66,6 +67,16 @@ struct gluebi_device {
+ static LIST_HEAD(gluebi_devices);
+ static DEFINE_MUTEX(devices_mutex);
+ 
++/* Device attribute handler for gluebi files in '/<sysfs>/class/mtd/mtdX' */
++static ssize_t gluebi_attribute_show(struct device *dev,
++	struct device_attribute *attr, char *buf);
++
++/* Device attributes corresponding to files in '/<sysfs>/class/mtd/mtdX' */
++static struct device_attribute attr_vol_gluebi_ubi_num =
++__ATTR(gluebi_ubi_num, S_IRUGO, gluebi_attribute_show, NULL);
++static struct device_attribute attr_vol_gluebi_vol_id =
++__ATTR(gluebi_vol_id, S_IRUGO, gluebi_attribute_show, NULL);
++
+ /**
+  * find_gluebi_nolock - find a gluebi device.
+  * @ubi_num: UBI device number
+@@ -288,6 +299,36 @@ out_err:
+ }
+ 
+ /**
++ * gluebi_attribute_show - "Show" method for gluebi files in sysfs.
++ */
++static ssize_t gluebi_attribute_show(struct device *dev,
++				  struct device_attribute *attr, char *buf)
++{
++	int ret;
++	struct mtd_info *mtd = container_of(dev, struct mtd_info, dev);
++	struct gluebi_device *gluebi;
++
++	gluebi_get_device(mtd);
++	gluebi = container_of(mtd, struct gluebi_device, mtd);
++
++	/* This really shouldn't happen */
++	if (!gluebi)
++		return -ENODEV;
++
++	if (attr == &attr_vol_gluebi_ubi_num) {
++		ret = sprintf(buf, "%u\n", gluebi->ubi_num);
++	} else if (attr == &attr_vol_gluebi_vol_id) {
++		ret = sprintf(buf, "%u\n", gluebi->vol_id);
++	} else {
++		/* This must be a bug */
++		ret = -EINVAL;
++	}
++
++	gluebi_put_device(mtd);
++	return ret;
++}
++
++/**
+  * gluebi_create - create a gluebi device for an UBI volume.
+  * @di: UBI device description object
+  * @vi: UBI volume description object
+@@ -355,6 +396,8 @@ static int gluebi_create(struct ubi_devi
+ 	mutex_lock(&devices_mutex);
+ 	list_add_tail(&gluebi->list, &gluebi_devices);
+ 	mutex_unlock(&devices_mutex);
++	device_create_file(&mtd->dev, &attr_vol_gluebi_ubi_num);
++	device_create_file(&mtd->dev, &attr_vol_gluebi_vol_id);
+ 	return 0;
+ }
+ 
+@@ -380,8 +423,11 @@ static int gluebi_remove(struct ubi_volu
+ 		err = -ENOENT;
+ 	} else if (gluebi->refcnt)
+ 		err = -EBUSY;
+-	else
++	else {
++		device_remove_file(&gluebi->mtd.dev, &attr_vol_gluebi_ubi_num);
++		device_remove_file(&gluebi->mtd.dev, &attr_vol_gluebi_vol_id);
+ 		list_del(&gluebi->list);
++	}
+ 	mutex_unlock(&devices_mutex);
+ 	if (err)
+ 		return err;
diff --git a/trunk/target/linux/generic/patches-3.13/600-netfilter_layer7_2.22.patch b/trunk/target/linux/generic/patches-3.13/600-netfilter_layer7_2.22.patch
new file mode 100644
index 00000000..3ef834fc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/600-netfilter_layer7_2.22.patch
@@ -0,0 +1,2141 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1247,6 +1247,27 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on NETFILTER_XTABLES
++	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
++       depends on NETFILTER_ADVANCED
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++        bool 'Layer 7 debugging output'
++        depends on NETFILTER_XT_MATCH_LAYER7
++        help
++          Say Y to get lots of debugging output.
++
++
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -152,6 +152,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
+--- /dev/null
++++ b/net/netfilter/xt_layer7.c
+@@ -0,0 +1,666 @@
++/*
++  Kernel module to match application layer (OSI layer 7) data in connections.
++
++  http://l7-filter.sf.net
++
++  (C) 2003-2009 Matthew Strait and Ethan Sommer.
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU General Public License
++  as published by the Free Software Foundation; either version
++  2 of the License, or (at your option) any later version.
++  http://www.gnu.org/licenses/gpl.txt
++
++  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
++  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
++  Ethan Sommer, Justin Levandoski.
++*/
++
++#include <linux/spinlock.h>
++#include <linux/version.h>
++#include <net/ip.h>
++#include <net/tcp.h>
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_acct.h>
++#endif
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_layer7.h>
++#include <linux/ctype.h>
++#include <linux/proc_fs.h>
++
++#include "regexp/regexp.c"
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
++MODULE_DESCRIPTION("iptables application layer match module");
++MODULE_ALIAS("ipt_layer7");
++MODULE_VERSION("2.21");
++
++static int maxdatalen = 2048; // this is the default
++module_param(maxdatalen, int, 0444);
++MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
++#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
++	#define DPRINTK(format,args...) printk(format,##args)
++#else
++	#define DPRINTK(format,args...)
++#endif
++
++/* Number of packets whose data we look at.
++This can be modified through /proc/net/layer7_numpackets */
++static int num_packets = 10;
++
++static struct pattern_cache {
++	char * regex_string;
++	regexp * pattern;
++	struct pattern_cache * next;
++} * first_pattern_cache = NULL;
++
++DEFINE_SPINLOCK(l7_lock);
++
++static int total_acct_packets(struct nf_conn *ct)
++{
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
++	BUG_ON(ct == NULL);
++	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
++#else
++	struct nf_conn_counter *acct;
++
++	BUG_ON(ct == NULL);
++	acct = nf_conn_acct_find(ct);
++	if (!acct)
++		return 0;
++	return (atomic64_read(&acct[IP_CT_DIR_ORIGINAL].packets) + atomic64_read(&acct[IP_CT_DIR_REPLY].packets));
++#endif
++}
++
++#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++/* Converts an unfriendly string into a friendly one by
++replacing unprintables with periods and all whitespace with " ". */
++static char * friendly_print(unsigned char * s)
++{
++	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
++	int i;
++
++	if(!f) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"friendly_print, bailing.\n");
++		return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++){
++		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
++		else if(isspace(s[i]))		f[i] = ' ';
++		else 				f[i] = '.';
++	}
++	f[i] = '\0';
++	return f;
++}
++
++static char dec2hex(int i)
++{
++	switch (i) {
++		case 0 ... 9:
++			return (i + '0');
++			break;
++		case 10 ... 15:
++			return (i - 10 + 'a');
++			break;
++		default:
++			if (net_ratelimit())
++				printk("layer7: Problem in dec2hex\n");
++			return '\0';
++	}
++}
++
++static char * hex_print(unsigned char * s)
++{
++	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
++	int i;
++
++	if(!g) {
++	       if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in hex_print, "
++					"bailing.\n");
++	       return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++) {
++		g[i*3    ] = dec2hex(s[i]/16);
++		g[i*3 + 1] = dec2hex(s[i]%16);
++		g[i*3 + 2] = ' ';
++	}
++	g[i*3] = '\0';
++
++	return g;
++}
++#endif // DEBUG
++
++/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
++over again, it make sense to cache the results. */
++static regexp * compile_and_cache(const char * regex_string, 
++                                  const char * protocol)
++{
++	struct pattern_cache * node               = first_pattern_cache;
++	struct pattern_cache * last_pattern_cache = first_pattern_cache;
++	struct pattern_cache * tmp;
++	unsigned int len;
++
++	while (node != NULL) {
++		if (!strcmp(node->regex_string, regex_string))
++		return node->pattern;
++
++		last_pattern_cache = node;/* points at the last non-NULL node */
++		node = node->next;
++	}
++
++	/* If we reach the end of the list, then we have not yet cached
++	   the pattern for this regex. Let's do that now.
++	   Be paranoid about running out of memory to avoid list corruption. */
++	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
++
++	if(!tmp) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		return NULL;
++	}
++
++	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
++	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
++	tmp->next = NULL;
++
++	if(!tmp->regex_string || !tmp->pattern) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		kfree(tmp->regex_string);
++		kfree(tmp->pattern);
++		kfree(tmp);
++		return NULL;
++	}
++
++	/* Ok.  The new node is all ready now. */
++	node = tmp;
++
++	if(first_pattern_cache == NULL) /* list is empty */
++		first_pattern_cache = node; /* make node the beginning */
++	else
++		last_pattern_cache->next = node; /* attach node to the end */
++
++	/* copy the string and compile the regex */
++	len = strlen(regex_string);
++	DPRINTK("About to compile this: \"%s\"\n", regex_string);
++	node->pattern = regcomp((char *)regex_string, &len);
++	if ( !node->pattern ) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: Error compiling regexp "
++					"\"%s\" (%s)\n", 
++					regex_string, protocol);
++		/* pattern is now cached as NULL, so we won't try again. */
++	}
++
++	strcpy(node->regex_string, regex_string);
++	return node->pattern;
++}
++
++static int can_handle(const struct sk_buff *skb)
++{
++	if(!ip_hdr(skb)) /* not IP */
++		return 0;
++	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
++	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
++	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
++		return 0;
++	return 1;
++}
++
++/* Returns offset the into the skb->data that the application data starts */
++static int app_data_offset(const struct sk_buff *skb)
++{
++	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
++	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
++	int ip_hl = 4*ip_hdr(skb)->ihl;
++
++	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
++		/* 12 == offset into TCP header for the header length field.
++		Can't get this with skb->h.th->doff because the tcphdr
++		struct doesn't get set when routing (this is confirmed to be
++		true in Netfilter as well as QoS.) */
++		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
++
++		return ip_hl + tcp_hl;
++	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
++		return ip_hl + 8; /* UDP header is always 8 bytes */
++	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
++		return ip_hl + 8; /* ICMP header is 8 bytes */
++	} else {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: tried to handle unknown "
++					"protocol!\n");
++		return ip_hl + 8; /* something reasonable */
++	}
++}
++
++/* handles whether there's a match when we aren't appending data anymore */
++static int match_no_append(struct nf_conn * conntrack, 
++                           struct nf_conn * master_conntrack, 
++                           enum ip_conntrack_info ctinfo,
++                           enum ip_conntrack_info master_ctinfo,
++                           const struct xt_layer7_info * info)
++{
++	/* If we're in here, throw the app data away */
++	if(master_conntrack->layer7.app_data != NULL) {
++
++	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++		if(!master_conntrack->layer7.app_proto) {
++			char * f = 
++			  friendly_print(master_conntrack->layer7.app_data);
++			char * g = 
++			  hex_print(master_conntrack->layer7.app_data);
++			DPRINTK("\nl7-filter gave up after %d bytes "
++				"(%d packets):\n%s\n",
++				strlen(f), total_acct_packets(master_conntrack), f);
++			kfree(f);
++			DPRINTK("In hex: %s\n", g);
++			kfree(g);
++		}
++	#endif
++
++		kfree(master_conntrack->layer7.app_data);
++		master_conntrack->layer7.app_data = NULL; /* don't free again */
++	}
++
++	if(master_conntrack->layer7.app_proto){
++		/* Here child connections set their .app_proto (for /proc) */
++		if(!conntrack->layer7.app_proto) {
++			conntrack->layer7.app_proto = 
++			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
++			    GFP_ATOMIC);
++			if(!conntrack->layer7.app_proto){
++				if (net_ratelimit())
++					printk(KERN_ERR "layer7: out of memory "
++							"in match_no_append, "
++							"bailing.\n");
++				return 1;
++			}
++			strcpy(conntrack->layer7.app_proto, 
++				master_conntrack->layer7.app_proto);
++		}
++
++		return (!strcmp(master_conntrack->layer7.app_proto, 
++				info->protocol));
++	}
++	else {
++		/* If not classified, set to "unknown" to distinguish from
++		connections that are still being tested. */
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match_no_append, bailing.\n");
++			return 1;
++		}
++		strcpy(master_conntrack->layer7.app_proto, "unknown");
++		return 0;
++	}
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length = 0, i;
++	int oldlength = master_conntrack->layer7.app_data_len;
++
++	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
++	   clear on whether the race condition exists or whether this really 
++	   fixes it.  I might just be being dense... Anyway, if it's not really 
++	   a fix, all it does is waste a very small amount of time. */
++	if(!master_conntrack->layer7.app_data) return 0;
++
++	/* Strip nulls. Make everything lower case (our regex lib doesn't
++	do case insensitivity).  Add it to the end of the current data. */
++	for(i = 0; i < maxdatalen-oldlength-1 &&
++		   i < appdatalen; i++) {
++		if(app_data[i] != '\0') {
++			/* the kernel version of tolower mungs 'upper ascii' */
++			master_conntrack->layer7.app_data[length+oldlength] =
++				isascii(app_data[i])? 
++					tolower(app_data[i]) : app_data[i];
++			length++;
++		}
++	}
++
++	master_conntrack->layer7.app_data[length+oldlength] = '\0';
++	master_conntrack->layer7.app_data_len = length + oldlength;
++
++	return length;
++}
++
++/* taken from drivers/video/modedb.c */
++static int my_atoi(const char *s)
++{
++	int val = 0;
++
++	for (;; s++) {
++		switch (*s) {
++			case '0'...'9':
++			val = 10*val+(*s-'0');
++			break;
++		default:
++			return val;
++		}
++	}
++}
++
++/* write out num_packets to userland. */
++static int layer7_read_proc(char* page, char ** start, off_t off, int count,
++                            int* eof, void * data)
++{
++	if(num_packets > 99 && net_ratelimit())
++		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
++
++	page[0] = num_packets/10 + '0';
++	page[1] = num_packets%10 + '0';
++	page[2] = '\n';
++	page[3] = '\0';
++
++	*eof=1;
++
++	return 3;
++}
++
++/* Read in num_packets from userland */
++static int layer7_write_proc(struct file* file, const char* buffer,
++                             unsigned long count, void *data)
++{
++	char * foo = kmalloc(count, GFP_ATOMIC);
++
++	if(!foo){
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory, bailing. "
++					"num_packets unchanged.\n");
++		return count;
++	}
++
++	if(copy_from_user(foo, buffer, count)) {
++		return -EFAULT;
++	}
++
++
++	num_packets = my_atoi(foo);
++	kfree (foo);
++
++	/* This has an arbitrary limit to make the math easier. I'm lazy.
++	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
++	if(num_packets > 99) {
++		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
++		num_packets = 99;
++	} else if(num_packets < 1) {
++		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
++		num_packets = 1;
++	}
++
++	return count;
++}
++
++static bool
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++match(const struct sk_buff *skbin, const struct xt_match_param *par)
++#else
++match(const struct sk_buff *skbin,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      bool *hotdrop)
++#endif
++{
++	/* sidestep const without getting a compiler warning... */
++	struct sk_buff * skb = (struct sk_buff *)skbin; 
++
++	const struct xt_layer7_info * info = 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++		par->matchinfo;
++	#else
++		matchinfo;
++	#endif
++
++	enum ip_conntrack_info master_ctinfo, ctinfo;
++	struct nf_conn *master_conntrack, *conntrack;
++	unsigned char * app_data;
++	unsigned int pattern_result, appdatalen;
++	regexp * comppattern;
++
++	/* Be paranoid/incompetent - lock the entire match function. */
++	spin_lock_bh(&l7_lock);
++
++	if(!can_handle(skb)){
++		DPRINTK("layer7: This is some protocol I can't handle.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Treat parent & all its children together as one connection, except
++	for the purpose of setting conntrack->layer7.app_proto in the actual
++	connection. This makes /proc/net/ip_conntrack more satisfying. */
++	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
++	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
++		DPRINTK("layer7: couldn't get conntrack.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
++	while (master_ct(master_conntrack) != NULL)
++		master_conntrack = master_ct(master_conntrack);
++
++	/* if we've classified it or seen too many packets */
++	if(total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto) {
++
++		pattern_result = match_no_append(conntrack, master_conntrack, 
++						 ctinfo, master_ctinfo, info);
++
++		/* skb->cb[0] == seen. Don't do things twice if there are 
++		multiple l7 rules. I'm not sure that using cb for this purpose 
++		is correct, even though it says "put your private variables 
++		there". But it doesn't look like it is being used for anything
++		else in the skbs that make it here. */
++		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
++
++		spin_unlock_bh(&l7_lock);
++		return (pattern_result ^ info->invert);
++	}
++
++	if(skb_is_nonlinear(skb)){
++		if(skb_linearize(skb) != 0){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: failed to linearize "
++						"packet, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* now that the skb is linearized, it's safe to set these. */
++	app_data = skb->data + app_data_offset(skb);
++	appdatalen = skb_tail_pointer(skb) - app_data;
++
++	/* the return value gets checked later, when we're ready to use it */
++	comppattern = compile_and_cache(info->pattern, info->protocol);
++
++	/* On the first packet of a connection, allocate space for app data */
++	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
++	   !master_conntrack->layer7.app_data){
++		master_conntrack->layer7.app_data = 
++			kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++
++		master_conntrack->layer7.app_data[0] = '\0';
++	}
++
++	/* Can be here, but unallocated, if numpackets is increased near
++	the beginning of a connection */
++	if(master_conntrack->layer7.app_data == NULL){
++		spin_unlock_bh(&l7_lock);
++		return info->invert; /* unmatched */
++	}
++
++	if(!skb->cb[0]){
++		int newbytes;
++		newbytes = add_data(master_conntrack, app_data, appdatalen);
++
++		if(newbytes == 0) { /* didn't add any data */
++			skb->cb[0] = 1;
++			/* Didn't match before, not going to match now */
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* If looking for "unknown", then never match.  "Unknown" means that
++	we've given up; we're still trying with these packets. */
++	if(!strcmp(info->protocol, "unknown")) {
++		pattern_result = 0;
++	/* If looking for "unset", then always match. "Unset" means that we
++	haven't yet classified the connection. */
++	} else if(!strcmp(info->protocol, "unset")) {
++		pattern_result = 2;
++		DPRINTK("layer7: matched unset: not yet classified "
++			"(%d/%d packets)\n",
++                        total_acct_packets(master_conntrack), num_packets);
++	/* If the regexp failed to compile, don't bother running it */
++	} else if(comppattern && 
++		  regexec(comppattern, master_conntrack->layer7.app_data)){
++		DPRINTK("layer7: matched %s\n", info->protocol);
++		pattern_result = 1;
++	} else pattern_result = 0;
++
++	if(pattern_result == 1) {
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return (pattern_result ^ info->invert);
++		}
++		strcpy(master_conntrack->layer7.app_proto, info->protocol);
++	} else if(pattern_result > 1) { /* cleanup from "unset" */
++		pattern_result = 1;
++	}
++
++	/* mark the packet seen */
++	skb->cb[0] = 1;
++
++	spin_unlock_bh(&l7_lock);
++	return (pattern_result ^ info->invert);
++}
++
++// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++static bool check(const struct xt_mtchk_param *par)
++{
++        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", par->match->family);
++#else
++static bool check(const char *tablename, const void *inf,
++		 const struct xt_match *match, void *matchinfo,
++		 unsigned int hook_mask)
++{
++        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", match->family);
++#endif
++                return 0;
++        }
++	return 1;
++}
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++	static void destroy(const struct xt_mtdtor_param *par)
++	{
++		nf_ct_l3proto_module_put(par->match->family);
++	}
++#else
++	static void destroy(const struct xt_match *match, void *matchinfo)
++	{
++		nf_ct_l3proto_module_put(match->family);
++	}
++#endif
++
++static struct xt_match xt_layer7_match[] __read_mostly = {
++{
++	.name		= "layer7",
++	.family		= AF_INET,
++	.checkentry	= check,
++	.match		= match,
++	.destroy	= destroy,
++	.matchsize	= sizeof(struct xt_layer7_info),
++	.me		= THIS_MODULE
++}
++};
++
++static void layer7_cleanup_proc(void)
++{
++	remove_proc_entry("layer7_numpackets", init_net.proc_net);
++}
++
++/* register the proc file */
++static void layer7_init_proc(void)
++{
++	struct proc_dir_entry* entry;
++	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
++	entry->read_proc = layer7_read_proc;
++	entry->write_proc = layer7_write_proc;
++}
++
++static int __init xt_layer7_init(void)
++{
++	need_conntrack();
++
++	layer7_init_proc();
++	if(maxdatalen < 1) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
++			"using 1\n");
++		maxdatalen = 1;
++	}
++	/* This is not a hard limit.  It's just here to prevent people from
++	bringing their slow machines to a grinding halt. */
++	else if(maxdatalen > 65536) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
++			"using 65536\n");
++		maxdatalen = 65536;
++	}
++	return xt_register_matches(xt_layer7_match,
++				   ARRAY_SIZE(xt_layer7_match));
++}
++
++static void __exit xt_layer7_fini(void)
++{
++	layer7_cleanup_proc();
++	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
++}
++
++module_init(xt_layer7_init);
++module_exit(xt_layer7_fini);
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.c
+@@ -0,0 +1,1197 @@
++/*
++ * regcomp and regexec -- regsub and regerror are elsewhere
++ * @(#)regexp.c	1.3 of 18 April 87
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ * Beware that some of this code is subtly aware of the way operator
++ * precedence is structured in regular expressions.  Serious changes in
++ * regular-expression syntax might require a total rethink.
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ * Modified slightly by Matthew Strait to use more modern C.
++ */
++
++#include "regexp.h"
++#include "regmagic.h"
++
++/* added by ethan and matt.  Lets it work in both kernel and user space.
++(So iptables can use it, for instance.)  Yea, it goes both ways... */
++#if __KERNEL__
++  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
++#else
++  #define printk(format,args...) printf(format,##args)
++#endif
++
++void regerror(char * s)
++{
++        printk("<3>Regexp: %s\n", s);
++        /* NOTREACHED */
++}
++
++/*
++ * The "internal use only" fields in regexp.h are present to pass info from
++ * compile to execute that permits the execute phase to run lots faster on
++ * simple cases.  They are:
++ *
++ * regstart	char that must begin a match; '\0' if none obvious
++ * reganch	is the match anchored (at beginning-of-line only)?
++ * regmust	string (pointer into program) that match must include, or NULL
++ * regmlen	length of regmust string
++ *
++ * Regstart and reganch permit very fast decisions on suitable starting points
++ * for a match, cutting down the work a lot.  Regmust permits fast rejection
++ * of lines that cannot possibly match.  The regmust tests are costly enough
++ * that regcomp() supplies a regmust only if the r.e. contains something
++ * potentially expensive (at present, the only such thing detected is * or +
++ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
++ * supplied because the test in regexec() needs it and regcomp() is computing
++ * it anyway.
++ */
++
++/*
++ * Structure for regexp "program".  This is essentially a linear encoding
++ * of a nondeterministic finite-state machine (aka syntax charts or
++ * "railroad normal form" in parsing technology).  Each node is an opcode
++ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
++ * all nodes except BRANCH implement concatenation; a "next" pointer with
++ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
++ * have one of the subtle syntax dependencies:  an individual BRANCH (as
++ * opposed to a collection of them) is never concatenated with anything
++ * because of operator precedence.)  The operand of some types of node is
++ * a literal string; for others, it is a node leading into a sub-FSM.  In
++ * particular, the operand of a BRANCH node is the first node of the branch.
++ * (NB this is *not* a tree structure:  the tail of the branch connects
++ * to the thing following the set of BRANCHes.)  The opcodes are:
++ */
++
++/* definition	number	opnd?	meaning */
++#define	END	0	/* no	End of program. */
++#define	BOL	1	/* no	Match "" at beginning of line. */
++#define	EOL	2	/* no	Match "" at end of line. */
++#define	ANY	3	/* no	Match any one character. */
++#define	ANYOF	4	/* str	Match any character in this string. */
++#define	ANYBUT	5	/* str	Match any character not in this string. */
++#define	BRANCH	6	/* node	Match this alternative, or the next... */
++#define	BACK	7	/* no	Match "", "next" ptr points backward. */
++#define	EXACTLY	8	/* str	Match this string. */
++#define	NOTHING	9	/* no	Match empty string. */
++#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
++#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
++#define	OPEN	20	/* no	Mark this point in input as start of #n. */
++			/*	OPEN+1 is number 1, etc. */
++#define	CLOSE	30	/* no	Analogous to OPEN. */
++
++/*
++ * Opcode notes:
++ *
++ * BRANCH	The set of branches constituting a single choice are hooked
++ *		together with their "next" pointers, since precedence prevents
++ *		anything being concatenated to any individual branch.  The
++ *		"next" pointer of the last BRANCH in a choice points to the
++ *		thing following the whole choice.  This is also where the
++ *		final "next" pointer of each individual branch points; each
++ *		branch starts with the operand node of a BRANCH node.
++ *
++ * BACK		Normal "next" pointers all implicitly point forward; BACK
++ *		exists to make loop structures possible.
++ *
++ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
++ *		BRANCH structures using BACK.  Simple cases (one character
++ *		per match) are implemented with STAR and PLUS for speed
++ *		and to minimize recursive plunges.
++ *
++ * OPEN,CLOSE	...are numbered at compile time.
++ */
++
++/*
++ * A node is one char of opcode followed by two chars of "next" pointer.
++ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
++ * value is a positive offset from the opcode of the node containing it.
++ * An operand, if any, simply follows the node.  (Note that much of the
++ * code generation knows about this implicit relationship.)
++ *
++ * Using two bytes for the "next" pointer is vast overkill for most things,
++ * but allows patterns to get big without disasters.
++ */
++#define	OP(p)	(*(p))
++#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
++#define	OPERAND(p)	((p) + 3)
++
++/*
++ * See regmagic.h for one further detail of program structure.
++ */
++
++
++/*
++ * Utility definitions.
++ */
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#define	FAIL(m)	{ regerror(m); return(NULL); }
++#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
++#define	META	"^$.[()|?+*\\"
++
++/*
++ * Flags to be passed up and down.
++ */
++#define	HASWIDTH	01	/* Known never to match null string. */
++#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
++#define	SPSTART		04	/* Starts with * or +. */
++#define	WORST		0	/* Worst case. */
++
++/*
++ * Global work variables for regcomp().
++ */
++struct match_globals {
++char *reginput;		/* String-input pointer. */
++char *regbol;		/* Beginning of input, for ^ check. */
++char **regstartp;	/* Pointer to startp array. */
++char **regendp;		/* Ditto for endp. */
++char *regparse;		/* Input-scan pointer. */
++int regnpar;		/* () count. */
++char regdummy;
++char *regcode;		/* Code-emit pointer; &regdummy = don't. */
++long regsize;		/* Code size. */
++};
++
++/*
++ * Forward declarations for regcomp()'s friends.
++ */
++#ifndef STATIC
++#define	STATIC	static
++#endif
++STATIC char *reg(struct match_globals *g, int paren,int *flagp);
++STATIC char *regbranch(struct match_globals *g, int *flagp);
++STATIC char *regpiece(struct match_globals *g, int *flagp);
++STATIC char *regatom(struct match_globals *g, int *flagp);
++STATIC char *regnode(struct match_globals *g, char op);
++STATIC char *regnext(struct match_globals *g, char *p);
++STATIC void regc(struct match_globals *g, char b);
++STATIC void reginsert(struct match_globals *g, char op, char *opnd);
++STATIC void regtail(struct match_globals *g, char *p, char *val);
++STATIC void regoptail(struct match_globals *g, char *p, char *val);
++
++
++__kernel_size_t my_strcspn(const char *s1,const char *s2)
++{
++        char *scan1;
++        char *scan2;
++        int count;
++
++        count = 0;
++        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
++                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
++                        if (*scan1 == *scan2++)
++                                return(count);
++                count++;
++        }
++        return(count);
++}
++
++/*
++ - regcomp - compile a regular expression into internal code
++ *
++ * We can't allocate space until we know how big the compiled form will be,
++ * but we can't compile it (and thus know how big it is) until we've got a
++ * place to put the code.  So we cheat:  we compile it twice, once with code
++ * generation turned off and size counting turned on, and once "for real".
++ * This also means that we don't allocate space until we are sure that the
++ * thing really will compile successfully, and we never have to move the
++ * code and thus invalidate pointers into it.  (Note that it has to be in
++ * one piece because free() must be able to free it all.)
++ *
++ * Beware that the optimization-preparation code in here knows about some
++ * of the structure of the compiled regexp.
++ */
++regexp *
++regcomp(char *exp,int *patternsize)
++{
++	register regexp *r;
++	register char *scan;
++	register char *longest;
++	register int len;
++	int flags;
++	struct match_globals g;
++	
++	/* commented out by ethan
++	   extern char *malloc();
++	*/
++
++	if (exp == NULL)
++		FAIL("NULL argument");
++
++	/* First pass: determine size, legality. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regsize = 0L;
++	g.regcode = &g.regdummy;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Small enough for pointer-storage convention? */
++	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
++		FAIL("regexp too big");
++
++	/* Allocate space. */
++	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
++	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
++	if (r == NULL)
++		FAIL("out of space");
++
++	/* Second pass: emit code. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regcode = r->program;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Dig out information for optimizations. */
++	r->regstart = '\0';	/* Worst-case defaults. */
++	r->reganch = 0;
++	r->regmust = NULL;
++	r->regmlen = 0;
++	scan = r->program+1;			/* First BRANCH. */
++	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
++		scan = OPERAND(scan);
++
++		/* Starting-point info. */
++		if (OP(scan) == EXACTLY)
++			r->regstart = *OPERAND(scan);
++		else if (OP(scan) == BOL)
++			r->reganch++;
++
++		/*
++		 * If there's something expensive in the r.e., find the
++		 * longest literal string that must appear and make it the
++		 * regmust.  Resolve ties in favor of later strings, since
++		 * the regstart check works with the beginning of the r.e.
++		 * and avoiding duplication strengthens checking.  Not a
++		 * strong reason, but sufficient in the absence of others.
++		 */
++		if (flags&SPSTART) {
++			longest = NULL;
++			len = 0;
++			for (; scan != NULL; scan = regnext(&g, scan))
++				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
++					longest = OPERAND(scan);
++					len = strlen(OPERAND(scan));
++				}
++			r->regmust = longest;
++			r->regmlen = len;
++		}
++	}
++
++	return(r);
++}
++
++/*
++ - reg - regular expression, i.e. main body or parenthesized thing
++ *
++ * Caller must absorb opening parenthesis.
++ *
++ * Combining parenthesis handling with the base level of regular expression
++ * is a trifle forced, but the need to tie the tails of the branches to what
++ * follows makes it hard to avoid.
++ */
++static char *
++reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
++{
++	register char *ret;
++	register char *br;
++	register char *ender;
++	register int parno = 0; /* 0 makes gcc happy */
++	int flags;
++
++	*flagp = HASWIDTH;	/* Tentatively. */
++
++	/* Make an OPEN node, if parenthesized. */
++	if (paren) {
++		if (g->regnpar >= NSUBEXP)
++			FAIL("too many ()");
++		parno = g->regnpar;
++		g->regnpar++;
++		ret = regnode(g, OPEN+parno);
++	} else
++		ret = NULL;
++
++	/* Pick up the branches, linking them together. */
++	br = regbranch(g, &flags);
++	if (br == NULL)
++		return(NULL);
++	if (ret != NULL)
++		regtail(g, ret, br);	/* OPEN -> first. */
++	else
++		ret = br;
++	if (!(flags&HASWIDTH))
++		*flagp &= ~HASWIDTH;
++	*flagp |= flags&SPSTART;
++	while (*g->regparse == '|') {
++		g->regparse++;
++		br = regbranch(g, &flags);
++		if (br == NULL)
++			return(NULL);
++		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
++		if (!(flags&HASWIDTH))
++			*flagp &= ~HASWIDTH;
++		*flagp |= flags&SPSTART;
++	}
++
++	/* Make a closing node, and hook it on the end. */
++	ender = regnode(g, (paren) ? CLOSE+parno : END);	
++	regtail(g, ret, ender);
++
++	/* Hook the tails of the branches to the closing node. */
++	for (br = ret; br != NULL; br = regnext(g, br))
++		regoptail(g, br, ender);
++
++	/* Check for proper termination. */
++	if (paren && *g->regparse++ != ')') {
++		FAIL("unmatched ()");
++	} else if (!paren && *g->regparse != '\0') {
++		if (*g->regparse == ')') {
++			FAIL("unmatched ()");
++		} else
++			FAIL("junk on end");	/* "Can't happen". */
++		/* NOTREACHED */
++	}
++
++	return(ret);
++}
++
++/*
++ - regbranch - one alternative of an | operator
++ *
++ * Implements the concatenation operator.
++ */
++static char *
++regbranch(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char *chain;
++	register char *latest;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	ret = regnode(g, BRANCH);
++	chain = NULL;
++	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
++		latest = regpiece(g, &flags);
++		if (latest == NULL)
++			return(NULL);
++		*flagp |= flags&HASWIDTH;
++		if (chain == NULL)	/* First piece. */
++			*flagp |= flags&SPSTART;
++		else
++			regtail(g, chain, latest);
++		chain = latest;
++	}
++	if (chain == NULL)	/* Loop ran zero times. */
++		(void) regnode(g, NOTHING);
++
++	return(ret);
++}
++
++/*
++ - regpiece - something followed by possible [*+?]
++ *
++ * Note that the branching code sequences used for ? and the general cases
++ * of * and + are somewhat optimized:  they use the same NOTHING node as
++ * both the endmarker for their branch list and the body of the last branch.
++ * It might seem that this node could be dispensed with entirely, but the
++ * endmarker role is not redundant.
++ */
++static char *
++regpiece(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char op;
++	register char *next;
++	int flags;
++
++	ret = regatom(g, &flags);
++	if (ret == NULL)
++		return(NULL);
++
++	op = *g->regparse;
++	if (!ISMULT(op)) {
++		*flagp = flags;
++		return(ret);
++	}
++
++	if (!(flags&HASWIDTH) && op != '?')
++		FAIL("*+ operand could be empty");
++	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
++
++	if (op == '*' && (flags&SIMPLE))
++		reginsert(g, STAR, ret);
++	else if (op == '*') {
++		/* Emit x* as (x&|), where & means "self". */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regoptail(g, ret, regnode(g, BACK));		/* and loop */
++		regoptail(g, ret, ret);			/* back */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '+' && (flags&SIMPLE))
++		reginsert(g, PLUS, ret);
++	else if (op == '+') {
++		/* Emit x+ as x(&|), where & means "self". */
++		next = regnode(g, BRANCH);			/* Either */
++		regtail(g, ret, next);
++		regtail(g, regnode(g, BACK), ret);		/* loop back */
++		regtail(g, next, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '?') {
++		/* Emit x? as (x|) */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		next = regnode(g, NOTHING);		/* null. */
++		regtail(g, ret, next);
++		regoptail(g, ret, next);
++	}
++	g->regparse++;
++	if (ISMULT(*g->regparse))
++		FAIL("nested *?+");
++
++	return(ret);
++}
++
++/*
++ - regatom - the lowest level
++ *
++ * Optimization:  gobbles an entire sequence of ordinary characters so that
++ * it can turn them into a single node, which is smaller to store and
++ * faster to run.  Backslashed characters are exceptions, each becoming a
++ * separate node; the code is simpler that way and it's not worth fixing.
++ */
++static char *
++regatom(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	switch (*g->regparse++) {
++	case '^':
++		ret = regnode(g, BOL);
++		break;
++	case '$':
++		ret = regnode(g, EOL);
++		break;
++	case '.':
++		ret = regnode(g, ANY);
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	case '[': {
++			register int class;
++			register int classend;
++
++			if (*g->regparse == '^') {	/* Complement of range. */
++				ret = regnode(g, ANYBUT);
++				g->regparse++;
++			} else
++				ret = regnode(g, ANYOF);
++			if (*g->regparse == ']' || *g->regparse == '-')
++				regc(g, *g->regparse++);
++			while (*g->regparse != '\0' && *g->regparse != ']') {
++				if (*g->regparse == '-') {
++					g->regparse++;
++					if (*g->regparse == ']' || *g->regparse == '\0')
++						regc(g, '-');
++					else {
++						class = UCHARAT(g->regparse-2)+1;
++						classend = UCHARAT(g->regparse);
++						if (class > classend+1)
++							FAIL("invalid [] range");
++						for (; class <= classend; class++)
++							regc(g, class);
++						g->regparse++;
++					}
++				} else
++					regc(g, *g->regparse++);
++			}
++			regc(g, '\0');
++			if (*g->regparse != ']')
++				FAIL("unmatched []");
++			g->regparse++;
++			*flagp |= HASWIDTH|SIMPLE;
++		}
++		break;
++	case '(':
++		ret = reg(g, 1, &flags);
++		if (ret == NULL)
++			return(NULL);
++		*flagp |= flags&(HASWIDTH|SPSTART);
++		break;
++	case '\0':
++	case '|':
++	case ')':
++		FAIL("internal urp");	/* Supposed to be caught earlier. */
++		break;
++	case '?':
++	case '+':
++	case '*':
++		FAIL("?+* follows nothing");
++		break;
++	case '\\':
++		if (*g->regparse == '\0')
++			FAIL("trailing \\");
++		ret = regnode(g, EXACTLY);
++		regc(g, *g->regparse++);
++		regc(g, '\0');
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	default: {
++			register int len;
++			register char ender;
++
++			g->regparse--;
++			len = my_strcspn((const char *)g->regparse, (const char *)META);
++			if (len <= 0)
++				FAIL("internal disaster");
++			ender = *(g->regparse+len);
++			if (len > 1 && ISMULT(ender))
++				len--;		/* Back off clear of ?+* operand. */
++			*flagp |= HASWIDTH;
++			if (len == 1)
++				*flagp |= SIMPLE;
++			ret = regnode(g, EXACTLY);
++			while (len > 0) {
++				regc(g, *g->regparse++);
++				len--;
++			}
++			regc(g, '\0');
++		}
++		break;
++	}
++
++	return(ret);
++}
++
++/*
++ - regnode - emit a node
++ */
++static char *			/* Location. */
++regnode(struct match_globals *g, char op)
++{
++	register char *ret;
++	register char *ptr;
++
++	ret = g->regcode;
++	if (ret == &g->regdummy) {
++		g->regsize += 3;
++		return(ret);
++	}
++
++	ptr = ret;
++	*ptr++ = op;
++	*ptr++ = '\0';		/* Null "next" pointer. */
++	*ptr++ = '\0';
++	g->regcode = ptr;
++
++	return(ret);
++}
++
++/*
++ - regc - emit (if appropriate) a byte of code
++ */
++static void
++regc(struct match_globals *g, char b)
++{
++	if (g->regcode != &g->regdummy)
++		*g->regcode++ = b;
++	else
++		g->regsize++;
++}
++
++/*
++ - reginsert - insert an operator in front of already-emitted operand
++ *
++ * Means relocating the operand.
++ */
++static void
++reginsert(struct match_globals *g, char op, char* opnd)
++{
++	register char *src;
++	register char *dst;
++	register char *place;
++
++	if (g->regcode == &g->regdummy) {
++		g->regsize += 3;
++		return;
++	}
++
++	src = g->regcode;
++	g->regcode += 3;
++	dst = g->regcode;
++	while (src > opnd)
++		*--dst = *--src;
++
++	place = opnd;		/* Op node, where operand used to be. */
++	*place++ = op;
++	*place++ = '\0';
++	*place++ = '\0';
++}
++
++/*
++ - regtail - set the next-pointer at the end of a node chain
++ */
++static void
++regtail(struct match_globals *g, char *p, char *val)
++{
++	register char *scan;
++	register char *temp;
++	register int offset;
++
++	if (p == &g->regdummy)
++		return;
++
++	/* Find last node. */
++	scan = p;
++	for (;;) {
++		temp = regnext(g, scan);
++		if (temp == NULL)
++			break;
++		scan = temp;
++	}
++
++	if (OP(scan) == BACK)
++		offset = scan - val;
++	else
++		offset = val - scan;
++	*(scan+1) = (offset>>8)&0377;
++	*(scan+2) = offset&0377;
++}
++
++/*
++ - regoptail - regtail on operand of first argument; nop if operandless
++ */
++static void
++regoptail(struct match_globals *g, char *p, char *val)
++{
++	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
++	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
++		return;
++	regtail(g, OPERAND(p), val);
++}
++
++/*
++ * regexec and friends
++ */
++
++
++/*
++ * Forwards.
++ */
++STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
++STATIC int regmatch(struct match_globals *g, char *prog);
++STATIC int regrepeat(struct match_globals *g, char *p);
++
++#ifdef DEBUG
++int regnarrate = 0;
++void regdump();
++STATIC char *regprop(char *op);
++#endif
++
++/*
++ - regexec - match a regexp against a string
++ */
++int
++regexec(regexp *prog, char *string)
++{
++	register char *s;
++	struct match_globals g;
++
++	/* Be paranoid... */
++	if (prog == NULL || string == NULL) {
++		printk("<3>Regexp: NULL parameter\n");
++		return(0);
++	}
++
++	/* Check validity of program. */
++	if (UCHARAT(prog->program) != MAGIC) {
++		printk("<3>Regexp: corrupted program\n");
++		return(0);
++	}
++
++	/* If there is a "must appear" string, look for it. */
++	if (prog->regmust != NULL) {
++		s = string;
++		while ((s = strchr(s, prog->regmust[0])) != NULL) {
++			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
++				break;	/* Found it. */
++			s++;
++		}
++		if (s == NULL)	/* Not present. */
++			return(0);
++	}
++
++	/* Mark beginning of line for ^ . */
++	g.regbol = string;
++
++	/* Simplest case:  anchored match need be tried only once. */
++	if (prog->reganch)
++		return(regtry(&g, prog, string));
++
++	/* Messy cases:  unanchored match. */
++	s = string;
++	if (prog->regstart != '\0')
++		/* We know what char it must start with. */
++		while ((s = strchr(s, prog->regstart)) != NULL) {
++			if (regtry(&g, prog, s))
++				return(1);
++			s++;
++		}
++	else
++		/* We don't -- general case. */
++		do {
++			if (regtry(&g, prog, s))
++				return(1);
++		} while (*s++ != '\0');
++
++	/* Failure. */
++	return(0);
++}
++
++/*
++ - regtry - try match at specific point
++ */
++static int			/* 0 failure, 1 success */
++regtry(struct match_globals *g, regexp *prog, char *string)
++{
++	register int i;
++	register char **sp;
++	register char **ep;
++
++	g->reginput = string;
++	g->regstartp = prog->startp;
++	g->regendp = prog->endp;
++
++	sp = prog->startp;
++	ep = prog->endp;
++	for (i = NSUBEXP; i > 0; i--) {
++		*sp++ = NULL;
++		*ep++ = NULL;
++	}
++	if (regmatch(g, prog->program + 1)) {
++		prog->startp[0] = string;
++		prog->endp[0] = g->reginput;
++		return(1);
++	} else
++		return(0);
++}
++
++/*
++ - regmatch - main matching routine
++ *
++ * Conceptually the strategy is simple:  check to see whether the current
++ * node matches, call self recursively to see whether the rest matches,
++ * and then act accordingly.  In practice we make some effort to avoid
++ * recursion, in particular by going through "ordinary" nodes (that don't
++ * need to know whether the rest of the match failed) by a loop instead of
++ * by recursion.
++ */
++static int			/* 0 failure, 1 success */
++regmatch(struct match_globals *g, char *prog)
++{
++	register char *scan = prog; /* Current node. */
++	char *next;		    /* Next node. */
++
++#ifdef DEBUG
++	if (scan != NULL && regnarrate)
++		fprintf(stderr, "%s(\n", regprop(scan));
++#endif
++	while (scan != NULL) {
++#ifdef DEBUG
++		if (regnarrate)
++			fprintf(stderr, "%s...\n", regprop(scan));
++#endif
++		next = regnext(g, scan);
++
++		switch (OP(scan)) {
++		case BOL:
++			if (g->reginput != g->regbol)
++				return(0);
++			break;
++		case EOL:
++			if (*g->reginput != '\0')
++				return(0);
++			break;
++		case ANY:
++			if (*g->reginput == '\0')
++				return(0);
++			g->reginput++;
++			break;
++		case EXACTLY: {
++				register int len;
++				register char *opnd;
++
++				opnd = OPERAND(scan);
++				/* Inline the first character, for speed. */
++				if (*opnd != *g->reginput)
++					return(0);
++				len = strlen(opnd);
++				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
++					return(0);
++				g->reginput += len;
++			}
++			break;
++		case ANYOF:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case ANYBUT:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case NOTHING:
++		case BACK:
++			break;
++		case OPEN+1:
++		case OPEN+2:
++		case OPEN+3:
++		case OPEN+4:
++		case OPEN+5:
++		case OPEN+6:
++		case OPEN+7:
++		case OPEN+8:
++		case OPEN+9: {
++				register int no;
++				register char *save;
++
++				no = OP(scan) - OPEN;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set startp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regstartp[no] == NULL)
++						g->regstartp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case CLOSE+1:
++		case CLOSE+2:
++		case CLOSE+3:
++		case CLOSE+4:
++		case CLOSE+5:
++		case CLOSE+6:
++		case CLOSE+7:
++		case CLOSE+8:
++		case CLOSE+9:
++			{
++				register int no;
++				register char *save;
++
++				no = OP(scan) - CLOSE;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set endp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regendp[no] == NULL)
++						g->regendp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case BRANCH: {
++				register char *save;
++
++				if (OP(next) != BRANCH)		/* No choice. */
++					next = OPERAND(scan);	/* Avoid recursion. */
++				else {
++					do {
++						save = g->reginput;
++						if (regmatch(g, OPERAND(scan)))
++							return(1);
++						g->reginput = save;
++						scan = regnext(g, scan);
++					} while (scan != NULL && OP(scan) == BRANCH);
++					return(0);
++					/* NOTREACHED */
++				}
++			}
++			break;
++		case STAR:
++		case PLUS: {
++				register char nextch;
++				register int no;
++				register char *save;
++				register int min;
++
++				/*
++				 * Lookahead to avoid useless match attempts
++				 * when we know what character comes next.
++				 */
++				nextch = '\0';
++				if (OP(next) == EXACTLY)
++					nextch = *OPERAND(next);
++				min = (OP(scan) == STAR) ? 0 : 1;
++				save = g->reginput;
++				no = regrepeat(g, OPERAND(scan));
++				while (no >= min) {
++					/* If it could work, try it. */
++					if (nextch == '\0' || *g->reginput == nextch)
++						if (regmatch(g, next))
++							return(1);
++					/* Couldn't or didn't -- back up. */
++					no--;
++					g->reginput = save + no;
++				}
++				return(0);
++			}
++			break;
++		case END:
++			return(1);	/* Success! */
++			break;
++		default:
++			printk("<3>Regexp: memory corruption\n");
++			return(0);
++			break;
++		}
++
++		scan = next;
++	}
++
++	/*
++	 * We get here only if there's trouble -- normally "case END" is
++	 * the terminating point.
++	 */
++	printk("<3>Regexp: corrupted pointers\n");
++	return(0);
++}
++
++/*
++ - regrepeat - repeatedly match something simple, report how many
++ */
++static int
++regrepeat(struct match_globals *g, char *p)
++{
++	register int count = 0;
++	register char *scan;
++	register char *opnd;
++
++	scan = g->reginput;
++	opnd = OPERAND(p);
++	switch (OP(p)) {
++	case ANY:
++		count = strlen(scan);
++		scan += count;
++		break;
++	case EXACTLY:
++		while (*opnd == *scan) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYOF:
++		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYBUT:
++		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	default:		/* Oh dear.  Called inappropriately. */
++		printk("<3>Regexp: internal foulup\n");
++		count = 0;	/* Best compromise. */
++		break;
++	}
++	g->reginput = scan;
++
++	return(count);
++}
++
++/*
++ - regnext - dig the "next" pointer out of a node
++ */
++static char*
++regnext(struct match_globals *g, char *p)
++{
++	register int offset;
++
++	if (p == &g->regdummy)
++		return(NULL);
++
++	offset = NEXT(p);
++	if (offset == 0)
++		return(NULL);
++
++	if (OP(p) == BACK)
++		return(p-offset);
++	else
++		return(p+offset);
++}
++
++#ifdef DEBUG
++
++STATIC char *regprop();
++
++/*
++ - regdump - dump a regexp onto stdout in vaguely comprehensible form
++ */
++void
++regdump(regexp *r)
++{
++	register char *s;
++	register char op = EXACTLY;	/* Arbitrary non-END op. */
++	register char *next;
++	/* extern char *strchr(); */
++
++
++	s = r->program + 1;
++	while (op != END) {	/* While that wasn't END last time... */
++		op = OP(s);
++		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
++		next = regnext(s);
++		if (next == NULL)		/* Next ptr. */
++			printf("(0)");
++		else
++			printf("(%d)", (s-r->program)+(next-s));
++		s += 3;
++		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
++			/* Literal string, where present. */
++			while (*s != '\0') {
++				putchar(*s);
++				s++;
++			}
++			s++;
++		}
++		putchar('\n');
++	}
++
++	/* Header fields of interest. */
++	if (r->regstart != '\0')
++		printf("start `%c' ", r->regstart);
++	if (r->reganch)
++		printf("anchored ");
++	if (r->regmust != NULL)
++		printf("must have \"%s\"", r->regmust);
++	printf("\n");
++}
++
++/*
++ - regprop - printable representation of opcode
++ */
++static char *
++regprop(char *op)
++{
++#define BUFLEN 50
++	register char *p;
++	static char buf[BUFLEN];
++
++	strcpy(buf, ":");
++
++	switch (OP(op)) {
++	case BOL:
++		p = "BOL";
++		break;
++	case EOL:
++		p = "EOL";
++		break;
++	case ANY:
++		p = "ANY";
++		break;
++	case ANYOF:
++		p = "ANYOF";
++		break;
++	case ANYBUT:
++		p = "ANYBUT";
++		break;
++	case BRANCH:
++		p = "BRANCH";
++		break;
++	case EXACTLY:
++		p = "EXACTLY";
++		break;
++	case NOTHING:
++		p = "NOTHING";
++		break;
++	case BACK:
++		p = "BACK";
++		break;
++	case END:
++		p = "END";
++		break;
++	case OPEN+1:
++	case OPEN+2:
++	case OPEN+3:
++	case OPEN+4:
++	case OPEN+5:
++	case OPEN+6:
++	case OPEN+7:
++	case OPEN+8:
++	case OPEN+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
++		p = NULL;
++		break;
++	case CLOSE+1:
++	case CLOSE+2:
++	case CLOSE+3:
++	case CLOSE+4:
++	case CLOSE+5:
++	case CLOSE+6:
++	case CLOSE+7:
++	case CLOSE+8:
++	case CLOSE+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
++		p = NULL;
++		break;
++	case STAR:
++		p = "STAR";
++		break;
++	case PLUS:
++		p = "PLUS";
++		break;
++	default:
++		printk("<3>Regexp: corrupted opcode\n");
++		break;
++	}
++	if (p != NULL)
++		strncat(buf, p, BUFLEN-strlen(buf));
++	return(buf);
++}
++#endif
++
++
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.h
+@@ -0,0 +1,41 @@
++/*
++ * Definitions etc. for regexp(3) routines.
++ *
++ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
++ * not the System V one.
++ */
++
++#ifndef REGEXP_H
++#define REGEXP_H
++
++
++/*
++http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
++which contains a version of this library, says:
++
++ *
++ * NSUBEXP must be at least 10, and no greater than 117 or the parser
++ * will not work properly.
++ *
++
++However, it looks rather like this library is limited to 10.  If you think
++otherwise, let us know.
++*/
++
++#define NSUBEXP  10
++typedef struct regexp {
++	char *startp[NSUBEXP];
++	char *endp[NSUBEXP];
++	char regstart;		/* Internal use only. */
++	char reganch;		/* Internal use only. */
++	char *regmust;		/* Internal use only. */
++	int regmlen;		/* Internal use only. */
++	char program[1];	/* Unwarranted chumminess with compiler. */
++} regexp;
++
++regexp * regcomp(char *exp, int *patternsize);
++int regexec(regexp *prog, char *string);
++void regsub(regexp *prog, char *source, char *dest);
++void regerror(char *s);
++
++#endif
+--- /dev/null
++++ b/net/netfilter/regexp/regmagic.h
+@@ -0,0 +1,5 @@
++/*
++ * The first byte of the regexp internal "program" is actually this magic
++ * number; the start node begins in the second byte.
++ */
++#define	MAGIC	0234
+--- /dev/null
++++ b/net/netfilter/regexp/regsub.c
+@@ -0,0 +1,95 @@
++/*
++ * regsub
++ * @(#)regsub.c	1.3 of 2 April 86
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ */
++#include "regexp.h"
++#include "regmagic.h"
++#include <linux/string.h>
++
++
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#if 0
++//void regerror(char * s)
++//{
++//        printk("regexp(3): %s", s);
++//        /* NOTREACHED */
++//}
++#endif
++
++/*
++ - regsub - perform substitutions after a regexp match
++ */
++void
++regsub(regexp * prog, char * source, char * dest)
++{
++	register char *src;
++	register char *dst;
++	register char c;
++	register int no;
++	register int len;
++	
++	/* Not necessary and gcc doesn't like it -MLS */
++	/*extern char *strncpy();*/
++
++	if (prog == NULL || source == NULL || dest == NULL) {
++		regerror("NULL parm to regsub");
++		return;
++	}
++	if (UCHARAT(prog->program) != MAGIC) {
++		regerror("damaged regexp fed to regsub");
++		return;
++	}
++
++	src = source;
++	dst = dest;
++	while ((c = *src++) != '\0') {
++		if (c == '&')
++			no = 0;
++		else if (c == '\\' && '0' <= *src && *src <= '9')
++			no = *src++ - '0';
++		else
++			no = -1;
++
++		if (no < 0) {	/* Ordinary character. */
++			if (c == '\\' && (*src == '\\' || *src == '&'))
++				c = *src++;
++			*dst++ = c;
++		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
++			len = prog->endp[no] - prog->startp[no];
++			(void) strncpy(dst, prog->startp[no], len);
++			dst += len;
++			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
++				regerror("damaged match string");
++				return;
++			}
++		}
++	}
++	*dst++ = '\0';
++}
+--- a/net/netfilter/nf_conntrack_core.c
++++ b/net/netfilter/nf_conntrack_core.c
+@@ -226,6 +226,13 @@ destroy_conntrack(struct nf_conntrack *n
+ 	 * too. */
+ 	nf_ct_remove_expectations(ct);
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto)
++		kfree(ct->layer7.app_proto);
++	if(ct->layer7.app_data)
++		kfree(ct->layer7.app_data);
++#endif
++
+ 	/* We overload first tuple to link into unconfirmed or dying list.*/
+ 	BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
+ 	hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -240,6 +240,12 @@ static int ct_seq_show(struct seq_file *
+ 	if (ct_show_delta_time(s, ct))
+ 		goto release;
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto &&
++           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
++		return -ENOSPC;
++#endif
++
+ 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
+ 		goto release;
+ 
+--- a/include/net/netfilter/nf_conntrack.h
++++ b/include/net/netfilter/nf_conntrack.h
+@@ -105,6 +105,22 @@ struct nf_conn {
+ 	struct net *ct_net;
+ #endif
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
++    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	struct {
++		/*
++		 * e.g. "http". NULL before decision. "unknown" after decision
++		 * if no match.
++		 */
++		char *app_proto;
++		/*
++		 * application layer data so far. NULL after match decision.
++		 */
++		char *app_data;
++		unsigned int app_data_len;
++	} layer7;
++#endif
++
+ 	/* Storage reserved for other modules, must be the last member */
+ 	union nf_conntrack_proto proto;
+ };
+--- /dev/null
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -0,0 +1,13 @@
++#ifndef _XT_LAYER7_H
++#define _XT_LAYER7_H
++
++#define MAX_PATTERN_LEN 8192
++#define MAX_PROTOCOL_LEN 256
++
++struct xt_layer7_info {
++    char protocol[MAX_PROTOCOL_LEN];
++    char pattern[MAX_PATTERN_LEN];
++    u_int8_t invert;
++};
++
++#endif /* _XT_LAYER7_H */
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -56,6 +56,7 @@ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
++header-y += xt_layer7.h
+ header-y += xt_length.h
+ header-y += xt_limit.h
+ header-y += xt_mac.h
diff --git a/trunk/target/linux/generic/patches-3.13/601-netfilter_layer7_pktmatch.patch b/trunk/target/linux/generic/patches-3.13/601-netfilter_layer7_pktmatch.patch
new file mode 100644
index 00000000..f65e301f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/601-netfilter_layer7_pktmatch.patch
@@ -0,0 +1,108 @@
+--- a/include/linux/netfilter/xt_layer7.h
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
+     char protocol[MAX_PROTOCOL_LEN];
+     char pattern[MAX_PATTERN_LEN];
+     u_int8_t invert;
++    u_int8_t pkt;
+ };
+ 
+ #endif /* _XT_LAYER7_H */
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
+ }
+ 
+ /* add the new app data to the conntrack.  Return number of bytes added. */
+-static int add_data(struct nf_conn * master_conntrack,
+-                    char * app_data, int appdatalen)
++static int add_datastr(char *target, int offset, char *app_data, int len)
+ {
+ 	int length = 0, i;
+-	int oldlength = master_conntrack->layer7.app_data_len;
+-
+-	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
+-	   clear on whether the race condition exists or whether this really 
+-	   fixes it.  I might just be being dense... Anyway, if it's not really 
+-	   a fix, all it does is waste a very small amount of time. */
+-	if(!master_conntrack->layer7.app_data) return 0;
++	if (!target) return 0;
+ 
+ 	/* Strip nulls. Make everything lower case (our regex lib doesn't
+ 	do case insensitivity).  Add it to the end of the current data. */
+-	for(i = 0; i < maxdatalen-oldlength-1 &&
+-		   i < appdatalen; i++) {
++ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
+ 		if(app_data[i] != '\0') {
+ 			/* the kernel version of tolower mungs 'upper ascii' */
+-			master_conntrack->layer7.app_data[length+oldlength] =
++			target[length+offset] =
+ 				isascii(app_data[i])? 
+ 					tolower(app_data[i]) : app_data[i];
+ 			length++;
+ 		}
+ 	}
++	target[length+offset] = '\0';
++
++	return length;
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length;
+ 
+-	master_conntrack->layer7.app_data[length+oldlength] = '\0';
+-	master_conntrack->layer7.app_data_len = length + oldlength;
++	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
++	master_conntrack->layer7.app_data_len += length;
+ 
+ 	return length;
+ }
+@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
+ 
+ 	enum ip_conntrack_info master_ctinfo, ctinfo;
+ 	struct nf_conn *master_conntrack, *conntrack;
+-	unsigned char * app_data;
++	unsigned char *app_data, *tmp_data;
+ 	unsigned int pattern_result, appdatalen;
+ 	regexp * comppattern;
+ 
+@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
+ 		master_conntrack = master_ct(master_conntrack);
+ 
+ 	/* if we've classified it or seen too many packets */
+-	if(total_acct_packets(master_conntrack) > num_packets ||
+-	   master_conntrack->layer7.app_proto) {
++	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto)) {
+ 
+ 		pattern_result = match_no_append(conntrack, master_conntrack, 
+ 						 ctinfo, master_ctinfo, info);
+@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
+ 	/* the return value gets checked later, when we're ready to use it */
+ 	comppattern = compile_and_cache(info->pattern, info->protocol);
+ 
++	if (info->pkt) {
++		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!tmp_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
++			return info->invert;
++		}
++
++		tmp_data[0] = '\0';
++		add_datastr(tmp_data, 0, app_data, appdatalen);
++		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
++
++		kfree(tmp_data);
++		tmp_data = NULL;
++		spin_unlock_bh(&l7_lock);
++
++		return (pattern_result ^ info->invert);
++	}
++
+ 	/* On the first packet of a connection, allocate space for app data */
+ 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
+ 	   !master_conntrack->layer7.app_data){
diff --git a/trunk/target/linux/generic/patches-3.13/602-netfilter_layer7_match.patch b/trunk/target/linux/generic/patches-3.13/602-netfilter_layer7_match.patch
new file mode 100644
index 00000000..b2e48c82
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/602-netfilter_layer7_match.patch
@@ -0,0 +1,51 @@
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
+ 
+ static bool
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
+ #else
+ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
+ 
+ // load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
+ {
+         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ 		 const struct xt_match *match, void *matchinfo,
+ 		 unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++		return -EINVAL;
++	}
++	return 0;
++#else
+                 return 0;
+         }
+ 	return 1;
++#endif
+ }
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/603-netfilter_layer7_2.6.36_fix.patch b/trunk/target/linux/generic/patches-3.13/603-netfilter_layer7_2.6.36_fix.patch
new file mode 100644
index 00000000..e6668872
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/603-netfilter_layer7_2.6.36_fix.patch
@@ -0,0 +1,61 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1053,6 +1053,27 @@ config NETFILTER_XT_MATCH_IPVS
+ 
+ 	  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on EXPERIMENTAL
++	depends on NETFILTER_XTABLES
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
++
+ config NETFILTER_XT_MATCH_LENGTH
+ 	tristate '"length" match support'
+ 	depends on NETFILTER_ADVANCED
+@@ -1247,26 +1268,11 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
+-config NETFILTER_XT_MATCH_LAYER7
+-	tristate '"layer7" match support'
+-	depends on NETFILTER_XTABLES
+-	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
+-       depends on NETFILTER_ADVANCED
+-	help
+-	  Say Y if you want to be able to classify connections (and their
+-	  packets) based on regular expression matching of their application
+-	  layer data.   This is one way to classify applications such as
+-	  peer-to-peer filesharing systems that do not always use the same
+-	  port.
+-
+-	  To compile it as a module, choose M here.  If unsure, say N.
+-
+ config NETFILTER_XT_MATCH_LAYER7_DEBUG
+-        bool 'Layer 7 debugging output'
+-        depends on NETFILTER_XT_MATCH_LAYER7
+-        help
+-          Say Y to get lots of debugging output.
+-
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
+ 
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
diff --git a/trunk/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch b/trunk/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch
new file mode 100644
index 00000000..83cd04ac
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,86 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -17,6 +17,7 @@
+ #include <linux/percpu.h>
+ #include <linux/netdevice.h>
+ #include <linux/security.h>
++#include <linux/inet.h>
+ #include <net/net_namespace.h>
+ #ifdef CONFIG_SYSCTL
+ #include <linux/sysctl.h>
+@@ -268,10 +269,66 @@ static int ct_open(struct inode *inode,
+ 			sizeof(struct ct_iter_state));
+ }
+ 
++struct kill_request {
++	u16 family;
++	union nf_inet_addr addr;
++};
++
++static int kill_matching(struct nf_conn *i, void *data)
++{
++	struct kill_request *kr = data;
++	struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
++	struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
++
++	if (!kr->family)
++		return 1;
++
++	if (t1->src.l3num != kr->family)
++		return 0;
++
++	return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++			     size_t count, loff_t *ppos)
++{
++	struct seq_file *seq = file->private_data;
++	struct net *net = seq_file_net(seq);
++	struct kill_request kr = { };
++	char req[INET6_ADDRSTRLEN] = { };
++
++	if (count == 0)
++		return 0;
++
++	if (count >= INET6_ADDRSTRLEN)
++		count = INET6_ADDRSTRLEN - 1;
++
++	if (copy_from_user(req, buf, count))
++		return -EFAULT;
++
++	if (strnchr(req, count, ':')) {
++		kr.family = AF_INET6;
++		if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	} else if (strnchr(req, count, '.')) {
++		kr.family = AF_INET;
++		if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	}
++
++	nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0);
++
++	return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ 	.owner   = THIS_MODULE,
+ 	.open    = ct_open,
+ 	.read    = seq_read,
++	.write	 = ct_file_write,
+ 	.llseek  = seq_lseek,
+ 	.release = seq_release_net,
+ };
+@@ -373,7 +430,7 @@ static int nf_conntrack_standalone_init_
+ {
+ 	struct proc_dir_entry *pde;
+ 
+-	pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops);
++	pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops);
+ 	if (!pde)
+ 		goto out_nf_conntrack;
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/610-netfilter_match_bypass_default_checks.patch b/trunk/target/linux/generic/patches-3.13/610-netfilter_match_bypass_default_checks.patch
new file mode 100644
index 00000000..358d64b1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/610-netfilter_match_bypass_default_checks.patch
@@ -0,0 +1,93 @@
+--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
++++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
+@@ -87,6 +87,7 @@ struct ipt_ip {
+ #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
+ #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
+ #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
++#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
+ 
+ /* Values for "inv" field in struct ipt_ip. */
+ #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -82,6 +82,9 @@ ip_packet_match(const struct iphdr *ip,
+ 
+ #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
+ 
++	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
++		return true;
++
+ 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+ 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+@@ -135,6 +138,29 @@ ip_packet_match(const struct iphdr *ip,
+ 	return true;
+ }
+ 
++static void
++ip_checkdefault(struct ipt_ip *ip)
++{
++	static const char iface_mask[IFNAMSIZ] = {};
++
++	if (ip->invflags || ip->flags & IPT_F_FRAG)
++		return;
++
++	if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (ip->smsk.s_addr || ip->dmsk.s_addr)
++		return;
++
++	if (ip->proto)
++		return;
++
++	ip->flags |= IPT_F_NO_DEF_MATCH;
++}
++
+ static bool
+ ip_checkentry(const struct ipt_ip *ip)
+ {
+@@ -565,7 +591,7 @@ static void cleanup_match(struct xt_entr
+ }
+ 
+ static int
+-check_entry(const struct ipt_entry *e, const char *name)
++check_entry(struct ipt_entry *e, const char *name)
+ {
+ 	const struct xt_entry_target *t;
+ 
+@@ -574,6 +600,8 @@ check_entry(const struct ipt_entry *e, c
+ 		return -EINVAL;
+ 	}
+ 
++	ip_checkdefault(&e->ip);
++
+ 	if (e->target_offset + sizeof(struct xt_entry_target) >
+ 	    e->next_offset)
+ 		return -EINVAL;
+@@ -935,6 +963,7 @@ copy_entries_to_user(unsigned int total_
+ 	const struct xt_table_info *private = table->private;
+ 	int ret = 0;
+ 	const void *loc_cpu_entry;
++	u8 flags;
+ 
+ 	counters = alloc_counters(table);
+ 	if (IS_ERR(counters))
+@@ -965,6 +994,14 @@ copy_entries_to_user(unsigned int total_
+ 			ret = -EFAULT;
+ 			goto free_counters;
+ 		}
++
++		flags = e->ip.flags & IPT_F_MASK;
++		if (copy_to_user(userptr + off
++				 + offsetof(struct ipt_entry, ip.flags),
++				 &flags, sizeof(flags)) != 0) {
++			ret = -EFAULT;
++			goto free_counters;
++		}
+ 
+ 		for (i = sizeof(struct ipt_entry);
+ 		     i < e->target_offset;
diff --git a/trunk/target/linux/generic/patches-3.13/611-netfilter_match_bypass_default_table.patch b/trunk/target/linux/generic/patches-3.13/611-netfilter_match_bypass_default_table.patch
new file mode 100644
index 00000000..f4fa054c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/611-netfilter_match_bypass_default_table.patch
@@ -0,0 +1,83 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -310,6 +310,33 @@ struct ipt_entry *ipt_next_entry(const s
+ 	return (void *)entry + entry->next_offset;
+ }
+ 
++static bool
++ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
++{
++	struct xt_entry_target *t;
++	struct xt_standard_target *st;
++
++	if (e->target_offset != sizeof(struct ipt_entry))
++		return false;
++
++	if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
++		return false;
++
++	t = ipt_get_target(e);
++	if (t->u.kernel.target->target)
++		return false;
++
++	st = (struct xt_standard_target *) t;
++	if (st->verdict == XT_RETURN)
++		return false;
++
++	if (st->verdict >= 0)
++		return false;
++
++	*verdict = (unsigned)(-st->verdict) - 1;
++	return true;
++}
++
+ /* Returns one of the generic firewall policies, like NF_ACCEPT. */
+ unsigned int
+ ipt_do_table(struct sk_buff *skb,
+@@ -334,19 +361,6 @@ ipt_do_table(struct sk_buff *skb,
+ 	ip = ip_hdr(skb);
+ 	indev = in ? in->name : nulldevname;
+ 	outdev = out ? out->name : nulldevname;
+-	/* We handle fragments by dealing with the first fragment as
+-	 * if it was a normal packet.  All other fragments are treated
+-	 * normally, except that they will NEVER match rules that ask
+-	 * things we don't know, ie. tcp syn flag or ports).  If the
+-	 * rule is also a fragment-specific rule, non-fragments won't
+-	 * match it. */
+-	acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
+-	acpar.thoff   = ip_hdrlen(skb);
+-	acpar.hotdrop = false;
+-	acpar.in      = in;
+-	acpar.out     = out;
+-	acpar.family  = NFPROTO_IPV4;
+-	acpar.hooknum = hook;
+ 
+ 	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+ 	local_bh_disable();
+@@ -364,6 +378,26 @@ ipt_do_table(struct sk_buff *skb,
+ 	origptr    = *stackptr;
+ 
+ 	e = get_entry(table_base, private->hook_entry[hook]);
++	if (ipt_handle_default_rule(e, &verdict)) {
++		ADD_COUNTER(e->counters, skb->len, 1);
++		xt_write_recseq_end(addend);
++		local_bh_enable();
++		return verdict;
++	}
++
++	/* We handle fragments by dealing with the first fragment as
++	 * if it was a normal packet.  All other fragments are treated
++	 * normally, except that they will NEVER match rules that ask
++	 * things we don't know, ie. tcp syn flag or ports).  If the
++	 * rule is also a fragment-specific rule, non-fragments won't
++	 * match it. */
++	acpar.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
++	acpar.thoff   = ip_hdrlen(skb);
++	acpar.hotdrop = false;
++	acpar.in      = in;
++	acpar.out     = out;
++	acpar.family  = NFPROTO_IPV4;
++	acpar.hooknum = hook;
+ 
+ 	pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n",
+ 		 table->name, hook, origptr,
diff --git a/trunk/target/linux/generic/patches-3.13/612-netfilter_match_reduce_memory_access.patch b/trunk/target/linux/generic/patches-3.13/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 00000000..72172d8b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/612-netfilter_match_reduce_memory_access.patch
@@ -0,0 +1,16 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -85,9 +85,11 @@ ip_packet_match(const struct iphdr *ip,
+ 	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
+ 		return true;
+ 
+-	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
++	if (FWINV(ipinfo->smsk.s_addr &&
++		  (ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+-	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
++	    FWINV(ipinfo->dmsk.s_addr &&
++		  (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+ 		  IPT_INV_DSTIP)) {
+ 		dprintf("Source or dest mismatch.\n");
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/613-netfilter_optional_tcp_window_check.patch b/trunk/target/linux/generic/patches-3.13/613-netfilter_optional_tcp_window_check.patch
new file mode 100644
index 00000000..1d3b37cc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/613-netfilter_optional_tcp_window_check.patch
@@ -0,0 +1,36 @@
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -33,6 +33,9 @@
+ #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
+ #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
+ 
++/* Do not check the TCP window for incoming packets  */
++static int nf_ct_tcp_no_window_check __read_mostly = 1;
++
+ /* "Be conservative in what you do,
+     be liberal in what you accept from others."
+     If it's non-zero, we mark only out of window RST segments as INVALID. */
+@@ -515,6 +518,9 @@ static bool tcp_in_window(const struct n
+ 	s32 receiver_offset;
+ 	bool res, in_recv_win;
+ 
++	if (nf_ct_tcp_no_window_check)
++		return true;
++
+ 	/*
+ 	 * Get the required data from the packet.
+ 	 */
+@@ -1452,6 +1458,13 @@ static struct ctl_table tcp_sysctl_table
+ 		.mode		= 0644,
+ 		.proc_handler	= proc_dointvec,
+ 	},
++	{
++		.procname       = "nf_conntrack_tcp_no_window_check",
++		.data           = &nf_ct_tcp_no_window_check,
++		.maxlen         = sizeof(unsigned int),
++		.mode           = 0644,
++		.proc_handler   = proc_dointvec,
++	},
+ 	{ }
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/615-netfilter_add_xt_id_match.patch b/trunk/target/linux/generic/patches-3.13/615-netfilter_add_xt_id_match.patch
new file mode 100644
index 00000000..44748a9a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/615-netfilter_add_xt_id_match.patch
@@ -0,0 +1,95 @@
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -54,6 +54,7 @@ header-y += xt_ecn.h
+ header-y += xt_esp.h
+ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
++header-y += xt_id.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+ header-y += xt_layer7.h
+--- /dev/null
++++ b/include/uapi/linux/netfilter/xt_id.h
+@@ -0,0 +1,8 @@
++#ifndef _XT_ID_H
++#define _XT_ID_H
++
++struct xt_id_info {
++	u32 id;
++};
++
++#endif /* XT_ID_H */
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1033,6 +1033,13 @@ config NETFILTER_XT_MATCH_HL
+ 	in the IPv6 header, or the time-to-live field in the IPv4
+ 	header of the packet.
+ 
++config NETFILTER_XT_MATCH_ID
++	tristate '"id" match support'
++	depends on NETFILTER_ADVANCED
++	---help---
++	This option adds a `id' dummy-match, which allows you to put
++	numeric IDs into your iptables ruleset.
++
+ config NETFILTER_XT_MATCH_IPRANGE
+ 	tristate '"iprange" address range match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -133,6 +133,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) +=
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_ID) += xt_id.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o
+--- /dev/null
++++ b/net/netfilter/xt_id.c
+@@ -0,0 +1,45 @@
++/*
++ * Implements a dummy match to allow attaching IDs to rules
++ *
++ * 2014-08-01 Jo-Philipp Wich <jow@openwrt.org>
++ */
++
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_id.h>
++
++MODULE_AUTHOR("Jo-Philipp Wich <jow@openwrt.org>");
++MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_id");
++MODULE_ALIAS("ip6t_id");
++
++static bool
++id_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++	/* We always match */
++	return true;
++}
++
++static struct xt_match id_mt_reg __read_mostly = {
++	.name      = "id",
++	.revision  = 0,
++	.family    = NFPROTO_UNSPEC,
++	.match     = id_mt,
++	.matchsize = sizeof(struct xt_id_info),
++	.me        = THIS_MODULE,
++};
++
++static int __init id_mt_init(void)
++{
++	return xt_register_match(&id_mt_reg);
++}
++
++static void __exit id_mt_exit(void)
++{
++	xt_unregister_match(&id_mt_reg);
++}
++
++module_init(id_mt_init);
++module_exit(id_mt_exit);
diff --git a/trunk/target/linux/generic/patches-3.13/620-sched_esfq.patch b/trunk/target/linux/generic/patches-3.13/620-sched_esfq.patch
new file mode 100644
index 00000000..d6bdbe29
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/620-sched_esfq.patch
@@ -0,0 +1,791 @@
+--- a/include/uapi/linux/pkt_sched.h
++++ b/include/uapi/linux/pkt_sched.h
+@@ -224,6 +224,33 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++	TCA_SFQ_HASH_CLASSIC,
++	TCA_SFQ_HASH_DST,
++	TCA_SFQ_HASH_SRC,
++	TCA_SFQ_HASH_FWMARK,
++	/* conntrack */
++	TCA_SFQ_HASH_CTORIGDST,
++	TCA_SFQ_HASH_CTORIGSRC,
++	TCA_SFQ_HASH_CTREPLDST,
++	TCA_SFQ_HASH_CTREPLSRC,
++	TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++	unsigned	quantum;	/* Bytes per round allocated to flow */
++	int		perturb_period;	/* Period of hash perturbation */
++	__u32		limit;		/* Maximal packets in queue */
++	unsigned	divisor;	/* Hash divisor  */
++	unsigned	flows;		/* Maximal number of flows  */
++	unsigned	hash_kind;	/* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -148,6 +148,37 @@ config NET_SCH_SFQ
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called sch_sfq.
+ 
++config NET_SCH_ESFQ
++	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
++	---help---
++	  Say Y here if you want to use the Enhanced Stochastic Fairness
++	  Queueing (ESFQ) packet scheduling algorithm for some of your network
++	  devices or as a leaf discipline for a classful qdisc such as HTB or
++	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
++	  references to the SFQ algorithm).
++
++	  This is an enchanced SFQ version which allows you to control some
++	  hardcoded values in the SFQ scheduler.
++
++	  ESFQ also adds control of the hash function used to identify packet
++	  flows. The original SFQ discipline hashes by connection; ESFQ add
++	  several other hashing methods, such as by src IP or by dst IP, which
++	  can be more fair to users in some networking situations.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called sch_esfq.
++
++config NET_SCH_ESFQ_NFCT
++	bool "Connection Tracking Hash Types"
++	depends on NET_SCH_ESFQ && NF_CONNTRACK
++	---help---
++	  Say Y here to enable support for hashing based on netfilter connection
++	  tracking information. This is useful for a router that is also using
++	  NAT to connect privately-addressed hosts to the Internet. If you want
++	  to provide fair distribution of upstream bandwidth, ESFQ must use
++	  connection tracking information, since all outgoing packets will share
++	  the same source address.
++
+ config NET_SCH_TEQL
+ 	tristate "True Link Equalizer (TEQL)"
+ 	---help---
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ing
+ obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
+ obj-$(CONFIG_NET_SCH_SFB)	+= sch_sfb.o
+ obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
++obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
+ obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
+ obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
+ obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
+--- /dev/null
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,702 @@
++/*
++ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:	Alexander Atanasov, <alex@ssi.bg>
++ *		Added dynamic depth,limit,divisor,hash_kind options.
++ *		Added dst and src hashes.
++ *
++ * 		Alexander Clouter, <alex@digriz.org.uk>
++ *		Ported ESFQ to Linux 2.6.
++ *
++ * 		Corey Hickey, <bugfood-c@fatooh.org>
++ *		Maintenance of the Linux 2.6 port.
++ *		Added fwmark hash (thanks to Robert Kurjata).
++ *		Added usage of jhash.
++ *		Added conntrack support.
++ *		Added ctnatchg hash (thanks to Ben Pfountz).
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <linux/bitops.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/socket.h>
++#include <linux/sockios.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/if_ether.h>
++#include <linux/inet.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/notifier.h>
++#include <linux/init.h>
++#include <net/ip.h>
++#include <net/netlink.h>
++#include <linux/ipv6.h>
++#include <net/route.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/pkt_sched.h>
++#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++#include <net/netfilter/nf_conntrack.h>
++#endif
++
++/*	Stochastic Fairness Queuing algorithm.
++	For more comments look at sch_sfq.c.
++	The difference is that you can change limit, depth,
++	hash table size and choose alternate hash types.
++
++	classic:	same as in sch_sfq.c
++	dst:		destination IP address
++	src:		source IP address
++	fwmark:		netfilter mark value
++	ctorigdst:	original destination IP address
++	ctorigsrc:	original source IP address
++	ctrepldst:	reply destination IP address
++	ctreplsrc:	reply source IP
++
++*/
++
++#define ESFQ_HEAD 0
++#define ESFQ_TAIL 1
++
++/* This type should contain at least SFQ_DEPTH*2 values */
++typedef unsigned int esfq_index;
++
++struct esfq_head
++{
++	esfq_index	next;
++	esfq_index	prev;
++};
++
++struct esfq_sched_data
++{
++/* Parameters */
++	int		perturb_period;
++	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
++	int		limit;
++	unsigned	depth;
++	unsigned	hash_divisor;
++	unsigned	hash_kind;
++/* Variables */
++	struct timer_list perturb_timer;
++	int		perturbation;
++	esfq_index	tail;		/* Index of current slot in round */
++	esfq_index	max_depth;	/* Maximal depth */
++
++	esfq_index	*ht;			/* Hash table */
++	esfq_index	*next;			/* Active slots link */
++	short		*allot;			/* Current allotment per slot */
++	unsigned short	*hash;			/* Hash value indexed by slots */
++	struct sk_buff_head	*qs;		/* Slot queue */
++	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
++};
++
++/* This contains the info we will hash. */
++struct esfq_packet_info
++{
++	u32	proto;		/* protocol or port */
++	u32	src;		/* source from packet header */
++	u32	dst;		/* destination from packet header */
++	u32	ctorigsrc;	/* original source from conntrack */
++	u32	ctorigdst;	/* original destination from conntrack */
++	u32	ctreplsrc;	/* reply source from conntrack */
++	u32	ctrepldst;	/* reply destination from conntrack */
++	u32	mark;		/* netfilter mark (fwmark) */
++};
++
++static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
++{
++	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
++{
++	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
++{
++	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
++}
++
++static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
++{
++	struct esfq_packet_info info;
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	enum ip_conntrack_info ctinfo;
++	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
++#endif
++
++	switch (skb->protocol) {
++	case __constant_htons(ETH_P_IP):
++	{
++		struct iphdr *iph = ip_hdr(skb);
++		info.dst = iph->daddr;
++		info.src = iph->saddr;
++		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
++		    (iph->protocol == IPPROTO_TCP ||
++		     iph->protocol == IPPROTO_UDP ||
++		     iph->protocol == IPPROTO_SCTP ||
++		     iph->protocol == IPPROTO_DCCP ||
++		     iph->protocol == IPPROTO_ESP))
++			info.proto = *(((u32*)iph) + iph->ihl);
++		else
++			info.proto = iph->protocol;
++		break;
++	}
++	case __constant_htons(ETH_P_IPV6):
++	{
++		struct ipv6hdr *iph = ipv6_hdr(skb);
++		/* Hash ipv6 addresses into a u32. This isn't ideal,
++		 * but the code is simple. */
++		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
++		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
++		if (iph->nexthdr == IPPROTO_TCP ||
++		    iph->nexthdr == IPPROTO_UDP ||
++		    iph->nexthdr == IPPROTO_SCTP ||
++		    iph->nexthdr == IPPROTO_DCCP ||
++		    iph->nexthdr == IPPROTO_ESP)
++			info.proto = *(u32*)&iph[1];
++		else
++			info.proto = iph->nexthdr;
++		break;
++	}
++	default:
++		info.dst   = (u32)(unsigned long)skb_dst(skb);
++		info.src   = (u32)(unsigned long)skb->sk;
++		info.proto = skb->protocol;
++	}
++
++	info.mark = skb->mark;
++
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	/* defaults if there is no conntrack info */
++	info.ctorigsrc = info.src;
++	info.ctorigdst = info.dst;
++	info.ctreplsrc = info.dst;
++	info.ctrepldst = info.src;
++	/* collect conntrack info */
++	if (ct && ct != &nf_conntrack_untracked) {
++		if (skb->protocol == __constant_htons(ETH_P_IP)) {
++			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
++			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
++			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++		}
++		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
++			/* Again, hash ipv6 addresses into a single u32. */
++			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
++			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
++		}
++
++	}
++#endif
++
++	switch(q->hash_kind) {
++	case TCA_SFQ_HASH_CLASSIC:
++		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++	case TCA_SFQ_HASH_DST:
++		return esfq_jhash_1word(q, info.dst);
++	case TCA_SFQ_HASH_SRC:
++		return esfq_jhash_1word(q, info.src);
++	case TCA_SFQ_HASH_FWMARK:
++		return esfq_jhash_1word(q, info.mark);
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	case TCA_SFQ_HASH_CTORIGDST:
++		return esfq_jhash_1word(q, info.ctorigdst);
++	case TCA_SFQ_HASH_CTORIGSRC:
++		return esfq_jhash_1word(q, info.ctorigsrc);
++	case TCA_SFQ_HASH_CTREPLDST:
++		return esfq_jhash_1word(q, info.ctrepldst);
++	case TCA_SFQ_HASH_CTREPLSRC:
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	case TCA_SFQ_HASH_CTNATCHG:
++	{
++		if (info.ctorigdst == info.ctreplsrc)
++			return esfq_jhash_1word(q, info.ctorigsrc);
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	}
++#endif
++	default:
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
++	}
++	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++}
++
++static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d = q->qs[x].qlen + q->depth;
++
++	p = d;
++	n = q->dep[d].next;
++	q->dep[x].next = n;
++	q->dep[x].prev = p;
++	q->dep[p].next = q->dep[n].prev = x;
++}
++
++static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++
++	if (n == p && q->max_depth == q->qs[x].qlen + 1)
++		q->max_depth--;
++
++	esfq_link(q, x);
++}
++
++static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++	d = q->qs[x].qlen;
++	if (q->max_depth < d)
++		q->max_depth = d;
++
++	esfq_link(q, x);
++}
++
++static unsigned int esfq_drop(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index d = q->max_depth;
++	struct sk_buff *skb;
++	unsigned int len;
++
++	/* Queue is full! Find the longest slot and
++	   drop a packet from it */
++
++	if (d > 1) {
++		esfq_index x = q->dep[d+q->depth].next;
++		skb = q->qs[x].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[x]);
++		kfree_skb(skb);
++		esfq_dec(q, x);
++		sch->q.qlen--;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	if (d == 1) {
++		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
++		d = q->next[q->tail];
++		q->next[q->tail] = q->next[d];
++		q->allot[q->next[d]] += q->quantum;
++		skb = q->qs[d].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[d]);
++		kfree_skb(skb);
++		esfq_dec(q, d);
++		sch->q.qlen--;
++		q->ht[q->hash[d]] = q->depth;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	return 0;
++}
++
++static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
++{
++	unsigned hash = esfq_hash(q, skb);
++	unsigned depth = q->depth;
++	esfq_index x;
++
++	x = q->ht[hash];
++	if (x == depth) {
++		q->ht[hash] = x = q->dep[depth].next;
++		q->hash[x] = hash;
++	}
++
++	if (end == ESFQ_TAIL)
++		__skb_queue_tail(&q->qs[x], skb);
++	else
++		__skb_queue_head(&q->qs[x], skb);
++
++	esfq_inc(q, x);
++	if (q->qs[x].qlen == 1) {		/* The flow is new */
++		if (q->tail == depth) {	/* It is the first flow */
++			q->tail = x;
++			q->next[x] = x;
++			q->allot[x] = q->quantum;
++		} else {
++			q->next[x] = q->next[q->tail];
++			q->next[q->tail] = x;
++			q->tail = x;
++		}
++	}
++}
++
++static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_enqueue(skb, q, ESFQ_TAIL);
++	sch->qstats.backlog += skb->len;
++	if (++sch->q.qlen < q->limit-1) {
++		sch->bstats.bytes += skb->len;
++		sch->bstats.packets++;
++		return 0;
++	}
++
++	sch->qstats.drops++;
++	esfq_drop(sch);
++	return NET_XMIT_CN;
++}
++
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index a;
++
++	/* No active slots */
++	if (q->tail == q->depth)
++		return NULL;
++
++	a = q->next[q->tail];
++	return skb_peek(&q->qs[a]);
++}
++
++static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
++{
++	struct sk_buff *skb;
++	unsigned depth = q->depth;
++	esfq_index a, old_a;
++
++	/* No active slots */
++	if (q->tail == depth)
++		return NULL;
++
++	a = old_a = q->next[q->tail];
++
++	/* Grab packet */
++	skb = __skb_dequeue(&q->qs[a]);
++	esfq_dec(q, a);
++
++	/* Is the slot empty? */
++	if (q->qs[a].qlen == 0) {
++		q->ht[q->hash[a]] = depth;
++		a = q->next[a];
++		if (a == old_a) {
++			q->tail = depth;
++			return skb;
++		}
++		q->next[q->tail] = a;
++		q->allot[a] += q->quantum;
++	} else if ((q->allot[a] -= skb->len) <= 0) {
++		q->tail = a;
++		a = q->next[a];
++		q->allot[a] += q->quantum;
++	}
++
++	return skb;
++}
++
++static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++
++	skb = esfq_q_dequeue(q);
++	if (skb == NULL)
++		return NULL;
++	sch->q.qlen--;
++	sch->qstats.backlog -= skb->len;
++	return skb;
++}
++
++static void esfq_q_destroy(struct esfq_sched_data *q)
++{
++	del_timer(&q->perturb_timer);
++	if(q->ht)
++		kfree(q->ht);
++	if(q->dep)
++		kfree(q->dep);
++	if(q->next)
++		kfree(q->next);
++	if(q->allot)
++		kfree(q->allot);
++	if(q->hash)
++		kfree(q->hash);
++	if(q->qs)
++		kfree(q->qs);
++}
++
++static void esfq_destroy(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_destroy(q);
++}
++
++
++static void esfq_reset(struct Qdisc* sch)
++{
++	struct sk_buff *skb;
++
++	while ((skb = esfq_dequeue(sch)) != NULL)
++		kfree_skb(skb);
++}
++
++static void esfq_perturbation(unsigned long arg)
++{
++	struct Qdisc *sch = (struct Qdisc*)arg;
++	struct esfq_sched_data *q = qdisc_priv(sch);
++
++	q->perturbation = net_random()&0x1F;
++
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++}
++
++static unsigned int esfq_check_hash(unsigned int kind)
++{
++	switch (kind) {
++	case TCA_SFQ_HASH_CTORIGDST:
++	case TCA_SFQ_HASH_CTORIGSRC:
++	case TCA_SFQ_HASH_CTREPLDST:
++	case TCA_SFQ_HASH_CTREPLSRC:
++	case TCA_SFQ_HASH_CTNATCHG:
++#ifndef CONFIG_NET_SCH_ESFQ_NFCT
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++#endif
++	case TCA_SFQ_HASH_CLASSIC:
++	case TCA_SFQ_HASH_DST:
++	case TCA_SFQ_HASH_SRC:
++	case TCA_SFQ_HASH_FWMARK:
++		return kind;
++	default:
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++	}
++}
++
++static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
++{
++	struct tc_esfq_qopt *ctl = nla_data(opt);
++	esfq_index p = ~0U/2;
++	int i;
++
++	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
++		return -EINVAL;
++
++	q->perturbation = 0;
++	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
++	q->max_depth = 0;
++	if (opt == NULL) {
++		q->perturb_period = 0;
++		q->hash_divisor = 1024;
++		q->tail = q->limit = q->depth = 128;
++
++	} else {
++		struct tc_esfq_qopt *ctl = nla_data(opt);
++		if (ctl->quantum)
++			q->quantum = ctl->quantum;
++		q->perturb_period = ctl->perturb_period*HZ;
++		q->hash_divisor = ctl->divisor ? : 1024;
++		q->tail = q->limit = q->depth = ctl->flows ? : 128;
++
++		if ( q->depth > p - 1 )
++			return -EINVAL;
++
++		if (ctl->limit)
++			q->limit = min_t(u32, ctl->limit, q->depth);
++
++		if (ctl->hash_kind) {
++			q->hash_kind = esfq_check_hash(ctl->hash_kind);
++		}
++	}
++
++	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->ht)
++		goto err_case;
++	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
++	if (!q->dep)
++		goto err_case;
++	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->next)
++		goto err_case;
++	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
++	if (!q->allot)
++		goto err_case;
++	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
++	if (!q->hash)
++		goto err_case;
++	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
++	if (!q->qs)
++		goto err_case;
++
++	for (i=0; i< q->hash_divisor; i++)
++		q->ht[i] = q->depth;
++	for (i=0; i<q->depth; i++) {
++		skb_queue_head_init(&q->qs[i]);
++		q->dep[i+q->depth].next = i+q->depth;
++		q->dep[i+q->depth].prev = i+q->depth;
++	}
++
++	for (i=0; i<q->depth; i++)
++		esfq_link(q, i);
++	return 0;
++err_case:
++	esfq_q_destroy(q);
++	return -ENOBUFS;
++}
++
++static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	int err;
++
++	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(q, opt)))
++		return err;
++
++	init_timer(&q->perturb_timer);
++	q->perturb_timer.data = (unsigned long)sch;
++	q->perturb_timer.function = esfq_perturbation;
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++
++	return 0;
++}
++
++static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct esfq_sched_data new;
++	struct sk_buff *skb;
++	int err;
++
++	/* set up new queue */
++	memset(&new, 0, sizeof(struct esfq_sched_data));
++	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(&new, opt)))
++		return err;
++
++	/* copy all packets from the old queue to the new queue */
++	sch_tree_lock(sch);
++	while ((skb = esfq_q_dequeue(q)) != NULL)
++		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
++
++	/* clean up the old queue */
++	esfq_q_destroy(q);
++
++	/* copy elements of the new queue into the old queue */
++	q->perturb_period = new.perturb_period;
++	q->quantum        = new.quantum;
++	q->limit          = new.limit;
++	q->depth          = new.depth;
++	q->hash_divisor   = new.hash_divisor;
++	q->hash_kind      = new.hash_kind;
++	q->tail           = new.tail;
++	q->max_depth      = new.max_depth;
++	q->ht    = new.ht;
++	q->dep   = new.dep;
++	q->next  = new.next;
++	q->allot = new.allot;
++	q->hash  = new.hash;
++	q->qs    = new.qs;
++
++	/* finish up */
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	} else {
++		q->perturbation = 0;
++	}
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	unsigned char *b = skb_tail_pointer(skb);
++	struct tc_esfq_qopt opt;
++
++	opt.quantum = q->quantum;
++	opt.perturb_period = q->perturb_period/HZ;
++
++	opt.limit = q->limit;
++	opt.divisor = q->hash_divisor;
++	opt.flows = q->depth;
++	opt.hash_kind = q->hash_kind;
++
++	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
++		goto nla_put_failure;
++
++	return skb->len;
++
++nla_put_failure:
++	nlmsg_trim(skb, b);
++	return -1;
++}
++
++static struct Qdisc_ops esfq_qdisc_ops =
++{
++	.next		=	NULL,
++	.cl_ops		=	NULL,
++	.id		=	"esfq",
++	.priv_size	=	sizeof(struct esfq_sched_data),
++	.enqueue	=	esfq_enqueue,
++	.dequeue	=	esfq_dequeue,
++	.peek		=	esfq_peek,
++	.drop		=	esfq_drop,
++	.init		=	esfq_init,
++	.reset		=	esfq_reset,
++	.destroy	=	esfq_destroy,
++	.change		=	esfq_change,
++	.dump		=	esfq_dump,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init esfq_module_init(void)
++{
++	return register_qdisc(&esfq_qdisc_ops);
++}
++static void __exit esfq_module_exit(void)
++{
++	unregister_qdisc(&esfq_qdisc_ops);
++}
++module_init(esfq_module_init)
++module_exit(esfq_module_exit)
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.13/621-sched_act_connmark.patch b/trunk/target/linux/generic/patches-3.13/621-sched_act_connmark.patch
new file mode 100644
index 00000000..8185098d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/621-sched_act_connmark.patch
@@ -0,0 +1,183 @@
+--- /dev/null
++++ b/net/sched/act_connmark.c
+@@ -0,0 +1,148 @@
++/*
++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/skbuff.h>
++#include <linux/rtnetlink.h>
++#include <linux/pkt_cls.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <net/netlink.h>
++#include <net/pkt_sched.h>
++#include <net/act_api.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++
++#define TCA_ACT_CONNMARK	20
++
++#define CONNMARK_TAB_MASK     3
++static struct tcf_common *tcf_connmark_ht[CONNMARK_TAB_MASK + 1];
++static u32 connmark_idx_gen;
++static DEFINE_RWLOCK(connmark_lock);
++
++static struct tcf_hashinfo connmark_hash_info = {
++	.htab	=	tcf_connmark_ht,
++	.hmask	=	CONNMARK_TAB_MASK,
++	.lock	=	&connmark_lock,
++};
++
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
++		       struct tcf_result *res)
++{
++	struct nf_conn *c;
++	enum ip_conntrack_info ctinfo;
++	int proto;
++	int r;
++
++	if (skb->protocol == htons(ETH_P_IP)) {
++		if (skb->len < sizeof(struct iphdr))
++			goto out;
++		proto = PF_INET;
++	} else if (skb->protocol == htons(ETH_P_IPV6)) {
++		if (skb->len < sizeof(struct ipv6hdr))
++			goto out;
++		proto = PF_INET6;
++	} else
++		goto out;
++
++	r = nf_conntrack_in(dev_net(skb->dev), proto, NF_INET_PRE_ROUTING, skb);
++	if (r != NF_ACCEPT)
++		goto out;
++
++	c = nf_ct_get(skb, &ctinfo);
++	if (!c)
++		goto out;
++
++	skb->mark = c->mark;
++	nf_conntrack_put(skb->nfct);
++	skb->nfct = NULL;
++
++out:
++	return TC_ACT_PIPE;
++}
++
++static int tcf_connmark_init(struct net *net, struct nlattr *nla,
++			     struct nlattr *est, struct tc_action *a,
++			     int ovr, int bind)
++{
++	struct tcf_common *pc;
++	int ret = 0;
++
++	pc = tcf_hash_check(0, a, bind, &connmark_hash_info);
++	if (!pc) {
++		pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
++				     &connmark_idx_gen, &connmark_hash_info);
++		if (IS_ERR(pc))
++		    return PTR_ERR(pc);
++
++		tcf_hash_insert(pc, &connmark_hash_info);
++		ret = ACT_P_CREATED;
++	} else {
++		if (!ovr) {
++			tcf_hash_release(pc, bind, &connmark_hash_info);
++			return -EEXIST;
++		}
++	}
++
++	return ret;
++}
++
++static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)
++{
++	if (a->priv)
++		return tcf_hash_release(a->priv, bind, &connmark_hash_info);
++	return 0;
++}
++
++static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
++				int bind, int ref)
++{
++	return skb->len;
++}
++
++static struct tc_action_ops act_connmark_ops = {
++	.kind		=	"connmark",
++	.hinfo		=	&connmark_hash_info,
++	.type		=	TCA_ACT_CONNMARK,
++	.capab		=	TCA_CAP_NONE,
++	.owner		=	THIS_MODULE,
++	.act		=	tcf_connmark,
++	.dump		=	tcf_connmark_dump,
++	.cleanup	=	tcf_connmark_cleanup,
++	.init		=	tcf_connmark_init,
++	.walk		=	tcf_generic_walker,
++};
++
++MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_DESCRIPTION("Connection tracking mark restoring");
++MODULE_LICENSE("GPL");
++
++static int __init connmark_init_module(void)
++{
++	return tcf_register_action(&act_connmark_ops);
++}
++
++static void __exit connmark_cleanup_module(void)
++{
++	tcf_unregister_action(&act_connmark_ops);
++}
++
++module_init(connmark_init_module);
++module_exit(connmark_cleanup_module);
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -694,6 +694,19 @@ config NET_ACT_CSUM
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called act_csum.
+ 
++config NET_ACT_CONNMARK
++        tristate "Connection Tracking Marking"
++        depends on NET_CLS_ACT
++        depends on NF_CONNTRACK
++	 depends on NF_CONNTRACK_MARK
++        ---help---
++	  Say Y here to restore the connmark from a scheduler action
++
++	  If unsure, say N.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called act_connmark.
++
+ config NET_CLS_IND
+ 	bool "Incoming device classification"
+ 	depends on NET_CLS_U32 || NET_CLS_FW
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit
+ obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+ obj-$(CONFIG_NET_ACT_SKBEDIT)	+= act_skbedit.o
+ obj-$(CONFIG_NET_ACT_CSUM)	+= act_csum.o
++obj-$(CONFIG_NET_ACT_CONNMARK)	+= act_connmark.o
+ obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
+ obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
+ obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
diff --git a/trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch b/trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch
new file mode 100644
index 00000000..60e84015
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/630-packet_socket_type.patch
@@ -0,0 +1,134 @@
+This patch allows the user to specify desired packet types (outgoing,
+broadcast, unicast, etc.) on packet sockets via setsockopt.
+This can reduce the load in situations where only a limited number
+of packet types are necessary
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/include/uapi/linux/if_packet.h
++++ b/include/uapi/linux/if_packet.h
+@@ -29,6 +29,8 @@ struct sockaddr_ll {
+ /* These ones are invisible by user level */
+ #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
+ #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
++#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
++
+ 
+ /* Packet socket options */
+ 
+@@ -51,6 +53,7 @@ struct sockaddr_ll {
+ #define PACKET_TIMESTAMP		17
+ #define PACKET_FANOUT			18
+ #define PACKET_TX_HAS_OFF		19
++#define PACKET_RECV_TYPE		20
+ 
+ #define PACKET_FANOUT_HASH		0
+ #define PACKET_FANOUT_LB		1
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -1414,6 +1414,7 @@ static int packet_rcv_spkt(struct sk_buf
+ {
+ 	struct sock *sk;
+ 	struct sockaddr_pkt *spkt;
++	struct packet_sock *po;
+ 
+ 	/*
+ 	 *	When we registered the protocol we saved the socket in the data
+@@ -1421,6 +1422,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 */
+ 
+ 	sk = pt->af_packet_priv;
++	po = pkt_sk(sk);
+ 
+ 	/*
+ 	 *	Yank back the headers [hope the device set this
+@@ -1433,7 +1435,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 *	so that this procedure is noop.
+ 	 */
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
+ 		goto out;
+ 
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+@@ -1640,12 +1642,12 @@ static int packet_rcv(struct sk_buff *sk
+ 	int skb_len = skb->len;
+ 	unsigned int snaplen, res;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -1758,12 +1760,12 @@ static int tpacket_rcv(struct sk_buff *s
+ 	struct timespec ts;
+ 	__u32 ts_status;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -2652,6 +2654,7 @@ static int packet_create(struct net *net
+ 	spin_lock_init(&po->bind_lock);
+ 	mutex_init(&po->pg_vec_lock);
+ 	po->prot_hook.func = packet_rcv;
++	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
+ 
+ 	if (sock->type == SOCK_PACKET)
+ 		po->prot_hook.func = packet_rcv_spkt;
+@@ -3218,6 +3221,16 @@ packet_setsockopt(struct socket *sock, i
+ 		po->tp_tx_has_off = !!val;
+ 		return 0;
+ 	}
++        case PACKET_RECV_TYPE:
++        {
++                unsigned int val;
++                if (optlen != sizeof(val))
++                        return -EINVAL;
++                if (copy_from_user(&val, optval, sizeof(val)))
++                        return -EFAULT;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
++                return 0;
++        }
+ 	default:
+ 		return -ENOPROTOOPT;
+ 	}
+@@ -3269,6 +3282,13 @@ static int packet_getsockopt(struct sock
+ 	case PACKET_VNET_HDR:
+ 		val = po->has_vnet_hdr;
+ 		break;
++	case PACKET_RECV_TYPE:
++		if (len > sizeof(unsigned int))
++			len = sizeof(unsigned int);
++		val = po->pkt_type;
++
++		data = &val;
++		break;
+ 	case PACKET_VERSION:
+ 		val = po->tp_version;
+ 		break;
+--- a/net/packet/internal.h
++++ b/net/packet/internal.h
+@@ -115,6 +115,7 @@ struct packet_sock {
+ 	unsigned int		tp_tstamp;
+ 	struct net_device __rcu	*cached_dev;
+ 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
++	unsigned int		pkt_type;
+ };
+ 
+ static struct packet_sock *pkt_sk(struct sock *sk)
diff --git a/trunk/target/linux/generic/patches-3.13/640-bridge_no_eap_forward.patch b/trunk/target/linux/generic/patches-3.13/640-bridge_no_eap_forward.patch
new file mode 100644
index 00000000..9e1a81d0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/640-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -96,7 +96,11 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 	dst = NULL;
+ 
+-	if (is_broadcast_ether_addr(dest)) {
++	if (skb->protocol == htons(ETH_P_PAE)) {
++		skb2 = skb;
++		/* Do not forward 802.1x/EAP frames */
++
++	} else if (is_broadcast_ether_addr(dest)) {
+ 		skb2 = skb;
+ 		unicast = false;
+ 	} else if (is_multicast_ether_addr(dest)) {
diff --git a/trunk/target/linux/generic/patches-3.13/641-bridge_always_accept_eap.patch b/trunk/target/linux/generic/patches-3.13/641-bridge_always_accept_eap.patch
new file mode 100644
index 00000000..f612c4b9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/641-bridge_always_accept_eap.patch
@@ -0,0 +1,11 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -83,7 +83,7 @@ int br_handle_frame_finish(struct sk_buf
+ 	    br_multicast_rcv(br, p, skb, vid))
+ 		goto drop;
+ 
+-	if (p->state == BR_STATE_LEARNING)
++	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
+ 		goto drop;
+ 
+ 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
diff --git a/trunk/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch b/trunk/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch
new file mode 100644
index 00000000..dd330b29
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/642-bridge_port_isolate.patch
@@ -0,0 +1,102 @@
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -173,6 +173,7 @@ struct net_bridge_port
+ #define BR_ADMIN_COST		0x00000010
+ #define BR_LEARNING		0x00000020
+ #define BR_FLOOD		0x00000040
++#define BR_ISOLATE_MODE	0x00000080
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	struct bridge_mcast_query	ip4_query;
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -161,6 +161,22 @@ BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLO
+ BRPORT_ATTR_FLAG(learning, BR_LEARNING);
+ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD);
+ 
++static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
++{
++	int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
++	return sprintf(buf, "%d\n", isolate_mode);
++}
++static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
++{
++	if (v)
++		p->flags |= BR_ISOLATE_MODE;
++	else
++		p->flags &= ~BR_ISOLATE_MODE;
++	return 0;
++}
++static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
++		   show_isolate_mode, store_isolate_mode);
++
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+ {
+@@ -203,6 +219,7 @@ static const struct brport_attribute *br
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
+ #endif
++	&brport_attr_isolate_mode,
+ 	NULL
+ };
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -119,8 +119,8 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 		unicast = false;
+ 		br->dev->stats.multicast++;
+-	} else if ((dst = __br_fdb_get(br, dest, vid)) &&
+-			dst->is_local) {
++	} else if ((p->flags & BR_ISOLATE_MODE) ||
++		   ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local)) {
+ 		skb2 = skb;
+ 		/* Do not forward the packet since it's local. */
+ 		skb = NULL;
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -119,7 +119,7 @@ void br_deliver(const struct net_bridge_
+ /* called with rcu_read_lock */
+ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
+ {
+-	if (should_deliver(to, skb)) {
++	if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
+ 		if (skb0)
+ 			deliver_clone(to, skb, __br_forward);
+ 		else
+@@ -175,7 +175,7 @@ static void br_flood(struct net_bridge *
+ 		     struct sk_buff *skb0,
+ 		     void (*__packet_hook)(const struct net_bridge_port *p,
+ 					   struct sk_buff *skb),
+-		     bool unicast)
++		     				bool unicast, bool forward)
+ {
+ 	struct net_bridge_port *p;
+ 	struct net_bridge_port *prev;
+@@ -183,6 +183,8 @@ static void br_flood(struct net_bridge *
+ 	prev = NULL;
+ 
+ 	list_for_each_entry_rcu(p, &br->port_list, list) {
++		if (forward && (p->flags & BR_ISOLATE_MODE))
++			continue;
+ 		/* Do not flood unicast traffic to ports that turn it off */
+ 		if (unicast && !(p->flags & BR_FLOOD))
+ 			continue;
+@@ -209,14 +211,14 @@ out:
+ /* called with rcu_read_lock */
+ void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast)
+ {
+-	br_flood(br, skb, NULL, __br_deliver, unicast);
++	br_flood(br, skb, NULL, __br_deliver, unicast, false);
+ }
+ 
+ /* called under bridge lock */
+ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
+ 		      struct sk_buff *skb2, bool unicast)
+ {
+-	br_flood(br, skb, skb2, __br_forward, unicast);
++	br_flood(br, skb, skb2, __br_forward, unicast, true);
+ }
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
diff --git a/trunk/target/linux/generic/patches-3.13/643-bridge_remove_ipv6_dependency.patch b/trunk/target/linux/generic/patches-3.13/643-bridge_remove_ipv6_dependency.patch
new file mode 100644
index 00000000..bf1a044e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/643-bridge_remove_ipv6_dependency.patch
@@ -0,0 +1,107 @@
+--- a/include/net/addrconf.h
++++ b/include/net/addrconf.h
+@@ -88,6 +88,12 @@ int ipv6_rcv_saddr_equal(const struct so
+ void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr);
+ void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr);
+ 
++extern int			(*ipv6_dev_get_saddr_hook)(struct net *net,
++						const struct net_device *dev,
++						const struct in6_addr *daddr,
++						unsigned int prefs,
++						struct in6_addr *saddr);
++
+ static inline unsigned long addrconf_timeout_fixup(u32 timeout,
+ 						   unsigned int unit)
+ {
+--- a/net/bridge/Kconfig
++++ b/net/bridge/Kconfig
+@@ -6,7 +6,6 @@ config BRIDGE
+ 	tristate "802.1d Ethernet Bridging"
+ 	select LLC
+ 	select STP
+-	depends on IPV6 || IPV6=n
+ 	---help---
+ 	  If you say Y here, then your Linux box will be able to act as an
+ 	  Ethernet bridge, which means that the different Ethernet segments it
+--- a/net/ipv6/Makefile
++++ b/net/ipv6/Makefile
+@@ -45,3 +45,4 @@ obj-y += addrconf_core.o exthdrs_core.o
+ obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
+ 
+ obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
++obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1279,7 +1279,7 @@ out:
+ 	return ret;
+ }
+ 
+-int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++static int __ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+ 		       struct in6_addr *saddr)
+ {
+@@ -1404,7 +1404,6 @@ try_nextdev:
+ 	in6_ifa_put(hiscore->ifa);
+ 	return 0;
+ }
+-EXPORT_SYMBOL(ipv6_dev_get_saddr);
+ 
+ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
+ 		      unsigned char banned_flags)
+@@ -5154,6 +5153,9 @@ int __init addrconf_init(void)
+ 
+ 	ipv6_addr_label_rtnl_register();
+ 
++	BUG_ON(ipv6_dev_get_saddr_hook != NULL);
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, __ipv6_dev_get_saddr);
++
+ 	return 0;
+ errout:
+ 	rtnl_af_unregister(&inet6_ops);
+@@ -5172,6 +5174,9 @@ void addrconf_cleanup(void)
+ 	struct net_device *dev;
+ 	int i;
+ 
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, NULL);
++	synchronize_rcu();
++
+ 	unregister_netdevice_notifier(&ipv6_dev_notf);
+ 	unregister_pernet_subsys(&addrconf_ops);
+ 	ipv6_addr_label_cleanup();
+--- /dev/null
++++ b/net/ipv6/inet6_stubs.c
+@@ -0,0 +1,33 @@
++/*
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ */
++#include <linux/export.h>
++#include <net/ipv6.h>
++
++int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr);
++
++EXPORT_SYMBOL(ipv6_dev_get_saddr_hook);
++
++int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr)
++{
++	int ret = -EADDRNOTAVAIL;
++	typeof(ipv6_dev_get_saddr_hook) dev_get_saddr;
++
++	rcu_read_lock();
++	dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook);
++
++	if (dev_get_saddr)
++		ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr);
++
++	rcu_read_unlock();
++	return ret;
++}
++EXPORT_SYMBOL(ipv6_dev_get_saddr);
++
diff --git a/trunk/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch b/trunk/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch
new file mode 100644
index 00000000..3d5ea84a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/644-bridge_optimize_netfilter_hooks.patch
@@ -0,0 +1,155 @@
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -57,7 +57,7 @@ int br_dev_queue_push_xmit(struct sk_buf
+ 
+ int br_forward_finish(struct sk_buff *skb)
+ {
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ 		       br_dev_queue_push_xmit);
+ 
+ }
+@@ -80,7 +80,7 @@ static void __br_deliver(const struct ne
+ 		return;
+ 	}
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+@@ -101,7 +101,7 @@ static void __br_forward(const struct ne
+ 	skb->dev = to->dev;
+ 	skb_forward_csum(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -52,7 +52,7 @@ static int br_pass_frame_up(struct sk_bu
+ 	indev = skb->dev;
+ 	skb->dev = brdev;
+ 
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+ 		       netif_receive_skb);
+ }
+ 
+@@ -213,7 +213,7 @@ rx_handler_result_t br_handle_frame(stru
+ 		}
+ 
+ 		/* Deliver packet to local host only */
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+ 			    NULL, br_handle_local_finish)) {
+ 			return RX_HANDLER_CONSUMED; /* consumed by filter */
+ 		} else {
+@@ -228,7 +228,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_local_finish))
+ 			break;
+ 
+@@ -250,7 +250,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_frame_finish);
+ 		break;
+ 	default:
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -802,7 +802,7 @@ static void __br_multicast_send_query(st
+ 	if (port) {
+ 		__skb_push(skb, sizeof(struct ethhdr));
+ 		skb->dev = port->dev;
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 			dev_queue_xmit);
+ 	} else
+ 		netif_rx(skb);
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -73,6 +73,15 @@ static int brnf_pass_vlan_indev __read_m
+ #define IS_ARP(skb) \
+ 	(!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
+ 
++int brnf_call_ebtables __read_mostly = 0;
++EXPORT_SYMBOL_GPL(brnf_call_ebtables);
++
++bool br_netfilter_run_hooks(void)
++{
++	return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables |
++	       brnf_call_ebtables;
++}
++
+ static inline __be16 vlan_proto(const struct sk_buff *skb)
+ {
+ 	if (vlan_tx_tag_present(skb))
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -717,15 +717,29 @@ static inline u16 br_get_pvid(const stru
+ 
+ /* br_netfilter.c */
+ #ifdef CONFIG_BRIDGE_NETFILTER
++extern int brnf_call_ebtables;
+ int br_netfilter_init(void);
+ void br_netfilter_fini(void);
+ void br_netfilter_rtable_init(struct net_bridge *);
++bool br_netfilter_run_hooks(void);
+ #else
+ #define br_netfilter_init()	(0)
+ #define br_netfilter_fini()	do { } while(0)
+ #define br_netfilter_rtable_init(x)
++#define br_netfilter_run_hooks()	false
+ #endif
+ 
++static inline int
++BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
++	struct net_device *in, struct net_device *out,
++	int (*okfn)(struct sk_buff *))
++{
++	if (!br_netfilter_run_hooks())
++		return okfn(skb);
++
++	return NF_HOOK(pf, hook, skb, in, out, okfn);
++}
++
+ /* br_stp.c */
+ void br_log_state(const struct net_bridge_port *p);
+ struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no);
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid
+ 
+ 	skb_reset_mac_header(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		dev_queue_xmit);
+ }
+ 
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -2407,11 +2407,13 @@ static int __init ebtables_init(void)
+ 	}
+ 
+ 	printk(KERN_INFO "Ebtables v2.0 registered\n");
++	brnf_call_ebtables = 1;
+ 	return 0;
+ }
+ 
+ static void __exit ebtables_fini(void)
+ {
++	brnf_call_ebtables = 0;
+ 	nf_unregister_sockopt(&ebt_sockopts);
+ 	xt_unregister_target(&ebt_standard_target);
+ 	printk(KERN_INFO "Ebtables v2.0 unregistered\n");
diff --git a/trunk/target/linux/generic/patches-3.13/650-pppoe_header_pad.patch b/trunk/target/linux/generic/patches-3.13/650-pppoe_header_pad.patch
new file mode 100644
index 00000000..a89a9f3b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/ppp/pppoe.c
++++ b/drivers/net/ppp/pppoe.c
+@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 		goto end;
+ 
+ 
+-	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
++	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
+ 			   0, GFP_KERNEL);
+ 	if (!skb) {
+ 		error = -ENOMEM;
+@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 	}
+ 
+ 	/* Reserve space for headers. */
+-	skb_reserve(skb, dev->hard_header_len);
++	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
+ 	skb_reset_network_header(skb);
+ 
+ 	skb->dev = dev;
diff --git a/trunk/target/linux/generic/patches-3.13/651-wireless_mesh_header.patch b/trunk/target/linux/generic/patches-3.13/651-wireless_mesh_header.patch
new file mode 100644
index 00000000..d2d40f53
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/651-wireless_mesh_header.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -139,7 +139,7 @@ static inline bool dev_xmit_complete(int
+  */
+ 
+ #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ #  define LL_MAX_HEADER 128
+ # else
+ #  define LL_MAX_HEADER 96
diff --git a/trunk/target/linux/generic/patches-3.13/652-atm_header_changes.patch b/trunk/target/linux/generic/patches-3.13/652-atm_header_changes.patch
new file mode 100644
index 00000000..7e568592
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/652-atm_header_changes.patch
@@ -0,0 +1,12 @@
+--- a/include/uapi/linux/atm.h
++++ b/include/uapi/linux/atm.h
+@@ -139,6 +139,9 @@ struct atm_trafprm {
+ 	int		min_pcr;	/* minimum PCR in cells per second */
+ 	int		max_cdv;	/* maximum CDV in microseconds */
+ 	int		max_sdu;	/* maximum SDU in bytes */
++	int		scr;		/* sustained rate in cells per second */
++	int		mbs;		/* maximum burst size (MBS) in cells */
++	int		cdv;		/* Cell delay varition */
+         /* extra params for ABR */
+         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
+         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/trunk/target/linux/generic/patches-3.13/653-disable_netlink_trim.patch b/trunk/target/linux/generic/patches-3.13/653-disable_netlink_trim.patch
new file mode 100644
index 00000000..1bc8fb87
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/653-disable_netlink_trim.patch
@@ -0,0 +1,30 @@
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -1665,27 +1665,7 @@ void netlink_detachskb(struct sock *sk,
+ 
+ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
+ {
+-	int delta;
+-
+ 	WARN_ON(skb->sk != NULL);
+-	if (netlink_skb_is_mmaped(skb))
+-		return skb;
+-
+-	delta = skb->end - skb->tail;
+-	if (is_vmalloc_addr(skb->head) || delta * 2 < skb->truesize)
+-		return skb;
+-
+-	if (skb_shared(skb)) {
+-		struct sk_buff *nskb = skb_clone(skb, allocation);
+-		if (!nskb)
+-			return skb;
+-		consume_skb(skb);
+-		skb = nskb;
+-	}
+-
+-	if (!pskb_expand_head(skb, 0, -delta, allocation))
+-		skb->truesize -= delta;
+-
+ 	return skb;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/655-increase_skb_pad.patch b/trunk/target/linux/generic/patches-3.13/655-increase_skb_pad.patch
new file mode 100644
index 00000000..325f175b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/655-increase_skb_pad.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1746,7 +1746,7 @@ static inline int pskb_network_may_pull(
+  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
+  */
+ #ifndef NET_SKB_PAD
+-#define NET_SKB_PAD	max(32, L1_CACHE_BYTES)
++#define NET_SKB_PAD	max(64, L1_CACHE_BYTES)
+ #endif
+ 
+ int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/trunk/target/linux/generic/patches-3.13/656-skb_reduce_truesize-helper.patch b/trunk/target/linux/generic/patches-3.13/656-skb_reduce_truesize-helper.patch
new file mode 100644
index 00000000..f1cf4524
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/656-skb_reduce_truesize-helper.patch
@@ -0,0 +1,41 @@
+From 4593a806e31119c5bd3faa00c7210ad862d515af Mon Sep 17 00:00:00 2001
+From: Dave Taht <dave.taht@bufferbloat.net>
+Date: Mon, 31 Dec 2012 10:02:21 -0800
+Subject: [PATCH 3/7] skb_reduce_truesize: helper function for shrinking skbs
+ whenever needed
+
+On embedded devices in particular, large queues of small packets from the rx
+path with a large truesize can exist. Reducing their size can reduce
+memory pressure. skb_reduce_truesize is a helper function for doing this,
+when needed.
+---
+ include/linux/skbuff.h |   18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1791,6 +1791,24 @@ static inline void pskb_trim_unique(stru
+ 	BUG_ON(err);
+ }
+ 
++/*
++ * Caller wants to reduce memory needs before queueing skb
++ * The (expensive) copy should not be be done in fast path.
++ */
++static inline struct sk_buff *skb_reduce_truesize(struct sk_buff *skb)
++{
++	if (skb->truesize > 2 * SKB_TRUESIZE(skb->len)) {
++		struct sk_buff *nskb;
++		nskb = skb_copy_expand(skb, skb_headroom(skb), 0,
++			GFP_ATOMIC | __GFP_NOWARN);
++		if (nskb) {
++			__kfree_skb(skb);
++			skb = nskb;
++		}
++	}
++	return skb;
++}
++
+ /**
+  *	skb_orphan - orphan a buffer
+  *	@skb: buffer to orphan
diff --git a/trunk/target/linux/generic/patches-3.13/657-qdisc_reduce_truesize.patch b/trunk/target/linux/generic/patches-3.13/657-qdisc_reduce_truesize.patch
new file mode 100644
index 00000000..93ff7ba7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/657-qdisc_reduce_truesize.patch
@@ -0,0 +1,63 @@
+From bc9fec2f87d57bdbff30d296605e24504513f65c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dave=20T=C3=A4ht?= <dave.taht@bufferbloat.net>
+Date: Mon, 17 Sep 2012 19:20:22 -0700
+Subject: [PATCH 4/7] net: add skb_reduce_truesize support to common qdiscs
+
+Reduce skb size under load when queues begin to fill on the
+commont qdiscs.
+---
+ net/sched/sch_codel.c    |    2 ++
+ net/sched/sch_fifo.c     |   12 ++++++++----
+ net/sched/sch_fq_codel.c |    2 ++
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+--- a/net/sched/sch_codel.c
++++ b/net/sched/sch_codel.c
+@@ -96,6 +96,8 @@ static int codel_qdisc_enqueue(struct sk
+ 	struct codel_sched_data *q;
+ 
+ 	if (likely(qdisc_qlen(sch) < sch->limit)) {
++		if(qdisc_qlen(sch) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		codel_set_enqueue_time(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+ 	}
+--- a/net/sched/sch_fifo.c
++++ b/net/sched/sch_fifo.c
+@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff
+ 
+ static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	return qdisc_reshape_fail(skb, sch);
+ }
+ 
+ static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	/* queue full, remove one skb to fulfill the limit */
+ 	__qdisc_queue_drop_head(sch, &sch->q);
+ 	sch->qstats.drops++;
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -182,6 +182,8 @@ static int fq_codel_enqueue(struct sk_bu
+ 		return ret;
+ 	}
+ 	idx--;
++	if (sch->q.qlen > 128)
++		skb = skb_reduce_truesize(skb);
+ 
+ 	codel_set_enqueue_time(skb);
+ 	flow = &q->flows[idx];
diff --git a/trunk/target/linux/generic/patches-3.13/660-fq_codel_defaults.patch b/trunk/target/linux/generic/patches-3.13/660-fq_codel_defaults.patch
new file mode 100644
index 00000000..c08b2191
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/660-fq_codel_defaults.patch
@@ -0,0 +1,14 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -389,9 +389,9 @@ static int fq_codel_init(struct Qdisc *s
+ 	struct fq_codel_sched_data *q = qdisc_priv(sch);
+ 	int i;
+ 
+-	sch->limit = 10*1024;
++	sch->limit = 1024;
+ 	q->flows_cnt = 1024;
+-	q->quantum = psched_mtu(qdisc_dev(sch));
++	q->quantum = 300;
+ 	q->perturbation = net_random();
+ 	INIT_LIST_HEAD(&q->new_flows);
+ 	INIT_LIST_HEAD(&q->old_flows);
diff --git a/trunk/target/linux/generic/patches-3.13/661-fq_codel_keep_dropped_stats.patch b/trunk/target/linux/generic/patches-3.13/661-fq_codel_keep_dropped_stats.patch
new file mode 100644
index 00000000..d51c7e58
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/661-fq_codel_keep_dropped_stats.patch
@@ -0,0 +1,10 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -195,7 +195,6 @@ static int fq_codel_enqueue(struct sk_bu
+ 		list_add_tail(&flow->flowchain, &q->new_flows);
+ 		q->new_flow_count++;
+ 		flow->deficit = q->quantum;
+-		flow->dropped = 0;
+ 	}
+ 	if (++sch->q.qlen <= sch->limit)
+ 		return NET_XMIT_SUCCESS;
diff --git a/trunk/target/linux/generic/patches-3.13/662-use_fq_codel_by_default.patch b/trunk/target/linux/generic/patches-3.13/662-use_fq_codel_by_default.patch
new file mode 100644
index 00000000..fcb0013c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/662-use_fq_codel_by_default.patch
@@ -0,0 +1,75 @@
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -3,8 +3,9 @@
+ # 
+ 
+ menuconfig NET_SCHED
+-	bool "QoS and/or fair queueing"
++	def_bool y
+ 	select NET_SCH_FIFO
++	select NET_SCH_FQ_CODEL
+ 	---help---
+ 	  When the kernel has several packets to send out over a network
+ 	  device, it has to decide which ones to send first, which ones to
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -594,7 +594,7 @@ static const struct Qdisc_class_ops fq_c
+ 	.walk		=	fq_codel_walk,
+ };
+ 
+-static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
++struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
+ 	.cl_ops		=	&fq_codel_class_ops,
+ 	.id		=	"fq_codel",
+ 	.priv_size	=	sizeof(struct fq_codel_sched_data),
+@@ -610,6 +610,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+ 	.dump_stats =	fq_codel_dump_stats,
+ 	.owner		=	THIS_MODULE,
+ };
++EXPORT_SYMBOL(fq_codel_qdisc_ops);
+ 
+ static int __init fq_codel_module_init(void)
+ {
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -316,6 +316,7 @@ extern struct Qdisc noop_qdisc;
+ extern struct Qdisc_ops noop_qdisc_ops;
+ extern struct Qdisc_ops pfifo_fast_ops;
+ extern struct Qdisc_ops mq_qdisc_ops;
++extern struct Qdisc_ops fq_codel_qdisc_ops;
+ extern const struct Qdisc_ops *default_qdisc_ops;
+ 
+ struct Qdisc_class_common {
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -693,7 +693,7 @@ static void attach_one_default_qdisc(str
+ 
+ 	if (dev->tx_queue_len) {
+ 		qdisc = qdisc_create_dflt(dev_queue,
+-					  default_qdisc_ops, TC_H_ROOT);
++					  &fq_codel_qdisc_ops, TC_H_ROOT);
+ 		if (!qdisc) {
+ 			netdev_info(dev, "activation failed\n");
+ 			return;
+--- a/net/sched/sch_mq.c
++++ b/net/sched/sch_mq.c
+@@ -57,7 +57,7 @@ static int mq_init(struct Qdisc *sch, st
+ 
+ 	for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
+ 		dev_queue = netdev_get_tx_queue(dev, ntx);
+-		qdisc = qdisc_create_dflt(dev_queue, default_qdisc_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(ntx + 1)));
+ 		if (qdisc == NULL)
+--- a/net/sched/sch_mqprio.c
++++ b/net/sched/sch_mqprio.c
+@@ -124,7 +124,7 @@ static int mqprio_init(struct Qdisc *sch
+ 
+ 	for (i = 0; i < dev->num_tx_queues; i++) {
+ 		dev_queue = netdev_get_tx_queue(dev, i);
+-		qdisc = qdisc_create_dflt(dev_queue, default_qdisc_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(i + 1)));
+ 		if (qdisc == NULL) {
diff --git a/trunk/target/linux/generic/patches-3.13/663-remove_pfifo_fast.patch b/trunk/target/linux/generic/patches-3.13/663-remove_pfifo_fast.patch
new file mode 100644
index 00000000..3420d3d4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/663-remove_pfifo_fast.patch
@@ -0,0 +1,143 @@
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -401,140 +401,6 @@ static struct Qdisc noqueue_qdisc = {
+ 	.busylock	=	__SPIN_LOCK_UNLOCKED(noqueue_qdisc.busylock),
+ };
+ 
+-
+-static const u8 prio2band[TC_PRIO_MAX + 1] = {
+-	1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
+-};
+-
+-/* 3-band FIFO queue: old style, but should be a bit faster than
+-   generic prio+fifo combination.
+- */
+-
+-#define PFIFO_FAST_BANDS 3
+-
+-/*
+- * Private data for a pfifo_fast scheduler containing:
+- * 	- queues for the three band
+- * 	- bitmap indicating which of the bands contain skbs
+- */
+-struct pfifo_fast_priv {
+-	u32 bitmap;
+-	struct sk_buff_head q[PFIFO_FAST_BANDS];
+-};
+-
+-/*
+- * Convert a bitmap to the first band number where an skb is queued, where:
+- * 	bitmap=0 means there are no skbs on any band.
+- * 	bitmap=1 means there is an skb on band 0.
+- *	bitmap=7 means there are skbs on all 3 bands, etc.
+- */
+-static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
+-
+-static inline struct sk_buff_head *band2list(struct pfifo_fast_priv *priv,
+-					     int band)
+-{
+-	return priv->q + band;
+-}
+-
+-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc)
+-{
+-	if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
+-		int band = prio2band[skb->priority & TC_PRIO_MAX];
+-		struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		priv->bitmap |= (1 << band);
+-		qdisc->q.qlen++;
+-		return __qdisc_enqueue_tail(skb, qdisc, list);
+-	}
+-
+-	return qdisc_drop(skb, qdisc);
+-}
+-
+-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (likely(band >= 0)) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-		struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
+-
+-		qdisc->q.qlen--;
+-		if (skb_queue_empty(list))
+-			priv->bitmap &= ~(1 << band);
+-
+-		return skb;
+-	}
+-
+-	return NULL;
+-}
+-
+-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (band >= 0) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		return skb_peek(list);
+-	}
+-
+-	return NULL;
+-}
+-
+-static void pfifo_fast_reset(struct Qdisc *qdisc)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		__qdisc_reset_queue(qdisc, band2list(priv, prio));
+-
+-	priv->bitmap = 0;
+-	qdisc->qstats.backlog = 0;
+-	qdisc->q.qlen = 0;
+-}
+-
+-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
+-{
+-	struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
+-
+-	memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
+-	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
+-		goto nla_put_failure;
+-	return skb->len;
+-
+-nla_put_failure:
+-	return -1;
+-}
+-
+-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		skb_queue_head_init(band2list(priv, prio));
+-
+-	/* Can by-pass the queue discipline */
+-	qdisc->flags |= TCQ_F_CAN_BYPASS;
+-	return 0;
+-}
+-
+-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
+-	.id		=	"pfifo_fast",
+-	.priv_size	=	sizeof(struct pfifo_fast_priv),
+-	.enqueue	=	pfifo_fast_enqueue,
+-	.dequeue	=	pfifo_fast_dequeue,
+-	.peek		=	pfifo_fast_peek,
+-	.init		=	pfifo_fast_init,
+-	.reset		=	pfifo_fast_reset,
+-	.dump		=	pfifo_fast_dump,
+-	.owner		=	THIS_MODULE,
+-};
+-
+ static struct lock_class_key qdisc_tx_busylock;
+ 
+ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
diff --git a/trunk/target/linux/generic/patches-3.13/664-codel_fix_3_12.patch b/trunk/target/linux/generic/patches-3.13/664-codel_fix_3_12.patch
new file mode 100644
index 00000000..8d75471e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/664-codel_fix_3_12.patch
@@ -0,0 +1,22 @@
+--- a/net/sched/sch_api.c
++++ b/net/sched/sch_api.c
+@@ -1909,7 +1909,7 @@ static int __init pktsched_init(void)
+ 		return err;
+ 	}
+ 
+-	register_qdisc(&pfifo_fast_ops);
++	register_qdisc(&fq_codel_qdisc_ops);
+ 	register_qdisc(&pfifo_qdisc_ops);
+ 	register_qdisc(&bfifo_qdisc_ops);
+ 	register_qdisc(&pfifo_head_drop_qdisc_ops);
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -31,7 +31,7 @@
+ #include <net/dst.h>
+ 
+ /* Qdisc to use by default */
+-const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
++const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops;
+ EXPORT_SYMBOL(default_qdisc_ops);
+ 
+ /* Main transmission queue. */
diff --git a/trunk/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/trunk/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
new file mode 100644
index 00000000..ca91ca14
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -0,0 +1,481 @@
+From 775d6fe74d1eaec2ba387535b068dde2dc89de9e Mon Sep 17 00:00:00 2001
+From: Steven Barth <steven@midlink.org>
+Date: Thu, 22 May 2014 09:49:05 +0200
+Subject: [PATCH] Add support for MAP-E FMRs (mesh mode)
+
+MAP-E FMRs (draft-ietf-softwire-map-10) are rules for IPv4-communication
+between MAP CEs (mesh mode) without the need to forward such data to a
+border relay. This is similar to how 6rd works but for IPv4 over IPv6.
+
+Signed-off-by: Steven Barth <cyrus@openwrt.org>
+---
+ include/net/ip6_tunnel.h       |  13 ++
+ include/uapi/linux/if_tunnel.h |  13 ++
+ net/ipv6/ip6_tunnel.c          | 276 +++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 291 insertions(+), 11 deletions(-)
+
+--- a/include/net/ip6_tunnel.h
++++ b/include/net/ip6_tunnel.h
+@@ -15,6 +15,18 @@
+ /* determine capability on a per-packet basis */
+ #define IP6_TNL_F_CAP_PER_PACKET 0x40000
+ 
++/* IPv6 tunnel FMR */
++struct __ip6_tnl_fmr {
++	struct __ip6_tnl_fmr *next; /* next fmr in list */
++	struct in6_addr ip6_prefix;
++	struct in_addr ip4_prefix;
++
++	__u8 ip6_prefix_len;
++	__u8 ip4_prefix_len;
++	__u8 ea_len;
++	__u8 offset;
++};
++
+ struct __ip6_tnl_parm {
+ 	char name[IFNAMSIZ];	/* name of tunnel device */
+ 	int link;		/* ifindex of underlying L2 interface */
+@@ -25,6 +37,7 @@ struct __ip6_tnl_parm {
+ 	__u32 flags;		/* tunnel flags */
+ 	struct in6_addr laddr;	/* local tunnel end-point address */
+ 	struct in6_addr raddr;	/* remote tunnel end-point address */
++	struct __ip6_tnl_fmr *fmrs;	/* FMRs */
+ 
+ 	__be16			i_flags;
+ 	__be16			o_flags;
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -53,10 +53,23 @@ enum {
+ 	IFLA_IPTUN_6RD_RELAY_PREFIX,
+ 	IFLA_IPTUN_6RD_PREFIXLEN,
+ 	IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
++	IFLA_IPTUN_FMRS,
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+ 
++enum {
++	IFLA_IPTUN_FMR_UNSPEC,
++	IFLA_IPTUN_FMR_IP6_PREFIX,
++	IFLA_IPTUN_FMR_IP4_PREFIX,
++	IFLA_IPTUN_FMR_IP6_PREFIX_LEN,
++	IFLA_IPTUN_FMR_IP4_PREFIX_LEN,
++	IFLA_IPTUN_FMR_EA_LEN,
++	IFLA_IPTUN_FMR_OFFSET,
++	__IFLA_IPTUN_FMR_MAX,
++};
++#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1)
++
+ /* SIT-mode i_flags */
+ #define	SIT_ISATAP	0x0001
+ 
+--- a/net/ipv6/ip6_tunnel.c
++++ b/net/ipv6/ip6_tunnel.c
+@@ -16,6 +16,8 @@
+  *      as published by the Free Software Foundation; either version
+  *      2 of the License, or (at your option) any later version.
+  *
++ *	Changes:
++ * Steven Barth <cyrus@openwrt.org>:		MAP-E FMR support
+  */
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+@@ -80,11 +82,9 @@ static bool log_ecn_error = true;
+ module_param(log_ecn_error, bool, 0644);
+ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
+ 
+-static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
++static u32 HASH(const struct in6_addr *addr)
+ {
+-	u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2);
+-
+-	return hash_32(hash, HASH_SIZE_SHIFT);
++	return hash_32(ipv6_addr_hash(addr), HASH_SIZE_SHIFT);
+ }
+ 
+ static int ip6_tnl_dev_init(struct net_device *dev);
+@@ -182,15 +182,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store);
+ static struct ip6_tnl *
+ ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
+ {
+-	unsigned int hash = HASH(remote, local);
++	unsigned int hash = HASH(local);
+ 	struct ip6_tnl *t;
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
+-		if (ipv6_addr_equal(local, &t->parms.laddr) &&
+-		    ipv6_addr_equal(remote, &t->parms.raddr) &&
+-		    (t->dev->flags & IFF_UP))
++		if (!ipv6_addr_equal(local, &t->parms.laddr) ||
++				!(t->dev->flags & IFF_UP))
++			continue;
++
++		if (ipv6_addr_equal(remote, &t->parms.raddr))
+ 			return t;
++
++		for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++			if (ipv6_prefix_equal(remote, &fmr->ip6_prefix,
++					fmr->ip6_prefix_len))
++				return t;
++		}
+ 	}
+ 	t = rcu_dereference(ip6n->tnls_wc[0]);
+ 	if (t && (t->dev->flags & IFF_UP))
+@@ -220,7 +229,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
+ 
+ 	if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
+ 		prio = 1;
+-		h = HASH(remote, local);
++		h = HASH(local);
+ 	}
+ 	return &ip6n->tnls[prio][h];
+ }
+@@ -388,6 +397,12 @@ ip6_tnl_dev_uninit(struct net_device *de
+ 	struct net *net = t->net;
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
+ 
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++
+ 	if (dev == ip6n->fb_tnl_dev)
+ 		RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
+ 	else
+@@ -771,6 +786,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+ }
+ EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
+ 
++
++/**
++ * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR
++ *   @dest: destination IPv6 address buffer
++ *   @skb: received socket buffer
++ *   @fmr: MAP FMR
++ *   @xmit: Calculate for xmit or rcv
++ **/
++static void ip4ip6_fmr_calc(struct in6_addr *dest,
++		const struct iphdr *iph, const uint8_t *end,
++		const struct __ip6_tnl_fmr *fmr, bool xmit)
++{
++	int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len);
++	u8 *portp = NULL;
++	bool use_dest_addr;
++	const struct iphdr *dsth = iph;
++
++	if ((u8*)dsth >= end)
++		return;
++
++	/* find significant IP header */
++	if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++		if (ih && ((u8*)&ih[1]) <= end && (
++			ih->type == ICMP_DEST_UNREACH ||
++			ih->type == ICMP_SOURCE_QUENCH ||
++			ih->type == ICMP_TIME_EXCEEDED ||
++			ih->type == ICMP_PARAMETERPROB ||
++			ih->type == ICMP_REDIRECT))
++				dsth = (const struct iphdr*)&ih[1];
++	}
++
++	/* in xmit-path use dest port by default and source port only if
++		this is an ICMP reply to something else; vice versa in rcv-path */
++	use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph);
++
++	/* get dst port */
++	if (((u8*)&dsth[1]) <= end && (
++		dsth->protocol == IPPROTO_UDP ||
++		dsth->protocol == IPPROTO_TCP ||
++		dsth->protocol == IPPROTO_SCTP ||
++		dsth->protocol == IPPROTO_DCCP)) {
++			/* for UDP, TCP, SCTP and DCCP source and dest port
++			follow IPv4 header directly */
++			portp = ((u8*)dsth) + dsth->ihl * 4;
++
++			if (use_dest_addr)
++				portp += sizeof(u16);
++	} else if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++
++		/* use icmp identifier as port */
++		if (((u8*)&ih) <= end && (
++		    (use_dest_addr && (
++		    ih->type == ICMP_ECHOREPLY ||
++			ih->type == ICMP_TIMESTAMPREPLY ||
++			ih->type == ICMP_INFO_REPLY ||
++			ih->type == ICMP_ADDRESSREPLY)) ||
++			(!use_dest_addr && (
++			ih->type == ICMP_ECHO ||
++			ih->type == ICMP_TIMESTAMP ||
++			ih->type == ICMP_INFO_REQUEST ||
++			ih->type == ICMP_ADDRESS)
++			)))
++				portp = (u8*)&ih->un.echo.id;
++	}
++
++	if ((portp && &portp[2] <= end) || psidlen == 0) {
++		int frombyte = fmr->ip6_prefix_len / 8;
++		int fromrem = fmr->ip6_prefix_len % 8;
++		int bytes = sizeof(struct in6_addr) - frombyte;
++		const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr;
++		u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len);
++		u64 t = 0;
++
++		/* extract PSID from port and add it to eabits */
++		u16 psidbits = 0;
++		if (psidlen > 0) {
++			psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]);
++			psidbits >>= 16 - psidlen - fmr->offset;
++			psidbits = (u16)(psidbits << (16 - psidlen));
++			eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen));
++		}
++
++		/* rewrite destination address */
++		*dest = fmr->ip6_prefix;
++		memcpy(&dest->s6_addr[10], addr, sizeof(*addr));
++		dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen));
++
++		if (bytes > sizeof(u64))
++			bytes = sizeof(u64);
++
++		/* insert eabits */
++		memcpy(&t, &dest->s6_addr[frombyte], bytes);
++		t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1)
++			<< (64 - fmr->ea_len - fromrem));
++		t = cpu_to_be64(t | (eabits >> fromrem));
++		memcpy(&dest->s6_addr[frombyte], &t, bytes);
++	}
++}
++
++
+ /**
+  * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally
+  *   @skb: received socket buffer
+@@ -815,6 +932,26 @@ static int ip6_tnl_rcv(struct sk_buff *s
+ 		skb_reset_network_header(skb);
+ 		skb->protocol = htons(protocol);
+ 		memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
++		if (protocol == ETH_P_IP &&
++			!ipv6_addr_equal(&ipv6h->saddr, &t->parms.raddr)) {
++				/* Packet didn't come from BR, so lookup FMR */
++				struct __ip6_tnl_fmr *fmr;
++				struct in6_addr expected = t->parms.raddr;
++				for (fmr = t->parms.fmrs; fmr; fmr = fmr->next)
++					if (ipv6_prefix_equal(&ipv6h->saddr,
++						&fmr->ip6_prefix, fmr->ip6_prefix_len))
++							break;
++
++				/* Check that IPv6 matches IPv4 source to prevent spoofing */
++				if (fmr)
++					ip4ip6_fmr_calc(&expected, ip_hdr(skb),
++							skb_tail_pointer(skb), fmr, false);
++
++				if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) {
++					rcu_read_unlock();
++					goto discard;
++				}
++		}
+ 
+ 		__skb_tunnel_rx(skb, t->dev, t->net);
+ 
+@@ -1075,6 +1212,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	__u8 dsfield;
+ 	__u32 mtu;
+ 	int err;
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
+ 	    !ip6_tnl_xmit_ctl(t))
+@@ -1094,6 +1232,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
+ 		fl6.flowi6_mark = skb->mark;
+ 
++	/* try to find matching FMR */
++	for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++		unsigned mshift = 32 - fmr->ip4_prefix_len;
++		if (ntohl(fmr->ip4_prefix.s_addr) >> mshift ==
++				ntohl(iph->daddr) >> mshift)
++			break;
++	}
++
++	/* change dstaddr according to FMR */
++	if (fmr)
++		ip4ip6_fmr_calc(&fl6.daddr, iph, skb_tail_pointer(skb), fmr, true);
++
+ 	err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
+ 	if (err != 0) {
+ 		/* XXX: send ICMP error even if DF is not set. */
+@@ -1262,6 +1412,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+ 	t->parms.flowinfo = p->flowinfo;
+ 	t->parms.link = p->link;
+ 	t->parms.proto = p->proto;
++
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++	t->parms.fmrs = p->fmrs;
++
+ 	ip6_tnl_dst_reset(t);
+ 	ip6_tnl_link_config(t);
+ 	return 0;
+@@ -1292,6 +1450,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+ 	p->flowinfo = u->flowinfo;
+ 	p->link = u->link;
+ 	p->proto = u->proto;
++	p->fmrs = NULL;
+ 	memcpy(p->name, u->name, sizeof(u->name));
+ }
+ 
+@@ -1579,6 +1738,15 @@ static int ip6_tnl_validate(struct nlatt
+ 	return 0;
+ }
+ 
++static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = {
++	[IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) },
++	[IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) },
++	[IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 }
++};
++
+ static void ip6_tnl_netlink_parms(struct nlattr *data[],
+ 				  struct __ip6_tnl_parm *parms)
+ {
+@@ -1612,6 +1780,46 @@ static void ip6_tnl_netlink_parms(struct
+ 
+ 	if (data[IFLA_IPTUN_PROTO])
+ 		parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
++
++	if (data[IFLA_IPTUN_FMRS]) {
++		unsigned rem;
++		struct nlattr *fmr;
++		nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) {
++			struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c;
++			struct __ip6_tnl_fmr *nfmr;
++
++			nla_parse_nested(fmrd, IFLA_IPTUN_FMR_MAX,
++				fmr, ip6_tnl_fmr_policy);
++
++			if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL)))
++				continue;
++
++			nfmr->offset = 6;
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX]))
++				nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX],
++					sizeof(nfmr->ip6_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX]))
++				nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX],
++					sizeof(nfmr->ip4_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN]))
++				nfmr->ip6_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN]))
++				nfmr->ip4_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN]))
++				nfmr->ea_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET]))
++				nfmr->offset = nla_get_u8(c);
++
++			nfmr->next = parms->fmrs;
++			parms->fmrs = nfmr;
++		}
++	}
+ }
+ 
+ static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
+@@ -1664,6 +1872,12 @@ static void ip6_tnl_dellink(struct net_d
+ 
+ static size_t ip6_tnl_get_size(const struct net_device *dev)
+ {
++	const struct ip6_tnl *t = netdev_priv(dev);
++	struct __ip6_tnl_fmr *c;
++	int fmrs = 0;
++	for (c = t->parms.fmrs; c; c = c->next)
++		++fmrs;
++
+ 	return
+ 		/* IFLA_IPTUN_LINK */
+ 		nla_total_size(4) +
+@@ -1681,6 +1895,24 @@ static size_t ip6_tnl_get_size(const str
+ 		nla_total_size(4) +
+ 		/* IFLA_IPTUN_PROTO */
+ 		nla_total_size(1) +
++		/* IFLA_IPTUN_FMRS */
++		nla_total_size(0) +
++		(
++			/* nest */
++			nla_total_size(0) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX */
++			nla_total_size(sizeof(struct in6_addr)) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX */
++			nla_total_size(sizeof(struct in_addr)) +
++			/* IFLA_IPTUN_FMR_EA_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_OFFSET */
++			nla_total_size(1)
++		) * fmrs +
+ 		0;
+ }
+ 
+@@ -1688,6 +1920,9 @@ static int ip6_tnl_fill_info(struct sk_b
+ {
+ 	struct ip6_tnl *tunnel = netdev_priv(dev);
+ 	struct __ip6_tnl_parm *parm = &tunnel->parms;
++	struct __ip6_tnl_fmr *c;
++	int fmrcnt = 0;
++	struct nlattr *fmrs;
+ 
+ 	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
+ 	    nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
+@@ -1698,8 +1933,27 @@ static int ip6_tnl_fill_info(struct sk_b
+ 	    nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
+ 	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
+ 	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
+-	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto))
++	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
++	    !(fmrs = nla_nest_start(skb, IFLA_IPTUN_FMRS)))
+ 		goto nla_put_failure;
++
++	for (c = parm->fmrs; c; c = c->next) {
++		struct nlattr *fmr = nla_nest_start(skb, ++fmrcnt);
++		if (!fmr ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX,
++				sizeof(c->ip6_prefix), &c->ip6_prefix) ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX,
++				sizeof(c->ip4_prefix), &c->ip4_prefix) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset))
++				goto nla_put_failure;
++
++		nla_nest_end(skb, fmr);
++	}
++	nla_nest_end(skb, fmrs);
++
+ 	return 0;
+ 
+ nla_put_failure:
+@@ -1715,6 +1969,7 @@ static const struct nla_policy ip6_tnl_p
+ 	[IFLA_IPTUN_FLOWINFO]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_FLAGS]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_PROTO]		= { .type = NLA_U8 },
++	[IFLA_IPTUN_FMRS]		= { .type = NLA_NESTED },
+ };
+ 
+ static struct rtnl_link_ops ip6_link_ops __read_mostly = {
diff --git a/trunk/target/linux/generic/patches-3.13/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/trunk/target/linux/generic/patches-3.13/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
new file mode 100644
index 00000000..1549b372
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -0,0 +1,249 @@
+From 1b5aaa4b16f6e6471ab1c07b38068197a1b4c395 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Fri, 24 May 2013 14:40:54 +0200
+Subject: [PATCH 1/2] ipv6: allow rejecting with "source address failed policy"
+
+RFC6204 L-14 requires rejecting traffic from invalid addresses with
+ICMPv6 Destination Unreachable, Code 5 (Source address failed ingress/
+egress policy) on the LAN side, so add an appropriate rule for that.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ include/net/netns/ipv6.h       |  1 +
+ include/uapi/linux/fib_rules.h |  4 +++
+ include/uapi/linux/rtnetlink.h |  1 +
+ net/ipv4/fib_semantics.c       |  4 +++
+ net/ipv4/fib_trie.c            |  1 +
+ net/ipv4/ipmr.c                |  1 +
+ net/ipv6/fib6_rules.c          |  4 +++
+ net/ipv6/ip6mr.c               |  2 ++
+ net/ipv6/route.c               | 58 +++++++++++++++++++++++++++++++++++++++++-
+ 9 files changed, 75 insertions(+), 1 deletion(-)
+
+--- a/include/net/netns/ipv6.h
++++ b/include/net/netns/ipv6.h
+@@ -55,6 +55,7 @@ struct netns_ipv6 {
+ 	unsigned long		 ip6_rt_last_gc;
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	struct rt6_info         *ip6_prohibit_entry;
++	struct rt6_info		*ip6_policy_failed_entry;
+ 	struct rt6_info         *ip6_blk_hole_entry;
+ 	struct fib6_table       *fib6_local_tbl;
+ 	struct fib_rules_ops    *fib6_rules_ops;
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -64,6 +64,10 @@ enum {
+ 	FR_ACT_BLACKHOLE,	/* Drop without notification */
+ 	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
+ 	FR_ACT_PROHIBIT,	/* Drop with EACCES */
++	FR_ACT_RES9,
++	FR_ACT_RES10,
++	FR_ACT_RES11,
++	FR_ACT_POLICY_FAILED,	/* Drop with EACCES */
+ 	__FR_ACT_MAX,
+ };
+ 
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -203,6 +203,7 @@ enum {
+ 	RTN_THROW,		/* Not in this table		*/
+ 	RTN_NAT,		/* Translate this address	*/
+ 	RTN_XRESOLVE,		/* Use external resolver	*/
++	RTN_POLICY_FAILED,	/* Failed ingress/egress policy */
+ 	__RTN_MAX
+ };
+ 
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX
+ 		.error	= -EINVAL,
+ 		.scope	= RT_SCOPE_NOWHERE,
+ 	},
++	[RTN_POLICY_FAILED] = {
++		.error	= -EACCES,
++		.scope	= RT_SCOPE_UNIVERSE,
++	},
+ };
+ 
+ static void rt_fibinfo_free(struct rtable __rcu **rtp)
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2324,6 +2324,7 @@ static const char *const rtn_type_names[
+ 	[RTN_THROW] = "THROW",
+ 	[RTN_NAT] = "NAT",
+ 	[RTN_XRESOLVE] = "XRESOLVE",
++	[RTN_POLICY_FAILED] = "POLICY_FAILED",
+ };
+ 
+ static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
+--- a/net/ipv4/ipmr.c
++++ b/net/ipv4/ipmr.c
+@@ -184,6 +184,7 @@ static int ipmr_rule_action(struct fib_r
+ 	case FR_ACT_UNREACHABLE:
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
++	case FR_ACT_POLICY_FAILED:
+ 		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+--- a/net/ipv6/fib6_rules.c
++++ b/net/ipv6/fib6_rules.c
+@@ -73,6 +73,10 @@ static int fib6_rule_action(struct fib_r
+ 		err = -EACCES;
+ 		rt = net->ipv6.ip6_prohibit_entry;
+ 		goto discard_pkt;
++	case FR_ACT_POLICY_FAILED:
++		err = -EACCES;
++		rt = net->ipv6.ip6_policy_failed_entry;
++		goto discard_pkt;
+ 	}
+ 
+ 	table = fib6_get_table(net, rule->table);
+--- a/net/ipv6/ip6mr.c
++++ b/net/ipv6/ip6mr.c
+@@ -169,6 +169,8 @@ static int ip6mr_rule_action(struct fib_
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
+ 		return -EACCES;
++	case FR_ACT_POLICY_FAILED:
++		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+ 		return -EINVAL;
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -86,6 +86,8 @@ static int		ip6_pkt_discard(struct sk_bu
+ static int		ip6_pkt_discard_out(struct sk_buff *skb);
+ static int		ip6_pkt_prohibit(struct sk_buff *skb);
+ static int		ip6_pkt_prohibit_out(struct sk_buff *skb);
++static int		ip6_pkt_policy_failed(struct sk_buff *skb);
++static int		ip6_pkt_policy_failed_out(struct sk_buff *skb);
+ static void		ip6_link_failure(struct sk_buff *skb);
+ static void		ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
+ 					   struct sk_buff *skb, u32 mtu);
+@@ -251,6 +253,21 @@ static const struct rt6_info ip6_prohibi
+ 	.rt6i_ref	= ATOMIC_INIT(1),
+ };
+ 
++static const struct rt6_info ip6_policy_failed_entry_template = {
++	.dst = {
++		.__refcnt	= ATOMIC_INIT(1),
++		.__use		= 1,
++		.obsolete	= DST_OBSOLETE_FORCE_CHK,
++		.error		= -EACCES,
++		.input		= ip6_pkt_policy_failed,
++		.output		= ip6_pkt_policy_failed_out,
++	},
++	.rt6i_flags	= (RTF_REJECT | RTF_NONEXTHOP),
++	.rt6i_protocol	= RTPROT_KERNEL,
++	.rt6i_metric	= ~(u32) 0,
++	.rt6i_ref	= ATOMIC_INIT(1),
++};
++
+ static const struct rt6_info ip6_blk_hole_entry_template = {
+ 	.dst = {
+ 		.__refcnt	= ATOMIC_INIT(1),
+@@ -1576,6 +1593,11 @@ int ip6_route_add(struct fib6_config *cf
+ 			rt->dst.output = ip6_pkt_prohibit_out;
+ 			rt->dst.input = ip6_pkt_prohibit;
+ 			break;
++		case RTN_POLICY_FAILED:
++			rt->dst.error = -EACCES;
++			rt->dst.output = ip6_pkt_policy_failed_out;
++			rt->dst.input = ip6_pkt_policy_failed;
++			break;
+ 		case RTN_THROW:
+ 		default:
+ 			rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN
+@@ -2155,6 +2177,17 @@ static int ip6_pkt_prohibit_out(struct s
+ 	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
+ }
+ 
++static int ip6_pkt_policy_failed(struct sk_buff *skb)
++{
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES);
++}
++
++static int ip6_pkt_policy_failed_out(struct sk_buff *skb)
++{
++	skb->dev = skb_dst(skb)->dev;
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES);
++}
++
+ /*
+  *	Allocate a dst for local (unicast / anycast) address.
+  */
+@@ -2357,7 +2390,8 @@ static int rtm_to_fib6_config(struct sk_
+ 	if (rtm->rtm_type == RTN_UNREACHABLE ||
+ 	    rtm->rtm_type == RTN_BLACKHOLE ||
+ 	    rtm->rtm_type == RTN_PROHIBIT ||
+-	    rtm->rtm_type == RTN_THROW)
++	    rtm->rtm_type == RTN_THROW ||
++	    rtm->rtm_type == RTN_POLICY_FAILED)
+ 		cfg->fc_flags |= RTF_REJECT;
+ 
+ 	if (rtm->rtm_type == RTN_LOCAL)
+@@ -2559,6 +2593,9 @@ static int rt6_fill_node(struct net *net
+ 		case -EACCES:
+ 			rtm->rtm_type = RTN_PROHIBIT;
+ 			break;
++		case -EPERM:
++			rtm->rtm_type = RTN_POLICY_FAILED;
++			break;
+ 		case -EAGAIN:
+ 			rtm->rtm_type = RTN_THROW;
+ 			break;
+@@ -2809,6 +2846,8 @@ static int ip6_route_dev_notify(struct n
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
+ 		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
++		net->ipv6.ip6_policy_failed_entry->dst.dev = dev;
++		net->ipv6.ip6_policy_failed_entry->rt6i_idev = in6_dev_get(dev);
+ 		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
+ 		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
+ #endif
+@@ -3025,6 +3064,17 @@ static int __net_init ip6_route_net_init
+ 	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
+ 	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
+ 			 ip6_template_metrics, true);
++
++	net->ipv6.ip6_policy_failed_entry =
++		kmemdup(&ip6_policy_failed_entry_template,
++			sizeof(*net->ipv6.ip6_policy_failed_entry), GFP_KERNEL);
++	if (!net->ipv6.ip6_policy_failed_entry)
++		goto out_ip6_blk_hole_entry;
++	net->ipv6.ip6_policy_failed_entry->dst.path =
++		(struct dst_entry *)net->ipv6.ip6_policy_failed_entry;
++	net->ipv6.ip6_policy_failed_entry->dst.ops = &net->ipv6.ip6_dst_ops;
++	dst_init_metrics(&net->ipv6.ip6_policy_failed_entry->dst,
++			 ip6_template_metrics, true);
+ #endif
+ 
+ 	net->ipv6.sysctl.flush_delay = 0;
+@@ -3043,6 +3093,8 @@ out:
+ 	return ret;
+ 
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
++out_ip6_blk_hole_entry:
++	kfree(net->ipv6.ip6_blk_hole_entry);
+ out_ip6_prohibit_entry:
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ out_ip6_null_entry:
+@@ -3060,6 +3112,7 @@ static void __net_exit ip6_route_net_exi
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ 	kfree(net->ipv6.ip6_blk_hole_entry);
++	kfree(net->ipv6.ip6_policy_failed_entry);
+ #endif
+ 	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
+ }
+@@ -3156,6 +3209,9 @@ int __init ip6_route_init(void)
+ 	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
+ 	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
+ 	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
++	init_net.ipv6.ip6_policy_failed_entry->dst.dev = init_net.loopback_dev;
++	init_net.ipv6.ip6_policy_failed_entry->rt6i_idev =
++		in6_dev_get(init_net.loopback_dev);
+   #endif
+ 	ret = fib6_init();
+ 	if (ret)
diff --git a/trunk/target/linux/generic/patches-3.13/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch b/trunk/target/linux/generic/patches-3.13/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
new file mode 100644
index 00000000..25a86393
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
@@ -0,0 +1,53 @@
+From 7749b481ce5d7e232b1f7da5e6b2c44816f51681 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sun, 19 Jan 2014 20:45:51 +0100
+Subject: [PATCH 2/2] net: provide defines for _POLICY_FAILED until all code is
+ updated
+
+Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
+unreachable, conflicting with our name.
+
+Add appropriate defines to allow our code to build with the new
+name until we have updated our local patches for older kernels
+and userspace packages.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ include/uapi/linux/fib_rules.h | 2 ++
+ include/uapi/linux/icmpv6.h    | 2 ++
+ include/uapi/linux/rtnetlink.h | 2 ++
+ 3 files changed, 6 insertions(+)
+
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -71,6 +71,8 @@ enum {
+ 	__FR_ACT_MAX,
+ };
+ 
++#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
++
+ #define FR_ACT_MAX (__FR_ACT_MAX - 1)
+ 
+ #endif
+--- a/include/uapi/linux/icmpv6.h
++++ b/include/uapi/linux/icmpv6.h
+@@ -118,6 +118,8 @@ struct icmp6hdr {
+ #define ICMPV6_POLICY_FAIL		5
+ #define ICMPV6_REJECT_ROUTE		6
+ 
++#define ICMPV6_FAILED_POLICY		ICMPV6_POLICY_FAIL
++
+ /*
+  *	Codes for Time Exceeded
+  */
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -207,6 +207,8 @@ enum {
+ 	__RTN_MAX
+ };
+ 
++#define RTN_FAILED_POLICY RTN_POLICY_FAILED
++
+ #define RTN_MAX (__RTN_MAX - 1)
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/700-swconfig.patch b/trunk/target/linux/generic/patches-3.13/700-swconfig.patch
new file mode 100644
index 00000000..a60722c2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/700-swconfig.patch
@@ -0,0 +1,39 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,16 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config SWCONFIG
++	tristate "Switch configuration API"
++	---help---
++	  Switch configuration API using netlink. This allows
++	  you to configure the VLAN features of certain switches.
++
++config SWCONFIG_LEDS
++	bool "Switch LED trigger support"
++	depends on (SWCONFIG && LEDS_TRIGGERS)
++
+ comment "MII PHY device drivers"
+ 
+ config AT803X_PHY
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -3,6 +3,7 @@
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
++obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
+ obj-$(CONFIG_CICADA_PHY)	+= cicada.o
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -366,6 +366,7 @@ header-y += stddef.h
+ header-y += string.h
+ header-y += suspend_ioctls.h
+ header-y += swab.h
++header-y += switch.h
+ header-y += synclink.h
+ header-y += sysctl.h
+ header-y += sysinfo.h
diff --git a/trunk/target/linux/generic/patches-3.13/701-phy_extension.patch b/trunk/target/linux/generic/patches-3.13/701-phy_extension.patch
new file mode 100644
index 00000000..e8df4a2b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/701-phy_extension.patch
@@ -0,0 +1,63 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -302,6 +302,50 @@ int phy_ethtool_gset(struct phy_device *
+ }
+ EXPORT_SYMBOL(phy_ethtool_gset);
+ 
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
++{
++	u32 cmd;
++	int tmp;
++	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
++	struct ethtool_value edata = { ETHTOOL_GLINK };
++
++	if (get_user(cmd, (u32 *) useraddr))
++		return -EFAULT;
++
++	switch (cmd) {
++	case ETHTOOL_GSET:
++		phy_ethtool_gset(phydev, &ecmd);
++		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
++			return -EFAULT;
++		return 0;
++
++	case ETHTOOL_SSET:
++		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
++			return -EFAULT;
++		return phy_ethtool_sset(phydev, &ecmd);
++
++	case ETHTOOL_NWAY_RST:
++		/* if autoneg is off, it's an error */
++		tmp = phy_read(phydev, MII_BMCR);
++		if (tmp & BMCR_ANENABLE) {
++			tmp |= (BMCR_ANRESTART);
++			phy_write(phydev, MII_BMCR, tmp);
++			return 0;
++		}
++		return -EINVAL;
++
++	case ETHTOOL_GLINK:
++		edata.data = (phy_read(phydev,
++				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
++		if (copy_to_user(useraddr, &edata, sizeof(edata)))
++			return -EFAULT;
++		return 0;
++	}
++
++	return -EOPNOTSUPP;
++}
++EXPORT_SYMBOL(phy_ethtool_ioctl);
++
+ /**
+  * phy_mii_ioctl - generic PHY MII ioctl interface
+  * @phydev: the phy_device struct
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -578,6 +578,7 @@ void phy_start_machine(struct phy_device
+ void phy_stop_machine(struct phy_device *phydev);
+ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
+ int phy_mii_ioctl(struct phy_device *phydev,
+ 		struct ifreq *ifr, int cmd);
+ int phy_start_interrupts(struct phy_device *phydev);
diff --git a/trunk/target/linux/generic/patches-3.13/702-phy_add_aneg_done_function.patch b/trunk/target/linux/generic/patches-3.13/702-phy_add_aneg_done_function.patch
new file mode 100644
index 00000000..088cee5f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,45 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -412,9 +412,18 @@ struct phy_driver {
+ 	 */
+ 	int (*config_aneg)(struct phy_device *phydev);
+ 
++	/* Determine if autonegotiation is done */
++	int (*aneg_done)(struct phy_device *phydev);
++
+ 	/* Determines the negotiated speed and duplex */
+ 	int (*read_status)(struct phy_device *phydev);
+ 
++	/* 
++	 * Update the value in phydev->link to reflect the 
++	 * current link value
++	 */
++	int (*update_link)(struct phy_device *phydev);
++
+ 	/* Clears any pending interrupts */
+ 	int (*ack_interrupt)(struct phy_device *phydev);
+ 
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -796,6 +796,9 @@ int genphy_update_link(struct phy_device
+ {
+ 	int status;
+ 
++	if (phydev->drv->update_link)
++		return phydev->drv->update_link(phydev);
++
+ 	/* Do a fake read */
+ 	status = phy_read(phydev, MII_BMSR);
+ 
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -108,6 +108,9 @@ static inline int phy_aneg_done(struct p
+ {
+ 	int retval;
+ 
++	if (phydev->drv->aneg_done)
++		return phydev->drv->aneg_done(phydev);
++
+ 	retval = phy_read(phydev, MII_BMSR);
+ 
+ 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/trunk/target/linux/generic/patches-3.13/703-phy-add-detach-callback-to-struct-phy_driver.patch b/trunk/target/linux/generic/patches-3.13/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 00000000..2b628d1f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++	if (phydev->drv && phydev->drv->detach)
++		phydev->drv->detach(phydev);
++
+ 	phydev->attached_dev->phydev = NULL;
+ 	phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -436,6 +436,12 @@ struct phy_driver {
+ 	 */
+ 	int (*did_interrupt)(struct phy_device *phydev);
+ 
++	/*
++	 * Called before an ethernet device is detached
++	 * from the PHY.
++	 */
++	void (*detach)(struct phy_device *phydev);
++
+ 	/* Clears up any memory if needed */
+ 	void (*remove)(struct phy_device *phydev);
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/710-phy-add-mdio_register_board_info.patch b/trunk/target/linux/generic/patches-3.13/710-phy-add-mdio_register_board_info.patch
new file mode 100644
index 00000000..a5109b79
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/710-phy-add-mdio_register_board_info.patch
@@ -0,0 +1,191 @@
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -41,6 +41,8 @@
+ #include <asm/irq.h>
+ #include <asm/uaccess.h>
+ 
++#include "mdio-boardinfo.h"
++
+ /**
+  * mdiobus_alloc_size - allocate a mii_bus structure
+  * @size: extra amount of memory to allocate for private storage.
+@@ -229,15 +231,33 @@ void mdiobus_free(struct mii_bus *bus)
+ }
+ EXPORT_SYMBOL(mdiobus_free);
+ 
++static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus,
++						struct phy_device *phydev,
++						struct mdio_board_info *bi)
++{
++	if (strcmp(bus->id, bi->bus_id) ||
++	    bi->phy_addr != phydev->addr)
++	    return;
++
++	phydev->dev.platform_data = (void *) bi->platform_data;
++}
++
+ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
+ {
+ 	struct phy_device *phydev;
++	struct mdio_board_entry *be;
+ 	int err;
+ 
+ 	phydev = get_phy_device(bus, addr, false);
+ 	if (IS_ERR(phydev) || phydev == NULL)
+ 		return phydev;
+ 
++	mutex_lock(&__mdio_board_lock);
++	list_for_each_entry(be, &__mdio_board_list, list)
++		mdiobus_setup_phydev_from_boardinfo(bus, phydev,
++						    &be->board_info);
++	mutex_unlock(&__mdio_board_lock);
++
+ 	err = phy_device_register(phydev);
+ 	if (err) {
+ 		phy_device_free(phydev);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -619,4 +619,22 @@ int __init mdio_bus_init(void);
+ void mdio_bus_exit(void);
+ 
+ extern struct bus_type mdio_bus_type;
++
++struct mdio_board_info {
++	const char	*bus_id;
++	int		phy_addr;
++
++	const void	*platform_data;
++};
++
++#ifdef CONFIG_MDIO_BOARDINFO
++int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n);
++#else
++static inline int
++mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n)
++{
++	return 0;
++}
++#endif
++
+ #endif /* __PHY_H */
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,10 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config MDIO_BOARDINFO
++	bool
++	default y
++
+ config SWCONFIG
+ 	tristate "Switch configuration API"
+ 	---help---
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -2,6 +2,8 @@
+ 
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
++obj-$(CONFIG_MDIO_BOARDINFO)	+= mdio-boardinfo.o
++
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
+ obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.c
+@@ -0,0 +1,58 @@
++/*
++ * mdio-boardinfo.c - collect pre-declarations of PHY devices
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/phy.h>
++#include <linux/slab.h>
++#include <linux/export.h>
++#include <linux/mutex.h>
++#include <linux/phy.h>
++
++#include "mdio-boardinfo.h"
++
++/*
++ * These symbols are exported ONLY FOR the mdio_bus component.
++ * No other users will be supported.
++ */
++
++LIST_HEAD(__mdio_board_list);
++EXPORT_SYMBOL_GPL(__mdio_board_list);
++
++DEFINE_MUTEX(__mdio_board_lock);
++EXPORT_SYMBOL_GPL(__mdio_board_lock);
++
++/**
++ * mdio_register_board_info - register PHY devices for a given board
++ * @info: array of chip descriptors
++ * @n: how many descriptors are provided
++ * Context: can sleep
++ *
++ * The board info passed can safely be __initdata ... but be careful of
++ * any embedded pointers (platform_data, etc), they're copied as-is.
++ */
++int __init
++mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n)
++{
++	struct mdio_board_entry *be;
++	int i;
++
++	be = kzalloc(n * sizeof(*be), GFP_KERNEL);
++	if (!be)
++		return -ENOMEM;
++
++	for (i = 0; i < n; i++, be++, info++) {
++		memcpy(&be->board_info, info, sizeof(*info));
++		mutex_lock(&__mdio_board_lock);
++		list_add_tail(&be->list, &__mdio_board_list);
++		mutex_unlock(&__mdio_board_lock);
++	}
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.h
+@@ -0,0 +1,22 @@
++/*
++ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/mutex.h>
++
++struct mdio_board_entry {
++	struct list_head	list;
++	struct mdio_board_info	board_info;
++};
++
++/* __mdio_board_lock protects __mdio_board_list
++ * only mdio_bus components are allowed to use these symbols.
++ */
++extern struct mutex __mdio_board_lock;
++extern struct list_head __mdio_board_list;
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -15,7 +15,7 @@ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_NET) += Space.o loopback.o
+ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+-obj-$(CONFIG_PHYLIB) += phy/
++obj-y += phy/
+ obj-$(CONFIG_RIONET) += rionet.o
+ obj-$(CONFIG_NET_TEAM) += team/
+ obj-$(CONFIG_TUN) += tun.o
diff --git a/trunk/target/linux/generic/patches-3.13/720-phy_adm6996.patch b/trunk/target/linux/generic/patches-3.13/720-phy_adm6996.patch
new file mode 100644
index 00000000..65b206da
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/720-phy_adm6996.patch
@@ -0,0 +1,26 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -120,6 +120,13 @@ config MICREL_PHY
+ 	---help---
+ 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
+ 
++config ADM6996_PHY
++	tristate "Driver for ADM6996 switches"
++	select SWCONFIG
++	---help---
++	  Currently supports the ADM6996FC and ADM6996M switches.
++	  Support for FC is very limited.
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
++obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.13/721-phy_packets.patch b/trunk/target/linux/generic/patches-3.13/721-phy_packets.patch
new file mode 100644
index 00000000..e781f765
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/721-phy_packets.patch
@@ -0,0 +1,153 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -1227,6 +1227,11 @@ struct net_device {
+ 	const struct ethtool_ops *ethtool_ops;
+ 	const struct forwarding_accel_ops *fwd_ops;
+ 
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
++	struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
++#endif
++
+ 	/* Hardware header description */
+ 	const struct header_ops *header_ops;
+ 
+@@ -1292,6 +1297,9 @@ struct net_device {
+ 	void			*ax25_ptr;	/* AX.25 specific data */
+ 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
+ 						   assign before registering */
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void			*phy_ptr; /* PHY device specific data */
++#endif
+ 
+ /*
+  * Cache lines mostly used on receive path (including eth_type_trans())
+--- a/include/uapi/linux/if.h
++++ b/include/uapi/linux/if.h
+@@ -84,6 +84,7 @@
+ #define IFF_LIVE_ADDR_CHANGE 0x100000	/* device supports hardware address
+ 					 * change when it's running */
+ #define IFF_MACVLAN 0x200000		/* Macvlan device */
++#define IFF_NO_IP_ALIGN	0x400000	/* do not ip-align allocated rx pkts */
+ 
+ 
+ #define IF_GET_IFACE	0x0001		/* for querying only */
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1776,6 +1776,10 @@ static inline int pskb_trim(struct sk_bu
+ 	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
+ }
+ 
++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp);
++
++
+ /**
+  *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
+  *	@skb: buffer to alter
+@@ -1902,16 +1906,6 @@ static inline struct sk_buff *dev_alloc_
+ }
+ 
+ 
+-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
+-		unsigned int length, gfp_t gfp)
+-{
+-	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
+-
+-	if (NET_IP_ALIGN && skb)
+-		skb_reserve(skb, NET_IP_ALIGN);
+-	return skb;
+-}
+-
+ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+ 		unsigned int length)
+ {
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -24,6 +24,12 @@ menuconfig NET
+ 
+ if NET
+ 
++config ETHERNET_PACKET_MANGLE
++	bool
++	help
++	  This option can be selected by phy drivers that need to mangle
++	  packets going in or out of an ethernet device.
++
+ config WANT_COMPAT_NETLINK_MESSAGES
+ 	bool
+ 	help
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2606,10 +2606,20 @@ int dev_hard_start_xmit(struct sk_buff *
+ 		if (!list_empty(&ptype_all))
+ 			dev_queue_xmit_nit(skb, dev);
+ 
+-		skb_len = skb->len;
+-			rc = ops->ndo_start_xmit(skb, dev);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = skb->len;
++				rc = ops->ndo_start_xmit(skb, dev);
+ 
+-		trace_net_dev_xmit(skb, rc, dev, skb_len);
++			trace_net_dev_xmit(skb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (rc == NETDEV_TX_OK)
+ 			txq_trans_update(txq);
+ 		return rc;
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -62,6 +62,7 @@
+ #include <linux/scatterlist.h>
+ #include <linux/errqueue.h>
+ #include <linux/prefetch.h>
++#include <linux/if.h>
+ 
+ #include <net/protocol.h>
+ #include <net/dst.h>
+@@ -438,6 +439,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+ }
+ EXPORT_SYMBOL(__netdev_alloc_skb);
+ 
++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp)
++{
++	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
++		return skb;
++#endif
++
++	if (NET_IP_ALIGN && skb)
++		skb_reserve(skb, NET_IP_ALIGN);
++	return skb;
++}
++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
++
+ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 		     int size, unsigned int truesize)
+ {
+--- a/net/ethernet/eth.c
++++ b/net/ethernet/eth.c
+@@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+ 	struct ethhdr *eth;
+ 
+ 	skb->dev = dev;
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev->eth_mangle_rx)
++		dev->eth_mangle_rx(dev, skb);
++#endif
++
+ 	skb_reset_mac_header(skb);
+ 	skb_pull_inline(skb, ETH_HLEN);
+ 	eth = eth_hdr(skb);
diff --git a/trunk/target/linux/generic/patches-3.13/722-phy_mvswitch.patch b/trunk/target/linux/generic/patches-3.13/722-phy_mvswitch.patch
new file mode 100644
index 00000000..d7c3d759
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/722-phy_mvswitch.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -127,6 +127,10 @@ config ADM6996_PHY
+ 	  Currently supports the ADM6996FC and ADM6996M switches.
+ 	  Support for FC is very limited.
+ 
++config MVSWITCH_PHY
++	tristate "Driver for Marvell 88E6060 switches"
++	select ETHERNET_PACKET_MANGLE
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
++obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.13/723-phy_ip175c.patch b/trunk/target/linux/generic/patches-3.13/723-phy_ip175c.patch
new file mode 100644
index 00000000..5e3f6b46
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/723-phy_ip175c.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -131,6 +131,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config IP17XX_PHY
++	tristate "Driver for IC+ IP17xx switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.13/724-phy_ar8216.patch b/trunk/target/linux/generic/patches-3.13/724-phy_ar8216.patch
new file mode 100644
index 00000000..d3b238ef
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/724-phy_ar8216.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -135,6 +135,11 @@ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+ 
++config AR8216_PHY
++	tristate "Driver for Atheros AR8216 switches"
++	select ETHERNET_PACKET_MANGLE
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.13/725-phy_rtl8306.patch b/trunk/target/linux/generic/patches-3.13/725-phy_rtl8306.patch
new file mode 100644
index 00000000..56899a70
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/725-phy_rtl8306.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -140,6 +140,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config RTL8306_PHY
++	tristate "Driver for Realtek RTL8306S switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.13/726-phy_rtl8366.patch b/trunk/target/linux/generic/patches-3.13/726-phy_rtl8366.patch
new file mode 100644
index 00000000..52ef6108
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/726-phy_rtl8366.patch
@@ -0,0 +1,45 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -231,6 +231,30 @@ config MDIO_BUS_MUX_MMIOREG
+ 
+ 	  Currently, only 8-bit registers are supported.
+ 
++config RTL8366_SMI
++	tristate "Driver for the RTL8366 SMI interface"
++	depends on GPIOLIB
++	---help---
++	  This module implements the SMI interface protocol which is used
++	  by some RTL8366 ethernet switch devices via the generic GPIO API.
++
++if RTL8366_SMI
++
++config RTL8366_SMI_DEBUG_FS
++	bool "RTL8366 SMI interface debugfs support"
++        depends on DEBUG_FS
++        default n
++
++config RTL8366S_PHY
++	tristate "Driver for the Realtek RTL8366S switch"
++	select SWCONFIG
++
++config RTL8366RB_PHY
++	tristate "Driver for the Realtek RTL8366RB switch"
++	select SWCONFIG
++
++endif # RTL8366_SMI
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
++obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
++obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.13/727-phy-rtl8367.patch b/trunk/target/linux/generic/patches-3.13/727-phy-rtl8367.patch
new file mode 100644
index 00000000..dfae770b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/727-phy-rtl8367.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -253,6 +253,10 @@ config RTL8366RB_PHY
+ 	tristate "Driver for the Realtek RTL8366RB switch"
+ 	select SWCONFIG
+ 
++config RTL8367_PHY
++	tristate "Driver for the Realtek RTL8367R/M switches"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
++obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.13/728-phy-micrel.patch b/trunk/target/linux/generic/patches-3.13/728-phy-micrel.patch
new file mode 100644
index 00000000..baf5a4a7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/728-phy-micrel.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -144,6 +144,11 @@ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
+ 
++config MICREL_PHY
++	tristate "Drivers for Micrel/Kendin PHYs"
++	---help---
++	  Currently has a driver for the KSZ8041
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
++obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.13/729-phy-rtl8367b.patch b/trunk/target/linux/generic/patches-3.13/729-phy-rtl8367b.patch
new file mode 100644
index 00000000..d69fc89e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/729-phy-rtl8367b.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -262,6 +262,10 @@ config RTL8367_PHY
+ 	tristate "Driver for the Realtek RTL8367R/M switches"
+ 	select SWCONFIG
+ 
++config RTL8367B_PHY
++	tristate "Driver fot the Realtek RTL8367R-VB switch"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
++obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.13/729-phy-tantos.patch b/trunk/target/linux/generic/patches-3.13/729-phy-tantos.patch
new file mode 100644
index 00000000..4a9fe873
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/729-phy-tantos.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -273,3 +273,8 @@ endif # PHYLIB
+ config MICREL_KS8995MA
+ 	tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
+ 	depends on SPI
++
++config PSB6970_PHY
++	tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
++	select SWCONFIG
++	select ETHERNET_PACKET_MANGLE
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -30,6 +30,7 @@ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
++obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.13/730-phy_b53.patch b/trunk/target/linux/generic/patches-3.13/730-phy_b53.patch
new file mode 100644
index 00000000..cd58182f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/730-phy_b53.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -268,6 +268,8 @@ config RTL8367B_PHY
+ 
+ endif # RTL8366_SMI
+ 
++source "drivers/net/phy/b53/Kconfig"
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -31,6 +31,7 @@ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
++obj-$(CONFIG_B53)		+= b53/
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.13/731-phy_mvswitch_3.10_compilation.patch b/trunk/target/linux/generic/patches-3.13/731-phy_mvswitch_3.10_compilation.patch
new file mode 100644
index 00000000..2053bd2f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/731-phy_mvswitch_3.10_compilation.patch
@@ -0,0 +1,35 @@
+From e6a5abb9a02be0bceb4782d9f736bfb4ae217505 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sat, 21 Sep 2013 13:56:51 +0200
+Subject: [PATCH] phy: mvswitch: fix 3.10 compilation
+
+Update to API changes in 3.10.
+
+Signed-off-by: Jonas Gorsi <jogo@openwrt.org>
+---
+ target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/phy/mvswitch.c
++++ b/drivers/net/phy/mvswitch.c
+@@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de
+ 	if (vlan == -1)
+ 		return;
+ 
+-	__vlan_hwaccel_put_tag(skb, vlan);
++	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
+ }
+ 
+ 
+@@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
+ 
+ #ifdef HEADER_MODE
+ 	dev->priv_flags |= IFF_NO_IP_ALIGN;
+-	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
+ #else
+-	dev->features |= NETIF_F_HW_VLAN_RX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
+ #endif
+ 
+ 	return 0;
diff --git a/trunk/target/linux/generic/patches-3.13/732-phy-ar8216-led-support.patch b/trunk/target/linux/generic/patches-3.13/732-phy-ar8216-led-support.patch
new file mode 100644
index 00000000..76c4afcd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/732-phy-ar8216-led-support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -140,6 +140,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config AR8216_PHY_LEDS
++	bool "Atheros AR8216 switch LED support"
++	depends on (AR8216_PHY && LEDS_CLASS)
++
+ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
diff --git a/trunk/target/linux/generic/patches-3.13/750-hostap_txpower.patch b/trunk/target/linux/generic/patches-3.13/750-hostap_txpower.patch
new file mode 100644
index 00000000..768c80f7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/750-hostap_txpower.patch
@@ -0,0 +1,154 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t
+ 		addr[count].sa_family = ARPHRD_ETHER;
+ 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+ 		if (sta->last_rx_silence == 0)
+-			qual[count].qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			qual[count].qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+ 		qual[count].updated = sta->last_rx_updated;
+ 
+ 		sta->last_rx_updated = IW_QUAL_DBM;
+@@ -2475,13 +2475,13 @@ int prism2_ap_translate_scan(struct net_
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = IWEVQUAL;
+ 		if (sta->last_rx_silence == 0)
+-			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			iwe.u.qual.qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+ 		iwe.u.qual.updated = sta->last_rx_updated;
+ 		iwe.len = IW_EV_QUAL_LEN;
+ 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++#define RAW_TXPOWER_SETTING
++
+ #endif /* HOSTAP_CONFIG_H */
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;
+ 
+ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++int hostap_restore_power(struct net_device *dev);
+ 
+ 
+ #endif /* HOSTAP_H */
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -928,6 +928,7 @@ static int hfa384x_set_rid(struct net_de
+ 			prism2_hw_reset(dev);
+ 	}
+ 
++	hostap_restore_power(dev);
+ 	return res;
+ }
+ 
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -435,6 +435,11 @@ static void handle_info_queue_linkstatus
+ 	}
+ 
+ 	/* Get BSSID if we have a valid AP address */
++
++	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++	     val == HFA384X_LINKSTATUS_DISCONNECTED )
++			hostap_restore_power(local->dev);
++
+ 	if (connected) {
+ 		netif_carrier_on(local->dev);
+ 		netif_carrier_on(local->ddev);
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1479,23 +1479,20 @@ static int prism2_txpower_hfa386x_to_dBm
+ 		val = 255;
+ 
+ 	tmp = val;
+-	tmp >>= 2;
+ 
+-	return -12 - tmp;
++	return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+ 	signed char tmp;
+ 
+-	if (val > 20)
+-		return 128;
+-	else if (val < -43)
++	if (val > 127)
+ 		return 127;
++	else if (val < -128)
++		return 128;
+ 
+ 	tmp = val;
+-	tmp = -12 - tmp;
+-	tmp <<= 2;
+ 
+ 	return (unsigned char) tmp;
+ }
+@@ -4052,3 +4049,35 @@ int hostap_ioctl(struct net_device *dev,
+ 
+ 	return ret;
+ }
++
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = netdev_priv(dev);
++       local_info_t *local = iface->local;
++
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
++EXPORT_SYMBOL(hostap_restore_power);
diff --git a/trunk/target/linux/generic/patches-3.13/770-bgmac-backport.patch b/trunk/target/linux/generic/patches-3.13/770-bgmac-backport.patch
new file mode 100644
index 00000000..01ab0efc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/770-bgmac-backport.patch
@@ -0,0 +1,748 @@
+--- a/drivers/net/ethernet/broadcom/Kconfig
++++ b/drivers/net/ethernet/broadcom/Kconfig
+@@ -23,6 +23,7 @@ config B44
+ 	depends on SSB_POSSIBLE && HAS_DMA
+ 	select SSB
+ 	select MII
++	select PHYLIB
+ 	---help---
+ 	  If you have a network (Ethernet) controller of this type, say Y
+ 	  or M and read the Ethernet-HOWTO, available from
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -96,6 +96,19 @@ static void bgmac_dma_tx_enable(struct b
+ 	u32 ctl;
+ 
+ 	ctl = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_TX_CTL);
++	if (bgmac->core->id.rev >= 4) {
++		ctl &= ~BGMAC_DMA_TX_BL_MASK;
++		ctl |= BGMAC_DMA_TX_BL_128 << BGMAC_DMA_TX_BL_SHIFT;
++
++		ctl &= ~BGMAC_DMA_TX_MR_MASK;
++		ctl |= BGMAC_DMA_TX_MR_2 << BGMAC_DMA_TX_MR_SHIFT;
++
++		ctl &= ~BGMAC_DMA_TX_PC_MASK;
++		ctl |= BGMAC_DMA_TX_PC_16 << BGMAC_DMA_TX_PC_SHIFT;
++
++		ctl &= ~BGMAC_DMA_TX_PT_MASK;
++		ctl |= BGMAC_DMA_TX_PT_8 << BGMAC_DMA_TX_PT_SHIFT;
++	}
+ 	ctl |= BGMAC_DMA_TX_ENABLE;
+ 	ctl |= BGMAC_DMA_TX_PARITY_DISABLE;
+ 	bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_TX_CTL, ctl);
+@@ -240,6 +253,16 @@ static void bgmac_dma_rx_enable(struct b
+ 	u32 ctl;
+ 
+ 	ctl = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL);
++	if (bgmac->core->id.rev >= 4) {
++		ctl &= ~BGMAC_DMA_RX_BL_MASK;
++		ctl |= BGMAC_DMA_RX_BL_128 << BGMAC_DMA_RX_BL_SHIFT;
++
++		ctl &= ~BGMAC_DMA_RX_PC_MASK;
++		ctl |= BGMAC_DMA_RX_PC_8 << BGMAC_DMA_RX_PC_SHIFT;
++
++		ctl &= ~BGMAC_DMA_RX_PT_MASK;
++		ctl |= BGMAC_DMA_RX_PT_1 << BGMAC_DMA_RX_PT_SHIFT;
++	}
+ 	ctl &= BGMAC_DMA_RX_ADDREXT_MASK;
+ 	ctl |= BGMAC_DMA_RX_ENABLE;
+ 	ctl |= BGMAC_DMA_RX_PARITY_DISABLE;
+@@ -682,70 +705,6 @@ static int bgmac_phy_write(struct bgmac
+ 	return 0;
+ }
+ 
+-/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyforce */
+-static void bgmac_phy_force(struct bgmac *bgmac)
+-{
+-	u16 ctl;
+-	u16 mask = ~(BGMAC_PHY_CTL_SPEED | BGMAC_PHY_CTL_SPEED_MSB |
+-		     BGMAC_PHY_CTL_ANENAB | BGMAC_PHY_CTL_DUPLEX);
+-
+-	if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+-		return;
+-
+-	if (bgmac->autoneg)
+-		return;
+-
+-	ctl = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL);
+-	ctl &= mask;
+-	if (bgmac->full_duplex)
+-		ctl |= BGMAC_PHY_CTL_DUPLEX;
+-	if (bgmac->speed == BGMAC_SPEED_100)
+-		ctl |= BGMAC_PHY_CTL_SPEED_100;
+-	else if (bgmac->speed == BGMAC_SPEED_1000)
+-		ctl |= BGMAC_PHY_CTL_SPEED_1000;
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL, ctl);
+-}
+-
+-/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyadvertise */
+-static void bgmac_phy_advertise(struct bgmac *bgmac)
+-{
+-	u16 adv;
+-
+-	if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+-		return;
+-
+-	if (!bgmac->autoneg)
+-		return;
+-
+-	/* Adv selected 10/100 speeds */
+-	adv = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV);
+-	adv &= ~(BGMAC_PHY_ADV_10HALF | BGMAC_PHY_ADV_10FULL |
+-		 BGMAC_PHY_ADV_100HALF | BGMAC_PHY_ADV_100FULL);
+-	if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_10)
+-		adv |= BGMAC_PHY_ADV_10HALF;
+-	if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_100)
+-		adv |= BGMAC_PHY_ADV_100HALF;
+-	if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_10)
+-		adv |= BGMAC_PHY_ADV_10FULL;
+-	if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_100)
+-		adv |= BGMAC_PHY_ADV_100FULL;
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV, adv);
+-
+-	/* Adv selected 1000 speeds */
+-	adv = bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV2);
+-	adv &= ~(BGMAC_PHY_ADV2_1000HALF | BGMAC_PHY_ADV2_1000FULL);
+-	if (!bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_1000)
+-		adv |= BGMAC_PHY_ADV2_1000HALF;
+-	if (bgmac->full_duplex && bgmac->speed & BGMAC_SPEED_1000)
+-		adv |= BGMAC_PHY_ADV2_1000FULL;
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_ADV2, adv);
+-
+-	/* Restart */
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL,
+-			bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL) |
+-			BGMAC_PHY_CTL_RESTART);
+-}
+-
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyinit */
+ static void bgmac_phy_init(struct bgmac *bgmac)
+ {
+@@ -789,11 +748,9 @@ static void bgmac_phy_reset(struct bgmac
+ 	if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+ 		return;
+ 
+-	bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL,
+-			BGMAC_PHY_CTL_RESET);
++	bgmac_phy_write(bgmac, bgmac->phyaddr, MII_BMCR, BMCR_RESET);
+ 	udelay(100);
+-	if (bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL) &
+-	    BGMAC_PHY_CTL_RESET)
++	if (bgmac_phy_read(bgmac, bgmac->phyaddr, MII_BMCR) & BMCR_RESET)
+ 		bgmac_err(bgmac, "PHY reset failed\n");
+ 	bgmac_phy_init(bgmac);
+ }
+@@ -811,13 +768,13 @@ static void bgmac_cmdcfg_maskset(struct
+ 	u32 cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);
+ 	u32 new_val = (cmdcfg & mask) | set;
+ 
+-	bgmac_set(bgmac, BGMAC_CMDCFG, BGMAC_CMDCFG_SR);
++	bgmac_set(bgmac, BGMAC_CMDCFG, BGMAC_CMDCFG_SR(bgmac->core->id.rev));
+ 	udelay(2);
+ 
+ 	if (new_val != cmdcfg || force)
+ 		bgmac_write(bgmac, BGMAC_CMDCFG, new_val);
+ 
+-	bgmac_mask(bgmac, BGMAC_CMDCFG, ~BGMAC_CMDCFG_SR);
++	bgmac_mask(bgmac, BGMAC_CMDCFG, ~BGMAC_CMDCFG_SR(bgmac->core->id.rev));
+ 	udelay(2);
+ }
+ 
+@@ -876,31 +833,56 @@ static void bgmac_clear_mib(struct bgmac
+ }
+ 
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_speed */
+-static void bgmac_speed(struct bgmac *bgmac, int speed)
++static void bgmac_mac_speed(struct bgmac *bgmac)
+ {
+ 	u32 mask = ~(BGMAC_CMDCFG_ES_MASK | BGMAC_CMDCFG_HD);
+ 	u32 set = 0;
+ 
+-	if (speed & BGMAC_SPEED_10)
++	switch (bgmac->mac_speed) {
++	case SPEED_10:
+ 		set |= BGMAC_CMDCFG_ES_10;
+-	if (speed & BGMAC_SPEED_100)
++		break;
++	case SPEED_100:
+ 		set |= BGMAC_CMDCFG_ES_100;
+-	if (speed & BGMAC_SPEED_1000)
++		break;
++	case SPEED_1000:
+ 		set |= BGMAC_CMDCFG_ES_1000;
+-	if (!bgmac->full_duplex)
++		break;
++	case SPEED_2500:
++		set |= BGMAC_CMDCFG_ES_2500;
++		break;
++	default:
++		bgmac_err(bgmac, "Unsupported speed: %d\n", bgmac->mac_speed);
++	}
++
++	if (bgmac->mac_duplex == DUPLEX_HALF)
+ 		set |= BGMAC_CMDCFG_HD;
++
+ 	bgmac_cmdcfg_maskset(bgmac, mask, set, true);
+ }
+ 
+ static void bgmac_miiconfig(struct bgmac *bgmac)
+ {
+-	u8 imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
+-			BGMAC_DS_MM_SHIFT;
+-	if (imode == 0 || imode == 1) {
+-		if (bgmac->autoneg)
+-			bgmac_speed(bgmac, BGMAC_SPEED_100);
+-		else
+-			bgmac_speed(bgmac, bgmac->speed);
++	struct bcma_device *core = bgmac->core;
++	struct bcma_chipinfo *ci = &core->bus->chipinfo;
++	u8 imode;
++
++	if (ci->id == BCMA_CHIP_ID_BCM4707 ||
++	    ci->id == BCMA_CHIP_ID_BCM53018) {
++		bcma_awrite32(core, BCMA_IOCTL,
++			      bcma_aread32(core, BCMA_IOCTL) | 0x40 |
++			      BGMAC_BCMA_IOCTL_SW_CLKEN);
++		bgmac->mac_speed = SPEED_2500;
++		bgmac->mac_duplex = DUPLEX_FULL;
++		bgmac_mac_speed(bgmac);
++	} else {
++		imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) &
++			BGMAC_DS_MM_MASK) >> BGMAC_DS_MM_SHIFT;
++		if (imode == 0 || imode == 1) {
++			bgmac->mac_speed = SPEED_100;
++			bgmac->mac_duplex = DUPLEX_FULL;
++			bgmac_mac_speed(bgmac);
++		}
+ 	}
+ }
+ 
+@@ -910,7 +892,7 @@ static void bgmac_chip_reset(struct bgma
+ 	struct bcma_device *core = bgmac->core;
+ 	struct bcma_bus *bus = core->bus;
+ 	struct bcma_chipinfo *ci = &bus->chipinfo;
+-	u32 flags = 0;
++	u32 flags;
+ 	u32 iost;
+ 	int i;
+ 
+@@ -933,26 +915,36 @@ static void bgmac_chip_reset(struct bgma
+ 	}
+ 
+ 	iost = bcma_aread32(core, BCMA_IOST);
+-	if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 10) ||
++	if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) ||
+ 	    (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg == 10) ||
+-	    (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9))
++	    (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
+ 		iost &= ~BGMAC_BCMA_IOST_ATTACHED;
+ 
+-	if (iost & BGMAC_BCMA_IOST_ATTACHED) {
+-		flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
+-		if (!bgmac->has_robosw)
+-			flags |= BGMAC_BCMA_IOCTL_SW_RESET;
++	/* 3GMAC: for BCM4707, only do core reset at bgmac_probe() */
++	if (ci->id != BCMA_CHIP_ID_BCM4707) {
++		flags = 0;
++		if (iost & BGMAC_BCMA_IOST_ATTACHED) {
++			flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
++			if (!bgmac->has_robosw)
++				flags |= BGMAC_BCMA_IOCTL_SW_RESET;
++		}
++		bcma_core_enable(core, flags);
+ 	}
+ 
+-	bcma_core_enable(core, flags);
+-
+-	if (core->id.rev > 2) {
+-		bgmac_set(bgmac, BCMA_CLKCTLST, 1 << 8);
+-		bgmac_wait_value(bgmac->core, BCMA_CLKCTLST, 1 << 24, 1 << 24,
++	/* Request Misc PLL for corerev > 2 */
++	if (core->id.rev > 2 &&
++	    ci->id != BCMA_CHIP_ID_BCM4707 &&
++	    ci->id != BCMA_CHIP_ID_BCM53018) {
++		bgmac_set(bgmac, BCMA_CLKCTLST,
++			  BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ);
++		bgmac_wait_value(bgmac->core, BCMA_CLKCTLST,
++				 BGMAC_BCMA_CLKCTLST_MISC_PLL_ST,
++				 BGMAC_BCMA_CLKCTLST_MISC_PLL_ST,
+ 				 1000);
+ 	}
+ 
+-	if (ci->id == BCMA_CHIP_ID_BCM5357 || ci->id == BCMA_CHIP_ID_BCM4749 ||
++	if (ci->id == BCMA_CHIP_ID_BCM5357 ||
++	    ci->id == BCMA_CHIP_ID_BCM4749 ||
+ 	    ci->id == BCMA_CHIP_ID_BCM53572) {
+ 		struct bcma_drv_cc *cc = &bgmac->core->bus->drv_cc;
+ 		u8 et_swtype = 0;
+@@ -967,10 +959,11 @@ static void bgmac_chip_reset(struct bgma
+ 			et_swtype &= 0x0f;
+ 			et_swtype <<= 4;
+ 			sw_type = et_swtype;
+-		} else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == 9) {
++		} else if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM5358) {
+ 			sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII;
+-		} else if ((ci->id != BCMA_CHIP_ID_BCM53572 && ci->pkg == 10) ||
+-			   (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == 9)) {
++		} else if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) ||
++			   (ci->id == BCMA_CHIP_ID_BCM4749 && ci->pkg == 10) ||
++			   (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188)) {
+ 			sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
+ 				  BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
+ 		}
+@@ -1007,8 +1000,10 @@ static void bgmac_chip_reset(struct bgma
+ 			     BGMAC_CMDCFG_PROM |
+ 			     BGMAC_CMDCFG_NLC |
+ 			     BGMAC_CMDCFG_CFE |
+-			     BGMAC_CMDCFG_SR,
++			     BGMAC_CMDCFG_SR(core->id.rev),
+ 			     false);
++	bgmac->mac_speed = SPEED_UNKNOWN;
++	bgmac->mac_duplex = DUPLEX_UNKNOWN;
+ 
+ 	bgmac_clear_mib(bgmac);
+ 	if (core->id.id == BCMA_CORE_4706_MAC_GBIT)
+@@ -1048,7 +1043,7 @@ static void bgmac_enable(struct bgmac *b
+ 
+ 	cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);
+ 	bgmac_cmdcfg_maskset(bgmac, ~(BGMAC_CMDCFG_TE | BGMAC_CMDCFG_RE),
+-			     BGMAC_CMDCFG_SR, true);
++			     BGMAC_CMDCFG_SR(bgmac->core->id.rev), true);
+ 	udelay(2);
+ 	cmdcfg |= BGMAC_CMDCFG_TE | BGMAC_CMDCFG_RE;
+ 	bgmac_write(bgmac, BGMAC_CMDCFG, cmdcfg);
+@@ -1077,12 +1072,16 @@ static void bgmac_enable(struct bgmac *b
+ 		break;
+ 	}
+ 
+-	rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
+-	rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
+-	bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) / 1000000;
+-	mdp = (bp_clk * 128 / 1000) - 3;
+-	rxq_ctl |= (mdp << BGMAC_RXQ_CTL_MDP_SHIFT);
+-	bgmac_write(bgmac, BGMAC_RXQ_CTL, rxq_ctl);
++	if (ci->id != BCMA_CHIP_ID_BCM4707 &&
++	    ci->id != BCMA_CHIP_ID_BCM53018) {
++		rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
++		rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
++		bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) /
++				1000000;
++		mdp = (bp_clk * 128 / 1000) - 3;
++		rxq_ctl |= (mdp << BGMAC_RXQ_CTL_MDP_SHIFT);
++		bgmac_write(bgmac, BGMAC_RXQ_CTL, rxq_ctl);
++	}
+ }
+ 
+ /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipinit */
+@@ -1108,13 +1107,6 @@ static void bgmac_chip_init(struct bgmac
+ 
+ 	bgmac_write(bgmac, BGMAC_RXMAX_LENGTH, 32 + ETHER_MAX_LEN);
+ 
+-	if (!bgmac->autoneg) {
+-		bgmac_speed(bgmac, bgmac->speed);
+-		bgmac_phy_force(bgmac);
+-	} else if (bgmac->speed) { /* if there is anything to adv */
+-		bgmac_phy_advertise(bgmac);
+-	}
+-
+ 	if (full_init) {
+ 		bgmac_dma_init(bgmac);
+ 		if (1) /* FIXME: is there any case we don't want IRQs? */
+@@ -1204,6 +1196,8 @@ static int bgmac_open(struct net_device
+ 	}
+ 	napi_enable(&bgmac->napi);
+ 
++	phy_start(bgmac->phy_dev);
++
+ 	netif_carrier_on(net_dev);
+ 
+ err_out:
+@@ -1216,6 +1210,8 @@ static int bgmac_stop(struct net_device
+ 
+ 	netif_carrier_off(net_dev);
+ 
++	phy_stop(bgmac->phy_dev);
++
+ 	napi_disable(&bgmac->napi);
+ 	bgmac_chip_intrs_off(bgmac);
+ 	free_irq(bgmac->core->irq, net_dev);
+@@ -1252,27 +1248,11 @@ static int bgmac_set_mac_address(struct
+ static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
+ {
+ 	struct bgmac *bgmac = netdev_priv(net_dev);
+-	struct mii_ioctl_data *data = if_mii(ifr);
+ 
+-	switch (cmd) {
+-	case SIOCGMIIPHY:
+-		data->phy_id = bgmac->phyaddr;
+-		/* fallthru */
+-	case SIOCGMIIREG:
+-		if (!netif_running(net_dev))
+-			return -EAGAIN;
+-		data->val_out = bgmac_phy_read(bgmac, data->phy_id,
+-					       data->reg_num & 0x1f);
+-		return 0;
+-	case SIOCSMIIREG:
+-		if (!netif_running(net_dev))
+-			return -EAGAIN;
+-		bgmac_phy_write(bgmac, data->phy_id, data->reg_num & 0x1f,
+-				data->val_in);
+-		return 0;
+-	default:
+-		return -EOPNOTSUPP;
+-	}
++	if (!netif_running(net_dev))
++		return -EINVAL;
++
++	return phy_mii_ioctl(bgmac->phy_dev, ifr, cmd);
+ }
+ 
+ static const struct net_device_ops bgmac_netdev_ops = {
+@@ -1294,61 +1274,16 @@ static int bgmac_get_settings(struct net
+ {
+ 	struct bgmac *bgmac = netdev_priv(net_dev);
+ 
+-	cmd->supported = SUPPORTED_10baseT_Half |
+-			 SUPPORTED_10baseT_Full |
+-			 SUPPORTED_100baseT_Half |
+-			 SUPPORTED_100baseT_Full |
+-			 SUPPORTED_1000baseT_Half |
+-			 SUPPORTED_1000baseT_Full |
+-			 SUPPORTED_Autoneg;
+-
+-	if (bgmac->autoneg) {
+-		WARN_ON(cmd->advertising);
+-		if (bgmac->full_duplex) {
+-			if (bgmac->speed & BGMAC_SPEED_10)
+-				cmd->advertising |= ADVERTISED_10baseT_Full;
+-			if (bgmac->speed & BGMAC_SPEED_100)
+-				cmd->advertising |= ADVERTISED_100baseT_Full;
+-			if (bgmac->speed & BGMAC_SPEED_1000)
+-				cmd->advertising |= ADVERTISED_1000baseT_Full;
+-		} else {
+-			if (bgmac->speed & BGMAC_SPEED_10)
+-				cmd->advertising |= ADVERTISED_10baseT_Half;
+-			if (bgmac->speed & BGMAC_SPEED_100)
+-				cmd->advertising |= ADVERTISED_100baseT_Half;
+-			if (bgmac->speed & BGMAC_SPEED_1000)
+-				cmd->advertising |= ADVERTISED_1000baseT_Half;
+-		}
+-	} else {
+-		switch (bgmac->speed) {
+-		case BGMAC_SPEED_10:
+-			ethtool_cmd_speed_set(cmd, SPEED_10);
+-			break;
+-		case BGMAC_SPEED_100:
+-			ethtool_cmd_speed_set(cmd, SPEED_100);
+-			break;
+-		case BGMAC_SPEED_1000:
+-			ethtool_cmd_speed_set(cmd, SPEED_1000);
+-			break;
+-		}
+-	}
+-
+-	cmd->duplex = bgmac->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
+-
+-	cmd->autoneg = bgmac->autoneg;
+-
+-	return 0;
++	return phy_ethtool_gset(bgmac->phy_dev, cmd);
+ }
+ 
+-#if 0
+ static int bgmac_set_settings(struct net_device *net_dev,
+ 			      struct ethtool_cmd *cmd)
+ {
+ 	struct bgmac *bgmac = netdev_priv(net_dev);
+ 
+-	return -1;
++	return phy_ethtool_sset(bgmac->phy_dev, cmd);
+ }
+-#endif
+ 
+ static void bgmac_get_drvinfo(struct net_device *net_dev,
+ 			      struct ethtool_drvinfo *info)
+@@ -1359,6 +1294,7 @@ static void bgmac_get_drvinfo(struct net
+ 
+ static const struct ethtool_ops bgmac_ethtool_ops = {
+ 	.get_settings		= bgmac_get_settings,
++	.set_settings		= bgmac_set_settings,
+ 	.get_drvinfo		= bgmac_get_drvinfo,
+ };
+ 
+@@ -1377,9 +1313,35 @@ static int bgmac_mii_write(struct mii_bu
+ 	return bgmac_phy_write(bus->priv, mii_id, regnum, value);
+ }
+ 
++static void bgmac_adjust_link(struct net_device *net_dev)
++{
++	struct bgmac *bgmac = netdev_priv(net_dev);
++	struct phy_device *phy_dev = bgmac->phy_dev;
++	bool update = false;
++
++	if (phy_dev->link) {
++		if (phy_dev->speed != bgmac->mac_speed) {
++			bgmac->mac_speed = phy_dev->speed;
++			update = true;
++		}
++
++		if (phy_dev->duplex != bgmac->mac_duplex) {
++			bgmac->mac_duplex = phy_dev->duplex;
++			update = true;
++		}
++	}
++
++	if (update) {
++		bgmac_mac_speed(bgmac);
++		phy_print_status(phy_dev);
++	}
++}
++
+ static int bgmac_mii_register(struct bgmac *bgmac)
+ {
+ 	struct mii_bus *mii_bus;
++	struct phy_device *phy_dev;
++	char bus_id[MII_BUS_ID_SIZE + 3];
+ 	int i, err = 0;
+ 
+ 	mii_bus = mdiobus_alloc();
+@@ -1411,8 +1373,22 @@ static int bgmac_mii_register(struct bgm
+ 
+ 	bgmac->mii_bus = mii_bus;
+ 
++	/* Connect to the PHY */
++	snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, mii_bus->id,
++		 bgmac->phyaddr);
++	phy_dev = phy_connect(bgmac->net_dev, bus_id, &bgmac_adjust_link,
++			      PHY_INTERFACE_MODE_MII);
++	if (IS_ERR(phy_dev)) {
++		bgmac_err(bgmac, "PHY connecton failed\n");
++		err = PTR_ERR(phy_dev);
++		goto err_unregister_bus;
++	}
++	bgmac->phy_dev = phy_dev;
++
+ 	return err;
+ 
++err_unregister_bus:
++	mdiobus_unregister(mii_bus);
+ err_free_irq:
+ 	kfree(mii_bus->irq);
+ err_free_bus:
+@@ -1467,9 +1443,6 @@ static int bgmac_probe(struct bcma_devic
+ 	bcma_set_drvdata(core, bgmac);
+ 
+ 	/* Defaults */
+-	bgmac->autoneg = true;
+-	bgmac->full_duplex = true;
+-	bgmac->speed = BGMAC_SPEED_10 | BGMAC_SPEED_100 | BGMAC_SPEED_1000;
+ 	memcpy(bgmac->net_dev->dev_addr, mac, ETH_ALEN);
+ 
+ 	/* On BCM4706 we need common core to access PHY */
+@@ -1500,6 +1473,27 @@ static int bgmac_probe(struct bcma_devic
+ 
+ 	bgmac_chip_reset(bgmac);
+ 
++	/* For Northstar, we have to take all GMAC core out of reset */
++	if (core->id.id == BCMA_CHIP_ID_BCM4707 ||
++	    core->id.id == BCMA_CHIP_ID_BCM53018) {
++		struct bcma_device *ns_core;
++		int ns_gmac;
++
++		/* Northstar has 4 GMAC cores */
++		for (ns_gmac = 0; ns_gmac < 4; ns_gmac++) {
++			/* As Northstar requirement, we have to reset all GMACs
++			 * before accessing one. bgmac_chip_reset() call
++			 * bcma_core_enable() for this core. Then the other
++			 * three GMACs didn't reset.  We do it here.
++			 */
++			ns_core = bcma_find_core_unit(core->bus,
++						      BCMA_CORE_MAC_GBIT,
++						      ns_gmac);
++			if (ns_core && !bcma_core_is_enabled(ns_core))
++				bcma_core_enable(ns_core, 0);
++		}
++	}
++
+ 	err = bgmac_dma_alloc(bgmac);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Unable to alloc memory for DMA\n");
+@@ -1524,14 +1518,12 @@ static int bgmac_probe(struct bcma_devic
+ 	err = bgmac_mii_register(bgmac);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register MDIO\n");
+-		err = -ENOTSUPP;
+ 		goto err_dma_free;
+ 	}
+ 
+ 	err = register_netdev(bgmac->net_dev);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register net device\n");
+-		err = -ENOTSUPP;
+ 		goto err_mii_unregister;
+ 	}
+ 
+--- a/drivers/net/ethernet/broadcom/bgmac.h
++++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -95,7 +95,11 @@
+ #define  BGMAC_RXQ_CTL_MDP_SHIFT		24
+ #define BGMAC_GPIO_SELECT			0x194
+ #define BGMAC_GPIO_OUTPUT_EN			0x198
+-/* For 0x1e0 see BCMA_CLKCTLST */
++
++/* For 0x1e0 see BCMA_CLKCTLST. Below are BGMAC specific bits */
++#define  BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ	0x00000100
++#define  BGMAC_BCMA_CLKCTLST_MISC_PLL_ST	0x01000000
++
+ #define BGMAC_HW_WAR				0x1e4
+ #define BGMAC_PWR_CTL				0x1e8
+ #define BGMAC_DMA_BASE0				0x200		/* Tx and Rx controller */
+@@ -185,6 +189,7 @@
+ #define   BGMAC_CMDCFG_ES_10			0x00000000
+ #define   BGMAC_CMDCFG_ES_100			0x00000004
+ #define   BGMAC_CMDCFG_ES_1000			0x00000008
++#define   BGMAC_CMDCFG_ES_2500			0x0000000C
+ #define  BGMAC_CMDCFG_PROM			0x00000010	/* Set to activate promiscuous mode */
+ #define  BGMAC_CMDCFG_PAD_EN			0x00000020
+ #define  BGMAC_CMDCFG_CF			0x00000040
+@@ -193,7 +198,9 @@
+ #define  BGMAC_CMDCFG_TAI			0x00000200
+ #define  BGMAC_CMDCFG_HD			0x00000400	/* Set if in half duplex mode */
+ #define  BGMAC_CMDCFG_HD_SHIFT			10
+-#define  BGMAC_CMDCFG_SR			0x00000800	/* Set to reset mode */
++#define  BGMAC_CMDCFG_SR_REV0			0x00000800	/* Set to reset mode, for other revs */
++#define  BGMAC_CMDCFG_SR_REV4			0x00002000	/* Set to reset mode, only for core rev 4 */
++#define  BGMAC_CMDCFG_SR(rev)  ((rev == 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0)
+ #define  BGMAC_CMDCFG_ML			0x00008000	/* Set to activate mac loopback mode */
+ #define  BGMAC_CMDCFG_AE			0x00400000
+ #define  BGMAC_CMDCFG_CFE			0x00800000
+@@ -216,27 +223,6 @@
+ #define BGMAC_RX_STATUS				0xb38
+ #define BGMAC_TX_STATUS				0xb3c
+ 
+-#define BGMAC_PHY_CTL				0x00
+-#define  BGMAC_PHY_CTL_SPEED_MSB		0x0040
+-#define  BGMAC_PHY_CTL_DUPLEX			0x0100		/* duplex mode */
+-#define  BGMAC_PHY_CTL_RESTART			0x0200		/* restart autonegotiation */
+-#define  BGMAC_PHY_CTL_ANENAB			0x1000		/* enable autonegotiation */
+-#define  BGMAC_PHY_CTL_SPEED			0x2000
+-#define  BGMAC_PHY_CTL_LOOP			0x4000		/* loopback */
+-#define  BGMAC_PHY_CTL_RESET			0x8000		/* reset */
+-/* Helpers */
+-#define  BGMAC_PHY_CTL_SPEED_10			0
+-#define  BGMAC_PHY_CTL_SPEED_100		BGMAC_PHY_CTL_SPEED
+-#define  BGMAC_PHY_CTL_SPEED_1000		BGMAC_PHY_CTL_SPEED_MSB
+-#define BGMAC_PHY_ADV				0x04
+-#define  BGMAC_PHY_ADV_10HALF			0x0020		/* advertise 10MBits/s half duplex */
+-#define  BGMAC_PHY_ADV_10FULL			0x0040		/* advertise 10MBits/s full duplex */
+-#define  BGMAC_PHY_ADV_100HALF			0x0080		/* advertise 100MBits/s half duplex */
+-#define  BGMAC_PHY_ADV_100FULL			0x0100		/* advertise 100MBits/s full duplex */
+-#define BGMAC_PHY_ADV2				0x09
+-#define  BGMAC_PHY_ADV2_1000HALF		0x0100		/* advertise 1000MBits/s half duplex */
+-#define  BGMAC_PHY_ADV2_1000FULL		0x0200		/* advertise 1000MBits/s full duplex */
+-
+ /* BCMA GMAC core specific IO Control (BCMA_IOCTL) flags */
+ #define BGMAC_BCMA_IOCTL_SW_CLKEN		0x00000004	/* PHY Clock Enable */
+ #define BGMAC_BCMA_IOCTL_SW_RESET		0x00000008	/* PHY Reset */
+@@ -254,9 +240,34 @@
+ #define  BGMAC_DMA_TX_SUSPEND			0x00000002
+ #define  BGMAC_DMA_TX_LOOPBACK			0x00000004
+ #define  BGMAC_DMA_TX_FLUSH			0x00000010
++#define  BGMAC_DMA_TX_MR_MASK			0x000000C0	/* Multiple outstanding reads */
++#define  BGMAC_DMA_TX_MR_SHIFT			6
++#define   BGMAC_DMA_TX_MR_1			0
++#define   BGMAC_DMA_TX_MR_2			1
+ #define  BGMAC_DMA_TX_PARITY_DISABLE		0x00000800
+ #define  BGMAC_DMA_TX_ADDREXT_MASK		0x00030000
+ #define  BGMAC_DMA_TX_ADDREXT_SHIFT		16
++#define  BGMAC_DMA_TX_BL_MASK			0x001C0000	/* BurstLen bits */
++#define  BGMAC_DMA_TX_BL_SHIFT			18
++#define   BGMAC_DMA_TX_BL_16			0
++#define   BGMAC_DMA_TX_BL_32			1
++#define   BGMAC_DMA_TX_BL_64			2
++#define   BGMAC_DMA_TX_BL_128			3
++#define   BGMAC_DMA_TX_BL_256			4
++#define   BGMAC_DMA_TX_BL_512			5
++#define   BGMAC_DMA_TX_BL_1024			6
++#define  BGMAC_DMA_TX_PC_MASK			0x00E00000	/* Prefetch control */
++#define  BGMAC_DMA_TX_PC_SHIFT			21
++#define   BGMAC_DMA_TX_PC_0			0
++#define   BGMAC_DMA_TX_PC_4			1
++#define   BGMAC_DMA_TX_PC_8			2
++#define   BGMAC_DMA_TX_PC_16			3
++#define  BGMAC_DMA_TX_PT_MASK			0x03000000	/* Prefetch threshold */
++#define  BGMAC_DMA_TX_PT_SHIFT			24
++#define   BGMAC_DMA_TX_PT_1			0
++#define   BGMAC_DMA_TX_PT_2			1
++#define   BGMAC_DMA_TX_PT_4			2
++#define   BGMAC_DMA_TX_PT_8			3
+ #define BGMAC_DMA_TX_INDEX			0x04
+ #define BGMAC_DMA_TX_RINGLO			0x08
+ #define BGMAC_DMA_TX_RINGHI			0x0C
+@@ -284,8 +295,33 @@
+ #define  BGMAC_DMA_RX_DIRECT_FIFO		0x00000100
+ #define  BGMAC_DMA_RX_OVERFLOW_CONT		0x00000400
+ #define  BGMAC_DMA_RX_PARITY_DISABLE		0x00000800
++#define  BGMAC_DMA_RX_MR_MASK			0x000000C0	/* Multiple outstanding reads */
++#define  BGMAC_DMA_RX_MR_SHIFT			6
++#define   BGMAC_DMA_TX_MR_1			0
++#define   BGMAC_DMA_TX_MR_2			1
+ #define  BGMAC_DMA_RX_ADDREXT_MASK		0x00030000
+ #define  BGMAC_DMA_RX_ADDREXT_SHIFT		16
++#define  BGMAC_DMA_RX_BL_MASK			0x001C0000	/* BurstLen bits */
++#define  BGMAC_DMA_RX_BL_SHIFT			18
++#define   BGMAC_DMA_RX_BL_16			0
++#define   BGMAC_DMA_RX_BL_32			1
++#define   BGMAC_DMA_RX_BL_64			2
++#define   BGMAC_DMA_RX_BL_128			3
++#define   BGMAC_DMA_RX_BL_256			4
++#define   BGMAC_DMA_RX_BL_512			5
++#define   BGMAC_DMA_RX_BL_1024			6
++#define  BGMAC_DMA_RX_PC_MASK			0x00E00000	/* Prefetch control */
++#define  BGMAC_DMA_RX_PC_SHIFT			21
++#define   BGMAC_DMA_RX_PC_0			0
++#define   BGMAC_DMA_RX_PC_4			1
++#define   BGMAC_DMA_RX_PC_8			2
++#define   BGMAC_DMA_RX_PC_16			3
++#define  BGMAC_DMA_RX_PT_MASK			0x03000000	/* Prefetch threshold */
++#define  BGMAC_DMA_RX_PT_SHIFT			24
++#define   BGMAC_DMA_RX_PT_1			0
++#define   BGMAC_DMA_RX_PT_2			1
++#define   BGMAC_DMA_RX_PT_4			2
++#define   BGMAC_DMA_RX_PT_8			3
+ #define BGMAC_DMA_RX_INDEX			0x24
+ #define BGMAC_DMA_RX_RINGLO			0x28
+ #define BGMAC_DMA_RX_RINGHI			0x2C
+@@ -342,10 +378,6 @@
+ #define BGMAC_CHIPCTL_1_SW_TYPE_RGMII		0x000000C0
+ #define BGMAC_CHIPCTL_1_RXC_DLL_BYPASS		0x00010000
+ 
+-#define BGMAC_SPEED_10				0x0001
+-#define BGMAC_SPEED_100				0x0002
+-#define BGMAC_SPEED_1000			0x0004
+-
+ #define BGMAC_WEIGHT	64
+ 
+ #define ETHER_MAX_LEN   1518
+@@ -402,6 +434,7 @@ struct bgmac {
+ 	struct net_device *net_dev;
+ 	struct napi_struct napi;
+ 	struct mii_bus *mii_bus;
++	struct phy_device *phy_dev;
+ 
+ 	/* DMA */
+ 	struct bgmac_dma_ring tx_ring[BGMAC_MAX_TX_RINGS];
+@@ -416,10 +449,9 @@ struct bgmac {
+ 	u32 int_mask;
+ 	u32 int_status;
+ 
+-	/* Speed-related */
+-	int speed;
+-	bool autoneg;
+-	bool full_duplex;
++	/* Current MAC state */
++	int mac_speed;
++	int mac_duplex;
+ 
+ 	u8 phyaddr;
+ 	bool has_robosw;
diff --git a/trunk/target/linux/generic/patches-3.13/773-bgmac-add-srab-switch.patch b/trunk/target/linux/generic/patches-3.13/773-bgmac-add-srab-switch.patch
new file mode 100644
index 00000000..fe52ccc3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/773-bgmac-add-srab-switch.patch
@@ -0,0 +1,72 @@
+Register switch connected to srab
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -16,6 +16,7 @@
+ #include <linux/phy.h>
+ #include <linux/interrupt.h>
+ #include <linux/dma-mapping.h>
++#include <linux/platform_data/b53.h>
+ #include <bcm47xx_nvram.h>
+ 
+ static const struct bcma_device_id bgmac_bcma_tbl[] = {
+@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct
+ 	mdiobus_free(mii_bus);
+ }
+ 
++static struct b53_platform_data bgmac_b53_pdata = {
++};
++
++static struct platform_device bgmac_b53_dev = {
++	.name		= "b53-srab-switch",
++	.id		= -1,
++	.dev		= {
++		.platform_data = &bgmac_b53_pdata,
++	},
++};
++
+ /**************************************************
+  * BCMA bus ops
+  **************************************************/
+@@ -1521,6 +1533,16 @@ static int bgmac_probe(struct bcma_devic
+ 		goto err_dma_free;
+ 	}
+ 
++	if (core->id.id != BCMA_CHIP_ID_BCM4707 &&
++	    core->id.id != BCMA_CHIP_ID_BCM53018 &&
++	    !bgmac_b53_pdata.regs) {
++		bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
++
++		err = platform_device_register(&bgmac_b53_dev);
++		if (!err)
++			bgmac->b53_device = &bgmac_b53_dev;
++	}
++
+ 	err = register_netdev(bgmac->net_dev);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register net device\n");
+@@ -1549,6 +1571,10 @@ static void bgmac_remove(struct bcma_dev
+ {
+ 	struct bgmac *bgmac = bcma_get_drvdata(core);
+ 
++	if (bgmac->b53_device)
++		platform_device_unregister(&bgmac_b53_dev);
++	bgmac->b53_device = NULL;
++
+ 	netif_napi_del(&bgmac->napi);
+ 	unregister_netdev(bgmac->net_dev);
+ 	bgmac_mii_unregister(bgmac);
+--- a/drivers/net/ethernet/broadcom/bgmac.h
++++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -457,6 +457,9 @@ struct bgmac {
+ 	bool has_robosw;
+ 
+ 	bool loopback;
++
++	/* platform device for associated switch */
++	struct platform_device *b53_device;
+ };
+ 
+ static inline u32 bgmac_read(struct bgmac *bgmac, u16 offset)
diff --git a/trunk/target/linux/generic/patches-3.13/775-bgmac-check-length-of-received-frame.patch b/trunk/target/linux/generic/patches-3.13/775-bgmac-check-length-of-received-frame.patch
new file mode 100644
index 00000000..c3d63b65
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/775-bgmac-check-length-of-received-frame.patch
@@ -0,0 +1,39 @@
+From 2d12a9abf3f81de5b51852e3cfcba8cedac82642 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 6 Dec 2013 01:14:52 +0100
+Subject: [PATCH] bgmac: check length of received frame
+
+---
+ drivers/net/ethernet/broadcom/bgmac.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma
+ 			dma_addr_t old_dma_addr = slot->dma_addr;
+ 			int err;
+ 
++			if (len > BGMAC_RX_MAX_FRAME_SIZE) {
++				struct bgmac_dma_desc *dma_desc = ring->cpu_base + ring->start;
++
++				bgmac_err(bgmac, "Hardware reported invalid packet length %d for slot %d!\n", len, ring->start);
++				bgmac_err(bgmac, "flags: 0x%04X\n", flags);
++				bgmac_err(bgmac, "ctl0: 0x%08X\tctl1: 0x%08X\n", le32_to_cpu(dma_desc->ctl0), le32_to_cpu(dma_desc->ctl1));
++
++				bgmac_err(bgmac, "   BGMAC_DMA_RX_CTL: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_INDEX: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGLO: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGLO));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGHI: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGHI));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_STATUS: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_STATUS));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_ERROR: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_ERROR));
++
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
++			}
++
+ 			/* Check for poison and drop or pass the packet */
+ 			if (len == 0xdead && flags == 0xbeef) {
+ 				bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
diff --git a/trunk/target/linux/generic/patches-3.13/810-pci_disable_common_quirks.patch b/trunk/target/linux/generic/patches-3.13/810-pci_disable_common_quirks.patch
new file mode 100644
index 00000000..8877bc0d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/810-pci_disable_common_quirks.patch
@@ -0,0 +1,51 @@
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -58,6 +58,12 @@ config XEN_PCIDEV_FRONTEND
+           The PCI device frontend driver allows the kernel to import arbitrary
+           PCI devices from a PCI backend to support PCI driver domains.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++	bool "PCI disable common quirks"
++	depends on PCI
++	help
++	  If you don't know what to do here, say N.
++
+ config HT_IRQ
+ 	bool "Interrupts on hypertransport devices"
+ 	default y
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -40,6 +40,7 @@ static void quirk_mmio_always_on(struct
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
+ 				PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -2860,6 +2861,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ /*
+  * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.  To
+@@ -2916,6 +2918,8 @@ static void fixup_debug_report(struct pc
+ 	}
+ }
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ /*
+  * Some BIOS implementations leave the Intel GPU interrupts enabled,
+  * even though no one is handling them (f.e. i915 driver is never loaded).
+@@ -2950,6 +2954,8 @@ static void disable_igfx_irq(struct pci_
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
+ /*
+  * PCI devices which are on Intel chips can skip the 10ms delay
+  * before entering D3 mode.
diff --git a/trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch b/trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 00000000..9fe134ee
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,101 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -98,6 +98,8 @@ struct amd_chipset_type {
+ 	u8 rev;
+ };
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static struct amd_chipset_info {
+ 	struct pci_dev	*nb_dev;
+ 	struct pci_dev	*smbus_dev;
+@@ -455,6 +457,10 @@ void usb_amd_dev_put(void)
+ }
+ EXPORT_SYMBOL_GPL(usb_amd_dev_put);
+ 
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
++#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
++
+ /*
+  * Make sure the controller is completely inactive, unable to
+  * generate interrupts or do DMA.
+@@ -534,8 +540,17 @@ reset_needed:
+ 	uhci_reset_hc(pdev, base);
+ 	return 1;
+ }
++#else
++int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
++{
++	return 0;
++}
++
++#endif
+ EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ {
+ 	u16 cmd;
+@@ -1064,3 +1079,4 @@ static void quirk_usb_early_handoff(stru
+ }
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+ 			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
++#endif
+--- a/drivers/usb/host/pci-quirks.h
++++ b/drivers/usb/host/pci-quirks.h
+@@ -4,6 +4,9 @@
+ #ifdef CONFIG_PCI
+ void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
+ int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
++#endif  /* CONFIG_PCI */
++
++#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ int usb_amd_find_chipset_info(void);
+ bool usb_amd_hang_symptom_quirk(void);
+ bool usb_amd_prefetch_quirk(void);
+@@ -15,11 +18,24 @@ void usb_disable_xhci_ports(struct pci_d
+ void sb800_prefetch(struct device *dev, int on);
+ #else
+ struct pci_dev;
++static inline int usb_amd_find_chipset_info(void)
++{
++	return 0;
++}
++static inline bool usb_amd_hang_symptom_quirk(void)
++{
++	return false;
++}
++static inline bool usb_amd_prefetch_quirk(void)
++{
++	return false;
++}
+ static inline void usb_amd_quirk_pll_disable(void) {}
+ static inline void usb_amd_quirk_pll_enable(void) {}
+ static inline void usb_amd_dev_put(void) {}
+ static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
+ static inline void sb800_prefetch(struct device *dev, int on) {}
+-#endif  /* CONFIG_PCI */
++static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
++#endif
+ 
+ #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -436,7 +436,14 @@ extern int usb_hcd_pci_probe(struct pci_
+ extern void usb_hcd_pci_remove(struct pci_dev *dev);
+ extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
++#else
++static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
++{
++	return 0;
++}
++#endif
+ 
+ #ifdef CONFIG_PM
+ extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
diff --git a/trunk/target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch b/trunk/target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch
new file mode 100644
index 00000000..99c7a362
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/820-usb_add_usb_find_device_by_name.patch
@@ -0,0 +1,84 @@
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -689,6 +689,71 @@ int __usb_get_extra_descriptor(char *buf
+ }
+ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
+ 
++static struct usb_device *match_device_name(struct usb_device *dev,
++					    const char *name)
++{
++	struct usb_device *ret_dev = NULL;
++	struct usb_device *childdev = NULL;
++	int child;
++
++	dev_dbg(&dev->dev, "check for name %s ...\n", name);
++
++	/* see if this device matches */
++	if (strcmp(dev_name(&dev->dev), name) == 0 ) {
++		dev_dbg(&dev->dev, "matched this device!\n");
++		ret_dev = usb_get_dev(dev);
++		goto exit;
++	}
++	/* look through all of the children of this device */
++	usb_hub_for_each_child(dev, child, childdev) {
++		if (childdev) {
++			usb_lock_device(childdev);
++			ret_dev = match_device_name(childdev, name);
++			usb_unlock_device(childdev);
++			if (ret_dev)
++				goto exit;
++		}
++	}
++exit:
++	return ret_dev;
++}
++
++/**
++ * usb_find_device_by_name - find a specific usb device in the system
++ * @name: the name of the device to find
++ *
++ * Returns a pointer to a struct usb_device if such a specified usb
++ * device is present in the system currently.  The usage count of the
++ * device will be incremented if a device is found.  Make sure to call
++ * usb_put_dev() when the caller is finished with the device.
++ *
++ * If a device with the specified bus id is not found, NULL is returned.
++ */
++struct usb_device *usb_find_device_by_name(const char *name)
++{
++	struct list_head *buslist;
++	struct usb_bus *bus;
++	struct usb_device *dev = NULL;
++
++	mutex_lock(&usb_bus_list_lock);
++	for (buslist = usb_bus_list.next;
++	     buslist != &usb_bus_list;
++	     buslist = buslist->next) {
++		bus = container_of(buslist, struct usb_bus, bus_list);
++		if (!bus->root_hub)
++			continue;
++		usb_lock_device(bus->root_hub);
++		dev = match_device_name(bus->root_hub, name);
++		usb_unlock_device(bus->root_hub);
++		if (dev)
++			goto exit;
++	}
++exit:
++	mutex_unlock(&usb_bus_list_lock);
++	return dev;
++}
++EXPORT_SYMBOL_GPL(usb_find_device_by_name);
++
+ /**
+  * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP
+  * @dev: device the buffer will be used with
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -692,6 +692,7 @@ static inline bool usb_device_no_sg_cons
+ 	return udev && udev->bus && udev->bus->no_sg_constraint;
+ }
+ 
++extern struct usb_device *usb_find_device_by_name(const char *name);
+ 
+ /*-------------------------------------------------------------------------*/
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/830-ledtrig_morse.patch b/trunk/target/linux/generic/patches-3.13/830-ledtrig_morse.patch
new file mode 100644
index 00000000..a5dffd2d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/830-ledtrig_morse.patch
@@ -0,0 +1,28 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA
+ 	  This enables direct flash/torch on/off by the driver, kernel space.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_MORSE
++	tristate "LED Morse Trigger"
++	depends on LEDS_TRIGGERS
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -60,3 +60,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ 
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
++obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+--- a/drivers/leds/ledtrig-morse.c
++++ b/drivers/leds/ledtrig-morse.c
+@@ -26,7 +26,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/leds.h>
diff --git a/trunk/target/linux/generic/patches-3.13/831-ledtrig_netdev.patch b/trunk/target/linux/generic/patches-3.13/831-ledtrig_netdev.patch
new file mode 100644
index 00000000..77bc8cc0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/831-ledtrig_netdev.patch
@@ -0,0 +1,60 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE
+ 	tristate "LED Morse Trigger"
+ 	depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_NETDEV
++	tristate "LED Netdev Trigger"
++	depends on NET && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by network device activity.
++	  If unsure, say Y.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -61,3 +61,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
++obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+--- a/drivers/leds/ledtrig-netdev.c
++++ b/drivers/leds/ledtrig-netdev.c
+@@ -22,7 +22,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/netdevice.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+@@ -254,7 +253,7 @@ static int netdev_trig_notify(struct not
+ 			      unsigned long evt,
+ 			      void *dv)
+ {
+-	struct net_device *dev = dv;
++	struct net_device *dev = netdev_notifier_info_to_dev((struct netdev_notifier_info *) dv);
+ 	struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
+ 
+ 	if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
+@@ -294,8 +293,9 @@ done:
+ static void netdev_trig_timer(unsigned long arg)
+ {
+ 	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
+-	const struct net_device_stats *dev_stats;
++	struct rtnl_link_stats64 *dev_stats;
+ 	unsigned new_activity;
++	struct rtnl_link_stats64 temp;
+ 
+ 	write_lock(&trigger_data->lock);
+ 
+@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
+ 		goto no_restart;
+ 	}
+ 
+-	dev_stats = dev_get_stats(trigger_data->net_dev);
++	dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
+ 	new_activity =
+ 		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
+ 		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
diff --git a/trunk/target/linux/generic/patches-3.13/832-ledtrig_usbdev.patch b/trunk/target/linux/generic/patches-3.13/832-ledtrig_usbdev.patch
new file mode 100644
index 00000000..c0568eb8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/832-ledtrig_usbdev.patch
@@ -0,0 +1,31 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV
+ 	  This allows LEDs to be controlled by network device activity.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_USBDEV
++	tristate "LED USB device Trigger"
++	depends on USB && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by the presence/activity of
++	  an USB device. If unsure, say N.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -62,3 +62,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
++obj-$(CONFIG_LEDS_TRIGGER_USBDEV)	+= ledtrig-usbdev.o
+--- a/drivers/leds/ledtrig-usbdev.c
++++ b/drivers/leds/ledtrig-usbdev.c
+@@ -24,7 +24,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/slab.h>
diff --git a/trunk/target/linux/generic/patches-3.13/840-rtc7301.patch b/trunk/target/linux/generic/patches-3.13/840-rtc7301.patch
new file mode 100644
index 00000000..9e4a26bf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/840-rtc7301.patch
@@ -0,0 +1,250 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -878,6 +878,15 @@ config RTC_DRV_NUC900
+ 	  If you say yes here you get support for the RTC subsystem of the
+ 	  NUC910/NUC920 used in embedded systems.
+ 
++config RTC_DRV_RTC7301
++	tristate "Epson RTC-7301 SF/DG"
++	help
++	  If you say Y here you will get support for the
++	  Epson RTC-7301 SF/DG RTC chips.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-7301.
++
+ comment "on-CPU RTC drivers"
+ 
+ config RTC_DRV_DAVINCI
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -102,6 +102,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
+ obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
+ obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
+ obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
++obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
+ obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o
+ obj-$(CONFIG_RTC_DRV_RX4581)	+= rtc-rx4581.o
+ obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
+--- /dev/null
++++ b/drivers/rtc/rtc-rtc7301.c
+@@ -0,0 +1,219 @@
++/*
++ * Driver for Epson RTC-7301SF/DG
++ *
++ * Copyright (C) 2009 Jose Vasconcellos
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/rtc.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/bcd.h>
++
++#define RTC_NAME "rtc7301"
++#define RTC_VERSION "0.1"
++
++/* Epson RTC-7301 register addresses */
++#define RTC7301_SEC		0x00
++#define RTC7301_SEC10		0x01
++#define RTC7301_MIN		0x02
++#define RTC7301_MIN10		0x03
++#define RTC7301_HOUR		0x04
++#define RTC7301_HOUR10		0x05
++#define RTC7301_WEEKDAY		0x06
++#define RTC7301_DAY		0x07
++#define RTC7301_DAY10		0x08
++#define RTC7301_MON		0x09
++#define RTC7301_MON10		0x0A
++#define RTC7301_YEAR		0x0B
++#define RTC7301_YEAR10		0x0C
++#define RTC7301_YEAR100		0x0D
++#define RTC7301_YEAR1000	0x0E
++#define RTC7301_CTRLREG		0x0F
++
++static uint8_t __iomem *rtc7301_base;
++
++#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
++#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
++
++#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
++
++static void rtc7301_init_settings(void)
++{
++	int i;
++
++	write_reg(RTC7301_CTRLREG, 2);
++	write_reg(RTC7301_YEAR1000, 2);
++	udelay(122);
++
++	/* bank 1 */
++	write_reg(RTC7301_CTRLREG, 6);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++
++	/* bank 2 */
++	write_reg(RTC7301_CTRLREG, 14);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++	write_reg(RTC7301_CTRLREG, 0);
++}
++
++static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int cnt;
++	uint8_t buf[16];
++
++	cnt = 0;
++	while (rtc7301_isbusy()) {
++		udelay(244);
++		if (cnt++ > 100) {
++			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
++			return -EIO;
++		}
++	}
++
++	for (cnt=0; cnt<16; cnt++)
++		buf[cnt] = read_reg(cnt);
++
++	if (buf[RTC7301_SEC10] & 8) {
++		dev_err(dev, "%s: RTC not set\n", __func__);
++		return -EINVAL;
++	}
++
++	memset(dt, 0, sizeof(*dt));
++
++	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
++	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
++	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
++
++	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
++	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
++	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
++		      buf[RTC7301_YEAR100]*100 +
++		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
++
++	/* the rtc device may contain illegal values on power up
++	 * according to the data sheet. make sure they are valid.
++	 */
++
++	return rtc_valid_tm(dt);
++}
++
++static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int data;
++
++	data = dt->tm_year + 1900;
++	if (data >= 2100 || data < 1900)
++		return -EINVAL;
++
++	write_reg(RTC7301_CTRLREG, 2);
++       	udelay(122);
++
++	data = bin2bcd(dt->tm_sec);
++	write_reg(RTC7301_SEC, data);
++	write_reg(RTC7301_SEC10, (data >> 4));
++
++	data = bin2bcd(dt->tm_min);
++	write_reg(RTC7301_MIN, data );
++	write_reg(RTC7301_MIN10, (data >> 4));
++
++	data = bin2bcd(dt->tm_hour);
++	write_reg(RTC7301_HOUR, data);
++	write_reg(RTC7301_HOUR10, (data >> 4));
++
++	data = bin2bcd(dt->tm_mday);
++	write_reg(RTC7301_DAY, data);
++	write_reg(RTC7301_DAY10, (data>> 4));
++
++	data = bin2bcd(dt->tm_mon + 1);
++	write_reg(RTC7301_MON, data);
++	write_reg(RTC7301_MON10, (data >> 4));
++
++	data = bin2bcd(dt->tm_year % 100);
++	write_reg(RTC7301_YEAR, data);
++	write_reg(RTC7301_YEAR10, (data >> 4));
++	data = bin2bcd((1900 + dt->tm_year) / 100);
++	write_reg(RTC7301_YEAR100, data);
++
++	data = bin2bcd(dt->tm_wday);
++	write_reg(RTC7301_WEEKDAY, data);
++
++	write_reg(RTC7301_CTRLREG, 0);
++
++	return 0;
++}
++
++static const struct rtc_class_ops rtc7301_rtc_ops = {
++	.read_time	= rtc7301_get_datetime,
++	.set_time	= rtc7301_set_datetime,
++};
++
++static int rtc7301_probe(struct platform_device *pdev)
++{
++	struct rtc_device *rtc;
++	struct resource *res;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENOENT;
++
++	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
++	if (!rtc7301_base)
++		return -EINVAL;
++
++	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
++				&rtc7301_rtc_ops, THIS_MODULE);
++	if (IS_ERR(rtc)) {
++		iounmap(rtc7301_base);
++		return PTR_ERR(rtc);
++	}
++
++	platform_set_drvdata(pdev, rtc);
++
++	rtc7301_init_settings();
++	return 0;
++}
++
++static int rtc7301_remove(struct platform_device *pdev)
++{
++	struct rtc_device *rtc = platform_get_drvdata(pdev);
++
++	if (rtc)
++		rtc_device_unregister(rtc);
++	if (rtc7301_base)
++		iounmap(rtc7301_base);
++	return 0;
++}
++
++static struct platform_driver rtc7301_driver = {
++	.driver = {
++		.name	= RTC_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe	= rtc7301_probe,
++	.remove = rtc7301_remove,
++};
++
++static __init int rtc7301_init(void)
++{
++	return platform_driver_register(&rtc7301_driver);
++}
++module_init(rtc7301_init);
++
++static __exit void rtc7301_exit(void)
++{
++	platform_driver_unregister(&rtc7301_driver);
++}
++module_exit(rtc7301_exit);
++
++MODULE_DESCRIPTION("Epson 7301 RTC driver");
++MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" RTC_NAME);
++MODULE_VERSION(RTC_VERSION);
diff --git a/trunk/target/linux/generic/patches-3.13/841-rtc_pt7c4338.patch b/trunk/target/linux/generic/patches-3.13/841-rtc_pt7c4338.patch
new file mode 100644
index 00000000..bcedcaea
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/841-rtc_pt7c4338.patch
@@ -0,0 +1,247 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -517,6 +517,15 @@ config RTC_DRV_S5M
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-s5m.
+ 
++config RTC_DRV_PT7C4338
++	tristate "Pericom Technology Inc. PT7C4338 RTC"
++	help
++	  If you say yes here you get support for the Pericom Technology
++	  Inc. PT7C4338 RTC chip.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-pt7c4338.
++
+ endif # I2C
+ 
+ comment "SPI RTC drivers"
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -94,6 +94,7 @@ obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030
+ obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
+ obj-$(CONFIG_RTC_DRV_PM8XXX)	+= rtc-pm8xxx.o
+ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
++obj-$(CONFIG_RTC_DRV_PT7C4338)	+= rtc-pt7c4338.o
+ obj-$(CONFIG_RTC_DRV_PUV3)	+= rtc-puv3.o
+ obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
+ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
+--- /dev/null
++++ b/drivers/rtc/rtc-pt7c4338.c
+@@ -0,0 +1,216 @@
++/*
++ * Copyright 2010 Freescale Semiconductor, Inc.
++ *
++ * Author:	Priyanka Jain <Priyanka.Jain@freescale.com>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++
++/*
++ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
++ *
++ * This file is based on drivers/rtc/rtc-ds1307.c
++ *
++ * PT7C4338 chip is manufactured by Pericom Technology Inc.
++ * It is a serial real-time clock which provides
++ * 1)Low-power clock/calendar.
++ * 2)Programmable square-wave output.
++ * It has 56 bytes of nonvolatile RAM.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++
++/* RTC register addresses */
++#define PT7C4338_REG_SECONDS          0x00
++#define PT7C4338_REG_MINUTES          0x01
++#define PT7C4338_REG_HOURS            0x02
++#define PT7C4338_REG_AMPM             0x02
++#define PT7C4338_REG_DAY              0x03
++#define PT7C4338_REG_DATE             0x04
++#define PT7C4338_REG_MONTH            0x05
++#define PT7C4338_REG_YEAR             0x06
++#define PT7C4338_REG_CTRL_STAT        0x07
++
++/* RTC second register address bit */
++#define PT7C4338_SEC_BIT_CH           0x80	/*Clock Halt (in Register 0)*/
++
++/* RTC control and status register bits */
++#define PT7C4338_CTRL_STAT_BIT_RS0    0x1	/*Rate select 0*/
++#define PT7C4338_CTRL_STAT_BIT_RS1    0x2	/*Rate select 1*/
++#define PT7C4338_CTRL_STAT_BIT_SQWE   0x10	/*Square Wave Enable*/
++#define PT7C4338_CTRL_STAT_BIT_OSF    0x20	/*Oscillator Stop Flag*/
++#define PT7C4338_CTRL_STAT_BIT_OUT    0x80	/*Output Level Control*/
++
++static const struct i2c_device_id pt7c4338_id[] = {
++	{ "pt7c4338", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, pt7c4338_id);
++
++struct pt7c4338{
++	struct i2c_client *client;
++	struct rtc_device *rtc;
++};
++
++static int pt7c4338_read_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	int ret;
++	u8 buf[7];
++	u8 year, month, day, hour, minute, second;
++	u8 week, twelve_hr, am_pm;
++
++	ret = i2c_smbus_read_i2c_block_data(client,
++			PT7C4338_REG_SECONDS, 7, buf);
++	if (ret < 0)
++		return ret;
++	if (ret < 7)
++		return -EIO;
++
++	second = buf[0];
++	minute = buf[1];
++	hour = buf[2];
++	week = buf[3];
++	day = buf[4];
++	month = buf[5];
++	year = buf[6];
++
++	/* Extract additional information for AM/PM */
++	twelve_hr = hour & 0x40;
++	am_pm = hour & 0x20;
++
++	/* Write to rtc_time structure */
++	time->tm_sec = bcd2bin(second & 0x7f);
++	time->tm_min = bcd2bin(minute & 0x7f);
++	if (twelve_hr) {
++		/* Convert to 24 hr */
++		if (am_pm)
++			time->tm_hour = bcd2bin(hour & 0x10) + 12;
++		else
++			time->tm_hour = bcd2bin(hour & 0xBF);
++	} else {
++		time->tm_hour = bcd2bin(hour);
++	}
++
++	time->tm_wday = bcd2bin(week & 0x07) - 1;
++	time->tm_mday = bcd2bin(day & 0x3f);
++	time->tm_mon = bcd2bin(month & 0x1F) - 1;
++	/* assume 20YY not 19YY */
++	time->tm_year = bcd2bin(year) + 100;
++
++	return 0;
++}
++
++static int pt7c4338_set_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	u8 buf[7];
++
++	/* Extract time from rtc_time and load into pt7c4338*/
++	buf[0] = bin2bcd(time->tm_sec);
++	buf[1] = bin2bcd(time->tm_min);
++	buf[2] = bin2bcd(time->tm_hour);
++	buf[3] = bin2bcd(time->tm_wday + 1); /* Day of the week */
++	buf[4] = bin2bcd(time->tm_mday); /* Date */
++	buf[5] = bin2bcd(time->tm_mon + 1);
++
++	/* assume 20YY not 19YY */
++	if (time->tm_year >= 100)
++		buf[6] = bin2bcd(time->tm_year - 100);
++	else
++		buf[6] = bin2bcd(time->tm_year);
++
++	return i2c_smbus_write_i2c_block_data(client,
++					PT7C4338_REG_SECONDS, 7, buf);
++}
++
++static const struct rtc_class_ops pt7c4338_rtc_ops = {
++	.read_time = pt7c4338_read_time,
++	.set_time = pt7c4338_set_time,
++};
++
++static int pt7c4338_probe(struct i2c_client *client,
++		const struct i2c_device_id *id)
++{
++	struct pt7c4338 *pt7c4338;
++	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
++	int ret;
++
++	pt7c4338 = kzalloc(sizeof(struct pt7c4338), GFP_KERNEL);
++	if (!pt7c4338)
++		return -ENOMEM;
++
++	pt7c4338->client = client;
++	i2c_set_clientdata(client, pt7c4338);
++	pt7c4338->rtc = rtc_device_register(client->name, &client->dev,
++					&pt7c4338_rtc_ops, THIS_MODULE);
++	if (IS_ERR(pt7c4338->rtc)) {
++		ret = PTR_ERR(pt7c4338->rtc);
++		dev_err(&client->dev, "unable to register the class device\n");
++		goto out_free;
++	}
++
++	return 0;
++out_free:
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return ret;
++}
++
++static int pt7c4338_remove(struct i2c_client *client)
++{
++	struct pt7c4338 *pt7c4338 = i2c_get_clientdata(client);
++
++	rtc_device_unregister(pt7c4338->rtc);
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return 0;
++}
++
++static struct i2c_driver pt7c4338_driver = {
++	.driver = {
++		.name = "rtc-pt7c4338",
++		.owner = THIS_MODULE,
++	},
++	.probe = pt7c4338_probe,
++	.remove = pt7c4338_remove,
++	.id_table = pt7c4338_id,
++};
++
++static int __init pt7c4338_init(void)
++{
++	return i2c_add_driver(&pt7c4338_driver);
++}
++
++static void __exit pt7c4338_exit(void)
++{
++	i2c_del_driver(&pt7c4338_driver);
++}
++
++module_init(pt7c4338_init);
++module_exit(pt7c4338_exit);
++
++MODULE_AUTHOR("Priyanka Jain <Priyanka.Jain@freescale.com>");
++MODULE_DESCRIPTION("pericom Technology Inc. PT7C4338 RTC Driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.13/861-04_spi_gpio_implement_spi_delay.patch b/trunk/target/linux/generic/patches-3.13/861-04_spi_gpio_implement_spi_delay.patch
new file mode 100644
index 00000000..6cbe4c3e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/861-04_spi_gpio_implement_spi_delay.patch
@@ -0,0 +1,58 @@
+Implement the SPI-GPIO delay function for busses that need speed limitation.
+
+--mb
+
+
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -22,6 +22,7 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/delay.h>
+ #include <linux/of.h>
+ #include <linux/of_device.h>
+ #include <linux/of_gpio.h>
+@@ -74,6 +75,7 @@ struct spi_gpio {
+  *		#define	SPI_MOSI_GPIO	120
+  *		#define	SPI_SCK_GPIO	121
+  *		#define	SPI_N_CHIPSEL	4
++ *		#undef NEED_SPIDELAY
+  *		#include "spi-gpio.c"
+  */
+ 
+@@ -81,6 +83,7 @@ struct spi_gpio {
+ #define DRIVER_NAME	"spi_gpio"
+ 
+ #define GENERIC_BITBANG	/* vs tight inlines */
++#define NEED_SPIDELAY	1
+ 
+ /* all functions referencing these symbols must define pdata */
+ #define SPI_MISO_GPIO	((pdata)->miso)
+@@ -131,12 +134,20 @@ static inline int getmiso(const struct s
+ #undef pdata
+ 
+ /*
+- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
+- * requested device clock.  Software overhead means we usually have trouble
+- * reaching even one Mbit/sec (except when we can inline bitops), so for now
+- * we'll just assume we never need additional per-bit slowdowns.
++ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
++ * and spi_transfer.speed_hz to 0.
++ * Otherwise this is a function of the requested device clock.
++ * Software overhead means we usually have trouble
++ * reaching even one Mbit/sec (except when we can inline bitops). So on small
++ * embedded devices with fast SPI slaves you usually don't need a delay.
+  */
+-#define spidelay(nsecs)	do {} while (0)
++static inline void spidelay(unsigned nsecs)
++{
++#ifdef NEED_SPIDELAY
++	if (unlikely(nsecs))
++		ndelay(nsecs);
++#endif /* NEED_SPIDELAY */
++}
+ 
+ #include "spi-bitbang-txrx.h"
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/862-gpio_spi_driver.patch b/trunk/target/linux/generic/patches-3.13/862-gpio_spi_driver.patch
new file mode 100644
index 00000000..00f71d57
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/862-gpio_spi_driver.patch
@@ -0,0 +1,373 @@
+THIS CODE IS DEPRECATED.
+
+Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+--mb
+
+
+
+---
+ drivers/spi/Kconfig              |    9 +
+ drivers/spi/Makefile             |    1 
+ drivers/spi/spi_gpio_old.c       |  251 +++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi_gpio_old.h |   73 +++++++++++
+ 4 files changed, 334 insertions(+)
+
+--- /dev/null
++++ b/include/linux/spi/spi_gpio_old.h
+@@ -0,0 +1,73 @@
++/*
++ * spi_gpio interface to platform code
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++#ifndef _LINUX_SPI_SPI_GPIO
++#define _LINUX_SPI_SPI_GPIO
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++
++
++/**
++ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
++ *
++ * This structure holds information about a GPIO-based SPI device.
++ *
++ * @pin_clk: The GPIO pin number of the CLOCK pin.
++ *
++ * @pin_miso: The GPIO pin number of the MISO pin.
++ *
++ * @pin_mosi: The GPIO pin number of the MOSI pin.
++ *
++ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
++ *
++ * @cs_activelow: If true, the chip is selected when the CS line is low.
++ *
++ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
++ *                Note that doing no delay is not standards compliant,
++ *                but it might be needed to speed up transfers on some
++ *                slow embedded machines.
++ *
++ * @boardinfo_setup: This callback is called after the
++ *                   SPI master device was registered, but before the
++ *                   device is registered.
++ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
++ */
++struct spi_gpio_platform_data {
++	unsigned int pin_clk;
++	unsigned int pin_miso;
++	unsigned int pin_mosi;
++	unsigned int pin_cs;
++	bool cs_activelow;
++	bool no_spi_delay;
++	int (*boardinfo_setup)(struct spi_board_info *bi,
++			       struct spi_master *master,
++			       void *data);
++	void *boardinfo_setup_data;
++};
++
++/**
++ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a spi-gpio device.
++ */
++#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
++
++/**
++ * spi_gpio_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int spi_gpio_next_id(void);
++
++#endif /* _LINUX_SPI_SPI_GPIO */
+--- /dev/null
++++ b/drivers/spi/spi_gpio_old.c
+@@ -0,0 +1,251 @@
++/*
++ * Bitbanging SPI bus driver using GPIO API
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * based on spi_s3c2410_gpio.c
++ *   Copyright (c) 2006 Ben Dooks
++ *   Copyright (c) 2006 Simtec Electronics
++ * and on i2c-gpio.c
++ *   Copyright (C) 2007 Atmel Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/spi_bitbang.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++struct spi_gpio {
++	struct spi_bitbang bitbang;
++	struct spi_gpio_platform_data *info;
++	struct platform_device *pdev;
++	struct spi_board_info bi;
++};
++
++
++static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
++{
++	return dev->controller_data;
++}
++
++static inline void setsck(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
++}
++
++static inline void setmosi(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
++}
++
++static inline u32 getmiso(struct spi_device *dev)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
++}
++
++static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (!sp->info->no_spi_delay)
++		ndelay(nsecs);
++}
++
++#define spidelay(nsecs) do {					\
++	/* Steal the spi_device pointer from our caller.	\
++	 * The bitbang-API should probably get fixed here... */	\
++	do_spidelay(spi, nsecs);				\
++  } while (0)
++
++#define EXPAND_BITBANG_TXRX
++#include "spi-bitbang-txrx.h"
++
++static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
++}
++
++static void spi_gpio_chipselect(struct spi_device *dev, int on)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (sp->info->cs_activelow)
++		on = !on;
++	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
++}
++
++static int spi_gpio_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct spi_gpio_platform_data *pdata;
++	struct spi_gpio *sp;
++	struct spi_device *spidev;
++	int err;
++
++	pdata = pdev->dev.platform_data;
++	if (!pdata)
++		return -ENXIO;
++
++	err = -ENOMEM;
++	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
++	if (!master)
++		goto err_alloc_master;
++
++	sp = spi_master_get_devdata(master);
++	platform_set_drvdata(pdev, sp);
++	sp->info = pdata;
++
++	err = gpio_request(pdata->pin_clk, "spi_clock");
++	if (err)
++		goto err_request_clk;
++	err = gpio_request(pdata->pin_mosi, "spi_mosi");
++	if (err)
++		goto err_request_mosi;
++	err = gpio_request(pdata->pin_miso, "spi_miso");
++	if (err)
++		goto err_request_miso;
++	err = gpio_request(pdata->pin_cs, "spi_cs");
++	if (err)
++		goto err_request_cs;
++
++	sp->bitbang.master = spi_master_get(master);
++	sp->bitbang.master->bus_num = -1;
++	sp->bitbang.master->num_chipselect = 1;
++	sp->bitbang.chipselect = spi_gpio_chipselect;
++	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
++	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
++	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
++	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
++
++	gpio_direction_output(pdata->pin_clk, 0);
++	gpio_direction_output(pdata->pin_mosi, 0);
++	gpio_direction_output(pdata->pin_cs,
++			      pdata->cs_activelow ? 1 : 0);
++	gpio_direction_input(pdata->pin_miso);
++
++	err = spi_bitbang_start(&sp->bitbang);
++	if (err)
++		goto err_no_bitbang;
++	err = pdata->boardinfo_setup(&sp->bi, master,
++				     pdata->boardinfo_setup_data);
++	if (err)
++		goto err_bi_setup;
++	sp->bi.controller_data = sp;
++	spidev = spi_new_device(master, &sp->bi);
++	if (!spidev)
++		goto err_new_dev;
++
++	return 0;
++
++err_new_dev:
++err_bi_setup:
++	spi_bitbang_stop(&sp->bitbang);
++err_no_bitbang:
++	spi_master_put(sp->bitbang.master);
++	gpio_free(pdata->pin_cs);
++err_request_cs:
++	gpio_free(pdata->pin_miso);
++err_request_miso:
++	gpio_free(pdata->pin_mosi);
++err_request_mosi:
++	gpio_free(pdata->pin_clk);
++err_request_clk:
++	kfree(master);
++
++err_alloc_master:
++	return err;
++}
++
++static int spi_gpio_remove(struct platform_device *pdev)
++{
++	struct spi_gpio *sp;
++	struct spi_gpio_platform_data *pdata;
++
++	pdata = pdev->dev.platform_data;
++	sp = platform_get_drvdata(pdev);
++
++	gpio_free(pdata->pin_clk);
++	gpio_free(pdata->pin_mosi);
++	gpio_free(pdata->pin_miso);
++	gpio_free(pdata->pin_cs);
++	spi_bitbang_stop(&sp->bitbang);
++	spi_master_put(sp->bitbang.master);
++
++	return 0;
++}
++
++static struct platform_driver spi_gpio_driver = {
++	.driver		= {
++		.name	= SPI_GPIO_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe		= spi_gpio_probe,
++	.remove		= spi_gpio_remove,
++};
++
++int spi_gpio_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(spi_gpio_next_id);
++
++static int __init spi_gpio_init(void)
++{
++	int err;
++
++	err = platform_driver_register(&spi_gpio_driver);
++	if (err)
++		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
++
++	return err;
++}
++module_init(spi_gpio_init);
++
++static void __exit spi_gpio_exit(void)
++{
++	platform_driver_unregister(&spi_gpio_driver);
++}
++module_exit(spi_gpio_exit);
++
++MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
++MODULE_LICENSE("GPL v2");
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -202,6 +202,15 @@ config SPI_GPIO
+ 	  GPIO operations, you should be able to leverage that for better
+ 	  speed with a custom version of this driver; see the source code.
+ 
++config SPI_GPIO_OLD
++	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
++	depends on SPI_MASTER && GPIOLIB
++	select SPI_BITBANG
++	help
++	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
++
++	  If unsure, say N.
++
+ config SPI_IMX
+ 	tristate "Freescale i.MX SPI controllers"
+ 	depends on ARCH_MXC || COMPILE_TEST
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -37,6 +37,7 @@ obj-$(CONFIG_SPI_FSL_LIB)		+= spi-fsl-li
+ obj-$(CONFIG_SPI_FSL_ESPI)		+= spi-fsl-espi.o
+ obj-$(CONFIG_SPI_FSL_SPI)		+= spi-fsl-spi.o
+ obj-$(CONFIG_SPI_GPIO)			+= spi-gpio.o
++obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
+ obj-$(CONFIG_SPI_IMX)			+= spi-imx.o
+ obj-$(CONFIG_SPI_LM70_LLP)		+= spi-lm70llp.o
+ obj-$(CONFIG_SPI_MPC512x_PSC)		+= spi-mpc512x-psc.o
diff --git a/trunk/target/linux/generic/patches-3.13/863-gpiommc.patch b/trunk/target/linux/generic/patches-3.13/863-gpiommc.patch
new file mode 100644
index 00000000..38000732
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/863-gpiommc.patch
@@ -0,0 +1,844 @@
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
+@@ -0,0 +1,609 @@
++/*
++ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
++ * This module hooks up the mmc_spi and spi_gpio modules and also
++ * provides a configfs interface.
++ *
++ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/module.h>
++#include <linux/mmc/gpiommc.h>
++#include <linux/platform_device.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/configfs.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++#define PFX				"gpio-mmc: "
++
++
++struct gpiommc_device {
++	struct platform_device *pdev;
++	struct platform_device *spi_pdev;
++	struct spi_board_info boardinfo;
++};
++
++
++MODULE_DESCRIPTION("GPIO based MMC driver");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_LICENSE("GPL");
++
++
++static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
++				   struct spi_master *master,
++				   void *data)
++{
++	struct gpiommc_device *d = data;
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	/* Bind the SPI master to the MMC-SPI host driver. */
++	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
++
++	bi->max_speed_hz = pdata->max_bus_speed;
++	bi->bus_num = master->bus_num;
++	bi->mode = pdata->mode;
++
++	return 0;
++}
++
++static int gpiommc_probe(struct platform_device *pdev)
++{
++	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
++	struct spi_gpio_platform_data spi_pdata;
++	struct gpiommc_device *d;
++	int err;
++
++	err = -ENXIO;
++	if (!mmc_pdata)
++		goto error;
++
++#ifdef CONFIG_MMC_SPI_MODULE
++	err = request_module("mmc_spi");
++	if (err) {
++		printk(KERN_WARNING PFX
++		       "Failed to request mmc_spi module.\n");
++	}
++#endif /* CONFIG_MMC_SPI_MODULE */
++
++	/* Allocate the GPIO-MMC device */
++	err = -ENOMEM;
++	d = kzalloc(sizeof(*d), GFP_KERNEL);
++	if (!d)
++		goto error;
++	d->pdev = pdev;
++
++	/* Create the SPI-GPIO device */
++	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
++					    spi_gpio_next_id());
++	if (!d->spi_pdev)
++		goto err_free_d;
++
++	memset(&spi_pdata, 0, sizeof(spi_pdata));
++	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
++	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
++	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
++	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
++	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
++	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
++	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
++	spi_pdata.boardinfo_setup_data = d;
++
++	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
++				       sizeof(spi_pdata));
++	if (err)
++		goto err_free_pdev;
++	err = platform_device_add(d->spi_pdev);
++	if (err)
++		goto err_free_pdata;
++	platform_set_drvdata(pdev, d);
++
++	printk(KERN_INFO PFX "MMC-Card \"%s\" "
++	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
++	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
++	       mmc_pdata->pins.gpio_do,
++	       mmc_pdata->pins.gpio_clk,
++	       mmc_pdata->pins.gpio_cs);
++
++	return 0;
++
++err_free_pdata:
++	kfree(d->spi_pdev->dev.platform_data);
++	d->spi_pdev->dev.platform_data = NULL;
++err_free_pdev:
++	platform_device_put(d->spi_pdev);
++err_free_d:
++	kfree(d);
++error:
++	return err;
++}
++
++static int gpiommc_remove(struct platform_device *pdev)
++{
++	struct gpiommc_device *d = platform_get_drvdata(pdev);
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	platform_device_unregister(d->spi_pdev);
++	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
++	       pdata->name);
++	platform_device_put(d->spi_pdev);
++
++	return 0;
++}
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++
++/* A device that was created through configfs */
++struct gpiommc_configfs_device {
++	struct config_item item;
++	/* The platform device, after registration. */
++	struct platform_device *pdev;
++	/* The configuration */
++	struct gpiommc_platform_data pdata;
++};
++
++#define GPIO_INVALID	-1
++
++static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
++{
++	return (dev->pdev != NULL);
++}
++
++static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
++{
++	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
++}
++
++static struct configfs_attribute gpiommc_attr_DI = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_in",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_DO = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_out",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CLK = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_clock",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS_activelow = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect_activelow",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spimode = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_mode",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spidelay = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_delay",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_max_bus_speed = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "max_bus_speed",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_register = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "register",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute *gpiommc_config_attrs[] = {
++	&gpiommc_attr_DI,
++	&gpiommc_attr_DO,
++	&gpiommc_attr_CLK,
++	&gpiommc_attr_CS,
++	&gpiommc_attr_CS_activelow,
++	&gpiommc_attr_spimode,
++	&gpiommc_attr_spidelay,
++	&gpiommc_attr_max_bus_speed,
++	&gpiommc_attr_register,
++	NULL,
++};
++
++static ssize_t gpiommc_config_attr_show(struct config_item *item,
++					struct configfs_attribute *attr,
++					char *page)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	ssize_t count = 0;
++	unsigned int gpio;
++	int err = 0;
++
++	if (attr == &gpiommc_attr_DI) {
++		gpio = dev->pdata.pins.gpio_di;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		gpio = dev->pdata.pins.gpio_do;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		gpio = dev->pdata.pins.gpio_clk;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		gpio = dev->pdata.pins.gpio_cs;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.pins.cs_activelow);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.mode);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 !dev->pdata.no_spi_delay);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.max_bus_speed);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_register) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 gpiommc_is_registered(dev));
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
++			       const char *name)
++{
++	int err;
++
++	if (gpiommc_is_registered(dev))
++		return 0;
++
++	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
++		printk(KERN_ERR PFX
++		       "configfs: Invalid GPIO pin number(s)\n");
++		return -EINVAL;
++	}
++
++	strlcpy(dev->pdata.name, name,
++		sizeof(dev->pdata.name));
++
++	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
++					  gpiommc_next_id());
++	if (!dev->pdev)
++		return -ENOMEM;
++	err = platform_device_add_data(dev->pdev, &dev->pdata,
++				       sizeof(dev->pdata));
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++	err = platform_device_add(dev->pdev);
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++
++	return 0;
++}
++
++static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
++{
++	if (!gpiommc_is_registered(dev))
++		return;
++
++	platform_device_unregister(dev->pdev);
++	dev->pdev = NULL;
++}
++
++static ssize_t gpiommc_config_attr_store(struct config_item *item,
++					 struct configfs_attribute *attr,
++					 const char *page, size_t count)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	int err = -EINVAL;
++	unsigned long data;
++
++	if (attr == &gpiommc_attr_register) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data == 1)
++			err = gpiommc_do_register(dev, item->ci_name);
++		if (data == 0) {
++			gpiommc_do_unregister(dev);
++			err = 0;
++		}
++		goto out;
++	}
++
++	if (gpiommc_is_registered(dev)) {
++		/* The rest of the config parameters can only be set
++		 * as long as the device is not registered, yet. */
++		err = -EBUSY;
++		goto out;
++	}
++
++	if (attr == &gpiommc_attr_DI) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_di = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_do = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_clk = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_cs = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.pins.cs_activelow = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		switch (data) {
++		case 0:
++			dev->pdata.mode = SPI_MODE_0;
++			break;
++		case 1:
++			dev->pdata.mode = SPI_MODE_1;
++			break;
++		case 2:
++			dev->pdata.mode = SPI_MODE_2;
++			break;
++		case 3:
++			dev->pdata.mode = SPI_MODE_3;
++			break;
++		default:
++			goto out;
++		}
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.no_spi_delay = !data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data > UINT_MAX)
++			goto out;
++		dev->pdata.max_bus_speed = data;
++		err = 0;
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static void gpiommc_config_item_release(struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	kfree(dev);
++}
++
++static struct configfs_item_operations gpiommc_config_item_ops = {
++	.release		= gpiommc_config_item_release,
++	.show_attribute		= gpiommc_config_attr_show,
++	.store_attribute	= gpiommc_config_attr_store,
++};
++
++static struct config_item_type gpiommc_dev_ci_type = {
++	.ct_item_ops	= &gpiommc_config_item_ops,
++	.ct_attrs	= gpiommc_config_attrs,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct config_item *gpiommc_make_item(struct config_group *group,
++					     const char *name)
++{
++	struct gpiommc_configfs_device *dev;
++
++	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
++		printk(KERN_ERR PFX "configfs: device name too long\n");
++		return NULL;
++	}
++
++	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++	if (!dev)
++		return NULL;
++
++	config_item_init_type_name(&dev->item, name,
++				   &gpiommc_dev_ci_type);
++
++	/* Assign default configuration */
++	dev->pdata.pins.gpio_di = GPIO_INVALID;
++	dev->pdata.pins.gpio_do = GPIO_INVALID;
++	dev->pdata.pins.gpio_clk = GPIO_INVALID;
++	dev->pdata.pins.gpio_cs = GPIO_INVALID;
++	dev->pdata.pins.cs_activelow = 1;
++	dev->pdata.mode = SPI_MODE_0;
++	dev->pdata.no_spi_delay = 0;
++	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
++
++	return &(dev->item);
++}
++
++static void gpiommc_drop_item(struct config_group *group,
++			      struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	gpiommc_do_unregister(dev);
++	kfree(dev);
++}
++
++static struct configfs_group_operations gpiommc_ct_group_ops = {
++	.make_item	= gpiommc_make_item,
++	.drop_item	= gpiommc_drop_item,
++};
++
++static struct config_item_type gpiommc_ci_type = {
++	.ct_group_ops	= &gpiommc_ct_group_ops,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct configfs_subsystem gpiommc_subsys = {
++	.su_group = {
++		.cg_item = {
++			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
++			.ci_type = &gpiommc_ci_type,
++		},
++	},
++	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
++};
++
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++static struct platform_driver gpiommc_plat_driver = {
++	.probe	= gpiommc_probe,
++	.remove	= gpiommc_remove,
++	.driver	= {
++		.name	= GPIOMMC_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++};
++
++int gpiommc_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(gpiommc_next_id);
++
++static int __init gpiommc_modinit(void)
++{
++	int err;
++
++	err = platform_driver_register(&gpiommc_plat_driver);
++	if (err)
++		return err;
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	config_group_init(&gpiommc_subsys.su_group);
++	err = configfs_register_subsystem(&gpiommc_subsys);
++	if (err) {
++		platform_driver_unregister(&gpiommc_plat_driver);
++		return err;
++	}
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++	return 0;
++}
++module_init(gpiommc_modinit);
++
++static void __exit gpiommc_modexit(void)
++{
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	configfs_unregister_subsystem(&gpiommc_subsys);
++#endif
++	platform_driver_unregister(&gpiommc_plat_driver);
++}
++module_exit(gpiommc_modexit);
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -485,6 +485,31 @@ config MMC_SDHI
+ 	  This provides support for the SDHI SD/SDIO controller found in
+ 	  SuperH and ARM SH-Mobile SoCs
+ 
++config GPIOMMC
++	tristate "MMC/SD over GPIO-based SPI"
++	depends on MMC && MMC_SPI && SPI_GPIO_OLD
++	help
++	  This driver hooks up the mmc_spi and spi_gpio modules so that
++	  MMC/SD cards can be used on a GPIO based bus by bitbanging
++	  the SPI protocol in software.
++
++	  This driver provides a configfs interface to dynamically create
++	  and destroy GPIO-based MMC/SD card devices. It also provides
++	  a platform device interface API.
++	  See Documentation/gpiommc.txt for details.
++
++	  The module will be called gpiommc.
++
++	  If unsure, say N.
++
++config GPIOMMC_CONFIGFS
++	bool
++	depends on GPIOMMC && CONFIGFS_FS
++	default y
++	help
++	  This option automatically enables configfs support for gpiommc
++	  if configfs is available.
++
+ config MMC_CB710
+ 	tristate "ENE CB710 MMC/SD Interface support"
+ 	depends on PCI
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -38,6 +38,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
+ obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o
+ obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
++obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
+ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
+ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
+ obj-$(CONFIG_MMC_DW_PLTFM)	+= dw_mmc-pltfm.o
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
+@@ -0,0 +1,71 @@
++/*
++ * Device driver for MMC/SD cards driven over a GPIO bus.
++ *
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * Licensed under the GNU/GPL version 2.
++ */
++#ifndef LINUX_GPIOMMC_H_
++#define LINUX_GPIOMMC_H_
++
++#include <linux/types.h>
++
++
++#define GPIOMMC_MAX_NAMELEN		15
++#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
++
++/**
++ * struct gpiommc_pins - Hardware pin assignments
++ *
++ * @gpio_di: The GPIO number of the DATA IN pin
++ * @gpio_do: The GPIO number of the DATA OUT pin
++ * @gpio_clk: The GPIO number of the CLOCK pin
++ * @gpio_cs: The GPIO number of the CHIPSELECT pin
++ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
++ */
++struct gpiommc_pins {
++	unsigned int gpio_di;
++	unsigned int gpio_do;
++	unsigned int gpio_clk;
++	unsigned int gpio_cs;
++	bool cs_activelow;
++};
++
++/**
++ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
++ *
++ * @name: The unique name string of the device.
++ * @pins: The hardware pin assignments.
++ * @mode: The hardware mode. This is either SPI_MODE_0,
++ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
++ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
++ *                This is not standards compliant, but may be required for some
++ *                embedded machines to gain reasonable speed.
++ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
++ */
++struct gpiommc_platform_data {
++	char name[GPIOMMC_MAX_NAMELEN + 1];
++	struct gpiommc_pins pins;
++	u8 mode;
++	bool no_spi_delay;
++	unsigned int max_bus_speed;
++};
++
++/**
++ * GPIOMMC_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a gpiommc device.
++ */
++#define GPIOMMC_PLATDEV_NAME	"gpiommc"
++
++/**
++ * gpiommc_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int gpiommc_next_id(void);
++
++#endif /* LINUX_GPIOMMC_H_ */
+--- /dev/null
++++ b/Documentation/gpiommc.txt
+@@ -0,0 +1,97 @@
++GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
++================================================================
++
++The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
++MMC or SD card on GPIO pins.
++
++Two interfaces for registering a new MMC/SD card device are provided:
++A static platform-device based mechanism and a dynamic configfs based interface.
++
++
++Registering devices via platform-device
++=======================================
++
++The platform-device interface is used for registering MMC/SD devices that are
++part of the hardware platform. This is most useful only for embedded machines
++with MMC/SD devices statically connected to the platform GPIO bus.
++
++The data structures are declared in <linux/mmc/gpiommc.h>.
++
++To register a new device, define an instance of struct gpiommc_platform_data.
++This structure holds any information about how the device is hooked up to the
++GPIO pins and what hardware modes the device supports. See the docbook-style
++documentation in the header file for more information on the struct fields.
++
++Then allocate a new instance of a platform device by doing:
++
++	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
++
++This will allocate the platform device data structures and hook it up to the
++gpiommc driver.
++Then add the gpiommc_platform_data to the platform device.
++
++	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
++
++You may free the local instance of struct gpiommc_platform_data now. (So the
++struct may be allocated on the stack, too).
++Now simply register the platform device.
++
++	err = platform_device_add(pdev);
++
++Done. The gpiommc probe routine will be invoked now and you should see a kernel
++log message for the added device.
++
++
++Registering devices via configfs
++================================
++
++MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
++selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
++hardware are a common situation.
++So we provide a dynamic interface to conveniently handle adding and removing
++devices from userspace, without the need to recompile the kernel.
++
++The "gpiommc" subdirectory at the configfs mountpoint is used for handling
++the dynamic configuration.
++
++To create a new device, it must first be allocated with mkdir.
++The following command will allocate a device named "my_mmc":
++	mkdir /config/gpiommc/my_mmc
++
++There are several configuration files available in the new
++/config/gpiommc/my_mmc/ directory:
++
++gpio_data_in			= The SPI data-IN GPIO pin number.
++gpio_data_out			= The SPI data-OUT GPIO pin number.
++gpio_clock			= The SPI Clock GPIO pin number.
++gpio_chipselect			= The SPI Chipselect GPIO pin number.
++gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
++				  If 1, Chipselect is active-LOW.
++spi_mode			= The SPI data mode. Can be 0-3.
++spi_delay			= Enable all delays in the lowlevel bitbanging.
++max_bus_speed			= The maximum SPI bus speed. In Hertz.
++
++register			= Not a configuration parameter.
++				  Used to register the configured card
++				  with the kernel.
++
++The device must first get configured and then registered by writing "1" to
++the "register" file.
++The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
++and "gpio_chipselect" are essential and _must_ be configured before writing
++"1" to the "register" file. The registration will fail, otherwise.
++
++The default values for the other parameters are:
++gpio_chipselect_activelow	= 1		(CS active-LOW)
++spi_mode			= 0		(SPI_MODE_0)
++spi_delay			= 1		(enabled)
++max_bus_speed			= 5000000	(5 Mhz)
++
++Configuration values can not be changed after registration. To unregister
++the device, write a "0" to the "register" file. The configuration can be
++changed again after unregistering.
++
++To completely remove the device, simply rmdir the directory
++(/config/gpiommc/my_mmc in this example).
++There's no need to first unregister the device before removing it. That will
++be done automatically.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3881,6 +3881,11 @@ L:	linuxppc-dev@lists.ozlabs.org
+ S:	Odd Fixes
+ F:	drivers/tty/hvc/
+ 
++GPIOMMC DRIVER
++P:	Michael Buesch
++M:	mb@bu3sch.de
++S:	Maintained
++
+ HARDWARE MONITORING
+ M:	Jean Delvare <khali@linux-fr.org>
+ M:	Guenter Roeck <linux@roeck-us.net>
diff --git a/trunk/target/linux/generic/patches-3.13/864-gpiommc_configfs_locking.patch b/trunk/target/linux/generic/patches-3.13/864-gpiommc_configfs_locking.patch
new file mode 100644
index 00000000..92815d91
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/864-gpiommc_configfs_locking.patch
@@ -0,0 +1,58 @@
+The gpiommc configfs context structure needs locking, as configfs
+does not lock access between files.
+
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
+ 	struct platform_device *pdev;
+ 	/* The configuration */
+ 	struct gpiommc_platform_data pdata;
++	/* Mutex to protect this structure */
++	struct mutex mutex;
+ };
+ 
+ #define GPIO_INVALID	-1
+@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	unsigned int gpio;
+ 	int err = 0;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_DI) {
+ 		gpio = dev->pdata.pins.gpio_di;
+ 		if (gpio == GPIO_INVALID)
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
+ 	int err = -EINVAL;
+ 	unsigned long data;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_register) {
+ 		err = kstrtoul(page, 10, &data);
+ 		if (err)
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
+ 	if (!dev)
+ 		return NULL;
+ 
++	mutex_init(&dev->mutex);
+ 	config_item_init_type_name(&dev->item, name,
+ 				   &gpiommc_dev_ci_type);
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/870-hifn795x_byteswap.patch b/trunk/target/linux/generic/patches-3.13/870-hifn795x_byteswap.patch
new file mode 100644
index 00000000..3a37c951
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/870-hifn795x_byteswap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/crypto/hifn_795x.c
++++ b/drivers/crypto/hifn_795x.c
+@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
+ 
+ static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
++	writel(val, dev->bar[0] + reg);
+ }
+ 
+ static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
++	writel(val, dev->bar[1] + reg);
+ }
+ 
+ static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/trunk/target/linux/generic/patches-3.13/880-gateworks_system_controller.patch b/trunk/target/linux/generic/patches-3.13/880-gateworks_system_controller.patch
new file mode 100644
index 00000000..6e4ae308
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/880-gateworks_system_controller.patch
@@ -0,0 +1,339 @@
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -492,6 +492,15 @@ config SENSORS_GL520SM
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called gl520sm.
+ 
++config SENSORS_GSC
++	tristate "Gateworks System Controller"
++	depends on I2C
++	help
++	  If you say yes here you get support for the Gateworks System Controller.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called gsc.
++
+ config SENSORS_GPIO_FAN
+ 	tristate "GPIO fan"
+ 	depends on GPIOLIB
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -142,6 +142,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l7
+ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
+ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
+ obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
++obj-$(CONFIG_SENSORS_GSC)	+= gsc.o
+ 
+ obj-$(CONFIG_PMBUS)		+= pmbus/
+ 
+--- /dev/null
++++ b/drivers/hwmon/gsc.c
+@@ -0,0 +1,308 @@
++/*
++ * A hwmon driver for the Gateworks System Controller 
++ * Copyright (C) 2009 Gateworks Corporation
++ *
++ * Author: Chris Lang <clang@gateworks.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License,
++ * as published by the Free Software Foundation - version 2.
++ */
++
++#include <linux/module.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++
++#define DRV_VERSION "0.2"
++
++enum chips { gsp };
++
++/* AD7418 registers */
++#define GSP_REG_TEMP_IN		0x00
++#define GSP_REG_VIN		0x02
++#define GSP_REG_3P3		0x05
++#define GSP_REG_BAT		0x08
++#define GSP_REG_5P0		0x0b
++#define GSP_REG_CORE		0x0e
++#define GSP_REG_CPU1		0x11
++#define GSP_REG_CPU2		0x14
++#define GSP_REG_DRAM		0x17
++#define GSP_REG_EXT_BAT		0x1a
++#define GSP_REG_IO1		0x1d
++#define GSP_REG_IO2 		0x20
++#define GSP_REG_PCIE		0x23
++#define GSP_REG_CURRENT		0x26
++#define GSP_FAN_0		0x2C
++#define GSP_FAN_1		0x2E
++#define GSP_FAN_2		0x30
++#define GSP_FAN_3		0x32
++#define GSP_FAN_4		0x34
++#define GSP_FAN_5		0x36
++
++struct gsp_sensor_info {
++	const char* name;
++	int reg;
++};
++
++static const struct gsp_sensor_info gsp_sensors[] = {
++	{"temp", GSP_REG_TEMP_IN},
++	{"vin", GSP_REG_VIN},
++	{"3p3", GSP_REG_3P3},
++	{"bat", GSP_REG_BAT},
++	{"5p0", GSP_REG_5P0},
++	{"core", GSP_REG_CORE},
++	{"cpu1", GSP_REG_CPU1},
++	{"cpu2", GSP_REG_CPU2},
++	{"dram", GSP_REG_DRAM},
++	{"ext_bat", GSP_REG_EXT_BAT},
++	{"io1", GSP_REG_IO1},
++	{"io2", GSP_REG_IO2},
++	{"pci2", GSP_REG_PCIE},
++	{"current", GSP_REG_CURRENT},
++	{"fan_point0", GSP_FAN_0},
++	{"fan_point1", GSP_FAN_1},
++	{"fan_point2", GSP_FAN_2},
++	{"fan_point3", GSP_FAN_3},
++	{"fan_point4", GSP_FAN_4},
++	{"fan_point5", GSP_FAN_5},
++};
++
++struct gsp_data {
++	struct device		*hwmon_dev;
++	struct attribute_group	attrs;
++	enum chips		type;
++};
++
++static int gsp_probe(struct i2c_client *client,
++			const struct i2c_device_id *id);
++static int gsp_remove(struct i2c_client *client);
++
++static const struct i2c_device_id gsp_id[] = {
++	{ "gsp", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, gsp_id);
++
++static struct i2c_driver gsp_driver = {
++	.driver = {
++		.name	= "gsp",
++	},
++	.probe		= gsp_probe,
++	.remove		= gsp_remove,
++	.id_table	= gsp_id,
++};
++
++/* All registers are word-sized, except for the configuration registers.
++ * AD7418 uses a high-byte first convention. Do NOT use those functions to
++ * access the configuration registers CONF and CONF2, as they are byte-sized.
++ */
++static inline int gsp_read(struct i2c_client *client, u8 reg)
++{
++	unsigned int adc = 0;
++	if (reg == GSP_REG_TEMP_IN || reg > GSP_REG_CURRENT)
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		return adc;
++	}
++	else
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		adc |= i2c_smbus_read_byte_data(client, reg + 2) << 16;
++		return adc;
++	}
++}
++
++static inline int gsp_write(struct i2c_client *client, u8 reg, u16 value)
++{
++	i2c_smbus_write_byte_data(client, reg, value & 0xff);
++	i2c_smbus_write_byte_data(client, reg + 1, ((value >> 8) & 0xff));
++	return 1;
++}
++
++static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
++			char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	return sprintf(buf, "%d\n", gsp_read(client, gsp_sensors[attr->index].reg));
++}
++
++static ssize_t show_label(struct device *dev,
++			struct device_attribute *devattr, char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++
++	return sprintf(buf, "%s\n", gsp_sensors[attr->index].name);
++}
++
++static ssize_t store_fan(struct device *dev,
++			struct device_attribute *devattr, const char *buf, size_t count)
++{
++	u16 val;
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	val = simple_strtoul(buf, NULL, 10);
++	gsp_write(client, gsp_sensors[attr->index].reg, val);
++	return count;
++}
++
++static SENSOR_DEVICE_ATTR(temp0_input, S_IRUGO, show_adc, NULL, 0);
++static SENSOR_DEVICE_ATTR(temp0_label, S_IRUGO, show_label, NULL, 0);
++
++static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_adc, NULL, 1);
++static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, show_label, NULL, 1);
++static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 2);
++static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, show_label, NULL, 2);
++static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 3);
++static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, show_label, NULL, 3);
++static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 4);
++static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 4);
++static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 5);
++static SENSOR_DEVICE_ATTR(in4_label, S_IRUGO, show_label, NULL, 5);
++static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_adc, NULL, 6);
++static SENSOR_DEVICE_ATTR(in5_label, S_IRUGO, show_label, NULL, 6);
++static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_adc, NULL, 7);
++static SENSOR_DEVICE_ATTR(in6_label, S_IRUGO, show_label, NULL, 7);
++static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_adc, NULL, 8);
++static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 8);
++static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, show_adc, NULL, 9);
++static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 9);
++static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_adc, NULL, 10);
++static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 10);
++static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_adc, NULL, 11);
++static SENSOR_DEVICE_ATTR(in10_label, S_IRUGO, show_label, NULL, 11);
++static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, show_adc, NULL, 12);
++static SENSOR_DEVICE_ATTR(in11_label, S_IRUGO, show_label, NULL, 12);
++static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, show_adc, NULL, 13);
++static SENSOR_DEVICE_ATTR(in12_label, S_IRUGO, show_label, NULL, 13);
++
++static SENSOR_DEVICE_ATTR(fan0_point0, S_IRUGO | S_IWUSR, show_adc, store_fan, 14);
++static SENSOR_DEVICE_ATTR(fan0_point1, S_IRUGO | S_IWUSR, show_adc, store_fan, 15);
++static SENSOR_DEVICE_ATTR(fan0_point2, S_IRUGO | S_IWUSR, show_adc, store_fan, 16);
++static SENSOR_DEVICE_ATTR(fan0_point3, S_IRUGO | S_IWUSR, show_adc, store_fan, 17);
++static SENSOR_DEVICE_ATTR(fan0_point4, S_IRUGO | S_IWUSR, show_adc, store_fan, 18);
++static SENSOR_DEVICE_ATTR(fan0_point5, S_IRUGO | S_IWUSR, show_adc, store_fan, 19);
++
++static struct attribute *gsp_attributes[] = {
++	&sensor_dev_attr_temp0_input.dev_attr.attr,
++	&sensor_dev_attr_in0_input.dev_attr.attr,
++	&sensor_dev_attr_in1_input.dev_attr.attr,
++	&sensor_dev_attr_in2_input.dev_attr.attr,
++	&sensor_dev_attr_in3_input.dev_attr.attr,
++	&sensor_dev_attr_in4_input.dev_attr.attr,
++	&sensor_dev_attr_in5_input.dev_attr.attr,
++	&sensor_dev_attr_in6_input.dev_attr.attr,
++	&sensor_dev_attr_in7_input.dev_attr.attr,
++	&sensor_dev_attr_in8_input.dev_attr.attr,
++	&sensor_dev_attr_in9_input.dev_attr.attr,
++	&sensor_dev_attr_in10_input.dev_attr.attr,
++	&sensor_dev_attr_in11_input.dev_attr.attr,
++	&sensor_dev_attr_in12_input.dev_attr.attr,
++
++	&sensor_dev_attr_temp0_label.dev_attr.attr,
++	&sensor_dev_attr_in0_label.dev_attr.attr,
++	&sensor_dev_attr_in1_label.dev_attr.attr,
++	&sensor_dev_attr_in2_label.dev_attr.attr,
++	&sensor_dev_attr_in3_label.dev_attr.attr,
++	&sensor_dev_attr_in4_label.dev_attr.attr,
++	&sensor_dev_attr_in5_label.dev_attr.attr,
++	&sensor_dev_attr_in6_label.dev_attr.attr,
++	&sensor_dev_attr_in7_label.dev_attr.attr,
++	&sensor_dev_attr_in8_label.dev_attr.attr,
++	&sensor_dev_attr_in9_label.dev_attr.attr,
++	&sensor_dev_attr_in10_label.dev_attr.attr,
++	&sensor_dev_attr_in11_label.dev_attr.attr,
++	&sensor_dev_attr_in12_label.dev_attr.attr,
++
++	&sensor_dev_attr_fan0_point0.dev_attr.attr,
++	&sensor_dev_attr_fan0_point1.dev_attr.attr,
++	&sensor_dev_attr_fan0_point2.dev_attr.attr,
++	&sensor_dev_attr_fan0_point3.dev_attr.attr,
++	&sensor_dev_attr_fan0_point4.dev_attr.attr,
++	&sensor_dev_attr_fan0_point5.dev_attr.attr,
++	NULL
++};
++
++
++static int gsp_probe(struct i2c_client *client,
++			 const struct i2c_device_id *id)
++{
++	struct i2c_adapter *adapter = client->adapter;
++	struct gsp_data *data;
++	int err;
++
++	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
++					I2C_FUNC_SMBUS_WORD_DATA)) {
++		err = -EOPNOTSUPP;
++		goto exit;
++	}
++
++	if (!(data = kzalloc(sizeof(struct gsp_data), GFP_KERNEL))) {
++		err = -ENOMEM;
++		goto exit;
++	}
++
++	i2c_set_clientdata(client, data);
++
++	data->type = id->driver_data;
++
++	switch (data->type) {
++	case 0:
++		data->attrs.attrs = gsp_attributes;
++		break;
++	}
++
++	dev_info(&client->dev, "%s chip found\n", client->name);
++
++	/* Register sysfs hooks */
++	if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
++		goto exit_free;
++
++	data->hwmon_dev = hwmon_device_register(&client->dev);
++	if (IS_ERR(data->hwmon_dev)) {
++		err = PTR_ERR(data->hwmon_dev);
++		goto exit_remove;
++	}
++
++	return 0;
++
++exit_remove:
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++exit_free:
++	kfree(data);
++exit:
++	return err;
++}
++
++static int gsp_remove(struct i2c_client *client)
++{
++	struct gsp_data *data = i2c_get_clientdata(client);
++	hwmon_device_unregister(data->hwmon_dev);
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++	kfree(data);
++	return 0;
++}
++
++static int __init gsp_init(void)
++{
++	return i2c_add_driver(&gsp_driver);
++}
++
++static void __exit gsp_exit(void)
++{
++	i2c_del_driver(&gsp_driver);
++}
++
++module_init(gsp_init);
++module_exit(gsp_exit);
++
++MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
++MODULE_DESCRIPTION("GSC HWMON driver");
++MODULE_LICENSE("GPL");
++MODULE_VERSION(DRV_VERSION);
++
diff --git a/trunk/target/linux/generic/patches-3.13/890-8250_optional_sysrq.patch b/trunk/target/linux/generic/patches-3.13/890-8250_optional_sysrq.patch
new file mode 100644
index 00000000..8e8c7abc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/890-8250_optional_sysrq.patch
@@ -0,0 +1,24 @@
+--- a/drivers/tty/serial/8250/8250_core.c
++++ b/drivers/tty/serial/8250/8250_core.c
+@@ -16,7 +16,7 @@
+  *  membase is an 'ioremapped' cookie.
+  */
+ 
+-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
++#if defined(CONFIG_SERIAL_8250_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ)
+ #define SUPPORT_SYSRQ
+ #endif
+ 
+--- a/drivers/tty/serial/8250/Kconfig
++++ b/drivers/tty/serial/8250/Kconfig
+@@ -90,6 +90,10 @@ config SERIAL_8250_CONSOLE
+ 
+ 	  If unsure, say N.
+ 
++config SERIAL_8250_SYSRQ
++	bool "Magic sysrq support on 8250/16550 devices"
++	depends on SERIAL_8250_CONSOLE
++
+ config FIX_EARLYCON_MEM
+ 	bool
+ 	depends on X86
diff --git a/trunk/target/linux/generic/patches-3.13/900-slab_maxsize.patch b/trunk/target/linux/generic/patches-3.13/900-slab_maxsize.patch
new file mode 100644
index 00000000..9a96d100
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/900-slab_maxsize.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -195,8 +195,8 @@ struct kmem_cache {
+  * to do various tricks to work around compiler limitations in order to
+  * ensure proper constant folding.
+  */
+-#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
+-				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
++#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
++				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
+ #define KMALLOC_SHIFT_MAX	KMALLOC_SHIFT_HIGH
+ #ifndef KMALLOC_SHIFT_LOW
+ #define KMALLOC_SHIFT_LOW	5
diff --git a/trunk/target/linux/generic/patches-3.13/901-debloat_sock_diag.patch b/trunk/target/linux/generic/patches-3.13/901-debloat_sock_diag.patch
new file mode 100644
index 00000000..7d18bbdc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/901-debloat_sock_diag.patch
@@ -0,0 +1,45 @@
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -88,6 +88,9 @@ source "net/netlabel/Kconfig"
+ 
+ endif # if INET
+ 
++config SOCK_DIAG
++	bool
++
+ config NETWORK_SECMARK
+ 	bool "Security Marking"
+ 	help
+--- a/net/core/Makefile
++++ b/net/core/Makefile
+@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
+ 
+ obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
+ 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
+-			sock_diag.o dev_ioctl.o
++			dev_ioctl.o
+ 
++obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
+ obj-$(CONFIG_XFRM) += flow.o
+ obj-y += net-sysfs.o
+ obj-$(CONFIG_PROC_FS) += net-procfs.o
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -390,6 +390,7 @@ config INET_LRO
+ 
+ config INET_DIAG
+ 	tristate "INET: socket monitoring interface"
++	select SOCK_DIAG
+ 	default y
+ 	---help---
+ 	  Support for INET (TCP, DCCP, etc) socket monitoring interface used by
+--- a/net/unix/Kconfig
++++ b/net/unix/Kconfig
+@@ -22,6 +22,7 @@ config UNIX
+ config UNIX_DIAG
+ 	tristate "UNIX: socket monitoring interface"
+ 	depends on UNIX
++	select SOCK_DIAG
+ 	default n
+ 	---help---
+ 	  Support for UNIX socket monitoring interface used by the ss tool.
diff --git a/trunk/target/linux/generic/patches-3.13/902-debloat_proc.patch b/trunk/target/linux/generic/patches-3.13/902-debloat_proc.patch
new file mode 100644
index 00000000..3b36497e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/902-debloat_proc.patch
@@ -0,0 +1,341 @@
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -2430,6 +2430,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_locks_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("locks", 0, NULL, &proc_locks_operations);
+ 	return 0;
+ }
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -71,3 +71,8 @@ config PROC_PAGE_MONITOR
+ 	  /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
+ 	  /proc/kpagecount, and /proc/kpageflags. Disabling these
+           interfaces will reduce the size of the kernel by approximately 4kb.
++
++config PROC_STRIPPED
++	default n
++	depends on EXPERT
++	bool "Strip non-essential /proc functionality to reduce code size"
+--- a/fs/proc/consoles.c
++++ b/fs/proc/consoles.c
+@@ -106,6 +106,9 @@ static const struct file_operations proc
+ 
+ static int __init proc_consoles_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	proc_create("consoles", 0, NULL, &proc_consoles_operations);
+ 	return 0;
+ }
+--- a/fs/proc/proc_tty.c
++++ b/fs/proc/proc_tty.c
+@@ -143,7 +143,10 @@ static const struct file_operations proc
+ void proc_tty_register_driver(struct tty_driver *driver)
+ {
+ 	struct proc_dir_entry *ent;
+-		
++
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!driver->driver_name || driver->proc_entry ||
+ 	    !driver->ops->proc_fops)
+ 		return;
+@@ -160,6 +163,9 @@ void proc_tty_unregister_driver(struct t
+ {
+ 	struct proc_dir_entry *ent;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ent = driver->proc_entry;
+ 	if (!ent)
+ 		return;
+@@ -174,6 +180,9 @@ void proc_tty_unregister_driver(struct t
+  */
+ void __init proc_tty_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!proc_mkdir("tty", NULL))
+ 		return;
+ 	proc_tty_ldisc = proc_mkdir("tty/ldisc", NULL);
+--- a/kernel/exec_domain.c
++++ b/kernel/exec_domain.c
+@@ -173,6 +173,8 @@ static const struct file_operations exec
+ 
+ static int __init proc_execdomains_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
+ 	return 0;
+ }
+--- a/kernel/irq/proc.c
++++ b/kernel/irq/proc.c
+@@ -311,6 +311,9 @@ void register_irq_proc(unsigned int irq,
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
+ 		return;
+ 
+@@ -347,6 +350,9 @@ void unregister_irq_proc(unsigned int ir
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || !desc->dir)
+ 		return;
+ #ifdef CONFIG_SMP
+@@ -382,6 +388,9 @@ void init_irq_proc(void)
+ 	unsigned int irq;
+ 	struct irq_desc *desc;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	/* create /proc/irq */
+ 	root_irq_dir = proc_mkdir("irq", NULL);
+ 	if (!root_irq_dir)
+--- a/kernel/time/timer_list.c
++++ b/kernel/time/timer_list.c
+@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs
+ {
+ 	struct proc_dir_entry *pe;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
+ 	if (!pe)
+ 		return -ENOMEM;
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -2665,6 +2665,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_vmalloc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
+ 	return 0;
+ }
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -1300,10 +1300,12 @@ static int __init setup_vmstat(void)
+ 	put_online_cpus();
+ #endif
+ #ifdef CONFIG_PROC_FS
+-	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
+-	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
++		proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++		proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
++	}
+ 	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
+-	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
+ #endif
+ 	return 0;
+ }
+--- a/net/8021q/vlanproc.c
++++ b/net/8021q/vlanproc.c
+@@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net)
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (vn->proc_vlan_conf)
+ 		remove_proc_entry(name_conf, vn->proc_vlan_dir);
+ 
+@@ -146,6 +149,9 @@ int __net_init vlan_proc_init(struct net
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
+ 	if (!vn->proc_vlan_dir)
+ 		goto err;
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2960,6 +2960,8 @@ static __net_initdata struct pernet_oper
+ 
+ static int __init proto_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	return register_pernet_subsys(&proto_net_ops);
+ }
+ 
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2581,10 +2581,12 @@ static const struct file_operations fib_
+ 
+ int __net_init fib_proc_init(struct net *net)
+ {
+-	if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
+ 		goto out1;
+ 
+-	if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_triestat", S_IRUGO, net->proc_net,
+ 			 &fib_triestat_fops))
+ 		goto out2;
+ 
+@@ -2594,17 +2596,21 @@ int __net_init fib_proc_init(struct net
+ 	return 0;
+ 
+ out3:
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_triestat", net->proc_net);
+ out2:
+-	remove_proc_entry("fib_trie", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_trie", net->proc_net);
+ out1:
+ 	return -ENOMEM;
+ }
+ 
+ void __net_exit fib_proc_exit(struct net *net)
+ {
+-	remove_proc_entry("fib_trie", net->proc_net);
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("fib_trie", net->proc_net);
++		remove_proc_entry("fib_triestat", net->proc_net);
++	}
+ 	remove_proc_entry("route", net->proc_net);
+ }
+ 
+--- a/net/ipv4/proc.c
++++ b/net/ipv4/proc.c
+@@ -516,6 +516,9 @@ static __net_initdata struct pernet_oper
+ 
+ int __init ip_misc_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_proc_ops);
+ }
+ 
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -424,6 +424,9 @@ static struct pernet_operations ip_rt_pr
+ 
+ static int __init ip_rt_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_rt_proc_ops);
+ }
+ 
+--- a/ipc/msg.c
++++ b/ipc/msg.c
+@@ -134,6 +134,9 @@ void __init msg_init(void)
+ 	printk(KERN_INFO "msgmni has been set to %d\n",
+ 		init_ipc_ns.msg_ctlmni);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ipc_init_proc_interface("sysvipc/msg",
+ 				"       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
+ 				IPC_MSG_IDS, sysvipc_msg_proc_show);
+--- a/ipc/sem.c
++++ b/ipc/sem.c
+@@ -191,6 +191,8 @@ void sem_exit_ns(struct ipc_namespace *n
+ void __init sem_init (void)
+ {
+ 	sem_init_ns(&init_ipc_ns);
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/sem",
+ 				"       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
+ 				IPC_SEM_IDS, sysvipc_sem_proc_show);
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init);
+ 
+ void __init shm_init (void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/shm",
+ #if BITS_PER_LONG <= 32
+ 				"       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
+--- a/ipc/util.c
++++ b/ipc/util.c
+@@ -171,6 +171,9 @@ void __init ipc_init_proc_interface(cons
+ 	struct proc_dir_entry *pde;
+ 	struct ipc_proc_iface *iface;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	iface = kmalloc(sizeof(*iface), GFP_KERNEL);
+ 	if (!iface)
+ 		return;
+--- a/net/core/net-procfs.c
++++ b/net/core/net-procfs.c
+@@ -318,10 +318,12 @@ static int __net_init dev_proc_net_init(
+ 
+ 	if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
+ 		goto out;
+-	if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("softnet_stat", S_IRUGO, net->proc_net,
+ 			 &softnet_seq_fops))
+ 		goto out_dev;
+-	if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
+ 		goto out_softnet;
+ 
+ 	if (wext_proc_init(net))
+@@ -330,9 +332,11 @@ static int __net_init dev_proc_net_init(
+ out:
+ 	return rc;
+ out_ptype:
+-	remove_proc_entry("ptype", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("ptype", net->proc_net);
+ out_softnet:
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("softnet_stat", net->proc_net);
+ out_dev:
+ 	remove_proc_entry("dev", net->proc_net);
+ 	goto out;
+@@ -342,8 +346,10 @@ static void __net_exit dev_proc_net_exit
+ {
+ 	wext_proc_exit(net);
+ 
+-	remove_proc_entry("ptype", net->proc_net);
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("ptype", net->proc_net);
++		remove_proc_entry("softnet_stat", net->proc_net);
++	}
+ 	remove_proc_entry("dev", net->proc_net);
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.13/903-debloat_direct_io.patch b/trunk/target/linux/generic/patches-3.13/903-debloat_direct_io.patch
new file mode 100644
index 00000000..2161388f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/903-debloat_direct_io.patch
@@ -0,0 +1,84 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -62,6 +62,11 @@ config FILE_LOCKING
+           for filesystems like NFS and for the flock() system
+           call. Disabling this option saves about 11k.
+ 
++config DIRECT_IO
++	bool "Enable O_DIRECT support" if EXPERT
++	depends on BLOCK
++	default y
++
+ source "fs/notify/Kconfig"
+ 
+ source "fs/quota/Kconfig"
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -14,7 +14,8 @@ obj-y :=	open.o read_write.o file_table.
+ 		stack.o fs_struct.o statfs.o
+ 
+ ifeq ($(CONFIG_BLOCK),y)
+-obj-y +=	buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
++obj-y +=	buffer.o bio.o block_dev.o mpage.o ioprio.o
++obj-$(CONFIG_DIRECT_IO) += direct-io.o
+ else
+ obj-y +=	no-block.o
+ endif
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2545,12 +2545,26 @@ enum {
+ 	DIO_SKIP_HOLES	= 0x02,
+ };
+ 
++#ifdef CONFIG_DIRECT_IO
+ void dio_end_io(struct bio *bio, int error);
+ 
+ ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
+ 	struct block_device *bdev, const struct iovec *iov, loff_t offset,
+ 	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
+ 	dio_submit_t submit_io,	int flags);
++#else
++static inline void dio_end_io(struct bio *bio, int error)
++{
++}
++static inline ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
++	struct block_device *bdev, const struct iovec *iov, loff_t offset,
++	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
++	dio_submit_t submit_io,	int flags)
++{
++	return -EOPNOTSUPP;
++}
++#endif
++
+ 
+ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
+ 		struct inode *inode, const struct iovec *iov, loff_t offset,
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -51,8 +51,10 @@ static int setfl(int fd, struct file * f
+ 		   arg |= O_NONBLOCK;
+ 
+ 	if (arg & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!filp->f_mapping || !filp->f_mapping->a_ops ||
+ 			!filp->f_mapping->a_ops->direct_IO)
++#endif
+ 				return -EINVAL;
+ 	}
+ 
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -665,9 +665,12 @@ int open_check_o_direct(struct file *f)
+ {
+ 	/* NB: we're sure to have correct a_ops only after f_op->open */
+ 	if (f->f_flags & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!f->f_mapping->a_ops ||
+ 		    ((!f->f_mapping->a_ops->direct_IO) &&
+-		    (!f->f_mapping->a_ops->get_xip_mem))) {
++		    (!f->f_mapping->a_ops->get_xip_mem)))
++#endif
++		{
+ 			return -EINVAL;
+ 		}
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.13/910-kobject_uevent.patch b/trunk/target/linux/generic/patches-3.13/910-kobject_uevent.patch
new file mode 100644
index 00000000..9ee9cff6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/910-kobject_uevent.patch
@@ -0,0 +1,21 @@
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -51,6 +51,18 @@ static const char *kobject_actions[] = {
+ 	[KOBJ_OFFLINE] =	"offline",
+ };
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	mutex_lock(&uevent_sock_mutex);
++	seq = ++uevent_seqnum;
++	mutex_unlock(&uevent_sock_mutex);
++
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ /**
+  * kobject_action_type - translate action string to numeric type
+  *
diff --git a/trunk/target/linux/generic/patches-3.13/911-kobject_add_broadcast_uevent.patch b/trunk/target/linux/generic/patches-3.13/911-kobject_add_broadcast_uevent.patch
new file mode 100644
index 00000000..251a358e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/911-kobject_add_broadcast_uevent.patch
@@ -0,0 +1,65 @@
+--- a/include/linux/kobject.h
++++ b/include/linux/kobject.h
+@@ -32,6 +32,8 @@
+ #define UEVENT_NUM_ENVP			32	/* number of env pointers */
+ #define UEVENT_BUFFER_SIZE		2048	/* buffer for the variables */
+ 
++struct sk_buff;
++
+ /* path to the userspace helper executed on an event */
+ extern char uevent_helper[];
+ 
+@@ -218,4 +220,7 @@ int add_uevent_var(struct kobj_uevent_en
+ int kobject_action_type(const char *buf, size_t count,
+ 			enum kobject_action *type);
+ 
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation);
++
+ #endif /* _KOBJECT_H_ */
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -382,6 +382,43 @@ int add_uevent_var(struct kobj_uevent_en
+ EXPORT_SYMBOL_GPL(add_uevent_var);
+ 
+ #if defined(CONFIG_NET)
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	struct uevent_sock *ue_sk;
++	int err = 0;
++
++	/* send netlink message */
++	mutex_lock(&uevent_sock_mutex);
++	list_for_each_entry(ue_sk, &uevent_sock_list, list) {
++		struct sock *uevent_sock = ue_sk->sk;
++		struct sk_buff *skb2;
++
++		skb2 = skb_clone(skb, allocation);
++		if (!skb2)
++			break;
++
++		err = netlink_broadcast(uevent_sock, skb2, pid, group,
++					allocation);
++		if (err)
++			break;
++	}
++	mutex_unlock(&uevent_sock_mutex);
++
++	kfree_skb(skb);
++	return err;
++}
++#else
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	kfree_skb(skb);
++	return 0;
++}
++#endif
++EXPORT_SYMBOL_GPL(broadcast_uevent);
++
++#if defined(CONFIG_NET)
+ static int uevent_net_init(struct net *net)
+ {
+ 	struct uevent_sock *ue_sk;
diff --git a/trunk/target/linux/generic/patches-3.13/921-use_preinit_as_init.patch b/trunk/target/linux/generic/patches-3.13/921-use_preinit_as_init.patch
new file mode 100644
index 00000000..8428c10e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/921-use_preinit_as_init.patch
@@ -0,0 +1,12 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -871,7 +871,8 @@ static int __ref kernel_init(void *unuse
+ 		pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
+ 			execute_command, ret);
+ 	}
+-	if (!try_to_run_init_process("/sbin/init") ||
++	if (!try_to_run_init_process("/etc/preinit") ||
++	    !try_to_run_init_process("/sbin/init") ||
+ 	    !try_to_run_init_process("/etc/init") ||
+ 	    !try_to_run_init_process("/bin/init") ||
+ 	    !try_to_run_init_process("/bin/sh"))
diff --git a/trunk/target/linux/generic/patches-3.13/922-always-create-console-node-in-initramfs.patch b/trunk/target/linux/generic/patches-3.13/922-always-create-console-node-in-initramfs.patch
new file mode 100644
index 00000000..3b308dd2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/922-always-create-console-node-in-initramfs.patch
@@ -0,0 +1,30 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -59,6 +59,18 @@ default_initramfs() {
+ 	EOF
+ }
+ 
++list_librecmc_initramfs() {
++	:
++}
++
++librecmc_initramfs() {
++	# make sure that /dev/console exists
++	cat <<-EOF >> ${output}
++		dir /dev 0755 0 0
++		nod /dev/console 0600 0 0 c 5 1
++	EOF
++}
++
+ filetype() {
+ 	local argv1="$1"
+ 
+@@ -177,6 +189,8 @@ dir_filelist() {
+ 	if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
+ 		${dep_list}print_mtime "$1"
+ 
++		${dep_list}librecmc_initramfs
++
+ 		echo "${dirlist}" | \
+ 		while read x; do
+ 			${dep_list}parse ${x}
diff --git a/trunk/target/linux/generic/patches-3.13/930-crashlog.patch b/trunk/target/linux/generic/patches-3.13/930-crashlog.patch
new file mode 100644
index 00000000..7066e99f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/930-crashlog.patch
@@ -0,0 +1,276 @@
+--- /dev/null
++++ b/include/linux/crashlog.h
+@@ -0,0 +1,17 @@
++#ifndef __CRASHLOG_H
++#define __CRASHLOG_H
++
++#ifdef CONFIG_CRASHLOG
++void crashlog_init_bootmem(struct bootmem_data *bdata);
++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
++#else
++static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
++{
++}
++
++static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++}
++#endif
++
++#endif
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1223,6 +1223,10 @@ config RELAY
+ 
+ 	  If unsure, say N.
+ 
++config CRASHLOG
++	bool "Crash logging"
++	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !(ARM || SPARC || PPC)
++
+ config BLK_DEV_INITRD
+ 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+ 	depends on BROKEN || !FRV
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -93,6 +93,7 @@ obj-$(CONFIG_PADATA) += padata.o
+ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
+ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
+ obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
++obj-$(CONFIG_CRASHLOG) += crashlog.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
+--- /dev/null
++++ b/kernel/crashlog.c
+@@ -0,0 +1,181 @@
++/*
++ * Crash information logger
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ *
++ * Based on ramoops.c
++ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
++ *
++ * This program is free software; you can redistribute 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 that 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/bootmem.h>
++#include <linux/memblock.h>
++#include <linux/debugfs.h>
++#include <linux/crashlog.h>
++#include <linux/kmsg_dump.h>
++#include <linux/module.h>
++#include <linux/pfn.h>
++#include <asm/io.h>
++
++#define CRASHLOG_PAGES	4
++#define CRASHLOG_SIZE	(CRASHLOG_PAGES * PAGE_SIZE)
++#define CRASHLOG_MAGIC	0xa1eedead
++
++/*
++ * Start the log at 1M before the end of RAM, as some boot loaders like
++ * to use the end of the RAM for stack usage and other things
++ * If this fails, fall back to using the last part.
++ */
++#define CRASHLOG_OFFSET	(1024 * 1024)
++
++struct crashlog_data {
++	u32 magic;
++	u32 len;
++	u8 data[];
++};
++
++static struct debugfs_blob_wrapper crashlog_blob;
++static unsigned long crashlog_addr = 0;
++static struct crashlog_data *crashlog_buf;
++static struct kmsg_dumper dump;
++static bool first = true;
++
++extern struct list_head *crashlog_modules;
++
++#ifndef CONFIG_NO_BOOTMEM
++void __init crashlog_init_bootmem(bootmem_data_t *bdata)
++{
++	unsigned long addr;
++
++	if (crashlog_addr)
++		return;
++
++	addr = PFN_PHYS(bdata->node_low_pfn) - CRASHLOG_OFFSET;
++	if (reserve_bootmem(addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", addr);
++		bdata->node_low_pfn -= CRASHLOG_PAGES;
++		addr = PFN_PHYS(bdata->node_low_pfn);
++	}
++	crashlog_addr = addr;
++}
++#endif
++
++#ifdef CONFIG_HAVE_MEMBLOCK
++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++	if (crashlog_addr)
++		return;
++
++	addr += size - CRASHLOG_OFFSET;
++	if (memblock_reserve(addr, CRASHLOG_SIZE)) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", (unsigned long) addr);
++		return;
++	}
++
++	crashlog_addr = addr;
++}
++#endif
++
++static void __init crashlog_copy(void)
++{
++	if (crashlog_buf->magic != CRASHLOG_MAGIC)
++		return;
++
++	if (!crashlog_buf->len || crashlog_buf->len >
++	    CRASHLOG_SIZE - sizeof(*crashlog_buf))
++		return;
++
++	crashlog_blob.size = crashlog_buf->len;
++	crashlog_blob.data = kmemdup(crashlog_buf->data,
++		crashlog_buf->len, GFP_KERNEL);
++
++	debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
++}
++
++static int get_maxlen(void)
++{
++	return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
++}
++
++static void crashlog_printf(const char *fmt, ...)
++{
++	va_list args;
++	int len = get_maxlen();
++
++	if (!len)
++		return;
++
++	va_start(args, fmt);
++	crashlog_buf->len += vscnprintf(
++		&crashlog_buf->data[crashlog_buf->len],
++		len, fmt, args);
++	va_end(args);
++}
++
++static void crashlog_do_dump(struct kmsg_dumper *dumper,
++		enum kmsg_dump_reason reason)
++{
++	struct timeval tv;
++	struct module *m;
++	char *buf;
++	size_t len;
++
++	if (!first)
++		crashlog_printf("\n===================================\n");
++
++	do_gettimeofday(&tv);
++	crashlog_printf("Time: %lu.%lu\n",
++		(long)tv.tv_sec, (long)tv.tv_usec);
++
++	if (first) {
++		crashlog_printf("Modules:");
++		list_for_each_entry(m, crashlog_modules, list) {
++			crashlog_printf("\t%s@%p+%x", m->name,
++			m->module_core, m->core_size,
++			m->module_init, m->init_size);
++		}
++		crashlog_printf("\n");
++		first = false;
++	}
++
++	buf = (char *)&crashlog_buf->data[crashlog_buf->len];
++
++	kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
++
++	crashlog_buf->len += len;
++}
++
++
++int __init crashlog_init_fs(void)
++{
++	if (!crashlog_addr)
++		return -ENOMEM;
++
++	crashlog_buf = ioremap(crashlog_addr, CRASHLOG_SIZE);
++
++	crashlog_copy();
++
++	crashlog_buf->magic = CRASHLOG_MAGIC;
++	crashlog_buf->len = 0;
++
++	dump.max_reason = KMSG_DUMP_OOPS;
++	dump.dump = crashlog_do_dump;
++	kmsg_dump_register(&dump);
++
++	return 0;
++}
++module_init(crashlog_init_fs);
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -15,6 +15,7 @@
+ #include <linux/export.h>
+ #include <linux/kmemleak.h>
+ #include <linux/range.h>
++#include <linux/crashlog.h>
+ #include <linux/memblock.h>
+ 
+ #include <asm/bug.h>
+@@ -177,6 +178,7 @@ static unsigned long __init free_all_boo
+ 	if (!bdata->node_bootmem_map)
+ 		return 0;
+ 
++	crashlog_init_bootmem(bdata);
+ 	map = bdata->node_bootmem_map;
+ 	start = bdata->node_min_pfn;
+ 	end = bdata->node_low_pfn;
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -106,6 +106,9 @@ static LIST_HEAD(modules);
+ #ifdef CONFIG_KGDB_KDB
+ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+ #endif /* CONFIG_KGDB_KDB */
++#ifdef CONFIG_CRASHLOG
++struct list_head *crashlog_modules = &modules;
++#endif
+ 
+ #ifdef CONFIG_MODULE_SIG
+ #ifdef CONFIG_MODULE_SIG_FORCE
+--- a/mm/memblock.c
++++ b/mm/memblock.c
+@@ -19,6 +19,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+ #include <linux/memblock.h>
++#include <linux/crashlog.h>
+ 
+ #include <asm-generic/sections.h>
+ 
+@@ -442,6 +443,8 @@ static void __init_memblock memblock_ins
+ 	memblock_set_region_node(rgn, nid);
+ 	type->cnt++;
+ 	type->total_size += size;
++	if (type == &memblock.memory && idx == 0)
++		crashlog_init_memblock(base, size);
+ }
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.13/940-ocf_kbuild_integration.patch b/trunk/target/linux/generic/patches-3.13/940-ocf_kbuild_integration.patch
new file mode 100644
index 00000000..7ad92374
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/940-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1415,3 +1415,6 @@ source "drivers/crypto/Kconfig"
+ source crypto/asymmetric_keys/Kconfig
+ 
+ endif	# if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -104,6 +104,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
+ obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
+ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
+ 
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #
diff --git a/trunk/target/linux/generic/patches-3.13/941-ocf_20120127.patch b/trunk/target/linux/generic/patches-3.13/941-ocf_20120127.patch
new file mode 100644
index 00000000..392b3fb6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/941-ocf_20120127.patch
@@ -0,0 +1,166 @@
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -139,6 +139,9 @@
+  * that might otherwise be identical and have very little entropy
+  * available to them (particularly common in the embedded world).
+  *
++ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++ *      int random_input_wait(void);
++ *
+  * add_input_randomness() uses the input layer interrupt timing, as well as
+  * the event type information from the hardware.
+  *
+@@ -152,6 +155,13 @@
+  * seek times do not make for good sources of entropy, as their seek
+  * times are usually fairly consistent.
+  *
++ * random_input_words() just provides a raw block of entropy to the input
++ * pool, such as from a hardware entropy generator.
++ *
++ * random_input_wait() suspends the caller until such time as the
++ * entropy pool falls below the write threshold, and returns a count of how
++ * much entropy (in bits) is needed to sustain the pool.
++ *
+  * All of these routines try to estimate how many bits of randomness a
+  * particular randomness source.  They do this by keeping track of the
+  * first and second order deltas of the event timings.
+@@ -889,6 +899,63 @@ void add_disk_randomness(struct gendisk
+ }
+ #endif
+ 
++/*
++ * random_input_words - add bulk entropy to pool
++ *
++ * @buf: buffer to add
++ * @wordcount: number of __u32 words to add
++ * @ent_count: total amount of entropy (in bits) to credit
++ *
++ * this provides bulk input of entropy to the input pool
++ *
++ */
++void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++{
++	mix_pool_bytes(&input_pool, buf, wordcount*4, NULL);
++
++	credit_entropy_bits(&input_pool, ent_count);
++
++	pr_notice("crediting %d bits => %d\n",
++		  ent_count, input_pool.entropy_count);
++	/*
++	 * Wake up waiting processes if we have enough
++	 * entropy.
++	 */
++	if (input_pool.entropy_count >= random_read_wakeup_thresh)
++		wake_up_interruptible(&random_read_wait);
++}
++EXPORT_SYMBOL(random_input_words);
++
++/*
++ * random_input_wait - wait until random needs entropy
++ *
++ * this function sleeps until the /dev/random subsystem actually
++ * needs more entropy, and then return the amount of entropy
++ * that it would be nice to have added to the system.
++ */
++int random_input_wait(void)
++{
++	int count;
++
++	wait_event_interruptible(random_write_wait, 
++			 input_pool.entropy_count < random_write_wakeup_thresh);
++
++	count = random_write_wakeup_thresh - input_pool.entropy_count;
++
++        /* likely we got woken up due to a signal */
++	if (count <= 0) count = random_read_wakeup_thresh; 
++
++	pr_notice("requesting %d bits from input_wait()er %d<%d\n",
++		  count,
++		  input_pool.entropy_count, random_write_wakeup_thresh);
++
++	return count;
++}
++EXPORT_SYMBOL(random_input_wait);
++
++
++#define EXTRACT_SIZE 10
++
+ /*********************************************************************
+  *
+  * Entropy extraction routines
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -147,6 +147,7 @@ pid_t f_getown(struct file *filp)
+ 	read_unlock(&filp->f_owner.lock);
+ 	return pid;
+ }
++EXPORT_SYMBOL(sys_dup);
+ 
+ static int f_setown_ex(struct file *filp, unsigned long arg)
+ {
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -19,6 +19,7 @@
+ #define APOLLO_MOUSE_MINOR	7
+ #define PC110PAD_MINOR		9
+ /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
++#define CRYPTODEV_MINOR		70	/* /dev/crypto */
+ #define WATCHDOG_MINOR		130	/* Watchdog timer     */
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+--- a/include/uapi/linux/random.h
++++ b/include/uapi/linux/random.h
+@@ -34,6 +34,30 @@
+ /* Clear the entropy pool and associated counters.  (Superuser only.) */
+ #define RNDCLEARPOOL	_IO( 'R', 0x06 )
+ 
++#ifdef CONFIG_FIPS_RNG
++
++/* Size of seed value - equal to AES blocksize */
++#define AES_BLOCK_SIZE_BYTES	16
++#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
++/* Size of AES key */
++#define KEY_SIZE_BYTES		16
++
++/* ioctl() structure used by FIPS 140-2 Tests */
++struct rand_fips_test {
++	unsigned char key[KEY_SIZE_BYTES];			/* Input */
++	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
++	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
++	unsigned char result[SEED_SIZE_BYTES];		/* Output */
++};
++
++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
++#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
++
++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
++#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
++
++#endif /* #ifdef CONFIG_FIPS_RNG */
++
+ struct rand_pool_info {
+ 	int	entropy_count;
+ 	int	buf_size;
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -14,6 +14,10 @@ extern void add_input_randomness(unsigne
+ 				 unsigned int value);
+ extern void add_interrupt_randomness(int irq, int irq_flags);
+ 
++extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
++extern int random_input_wait(void);
++#define HAS_RANDOM_INPUT_WAIT 1
++
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -425,6 +425,7 @@ void transfer_pid(struct task_struct *ol
+ 	new->pids[type].pid = old->pids[type].pid;
+ 	hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
diff --git a/trunk/target/linux/generic/patches-3.13/960-decompress_unlzo_fix.patch b/trunk/target/linux/generic/patches-3.13/960-decompress_unlzo_fix.patch
new file mode 100644
index 00000000..ee7c118e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/960-decompress_unlzo_fix.patch
@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/include/linux/decompress/unlzo_mm.h
+@@ -0,0 +1,10 @@
++#ifndef UNLZO_MM_H
++#define UNLZO_MM_H
++
++#ifdef STATIC
++#define INIT
++#else
++#define INIT __init
++#endif
++
++#endif
+--- a/lib/decompress_unlzo.c
++++ b/lib/decompress_unlzo.c
+@@ -38,6 +38,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/lzo.h>
++#include <linux/decompress/unlzo_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #include <linux/compiler.h>
diff --git a/trunk/target/linux/generic/patches-3.13/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/trunk/target/linux/generic/patches-3.13/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 00000000..ac13c9e6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/970-remove-unsane-filenames-from-deps_initramfs-list.patch
@@ -0,0 +1,29 @@
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data
+ 	include $(obj)/.initramfs_data.cpio.d
+ endif
+ 
++deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
++
+ quiet_cmd_initfs = GEN     $@
+       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+ 
+@@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra
+ 	initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
+ 	initramfs_data.cpio
+ # do not try to update files included in initramfs
+-$(deps_initramfs): ;
++$(deps_initramfs_sane): ;
+ 
+-$(deps_initramfs): klibcdirs
++$(deps_initramfs_sane): klibcdirs
+ # We rebuild initramfs_data.cpio if:
+ # 1) Any included file is newer then initramfs_data.cpio
+ # 2) There are changes in which files are included (added or deleted)
+ # 3) If gen_init_cpio are newer than initramfs_data.cpio
+ # 4) arguments to gen_initramfs.sh changes
+-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
++$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
+ 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
+ 	$(call if_changed,initfs)
diff --git a/trunk/target/linux/generic/patches-3.13/980-arm_openwrt_machtypes.patch b/trunk/target/linux/generic/patches-3.13/980-arm_openwrt_machtypes.patch
new file mode 100644
index 00000000..8303344b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/980-arm_openwrt_machtypes.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1007,3 +1007,29 @@ eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572
+ eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573
+ domotab			MACH_DOMOTAB		DOMOTAB			4574
+ pfla03			MACH_PFLA03		PFLA03			4575
++#
++# Additional mach-types supported by libreCMC
++#
++wg302v1			MACH_WG302V1		WG302V1			889
++pronghorn		MACH_PRONGHORN		PRONGHORN		928
++pronghorn_metro		MACH_PRONGHORNMETRO	PRONGHORNMETRO		1040
++sidewinder		MACH_SIDEWINDER		SIDEWINDER		1041
++wrt300nv2		MACH_WRT300NV2		WRT300NV2		1077
++compex42x		MACH_COMPEXWP18		COMPEXWP18		1273
++goldfish		MACH_GOLDFISH		GOLDFISH		1441
++cambria			MACH_CAMBRIA		CAMBRIA			1468
++dt2			MACH_DT2		DT2			1514
++ap1000			MACH_AP1000		AP1000			1543
++tw2662			MACH_TW2662		TW2662			1658
++tw5334			MACH_TW5334		TW5334			1664
++usr8200			MACH_USR8200		USR8200			1762
++mi424wr			MACH_MI424WR		MI424WR			1778
++gw2388			MACH_GW2388		GW2388			2635
++iconnect		MACH_ICONNECT		ICONNECT		2870
++nsb3ast			MACH_NSB3AST		NSB3AST			2917
++goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089
++nas6210			MACH_NAS6210		NAS6210			3104
++ns_k330			MACH_NS_K330		NS_K330			3108
++bcm2708			MACH_BCM2708		BCM2708			3138
++wn802t			MACH_WN802T		WN802T			3306
++nsa310			MACH_NSA310		NSA310			4022
diff --git a/trunk/target/linux/generic/patches-3.13/990-gpio_wdt.patch b/trunk/target/linux/generic/patches-3.13/990-gpio_wdt.patch
new file mode 100644
index 00000000..9fa69d4c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/990-gpio_wdt.patch
@@ -0,0 +1,360 @@
+This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
+
+Signed-off-by: Mathias Adam <m.adam--librecmc@adamis.de>
+
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -1065,6 +1065,15 @@ config WDT_MTX1
+ 	  Hardware driver for the MTX-1 boards. This is a watchdog timer that
+ 	  will reboot the machine after a 100 seconds timer expired.
+ 
++config GPIO_WDT
++	tristate "GPIO Hardware Watchdog"
++ 	help
++	  Hardware driver for GPIO-controlled watchdogs. GPIO pin and
++	  toggle interval settings are platform-specific. The driver
++	  will stop toggling the GPIO (i.e. machine reboots) after a
++	  100 second timer expired and no process has written to
++	  /dev/watchdog during that time.
++
+ config PNX833X_WDT
+ 	tristate "PNX833x Hardware Watchdog"
+ 	depends on SOC_PNX8335
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -129,6 +129,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
+ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
++obj-$(CONFIG_GPIO_WDT) += gpio_wdt.o
+ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
+ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
+ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+--- /dev/null
++++ b/drivers/watchdog/gpio_wdt.c
+@@ -0,0 +1,301 @@
++/*
++ *      Driver for GPIO-controlled Hardware Watchdogs.
++ *
++ *      Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *      Replaces mtx1_wdt (driver for the MTX-1 Watchdog):
++ *
++ *      (C) Copyright 2005 4G Systems <info@4g-systems.biz>,
++ *                              All Rights Reserved.
++ *                              http://www.4g-systems.biz
++ *
++ *      (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
++ *
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ *
++ *      Neither Michael Stickel nor 4G Systems admit liability nor provide
++ *      warranty for any of this software. This material is provided
++ *      "AS-IS" and at no charge.
++ *
++ *      (c) Copyright 2005    4G Systems <info@4g-systems.biz>
++ *
++ *      Release 0.01.
++ *      Author: Michael Stickel  michael.stickel@4g-systems.biz
++ *
++ *      Release 0.02.
++ *      Author: Florian Fainelli florian@openwrt.org
++ *              use the Linux watchdog/timer APIs
++ *
++ *      Release 0.03.
++ *      Author: Mathias Adam <m.adam--linux@adamis.de>
++ *              make it a generic gpio watchdog driver
++ *
++ *      The Watchdog is configured to reset the MTX-1
++ *      if it is not triggered for 100 seconds.
++ *      It should not be triggered more often than 1.6 seconds.
++ *
++ *      A timer triggers the watchdog every 5 seconds, until
++ *      it is opened for the first time. After the first open
++ *      it MUST be triggered every 2..95 seconds.
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/miscdevice.h>
++#include <linux/fs.h>
++#include <linux/init.h>
++#include <linux/ioport.h>
++#include <linux/timer.h>
++#include <linux/completion.h>
++#include <linux/jiffies.h>
++#include <linux/watchdog.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/uaccess.h>
++#include <linux/gpio.h>
++#include <linux/gpio_wdt.h>
++
++static int ticks = 100 * HZ;
++
++static struct {
++	struct completion stop;
++	spinlock_t lock;
++	int running;
++	struct timer_list timer;
++	int queue;
++	int default_ticks;
++	unsigned long inuse;
++	unsigned gpio;
++	unsigned int gstate;
++	int interval;
++	int first_interval;
++} gpio_wdt_device;
++
++static void gpio_wdt_trigger(unsigned long unused)
++{
++	spin_lock(&gpio_wdt_device.lock);
++	if (gpio_wdt_device.running && ticks > 0)
++		ticks -= gpio_wdt_device.interval;
++
++	/* toggle wdt gpio */
++	gpio_wdt_device.gstate = !gpio_wdt_device.gstate;
++	gpio_set_value(gpio_wdt_device.gpio, gpio_wdt_device.gstate);
++
++	if (gpio_wdt_device.queue && ticks > 0)
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.interval);
++	else
++		complete(&gpio_wdt_device.stop);
++	spin_unlock(&gpio_wdt_device.lock);
++}
++
++static void gpio_wdt_reset(void)
++{
++	ticks = gpio_wdt_device.default_ticks;
++}
++
++
++static void gpio_wdt_start(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (!gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 1;
++		gpio_wdt_device.gstate = 1;
++		gpio_set_value(gpio_wdt_device.gpio, 1);
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.first_interval);
++	}
++	gpio_wdt_device.running++;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++}
++
++static int gpio_wdt_stop(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		gpio_wdt_device.gstate = 0;
++		gpio_set_value(gpio_wdt_device.gpio, 0);
++	}
++	ticks = gpio_wdt_device.default_ticks;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++	return 0;
++}
++
++/* Filesystem functions */
++
++static int gpio_wdt_open(struct inode *inode, struct file *file)
++{
++	if (test_and_set_bit(0, &gpio_wdt_device.inuse))
++		return -EBUSY;
++	return nonseekable_open(inode, file);
++}
++
++
++static int gpio_wdt_release(struct inode *inode, struct file *file)
++{
++	clear_bit(0, &gpio_wdt_device.inuse);
++	return 0;
++}
++
++static long gpio_wdt_ioctl(struct file *file, unsigned int cmd,
++							unsigned long arg)
++{
++	void __user *argp = (void __user *)arg;
++	int __user *p = (int __user *)argp;
++	unsigned int value;
++	static const struct watchdog_info ident = {
++		.options = WDIOF_CARDRESET,
++		.identity = "GPIO WDT",
++	};
++
++	switch (cmd) {
++	case WDIOC_GETSUPPORT:
++		if (copy_to_user(argp, &ident, sizeof(ident)))
++			return -EFAULT;
++		break;
++	case WDIOC_GETSTATUS:
++	case WDIOC_GETBOOTSTATUS:
++		put_user(0, p);
++		break;
++	case WDIOC_SETOPTIONS:
++		if (get_user(value, p))
++			return -EFAULT;
++		if (value & WDIOS_ENABLECARD)
++			gpio_wdt_start();
++		else if (value & WDIOS_DISABLECARD)
++			gpio_wdt_stop();
++		else
++			return -EINVAL;
++		return 0;
++	case WDIOC_KEEPALIVE:
++		gpio_wdt_reset();
++		break;
++	default:
++		return -ENOTTY;
++	}
++	return 0;
++}
++
++
++static ssize_t gpio_wdt_write(struct file *file, const char *buf,
++						size_t count, loff_t *ppos)
++{
++	if (!count)
++		return -EIO;
++	gpio_wdt_reset();
++	return count;
++}
++
++static const struct file_operations gpio_wdt_fops = {
++	.owner		= THIS_MODULE,
++	.llseek		= no_llseek,
++	.unlocked_ioctl	= gpio_wdt_ioctl,
++	.open		= gpio_wdt_open,
++	.write		= gpio_wdt_write,
++	.release	= gpio_wdt_release,
++};
++
++
++static struct miscdevice gpio_wdt_misc = {
++	.minor	= WATCHDOG_MINOR,
++	.name	= "watchdog",
++	.fops	= &gpio_wdt_fops,
++};
++
++
++static int gpio_wdt_probe(struct platform_device *pdev)
++{
++	int ret;
++	struct gpio_wdt_platform_data *gpio_wdt_data = pdev->dev.platform_data;
++
++	gpio_wdt_device.gpio = gpio_wdt_data->gpio;
++	gpio_wdt_device.interval = gpio_wdt_data->interval;
++	gpio_wdt_device.first_interval = gpio_wdt_data->first_interval;
++	if (gpio_wdt_device.first_interval <= 0) {
++		gpio_wdt_device.first_interval = gpio_wdt_device.interval;
++	}
++
++	ret = gpio_request(gpio_wdt_device.gpio, "gpio-wdt");
++	if (ret < 0) {
++		dev_err(&pdev->dev, "failed to request gpio");
++		return ret;
++	}
++
++	spin_lock_init(&gpio_wdt_device.lock);
++	init_completion(&gpio_wdt_device.stop);
++	gpio_wdt_device.queue = 0;
++	clear_bit(0, &gpio_wdt_device.inuse);
++	setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
++	gpio_wdt_device.default_ticks = ticks;
++
++	gpio_wdt_start();
++	dev_info(&pdev->dev, "GPIO Hardware Watchdog driver (gpio=%i interval=%i/%i)\n",
++		gpio_wdt_data->gpio, gpio_wdt_data->first_interval, gpio_wdt_data->interval);
++	return 0;
++}
++
++static int gpio_wdt_remove(struct platform_device *pdev)
++{
++	/* FIXME: do we need to lock this test ? */
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		wait_for_completion(&gpio_wdt_device.stop);
++	}
++
++	gpio_free(gpio_wdt_device.gpio);
++	misc_deregister(&gpio_wdt_misc);
++	return 0;
++}
++
++static struct platform_driver gpio_wdt_driver = {
++	.probe = gpio_wdt_probe,
++	.remove = gpio_wdt_remove,
++	.driver.name = "gpio-wdt",
++	.driver.owner = THIS_MODULE,
++};
++
++static int __init gpio_wdt_init(void)
++{
++	return platform_driver_register(&gpio_wdt_driver);
++}
++arch_initcall(gpio_wdt_init);
++
++/*
++ * We do wdt initialization in two steps: arch_initcall probes the wdt
++ * very early to start pinging the watchdog (misc devices are not yet
++ * available), and later module_init() just registers the misc device.
++ */
++static int gpio_wdt_init_late(void)
++{
++	int ret;
++
++	ret = misc_register(&gpio_wdt_misc);
++	if (ret < 0) {
++		pr_err("GPIO_WDT: failed to register misc device\n");
++		return ret;
++	}
++	return 0;
++}
++#ifndef MODULE
++module_init(gpio_wdt_init_late);
++#endif
++
++static void __exit gpio_wdt_exit(void)
++{
++	platform_driver_unregister(&gpio_wdt_driver);
++}
++module_exit(gpio_wdt_exit);
++
++MODULE_AUTHOR("Michael Stickel, Florian Fainelli, Mathias Adam");
++MODULE_DESCRIPTION("Driver for GPIO hardware watchdogs");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
++MODULE_ALIAS("platform:gpio-wdt");
+--- /dev/null
++++ b/include/linux/gpio_wdt.h
+@@ -0,0 +1,21 @@
++/*
++ *  Definitions for the GPIO watchdog driver
++ *
++ *  Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ *
++ */
++
++#ifndef _GPIO_WDT_H_
++#define _GPIO_WDT_H_
++
++struct gpio_wdt_platform_data {
++	int	gpio;		/* GPIO line number */
++	int	interval;	/* watchdog reset interval in system ticks */
++	int	first_interval;	/* first wd reset interval in system ticks */
++};
++
++#endif /* _GPIO_WDT_H_ */
diff --git a/trunk/target/linux/generic/patches-3.13/996-zsmalloc_allow_module_build.patch b/trunk/target/linux/generic/patches-3.13/996-zsmalloc_allow_module_build.patch
new file mode 100644
index 00000000..ae9cba19
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/996-zsmalloc_allow_module_build.patch
@@ -0,0 +1,9 @@
+--- a/drivers/staging/zsmalloc/Kconfig
++++ b/drivers/staging/zsmalloc/Kconfig
+@@ -1,5 +1,5 @@
+ config ZSMALLOC
+-	bool "Memory allocator for compressed pages"
++	tristate "Memory allocator for compressed pages"
+ 	depends on MMU
+ 	default n
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch b/trunk/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch
new file mode 100644
index 00000000..8e87b1f0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/997-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -817,6 +817,9 @@ int __init early_init_dt_scan_chosen(uns
+ 	p = of_get_flat_dt_prop(node, "bootargs", &l);
+ 	if (p != NULL && l > 0)
+ 		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
++	p = of_get_flat_dt_prop(node, "bootargs-append", &l);
++	if (p != NULL && l > 0)
++		strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE));
+ 
+ 	/*
+ 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
diff --git a/trunk/target/linux/generic/patches-3.13/998-enable_wilink_platform_without_drivers.patch b/trunk/target/linux/generic/patches-3.13/998-enable_wilink_platform_without_drivers.patch
new file mode 100644
index 00000000..d317de11
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.13/998-enable_wilink_platform_without_drivers.patch
@@ -0,0 +1,15 @@
+We use backports for driver updates - make sure we can compile in the glue code regardless
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/drivers/net/wireless/ti/Kconfig
++++ b/drivers/net/wireless/ti/Kconfig
+@@ -15,7 +15,7 @@ source "drivers/net/wireless/ti/wlcore/K
+ 
+ config WILINK_PLATFORM_DATA
+ 	bool "TI WiLink platform data"
+-	depends on WLCORE_SDIO || WL1251_SDIO
++	depends on WLCORE_SDIO || WL1251_SDIO || ARCH_OMAP2PLUS
+ 	default y
+ 	---help---
+ 	Small platform data bit needed to pass data to the sdio modules.
diff --git a/trunk/target/linux/generic/patches-3.14/000-keep_initrafs_the_default.patch b/trunk/target/linux/generic/patches-3.14/000-keep_initrafs_the_default.patch
new file mode 100644
index 00000000..b5b1955f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/000-keep_initrafs_the_default.patch
@@ -0,0 +1,25 @@
+Upstream changed the default rootfs to tmpfs when none has been passed
+to the kernel - this doesn't fit our purposes, so change it back.
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -622,6 +622,7 @@ int __init init_rootfs(void)
+ 	if (err)
+ 		return err;
+ 
++#if 0
+ 	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+ 		(!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
+ 		err = shmem_init();
+@@ -629,6 +630,9 @@ int __init init_rootfs(void)
+ 	} else {
+ 		err = init_ramfs_fs();
+ 	}
++#else
++	err = init_ramfs_fs();
++#endif
+ 
+ 	if (err)
+ 		unregister_filesystem(&rootfs_fs_type);
diff --git a/trunk/target/linux/generic/patches-3.14/020-ssb_update.patch b/trunk/target/linux/generic/patches-3.14/020-ssb_update.patch
new file mode 100644
index 00000000..e1fd275a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/020-ssb_update.patch
@@ -0,0 +1,321 @@
+--- a/drivers/ssb/b43_pci_bridge.c
++++ b/drivers/ssb/b43_pci_bridge.c
+@@ -38,6 +38,7 @@ static const struct pci_device_id b43_pc
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) },
+ 	{ 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
+--- a/drivers/ssb/driver_gpio.c
++++ b/drivers/ssb/driver_gpio.c
+@@ -475,7 +475,8 @@ int ssb_gpio_unregister(struct ssb_bus *
+ {
+ 	if (ssb_chipco_available(&bus->chipco) ||
+ 	    ssb_extif_available(&bus->extif)) {
+-		return gpiochip_remove(&bus->gpio);
++		gpiochip_remove(&bus->gpio);
++		return 0;
+ 	} else {
+ 		SSB_WARN_ON(1);
+ 	}
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -326,13 +326,13 @@ err_ctlreg:
+ 	return err;
+ }
+ 
+-static s8 r123_extract_antgain(u8 sprom_revision, const u16 *in,
+-			       u16 mask, u16 shift)
++static s8 sprom_extract_antgain(u8 sprom_revision, const u16 *in, u16 offset,
++				u16 mask, u16 shift)
+ {
+ 	u16 v;
+ 	u8 gain;
+ 
+-	v = in[SPOFF(SSB_SPROM1_AGAIN)];
++	v = in[SPOFF(offset)];
+ 	gain = (v & mask) >> shift;
+ 	if (gain == 0xFF)
+ 		gain = 2; /* If unset use 2dBm */
+@@ -416,12 +416,14 @@ static void sprom_extract_r123(struct ss
+ 	SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
+-						    SSB_SPROM1_AGAIN_BG,
+-						    SSB_SPROM1_AGAIN_BG_SHIFT);
+-	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
+-						    SSB_SPROM1_AGAIN_A,
+-						    SSB_SPROM1_AGAIN_A_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM1_AGAIN,
++						     SSB_SPROM1_AGAIN_BG,
++						     SSB_SPROM1_AGAIN_BG_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM1_AGAIN,
++						     SSB_SPROM1_AGAIN_A,
++						     SSB_SPROM1_AGAIN_A_SHIFT);
+ 	if (out->revision >= 2)
+ 		sprom_extract_r23(out, in);
+ }
+@@ -468,7 +470,15 @@ static void sprom_extract_r458(struct ss
+ 
+ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
+ {
++	static const u16 pwr_info_offset[] = {
++		SSB_SPROM4_PWR_INFO_CORE0, SSB_SPROM4_PWR_INFO_CORE1,
++		SSB_SPROM4_PWR_INFO_CORE2, SSB_SPROM4_PWR_INFO_CORE3
++	};
+ 	u16 il0mac_offset;
++	int i;
++
++	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
++		     ARRAY_SIZE(out->core_pwr_info));
+ 
+ 	if (out->revision == 4)
+ 		il0mac_offset = SSB_SPROM4_IL0MAC;
+@@ -524,14 +534,59 @@ static void sprom_extract_r45(struct ssb
+ 	}
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
+-	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
+-	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
+-	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
+-	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN01,
++						     SSB_SPROM4_AGAIN0,
++						     SSB_SPROM4_AGAIN0_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN01,
++						     SSB_SPROM4_AGAIN1,
++						     SSB_SPROM4_AGAIN1_SHIFT);
++	out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN23,
++						     SSB_SPROM4_AGAIN2,
++						     SSB_SPROM4_AGAIN2_SHIFT);
++	out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM4_AGAIN23,
++						     SSB_SPROM4_AGAIN3,
++						     SSB_SPROM4_AGAIN3_SHIFT);
++
++	/* Extract cores power info info */
++	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
++		u16 o = pwr_info_offset[i];
++
++		SPEX(core_pwr_info[i].itssi_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
++			SSB_SPROM4_2G_ITSSI, SSB_SPROM4_2G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
++			SSB_SPROM4_2G_MAXP, 0);
++
++		SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SPROM4_2G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SPROM4_2G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SPROM4_2G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[3], o + SSB_SPROM4_2G_PA_3, ~0, 0);
++
++		SPEX(core_pwr_info[i].itssi_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
++			SSB_SPROM4_5G_ITSSI, SSB_SPROM4_5G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
++			SSB_SPROM4_5G_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM4_5GHL_MAXP,
++			SSB_SPROM4_5GH_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM4_5GHL_MAXP,
++			SSB_SPROM4_5GL_MAXP, SSB_SPROM4_5GL_MAXP_SHIFT);
++
++		SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SPROM4_5GL_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SPROM4_5GL_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SPROM4_5GL_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[3], o + SSB_SPROM4_5GL_PA_3, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SPROM4_5G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SPROM4_5G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SPROM4_5G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[3], o + SSB_SPROM4_5G_PA_3, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SPROM4_5GH_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SPROM4_5GH_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SPROM4_5GH_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[3], o + SSB_SPROM4_5GH_PA_3, ~0, 0);
++	}
+ 
+ 	sprom_extract_r458(out, in);
+ 
+@@ -621,14 +676,22 @@ static void sprom_extract_r8(struct ssb_
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
++	out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN01,
++						     SSB_SPROM8_AGAIN0,
++						     SSB_SPROM8_AGAIN0_SHIFT);
++	out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN01,
++						     SSB_SPROM8_AGAIN1,
++						     SSB_SPROM8_AGAIN1_SHIFT);
++	out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN23,
++						     SSB_SPROM8_AGAIN2,
++						     SSB_SPROM8_AGAIN2_SHIFT);
++	out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
++						     SSB_SPROM8_AGAIN23,
++						     SSB_SPROM8_AGAIN3,
++						     SSB_SPROM8_AGAIN3_SHIFT);
+ 
+ 	/* Extract cores power info info */
+ 	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
+--- a/drivers/ssb/pcihost_wrapper.c
++++ b/drivers/ssb/pcihost_wrapper.c
+@@ -11,15 +11,17 @@
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
++#include <linux/pm.h>
+ #include <linux/pci.h>
+ #include <linux/export.h>
+ #include <linux/slab.h>
+ #include <linux/ssb/ssb.h>
+ 
+ 
+-#ifdef CONFIG_PM
+-static int ssb_pcihost_suspend(struct pci_dev *dev, pm_message_t state)
++#ifdef CONFIG_PM_SLEEP
++static int ssb_pcihost_suspend(struct device *d)
+ {
++	struct pci_dev *dev = to_pci_dev(d);
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+@@ -28,17 +30,23 @@ static int ssb_pcihost_suspend(struct pc
+ 		return err;
+ 	pci_save_state(dev);
+ 	pci_disable_device(dev);
+-	pci_set_power_state(dev, pci_choose_state(dev, state));
++
++	/* if there is a wakeup enabled child device on ssb bus,
++	   enable pci wakeup posibility. */
++	device_set_wakeup_enable(d, d->power.wakeup_path);
++
++	pci_prepare_to_sleep(dev);
+ 
+ 	return 0;
+ }
+ 
+-static int ssb_pcihost_resume(struct pci_dev *dev)
++static int ssb_pcihost_resume(struct device *d)
+ {
++	struct pci_dev *dev = to_pci_dev(d);
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+-	pci_set_power_state(dev, PCI_D0);
++	pci_back_from_sleep(dev);
+ 	err = pci_enable_device(dev);
+ 	if (err)
+ 		return err;
+@@ -49,10 +57,12 @@ static int ssb_pcihost_resume(struct pci
+ 
+ 	return 0;
+ }
+-#else /* CONFIG_PM */
+-# define ssb_pcihost_suspend	NULL
+-# define ssb_pcihost_resume	NULL
+-#endif /* CONFIG_PM */
++
++static const struct dev_pm_ops ssb_pcihost_pm_ops = {
++	SET_SYSTEM_SLEEP_PM_OPS(ssb_pcihost_suspend, ssb_pcihost_resume)
++};
++
++#endif /* CONFIG_PM_SLEEP */
+ 
+ static int ssb_pcihost_probe(struct pci_dev *dev,
+ 			     const struct pci_device_id *id)
+@@ -115,8 +125,9 @@ int ssb_pcihost_register(struct pci_driv
+ {
+ 	driver->probe = ssb_pcihost_probe;
+ 	driver->remove = ssb_pcihost_remove;
+-	driver->suspend = ssb_pcihost_suspend;
+-	driver->resume = ssb_pcihost_resume;
++#ifdef CONFIG_PM_SLEEP
++	driver->driver.pm = &ssb_pcihost_pm_ops;
++#endif
+ 
+ 	return pci_register_driver(driver);
+ }
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -33,6 +33,7 @@ struct ssb_sprom {
+ 	u8 et1phyaddr;		/* MII address for enet1 */
+ 	u8 et0mdcport;		/* MDIO for enet0 */
+ 	u8 et1mdcport;		/* MDIO for enet1 */
++	u16 dev_id;		/* Device ID overriding e.g. PCI ID */
+ 	u16 board_rev;		/* Board revision number from SPROM. */
+ 	u16 board_num;		/* Board number from SPROM. */
+ 	u16 board_type;		/* Board type from SPROM. */
+--- a/include/linux/ssb/ssb_regs.h
++++ b/include/linux/ssb/ssb_regs.h
+@@ -345,6 +345,43 @@
+ #define  SSB_SPROM4_TXPID5GH2_SHIFT	0
+ #define  SSB_SPROM4_TXPID5GH3		0xFF00
+ #define  SSB_SPROM4_TXPID5GH3_SHIFT	8
++
++/* There are 4 blocks with power info sharing the same layout */
++#define SSB_SPROM4_PWR_INFO_CORE0	0x0080
++#define SSB_SPROM4_PWR_INFO_CORE1	0x00AE
++#define SSB_SPROM4_PWR_INFO_CORE2	0x00DC
++#define SSB_SPROM4_PWR_INFO_CORE3	0x010A
++
++#define SSB_SPROM4_2G_MAXP_ITSSI	0x00	/* 2 GHz ITSSI and 2 GHz Max Power */
++#define  SSB_SPROM4_2G_MAXP		0x00FF
++#define  SSB_SPROM4_2G_ITSSI		0xFF00
++#define  SSB_SPROM4_2G_ITSSI_SHIFT	8
++#define SSB_SPROM4_2G_PA_0		0x02	/* 2 GHz power amp */
++#define SSB_SPROM4_2G_PA_1		0x04
++#define SSB_SPROM4_2G_PA_2		0x06
++#define SSB_SPROM4_2G_PA_3		0x08
++#define SSB_SPROM4_5G_MAXP_ITSSI	0x0A	/* 5 GHz ITSSI and 5.3 GHz Max Power */
++#define  SSB_SPROM4_5G_MAXP		0x00FF
++#define  SSB_SPROM4_5G_ITSSI		0xFF00
++#define  SSB_SPROM4_5G_ITSSI_SHIFT	8
++#define SSB_SPROM4_5GHL_MAXP		0x0C	/* 5.2 GHz and 5.8 GHz Max Power */
++#define  SSB_SPROM4_5GH_MAXP		0x00FF
++#define  SSB_SPROM4_5GL_MAXP		0xFF00
++#define  SSB_SPROM4_5GL_MAXP_SHIFT	8
++#define SSB_SPROM4_5G_PA_0		0x0E	/* 5.3 GHz power amp */
++#define SSB_SPROM4_5G_PA_1		0x10
++#define SSB_SPROM4_5G_PA_2		0x12
++#define SSB_SPROM4_5G_PA_3		0x14
++#define SSB_SPROM4_5GL_PA_0		0x16	/* 5.2 GHz power amp */
++#define SSB_SPROM4_5GL_PA_1		0x18
++#define SSB_SPROM4_5GL_PA_2		0x1A
++#define SSB_SPROM4_5GL_PA_3		0x1C
++#define SSB_SPROM4_5GH_PA_0		0x1E	/* 5.8 GHz power amp */
++#define SSB_SPROM4_5GH_PA_1		0x20
++#define SSB_SPROM4_5GH_PA_2		0x22
++#define SSB_SPROM4_5GH_PA_3		0x24
++
++/* TODO: Make it deprecated */
+ #define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
+ #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
+ #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
+--- a/arch/mips/bcm47xx/sprom.c
++++ b/arch/mips/bcm47xx/sprom.c
+@@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char
+ static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
+ 					const char *prefix, bool fallback)
+ {
++	nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);
diff --git a/trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch b/trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch
new file mode 100644
index 00000000..436c1cf3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch
@@ -0,0 +1,1606 @@
+--- a/drivers/bcma/Makefile
++++ b/drivers/bcma/Makefile
+@@ -1,8 +1,10 @@
+ bcma-y					+= main.o scan.o core.o sprom.o
+ bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
++bcma-y					+= driver_chipcommon_b.o
+ bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o
+ bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o
+ bcma-y					+= driver_pci.o
++bcma-y					+= driver_pcie2.o
+ bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)	+= driver_pci_host.o
+ bcma-$(CONFIG_BCMA_DRIVER_MIPS)		+= driver_mips.o
+ bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)	+= driver_gmac_cmn.o
+--- a/drivers/bcma/driver_chipcommon.c
++++ b/drivers/bcma/driver_chipcommon.c
+@@ -339,7 +339,7 @@ void bcma_chipco_serial_init(struct bcma
+ 		return;
+ 	}
+ 
+-	irq = bcma_core_irq(cc->core);
++	irq = bcma_core_irq(cc->core, 0);
+ 
+ 	/* Determine the registers of the UARTs */
+ 	cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
+--- a/drivers/bcma/driver_chipcommon_pmu.c
++++ b/drivers/bcma/driver_chipcommon_pmu.c
+@@ -603,6 +603,8 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;
+ 		break;
+ 
++	case BCMA_CHIP_ID_BCM43131:
++	case BCMA_CHIP_ID_BCM43217:
+ 	case BCMA_CHIP_ID_BCM43227:
+ 	case BCMA_CHIP_ID_BCM43228:
+ 	case BCMA_CHIP_ID_BCM43428:
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -76,7 +76,7 @@ static void bcma_gpio_free(struct gpio_c
+ 	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
+ }
+ 
+-#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
++#if IS_BUILTIN(CONFIG_BCM47XX)
+ static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
+ {
+ 	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+@@ -152,7 +152,7 @@ static int bcma_gpio_irq_domain_init(str
+ 					 handle_simple_irq);
+ 	}
+ 
+-	hwirq = bcma_core_irq(cc->core);
++	hwirq = bcma_core_irq(cc->core, 0);
+ 	err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio",
+ 			  cc);
+ 	if (err)
+@@ -183,7 +183,7 @@ static void bcma_gpio_irq_domain_exit(st
+ 		return;
+ 
+ 	bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO);
+-	free_irq(bcma_core_irq(cc->core), cc);
++	free_irq(bcma_core_irq(cc->core, 0), cc);
+ 	for (gpio = 0; gpio < chip->ngpio; gpio++) {
+ 		int irq = irq_find_mapping(cc->irq_domain, gpio);
+ 
+@@ -215,10 +215,22 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ 	chip->set		= bcma_gpio_set_value;
+ 	chip->direction_input	= bcma_gpio_direction_input;
+ 	chip->direction_output	= bcma_gpio_direction_output;
+-#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
++#if IS_BUILTIN(CONFIG_BCM47XX)
+ 	chip->to_irq		= bcma_gpio_to_irq;
+ #endif
+-	chip->ngpio		= 16;
++#if IS_BUILTIN(CONFIG_OF)
++	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
++		chip->of_node	= cc->core->dev.of_node;
++#endif
++	switch (cc->core->bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM53572:
++		chip->ngpio	= 32;
++		break;
++	default:
++		chip->ngpio	= 16;
++	}
++
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+ 	 * a random base number. */
+@@ -243,5 +255,6 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ int bcma_gpio_unregister(struct bcma_drv_cc *cc)
+ {
+ 	bcma_gpio_irq_domain_exit(cc);
+-	return gpiochip_remove(&cc->gpio);
++	gpiochip_remove(&cc->gpio);
++	return 0;
+ }
+--- a/drivers/bcma/driver_pci_host.c
++++ b/drivers/bcma/driver_pci_host.c
+@@ -593,7 +593,7 @@ int bcma_core_pci_plat_dev_init(struct p
+ 	pr_info("PCI: Fixing up device %s\n", pci_name(dev));
+ 
+ 	/* Fix up interrupt lines */
+-	dev->irq = bcma_core_irq(pc_host->pdev->core);
++	dev->irq = bcma_core_irq(pc_host->pdev->core, 0);
+ 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+ 
+ 	readrq = pcie_get_readrq(dev);
+@@ -617,6 +617,6 @@ int bcma_core_pci_pcibios_map_irq(const 
+ 
+ 	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
+ 			       pci_ops);
+-	return bcma_core_irq(pc_host->pdev->core);
++	return bcma_core_irq(pc_host->pdev->core, 0);
+ }
+ EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
+--- /dev/null
++++ b/drivers/bcma/driver_pcie2.c
+@@ -0,0 +1,175 @@
++/*
++ * Broadcom specific AMBA
++ * PCIe Gen 2 Core
++ *
++ * Copyright 2014, Broadcom Corporation
++ * Copyright 2014, Rafał Miłecki <zajec5@gmail.com>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++#include <linux/bcma/bcma.h>
++
++/**************************************************
++ * R/W ops.
++ **************************************************/
++
++#if 0
++static u32 bcma_core_pcie2_cfg_read(struct bcma_drv_pcie2 *pcie2, u32 addr)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, addr);
++	pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR);
++	return pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA);
++}
++#endif
++
++static void bcma_core_pcie2_cfg_write(struct bcma_drv_pcie2 *pcie2, u32 addr,
++				      u32 val)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, addr);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, val);
++}
++
++/**************************************************
++ * Init.
++ **************************************************/
++
++static u32 bcma_core_pcie2_war_delay_perst_enab(struct bcma_drv_pcie2 *pcie2,
++						bool enable)
++{
++	u32 val;
++
++	/* restore back to default */
++	val = pcie2_read32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL);
++	val |= PCIE2_CLKC_DLYPERST;
++	val &= ~PCIE2_CLKC_DISSPROMLD;
++	if (enable) {
++		val &= ~PCIE2_CLKC_DLYPERST;
++		val |= PCIE2_CLKC_DISSPROMLD;
++	}
++	pcie2_write32(pcie2, (BCMA_CORE_PCIE2_CLK_CONTROL), val);
++	/* flush */
++	return pcie2_read32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL);
++}
++
++static void bcma_core_pcie2_set_ltr_vals(struct bcma_drv_pcie2 *pcie2)
++{
++	/* LTR0 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x844);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x883c883c);
++	/* LTR1 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x848);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x88648864);
++	/* LTR2 */
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, 0x84C);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x90039003);
++}
++
++static void bcma_core_pcie2_hw_ltr_war(struct bcma_drv_pcie2 *pcie2)
++{
++	u8 core_rev = pcie2->core->id.rev;
++	u32 devstsctr2;
++
++	if (core_rev < 2 || core_rev == 10 || core_rev > 13)
++		return;
++
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++		      PCIE2_CAP_DEVSTSCTRL2_OFFSET);
++	devstsctr2 = pcie2_read32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA);
++	if (devstsctr2 & PCIE2_CAP_DEVSTSCTRL2_LTRENAB) {
++		/* force the right LTR values */
++		bcma_core_pcie2_set_ltr_vals(pcie2);
++
++		/* TODO:
++		si_core_wrapperreg(pcie2, 3, 0x60, 0x8080, 0); */
++
++		/* enable the LTR */
++		devstsctr2 |= PCIE2_CAP_DEVSTSCTRL2_LTRENAB;
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++			      PCIE2_CAP_DEVSTSCTRL2_OFFSET);
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, devstsctr2);
++
++		/* set the LTR state to be active */
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_LTR_STATE,
++			      PCIE2_LTR_ACTIVE);
++		usleep_range(1000, 2000);
++
++		/* set the LTR state to be sleep */
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_LTR_STATE,
++			      PCIE2_LTR_SLEEP);
++		usleep_range(1000, 2000);
++	}
++}
++
++static void pciedev_crwlpciegen2(struct bcma_drv_pcie2 *pcie2)
++{
++	u8 core_rev = pcie2->core->id.rev;
++	bool pciewar160, pciewar162;
++
++	pciewar160 = core_rev == 7 || core_rev == 9 || core_rev == 11;
++	pciewar162 = core_rev == 5 || core_rev == 7 || core_rev == 8 ||
++		     core_rev == 9 || core_rev == 11;
++
++	if (!pciewar160 && !pciewar162)
++		return;
++
++/* TODO */
++#if 0
++	pcie2_set32(pcie2, BCMA_CORE_PCIE2_CLK_CONTROL,
++		    PCIE_DISABLE_L1CLK_GATING);
++#if 0
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++		      PCIEGEN2_COE_PVT_TL_CTRL_0);
++	pcie2_mask32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA,
++		     ~(1 << COE_PVT_TL_CTRL_0_PM_DIS_L1_REENTRY_BIT));
++#endif
++#endif
++}
++
++static void pciedev_crwlpciegen2_180(struct bcma_drv_pcie2 *pcie2)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, PCIE2_PMCR_REFUP);
++	pcie2_set32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 0x1f);
++}
++
++static void pciedev_crwlpciegen2_182(struct bcma_drv_pcie2 *pcie2)
++{
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR, PCIE2_SBMBX);
++	pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, 1 << 0);
++}
++
++static void pciedev_reg_pm_clk_period(struct bcma_drv_pcie2 *pcie2)
++{
++	struct bcma_drv_cc *drv_cc = &pcie2->core->bus->drv_cc;
++	u8 core_rev = pcie2->core->id.rev;
++	u32 alp_khz, pm_value;
++
++	if (core_rev <= 13) {
++		alp_khz = bcma_pmu_get_alp_clock(drv_cc) / 1000;
++		pm_value = (1000000 * 2) / alp_khz;
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDADDR,
++			      PCIE2_PVT_REG_PM_CLK_PERIOD);
++		pcie2_write32(pcie2, BCMA_CORE_PCIE2_CONFIGINDDATA, pm_value);
++	}
++}
++
++void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2)
++{
++	struct bcma_chipinfo *ci = &pcie2->core->bus->chipinfo;
++	u32 tmp;
++
++	tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54));
++	if ((tmp & 0xe) >> 1 == 2)
++		bcma_core_pcie2_cfg_write(pcie2, 0x4e0, 0x17);
++
++	/* TODO: Do we need pcie_reqsize? */
++
++	if (ci->id == BCMA_CHIP_ID_BCM4360 && ci->rev > 3)
++		bcma_core_pcie2_war_delay_perst_enab(pcie2, true);
++	bcma_core_pcie2_hw_ltr_war(pcie2);
++	pciedev_crwlpciegen2(pcie2);
++	pciedev_reg_pm_clk_period(pcie2);
++	pciedev_crwlpciegen2_180(pcie2);
++	pciedev_crwlpciegen2_182(pcie2);
++}
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -208,6 +208,9 @@ static int bcma_host_pci_probe(struct pc
+ 	bus->boardinfo.vendor = bus->host_pci->subsystem_vendor;
+ 	bus->boardinfo.type = bus->host_pci->subsystem_device;
+ 
++	/* Initialize struct, detect chip */
++	bcma_init_bus(bus);
++
+ 	/* Register */
+ 	err = bcma_bus_register(bus);
+ 	if (err)
+@@ -272,14 +275,18 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc
+ static const struct pci_device_id bcma_pci_bridge_tbl[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },
+-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },	/* 0xa8d8 */
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xa8db, BCM43217 (sic!) */
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43228) },	/* 0xa8dc */
+ 	{ 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -10,6 +10,8 @@
+ #include <linux/platform_device.h>
+ #include <linux/bcma/bcma.h>
+ #include <linux/slab.h>
++#include <linux/of_address.h>
++#include <linux/of_irq.h>
+ 
+ MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
+ MODULE_LICENSE("GPL");
+@@ -120,56 +122,195 @@ static void bcma_release_core_dev(struct
+ 	kfree(core);
+ }
+ 
+-static int bcma_register_cores(struct bcma_bus *bus)
++static bool bcma_is_core_needed_early(u16 core_id)
++{
++	switch (core_id) {
++	case BCMA_CORE_NS_NAND:
++	case BCMA_CORE_NS_QSPI:
++		return true;
++	}
++
++	return false;
++}
++
++#if defined(CONFIG_OF) && defined(CONFIG_OF_ADDRESS)
++static struct device_node *bcma_of_find_child_device(struct platform_device *parent,
++						     struct bcma_device *core)
++{
++	struct device_node *node;
++	u64 size;
++	const __be32 *reg;
++
++	if (!parent || !parent->dev.of_node)
++		return NULL;
++
++	for_each_child_of_node(parent->dev.of_node, node) {
++		reg = of_get_address(node, 0, &size, NULL);
++		if (!reg)
++			continue;
++		if (of_translate_address(node, reg) == core->addr)
++			return node;
++	}
++	return NULL;
++}
++
++static int bcma_of_irq_parse(struct platform_device *parent,
++			     struct bcma_device *core,
++			     struct of_phandle_args *out_irq, int num)
++{
++	__be32 laddr[1];
++	int rc;
++
++	if (core->dev.of_node) {
++		rc = of_irq_parse_one(core->dev.of_node, num, out_irq);
++		if (!rc)
++			return rc;
++	}
++
++	out_irq->np = parent->dev.of_node;
++	out_irq->args_count = 1;
++	out_irq->args[0] = num;
++
++	laddr[0] = cpu_to_be32(core->addr);
++	return of_irq_parse_raw(laddr, out_irq);
++}
++
++static unsigned int bcma_of_get_irq(struct platform_device *parent,
++				    struct bcma_device *core, int num)
++{
++	struct of_phandle_args out_irq;
++	int ret;
++
++	if (!parent || !parent->dev.of_node)
++		return 0;
++
++	ret = bcma_of_irq_parse(parent, core, &out_irq, num);
++	if (ret) {
++		bcma_debug(core->bus, "bcma_of_get_irq() failed with rc=%d\n",
++			   ret);
++		return 0;
++	}
++
++	return irq_create_of_mapping(&out_irq);
++}
++
++static void bcma_of_fill_device(struct platform_device *parent,
++				struct bcma_device *core)
++{
++	struct device_node *node;
++
++	node = bcma_of_find_child_device(parent, core);
++	if (node)
++		core->dev.of_node = node;
++
++	core->irq = bcma_of_get_irq(parent, core, 0);
++}
++#else
++static void bcma_of_fill_device(struct platform_device *parent,
++				struct bcma_device *core)
++{
++}
++static inline unsigned int bcma_of_get_irq(struct platform_device *parent,
++					   struct bcma_device *core, int num)
++{
++	return 0;
++}
++#endif /* CONFIG_OF */
++
++unsigned int bcma_core_irq(struct bcma_device *core, int num)
++{
++	struct bcma_bus *bus = core->bus;
++	unsigned int mips_irq;
++
++	switch (bus->hosttype) {
++	case BCMA_HOSTTYPE_PCI:
++		return bus->host_pci->irq;
++	case BCMA_HOSTTYPE_SOC:
++		if (bus->drv_mips.core && num == 0) {
++			mips_irq = bcma_core_mips_irq(core);
++			return mips_irq <= 4 ? mips_irq + 2 : 0;
++		}
++		if (bus->host_pdev)
++			return bcma_of_get_irq(bus->host_pdev, core, num);
++		return 0;
++	case BCMA_HOSTTYPE_SDIO:
++		return 0;
++	}
++
++	return 0;
++}
++EXPORT_SYMBOL(bcma_core_irq);
++
++void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
++{
++	core->dev.release = bcma_release_core_dev;
++	core->dev.bus = &bcma_bus_type;
++	dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
++
++	switch (bus->hosttype) {
++	case BCMA_HOSTTYPE_PCI:
++		core->dev.parent = &bus->host_pci->dev;
++		core->dma_dev = &bus->host_pci->dev;
++		core->irq = bus->host_pci->irq;
++		break;
++	case BCMA_HOSTTYPE_SOC:
++		core->dev.dma_mask = &core->dev.coherent_dma_mask;
++		if (bus->host_pdev) {
++			core->dma_dev = &bus->host_pdev->dev;
++			core->dev.parent = &bus->host_pdev->dev;
++			bcma_of_fill_device(bus->host_pdev, core);
++		} else {
++			core->dma_dev = &core->dev;
++		}
++		break;
++	case BCMA_HOSTTYPE_SDIO:
++		break;
++	}
++}
++
++static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
++{
++	int err;
++
++	err = device_register(&core->dev);
++	if (err) {
++		bcma_err(bus, "Could not register dev for core 0x%03X\n",
++			 core->id.id);
++		put_device(&core->dev);
++		return;
++	}
++	core->dev_registered = true;
++}
++
++static int bcma_register_devices(struct bcma_bus *bus)
+ {
+ 	struct bcma_device *core;
+-	int err, dev_id = 0;
++	int err;
+ 
+ 	list_for_each_entry(core, &bus->cores, list) {
+ 		/* We support that cores ourself */
+ 		switch (core->id.id) {
+ 		case BCMA_CORE_4706_CHIPCOMMON:
+ 		case BCMA_CORE_CHIPCOMMON:
++		case BCMA_CORE_NS_CHIPCOMMON_B:
+ 		case BCMA_CORE_PCI:
+ 		case BCMA_CORE_PCIE:
++		case BCMA_CORE_PCIE2:
+ 		case BCMA_CORE_MIPS_74K:
+ 		case BCMA_CORE_4706_MAC_GBIT_COMMON:
+ 			continue;
+ 		}
+ 
++		/* Early cores were already registered */
++		if (bcma_is_core_needed_early(core->id.id))
++			continue;
++
+ 		/* Only first GMAC core on BCM4706 is connected and working */
+ 		if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
+ 		    core->core_unit > 0)
+ 			continue;
+ 
+-		core->dev.release = bcma_release_core_dev;
+-		core->dev.bus = &bcma_bus_type;
+-		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
+-
+-		switch (bus->hosttype) {
+-		case BCMA_HOSTTYPE_PCI:
+-			core->dev.parent = &bus->host_pci->dev;
+-			core->dma_dev = &bus->host_pci->dev;
+-			core->irq = bus->host_pci->irq;
+-			break;
+-		case BCMA_HOSTTYPE_SOC:
+-			core->dev.dma_mask = &core->dev.coherent_dma_mask;
+-			core->dma_dev = &core->dev;
+-			break;
+-		case BCMA_HOSTTYPE_SDIO:
+-			break;
+-		}
+-
+-		err = device_register(&core->dev);
+-		if (err) {
+-			bcma_err(bus,
+-				 "Could not register dev for core 0x%03X\n",
+-				 core->id.id);
+-			put_device(&core->dev);
+-			continue;
+-		}
+-		core->dev_registered = true;
+-		dev_id++;
++		bcma_register_core(bus, core);
+ 	}
+ 
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+@@ -246,6 +387,12 @@ int bcma_bus_register(struct bcma_bus *b
+ 		bcma_core_chipcommon_early_init(&bus->drv_cc);
+ 	}
+ 
++	/* Cores providing flash access go before SPROM init */
++	list_for_each_entry(core, &bus->cores, list) {
++		if (bcma_is_core_needed_early(core->id.id))
++			bcma_register_core(bus, core);
++	}
++
+ 	/* Try to get SPROM */
+ 	err = bcma_sprom_get(bus);
+ 	if (err == -ENOENT) {
+@@ -260,6 +407,13 @@ int bcma_bus_register(struct bcma_bus *b
+ 		bcma_core_chipcommon_init(&bus->drv_cc);
+ 	}
+ 
++	/* Init CC core */
++	core = bcma_find_core(bus, BCMA_CORE_NS_CHIPCOMMON_B);
++	if (core) {
++		bus->drv_cc_b.core = core;
++		bcma_core_chipcommon_b_init(&bus->drv_cc_b);
++	}
++
+ 	/* Init MIPS core */
+ 	core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+ 	if (core) {
+@@ -281,6 +435,13 @@ int bcma_bus_register(struct bcma_bus *b
+ 		bcma_core_pci_init(&bus->drv_pci[1]);
+ 	}
+ 
++	/* Init PCIe Gen 2 core */
++	core = bcma_find_core_unit(bus, BCMA_CORE_PCIE2, 0);
++	if (core) {
++		bus->drv_pcie2.core = core;
++		bcma_core_pcie2_init(&bus->drv_pcie2);
++	}
++
+ 	/* Init GBIT MAC COMMON core */
+ 	core = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
+ 	if (core) {
+@@ -289,7 +450,7 @@ int bcma_bus_register(struct bcma_bus *b
+ 	}
+ 
+ 	/* Register found cores */
+-	bcma_register_cores(bus);
++	bcma_register_devices(bus);
+ 
+ 	bcma_info(bus, "Bus registered\n");
+ 
+@@ -307,6 +468,8 @@ void bcma_bus_unregister(struct bcma_bus
+ 	else if (err)
+ 		bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
+ 
++	bcma_core_chipcommon_b_free(&bus->drv_cc_b);
++
+ 	cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+ 	cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);
+ 	cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
+@@ -326,8 +489,6 @@ int __init bcma_bus_early_register(struc
+ 	struct bcma_device *core;
+ 	struct bcma_device_id match;
+ 
+-	bcma_init_bus(bus);
+-
+ 	match.manuf = BCMA_MANUF_BCM;
+ 	match.id = bcma_cc_core_id(bus);
+ 	match.class = BCMA_CL_SIM;
+@@ -486,6 +647,11 @@ static int __init bcma_modinit(void)
+ 	if (err)
+ 		return err;
+ 
++	err = bcma_host_soc_register_driver();
++	if (err) {
++		pr_err("SoC host initialization failed\n");
++		err = 0;
++	}
+ #ifdef CONFIG_BCMA_HOST_PCI
+ 	err = bcma_host_pci_init();
+ 	if (err) {
+@@ -503,6 +669,7 @@ static void __exit bcma_modexit(void)
+ #ifdef CONFIG_BCMA_HOST_PCI
+ 	bcma_host_pci_exit();
+ #endif
++	bcma_host_soc_unregister_driver();
+ 	bus_unregister(&bcma_bus_type);
+ }
+ module_exit(bcma_modexit)
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -201,6 +201,23 @@ static int bcma_sprom_valid(struct bcma_
+ 		SPEX(_field[7], _offset + 14, _mask, _shift);	\
+ 	} while (0)
+ 
++static s8 sprom_extract_antgain(const u16 *in, u16 offset, u16 mask, u16 shift)
++{
++	u16 v;
++	u8 gain;
++
++	v = in[SPOFF(offset)];
++	gain = (v & mask) >> shift;
++	if (gain == 0xFF) {
++		gain = 8; /* If unset use 2dBm */
++	} else {
++		/* Q5.2 Fractional part is stored in 0xC0 */
++		gain = ((gain & 0xC0) >> 6) | ((gain & 0x3F) << 2);
++	}
++
++	return (s8)gain;
++}
++
+ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
+ {
+ 	u16 v, o;
+@@ -381,14 +398,22 @@ static void bcma_sprom_extract_r8(struct
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, ~0, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
+-	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
+-	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
++	bus->sprom.antenna_gain.a0 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN01,
++							   SSB_SPROM8_AGAIN0,
++							   SSB_SPROM8_AGAIN0_SHIFT);
++	bus->sprom.antenna_gain.a1 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN01,
++							   SSB_SPROM8_AGAIN1,
++							   SSB_SPROM8_AGAIN1_SHIFT);
++	bus->sprom.antenna_gain.a2 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN23,
++							   SSB_SPROM8_AGAIN2,
++							   SSB_SPROM8_AGAIN2_SHIFT);
++	bus->sprom.antenna_gain.a3 = sprom_extract_antgain(sprom,
++							   SSB_SPROM8_AGAIN23,
++							   SSB_SPROM8_AGAIN3,
++							   SSB_SPROM8_AGAIN3_SHIFT);
+ 
+ 	SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
+ 	     SSB_SPROM8_LEDDC_ON_SHIFT);
+@@ -509,6 +534,8 @@ static bool bcma_sprom_onchip_available(
+ 		/* for these chips OTP is always available */
+ 		present = true;
+ 		break;
++	case BCMA_CHIP_ID_BCM43131:
++	case BCMA_CHIP_ID_BCM43217:
+ 	case BCMA_CHIP_ID_BCM43227:
+ 	case BCMA_CHIP_ID_BCM43228:
+ 	case BCMA_CHIP_ID_BCM43428:
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -6,6 +6,7 @@
+ 
+ #include <linux/bcma/bcma_driver_chipcommon.h>
+ #include <linux/bcma/bcma_driver_pci.h>
++#include <linux/bcma/bcma_driver_pcie2.h>
+ #include <linux/bcma/bcma_driver_mips.h>
+ #include <linux/bcma/bcma_driver_gmac_cmn.h>
+ #include <linux/ssb/ssb.h> /* SPROM sharing */
+@@ -72,17 +73,17 @@ struct bcma_host_ops {
+ /* Core-ID values. */
+ #define BCMA_CORE_OOB_ROUTER		0x367	/* Out of band */
+ #define BCMA_CORE_4706_CHIPCOMMON	0x500
+-#define BCMA_CORE_PCIEG2		0x501
+-#define BCMA_CORE_DMA			0x502
+-#define BCMA_CORE_SDIO3			0x503
+-#define BCMA_CORE_USB20			0x504
+-#define BCMA_CORE_USB30			0x505
+-#define BCMA_CORE_A9JTAG		0x506
+-#define BCMA_CORE_DDR23			0x507
+-#define BCMA_CORE_ROM			0x508
+-#define BCMA_CORE_NAND			0x509
+-#define BCMA_CORE_QSPI			0x50A
+-#define BCMA_CORE_CHIPCOMMON_B		0x50B
++#define BCMA_CORE_NS_PCIEG2		0x501
++#define BCMA_CORE_NS_DMA		0x502
++#define BCMA_CORE_NS_SDIO3		0x503
++#define BCMA_CORE_NS_USB20		0x504
++#define BCMA_CORE_NS_USB30		0x505
++#define BCMA_CORE_NS_A9JTAG		0x506
++#define BCMA_CORE_NS_DDR23		0x507
++#define BCMA_CORE_NS_ROM		0x508
++#define BCMA_CORE_NS_NAND		0x509
++#define BCMA_CORE_NS_QSPI		0x50A
++#define BCMA_CORE_NS_CHIPCOMMON_B	0x50B
+ #define BCMA_CORE_4706_SOC_RAM		0x50E
+ #define BCMA_CORE_ARMCA9		0x510
+ #define BCMA_CORE_4706_MAC_GBIT		0x52D
+@@ -157,6 +158,9 @@ struct bcma_host_ops {
+ /* Chip IDs of PCIe devices */
+ #define BCMA_CHIP_ID_BCM4313	0x4313
+ #define BCMA_CHIP_ID_BCM43142	43142
++#define BCMA_CHIP_ID_BCM43131	43131
++#define BCMA_CHIP_ID_BCM43217	43217
++#define BCMA_CHIP_ID_BCM43222	43222
+ #define BCMA_CHIP_ID_BCM43224	43224
+ #define  BCMA_PKG_ID_BCM43224_FAB_CSM	0x8
+ #define  BCMA_PKG_ID_BCM43224_FAB_SMIC	0xa
+@@ -263,7 +267,7 @@ struct bcma_device {
+ 	u8 core_unit;
+ 
+ 	u32 addr;
+-	u32 addr1;
++	u32 addr_s[8];
+ 	u32 wrap;
+ 
+ 	void __iomem *io_addr;
+@@ -319,6 +323,8 @@ struct bcma_bus {
+ 		struct pci_dev *host_pci;
+ 		/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
+ 		struct sdio_func *host_sdio;
++		/* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
++		struct platform_device *host_pdev;
+ 	};
+ 
+ 	struct bcma_chipinfo chipinfo;
+@@ -328,11 +334,12 @@ struct bcma_bus {
+ 	struct bcma_device *mapped_core;
+ 	struct list_head cores;
+ 	u8 nr_cores;
+-	u8 init_done:1;
+ 	u8 num;
+ 
+ 	struct bcma_drv_cc drv_cc;
++	struct bcma_drv_cc_b drv_cc_b;
+ 	struct bcma_drv_pci drv_pci[2];
++	struct bcma_drv_pcie2 drv_pcie2;
+ 	struct bcma_drv_mips drv_mips;
+ 	struct bcma_drv_gmac_cmn drv_gmac_cmn;
+ 
+@@ -440,4 +447,6 @@ extern u32 bcma_chipco_pll_read(struct b
+ #define  BCMA_DMA_TRANSLATION_DMA64_CMT	0x80000000 /* Client Mode Translation for 64-bit DMA */
+ extern u32 bcma_core_dma_translation(struct bcma_device *core);
+ 
++extern unsigned int bcma_core_irq(struct bcma_device *core, int num);
++
+ #endif /* LINUX_BCMA_H_ */
+--- a/include/linux/bcma/bcma_driver_mips.h
++++ b/include/linux/bcma/bcma_driver_mips.h
+@@ -43,12 +43,12 @@ struct bcma_drv_mips {
+ extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
+ extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);
+ 
+-extern unsigned int bcma_core_irq(struct bcma_device *core);
++extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
+ #else
+ static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
+ static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
+ 
+-static inline unsigned int bcma_core_irq(struct bcma_device *core)
++static inline unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	return 0;
+ }
+--- /dev/null
++++ b/include/linux/bcma/bcma_driver_pcie2.h
+@@ -0,0 +1,158 @@
++#ifndef LINUX_BCMA_DRIVER_PCIE2_H_
++#define LINUX_BCMA_DRIVER_PCIE2_H_
++
++#define BCMA_CORE_PCIE2_CLK_CONTROL		0x0000
++#define  PCIE2_CLKC_RST_OE			0x0001 /* When set, drives PCI_RESET out to pin */
++#define  PCIE2_CLKC_RST				0x0002 /* Value driven out to pin */
++#define  PCIE2_CLKC_SPERST			0x0004 /* SurvivePeRst */
++#define  PCIE2_CLKC_DISABLE_L1CLK_GATING	0x0010
++#define  PCIE2_CLKC_DLYPERST			0x0100 /* Delay PeRst to CoE Core */
++#define  PCIE2_CLKC_DISSPROMLD			0x0200 /* DisableSpromLoadOnPerst */
++#define  PCIE2_CLKC_WAKE_MODE_L2		0x1000 /* Wake on L2 */
++#define BCMA_CORE_PCIE2_RC_PM_CONTROL		0x0004
++#define BCMA_CORE_PCIE2_RC_PM_STATUS		0x0008
++#define BCMA_CORE_PCIE2_EP_PM_CONTROL		0x000C
++#define BCMA_CORE_PCIE2_EP_PM_STATUS		0x0010
++#define BCMA_CORE_PCIE2_EP_LTR_CONTROL		0x0014
++#define BCMA_CORE_PCIE2_EP_LTR_STATUS		0x0018
++#define BCMA_CORE_PCIE2_EP_OBFF_STATUS		0x001C
++#define BCMA_CORE_PCIE2_PCIE_ERR_STATUS		0x0020
++#define BCMA_CORE_PCIE2_RC_AXI_CONFIG		0x0100
++#define BCMA_CORE_PCIE2_EP_AXI_CONFIG		0x0104
++#define BCMA_CORE_PCIE2_RXDEBUG_STATUS0		0x0108
++#define BCMA_CORE_PCIE2_RXDEBUG_CONTROL0	0x010C
++#define BCMA_CORE_PCIE2_CONFIGINDADDR		0x0120
++#define BCMA_CORE_PCIE2_CONFIGINDDATA		0x0124
++#define BCMA_CORE_PCIE2_MDIOCONTROL		0x0128
++#define BCMA_CORE_PCIE2_MDIOWRDATA		0x012C
++#define BCMA_CORE_PCIE2_MDIORDDATA		0x0130
++#define BCMA_CORE_PCIE2_DATAINTF		0x0180
++#define BCMA_CORE_PCIE2_D2H_INTRLAZY_0		0x0188
++#define BCMA_CORE_PCIE2_H2D_INTRLAZY_0		0x018c
++#define BCMA_CORE_PCIE2_H2D_INTSTAT_0		0x0190
++#define BCMA_CORE_PCIE2_H2D_INTMASK_0		0x0194
++#define BCMA_CORE_PCIE2_D2H_INTSTAT_0		0x0198
++#define BCMA_CORE_PCIE2_D2H_INTMASK_0		0x019c
++#define BCMA_CORE_PCIE2_LTR_STATE		0x01A0 /* Latency Tolerance Reporting */
++#define  PCIE2_LTR_ACTIVE			2
++#define  PCIE2_LTR_ACTIVE_IDLE			1
++#define  PCIE2_LTR_SLEEP			0
++#define  PCIE2_LTR_FINAL_MASK			0x300
++#define  PCIE2_LTR_FINAL_SHIFT			8
++#define BCMA_CORE_PCIE2_PWR_INT_STATUS		0x01A4
++#define BCMA_CORE_PCIE2_PWR_INT_MASK		0x01A8
++#define BCMA_CORE_PCIE2_CFG_ADDR		0x01F8
++#define BCMA_CORE_PCIE2_CFG_DATA		0x01FC
++#define BCMA_CORE_PCIE2_SYS_EQ_PAGE		0x0200
++#define BCMA_CORE_PCIE2_SYS_MSI_PAGE		0x0204
++#define BCMA_CORE_PCIE2_SYS_MSI_INTREN		0x0208
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL0		0x0210
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL1		0x0214
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL2		0x0218
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL3		0x021C
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL4		0x0220
++#define BCMA_CORE_PCIE2_SYS_MSI_CTRL5		0x0224
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD0		0x0250
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL0		0x0254
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD1		0x0258
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL1		0x025C
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD2		0x0260
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL2		0x0264
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD3		0x0268
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL3		0x026C
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD4		0x0270
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL4		0x0274
++#define BCMA_CORE_PCIE2_SYS_EQ_HEAD5		0x0278
++#define BCMA_CORE_PCIE2_SYS_EQ_TAIL5		0x027C
++#define BCMA_CORE_PCIE2_SYS_RC_INTX_EN		0x0330
++#define BCMA_CORE_PCIE2_SYS_RC_INTX_CSR		0x0334
++#define BCMA_CORE_PCIE2_SYS_MSI_REQ		0x0340
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR_EN	0x0344
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR_CSR	0x0348
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR0		0x0350
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR1		0x0354
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR2		0x0358
++#define BCMA_CORE_PCIE2_SYS_HOST_INTR3		0x035C
++#define BCMA_CORE_PCIE2_SYS_EP_INT_EN0		0x0360
++#define BCMA_CORE_PCIE2_SYS_EP_INT_EN1		0x0364
++#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR0		0x0370
++#define BCMA_CORE_PCIE2_SYS_EP_INT_CSR1		0x0374
++#define BCMA_CORE_PCIE2_SPROM(wordoffset)	(0x0800 + ((wordoffset) * 2))
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_0		0x0C00
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_1		0x0C04
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_2		0x0C08
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_3		0x0C0C
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_4		0x0C10
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_5		0x0C14
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_6		0x0C18
++#define BCMA_CORE_PCIE2_FUNC0_IMAP0_7		0x0C1C
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_0		0x0C20
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_1		0x0C24
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_2		0x0C28
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_3		0x0C2C
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_4		0x0C30
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_5		0x0C34
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_6		0x0C38
++#define BCMA_CORE_PCIE2_FUNC1_IMAP0_7		0x0C3C
++#define BCMA_CORE_PCIE2_FUNC0_IMAP1		0x0C80
++#define BCMA_CORE_PCIE2_FUNC1_IMAP1		0x0C88
++#define BCMA_CORE_PCIE2_FUNC0_IMAP2		0x0CC0
++#define BCMA_CORE_PCIE2_FUNC1_IMAP2		0x0CC8
++#define BCMA_CORE_PCIE2_IARR0_LOWER		0x0D00
++#define BCMA_CORE_PCIE2_IARR0_UPPER		0x0D04
++#define BCMA_CORE_PCIE2_IARR1_LOWER		0x0D08
++#define BCMA_CORE_PCIE2_IARR1_UPPER		0x0D0C
++#define BCMA_CORE_PCIE2_IARR2_LOWER		0x0D10
++#define BCMA_CORE_PCIE2_IARR2_UPPER		0x0D14
++#define BCMA_CORE_PCIE2_OARR0			0x0D20
++#define BCMA_CORE_PCIE2_OARR1			0x0D28
++#define BCMA_CORE_PCIE2_OARR2			0x0D30
++#define BCMA_CORE_PCIE2_OMAP0_LOWER		0x0D40
++#define BCMA_CORE_PCIE2_OMAP0_UPPER		0x0D44
++#define BCMA_CORE_PCIE2_OMAP1_LOWER		0x0D48
++#define BCMA_CORE_PCIE2_OMAP1_UPPER		0x0D4C
++#define BCMA_CORE_PCIE2_OMAP2_LOWER		0x0D50
++#define BCMA_CORE_PCIE2_OMAP2_UPPER		0x0D54
++#define BCMA_CORE_PCIE2_FUNC1_IARR1_SIZE	0x0D58
++#define BCMA_CORE_PCIE2_FUNC1_IARR2_SIZE	0x0D5C
++#define BCMA_CORE_PCIE2_MEM_CONTROL		0x0F00
++#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG0		0x0F04
++#define BCMA_CORE_PCIE2_MEM_ECC_ERRLOG1		0x0F08
++#define BCMA_CORE_PCIE2_LINK_STATUS		0x0F0C
++#define BCMA_CORE_PCIE2_STRAP_STATUS		0x0F10
++#define BCMA_CORE_PCIE2_RESET_STATUS		0x0F14
++#define BCMA_CORE_PCIE2_RESETEN_IN_LINKDOWN	0x0F18
++#define BCMA_CORE_PCIE2_MISC_INTR_EN		0x0F1C
++#define BCMA_CORE_PCIE2_TX_DEBUG_CFG		0x0F20
++#define BCMA_CORE_PCIE2_MISC_CONFIG		0x0F24
++#define BCMA_CORE_PCIE2_MISC_STATUS		0x0F28
++#define BCMA_CORE_PCIE2_INTR_EN			0x0F30
++#define BCMA_CORE_PCIE2_INTR_CLEAR		0x0F34
++#define BCMA_CORE_PCIE2_INTR_STATUS		0x0F38
++
++/* PCIE gen2 config regs */
++#define PCIE2_INTSTATUS				0x090
++#define PCIE2_INTMASK				0x094
++#define PCIE2_SBMBX				0x098
++
++#define PCIE2_PMCR_REFUP			0x1814 /* Trefup time */
++
++#define PCIE2_CAP_DEVSTSCTRL2_OFFSET		0xD4
++#define PCIE2_CAP_DEVSTSCTRL2_LTRENAB		0x400
++#define PCIE2_PVT_REG_PM_CLK_PERIOD		0x184c
++
++struct bcma_drv_pcie2 {
++	struct bcma_device *core;
++};
++
++#define pcie2_read16(pcie2, offset)		bcma_read16((pcie2)->core, offset)
++#define pcie2_read32(pcie2, offset)		bcma_read32((pcie2)->core, offset)
++#define pcie2_write16(pcie2, offset, val)	bcma_write16((pcie2)->core, offset, val)
++#define pcie2_write32(pcie2, offset, val)	bcma_write32((pcie2)->core, offset, val)
++
++#define pcie2_set32(pcie2, offset, set)		bcma_set32((pcie2)->core, offset, set)
++#define pcie2_mask32(pcie2, offset, mask)	bcma_mask32((pcie2)->core, offset, mask)
++
++void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2);
++
++#endif /* LINUX_BCMA_DRIVER_PCIE2_H_ */
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -32,17 +32,17 @@ static const struct bcma_device_id_name 
+ 	{ BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
+ 	{ BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
+ 	{ BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
+-	{ BCMA_CORE_PCIEG2, "PCIe Gen 2" },
+-	{ BCMA_CORE_DMA, "DMA" },
+-	{ BCMA_CORE_SDIO3, "SDIO3" },
+-	{ BCMA_CORE_USB20, "USB 2.0" },
+-	{ BCMA_CORE_USB30, "USB 3.0" },
+-	{ BCMA_CORE_A9JTAG, "ARM Cortex A9 JTAG" },
+-	{ BCMA_CORE_DDR23, "Denali DDR2/DDR3 memory controller" },
+-	{ BCMA_CORE_ROM, "ROM" },
+-	{ BCMA_CORE_NAND, "NAND flash controller" },
+-	{ BCMA_CORE_QSPI, "SPI flash controller" },
+-	{ BCMA_CORE_CHIPCOMMON_B, "Chipcommon B" },
++	{ BCMA_CORE_NS_PCIEG2, "PCIe Gen 2" },
++	{ BCMA_CORE_NS_DMA, "DMA" },
++	{ BCMA_CORE_NS_SDIO3, "SDIO3" },
++	{ BCMA_CORE_NS_USB20, "USB 2.0" },
++	{ BCMA_CORE_NS_USB30, "USB 3.0" },
++	{ BCMA_CORE_NS_A9JTAG, "ARM Cortex A9 JTAG" },
++	{ BCMA_CORE_NS_DDR23, "Denali DDR2/DDR3 memory controller" },
++	{ BCMA_CORE_NS_ROM, "ROM" },
++	{ BCMA_CORE_NS_NAND, "NAND flash controller" },
++	{ BCMA_CORE_NS_QSPI, "SPI flash controller" },
++	{ BCMA_CORE_NS_CHIPCOMMON_B, "Chipcommon B" },
+ 	{ BCMA_CORE_ARMCA9, "ARM Cortex A9 core (ihost)" },
+ 	{ BCMA_CORE_AMEMC, "AMEMC (DDR)" },
+ 	{ BCMA_CORE_ALTA, "ALTA (I2S)" },
+@@ -276,7 +276,7 @@ static int bcma_get_next_core(struct bcm
+ 			      struct bcma_device *core)
+ {
+ 	u32 tmp;
+-	u8 i, j;
++	u8 i, j, k;
+ 	s32 cia, cib;
+ 	u8 ports[2], wrappers[2];
+ 
+@@ -314,6 +314,7 @@ static int bcma_get_next_core(struct bcm
+ 		/* Some specific cores don't need wrappers */
+ 		switch (core->id.id) {
+ 		case BCMA_CORE_4706_MAC_GBIT_COMMON:
++		case BCMA_CORE_NS_CHIPCOMMON_B:
+ 		/* Not used yet: case BCMA_CORE_OOB_ROUTER: */
+ 			break;
+ 		default:
+@@ -367,6 +368,7 @@ static int bcma_get_next_core(struct bcm
+ 	core->addr = tmp;
+ 
+ 	/* get & parse slave ports */
++	k = 0;
+ 	for (i = 0; i < ports[1]; i++) {
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+@@ -376,9 +378,9 @@ static int bcma_get_next_core(struct bcm
+ 				/* pr_debug("erom: slave port %d "
+ 				 * "has %d descriptors\n", i, j); */
+ 				break;
+-			} else {
+-				if (i == 0 && j == 0)
+-					core->addr1 = tmp;
++			} else if (k < ARRAY_SIZE(core->addr_s)) {
++				core->addr_s[k] = tmp;
++				k++;
+ 			}
+ 		}
+ 	}
+@@ -421,10 +423,13 @@ static int bcma_get_next_core(struct bcm
+ 		core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
+ 		if (!core->io_addr)
+ 			return -ENOMEM;
+-		core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);
+-		if (!core->io_wrap) {
+-			iounmap(core->io_addr);
+-			return -ENOMEM;
++		if (core->wrap) {
++			core->io_wrap = ioremap_nocache(core->wrap,
++							BCMA_CORE_SIZE);
++			if (!core->io_wrap) {
++				iounmap(core->io_addr);
++				return -ENOMEM;
++			}
+ 		}
+ 	}
+ 	return 0;
+@@ -434,9 +439,7 @@ void bcma_init_bus(struct bcma_bus *bus)
+ {
+ 	s32 tmp;
+ 	struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
+-
+-	if (bus->init_done)
+-		return;
++	char chip_id[8];
+ 
+ 	INIT_LIST_HEAD(&bus->cores);
+ 	bus->nr_cores = 0;
+@@ -447,10 +450,11 @@ void bcma_init_bus(struct bcma_bus *bus)
+ 	chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
+ 	chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
+ 	chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
+-	bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
+-		  chipinfo->id, chipinfo->rev, chipinfo->pkg);
+ 
+-	bus->init_done = true;
++	snprintf(chip_id, ARRAY_SIZE(chip_id),
++		 (chipinfo->id > 0x9999) ? "%d" : "0x%04X", chipinfo->id);
++	bcma_info(bus, "Found chip with id %s, rev 0x%02X and package 0x%02X\n",
++		  chip_id, chipinfo->rev, chipinfo->pkg);
+ }
+ 
+ int bcma_bus_scan(struct bcma_bus *bus)
+@@ -460,8 +464,6 @@ int bcma_bus_scan(struct bcma_bus *bus)
+ 
+ 	int err, core_num = 0;
+ 
+-	bcma_init_bus(bus);
+-
+ 	erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
+ 	if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
+ 		eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
+@@ -503,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
+ 		bus->nr_cores++;
+ 		other_core = bcma_find_core_reverse(bus, core->id.id);
+ 		core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
++		bcma_prepare_core(bus, core);
+ 
+ 		bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
+ 			  core->core_index, bcma_device_name(&core->id),
+--- a/drivers/bcma/host_soc.c
++++ b/drivers/bcma/host_soc.c
+@@ -7,6 +7,9 @@
+ 
+ #include "bcma_private.h"
+ #include "scan.h"
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/of_address.h>
+ #include <linux/bcma/bcma.h>
+ #include <linux/bcma/bcma_soc.h>
+ 
+@@ -134,12 +137,16 @@ static void bcma_host_soc_block_write(st
+ 
+ static u32 bcma_host_soc_aread32(struct bcma_device *core, u16 offset)
+ {
++	if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
++		return ~0;
+ 	return readl(core->io_wrap + offset);
+ }
+ 
+ static void bcma_host_soc_awrite32(struct bcma_device *core, u16 offset,
+ 				  u32 value)
+ {
++	if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
++		return;
+ 	writel(value, core->io_wrap + offset);
+ }
+ 
+@@ -161,7 +168,6 @@ static const struct bcma_host_ops bcma_h
+ int __init bcma_host_soc_register(struct bcma_soc *soc)
+ {
+ 	struct bcma_bus *bus = &soc->bus;
+-	int err;
+ 
+ 	/* iomap only first core. We have to read some register on this core
+ 	 * to scan the bus.
+@@ -173,11 +179,100 @@ int __init bcma_host_soc_register(struct
+ 	/* Host specific */
+ 	bus->hosttype = BCMA_HOSTTYPE_SOC;
+ 	bus->ops = &bcma_host_soc_ops;
++	bus->host_pdev = NULL;
+ 
+-	/* Register */
++	/* Initialize struct, detect chip */
++	bcma_init_bus(bus);
++
++	return 0;
++}
++
++int __init bcma_host_soc_init(struct bcma_soc *soc)
++{
++	struct bcma_bus *bus = &soc->bus;
++	int err;
++
++	/* Scan bus and initialize it */
+ 	err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
+ 	if (err)
+ 		iounmap(bus->mmio);
+ 
+ 	return err;
+ }
++
++#ifdef CONFIG_OF
++static int bcma_host_soc_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct device_node *np = dev->of_node;
++	struct bcma_bus *bus;
++	int err;
++
++	/* Alloc */
++	bus = devm_kzalloc(dev, sizeof(*bus), GFP_KERNEL);
++	if (!bus)
++		return -ENOMEM;
++
++	/* Map MMIO */
++	bus->mmio = of_iomap(np, 0);
++	if (!bus->mmio)
++		return -ENOMEM;
++
++	/* Host specific */
++	bus->hosttype = BCMA_HOSTTYPE_SOC;
++	bus->ops = &bcma_host_soc_ops;
++	bus->host_pdev = pdev;
++
++	/* Initialize struct, detect chip */
++	bcma_init_bus(bus);
++
++	/* Register */
++	err = bcma_bus_register(bus);
++	if (err)
++		goto err_unmap_mmio;
++
++	platform_set_drvdata(pdev, bus);
++
++	return err;
++
++err_unmap_mmio:
++	iounmap(bus->mmio);
++	return err;
++}
++
++static int bcma_host_soc_remove(struct platform_device *pdev)
++{
++	struct bcma_bus *bus = platform_get_drvdata(pdev);
++
++	bcma_bus_unregister(bus);
++	iounmap(bus->mmio);
++	platform_set_drvdata(pdev, NULL);
++
++	return 0;
++}
++
++static const struct of_device_id bcma_host_soc_of_match[] = {
++	{ .compatible = "brcm,bus-axi", },
++	{},
++};
++MODULE_DEVICE_TABLE(of, bcma_host_soc_of_match);
++
++static struct platform_driver bcma_host_soc_driver = {
++	.driver = {
++		.name = "bcma-host-soc",
++		.of_match_table = bcma_host_soc_of_match,
++	},
++	.probe		= bcma_host_soc_probe,
++	.remove		= bcma_host_soc_remove,
++};
++
++int __init bcma_host_soc_register_driver(void)
++{
++	return platform_driver_register(&bcma_host_soc_driver);
++}
++
++void __exit bcma_host_soc_unregister_driver(void)
++{
++	platform_driver_unregister(&bcma_host_soc_driver);
++}
++#endif /* CONFIG_OF */
+--- a/drivers/bcma/driver_mips.c
++++ b/drivers/bcma/driver_mips.c
+@@ -21,6 +21,14 @@
+ #include <linux/serial_reg.h>
+ #include <linux/time.h>
+ 
++enum bcma_boot_dev {
++	BCMA_BOOT_DEV_UNK = 0,
++	BCMA_BOOT_DEV_ROM,
++	BCMA_BOOT_DEV_PARALLEL,
++	BCMA_BOOT_DEV_SERIAL,
++	BCMA_BOOT_DEV_NAND,
++};
++
+ static const char * const part_probes[] = { "bcm47xxpart", NULL };
+ 
+ static struct physmap_flash_data bcma_pflash_data = {
+@@ -107,7 +115,7 @@ static u32 bcma_core_mips_irqflag(struct
+  * If disabled, 5 is returned.
+  * If not supported, 6 is returned.
+  */
+-static unsigned int bcma_core_mips_irq(struct bcma_device *dev)
++unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	struct bcma_device *mdev = dev->bus->drv_mips.core;
+ 	u32 irqflag;
+@@ -125,13 +133,6 @@ static unsigned int bcma_core_mips_irq(s
+ 	return 5;
+ }
+ 
+-unsigned int bcma_core_irq(struct bcma_device *dev)
+-{
+-	unsigned int mips_irq = bcma_core_mips_irq(dev);
+-	return mips_irq <= 4 ? mips_irq + 2 : 0;
+-}
+-EXPORT_SYMBOL(bcma_core_irq);
+-
+ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
+ {
+ 	unsigned int oldirq = bcma_core_mips_irq(dev);
+@@ -229,11 +230,51 @@ u32 bcma_cpu_clock(struct bcma_drv_mips 
+ }
+ EXPORT_SYMBOL(bcma_cpu_clock);
+ 
++static enum bcma_boot_dev bcma_boot_dev(struct bcma_bus *bus)
++{
++	struct bcma_drv_cc *cc = &bus->drv_cc;
++	u8 cc_rev = cc->core->id.rev;
++
++	if (cc_rev == 42) {
++		struct bcma_device *core;
++
++		core = bcma_find_core(bus, BCMA_CORE_NS_ROM);
++		if (core) {
++			switch (bcma_aread32(core, BCMA_IOST) &
++				BCMA_NS_ROM_IOST_BOOT_DEV_MASK) {
++			case BCMA_NS_ROM_IOST_BOOT_DEV_NOR:
++				return BCMA_BOOT_DEV_SERIAL;
++			case BCMA_NS_ROM_IOST_BOOT_DEV_NAND:
++				return BCMA_BOOT_DEV_NAND;
++			case BCMA_NS_ROM_IOST_BOOT_DEV_ROM:
++			default:
++				return BCMA_BOOT_DEV_ROM;
++			}
++		}
++	} else {
++		if (cc_rev == 38) {
++			if (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT)
++				return BCMA_BOOT_DEV_NAND;
++			else if (cc->status & BIT(5))
++				return BCMA_BOOT_DEV_ROM;
++		}
++
++		if ((cc->capabilities & BCMA_CC_CAP_FLASHT) ==
++		    BCMA_CC_FLASHT_PARA)
++			return BCMA_BOOT_DEV_PARALLEL;
++		else
++			return BCMA_BOOT_DEV_SERIAL;
++	}
++
++	return BCMA_BOOT_DEV_SERIAL;
++}
++
+ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
+ {
+ 	struct bcma_bus *bus = mcore->core->bus;
+ 	struct bcma_drv_cc *cc = &bus->drv_cc;
+ 	struct bcma_pflash *pflash = &cc->pflash;
++	enum bcma_boot_dev boot_dev;
+ 
+ 	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
+ 	case BCMA_CC_FLASHT_STSER:
+@@ -269,6 +310,20 @@ static void bcma_core_mips_flash_detect(
+ 			bcma_nflash_init(cc);
+ 		}
+ 	}
++
++	/* Determine flash type this SoC boots from */
++	boot_dev = bcma_boot_dev(bus);
++	switch (boot_dev) {
++	case BCMA_BOOT_DEV_PARALLEL:
++	case BCMA_BOOT_DEV_SERIAL:
++		/* TODO: Init NVRAM using BCMA_SOC_FLASH2 window */
++		break;
++	case BCMA_BOOT_DEV_NAND:
++		/* TODO: Init NVRAM using BCMA_SOC_FLASH1 window */
++		break;
++	default:
++		break;
++	}
+ }
+ 
+ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
+@@ -361,7 +416,7 @@ void bcma_core_mips_init(struct bcma_drv
+ 		break;
+ 	default:
+ 		list_for_each_entry(core, &bus->cores, list) {
+-			core->irq = bcma_core_irq(core);
++			core->irq = bcma_core_irq(core, 0);
+ 		}
+ 		bcma_err(bus,
+ 			 "Unknown device (0x%x) found, can not configure IRQs\n",
+--- a/include/linux/bcma/bcma_regs.h
++++ b/include/linux/bcma/bcma_regs.h
+@@ -39,6 +39,11 @@
+ #define  BCMA_RESET_CTL_RESET		0x0001
+ #define BCMA_RESET_ST			0x0804
+ 
++#define BCMA_NS_ROM_IOST_BOOT_DEV_MASK	0x0003
++#define BCMA_NS_ROM_IOST_BOOT_DEV_NOR	0x0000
++#define BCMA_NS_ROM_IOST_BOOT_DEV_NAND	0x0001
++#define BCMA_NS_ROM_IOST_BOOT_DEV_ROM	0x0002
++
+ /* BCMA PCI config space registers. */
+ #define BCMA_PCI_PMCSR			0x44
+ #define  BCMA_PCI_PE			0x100
+--- a/drivers/usb/host/bcma-hcd.c
++++ b/drivers/usb/host/bcma-hcd.c
+@@ -237,7 +237,7 @@ static int bcma_hcd_probe(struct bcma_de
+ 	bcma_hcd_init_chip(dev);
+ 
+ 	/* In AI chips EHCI is addrspace 0, OHCI is 1 */
+-	ohci_addr = dev->addr1;
++	ohci_addr = dev->addr_s[0];
+ 	if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749)
+ 	    && chipinfo->rev == 0)
+ 		ohci_addr = 0x18009000;
+--- a/drivers/bcma/bcma_private.h
++++ b/drivers/bcma/bcma_private.h
+@@ -24,6 +24,7 @@ struct bcma_bus;
+ /* main.c */
+ bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
+ 		     int timeout);
++void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);
+ int bcma_bus_register(struct bcma_bus *bus);
+ void bcma_bus_unregister(struct bcma_bus *bus);
+ int __init bcma_bus_early_register(struct bcma_bus *bus,
+@@ -50,6 +51,10 @@ void bcma_chipco_serial_init(struct bcma
+ extern struct platform_device bcma_pflash_dev;
+ #endif /* CONFIG_BCMA_DRIVER_MIPS */
+ 
++/* driver_chipcommon_b.c */
++int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);
++void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb);
++
+ /* driver_chipcommon_pmu.c */
+ u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);
+ u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);
+@@ -84,6 +89,20 @@ extern int __init bcma_host_pci_init(voi
+ extern void __exit bcma_host_pci_exit(void);
+ #endif /* CONFIG_BCMA_HOST_PCI */
+ 
++/* host_soc.c */
++#if defined(CONFIG_BCMA_HOST_SOC) && defined(CONFIG_OF)
++extern int __init bcma_host_soc_register_driver(void);
++extern void __exit bcma_host_soc_unregister_driver(void);
++#else
++static inline int __init bcma_host_soc_register_driver(void)
++{
++	return 0;
++}
++static inline void __exit bcma_host_soc_unregister_driver(void)
++{
++}
++#endif /* CONFIG_BCMA_HOST_SOC && CONFIG_OF */
++
+ /* driver_pci.c */
+ u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
+ 
+--- /dev/null
++++ b/drivers/bcma/driver_chipcommon_b.c
+@@ -0,0 +1,61 @@
++/*
++ * Broadcom specific AMBA
++ * ChipCommon B Unit driver
++ *
++ * Copyright 2014, Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++#include <linux/export.h>
++#include <linux/bcma/bcma.h>
++
++static bool bcma_wait_reg(struct bcma_bus *bus, void __iomem *addr, u32 mask,
++			  u32 value, int timeout)
++{
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
++
++	do {
++		val = readl(addr);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_err(bus, "Timeout waiting for register %p\n", addr);
++
++	return false;
++}
++
++void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value)
++{
++	struct bcma_bus *bus = ccb->core->bus;
++
++	writel(offset, ccb->mii + 0x00);
++	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);
++	writel(value, ccb->mii + 0x04);
++	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);
++}
++EXPORT_SYMBOL_GPL(bcma_chipco_b_mii_write);
++
++int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb)
++{
++	if (ccb->setup_done)
++		return 0;
++
++	ccb->setup_done = 1;
++	ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);
++	if (!ccb->mii)
++		return -ENOMEM;
++
++	return 0;
++}
++
++void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb)
++{
++	if (ccb->mii)
++		iounmap(ccb->mii);
++}
+--- a/include/linux/bcma/bcma_driver_chipcommon.h
++++ b/include/linux/bcma/bcma_driver_chipcommon.h
+@@ -644,6 +644,12 @@ struct bcma_drv_cc {
+ #endif
+ };
+ 
++struct bcma_drv_cc_b {
++	struct bcma_device *core;
++	u8 setup_done:1;
++	void __iomem *mii;
++};
++
+ /* Register access */
+ #define bcma_cc_read32(cc, offset) \
+ 	bcma_read32((cc)->core, offset)
+@@ -699,4 +705,6 @@ extern void bcma_pmu_spuravoid_pllupdate
+ 
+ extern u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc);
+ 
++void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value);
++
+ #endif /* LINUX_BCMA_DRIVER_CC_H_ */
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -202,6 +202,10 @@ static void __init bcm47xx_register_bcma
+ 
+ 	err = bcma_host_soc_register(&bcm47xx_bus.bcma);
+ 	if (err)
++		panic("Failed to register BCMA bus (err %d)", err);
++
++	err = bcma_host_soc_init(&bcm47xx_bus.bcma);
++	if (err)
+ 		panic("Failed to initialize BCMA bus (err %d)", err);
+ 
+ 	bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
+--- a/include/linux/bcma/bcma_soc.h
++++ b/include/linux/bcma/bcma_soc.h
+@@ -10,6 +10,7 @@ struct bcma_soc {
+ };
+ 
+ int __init bcma_host_soc_register(struct bcma_soc *soc);
++int __init bcma_host_soc_init(struct bcma_soc *soc);
+ 
+ int bcma_bus_register(struct bcma_bus *bus);
+ 
+--- /dev/null
++++ b/Documentation/devicetree/bindings/bus/bcma.txt
+@@ -0,0 +1,53 @@
++Driver for ARM AXI Bus with Broadcom Plugins (bcma)
++
++Required properties:
++
++- compatible : brcm,bus-axi
++
++- reg : iomem address range of chipcommon core
++
++The cores on the AXI bus are automatically detected by bcma with the
++memory ranges they are using and they get registered afterwards.
++Automatic detection of the IRQ number is not working on
++BCM47xx/BCM53xx ARM SoCs. To assign IRQ numbers to the cores, provide
++them manually through device tree. Use an interrupt-map to specify the
++IRQ used by the devices on the bus. The first address is just an index,
++because we do not have any special register.
++
++The top-level axi bus may contain children representing attached cores
++(devices). This is needed since some hardware details can't be auto
++detected (e.g. IRQ numbers). Also some of the cores may be responsible
++for extra things, e.g. ChipCommon providing access to the GPIO chip.
++
++Example:
++
++	axi@18000000 {
++		compatible = "brcm,bus-axi";
++		reg = <0x18000000 0x1000>;
++		ranges = <0x00000000 0x18000000 0x00100000>;
++		#address-cells = <1>;
++		#size-cells = <1>;
++		#interrupt-cells = <1>;
++		interrupt-map-mask = <0x000fffff 0xffff>;
++		interrupt-map =
++			/* Ethernet Controller 0 */
++			<0x00024000 0 &gic GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
++
++			/* Ethernet Controller 1 */
++			<0x00025000 0 &gic GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
++
++			/* PCIe Controller 0 */
++			<0x00012000 0 &gic GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 1 &gic GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 2 &gic GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 3 &gic GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 4 &gic GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
++			<0x00012000 5 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
++
++		chipcommon {
++			reg = <0x00000000 0x1000>;
++
++			gpio-controller;
++			#gpio-cells = <2>;
++		};
++	};
diff --git a/trunk/target/linux/generic/patches-3.14/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch b/trunk/target/linux/generic/patches-3.14/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch
new file mode 100644
index 00000000..609deecf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch
@@ -0,0 +1,829 @@
+From 9d54c8a33eec78289b1b3f6e10874719c27ce0a7 Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Tue, 25 Feb 2014 13:25:22 -0300
+Subject: [PATCH] UBI: R/O block driver on top of UBI volumes
+
+This commit introduces read-only block device emulation on top of UBI volumes.
+
+Given UBI takes care of wear leveling and bad block management it's possible
+to add a thin layer to enable block device access to UBI volumes.
+This allows to use a block-oriented filesystem on a flash device.
+
+The UBI block devices are meant to be used in conjunction with any
+regular, block-oriented file system (e.g. ext4), although it's primarily
+targeted at read-only file systems, such as squashfs.
+
+Block devices are created upon user request through new ioctls:
+UBI_IOCVOLATTBLK to attach and UBI_IOCVOLDETBLK to detach.
+Also, a new UBI module parameter is added 'ubi.block'. This parameter is
+needed in order to attach a block device on boot-up time, allowing to
+mount the rootfs on a ubiblock device.
+For instance, you could have these kernel parameters:
+
+  ubi.mtd=5 ubi.block=0,0 root=/dev/ubiblock0_0
+
+Or, if you compile ubi as a module:
+
+  $ modprobe ubi mtd=/dev/mtd5 block=/dev/ubi0_0
+
+Artem: amend commentaries and massage the patch a little bit.
+
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/Kconfig     |  15 +
+ drivers/mtd/ubi/Makefile    |   1 +
+ drivers/mtd/ubi/block.c     | 646 ++++++++++++++++++++++++++++++++++++++++++++
+ drivers/mtd/ubi/build.c     |  11 +
+ drivers/mtd/ubi/cdev.c      |  20 ++
+ drivers/mtd/ubi/ubi.h       |  14 +
+ include/uapi/mtd/ubi-user.h |  11 +
+ 7 files changed, 718 insertions(+)
+ create mode 100644 drivers/mtd/ubi/block.c
+
+--- a/drivers/mtd/ubi/Kconfig
++++ b/drivers/mtd/ubi/Kconfig
+@@ -87,4 +87,19 @@ config MTD_UBI_GLUEBI
+ 	   work on top of UBI. Do not enable this unless you use legacy
+ 	   software.
+ 
++config MTD_UBI_BLOCK
++	bool "Read-only block devices on top of UBI volumes"
++	default n
++	help
++	   This option enables read-only UBI block devices support. UBI block
++	   devices will be layered on top of UBI volumes, which means that the
++	   UBI driver will transparently handle things like bad eraseblocks and
++	   bit-flips. You can put any block-oriented file system on top of UBI
++	   volumes in read-only mode (e.g., ext4), but it is probably most
++	   practical for read-only file systems, like squashfs.
++
++	   When selected, this feature will be built in the UBI driver.
++
++	   If in doubt, say "N".
++
+ endif # MTD_UBI
+--- a/drivers/mtd/ubi/Makefile
++++ b/drivers/mtd/ubi/Makefile
+@@ -3,5 +3,6 @@ obj-$(CONFIG_MTD_UBI) += ubi.o
+ ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o attach.o
+ ubi-y += misc.o debug.o
+ ubi-$(CONFIG_MTD_UBI_FASTMAP) += fastmap.o
++ubi-$(CONFIG_MTD_UBI_BLOCK) += block.o
+ 
+ obj-$(CONFIG_MTD_UBI_GLUEBI) += gluebi.o
+--- /dev/null
++++ b/drivers/mtd/ubi/block.c
+@@ -0,0 +1,646 @@
++/*
++ * Copyright (c) 2014 Ezequiel Garcia
++ * Copyright (c) 2011 Free Electrons
++ *
++ * Driver parameter handling strongly based on drivers/mtd/ubi/build.c
++ *   Copyright (c) International Business Machines Corp., 2006
++ *   Copyright (c) Nokia Corporation, 2007
++ *   Authors: Artem Bityutskiy, Frank Haverkamp
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, version 2.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++/*
++ * Read-only block devices on top of UBI volumes
++ *
++ * A simple implementation to allow a block device to be layered on top of a
++ * UBI volume. The implementation is provided by creating a static 1-to-1
++ * mapping between the block device and the UBI volume.
++ *
++ * The addressed byte is obtained from the addressed block sector, which is
++ * mapped linearly into the corresponding LEB:
++ *
++ *   LEB number = addressed byte / LEB size
++ *
++ * This feature is compiled in the UBI core, and adds a new 'block' parameter
++ * to allow early block device attaching. Runtime  block attach/detach for UBI
++ * volumes is provided through two new UBI ioctls: UBI_IOCVOLATTBLK and
++ * UBI_IOCVOLDETBLK.
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <linux/kernel.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/mtd/ubi.h>
++#include <linux/workqueue.h>
++#include <linux/blkdev.h>
++#include <linux/hdreg.h>
++#include <asm/div64.h>
++
++#include "ubi-media.h"
++#include "ubi.h"
++
++/* Maximum number of supported devices */
++#define UBIBLOCK_MAX_DEVICES 32
++
++/* Maximum length of the 'block=' parameter */
++#define UBIBLOCK_PARAM_LEN 63
++
++/* Maximum number of comma-separated items in the 'block=' parameter */
++#define UBIBLOCK_PARAM_COUNT 2
++
++struct ubiblock_param {
++	int ubi_num;
++	int vol_id;
++	char name[UBIBLOCK_PARAM_LEN+1];
++};
++
++/* Numbers of elements set in the @ubiblock_param array */
++static int ubiblock_devs __initdata;
++
++/* MTD devices specification parameters */
++static struct ubiblock_param ubiblock_param[UBIBLOCK_MAX_DEVICES] __initdata;
++
++struct ubiblock {
++	struct ubi_volume_desc *desc;
++	int ubi_num;
++	int vol_id;
++	int refcnt;
++	int leb_size;
++
++	struct gendisk *gd;
++	struct request_queue *rq;
++
++	struct workqueue_struct *wq;
++	struct work_struct work;
++
++	struct mutex dev_mutex;
++	spinlock_t queue_lock;
++	struct list_head list;
++};
++
++/* Linked list of all ubiblock instances */
++static LIST_HEAD(ubiblock_devices);
++static DEFINE_MUTEX(devices_mutex);
++static int ubiblock_major;
++
++static int __init ubiblock_set_param(const char *val,
++				     const struct kernel_param *kp)
++{
++	int i, ret;
++	size_t len;
++	struct ubiblock_param *param;
++	char buf[UBIBLOCK_PARAM_LEN];
++	char *pbuf = &buf[0];
++	char *tokens[UBIBLOCK_PARAM_COUNT];
++
++	if (!val)
++		return -EINVAL;
++
++	len = strnlen(val, UBIBLOCK_PARAM_LEN);
++	if (len == 0) {
++		ubi_warn("block: empty 'block=' parameter - ignored\n");
++		return 0;
++	}
++
++	if (len == UBIBLOCK_PARAM_LEN) {
++		ubi_err("block: parameter \"%s\" is too long, max. is %d\n",
++			val, UBIBLOCK_PARAM_LEN);
++		return -EINVAL;
++	}
++
++	strcpy(buf, val);
++
++	/* Get rid of the final newline */
++	if (buf[len - 1] == '\n')
++		buf[len - 1] = '\0';
++
++	for (i = 0; i < UBIBLOCK_PARAM_COUNT; i++)
++		tokens[i] = strsep(&pbuf, ",");
++
++	param = &ubiblock_param[ubiblock_devs];
++	if (tokens[1]) {
++		/* Two parameters: can be 'ubi, vol_id' or 'ubi, vol_name' */
++		ret = kstrtoint(tokens[0], 10, &param->ubi_num);
++		if (ret < 0)
++			return -EINVAL;
++
++		/* Second param can be a number or a name */
++		ret = kstrtoint(tokens[1], 10, &param->vol_id);
++		if (ret < 0) {
++			param->vol_id = -1;
++			strcpy(param->name, tokens[1]);
++		}
++
++	} else {
++		/* One parameter: must be device path */
++		strcpy(param->name, tokens[0]);
++		param->ubi_num = -1;
++		param->vol_id = -1;
++	}
++
++	ubiblock_devs++;
++
++	return 0;
++}
++
++static const struct kernel_param_ops ubiblock_param_ops = {
++	.set    = ubiblock_set_param,
++};
++module_param_cb(block, &ubiblock_param_ops, NULL, 0);
++MODULE_PARM_DESC(block, "Attach block devices to UBI volumes. Parameter format: block=<path|dev,num|dev,name>.\n"
++			"Multiple \"block\" parameters may be specified.\n"
++			"UBI volumes may be specified by their number, name, or path to the device node.\n"
++			"Examples\n"
++			"Using the UBI volume path:\n"
++			"ubi.block=/dev/ubi0_0\n"
++			"Using the UBI device, and the volume name:\n"
++			"ubi.block=0,rootfs\n"
++			"Using both UBI device number and UBI volume number:\n"
++			"ubi.block=0,0\n");
++
++static struct ubiblock *find_dev_nolock(int ubi_num, int vol_id)
++{
++	struct ubiblock *dev;
++
++	list_for_each_entry(dev, &ubiblock_devices, list)
++		if (dev->ubi_num == ubi_num && dev->vol_id == vol_id)
++			return dev;
++	return NULL;
++}
++
++static int ubiblock_read_to_buf(struct ubiblock *dev, char *buffer,
++				int leb, int offset, int len)
++{
++	int ret;
++
++	ret = ubi_read(dev->desc, leb, buffer, offset, len);
++	if (ret) {
++		ubi_err("%s ubi_read error %d",
++			dev->gd->disk_name, ret);
++		return ret;
++	}
++	return 0;
++}
++
++static int ubiblock_read(struct ubiblock *dev, char *buffer,
++			 sector_t sec, int len)
++{
++	int ret, leb, offset;
++	int bytes_left = len;
++	int to_read = len;
++	loff_t pos = sec << 9;
++
++	/* Get LEB:offset address to read from */
++	offset = do_div(pos, dev->leb_size);
++	leb = pos;
++
++	while (bytes_left) {
++		/*
++		 * We can only read one LEB at a time. Therefore if the read
++		 * length is larger than one LEB size, we split the operation.
++		 */
++		if (offset + to_read > dev->leb_size)
++			to_read = dev->leb_size - offset;
++
++		ret = ubiblock_read_to_buf(dev, buffer, leb, offset, to_read);
++		if (ret)
++			return ret;
++
++		buffer += to_read;
++		bytes_left -= to_read;
++		to_read = bytes_left;
++		leb += 1;
++		offset = 0;
++	}
++	return 0;
++}
++
++static int do_ubiblock_request(struct ubiblock *dev, struct request *req)
++{
++	int len, ret;
++	sector_t sec;
++
++	if (req->cmd_type != REQ_TYPE_FS)
++		return -EIO;
++
++	if (blk_rq_pos(req) + blk_rq_cur_sectors(req) >
++	    get_capacity(req->rq_disk))
++		return -EIO;
++
++	if (rq_data_dir(req) != READ)
++		return -ENOSYS; /* Write not implemented */
++
++	sec = blk_rq_pos(req);
++	len = blk_rq_cur_bytes(req);
++
++	/*
++	 * Let's prevent the device from being removed while we're doing I/O
++	 * work. Notice that this means we serialize all the I/O operations,
++	 * but it's probably of no impact given the NAND core serializes
++	 * flash access anyway.
++	 */
++	mutex_lock(&dev->dev_mutex);
++	ret = ubiblock_read(dev, req->buffer, sec, len);
++	mutex_unlock(&dev->dev_mutex);
++
++	return ret;
++}
++
++static void ubiblock_do_work(struct work_struct *work)
++{
++	struct ubiblock *dev =
++		container_of(work, struct ubiblock, work);
++	struct request_queue *rq = dev->rq;
++	struct request *req;
++	int res;
++
++	spin_lock_irq(rq->queue_lock);
++
++	req = blk_fetch_request(rq);
++	while (req) {
++
++		spin_unlock_irq(rq->queue_lock);
++		res = do_ubiblock_request(dev, req);
++		spin_lock_irq(rq->queue_lock);
++
++		/*
++		 * If we're done with this request,
++		 * we need to fetch a new one
++		 */
++		if (!__blk_end_request_cur(req, res))
++			req = blk_fetch_request(rq);
++	}
++
++	spin_unlock_irq(rq->queue_lock);
++}
++
++static void ubiblock_request(struct request_queue *rq)
++{
++	struct ubiblock *dev;
++	struct request *req;
++
++	dev = rq->queuedata;
++
++	if (!dev)
++		while ((req = blk_fetch_request(rq)) != NULL)
++			__blk_end_request_all(req, -ENODEV);
++	else
++		queue_work(dev->wq, &dev->work);
++}
++
++static int ubiblock_open(struct block_device *bdev, fmode_t mode)
++{
++	struct ubiblock *dev = bdev->bd_disk->private_data;
++	int ret;
++
++	mutex_lock(&dev->dev_mutex);
++	if (dev->refcnt > 0) {
++		/*
++		 * The volume is already open, just increase the reference
++		 * counter.
++		 */
++		goto out_done;
++	}
++
++	/*
++	 * We want users to be aware they should only mount us as read-only.
++	 * It's just a paranoid check, as write requests will get rejected
++	 * in any case.
++	 */
++	if (mode & FMODE_WRITE) {
++		ret = -EPERM;
++		goto out_unlock;
++	}
++
++	dev->desc = ubi_open_volume(dev->ubi_num, dev->vol_id, UBI_READONLY);
++	if (IS_ERR(dev->desc)) {
++		ubi_err("%s failed to open ubi volume %d_%d",
++			dev->gd->disk_name, dev->ubi_num, dev->vol_id);
++		ret = PTR_ERR(dev->desc);
++		dev->desc = NULL;
++		goto out_unlock;
++	}
++
++out_done:
++	dev->refcnt++;
++	mutex_unlock(&dev->dev_mutex);
++	return 0;
++
++out_unlock:
++	mutex_unlock(&dev->dev_mutex);
++	return ret;
++}
++
++static void ubiblock_release(struct gendisk *gd, fmode_t mode)
++{
++	struct ubiblock *dev = gd->private_data;
++
++	mutex_lock(&dev->dev_mutex);
++	dev->refcnt--;
++	if (dev->refcnt == 0) {
++		ubi_close_volume(dev->desc);
++		dev->desc = NULL;
++	}
++	mutex_unlock(&dev->dev_mutex);
++}
++
++static int ubiblock_getgeo(struct block_device *bdev, struct hd_geometry *geo)
++{
++	/* Some tools might require this information */
++	geo->heads = 1;
++	geo->cylinders = 1;
++	geo->sectors = get_capacity(bdev->bd_disk);
++	geo->start = 0;
++	return 0;
++}
++
++static const struct block_device_operations ubiblock_ops = {
++	.owner = THIS_MODULE,
++	.open = ubiblock_open,
++	.release = ubiblock_release,
++	.getgeo	= ubiblock_getgeo,
++};
++
++int ubiblock_add(struct ubi_volume_info *vi)
++{
++	struct ubiblock *dev;
++	struct gendisk *gd;
++	int disk_capacity;
++	int ret;
++
++	/* Check that the volume isn't already handled */
++	mutex_lock(&devices_mutex);
++	if (find_dev_nolock(vi->ubi_num, vi->vol_id)) {
++		mutex_unlock(&devices_mutex);
++		return -EEXIST;
++	}
++	mutex_unlock(&devices_mutex);
++
++	dev = kzalloc(sizeof(struct ubiblock), GFP_KERNEL);
++	if (!dev)
++		return -ENOMEM;
++
++	mutex_init(&dev->dev_mutex);
++
++	dev->ubi_num = vi->ubi_num;
++	dev->vol_id = vi->vol_id;
++	dev->leb_size = vi->usable_leb_size;
++
++	/* Initialize the gendisk of this ubiblock device */
++	gd = alloc_disk(1);
++	if (!gd) {
++		ubi_err("block: alloc_disk failed");
++		ret = -ENODEV;
++		goto out_free_dev;
++	}
++
++	gd->fops = &ubiblock_ops;
++	gd->major = ubiblock_major;
++	gd->first_minor = dev->ubi_num * UBI_MAX_VOLUMES + dev->vol_id;
++	gd->private_data = dev;
++	sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);
++	disk_capacity = (vi->size * vi->usable_leb_size) >> 9;
++	set_capacity(gd, disk_capacity);
++	dev->gd = gd;
++
++	spin_lock_init(&dev->queue_lock);
++	dev->rq = blk_init_queue(ubiblock_request, &dev->queue_lock);
++	if (!dev->rq) {
++		ubi_err("block: blk_init_queue failed");
++		ret = -ENODEV;
++		goto out_put_disk;
++	}
++
++	dev->rq->queuedata = dev;
++	dev->gd->queue = dev->rq;
++
++	/*
++	 * Create one workqueue per volume (per registered block device).
++	 * Rembember workqueues are cheap, they're not threads.
++	 */
++	dev->wq = alloc_workqueue(gd->disk_name, 0, 0);
++	if (!dev->wq)
++		goto out_free_queue;
++	INIT_WORK(&dev->work, ubiblock_do_work);
++
++	mutex_lock(&devices_mutex);
++	list_add_tail(&dev->list, &ubiblock_devices);
++	mutex_unlock(&devices_mutex);
++
++	/* Must be the last step: anyone can call file ops from now on */
++	add_disk(dev->gd);
++	ubi_msg("%s created from ubi%d:%d(%s)",
++		dev->gd->disk_name, dev->ubi_num, dev->vol_id, vi->name);
++	return 0;
++
++out_free_queue:
++	blk_cleanup_queue(dev->rq);
++out_put_disk:
++	put_disk(dev->gd);
++out_free_dev:
++	kfree(dev);
++
++	return ret;
++}
++
++static void ubiblock_cleanup(struct ubiblock *dev)
++{
++	del_gendisk(dev->gd);
++	blk_cleanup_queue(dev->rq);
++	ubi_msg("%s released", dev->gd->disk_name);
++	put_disk(dev->gd);
++}
++
++int ubiblock_del(struct ubi_volume_info *vi)
++{
++	struct ubiblock *dev;
++
++	mutex_lock(&devices_mutex);
++	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
++	if (!dev) {
++		mutex_unlock(&devices_mutex);
++		return -ENODEV;
++	}
++
++	/* Found a device, let's lock it so we can check if it's busy */
++	mutex_lock(&dev->dev_mutex);
++	if (dev->refcnt > 0) {
++		mutex_unlock(&dev->dev_mutex);
++		mutex_unlock(&devices_mutex);
++		return -EBUSY;
++	}
++
++	/* Remove from device list */
++	list_del(&dev->list);
++	mutex_unlock(&devices_mutex);
++
++	/* Flush pending work and stop this workqueue */
++	destroy_workqueue(dev->wq);
++
++	ubiblock_cleanup(dev);
++	mutex_unlock(&dev->dev_mutex);
++	kfree(dev);
++	return 0;
++}
++
++static void ubiblock_resize(struct ubi_volume_info *vi)
++{
++	struct ubiblock *dev;
++	int disk_capacity;
++
++	/*
++	 * Need to lock the device list until we stop using the device,
++	 * otherwise the device struct might get released in 'ubiblock_del()'.
++	 */
++	mutex_lock(&devices_mutex);
++	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
++	if (!dev) {
++		mutex_unlock(&devices_mutex);
++		return;
++	}
++
++	mutex_lock(&dev->dev_mutex);
++	disk_capacity = (vi->size * vi->usable_leb_size) >> 9;
++	set_capacity(dev->gd, disk_capacity);
++	ubi_msg("%s resized to %d LEBs", dev->gd->disk_name, vi->size);
++	mutex_unlock(&dev->dev_mutex);
++	mutex_unlock(&devices_mutex);
++}
++
++static int ubiblock_notify(struct notifier_block *nb,
++			 unsigned long notification_type, void *ns_ptr)
++{
++	struct ubi_notification *nt = ns_ptr;
++
++	switch (notification_type) {
++	case UBI_VOLUME_ADDED:
++		/*
++		 * We want to enforce explicit block device attaching for
++		 * volumes, so when a volume is added we do nothing.
++		 */
++		break;
++	case UBI_VOLUME_REMOVED:
++		ubiblock_del(&nt->vi);
++		break;
++	case UBI_VOLUME_RESIZED:
++		ubiblock_resize(&nt->vi);
++		break;
++	default:
++		break;
++	}
++	return NOTIFY_OK;
++}
++
++static struct notifier_block ubiblock_notifier = {
++	.notifier_call = ubiblock_notify,
++};
++
++static struct ubi_volume_desc * __init
++open_volume_desc(const char *name, int ubi_num, int vol_id)
++{
++	if (ubi_num == -1)
++		/* No ubi num, name must be a vol device path */
++		return ubi_open_volume_path(name, UBI_READONLY);
++	else if (vol_id == -1)
++		/* No vol_id, must be vol_name */
++		return ubi_open_volume_nm(ubi_num, name, UBI_READONLY);
++	else
++		return ubi_open_volume(ubi_num, vol_id, UBI_READONLY);
++}
++
++static int __init ubiblock_attach_from_param(void)
++{
++	int i, ret;
++	struct ubiblock_param *p;
++	struct ubi_volume_desc *desc;
++	struct ubi_volume_info vi;
++
++	for (i = 0; i < ubiblock_devs; i++) {
++		p = &ubiblock_param[i];
++
++		desc = open_volume_desc(p->name, p->ubi_num, p->vol_id);
++		if (IS_ERR(desc)) {
++			ubi_err("block: can't open volume, err=%ld\n",
++				PTR_ERR(desc));
++			ret = PTR_ERR(desc);
++			break;
++		}
++
++		ubi_get_volume_info(desc, &vi);
++		ubi_close_volume(desc);
++
++		ret = ubiblock_add(&vi);
++		if (ret) {
++			ubi_err("block: can't add '%s' volume, err=%d\n",
++				vi.name, ret);
++			break;
++		}
++	}
++	return ret;
++}
++
++static void ubiblock_detach_all(void)
++{
++	struct ubiblock *next;
++	struct ubiblock *dev;
++
++	list_for_each_entry_safe(dev, next, &ubiblock_devices, list) {
++		/* Flush pending work and stop workqueue */
++		destroy_workqueue(dev->wq);
++		/* The module is being forcefully removed */
++		WARN_ON(dev->desc);
++		/* Remove from device list */
++		list_del(&dev->list);
++		ubiblock_cleanup(dev);
++		kfree(dev);
++	}
++}
++
++int __init ubiblock_init(void)
++{
++	int ret;
++
++	ubiblock_major = register_blkdev(0, "ubiblock");
++	if (ubiblock_major < 0)
++		return ubiblock_major;
++
++	/* Attach block devices from 'block=' module param */
++	ret = ubiblock_attach_from_param();
++	if (ret)
++		goto err_detach;
++
++	/*
++	 * Block devices needs to be attached to volumes explicitly
++	 * upon user request. So we ignore existing volumes.
++	 */
++	ret = ubi_register_volume_notifier(&ubiblock_notifier, 1);
++	if (ret)
++		goto err_unreg;
++	return 0;
++
++err_unreg:
++	unregister_blkdev(ubiblock_major, "ubiblock");
++err_detach:
++	ubiblock_detach_all();
++	return ret;
++}
++
++void __exit ubiblock_exit(void)
++{
++	ubi_unregister_volume_notifier(&ubiblock_notifier);
++	ubiblock_detach_all();
++	unregister_blkdev(ubiblock_major, "ubiblock");
++}
+--- a/drivers/mtd/ubi/build.c
++++ b/drivers/mtd/ubi/build.c
+@@ -1298,6 +1298,15 @@ static int __init ubi_init(void)
+ 		}
+ 	}
+ 
++	err = ubiblock_init();
++	if (err) {
++		ubi_err("block: cannot initialize, error %d", err);
++
++		/* See comment above re-ubi_is_module(). */
++		if (ubi_is_module())
++			goto out_detach;
++	}
++
+ 	return 0;
+ 
+ out_detach:
+@@ -1326,6 +1335,8 @@ static void __exit ubi_exit(void)
+ {
+ 	int i;
+ 
++	ubiblock_exit();
++
+ 	for (i = 0; i < UBI_MAX_DEVICES; i++)
+ 		if (ubi_devices[i]) {
+ 			mutex_lock(&ubi_devices_mutex);
+--- a/drivers/mtd/ubi/cdev.c
++++ b/drivers/mtd/ubi/cdev.c
+@@ -561,6 +561,26 @@ static long vol_cdev_ioctl(struct file *
+ 		break;
+ 	}
+ 
++	/* Attach a block device to an UBI volume */
++	case UBI_IOCVOLATTBLK:
++	{
++		struct ubi_volume_info vi;
++
++		ubi_get_volume_info(desc, &vi);
++		err = ubiblock_add(&vi);
++		break;
++	}
++
++	/* Dettach a block device from an UBI volume */
++	case UBI_IOCVOLDETBLK:
++	{
++		struct ubi_volume_info vi;
++
++		ubi_get_volume_info(desc, &vi);
++		err = ubiblock_del(&vi);
++		break;
++	}
++
+ 	default:
+ 		err = -ENOTTY;
+ 		break;
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -864,6 +864,20 @@ int ubi_update_fastmap(struct ubi_device
+ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
+ 		     int fm_anchor);
+ 
++/* block.c */
++#ifdef CONFIG_MTD_UBI_BLOCK
++int ubiblock_init(void);
++void ubiblock_exit(void);
++int ubiblock_add(struct ubi_volume_info *vi);
++int ubiblock_del(struct ubi_volume_info *vi);
++#else
++static inline int ubiblock_init(void) { return 0; }
++static inline void ubiblock_exit(void) {}
++static inline int ubiblock_add(struct ubi_volume_info *vi) { return -ENOTTY; }
++static inline int ubiblock_del(struct ubi_volume_info *vi) { return -ENOTTY; }
++#endif
++
++
+ /*
+  * ubi_rb_for_each_entry - walk an RB-tree.
+  * @rb: a pointer to type 'struct rb_node' to use as a loop counter
+--- a/include/uapi/mtd/ubi-user.h
++++ b/include/uapi/mtd/ubi-user.h
+@@ -134,6 +134,13 @@
+  * used. A pointer to a &struct ubi_set_vol_prop_req object is expected to be
+  * passed. The object describes which property should be set, and to which value
+  * it should be set.
++ *
++ * Block devices on UBI volumes
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ *
++ * To attach or detach a block device from an UBI volume the %UBI_IOCVOLATTBLK
++ * and %UBI_IOCVOLDETBLK ioctl commands should be used, respectively.
++ * These commands take no arguments.
+  */
+ 
+ /*
+@@ -191,6 +198,10 @@
+ /* Set an UBI volume property */
+ #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
+ 			       struct ubi_set_vol_prop_req)
++/* Attach a block device to an UBI volume */
++#define UBI_IOCVOLATTBLK _IO(UBI_VOL_IOC_MAGIC, 7)
++/* Detach a block device from an UBI volume */
++#define UBI_IOCVOLDETBLK _IO(UBI_VOL_IOC_MAGIC, 8)
+ 
+ /* Maximum MTD device name length supported by UBI */
+ #define MAX_UBI_MTD_NAME_LEN 127
diff --git a/trunk/target/linux/generic/patches-3.14/041-UBI-block-do-not-use-term-attach.patch b/trunk/target/linux/generic/patches-3.14/041-UBI-block-do-not-use-term-attach.patch
new file mode 100644
index 00000000..e9344618
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/041-UBI-block-do-not-use-term-attach.patch
@@ -0,0 +1,185 @@
+From 4d283ee2517303afa54ad6cbd9342a2f748cf509 Mon Sep 17 00:00:00 2001
+From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Date: Tue, 4 Mar 2014 12:00:26 +0200
+Subject: [PATCH] UBI: block: do not use term "attach"
+
+We already use term attach/detach for UBI->MTD relations, let's not use this
+for UBI->ubiblock relations to avoid confusion. Just use 'create' and 'remove'
+instead. E.g., "create a R/O block device on top of a UBI volume".
+
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 39 ++++++++++++++++++++-------------------
+ drivers/mtd/ubi/cdev.c  |  4 ++--
+ drivers/mtd/ubi/ubi.h   | 14 ++++++++++----
+ 3 files changed, 32 insertions(+), 25 deletions(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -29,10 +29,10 @@
+  *
+  *   LEB number = addressed byte / LEB size
+  *
+- * This feature is compiled in the UBI core, and adds a new 'block' parameter
+- * to allow early block device attaching. Runtime  block attach/detach for UBI
+- * volumes is provided through two new UBI ioctls: UBI_IOCVOLATTBLK and
+- * UBI_IOCVOLDETBLK.
++ * This feature is compiled in the UBI core, and adds a 'block' parameter
++ * to allow early creation of block devices on top of UBI volumes. Runtime
++ * block creation/removal for UBI volumes is provided through two UBI ioctls:
++ * UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK.
+  */
+ 
+ #include <linux/module.h>
+@@ -374,7 +374,7 @@ static const struct block_device_operati
+ 	.getgeo	= ubiblock_getgeo,
+ };
+ 
+-int ubiblock_add(struct ubi_volume_info *vi)
++int ubiblock_create(struct ubi_volume_info *vi)
+ {
+ 	struct ubiblock *dev;
+ 	struct gendisk *gd;
+@@ -464,7 +464,7 @@ static void ubiblock_cleanup(struct ubib
+ 	put_disk(dev->gd);
+ }
+ 
+-int ubiblock_del(struct ubi_volume_info *vi)
++int ubiblock_remove(struct ubi_volume_info *vi)
+ {
+ 	struct ubiblock *dev;
+ 
+@@ -503,7 +503,8 @@ static void ubiblock_resize(struct ubi_v
+ 
+ 	/*
+ 	 * Need to lock the device list until we stop using the device,
+-	 * otherwise the device struct might get released in 'ubiblock_del()'.
++	 * otherwise the device struct might get released in
++	 * 'ubiblock_remove()'.
+ 	 */
+ 	mutex_lock(&devices_mutex);
+ 	dev = find_dev_nolock(vi->ubi_num, vi->vol_id);
+@@ -528,12 +529,12 @@ static int ubiblock_notify(struct notifi
+ 	switch (notification_type) {
+ 	case UBI_VOLUME_ADDED:
+ 		/*
+-		 * We want to enforce explicit block device attaching for
++		 * We want to enforce explicit block device creation for
+ 		 * volumes, so when a volume is added we do nothing.
+ 		 */
+ 		break;
+ 	case UBI_VOLUME_REMOVED:
+-		ubiblock_del(&nt->vi);
++		ubiblock_remove(&nt->vi);
+ 		break;
+ 	case UBI_VOLUME_RESIZED:
+ 		ubiblock_resize(&nt->vi);
+@@ -561,7 +562,7 @@ open_volume_desc(const char *name, int u
+ 		return ubi_open_volume(ubi_num, vol_id, UBI_READONLY);
+ }
+ 
+-static int __init ubiblock_attach_from_param(void)
++static int __init ubiblock_create_from_param(void)
+ {
+ 	int i, ret;
+ 	struct ubiblock_param *p;
+@@ -582,7 +583,7 @@ static int __init ubiblock_attach_from_p
+ 		ubi_get_volume_info(desc, &vi);
+ 		ubi_close_volume(desc);
+ 
+-		ret = ubiblock_add(&vi);
++		ret = ubiblock_create(&vi);
+ 		if (ret) {
+ 			ubi_err("block: can't add '%s' volume, err=%d\n",
+ 				vi.name, ret);
+@@ -592,7 +593,7 @@ static int __init ubiblock_attach_from_p
+ 	return ret;
+ }
+ 
+-static void ubiblock_detach_all(void)
++static void ubiblock_remove_all(void)
+ {
+ 	struct ubiblock *next;
+ 	struct ubiblock *dev;
+@@ -618,13 +619,13 @@ int __init ubiblock_init(void)
+ 		return ubiblock_major;
+ 
+ 	/* Attach block devices from 'block=' module param */
+-	ret = ubiblock_attach_from_param();
++	ret = ubiblock_create_from_param();
+ 	if (ret)
+-		goto err_detach;
++		goto err_remove;
+ 
+ 	/*
+-	 * Block devices needs to be attached to volumes explicitly
+-	 * upon user request. So we ignore existing volumes.
++	 * Block devices are only created upon user requests, so we ignore
++	 * existing volumes.
+ 	 */
+ 	ret = ubi_register_volume_notifier(&ubiblock_notifier, 1);
+ 	if (ret)
+@@ -633,14 +634,14 @@ int __init ubiblock_init(void)
+ 
+ err_unreg:
+ 	unregister_blkdev(ubiblock_major, "ubiblock");
+-err_detach:
+-	ubiblock_detach_all();
++err_remove:
++	ubiblock_remove_all();
+ 	return ret;
+ }
+ 
+ void __exit ubiblock_exit(void)
+ {
+ 	ubi_unregister_volume_notifier(&ubiblock_notifier);
+-	ubiblock_detach_all();
++	ubiblock_remove_all();
+ 	unregister_blkdev(ubiblock_major, "ubiblock");
+ }
+--- a/drivers/mtd/ubi/cdev.c
++++ b/drivers/mtd/ubi/cdev.c
+@@ -567,7 +567,7 @@ static long vol_cdev_ioctl(struct file *
+ 		struct ubi_volume_info vi;
+ 
+ 		ubi_get_volume_info(desc, &vi);
+-		err = ubiblock_add(&vi);
++		err = ubiblock_create(&vi);
+ 		break;
+ 	}
+ 
+@@ -577,7 +577,7 @@ static long vol_cdev_ioctl(struct file *
+ 		struct ubi_volume_info vi;
+ 
+ 		ubi_get_volume_info(desc, &vi);
+-		err = ubiblock_del(&vi);
++		err = ubiblock_remove(&vi);
+ 		break;
+ 	}
+ 
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -868,13 +868,19 @@ int ubi_scan_fastmap(struct ubi_device *
+ #ifdef CONFIG_MTD_UBI_BLOCK
+ int ubiblock_init(void);
+ void ubiblock_exit(void);
+-int ubiblock_add(struct ubi_volume_info *vi);
+-int ubiblock_del(struct ubi_volume_info *vi);
++int ubiblock_create(struct ubi_volume_info *vi);
++int ubiblock_remove(struct ubi_volume_info *vi);
+ #else
+ static inline int ubiblock_init(void) { return 0; }
+ static inline void ubiblock_exit(void) {}
+-static inline int ubiblock_add(struct ubi_volume_info *vi) { return -ENOTTY; }
+-static inline int ubiblock_del(struct ubi_volume_info *vi) { return -ENOTTY; }
++static inline int ubiblock_create(struct ubi_volume_info *vi)
++{
++	return -ENOTTY;
++}
++static inline int ubiblock_remove(struct ubi_volume_info *vi)
++{
++	return -ENOTTY;
++}
+ #endif
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch b/trunk/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
new file mode 100644
index 00000000..54660992
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
@@ -0,0 +1,37 @@
+From ca2b722d1ab5bc3ffc34b5995248968cd8a7cb6f Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Mon, 3 Mar 2014 13:42:38 -0300
+Subject: [PATCH] UBI: block: Mark init-only symbol as __initdata
+
+ubiblock_param_ops should be marked as __init as it's only used to set
+a driver parameter on insertion time. This commit fixes the following:
+
+  WARNING: drivers/mtd/built-in.o(.text+0x653ac): Section mismatch in
+  reference from the variable ubiblock_param_ops to the function
+  .init.text:ubiblock_set_param()
+
+  The function ubiblock_param_ops() references the function __init
+  ubiblock_set_param(). This is often because ubiblock_param_ops lacks a
+  __init annotation or the annotation of ubiblock_set_param is wrong.
+
+Given gcc errors if the struct is marked const __initdata, this commit
+drops the const mark from it.
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(con
+ 	return 0;
+ }
+ 
+-static const struct kernel_param_ops ubiblock_param_ops = {
++static struct kernel_param_ops ubiblock_param_ops __initdata = {
+ 	.set    = ubiblock_set_param,
+ };
+ module_param_cb(block, &ubiblock_param_ops, NULL, 0);
diff --git a/trunk/target/linux/generic/patches-3.14/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch b/trunk/target/linux/generic/patches-3.14/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
new file mode 100644
index 00000000..260927d0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
@@ -0,0 +1,28 @@
+From 9981e14ab2f7c6a4d2bb45e51a6371964919837d Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Mon, 3 Mar 2014 13:42:39 -0300
+Subject: [PATCH] UBI: block: Use 'u64' for the 64-bit dividend
+
+Fixes the following warning on ARCH=avr32:
+
+  drivers/mtd/ubi/block.c: In function 'ubiblock_read':
+  drivers/mtd/ubi/block.c:207: warning: comparison of distinct pointer types lacks a cast
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -201,7 +201,7 @@ static int ubiblock_read(struct ubiblock
+ 	int ret, leb, offset;
+ 	int bytes_left = len;
+ 	int to_read = len;
+-	loff_t pos = sec << 9;
++	u64 pos = sec << 9;
+ 
+ 	/* Get LEB:offset address to read from */
+ 	offset = do_div(pos, dev->leb_size);
diff --git a/trunk/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch b/trunk/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch
new file mode 100644
index 00000000..ec71b052
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch
@@ -0,0 +1,83 @@
+From 8af871887fcba470ff9265c65cff7d14d9e0e3f9 Mon Sep 17 00:00:00 2001
+From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Date: Wed, 5 Mar 2014 13:01:56 +0200
+Subject: [PATCH] UBI: rename block device ioctls
+
+Rename the UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK to UBI_IOCVOLCRBLK and
+UBI_IOCVOLRMBLK, because we do not use terms "attach" and "detach" for the R/O
+block devices on top of UBI volumes. Instead, we use terms "create" and
+"remove". This patch also amends the related commentaries.
+
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+---
+ drivers/mtd/ubi/block.c     |  2 +-
+ drivers/mtd/ubi/cdev.c      |  8 ++++----
+ include/uapi/mtd/ubi-user.h | 14 +++++++-------
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -32,7 +32,7 @@
+  * This feature is compiled in the UBI core, and adds a 'block' parameter
+  * to allow early creation of block devices on top of UBI volumes. Runtime
+  * block creation/removal for UBI volumes is provided through two UBI ioctls:
+- * UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK.
++ * UBI_IOCVOLCRBLK and UBI_IOCVOLRMBLK.
+  */
+ 
+ #include <linux/module.h>
+--- a/drivers/mtd/ubi/cdev.c
++++ b/drivers/mtd/ubi/cdev.c
+@@ -561,8 +561,8 @@ static long vol_cdev_ioctl(struct file *
+ 		break;
+ 	}
+ 
+-	/* Attach a block device to an UBI volume */
+-	case UBI_IOCVOLATTBLK:
++	/* Create a R/O block device on top of the UBI volume */
++	case UBI_IOCVOLCRBLK:
+ 	{
+ 		struct ubi_volume_info vi;
+ 
+@@ -571,8 +571,8 @@ static long vol_cdev_ioctl(struct file *
+ 		break;
+ 	}
+ 
+-	/* Dettach a block device from an UBI volume */
+-	case UBI_IOCVOLDETBLK:
++	/* Remove the R/O block device */
++	case UBI_IOCVOLRMBLK:
+ 	{
+ 		struct ubi_volume_info vi;
+ 
+--- a/include/uapi/mtd/ubi-user.h
++++ b/include/uapi/mtd/ubi-user.h
+@@ -138,9 +138,9 @@
+  * Block devices on UBI volumes
+  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  *
+- * To attach or detach a block device from an UBI volume the %UBI_IOCVOLATTBLK
+- * and %UBI_IOCVOLDETBLK ioctl commands should be used, respectively.
+- * These commands take no arguments.
++ * To create or remove a R/O block device on top of an UBI volume the
++ * %UBI_IOCVOLCRBLK and %UBI_IOCVOLRMBLK ioctl commands should be used,
++ * respectively. These commands take no arguments.
+  */
+ 
+ /*
+@@ -198,10 +198,10 @@
+ /* Set an UBI volume property */
+ #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
+ 			       struct ubi_set_vol_prop_req)
+-/* Attach a block device to an UBI volume */
+-#define UBI_IOCVOLATTBLK _IO(UBI_VOL_IOC_MAGIC, 7)
+-/* Detach a block device from an UBI volume */
+-#define UBI_IOCVOLDETBLK _IO(UBI_VOL_IOC_MAGIC, 8)
++/* Create a R/O block device on top of an UBI volume */
++#define UBI_IOCVOLCRBLK _IO(UBI_VOL_IOC_MAGIC, 7)
++/* Remove the R/O block device */
++#define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8)
+ 
+ /* Maximum MTD device name length supported by UBI */
+ #define MAX_UBI_MTD_NAME_LEN 127
diff --git a/trunk/target/linux/generic/patches-3.14/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch b/trunk/target/linux/generic/patches-3.14/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch
new file mode 100644
index 00000000..badfcb0a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch
@@ -0,0 +1,30 @@
+From d56030ac25d383218045c5d87e98e0494d6af3ad Mon Sep 17 00:00:00 2001
+From: Richard Weinberger <richard@nod.at>
+Date: Wed, 19 Mar 2014 11:43:22 +0100
+Subject: [PATCH] UBI: block: Remove __initdata from ubiblock_param_ops
+
+You cannot mark these parameters as __initdata.
+Otherwise the data is gone upon module exit.
+
+Fixes:
+[  172.045465] BUG: unable to handle kernel paging request at ffffffffa001db38
+[  172.046020] IP: [<ffffffff81067aa4>] destroy_params+0x24/0x50
+
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(con
+ 	return 0;
+ }
+ 
+-static struct kernel_param_ops ubiblock_param_ops __initdata = {
++static struct kernel_param_ops ubiblock_param_ops = {
+ 	.set    = ubiblock_set_param,
+ };
+ module_param_cb(block, &ubiblock_param_ops, NULL, 0);
diff --git a/trunk/target/linux/generic/patches-3.14/046-UBI-avoid-workqueue-format-string-leak.patch b/trunk/target/linux/generic/patches-3.14/046-UBI-avoid-workqueue-format-string-leak.patch
new file mode 100644
index 00000000..41ef6b84
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/046-UBI-avoid-workqueue-format-string-leak.patch
@@ -0,0 +1,25 @@
+From bebfef150e0b8fa68704cddacf05b8c26462d565 Mon Sep 17 00:00:00 2001
+From: Kees Cook <keescook@chromium.org>
+Date: Mon, 7 Apr 2014 21:44:07 -0700
+Subject: [PATCH] UBI: avoid workqueue format string leak
+
+When building the name for the workqueue thread, make sure a format
+string cannot leak in from the disk name.
+
+Signed-off-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -431,7 +431,7 @@ int ubiblock_create(struct ubi_volume_in
+ 	 * Create one workqueue per volume (per registered block device).
+ 	 * Rembember workqueues are cheap, they're not threads.
+ 	 */
+-	dev->wq = alloc_workqueue(gd->disk_name, 0, 0);
++	dev->wq = alloc_workqueue("%s", 0, 0, gd->disk_name);
+ 	if (!dev->wq)
+ 		goto out_free_queue;
+ 	INIT_WORK(&dev->work, ubiblock_do_work);
diff --git a/trunk/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch b/trunk/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
new file mode 100644
index 00000000..e9aab2a1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch
@@ -0,0 +1,58 @@
+From 463c5eedb4a13b9aa91f05498a0f2c20bd03f8c4 Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Wed, 5 Mar 2014 11:16:14 -0300
+Subject: [PATCH] UBI: make UBI_IOCVOLCRBLK take a parameter for future usage
+
+In order to allow a future ioctl parameter, such as a creation flag,
+we change the UBI_IOCVOLCRBLK so it accepts a struct ubi_blkcreate_req.
+For the time being the structure is not in use, but fully reserved.
+
+This ABI change is still possible and harmless, because the ioctl has just
+been introduced and there's no userspace program which uses it.
+
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ include/uapi/mtd/ubi-user.h | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+--- a/include/uapi/mtd/ubi-user.h
++++ b/include/uapi/mtd/ubi-user.h
+@@ -138,9 +138,12 @@
+  * Block devices on UBI volumes
+  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  *
+- * To create or remove a R/O block device on top of an UBI volume the
+- * %UBI_IOCVOLCRBLK and %UBI_IOCVOLRMBLK ioctl commands should be used,
+- * respectively. These commands take no arguments.
++ * To create a R/O block device on top of an UBI volume the %UBI_IOCVOLCRBLK
++ * should be used. A pointer to a &struct ubi_blkcreate_req object is expected
++ * to be passed, which is not used and reserved for future usage.
++ *
++ * Conversely, to remove a block device the %UBI_IOCVOLRMBLK should be used,
++ * which takes no arguments.
+  */
+ 
+ /*
+@@ -199,7 +202,7 @@
+ #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
+ 			       struct ubi_set_vol_prop_req)
+ /* Create a R/O block device on top of an UBI volume */
+-#define UBI_IOCVOLCRBLK _IO(UBI_VOL_IOC_MAGIC, 7)
++#define UBI_IOCVOLCRBLK _IOW(UBI_VOL_IOC_MAGIC, 7, struct ubi_blkcreate_req)
+ /* Remove the R/O block device */
+ #define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8)
+ 
+@@ -431,4 +434,12 @@ struct ubi_set_vol_prop_req {
+ 	__u64 value;
+ }  __packed;
+ 
++/**
++ * struct ubi_blkcreate_req - a data structure used in block creation requests.
++ * @padding: reserved for future, not used, has to be zeroed
++ */
++struct ubi_blkcreate_req {
++	__s8  padding[128];
++}  __packed;
++
+ #endif /* __UBI_USER_H__ */
diff --git a/trunk/target/linux/generic/patches-3.14/048-mtd-bcm47xxpart-backports-from-3.16.patch b/trunk/target/linux/generic/patches-3.14/048-mtd-bcm47xxpart-backports-from-3.16.patch
new file mode 100644
index 00000000..540db6ff
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/048-mtd-bcm47xxpart-backports-from-3.16.patch
@@ -0,0 +1,59 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -150,7 +150,7 @@ config MTD_BCM63XX_PARTS
+ 
+ config MTD_BCM47XX_PARTS
+ 	tristate "BCM47XX partitioning support"
+-	depends on BCM47XX
++	depends on BCM47XX || ARCH_BCM_5301X
+ 	help
+ 	  This provides partitions parser for devices based on BCM47xx
+ 	  boards.
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -14,7 +14,6 @@
+ #include <linux/slab.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+-#include <bcm47xx_nvram.h>
+ 
+ /* 10 parts were found on sflash on Netgear WNDR4500 */
+ #define BCM47XXPART_MAX_PARTS		12
+@@ -30,6 +29,7 @@
+ #define BOARD_DATA_MAGIC2		0xBD0D0BBD
+ #define CFE_MAGIC			0x43464531	/* 1EFC */
+ #define FACTORY_MAGIC			0x59544346	/* FCTY */
++#define NVRAM_HEADER			0x48534C46	/* FLSH */
+ #define POT_MAGIC1			0x54544f50	/* POTT */
+ #define POT_MAGIC2			0x504f		/* OP */
+ #define ML_MAGIC1			0x39685a42
+@@ -91,7 +91,7 @@ static int bcm47xxpart_parse(struct mtd_
+ 		if (offset >= 0x2000000)
+ 			break;
+ 
+-		if (curr_part > BCM47XXPART_MAX_PARTS) {
++		if (curr_part >= BCM47XXPART_MAX_PARTS) {
+ 			pr_warn("Reached maximum number of partitions, scanning stopped!\n");
+ 			break;
+ 		}
+@@ -147,6 +147,11 @@ static int bcm47xxpart_parse(struct mtd_
+ 
+ 		/* TRX */
+ 		if (buf[0x000 / 4] == TRX_MAGIC) {
++			if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
++				pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
++				break;
++			}
++
+ 			trx = (struct trx_header *)buf;
+ 
+ 			trx_part = curr_part;
+@@ -212,7 +217,7 @@ static int bcm47xxpart_parse(struct mtd_
+ 
+ 	/* Look for NVRAM at the end of the last block. */
+ 	for (i = 0; i < ARRAY_SIZE(possible_nvram_sizes); i++) {
+-		if (curr_part > BCM47XXPART_MAX_PARTS) {
++		if (curr_part >= BCM47XXPART_MAX_PARTS) {
+ 			pr_warn("Reached maximum number of partitions, scanning stopped!\n");
+ 			break;
+ 		}
diff --git a/trunk/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch b/trunk/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
new file mode 100644
index 00000000..48f8d36d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
@@ -0,0 +1,19 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -199,6 +199,16 @@ static int bcm47xxpart_parse(struct mtd_
+ 			continue;
+ 		}
+ 
++		/* New (ARM?) devices may have NVRAM in some middle block. Last
++		 * block will be checked later, so skip it.
++		 */
++		if (offset != master->size - blocksize &&
++		    buf[0x000 / 4] == NVRAM_HEADER) {
++			bcm47xxpart_add_part(&parts[curr_part++], "nvram",
++					     offset, 0);
++			continue;
++		}
++
+ 		/* Read middle of the block */
+ 		if (mtd_read(master, offset + 0x8000, 0x4,
+ 			     &bytes_read, (uint8_t *)buf) < 0) {
diff --git a/trunk/target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch b/trunk/target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch
new file mode 100644
index 00000000..b2d53f9f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch
@@ -0,0 +1,50 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -15,8 +15,12 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
+-/* 10 parts were found on sflash on Netgear WNDR4500 */
+-#define BCM47XXPART_MAX_PARTS		12
++/*
++ * NAND flash on Netgear R6250 was verified to contain 15 partitions.
++ * This will result in allocating too big array for some old devices, but the
++ * memory will be freed soon anyway (see mtd_device_parse_register).
++ */
++#define BCM47XXPART_MAX_PARTS		20
+ 
+ /*
+  * Amount of bytes we read when analyzing each block of flash memory.
+@@ -168,18 +172,26 @@ static int bcm47xxpart_parse(struct mtd_
+ 				i++;
+ 			}
+ 
+-			bcm47xxpart_add_part(&parts[curr_part++], "linux",
+-					     offset + trx->offset[i], 0);
+-			i++;
++			if (trx->offset[i]) {
++				bcm47xxpart_add_part(&parts[curr_part++],
++						     "linux",
++						     offset + trx->offset[i],
++						     0);
++				i++;
++			}
+ 
+ 			/*
+ 			 * Pure rootfs size is known and can be calculated as:
+ 			 * trx->length - trx->offset[i]. We don't fill it as
+ 			 * we want to have jffs2 (overlay) in the same mtd.
+ 			 */
+-			bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
+-					     offset + trx->offset[i], 0);
+-			i++;
++			if (trx->offset[i]) {
++				bcm47xxpart_add_part(&parts[curr_part++],
++						     "rootfs",
++						     offset + trx->offset[i],
++						     0);
++				i++;
++			}
+ 
+ 			last_trx_part = curr_part - 1;
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/060-net-usb-hso-Add-support-for-Option-GTM671WFS.patch b/trunk/target/linux/generic/patches-3.14/060-net-usb-hso-Add-support-for-Option-GTM671WFS.patch
new file mode 100644
index 00000000..7ccf34cf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/060-net-usb-hso-Add-support-for-Option-GTM671WFS.patch
@@ -0,0 +1,323 @@
+From 61ab9efddf51cbc0d57356a4d650785cf5721fbe Mon Sep 17 00:00:00 2001
+From: Ricardo Ribalda <ricardo.ribalda@gmail.com>
+Date: Mon, 4 Aug 2014 11:11:49 +0200
+Subject: [PATCH] net/usb/hso: Add support for Option GTM671WFS
+
+After this patch:
+
+[   32.985530] hso: drivers/net/usb/hso.c: Option Wireless
+[   33.000452] hso 2-1.4:1.7: Not our interface
+[   33.001849] usbcore: registered new interface driver hso
+
+root@qt5022:~# ls /dev/ttyHS*
+/dev/ttyHS0  /dev/ttyHS1  /dev/ttyHS2  /dev/ttyHS3  /dev/ttyHS4
+/dev/ttyHS5
+
+root@qt5022:~# lsusb -d 0af0: -vvv
+
+Bus 002 Device 003: ID 0af0:9200 Option
+Device Descriptor:
+  bLength                18
+  bDescriptorType         1
+  bcdUSB               2.00
+  bDeviceClass          255 Vendor Specific Class
+  bDeviceSubClass       255 Vendor Specific Subclass
+  bDeviceProtocol       255 Vendor Specific Protocol
+  bMaxPacketSize0        64
+  idVendor           0x0af0 Option
+  idProduct          0x9200
+  bcdDevice            0.00
+  iManufacturer           3 Option N.V.
+  iProduct                2 Globetrotter HSUPA Modem
+  iSerial                 0
+  bNumConfigurations      1
+  Configuration Descriptor:
+    bLength                 9
+    bDescriptorType         2
+    wTotalLength          200
+    bNumInterfaces          8
+    bConfigurationValue     1
+    iConfiguration          1 Option Configuration
+    bmAttributes         0xe0
+      Self Powered
+      Remote Wakeup
+    MaxPower              100mA
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        0
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass    255 Vendor Specific Subclass
+      bInterfaceProtocol    255 Vendor Specific Protocol
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x81  EP 1 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x01  EP 1 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        1
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass    255 Vendor Specific Subclass
+      bInterfaceProtocol    255 Vendor Specific Protocol
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x82  EP 2 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x02  EP 2 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        2
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass    255 Vendor Specific Subclass
+      bInterfaceProtocol    255 Vendor Specific Protocol
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x83  EP 3 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x03  EP 3 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        3
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass    255 Vendor Specific Subclass
+      bInterfaceProtocol    255 Vendor Specific Protocol
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x84  EP 4 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x04  EP 4 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        4
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass    255 Vendor Specific Subclass
+      bInterfaceProtocol    255 Vendor Specific Protocol
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x85  EP 5 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x05  EP 5 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        5
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass    255 Vendor Specific Subclass
+      bInterfaceProtocol    255 Vendor Specific Protocol
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x06  EP 6 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x86  EP 6 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        6
+      bAlternateSetting       0
+      bNumEndpoints           3
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass    255 Vendor Specific Subclass
+      bInterfaceProtocol    255 Vendor Specific Protocol
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x87  EP 7 IN
+        bmAttributes            3
+          Transfer Type            Interrupt
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               5
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x88  EP 8 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x07  EP 7 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval              32
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        7
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass         8 Mass Storage
+      bInterfaceSubClass      6 SCSI
+      bInterfaceProtocol     80 Bulk-Only
+      iInterface              0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x08  EP 8 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval               1
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x89  EP 9 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0200  1x 512 bytes
+        bInterval               1
+Device Qualifier (for other device speed):
+  bLength                10
+  bDescriptorType         6
+  bcdUSB               2.00
+  bDeviceClass          255 Vendor Specific Class
+  bDeviceSubClass       255 Vendor Specific Subclass
+  bDeviceProtocol       255 Vendor Specific Protocol
+  bMaxPacketSize0        64
+  bNumConfigurations      1
+Device Status:     0x0001
+  Self Powered
+
+Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
+Acked-by: Dan Williams <dcbw@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/hso.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -469,6 +469,7 @@ static const struct usb_device_id hso_id
+ 	{USB_DEVICE(0x0af0, 0x8800)},
+ 	{USB_DEVICE(0x0af0, 0x8900)},
+ 	{USB_DEVICE(0x0af0, 0x9000)},
++	{USB_DEVICE(0x0af0, 0x9200)},		/* Option GTM671WFS */
+ 	{USB_DEVICE(0x0af0, 0xd035)},
+ 	{USB_DEVICE(0x0af0, 0xd055)},
+ 	{USB_DEVICE(0x0af0, 0xd155)},
diff --git a/trunk/target/linux/generic/patches-3.14/061-arm_xz_decompressor_build_fix.patch b/trunk/target/linux/generic/patches-3.14/061-arm_xz_decompressor_build_fix.patch
new file mode 100644
index 00000000..e69ca259
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/061-arm_xz_decompressor_build_fix.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -48,6 +48,7 @@ extern char * strstr(const char * s1, co
+ #ifdef CONFIG_KERNEL_XZ
+ #define memmove memmove
+ #define memcpy memcpy
++extern char * strstr(const char *, const char *);
+ #include "../../../../lib/decompress_unxz.c"
+ #endif
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/062-mips_decompressor_build_fix.patch b/trunk/target/linux/generic/patches-3.14/062-mips_decompressor_build_fix.patch
new file mode 100644
index 00000000..4ddcbb4e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/062-mips_decompressor_build_fix.patch
@@ -0,0 +1,64 @@
+From 0db3db45f5bd6df4bdc03bbd5dec672e16164c4e Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 12 Nov 2012 12:31:55 +0100
+Subject: [PATCH] MIPS: decompressor: fix build failure on memcpy() in
+ decompress.c
+
+The decompress.c file includes linux/kernel.h which causes the following
+inclusion chain to be pulled:
+linux/kernel.h ->
+	linux/dynamic_debug.h ->
+		linux/string.h ->
+			asm/string.h
+
+We end up having a the GCC builtin + architecture specific memcpy() expanding
+into this:
+
+void *({ size_t __len = (size_t n); void *__ret; if
+(__builtin_constant_p(size_t n) && __len >= 64) __ret = memcpy((void *dest),
+(const void *src), __len); else __ret = __builtin_memcpy((void *dest), (const
+void *src), __len); __ret; })
+{
+ [memcpy implementation in decompress.c starts here]
+ int i;
+ const char *s = src;
+ char *d = dest;
+
+ for (i = 0; i < n; i++)
+  d[i] = s[i];
+ return dest;
+}
+
+raising the following compilation error:
+arch/mips/boot/compressed/decompress.c:46:8: error: expected identifier or '('
+before '{' token
+
+There are at least three possibilities to fix this issue:
+
+1) define _LINUX_STRING_H_ at the beginning of decompress.c to prevent
+   further linux/string.h definitions and declarations from being used, and add
+   an explicit strstr() declaration for linux/dynamic_debug.h
+
+2) remove the inclusion of linux/kernel.h because we actually use no definition
+   or declaration from this header file
+
+3) undefine memcpy or re-define memcpy to memcpy thus resulting in picking up
+   the local memcpy() implementation to this compilation unit
+
+This patch uses the second option which is the less intrusive one.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ arch/mips/boot/compressed/decompress.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/mips/boot/compressed/decompress.c
++++ b/arch/mips/boot/compressed/decompress.c
+@@ -12,7 +12,6 @@
+  */
+ 
+ #include <linux/types.h>
+-#include <linux/kernel.h>
+ #include <linux/string.h>
+ 
+ #include <asm/addrspace.h>
diff --git a/trunk/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch b/trunk/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
new file mode 100644
index 00000000..d215b80a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/063-mips_decompressor_memmove.patch
@@ -0,0 +1,22 @@
+--- a/arch/mips/boot/compressed/string.c
++++ b/arch/mips/boot/compressed/string.c
+@@ -26,3 +26,19 @@ void *memset(void *s, int c, size_t n)
+ 		ss[i] = c;
+ 	return s;
+ }
++
++void *memmove(void *__dest, __const void *__src, size_t count)
++{
++	unsigned char *d = __dest;
++	const unsigned char *s = __src;
++
++	if (__dest == __src)
++		return __dest;
++
++	if (__dest < __src)
++		return memcpy(__dest, __src, count);
++
++	while (count--)
++		d[count] = s[count];
++	return __dest;
++}
diff --git a/trunk/target/linux/generic/patches-3.14/065-iio_ad799x_backport_fixes.patch b/trunk/target/linux/generic/patches-3.14/065-iio_ad799x_backport_fixes.patch
new file mode 100644
index 00000000..55d69db1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/065-iio_ad799x_backport_fixes.patch
@@ -0,0 +1,122 @@
+Backport essential fixes from 3.15
+
+From Linux 3.10 on this driver required platform data to load, which makes it
+unusable in libreCMC. This commit backports the following fixes:
+  * Move to regulator framework for scaling
+  * Fix device-removal path
+This commit should not be moved to newer kernel versions!
+
+Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
+---
+--- a/drivers/staging/iio/adc/ad799x_core.c
++++ b/drivers/staging/iio/adc/ad799x_core.c
+@@ -179,7 +179,10 @@ static int ad799x_read_raw(struct iio_de
+ 			RES_MASK(chan->scan_type.realbits);
+ 		return IIO_VAL_INT;
+ 	case IIO_CHAN_INFO_SCALE:
+-		*val = st->int_vref_mv;
++		ret = regulator_get_voltage(st->vref);
++		if (ret < 0)
++			return ret;
++		*val =  ret / 1000;
+ 		*val2 = chan->scan_type.realbits;
+ 		return IIO_VAL_FRACTIONAL_LOG2;
+ 	}
+@@ -533,7 +536,6 @@ static int ad799x_probe(struct i2c_clien
+ 				   const struct i2c_device_id *id)
+ {
+ 	int ret;
+-	struct ad799x_platform_data *pdata = client->dev.platform_data;
+ 	struct ad799x_state *st;
+ 	struct iio_dev *indio_dev;
+ 
+@@ -551,17 +553,21 @@ static int ad799x_probe(struct i2c_clien
+ 
+ 	/* TODO: Add pdata options for filtering and bit delay */
+ 
+-	if (!pdata)
+-		return -EINVAL;
+-
+-	st->int_vref_mv = pdata->vref_mv;
+-
+ 	st->reg = devm_regulator_get(&client->dev, "vcc");
+-	if (!IS_ERR(st->reg)) {
+-		ret = regulator_enable(st->reg);
+-		if (ret)
+-			return ret;
++	if (IS_ERR(st->reg))
++		return PTR_ERR(st->reg);
++	ret = regulator_enable(st->reg);
++	if (ret)
++		return ret;
++	st->vref = devm_regulator_get(&client->dev, "vref");
++	if (IS_ERR(st->vref)) {
++		ret = PTR_ERR(st->vref);
++		goto error_disable_reg;
+ 	}
++	ret = regulator_enable(st->vref);
++	if (ret)
++		goto error_disable_reg;
++
+ 	st->client = client;
+ 
+ 	indio_dev->dev.parent = &client->dev;
+@@ -574,7 +580,7 @@ static int ad799x_probe(struct i2c_clien
+ 
+ 	ret = ad799x_register_ring_funcs_and_init(indio_dev);
+ 	if (ret)
+-		goto error_disable_reg;
++		goto error_disable_vref;
+ 
+ 	if (client->irq > 0) {
+ 		ret = request_threaded_irq(client->irq,
+@@ -598,9 +604,10 @@ error_free_irq:
+ 		free_irq(client->irq, indio_dev);
+ error_cleanup_ring:
+ 	ad799x_ring_cleanup(indio_dev);
++error_disable_vref:
++	regulator_disable(st->vref);
+ error_disable_reg:
+-	if (!IS_ERR(st->reg))
+-		regulator_disable(st->reg);
++	regulator_disable(st->reg);
+ 
+ 	return ret;
+ }
+@@ -615,8 +622,8 @@ static int ad799x_remove(struct i2c_clie
+ 		free_irq(client->irq, indio_dev);
+ 
+ 	ad799x_ring_cleanup(indio_dev);
+-	if (!IS_ERR(st->reg))
+-		regulator_disable(st->reg);
++	regulator_disable(st->vref);
++	regulator_disable(st->reg);
+ 	kfree(st->rx_buf);
+ 
+ 	return 0;
+--- a/drivers/staging/iio/adc/ad799x.h
++++ b/drivers/staging/iio/adc/ad799x.h
+@@ -95,7 +95,7 @@ struct ad799x_state {
+ 	struct i2c_client		*client;
+ 	const struct ad799x_chip_info	*chip_info;
+ 	struct regulator		*reg;
+-	u16				int_vref_mv;
++	struct regulator		*vref;
+ 	unsigned			id;
+ 	u16				config;
+ 
+@@ -103,14 +103,6 @@ struct ad799x_state {
+ 	unsigned int			transfer_size;
+ };
+ 
+-/*
+- * TODO: struct ad799x_platform_data needs to go into include/linux/iio
+- */
+-
+-struct ad799x_platform_data {
+-	u16				vref_mv;
+-};
+-
+ #ifdef CONFIG_AD799X_RING_BUFFER
+ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev);
+ void ad799x_ring_cleanup(struct iio_dev *indio_dev);
diff --git a/trunk/target/linux/generic/patches-3.14/070-net-phy-move-PHY-software-reset.patch b/trunk/target/linux/generic/patches-3.14/070-net-phy-move-PHY-software-reset.patch
new file mode 100644
index 00000000..007a7aad
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/070-net-phy-move-PHY-software-reset.patch
@@ -0,0 +1,71 @@
+commit 797ac07137d9ae8572008e21e6123a9ae17dae50
+Author: Florian Fainelli <f.fainelli@gmail.com>
+Date:   Mon Feb 17 13:34:02 2014 -0800
+
+    net: phy: move PHY software reset to genphy_soft_reset
+    
+    As pointed out by Shaohui, this function is generic for 10/100/1000
+    PHYs, but 10G PHYs might have a slightly different reset sequence which
+    prevents most of them from using this function.
+    
+    Move the BMCR_RESET based software resent sequence to
+    genphy_soft_reset() in preparation for allowing PHY drivers to implement
+    a soft_reset() callback.
+    
+    Reported-by: Shaohui Xie <Shaohui.Xie@freescale.com>
+    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -539,11 +539,7 @@ int phy_init_hw(struct phy_device *phyde
+ 	if (!phydev->drv || !phydev->drv->config_init)
+ 		return 0;
+ 
+-	ret = phy_write(phydev, MII_BMCR, BMCR_RESET);
+-	if (ret < 0)
+-		return ret;
+-
+-	ret = phy_poll_reset(phydev);
++	ret = genphy_soft_reset(phydev);
+ 	if (ret < 0)
+ 		return ret;
+ 
+@@ -1029,6 +1025,27 @@ static int gen10g_read_status(struct phy
+ 	return 0;
+ }
+ 
++/**
++ * genphy_soft_reset - software reset the PHY via BMCR_RESET bit
++ * @phydev: target phy_device struct
++ *
++ * Description: Perform a software PHY reset using the standard
++ * BMCR_RESET bit and poll for the reset bit to be cleared.
++ *
++ * Returns: 0 on success, < 0 on failure
++ */
++int genphy_soft_reset(struct phy_device *phydev)
++{
++	int ret;
++
++	ret = phy_write(phydev, MII_BMCR, BMCR_RESET);
++	if (ret < 0)
++		return ret;
++
++	return phy_poll_reset(phydev);
++}
++EXPORT_SYMBOL(genphy_soft_reset);
++
+ static int genphy_config_init(struct phy_device *phydev)
+ {
+ 	int val;
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -616,6 +616,7 @@ int genphy_update_link(struct phy_device
+ int genphy_read_status(struct phy_device *phydev);
+ int genphy_suspend(struct phy_device *phydev);
+ int genphy_resume(struct phy_device *phydev);
++int genphy_soft_reset(struct phy_device *phydev);
+ void phy_driver_unregister(struct phy_driver *drv);
+ void phy_drivers_unregister(struct phy_driver *drv, int n);
+ int phy_driver_register(struct phy_driver *new_driver);
diff --git a/trunk/target/linux/generic/patches-3.14/071-net-phy-override-PHY-reset.patch b/trunk/target/linux/generic/patches-3.14/071-net-phy-override-PHY-reset.patch
new file mode 100644
index 00000000..c70d40a6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/071-net-phy-override-PHY-reset.patch
@@ -0,0 +1,81 @@
+commit 9df81dd7583d14862d0cfb673a941b261f3b2112
+Author: Florian Fainelli <f.fainelli@gmail.com>
+Date:   Mon Feb 17 13:34:03 2014 -0800
+
+    net: phy: allow PHY drivers to implement their own software reset
+    
+    As pointed out by Shaohui, most 10G PHYs out there have a non-standard
+    compliant software reset sequence, eventually something much more
+    complex than just toggling the BMCR_RESET bit. Allow PHY driver to
+    implement their own soft_reset() callback to deal with that. If no
+    callback is provided, call into genphy_soft_reset() which makes sure the
+    existing behavior is kept intact.
+    
+    Reported-by: Shaohui Xie <Shaohui.Xie@freescale.com>
+    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -534,12 +534,16 @@ static int phy_poll_reset(struct phy_dev
+ 
+ int phy_init_hw(struct phy_device *phydev)
+ {
+-	int ret;
++	int ret = 0;
+ 
+ 	if (!phydev->drv || !phydev->drv->config_init)
+ 		return 0;
+ 
+-	ret = genphy_soft_reset(phydev);
++	if (phydev->drv->soft_reset)
++		ret = phydev->drv->soft_reset(phydev);
++	else
++		ret = genphy_soft_reset(phydev);
++
+ 	if (ret < 0)
+ 		return ret;
+ 
+@@ -1092,6 +1096,12 @@ static int genphy_config_init(struct phy
+ 	return 0;
+ }
+ 
++static int gen10g_soft_reset(struct phy_device *phydev)
++{
++	/* Do nothing for now */
++	return 0;
++}
++
+ static int gen10g_config_init(struct phy_device *phydev)
+ {
+ 	/* Temporarily just say we support everything */
+@@ -1266,6 +1276,7 @@ static struct phy_driver genphy_driver[]
+ 	.phy_id		= 0xffffffff,
+ 	.phy_id_mask	= 0xffffffff,
+ 	.name		= "Generic PHY",
++	.soft_reset	= genphy_soft_reset,
+ 	.config_init	= genphy_config_init,
+ 	.features	= 0,
+ 	.config_aneg	= genphy_config_aneg,
+@@ -1277,6 +1288,7 @@ static struct phy_driver genphy_driver[]
+ 	.phy_id         = 0xffffffff,
+ 	.phy_id_mask    = 0xffffffff,
+ 	.name           = "Generic 10G PHY",
++	.soft_reset	= gen10g_soft_reset,
+ 	.config_init    = gen10g_config_init,
+ 	.features       = 0,
+ 	.config_aneg    = gen10g_config_aneg,
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -394,6 +394,11 @@ struct phy_driver {
+ 	u32 flags;
+ 
+ 	/*
++	 * Called to issue a PHY software reset
++	 */
++	int (*soft_reset)(struct phy_device *phydev);
++
++	/*
+ 	 * Called to initialize the PHY,
+ 	 * including after a reset
+ 	 */
diff --git a/trunk/target/linux/generic/patches-3.14/080-backport_xfrm_crash_fix.patch b/trunk/target/linux/generic/patches-3.14/080-backport_xfrm_crash_fix.patch
new file mode 100644
index 00000000..754f5189
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/080-backport_xfrm_crash_fix.patch
@@ -0,0 +1,133 @@
+commit 5596732fa8c14139018ecda8356eabbfb599d830
+Author: Steffen Klassert <steffen.klassert@secunet.com>
+Date:   Mon Apr 7 08:08:52 2014 +0200
+
+    xfrm: Fix crash with ipv6 IPsec tunnel and NAT.
+    
+    The ipv6 xfrm output path is not aware that packets can be
+    rerouted by NAT to not use IPsec. We crash in this case
+    because we expect to have a xfrm state at the dst_entry.
+    This crash happens if the ipv6 layer does IPsec and NAT
+    or if we have an interfamily IPsec tunnel with ipv4 NAT.
+    
+    We fix this by checking for a NAT rerouted packet in each
+    address family and dst_output() to the new destination
+    in this case.
+    
+    Reported-by: Martin Pelikan <martin.pelikan@gmail.com>
+    Tested-by: Martin Pelikan <martin.pelikan@gmail.com>
+    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+
+--- a/net/ipv4/xfrm4_output.c
++++ b/net/ipv4/xfrm4_output.c
+@@ -62,10 +62,7 @@ int xfrm4_prepare_output(struct xfrm_sta
+ 	if (err)
+ 		return err;
+ 
+-	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
+-	IPCB(skb)->flags |= IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED;
+-
+-	skb->protocol = htons(ETH_P_IP);
++	IPCB(skb)->flags |= IPSKB_XFRM_TUNNEL_SIZE;
+ 
+ 	return x->outer_mode->output2(x, skb);
+ }
+@@ -73,27 +70,34 @@ EXPORT_SYMBOL(xfrm4_prepare_output);
+ 
+ int xfrm4_output_finish(struct sk_buff *skb)
+ {
++	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
++	skb->protocol = htons(ETH_P_IP);
++
++#ifdef CONFIG_NETFILTER
++	IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
++#endif
++
++	return xfrm_output(skb);
++}
++
++static int __xfrm4_output(struct sk_buff *skb)
++{
++	struct xfrm_state *x = skb_dst(skb)->xfrm;
++
+ #ifdef CONFIG_NETFILTER
+-	if (!skb_dst(skb)->xfrm) {
++	if (!x) {
+ 		IPCB(skb)->flags |= IPSKB_REROUTED;
+ 		return dst_output(skb);
+ 	}
+-
+-	IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
+ #endif
+ 
+-	skb->protocol = htons(ETH_P_IP);
+-	return xfrm_output(skb);
++	return x->outer_mode->afinfo->output_finish(skb);
+ }
+ 
+ int xfrm4_output(struct sk_buff *skb)
+ {
+-	struct dst_entry *dst = skb_dst(skb);
+-	struct xfrm_state *x = dst->xfrm;
+-
+ 	return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, skb,
+-			    NULL, dst->dev,
+-			    x->outer_mode->afinfo->output_finish,
++			    NULL, skb_dst(skb)->dev, __xfrm4_output,
+ 			    !(IPCB(skb)->flags & IPSKB_REROUTED));
+ }
+ 
+--- a/net/ipv6/xfrm6_output.c
++++ b/net/ipv6/xfrm6_output.c
+@@ -114,12 +114,6 @@ int xfrm6_prepare_output(struct xfrm_sta
+ 	if (err)
+ 		return err;
+ 
+-	memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
+-#ifdef CONFIG_NETFILTER
+-	IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
+-#endif
+-
+-	skb->protocol = htons(ETH_P_IPV6);
+ 	skb->local_df = 1;
+ 
+ 	return x->outer_mode->output2(x, skb);
+@@ -128,11 +122,13 @@ EXPORT_SYMBOL(xfrm6_prepare_output);
+ 
+ int xfrm6_output_finish(struct sk_buff *skb)
+ {
++	memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
++	skb->protocol = htons(ETH_P_IPV6);
++
+ #ifdef CONFIG_NETFILTER
+ 	IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
+ #endif
+ 
+-	skb->protocol = htons(ETH_P_IPV6);
+ 	return xfrm_output(skb);
+ }
+ 
+@@ -142,6 +138,13 @@ static int __xfrm6_output(struct sk_buff
+ 	struct xfrm_state *x = dst->xfrm;
+ 	int mtu;
+ 
++#ifdef CONFIG_NETFILTER
++	if (!x) {
++		IP6CB(skb)->flags |= IP6SKB_REROUTED;
++		return dst_output(skb);
++	}
++#endif
++
+ 	if (skb->protocol == htons(ETH_P_IPV6))
+ 		mtu = ip6_skb_dst_mtu(skb);
+ 	else
+@@ -165,6 +168,7 @@ static int __xfrm6_output(struct sk_buff
+ 
+ int xfrm6_output(struct sk_buff *skb)
+ {
+-	return NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL,
+-		       skb_dst(skb)->dev, __xfrm6_output);
++	return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb,
++			    NULL, skb_dst(skb)->dev, __xfrm6_output,
++			    !(IP6CB(skb)->flags & IP6SKB_REROUTED));
+ }
diff --git a/trunk/target/linux/generic/patches-3.14/090-backport_netfilter_rtcache.patch b/trunk/target/linux/generic/patches-3.14/090-backport_netfilter_rtcache.patch
new file mode 100644
index 00000000..ebe573f5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/090-backport_netfilter_rtcache.patch
@@ -0,0 +1,504 @@
+Subject: netfilter: conntrack: cache route for forwarded connections
+
+... to avoid per-packet FIB lookup if possible.
+
+The cached dst is re-used provided the input interface
+is the same as that of the previous packet in the same direction.
+
+If not, the cached dst is invalidated.
+
+For ipv6 we also need to store sernum, else dst_check doesn't work,
+pointed out by Eric Dumazet.
+
+This should speed up forwarding when conntrack is already in use
+anyway, especially when using reverse path filtering -- active RPF
+enforces two FIB lookups for each packet.
+
+Before the routing cache removal this didn't matter since RPF was performed
+only when route cache didn't yield a result; but without route cache it
+comes at higher price.
+
+Julian Anastasov suggested to add NETDEV_UNREGISTER handler to
+avoid holding on to dsts of 'frozen' conntracks.
+
+Signed-off-by: Florian Westphal <fw@strlen.de>
+
+--- a/include/net/netfilter/nf_conntrack_extend.h
++++ b/include/net/netfilter/nf_conntrack_extend.h
+@@ -30,6 +30,9 @@ enum nf_ct_ext_id {
+ #if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
+ 	NF_CT_EXT_SYNPROXY,
+ #endif
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
++	NF_CT_EXT_RTCACHE,
++#endif
+ 	NF_CT_EXT_NUM,
+ };
+ 
+@@ -43,6 +46,7 @@ enum nf_ct_ext_id {
+ #define NF_CT_EXT_TIMEOUT_TYPE struct nf_conn_timeout
+ #define NF_CT_EXT_LABELS_TYPE struct nf_conn_labels
+ #define NF_CT_EXT_SYNPROXY_TYPE struct nf_conn_synproxy
++#define NF_CT_EXT_RTCACHE_TYPE struct nf_conn_rtcache
+ 
+ /* Extensions: optional stuff which isn't permanently in struct. */
+ struct nf_ct_ext {
+--- /dev/null
++++ b/include/net/netfilter/nf_conntrack_rtcache.h
+@@ -0,0 +1,34 @@
++#include <linux/gfp.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_extend.h>
++
++struct dst_entry;
++
++struct nf_conn_dst_cache {
++	struct dst_entry *dst;
++	int iif;
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++	u32 cookie;
++#endif
++
++};
++
++struct nf_conn_rtcache {
++	struct nf_conn_dst_cache cached_dst[IP_CT_DIR_MAX];
++};
++
++static inline
++struct nf_conn_rtcache *nf_ct_rtcache_find(const struct nf_conn *ct)
++{
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
++	return nf_ct_ext_find(ct, NF_CT_EXT_RTCACHE);
++#else
++	return NULL;
++#endif
++}
++
++static inline int nf_conn_rtcache_iif_get(const struct nf_conn_rtcache *rtc,
++					  enum ip_conntrack_dir dir)
++{
++	return rtc->cached_dst[dir].iif;
++}
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -103,6 +103,18 @@ config NF_CONNTRACK_EVENTS
+ 
+ 	  If unsure, say `N'.
+ 
++config NF_CONNTRACK_RTCACHE
++	tristate "Cache route entries in conntrack objects"
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  If this option is enabled, the connection tracking code will
++	  cache routing information for each connection that is being
++	  forwarded, at a cost of 32 bytes per conntrack object.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++	  The module will be called nf_conntrack_rtcache.
++
+ config NF_CONNTRACK_TIMEOUT
+ 	bool  'Connection tracking timeout'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -18,6 +18,9 @@ obj-$(CONFIG_NETFILTER_NETLINK_LOG) += n
+ # connection tracking
+ obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o
+ 
++# optional conntrack route cache extension
++obj-$(CONFIG_NF_CONNTRACK_RTCACHE) += nf_conntrack_rtcache.o
++
+ # SCTP protocol connection tracking
+ obj-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o
+ obj-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o
+--- /dev/null
++++ b/net/netfilter/nf_conntrack_rtcache.c
+@@ -0,0 +1,386 @@
++/* route cache for netfilter.
++ *
++ * (C) 2014 Red Hat GmbH
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
++
++#include <linux/types.h>
++#include <linux/netfilter.h>
++#include <linux/skbuff.h>
++#include <linux/stddef.h>
++#include <linux/kernel.h>
++#include <linux/netdevice.h>
++#include <linux/export.h>
++#include <linux/module.h>
++
++#include <net/dst.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_rtcache.h>
++
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++#include <net/ip6_fib.h>
++#endif
++
++static void __nf_conn_rtcache_destroy(struct nf_conn_rtcache *rtc,
++				      enum ip_conntrack_dir dir)
++{
++	struct dst_entry *dst = rtc->cached_dst[dir].dst;
++
++	dst_release(dst);
++}
++
++static void nf_conn_rtcache_destroy(struct nf_conn *ct)
++{
++	struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
++
++	if (!rtc)
++		return;
++
++	__nf_conn_rtcache_destroy(rtc, IP_CT_DIR_ORIGINAL);
++	__nf_conn_rtcache_destroy(rtc, IP_CT_DIR_REPLY);
++}
++
++static void nf_ct_rtcache_ext_add(struct nf_conn *ct)
++{
++	struct nf_conn_rtcache *rtc;
++
++	rtc = nf_ct_ext_add(ct, NF_CT_EXT_RTCACHE, GFP_ATOMIC);
++	if (rtc) {
++		rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif = -1;
++		rtc->cached_dst[IP_CT_DIR_ORIGINAL].dst = NULL;
++		rtc->cached_dst[IP_CT_DIR_REPLY].iif = -1;
++		rtc->cached_dst[IP_CT_DIR_REPLY].dst = NULL;
++	}
++}
++
++static struct nf_conn_rtcache *nf_ct_rtcache_find_usable(struct nf_conn *ct)
++{
++	if (nf_ct_is_untracked(ct))
++		return NULL;
++	return nf_ct_rtcache_find(ct);
++}
++
++static struct dst_entry *
++nf_conn_rtcache_dst_get(const struct nf_conn_rtcache *rtc,
++			enum ip_conntrack_dir dir)
++{
++	return rtc->cached_dst[dir].dst;
++}
++
++static u32 nf_rtcache_get_cookie(int pf, const struct dst_entry *dst)
++{
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++	if (pf == NFPROTO_IPV6) {
++		const struct rt6_info *rt = (const struct rt6_info *)dst;
++
++		if (rt->rt6i_node)
++			return (u32)rt->rt6i_node->fn_sernum;
++	}
++#endif
++	return 0;
++}
++
++static void nf_conn_rtcache_dst_set(int pf,
++				    struct nf_conn_rtcache *rtc,
++				    struct dst_entry *dst,
++				    enum ip_conntrack_dir dir, int iif)
++{
++	if (rtc->cached_dst[dir].iif != iif)
++		rtc->cached_dst[dir].iif = iif;
++
++	if (rtc->cached_dst[dir].dst != dst) {
++		struct dst_entry *old;
++
++		dst_hold(dst);
++
++		old = xchg(&rtc->cached_dst[dir].dst, dst);
++		dst_release(old);
++
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++		if (pf == NFPROTO_IPV6)
++			rtc->cached_dst[dir].cookie =
++				nf_rtcache_get_cookie(pf, dst);
++#endif
++	}
++}
++
++static void nf_conn_rtcache_dst_obsolete(struct nf_conn_rtcache *rtc,
++					 enum ip_conntrack_dir dir)
++{
++	struct dst_entry *old;
++
++	pr_debug("Invalidate iif %d for dir %d on cache %p\n",
++		 rtc->cached_dst[dir].iif, dir, rtc);
++
++	old = xchg(&rtc->cached_dst[dir].dst, NULL);
++	dst_release(old);
++	rtc->cached_dst[dir].iif = -1;
++}
++
++static unsigned int nf_rtcache_in(const struct nf_hook_ops *ops,
++				  struct sk_buff *skb,
++				  const struct net_device *in,
++				  const struct net_device *out,
++				  int (*okfn)(struct sk_buff *))
++{
++	struct nf_conn_rtcache *rtc;
++	enum ip_conntrack_info ctinfo;
++	enum ip_conntrack_dir dir;
++	struct dst_entry *dst;
++	struct nf_conn *ct;
++	int iif;
++	u32 cookie;
++
++	if (skb_dst(skb) || skb->sk)
++		return NF_ACCEPT;
++
++	ct = nf_ct_get(skb, &ctinfo);
++	if (!ct)
++		return NF_ACCEPT;
++
++	rtc = nf_ct_rtcache_find_usable(ct);
++	if (!rtc)
++		return NF_ACCEPT;
++
++	/* if iif changes, don't use cache and let ip stack
++	 * do route lookup.
++	 *
++	 * If rp_filter is enabled it might toss skb, so
++	 * we don't want to avoid these checks.
++	 */
++	dir = CTINFO2DIR(ctinfo);
++	iif = nf_conn_rtcache_iif_get(rtc, dir);
++	if (in->ifindex != iif) {
++		pr_debug("ct %p, iif %d, cached iif %d, skip cached entry\n",
++			 ct, iif, in->ifindex);
++		return NF_ACCEPT;
++	}
++	dst = nf_conn_rtcache_dst_get(rtc, dir);
++	if (dst == NULL)
++		return NF_ACCEPT;
++
++	cookie = nf_rtcache_get_cookie(ops->pf, dst);
++
++	dst = dst_check(dst, cookie);
++	pr_debug("obtained dst %p for skb %p, cookie %d\n", dst, skb, cookie);
++	if (likely(dst))
++		skb_dst_set_noref_force(skb, dst);
++	else
++		nf_conn_rtcache_dst_obsolete(rtc, dir);
++
++	return NF_ACCEPT;
++}
++
++static unsigned int nf_rtcache_forward(const struct nf_hook_ops *ops,
++				       struct sk_buff *skb,
++				       const struct net_device *in,
++				       const struct net_device *out,
++				       int (*okfn)(struct sk_buff *))
++{
++	struct nf_conn_rtcache *rtc;
++	enum ip_conntrack_info ctinfo;
++	enum ip_conntrack_dir dir;
++	struct nf_conn *ct;
++	int iif;
++
++	ct = nf_ct_get(skb, &ctinfo);
++	if (!ct)
++		return NF_ACCEPT;
++
++	if (!nf_ct_is_confirmed(ct)) {
++		if (WARN_ON(nf_ct_rtcache_find(ct)))
++			return NF_ACCEPT;
++		nf_ct_rtcache_ext_add(ct);
++		return NF_ACCEPT;
++	}
++
++	rtc = nf_ct_rtcache_find_usable(ct);
++	if (!rtc)
++		return NF_ACCEPT;
++
++	dir = CTINFO2DIR(ctinfo);
++	iif = nf_conn_rtcache_iif_get(rtc, dir);
++	pr_debug("ct %p, skb %p, dir %d, iif %d, cached iif %d\n",
++		 ct, skb, dir, iif, in->ifindex);
++	if (likely(in->ifindex == iif))
++		return NF_ACCEPT;
++
++	nf_conn_rtcache_dst_set(ops->pf, rtc, skb_dst(skb), dir, in->ifindex);
++	return NF_ACCEPT;
++}
++
++static int nf_rtcache_dst_remove(struct nf_conn *ct, void *data)
++{
++	struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
++	struct net_device *dev = data;
++
++	if (!rtc)
++		return 0;
++
++	if (dev->ifindex == rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif ||
++	    dev->ifindex == rtc->cached_dst[IP_CT_DIR_REPLY].iif) {
++		nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_ORIGINAL);
++		nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_REPLY);
++	}
++
++	return 0;
++}
++
++static int nf_rtcache_netdev_event(struct notifier_block *this,
++				   unsigned long event, void *ptr)
++{
++	struct net_device *dev = netdev_notifier_info_to_dev(ptr);
++	struct net *net = dev_net(dev);
++
++	if (event == NETDEV_DOWN)
++		nf_ct_iterate_cleanup(net, nf_rtcache_dst_remove, dev, 0, 0);
++
++	return NOTIFY_DONE;
++}
++
++static struct notifier_block nf_rtcache_notifier = {
++	.notifier_call = nf_rtcache_netdev_event,
++};
++
++static struct nf_hook_ops rtcache_ops[] = {
++	{
++		.hook		= nf_rtcache_in,
++		.owner		= THIS_MODULE,
++		.pf		= NFPROTO_IPV4,
++		.hooknum	= NF_INET_PRE_ROUTING,
++		.priority       = NF_IP_PRI_LAST,
++	},
++	{
++		.hook           = nf_rtcache_forward,
++		.owner          = THIS_MODULE,
++		.pf             = NFPROTO_IPV4,
++		.hooknum        = NF_INET_FORWARD,
++		.priority       = NF_IP_PRI_LAST,
++	},
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++	{
++		.hook		= nf_rtcache_in,
++		.owner		= THIS_MODULE,
++		.pf		= NFPROTO_IPV6,
++		.hooknum	= NF_INET_PRE_ROUTING,
++		.priority       = NF_IP_PRI_LAST,
++	},
++	{
++		.hook           = nf_rtcache_forward,
++		.owner          = THIS_MODULE,
++		.pf             = NFPROTO_IPV6,
++		.hooknum        = NF_INET_FORWARD,
++		.priority       = NF_IP_PRI_LAST,
++	},
++#endif
++};
++
++static struct nf_ct_ext_type rtcache_extend __read_mostly = {
++	.len	= sizeof(struct nf_conn_rtcache),
++	.align	= __alignof__(struct nf_conn_rtcache),
++	.id	= NF_CT_EXT_RTCACHE,
++	.destroy = nf_conn_rtcache_destroy,
++};
++
++static int __init nf_conntrack_rtcache_init(void)
++{
++	int ret = nf_ct_extend_register(&rtcache_extend);
++
++	if (ret < 0) {
++		pr_err("nf_conntrack_rtcache: Unable to register extension\n");
++		return ret;
++	}
++
++	ret = nf_register_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
++	if (ret < 0) {
++		nf_ct_extend_unregister(&rtcache_extend);
++		return ret;
++	}
++
++	ret = register_netdevice_notifier(&nf_rtcache_notifier);
++	if (ret) {
++		nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
++		nf_ct_extend_unregister(&rtcache_extend);
++	}
++
++	return ret;
++}
++
++static int nf_rtcache_ext_remove(struct nf_conn *ct, void *data)
++{
++	struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
++
++	return rtc != NULL;
++}
++
++static bool __exit nf_conntrack_rtcache_wait_for_dying(struct net *net)
++{
++	bool wait = false;
++	int cpu;
++
++	for_each_possible_cpu(cpu) {
++		struct nf_conntrack_tuple_hash *h;
++		struct hlist_nulls_node *n;
++		struct nf_conn *ct;
++
++		rcu_read_lock();
++		spin_lock_bh(&nf_conntrack_lock);
++
++		hlist_nulls_for_each_entry(h, n, &net->ct.dying, hnnode) {
++			ct = nf_ct_tuplehash_to_ctrack(h);
++			if (nf_ct_rtcache_find(ct) != NULL) {
++				wait = true;
++				break;
++			}
++		}
++		spin_unlock_bh(&nf_conntrack_lock);
++		rcu_read_unlock();
++	}
++
++	return wait;
++}
++
++static void __exit nf_conntrack_rtcache_fini(void)
++{
++	struct net *net;
++	int count = 0;
++
++	/* remove hooks so no new connections get rtcache extension */
++	nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
++
++	synchronize_net();
++
++	unregister_netdevice_notifier(&nf_rtcache_notifier);
++
++	rtnl_lock();
++
++	/* zap all conntracks with rtcache extension */
++	for_each_net(net)
++		nf_ct_iterate_cleanup(net, nf_rtcache_ext_remove, NULL, 0, 0);
++
++	for_each_net(net) {
++		/* .. and make sure they're gone from dying list, too */
++		while (nf_conntrack_rtcache_wait_for_dying(net)) {
++			msleep(200);
++			WARN_ONCE(++count > 25, "Waiting for all rtcache conntracks to go away\n");
++		}
++	}
++
++	rtnl_unlock();
++	synchronize_net();
++	nf_ct_extend_unregister(&rtcache_extend);
++}
++module_init(nf_conntrack_rtcache_init);
++module_exit(nf_conntrack_rtcache_fini);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Florian Westphal <fw@strlen.de>");
++MODULE_DESCRIPTION("Conntrack route cache extension");
diff --git a/trunk/target/linux/generic/patches-3.14/100-overlayfs.patch b/trunk/target/linux/generic/patches-3.14/100-overlayfs.patch
new file mode 100644
index 00000000..a04b1fef
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/100-overlayfs.patch
@@ -0,0 +1,3231 @@
+--- a/Documentation/filesystems/Locking
++++ b/Documentation/filesystems/Locking
+@@ -65,6 +65,7 @@ prototypes:
+ 				struct file *, unsigned open_flag,
+ 				umode_t create_mode, int *opened);
+ 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ 
+ locking rules:
+ 	all may block
+@@ -93,6 +94,7 @@ fiemap:		no
+ update_time:	no
+ atomic_open:	yes
+ tmpfile:	no
++dentry_open:	no
+ 
+ 	Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
+ victim.
+--- /dev/null
++++ b/Documentation/filesystems/overlayfs.txt
+@@ -0,0 +1,199 @@
++Written by: Neil Brown <neilb@suse.de>
++
++Overlay Filesystem
++==================
++
++This document describes a prototype for a new approach to providing
++overlay-filesystem functionality in Linux (sometimes referred to as
++union-filesystems).  An overlay-filesystem tries to present a
++filesystem which is the result over overlaying one filesystem on top
++of the other.
++
++The result will inevitably fail to look exactly like a normal
++filesystem for various technical reasons.  The expectation is that
++many use cases will be able to ignore these differences.
++
++This approach is 'hybrid' because the objects that appear in the
++filesystem do not all appear to belong to that filesystem.  In many
++cases an object accessed in the union will be indistinguishable
++from accessing the corresponding object from the original filesystem.
++This is most obvious from the 'st_dev' field returned by stat(2).
++
++While directories will report an st_dev from the overlay-filesystem,
++all non-directory objects will report an st_dev from the lower or
++upper filesystem that is providing the object.  Similarly st_ino will
++only be unique when combined with st_dev, and both of these can change
++over the lifetime of a non-directory object.  Many applications and
++tools ignore these values and will not be affected.
++
++Upper and Lower
++---------------
++
++An overlay filesystem combines two filesystems - an 'upper' filesystem
++and a 'lower' filesystem.  When a name exists in both filesystems, the
++object in the 'upper' filesystem is visible while the object in the
++'lower' filesystem is either hidden or, in the case of directories,
++merged with the 'upper' object.
++
++It would be more correct to refer to an upper and lower 'directory
++tree' rather than 'filesystem' as it is quite possible for both
++directory trees to be in the same filesystem and there is no
++requirement that the root of a filesystem be given for either upper or
++lower.
++
++The lower filesystem can be any filesystem supported by Linux and does
++not need to be writable.  The lower filesystem can even be another
++overlayfs.  The upper filesystem will normally be writable and if it
++is it must support the creation of trusted.* extended attributes, and
++must provide valid d_type in readdir responses, at least for symbolic
++links - so NFS is not suitable.
++
++A read-only overlay of two read-only filesystems may use any
++filesystem type.
++
++Directories
++-----------
++
++Overlaying mainly involves directories.  If a given name appears in both
++upper and lower filesystems and refers to a non-directory in either,
++then the lower object is hidden - the name refers only to the upper
++object.
++
++Where both upper and lower objects are directories, a merged directory
++is formed.
++
++At mount time, the two directories given as mount options are combined
++into a merged directory:
++
++  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper /overlay
++
++Then whenever a lookup is requested in such a merged directory, the
++lookup is performed in each actual directory and the combined result
++is cached in the dentry belonging to the overlay filesystem.  If both
++actual lookups find directories, both are stored and a merged
++directory is created, otherwise only one is stored: the upper if it
++exists, else the lower.
++
++Only the lists of names from directories are merged.  Other content
++such as metadata and extended attributes are reported for the upper
++directory only.  These attributes of the lower directory are hidden.
++
++whiteouts and opaque directories
++--------------------------------
++
++In order to support rm and rmdir without changing the lower
++filesystem, an overlay filesystem needs to record in the upper filesystem
++that files have been removed.  This is done using whiteouts and opaque
++directories (non-directories are always opaque).
++
++The overlay filesystem uses extended attributes with a
++"trusted.overlay."  prefix to record these details.
++
++A whiteout is created as a symbolic link with target
++"(overlay-whiteout)" and with xattr "trusted.overlay.whiteout" set to "y".
++When a whiteout is found in the upper level of a merged directory, any
++matching name in the lower level is ignored, and the whiteout itself
++is also hidden.
++
++A directory is made opaque by setting the xattr "trusted.overlay.opaque"
++to "y".  Where the upper filesystem contains an opaque directory, any
++directory in the lower filesystem with the same name is ignored.
++
++readdir
++-------
++
++When a 'readdir' request is made on a merged directory, the upper and
++lower directories are each read and the name lists merged in the
++obvious way (upper is read first, then lower - entries that already
++exist are not re-added).  This merged name list is cached in the
++'struct file' and so remains as long as the file is kept open.  If the
++directory is opened and read by two processes at the same time, they
++will each have separate caches.  A seekdir to the start of the
++directory (offset 0) followed by a readdir will cause the cache to be
++discarded and rebuilt.
++
++This means that changes to the merged directory do not appear while a
++directory is being read.  This is unlikely to be noticed by many
++programs.
++
++seek offsets are assigned sequentially when the directories are read.
++Thus if
++  - read part of a directory
++  - remember an offset, and close the directory
++  - re-open the directory some time later
++  - seek to the remembered offset
++
++there may be little correlation between the old and new locations in
++the list of filenames, particularly if anything has changed in the
++directory.
++
++Readdir on directories that are not merged is simply handled by the
++underlying directory (upper or lower).
++
++
++Non-directories
++---------------
++
++Objects that are not directories (files, symlinks, device-special
++files etc.) are presented either from the upper or lower filesystem as
++appropriate.  When a file in the lower filesystem is accessed in a way
++the requires write-access, such as opening for write access, changing
++some metadata etc., the file is first copied from the lower filesystem
++to the upper filesystem (copy_up).  Note that creating a hard-link
++also requires copy_up, though of course creation of a symlink does
++not.
++
++The copy_up may turn out to be unnecessary, for example if the file is
++opened for read-write but the data is not modified.
++
++The copy_up process first makes sure that the containing directory
++exists in the upper filesystem - creating it and any parents as
++necessary.  It then creates the object with the same metadata (owner,
++mode, mtime, symlink-target etc.) and then if the object is a file, the
++data is copied from the lower to the upper filesystem.  Finally any
++extended attributes are copied up.
++
++Once the copy_up is complete, the overlay filesystem simply
++provides direct access to the newly created file in the upper
++filesystem - future operations on the file are barely noticed by the
++overlay filesystem (though an operation on the name of the file such as
++rename or unlink will of course be noticed and handled).
++
++
++Non-standard behavior
++---------------------
++
++The copy_up operation essentially creates a new, identical file and
++moves it over to the old name.  The new file may be on a different
++filesystem, so both st_dev and st_ino of the file may change.
++
++Any open files referring to this inode will access the old data and
++metadata.  Similarly any file locks obtained before copy_up will not
++apply to the copied up file.
++
++On a file opened with O_RDONLY fchmod(2), fchown(2), futimesat(2) and
++fsetxattr(2) will fail with EROFS.
++
++If a file with multiple hard links is copied up, then this will
++"break" the link.  Changes will not be propagated to other names
++referring to the same inode.
++
++Symlinks in /proc/PID/ and /proc/PID/fd which point to a non-directory
++object in overlayfs will not contain valid absolute paths, only
++relative paths leading up to the filesystem's root.  This will be
++fixed in the future.
++
++Some operations are not atomic, for example a crash during copy_up or
++rename will leave the filesystem in an inconsistent state.  This will
++be addressed in the future.
++
++Changes to underlying filesystems
++---------------------------------
++
++Offline changes, when the overlay is not mounted, are allowed to either
++the upper or the lower trees.
++
++Changes to the underlying filesystems while part of a mounted overlay
++filesystem are not allowed.  If the underlying filesystem is changed,
++the behavior of the overlay is undefined, though it will not result in
++a crash or deadlock.
+--- a/Documentation/filesystems/vfs.txt
++++ b/Documentation/filesystems/vfs.txt
+@@ -362,6 +362,7 @@ struct inode_operations {
+ 	int (*atomic_open)(struct inode *, struct dentry *, struct file *,
+ 			unsigned open_flag, umode_t create_mode, int *opened);
+ 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ };
+ 
+ Again, all methods are called without any locks being held, unless
+@@ -681,6 +682,12 @@ struct address_space_operations {
+   	but instead uses bmap to find out where the blocks in the file
+   	are and uses those addresses directly.
+ 
++  dentry_open: this is an alternative to f_op->open(), the difference is that
++	this method may open a file not necessarily originating from the same
++	filesystem as the one i_op->open() was called on.  It may be
++	useful for stacking filesystems which want to allow native I/O directly
++	on underlying files.
++
+ 
+   invalidatepage: If a page has PagePrivate set, then invalidatepage
+         will be called when part or all of the page is to be removed
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -6452,6 +6452,13 @@ F:	drivers/scsi/osd/
+ F:	include/scsi/osd_*
+ F:	fs/exofs/
+ 
++OVERLAYFS FILESYSTEM
++M:	Miklos Szeredi <miklos@szeredi.hu>
++L:	linux-fsdevel@vger.kernel.org
++S:	Supported
++F:	fs/overlayfs/*
++F:	Documentation/filesystems/overlayfs.txt
++
+ P54 WIRELESS DRIVER
+ M:	Christian Lamparter <chunkeey@googlemail.com>
+ L:	linux-wireless@vger.kernel.org
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -67,6 +67,7 @@ source "fs/quota/Kconfig"
+ 
+ source "fs/autofs4/Kconfig"
+ source "fs/fuse/Kconfig"
++source "fs/overlayfs/Kconfig"
+ 
+ menu "Caches"
+ 
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -104,6 +104,7 @@ obj-$(CONFIG_QNX6FS_FS)		+= qnx6/
+ obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
+ obj-$(CONFIG_ADFS_FS)		+= adfs/
+ obj-$(CONFIG_FUSE_FS)		+= fuse/
++obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/
+ obj-$(CONFIG_UDF_FS)		+= udf/
+ obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
+ obj-$(CONFIG_OMFS_FS)		+= omfs/
+--- a/fs/ecryptfs/main.c
++++ b/fs/ecryptfs/main.c
+@@ -566,6 +566,13 @@ static struct dentry *ecryptfs_mount(str
+ 	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
+ 	s->s_blocksize = path.dentry->d_sb->s_blocksize;
+ 	s->s_magic = ECRYPTFS_SUPER_MAGIC;
++	s->s_stack_depth = path.dentry->d_sb->s_stack_depth + 1;
++
++	rc = -EINVAL;
++	if (s->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		pr_err("eCryptfs: maximum fs stacking depth exceeded\n");
++		goto out_free;
++	}
+ 
+ 	inode = ecryptfs_get_inode(path.dentry->d_inode, s);
+ 	rc = PTR_ERR(inode);
+--- a/fs/internal.h
++++ b/fs/internal.h
+@@ -42,7 +42,6 @@ extern void __init chrdev_init(void);
+ /*
+  * namei.c
+  */
+-extern int __inode_permission(struct inode *, int);
+ extern int user_path_mountpoint_at(int, const char __user *, unsigned int, struct path *);
+ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ 			   const char *, unsigned int, struct path *);
+@@ -135,12 +134,6 @@ extern ssize_t __kernel_write(struct fil
+ extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
+ 
+ /*
+- * splice.c
+- */
+-extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
+-		loff_t *opos, size_t len, unsigned int flags);
+-
+-/*
+  * pipe.c
+  */
+ extern const struct file_operations pipefifo_fops;
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -415,6 +415,7 @@ int __inode_permission(struct inode *ino
+ 
+ 	return security_inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(__inode_permission);
+ 
+ /**
+  * sb_permission - Check superblock-level permissions
+@@ -3037,9 +3038,12 @@ finish_open_created:
+ 	error = may_open(&nd->path, acc_mode, open_flag);
+ 	if (error)
+ 		goto out;
+-	file->f_path.mnt = nd->path.mnt;
+-	error = finish_open(file, nd->path.dentry, NULL, opened);
+-	if (error) {
++
++	BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
++	error = vfs_open(&nd->path, file, current_cred());
++	if (!error) {
++		*opened |= FILE_OPENED;
++	} else {
+ 		if (error == -EOPENSTALE)
+ 			goto stale_open;
+ 		goto out;
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1581,6 +1581,33 @@ void drop_collected_mounts(struct vfsmou
+ 	namespace_unlock();
+ }
+ 
++/**
++ * clone_private_mount - create a private clone of a path
++ *
++ * This creates a new vfsmount, which will be the clone of @path.  The new will
++ * not be attached anywhere in the namespace and will be private (i.e. changes
++ * to the originating mount won't be propagated into this).
++ *
++ * Release with mntput().
++ */
++struct vfsmount *clone_private_mount(struct path *path)
++{
++	struct mount *old_mnt = real_mount(path->mnt);
++	struct mount *new_mnt;
++
++	if (IS_MNT_UNBINDABLE(old_mnt))
++		return ERR_PTR(-EINVAL);
++
++	down_read(&namespace_sem);
++	new_mnt = clone_mnt(old_mnt, path->dentry, CL_PRIVATE);
++	up_read(&namespace_sem);
++	if (IS_ERR(new_mnt))
++		return ERR_CAST(new_mnt);
++
++	return &new_mnt->mnt;
++}
++EXPORT_SYMBOL_GPL(clone_private_mount);
++
+ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 		   struct vfsmount *root)
+ {
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -822,8 +822,7 @@ struct file *dentry_open(const struct pa
+ 	f = get_empty_filp();
+ 	if (!IS_ERR(f)) {
+ 		f->f_flags = flags;
+-		f->f_path = *path;
+-		error = do_dentry_open(f, NULL, cred);
++		error = vfs_open(path, f, cred);
+ 		if (!error) {
+ 			/* from now on we need fput() to dispose of f */
+ 			error = open_check_o_direct(f);
+@@ -840,6 +839,26 @@ struct file *dentry_open(const struct pa
+ }
+ EXPORT_SYMBOL(dentry_open);
+ 
++/**
++ * vfs_open - open the file at the given path
++ * @path: path to open
++ * @filp: newly allocated file with f_flag initialized
++ * @cred: credentials to use
++ */
++int vfs_open(const struct path *path, struct file *filp,
++	     const struct cred *cred)
++{
++	struct inode *inode = path->dentry->d_inode;
++
++	if (inode->i_op->dentry_open)
++		return inode->i_op->dentry_open(path->dentry, filp, cred);
++	else {
++		filp->f_path = *path;
++		return do_dentry_open(filp, NULL, cred);
++	}
++}
++EXPORT_SYMBOL(vfs_open);
++
+ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op)
+ {
+ 	int lookup_flags = 0;
+--- /dev/null
++++ b/fs/overlayfs/Kconfig
+@@ -0,0 +1,10 @@
++config OVERLAYFS_FS
++	tristate "Overlay filesystem support"
++	help
++	  An overlay filesystem combines two filesystems - an 'upper' filesystem
++	  and a 'lower' filesystem.  When a name exists in both filesystems, the
++	  object in the 'upper' filesystem is visible while the object in the
++	  'lower' filesystem is either hidden or, in the case of directories,
++	  merged with the 'upper' object.
++
++	  For more information see Documentation/filesystems/overlayfs.txt
+--- /dev/null
++++ b/fs/overlayfs/Makefile
+@@ -0,0 +1,7 @@
++#
++# Makefile for the overlay filesystem.
++#
++
++obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
++
++overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
+--- /dev/null
++++ b/fs/overlayfs/copy_up.c
+@@ -0,0 +1,388 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/file.h>
++#include <linux/splice.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/uaccess.h>
++#include <linux/sched.h>
++#include "overlayfs.h"
++
++#define OVL_COPY_UP_CHUNK_SIZE (1 << 20)
++
++static int ovl_copy_up_xattr(struct dentry *old, struct dentry *new)
++{
++	ssize_t list_size, size;
++	char *buf, *name, *value;
++	int error;
++
++	if (!old->d_inode->i_op->getxattr ||
++	    !new->d_inode->i_op->getxattr)
++		return 0;
++
++	list_size = vfs_listxattr(old, NULL, 0);
++	if (list_size <= 0) {
++		if (list_size == -EOPNOTSUPP)
++			return 0;
++		return list_size;
++	}
++
++	buf = kzalloc(list_size, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++
++	error = -ENOMEM;
++	value = kmalloc(XATTR_SIZE_MAX, GFP_KERNEL);
++	if (!value)
++		goto out;
++
++	list_size = vfs_listxattr(old, buf, list_size);
++	if (list_size <= 0) {
++		error = list_size;
++		goto out_free_value;
++	}
++
++	for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
++		size = vfs_getxattr(old, name, value, XATTR_SIZE_MAX);
++		if (size <= 0) {
++			error = size;
++			goto out_free_value;
++		}
++		error = vfs_setxattr(new, name, value, size, 0);
++		if (error)
++			goto out_free_value;
++	}
++
++out_free_value:
++	kfree(value);
++out:
++	kfree(buf);
++	return error;
++}
++
++static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
++{
++	struct file *old_file;
++	struct file *new_file;
++	loff_t old_pos = 0;
++	loff_t new_pos = 0;
++	int error = 0;
++
++	if (len == 0)
++		return 0;
++
++	old_file = ovl_path_open(old, O_RDONLY);
++	if (IS_ERR(old_file))
++		return PTR_ERR(old_file);
++
++	new_file = ovl_path_open(new, O_WRONLY);
++	if (IS_ERR(new_file)) {
++		error = PTR_ERR(new_file);
++		goto out_fput;
++	}
++
++	/* FIXME: copy up sparse files efficiently */
++	while (len) {
++		size_t this_len = OVL_COPY_UP_CHUNK_SIZE;
++		long bytes;
++
++		if (len < this_len)
++			this_len = len;
++
++		if (signal_pending_state(TASK_KILLABLE, current)) {
++			error = -EINTR;
++			break;
++		}
++
++		bytes = do_splice_direct(old_file, &old_pos,
++					 new_file, &new_pos,
++					 this_len, SPLICE_F_MOVE);
++		if (bytes <= 0) {
++			error = bytes;
++			break;
++		}
++		WARN_ON(old_pos != new_pos);
++
++		len -= bytes;
++	}
++
++	fput(new_file);
++out_fput:
++	fput(old_file);
++	return error;
++}
++
++static char *ovl_read_symlink(struct dentry *realdentry)
++{
++	int res;
++	char *buf;
++	struct inode *inode = realdentry->d_inode;
++	mm_segment_t old_fs;
++
++	res = -EINVAL;
++	if (!inode->i_op->readlink)
++		goto err;
++
++	res = -ENOMEM;
++	buf = (char *) __get_free_page(GFP_KERNEL);
++	if (!buf)
++		goto err;
++
++	old_fs = get_fs();
++	set_fs(get_ds());
++	/* The cast to a user pointer is valid due to the set_fs() */
++	res = inode->i_op->readlink(realdentry,
++				    (char __user *)buf, PAGE_SIZE - 1);
++	set_fs(old_fs);
++	if (res < 0) {
++		free_page((unsigned long) buf);
++		goto err;
++	}
++	buf[res] = '\0';
++
++	return buf;
++
++err:
++	return ERR_PTR(res);
++}
++
++static int ovl_set_timestamps(struct dentry *upperdentry, struct kstat *stat)
++{
++	struct iattr attr = {
++		.ia_valid =
++		     ATTR_ATIME | ATTR_MTIME | ATTR_ATIME_SET | ATTR_MTIME_SET,
++		.ia_atime = stat->atime,
++		.ia_mtime = stat->mtime,
++	};
++
++	return notify_change(upperdentry, &attr, NULL);
++}
++
++static int ovl_set_mode(struct dentry *upperdentry, umode_t mode)
++{
++	struct iattr attr = {
++		.ia_valid = ATTR_MODE,
++		.ia_mode = mode,
++	};
++
++	return notify_change(upperdentry, &attr, NULL);
++}
++
++static int ovl_copy_up_locked(struct dentry *upperdir, struct dentry *dentry,
++			      struct path *lowerpath, struct kstat *stat,
++			      const char *link)
++{
++	int err;
++	struct path newpath;
++	umode_t mode = stat->mode;
++
++	/* Can't properly set mode on creation because of the umask */
++	stat->mode &= S_IFMT;
++
++	ovl_path_upper(dentry, &newpath);
++	WARN_ON(newpath.dentry);
++	newpath.dentry = ovl_upper_create(upperdir, dentry, stat, link);
++	if (IS_ERR(newpath.dentry))
++		return PTR_ERR(newpath.dentry);
++
++	if (S_ISREG(stat->mode)) {
++		err = ovl_copy_up_data(lowerpath, &newpath, stat->size);
++		if (err)
++			goto err_remove;
++	}
++
++	err = ovl_copy_up_xattr(lowerpath->dentry, newpath.dentry);
++	if (err)
++		goto err_remove;
++
++	mutex_lock(&newpath.dentry->d_inode->i_mutex);
++	if (!S_ISLNK(stat->mode))
++		err = ovl_set_mode(newpath.dentry, mode);
++	if (!err)
++		err = ovl_set_timestamps(newpath.dentry, stat);
++	mutex_unlock(&newpath.dentry->d_inode->i_mutex);
++	if (err)
++		goto err_remove;
++
++	ovl_dentry_update(dentry, newpath.dentry);
++
++	/*
++	 * Easiest way to get rid of the lower dentry reference is to
++	 * drop this dentry.  This is neither needed nor possible for
++	 * directories.
++	 */
++	if (!S_ISDIR(stat->mode))
++		d_drop(dentry);
++
++	return 0;
++
++err_remove:
++	if (S_ISDIR(stat->mode))
++		vfs_rmdir(upperdir->d_inode, newpath.dentry);
++	else
++		vfs_unlink(upperdir->d_inode, newpath.dentry, NULL);
++
++	dput(newpath.dentry);
++
++	return err;
++}
++
++/*
++ * Copy up a single dentry
++ *
++ * Directory renames only allowed on "pure upper" (already created on
++ * upper filesystem, never copied up).  Directories which are on lower or
++ * are merged may not be renamed.  For these -EXDEV is returned and
++ * userspace has to deal with it.  This means, when copying up a
++ * directory we can rely on it and ancestors being stable.
++ *
++ * Non-directory renames start with copy up of source if necessary.  The
++ * actual rename will only proceed once the copy up was successful.  Copy
++ * up uses upper parent i_mutex for exclusion.  Since rename can change
++ * d_parent it is possible that the copy up will lock the old parent.  At
++ * that point the file will have already been copied up anyway.
++ */
++static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,
++			   struct path *lowerpath, struct kstat *stat)
++{
++	int err;
++	struct kstat pstat;
++	struct path parentpath;
++	struct dentry *upperdir;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	char *link = NULL;
++
++	ovl_path_upper(parent, &parentpath);
++	upperdir = parentpath.dentry;
++
++	err = vfs_getattr(&parentpath, &pstat);
++	if (err)
++		return err;
++
++	if (S_ISLNK(stat->mode)) {
++		link = ovl_read_symlink(lowerpath->dentry);
++		if (IS_ERR(link))
++			return PTR_ERR(link);
++	}
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out_free_link;
++
++	override_cred->fsuid = stat->uid;
++	override_cred->fsgid = stat->gid;
++	/*
++	 * CAP_SYS_ADMIN for copying up extended attributes
++	 * CAP_DAC_OVERRIDE for create
++	 * CAP_FOWNER for chmod, timestamp update
++	 * CAP_FSETID for chmod
++	 * CAP_MKNOD for mknod
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	cap_raise(override_cred->cap_effective, CAP_FSETID);
++	cap_raise(override_cred->cap_effective, CAP_MKNOD);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	if (ovl_path_type(dentry) != OVL_PATH_LOWER) {
++		err = 0;
++	} else {
++		err = ovl_copy_up_locked(upperdir, dentry, lowerpath,
++					 stat, link);
++		if (!err) {
++			/* Restore timestamps on parent (best effort) */
++			ovl_set_timestamps(upperdir, &pstat);
++		}
++	}
++
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++out_free_link:
++	if (link)
++		free_page((unsigned long) link);
++
++	return err;
++}
++
++int ovl_copy_up(struct dentry *dentry)
++{
++	int err;
++
++	err = 0;
++	while (!err) {
++		struct dentry *next;
++		struct dentry *parent;
++		struct path lowerpath;
++		struct kstat stat;
++		enum ovl_path_type type = ovl_path_type(dentry);
++
++		if (type != OVL_PATH_LOWER)
++			break;
++
++		next = dget(dentry);
++		/* find the topmost dentry not yet copied up */
++		for (;;) {
++			parent = dget_parent(next);
++
++			type = ovl_path_type(parent);
++			if (type != OVL_PATH_LOWER)
++				break;
++
++			dput(next);
++			next = parent;
++		}
++
++		ovl_path_lower(next, &lowerpath);
++		err = vfs_getattr(&lowerpath, &stat);
++		if (!err)
++			err = ovl_copy_up_one(parent, next, &lowerpath, &stat);
++
++		dput(parent);
++		dput(next);
++	}
++
++	return err;
++}
++
++/* Optimize by not copying up the file first and truncating later */
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size)
++{
++	int err;
++	struct kstat stat;
++	struct path lowerpath;
++	struct dentry *parent = dget_parent(dentry);
++
++	err = ovl_copy_up(parent);
++	if (err)
++		goto out_dput_parent;
++
++	ovl_path_lower(dentry, &lowerpath);
++	err = vfs_getattr(&lowerpath, &stat);
++	if (err)
++		goto out_dput_parent;
++
++	if (size < stat.size)
++		stat.size = size;
++
++	err = ovl_copy_up_one(parent, dentry, &lowerpath, &stat);
++
++out_dput_parent:
++	dput(parent);
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/dir.c
+@@ -0,0 +1,606 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++static const char *ovl_whiteout_symlink = "(overlay-whiteout)";
++
++static int ovl_whiteout(struct dentry *upperdir, struct dentry *dentry)
++{
++	int err;
++	struct dentry *newdentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	/* FIXME: recheck lower dentry to see if whiteout is really needed */
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out;
++
++	/*
++	 * CAP_SYS_ADMIN for setxattr
++	 * CAP_DAC_OVERRIDE for symlink creation
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	override_cred->fsuid = GLOBAL_ROOT_UID;
++	override_cred->fsgid = GLOBAL_ROOT_GID;
++	old_cred = override_creds(override_cred);
++
++	newdentry = lookup_one_len(dentry->d_name.name, upperdir,
++				   dentry->d_name.len);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_put_cred;
++
++	/* Just been removed within the same locked region */
++	WARN_ON(newdentry->d_inode);
++
++	err = vfs_symlink(upperdir->d_inode, newdentry, ovl_whiteout_symlink);
++	if (err)
++		goto out_dput;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++
++	err = vfs_setxattr(newdentry, ovl_whiteout_xattr, "y", 1, 0);
++	if (err)
++		vfs_unlink(upperdir->d_inode, newdentry, NULL);
++
++out_dput:
++	dput(newdentry);
++out_put_cred:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++out:
++	if (err) {
++		/*
++		 * There's no way to recover from failure to whiteout.
++		 * What should we do?  Log a big fat error and... ?
++		 */
++		pr_err("overlayfs: ERROR - failed to whiteout '%s'\n",
++		       dentry->d_name.name);
++	}
++
++	return err;
++}
++
++static struct dentry *ovl_lookup_create(struct dentry *upperdir,
++					struct dentry *template)
++{
++	int err;
++	struct dentry *newdentry;
++	struct qstr *name = &template->d_name;
++
++	newdentry = lookup_one_len(name->name, upperdir, name->len);
++	if (IS_ERR(newdentry))
++		return newdentry;
++
++	if (newdentry->d_inode) {
++		const struct cred *old_cred;
++		struct cred *override_cred;
++
++		/* No need to check whiteout if lower parent is non-existent */
++		err = -EEXIST;
++		if (!ovl_dentry_lower(template->d_parent))
++			goto out_dput;
++
++		if (!S_ISLNK(newdentry->d_inode->i_mode))
++			goto out_dput;
++
++		err = -ENOMEM;
++		override_cred = prepare_creds();
++		if (!override_cred)
++			goto out_dput;
++
++		/*
++		 * CAP_SYS_ADMIN for getxattr
++		 * CAP_FOWNER for unlink in sticky directory
++		 */
++		cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++		cap_raise(override_cred->cap_effective, CAP_FOWNER);
++		old_cred = override_creds(override_cred);
++
++		err = -EEXIST;
++		if (ovl_is_whiteout(newdentry))
++			err = vfs_unlink(upperdir->d_inode, newdentry, NULL);
++
++		revert_creds(old_cred);
++		put_cred(override_cred);
++		if (err)
++			goto out_dput;
++
++		dput(newdentry);
++		newdentry = lookup_one_len(name->name, upperdir, name->len);
++		if (IS_ERR(newdentry)) {
++			ovl_whiteout(upperdir, template);
++			return newdentry;
++		}
++
++		/*
++		 * Whiteout just been successfully removed, parent
++		 * i_mutex is still held, there's no way the lookup
++		 * could return positive.
++		 */
++		WARN_ON(newdentry->d_inode);
++	}
++
++	return newdentry;
++
++out_dput:
++	dput(newdentry);
++	return ERR_PTR(err);
++}
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct inode *dir = upperdir->d_inode;
++
++	newdentry = ovl_lookup_create(upperdir, dentry);
++	if (IS_ERR(newdentry))
++		goto out;
++
++	switch (stat->mode & S_IFMT) {
++	case S_IFREG:
++		err = vfs_create(dir, newdentry, stat->mode, NULL);
++		break;
++
++	case S_IFDIR:
++		err = vfs_mkdir(dir, newdentry, stat->mode);
++		break;
++
++	case S_IFCHR:
++	case S_IFBLK:
++	case S_IFIFO:
++	case S_IFSOCK:
++		err = vfs_mknod(dir, newdentry, stat->mode, stat->rdev);
++		break;
++
++	case S_IFLNK:
++		err = vfs_symlink(dir, newdentry, link);
++		break;
++
++	default:
++		err = -EPERM;
++	}
++	if (err) {
++		if (ovl_dentry_is_opaque(dentry))
++			ovl_whiteout(upperdir, dentry);
++		dput(newdentry);
++		newdentry = ERR_PTR(err);
++	} else if (WARN_ON(!newdentry->d_inode)) {
++		/*
++		 * Not quite sure if non-instantiated dentry is legal or not.
++		 * VFS doesn't seem to care so check and warn here.
++		 */
++		dput(newdentry);
++		newdentry = ERR_PTR(-ENOENT);
++	}
++
++out:
++	return newdentry;
++
++}
++
++static int ovl_set_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for setxattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_setxattr(upperdentry, ovl_opaque_xattr, "y", 1, 0);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_remove_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for removexattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_removexattr(upperdentry, ovl_opaque_xattr);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_dir_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++
++	type = ovl_path_real(dentry, &realpath);
++	err = vfs_getattr(&realpath, stat);
++	if (err)
++		return err;
++
++	stat->dev = dentry->d_sb->s_dev;
++	stat->ino = dentry->d_inode->i_ino;
++
++	/*
++	 * It's probably not worth it to count subdirs to get the
++	 * correct link count.  nlink=1 seems to pacify 'find' and
++	 * other utilities.
++	 */
++	if (type == OVL_PATH_MERGE)
++		stat->nlink = 1;
++
++	return 0;
++}
++
++static int ovl_create_object(struct dentry *dentry, int mode, dev_t rdev,
++			     const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *inode;
++	struct kstat stat = {
++		.mode = mode,
++		.rdev = rdev,
++	};
++
++	err = -ENOMEM;
++	inode = ovl_new_inode(dentry->d_sb, mode, dentry->d_fsdata);
++	if (!inode)
++		goto out;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		goto out_iput;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++
++	newdentry = ovl_upper_create(upperdir, dentry, &stat, link);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++	if (ovl_dentry_is_opaque(dentry) && S_ISDIR(mode)) {
++		err = ovl_set_opaque(newdentry);
++		if (err) {
++			vfs_rmdir(upperdir->d_inode, newdentry);
++			ovl_whiteout(upperdir, dentry);
++			goto out_dput;
++		}
++	}
++	ovl_dentry_update(dentry, newdentry);
++	ovl_copyattr(newdentry->d_inode, inode);
++	d_instantiate(dentry, inode);
++	inode = NULL;
++	newdentry = NULL;
++	err = 0;
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out_iput:
++	iput(inode);
++out:
++	return err;
++}
++
++static int ovl_create(struct inode *dir, struct dentry *dentry, umode_t mode,
++		      bool excl)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFREG, 0, NULL);
++}
++
++static int ovl_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFDIR, 0, NULL);
++}
++
++static int ovl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
++		     dev_t rdev)
++{
++	return ovl_create_object(dentry, mode, rdev, NULL);
++}
++
++static int ovl_symlink(struct inode *dir, struct dentry *dentry,
++			 const char *link)
++{
++	return ovl_create_object(dentry, S_IFLNK, 0, link);
++}
++
++static int ovl_do_remove(struct dentry *dentry, bool is_dir)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++	struct dentry *upperdir;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		return err;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	type = ovl_path_real(dentry, &realpath);
++	if (type != OVL_PATH_LOWER) {
++		err = -ESTALE;
++		if (realpath.dentry->d_parent != upperdir)
++			goto out_d_drop;
++
++		/* FIXME: create whiteout up front and rename to target */
++
++		if (is_dir)
++			err = vfs_rmdir(upperdir->d_inode, realpath.dentry);
++		else
++			err = vfs_unlink(upperdir->d_inode, realpath.dentry,
++					 NULL);
++		if (err)
++			goto out_d_drop;
++
++		ovl_dentry_version_inc(dentry->d_parent);
++	}
++
++	if (type != OVL_PATH_UPPER || ovl_dentry_is_opaque(dentry))
++		err = ovl_whiteout(upperdir, dentry);
++
++	/*
++	 * Keeping this dentry hashed would mean having to release
++	 * upperpath/lowerpath, which could only be done if we are the
++	 * sole user of this dentry.  Too tricky...  Just unhash for
++	 * now.
++	 */
++out_d_drop:
++	d_drop(dentry);
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_unlink(struct inode *dir, struct dentry *dentry)
++{
++	return ovl_do_remove(dentry, false);
++}
++
++
++static int ovl_rmdir(struct inode *dir, struct dentry *dentry)
++{
++	int err;
++	enum ovl_path_type type;
++
++	type = ovl_path_type(dentry);
++	if (type != OVL_PATH_UPPER) {
++		err = ovl_check_empty_and_clear(dentry, type);
++		if (err)
++			return err;
++	}
++
++	return ovl_do_remove(dentry, true);
++}
++
++static int ovl_link(struct dentry *old, struct inode *newdir,
++		    struct dentry *new)
++{
++	int err;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *newinode;
++
++	err = ovl_copy_up(old);
++	if (err)
++		goto out;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		goto out;
++
++	upperdir = ovl_dentry_upper(new->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	newdentry = ovl_lookup_create(upperdir, new);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	olddentry = ovl_dentry_upper(old);
++	err = vfs_link(olddentry, upperdir->d_inode, newdentry, NULL);
++	if (!err) {
++		if (WARN_ON(!newdentry->d_inode)) {
++			dput(newdentry);
++			err = -ENOENT;
++			goto out_unlock;
++		}
++		newinode = ovl_new_inode(old->d_sb, newdentry->d_inode->i_mode,
++				new->d_fsdata);
++		if (!newinode) {
++			err = -ENOMEM;
++			goto link_fail;
++		}
++		ovl_copyattr(upperdir->d_inode, newinode);
++
++		ovl_dentry_version_inc(new->d_parent);
++		ovl_dentry_update(new, newdentry);
++
++		d_instantiate(new, newinode);
++	} else {
++link_fail:
++		if (ovl_dentry_is_opaque(new))
++			ovl_whiteout(upperdir, new);
++		dput(newdentry);
++	}
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out:
++	return err;
++}
++
++static int ovl_rename(struct inode *olddir, struct dentry *old,
++			struct inode *newdir, struct dentry *new)
++{
++	int err;
++	enum ovl_path_type old_type;
++	enum ovl_path_type new_type;
++	struct dentry *old_upperdir;
++	struct dentry *new_upperdir;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *trap;
++	bool old_opaque;
++	bool new_opaque;
++	bool new_create = false;
++	bool is_dir = S_ISDIR(old->d_inode->i_mode);
++
++	/* Don't copy up directory trees */
++	old_type = ovl_path_type(old);
++	if (old_type != OVL_PATH_UPPER && is_dir)
++		return -EXDEV;
++
++	if (new->d_inode) {
++		new_type = ovl_path_type(new);
++
++		if (new_type == OVL_PATH_LOWER && old_type == OVL_PATH_LOWER) {
++			if (ovl_dentry_lower(old)->d_inode ==
++			    ovl_dentry_lower(new)->d_inode)
++				return 0;
++		}
++		if (new_type != OVL_PATH_LOWER && old_type != OVL_PATH_LOWER) {
++			if (ovl_dentry_upper(old)->d_inode ==
++			    ovl_dentry_upper(new)->d_inode)
++				return 0;
++		}
++
++		if (new_type != OVL_PATH_UPPER &&
++		    S_ISDIR(new->d_inode->i_mode)) {
++			err = ovl_check_empty_and_clear(new, new_type);
++			if (err)
++				return err;
++		}
++	} else {
++		new_type = OVL_PATH_UPPER;
++	}
++
++	err = ovl_copy_up(old);
++	if (err)
++		return err;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		return err;
++
++	old_upperdir = ovl_dentry_upper(old->d_parent);
++	new_upperdir = ovl_dentry_upper(new->d_parent);
++
++	trap = lock_rename(new_upperdir, old_upperdir);
++
++	olddentry = ovl_dentry_upper(old);
++	newdentry = ovl_dentry_upper(new);
++	if (newdentry) {
++		dget(newdentry);
++	} else {
++		new_create = true;
++		newdentry = ovl_lookup_create(new_upperdir, new);
++		err = PTR_ERR(newdentry);
++		if (IS_ERR(newdentry))
++			goto out_unlock;
++	}
++
++	err = -ESTALE;
++	if (olddentry->d_parent != old_upperdir)
++		goto out_dput;
++	if (newdentry->d_parent != new_upperdir)
++		goto out_dput;
++	if (olddentry == trap)
++		goto out_dput;
++	if (newdentry == trap)
++		goto out_dput;
++
++	old_opaque = ovl_dentry_is_opaque(old);
++	new_opaque = ovl_dentry_is_opaque(new) || new_type != OVL_PATH_UPPER;
++
++	if (is_dir && !old_opaque && new_opaque) {
++		err = ovl_set_opaque(olddentry);
++		if (err)
++			goto out_dput;
++	}
++
++	err = vfs_rename(old_upperdir->d_inode, olddentry,
++			 new_upperdir->d_inode, newdentry, NULL);
++
++	if (err) {
++		if (new_create && ovl_dentry_is_opaque(new))
++			ovl_whiteout(new_upperdir, new);
++		if (is_dir && !old_opaque && new_opaque)
++			ovl_remove_opaque(olddentry);
++		goto out_dput;
++	}
++
++	if (old_type != OVL_PATH_UPPER || old_opaque)
++		err = ovl_whiteout(old_upperdir, old);
++	if (is_dir && old_opaque && !new_opaque)
++		ovl_remove_opaque(olddentry);
++
++	if (old_opaque != new_opaque)
++		ovl_dentry_set_opaque(old, new_opaque);
++
++	ovl_dentry_version_inc(old->d_parent);
++	ovl_dentry_version_inc(new->d_parent);
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	unlock_rename(new_upperdir, old_upperdir);
++	return err;
++}
++
++const struct inode_operations ovl_dir_inode_operations = {
++	.lookup		= ovl_lookup,
++	.mkdir		= ovl_mkdir,
++	.symlink	= ovl_symlink,
++	.unlink		= ovl_unlink,
++	.rmdir		= ovl_rmdir,
++	.rename		= ovl_rename,
++	.link		= ovl_link,
++	.setattr	= ovl_setattr,
++	.create		= ovl_create,
++	.mknod		= ovl_mknod,
++	.permission	= ovl_permission,
++	.getattr	= ovl_dir_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
+--- /dev/null
++++ b/fs/overlayfs/inode.c
+@@ -0,0 +1,372 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/xattr.h>
++#include "overlayfs.h"
++
++int ovl_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct dentry *upperdentry;
++	int err;
++
++	if ((attr->ia_valid & ATTR_SIZE) && !ovl_dentry_upper(dentry))
++		err = ovl_copy_up_truncate(dentry, attr->ia_size);
++	else
++		err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++
++	if (attr->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
++		attr->ia_valid &= ~ATTR_MODE;
++
++	mutex_lock(&upperdentry->d_inode->i_mutex);
++	err = notify_change(upperdentry, attr, NULL);
++	if (!err)
++		ovl_copyattr(upperdentry->d_inode, dentry->d_inode);
++	mutex_unlock(&upperdentry->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	struct path realpath;
++
++	ovl_path_real(dentry, &realpath);
++	return vfs_getattr(&realpath, stat);
++}
++
++int ovl_permission(struct inode *inode, int mask)
++{
++	struct ovl_entry *oe;
++	struct dentry *alias = NULL;
++	struct inode *realinode;
++	struct dentry *realdentry;
++	bool is_upper;
++	int err;
++
++	if (S_ISDIR(inode->i_mode)) {
++		oe = inode->i_private;
++	} else if (mask & MAY_NOT_BLOCK) {
++		return -ECHILD;
++	} else {
++		/*
++		 * For non-directories find an alias and get the info
++		 * from there.
++		 */
++		alias = d_find_any_alias(inode);
++		if (WARN_ON(!alias))
++			return -ENOENT;
++
++		oe = alias->d_fsdata;
++	}
++
++	realdentry = ovl_entry_real(oe, &is_upper);
++
++	/* Careful in RCU walk mode */
++	realinode = ACCESS_ONCE(realdentry->d_inode);
++	if (!realinode) {
++		WARN_ON(!(mask & MAY_NOT_BLOCK));
++		err = -ENOENT;
++		goto out_dput;
++	}
++
++	if (mask & MAY_WRITE) {
++		umode_t mode = realinode->i_mode;
++
++		/*
++		 * Writes will always be redirected to upper layer, so
++		 * ignore lower layer being read-only.
++		 *
++		 * If the overlay itself is read-only then proceed
++		 * with the permission check, don't return EROFS.
++		 * This will only happen if this is the lower layer of
++		 * another overlayfs.
++		 *
++		 * If upper fs becomes read-only after the overlay was
++		 * constructed return EROFS to prevent modification of
++		 * upper layer.
++		 */
++		err = -EROFS;
++		if (is_upper && !IS_RDONLY(inode) && IS_RDONLY(realinode) &&
++		    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
++			goto out_dput;
++	}
++
++	err = __inode_permission(realinode, mask);
++out_dput:
++	dput(alias);
++	return err;
++}
++
++
++struct ovl_link_data {
++	struct dentry *realdentry;
++	void *cookie;
++};
++
++static void *ovl_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	void *ret;
++	struct dentry *realdentry;
++	struct inode *realinode;
++
++	realdentry = ovl_dentry_real(dentry);
++	realinode = realdentry->d_inode;
++
++	if (WARN_ON(!realinode->i_op->follow_link))
++		return ERR_PTR(-EPERM);
++
++	ret = realinode->i_op->follow_link(realdentry, nd);
++	if (IS_ERR(ret))
++		return ret;
++
++	if (realinode->i_op->put_link) {
++		struct ovl_link_data *data;
++
++		data = kmalloc(sizeof(struct ovl_link_data), GFP_KERNEL);
++		if (!data) {
++			realinode->i_op->put_link(realdentry, nd, ret);
++			return ERR_PTR(-ENOMEM);
++		}
++		data->realdentry = realdentry;
++		data->cookie = ret;
++
++		return data;
++	} else {
++		return NULL;
++	}
++}
++
++static void ovl_put_link(struct dentry *dentry, struct nameidata *nd, void *c)
++{
++	struct inode *realinode;
++	struct ovl_link_data *data = c;
++
++	if (!data)
++		return;
++
++	realinode = data->realdentry->d_inode;
++	realinode->i_op->put_link(data->realdentry, nd, data->cookie);
++	kfree(data);
++}
++
++static int ovl_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
++{
++	struct path realpath;
++	struct inode *realinode;
++
++	ovl_path_real(dentry, &realpath);
++	realinode = realpath.dentry->d_inode;
++
++	if (!realinode->i_op->readlink)
++		return -EINVAL;
++
++	touch_atime(&realpath);
++
++	return realinode->i_op->readlink(realpath.dentry, buf, bufsiz);
++}
++
++
++static bool ovl_is_private_xattr(const char *name)
++{
++	return strncmp(name, "trusted.overlay.", 14) == 0;
++}
++
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags)
++{
++	int err;
++	struct dentry *upperdentry;
++
++	if (ovl_is_private_xattr(name))
++		return -EPERM;
++
++	err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++	return  vfs_setxattr(upperdentry, name, value, size, flags);
++}
++
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size)
++{
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	return vfs_getxattr(ovl_dentry_real(dentry), name, value, size);
++}
++
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
++{
++	ssize_t res;
++	int off;
++
++	res = vfs_listxattr(ovl_dentry_real(dentry), list, size);
++	if (res <= 0 || size == 0)
++		return res;
++
++	if (ovl_path_type(dentry->d_parent) != OVL_PATH_MERGE)
++		return res;
++
++	/* filter out private xattrs */
++	for (off = 0; off < res;) {
++		char *s = list + off;
++		size_t slen = strlen(s) + 1;
++
++		BUG_ON(off + slen > res);
++
++		if (ovl_is_private_xattr(s)) {
++			res -= slen;
++			memmove(s, s + slen, res - off);
++		} else {
++			off += slen;
++		}
++	}
++
++	return res;
++}
++
++int ovl_removexattr(struct dentry *dentry, const char *name)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (type == OVL_PATH_LOWER) {
++		err = vfs_getxattr(realpath.dentry, name, NULL, 0);
++		if (err < 0)
++			return err;
++
++		err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_removexattr(realpath.dentry, name);
++}
++
++static bool ovl_open_need_copy_up(int flags, enum ovl_path_type type,
++				  struct dentry *realdentry)
++{
++	if (type != OVL_PATH_LOWER)
++		return false;
++
++	if (special_file(realdentry->d_inode->i_mode))
++		return false;
++
++	if (!(OPEN_FMODE(flags) & FMODE_WRITE) && !(flags & O_TRUNC))
++		return false;
++
++	return true;
++}
++
++static int ovl_dentry_open(struct dentry *dentry, struct file *file,
++		    const struct cred *cred)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
++		if (file->f_flags & O_TRUNC)
++			err = ovl_copy_up_truncate(dentry, 0);
++		else
++			err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_open(&realpath, file, cred);
++}
++
++static const struct inode_operations ovl_file_inode_operations = {
++	.setattr	= ovl_setattr,
++	.permission	= ovl_permission,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++	.dentry_open	= ovl_dentry_open,
++};
++
++static const struct inode_operations ovl_symlink_inode_operations = {
++	.setattr	= ovl_setattr,
++	.follow_link	= ovl_follow_link,
++	.put_link	= ovl_put_link,
++	.readlink	= ovl_readlink,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe)
++{
++	struct inode *inode;
++
++	inode = new_inode(sb);
++	if (!inode)
++		return NULL;
++
++	mode &= S_IFMT;
++
++	inode->i_ino = get_next_ino();
++	inode->i_mode = mode;
++	inode->i_flags |= S_NOATIME | S_NOCMTIME;
++
++	switch (mode) {
++	case S_IFDIR:
++		inode->i_private = oe;
++		inode->i_op = &ovl_dir_inode_operations;
++		inode->i_fop = &ovl_dir_operations;
++		break;
++
++	case S_IFLNK:
++		inode->i_op = &ovl_symlink_inode_operations;
++		break;
++
++	case S_IFREG:
++	case S_IFSOCK:
++	case S_IFBLK:
++	case S_IFCHR:
++	case S_IFIFO:
++		inode->i_op = &ovl_file_inode_operations;
++		break;
++
++	default:
++		WARN(1, "illegal file type: %i\n", mode);
++		iput(inode);
++		inode = NULL;
++	}
++
++	return inode;
++
++}
+--- /dev/null
++++ b/fs/overlayfs/overlayfs.h
+@@ -0,0 +1,70 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++struct ovl_entry;
++
++enum ovl_path_type {
++	OVL_PATH_UPPER,
++	OVL_PATH_MERGE,
++	OVL_PATH_LOWER,
++};
++
++extern const char *ovl_opaque_xattr;
++extern const char *ovl_whiteout_xattr;
++extern const struct dentry_operations ovl_dentry_operations;
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry);
++u64 ovl_dentry_version_get(struct dentry *dentry);
++void ovl_dentry_version_inc(struct dentry *dentry);
++void ovl_path_upper(struct dentry *dentry, struct path *path);
++void ovl_path_lower(struct dentry *dentry, struct path *path);
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path);
++struct dentry *ovl_dentry_upper(struct dentry *dentry);
++struct dentry *ovl_dentry_lower(struct dentry *dentry);
++struct dentry *ovl_dentry_real(struct dentry *dentry);
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper);
++bool ovl_dentry_is_opaque(struct dentry *dentry);
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque);
++bool ovl_is_whiteout(struct dentry *dentry);
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry);
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags);
++struct file *ovl_path_open(struct path *path, int flags);
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link);
++
++/* readdir.c */
++extern const struct file_operations ovl_dir_operations;
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type);
++
++/* inode.c */
++int ovl_setattr(struct dentry *dentry, struct iattr *attr);
++int ovl_permission(struct inode *inode, int mask);
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags);
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size);
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
++int ovl_removexattr(struct dentry *dentry, const char *name);
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe);
++static inline void ovl_copyattr(struct inode *from, struct inode *to)
++{
++	to->i_uid = from->i_uid;
++	to->i_gid = from->i_gid;
++}
++
++/* dir.c */
++extern const struct inode_operations ovl_dir_inode_operations;
++
++/* copy_up.c */
++int ovl_copy_up(struct dentry *dentry);
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size);
+--- /dev/null
++++ b/fs/overlayfs/readdir.c
+@@ -0,0 +1,567 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/namei.h>
++#include <linux/file.h>
++#include <linux/xattr.h>
++#include <linux/rbtree.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++struct ovl_cache_entry {
++	const char *name;
++	unsigned int len;
++	unsigned int type;
++	u64 ino;
++	bool is_whiteout;
++	struct list_head l_node;
++	struct rb_node node;
++};
++
++struct ovl_readdir_data {
++	struct dir_context ctx;
++	bool is_merge;
++	struct rb_root *root;
++	struct list_head *list;
++	struct list_head *middle;
++	struct dentry *dir;
++	int count;
++	int err;
++};
++
++struct ovl_dir_file {
++	bool is_real;
++	bool is_cached;
++	struct list_head cursor;
++	u64 cache_version;
++	struct list_head cache;
++	struct file *realfile;
++};
++
++static struct ovl_cache_entry *ovl_cache_entry_from_node(struct rb_node *n)
++{
++	return container_of(n, struct ovl_cache_entry, node);
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_find(struct rb_root *root,
++						    const char *name, int len)
++{
++	struct rb_node *node = root->rb_node;
++	int cmp;
++
++	while (node) {
++		struct ovl_cache_entry *p = ovl_cache_entry_from_node(node);
++
++		cmp = strncmp(name, p->name, len);
++		if (cmp > 0)
++			node = p->node.rb_right;
++		else if (cmp < 0 || len < p->len)
++			node = p->node.rb_left;
++		else
++			return p;
++	}
++
++	return NULL;
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_new(const char *name, int len,
++						   u64 ino, unsigned int d_type)
++{
++	struct ovl_cache_entry *p;
++
++	p = kmalloc(sizeof(*p) + len + 1, GFP_KERNEL);
++	if (p) {
++		char *name_copy = (char *) (p + 1);
++		memcpy(name_copy, name, len);
++		name_copy[len] = '\0';
++		p->name = name_copy;
++		p->len = len;
++		p->type = d_type;
++		p->ino = ino;
++		p->is_whiteout = false;
++	}
++
++	return p;
++}
++
++static int ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,
++				  const char *name, int len, u64 ino,
++				  unsigned int d_type)
++{
++	struct rb_node **newp = &rdd->root->rb_node;
++	struct rb_node *parent = NULL;
++	struct ovl_cache_entry *p;
++
++	while (*newp) {
++		int cmp;
++		struct ovl_cache_entry *tmp;
++
++		parent = *newp;
++		tmp = ovl_cache_entry_from_node(*newp);
++		cmp = strncmp(name, tmp->name, len);
++		if (cmp > 0)
++			newp = &tmp->node.rb_right;
++		else if (cmp < 0 || len < tmp->len)
++			newp = &tmp->node.rb_left;
++		else
++			return 0;
++	}
++
++	p = ovl_cache_entry_new(name, len, ino, d_type);
++	if (p == NULL)
++		return -ENOMEM;
++
++	list_add_tail(&p->l_node, rdd->list);
++	rb_link_node(&p->node, parent, newp);
++	rb_insert_color(&p->node, rdd->root);
++
++	return 0;
++}
++
++static int ovl_fill_lower(struct ovl_readdir_data *rdd,
++			  const char *name, int namelen,
++			  loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_cache_entry *p;
++
++	p = ovl_cache_entry_find(rdd->root, name, namelen);
++	if (p) {
++		list_move_tail(&p->l_node, rdd->middle);
++	} else {
++		p = ovl_cache_entry_new(name, namelen, ino, d_type);
++		if (p == NULL)
++			rdd->err = -ENOMEM;
++		else
++			list_add_tail(&p->l_node, rdd->middle);
++	}
++
++	return rdd->err;
++}
++
++static void ovl_cache_free(struct list_head *list)
++{
++	struct ovl_cache_entry *p;
++	struct ovl_cache_entry *n;
++
++	list_for_each_entry_safe(p, n, list, l_node)
++		kfree(p);
++
++	INIT_LIST_HEAD(list);
++}
++
++static int ovl_fill_merge(void *buf, const char *name, int namelen,
++			  loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++
++	rdd->count++;
++	if (!rdd->is_merge)
++		return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);
++	else
++		return ovl_fill_lower(rdd, name, namelen, offset, ino, d_type);
++}
++
++static inline int ovl_dir_read(struct path *realpath,
++			       struct ovl_readdir_data *rdd)
++{
++	struct file *realfile;
++	int err;
++
++	realfile = ovl_path_open(realpath, O_RDONLY | O_DIRECTORY);
++	if (IS_ERR(realfile))
++		return PTR_ERR(realfile);
++
++	rdd->ctx.pos = 0;
++	do {
++		rdd->count = 0;
++		rdd->err = 0;
++		err = iterate_dir(realfile, &rdd->ctx);
++		if (err >= 0)
++			err = rdd->err;
++	} while (!err && rdd->count);
++	fput(realfile);
++
++	return 0;
++}
++
++static void ovl_dir_reset(struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++	enum ovl_path_type type = ovl_path_type(file->f_path.dentry);
++
++	if (ovl_dentry_version_get(file->f_path.dentry) != od->cache_version) {
++		list_del_init(&od->cursor);
++		ovl_cache_free(&od->cache);
++		od->is_cached = false;
++	}
++	WARN_ON(!od->is_real && type != OVL_PATH_MERGE);
++	if (od->is_real && type == OVL_PATH_MERGE) {
++		fput(od->realfile);
++		od->realfile = NULL;
++		od->is_real = false;
++	}
++}
++
++static int ovl_dir_mark_whiteouts(struct ovl_readdir_data *rdd)
++{
++	struct ovl_cache_entry *p;
++	struct dentry *dentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred) {
++		ovl_cache_free(rdd->list);
++		return -ENOMEM;
++	}
++
++	/*
++	 * CAP_SYS_ADMIN for getxattr
++	 * CAP_DAC_OVERRIDE for lookup
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock(&rdd->dir->d_inode->i_mutex);
++	list_for_each_entry(p, rdd->list, l_node) {
++		if (p->type != DT_LNK)
++			continue;
++
++		dentry = lookup_one_len(p->name, rdd->dir, p->len);
++		if (IS_ERR(dentry))
++			continue;
++
++		p->is_whiteout = ovl_is_whiteout(dentry);
++		dput(dentry);
++	}
++	mutex_unlock(&rdd->dir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return 0;
++}
++
++static inline int ovl_dir_read_merged(struct path *upperpath,
++				      struct path *lowerpath,
++				      struct list_head *list)
++{
++	int err;
++	struct rb_root root = RB_ROOT;
++	struct list_head middle;
++	struct ovl_readdir_data rdd = {
++		.ctx.actor = ovl_fill_merge,
++		.list = list,
++		.root = &root,
++		.is_merge = false,
++	};
++
++	if (upperpath->dentry) {
++		rdd.dir = upperpath->dentry;
++		err = ovl_dir_read(upperpath, &rdd);
++		if (err)
++			goto out;
++
++		err = ovl_dir_mark_whiteouts(&rdd);
++		if (err)
++			goto out;
++	}
++	/*
++	 * Insert lowerpath entries before upperpath ones, this allows
++	 * offsets to be reasonably constant
++	 */
++	list_add(&middle, rdd.list);
++	rdd.middle = &middle;
++	rdd.is_merge = true;
++	err = ovl_dir_read(lowerpath, &rdd);
++	list_del(&middle);
++out:
++	return err;
++}
++
++static void ovl_seek_cursor(struct ovl_dir_file *od, loff_t pos)
++{
++	struct list_head *l;
++	loff_t off;
++
++	l = od->cache.next;
++	for (off = 0; off < pos; off++) {
++		if (l == &od->cache)
++			break;
++		l = l->next;
++	}
++	list_move_tail(&od->cursor, l);
++}
++
++static int ovl_iterate(struct file *file, struct dir_context *ctx)
++{
++	struct ovl_dir_file *od = file->private_data;
++	int res;
++
++	if (!ctx->pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = iterate_dir(od->realfile, ctx);
++
++		return res;
++	}
++
++	if (!od->is_cached) {
++		struct path lowerpath;
++		struct path upperpath;
++
++		ovl_path_lower(file->f_path.dentry, &lowerpath);
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++
++		res = ovl_dir_read_merged(&upperpath, &lowerpath, &od->cache);
++		if (res) {
++			ovl_cache_free(&od->cache);
++			return res;
++		}
++
++		od->cache_version = ovl_dentry_version_get(file->f_path.dentry);
++		od->is_cached = true;
++
++		ovl_seek_cursor(od, ctx->pos);
++	}
++
++	while (od->cursor.next != &od->cache) {
++		struct ovl_cache_entry *p;
++
++		p = list_entry(od->cursor.next, struct ovl_cache_entry, l_node);
++		if (!p->is_whiteout) {
++			if (!dir_emit(ctx, p->name, p->len, p->ino, p->type))
++				break;
++		}
++		ctx->pos++;
++		list_move(&od->cursor, &p->l_node);
++	}
++
++	return 0;
++}
++
++static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
++{
++	loff_t res;
++	struct ovl_dir_file *od = file->private_data;
++
++	mutex_lock(&file_inode(file)->i_mutex);
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_llseek(od->realfile, offset, origin);
++		file->f_pos = od->realfile->f_pos;
++	} else {
++		res = -EINVAL;
++
++		switch (origin) {
++		case SEEK_CUR:
++			offset += file->f_pos;
++			break;
++		case SEEK_SET:
++			break;
++		default:
++			goto out_unlock;
++		}
++		if (offset < 0)
++			goto out_unlock;
++
++		if (offset != file->f_pos) {
++			file->f_pos = offset;
++			if (od->is_cached)
++				ovl_seek_cursor(od, offset);
++		}
++		res = offset;
++	}
++out_unlock:
++	mutex_unlock(&file_inode(file)->i_mutex);
++
++	return res;
++}
++
++static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
++			 int datasync)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	/* May need to reopen directory if it got copied up */
++	if (!od->realfile) {
++		struct path upperpath;
++
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++		od->realfile = ovl_path_open(&upperpath, O_RDONLY);
++		if (IS_ERR(od->realfile))
++			return PTR_ERR(od->realfile);
++	}
++
++	return vfs_fsync_range(od->realfile, start, end, datasync);
++}
++
++static int ovl_dir_release(struct inode *inode, struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	list_del(&od->cursor);
++	ovl_cache_free(&od->cache);
++	if (od->realfile)
++		fput(od->realfile);
++	kfree(od);
++
++	return 0;
++}
++
++static int ovl_dir_open(struct inode *inode, struct file *file)
++{
++	struct path realpath;
++	struct file *realfile;
++	struct ovl_dir_file *od;
++	enum ovl_path_type type;
++
++	od = kzalloc(sizeof(struct ovl_dir_file), GFP_KERNEL);
++	if (!od)
++		return -ENOMEM;
++
++	type = ovl_path_real(file->f_path.dentry, &realpath);
++	realfile = ovl_path_open(&realpath, file->f_flags);
++	if (IS_ERR(realfile)) {
++		kfree(od);
++		return PTR_ERR(realfile);
++	}
++	INIT_LIST_HEAD(&od->cache);
++	INIT_LIST_HEAD(&od->cursor);
++	od->is_cached = false;
++	od->realfile = realfile;
++	od->is_real = (type != OVL_PATH_MERGE);
++	file->private_data = od;
++
++	return 0;
++}
++
++const struct file_operations ovl_dir_operations = {
++	.read		= generic_read_dir,
++	.open		= ovl_dir_open,
++	.iterate	= ovl_iterate,
++	.llseek		= ovl_dir_llseek,
++	.fsync		= ovl_dir_fsync,
++	.release	= ovl_dir_release,
++};
++
++static int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
++{
++	int err;
++	struct path lowerpath;
++	struct path upperpath;
++	struct ovl_cache_entry *p;
++
++	ovl_path_upper(dentry, &upperpath);
++	ovl_path_lower(dentry, &lowerpath);
++
++	err = ovl_dir_read_merged(&upperpath, &lowerpath, list);
++	if (err)
++		return err;
++
++	err = 0;
++
++	list_for_each_entry(p, list, l_node) {
++		if (p->is_whiteout)
++			continue;
++
++		if (p->name[0] == '.') {
++			if (p->len == 1)
++				continue;
++			if (p->len == 2 && p->name[1] == '.')
++				continue;
++		}
++		err = -ENOTEMPTY;
++		break;
++	}
++
++	return err;
++}
++
++static int ovl_remove_whiteouts(struct dentry *dir, struct list_head *list)
++{
++	struct path upperpath;
++	struct dentry *upperdir;
++	struct ovl_cache_entry *p;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	int err;
++
++	ovl_path_upper(dir, &upperpath);
++	upperdir = upperpath.dentry;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/*
++	 * CAP_DAC_OVERRIDE for lookup and unlink
++	 * CAP_SYS_ADMIN for setxattr of "trusted" namespace
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	old_cred = override_creds(override_cred);
++
++	err = vfs_setxattr(upperdir, ovl_opaque_xattr, "y", 1, 0);
++	if (err)
++		goto out_revert_creds;
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	list_for_each_entry(p, list, l_node) {
++		struct dentry *dentry;
++		int ret;
++
++		if (!p->is_whiteout)
++			continue;
++
++		dentry = lookup_one_len(p->name, upperdir, p->len);
++		if (IS_ERR(dentry)) {
++			pr_warn(
++			    "overlayfs: failed to lookup whiteout %.*s: %li\n",
++			    p->len, p->name, PTR_ERR(dentry));
++			continue;
++		}
++		ret = vfs_unlink(upperdir->d_inode, dentry, NULL);
++		dput(dentry);
++		if (ret)
++			pr_warn(
++			    "overlayfs: failed to unlink whiteout %.*s: %i\n",
++			    p->len, p->name, ret);
++	}
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++out_revert_creds:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type)
++{
++	int err;
++	LIST_HEAD(list);
++
++	err = ovl_check_empty_dir(dentry, &list);
++	if (!err && type == OVL_PATH_MERGE)
++		err = ovl_remove_whiteouts(dentry, &list);
++
++	ovl_cache_free(&list);
++
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/super.c
+@@ -0,0 +1,685 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/mount.h>
++#include <linux/slab.h>
++#include <linux/parser.h>
++#include <linux/module.h>
++#include <linux/cred.h>
++#include <linux/sched.h>
++#include <linux/statfs.h>
++#include <linux/seq_file.h>
++#include "overlayfs.h"
++
++MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
++MODULE_DESCRIPTION("Overlay filesystem");
++MODULE_LICENSE("GPL");
++
++#define OVERLAYFS_SUPER_MAGIC 0x794c764f
++
++struct ovl_config {
++	char *lowerdir;
++	char *upperdir;
++};
++
++/* private information held for overlayfs's superblock */
++struct ovl_fs {
++	struct vfsmount *upper_mnt;
++	struct vfsmount *lower_mnt;
++	long lower_namelen;
++	/* pathnames of lower and upper dirs, for show_options */
++	struct ovl_config config;
++};
++
++/* private information held for every overlayfs dentry */
++struct ovl_entry {
++	/*
++	 * Keep "double reference" on upper dentries, so that
++	 * d_delete() doesn't think it's OK to reset d_inode to NULL.
++	 */
++	struct dentry *__upperdentry;
++	struct dentry *lowerdentry;
++	union {
++		struct {
++			u64 version;
++			bool opaque;
++		};
++		struct rcu_head rcu;
++	};
++};
++
++const char *ovl_whiteout_xattr = "trusted.overlay.whiteout";
++const char *ovl_opaque_xattr = "trusted.overlay.opaque";
++
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe->__upperdentry) {
++		if (oe->lowerdentry && S_ISDIR(dentry->d_inode->i_mode))
++			return OVL_PATH_MERGE;
++		else
++			return OVL_PATH_UPPER;
++	} else {
++		return OVL_PATH_LOWER;
++	}
++}
++
++static struct dentry *ovl_upperdentry_dereference(struct ovl_entry *oe)
++{
++	struct dentry *upperdentry = ACCESS_ONCE(oe->__upperdentry);
++	smp_read_barrier_depends();
++	return upperdentry;
++}
++
++void ovl_path_upper(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->upper_mnt;
++	path->dentry = ovl_upperdentry_dereference(oe);
++}
++
++void ovl_path_lower(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->lower_mnt;
++	path->dentry = oe->lowerdentry;
++}
++
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)
++{
++
++	enum ovl_path_type type = ovl_path_type(dentry);
++
++	if (type == OVL_PATH_LOWER)
++		ovl_path_lower(dentry, path);
++	else
++		ovl_path_upper(dentry, path);
++
++	return type;
++}
++
++struct dentry *ovl_dentry_upper(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return ovl_upperdentry_dereference(oe);
++}
++
++struct dentry *ovl_dentry_lower(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return oe->lowerdentry;
++}
++
++struct dentry *ovl_dentry_real(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (!realdentry)
++		realdentry = oe->lowerdentry;
++
++	return realdentry;
++}
++
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper)
++{
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (realdentry) {
++		*is_upper = true;
++	} else {
++		realdentry = oe->lowerdentry;
++		*is_upper = false;
++	}
++	return realdentry;
++}
++
++bool ovl_dentry_is_opaque(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	return oe->opaque;
++}
++
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	oe->opaque = opaque;
++}
++
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&upperdentry->d_parent->d_inode->i_mutex));
++	WARN_ON(oe->__upperdentry);
++	BUG_ON(!upperdentry->d_inode);
++	smp_wmb();
++	oe->__upperdentry = dget(upperdentry);
++}
++
++void ovl_dentry_version_inc(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	oe->version++;
++}
++
++u64 ovl_dentry_version_get(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	return oe->version;
++}
++
++bool ovl_is_whiteout(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!dentry)
++		return false;
++	if (!dentry->d_inode)
++		return false;
++	if (!S_ISLNK(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_whiteout_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static bool ovl_is_opaquedir(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!S_ISDIR(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_opaque_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static void ovl_entry_free(struct rcu_head *head)
++{
++	struct ovl_entry *oe = container_of(head, struct ovl_entry, rcu);
++	kfree(oe);
++}
++
++static void ovl_dentry_release(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe) {
++		dput(oe->__upperdentry);
++		dput(oe->__upperdentry);
++		dput(oe->lowerdentry);
++		call_rcu(&oe->rcu, ovl_entry_free);
++	}
++}
++
++const struct dentry_operations ovl_dentry_operations = {
++	.d_release = ovl_dentry_release,
++};
++
++static struct ovl_entry *ovl_alloc_entry(void)
++{
++	return kzalloc(sizeof(struct ovl_entry), GFP_KERNEL);
++}
++
++static inline struct dentry *ovl_lookup_real(struct dentry *dir,
++					     struct qstr *name)
++{
++	struct dentry *dentry;
++
++	mutex_lock(&dir->d_inode->i_mutex);
++	dentry = lookup_one_len(name->name, dir, name->len);
++	mutex_unlock(&dir->d_inode->i_mutex);
++
++	if (IS_ERR(dentry)) {
++		if (PTR_ERR(dentry) == -ENOENT)
++			dentry = NULL;
++	} else if (!dentry->d_inode) {
++		dput(dentry);
++		dentry = NULL;
++	}
++	return dentry;
++}
++
++static int ovl_do_lookup(struct dentry *dentry)
++{
++	struct ovl_entry *oe;
++	struct dentry *upperdir;
++	struct dentry *lowerdir;
++	struct dentry *upperdentry = NULL;
++	struct dentry *lowerdentry = NULL;
++	struct inode *inode = NULL;
++	int err;
++
++	err = -ENOMEM;
++	oe = ovl_alloc_entry();
++	if (!oe)
++		goto out;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	lowerdir = ovl_dentry_lower(dentry->d_parent);
++
++	if (upperdir) {
++		upperdentry = ovl_lookup_real(upperdir, &dentry->d_name);
++		err = PTR_ERR(upperdentry);
++		if (IS_ERR(upperdentry))
++			goto out_put_dir;
++
++		if (lowerdir && upperdentry &&
++		    (S_ISLNK(upperdentry->d_inode->i_mode) ||
++		     S_ISDIR(upperdentry->d_inode->i_mode))) {
++			const struct cred *old_cred;
++			struct cred *override_cred;
++
++			err = -ENOMEM;
++			override_cred = prepare_creds();
++			if (!override_cred)
++				goto out_dput_upper;
++
++			/* CAP_SYS_ADMIN needed for getxattr */
++			cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++			old_cred = override_creds(override_cred);
++
++			if (ovl_is_opaquedir(upperdentry)) {
++				oe->opaque = true;
++			} else if (ovl_is_whiteout(upperdentry)) {
++				dput(upperdentry);
++				upperdentry = NULL;
++				oe->opaque = true;
++			}
++			revert_creds(old_cred);
++			put_cred(override_cred);
++		}
++	}
++	if (lowerdir && !oe->opaque) {
++		lowerdentry = ovl_lookup_real(lowerdir, &dentry->d_name);
++		err = PTR_ERR(lowerdentry);
++		if (IS_ERR(lowerdentry))
++			goto out_dput_upper;
++	}
++
++	if (lowerdentry && upperdentry &&
++	    (!S_ISDIR(upperdentry->d_inode->i_mode) ||
++	     !S_ISDIR(lowerdentry->d_inode->i_mode))) {
++		dput(lowerdentry);
++		lowerdentry = NULL;
++		oe->opaque = true;
++	}
++
++	if (lowerdentry || upperdentry) {
++		struct dentry *realdentry;
++
++		realdentry = upperdentry ? upperdentry : lowerdentry;
++		err = -ENOMEM;
++		inode = ovl_new_inode(dentry->d_sb, realdentry->d_inode->i_mode,
++				      oe);
++		if (!inode)
++			goto out_dput;
++		ovl_copyattr(realdentry->d_inode, inode);
++	}
++
++	if (upperdentry)
++		oe->__upperdentry = dget(upperdentry);
++
++	if (lowerdentry)
++		oe->lowerdentry = lowerdentry;
++
++	dentry->d_fsdata = oe;
++	dentry->d_op = &ovl_dentry_operations;
++	d_add(dentry, inode);
++
++	return 0;
++
++out_dput:
++	dput(lowerdentry);
++out_dput_upper:
++	dput(upperdentry);
++out_put_dir:
++	kfree(oe);
++out:
++	return err;
++}
++
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags)
++{
++	int err = ovl_do_lookup(dentry);
++
++	if (err)
++		return ERR_PTR(err);
++
++	return NULL;
++}
++
++struct file *ovl_path_open(struct path *path, int flags)
++{
++	return dentry_open(path, flags, current_cred());
++}
++
++static void ovl_put_super(struct super_block *sb)
++{
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++
++	mntput(ufs->upper_mnt);
++	mntput(ufs->lower_mnt);
++
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++	kfree(ufs);
++}
++
++static int ovl_remount_fs(struct super_block *sb, int *flagsp, char *data)
++{
++	int flags = *flagsp;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	/* When remounting rw or ro, we need to adjust the write access to the
++	 * upper fs.
++	 */
++	if (((flags ^ sb->s_flags) & MS_RDONLY) == 0)
++		/* No change to readonly status */
++		return 0;
++
++	if (flags & MS_RDONLY) {
++		mnt_drop_write(ufs->upper_mnt);
++		return 0;
++	} else
++		return mnt_want_write(ufs->upper_mnt);
++}
++
++/**
++ * ovl_statfs
++ * @sb: The overlayfs super block
++ * @buf: The struct kstatfs to fill in with stats
++ *
++ * Get the filesystem statistics.  As writes always target the upper layer
++ * filesystem pass the statfs to the same filesystem.
++ */
++static int ovl_statfs(struct dentry *dentry, struct kstatfs *buf)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct dentry *root_dentry = dentry->d_sb->s_root;
++	struct path path;
++	int err;
++
++	ovl_path_upper(root_dentry, &path);
++
++	err = vfs_statfs(&path, buf);
++	if (!err) {
++		buf->f_namelen = max(buf->f_namelen, ofs->lower_namelen);
++		buf->f_type = OVERLAYFS_SUPER_MAGIC;
++	}
++
++	return err;
++}
++
++/**
++ * ovl_show_options
++ *
++ * Prints the mount options for a given superblock.
++ * Returns zero; does not fail.
++ */
++static int ovl_show_options(struct seq_file *m, struct dentry *dentry)
++{
++	struct super_block *sb = dentry->d_sb;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	seq_printf(m, ",lowerdir=%s", ufs->config.lowerdir);
++	seq_printf(m, ",upperdir=%s", ufs->config.upperdir);
++	return 0;
++}
++
++static const struct super_operations ovl_super_operations = {
++	.put_super	= ovl_put_super,
++	.remount_fs	= ovl_remount_fs,
++	.statfs		= ovl_statfs,
++	.show_options	= ovl_show_options,
++};
++
++enum {
++	OPT_LOWERDIR,
++	OPT_UPPERDIR,
++	OPT_ERR,
++};
++
++static const match_table_t ovl_tokens = {
++	{OPT_LOWERDIR,			"lowerdir=%s"},
++	{OPT_UPPERDIR,			"upperdir=%s"},
++	{OPT_ERR,			NULL}
++};
++
++static int ovl_parse_opt(char *opt, struct ovl_config *config)
++{
++	char *p;
++
++	config->upperdir = NULL;
++	config->lowerdir = NULL;
++
++	while ((p = strsep(&opt, ",")) != NULL) {
++		int token;
++		substring_t args[MAX_OPT_ARGS];
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, ovl_tokens, args);
++		switch (token) {
++		case OPT_UPPERDIR:
++			kfree(config->upperdir);
++			config->upperdir = match_strdup(&args[0]);
++			if (!config->upperdir)
++				return -ENOMEM;
++			break;
++
++		case OPT_LOWERDIR:
++			kfree(config->lowerdir);
++			config->lowerdir = match_strdup(&args[0]);
++			if (!config->lowerdir)
++				return -ENOMEM;
++			break;
++
++		default:
++			return -EINVAL;
++		}
++	}
++	return 0;
++}
++
++static int ovl_fill_super(struct super_block *sb, void *data, int silent)
++{
++	struct path lowerpath;
++	struct path upperpath;
++	struct inode *root_inode;
++	struct dentry *root_dentry;
++	struct ovl_entry *oe;
++	struct ovl_fs *ufs;
++	struct kstatfs statfs;
++	int err;
++
++	err = -ENOMEM;
++	ufs = kmalloc(sizeof(struct ovl_fs), GFP_KERNEL);
++	if (!ufs)
++		goto out;
++
++	err = ovl_parse_opt((char *) data, &ufs->config);
++	if (err)
++		goto out_free_ufs;
++
++	err = -EINVAL;
++	if (!ufs->config.upperdir || !ufs->config.lowerdir) {
++		pr_err("overlayfs: missing upperdir or lowerdir\n");
++		goto out_free_config;
++	}
++
++	oe = ovl_alloc_entry();
++	if (oe == NULL)
++		goto out_free_config;
++
++	err = kern_path(ufs->config.upperdir, LOOKUP_FOLLOW, &upperpath);
++	if (err)
++		goto out_free_oe;
++
++	err = kern_path(ufs->config.lowerdir, LOOKUP_FOLLOW, &lowerpath);
++	if (err)
++		goto out_put_upperpath;
++
++	err = -ENOTDIR;
++	if (!S_ISDIR(upperpath.dentry->d_inode->i_mode) ||
++	    !S_ISDIR(lowerpath.dentry->d_inode->i_mode))
++		goto out_put_lowerpath;
++
++	err = vfs_statfs(&lowerpath, &statfs);
++	if (err) {
++		pr_err("overlayfs: statfs failed on lowerpath\n");
++		goto out_put_lowerpath;
++	}
++	ufs->lower_namelen = statfs.f_namelen;
++
++	sb->s_stack_depth = max(upperpath.mnt->mnt_sb->s_stack_depth,
++				lowerpath.mnt->mnt_sb->s_stack_depth) + 1;
++
++	err = -EINVAL;
++	if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		pr_err("overlayfs: maximum fs stacking depth exceeded\n");
++		goto out_put_lowerpath;
++	}
++
++
++	ufs->upper_mnt = clone_private_mount(&upperpath);
++	err = PTR_ERR(ufs->upper_mnt);
++	if (IS_ERR(ufs->upper_mnt)) {
++		pr_err("overlayfs: failed to clone upperpath\n");
++		goto out_put_lowerpath;
++	}
++
++	ufs->lower_mnt = clone_private_mount(&lowerpath);
++	err = PTR_ERR(ufs->lower_mnt);
++	if (IS_ERR(ufs->lower_mnt)) {
++		pr_err("overlayfs: failed to clone lowerpath\n");
++		goto out_put_upper_mnt;
++	}
++
++	/*
++	 * Make lower_mnt R/O.  That way fchmod/fchown on lower file
++	 * will fail instead of modifying lower fs.
++	 */
++	ufs->lower_mnt->mnt_flags |= MNT_READONLY;
++
++	/* If the upper fs is r/o, we mark overlayfs r/o too */
++	if (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY)
++		sb->s_flags |= MS_RDONLY;
++
++	if (!(sb->s_flags & MS_RDONLY)) {
++		err = mnt_want_write(ufs->upper_mnt);
++		if (err)
++			goto out_put_lower_mnt;
++	}
++
++	err = -ENOMEM;
++	root_inode = ovl_new_inode(sb, S_IFDIR, oe);
++	if (!root_inode)
++		goto out_drop_write;
++
++	root_dentry = d_make_root(root_inode);
++	if (!root_dentry)
++		goto out_drop_write;
++
++	mntput(upperpath.mnt);
++	mntput(lowerpath.mnt);
++
++	oe->__upperdentry = dget(upperpath.dentry);
++	oe->lowerdentry = lowerpath.dentry;
++
++	root_dentry->d_fsdata = oe;
++	root_dentry->d_op = &ovl_dentry_operations;
++
++	sb->s_magic = OVERLAYFS_SUPER_MAGIC;
++	sb->s_op = &ovl_super_operations;
++	sb->s_root = root_dentry;
++	sb->s_fs_info = ufs;
++
++	return 0;
++
++out_drop_write:
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++out_put_lower_mnt:
++	mntput(ufs->lower_mnt);
++out_put_upper_mnt:
++	mntput(ufs->upper_mnt);
++out_put_lowerpath:
++	path_put(&lowerpath);
++out_put_upperpath:
++	path_put(&upperpath);
++out_free_oe:
++	kfree(oe);
++out_free_config:
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++out_free_ufs:
++	kfree(ufs);
++out:
++	return err;
++}
++
++static struct dentry *ovl_mount(struct file_system_type *fs_type, int flags,
++				const char *dev_name, void *raw_data)
++{
++	return mount_nodev(fs_type, flags, raw_data, ovl_fill_super);
++}
++
++static struct file_system_type ovl_fs_type = {
++	.owner		= THIS_MODULE,
++	.name		= "overlayfs",
++	.mount		= ovl_mount,
++	.kill_sb	= kill_anon_super,
++};
++MODULE_ALIAS_FS("overlayfs");
++
++static int __init ovl_init(void)
++{
++	return register_filesystem(&ovl_fs_type);
++}
++
++static void __exit ovl_exit(void)
++{
++	unregister_filesystem(&ovl_fs_type);
++}
++
++module_init(ovl_init);
++module_exit(ovl_exit);
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1327,6 +1327,7 @@ long do_splice_direct(struct file *in, l
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_splice_direct);
+ 
+ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
+ 			       struct pipe_inode_info *opipe,
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -249,6 +249,12 @@ struct iattr {
+  */
+ #include <linux/quota.h>
+ 
++/*
++ * Maximum number of layers of fs stack.  Needs to be limited to
++ * prevent kernel stack overflow
++ */
++#define FILESYSTEM_MAX_STACK_DEPTH 2
++
+ /** 
+  * enum positive_aop_returns - aop return codes with specific semantics
+  *
+@@ -1329,6 +1335,11 @@ struct super_block {
+ 	struct list_lru		s_dentry_lru ____cacheline_aligned_in_smp;
+ 	struct list_lru		s_inode_lru ____cacheline_aligned_in_smp;
+ 	struct rcu_head		rcu;
++
++	/*
++	 * Indicates how deep in a filesystem stack this SB is
++	 */
++	int s_stack_depth;
+ };
+ 
+ extern struct timespec current_fs_time(struct super_block *sb);
+@@ -1585,6 +1596,7 @@ struct inode_operations {
+ 			   umode_t create_mode, int *opened);
+ 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
+ 	int (*set_acl)(struct inode *, struct posix_acl *, int);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ } ____cacheline_aligned;
+ 
+ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -2079,6 +2091,7 @@ extern struct file *file_open_name(struc
+ extern struct file *filp_open(const char *, int, umode_t);
+ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
+ 				   const char *, int);
++extern int vfs_open(const struct path *, struct file *, const struct cred *);
+ extern struct file * dentry_open(const struct path *, int, const struct cred *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ 
+@@ -2292,6 +2305,7 @@ extern sector_t bmap(struct inode *, sec
+ #endif
+ extern int notify_change(struct dentry *, struct iattr *, struct inode **);
+ extern int inode_permission(struct inode *, int);
++extern int __inode_permission(struct inode *, int);
+ extern int generic_permission(struct inode *, int);
+ 
+ static inline bool execute_ok(struct inode *inode)
+@@ -2500,6 +2514,9 @@ extern ssize_t generic_file_splice_write
+ 		struct file *, loff_t *, size_t, unsigned int);
+ extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+ 		struct file *out, loff_t *, size_t len, unsigned int flags);
++extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
++		loff_t *opos, size_t len, unsigned int flags);
++
+ 
+ extern void
+ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
+--- a/include/linux/mount.h
++++ b/include/linux/mount.h
+@@ -81,6 +81,9 @@ extern void mnt_pin(struct vfsmount *mnt
+ extern void mnt_unpin(struct vfsmount *mnt);
+ extern int __mnt_is_readonly(struct vfsmount *mnt);
+ 
++struct path;
++extern struct vfsmount *clone_private_mount(struct path *path);
++
+ struct file_system_type;
+ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
+ 				      int flags, const char *name,
diff --git a/trunk/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch b/trunk/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch
new file mode 100644
index 00000000..7c32c6d5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch
@@ -0,0 +1,81 @@
+From 1e311820ec3055e3f08e687de6564692a7cec675 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 28 Jan 2013 20:06:29 +0100
+Subject: [PATCH 11/12] USB: EHCI: add ignore_oc flag to disable overcurrent
+ checking
+
+This patch adds an ignore_oc flag which can be set by EHCI controller
+not supporting or wanting to disable overcurrent checking. The EHCI
+platform data in include/linux/usb/ehci_pdriver.h is also augmented to
+take advantage of this new flag.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ drivers/usb/host/ehci-hcd.c      |    2 +-
+ drivers/usb/host/ehci-hub.c      |    4 ++--
+ drivers/usb/host/ehci-platform.c |    1 +
+ drivers/usb/host/ehci.h          |    1 +
+ include/linux/usb/ehci_pdriver.h |    1 +
+ 5 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -633,7 +633,7 @@ static int ehci_run (struct usb_hcd *hcd
+ 		"USB %x.%x started, EHCI %x.%02x%s\n",
+ 		((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
+ 		temp >> 8, temp & 0xff,
+-		ignore_oc ? ", overcurrent ignored" : "");
++		(ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
+ 
+ 	ehci_writel(ehci, INTR_MASK,
+ 		    &ehci->regs->intr_enable); /* Turn On Interrupts */
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -641,7 +641,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+ 	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
+ 	 * PORT_POWER; that's surprising, but maybe within-spec.
+ 	 */
+-	if (!ignore_oc)
++	if (!ignore_oc && !ehci->ignore_oc)
+ 		mask = PORT_CSC | PORT_PEC | PORT_OCC;
+ 	else
+ 		mask = PORT_CSC | PORT_PEC;
+@@ -1001,7 +1001,7 @@ static int ehci_hub_control (
+ 		if (temp & PORT_PEC)
+ 			status |= USB_PORT_STAT_C_ENABLE << 16;
+ 
+-		if ((temp & PORT_OCC) && !ignore_oc){
++		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
+ 			status |= USB_PORT_STAT_C_OVERCURRENT << 16;
+ 
+ 			/*
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -47,6 +47,7 @@ static int ehci_platform_reset(struct us
+ 	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
+ 	ehci->big_endian_desc = pdata->big_endian_desc;
+ 	ehci->big_endian_mmio = pdata->big_endian_mmio;
++	ehci->ignore_oc = pdata->ignore_oc;
+ 
+ 	if (pdata->pre_setup) {
+ 		retval = pdata->pre_setup(hcd);
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -226,6 +226,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
+ 	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */
+ 	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */
++	unsigned		ignore_oc:1;
+ 
+ 	/* required for usb32 quirk */
+ 	#define OHCI_CTRL_HCFS          (3 << 6)
+--- a/include/linux/usb/ehci_pdriver.h
++++ b/include/linux/usb/ehci_pdriver.h
+@@ -45,6 +45,7 @@ struct usb_ehci_pdata {
+ 	unsigned	big_endian_desc:1;
+ 	unsigned	big_endian_mmio:1;
+ 	unsigned	no_io_watchdog:1;
++	unsigned	ignore_oc:1;
+ 
+ 	/* Turn on all power and clocks */
+ 	int (*power_on)(struct platform_device *pdev);
diff --git a/trunk/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch b/trunk/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch
new file mode 100644
index 00000000..d12f7a6c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch
@@ -0,0 +1,54 @@
+From: Stephen Hemminger <stephen@networkplumber.org>
+Subject: bridge: allow receiption on disabled port
+
+When an ethernet device is enslaved to a bridge, and the bridge STP
+detects loss of carrier (or operational state down), then normally
+packet receiption is blocked.
+
+This breaks control applications like WPA which maybe expecting to
+receive packets to negotiate to bring link up. The bridge needs to
+block forwarding packets from these disabled ports, but there is no
+hard requirement to not allow local packet delivery.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -145,11 +145,13 @@ drop:
+ static int br_handle_local_finish(struct sk_buff *skb)
+ {
+ 	struct net_bridge_port *p = br_port_get_rcu(skb->dev);
+-	u16 vid = 0;
++	if (p->state != BR_STATE_DISABLED) {
++		u16 vid = 0;
+ 
+-	/* check if vlan is allowed, to avoid spoofing */
+-	if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid))
+-		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);
++		/* check if vlan is allowed, to avoid spoofing */
++		if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid))
++			br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);
++	}
+ 	return 0;	 /* process further */
+ }
+ 
+@@ -219,6 +221,18 @@ rx_handler_result_t br_handle_frame(stru
+ 
+ forward:
+ 	switch (p->state) {
++	case BR_STATE_DISABLED:
++		if (ether_addr_equal(p->br->dev->dev_addr, dest))
++			skb->pkt_type = PACKET_HOST;
++
++		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++			br_handle_local_finish))
++			break;
++
++		BR_INPUT_SKB_CB(skb)->brdev = p->br->dev;
++		br_pass_frame_up(skb);
++		break;
++
+ 	case BR_STATE_FORWARDING:
+ 		rhook = rcu_dereference(br_should_route_hook);
+ 		if (rhook) {
diff --git a/trunk/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch b/trunk/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
new file mode 100644
index 00000000..366dbc5b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch
@@ -0,0 +1,679 @@
+From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 12 Aug 2013 12:50:22 +0200
+Subject: [PATCH] MIPS: partially inline dma ops
+
+Several DMA ops are no-op on many platforms, and the indirection through
+the mips_dma_map_ops function table is causing the compiler to emit
+unnecessary code.
+
+Inlining visibly improves network performance in my tests (on a 24Kc
+based system), and also slightly reduces code size of a few drivers.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/Kconfig                   |   4 +
+ arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
+ arch/mips/mm/dma-default.c          | 163 ++--------------
+ 3 files changed, 373 insertions(+), 154 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -1620,6 +1620,9 @@ config SYS_HAS_CPU_XLR
+ config SYS_HAS_CPU_XLP
+ 	bool
+ 
++config SYS_HAS_DMA_OPS
++	bool
++
+ #
+ # CPU may reorder R->R, R->W, W->R, W->W
+ # Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
+--- a/arch/mips/include/asm/dma-mapping.h
++++ b/arch/mips/include/asm/dma-mapping.h
+@@ -1,9 +1,16 @@
+ #ifndef _ASM_DMA_MAPPING_H
+ #define _ASM_DMA_MAPPING_H
+ 
++#include <linux/kmemcheck.h>
++#include <linux/bug.h>
++#include <linux/scatterlist.h>
++#include <linux/dma-debug.h>
++#include <linux/dma-attrs.h>
++
+ #include <asm/scatterlist.h>
+ #include <asm/dma-coherence.h>
+ #include <asm/cache.h>
++#include <asm/cpu-type.h>
+ #include <asm-generic/dma-coherent.h>
+ 
+ #ifndef CONFIG_SGI_IP27 /* Kludge to fix 2.6.39 build for IP27 */
+@@ -12,12 +19,48 @@
+ 
+ extern struct dma_map_ops *mips_dma_map_ops;
+ 
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction);
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs);
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs);
++
+ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
++#ifdef CONFIG_SYS_HAS_DMA_OPS
+ 	if (dev && dev->archdata.dma_ops)
+ 		return dev->archdata.dma_ops;
+ 	else
+ 		return mips_dma_map_ops;
++#else
++	return NULL;
++#endif
++}
++
++/*
++ * Warning on the terminology - Linux calls an uncached area coherent;
++ * MIPS terminology calls memory areas with hardware maintained coherency
++ * coherent.
++ */
++
++static inline int cpu_needs_post_dma_flush(struct device *dev)
++{
++#ifndef CONFIG_SYS_HAS_CPU_R10000
++	return 0;
++#endif
++	return !plat_device_is_coherent(dev) &&
++	       (boot_cpu_type() == CPU_R10000 ||
++		boot_cpu_type() == CPU_R12000 ||
++		boot_cpu_type() == CPU_BMIPS5000);
++}
++
++static inline struct page *dma_addr_to_page(struct device *dev,
++	dma_addr_t dma_addr)
++{
++	return pfn_to_page(
++		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+ }
+ 
+ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
+@@ -30,12 +73,312 @@ static inline bool dma_capable(struct de
+ 
+ static inline void dma_mark_clean(void *addr, size_t size) {}
+ 
+-#include <asm-generic/dma-mapping-common.h>
++static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
++					      size_t size,
++					      enum dma_data_direction dir,
++					      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	unsigned long offset = (unsigned long)ptr & ~PAGE_MASK;
++	struct page *page = virt_to_page(ptr);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(ptr, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, attrs);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, true);
++	return addr;
++}
++
++static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
++					  size_t size,
++					  enum dma_data_direction dir,
++					  struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, attrs);
++	} else {
++		if (cpu_needs_post_dma_flush(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, true);
++}
++
++static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
++				   int nents, enum dma_data_direction dir,
++				   struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	int i, ents;
++	struct scatterlist *s;
++
++	for_each_sg(sg, s, nents, i)
++		kmemcheck_mark_initialized(sg_virt(s), s->length);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ents = ops->map_sg(dev, sg, nents, dir, attrs);
++	} else {
++		for_each_sg(sg, s, nents, i) {
++			struct page *page = sg_page(s);
++
++			if (!plat_device_is_coherent(dev))
++				__dma_sync(page, s->offset, s->length, dir);
++#ifdef CONFIG_NEED_SG_DMA_LENGTH
++			s->dma_length = s->length;
++#endif
++			s->dma_address =
++				plat_map_dma_mem_page(dev, page) + s->offset;
++		}
++		ents = nents;
++	}
++	debug_dma_map_sg(dev, sg, nents, ents, dir);
++
++	return ents;
++}
++
++static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,
++				      int nents, enum dma_data_direction dir,
++				      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	debug_dma_unmap_sg(dev, sg, nents, dir);
++	if (ops) {
++		ops->unmap_sg(dev, sg, nents, dir, attrs);
++		return;
++	}
++
++	for_each_sg(sg, s, nents, i) {
++		if (!plat_device_is_coherent(dev) && dir != DMA_TO_DEVICE)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++		plat_unmap_dma_mem(dev, s->dma_address, s->length, dir);
++	}
++}
++
++static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
++				      size_t offset, size_t size,
++				      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(page_address(page) + offset, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, NULL);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, false);
++
++	return addr;
++}
++
++static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
++				  size_t size, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, NULL);
++	} else {
++		if (cpu_needs_post_dma_flush(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, false);
++}
++
++static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
++					   size_t size,
++					   enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr, size, dir);
++	else if (cpu_needs_post_dma_flush(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_cpu(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_for_device(struct device *dev,
++					      dma_addr_t addr, size_t size,
++					      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_device(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_range_for_cpu(struct device *dev,
++						 dma_addr_t addr,
++						 unsigned long offset,
++						 size_t size,
++						 enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr + offset, size, dir);
++	else if (cpu_needs_post_dma_flush(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir);
++}
++
++static inline void dma_sync_single_range_for_device(struct device *dev,
++						    dma_addr_t addr,
++						    unsigned long offset,
++						    size_t size,
++						    enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr + offset, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir);
++}
++
++static inline void
++dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
++		    int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_cpu(dev, sg, nelems, dir);
++	else if (cpu_needs_post_dma_flush(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_cpu(dev, sg, nelems, dir);
++}
++
++static inline void
++dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
++		       int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_device(dev, sg, nelems, dir);
++	else if (!plat_device_is_coherent(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_device(dev, sg, nelems, dir);
++
++}
++
++#define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)
++#define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
++#define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL)
++#define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, NULL)
++
++extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
++			   void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++/**
++ * dma_mmap_attrs - map a coherent DMA allocation into user space
++ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
++ * @vma: vm_area_struct describing requested user mapping
++ * @cpu_addr: kernel CPU-view address returned from dma_alloc_attrs
++ * @handle: device-view address returned from dma_alloc_attrs
++ * @size: size of memory originally requested in dma_alloc_attrs
++ * @attrs: attributes of mapping properties requested in dma_alloc_attrs
++ *
++ * Map a coherent DMA buffer previously allocated by dma_alloc_attrs
++ * into user space.  The coherent DMA buffer must not be freed by the
++ * driver until the user space mapping has been released.
++ */
++static inline int
++dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, void *cpu_addr,
++	       dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->mmap)
++		return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
++	return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size);
++}
++
++#define dma_mmap_coherent(d, v, c, h, s) dma_mmap_attrs(d, v, c, h, s, NULL)
++
++static inline int dma_mmap_writecombine(struct device *dev, struct vm_area_struct *vma,
++		      void *cpu_addr, dma_addr_t dma_addr, size_t size)
++{
++	DEFINE_DMA_ATTRS(attrs);
++	dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
++	return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, &attrs);
++}
++
++int
++dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
++		       void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++static inline int
++dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
++		      dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->get_sgtable)
++		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
++					attrs);
++	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
++}
++
++#define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, NULL)
++
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+-	return ops->dma_supported(dev, mask);
++	if (ops)
++		return ops->dma_supported(dev, mask);
++	return plat_dma_supported(dev, mask);
+ }
+ 
+ static inline int dma_mapping_error(struct device *dev, u64 mask)
+@@ -43,7 +386,9 @@ static inline int dma_mapping_error(stru
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	debug_dma_mapping_error(dev, mask);
+-	return ops->mapping_error(dev, mask);
++	if (ops)
++		return ops->mapping_error(dev, mask);
++	return 0;
+ }
+ 
+ static inline int
+@@ -69,7 +414,11 @@ static inline void *dma_alloc_attrs(stru
+ 	void *ret;
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	if (ops)
++		ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	else
++		ret = mips_dma_alloc_coherent(dev, size, dma_handle, gfp,
++					      attrs);
+ 
+ 	debug_dma_alloc_coherent(dev, size, *dma_handle, ret);
+ 
+@@ -84,7 +433,10 @@ static inline void dma_free_attrs(struct
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ops->free(dev, size, vaddr, dma_handle, attrs);
++	if (ops)
++		ops->free(dev, size, vaddr, dma_handle, attrs);
++	else
++		mips_dma_free_coherent(dev, size, vaddr, dma_handle, attrs);
+ 
+ 	debug_dma_free_coherent(dev, size, vaddr, dma_handle);
+ }
+--- a/arch/mips/mm/dma-default.c
++++ b/arch/mips/mm/dma-default.c
+@@ -25,7 +25,7 @@
+ 
+ #ifdef CONFIG_DMA_MAYBE_COHERENT
+ int coherentio = 0;	/* User defined DMA coherency from command line. */
+-EXPORT_SYMBOL_GPL(coherentio);
++EXPORT_SYMBOL(coherentio);
+ int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */
+ 
+ static int __init setcoherentio(char *str)
+@@ -45,30 +45,6 @@ static int __init setnocoherentio(char *
+ early_param("nocoherentio", setnocoherentio);
+ #endif
+ 
+-static inline struct page *dma_addr_to_page(struct device *dev,
+-	dma_addr_t dma_addr)
+-{
+-	return pfn_to_page(
+-		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+-}
+-
+-/*
+- * The affected CPUs below in 'cpu_needs_post_dma_flush()' can
+- * speculatively fill random cachelines with stale data at any time,
+- * requiring an extra flush post-DMA.
+- *
+- * Warning on the terminology - Linux calls an uncached area coherent;
+- * MIPS terminology calls memory areas with hardware maintained coherency
+- * coherent.
+- */
+-static inline int cpu_needs_post_dma_flush(struct device *dev)
+-{
+-	return !plat_device_is_coherent(dev) &&
+-	       (boot_cpu_type() == CPU_R10000 ||
+-		boot_cpu_type() == CPU_R12000 ||
+-		boot_cpu_type() == CPU_BMIPS5000);
+-}
+-
+ static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
+ {
+ 	gfp_t dma_flag;
+@@ -124,8 +100,9 @@ void *dma_alloc_noncoherent(struct devic
+ }
+ EXPORT_SYMBOL(dma_alloc_noncoherent);
+ 
+-static void *mips_dma_alloc_coherent(struct device *dev, size_t size,
+-	dma_addr_t * dma_handle, gfp_t gfp, struct dma_attrs *attrs)
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs)
+ {
+ 	void *ret;
+ 
+@@ -149,6 +126,7 @@ static void *mips_dma_alloc_coherent(str
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(mips_dma_alloc_coherent);
+ 
+ 
+ void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
+@@ -159,8 +137,8 @@ void dma_free_noncoherent(struct device 
+ }
+ EXPORT_SYMBOL(dma_free_noncoherent);
+ 
+-static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
+-	dma_addr_t dma_handle, struct dma_attrs *attrs)
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs)
+ {
+ 	unsigned long addr = (unsigned long) vaddr;
+ 	int order = get_order(size);
+@@ -175,6 +153,7 @@ static void mips_dma_free_coherent(struc
+ 
+ 	free_pages(addr, get_order(size));
+ }
++EXPORT_SYMBOL(mips_dma_free_coherent);
+ 
+ static inline void __dma_sync_virtual(void *addr, size_t size,
+ 	enum dma_data_direction direction)
+@@ -203,8 +182,8 @@ static inline void __dma_sync_virtual(vo
+  * If highmem is not configured then the bulk of this loop gets
+  * optimized out.
+  */
+-static inline void __dma_sync(struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction)
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction)
+ {
+ 	size_t left = size;
+ 
+@@ -233,108 +212,7 @@ static inline void __dma_sync(struct pag
+ 		left -= len;
+ 	} while (left);
+ }
+-
+-static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
+-	size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_addr),
+-			   dma_addr & ~PAGE_MASK, size, direction);
+-
+-	plat_unmap_dma_mem(dev, dma_addr, size, direction);
+-}
+-
+-static int mips_dma_map_sg(struct device *dev, struct scatterlist *sg,
+-	int nents, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nents; i++, sg++) {
+-		if (!plat_device_is_coherent(dev))
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-#ifdef CONFIG_NEED_SG_DMA_LENGTH
+-		sg->dma_length = sg->length;
+-#endif
+-		sg->dma_address = plat_map_dma_mem_page(dev, sg_page(sg)) +
+-				  sg->offset;
+-	}
+-
+-	return nents;
+-}
+-
+-static dma_addr_t mips_dma_map_page(struct device *dev, struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(page, offset, size, direction);
+-
+-	return plat_map_dma_mem_page(dev, page) + offset;
+-}
+-
+-static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
+-	int nhwentries, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nhwentries; i++, sg++) {
+-		if (!plat_device_is_coherent(dev) &&
+-		    direction != DMA_TO_DEVICE)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-		plat_unmap_dma_mem(dev, sg->dma_address, sg->length, direction);
+-	}
+-}
+-
+-static void mips_dma_sync_single_for_cpu(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_single_for_device(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_sg_for_cpu(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	if (cpu_needs_post_dma_flush(dev))
+-		for (i = 0; i < nelems; i++, sg++)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-}
+-
+-static void mips_dma_sync_sg_for_device(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	if (!plat_device_is_coherent(dev))
+-		for (i = 0; i < nelems; i++, sg++)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-}
+-
+-int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+-int mips_dma_supported(struct device *dev, u64 mask)
+-{
+-	return plat_dma_supported(dev, mask);
+-}
++EXPORT_SYMBOL(__dma_sync);
+ 
+ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+ 			 enum dma_data_direction direction)
+@@ -347,23 +225,10 @@ void dma_cache_sync(struct device *dev, 
+ 
+ EXPORT_SYMBOL(dma_cache_sync);
+ 
+-static struct dma_map_ops mips_default_dma_map_ops = {
+-	.alloc = mips_dma_alloc_coherent,
+-	.free = mips_dma_free_coherent,
+-	.map_page = mips_dma_map_page,
+-	.unmap_page = mips_dma_unmap_page,
+-	.map_sg = mips_dma_map_sg,
+-	.unmap_sg = mips_dma_unmap_sg,
+-	.sync_single_for_cpu = mips_dma_sync_single_for_cpu,
+-	.sync_single_for_device = mips_dma_sync_single_for_device,
+-	.sync_sg_for_cpu = mips_dma_sync_sg_for_cpu,
+-	.sync_sg_for_device = mips_dma_sync_sg_for_device,
+-	.mapping_error = mips_dma_mapping_error,
+-	.dma_supported = mips_dma_supported
+-};
+-
+-struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
++#ifdef CONFIG_SYS_HAS_DMA_OPS
++struct dma_map_ops *mips_dma_map_ops = NULL;
+ EXPORT_SYMBOL(mips_dma_map_ops);
++#endif
+ 
+ #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/200-fix_localversion.patch b/trunk/target/linux/generic/patches-3.14/200-fix_localversion.patch
new file mode 100644
index 00000000..70228bb5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- a/scripts/setlocalversion
++++ b/scripts/setlocalversion
+@@ -165,7 +165,7 @@ else
+ 	# annotated or signed tagged state (as git describe only
+ 	# looks at signed or annotated tags - git tag -a/-s) and
+ 	# LOCALVERSION= is not specified
+-	if test "${LOCALVERSION+set}" != "set"; then
++	if test "${CONFIG_LOCALVERSION+set}" != "set"; then
+ 		scm=$(scm_version --short)
+ 		res="$res${scm:++}"
+ 	fi
diff --git a/trunk/target/linux/generic/patches-3.14/201-extra_optimization.patch b/trunk/target/linux/generic/patches-3.14/201-extra_optimization.patch
new file mode 100644
index 00000000..cec343cf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/201-extra_optimization.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -580,9 +580,9 @@ endif # $(dot-config)
+ all: vmlinux
+ 
+ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+-KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)
++KBUILD_CFLAGS	+= -Os $(EXTRA_OPTIMIZATION) $(call cc-disable-warning,maybe-uninitialized,)
+ else
+-KBUILD_CFLAGS	+= -O2
++KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
+ endif
+ 
+ include $(srctree)/arch/$(SRCARCH)/Makefile
diff --git a/trunk/target/linux/generic/patches-3.14/202-reduce_module_size.patch b/trunk/target/linux/generic/patches-3.14/202-reduce_module_size.patch
new file mode 100644
index 00000000..49fe6d53
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/202-reduce_module_size.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -388,7 +388,7 @@ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+ KBUILD_AFLAGS_MODULE  := -DMODULE
+ KBUILD_CFLAGS_MODULE  := -DMODULE
+-KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
++KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s)
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/trunk/target/linux/generic/patches-3.14/203-kallsyms_uncompressed.patch b/trunk/target/linux/generic/patches-3.14/203-kallsyms_uncompressed.patch
new file mode 100644
index 00000000..b365c050
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/203-kallsyms_uncompressed.patch
@@ -0,0 +1,108 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -54,6 +54,7 @@ static struct text_range text_ranges[] =
+ static struct sym_entry *table;
+ static unsigned int table_size, table_cnt;
+ static int all_symbols = 0;
++static int uncompressed = 0;
+ static char symbol_prefix_char = '\0';
+ static unsigned long long kernel_start_addr = 0;
+ 
+@@ -373,6 +374,9 @@ static void write_src(void)
+ 
+ 	free(markers);
+ 
++	if (uncompressed)
++		return;
++
+ 	output_label("kallsyms_token_table");
+ 	off = 0;
+ 	for (i = 0; i < 256; i++) {
+@@ -431,6 +435,9 @@ static void *find_token(unsigned char *s
+ {
+ 	int i;
+ 
++	if (uncompressed)
++		return NULL;
++
+ 	for (i = 0; i < len - 1; i++) {
+ 		if (str[i] == token[0] && str[i+1] == token[1])
+ 			return &str[i];
+@@ -503,6 +510,9 @@ static void optimize_result(void)
+ {
+ 	int i, best;
+ 
++	if (uncompressed)
++		return;
++
+ 	/* using the '\0' symbol last allows compress_symbols to use standard
+ 	 * fast string functions */
+ 	for (i = 255; i >= 0; i--) {
+@@ -662,7 +672,9 @@ int main(int argc, char **argv)
+ 			} else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+ 				const char *p = &argv[i][14];
+ 				kernel_start_addr = strtoull(p, NULL, 16);
+-			} else
++			} else if (strcmp(argv[i], "--uncompressed") == 0)
++				uncompressed = 1;
++			else
+ 				usage();
+ 		}
+ 	} else if (argc != 1)
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1270,6 +1270,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+ 	  the unaligned access emulation.
+ 	  see arch/parisc/kernel/unaligned.c for reference
+ 
++config KALLSYMS_UNCOMPRESSED
++	bool "Keep kallsyms uncompressed"
++	depends on KALLSYMS
++	help
++		Normally kallsyms contains compressed symbols (using a token table),
++		reducing the uncompressed kernel image size. Keeping the symbol table
++		uncompressed significantly improves the size of this part in compressed
++		kernel images.
++
++		Say N unless you need compressed kernel images to be small.
++
+ config HAVE_PCSPKR_PLATFORM
+ 	bool
+ 
+--- a/scripts/link-vmlinux.sh
++++ b/scripts/link-vmlinux.sh
+@@ -86,6 +86,10 @@ kallsyms()
+ 		kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+ 	fi
+ 
++	if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
++		kallsymopt="${kallsymopt} --uncompressed"
++	fi
++
+ 	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
+ 		      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+ 
+--- a/kernel/kallsyms.c
++++ b/kernel/kallsyms.c
+@@ -108,6 +108,11 @@ static unsigned int kallsyms_expand_symb
+ 	 * For every byte on the compressed symbol data, copy the table
+ 	 * entry for that byte.
+ 	 */
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	memcpy(result, data + 1, len - 1);
++	result += len - 1;
++	len = 0;
++#endif
+ 	while (len) {
+ 		tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
+ 		data++;
+@@ -140,6 +145,9 @@ tail:
+  */
+ static char kallsyms_get_symbol_type(unsigned int off)
+ {
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	return kallsyms_names[off + 1];
++#endif
+ 	/*
+ 	 * Get just the first code, look it up in the token table,
+ 	 * and return the first char from this token.
diff --git a/trunk/target/linux/generic/patches-3.14/204-module_strip.patch b/trunk/target/linux/generic/patches-3.14/204-module_strip.patch
new file mode 100644
index 00000000..d6aa3592
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/204-module_strip.patch
@@ -0,0 +1,200 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] build: add a hack for removing non-essential module info
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -82,7 +82,7 @@ void sort_extable(struct exception_table
+ void sort_main_extable(void);
+ void trim_init_extable(struct module *m);
+ 
+-#ifdef MODULE
++#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
+ #define MODULE_GENERIC_TABLE(gtype, name)			\
+ extern const struct gtype##_id __mod_##gtype##_table		\
+   __attribute__ ((unused, alias(__stringify(name))))
+@@ -93,9 +93,10 @@ extern const struct gtype##_id __mod_##g
+ 
+ /* Generic info of form tag = "info" */
+ #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
++#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
+ 
+ /* For userspace: you can also call me... */
+-#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
++#define MODULE_ALIAS(_alias) MODULE_INFO_STRIP(alias, _alias)
+ 
+ /* Soft module dependencies. See man modprobe.d for details.
+  * Example: MODULE_SOFTDEP("pre: module-foo module-bar post: module-baz")
+@@ -136,10 +137,10 @@ extern const struct gtype##_id __mod_##g
+  * Author(s), use "Name <email>" or just "Name", for multiple
+  * authors use multiple MODULE_AUTHOR() statements/lines.
+  */
+-#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
++#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
+ 
+ /* What your module does. */
+-#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
++#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
+ 
+ #define MODULE_DEVICE_TABLE(type, name)		\
+   MODULE_GENERIC_TABLE(type##_device, name)
+@@ -162,7 +163,9 @@ extern const struct gtype##_id __mod_##g
+  */
+ 
+ #if defined(MODULE) || !defined(CONFIG_SYSFS)
+-#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
++#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
++#elif defined(CONFIG_MODULE_STRIPPED)
++#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
+ #else
+ #define MODULE_VERSION(_version)					\
+ 	static struct module_version_attribute ___modver_attr = {	\
+@@ -184,7 +187,7 @@ extern const struct gtype##_id __mod_##g
+ /* Optional firmware file (or files) needed by the module
+  * format is simply firmware file name.  Multiple firmware
+  * files require multiple MODULE_FIRMWARE() specifiers */
+-#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
++#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
+ 
+ /* Given an address, look for it in the exception tables */
+ const struct exception_table_entry *search_exception_tables(unsigned long add);
+--- a/include/linux/moduleparam.h
++++ b/include/linux/moduleparam.h
+@@ -16,6 +16,16 @@
+ /* Chosen so that structs with an unsigned long line up. */
+ #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
+ 
++/* This struct is here for syntactic coherency, it is not used */
++#define __MODULE_INFO_DISABLED(name)					  \
++  struct __UNIQUE_ID(name) {}
++
++#ifdef CONFIG_MODULE_STRIPPED
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
++#else
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
++#endif
++
+ #ifdef MODULE
+ #define __MODULE_INFO(tag, name, info)					  \
+ static const char __UNIQUE_ID(name)[]					  \
+@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]			
+   = __stringify(tag) "=" info
+ #else  /* !MODULE */
+ /* This struct is here for syntactic coherency, it is not used */
+-#define __MODULE_INFO(tag, name, info)					  \
+-  struct __UNIQUE_ID(name) {}
++#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name)
+ #endif
+ #define __MODULE_PARM_TYPE(name, _type)					  \
+   __MODULE_INFO(parmtype, name##type, #name ":" _type)
+@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]			
+ /* One for each parameter, describing how to use it.  Some files do
+    multiple of these per line, so can't just use MODULE_INFO. */
+ #define MODULE_PARM_DESC(_parm, desc) \
+-	__MODULE_INFO(parm, _parm, #_parm ":" desc)
++	__MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
+ 
+ struct kernel_param;
+ 
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1831,6 +1831,13 @@ config MODULE_SIG_HASH
+ 	default "sha384" if MODULE_SIG_SHA384
+ 	default "sha512" if MODULE_SIG_SHA512
+ 
++config MODULE_STRIPPED
++	bool "Reduce module size"
++	depends on MODULES
++	help
++	  Remove module parameter descriptions, author info, version, aliases,
++	  device tables, etc.
++
+ endif # MODULES
+ 
+ config INIT_ALL_POSSIBLE
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2663,6 +2663,7 @@ static struct module *setup_load_info(st
+ 
+ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	const char *modmagic = get_modinfo(info, "vermagic");
+ 	int err;
+ 
+@@ -2688,6 +2689,7 @@ static int check_modinfo(struct module *
+ 		pr_warn("%s: module is from the staging directory, the quality "
+ 			"is unknown, you have been warned.\n", mod->name);
+ 	}
++#endif
+ 
+ 	/* Set up license info based on the info section */
+ 	set_license(mod, get_modinfo(info, "license"));
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -1734,7 +1734,9 @@ static void read_symbols(char *modname)
+ 		symname = info.strtab + sym->st_name;
+ 
+ 		handle_modversions(mod, &info, sym, symname);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		handle_moddevtable(mod, &info, sym, symname);
++#endif
+ 	}
+ 	if (!is_vmlinux(modname) ||
+ 	     (is_vmlinux(modname) && vmlinux_section_warnings))
+@@ -1878,7 +1880,9 @@ static void add_header(struct buffer *b,
+ 	buf_printf(b, "#include <linux/vermagic.h>\n");
+ 	buf_printf(b, "#include <linux/compiler.h>\n");
+ 	buf_printf(b, "\n");
++#ifndef CONFIG_MODULE_STRIPPED
+ 	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
++#endif
+ 	buf_printf(b, "\n");
+ 	buf_printf(b, "__visible struct module __this_module\n");
+ 	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
+@@ -1895,16 +1899,20 @@ static void add_header(struct buffer *b,
+ 
+ static void add_intree_flag(struct buffer *b, int is_intree)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (is_intree)
+ 		buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
++#endif
+ }
+ 
+ static void add_staging_flag(struct buffer *b, const char *name)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	static const char *staging_dir = "drivers/staging";
+ 
+ 	if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
+ 		buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
++#endif
+ }
+ 
+ /**
+@@ -1997,11 +2005,13 @@ static void add_depends(struct buffer *b
+ 
+ static void add_srcversion(struct buffer *b, struct module *mod)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (mod->srcversion[0]) {
+ 		buf_printf(b, "\n");
+ 		buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
+ 			   mod->srcversion);
+ 	}
++#endif
+ }
+ 
+ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -2230,7 +2240,9 @@ int main(int argc, char **argv)
+ 		add_staging_flag(&buf, mod->name);
+ 		err |= add_versions(&buf, mod);
+ 		add_depends(&buf, mod, modules);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		add_moddevtable(&buf, mod);
++#endif
+ 		add_srcversion(&buf, mod);
+ 
+ 		sprintf(fname, "%s.mod.c", mod->name);
diff --git a/trunk/target/linux/generic/patches-3.14/210-darwin_scripts_include.patch b/trunk/target/linux/generic/patches-3.14/210-darwin_scripts_include.patch
new file mode 100644
index 00000000..f358e0a0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/210-darwin_scripts_include.patch
@@ -0,0 +1,3088 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -22,6 +22,35 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef __APPLE__
++/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
++void *memmem (const void *haystack, size_t haystack_len,
++                          const void *needle,  size_t needle_len)
++{
++  const char *begin;
++  const char *const last_possible
++    = (const char *) haystack + haystack_len - needle_len;
++
++  if (needle_len == 0)
++    /* The first occurrence of the empty string is deemed to occur at
++       the beginning of the string.  */
++    return (void *) haystack;
++
++  /* Sanity check, otherwise the loop might search through the whole
++     memory.  */
++  if (__builtin_expect (haystack_len < needle_len, 0))
++    return NULL;
++
++  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
++    if (begin[0] == ((const char *) needle)[0] &&
++        !memcmp ((const void *) &begin[1],
++                 (const void *) ((const char *) needle + 1),
++                 needle_len - 1))
++      return (void *) begin;
++
++  return NULL;
++}
++#endif
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -132,6 +132,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
+ # we really need to do so. (Do not call gcc as part of make mrproper)
+ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
+                     -DLOCALE
++ifeq ($(shell uname -s),Darwin)
++HOST_LOADLIBES  += -lncurses
++endif
+ 
+ # ===========================================================================
+ # Shared Makefile for the various kconfig executables:
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c
+@@ -1,7 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __APPLE__
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ int
+ main(int argc, char **argv)
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -7,7 +7,11 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ #include "elfconfig.h"
+ 
+--- /dev/null
++++ b/scripts/mod/elf.h
+@@ -0,0 +1,3007 @@
++/* This file defines standard ELF types, structures, and macros.
++   Copyright (C) 1995-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _ELF_H
++#define	_ELF_H 1
++
++/* Standard ELF types.  */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity.  */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities.  */
++typedef uint32_t Elf32_Word;
++typedef	int32_t  Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef	int32_t  Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities.  */
++typedef uint64_t Elf32_Xword;
++typedef	int64_t  Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef	int64_t  Elf64_Sxword;
++
++/* Type of addresses.  */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets.  */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities.  */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information.  */
++typedef Elf32_Half Elf32_Versym;
++typedef Elf64_Half Elf64_Versym;
++
++
++/* The ELF file header.  This appears at the start of every ELF file.  */
++
++#define EI_NIDENT (16)
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf32_Half	e_type;			/* Object file type */
++  Elf32_Half	e_machine;		/* Architecture */
++  Elf32_Word	e_version;		/* Object file version */
++  Elf32_Addr	e_entry;		/* Entry point virtual address */
++  Elf32_Off	e_phoff;		/* Program header table file offset */
++  Elf32_Off	e_shoff;		/* Section header table file offset */
++  Elf32_Word	e_flags;		/* Processor-specific flags */
++  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf32_Half	e_phentsize;		/* Program header table entry size */
++  Elf32_Half	e_phnum;		/* Program header table entry count */
++  Elf32_Half	e_shentsize;		/* Section header table entry size */
++  Elf32_Half	e_shnum;		/* Section header table entry count */
++  Elf32_Half	e_shstrndx;		/* Section header string table index */
++} Elf32_Ehdr;
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf64_Half	e_type;			/* Object file type */
++  Elf64_Half	e_machine;		/* Architecture */
++  Elf64_Word	e_version;		/* Object file version */
++  Elf64_Addr	e_entry;		/* Entry point virtual address */
++  Elf64_Off	e_phoff;		/* Program header table file offset */
++  Elf64_Off	e_shoff;		/* Section header table file offset */
++  Elf64_Word	e_flags;		/* Processor-specific flags */
++  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf64_Half	e_phentsize;		/* Program header table entry size */
++  Elf64_Half	e_phnum;		/* Program header table entry count */
++  Elf64_Half	e_shentsize;		/* Section header table entry size */
++  Elf64_Half	e_shnum;		/* Section header table entry count */
++  Elf64_Half	e_shstrndx;		/* Section header string table index */
++} Elf64_Ehdr;
++
++/* Fields in the e_ident array.  The EI_* macros are indices into the
++   array.  The macros under each EI_* macro are the values the byte
++   may have.  */
++
++#define EI_MAG0		0		/* File identification byte 0 index */
++#define ELFMAG0		0x7f		/* Magic number byte 0 */
++
++#define EI_MAG1		1		/* File identification byte 1 index */
++#define ELFMAG1		'E'		/* Magic number byte 1 */
++
++#define EI_MAG2		2		/* File identification byte 2 index */
++#define ELFMAG2		'L'		/* Magic number byte 2 */
++
++#define EI_MAG3		3		/* File identification byte 3 index */
++#define ELFMAG3		'F'		/* Magic number byte 3 */
++
++/* Conglomeration of the identification bytes, for easy testing as a word.  */
++#define	ELFMAG		"\177ELF"
++#define	SELFMAG		4
++
++#define EI_CLASS	4		/* File class byte index */
++#define ELFCLASSNONE	0		/* Invalid class */
++#define ELFCLASS32	1		/* 32-bit objects */
++#define ELFCLASS64	2		/* 64-bit objects */
++#define ELFCLASSNUM	3
++
++#define EI_DATA		5		/* Data encoding byte index */
++#define ELFDATANONE	0		/* Invalid data encoding */
++#define ELFDATA2LSB	1		/* 2's complement, little endian */
++#define ELFDATA2MSB	2		/* 2's complement, big endian */
++#define ELFDATANUM	3
++
++#define EI_VERSION	6		/* File version byte index */
++					/* Value must be EV_CURRENT */
++
++#define EI_OSABI	7		/* OS ABI identification */
++#define ELFOSABI_NONE		0	/* UNIX System V ABI */
++#define ELFOSABI_SYSV		0	/* Alias.  */
++#define ELFOSABI_HPUX		1	/* HP-UX */
++#define ELFOSABI_NETBSD		2	/* NetBSD.  */
++#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
++#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
++#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
++#define ELFOSABI_AIX		7	/* IBM AIX.  */
++#define ELFOSABI_IRIX		8	/* SGI Irix.  */
++#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
++#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
++#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
++#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
++#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
++#define ELFOSABI_ARM		97	/* ARM */
++#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
++
++#define EI_ABIVERSION	8		/* ABI version */
++
++#define EI_PAD		9		/* Byte index of padding bytes */
++
++/* Legal values for e_type (object file type).  */
++
++#define ET_NONE		0		/* No file type */
++#define ET_REL		1		/* Relocatable file */
++#define ET_EXEC		2		/* Executable file */
++#define ET_DYN		3		/* Shared object file */
++#define ET_CORE		4		/* Core file */
++#define	ET_NUM		5		/* Number of defined types */
++#define ET_LOOS		0xfe00		/* OS-specific range start */
++#define ET_HIOS		0xfeff		/* OS-specific range end */
++#define ET_LOPROC	0xff00		/* Processor-specific range start */
++#define ET_HIPROC	0xffff		/* Processor-specific range end */
++
++/* Legal values for e_machine (architecture).  */
++
++#define EM_NONE		 0		/* No machine */
++#define EM_M32		 1		/* AT&T WE 32100 */
++#define EM_SPARC	 2		/* SUN SPARC */
++#define EM_386		 3		/* Intel 80386 */
++#define EM_68K		 4		/* Motorola m68k family */
++#define EM_88K		 5		/* Motorola m88k family */
++#define EM_860		 7		/* Intel 80860 */
++#define EM_MIPS		 8		/* MIPS R3000 big-endian */
++#define EM_S370		 9		/* IBM System/370 */
++#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
++
++#define EM_PARISC	15		/* HPPA */
++#define EM_VPP500	17		/* Fujitsu VPP500 */
++#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
++#define EM_960		19		/* Intel 80960 */
++#define EM_PPC		20		/* PowerPC */
++#define EM_PPC64	21		/* PowerPC 64-bit */
++#define EM_S390		22		/* IBM S390 */
++
++#define EM_V800		36		/* NEC V800 series */
++#define EM_FR20		37		/* Fujitsu FR20 */
++#define EM_RH32		38		/* TRW RH-32 */
++#define EM_RCE		39		/* Motorola RCE */
++#define EM_ARM		40		/* ARM */
++#define EM_FAKE_ALPHA	41		/* Digital Alpha */
++#define EM_SH		42		/* Hitachi SH */
++#define EM_SPARCV9	43		/* SPARC v9 64-bit */
++#define EM_TRICORE	44		/* Siemens Tricore */
++#define EM_ARC		45		/* Argonaut RISC Core */
++#define EM_H8_300	46		/* Hitachi H8/300 */
++#define EM_H8_300H	47		/* Hitachi H8/300H */
++#define EM_H8S		48		/* Hitachi H8S */
++#define EM_H8_500	49		/* Hitachi H8/500 */
++#define EM_IA_64	50		/* Intel Merced */
++#define EM_MIPS_X	51		/* Stanford MIPS-X */
++#define EM_COLDFIRE	52		/* Motorola Coldfire */
++#define EM_68HC12	53		/* Motorola M68HC12 */
++#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP		55		/* Siemens PCP */
++#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
++#define EM_NDR1		57		/* Denso NDR1 microprocessor */
++#define EM_STARCORE	58		/* Motorola Start*Core processor */
++#define EM_ME16		59		/* Toyota ME16 processor */
++#define EM_ST100	60		/* STMicroelectronic ST100 processor */
++#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64	62		/* AMD x86-64 architecture */
++#define EM_PDSP		63		/* Sony DSP Processor */
++
++#define EM_FX66		66		/* Siemens FX66 microcontroller */
++#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
++#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
++#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
++#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
++#define EM_SVX		73		/* Silicon Graphics SVx */
++#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX		75		/* Digital VAX */
++#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
++#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY	81		/* Harvard University machine-independent object files */
++#define EM_PRISM	82		/* SiTera Prism */
++#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
++#define EM_FR30		84		/* Fujitsu FR30 */
++#define EM_D10V		85		/* Mitsubishi D10V */
++#define EM_D30V		86		/* Mitsubishi D30V */
++#define EM_V850		87		/* NEC v850 */
++#define EM_M32R		88		/* Mitsubishi M32R */
++#define EM_MN10300	89		/* Matsushita MN10300 */
++#define EM_MN10200	90		/* Matsushita MN10200 */
++#define EM_PJ		91		/* picoJava */
++#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
++#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
++#define EM_TILEPRO	188		/* Tilera TILEPro */
++#define EM_TILEGX	191		/* Tilera TILE-Gx */
++#define EM_NUM		192
++
++/* If it is necessary to assign new unofficial EM_* values, please
++   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
++   chances of collision with official or non-GNU unofficial values.  */
++
++#define EM_ALPHA	0x9026
++
++/* Legal values for e_version (version).  */
++
++#define EV_NONE		0		/* Invalid ELF version */
++#define EV_CURRENT	1		/* Current version */
++#define EV_NUM		2
++
++/* Section header.  */
++
++typedef struct
++{
++  Elf32_Word	sh_name;		/* Section name (string tbl index) */
++  Elf32_Word	sh_type;		/* Section type */
++  Elf32_Word	sh_flags;		/* Section flags */
++  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf32_Off	sh_offset;		/* Section file offset */
++  Elf32_Word	sh_size;		/* Section size in bytes */
++  Elf32_Word	sh_link;		/* Link to another section */
++  Elf32_Word	sh_info;		/* Additional section information */
++  Elf32_Word	sh_addralign;		/* Section alignment */
++  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
++} Elf32_Shdr;
++
++typedef struct
++{
++  Elf64_Word	sh_name;		/* Section name (string tbl index) */
++  Elf64_Word	sh_type;		/* Section type */
++  Elf64_Xword	sh_flags;		/* Section flags */
++  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf64_Off	sh_offset;		/* Section file offset */
++  Elf64_Xword	sh_size;		/* Section size in bytes */
++  Elf64_Word	sh_link;		/* Link to another section */
++  Elf64_Word	sh_info;		/* Additional section information */
++  Elf64_Xword	sh_addralign;		/* Section alignment */
++  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
++} Elf64_Shdr;
++
++/* Special section indices.  */
++
++#define SHN_UNDEF	0		/* Undefined section */
++#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
++#define SHN_LOPROC	0xff00		/* Start of processor-specific */
++#define SHN_BEFORE	0xff00		/* Order section before all others
++					   (Solaris).  */
++#define SHN_AFTER	0xff01		/* Order section after all others
++					   (Solaris).  */
++#define SHN_HIPROC	0xff1f		/* End of processor-specific */
++#define SHN_LOOS	0xff20		/* Start of OS-specific */
++#define SHN_HIOS	0xff3f		/* End of OS-specific */
++#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
++#define SHN_COMMON	0xfff2		/* Associated symbol is common */
++#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
++#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
++
++/* Legal values for sh_type (section type).  */
++
++#define SHT_NULL	  0		/* Section header table entry unused */
++#define SHT_PROGBITS	  1		/* Program data */
++#define SHT_SYMTAB	  2		/* Symbol table */
++#define SHT_STRTAB	  3		/* String table */
++#define SHT_RELA	  4		/* Relocation entries with addends */
++#define SHT_HASH	  5		/* Symbol hash table */
++#define SHT_DYNAMIC	  6		/* Dynamic linking information */
++#define SHT_NOTE	  7		/* Notes */
++#define SHT_NOBITS	  8		/* Program space with no data (bss) */
++#define SHT_REL		  9		/* Relocation entries, no addends */
++#define SHT_SHLIB	  10		/* Reserved */
++#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
++#define SHT_INIT_ARRAY	  14		/* Array of constructors */
++#define SHT_FINI_ARRAY	  15		/* Array of destructors */
++#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
++#define SHT_GROUP	  17		/* Section group */
++#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
++#define	SHT_NUM		  19		/* Number of defined types.  */
++#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
++#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
++#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
++#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
++#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
++#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
++#define SHT_SUNW_move	  0x6ffffffa
++#define SHT_SUNW_COMDAT   0x6ffffffb
++#define SHT_SUNW_syminfo  0x6ffffffc
++#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
++#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
++#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
++#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
++#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
++#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
++#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
++#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
++#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
++
++/* Legal values for sh_flags (section flags).  */
++
++#define SHF_WRITE	     (1 << 0)	/* Writable */
++#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
++#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
++#define SHF_MERGE	     (1 << 4)	/* Might be merged */
++#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
++#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
++#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
++#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
++					   required */
++#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
++#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
++#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
++#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
++#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
++					   (Solaris).  */
++#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
++					   referenced or allocated (Solaris).*/
++
++/* Section group handling.  */
++#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
++
++/* Symbol table entry.  */
++
++typedef struct
++{
++  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
++  Elf32_Addr	st_value;		/* Symbol value */
++  Elf32_Word	st_size;		/* Symbol size */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char	st_other;		/* Symbol visibility */
++  Elf32_Section	st_shndx;		/* Section index */
++} Elf32_Sym;
++
++typedef struct
++{
++  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char st_other;		/* Symbol visibility */
++  Elf64_Section	st_shndx;		/* Section index */
++  Elf64_Addr	st_value;		/* Symbol value */
++  Elf64_Xword	st_size;		/* Symbol size */
++} Elf64_Sym;
++
++/* The syminfo section if available contains additional information about
++   every dynamic symbol.  */
++
++typedef struct
++{
++  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf32_Half si_flags;			/* Per symbol flags */
++} Elf32_Syminfo;
++
++typedef struct
++{
++  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf64_Half si_flags;			/* Per symbol flags */
++} Elf64_Syminfo;
++
++/* Possible values for si_boundto.  */
++#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
++#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
++#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
++
++/* Possible bitmasks for si_flags.  */
++#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
++#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
++#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
++#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
++					   loaded */
++/* Syminfo version values.  */
++#define SYMINFO_NONE		0
++#define SYMINFO_CURRENT		1
++#define SYMINFO_NUM		2
++
++
++/* How to extract and insert information held in the st_info field.  */
++
++#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
++#define ELF32_ST_TYPE(val)		((val) & 0xf)
++#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
++
++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
++#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
++#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
++#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
++
++/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
++
++#define STB_LOCAL	0		/* Local symbol */
++#define STB_GLOBAL	1		/* Global symbol */
++#define STB_WEAK	2		/* Weak symbol */
++#define	STB_NUM		3		/* Number of defined types.  */
++#define STB_LOOS	10		/* Start of OS-specific */
++#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
++#define STB_HIOS	12		/* End of OS-specific */
++#define STB_LOPROC	13		/* Start of processor-specific */
++#define STB_HIPROC	15		/* End of processor-specific */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_NOTYPE	0		/* Symbol type is unspecified */
++#define STT_OBJECT	1		/* Symbol is a data object */
++#define STT_FUNC	2		/* Symbol is a code object */
++#define STT_SECTION	3		/* Symbol associated with a section */
++#define STT_FILE	4		/* Symbol's name is file name */
++#define STT_COMMON	5		/* Symbol is a common data object */
++#define STT_TLS		6		/* Symbol is thread-local data object*/
++#define	STT_NUM		7		/* Number of defined types.  */
++#define STT_LOOS	10		/* Start of OS-specific */
++#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
++#define STT_HIOS	12		/* End of OS-specific */
++#define STT_LOPROC	13		/* Start of processor-specific */
++#define STT_HIPROC	15		/* End of processor-specific */
++
++
++/* Symbol table indices are found in the hash buckets and chain table
++   of a symbol hash table section.  This special index value indicates
++   the end of a chain, meaning no further symbols are found in that bucket.  */
++
++#define STN_UNDEF	0		/* End of a chain.  */
++
++
++/* How to extract and insert information held in the st_other field.  */
++
++#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
++
++/* For ELF64 the definitions are the same.  */
++#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
++
++/* Symbol visibility specification encoded in the st_other field.  */
++#define STV_DEFAULT	0		/* Default symbol visibility rules */
++#define STV_INTERNAL	1		/* Processor specific hidden class */
++#define STV_HIDDEN	2		/* Sym unavailable in other modules */
++#define STV_PROTECTED	3		/* Not preemptible, not exported */
++
++
++/* Relocation table entry without addend (in section of type SHT_REL).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++} Elf32_Rel;
++
++/* I have seen two different definitions of the Elf64_Rel and
++   Elf64_Rela structures, so we'll leave them out until Novell (or
++   whoever) gets their act together.  */
++/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++} Elf64_Rel;
++
++/* Relocation table entry with addend (in section of type SHT_RELA).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++  Elf32_Sword	r_addend;		/* Addend */
++} Elf32_Rela;
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++  Elf64_Sxword	r_addend;		/* Addend */
++} Elf64_Rela;
++
++/* How to extract and insert information held in the r_info field.  */
++
++#define ELF32_R_SYM(val)		((val) >> 8)
++#define ELF32_R_TYPE(val)		((val) & 0xff)
++#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
++
++#define ELF64_R_SYM(i)			((i) >> 32)
++#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
++#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
++
++/* Program segment header.  */
++
++typedef struct
++{
++  Elf32_Word	p_type;			/* Segment type */
++  Elf32_Off	p_offset;		/* Segment file offset */
++  Elf32_Addr	p_vaddr;		/* Segment virtual address */
++  Elf32_Addr	p_paddr;		/* Segment physical address */
++  Elf32_Word	p_filesz;		/* Segment size in file */
++  Elf32_Word	p_memsz;		/* Segment size in memory */
++  Elf32_Word	p_flags;		/* Segment flags */
++  Elf32_Word	p_align;		/* Segment alignment */
++} Elf32_Phdr;
++
++typedef struct
++{
++  Elf64_Word	p_type;			/* Segment type */
++  Elf64_Word	p_flags;		/* Segment flags */
++  Elf64_Off	p_offset;		/* Segment file offset */
++  Elf64_Addr	p_vaddr;		/* Segment virtual address */
++  Elf64_Addr	p_paddr;		/* Segment physical address */
++  Elf64_Xword	p_filesz;		/* Segment size in file */
++  Elf64_Xword	p_memsz;		/* Segment size in memory */
++  Elf64_Xword	p_align;		/* Segment alignment */
++} Elf64_Phdr;
++
++/* Special value for e_phnum.  This indicates that the real number of
++   program headers is too large to fit into e_phnum.  Instead the real
++   value is in the field sh_info of section 0.  */
++
++#define PN_XNUM		0xffff
++
++/* Legal values for p_type (segment type).  */
++
++#define	PT_NULL		0		/* Program header table entry unused */
++#define PT_LOAD		1		/* Loadable program segment */
++#define PT_DYNAMIC	2		/* Dynamic linking information */
++#define PT_INTERP	3		/* Program interpreter */
++#define PT_NOTE		4		/* Auxiliary information */
++#define PT_SHLIB	5		/* Reserved */
++#define PT_PHDR		6		/* Entry for header table itself */
++#define PT_TLS		7		/* Thread-local storage segment */
++#define	PT_NUM		8		/* Number of defined types */
++#define PT_LOOS		0x60000000	/* Start of OS-specific */
++#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
++#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
++#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
++#define PT_LOSUNW	0x6ffffffa
++#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
++#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
++#define PT_HISUNW	0x6fffffff
++#define PT_HIOS		0x6fffffff	/* End of OS-specific */
++#define PT_LOPROC	0x70000000	/* Start of processor-specific */
++#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
++
++/* Legal values for p_flags (segment flags).  */
++
++#define PF_X		(1 << 0)	/* Segment is executable */
++#define PF_W		(1 << 1)	/* Segment is writable */
++#define PF_R		(1 << 2)	/* Segment is readable */
++#define PF_MASKOS	0x0ff00000	/* OS-specific */
++#define PF_MASKPROC	0xf0000000	/* Processor-specific */
++
++/* Legal values for note segment descriptor types for core files. */
++
++#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
++#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
++#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
++#define NT_PRXREG	4		/* Contains copy of prxregset struct */
++#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
++#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
++#define NT_AUXV		6		/* Contains copy of auxv array */
++#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
++#define NT_ASRS		8		/* Contains copy of asrset struct */
++#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
++#define NT_PSINFO	13		/* Contains copy of psinfo struct */
++#define NT_PRCRED	14		/* Contains copy of prcred struct */
++#define NT_UTSNAME	15		/* Contains copy of utsname struct */
++#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
++#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
++#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
++#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
++#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
++#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
++#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
++#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
++#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
++#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
++
++/* Legal values for the note segment descriptor types for object files.  */
++
++#define NT_VERSION	1		/* Contains a version string.  */
++
++
++/* Dynamic section entry.  */
++
++typedef struct
++{
++  Elf32_Sword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf32_Word d_val;			/* Integer value */
++      Elf32_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf32_Dyn;
++
++typedef struct
++{
++  Elf64_Sxword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf64_Xword d_val;		/* Integer value */
++      Elf64_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf64_Dyn;
++
++/* Legal values for d_tag (dynamic entry type).  */
++
++#define DT_NULL		0		/* Marks end of dynamic section */
++#define DT_NEEDED	1		/* Name of needed library */
++#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
++#define DT_PLTGOT	3		/* Processor defined value */
++#define DT_HASH		4		/* Address of symbol hash table */
++#define DT_STRTAB	5		/* Address of string table */
++#define DT_SYMTAB	6		/* Address of symbol table */
++#define DT_RELA		7		/* Address of Rela relocs */
++#define DT_RELASZ	8		/* Total size of Rela relocs */
++#define DT_RELAENT	9		/* Size of one Rela reloc */
++#define DT_STRSZ	10		/* Size of string table */
++#define DT_SYMENT	11		/* Size of one symbol table entry */
++#define DT_INIT		12		/* Address of init function */
++#define DT_FINI		13		/* Address of termination function */
++#define DT_SONAME	14		/* Name of shared object */
++#define DT_RPATH	15		/* Library search path (deprecated) */
++#define DT_SYMBOLIC	16		/* Start symbol search here */
++#define DT_REL		17		/* Address of Rel relocs */
++#define DT_RELSZ	18		/* Total size of Rel relocs */
++#define DT_RELENT	19		/* Size of one Rel reloc */
++#define DT_PLTREL	20		/* Type of reloc in PLT */
++#define DT_DEBUG	21		/* For debugging; unspecified */
++#define DT_TEXTREL	22		/* Reloc might modify .text */
++#define DT_JMPREL	23		/* Address of PLT relocs */
++#define	DT_BIND_NOW	24		/* Process relocations of object */
++#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
++#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
++#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
++#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
++#define DT_RUNPATH	29		/* Library search path */
++#define DT_FLAGS	30		/* Flags for the object being loaded */
++#define DT_ENCODING	32		/* Start of encoded range */
++#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
++#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
++#define	DT_NUM		34		/* Number used */
++#define DT_LOOS		0x6000000d	/* Start of OS-specific */
++#define DT_HIOS		0x6ffff000	/* End of OS-specific */
++#define DT_LOPROC	0x70000000	/* Start of processor-specific */
++#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
++#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
++
++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
++   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
++   approach.  */
++#define DT_VALRNGLO	0x6ffffd00
++#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
++#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
++#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
++#define DT_CHECKSUM	0x6ffffdf8
++#define DT_PLTPADSZ	0x6ffffdf9
++#define DT_MOVEENT	0x6ffffdfa
++#define DT_MOVESZ	0x6ffffdfb
++#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
++#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
++					   the following DT_* entry.  */
++#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
++#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
++#define DT_VALRNGHI	0x6ffffdff
++#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
++#define DT_VALNUM 12
++
++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
++   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
++
++   If any adjustment is made to the ELF object after it has been
++   built these entries will need to be adjusted.  */
++#define DT_ADDRRNGLO	0x6ffffe00
++#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
++#define DT_TLSDESC_PLT	0x6ffffef6
++#define DT_TLSDESC_GOT	0x6ffffef7
++#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
++#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
++#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
++#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
++#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
++#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
++#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
++#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
++#define DT_ADDRRNGHI	0x6ffffeff
++#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
++#define DT_ADDRNUM 11
++
++/* The versioning entry types.  The next are defined as part of the
++   GNU extension.  */
++#define DT_VERSYM	0x6ffffff0
++
++#define DT_RELACOUNT	0x6ffffff9
++#define DT_RELCOUNT	0x6ffffffa
++
++/* These were chosen by Sun.  */
++#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
++#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
++					   table */
++#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
++#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
++					   versions */
++#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
++#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
++#define DT_VERSIONTAGNUM 16
++
++/* Sun added these machine-independent extensions in the "processor-specific"
++   range.  Be compatible.  */
++#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
++#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
++#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
++#define DT_EXTRANUM	3
++
++/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
++#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
++#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
++#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
++#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
++#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
++
++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
++   entry in the dynamic section.  */
++#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
++#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
++#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
++#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
++#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
++#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
++#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
++#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
++#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
++#define DF_1_TRANS	0x00000200
++#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
++#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
++#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
++#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
++#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
++#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
++#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
++
++/* Flags for the feature selection in DT_FEATURE_1.  */
++#define DTF_1_PARINIT	0x00000001
++#define DTF_1_CONFEXP	0x00000002
++
++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
++#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
++#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
++					   generally available.  */
++
++/* Version definition sections.  */
++
++typedef struct
++{
++  Elf32_Half	vd_version;		/* Version revision */
++  Elf32_Half	vd_flags;		/* Version information */
++  Elf32_Half	vd_ndx;			/* Version Index */
++  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vd_hash;		/* Version name hash value */
++  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf32_Verdef;
++
++typedef struct
++{
++  Elf64_Half	vd_version;		/* Version revision */
++  Elf64_Half	vd_flags;		/* Version information */
++  Elf64_Half	vd_ndx;			/* Version Index */
++  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vd_hash;		/* Version name hash value */
++  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf64_Verdef;
++
++
++/* Legal values for vd_version (version revision).  */
++#define VER_DEF_NONE	0		/* No version */
++#define VER_DEF_CURRENT	1		/* Current version */
++#define VER_DEF_NUM	2		/* Given version number */
++
++/* Legal values for vd_flags (version information flags).  */
++#define VER_FLG_BASE	0x1		/* Version definition of file itself */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++/* Versym symbol index values.  */
++#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
++#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
++#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
++#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
++
++/* Auxialiary version information.  */
++
++typedef struct
++{
++  Elf32_Word	vda_name;		/* Version or dependency names */
++  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf32_Verdaux;
++
++typedef struct
++{
++  Elf64_Word	vda_name;		/* Version or dependency names */
++  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf64_Verdaux;
++
++
++/* Version dependency section.  */
++
++typedef struct
++{
++  Elf32_Half	vn_version;		/* Version of structure */
++  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf32_Verneed;
++
++typedef struct
++{
++  Elf64_Half	vn_version;		/* Version of structure */
++  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf64_Verneed;
++
++
++/* Legal values for vn_version (version revision).  */
++#define VER_NEED_NONE	 0		/* No version */
++#define VER_NEED_CURRENT 1		/* Current version */
++#define VER_NEED_NUM	 2		/* Given version number */
++
++/* Auxiliary needed version information.  */
++
++typedef struct
++{
++  Elf32_Word	vna_hash;		/* Hash value of dependency name */
++  Elf32_Half	vna_flags;		/* Dependency specific information */
++  Elf32_Half	vna_other;		/* Unused */
++  Elf32_Word	vna_name;		/* Dependency name string offset */
++  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf32_Vernaux;
++
++typedef struct
++{
++  Elf64_Word	vna_hash;		/* Hash value of dependency name */
++  Elf64_Half	vna_flags;		/* Dependency specific information */
++  Elf64_Half	vna_other;		/* Unused */
++  Elf64_Word	vna_name;		/* Dependency name string offset */
++  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf64_Vernaux;
++
++
++/* Legal values for vna_flags.  */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++
++/* Auxiliary vector.  */
++
++/* This vector is normally only used by the program interpreter.  The
++   usual definition in an ABI supplement uses the name auxv_t.  The
++   vector is not usually defined in a standard <elf.h> file, but it
++   can't hurt.  We rename it to avoid conflicts.  The sizes of these
++   types are an arrangement between the exec server and the program
++   interpreter, so we don't fully specify them here.  */
++
++typedef struct
++{
++  uint32_t a_type;		/* Entry type */
++  union
++    {
++      uint32_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf32_auxv_t;
++
++typedef struct
++{
++  uint64_t a_type;		/* Entry type */
++  union
++    {
++      uint64_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf64_auxv_t;
++
++/* Legal values for a_type (entry type).  */
++
++#define AT_NULL		0		/* End of vector */
++#define AT_IGNORE	1		/* Entry should be ignored */
++#define AT_EXECFD	2		/* File descriptor of program */
++#define AT_PHDR		3		/* Program headers for program */
++#define AT_PHENT	4		/* Size of program header entry */
++#define AT_PHNUM	5		/* Number of program headers */
++#define AT_PAGESZ	6		/* System page size */
++#define AT_BASE		7		/* Base address of interpreter */
++#define AT_FLAGS	8		/* Flags */
++#define AT_ENTRY	9		/* Entry point of program */
++#define AT_NOTELF	10		/* Program is not ELF */
++#define AT_UID		11		/* Real uid */
++#define AT_EUID		12		/* Effective uid */
++#define AT_GID		13		/* Real gid */
++#define AT_EGID		14		/* Effective gid */
++#define AT_CLKTCK	17		/* Frequency of times() */
++
++/* Some more special a_type values describing the hardware.  */
++#define AT_PLATFORM	15		/* String identifying platform.  */
++#define AT_HWCAP	16		/* Machine dependent hints about
++					   processor capabilities.  */
++
++/* This entry gives some information about the FPU initialization
++   performed by the kernel.  */
++#define AT_FPUCW	18		/* Used FPU control word.  */
++
++/* Cache block sizes.  */
++#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
++#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
++#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
++
++/* A special ignored value for PPC, used by the kernel to control the
++   interpretation of the AUXV. Must be > 16.  */
++#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
++
++#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
++
++#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
++
++#define AT_RANDOM	25		/* Address of 16 random bytes.  */
++
++#define AT_EXECFN	31		/* Filename of executable.  */
++
++/* Pointer to the global system page used for system calls and other
++   nice things.  */
++#define AT_SYSINFO	32
++#define AT_SYSINFO_EHDR	33
++
++/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
++   log2 of line size; mask those to get cache size.  */
++#define AT_L1I_CACHESHAPE	34
++#define AT_L1D_CACHESHAPE	35
++#define AT_L2_CACHESHAPE	36
++#define AT_L3_CACHESHAPE	37
++
++/* Note section contents.  Each entry in the note section begins with
++   a header of a fixed form.  */
++
++typedef struct
++{
++  Elf32_Word n_namesz;			/* Length of the note's name.  */
++  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf32_Word n_type;			/* Type of the note.  */
++} Elf32_Nhdr;
++
++typedef struct
++{
++  Elf64_Word n_namesz;			/* Length of the note's name.  */
++  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf64_Word n_type;			/* Type of the note.  */
++} Elf64_Nhdr;
++
++/* Known names of notes.  */
++
++/* Solaris entries in the note section have this name.  */
++#define ELF_NOTE_SOLARIS	"SUNW Solaris"
++
++/* Note entries for GNU systems have this name.  */
++#define ELF_NOTE_GNU		"GNU"
++
++
++/* Defined types of notes for Solaris.  */
++
++/* Value of descriptor (one word) is desired pagesize for the binary.  */
++#define ELF_NOTE_PAGESIZE_HINT	1
++
++
++/* Defined note types for GNU systems.  */
++
++/* ABI information.  The descriptor consists of words:
++   word 0: OS descriptor
++   word 1: major version of the ABI
++   word 2: minor version of the ABI
++   word 3: subminor version of the ABI
++*/
++#define NT_GNU_ABI_TAG	1
++#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
++
++/* Known OSes.  These values can appear in word 0 of an
++   NT_GNU_ABI_TAG note section entry.  */
++#define ELF_NOTE_OS_LINUX	0
++#define ELF_NOTE_OS_GNU		1
++#define ELF_NOTE_OS_SOLARIS2	2
++#define ELF_NOTE_OS_FREEBSD	3
++
++/* Synthetic hwcap information.  The descriptor begins with two words:
++   word 0: number of entries
++   word 1: bitmask of enabled entries
++   Then follow variable-length entries, one byte followed by a
++   '\0'-terminated hwcap name string.  The byte gives the bit
++   number to test if enabled, (1U << bit) & bitmask.  */
++#define NT_GNU_HWCAP	2
++
++/* Build ID bits as generated by ld --build-id.
++   The descriptor consists of any nonzero number of bytes.  */
++#define NT_GNU_BUILD_ID	3
++
++/* Version note generated by GNU gold containing a version string.  */
++#define NT_GNU_GOLD_VERSION	4
++
++
++/* Move records.  */
++typedef struct
++{
++  Elf32_Xword m_value;		/* Symbol value.  */
++  Elf32_Word m_info;		/* Size and index.  */
++  Elf32_Word m_poffset;		/* Symbol offset.  */
++  Elf32_Half m_repeat;		/* Repeat count.  */
++  Elf32_Half m_stride;		/* Stride info.  */
++} Elf32_Move;
++
++typedef struct
++{
++  Elf64_Xword m_value;		/* Symbol value.  */
++  Elf64_Xword m_info;		/* Size and index.  */
++  Elf64_Xword m_poffset;	/* Symbol offset.  */
++  Elf64_Half m_repeat;		/* Repeat count.  */
++  Elf64_Half m_stride;		/* Stride info.  */
++} Elf64_Move;
++
++/* Macro to construct move records.  */
++#define ELF32_M_SYM(info)	((info) >> 8)
++#define ELF32_M_SIZE(info)	((unsigned char) (info))
++#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
++
++#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
++#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
++#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
++
++
++/* Motorola 68k specific definitions.  */
++
++/* Values for Elf32_Ehdr.e_flags.  */
++#define EF_CPU32	0x00810000
++
++/* m68k relocs.  */
++
++#define R_68K_NONE	0		/* No reloc */
++#define R_68K_32	1		/* Direct 32 bit  */
++#define R_68K_16	2		/* Direct 16 bit  */
++#define R_68K_8		3		/* Direct 8 bit  */
++#define R_68K_PC32	4		/* PC relative 32 bit */
++#define R_68K_PC16	5		/* PC relative 16 bit */
++#define R_68K_PC8	6		/* PC relative 8 bit */
++#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
++#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
++#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
++#define R_68K_GOT32O	10		/* 32 bit GOT offset */
++#define R_68K_GOT16O	11		/* 16 bit GOT offset */
++#define R_68K_GOT8O	12		/* 8 bit GOT offset */
++#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
++#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
++#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
++#define R_68K_PLT32O	16		/* 32 bit PLT offset */
++#define R_68K_PLT16O	17		/* 16 bit PLT offset */
++#define R_68K_PLT8O	18		/* 8 bit PLT offset */
++#define R_68K_COPY	19		/* Copy symbol at runtime */
++#define R_68K_GLOB_DAT	20		/* Create GOT entry */
++#define R_68K_JMP_SLOT	21		/* Create PLT entry */
++#define R_68K_RELATIVE	22		/* Adjust by program base */
++#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
++#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
++#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
++#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
++#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
++#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
++#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
++#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
++#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
++#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
++#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
++#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
++#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
++#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
++#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
++/* Keep this the last entry.  */
++#define R_68K_NUM	43
++
++/* Intel 80386 specific definitions.  */
++
++/* i386 relocs.  */
++
++#define R_386_NONE	   0		/* No reloc */
++#define R_386_32	   1		/* Direct 32 bit  */
++#define R_386_PC32	   2		/* PC relative 32 bit */
++#define R_386_GOT32	   3		/* 32 bit GOT entry */
++#define R_386_PLT32	   4		/* 32 bit PLT address */
++#define R_386_COPY	   5		/* Copy symbol at runtime */
++#define R_386_GLOB_DAT	   6		/* Create GOT entry */
++#define R_386_JMP_SLOT	   7		/* Create PLT entry */
++#define R_386_RELATIVE	   8		/* Adjust by program base */
++#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
++#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
++#define R_386_32PLT	   11
++#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
++#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
++					   block offset */
++#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
++					   offset */
++#define R_386_TLS_LE	   17		/* Offset relative to static TLS
++					   block */
++#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
++					   general dynamic thread local data */
++#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
++					   local dynamic thread local data
++					   in LE code */
++#define R_386_16	   20
++#define R_386_PC16	   21
++#define R_386_8		   22
++#define R_386_PC8	   23
++#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
++					   thread local data */
++#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
++#define R_386_TLS_GD_CALL  26		/* Relocation for call to
++					   __tls_get_addr() */
++#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
++#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
++					   thread local data in LE code */
++#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
++#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
++					   __tls_get_addr() in LDM code */
++#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
++#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
++#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
++					   block offset */
++#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
++					   TLS block */
++#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
++#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
++#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
++/* 38? */
++#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
++#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
++					   descriptor for
++					   relaxation.  */
++#define R_386_TLS_DESC     41		/* TLS descriptor containing
++					   pointer to code and to
++					   argument, returning the TLS
++					   offset for the symbol.  */
++#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
++/* Keep this the last entry.  */
++#define R_386_NUM	   43
++
++/* SUN SPARC specific definitions.  */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
++
++/* Values for Elf64_Ehdr.e_flags.  */
++
++#define EF_SPARCV9_MM		3
++#define EF_SPARCV9_TSO		0
++#define EF_SPARCV9_PSO		1
++#define EF_SPARCV9_RMO		2
++#define EF_SPARC_LEDATA		0x800000 /* little endian data */
++#define EF_SPARC_EXT_MASK	0xFFFF00
++#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
++#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
++#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
++#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
++
++/* SPARC relocs.  */
++
++#define R_SPARC_NONE		0	/* No reloc */
++#define R_SPARC_8		1	/* Direct 8 bit */
++#define R_SPARC_16		2	/* Direct 16 bit */
++#define R_SPARC_32		3	/* Direct 32 bit */
++#define R_SPARC_DISP8		4	/* PC relative 8 bit */
++#define R_SPARC_DISP16		5	/* PC relative 16 bit */
++#define R_SPARC_DISP32		6	/* PC relative 32 bit */
++#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
++#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
++#define R_SPARC_HI22		9	/* High 22 bit */
++#define R_SPARC_22		10	/* Direct 22 bit */
++#define R_SPARC_13		11	/* Direct 13 bit */
++#define R_SPARC_LO10		12	/* Truncated 10 bit */
++#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
++#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
++#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
++#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
++#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
++#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
++#define R_SPARC_COPY		19	/* Copy symbol at runtime */
++#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
++#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
++#define R_SPARC_RELATIVE	22	/* Adjust by program base */
++#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
++
++/* Additional Sparc64 relocs.  */
++
++#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
++#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
++#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
++#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
++#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
++#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
++#define R_SPARC_10		30	/* Direct 10 bit */
++#define R_SPARC_11		31	/* Direct 11 bit */
++#define R_SPARC_64		32	/* Direct 64 bit */
++#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
++#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
++#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
++#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
++#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
++#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
++#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
++#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
++#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
++#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
++#define R_SPARC_7		43	/* Direct 7 bit */
++#define R_SPARC_5		44	/* Direct 5 bit */
++#define R_SPARC_6		45	/* Direct 6 bit */
++#define R_SPARC_DISP64		46	/* PC relative 64 bit */
++#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
++#define R_SPARC_HIX22		48	/* High 22 bit complemented */
++#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
++#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
++#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
++#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
++#define R_SPARC_REGISTER	53	/* Global register usage */
++#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
++#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
++#define R_SPARC_TLS_GD_HI22	56
++#define R_SPARC_TLS_GD_LO10	57
++#define R_SPARC_TLS_GD_ADD	58
++#define R_SPARC_TLS_GD_CALL	59
++#define R_SPARC_TLS_LDM_HI22	60
++#define R_SPARC_TLS_LDM_LO10	61
++#define R_SPARC_TLS_LDM_ADD	62
++#define R_SPARC_TLS_LDM_CALL	63
++#define R_SPARC_TLS_LDO_HIX22	64
++#define R_SPARC_TLS_LDO_LOX10	65
++#define R_SPARC_TLS_LDO_ADD	66
++#define R_SPARC_TLS_IE_HI22	67
++#define R_SPARC_TLS_IE_LO10	68
++#define R_SPARC_TLS_IE_LD	69
++#define R_SPARC_TLS_IE_LDX	70
++#define R_SPARC_TLS_IE_ADD	71
++#define R_SPARC_TLS_LE_HIX22	72
++#define R_SPARC_TLS_LE_LOX10	73
++#define R_SPARC_TLS_DTPMOD32	74
++#define R_SPARC_TLS_DTPMOD64	75
++#define R_SPARC_TLS_DTPOFF32	76
++#define R_SPARC_TLS_DTPOFF64	77
++#define R_SPARC_TLS_TPOFF32	78
++#define R_SPARC_TLS_TPOFF64	79
++#define R_SPARC_GOTDATA_HIX22	80
++#define R_SPARC_GOTDATA_LOX10	81
++#define R_SPARC_GOTDATA_OP_HIX22	82
++#define R_SPARC_GOTDATA_OP_LOX10	83
++#define R_SPARC_GOTDATA_OP	84
++#define R_SPARC_H34		85
++#define R_SPARC_SIZE32		86
++#define R_SPARC_SIZE64		87
++#define R_SPARC_WDISP10		88
++#define R_SPARC_JMP_IREL	248
++#define R_SPARC_IRELATIVE	249
++#define R_SPARC_GNU_VTINHERIT	250
++#define R_SPARC_GNU_VTENTRY	251
++#define R_SPARC_REV32		252
++/* Keep this the last entry.  */
++#define R_SPARC_NUM		253
++
++/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
++
++#define DT_SPARC_REGISTER 0x70000001
++#define DT_SPARC_NUM	2
++
++/* MIPS R3000 specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
++#define EF_MIPS_PIC	    2		/* Contains PIC code */
++#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
++#define EF_MIPS_XGOT	    8
++#define EF_MIPS_64BIT_WHIRL 16
++#define EF_MIPS_ABI2	    32
++#define EF_MIPS_ABI_ON32    64
++#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
++
++/* Legal values for MIPS architecture level.  */
++
++#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
++#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
++#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
++#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
++#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
++#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
++#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
++
++/* The following are non-official names and should not be used.  */
++
++#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
++#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
++#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
++#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
++#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
++#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
++#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
++
++/* Special section indices.  */
++
++#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
++#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
++#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
++#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
++#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
++#define SHT_MIPS_MSYM	       0x70000001
++#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
++#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
++#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
++#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
++#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
++#define SHT_MIPS_PACKAGE       0x70000007
++#define SHT_MIPS_PACKSYM       0x70000008
++#define SHT_MIPS_RELD	       0x70000009
++#define SHT_MIPS_IFACE         0x7000000b
++#define SHT_MIPS_CONTENT       0x7000000c
++#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
++#define SHT_MIPS_SHDR	       0x70000010
++#define SHT_MIPS_FDESC	       0x70000011
++#define SHT_MIPS_EXTSYM	       0x70000012
++#define SHT_MIPS_DENSE	       0x70000013
++#define SHT_MIPS_PDESC	       0x70000014
++#define SHT_MIPS_LOCSYM	       0x70000015
++#define SHT_MIPS_AUXSYM	       0x70000016
++#define SHT_MIPS_OPTSYM	       0x70000017
++#define SHT_MIPS_LOCSTR	       0x70000018
++#define SHT_MIPS_LINE	       0x70000019
++#define SHT_MIPS_RFDESC	       0x7000001a
++#define SHT_MIPS_DELTASYM      0x7000001b
++#define SHT_MIPS_DELTAINST     0x7000001c
++#define SHT_MIPS_DELTACLASS    0x7000001d
++#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
++#define SHT_MIPS_DELTADECL     0x7000001f
++#define SHT_MIPS_SYMBOL_LIB    0x70000020
++#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
++#define SHT_MIPS_TRANSLATE     0x70000022
++#define SHT_MIPS_PIXIE	       0x70000023
++#define SHT_MIPS_XLATE	       0x70000024
++#define SHT_MIPS_XLATE_DEBUG   0x70000025
++#define SHT_MIPS_WHIRL	       0x70000026
++#define SHT_MIPS_EH_REGION     0x70000027
++#define SHT_MIPS_XLATE_OLD     0x70000028
++#define SHT_MIPS_PDR_EXCEPTION 0x70000029
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
++#define SHF_MIPS_MERGE	 0x20000000
++#define SHF_MIPS_ADDR	 0x40000000
++#define SHF_MIPS_STRINGS 0x80000000
++#define SHF_MIPS_NOSTRIP 0x08000000
++#define SHF_MIPS_LOCAL	 0x04000000
++#define SHF_MIPS_NAMES	 0x02000000
++#define SHF_MIPS_NODUPE	 0x01000000
++
++
++/* Symbol tables.  */
++
++/* MIPS specific values for `st_other'.  */
++#define STO_MIPS_DEFAULT		0x0
++#define STO_MIPS_INTERNAL		0x1
++#define STO_MIPS_HIDDEN			0x2
++#define STO_MIPS_PROTECTED		0x3
++#define STO_MIPS_PLT			0x8
++#define STO_MIPS_SC_ALIGN_UNUSED	0xff
++
++/* MIPS specific values for `st_info'.  */
++#define STB_MIPS_SPLIT_COMMON		13
++
++/* Entries found in sections of type SHT_MIPS_GPTAB.  */
++
++typedef union
++{
++  struct
++    {
++      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
++      Elf32_Word gt_unused;		/* Not used */
++    } gt_header;			/* First entry in section */
++  struct
++    {
++      Elf32_Word gt_g_value;		/* If this value were used for -G */
++      Elf32_Word gt_bytes;		/* This many bytes would be used */
++    } gt_entry;				/* Subsequent entries in section */
++} Elf32_gptab;
++
++/* Entry found in sections of type SHT_MIPS_REGINFO.  */
++
++typedef struct
++{
++  Elf32_Word	ri_gprmask;		/* General registers used */
++  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
++  Elf32_Sword	ri_gp_value;		/* $gp register value */
++} Elf32_RegInfo;
++
++/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
++
++typedef struct
++{
++  unsigned char kind;		/* Determines interpretation of the
++				   variable part of descriptor.  */
++  unsigned char size;		/* Size of descriptor, including header.  */
++  Elf32_Section section;	/* Section header index of section affected,
++				   0 for global options.  */
++  Elf32_Word info;		/* Kind-specific information.  */
++} Elf_Options;
++
++/* Values for `kind' field in Elf_Options.  */
++
++#define ODK_NULL	0	/* Undefined.  */
++#define ODK_REGINFO	1	/* Register usage information.  */
++#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
++#define ODK_PAD		3	/* Section padding options.  */
++#define ODK_HWPATCH	4	/* Hardware workarounds performed */
++#define ODK_FILL	5	/* record the fill value used by the linker. */
++#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
++#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
++#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
++
++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
++
++#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
++#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
++#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
++#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
++#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
++#define OEX_PRECISEFP	OEX_FPDBUG
++#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
++
++#define OEX_FPU_INVAL	0x10
++#define OEX_FPU_DIV0	0x08
++#define OEX_FPU_OFLO	0x04
++#define OEX_FPU_UFLO	0x02
++#define OEX_FPU_INEX	0x01
++
++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
++
++#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
++#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
++#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
++#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
++
++#define OPAD_PREFIX	0x1
++#define OPAD_POSTFIX	0x2
++#define OPAD_SYMBOL	0x4
++
++/* Entry found in `.options' section.  */
++
++typedef struct
++{
++  Elf32_Word hwp_flags1;	/* Extra flags.  */
++  Elf32_Word hwp_flags2;	/* Extra flags.  */
++} Elf_Options_Hw;
++
++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
++
++#define OHWA0_R4KEOP_CHECKED	0x00000001
++#define OHWA1_R4KEOP_CLEAN	0x00000002
++
++/* MIPS relocs.  */
++
++#define R_MIPS_NONE		0	/* No reloc */
++#define R_MIPS_16		1	/* Direct 16 bit */
++#define R_MIPS_32		2	/* Direct 32 bit */
++#define R_MIPS_REL32		3	/* PC relative 32 bit */
++#define R_MIPS_26		4	/* Direct 26 bit shifted */
++#define R_MIPS_HI16		5	/* High 16 bit */
++#define R_MIPS_LO16		6	/* Low 16 bit */
++#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
++#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
++#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
++#define R_MIPS_PC16		10	/* PC relative 16 bit */
++#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
++#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
++
++#define R_MIPS_SHIFT5		16
++#define R_MIPS_SHIFT6		17
++#define R_MIPS_64		18
++#define R_MIPS_GOT_DISP		19
++#define R_MIPS_GOT_PAGE		20
++#define R_MIPS_GOT_OFST		21
++#define R_MIPS_GOT_HI16		22
++#define R_MIPS_GOT_LO16		23
++#define R_MIPS_SUB		24
++#define R_MIPS_INSERT_A		25
++#define R_MIPS_INSERT_B		26
++#define R_MIPS_DELETE		27
++#define R_MIPS_HIGHER		28
++#define R_MIPS_HIGHEST		29
++#define R_MIPS_CALL_HI16	30
++#define R_MIPS_CALL_LO16	31
++#define R_MIPS_SCN_DISP		32
++#define R_MIPS_REL16		33
++#define R_MIPS_ADD_IMMEDIATE	34
++#define R_MIPS_PJUMP		35
++#define R_MIPS_RELGOT		36
++#define R_MIPS_JALR		37
++#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
++#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
++#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
++#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
++#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
++#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
++#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
++#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
++#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
++#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
++#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
++#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
++#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
++#define R_MIPS_GLOB_DAT		51
++#define R_MIPS_COPY		126
++#define R_MIPS_JUMP_SLOT        127
++/* Keep this the last entry.  */
++#define R_MIPS_NUM		128
++
++/* Legal values for p_type field of Elf32_Phdr.  */
++
++#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
++#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
++#define PT_MIPS_OPTIONS 0x70000002
++
++/* Special program header types.  */
++
++#define PF_MIPS_LOCAL	0x10000000
++
++/* Legal values for d_tag field of Elf32_Dyn.  */
++
++#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
++#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
++#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
++#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
++#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
++#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
++#define DT_MIPS_MSYM	     0x70000007
++#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
++#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
++#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
++#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
++#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
++#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
++#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
++#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
++#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
++#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
++#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
++#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
++						DT_MIPS_DELTA_CLASS.  */
++#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
++						DT_MIPS_DELTA_INSTANCE.  */
++#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
++					     DT_MIPS_DELTA_RELOC.  */
++#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
++					   relocations refer to.  */
++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
++					   DT_MIPS_DELTA_SYM.  */
++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
++					     class declaration.  */
++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
++						DT_MIPS_DELTA_CLASSSYM.  */
++#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
++#define DT_MIPS_PIXIE_INIT   0x70000023
++#define DT_MIPS_SYMBOL_LIB   0x70000024
++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
++#define DT_MIPS_LOCAL_GOTIDX 0x70000026
++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
++#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
++#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
++						    function stored in GOT.  */
++#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
++					   by rld on dlopen() calls.  */
++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
++#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
++#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
++/* The address of .got.plt in an executable using the new non-PIC ABI.  */
++#define DT_MIPS_PLTGOT	     0x70000032
++/* The base of the PLT in an executable using the new non-PIC ABI if that
++   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
++   value.  */
++#define DT_MIPS_RWPLT        0x70000034
++#define DT_MIPS_NUM	     0x35
++
++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
++
++#define RHF_NONE		   0		/* No flags */
++#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
++#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
++#define RHF_NO_MOVE		   (1 << 3)
++#define RHF_SGI_ONLY		   (1 << 4)
++#define RHF_GUARANTEE_INIT	   (1 << 5)
++#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
++#define RHF_GUARANTEE_START_INIT   (1 << 7)
++#define RHF_PIXIE		   (1 << 8)
++#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
++#define RHF_REQUICKSTART	   (1 << 10)
++#define RHF_REQUICKSTARTED	   (1 << 11)
++#define RHF_CORD		   (1 << 12)
++#define RHF_NO_UNRES_UNDEF	   (1 << 13)
++#define RHF_RLD_ORDER_SAFE	   (1 << 14)
++
++/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
++
++typedef struct
++{
++  Elf32_Word l_name;		/* Name (string table index) */
++  Elf32_Word l_time_stamp;	/* Timestamp */
++  Elf32_Word l_checksum;	/* Checksum */
++  Elf32_Word l_version;		/* Interface version */
++  Elf32_Word l_flags;		/* Flags */
++} Elf32_Lib;
++
++typedef struct
++{
++  Elf64_Word l_name;		/* Name (string table index) */
++  Elf64_Word l_time_stamp;	/* Timestamp */
++  Elf64_Word l_checksum;	/* Checksum */
++  Elf64_Word l_version;		/* Interface version */
++  Elf64_Word l_flags;		/* Flags */
++} Elf64_Lib;
++
++
++/* Legal values for l_flags.  */
++
++#define LL_NONE		  0
++#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
++#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
++#define LL_REQUIRE_MINOR  (1 << 2)
++#define LL_EXPORTS	  (1 << 3)
++#define LL_DELAY_LOAD	  (1 << 4)
++#define LL_DELTA	  (1 << 5)
++
++/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
++
++typedef Elf32_Addr Elf32_Conflict;
++
++
++/* HPPA specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
++#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
++#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
++#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
++#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
++					      prediction.  */
++#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
++#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
++
++/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
++
++#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
++#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
++#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
++
++/* Additional section indeces.  */
++
++#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
++					      symbols in ANSI C.  */
++#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
++#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
++#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
++#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
++#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
++
++#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
++#define STT_HP_STUB		(STT_LOOS + 0x2)
++
++/* HPPA relocs.  */
++
++#define R_PARISC_NONE		0	/* No reloc.  */
++#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
++#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
++#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
++#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
++#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
++#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
++#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
++#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
++#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
++#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
++#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
++#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
++#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
++#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
++#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
++#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
++#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
++#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
++#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
++#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
++#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
++#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
++#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
++#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
++#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
++#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
++#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
++#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
++#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
++#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
++#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
++#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
++#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
++#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
++#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
++#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
++#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
++#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
++#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
++#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
++#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
++#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LORESERVE	128
++#define R_PARISC_COPY		128	/* Copy relocation.  */
++#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
++#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
++#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
++#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
++#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
++#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
++#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
++#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
++#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_GNU_VTENTRY	232
++#define R_PARISC_GNU_VTINHERIT	233
++#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
++#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
++#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
++#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
++#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
++#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
++#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
++#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
++#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
++#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
++#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
++#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
++#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
++#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
++#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
++#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
++#define R_PARISC_HIRESERVE	255
++
++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PT_HP_TLS		(PT_LOOS + 0x0)
++#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
++#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
++#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
++#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
++#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
++#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
++#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
++#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
++#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
++#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
++#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
++#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
++#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
++#define PT_HP_STACK		(PT_LOOS + 0x14)
++
++#define PT_PARISC_ARCHEXT	0x70000000
++#define PT_PARISC_UNWIND	0x70000001
++
++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PF_PARISC_SBP		0x08000000
++
++#define PF_HP_PAGE_SIZE		0x00100000
++#define PF_HP_FAR_SHARED	0x00200000
++#define PF_HP_NEAR_SHARED	0x00400000
++#define PF_HP_CODE		0x01000000
++#define PF_HP_MODIFY		0x02000000
++#define PF_HP_LAZYSWAP		0x04000000
++#define PF_HP_SBP		0x08000000
++
++
++/* Alpha specific definitions.  */
++
++/* Legal values for e_flags field of Elf64_Ehdr.  */
++
++#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
++#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
++
++/* Legal values for sh_type field of Elf64_Shdr.  */
++
++/* These two are primerily concerned with ECOFF debugging info.  */
++#define SHT_ALPHA_DEBUG		0x70000001
++#define SHT_ALPHA_REGINFO	0x70000002
++
++/* Legal values for sh_flags field of Elf64_Shdr.  */
++
++#define SHF_ALPHA_GPREL		0x10000000
++
++/* Legal values for st_other field of Elf64_Sym.  */
++#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
++#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
++
++/* Alpha relocs.  */
++
++#define R_ALPHA_NONE		0	/* No reloc */
++#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
++#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
++#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
++#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
++#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
++#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
++#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
++#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
++#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
++#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
++#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
++#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
++#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
++#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
++#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
++#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
++#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
++#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
++#define R_ALPHA_TLS_GD_HI	28
++#define R_ALPHA_TLSGD		29
++#define R_ALPHA_TLS_LDM		30
++#define R_ALPHA_DTPMOD64	31
++#define R_ALPHA_GOTDTPREL	32
++#define R_ALPHA_DTPREL64	33
++#define R_ALPHA_DTPRELHI	34
++#define R_ALPHA_DTPRELLO	35
++#define R_ALPHA_DTPREL16	36
++#define R_ALPHA_GOTTPREL	37
++#define R_ALPHA_TPREL64		38
++#define R_ALPHA_TPRELHI		39
++#define R_ALPHA_TPRELLO		40
++#define R_ALPHA_TPREL16		41
++/* Keep this the last entry.  */
++#define R_ALPHA_NUM		46
++
++/* Magic values of the LITUSE relocation addend.  */
++#define LITUSE_ALPHA_ADDR	0
++#define LITUSE_ALPHA_BASE	1
++#define LITUSE_ALPHA_BYTOFF	2
++#define LITUSE_ALPHA_JSR	3
++#define LITUSE_ALPHA_TLS_GD	4
++#define LITUSE_ALPHA_TLS_LDM	5
++
++/* Legal values for d_tag of Elf64_Dyn.  */
++#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
++#define DT_ALPHA_NUM		1
++
++/* PowerPC specific declarations */
++
++/* Values for Elf32/64_Ehdr.e_flags.  */
++#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
++
++/* Cygnus local bits below */
++#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
++#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
++						   flag */
++
++/* PowerPC relocations defined by the ABIs */
++#define R_PPC_NONE		0
++#define R_PPC_ADDR32		1	/* 32bit absolute address */
++#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
++#define R_PPC_ADDR16		3	/* 16bit absolute address */
++#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
++#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
++#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
++#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
++#define R_PPC_ADDR14_BRTAKEN	8
++#define R_PPC_ADDR14_BRNTAKEN	9
++#define R_PPC_REL24		10	/* PC relative 26 bit */
++#define R_PPC_REL14		11	/* PC relative 16 bit */
++#define R_PPC_REL14_BRTAKEN	12
++#define R_PPC_REL14_BRNTAKEN	13
++#define R_PPC_GOT16		14
++#define R_PPC_GOT16_LO		15
++#define R_PPC_GOT16_HI		16
++#define R_PPC_GOT16_HA		17
++#define R_PPC_PLTREL24		18
++#define R_PPC_COPY		19
++#define R_PPC_GLOB_DAT		20
++#define R_PPC_JMP_SLOT		21
++#define R_PPC_RELATIVE		22
++#define R_PPC_LOCAL24PC		23
++#define R_PPC_UADDR32		24
++#define R_PPC_UADDR16		25
++#define R_PPC_REL32		26
++#define R_PPC_PLT32		27
++#define R_PPC_PLTREL32		28
++#define R_PPC_PLT16_LO		29
++#define R_PPC_PLT16_HI		30
++#define R_PPC_PLT16_HA		31
++#define R_PPC_SDAREL16		32
++#define R_PPC_SECTOFF		33
++#define R_PPC_SECTOFF_LO	34
++#define R_PPC_SECTOFF_HI	35
++#define R_PPC_SECTOFF_HA	36
++
++/* PowerPC relocations defined for the TLS access ABI.  */
++#define R_PPC_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
++#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
++#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
++#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
++#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
++#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
++#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
++#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
++#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
++#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
++
++/* The remaining relocs are from the Embedded ELF ABI, and are not
++   in the SVR4 ELF ABI.  */
++#define R_PPC_EMB_NADDR32	101
++#define R_PPC_EMB_NADDR16	102
++#define R_PPC_EMB_NADDR16_LO	103
++#define R_PPC_EMB_NADDR16_HI	104
++#define R_PPC_EMB_NADDR16_HA	105
++#define R_PPC_EMB_SDAI16	106
++#define R_PPC_EMB_SDA2I16	107
++#define R_PPC_EMB_SDA2REL	108
++#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
++#define R_PPC_EMB_MRKREF	110
++#define R_PPC_EMB_RELSEC16	111
++#define R_PPC_EMB_RELST_LO	112
++#define R_PPC_EMB_RELST_HI	113
++#define R_PPC_EMB_RELST_HA	114
++#define R_PPC_EMB_BIT_FLD	115
++#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
++
++/* Diab tool relocations.  */
++#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
++#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
++#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
++#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
++#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
++#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC_IRELATIVE		248
++
++/* GNU relocs used in PIC code sequences.  */
++#define R_PPC_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
++#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
++#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
++
++/* This is a phony reloc to handle any old fashioned TOC16 references
++   that may still be in object files.  */
++#define R_PPC_TOC16		255
++
++/* PowerPC specific values for the Dyn d_tag field.  */
++#define DT_PPC_GOT		(DT_LOPROC + 0)
++#define DT_PPC_NUM		1
++
++/* PowerPC64 relocations defined by the ABIs */
++#define R_PPC64_NONE		R_PPC_NONE
++#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
++#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
++#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
++#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
++#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
++#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
++#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
++#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
++#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
++#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
++#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
++#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
++#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
++#define R_PPC64_GOT16		R_PPC_GOT16
++#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
++#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
++#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
++
++#define R_PPC64_COPY		R_PPC_COPY
++#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
++#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
++#define R_PPC64_RELATIVE	R_PPC_RELATIVE
++
++#define R_PPC64_UADDR32		R_PPC_UADDR32
++#define R_PPC64_UADDR16		R_PPC_UADDR16
++#define R_PPC64_REL32		R_PPC_REL32
++#define R_PPC64_PLT32		R_PPC_PLT32
++#define R_PPC64_PLTREL32	R_PPC_PLTREL32
++#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
++#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
++#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
++
++#define R_PPC64_SECTOFF		R_PPC_SECTOFF
++#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
++#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
++#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
++#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
++#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
++#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
++#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
++#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
++#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
++#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
++#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
++#define R_PPC64_PLT64		45 /* doubleword64 L + A */
++#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
++#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
++#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
++#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
++#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
++#define R_PPC64_TOC		51 /* doubleword64 .TOC */
++#define R_PPC64_PLTGOT16	52 /* half16* M + A */
++#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
++#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
++#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
++
++#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
++#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
++#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
++#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
++#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
++#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
++#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
++#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
++#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
++#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
++#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
++
++/* PowerPC64 relocations defined for the TLS access ABI.  */
++#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
++#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
++#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
++#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
++#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
++#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
++#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
++#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
++#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
++#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
++#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC64_JMP_IREL	247
++#define R_PPC64_IRELATIVE	248
++#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
++#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
++#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
++
++/* PowerPC64 specific values for the Dyn d_tag field.  */
++#define DT_PPC64_GLINK  (DT_LOPROC + 0)
++#define DT_PPC64_OPD	(DT_LOPROC + 1)
++#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
++#define DT_PPC64_NUM    3
++
++
++/* ARM specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_ARM_RELEXEC		0x01
++#define EF_ARM_HASENTRY		0x02
++#define EF_ARM_INTERWORK	0x04
++#define EF_ARM_APCS_26		0x08
++#define EF_ARM_APCS_FLOAT	0x10
++#define EF_ARM_PIC		0x20
++#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
++#define EF_ARM_NEW_ABI		0x80
++#define EF_ARM_OLD_ABI		0x100
++#define EF_ARM_SOFT_FLOAT	0x200
++#define EF_ARM_VFP_FLOAT	0x400
++#define EF_ARM_MAVERICK_FLOAT	0x800
++
++
++/* Other constants defined in the ARM ELF spec. version B-01.  */
++/* NB. These conflict with values defined above.  */
++#define EF_ARM_SYMSARESORTED	0x04
++#define EF_ARM_DYNSYMSUSESEGIDX	0x08
++#define EF_ARM_MAPSYMSFIRST	0x10
++#define EF_ARM_EABIMASK		0XFF000000
++
++/* Constants defined in AAELF.  */
++#define EF_ARM_BE8	    0x00800000
++#define EF_ARM_LE8	    0x00400000
++
++#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
++#define EF_ARM_EABI_UNKNOWN	0x00000000
++#define EF_ARM_EABI_VER1	0x01000000
++#define EF_ARM_EABI_VER2	0x02000000
++#define EF_ARM_EABI_VER3	0x03000000
++#define EF_ARM_EABI_VER4	0x04000000
++#define EF_ARM_EABI_VER5	0x05000000
++
++/* Additional symbol types for Thumb.  */
++#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
++#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
++
++/* ARM-specific values for sh_flags */
++#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
++#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
++					      in the input to a link step.  */
++
++/* ARM-specific program header flags */
++#define PF_ARM_SB		0x10000000 /* Segment contains the location
++					      addressed by the static base. */
++#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
++#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
++#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
++#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
++
++
++/* ARM relocs.  */
++
++#define R_ARM_NONE		0	/* No reloc */
++#define R_ARM_PC24		1	/* PC relative 26 bit branch */
++#define R_ARM_ABS32		2	/* Direct 32 bit  */
++#define R_ARM_REL32		3	/* PC relative 32 bit */
++#define R_ARM_PC13		4
++#define R_ARM_ABS16		5	/* Direct 16 bit */
++#define R_ARM_ABS12		6	/* Direct 12 bit */
++#define R_ARM_THM_ABS5		7
++#define R_ARM_ABS8		8	/* Direct 8 bit */
++#define R_ARM_SBREL32		9
++#define R_ARM_THM_PC22		10
++#define R_ARM_THM_PC8		11
++#define R_ARM_AMP_VCALL9	12
++#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
++#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
++#define R_ARM_THM_SWI8		14
++#define R_ARM_XPC25		15
++#define R_ARM_THM_XPC22		16
++#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
++#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
++#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
++#define R_ARM_COPY		20	/* Copy symbol at runtime */
++#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
++#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
++#define R_ARM_RELATIVE		23	/* Adjust by program base */
++#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
++#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
++#define R_ARM_GOT32		26	/* 32 bit GOT entry */
++#define R_ARM_PLT32		27	/* 32 bit PLT address */
++#define R_ARM_ALU_PCREL_7_0	32
++#define R_ARM_ALU_PCREL_15_8	33
++#define R_ARM_ALU_PCREL_23_15	34
++#define R_ARM_LDR_SBREL_11_0	35
++#define R_ARM_ALU_SBREL_19_12	36
++#define R_ARM_ALU_SBREL_27_20	37
++#define R_ARM_TLS_GOTDESC	90
++#define R_ARM_TLS_CALL		91
++#define R_ARM_TLS_DESCSEQ	92
++#define R_ARM_THM_TLS_CALL	93
++#define R_ARM_GNU_VTENTRY	100
++#define R_ARM_GNU_VTINHERIT	101
++#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
++#define R_ARM_THM_PC9		103	/* thumb conditional branch */
++#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
++					   thread local data */
++#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
++					   thread local data */
++#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
++					   block */
++#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
++					   static TLS block offset */
++#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
++					   TLS block */
++#define	R_ARM_THM_TLS_DESCSEQ	129
++#define R_ARM_IRELATIVE		160
++#define R_ARM_RXPC25		249
++#define R_ARM_RSBREL32		250
++#define R_ARM_THM_RPC22		251
++#define R_ARM_RREL32		252
++#define R_ARM_RABS22		253
++#define R_ARM_RPC24		254
++#define R_ARM_RBASE		255
++/* Keep this the last entry.  */
++#define R_ARM_NUM		256
++
++/* IA-64 specific declarations.  */
++
++/* Processor specific flags for the Ehdr e_flags field.  */
++#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
++#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
++#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
++#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
++#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
++#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
++#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
++
++/* Processor specific flags for the Phdr p_flags field.  */
++#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
++#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
++
++/* Processor specific flags for the Shdr sh_flags field.  */
++#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
++#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Dyn d_tag field.  */
++#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
++#define DT_IA_64_NUM		1
++
++/* IA-64 relocations.  */
++#define R_IA64_NONE		0x00	/* none */
++#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
++#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
++#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
++#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
++#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
++#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
++#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
++#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
++#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
++#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
++#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
++#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
++#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
++#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
++#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
++#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
++#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
++#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
++#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
++#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
++#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
++#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
++#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
++#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
++#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
++#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
++#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
++#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
++#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
++#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
++#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
++#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
++#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
++#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
++#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
++#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
++#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
++#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
++#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
++#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
++#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
++#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
++#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
++#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
++#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
++#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
++#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
++#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
++#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
++#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
++#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
++#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
++#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
++#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
++#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
++#define R_IA64_COPY		0x84	/* copy relocation */
++#define R_IA64_SUB		0x85	/* Addend and symbol difference */
++#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
++#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
++#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
++#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
++#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
++#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
++#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
++#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
++#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
++#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
++#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
++#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
++#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
++#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
++#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
++#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
++
++/* SH specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_SH_MACH_MASK		0x1f
++#define EF_SH_UNKNOWN		0x0
++#define EF_SH1			0x1
++#define EF_SH2			0x2
++#define EF_SH3			0x3
++#define EF_SH_DSP		0x4
++#define EF_SH3_DSP		0x5
++#define EF_SH4AL_DSP		0x6
++#define EF_SH3E			0x8
++#define EF_SH4			0x9
++#define EF_SH2E			0xb
++#define EF_SH4A			0xc
++#define EF_SH2A			0xd
++#define EF_SH4_NOFPU		0x10
++#define EF_SH4A_NOFPU		0x11
++#define EF_SH4_NOMMU_NOFPU	0x12
++#define EF_SH2A_NOFPU		0x13
++#define EF_SH3_NOMMU		0x14
++#define EF_SH2A_SH4_NOFPU	0x15
++#define EF_SH2A_SH3_NOFPU	0x16
++#define EF_SH2A_SH4		0x17
++#define EF_SH2A_SH3E		0x18
++
++/* SH relocs.  */
++#define	R_SH_NONE		0
++#define	R_SH_DIR32		1
++#define	R_SH_REL32		2
++#define	R_SH_DIR8WPN		3
++#define	R_SH_IND12W		4
++#define	R_SH_DIR8WPL		5
++#define	R_SH_DIR8WPZ		6
++#define	R_SH_DIR8BP		7
++#define	R_SH_DIR8W		8
++#define	R_SH_DIR8L		9
++#define	R_SH_SWITCH16		25
++#define	R_SH_SWITCH32		26
++#define	R_SH_USES		27
++#define	R_SH_COUNT		28
++#define	R_SH_ALIGN		29
++#define	R_SH_CODE		30
++#define	R_SH_DATA		31
++#define	R_SH_LABEL		32
++#define	R_SH_SWITCH8		33
++#define	R_SH_GNU_VTINHERIT	34
++#define	R_SH_GNU_VTENTRY	35
++#define	R_SH_TLS_GD_32		144
++#define	R_SH_TLS_LD_32		145
++#define	R_SH_TLS_LDO_32		146
++#define	R_SH_TLS_IE_32		147
++#define	R_SH_TLS_LE_32		148
++#define	R_SH_TLS_DTPMOD32	149
++#define	R_SH_TLS_DTPOFF32	150
++#define	R_SH_TLS_TPOFF32	151
++#define	R_SH_GOT32		160
++#define	R_SH_PLT32		161
++#define	R_SH_COPY		162
++#define	R_SH_GLOB_DAT		163
++#define	R_SH_JMP_SLOT		164
++#define	R_SH_RELATIVE		165
++#define	R_SH_GOTOFF		166
++#define	R_SH_GOTPC		167
++/* Keep this the last entry.  */
++#define	R_SH_NUM		256
++
++/* S/390 specific definitions.  */
++
++/* Valid values for the e_flags field.  */
++
++#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
++
++/* Additional s390 relocs */
++
++#define R_390_NONE		0	/* No reloc.  */
++#define R_390_8			1	/* Direct 8 bit.  */
++#define R_390_12		2	/* Direct 12 bit.  */
++#define R_390_16		3	/* Direct 16 bit.  */
++#define R_390_32		4	/* Direct 32 bit.  */
++#define R_390_PC32		5	/* PC relative 32 bit.	*/
++#define R_390_GOT12		6	/* 12 bit GOT offset.  */
++#define R_390_GOT32		7	/* 32 bit GOT offset.  */
++#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
++#define R_390_COPY		9	/* Copy symbol at runtime.  */
++#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
++#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
++#define R_390_RELATIVE		12	/* Adjust by program base.  */
++#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
++#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
++#define R_390_GOT16		15	/* 16 bit GOT offset.  */
++#define R_390_PC16		16	/* PC relative 16 bit.	*/
++#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
++#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
++#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
++#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
++#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
++#define R_390_64		22	/* Direct 64 bit.  */
++#define R_390_PC64		23	/* PC relative 64 bit.	*/
++#define R_390_GOT64		24	/* 64 bit GOT offset.  */
++#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
++#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
++#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
++#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
++#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
++#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
++#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
++#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
++#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
++#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
++#define R_390_TLS_GDCALL	38	/* Tag for function call in general
++					   dynamic TLS code. */
++#define R_390_TLS_LDCALL	39	/* Tag for function call in local
++					   dynamic TLS code. */
++#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
++					   thread local data.  */
++#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
++					  thread local data.  */
++#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
++					   block offset. */
++#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
++#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
++#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
++					   block.  */
++#define R_390_20		57	/* Direct 20 bit.  */
++#define R_390_GOT20		58	/* 20 bit GOT offset.  */
++#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
++#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
++/* Keep this the last entry.  */
++#define R_390_NUM		62
++
++
++/* CRIS relocations.  */
++#define R_CRIS_NONE		0
++#define R_CRIS_8		1
++#define R_CRIS_16		2
++#define R_CRIS_32		3
++#define R_CRIS_8_PCREL		4
++#define R_CRIS_16_PCREL		5
++#define R_CRIS_32_PCREL		6
++#define R_CRIS_GNU_VTINHERIT	7
++#define R_CRIS_GNU_VTENTRY	8
++#define R_CRIS_COPY		9
++#define R_CRIS_GLOB_DAT		10
++#define R_CRIS_JUMP_SLOT	11
++#define R_CRIS_RELATIVE		12
++#define R_CRIS_16_GOT		13
++#define R_CRIS_32_GOT		14
++#define R_CRIS_16_GOTPLT	15
++#define R_CRIS_32_GOTPLT	16
++#define R_CRIS_32_GOTREL	17
++#define R_CRIS_32_PLT_GOTREL	18
++#define R_CRIS_32_PLT_PCREL	19
++
++#define R_CRIS_NUM		20
++
++
++/* AMD x86-64 relocations.  */
++#define R_X86_64_NONE		0	/* No reloc */
++#define R_X86_64_64		1	/* Direct 64 bit  */
++#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
++#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
++#define R_X86_64_PLT32		4	/* 32 bit PLT address */
++#define R_X86_64_COPY		5	/* Copy symbol at runtime */
++#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
++#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
++#define R_X86_64_RELATIVE	8	/* Adjust by program base */
++#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
++					   offset to GOT */
++#define R_X86_64_32		10	/* Direct 32 bit zero extended */
++#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
++#define R_X86_64_16		12	/* Direct 16 bit zero extended */
++#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
++#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
++#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
++#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
++#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
++#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
++#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
++					   to two GOT entries for GD symbol */
++#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
++					   to two GOT entries for LD symbol */
++#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
++#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
++					   to GOT entry for IE symbol */
++#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
++#define R_X86_64_PC64		24	/* PC relative 64 bit */
++#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
++#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
++					   offset to GOT */
++#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
++#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
++					   to GOT entry */
++#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
++#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
++#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
++					   to PLT entry */
++#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
++#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
++#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
++#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
++					   descriptor.  */
++#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
++#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
++#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
++
++#define R_X86_64_NUM		39
++
++
++/* AM33 relocations.  */
++#define R_MN10300_NONE		0	/* No reloc.  */
++#define R_MN10300_32		1	/* Direct 32 bit.  */
++#define R_MN10300_16		2	/* Direct 16 bit.  */
++#define R_MN10300_8		3	/* Direct 8 bit.  */
++#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
++#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
++#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
++#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
++#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
++#define R_MN10300_24		9	/* Direct 24 bit.  */
++#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
++#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
++#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
++#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
++#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
++#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
++#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
++#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
++#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
++#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
++#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
++#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
++
++#define R_MN10300_NUM		24
++
++
++/* M32R relocs.  */
++#define R_M32R_NONE		0	/* No reloc. */
++#define R_M32R_16		1	/* Direct 16 bit. */
++#define R_M32R_32		2	/* Direct 32 bit. */
++#define R_M32R_24		3	/* Direct 24 bit. */
++#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
++#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
++#define R_M32R_LO16		9	/* Low 16 bit. */
++#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
++#define R_M32R_GNU_VTINHERIT	11
++#define R_M32R_GNU_VTENTRY	12
++/* M32R relocs use SHT_RELA.  */
++#define R_M32R_16_RELA		33	/* Direct 16 bit. */
++#define R_M32R_32_RELA		34	/* Direct 32 bit. */
++#define R_M32R_24_RELA		35	/* Direct 24 bit. */
++#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
++#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
++#define R_M32R_LO16_RELA	41	/* Low 16 bit */
++#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
++#define R_M32R_RELA_GNU_VTINHERIT	43
++#define R_M32R_RELA_GNU_VTENTRY	44
++#define R_M32R_REL32		45	/* PC relative 32 bit.  */
++
++#define R_M32R_GOT24		48	/* 24 bit GOT entry */
++#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
++#define R_M32R_COPY		50	/* Copy symbol at runtime */
++#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
++#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
++#define R_M32R_RELATIVE		53	/* Adjust by program base */
++#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
++#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
++#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
++					   low */
++#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
++					   low */
++#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
++#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
++					   GOT with unsigned low */
++#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
++					   GOT with signed low */
++#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
++					   GOT */
++#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
++					   with unsigned low */
++#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
++					   with signed low */
++#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
++#define R_M32R_NUM		256	/* Keep this the last entry. */
++
++
++/* TILEPro relocations.  */
++#define R_TILEPRO_NONE		0	/* No reloc */
++#define R_TILEPRO_32		1	/* Direct 32 bit */
++#define R_TILEPRO_16		2	/* Direct 16 bit */
++#define R_TILEPRO_8		3	/* Direct 8 bit */
++#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
++#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
++#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
++#define R_TILEPRO_LO16		7	/* Low 16 bit */
++#define R_TILEPRO_HI16		8	/* High 16 bit */
++#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
++#define R_TILEPRO_COPY		10	/* Copy relocation */
++#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
++#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
++#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
++#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
++#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
++#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
++#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
++#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
++#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
++#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
++#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
++#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
++#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
++#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
++#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
++#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
++#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
++#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
++#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
++/* Relocs 56-59 are currently not defined.  */
++#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
++#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
++#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
++#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
++#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
++#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
++
++#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEPRO_NUM		130
++
++
++/* TILE-Gx relocations.  */
++#define R_TILEGX_NONE		0	/* No reloc */
++#define R_TILEGX_64		1	/* Direct 64 bit */
++#define R_TILEGX_32		2	/* Direct 32 bit */
++#define R_TILEGX_16		3	/* Direct 16 bit */
++#define R_TILEGX_8		4	/* Direct 8 bit */
++#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
++#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
++#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
++#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
++#define R_TILEGX_HW0		9	/* hword 0 16-bit */
++#define R_TILEGX_HW1		10	/* hword 1 16-bit */
++#define R_TILEGX_HW2		11	/* hword 2 16-bit */
++#define R_TILEGX_HW3		12	/* hword 3 16-bit */
++#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
++#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
++#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
++#define R_TILEGX_COPY		16	/* Copy relocation */
++#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
++#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
++#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
++#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
++#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
++#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
++#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
++#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
++#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
++#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
++#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
++#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
++#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
++#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
++#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
++#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
++#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
++#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
++#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
++#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
++#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
++#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
++#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
++#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
++#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
++#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
++#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
++/* Relocs 66-71 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
++#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
++/* Relocs 76-77 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
++/* Relocs 90-91 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
++/* Relocs 94-99 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
++/* Relocs 104-105 are currently not defined.  */
++#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
++#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
++#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
++#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
++#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
++
++#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEGX_NUM		130
++
++#endif	/* elf.h */
diff --git a/trunk/target/linux/generic/patches-3.14/212-byteshift_portability.patch b/trunk/target/linux/generic/patches-3.14/212-byteshift_portability.patch
new file mode 100644
index 00000000..0f23ba9b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/212-byteshift_portability.patch
@@ -0,0 +1,51 @@
+--- a/tools/include/tools/be_byteshift.h
++++ b/tools/include/tools/be_byteshift.h
+@@ -1,6 +1,10 @@
+ #ifndef _TOOLS_BE_BYTESHIFT_H
+ #define _TOOLS_BE_BYTESHIFT_H
+ 
++#ifndef __linux__
++#include "linux_types.h"
++#endif
++
+ #include <stdint.h>
+ 
+ static inline uint16_t __get_unaligned_be16(const uint8_t *p)
+--- a/tools/include/tools/le_byteshift.h
++++ b/tools/include/tools/le_byteshift.h
+@@ -1,6 +1,10 @@
+ #ifndef _TOOLS_LE_BYTESHIFT_H
+ #define _TOOLS_LE_BYTESHIFT_H
+ 
++#ifndef __linux__
++#include "linux_types.h"
++#endif
++
+ #include <stdint.h>
+ 
+ static inline uint16_t __get_unaligned_le16(const uint8_t *p)
+--- /dev/null
++++ b/tools/include/tools/linux_types.h
+@@ -0,0 +1,22 @@
++#ifndef __LINUX_TYPES_H
++#define __LINUX_TYPES_H
++
++#include <stdint.h>
++
++typedef uint8_t __u8;
++typedef uint8_t __be8;
++typedef uint8_t __le8;
++
++typedef uint16_t __u16;
++typedef uint16_t __be16;
++typedef uint16_t __le16;
++
++typedef uint32_t __u32;
++typedef uint32_t __be32;
++typedef uint32_t __le32;
++
++typedef uint64_t __u64;
++typedef uint64_t __be64;
++typedef uint64_t __le64;
++
++#endif
diff --git a/trunk/target/linux/generic/patches-3.14/220-gc_sections.patch b/trunk/target/linux/generic/patches-3.14/220-gc_sections.patch
new file mode 100644
index 00000000..1beafaaa
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/220-gc_sections.patch
@@ -0,0 +1,540 @@
+From: Felix Fietkau <nbd@openwrt.org>
+
+use -ffunction-sections, -fdata-sections and --gc-sections --sort-section=name
+
+In combination with kernel symbol export stripping this significantly reduces
+the kernel image size. Used on both ARM and MIPS architectures.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -89,10 +89,14 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ #
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y			+= -msoft-float
+-LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
++LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
++endif
++
+ cflags-y += -ffreestanding
+ 
+ #
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -67,7 +67,7 @@ SECTIONS
+ 	/* Exception table for data bus errors */
+ 	__dbe_table : {
+ 		__start___dbe_table = .;
+-		*(__dbe_table)
++		KEEP(*(__dbe_table))
+ 		__stop___dbe_table = .;
+ 	}
+ 
+@@ -112,7 +112,7 @@ SECTIONS
+ 	. = ALIGN(4);
+ 	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
+ 		__mips_machines_start = .;
+-		*(.mips.machines.init)
++		KEEP(*(.mips.machines.init))
+ 		__mips_machines_end = .;
+ 	}
+ 
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -87,7 +87,7 @@
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ #define MCOUNT_REC()	. = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__start_mcount_loc) = .; \
+-			*(__mcount_loc)				\
++			KEEP(*(__mcount_loc))			\
+ 			VMLINUX_SYMBOL(__stop_mcount_loc) = .;
+ #else
+ #define MCOUNT_REC()
+@@ -95,7 +95,7 @@
+ 
+ #ifdef CONFIG_TRACE_BRANCH_PROFILING
+ #define LIKELY_PROFILE()	VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
+-				*(_ftrace_annotated_branch)			      \
++				KEEP(*(_ftrace_annotated_branch))		      \
+ 				VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
+ #else
+ #define LIKELY_PROFILE()
+@@ -103,7 +103,7 @@
+ 
+ #ifdef CONFIG_PROFILE_ALL_BRANCHES
+ #define BRANCH_PROFILE()	VMLINUX_SYMBOL(__start_branch_profile) = .;   \
+-				*(_ftrace_branch)			      \
++				KEEP(*(_ftrace_branch))			      \
+ 				VMLINUX_SYMBOL(__stop_branch_profile) = .;
+ #else
+ #define BRANCH_PROFILE()
+@@ -112,7 +112,7 @@
+ #ifdef CONFIG_EVENT_TRACING
+ #define FTRACE_EVENTS()	. = ALIGN(8);					\
+ 			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\
+-			*(_ftrace_events)				\
++			KEEP(*(_ftrace_events))				\
+ 			VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+ #else
+ #define FTRACE_EVENTS()
+@@ -120,7 +120,7 @@
+ 
+ #ifdef CONFIG_TRACING
+ #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .;      \
+-			 *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
++			 KEEP(*(__trace_printk_fmt)) /* Trace_printk fmt' pointer */ \
+ 			 VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
+ #define TRACEPOINT_STR() VMLINUX_SYMBOL(__start___tracepoint_str) = .;	\
+ 			 *(__tracepoint_str) /* Trace_printk fmt' pointer */ \
+@@ -133,7 +133,7 @@
+ #ifdef CONFIG_FTRACE_SYSCALLS
+ #define TRACE_SYSCALLS() . = ALIGN(8);					\
+ 			 VMLINUX_SYMBOL(__start_syscalls_metadata) = .;	\
+-			 *(__syscalls_metadata)				\
++			 KEEP(*(__syscalls_metadata))			\
+ 			 VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
+ #else
+ #define TRACE_SYSCALLS()
+@@ -142,8 +142,8 @@
+ #ifdef CONFIG_CLKSRC_OF
+ #define CLKSRC_OF_TABLES() . = ALIGN(8);				\
+ 			   VMLINUX_SYMBOL(__clksrc_of_table) = .;	\
+-			   *(__clksrc_of_table)				\
+-			   *(__clksrc_of_table_end)
++			   KEEP(*(__clksrc_of_table))			\
++			   KEEP(*(__clksrc_of_table_end))
+ #else
+ #define CLKSRC_OF_TABLES()
+ #endif
+@@ -152,8 +152,8 @@
+ #define IRQCHIP_OF_MATCH_TABLE()					\
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__irqchip_begin) = .;				\
+-	*(__irqchip_of_table)		  				\
+-	*(__irqchip_of_end)
++	KEEP(*(__irqchip_of_table))	  				\
++	KEEP(*(__irqchip_of_end))
+ #else
+ #define IRQCHIP_OF_MATCH_TABLE()
+ #endif
+@@ -161,8 +161,8 @@
+ #ifdef CONFIG_COMMON_CLK
+ #define CLK_OF_TABLES() . = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__clk_of_table) = .;	\
+-			*(__clk_of_table)			\
+-			*(__clk_of_table_end)
++			KEEP(*(__clk_of_table))			\
++			KEEP(*(__clk_of_table_end))
+ #else
+ #define CLK_OF_TABLES()
+ #endif
+@@ -170,7 +170,7 @@
+ #define KERNEL_DTB()							\
+ 	STRUCT_ALIGN();							\
+ 	VMLINUX_SYMBOL(__dtb_start) = .;				\
+-	*(.dtb.init.rodata)						\
++	KEEP(*(.dtb.init.rodata))					\
+ 	VMLINUX_SYMBOL(__dtb_end) = .;
+ 
+ /* .data section */
+@@ -186,16 +186,17 @@
+ 	/* implement dynamic printk debug */				\
+ 	. = ALIGN(8);                                                   \
+ 	VMLINUX_SYMBOL(__start___jump_table) = .;                       \
+-	*(__jump_table)                                                 \
++	KEEP(*(__jump_table))                                           \
+ 	VMLINUX_SYMBOL(__stop___jump_table) = .;                        \
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__start___verbose) = .;                          \
+-	*(__verbose)                                                    \
++	KEEP(*(__verbose))                                              \
+ 	VMLINUX_SYMBOL(__stop___verbose) = .;				\
+ 	LIKELY_PROFILE()		       				\
+ 	BRANCH_PROFILE()						\
+ 	TRACE_PRINTKS()							\
+-	TRACEPOINT_STR()
++	TRACEPOINT_STR()                                                \
++	*(.data.[a-zA-Z_]*)
+ 
+ /*
+  * Data section helpers
+@@ -249,32 +250,32 @@
+ 	/* PCI quirks */						\
+ 	.pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_early) = .;		\
+-		*(.pci_fixup_early)					\
++		KEEP(*(.pci_fixup_early))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_early) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_header) = .;		\
+-		*(.pci_fixup_header)					\
++		KEEP(*(.pci_fixup_header))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_header) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_final) = .;		\
+-		*(.pci_fixup_final)					\
++		KEEP(*(.pci_fixup_final))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_final) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;		\
+-		*(.pci_fixup_enable)					\
++		KEEP(*(.pci_fixup_enable))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;		\
+-		*(.pci_fixup_resume)					\
++		KEEP(*(.pci_fixup_resume))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;	\
+-		*(.pci_fixup_resume_early)				\
++		KEEP(*(.pci_fixup_resume_early))			\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;		\
+-		*(.pci_fixup_suspend)					\
++		KEEP(*(.pci_fixup_suspend))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;		\
+ 	}								\
+ 									\
+ 	/* Built-in firmware blobs */					\
+ 	.builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_builtin_fw) = .;			\
+-		*(.builtin_fw)						\
++		KEEP(*(.builtin_fw))					\
+ 		VMLINUX_SYMBOL(__end_builtin_fw) = .;			\
+ 	}								\
+ 									\
+@@ -283,49 +284,49 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		*(SORT(___ksymtab+*))					\
++		KEEP(*(SORT(___ksymtab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		*(SORT(___ksymtab_gpl+*))				\
++		KEEP(*(SORT(___ksymtab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal unused symbols */		\
+ 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
+-		*(SORT(___ksymtab_unused+*))				\
++		KEEP(*(SORT(___ksymtab_unused+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
+-		*(SORT(___ksymtab_unused_gpl+*))			\
++		KEEP(*(SORT(___ksymtab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
+-		*(SORT(___ksymtab_gpl_future+*))			\
++		KEEP(*(SORT(___ksymtab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__kcrctab         : AT(ADDR(__kcrctab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___kcrctab) = .;			\
+-		*(SORT(___kcrctab+*))					\
++		KEEP(*(SORT(___kcrctab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__kcrctab_gpl     : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl) = .;		\
+-		*(SORT(___kcrctab_gpl+*))				\
++		KEEP(*(SORT(___kcrctab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -339,14 +340,14 @@
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .;	\
+-		*(SORT(___kcrctab_unused_gpl+*))			\
++		KEEP(*(SORT(___kcrctab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .;	\
+-		*(SORT(___kcrctab_gpl_future+*))			\
++		KEEP(*(SORT(___kcrctab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .;	\
+ 	}								\
+ 									\
+@@ -365,14 +366,14 @@
+ 	/* Built-in module parameters. */				\
+ 	__param : AT(ADDR(__param) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___param) = .;			\
+-		*(__param)						\
++		KEEP(*(__param))					\
+ 		VMLINUX_SYMBOL(__stop___param) = .;			\
+ 	}								\
+ 									\
+ 	/* Built-in module versions. */					\
+ 	__modver : AT(ADDR(__modver) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___modver) = .;			\
+-		*(__modver)						\
++		KEEP(*(__modver))					\
+ 		VMLINUX_SYMBOL(__stop___modver) = .;			\
+ 		. = ALIGN((align));					\
+ 		VMLINUX_SYMBOL(__end_rodata) = .;			\
+@@ -428,7 +429,7 @@
+ #define ENTRY_TEXT							\
+ 		ALIGN_FUNCTION();					\
+ 		VMLINUX_SYMBOL(__entry_text_start) = .;			\
+-		*(.entry.text)						\
++		KEEP(*(.entry.text))					\
+ 		VMLINUX_SYMBOL(__entry_text_end) = .;
+ 
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+@@ -456,7 +457,7 @@
+ 	. = ALIGN(align);						\
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ex_table) = .;			\
+-		*(__ex_table)						\
++		KEEP(*(__ex_table))						\
+ 		VMLINUX_SYMBOL(__stop___ex_table) = .;			\
+ 	}
+ 
+@@ -472,8 +473,8 @@
+ #ifdef CONFIG_CONSTRUCTORS
+ #define KERNEL_CTORS()	. = ALIGN(8);			   \
+ 			VMLINUX_SYMBOL(__ctors_start) = .; \
+-			*(.ctors)			   \
+-			*(.init_array)			   \
++			KEEP(*(.ctors))			   \
++			KEEP(*(.init_array))		   \
+ 			VMLINUX_SYMBOL(__ctors_end) = .;
+ #else
+ #define KERNEL_CTORS()
+@@ -517,7 +518,7 @@
+ #define SBSS(sbss_align)						\
+ 	. = ALIGN(sbss_align);						\
+ 	.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {				\
+-		*(.sbss)						\
++		*(.sbss .sbss.*)					\
+ 		*(.scommon)						\
+ 	}
+ 
+@@ -535,7 +536,7 @@
+ 		BSS_FIRST_SECTIONS					\
+ 		*(.bss..page_aligned)					\
+ 		*(.dynbss)						\
+-		*(.bss)							\
++		*(.bss .bss.*)						\
+ 		*(COMMON)						\
+ 	}
+ 
+@@ -584,7 +585,7 @@
+ 	. = ALIGN(8);							\
+ 	__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___bug_table) = .;		\
+-		*(__bug_table)						\
++		KEEP(*(__bug_table))	\
+ 		VMLINUX_SYMBOL(__stop___bug_table) = .;			\
+ 	}
+ #else
+@@ -596,7 +597,7 @@
+ 	. = ALIGN(4);							\
+ 	.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__tracedata_start) = .;			\
+-		*(.tracedata)						\
++		KEEP(*(.tracedata))					\
+ 		VMLINUX_SYMBOL(__tracedata_end) = .;			\
+ 	}
+ #else
+@@ -613,17 +614,17 @@
+ #define INIT_SETUP(initsetup_align)					\
+ 		. = ALIGN(initsetup_align);				\
+ 		VMLINUX_SYMBOL(__setup_start) = .;			\
+-		*(.init.setup)						\
++		KEEP(*(.init.setup))					\
+ 		VMLINUX_SYMBOL(__setup_end) = .;
+ 
+ #define INIT_CALLS_LEVEL(level)						\
+ 		VMLINUX_SYMBOL(__initcall##level##_start) = .;		\
+-		*(.initcall##level##.init)				\
+-		*(.initcall##level##s.init)				\
++		KEEP(*(.initcall##level##.init))			\
++		KEEP(*(.initcall##level##s.init))			\
+ 
+ #define INIT_CALLS							\
+ 		VMLINUX_SYMBOL(__initcall_start) = .;			\
+-		*(.initcallearly.init)					\
++		KEEP(*(.initcallearly.init))				\
+ 		INIT_CALLS_LEVEL(0)					\
+ 		INIT_CALLS_LEVEL(1)					\
+ 		INIT_CALLS_LEVEL(2)					\
+@@ -637,21 +638,21 @@
+ 
+ #define CON_INITCALL							\
+ 		VMLINUX_SYMBOL(__con_initcall_start) = .;		\
+-		*(.con_initcall.init)					\
++		KEEP(*(.con_initcall.init))				\
+ 		VMLINUX_SYMBOL(__con_initcall_end) = .;
+ 
+ #define SECURITY_INITCALL						\
+ 		VMLINUX_SYMBOL(__security_initcall_start) = .;		\
+-		*(.security_initcall.init)				\
++		KEEP(*(.security_initcall.init))			\
+ 		VMLINUX_SYMBOL(__security_initcall_end) = .;
+ 
+ #ifdef CONFIG_BLK_DEV_INITRD
+ #define INIT_RAM_FS							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__initramfs_start) = .;				\
+-	*(.init.ramfs)							\
++	KEEP(*(.init.ramfs))						\
+ 	. = ALIGN(8);							\
+-	*(.init.ramfs.info)
++	KEEP(*(.init.ramfs.info))
+ #else
+ #define INIT_RAM_FS
+ #endif
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
+@@ -18,11 +18,16 @@ ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
+ LDFLAGS_vmlinux	+= --be8
+ LDFLAGS_MODULE	+= --be8
+ endif
++LDFLAGS_vmlinux += --gc-sections --sort-section=name
+ 
+ OBJCOPYFLAGS	:=-O binary -R .comment -S
+ GZFLAGS		:=-9
+ #KBUILD_CFLAGS	+=-pipe
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
++endif
++
+ # Never generate .eh_frame
+ KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
+ 
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -12,13 +12,13 @@
+ #define PROC_INFO							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__proc_info_begin) = .;				\
+-	*(.proc.info.init)						\
++	KEEP(*(.proc.info.init))					\
+ 	VMLINUX_SYMBOL(__proc_info_end) = .;
+ 
+ #define IDMAP_TEXT							\
+ 	ALIGN_FUNCTION();						\
+ 	VMLINUX_SYMBOL(__idmap_text_start) = .;				\
+-	*(.idmap.text)							\
++	KEEP(*(.idmap.text))						\
+ 	VMLINUX_SYMBOL(__idmap_text_end) = .;				\
+ 	. = ALIGN(32);							\
+ 	VMLINUX_SYMBOL(__hyp_idmap_text_start) = .;			\
+@@ -93,7 +93,7 @@ SECTIONS
+ 	.text : {			/* Real text segment		*/
+ 		_stext = .;		/* Text and read-only data	*/
+ 			__exception_text_start = .;
+-			*(.exception.text)
++			KEEP(*(.exception.text))
+ 			__exception_text_end = .;
+ 			IRQENTRY_TEXT
+ 			TEXT_TEXT
+@@ -118,7 +118,7 @@ SECTIONS
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+ 		__start___ex_table = .;
+ #ifdef CONFIG_MMU
+-		*(__ex_table)
++		KEEP(*(__ex_table))
+ #endif
+ 		__stop___ex_table = .;
+ 	}
+@@ -130,12 +130,12 @@ SECTIONS
+ 	. = ALIGN(8);
+ 	.ARM.unwind_idx : {
+ 		__start_unwind_idx = .;
+-		*(.ARM.exidx*)
++		KEEP(*(.ARM.exidx*))
+ 		__stop_unwind_idx = .;
+ 	}
+ 	.ARM.unwind_tab : {
+ 		__start_unwind_tab = .;
+-		*(.ARM.extab*)
++		KEEP(*(.ARM.extab*))
+ 		__stop_unwind_tab = .;
+ 	}
+ #endif
+@@ -154,14 +154,14 @@ SECTIONS
+ 	 */
+ 	__vectors_start = .;
+ 	.vectors 0 : AT(__vectors_start) {
+-		*(.vectors)
++		KEEP(*(.vectors))
+ 	}
+ 	. = __vectors_start + SIZEOF(.vectors);
+ 	__vectors_end = .;
+ 
+ 	__stubs_start = .;
+ 	.stubs 0x1000 : AT(__stubs_start) {
+-		*(.stubs)
++		KEEP(*(.stubs))
+ 	}
+ 	. = __stubs_start + SIZEOF(.stubs);
+ 	__stubs_end = .;
+@@ -175,24 +175,24 @@ SECTIONS
+ 	}
+ 	.init.arch.info : {
+ 		__arch_info_begin = .;
+-		*(.arch.info.init)
++		KEEP(*(.arch.info.init))
+ 		__arch_info_end = .;
+ 	}
+ 	.init.tagtable : {
+ 		__tagtable_begin = .;
+-		*(.taglist.init)
++		KEEP(*(.taglist.init))
+ 		__tagtable_end = .;
+ 	}
+ #ifdef CONFIG_SMP_ON_UP
+ 	.init.smpalt : {
+ 		__smpalt_begin = .;
+-		*(.alt.smp.init)
++		KEEP(*(.alt.smp.init))
+ 		__smpalt_end = .;
+ 	}
+ #endif
+ 	.init.pv_table : {
+ 		__pv_table_begin = .;
+-		*(.pv_table)
++		KEEP(*(.pv_table))
+ 		__pv_table_end = .;
+ 	}
+ 	.init.data : {
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -120,6 +120,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
+ endif
++KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
+ 
+ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)
+ asflags-y := -DZIMAGE
diff --git a/trunk/target/linux/generic/patches-3.14/221-module_exports.patch b/trunk/target/linux/generic/patches-3.14/221-module_exports.patch
new file mode 100644
index 00000000..b5380030
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/221-module_exports.patch
@@ -0,0 +1,88 @@
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -52,6 +52,16 @@
+ #define LOAD_OFFSET 0
+ #endif
+ 
++#ifndef SYMTAB_KEEP
++#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*)))
++#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*)))
++#endif
++
++#ifndef SYMTAB_DISCARD
++#define SYMTAB_DISCARD
++#define SYMTAB_DISCARD_GPL
++#endif
++
+ #include <linux/export.h>
+ 
+ /* Align . to a 8 byte boundary equals to maximum function alignment. */
+@@ -284,14 +294,14 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		KEEP(*(SORT(___ksymtab+*)))				\
++		SYMTAB_KEEP						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		KEEP(*(SORT(___ksymtab_gpl+*)))				\
++		SYMTAB_KEEP_GPL						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -353,7 +363,7 @@
+ 									\
+ 	/* Kernel symbol table: strings */				\
+         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
+-		*(__ksymtab_strings)					\
++		*(__ksymtab_strings+*)					\
+ 	}								\
+ 									\
+ 	/* __*init sections */						\
+@@ -671,6 +681,8 @@
+ 	EXIT_TEXT							\
+ 	EXIT_DATA							\
+ 	EXIT_CALL							\
++	SYMTAB_DISCARD							\
++	SYMTAB_DISCARD_GPL						\
+ 	*(.discard)							\
+ 	*(.discard.*)							\
+ 	}
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -349,7 +349,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
+ # Linker scripts preprocessor (.lds.S -> .lds)
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds_S = LDS     $@
+-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
++      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \
+ 	                     -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
+ 
+ $(obj)/%.lds: $(src)/%.lds.S FORCE
+--- a/include/linux/export.h
++++ b/include/linux/export.h
+@@ -52,12 +52,19 @@ extern struct module __this_module;
+ #define __CRC_SYMBOL(sym, sec)
+ #endif
+ 
++#ifdef MODULE
++#define __EXPORT_SUFFIX(sym)
++#else
++#define __EXPORT_SUFFIX(sym) "+" #sym
++#endif
++
+ /* For every exported symbol, place a struct in the __ksymtab section */
+ #define __EXPORT_SYMBOL(sym, sec)				\
+ 	extern typeof(sym) sym;					\
+ 	__CRC_SYMBOL(sym, sec)					\
+ 	static const char __kstrtab_##sym[]			\
+-	__attribute__((section("__ksymtab_strings"), aligned(1))) \
++	__attribute__((section("__ksymtab_strings"		\
++	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
+ 	= VMLINUX_SYMBOL_STR(sym);				\
+ 	extern const struct kernel_symbol __ksymtab_##sym;	\
+ 	__visible const struct kernel_symbol __ksymtab_##sym	\
diff --git a/trunk/target/linux/generic/patches-3.14/230-openwrt_lzma_options.patch b/trunk/target/linux/generic/patches-3.14/230-openwrt_lzma_options.patch
new file mode 100644
index 00000000..6d9407eb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/230-openwrt_lzma_options.patch
@@ -0,0 +1,58 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -304,7 +304,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -226,7 +226,7 @@ cpio_list=
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -n -9 -f"
++compr="gzip -n -9 -f -"
+ 
+ arg="$1"
+ case "$arg" in
+@@ -242,13 +242,13 @@ case "$arg" in
+ 		output=${cpio_list}
+ 		echo "$output_file" | grep -q "\.gz$" \
+                 && [ -x "`which gzip 2> /dev/null`" ] \
+-                && compr="gzip -n -9 -f"
++                && compr="gzip -n -9 -f -"
+ 		echo "$output_file" | grep -q "\.bz2$" \
+                 && [ -x "`which bzip2 2> /dev/null`" ] \
+-                && compr="bzip2 -9 -f"
++                && compr="bzip2 -9 -f -"
+ 		echo "$output_file" | grep -q "\.lzma$" \
+                 && [ -x "`which lzma 2> /dev/null`" ] \
+-                && compr="lzma -9 -f"
++                && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
+ 		echo "$output_file" | grep -q "\.xz$" \
+                 && [ -x "`which xz 2> /dev/null`" ] \
+                 && compr="xz --check=crc32 --lzma2=dict=1MiB"
+@@ -315,7 +315,7 @@ if [ ! -z ${output_file} ]; then
+ 	if [ "${is_cpio_compressed}" = "compressed" ]; then
+ 		cat ${cpio_tfile} > ${output_file}
+ 	else
+-		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
++		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
+ 		|| (rm -f ${output_file} ; false)
+ 	fi
+ 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
+--- a/lib/decompress.c
++++ b/lib/decompress.c
+@@ -47,6 +47,7 @@ static const struct compress_format comp
+ 	{ {037, 0236}, "gzip", gunzip },
+ 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
+ 	{ {0x5d, 0x00}, "lzma", unlzma },
++	{ {0x6d, 0x00}, "lzma-librecmc", unlzma },
+ 	{ {0xfd, 0x37}, "xz", unxz },
+ 	{ {0x89, 0x4c}, "lzo", unlzo },
+ 	{ {0x02, 0x21}, "lz4", unlz4 },
diff --git a/trunk/target/linux/generic/patches-3.14/250-netfilter_depends.patch b/trunk/target/linux/generic/patches-3.14/250-netfilter_depends.patch
new file mode 100644
index 00000000..e9239a7e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/250-netfilter_depends.patch
@@ -0,0 +1,18 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -207,7 +207,6 @@ config NF_CONNTRACK_FTP
+ 
+ config NF_CONNTRACK_H323
+ 	tristate "H.323 protocol support"
+-	depends on (IPV6 || IPV6=n)
+ 	depends on NETFILTER_ADVANCED
+ 	help
+ 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
+@@ -883,7 +882,6 @@ config NETFILTER_XT_TARGET_SECMARK
+ 
+ config NETFILTER_XT_TARGET_TCPMSS
+ 	tristate '"TCPMSS" target support'
+-	depends on (IPV6 || IPV6=n)
+ 	default m if NETFILTER_ADVANCED=n
+ 	---help---
+ 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/trunk/target/linux/generic/patches-3.14/251-sound_kconfig.patch b/trunk/target/linux/generic/patches-3.14/251-sound_kconfig.patch
new file mode 100644
index 00000000..c2ebacec
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/251-sound_kconfig.patch
@@ -0,0 +1,18 @@
+--- a/sound/core/Kconfig
++++ b/sound/core/Kconfig
+@@ -10,13 +10,13 @@ config SND_DMAENGINE_PCM
+ 	tristate
+ 
+ config SND_HWDEP
+-	tristate
++	tristate "Sound hardware support"
+ 
+ config SND_RAWMIDI
+ 	tristate
+ 
+ config SND_COMPRESS_OFFLOAD
+-	tristate
++	tristate "Compression offloading support"
+ 
+ # To be effective this also requires INPUT - users should say:
+ #    select SND_JACK if INPUT=y || INPUT=SND
diff --git a/trunk/target/linux/generic/patches-3.14/252-mv_cesa_depends.patch b/trunk/target/linux/generic/patches-3.14/252-mv_cesa_depends.patch
new file mode 100644
index 00000000..fee28db1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/252-mv_cesa_depends.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
+ 	depends on PLAT_ORION
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES
++	select CRYPTO_HASH2
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_HASH
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.14/253-ssb_b43_default_on.patch b/trunk/target/linux/generic/patches-3.14/253-ssb_b43_default_on.patch
new file mode 100644
index 00000000..29d2a41a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/253-ssb_b43_default_on.patch
@@ -0,0 +1,29 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+ 	bool
+ 	depends on SSB
++	default y
+ 
+ config SSB_PCIHOST_POSSIBLE
+ 	bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
+ config SSB_B43_PCI_BRIDGE
+ 	bool
+ 	depends on SSB_PCIHOST
+-	default n
++	default y
+ 
+ config SSB_PCMCIAHOST_POSSIBLE
+ 	bool
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -17,6 +17,7 @@ config BCMA
+ config BCMA_BLOCKIO
+ 	bool
+ 	depends on BCMA
++	default y
+ 
+ config BCMA_HOST_PCI_POSSIBLE
+ 	bool
diff --git a/trunk/target/linux/generic/patches-3.14/254-textsearch_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.14/254-textsearch_kconfig_hacks.patch
new file mode 100644
index 00000000..00e24b48
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/254-textsearch_kconfig_hacks.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -308,16 +308,16 @@ config BCH_CONST_T
+ # Textsearch support is select'ed if needed
+ #
+ config TEXTSEARCH
+-	boolean
++	boolean	"Textsearch support"
+ 
+ config TEXTSEARCH_KMP
+-	tristate
++	tristate "Textsearch KMP"
+ 
+ config TEXTSEARCH_BM
+-	tristate
++	tristate "Textsearch BM"
+ 
+ config TEXTSEARCH_FSM
+-	tristate
++	tristate "Textsearch FSM"
+ 
+ config BTREE
+ 	boolean
diff --git a/trunk/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch
new file mode 100644
index 00000000..36281930
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch
@@ -0,0 +1,31 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -140,7 +140,7 @@ config CFG80211_WEXT
+ 	  extensions with cfg80211-based drivers.
+ 
+ config LIB80211
+-	tristate
++	tristate "LIB80211"
+ 	default n
+ 	help
+ 	  This options enables a library of common routines used
+@@ -149,13 +149,16 @@ config LIB80211
+ 	  Drivers should select this themselves if needed.
+ 
+ config LIB80211_CRYPT_WEP
+-	tristate
++	tristate "LIB80211_CRYPT_WEP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_CCMP
+-	tristate
++	tristate "LIB80211_CRYPT_CCMP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_TKIP
+-	tristate
++	tristate "LIB80211_CRYPT_TKIP"
++	select LIB80211
+ 
+ config LIB80211_DEBUG
+ 	bool "lib80211 debugging messages"
diff --git a/trunk/target/linux/generic/patches-3.14/256-crypto_add_kconfig_prompts.patch b/trunk/target/linux/generic/patches-3.14/256-crypto_add_kconfig_prompts.patch
new file mode 100644
index 00000000..8462c711
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/256-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -31,7 +31,7 @@ config CRYPTO_FIPS
+ 	  this is.
+ 
+ config CRYPTO_ALGAPI
+-	tristate
++	tristate "ALGAPI"
+ 	select CRYPTO_ALGAPI2
+ 	help
+ 	  This option provides the API for cryptographic algorithms.
+@@ -40,7 +40,7 @@ config CRYPTO_ALGAPI2
+ 	tristate
+ 
+ config CRYPTO_AEAD
+-	tristate
++	tristate "AEAD"
+ 	select CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -49,7 +49,7 @@ config CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_BLKCIPHER
+-	tristate
++	tristate "BLKCIPHER"
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -60,7 +60,7 @@ config CRYPTO_BLKCIPHER2
+ 	select CRYPTO_WORKQUEUE
+ 
+ config CRYPTO_HASH
+-	tristate
++	tristate "HASH"
+ 	select CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -69,7 +69,7 @@ config CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_RNG
+-	tristate
++	tristate "RNG"
+ 	select CRYPTO_RNG2
+ 	select CRYPTO_ALGAPI
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/257-wireless_ext_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.14/257-wireless_ext_kconfig_hack.patch
new file mode 100644
index 00000000..daac5898
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/257-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-	bool
++	bool "Wireless extensions"
+ 
+ config WEXT_CORE
+ 	def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+ 	depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-	bool
++	bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-	bool
++	bool "WEXT_PRIV"
+ 
+ config CFG80211
+ 	tristate "cfg80211 - wireless configuration API"
diff --git a/trunk/target/linux/generic/patches-3.14/258-netfilter_netlink_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.14/258-netfilter_netlink_kconfig_hack.patch
new file mode 100644
index 00000000..9d827c25
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/258-netfilter_netlink_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -2,7 +2,7 @@ menu "Core Netfilter Configuration"
+ 	depends on NET && INET && NETFILTER
+ 
+ config NETFILTER_NETLINK
+-	tristate
++	tristate "Netfilter NFNETLINK interface"
+ 
+ config NETFILTER_NETLINK_ACCT
+ tristate "Netfilter NFACCT over NFNETLINK interface"
diff --git a/trunk/target/linux/generic/patches-3.14/259-regmap_dynamic.patch b/trunk/target/linux/generic/patches-3.14/259-regmap_dynamic.patch
new file mode 100644
index 00000000..cf90315a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/259-regmap_dynamic.patch
@@ -0,0 +1,76 @@
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
+@@ -3,23 +3,28 @@
+ # subsystems should select the appropriate symbols.
+ 
+ config REGMAP
+-	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_MMIO || REGMAP_IRQ)
+ 	select LZO_COMPRESS
+ 	select LZO_DECOMPRESS
+ 	select IRQ_DOMAIN if REGMAP_IRQ
+-	bool
++	tristate "Regmap"
+ 
+ config REGMAP_I2C
+-	tristate
++	select REGMAP
++	tristate "Regmap I2C"
+ 
+ config REGMAP_SPI
+-	tristate
++	select REGMAP
++	depends on SPI_MASTER
++	tristate "Regmap SPI"
+ 
+ config REGMAP_SPMI
++	select REGMAP
+ 	tristate
+ 
+ config REGMAP_MMIO
++	select REGMAP
+ 	tristate
+ 
+ config REGMAP_IRQ
++	select REGMAP
+ 	bool
+--- a/include/linux/regmap.h
++++ b/include/linux/regmap.h
+@@ -49,7 +49,7 @@ struct reg_default {
+ 	unsigned int def;
+ };
+ 
+-#ifdef CONFIG_REGMAP
++#if IS_ENABLED(CONFIG_REGMAP)
+ 
+ enum regmap_endian {
+ 	/* Unspecified -> 0 -> Backwards compatible default */
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
+@@ -1,6 +1,8 @@
+-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
+-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
+-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o
++ifdef CONFIG_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/device.h>
+ #include <linux/slab.h>
+ #include <linux/export.h>
++#include <linux/module.h>
+ #include <linux/mutex.h>
+ #include <linux/err.h>
+ #include <linux/rbtree.h>
+@@ -2252,3 +2253,5 @@ static int __init regmap_initcall(void)
+ 	return 0;
+ }
+ postcore_initcall(regmap_initcall);
++
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch b/trunk/target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch
new file mode 100644
index 00000000..a28f6930
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch
@@ -0,0 +1,37 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -95,10 +95,10 @@ config CRYPTO_MANAGER
+ 
+ config CRYPTO_MANAGER2
+ 	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+-	select CRYPTO_AEAD2
+-	select CRYPTO_HASH2
+-	select CRYPTO_BLKCIPHER2
+-	select CRYPTO_PCOMP2
++	select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
+ 
+ config CRYPTO_USER
+ 	tristate "Userspace cryptographic algorithm configuration"
+--- a/crypto/algboss.c
++++ b/crypto/algboss.c
+@@ -248,6 +248,9 @@ static int cryptomgr_schedule_test(struc
+ 	type = alg->cra_flags;
+ 
+ 	/* This piece of crap needs to disappear into per-type test hooks. */
++#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
++	type |= CRYPTO_ALG_TESTED;
++#else
+ 	if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
+ 	       CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
+ 	     ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+@@ -256,6 +259,7 @@ static int cryptomgr_schedule_test(struc
+ 	    (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
+ 	     alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
+ 		type |= CRYPTO_ALG_TESTED;
++#endif
+ 
+ 	param->type = type;
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/262-compressor_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.14/262-compressor_kconfig_hack.patch
new file mode 100644
index 00000000..654608fc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/262-compressor_kconfig_hack.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -193,16 +193,16 @@ config RANDOM32_SELFTEST
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++	tristate "ZLIB inflate support"
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "ZLIB deflate support"
+ 
+ config LZO_COMPRESS
+-	tristate
++	tristate "LZO compress support"
+ 
+ config LZO_DECOMPRESS
+-	tristate
++	tristate "LZO decompress support"
+ 
+ config LZ4_COMPRESS
+ 	tristate
diff --git a/trunk/target/linux/generic/patches-3.14/270-x86_objdump_command.patch b/trunk/target/linux/generic/patches-3.14/270-x86_objdump_command.patch
new file mode 100644
index 00000000..15062691
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/270-x86_objdump_command.patch
@@ -0,0 +1,16 @@
+Use the cross toolchain objdump command instead of assuming that the host
+toolchain has it.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/arch/x86/boot/compressed/Makefile
++++ b/arch/x86/boot/compressed/Makefile
+@@ -75,7 +75,7 @@ suffix-$(CONFIG_KERNEL_XZ)	:= xz
+ suffix-$(CONFIG_KERNEL_LZO) 	:= lzo
+ suffix-$(CONFIG_KERNEL_LZ4) 	:= lz4
+ 
+-RUN_SIZE = $(shell objdump -h vmlinux | \
++RUN_SIZE = $(shell $(OBJDUMP) -h vmlinux | \
+ 	     perl $(srctree)/arch/x86/tools/calc_run_size.pl)
+ quiet_cmd_mkpiggy = MKPIGGY $@
+       cmd_mkpiggy = $(obj)/mkpiggy $< $(RUN_SIZE) > $@ || ( rm -f $@ ; false )
diff --git a/trunk/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch b/trunk/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
new file mode 100644
index 00000000..4b4ac951
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
@@ -0,0 +1,39 @@
+From: Mark Miller <mark@mirell.org>
+
+This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
+certain Broadcom chipsets running CFE in order to load the kernel.
+
+Signed-off-by: Mark Miller <mark@mirell.org>
+Acked-by: Rob Landley <rob@landley.net>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -852,9 +852,6 @@ config FW_ARC
+ config ARCH_MAY_HAVE_PC_FDC
+ 	bool
+ 
+-config BOOT_RAW
+-	bool
+-
+ config CEVT_BCM1480
+ 	bool
+ 
+@@ -2384,6 +2381,18 @@ config USE_OF
+ 	select OF_EARLY_FLATTREE
+ 	select IRQ_DOMAIN
+ 
++config BOOT_RAW
++	bool "Enable the kernel to be executed from the load address"
++	default n
++	help
++	 Allow the kernel to be executed from the load address for
++	 bootloaders which cannot read the ELF format. This places
++	 a jump to start_kernel at the load address.
++
++	 If unsure, say N.
++
++
++
+ endmenu
+ 
+ config LOCKDEP_SUPPORT
diff --git a/trunk/target/linux/generic/patches-3.14/301-mips_image_cmdline_hack.patch b/trunk/target/linux/generic/patches-3.14/301-mips_image_cmdline_hack.patch
new file mode 100644
index 00000000..2184d03d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/301-mips_image_cmdline_hack.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -946,6 +946,10 @@ config SYNC_R4K
+ config MIPS_MACHINE
+ 	def_bool n
+ 
++config IMAGE_CMDLINE_HACK
++	bool "libreCMC specific image command line hack"
++	default n
++
+ config NO_IOPORT
+ 	def_bool n
+ 
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -101,6 +101,12 @@ FEXPORT(__kernel_entry)
+ 	j	kernel_entry
+ #endif
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++	.ascii	"CMDLINE:"
++EXPORT(__image_cmdline)
++	.fill	0x400
++#endif /* CONFIG_IMAGE_CMDLINE_HACK */
++
+ 	__REF
+ 
+ NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/trunk/target/linux/generic/patches-3.14/302-mips_no_branch_likely.patch b/trunk/target/linux/generic/patches-3.14/302-mips_no_branch_likely.patch
new file mode 100644
index 00000000..19adcb80
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/302-mips_no_branch_likely.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -87,7 +87,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ # machines may also.  Since BFD is incredibly buggy with respect to
+ # crossformat linking we rely on the elf2ecoff tool for format conversion.
+ #
+-cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
++cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
diff --git a/trunk/target/linux/generic/patches-3.14/304-mips_disable_fpu.patch b/trunk/target/linux/generic/patches-3.14/304-mips_disable_fpu.patch
new file mode 100644
index 00000000..4536ce6d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/304-mips_disable_fpu.patch
@@ -0,0 +1,160 @@
+MIPS: allow disabling the kernel FPU emulator
+
+This patch allows turning off the in-kernel Algorithmics
+FPU emulator support, which allows one to save a couple of
+precious blocks on an embedded system.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+--
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -934,6 +934,17 @@ config I8259
+ config MIPS_BONITO64
+ 	bool
+ 
++config MIPS_FPU_EMU
++	bool "Enable FPU emulation"
++	default y
++	help
++	   This option allows building a kernel with or without the Algorithmics
++	   FPU emulator enabled. Turning off this option results in a kernel which
++	   does not catch floating operations exceptions. Make sure that your toolchain
++	   is configured to enable software floating point emulation in that case.
++
++	   If unsure say Y here.
++
+ config MIPS_MSC
+ 	bool
+ 
+--- a/arch/mips/math-emu/Makefile
++++ b/arch/mips/math-emu/Makefile
+@@ -2,10 +2,12 @@
+ # Makefile for the Linux/MIPS kernel FPU emulation.
+ #
+ 
+-obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
++obj-y	:= kernel_linkage.o
++
++obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
+ 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
+ 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
+ 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
+ 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
+ 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
+-	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
++	   dp_sqrt.o sp_sqrt.o dsemul.o cp1emu.o
+--- a/arch/mips/math-emu/kernel_linkage.c
++++ b/arch/mips/math-emu/kernel_linkage.c
+@@ -29,6 +29,7 @@
+ 
+ #define SIGNALLING_NAN 0x7ff800007ff80000LL
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ void fpu_emulator_init_fpu(void)
+ {
+ 	static int first = 1;
+@@ -115,3 +116,36 @@ int fpu_emulator_restore_context32(struc
+ 	return err;
+ }
+ #endif
++
++#else
++
++void fpu_emulator_init_fpu(void)
++{
++	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
++		"was compiled with software floating point support (soft-float)\n");
++	return;
++}
++
++int fpu_emulator_save_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++#ifdef CONFIG_64BIT
++int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++#endif /* CONFIG_64BIT */
++
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/include/asm/fpu_emulator.h
++++ b/arch/mips/include/asm/fpu_emulator.h
+@@ -27,6 +27,8 @@
+ #include <asm/inst.h>
+ #include <asm/local.h>
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
++
+ #ifdef CONFIG_DEBUG_FS
+ 
+ struct mips_fpu_emulator_stats {
+@@ -60,6 +62,38 @@ extern int fpu_emulator_cop1Handler(stru
+ int process_fpemu_return(int sig, void __user *fault_addr);
+ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
+ 		     unsigned long *contpc);
++#else
++static inline int mips_dsemul(struct pt_regs *regs, mips_instruction ir,
++			      unsigned long cpc)
++{
++	return 0;
++}
++
++static inline int do_dsemulret(struct pt_regs *xcp)
++{
++	return 0;
++}
++
++static inline int fpu_emulator_cop1Handler(struct pt_regs *xcp,
++					   struct mips_fpu_struct *ctx,
++					   int has_fpu,
++					   void *__user *fault_addr)
++{
++	return 0;
++}
++
++static inline int process_fpemu_return(int sig, void __user *fault_addr)
++{
++	return -EINVAL;
++}
++
++static inline int mm_isBranchInstr(struct pt_regs *regs,
++				   struct mm_decoded_insn dec_insn,
++				   unsigned long *contpc)
++{
++	return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+ 
+ /*
+  * Instruction inserted following the badinst to further tag the sequence
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -701,6 +701,7 @@ asmlinkage void do_ov(struct pt_regs *re
+ 	exception_exit(prev_state);
+ }
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ int process_fpemu_return(int sig, void __user *fault_addr)
+ {
+ 	if (sig == SIGSEGV || sig == SIGBUS) {
+@@ -724,6 +725,7 @@ int process_fpemu_return(int sig, void _
+ 		return 0;
+ 	}
+ }
++#endif /* CONFIG_MIPS_FPU_EMU */
+ 
+ /*
+  * XXX Delayed fp exceptions when doing a lazy ctx switch XXX
diff --git a/trunk/target/linux/generic/patches-3.14/305-mips_module_reloc.patch b/trunk/target/linux/generic/patches-3.14/305-mips_module_reloc.patch
new file mode 100644
index 00000000..2e92916f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/305-mips_module_reloc.patch
@@ -0,0 +1,352 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
++ifdef CONFIG_64BIT
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
++else
++KBUILD_AFLAGS_MODULE		+= -mno-long-calls
++KBUILD_CFLAGS_MODULE		+= -mno-long-calls
++endif
+ 
+ ifndef CONFIG_FUNCTION_TRACER
+ KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -11,6 +11,11 @@ struct mod_arch_specific {
+ 	const struct exception_table_entry *dbe_start;
+ 	const struct exception_table_entry *dbe_end;
+ 	struct mips_hi16 *r_mips_hi16_list;
++
++	void *phys_plt_tbl;
++	void *virt_plt_tbl;
++	unsigned int phys_plt_offset;
++	unsigned int virt_plt_offset;
+ };
+ 
+ typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -43,14 +43,222 @@ struct mips_hi16 {
+ static LIST_HEAD(dbe_list);
+ static DEFINE_SPINLOCK(dbe_lock);
+ 
+-#ifdef MODULE_START
++/*
++ * Get the potential max trampolines size required of the init and
++ * non-init sections. Only used if we cannot find enough contiguous
++ * physically mapped memory to put the module into.
++ */
++static unsigned int
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
++             const char *secstrings, unsigned int symindex, bool is_init)
++{
++	unsigned long ret = 0;
++	unsigned int i, j;
++	Elf_Sym *syms;
++
++	/* Everything marked ALLOC (this includes the exported symbols) */
++	for (i = 1; i < hdr->e_shnum; ++i) {
++		unsigned int info = sechdrs[i].sh_info;
++
++		if (sechdrs[i].sh_type != SHT_REL
++		    && sechdrs[i].sh_type != SHT_RELA)
++			continue;
++
++		/* Not a valid relocation section? */
++		if (info >= hdr->e_shnum)
++			continue;
++
++		/* Don't bother with non-allocated sections */
++		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
++			continue;
++
++		/* If it's called *.init*, and we're not init, we're
++                   not interested */
++		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
++		    != is_init)
++			continue;
++
++		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
++		if (sechdrs[i].sh_type == SHT_REL) {
++			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rel[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		} else {
++			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rela[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		}
++	}
++
++	return ret;
++}
++
++#ifndef MODULE_START
++static void *alloc_phys(unsigned long size)
++{
++	unsigned order;
++	struct page *page;
++	struct page *p;
++
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
++
++	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
++			__GFP_THISNODE, order);
++	if (!page)
++		return NULL;
++
++	split_page(page, order);
++
++	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
++		__free_page(p);
++
++	return page_address(page);
++}
++#endif
++
++static void free_phys(void *ptr, unsigned long size)
++{
++	struct page *page;
++	struct page *end;
++
++	page = virt_to_page(ptr);
++	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
++
++	for (; page < end; ++page)
++		__free_page(page);
++}
++
++
+ void *module_alloc(unsigned long size)
+ {
++#ifdef MODULE_START
+ 	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+ 				GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
+ 				__builtin_return_address(0));
++#else
++	void *ptr;
++
++	if (size == 0)
++		return NULL;
++
++	ptr = alloc_phys(size);
++
++	/* If we failed to allocate physically contiguous memory,
++	 * fall back to regular vmalloc. The module loader code will
++	 * create jump tables to handle long jumps */
++	if (!ptr)
++		return vmalloc(size);
++
++	return ptr;
++#endif
+ }
++
++static inline bool is_phys_addr(void *ptr)
++{
++#ifdef CONFIG_64BIT
++	return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else
++	return (KSEGX(ptr) == KSEG0);
+ #endif
++}
++
++/* Free memory returned from module_alloc */
++void module_free(struct module *mod, void *module_region)
++{
++	if (is_phys_addr(module_region)) {
++		if (mod->module_init == module_region)
++			free_phys(module_region, mod->init_size);
++		else if (mod->module_core == module_region)
++			free_phys(module_region, mod->core_size);
++		else
++			BUG();
++	} else {
++		vfree(module_region);
++	}
++}
++
++static void *__module_alloc(int size, bool phys)
++{
++	void *ptr;
++
++	if (phys)
++		ptr = kmalloc(size, GFP_KERNEL);
++	else
++		ptr = vmalloc(size);
++	return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++	if (is_phys_addr(ptr))
++		kfree(ptr);
++	else
++		vfree(ptr);
++}
++
++int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
++			      char *secstrings, struct module *mod)
++{
++	unsigned int symindex = 0;
++	unsigned int core_size, init_size;
++	int i;
++
++	mod->arch.phys_plt_offset = 0;
++	mod->arch.virt_plt_offset = 0;
++	mod->arch.phys_plt_tbl = NULL;
++	mod->arch.virt_plt_tbl = NULL;
++
++	if (IS_ENABLED(CONFIG_64BIT))
++		return 0;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (sechdrs[i].sh_type == SHT_SYMTAB)
++			symindex = i;
++
++	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
++	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
++
++	if ((core_size + init_size) == 0)
++		return 0;
++
++	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++	if (!mod->arch.phys_plt_tbl)
++		return -ENOMEM;
++
++	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++	if (!mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++		return -ENOMEM;
++	}
++
++	return 0;
++}
+ 
+ int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+ {
+@@ -64,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo
+ 	return 0;
+ }
+ 
++static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
++				 void *start, Elf_Addr v)
++{
++	unsigned *tramp = start + *plt_offset;
++	*plt_offset += 4 * sizeof(int);
++
++	/* adjust carry for addiu */
++	if (v & 0x00008000)
++		v += 0x10000;
++
++	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
++	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
++	tramp[2] = 0x03200008;                  /* jr t9 */
++	tramp[3] = 0x00000000;                  /* nop */
++
++	return (Elf_Addr) tramp;
++}
++
++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++	if (is_phys_addr(location))
++		return add_plt_entry_to(&me->arch.phys_plt_offset,
++				me->arch.phys_plt_tbl, v);
++	else
++		return add_plt_entry_to(&me->arch.virt_plt_offset,
++				me->arch.virt_plt_tbl, v);
++
++}
++
+ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
+ {
++	u32 ofs = *location & 0x03ffffff;
++
+ 	if (v % 4) {
+ 		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
+ 		       me->name);
+@@ -73,14 +312,17 @@ static int apply_r_mips_26_rel(struct mo
+ 	}
+ 
+ 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-		printk(KERN_ERR
+-		       "module %s: relocation overflow\n",
+-		       me->name);
+-		return -ENOEXEC;
++		v = add_plt_entry(me, location, v + (ofs << 2));
++		if (!v) {
++			printk(KERN_ERR
++				"module %s: relocation overflow\n", me->name);
++			return -ENOEXEC;
++		}
++		ofs = 0;
+ 	}
+ 
+ 	*location = (*location & ~0x03ffffff) |
+-		    ((*location + (v >> 2)) & 0x03ffffff);
++		    ((ofs + (v >> 2)) & 0x03ffffff);
+ 
+ 	return 0;
+ }
+@@ -287,11 +529,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		list_add(&me->arch.dbe_list, &dbe_list);
+ 		spin_unlock_irq(&dbe_lock);
+ 	}
++
++	/* Get rid of the fixup trampoline if we're running the module
++	 * from physically mapped address space */
++	if (me->arch.phys_plt_offset == 0) {
++		__module_free(me->arch.phys_plt_tbl);
++		me->arch.phys_plt_tbl = NULL;
++	}
++	if (me->arch.virt_plt_offset == 0) {
++		__module_free(me->arch.virt_plt_tbl);
++		me->arch.virt_plt_tbl = NULL;
++	}
++
+ 	return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++	if (mod->arch.phys_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++	}
++	if (mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.virt_plt_tbl);
++		mod->arch.virt_plt_tbl = NULL;
++	}
++
+ 	spin_lock_irq(&dbe_lock);
+ 	list_del(&mod->arch.dbe_list);
+ 	spin_unlock_irq(&dbe_lock);
diff --git a/trunk/target/linux/generic/patches-3.14/306-mips_mem_functions_performance.patch b/trunk/target/linux/generic/patches-3.14/306-mips_mem_functions_performance.patch
new file mode 100644
index 00000000..e6056fa5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/306-mips_mem_functions_performance.patch
@@ -0,0 +1,83 @@
+--- a/arch/mips/include/asm/string.h
++++ b/arch/mips/include/asm/string.h
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
+ 
+ #define __HAVE_ARCH_MEMSET
+ extern void *memset(void *__s, int __c, size_t __count);
++#define memset(__s, __c, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memset((__s), (__c), __len);		\
++	else							\
++		__ret = __builtin_memset((__s), (__c), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMCPY
+ extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
++#define memcpy(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memcpy((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memcpy((dst), (src), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMMOVE
+ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
++#define memmove(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memmove((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memmove((dst), (src), __len);	\
++	__ret;							\
++})
++
++#define __HAVE_ARCH_MEMCMP
++#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
+ 
+ #endif /* _ASM_STRING_H */
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
+@@ -4,7 +4,7 @@
+ 
+ lib-y	+= bitops.o csum_partial.o delay.o memcpy.o memset.o \
+ 	   mips-atomic.o strlen_user.o strncpy_user.o \
+-	   strnlen_user.o uncached.o
++	   strnlen_user.o uncached.o memcmp.o
+ 
+ obj-y			+= iomap.o
+ obj-$(CONFIG_PCI)	+= iomap-pci.o
+--- /dev/null
++++ b/arch/mips/lib/memcmp.c
+@@ -0,0 +1,22 @@
++/*
++ *  copied from linux/lib/string.c
++ *
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
++
++#include <linux/module.h>
++#include <linux/string.h>
++
++#undef memcmp
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++	const unsigned char *su1, *su2;
++	int res = 0;
++
++	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
++		if ((res = *su1 - *su2) != 0)
++			break;
++	return res;
++}
++EXPORT_SYMBOL(memcmp);
++
diff --git a/trunk/target/linux/generic/patches-3.14/309-mips_fuse_workaround.patch b/trunk/target/linux/generic/patches-3.14/309-mips_fuse_workaround.patch
new file mode 100644
index 00000000..68caa57a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/309-mips_fuse_workaround.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -38,6 +38,7 @@ void (*__flush_kernel_vmap_range)(unsign
+ void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);
+ 
+ EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
++EXPORT_SYMBOL(__flush_cache_all);
+ 
+ /* MIPS specific cache operations */
+ void (*flush_cache_sigtramp)(unsigned long addr);
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -20,6 +20,9 @@
+ #include <linux/swap.h>
+ #include <linux/splice.h>
+ #include <linux/aio.h>
++#ifdef CONFIG_MIPS
++#include <asm/cacheflush.h>
++#endif
+ 
+ MODULE_ALIAS_MISCDEV(FUSE_MINOR);
+ MODULE_ALIAS("devname:fuse");
+@@ -759,6 +762,9 @@ static int fuse_copy_fill(struct fuse_co
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
++#ifdef CONFIG_MIPS
++	__flush_cache_all();
++#endif
+ 	if (val) {
+ 		if (cs->write)
+ 			memcpy(cs->buf, *val, ncpy);
diff --git a/trunk/target/linux/generic/patches-3.14/310-arm_module_unresolved_weak_sym.patch b/trunk/target/linux/generic/patches-3.14/310-arm_module_unresolved_weak_sym.patch
new file mode 100644
index 00000000..9210c1d2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/310-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -83,6 +83,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+ 			return -ENOEXEC;
+ 		}
+ 
++		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
++			continue;
++
+ 		loc = dstsec->sh_addr + rel->r_offset;
+ 
+ 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/trunk/target/linux/generic/patches-3.14/320-ppc4xx_optimization.patch b/trunk/target/linux/generic/patches-3.14/320-ppc4xx_optimization.patch
new file mode 100644
index 00000000..064cc796
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/320-ppc4xx_optimization.patch
@@ -0,0 +1,31 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -191,7 +191,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS		+= -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++cpu-as-$(CONFIG_40x)		+= -Wa,-m405
++cpu-as-$(CONFIG_44x)		+= -Wa,-m440
+ cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec
+ cpu-as-$(CONFIG_E200)		+= -Wa,-me200
+ 
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -39,10 +39,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
+ DTC_FLAGS	?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
diff --git a/trunk/target/linux/generic/patches-3.14/321-powerpc_crtsavres_prereq.patch b/trunk/target/linux/generic/patches-3.14/321-powerpc_crtsavres_prereq.patch
new file mode 100644
index 00000000..b999b859
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/321-powerpc_crtsavres_prereq.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -158,7 +158,6 @@ CPP		= $(CC) -E $(KBUILD_CFLAGS)
+ 
+ CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
+ 
+-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
+ 
+ # No AltiVec or VSX instructions when building kernel
+ KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
diff --git a/trunk/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch b/trunk/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
new file mode 100644
index 00000000..ec26e09b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
@@ -0,0 +1,215 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -12,6 +12,28 @@ menuconfig MTD
+ 
+ if MTD
+ 
++menu "libreCMC specific MTD options"
++
++config MTD_ROOTFS_ROOT_DEV
++	bool "Automatically set 'rootfs' partition to be root filesystem"
++	default y
++
++config MTD_SPLIT_FIRMWARE
++	bool "Automatically split firmware partition for kernel+rootfs"
++	default y
++
++config MTD_SPLIT_FIRMWARE_NAME
++	string "Firmware partition name"
++	depends on MTD_SPLIT_FIRMWARE
++	default "firmware"
++
++config MTD_UIMAGE_SPLIT
++	bool "Enable split support for firmware partitions containing a uImage"
++	depends on MTD_SPLIT_FIRMWARE
++	default y
++
++endmenu
++
+ config MTD_TESTS
+ 	tristate "MTD tests support (DANGEROUS)"
+ 	depends on m
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -29,9 +29,11 @@
+ #include <linux/kmod.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/magic.h>
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
++#include "mtdsplit.h"
+ 
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+@@ -45,13 +47,14 @@ struct mtd_part {
+ 	struct list_head list;
+ };
+ 
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
++
+ /*
+  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
+  * the pointer to that structure with this macro.
+  */
+ #define PART(x)  ((struct mtd_part *)(x))
+ 
+-
+ /*
+  * MTD methods which simply translate the effective address and pass through
+  * to the _real_ device.
+@@ -534,8 +537,10 @@ out_register:
+ 	return slave;
+ }
+ 
+-int mtd_add_partition(struct mtd_info *master, const char *name,
+-		      long long offset, long long length)
++
++static int
++__mtd_add_partition(struct mtd_info *master, const char *name,
++		    long long offset, long long length, bool dup_check)
+ {
+ 	struct mtd_partition part;
+ 	struct mtd_part *p, *new;
+@@ -567,21 +572,24 @@ int mtd_add_partition(struct mtd_info *m
+ 	end = offset + length;
+ 
+ 	mutex_lock(&mtd_partitions_mutex);
+-	list_for_each_entry(p, &mtd_partitions, list)
+-		if (p->master == master) {
+-			if ((start >= p->offset) &&
+-			    (start < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-
+-			if ((end >= p->offset) &&
+-			    (end < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-		}
++	if (dup_check) {
++		list_for_each_entry(p, &mtd_partitions, list)
++			if (p->master == master) {
++				if ((start >= p->offset) &&
++				    (start < (p->offset + p->mtd.size)))
++					goto err_inv;
++
++				if ((end >= p->offset) &&
++				    (end < (p->offset + p->mtd.size)))
++					goto err_inv;
++			}
++	}
+ 
+ 	list_add(&new->list, &mtd_partitions);
+ 	mutex_unlock(&mtd_partitions_mutex);
+ 
+ 	add_mtd_device(&new->mtd);
++	mtd_partition_split(master, new);
+ 
+ 	return ret;
+ err_inv:
+@@ -591,6 +599,12 @@ err_inv:
+ }
+ EXPORT_SYMBOL_GPL(mtd_add_partition);
+ 
++int mtd_add_partition(struct mtd_info *master, const char *name,
++		      long long offset, long long length)
++{
++	return __mtd_add_partition(master, name, offset, length, true);
++}
++
+ int mtd_del_partition(struct mtd_info *master, int partno)
+ {
+ 	struct mtd_part *slave, *next;
+@@ -614,6 +628,74 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static inline unsigned long
++mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
++{
++	unsigned long mask = mtd->erasesize - 1;
++
++	len += offset & mask;
++	len = (len + mask) & ~mask;
++	len -= offset & mask;
++	return len;
++}
++
++#define UBOOT_MAGIC	0x27051956
++
++static void split_uimage(struct mtd_info *master, struct mtd_part *part)
++{
++	struct {
++		__be32 magic;
++		__be32 pad[2];
++		__be32 size;
++	} hdr;
++	size_t len;
++
++	if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
++		return;
++
++	if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
++		return;
++
++	len = be32_to_cpu(hdr.size) + 0x40;
++	len = mtd_pad_erasesize(master, part->offset, len);
++	if (len + master->erasesize > part->mtd.size)
++		return;
++
++	__mtd_add_partition(master, "rootfs", part->offset + len,
++			    part->mtd.size - len, false);
++}
++
++#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#define SPLIT_FIRMWARE_NAME	CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#else
++#define SPLIT_FIRMWARE_NAME	"unused"
++#endif
++
++static void split_firmware(struct mtd_info *master, struct mtd_part *part)
++{
++	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
++		split_uimage(master, part);
++}
++
++void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
++                                int offset, int size)
++{
++}
++
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
++{
++	static int rootfs_found = 0;
++
++	if (rootfs_found)
++		return;
++
++	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
++	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
++		split_firmware(master, part);
++
++	arch_split_mtd_part(master, part->mtd.name, part->offset,
++			    part->mtd.size);
++}
+ /*
+  * This function, given a master MTD object and a partition table, creates
+  * and registers slave MTD objects which are bound to the master according to
+@@ -643,6 +725,7 @@ int add_mtd_partitions(struct mtd_info *
+ 		mutex_unlock(&mtd_partitions_mutex);
+ 
+ 		add_mtd_device(&slave->mtd);
++		mtd_partition_split(master, slave);
+ 
+ 		cur_offset = slave->offset + slave->mtd.size;
+ 	}
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
++extern void __weak arch_split_mtd_part(struct mtd_info *master,
++				       const char *name, int offset, int size);
+ 
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch b/trunk/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
new file mode 100644
index 00000000..d996b60e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -0,0 +1,113 @@
+From 02cff0ccaa6d364f5c1eeea83f47ac80ccc967d4 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Tue, 3 Sep 2013 18:11:50 +0200
+Subject: [PATCH] mtd: add support for different partition parser types
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/mtdpart.c          |   56 ++++++++++++++++++++++++++++++++++++++++
+ include/linux/mtd/partitions.h |   11 ++++++++
+ 2 files changed, 67 insertions(+)
+
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -755,6 +755,30 @@ static struct mtd_part_parser *get_parti
+ 
+ #define put_partition_parser(p) do { module_put((p)->owner); } while (0)
+ 
++static struct mtd_part_parser *
++get_partition_parser_by_type(enum mtd_parser_type type,
++			     struct mtd_part_parser *start)
++{
++	struct mtd_part_parser *p, *ret = NULL;
++
++	spin_lock(&part_parser_lock);
++
++	p = list_prepare_entry(start, &part_parsers, list);
++	if (start)
++		put_partition_parser(start);
++
++	list_for_each_entry_continue(p, &part_parsers, list) {
++		if (p->type == type && try_module_get(p->owner)) {
++			ret = p;
++			break;
++		}
++	}
++
++	spin_unlock(&part_parser_lock);
++
++	return ret;
++}
++
+ void register_mtd_parser(struct mtd_part_parser *p)
+ {
+ 	spin_lock(&part_parser_lock);
+@@ -828,6 +852,38 @@ int parse_mtd_partitions(struct mtd_info
+ 	return ret;
+ }
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data)
++{
++	struct mtd_part_parser *prev = NULL;
++	int ret = 0;
++
++	while (1) {
++		struct mtd_part_parser *parser;
++
++		parser = get_partition_parser_by_type(type, prev);
++		if (!parser)
++			break;
++
++		ret = (*parser->parse_fn)(master, pparts, data);
++
++		if (ret > 0) {
++			put_partition_parser(parser);
++			printk(KERN_NOTICE
++			       "%d %s partitions found on MTD device %s\n",
++			       ret, parser->name, master->name);
++			break;
++		}
++
++		prev = parser;
++	}
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(parse_mtd_partitions_by_type);
++
+ int mtd_is_partition(const struct mtd_info *mtd)
+ {
+ 	struct mtd_part *part;
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -68,12 +68,17 @@ struct mtd_part_parser_data {
+  * Functions dealing with the various ways of partitioning the space
+  */
+ 
++enum mtd_parser_type {
++	MTD_PARSER_TYPE_DEVICE = 0,
++};
++
+ struct mtd_part_parser {
+ 	struct list_head list;
+ 	struct module *owner;
+ 	const char *name;
+ 	int (*parse_fn)(struct mtd_info *, struct mtd_partition **,
+ 			struct mtd_part_parser_data *);
++	enum mtd_parser_type type;
+ };
+ 
+ extern void register_mtd_parser(struct mtd_part_parser *parser);
+@@ -87,4 +92,9 @@ uint64_t mtd_get_device_size(const struc
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data);
++
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/trunk/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
new file mode 100644
index 00000000..242d9576
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -0,0 +1,77 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -628,6 +628,37 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static int
++run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
++{
++	struct mtd_partition *parts;
++	int nr_parts;
++	int i;
++
++	nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, &parts,
++						NULL);
++	if (nr_parts <= 0)
++		return nr_parts;
++
++	if (WARN_ON(!parts))
++		return 0;
++
++	for (i = 0; i < nr_parts; i++) {
++		/* adjust partition offsets */
++		parts[i].offset += slave->offset;
++
++		__mtd_add_partition(slave->master,
++				    parts[i].name,
++				    parts[i].offset,
++				    parts[i].size,
++				    false);
++	}
++
++	kfree(parts);
++
++	return nr_parts;
++}
++
+ static inline unsigned long
+ mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
+ {
+@@ -673,6 +704,12 @@ static void split_uimage(struct mtd_info
+ 
+ static void split_firmware(struct mtd_info *master, struct mtd_part *part)
+ {
++	int ret;
++
++	ret = run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
++	if (ret > 0)
++		return;
++
+ 	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
+ 		split_uimage(master, part);
+ }
+@@ -689,6 +726,12 @@ static void mtd_partition_split(struct m
+ 	if (rootfs_found)
+ 		return;
+ 
++	if (!strcmp(part->mtd.name, "rootfs")) {
++		run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++
++		rootfs_found = 1;
++	}
++
+ 	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+ 	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
+ 		split_firmware(master, part);
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -70,6 +70,8 @@ struct mtd_part_parser_data {
+ 
+ enum mtd_parser_type {
+ 	MTD_PARSER_TYPE_DEVICE = 0,
++	MTD_PARSER_TYPE_ROOTFS,
++	MTD_PARSER_TYPE_FIRMWARE,
+ };
+ 
+ struct mtd_part_parser {
diff --git a/trunk/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch b/trunk/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch
new file mode 100644
index 00000000..a70f8182
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -32,6 +32,11 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++config MTD_SPLIT
++	def_bool n
++	help 
++	  Generic MTD split support.
++
+ endmenu
+ 
+ config MTD_TESTS
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -6,6 +6,8 @@
+ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
++mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
+ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
diff --git a/trunk/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch b/trunk/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
new file mode 100644
index 00000000..30292e93
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
@@ -0,0 +1,83 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -434,14 +434,12 @@ static struct mtd_part *allocate_partiti
+ 	if (slave->offset == MTDPART_OFS_APPEND)
+ 		slave->offset = cur_offset;
+ 	if (slave->offset == MTDPART_OFS_NXTBLK) {
+-		slave->offset = cur_offset;
+-		if (mtd_mod_by_eb(cur_offset, master) != 0) {
+-			/* Round up to next erasesize */
+-			slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
++		/* Round up to next erasesize */
++		slave->offset = mtd_roundup_to_eb(cur_offset, master);
++		if (slave->offset != cur_offset)
+ 			printk(KERN_NOTICE "Moving partition %d: "
+ 			       "0x%012llx -> 0x%012llx\n", partno,
+ 			       (unsigned long long)cur_offset, (unsigned long long)slave->offset);
+-		}
+ 	}
+ 	if (slave->offset == MTDPART_OFS_RETAIN) {
+ 		slave->offset = cur_offset;
+@@ -944,6 +942,24 @@ int mtd_is_partition(const struct mtd_in
+ }
+ EXPORT_SYMBOL_GPL(mtd_is_partition);
+ 
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return (struct mtd_info *)mtd;
++
++	return PART(mtd)->master;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_master);
++
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return 0;
++
++	return PART(mtd)->offset;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_offset);
++
+ /* Returns the size of the entire flash chip */
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd)
+ {
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -90,6 +90,8 @@ int mtd_is_partition(const struct mtd_in
+ int mtd_add_partition(struct mtd_info *master, const char *name,
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -331,6 +331,24 @@ static inline uint32_t mtd_mod_by_eb(uin
+ 	return do_div(sz, mtd->erasesize);
+ }
+ 
++static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round up to next erase block */
++	return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize;
++}
++
++static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round down to the start of the current erase block */
++	return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize;
++}
++
+ static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
+ {
+ 	if (mtd->writesize_shift)
diff --git a/trunk/target/linux/generic/patches-3.14/406-mtd-hook-mtdsplit-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.14/406-mtd-hook-mtdsplit-into-Kbuild.patch
new file mode 100644
index 00000000..f022405b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/406-mtd-hook-mtdsplit-into-Kbuild.patch
@@ -0,0 +1,24 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -32,6 +32,8 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++source "drivers/mtd/mtdsplit/Kconfig"
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -7,6 +7,10 @@ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++mtd-$(CONFIG_MTD_SPLIT_SEAMA_FW) += mtdsplit_seama.o
++mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
++mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
++mtd-$(CONFIG_MTD_SPLIT_LZMA_FW) += mtdsplit_lzma.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch b/trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch
new file mode 100644
index 00000000..0e91d409
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/408-mtd-old-rootfs-squashfs-splitter.patch
@@ -0,0 +1,76 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -18,6 +18,11 @@ config MTD_ROOTFS_ROOT_DEV
+ 	bool "Automatically set 'rootfs' partition to be root filesystem"
+ 	default y
+ 
++config MTD_ROOTFS_SPLIT
++	bool "Automatically split 'rootfs' partition for squashfs"
++	select MTD_SPLIT
++	default y
++
+ config MTD_SPLIT_FIRMWARE
+ 	bool "Automatically split firmware partition for kernel+rootfs"
+ 	default y
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -668,6 +668,47 @@ mtd_pad_erasesize(struct mtd_info *mtd, 
+ 	return len;
+ }
+ 
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++	size_t squashfs_len;
++	int len, ret;
++
++	ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
++	if (ret)
++		return ret;
++
++	len = mtd_pad_erasesize(master, offset, squashfs_len);
++	*split_offset = offset + len;
++
++	return 0;
++}
++
++static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
++{
++	unsigned int split_offset = 0;
++	unsigned int split_size;
++	int ret;
++
++	ret = split_squashfs(master, part->offset, &split_offset);
++	if (ret)
++		return;
++
++	if (split_offset <= 0)
++		return;
++
++	if (config_enabled(CONFIG_MTD_SPLIT_SQUASHFS_ROOT))
++		pr_err("Dedicated partitioner didn't create \"rootfs_data\" partition, please fill a bug report!\n");
++	else
++		pr_warn("Support for built-in \"rootfs_data\" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT\n");
++
++	split_size = part->mtd.size - (split_offset - part->offset);
++	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
++		ROOTFS_SPLIT_NAME, split_offset, split_size);
++
++	__mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
++			    split_size, false);
++}
++
+ #define UBOOT_MAGIC	0x27051956
+ 
+ static void split_uimage(struct mtd_info *master, struct mtd_part *part)
+@@ -725,7 +766,10 @@ static void mtd_partition_split(struct m
+ 		return;
+ 
+ 	if (!strcmp(part->mtd.name, "rootfs")) {
+-		run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++		int num = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++
++		if (num <= 0 && config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
++			split_rootfs_data(master, part);
+ 
+ 		rootfs_found = 1;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.14/410-mtd-move-forward-declaration-of-struct-mtd_info.patch b/trunk/target/linux/generic/patches-3.14/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
new file mode 100644
index 00000000..78ebbf88
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
@@ -0,0 +1,18 @@
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -35,6 +35,7 @@
+  * Note: writeable partitions require their size and offset be
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
++struct mtd_info;
+ 
+ struct mtd_partition {
+ 	const char *name;		/* identifier string */
+@@ -50,7 +51,6 @@ struct mtd_partition {
+ #define MTDPART_SIZ_FULL	(0)
+ 
+ 
+-struct mtd_info;
+ struct device_node;
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.14/411-mtd-partial_eraseblock_write.patch b/trunk/target/linux/generic/patches-3.14/411-mtd-partial_eraseblock_write.patch
new file mode 100644
index 00000000..8da080b2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/411-mtd-partial_eraseblock_write.patch
@@ -0,0 +1,146 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -35,6 +35,8 @@
+ #include "mtdcore.h"
+ #include "mtdsplit.h"
+ 
++#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
++
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+ static DEFINE_MUTEX(mtd_partitions_mutex);
+@@ -231,13 +233,61 @@ static int part_erase(struct mtd_info *m
+ 	struct mtd_part *part = PART(mtd);
+ 	int ret;
+ 
++
++	instr->partial_start = false;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		size_t readlen = 0;
++		u64 mtd_ofs;
++
++		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
++		if (!instr->erase_buf)
++			return -ENOMEM;
++
++		mtd_ofs = part->offset + instr->addr;
++		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
++
++		if (instr->erase_buf_ofs > 0) {
++			instr->addr -= instr->erase_buf_ofs;
++			ret = mtd_read(part->master,
++				instr->addr + part->offset,
++				part->master->erasesize,
++				&readlen, instr->erase_buf);
++
++			instr->len += instr->erase_buf_ofs;
++			instr->partial_start = true;
++		} else {
++			mtd_ofs = part->offset + part->mtd.size;
++			instr->erase_buf_ofs = part->master->erasesize -
++				do_div(mtd_ofs, part->master->erasesize);
++
++			if (instr->erase_buf_ofs > 0) {
++				instr->len += instr->erase_buf_ofs;
++				ret = mtd_read(part->master,
++					part->offset + instr->addr +
++					instr->len - part->master->erasesize,
++					part->master->erasesize, &readlen,
++					instr->erase_buf);
++			} else {
++				ret = 0;
++			}
++		}
++		if (ret < 0) {
++			kfree(instr->erase_buf);
++			return ret;
++		}
++
++	}
++
+ 	instr->addr += part->offset;
+ 	ret = part->master->_erase(part->master, instr);
+ 	if (ret) {
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
++		if (mtd->flags & MTD_ERASE_PARTIAL)
++			kfree(instr->erase_buf);
+ 	}
++
+ 	return ret;
+ }
+ 
+@@ -245,7 +295,25 @@ void mtd_erase_callback(struct erase_inf
+ {
+ 	if (instr->mtd->_erase == part_erase) {
+ 		struct mtd_part *part = PART(instr->mtd);
++		size_t wrlen = 0;
+ 
++		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
++			if (instr->partial_start) {
++				part->master->_write(part->master,
++					instr->addr, instr->erase_buf_ofs,
++					&wrlen, instr->erase_buf);
++				instr->addr += instr->erase_buf_ofs;
++			} else {
++				instr->len -= instr->erase_buf_ofs;
++				part->master->_write(part->master,
++					instr->addr + instr->len,
++					instr->erase_buf_ofs, &wrlen,
++					instr->erase_buf +
++					part->master->erasesize -
++					instr->erase_buf_ofs);
++			}
++			kfree(instr->erase_buf);
++		}
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
+@@ -503,18 +571,24 @@ static struct mtd_part *allocate_partiti
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+ 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
+ 		/* Doesn't start on a boundary of major erase size */
+-		/* FIXME: Let it be writable if it is on a boundary of
+-		 * _minor_ erase size though */
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
+-			part->name);
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++		if (((u32) slave->mtd.size) > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+-	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
+-			part->name);
++	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++
++		if ((u32) slave->mtd.size > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
++	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
++		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
++				part->name);
+ 
+ 	slave->mtd.ecclayout = master->ecclayout;
+ 	slave->mtd.ecc_step_size = master->ecc_step_size;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -55,6 +55,10 @@ struct erase_info {
+ 	u_long priv;
+ 	u_char state;
+ 	struct erase_info *next;
++
++	u8 *erase_buf;
++	u32 erase_buf_ofs;
++	bool partial_start;
+ };
+ 
+ struct mtd_erase_region_info {
diff --git a/trunk/target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch b/trunk/target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 00000000..87c8257f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/412-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -332,7 +332,14 @@ static int part_lock(struct mtd_info *mt
+ static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+ {
+ 	struct mtd_part *part = PART(mtd);
+-	return part->master->_unlock(part->master, ofs + part->offset, len);
++
++	ofs += part->offset;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		/* round up len to next erasesize and round down offset to prev block */
++		len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++		ofs &= ~(part->master->erasesize - 1);
++	}
++	return part->master->_unlock(part->master, ofs, len);
+ }
+ 
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/trunk/target/linux/generic/patches-3.14/420-mtd-redboot_space.patch b/trunk/target/linux/generic/patches-3.14/420-mtd-redboot_space.patch
new file mode 100644
index 00000000..f74affce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/420-mtd-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru
+ #endif
+ 		names += strlen(names)+1;
+ 
+-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+-			i++;
+-			parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-			parts[i].size = fl->next->img->flash_base - parts[i].offset;
+-			parts[i].name = nullname;
+-		}
++			if (!strcmp(parts[i].name, "rootfs")) {
++				parts[i].size = fl->next->img->flash_base;
++				parts[i].size &= ~(master->erasesize - 1);
++				parts[i].size -= parts[i].offset;
++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
++				nrparts--;
++			} else {
++				i++;
++				parts[i].offset = parts[i-1].size + parts[i-1].offset;
++				parts[i].size = fl->next->img->flash_base - parts[i].offset;
++				parts[i].name = nullname;
+ #endif
++			}
++		}
+ 		tmp_fl = fl;
+ 		fl = fl->next;
+ 		kfree(tmp_fl);
diff --git a/trunk/target/linux/generic/patches-3.14/430-mtd-add-myloader-partition-parser.patch b/trunk/target/linux/generic/patches-3.14/430-mtd-add-myloader-partition-parser.patch
new file mode 100644
index 00000000..ffc9e219
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/430-mtd-add-myloader-partition-parser.patch
@@ -0,0 +1,35 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -189,6 +189,22 @@ config MTD_BCM47XX_PARTS
+ 	  This provides partitions parser for devices based on BCM47xx
+ 	  boards.
+ 
++config MTD_MYLOADER_PARTS
++	tristate "MyLoader partition parsing"
++	depends on ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX || ATH79
++	---help---
++	  MyLoader is a bootloader which allows the user to define partitions
++	  in flash devices, by putting a table in the second erase block
++	  on the device, similar to a partition table. This table gives the 
++	  offsets and lengths of the user defined partitions.
++
++	  If you need code which can detect and parse these tables, and
++	  register MTD 'partitions' corresponding to each image detected,
++	  enable this option.
++
++	  You will still need the parsing functions to be called by the driver
++	  for your particular device. It won't happen automatically.
++
+ comment "User Modules And Translation Layers"
+ 
+ #
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
++obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_BLKDEVS)	+= mtd_blkdevs.o
diff --git a/trunk/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch b/trunk/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
new file mode 100644
index 00000000..46881fca
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
@@ -0,0 +1,66 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -40,6 +40,7 @@
+ #define ML_MAGIC2			0x26594131
+ #define TRX_MAGIC			0x30524448
+ #define SQSH_MAGIC			0x71736873	/* shsq */
++#define UBI_EC_MAGIC			0x23494255	/* UBI# */
+ 
+ struct trx_header {
+ 	uint32_t magic;
+@@ -50,7 +51,7 @@ struct trx_header {
+ 	uint32_t offset[3];
+ } __packed;
+ 
+-static void bcm47xxpart_add_part(struct mtd_partition *part, char *name,
++static void bcm47xxpart_add_part(struct mtd_partition *part, const char *name,
+ 				 u64 offset, uint32_t mask_flags)
+ {
+ 	part->name = name;
+@@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct 
+ 	part->mask_flags = mask_flags;
+ }
+ 
++static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master,
++						  size_t offset)
++{
++	uint32_t buf;
++	size_t bytes_read;
++
++	if (mtd_read(master, offset, sizeof(&buf), &bytes_read,
++		     (uint8_t *)&buf) < 0) {
++		pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
++			offset);
++		goto out_default;
++	}
++
++	if (buf == UBI_EC_MAGIC)
++		return "ubi";
++
++out_default:
++	return "rootfs";
++}
++
+ static int bcm47xxpart_parse(struct mtd_info *master,
+ 			     struct mtd_partition **pparts,
+ 			     struct mtd_part_parser_data *data)
+@@ -151,6 +172,8 @@ static int bcm47xxpart_parse(struct mtd_
+ 
+ 		/* TRX */
+ 		if (buf[0x000 / 4] == TRX_MAGIC) {
++			const char *name;
++
+ 			if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
+ 				pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
+ 				break;
+@@ -186,8 +209,9 @@ static int bcm47xxpart_parse(struct mtd_
+ 			 * we want to have jffs2 (overlay) in the same mtd.
+ 			 */
+ 			if (trx->offset[i]) {
++				name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
+ 				bcm47xxpart_add_part(&parts[curr_part++],
+-						     "rootfs",
++						     name,
+ 						     offset + trx->offset[i],
+ 						     0);
+ 				i++;
diff --git a/trunk/target/linux/generic/patches-3.14/440-block2mtd_init.patch b/trunk/target/linux/generic/patches-3.14/440-block2mtd_init.patch
new file mode 100644
index 00000000..a5819984
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/440-block2mtd_init.patch
@@ -0,0 +1,107 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -17,6 +17,7 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
+ #include <linux/mutex.h>
+ #include <linux/mount.h>
+ #include <linux/slab.h>
+@@ -210,11 +211,12 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+ 	struct block_device *bdev;
+ 	struct block2mtd_dev *dev;
++	struct mtd_partition *part;
+ 	char *name;
+ 
+ 	if (!devname)
+@@ -253,13 +255,16 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+-	name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
++	if (!mtdname)
++		mtdname = devname;
++	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
+ 	if (!name)
+ 		goto devinit_err;
+ 
++	strcpy(name, mtdname);
+ 	dev->mtd.name = name;
+ 
+-	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
++	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
+ 	dev->mtd.erasesize = erase_size;
+ 	dev->mtd.writesize = 1;
+ 	dev->mtd.writebufsize = PAGE_SIZE;
+@@ -272,15 +277,18 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
+ 
+-	if (mtd_device_register(&dev->mtd, NULL, 0)) {
++	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
++	part->name = name;
++	part->offset = 0;
++	part->size = dev->mtd.size;
++	if (mtd_device_register(&dev->mtd, part, 1)) {
+ 		/* Device didn't get added, so free the entry */
+ 		goto devinit_err;
+ 	}
+ 	list_add(&dev->list, &blkmtd_device_list);
+ 	pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n",
+ 		dev->mtd.index,
+-		dev->mtd.name + strlen("block2mtd: "),
+-		dev->mtd.erasesize >> 10, dev->mtd.erasesize);
++		mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+ 	return dev;
+ 
+ devinit_err:
+@@ -347,9 +355,9 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12]; /* 80 for device, 12 for erase size */
++	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
+ 	char *str = buf;
+-	char *token[2];
++	char *token[3];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
+ 	int i, ret;
+@@ -362,7 +370,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 2; i++)
++	for (i = 0; i < 3; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str) {
+@@ -388,8 +396,10 @@ static int block2mtd_setup2(const char *
+ 			return 0;
+ 		}
+ 	}
++	if (token[2] && (strlen(token[2]) + 1 > 80))
++		pr_err("mtd device name too long\n");
+ 
+-	add_device(name, erase_size);
++	add_device(name, erase_size, token[2]);
+ 
+ 	return 0;
+ }
+@@ -423,7 +433,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
diff --git a/trunk/target/linux/generic/patches-3.14/441-block2mtd_probe.patch b/trunk/target/linux/generic/patches-3.14/441-block2mtd_probe.patch
new file mode 100644
index 00000000..3ab9d1a3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/441-block2mtd_probe.patch
@@ -0,0 +1,108 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -10,6 +10,7 @@
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/module.h>
++#include <linux/delay.h>
+ #include <linux/fs.h>
+ #include <linux/blkdev.h>
+ #include <linux/bio.h>
+@@ -211,13 +212,14 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname, int timeout)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+-	struct block_device *bdev;
++	struct block_device *bdev = ERR_PTR(-ENODEV);
+ 	struct block2mtd_dev *dev;
+ 	struct mtd_partition *part;
+ 	char *name;
++	int i;
+ 
+ 	if (!devname)
+ 		return NULL;
+@@ -228,15 +230,20 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Get a handle on the device */
+ 	bdev = blkdev_get_by_path(devname, mode, dev);
++
+ #ifndef MODULE
+-	if (IS_ERR(bdev)) {
++	for (i = 0; IS_ERR(bdev) && i <= timeout; i++) {
++		dev_t devt;
+ 
+-		/* We might not have rootfs mounted at this point. Try
+-		   to resolve the device name by other means. */
++		if (i)
++			msleep(1000);
++		wait_for_device_probe();
++
++		devt = name_to_dev_t(devname);
++		if (!devt)
++			continue;
+ 
+-		dev_t devt = name_to_dev_t(devname);
+-		if (devt)
+-			bdev = blkdev_get_by_dev(devt, mode, dev);
++		bdev = blkdev_get_by_dev(devt, mode, dev);
+ 	}
+ #endif
+ 
+@@ -355,11 +362,12 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
++	char buf[80 + 12 + 80 + 8]; /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
+ 	char *str = buf;
+-	char *token[3];
++	char *token[4];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
++	unsigned long timeout = 0;
+ 	int i, ret;
+ 
+ 	if (strnlen(val, sizeof(buf)) >= sizeof(buf)) {
+@@ -370,7 +378,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 3; i++)
++	for (i = 0; i < 4; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str) {
+@@ -399,7 +407,10 @@ static int block2mtd_setup2(const char *
+ 	if (token[2] && (strlen(token[2]) + 1 > 80))
+ 		pr_err("mtd device name too long\n");
+ 
+-	add_device(name, erase_size, token[2]);
++	if (token[3] && kstrtoul(token[3], 0, &timeout))
++		pr_err("invalid timeout\n");
++
++	add_device(name, erase_size, token[2], timeout);
+ 
+ 	return 0;
+ }
+@@ -433,7 +444,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
+@@ -467,7 +478,7 @@ static void block2mtd_exit(void)
+ }
+ 
+ 
+-module_init(block2mtd_init);
++late_initcall(block2mtd_init);
+ module_exit(block2mtd_exit);
+ 
+ MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.14/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch b/trunk/target/linux/generic/patches-3.14/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
new file mode 100644
index 00000000..1c23bb54
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
@@ -0,0 +1,37 @@
+---
+ drivers/mtd/nand/plat_nand.c |   13 ++++++++++++-
+ include/linux/mtd/nand.h     |    1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -756,6 +756,7 @@ struct platform_nand_chip {
+ 	unsigned int options;
+ 	unsigned int bbt_options;
+ 	const char **part_probe_types;
++	int (*chip_fixup)(struct mtd_info *mtd);
+ };
+ 
+ /* Keep gcc happy */
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -90,7 +90,18 @@ static int plat_nand_probe(struct platfo
+ 	}
+ 
+ 	/* Scan to find existence of the device */
+-	if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
++	if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
++		err = -ENXIO;
++		goto out;
++	}
++
++	if (pdata->chip.chip_fixup) {
++		err = pdata->chip.chip_fixup(&data->mtd);
++		if (err)
++			goto out;
++	}
++
++	if (nand_scan_tail(&data->mtd)) {
+ 		err = -ENXIO;
+ 		goto out;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.14/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch b/trunk/target/linux/generic/patches-3.14/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
new file mode 100644
index 00000000..fa673059
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -507,7 +507,7 @@ int __nand_correct_data(unsigned char *b
+ 		return 1;	/* error in ECC data; no action needed */
+ 
+ 	pr_err("%s: uncorrectable ECC error", __func__);
+-	return -1;
++	return -EBADMSG;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/trunk/target/linux/generic/patches-3.14/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
new file mode 100644
index 00000000..0854a564
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -780,7 +780,7 @@ static int get_chip(struct map_info *map
+ 		return 0;
+ 
+ 	case FL_ERASING:
+-		if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
++		if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+ 		    !(mode == FL_READY || mode == FL_POINT ||
+ 		    (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
+ 			goto sleep;
diff --git a/trunk/target/linux/generic/patches-3.14/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/trunk/target/linux/generic/patches-3.14/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
new file mode 100644
index 00000000..b5fae8ae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
@@ -0,0 +1,18 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Issue map read after Write Buffer Load command to ensure chip is ready
+to receive data.
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
+ 1 file changed, 1 insertion(+)
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1498,6 +1498,7 @@ static int __xipram do_write_buffer(stru
+ 
+ 	/* Write Buffer Load */
+ 	map_write(map, CMD(0x25), cmd_adr);
++	(void) map_read(map, cmd_adr);
+ 
+ 	chip->state = FL_WRITING_TO_BUFFER;
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/trunk/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
new file mode 100644
index 00000000..4f2f4e65
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -0,0 +1,41 @@
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
+@@ -102,6 +102,14 @@ config MTD_SPEAR_SMI
+ 	help
+ 	  This enable SNOR support on SPEAR platforms using SMI controller
+ 
++config M25PXX_PREFER_SMALL_SECTOR_ERASE
++	bool "Prefer small sector erase"
++	depends on MTD_M25P80
++	default y
++	help
++	  This option enables use of the small erase sectors if that is
++	  supported by the flash chip.
++
+ config MTD_SST25L
+ 	tristate "Support SST25L (non JEDEC) SPI Flash chips"
+ 	depends on SPI_MASTER
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -90,6 +90,12 @@
+ 
+ #define JEDEC_MFR(_jedec_id)	((_jedec_id) >> 16)
+ 
++#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE
++#define PREFER_SMALL_SECTOR_ERASE 1
++#else
++#define PREFER_SMALL_SECTOR_ERASE 0
++#endif
++
+ /****************************************************************************/
+ 
+ enum read_type {
+@@ -1192,7 +1198,7 @@ static int m25p_probe(struct spi_device 
+ 		flash->mtd._write = m25p80_write;
+ 
+ 	/* prefer "small sector" erase if possible */
+-	if (info->flags & SECT_4K) {
++	if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
+ 	} else if (info->flags & SECT_4K_PMC) {
diff --git a/trunk/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch b/trunk/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
new file mode 100644
index 00000000..d4c6a641
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
@@ -0,0 +1,20 @@
+From eef9dfc4e821408af1af13aa0cc707fc496fb7c6 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Wed, 11 Dec 2013 19:05:59 +0100
+Subject: [PATCH] m25p80: add support for the Winbond W25X05 flash
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/devices/m25p80.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -1022,6 +1022,7 @@ static const struct spi_device_id m25p_i
+ 	{ "m25px64",    INFO(0x207117,  0, 64 * 1024, 128, 0) },
+ 
+ 	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
++	{ "w25x05", INFO(0xef3010, 0, 64 * 1024,  1,  SECT_4K) },
+ 	{ "w25x10", INFO(0xef3011, 0, 64 * 1024,  2,  SECT_4K) },
+ 	{ "w25x20", INFO(0xef3012, 0, 64 * 1024,  4,  SECT_4K) },
+ 	{ "w25x40", INFO(0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
diff --git a/trunk/target/linux/generic/patches-3.14/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch b/trunk/target/linux/generic/patches-3.14/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
new file mode 100644
index 00000000..5465d1ce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/473-mtd-m25p80-add-support-for-EON-EN25QH128-flash.patch
@@ -0,0 +1,20 @@
+From 0233dcb52eefa0b29250a6d8a58b3143790df57d Mon Sep 17 00:00:00 2001
+From: Sergey Ryazanov <ryazanov.s.a@gmail.com>
+Date: Wed, 11 Jun 2014 02:23:00 +0400
+Subject: [PATCH] mtd: m25p80: add support for EON EN25QH128
+
+Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
+---
+ drivers/mtd/devices/m25p80.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -909,6 +909,7 @@ static const struct spi_device_id m25p_i
+ 	{ "en25q32b",   INFO(0x1c3016, 0, 64 * 1024,   64, 0) },
+ 	{ "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128, 0) },
+ 	{ "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
++	{ "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256, 0) },
+ 	{ "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  512, 0) },
+ 
+ 	/* ESMT */
diff --git a/trunk/target/linux/generic/patches-3.14/480-mtd-set-rootfs-to-be-root-dev.patch b/trunk/target/linux/generic/patches-3.14/480-mtd-set-rootfs-to-be-root-dev.patch
new file mode 100644
index 00000000..b7cff8c1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/480-mtd-set-rootfs-to-be-root-dev.patch
@@ -0,0 +1,26 @@
+--- a/drivers/mtd/mtdcore.c
++++ b/drivers/mtd/mtdcore.c
+@@ -37,6 +37,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/gfp.h>
+ #include <linux/slab.h>
++#include <linux/root_dev.h>
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+@@ -414,6 +415,15 @@ int add_mtd_device(struct mtd_info *mtd)
+ 	   of this try_ nonsense, and no bitching about it
+ 	   either. :) */
+ 	__module_get(THIS_MODULE);
++
++	if (!strcmp(mtd->name, "rootfs") &&
++	    config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    ROOT_DEV == 0) {
++		pr_notice("mtd: device %d (%s) set to be root filesystem\n",
++			  mtd->index, mtd->name);
++		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
++	}
++
+ 	return 0;
+ 
+ fail_added:
diff --git a/trunk/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch b/trunk/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch
new file mode 100644
index 00000000..cd02c13e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/490-mtd-ubi-add-EOF-marker-support.patch
@@ -0,0 +1,51 @@
+--- a/drivers/mtd/ubi/attach.c
++++ b/drivers/mtd/ubi/attach.c
+@@ -800,6 +800,13 @@ out_unlock:
+ 	return err;
+ }
+ 
++static bool ec_hdr_has_eof(struct ubi_ec_hdr *ech)
++{
++	return ech->padding1[0] == 'E' &&
++	       ech->padding1[1] == 'O' &&
++	       ech->padding1[2] == 'F';
++}
++
+ /**
+  * scan_peb - scan and process UBI headers of a PEB.
+  * @ubi: UBI device description object
+@@ -830,9 +837,21 @@ static int scan_peb(struct ubi_device *u
+ 		return 0;
+ 	}
+ 
+-	err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
+-	if (err < 0)
+-		return err;
++	if (!ai->eof_found) {
++		err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
++		if (err < 0)
++			return err;
++
++		if (ec_hdr_has_eof(ech)) {
++			ubi_msg("EOF marker found, PEBs from %d will be erased",
++				pnum);
++			ai->eof_found = true;
++		}
++	}
++
++	if (ai->eof_found)
++		err = UBI_IO_FF_BITFLIPS;
++
+ 	switch (err) {
+ 	case 0:
+ 		break;
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -701,6 +701,7 @@ struct ubi_attach_info {
+ 	int mean_ec;
+ 	uint64_t ec_sum;
+ 	int ec_count;
++	bool eof_found;
+ 	struct kmem_cache *aeb_slab_cache;
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/trunk/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
new file mode 100644
index 00000000..fd343fa6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -0,0 +1,75 @@
+From 8a52e4100d7c3a4a1dfddfa02b8864a9b0068c13 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 17 May 2014 03:36:18 +0200
+Subject: [PATCH 1/5] ubi: auto-attach mtd device named "ubi" or "data" on boot
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+--- a/drivers/mtd/ubi/build.c
++++ b/drivers/mtd/ubi/build.c
+@@ -1209,6 +1209,48 @@ static struct mtd_info * __init open_mtd
+ 	return mtd;
+ }
+ 
++/*
++ * This function tries attaching mtd partitions named either "ubi" or "data"
++ * during boot.
++ */
++static void __init ubi_auto_attach(void)
++{
++	int err;
++	struct mtd_info *mtd;
++
++	/* try attaching mtd device named "ubi" or "data" */
++	mtd = open_mtd_device("ubi");
++	if (IS_ERR(mtd))
++		mtd = open_mtd_device("data");
++
++	if (!IS_ERR(mtd)) {
++		size_t len;
++		char magic[4];
++
++		/* check for a valid ubi magic */
++		err = mtd_read(mtd, 0, 4, &len, (void *) magic);
++		if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
++			ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
++			put_mtd_device(mtd);
++			return;
++		}
++
++		/* auto-add only media types where UBI makes sense */
++		if (mtd->type == MTD_NANDFLASH ||
++		    mtd->type == MTD_DATAFLASH ||
++		    mtd->type == MTD_MLCNANDFLASH) {
++			mutex_lock(&ubi_devices_mutex);
++			ubi_msg("auto-attach mtd%d", mtd->index);
++			err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
++			mutex_unlock(&ubi_devices_mutex);
++			if (err < 0) {
++				ubi_err("cannot attach mtd%d", mtd->index);
++				put_mtd_device(mtd);
++			}
++		}
++	}
++}
++
+ static int __init ubi_init(void)
+ {
+ 	int err, i, k;
+@@ -1298,6 +1340,12 @@ static int __init ubi_init(void)
+ 		}
+ 	}
+ 
++	/* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd
++	 * parameter was given */
++	if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    !ubi_is_module() && !mtd_devs)
++		ubi_auto_attach();
++
+ 	err = ubiblock_init();
+ 	if (err) {
+ 		ubi_err("block: cannot initialize, error %d", err);
diff --git a/trunk/target/linux/generic/patches-3.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/trunk/target/linux/generic/patches-3.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
new file mode 100644
index 00000000..f2c44268
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -0,0 +1,69 @@
+From 0f3966579815f889bb2fcb4846152c35f65e79c4 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 15 May 2014 21:06:33 +0200
+Subject: [PATCH 2/5] ubi: auto-create ubiblock device for rootfs
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -593,6 +593,44 @@ static int __init ubiblock_create_from_p
+ 	return ret;
+ }
+ 
++#define UBIFS_NODE_MAGIC  0x06101831
++static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc)
++{
++	int ret;
++	uint32_t magic_of, magic;
++	ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4);
++	if (ret)
++		return 0;
++	magic = le32_to_cpu(magic_of);
++	return magic == UBIFS_NODE_MAGIC;
++}
++
++static void __init ubiblock_create_auto_rootfs(void)
++{
++	int ubi_num, ret, is_ubifs;
++	struct ubi_volume_desc *desc;
++	struct ubi_volume_info vi;
++
++	for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++) {
++		desc = ubi_open_volume_nm(ubi_num, "rootfs", UBI_READONLY);
++		if (IS_ERR(desc))
++			continue;
++
++		ubi_get_volume_info(desc, &vi);
++		is_ubifs = ubi_vol_is_ubifs(desc);
++		ubi_close_volume(desc);
++		if (is_ubifs)
++			break;
++
++		ret = ubiblock_create(&vi);
++		if (ret)
++			ubi_err("block: can't add '%s' volume, err=%d\n",
++				vi.name, ret);
++		/* always break if we get here */
++		break;
++	}
++}
++
+ static void ubiblock_remove_all(void)
+ {
+ 	struct ubiblock *next;
+@@ -623,6 +661,10 @@ int __init ubiblock_init(void)
+ 	if (ret)
+ 		goto err_remove;
+ 
++	/* auto-attach "rootfs" volume if existing and non-ubifs */
++	if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))
++		ubiblock_create_auto_rootfs();
++
+ 	/*
+ 	 * Block devices are only created upon user requests, so we ignore
+ 	 * existing volumes.
diff --git a/trunk/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/trunk/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
new file mode 100644
index 00000000..b9dd9dc5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -0,0 +1,53 @@
+From eea9e1785e4c05c2a3444506aabafa0ae958538f Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 17 May 2014 03:35:02 +0200
+Subject: [PATCH 4/5] try auto-mounting ubi0:rootfs in init/do_mounts.c
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ init/do_mounts.c | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -432,7 +432,27 @@ retry:
+ out:
+ 	put_page(page);
+ }
+- 
++
++static int __init mount_ubi_rootfs(void)
++{
++	int flags = MS_SILENT;
++	int err, tried = 0;
++
++	while (tried < 2) {
++		err = do_mount_root("ubi0:rootfs", "ubifs", flags, \
++					root_mount_data);
++		switch (err) {
++			case -EACCES:
++				flags |= MS_RDONLY;
++				tried++;
++			default:
++				return err;
++		}
++	}
++
++	return -EINVAL;
++}
++
+ #ifdef CONFIG_ROOT_NFS
+ 
+ #define NFSROOT_TIMEOUT_MIN	5
+@@ -526,6 +546,10 @@ void __init mount_root(void)
+ 			change_floppy("root floppy");
+ 	}
+ #endif
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++	if (!mount_ubi_rootfs())
++		return;
++#endif
+ #ifdef CONFIG_BLOCK
+ 	create_dev("/dev/root", ROOT_DEV);
+ 	mount_block_root("/dev/root", root_mountflags);
diff --git a/trunk/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/trunk/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
new file mode 100644
index 00000000..15d37f88
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
@@ -0,0 +1,37 @@
+From cd68d1b12b5ea4c01a664c064179ada42bf55d3d Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 15 May 2014 20:55:42 +0200
+Subject: [PATCH 5/5] ubi: set ROOT_DEV to ubiblock "rootfs" if unset
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/block.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -48,6 +48,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/hdreg.h>
+ #include <asm/div64.h>
++#include <linux/root_dev.h>
+ 
+ #include "ubi-media.h"
+ #include "ubi.h"
+@@ -444,6 +445,15 @@ int ubiblock_create(struct ubi_volume_in
+ 	add_disk(dev->gd);
+ 	ubi_msg("%s created from ubi%d:%d(%s)",
+ 		dev->gd->disk_name, dev->ubi_num, dev->vol_id, vi->name);
++
++	if (!strcmp(vi->name, "rootfs") &&
++	    config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    ROOT_DEV == 0) {
++		pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n",
++			  dev->ubi_num, dev->vol_id, vi->name);
++		ROOT_DEV = MKDEV(gd->major, gd->first_minor);
++	}
++
+ 	return 0;
+ 
+ out_free_queue:
diff --git a/trunk/target/linux/generic/patches-3.14/500-yaffs-Kbuild-integration.patch b/trunk/target/linux/generic/patches-3.14/500-yaffs-Kbuild-integration.patch
new file mode 100644
index 00000000..de6643a4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/500-yaffs-Kbuild-integration.patch
@@ -0,0 +1,18 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -39,6 +39,7 @@ source "fs/gfs2/Kconfig"
+ source "fs/ocfs2/Kconfig"
+ source "fs/btrfs/Kconfig"
+ source "fs/nilfs2/Kconfig"
++source "fs/yaffs2/Kconfig"
+ 
+ endif # BLOCK
+ 
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -126,3 +126,5 @@ obj-y				+= exofs/ # Multiple modules
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
+ obj-$(CONFIG_PSTORE)		+= pstore/
+ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
++obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
++
diff --git a/trunk/target/linux/generic/patches-3.14/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch b/trunk/target/linux/generic/patches-3.14/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
new file mode 100644
index 00000000..c1f7367d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
@@ -0,0 +1,155 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -329,6 +329,33 @@ static int yaffs_readpage(struct file *f
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++#define YCRED_FSUID()	from_kuid(&init_user_ns, current_fsuid())
++#define YCRED_FSGID()	from_kgid(&init_user_ns, current_fsgid())
++#else
++#define YCRED_FSUID()	YCRED(current)->fsuid
++#define YCRED_FSGID()	YCRED(current)->fsgid
++
++static inline uid_t i_uid_read(const struct inode *inode)
++{
++	return inode->i_uid;
++}
++
++static inline gid_t i_gid_read(const struct inode *inode)
++{
++	return inode->i_gid;
++}
++
++static inline void i_uid_write(struct inode *inode, uid_t uid)
++{
++	inode->i_uid = uid;
++}
++
++static inline void i_gid_write(struct inode *inode, gid_t gid)
++{
++	inode->i_gid = gid;
++}
++#endif
+ 
+ static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+ {
+@@ -1225,9 +1252,9 @@ static int yaffs_mknod(struct inode *dir
+ 	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
+ 
+ 	int error = -ENOSPC;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+ 		mode |= S_ISGID;
+@@ -1424,9 +1451,9 @@ static int yaffs_symlink(struct inode *d
+ {
+ 	struct yaffs_obj *obj;
+ 	struct yaffs_dev *dev;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
+ 
+@@ -1829,8 +1856,8 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		inode->i_ino = obj->obj_id;
+ 		inode->i_mode = obj->yst_mode;
+-		inode->i_uid = obj->yst_uid;
+-		inode->i_gid = obj->yst_gid;
++		i_uid_write(inode, obj->yst_uid);
++		i_gid_write(inode, obj->yst_gid);
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+ 		inode->i_blksize = inode->i_sb->s_blocksize;
+ #endif
+@@ -1856,7 +1883,7 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		yaffs_trace(YAFFS_TRACE_OS,
+ 			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+-			inode->i_mode, inode->i_uid, inode->i_gid,
++			inode->i_mode, i_uid_read(inode), i_gid_read(inode),
+ 			inode->i_size, atomic_read(&inode->i_count));
+ 
+ 		switch (obj->yst_mode & S_IFMT) {
+--- a/fs/yaffs2/yaffs_attribs.c
++++ b/fs/yaffs2/yaffs_attribs.c
+@@ -14,6 +14,48 @@
+ #include "yaffs_guts.h"
+ #include "yaffs_attribs.h"
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return from_kuid(&init_user_ns, iattr->ia_uid);
++}
++
++static inline gid_t ia_gid_read(const struct iattr *iattr)
++{
++	return from_kgid(&init_user_ns, iattr->ia_gid);
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = make_kuid(&init_user_ns, uid);
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = make_kgid(&init_user_ns, gid);
++}
++#else
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return iattr->ia_uid;
++}
++
++static inline gid_t ia_gid_read(const struct iattr *inode)
++{
++	return iattr->ia_gid;
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = uid;
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = gid;
++}
++#endif
++
+ void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
+ {
+ 	obj->yst_uid = oh->yst_uid;
+@@ -77,9 +119,9 @@ int yaffs_set_attribs(struct yaffs_obj *
+ 	if (valid & ATTR_MODE)
+ 		obj->yst_mode = attr->ia_mode;
+ 	if (valid & ATTR_UID)
+-		obj->yst_uid = attr->ia_uid;
++		obj->yst_uid =  ia_uid_read(attr);
+ 	if (valid & ATTR_GID)
+-		obj->yst_gid = attr->ia_gid;
++		obj->yst_gid =  ia_gid_read(attr);
+ 
+ 	if (valid & ATTR_ATIME)
+ 		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
+@@ -103,9 +145,9 @@ int yaffs_get_attribs(struct yaffs_obj *
+ 
+ 	attr->ia_mode = obj->yst_mode;
+ 	valid |= ATTR_MODE;
+-	attr->ia_uid = obj->yst_uid;
++	ia_uid_write(attr, obj->yst_uid);
+ 	valid |= ATTR_UID;
+-	attr->ia_gid = obj->yst_gid;
++	ia_gid_write(attr, obj->yst_gid);
+ 	valid |= ATTR_GID;
+ 
+ 	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
diff --git a/trunk/target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch b/trunk/target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch
new file mode 100644
index 00000000..5345678c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/502-yaffs-3.10-disable-proc-entry.patch
@@ -0,0 +1,44 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -3025,6 +3025,7 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "y
+ #endif
+ 
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ static struct proc_dir_entry *my_proc_entry;
+ 
+ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
+@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file 
+ 		return yaffs_proc_debug_write(file, buf, count, data);
+ 	return yaffs_proc_write_trace_options(file, buf, count, data);
+ }
++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) */
+ 
+ /* Stuff to handle installation of file systems */
+ struct file_system_to_install {
+@@ -3421,6 +3423,7 @@ static int __init init_yaffs_fs(void)
+ 
+ 	mutex_init(&yaffs_context_lock);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	/* Install the proc_fs entries */
+ 	my_proc_entry = create_proc_entry("yaffs",
+ 					  S_IRUGO | S_IFREG, YPROC_ROOT);
+@@ -3432,6 +3435,7 @@ static int __init init_yaffs_fs(void)
+ 	} else {
+ 		return -ENOMEM;
+         }
++#endif
+ 
+ 	/* Now add the file system entries */
+ 
+@@ -3468,7 +3472,9 @@ static void __exit exit_yaffs_fs(void)
+ 	yaffs_trace(YAFFS_TRACE_ALWAYS,
+ 		"yaffs built " __DATE__ " " __TIME__ " removing.");
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	remove_proc_entry("yaffs", YPROC_ROOT);
++#endif
+ 
+ 	fsinst = fs_to_install;
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/503-yaffs-3.12-convert-readdir-to-iterate.patch b/trunk/target/linux/generic/patches-3.14/503-yaffs-3.12-convert-readdir-to-iterate.patch
new file mode 100644
index 00000000..586c141e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/503-yaffs-3.12-convert-readdir-to-iterate.patch
@@ -0,0 +1,129 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -1701,6 +1701,110 @@ static void yaffs_remove_obj_callback(st
+ 
+ /*-----------------------------------------------------------------*/
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
++static int yaffs_readdir(struct file *file, struct dir_context *ctx)
++{
++	struct yaffs_obj *obj;
++	struct yaffs_dev *dev;
++	struct yaffs_search_context *sc;
++	struct inode *inode = file->f_dentry->d_inode;
++	unsigned long offset, curoffs;
++	struct yaffs_obj *l;
++	int ret_val = 0;
++
++	char name[YAFFS_MAX_NAME_LENGTH + 1];
++
++	obj = yaffs_dentry_to_obj(file->f_dentry);
++	dev = obj->my_dev;
++
++	yaffs_gross_lock(dev);
++
++	yaffs_dev_to_lc(dev)->readdir_process = current;
++
++	offset = ctx->pos;
++
++	sc = yaffs_new_search(obj);
++	if (!sc) {
++		ret_val = -ENOMEM;
++		goto out;
++	}
++
++	yaffs_trace(YAFFS_TRACE_OS,
++		"yaffs_readdir: starting at %d", (int)offset);
++
++	if (offset == 0) {
++		yaffs_trace(YAFFS_TRACE_OS,
++			"yaffs_readdir: entry . ino %d",
++			(int)inode->i_ino);
++		yaffs_gross_unlock(dev);
++		if (!dir_emit_dot(file, ctx)) {
++			yaffs_gross_lock(dev);
++			goto out;
++		}
++		yaffs_gross_lock(dev);
++		offset++;
++		ctx->pos++;
++	}
++	if (offset == 1) {
++		yaffs_trace(YAFFS_TRACE_OS,
++			"yaffs_readdir: entry .. ino %d",
++			(int)file->f_dentry->d_parent->d_inode->i_ino);
++		yaffs_gross_unlock(dev);
++		if (!dir_emit_dotdot(file, ctx)) {
++			yaffs_gross_lock(dev);
++			goto out;
++		}
++		yaffs_gross_lock(dev);
++		offset++;
++		ctx->pos++;
++	}
++
++	curoffs = 1;
++
++	/* If the directory has changed since the open or last call to
++	   readdir, rewind to after the 2 canned entries. */
++	if (file->f_version != inode->i_version) {
++		offset = 2;
++		ctx->pos = offset;
++		file->f_version = inode->i_version;
++	}
++
++	while (sc->next_return) {
++		curoffs++;
++		l = sc->next_return;
++		if (curoffs >= offset) {
++			int this_inode = yaffs_get_obj_inode(l);
++			int this_type = yaffs_get_obj_type(l);
++
++			yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
++			yaffs_trace(YAFFS_TRACE_OS,
++				"yaffs_readdir: %s inode %d",
++				name, yaffs_get_obj_inode(l));
++
++			yaffs_gross_unlock(dev);
++
++			if (!dir_emit(ctx, name, strlen(name),
++				      this_inode, this_type) < 0) {
++				yaffs_gross_lock(dev);
++				goto out;
++			}
++
++			yaffs_gross_lock(dev);
++
++			offset++;
++			ctx->pos++;
++		}
++		yaffs_search_advance(sc);
++	}
++
++out:
++	yaffs_search_end(sc);
++	yaffs_dev_to_lc(dev)->readdir_process = NULL;
++	yaffs_gross_unlock(dev);
++
++	return ret_val;
++}
++#else
+ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
+ {
+ 	struct yaffs_obj *obj;
+@@ -1807,10 +1911,15 @@ out:
+ 
+ 	return ret_val;
+ }
++#endif
+ 
+ static const struct file_operations yaffs_dir_operations = {
+ 	.read = generic_read_dir,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
++	.iterate = yaffs_readdir,
++#else
+ 	.readdir = yaffs_readdir,
++#endif
+ 	.fsync = yaffs_sync_object,
+ 	.llseek = generic_file_llseek,
+ };
diff --git a/trunk/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch b/trunk/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch
new file mode 100644
index 00000000..4858519c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/503-yaffs-add-tags-9bytes-mount-option.patch
@@ -0,0 +1,123 @@
+Subject: yaffs: add support for tags-9bytes mount option
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -2634,6 +2634,7 @@ static const struct super_operations yaf
+ 
+ struct yaffs_options {
+ 	int inband_tags;
++	int tags_9bytes;
+ 	int skip_checkpoint_read;
+ 	int skip_checkpoint_write;
+ 	int no_cache;
+@@ -2673,6 +2674,8 @@ static int yaffs_parse_options(struct ya
+ 
+ 		if (!strcmp(cur_opt, "inband-tags")) {
+ 			options->inband_tags = 1;
++		} else if (!strcmp(cur_opt, "tags-9bytes")) {
++			options->tags_9bytes = 1;
+ 		} else if (!strcmp(cur_opt, "tags-ecc-off")) {
+ 			options->tags_ecc_on = 0;
+ 			options->tags_ecc_overridden = 1;
+@@ -2746,7 +2749,6 @@ static struct super_block *yaffs_interna
+ 	struct yaffs_param *param;
+ 
+ 	int read_only = 0;
+-	int inband_tags = 0;
+ 
+ 	struct yaffs_options options;
+ 
+@@ -2786,6 +2788,9 @@ static struct super_block *yaffs_interna
+ 
+ 	memset(&options, 0, sizeof(options));
+ 
++	if (IS_ENABLED(CONFIG_YAFFS_9BYTE_TAGS))
++		options.tags_9bytes = 1;
++
+ 	if (yaffs_parse_options(&options, data_str)) {
+ 		/* Option parsing failed */
+ 		return NULL;
+@@ -2819,17 +2824,22 @@ static struct super_block *yaffs_interna
+ 	}
+ 
+ 	/* Added NCB 26/5/2006 for completeness */
+-	if (yaffs_version == 2 && !options.inband_tags
+-	    && WRITE_SIZE(mtd) == 512) {
++	if (yaffs_version == 2 &&
++	    (!options.inband_tags || options.tags_9bytes) &&
++	    WRITE_SIZE(mtd) == 512) {
+ 		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1");
+ 		yaffs_version = 1;
+ 	}
+ 
+-	if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) ||
+-	    options.inband_tags)
+-		inband_tags = 1;
++	if (yaffs_version == 2 &&
++	    mtd->oobavail < sizeof(struct yaffs_packed_tags2)) {
++		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting inband tags");
++		options.inband_tags = 1;
++	}
+ 
+-	if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0)
++	err = yaffs_verify_mtd(mtd, yaffs_version, options.inband_tags,
++			       options.tags_9bytes);
++	if (err < 0)
+ 		return NULL;
+ 
+ 	/* OK, so if we got here, we have an MTD that's NAND and looks
+@@ -2890,7 +2900,8 @@ static struct super_block *yaffs_interna
+ 
+ 	param->n_reserved_blocks = 5;
+ 	param->n_caches = (options.no_cache) ? 0 : 10;
+-	param->inband_tags = inband_tags;
++	param->inband_tags = options.inband_tags;
++	param->tags_9bytes = options.tags_9bytes;
+ 
+ 	param->enable_xattr = 1;
+ 	if (options.lazy_loading_overridden)
+--- a/fs/yaffs2/yaffs_mtdif.c
++++ b/fs/yaffs2/yaffs_mtdif.c
+@@ -16,6 +16,7 @@
+ #include "yaffs_mtdif.h"
+ 
+ #include "linux/mtd/mtd.h"
++#include "uapi/linux/major.h"
+ #include "linux/types.h"
+ #include "linux/time.h"
+ #include "linux/mtd/nand.h"
+@@ -276,7 +277,8 @@ struct mtd_info * yaffs_get_mtd_device(d
+ 	return mtd;
+ }
+ 
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes)
+ {
+ 	if (yaffs_version == 2) {
+ 		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+@@ -295,6 +297,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
+ 			);
+ 			return -1;
+ 		}
++
++		if (tags_9bytes && mtd->oobavail < 9) {
++			yaffs_trace(YAFFS_TRACE_ALWAYS,
++				    "MTD device does not support 9-byte tags");
++			return -1;
++		}
+ 	}
+ 
+ 	return 0;
+--- a/fs/yaffs2/yaffs_mtdif.h
++++ b/fs/yaffs2/yaffs_mtdif.h
+@@ -21,5 +21,6 @@
+ void yaffs_mtd_drv_install(struct yaffs_dev *dev);
+ struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
+ void yaffs_put_mtd_device(struct mtd_info *mtd);
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes);
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.14/504-yaffs-fix-compat-tags-handling.patch b/trunk/target/linux/generic/patches-3.14/504-yaffs-fix-compat-tags-handling.patch
new file mode 100644
index 00000000..a18cf6fd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/504-yaffs-fix-compat-tags-handling.patch
@@ -0,0 +1,239 @@
+Subject: yaffs: fix compat tags handling
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_tagscompat.c
++++ b/fs/yaffs2/yaffs_tagscompat.c
+@@ -17,7 +17,9 @@
+ #include "yaffs_getblockinfo.h"
+ #include "yaffs_trace.h"
+ 
++#if 0
+ static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
++#endif
+ 
+ 
+ /********** Tags ECC calculations  *********/
+@@ -71,6 +73,7 @@ int yaffs_check_tags_ecc(struct yaffs_ta
+ 	return 0;
+ }
+ 
++#if 0
+ /********** Tags **********/
+ 
+ static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
+@@ -379,3 +382,214 @@ void yaffs_tags_compat_install(struct ya
+ 	if(!dev->tagger.mark_bad_fn)
+ 		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
+ }
++#else
++
++#include "yaffs_packedtags1.h"
++
++static int yaffs_tags_compat_write(struct yaffs_dev *dev,
++				   int nand_chunk,
++				   const u8 *data,
++				   const struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	u8 tag_buf[9];
++	int retval;
++
++	/* we assume that yaffs_packed_tags1 and yaffs_tags are compatible */
++	compile_time_assertion(sizeof(struct yaffs_packed_tags1) == 12);
++	compile_time_assertion(sizeof(struct yaffs_tags) == 8);
++
++	yaffs_pack_tags1(&pt1, tags);
++	yaffs_calc_tags_ecc((struct yaffs_tags *)&pt1);
++
++	/* When deleting a chunk, the upper layer provides only skeletal
++	 * tags, one with is_deleted set.  However, we need to update the
++	 * tags, not erase them completely.  So we use the NAND write property
++	 * that only zeroed-bits stick and set tag bytes to all-ones and
++	 * zero just the (not) deleted bit.
++	 */
++	if (!dev->param.tags_9bytes) {
++		if (tags->is_deleted) {
++			memset(&pt1, 0xff, 8);
++			/* clear delete status bit to indicate deleted */
++			pt1.deleted = 0;
++		}
++		memcpy(tag_buf, &pt1, 8);
++	} else {
++		if (tags->is_deleted) {
++			memset(tag_buf, 0xff, 8);
++			tag_buf[8] = 0;
++		} else {
++			memcpy(tag_buf, &pt1, 8);
++			tag_buf[8] = 0xff;
++		}
++	}
++
++	retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk,
++			data,
++			(data) ? dev->data_bytes_per_chunk : 0,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8);
++
++	return retval;
++}
++
++/* Return with empty extended tags but add ecc_result.
++ */
++static int return_empty_tags(struct yaffs_ext_tags *tags,
++			     enum yaffs_ecc_result ecc_result,
++			     int retval)
++{
++	if (tags) {
++		memset(tags, 0, sizeof(*tags));
++		tags->ecc_result = ecc_result;
++	}
++
++	return retval;
++}
++
++static int yaffs_tags_compat_read(struct yaffs_dev *dev,
++				  int nand_chunk,
++				  u8 *data,
++				  struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	enum yaffs_ecc_result ecc_result;
++	int retval;
++	int deleted;
++	u8 tag_buf[9];
++
++	retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
++			data, dev->param.total_bytes_per_chunk,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8,
++			&ecc_result);
++
++	switch (ecc_result) {
++	case YAFFS_ECC_RESULT_NO_ERROR:
++	case YAFFS_ECC_RESULT_FIXED:
++		break;
++
++	case YAFFS_ECC_RESULT_UNFIXED:
++	default:
++		return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED, 0);
++		tags->block_bad = dev->drv.drv_check_bad_fn(dev, nand_chunk);
++		return YAFFS_FAIL;
++	}
++
++	/* Check for a blank/erased chunk. */
++	if (yaffs_check_ff(tag_buf, 8)) {
++		/* when blank, upper layers want ecc_result to be <= NO_ERROR */
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_NO_ERROR,
++					 YAFFS_OK);
++	}
++
++	memcpy(&pt1, tag_buf, 8);
++
++	if (!dev->param.tags_9bytes) {
++		/* Read deleted status (bit) then return it to it's non-deleted
++		 * state before performing tags mini-ECC check. pt1.deleted is
++		 * inverted.
++		 */
++		deleted = !pt1.deleted;
++		pt1.deleted = 1;
++	} else {
++		deleted = (hweight8(tag_buf[8]) < 7) ? 1 : 0;
++	}
++
++	/* Check the packed tags mini-ECC and correct if necessary/possible. */
++	retval = yaffs_check_tags_ecc((struct yaffs_tags *)&pt1);
++	switch (retval) {
++	case 0:
++		/* no tags error, use MTD result */
++		break;
++	case 1:
++		/* recovered tags-ECC error */
++		dev->n_tags_ecc_fixed++;
++		if (ecc_result == YAFFS_ECC_RESULT_NO_ERROR)
++			ecc_result = YAFFS_ECC_RESULT_FIXED;
++		break;
++	default:
++		/* unrecovered tags-ECC error */
++		dev->n_tags_ecc_unfixed++;
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED,
++					 YAFFS_FAIL);
++	}
++
++	/* Unpack the tags to extended form and set ECC result.
++	 * [set should_be_ff just to keep yaffs_unpack_tags1 happy]
++	 */
++	pt1.should_be_ff = 0xffffffff;
++	yaffs_unpack_tags1(tags, &pt1);
++	tags->ecc_result = ecc_result;
++
++	/* Set deleted state */
++	tags->is_deleted = deleted;
++	return YAFFS_OK;
++}
++
++static int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no)
++{
++	return dev->drv.drv_mark_bad_fn(dev, block_no);
++}
++
++static int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
++					 int block_no,
++					 enum yaffs_block_state *state,
++					 u32 *seq_number)
++{
++	struct yaffs_ext_tags tags;
++	int retval;
++
++	yaffs_trace(YAFFS_TRACE_MTD, "%s %d", __func__, block_no);
++
++	*seq_number = 0;
++
++	retval = dev->drv.drv_check_bad_fn(dev, block_no);
++	if (retval == YAFFS_FAIL) {
++		*state = YAFFS_BLOCK_STATE_DEAD;
++		goto out;
++	}
++
++	yaffs_tags_compat_read(dev, block_no * dev->param.chunks_per_block,
++			       NULL, &tags);
++
++	if (tags.ecc_result != YAFFS_ECC_RESULT_NO_ERROR) {
++		yaffs_trace(YAFFS_TRACE_MTD, "block %d is marked bad",
++			    block_no);
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else if (tags.chunk_used) {
++		*seq_number = tags.seq_number;
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else {
++		*state = YAFFS_BLOCK_STATE_EMPTY;
++	}
++
++	retval = YAFFS_OK;
++
++out:
++	yaffs_trace(YAFFS_TRACE_MTD,
++		    "block query returns seq %u state %d",
++		    *seq_number, *state);
++
++	return retval;
++}
++
++void yaffs_tags_compat_install(struct yaffs_dev *dev)
++{
++	if (dev->param.is_yaffs2)
++		return;
++
++	if (!dev->tagger.write_chunk_tags_fn)
++		dev->tagger.write_chunk_tags_fn = yaffs_tags_compat_write;
++
++	if (!dev->tagger.read_chunk_tags_fn)
++		dev->tagger.read_chunk_tags_fn = yaffs_tags_compat_read;
++
++	if (!dev->tagger.query_block_fn)
++		dev->tagger.query_block_fn = yaffs_tags_compat_query_block;
++
++	if (!dev->tagger.mark_bad_fn)
++		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
++}
++#endif
diff --git a/trunk/target/linux/generic/patches-3.14/520-squashfs_update_xz_comp_opts.patch b/trunk/target/linux/generic/patches-3.14/520-squashfs_update_xz_comp_opts.patch
new file mode 100644
index 00000000..ad11b302
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/520-squashfs_update_xz_comp_opts.patch
@@ -0,0 +1,25 @@
+From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 12 Apr 2011 19:55:41 +0200
+Subject: [PATCH] squashfs: update xz compressor options struct.
+
+Update the xz compressor options struct to match the squashfs userspace
+one.
+---
+ fs/squashfs/xz_wrapper.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/fs/squashfs/xz_wrapper.c
++++ b/fs/squashfs/xz_wrapper.c
+@@ -40,8 +40,10 @@ struct squashfs_xz {
+ };
+ 
+ struct disk_comp_opts {
+-	__le32 dictionary_size;
+ 	__le32 flags;
++	__le16 bit_opts;
++	__le16 fb;
++	__le32 dictionary_size;
+ };
+ 
+ struct comp_opts {
diff --git a/trunk/target/linux/generic/patches-3.14/530-jffs2_make_lzma_available.patch b/trunk/target/linux/generic/patches-3.14/530-jffs2_make_lzma_available.patch
new file mode 100644
index 00000000..e3e99ec4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/530-jffs2_make_lzma_available.patch
@@ -0,0 +1,5142 @@
+--- a/fs/jffs2/Kconfig
++++ b/fs/jffs2/Kconfig
+@@ -139,6 +139,15 @@ config JFFS2_LZO
+ 	  This feature was added in July, 2007. Say 'N' if you need
+ 	  compatibility with older bootloaders or kernels.
+ 
++config JFFS2_LZMA
++	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
++	select LZMA_COMPRESS
++	select LZMA_DECOMPRESS
++	depends on JFFS2_FS
++	default n
++	help
++	  JFFS2 wrapper to the LZMA C SDK
++
+ config JFFS2_RTIME
+ 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
+ 	depends on JFFS2_FS
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
+@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
+ jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
+ jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
+ jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
++jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
+ jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
++
++CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
+--- a/fs/jffs2/compr.c
++++ b/fs/jffs2/compr.c
+@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ /* Setting default compression mode */
+ #ifdef CONFIG_JFFS2_CMODE_NONE
+ 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
+@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
+ int jffs2_compressors_exit(void)
+ {
+ /* Unregistering compressors */
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
+--- a/fs/jffs2/compr.h
++++ b/fs/jffs2/compr.h
+@@ -29,9 +29,9 @@
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_LZARI_PRIORITY     30
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
+-
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
+ #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
+@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/fs/jffs2/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
+ 
+-	pr_info("version 2.2."
++	pr_info("version 2.2"
+ #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+ 	       " (NAND)"
+ #endif
+ #ifdef CONFIG_JFFS2_SUMMARY
+-	       " (SUMMARY) "
++	       " (SUMMARY)"
+ #endif
+-	       " © 2001-2006 Red Hat, Inc.\n");
++#ifdef CONFIG_JFFS2_ZLIB
++	       " (ZLIB)"
++#endif
++#ifdef CONFIG_JFFS2_LZO
++	       " (LZO)"
++#endif
++#ifdef CONFIG_JFFS2_LZMA
++	       " (LZMA)"
++#endif
++#ifdef CONFIG_JFFS2_RTIME
++	       " (RTIME)"
++#endif
++#ifdef CONFIG_JFFS2_RUBIN
++	       " (RUBIN)"
++#endif
++#ifdef  CONFIG_JFFS2_CMODE_NONE
++	       " (CMODE_NONE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_PRIORITY
++	       " (CMODE_PRIORITY)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_SIZE
++	       " (CMODE_SIZE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
++	       " (CMODE_FAVOURLZO)"
++#endif
++	       " (c) 2001-2006 Red Hat, Inc.\n");
+ 
+ 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
+ 					     sizeof(struct jffs2_inode_info),
+--- a/include/uapi/linux/jffs2.h
++++ b/include/uapi/linux/jffs2.h
+@@ -46,6 +46,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,62 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <asm/types.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,115 @@
++/* LzFind.h -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_FIND_H
++#define __LZ_FIND_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  size_t directInputRem;
++  int btMode;
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
++    UInt32 *distances, UInt32 maxLen);
++
++/*
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,54 @@
++/* LzHash.h -- HASH functions for LZ algorithms
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_HASH_H
++#define __LZ_HASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,231 @@
++/* LzmaDec.h -- LZMA Decoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_DEC_H
++#define __LZMA_DEC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs,
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum
++{
++  LZMA_FINISH_ANY,   /* finish at any point */
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
++        You must use correct finish mode in that case. */
++
++typedef enum
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually.
++   For Buffer Interface you must always use variant 1.
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */
++
++/* You can use it, if you want to eliminate the overhead for data copying from
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,80 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_ENC_H
++#define __LZMA_ENC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */
++  int lp;          /* 0 <= lp <= 4, default = 0 */
++  int pb;          /* 0 <= pb <= 4, default = 2 */
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,226 @@
++/* Types.h -- Basic types
++2009-11-23 : Igor Pavlov : Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#include <stddef.h>
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
++
++#ifndef EXTERN_C_BEGIN
++#ifdef __cplusplus
++#define EXTERN_C_BEGIN extern "C" {
++#define EXTERN_C_END }
++#else
++#define EXTERN_C_BEGIN
++#define EXTERN_C_END
++#endif
++#endif
++
++EXTERN_C_BEGIN
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifdef _WIN32
++typedef DWORD WRes;
++#else
++typedef int WRes;
++#endif
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++#ifdef _SZ_NO_INT_64
++
++/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
++   NOTES: Some code will work incorrectly in that case! */
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _WIN32
++#define MY_STD_CALL __stdcall
++#else
++#define MY_STD_CALL
++#endif
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_FAST_CALL __fastcall
++
++#else
++
++#define MY_CDECL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++/* it can return SZ_ERROR_INPUT_EOF */
++SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
++SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
++SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++       (result < size) means error */
++} ISeqOutStream;
++
++typedef enum
++{
++  SZ_SEEK_SET = 0,
++  SZ_SEEK_CUR = 1,
++  SZ_SEEK_END = 2
++} ESzSeek;
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ISeekInStream;
++
++typedef struct
++{
++  SRes (*Look)(void *p, void **buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) > input(*size)) is not allowed
++       (output(*size) < input(*size)) is allowed */
++  SRes (*Skip)(void *p, size_t offset);
++    /* offset must be <= output(*size) of Look */
++
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* reads directly (without buffer). It's same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ILookInStream;
++
++SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
++SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
++
++/* reads via ILookInStream::Read */
++SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
++SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
++
++#define LookToRead_BUF_SIZE (1 << 14)
++
++typedef struct
++{
++  ILookInStream s;
++  ISeekInStream *realStream;
++  size_t pos;
++  size_t size;
++  Byte buf[LookToRead_BUF_SIZE];
++} CLookToRead;
++
++void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
++void LookToRead_Init(CLookToRead *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToLook;
++
++void SecToLook_CreateVTable(CSecToLook *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToRead;
++
++void SecToRead_CreateVTable(CSecToRead *p);
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++EXTERN_C_END
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -215,6 +215,12 @@ config LZ4_DECOMPRESS
+ 
+ source "lib/xz/Kconfig"
+ 
++config LZMA_COMPRESS
++    tristate
++
++config LZMA_DECOMPRESS
++    tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,6 +2,16 @@
+ # Makefile for some libs needed in the kernel.
+ #
+ 
++ifdef CONFIG_JFFS2_ZLIB
++	CONFIG_ZLIB_INFLATE:=y
++	CONFIG_ZLIB_DEFLATE:=y
++endif
++
++ifdef CONFIG_JFFS2_LZMA
++	CONFIG_LZMA_DECOMPRESS:=y
++	CONFIG_LZMA_COMPRESS:=y
++endif
++
+ ifdef CONFIG_FUNCTION_TRACER
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+@@ -82,6 +92,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
+ obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
+ obj-$(CONFIG_XZ_DEC) += xz/
+ obj-$(CONFIG_RAID6_PQ) += raid6/
++obj-$(CONFIG_LZMA_COMPRESS) += lzma/
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/lib/lzma/LzFind.c
+@@ -0,0 +1,761 @@
++/* LzFind.c -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  if (p->directInput)
++  {
++    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
++    if (curSize > p->directInputRem)
++      curSize = (UInt32)p->directInputRem;
++    p->directInputRem -= curSize;
++    p->streamPos += curSize;
++    if (p->directInputRem == 0)
++      p->streamEndWasReached = 1;
++    return;
++  }
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase,
++    p->buffer - p->keepSizeBefore,
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  if (p->directInput)
++    return 0;
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached)
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = historySize + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit)
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit)
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for (i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
++{
++  return (p->pos - p->historySize - 1) & kNormalizeMask;
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while (++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] =
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2)
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lib/lzma/LzmaDec.c
+@@ -0,0 +1,999 @@
++/* LzmaDec.c -- LZMA Decoder
++2009-09-20 : Igor Pavlov : Public domain */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; }
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded.
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
++Out:
++  Result:
++    SZ_OK - OK
++    SZ_ERROR_DATA - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        state -= (state < 4) ? state : 3;
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        state -= (state < 10) ? 3 : 6;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++      continue;
++    }
++    else
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance;
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while (--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1;
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++      }
++
++      len += kMatchMinLen;
++
++      if (limit == dicPos)
++        return SZ_ERROR_DATA;
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do
++            *(dest) = (Byte)*(dest + src);
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE *
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while (--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++{
++  p->needFlush = 1;
++  p->remainLen = 0;
++  p->tempBufSize = 0;
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p)
++{
++  p->dicPos = 0;
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1;
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = (SizeT)(p->buf - src);
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0)
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->probs);
++  p->probs = 0;
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->dic);
++  p->dic = 0;
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize;
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/LzmaEnc.c
+@@ -0,0 +1,2271 @@
++/* LzmaEnc.c -- LZMA Encoder
++2009-11-24 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include "LzmaEnc.h"
++
++/* disable MT */
++#define _7ZIP_ST
++
++#include "LzFind.h"
++#ifndef _7ZIP_ST
++#include "LzFindMt.h"
++#endif
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3;
++  if (p->lp < 0) p->lp = 0;
++  if (p->pb < 0) p->pb = 2;
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
++  if (p->numHashBytes < 0) p->numHashBytes = 4;
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0)
++    p->numThreads =
++      #ifndef _7ZIP_ST
++      ((p->btMode && p->algo) ? 2 : 1);
++      #else
++      1;
++      #endif
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos)
++{
++  UInt32 res;
++  BSR2_RET(pos, res);
++  return res;
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct
++{
++  UInt32 price;
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;
++
++  UInt32 posPrev;
++  UInt32 backPrev;
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6
++#define kDicLogSizeMin 0
++#define kDicLogSizeMax 32
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifndef _7ZIP_ST
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifndef _7ZIP_ST
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  UInt32 longestMatchLength;
++  UInt32 numPairs;
++  UInt32 numAvail;
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  int needInit;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifndef _7ZIP_ST
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++#define IsCharState(s) ((s) < 7)
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);
++  }
++  p->cacheSize++;
++  p->low = (UInt32)p->low << 8;
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++}
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numPairs;
++  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
++  ttt++;
++  {
++    UInt32 i;
++    for (i = 0; i < numPairs; i += 2)
++      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
++  }
++  #endif
++  if (numPairs > 0)
++  {
++    lenRes = p->matches[numPairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matches[numPairs - 1] + 1;
++      UInt32 numAvail = p->numAvail;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numPairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex;
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
++  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
++  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
++  UInt32 *matches;
++  const Byte *data;
++  Byte curByte, matchByte;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  if (numAvail < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++  curByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
++        (!IsCharState(p->state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == curByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= mainLen)
++  {
++    UInt32 offs = 0;
++    while (len > matches[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matches[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matches[offs])
++      {
++        offs += 2;
++        if (offs == numPairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
++    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
++    Bool nextIsChar;
++    Byte curByte, matchByte;
++    const Byte *data;
++    COptimal *curOpt;
++    COptimal *nextOpt;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    newLen = ReadMatchDistances(p, &numPairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numPairs = numPairs;
++      p->longestMatchLength = newLen;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price;
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    curByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price +=
++        (!IsCharState(state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++    }
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price)
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++    numAvailFull = p->numAvail;
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp < numAvailFull)
++        numAvailFull = temp;
++    }
++
++    if (numAvailFull < 2)
++      continue;
++    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
++
++    if (!nextIsChar && matchByte != curByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailFull)
++        limit = numAvailFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price +
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price)
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice =
++                price + p->repLenEnc.prices[posState][lenTest - 2] +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvail)
++    {
++      newLen = numAvail;
++      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
++      matches[numPairs] = newLen;
++      numPairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matches[offs])
++        offs += 2;
++      curBack = matches[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matches[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numPairs)
++            break;
++          curBack = matches[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
++  const Byte *data;
++  const UInt32 *matches;
++
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  *backRes = (UInt32)-1;
++  if (numAvail < 2)
++    return 1;
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++
++  repLen = repIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    if (len > repLen)
++    {
++      repIndex = i;
++      repLen = len;
++    }
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++
++  mainDist = 0; /* for GCC */
++  if (mainLen >= 2)
++  {
++    mainDist = matches[numPairs - 1];
++    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
++    {
++      if (!ChangePair(matches[numPairs - 3], mainDist))
++        break;
++      numPairs -= 2;
++      mainLen = matches[numPairs - 2];
++      mainDist = matches[numPairs - 1];
++    }
++    if (mainLen == 2 && mainDist >= 0x80)
++      mainLen = 1;
++  }
++
++  if (repLen >= 2 && (
++        (repLen + 1 >= mainLen) ||
++        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
++        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
++  {
++    *backRes = repIndex;
++    MovePos(p, repLen - 1);
++    return repLen;
++  }
++  
++  if (mainLen < 2 || numAvail <= 2)
++    return 1;
++
++  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
++  if (p->longestMatchLength >= 2)
++  {
++    UInt32 newDistance = matches[p->numPairs - 1];
++    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
++        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
++        (p->longestMatchLength > mainLen + 1) ||
++        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
++      return 1;
++  }
++  
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len, limit;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    limit = mainLen - 1;
++    for (len = 2; len < limit && data[len] == data2[len]; len++);
++    if (len >= limit)
++      return 1;
++  }
++  *backRes = mainDist + LZMA_NUM_REPS;
++  MovePos(p, mainLen - 2);
++  return mainLen;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  {
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->needInit)
++  {
++    p->matchFinder.Init(p->matchFinderObj);
++    p->needInit = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numPairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numPairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == (UInt32)-1)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifndef _7ZIP_ST
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifndef _7ZIP_ST
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for (i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize =
++  p->repLenEnc.tableSize =
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->matchFinderBase.directInput = 1;
++  p->matchFinderBase.bufferBase = (Byte *)src;
++  p->matchFinderBase.directInputRem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->needInit = 1;
++
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifndef _7ZIP_ST
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #else
++  pp = pp;
++  #endif
++}
++
++typedef struct
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
++{
++  SRes res = SZ_OK;
++
++  #ifndef _7ZIP_ST
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(p);
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
++  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++
++  p->rc.outStream = &outStream.funcTable;
++  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
++  if (res == SZ_OK)
++    res = LzmaEnc_Encode2(p, progress);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/Makefile
+@@ -0,0 +1,7 @@
++lzma_compress-objs := LzFind.o LzmaEnc.o
++lzma_decompress-objs := LzmaDec.o
++
++obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
++
++EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/trunk/target/linux/generic/patches-3.14/531-debloat_lzma.patch b/trunk/target/linux/generic/patches-3.14/531-debloat_lzma.patch
new file mode 100644
index 00000000..9f9690f1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/531-debloat_lzma.patch
@@ -0,0 +1,1021 @@
+--- a/include/linux/lzma/LzmaDec.h
++++ b/include/linux/lzma/LzmaDec.h
+@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
+   UInt32 dicSize;
+ } CLzmaProps;
+ 
+-/* LzmaProps_Decode - decodes properties
+-Returns:
+-  SZ_OK
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+-
+ 
+ /* ---------- LZMA Decoder state ---------- */
+ 
+@@ -70,8 +62,6 @@ typedef struct
+ 
+ #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
+ 
+-void LzmaDec_Init(CLzmaDec *p);
+-
+ /* There are two types of LZMA streams:
+      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
+      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+@@ -108,97 +98,6 @@ typedef enum
+ 
+ /* ELzmaStatus is used only as output value for function call */
+ 
+-
+-/* ---------- Interfaces ---------- */
+-
+-/* There are 3 levels of interfaces:
+-     1) Dictionary Interface
+-     2) Buffer Interface
+-     3) One Call Interface
+-   You can select any of these interfaces, but don't mix functions from different
+-   groups for same object. */
+-
+-
+-/* There are two variants to allocate state for Dictionary Interface:
+-     1) LzmaDec_Allocate / LzmaDec_Free
+-     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+-   You can use variant 2, if you set dictionary buffer manually.
+-   For Buffer Interface you must always use variant 1.
+-
+-LzmaDec_Allocate* can return:
+-  SZ_OK
+-  SZ_ERROR_MEM         - Memory allocation error
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-   
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
+-
+-SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
+-
+-/* ---------- Dictionary Interface ---------- */
+-
+-/* You can use it, if you want to eliminate the overhead for data copying from
+-   dictionary to some other external buffer.
+-   You must work with CLzmaDec variables directly in this interface.
+-
+-   STEPS:
+-     LzmaDec_Constr()
+-     LzmaDec_Allocate()
+-     for (each new stream)
+-     {
+-       LzmaDec_Init()
+-       while (it needs more decompression)
+-       {
+-         LzmaDec_DecodeToDic()
+-         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+-       }
+-     }
+-     LzmaDec_Free()
+-*/
+-
+-/* LzmaDec_DecodeToDic
+-   
+-   The decoding to internal dictionary buffer (CLzmaDec::dic).
+-   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (dicLimit).
+-  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+-  LZMA_FINISH_END - Stream must be finished after dicLimit.
+-
+-Returns:
+-  SZ_OK
+-    status:
+-      LZMA_STATUS_FINISHED_WITH_MARK
+-      LZMA_STATUS_NOT_FINISHED
+-      LZMA_STATUS_NEEDS_MORE_INPUT
+-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+-  SZ_ERROR_DATA - Data error
+-*/
+-
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+-/* ---------- Buffer Interface ---------- */
+-
+-/* It's zlib-like interface.
+-   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+-   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+-   to work with CLzmaDec variables manually.
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (*destLen).
+-  LZMA_FINISH_ANY - Decode just destLen bytes.
+-  LZMA_FINISH_END - Stream must be finished after (*destLen).
+-*/
+-
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+ /* ---------- One Call Interface ---------- */
+ 
+ /* LzmaDecode
+--- a/lib/lzma/LzmaDec.c
++++ b/lib/lzma/LzmaDec.c
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 
+   p->needFlush = 0;
+ }
+ 
+-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+ {
+   p->needFlush = 1;
+   p->remainLen = 0;
+@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
+     p->needInitState = 1;
+ }
+ 
+-void LzmaDec_Init(CLzmaDec *p)
++static void LzmaDec_Init(CLzmaDec *p)
+ {
+   p->dicPos = 0;
+   LzmaDec_InitDicAndState(p, True, True);
+@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
+   p->needInitState = 0;
+ }
+ 
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+     ELzmaFinishMode finishMode, ELzmaStatus *status)
+ {
+   SizeT inSize = *srcLen;
+@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
+   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
+ }
+ 
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+-{
+-  SizeT outSize = *destLen;
+-  SizeT inSize = *srcLen;
+-  *srcLen = *destLen = 0;
+-  for (;;)
+-  {
+-    SizeT inSizeCur = inSize, outSizeCur, dicPos;
+-    ELzmaFinishMode curFinishMode;
+-    SRes res;
+-    if (p->dicPos == p->dicBufSize)
+-      p->dicPos = 0;
+-    dicPos = p->dicPos;
+-    if (outSize > p->dicBufSize - dicPos)
+-    {
+-      outSizeCur = p->dicBufSize;
+-      curFinishMode = LZMA_FINISH_ANY;
+-    }
+-    else
+-    {
+-      outSizeCur = dicPos + outSize;
+-      curFinishMode = finishMode;
+-    }
+-
+-    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
+-    src += inSizeCur;
+-    inSize -= inSizeCur;
+-    *srcLen += inSizeCur;
+-    outSizeCur = p->dicPos - dicPos;
+-    memcpy(dest, p->dic + dicPos, outSizeCur);
+-    dest += outSizeCur;
+-    outSize -= outSizeCur;
+-    *destLen += outSizeCur;
+-    if (res != 0)
+-      return res;
+-    if (outSizeCur == 0 || outSize == 0)
+-      return SZ_OK;
+-  }
+-}
+-
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->probs);
+   p->probs = 0;
+ }
+ 
+-static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  alloc->Free(alloc, p->dic);
+-  p->dic = 0;
+-}
+-
+-void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  LzmaDec_FreeProbs(p, alloc);
+-  LzmaDec_FreeDict(p, alloc);
+-}
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+ {
+   UInt32 dicSize;
+   Byte d;
+@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+   return SZ_OK;
+ }
+ 
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+-{
+-  CLzmaProps propNew;
+-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  p->prop = propNew;
+-  return SZ_OK;
+-}
+-
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+ {
+   CLzmaProps propNew;
+-  SizeT dicBufSize;
+   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+   RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  dicBufSize = propNew.dicSize;
+-  if (p->dic == 0 || dicBufSize != p->dicBufSize)
+-  {
+-    LzmaDec_FreeDict(p, alloc);
+-    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
+-    if (p->dic == 0)
+-    {
+-      LzmaDec_FreeProbs(p, alloc);
+-      return SZ_ERROR_MEM;
+-    }
+-  }
+-  p->dicBufSize = dicBufSize;
+   p->prop = propNew;
+   return SZ_OK;
+ }
+--- a/include/linux/lzma/LzmaEnc.h
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
+ } CLzmaEncProps;
+ 
+ void LzmaEncProps_Init(CLzmaEncProps *p);
+-void LzmaEncProps_Normalize(CLzmaEncProps *p);
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+-
+ 
+ /* ---------- CLzmaEncHandle Interface ---------- */
+ 
+@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+ void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ 
+-/* ---------- One Call Interface ---------- */
+-
+-/* LzmaEncode
+-Return code:
+-  SZ_OK               - OK
+-  SZ_ERROR_MEM        - Memory allocation error
+-  SZ_ERROR_PARAM      - Incorrect paramater
+-  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+-  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+-*/
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzmaEnc.c
++++ b/lib/lzma/LzmaEnc.c
+@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
+   p->writeEndMark = 0;
+ }
+ 
+-void LzmaEncProps_Normalize(CLzmaEncProps *p)
++static void LzmaEncProps_Normalize(CLzmaEncProps *p)
+ {
+   int level = p->level;
+   if (level < 0) level = 5;
+@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
+       #endif
+ }
+ 
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+ {
+   CLzmaEncProps props = *props2;
+   LzmaEncProps_Normalize(&props);
+@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
+ 
+ #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
+ 
+-UInt32 GetPosSlot1(UInt32 pos)
++static UInt32 GetPosSlot1(UInt32 pos)
+ {
+   UInt32 res;
+   BSR2_RET(pos, res);
+@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
+ #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
+ #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+ 
+-void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
+ {
+   int c = 2, slotFast;
+   g_FastPos[0] = 0;
+@@ -339,58 +339,6 @@ typedef struct
+   CSaveState saveState;
+ } CLzmaEnc;
+ 
+-void LzmaEnc_SaveState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  CSaveState *dest = &p->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
+-}
+-
+-void LzmaEnc_RestoreState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *dest = (CLzmaEnc *)pp;
+-  const CSaveState *p = &dest->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
+-}
+-
+ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE
+   while (symbol < 0x10000);
+ }
+ 
+-void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
+ {
+   UInt32 i;
+   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
+@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc
+   p->matchPriceCount = 0;
+ }
+ 
+-void LzmaEnc_Construct(CLzmaEnc *p)
++static void LzmaEnc_Construct(CLzmaEnc *p)
+ {
+   RangeEnc_Construct(&p->rc);
+   MatchFinder_Construct(&p->matchFinderBase);
+@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+   return p;
+ }
+ 
+-void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->litProbs);
+   alloc->Free(alloc, p->saveState.litProbs);
+@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl
+   p->saveState.litProbs = 0;
+ }
+ 
+-void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   #ifndef _7ZIP_ST
+   MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
+@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U
+   return SZ_OK;
+ }
+ 
+-void LzmaEnc_Init(CLzmaEnc *p)
++static void LzmaEnc_Init(CLzmaEnc *p)
+ {
+   UInt32 i;
+   p->state = 0;
+@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p)
+   p->lpMask = (1 << p->lp) - 1;
+ }
+ 
+-void LzmaEnc_InitPrices(CLzmaEnc *p)
++static void LzmaEnc_InitPrices(CLzmaEnc *p)
+ {
+   if (!p->fastMode)
+   {
+@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
+   return SZ_OK;
+ }
+ 
+-static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  p->rc.outStream = outStream;
+-  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
+-}
+-
+-SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
+-    ISeqInStream *inStream, UInt32 keepWindowSize,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+-}
+-
+ static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
+ {
+   p->matchFinderBase.directInput = 1;
+@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc
+   p->matchFinderBase.directInputRem = srcLen;
+ }
+ 
+-SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+     UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
+   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+ }
+ 
+-void LzmaEnc_Finish(CLzmaEncHandle pp)
++static void LzmaEnc_Finish(CLzmaEncHandle pp)
+ {
+   #ifndef _7ZIP_ST
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo
+   return size;
+ }
+ 
+-
+-UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+-}
+-
+-const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+-}
+-
+-SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
+-    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  UInt64 nowPos64;
+-  SRes res;
+-  CSeqOutStreamBuf outStream;
+-
+-  outStream.funcTable.Write = MyWrite;
+-  outStream.data = dest;
+-  outStream.rem = *destLen;
+-  outStream.overflow = False;
+-
+-  p->writeEndMark = False;
+-  p->finished = False;
+-  p->result = SZ_OK;
+-
+-  if (reInit)
+-    LzmaEnc_Init(p);
+-  LzmaEnc_InitPrices(p);
+-  nowPos64 = p->nowPos64;
+-  RangeEnc_Init(&p->rc);
+-  p->rc.outStream = &outStream.funcTable;
+-
+-  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
+-  
+-  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+-  *destLen -= outStream.rem;
+-  if (outStream.overflow)
+-    return SZ_ERROR_OUTPUT_EOF;
+-
+-  return res;
+-}
+-
+ static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
+ {
+   SRes res = SZ_OK;
+@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p,
+   return res;
+ }
+ 
+-SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
+-  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
+-}
+-
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
+     return SZ_ERROR_OUTPUT_EOF;
+   return res;
+ }
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
+-  SRes res;
+-  if (p == 0)
+-    return SZ_ERROR_MEM;
+-
+-  res = LzmaEnc_SetProps(p, props);
+-  if (res == SZ_OK)
+-  {
+-    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
+-    if (res == SZ_OK)
+-      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
+-          writeEndMark, progress, alloc, allocBig);
+-  }
+-
+-  LzmaEnc_Destroy(p, alloc, allocBig);
+-  return res;
+-}
+--- a/include/linux/lzma/LzFind.h
++++ b/include/linux/lzma/LzFind.h
+@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
+ 
+ #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p);
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+-void MatchFinder_MoveBlock(CMatchFinder *p);
+-void MatchFinder_ReadIfRequired(CMatchFinder *p);
+-
+ void MatchFinder_Construct(CMatchFinder *p);
+ 
+ /* Conditions:
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 
+     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+     ISzAlloc *alloc);
+ void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+-    UInt32 *distances, UInt32 maxLen);
+ 
+ /*
+ Conditions:
+@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
+ 
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+ 
+-void MatchFinder_Init(CMatchFinder *p);
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzFind.c
++++ b/lib/lzma/LzFind.c
+@@ -14,9 +14,15 @@
+ 
+ #define kStartMaxLen 3
+ 
++#if 0
++#define DIRECT_INPUT	p->directInput
++#else
++#define DIRECT_INPUT	1
++#endif
++
+ static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
+ {
+-  if (!p->directInput)
++  if (!DIRECT_INPUT)
+   {
+     alloc->Free(alloc, p->bufferBase);
+     p->bufferBase = 0;
+@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder
+ static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
+ {
+   UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     p->blockSize = blockSize;
+     return 1;
+@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde
+   return (p->bufferBase != 0);
+ }
+ 
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+-Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
+ 
+-UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+ 
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+ {
+   p->posLimit -= subValue;
+   p->pos -= subValue;
+@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch
+ {
+   if (p->streamEndWasReached || p->result != SZ_OK)
+     return;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     UInt32 curSize = 0xFFFFFFFF - p->streamPos;
+     if (curSize > p->directInputRem)
+@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch
+   }
+ }
+ 
+-void MatchFinder_MoveBlock(CMatchFinder *p)
++static void MatchFinder_MoveBlock(CMatchFinder *p)
+ {
+   memmove(p->bufferBase,
+     p->buffer - p->keepSizeBefore,
+@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder 
+   p->buffer = p->bufferBase + p->keepSizeBefore;
+ }
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p)
++static int MatchFinder_NeedMove(CMatchFinder *p)
+ {
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+     return 0;
+   /* if (p->streamEndWasReached) return 0; */
+   return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
+ }
+ 
+-void MatchFinder_ReadIfRequired(CMatchFinder *p)
+-{
+-  if (p->streamEndWasReached)
+-    return;
+-  if (p->keepSizeAfter >= p->streamPos - p->pos)
+-    MatchFinder_ReadBlock(p);
+-}
+-
+ static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
+ {
+   if (MatchFinder_NeedMove(p))
+@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch
+   p->posLimit = p->pos + limit;
+ }
+ 
+-void MatchFinder_Init(CMatchFinder *p)
++static void MatchFinder_Init(CMatchFinder *p)
+ {
+   UInt32 i;
+   for (i = 0; i < p->hashSizeSum; i++)
+@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM
+   return (p->pos - p->historySize - 1) & kNormalizeMask;
+ }
+ 
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
+ {
+   UInt32 i;
+   for (i = 0; i < numItems; i++)
+@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat
+   MatchFinder_SetLimits(p);
+ }
+ 
+-static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+-    UInt32 *distances, UInt32 maxLen)
+-{
+-  son[_cyclicBufferPos] = curMatch;
+-  for (;;)
+-  {
+-    UInt32 delta = pos - curMatch;
+-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+-      return distances;
+-    {
+-      const Byte *pb = cur - delta;
+-      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+-      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
+-      {
+-        UInt32 len = 0;
+-        while (++len != lenLimit)
+-          if (pb[len] != cur[len])
+-            break;
+-        if (maxLen < len)
+-        {
+-          *distances++ = maxLen = len;
+-          *distances++ = delta - 1;
+-          if (len == lenLimit)
+-            return distances;
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+     UInt32 *distances, UInt32 maxLen)
+ {
+@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi
+   p->buffer++; \
+   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
+ 
+-#define MOVE_POS_RET MOVE_POS return offset;
+-
+ static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
+ 
++#define MOVE_POS_RET MatchFinder_MovePos(p); return offset;
++
+ #define GET_MATCHES_HEADER2(minLen, ret_op) \
+   UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
+   lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
+@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi
+   distances + offset, maxLen) - distances); MOVE_POS_RET;
+ 
+ #define SKIP_FOOTER \
+-  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
+-
+-static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(2)
+-  HASH2_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 1)
+-}
+-
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 2)
+-}
+-
+-static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, delta2, maxLen, offset;
+-  GET_MATCHES_HEADER(3)
+-
+-  HASH3_CALC;
+-
+-  delta2 = p->pos - p->hash[hash2Value];
+-  curMatch = p->hash[kFix3HashSize + hashValue];
+-  
+-  p->hash[hash2Value] =
+-  p->hash[kFix3HashSize + hashValue] = p->pos;
+-
+-
+-  maxLen = 2;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[0] = maxLen;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-    if (maxLen == lenLimit)
+-    {
+-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+-      MOVE_POS_RET;
+-    }
+-  }
+-  GET_MATCHES_FOOTER(offset, maxLen)
+-}
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p);
+ 
+ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+ {
+@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches
+   GET_MATCHES_FOOTER(offset, maxLen)
+ }
+ 
+-static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
+-  GET_MATCHES_HEADER(4)
+-
+-  HASH4_CALC;
+-
+-  delta2 = p->pos - p->hash[                hash2Value];
+-  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
+-  curMatch = p->hash[kFix4HashSize + hashValue];
+-
+-  p->hash[                hash2Value] =
+-  p->hash[kFix3HashSize + hash3Value] =
+-  p->hash[kFix4HashSize + hashValue] = p->pos;
+-
+-  maxLen = 1;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    distances[0] = maxLen = 2;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-  }
+-  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
+-  {
+-    maxLen = 3;
+-    distances[offset + 1] = delta3 - 1;
+-    offset += 2;
+-    delta2 = delta3;
+-  }
+-  if (offset != 0)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[offset - 2] = maxLen;
+-    if (maxLen == lenLimit)
+-    {
+-      p->son[p->cyclicBufferPos] = curMatch;
+-      MOVE_POS_RET;
+-    }
+-  }
+-  if (maxLen < 3)
+-    maxLen = 3;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances + offset, maxLen) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances, 2) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(2)
+-    HASH2_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value;
+-    SKIP_HEADER(3)
+-    HASH3_CALC;
+-    curMatch = p->hash[kFix3HashSize + hashValue];
+-    p->hash[hash2Value] =
+-    p->hash[kFix3HashSize + hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+ static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+ {
+   do
+@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF
+   while (--num != 0);
+ }
+ 
+-static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value, hash3Value;
+-    SKIP_HEADER(4)
+-    HASH4_CALC;
+-    curMatch = p->hash[kFix4HashSize + hashValue];
+-    p->hash[                hash2Value] =
+-    p->hash[kFix3HashSize + hash3Value] =
+-    p->hash[kFix4HashSize + hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
+ {
+   vTable->Init = (Mf_Init_Func)MatchFinder_Init;
+   vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
+   vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
+   vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
+-  if (!p->btMode)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 2)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 3)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
+-  }
+-  else
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+-  }
++  vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++  vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+ }
diff --git a/trunk/target/linux/generic/patches-3.14/532-jffs2_eofdetect.patch b/trunk/target/linux/generic/patches-3.14/532-jffs2_eofdetect.patch
new file mode 100644
index 00000000..26917906
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/532-jffs2_eofdetect.patch
@@ -0,0 +1,56 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
+ 	dbg_fsbuild("scanned flash completely\n");
+ 	jffs2_dbg_dump_block_lists_nolock(c);
+ 
++	if (c->flags & (1 << 7)) {
++		printk("%s(): unlocking the mtd device... ", __func__);
++		mtd_unlock(c->mtd, 0, c->mtd->size);
++		printk("done.\n");
++
++		printk("%s(): erasing all blocks after the end marker... ", __func__);
++		jffs2_erase_pending_blocks(c, -1);
++		printk("done.\n");
++	}
++
+ 	dbg_fsbuild("pass 1 starting\n");
+ 	c->flags |= JFFS2_SB_FLAG_BUILDING;
+ 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in
+ 		/* reset summary info for next eraseblock scan */
+ 		jffs2_sum_reset_collected(s);
+ 
+-		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
+-						buf_size, s);
++		if (c->flags & (1 << 7)) {
++			if (mtd_block_isbad(c->mtd, jeb->offset))
++				ret = BLK_STATE_BADBLOCK;
++			else
++				ret = BLK_STATE_ALLFF;
++		} else
++			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
++							buf_size, s);
+ 
+ 		if (ret < 0)
+ 			goto out;
+@@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct
+ 			return err;
+ 	}
+ 
++	if ((buf[0] == 0xde) &&
++		(buf[1] == 0xad) &&
++		(buf[2] == 0xc0) &&
++		(buf[3] == 0xde)) {
++		/* end of filesystem. erase everything after this point */
++		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
++		c->flags |= (1 << 7);
++
++		return BLK_STATE_ALLFF;
++	}
++
+ 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+ 	ofs = 0;
+ 	max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
diff --git a/trunk/target/linux/generic/patches-3.14/540-crypto-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.14/540-crypto-xz-decompression-support.patch
new file mode 100644
index 00000000..fbbda769
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/540-crypto-xz-decompression-support.patch
@@ -0,0 +1,146 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1367,6 +1367,13 @@ config CRYPTO_LZ4HC
+ 	help
+ 	  This is the LZ4 high compression mode algorithm.
+ 
++config CRYPTO_XZ
++	tristate "XZ compression algorithm"
++	select CRYPTO_ALGAPI
++	select XZ_DEC
++	help
++	  This is the XZ algorithm. Only decompression is supported for now.
++
+ comment "Random Number Generation"
+ 
+ config CRYPTO_ANSI_CPRNG
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -88,6 +88,7 @@ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.
+ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
+ obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
+ obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o
++obj-$(CONFIG_CRYPTO_XZ) += xz.o
+ obj-$(CONFIG_CRYPTO_842) += 842.o
+ obj-$(CONFIG_CRYPTO_RNG2) += rng.o
+ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
+--- /dev/null
++++ b/crypto/xz.c
+@@ -0,0 +1,117 @@
++/*
++ * Cryptographic API.
++ *
++ * XZ decompression support.
++ *
++ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ *
++ */
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/crypto.h>
++#include <linux/xz.h>
++#include <linux/interrupt.h>
++#include <linux/mm.h>
++#include <linux/net.h>
++
++struct xz_comp_ctx {
++	struct xz_dec	*decomp_state;
++	struct xz_buf	decomp_buf;
++};
++
++static int crypto_xz_decomp_init(struct xz_comp_ctx *ctx)
++{
++	ctx->decomp_state = xz_dec_init(XZ_SINGLE, 0);
++	if (!ctx->decomp_state)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void crypto_xz_decomp_exit(struct xz_comp_ctx *ctx)
++{
++	xz_dec_end(ctx->decomp_state);
++}
++
++static int crypto_xz_init(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	return crypto_xz_decomp_init(ctx);
++}
++
++static void crypto_xz_exit(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	crypto_xz_decomp_exit(ctx);
++}
++
++static int crypto_xz_compress(struct crypto_tfm *tfm, const u8 *src,
++			      unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	return -EOPNOTSUPP;
++}
++
++static int crypto_xz_decompress(struct crypto_tfm *tfm, const u8 *src,
++				unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	struct xz_comp_ctx *dctx = crypto_tfm_ctx(tfm);
++	struct xz_buf *xz_buf = &dctx->decomp_buf;
++	int ret;
++
++	memset(xz_buf, '\0', sizeof(struct xz_buf));
++
++	xz_buf->in = (u8 *) src;
++	xz_buf->in_pos = 0;
++	xz_buf->in_size = slen;
++	xz_buf->out = (u8 *) dst;
++	xz_buf->out_pos = 0;
++	xz_buf->out_size = *dlen;
++
++	ret = xz_dec_run(dctx->decomp_state, xz_buf);
++	if (ret != XZ_STREAM_END) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	*dlen = xz_buf->out_pos;
++	ret = 0;
++
++out:
++	return ret;
++}
++
++static struct crypto_alg crypto_xz_alg = {
++	.cra_name		= "xz",
++	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,
++	.cra_ctxsize		= sizeof(struct xz_comp_ctx),
++	.cra_module		= THIS_MODULE,
++	.cra_list		= LIST_HEAD_INIT(crypto_xz_alg.cra_list),
++	.cra_init		= crypto_xz_init,
++	.cra_exit		= crypto_xz_exit,
++	.cra_u			= { .compress = {
++	.coa_compress 		= crypto_xz_compress,
++	.coa_decompress  	= crypto_xz_decompress } }
++};
++
++static int __init crypto_xz_mod_init(void)
++{
++	return crypto_register_alg(&crypto_xz_alg);
++}
++
++static void __exit crypto_xz_mod_exit(void)
++{
++	crypto_unregister_alg(&crypto_xz_alg);
++}
++
++module_init(crypto_xz_mod_init);
++module_exit(crypto_xz_mod_exit);
++
++MODULE_LICENSE("GPL v2");
++MODULE_DESCRIPTION("Crypto XZ decompression support");
++MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/trunk/target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch
new file mode 100644
index 00000000..f85689c5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/541-ubifs-xz-decompression-support.patch
@@ -0,0 +1,92 @@
+--- a/fs/ubifs/Kconfig
++++ b/fs/ubifs/Kconfig
+@@ -5,8 +5,10 @@ config UBIFS_FS
+ 	select CRYPTO if UBIFS_FS_ADVANCED_COMPR
+ 	select CRYPTO if UBIFS_FS_LZO
+ 	select CRYPTO if UBIFS_FS_ZLIB
++	select CRYPTO if UBIFS_FS_XZ
+ 	select CRYPTO_LZO if UBIFS_FS_LZO
+ 	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
++	select CRYPTO_XZ if UBIFS_FS_XZ
+ 	depends on MTD_UBI
+ 	help
+ 	  UBIFS is a file system for flash devices which works on top of UBI.
+@@ -35,3 +37,12 @@ config UBIFS_FS_ZLIB
+ 	default y
+ 	help
+ 	  Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
++
++config UBIFS_FS_XZ
++	bool "XZ decompression support" if UBIFS_FS_ADVANCED_COMPR
++	depends on UBIFS_FS
++	default y
++	help
++	  XZ compresses better the ZLIB but it is slower..
++	  Say 'Y' if unsure.
++
+--- a/fs/ubifs/compress.c
++++ b/fs/ubifs/compress.c
+@@ -71,6 +71,24 @@ static struct ubifs_compressor zlib_comp
+ };
+ #endif
+ 
++#ifdef CONFIG_UBIFS_FS_XZ
++static DEFINE_MUTEX(xz_enc_mutex);
++static DEFINE_MUTEX(xz_dec_mutex);
++
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.comp_mutex = &xz_enc_mutex,
++	.decomp_mutex = &xz_dec_mutex,
++	.name = "xz",
++	.capi_name = "xz",
++};
++#else
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.name = "xz",
++};
++#endif
++
+ /* All UBIFS compressors */
+ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
+ 
+@@ -232,9 +250,15 @@ int __init ubifs_compressors_init(void)
+ 	if (err)
+ 		goto out_lzo;
+ 
++	err = compr_init(&xz_compr);
++	if (err)
++		goto out_zlib;
++
+ 	ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+ 	return 0;
+ 
++out_zlib:
++	compr_exit(&zlib_compr);
+ out_lzo:
+ 	compr_exit(&lzo_compr);
+ 	return err;
+@@ -247,4 +271,5 @@ void ubifs_compressors_exit(void)
+ {
+ 	compr_exit(&lzo_compr);
+ 	compr_exit(&zlib_compr);
++	compr_exit(&xz_compr);
+ }
+--- a/fs/ubifs/ubifs-media.h
++++ b/fs/ubifs/ubifs-media.h
+@@ -332,12 +332,14 @@ enum {
+  * UBIFS_COMPR_NONE: no compression
+  * UBIFS_COMPR_LZO: LZO compression
+  * UBIFS_COMPR_ZLIB: ZLIB compression
++ * UBIFS_COMPR_XZ: XZ compression
+  * UBIFS_COMPR_TYPES_CNT: count of supported compression types
+  */
+ enum {
+ 	UBIFS_COMPR_NONE,
+ 	UBIFS_COMPR_LZO,
+ 	UBIFS_COMPR_ZLIB,
++	UBIFS_COMPR_XZ,
+ 	UBIFS_COMPR_TYPES_CNT,
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch b/trunk/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
new file mode 100644
index 00000000..0235340a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
@@ -0,0 +1,65 @@
+--- a/fs/ubifs/file.c
++++ b/fs/ubifs/file.c
+@@ -1576,6 +1576,10 @@ const struct inode_operations ubifs_syml
+ 	.follow_link = ubifs_follow_link,
+ 	.setattr     = ubifs_setattr,
+ 	.getattr     = ubifs_getattr,
++	.setxattr    = ubifs_setxattr,
++	.getxattr    = ubifs_getxattr,
++	.listxattr   = ubifs_listxattr,
++	.removexattr = ubifs_removexattr,
+ };
+ 
+ const struct file_operations ubifs_file_operations = {
+--- a/fs/ubifs/journal.c
++++ b/fs/ubifs/journal.c
+@@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu",
+ 		inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino);
+-	ubifs_assert(dir_ui->data_len == 0);
++	if (!xent)
++		ubifs_assert(dir_ui->data_len == 0);
+ 	ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex));
+ 
+ 	dlen = UBIFS_DENT_NODE_SZ + nm->len + 1;
+@@ -573,6 +574,13 @@ int ubifs_jnl_update(struct ubifs_info *
+ 	aligned_dlen = ALIGN(dlen, 8);
+ 	aligned_ilen = ALIGN(ilen, 8);
+ 	len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
++	if (xent) {
++		/*
++		 * Make sure to account for dir_ui->data_len in
++		 * length calculation in case there is extended attribute.
++		 */
++		len += dir_ui->data_len;
++	}
+ 	dent = kmalloc(len, GFP_NOFS);
+ 	if (!dent)
+ 		return -ENOMEM;
+@@ -649,7 +657,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	ino_key_init(c, &ino_key, dir->i_ino);
+ 	ino_offs += aligned_ilen;
+-	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ);
++	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs,
++			    UBIFS_INO_NODE_SZ + dir_ui->data_len);
+ 	if (err)
+ 		goto out_ro;
+ 
+--- a/fs/ubifs/xattr.c
++++ b/fs/ubifs/xattr.c
+@@ -209,12 +209,12 @@ static int change_xattr(struct ubifs_inf
+ 		goto out_free;
+ 	}
+ 	inode->i_size = ui->ui_size = size;
+-	ui->data_len = size;
+ 
+ 	mutex_lock(&host_ui->ui_mutex);
+ 	host->i_ctime = ubifs_current_time(host);
+ 	host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len);
+ 	host_ui->xattr_size += CALC_XATTR_BYTES(size);
++	ui->data_len = size;
+ 
+ 	/*
+ 	 * It is important to write the host inode after the xattr inode
diff --git a/trunk/target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch b/trunk/target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch
new file mode 100644
index 00000000..1b0f3071
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/551-ubifs-fix-default-compression-selection.patch
@@ -0,0 +1,29 @@
+--- a/fs/ubifs/sb.c
++++ b/fs/ubifs/sb.c
+@@ -63,6 +63,17 @@
+ /* Default time granularity in nanoseconds */
+ #define DEFAULT_TIME_GRAN 1000000000
+ 
++static int get_default_compressor(void)
++{
++	if (ubifs_compr_present(UBIFS_COMPR_LZO))
++		return UBIFS_COMPR_LZO;
++
++	if (ubifs_compr_present(UBIFS_COMPR_ZLIB))
++		return UBIFS_COMPR_ZLIB;
++
++	return UBIFS_COMPR_NONE;
++}
++
+ /**
+  * create_default_filesystem - format empty UBI volume.
+  * @c: UBIFS file-system description object
+@@ -183,7 +194,7 @@ static int create_default_filesystem(str
+ 	if (c->mount_opts.override_compr)
+ 		sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
+ 	else
+-		sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO);
++		sup->default_compr = cpu_to_le16(get_default_compressor());
+ 
+ 	generate_random_uuid(sup->uuid);
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch b/trunk/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch
new file mode 100644
index 00000000..607efde7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch
@@ -0,0 +1,122 @@
+From 90bea5a3f0bf680b87b90516f3c231997f4b8f3b Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Mon, 2 Jun 2014 15:51:10 +0200
+X-Git-Url: http://git.infradead.org/linux-ubifs.git/commitdiff_plain/90bea5a3f0bf680b87b90516f3c231997f4b8f3b
+X-Git-Url: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=90bea5a3f0bf680b87b90516f3c231997f4b8f3b
+Subject: UBIFS: respect MS_SILENT mount flag
+
+When attempting to mount a non-ubifs formatted volume, lots of error
+messages (including a stack dump) are thrown to the kernel log even if
+the MS_SILENT mount flag is set.
+Fix this by introducing adding an additional state-variable in
+struct ubifs_info and suppress error messages in ubifs_read_node if
+MS_SILENT is set.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ fs/ubifs/io.c    | 18 ++++++++++--------
+ fs/ubifs/super.c |  5 +++++
+ fs/ubifs/ubifs.h | 11 +++++++++++
+ 3 files changed, 26 insertions(+), 8 deletions(-)
+
+---
+
+--- a/fs/ubifs/io.c
++++ b/fs/ubifs/io.c
+@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_i
+ 		return err;
+ 
+ 	if (type != ch->node_type) {
+-		ubifs_err("bad node type (%d but expected %d)",
+-			  ch->node_type, type);
++		ubifs_errc(c, "bad node type (%d but expected %d)",
++			   ch->node_type, type);
+ 		goto out;
+ 	}
+ 
+ 	err = ubifs_check_node(c, buf, lnum, offs, 0, 0);
+ 	if (err) {
+-		ubifs_err("expected node type %d", type);
++		ubifs_errc(c, "expected node type %d", type);
+ 		return err;
+ 	}
+ 
+ 	l = le32_to_cpu(ch->len);
+ 	if (l != len) {
+-		ubifs_err("bad node length %d, expected %d", l, len);
++		ubifs_errc(c, "bad node length %d, expected %d", l, len);
+ 		goto out;
+ 	}
+ 
+ 	return 0;
+ 
+ out:
+-	ubifs_err("bad node at LEB %d:%d, LEB mapping status %d", lnum, offs,
+-		  ubi_is_mapped(c->ubi, lnum));
+-	ubifs_dump_node(c, buf);
+-	dump_stack();
++	ubifs_errc(c, "bad node at LEB %d:%d, LEB mapping status %d", lnum,
++		   offs, ubi_is_mapped(c->ubi, lnum));
++	if (!c->probing) {
++		ubifs_dump_node(c, buf);
++		dump_stack();
++	}
+ 	return -EINVAL;
+ }
+ 
+--- a/fs/ubifs/super.c
++++ b/fs/ubifs/super.c
+@@ -1149,6 +1149,9 @@ static int mount_ubifs(struct ubifs_info
+ 	size_t sz;
+ 
+ 	c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
++	/* Suppress error messages while probing if MS_SILENT is set */
++	c->probing = !!(c->vfs_sb->s_flags & MS_SILENT);
++
+ 	err = init_constants_early(c);
+ 	if (err)
+ 		return err;
+@@ -1214,6 +1217,8 @@ static int mount_ubifs(struct ubifs_info
+ 	if (err)
+ 		goto out_free;
+ 
++	c->probing = 0;
++
+ 	/*
+ 	 * Make sure the compressor which is set as default in the superblock
+ 	 * or overridden by mount options is actually compiled in.
+--- a/fs/ubifs/ubifs.h
++++ b/fs/ubifs/ubifs.h
+@@ -51,6 +51,15 @@
+ #define ubifs_warn(fmt, ...)                                        \
+ 	pr_warn("UBIFS warning (pid %d): %s: " fmt "\n",            \
+ 		current->pid, __func__, ##__VA_ARGS__)
++/*
++ * A variant of 'ubifs_err()' which takes the UBIFS file-sytem description
++ * object as an argument.
++ */
++#define ubifs_errc(c, fmt, ...)                                     \
++	do {                                                        \
++		if (!(c)->probing)                                  \
++			ubifs_err(fmt, ##__VA_ARGS__);              \
++	} while (0)
+ 
+ /* UBIFS file system VFS magic number */
+ #define UBIFS_SUPER_MAGIC 0x24051905
+@@ -1208,6 +1217,7 @@ struct ubifs_debug_info;
+  * @need_recovery: %1 if the file-system needs recovery
+  * @replaying: %1 during journal replay
+  * @mounting: %1 while mounting
++ * @probing: %1 while attempting to mount if MS_SILENT mount flag is set
+  * @remounting_rw: %1 while re-mounting from R/O mode to R/W mode
+  * @replay_list: temporary list used during journal replay
+  * @replay_buds: list of buds to replay
+@@ -1439,6 +1449,7 @@ struct ubifs_info {
+ 	unsigned int replaying:1;
+ 	unsigned int mounting:1;
+ 	unsigned int remounting_rw:1;
++	unsigned int probing:1;
+ 	struct list_head replay_list;
+ 	struct list_head replay_buds;
+ 	unsigned long long cs_sqnum;
diff --git a/trunk/target/linux/generic/patches-3.14/600-netfilter_layer7_2.22.patch b/trunk/target/linux/generic/patches-3.14/600-netfilter_layer7_2.22.patch
new file mode 100644
index 00000000..6d3db38e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/600-netfilter_layer7_2.22.patch
@@ -0,0 +1,2141 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1357,6 +1357,27 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on NETFILTER_XTABLES
++	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
++       depends on NETFILTER_ADVANCED
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++        bool 'Layer 7 debugging output'
++        depends on NETFILTER_XT_MATCH_LAYER7
++        help
++          Say Y to get lots of debugging output.
++
++
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -161,6 +161,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
+--- /dev/null
++++ b/net/netfilter/xt_layer7.c
+@@ -0,0 +1,666 @@
++/*
++  Kernel module to match application layer (OSI layer 7) data in connections.
++
++  http://l7-filter.sf.net
++
++  (C) 2003-2009 Matthew Strait and Ethan Sommer.
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU General Public License
++  as published by the Free Software Foundation; either version
++  2 of the License, or (at your option) any later version.
++  http://www.gnu.org/licenses/gpl.txt
++
++  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
++  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
++  Ethan Sommer, Justin Levandoski.
++*/
++
++#include <linux/spinlock.h>
++#include <linux/version.h>
++#include <net/ip.h>
++#include <net/tcp.h>
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_acct.h>
++#endif
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_layer7.h>
++#include <linux/ctype.h>
++#include <linux/proc_fs.h>
++
++#include "regexp/regexp.c"
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
++MODULE_DESCRIPTION("iptables application layer match module");
++MODULE_ALIAS("ipt_layer7");
++MODULE_VERSION("2.21");
++
++static int maxdatalen = 2048; // this is the default
++module_param(maxdatalen, int, 0444);
++MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
++#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
++	#define DPRINTK(format,args...) printk(format,##args)
++#else
++	#define DPRINTK(format,args...)
++#endif
++
++/* Number of packets whose data we look at.
++This can be modified through /proc/net/layer7_numpackets */
++static int num_packets = 10;
++
++static struct pattern_cache {
++	char * regex_string;
++	regexp * pattern;
++	struct pattern_cache * next;
++} * first_pattern_cache = NULL;
++
++DEFINE_SPINLOCK(l7_lock);
++
++static int total_acct_packets(struct nf_conn *ct)
++{
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
++	BUG_ON(ct == NULL);
++	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
++#else
++	struct nf_conn_counter *acct;
++
++	BUG_ON(ct == NULL);
++	acct = nf_conn_acct_find(ct);
++	if (!acct)
++		return 0;
++	return (atomic64_read(&acct[IP_CT_DIR_ORIGINAL].packets) + atomic64_read(&acct[IP_CT_DIR_REPLY].packets));
++#endif
++}
++
++#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++/* Converts an unfriendly string into a friendly one by
++replacing unprintables with periods and all whitespace with " ". */
++static char * friendly_print(unsigned char * s)
++{
++	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
++	int i;
++
++	if(!f) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"friendly_print, bailing.\n");
++		return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++){
++		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
++		else if(isspace(s[i]))		f[i] = ' ';
++		else 				f[i] = '.';
++	}
++	f[i] = '\0';
++	return f;
++}
++
++static char dec2hex(int i)
++{
++	switch (i) {
++		case 0 ... 9:
++			return (i + '0');
++			break;
++		case 10 ... 15:
++			return (i - 10 + 'a');
++			break;
++		default:
++			if (net_ratelimit())
++				printk("layer7: Problem in dec2hex\n");
++			return '\0';
++	}
++}
++
++static char * hex_print(unsigned char * s)
++{
++	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
++	int i;
++
++	if(!g) {
++	       if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in hex_print, "
++					"bailing.\n");
++	       return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++) {
++		g[i*3    ] = dec2hex(s[i]/16);
++		g[i*3 + 1] = dec2hex(s[i]%16);
++		g[i*3 + 2] = ' ';
++	}
++	g[i*3] = '\0';
++
++	return g;
++}
++#endif // DEBUG
++
++/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
++over again, it make sense to cache the results. */
++static regexp * compile_and_cache(const char * regex_string, 
++                                  const char * protocol)
++{
++	struct pattern_cache * node               = first_pattern_cache;
++	struct pattern_cache * last_pattern_cache = first_pattern_cache;
++	struct pattern_cache * tmp;
++	unsigned int len;
++
++	while (node != NULL) {
++		if (!strcmp(node->regex_string, regex_string))
++		return node->pattern;
++
++		last_pattern_cache = node;/* points at the last non-NULL node */
++		node = node->next;
++	}
++
++	/* If we reach the end of the list, then we have not yet cached
++	   the pattern for this regex. Let's do that now.
++	   Be paranoid about running out of memory to avoid list corruption. */
++	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
++
++	if(!tmp) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		return NULL;
++	}
++
++	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
++	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
++	tmp->next = NULL;
++
++	if(!tmp->regex_string || !tmp->pattern) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		kfree(tmp->regex_string);
++		kfree(tmp->pattern);
++		kfree(tmp);
++		return NULL;
++	}
++
++	/* Ok.  The new node is all ready now. */
++	node = tmp;
++
++	if(first_pattern_cache == NULL) /* list is empty */
++		first_pattern_cache = node; /* make node the beginning */
++	else
++		last_pattern_cache->next = node; /* attach node to the end */
++
++	/* copy the string and compile the regex */
++	len = strlen(regex_string);
++	DPRINTK("About to compile this: \"%s\"\n", regex_string);
++	node->pattern = regcomp((char *)regex_string, &len);
++	if ( !node->pattern ) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: Error compiling regexp "
++					"\"%s\" (%s)\n", 
++					regex_string, protocol);
++		/* pattern is now cached as NULL, so we won't try again. */
++	}
++
++	strcpy(node->regex_string, regex_string);
++	return node->pattern;
++}
++
++static int can_handle(const struct sk_buff *skb)
++{
++	if(!ip_hdr(skb)) /* not IP */
++		return 0;
++	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
++	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
++	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
++		return 0;
++	return 1;
++}
++
++/* Returns offset the into the skb->data that the application data starts */
++static int app_data_offset(const struct sk_buff *skb)
++{
++	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
++	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
++	int ip_hl = 4*ip_hdr(skb)->ihl;
++
++	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
++		/* 12 == offset into TCP header for the header length field.
++		Can't get this with skb->h.th->doff because the tcphdr
++		struct doesn't get set when routing (this is confirmed to be
++		true in Netfilter as well as QoS.) */
++		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
++
++		return ip_hl + tcp_hl;
++	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
++		return ip_hl + 8; /* UDP header is always 8 bytes */
++	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
++		return ip_hl + 8; /* ICMP header is 8 bytes */
++	} else {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: tried to handle unknown "
++					"protocol!\n");
++		return ip_hl + 8; /* something reasonable */
++	}
++}
++
++/* handles whether there's a match when we aren't appending data anymore */
++static int match_no_append(struct nf_conn * conntrack, 
++                           struct nf_conn * master_conntrack, 
++                           enum ip_conntrack_info ctinfo,
++                           enum ip_conntrack_info master_ctinfo,
++                           const struct xt_layer7_info * info)
++{
++	/* If we're in here, throw the app data away */
++	if(master_conntrack->layer7.app_data != NULL) {
++
++	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++		if(!master_conntrack->layer7.app_proto) {
++			char * f = 
++			  friendly_print(master_conntrack->layer7.app_data);
++			char * g = 
++			  hex_print(master_conntrack->layer7.app_data);
++			DPRINTK("\nl7-filter gave up after %d bytes "
++				"(%d packets):\n%s\n",
++				strlen(f), total_acct_packets(master_conntrack), f);
++			kfree(f);
++			DPRINTK("In hex: %s\n", g);
++			kfree(g);
++		}
++	#endif
++
++		kfree(master_conntrack->layer7.app_data);
++		master_conntrack->layer7.app_data = NULL; /* don't free again */
++	}
++
++	if(master_conntrack->layer7.app_proto){
++		/* Here child connections set their .app_proto (for /proc) */
++		if(!conntrack->layer7.app_proto) {
++			conntrack->layer7.app_proto = 
++			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
++			    GFP_ATOMIC);
++			if(!conntrack->layer7.app_proto){
++				if (net_ratelimit())
++					printk(KERN_ERR "layer7: out of memory "
++							"in match_no_append, "
++							"bailing.\n");
++				return 1;
++			}
++			strcpy(conntrack->layer7.app_proto, 
++				master_conntrack->layer7.app_proto);
++		}
++
++		return (!strcmp(master_conntrack->layer7.app_proto, 
++				info->protocol));
++	}
++	else {
++		/* If not classified, set to "unknown" to distinguish from
++		connections that are still being tested. */
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match_no_append, bailing.\n");
++			return 1;
++		}
++		strcpy(master_conntrack->layer7.app_proto, "unknown");
++		return 0;
++	}
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length = 0, i;
++	int oldlength = master_conntrack->layer7.app_data_len;
++
++	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
++	   clear on whether the race condition exists or whether this really 
++	   fixes it.  I might just be being dense... Anyway, if it's not really 
++	   a fix, all it does is waste a very small amount of time. */
++	if(!master_conntrack->layer7.app_data) return 0;
++
++	/* Strip nulls. Make everything lower case (our regex lib doesn't
++	do case insensitivity).  Add it to the end of the current data. */
++	for(i = 0; i < maxdatalen-oldlength-1 &&
++		   i < appdatalen; i++) {
++		if(app_data[i] != '\0') {
++			/* the kernel version of tolower mungs 'upper ascii' */
++			master_conntrack->layer7.app_data[length+oldlength] =
++				isascii(app_data[i])? 
++					tolower(app_data[i]) : app_data[i];
++			length++;
++		}
++	}
++
++	master_conntrack->layer7.app_data[length+oldlength] = '\0';
++	master_conntrack->layer7.app_data_len = length + oldlength;
++
++	return length;
++}
++
++/* taken from drivers/video/modedb.c */
++static int my_atoi(const char *s)
++{
++	int val = 0;
++
++	for (;; s++) {
++		switch (*s) {
++			case '0'...'9':
++			val = 10*val+(*s-'0');
++			break;
++		default:
++			return val;
++		}
++	}
++}
++
++/* write out num_packets to userland. */
++static int layer7_read_proc(char* page, char ** start, off_t off, int count,
++                            int* eof, void * data)
++{
++	if(num_packets > 99 && net_ratelimit())
++		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
++
++	page[0] = num_packets/10 + '0';
++	page[1] = num_packets%10 + '0';
++	page[2] = '\n';
++	page[3] = '\0';
++
++	*eof=1;
++
++	return 3;
++}
++
++/* Read in num_packets from userland */
++static int layer7_write_proc(struct file* file, const char* buffer,
++                             unsigned long count, void *data)
++{
++	char * foo = kmalloc(count, GFP_ATOMIC);
++
++	if(!foo){
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory, bailing. "
++					"num_packets unchanged.\n");
++		return count;
++	}
++
++	if(copy_from_user(foo, buffer, count)) {
++		return -EFAULT;
++	}
++
++
++	num_packets = my_atoi(foo);
++	kfree (foo);
++
++	/* This has an arbitrary limit to make the math easier. I'm lazy.
++	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
++	if(num_packets > 99) {
++		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
++		num_packets = 99;
++	} else if(num_packets < 1) {
++		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
++		num_packets = 1;
++	}
++
++	return count;
++}
++
++static bool
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++match(const struct sk_buff *skbin, const struct xt_match_param *par)
++#else
++match(const struct sk_buff *skbin,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      bool *hotdrop)
++#endif
++{
++	/* sidestep const without getting a compiler warning... */
++	struct sk_buff * skb = (struct sk_buff *)skbin; 
++
++	const struct xt_layer7_info * info = 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++		par->matchinfo;
++	#else
++		matchinfo;
++	#endif
++
++	enum ip_conntrack_info master_ctinfo, ctinfo;
++	struct nf_conn *master_conntrack, *conntrack;
++	unsigned char * app_data;
++	unsigned int pattern_result, appdatalen;
++	regexp * comppattern;
++
++	/* Be paranoid/incompetent - lock the entire match function. */
++	spin_lock_bh(&l7_lock);
++
++	if(!can_handle(skb)){
++		DPRINTK("layer7: This is some protocol I can't handle.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Treat parent & all its children together as one connection, except
++	for the purpose of setting conntrack->layer7.app_proto in the actual
++	connection. This makes /proc/net/ip_conntrack more satisfying. */
++	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
++	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
++		DPRINTK("layer7: couldn't get conntrack.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
++	while (master_ct(master_conntrack) != NULL)
++		master_conntrack = master_ct(master_conntrack);
++
++	/* if we've classified it or seen too many packets */
++	if(total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto) {
++
++		pattern_result = match_no_append(conntrack, master_conntrack, 
++						 ctinfo, master_ctinfo, info);
++
++		/* skb->cb[0] == seen. Don't do things twice if there are 
++		multiple l7 rules. I'm not sure that using cb for this purpose 
++		is correct, even though it says "put your private variables 
++		there". But it doesn't look like it is being used for anything
++		else in the skbs that make it here. */
++		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
++
++		spin_unlock_bh(&l7_lock);
++		return (pattern_result ^ info->invert);
++	}
++
++	if(skb_is_nonlinear(skb)){
++		if(skb_linearize(skb) != 0){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: failed to linearize "
++						"packet, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* now that the skb is linearized, it's safe to set these. */
++	app_data = skb->data + app_data_offset(skb);
++	appdatalen = skb_tail_pointer(skb) - app_data;
++
++	/* the return value gets checked later, when we're ready to use it */
++	comppattern = compile_and_cache(info->pattern, info->protocol);
++
++	/* On the first packet of a connection, allocate space for app data */
++	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
++	   !master_conntrack->layer7.app_data){
++		master_conntrack->layer7.app_data = 
++			kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++
++		master_conntrack->layer7.app_data[0] = '\0';
++	}
++
++	/* Can be here, but unallocated, if numpackets is increased near
++	the beginning of a connection */
++	if(master_conntrack->layer7.app_data == NULL){
++		spin_unlock_bh(&l7_lock);
++		return info->invert; /* unmatched */
++	}
++
++	if(!skb->cb[0]){
++		int newbytes;
++		newbytes = add_data(master_conntrack, app_data, appdatalen);
++
++		if(newbytes == 0) { /* didn't add any data */
++			skb->cb[0] = 1;
++			/* Didn't match before, not going to match now */
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* If looking for "unknown", then never match.  "Unknown" means that
++	we've given up; we're still trying with these packets. */
++	if(!strcmp(info->protocol, "unknown")) {
++		pattern_result = 0;
++	/* If looking for "unset", then always match. "Unset" means that we
++	haven't yet classified the connection. */
++	} else if(!strcmp(info->protocol, "unset")) {
++		pattern_result = 2;
++		DPRINTK("layer7: matched unset: not yet classified "
++			"(%d/%d packets)\n",
++                        total_acct_packets(master_conntrack), num_packets);
++	/* If the regexp failed to compile, don't bother running it */
++	} else if(comppattern && 
++		  regexec(comppattern, master_conntrack->layer7.app_data)){
++		DPRINTK("layer7: matched %s\n", info->protocol);
++		pattern_result = 1;
++	} else pattern_result = 0;
++
++	if(pattern_result == 1) {
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return (pattern_result ^ info->invert);
++		}
++		strcpy(master_conntrack->layer7.app_proto, info->protocol);
++	} else if(pattern_result > 1) { /* cleanup from "unset" */
++		pattern_result = 1;
++	}
++
++	/* mark the packet seen */
++	skb->cb[0] = 1;
++
++	spin_unlock_bh(&l7_lock);
++	return (pattern_result ^ info->invert);
++}
++
++// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++static bool check(const struct xt_mtchk_param *par)
++{
++        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", par->match->family);
++#else
++static bool check(const char *tablename, const void *inf,
++		 const struct xt_match *match, void *matchinfo,
++		 unsigned int hook_mask)
++{
++        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", match->family);
++#endif
++                return 0;
++        }
++	return 1;
++}
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++	static void destroy(const struct xt_mtdtor_param *par)
++	{
++		nf_ct_l3proto_module_put(par->match->family);
++	}
++#else
++	static void destroy(const struct xt_match *match, void *matchinfo)
++	{
++		nf_ct_l3proto_module_put(match->family);
++	}
++#endif
++
++static struct xt_match xt_layer7_match[] __read_mostly = {
++{
++	.name		= "layer7",
++	.family		= AF_INET,
++	.checkentry	= check,
++	.match		= match,
++	.destroy	= destroy,
++	.matchsize	= sizeof(struct xt_layer7_info),
++	.me		= THIS_MODULE
++}
++};
++
++static void layer7_cleanup_proc(void)
++{
++	remove_proc_entry("layer7_numpackets", init_net.proc_net);
++}
++
++/* register the proc file */
++static void layer7_init_proc(void)
++{
++	struct proc_dir_entry* entry;
++	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
++	entry->read_proc = layer7_read_proc;
++	entry->write_proc = layer7_write_proc;
++}
++
++static int __init xt_layer7_init(void)
++{
++	need_conntrack();
++
++	layer7_init_proc();
++	if(maxdatalen < 1) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
++			"using 1\n");
++		maxdatalen = 1;
++	}
++	/* This is not a hard limit.  It's just here to prevent people from
++	bringing their slow machines to a grinding halt. */
++	else if(maxdatalen > 65536) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
++			"using 65536\n");
++		maxdatalen = 65536;
++	}
++	return xt_register_matches(xt_layer7_match,
++				   ARRAY_SIZE(xt_layer7_match));
++}
++
++static void __exit xt_layer7_fini(void)
++{
++	layer7_cleanup_proc();
++	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
++}
++
++module_init(xt_layer7_init);
++module_exit(xt_layer7_fini);
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.c
+@@ -0,0 +1,1197 @@
++/*
++ * regcomp and regexec -- regsub and regerror are elsewhere
++ * @(#)regexp.c	1.3 of 18 April 87
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ * Beware that some of this code is subtly aware of the way operator
++ * precedence is structured in regular expressions.  Serious changes in
++ * regular-expression syntax might require a total rethink.
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ * Modified slightly by Matthew Strait to use more modern C.
++ */
++
++#include "regexp.h"
++#include "regmagic.h"
++
++/* added by ethan and matt.  Lets it work in both kernel and user space.
++(So iptables can use it, for instance.)  Yea, it goes both ways... */
++#if __KERNEL__
++  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
++#else
++  #define printk(format,args...) printf(format,##args)
++#endif
++
++void regerror(char * s)
++{
++        printk("<3>Regexp: %s\n", s);
++        /* NOTREACHED */
++}
++
++/*
++ * The "internal use only" fields in regexp.h are present to pass info from
++ * compile to execute that permits the execute phase to run lots faster on
++ * simple cases.  They are:
++ *
++ * regstart	char that must begin a match; '\0' if none obvious
++ * reganch	is the match anchored (at beginning-of-line only)?
++ * regmust	string (pointer into program) that match must include, or NULL
++ * regmlen	length of regmust string
++ *
++ * Regstart and reganch permit very fast decisions on suitable starting points
++ * for a match, cutting down the work a lot.  Regmust permits fast rejection
++ * of lines that cannot possibly match.  The regmust tests are costly enough
++ * that regcomp() supplies a regmust only if the r.e. contains something
++ * potentially expensive (at present, the only such thing detected is * or +
++ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
++ * supplied because the test in regexec() needs it and regcomp() is computing
++ * it anyway.
++ */
++
++/*
++ * Structure for regexp "program".  This is essentially a linear encoding
++ * of a nondeterministic finite-state machine (aka syntax charts or
++ * "railroad normal form" in parsing technology).  Each node is an opcode
++ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
++ * all nodes except BRANCH implement concatenation; a "next" pointer with
++ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
++ * have one of the subtle syntax dependencies:  an individual BRANCH (as
++ * opposed to a collection of them) is never concatenated with anything
++ * because of operator precedence.)  The operand of some types of node is
++ * a literal string; for others, it is a node leading into a sub-FSM.  In
++ * particular, the operand of a BRANCH node is the first node of the branch.
++ * (NB this is *not* a tree structure:  the tail of the branch connects
++ * to the thing following the set of BRANCHes.)  The opcodes are:
++ */
++
++/* definition	number	opnd?	meaning */
++#define	END	0	/* no	End of program. */
++#define	BOL	1	/* no	Match "" at beginning of line. */
++#define	EOL	2	/* no	Match "" at end of line. */
++#define	ANY	3	/* no	Match any one character. */
++#define	ANYOF	4	/* str	Match any character in this string. */
++#define	ANYBUT	5	/* str	Match any character not in this string. */
++#define	BRANCH	6	/* node	Match this alternative, or the next... */
++#define	BACK	7	/* no	Match "", "next" ptr points backward. */
++#define	EXACTLY	8	/* str	Match this string. */
++#define	NOTHING	9	/* no	Match empty string. */
++#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
++#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
++#define	OPEN	20	/* no	Mark this point in input as start of #n. */
++			/*	OPEN+1 is number 1, etc. */
++#define	CLOSE	30	/* no	Analogous to OPEN. */
++
++/*
++ * Opcode notes:
++ *
++ * BRANCH	The set of branches constituting a single choice are hooked
++ *		together with their "next" pointers, since precedence prevents
++ *		anything being concatenated to any individual branch.  The
++ *		"next" pointer of the last BRANCH in a choice points to the
++ *		thing following the whole choice.  This is also where the
++ *		final "next" pointer of each individual branch points; each
++ *		branch starts with the operand node of a BRANCH node.
++ *
++ * BACK		Normal "next" pointers all implicitly point forward; BACK
++ *		exists to make loop structures possible.
++ *
++ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
++ *		BRANCH structures using BACK.  Simple cases (one character
++ *		per match) are implemented with STAR and PLUS for speed
++ *		and to minimize recursive plunges.
++ *
++ * OPEN,CLOSE	...are numbered at compile time.
++ */
++
++/*
++ * A node is one char of opcode followed by two chars of "next" pointer.
++ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
++ * value is a positive offset from the opcode of the node containing it.
++ * An operand, if any, simply follows the node.  (Note that much of the
++ * code generation knows about this implicit relationship.)
++ *
++ * Using two bytes for the "next" pointer is vast overkill for most things,
++ * but allows patterns to get big without disasters.
++ */
++#define	OP(p)	(*(p))
++#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
++#define	OPERAND(p)	((p) + 3)
++
++/*
++ * See regmagic.h for one further detail of program structure.
++ */
++
++
++/*
++ * Utility definitions.
++ */
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#define	FAIL(m)	{ regerror(m); return(NULL); }
++#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
++#define	META	"^$.[()|?+*\\"
++
++/*
++ * Flags to be passed up and down.
++ */
++#define	HASWIDTH	01	/* Known never to match null string. */
++#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
++#define	SPSTART		04	/* Starts with * or +. */
++#define	WORST		0	/* Worst case. */
++
++/*
++ * Global work variables for regcomp().
++ */
++struct match_globals {
++char *reginput;		/* String-input pointer. */
++char *regbol;		/* Beginning of input, for ^ check. */
++char **regstartp;	/* Pointer to startp array. */
++char **regendp;		/* Ditto for endp. */
++char *regparse;		/* Input-scan pointer. */
++int regnpar;		/* () count. */
++char regdummy;
++char *regcode;		/* Code-emit pointer; &regdummy = don't. */
++long regsize;		/* Code size. */
++};
++
++/*
++ * Forward declarations for regcomp()'s friends.
++ */
++#ifndef STATIC
++#define	STATIC	static
++#endif
++STATIC char *reg(struct match_globals *g, int paren,int *flagp);
++STATIC char *regbranch(struct match_globals *g, int *flagp);
++STATIC char *regpiece(struct match_globals *g, int *flagp);
++STATIC char *regatom(struct match_globals *g, int *flagp);
++STATIC char *regnode(struct match_globals *g, char op);
++STATIC char *regnext(struct match_globals *g, char *p);
++STATIC void regc(struct match_globals *g, char b);
++STATIC void reginsert(struct match_globals *g, char op, char *opnd);
++STATIC void regtail(struct match_globals *g, char *p, char *val);
++STATIC void regoptail(struct match_globals *g, char *p, char *val);
++
++
++__kernel_size_t my_strcspn(const char *s1,const char *s2)
++{
++        char *scan1;
++        char *scan2;
++        int count;
++
++        count = 0;
++        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
++                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
++                        if (*scan1 == *scan2++)
++                                return(count);
++                count++;
++        }
++        return(count);
++}
++
++/*
++ - regcomp - compile a regular expression into internal code
++ *
++ * We can't allocate space until we know how big the compiled form will be,
++ * but we can't compile it (and thus know how big it is) until we've got a
++ * place to put the code.  So we cheat:  we compile it twice, once with code
++ * generation turned off and size counting turned on, and once "for real".
++ * This also means that we don't allocate space until we are sure that the
++ * thing really will compile successfully, and we never have to move the
++ * code and thus invalidate pointers into it.  (Note that it has to be in
++ * one piece because free() must be able to free it all.)
++ *
++ * Beware that the optimization-preparation code in here knows about some
++ * of the structure of the compiled regexp.
++ */
++regexp *
++regcomp(char *exp,int *patternsize)
++{
++	register regexp *r;
++	register char *scan;
++	register char *longest;
++	register int len;
++	int flags;
++	struct match_globals g;
++	
++	/* commented out by ethan
++	   extern char *malloc();
++	*/
++
++	if (exp == NULL)
++		FAIL("NULL argument");
++
++	/* First pass: determine size, legality. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regsize = 0L;
++	g.regcode = &g.regdummy;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Small enough for pointer-storage convention? */
++	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
++		FAIL("regexp too big");
++
++	/* Allocate space. */
++	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
++	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
++	if (r == NULL)
++		FAIL("out of space");
++
++	/* Second pass: emit code. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regcode = r->program;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Dig out information for optimizations. */
++	r->regstart = '\0';	/* Worst-case defaults. */
++	r->reganch = 0;
++	r->regmust = NULL;
++	r->regmlen = 0;
++	scan = r->program+1;			/* First BRANCH. */
++	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
++		scan = OPERAND(scan);
++
++		/* Starting-point info. */
++		if (OP(scan) == EXACTLY)
++			r->regstart = *OPERAND(scan);
++		else if (OP(scan) == BOL)
++			r->reganch++;
++
++		/*
++		 * If there's something expensive in the r.e., find the
++		 * longest literal string that must appear and make it the
++		 * regmust.  Resolve ties in favor of later strings, since
++		 * the regstart check works with the beginning of the r.e.
++		 * and avoiding duplication strengthens checking.  Not a
++		 * strong reason, but sufficient in the absence of others.
++		 */
++		if (flags&SPSTART) {
++			longest = NULL;
++			len = 0;
++			for (; scan != NULL; scan = regnext(&g, scan))
++				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
++					longest = OPERAND(scan);
++					len = strlen(OPERAND(scan));
++				}
++			r->regmust = longest;
++			r->regmlen = len;
++		}
++	}
++
++	return(r);
++}
++
++/*
++ - reg - regular expression, i.e. main body or parenthesized thing
++ *
++ * Caller must absorb opening parenthesis.
++ *
++ * Combining parenthesis handling with the base level of regular expression
++ * is a trifle forced, but the need to tie the tails of the branches to what
++ * follows makes it hard to avoid.
++ */
++static char *
++reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
++{
++	register char *ret;
++	register char *br;
++	register char *ender;
++	register int parno = 0; /* 0 makes gcc happy */
++	int flags;
++
++	*flagp = HASWIDTH;	/* Tentatively. */
++
++	/* Make an OPEN node, if parenthesized. */
++	if (paren) {
++		if (g->regnpar >= NSUBEXP)
++			FAIL("too many ()");
++		parno = g->regnpar;
++		g->regnpar++;
++		ret = regnode(g, OPEN+parno);
++	} else
++		ret = NULL;
++
++	/* Pick up the branches, linking them together. */
++	br = regbranch(g, &flags);
++	if (br == NULL)
++		return(NULL);
++	if (ret != NULL)
++		regtail(g, ret, br);	/* OPEN -> first. */
++	else
++		ret = br;
++	if (!(flags&HASWIDTH))
++		*flagp &= ~HASWIDTH;
++	*flagp |= flags&SPSTART;
++	while (*g->regparse == '|') {
++		g->regparse++;
++		br = regbranch(g, &flags);
++		if (br == NULL)
++			return(NULL);
++		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
++		if (!(flags&HASWIDTH))
++			*flagp &= ~HASWIDTH;
++		*flagp |= flags&SPSTART;
++	}
++
++	/* Make a closing node, and hook it on the end. */
++	ender = regnode(g, (paren) ? CLOSE+parno : END);	
++	regtail(g, ret, ender);
++
++	/* Hook the tails of the branches to the closing node. */
++	for (br = ret; br != NULL; br = regnext(g, br))
++		regoptail(g, br, ender);
++
++	/* Check for proper termination. */
++	if (paren && *g->regparse++ != ')') {
++		FAIL("unmatched ()");
++	} else if (!paren && *g->regparse != '\0') {
++		if (*g->regparse == ')') {
++			FAIL("unmatched ()");
++		} else
++			FAIL("junk on end");	/* "Can't happen". */
++		/* NOTREACHED */
++	}
++
++	return(ret);
++}
++
++/*
++ - regbranch - one alternative of an | operator
++ *
++ * Implements the concatenation operator.
++ */
++static char *
++regbranch(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char *chain;
++	register char *latest;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	ret = regnode(g, BRANCH);
++	chain = NULL;
++	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
++		latest = regpiece(g, &flags);
++		if (latest == NULL)
++			return(NULL);
++		*flagp |= flags&HASWIDTH;
++		if (chain == NULL)	/* First piece. */
++			*flagp |= flags&SPSTART;
++		else
++			regtail(g, chain, latest);
++		chain = latest;
++	}
++	if (chain == NULL)	/* Loop ran zero times. */
++		(void) regnode(g, NOTHING);
++
++	return(ret);
++}
++
++/*
++ - regpiece - something followed by possible [*+?]
++ *
++ * Note that the branching code sequences used for ? and the general cases
++ * of * and + are somewhat optimized:  they use the same NOTHING node as
++ * both the endmarker for their branch list and the body of the last branch.
++ * It might seem that this node could be dispensed with entirely, but the
++ * endmarker role is not redundant.
++ */
++static char *
++regpiece(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char op;
++	register char *next;
++	int flags;
++
++	ret = regatom(g, &flags);
++	if (ret == NULL)
++		return(NULL);
++
++	op = *g->regparse;
++	if (!ISMULT(op)) {
++		*flagp = flags;
++		return(ret);
++	}
++
++	if (!(flags&HASWIDTH) && op != '?')
++		FAIL("*+ operand could be empty");
++	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
++
++	if (op == '*' && (flags&SIMPLE))
++		reginsert(g, STAR, ret);
++	else if (op == '*') {
++		/* Emit x* as (x&|), where & means "self". */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regoptail(g, ret, regnode(g, BACK));		/* and loop */
++		regoptail(g, ret, ret);			/* back */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '+' && (flags&SIMPLE))
++		reginsert(g, PLUS, ret);
++	else if (op == '+') {
++		/* Emit x+ as x(&|), where & means "self". */
++		next = regnode(g, BRANCH);			/* Either */
++		regtail(g, ret, next);
++		regtail(g, regnode(g, BACK), ret);		/* loop back */
++		regtail(g, next, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '?') {
++		/* Emit x? as (x|) */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		next = regnode(g, NOTHING);		/* null. */
++		regtail(g, ret, next);
++		regoptail(g, ret, next);
++	}
++	g->regparse++;
++	if (ISMULT(*g->regparse))
++		FAIL("nested *?+");
++
++	return(ret);
++}
++
++/*
++ - regatom - the lowest level
++ *
++ * Optimization:  gobbles an entire sequence of ordinary characters so that
++ * it can turn them into a single node, which is smaller to store and
++ * faster to run.  Backslashed characters are exceptions, each becoming a
++ * separate node; the code is simpler that way and it's not worth fixing.
++ */
++static char *
++regatom(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	switch (*g->regparse++) {
++	case '^':
++		ret = regnode(g, BOL);
++		break;
++	case '$':
++		ret = regnode(g, EOL);
++		break;
++	case '.':
++		ret = regnode(g, ANY);
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	case '[': {
++			register int class;
++			register int classend;
++
++			if (*g->regparse == '^') {	/* Complement of range. */
++				ret = regnode(g, ANYBUT);
++				g->regparse++;
++			} else
++				ret = regnode(g, ANYOF);
++			if (*g->regparse == ']' || *g->regparse == '-')
++				regc(g, *g->regparse++);
++			while (*g->regparse != '\0' && *g->regparse != ']') {
++				if (*g->regparse == '-') {
++					g->regparse++;
++					if (*g->regparse == ']' || *g->regparse == '\0')
++						regc(g, '-');
++					else {
++						class = UCHARAT(g->regparse-2)+1;
++						classend = UCHARAT(g->regparse);
++						if (class > classend+1)
++							FAIL("invalid [] range");
++						for (; class <= classend; class++)
++							regc(g, class);
++						g->regparse++;
++					}
++				} else
++					regc(g, *g->regparse++);
++			}
++			regc(g, '\0');
++			if (*g->regparse != ']')
++				FAIL("unmatched []");
++			g->regparse++;
++			*flagp |= HASWIDTH|SIMPLE;
++		}
++		break;
++	case '(':
++		ret = reg(g, 1, &flags);
++		if (ret == NULL)
++			return(NULL);
++		*flagp |= flags&(HASWIDTH|SPSTART);
++		break;
++	case '\0':
++	case '|':
++	case ')':
++		FAIL("internal urp");	/* Supposed to be caught earlier. */
++		break;
++	case '?':
++	case '+':
++	case '*':
++		FAIL("?+* follows nothing");
++		break;
++	case '\\':
++		if (*g->regparse == '\0')
++			FAIL("trailing \\");
++		ret = regnode(g, EXACTLY);
++		regc(g, *g->regparse++);
++		regc(g, '\0');
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	default: {
++			register int len;
++			register char ender;
++
++			g->regparse--;
++			len = my_strcspn((const char *)g->regparse, (const char *)META);
++			if (len <= 0)
++				FAIL("internal disaster");
++			ender = *(g->regparse+len);
++			if (len > 1 && ISMULT(ender))
++				len--;		/* Back off clear of ?+* operand. */
++			*flagp |= HASWIDTH;
++			if (len == 1)
++				*flagp |= SIMPLE;
++			ret = regnode(g, EXACTLY);
++			while (len > 0) {
++				regc(g, *g->regparse++);
++				len--;
++			}
++			regc(g, '\0');
++		}
++		break;
++	}
++
++	return(ret);
++}
++
++/*
++ - regnode - emit a node
++ */
++static char *			/* Location. */
++regnode(struct match_globals *g, char op)
++{
++	register char *ret;
++	register char *ptr;
++
++	ret = g->regcode;
++	if (ret == &g->regdummy) {
++		g->regsize += 3;
++		return(ret);
++	}
++
++	ptr = ret;
++	*ptr++ = op;
++	*ptr++ = '\0';		/* Null "next" pointer. */
++	*ptr++ = '\0';
++	g->regcode = ptr;
++
++	return(ret);
++}
++
++/*
++ - regc - emit (if appropriate) a byte of code
++ */
++static void
++regc(struct match_globals *g, char b)
++{
++	if (g->regcode != &g->regdummy)
++		*g->regcode++ = b;
++	else
++		g->regsize++;
++}
++
++/*
++ - reginsert - insert an operator in front of already-emitted operand
++ *
++ * Means relocating the operand.
++ */
++static void
++reginsert(struct match_globals *g, char op, char* opnd)
++{
++	register char *src;
++	register char *dst;
++	register char *place;
++
++	if (g->regcode == &g->regdummy) {
++		g->regsize += 3;
++		return;
++	}
++
++	src = g->regcode;
++	g->regcode += 3;
++	dst = g->regcode;
++	while (src > opnd)
++		*--dst = *--src;
++
++	place = opnd;		/* Op node, where operand used to be. */
++	*place++ = op;
++	*place++ = '\0';
++	*place++ = '\0';
++}
++
++/*
++ - regtail - set the next-pointer at the end of a node chain
++ */
++static void
++regtail(struct match_globals *g, char *p, char *val)
++{
++	register char *scan;
++	register char *temp;
++	register int offset;
++
++	if (p == &g->regdummy)
++		return;
++
++	/* Find last node. */
++	scan = p;
++	for (;;) {
++		temp = regnext(g, scan);
++		if (temp == NULL)
++			break;
++		scan = temp;
++	}
++
++	if (OP(scan) == BACK)
++		offset = scan - val;
++	else
++		offset = val - scan;
++	*(scan+1) = (offset>>8)&0377;
++	*(scan+2) = offset&0377;
++}
++
++/*
++ - regoptail - regtail on operand of first argument; nop if operandless
++ */
++static void
++regoptail(struct match_globals *g, char *p, char *val)
++{
++	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
++	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
++		return;
++	regtail(g, OPERAND(p), val);
++}
++
++/*
++ * regexec and friends
++ */
++
++
++/*
++ * Forwards.
++ */
++STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
++STATIC int regmatch(struct match_globals *g, char *prog);
++STATIC int regrepeat(struct match_globals *g, char *p);
++
++#ifdef DEBUG
++int regnarrate = 0;
++void regdump();
++STATIC char *regprop(char *op);
++#endif
++
++/*
++ - regexec - match a regexp against a string
++ */
++int
++regexec(regexp *prog, char *string)
++{
++	register char *s;
++	struct match_globals g;
++
++	/* Be paranoid... */
++	if (prog == NULL || string == NULL) {
++		printk("<3>Regexp: NULL parameter\n");
++		return(0);
++	}
++
++	/* Check validity of program. */
++	if (UCHARAT(prog->program) != MAGIC) {
++		printk("<3>Regexp: corrupted program\n");
++		return(0);
++	}
++
++	/* If there is a "must appear" string, look for it. */
++	if (prog->regmust != NULL) {
++		s = string;
++		while ((s = strchr(s, prog->regmust[0])) != NULL) {
++			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
++				break;	/* Found it. */
++			s++;
++		}
++		if (s == NULL)	/* Not present. */
++			return(0);
++	}
++
++	/* Mark beginning of line for ^ . */
++	g.regbol = string;
++
++	/* Simplest case:  anchored match need be tried only once. */
++	if (prog->reganch)
++		return(regtry(&g, prog, string));
++
++	/* Messy cases:  unanchored match. */
++	s = string;
++	if (prog->regstart != '\0')
++		/* We know what char it must start with. */
++		while ((s = strchr(s, prog->regstart)) != NULL) {
++			if (regtry(&g, prog, s))
++				return(1);
++			s++;
++		}
++	else
++		/* We don't -- general case. */
++		do {
++			if (regtry(&g, prog, s))
++				return(1);
++		} while (*s++ != '\0');
++
++	/* Failure. */
++	return(0);
++}
++
++/*
++ - regtry - try match at specific point
++ */
++static int			/* 0 failure, 1 success */
++regtry(struct match_globals *g, regexp *prog, char *string)
++{
++	register int i;
++	register char **sp;
++	register char **ep;
++
++	g->reginput = string;
++	g->regstartp = prog->startp;
++	g->regendp = prog->endp;
++
++	sp = prog->startp;
++	ep = prog->endp;
++	for (i = NSUBEXP; i > 0; i--) {
++		*sp++ = NULL;
++		*ep++ = NULL;
++	}
++	if (regmatch(g, prog->program + 1)) {
++		prog->startp[0] = string;
++		prog->endp[0] = g->reginput;
++		return(1);
++	} else
++		return(0);
++}
++
++/*
++ - regmatch - main matching routine
++ *
++ * Conceptually the strategy is simple:  check to see whether the current
++ * node matches, call self recursively to see whether the rest matches,
++ * and then act accordingly.  In practice we make some effort to avoid
++ * recursion, in particular by going through "ordinary" nodes (that don't
++ * need to know whether the rest of the match failed) by a loop instead of
++ * by recursion.
++ */
++static int			/* 0 failure, 1 success */
++regmatch(struct match_globals *g, char *prog)
++{
++	register char *scan = prog; /* Current node. */
++	char *next;		    /* Next node. */
++
++#ifdef DEBUG
++	if (scan != NULL && regnarrate)
++		fprintf(stderr, "%s(\n", regprop(scan));
++#endif
++	while (scan != NULL) {
++#ifdef DEBUG
++		if (regnarrate)
++			fprintf(stderr, "%s...\n", regprop(scan));
++#endif
++		next = regnext(g, scan);
++
++		switch (OP(scan)) {
++		case BOL:
++			if (g->reginput != g->regbol)
++				return(0);
++			break;
++		case EOL:
++			if (*g->reginput != '\0')
++				return(0);
++			break;
++		case ANY:
++			if (*g->reginput == '\0')
++				return(0);
++			g->reginput++;
++			break;
++		case EXACTLY: {
++				register int len;
++				register char *opnd;
++
++				opnd = OPERAND(scan);
++				/* Inline the first character, for speed. */
++				if (*opnd != *g->reginput)
++					return(0);
++				len = strlen(opnd);
++				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
++					return(0);
++				g->reginput += len;
++			}
++			break;
++		case ANYOF:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case ANYBUT:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case NOTHING:
++		case BACK:
++			break;
++		case OPEN+1:
++		case OPEN+2:
++		case OPEN+3:
++		case OPEN+4:
++		case OPEN+5:
++		case OPEN+6:
++		case OPEN+7:
++		case OPEN+8:
++		case OPEN+9: {
++				register int no;
++				register char *save;
++
++				no = OP(scan) - OPEN;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set startp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regstartp[no] == NULL)
++						g->regstartp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case CLOSE+1:
++		case CLOSE+2:
++		case CLOSE+3:
++		case CLOSE+4:
++		case CLOSE+5:
++		case CLOSE+6:
++		case CLOSE+7:
++		case CLOSE+8:
++		case CLOSE+9:
++			{
++				register int no;
++				register char *save;
++
++				no = OP(scan) - CLOSE;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set endp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regendp[no] == NULL)
++						g->regendp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case BRANCH: {
++				register char *save;
++
++				if (OP(next) != BRANCH)		/* No choice. */
++					next = OPERAND(scan);	/* Avoid recursion. */
++				else {
++					do {
++						save = g->reginput;
++						if (regmatch(g, OPERAND(scan)))
++							return(1);
++						g->reginput = save;
++						scan = regnext(g, scan);
++					} while (scan != NULL && OP(scan) == BRANCH);
++					return(0);
++					/* NOTREACHED */
++				}
++			}
++			break;
++		case STAR:
++		case PLUS: {
++				register char nextch;
++				register int no;
++				register char *save;
++				register int min;
++
++				/*
++				 * Lookahead to avoid useless match attempts
++				 * when we know what character comes next.
++				 */
++				nextch = '\0';
++				if (OP(next) == EXACTLY)
++					nextch = *OPERAND(next);
++				min = (OP(scan) == STAR) ? 0 : 1;
++				save = g->reginput;
++				no = regrepeat(g, OPERAND(scan));
++				while (no >= min) {
++					/* If it could work, try it. */
++					if (nextch == '\0' || *g->reginput == nextch)
++						if (regmatch(g, next))
++							return(1);
++					/* Couldn't or didn't -- back up. */
++					no--;
++					g->reginput = save + no;
++				}
++				return(0);
++			}
++			break;
++		case END:
++			return(1);	/* Success! */
++			break;
++		default:
++			printk("<3>Regexp: memory corruption\n");
++			return(0);
++			break;
++		}
++
++		scan = next;
++	}
++
++	/*
++	 * We get here only if there's trouble -- normally "case END" is
++	 * the terminating point.
++	 */
++	printk("<3>Regexp: corrupted pointers\n");
++	return(0);
++}
++
++/*
++ - regrepeat - repeatedly match something simple, report how many
++ */
++static int
++regrepeat(struct match_globals *g, char *p)
++{
++	register int count = 0;
++	register char *scan;
++	register char *opnd;
++
++	scan = g->reginput;
++	opnd = OPERAND(p);
++	switch (OP(p)) {
++	case ANY:
++		count = strlen(scan);
++		scan += count;
++		break;
++	case EXACTLY:
++		while (*opnd == *scan) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYOF:
++		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYBUT:
++		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	default:		/* Oh dear.  Called inappropriately. */
++		printk("<3>Regexp: internal foulup\n");
++		count = 0;	/* Best compromise. */
++		break;
++	}
++	g->reginput = scan;
++
++	return(count);
++}
++
++/*
++ - regnext - dig the "next" pointer out of a node
++ */
++static char*
++regnext(struct match_globals *g, char *p)
++{
++	register int offset;
++
++	if (p == &g->regdummy)
++		return(NULL);
++
++	offset = NEXT(p);
++	if (offset == 0)
++		return(NULL);
++
++	if (OP(p) == BACK)
++		return(p-offset);
++	else
++		return(p+offset);
++}
++
++#ifdef DEBUG
++
++STATIC char *regprop();
++
++/*
++ - regdump - dump a regexp onto stdout in vaguely comprehensible form
++ */
++void
++regdump(regexp *r)
++{
++	register char *s;
++	register char op = EXACTLY;	/* Arbitrary non-END op. */
++	register char *next;
++	/* extern char *strchr(); */
++
++
++	s = r->program + 1;
++	while (op != END) {	/* While that wasn't END last time... */
++		op = OP(s);
++		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
++		next = regnext(s);
++		if (next == NULL)		/* Next ptr. */
++			printf("(0)");
++		else
++			printf("(%d)", (s-r->program)+(next-s));
++		s += 3;
++		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
++			/* Literal string, where present. */
++			while (*s != '\0') {
++				putchar(*s);
++				s++;
++			}
++			s++;
++		}
++		putchar('\n');
++	}
++
++	/* Header fields of interest. */
++	if (r->regstart != '\0')
++		printf("start `%c' ", r->regstart);
++	if (r->reganch)
++		printf("anchored ");
++	if (r->regmust != NULL)
++		printf("must have \"%s\"", r->regmust);
++	printf("\n");
++}
++
++/*
++ - regprop - printable representation of opcode
++ */
++static char *
++regprop(char *op)
++{
++#define BUFLEN 50
++	register char *p;
++	static char buf[BUFLEN];
++
++	strcpy(buf, ":");
++
++	switch (OP(op)) {
++	case BOL:
++		p = "BOL";
++		break;
++	case EOL:
++		p = "EOL";
++		break;
++	case ANY:
++		p = "ANY";
++		break;
++	case ANYOF:
++		p = "ANYOF";
++		break;
++	case ANYBUT:
++		p = "ANYBUT";
++		break;
++	case BRANCH:
++		p = "BRANCH";
++		break;
++	case EXACTLY:
++		p = "EXACTLY";
++		break;
++	case NOTHING:
++		p = "NOTHING";
++		break;
++	case BACK:
++		p = "BACK";
++		break;
++	case END:
++		p = "END";
++		break;
++	case OPEN+1:
++	case OPEN+2:
++	case OPEN+3:
++	case OPEN+4:
++	case OPEN+5:
++	case OPEN+6:
++	case OPEN+7:
++	case OPEN+8:
++	case OPEN+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
++		p = NULL;
++		break;
++	case CLOSE+1:
++	case CLOSE+2:
++	case CLOSE+3:
++	case CLOSE+4:
++	case CLOSE+5:
++	case CLOSE+6:
++	case CLOSE+7:
++	case CLOSE+8:
++	case CLOSE+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
++		p = NULL;
++		break;
++	case STAR:
++		p = "STAR";
++		break;
++	case PLUS:
++		p = "PLUS";
++		break;
++	default:
++		printk("<3>Regexp: corrupted opcode\n");
++		break;
++	}
++	if (p != NULL)
++		strncat(buf, p, BUFLEN-strlen(buf));
++	return(buf);
++}
++#endif
++
++
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.h
+@@ -0,0 +1,41 @@
++/*
++ * Definitions etc. for regexp(3) routines.
++ *
++ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
++ * not the System V one.
++ */
++
++#ifndef REGEXP_H
++#define REGEXP_H
++
++
++/*
++http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
++which contains a version of this library, says:
++
++ *
++ * NSUBEXP must be at least 10, and no greater than 117 or the parser
++ * will not work properly.
++ *
++
++However, it looks rather like this library is limited to 10.  If you think
++otherwise, let us know.
++*/
++
++#define NSUBEXP  10
++typedef struct regexp {
++	char *startp[NSUBEXP];
++	char *endp[NSUBEXP];
++	char regstart;		/* Internal use only. */
++	char reganch;		/* Internal use only. */
++	char *regmust;		/* Internal use only. */
++	int regmlen;		/* Internal use only. */
++	char program[1];	/* Unwarranted chumminess with compiler. */
++} regexp;
++
++regexp * regcomp(char *exp, int *patternsize);
++int regexec(regexp *prog, char *string);
++void regsub(regexp *prog, char *source, char *dest);
++void regerror(char *s);
++
++#endif
+--- /dev/null
++++ b/net/netfilter/regexp/regmagic.h
+@@ -0,0 +1,5 @@
++/*
++ * The first byte of the regexp internal "program" is actually this magic
++ * number; the start node begins in the second byte.
++ */
++#define	MAGIC	0234
+--- /dev/null
++++ b/net/netfilter/regexp/regsub.c
+@@ -0,0 +1,95 @@
++/*
++ * regsub
++ * @(#)regsub.c	1.3 of 2 April 86
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ */
++#include "regexp.h"
++#include "regmagic.h"
++#include <linux/string.h>
++
++
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#if 0
++//void regerror(char * s)
++//{
++//        printk("regexp(3): %s", s);
++//        /* NOTREACHED */
++//}
++#endif
++
++/*
++ - regsub - perform substitutions after a regexp match
++ */
++void
++regsub(regexp * prog, char * source, char * dest)
++{
++	register char *src;
++	register char *dst;
++	register char c;
++	register int no;
++	register int len;
++	
++	/* Not necessary and gcc doesn't like it -MLS */
++	/*extern char *strncpy();*/
++
++	if (prog == NULL || source == NULL || dest == NULL) {
++		regerror("NULL parm to regsub");
++		return;
++	}
++	if (UCHARAT(prog->program) != MAGIC) {
++		regerror("damaged regexp fed to regsub");
++		return;
++	}
++
++	src = source;
++	dst = dest;
++	while ((c = *src++) != '\0') {
++		if (c == '&')
++			no = 0;
++		else if (c == '\\' && '0' <= *src && *src <= '9')
++			no = *src++ - '0';
++		else
++			no = -1;
++
++		if (no < 0) {	/* Ordinary character. */
++			if (c == '\\' && (*src == '\\' || *src == '&'))
++				c = *src++;
++			*dst++ = c;
++		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
++			len = prog->endp[no] - prog->startp[no];
++			(void) strncpy(dst, prog->startp[no], len);
++			dst += len;
++			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
++				regerror("damaged match string");
++				return;
++			}
++		}
++	}
++	*dst++ = '\0';
++}
+--- a/net/netfilter/nf_conntrack_core.c
++++ b/net/netfilter/nf_conntrack_core.c
+@@ -220,6 +220,13 @@ destroy_conntrack(struct nf_conntrack *n
+ 	 * too. */
+ 	nf_ct_remove_expectations(ct);
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto)
++		kfree(ct->layer7.app_proto);
++	if(ct->layer7.app_data)
++		kfree(ct->layer7.app_data);
++#endif
++
+ 	/* We overload first tuple to link into unconfirmed or dying list.*/
+ 	BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
+ 	hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -240,6 +240,12 @@ static int ct_seq_show(struct seq_file *
+ 	if (ct_show_delta_time(s, ct))
+ 		goto release;
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto &&
++           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
++		return -ENOSPC;
++#endif
++
+ 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
+ 		goto release;
+ 
+--- a/include/net/netfilter/nf_conntrack.h
++++ b/include/net/netfilter/nf_conntrack.h
+@@ -105,6 +105,22 @@ struct nf_conn {
+ 	struct net *ct_net;
+ #endif
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
++    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	struct {
++		/*
++		 * e.g. "http". NULL before decision. "unknown" after decision
++		 * if no match.
++		 */
++		char *app_proto;
++		/*
++		 * application layer data so far. NULL after match decision.
++		 */
++		char *app_data;
++		unsigned int app_data_len;
++	} layer7;
++#endif
++
+ 	/* Storage reserved for other modules, must be the last member */
+ 	union nf_conntrack_proto proto;
+ };
+--- /dev/null
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -0,0 +1,13 @@
++#ifndef _XT_LAYER7_H
++#define _XT_LAYER7_H
++
++#define MAX_PATTERN_LEN 8192
++#define MAX_PROTOCOL_LEN 256
++
++struct xt_layer7_info {
++    char protocol[MAX_PROTOCOL_LEN];
++    char pattern[MAX_PATTERN_LEN];
++    u_int8_t invert;
++};
++
++#endif /* _XT_LAYER7_H */
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -59,6 +59,7 @@ header-y += xt_ipcomp.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+ header-y += xt_l2tp.h
++header-y += xt_layer7.h
+ header-y += xt_length.h
+ header-y += xt_limit.h
+ header-y += xt_mac.h
diff --git a/trunk/target/linux/generic/patches-3.14/601-netfilter_layer7_pktmatch.patch b/trunk/target/linux/generic/patches-3.14/601-netfilter_layer7_pktmatch.patch
new file mode 100644
index 00000000..f65e301f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/601-netfilter_layer7_pktmatch.patch
@@ -0,0 +1,108 @@
+--- a/include/linux/netfilter/xt_layer7.h
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
+     char protocol[MAX_PROTOCOL_LEN];
+     char pattern[MAX_PATTERN_LEN];
+     u_int8_t invert;
++    u_int8_t pkt;
+ };
+ 
+ #endif /* _XT_LAYER7_H */
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
+ }
+ 
+ /* add the new app data to the conntrack.  Return number of bytes added. */
+-static int add_data(struct nf_conn * master_conntrack,
+-                    char * app_data, int appdatalen)
++static int add_datastr(char *target, int offset, char *app_data, int len)
+ {
+ 	int length = 0, i;
+-	int oldlength = master_conntrack->layer7.app_data_len;
+-
+-	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
+-	   clear on whether the race condition exists or whether this really 
+-	   fixes it.  I might just be being dense... Anyway, if it's not really 
+-	   a fix, all it does is waste a very small amount of time. */
+-	if(!master_conntrack->layer7.app_data) return 0;
++	if (!target) return 0;
+ 
+ 	/* Strip nulls. Make everything lower case (our regex lib doesn't
+ 	do case insensitivity).  Add it to the end of the current data. */
+-	for(i = 0; i < maxdatalen-oldlength-1 &&
+-		   i < appdatalen; i++) {
++ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
+ 		if(app_data[i] != '\0') {
+ 			/* the kernel version of tolower mungs 'upper ascii' */
+-			master_conntrack->layer7.app_data[length+oldlength] =
++			target[length+offset] =
+ 				isascii(app_data[i])? 
+ 					tolower(app_data[i]) : app_data[i];
+ 			length++;
+ 		}
+ 	}
++	target[length+offset] = '\0';
++
++	return length;
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length;
+ 
+-	master_conntrack->layer7.app_data[length+oldlength] = '\0';
+-	master_conntrack->layer7.app_data_len = length + oldlength;
++	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
++	master_conntrack->layer7.app_data_len += length;
+ 
+ 	return length;
+ }
+@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
+ 
+ 	enum ip_conntrack_info master_ctinfo, ctinfo;
+ 	struct nf_conn *master_conntrack, *conntrack;
+-	unsigned char * app_data;
++	unsigned char *app_data, *tmp_data;
+ 	unsigned int pattern_result, appdatalen;
+ 	regexp * comppattern;
+ 
+@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
+ 		master_conntrack = master_ct(master_conntrack);
+ 
+ 	/* if we've classified it or seen too many packets */
+-	if(total_acct_packets(master_conntrack) > num_packets ||
+-	   master_conntrack->layer7.app_proto) {
++	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto)) {
+ 
+ 		pattern_result = match_no_append(conntrack, master_conntrack, 
+ 						 ctinfo, master_ctinfo, info);
+@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
+ 	/* the return value gets checked later, when we're ready to use it */
+ 	comppattern = compile_and_cache(info->pattern, info->protocol);
+ 
++	if (info->pkt) {
++		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!tmp_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
++			return info->invert;
++		}
++
++		tmp_data[0] = '\0';
++		add_datastr(tmp_data, 0, app_data, appdatalen);
++		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
++
++		kfree(tmp_data);
++		tmp_data = NULL;
++		spin_unlock_bh(&l7_lock);
++
++		return (pattern_result ^ info->invert);
++	}
++
+ 	/* On the first packet of a connection, allocate space for app data */
+ 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
+ 	   !master_conntrack->layer7.app_data){
diff --git a/trunk/target/linux/generic/patches-3.14/602-netfilter_layer7_match.patch b/trunk/target/linux/generic/patches-3.14/602-netfilter_layer7_match.patch
new file mode 100644
index 00000000..b2e48c82
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/602-netfilter_layer7_match.patch
@@ -0,0 +1,51 @@
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
+ 
+ static bool
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
+ #else
+ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
+ 
+ // load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
+ {
+         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ 		 const struct xt_match *match, void *matchinfo,
+ 		 unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++		return -EINVAL;
++	}
++	return 0;
++#else
+                 return 0;
+         }
+ 	return 1;
++#endif
+ }
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/603-netfilter_layer7_2.6.36_fix.patch b/trunk/target/linux/generic/patches-3.14/603-netfilter_layer7_2.6.36_fix.patch
new file mode 100644
index 00000000..85c6f0de
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/603-netfilter_layer7_2.6.36_fix.patch
@@ -0,0 +1,61 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1163,6 +1163,27 @@ config NETFILTER_XT_MATCH_L2TP
+ 
+ 	To compile it as a module, choose M here. If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on EXPERIMENTAL
++	depends on NETFILTER_XTABLES
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
++
+ config NETFILTER_XT_MATCH_LENGTH
+ 	tristate '"length" match support'
+ 	depends on NETFILTER_ADVANCED
+@@ -1357,26 +1378,11 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
+-config NETFILTER_XT_MATCH_LAYER7
+-	tristate '"layer7" match support'
+-	depends on NETFILTER_XTABLES
+-	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
+-       depends on NETFILTER_ADVANCED
+-	help
+-	  Say Y if you want to be able to classify connections (and their
+-	  packets) based on regular expression matching of their application
+-	  layer data.   This is one way to classify applications such as
+-	  peer-to-peer filesharing systems that do not always use the same
+-	  port.
+-
+-	  To compile it as a module, choose M here.  If unsure, say N.
+-
+ config NETFILTER_XT_MATCH_LAYER7_DEBUG
+-        bool 'Layer 7 debugging output'
+-        depends on NETFILTER_XT_MATCH_LAYER7
+-        help
+-          Say Y to get lots of debugging output.
+-
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
+ 
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
diff --git a/trunk/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch b/trunk/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch
new file mode 100644
index 00000000..88adb019
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,86 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -17,6 +17,7 @@
+ #include <linux/percpu.h>
+ #include <linux/netdevice.h>
+ #include <linux/security.h>
++#include <linux/inet.h>
+ #include <net/net_namespace.h>
+ #ifdef CONFIG_SYSCTL
+ #include <linux/sysctl.h>
+@@ -268,10 +269,66 @@ static int ct_open(struct inode *inode, 
+ 			sizeof(struct ct_iter_state));
+ }
+ 
++struct kill_request {
++	u16 family;
++	union nf_inet_addr addr;
++};
++
++static int kill_matching(struct nf_conn *i, void *data)
++{
++	struct kill_request *kr = data;
++	struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
++	struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
++
++	if (!kr->family)
++		return 1;
++
++	if (t1->src.l3num != kr->family)
++		return 0;
++
++	return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++			     size_t count, loff_t *ppos)
++{
++	struct seq_file *seq = file->private_data;
++	struct net *net = seq_file_net(seq);
++	struct kill_request kr = { };
++	char req[INET6_ADDRSTRLEN] = { };
++
++	if (count == 0)
++		return 0;
++
++	if (count >= INET6_ADDRSTRLEN)
++		count = INET6_ADDRSTRLEN - 1;
++
++	if (copy_from_user(req, buf, count))
++		return -EFAULT;
++
++	if (strnchr(req, count, ':')) {
++		kr.family = AF_INET6;
++		if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	} else if (strnchr(req, count, '.')) {
++		kr.family = AF_INET;
++		if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	}
++
++	nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0);
++
++	return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ 	.owner   = THIS_MODULE,
+ 	.open    = ct_open,
+ 	.read    = seq_read,
++	.write	 = ct_file_write,
+ 	.llseek  = seq_lseek,
+ 	.release = seq_release_net,
+ };
+@@ -373,7 +430,7 @@ static int nf_conntrack_standalone_init_
+ {
+ 	struct proc_dir_entry *pde;
+ 
+-	pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops);
++	pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops);
+ 	if (!pde)
+ 		goto out_nf_conntrack;
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch b/trunk/target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch
new file mode 100644
index 00000000..f652dafd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/610-netfilter_match_bypass_default_checks.patch
@@ -0,0 +1,93 @@
+--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
++++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
+@@ -87,6 +87,7 @@ struct ipt_ip {
+ #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
+ #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
+ #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
++#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
+ 
+ /* Values for "inv" field in struct ipt_ip. */
+ #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -82,6 +82,9 @@ ip_packet_match(const struct iphdr *ip,
+ 
+ #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
+ 
++	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
++		return true;
++
+ 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+ 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+@@ -135,6 +138,29 @@ ip_packet_match(const struct iphdr *ip,
+ 	return true;
+ }
+ 
++static void
++ip_checkdefault(struct ipt_ip *ip)
++{
++	static const char iface_mask[IFNAMSIZ] = {};
++
++	if (ip->invflags || ip->flags & IPT_F_FRAG)
++		return;
++
++	if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (ip->smsk.s_addr || ip->dmsk.s_addr)
++		return;
++
++	if (ip->proto)
++		return;
++
++	ip->flags |= IPT_F_NO_DEF_MATCH;
++}
++
+ static bool
+ ip_checkentry(const struct ipt_ip *ip)
+ {
+@@ -565,7 +591,7 @@ static void cleanup_match(struct xt_entr
+ }
+ 
+ static int
+-check_entry(const struct ipt_entry *e, const char *name)
++check_entry(struct ipt_entry *e, const char *name)
+ {
+ 	const struct xt_entry_target *t;
+ 
+@@ -574,6 +600,8 @@ check_entry(const struct ipt_entry *e, c
+ 		return -EINVAL;
+ 	}
+ 
++	ip_checkdefault(&e->ip);
++
+ 	if (e->target_offset + sizeof(struct xt_entry_target) >
+ 	    e->next_offset)
+ 		return -EINVAL;
+@@ -935,6 +963,7 @@ copy_entries_to_user(unsigned int total_
+ 	const struct xt_table_info *private = table->private;
+ 	int ret = 0;
+ 	const void *loc_cpu_entry;
++	u8 flags;
+ 
+ 	counters = alloc_counters(table);
+ 	if (IS_ERR(counters))
+@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_
+ 			goto free_counters;
+ 		}
+ 
++		flags = e->ip.flags & IPT_F_MASK;
++		if (copy_to_user(userptr + off
++				 + offsetof(struct ipt_entry, ip.flags),
++				 &flags, sizeof(flags)) != 0) {
++			ret = -EFAULT;
++			goto free_counters;
++		}
++
+ 		for (i = sizeof(struct ipt_entry);
+ 		     i < e->target_offset;
+ 		     i += m->u.match_size) {
diff --git a/trunk/target/linux/generic/patches-3.14/611-netfilter_match_bypass_default_table.patch b/trunk/target/linux/generic/patches-3.14/611-netfilter_match_bypass_default_table.patch
new file mode 100644
index 00000000..ef993c86
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/611-netfilter_match_bypass_default_table.patch
@@ -0,0 +1,94 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -310,6 +310,33 @@ struct ipt_entry *ipt_next_entry(const s
+ 	return (void *)entry + entry->next_offset;
+ }
+ 
++static bool
++ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
++{
++	struct xt_entry_target *t;
++	struct xt_standard_target *st;
++
++	if (e->target_offset != sizeof(struct ipt_entry))
++		return false;
++
++	if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
++		return false;
++
++	t = ipt_get_target(e);
++	if (t->u.kernel.target->target)
++		return false;
++
++	st = (struct xt_standard_target *) t;
++	if (st->verdict == XT_RETURN)
++		return false;
++
++	if (st->verdict >= 0)
++		return false;
++
++	*verdict = (unsigned)(-st->verdict) - 1;
++	return true;
++}
++
+ /* Returns one of the generic firewall policies, like NF_ACCEPT. */
+ unsigned int
+ ipt_do_table(struct sk_buff *skb,
+@@ -331,9 +358,33 @@ ipt_do_table(struct sk_buff *skb,
+ 	unsigned int addend;
+ 
+ 	/* Initialization */
++	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++	local_bh_disable();
++	private = table->private;
++	cpu        = smp_processor_id();
++	/*
++	 * Ensure we load private-> members after we've fetched the base
++	 * pointer.
++	 */
++	smp_read_barrier_depends();
++	table_base = private->entries[cpu];
++
++	e = get_entry(table_base, private->hook_entry[hook]);
++	if (ipt_handle_default_rule(e, &verdict)) {
++		ADD_COUNTER(e->counters, skb->len, 1);
++		local_bh_enable();
++		return verdict;
++	}
++
+ 	ip = ip_hdr(skb);
+ 	indev = in ? in->name : nulldevname;
+ 	outdev = out ? out->name : nulldevname;
++
++	addend = xt_write_recseq_begin();
++	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
++	stackptr   = per_cpu_ptr(private->stackptr, cpu);
++	origptr    = *stackptr;
++
+ 	/* We handle fragments by dealing with the first fragment as
+ 	 * if it was a normal packet.  All other fragments are treated
+ 	 * normally, except that they will NEVER match rules that ask
+@@ -348,23 +399,6 @@ ipt_do_table(struct sk_buff *skb,
+ 	acpar.family  = NFPROTO_IPV4;
+ 	acpar.hooknum = hook;
+ 
+-	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+-	local_bh_disable();
+-	addend = xt_write_recseq_begin();
+-	private = table->private;
+-	cpu        = smp_processor_id();
+-	/*
+-	 * Ensure we load private-> members after we've fetched the base
+-	 * pointer.
+-	 */
+-	smp_read_barrier_depends();
+-	table_base = private->entries[cpu];
+-	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
+-	stackptr   = per_cpu_ptr(private->stackptr, cpu);
+-	origptr    = *stackptr;
+-
+-	e = get_entry(table_base, private->hook_entry[hook]);
+-
+ 	pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n",
+ 		 table->name, hook, origptr,
+ 		 get_entry(table_base, private->underflow[hook]));
diff --git a/trunk/target/linux/generic/patches-3.14/612-netfilter_match_reduce_memory_access.patch b/trunk/target/linux/generic/patches-3.14/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 00000000..72172d8b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/612-netfilter_match_reduce_memory_access.patch
@@ -0,0 +1,16 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -85,9 +85,11 @@ ip_packet_match(const struct iphdr *ip,
+ 	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
+ 		return true;
+ 
+-	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
++	if (FWINV(ipinfo->smsk.s_addr &&
++		  (ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+-	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
++	    FWINV(ipinfo->dmsk.s_addr &&
++		  (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+ 		  IPT_INV_DSTIP)) {
+ 		dprintf("Source or dest mismatch.\n");
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/613-netfilter_optional_tcp_window_check.patch b/trunk/target/linux/generic/patches-3.14/613-netfilter_optional_tcp_window_check.patch
new file mode 100644
index 00000000..1d3b37cc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/613-netfilter_optional_tcp_window_check.patch
@@ -0,0 +1,36 @@
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -33,6 +33,9 @@
+ #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
+ #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
+ 
++/* Do not check the TCP window for incoming packets  */
++static int nf_ct_tcp_no_window_check __read_mostly = 1;
++
+ /* "Be conservative in what you do,
+     be liberal in what you accept from others."
+     If it's non-zero, we mark only out of window RST segments as INVALID. */
+@@ -515,6 +518,9 @@ static bool tcp_in_window(const struct n
+ 	s32 receiver_offset;
+ 	bool res, in_recv_win;
+ 
++	if (nf_ct_tcp_no_window_check)
++		return true;
++
+ 	/*
+ 	 * Get the required data from the packet.
+ 	 */
+@@ -1452,6 +1458,13 @@ static struct ctl_table tcp_sysctl_table
+ 		.mode		= 0644,
+ 		.proc_handler	= proc_dointvec,
+ 	},
++	{
++		.procname       = "nf_conntrack_tcp_no_window_check",
++		.data           = &nf_ct_tcp_no_window_check,
++		.maxlen         = sizeof(unsigned int),
++		.mode           = 0644,
++		.proc_handler   = proc_dointvec,
++	},
+ 	{ }
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/615-netfilter_add_xt_id_match.patch b/trunk/target/linux/generic/patches-3.14/615-netfilter_add_xt_id_match.patch
new file mode 100644
index 00000000..07b4bfae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/615-netfilter_add_xt_id_match.patch
@@ -0,0 +1,95 @@
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -55,6 +55,7 @@ header-y += xt_ecn.h
+ header-y += xt_esp.h
+ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
++header-y += xt_id.h
+ header-y += xt_ipcomp.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+--- /dev/null
++++ b/include/uapi/linux/netfilter/xt_id.h
+@@ -0,0 +1,8 @@
++#ifndef _XT_ID_H
++#define _XT_ID_H
++
++struct xt_id_info {
++	u32 id;
++};
++
++#endif /* XT_ID_H */
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1133,6 +1133,13 @@ config NETFILTER_XT_MATCH_IPCOMP
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_ID
++	tristate '"id" match support'
++	depends on NETFILTER_ADVANCED
++	---help---
++	This option adds a `id' dummy-match, which allows you to put
++	numeric IDs into your iptables ruleset.
++
+ config NETFILTER_XT_MATCH_IPRANGE
+ 	tristate '"iprange" address range match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += 
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_ID) += xt_id.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPCOMP) += xt_ipcomp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o
+--- /dev/null
++++ b/net/netfilter/xt_id.c
+@@ -0,0 +1,45 @@
++/*
++ * Implements a dummy match to allow attaching IDs to rules
++ *
++ * 2014-08-01 Jo-Philipp Wich <jow@openwrt.org>
++ */
++
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_id.h>
++
++MODULE_AUTHOR("Jo-Philipp Wich <jow@openwrt.org>");
++MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_id");
++MODULE_ALIAS("ip6t_id");
++
++static bool
++id_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++	/* We always match */
++	return true;
++}
++
++static struct xt_match id_mt_reg __read_mostly = {
++	.name      = "id",
++	.revision  = 0,
++	.family    = NFPROTO_UNSPEC,
++	.match     = id_mt,
++	.matchsize = sizeof(struct xt_id_info),
++	.me        = THIS_MODULE,
++};
++
++static int __init id_mt_init(void)
++{
++	return xt_register_match(&id_mt_reg);
++}
++
++static void __exit id_mt_exit(void)
++{
++	xt_unregister_match(&id_mt_reg);
++}
++
++module_init(id_mt_init);
++module_exit(id_mt_exit);
diff --git a/trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch b/trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
new file mode 100644
index 00000000..2a64d542
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
@@ -0,0 +1,12 @@
+--- a/net/netfilter/nf_nat_core.c
++++ b/net/netfilter/nf_nat_core.c
+@@ -90,6 +90,9 @@ int nf_xfrm_me_harder(struct sk_buff *sk
+ 	struct dst_entry *dst;
+ 	int err;
+ 
++	if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++		return 0;
++
+ 	err = xfrm_decode_session(skb, &fl, family);
+ 	if (err < 0)
+ 		return err;
diff --git a/trunk/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch b/trunk/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch
new file mode 100644
index 00000000..255eaae5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/617-netfilter_skip_filter_sysctl.patch
@@ -0,0 +1,87 @@
+--- a/include/net/netns/conntrack.h
++++ b/include/net/netns/conntrack.h
+@@ -73,6 +73,7 @@ struct netns_ct {
+ 	struct ctl_table_header	*helper_sysctl_header;
+ #endif
+ 	char			*slabname;
++	int			skip_filter;
+ 	unsigned int		sysctl_log_invalid; /* Log invalid packets */
+ 	unsigned int		sysctl_events_retry_timeout;
+ 	int			sysctl_events;
+--- a/net/ipv4/netfilter/iptable_filter.c
++++ b/net/ipv4/netfilter/iptable_filter.c
+@@ -15,6 +15,7 @@
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ #include <linux/slab.h>
+ #include <net/ip.h>
++#include <net/netfilter/nf_conntrack.h>
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+@@ -37,6 +38,7 @@ iptable_filter_hook(const struct nf_hook
+ 		    const struct net_device *in, const struct net_device *out,
+ 		    int (*okfn)(struct sk_buff *))
+ {
++	enum ip_conntrack_info ctinfo;
+ 	const struct net *net;
+ 
+ 	if (ops->hooknum == NF_INET_LOCAL_OUT &&
+@@ -46,6 +48,11 @@ iptable_filter_hook(const struct nf_hook
+ 		return NF_ACCEPT;
+ 
+ 	net = dev_net((in != NULL) ? in : out);
++	nf_ct_get(skb, &ctinfo);
++	if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) &&
++	    net->ct.skip_filter)
++	    return NF_ACCEPT;
++
+ 	return ipt_do_table(skb, ops->hooknum, in, out,
+ 			    net->ipv4.iptable_filter);
+ }
+--- a/net/ipv6/netfilter/ip6table_filter.c
++++ b/net/ipv6/netfilter/ip6table_filter.c
+@@ -13,6 +13,7 @@
+ #include <linux/moduleparam.h>
+ #include <linux/netfilter_ipv6/ip6_tables.h>
+ #include <linux/slab.h>
++#include <net/netfilter/nf_conntrack.h>
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+@@ -37,6 +38,12 @@ ip6table_filter_hook(const struct nf_hoo
+ 		     int (*okfn)(struct sk_buff *))
+ {
+ 	const struct net *net = dev_net((in != NULL) ? in : out);
++	enum ip_conntrack_info ctinfo;
++
++	nf_ct_get(skb, &ctinfo);
++	if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) &&
++	    net->ct.skip_filter)
++	    return NF_ACCEPT;
+ 
+ 	return ip6t_do_table(skb, ops->hooknum, in, out,
+ 			     net->ipv6.ip6table_filter);
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -510,6 +510,13 @@ static struct ctl_table nf_ct_sysctl_tab
+ 		.extra2		= &log_invalid_proto_max,
+ 	},
+ 	{
++		.procname	= "nf_conntrack_skip_filter",
++		.data		= &init_net.ct.skip_filter,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec,
++	},
++	{
+ 		.procname	= "nf_conntrack_expect_max",
+ 		.data		= &nf_ct_expect_max,
+ 		.maxlen		= sizeof(int),
+@@ -545,6 +552,7 @@ static int nf_conntrack_standalone_init_
+ 	table[2].data = &net->ct.htable_size;
+ 	table[3].data = &net->ct.sysctl_checksum;
+ 	table[4].data = &net->ct.sysctl_log_invalid;
++	table[5].data = &net->ct.skip_filter;
+ 
+ 	/* Don't export sysctls to unprivileged users */
+ 	if (net->user_ns != &init_user_ns)
diff --git a/trunk/target/linux/generic/patches-3.14/620-sched_esfq.patch b/trunk/target/linux/generic/patches-3.14/620-sched_esfq.patch
new file mode 100644
index 00000000..9726e4ac
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/620-sched_esfq.patch
@@ -0,0 +1,791 @@
+--- a/include/uapi/linux/pkt_sched.h
++++ b/include/uapi/linux/pkt_sched.h
+@@ -226,6 +226,33 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++	TCA_SFQ_HASH_CLASSIC,
++	TCA_SFQ_HASH_DST,
++	TCA_SFQ_HASH_SRC,
++	TCA_SFQ_HASH_FWMARK,
++	/* conntrack */
++	TCA_SFQ_HASH_CTORIGDST,
++	TCA_SFQ_HASH_CTORIGSRC,
++	TCA_SFQ_HASH_CTREPLDST,
++	TCA_SFQ_HASH_CTREPLSRC,
++	TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++	unsigned	quantum;	/* Bytes per round allocated to flow */
++	int		perturb_period;	/* Period of hash perturbation */
++	__u32		limit;		/* Maximal packets in queue */
++	unsigned	divisor;	/* Hash divisor  */
++	unsigned	flows;		/* Maximal number of flows  */
++	unsigned	hash_kind;	/* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -148,6 +148,37 @@ config NET_SCH_SFQ
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called sch_sfq.
+ 
++config NET_SCH_ESFQ
++	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
++	---help---
++	  Say Y here if you want to use the Enhanced Stochastic Fairness
++	  Queueing (ESFQ) packet scheduling algorithm for some of your network
++	  devices or as a leaf discipline for a classful qdisc such as HTB or
++	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
++	  references to the SFQ algorithm).
++
++	  This is an enchanced SFQ version which allows you to control some
++	  hardcoded values in the SFQ scheduler.
++
++	  ESFQ also adds control of the hash function used to identify packet
++	  flows. The original SFQ discipline hashes by connection; ESFQ add
++	  several other hashing methods, such as by src IP or by dst IP, which
++	  can be more fair to users in some networking situations.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called sch_esfq.
++
++config NET_SCH_ESFQ_NFCT
++	bool "Connection Tracking Hash Types"
++	depends on NET_SCH_ESFQ && NF_CONNTRACK
++	---help---
++	  Say Y here to enable support for hashing based on netfilter connection
++	  tracking information. This is useful for a router that is also using
++	  NAT to connect privately-addressed hosts to the Internet. If you want
++	  to provide fair distribution of upstream bandwidth, ESFQ must use
++	  connection tracking information, since all outgoing packets will share
++	  the same source address.
++
+ config NET_SCH_TEQL
+ 	tristate "True Link Equalizer (TEQL)"
+ 	---help---
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ing
+ obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
+ obj-$(CONFIG_NET_SCH_SFB)	+= sch_sfb.o
+ obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
++obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
+ obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
+ obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
+ obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
+--- /dev/null
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,702 @@
++/*
++ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:	Alexander Atanasov, <alex@ssi.bg>
++ *		Added dynamic depth,limit,divisor,hash_kind options.
++ *		Added dst and src hashes.
++ *
++ * 		Alexander Clouter, <alex@digriz.org.uk>
++ *		Ported ESFQ to Linux 2.6.
++ *
++ * 		Corey Hickey, <bugfood-c@fatooh.org>
++ *		Maintenance of the Linux 2.6 port.
++ *		Added fwmark hash (thanks to Robert Kurjata).
++ *		Added usage of jhash.
++ *		Added conntrack support.
++ *		Added ctnatchg hash (thanks to Ben Pfountz).
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <linux/bitops.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/socket.h>
++#include <linux/sockios.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/if_ether.h>
++#include <linux/inet.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/notifier.h>
++#include <linux/init.h>
++#include <net/ip.h>
++#include <net/netlink.h>
++#include <linux/ipv6.h>
++#include <net/route.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/pkt_sched.h>
++#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++#include <net/netfilter/nf_conntrack.h>
++#endif
++
++/*	Stochastic Fairness Queuing algorithm.
++	For more comments look at sch_sfq.c.
++	The difference is that you can change limit, depth,
++	hash table size and choose alternate hash types.
++
++	classic:	same as in sch_sfq.c
++	dst:		destination IP address
++	src:		source IP address
++	fwmark:		netfilter mark value
++	ctorigdst:	original destination IP address
++	ctorigsrc:	original source IP address
++	ctrepldst:	reply destination IP address
++	ctreplsrc:	reply source IP
++
++*/
++
++#define ESFQ_HEAD 0
++#define ESFQ_TAIL 1
++
++/* This type should contain at least SFQ_DEPTH*2 values */
++typedef unsigned int esfq_index;
++
++struct esfq_head
++{
++	esfq_index	next;
++	esfq_index	prev;
++};
++
++struct esfq_sched_data
++{
++/* Parameters */
++	int		perturb_period;
++	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
++	int		limit;
++	unsigned	depth;
++	unsigned	hash_divisor;
++	unsigned	hash_kind;
++/* Variables */
++	struct timer_list perturb_timer;
++	int		perturbation;
++	esfq_index	tail;		/* Index of current slot in round */
++	esfq_index	max_depth;	/* Maximal depth */
++
++	esfq_index	*ht;			/* Hash table */
++	esfq_index	*next;			/* Active slots link */
++	short		*allot;			/* Current allotment per slot */
++	unsigned short	*hash;			/* Hash value indexed by slots */
++	struct sk_buff_head	*qs;		/* Slot queue */
++	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
++};
++
++/* This contains the info we will hash. */
++struct esfq_packet_info
++{
++	u32	proto;		/* protocol or port */
++	u32	src;		/* source from packet header */
++	u32	dst;		/* destination from packet header */
++	u32	ctorigsrc;	/* original source from conntrack */
++	u32	ctorigdst;	/* original destination from conntrack */
++	u32	ctreplsrc;	/* reply source from conntrack */
++	u32	ctrepldst;	/* reply destination from conntrack */
++	u32	mark;		/* netfilter mark (fwmark) */
++};
++
++static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
++{
++	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
++{
++	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
++{
++	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
++}
++
++static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
++{
++	struct esfq_packet_info info;
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	enum ip_conntrack_info ctinfo;
++	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
++#endif
++
++	switch (skb->protocol) {
++	case __constant_htons(ETH_P_IP):
++	{
++		struct iphdr *iph = ip_hdr(skb);
++		info.dst = iph->daddr;
++		info.src = iph->saddr;
++		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
++		    (iph->protocol == IPPROTO_TCP ||
++		     iph->protocol == IPPROTO_UDP ||
++		     iph->protocol == IPPROTO_SCTP ||
++		     iph->protocol == IPPROTO_DCCP ||
++		     iph->protocol == IPPROTO_ESP))
++			info.proto = *(((u32*)iph) + iph->ihl);
++		else
++			info.proto = iph->protocol;
++		break;
++	}
++	case __constant_htons(ETH_P_IPV6):
++	{
++		struct ipv6hdr *iph = ipv6_hdr(skb);
++		/* Hash ipv6 addresses into a u32. This isn't ideal,
++		 * but the code is simple. */
++		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
++		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
++		if (iph->nexthdr == IPPROTO_TCP ||
++		    iph->nexthdr == IPPROTO_UDP ||
++		    iph->nexthdr == IPPROTO_SCTP ||
++		    iph->nexthdr == IPPROTO_DCCP ||
++		    iph->nexthdr == IPPROTO_ESP)
++			info.proto = *(u32*)&iph[1];
++		else
++			info.proto = iph->nexthdr;
++		break;
++	}
++	default:
++		info.dst   = (u32)(unsigned long)skb_dst(skb);
++		info.src   = (u32)(unsigned long)skb->sk;
++		info.proto = skb->protocol;
++	}
++
++	info.mark = skb->mark;
++
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	/* defaults if there is no conntrack info */
++	info.ctorigsrc = info.src;
++	info.ctorigdst = info.dst;
++	info.ctreplsrc = info.dst;
++	info.ctrepldst = info.src;
++	/* collect conntrack info */
++	if (ct && ct != &nf_conntrack_untracked) {
++		if (skb->protocol == __constant_htons(ETH_P_IP)) {
++			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
++			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
++			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++		}
++		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
++			/* Again, hash ipv6 addresses into a single u32. */
++			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
++			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
++		}
++
++	}
++#endif
++
++	switch(q->hash_kind) {
++	case TCA_SFQ_HASH_CLASSIC:
++		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++	case TCA_SFQ_HASH_DST:
++		return esfq_jhash_1word(q, info.dst);
++	case TCA_SFQ_HASH_SRC:
++		return esfq_jhash_1word(q, info.src);
++	case TCA_SFQ_HASH_FWMARK:
++		return esfq_jhash_1word(q, info.mark);
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	case TCA_SFQ_HASH_CTORIGDST:
++		return esfq_jhash_1word(q, info.ctorigdst);
++	case TCA_SFQ_HASH_CTORIGSRC:
++		return esfq_jhash_1word(q, info.ctorigsrc);
++	case TCA_SFQ_HASH_CTREPLDST:
++		return esfq_jhash_1word(q, info.ctrepldst);
++	case TCA_SFQ_HASH_CTREPLSRC:
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	case TCA_SFQ_HASH_CTNATCHG:
++	{
++		if (info.ctorigdst == info.ctreplsrc)
++			return esfq_jhash_1word(q, info.ctorigsrc);
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	}
++#endif
++	default:
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
++	}
++	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++}
++
++static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d = q->qs[x].qlen + q->depth;
++
++	p = d;
++	n = q->dep[d].next;
++	q->dep[x].next = n;
++	q->dep[x].prev = p;
++	q->dep[p].next = q->dep[n].prev = x;
++}
++
++static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++
++	if (n == p && q->max_depth == q->qs[x].qlen + 1)
++		q->max_depth--;
++
++	esfq_link(q, x);
++}
++
++static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++	d = q->qs[x].qlen;
++	if (q->max_depth < d)
++		q->max_depth = d;
++
++	esfq_link(q, x);
++}
++
++static unsigned int esfq_drop(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index d = q->max_depth;
++	struct sk_buff *skb;
++	unsigned int len;
++
++	/* Queue is full! Find the longest slot and
++	   drop a packet from it */
++
++	if (d > 1) {
++		esfq_index x = q->dep[d+q->depth].next;
++		skb = q->qs[x].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[x]);
++		kfree_skb(skb);
++		esfq_dec(q, x);
++		sch->q.qlen--;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	if (d == 1) {
++		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
++		d = q->next[q->tail];
++		q->next[q->tail] = q->next[d];
++		q->allot[q->next[d]] += q->quantum;
++		skb = q->qs[d].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[d]);
++		kfree_skb(skb);
++		esfq_dec(q, d);
++		sch->q.qlen--;
++		q->ht[q->hash[d]] = q->depth;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	return 0;
++}
++
++static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
++{
++	unsigned hash = esfq_hash(q, skb);
++	unsigned depth = q->depth;
++	esfq_index x;
++
++	x = q->ht[hash];
++	if (x == depth) {
++		q->ht[hash] = x = q->dep[depth].next;
++		q->hash[x] = hash;
++	}
++
++	if (end == ESFQ_TAIL)
++		__skb_queue_tail(&q->qs[x], skb);
++	else
++		__skb_queue_head(&q->qs[x], skb);
++
++	esfq_inc(q, x);
++	if (q->qs[x].qlen == 1) {		/* The flow is new */
++		if (q->tail == depth) {	/* It is the first flow */
++			q->tail = x;
++			q->next[x] = x;
++			q->allot[x] = q->quantum;
++		} else {
++			q->next[x] = q->next[q->tail];
++			q->next[q->tail] = x;
++			q->tail = x;
++		}
++	}
++}
++
++static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_enqueue(skb, q, ESFQ_TAIL);
++	sch->qstats.backlog += skb->len;
++	if (++sch->q.qlen < q->limit-1) {
++		sch->bstats.bytes += skb->len;
++		sch->bstats.packets++;
++		return 0;
++	}
++
++	sch->qstats.drops++;
++	esfq_drop(sch);
++	return NET_XMIT_CN;
++}
++
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index a;
++
++	/* No active slots */
++	if (q->tail == q->depth)
++		return NULL;
++
++	a = q->next[q->tail];
++	return skb_peek(&q->qs[a]);
++}
++
++static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
++{
++	struct sk_buff *skb;
++	unsigned depth = q->depth;
++	esfq_index a, old_a;
++
++	/* No active slots */
++	if (q->tail == depth)
++		return NULL;
++
++	a = old_a = q->next[q->tail];
++
++	/* Grab packet */
++	skb = __skb_dequeue(&q->qs[a]);
++	esfq_dec(q, a);
++
++	/* Is the slot empty? */
++	if (q->qs[a].qlen == 0) {
++		q->ht[q->hash[a]] = depth;
++		a = q->next[a];
++		if (a == old_a) {
++			q->tail = depth;
++			return skb;
++		}
++		q->next[q->tail] = a;
++		q->allot[a] += q->quantum;
++	} else if ((q->allot[a] -= skb->len) <= 0) {
++		q->tail = a;
++		a = q->next[a];
++		q->allot[a] += q->quantum;
++	}
++
++	return skb;
++}
++
++static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++
++	skb = esfq_q_dequeue(q);
++	if (skb == NULL)
++		return NULL;
++	sch->q.qlen--;
++	sch->qstats.backlog -= skb->len;
++	return skb;
++}
++
++static void esfq_q_destroy(struct esfq_sched_data *q)
++{
++	del_timer(&q->perturb_timer);
++	if(q->ht)
++		kfree(q->ht);
++	if(q->dep)
++		kfree(q->dep);
++	if(q->next)
++		kfree(q->next);
++	if(q->allot)
++		kfree(q->allot);
++	if(q->hash)
++		kfree(q->hash);
++	if(q->qs)
++		kfree(q->qs);
++}
++
++static void esfq_destroy(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_destroy(q);
++}
++
++
++static void esfq_reset(struct Qdisc* sch)
++{
++	struct sk_buff *skb;
++
++	while ((skb = esfq_dequeue(sch)) != NULL)
++		kfree_skb(skb);
++}
++
++static void esfq_perturbation(unsigned long arg)
++{
++	struct Qdisc *sch = (struct Qdisc*)arg;
++	struct esfq_sched_data *q = qdisc_priv(sch);
++
++	q->perturbation = prandom_u32()&0x1F;
++
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++}
++
++static unsigned int esfq_check_hash(unsigned int kind)
++{
++	switch (kind) {
++	case TCA_SFQ_HASH_CTORIGDST:
++	case TCA_SFQ_HASH_CTORIGSRC:
++	case TCA_SFQ_HASH_CTREPLDST:
++	case TCA_SFQ_HASH_CTREPLSRC:
++	case TCA_SFQ_HASH_CTNATCHG:
++#ifndef CONFIG_NET_SCH_ESFQ_NFCT
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++#endif
++	case TCA_SFQ_HASH_CLASSIC:
++	case TCA_SFQ_HASH_DST:
++	case TCA_SFQ_HASH_SRC:
++	case TCA_SFQ_HASH_FWMARK:
++		return kind;
++	default:
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++	}
++}
++
++static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
++{
++	struct tc_esfq_qopt *ctl = nla_data(opt);
++	esfq_index p = ~0U/2;
++	int i;
++
++	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
++		return -EINVAL;
++
++	q->perturbation = 0;
++	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
++	q->max_depth = 0;
++	if (opt == NULL) {
++		q->perturb_period = 0;
++		q->hash_divisor = 1024;
++		q->tail = q->limit = q->depth = 128;
++
++	} else {
++		struct tc_esfq_qopt *ctl = nla_data(opt);
++		if (ctl->quantum)
++			q->quantum = ctl->quantum;
++		q->perturb_period = ctl->perturb_period*HZ;
++		q->hash_divisor = ctl->divisor ? : 1024;
++		q->tail = q->limit = q->depth = ctl->flows ? : 128;
++
++		if ( q->depth > p - 1 )
++			return -EINVAL;
++
++		if (ctl->limit)
++			q->limit = min_t(u32, ctl->limit, q->depth);
++
++		if (ctl->hash_kind) {
++			q->hash_kind = esfq_check_hash(ctl->hash_kind);
++		}
++	}
++
++	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->ht)
++		goto err_case;
++	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
++	if (!q->dep)
++		goto err_case;
++	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->next)
++		goto err_case;
++	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
++	if (!q->allot)
++		goto err_case;
++	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
++	if (!q->hash)
++		goto err_case;
++	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
++	if (!q->qs)
++		goto err_case;
++
++	for (i=0; i< q->hash_divisor; i++)
++		q->ht[i] = q->depth;
++	for (i=0; i<q->depth; i++) {
++		skb_queue_head_init(&q->qs[i]);
++		q->dep[i+q->depth].next = i+q->depth;
++		q->dep[i+q->depth].prev = i+q->depth;
++	}
++
++	for (i=0; i<q->depth; i++)
++		esfq_link(q, i);
++	return 0;
++err_case:
++	esfq_q_destroy(q);
++	return -ENOBUFS;
++}
++
++static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	int err;
++
++	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(q, opt)))
++		return err;
++
++	init_timer(&q->perturb_timer);
++	q->perturb_timer.data = (unsigned long)sch;
++	q->perturb_timer.function = esfq_perturbation;
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++
++	return 0;
++}
++
++static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct esfq_sched_data new;
++	struct sk_buff *skb;
++	int err;
++
++	/* set up new queue */
++	memset(&new, 0, sizeof(struct esfq_sched_data));
++	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(&new, opt)))
++		return err;
++
++	/* copy all packets from the old queue to the new queue */
++	sch_tree_lock(sch);
++	while ((skb = esfq_q_dequeue(q)) != NULL)
++		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
++
++	/* clean up the old queue */
++	esfq_q_destroy(q);
++
++	/* copy elements of the new queue into the old queue */
++	q->perturb_period = new.perturb_period;
++	q->quantum        = new.quantum;
++	q->limit          = new.limit;
++	q->depth          = new.depth;
++	q->hash_divisor   = new.hash_divisor;
++	q->hash_kind      = new.hash_kind;
++	q->tail           = new.tail;
++	q->max_depth      = new.max_depth;
++	q->ht    = new.ht;
++	q->dep   = new.dep;
++	q->next  = new.next;
++	q->allot = new.allot;
++	q->hash  = new.hash;
++	q->qs    = new.qs;
++
++	/* finish up */
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	} else {
++		q->perturbation = 0;
++	}
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	unsigned char *b = skb_tail_pointer(skb);
++	struct tc_esfq_qopt opt;
++
++	opt.quantum = q->quantum;
++	opt.perturb_period = q->perturb_period/HZ;
++
++	opt.limit = q->limit;
++	opt.divisor = q->hash_divisor;
++	opt.flows = q->depth;
++	opt.hash_kind = q->hash_kind;
++
++	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
++		goto nla_put_failure;
++
++	return skb->len;
++
++nla_put_failure:
++	nlmsg_trim(skb, b);
++	return -1;
++}
++
++static struct Qdisc_ops esfq_qdisc_ops =
++{
++	.next		=	NULL,
++	.cl_ops		=	NULL,
++	.id		=	"esfq",
++	.priv_size	=	sizeof(struct esfq_sched_data),
++	.enqueue	=	esfq_enqueue,
++	.dequeue	=	esfq_dequeue,
++	.peek		=	esfq_peek,
++	.drop		=	esfq_drop,
++	.init		=	esfq_init,
++	.reset		=	esfq_reset,
++	.destroy	=	esfq_destroy,
++	.change		=	esfq_change,
++	.dump		=	esfq_dump,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init esfq_module_init(void)
++{
++	return register_qdisc(&esfq_qdisc_ops);
++}
++static void __exit esfq_module_exit(void)
++{
++	unregister_qdisc(&esfq_qdisc_ops);
++}
++module_init(esfq_module_init)
++module_exit(esfq_module_exit)
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.14/621-sched_act_connmark.patch b/trunk/target/linux/generic/patches-3.14/621-sched_act_connmark.patch
new file mode 100644
index 00000000..d8ca6666
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/621-sched_act_connmark.patch
@@ -0,0 +1,179 @@
+--- /dev/null
++++ b/net/sched/act_connmark.c
+@@ -0,0 +1,144 @@
++/*
++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/skbuff.h>
++#include <linux/rtnetlink.h>
++#include <linux/pkt_cls.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <net/netlink.h>
++#include <net/pkt_sched.h>
++#include <net/act_api.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++
++#define TCA_ACT_CONNMARK	20
++
++#define CONNMARK_TAB_MASK     3
++
++static struct tcf_hashinfo connmark_hash_info;
++
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
++		       struct tcf_result *res)
++{
++	struct nf_conn *c;
++	enum ip_conntrack_info ctinfo;
++	int proto;
++	int r;
++
++	if (skb->protocol == htons(ETH_P_IP)) {
++		if (skb->len < sizeof(struct iphdr))
++			goto out;
++		proto = PF_INET;
++	} else if (skb->protocol == htons(ETH_P_IPV6)) {
++		if (skb->len < sizeof(struct ipv6hdr))
++			goto out;
++		proto = PF_INET6;
++	} else
++		goto out;
++
++	r = nf_conntrack_in(dev_net(skb->dev), proto, NF_INET_PRE_ROUTING, skb);
++	if (r != NF_ACCEPT)
++		goto out;
++
++	c = nf_ct_get(skb, &ctinfo);
++	if (!c)
++		goto out;
++
++	skb->mark = c->mark;
++	nf_conntrack_put(skb->nfct);
++	skb->nfct = NULL;
++
++out:
++	return TC_ACT_PIPE;
++}
++
++static int tcf_connmark_init(struct net *net, struct nlattr *nla,
++			     struct nlattr *est, struct tc_action *a,
++			     int ovr, int bind)
++{
++	struct tcf_common *pc;
++	int ret = 0;
++
++	pc = tcf_hash_check(0, a, bind);
++	if (!pc) {
++		pc = tcf_hash_create(0, est, a, sizeof(*pc), bind);
++		if (IS_ERR(pc))
++		    return PTR_ERR(pc);
++
++		tcf_hash_insert(pc, &connmark_hash_info);
++		ret = ACT_P_CREATED;
++	} else {
++		if (!ovr) {
++			tcf_hash_release(pc, bind, &connmark_hash_info);
++			return -EEXIST;
++		}
++	}
++
++	return ret;
++}
++
++static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)
++{
++	if (a->priv)
++		return tcf_hash_release(a->priv, bind, &connmark_hash_info);
++	return 0;
++}
++
++static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
++				int bind, int ref)
++{
++	return skb->len;
++}
++
++static struct tc_action_ops act_connmark_ops = {
++	.kind		=	"connmark",
++	.hinfo		=	&connmark_hash_info,
++	.type		=	TCA_ACT_CONNMARK,
++	.owner		=	THIS_MODULE,
++	.act		=	tcf_connmark,
++	.dump		=	tcf_connmark_dump,
++	.cleanup	=	tcf_connmark_cleanup,
++	.init		=	tcf_connmark_init,
++};
++
++MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_DESCRIPTION("Connection tracking mark restoring");
++MODULE_LICENSE("GPL");
++
++static int __init connmark_init_module(void)
++{
++	int ret;
++
++	ret = tcf_hashinfo_init(&connmark_hash_info, CONNMARK_TAB_MASK);
++	if (ret)
++		return ret;
++
++	return tcf_register_action(&act_connmark_ops);
++}
++
++static void __exit connmark_cleanup_module(void)
++{
++	tcf_unregister_action(&act_connmark_ops);
++}
++
++module_init(connmark_init_module);
++module_exit(connmark_cleanup_module);
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -717,6 +717,19 @@ config NET_ACT_CSUM
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called act_csum.
+ 
++config NET_ACT_CONNMARK
++        tristate "Connection Tracking Marking"
++        depends on NET_CLS_ACT
++        depends on NF_CONNTRACK
++	 depends on NF_CONNTRACK_MARK
++        ---help---
++	  Say Y here to restore the connmark from a scheduler action
++
++	  If unsure, say N.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called act_connmark.
++
+ config NET_CLS_IND
+ 	bool "Incoming device classification"
+ 	depends on NET_CLS_U32 || NET_CLS_FW
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit
+ obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+ obj-$(CONFIG_NET_ACT_SKBEDIT)	+= act_skbedit.o
+ obj-$(CONFIG_NET_ACT_CSUM)	+= act_csum.o
++obj-$(CONFIG_NET_ACT_CONNMARK)	+= act_connmark.o
+ obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
+ obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
+ obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
diff --git a/trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch b/trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch
new file mode 100644
index 00000000..5c028fb4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch
@@ -0,0 +1,134 @@
+This patch allows the user to specify desired packet types (outgoing,
+broadcast, unicast, etc.) on packet sockets via setsockopt.
+This can reduce the load in situations where only a limited number
+of packet types are necessary
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/include/uapi/linux/if_packet.h
++++ b/include/uapi/linux/if_packet.h
+@@ -31,6 +31,8 @@ struct sockaddr_ll {
+ #define PACKET_KERNEL		7		/* To kernel space	*/
+ /* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */
+ #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
++#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
++
+ 
+ /* Packet socket options */
+ 
+@@ -54,6 +56,7 @@ struct sockaddr_ll {
+ #define PACKET_FANOUT			18
+ #define PACKET_TX_HAS_OFF		19
+ #define PACKET_QDISC_BYPASS		20
++#define PACKET_RECV_TYPE		21
+ 
+ #define PACKET_FANOUT_HASH		0
+ #define PACKET_FANOUT_LB		1
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -1540,6 +1540,7 @@ static int packet_rcv_spkt(struct sk_buf
+ {
+ 	struct sock *sk;
+ 	struct sockaddr_pkt *spkt;
++	struct packet_sock *po;
+ 
+ 	/*
+ 	 *	When we registered the protocol we saved the socket in the data
+@@ -1547,6 +1548,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 */
+ 
+ 	sk = pt->af_packet_priv;
++	po = pkt_sk(sk);
+ 
+ 	/*
+ 	 *	Yank back the headers [hope the device set this
+@@ -1559,7 +1561,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 *	so that this procedure is noop.
+ 	 */
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
+ 		goto out;
+ 
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+@@ -1766,12 +1768,12 @@ static int packet_rcv(struct sk_buff *sk
+ 	int skb_len = skb->len;
+ 	unsigned int snaplen, res;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -1891,12 +1893,12 @@ static int tpacket_rcv(struct sk_buff *s
+ 	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
+ 	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -2823,6 +2825,7 @@ static int packet_create(struct net *net
+ 	spin_lock_init(&po->bind_lock);
+ 	mutex_init(&po->pg_vec_lock);
+ 	po->prot_hook.func = packet_rcv;
++	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
+ 
+ 	if (sock->type == SOCK_PACKET)
+ 		po->prot_hook.func = packet_rcv_spkt;
+@@ -3405,6 +3408,16 @@ packet_setsockopt(struct socket *sock, i
+ 		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
+ 		return 0;
+ 	}
++        case PACKET_RECV_TYPE:
++        {
++                unsigned int val;
++                if (optlen != sizeof(val))
++                        return -EINVAL;
++                if (copy_from_user(&val, optval, sizeof(val)))
++                        return -EFAULT;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
++                return 0;
++        }
+ 	default:
+ 		return -ENOPROTOOPT;
+ 	}
+@@ -3456,6 +3469,13 @@ static int packet_getsockopt(struct sock
+ 	case PACKET_VNET_HDR:
+ 		val = po->has_vnet_hdr;
+ 		break;
++	case PACKET_RECV_TYPE:
++		if (len > sizeof(unsigned int))
++			len = sizeof(unsigned int);
++		val = po->pkt_type;
++
++		data = &val;
++		break;
+ 	case PACKET_VERSION:
+ 		val = po->tp_version;
+ 		break;
+--- a/net/packet/internal.h
++++ b/net/packet/internal.h
+@@ -117,6 +117,7 @@ struct packet_sock {
+ 	struct net_device __rcu	*cached_dev;
+ 	int			(*xmit)(struct sk_buff *skb);
+ 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
++	unsigned int		pkt_type;
+ };
+ 
+ static struct packet_sock *pkt_sk(struct sock *sk)
diff --git a/trunk/target/linux/generic/patches-3.14/640-bridge_no_eap_forward.patch b/trunk/target/linux/generic/patches-3.14/640-bridge_no_eap_forward.patch
new file mode 100644
index 00000000..acbf1e20
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/640-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -97,7 +97,11 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 	dst = NULL;
+ 
+-	if (is_broadcast_ether_addr(dest)) {
++	if (skb->protocol == htons(ETH_P_PAE)) {
++		skb2 = skb;
++		/* Do not forward 802.1x/EAP frames */
++
++	} else if (is_broadcast_ether_addr(dest)) {
+ 		skb2 = skb;
+ 		unicast = false;
+ 	} else if (is_multicast_ether_addr(dest)) {
diff --git a/trunk/target/linux/generic/patches-3.14/641-bridge_always_accept_eap.patch b/trunk/target/linux/generic/patches-3.14/641-bridge_always_accept_eap.patch
new file mode 100644
index 00000000..d20773a4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/641-bridge_always_accept_eap.patch
@@ -0,0 +1,11 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -84,7 +84,7 @@ int br_handle_frame_finish(struct sk_buf
+ 	    br_multicast_rcv(br, p, skb, vid))
+ 		goto drop;
+ 
+-	if (p->state == BR_STATE_LEARNING)
++	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
+ 		goto drop;
+ 
+ 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
diff --git a/trunk/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch b/trunk/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch
new file mode 100644
index 00000000..f3874358
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch
@@ -0,0 +1,102 @@
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -174,6 +174,7 @@ struct net_bridge_port
+ #define BR_ADMIN_COST		0x00000010
+ #define BR_LEARNING		0x00000020
+ #define BR_FLOOD		0x00000040
++#define BR_ISOLATE_MODE	0x00000080
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	struct bridge_mcast_query	ip4_query;
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -161,6 +161,22 @@ BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLO
+ BRPORT_ATTR_FLAG(learning, BR_LEARNING);
+ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD);
+ 
++static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
++{
++	int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
++	return sprintf(buf, "%d\n", isolate_mode);
++}
++static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
++{
++	if (v)
++		p->flags |= BR_ISOLATE_MODE;
++	else
++		p->flags &= ~BR_ISOLATE_MODE;
++	return 0;
++}
++static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
++		   show_isolate_mode, store_isolate_mode);
++
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+ {
+@@ -203,6 +219,7 @@ static const struct brport_attribute *br
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
+ #endif
++	&brport_attr_isolate_mode,
+ 	NULL
+ };
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -120,8 +120,8 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 		unicast = false;
+ 		br->dev->stats.multicast++;
+-	} else if ((dst = __br_fdb_get(br, dest, vid)) &&
+-			dst->is_local) {
++	} else if ((p->flags & BR_ISOLATE_MODE) ||
++		   ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local)) {
+ 		skb2 = skb;
+ 		/* Do not forward the packet since it's local. */
+ 		skb = NULL;
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -119,7 +119,7 @@ void br_deliver(const struct net_bridge_
+ /* called with rcu_read_lock */
+ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
+ {
+-	if (should_deliver(to, skb)) {
++	if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
+ 		if (skb0)
+ 			deliver_clone(to, skb, __br_forward);
+ 		else
+@@ -175,7 +175,7 @@ static void br_flood(struct net_bridge *
+ 		     struct sk_buff *skb0,
+ 		     void (*__packet_hook)(const struct net_bridge_port *p,
+ 					   struct sk_buff *skb),
+-		     bool unicast)
++		     				bool unicast, bool forward)
+ {
+ 	struct net_bridge_port *p;
+ 	struct net_bridge_port *prev;
+@@ -183,6 +183,8 @@ static void br_flood(struct net_bridge *
+ 	prev = NULL;
+ 
+ 	list_for_each_entry_rcu(p, &br->port_list, list) {
++		if (forward && (p->flags & BR_ISOLATE_MODE))
++			continue;
+ 		/* Do not flood unicast traffic to ports that turn it off */
+ 		if (unicast && !(p->flags & BR_FLOOD))
+ 			continue;
+@@ -209,14 +211,14 @@ out:
+ /* called with rcu_read_lock */
+ void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast)
+ {
+-	br_flood(br, skb, NULL, __br_deliver, unicast);
++	br_flood(br, skb, NULL, __br_deliver, unicast, false);
+ }
+ 
+ /* called under bridge lock */
+ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
+ 		      struct sk_buff *skb2, bool unicast)
+ {
+-	br_flood(br, skb, skb2, __br_forward, unicast);
++	br_flood(br, skb, skb2, __br_forward, unicast, true);
+ }
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
diff --git a/trunk/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch b/trunk/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
new file mode 100644
index 00000000..e5f4eff5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
@@ -0,0 +1,107 @@
+--- a/include/net/addrconf.h
++++ b/include/net/addrconf.h
+@@ -88,6 +88,12 @@ int ipv6_rcv_saddr_equal(const struct so
+ void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr);
+ void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr);
+ 
++extern int			(*ipv6_dev_get_saddr_hook)(struct net *net,
++						const struct net_device *dev,
++						const struct in6_addr *daddr,
++						unsigned int prefs,
++						struct in6_addr *saddr);
++
+ static inline unsigned long addrconf_timeout_fixup(u32 timeout,
+ 						   unsigned int unit)
+ {
+--- a/net/bridge/Kconfig
++++ b/net/bridge/Kconfig
+@@ -6,7 +6,6 @@ config BRIDGE
+ 	tristate "802.1d Ethernet Bridging"
+ 	select LLC
+ 	select STP
+-	depends on IPV6 || IPV6=n
+ 	---help---
+ 	  If you say Y here, then your Linux box will be able to act as an
+ 	  Ethernet bridge, which means that the different Ethernet segments it
+--- a/net/ipv6/Makefile
++++ b/net/ipv6/Makefile
+@@ -45,3 +45,4 @@ obj-y += addrconf_core.o exthdrs_core.o 
+ obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
+ 
+ obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
++obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1311,7 +1311,7 @@ out:
+ 	return ret;
+ }
+ 
+-int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++static int __ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+ 		       struct in6_addr *saddr)
+ {
+@@ -1436,7 +1436,6 @@ try_nextdev:
+ 	in6_ifa_put(hiscore->ifa);
+ 	return 0;
+ }
+-EXPORT_SYMBOL(ipv6_dev_get_saddr);
+ 
+ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
+ 		      u32 banned_flags)
+@@ -5380,6 +5379,9 @@ int __init addrconf_init(void)
+ 
+ 	ipv6_addr_label_rtnl_register();
+ 
++	BUG_ON(ipv6_dev_get_saddr_hook != NULL);
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, __ipv6_dev_get_saddr);
++
+ 	return 0;
+ errout:
+ 	rtnl_af_unregister(&inet6_ops);
+@@ -5399,6 +5401,9 @@ void addrconf_cleanup(void)
+ 	struct net_device *dev;
+ 	int i;
+ 
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, NULL);
++	synchronize_rcu();
++
+ 	unregister_netdevice_notifier(&ipv6_dev_notf);
+ 	unregister_pernet_subsys(&addrconf_ops);
+ 	ipv6_addr_label_cleanup();
+--- /dev/null
++++ b/net/ipv6/inet6_stubs.c
+@@ -0,0 +1,33 @@
++/*
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ */
++#include <linux/export.h>
++#include <net/ipv6.h>
++
++int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr);
++
++EXPORT_SYMBOL(ipv6_dev_get_saddr_hook);
++
++int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr)
++{
++	int ret = -EADDRNOTAVAIL;
++	typeof(ipv6_dev_get_saddr_hook) dev_get_saddr;
++
++	rcu_read_lock();
++	dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook);
++
++	if (dev_get_saddr)
++		ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr);
++
++	rcu_read_unlock();
++	return ret;
++}
++EXPORT_SYMBOL(ipv6_dev_get_saddr);
++
diff --git a/trunk/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch b/trunk/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
new file mode 100644
index 00000000..6948fcf6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
@@ -0,0 +1,155 @@
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -57,7 +57,7 @@ int br_dev_queue_push_xmit(struct sk_buf
+ 
+ int br_forward_finish(struct sk_buff *skb)
+ {
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ 		       br_dev_queue_push_xmit);
+ 
+ }
+@@ -80,7 +80,7 @@ static void __br_deliver(const struct ne
+ 		return;
+ 	}
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+@@ -101,7 +101,7 @@ static void __br_forward(const struct ne
+ 	skb->dev = to->dev;
+ 	skb_forward_csum(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -53,7 +53,7 @@ static int br_pass_frame_up(struct sk_bu
+ 	if (!skb)
+ 		return NET_RX_DROP;
+ 
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+ 		       netif_receive_skb);
+ }
+ 
+@@ -214,7 +214,7 @@ rx_handler_result_t br_handle_frame(stru
+ 		}
+ 
+ 		/* Deliver packet to local host only */
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+ 			    NULL, br_handle_local_finish)) {
+ 			return RX_HANDLER_CONSUMED; /* consumed by filter */
+ 		} else {
+@@ -229,7 +229,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_local_finish))
+ 			break;
+ 
+@@ -251,7 +251,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_frame_finish);
+ 		break;
+ 	default:
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -802,7 +802,7 @@ static void __br_multicast_send_query(st
+ 	if (port) {
+ 		__skb_push(skb, sizeof(struct ethhdr));
+ 		skb->dev = port->dev;
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 			dev_queue_xmit);
+ 	} else
+ 		netif_rx(skb);
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -73,6 +73,15 @@ static int brnf_pass_vlan_indev __read_m
+ #define IS_ARP(skb) \
+ 	(!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
+ 
++int brnf_call_ebtables __read_mostly = 0;
++EXPORT_SYMBOL_GPL(brnf_call_ebtables);
++
++bool br_netfilter_run_hooks(void)
++{
++	return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables |
++	       brnf_call_ebtables;
++}
++
+ static inline __be16 vlan_proto(const struct sk_buff *skb)
+ {
+ 	if (vlan_tx_tag_present(skb))
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -727,15 +727,29 @@ static inline u16 br_get_pvid(const stru
+ 
+ /* br_netfilter.c */
+ #ifdef CONFIG_BRIDGE_NETFILTER
++extern int brnf_call_ebtables;
+ int br_netfilter_init(void);
+ void br_netfilter_fini(void);
+ void br_netfilter_rtable_init(struct net_bridge *);
++bool br_netfilter_run_hooks(void);
+ #else
+ #define br_netfilter_init()	(0)
+ #define br_netfilter_fini()	do { } while (0)
+ #define br_netfilter_rtable_init(x)
++#define br_netfilter_run_hooks()	false
+ #endif
+ 
++static inline int
++BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
++	struct net_device *in, struct net_device *out,
++	int (*okfn)(struct sk_buff *))
++{
++	if (!br_netfilter_run_hooks())
++		return okfn(skb);
++
++	return NF_HOOK(pf, hook, skb, in, out, okfn);
++}
++
+ /* br_stp.c */
+ void br_log_state(const struct net_bridge_port *p);
+ struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no);
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid
+ 
+ 	skb_reset_mac_header(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		dev_queue_xmit);
+ }
+ 
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -2405,11 +2405,13 @@ static int __init ebtables_init(void)
+ 	}
+ 
+ 	printk(KERN_INFO "Ebtables v2.0 registered\n");
++	brnf_call_ebtables = 1;
+ 	return 0;
+ }
+ 
+ static void __exit ebtables_fini(void)
+ {
++	brnf_call_ebtables = 0;
+ 	nf_unregister_sockopt(&ebt_sockopts);
+ 	xt_unregister_target(&ebt_standard_target);
+ 	printk(KERN_INFO "Ebtables v2.0 unregistered\n");
diff --git a/trunk/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch b/trunk/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch
new file mode 100644
index 00000000..4e63e9ad
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/645-bridge_multicast_to_unicast.patch
@@ -0,0 +1,375 @@
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -634,7 +634,8 @@ struct net_bridge_port_group *br_multica
+ 			struct net_bridge_port *port,
+ 			struct br_ip *group,
+ 			struct net_bridge_port_group __rcu *next,
+-			unsigned char state)
++			unsigned char state,
++			const unsigned char *src)
+ {
+ 	struct net_bridge_port_group *p;
+ 
+@@ -649,12 +650,33 @@ struct net_bridge_port_group *br_multica
+ 	hlist_add_head(&p->mglist, &port->mglist);
+ 	setup_timer(&p->timer, br_multicast_port_group_expired,
+ 		    (unsigned long)p);
++	if ((port->flags & BR_MULTICAST_TO_UCAST) && src) {
++		memcpy(p->eth_addr, src, ETH_ALEN);
++		p->unicast = true;
++	}
+ 	return p;
+ }
+ 
++static bool br_port_group_equal(struct net_bridge_port_group *p,
++				struct net_bridge_port *port,
++				const unsigned char *src)
++{
++	if (p->port != port)
++		return false;
++
++	if (!p->unicast)
++		return true;
++
++	if (!src)
++		return false;
++
++	return ether_addr_equal(src, p->eth_addr);
++}
++
+ static int br_multicast_add_group(struct net_bridge *br,
+ 				  struct net_bridge_port *port,
+-				  struct br_ip *group)
++				  struct br_ip *group,
++				  const unsigned char *src)
+ {
+ 	struct net_bridge_mdb_entry *mp;
+ 	struct net_bridge_port_group *p;
+@@ -681,13 +703,13 @@ static int br_multicast_add_group(struct
+ 	for (pp = &mp->ports;
+ 	     (p = mlock_dereference(*pp, br)) != NULL;
+ 	     pp = &p->next) {
+-		if (p->port == port)
++		if (br_port_group_equal(p, port, src))
+ 			goto found;
+ 		if ((unsigned long)p->port < (unsigned long)port)
+ 			break;
+ 	}
+ 
+-	p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);
++	p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY, src);
+ 	if (unlikely(!p))
+ 		goto err;
+ 	rcu_assign_pointer(*pp, p);
+@@ -706,7 +728,7 @@ err:
+ static int br_ip4_multicast_add_group(struct net_bridge *br,
+ 				      struct net_bridge_port *port,
+ 				      __be32 group,
+-				      __u16 vid)
++				      __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 
+@@ -717,14 +739,14 @@ static int br_ip4_multicast_add_group(st
+ 	br_group.proto = htons(ETH_P_IP);
+ 	br_group.vid = vid;
+ 
+-	return br_multicast_add_group(br, port, &br_group);
++	return br_multicast_add_group(br, port, &br_group, src);
+ }
+ 
+ #if IS_ENABLED(CONFIG_IPV6)
+ static int br_ip6_multicast_add_group(struct net_bridge *br,
+ 				      struct net_bridge_port *port,
+ 				      const struct in6_addr *group,
+-				      __u16 vid)
++				      __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 
+@@ -735,7 +757,7 @@ static int br_ip6_multicast_add_group(st
+ 	br_group.proto = htons(ETH_P_IPV6);
+ 	br_group.vid = vid;
+ 
+-	return br_multicast_add_group(br, port, &br_group);
++	return br_multicast_add_group(br, port, &br_group, src);
+ }
+ #endif
+ 
+@@ -950,6 +972,7 @@ static int br_ip4_multicast_igmp3_report
+ 					 struct sk_buff *skb,
+ 					 u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct igmpv3_report *ih;
+ 	struct igmpv3_grec *grec;
+ 	int i;
+@@ -993,7 +1016,7 @@ static int br_ip4_multicast_igmp3_report
+ 			continue;
+ 		}
+ 
+-		err = br_ip4_multicast_add_group(br, port, group, vid);
++		err = br_ip4_multicast_add_group(br, port, group, vid, src);
+ 		if (err)
+ 			break;
+ 	}
+@@ -1007,6 +1030,7 @@ static int br_ip6_multicast_mld2_report(
+ 					struct sk_buff *skb,
+ 					u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct icmp6hdr *icmp6h;
+ 	struct mld2_grec *grec;
+ 	int i;
+@@ -1055,7 +1079,7 @@ static int br_ip6_multicast_mld2_report(
+ 		}
+ 
+ 		err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
+-						 vid);
++						 vid, src);
+ 		if (!err)
+ 			break;
+ 	}
+@@ -1319,7 +1343,8 @@ static void br_multicast_leave_group(str
+ 				     struct net_bridge_port *port,
+ 				     struct br_ip *group,
+ 				     struct bridge_mcast_querier *querier,
+-				     struct bridge_mcast_query *query)
++				     struct bridge_mcast_query *query,
++				     const unsigned char *src)
+ {
+ 	struct net_bridge_mdb_htable *mdb;
+ 	struct net_bridge_mdb_entry *mp;
+@@ -1369,7 +1394,7 @@ static void br_multicast_leave_group(str
+ 		for (pp = &mp->ports;
+ 		     (p = mlock_dereference(*pp, br)) != NULL;
+ 		     pp = &p->next) {
+-			if (p->port != port)
++			if (!br_port_group_equal(p, port, src))
+ 				continue;
+ 
+ 			rcu_assign_pointer(*pp, p->next);
+@@ -1403,7 +1428,7 @@ static void br_multicast_leave_group(str
+ 	for (p = mlock_dereference(mp->ports, br);
+ 	     p != NULL;
+ 	     p = mlock_dereference(p->next, br)) {
+-		if (p->port != port)
++		if (!br_port_group_equal(p, port, src))
+ 			continue;
+ 
+ 		if (!hlist_unhashed(&p->mglist) &&
+@@ -1421,8 +1446,8 @@ out:
+ 
+ static void br_ip4_multicast_leave_group(struct net_bridge *br,
+ 					 struct net_bridge_port *port,
+-					 __be32 group,
+-					 __u16 vid)
++					 __be32 group, __u16 vid,
++					 const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 	struct bridge_mcast_query *query = port ? &port->ip4_query :
+@@ -1435,14 +1460,15 @@ static void br_ip4_multicast_leave_group
+ 	br_group.proto = htons(ETH_P_IP);
+ 	br_group.vid = vid;
+ 
+-	br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query);
++	br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query,
++				 src);
+ }
+ 
+ #if IS_ENABLED(CONFIG_IPV6)
+ static void br_ip6_multicast_leave_group(struct net_bridge *br,
+ 					 struct net_bridge_port *port,
+ 					 const struct in6_addr *group,
+-					 __u16 vid)
++					 __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 	struct bridge_mcast_query *query = port ? &port->ip6_query :
+@@ -1456,7 +1482,8 @@ static void br_ip6_multicast_leave_group
+ 	br_group.proto = htons(ETH_P_IPV6);
+ 	br_group.vid = vid;
+ 
+-	br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query);
++	br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query,
++				 src);
+ }
+ #endif
+ 
+@@ -1465,6 +1492,7 @@ static int br_multicast_ipv4_rcv(struct 
+ 				 struct sk_buff *skb,
+ 				 u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct sk_buff *skb2 = skb;
+ 	const struct iphdr *iph;
+ 	struct igmphdr *ih;
+@@ -1538,7 +1566,7 @@ static int br_multicast_ipv4_rcv(struct 
+ 	case IGMP_HOST_MEMBERSHIP_REPORT:
+ 	case IGMPV2_HOST_MEMBERSHIP_REPORT:
+ 		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
+-		err = br_ip4_multicast_add_group(br, port, ih->group, vid);
++		err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
+ 		break;
+ 	case IGMPV3_HOST_MEMBERSHIP_REPORT:
+ 		err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
+@@ -1547,7 +1575,7 @@ static int br_multicast_ipv4_rcv(struct 
+ 		err = br_ip4_multicast_query(br, port, skb2, vid);
+ 		break;
+ 	case IGMP_HOST_LEAVE_MESSAGE:
+-		br_ip4_multicast_leave_group(br, port, ih->group, vid);
++		br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
+ 		break;
+ 	}
+ 
+@@ -1565,6 +1593,7 @@ static int br_multicast_ipv6_rcv(struct 
+ 				 struct sk_buff *skb,
+ 				 u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct sk_buff *skb2;
+ 	const struct ipv6hdr *ip6h;
+ 	u8 icmp6_type;
+@@ -1674,7 +1703,8 @@ static int br_multicast_ipv6_rcv(struct 
+ 		}
+ 		mld = (struct mld_msg *)skb_transport_header(skb2);
+ 		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
+-		err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
++		err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
++						 src);
+ 		break;
+ 	    }
+ 	case ICMPV6_MLD2_REPORT:
+@@ -1691,7 +1721,7 @@ static int br_multicast_ipv6_rcv(struct 
+ 			goto out;
+ 		}
+ 		mld = (struct mld_msg *)skb_transport_header(skb2);
+-		br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
++		br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
+ 	    }
+ 	}
+ 
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -116,6 +116,9 @@ struct net_bridge_port_group {
+ 	struct timer_list		timer;
+ 	struct br_ip			addr;
+ 	unsigned char			state;
++
++	unsigned char			eth_addr[ETH_ALEN];
++	bool				unicast;
+ };
+ 
+ struct net_bridge_mdb_entry
+@@ -175,6 +178,7 @@ struct net_bridge_port
+ #define BR_LEARNING		0x00000020
+ #define BR_FLOOD		0x00000040
+ #define BR_ISOLATE_MODE	0x00000080
++#define BR_MULTICAST_TO_UCAST	0x00000100
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	struct bridge_mcast_query	ip4_query;
+@@ -471,7 +475,8 @@ void br_multicast_free_pg(struct rcu_hea
+ struct net_bridge_port_group *
+ br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
+ 			    struct net_bridge_port_group __rcu *next,
+-			    unsigned char state);
++			    unsigned char state,
++		       const unsigned char *src);
+ void br_mdb_init(void);
+ void br_mdb_uninit(void);
+ void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
+--- a/net/bridge/br_mdb.c
++++ b/net/bridge/br_mdb.c
+@@ -342,7 +342,7 @@ static int br_mdb_add_group(struct net_b
+ 			break;
+ 	}
+ 
+-	p = br_multicast_new_port_group(port, group, *pp, state);
++	p = br_multicast_new_port_group(port, group, *pp, state, NULL);
+ 	if (unlikely(!p))
+ 		return -ENOMEM;
+ 	rcu_assign_pointer(*pp, p);
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -170,6 +170,29 @@ out:
+ 	return p;
+ }
+ 
++static struct net_bridge_port *maybe_deliver_addr(
++	struct net_bridge_port *prev, struct net_bridge_port *p,
++	struct sk_buff *skb, const unsigned char *addr,
++	void (*__packet_hook)(const struct net_bridge_port *p,
++			      struct sk_buff *skb))
++{
++	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
++
++	if (!should_deliver(p, skb))
++		return prev;
++
++	skb = skb_copy(skb, GFP_ATOMIC);
++	if (!skb) {
++		dev->stats.tx_dropped++;
++		return prev;
++	}
++
++	memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
++	__packet_hook(p, skb);
++
++	return prev;
++}
++
+ /* called under bridge lock */
+ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 		     struct sk_buff *skb0,
+@@ -234,6 +257,7 @@ static void br_multicast_flood(struct ne
+ 	struct net_bridge_port *prev = NULL;
+ 	struct net_bridge_port_group *p;
+ 	struct hlist_node *rp;
++	const unsigned char *addr;
+ 
+ 	rp = rcu_dereference(hlist_first_rcu(&br->router_list));
+ 	p = mdst ? rcu_dereference(mdst->ports) : NULL;
+@@ -244,10 +268,19 @@ static void br_multicast_flood(struct ne
+ 		rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
+ 			     NULL;
+ 
+-		port = (unsigned long)lport > (unsigned long)rport ?
+-		       lport : rport;
+-
+-		prev = maybe_deliver(prev, port, skb, __packet_hook);
++		if ((unsigned long)lport > (unsigned long)rport) {
++			port = lport;
++			addr = p->unicast ? p->eth_addr : NULL;
++		} else {
++			port = rport;
++			addr = NULL;
++		}
++
++		if (addr)
++			prev = maybe_deliver_addr(prev, port, skb, addr,
++						  __packet_hook);
++		else
++			prev = maybe_deliver(prev, port, skb, __packet_hook);
+ 		if (IS_ERR(prev))
+ 			goto out;
+ 
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -192,6 +192,7 @@ static BRPORT_ATTR(multicast_router, S_I
+ 		   store_multicast_router);
+ 
+ BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
++BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
+ #endif
+ 
+ static const struct brport_attribute *brport_attrs[] = {
+@@ -218,6 +219,7 @@ static const struct brport_attribute *br
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
++	&brport_attr_multicast_to_unicast,
+ #endif
+ 	&brport_attr_isolate_mode,
+ 	NULL
diff --git a/trunk/target/linux/generic/patches-3.14/650-pppoe_header_pad.patch b/trunk/target/linux/generic/patches-3.14/650-pppoe_header_pad.patch
new file mode 100644
index 00000000..a89a9f3b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/ppp/pppoe.c
++++ b/drivers/net/ppp/pppoe.c
+@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 		goto end;
+ 
+ 
+-	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
++	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
+ 			   0, GFP_KERNEL);
+ 	if (!skb) {
+ 		error = -ENOMEM;
+@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 	}
+ 
+ 	/* Reserve space for headers. */
+-	skb_reserve(skb, dev->hard_header_len);
++	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
+ 	skb_reset_network_header(skb);
+ 
+ 	skb->dev = dev;
diff --git a/trunk/target/linux/generic/patches-3.14/651-wireless_mesh_header.patch b/trunk/target/linux/generic/patches-3.14/651-wireless_mesh_header.patch
new file mode 100644
index 00000000..d2d40f53
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/651-wireless_mesh_header.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -139,7 +139,7 @@ static inline bool dev_xmit_complete(int
+  */
+ 
+ #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ #  define LL_MAX_HEADER 128
+ # else
+ #  define LL_MAX_HEADER 96
diff --git a/trunk/target/linux/generic/patches-3.14/652-atm_header_changes.patch b/trunk/target/linux/generic/patches-3.14/652-atm_header_changes.patch
new file mode 100644
index 00000000..7e568592
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/652-atm_header_changes.patch
@@ -0,0 +1,12 @@
+--- a/include/uapi/linux/atm.h
++++ b/include/uapi/linux/atm.h
+@@ -139,6 +139,9 @@ struct atm_trafprm {
+ 	int		min_pcr;	/* minimum PCR in cells per second */
+ 	int		max_cdv;	/* maximum CDV in microseconds */
+ 	int		max_sdu;	/* maximum SDU in bytes */
++	int		scr;		/* sustained rate in cells per second */
++	int		mbs;		/* maximum burst size (MBS) in cells */
++	int		cdv;		/* Cell delay varition */
+         /* extra params for ABR */
+         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
+         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/trunk/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch b/trunk/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch
new file mode 100644
index 00000000..ffde041f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch
@@ -0,0 +1,30 @@
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -1740,27 +1740,7 @@ void netlink_detachskb(struct sock *sk, 
+ 
+ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
+ {
+-	int delta;
+-
+ 	WARN_ON(skb->sk != NULL);
+-	if (netlink_skb_is_mmaped(skb))
+-		return skb;
+-
+-	delta = skb->end - skb->tail;
+-	if (is_vmalloc_addr(skb->head) || delta * 2 < skb->truesize)
+-		return skb;
+-
+-	if (skb_shared(skb)) {
+-		struct sk_buff *nskb = skb_clone(skb, allocation);
+-		if (!nskb)
+-			return skb;
+-		consume_skb(skb);
+-		skb = nskb;
+-	}
+-
+-	if (!pskb_expand_head(skb, 0, -delta, allocation))
+-		skb->truesize -= delta;
+-
+ 	return skb;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/655-increase_skb_pad.patch b/trunk/target/linux/generic/patches-3.14/655-increase_skb_pad.patch
new file mode 100644
index 00000000..d252754f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/655-increase_skb_pad.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1828,7 +1828,7 @@ static inline int pskb_network_may_pull(
+  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
+  */
+ #ifndef NET_SKB_PAD
+-#define NET_SKB_PAD	max(32, L1_CACHE_BYTES)
++#define NET_SKB_PAD	max(64, L1_CACHE_BYTES)
+ #endif
+ 
+ int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/trunk/target/linux/generic/patches-3.14/656-skb_reduce_truesize-helper.patch b/trunk/target/linux/generic/patches-3.14/656-skb_reduce_truesize-helper.patch
new file mode 100644
index 00000000..2c78ef8b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/656-skb_reduce_truesize-helper.patch
@@ -0,0 +1,41 @@
+From 4593a806e31119c5bd3faa00c7210ad862d515af Mon Sep 17 00:00:00 2001
+From: Dave Taht <dave.taht@bufferbloat.net>
+Date: Mon, 31 Dec 2012 10:02:21 -0800
+Subject: [PATCH 3/7] skb_reduce_truesize: helper function for shrinking skbs
+ whenever needed
+
+On embedded devices in particular, large queues of small packets from the rx
+path with a large truesize can exist. Reducing their size can reduce
+memory pressure. skb_reduce_truesize is a helper function for doing this,
+when needed.
+---
+ include/linux/skbuff.h |   18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1873,6 +1873,24 @@ static inline void pskb_trim_unique(stru
+ 	BUG_ON(err);
+ }
+ 
++/*
++ * Caller wants to reduce memory needs before queueing skb
++ * The (expensive) copy should not be be done in fast path.
++ */
++static inline struct sk_buff *skb_reduce_truesize(struct sk_buff *skb)
++{
++	if (skb->truesize > 2 * SKB_TRUESIZE(skb->len)) {
++		struct sk_buff *nskb;
++		nskb = skb_copy_expand(skb, skb_headroom(skb), 0,
++			GFP_ATOMIC | __GFP_NOWARN);
++		if (nskb) {
++			__kfree_skb(skb);
++			skb = nskb;
++		}
++	}
++	return skb;
++}
++
+ /**
+  *	skb_orphan - orphan a buffer
+  *	@skb: buffer to orphan
diff --git a/trunk/target/linux/generic/patches-3.14/657-qdisc_reduce_truesize.patch b/trunk/target/linux/generic/patches-3.14/657-qdisc_reduce_truesize.patch
new file mode 100644
index 00000000..e27d0a04
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/657-qdisc_reduce_truesize.patch
@@ -0,0 +1,63 @@
+From bc9fec2f87d57bdbff30d296605e24504513f65c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dave=20T=C3=A4ht?= <dave.taht@bufferbloat.net>
+Date: Mon, 17 Sep 2012 19:20:22 -0700
+Subject: [PATCH 4/7] net: add skb_reduce_truesize support to common qdiscs
+
+Reduce skb size under load when queues begin to fill on the
+commont qdiscs.
+---
+ net/sched/sch_codel.c    |    2 ++
+ net/sched/sch_fifo.c     |   12 ++++++++----
+ net/sched/sch_fq_codel.c |    2 ++
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+--- a/net/sched/sch_codel.c
++++ b/net/sched/sch_codel.c
+@@ -96,6 +96,8 @@ static int codel_qdisc_enqueue(struct sk
+ 	struct codel_sched_data *q;
+ 
+ 	if (likely(qdisc_qlen(sch) < sch->limit)) {
++		if(qdisc_qlen(sch) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		codel_set_enqueue_time(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+ 	}
+--- a/net/sched/sch_fifo.c
++++ b/net/sched/sch_fifo.c
+@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff 
+ 
+ static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	return qdisc_reshape_fail(skb, sch);
+ }
+ 
+ static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	/* queue full, remove one skb to fulfill the limit */
+ 	__qdisc_queue_drop_head(sch, &sch->q);
+ 	sch->qstats.drops++;
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -182,6 +182,8 @@ static int fq_codel_enqueue(struct sk_bu
+ 		return ret;
+ 	}
+ 	idx--;
++	if (sch->q.qlen > 128)
++		skb = skb_reduce_truesize(skb);
+ 
+ 	codel_set_enqueue_time(skb);
+ 	flow = &q->flows[idx];
diff --git a/trunk/target/linux/generic/patches-3.14/660-fq_codel_defaults.patch b/trunk/target/linux/generic/patches-3.14/660-fq_codel_defaults.patch
new file mode 100644
index 00000000..96475f05
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/660-fq_codel_defaults.patch
@@ -0,0 +1,14 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -389,9 +389,9 @@ static int fq_codel_init(struct Qdisc *s
+ 	struct fq_codel_sched_data *q = qdisc_priv(sch);
+ 	int i;
+ 
+-	sch->limit = 10*1024;
++	sch->limit = 1024;
+ 	q->flows_cnt = 1024;
+-	q->quantum = psched_mtu(qdisc_dev(sch));
++	q->quantum = 300;
+ 	q->perturbation = prandom_u32();
+ 	INIT_LIST_HEAD(&q->new_flows);
+ 	INIT_LIST_HEAD(&q->old_flows);
diff --git a/trunk/target/linux/generic/patches-3.14/661-fq_codel_keep_dropped_stats.patch b/trunk/target/linux/generic/patches-3.14/661-fq_codel_keep_dropped_stats.patch
new file mode 100644
index 00000000..d51c7e58
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/661-fq_codel_keep_dropped_stats.patch
@@ -0,0 +1,10 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -195,7 +195,6 @@ static int fq_codel_enqueue(struct sk_bu
+ 		list_add_tail(&flow->flowchain, &q->new_flows);
+ 		q->new_flow_count++;
+ 		flow->deficit = q->quantum;
+-		flow->dropped = 0;
+ 	}
+ 	if (++sch->q.qlen <= sch->limit)
+ 		return NET_XMIT_SUCCESS;
diff --git a/trunk/target/linux/generic/patches-3.14/662-use_fq_codel_by_default.patch b/trunk/target/linux/generic/patches-3.14/662-use_fq_codel_by_default.patch
new file mode 100644
index 00000000..fcb0013c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/662-use_fq_codel_by_default.patch
@@ -0,0 +1,75 @@
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -3,8 +3,9 @@
+ # 
+ 
+ menuconfig NET_SCHED
+-	bool "QoS and/or fair queueing"
++	def_bool y
+ 	select NET_SCH_FIFO
++	select NET_SCH_FQ_CODEL
+ 	---help---
+ 	  When the kernel has several packets to send out over a network
+ 	  device, it has to decide which ones to send first, which ones to
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -594,7 +594,7 @@ static const struct Qdisc_class_ops fq_c
+ 	.walk		=	fq_codel_walk,
+ };
+ 
+-static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
++struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
+ 	.cl_ops		=	&fq_codel_class_ops,
+ 	.id		=	"fq_codel",
+ 	.priv_size	=	sizeof(struct fq_codel_sched_data),
+@@ -610,6 +610,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+ 	.dump_stats =	fq_codel_dump_stats,
+ 	.owner		=	THIS_MODULE,
+ };
++EXPORT_SYMBOL(fq_codel_qdisc_ops);
+ 
+ static int __init fq_codel_module_init(void)
+ {
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -316,6 +316,7 @@ extern struct Qdisc noop_qdisc;
+ extern struct Qdisc_ops noop_qdisc_ops;
+ extern struct Qdisc_ops pfifo_fast_ops;
+ extern struct Qdisc_ops mq_qdisc_ops;
++extern struct Qdisc_ops fq_codel_qdisc_ops;
+ extern const struct Qdisc_ops *default_qdisc_ops;
+ 
+ struct Qdisc_class_common {
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -693,7 +693,7 @@ static void attach_one_default_qdisc(str
+ 
+ 	if (dev->tx_queue_len) {
+ 		qdisc = qdisc_create_dflt(dev_queue,
+-					  default_qdisc_ops, TC_H_ROOT);
++					  &fq_codel_qdisc_ops, TC_H_ROOT);
+ 		if (!qdisc) {
+ 			netdev_info(dev, "activation failed\n");
+ 			return;
+--- a/net/sched/sch_mq.c
++++ b/net/sched/sch_mq.c
+@@ -57,7 +57,7 @@ static int mq_init(struct Qdisc *sch, st
+ 
+ 	for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
+ 		dev_queue = netdev_get_tx_queue(dev, ntx);
+-		qdisc = qdisc_create_dflt(dev_queue, default_qdisc_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(ntx + 1)));
+ 		if (qdisc == NULL)
+--- a/net/sched/sch_mqprio.c
++++ b/net/sched/sch_mqprio.c
+@@ -124,7 +124,7 @@ static int mqprio_init(struct Qdisc *sch
+ 
+ 	for (i = 0; i < dev->num_tx_queues; i++) {
+ 		dev_queue = netdev_get_tx_queue(dev, i);
+-		qdisc = qdisc_create_dflt(dev_queue, default_qdisc_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(i + 1)));
+ 		if (qdisc == NULL) {
diff --git a/trunk/target/linux/generic/patches-3.14/663-remove_pfifo_fast.patch b/trunk/target/linux/generic/patches-3.14/663-remove_pfifo_fast.patch
new file mode 100644
index 00000000..3420d3d4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/663-remove_pfifo_fast.patch
@@ -0,0 +1,143 @@
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -401,140 +401,6 @@ static struct Qdisc noqueue_qdisc = {
+ 	.busylock	=	__SPIN_LOCK_UNLOCKED(noqueue_qdisc.busylock),
+ };
+ 
+-
+-static const u8 prio2band[TC_PRIO_MAX + 1] = {
+-	1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
+-};
+-
+-/* 3-band FIFO queue: old style, but should be a bit faster than
+-   generic prio+fifo combination.
+- */
+-
+-#define PFIFO_FAST_BANDS 3
+-
+-/*
+- * Private data for a pfifo_fast scheduler containing:
+- * 	- queues for the three band
+- * 	- bitmap indicating which of the bands contain skbs
+- */
+-struct pfifo_fast_priv {
+-	u32 bitmap;
+-	struct sk_buff_head q[PFIFO_FAST_BANDS];
+-};
+-
+-/*
+- * Convert a bitmap to the first band number where an skb is queued, where:
+- * 	bitmap=0 means there are no skbs on any band.
+- * 	bitmap=1 means there is an skb on band 0.
+- *	bitmap=7 means there are skbs on all 3 bands, etc.
+- */
+-static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
+-
+-static inline struct sk_buff_head *band2list(struct pfifo_fast_priv *priv,
+-					     int band)
+-{
+-	return priv->q + band;
+-}
+-
+-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc)
+-{
+-	if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
+-		int band = prio2band[skb->priority & TC_PRIO_MAX];
+-		struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		priv->bitmap |= (1 << band);
+-		qdisc->q.qlen++;
+-		return __qdisc_enqueue_tail(skb, qdisc, list);
+-	}
+-
+-	return qdisc_drop(skb, qdisc);
+-}
+-
+-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (likely(band >= 0)) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-		struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
+-
+-		qdisc->q.qlen--;
+-		if (skb_queue_empty(list))
+-			priv->bitmap &= ~(1 << band);
+-
+-		return skb;
+-	}
+-
+-	return NULL;
+-}
+-
+-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (band >= 0) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		return skb_peek(list);
+-	}
+-
+-	return NULL;
+-}
+-
+-static void pfifo_fast_reset(struct Qdisc *qdisc)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		__qdisc_reset_queue(qdisc, band2list(priv, prio));
+-
+-	priv->bitmap = 0;
+-	qdisc->qstats.backlog = 0;
+-	qdisc->q.qlen = 0;
+-}
+-
+-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
+-{
+-	struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
+-
+-	memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
+-	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
+-		goto nla_put_failure;
+-	return skb->len;
+-
+-nla_put_failure:
+-	return -1;
+-}
+-
+-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		skb_queue_head_init(band2list(priv, prio));
+-
+-	/* Can by-pass the queue discipline */
+-	qdisc->flags |= TCQ_F_CAN_BYPASS;
+-	return 0;
+-}
+-
+-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
+-	.id		=	"pfifo_fast",
+-	.priv_size	=	sizeof(struct pfifo_fast_priv),
+-	.enqueue	=	pfifo_fast_enqueue,
+-	.dequeue	=	pfifo_fast_dequeue,
+-	.peek		=	pfifo_fast_peek,
+-	.init		=	pfifo_fast_init,
+-	.reset		=	pfifo_fast_reset,
+-	.dump		=	pfifo_fast_dump,
+-	.owner		=	THIS_MODULE,
+-};
+-
+ static struct lock_class_key qdisc_tx_busylock;
+ 
+ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
diff --git a/trunk/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch b/trunk/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch
new file mode 100644
index 00000000..31158c58
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch
@@ -0,0 +1,22 @@
+--- a/net/sched/sch_api.c
++++ b/net/sched/sch_api.c
+@@ -1914,7 +1914,7 @@ static int __init pktsched_init(void)
+ 		return err;
+ 	}
+ 
+-	register_qdisc(&pfifo_fast_ops);
++	register_qdisc(&fq_codel_qdisc_ops);
+ 	register_qdisc(&pfifo_qdisc_ops);
+ 	register_qdisc(&bfifo_qdisc_ops);
+ 	register_qdisc(&pfifo_head_drop_qdisc_ops);
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -31,7 +31,7 @@
+ #include <net/dst.h>
+ 
+ /* Qdisc to use by default */
+-const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
++const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops;
+ EXPORT_SYMBOL(default_qdisc_ops);
+ 
+ /* Main transmission queue. */
diff --git a/trunk/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/trunk/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
new file mode 100644
index 00000000..ab8d9688
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -0,0 +1,481 @@
+From 775d6fe74d1eaec2ba387535b068dde2dc89de9e Mon Sep 17 00:00:00 2001
+From: Steven Barth <steven@midlink.org>
+Date: Thu, 22 May 2014 09:49:05 +0200
+Subject: [PATCH] Add support for MAP-E FMRs (mesh mode)
+
+MAP-E FMRs (draft-ietf-softwire-map-10) are rules for IPv4-communication
+between MAP CEs (mesh mode) without the need to forward such data to a
+border relay. This is similar to how 6rd works but for IPv4 over IPv6.
+
+Signed-off-by: Steven Barth <cyrus@openwrt.org>
+---
+ include/net/ip6_tunnel.h       |  13 ++
+ include/uapi/linux/if_tunnel.h |  13 ++
+ net/ipv6/ip6_tunnel.c          | 276 +++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 291 insertions(+), 11 deletions(-)
+
+--- a/include/net/ip6_tunnel.h
++++ b/include/net/ip6_tunnel.h
+@@ -15,6 +15,18 @@
+ /* determine capability on a per-packet basis */
+ #define IP6_TNL_F_CAP_PER_PACKET 0x40000
+ 
++/* IPv6 tunnel FMR */
++struct __ip6_tnl_fmr {
++	struct __ip6_tnl_fmr *next; /* next fmr in list */
++	struct in6_addr ip6_prefix;
++	struct in_addr ip4_prefix;
++
++	__u8 ip6_prefix_len;
++	__u8 ip4_prefix_len;
++	__u8 ea_len;
++	__u8 offset;
++};
++
+ struct __ip6_tnl_parm {
+ 	char name[IFNAMSIZ];	/* name of tunnel device */
+ 	int link;		/* ifindex of underlying L2 interface */
+@@ -25,6 +37,7 @@ struct __ip6_tnl_parm {
+ 	__u32 flags;		/* tunnel flags */
+ 	struct in6_addr laddr;	/* local tunnel end-point address */
+ 	struct in6_addr raddr;	/* remote tunnel end-point address */
++	struct __ip6_tnl_fmr *fmrs;	/* FMRs */
+ 
+ 	__be16			i_flags;
+ 	__be16			o_flags;
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -53,10 +53,23 @@ enum {
+ 	IFLA_IPTUN_6RD_RELAY_PREFIX,
+ 	IFLA_IPTUN_6RD_PREFIXLEN,
+ 	IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
++	IFLA_IPTUN_FMRS,
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+ 
++enum {
++	IFLA_IPTUN_FMR_UNSPEC,
++	IFLA_IPTUN_FMR_IP6_PREFIX,
++	IFLA_IPTUN_FMR_IP4_PREFIX,
++	IFLA_IPTUN_FMR_IP6_PREFIX_LEN,
++	IFLA_IPTUN_FMR_IP4_PREFIX_LEN,
++	IFLA_IPTUN_FMR_EA_LEN,
++	IFLA_IPTUN_FMR_OFFSET,
++	__IFLA_IPTUN_FMR_MAX,
++};
++#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1)
++
+ /* SIT-mode i_flags */
+ #define	SIT_ISATAP	0x0001
+ 
+--- a/net/ipv6/ip6_tunnel.c
++++ b/net/ipv6/ip6_tunnel.c
+@@ -16,6 +16,8 @@
+  *      as published by the Free Software Foundation; either version
+  *      2 of the License, or (at your option) any later version.
+  *
++ *	Changes:
++ * Steven Barth <cyrus@openwrt.org>:		MAP-E FMR support
+  */
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+@@ -77,11 +79,9 @@ static bool log_ecn_error = true;
+ module_param(log_ecn_error, bool, 0644);
+ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
+ 
+-static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
++static u32 HASH(const struct in6_addr *addr)
+ {
+-	u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2);
+-
+-	return hash_32(hash, HASH_SIZE_SHIFT);
++	return hash_32(ipv6_addr_hash(addr), HASH_SIZE_SHIFT);
+ }
+ 
+ static int ip6_tnl_dev_init(struct net_device *dev);
+@@ -180,15 +180,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store);
+ static struct ip6_tnl *
+ ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
+ {
+-	unsigned int hash = HASH(remote, local);
++	unsigned int hash = HASH(local);
+ 	struct ip6_tnl *t;
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
+-		if (ipv6_addr_equal(local, &t->parms.laddr) &&
+-		    ipv6_addr_equal(remote, &t->parms.raddr) &&
+-		    (t->dev->flags & IFF_UP))
++		if (!ipv6_addr_equal(local, &t->parms.laddr) ||
++				!(t->dev->flags & IFF_UP))
++			continue;
++
++		if (ipv6_addr_equal(remote, &t->parms.raddr))
+ 			return t;
++
++		for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++			if (ipv6_prefix_equal(remote, &fmr->ip6_prefix,
++					fmr->ip6_prefix_len))
++				return t;
++		}
+ 	}
+ 	t = rcu_dereference(ip6n->tnls_wc[0]);
+ 	if (t && (t->dev->flags & IFF_UP))
+@@ -218,7 +227,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
+ 
+ 	if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
+ 		prio = 1;
+-		h = HASH(remote, local);
++		h = HASH(local);
+ 	}
+ 	return &ip6n->tnls[prio][h];
+ }
+@@ -383,6 +392,12 @@ ip6_tnl_dev_uninit(struct net_device *de
+ 	struct net *net = t->net;
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
+ 
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++
+ 	if (dev == ip6n->fb_tnl_dev)
+ 		RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
+ 	else
+@@ -766,6 +781,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+ }
+ EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
+ 
++
++/**
++ * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR
++ *   @dest: destination IPv6 address buffer
++ *   @skb: received socket buffer
++ *   @fmr: MAP FMR
++ *   @xmit: Calculate for xmit or rcv
++ **/
++static void ip4ip6_fmr_calc(struct in6_addr *dest,
++		const struct iphdr *iph, const uint8_t *end,
++		const struct __ip6_tnl_fmr *fmr, bool xmit)
++{
++	int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len);
++	u8 *portp = NULL;
++	bool use_dest_addr;
++	const struct iphdr *dsth = iph;
++
++	if ((u8*)dsth >= end)
++		return;
++
++	/* find significant IP header */
++	if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++		if (ih && ((u8*)&ih[1]) <= end && (
++			ih->type == ICMP_DEST_UNREACH ||
++			ih->type == ICMP_SOURCE_QUENCH ||
++			ih->type == ICMP_TIME_EXCEEDED ||
++			ih->type == ICMP_PARAMETERPROB ||
++			ih->type == ICMP_REDIRECT))
++				dsth = (const struct iphdr*)&ih[1];
++	}
++
++	/* in xmit-path use dest port by default and source port only if
++		this is an ICMP reply to something else; vice versa in rcv-path */
++	use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph);
++
++	/* get dst port */
++	if (((u8*)&dsth[1]) <= end && (
++		dsth->protocol == IPPROTO_UDP ||
++		dsth->protocol == IPPROTO_TCP ||
++		dsth->protocol == IPPROTO_SCTP ||
++		dsth->protocol == IPPROTO_DCCP)) {
++			/* for UDP, TCP, SCTP and DCCP source and dest port
++			follow IPv4 header directly */
++			portp = ((u8*)dsth) + dsth->ihl * 4;
++
++			if (use_dest_addr)
++				portp += sizeof(u16);
++	} else if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++
++		/* use icmp identifier as port */
++		if (((u8*)&ih) <= end && (
++		    (use_dest_addr && (
++		    ih->type == ICMP_ECHOREPLY ||
++			ih->type == ICMP_TIMESTAMPREPLY ||
++			ih->type == ICMP_INFO_REPLY ||
++			ih->type == ICMP_ADDRESSREPLY)) ||
++			(!use_dest_addr && (
++			ih->type == ICMP_ECHO ||
++			ih->type == ICMP_TIMESTAMP ||
++			ih->type == ICMP_INFO_REQUEST ||
++			ih->type == ICMP_ADDRESS)
++			)))
++				portp = (u8*)&ih->un.echo.id;
++	}
++
++	if ((portp && &portp[2] <= end) || psidlen == 0) {
++		int frombyte = fmr->ip6_prefix_len / 8;
++		int fromrem = fmr->ip6_prefix_len % 8;
++		int bytes = sizeof(struct in6_addr) - frombyte;
++		const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr;
++		u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len);
++		u64 t = 0;
++
++		/* extract PSID from port and add it to eabits */
++		u16 psidbits = 0;
++		if (psidlen > 0) {
++			psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]);
++			psidbits >>= 16 - psidlen - fmr->offset;
++			psidbits = (u16)(psidbits << (16 - psidlen));
++			eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen));
++		}
++
++		/* rewrite destination address */
++		*dest = fmr->ip6_prefix;
++		memcpy(&dest->s6_addr[10], addr, sizeof(*addr));
++		dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen));
++
++		if (bytes > sizeof(u64))
++			bytes = sizeof(u64);
++
++		/* insert eabits */
++		memcpy(&t, &dest->s6_addr[frombyte], bytes);
++		t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1)
++			<< (64 - fmr->ea_len - fromrem));
++		t = cpu_to_be64(t | (eabits >> fromrem));
++		memcpy(&dest->s6_addr[frombyte], &t, bytes);
++	}
++}
++
++
+ /**
+  * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally
+  *   @skb: received socket buffer
+@@ -810,6 +927,26 @@ static int ip6_tnl_rcv(struct sk_buff *s
+ 		skb_reset_network_header(skb);
+ 		skb->protocol = htons(protocol);
+ 		memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
++		if (protocol == ETH_P_IP &&
++			!ipv6_addr_equal(&ipv6h->saddr, &t->parms.raddr)) {
++				/* Packet didn't come from BR, so lookup FMR */
++				struct __ip6_tnl_fmr *fmr;
++				struct in6_addr expected = t->parms.raddr;
++				for (fmr = t->parms.fmrs; fmr; fmr = fmr->next)
++					if (ipv6_prefix_equal(&ipv6h->saddr,
++						&fmr->ip6_prefix, fmr->ip6_prefix_len))
++							break;
++
++				/* Check that IPv6 matches IPv4 source to prevent spoofing */
++				if (fmr)
++					ip4ip6_fmr_calc(&expected, ip_hdr(skb),
++							skb_tail_pointer(skb), fmr, false);
++
++				if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) {
++					rcu_read_unlock();
++					goto discard;
++				}
++		}
+ 
+ 		__skb_tunnel_rx(skb, t->dev, t->net);
+ 
+@@ -1070,6 +1207,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	__u8 dsfield;
+ 	__u32 mtu;
+ 	int err;
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
+ 	    !ip6_tnl_xmit_ctl(t))
+@@ -1089,6 +1227,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
+ 		fl6.flowi6_mark = skb->mark;
+ 
++	/* try to find matching FMR */
++	for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++		unsigned mshift = 32 - fmr->ip4_prefix_len;
++		if (ntohl(fmr->ip4_prefix.s_addr) >> mshift ==
++				ntohl(iph->daddr) >> mshift)
++			break;
++	}
++
++	/* change dstaddr according to FMR */
++	if (fmr)
++		ip4ip6_fmr_calc(&fl6.daddr, iph, skb_tail_pointer(skb), fmr, true);
++
+ 	err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
+ 	if (err != 0) {
+ 		/* XXX: send ICMP error even if DF is not set. */
+@@ -1257,6 +1407,14 @@ ip6_tnl_change(struct ip6_tnl *t, const 
+ 	t->parms.flowinfo = p->flowinfo;
+ 	t->parms.link = p->link;
+ 	t->parms.proto = p->proto;
++
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++	t->parms.fmrs = p->fmrs;
++
+ 	ip6_tnl_dst_reset(t);
+ 	ip6_tnl_link_config(t);
+ 	return 0;
+@@ -1287,6 +1445,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+ 	p->flowinfo = u->flowinfo;
+ 	p->link = u->link;
+ 	p->proto = u->proto;
++	p->fmrs = NULL;
+ 	memcpy(p->name, u->name, sizeof(u->name));
+ }
+ 
+@@ -1569,6 +1728,15 @@ static int ip6_tnl_validate(struct nlatt
+ 	return 0;
+ }
+ 
++static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = {
++	[IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) },
++	[IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) },
++	[IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 }
++};
++
+ static void ip6_tnl_netlink_parms(struct nlattr *data[],
+ 				  struct __ip6_tnl_parm *parms)
+ {
+@@ -1602,6 +1770,46 @@ static void ip6_tnl_netlink_parms(struct
+ 
+ 	if (data[IFLA_IPTUN_PROTO])
+ 		parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
++
++	if (data[IFLA_IPTUN_FMRS]) {
++		unsigned rem;
++		struct nlattr *fmr;
++		nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) {
++			struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c;
++			struct __ip6_tnl_fmr *nfmr;
++
++			nla_parse_nested(fmrd, IFLA_IPTUN_FMR_MAX,
++				fmr, ip6_tnl_fmr_policy);
++
++			if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL)))
++				continue;
++
++			nfmr->offset = 6;
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX]))
++				nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX],
++					sizeof(nfmr->ip6_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX]))
++				nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX],
++					sizeof(nfmr->ip4_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN]))
++				nfmr->ip6_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN]))
++				nfmr->ip4_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN]))
++				nfmr->ea_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET]))
++				nfmr->offset = nla_get_u8(c);
++
++			nfmr->next = parms->fmrs;
++			parms->fmrs = nfmr;
++		}
++	}
+ }
+ 
+ static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
+@@ -1654,6 +1862,12 @@ static void ip6_tnl_dellink(struct net_d
+ 
+ static size_t ip6_tnl_get_size(const struct net_device *dev)
+ {
++	const struct ip6_tnl *t = netdev_priv(dev);
++	struct __ip6_tnl_fmr *c;
++	int fmrs = 0;
++	for (c = t->parms.fmrs; c; c = c->next)
++		++fmrs;
++
+ 	return
+ 		/* IFLA_IPTUN_LINK */
+ 		nla_total_size(4) +
+@@ -1671,6 +1885,24 @@ static size_t ip6_tnl_get_size(const str
+ 		nla_total_size(4) +
+ 		/* IFLA_IPTUN_PROTO */
+ 		nla_total_size(1) +
++		/* IFLA_IPTUN_FMRS */
++		nla_total_size(0) +
++		(
++			/* nest */
++			nla_total_size(0) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX */
++			nla_total_size(sizeof(struct in6_addr)) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX */
++			nla_total_size(sizeof(struct in_addr)) +
++			/* IFLA_IPTUN_FMR_EA_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_OFFSET */
++			nla_total_size(1)
++		) * fmrs +
+ 		0;
+ }
+ 
+@@ -1678,6 +1910,9 @@ static int ip6_tnl_fill_info(struct sk_b
+ {
+ 	struct ip6_tnl *tunnel = netdev_priv(dev);
+ 	struct __ip6_tnl_parm *parm = &tunnel->parms;
++	struct __ip6_tnl_fmr *c;
++	int fmrcnt = 0;
++	struct nlattr *fmrs;
+ 
+ 	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
+ 	    nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
+@@ -1688,8 +1923,27 @@ static int ip6_tnl_fill_info(struct sk_b
+ 	    nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
+ 	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
+ 	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
+-	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto))
++	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
++	    !(fmrs = nla_nest_start(skb, IFLA_IPTUN_FMRS)))
+ 		goto nla_put_failure;
++
++	for (c = parm->fmrs; c; c = c->next) {
++		struct nlattr *fmr = nla_nest_start(skb, ++fmrcnt);
++		if (!fmr ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX,
++				sizeof(c->ip6_prefix), &c->ip6_prefix) ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX,
++				sizeof(c->ip4_prefix), &c->ip4_prefix) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset))
++				goto nla_put_failure;
++
++		nla_nest_end(skb, fmr);
++	}
++	nla_nest_end(skb, fmrs);
++
+ 	return 0;
+ 
+ nla_put_failure:
+@@ -1705,6 +1959,7 @@ static const struct nla_policy ip6_tnl_p
+ 	[IFLA_IPTUN_FLOWINFO]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_FLAGS]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_PROTO]		= { .type = NLA_U8 },
++	[IFLA_IPTUN_FMRS]		= { .type = NLA_NESTED },
+ };
+ 
+ static struct rtnl_link_ops ip6_link_ops __read_mostly = {
diff --git a/trunk/target/linux/generic/patches-3.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/trunk/target/linux/generic/patches-3.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
new file mode 100644
index 00000000..3c45090f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -0,0 +1,249 @@
+From 1b5aaa4b16f6e6471ab1c07b38068197a1b4c395 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Fri, 24 May 2013 14:40:54 +0200
+Subject: [PATCH 1/2] ipv6: allow rejecting with "source address failed policy"
+
+RFC6204 L-14 requires rejecting traffic from invalid addresses with
+ICMPv6 Destination Unreachable, Code 5 (Source address failed ingress/
+egress policy) on the LAN side, so add an appropriate rule for that.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ include/net/netns/ipv6.h       |  1 +
+ include/uapi/linux/fib_rules.h |  4 +++
+ include/uapi/linux/rtnetlink.h |  1 +
+ net/ipv4/fib_semantics.c       |  4 +++
+ net/ipv4/fib_trie.c            |  1 +
+ net/ipv4/ipmr.c                |  1 +
+ net/ipv6/fib6_rules.c          |  4 +++
+ net/ipv6/ip6mr.c               |  2 ++
+ net/ipv6/route.c               | 58 +++++++++++++++++++++++++++++++++++++++++-
+ 9 files changed, 75 insertions(+), 1 deletion(-)
+
+--- a/include/net/netns/ipv6.h
++++ b/include/net/netns/ipv6.h
+@@ -57,6 +57,7 @@ struct netns_ipv6 {
+ 	unsigned long		 ip6_rt_last_gc;
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	struct rt6_info         *ip6_prohibit_entry;
++	struct rt6_info		*ip6_policy_failed_entry;
+ 	struct rt6_info         *ip6_blk_hole_entry;
+ 	struct fib6_table       *fib6_local_tbl;
+ 	struct fib_rules_ops    *fib6_rules_ops;
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -64,6 +64,10 @@ enum {
+ 	FR_ACT_BLACKHOLE,	/* Drop without notification */
+ 	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
+ 	FR_ACT_PROHIBIT,	/* Drop with EACCES */
++	FR_ACT_RES9,
++	FR_ACT_RES10,
++	FR_ACT_RES11,
++	FR_ACT_POLICY_FAILED,	/* Drop with EACCES */
+ 	__FR_ACT_MAX,
+ };
+ 
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -203,6 +203,7 @@ enum {
+ 	RTN_THROW,		/* Not in this table		*/
+ 	RTN_NAT,		/* Translate this address	*/
+ 	RTN_XRESOLVE,		/* Use external resolver	*/
++	RTN_POLICY_FAILED,	/* Failed ingress/egress policy */
+ 	__RTN_MAX
+ };
+ 
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX 
+ 		.error	= -EINVAL,
+ 		.scope	= RT_SCOPE_NOWHERE,
+ 	},
++	[RTN_POLICY_FAILED] = {
++		.error	= -EACCES,
++		.scope	= RT_SCOPE_UNIVERSE,
++	},
+ };
+ 
+ static void rt_fibinfo_free(struct rtable __rcu **rtp)
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2324,6 +2324,7 @@ static const char *const rtn_type_names[
+ 	[RTN_THROW] = "THROW",
+ 	[RTN_NAT] = "NAT",
+ 	[RTN_XRESOLVE] = "XRESOLVE",
++	[RTN_POLICY_FAILED] = "POLICY_FAILED",
+ };
+ 
+ static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
+--- a/net/ipv4/ipmr.c
++++ b/net/ipv4/ipmr.c
+@@ -184,6 +184,7 @@ static int ipmr_rule_action(struct fib_r
+ 	case FR_ACT_UNREACHABLE:
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
++	case FR_ACT_POLICY_FAILED:
+ 		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+--- a/net/ipv6/fib6_rules.c
++++ b/net/ipv6/fib6_rules.c
+@@ -73,6 +73,10 @@ static int fib6_rule_action(struct fib_r
+ 		err = -EACCES;
+ 		rt = net->ipv6.ip6_prohibit_entry;
+ 		goto discard_pkt;
++	case FR_ACT_POLICY_FAILED:
++		err = -EACCES;
++		rt = net->ipv6.ip6_policy_failed_entry;
++		goto discard_pkt;
+ 	}
+ 
+ 	table = fib6_get_table(net, rule->table);
+--- a/net/ipv6/ip6mr.c
++++ b/net/ipv6/ip6mr.c
+@@ -169,6 +169,8 @@ static int ip6mr_rule_action(struct fib_
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
+ 		return -EACCES;
++	case FR_ACT_POLICY_FAILED:
++		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+ 		return -EINVAL;
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -87,6 +87,8 @@ static int		ip6_pkt_discard(struct sk_bu
+ static int		ip6_pkt_discard_out(struct sk_buff *skb);
+ static int		ip6_pkt_prohibit(struct sk_buff *skb);
+ static int		ip6_pkt_prohibit_out(struct sk_buff *skb);
++static int		ip6_pkt_policy_failed(struct sk_buff *skb);
++static int		ip6_pkt_policy_failed_out(struct sk_buff *skb);
+ static void		ip6_link_failure(struct sk_buff *skb);
+ static void		ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
+ 					   struct sk_buff *skb, u32 mtu);
+@@ -282,6 +284,21 @@ static const struct rt6_info ip6_prohibi
+ 	.rt6i_ref	= ATOMIC_INIT(1),
+ };
+ 
++static const struct rt6_info ip6_policy_failed_entry_template = {
++	.dst = {
++		.__refcnt	= ATOMIC_INIT(1),
++		.__use		= 1,
++		.obsolete	= DST_OBSOLETE_FORCE_CHK,
++		.error		= -EACCES,
++		.input		= ip6_pkt_policy_failed,
++		.output		= ip6_pkt_policy_failed_out,
++	},
++	.rt6i_flags	= (RTF_REJECT | RTF_NONEXTHOP),
++	.rt6i_protocol	= RTPROT_KERNEL,
++	.rt6i_metric	= ~(u32) 0,
++	.rt6i_ref	= ATOMIC_INIT(1),
++};
++
+ static const struct rt6_info ip6_blk_hole_entry_template = {
+ 	.dst = {
+ 		.__refcnt	= ATOMIC_INIT(1),
+@@ -1595,6 +1612,11 @@ int ip6_route_add(struct fib6_config *cf
+ 			rt->dst.output = ip6_pkt_prohibit_out;
+ 			rt->dst.input = ip6_pkt_prohibit;
+ 			break;
++		case RTN_POLICY_FAILED:
++			rt->dst.error = -EACCES;
++			rt->dst.output = ip6_pkt_policy_failed_out;
++			rt->dst.input = ip6_pkt_policy_failed;
++			break;
+ 		case RTN_THROW:
+ 		default:
+ 			rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN
+@@ -2174,6 +2196,17 @@ static int ip6_pkt_prohibit_out(struct s
+ 	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
+ }
+ 
++static int ip6_pkt_policy_failed(struct sk_buff *skb)
++{
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES);
++}
++
++static int ip6_pkt_policy_failed_out(struct sk_buff *skb)
++{
++	skb->dev = skb_dst(skb)->dev;
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES);
++}
++
+ /*
+  *	Allocate a dst for local (unicast / anycast) address.
+  */
+@@ -2376,7 +2409,8 @@ static int rtm_to_fib6_config(struct sk_
+ 	if (rtm->rtm_type == RTN_UNREACHABLE ||
+ 	    rtm->rtm_type == RTN_BLACKHOLE ||
+ 	    rtm->rtm_type == RTN_PROHIBIT ||
+-	    rtm->rtm_type == RTN_THROW)
++	    rtm->rtm_type == RTN_THROW ||
++	    rtm->rtm_type == RTN_POLICY_FAILED)
+ 		cfg->fc_flags |= RTF_REJECT;
+ 
+ 	if (rtm->rtm_type == RTN_LOCAL)
+@@ -2578,6 +2612,9 @@ static int rt6_fill_node(struct net *net
+ 		case -EACCES:
+ 			rtm->rtm_type = RTN_PROHIBIT;
+ 			break;
++		case -EPERM:
++			rtm->rtm_type = RTN_POLICY_FAILED;
++			break;
+ 		case -EAGAIN:
+ 			rtm->rtm_type = RTN_THROW;
+ 			break;
+@@ -2828,6 +2865,8 @@ static int ip6_route_dev_notify(struct n
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
+ 		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
++		net->ipv6.ip6_policy_failed_entry->dst.dev = dev;
++		net->ipv6.ip6_policy_failed_entry->rt6i_idev = in6_dev_get(dev);
+ 		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
+ 		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
+ #endif
+@@ -3044,6 +3083,17 @@ static int __net_init ip6_route_net_init
+ 	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
+ 	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
+ 			 ip6_template_metrics, true);
++
++	net->ipv6.ip6_policy_failed_entry =
++		kmemdup(&ip6_policy_failed_entry_template,
++			sizeof(*net->ipv6.ip6_policy_failed_entry), GFP_KERNEL);
++	if (!net->ipv6.ip6_policy_failed_entry)
++		goto out_ip6_blk_hole_entry;
++	net->ipv6.ip6_policy_failed_entry->dst.path =
++		(struct dst_entry *)net->ipv6.ip6_policy_failed_entry;
++	net->ipv6.ip6_policy_failed_entry->dst.ops = &net->ipv6.ip6_dst_ops;
++	dst_init_metrics(&net->ipv6.ip6_policy_failed_entry->dst,
++			 ip6_template_metrics, true);
+ #endif
+ 
+ 	net->ipv6.sysctl.flush_delay = 0;
+@@ -3062,6 +3112,8 @@ out:
+ 	return ret;
+ 
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
++out_ip6_blk_hole_entry:
++	kfree(net->ipv6.ip6_blk_hole_entry);
+ out_ip6_prohibit_entry:
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ out_ip6_null_entry:
+@@ -3079,6 +3131,7 @@ static void __net_exit ip6_route_net_exi
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ 	kfree(net->ipv6.ip6_blk_hole_entry);
++	kfree(net->ipv6.ip6_policy_failed_entry);
+ #endif
+ 	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
+ }
+@@ -3175,6 +3228,9 @@ int __init ip6_route_init(void)
+ 	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
+ 	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
+ 	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
++	init_net.ipv6.ip6_policy_failed_entry->dst.dev = init_net.loopback_dev;
++	init_net.ipv6.ip6_policy_failed_entry->rt6i_idev =
++		in6_dev_get(init_net.loopback_dev);
+   #endif
+ 	ret = fib6_init();
+ 	if (ret)
diff --git a/trunk/target/linux/generic/patches-3.14/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch b/trunk/target/linux/generic/patches-3.14/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
new file mode 100644
index 00000000..25a86393
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
@@ -0,0 +1,53 @@
+From 7749b481ce5d7e232b1f7da5e6b2c44816f51681 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sun, 19 Jan 2014 20:45:51 +0100
+Subject: [PATCH 2/2] net: provide defines for _POLICY_FAILED until all code is
+ updated
+
+Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
+unreachable, conflicting with our name.
+
+Add appropriate defines to allow our code to build with the new
+name until we have updated our local patches for older kernels
+and userspace packages.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ include/uapi/linux/fib_rules.h | 2 ++
+ include/uapi/linux/icmpv6.h    | 2 ++
+ include/uapi/linux/rtnetlink.h | 2 ++
+ 3 files changed, 6 insertions(+)
+
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -71,6 +71,8 @@ enum {
+ 	__FR_ACT_MAX,
+ };
+ 
++#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
++
+ #define FR_ACT_MAX (__FR_ACT_MAX - 1)
+ 
+ #endif
+--- a/include/uapi/linux/icmpv6.h
++++ b/include/uapi/linux/icmpv6.h
+@@ -118,6 +118,8 @@ struct icmp6hdr {
+ #define ICMPV6_POLICY_FAIL		5
+ #define ICMPV6_REJECT_ROUTE		6
+ 
++#define ICMPV6_FAILED_POLICY		ICMPV6_POLICY_FAIL
++
+ /*
+  *	Codes for Time Exceeded
+  */
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -207,6 +207,8 @@ enum {
+ 	__RTN_MAX
+ };
+ 
++#define RTN_FAILED_POLICY RTN_POLICY_FAILED
++
+ #define RTN_MAX (__RTN_MAX - 1)
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/700-swconfig.patch b/trunk/target/linux/generic/patches-3.14/700-swconfig.patch
new file mode 100644
index 00000000..a60722c2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/700-swconfig.patch
@@ -0,0 +1,39 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,16 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config SWCONFIG
++	tristate "Switch configuration API"
++	---help---
++	  Switch configuration API using netlink. This allows
++	  you to configure the VLAN features of certain switches.
++
++config SWCONFIG_LEDS
++	bool "Switch LED trigger support"
++	depends on (SWCONFIG && LEDS_TRIGGERS)
++
+ comment "MII PHY device drivers"
+ 
+ config AT803X_PHY
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -3,6 +3,7 @@
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
++obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
+ obj-$(CONFIG_CICADA_PHY)	+= cicada.o
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -366,6 +366,7 @@ header-y += stddef.h
+ header-y += string.h
+ header-y += suspend_ioctls.h
+ header-y += swab.h
++header-y += switch.h
+ header-y += synclink.h
+ header-y += sysctl.h
+ header-y += sysinfo.h
diff --git a/trunk/target/linux/generic/patches-3.14/701-phy_extension.patch b/trunk/target/linux/generic/patches-3.14/701-phy_extension.patch
new file mode 100644
index 00000000..eda088fe
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/701-phy_extension.patch
@@ -0,0 +1,63 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -293,6 +293,50 @@ int phy_ethtool_gset(struct phy_device *
+ }
+ EXPORT_SYMBOL(phy_ethtool_gset);
+ 
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
++{
++	u32 cmd;
++	int tmp;
++	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
++	struct ethtool_value edata = { ETHTOOL_GLINK };
++
++	if (get_user(cmd, (u32 *) useraddr))
++		return -EFAULT;
++
++	switch (cmd) {
++	case ETHTOOL_GSET:
++		phy_ethtool_gset(phydev, &ecmd);
++		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
++			return -EFAULT;
++		return 0;
++
++	case ETHTOOL_SSET:
++		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
++			return -EFAULT;
++		return phy_ethtool_sset(phydev, &ecmd);
++
++	case ETHTOOL_NWAY_RST:
++		/* if autoneg is off, it's an error */
++		tmp = phy_read(phydev, MII_BMCR);
++		if (tmp & BMCR_ANENABLE) {
++			tmp |= (BMCR_ANRESTART);
++			phy_write(phydev, MII_BMCR, tmp);
++			return 0;
++		}
++		return -EINVAL;
++
++	case ETHTOOL_GLINK:
++		edata.data = (phy_read(phydev,
++				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
++		if (copy_to_user(useraddr, &edata, sizeof(edata)))
++			return -EFAULT;
++		return 0;
++	}
++
++	return -EOPNOTSUPP;
++}
++EXPORT_SYMBOL(phy_ethtool_ioctl);
++
+ /**
+  * phy_mii_ioctl - generic PHY MII ioctl interface
+  * @phydev: the phy_device struct
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -633,6 +633,7 @@ void phy_start_machine(struct phy_device
+ void phy_stop_machine(struct phy_device *phydev);
+ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
+ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
+ int phy_start_interrupts(struct phy_device *phydev);
+ void phy_print_status(struct phy_device *phydev);
diff --git a/trunk/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch b/trunk/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
new file mode 100644
index 00000000..b617fc25
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,49 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -422,9 +422,18 @@ struct phy_driver {
+ 	 */
+ 	int (*config_aneg)(struct phy_device *phydev);
+ 
++	/* Determine if autonegotiation is done */
++	int (*aneg_done)(struct phy_device *phydev);
++
+ 	/* Determines the negotiated speed and duplex */
+ 	int (*read_status)(struct phy_device *phydev);
+ 
++	/* 
++	 * Update the value in phydev->link to reflect the 
++	 * current link value
++	 */
++	int (*update_link)(struct phy_device *phydev);
++
+ 	/* Clears any pending interrupts */
+ 	int (*ack_interrupt)(struct phy_device *phydev);
+ 
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -881,6 +881,9 @@ int genphy_update_link(struct phy_device
+ {
+ 	int status;
+ 
++	if (phydev->drv->update_link)
++		return phydev->drv->update_link(phydev);
++
+ 	/* Do a fake read */
+ 	status = phy_read(phydev, MII_BMSR);
+ 	if (status < 0)
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -99,7 +99,12 @@ static int phy_config_interrupt(struct p
+  */
+ static inline int phy_aneg_done(struct phy_device *phydev)
+ {
+-	int retval = phy_read(phydev, MII_BMSR);
++	int retval;
++
++	if (phydev->drv->aneg_done)
++		return phydev->drv->aneg_done(phydev);
++
++	retval = phy_read(phydev, MII_BMSR);
+ 
+ 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
+ }
diff --git a/trunk/target/linux/generic/patches-3.14/703-phy-add-detach-callback-to-struct-phy_driver.patch b/trunk/target/linux/generic/patches-3.14/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 00000000..fee6b8c6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -662,6 +662,9 @@ EXPORT_SYMBOL(phy_attach);
+ void phy_detach(struct phy_device *phydev)
+ {
+ 	int i;
++	if (phydev->drv && phydev->drv->detach)
++		phydev->drv->detach(phydev);
++
+ 	phydev->attached_dev->phydev = NULL;
+ 	phydev->attached_dev = NULL;
+ 	phy_suspend(phydev);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -446,6 +446,12 @@ struct phy_driver {
+ 	 */
+ 	int (*did_interrupt)(struct phy_device *phydev);
+ 
++	/*
++	 * Called before an ethernet device is detached
++	 * from the PHY.
++	 */
++	void (*detach)(struct phy_device *phydev);
++
+ 	/* Clears up any memory if needed */
+ 	void (*remove)(struct phy_device *phydev);
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/710-phy-add-mdio_register_board_info.patch b/trunk/target/linux/generic/patches-3.14/710-phy-add-mdio_register_board_info.patch
new file mode 100644
index 00000000..757616fa
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/710-phy-add-mdio_register_board_info.patch
@@ -0,0 +1,191 @@
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -38,6 +38,8 @@
+ 
+ #include <asm/irq.h>
+ 
++#include "mdio-boardinfo.h"
++
+ /**
+  * mdiobus_alloc_size - allocate a mii_bus structure
+  * @size: extra amount of memory to allocate for private storage.
+@@ -224,15 +226,33 @@ void mdiobus_free(struct mii_bus *bus)
+ }
+ EXPORT_SYMBOL(mdiobus_free);
+ 
++static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus,
++						struct phy_device *phydev,
++						struct mdio_board_info *bi)
++{
++	if (strcmp(bus->id, bi->bus_id) ||
++	    bi->phy_addr != phydev->addr)
++	    return;
++
++	phydev->dev.platform_data = (void *) bi->platform_data;
++}
++
+ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
+ {
+ 	struct phy_device *phydev;
++	struct mdio_board_entry *be;
+ 	int err;
+ 
+ 	phydev = get_phy_device(bus, addr, false);
+ 	if (IS_ERR(phydev) || phydev == NULL)
+ 		return phydev;
+ 
++	mutex_lock(&__mdio_board_lock);
++	list_for_each_entry(be, &__mdio_board_list, list)
++		mdiobus_setup_phydev_from_boardinfo(bus, phydev,
++						    &be->board_info);
++	mutex_unlock(&__mdio_board_lock);
++
+ 	err = phy_device_register(phydev);
+ 	if (err) {
+ 		phy_device_free(phydev);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -673,4 +673,22 @@ int __init mdio_bus_init(void);
+ void mdio_bus_exit(void);
+ 
+ extern struct bus_type mdio_bus_type;
++
++struct mdio_board_info {
++	const char	*bus_id;
++	int		phy_addr;
++
++	const void	*platform_data;
++};
++
++#ifdef CONFIG_MDIO_BOARDINFO
++int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n);
++#else
++static inline int
++mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n)
++{
++	return 0;
++}
++#endif
++
+ #endif /* __PHY_H */
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,10 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config MDIO_BOARDINFO
++	bool
++	default y
++
+ config SWCONFIG
+ 	tristate "Switch configuration API"
+ 	---help---
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -2,6 +2,8 @@
+ 
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
++obj-$(CONFIG_MDIO_BOARDINFO)	+= mdio-boardinfo.o
++
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
+ obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.c
+@@ -0,0 +1,58 @@
++/*
++ * mdio-boardinfo.c - collect pre-declarations of PHY devices
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/phy.h>
++#include <linux/slab.h>
++#include <linux/export.h>
++#include <linux/mutex.h>
++#include <linux/phy.h>
++
++#include "mdio-boardinfo.h"
++
++/*
++ * These symbols are exported ONLY FOR the mdio_bus component.
++ * No other users will be supported.
++ */
++
++LIST_HEAD(__mdio_board_list);
++EXPORT_SYMBOL_GPL(__mdio_board_list);
++
++DEFINE_MUTEX(__mdio_board_lock);
++EXPORT_SYMBOL_GPL(__mdio_board_lock);
++
++/**
++ * mdio_register_board_info - register PHY devices for a given board
++ * @info: array of chip descriptors
++ * @n: how many descriptors are provided
++ * Context: can sleep
++ *
++ * The board info passed can safely be __initdata ... but be careful of
++ * any embedded pointers (platform_data, etc), they're copied as-is.
++ */
++int __init
++mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n)
++{
++	struct mdio_board_entry *be;
++	int i;
++
++	be = kzalloc(n * sizeof(*be), GFP_KERNEL);
++	if (!be)
++		return -ENOMEM;
++
++	for (i = 0; i < n; i++, be++, info++) {
++		memcpy(&be->board_info, info, sizeof(*info));
++		mutex_lock(&__mdio_board_lock);
++		list_add_tail(&be->list, &__mdio_board_list);
++		mutex_unlock(&__mdio_board_lock);
++	}
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.h
+@@ -0,0 +1,22 @@
++/*
++ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/mutex.h>
++
++struct mdio_board_entry {
++	struct list_head	list;
++	struct mdio_board_info	board_info;
++};
++
++/* __mdio_board_lock protects __mdio_board_list
++ * only mdio_bus components are allowed to use these symbols.
++ */
++extern struct mutex __mdio_board_lock;
++extern struct list_head __mdio_board_list;
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -15,7 +15,7 @@ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_NET) += Space.o loopback.o
+ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+-obj-$(CONFIG_PHYLIB) += phy/
++obj-y += phy/
+ obj-$(CONFIG_RIONET) += rionet.o
+ obj-$(CONFIG_NET_TEAM) += team/
+ obj-$(CONFIG_TUN) += tun.o
diff --git a/trunk/target/linux/generic/patches-3.14/720-phy_adm6996.patch b/trunk/target/linux/generic/patches-3.14/720-phy_adm6996.patch
new file mode 100644
index 00000000..65b206da
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/720-phy_adm6996.patch
@@ -0,0 +1,26 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -120,6 +120,13 @@ config MICREL_PHY
+ 	---help---
+ 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
+ 
++config ADM6996_PHY
++	tristate "Driver for ADM6996 switches"
++	select SWCONFIG
++	---help---
++	  Currently supports the ADM6996FC and ADM6996M switches.
++	  Support for FC is very limited.
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
++obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.14/721-phy_packets.patch b/trunk/target/linux/generic/patches-3.14/721-phy_packets.patch
new file mode 100644
index 00000000..23d7b16e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/721-phy_packets.patch
@@ -0,0 +1,154 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -1245,6 +1245,11 @@ struct net_device {
+ 	const struct ethtool_ops *ethtool_ops;
+ 	const struct forwarding_accel_ops *fwd_ops;
+ 
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
++	struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
++#endif
++
+ 	/* Hardware header description */
+ 	const struct header_ops *header_ops;
+ 
+@@ -1313,6 +1318,9 @@ struct net_device {
+ 	void			*ax25_ptr;	/* AX.25 specific data */
+ 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
+ 						   assign before registering */
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void			*phy_ptr; /* PHY device specific data */
++#endif
+ 
+ /*
+  * Cache lines mostly used on receive path (including eth_type_trans())
+--- a/include/uapi/linux/if.h
++++ b/include/uapi/linux/if.h
+@@ -84,6 +84,7 @@
+ #define IFF_LIVE_ADDR_CHANGE 0x100000	/* device supports hardware address
+ 					 * change when it's running */
+ #define IFF_MACVLAN 0x200000		/* Macvlan device */
++#define IFF_NO_IP_ALIGN	0x400000	/* do not ip-align allocated rx pkts */
+ 
+ 
+ #define IF_GET_IFACE	0x0001		/* for querying only */
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1858,6 +1858,10 @@ static inline int pskb_trim(struct sk_bu
+ 	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
+ }
+ 
++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp);
++
++
+ /**
+  *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
+  *	@skb: buffer to alter
+@@ -1984,16 +1988,6 @@ static inline struct sk_buff *dev_alloc_
+ }
+ 
+ 
+-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
+-		unsigned int length, gfp_t gfp)
+-{
+-	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
+-
+-	if (NET_IP_ALIGN && skb)
+-		skb_reserve(skb, NET_IP_ALIGN);
+-	return skb;
+-}
+-
+ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+ 		unsigned int length)
+ {
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -24,6 +24,12 @@ menuconfig NET
+ 
+ if NET
+ 
++config ETHERNET_PACKET_MANGLE
++	bool
++	help
++	  This option can be selected by phy drivers that need to mangle
++	  packets going in or out of an ethernet device.
++
+ config WANT_COMPAT_NETLINK_MESSAGES
+ 	bool
+ 	help
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2614,10 +2614,20 @@ int dev_hard_start_xmit(struct sk_buff *
+ 		if (!list_empty(&ptype_all))
+ 			dev_queue_xmit_nit(skb, dev);
+ 
+-		skb_len = skb->len;
+-		trace_net_dev_start_xmit(skb, dev);
+-		rc = ops->ndo_start_xmit(skb, dev);
+-		trace_net_dev_xmit(skb, rc, dev, skb_len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = skb->len;
++			trace_net_dev_start_xmit(skb, dev);
++			rc = ops->ndo_start_xmit(skb, dev);
++			trace_net_dev_xmit(skb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (rc == NETDEV_TX_OK)
+ 			txq_trans_update(txq);
+ 		return rc;
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -63,6 +63,7 @@
+ #include <linux/errqueue.h>
+ #include <linux/prefetch.h>
+ #include <linux/if_vlan.h>
++#include <linux/if.h>
+ 
+ #include <net/protocol.h>
+ #include <net/dst.h>
+@@ -440,6 +441,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+ }
+ EXPORT_SYMBOL(__netdev_alloc_skb);
+ 
++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp)
++{
++	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
++		return skb;
++#endif
++
++	if (NET_IP_ALIGN && skb)
++		skb_reserve(skb, NET_IP_ALIGN);
++	return skb;
++}
++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
++
+ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 		     int size, unsigned int truesize)
+ {
+--- a/net/ethernet/eth.c
++++ b/net/ethernet/eth.c
+@@ -161,6 +161,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+ 	const struct ethhdr *eth;
+ 
+ 	skb->dev = dev;
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev->eth_mangle_rx)
++		dev->eth_mangle_rx(dev, skb);
++#endif
++
+ 	skb_reset_mac_header(skb);
+ 	skb_pull_inline(skb, ETH_HLEN);
+ 	eth = eth_hdr(skb);
diff --git a/trunk/target/linux/generic/patches-3.14/722-phy_mvswitch.patch b/trunk/target/linux/generic/patches-3.14/722-phy_mvswitch.patch
new file mode 100644
index 00000000..d7c3d759
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/722-phy_mvswitch.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -127,6 +127,10 @@ config ADM6996_PHY
+ 	  Currently supports the ADM6996FC and ADM6996M switches.
+ 	  Support for FC is very limited.
+ 
++config MVSWITCH_PHY
++	tristate "Driver for Marvell 88E6060 switches"
++	select ETHERNET_PACKET_MANGLE
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
++obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.14/723-phy_ip175c.patch b/trunk/target/linux/generic/patches-3.14/723-phy_ip175c.patch
new file mode 100644
index 00000000..5e3f6b46
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/723-phy_ip175c.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -131,6 +131,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config IP17XX_PHY
++	tristate "Driver for IC+ IP17xx switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.14/724-phy_ar8216.patch b/trunk/target/linux/generic/patches-3.14/724-phy_ar8216.patch
new file mode 100644
index 00000000..d3b238ef
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/724-phy_ar8216.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -135,6 +135,11 @@ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+ 
++config AR8216_PHY
++	tristate "Driver for Atheros AR8216 switches"
++	select ETHERNET_PACKET_MANGLE
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.14/725-phy_rtl8306.patch b/trunk/target/linux/generic/patches-3.14/725-phy_rtl8306.patch
new file mode 100644
index 00000000..56899a70
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/725-phy_rtl8306.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -140,6 +140,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config RTL8306_PHY
++	tristate "Driver for Realtek RTL8306S switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.14/726-phy_rtl8366.patch b/trunk/target/linux/generic/patches-3.14/726-phy_rtl8366.patch
new file mode 100644
index 00000000..52ef6108
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/726-phy_rtl8366.patch
@@ -0,0 +1,45 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -231,6 +231,30 @@ config MDIO_BUS_MUX_MMIOREG
+ 
+ 	  Currently, only 8-bit registers are supported.
+ 
++config RTL8366_SMI
++	tristate "Driver for the RTL8366 SMI interface"
++	depends on GPIOLIB
++	---help---
++	  This module implements the SMI interface protocol which is used
++	  by some RTL8366 ethernet switch devices via the generic GPIO API.
++
++if RTL8366_SMI
++
++config RTL8366_SMI_DEBUG_FS
++	bool "RTL8366 SMI interface debugfs support"
++        depends on DEBUG_FS
++        default n
++
++config RTL8366S_PHY
++	tristate "Driver for the Realtek RTL8366S switch"
++	select SWCONFIG
++
++config RTL8366RB_PHY
++	tristate "Driver for the Realtek RTL8366RB switch"
++	select SWCONFIG
++
++endif # RTL8366_SMI
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
++obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
++obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.14/727-phy-rtl8367.patch b/trunk/target/linux/generic/patches-3.14/727-phy-rtl8367.patch
new file mode 100644
index 00000000..dfae770b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/727-phy-rtl8367.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -253,6 +253,10 @@ config RTL8366RB_PHY
+ 	tristate "Driver for the Realtek RTL8366RB switch"
+ 	select SWCONFIG
+ 
++config RTL8367_PHY
++	tristate "Driver for the Realtek RTL8367R/M switches"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
++obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.14/728-phy-micrel.patch b/trunk/target/linux/generic/patches-3.14/728-phy-micrel.patch
new file mode 100644
index 00000000..baf5a4a7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/728-phy-micrel.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -144,6 +144,11 @@ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
+ 
++config MICREL_PHY
++	tristate "Drivers for Micrel/Kendin PHYs"
++	---help---
++	  Currently has a driver for the KSZ8041
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
++obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.14/729-phy-rtl8367b.patch b/trunk/target/linux/generic/patches-3.14/729-phy-rtl8367b.patch
new file mode 100644
index 00000000..d69fc89e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/729-phy-rtl8367b.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -262,6 +262,10 @@ config RTL8367_PHY
+ 	tristate "Driver for the Realtek RTL8367R/M switches"
+ 	select SWCONFIG
+ 
++config RTL8367B_PHY
++	tristate "Driver fot the Realtek RTL8367R-VB switch"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
++obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.14/729-phy-tantos.patch b/trunk/target/linux/generic/patches-3.14/729-phy-tantos.patch
new file mode 100644
index 00000000..4a9fe873
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/729-phy-tantos.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -273,3 +273,8 @@ endif # PHYLIB
+ config MICREL_KS8995MA
+ 	tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
+ 	depends on SPI
++
++config PSB6970_PHY
++	tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
++	select SWCONFIG
++	select ETHERNET_PACKET_MANGLE
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -30,6 +30,7 @@ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
++obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.14/730-phy_b53.patch b/trunk/target/linux/generic/patches-3.14/730-phy_b53.patch
new file mode 100644
index 00000000..cd58182f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/730-phy_b53.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -268,6 +268,8 @@ config RTL8367B_PHY
+ 
+ endif # RTL8366_SMI
+ 
++source "drivers/net/phy/b53/Kconfig"
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -31,6 +31,7 @@ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
++obj-$(CONFIG_B53)		+= b53/
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.14/731-phy_mvswitch_3.10_compilation.patch b/trunk/target/linux/generic/patches-3.14/731-phy_mvswitch_3.10_compilation.patch
new file mode 100644
index 00000000..2053bd2f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/731-phy_mvswitch_3.10_compilation.patch
@@ -0,0 +1,35 @@
+From e6a5abb9a02be0bceb4782d9f736bfb4ae217505 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sat, 21 Sep 2013 13:56:51 +0200
+Subject: [PATCH] phy: mvswitch: fix 3.10 compilation
+
+Update to API changes in 3.10.
+
+Signed-off-by: Jonas Gorsi <jogo@openwrt.org>
+---
+ target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/phy/mvswitch.c
++++ b/drivers/net/phy/mvswitch.c
+@@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de
+ 	if (vlan == -1)
+ 		return;
+ 
+-	__vlan_hwaccel_put_tag(skb, vlan);
++	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
+ }
+ 
+ 
+@@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
+ 
+ #ifdef HEADER_MODE
+ 	dev->priv_flags |= IFF_NO_IP_ALIGN;
+-	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
+ #else
+-	dev->features |= NETIF_F_HW_VLAN_RX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
+ #endif
+ 
+ 	return 0;
diff --git a/trunk/target/linux/generic/patches-3.14/732-phy-ar8216-led-support.patch b/trunk/target/linux/generic/patches-3.14/732-phy-ar8216-led-support.patch
new file mode 100644
index 00000000..76c4afcd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/732-phy-ar8216-led-support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -140,6 +140,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config AR8216_PHY_LEDS
++	bool "Atheros AR8216 switch LED support"
++	depends on (AR8216_PHY && LEDS_CLASS)
++
+ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
diff --git a/trunk/target/linux/generic/patches-3.14/733-phy_mvsw6171.patch b/trunk/target/linux/generic/patches-3.14/733-phy_mvsw6171.patch
new file mode 100644
index 00000000..991828da
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/733-phy_mvsw6171.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -131,6 +131,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config MVSW6171_PHY
++	tristate "Driver for Marvell 88E6171 switches"
++	select SWCONFIG
++
+ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_MVSW6171_PHY)	+= mvsw6171.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
diff --git a/trunk/target/linux/generic/patches-3.14/750-hostap_txpower.patch b/trunk/target/linux/generic/patches-3.14/750-hostap_txpower.patch
new file mode 100644
index 00000000..fc032a93
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/750-hostap_txpower.patch
@@ -0,0 +1,154 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t 
+ 		addr[count].sa_family = ARPHRD_ETHER;
+ 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+ 		if (sta->last_rx_silence == 0)
+-			qual[count].qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			qual[count].qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+ 		qual[count].updated = sta->last_rx_updated;
+ 
+ 		sta->last_rx_updated = IW_QUAL_DBM;
+@@ -2475,13 +2475,13 @@ int prism2_ap_translate_scan(struct net_
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = IWEVQUAL;
+ 		if (sta->last_rx_silence == 0)
+-			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			iwe.u.qual.qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+ 		iwe.u.qual.updated = sta->last_rx_updated;
+ 		iwe.len = IW_EV_QUAL_LEN;
+ 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++#define RAW_TXPOWER_SETTING
++
+ #endif /* HOSTAP_CONFIG_H */
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;
+ 
+ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++int hostap_restore_power(struct net_device *dev);
+ 
+ 
+ #endif /* HOSTAP_H */
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -928,6 +928,7 @@ static int hfa384x_set_rid(struct net_de
+ 			prism2_hw_reset(dev);
+ 	}
+ 
++	hostap_restore_power(dev);
+ 	return res;
+ }
+ 
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -435,6 +435,11 @@ static void handle_info_queue_linkstatus
+ 	}
+ 
+ 	/* Get BSSID if we have a valid AP address */
++
++	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++	     val == HFA384X_LINKSTATUS_DISCONNECTED )
++			hostap_restore_power(local->dev);
++
+ 	if (connected) {
+ 		netif_carrier_on(local->dev);
+ 		netif_carrier_on(local->ddev);
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1479,23 +1479,20 @@ static int prism2_txpower_hfa386x_to_dBm
+ 		val = 255;
+ 
+ 	tmp = val;
+-	tmp >>= 2;
+ 
+-	return -12 - tmp;
++	return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+ 	signed char tmp;
+ 
+-	if (val > 20)
+-		return 128;
+-	else if (val < -43)
++	if (val > 127)
+ 		return 127;
++	else if (val < -128)
++		return 128;
+ 
+ 	tmp = val;
+-	tmp = -12 - tmp;
+-	tmp <<= 2;
+ 
+ 	return (unsigned char) tmp;
+ }
+@@ -4052,3 +4049,35 @@ int hostap_ioctl(struct net_device *dev,
+ 
+ 	return ret;
+ }
++
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = netdev_priv(dev);
++       local_info_t *local = iface->local;
++
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
++EXPORT_SYMBOL(hostap_restore_power);
diff --git a/trunk/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch b/trunk/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch
new file mode 100644
index 00000000..c2eef699
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch
@@ -0,0 +1,72 @@
+Register switch connected to srab
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -16,6 +16,7 @@
+ #include <linux/phy.h>
+ #include <linux/interrupt.h>
+ #include <linux/dma-mapping.h>
++#include <linux/platform_data/b53.h>
+ #include <bcm47xx_nvram.h>
+ 
+ static const struct bcma_device_id bgmac_bcma_tbl[] = {
+@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct 
+ 	mdiobus_free(mii_bus);
+ }
+ 
++static struct b53_platform_data bgmac_b53_pdata = {
++};
++
++static struct platform_device bgmac_b53_dev = {
++	.name		= "b53-srab-switch",
++	.id		= -1,
++	.dev		= {
++		.platform_data = &bgmac_b53_pdata,
++	},
++};
++
+ /**************************************************
+  * BCMA bus ops
+  **************************************************/
+@@ -1521,6 +1533,16 @@ static int bgmac_probe(struct bcma_devic
+ 		goto err_dma_free;
+ 	}
+ 
++	if (core->id.id != BCMA_CHIP_ID_BCM4707 &&
++	    core->id.id != BCMA_CHIP_ID_BCM53018 &&
++	    !bgmac_b53_pdata.regs) {
++		bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
++
++		err = platform_device_register(&bgmac_b53_dev);
++		if (!err)
++			bgmac->b53_device = &bgmac_b53_dev;
++	}
++
+ 	err = register_netdev(bgmac->net_dev);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register net device\n");
+@@ -1549,6 +1571,10 @@ static void bgmac_remove(struct bcma_dev
+ {
+ 	struct bgmac *bgmac = bcma_get_drvdata(core);
+ 
++	if (bgmac->b53_device)
++		platform_device_unregister(&bgmac_b53_dev);
++	bgmac->b53_device = NULL;
++
+ 	netif_napi_del(&bgmac->napi);
+ 	unregister_netdev(bgmac->net_dev);
+ 	bgmac_mii_unregister(bgmac);
+--- a/drivers/net/ethernet/broadcom/bgmac.h
++++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -457,6 +457,9 @@ struct bgmac {
+ 	bool has_robosw;
+ 
+ 	bool loopback;
++
++	/* platform device for associated switch */
++	struct platform_device *b53_device;
+ };
+ 
+ static inline u32 bgmac_read(struct bgmac *bgmac, u16 offset)
diff --git a/trunk/target/linux/generic/patches-3.14/775-bgmac-check-length-of-received-frame.patch b/trunk/target/linux/generic/patches-3.14/775-bgmac-check-length-of-received-frame.patch
new file mode 100644
index 00000000..c3d63b65
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/775-bgmac-check-length-of-received-frame.patch
@@ -0,0 +1,39 @@
+From 2d12a9abf3f81de5b51852e3cfcba8cedac82642 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 6 Dec 2013 01:14:52 +0100
+Subject: [PATCH] bgmac: check length of received frame
+
+---
+ drivers/net/ethernet/broadcom/bgmac.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma
+ 			dma_addr_t old_dma_addr = slot->dma_addr;
+ 			int err;
+ 
++			if (len > BGMAC_RX_MAX_FRAME_SIZE) {
++				struct bgmac_dma_desc *dma_desc = ring->cpu_base + ring->start;
++
++				bgmac_err(bgmac, "Hardware reported invalid packet length %d for slot %d!\n", len, ring->start);
++				bgmac_err(bgmac, "flags: 0x%04X\n", flags);
++				bgmac_err(bgmac, "ctl0: 0x%08X\tctl1: 0x%08X\n", le32_to_cpu(dma_desc->ctl0), le32_to_cpu(dma_desc->ctl1));
++
++				bgmac_err(bgmac, "   BGMAC_DMA_RX_CTL: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_INDEX: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGLO: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGLO));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGHI: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGHI));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_STATUS: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_STATUS));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_ERROR: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_ERROR));
++
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
++			}
++
+ 			/* Check for poison and drop or pass the packet */
+ 			if (len == 0xdead && flags == 0xbeef) {
+ 				bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
diff --git a/trunk/target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch b/trunk/target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch
new file mode 100644
index 00000000..3beb9071
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch
@@ -0,0 +1,40 @@
+From cb06d102327eadcd1bdc480bfd9f8876251d1007 Mon Sep 17 00:00:00 2001
+From: Christoph Paasch <christoph.paasch@uclouvain.be>
+Date: Fri, 21 Mar 2014 03:48:19 -0700
+Subject: [PATCH] igb: Fix Null-pointer dereference in igb_reset_q_vector
+
+When igb_set_interrupt_capability() calls
+igb_reset_interrupt_capability() (e.g., because CONFIG_PCI_MSI is unset),
+num_q_vectors has been set but no vector has yet been allocated.
+
+igb_reset_interrupt_capability() will then call igb_reset_q_vector,
+which assumes that the vector is allocated. As this is not the case, we
+are accessing a NULL-pointer.
+
+This patch fixes it by checking that q_vector is indeed different from
+NULL.
+
+Fixes: 02ef6e1d0b0023 (igb: Fix queue allocation method to accommodate changing during runtime)
+Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
+Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
+Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+---
+ drivers/net/ethernet/intel/igb/igb_main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -1020,6 +1020,12 @@ static void igb_reset_q_vector(struct ig
+ 	if (!q_vector)
+ 		return;
+ 
++	/* Coming from igb_set_interrupt_capability, the vectors are not yet
++	 * allocated. So, q_vector is NULL so we should stop here.
++	 */
++	if (!q_vector)
++		return;
++
+ 	if (q_vector->tx.ring)
+ 		adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/785-hso-support-0af0-9300.patch b/trunk/target/linux/generic/patches-3.14/785-hso-support-0af0-9300.patch
new file mode 100644
index 00000000..8cd9e753
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/785-hso-support-0af0-9300.patch
@@ -0,0 +1,25 @@
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -470,6 +470,7 @@ static const struct usb_device_id hso_id
+ 	{USB_DEVICE(0x0af0, 0x8900)},
+ 	{USB_DEVICE(0x0af0, 0x9000)},
+ 	{USB_DEVICE(0x0af0, 0x9200)},		/* Option GTM671WFS */
++	{USB_DEVICE(0x0af0, 0x9300)},		/* GTM 66xxWFS */
+ 	{USB_DEVICE(0x0af0, 0xd035)},
+ 	{USB_DEVICE(0x0af0, 0xd055)},
+ 	{USB_DEVICE(0x0af0, 0xd155)},
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1304,6 +1304,12 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		0 ),
+ 
++UNUSUAL_DEV( 0x0af0, 0x9300, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 66xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
+ UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000,
+ 		"Option",
+ 		"GI 070x SD-Card",
diff --git a/trunk/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch b/trunk/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
new file mode 100644
index 00000000..e483ddd6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
@@ -0,0 +1,51 @@
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -58,6 +58,12 @@ config XEN_PCIDEV_FRONTEND
+           The PCI device frontend driver allows the kernel to import arbitrary
+           PCI devices from a PCI backend to support PCI driver domains.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++	bool "PCI disable common quirks"
++	depends on PCI
++	help
++	  If you don't know what to do here, say N.
++
+ config HT_IRQ
+ 	bool "Interrupts on hypertransport devices"
+ 	default y
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -41,6 +41,7 @@ static void quirk_mmio_always_on(struct 
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
+ 				PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -2880,6 +2881,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ /*
+  * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.  To
+@@ -2936,6 +2938,8 @@ static void fixup_debug_report(struct pc
+ 	}
+ }
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ /*
+  * Some BIOS implementations leave the Intel GPU interrupts enabled,
+  * even though no one is handling them (f.e. i915 driver is never loaded).
+@@ -2971,6 +2975,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
+ /*
+  * PCI devices which are on Intel chips can skip the 10ms delay
+  * before entering D3 mode.
diff --git a/trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch b/trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 00000000..4c8ee4a7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,101 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -97,6 +97,8 @@ struct amd_chipset_type {
+ 	u8 rev;
+ };
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static struct amd_chipset_info {
+ 	struct pci_dev	*nb_dev;
+ 	struct pci_dev	*smbus_dev;
+@@ -454,6 +456,10 @@ void usb_amd_dev_put(void)
+ }
+ EXPORT_SYMBOL_GPL(usb_amd_dev_put);
+ 
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
++#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
++
+ /*
+  * Make sure the controller is completely inactive, unable to
+  * generate interrupts or do DMA.
+@@ -533,8 +539,17 @@ reset_needed:
+ 	uhci_reset_hc(pdev, base);
+ 	return 1;
+ }
++#else
++int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
++{
++	return 0;
++}
++
++#endif
+ EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ {
+ 	u16 cmd;
+@@ -1083,3 +1098,4 @@ static void quirk_usb_early_handoff(stru
+ }
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+ 			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
++#endif
+--- a/drivers/usb/host/pci-quirks.h
++++ b/drivers/usb/host/pci-quirks.h
+@@ -4,6 +4,9 @@
+ #ifdef CONFIG_PCI
+ void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
+ int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
++#endif  /* CONFIG_PCI */
++
++#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ int usb_amd_find_chipset_info(void);
+ bool usb_amd_hang_symptom_quirk(void);
+ bool usb_amd_prefetch_quirk(void);
+@@ -15,11 +18,24 @@ void usb_disable_xhci_ports(struct pci_d
+ void sb800_prefetch(struct device *dev, int on);
+ #else
+ struct pci_dev;
++static inline int usb_amd_find_chipset_info(void)
++{
++	return 0;
++}
++static inline bool usb_amd_hang_symptom_quirk(void)
++{
++	return false;
++}
++static inline bool usb_amd_prefetch_quirk(void)
++{
++	return false;
++}
+ static inline void usb_amd_quirk_pll_disable(void) {}
+ static inline void usb_amd_quirk_pll_enable(void) {}
+ static inline void usb_amd_dev_put(void) {}
+ static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
+ static inline void sb800_prefetch(struct device *dev, int on) {}
+-#endif  /* CONFIG_PCI */
++static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
++#endif
+ 
+ #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -439,7 +439,14 @@ extern int usb_hcd_pci_probe(struct pci_
+ extern void usb_hcd_pci_remove(struct pci_dev *dev);
+ extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
++#else
++static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
++{
++	return 0;
++}
++#endif
+ 
+ #ifdef CONFIG_PM
+ extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
diff --git a/trunk/target/linux/generic/patches-3.14/820-usb_add_usb_find_device_by_name.patch b/trunk/target/linux/generic/patches-3.14/820-usb_add_usb_find_device_by_name.patch
new file mode 100644
index 00000000..99c7a362
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/820-usb_add_usb_find_device_by_name.patch
@@ -0,0 +1,84 @@
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -689,6 +689,71 @@ int __usb_get_extra_descriptor(char *buf
+ }
+ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
+ 
++static struct usb_device *match_device_name(struct usb_device *dev,
++					    const char *name)
++{
++	struct usb_device *ret_dev = NULL;
++	struct usb_device *childdev = NULL;
++	int child;
++
++	dev_dbg(&dev->dev, "check for name %s ...\n", name);
++
++	/* see if this device matches */
++	if (strcmp(dev_name(&dev->dev), name) == 0 ) {
++		dev_dbg(&dev->dev, "matched this device!\n");
++		ret_dev = usb_get_dev(dev);
++		goto exit;
++	}
++	/* look through all of the children of this device */
++	usb_hub_for_each_child(dev, child, childdev) {
++		if (childdev) {
++			usb_lock_device(childdev);
++			ret_dev = match_device_name(childdev, name);
++			usb_unlock_device(childdev);
++			if (ret_dev)
++				goto exit;
++		}
++	}
++exit:
++	return ret_dev;
++}
++
++/**
++ * usb_find_device_by_name - find a specific usb device in the system
++ * @name: the name of the device to find
++ *
++ * Returns a pointer to a struct usb_device if such a specified usb
++ * device is present in the system currently.  The usage count of the
++ * device will be incremented if a device is found.  Make sure to call
++ * usb_put_dev() when the caller is finished with the device.
++ *
++ * If a device with the specified bus id is not found, NULL is returned.
++ */
++struct usb_device *usb_find_device_by_name(const char *name)
++{
++	struct list_head *buslist;
++	struct usb_bus *bus;
++	struct usb_device *dev = NULL;
++
++	mutex_lock(&usb_bus_list_lock);
++	for (buslist = usb_bus_list.next;
++	     buslist != &usb_bus_list;
++	     buslist = buslist->next) {
++		bus = container_of(buslist, struct usb_bus, bus_list);
++		if (!bus->root_hub)
++			continue;
++		usb_lock_device(bus->root_hub);
++		dev = match_device_name(bus->root_hub, name);
++		usb_unlock_device(bus->root_hub);
++		if (dev)
++			goto exit;
++	}
++exit:
++	mutex_unlock(&usb_bus_list_lock);
++	return dev;
++}
++EXPORT_SYMBOL_GPL(usb_find_device_by_name);
++
+ /**
+  * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP
+  * @dev: device the buffer will be used with
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -692,6 +692,7 @@ static inline bool usb_device_no_sg_cons
+ 	return udev && udev->bus && udev->bus->no_sg_constraint;
+ }
+ 
++extern struct usb_device *usb_find_device_by_name(const char *name);
+ 
+ /*-------------------------------------------------------------------------*/
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/830-ledtrig_morse.patch b/trunk/target/linux/generic/patches-3.14/830-ledtrig_morse.patch
new file mode 100644
index 00000000..a5dffd2d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/830-ledtrig_morse.patch
@@ -0,0 +1,28 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA
+ 	  This enables direct flash/torch on/off by the driver, kernel space.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_MORSE
++	tristate "LED Morse Trigger"
++	depends on LEDS_TRIGGERS
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -60,3 +60,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ 
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
++obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+--- a/drivers/leds/ledtrig-morse.c
++++ b/drivers/leds/ledtrig-morse.c
+@@ -26,7 +26,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/leds.h>
diff --git a/trunk/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch b/trunk/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch
new file mode 100644
index 00000000..77bc8cc0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch
@@ -0,0 +1,60 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE
+ 	tristate "LED Morse Trigger"
+ 	depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_NETDEV
++	tristate "LED Netdev Trigger"
++	depends on NET && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by network device activity.
++	  If unsure, say Y.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -61,3 +61,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
++obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+--- a/drivers/leds/ledtrig-netdev.c
++++ b/drivers/leds/ledtrig-netdev.c
+@@ -22,7 +22,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/netdevice.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+@@ -254,7 +253,7 @@ static int netdev_trig_notify(struct not
+ 			      unsigned long evt,
+ 			      void *dv)
+ {
+-	struct net_device *dev = dv;
++	struct net_device *dev = netdev_notifier_info_to_dev((struct netdev_notifier_info *) dv);
+ 	struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
+ 
+ 	if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
+@@ -294,8 +293,9 @@ done:
+ static void netdev_trig_timer(unsigned long arg)
+ {
+ 	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
+-	const struct net_device_stats *dev_stats;
++	struct rtnl_link_stats64 *dev_stats;
+ 	unsigned new_activity;
++	struct rtnl_link_stats64 temp;
+ 
+ 	write_lock(&trigger_data->lock);
+ 
+@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
+ 		goto no_restart;
+ 	}
+ 
+-	dev_stats = dev_get_stats(trigger_data->net_dev);
++	dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
+ 	new_activity =
+ 		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
+ 		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
diff --git a/trunk/target/linux/generic/patches-3.14/832-ledtrig_usbdev.patch b/trunk/target/linux/generic/patches-3.14/832-ledtrig_usbdev.patch
new file mode 100644
index 00000000..c0568eb8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/832-ledtrig_usbdev.patch
@@ -0,0 +1,31 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV
+ 	  This allows LEDs to be controlled by network device activity.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_USBDEV
++	tristate "LED USB device Trigger"
++	depends on USB && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by the presence/activity of
++	  an USB device. If unsure, say N.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -62,3 +62,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
++obj-$(CONFIG_LEDS_TRIGGER_USBDEV)	+= ledtrig-usbdev.o
+--- a/drivers/leds/ledtrig-usbdev.c
++++ b/drivers/leds/ledtrig-usbdev.c
+@@ -24,7 +24,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/slab.h>
diff --git a/trunk/target/linux/generic/patches-3.14/840-rtc7301.patch b/trunk/target/linux/generic/patches-3.14/840-rtc7301.patch
new file mode 100644
index 00000000..42cbd86a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/840-rtc7301.patch
@@ -0,0 +1,250 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -900,6 +900,15 @@ config RTC_DRV_NUC900
+ 	  If you say yes here you get support for the RTC subsystem of the
+ 	  NUC910/NUC920 used in embedded systems.
+ 
++config RTC_DRV_RTC7301
++	tristate "Epson RTC-7301 SF/DG"
++	help
++	  If you say Y here you will get support for the
++	  Epson RTC-7301 SF/DG RTC chips.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-7301.
++
+ comment "on-CPU RTC drivers"
+ 
+ config RTC_DRV_DAVINCI
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -104,6 +104,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
+ obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
+ obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
+ obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
++obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
+ obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o
+ obj-$(CONFIG_RTC_DRV_RX4581)	+= rtc-rx4581.o
+ obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
+--- /dev/null
++++ b/drivers/rtc/rtc-rtc7301.c
+@@ -0,0 +1,219 @@
++/*
++ * Driver for Epson RTC-7301SF/DG
++ *
++ * Copyright (C) 2009 Jose Vasconcellos
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/rtc.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/bcd.h>
++
++#define RTC_NAME "rtc7301"
++#define RTC_VERSION "0.1"
++
++/* Epson RTC-7301 register addresses */
++#define RTC7301_SEC		0x00
++#define RTC7301_SEC10		0x01
++#define RTC7301_MIN		0x02
++#define RTC7301_MIN10		0x03
++#define RTC7301_HOUR		0x04
++#define RTC7301_HOUR10		0x05
++#define RTC7301_WEEKDAY		0x06
++#define RTC7301_DAY		0x07
++#define RTC7301_DAY10		0x08
++#define RTC7301_MON		0x09
++#define RTC7301_MON10		0x0A
++#define RTC7301_YEAR		0x0B
++#define RTC7301_YEAR10		0x0C
++#define RTC7301_YEAR100		0x0D
++#define RTC7301_YEAR1000	0x0E
++#define RTC7301_CTRLREG		0x0F
++
++static uint8_t __iomem *rtc7301_base;
++
++#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
++#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
++
++#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
++
++static void rtc7301_init_settings(void)
++{
++	int i;
++
++	write_reg(RTC7301_CTRLREG, 2);
++	write_reg(RTC7301_YEAR1000, 2);
++	udelay(122);
++
++	/* bank 1 */
++	write_reg(RTC7301_CTRLREG, 6);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++
++	/* bank 2 */
++	write_reg(RTC7301_CTRLREG, 14);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++	write_reg(RTC7301_CTRLREG, 0);
++}
++
++static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int cnt;
++	uint8_t buf[16];
++
++	cnt = 0;
++	while (rtc7301_isbusy()) {
++		udelay(244);
++		if (cnt++ > 100) {
++			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
++			return -EIO;
++		}
++	}
++
++	for (cnt=0; cnt<16; cnt++)
++		buf[cnt] = read_reg(cnt);
++
++	if (buf[RTC7301_SEC10] & 8) {
++		dev_err(dev, "%s: RTC not set\n", __func__);
++		return -EINVAL;
++	}
++
++	memset(dt, 0, sizeof(*dt));
++
++	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
++	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
++	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
++
++	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
++	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
++	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
++		      buf[RTC7301_YEAR100]*100 +
++		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
++
++	/* the rtc device may contain illegal values on power up
++	 * according to the data sheet. make sure they are valid.
++	 */
++
++	return rtc_valid_tm(dt);
++}
++
++static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int data;
++
++	data = dt->tm_year + 1900;
++	if (data >= 2100 || data < 1900)
++		return -EINVAL;
++
++	write_reg(RTC7301_CTRLREG, 2);
++       	udelay(122);
++
++	data = bin2bcd(dt->tm_sec);
++	write_reg(RTC7301_SEC, data);
++	write_reg(RTC7301_SEC10, (data >> 4));
++
++	data = bin2bcd(dt->tm_min);
++	write_reg(RTC7301_MIN, data );
++	write_reg(RTC7301_MIN10, (data >> 4));
++
++	data = bin2bcd(dt->tm_hour);
++	write_reg(RTC7301_HOUR, data);
++	write_reg(RTC7301_HOUR10, (data >> 4));
++
++	data = bin2bcd(dt->tm_mday);
++	write_reg(RTC7301_DAY, data);
++	write_reg(RTC7301_DAY10, (data>> 4));
++
++	data = bin2bcd(dt->tm_mon + 1);
++	write_reg(RTC7301_MON, data);
++	write_reg(RTC7301_MON10, (data >> 4));
++
++	data = bin2bcd(dt->tm_year % 100);
++	write_reg(RTC7301_YEAR, data);
++	write_reg(RTC7301_YEAR10, (data >> 4));
++	data = bin2bcd((1900 + dt->tm_year) / 100);
++	write_reg(RTC7301_YEAR100, data);
++
++	data = bin2bcd(dt->tm_wday);
++	write_reg(RTC7301_WEEKDAY, data);
++
++	write_reg(RTC7301_CTRLREG, 0);
++
++	return 0;
++}
++
++static const struct rtc_class_ops rtc7301_rtc_ops = {
++	.read_time	= rtc7301_get_datetime,
++	.set_time	= rtc7301_set_datetime,
++};
++
++static int rtc7301_probe(struct platform_device *pdev)
++{
++	struct rtc_device *rtc;
++	struct resource *res;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENOENT;
++
++	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
++	if (!rtc7301_base)
++		return -EINVAL;
++
++	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
++				&rtc7301_rtc_ops, THIS_MODULE);
++	if (IS_ERR(rtc)) {
++		iounmap(rtc7301_base);
++		return PTR_ERR(rtc);
++	}
++
++	platform_set_drvdata(pdev, rtc);
++
++	rtc7301_init_settings();
++	return 0;
++}
++
++static int rtc7301_remove(struct platform_device *pdev)
++{
++	struct rtc_device *rtc = platform_get_drvdata(pdev);
++
++	if (rtc)
++		rtc_device_unregister(rtc);
++	if (rtc7301_base)
++		iounmap(rtc7301_base);
++	return 0;
++}
++
++static struct platform_driver rtc7301_driver = {
++	.driver = {
++		.name	= RTC_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe	= rtc7301_probe,
++	.remove = rtc7301_remove,
++};
++
++static __init int rtc7301_init(void)
++{
++	return platform_driver_register(&rtc7301_driver);
++}
++module_init(rtc7301_init);
++
++static __exit void rtc7301_exit(void)
++{
++	platform_driver_unregister(&rtc7301_driver);
++}
++module_exit(rtc7301_exit);
++
++MODULE_DESCRIPTION("Epson 7301 RTC driver");
++MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" RTC_NAME);
++MODULE_VERSION(RTC_VERSION);
diff --git a/trunk/target/linux/generic/patches-3.14/841-rtc_pt7c4338.patch b/trunk/target/linux/generic/patches-3.14/841-rtc_pt7c4338.patch
new file mode 100644
index 00000000..6391ce02
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/841-rtc_pt7c4338.patch
@@ -0,0 +1,247 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -539,6 +539,15 @@ config RTC_DRV_S5M
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-s5m.
+ 
++config RTC_DRV_PT7C4338
++	tristate "Pericom Technology Inc. PT7C4338 RTC"
++	help
++	  If you say yes here you get support for the Pericom Technology
++	  Inc. PT7C4338 RTC chip.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-pt7c4338.
++
+ endif # I2C
+ 
+ comment "SPI RTC drivers"
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -96,6 +96,7 @@ obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030
+ obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
+ obj-$(CONFIG_RTC_DRV_PM8XXX)	+= rtc-pm8xxx.o
+ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
++obj-$(CONFIG_RTC_DRV_PT7C4338)	+= rtc-pt7c4338.o
+ obj-$(CONFIG_RTC_DRV_PUV3)	+= rtc-puv3.o
+ obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
+ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
+--- /dev/null
++++ b/drivers/rtc/rtc-pt7c4338.c
+@@ -0,0 +1,216 @@
++/*
++ * Copyright 2010 Freescale Semiconductor, Inc.
++ *
++ * Author:	Priyanka Jain <Priyanka.Jain@freescale.com>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++
++/*
++ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
++ *
++ * This file is based on drivers/rtc/rtc-ds1307.c
++ *
++ * PT7C4338 chip is manufactured by Pericom Technology Inc.
++ * It is a serial real-time clock which provides
++ * 1)Low-power clock/calendar.
++ * 2)Programmable square-wave output.
++ * It has 56 bytes of nonvolatile RAM.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++
++/* RTC register addresses */
++#define PT7C4338_REG_SECONDS          0x00
++#define PT7C4338_REG_MINUTES          0x01
++#define PT7C4338_REG_HOURS            0x02
++#define PT7C4338_REG_AMPM             0x02
++#define PT7C4338_REG_DAY              0x03
++#define PT7C4338_REG_DATE             0x04
++#define PT7C4338_REG_MONTH            0x05
++#define PT7C4338_REG_YEAR             0x06
++#define PT7C4338_REG_CTRL_STAT        0x07
++
++/* RTC second register address bit */
++#define PT7C4338_SEC_BIT_CH           0x80	/*Clock Halt (in Register 0)*/
++
++/* RTC control and status register bits */
++#define PT7C4338_CTRL_STAT_BIT_RS0    0x1	/*Rate select 0*/
++#define PT7C4338_CTRL_STAT_BIT_RS1    0x2	/*Rate select 1*/
++#define PT7C4338_CTRL_STAT_BIT_SQWE   0x10	/*Square Wave Enable*/
++#define PT7C4338_CTRL_STAT_BIT_OSF    0x20	/*Oscillator Stop Flag*/
++#define PT7C4338_CTRL_STAT_BIT_OUT    0x80	/*Output Level Control*/
++
++static const struct i2c_device_id pt7c4338_id[] = {
++	{ "pt7c4338", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, pt7c4338_id);
++
++struct pt7c4338{
++	struct i2c_client *client;
++	struct rtc_device *rtc;
++};
++
++static int pt7c4338_read_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	int ret;
++	u8 buf[7];
++	u8 year, month, day, hour, minute, second;
++	u8 week, twelve_hr, am_pm;
++
++	ret = i2c_smbus_read_i2c_block_data(client,
++			PT7C4338_REG_SECONDS, 7, buf);
++	if (ret < 0)
++		return ret;
++	if (ret < 7)
++		return -EIO;
++
++	second = buf[0];
++	minute = buf[1];
++	hour = buf[2];
++	week = buf[3];
++	day = buf[4];
++	month = buf[5];
++	year = buf[6];
++
++	/* Extract additional information for AM/PM */
++	twelve_hr = hour & 0x40;
++	am_pm = hour & 0x20;
++
++	/* Write to rtc_time structure */
++	time->tm_sec = bcd2bin(second & 0x7f);
++	time->tm_min = bcd2bin(minute & 0x7f);
++	if (twelve_hr) {
++		/* Convert to 24 hr */
++		if (am_pm)
++			time->tm_hour = bcd2bin(hour & 0x10) + 12;
++		else
++			time->tm_hour = bcd2bin(hour & 0xBF);
++	} else {
++		time->tm_hour = bcd2bin(hour);
++	}
++
++	time->tm_wday = bcd2bin(week & 0x07) - 1;
++	time->tm_mday = bcd2bin(day & 0x3f);
++	time->tm_mon = bcd2bin(month & 0x1F) - 1;
++	/* assume 20YY not 19YY */
++	time->tm_year = bcd2bin(year) + 100;
++
++	return 0;
++}
++
++static int pt7c4338_set_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	u8 buf[7];
++
++	/* Extract time from rtc_time and load into pt7c4338*/
++	buf[0] = bin2bcd(time->tm_sec);
++	buf[1] = bin2bcd(time->tm_min);
++	buf[2] = bin2bcd(time->tm_hour);
++	buf[3] = bin2bcd(time->tm_wday + 1); /* Day of the week */
++	buf[4] = bin2bcd(time->tm_mday); /* Date */
++	buf[5] = bin2bcd(time->tm_mon + 1);
++
++	/* assume 20YY not 19YY */
++	if (time->tm_year >= 100)
++		buf[6] = bin2bcd(time->tm_year - 100);
++	else
++		buf[6] = bin2bcd(time->tm_year);
++
++	return i2c_smbus_write_i2c_block_data(client,
++					PT7C4338_REG_SECONDS, 7, buf);
++}
++
++static const struct rtc_class_ops pt7c4338_rtc_ops = {
++	.read_time = pt7c4338_read_time,
++	.set_time = pt7c4338_set_time,
++};
++
++static int pt7c4338_probe(struct i2c_client *client,
++		const struct i2c_device_id *id)
++{
++	struct pt7c4338 *pt7c4338;
++	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
++	int ret;
++
++	pt7c4338 = kzalloc(sizeof(struct pt7c4338), GFP_KERNEL);
++	if (!pt7c4338)
++		return -ENOMEM;
++
++	pt7c4338->client = client;
++	i2c_set_clientdata(client, pt7c4338);
++	pt7c4338->rtc = rtc_device_register(client->name, &client->dev,
++					&pt7c4338_rtc_ops, THIS_MODULE);
++	if (IS_ERR(pt7c4338->rtc)) {
++		ret = PTR_ERR(pt7c4338->rtc);
++		dev_err(&client->dev, "unable to register the class device\n");
++		goto out_free;
++	}
++
++	return 0;
++out_free:
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return ret;
++}
++
++static int pt7c4338_remove(struct i2c_client *client)
++{
++	struct pt7c4338 *pt7c4338 = i2c_get_clientdata(client);
++
++	rtc_device_unregister(pt7c4338->rtc);
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return 0;
++}
++
++static struct i2c_driver pt7c4338_driver = {
++	.driver = {
++		.name = "rtc-pt7c4338",
++		.owner = THIS_MODULE,
++	},
++	.probe = pt7c4338_probe,
++	.remove = pt7c4338_remove,
++	.id_table = pt7c4338_id,
++};
++
++static int __init pt7c4338_init(void)
++{
++	return i2c_add_driver(&pt7c4338_driver);
++}
++
++static void __exit pt7c4338_exit(void)
++{
++	i2c_del_driver(&pt7c4338_driver);
++}
++
++module_init(pt7c4338_init);
++module_exit(pt7c4338_exit);
++
++MODULE_AUTHOR("Priyanka Jain <Priyanka.Jain@freescale.com>");
++MODULE_DESCRIPTION("pericom Technology Inc. PT7C4338 RTC Driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.14/861-04_spi_gpio_implement_spi_delay.patch b/trunk/target/linux/generic/patches-3.14/861-04_spi_gpio_implement_spi_delay.patch
new file mode 100644
index 00000000..6cbe4c3e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/861-04_spi_gpio_implement_spi_delay.patch
@@ -0,0 +1,58 @@
+Implement the SPI-GPIO delay function for busses that need speed limitation.
+
+--mb
+
+
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -22,6 +22,7 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/delay.h>
+ #include <linux/of.h>
+ #include <linux/of_device.h>
+ #include <linux/of_gpio.h>
+@@ -74,6 +75,7 @@ struct spi_gpio {
+  *		#define	SPI_MOSI_GPIO	120
+  *		#define	SPI_SCK_GPIO	121
+  *		#define	SPI_N_CHIPSEL	4
++ *		#undef NEED_SPIDELAY
+  *		#include "spi-gpio.c"
+  */
+ 
+@@ -81,6 +83,7 @@ struct spi_gpio {
+ #define DRIVER_NAME	"spi_gpio"
+ 
+ #define GENERIC_BITBANG	/* vs tight inlines */
++#define NEED_SPIDELAY	1
+ 
+ /* all functions referencing these symbols must define pdata */
+ #define SPI_MISO_GPIO	((pdata)->miso)
+@@ -131,12 +134,20 @@ static inline int getmiso(const struct s
+ #undef pdata
+ 
+ /*
+- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
+- * requested device clock.  Software overhead means we usually have trouble
+- * reaching even one Mbit/sec (except when we can inline bitops), so for now
+- * we'll just assume we never need additional per-bit slowdowns.
++ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
++ * and spi_transfer.speed_hz to 0.
++ * Otherwise this is a function of the requested device clock.
++ * Software overhead means we usually have trouble
++ * reaching even one Mbit/sec (except when we can inline bitops). So on small
++ * embedded devices with fast SPI slaves you usually don't need a delay.
+  */
+-#define spidelay(nsecs)	do {} while (0)
++static inline void spidelay(unsigned nsecs)
++{
++#ifdef NEED_SPIDELAY
++	if (unlikely(nsecs))
++		ndelay(nsecs);
++#endif /* NEED_SPIDELAY */
++}
+ 
+ #include "spi-bitbang-txrx.h"
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/862-gpio_spi_driver.patch b/trunk/target/linux/generic/patches-3.14/862-gpio_spi_driver.patch
new file mode 100644
index 00000000..304445a3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/862-gpio_spi_driver.patch
@@ -0,0 +1,373 @@
+THIS CODE IS DEPRECATED.
+
+Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+--mb
+
+
+
+---
+ drivers/spi/Kconfig              |    9 +
+ drivers/spi/Makefile             |    1 
+ drivers/spi/spi_gpio_old.c       |  251 +++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi_gpio_old.h |   73 +++++++++++
+ 4 files changed, 334 insertions(+)
+
+--- /dev/null
++++ b/include/linux/spi/spi_gpio_old.h
+@@ -0,0 +1,73 @@
++/*
++ * spi_gpio interface to platform code
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++#ifndef _LINUX_SPI_SPI_GPIO
++#define _LINUX_SPI_SPI_GPIO
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++
++
++/**
++ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
++ *
++ * This structure holds information about a GPIO-based SPI device.
++ *
++ * @pin_clk: The GPIO pin number of the CLOCK pin.
++ *
++ * @pin_miso: The GPIO pin number of the MISO pin.
++ *
++ * @pin_mosi: The GPIO pin number of the MOSI pin.
++ *
++ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
++ *
++ * @cs_activelow: If true, the chip is selected when the CS line is low.
++ *
++ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
++ *                Note that doing no delay is not standards compliant,
++ *                but it might be needed to speed up transfers on some
++ *                slow embedded machines.
++ *
++ * @boardinfo_setup: This callback is called after the
++ *                   SPI master device was registered, but before the
++ *                   device is registered.
++ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
++ */
++struct spi_gpio_platform_data {
++	unsigned int pin_clk;
++	unsigned int pin_miso;
++	unsigned int pin_mosi;
++	unsigned int pin_cs;
++	bool cs_activelow;
++	bool no_spi_delay;
++	int (*boardinfo_setup)(struct spi_board_info *bi,
++			       struct spi_master *master,
++			       void *data);
++	void *boardinfo_setup_data;
++};
++
++/**
++ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a spi-gpio device.
++ */
++#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
++
++/**
++ * spi_gpio_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int spi_gpio_next_id(void);
++
++#endif /* _LINUX_SPI_SPI_GPIO */
+--- /dev/null
++++ b/drivers/spi/spi_gpio_old.c
+@@ -0,0 +1,251 @@
++/*
++ * Bitbanging SPI bus driver using GPIO API
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * based on spi_s3c2410_gpio.c
++ *   Copyright (c) 2006 Ben Dooks
++ *   Copyright (c) 2006 Simtec Electronics
++ * and on i2c-gpio.c
++ *   Copyright (C) 2007 Atmel Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/spi_bitbang.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++struct spi_gpio {
++	struct spi_bitbang bitbang;
++	struct spi_gpio_platform_data *info;
++	struct platform_device *pdev;
++	struct spi_board_info bi;
++};
++
++
++static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
++{
++	return dev->controller_data;
++}
++
++static inline void setsck(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
++}
++
++static inline void setmosi(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
++}
++
++static inline u32 getmiso(struct spi_device *dev)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
++}
++
++static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (!sp->info->no_spi_delay)
++		ndelay(nsecs);
++}
++
++#define spidelay(nsecs) do {					\
++	/* Steal the spi_device pointer from our caller.	\
++	 * The bitbang-API should probably get fixed here... */	\
++	do_spidelay(spi, nsecs);				\
++  } while (0)
++
++#define EXPAND_BITBANG_TXRX
++#include "spi-bitbang-txrx.h"
++
++static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
++}
++
++static void spi_gpio_chipselect(struct spi_device *dev, int on)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (sp->info->cs_activelow)
++		on = !on;
++	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
++}
++
++static int spi_gpio_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct spi_gpio_platform_data *pdata;
++	struct spi_gpio *sp;
++	struct spi_device *spidev;
++	int err;
++
++	pdata = pdev->dev.platform_data;
++	if (!pdata)
++		return -ENXIO;
++
++	err = -ENOMEM;
++	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
++	if (!master)
++		goto err_alloc_master;
++
++	sp = spi_master_get_devdata(master);
++	platform_set_drvdata(pdev, sp);
++	sp->info = pdata;
++
++	err = gpio_request(pdata->pin_clk, "spi_clock");
++	if (err)
++		goto err_request_clk;
++	err = gpio_request(pdata->pin_mosi, "spi_mosi");
++	if (err)
++		goto err_request_mosi;
++	err = gpio_request(pdata->pin_miso, "spi_miso");
++	if (err)
++		goto err_request_miso;
++	err = gpio_request(pdata->pin_cs, "spi_cs");
++	if (err)
++		goto err_request_cs;
++
++	sp->bitbang.master = spi_master_get(master);
++	sp->bitbang.master->bus_num = -1;
++	sp->bitbang.master->num_chipselect = 1;
++	sp->bitbang.chipselect = spi_gpio_chipselect;
++	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
++	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
++	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
++	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
++
++	gpio_direction_output(pdata->pin_clk, 0);
++	gpio_direction_output(pdata->pin_mosi, 0);
++	gpio_direction_output(pdata->pin_cs,
++			      pdata->cs_activelow ? 1 : 0);
++	gpio_direction_input(pdata->pin_miso);
++
++	err = spi_bitbang_start(&sp->bitbang);
++	if (err)
++		goto err_no_bitbang;
++	err = pdata->boardinfo_setup(&sp->bi, master,
++				     pdata->boardinfo_setup_data);
++	if (err)
++		goto err_bi_setup;
++	sp->bi.controller_data = sp;
++	spidev = spi_new_device(master, &sp->bi);
++	if (!spidev)
++		goto err_new_dev;
++
++	return 0;
++
++err_new_dev:
++err_bi_setup:
++	spi_bitbang_stop(&sp->bitbang);
++err_no_bitbang:
++	spi_master_put(sp->bitbang.master);
++	gpio_free(pdata->pin_cs);
++err_request_cs:
++	gpio_free(pdata->pin_miso);
++err_request_miso:
++	gpio_free(pdata->pin_mosi);
++err_request_mosi:
++	gpio_free(pdata->pin_clk);
++err_request_clk:
++	kfree(master);
++
++err_alloc_master:
++	return err;
++}
++
++static int spi_gpio_remove(struct platform_device *pdev)
++{
++	struct spi_gpio *sp;
++	struct spi_gpio_platform_data *pdata;
++
++	pdata = pdev->dev.platform_data;
++	sp = platform_get_drvdata(pdev);
++
++	gpio_free(pdata->pin_clk);
++	gpio_free(pdata->pin_mosi);
++	gpio_free(pdata->pin_miso);
++	gpio_free(pdata->pin_cs);
++	spi_bitbang_stop(&sp->bitbang);
++	spi_master_put(sp->bitbang.master);
++
++	return 0;
++}
++
++static struct platform_driver spi_gpio_driver = {
++	.driver		= {
++		.name	= SPI_GPIO_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe		= spi_gpio_probe,
++	.remove		= spi_gpio_remove,
++};
++
++int spi_gpio_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(spi_gpio_next_id);
++
++static int __init spi_gpio_init(void)
++{
++	int err;
++
++	err = platform_driver_register(&spi_gpio_driver);
++	if (err)
++		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
++
++	return err;
++}
++module_init(spi_gpio_init);
++
++static void __exit spi_gpio_exit(void)
++{
++	platform_driver_unregister(&spi_gpio_driver);
++}
++module_exit(spi_gpio_exit);
++
++MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
++MODULE_LICENSE("GPL v2");
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -208,6 +208,15 @@ config SPI_GPIO
+ 	  GPIO operations, you should be able to leverage that for better
+ 	  speed with a custom version of this driver; see the source code.
+ 
++config SPI_GPIO_OLD
++	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
++	depends on SPI_MASTER && GPIOLIB
++	select SPI_BITBANG
++	help
++	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
++
++	  If unsure, say N.
++
+ config SPI_IMX
+ 	tristate "Freescale i.MX SPI controllers"
+ 	depends on ARCH_MXC || COMPILE_TEST
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -38,6 +38,7 @@ obj-$(CONFIG_SPI_FSL_LIB)		+= spi-fsl-li
+ obj-$(CONFIG_SPI_FSL_ESPI)		+= spi-fsl-espi.o
+ obj-$(CONFIG_SPI_FSL_SPI)		+= spi-fsl-spi.o
+ obj-$(CONFIG_SPI_GPIO)			+= spi-gpio.o
++obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
+ obj-$(CONFIG_SPI_IMX)			+= spi-imx.o
+ obj-$(CONFIG_SPI_LM70_LLP)		+= spi-lm70llp.o
+ obj-$(CONFIG_SPI_MPC512x_PSC)		+= spi-mpc512x-psc.o
diff --git a/trunk/target/linux/generic/patches-3.14/863-gpiommc.patch b/trunk/target/linux/generic/patches-3.14/863-gpiommc.patch
new file mode 100644
index 00000000..8f3022c8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/863-gpiommc.patch
@@ -0,0 +1,844 @@
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
+@@ -0,0 +1,609 @@
++/*
++ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
++ * This module hooks up the mmc_spi and spi_gpio modules and also
++ * provides a configfs interface.
++ *
++ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/module.h>
++#include <linux/mmc/gpiommc.h>
++#include <linux/platform_device.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/configfs.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++#define PFX				"gpio-mmc: "
++
++
++struct gpiommc_device {
++	struct platform_device *pdev;
++	struct platform_device *spi_pdev;
++	struct spi_board_info boardinfo;
++};
++
++
++MODULE_DESCRIPTION("GPIO based MMC driver");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_LICENSE("GPL");
++
++
++static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
++				   struct spi_master *master,
++				   void *data)
++{
++	struct gpiommc_device *d = data;
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	/* Bind the SPI master to the MMC-SPI host driver. */
++	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
++
++	bi->max_speed_hz = pdata->max_bus_speed;
++	bi->bus_num = master->bus_num;
++	bi->mode = pdata->mode;
++
++	return 0;
++}
++
++static int gpiommc_probe(struct platform_device *pdev)
++{
++	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
++	struct spi_gpio_platform_data spi_pdata;
++	struct gpiommc_device *d;
++	int err;
++
++	err = -ENXIO;
++	if (!mmc_pdata)
++		goto error;
++
++#ifdef CONFIG_MMC_SPI_MODULE
++	err = request_module("mmc_spi");
++	if (err) {
++		printk(KERN_WARNING PFX
++		       "Failed to request mmc_spi module.\n");
++	}
++#endif /* CONFIG_MMC_SPI_MODULE */
++
++	/* Allocate the GPIO-MMC device */
++	err = -ENOMEM;
++	d = kzalloc(sizeof(*d), GFP_KERNEL);
++	if (!d)
++		goto error;
++	d->pdev = pdev;
++
++	/* Create the SPI-GPIO device */
++	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
++					    spi_gpio_next_id());
++	if (!d->spi_pdev)
++		goto err_free_d;
++
++	memset(&spi_pdata, 0, sizeof(spi_pdata));
++	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
++	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
++	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
++	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
++	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
++	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
++	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
++	spi_pdata.boardinfo_setup_data = d;
++
++	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
++				       sizeof(spi_pdata));
++	if (err)
++		goto err_free_pdev;
++	err = platform_device_add(d->spi_pdev);
++	if (err)
++		goto err_free_pdata;
++	platform_set_drvdata(pdev, d);
++
++	printk(KERN_INFO PFX "MMC-Card \"%s\" "
++	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
++	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
++	       mmc_pdata->pins.gpio_do,
++	       mmc_pdata->pins.gpio_clk,
++	       mmc_pdata->pins.gpio_cs);
++
++	return 0;
++
++err_free_pdata:
++	kfree(d->spi_pdev->dev.platform_data);
++	d->spi_pdev->dev.platform_data = NULL;
++err_free_pdev:
++	platform_device_put(d->spi_pdev);
++err_free_d:
++	kfree(d);
++error:
++	return err;
++}
++
++static int gpiommc_remove(struct platform_device *pdev)
++{
++	struct gpiommc_device *d = platform_get_drvdata(pdev);
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	platform_device_unregister(d->spi_pdev);
++	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
++	       pdata->name);
++	platform_device_put(d->spi_pdev);
++
++	return 0;
++}
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++
++/* A device that was created through configfs */
++struct gpiommc_configfs_device {
++	struct config_item item;
++	/* The platform device, after registration. */
++	struct platform_device *pdev;
++	/* The configuration */
++	struct gpiommc_platform_data pdata;
++};
++
++#define GPIO_INVALID	-1
++
++static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
++{
++	return (dev->pdev != NULL);
++}
++
++static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
++{
++	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
++}
++
++static struct configfs_attribute gpiommc_attr_DI = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_in",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_DO = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_out",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CLK = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_clock",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS_activelow = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect_activelow",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spimode = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_mode",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spidelay = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_delay",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_max_bus_speed = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "max_bus_speed",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_register = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "register",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute *gpiommc_config_attrs[] = {
++	&gpiommc_attr_DI,
++	&gpiommc_attr_DO,
++	&gpiommc_attr_CLK,
++	&gpiommc_attr_CS,
++	&gpiommc_attr_CS_activelow,
++	&gpiommc_attr_spimode,
++	&gpiommc_attr_spidelay,
++	&gpiommc_attr_max_bus_speed,
++	&gpiommc_attr_register,
++	NULL,
++};
++
++static ssize_t gpiommc_config_attr_show(struct config_item *item,
++					struct configfs_attribute *attr,
++					char *page)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	ssize_t count = 0;
++	unsigned int gpio;
++	int err = 0;
++
++	if (attr == &gpiommc_attr_DI) {
++		gpio = dev->pdata.pins.gpio_di;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		gpio = dev->pdata.pins.gpio_do;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		gpio = dev->pdata.pins.gpio_clk;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		gpio = dev->pdata.pins.gpio_cs;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.pins.cs_activelow);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.mode);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 !dev->pdata.no_spi_delay);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.max_bus_speed);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_register) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 gpiommc_is_registered(dev));
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
++			       const char *name)
++{
++	int err;
++
++	if (gpiommc_is_registered(dev))
++		return 0;
++
++	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
++		printk(KERN_ERR PFX
++		       "configfs: Invalid GPIO pin number(s)\n");
++		return -EINVAL;
++	}
++
++	strlcpy(dev->pdata.name, name,
++		sizeof(dev->pdata.name));
++
++	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
++					  gpiommc_next_id());
++	if (!dev->pdev)
++		return -ENOMEM;
++	err = platform_device_add_data(dev->pdev, &dev->pdata,
++				       sizeof(dev->pdata));
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++	err = platform_device_add(dev->pdev);
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++
++	return 0;
++}
++
++static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
++{
++	if (!gpiommc_is_registered(dev))
++		return;
++
++	platform_device_unregister(dev->pdev);
++	dev->pdev = NULL;
++}
++
++static ssize_t gpiommc_config_attr_store(struct config_item *item,
++					 struct configfs_attribute *attr,
++					 const char *page, size_t count)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	int err = -EINVAL;
++	unsigned long data;
++
++	if (attr == &gpiommc_attr_register) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data == 1)
++			err = gpiommc_do_register(dev, item->ci_name);
++		if (data == 0) {
++			gpiommc_do_unregister(dev);
++			err = 0;
++		}
++		goto out;
++	}
++
++	if (gpiommc_is_registered(dev)) {
++		/* The rest of the config parameters can only be set
++		 * as long as the device is not registered, yet. */
++		err = -EBUSY;
++		goto out;
++	}
++
++	if (attr == &gpiommc_attr_DI) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_di = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_do = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_clk = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_cs = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.pins.cs_activelow = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		switch (data) {
++		case 0:
++			dev->pdata.mode = SPI_MODE_0;
++			break;
++		case 1:
++			dev->pdata.mode = SPI_MODE_1;
++			break;
++		case 2:
++			dev->pdata.mode = SPI_MODE_2;
++			break;
++		case 3:
++			dev->pdata.mode = SPI_MODE_3;
++			break;
++		default:
++			goto out;
++		}
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.no_spi_delay = !data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data > UINT_MAX)
++			goto out;
++		dev->pdata.max_bus_speed = data;
++		err = 0;
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static void gpiommc_config_item_release(struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	kfree(dev);
++}
++
++static struct configfs_item_operations gpiommc_config_item_ops = {
++	.release		= gpiommc_config_item_release,
++	.show_attribute		= gpiommc_config_attr_show,
++	.store_attribute	= gpiommc_config_attr_store,
++};
++
++static struct config_item_type gpiommc_dev_ci_type = {
++	.ct_item_ops	= &gpiommc_config_item_ops,
++	.ct_attrs	= gpiommc_config_attrs,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct config_item *gpiommc_make_item(struct config_group *group,
++					     const char *name)
++{
++	struct gpiommc_configfs_device *dev;
++
++	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
++		printk(KERN_ERR PFX "configfs: device name too long\n");
++		return NULL;
++	}
++
++	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++	if (!dev)
++		return NULL;
++
++	config_item_init_type_name(&dev->item, name,
++				   &gpiommc_dev_ci_type);
++
++	/* Assign default configuration */
++	dev->pdata.pins.gpio_di = GPIO_INVALID;
++	dev->pdata.pins.gpio_do = GPIO_INVALID;
++	dev->pdata.pins.gpio_clk = GPIO_INVALID;
++	dev->pdata.pins.gpio_cs = GPIO_INVALID;
++	dev->pdata.pins.cs_activelow = 1;
++	dev->pdata.mode = SPI_MODE_0;
++	dev->pdata.no_spi_delay = 0;
++	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
++
++	return &(dev->item);
++}
++
++static void gpiommc_drop_item(struct config_group *group,
++			      struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	gpiommc_do_unregister(dev);
++	kfree(dev);
++}
++
++static struct configfs_group_operations gpiommc_ct_group_ops = {
++	.make_item	= gpiommc_make_item,
++	.drop_item	= gpiommc_drop_item,
++};
++
++static struct config_item_type gpiommc_ci_type = {
++	.ct_group_ops	= &gpiommc_ct_group_ops,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct configfs_subsystem gpiommc_subsys = {
++	.su_group = {
++		.cg_item = {
++			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
++			.ci_type = &gpiommc_ci_type,
++		},
++	},
++	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
++};
++
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++static struct platform_driver gpiommc_plat_driver = {
++	.probe	= gpiommc_probe,
++	.remove	= gpiommc_remove,
++	.driver	= {
++		.name	= GPIOMMC_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++};
++
++int gpiommc_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(gpiommc_next_id);
++
++static int __init gpiommc_modinit(void)
++{
++	int err;
++
++	err = platform_driver_register(&gpiommc_plat_driver);
++	if (err)
++		return err;
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	config_group_init(&gpiommc_subsys.su_group);
++	err = configfs_register_subsystem(&gpiommc_subsys);
++	if (err) {
++		platform_driver_unregister(&gpiommc_plat_driver);
++		return err;
++	}
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++	return 0;
++}
++module_init(gpiommc_modinit);
++
++static void __exit gpiommc_modexit(void)
++{
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	configfs_unregister_subsystem(&gpiommc_subsys);
++#endif
++	platform_driver_unregister(&gpiommc_plat_driver);
++}
++module_exit(gpiommc_modexit);
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -498,6 +498,31 @@ config MMC_SDHI
+ 	  This provides support for the SDHI SD/SDIO controller found in
+ 	  SuperH and ARM SH-Mobile SoCs
+ 
++config GPIOMMC
++	tristate "MMC/SD over GPIO-based SPI"
++	depends on MMC && MMC_SPI && SPI_GPIO_OLD
++	help
++	  This driver hooks up the mmc_spi and spi_gpio modules so that
++	  MMC/SD cards can be used on a GPIO based bus by bitbanging
++	  the SPI protocol in software.
++
++	  This driver provides a configfs interface to dynamically create
++	  and destroy GPIO-based MMC/SD card devices. It also provides
++	  a platform device interface API.
++	  See Documentation/gpiommc.txt for details.
++
++	  The module will be called gpiommc.
++
++	  If unsure, say N.
++
++config GPIOMMC_CONFIGFS
++	bool
++	depends on GPIOMMC && CONFIGFS_FS
++	default y
++	help
++	  This option automatically enables configfs support for gpiommc
++	  if configfs is available.
++
+ config MMC_CB710
+ 	tristate "ENE CB710 MMC/SD Interface support"
+ 	depends on PCI
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -39,6 +39,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
+ obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o
+ obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
++obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
+ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
+ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
+ obj-$(CONFIG_MMC_DW_PLTFM)	+= dw_mmc-pltfm.o
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
+@@ -0,0 +1,71 @@
++/*
++ * Device driver for MMC/SD cards driven over a GPIO bus.
++ *
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * Licensed under the GNU/GPL version 2.
++ */
++#ifndef LINUX_GPIOMMC_H_
++#define LINUX_GPIOMMC_H_
++
++#include <linux/types.h>
++
++
++#define GPIOMMC_MAX_NAMELEN		15
++#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
++
++/**
++ * struct gpiommc_pins - Hardware pin assignments
++ *
++ * @gpio_di: The GPIO number of the DATA IN pin
++ * @gpio_do: The GPIO number of the DATA OUT pin
++ * @gpio_clk: The GPIO number of the CLOCK pin
++ * @gpio_cs: The GPIO number of the CHIPSELECT pin
++ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
++ */
++struct gpiommc_pins {
++	unsigned int gpio_di;
++	unsigned int gpio_do;
++	unsigned int gpio_clk;
++	unsigned int gpio_cs;
++	bool cs_activelow;
++};
++
++/**
++ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
++ *
++ * @name: The unique name string of the device.
++ * @pins: The hardware pin assignments.
++ * @mode: The hardware mode. This is either SPI_MODE_0,
++ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
++ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
++ *                This is not standards compliant, but may be required for some
++ *                embedded machines to gain reasonable speed.
++ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
++ */
++struct gpiommc_platform_data {
++	char name[GPIOMMC_MAX_NAMELEN + 1];
++	struct gpiommc_pins pins;
++	u8 mode;
++	bool no_spi_delay;
++	unsigned int max_bus_speed;
++};
++
++/**
++ * GPIOMMC_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a gpiommc device.
++ */
++#define GPIOMMC_PLATDEV_NAME	"gpiommc"
++
++/**
++ * gpiommc_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int gpiommc_next_id(void);
++
++#endif /* LINUX_GPIOMMC_H_ */
+--- /dev/null
++++ b/Documentation/gpiommc.txt
+@@ -0,0 +1,97 @@
++GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
++================================================================
++
++The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
++MMC or SD card on GPIO pins.
++
++Two interfaces for registering a new MMC/SD card device are provided:
++A static platform-device based mechanism and a dynamic configfs based interface.
++
++
++Registering devices via platform-device
++=======================================
++
++The platform-device interface is used for registering MMC/SD devices that are
++part of the hardware platform. This is most useful only for embedded machines
++with MMC/SD devices statically connected to the platform GPIO bus.
++
++The data structures are declared in <linux/mmc/gpiommc.h>.
++
++To register a new device, define an instance of struct gpiommc_platform_data.
++This structure holds any information about how the device is hooked up to the
++GPIO pins and what hardware modes the device supports. See the docbook-style
++documentation in the header file for more information on the struct fields.
++
++Then allocate a new instance of a platform device by doing:
++
++	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
++
++This will allocate the platform device data structures and hook it up to the
++gpiommc driver.
++Then add the gpiommc_platform_data to the platform device.
++
++	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
++
++You may free the local instance of struct gpiommc_platform_data now. (So the
++struct may be allocated on the stack, too).
++Now simply register the platform device.
++
++	err = platform_device_add(pdev);
++
++Done. The gpiommc probe routine will be invoked now and you should see a kernel
++log message for the added device.
++
++
++Registering devices via configfs
++================================
++
++MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
++selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
++hardware are a common situation.
++So we provide a dynamic interface to conveniently handle adding and removing
++devices from userspace, without the need to recompile the kernel.
++
++The "gpiommc" subdirectory at the configfs mountpoint is used for handling
++the dynamic configuration.
++
++To create a new device, it must first be allocated with mkdir.
++The following command will allocate a device named "my_mmc":
++	mkdir /config/gpiommc/my_mmc
++
++There are several configuration files available in the new
++/config/gpiommc/my_mmc/ directory:
++
++gpio_data_in			= The SPI data-IN GPIO pin number.
++gpio_data_out			= The SPI data-OUT GPIO pin number.
++gpio_clock			= The SPI Clock GPIO pin number.
++gpio_chipselect			= The SPI Chipselect GPIO pin number.
++gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
++				  If 1, Chipselect is active-LOW.
++spi_mode			= The SPI data mode. Can be 0-3.
++spi_delay			= Enable all delays in the lowlevel bitbanging.
++max_bus_speed			= The maximum SPI bus speed. In Hertz.
++
++register			= Not a configuration parameter.
++				  Used to register the configured card
++				  with the kernel.
++
++The device must first get configured and then registered by writing "1" to
++the "register" file.
++The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
++and "gpio_chipselect" are essential and _must_ be configured before writing
++"1" to the "register" file. The registration will fail, otherwise.
++
++The default values for the other parameters are:
++gpio_chipselect_activelow	= 1		(CS active-LOW)
++spi_mode			= 0		(SPI_MODE_0)
++spi_delay			= 1		(enabled)
++max_bus_speed			= 5000000	(5 Mhz)
++
++Configuration values can not be changed after registration. To unregister
++the device, write a "0" to the "register" file. The configuration can be
++changed again after unregistering.
++
++To completely remove the device, simply rmdir the directory
++(/config/gpiommc/my_mmc in this example).
++There's no need to first unregister the device before removing it. That will
++be done automatically.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3935,6 +3935,11 @@ L:	linuxppc-dev@lists.ozlabs.org
+ S:	Odd Fixes
+ F:	drivers/tty/hvc/
+ 
++GPIOMMC DRIVER
++P:	Michael Buesch
++M:	mb@bu3sch.de
++S:	Maintained
++
+ HARDWARE MONITORING
+ M:	Jean Delvare <jdelvare@suse.de>
+ M:	Guenter Roeck <linux@roeck-us.net>
diff --git a/trunk/target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch b/trunk/target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch
new file mode 100644
index 00000000..92815d91
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/864-gpiommc_configfs_locking.patch
@@ -0,0 +1,58 @@
+The gpiommc configfs context structure needs locking, as configfs
+does not lock access between files.
+
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
+ 	struct platform_device *pdev;
+ 	/* The configuration */
+ 	struct gpiommc_platform_data pdata;
++	/* Mutex to protect this structure */
++	struct mutex mutex;
+ };
+ 
+ #define GPIO_INVALID	-1
+@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	unsigned int gpio;
+ 	int err = 0;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_DI) {
+ 		gpio = dev->pdata.pins.gpio_di;
+ 		if (gpio == GPIO_INVALID)
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
+ 	int err = -EINVAL;
+ 	unsigned long data;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_register) {
+ 		err = kstrtoul(page, 10, &data);
+ 		if (err)
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
+ 	if (!dev)
+ 		return NULL;
+ 
++	mutex_init(&dev->mutex);
+ 	config_item_init_type_name(&dev->item, name,
+ 				   &gpiommc_dev_ci_type);
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/870-hifn795x_byteswap.patch b/trunk/target/linux/generic/patches-3.14/870-hifn795x_byteswap.patch
new file mode 100644
index 00000000..3a37c951
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/870-hifn795x_byteswap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/crypto/hifn_795x.c
++++ b/drivers/crypto/hifn_795x.c
+@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
+ 
+ static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
++	writel(val, dev->bar[0] + reg);
+ }
+ 
+ static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
++	writel(val, dev->bar[1] + reg);
+ }
+ 
+ static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/trunk/target/linux/generic/patches-3.14/880-gateworks_system_controller.patch b/trunk/target/linux/generic/patches-3.14/880-gateworks_system_controller.patch
new file mode 100644
index 00000000..6e4ae308
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/880-gateworks_system_controller.patch
@@ -0,0 +1,339 @@
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -492,6 +492,15 @@ config SENSORS_GL520SM
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called gl520sm.
+ 
++config SENSORS_GSC
++	tristate "Gateworks System Controller"
++	depends on I2C
++	help
++	  If you say yes here you get support for the Gateworks System Controller.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called gsc.
++
+ config SENSORS_GPIO_FAN
+ 	tristate "GPIO fan"
+ 	depends on GPIOLIB
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -142,6 +142,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l7
+ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
+ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
+ obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
++obj-$(CONFIG_SENSORS_GSC)	+= gsc.o
+ 
+ obj-$(CONFIG_PMBUS)		+= pmbus/
+ 
+--- /dev/null
++++ b/drivers/hwmon/gsc.c
+@@ -0,0 +1,308 @@
++/*
++ * A hwmon driver for the Gateworks System Controller 
++ * Copyright (C) 2009 Gateworks Corporation
++ *
++ * Author: Chris Lang <clang@gateworks.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License,
++ * as published by the Free Software Foundation - version 2.
++ */
++
++#include <linux/module.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++
++#define DRV_VERSION "0.2"
++
++enum chips { gsp };
++
++/* AD7418 registers */
++#define GSP_REG_TEMP_IN		0x00
++#define GSP_REG_VIN		0x02
++#define GSP_REG_3P3		0x05
++#define GSP_REG_BAT		0x08
++#define GSP_REG_5P0		0x0b
++#define GSP_REG_CORE		0x0e
++#define GSP_REG_CPU1		0x11
++#define GSP_REG_CPU2		0x14
++#define GSP_REG_DRAM		0x17
++#define GSP_REG_EXT_BAT		0x1a
++#define GSP_REG_IO1		0x1d
++#define GSP_REG_IO2 		0x20
++#define GSP_REG_PCIE		0x23
++#define GSP_REG_CURRENT		0x26
++#define GSP_FAN_0		0x2C
++#define GSP_FAN_1		0x2E
++#define GSP_FAN_2		0x30
++#define GSP_FAN_3		0x32
++#define GSP_FAN_4		0x34
++#define GSP_FAN_5		0x36
++
++struct gsp_sensor_info {
++	const char* name;
++	int reg;
++};
++
++static const struct gsp_sensor_info gsp_sensors[] = {
++	{"temp", GSP_REG_TEMP_IN},
++	{"vin", GSP_REG_VIN},
++	{"3p3", GSP_REG_3P3},
++	{"bat", GSP_REG_BAT},
++	{"5p0", GSP_REG_5P0},
++	{"core", GSP_REG_CORE},
++	{"cpu1", GSP_REG_CPU1},
++	{"cpu2", GSP_REG_CPU2},
++	{"dram", GSP_REG_DRAM},
++	{"ext_bat", GSP_REG_EXT_BAT},
++	{"io1", GSP_REG_IO1},
++	{"io2", GSP_REG_IO2},
++	{"pci2", GSP_REG_PCIE},
++	{"current", GSP_REG_CURRENT},
++	{"fan_point0", GSP_FAN_0},
++	{"fan_point1", GSP_FAN_1},
++	{"fan_point2", GSP_FAN_2},
++	{"fan_point3", GSP_FAN_3},
++	{"fan_point4", GSP_FAN_4},
++	{"fan_point5", GSP_FAN_5},
++};
++
++struct gsp_data {
++	struct device		*hwmon_dev;
++	struct attribute_group	attrs;
++	enum chips		type;
++};
++
++static int gsp_probe(struct i2c_client *client,
++			const struct i2c_device_id *id);
++static int gsp_remove(struct i2c_client *client);
++
++static const struct i2c_device_id gsp_id[] = {
++	{ "gsp", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, gsp_id);
++
++static struct i2c_driver gsp_driver = {
++	.driver = {
++		.name	= "gsp",
++	},
++	.probe		= gsp_probe,
++	.remove		= gsp_remove,
++	.id_table	= gsp_id,
++};
++
++/* All registers are word-sized, except for the configuration registers.
++ * AD7418 uses a high-byte first convention. Do NOT use those functions to
++ * access the configuration registers CONF and CONF2, as they are byte-sized.
++ */
++static inline int gsp_read(struct i2c_client *client, u8 reg)
++{
++	unsigned int adc = 0;
++	if (reg == GSP_REG_TEMP_IN || reg > GSP_REG_CURRENT)
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		return adc;
++	}
++	else
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		adc |= i2c_smbus_read_byte_data(client, reg + 2) << 16;
++		return adc;
++	}
++}
++
++static inline int gsp_write(struct i2c_client *client, u8 reg, u16 value)
++{
++	i2c_smbus_write_byte_data(client, reg, value & 0xff);
++	i2c_smbus_write_byte_data(client, reg + 1, ((value >> 8) & 0xff));
++	return 1;
++}
++
++static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
++			char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	return sprintf(buf, "%d\n", gsp_read(client, gsp_sensors[attr->index].reg));
++}
++
++static ssize_t show_label(struct device *dev,
++			struct device_attribute *devattr, char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++
++	return sprintf(buf, "%s\n", gsp_sensors[attr->index].name);
++}
++
++static ssize_t store_fan(struct device *dev,
++			struct device_attribute *devattr, const char *buf, size_t count)
++{
++	u16 val;
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	val = simple_strtoul(buf, NULL, 10);
++	gsp_write(client, gsp_sensors[attr->index].reg, val);
++	return count;
++}
++
++static SENSOR_DEVICE_ATTR(temp0_input, S_IRUGO, show_adc, NULL, 0);
++static SENSOR_DEVICE_ATTR(temp0_label, S_IRUGO, show_label, NULL, 0);
++
++static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_adc, NULL, 1);
++static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, show_label, NULL, 1);
++static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 2);
++static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, show_label, NULL, 2);
++static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 3);
++static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, show_label, NULL, 3);
++static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 4);
++static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 4);
++static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 5);
++static SENSOR_DEVICE_ATTR(in4_label, S_IRUGO, show_label, NULL, 5);
++static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_adc, NULL, 6);
++static SENSOR_DEVICE_ATTR(in5_label, S_IRUGO, show_label, NULL, 6);
++static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_adc, NULL, 7);
++static SENSOR_DEVICE_ATTR(in6_label, S_IRUGO, show_label, NULL, 7);
++static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_adc, NULL, 8);
++static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 8);
++static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, show_adc, NULL, 9);
++static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 9);
++static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_adc, NULL, 10);
++static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 10);
++static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_adc, NULL, 11);
++static SENSOR_DEVICE_ATTR(in10_label, S_IRUGO, show_label, NULL, 11);
++static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, show_adc, NULL, 12);
++static SENSOR_DEVICE_ATTR(in11_label, S_IRUGO, show_label, NULL, 12);
++static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, show_adc, NULL, 13);
++static SENSOR_DEVICE_ATTR(in12_label, S_IRUGO, show_label, NULL, 13);
++
++static SENSOR_DEVICE_ATTR(fan0_point0, S_IRUGO | S_IWUSR, show_adc, store_fan, 14);
++static SENSOR_DEVICE_ATTR(fan0_point1, S_IRUGO | S_IWUSR, show_adc, store_fan, 15);
++static SENSOR_DEVICE_ATTR(fan0_point2, S_IRUGO | S_IWUSR, show_adc, store_fan, 16);
++static SENSOR_DEVICE_ATTR(fan0_point3, S_IRUGO | S_IWUSR, show_adc, store_fan, 17);
++static SENSOR_DEVICE_ATTR(fan0_point4, S_IRUGO | S_IWUSR, show_adc, store_fan, 18);
++static SENSOR_DEVICE_ATTR(fan0_point5, S_IRUGO | S_IWUSR, show_adc, store_fan, 19);
++
++static struct attribute *gsp_attributes[] = {
++	&sensor_dev_attr_temp0_input.dev_attr.attr,
++	&sensor_dev_attr_in0_input.dev_attr.attr,
++	&sensor_dev_attr_in1_input.dev_attr.attr,
++	&sensor_dev_attr_in2_input.dev_attr.attr,
++	&sensor_dev_attr_in3_input.dev_attr.attr,
++	&sensor_dev_attr_in4_input.dev_attr.attr,
++	&sensor_dev_attr_in5_input.dev_attr.attr,
++	&sensor_dev_attr_in6_input.dev_attr.attr,
++	&sensor_dev_attr_in7_input.dev_attr.attr,
++	&sensor_dev_attr_in8_input.dev_attr.attr,
++	&sensor_dev_attr_in9_input.dev_attr.attr,
++	&sensor_dev_attr_in10_input.dev_attr.attr,
++	&sensor_dev_attr_in11_input.dev_attr.attr,
++	&sensor_dev_attr_in12_input.dev_attr.attr,
++
++	&sensor_dev_attr_temp0_label.dev_attr.attr,
++	&sensor_dev_attr_in0_label.dev_attr.attr,
++	&sensor_dev_attr_in1_label.dev_attr.attr,
++	&sensor_dev_attr_in2_label.dev_attr.attr,
++	&sensor_dev_attr_in3_label.dev_attr.attr,
++	&sensor_dev_attr_in4_label.dev_attr.attr,
++	&sensor_dev_attr_in5_label.dev_attr.attr,
++	&sensor_dev_attr_in6_label.dev_attr.attr,
++	&sensor_dev_attr_in7_label.dev_attr.attr,
++	&sensor_dev_attr_in8_label.dev_attr.attr,
++	&sensor_dev_attr_in9_label.dev_attr.attr,
++	&sensor_dev_attr_in10_label.dev_attr.attr,
++	&sensor_dev_attr_in11_label.dev_attr.attr,
++	&sensor_dev_attr_in12_label.dev_attr.attr,
++
++	&sensor_dev_attr_fan0_point0.dev_attr.attr,
++	&sensor_dev_attr_fan0_point1.dev_attr.attr,
++	&sensor_dev_attr_fan0_point2.dev_attr.attr,
++	&sensor_dev_attr_fan0_point3.dev_attr.attr,
++	&sensor_dev_attr_fan0_point4.dev_attr.attr,
++	&sensor_dev_attr_fan0_point5.dev_attr.attr,
++	NULL
++};
++
++
++static int gsp_probe(struct i2c_client *client,
++			 const struct i2c_device_id *id)
++{
++	struct i2c_adapter *adapter = client->adapter;
++	struct gsp_data *data;
++	int err;
++
++	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
++					I2C_FUNC_SMBUS_WORD_DATA)) {
++		err = -EOPNOTSUPP;
++		goto exit;
++	}
++
++	if (!(data = kzalloc(sizeof(struct gsp_data), GFP_KERNEL))) {
++		err = -ENOMEM;
++		goto exit;
++	}
++
++	i2c_set_clientdata(client, data);
++
++	data->type = id->driver_data;
++
++	switch (data->type) {
++	case 0:
++		data->attrs.attrs = gsp_attributes;
++		break;
++	}
++
++	dev_info(&client->dev, "%s chip found\n", client->name);
++
++	/* Register sysfs hooks */
++	if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
++		goto exit_free;
++
++	data->hwmon_dev = hwmon_device_register(&client->dev);
++	if (IS_ERR(data->hwmon_dev)) {
++		err = PTR_ERR(data->hwmon_dev);
++		goto exit_remove;
++	}
++
++	return 0;
++
++exit_remove:
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++exit_free:
++	kfree(data);
++exit:
++	return err;
++}
++
++static int gsp_remove(struct i2c_client *client)
++{
++	struct gsp_data *data = i2c_get_clientdata(client);
++	hwmon_device_unregister(data->hwmon_dev);
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++	kfree(data);
++	return 0;
++}
++
++static int __init gsp_init(void)
++{
++	return i2c_add_driver(&gsp_driver);
++}
++
++static void __exit gsp_exit(void)
++{
++	i2c_del_driver(&gsp_driver);
++}
++
++module_init(gsp_init);
++module_exit(gsp_exit);
++
++MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
++MODULE_DESCRIPTION("GSC HWMON driver");
++MODULE_LICENSE("GPL");
++MODULE_VERSION(DRV_VERSION);
++
diff --git a/trunk/target/linux/generic/patches-3.14/890-8250_optional_sysrq.patch b/trunk/target/linux/generic/patches-3.14/890-8250_optional_sysrq.patch
new file mode 100644
index 00000000..8e8c7abc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/890-8250_optional_sysrq.patch
@@ -0,0 +1,24 @@
+--- a/drivers/tty/serial/8250/8250_core.c
++++ b/drivers/tty/serial/8250/8250_core.c
+@@ -16,7 +16,7 @@
+  *  membase is an 'ioremapped' cookie.
+  */
+ 
+-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
++#if defined(CONFIG_SERIAL_8250_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ)
+ #define SUPPORT_SYSRQ
+ #endif
+ 
+--- a/drivers/tty/serial/8250/Kconfig
++++ b/drivers/tty/serial/8250/Kconfig
+@@ -90,6 +90,10 @@ config SERIAL_8250_CONSOLE
+ 
+ 	  If unsure, say N.
+ 
++config SERIAL_8250_SYSRQ
++	bool "Magic sysrq support on 8250/16550 devices"
++	depends on SERIAL_8250_CONSOLE
++
+ config FIX_EARLYCON_MEM
+ 	bool
+ 	depends on X86
diff --git a/trunk/target/linux/generic/patches-3.14/900-slab_maxsize.patch b/trunk/target/linux/generic/patches-3.14/900-slab_maxsize.patch
new file mode 100644
index 00000000..9a96d100
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/900-slab_maxsize.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -195,8 +195,8 @@ struct kmem_cache {
+  * to do various tricks to work around compiler limitations in order to
+  * ensure proper constant folding.
+  */
+-#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
+-				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
++#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
++				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
+ #define KMALLOC_SHIFT_MAX	KMALLOC_SHIFT_HIGH
+ #ifndef KMALLOC_SHIFT_LOW
+ #define KMALLOC_SHIFT_LOW	5
diff --git a/trunk/target/linux/generic/patches-3.14/901-debloat_sock_diag.patch b/trunk/target/linux/generic/patches-3.14/901-debloat_sock_diag.patch
new file mode 100644
index 00000000..7d18bbdc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/901-debloat_sock_diag.patch
@@ -0,0 +1,45 @@
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -88,6 +88,9 @@ source "net/netlabel/Kconfig"
+ 
+ endif # if INET
+ 
++config SOCK_DIAG
++	bool
++
+ config NETWORK_SECMARK
+ 	bool "Security Marking"
+ 	help
+--- a/net/core/Makefile
++++ b/net/core/Makefile
+@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
+ 
+ obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
+ 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
+-			sock_diag.o dev_ioctl.o
++			dev_ioctl.o
+ 
++obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
+ obj-$(CONFIG_XFRM) += flow.o
+ obj-y += net-sysfs.o
+ obj-$(CONFIG_PROC_FS) += net-procfs.o
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -390,6 +390,7 @@ config INET_LRO
+ 
+ config INET_DIAG
+ 	tristate "INET: socket monitoring interface"
++	select SOCK_DIAG
+ 	default y
+ 	---help---
+ 	  Support for INET (TCP, DCCP, etc) socket monitoring interface used by
+--- a/net/unix/Kconfig
++++ b/net/unix/Kconfig
+@@ -22,6 +22,7 @@ config UNIX
+ config UNIX_DIAG
+ 	tristate "UNIX: socket monitoring interface"
+ 	depends on UNIX
++	select SOCK_DIAG
+ 	default n
+ 	---help---
+ 	  Support for UNIX socket monitoring interface used by the ss tool.
diff --git a/trunk/target/linux/generic/patches-3.14/902-debloat_proc.patch b/trunk/target/linux/generic/patches-3.14/902-debloat_proc.patch
new file mode 100644
index 00000000..d9284be0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/902-debloat_proc.patch
@@ -0,0 +1,341 @@
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -2441,6 +2441,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_locks_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("locks", 0, NULL, &proc_locks_operations);
+ 	return 0;
+ }
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -71,3 +71,8 @@ config PROC_PAGE_MONITOR
+ 	  /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
+ 	  /proc/kpagecount, and /proc/kpageflags. Disabling these
+           interfaces will reduce the size of the kernel by approximately 4kb.
++
++config PROC_STRIPPED
++	default n
++	depends on EXPERT
++	bool "Strip non-essential /proc functionality to reduce code size"
+--- a/fs/proc/consoles.c
++++ b/fs/proc/consoles.c
+@@ -106,6 +106,9 @@ static const struct file_operations proc
+ 
+ static int __init proc_consoles_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	proc_create("consoles", 0, NULL, &proc_consoles_operations);
+ 	return 0;
+ }
+--- a/fs/proc/proc_tty.c
++++ b/fs/proc/proc_tty.c
+@@ -143,7 +143,10 @@ static const struct file_operations proc
+ void proc_tty_register_driver(struct tty_driver *driver)
+ {
+ 	struct proc_dir_entry *ent;
+-		
++
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!driver->driver_name || driver->proc_entry ||
+ 	    !driver->ops->proc_fops)
+ 		return;
+@@ -160,6 +163,9 @@ void proc_tty_unregister_driver(struct t
+ {
+ 	struct proc_dir_entry *ent;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ent = driver->proc_entry;
+ 	if (!ent)
+ 		return;
+@@ -174,6 +180,9 @@ void proc_tty_unregister_driver(struct t
+  */
+ void __init proc_tty_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!proc_mkdir("tty", NULL))
+ 		return;
+ 	proc_tty_ldisc = proc_mkdir("tty/ldisc", NULL);
+--- a/kernel/exec_domain.c
++++ b/kernel/exec_domain.c
+@@ -173,6 +173,8 @@ static const struct file_operations exec
+ 
+ static int __init proc_execdomains_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
+ 	return 0;
+ }
+--- a/kernel/irq/proc.c
++++ b/kernel/irq/proc.c
+@@ -311,6 +311,9 @@ void register_irq_proc(unsigned int irq,
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
+ 		return;
+ 
+@@ -347,6 +350,9 @@ void unregister_irq_proc(unsigned int ir
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || !desc->dir)
+ 		return;
+ #ifdef CONFIG_SMP
+@@ -382,6 +388,9 @@ void init_irq_proc(void)
+ 	unsigned int irq;
+ 	struct irq_desc *desc;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	/* create /proc/irq */
+ 	root_irq_dir = proc_mkdir("irq", NULL);
+ 	if (!root_irq_dir)
+--- a/kernel/time/timer_list.c
++++ b/kernel/time/timer_list.c
+@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs
+ {
+ 	struct proc_dir_entry *pe;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
+ 	if (!pe)
+ 		return -ENOMEM;
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -2665,6 +2665,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_vmalloc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
+ 	return 0;
+ }
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -1302,10 +1302,12 @@ static int __init setup_vmstat(void)
+ 	put_online_cpus();
+ #endif
+ #ifdef CONFIG_PROC_FS
+-	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
+-	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
++		proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++		proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
++	}
+ 	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
+-	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
+ #endif
+ 	return 0;
+ }
+--- a/net/8021q/vlanproc.c
++++ b/net/8021q/vlanproc.c
+@@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net)
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (vn->proc_vlan_conf)
+ 		remove_proc_entry(name_conf, vn->proc_vlan_dir);
+ 
+@@ -146,6 +149,9 @@ int __net_init vlan_proc_init(struct net
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
+ 	if (!vn->proc_vlan_dir)
+ 		goto err;
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2985,6 +2985,8 @@ static __net_initdata struct pernet_oper
+ 
+ static int __init proto_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	return register_pernet_subsys(&proto_net_ops);
+ }
+ 
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2581,10 +2581,12 @@ static const struct file_operations fib_
+ 
+ int __net_init fib_proc_init(struct net *net)
+ {
+-	if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
+ 		goto out1;
+ 
+-	if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_triestat", S_IRUGO, net->proc_net,
+ 			 &fib_triestat_fops))
+ 		goto out2;
+ 
+@@ -2594,17 +2596,21 @@ int __net_init fib_proc_init(struct net 
+ 	return 0;
+ 
+ out3:
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_triestat", net->proc_net);
+ out2:
+-	remove_proc_entry("fib_trie", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_trie", net->proc_net);
+ out1:
+ 	return -ENOMEM;
+ }
+ 
+ void __net_exit fib_proc_exit(struct net *net)
+ {
+-	remove_proc_entry("fib_trie", net->proc_net);
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("fib_trie", net->proc_net);
++		remove_proc_entry("fib_triestat", net->proc_net);
++	}
+ 	remove_proc_entry("route", net->proc_net);
+ }
+ 
+--- a/net/ipv4/proc.c
++++ b/net/ipv4/proc.c
+@@ -517,6 +517,9 @@ static __net_initdata struct pernet_oper
+ 
+ int __init ip_misc_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_proc_ops);
+ }
+ 
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -422,6 +422,9 @@ static struct pernet_operations ip_rt_pr
+ 
+ static int __init ip_rt_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_rt_proc_ops);
+ }
+ 
+--- a/ipc/msg.c
++++ b/ipc/msg.c
+@@ -134,6 +134,9 @@ void __init msg_init(void)
+ 	printk(KERN_INFO "msgmni has been set to %d\n",
+ 		init_ipc_ns.msg_ctlmni);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ipc_init_proc_interface("sysvipc/msg",
+ 				"       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
+ 				IPC_MSG_IDS, sysvipc_msg_proc_show);
+--- a/ipc/sem.c
++++ b/ipc/sem.c
+@@ -191,6 +191,8 @@ void sem_exit_ns(struct ipc_namespace *n
+ void __init sem_init(void)
+ {
+ 	sem_init_ns(&init_ipc_ns);
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/sem",
+ 				"       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
+ 				IPC_SEM_IDS, sysvipc_sem_proc_show);
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init);
+ 
+ void __init shm_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/shm",
+ #if BITS_PER_LONG <= 32
+ 				"       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
+--- a/ipc/util.c
++++ b/ipc/util.c
+@@ -161,6 +161,9 @@ void __init ipc_init_proc_interface(cons
+ 	struct proc_dir_entry *pde;
+ 	struct ipc_proc_iface *iface;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	iface = kmalloc(sizeof(*iface), GFP_KERNEL);
+ 	if (!iface)
+ 		return;
+--- a/net/core/net-procfs.c
++++ b/net/core/net-procfs.c
+@@ -318,10 +318,12 @@ static int __net_init dev_proc_net_init(
+ 
+ 	if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
+ 		goto out;
+-	if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("softnet_stat", S_IRUGO, net->proc_net,
+ 			 &softnet_seq_fops))
+ 		goto out_dev;
+-	if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
+ 		goto out_softnet;
+ 
+ 	if (wext_proc_init(net))
+@@ -330,9 +332,11 @@ static int __net_init dev_proc_net_init(
+ out:
+ 	return rc;
+ out_ptype:
+-	remove_proc_entry("ptype", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("ptype", net->proc_net);
+ out_softnet:
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("softnet_stat", net->proc_net);
+ out_dev:
+ 	remove_proc_entry("dev", net->proc_net);
+ 	goto out;
+@@ -342,8 +346,10 @@ static void __net_exit dev_proc_net_exit
+ {
+ 	wext_proc_exit(net);
+ 
+-	remove_proc_entry("ptype", net->proc_net);
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("ptype", net->proc_net);
++		remove_proc_entry("softnet_stat", net->proc_net);
++	}
+ 	remove_proc_entry("dev", net->proc_net);
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.14/903-debloat_direct_io.patch b/trunk/target/linux/generic/patches-3.14/903-debloat_direct_io.patch
new file mode 100644
index 00000000..8154763b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/903-debloat_direct_io.patch
@@ -0,0 +1,84 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -62,6 +62,11 @@ config FILE_LOCKING
+           for filesystems like NFS and for the flock() system
+           call. Disabling this option saves about 11k.
+ 
++config DIRECT_IO
++	bool "Enable O_DIRECT support" if EXPERT
++	depends on BLOCK
++	default y
++
+ source "fs/notify/Kconfig"
+ 
+ source "fs/quota/Kconfig"
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -14,7 +14,8 @@ obj-y :=	open.o read_write.o file_table.
+ 		stack.o fs_struct.o statfs.o
+ 
+ ifeq ($(CONFIG_BLOCK),y)
+-obj-y +=	buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
++obj-y +=	buffer.o bio.o block_dev.o mpage.o ioprio.o
++obj-$(CONFIG_DIRECT_IO) += direct-io.o
+ else
+ obj-y +=	no-block.o
+ endif
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2557,12 +2557,26 @@ enum {
+ 	DIO_SKIP_HOLES	= 0x02,
+ };
+ 
++#ifdef CONFIG_DIRECT_IO
+ void dio_end_io(struct bio *bio, int error);
+ 
+ ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
+ 	struct block_device *bdev, const struct iovec *iov, loff_t offset,
+ 	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
+ 	dio_submit_t submit_io,	int flags);
++#else
++static inline void dio_end_io(struct bio *bio, int error)
++{
++}
++static inline ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
++	struct block_device *bdev, const struct iovec *iov, loff_t offset,
++	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
++	dio_submit_t submit_io,	int flags)
++{
++	return -EOPNOTSUPP;
++}
++#endif
++
+ 
+ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
+ 		struct inode *inode, const struct iovec *iov, loff_t offset,
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -51,8 +51,10 @@ static int setfl(int fd, struct file * f
+ 		   arg |= O_NONBLOCK;
+ 
+ 	if (arg & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!filp->f_mapping || !filp->f_mapping->a_ops ||
+ 			!filp->f_mapping->a_ops->direct_IO)
++#endif
+ 				return -EINVAL;
+ 	}
+ 
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -654,9 +654,12 @@ int open_check_o_direct(struct file *f)
+ {
+ 	/* NB: we're sure to have correct a_ops only after f_op->open */
+ 	if (f->f_flags & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!f->f_mapping->a_ops ||
+ 		    ((!f->f_mapping->a_ops->direct_IO) &&
+-		    (!f->f_mapping->a_ops->get_xip_mem))) {
++		    (!f->f_mapping->a_ops->get_xip_mem)))
++#endif
++		{
+ 			return -EINVAL;
+ 		}
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.14/910-kobject_uevent.patch b/trunk/target/linux/generic/patches-3.14/910-kobject_uevent.patch
new file mode 100644
index 00000000..9ee9cff6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/910-kobject_uevent.patch
@@ -0,0 +1,21 @@
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -51,6 +51,18 @@ static const char *kobject_actions[] = {
+ 	[KOBJ_OFFLINE] =	"offline",
+ };
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	mutex_lock(&uevent_sock_mutex);
++	seq = ++uevent_seqnum;
++	mutex_unlock(&uevent_sock_mutex);
++
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ /**
+  * kobject_action_type - translate action string to numeric type
+  *
diff --git a/trunk/target/linux/generic/patches-3.14/911-kobject_add_broadcast_uevent.patch b/trunk/target/linux/generic/patches-3.14/911-kobject_add_broadcast_uevent.patch
new file mode 100644
index 00000000..b1b11a5d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/911-kobject_add_broadcast_uevent.patch
@@ -0,0 +1,65 @@
+--- a/include/linux/kobject.h
++++ b/include/linux/kobject.h
+@@ -32,6 +32,8 @@
+ #define UEVENT_NUM_ENVP			32	/* number of env pointers */
+ #define UEVENT_BUFFER_SIZE		2048	/* buffer for the variables */
+ 
++struct sk_buff;
++
+ /* path to the userspace helper executed on an event */
+ extern char uevent_helper[];
+ 
+@@ -218,4 +220,7 @@ int add_uevent_var(struct kobj_uevent_en
+ int kobject_action_type(const char *buf, size_t count,
+ 			enum kobject_action *type);
+ 
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation);
++
+ #endif /* _KOBJECT_H_ */
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -388,6 +388,43 @@ int add_uevent_var(struct kobj_uevent_en
+ EXPORT_SYMBOL_GPL(add_uevent_var);
+ 
+ #if defined(CONFIG_NET)
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	struct uevent_sock *ue_sk;
++	int err = 0;
++
++	/* send netlink message */
++	mutex_lock(&uevent_sock_mutex);
++	list_for_each_entry(ue_sk, &uevent_sock_list, list) {
++		struct sock *uevent_sock = ue_sk->sk;
++		struct sk_buff *skb2;
++
++		skb2 = skb_clone(skb, allocation);
++		if (!skb2)
++			break;
++
++		err = netlink_broadcast(uevent_sock, skb2, pid, group,
++					allocation);
++		if (err)
++			break;
++	}
++	mutex_unlock(&uevent_sock_mutex);
++
++	kfree_skb(skb);
++	return err;
++}
++#else
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	kfree_skb(skb);
++	return 0;
++}
++#endif
++EXPORT_SYMBOL_GPL(broadcast_uevent);
++
++#if defined(CONFIG_NET)
+ static int uevent_net_init(struct net *net)
+ {
+ 	struct uevent_sock *ue_sk;
diff --git a/trunk/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch b/trunk/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
new file mode 100644
index 00000000..df703a75
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
@@ -0,0 +1,12 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -872,7 +872,8 @@ static int __ref kernel_init(void *unuse
+ 		pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
+ 			execute_command, ret);
+ 	}
+-	if (!try_to_run_init_process("/sbin/init") ||
++	if (!try_to_run_init_process("/etc/preinit") ||
++	    !try_to_run_init_process("/sbin/init") ||
+ 	    !try_to_run_init_process("/etc/init") ||
+ 	    !try_to_run_init_process("/bin/init") ||
+ 	    !try_to_run_init_process("/bin/sh"))
diff --git a/trunk/target/linux/generic/patches-3.14/922-always-create-console-node-in-initramfs.patch b/trunk/target/linux/generic/patches-3.14/922-always-create-console-node-in-initramfs.patch
new file mode 100644
index 00000000..3b308dd2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/922-always-create-console-node-in-initramfs.patch
@@ -0,0 +1,30 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -59,6 +59,18 @@ default_initramfs() {
+ 	EOF
+ }
+ 
++list_librecmc_initramfs() {
++	:
++}
++
++librecmc_initramfs() {
++	# make sure that /dev/console exists
++	cat <<-EOF >> ${output}
++		dir /dev 0755 0 0
++		nod /dev/console 0600 0 0 c 5 1
++	EOF
++}
++
+ filetype() {
+ 	local argv1="$1"
+ 
+@@ -177,6 +189,8 @@ dir_filelist() {
+ 	if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
+ 		${dep_list}print_mtime "$1"
+ 
++		${dep_list}librecmc_initramfs
++
+ 		echo "${dirlist}" | \
+ 		while read x; do
+ 			${dep_list}parse ${x}
diff --git a/trunk/target/linux/generic/patches-3.14/930-crashlog.patch b/trunk/target/linux/generic/patches-3.14/930-crashlog.patch
new file mode 100644
index 00000000..e9337b68
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/930-crashlog.patch
@@ -0,0 +1,276 @@
+--- /dev/null
++++ b/include/linux/crashlog.h
+@@ -0,0 +1,17 @@
++#ifndef __CRASHLOG_H
++#define __CRASHLOG_H
++
++#ifdef CONFIG_CRASHLOG
++void crashlog_init_bootmem(struct bootmem_data *bdata);
++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
++#else
++static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
++{
++}
++
++static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++}
++#endif
++
++#endif
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1211,6 +1211,10 @@ config RELAY
+ 
+ 	  If unsure, say N.
+ 
++config CRASHLOG
++	bool "Crash logging"
++	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !(ARM || SPARC || PPC)
++
+ config BLK_DEV_INITRD
+ 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+ 	depends on BROKEN || !FRV
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -93,6 +93,7 @@ obj-$(CONFIG_PADATA) += padata.o
+ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
+ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
+ obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
++obj-$(CONFIG_CRASHLOG) += crashlog.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
+--- /dev/null
++++ b/kernel/crashlog.c
+@@ -0,0 +1,181 @@
++/*
++ * Crash information logger
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ *
++ * Based on ramoops.c
++ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
++ *
++ * This program is free software; you can redistribute 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 that 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/bootmem.h>
++#include <linux/memblock.h>
++#include <linux/debugfs.h>
++#include <linux/crashlog.h>
++#include <linux/kmsg_dump.h>
++#include <linux/module.h>
++#include <linux/pfn.h>
++#include <asm/io.h>
++
++#define CRASHLOG_PAGES	4
++#define CRASHLOG_SIZE	(CRASHLOG_PAGES * PAGE_SIZE)
++#define CRASHLOG_MAGIC	0xa1eedead
++
++/*
++ * Start the log at 1M before the end of RAM, as some boot loaders like
++ * to use the end of the RAM for stack usage and other things
++ * If this fails, fall back to using the last part.
++ */
++#define CRASHLOG_OFFSET	(1024 * 1024)
++
++struct crashlog_data {
++	u32 magic;
++	u32 len;
++	u8 data[];
++};
++
++static struct debugfs_blob_wrapper crashlog_blob;
++static unsigned long crashlog_addr = 0;
++static struct crashlog_data *crashlog_buf;
++static struct kmsg_dumper dump;
++static bool first = true;
++
++extern struct list_head *crashlog_modules;
++
++#ifndef CONFIG_NO_BOOTMEM
++void __init crashlog_init_bootmem(bootmem_data_t *bdata)
++{
++	unsigned long addr;
++
++	if (crashlog_addr)
++		return;
++
++	addr = PFN_PHYS(bdata->node_low_pfn) - CRASHLOG_OFFSET;
++	if (reserve_bootmem(addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", addr);
++		bdata->node_low_pfn -= CRASHLOG_PAGES;
++		addr = PFN_PHYS(bdata->node_low_pfn);
++	}
++	crashlog_addr = addr;
++}
++#endif
++
++#ifdef CONFIG_HAVE_MEMBLOCK
++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++	if (crashlog_addr)
++		return;
++
++	addr += size - CRASHLOG_OFFSET;
++	if (memblock_reserve(addr, CRASHLOG_SIZE)) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", (unsigned long) addr);
++		return;
++	}
++
++	crashlog_addr = addr;
++}
++#endif
++
++static void __init crashlog_copy(void)
++{
++	if (crashlog_buf->magic != CRASHLOG_MAGIC)
++		return;
++
++	if (!crashlog_buf->len || crashlog_buf->len >
++	    CRASHLOG_SIZE - sizeof(*crashlog_buf))
++		return;
++
++	crashlog_blob.size = crashlog_buf->len;
++	crashlog_blob.data = kmemdup(crashlog_buf->data,
++		crashlog_buf->len, GFP_KERNEL);
++
++	debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
++}
++
++static int get_maxlen(void)
++{
++	return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
++}
++
++static void crashlog_printf(const char *fmt, ...)
++{
++	va_list args;
++	int len = get_maxlen();
++
++	if (!len)
++		return;
++
++	va_start(args, fmt);
++	crashlog_buf->len += vscnprintf(
++		&crashlog_buf->data[crashlog_buf->len],
++		len, fmt, args);
++	va_end(args);
++}
++
++static void crashlog_do_dump(struct kmsg_dumper *dumper,
++		enum kmsg_dump_reason reason)
++{
++	struct timeval tv;
++	struct module *m;
++	char *buf;
++	size_t len;
++
++	if (!first)
++		crashlog_printf("\n===================================\n");
++
++	do_gettimeofday(&tv);
++	crashlog_printf("Time: %lu.%lu\n",
++		(long)tv.tv_sec, (long)tv.tv_usec);
++
++	if (first) {
++		crashlog_printf("Modules:");
++		list_for_each_entry(m, crashlog_modules, list) {
++			crashlog_printf("\t%s@%p+%x", m->name,
++			m->module_core, m->core_size,
++			m->module_init, m->init_size);
++		}
++		crashlog_printf("\n");
++		first = false;
++	}
++
++	buf = (char *)&crashlog_buf->data[crashlog_buf->len];
++
++	kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
++
++	crashlog_buf->len += len;
++}
++
++
++int __init crashlog_init_fs(void)
++{
++	if (!crashlog_addr)
++		return -ENOMEM;
++
++	crashlog_buf = ioremap(crashlog_addr, CRASHLOG_SIZE);
++
++	crashlog_copy();
++
++	crashlog_buf->magic = CRASHLOG_MAGIC;
++	crashlog_buf->len = 0;
++
++	dump.max_reason = KMSG_DUMP_OOPS;
++	dump.dump = crashlog_do_dump;
++	kmsg_dump_register(&dump);
++
++	return 0;
++}
++module_init(crashlog_init_fs);
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -15,6 +15,7 @@
+ #include <linux/export.h>
+ #include <linux/kmemleak.h>
+ #include <linux/range.h>
++#include <linux/crashlog.h>
+ #include <linux/memblock.h>
+ 
+ #include <asm/bug.h>
+@@ -177,6 +178,7 @@ static unsigned long __init free_all_boo
+ 	if (!bdata->node_bootmem_map)
+ 		return 0;
+ 
++	crashlog_init_bootmem(bdata);
+ 	map = bdata->node_bootmem_map;
+ 	start = bdata->node_min_pfn;
+ 	end = bdata->node_low_pfn;
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -106,6 +106,9 @@ static LIST_HEAD(modules);
+ #ifdef CONFIG_KGDB_KDB
+ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+ #endif /* CONFIG_KGDB_KDB */
++#ifdef CONFIG_CRASHLOG
++struct list_head *crashlog_modules = &modules;
++#endif
+ 
+ #ifdef CONFIG_MODULE_SIG
+ #ifdef CONFIG_MODULE_SIG_FORCE
+--- a/mm/memblock.c
++++ b/mm/memblock.c
+@@ -19,6 +19,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+ #include <linux/memblock.h>
++#include <linux/crashlog.h>
+ 
+ #include <asm-generic/sections.h>
+ #include <linux/io.h>
+@@ -468,6 +469,8 @@ static void __init_memblock memblock_ins
+ 	memblock_set_region_node(rgn, nid);
+ 	type->cnt++;
+ 	type->total_size += size;
++	if (type == &memblock.memory && idx == 0)
++		crashlog_init_memblock(base, size);
+ }
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.14/940-ocf_kbuild_integration.patch b/trunk/target/linux/generic/patches-3.14/940-ocf_kbuild_integration.patch
new file mode 100644
index 00000000..a7dd5fad
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/940-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1415,3 +1415,6 @@ source "drivers/crypto/Kconfig"
+ source crypto/asymmetric_keys/Kconfig
+ 
+ endif	# if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -99,6 +99,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
+ obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
+ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
+ 
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #
diff --git a/trunk/target/linux/generic/patches-3.14/941-ocf_20120127.patch b/trunk/target/linux/generic/patches-3.14/941-ocf_20120127.patch
new file mode 100644
index 00000000..d97f7746
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/941-ocf_20120127.patch
@@ -0,0 +1,166 @@
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -139,6 +139,9 @@
+  * that might otherwise be identical and have very little entropy
+  * available to them (particularly common in the embedded world).
+  *
++ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++ *      int random_input_wait(void);
++ *
+  * add_input_randomness() uses the input layer interrupt timing, as well as
+  * the event type information from the hardware.
+  *
+@@ -152,6 +155,13 @@
+  * seek times do not make for good sources of entropy, as their seek
+  * times are usually fairly consistent.
+  *
++ * random_input_words() just provides a raw block of entropy to the input
++ * pool, such as from a hardware entropy generator.
++ *
++ * random_input_wait() suspends the caller until such time as the
++ * entropy pool falls below the write threshold, and returns a count of how
++ * much entropy (in bits) is needed to sustain the pool.
++ *
+  * All of these routines try to estimate how many bits of randomness a
+  * particular randomness source.  They do this by keeping track of the
+  * first and second order deltas of the event timings.
+@@ -889,6 +899,63 @@ void add_disk_randomness(struct gendisk 
+ }
+ #endif
+ 
++/*
++ * random_input_words - add bulk entropy to pool
++ *
++ * @buf: buffer to add
++ * @wordcount: number of __u32 words to add
++ * @ent_count: total amount of entropy (in bits) to credit
++ *
++ * this provides bulk input of entropy to the input pool
++ *
++ */
++void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++{
++	mix_pool_bytes(&input_pool, buf, wordcount*4, NULL);
++
++	credit_entropy_bits(&input_pool, ent_count);
++
++	pr_notice("crediting %d bits => %d\n",
++		  ent_count, input_pool.entropy_count);
++	/*
++	 * Wake up waiting processes if we have enough
++	 * entropy.
++	 */
++	if (input_pool.entropy_count >= random_read_wakeup_thresh)
++		wake_up_interruptible(&random_read_wait);
++}
++EXPORT_SYMBOL(random_input_words);
++
++/*
++ * random_input_wait - wait until random needs entropy
++ *
++ * this function sleeps until the /dev/random subsystem actually
++ * needs more entropy, and then return the amount of entropy
++ * that it would be nice to have added to the system.
++ */
++int random_input_wait(void)
++{
++	int count;
++
++	wait_event_interruptible(random_write_wait, 
++			 input_pool.entropy_count < random_write_wakeup_thresh);
++
++	count = random_write_wakeup_thresh - input_pool.entropy_count;
++
++        /* likely we got woken up due to a signal */
++	if (count <= 0) count = random_read_wakeup_thresh; 
++
++	pr_notice("requesting %d bits from input_wait()er %d<%d\n",
++		  count,
++		  input_pool.entropy_count, random_write_wakeup_thresh);
++
++	return count;
++}
++EXPORT_SYMBOL(random_input_wait);
++
++
++#define EXTRACT_SIZE 10
++
+ /*********************************************************************
+  *
+  * Entropy extraction routines
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -147,6 +147,7 @@ pid_t f_getown(struct file *filp)
+ 	read_unlock(&filp->f_owner.lock);
+ 	return pid;
+ }
++EXPORT_SYMBOL(sys_dup);
+ 
+ static int f_setown_ex(struct file *filp, unsigned long arg)
+ {
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -19,6 +19,7 @@
+ #define APOLLO_MOUSE_MINOR	7
+ #define PC110PAD_MINOR		9
+ /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
++#define CRYPTODEV_MINOR		70	/* /dev/crypto */
+ #define WATCHDOG_MINOR		130	/* Watchdog timer     */
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+--- a/include/uapi/linux/random.h
++++ b/include/uapi/linux/random.h
+@@ -34,6 +34,30 @@
+ /* Clear the entropy pool and associated counters.  (Superuser only.) */
+ #define RNDCLEARPOOL	_IO( 'R', 0x06 )
+ 
++#ifdef CONFIG_FIPS_RNG
++
++/* Size of seed value - equal to AES blocksize */
++#define AES_BLOCK_SIZE_BYTES	16
++#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
++/* Size of AES key */
++#define KEY_SIZE_BYTES		16
++
++/* ioctl() structure used by FIPS 140-2 Tests */
++struct rand_fips_test {
++	unsigned char key[KEY_SIZE_BYTES];			/* Input */
++	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
++	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
++	unsigned char result[SEED_SIZE_BYTES];		/* Output */
++};
++
++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
++#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
++
++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
++#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
++
++#endif /* #ifdef CONFIG_FIPS_RNG */
++
+ struct rand_pool_info {
+ 	int	entropy_count;
+ 	int	buf_size;
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -13,6 +13,10 @@ extern void add_input_randomness(unsigne
+ 				 unsigned int value);
+ extern void add_interrupt_randomness(int irq, int irq_flags);
+ 
++extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
++extern int random_input_wait(void);
++#define HAS_RANDOM_INPUT_WAIT 1
++
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -425,6 +425,7 @@ void transfer_pid(struct task_struct *ol
+ 	new->pids[type].pid = old->pids[type].pid;
+ 	hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
diff --git a/trunk/target/linux/generic/patches-3.14/960-decompress_unlzo_fix.patch b/trunk/target/linux/generic/patches-3.14/960-decompress_unlzo_fix.patch
new file mode 100644
index 00000000..ee7c118e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/960-decompress_unlzo_fix.patch
@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/include/linux/decompress/unlzo_mm.h
+@@ -0,0 +1,10 @@
++#ifndef UNLZO_MM_H
++#define UNLZO_MM_H
++
++#ifdef STATIC
++#define INIT
++#else
++#define INIT __init
++#endif
++
++#endif
+--- a/lib/decompress_unlzo.c
++++ b/lib/decompress_unlzo.c
+@@ -38,6 +38,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/lzo.h>
++#include <linux/decompress/unlzo_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #include <linux/compiler.h>
diff --git a/trunk/target/linux/generic/patches-3.14/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/trunk/target/linux/generic/patches-3.14/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 00000000..ac13c9e6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/970-remove-unsane-filenames-from-deps_initramfs-list.patch
@@ -0,0 +1,29 @@
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data
+ 	include $(obj)/.initramfs_data.cpio.d
+ endif
+ 
++deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
++
+ quiet_cmd_initfs = GEN     $@
+       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+ 
+@@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra
+ 	initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
+ 	initramfs_data.cpio
+ # do not try to update files included in initramfs
+-$(deps_initramfs): ;
++$(deps_initramfs_sane): ;
+ 
+-$(deps_initramfs): klibcdirs
++$(deps_initramfs_sane): klibcdirs
+ # We rebuild initramfs_data.cpio if:
+ # 1) Any included file is newer then initramfs_data.cpio
+ # 2) There are changes in which files are included (added or deleted)
+ # 3) If gen_init_cpio are newer than initramfs_data.cpio
+ # 4) arguments to gen_initramfs.sh changes
+-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
++$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
+ 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
+ 	$(call if_changed,initfs)
diff --git a/trunk/target/linux/generic/patches-3.14/980-arm_openwrt_machtypes.patch b/trunk/target/linux/generic/patches-3.14/980-arm_openwrt_machtypes.patch
new file mode 100644
index 00000000..8303344b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/980-arm_openwrt_machtypes.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1007,3 +1007,29 @@ eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572
+ eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573
+ domotab			MACH_DOMOTAB		DOMOTAB			4574
+ pfla03			MACH_PFLA03		PFLA03			4575
++#
++# Additional mach-types supported by libreCMC
++#
++wg302v1			MACH_WG302V1		WG302V1			889
++pronghorn		MACH_PRONGHORN		PRONGHORN		928
++pronghorn_metro		MACH_PRONGHORNMETRO	PRONGHORNMETRO		1040
++sidewinder		MACH_SIDEWINDER		SIDEWINDER		1041
++wrt300nv2		MACH_WRT300NV2		WRT300NV2		1077
++compex42x		MACH_COMPEXWP18		COMPEXWP18		1273
++goldfish		MACH_GOLDFISH		GOLDFISH		1441
++cambria			MACH_CAMBRIA		CAMBRIA			1468
++dt2			MACH_DT2		DT2			1514
++ap1000			MACH_AP1000		AP1000			1543
++tw2662			MACH_TW2662		TW2662			1658
++tw5334			MACH_TW5334		TW5334			1664
++usr8200			MACH_USR8200		USR8200			1762
++mi424wr			MACH_MI424WR		MI424WR			1778
++gw2388			MACH_GW2388		GW2388			2635
++iconnect		MACH_ICONNECT		ICONNECT		2870
++nsb3ast			MACH_NSB3AST		NSB3AST			2917
++goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089
++nas6210			MACH_NAS6210		NAS6210			3104
++ns_k330			MACH_NS_K330		NS_K330			3108
++bcm2708			MACH_BCM2708		BCM2708			3138
++wn802t			MACH_WN802T		WN802T			3306
++nsa310			MACH_NSA310		NSA310			4022
diff --git a/trunk/target/linux/generic/patches-3.14/990-gpio_wdt.patch b/trunk/target/linux/generic/patches-3.14/990-gpio_wdt.patch
new file mode 100644
index 00000000..d9e1bf75
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/990-gpio_wdt.patch
@@ -0,0 +1,360 @@
+This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
+
+Signed-off-by: Mathias Adam <m.adam--librecmc@adamis.de>
+
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -1084,6 +1084,15 @@ config WDT_MTX1
+ 	  Hardware driver for the MTX-1 boards. This is a watchdog timer that
+ 	  will reboot the machine after a 100 seconds timer expired.
+ 
++config GPIO_WDT
++	tristate "GPIO Hardware Watchdog"
++ 	help
++	  Hardware driver for GPIO-controlled watchdogs. GPIO pin and
++	  toggle interval settings are platform-specific. The driver
++	  will stop toggling the GPIO (i.e. machine reboots) after a
++	  100 second timer expired and no process has written to
++	  /dev/watchdog during that time.
++
+ config PNX833X_WDT
+ 	tristate "PNX833x Hardware Watchdog"
+ 	depends on SOC_PNX8335
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -130,6 +130,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
+ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
++obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o
+ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
+ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
+ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+--- /dev/null
++++ b/drivers/watchdog/old_gpio_wdt.c
+@@ -0,0 +1,301 @@
++/*
++ *      Driver for GPIO-controlled Hardware Watchdogs.
++ *
++ *      Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *      Replaces mtx1_wdt (driver for the MTX-1 Watchdog):
++ *
++ *      (C) Copyright 2005 4G Systems <info@4g-systems.biz>,
++ *                              All Rights Reserved.
++ *                              http://www.4g-systems.biz
++ *
++ *      (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
++ *
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ *
++ *      Neither Michael Stickel nor 4G Systems admit liability nor provide
++ *      warranty for any of this software. This material is provided
++ *      "AS-IS" and at no charge.
++ *
++ *      (c) Copyright 2005    4G Systems <info@4g-systems.biz>
++ *
++ *      Release 0.01.
++ *      Author: Michael Stickel  michael.stickel@4g-systems.biz
++ *
++ *      Release 0.02.
++ *      Author: Florian Fainelli florian@openwrt.org
++ *              use the Linux watchdog/timer APIs
++ *
++ *      Release 0.03.
++ *      Author: Mathias Adam <m.adam--linux@adamis.de>
++ *              make it a generic gpio watchdog driver
++ *
++ *      The Watchdog is configured to reset the MTX-1
++ *      if it is not triggered for 100 seconds.
++ *      It should not be triggered more often than 1.6 seconds.
++ *
++ *      A timer triggers the watchdog every 5 seconds, until
++ *      it is opened for the first time. After the first open
++ *      it MUST be triggered every 2..95 seconds.
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/miscdevice.h>
++#include <linux/fs.h>
++#include <linux/init.h>
++#include <linux/ioport.h>
++#include <linux/timer.h>
++#include <linux/completion.h>
++#include <linux/jiffies.h>
++#include <linux/watchdog.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/uaccess.h>
++#include <linux/gpio.h>
++#include <linux/old_gpio_wdt.h>
++
++static int ticks = 100 * HZ;
++
++static struct {
++	struct completion stop;
++	spinlock_t lock;
++	int running;
++	struct timer_list timer;
++	int queue;
++	int default_ticks;
++	unsigned long inuse;
++	unsigned gpio;
++	unsigned int gstate;
++	int interval;
++	int first_interval;
++} gpio_wdt_device;
++
++static void gpio_wdt_trigger(unsigned long unused)
++{
++	spin_lock(&gpio_wdt_device.lock);
++	if (gpio_wdt_device.running && ticks > 0)
++		ticks -= gpio_wdt_device.interval;
++
++	/* toggle wdt gpio */
++	gpio_wdt_device.gstate = !gpio_wdt_device.gstate;
++	gpio_set_value(gpio_wdt_device.gpio, gpio_wdt_device.gstate);
++
++	if (gpio_wdt_device.queue && ticks > 0)
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.interval);
++	else
++		complete(&gpio_wdt_device.stop);
++	spin_unlock(&gpio_wdt_device.lock);
++}
++
++static void gpio_wdt_reset(void)
++{
++	ticks = gpio_wdt_device.default_ticks;
++}
++
++
++static void gpio_wdt_start(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (!gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 1;
++		gpio_wdt_device.gstate = 1;
++		gpio_set_value(gpio_wdt_device.gpio, 1);
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.first_interval);
++	}
++	gpio_wdt_device.running++;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++}
++
++static int gpio_wdt_stop(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		gpio_wdt_device.gstate = 0;
++		gpio_set_value(gpio_wdt_device.gpio, 0);
++	}
++	ticks = gpio_wdt_device.default_ticks;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++	return 0;
++}
++
++/* Filesystem functions */
++
++static int gpio_wdt_open(struct inode *inode, struct file *file)
++{
++	if (test_and_set_bit(0, &gpio_wdt_device.inuse))
++		return -EBUSY;
++	return nonseekable_open(inode, file);
++}
++
++
++static int gpio_wdt_release(struct inode *inode, struct file *file)
++{
++	clear_bit(0, &gpio_wdt_device.inuse);
++	return 0;
++}
++
++static long gpio_wdt_ioctl(struct file *file, unsigned int cmd,
++							unsigned long arg)
++{
++	void __user *argp = (void __user *)arg;
++	int __user *p = (int __user *)argp;
++	unsigned int value;
++	static const struct watchdog_info ident = {
++		.options = WDIOF_CARDRESET,
++		.identity = "GPIO WDT",
++	};
++
++	switch (cmd) {
++	case WDIOC_GETSUPPORT:
++		if (copy_to_user(argp, &ident, sizeof(ident)))
++			return -EFAULT;
++		break;
++	case WDIOC_GETSTATUS:
++	case WDIOC_GETBOOTSTATUS:
++		put_user(0, p);
++		break;
++	case WDIOC_SETOPTIONS:
++		if (get_user(value, p))
++			return -EFAULT;
++		if (value & WDIOS_ENABLECARD)
++			gpio_wdt_start();
++		else if (value & WDIOS_DISABLECARD)
++			gpio_wdt_stop();
++		else
++			return -EINVAL;
++		return 0;
++	case WDIOC_KEEPALIVE:
++		gpio_wdt_reset();
++		break;
++	default:
++		return -ENOTTY;
++	}
++	return 0;
++}
++
++
++static ssize_t gpio_wdt_write(struct file *file, const char *buf,
++						size_t count, loff_t *ppos)
++{
++	if (!count)
++		return -EIO;
++	gpio_wdt_reset();
++	return count;
++}
++
++static const struct file_operations gpio_wdt_fops = {
++	.owner		= THIS_MODULE,
++	.llseek		= no_llseek,
++	.unlocked_ioctl	= gpio_wdt_ioctl,
++	.open		= gpio_wdt_open,
++	.write		= gpio_wdt_write,
++	.release	= gpio_wdt_release,
++};
++
++
++static struct miscdevice gpio_wdt_misc = {
++	.minor	= WATCHDOG_MINOR,
++	.name	= "watchdog",
++	.fops	= &gpio_wdt_fops,
++};
++
++
++static int gpio_wdt_probe(struct platform_device *pdev)
++{
++	int ret;
++	struct gpio_wdt_platform_data *gpio_wdt_data = pdev->dev.platform_data;
++
++	gpio_wdt_device.gpio = gpio_wdt_data->gpio;
++	gpio_wdt_device.interval = gpio_wdt_data->interval;
++	gpio_wdt_device.first_interval = gpio_wdt_data->first_interval;
++	if (gpio_wdt_device.first_interval <= 0) {
++		gpio_wdt_device.first_interval = gpio_wdt_device.interval;
++	}
++
++	ret = gpio_request(gpio_wdt_device.gpio, "gpio-wdt");
++	if (ret < 0) {
++		dev_err(&pdev->dev, "failed to request gpio");
++		return ret;
++	}
++
++	spin_lock_init(&gpio_wdt_device.lock);
++	init_completion(&gpio_wdt_device.stop);
++	gpio_wdt_device.queue = 0;
++	clear_bit(0, &gpio_wdt_device.inuse);
++	setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
++	gpio_wdt_device.default_ticks = ticks;
++
++	gpio_wdt_start();
++	dev_info(&pdev->dev, "GPIO Hardware Watchdog driver (gpio=%i interval=%i/%i)\n",
++		gpio_wdt_data->gpio, gpio_wdt_data->first_interval, gpio_wdt_data->interval);
++	return 0;
++}
++
++static int gpio_wdt_remove(struct platform_device *pdev)
++{
++	/* FIXME: do we need to lock this test ? */
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		wait_for_completion(&gpio_wdt_device.stop);
++	}
++
++	gpio_free(gpio_wdt_device.gpio);
++	misc_deregister(&gpio_wdt_misc);
++	return 0;
++}
++
++static struct platform_driver gpio_wdt_driver = {
++	.probe = gpio_wdt_probe,
++	.remove = gpio_wdt_remove,
++	.driver.name = "gpio-wdt",
++	.driver.owner = THIS_MODULE,
++};
++
++static int __init gpio_wdt_init(void)
++{
++	return platform_driver_register(&gpio_wdt_driver);
++}
++arch_initcall(gpio_wdt_init);
++
++/*
++ * We do wdt initialization in two steps: arch_initcall probes the wdt
++ * very early to start pinging the watchdog (misc devices are not yet
++ * available), and later module_init() just registers the misc device.
++ */
++static int gpio_wdt_init_late(void)
++{
++	int ret;
++
++	ret = misc_register(&gpio_wdt_misc);
++	if (ret < 0) {
++		pr_err("GPIO_WDT: failed to register misc device\n");
++		return ret;
++	}
++	return 0;
++}
++#ifndef MODULE
++module_init(gpio_wdt_init_late);
++#endif
++
++static void __exit gpio_wdt_exit(void)
++{
++	platform_driver_unregister(&gpio_wdt_driver);
++}
++module_exit(gpio_wdt_exit);
++
++MODULE_AUTHOR("Michael Stickel, Florian Fainelli, Mathias Adam");
++MODULE_DESCRIPTION("Driver for GPIO hardware watchdogs");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
++MODULE_ALIAS("platform:gpio-wdt");
+--- /dev/null
++++ b/include/linux/old_gpio_wdt.h
+@@ -0,0 +1,21 @@
++/*
++ *  Definitions for the GPIO watchdog driver
++ *
++ *  Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ *
++ */
++
++#ifndef _GPIO_WDT_H_
++#define _GPIO_WDT_H_
++
++struct gpio_wdt_platform_data {
++	int	gpio;		/* GPIO line number */
++	int	interval;	/* watchdog reset interval in system ticks */
++	int	first_interval;	/* first wd reset interval in system ticks */
++};
++
++#endif /* _GPIO_WDT_H_ */
diff --git a/trunk/target/linux/generic/patches-3.14/996-zsmalloc_allow_module_build.patch b/trunk/target/linux/generic/patches-3.14/996-zsmalloc_allow_module_build.patch
new file mode 100644
index 00000000..8ff2b691
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/996-zsmalloc_allow_module_build.patch
@@ -0,0 +1,11 @@
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -557,7 +557,7 @@ config MEM_SOFT_DIRTY
+ 	  See Documentation/vm/soft-dirty.txt for more details.
+ 
+ config ZSMALLOC
+-	bool "Memory allocator for compressed pages"
++	tristate "Memory allocator for compressed pages"
+ 	depends on MMU
+ 	default n
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch b/trunk/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
new file mode 100644
index 00000000..bc8e7091
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -817,6 +817,9 @@ int __init early_init_dt_scan_chosen(uns
+ 	p = of_get_flat_dt_prop(node, "bootargs", &l);
+ 	if (p != NULL && l > 0)
+ 		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
++	p = of_get_flat_dt_prop(node, "bootargs-append", &l);
++	if (p != NULL && l > 0)
++		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
+ 
+ 	/*
+ 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
diff --git a/trunk/target/linux/generic/patches-3.14/998-enable_wilink_platform_without_drivers.patch b/trunk/target/linux/generic/patches-3.14/998-enable_wilink_platform_without_drivers.patch
new file mode 100644
index 00000000..d317de11
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.14/998-enable_wilink_platform_without_drivers.patch
@@ -0,0 +1,15 @@
+We use backports for driver updates - make sure we can compile in the glue code regardless
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/drivers/net/wireless/ti/Kconfig
++++ b/drivers/net/wireless/ti/Kconfig
+@@ -15,7 +15,7 @@ source "drivers/net/wireless/ti/wlcore/K
+ 
+ config WILINK_PLATFORM_DATA
+ 	bool "TI WiLink platform data"
+-	depends on WLCORE_SDIO || WL1251_SDIO
++	depends on WLCORE_SDIO || WL1251_SDIO || ARCH_OMAP2PLUS
+ 	default y
+ 	---help---
+ 	Small platform data bit needed to pass data to the sdio modules.
diff --git a/trunk/target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch b/trunk/target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch
new file mode 100644
index 00000000..d4164ca2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/000-keep_initrafs_the_default.patch
@@ -0,0 +1,25 @@
+Upstream changed the default rootfs to tmpfs when none has been passed
+to the kernel - this doesn't fit our purposes, so change it back.
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -623,6 +623,7 @@ int __init init_rootfs(void)
+ 	if (err)
+ 		return err;
+ 
++#if 0
+ 	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+ 		(!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
+ 		err = shmem_init();
+@@ -630,6 +631,9 @@ int __init init_rootfs(void)
+ 	} else {
+ 		err = init_ramfs_fs();
+ 	}
++#else
++	err = init_ramfs_fs();
++#endif
+ 
+ 	if (err)
+ 		unregister_filesystem(&rootfs_fs_type);
diff --git a/trunk/target/linux/generic/patches-3.18/020-ssb_update.patch b/trunk/target/linux/generic/patches-3.18/020-ssb_update.patch
new file mode 100644
index 00000000..9171b247
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/020-ssb_update.patch
@@ -0,0 +1,78 @@
+--- a/drivers/ssb/pcihost_wrapper.c
++++ b/drivers/ssb/pcihost_wrapper.c
+@@ -11,15 +11,17 @@
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
++#include <linux/pm.h>
+ #include <linux/pci.h>
+ #include <linux/export.h>
+ #include <linux/slab.h>
+ #include <linux/ssb/ssb.h>
+ 
+ 
+-#ifdef CONFIG_PM
+-static int ssb_pcihost_suspend(struct pci_dev *dev, pm_message_t state)
++#ifdef CONFIG_PM_SLEEP
++static int ssb_pcihost_suspend(struct device *d)
+ {
++	struct pci_dev *dev = to_pci_dev(d);
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+@@ -28,17 +30,23 @@ static int ssb_pcihost_suspend(struct pc
+ 		return err;
+ 	pci_save_state(dev);
+ 	pci_disable_device(dev);
+-	pci_set_power_state(dev, pci_choose_state(dev, state));
++
++	/* if there is a wakeup enabled child device on ssb bus,
++	   enable pci wakeup posibility. */
++	device_set_wakeup_enable(d, d->power.wakeup_path);
++
++	pci_prepare_to_sleep(dev);
+ 
+ 	return 0;
+ }
+ 
+-static int ssb_pcihost_resume(struct pci_dev *dev)
++static int ssb_pcihost_resume(struct device *d)
+ {
++	struct pci_dev *dev = to_pci_dev(d);
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+-	pci_set_power_state(dev, PCI_D0);
++	pci_back_from_sleep(dev);
+ 	err = pci_enable_device(dev);
+ 	if (err)
+ 		return err;
+@@ -49,10 +57,12 @@ static int ssb_pcihost_resume(struct pci
+ 
+ 	return 0;
+ }
+-#else /* CONFIG_PM */
+-# define ssb_pcihost_suspend	NULL
+-# define ssb_pcihost_resume	NULL
+-#endif /* CONFIG_PM */
++
++static const struct dev_pm_ops ssb_pcihost_pm_ops = {
++	SET_SYSTEM_SLEEP_PM_OPS(ssb_pcihost_suspend, ssb_pcihost_resume)
++};
++
++#endif /* CONFIG_PM_SLEEP */
+ 
+ static int ssb_pcihost_probe(struct pci_dev *dev,
+ 			     const struct pci_device_id *id)
+@@ -115,8 +125,9 @@ int ssb_pcihost_register(struct pci_driv
+ {
+ 	driver->probe = ssb_pcihost_probe;
+ 	driver->remove = ssb_pcihost_remove;
+-	driver->suspend = ssb_pcihost_suspend;
+-	driver->resume = ssb_pcihost_resume;
++#ifdef CONFIG_PM_SLEEP
++	driver->driver.pm = &ssb_pcihost_pm_ops;
++#endif
+ 
+ 	return pci_register_driver(driver);
+ }
diff --git a/trunk/target/linux/generic/patches-3.18/025-bcma_backport.patch b/trunk/target/linux/generic/patches-3.18/025-bcma_backport.patch
new file mode 100644
index 00000000..48fd5bb7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/025-bcma_backport.patch
@@ -0,0 +1,249 @@
+--- a/drivers/bcma/bcma_private.h
++++ b/drivers/bcma/bcma_private.h
+@@ -24,6 +24,7 @@ struct bcma_bus;
+ /* main.c */
+ bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
+ 		     int timeout);
++void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);
+ int bcma_bus_register(struct bcma_bus *bus);
+ void bcma_bus_unregister(struct bcma_bus *bus);
+ int __init bcma_bus_early_register(struct bcma_bus *bus,
+--- a/drivers/bcma/driver_chipcommon.c
++++ b/drivers/bcma/driver_chipcommon.c
+@@ -339,7 +339,7 @@ void bcma_chipco_serial_init(struct bcma
+ 		return;
+ 	}
+ 
+-	irq = bcma_core_irq(cc->core);
++	irq = bcma_core_irq(cc->core, 0);
+ 
+ 	/* Determine the registers of the UARTs */
+ 	cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -152,7 +152,7 @@ static int bcma_gpio_irq_domain_init(str
+ 					 handle_simple_irq);
+ 	}
+ 
+-	hwirq = bcma_core_irq(cc->core);
++	hwirq = bcma_core_irq(cc->core, 0);
+ 	err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio",
+ 			  cc);
+ 	if (err)
+@@ -183,7 +183,7 @@ static void bcma_gpio_irq_domain_exit(st
+ 		return;
+ 
+ 	bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO);
+-	free_irq(bcma_core_irq(cc->core), cc);
++	free_irq(bcma_core_irq(cc->core, 0), cc);
+ 	for (gpio = 0; gpio < chip->ngpio; gpio++) {
+ 		int irq = irq_find_mapping(cc->irq_domain, gpio);
+ 
+--- a/drivers/bcma/driver_mips.c
++++ b/drivers/bcma/driver_mips.c
+@@ -115,7 +115,7 @@ static u32 bcma_core_mips_irqflag(struct
+  * If disabled, 5 is returned.
+  * If not supported, 6 is returned.
+  */
+-static unsigned int bcma_core_mips_irq(struct bcma_device *dev)
++unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	struct bcma_device *mdev = dev->bus->drv_mips.core;
+ 	u32 irqflag;
+@@ -133,13 +133,6 @@ static unsigned int bcma_core_mips_irq(s
+ 	return 5;
+ }
+ 
+-unsigned int bcma_core_irq(struct bcma_device *dev)
+-{
+-	unsigned int mips_irq = bcma_core_mips_irq(dev);
+-	return mips_irq <= 4 ? mips_irq + 2 : 0;
+-}
+-EXPORT_SYMBOL(bcma_core_irq);
+-
+ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
+ {
+ 	unsigned int oldirq = bcma_core_mips_irq(dev);
+@@ -423,7 +416,7 @@ void bcma_core_mips_init(struct bcma_drv
+ 		break;
+ 	default:
+ 		list_for_each_entry(core, &bus->cores, list) {
+-			core->irq = bcma_core_irq(core);
++			core->irq = bcma_core_irq(core, 0);
+ 		}
+ 		bcma_err(bus,
+ 			 "Unknown device (0x%x) found, can not configure IRQs\n",
+--- a/drivers/bcma/driver_pci_host.c
++++ b/drivers/bcma/driver_pci_host.c
+@@ -593,7 +593,7 @@ int bcma_core_pci_plat_dev_init(struct p
+ 	pr_info("PCI: Fixing up device %s\n", pci_name(dev));
+ 
+ 	/* Fix up interrupt lines */
+-	dev->irq = bcma_core_irq(pc_host->pdev->core);
++	dev->irq = bcma_core_irq(pc_host->pdev->core, 0);
+ 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+ 
+ 	readrq = pcie_get_readrq(dev);
+@@ -617,6 +617,6 @@ int bcma_core_pci_pcibios_map_irq(const 
+ 
+ 	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
+ 			       pci_ops);
+-	return bcma_core_irq(pc_host->pdev->core);
++	return bcma_core_irq(pc_host->pdev->core, 0);
+ }
+ EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -11,6 +11,7 @@
+ #include <linux/bcma/bcma.h>
+ #include <linux/slab.h>
+ #include <linux/of_address.h>
++#include <linux/of_irq.h>
+ 
+ MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
+ MODULE_LICENSE("GPL");
+@@ -153,6 +154,46 @@ static struct device_node *bcma_of_find_
+ 	return NULL;
+ }
+ 
++static int bcma_of_irq_parse(struct platform_device *parent,
++			     struct bcma_device *core,
++			     struct of_phandle_args *out_irq, int num)
++{
++	__be32 laddr[1];
++	int rc;
++
++	if (core->dev.of_node) {
++		rc = of_irq_parse_one(core->dev.of_node, num, out_irq);
++		if (!rc)
++			return rc;
++	}
++
++	out_irq->np = parent->dev.of_node;
++	out_irq->args_count = 1;
++	out_irq->args[0] = num;
++
++	laddr[0] = cpu_to_be32(core->addr);
++	return of_irq_parse_raw(laddr, out_irq);
++}
++
++static unsigned int bcma_of_get_irq(struct platform_device *parent,
++				    struct bcma_device *core, int num)
++{
++	struct of_phandle_args out_irq;
++	int ret;
++
++	if (!parent || !parent->dev.of_node)
++		return 0;
++
++	ret = bcma_of_irq_parse(parent, core, &out_irq, num);
++	if (ret) {
++		bcma_debug(core->bus, "bcma_of_get_irq() failed with rc=%d\n",
++			   ret);
++		return 0;
++	}
++
++	return irq_create_of_mapping(&out_irq);
++}
++
+ static void bcma_of_fill_device(struct platform_device *parent,
+ 				struct bcma_device *core)
+ {
+@@ -161,18 +202,47 @@ static void bcma_of_fill_device(struct p
+ 	node = bcma_of_find_child_device(parent, core);
+ 	if (node)
+ 		core->dev.of_node = node;
++
++	core->irq = bcma_of_get_irq(parent, core, 0);
+ }
+ #else
+ static void bcma_of_fill_device(struct platform_device *parent,
+ 				struct bcma_device *core)
+ {
+ }
++static inline unsigned int bcma_of_get_irq(struct platform_device *parent,
++					   struct bcma_device *core, int num)
++{
++	return 0;
++}
+ #endif /* CONFIG_OF */
+ 
+-static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
++unsigned int bcma_core_irq(struct bcma_device *core, int num)
+ {
+-	int err;
++	struct bcma_bus *bus = core->bus;
++	unsigned int mips_irq;
++
++	switch (bus->hosttype) {
++	case BCMA_HOSTTYPE_PCI:
++		return bus->host_pci->irq;
++	case BCMA_HOSTTYPE_SOC:
++		if (bus->drv_mips.core && num == 0) {
++			mips_irq = bcma_core_mips_irq(core);
++			return mips_irq <= 4 ? mips_irq + 2 : 0;
++		}
++		if (bus->host_pdev)
++			return bcma_of_get_irq(bus->host_pdev, core, num);
++		return 0;
++	case BCMA_HOSTTYPE_SDIO:
++		return 0;
++	}
+ 
++	return 0;
++}
++EXPORT_SYMBOL(bcma_core_irq);
++
++void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
++{
+ 	core->dev.release = bcma_release_core_dev;
+ 	core->dev.bus = &bcma_bus_type;
+ 	dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
+@@ -196,6 +266,11 @@ static void bcma_register_core(struct bc
+ 	case BCMA_HOSTTYPE_SDIO:
+ 		break;
+ 	}
++}
++
++static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
++{
++	int err;
+ 
+ 	err = device_register(&core->dev);
+ 	if (err) {
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -505,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
+ 		bus->nr_cores++;
+ 		other_core = bcma_find_core_reverse(bus, core->id.id);
+ 		core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
++		bcma_prepare_core(bus, core);
+ 
+ 		bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
+ 			  core->core_index, bcma_device_name(&core->id),
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -447,4 +447,6 @@ extern u32 bcma_chipco_pll_read(struct b
+ #define  BCMA_DMA_TRANSLATION_DMA64_CMT	0x80000000 /* Client Mode Translation for 64-bit DMA */
+ extern u32 bcma_core_dma_translation(struct bcma_device *core);
+ 
++extern unsigned int bcma_core_irq(struct bcma_device *core, int num);
++
+ #endif /* LINUX_BCMA_H_ */
+--- a/include/linux/bcma/bcma_driver_mips.h
++++ b/include/linux/bcma/bcma_driver_mips.h
+@@ -43,12 +43,12 @@ struct bcma_drv_mips {
+ extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
+ extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);
+ 
+-extern unsigned int bcma_core_irq(struct bcma_device *core);
++extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
+ #else
+ static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
+ static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
+ 
+-static inline unsigned int bcma_core_irq(struct bcma_device *core)
++static inline unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	return 0;
+ }
diff --git a/trunk/target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch b/trunk/target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch
new file mode 100644
index 00000000..b2d53f9f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch
@@ -0,0 +1,50 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -15,8 +15,12 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
+-/* 10 parts were found on sflash on Netgear WNDR4500 */
+-#define BCM47XXPART_MAX_PARTS		12
++/*
++ * NAND flash on Netgear R6250 was verified to contain 15 partitions.
++ * This will result in allocating too big array for some old devices, but the
++ * memory will be freed soon anyway (see mtd_device_parse_register).
++ */
++#define BCM47XXPART_MAX_PARTS		20
+ 
+ /*
+  * Amount of bytes we read when analyzing each block of flash memory.
+@@ -168,18 +172,26 @@ static int bcm47xxpart_parse(struct mtd_
+ 				i++;
+ 			}
+ 
+-			bcm47xxpart_add_part(&parts[curr_part++], "linux",
+-					     offset + trx->offset[i], 0);
+-			i++;
++			if (trx->offset[i]) {
++				bcm47xxpart_add_part(&parts[curr_part++],
++						     "linux",
++						     offset + trx->offset[i],
++						     0);
++				i++;
++			}
+ 
+ 			/*
+ 			 * Pure rootfs size is known and can be calculated as:
+ 			 * trx->length - trx->offset[i]. We don't fill it as
+ 			 * we want to have jffs2 (overlay) in the same mtd.
+ 			 */
+-			bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
+-					     offset + trx->offset[i], 0);
+-			i++;
++			if (trx->offset[i]) {
++				bcm47xxpart_add_part(&parts[curr_part++],
++						     "rootfs",
++						     offset + trx->offset[i],
++						     0);
++				i++;
++			}
+ 
+ 			last_trx_part = curr_part - 1;
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/050-backport_netfilter_rtcache.patch b/trunk/target/linux/generic/patches-3.18/050-backport_netfilter_rtcache.patch
new file mode 100644
index 00000000..61a1411e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/050-backport_netfilter_rtcache.patch
@@ -0,0 +1,505 @@
+Subject: netfilter: conntrack: cache route for forwarded connections
+
+... to avoid per-packet FIB lookup if possible.
+
+The cached dst is re-used provided the input interface
+is the same as that of the previous packet in the same direction.
+
+If not, the cached dst is invalidated.
+
+For ipv6 we also need to store sernum, else dst_check doesn't work,
+pointed out by Eric Dumazet.
+
+This should speed up forwarding when conntrack is already in use
+anyway, especially when using reverse path filtering -- active RPF
+enforces two FIB lookups for each packet.
+
+Before the routing cache removal this didn't matter since RPF was performed
+only when route cache didn't yield a result; but without route cache it
+comes at higher price.
+
+Julian Anastasov suggested to add NETDEV_UNREGISTER handler to
+avoid holding on to dsts of 'frozen' conntracks.
+
+Signed-off-by: Florian Westphal <fw@strlen.de>
+
+--- a/include/net/netfilter/nf_conntrack_extend.h
++++ b/include/net/netfilter/nf_conntrack_extend.h
+@@ -30,6 +30,9 @@ enum nf_ct_ext_id {
+ #if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
+ 	NF_CT_EXT_SYNPROXY,
+ #endif
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
++	NF_CT_EXT_RTCACHE,
++#endif
+ 	NF_CT_EXT_NUM,
+ };
+ 
+@@ -43,6 +46,7 @@ enum nf_ct_ext_id {
+ #define NF_CT_EXT_TIMEOUT_TYPE struct nf_conn_timeout
+ #define NF_CT_EXT_LABELS_TYPE struct nf_conn_labels
+ #define NF_CT_EXT_SYNPROXY_TYPE struct nf_conn_synproxy
++#define NF_CT_EXT_RTCACHE_TYPE struct nf_conn_rtcache
+ 
+ /* Extensions: optional stuff which isn't permanently in struct. */
+ struct nf_ct_ext {
+--- /dev/null
++++ b/include/net/netfilter/nf_conntrack_rtcache.h
+@@ -0,0 +1,34 @@
++#include <linux/gfp.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_extend.h>
++
++struct dst_entry;
++
++struct nf_conn_dst_cache {
++	struct dst_entry *dst;
++	int iif;
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++	u32 cookie;
++#endif
++
++};
++
++struct nf_conn_rtcache {
++	struct nf_conn_dst_cache cached_dst[IP_CT_DIR_MAX];
++};
++
++static inline
++struct nf_conn_rtcache *nf_ct_rtcache_find(const struct nf_conn *ct)
++{
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
++	return nf_ct_ext_find(ct, NF_CT_EXT_RTCACHE);
++#else
++	return NULL;
++#endif
++}
++
++static inline int nf_conn_rtcache_iif_get(const struct nf_conn_rtcache *rtc,
++					  enum ip_conntrack_dir dir)
++{
++	return rtc->cached_dst[dir].iif;
++}
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -106,6 +106,18 @@ config NF_CONNTRACK_EVENTS
+ 
+ 	  If unsure, say `N'.
+ 
++config NF_CONNTRACK_RTCACHE
++	tristate "Cache route entries in conntrack objects"
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  If this option is enabled, the connection tracking code will
++	  cache routing information for each connection that is being
++	  forwarded, at a cost of 32 bytes per conntrack object.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++	  The module will be called nf_conntrack_rtcache.
++
+ config NF_CONNTRACK_TIMEOUT
+ 	bool  'Connection tracking timeout'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -18,6 +18,9 @@ obj-$(CONFIG_NETFILTER_NETLINK_LOG) += n
+ # connection tracking
+ obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o
+ 
++# optional conntrack route cache extension
++obj-$(CONFIG_NF_CONNTRACK_RTCACHE) += nf_conntrack_rtcache.o
++
+ # SCTP protocol connection tracking
+ obj-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o
+ obj-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o
+--- /dev/null
++++ b/net/netfilter/nf_conntrack_rtcache.c
+@@ -0,0 +1,387 @@
++/* route cache for netfilter.
++ *
++ * (C) 2014 Red Hat GmbH
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
++
++#include <linux/types.h>
++#include <linux/netfilter.h>
++#include <linux/skbuff.h>
++#include <linux/stddef.h>
++#include <linux/kernel.h>
++#include <linux/netdevice.h>
++#include <linux/export.h>
++#include <linux/module.h>
++
++#include <net/dst.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_rtcache.h>
++
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++#include <net/ip6_fib.h>
++#endif
++
++static void __nf_conn_rtcache_destroy(struct nf_conn_rtcache *rtc,
++				      enum ip_conntrack_dir dir)
++{
++	struct dst_entry *dst = rtc->cached_dst[dir].dst;
++
++	dst_release(dst);
++}
++
++static void nf_conn_rtcache_destroy(struct nf_conn *ct)
++{
++	struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
++
++	if (!rtc)
++		return;
++
++	__nf_conn_rtcache_destroy(rtc, IP_CT_DIR_ORIGINAL);
++	__nf_conn_rtcache_destroy(rtc, IP_CT_DIR_REPLY);
++}
++
++static void nf_ct_rtcache_ext_add(struct nf_conn *ct)
++{
++	struct nf_conn_rtcache *rtc;
++
++	rtc = nf_ct_ext_add(ct, NF_CT_EXT_RTCACHE, GFP_ATOMIC);
++	if (rtc) {
++		rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif = -1;
++		rtc->cached_dst[IP_CT_DIR_ORIGINAL].dst = NULL;
++		rtc->cached_dst[IP_CT_DIR_REPLY].iif = -1;
++		rtc->cached_dst[IP_CT_DIR_REPLY].dst = NULL;
++	}
++}
++
++static struct nf_conn_rtcache *nf_ct_rtcache_find_usable(struct nf_conn *ct)
++{
++	if (nf_ct_is_untracked(ct))
++		return NULL;
++	return nf_ct_rtcache_find(ct);
++}
++
++static struct dst_entry *
++nf_conn_rtcache_dst_get(const struct nf_conn_rtcache *rtc,
++			enum ip_conntrack_dir dir)
++{
++	return rtc->cached_dst[dir].dst;
++}
++
++static u32 nf_rtcache_get_cookie(int pf, const struct dst_entry *dst)
++{
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++	if (pf == NFPROTO_IPV6) {
++		const struct rt6_info *rt = (const struct rt6_info *)dst;
++
++		if (rt->rt6i_node)
++			return (u32)rt->rt6i_node->fn_sernum;
++	}
++#endif
++	return 0;
++}
++
++static void nf_conn_rtcache_dst_set(int pf,
++				    struct nf_conn_rtcache *rtc,
++				    struct dst_entry *dst,
++				    enum ip_conntrack_dir dir, int iif)
++{
++	if (rtc->cached_dst[dir].iif != iif)
++		rtc->cached_dst[dir].iif = iif;
++
++	if (rtc->cached_dst[dir].dst != dst) {
++		struct dst_entry *old;
++
++		dst_hold(dst);
++
++		old = xchg(&rtc->cached_dst[dir].dst, dst);
++		dst_release(old);
++
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++		if (pf == NFPROTO_IPV6)
++			rtc->cached_dst[dir].cookie =
++				nf_rtcache_get_cookie(pf, dst);
++#endif
++	}
++}
++
++static void nf_conn_rtcache_dst_obsolete(struct nf_conn_rtcache *rtc,
++					 enum ip_conntrack_dir dir)
++{
++	struct dst_entry *old;
++
++	pr_debug("Invalidate iif %d for dir %d on cache %p\n",
++		 rtc->cached_dst[dir].iif, dir, rtc);
++
++	old = xchg(&rtc->cached_dst[dir].dst, NULL);
++	dst_release(old);
++	rtc->cached_dst[dir].iif = -1;
++}
++
++static unsigned int nf_rtcache_in(const struct nf_hook_ops *ops,
++				  struct sk_buff *skb,
++				  const struct net_device *in,
++				  const struct net_device *out,
++				  int (*okfn)(struct sk_buff *))
++{
++	struct nf_conn_rtcache *rtc;
++	enum ip_conntrack_info ctinfo;
++	enum ip_conntrack_dir dir;
++	struct dst_entry *dst;
++	struct nf_conn *ct;
++	int iif;
++	u32 cookie;
++
++	if (skb_dst(skb) || skb->sk)
++		return NF_ACCEPT;
++
++	ct = nf_ct_get(skb, &ctinfo);
++	if (!ct)
++		return NF_ACCEPT;
++
++	rtc = nf_ct_rtcache_find_usable(ct);
++	if (!rtc)
++		return NF_ACCEPT;
++
++	/* if iif changes, don't use cache and let ip stack
++	 * do route lookup.
++	 *
++	 * If rp_filter is enabled it might toss skb, so
++	 * we don't want to avoid these checks.
++	 */
++	dir = CTINFO2DIR(ctinfo);
++	iif = nf_conn_rtcache_iif_get(rtc, dir);
++	if (in->ifindex != iif) {
++		pr_debug("ct %p, iif %d, cached iif %d, skip cached entry\n",
++			 ct, iif, in->ifindex);
++		return NF_ACCEPT;
++	}
++	dst = nf_conn_rtcache_dst_get(rtc, dir);
++	if (dst == NULL)
++		return NF_ACCEPT;
++
++	cookie = nf_rtcache_get_cookie(ops->pf, dst);
++
++	dst = dst_check(dst, cookie);
++	pr_debug("obtained dst %p for skb %p, cookie %d\n", dst, skb, cookie);
++	if (likely(dst))
++		skb_dst_set_noref_force(skb, dst);
++	else
++		nf_conn_rtcache_dst_obsolete(rtc, dir);
++
++	return NF_ACCEPT;
++}
++
++static unsigned int nf_rtcache_forward(const struct nf_hook_ops *ops,
++				       struct sk_buff *skb,
++				       const struct net_device *in,
++				       const struct net_device *out,
++				       int (*okfn)(struct sk_buff *))
++{
++	struct nf_conn_rtcache *rtc;
++	enum ip_conntrack_info ctinfo;
++	enum ip_conntrack_dir dir;
++	struct nf_conn *ct;
++	int iif;
++
++	ct = nf_ct_get(skb, &ctinfo);
++	if (!ct)
++		return NF_ACCEPT;
++
++	if (!nf_ct_is_confirmed(ct)) {
++		if (WARN_ON(nf_ct_rtcache_find(ct)))
++			return NF_ACCEPT;
++		nf_ct_rtcache_ext_add(ct);
++		return NF_ACCEPT;
++	}
++
++	rtc = nf_ct_rtcache_find_usable(ct);
++	if (!rtc)
++		return NF_ACCEPT;
++
++	dir = CTINFO2DIR(ctinfo);
++	iif = nf_conn_rtcache_iif_get(rtc, dir);
++	pr_debug("ct %p, skb %p, dir %d, iif %d, cached iif %d\n",
++		 ct, skb, dir, iif, in->ifindex);
++	if (likely(in->ifindex == iif))
++		return NF_ACCEPT;
++
++	nf_conn_rtcache_dst_set(ops->pf, rtc, skb_dst(skb), dir, in->ifindex);
++	return NF_ACCEPT;
++}
++
++static int nf_rtcache_dst_remove(struct nf_conn *ct, void *data)
++{
++	struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
++	struct net_device *dev = data;
++
++	if (!rtc)
++		return 0;
++
++	if (dev->ifindex == rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif ||
++	    dev->ifindex == rtc->cached_dst[IP_CT_DIR_REPLY].iif) {
++		nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_ORIGINAL);
++		nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_REPLY);
++	}
++
++	return 0;
++}
++
++static int nf_rtcache_netdev_event(struct notifier_block *this,
++				   unsigned long event, void *ptr)
++{
++	struct net_device *dev = netdev_notifier_info_to_dev(ptr);
++	struct net *net = dev_net(dev);
++
++	if (event == NETDEV_DOWN)
++		nf_ct_iterate_cleanup(net, nf_rtcache_dst_remove, dev, 0, 0);
++
++	return NOTIFY_DONE;
++}
++
++static struct notifier_block nf_rtcache_notifier = {
++	.notifier_call = nf_rtcache_netdev_event,
++};
++
++static struct nf_hook_ops rtcache_ops[] = {
++	{
++		.hook		= nf_rtcache_in,
++		.owner		= THIS_MODULE,
++		.pf		= NFPROTO_IPV4,
++		.hooknum	= NF_INET_PRE_ROUTING,
++		.priority       = NF_IP_PRI_LAST,
++	},
++	{
++		.hook           = nf_rtcache_forward,
++		.owner          = THIS_MODULE,
++		.pf             = NFPROTO_IPV4,
++		.hooknum        = NF_INET_FORWARD,
++		.priority       = NF_IP_PRI_LAST,
++	},
++#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
++	{
++		.hook		= nf_rtcache_in,
++		.owner		= THIS_MODULE,
++		.pf		= NFPROTO_IPV6,
++		.hooknum	= NF_INET_PRE_ROUTING,
++		.priority       = NF_IP_PRI_LAST,
++	},
++	{
++		.hook           = nf_rtcache_forward,
++		.owner          = THIS_MODULE,
++		.pf             = NFPROTO_IPV6,
++		.hooknum        = NF_INET_FORWARD,
++		.priority       = NF_IP_PRI_LAST,
++	},
++#endif
++};
++
++static struct nf_ct_ext_type rtcache_extend __read_mostly = {
++	.len	= sizeof(struct nf_conn_rtcache),
++	.align	= __alignof__(struct nf_conn_rtcache),
++	.id	= NF_CT_EXT_RTCACHE,
++	.destroy = nf_conn_rtcache_destroy,
++};
++
++static int __init nf_conntrack_rtcache_init(void)
++{
++	int ret = nf_ct_extend_register(&rtcache_extend);
++
++	if (ret < 0) {
++		pr_err("nf_conntrack_rtcache: Unable to register extension\n");
++		return ret;
++	}
++
++	ret = nf_register_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
++	if (ret < 0) {
++		nf_ct_extend_unregister(&rtcache_extend);
++		return ret;
++	}
++
++	ret = register_netdevice_notifier(&nf_rtcache_notifier);
++	if (ret) {
++		nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
++		nf_ct_extend_unregister(&rtcache_extend);
++	}
++
++	return ret;
++}
++
++static int nf_rtcache_ext_remove(struct nf_conn *ct, void *data)
++{
++	struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
++
++	return rtc != NULL;
++}
++
++static bool __exit nf_conntrack_rtcache_wait_for_dying(struct net *net)
++{
++	bool wait = false;
++	int cpu;
++
++	for_each_possible_cpu(cpu) {
++		struct nf_conntrack_tuple_hash *h;
++		struct hlist_nulls_node *n;
++		struct nf_conn *ct;
++		struct ct_pcpu *pcpu = per_cpu_ptr(net->ct.pcpu_lists, cpu);
++
++		rcu_read_lock();
++		spin_lock_bh(&pcpu->lock);
++
++		hlist_nulls_for_each_entry(h, n, &pcpu->dying, hnnode) {
++			ct = nf_ct_tuplehash_to_ctrack(h);
++			if (nf_ct_rtcache_find(ct) != NULL) {
++				wait = true;
++				break;
++			}
++		}
++		spin_unlock_bh(&pcpu->lock);
++		rcu_read_unlock();
++	}
++
++	return wait;
++}
++
++static void __exit nf_conntrack_rtcache_fini(void)
++{
++	struct net *net;
++	int count = 0;
++
++	/* remove hooks so no new connections get rtcache extension */
++	nf_unregister_hooks(rtcache_ops, ARRAY_SIZE(rtcache_ops));
++
++	synchronize_net();
++
++	unregister_netdevice_notifier(&nf_rtcache_notifier);
++
++	rtnl_lock();
++
++	/* zap all conntracks with rtcache extension */
++	for_each_net(net)
++		nf_ct_iterate_cleanup(net, nf_rtcache_ext_remove, NULL, 0, 0);
++
++	for_each_net(net) {
++		/* .. and make sure they're gone from dying list, too */
++		while (nf_conntrack_rtcache_wait_for_dying(net)) {
++			msleep(200);
++			WARN_ONCE(++count > 25, "Waiting for all rtcache conntracks to go away\n");
++		}
++	}
++
++	rtnl_unlock();
++	synchronize_net();
++	nf_ct_extend_unregister(&rtcache_extend);
++}
++module_init(nf_conntrack_rtcache_init);
++module_exit(nf_conntrack_rtcache_fini);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Florian Westphal <fw@strlen.de>");
++MODULE_DESCRIPTION("Conntrack route cache extension");
diff --git a/trunk/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch b/trunk/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch
new file mode 100644
index 00000000..f498d4ea
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch
@@ -0,0 +1,82 @@
+From 1e311820ec3055e3f08e687de6564692a7cec675 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 28 Jan 2013 20:06:29 +0100
+Subject: [PATCH 11/12] USB: EHCI: add ignore_oc flag to disable overcurrent
+ checking
+
+This patch adds an ignore_oc flag which can be set by EHCI controller
+not supporting or wanting to disable overcurrent checking. The EHCI
+platform data in include/linux/usb/ehci_pdriver.h is also augmented to
+take advantage of this new flag.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ drivers/usb/host/ehci-hcd.c      |    2 +-
+ drivers/usb/host/ehci-hub.c      |    4 ++--
+ drivers/usb/host/ehci-platform.c |    1 +
+ drivers/usb/host/ehci.h          |    1 +
+ include/linux/usb/ehci_pdriver.h |    1 +
+ 5 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -633,7 +633,7 @@ static int ehci_run (struct usb_hcd *hcd
+ 		"USB %x.%x started, EHCI %x.%02x%s\n",
+ 		((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
+ 		temp >> 8, temp & 0xff,
+-		ignore_oc ? ", overcurrent ignored" : "");
++		(ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
+ 
+ 	ehci_writel(ehci, INTR_MASK,
+ 		    &ehci->regs->intr_enable); /* Turn On Interrupts */
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -632,7 +632,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+ 	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
+ 	 * PORT_POWER; that's surprising, but maybe within-spec.
+ 	 */
+-	if (!ignore_oc)
++	if (!ignore_oc && !ehci->ignore_oc)
+ 		mask = PORT_CSC | PORT_PEC | PORT_OCC;
+ 	else
+ 		mask = PORT_CSC | PORT_PEC;
+@@ -992,7 +992,7 @@ int ehci_hub_control(
+ 		if (temp & PORT_PEC)
+ 			status |= USB_PORT_STAT_C_ENABLE << 16;
+ 
+-		if ((temp & PORT_OCC) && !ignore_oc){
++		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
+ 			status |= USB_PORT_STAT_C_OVERCURRENT << 16;
+ 
+ 			/*
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -226,6 +226,8 @@ static int ehci_platform_probe(struct pl
+ 		ehci->big_endian_desc = 1;
+ 	if (pdata->big_endian_mmio)
+ 		ehci->big_endian_mmio = 1;
++	if (pdata->ignore_oc)
++		ehci->ignore_oc = 1;
+ 
+ #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
+ 	if (ehci->big_endian_mmio) {
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -226,6 +226,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
+ 	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */
+ 	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */
++	unsigned		ignore_oc:1;
+ 
+ 	/* required for usb32 quirk */
+ 	#define OHCI_CTRL_HCFS          (3 << 6)
+--- a/include/linux/usb/ehci_pdriver.h
++++ b/include/linux/usb/ehci_pdriver.h
+@@ -45,6 +45,7 @@ struct usb_ehci_pdata {
+ 	unsigned	big_endian_desc:1;
+ 	unsigned	big_endian_mmio:1;
+ 	unsigned	no_io_watchdog:1;
++	unsigned	ignore_oc:1;
+ 
+ 	/* Turn on all power and clocks */
+ 	int (*power_on)(struct platform_device *pdev);
diff --git a/trunk/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch b/trunk/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch
new file mode 100644
index 00000000..d80ef18d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch
@@ -0,0 +1,54 @@
+From: Stephen Hemminger <stephen@networkplumber.org>
+Subject: bridge: allow receiption on disabled port
+
+When an ethernet device is enslaved to a bridge, and the bridge STP
+detects loss of carrier (or operational state down), then normally
+packet receiption is blocked.
+
+This breaks control applications like WPA which maybe expecting to
+receive packets to negotiate to bring link up. The bridge needs to
+block forwarding packets from these disabled ports, but there is no
+hard requirement to not allow local packet delivery.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -146,11 +146,13 @@ EXPORT_SYMBOL_GPL(br_handle_frame_finish
+ static int br_handle_local_finish(struct sk_buff *skb)
+ {
+ 	struct net_bridge_port *p = br_port_get_rcu(skb->dev);
+-	u16 vid = 0;
++	if (p->state != BR_STATE_DISABLED) {
++		u16 vid = 0;
+ 
+-	/* check if vlan is allowed, to avoid spoofing */
+-	if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid))
+-		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);
++		/* check if vlan is allowed, to avoid spoofing */
++		if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid))
++			br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);
++	}
+ 	return 0;	 /* process further */
+ }
+ 
+@@ -224,6 +226,18 @@ rx_handler_result_t br_handle_frame(stru
+ 
+ forward:
+ 	switch (p->state) {
++	case BR_STATE_DISABLED:
++		if (ether_addr_equal(p->br->dev->dev_addr, dest))
++			skb->pkt_type = PACKET_HOST;
++
++		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++			br_handle_local_finish))
++			break;
++
++		BR_INPUT_SKB_CB(skb)->brdev = p->br->dev;
++		br_pass_frame_up(skb);
++		break;
++
+ 	case BR_STATE_FORWARDING:
+ 		rhook = rcu_dereference(br_should_route_hook);
+ 		if (rhook) {
diff --git a/trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch b/trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
new file mode 100644
index 00000000..8795bde0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
@@ -0,0 +1,688 @@
+From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 12 Aug 2013 12:50:22 +0200
+Subject: [PATCH] MIPS: partially inline dma ops
+
+Several DMA ops are no-op on many platforms, and the indirection through
+the mips_dma_map_ops function table is causing the compiler to emit
+unnecessary code.
+
+Inlining visibly improves network performance in my tests (on a 24Kc
+based system), and also slightly reduces code size of a few drivers.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/Kconfig                   |   4 +
+ arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
+ arch/mips/mm/dma-default.c          | 163 ++--------------
+ 3 files changed, 373 insertions(+), 154 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -1450,6 +1450,7 @@ config CPU_CAVIUM_OCTEON
+ 	select CPU_SUPPORTS_HUGEPAGES
+ 	select USB_EHCI_BIG_ENDIAN_MMIO
+ 	select MIPS_L1_CACHE_SHIFT_7
++	select SYS_HAS_DMA_OPS
+ 	help
+ 	  The Cavium Octeon processor is a highly integrated chip containing
+ 	  many ethernet hardware widgets for networking tasks. The processor
+@@ -1705,6 +1706,9 @@ config MIPS_MALTA_PM
+ 	bool
+ 	default y
+ 
++config SYS_HAS_DMA_OPS
++	bool
++
+ #
+ # CPU may reorder R->R, R->W, W->R, W->W
+ # Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
+--- a/arch/mips/include/asm/dma-mapping.h
++++ b/arch/mips/include/asm/dma-mapping.h
+@@ -1,9 +1,16 @@
+ #ifndef _ASM_DMA_MAPPING_H
+ #define _ASM_DMA_MAPPING_H
+ 
++#include <linux/kmemcheck.h>
++#include <linux/bug.h>
++#include <linux/scatterlist.h>
++#include <linux/dma-debug.h>
++#include <linux/dma-attrs.h>
++
+ #include <asm/scatterlist.h>
+ #include <asm/dma-coherence.h>
+ #include <asm/cache.h>
++#include <asm/cpu-type.h>
+ #include <asm-generic/dma-coherent.h>
+ 
+ #ifndef CONFIG_SGI_IP27 /* Kludge to fix 2.6.39 build for IP27 */
+@@ -12,12 +19,48 @@
+ 
+ extern struct dma_map_ops *mips_dma_map_ops;
+ 
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction);
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs);
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs);
++
+ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
++#ifdef CONFIG_SYS_HAS_DMA_OPS
+ 	if (dev && dev->archdata.dma_ops)
+ 		return dev->archdata.dma_ops;
+ 	else
+ 		return mips_dma_map_ops;
++#else
++	return NULL;
++#endif
++}
++
++/*
++ * Warning on the terminology - Linux calls an uncached area coherent;
++ * MIPS terminology calls memory areas with hardware maintained coherency
++ * coherent.
++ */
++
++static inline int cpu_needs_post_dma_flush(struct device *dev)
++{
++#ifndef CONFIG_SYS_HAS_CPU_R10000
++	return 0;
++#endif
++	return !plat_device_is_coherent(dev) &&
++	       (boot_cpu_type() == CPU_R10000 ||
++		boot_cpu_type() == CPU_R12000 ||
++		boot_cpu_type() == CPU_BMIPS5000);
++}
++
++static inline struct page *dma_addr_to_page(struct device *dev,
++	dma_addr_t dma_addr)
++{
++	return pfn_to_page(
++		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+ }
+ 
+ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
+@@ -30,12 +73,304 @@ static inline bool dma_capable(struct de
+ 
+ static inline void dma_mark_clean(void *addr, size_t size) {}
+ 
+-#include <asm-generic/dma-mapping-common.h>
++static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
++					      size_t size,
++					      enum dma_data_direction dir,
++					      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	unsigned long offset = (unsigned long)ptr & ~PAGE_MASK;
++	struct page *page = virt_to_page(ptr);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(ptr, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, attrs);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, true);
++	return addr;
++}
++
++static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
++					  size_t size,
++					  enum dma_data_direction dir,
++					  struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, attrs);
++	} else {
++		if (cpu_needs_post_dma_flush(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, true);
++}
++
++static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
++				   int nents, enum dma_data_direction dir,
++				   struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	int i, ents;
++	struct scatterlist *s;
++
++	for_each_sg(sg, s, nents, i)
++		kmemcheck_mark_initialized(sg_virt(s), s->length);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ents = ops->map_sg(dev, sg, nents, dir, attrs);
++	} else {
++		for_each_sg(sg, s, nents, i) {
++			struct page *page = sg_page(s);
++
++			if (!plat_device_is_coherent(dev))
++				__dma_sync(page, s->offset, s->length, dir);
++#ifdef CONFIG_NEED_SG_DMA_LENGTH
++			s->dma_length = s->length;
++#endif
++			s->dma_address =
++				plat_map_dma_mem_page(dev, page) + s->offset;
++		}
++		ents = nents;
++	}
++	debug_dma_map_sg(dev, sg, nents, ents, dir);
++
++	return ents;
++}
++
++static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,
++				      int nents, enum dma_data_direction dir,
++				      struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	debug_dma_unmap_sg(dev, sg, nents, dir);
++	if (ops) {
++		ops->unmap_sg(dev, sg, nents, dir, attrs);
++		return;
++	}
++
++	for_each_sg(sg, s, nents, i) {
++		if (!plat_device_is_coherent(dev) && dir != DMA_TO_DEVICE)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++		plat_unmap_dma_mem(dev, s->dma_address, s->length, dir);
++	}
++}
++
++static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
++				      size_t offset, size_t size,
++				      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	dma_addr_t addr;
++
++	kmemcheck_mark_initialized(page_address(page) + offset, size);
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		addr = ops->map_page(dev, page, offset, size, dir, NULL);
++	} else {
++		if (!plat_device_is_coherent(dev))
++			__dma_sync(page, offset, size, dir);
++
++		addr = plat_map_dma_mem_page(dev, page) + offset;
++	}
++	debug_dma_map_page(dev, page, offset, size, dir, addr, false);
++
++	return addr;
++}
++
++static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
++				  size_t size, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops) {
++		ops->unmap_page(dev, addr, size, dir, NULL);
++	} else {
++		if (cpu_needs_post_dma_flush(dev))
++			__dma_sync(dma_addr_to_page(dev, addr),
++				   addr & ~PAGE_MASK, size, dir);
++
++		plat_unmap_dma_mem(dev, addr, size, dir);
++	}
++	debug_dma_unmap_page(dev, addr, size, dir, false);
++}
++
++static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
++					   size_t size,
++					   enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr, size, dir);
++	else if (cpu_needs_post_dma_flush(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_cpu(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_for_device(struct device *dev,
++					      dma_addr_t addr, size_t size,
++					      enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr),
++			   addr & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_for_device(dev, addr, size, dir);
++}
++
++static inline void dma_sync_single_range_for_cpu(struct device *dev,
++						 dma_addr_t addr,
++						 unsigned long offset,
++						 size_t size,
++						 enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_cpu(dev, addr + offset, size, dir);
++	else if (cpu_needs_post_dma_flush(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir);
++}
++
++static inline void dma_sync_single_range_for_device(struct device *dev,
++						    dma_addr_t addr,
++						    unsigned long offset,
++						    size_t size,
++						    enum dma_data_direction dir)
++{
++	const struct dma_map_ops *ops = get_dma_ops(dev);
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_single_for_device(dev, addr + offset, size, dir);
++	else if (!plat_device_is_coherent(dev))
++		__dma_sync(dma_addr_to_page(dev, addr + offset),
++			   (addr + offset) & ~PAGE_MASK, size, dir);
++	debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir);
++}
++
++static inline void
++dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
++		    int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_cpu(dev, sg, nelems, dir);
++	else if (cpu_needs_post_dma_flush(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_cpu(dev, sg, nelems, dir);
++}
++
++static inline void
++dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
++		       int nelems, enum dma_data_direction dir)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	struct scatterlist *s;
++	int i;
++
++	BUG_ON(!valid_dma_direction(dir));
++	if (ops)
++		ops->sync_sg_for_device(dev, sg, nelems, dir);
++	else if (!plat_device_is_coherent(dev)) {
++		for_each_sg(sg, s, nelems, i)
++			__dma_sync(sg_page(s), s->offset, s->length, dir);
++	}
++	debug_dma_sync_sg_for_device(dev, sg, nelems, dir);
++
++}
++
++#define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)
++#define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
++#define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL)
++#define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, NULL)
++
++extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
++			   void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++/**
++ * dma_mmap_attrs - map a coherent DMA allocation into user space
++ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
++ * @vma: vm_area_struct describing requested user mapping
++ * @cpu_addr: kernel CPU-view address returned from dma_alloc_attrs
++ * @handle: device-view address returned from dma_alloc_attrs
++ * @size: size of memory originally requested in dma_alloc_attrs
++ * @attrs: attributes of mapping properties requested in dma_alloc_attrs
++ *
++ * Map a coherent DMA buffer previously allocated by dma_alloc_attrs
++ * into user space.  The coherent DMA buffer must not be freed by the
++ * driver until the user space mapping has been released.
++ */
++static inline int
++dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, void *cpu_addr,
++	       dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->mmap)
++		return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
++	return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size);
++}
++
++#define dma_mmap_coherent(d, v, c, h, s) dma_mmap_attrs(d, v, c, h, s, NULL)
++
++int
++dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
++		       void *cpu_addr, dma_addr_t dma_addr, size_t size);
++
++static inline int
++dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
++		      dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs)
++{
++	struct dma_map_ops *ops = get_dma_ops(dev);
++	BUG_ON(!ops);
++	if (ops && ops->get_sgtable)
++		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
++					attrs);
++	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
++}
++
++#define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, NULL)
++
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+-	return ops->dma_supported(dev, mask);
++	if (ops)
++		return ops->dma_supported(dev, mask);
++	return plat_dma_supported(dev, mask);
+ }
+ 
+ static inline int dma_mapping_error(struct device *dev, u64 mask)
+@@ -43,7 +378,9 @@ static inline int dma_mapping_error(stru
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+ 	debug_dma_mapping_error(dev, mask);
+-	return ops->mapping_error(dev, mask);
++	if (ops)
++		return ops->mapping_error(dev, mask);
++	return 0;
+ }
+ 
+ static inline int
+@@ -54,7 +391,7 @@ dma_set_mask(struct device *dev, u64 mas
+ 	if(!dev->dma_mask || !dma_supported(dev, mask))
+ 		return -EIO;
+ 
+-	if (ops->set_dma_mask)
++	if (ops && ops->set_dma_mask)
+ 		return ops->set_dma_mask(dev, mask);
+ 
+ 	*dev->dma_mask = mask;
+@@ -74,7 +411,11 @@ static inline void *dma_alloc_attrs(stru
+ 	void *ret;
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	if (ops)
++		ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
++	else
++		ret = mips_dma_alloc_coherent(dev, size, dma_handle, gfp,
++					      attrs);
+ 
+ 	debug_dma_alloc_coherent(dev, size, *dma_handle, ret);
+ 
+@@ -89,7 +430,10 @@ static inline void dma_free_attrs(struct
+ {
+ 	struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+-	ops->free(dev, size, vaddr, dma_handle, attrs);
++	if (ops)
++		ops->free(dev, size, vaddr, dma_handle, attrs);
++	else
++		mips_dma_free_coherent(dev, size, vaddr, dma_handle, attrs);
+ 
+ 	debug_dma_free_coherent(dev, size, vaddr, dma_handle);
+ }
+--- a/arch/mips/mm/dma-default.c
++++ b/arch/mips/mm/dma-default.c
+@@ -26,7 +26,7 @@
+ 
+ #ifdef CONFIG_DMA_MAYBE_COHERENT
+ int coherentio = 0;	/* User defined DMA coherency from command line. */
+-EXPORT_SYMBOL_GPL(coherentio);
++EXPORT_SYMBOL(coherentio);
+ int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */
+ 
+ static int __init setcoherentio(char *str)
+@@ -46,30 +46,6 @@ static int __init setnocoherentio(char *
+ early_param("nocoherentio", setnocoherentio);
+ #endif
+ 
+-static inline struct page *dma_addr_to_page(struct device *dev,
+-	dma_addr_t dma_addr)
+-{
+-	return pfn_to_page(
+-		plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
+-}
+-
+-/*
+- * The affected CPUs below in 'cpu_needs_post_dma_flush()' can
+- * speculatively fill random cachelines with stale data at any time,
+- * requiring an extra flush post-DMA.
+- *
+- * Warning on the terminology - Linux calls an uncached area coherent;
+- * MIPS terminology calls memory areas with hardware maintained coherency
+- * coherent.
+- */
+-static inline int cpu_needs_post_dma_flush(struct device *dev)
+-{
+-	return !plat_device_is_coherent(dev) &&
+-	       (boot_cpu_type() == CPU_R10000 ||
+-		boot_cpu_type() == CPU_R12000 ||
+-		boot_cpu_type() == CPU_BMIPS5000);
+-}
+-
+ static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
+ {
+ 	gfp_t dma_flag;
+@@ -125,8 +101,9 @@ void *dma_alloc_noncoherent(struct devic
+ }
+ EXPORT_SYMBOL(dma_alloc_noncoherent);
+ 
+-static void *mips_dma_alloc_coherent(struct device *dev, size_t size,
+-	dma_addr_t * dma_handle, gfp_t gfp, struct dma_attrs *attrs)
++void *mips_dma_alloc_coherent(struct device *dev, size_t size,
++			      dma_addr_t *dma_handle, gfp_t gfp,
++			      struct dma_attrs *attrs)
+ {
+ 	void *ret;
+ 	struct page *page = NULL;
+@@ -157,6 +134,7 @@ static void *mips_dma_alloc_coherent(str
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(mips_dma_alloc_coherent);
+ 
+ 
+ void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
+@@ -167,8 +145,8 @@ void dma_free_noncoherent(struct device
+ }
+ EXPORT_SYMBOL(dma_free_noncoherent);
+ 
+-static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
+-	dma_addr_t dma_handle, struct dma_attrs *attrs)
++void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,
++			    dma_addr_t dma_handle, struct dma_attrs *attrs)
+ {
+ 	unsigned long addr = (unsigned long) vaddr;
+ 	int order = get_order(size);
+@@ -188,6 +166,7 @@ static void mips_dma_free_coherent(struc
+ 	if (!dma_release_from_contiguous(dev, page, count))
+ 		__free_pages(page, get_order(size));
+ }
++EXPORT_SYMBOL(mips_dma_free_coherent);
+ 
+ static inline void __dma_sync_virtual(void *addr, size_t size,
+ 	enum dma_data_direction direction)
+@@ -216,8 +195,8 @@ static inline void __dma_sync_virtual(vo
+  * If highmem is not configured then the bulk of this loop gets
+  * optimized out.
+  */
+-static inline void __dma_sync(struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction)
++void __dma_sync(struct page *page, unsigned long offset, size_t size,
++		enum dma_data_direction direction)
+ {
+ 	size_t left = size;
+ 
+@@ -246,108 +225,7 @@ static inline void __dma_sync(struct pag
+ 		left -= len;
+ 	} while (left);
+ }
+-
+-static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
+-	size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_addr),
+-			   dma_addr & ~PAGE_MASK, size, direction);
+-
+-	plat_unmap_dma_mem(dev, dma_addr, size, direction);
+-}
+-
+-static int mips_dma_map_sg(struct device *dev, struct scatterlist *sg,
+-	int nents, enum dma_data_direction direction, struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nents; i++, sg++) {
+-		if (!plat_device_is_coherent(dev))
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-#ifdef CONFIG_NEED_SG_DMA_LENGTH
+-		sg->dma_length = sg->length;
+-#endif
+-		sg->dma_address = plat_map_dma_mem_page(dev, sg_page(sg)) +
+-				  sg->offset;
+-	}
+-
+-	return nents;
+-}
+-
+-static dma_addr_t mips_dma_map_page(struct device *dev, struct page *page,
+-	unsigned long offset, size_t size, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(page, offset, size, direction);
+-
+-	return plat_map_dma_mem_page(dev, page) + offset;
+-}
+-
+-static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
+-	int nhwentries, enum dma_data_direction direction,
+-	struct dma_attrs *attrs)
+-{
+-	int i;
+-
+-	for (i = 0; i < nhwentries; i++, sg++) {
+-		if (!plat_device_is_coherent(dev) &&
+-		    direction != DMA_TO_DEVICE)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-		plat_unmap_dma_mem(dev, sg->dma_address, sg->length, direction);
+-	}
+-}
+-
+-static void mips_dma_sync_single_for_cpu(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (cpu_needs_post_dma_flush(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_single_for_device(struct device *dev,
+-	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
+-{
+-	if (!plat_device_is_coherent(dev))
+-		__dma_sync(dma_addr_to_page(dev, dma_handle),
+-			   dma_handle & ~PAGE_MASK, size, direction);
+-}
+-
+-static void mips_dma_sync_sg_for_cpu(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	if (cpu_needs_post_dma_flush(dev))
+-		for (i = 0; i < nelems; i++, sg++)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-}
+-
+-static void mips_dma_sync_sg_for_device(struct device *dev,
+-	struct scatterlist *sg, int nelems, enum dma_data_direction direction)
+-{
+-	int i;
+-
+-	if (!plat_device_is_coherent(dev))
+-		for (i = 0; i < nelems; i++, sg++)
+-			__dma_sync(sg_page(sg), sg->offset, sg->length,
+-				   direction);
+-}
+-
+-int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+-{
+-	return 0;
+-}
+-
+-int mips_dma_supported(struct device *dev, u64 mask)
+-{
+-	return plat_dma_supported(dev, mask);
+-}
++EXPORT_SYMBOL(__dma_sync);
+ 
+ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+ 			 enum dma_data_direction direction)
+@@ -360,23 +238,10 @@ void dma_cache_sync(struct device *dev,
+ 
+ EXPORT_SYMBOL(dma_cache_sync);
+ 
+-static struct dma_map_ops mips_default_dma_map_ops = {
+-	.alloc = mips_dma_alloc_coherent,
+-	.free = mips_dma_free_coherent,
+-	.map_page = mips_dma_map_page,
+-	.unmap_page = mips_dma_unmap_page,
+-	.map_sg = mips_dma_map_sg,
+-	.unmap_sg = mips_dma_unmap_sg,
+-	.sync_single_for_cpu = mips_dma_sync_single_for_cpu,
+-	.sync_single_for_device = mips_dma_sync_single_for_device,
+-	.sync_sg_for_cpu = mips_dma_sync_sg_for_cpu,
+-	.sync_sg_for_device = mips_dma_sync_sg_for_device,
+-	.mapping_error = mips_dma_mapping_error,
+-	.dma_supported = mips_dma_supported
+-};
+-
+-struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
++#ifdef CONFIG_SYS_HAS_DMA_OPS
++struct dma_map_ops *mips_dma_map_ops = NULL;
+ EXPORT_SYMBOL(mips_dma_map_ops);
++#endif
+ 
+ #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/200-fix_localversion.patch b/trunk/target/linux/generic/patches-3.18/200-fix_localversion.patch
new file mode 100644
index 00000000..70228bb5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- a/scripts/setlocalversion
++++ b/scripts/setlocalversion
+@@ -165,7 +165,7 @@ else
+ 	# annotated or signed tagged state (as git describe only
+ 	# looks at signed or annotated tags - git tag -a/-s) and
+ 	# LOCALVERSION= is not specified
+-	if test "${LOCALVERSION+set}" != "set"; then
++	if test "${CONFIG_LOCALVERSION+set}" != "set"; then
+ 		scm=$(scm_version --short)
+ 		res="$res${scm:++}"
+ 	fi
diff --git a/trunk/target/linux/generic/patches-3.18/201-extra_optimization.patch b/trunk/target/linux/generic/patches-3.18/201-extra_optimization.patch
new file mode 100644
index 00000000..7ec93a47
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/201-extra_optimization.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -612,9 +612,9 @@ include $(srctree)/arch/$(SRCARCH)/Makef
+ KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)
+ 
+ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+-KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)
++KBUILD_CFLAGS	+= -Os $(EXTRA_OPTIMIZATION) $(call cc-disable-warning,maybe-uninitialized,)
+ else
+-KBUILD_CFLAGS	+= -O2
++KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
+ endif
+ 
+ # Tell gcc to never replace conditional load with a non-conditional one
diff --git a/trunk/target/linux/generic/patches-3.18/202-reduce_module_size.patch b/trunk/target/linux/generic/patches-3.18/202-reduce_module_size.patch
new file mode 100644
index 00000000..b98ea4e9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/202-reduce_module_size.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -409,7 +409,7 @@ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+ KBUILD_AFLAGS_MODULE  := -DMODULE
+ KBUILD_CFLAGS_MODULE  := -DMODULE
+-KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
++KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s)
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/trunk/target/linux/generic/patches-3.18/203-kallsyms_uncompressed.patch b/trunk/target/linux/generic/patches-3.18/203-kallsyms_uncompressed.patch
new file mode 100644
index 00000000..b9d82207
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/203-kallsyms_uncompressed.patch
@@ -0,0 +1,108 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -58,6 +58,7 @@ static struct addr_range percpu_range =
+ static struct sym_entry *table;
+ static unsigned int table_size, table_cnt;
+ static int all_symbols = 0;
++static int uncompressed = 0;
+ static int absolute_percpu = 0;
+ static char symbol_prefix_char = '\0';
+ static unsigned long long kernel_start_addr = 0;
+@@ -392,6 +393,9 @@ static void write_src(void)
+ 
+ 	free(markers);
+ 
++	if (uncompressed)
++		return;
++
+ 	output_label("kallsyms_token_table");
+ 	off = 0;
+ 	for (i = 0; i < 256; i++) {
+@@ -450,6 +454,9 @@ static void *find_token(unsigned char *s
+ {
+ 	int i;
+ 
++	if (uncompressed)
++		return NULL;
++
+ 	for (i = 0; i < len - 1; i++) {
+ 		if (str[i] == token[0] && str[i+1] == token[1])
+ 			return &str[i];
+@@ -522,6 +529,9 @@ static void optimize_result(void)
+ {
+ 	int i, best;
+ 
++	if (uncompressed)
++		return;
++
+ 	/* using the '\0' symbol last allows compress_symbols to use standard
+ 	 * fast string functions */
+ 	for (i = 255; i >= 0; i--) {
+@@ -692,7 +702,9 @@ int main(int argc, char **argv)
+ 			} else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+ 				const char *p = &argv[i][14];
+ 				kernel_start_addr = strtoull(p, NULL, 16);
+-			} else
++			} else if (strcmp(argv[i], "--uncompressed") == 0)
++				uncompressed = 1;
++			else
+ 				usage();
+ 		}
+ 	} else if (argc != 1)
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1338,6 +1338,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+ 	  the unaligned access emulation.
+ 	  see arch/parisc/kernel/unaligned.c for reference
+ 
++config KALLSYMS_UNCOMPRESSED
++	bool "Keep kallsyms uncompressed"
++	depends on KALLSYMS
++	help
++		Normally kallsyms contains compressed symbols (using a token table),
++		reducing the uncompressed kernel image size. Keeping the symbol table
++		uncompressed significantly improves the size of this part in compressed
++		kernel images.
++
++		Say N unless you need compressed kernel images to be small.
++
+ config HAVE_PCSPKR_PLATFORM
+ 	bool
+ 
+--- a/scripts/link-vmlinux.sh
++++ b/scripts/link-vmlinux.sh
+@@ -90,6 +90,10 @@ kallsyms()
+ 		kallsymopt="${kallsymopt} --absolute-percpu"
+ 	fi
+ 
++	if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
++		kallsymopt="${kallsymopt} --uncompressed"
++	fi
++
+ 	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
+ 		      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+ 
+--- a/kernel/kallsyms.c
++++ b/kernel/kallsyms.c
+@@ -109,6 +109,11 @@ static unsigned int kallsyms_expand_symb
+ 	 * For every byte on the compressed symbol data, copy the table
+ 	 * entry for that byte.
+ 	 */
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	memcpy(result, data + 1, len - 1);
++	result += len - 1;
++	len = 0;
++#endif
+ 	while (len) {
+ 		tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
+ 		data++;
+@@ -141,6 +146,9 @@ tail:
+  */
+ static char kallsyms_get_symbol_type(unsigned int off)
+ {
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	return kallsyms_names[off + 1];
++#endif
+ 	/*
+ 	 * Get just the first code, look it up in the token table,
+ 	 * and return the first char from this token.
diff --git a/trunk/target/linux/generic/patches-3.18/204-module_strip.patch b/trunk/target/linux/generic/patches-3.18/204-module_strip.patch
new file mode 100644
index 00000000..ed95eafd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/204-module_strip.patch
@@ -0,0 +1,194 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] build: add a hack for removing non-essential module info
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -84,9 +84,10 @@ void trim_init_extable(struct module *m)
+ 
+ /* Generic info of form tag = "info" */
+ #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
++#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
+ 
+ /* For userspace: you can also call me... */
+-#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
++#define MODULE_ALIAS(_alias) MODULE_INFO_STRIP(alias, _alias)
+ 
+ /* Soft module dependencies. See man modprobe.d for details.
+  * Example: MODULE_SOFTDEP("pre: module-foo module-bar post: module-baz")
+@@ -127,12 +128,12 @@ void trim_init_extable(struct module *m)
+  * Author(s), use "Name <email>" or just "Name", for multiple
+  * authors use multiple MODULE_AUTHOR() statements/lines.
+  */
+-#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
++#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
+ 
+ /* What your module does. */
+-#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
++#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
+ 
+-#ifdef MODULE
++#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
+ /* Creates an alias so file2alias.c can find device table. */
+ #define MODULE_DEVICE_TABLE(type, name)					\
+   extern const struct type##_device_id __mod_##type##__##name##_device_table \
+@@ -159,7 +160,9 @@ void trim_init_extable(struct module *m)
+  */
+ 
+ #if defined(MODULE) || !defined(CONFIG_SYSFS)
+-#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
++#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
++#elif defined(CONFIG_MODULE_STRIPPED)
++#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
+ #else
+ #define MODULE_VERSION(_version)					\
+ 	static struct module_version_attribute ___modver_attr = {	\
+@@ -181,7 +184,7 @@ void trim_init_extable(struct module *m)
+ /* Optional firmware file (or files) needed by the module
+  * format is simply firmware file name.  Multiple firmware
+  * files require multiple MODULE_FIRMWARE() specifiers */
+-#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
++#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
+ 
+ /* Given an address, look for it in the exception tables */
+ const struct exception_table_entry *search_exception_tables(unsigned long add);
+--- a/include/linux/moduleparam.h
++++ b/include/linux/moduleparam.h
+@@ -16,6 +16,16 @@
+ /* Chosen so that structs with an unsigned long line up. */
+ #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
+ 
++/* This struct is here for syntactic coherency, it is not used */
++#define __MODULE_INFO_DISABLED(name)					  \
++  struct __UNIQUE_ID(name) {}
++
++#ifdef CONFIG_MODULE_STRIPPED
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
++#else
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
++#endif
++
+ #ifdef MODULE
+ #define __MODULE_INFO(tag, name, info)					  \
+ static const char __UNIQUE_ID(name)[]					  \
+@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]
+   = __stringify(tag) "=" info
+ #else  /* !MODULE */
+ /* This struct is here for syntactic coherency, it is not used */
+-#define __MODULE_INFO(tag, name, info)					  \
+-  struct __UNIQUE_ID(name) {}
++#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name)
+ #endif
+ #define __MODULE_PARM_TYPE(name, _type)					  \
+   __MODULE_INFO(parmtype, name##type, #name ":" _type)
+@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]
+ /* One for each parameter, describing how to use it.  Some files do
+    multiple of these per line, so can't just use MODULE_INFO. */
+ #define MODULE_PARM_DESC(_parm, desc) \
+-	__MODULE_INFO(parm, _parm, #_parm ":" desc)
++	__MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
+ 
+ struct kernel_param;
+ 
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1987,6 +1987,13 @@ config MODULE_COMPRESS_XZ
+ 
+ endchoice
+ 
++config MODULE_STRIPPED
++	bool "Reduce module size"
++	depends on MODULES
++	help
++	  Remove module parameter descriptions, author info, version, aliases,
++	  device tables, etc.
++
+ endif # MODULES
+ 
+ config INIT_ALL_POSSIBLE
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2665,6 +2665,7 @@ static struct module *setup_load_info(st
+ 
+ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	const char *modmagic = get_modinfo(info, "vermagic");
+ 	int err;
+ 
+@@ -2690,6 +2691,7 @@ static int check_modinfo(struct module *
+ 		pr_warn("%s: module is from the staging directory, the quality "
+ 			"is unknown, you have been warned.\n", mod->name);
+ 	}
++#endif
+ 
+ 	/* Set up license info based on the info section */
+ 	set_license(mod, get_modinfo(info, "license"));
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -1726,7 +1726,9 @@ static void read_symbols(char *modname)
+ 		symname = remove_dot(info.strtab + sym->st_name);
+ 
+ 		handle_modversions(mod, &info, sym, symname);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		handle_moddevtable(mod, &info, sym, symname);
++#endif
+ 	}
+ 	if (!is_vmlinux(modname) ||
+ 	     (is_vmlinux(modname) && vmlinux_section_warnings))
+@@ -1870,7 +1872,9 @@ static void add_header(struct buffer *b,
+ 	buf_printf(b, "#include <linux/vermagic.h>\n");
+ 	buf_printf(b, "#include <linux/compiler.h>\n");
+ 	buf_printf(b, "\n");
++#ifndef CONFIG_MODULE_STRIPPED
+ 	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
++#endif
+ 	buf_printf(b, "\n");
+ 	buf_printf(b, "__visible struct module __this_module\n");
+ 	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
+@@ -1887,16 +1891,20 @@ static void add_header(struct buffer *b,
+ 
+ static void add_intree_flag(struct buffer *b, int is_intree)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (is_intree)
+ 		buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
++#endif
+ }
+ 
+ static void add_staging_flag(struct buffer *b, const char *name)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	static const char *staging_dir = "drivers/staging";
+ 
+ 	if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
+ 		buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
++#endif
+ }
+ 
+ /**
+@@ -1989,11 +1997,13 @@ static void add_depends(struct buffer *b
+ 
+ static void add_srcversion(struct buffer *b, struct module *mod)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (mod->srcversion[0]) {
+ 		buf_printf(b, "\n");
+ 		buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
+ 			   mod->srcversion);
+ 	}
++#endif
+ }
+ 
+ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -2224,7 +2234,9 @@ int main(int argc, char **argv)
+ 		add_staging_flag(&buf, mod->name);
+ 		err |= add_versions(&buf, mod);
+ 		add_depends(&buf, mod, modules);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		add_moddevtable(&buf, mod);
++#endif
+ 		add_srcversion(&buf, mod);
+ 
+ 		sprintf(fname, "%s.mod.c", mod->name);
diff --git a/trunk/target/linux/generic/patches-3.18/210-darwin_scripts_include.patch b/trunk/target/linux/generic/patches-3.18/210-darwin_scripts_include.patch
new file mode 100644
index 00000000..dc554de2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/210-darwin_scripts_include.patch
@@ -0,0 +1,3088 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -22,6 +22,35 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef __APPLE__
++/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
++void *memmem (const void *haystack, size_t haystack_len,
++                          const void *needle,  size_t needle_len)
++{
++  const char *begin;
++  const char *const last_possible
++    = (const char *) haystack + haystack_len - needle_len;
++
++  if (needle_len == 0)
++    /* The first occurrence of the empty string is deemed to occur at
++       the beginning of the string.  */
++    return (void *) haystack;
++
++  /* Sanity check, otherwise the loop might search through the whole
++     memory.  */
++  if (__builtin_expect (haystack_len < needle_len, 0))
++    return NULL;
++
++  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
++    if (begin[0] == ((const char *) needle)[0] &&
++        !memcmp ((const void *) &begin[1],
++                 (const void *) ((const char *) needle + 1),
++                 needle_len - 1))
++      return (void *) begin;
++
++  return NULL;
++}
++#endif
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -151,6 +151,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
+ # we really need to do so. (Do not call gcc as part of make mrproper)
+ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
+                     -DLOCALE
++ifeq ($(shell uname -s),Darwin)
++HOST_LOADLIBES  += -lncurses
++endif
+ 
+ # ===========================================================================
+ # Shared Makefile for the various kconfig executables:
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c
+@@ -1,7 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __APPLE__
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ int
+ main(int argc, char **argv)
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -7,7 +7,11 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ #include "elfconfig.h"
+ 
+--- /dev/null
++++ b/scripts/mod/elf.h
+@@ -0,0 +1,3007 @@
++/* This file defines standard ELF types, structures, and macros.
++   Copyright (C) 1995-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _ELF_H
++#define	_ELF_H 1
++
++/* Standard ELF types.  */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity.  */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities.  */
++typedef uint32_t Elf32_Word;
++typedef	int32_t  Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef	int32_t  Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities.  */
++typedef uint64_t Elf32_Xword;
++typedef	int64_t  Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef	int64_t  Elf64_Sxword;
++
++/* Type of addresses.  */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets.  */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities.  */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information.  */
++typedef Elf32_Half Elf32_Versym;
++typedef Elf64_Half Elf64_Versym;
++
++
++/* The ELF file header.  This appears at the start of every ELF file.  */
++
++#define EI_NIDENT (16)
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf32_Half	e_type;			/* Object file type */
++  Elf32_Half	e_machine;		/* Architecture */
++  Elf32_Word	e_version;		/* Object file version */
++  Elf32_Addr	e_entry;		/* Entry point virtual address */
++  Elf32_Off	e_phoff;		/* Program header table file offset */
++  Elf32_Off	e_shoff;		/* Section header table file offset */
++  Elf32_Word	e_flags;		/* Processor-specific flags */
++  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf32_Half	e_phentsize;		/* Program header table entry size */
++  Elf32_Half	e_phnum;		/* Program header table entry count */
++  Elf32_Half	e_shentsize;		/* Section header table entry size */
++  Elf32_Half	e_shnum;		/* Section header table entry count */
++  Elf32_Half	e_shstrndx;		/* Section header string table index */
++} Elf32_Ehdr;
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf64_Half	e_type;			/* Object file type */
++  Elf64_Half	e_machine;		/* Architecture */
++  Elf64_Word	e_version;		/* Object file version */
++  Elf64_Addr	e_entry;		/* Entry point virtual address */
++  Elf64_Off	e_phoff;		/* Program header table file offset */
++  Elf64_Off	e_shoff;		/* Section header table file offset */
++  Elf64_Word	e_flags;		/* Processor-specific flags */
++  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf64_Half	e_phentsize;		/* Program header table entry size */
++  Elf64_Half	e_phnum;		/* Program header table entry count */
++  Elf64_Half	e_shentsize;		/* Section header table entry size */
++  Elf64_Half	e_shnum;		/* Section header table entry count */
++  Elf64_Half	e_shstrndx;		/* Section header string table index */
++} Elf64_Ehdr;
++
++/* Fields in the e_ident array.  The EI_* macros are indices into the
++   array.  The macros under each EI_* macro are the values the byte
++   may have.  */
++
++#define EI_MAG0		0		/* File identification byte 0 index */
++#define ELFMAG0		0x7f		/* Magic number byte 0 */
++
++#define EI_MAG1		1		/* File identification byte 1 index */
++#define ELFMAG1		'E'		/* Magic number byte 1 */
++
++#define EI_MAG2		2		/* File identification byte 2 index */
++#define ELFMAG2		'L'		/* Magic number byte 2 */
++
++#define EI_MAG3		3		/* File identification byte 3 index */
++#define ELFMAG3		'F'		/* Magic number byte 3 */
++
++/* Conglomeration of the identification bytes, for easy testing as a word.  */
++#define	ELFMAG		"\177ELF"
++#define	SELFMAG		4
++
++#define EI_CLASS	4		/* File class byte index */
++#define ELFCLASSNONE	0		/* Invalid class */
++#define ELFCLASS32	1		/* 32-bit objects */
++#define ELFCLASS64	2		/* 64-bit objects */
++#define ELFCLASSNUM	3
++
++#define EI_DATA		5		/* Data encoding byte index */
++#define ELFDATANONE	0		/* Invalid data encoding */
++#define ELFDATA2LSB	1		/* 2's complement, little endian */
++#define ELFDATA2MSB	2		/* 2's complement, big endian */
++#define ELFDATANUM	3
++
++#define EI_VERSION	6		/* File version byte index */
++					/* Value must be EV_CURRENT */
++
++#define EI_OSABI	7		/* OS ABI identification */
++#define ELFOSABI_NONE		0	/* UNIX System V ABI */
++#define ELFOSABI_SYSV		0	/* Alias.  */
++#define ELFOSABI_HPUX		1	/* HP-UX */
++#define ELFOSABI_NETBSD		2	/* NetBSD.  */
++#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
++#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
++#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
++#define ELFOSABI_AIX		7	/* IBM AIX.  */
++#define ELFOSABI_IRIX		8	/* SGI Irix.  */
++#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
++#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
++#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
++#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
++#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
++#define ELFOSABI_ARM		97	/* ARM */
++#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
++
++#define EI_ABIVERSION	8		/* ABI version */
++
++#define EI_PAD		9		/* Byte index of padding bytes */
++
++/* Legal values for e_type (object file type).  */
++
++#define ET_NONE		0		/* No file type */
++#define ET_REL		1		/* Relocatable file */
++#define ET_EXEC		2		/* Executable file */
++#define ET_DYN		3		/* Shared object file */
++#define ET_CORE		4		/* Core file */
++#define	ET_NUM		5		/* Number of defined types */
++#define ET_LOOS		0xfe00		/* OS-specific range start */
++#define ET_HIOS		0xfeff		/* OS-specific range end */
++#define ET_LOPROC	0xff00		/* Processor-specific range start */
++#define ET_HIPROC	0xffff		/* Processor-specific range end */
++
++/* Legal values for e_machine (architecture).  */
++
++#define EM_NONE		 0		/* No machine */
++#define EM_M32		 1		/* AT&T WE 32100 */
++#define EM_SPARC	 2		/* SUN SPARC */
++#define EM_386		 3		/* Intel 80386 */
++#define EM_68K		 4		/* Motorola m68k family */
++#define EM_88K		 5		/* Motorola m88k family */
++#define EM_860		 7		/* Intel 80860 */
++#define EM_MIPS		 8		/* MIPS R3000 big-endian */
++#define EM_S370		 9		/* IBM System/370 */
++#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
++
++#define EM_PARISC	15		/* HPPA */
++#define EM_VPP500	17		/* Fujitsu VPP500 */
++#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
++#define EM_960		19		/* Intel 80960 */
++#define EM_PPC		20		/* PowerPC */
++#define EM_PPC64	21		/* PowerPC 64-bit */
++#define EM_S390		22		/* IBM S390 */
++
++#define EM_V800		36		/* NEC V800 series */
++#define EM_FR20		37		/* Fujitsu FR20 */
++#define EM_RH32		38		/* TRW RH-32 */
++#define EM_RCE		39		/* Motorola RCE */
++#define EM_ARM		40		/* ARM */
++#define EM_FAKE_ALPHA	41		/* Digital Alpha */
++#define EM_SH		42		/* Hitachi SH */
++#define EM_SPARCV9	43		/* SPARC v9 64-bit */
++#define EM_TRICORE	44		/* Siemens Tricore */
++#define EM_ARC		45		/* Argonaut RISC Core */
++#define EM_H8_300	46		/* Hitachi H8/300 */
++#define EM_H8_300H	47		/* Hitachi H8/300H */
++#define EM_H8S		48		/* Hitachi H8S */
++#define EM_H8_500	49		/* Hitachi H8/500 */
++#define EM_IA_64	50		/* Intel Merced */
++#define EM_MIPS_X	51		/* Stanford MIPS-X */
++#define EM_COLDFIRE	52		/* Motorola Coldfire */
++#define EM_68HC12	53		/* Motorola M68HC12 */
++#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP		55		/* Siemens PCP */
++#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
++#define EM_NDR1		57		/* Denso NDR1 microprocessor */
++#define EM_STARCORE	58		/* Motorola Start*Core processor */
++#define EM_ME16		59		/* Toyota ME16 processor */
++#define EM_ST100	60		/* STMicroelectronic ST100 processor */
++#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64	62		/* AMD x86-64 architecture */
++#define EM_PDSP		63		/* Sony DSP Processor */
++
++#define EM_FX66		66		/* Siemens FX66 microcontroller */
++#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
++#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
++#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
++#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
++#define EM_SVX		73		/* Silicon Graphics SVx */
++#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX		75		/* Digital VAX */
++#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
++#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY	81		/* Harvard University machine-independent object files */
++#define EM_PRISM	82		/* SiTera Prism */
++#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
++#define EM_FR30		84		/* Fujitsu FR30 */
++#define EM_D10V		85		/* Mitsubishi D10V */
++#define EM_D30V		86		/* Mitsubishi D30V */
++#define EM_V850		87		/* NEC v850 */
++#define EM_M32R		88		/* Mitsubishi M32R */
++#define EM_MN10300	89		/* Matsushita MN10300 */
++#define EM_MN10200	90		/* Matsushita MN10200 */
++#define EM_PJ		91		/* picoJava */
++#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
++#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
++#define EM_TILEPRO	188		/* Tilera TILEPro */
++#define EM_TILEGX	191		/* Tilera TILE-Gx */
++#define EM_NUM		192
++
++/* If it is necessary to assign new unofficial EM_* values, please
++   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
++   chances of collision with official or non-GNU unofficial values.  */
++
++#define EM_ALPHA	0x9026
++
++/* Legal values for e_version (version).  */
++
++#define EV_NONE		0		/* Invalid ELF version */
++#define EV_CURRENT	1		/* Current version */
++#define EV_NUM		2
++
++/* Section header.  */
++
++typedef struct
++{
++  Elf32_Word	sh_name;		/* Section name (string tbl index) */
++  Elf32_Word	sh_type;		/* Section type */
++  Elf32_Word	sh_flags;		/* Section flags */
++  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf32_Off	sh_offset;		/* Section file offset */
++  Elf32_Word	sh_size;		/* Section size in bytes */
++  Elf32_Word	sh_link;		/* Link to another section */
++  Elf32_Word	sh_info;		/* Additional section information */
++  Elf32_Word	sh_addralign;		/* Section alignment */
++  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
++} Elf32_Shdr;
++
++typedef struct
++{
++  Elf64_Word	sh_name;		/* Section name (string tbl index) */
++  Elf64_Word	sh_type;		/* Section type */
++  Elf64_Xword	sh_flags;		/* Section flags */
++  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf64_Off	sh_offset;		/* Section file offset */
++  Elf64_Xword	sh_size;		/* Section size in bytes */
++  Elf64_Word	sh_link;		/* Link to another section */
++  Elf64_Word	sh_info;		/* Additional section information */
++  Elf64_Xword	sh_addralign;		/* Section alignment */
++  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
++} Elf64_Shdr;
++
++/* Special section indices.  */
++
++#define SHN_UNDEF	0		/* Undefined section */
++#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
++#define SHN_LOPROC	0xff00		/* Start of processor-specific */
++#define SHN_BEFORE	0xff00		/* Order section before all others
++					   (Solaris).  */
++#define SHN_AFTER	0xff01		/* Order section after all others
++					   (Solaris).  */
++#define SHN_HIPROC	0xff1f		/* End of processor-specific */
++#define SHN_LOOS	0xff20		/* Start of OS-specific */
++#define SHN_HIOS	0xff3f		/* End of OS-specific */
++#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
++#define SHN_COMMON	0xfff2		/* Associated symbol is common */
++#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
++#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
++
++/* Legal values for sh_type (section type).  */
++
++#define SHT_NULL	  0		/* Section header table entry unused */
++#define SHT_PROGBITS	  1		/* Program data */
++#define SHT_SYMTAB	  2		/* Symbol table */
++#define SHT_STRTAB	  3		/* String table */
++#define SHT_RELA	  4		/* Relocation entries with addends */
++#define SHT_HASH	  5		/* Symbol hash table */
++#define SHT_DYNAMIC	  6		/* Dynamic linking information */
++#define SHT_NOTE	  7		/* Notes */
++#define SHT_NOBITS	  8		/* Program space with no data (bss) */
++#define SHT_REL		  9		/* Relocation entries, no addends */
++#define SHT_SHLIB	  10		/* Reserved */
++#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
++#define SHT_INIT_ARRAY	  14		/* Array of constructors */
++#define SHT_FINI_ARRAY	  15		/* Array of destructors */
++#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
++#define SHT_GROUP	  17		/* Section group */
++#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
++#define	SHT_NUM		  19		/* Number of defined types.  */
++#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
++#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
++#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
++#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
++#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
++#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
++#define SHT_SUNW_move	  0x6ffffffa
++#define SHT_SUNW_COMDAT   0x6ffffffb
++#define SHT_SUNW_syminfo  0x6ffffffc
++#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
++#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
++#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
++#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
++#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
++#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
++#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
++#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
++#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
++
++/* Legal values for sh_flags (section flags).  */
++
++#define SHF_WRITE	     (1 << 0)	/* Writable */
++#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
++#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
++#define SHF_MERGE	     (1 << 4)	/* Might be merged */
++#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
++#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
++#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
++#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
++					   required */
++#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
++#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
++#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
++#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
++#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
++					   (Solaris).  */
++#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
++					   referenced or allocated (Solaris).*/
++
++/* Section group handling.  */
++#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
++
++/* Symbol table entry.  */
++
++typedef struct
++{
++  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
++  Elf32_Addr	st_value;		/* Symbol value */
++  Elf32_Word	st_size;		/* Symbol size */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char	st_other;		/* Symbol visibility */
++  Elf32_Section	st_shndx;		/* Section index */
++} Elf32_Sym;
++
++typedef struct
++{
++  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char st_other;		/* Symbol visibility */
++  Elf64_Section	st_shndx;		/* Section index */
++  Elf64_Addr	st_value;		/* Symbol value */
++  Elf64_Xword	st_size;		/* Symbol size */
++} Elf64_Sym;
++
++/* The syminfo section if available contains additional information about
++   every dynamic symbol.  */
++
++typedef struct
++{
++  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf32_Half si_flags;			/* Per symbol flags */
++} Elf32_Syminfo;
++
++typedef struct
++{
++  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf64_Half si_flags;			/* Per symbol flags */
++} Elf64_Syminfo;
++
++/* Possible values for si_boundto.  */
++#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
++#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
++#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
++
++/* Possible bitmasks for si_flags.  */
++#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
++#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
++#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
++#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
++					   loaded */
++/* Syminfo version values.  */
++#define SYMINFO_NONE		0
++#define SYMINFO_CURRENT		1
++#define SYMINFO_NUM		2
++
++
++/* How to extract and insert information held in the st_info field.  */
++
++#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
++#define ELF32_ST_TYPE(val)		((val) & 0xf)
++#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
++
++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
++#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
++#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
++#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
++
++/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
++
++#define STB_LOCAL	0		/* Local symbol */
++#define STB_GLOBAL	1		/* Global symbol */
++#define STB_WEAK	2		/* Weak symbol */
++#define	STB_NUM		3		/* Number of defined types.  */
++#define STB_LOOS	10		/* Start of OS-specific */
++#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
++#define STB_HIOS	12		/* End of OS-specific */
++#define STB_LOPROC	13		/* Start of processor-specific */
++#define STB_HIPROC	15		/* End of processor-specific */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_NOTYPE	0		/* Symbol type is unspecified */
++#define STT_OBJECT	1		/* Symbol is a data object */
++#define STT_FUNC	2		/* Symbol is a code object */
++#define STT_SECTION	3		/* Symbol associated with a section */
++#define STT_FILE	4		/* Symbol's name is file name */
++#define STT_COMMON	5		/* Symbol is a common data object */
++#define STT_TLS		6		/* Symbol is thread-local data object*/
++#define	STT_NUM		7		/* Number of defined types.  */
++#define STT_LOOS	10		/* Start of OS-specific */
++#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
++#define STT_HIOS	12		/* End of OS-specific */
++#define STT_LOPROC	13		/* Start of processor-specific */
++#define STT_HIPROC	15		/* End of processor-specific */
++
++
++/* Symbol table indices are found in the hash buckets and chain table
++   of a symbol hash table section.  This special index value indicates
++   the end of a chain, meaning no further symbols are found in that bucket.  */
++
++#define STN_UNDEF	0		/* End of a chain.  */
++
++
++/* How to extract and insert information held in the st_other field.  */
++
++#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
++
++/* For ELF64 the definitions are the same.  */
++#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
++
++/* Symbol visibility specification encoded in the st_other field.  */
++#define STV_DEFAULT	0		/* Default symbol visibility rules */
++#define STV_INTERNAL	1		/* Processor specific hidden class */
++#define STV_HIDDEN	2		/* Sym unavailable in other modules */
++#define STV_PROTECTED	3		/* Not preemptible, not exported */
++
++
++/* Relocation table entry without addend (in section of type SHT_REL).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++} Elf32_Rel;
++
++/* I have seen two different definitions of the Elf64_Rel and
++   Elf64_Rela structures, so we'll leave them out until Novell (or
++   whoever) gets their act together.  */
++/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++} Elf64_Rel;
++
++/* Relocation table entry with addend (in section of type SHT_RELA).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++  Elf32_Sword	r_addend;		/* Addend */
++} Elf32_Rela;
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++  Elf64_Sxword	r_addend;		/* Addend */
++} Elf64_Rela;
++
++/* How to extract and insert information held in the r_info field.  */
++
++#define ELF32_R_SYM(val)		((val) >> 8)
++#define ELF32_R_TYPE(val)		((val) & 0xff)
++#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
++
++#define ELF64_R_SYM(i)			((i) >> 32)
++#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
++#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
++
++/* Program segment header.  */
++
++typedef struct
++{
++  Elf32_Word	p_type;			/* Segment type */
++  Elf32_Off	p_offset;		/* Segment file offset */
++  Elf32_Addr	p_vaddr;		/* Segment virtual address */
++  Elf32_Addr	p_paddr;		/* Segment physical address */
++  Elf32_Word	p_filesz;		/* Segment size in file */
++  Elf32_Word	p_memsz;		/* Segment size in memory */
++  Elf32_Word	p_flags;		/* Segment flags */
++  Elf32_Word	p_align;		/* Segment alignment */
++} Elf32_Phdr;
++
++typedef struct
++{
++  Elf64_Word	p_type;			/* Segment type */
++  Elf64_Word	p_flags;		/* Segment flags */
++  Elf64_Off	p_offset;		/* Segment file offset */
++  Elf64_Addr	p_vaddr;		/* Segment virtual address */
++  Elf64_Addr	p_paddr;		/* Segment physical address */
++  Elf64_Xword	p_filesz;		/* Segment size in file */
++  Elf64_Xword	p_memsz;		/* Segment size in memory */
++  Elf64_Xword	p_align;		/* Segment alignment */
++} Elf64_Phdr;
++
++/* Special value for e_phnum.  This indicates that the real number of
++   program headers is too large to fit into e_phnum.  Instead the real
++   value is in the field sh_info of section 0.  */
++
++#define PN_XNUM		0xffff
++
++/* Legal values for p_type (segment type).  */
++
++#define	PT_NULL		0		/* Program header table entry unused */
++#define PT_LOAD		1		/* Loadable program segment */
++#define PT_DYNAMIC	2		/* Dynamic linking information */
++#define PT_INTERP	3		/* Program interpreter */
++#define PT_NOTE		4		/* Auxiliary information */
++#define PT_SHLIB	5		/* Reserved */
++#define PT_PHDR		6		/* Entry for header table itself */
++#define PT_TLS		7		/* Thread-local storage segment */
++#define	PT_NUM		8		/* Number of defined types */
++#define PT_LOOS		0x60000000	/* Start of OS-specific */
++#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
++#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
++#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
++#define PT_LOSUNW	0x6ffffffa
++#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
++#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
++#define PT_HISUNW	0x6fffffff
++#define PT_HIOS		0x6fffffff	/* End of OS-specific */
++#define PT_LOPROC	0x70000000	/* Start of processor-specific */
++#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
++
++/* Legal values for p_flags (segment flags).  */
++
++#define PF_X		(1 << 0)	/* Segment is executable */
++#define PF_W		(1 << 1)	/* Segment is writable */
++#define PF_R		(1 << 2)	/* Segment is readable */
++#define PF_MASKOS	0x0ff00000	/* OS-specific */
++#define PF_MASKPROC	0xf0000000	/* Processor-specific */
++
++/* Legal values for note segment descriptor types for core files. */
++
++#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
++#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
++#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
++#define NT_PRXREG	4		/* Contains copy of prxregset struct */
++#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
++#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
++#define NT_AUXV		6		/* Contains copy of auxv array */
++#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
++#define NT_ASRS		8		/* Contains copy of asrset struct */
++#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
++#define NT_PSINFO	13		/* Contains copy of psinfo struct */
++#define NT_PRCRED	14		/* Contains copy of prcred struct */
++#define NT_UTSNAME	15		/* Contains copy of utsname struct */
++#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
++#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
++#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
++#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
++#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
++#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
++#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
++#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
++#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
++#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
++
++/* Legal values for the note segment descriptor types for object files.  */
++
++#define NT_VERSION	1		/* Contains a version string.  */
++
++
++/* Dynamic section entry.  */
++
++typedef struct
++{
++  Elf32_Sword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf32_Word d_val;			/* Integer value */
++      Elf32_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf32_Dyn;
++
++typedef struct
++{
++  Elf64_Sxword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf64_Xword d_val;		/* Integer value */
++      Elf64_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf64_Dyn;
++
++/* Legal values for d_tag (dynamic entry type).  */
++
++#define DT_NULL		0		/* Marks end of dynamic section */
++#define DT_NEEDED	1		/* Name of needed library */
++#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
++#define DT_PLTGOT	3		/* Processor defined value */
++#define DT_HASH		4		/* Address of symbol hash table */
++#define DT_STRTAB	5		/* Address of string table */
++#define DT_SYMTAB	6		/* Address of symbol table */
++#define DT_RELA		7		/* Address of Rela relocs */
++#define DT_RELASZ	8		/* Total size of Rela relocs */
++#define DT_RELAENT	9		/* Size of one Rela reloc */
++#define DT_STRSZ	10		/* Size of string table */
++#define DT_SYMENT	11		/* Size of one symbol table entry */
++#define DT_INIT		12		/* Address of init function */
++#define DT_FINI		13		/* Address of termination function */
++#define DT_SONAME	14		/* Name of shared object */
++#define DT_RPATH	15		/* Library search path (deprecated) */
++#define DT_SYMBOLIC	16		/* Start symbol search here */
++#define DT_REL		17		/* Address of Rel relocs */
++#define DT_RELSZ	18		/* Total size of Rel relocs */
++#define DT_RELENT	19		/* Size of one Rel reloc */
++#define DT_PLTREL	20		/* Type of reloc in PLT */
++#define DT_DEBUG	21		/* For debugging; unspecified */
++#define DT_TEXTREL	22		/* Reloc might modify .text */
++#define DT_JMPREL	23		/* Address of PLT relocs */
++#define	DT_BIND_NOW	24		/* Process relocations of object */
++#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
++#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
++#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
++#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
++#define DT_RUNPATH	29		/* Library search path */
++#define DT_FLAGS	30		/* Flags for the object being loaded */
++#define DT_ENCODING	32		/* Start of encoded range */
++#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
++#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
++#define	DT_NUM		34		/* Number used */
++#define DT_LOOS		0x6000000d	/* Start of OS-specific */
++#define DT_HIOS		0x6ffff000	/* End of OS-specific */
++#define DT_LOPROC	0x70000000	/* Start of processor-specific */
++#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
++#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
++
++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
++   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
++   approach.  */
++#define DT_VALRNGLO	0x6ffffd00
++#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
++#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
++#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
++#define DT_CHECKSUM	0x6ffffdf8
++#define DT_PLTPADSZ	0x6ffffdf9
++#define DT_MOVEENT	0x6ffffdfa
++#define DT_MOVESZ	0x6ffffdfb
++#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
++#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
++					   the following DT_* entry.  */
++#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
++#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
++#define DT_VALRNGHI	0x6ffffdff
++#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
++#define DT_VALNUM 12
++
++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
++   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
++
++   If any adjustment is made to the ELF object after it has been
++   built these entries will need to be adjusted.  */
++#define DT_ADDRRNGLO	0x6ffffe00
++#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
++#define DT_TLSDESC_PLT	0x6ffffef6
++#define DT_TLSDESC_GOT	0x6ffffef7
++#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
++#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
++#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
++#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
++#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
++#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
++#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
++#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
++#define DT_ADDRRNGHI	0x6ffffeff
++#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
++#define DT_ADDRNUM 11
++
++/* The versioning entry types.  The next are defined as part of the
++   GNU extension.  */
++#define DT_VERSYM	0x6ffffff0
++
++#define DT_RELACOUNT	0x6ffffff9
++#define DT_RELCOUNT	0x6ffffffa
++
++/* These were chosen by Sun.  */
++#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
++#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
++					   table */
++#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
++#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
++					   versions */
++#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
++#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
++#define DT_VERSIONTAGNUM 16
++
++/* Sun added these machine-independent extensions in the "processor-specific"
++   range.  Be compatible.  */
++#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
++#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
++#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
++#define DT_EXTRANUM	3
++
++/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
++#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
++#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
++#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
++#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
++#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
++
++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
++   entry in the dynamic section.  */
++#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
++#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
++#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
++#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
++#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
++#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
++#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
++#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
++#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
++#define DF_1_TRANS	0x00000200
++#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
++#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
++#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
++#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
++#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
++#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
++#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
++
++/* Flags for the feature selection in DT_FEATURE_1.  */
++#define DTF_1_PARINIT	0x00000001
++#define DTF_1_CONFEXP	0x00000002
++
++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
++#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
++#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
++					   generally available.  */
++
++/* Version definition sections.  */
++
++typedef struct
++{
++  Elf32_Half	vd_version;		/* Version revision */
++  Elf32_Half	vd_flags;		/* Version information */
++  Elf32_Half	vd_ndx;			/* Version Index */
++  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vd_hash;		/* Version name hash value */
++  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf32_Verdef;
++
++typedef struct
++{
++  Elf64_Half	vd_version;		/* Version revision */
++  Elf64_Half	vd_flags;		/* Version information */
++  Elf64_Half	vd_ndx;			/* Version Index */
++  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vd_hash;		/* Version name hash value */
++  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf64_Verdef;
++
++
++/* Legal values for vd_version (version revision).  */
++#define VER_DEF_NONE	0		/* No version */
++#define VER_DEF_CURRENT	1		/* Current version */
++#define VER_DEF_NUM	2		/* Given version number */
++
++/* Legal values for vd_flags (version information flags).  */
++#define VER_FLG_BASE	0x1		/* Version definition of file itself */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++/* Versym symbol index values.  */
++#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
++#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
++#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
++#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
++
++/* Auxialiary version information.  */
++
++typedef struct
++{
++  Elf32_Word	vda_name;		/* Version or dependency names */
++  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf32_Verdaux;
++
++typedef struct
++{
++  Elf64_Word	vda_name;		/* Version or dependency names */
++  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf64_Verdaux;
++
++
++/* Version dependency section.  */
++
++typedef struct
++{
++  Elf32_Half	vn_version;		/* Version of structure */
++  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf32_Verneed;
++
++typedef struct
++{
++  Elf64_Half	vn_version;		/* Version of structure */
++  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf64_Verneed;
++
++
++/* Legal values for vn_version (version revision).  */
++#define VER_NEED_NONE	 0		/* No version */
++#define VER_NEED_CURRENT 1		/* Current version */
++#define VER_NEED_NUM	 2		/* Given version number */
++
++/* Auxiliary needed version information.  */
++
++typedef struct
++{
++  Elf32_Word	vna_hash;		/* Hash value of dependency name */
++  Elf32_Half	vna_flags;		/* Dependency specific information */
++  Elf32_Half	vna_other;		/* Unused */
++  Elf32_Word	vna_name;		/* Dependency name string offset */
++  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf32_Vernaux;
++
++typedef struct
++{
++  Elf64_Word	vna_hash;		/* Hash value of dependency name */
++  Elf64_Half	vna_flags;		/* Dependency specific information */
++  Elf64_Half	vna_other;		/* Unused */
++  Elf64_Word	vna_name;		/* Dependency name string offset */
++  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf64_Vernaux;
++
++
++/* Legal values for vna_flags.  */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++
++/* Auxiliary vector.  */
++
++/* This vector is normally only used by the program interpreter.  The
++   usual definition in an ABI supplement uses the name auxv_t.  The
++   vector is not usually defined in a standard <elf.h> file, but it
++   can't hurt.  We rename it to avoid conflicts.  The sizes of these
++   types are an arrangement between the exec server and the program
++   interpreter, so we don't fully specify them here.  */
++
++typedef struct
++{
++  uint32_t a_type;		/* Entry type */
++  union
++    {
++      uint32_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf32_auxv_t;
++
++typedef struct
++{
++  uint64_t a_type;		/* Entry type */
++  union
++    {
++      uint64_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf64_auxv_t;
++
++/* Legal values for a_type (entry type).  */
++
++#define AT_NULL		0		/* End of vector */
++#define AT_IGNORE	1		/* Entry should be ignored */
++#define AT_EXECFD	2		/* File descriptor of program */
++#define AT_PHDR		3		/* Program headers for program */
++#define AT_PHENT	4		/* Size of program header entry */
++#define AT_PHNUM	5		/* Number of program headers */
++#define AT_PAGESZ	6		/* System page size */
++#define AT_BASE		7		/* Base address of interpreter */
++#define AT_FLAGS	8		/* Flags */
++#define AT_ENTRY	9		/* Entry point of program */
++#define AT_NOTELF	10		/* Program is not ELF */
++#define AT_UID		11		/* Real uid */
++#define AT_EUID		12		/* Effective uid */
++#define AT_GID		13		/* Real gid */
++#define AT_EGID		14		/* Effective gid */
++#define AT_CLKTCK	17		/* Frequency of times() */
++
++/* Some more special a_type values describing the hardware.  */
++#define AT_PLATFORM	15		/* String identifying platform.  */
++#define AT_HWCAP	16		/* Machine dependent hints about
++					   processor capabilities.  */
++
++/* This entry gives some information about the FPU initialization
++   performed by the kernel.  */
++#define AT_FPUCW	18		/* Used FPU control word.  */
++
++/* Cache block sizes.  */
++#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
++#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
++#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
++
++/* A special ignored value for PPC, used by the kernel to control the
++   interpretation of the AUXV. Must be > 16.  */
++#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
++
++#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
++
++#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
++
++#define AT_RANDOM	25		/* Address of 16 random bytes.  */
++
++#define AT_EXECFN	31		/* Filename of executable.  */
++
++/* Pointer to the global system page used for system calls and other
++   nice things.  */
++#define AT_SYSINFO	32
++#define AT_SYSINFO_EHDR	33
++
++/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
++   log2 of line size; mask those to get cache size.  */
++#define AT_L1I_CACHESHAPE	34
++#define AT_L1D_CACHESHAPE	35
++#define AT_L2_CACHESHAPE	36
++#define AT_L3_CACHESHAPE	37
++
++/* Note section contents.  Each entry in the note section begins with
++   a header of a fixed form.  */
++
++typedef struct
++{
++  Elf32_Word n_namesz;			/* Length of the note's name.  */
++  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf32_Word n_type;			/* Type of the note.  */
++} Elf32_Nhdr;
++
++typedef struct
++{
++  Elf64_Word n_namesz;			/* Length of the note's name.  */
++  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf64_Word n_type;			/* Type of the note.  */
++} Elf64_Nhdr;
++
++/* Known names of notes.  */
++
++/* Solaris entries in the note section have this name.  */
++#define ELF_NOTE_SOLARIS	"SUNW Solaris"
++
++/* Note entries for GNU systems have this name.  */
++#define ELF_NOTE_GNU		"GNU"
++
++
++/* Defined types of notes for Solaris.  */
++
++/* Value of descriptor (one word) is desired pagesize for the binary.  */
++#define ELF_NOTE_PAGESIZE_HINT	1
++
++
++/* Defined note types for GNU systems.  */
++
++/* ABI information.  The descriptor consists of words:
++   word 0: OS descriptor
++   word 1: major version of the ABI
++   word 2: minor version of the ABI
++   word 3: subminor version of the ABI
++*/
++#define NT_GNU_ABI_TAG	1
++#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
++
++/* Known OSes.  These values can appear in word 0 of an
++   NT_GNU_ABI_TAG note section entry.  */
++#define ELF_NOTE_OS_LINUX	0
++#define ELF_NOTE_OS_GNU		1
++#define ELF_NOTE_OS_SOLARIS2	2
++#define ELF_NOTE_OS_FREEBSD	3
++
++/* Synthetic hwcap information.  The descriptor begins with two words:
++   word 0: number of entries
++   word 1: bitmask of enabled entries
++   Then follow variable-length entries, one byte followed by a
++   '\0'-terminated hwcap name string.  The byte gives the bit
++   number to test if enabled, (1U << bit) & bitmask.  */
++#define NT_GNU_HWCAP	2
++
++/* Build ID bits as generated by ld --build-id.
++   The descriptor consists of any nonzero number of bytes.  */
++#define NT_GNU_BUILD_ID	3
++
++/* Version note generated by GNU gold containing a version string.  */
++#define NT_GNU_GOLD_VERSION	4
++
++
++/* Move records.  */
++typedef struct
++{
++  Elf32_Xword m_value;		/* Symbol value.  */
++  Elf32_Word m_info;		/* Size and index.  */
++  Elf32_Word m_poffset;		/* Symbol offset.  */
++  Elf32_Half m_repeat;		/* Repeat count.  */
++  Elf32_Half m_stride;		/* Stride info.  */
++} Elf32_Move;
++
++typedef struct
++{
++  Elf64_Xword m_value;		/* Symbol value.  */
++  Elf64_Xword m_info;		/* Size and index.  */
++  Elf64_Xword m_poffset;	/* Symbol offset.  */
++  Elf64_Half m_repeat;		/* Repeat count.  */
++  Elf64_Half m_stride;		/* Stride info.  */
++} Elf64_Move;
++
++/* Macro to construct move records.  */
++#define ELF32_M_SYM(info)	((info) >> 8)
++#define ELF32_M_SIZE(info)	((unsigned char) (info))
++#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
++
++#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
++#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
++#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
++
++
++/* Motorola 68k specific definitions.  */
++
++/* Values for Elf32_Ehdr.e_flags.  */
++#define EF_CPU32	0x00810000
++
++/* m68k relocs.  */
++
++#define R_68K_NONE	0		/* No reloc */
++#define R_68K_32	1		/* Direct 32 bit  */
++#define R_68K_16	2		/* Direct 16 bit  */
++#define R_68K_8		3		/* Direct 8 bit  */
++#define R_68K_PC32	4		/* PC relative 32 bit */
++#define R_68K_PC16	5		/* PC relative 16 bit */
++#define R_68K_PC8	6		/* PC relative 8 bit */
++#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
++#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
++#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
++#define R_68K_GOT32O	10		/* 32 bit GOT offset */
++#define R_68K_GOT16O	11		/* 16 bit GOT offset */
++#define R_68K_GOT8O	12		/* 8 bit GOT offset */
++#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
++#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
++#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
++#define R_68K_PLT32O	16		/* 32 bit PLT offset */
++#define R_68K_PLT16O	17		/* 16 bit PLT offset */
++#define R_68K_PLT8O	18		/* 8 bit PLT offset */
++#define R_68K_COPY	19		/* Copy symbol at runtime */
++#define R_68K_GLOB_DAT	20		/* Create GOT entry */
++#define R_68K_JMP_SLOT	21		/* Create PLT entry */
++#define R_68K_RELATIVE	22		/* Adjust by program base */
++#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
++#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
++#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
++#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
++#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
++#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
++#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
++#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
++#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
++#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
++#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
++#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
++#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
++#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
++#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
++/* Keep this the last entry.  */
++#define R_68K_NUM	43
++
++/* Intel 80386 specific definitions.  */
++
++/* i386 relocs.  */
++
++#define R_386_NONE	   0		/* No reloc */
++#define R_386_32	   1		/* Direct 32 bit  */
++#define R_386_PC32	   2		/* PC relative 32 bit */
++#define R_386_GOT32	   3		/* 32 bit GOT entry */
++#define R_386_PLT32	   4		/* 32 bit PLT address */
++#define R_386_COPY	   5		/* Copy symbol at runtime */
++#define R_386_GLOB_DAT	   6		/* Create GOT entry */
++#define R_386_JMP_SLOT	   7		/* Create PLT entry */
++#define R_386_RELATIVE	   8		/* Adjust by program base */
++#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
++#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
++#define R_386_32PLT	   11
++#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
++#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
++					   block offset */
++#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
++					   offset */
++#define R_386_TLS_LE	   17		/* Offset relative to static TLS
++					   block */
++#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
++					   general dynamic thread local data */
++#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
++					   local dynamic thread local data
++					   in LE code */
++#define R_386_16	   20
++#define R_386_PC16	   21
++#define R_386_8		   22
++#define R_386_PC8	   23
++#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
++					   thread local data */
++#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
++#define R_386_TLS_GD_CALL  26		/* Relocation for call to
++					   __tls_get_addr() */
++#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
++#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
++					   thread local data in LE code */
++#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
++#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
++					   __tls_get_addr() in LDM code */
++#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
++#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
++#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
++					   block offset */
++#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
++					   TLS block */
++#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
++#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
++#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
++/* 38? */
++#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
++#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
++					   descriptor for
++					   relaxation.  */
++#define R_386_TLS_DESC     41		/* TLS descriptor containing
++					   pointer to code and to
++					   argument, returning the TLS
++					   offset for the symbol.  */
++#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
++/* Keep this the last entry.  */
++#define R_386_NUM	   43
++
++/* SUN SPARC specific definitions.  */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
++
++/* Values for Elf64_Ehdr.e_flags.  */
++
++#define EF_SPARCV9_MM		3
++#define EF_SPARCV9_TSO		0
++#define EF_SPARCV9_PSO		1
++#define EF_SPARCV9_RMO		2
++#define EF_SPARC_LEDATA		0x800000 /* little endian data */
++#define EF_SPARC_EXT_MASK	0xFFFF00
++#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
++#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
++#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
++#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
++
++/* SPARC relocs.  */
++
++#define R_SPARC_NONE		0	/* No reloc */
++#define R_SPARC_8		1	/* Direct 8 bit */
++#define R_SPARC_16		2	/* Direct 16 bit */
++#define R_SPARC_32		3	/* Direct 32 bit */
++#define R_SPARC_DISP8		4	/* PC relative 8 bit */
++#define R_SPARC_DISP16		5	/* PC relative 16 bit */
++#define R_SPARC_DISP32		6	/* PC relative 32 bit */
++#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
++#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
++#define R_SPARC_HI22		9	/* High 22 bit */
++#define R_SPARC_22		10	/* Direct 22 bit */
++#define R_SPARC_13		11	/* Direct 13 bit */
++#define R_SPARC_LO10		12	/* Truncated 10 bit */
++#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
++#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
++#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
++#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
++#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
++#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
++#define R_SPARC_COPY		19	/* Copy symbol at runtime */
++#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
++#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
++#define R_SPARC_RELATIVE	22	/* Adjust by program base */
++#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
++
++/* Additional Sparc64 relocs.  */
++
++#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
++#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
++#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
++#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
++#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
++#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
++#define R_SPARC_10		30	/* Direct 10 bit */
++#define R_SPARC_11		31	/* Direct 11 bit */
++#define R_SPARC_64		32	/* Direct 64 bit */
++#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
++#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
++#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
++#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
++#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
++#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
++#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
++#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
++#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
++#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
++#define R_SPARC_7		43	/* Direct 7 bit */
++#define R_SPARC_5		44	/* Direct 5 bit */
++#define R_SPARC_6		45	/* Direct 6 bit */
++#define R_SPARC_DISP64		46	/* PC relative 64 bit */
++#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
++#define R_SPARC_HIX22		48	/* High 22 bit complemented */
++#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
++#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
++#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
++#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
++#define R_SPARC_REGISTER	53	/* Global register usage */
++#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
++#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
++#define R_SPARC_TLS_GD_HI22	56
++#define R_SPARC_TLS_GD_LO10	57
++#define R_SPARC_TLS_GD_ADD	58
++#define R_SPARC_TLS_GD_CALL	59
++#define R_SPARC_TLS_LDM_HI22	60
++#define R_SPARC_TLS_LDM_LO10	61
++#define R_SPARC_TLS_LDM_ADD	62
++#define R_SPARC_TLS_LDM_CALL	63
++#define R_SPARC_TLS_LDO_HIX22	64
++#define R_SPARC_TLS_LDO_LOX10	65
++#define R_SPARC_TLS_LDO_ADD	66
++#define R_SPARC_TLS_IE_HI22	67
++#define R_SPARC_TLS_IE_LO10	68
++#define R_SPARC_TLS_IE_LD	69
++#define R_SPARC_TLS_IE_LDX	70
++#define R_SPARC_TLS_IE_ADD	71
++#define R_SPARC_TLS_LE_HIX22	72
++#define R_SPARC_TLS_LE_LOX10	73
++#define R_SPARC_TLS_DTPMOD32	74
++#define R_SPARC_TLS_DTPMOD64	75
++#define R_SPARC_TLS_DTPOFF32	76
++#define R_SPARC_TLS_DTPOFF64	77
++#define R_SPARC_TLS_TPOFF32	78
++#define R_SPARC_TLS_TPOFF64	79
++#define R_SPARC_GOTDATA_HIX22	80
++#define R_SPARC_GOTDATA_LOX10	81
++#define R_SPARC_GOTDATA_OP_HIX22	82
++#define R_SPARC_GOTDATA_OP_LOX10	83
++#define R_SPARC_GOTDATA_OP	84
++#define R_SPARC_H34		85
++#define R_SPARC_SIZE32		86
++#define R_SPARC_SIZE64		87
++#define R_SPARC_WDISP10		88
++#define R_SPARC_JMP_IREL	248
++#define R_SPARC_IRELATIVE	249
++#define R_SPARC_GNU_VTINHERIT	250
++#define R_SPARC_GNU_VTENTRY	251
++#define R_SPARC_REV32		252
++/* Keep this the last entry.  */
++#define R_SPARC_NUM		253
++
++/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
++
++#define DT_SPARC_REGISTER 0x70000001
++#define DT_SPARC_NUM	2
++
++/* MIPS R3000 specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
++#define EF_MIPS_PIC	    2		/* Contains PIC code */
++#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
++#define EF_MIPS_XGOT	    8
++#define EF_MIPS_64BIT_WHIRL 16
++#define EF_MIPS_ABI2	    32
++#define EF_MIPS_ABI_ON32    64
++#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
++
++/* Legal values for MIPS architecture level.  */
++
++#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
++#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
++#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
++#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
++#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
++#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
++#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
++
++/* The following are non-official names and should not be used.  */
++
++#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
++#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
++#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
++#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
++#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
++#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
++#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
++
++/* Special section indices.  */
++
++#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
++#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
++#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
++#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
++#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
++#define SHT_MIPS_MSYM	       0x70000001
++#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
++#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
++#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
++#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
++#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
++#define SHT_MIPS_PACKAGE       0x70000007
++#define SHT_MIPS_PACKSYM       0x70000008
++#define SHT_MIPS_RELD	       0x70000009
++#define SHT_MIPS_IFACE         0x7000000b
++#define SHT_MIPS_CONTENT       0x7000000c
++#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
++#define SHT_MIPS_SHDR	       0x70000010
++#define SHT_MIPS_FDESC	       0x70000011
++#define SHT_MIPS_EXTSYM	       0x70000012
++#define SHT_MIPS_DENSE	       0x70000013
++#define SHT_MIPS_PDESC	       0x70000014
++#define SHT_MIPS_LOCSYM	       0x70000015
++#define SHT_MIPS_AUXSYM	       0x70000016
++#define SHT_MIPS_OPTSYM	       0x70000017
++#define SHT_MIPS_LOCSTR	       0x70000018
++#define SHT_MIPS_LINE	       0x70000019
++#define SHT_MIPS_RFDESC	       0x7000001a
++#define SHT_MIPS_DELTASYM      0x7000001b
++#define SHT_MIPS_DELTAINST     0x7000001c
++#define SHT_MIPS_DELTACLASS    0x7000001d
++#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
++#define SHT_MIPS_DELTADECL     0x7000001f
++#define SHT_MIPS_SYMBOL_LIB    0x70000020
++#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
++#define SHT_MIPS_TRANSLATE     0x70000022
++#define SHT_MIPS_PIXIE	       0x70000023
++#define SHT_MIPS_XLATE	       0x70000024
++#define SHT_MIPS_XLATE_DEBUG   0x70000025
++#define SHT_MIPS_WHIRL	       0x70000026
++#define SHT_MIPS_EH_REGION     0x70000027
++#define SHT_MIPS_XLATE_OLD     0x70000028
++#define SHT_MIPS_PDR_EXCEPTION 0x70000029
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
++#define SHF_MIPS_MERGE	 0x20000000
++#define SHF_MIPS_ADDR	 0x40000000
++#define SHF_MIPS_STRINGS 0x80000000
++#define SHF_MIPS_NOSTRIP 0x08000000
++#define SHF_MIPS_LOCAL	 0x04000000
++#define SHF_MIPS_NAMES	 0x02000000
++#define SHF_MIPS_NODUPE	 0x01000000
++
++
++/* Symbol tables.  */
++
++/* MIPS specific values for `st_other'.  */
++#define STO_MIPS_DEFAULT		0x0
++#define STO_MIPS_INTERNAL		0x1
++#define STO_MIPS_HIDDEN			0x2
++#define STO_MIPS_PROTECTED		0x3
++#define STO_MIPS_PLT			0x8
++#define STO_MIPS_SC_ALIGN_UNUSED	0xff
++
++/* MIPS specific values for `st_info'.  */
++#define STB_MIPS_SPLIT_COMMON		13
++
++/* Entries found in sections of type SHT_MIPS_GPTAB.  */
++
++typedef union
++{
++  struct
++    {
++      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
++      Elf32_Word gt_unused;		/* Not used */
++    } gt_header;			/* First entry in section */
++  struct
++    {
++      Elf32_Word gt_g_value;		/* If this value were used for -G */
++      Elf32_Word gt_bytes;		/* This many bytes would be used */
++    } gt_entry;				/* Subsequent entries in section */
++} Elf32_gptab;
++
++/* Entry found in sections of type SHT_MIPS_REGINFO.  */
++
++typedef struct
++{
++  Elf32_Word	ri_gprmask;		/* General registers used */
++  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
++  Elf32_Sword	ri_gp_value;		/* $gp register value */
++} Elf32_RegInfo;
++
++/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
++
++typedef struct
++{
++  unsigned char kind;		/* Determines interpretation of the
++				   variable part of descriptor.  */
++  unsigned char size;		/* Size of descriptor, including header.  */
++  Elf32_Section section;	/* Section header index of section affected,
++				   0 for global options.  */
++  Elf32_Word info;		/* Kind-specific information.  */
++} Elf_Options;
++
++/* Values for `kind' field in Elf_Options.  */
++
++#define ODK_NULL	0	/* Undefined.  */
++#define ODK_REGINFO	1	/* Register usage information.  */
++#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
++#define ODK_PAD		3	/* Section padding options.  */
++#define ODK_HWPATCH	4	/* Hardware workarounds performed */
++#define ODK_FILL	5	/* record the fill value used by the linker. */
++#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
++#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
++#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
++
++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
++
++#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
++#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
++#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
++#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
++#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
++#define OEX_PRECISEFP	OEX_FPDBUG
++#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
++
++#define OEX_FPU_INVAL	0x10
++#define OEX_FPU_DIV0	0x08
++#define OEX_FPU_OFLO	0x04
++#define OEX_FPU_UFLO	0x02
++#define OEX_FPU_INEX	0x01
++
++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
++
++#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
++#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
++#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
++#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
++
++#define OPAD_PREFIX	0x1
++#define OPAD_POSTFIX	0x2
++#define OPAD_SYMBOL	0x4
++
++/* Entry found in `.options' section.  */
++
++typedef struct
++{
++  Elf32_Word hwp_flags1;	/* Extra flags.  */
++  Elf32_Word hwp_flags2;	/* Extra flags.  */
++} Elf_Options_Hw;
++
++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
++
++#define OHWA0_R4KEOP_CHECKED	0x00000001
++#define OHWA1_R4KEOP_CLEAN	0x00000002
++
++/* MIPS relocs.  */
++
++#define R_MIPS_NONE		0	/* No reloc */
++#define R_MIPS_16		1	/* Direct 16 bit */
++#define R_MIPS_32		2	/* Direct 32 bit */
++#define R_MIPS_REL32		3	/* PC relative 32 bit */
++#define R_MIPS_26		4	/* Direct 26 bit shifted */
++#define R_MIPS_HI16		5	/* High 16 bit */
++#define R_MIPS_LO16		6	/* Low 16 bit */
++#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
++#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
++#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
++#define R_MIPS_PC16		10	/* PC relative 16 bit */
++#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
++#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
++
++#define R_MIPS_SHIFT5		16
++#define R_MIPS_SHIFT6		17
++#define R_MIPS_64		18
++#define R_MIPS_GOT_DISP		19
++#define R_MIPS_GOT_PAGE		20
++#define R_MIPS_GOT_OFST		21
++#define R_MIPS_GOT_HI16		22
++#define R_MIPS_GOT_LO16		23
++#define R_MIPS_SUB		24
++#define R_MIPS_INSERT_A		25
++#define R_MIPS_INSERT_B		26
++#define R_MIPS_DELETE		27
++#define R_MIPS_HIGHER		28
++#define R_MIPS_HIGHEST		29
++#define R_MIPS_CALL_HI16	30
++#define R_MIPS_CALL_LO16	31
++#define R_MIPS_SCN_DISP		32
++#define R_MIPS_REL16		33
++#define R_MIPS_ADD_IMMEDIATE	34
++#define R_MIPS_PJUMP		35
++#define R_MIPS_RELGOT		36
++#define R_MIPS_JALR		37
++#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
++#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
++#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
++#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
++#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
++#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
++#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
++#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
++#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
++#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
++#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
++#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
++#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
++#define R_MIPS_GLOB_DAT		51
++#define R_MIPS_COPY		126
++#define R_MIPS_JUMP_SLOT        127
++/* Keep this the last entry.  */
++#define R_MIPS_NUM		128
++
++/* Legal values for p_type field of Elf32_Phdr.  */
++
++#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
++#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
++#define PT_MIPS_OPTIONS 0x70000002
++
++/* Special program header types.  */
++
++#define PF_MIPS_LOCAL	0x10000000
++
++/* Legal values for d_tag field of Elf32_Dyn.  */
++
++#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
++#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
++#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
++#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
++#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
++#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
++#define DT_MIPS_MSYM	     0x70000007
++#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
++#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
++#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
++#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
++#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
++#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
++#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
++#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
++#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
++#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
++#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
++#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
++						DT_MIPS_DELTA_CLASS.  */
++#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
++						DT_MIPS_DELTA_INSTANCE.  */
++#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
++					     DT_MIPS_DELTA_RELOC.  */
++#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
++					   relocations refer to.  */
++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
++					   DT_MIPS_DELTA_SYM.  */
++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
++					     class declaration.  */
++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
++						DT_MIPS_DELTA_CLASSSYM.  */
++#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
++#define DT_MIPS_PIXIE_INIT   0x70000023
++#define DT_MIPS_SYMBOL_LIB   0x70000024
++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
++#define DT_MIPS_LOCAL_GOTIDX 0x70000026
++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
++#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
++#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
++						    function stored in GOT.  */
++#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
++					   by rld on dlopen() calls.  */
++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
++#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
++#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
++/* The address of .got.plt in an executable using the new non-PIC ABI.  */
++#define DT_MIPS_PLTGOT	     0x70000032
++/* The base of the PLT in an executable using the new non-PIC ABI if that
++   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
++   value.  */
++#define DT_MIPS_RWPLT        0x70000034
++#define DT_MIPS_NUM	     0x35
++
++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
++
++#define RHF_NONE		   0		/* No flags */
++#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
++#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
++#define RHF_NO_MOVE		   (1 << 3)
++#define RHF_SGI_ONLY		   (1 << 4)
++#define RHF_GUARANTEE_INIT	   (1 << 5)
++#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
++#define RHF_GUARANTEE_START_INIT   (1 << 7)
++#define RHF_PIXIE		   (1 << 8)
++#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
++#define RHF_REQUICKSTART	   (1 << 10)
++#define RHF_REQUICKSTARTED	   (1 << 11)
++#define RHF_CORD		   (1 << 12)
++#define RHF_NO_UNRES_UNDEF	   (1 << 13)
++#define RHF_RLD_ORDER_SAFE	   (1 << 14)
++
++/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
++
++typedef struct
++{
++  Elf32_Word l_name;		/* Name (string table index) */
++  Elf32_Word l_time_stamp;	/* Timestamp */
++  Elf32_Word l_checksum;	/* Checksum */
++  Elf32_Word l_version;		/* Interface version */
++  Elf32_Word l_flags;		/* Flags */
++} Elf32_Lib;
++
++typedef struct
++{
++  Elf64_Word l_name;		/* Name (string table index) */
++  Elf64_Word l_time_stamp;	/* Timestamp */
++  Elf64_Word l_checksum;	/* Checksum */
++  Elf64_Word l_version;		/* Interface version */
++  Elf64_Word l_flags;		/* Flags */
++} Elf64_Lib;
++
++
++/* Legal values for l_flags.  */
++
++#define LL_NONE		  0
++#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
++#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
++#define LL_REQUIRE_MINOR  (1 << 2)
++#define LL_EXPORTS	  (1 << 3)
++#define LL_DELAY_LOAD	  (1 << 4)
++#define LL_DELTA	  (1 << 5)
++
++/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
++
++typedef Elf32_Addr Elf32_Conflict;
++
++
++/* HPPA specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
++#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
++#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
++#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
++#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
++					      prediction.  */
++#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
++#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
++
++/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
++
++#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
++#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
++#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
++
++/* Additional section indeces.  */
++
++#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
++					      symbols in ANSI C.  */
++#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
++#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
++#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
++#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
++#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
++
++#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
++#define STT_HP_STUB		(STT_LOOS + 0x2)
++
++/* HPPA relocs.  */
++
++#define R_PARISC_NONE		0	/* No reloc.  */
++#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
++#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
++#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
++#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
++#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
++#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
++#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
++#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
++#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
++#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
++#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
++#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
++#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
++#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
++#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
++#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
++#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
++#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
++#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
++#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
++#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
++#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
++#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
++#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
++#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
++#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
++#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
++#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
++#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
++#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
++#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
++#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
++#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
++#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
++#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
++#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
++#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
++#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
++#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
++#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
++#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
++#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LORESERVE	128
++#define R_PARISC_COPY		128	/* Copy relocation.  */
++#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
++#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
++#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
++#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
++#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
++#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
++#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
++#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
++#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_GNU_VTENTRY	232
++#define R_PARISC_GNU_VTINHERIT	233
++#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
++#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
++#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
++#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
++#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
++#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
++#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
++#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
++#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
++#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
++#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
++#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
++#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
++#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
++#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
++#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
++#define R_PARISC_HIRESERVE	255
++
++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PT_HP_TLS		(PT_LOOS + 0x0)
++#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
++#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
++#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
++#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
++#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
++#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
++#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
++#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
++#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
++#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
++#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
++#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
++#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
++#define PT_HP_STACK		(PT_LOOS + 0x14)
++
++#define PT_PARISC_ARCHEXT	0x70000000
++#define PT_PARISC_UNWIND	0x70000001
++
++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PF_PARISC_SBP		0x08000000
++
++#define PF_HP_PAGE_SIZE		0x00100000
++#define PF_HP_FAR_SHARED	0x00200000
++#define PF_HP_NEAR_SHARED	0x00400000
++#define PF_HP_CODE		0x01000000
++#define PF_HP_MODIFY		0x02000000
++#define PF_HP_LAZYSWAP		0x04000000
++#define PF_HP_SBP		0x08000000
++
++
++/* Alpha specific definitions.  */
++
++/* Legal values for e_flags field of Elf64_Ehdr.  */
++
++#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
++#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
++
++/* Legal values for sh_type field of Elf64_Shdr.  */
++
++/* These two are primerily concerned with ECOFF debugging info.  */
++#define SHT_ALPHA_DEBUG		0x70000001
++#define SHT_ALPHA_REGINFO	0x70000002
++
++/* Legal values for sh_flags field of Elf64_Shdr.  */
++
++#define SHF_ALPHA_GPREL		0x10000000
++
++/* Legal values for st_other field of Elf64_Sym.  */
++#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
++#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
++
++/* Alpha relocs.  */
++
++#define R_ALPHA_NONE		0	/* No reloc */
++#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
++#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
++#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
++#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
++#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
++#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
++#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
++#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
++#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
++#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
++#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
++#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
++#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
++#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
++#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
++#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
++#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
++#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
++#define R_ALPHA_TLS_GD_HI	28
++#define R_ALPHA_TLSGD		29
++#define R_ALPHA_TLS_LDM		30
++#define R_ALPHA_DTPMOD64	31
++#define R_ALPHA_GOTDTPREL	32
++#define R_ALPHA_DTPREL64	33
++#define R_ALPHA_DTPRELHI	34
++#define R_ALPHA_DTPRELLO	35
++#define R_ALPHA_DTPREL16	36
++#define R_ALPHA_GOTTPREL	37
++#define R_ALPHA_TPREL64		38
++#define R_ALPHA_TPRELHI		39
++#define R_ALPHA_TPRELLO		40
++#define R_ALPHA_TPREL16		41
++/* Keep this the last entry.  */
++#define R_ALPHA_NUM		46
++
++/* Magic values of the LITUSE relocation addend.  */
++#define LITUSE_ALPHA_ADDR	0
++#define LITUSE_ALPHA_BASE	1
++#define LITUSE_ALPHA_BYTOFF	2
++#define LITUSE_ALPHA_JSR	3
++#define LITUSE_ALPHA_TLS_GD	4
++#define LITUSE_ALPHA_TLS_LDM	5
++
++/* Legal values for d_tag of Elf64_Dyn.  */
++#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
++#define DT_ALPHA_NUM		1
++
++/* PowerPC specific declarations */
++
++/* Values for Elf32/64_Ehdr.e_flags.  */
++#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
++
++/* Cygnus local bits below */
++#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
++#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
++						   flag */
++
++/* PowerPC relocations defined by the ABIs */
++#define R_PPC_NONE		0
++#define R_PPC_ADDR32		1	/* 32bit absolute address */
++#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
++#define R_PPC_ADDR16		3	/* 16bit absolute address */
++#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
++#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
++#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
++#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
++#define R_PPC_ADDR14_BRTAKEN	8
++#define R_PPC_ADDR14_BRNTAKEN	9
++#define R_PPC_REL24		10	/* PC relative 26 bit */
++#define R_PPC_REL14		11	/* PC relative 16 bit */
++#define R_PPC_REL14_BRTAKEN	12
++#define R_PPC_REL14_BRNTAKEN	13
++#define R_PPC_GOT16		14
++#define R_PPC_GOT16_LO		15
++#define R_PPC_GOT16_HI		16
++#define R_PPC_GOT16_HA		17
++#define R_PPC_PLTREL24		18
++#define R_PPC_COPY		19
++#define R_PPC_GLOB_DAT		20
++#define R_PPC_JMP_SLOT		21
++#define R_PPC_RELATIVE		22
++#define R_PPC_LOCAL24PC		23
++#define R_PPC_UADDR32		24
++#define R_PPC_UADDR16		25
++#define R_PPC_REL32		26
++#define R_PPC_PLT32		27
++#define R_PPC_PLTREL32		28
++#define R_PPC_PLT16_LO		29
++#define R_PPC_PLT16_HI		30
++#define R_PPC_PLT16_HA		31
++#define R_PPC_SDAREL16		32
++#define R_PPC_SECTOFF		33
++#define R_PPC_SECTOFF_LO	34
++#define R_PPC_SECTOFF_HI	35
++#define R_PPC_SECTOFF_HA	36
++
++/* PowerPC relocations defined for the TLS access ABI.  */
++#define R_PPC_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
++#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
++#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
++#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
++#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
++#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
++#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
++#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
++#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
++#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
++
++/* The remaining relocs are from the Embedded ELF ABI, and are not
++   in the SVR4 ELF ABI.  */
++#define R_PPC_EMB_NADDR32	101
++#define R_PPC_EMB_NADDR16	102
++#define R_PPC_EMB_NADDR16_LO	103
++#define R_PPC_EMB_NADDR16_HI	104
++#define R_PPC_EMB_NADDR16_HA	105
++#define R_PPC_EMB_SDAI16	106
++#define R_PPC_EMB_SDA2I16	107
++#define R_PPC_EMB_SDA2REL	108
++#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
++#define R_PPC_EMB_MRKREF	110
++#define R_PPC_EMB_RELSEC16	111
++#define R_PPC_EMB_RELST_LO	112
++#define R_PPC_EMB_RELST_HI	113
++#define R_PPC_EMB_RELST_HA	114
++#define R_PPC_EMB_BIT_FLD	115
++#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
++
++/* Diab tool relocations.  */
++#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
++#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
++#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
++#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
++#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
++#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC_IRELATIVE		248
++
++/* GNU relocs used in PIC code sequences.  */
++#define R_PPC_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
++#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
++#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
++
++/* This is a phony reloc to handle any old fashioned TOC16 references
++   that may still be in object files.  */
++#define R_PPC_TOC16		255
++
++/* PowerPC specific values for the Dyn d_tag field.  */
++#define DT_PPC_GOT		(DT_LOPROC + 0)
++#define DT_PPC_NUM		1
++
++/* PowerPC64 relocations defined by the ABIs */
++#define R_PPC64_NONE		R_PPC_NONE
++#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
++#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
++#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
++#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
++#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
++#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
++#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
++#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
++#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
++#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
++#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
++#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
++#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
++#define R_PPC64_GOT16		R_PPC_GOT16
++#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
++#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
++#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
++
++#define R_PPC64_COPY		R_PPC_COPY
++#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
++#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
++#define R_PPC64_RELATIVE	R_PPC_RELATIVE
++
++#define R_PPC64_UADDR32		R_PPC_UADDR32
++#define R_PPC64_UADDR16		R_PPC_UADDR16
++#define R_PPC64_REL32		R_PPC_REL32
++#define R_PPC64_PLT32		R_PPC_PLT32
++#define R_PPC64_PLTREL32	R_PPC_PLTREL32
++#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
++#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
++#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
++
++#define R_PPC64_SECTOFF		R_PPC_SECTOFF
++#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
++#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
++#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
++#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
++#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
++#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
++#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
++#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
++#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
++#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
++#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
++#define R_PPC64_PLT64		45 /* doubleword64 L + A */
++#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
++#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
++#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
++#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
++#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
++#define R_PPC64_TOC		51 /* doubleword64 .TOC */
++#define R_PPC64_PLTGOT16	52 /* half16* M + A */
++#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
++#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
++#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
++
++#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
++#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
++#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
++#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
++#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
++#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
++#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
++#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
++#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
++#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
++#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
++
++/* PowerPC64 relocations defined for the TLS access ABI.  */
++#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
++#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
++#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
++#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
++#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
++#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
++#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
++#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
++#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
++#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
++#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC64_JMP_IREL	247
++#define R_PPC64_IRELATIVE	248
++#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
++#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
++#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
++
++/* PowerPC64 specific values for the Dyn d_tag field.  */
++#define DT_PPC64_GLINK  (DT_LOPROC + 0)
++#define DT_PPC64_OPD	(DT_LOPROC + 1)
++#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
++#define DT_PPC64_NUM    3
++
++
++/* ARM specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_ARM_RELEXEC		0x01
++#define EF_ARM_HASENTRY		0x02
++#define EF_ARM_INTERWORK	0x04
++#define EF_ARM_APCS_26		0x08
++#define EF_ARM_APCS_FLOAT	0x10
++#define EF_ARM_PIC		0x20
++#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
++#define EF_ARM_NEW_ABI		0x80
++#define EF_ARM_OLD_ABI		0x100
++#define EF_ARM_SOFT_FLOAT	0x200
++#define EF_ARM_VFP_FLOAT	0x400
++#define EF_ARM_MAVERICK_FLOAT	0x800
++
++
++/* Other constants defined in the ARM ELF spec. version B-01.  */
++/* NB. These conflict with values defined above.  */
++#define EF_ARM_SYMSARESORTED	0x04
++#define EF_ARM_DYNSYMSUSESEGIDX	0x08
++#define EF_ARM_MAPSYMSFIRST	0x10
++#define EF_ARM_EABIMASK		0XFF000000
++
++/* Constants defined in AAELF.  */
++#define EF_ARM_BE8	    0x00800000
++#define EF_ARM_LE8	    0x00400000
++
++#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
++#define EF_ARM_EABI_UNKNOWN	0x00000000
++#define EF_ARM_EABI_VER1	0x01000000
++#define EF_ARM_EABI_VER2	0x02000000
++#define EF_ARM_EABI_VER3	0x03000000
++#define EF_ARM_EABI_VER4	0x04000000
++#define EF_ARM_EABI_VER5	0x05000000
++
++/* Additional symbol types for Thumb.  */
++#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
++#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
++
++/* ARM-specific values for sh_flags */
++#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
++#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
++					      in the input to a link step.  */
++
++/* ARM-specific program header flags */
++#define PF_ARM_SB		0x10000000 /* Segment contains the location
++					      addressed by the static base. */
++#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
++#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
++#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
++#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
++
++
++/* ARM relocs.  */
++
++#define R_ARM_NONE		0	/* No reloc */
++#define R_ARM_PC24		1	/* PC relative 26 bit branch */
++#define R_ARM_ABS32		2	/* Direct 32 bit  */
++#define R_ARM_REL32		3	/* PC relative 32 bit */
++#define R_ARM_PC13		4
++#define R_ARM_ABS16		5	/* Direct 16 bit */
++#define R_ARM_ABS12		6	/* Direct 12 bit */
++#define R_ARM_THM_ABS5		7
++#define R_ARM_ABS8		8	/* Direct 8 bit */
++#define R_ARM_SBREL32		9
++#define R_ARM_THM_PC22		10
++#define R_ARM_THM_PC8		11
++#define R_ARM_AMP_VCALL9	12
++#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
++#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
++#define R_ARM_THM_SWI8		14
++#define R_ARM_XPC25		15
++#define R_ARM_THM_XPC22		16
++#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
++#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
++#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
++#define R_ARM_COPY		20	/* Copy symbol at runtime */
++#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
++#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
++#define R_ARM_RELATIVE		23	/* Adjust by program base */
++#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
++#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
++#define R_ARM_GOT32		26	/* 32 bit GOT entry */
++#define R_ARM_PLT32		27	/* 32 bit PLT address */
++#define R_ARM_ALU_PCREL_7_0	32
++#define R_ARM_ALU_PCREL_15_8	33
++#define R_ARM_ALU_PCREL_23_15	34
++#define R_ARM_LDR_SBREL_11_0	35
++#define R_ARM_ALU_SBREL_19_12	36
++#define R_ARM_ALU_SBREL_27_20	37
++#define R_ARM_TLS_GOTDESC	90
++#define R_ARM_TLS_CALL		91
++#define R_ARM_TLS_DESCSEQ	92
++#define R_ARM_THM_TLS_CALL	93
++#define R_ARM_GNU_VTENTRY	100
++#define R_ARM_GNU_VTINHERIT	101
++#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
++#define R_ARM_THM_PC9		103	/* thumb conditional branch */
++#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
++					   thread local data */
++#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
++					   thread local data */
++#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
++					   block */
++#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
++					   static TLS block offset */
++#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
++					   TLS block */
++#define	R_ARM_THM_TLS_DESCSEQ	129
++#define R_ARM_IRELATIVE		160
++#define R_ARM_RXPC25		249
++#define R_ARM_RSBREL32		250
++#define R_ARM_THM_RPC22		251
++#define R_ARM_RREL32		252
++#define R_ARM_RABS22		253
++#define R_ARM_RPC24		254
++#define R_ARM_RBASE		255
++/* Keep this the last entry.  */
++#define R_ARM_NUM		256
++
++/* IA-64 specific declarations.  */
++
++/* Processor specific flags for the Ehdr e_flags field.  */
++#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
++#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
++#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
++#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
++#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
++#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
++#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
++
++/* Processor specific flags for the Phdr p_flags field.  */
++#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
++#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
++
++/* Processor specific flags for the Shdr sh_flags field.  */
++#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
++#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Dyn d_tag field.  */
++#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
++#define DT_IA_64_NUM		1
++
++/* IA-64 relocations.  */
++#define R_IA64_NONE		0x00	/* none */
++#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
++#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
++#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
++#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
++#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
++#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
++#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
++#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
++#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
++#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
++#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
++#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
++#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
++#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
++#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
++#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
++#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
++#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
++#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
++#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
++#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
++#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
++#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
++#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
++#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
++#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
++#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
++#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
++#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
++#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
++#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
++#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
++#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
++#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
++#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
++#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
++#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
++#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
++#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
++#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
++#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
++#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
++#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
++#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
++#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
++#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
++#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
++#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
++#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
++#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
++#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
++#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
++#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
++#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
++#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
++#define R_IA64_COPY		0x84	/* copy relocation */
++#define R_IA64_SUB		0x85	/* Addend and symbol difference */
++#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
++#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
++#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
++#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
++#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
++#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
++#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
++#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
++#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
++#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
++#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
++#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
++#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
++#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
++#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
++#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
++
++/* SH specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_SH_MACH_MASK		0x1f
++#define EF_SH_UNKNOWN		0x0
++#define EF_SH1			0x1
++#define EF_SH2			0x2
++#define EF_SH3			0x3
++#define EF_SH_DSP		0x4
++#define EF_SH3_DSP		0x5
++#define EF_SH4AL_DSP		0x6
++#define EF_SH3E			0x8
++#define EF_SH4			0x9
++#define EF_SH2E			0xb
++#define EF_SH4A			0xc
++#define EF_SH2A			0xd
++#define EF_SH4_NOFPU		0x10
++#define EF_SH4A_NOFPU		0x11
++#define EF_SH4_NOMMU_NOFPU	0x12
++#define EF_SH2A_NOFPU		0x13
++#define EF_SH3_NOMMU		0x14
++#define EF_SH2A_SH4_NOFPU	0x15
++#define EF_SH2A_SH3_NOFPU	0x16
++#define EF_SH2A_SH4		0x17
++#define EF_SH2A_SH3E		0x18
++
++/* SH relocs.  */
++#define	R_SH_NONE		0
++#define	R_SH_DIR32		1
++#define	R_SH_REL32		2
++#define	R_SH_DIR8WPN		3
++#define	R_SH_IND12W		4
++#define	R_SH_DIR8WPL		5
++#define	R_SH_DIR8WPZ		6
++#define	R_SH_DIR8BP		7
++#define	R_SH_DIR8W		8
++#define	R_SH_DIR8L		9
++#define	R_SH_SWITCH16		25
++#define	R_SH_SWITCH32		26
++#define	R_SH_USES		27
++#define	R_SH_COUNT		28
++#define	R_SH_ALIGN		29
++#define	R_SH_CODE		30
++#define	R_SH_DATA		31
++#define	R_SH_LABEL		32
++#define	R_SH_SWITCH8		33
++#define	R_SH_GNU_VTINHERIT	34
++#define	R_SH_GNU_VTENTRY	35
++#define	R_SH_TLS_GD_32		144
++#define	R_SH_TLS_LD_32		145
++#define	R_SH_TLS_LDO_32		146
++#define	R_SH_TLS_IE_32		147
++#define	R_SH_TLS_LE_32		148
++#define	R_SH_TLS_DTPMOD32	149
++#define	R_SH_TLS_DTPOFF32	150
++#define	R_SH_TLS_TPOFF32	151
++#define	R_SH_GOT32		160
++#define	R_SH_PLT32		161
++#define	R_SH_COPY		162
++#define	R_SH_GLOB_DAT		163
++#define	R_SH_JMP_SLOT		164
++#define	R_SH_RELATIVE		165
++#define	R_SH_GOTOFF		166
++#define	R_SH_GOTPC		167
++/* Keep this the last entry.  */
++#define	R_SH_NUM		256
++
++/* S/390 specific definitions.  */
++
++/* Valid values for the e_flags field.  */
++
++#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
++
++/* Additional s390 relocs */
++
++#define R_390_NONE		0	/* No reloc.  */
++#define R_390_8			1	/* Direct 8 bit.  */
++#define R_390_12		2	/* Direct 12 bit.  */
++#define R_390_16		3	/* Direct 16 bit.  */
++#define R_390_32		4	/* Direct 32 bit.  */
++#define R_390_PC32		5	/* PC relative 32 bit.	*/
++#define R_390_GOT12		6	/* 12 bit GOT offset.  */
++#define R_390_GOT32		7	/* 32 bit GOT offset.  */
++#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
++#define R_390_COPY		9	/* Copy symbol at runtime.  */
++#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
++#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
++#define R_390_RELATIVE		12	/* Adjust by program base.  */
++#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
++#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
++#define R_390_GOT16		15	/* 16 bit GOT offset.  */
++#define R_390_PC16		16	/* PC relative 16 bit.	*/
++#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
++#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
++#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
++#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
++#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
++#define R_390_64		22	/* Direct 64 bit.  */
++#define R_390_PC64		23	/* PC relative 64 bit.	*/
++#define R_390_GOT64		24	/* 64 bit GOT offset.  */
++#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
++#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
++#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
++#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
++#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
++#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
++#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
++#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
++#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
++#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
++#define R_390_TLS_GDCALL	38	/* Tag for function call in general
++					   dynamic TLS code. */
++#define R_390_TLS_LDCALL	39	/* Tag for function call in local
++					   dynamic TLS code. */
++#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
++					   thread local data.  */
++#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
++					  thread local data.  */
++#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
++					   block offset. */
++#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
++#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
++#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
++					   block.  */
++#define R_390_20		57	/* Direct 20 bit.  */
++#define R_390_GOT20		58	/* 20 bit GOT offset.  */
++#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
++#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
++/* Keep this the last entry.  */
++#define R_390_NUM		62
++
++
++/* CRIS relocations.  */
++#define R_CRIS_NONE		0
++#define R_CRIS_8		1
++#define R_CRIS_16		2
++#define R_CRIS_32		3
++#define R_CRIS_8_PCREL		4
++#define R_CRIS_16_PCREL		5
++#define R_CRIS_32_PCREL		6
++#define R_CRIS_GNU_VTINHERIT	7
++#define R_CRIS_GNU_VTENTRY	8
++#define R_CRIS_COPY		9
++#define R_CRIS_GLOB_DAT		10
++#define R_CRIS_JUMP_SLOT	11
++#define R_CRIS_RELATIVE		12
++#define R_CRIS_16_GOT		13
++#define R_CRIS_32_GOT		14
++#define R_CRIS_16_GOTPLT	15
++#define R_CRIS_32_GOTPLT	16
++#define R_CRIS_32_GOTREL	17
++#define R_CRIS_32_PLT_GOTREL	18
++#define R_CRIS_32_PLT_PCREL	19
++
++#define R_CRIS_NUM		20
++
++
++/* AMD x86-64 relocations.  */
++#define R_X86_64_NONE		0	/* No reloc */
++#define R_X86_64_64		1	/* Direct 64 bit  */
++#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
++#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
++#define R_X86_64_PLT32		4	/* 32 bit PLT address */
++#define R_X86_64_COPY		5	/* Copy symbol at runtime */
++#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
++#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
++#define R_X86_64_RELATIVE	8	/* Adjust by program base */
++#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
++					   offset to GOT */
++#define R_X86_64_32		10	/* Direct 32 bit zero extended */
++#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
++#define R_X86_64_16		12	/* Direct 16 bit zero extended */
++#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
++#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
++#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
++#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
++#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
++#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
++#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
++					   to two GOT entries for GD symbol */
++#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
++					   to two GOT entries for LD symbol */
++#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
++#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
++					   to GOT entry for IE symbol */
++#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
++#define R_X86_64_PC64		24	/* PC relative 64 bit */
++#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
++#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
++					   offset to GOT */
++#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
++#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
++					   to GOT entry */
++#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
++#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
++#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
++					   to PLT entry */
++#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
++#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
++#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
++#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
++					   descriptor.  */
++#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
++#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
++#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
++
++#define R_X86_64_NUM		39
++
++
++/* AM33 relocations.  */
++#define R_MN10300_NONE		0	/* No reloc.  */
++#define R_MN10300_32		1	/* Direct 32 bit.  */
++#define R_MN10300_16		2	/* Direct 16 bit.  */
++#define R_MN10300_8		3	/* Direct 8 bit.  */
++#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
++#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
++#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
++#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
++#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
++#define R_MN10300_24		9	/* Direct 24 bit.  */
++#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
++#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
++#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
++#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
++#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
++#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
++#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
++#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
++#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
++#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
++#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
++#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
++
++#define R_MN10300_NUM		24
++
++
++/* M32R relocs.  */
++#define R_M32R_NONE		0	/* No reloc. */
++#define R_M32R_16		1	/* Direct 16 bit. */
++#define R_M32R_32		2	/* Direct 32 bit. */
++#define R_M32R_24		3	/* Direct 24 bit. */
++#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
++#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
++#define R_M32R_LO16		9	/* Low 16 bit. */
++#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
++#define R_M32R_GNU_VTINHERIT	11
++#define R_M32R_GNU_VTENTRY	12
++/* M32R relocs use SHT_RELA.  */
++#define R_M32R_16_RELA		33	/* Direct 16 bit. */
++#define R_M32R_32_RELA		34	/* Direct 32 bit. */
++#define R_M32R_24_RELA		35	/* Direct 24 bit. */
++#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
++#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
++#define R_M32R_LO16_RELA	41	/* Low 16 bit */
++#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
++#define R_M32R_RELA_GNU_VTINHERIT	43
++#define R_M32R_RELA_GNU_VTENTRY	44
++#define R_M32R_REL32		45	/* PC relative 32 bit.  */
++
++#define R_M32R_GOT24		48	/* 24 bit GOT entry */
++#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
++#define R_M32R_COPY		50	/* Copy symbol at runtime */
++#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
++#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
++#define R_M32R_RELATIVE		53	/* Adjust by program base */
++#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
++#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
++#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
++					   low */
++#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
++					   low */
++#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
++#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
++					   GOT with unsigned low */
++#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
++					   GOT with signed low */
++#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
++					   GOT */
++#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
++					   with unsigned low */
++#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
++					   with signed low */
++#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
++#define R_M32R_NUM		256	/* Keep this the last entry. */
++
++
++/* TILEPro relocations.  */
++#define R_TILEPRO_NONE		0	/* No reloc */
++#define R_TILEPRO_32		1	/* Direct 32 bit */
++#define R_TILEPRO_16		2	/* Direct 16 bit */
++#define R_TILEPRO_8		3	/* Direct 8 bit */
++#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
++#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
++#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
++#define R_TILEPRO_LO16		7	/* Low 16 bit */
++#define R_TILEPRO_HI16		8	/* High 16 bit */
++#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
++#define R_TILEPRO_COPY		10	/* Copy relocation */
++#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
++#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
++#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
++#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
++#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
++#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
++#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
++#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
++#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
++#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
++#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
++#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
++#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
++#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
++#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
++#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
++#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
++#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
++#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
++/* Relocs 56-59 are currently not defined.  */
++#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
++#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
++#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
++#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
++#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
++#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
++
++#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEPRO_NUM		130
++
++
++/* TILE-Gx relocations.  */
++#define R_TILEGX_NONE		0	/* No reloc */
++#define R_TILEGX_64		1	/* Direct 64 bit */
++#define R_TILEGX_32		2	/* Direct 32 bit */
++#define R_TILEGX_16		3	/* Direct 16 bit */
++#define R_TILEGX_8		4	/* Direct 8 bit */
++#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
++#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
++#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
++#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
++#define R_TILEGX_HW0		9	/* hword 0 16-bit */
++#define R_TILEGX_HW1		10	/* hword 1 16-bit */
++#define R_TILEGX_HW2		11	/* hword 2 16-bit */
++#define R_TILEGX_HW3		12	/* hword 3 16-bit */
++#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
++#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
++#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
++#define R_TILEGX_COPY		16	/* Copy relocation */
++#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
++#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
++#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
++#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
++#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
++#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
++#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
++#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
++#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
++#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
++#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
++#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
++#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
++#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
++#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
++#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
++#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
++#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
++#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
++#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
++#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
++#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
++#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
++#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
++#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
++#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
++#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
++/* Relocs 66-71 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
++#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
++/* Relocs 76-77 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
++/* Relocs 90-91 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
++/* Relocs 94-99 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
++/* Relocs 104-105 are currently not defined.  */
++#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
++#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
++#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
++#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
++#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
++
++#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEGX_NUM		130
++
++#endif	/* elf.h */
diff --git a/trunk/target/linux/generic/patches-3.18/212-byteshift_portability.patch b/trunk/target/linux/generic/patches-3.18/212-byteshift_portability.patch
new file mode 100644
index 00000000..0f23ba9b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/212-byteshift_portability.patch
@@ -0,0 +1,51 @@
+--- a/tools/include/tools/be_byteshift.h
++++ b/tools/include/tools/be_byteshift.h
+@@ -1,6 +1,10 @@
+ #ifndef _TOOLS_BE_BYTESHIFT_H
+ #define _TOOLS_BE_BYTESHIFT_H
+ 
++#ifndef __linux__
++#include "linux_types.h"
++#endif
++
+ #include <stdint.h>
+ 
+ static inline uint16_t __get_unaligned_be16(const uint8_t *p)
+--- a/tools/include/tools/le_byteshift.h
++++ b/tools/include/tools/le_byteshift.h
+@@ -1,6 +1,10 @@
+ #ifndef _TOOLS_LE_BYTESHIFT_H
+ #define _TOOLS_LE_BYTESHIFT_H
+ 
++#ifndef __linux__
++#include "linux_types.h"
++#endif
++
+ #include <stdint.h>
+ 
+ static inline uint16_t __get_unaligned_le16(const uint8_t *p)
+--- /dev/null
++++ b/tools/include/tools/linux_types.h
+@@ -0,0 +1,22 @@
++#ifndef __LINUX_TYPES_H
++#define __LINUX_TYPES_H
++
++#include <stdint.h>
++
++typedef uint8_t __u8;
++typedef uint8_t __be8;
++typedef uint8_t __le8;
++
++typedef uint16_t __u16;
++typedef uint16_t __be16;
++typedef uint16_t __le16;
++
++typedef uint32_t __u32;
++typedef uint32_t __be32;
++typedef uint32_t __le32;
++
++typedef uint64_t __u64;
++typedef uint64_t __be64;
++typedef uint64_t __le64;
++
++#endif
diff --git a/trunk/target/linux/generic/patches-3.18/220-gc_sections.patch b/trunk/target/linux/generic/patches-3.18/220-gc_sections.patch
new file mode 100644
index 00000000..db6dc18e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/220-gc_sections.patch
@@ -0,0 +1,531 @@
+From: Felix Fietkau <nbd@openwrt.org>
+
+use -ffunction-sections, -fdata-sections and --gc-sections --sort-section=name
+
+In combination with kernel symbol export stripping this significantly reduces
+the kernel image size. Used on both ARM and MIPS architectures.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -89,10 +89,14 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ #
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y			+= -msoft-float
+-LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
++LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
++endif
++
+ #
+ # pass -msoft-float to GAS if it supports it.  However on newer binutils
+ # (specifically newer than 2.24.51.20140728) we then also need to explicitly
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -67,7 +67,7 @@ SECTIONS
+ 	/* Exception table for data bus errors */
+ 	__dbe_table : {
+ 		__start___dbe_table = .;
+-		*(__dbe_table)
++		KEEP(*(__dbe_table))
+ 		__stop___dbe_table = .;
+ 	}
+ 
+@@ -112,7 +112,7 @@ SECTIONS
+ 	. = ALIGN(4);
+ 	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
+ 		__mips_machines_start = .;
+-		*(.mips.machines.init)
++		KEEP(*(.mips.machines.init))
+ 		__mips_machines_end = .;
+ 	}
+ 
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -89,7 +89,7 @@
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ #define MCOUNT_REC()	. = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__start_mcount_loc) = .; \
+-			*(__mcount_loc)				\
++			KEEP(*(__mcount_loc))			\
+ 			VMLINUX_SYMBOL(__stop_mcount_loc) = .;
+ #else
+ #define MCOUNT_REC()
+@@ -97,7 +97,7 @@
+ 
+ #ifdef CONFIG_TRACE_BRANCH_PROFILING
+ #define LIKELY_PROFILE()	VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
+-				*(_ftrace_annotated_branch)			      \
++				KEEP(*(_ftrace_annotated_branch))		      \
+ 				VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
+ #else
+ #define LIKELY_PROFILE()
+@@ -105,7 +105,7 @@
+ 
+ #ifdef CONFIG_PROFILE_ALL_BRANCHES
+ #define BRANCH_PROFILE()	VMLINUX_SYMBOL(__start_branch_profile) = .;   \
+-				*(_ftrace_branch)			      \
++				KEEP(*(_ftrace_branch))			      \
+ 				VMLINUX_SYMBOL(__stop_branch_profile) = .;
+ #else
+ #define BRANCH_PROFILE()
+@@ -114,7 +114,7 @@
+ #ifdef CONFIG_KPROBES
+ #define KPROBE_BLACKLIST()	. = ALIGN(8);				      \
+ 				VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \
+-				*(_kprobe_blacklist)			      \
++				KEEP(*(_kprobe_blacklist))		      \
+ 				VMLINUX_SYMBOL(__stop_kprobe_blacklist) = .;
+ #else
+ #define KPROBE_BLACKLIST()
+@@ -123,7 +123,7 @@
+ #ifdef CONFIG_EVENT_TRACING
+ #define FTRACE_EVENTS()	. = ALIGN(8);					\
+ 			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\
+-			*(_ftrace_events)				\
++			KEEP(*(_ftrace_events))				\
+ 			VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+ #else
+ #define FTRACE_EVENTS()
+@@ -131,7 +131,7 @@
+ 
+ #ifdef CONFIG_TRACING
+ #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .;      \
+-			 *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
++			 KEEP(*(__trace_printk_fmt)) /* Trace_printk fmt' pointer */ \
+ 			 VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
+ #define TRACEPOINT_STR() VMLINUX_SYMBOL(__start___tracepoint_str) = .;	\
+ 			 *(__tracepoint_str) /* Trace_printk fmt' pointer */ \
+@@ -144,7 +144,7 @@
+ #ifdef CONFIG_FTRACE_SYSCALLS
+ #define TRACE_SYSCALLS() . = ALIGN(8);					\
+ 			 VMLINUX_SYMBOL(__start_syscalls_metadata) = .;	\
+-			 *(__syscalls_metadata)				\
++			 KEEP(*(__syscalls_metadata))			\
+ 			 VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
+ #else
+ #define TRACE_SYSCALLS()
+@@ -158,8 +158,8 @@
+ #define _OF_TABLE_1(name)						\
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__##name##_of_table) = .;			\
+-	*(__##name##_of_table)						\
+-	*(__##name##_of_table_end)
++	KEEP(*(__##name##_of_table))					\
++	KEEP(*(__##name##_of_table_end))
+ 
+ #define CLKSRC_OF_TABLES()	OF_TABLE(CONFIG_CLKSRC_OF, clksrc)
+ #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
+@@ -171,7 +171,7 @@
+ #define KERNEL_DTB()							\
+ 	STRUCT_ALIGN();							\
+ 	VMLINUX_SYMBOL(__dtb_start) = .;				\
+-	*(.dtb.init.rodata)						\
++	KEEP(*(.dtb.init.rodata))					\
+ 	VMLINUX_SYMBOL(__dtb_end) = .;
+ 
+ /* .data section */
+@@ -187,16 +187,17 @@
+ 	/* implement dynamic printk debug */				\
+ 	. = ALIGN(8);                                                   \
+ 	VMLINUX_SYMBOL(__start___jump_table) = .;                       \
+-	*(__jump_table)                                                 \
++	KEEP(*(__jump_table))                                           \
+ 	VMLINUX_SYMBOL(__stop___jump_table) = .;                        \
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__start___verbose) = .;                          \
+-	*(__verbose)                                                    \
++	KEEP(*(__verbose))                                              \
+ 	VMLINUX_SYMBOL(__stop___verbose) = .;				\
+ 	LIKELY_PROFILE()		       				\
+ 	BRANCH_PROFILE()						\
+ 	TRACE_PRINTKS()							\
+-	TRACEPOINT_STR()
++	TRACEPOINT_STR()                                                \
++	*(.data.[a-zA-Z_]*)
+ 
+ /*
+  * Data section helpers
+@@ -250,35 +251,35 @@
+ 	/* PCI quirks */						\
+ 	.pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_early) = .;		\
+-		*(.pci_fixup_early)					\
++		KEEP(*(.pci_fixup_early))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_early) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_header) = .;		\
+-		*(.pci_fixup_header)					\
++		KEEP(*(.pci_fixup_header))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_header) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_final) = .;		\
+-		*(.pci_fixup_final)					\
++		KEEP(*(.pci_fixup_final))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_final) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;		\
+-		*(.pci_fixup_enable)					\
++		KEEP(*(.pci_fixup_enable))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;		\
+-		*(.pci_fixup_resume)					\
++		KEEP(*(.pci_fixup_resume))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;	\
+-		*(.pci_fixup_resume_early)				\
++		KEEP(*(.pci_fixup_resume_early))			\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;		\
+-		*(.pci_fixup_suspend)					\
++		KEEP(*(.pci_fixup_suspend))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .;	\
+-		*(.pci_fixup_suspend_late)				\
++		KEEP(*(.pci_fixup_suspend_late))			\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .;	\
+ 	}								\
+ 									\
+ 	/* Built-in firmware blobs */					\
+ 	.builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_builtin_fw) = .;			\
+-		*(.builtin_fw)						\
++		KEEP(*(.builtin_fw))					\
+ 		VMLINUX_SYMBOL(__end_builtin_fw) = .;			\
+ 	}								\
+ 									\
+@@ -287,49 +288,49 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		*(SORT(___ksymtab+*))					\
++		KEEP(*(SORT(___ksymtab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		*(SORT(___ksymtab_gpl+*))				\
++		KEEP(*(SORT(___ksymtab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal unused symbols */		\
+ 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
+-		*(SORT(___ksymtab_unused+*))				\
++		KEEP(*(SORT(___ksymtab_unused+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
+-		*(SORT(___ksymtab_unused_gpl+*))			\
++		KEEP(*(SORT(___ksymtab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
+-		*(SORT(___ksymtab_gpl_future+*))			\
++		KEEP(*(SORT(___ksymtab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__kcrctab         : AT(ADDR(__kcrctab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___kcrctab) = .;			\
+-		*(SORT(___kcrctab+*))					\
++		KEEP(*(SORT(___kcrctab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__kcrctab_gpl     : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl) = .;		\
+-		*(SORT(___kcrctab_gpl+*))				\
++		KEEP(*(SORT(___kcrctab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -343,14 +344,14 @@
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .;	\
+-		*(SORT(___kcrctab_unused_gpl+*))			\
++		KEEP(*(SORT(___kcrctab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .;	\
+-		*(SORT(___kcrctab_gpl_future+*))			\
++		KEEP(*(SORT(___kcrctab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .;	\
+ 	}								\
+ 									\
+@@ -369,14 +370,14 @@
+ 	/* Built-in module parameters. */				\
+ 	__param : AT(ADDR(__param) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___param) = .;			\
+-		*(__param)						\
++		KEEP(*(__param))					\
+ 		VMLINUX_SYMBOL(__stop___param) = .;			\
+ 	}								\
+ 									\
+ 	/* Built-in module versions. */					\
+ 	__modver : AT(ADDR(__modver) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___modver) = .;			\
+-		*(__modver)						\
++		KEEP(*(__modver))					\
+ 		VMLINUX_SYMBOL(__stop___modver) = .;			\
+ 		. = ALIGN((align));					\
+ 		VMLINUX_SYMBOL(__end_rodata) = .;			\
+@@ -432,7 +433,7 @@
+ #define ENTRY_TEXT							\
+ 		ALIGN_FUNCTION();					\
+ 		VMLINUX_SYMBOL(__entry_text_start) = .;			\
+-		*(.entry.text)						\
++		KEEP(*(.entry.text))					\
+ 		VMLINUX_SYMBOL(__entry_text_end) = .;
+ 
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+@@ -460,7 +461,7 @@
+ 	. = ALIGN(align);						\
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ex_table) = .;			\
+-		*(__ex_table)						\
++		KEEP(*(__ex_table))						\
+ 		VMLINUX_SYMBOL(__stop___ex_table) = .;			\
+ 	}
+ 
+@@ -476,8 +477,8 @@
+ #ifdef CONFIG_CONSTRUCTORS
+ #define KERNEL_CTORS()	. = ALIGN(8);			   \
+ 			VMLINUX_SYMBOL(__ctors_start) = .; \
+-			*(.ctors)			   \
+-			*(.init_array)			   \
++			KEEP(*(.ctors))			   \
++			KEEP(*(.init_array))		   \
+ 			VMLINUX_SYMBOL(__ctors_end) = .;
+ #else
+ #define KERNEL_CTORS()
+@@ -525,7 +526,7 @@
+ #define SBSS(sbss_align)						\
+ 	. = ALIGN(sbss_align);						\
+ 	.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {				\
+-		*(.sbss)						\
++		*(.sbss .sbss.*)					\
+ 		*(.scommon)						\
+ 	}
+ 
+@@ -543,7 +544,7 @@
+ 		BSS_FIRST_SECTIONS					\
+ 		*(.bss..page_aligned)					\
+ 		*(.dynbss)						\
+-		*(.bss)							\
++		*(.bss .bss.*)						\
+ 		*(COMMON)						\
+ 	}
+ 
+@@ -592,7 +593,7 @@
+ 	. = ALIGN(8);							\
+ 	__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___bug_table) = .;		\
+-		*(__bug_table)						\
++		KEEP(*(__bug_table))					\
+ 		VMLINUX_SYMBOL(__stop___bug_table) = .;			\
+ 	}
+ #else
+@@ -604,7 +605,7 @@
+ 	. = ALIGN(4);							\
+ 	.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__tracedata_start) = .;			\
+-		*(.tracedata)						\
++		KEEP(*(.tracedata))					\
+ 		VMLINUX_SYMBOL(__tracedata_end) = .;			\
+ 	}
+ #else
+@@ -621,17 +622,17 @@
+ #define INIT_SETUP(initsetup_align)					\
+ 		. = ALIGN(initsetup_align);				\
+ 		VMLINUX_SYMBOL(__setup_start) = .;			\
+-		*(.init.setup)						\
++		KEEP(*(.init.setup))					\
+ 		VMLINUX_SYMBOL(__setup_end) = .;
+ 
+ #define INIT_CALLS_LEVEL(level)						\
+ 		VMLINUX_SYMBOL(__initcall##level##_start) = .;		\
+-		*(.initcall##level##.init)				\
+-		*(.initcall##level##s.init)				\
++		KEEP(*(.initcall##level##.init))			\
++		KEEP(*(.initcall##level##s.init))			\
+ 
+ #define INIT_CALLS							\
+ 		VMLINUX_SYMBOL(__initcall_start) = .;			\
+-		*(.initcallearly.init)					\
++		KEEP(*(.initcallearly.init))				\
+ 		INIT_CALLS_LEVEL(0)					\
+ 		INIT_CALLS_LEVEL(1)					\
+ 		INIT_CALLS_LEVEL(2)					\
+@@ -645,21 +646,21 @@
+ 
+ #define CON_INITCALL							\
+ 		VMLINUX_SYMBOL(__con_initcall_start) = .;		\
+-		*(.con_initcall.init)					\
++		KEEP(*(.con_initcall.init))				\
+ 		VMLINUX_SYMBOL(__con_initcall_end) = .;
+ 
+ #define SECURITY_INITCALL						\
+ 		VMLINUX_SYMBOL(__security_initcall_start) = .;		\
+-		*(.security_initcall.init)				\
++		KEEP(*(.security_initcall.init))			\
+ 		VMLINUX_SYMBOL(__security_initcall_end) = .;
+ 
+ #ifdef CONFIG_BLK_DEV_INITRD
+ #define INIT_RAM_FS							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__initramfs_start) = .;				\
+-	*(.init.ramfs)							\
++	KEEP(*(.init.ramfs))						\
+ 	. = ALIGN(8);							\
+-	*(.init.ramfs.info)
++	KEEP(*(.init.ramfs.info))
+ #else
+ #define INIT_RAM_FS
+ #endif
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
+@@ -18,11 +18,16 @@ ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
+ LDFLAGS_vmlinux	+= --be8
+ LDFLAGS_MODULE	+= --be8
+ endif
++LDFLAGS_vmlinux += --gc-sections --sort-section=name
+ 
+ OBJCOPYFLAGS	:=-O binary -R .comment -S
+ GZFLAGS		:=-9
+ #KBUILD_CFLAGS	+=-pipe
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
++endif
++
+ # Never generate .eh_frame
+ KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
+ 
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -12,13 +12,13 @@
+ #define PROC_INFO							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__proc_info_begin) = .;				\
+-	*(.proc.info.init)						\
++	KEEP(*(.proc.info.init))					\
+ 	VMLINUX_SYMBOL(__proc_info_end) = .;
+ 
+ #define IDMAP_TEXT							\
+ 	ALIGN_FUNCTION();						\
+ 	VMLINUX_SYMBOL(__idmap_text_start) = .;				\
+-	*(.idmap.text)							\
++	KEEP(*(.idmap.text))						\
+ 	VMLINUX_SYMBOL(__idmap_text_end) = .;				\
+ 	. = ALIGN(32);							\
+ 	VMLINUX_SYMBOL(__hyp_idmap_text_start) = .;			\
+@@ -93,7 +93,7 @@ SECTIONS
+ 	.text : {			/* Real text segment		*/
+ 		_stext = .;		/* Text and read-only data	*/
+ 			__exception_text_start = .;
+-			*(.exception.text)
++			KEEP(*(.exception.text))
+ 			__exception_text_end = .;
+ 			IRQENTRY_TEXT
+ 			TEXT_TEXT
+@@ -118,7 +118,7 @@ SECTIONS
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+ 		__start___ex_table = .;
+ #ifdef CONFIG_MMU
+-		*(__ex_table)
++		KEEP(*(__ex_table))
+ #endif
+ 		__stop___ex_table = .;
+ 	}
+@@ -130,12 +130,12 @@ SECTIONS
+ 	. = ALIGN(8);
+ 	.ARM.unwind_idx : {
+ 		__start_unwind_idx = .;
+-		*(.ARM.exidx*)
++		KEEP(*(.ARM.exidx*))
+ 		__stop_unwind_idx = .;
+ 	}
+ 	.ARM.unwind_tab : {
+ 		__start_unwind_tab = .;
+-		*(.ARM.extab*)
++		KEEP(*(.ARM.extab*))
+ 		__stop_unwind_tab = .;
+ 	}
+ #endif
+@@ -154,14 +154,14 @@ SECTIONS
+ 	 */
+ 	__vectors_start = .;
+ 	.vectors 0 : AT(__vectors_start) {
+-		*(.vectors)
++		KEEP(*(.vectors))
+ 	}
+ 	. = __vectors_start + SIZEOF(.vectors);
+ 	__vectors_end = .;
+ 
+ 	__stubs_start = .;
+ 	.stubs 0x1000 : AT(__stubs_start) {
+-		*(.stubs)
++		KEEP(*(.stubs))
+ 	}
+ 	. = __stubs_start + SIZEOF(.stubs);
+ 	__stubs_end = .;
+@@ -175,24 +175,24 @@ SECTIONS
+ 	}
+ 	.init.arch.info : {
+ 		__arch_info_begin = .;
+-		*(.arch.info.init)
++		KEEP(*(.arch.info.init))
+ 		__arch_info_end = .;
+ 	}
+ 	.init.tagtable : {
+ 		__tagtable_begin = .;
+-		*(.taglist.init)
++		KEEP(*(.taglist.init))
+ 		__tagtable_end = .;
+ 	}
+ #ifdef CONFIG_SMP_ON_UP
+ 	.init.smpalt : {
+ 		__smpalt_begin = .;
+-		*(.alt.smp.init)
++		KEEP(*(.alt.smp.init))
+ 		__smpalt_end = .;
+ 	}
+ #endif
+ 	.init.pv_table : {
+ 		__pv_table_begin = .;
+-		*(.pv_table)
++		KEEP(*(.pv_table))
+ 		__pv_table_end = .;
+ 	}
+ 	.init.data : {
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -122,6 +122,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
+ endif
++KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
+ 
+ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)
+ asflags-y := -DZIMAGE
diff --git a/trunk/target/linux/generic/patches-3.18/221-module_exports.patch b/trunk/target/linux/generic/patches-3.18/221-module_exports.patch
new file mode 100644
index 00000000..f2cad7a0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/221-module_exports.patch
@@ -0,0 +1,88 @@
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -54,6 +54,16 @@
+ #define LOAD_OFFSET 0
+ #endif
+ 
++#ifndef SYMTAB_KEEP
++#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*)))
++#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*)))
++#endif
++
++#ifndef SYMTAB_DISCARD
++#define SYMTAB_DISCARD
++#define SYMTAB_DISCARD_GPL
++#endif
++
+ #include <linux/export.h>
+ 
+ /* Align . to a 8 byte boundary equals to maximum function alignment. */
+@@ -288,14 +298,14 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		KEEP(*(SORT(___ksymtab+*)))				\
++		SYMTAB_KEEP						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		KEEP(*(SORT(___ksymtab_gpl+*)))				\
++		SYMTAB_KEEP_GPL						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -357,7 +367,7 @@
+ 									\
+ 	/* Kernel symbol table: strings */				\
+         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
+-		*(__ksymtab_strings)					\
++		*(__ksymtab_strings+*)					\
+ 	}								\
+ 									\
+ 	/* __*init sections */						\
+@@ -679,6 +689,8 @@
+ 	EXIT_TEXT							\
+ 	EXIT_DATA							\
+ 	EXIT_CALL							\
++	SYMTAB_DISCARD							\
++	SYMTAB_DISCARD_GPL						\
+ 	*(.discard)							\
+ 	*(.discard.*)							\
+ 	}
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -298,7 +298,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
+ # Linker scripts preprocessor (.lds.S -> .lds)
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds_S = LDS     $@
+-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
++      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \
+ 	                     -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
+ 
+ $(obj)/%.lds: $(src)/%.lds.S FORCE
+--- a/include/linux/export.h
++++ b/include/linux/export.h
+@@ -52,12 +52,19 @@ extern struct module __this_module;
+ #define __CRC_SYMBOL(sym, sec)
+ #endif
+ 
++#ifdef MODULE
++#define __EXPORT_SUFFIX(sym)
++#else
++#define __EXPORT_SUFFIX(sym) "+" #sym
++#endif
++
+ /* For every exported symbol, place a struct in the __ksymtab section */
+ #define __EXPORT_SYMBOL(sym, sec)				\
+ 	extern typeof(sym) sym;					\
+ 	__CRC_SYMBOL(sym, sec)					\
+ 	static const char __kstrtab_##sym[]			\
+-	__attribute__((section("__ksymtab_strings"), aligned(1))) \
++	__attribute__((section("__ksymtab_strings"		\
++	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
+ 	= VMLINUX_SYMBOL_STR(sym);				\
+ 	extern const struct kernel_symbol __ksymtab_##sym;	\
+ 	__visible const struct kernel_symbol __ksymtab_##sym	\
diff --git a/trunk/target/linux/generic/patches-3.18/230-openwrt_lzma_options.patch b/trunk/target/linux/generic/patches-3.18/230-openwrt_lzma_options.patch
new file mode 100644
index 00000000..73978f74
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/230-openwrt_lzma_options.patch
@@ -0,0 +1,58 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -325,7 +325,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -226,7 +226,7 @@ cpio_list=
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -n -9 -f"
++compr="gzip -n -9 -f -"
+ 
+ arg="$1"
+ case "$arg" in
+@@ -242,13 +242,13 @@ case "$arg" in
+ 		output=${cpio_list}
+ 		echo "$output_file" | grep -q "\.gz$" \
+                 && [ -x "`which gzip 2> /dev/null`" ] \
+-                && compr="gzip -n -9 -f"
++                && compr="gzip -n -9 -f -"
+ 		echo "$output_file" | grep -q "\.bz2$" \
+                 && [ -x "`which bzip2 2> /dev/null`" ] \
+-                && compr="bzip2 -9 -f"
++                && compr="bzip2 -9 -f -"
+ 		echo "$output_file" | grep -q "\.lzma$" \
+                 && [ -x "`which lzma 2> /dev/null`" ] \
+-                && compr="lzma -9 -f"
++                && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
+ 		echo "$output_file" | grep -q "\.xz$" \
+                 && [ -x "`which xz 2> /dev/null`" ] \
+                 && compr="xz --check=crc32 --lzma2=dict=1MiB"
+@@ -315,7 +315,7 @@ if [ ! -z ${output_file} ]; then
+ 	if [ "${is_cpio_compressed}" = "compressed" ]; then
+ 		cat ${cpio_tfile} > ${output_file}
+ 	else
+-		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
++		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
+ 		|| (rm -f ${output_file} ; false)
+ 	fi
+ 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
+--- a/lib/decompress.c
++++ b/lib/decompress.c
+@@ -48,6 +48,7 @@ static const struct compress_format comp
+ 	{ {037, 0236}, "gzip", gunzip },
+ 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
+ 	{ {0x5d, 0x00}, "lzma", unlzma },
++	{ {0x6d, 0x00}, "lzma-librecmc", unlzma },
+ 	{ {0xfd, 0x37}, "xz", unxz },
+ 	{ {0x89, 0x4c}, "lzo", unlzo },
+ 	{ {0x02, 0x21}, "lz4", unlz4 },
diff --git a/trunk/target/linux/generic/patches-3.18/250-netfilter_depends.patch b/trunk/target/linux/generic/patches-3.18/250-netfilter_depends.patch
new file mode 100644
index 00000000..47be4a01
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/250-netfilter_depends.patch
@@ -0,0 +1,18 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -210,7 +210,6 @@ config NF_CONNTRACK_FTP
+ 
+ config NF_CONNTRACK_H323
+ 	tristate "H.323 protocol support"
+-	depends on (IPV6 || IPV6=n)
+ 	depends on NETFILTER_ADVANCED
+ 	help
+ 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
+@@ -907,7 +906,6 @@ config NETFILTER_XT_TARGET_SECMARK
+ 
+ config NETFILTER_XT_TARGET_TCPMSS
+ 	tristate '"TCPMSS" target support'
+-	depends on (IPV6 || IPV6=n)
+ 	default m if NETFILTER_ADVANCED=n
+ 	---help---
+ 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/trunk/target/linux/generic/patches-3.18/251-sound_kconfig.patch b/trunk/target/linux/generic/patches-3.18/251-sound_kconfig.patch
new file mode 100644
index 00000000..c2ebacec
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/251-sound_kconfig.patch
@@ -0,0 +1,18 @@
+--- a/sound/core/Kconfig
++++ b/sound/core/Kconfig
+@@ -10,13 +10,13 @@ config SND_DMAENGINE_PCM
+ 	tristate
+ 
+ config SND_HWDEP
+-	tristate
++	tristate "Sound hardware support"
+ 
+ config SND_RAWMIDI
+ 	tristate
+ 
+ config SND_COMPRESS_OFFLOAD
+-	tristate
++	tristate "Compression offloading support"
+ 
+ # To be effective this also requires INPUT - users should say:
+ #    select SND_JACK if INPUT=y || INPUT=SND
diff --git a/trunk/target/linux/generic/patches-3.18/252-mv_cesa_depends.patch b/trunk/target/linux/generic/patches-3.18/252-mv_cesa_depends.patch
new file mode 100644
index 00000000..fee28db1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/252-mv_cesa_depends.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
+ 	depends on PLAT_ORION
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES
++	select CRYPTO_HASH2
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_HASH
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.18/253-ssb_b43_default_on.patch b/trunk/target/linux/generic/patches-3.18/253-ssb_b43_default_on.patch
new file mode 100644
index 00000000..29d2a41a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/253-ssb_b43_default_on.patch
@@ -0,0 +1,29 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+ 	bool
+ 	depends on SSB
++	default y
+ 
+ config SSB_PCIHOST_POSSIBLE
+ 	bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
+ config SSB_B43_PCI_BRIDGE
+ 	bool
+ 	depends on SSB_PCIHOST
+-	default n
++	default y
+ 
+ config SSB_PCMCIAHOST_POSSIBLE
+ 	bool
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -17,6 +17,7 @@ config BCMA
+ config BCMA_BLOCKIO
+ 	bool
+ 	depends on BCMA
++	default y
+ 
+ config BCMA_HOST_PCI_POSSIBLE
+ 	bool
diff --git a/trunk/target/linux/generic/patches-3.18/254-textsearch_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.18/254-textsearch_kconfig_hacks.patch
new file mode 100644
index 00000000..3c3b1e1b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/254-textsearch_kconfig_hacks.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -320,16 +320,16 @@ config BCH_CONST_T
+ # Textsearch support is select'ed if needed
+ #
+ config TEXTSEARCH
+-	boolean
++	boolean	"Textsearch support"
+ 
+ config TEXTSEARCH_KMP
+-	tristate
++	tristate "Textsearch KMP"
+ 
+ config TEXTSEARCH_BM
+-	tristate
++	tristate "Textsearch BM"
+ 
+ config TEXTSEARCH_FSM
+-	tristate
++	tristate "Textsearch FSM"
+ 
+ config BTREE
+ 	boolean
diff --git a/trunk/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch
new file mode 100644
index 00000000..d8752359
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch
@@ -0,0 +1,31 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -183,7 +183,7 @@ config CFG80211_WEXT
+ 	  extensions with cfg80211-based drivers.
+ 
+ config LIB80211
+-	tristate
++	tristate "LIB80211"
+ 	default n
+ 	help
+ 	  This options enables a library of common routines used
+@@ -192,13 +192,16 @@ config LIB80211
+ 	  Drivers should select this themselves if needed.
+ 
+ config LIB80211_CRYPT_WEP
+-	tristate
++	tristate "LIB80211_CRYPT_WEP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_CCMP
+-	tristate
++	tristate "LIB80211_CRYPT_CCMP"
++	select LIB80211
+ 
+ config LIB80211_CRYPT_TKIP
+-	tristate
++	tristate "LIB80211_CRYPT_TKIP"
++	select LIB80211
+ 
+ config LIB80211_DEBUG
+ 	bool "lib80211 debugging messages"
diff --git a/trunk/target/linux/generic/patches-3.18/256-crypto_add_kconfig_prompts.patch b/trunk/target/linux/generic/patches-3.18/256-crypto_add_kconfig_prompts.patch
new file mode 100644
index 00000000..f9f6c0ea
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/256-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -32,7 +32,7 @@ config CRYPTO_FIPS
+ 	  this is.
+ 
+ config CRYPTO_ALGAPI
+-	tristate
++	tristate "ALGAPI"
+ 	select CRYPTO_ALGAPI2
+ 	help
+ 	  This option provides the API for cryptographic algorithms.
+@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
+ 	tristate
+ 
+ config CRYPTO_AEAD
+-	tristate
++	tristate "AEAD"
+ 	select CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_BLKCIPHER
+-	tristate
++	tristate "BLKCIPHER"
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
+ 	select CRYPTO_WORKQUEUE
+ 
+ config CRYPTO_HASH
+-	tristate
++	tristate "HASH"
+ 	select CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -70,7 +70,7 @@ config CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_RNG
+-	tristate
++	tristate "RNG"
+ 	select CRYPTO_RNG2
+ 	select CRYPTO_ALGAPI
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/257-wireless_ext_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.18/257-wireless_ext_kconfig_hack.patch
new file mode 100644
index 00000000..daac5898
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/257-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-	bool
++	bool "Wireless extensions"
+ 
+ config WEXT_CORE
+ 	def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+ 	depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-	bool
++	bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-	bool
++	bool "WEXT_PRIV"
+ 
+ config CFG80211
+ 	tristate "cfg80211 - wireless configuration API"
diff --git a/trunk/target/linux/generic/patches-3.18/258-netfilter_netlink_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.18/258-netfilter_netlink_kconfig_hack.patch
new file mode 100644
index 00000000..9d827c25
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/258-netfilter_netlink_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -2,7 +2,7 @@ menu "Core Netfilter Configuration"
+ 	depends on NET && INET && NETFILTER
+ 
+ config NETFILTER_NETLINK
+-	tristate
++	tristate "Netfilter NFNETLINK interface"
+ 
+ config NETFILTER_NETLINK_ACCT
+ tristate "Netfilter NFACCT over NFNETLINK interface"
diff --git a/trunk/target/linux/generic/patches-3.18/259-regmap_dynamic.patch b/trunk/target/linux/generic/patches-3.18/259-regmap_dynamic.patch
new file mode 100644
index 00000000..cf67a7df
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/259-regmap_dynamic.patch
@@ -0,0 +1,79 @@
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
+@@ -3,26 +3,31 @@
+ # subsystems should select the appropriate symbols.
+ 
+ config REGMAP
+-	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_MMIO || REGMAP_IRQ)
+ 	select LZO_COMPRESS
+ 	select LZO_DECOMPRESS
+ 	select IRQ_DOMAIN if REGMAP_IRQ
+-	bool
++	tristate "Regmap"
+ 
+ config REGMAP_I2C
+-	tristate
++	tristate "Regmap I2C"
++	select REGMAP
+ 	depends on I2C
+ 
+ config REGMAP_SPI
+-	tristate
++	tristate "Regmap SPI"
++	select REGMAP
++	depends on SPI_MASTER
+ 	depends on SPI
+ 
+ config REGMAP_SPMI
++	select REGMAP
+ 	tristate
+ 	depends on SPMI
+ 
+ config REGMAP_MMIO
++	select REGMAP
+ 	tristate
+ 
+ config REGMAP_IRQ
++	select REGMAP
+ 	bool
+--- a/include/linux/regmap.h
++++ b/include/linux/regmap.h
+@@ -49,7 +49,7 @@ struct reg_default {
+ 	unsigned int def;
+ };
+ 
+-#ifdef CONFIG_REGMAP
++#if IS_ENABLED(CONFIG_REGMAP)
+ 
+ enum regmap_endian {
+ 	/* Unspecified -> 0 -> Backwards compatible default */
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
+@@ -1,6 +1,8 @@
+-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
+-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
+-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o regcache-flat.o
++ifdef CONFIG_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/device.h>
+ #include <linux/slab.h>
+ #include <linux/export.h>
++#include <linux/module.h>
+ #include <linux/mutex.h>
+ #include <linux/err.h>
+ #include <linux/of.h>
+@@ -2635,3 +2636,5 @@ static int __init regmap_initcall(void)
+ 	return 0;
+ }
+ postcore_initcall(regmap_initcall);
++
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.18/260-crypto_test_dependencies.patch b/trunk/target/linux/generic/patches-3.18/260-crypto_test_dependencies.patch
new file mode 100644
index 00000000..8a96fd9d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/260-crypto_test_dependencies.patch
@@ -0,0 +1,37 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -96,10 +96,10 @@ config CRYPTO_MANAGER
+ 
+ config CRYPTO_MANAGER2
+ 	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+-	select CRYPTO_AEAD2
+-	select CRYPTO_HASH2
+-	select CRYPTO_BLKCIPHER2
+-	select CRYPTO_PCOMP2
++	select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
+ 
+ config CRYPTO_USER
+ 	tristate "Userspace cryptographic algorithm configuration"
+--- a/crypto/algboss.c
++++ b/crypto/algboss.c
+@@ -248,6 +248,9 @@ static int cryptomgr_schedule_test(struc
+ 	type = alg->cra_flags;
+ 
+ 	/* This piece of crap needs to disappear into per-type test hooks. */
++#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
++	type |= CRYPTO_ALG_TESTED;
++#else
+ 	if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
+ 	       CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
+ 	     ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+@@ -256,6 +259,7 @@ static int cryptomgr_schedule_test(struc
+ 	    (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
+ 	     alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
+ 		type |= CRYPTO_ALG_TESTED;
++#endif
+ 
+ 	param->type = type;
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/261-move_bcm963xx_tag.patch b/trunk/target/linux/generic/patches-3.18/261-move_bcm963xx_tag.patch
new file mode 100644
index 00000000..2a006063
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/261-move_bcm963xx_tag.patch
@@ -0,0 +1,219 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
++++ /dev/null
+@@ -1,96 +0,0 @@
+-#ifndef __BCM963XX_TAG_H
+-#define __BCM963XX_TAG_H
+-
+-#define TAGVER_LEN		4	/* Length of Tag Version */
+-#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
+-#define SIG1_LEN		20	/* Company Signature 1 Length */
+-#define SIG2_LEN		14	/* Company Signature 2 Length */
+-#define BOARDID_LEN		16	/* Length of BoardId */
+-#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
+-#define CHIPID_LEN		6	/* Chip Id Length */
+-#define IMAGE_LEN		10	/* Length of Length Field */
+-#define ADDRESS_LEN		12	/* Length of Address field */
+-#define DUALFLAG_LEN		2	/* Dual Image flag Length */
+-#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
+-#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
+-#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
+-#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
+-#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
+-#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
+-
+-#define NUM_PIRELLI		2
+-#define IMAGETAG_CRC_START	0xFFFFFFFF
+-
+-#define PIRELLI_BOARDS { \
+-	"AGPF-S0", \
+-	"DWV-S0", \
+-}
+-
+-/*
+- * The broadcom firmware assumes the rootfs starts the image,
+- * therefore uses the rootfs start (flash_image_address)
+- * to determine where to flash the image.  Since we have the kernel first
+- * we have to give it the kernel address, but the crc uses the length
+- * associated with this address (root_length), which is added to the kernel
+- * length (kernel_length) to determine the length of image to flash and thus
+- * needs to be rootfs + deadcode (jffs2 EOF marker)
+-*/
+-
+-struct bcm_tag {
+-	/* 0-3: Version of the image tag */
+-	char tag_version[TAGVER_LEN];
+-	/* 4-23: Company Line 1 */
+-	char sig_1[SIG1_LEN];
+-	/*  24-37: Company Line 2 */
+-	char sig_2[SIG2_LEN];
+-	/* 38-43: Chip this image is for */
+-	char chip_id[CHIPID_LEN];
+-	/* 44-59: Board name */
+-	char board_id[BOARDID_LEN];
+-	/* 60-61: Map endianness -- 1 BE 0 LE */
+-	char big_endian[ENDIANFLAG_LEN];
+-	/* 62-71: Total length of image */
+-	char total_length[IMAGE_LEN];
+-	/* 72-83: Address in memory of CFE */
+-	char cfe__address[ADDRESS_LEN];
+-	/* 84-93: Size of CFE */
+-	char cfe_length[IMAGE_LEN];
+-	/* 94-105: Address in memory of image start
+-	 * (kernel for libreCMC, rootfs for stock firmware)
+-	 */
+-	char flash_image_start[ADDRESS_LEN];
+-	/* 106-115: Size of rootfs */
+-	char root_length[IMAGE_LEN];
+-	/* 116-127: Address in memory of kernel */
+-	char kernel_address[ADDRESS_LEN];
+-	/* 128-137: Size of kernel */
+-	char kernel_length[IMAGE_LEN];
+-	/* 138-139: Unused at the moment */
+-	char dual_image[DUALFLAG_LEN];
+-	/* 140-141: Unused at the moment */
+-	char inactive_flag[INACTIVEFLAG_LEN];
+-	/* 142-161: RSA Signature (not used; some vendors may use this) */
+-	char rsa_signature[RSASIG_LEN];
+-	/* 162-191: Compilation and related information (not used in libreCMC) */
+-	char information1[TAGINFO1_LEN];
+-	/* 192-195: Version flash layout */
+-	char flash_layout_ver[FLASHLAYOUTVER_LEN];
+-	/* 196-199: kernel+rootfs CRC32 */
+-	__u32 fskernel_crc;
+-	/* 200-215: Unused except on Alice Gate where is is information */
+-	char information2[TAGINFO2_LEN];
+-	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
+-	__u32 image_crc;
+-	/* 220-223: CRC32 of rootfs partition */
+-	__u32 rootfs_crc;
+-	/* 224-227: CRC32 of kernel partition */
+-	__u32 kernel_crc;
+-	/* 228-235: Unused at present */
+-	char reserved1[8];
+-	/* 236-239: CRC32 of header excluding last 20 bytes */
+-	__u32 header_crc;
+-	/* 240-255: Unused at present */
+-	char reserved2[16];
+-};
+-
+-#endif /* __BCM63XX_TAG_H */
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -34,7 +34,7 @@
+ #include <linux/mtd/partitions.h>
+ 
+ #include <asm/mach-bcm63xx/bcm63xx_nvram.h>
+-#include <asm/mach-bcm63xx/bcm963xx_tag.h>
++#include <linux/bcm963xx_tag.h>
+ #include <asm/mach-bcm63xx/board_bcm963xx.h>
+ 
+ #define BCM63XX_EXTENDED_SIZE	0xBFC00000	/* Extended flash address */
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -70,6 +70,7 @@ header-y += blktrace_api.h
+ header-y += bpf.h
+ header-y += bpf_common.h
+ header-y += bpqether.h
++header-y += bcm963xx_tag.h
+ header-y += bsg.h
+ header-y += btrfs.h
+ header-y += can.h
+--- /dev/null
++++ b/include/uapi/linux/bcm963xx_tag.h
+@@ -0,0 +1,96 @@
++#ifndef __BCM963XX_TAG_H
++#define __BCM963XX_TAG_H
++
++#define TAGVER_LEN		4	/* Length of Tag Version */
++#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
++#define SIG1_LEN		20	/* Company Signature 1 Length */
++#define SIG2_LEN		14	/* Company Signature 2 Length */
++#define BOARDID_LEN		16	/* Length of BoardId */
++#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
++#define CHIPID_LEN		6	/* Chip Id Length */
++#define IMAGE_LEN		10	/* Length of Length Field */
++#define ADDRESS_LEN		12	/* Length of Address field */
++#define DUALFLAG_LEN		2	/* Dual Image flag Length */
++#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
++#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
++#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
++#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
++#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
++#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
++
++#define NUM_PIRELLI		2
++#define IMAGETAG_CRC_START	0xFFFFFFFF
++
++#define PIRELLI_BOARDS { \
++	"AGPF-S0", \
++	"DWV-S0", \
++}
++
++/*
++ * The broadcom firmware assumes the rootfs starts the image,
++ * therefore uses the rootfs start (flash_image_address)
++ * to determine where to flash the image.  Since we have the kernel first
++ * we have to give it the kernel address, but the crc uses the length
++ * associated with this address (root_length), which is added to the kernel
++ * length (kernel_length) to determine the length of image to flash and thus
++ * needs to be rootfs + deadcode (jffs2 EOF marker)
++*/
++
++struct bcm_tag {
++	/* 0-3: Version of the image tag */
++	char tag_version[TAGVER_LEN];
++	/* 4-23: Company Line 1 */
++	char sig_1[SIG1_LEN];
++	/*  24-37: Company Line 2 */
++	char sig_2[SIG2_LEN];
++	/* 38-43: Chip this image is for */
++	char chip_id[CHIPID_LEN];
++	/* 44-59: Board name */
++	char board_id[BOARDID_LEN];
++	/* 60-61: Map endianness -- 1 BE 0 LE */
++	char big_endian[ENDIANFLAG_LEN];
++	/* 62-71: Total length of image */
++	char total_length[IMAGE_LEN];
++	/* 72-83: Address in memory of CFE */
++	char cfe__address[ADDRESS_LEN];
++	/* 84-93: Size of CFE */
++	char cfe_length[IMAGE_LEN];
++	/* 94-105: Address in memory of image start
++	 * (kernel for libreCMC, rootfs for stock firmware)
++	 */
++	char flash_image_start[ADDRESS_LEN];
++	/* 106-115: Size of rootfs */
++	char root_length[IMAGE_LEN];
++	/* 116-127: Address in memory of kernel */
++	char kernel_address[ADDRESS_LEN];
++	/* 128-137: Size of kernel */
++	char kernel_length[IMAGE_LEN];
++	/* 138-139: Unused at the moment */
++	char dual_image[DUALFLAG_LEN];
++	/* 140-141: Unused at the moment */
++	char inactive_flag[INACTIVEFLAG_LEN];
++	/* 142-161: RSA Signature (not used; some vendors may use this) */
++	char rsa_signature[RSASIG_LEN];
++	/* 162-191: Compilation and related information (not used in libreCMC) */
++	char information1[TAGINFO1_LEN];
++	/* 192-195: Version flash layout */
++	char flash_layout_ver[FLASHLAYOUTVER_LEN];
++	/* 196-199: kernel+rootfs CRC32 */
++	__u32 fskernel_crc;
++	/* 200-215: Unused except on Alice Gate where is is information */
++	char information2[TAGINFO2_LEN];
++	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
++	__u32 image_crc;
++	/* 220-223: CRC32 of rootfs partition */
++	__u32 rootfs_crc;
++	/* 224-227: CRC32 of kernel partition */
++	__u32 kernel_crc;
++	/* 228-235: Unused at present */
++	char reserved1[8];
++	/* 236-239: CRC32 of header excluding last 20 bytes */
++	__u32 header_crc;
++	/* 240-255: Unused at present */
++	char reserved2[16];
++};
++
++#endif /* __BCM63XX_TAG_H */
diff --git a/trunk/target/linux/generic/patches-3.18/262-compressor_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.18/262-compressor_kconfig_hack.patch
new file mode 100644
index 00000000..a24405d5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/262-compressor_kconfig_hack.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -205,16 +205,16 @@ config RANDOM32_SELFTEST
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++	tristate "ZLIB inflate support"
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "ZLIB deflate support"
+ 
+ config LZO_COMPRESS
+-	tristate
++	tristate "LZO compress support"
+ 
+ config LZO_DECOMPRESS
+-	tristate
++	tristate "LZO decompress support"
+ 
+ config LZ4_COMPRESS
+ 	tristate
diff --git a/trunk/target/linux/generic/patches-3.18/300-mips_expose_boot_raw.patch b/trunk/target/linux/generic/patches-3.18/300-mips_expose_boot_raw.patch
new file mode 100644
index 00000000..69d61f20
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/300-mips_expose_boot_raw.patch
@@ -0,0 +1,39 @@
+From: Mark Miller <mark@mirell.org>
+
+This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
+certain Broadcom chipsets running CFE in order to load the kernel.
+
+Signed-off-by: Mark Miller <mark@mirell.org>
+Acked-by: Rob Landley <rob@landley.net>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -892,9 +892,6 @@ config FW_ARC
+ config ARCH_MAY_HAVE_PC_FDC
+ 	bool
+ 
+-config BOOT_RAW
+-	bool
+-
+ config CEVT_BCM1480
+ 	bool
+ 
+@@ -2503,6 +2500,18 @@ config USE_OF
+ config BUILTIN_DTB
+ 	bool
+ 
++config BOOT_RAW
++	bool "Enable the kernel to be executed from the load address"
++	default n
++	help
++	 Allow the kernel to be executed from the load address for
++	 bootloaders which cannot read the ELF format. This places
++	 a jump to start_kernel at the load address.
++
++	 If unsure, say N.
++
++
++
+ endmenu
+ 
+ config LOCKDEP_SUPPORT
diff --git a/trunk/target/linux/generic/patches-3.18/301-mips_image_cmdline_hack.patch b/trunk/target/linux/generic/patches-3.18/301-mips_image_cmdline_hack.patch
new file mode 100644
index 00000000..2282749a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/301-mips_image_cmdline_hack.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -988,6 +988,10 @@ config SYNC_R4K
+ config MIPS_MACHINE
+ 	def_bool n
+ 
++config IMAGE_CMDLINE_HACK
++	bool "libreCMC specific image command line hack"
++	default n
++
+ config NO_IOPORT_MAP
+ 	def_bool n
+ 
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -80,6 +80,12 @@ FEXPORT(__kernel_entry)
+ 	j	kernel_entry
+ #endif
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++	.ascii	"CMDLINE:"
++EXPORT(__image_cmdline)
++	.fill	0x400
++#endif /* CONFIG_IMAGE_CMDLINE_HACK */
++
+ 	__REF
+ 
+ NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/trunk/target/linux/generic/patches-3.18/302-mips_no_branch_likely.patch b/trunk/target/linux/generic/patches-3.18/302-mips_no_branch_likely.patch
new file mode 100644
index 00000000..19adcb80
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/302-mips_no_branch_likely.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -87,7 +87,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ # machines may also.  Since BFD is incredibly buggy with respect to
+ # crossformat linking we rely on the elf2ecoff tool for format conversion.
+ #
+-cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
++cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
diff --git a/trunk/target/linux/generic/patches-3.18/304-mips_disable_fpu.patch b/trunk/target/linux/generic/patches-3.18/304-mips_disable_fpu.patch
new file mode 100644
index 00000000..ae742dc3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/304-mips_disable_fpu.patch
@@ -0,0 +1,105 @@
+From:   Manuel Lauss <manuel.lauss@gmail.com>
+Subject: [RFC PATCH v4 2/2] MIPS: make FPU emulator optional
+Date:   Mon,  7 Apr 2014 12:57:04 +0200
+Message-Id: <1396868224-252888-2-git-send-email-manuel.lauss@gmail.com>
+
+This small patch makes the MIPS FPU emulator optional. The kernel
+kills float-users on systems without a hardware FPU by sending a SIGILL.
+
+Disabling the emulator shrinks vmlinux by about 54kBytes (32bit,
+optimizing for size).
+
+Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
+---
+v4: rediffed because of patch 1/2, should now work with micromips as well
+v3: updated patch description with size savings.
+v2: incorporated changes suggested by Jonas Gorski
+    force the fpu emulator on for micromips: relocating the parts
+    of the mmips code in the emulator to other areas would be a
+    much larger change; I went the cheap route instead with this.
+
+ arch/mips/Kbuild                     |  2 +-
+ arch/mips/Kconfig                    | 14 ++++++++++++++
+ arch/mips/include/asm/fpu.h          |  5 +++--
+ arch/mips/include/asm/fpu_emulator.h | 15 +++++++++++++++
+ 4 files changed, 33 insertions(+), 3 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -2495,6 +2495,20 @@ config MIPS_O32_FP64_SUPPORT
+ 
+ 	  If unsure, say N.
+ 
++config MIPS_FPU_EMULATOR
++	bool "MIPS FPU Emulator"
++	default y
++	help
++	  This option lets you disable the built-in MIPS FPU (Coprocessor 1)
++	  emulator, which handles floating-point instructions on processors
++	  without a hardware FPU.  It is generally a good idea to keep the
++	  emulator built-in, unless you are perfectly sure you have a
++	  complete soft-float environment.  With the emulator disabled, all
++	  users of float operations will be killed with an illegal instr-
++	  uction exception.
++
++	  Say Y, please.
++
+ config USE_OF
+ 	bool
+ 	select OF
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -275,7 +275,7 @@ OBJCOPYFLAGS		+= --remove-section=.regin
+ head-y := arch/mips/kernel/head.o
+ 
+ libs-y			+= arch/mips/lib/
+-libs-y			+= arch/mips/math-emu/
++libs-$(CONFIG_MIPS_FPU_EMULATOR)	+= arch/mips/math-emu/
+ 
+ # See arch/mips/Kbuild for content of core part of the kernel
+ core-y += arch/mips/
+--- a/arch/mips/include/asm/fpu.h
++++ b/arch/mips/include/asm/fpu.h
+@@ -168,8 +168,10 @@ static inline int init_fpu(void)
+ 		ret = __own_fpu();
+ 		if (!ret)
+ 			_init_fpu();
+-	} else
++	} else if (IS_ENABLED(CONFIG_MIPS_FPU_EMULATOR))
+ 		fpu_emulator_init_fpu();
++	else
++		ret = SIGILL;
+ 
+ 	return ret;
+ }
+--- a/arch/mips/include/asm/fpu_emulator.h
++++ b/arch/mips/include/asm/fpu_emulator.h
+@@ -30,6 +30,7 @@
+ #include <asm/local.h>
+ #include <asm/processor.h>
+ 
++#ifdef CONFIG_MIPS_FPU_EMULATOR
+ #ifdef CONFIG_DEBUG_FS
+ 
+ struct mips_fpu_emulator_stats {
+@@ -65,6 +66,20 @@ extern int do_dsemulret(struct pt_regs *
+ extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
+ 				    struct mips_fpu_struct *ctx, int has_fpu,
+ 				    void *__user *fault_addr);
++#else	/* no CONFIG_MIPS_FPU_EMULATOR */
++static inline int do_dsemulret(struct pt_regs *xcp)
++{
++	return 0;	/* 0 means error, should never get here anyway */
++}
++
++static inline int fpu_emulator_cop1Handler(struct pt_regs *xcp,
++				struct mips_fpu_struct *ctx, int has_fpu,
++				void *__user *fault_addr)
++{
++	return SIGILL;	/* we don't speak MIPS FPU */
++}
++#endif	/* CONFIG_MIPS_FPU_EMULATOR */
++
+ int process_fpemu_return(int sig, void __user *fault_addr);
+ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
+ 		     unsigned long *contpc);
diff --git a/trunk/target/linux/generic/patches-3.18/305-mips_module_reloc.patch b/trunk/target/linux/generic/patches-3.18/305-mips_module_reloc.patch
new file mode 100644
index 00000000..2e92916f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/305-mips_module_reloc.patch
@@ -0,0 +1,352 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
++ifdef CONFIG_64BIT
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
++else
++KBUILD_AFLAGS_MODULE		+= -mno-long-calls
++KBUILD_CFLAGS_MODULE		+= -mno-long-calls
++endif
+ 
+ ifndef CONFIG_FUNCTION_TRACER
+ KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -11,6 +11,11 @@ struct mod_arch_specific {
+ 	const struct exception_table_entry *dbe_start;
+ 	const struct exception_table_entry *dbe_end;
+ 	struct mips_hi16 *r_mips_hi16_list;
++
++	void *phys_plt_tbl;
++	void *virt_plt_tbl;
++	unsigned int phys_plt_offset;
++	unsigned int virt_plt_offset;
+ };
+ 
+ typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -43,14 +43,222 @@ struct mips_hi16 {
+ static LIST_HEAD(dbe_list);
+ static DEFINE_SPINLOCK(dbe_lock);
+ 
+-#ifdef MODULE_START
++/*
++ * Get the potential max trampolines size required of the init and
++ * non-init sections. Only used if we cannot find enough contiguous
++ * physically mapped memory to put the module into.
++ */
++static unsigned int
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
++             const char *secstrings, unsigned int symindex, bool is_init)
++{
++	unsigned long ret = 0;
++	unsigned int i, j;
++	Elf_Sym *syms;
++
++	/* Everything marked ALLOC (this includes the exported symbols) */
++	for (i = 1; i < hdr->e_shnum; ++i) {
++		unsigned int info = sechdrs[i].sh_info;
++
++		if (sechdrs[i].sh_type != SHT_REL
++		    && sechdrs[i].sh_type != SHT_RELA)
++			continue;
++
++		/* Not a valid relocation section? */
++		if (info >= hdr->e_shnum)
++			continue;
++
++		/* Don't bother with non-allocated sections */
++		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
++			continue;
++
++		/* If it's called *.init*, and we're not init, we're
++                   not interested */
++		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
++		    != is_init)
++			continue;
++
++		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
++		if (sechdrs[i].sh_type == SHT_REL) {
++			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rel[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		} else {
++			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rela[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		}
++	}
++
++	return ret;
++}
++
++#ifndef MODULE_START
++static void *alloc_phys(unsigned long size)
++{
++	unsigned order;
++	struct page *page;
++	struct page *p;
++
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
++
++	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
++			__GFP_THISNODE, order);
++	if (!page)
++		return NULL;
++
++	split_page(page, order);
++
++	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
++		__free_page(p);
++
++	return page_address(page);
++}
++#endif
++
++static void free_phys(void *ptr, unsigned long size)
++{
++	struct page *page;
++	struct page *end;
++
++	page = virt_to_page(ptr);
++	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
++
++	for (; page < end; ++page)
++		__free_page(page);
++}
++
++
+ void *module_alloc(unsigned long size)
+ {
++#ifdef MODULE_START
+ 	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+ 				GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
+ 				__builtin_return_address(0));
++#else
++	void *ptr;
++
++	if (size == 0)
++		return NULL;
++
++	ptr = alloc_phys(size);
++
++	/* If we failed to allocate physically contiguous memory,
++	 * fall back to regular vmalloc. The module loader code will
++	 * create jump tables to handle long jumps */
++	if (!ptr)
++		return vmalloc(size);
++
++	return ptr;
++#endif
+ }
++
++static inline bool is_phys_addr(void *ptr)
++{
++#ifdef CONFIG_64BIT
++	return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else
++	return (KSEGX(ptr) == KSEG0);
+ #endif
++}
++
++/* Free memory returned from module_alloc */
++void module_free(struct module *mod, void *module_region)
++{
++	if (is_phys_addr(module_region)) {
++		if (mod->module_init == module_region)
++			free_phys(module_region, mod->init_size);
++		else if (mod->module_core == module_region)
++			free_phys(module_region, mod->core_size);
++		else
++			BUG();
++	} else {
++		vfree(module_region);
++	}
++}
++
++static void *__module_alloc(int size, bool phys)
++{
++	void *ptr;
++
++	if (phys)
++		ptr = kmalloc(size, GFP_KERNEL);
++	else
++		ptr = vmalloc(size);
++	return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++	if (is_phys_addr(ptr))
++		kfree(ptr);
++	else
++		vfree(ptr);
++}
++
++int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
++			      char *secstrings, struct module *mod)
++{
++	unsigned int symindex = 0;
++	unsigned int core_size, init_size;
++	int i;
++
++	mod->arch.phys_plt_offset = 0;
++	mod->arch.virt_plt_offset = 0;
++	mod->arch.phys_plt_tbl = NULL;
++	mod->arch.virt_plt_tbl = NULL;
++
++	if (IS_ENABLED(CONFIG_64BIT))
++		return 0;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (sechdrs[i].sh_type == SHT_SYMTAB)
++			symindex = i;
++
++	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
++	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
++
++	if ((core_size + init_size) == 0)
++		return 0;
++
++	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++	if (!mod->arch.phys_plt_tbl)
++		return -ENOMEM;
++
++	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++	if (!mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++		return -ENOMEM;
++	}
++
++	return 0;
++}
+ 
+ int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+ {
+@@ -64,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo
+ 	return 0;
+ }
+ 
++static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
++				 void *start, Elf_Addr v)
++{
++	unsigned *tramp = start + *plt_offset;
++	*plt_offset += 4 * sizeof(int);
++
++	/* adjust carry for addiu */
++	if (v & 0x00008000)
++		v += 0x10000;
++
++	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
++	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
++	tramp[2] = 0x03200008;                  /* jr t9 */
++	tramp[3] = 0x00000000;                  /* nop */
++
++	return (Elf_Addr) tramp;
++}
++
++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++	if (is_phys_addr(location))
++		return add_plt_entry_to(&me->arch.phys_plt_offset,
++				me->arch.phys_plt_tbl, v);
++	else
++		return add_plt_entry_to(&me->arch.virt_plt_offset,
++				me->arch.virt_plt_tbl, v);
++
++}
++
+ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
+ {
++	u32 ofs = *location & 0x03ffffff;
++
+ 	if (v % 4) {
+ 		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
+ 		       me->name);
+@@ -73,14 +312,17 @@ static int apply_r_mips_26_rel(struct mo
+ 	}
+ 
+ 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-		printk(KERN_ERR
+-		       "module %s: relocation overflow\n",
+-		       me->name);
+-		return -ENOEXEC;
++		v = add_plt_entry(me, location, v + (ofs << 2));
++		if (!v) {
++			printk(KERN_ERR
++				"module %s: relocation overflow\n", me->name);
++			return -ENOEXEC;
++		}
++		ofs = 0;
+ 	}
+ 
+ 	*location = (*location & ~0x03ffffff) |
+-		    ((*location + (v >> 2)) & 0x03ffffff);
++		    ((ofs + (v >> 2)) & 0x03ffffff);
+ 
+ 	return 0;
+ }
+@@ -287,11 +529,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		list_add(&me->arch.dbe_list, &dbe_list);
+ 		spin_unlock_irq(&dbe_lock);
+ 	}
++
++	/* Get rid of the fixup trampoline if we're running the module
++	 * from physically mapped address space */
++	if (me->arch.phys_plt_offset == 0) {
++		__module_free(me->arch.phys_plt_tbl);
++		me->arch.phys_plt_tbl = NULL;
++	}
++	if (me->arch.virt_plt_offset == 0) {
++		__module_free(me->arch.virt_plt_tbl);
++		me->arch.virt_plt_tbl = NULL;
++	}
++
+ 	return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++	if (mod->arch.phys_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++	}
++	if (mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.virt_plt_tbl);
++		mod->arch.virt_plt_tbl = NULL;
++	}
++
+ 	spin_lock_irq(&dbe_lock);
+ 	list_del(&mod->arch.dbe_list);
+ 	spin_unlock_irq(&dbe_lock);
diff --git a/trunk/target/linux/generic/patches-3.18/306-mips_mem_functions_performance.patch b/trunk/target/linux/generic/patches-3.18/306-mips_mem_functions_performance.patch
new file mode 100644
index 00000000..98186774
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/306-mips_mem_functions_performance.patch
@@ -0,0 +1,83 @@
+--- a/arch/mips/include/asm/string.h
++++ b/arch/mips/include/asm/string.h
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+ 
+ #define __HAVE_ARCH_MEMSET
+ extern void *memset(void *__s, int __c, size_t __count);
++#define memset(__s, __c, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memset((__s), (__c), __len);		\
++	else							\
++		__ret = __builtin_memset((__s), (__c), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMCPY
+ extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
++#define memcpy(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memcpy((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memcpy((dst), (src), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMMOVE
+ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
++#define memmove(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memmove((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memmove((dst), (src), __len);	\
++	__ret;							\
++})
++
++#define __HAVE_ARCH_MEMCMP
++#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
+ 
+ #endif /* _ASM_STRING_H */
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
+@@ -4,7 +4,7 @@
+ 
+ lib-y	+= bitops.o csum_partial.o delay.o memcpy.o memset.o \
+ 	   mips-atomic.o strlen_user.o strncpy_user.o \
+-	   strnlen_user.o uncached.o
++	   strnlen_user.o uncached.o memcmp.o
+ 
+ obj-y			+= iomap.o
+ obj-$(CONFIG_PCI)	+= iomap-pci.o
+--- /dev/null
++++ b/arch/mips/lib/memcmp.c
+@@ -0,0 +1,22 @@
++/*
++ *  copied from linux/lib/string.c
++ *
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
++
++#include <linux/module.h>
++#include <linux/string.h>
++
++#undef memcmp
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++	const unsigned char *su1, *su2;
++	int res = 0;
++
++	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
++		if ((res = *su1 - *su2) != 0)
++			break;
++	return res;
++}
++EXPORT_SYMBOL(memcmp);
++
diff --git a/trunk/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch b/trunk/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch
new file mode 100644
index 00000000..934b1198
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void);
+ 
+ void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size);
+ EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
++EXPORT_SYMBOL(__flush_cache_all);
+ void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);
+ 
+ /* MIPS specific cache operations */
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -20,6 +20,9 @@
+ #include <linux/swap.h>
+ #include <linux/splice.h>
+ #include <linux/aio.h>
++#ifdef CONFIG_MIPS
++#include <asm/cacheflush.h>
++#endif
+ 
+ MODULE_ALIAS_MISCDEV(FUSE_MINOR);
+ MODULE_ALIAS("devname:fuse");
+@@ -749,6 +752,9 @@ static int fuse_copy_fill(struct fuse_co
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
++#ifdef CONFIG_MIPS
++	__flush_cache_all();
++#endif
+ 	if (val) {
+ 		void *pgaddr = kmap_atomic(cs->pg);
+ 		void *buf = pgaddr + cs->offset;
diff --git a/trunk/target/linux/generic/patches-3.18/310-arm_module_unresolved_weak_sym.patch b/trunk/target/linux/generic/patches-3.18/310-arm_module_unresolved_weak_sym.patch
new file mode 100644
index 00000000..9210c1d2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/310-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -83,6 +83,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+ 			return -ENOEXEC;
+ 		}
+ 
++		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
++			continue;
++
+ 		loc = dstsec->sh_addr + rel->r_offset;
+ 
+ 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/trunk/target/linux/generic/patches-3.18/320-ppc4xx_optimization.patch b/trunk/target/linux/generic/patches-3.18/320-ppc4xx_optimization.patch
new file mode 100644
index 00000000..8673de4d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/320-ppc4xx_optimization.patch
@@ -0,0 +1,31 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -203,7 +203,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS		+= -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++cpu-as-$(CONFIG_40x)		+= -Wa,-m405
++cpu-as-$(CONFIG_44x)		+= -Wa,-m440
+ cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec
+ cpu-as-$(CONFIG_E200)		+= -Wa,-me200
+ 
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -45,10 +45,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
+ DTC_FLAGS	?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
diff --git a/trunk/target/linux/generic/patches-3.18/321-powerpc_crtsavres_prereq.patch b/trunk/target/linux/generic/patches-3.18/321-powerpc_crtsavres_prereq.patch
new file mode 100644
index 00000000..ab6ea7be
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/321-powerpc_crtsavres_prereq.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -165,7 +165,6 @@ CPP		= $(CC) -E $(KBUILD_CFLAGS)
+ 
+ CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
+ 
+-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
+ 
+ ifeq ($(CONFIG_476FPE_ERR46),y)
+ 	KBUILD_LDFLAGS_MODULE += --ppc476-workaround \
diff --git a/trunk/target/linux/generic/patches-3.18/400-mtd-add-rootfs-split-support.patch b/trunk/target/linux/generic/patches-3.18/400-mtd-add-rootfs-split-support.patch
new file mode 100644
index 00000000..0d18c687
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/400-mtd-add-rootfs-split-support.patch
@@ -0,0 +1,215 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -12,6 +12,28 @@ menuconfig MTD
+ 
+ if MTD
+ 
++menu "libreCMC specific MTD options"
++
++config MTD_ROOTFS_ROOT_DEV
++	bool "Automatically set 'rootfs' partition to be root filesystem"
++	default y
++
++config MTD_SPLIT_FIRMWARE
++	bool "Automatically split firmware partition for kernel+rootfs"
++	default y
++
++config MTD_SPLIT_FIRMWARE_NAME
++	string "Firmware partition name"
++	depends on MTD_SPLIT_FIRMWARE
++	default "firmware"
++
++config MTD_UIMAGE_SPLIT
++	bool "Enable split support for firmware partitions containing a uImage"
++	depends on MTD_SPLIT_FIRMWARE
++	default y
++
++endmenu
++
+ config MTD_TESTS
+ 	tristate "MTD tests support (DANGEROUS)"
+ 	depends on m
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -29,9 +29,11 @@
+ #include <linux/kmod.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/magic.h>
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
++#include "mtdsplit.h"
+ 
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+@@ -45,13 +47,14 @@ struct mtd_part {
+ 	struct list_head list;
+ };
+ 
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part);
++
+ /*
+  * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
+  * the pointer to that structure with this macro.
+  */
+ #define PART(x)  ((struct mtd_part *)(x))
+ 
+-
+ /*
+  * MTD methods which simply translate the effective address and pass through
+  * to the _real_ device.
+@@ -547,8 +550,10 @@ out_register:
+ 	return slave;
+ }
+ 
+-int mtd_add_partition(struct mtd_info *master, const char *name,
+-		      long long offset, long long length)
++
++static int
++__mtd_add_partition(struct mtd_info *master, const char *name,
++		    long long offset, long long length, bool dup_check)
+ {
+ 	struct mtd_partition part;
+ 	struct mtd_part *p, *new;
+@@ -580,21 +585,24 @@ int mtd_add_partition(struct mtd_info *m
+ 	end = offset + length;
+ 
+ 	mutex_lock(&mtd_partitions_mutex);
+-	list_for_each_entry(p, &mtd_partitions, list)
+-		if (p->master == master) {
+-			if ((start >= p->offset) &&
+-			    (start < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-
+-			if ((end >= p->offset) &&
+-			    (end < (p->offset + p->mtd.size)))
+-				goto err_inv;
+-		}
++	if (dup_check) {
++		list_for_each_entry(p, &mtd_partitions, list)
++			if (p->master == master) {
++				if ((start >= p->offset) &&
++				    (start < (p->offset + p->mtd.size)))
++					goto err_inv;
++
++				if ((end >= p->offset) &&
++				    (end < (p->offset + p->mtd.size)))
++					goto err_inv;
++			}
++	}
+ 
+ 	list_add(&new->list, &mtd_partitions);
+ 	mutex_unlock(&mtd_partitions_mutex);
+ 
+ 	add_mtd_device(&new->mtd);
++	mtd_partition_split(master, new);
+ 
+ 	return ret;
+ err_inv:
+@@ -604,6 +612,12 @@ err_inv:
+ }
+ EXPORT_SYMBOL_GPL(mtd_add_partition);
+ 
++int mtd_add_partition(struct mtd_info *master, const char *name,
++		      long long offset, long long length)
++{
++	return __mtd_add_partition(master, name, offset, length, true);
++}
++
+ int mtd_del_partition(struct mtd_info *master, int partno)
+ {
+ 	struct mtd_part *slave, *next;
+@@ -627,6 +641,74 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static inline unsigned long
++mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
++{
++	unsigned long mask = mtd->erasesize - 1;
++
++	len += offset & mask;
++	len = (len + mask) & ~mask;
++	len -= offset & mask;
++	return len;
++}
++
++#define UBOOT_MAGIC	0x27051956
++
++static void split_uimage(struct mtd_info *master, struct mtd_part *part)
++{
++	struct {
++		__be32 magic;
++		__be32 pad[2];
++		__be32 size;
++	} hdr;
++	size_t len;
++
++	if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr))
++		return;
++
++	if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC))
++		return;
++
++	len = be32_to_cpu(hdr.size) + 0x40;
++	len = mtd_pad_erasesize(master, part->offset, len);
++	if (len + master->erasesize > part->mtd.size)
++		return;
++
++	__mtd_add_partition(master, "rootfs", part->offset + len,
++			    part->mtd.size - len, false);
++}
++
++#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#define SPLIT_FIRMWARE_NAME	CONFIG_MTD_SPLIT_FIRMWARE_NAME
++#else
++#define SPLIT_FIRMWARE_NAME	"unused"
++#endif
++
++static void split_firmware(struct mtd_info *master, struct mtd_part *part)
++{
++	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
++		split_uimage(master, part);
++}
++
++void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
++                                int offset, int size)
++{
++}
++
++static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
++{
++	static int rootfs_found = 0;
++
++	if (rootfs_found)
++		return;
++
++	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
++	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
++		split_firmware(master, part);
++
++	arch_split_mtd_part(master, part->mtd.name, part->offset,
++			    part->mtd.size);
++}
+ /*
+  * This function, given a master MTD object and a partition table, creates
+  * and registers slave MTD objects which are bound to the master according to
+@@ -656,6 +738,7 @@ int add_mtd_partitions(struct mtd_info *
+ 		mutex_unlock(&mtd_partitions_mutex);
+ 
+ 		add_mtd_device(&slave->mtd);
++		mtd_partition_split(master, slave);
+ 
+ 		cur_offset = slave->offset + slave->mtd.size;
+ 	}
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -84,5 +84,7 @@ int mtd_add_partition(struct mtd_info *m
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
++extern void __weak arch_split_mtd_part(struct mtd_info *master,
++				       const char *name, int offset, int size);
+ 
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.18/401-mtd-add-support-for-different-partition-parser-types.patch b/trunk/target/linux/generic/patches-3.18/401-mtd-add-support-for-different-partition-parser-types.patch
new file mode 100644
index 00000000..41024539
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -0,0 +1,113 @@
+From 02cff0ccaa6d364f5c1eeea83f47ac80ccc967d4 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Tue, 3 Sep 2013 18:11:50 +0200
+Subject: [PATCH] mtd: add support for different partition parser types
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/mtdpart.c          |   56 ++++++++++++++++++++++++++++++++++++++++
+ include/linux/mtd/partitions.h |   11 ++++++++
+ 2 files changed, 67 insertions(+)
+
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -768,6 +768,30 @@ static struct mtd_part_parser *get_parti
+ 
+ #define put_partition_parser(p) do { module_put((p)->owner); } while (0)
+ 
++static struct mtd_part_parser *
++get_partition_parser_by_type(enum mtd_parser_type type,
++			     struct mtd_part_parser *start)
++{
++	struct mtd_part_parser *p, *ret = NULL;
++
++	spin_lock(&part_parser_lock);
++
++	p = list_prepare_entry(start, &part_parsers, list);
++	if (start)
++		put_partition_parser(start);
++
++	list_for_each_entry_continue(p, &part_parsers, list) {
++		if (p->type == type && try_module_get(p->owner)) {
++			ret = p;
++			break;
++		}
++	}
++
++	spin_unlock(&part_parser_lock);
++
++	return ret;
++}
++
+ void register_mtd_parser(struct mtd_part_parser *p)
+ {
+ 	spin_lock(&part_parser_lock);
+@@ -841,6 +865,38 @@ int parse_mtd_partitions(struct mtd_info
+ 	return ret;
+ }
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data)
++{
++	struct mtd_part_parser *prev = NULL;
++	int ret = 0;
++
++	while (1) {
++		struct mtd_part_parser *parser;
++
++		parser = get_partition_parser_by_type(type, prev);
++		if (!parser)
++			break;
++
++		ret = (*parser->parse_fn)(master, pparts, data);
++
++		if (ret > 0) {
++			put_partition_parser(parser);
++			printk(KERN_NOTICE
++			       "%d %s partitions found on MTD device %s\n",
++			       ret, parser->name, master->name);
++			break;
++		}
++
++		prev = parser;
++	}
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(parse_mtd_partitions_by_type);
++
+ int mtd_is_partition(const struct mtd_info *mtd)
+ {
+ 	struct mtd_part *part;
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -68,12 +68,17 @@ struct mtd_part_parser_data {
+  * Functions dealing with the various ways of partitioning the space
+  */
+ 
++enum mtd_parser_type {
++	MTD_PARSER_TYPE_DEVICE = 0,
++};
++
+ struct mtd_part_parser {
+ 	struct list_head list;
+ 	struct module *owner;
+ 	const char *name;
+ 	int (*parse_fn)(struct mtd_info *, struct mtd_partition **,
+ 			struct mtd_part_parser_data *);
++	enum mtd_parser_type type;
+ };
+ 
+ extern void register_mtd_parser(struct mtd_part_parser *parser);
+@@ -87,4 +92,9 @@ uint64_t mtd_get_device_size(const struc
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+ 
++int parse_mtd_partitions_by_type(struct mtd_info *master,
++				 enum mtd_parser_type type,
++				 struct mtd_partition **pparts,
++				 struct mtd_part_parser_data *data);
++
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/trunk/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
new file mode 100644
index 00000000..0c335683
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -0,0 +1,77 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -641,6 +641,37 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++static int
++run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
++{
++	struct mtd_partition *parts;
++	int nr_parts;
++	int i;
++
++	nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, &parts,
++						NULL);
++	if (nr_parts <= 0)
++		return nr_parts;
++
++	if (WARN_ON(!parts))
++		return 0;
++
++	for (i = 0; i < nr_parts; i++) {
++		/* adjust partition offsets */
++		parts[i].offset += slave->offset;
++
++		__mtd_add_partition(slave->master,
++				    parts[i].name,
++				    parts[i].offset,
++				    parts[i].size,
++				    false);
++	}
++
++	kfree(parts);
++
++	return nr_parts;
++}
++
+ static inline unsigned long
+ mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
+ {
+@@ -686,6 +717,12 @@ static void split_uimage(struct mtd_info
+ 
+ static void split_firmware(struct mtd_info *master, struct mtd_part *part)
+ {
++	int ret;
++
++	ret = run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
++	if (ret > 0)
++		return;
++
+ 	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
+ 		split_uimage(master, part);
+ }
+@@ -702,6 +739,12 @@ static void mtd_partition_split(struct m
+ 	if (rootfs_found)
+ 		return;
+ 
++	if (!strcmp(part->mtd.name, "rootfs")) {
++		run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++
++		rootfs_found = 1;
++	}
++
+ 	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+ 	    config_enabled(CONFIG_MTD_SPLIT_FIRMWARE))
+ 		split_firmware(master, part);
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -70,6 +70,8 @@ struct mtd_part_parser_data {
+ 
+ enum mtd_parser_type {
+ 	MTD_PARSER_TYPE_DEVICE = 0,
++	MTD_PARSER_TYPE_ROOTFS,
++	MTD_PARSER_TYPE_FIRMWARE,
+ };
+ 
+ struct mtd_part_parser {
diff --git a/trunk/target/linux/generic/patches-3.18/403-mtd-hook-mtdsplit-to-Kbuild.patch b/trunk/target/linux/generic/patches-3.18/403-mtd-hook-mtdsplit-to-Kbuild.patch
new file mode 100644
index 00000000..a70f8182
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/403-mtd-hook-mtdsplit-to-Kbuild.patch
@@ -0,0 +1,25 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -32,6 +32,11 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++config MTD_SPLIT
++	def_bool n
++	help 
++	  Generic MTD split support.
++
+ endmenu
+ 
+ config MTD_TESTS
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -6,6 +6,8 @@
+ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
++mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
+ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
diff --git a/trunk/target/linux/generic/patches-3.18/405-mtd-add-more-helper-functions.patch b/trunk/target/linux/generic/patches-3.18/405-mtd-add-more-helper-functions.patch
new file mode 100644
index 00000000..b59166c4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/405-mtd-add-more-helper-functions.patch
@@ -0,0 +1,83 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -445,14 +445,12 @@ static struct mtd_part *allocate_partiti
+ 	if (slave->offset == MTDPART_OFS_APPEND)
+ 		slave->offset = cur_offset;
+ 	if (slave->offset == MTDPART_OFS_NXTBLK) {
+-		slave->offset = cur_offset;
+-		if (mtd_mod_by_eb(cur_offset, master) != 0) {
+-			/* Round up to next erasesize */
+-			slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
++		/* Round up to next erasesize */
++		slave->offset = mtd_roundup_to_eb(cur_offset, master);
++		if (slave->offset != cur_offset)
+ 			printk(KERN_NOTICE "Moving partition %d: "
+ 			       "0x%012llx -> 0x%012llx\n", partno,
+ 			       (unsigned long long)cur_offset, (unsigned long long)slave->offset);
+-		}
+ 	}
+ 	if (slave->offset == MTDPART_OFS_RETAIN) {
+ 		slave->offset = cur_offset;
+@@ -957,6 +955,24 @@ int mtd_is_partition(const struct mtd_in
+ }
+ EXPORT_SYMBOL_GPL(mtd_is_partition);
+ 
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return (struct mtd_info *)mtd;
++
++	return PART(mtd)->master;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_master);
++
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd)
++{
++	if (!mtd_is_partition(mtd))
++		return 0;
++
++	return PART(mtd)->offset;
++}
++EXPORT_SYMBOL_GPL(mtdpart_get_offset);
++
+ /* Returns the size of the entire flash chip */
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd)
+ {
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -90,6 +90,8 @@ int mtd_is_partition(const struct mtd_in
+ int mtd_add_partition(struct mtd_info *master, const char *name,
+ 		      long long offset, long long length);
+ int mtd_del_partition(struct mtd_info *master, int partno);
++struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd);
++uint64_t mtdpart_get_offset(const struct mtd_info *mtd);
+ uint64_t mtd_get_device_size(const struct mtd_info *mtd);
+ extern void __weak arch_split_mtd_part(struct mtd_info *master,
+ 				       const char *name, int offset, int size);
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -333,6 +333,24 @@ static inline uint32_t mtd_mod_by_eb(uin
+ 	return do_div(sz, mtd->erasesize);
+ }
+ 
++static inline uint64_t mtd_roundup_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round up to next erase block */
++	return (mtd_div_by_eb(sz, mtd) + 1) * mtd->erasesize;
++}
++
++static inline uint64_t mtd_rounddown_to_eb(uint64_t sz, struct mtd_info *mtd)
++{
++	if (mtd_mod_by_eb(sz, mtd) == 0)
++		return sz;
++
++	/* Round down to the start of the current erase block */
++	return (mtd_div_by_eb(sz, mtd)) * mtd->erasesize;
++}
++
+ static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
+ {
+ 	if (mtd->writesize_shift)
diff --git a/trunk/target/linux/generic/patches-3.18/406-mtd-hook-mtdsplit-into-Kbuild.patch b/trunk/target/linux/generic/patches-3.18/406-mtd-hook-mtdsplit-into-Kbuild.patch
new file mode 100644
index 00000000..f022405b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/406-mtd-hook-mtdsplit-into-Kbuild.patch
@@ -0,0 +1,24 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -32,6 +32,8 @@ config MTD_UIMAGE_SPLIT
+ 	depends on MTD_SPLIT_FIRMWARE
+ 	default y
+ 
++source "drivers/mtd/mtdsplit/Kconfig"
++
+ config MTD_SPLIT
+ 	def_bool n
+ 	help 
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -7,6 +7,10 @@ obj-$(CONFIG_MTD)		+= mtd.o
+ mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
+ 
+ mtd-$(CONFIG_MTD_SPLIT)		+= mtdsplit.o
++mtd-$(CONFIG_MTD_SPLIT_SEAMA_FW) += mtdsplit_seama.o
++mtd-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
++mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
++mtd-$(CONFIG_MTD_SPLIT_LZMA_FW) += mtdsplit_lzma.o
+ 
+ obj-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
diff --git a/trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch b/trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch
new file mode 100644
index 00000000..07d4f7d8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/408-mtd-old-rootfs-squashfs-splitter.patch
@@ -0,0 +1,76 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -18,6 +18,11 @@ config MTD_ROOTFS_ROOT_DEV
+ 	bool "Automatically set 'rootfs' partition to be root filesystem"
+ 	default y
+ 
++config MTD_ROOTFS_SPLIT
++	bool "Automatically split 'rootfs' partition for squashfs"
++	select MTD_SPLIT
++	default y
++
+ config MTD_SPLIT_FIRMWARE
+ 	bool "Automatically split firmware partition for kernel+rootfs"
+ 	default y
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -681,6 +681,47 @@ mtd_pad_erasesize(struct mtd_info *mtd,
+ 	return len;
+ }
+ 
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++	size_t squashfs_len;
++	int len, ret;
++
++	ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
++	if (ret)
++		return ret;
++
++	len = mtd_pad_erasesize(master, offset, squashfs_len);
++	*split_offset = offset + len;
++
++	return 0;
++}
++
++static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
++{
++	unsigned int split_offset = 0;
++	unsigned int split_size;
++	int ret;
++
++	ret = split_squashfs(master, part->offset, &split_offset);
++	if (ret)
++		return;
++
++	if (split_offset <= 0)
++		return;
++
++	if (config_enabled(CONFIG_MTD_SPLIT_SQUASHFS_ROOT))
++		pr_err("Dedicated partitioner didn't create \"rootfs_data\" partition, please fill a bug report!\n");
++	else
++		pr_warn("Support for built-in \"rootfs_data\" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT\n");
++
++	split_size = part->mtd.size - (split_offset - part->offset);
++	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
++		ROOTFS_SPLIT_NAME, split_offset, split_size);
++
++	__mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
++			    split_size, false);
++}
++
+ #define UBOOT_MAGIC	0x27051956
+ 
+ static void split_uimage(struct mtd_info *master, struct mtd_part *part)
+@@ -738,7 +779,10 @@ static void mtd_partition_split(struct m
+ 		return;
+ 
+ 	if (!strcmp(part->mtd.name, "rootfs")) {
+-		run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++		int num = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
++
++		if (num <= 0 && config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
++			split_rootfs_data(master, part);
+ 
+ 		rootfs_found = 1;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.18/410-mtd-move-forward-declaration-of-struct-mtd_info.patch b/trunk/target/linux/generic/patches-3.18/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
new file mode 100644
index 00000000..78ebbf88
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/410-mtd-move-forward-declaration-of-struct-mtd_info.patch
@@ -0,0 +1,18 @@
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -35,6 +35,7 @@
+  * Note: writeable partitions require their size and offset be
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
++struct mtd_info;
+ 
+ struct mtd_partition {
+ 	const char *name;		/* identifier string */
+@@ -50,7 +51,6 @@ struct mtd_partition {
+ #define MTDPART_SIZ_FULL	(0)
+ 
+ 
+-struct mtd_info;
+ struct device_node;
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch b/trunk/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
new file mode 100644
index 00000000..4a17ccd8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
@@ -0,0 +1,146 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -35,6 +35,8 @@
+ #include "mtdcore.h"
+ #include "mtdsplit.h"
+ 
++#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
++
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+ static DEFINE_MUTEX(mtd_partitions_mutex);
+@@ -233,13 +235,61 @@ static int part_erase(struct mtd_info *m
+ 	struct mtd_part *part = PART(mtd);
+ 	int ret;
+ 
++
++	instr->partial_start = false;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		size_t readlen = 0;
++		u64 mtd_ofs;
++
++		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
++		if (!instr->erase_buf)
++			return -ENOMEM;
++
++		mtd_ofs = part->offset + instr->addr;
++		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
++
++		if (instr->erase_buf_ofs > 0) {
++			instr->addr -= instr->erase_buf_ofs;
++			ret = mtd_read(part->master,
++				instr->addr + part->offset,
++				part->master->erasesize,
++				&readlen, instr->erase_buf);
++
++			instr->len += instr->erase_buf_ofs;
++			instr->partial_start = true;
++		} else {
++			mtd_ofs = part->offset + part->mtd.size;
++			instr->erase_buf_ofs = part->master->erasesize -
++				do_div(mtd_ofs, part->master->erasesize);
++
++			if (instr->erase_buf_ofs > 0) {
++				instr->len += instr->erase_buf_ofs;
++				ret = mtd_read(part->master,
++					part->offset + instr->addr +
++					instr->len - part->master->erasesize,
++					part->master->erasesize, &readlen,
++					instr->erase_buf);
++			} else {
++				ret = 0;
++			}
++		}
++		if (ret < 0) {
++			kfree(instr->erase_buf);
++			return ret;
++		}
++
++	}
++
+ 	instr->addr += part->offset;
+ 	ret = part->master->_erase(part->master, instr);
+ 	if (ret) {
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
++		if (mtd->flags & MTD_ERASE_PARTIAL)
++			kfree(instr->erase_buf);
+ 	}
++
+ 	return ret;
+ }
+ 
+@@ -247,7 +297,25 @@ void mtd_erase_callback(struct erase_inf
+ {
+ 	if (instr->mtd->_erase == part_erase) {
+ 		struct mtd_part *part = PART(instr->mtd);
++		size_t wrlen = 0;
+ 
++		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
++			if (instr->partial_start) {
++				part->master->_write(part->master,
++					instr->addr, instr->erase_buf_ofs,
++					&wrlen, instr->erase_buf);
++				instr->addr += instr->erase_buf_ofs;
++			} else {
++				instr->len -= instr->erase_buf_ofs;
++				part->master->_write(part->master,
++					instr->addr + instr->len,
++					instr->erase_buf_ofs, &wrlen,
++					instr->erase_buf +
++					part->master->erasesize -
++					instr->erase_buf_ofs);
++			}
++			kfree(instr->erase_buf);
++		}
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
+@@ -514,18 +582,24 @@ static struct mtd_part *allocate_partiti
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+ 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
+ 		/* Doesn't start on a boundary of major erase size */
+-		/* FIXME: Let it be writable if it is on a boundary of
+-		 * _minor_ erase size though */
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
+-			part->name);
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++		if (((u32) slave->mtd.size) > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+-	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
+-			part->name);
++	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++
++		if ((u32) slave->mtd.size > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
++	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
++		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
++				part->name);
+ 
+ 	slave->mtd.ecclayout = master->ecclayout;
+ 	slave->mtd.ecc_step_size = master->ecc_step_size;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -55,6 +55,10 @@ struct erase_info {
+ 	u_long priv;
+ 	u_char state;
+ 	struct erase_info *next;
++
++	u8 *erase_buf;
++	u32 erase_buf_ofs;
++	bool partial_start;
+ };
+ 
+ struct mtd_erase_region_info {
diff --git a/trunk/target/linux/generic/patches-3.18/412-mtd-partial_eraseblock_unlock.patch b/trunk/target/linux/generic/patches-3.18/412-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 00000000..ba45accd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/412-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -334,7 +334,14 @@ static int part_lock(struct mtd_info *mt
+ static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+ {
+ 	struct mtd_part *part = PART(mtd);
+-	return part->master->_unlock(part->master, ofs + part->offset, len);
++
++	ofs += part->offset;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		/* round up len to next erasesize and round down offset to prev block */
++		len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++		ofs &= ~(part->master->erasesize - 1);
++	}
++	return part->master->_unlock(part->master, ofs, len);
+ }
+ 
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/trunk/target/linux/generic/patches-3.18/420-mtd-redboot_space.patch b/trunk/target/linux/generic/patches-3.18/420-mtd-redboot_space.patch
new file mode 100644
index 00000000..f74affce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/420-mtd-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru
+ #endif
+ 		names += strlen(names)+1;
+ 
+-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+-			i++;
+-			parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-			parts[i].size = fl->next->img->flash_base - parts[i].offset;
+-			parts[i].name = nullname;
+-		}
++			if (!strcmp(parts[i].name, "rootfs")) {
++				parts[i].size = fl->next->img->flash_base;
++				parts[i].size &= ~(master->erasesize - 1);
++				parts[i].size -= parts[i].offset;
++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
++				nrparts--;
++			} else {
++				i++;
++				parts[i].offset = parts[i-1].size + parts[i-1].offset;
++				parts[i].size = fl->next->img->flash_base - parts[i].offset;
++				parts[i].name = nullname;
+ #endif
++			}
++		}
+ 		tmp_fl = fl;
+ 		fl = fl->next;
+ 		kfree(tmp_fl);
diff --git a/trunk/target/linux/generic/patches-3.18/430-mtd-add-myloader-partition-parser.patch b/trunk/target/linux/generic/patches-3.18/430-mtd-add-myloader-partition-parser.patch
new file mode 100644
index 00000000..ffc9e219
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/430-mtd-add-myloader-partition-parser.patch
@@ -0,0 +1,35 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -189,6 +189,22 @@ config MTD_BCM47XX_PARTS
+ 	  This provides partitions parser for devices based on BCM47xx
+ 	  boards.
+ 
++config MTD_MYLOADER_PARTS
++	tristate "MyLoader partition parsing"
++	depends on ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX || ATH79
++	---help---
++	  MyLoader is a bootloader which allows the user to define partitions
++	  in flash devices, by putting a table in the second erase block
++	  on the device, similar to a partition table. This table gives the 
++	  offsets and lengths of the user defined partitions.
++
++	  If you need code which can detect and parse these tables, and
++	  register MTD 'partitions' corresponding to each image detected,
++	  enable this option.
++
++	  You will still need the parsing functions to be called by the driver
++	  for your particular device. It won't happen automatically.
++
+ comment "User Modules And Translation Layers"
+ 
+ #
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
++obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_BLKDEVS)	+= mtd_blkdevs.o
diff --git a/trunk/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch b/trunk/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
new file mode 100644
index 00000000..4c472034
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
@@ -0,0 +1,66 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -40,6 +40,7 @@
+ #define ML_MAGIC2			0x26594131
+ #define TRX_MAGIC			0x30524448
+ #define SQSH_MAGIC			0x71736873	/* shsq */
++#define UBI_EC_MAGIC			0x23494255	/* UBI# */
+ 
+ struct trx_header {
+ 	uint32_t magic;
+@@ -50,7 +51,7 @@ struct trx_header {
+ 	uint32_t offset[3];
+ } __packed;
+ 
+-static void bcm47xxpart_add_part(struct mtd_partition *part, char *name,
++static void bcm47xxpart_add_part(struct mtd_partition *part, const char *name,
+ 				 u64 offset, uint32_t mask_flags)
+ {
+ 	part->name = name;
+@@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct
+ 	part->mask_flags = mask_flags;
+ }
+ 
++static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master,
++						  size_t offset)
++{
++	uint32_t buf;
++	size_t bytes_read;
++
++	if (mtd_read(master, offset, sizeof(&buf), &bytes_read,
++		     (uint8_t *)&buf) < 0) {
++		pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
++			offset);
++		goto out_default;
++	}
++
++	if (buf == UBI_EC_MAGIC)
++		return "ubi";
++
++out_default:
++	return "rootfs";
++}
++
+ static int bcm47xxpart_parse(struct mtd_info *master,
+ 			     struct mtd_partition **pparts,
+ 			     struct mtd_part_parser_data *data)
+@@ -151,6 +172,8 @@ static int bcm47xxpart_parse(struct mtd_
+ 
+ 		/* TRX */
+ 		if (buf[0x000 / 4] == TRX_MAGIC) {
++			const char *name;
++
+ 			if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
+ 				pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
+ 				break;
+@@ -186,8 +209,9 @@ static int bcm47xxpart_parse(struct mtd_
+ 			 * we want to have jffs2 (overlay) in the same mtd.
+ 			 */
+ 			if (trx->offset[i]) {
++				name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
+ 				bcm47xxpart_add_part(&parts[curr_part++],
+-						     "rootfs",
++						     name,
+ 						     offset + trx->offset[i],
+ 						     0);
+ 				i++;
diff --git a/trunk/target/linux/generic/patches-3.18/440-block2mtd_init.patch b/trunk/target/linux/generic/patches-3.18/440-block2mtd_init.patch
new file mode 100644
index 00000000..5ab60265
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/440-block2mtd_init.patch
@@ -0,0 +1,107 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -17,6 +17,7 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
+ #include <linux/mutex.h>
+ #include <linux/mount.h>
+ #include <linux/slab.h>
+@@ -209,11 +210,12 @@ static void block2mtd_free_device(struct
+ }
+ 
+ 
+-static struct block2mtd_dev *add_device(char *devname, int erase_size)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+ 	struct block_device *bdev;
+ 	struct block2mtd_dev *dev;
++	struct mtd_partition *part;
+ 	char *name;
+ 
+ 	if (!devname)
+@@ -257,13 +259,16 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+-	name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
++	if (!mtdname)
++		mtdname = devname;
++	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
+ 	if (!name)
+ 		goto err_destroy_mutex;
+ 
++	strcpy(name, mtdname);
+ 	dev->mtd.name = name;
+ 
+-	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
++	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
+ 	dev->mtd.erasesize = erase_size;
+ 	dev->mtd.writesize = 1;
+ 	dev->mtd.writebufsize = PAGE_SIZE;
+@@ -276,15 +281,18 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
+ 
+-	if (mtd_device_register(&dev->mtd, NULL, 0)) {
++	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
++	part->name = name;
++	part->offset = 0;
++	part->size = dev->mtd.size;
++	if (mtd_device_register(&dev->mtd, part, 1)) {
+ 		/* Device didn't get added, so free the entry */
+ 		goto err_destroy_mutex;
+ 	}
+ 	list_add(&dev->list, &blkmtd_device_list);
+ 	pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n",
+ 		dev->mtd.index,
+-		dev->mtd.name + strlen("block2mtd: "),
+-		dev->mtd.erasesize >> 10, dev->mtd.erasesize);
++		mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+ 	return dev;
+ 
+ err_destroy_mutex:
+@@ -353,9 +361,9 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12]; /* 80 for device, 12 for erase size */
++	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
+ 	char *str = buf;
+-	char *token[2];
++	char *token[3];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
+ 	int i, ret;
+@@ -368,7 +376,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 2; i++)
++	for (i = 0; i < 3; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str) {
+@@ -394,8 +402,10 @@ static int block2mtd_setup2(const char *
+ 			return 0;
+ 		}
+ 	}
++	if (token[2] && (strlen(token[2]) + 1 > 80))
++		pr_err("mtd device name too long\n");
+ 
+-	add_device(name, erase_size);
++	add_device(name, erase_size, token[2]);
+ 
+ 	return 0;
+ }
+@@ -429,7 +439,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
diff --git a/trunk/target/linux/generic/patches-3.18/441-block2mtd_probe.patch b/trunk/target/linux/generic/patches-3.18/441-block2mtd_probe.patch
new file mode 100644
index 00000000..6836a48e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/441-block2mtd_probe.patch
@@ -0,0 +1,110 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -10,6 +10,7 @@
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/module.h>
++#include <linux/delay.h>
+ #include <linux/fs.h>
+ #include <linux/blkdev.h>
+ #include <linux/bio.h>
+@@ -210,13 +211,16 @@ static void block2mtd_free_device(struct
+ }
+ 
+ 
+-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname, int timeout)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+-	struct block_device *bdev;
++	struct block_device *bdev = ERR_PTR(-ENODEV);
+ 	struct block2mtd_dev *dev;
+ 	struct mtd_partition *part;
+ 	char *name;
++#ifndef MODULE
++	int i;
++#endif
+ 
+ 	if (!devname)
+ 		return NULL;
+@@ -227,15 +231,20 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Get a handle on the device */
+ 	bdev = blkdev_get_by_path(devname, mode, dev);
++
+ #ifndef MODULE
+-	if (IS_ERR(bdev)) {
++	for (i = 0; IS_ERR(bdev) && i <= timeout; i++) {
++		dev_t devt;
+ 
+-		/* We might not have rootfs mounted at this point. Try
+-		   to resolve the device name by other means. */
++		if (i)
++			msleep(1000);
++		wait_for_device_probe();
++
++		devt = name_to_dev_t(devname);
++		if (!devt)
++			continue;
+ 
+-		dev_t devt = name_to_dev_t(devname);
+-		if (devt)
+-			bdev = blkdev_get_by_dev(devt, mode, dev);
++		bdev = blkdev_get_by_dev(devt, mode, dev);
+ 	}
+ #endif
+ 
+@@ -361,11 +370,12 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
++	char buf[80 + 12 + 80 + 8]; /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
+ 	char *str = buf;
+-	char *token[3];
++	char *token[4];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
++	unsigned long timeout = 0;
+ 	int i, ret;
+ 
+ 	if (strnlen(val, sizeof(buf)) >= sizeof(buf)) {
+@@ -376,7 +386,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 3; i++)
++	for (i = 0; i < 4; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str) {
+@@ -405,7 +415,10 @@ static int block2mtd_setup2(const char *
+ 	if (token[2] && (strlen(token[2]) + 1 > 80))
+ 		pr_err("mtd device name too long\n");
+ 
+-	add_device(name, erase_size, token[2]);
++	if (token[3] && kstrtoul(token[3], 0, &timeout))
++		pr_err("invalid timeout\n");
++
++	add_device(name, erase_size, token[2], timeout);
+ 
+ 	return 0;
+ }
+@@ -439,7 +452,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
+@@ -474,7 +487,7 @@ static void block2mtd_exit(void)
+ }
+ 
+ 
+-module_init(block2mtd_init);
++late_initcall(block2mtd_init);
+ module_exit(block2mtd_exit);
+ 
+ MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.18/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch b/trunk/target/linux/generic/patches-3.18/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
new file mode 100644
index 00000000..0f5abaa7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch
@@ -0,0 +1,37 @@
+---
+ drivers/mtd/nand/plat_nand.c |   13 ++++++++++++-
+ include/linux/mtd/nand.h     |    1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -851,6 +851,7 @@ struct platform_nand_chip {
+ 	unsigned int options;
+ 	unsigned int bbt_options;
+ 	const char **part_probe_types;
++	int (*chip_fixup)(struct mtd_info *mtd);
+ };
+ 
+ /* Keep gcc happy */
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -90,7 +90,18 @@ static int plat_nand_probe(struct platfo
+ 	}
+ 
+ 	/* Scan to find existence of the device */
+-	if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
++	if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
++		err = -ENXIO;
++		goto out;
++	}
++
++	if (pdata->chip.chip_fixup) {
++		err = pdata->chip.chip_fixup(&data->mtd);
++		if (err)
++			goto out;
++	}
++
++	if (nand_scan_tail(&data->mtd)) {
+ 		err = -ENXIO;
+ 		goto out;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.18/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch b/trunk/target/linux/generic/patches-3.18/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
new file mode 100644
index 00000000..6a2092ce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -507,7 +507,7 @@ int __nand_correct_data(unsigned char *b
+ 		return 1;	/* error in ECC data; no action needed */
+ 
+ 	pr_err("%s: uncorrectable ECC error\n", __func__);
+-	return -1;
++	return -EBADMSG;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/trunk/target/linux/generic/patches-3.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
new file mode 100644
index 00000000..68fbd124
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -809,7 +809,7 @@ static int get_chip(struct map_info *map
+ 		return 0;
+ 
+ 	case FL_ERASING:
+-		if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
++		if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+ 		    !(mode == FL_READY || mode == FL_POINT ||
+ 		    (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
+ 			goto sleep;
diff --git a/trunk/target/linux/generic/patches-3.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/trunk/target/linux/generic/patches-3.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
new file mode 100644
index 00000000..c437a140
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
@@ -0,0 +1,18 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Issue map read after Write Buffer Load command to ensure chip is ready
+to receive data.
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
+ 1 file changed, 1 insertion(+)
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1830,6 +1830,7 @@ static int __xipram do_write_buffer(stru
+ 
+ 	/* Write Buffer Load */
+ 	map_write(map, CMD(0x25), cmd_adr);
++	(void) map_read(map, cmd_adr);
+ 
+ 	chip->state = FL_WRITING_TO_BUFFER;
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch b/trunk/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
new file mode 100644
index 00000000..6bf516c7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
@@ -0,0 +1,20 @@
+From eef9dfc4e821408af1af13aa0cc707fc496fb7c6 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Wed, 11 Dec 2013 19:05:59 +0100
+Subject: [PATCH] m25p80: add support for the Winbond W25X05 flash
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/devices/m25p80.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mtd/spi-nor/spi-nor.c
++++ b/drivers/mtd/spi-nor/spi-nor.c
+@@ -616,6 +616,7 @@ static const struct spi_device_id spi_no
+ 	{ "m25px80",    INFO(0x207114,  0, 64 * 1024, 16, 0) },
+ 
+ 	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
++	{ "w25x05", INFO(0xef3010, 0, 64 * 1024,  1,  SECT_4K) },
+ 	{ "w25x10", INFO(0xef3011, 0, 64 * 1024,  2,  SECT_4K) },
+ 	{ "w25x20", INFO(0xef3012, 0, 64 * 1024,  4,  SECT_4K) },
+ 	{ "w25x40", INFO(0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
diff --git a/trunk/target/linux/generic/patches-3.18/480-mtd-set-rootfs-to-be-root-dev.patch b/trunk/target/linux/generic/patches-3.18/480-mtd-set-rootfs-to-be-root-dev.patch
new file mode 100644
index 00000000..8fc3578a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/480-mtd-set-rootfs-to-be-root-dev.patch
@@ -0,0 +1,26 @@
+--- a/drivers/mtd/mtdcore.c
++++ b/drivers/mtd/mtdcore.c
+@@ -37,6 +37,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/gfp.h>
+ #include <linux/slab.h>
++#include <linux/root_dev.h>
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+@@ -456,6 +457,15 @@ int add_mtd_device(struct mtd_info *mtd)
+ 	   of this try_ nonsense, and no bitching about it
+ 	   either. :) */
+ 	__module_get(THIS_MODULE);
++
++	if (!strcmp(mtd->name, "rootfs") &&
++	    config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    ROOT_DEV == 0) {
++		pr_notice("mtd: device %d (%s) set to be root filesystem\n",
++			  mtd->index, mtd->name);
++		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
++	}
++
+ 	return 0;
+ 
+ fail_added:
diff --git a/trunk/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/trunk/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
new file mode 100644
index 00000000..fd343fa6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -0,0 +1,75 @@
+From 8a52e4100d7c3a4a1dfddfa02b8864a9b0068c13 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 17 May 2014 03:36:18 +0200
+Subject: [PATCH 1/5] ubi: auto-attach mtd device named "ubi" or "data" on boot
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+--- a/drivers/mtd/ubi/build.c
++++ b/drivers/mtd/ubi/build.c
+@@ -1209,6 +1209,48 @@ static struct mtd_info * __init open_mtd
+ 	return mtd;
+ }
+ 
++/*
++ * This function tries attaching mtd partitions named either "ubi" or "data"
++ * during boot.
++ */
++static void __init ubi_auto_attach(void)
++{
++	int err;
++	struct mtd_info *mtd;
++
++	/* try attaching mtd device named "ubi" or "data" */
++	mtd = open_mtd_device("ubi");
++	if (IS_ERR(mtd))
++		mtd = open_mtd_device("data");
++
++	if (!IS_ERR(mtd)) {
++		size_t len;
++		char magic[4];
++
++		/* check for a valid ubi magic */
++		err = mtd_read(mtd, 0, 4, &len, (void *) magic);
++		if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
++			ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
++			put_mtd_device(mtd);
++			return;
++		}
++
++		/* auto-add only media types where UBI makes sense */
++		if (mtd->type == MTD_NANDFLASH ||
++		    mtd->type == MTD_DATAFLASH ||
++		    mtd->type == MTD_MLCNANDFLASH) {
++			mutex_lock(&ubi_devices_mutex);
++			ubi_msg("auto-attach mtd%d", mtd->index);
++			err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
++			mutex_unlock(&ubi_devices_mutex);
++			if (err < 0) {
++				ubi_err("cannot attach mtd%d", mtd->index);
++				put_mtd_device(mtd);
++			}
++		}
++	}
++}
++
+ static int __init ubi_init(void)
+ {
+ 	int err, i, k;
+@@ -1298,6 +1340,12 @@ static int __init ubi_init(void)
+ 		}
+ 	}
+ 
++	/* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd
++	 * parameter was given */
++	if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    !ubi_is_module() && !mtd_devs)
++		ubi_auto_attach();
++
+ 	err = ubiblock_init();
+ 	if (err) {
+ 		ubi_err("block: cannot initialize, error %d", err);
diff --git a/trunk/target/linux/generic/patches-3.18/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/trunk/target/linux/generic/patches-3.18/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
new file mode 100644
index 00000000..42590c83
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -0,0 +1,69 @@
+From 0f3966579815f889bb2fcb4846152c35f65e79c4 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 15 May 2014 21:06:33 +0200
+Subject: [PATCH 2/5] ubi: auto-create ubiblock device for rootfs
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/block.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -615,6 +615,44 @@ static int __init ubiblock_create_from_p
+ 	return ret;
+ }
+ 
++#define UBIFS_NODE_MAGIC  0x06101831
++static inline int ubi_vol_is_ubifs(struct ubi_volume_desc *desc)
++{
++	int ret;
++	uint32_t magic_of, magic;
++	ret = ubi_read(desc, 0, (char *)&magic_of, 0, 4);
++	if (ret)
++		return 0;
++	magic = le32_to_cpu(magic_of);
++	return magic == UBIFS_NODE_MAGIC;
++}
++
++static void __init ubiblock_create_auto_rootfs(void)
++{
++	int ubi_num, ret, is_ubifs;
++	struct ubi_volume_desc *desc;
++	struct ubi_volume_info vi;
++
++	for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++) {
++		desc = ubi_open_volume_nm(ubi_num, "rootfs", UBI_READONLY);
++		if (IS_ERR(desc))
++			continue;
++
++		ubi_get_volume_info(desc, &vi);
++		is_ubifs = ubi_vol_is_ubifs(desc);
++		ubi_close_volume(desc);
++		if (is_ubifs)
++			break;
++
++		ret = ubiblock_create(&vi);
++		if (ret)
++			ubi_err("block: can't add '%s' volume, err=%d\n",
++				vi.name, ret);
++		/* always break if we get here */
++		break;
++	}
++}
++
+ static void ubiblock_remove_all(void)
+ {
+ 	struct ubiblock *next;
+@@ -645,6 +683,10 @@ int __init ubiblock_init(void)
+ 	if (ret)
+ 		goto err_remove;
+ 
++	/* auto-attach "rootfs" volume if existing and non-ubifs */
++	if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))
++		ubiblock_create_auto_rootfs();
++
+ 	/*
+ 	 * Block devices are only created upon user requests, so we ignore
+ 	 * existing volumes.
diff --git a/trunk/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/trunk/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
new file mode 100644
index 00000000..333c7225
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -0,0 +1,53 @@
+From eea9e1785e4c05c2a3444506aabafa0ae958538f Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 17 May 2014 03:35:02 +0200
+Subject: [PATCH 4/5] try auto-mounting ubi0:rootfs in init/do_mounts.c
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ init/do_mounts.c | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -433,7 +433,27 @@ retry:
+ out:
+ 	put_page(page);
+ }
+- 
++
++static int __init mount_ubi_rootfs(void)
++{
++	int flags = MS_SILENT;
++	int err, tried = 0;
++
++	while (tried < 2) {
++		err = do_mount_root("ubi0:rootfs", "ubifs", flags, \
++					root_mount_data);
++		switch (err) {
++			case -EACCES:
++				flags |= MS_RDONLY;
++				tried++;
++			default:
++				return err;
++		}
++	}
++
++	return -EINVAL;
++}
++
+ #ifdef CONFIG_ROOT_NFS
+ 
+ #define NFSROOT_TIMEOUT_MIN	5
+@@ -527,6 +547,10 @@ void __init mount_root(void)
+ 			change_floppy("root floppy");
+ 	}
+ #endif
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++	if (!mount_ubi_rootfs())
++		return;
++#endif
+ #ifdef CONFIG_BLOCK
+ 	create_dev("/dev/root", ROOT_DEV);
+ 	mount_block_root("/dev/root", root_mountflags);
diff --git a/trunk/target/linux/generic/patches-3.18/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/trunk/target/linux/generic/patches-3.18/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
new file mode 100644
index 00000000..7170e8a2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
@@ -0,0 +1,37 @@
+From cd68d1b12b5ea4c01a664c064179ada42bf55d3d Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 15 May 2014 20:55:42 +0200
+Subject: [PATCH 5/5] ubi: set ROOT_DEV to ubiblock "rootfs" if unset
+To: librecmc-devel@lists.openwrt.org
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/mtd/ubi/block.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -48,6 +48,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/hdreg.h>
+ #include <asm/div64.h>
++#include <linux/root_dev.h>
+ 
+ #include "ubi-media.h"
+ #include "ubi.h"
+@@ -448,6 +449,15 @@ int ubiblock_create(struct ubi_volume_in
+ 	add_disk(dev->gd);
+ 	ubi_msg("%s created from ubi%d:%d(%s)",
+ 		dev->gd->disk_name, dev->ubi_num, dev->vol_id, vi->name);
++
++	if (!strcmp(vi->name, "rootfs") &&
++	    config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++	    ROOT_DEV == 0) {
++		pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n",
++			  dev->ubi_num, dev->vol_id, vi->name);
++		ROOT_DEV = MKDEV(gd->major, gd->first_minor);
++	}
++
+ 	return 0;
+ 
+ out_free_queue:
diff --git a/trunk/target/linux/generic/patches-3.18/500-yaffs-Kbuild-integration.patch b/trunk/target/linux/generic/patches-3.18/500-yaffs-Kbuild-integration.patch
new file mode 100644
index 00000000..de6643a4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/500-yaffs-Kbuild-integration.patch
@@ -0,0 +1,18 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -39,6 +39,7 @@ source "fs/gfs2/Kconfig"
+ source "fs/ocfs2/Kconfig"
+ source "fs/btrfs/Kconfig"
+ source "fs/nilfs2/Kconfig"
++source "fs/yaffs2/Kconfig"
+ 
+ endif # BLOCK
+ 
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -126,3 +126,5 @@ obj-y				+= exofs/ # Multiple modules
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
+ obj-$(CONFIG_PSTORE)		+= pstore/
+ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
++obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
++
diff --git a/trunk/target/linux/generic/patches-3.18/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch b/trunk/target/linux/generic/patches-3.18/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
new file mode 100644
index 00000000..c1f7367d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
@@ -0,0 +1,155 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -329,6 +329,33 @@ static int yaffs_readpage(struct file *f
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++#define YCRED_FSUID()	from_kuid(&init_user_ns, current_fsuid())
++#define YCRED_FSGID()	from_kgid(&init_user_ns, current_fsgid())
++#else
++#define YCRED_FSUID()	YCRED(current)->fsuid
++#define YCRED_FSGID()	YCRED(current)->fsgid
++
++static inline uid_t i_uid_read(const struct inode *inode)
++{
++	return inode->i_uid;
++}
++
++static inline gid_t i_gid_read(const struct inode *inode)
++{
++	return inode->i_gid;
++}
++
++static inline void i_uid_write(struct inode *inode, uid_t uid)
++{
++	inode->i_uid = uid;
++}
++
++static inline void i_gid_write(struct inode *inode, gid_t gid)
++{
++	inode->i_gid = gid;
++}
++#endif
+ 
+ static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+ {
+@@ -1225,9 +1252,9 @@ static int yaffs_mknod(struct inode *dir
+ 	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
+ 
+ 	int error = -ENOSPC;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+ 		mode |= S_ISGID;
+@@ -1424,9 +1451,9 @@ static int yaffs_symlink(struct inode *d
+ {
+ 	struct yaffs_obj *obj;
+ 	struct yaffs_dev *dev;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
+ 
+@@ -1829,8 +1856,8 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		inode->i_ino = obj->obj_id;
+ 		inode->i_mode = obj->yst_mode;
+-		inode->i_uid = obj->yst_uid;
+-		inode->i_gid = obj->yst_gid;
++		i_uid_write(inode, obj->yst_uid);
++		i_gid_write(inode, obj->yst_gid);
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+ 		inode->i_blksize = inode->i_sb->s_blocksize;
+ #endif
+@@ -1856,7 +1883,7 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		yaffs_trace(YAFFS_TRACE_OS,
+ 			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+-			inode->i_mode, inode->i_uid, inode->i_gid,
++			inode->i_mode, i_uid_read(inode), i_gid_read(inode),
+ 			inode->i_size, atomic_read(&inode->i_count));
+ 
+ 		switch (obj->yst_mode & S_IFMT) {
+--- a/fs/yaffs2/yaffs_attribs.c
++++ b/fs/yaffs2/yaffs_attribs.c
+@@ -14,6 +14,48 @@
+ #include "yaffs_guts.h"
+ #include "yaffs_attribs.h"
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return from_kuid(&init_user_ns, iattr->ia_uid);
++}
++
++static inline gid_t ia_gid_read(const struct iattr *iattr)
++{
++	return from_kgid(&init_user_ns, iattr->ia_gid);
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = make_kuid(&init_user_ns, uid);
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = make_kgid(&init_user_ns, gid);
++}
++#else
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return iattr->ia_uid;
++}
++
++static inline gid_t ia_gid_read(const struct iattr *inode)
++{
++	return iattr->ia_gid;
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = uid;
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = gid;
++}
++#endif
++
+ void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
+ {
+ 	obj->yst_uid = oh->yst_uid;
+@@ -77,9 +119,9 @@ int yaffs_set_attribs(struct yaffs_obj *
+ 	if (valid & ATTR_MODE)
+ 		obj->yst_mode = attr->ia_mode;
+ 	if (valid & ATTR_UID)
+-		obj->yst_uid = attr->ia_uid;
++		obj->yst_uid =  ia_uid_read(attr);
+ 	if (valid & ATTR_GID)
+-		obj->yst_gid = attr->ia_gid;
++		obj->yst_gid =  ia_gid_read(attr);
+ 
+ 	if (valid & ATTR_ATIME)
+ 		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
+@@ -103,9 +145,9 @@ int yaffs_get_attribs(struct yaffs_obj *
+ 
+ 	attr->ia_mode = obj->yst_mode;
+ 	valid |= ATTR_MODE;
+-	attr->ia_uid = obj->yst_uid;
++	ia_uid_write(attr, obj->yst_uid);
+ 	valid |= ATTR_UID;
+-	attr->ia_gid = obj->yst_gid;
++	ia_gid_write(attr, obj->yst_gid);
+ 	valid |= ATTR_GID;
+ 
+ 	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
diff --git a/trunk/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch b/trunk/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch
new file mode 100644
index 00000000..5b73d389
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch
@@ -0,0 +1,44 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -3025,6 +3025,7 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "y
+ #endif
+ 
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ static struct proc_dir_entry *my_proc_entry;
+ 
+ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
+@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file
+ 		return yaffs_proc_debug_write(file, buf, count, data);
+ 	return yaffs_proc_write_trace_options(file, buf, count, data);
+ }
++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) */
+ 
+ /* Stuff to handle installation of file systems */
+ struct file_system_to_install {
+@@ -3421,6 +3423,7 @@ static int __init init_yaffs_fs(void)
+ 
+ 	mutex_init(&yaffs_context_lock);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	/* Install the proc_fs entries */
+ 	my_proc_entry = create_proc_entry("yaffs",
+ 					  S_IRUGO | S_IFREG, YPROC_ROOT);
+@@ -3432,6 +3435,7 @@ static int __init init_yaffs_fs(void)
+ 	} else {
+ 		return -ENOMEM;
+         }
++#endif
+ 
+ 	/* Now add the file system entries */
+ 
+@@ -3468,7 +3472,9 @@ static void __exit exit_yaffs_fs(void)
+ 	yaffs_trace(YAFFS_TRACE_ALWAYS,
+ 		"yaffs built " __DATE__ " " __TIME__ " removing.");
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
+ 	remove_proc_entry("yaffs", YPROC_ROOT);
++#endif
+ 
+ 	fsinst = fs_to_install;
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/503-yaffs-3.12-convert-readdir-to-iterate.patch b/trunk/target/linux/generic/patches-3.18/503-yaffs-3.12-convert-readdir-to-iterate.patch
new file mode 100644
index 00000000..586c141e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/503-yaffs-3.12-convert-readdir-to-iterate.patch
@@ -0,0 +1,129 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -1701,6 +1701,110 @@ static void yaffs_remove_obj_callback(st
+ 
+ /*-----------------------------------------------------------------*/
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
++static int yaffs_readdir(struct file *file, struct dir_context *ctx)
++{
++	struct yaffs_obj *obj;
++	struct yaffs_dev *dev;
++	struct yaffs_search_context *sc;
++	struct inode *inode = file->f_dentry->d_inode;
++	unsigned long offset, curoffs;
++	struct yaffs_obj *l;
++	int ret_val = 0;
++
++	char name[YAFFS_MAX_NAME_LENGTH + 1];
++
++	obj = yaffs_dentry_to_obj(file->f_dentry);
++	dev = obj->my_dev;
++
++	yaffs_gross_lock(dev);
++
++	yaffs_dev_to_lc(dev)->readdir_process = current;
++
++	offset = ctx->pos;
++
++	sc = yaffs_new_search(obj);
++	if (!sc) {
++		ret_val = -ENOMEM;
++		goto out;
++	}
++
++	yaffs_trace(YAFFS_TRACE_OS,
++		"yaffs_readdir: starting at %d", (int)offset);
++
++	if (offset == 0) {
++		yaffs_trace(YAFFS_TRACE_OS,
++			"yaffs_readdir: entry . ino %d",
++			(int)inode->i_ino);
++		yaffs_gross_unlock(dev);
++		if (!dir_emit_dot(file, ctx)) {
++			yaffs_gross_lock(dev);
++			goto out;
++		}
++		yaffs_gross_lock(dev);
++		offset++;
++		ctx->pos++;
++	}
++	if (offset == 1) {
++		yaffs_trace(YAFFS_TRACE_OS,
++			"yaffs_readdir: entry .. ino %d",
++			(int)file->f_dentry->d_parent->d_inode->i_ino);
++		yaffs_gross_unlock(dev);
++		if (!dir_emit_dotdot(file, ctx)) {
++			yaffs_gross_lock(dev);
++			goto out;
++		}
++		yaffs_gross_lock(dev);
++		offset++;
++		ctx->pos++;
++	}
++
++	curoffs = 1;
++
++	/* If the directory has changed since the open or last call to
++	   readdir, rewind to after the 2 canned entries. */
++	if (file->f_version != inode->i_version) {
++		offset = 2;
++		ctx->pos = offset;
++		file->f_version = inode->i_version;
++	}
++
++	while (sc->next_return) {
++		curoffs++;
++		l = sc->next_return;
++		if (curoffs >= offset) {
++			int this_inode = yaffs_get_obj_inode(l);
++			int this_type = yaffs_get_obj_type(l);
++
++			yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
++			yaffs_trace(YAFFS_TRACE_OS,
++				"yaffs_readdir: %s inode %d",
++				name, yaffs_get_obj_inode(l));
++
++			yaffs_gross_unlock(dev);
++
++			if (!dir_emit(ctx, name, strlen(name),
++				      this_inode, this_type) < 0) {
++				yaffs_gross_lock(dev);
++				goto out;
++			}
++
++			yaffs_gross_lock(dev);
++
++			offset++;
++			ctx->pos++;
++		}
++		yaffs_search_advance(sc);
++	}
++
++out:
++	yaffs_search_end(sc);
++	yaffs_dev_to_lc(dev)->readdir_process = NULL;
++	yaffs_gross_unlock(dev);
++
++	return ret_val;
++}
++#else
+ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
+ {
+ 	struct yaffs_obj *obj;
+@@ -1807,10 +1911,15 @@ out:
+ 
+ 	return ret_val;
+ }
++#endif
+ 
+ static const struct file_operations yaffs_dir_operations = {
+ 	.read = generic_read_dir,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
++	.iterate = yaffs_readdir,
++#else
+ 	.readdir = yaffs_readdir,
++#endif
+ 	.fsync = yaffs_sync_object,
+ 	.llseek = generic_file_llseek,
+ };
diff --git a/trunk/target/linux/generic/patches-3.18/503-yaffs-add-tags-9bytes-mount-option.patch b/trunk/target/linux/generic/patches-3.18/503-yaffs-add-tags-9bytes-mount-option.patch
new file mode 100644
index 00000000..4858519c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/503-yaffs-add-tags-9bytes-mount-option.patch
@@ -0,0 +1,123 @@
+Subject: yaffs: add support for tags-9bytes mount option
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -2634,6 +2634,7 @@ static const struct super_operations yaf
+ 
+ struct yaffs_options {
+ 	int inband_tags;
++	int tags_9bytes;
+ 	int skip_checkpoint_read;
+ 	int skip_checkpoint_write;
+ 	int no_cache;
+@@ -2673,6 +2674,8 @@ static int yaffs_parse_options(struct ya
+ 
+ 		if (!strcmp(cur_opt, "inband-tags")) {
+ 			options->inband_tags = 1;
++		} else if (!strcmp(cur_opt, "tags-9bytes")) {
++			options->tags_9bytes = 1;
+ 		} else if (!strcmp(cur_opt, "tags-ecc-off")) {
+ 			options->tags_ecc_on = 0;
+ 			options->tags_ecc_overridden = 1;
+@@ -2746,7 +2749,6 @@ static struct super_block *yaffs_interna
+ 	struct yaffs_param *param;
+ 
+ 	int read_only = 0;
+-	int inband_tags = 0;
+ 
+ 	struct yaffs_options options;
+ 
+@@ -2786,6 +2788,9 @@ static struct super_block *yaffs_interna
+ 
+ 	memset(&options, 0, sizeof(options));
+ 
++	if (IS_ENABLED(CONFIG_YAFFS_9BYTE_TAGS))
++		options.tags_9bytes = 1;
++
+ 	if (yaffs_parse_options(&options, data_str)) {
+ 		/* Option parsing failed */
+ 		return NULL;
+@@ -2819,17 +2824,22 @@ static struct super_block *yaffs_interna
+ 	}
+ 
+ 	/* Added NCB 26/5/2006 for completeness */
+-	if (yaffs_version == 2 && !options.inband_tags
+-	    && WRITE_SIZE(mtd) == 512) {
++	if (yaffs_version == 2 &&
++	    (!options.inband_tags || options.tags_9bytes) &&
++	    WRITE_SIZE(mtd) == 512) {
+ 		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1");
+ 		yaffs_version = 1;
+ 	}
+ 
+-	if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) ||
+-	    options.inband_tags)
+-		inband_tags = 1;
++	if (yaffs_version == 2 &&
++	    mtd->oobavail < sizeof(struct yaffs_packed_tags2)) {
++		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting inband tags");
++		options.inband_tags = 1;
++	}
+ 
+-	if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0)
++	err = yaffs_verify_mtd(mtd, yaffs_version, options.inband_tags,
++			       options.tags_9bytes);
++	if (err < 0)
+ 		return NULL;
+ 
+ 	/* OK, so if we got here, we have an MTD that's NAND and looks
+@@ -2890,7 +2900,8 @@ static struct super_block *yaffs_interna
+ 
+ 	param->n_reserved_blocks = 5;
+ 	param->n_caches = (options.no_cache) ? 0 : 10;
+-	param->inband_tags = inband_tags;
++	param->inband_tags = options.inband_tags;
++	param->tags_9bytes = options.tags_9bytes;
+ 
+ 	param->enable_xattr = 1;
+ 	if (options.lazy_loading_overridden)
+--- a/fs/yaffs2/yaffs_mtdif.c
++++ b/fs/yaffs2/yaffs_mtdif.c
+@@ -16,6 +16,7 @@
+ #include "yaffs_mtdif.h"
+ 
+ #include "linux/mtd/mtd.h"
++#include "uapi/linux/major.h"
+ #include "linux/types.h"
+ #include "linux/time.h"
+ #include "linux/mtd/nand.h"
+@@ -276,7 +277,8 @@ struct mtd_info * yaffs_get_mtd_device(d
+ 	return mtd;
+ }
+ 
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes)
+ {
+ 	if (yaffs_version == 2) {
+ 		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+@@ -295,6 +297,12 @@ int yaffs_verify_mtd(struct mtd_info *mt
+ 			);
+ 			return -1;
+ 		}
++
++		if (tags_9bytes && mtd->oobavail < 9) {
++			yaffs_trace(YAFFS_TRACE_ALWAYS,
++				    "MTD device does not support 9-byte tags");
++			return -1;
++		}
+ 	}
+ 
+ 	return 0;
+--- a/fs/yaffs2/yaffs_mtdif.h
++++ b/fs/yaffs2/yaffs_mtdif.h
+@@ -21,5 +21,6 @@
+ void yaffs_mtd_drv_install(struct yaffs_dev *dev);
+ struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
+ void yaffs_put_mtd_device(struct mtd_info *mtd);
+-int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags,
++		     int tags_9bytes);
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.18/504-yaffs-fix-compat-tags-handling.patch b/trunk/target/linux/generic/patches-3.18/504-yaffs-fix-compat-tags-handling.patch
new file mode 100644
index 00000000..a18cf6fd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/504-yaffs-fix-compat-tags-handling.patch
@@ -0,0 +1,239 @@
+Subject: yaffs: fix compat tags handling
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+--- a/fs/yaffs2/yaffs_tagscompat.c
++++ b/fs/yaffs2/yaffs_tagscompat.c
+@@ -17,7 +17,9 @@
+ #include "yaffs_getblockinfo.h"
+ #include "yaffs_trace.h"
+ 
++#if 0
+ static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
++#endif
+ 
+ 
+ /********** Tags ECC calculations  *********/
+@@ -71,6 +73,7 @@ int yaffs_check_tags_ecc(struct yaffs_ta
+ 	return 0;
+ }
+ 
++#if 0
+ /********** Tags **********/
+ 
+ static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
+@@ -379,3 +382,214 @@ void yaffs_tags_compat_install(struct ya
+ 	if(!dev->tagger.mark_bad_fn)
+ 		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
+ }
++#else
++
++#include "yaffs_packedtags1.h"
++
++static int yaffs_tags_compat_write(struct yaffs_dev *dev,
++				   int nand_chunk,
++				   const u8 *data,
++				   const struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	u8 tag_buf[9];
++	int retval;
++
++	/* we assume that yaffs_packed_tags1 and yaffs_tags are compatible */
++	compile_time_assertion(sizeof(struct yaffs_packed_tags1) == 12);
++	compile_time_assertion(sizeof(struct yaffs_tags) == 8);
++
++	yaffs_pack_tags1(&pt1, tags);
++	yaffs_calc_tags_ecc((struct yaffs_tags *)&pt1);
++
++	/* When deleting a chunk, the upper layer provides only skeletal
++	 * tags, one with is_deleted set.  However, we need to update the
++	 * tags, not erase them completely.  So we use the NAND write property
++	 * that only zeroed-bits stick and set tag bytes to all-ones and
++	 * zero just the (not) deleted bit.
++	 */
++	if (!dev->param.tags_9bytes) {
++		if (tags->is_deleted) {
++			memset(&pt1, 0xff, 8);
++			/* clear delete status bit to indicate deleted */
++			pt1.deleted = 0;
++		}
++		memcpy(tag_buf, &pt1, 8);
++	} else {
++		if (tags->is_deleted) {
++			memset(tag_buf, 0xff, 8);
++			tag_buf[8] = 0;
++		} else {
++			memcpy(tag_buf, &pt1, 8);
++			tag_buf[8] = 0xff;
++		}
++	}
++
++	retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk,
++			data,
++			(data) ? dev->data_bytes_per_chunk : 0,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8);
++
++	return retval;
++}
++
++/* Return with empty extended tags but add ecc_result.
++ */
++static int return_empty_tags(struct yaffs_ext_tags *tags,
++			     enum yaffs_ecc_result ecc_result,
++			     int retval)
++{
++	if (tags) {
++		memset(tags, 0, sizeof(*tags));
++		tags->ecc_result = ecc_result;
++	}
++
++	return retval;
++}
++
++static int yaffs_tags_compat_read(struct yaffs_dev *dev,
++				  int nand_chunk,
++				  u8 *data,
++				  struct yaffs_ext_tags *tags)
++{
++	struct yaffs_packed_tags1 pt1;
++	enum yaffs_ecc_result ecc_result;
++	int retval;
++	int deleted;
++	u8 tag_buf[9];
++
++	retval = dev->drv.drv_read_chunk_fn(dev, nand_chunk,
++			data, dev->param.total_bytes_per_chunk,
++			tag_buf,
++			(dev->param.tags_9bytes) ? 9 : 8,
++			&ecc_result);
++
++	switch (ecc_result) {
++	case YAFFS_ECC_RESULT_NO_ERROR:
++	case YAFFS_ECC_RESULT_FIXED:
++		break;
++
++	case YAFFS_ECC_RESULT_UNFIXED:
++	default:
++		return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED, 0);
++		tags->block_bad = dev->drv.drv_check_bad_fn(dev, nand_chunk);
++		return YAFFS_FAIL;
++	}
++
++	/* Check for a blank/erased chunk. */
++	if (yaffs_check_ff(tag_buf, 8)) {
++		/* when blank, upper layers want ecc_result to be <= NO_ERROR */
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_NO_ERROR,
++					 YAFFS_OK);
++	}
++
++	memcpy(&pt1, tag_buf, 8);
++
++	if (!dev->param.tags_9bytes) {
++		/* Read deleted status (bit) then return it to it's non-deleted
++		 * state before performing tags mini-ECC check. pt1.deleted is
++		 * inverted.
++		 */
++		deleted = !pt1.deleted;
++		pt1.deleted = 1;
++	} else {
++		deleted = (hweight8(tag_buf[8]) < 7) ? 1 : 0;
++	}
++
++	/* Check the packed tags mini-ECC and correct if necessary/possible. */
++	retval = yaffs_check_tags_ecc((struct yaffs_tags *)&pt1);
++	switch (retval) {
++	case 0:
++		/* no tags error, use MTD result */
++		break;
++	case 1:
++		/* recovered tags-ECC error */
++		dev->n_tags_ecc_fixed++;
++		if (ecc_result == YAFFS_ECC_RESULT_NO_ERROR)
++			ecc_result = YAFFS_ECC_RESULT_FIXED;
++		break;
++	default:
++		/* unrecovered tags-ECC error */
++		dev->n_tags_ecc_unfixed++;
++		return return_empty_tags(tags, YAFFS_ECC_RESULT_UNFIXED,
++					 YAFFS_FAIL);
++	}
++
++	/* Unpack the tags to extended form and set ECC result.
++	 * [set should_be_ff just to keep yaffs_unpack_tags1 happy]
++	 */
++	pt1.should_be_ff = 0xffffffff;
++	yaffs_unpack_tags1(tags, &pt1);
++	tags->ecc_result = ecc_result;
++
++	/* Set deleted state */
++	tags->is_deleted = deleted;
++	return YAFFS_OK;
++}
++
++static int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no)
++{
++	return dev->drv.drv_mark_bad_fn(dev, block_no);
++}
++
++static int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
++					 int block_no,
++					 enum yaffs_block_state *state,
++					 u32 *seq_number)
++{
++	struct yaffs_ext_tags tags;
++	int retval;
++
++	yaffs_trace(YAFFS_TRACE_MTD, "%s %d", __func__, block_no);
++
++	*seq_number = 0;
++
++	retval = dev->drv.drv_check_bad_fn(dev, block_no);
++	if (retval == YAFFS_FAIL) {
++		*state = YAFFS_BLOCK_STATE_DEAD;
++		goto out;
++	}
++
++	yaffs_tags_compat_read(dev, block_no * dev->param.chunks_per_block,
++			       NULL, &tags);
++
++	if (tags.ecc_result != YAFFS_ECC_RESULT_NO_ERROR) {
++		yaffs_trace(YAFFS_TRACE_MTD, "block %d is marked bad",
++			    block_no);
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else if (tags.chunk_used) {
++		*seq_number = tags.seq_number;
++		*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
++	} else {
++		*state = YAFFS_BLOCK_STATE_EMPTY;
++	}
++
++	retval = YAFFS_OK;
++
++out:
++	yaffs_trace(YAFFS_TRACE_MTD,
++		    "block query returns seq %u state %d",
++		    *seq_number, *state);
++
++	return retval;
++}
++
++void yaffs_tags_compat_install(struct yaffs_dev *dev)
++{
++	if (dev->param.is_yaffs2)
++		return;
++
++	if (!dev->tagger.write_chunk_tags_fn)
++		dev->tagger.write_chunk_tags_fn = yaffs_tags_compat_write;
++
++	if (!dev->tagger.read_chunk_tags_fn)
++		dev->tagger.read_chunk_tags_fn = yaffs_tags_compat_read;
++
++	if (!dev->tagger.query_block_fn)
++		dev->tagger.query_block_fn = yaffs_tags_compat_query_block;
++
++	if (!dev->tagger.mark_bad_fn)
++		dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad;
++}
++#endif
diff --git a/trunk/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch b/trunk/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch
new file mode 100644
index 00000000..ad11b302
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch
@@ -0,0 +1,25 @@
+From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 12 Apr 2011 19:55:41 +0200
+Subject: [PATCH] squashfs: update xz compressor options struct.
+
+Update the xz compressor options struct to match the squashfs userspace
+one.
+---
+ fs/squashfs/xz_wrapper.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/fs/squashfs/xz_wrapper.c
++++ b/fs/squashfs/xz_wrapper.c
+@@ -40,8 +40,10 @@ struct squashfs_xz {
+ };
+ 
+ struct disk_comp_opts {
+-	__le32 dictionary_size;
+ 	__le32 flags;
++	__le16 bit_opts;
++	__le16 fb;
++	__le32 dictionary_size;
+ };
+ 
+ struct comp_opts {
diff --git a/trunk/target/linux/generic/patches-3.18/530-jffs2_make_lzma_available.patch b/trunk/target/linux/generic/patches-3.18/530-jffs2_make_lzma_available.patch
new file mode 100644
index 00000000..c92209a7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/530-jffs2_make_lzma_available.patch
@@ -0,0 +1,5142 @@
+--- a/fs/jffs2/Kconfig
++++ b/fs/jffs2/Kconfig
+@@ -139,6 +139,15 @@ config JFFS2_LZO
+ 	  This feature was added in July, 2007. Say 'N' if you need
+ 	  compatibility with older bootloaders or kernels.
+ 
++config JFFS2_LZMA
++	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
++	select LZMA_COMPRESS
++	select LZMA_DECOMPRESS
++	depends on JFFS2_FS
++	default n
++	help
++	  JFFS2 wrapper to the LZMA C SDK
++
+ config JFFS2_RTIME
+ 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
+ 	depends on JFFS2_FS
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
+@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
+ jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
+ jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
+ jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
++jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
+ jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
++
++CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
+--- a/fs/jffs2/compr.c
++++ b/fs/jffs2/compr.c
+@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ /* Setting default compression mode */
+ #ifdef CONFIG_JFFS2_CMODE_NONE
+ 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
+@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
+ int jffs2_compressors_exit(void)
+ {
+ /* Unregistering compressors */
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
+--- a/fs/jffs2/compr.h
++++ b/fs/jffs2/compr.h
+@@ -29,9 +29,9 @@
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_LZARI_PRIORITY     30
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
+-
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
+ #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
+@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/fs/jffs2/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -375,14 +375,41 @@ static int __init init_jffs2_fs(void)
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
+ 
+-	pr_info("version 2.2."
++	pr_info("version 2.2"
+ #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+ 	       " (NAND)"
+ #endif
+ #ifdef CONFIG_JFFS2_SUMMARY
+-	       " (SUMMARY) "
++	       " (SUMMARY)"
+ #endif
+-	       " © 2001-2006 Red Hat, Inc.\n");
++#ifdef CONFIG_JFFS2_ZLIB
++	       " (ZLIB)"
++#endif
++#ifdef CONFIG_JFFS2_LZO
++	       " (LZO)"
++#endif
++#ifdef CONFIG_JFFS2_LZMA
++	       " (LZMA)"
++#endif
++#ifdef CONFIG_JFFS2_RTIME
++	       " (RTIME)"
++#endif
++#ifdef CONFIG_JFFS2_RUBIN
++	       " (RUBIN)"
++#endif
++#ifdef  CONFIG_JFFS2_CMODE_NONE
++	       " (CMODE_NONE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_PRIORITY
++	       " (CMODE_PRIORITY)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_SIZE
++	       " (CMODE_SIZE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
++	       " (CMODE_FAVOURLZO)"
++#endif
++	       " (c) 2001-2006 Red Hat, Inc.\n");
+ 
+ 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
+ 					     sizeof(struct jffs2_inode_info),
+--- a/include/uapi/linux/jffs2.h
++++ b/include/uapi/linux/jffs2.h
+@@ -46,6 +46,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,62 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <asm/types.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,115 @@
++/* LzFind.h -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_FIND_H
++#define __LZ_FIND_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  size_t directInputRem;
++  int btMode;
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
++    UInt32 *distances, UInt32 maxLen);
++
++/*
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,54 @@
++/* LzHash.h -- HASH functions for LZ algorithms
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_HASH_H
++#define __LZ_HASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,231 @@
++/* LzmaDec.h -- LZMA Decoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_DEC_H
++#define __LZMA_DEC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs,
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum
++{
++  LZMA_FINISH_ANY,   /* finish at any point */
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
++        You must use correct finish mode in that case. */
++
++typedef enum
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually.
++   For Buffer Interface you must always use variant 1.
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */
++
++/* You can use it, if you want to eliminate the overhead for data copying from
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,80 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_ENC_H
++#define __LZMA_ENC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */
++  int lp;          /* 0 <= lp <= 4, default = 0 */
++  int pb;          /* 0 <= pb <= 4, default = 2 */
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,226 @@
++/* Types.h -- Basic types
++2009-11-23 : Igor Pavlov : Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#include <stddef.h>
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
++
++#ifndef EXTERN_C_BEGIN
++#ifdef __cplusplus
++#define EXTERN_C_BEGIN extern "C" {
++#define EXTERN_C_END }
++#else
++#define EXTERN_C_BEGIN
++#define EXTERN_C_END
++#endif
++#endif
++
++EXTERN_C_BEGIN
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifdef _WIN32
++typedef DWORD WRes;
++#else
++typedef int WRes;
++#endif
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++#ifdef _SZ_NO_INT_64
++
++/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
++   NOTES: Some code will work incorrectly in that case! */
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _WIN32
++#define MY_STD_CALL __stdcall
++#else
++#define MY_STD_CALL
++#endif
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_FAST_CALL __fastcall
++
++#else
++
++#define MY_CDECL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++/* it can return SZ_ERROR_INPUT_EOF */
++SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
++SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
++SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++       (result < size) means error */
++} ISeqOutStream;
++
++typedef enum
++{
++  SZ_SEEK_SET = 0,
++  SZ_SEEK_CUR = 1,
++  SZ_SEEK_END = 2
++} ESzSeek;
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ISeekInStream;
++
++typedef struct
++{
++  SRes (*Look)(void *p, void **buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) > input(*size)) is not allowed
++       (output(*size) < input(*size)) is allowed */
++  SRes (*Skip)(void *p, size_t offset);
++    /* offset must be <= output(*size) of Look */
++
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* reads directly (without buffer). It's same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ILookInStream;
++
++SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
++SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
++
++/* reads via ILookInStream::Read */
++SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
++SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
++
++#define LookToRead_BUF_SIZE (1 << 14)
++
++typedef struct
++{
++  ILookInStream s;
++  ISeekInStream *realStream;
++  size_t pos;
++  size_t size;
++  Byte buf[LookToRead_BUF_SIZE];
++} CLookToRead;
++
++void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
++void LookToRead_Init(CLookToRead *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToLook;
++
++void SecToLook_CreateVTable(CSecToLook *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToRead;
++
++void SecToRead_CreateVTable(CSecToRead *p);
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++EXTERN_C_END
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -227,6 +227,12 @@ config LZ4_DECOMPRESS
+ 
+ source "lib/xz/Kconfig"
+ 
++config LZMA_COMPRESS
++    tristate
++
++config LZMA_DECOMPRESS
++    tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,6 +2,16 @@
+ # Makefile for some libs needed in the kernel.
+ #
+ 
++ifdef CONFIG_JFFS2_ZLIB
++	CONFIG_ZLIB_INFLATE:=y
++	CONFIG_ZLIB_DEFLATE:=y
++endif
++
++ifdef CONFIG_JFFS2_LZMA
++	CONFIG_LZMA_DECOMPRESS:=y
++	CONFIG_LZMA_COMPRESS:=y
++endif
++
+ ifdef CONFIG_FUNCTION_TRACER
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+@@ -85,6 +95,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
+ obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
+ obj-$(CONFIG_XZ_DEC) += xz/
+ obj-$(CONFIG_RAID6_PQ) += raid6/
++obj-$(CONFIG_LZMA_COMPRESS) += lzma/
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/lib/lzma/LzFind.c
+@@ -0,0 +1,761 @@
++/* LzFind.c -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  if (p->directInput)
++  {
++    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
++    if (curSize > p->directInputRem)
++      curSize = (UInt32)p->directInputRem;
++    p->directInputRem -= curSize;
++    p->streamPos += curSize;
++    if (p->directInputRem == 0)
++      p->streamEndWasReached = 1;
++    return;
++  }
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase,
++    p->buffer - p->keepSizeBefore,
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  if (p->directInput)
++    return 0;
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached)
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = historySize + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit)
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit)
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for (i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
++{
++  return (p->pos - p->historySize - 1) & kNormalizeMask;
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while (++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] =
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2)
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lib/lzma/LzmaDec.c
+@@ -0,0 +1,999 @@
++/* LzmaDec.c -- LZMA Decoder
++2009-09-20 : Igor Pavlov : Public domain */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; }
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded.
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
++Out:
++  Result:
++    SZ_OK - OK
++    SZ_ERROR_DATA - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        state -= (state < 4) ? state : 3;
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        state -= (state < 10) ? 3 : 6;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++      continue;
++    }
++    else
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance;
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while (--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1;
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++      }
++
++      len += kMatchMinLen;
++
++      if (limit == dicPos)
++        return SZ_ERROR_DATA;
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do
++            *(dest) = (Byte)*(dest + src);
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE *
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while (--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++{
++  p->needFlush = 1;
++  p->remainLen = 0;
++  p->tempBufSize = 0;
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p)
++{
++  p->dicPos = 0;
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1;
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = (SizeT)(p->buf - src);
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0)
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->probs);
++  p->probs = 0;
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->dic);
++  p->dic = 0;
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize;
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/LzmaEnc.c
+@@ -0,0 +1,2271 @@
++/* LzmaEnc.c -- LZMA Encoder
++2009-11-24 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include "LzmaEnc.h"
++
++/* disable MT */
++#define _7ZIP_ST
++
++#include "LzFind.h"
++#ifndef _7ZIP_ST
++#include "LzFindMt.h"
++#endif
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3;
++  if (p->lp < 0) p->lp = 0;
++  if (p->pb < 0) p->pb = 2;
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
++  if (p->numHashBytes < 0) p->numHashBytes = 4;
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0)
++    p->numThreads =
++      #ifndef _7ZIP_ST
++      ((p->btMode && p->algo) ? 2 : 1);
++      #else
++      1;
++      #endif
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos)
++{
++  UInt32 res;
++  BSR2_RET(pos, res);
++  return res;
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct
++{
++  UInt32 price;
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;
++
++  UInt32 posPrev;
++  UInt32 backPrev;
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6
++#define kDicLogSizeMin 0
++#define kDicLogSizeMax 32
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifndef _7ZIP_ST
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifndef _7ZIP_ST
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  UInt32 longestMatchLength;
++  UInt32 numPairs;
++  UInt32 numAvail;
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  int needInit;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifndef _7ZIP_ST
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++#define IsCharState(s) ((s) < 7)
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);
++  }
++  p->cacheSize++;
++  p->low = (UInt32)p->low << 8;
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++}
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numPairs;
++  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
++  ttt++;
++  {
++    UInt32 i;
++    for (i = 0; i < numPairs; i += 2)
++      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
++  }
++  #endif
++  if (numPairs > 0)
++  {
++    lenRes = p->matches[numPairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matches[numPairs - 1] + 1;
++      UInt32 numAvail = p->numAvail;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numPairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex;
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
++  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
++  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
++  UInt32 *matches;
++  const Byte *data;
++  Byte curByte, matchByte;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  if (numAvail < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++  curByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
++        (!IsCharState(p->state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == curByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= mainLen)
++  {
++    UInt32 offs = 0;
++    while (len > matches[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matches[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matches[offs])
++      {
++        offs += 2;
++        if (offs == numPairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
++    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
++    Bool nextIsChar;
++    Byte curByte, matchByte;
++    const Byte *data;
++    COptimal *curOpt;
++    COptimal *nextOpt;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    newLen = ReadMatchDistances(p, &numPairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numPairs = numPairs;
++      p->longestMatchLength = newLen;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price;
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    curByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price +=
++        (!IsCharState(state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++    }
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price)
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++    numAvailFull = p->numAvail;
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp < numAvailFull)
++        numAvailFull = temp;
++    }
++
++    if (numAvailFull < 2)
++      continue;
++    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
++
++    if (!nextIsChar && matchByte != curByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailFull)
++        limit = numAvailFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price +
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price)
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice =
++                price + p->repLenEnc.prices[posState][lenTest - 2] +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvail)
++    {
++      newLen = numAvail;
++      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
++      matches[numPairs] = newLen;
++      numPairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matches[offs])
++        offs += 2;
++      curBack = matches[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matches[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numPairs)
++            break;
++          curBack = matches[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
++  const Byte *data;
++  const UInt32 *matches;
++
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  *backRes = (UInt32)-1;
++  if (numAvail < 2)
++    return 1;
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++
++  repLen = repIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    if (len > repLen)
++    {
++      repIndex = i;
++      repLen = len;
++    }
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++
++  mainDist = 0; /* for GCC */
++  if (mainLen >= 2)
++  {
++    mainDist = matches[numPairs - 1];
++    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
++    {
++      if (!ChangePair(matches[numPairs - 3], mainDist))
++        break;
++      numPairs -= 2;
++      mainLen = matches[numPairs - 2];
++      mainDist = matches[numPairs - 1];
++    }
++    if (mainLen == 2 && mainDist >= 0x80)
++      mainLen = 1;
++  }
++
++  if (repLen >= 2 && (
++        (repLen + 1 >= mainLen) ||
++        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
++        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
++  {
++    *backRes = repIndex;
++    MovePos(p, repLen - 1);
++    return repLen;
++  }
++  
++  if (mainLen < 2 || numAvail <= 2)
++    return 1;
++
++  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
++  if (p->longestMatchLength >= 2)
++  {
++    UInt32 newDistance = matches[p->numPairs - 1];
++    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
++        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
++        (p->longestMatchLength > mainLen + 1) ||
++        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
++      return 1;
++  }
++  
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len, limit;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    limit = mainLen - 1;
++    for (len = 2; len < limit && data[len] == data2[len]; len++);
++    if (len >= limit)
++      return 1;
++  }
++  *backRes = mainDist + LZMA_NUM_REPS;
++  MovePos(p, mainLen - 2);
++  return mainLen;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  {
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->needInit)
++  {
++    p->matchFinder.Init(p->matchFinderObj);
++    p->needInit = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numPairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numPairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == (UInt32)-1)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifndef _7ZIP_ST
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifndef _7ZIP_ST
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for (i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize =
++  p->repLenEnc.tableSize =
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->matchFinderBase.directInput = 1;
++  p->matchFinderBase.bufferBase = (Byte *)src;
++  p->matchFinderBase.directInputRem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->needInit = 1;
++
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifndef _7ZIP_ST
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #else
++  pp = pp;
++  #endif
++}
++
++typedef struct
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
++{
++  SRes res = SZ_OK;
++
++  #ifndef _7ZIP_ST
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(p);
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
++  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++
++  p->rc.outStream = &outStream.funcTable;
++  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
++  if (res == SZ_OK)
++    res = LzmaEnc_Encode2(p, progress);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/Makefile
+@@ -0,0 +1,7 @@
++lzma_compress-objs := LzFind.o LzmaEnc.o
++lzma_decompress-objs := LzmaDec.o
++
++obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
++
++EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/trunk/target/linux/generic/patches-3.18/531-debloat_lzma.patch b/trunk/target/linux/generic/patches-3.18/531-debloat_lzma.patch
new file mode 100644
index 00000000..9f9690f1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/531-debloat_lzma.patch
@@ -0,0 +1,1021 @@
+--- a/include/linux/lzma/LzmaDec.h
++++ b/include/linux/lzma/LzmaDec.h
+@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
+   UInt32 dicSize;
+ } CLzmaProps;
+ 
+-/* LzmaProps_Decode - decodes properties
+-Returns:
+-  SZ_OK
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+-
+ 
+ /* ---------- LZMA Decoder state ---------- */
+ 
+@@ -70,8 +62,6 @@ typedef struct
+ 
+ #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
+ 
+-void LzmaDec_Init(CLzmaDec *p);
+-
+ /* There are two types of LZMA streams:
+      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
+      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+@@ -108,97 +98,6 @@ typedef enum
+ 
+ /* ELzmaStatus is used only as output value for function call */
+ 
+-
+-/* ---------- Interfaces ---------- */
+-
+-/* There are 3 levels of interfaces:
+-     1) Dictionary Interface
+-     2) Buffer Interface
+-     3) One Call Interface
+-   You can select any of these interfaces, but don't mix functions from different
+-   groups for same object. */
+-
+-
+-/* There are two variants to allocate state for Dictionary Interface:
+-     1) LzmaDec_Allocate / LzmaDec_Free
+-     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+-   You can use variant 2, if you set dictionary buffer manually.
+-   For Buffer Interface you must always use variant 1.
+-
+-LzmaDec_Allocate* can return:
+-  SZ_OK
+-  SZ_ERROR_MEM         - Memory allocation error
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-   
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
+-
+-SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
+-
+-/* ---------- Dictionary Interface ---------- */
+-
+-/* You can use it, if you want to eliminate the overhead for data copying from
+-   dictionary to some other external buffer.
+-   You must work with CLzmaDec variables directly in this interface.
+-
+-   STEPS:
+-     LzmaDec_Constr()
+-     LzmaDec_Allocate()
+-     for (each new stream)
+-     {
+-       LzmaDec_Init()
+-       while (it needs more decompression)
+-       {
+-         LzmaDec_DecodeToDic()
+-         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+-       }
+-     }
+-     LzmaDec_Free()
+-*/
+-
+-/* LzmaDec_DecodeToDic
+-   
+-   The decoding to internal dictionary buffer (CLzmaDec::dic).
+-   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (dicLimit).
+-  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+-  LZMA_FINISH_END - Stream must be finished after dicLimit.
+-
+-Returns:
+-  SZ_OK
+-    status:
+-      LZMA_STATUS_FINISHED_WITH_MARK
+-      LZMA_STATUS_NOT_FINISHED
+-      LZMA_STATUS_NEEDS_MORE_INPUT
+-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+-  SZ_ERROR_DATA - Data error
+-*/
+-
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+-/* ---------- Buffer Interface ---------- */
+-
+-/* It's zlib-like interface.
+-   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+-   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+-   to work with CLzmaDec variables manually.
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (*destLen).
+-  LZMA_FINISH_ANY - Decode just destLen bytes.
+-  LZMA_FINISH_END - Stream must be finished after (*destLen).
+-*/
+-
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+ /* ---------- One Call Interface ---------- */
+ 
+ /* LzmaDecode
+--- a/lib/lzma/LzmaDec.c
++++ b/lib/lzma/LzmaDec.c
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 
+   p->needFlush = 0;
+ }
+ 
+-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+ {
+   p->needFlush = 1;
+   p->remainLen = 0;
+@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
+     p->needInitState = 1;
+ }
+ 
+-void LzmaDec_Init(CLzmaDec *p)
++static void LzmaDec_Init(CLzmaDec *p)
+ {
+   p->dicPos = 0;
+   LzmaDec_InitDicAndState(p, True, True);
+@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
+   p->needInitState = 0;
+ }
+ 
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+     ELzmaFinishMode finishMode, ELzmaStatus *status)
+ {
+   SizeT inSize = *srcLen;
+@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
+   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
+ }
+ 
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+-{
+-  SizeT outSize = *destLen;
+-  SizeT inSize = *srcLen;
+-  *srcLen = *destLen = 0;
+-  for (;;)
+-  {
+-    SizeT inSizeCur = inSize, outSizeCur, dicPos;
+-    ELzmaFinishMode curFinishMode;
+-    SRes res;
+-    if (p->dicPos == p->dicBufSize)
+-      p->dicPos = 0;
+-    dicPos = p->dicPos;
+-    if (outSize > p->dicBufSize - dicPos)
+-    {
+-      outSizeCur = p->dicBufSize;
+-      curFinishMode = LZMA_FINISH_ANY;
+-    }
+-    else
+-    {
+-      outSizeCur = dicPos + outSize;
+-      curFinishMode = finishMode;
+-    }
+-
+-    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
+-    src += inSizeCur;
+-    inSize -= inSizeCur;
+-    *srcLen += inSizeCur;
+-    outSizeCur = p->dicPos - dicPos;
+-    memcpy(dest, p->dic + dicPos, outSizeCur);
+-    dest += outSizeCur;
+-    outSize -= outSizeCur;
+-    *destLen += outSizeCur;
+-    if (res != 0)
+-      return res;
+-    if (outSizeCur == 0 || outSize == 0)
+-      return SZ_OK;
+-  }
+-}
+-
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->probs);
+   p->probs = 0;
+ }
+ 
+-static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  alloc->Free(alloc, p->dic);
+-  p->dic = 0;
+-}
+-
+-void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  LzmaDec_FreeProbs(p, alloc);
+-  LzmaDec_FreeDict(p, alloc);
+-}
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+ {
+   UInt32 dicSize;
+   Byte d;
+@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+   return SZ_OK;
+ }
+ 
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+-{
+-  CLzmaProps propNew;
+-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  p->prop = propNew;
+-  return SZ_OK;
+-}
+-
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+ {
+   CLzmaProps propNew;
+-  SizeT dicBufSize;
+   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+   RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  dicBufSize = propNew.dicSize;
+-  if (p->dic == 0 || dicBufSize != p->dicBufSize)
+-  {
+-    LzmaDec_FreeDict(p, alloc);
+-    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
+-    if (p->dic == 0)
+-    {
+-      LzmaDec_FreeProbs(p, alloc);
+-      return SZ_ERROR_MEM;
+-    }
+-  }
+-  p->dicBufSize = dicBufSize;
+   p->prop = propNew;
+   return SZ_OK;
+ }
+--- a/include/linux/lzma/LzmaEnc.h
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
+ } CLzmaEncProps;
+ 
+ void LzmaEncProps_Init(CLzmaEncProps *p);
+-void LzmaEncProps_Normalize(CLzmaEncProps *p);
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+-
+ 
+ /* ---------- CLzmaEncHandle Interface ---------- */
+ 
+@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+ void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ 
+-/* ---------- One Call Interface ---------- */
+-
+-/* LzmaEncode
+-Return code:
+-  SZ_OK               - OK
+-  SZ_ERROR_MEM        - Memory allocation error
+-  SZ_ERROR_PARAM      - Incorrect paramater
+-  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+-  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+-*/
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzmaEnc.c
++++ b/lib/lzma/LzmaEnc.c
+@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
+   p->writeEndMark = 0;
+ }
+ 
+-void LzmaEncProps_Normalize(CLzmaEncProps *p)
++static void LzmaEncProps_Normalize(CLzmaEncProps *p)
+ {
+   int level = p->level;
+   if (level < 0) level = 5;
+@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
+       #endif
+ }
+ 
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+ {
+   CLzmaEncProps props = *props2;
+   LzmaEncProps_Normalize(&props);
+@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
+ 
+ #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
+ 
+-UInt32 GetPosSlot1(UInt32 pos)
++static UInt32 GetPosSlot1(UInt32 pos)
+ {
+   UInt32 res;
+   BSR2_RET(pos, res);
+@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
+ #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
+ #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+ 
+-void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
+ {
+   int c = 2, slotFast;
+   g_FastPos[0] = 0;
+@@ -339,58 +339,6 @@ typedef struct
+   CSaveState saveState;
+ } CLzmaEnc;
+ 
+-void LzmaEnc_SaveState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  CSaveState *dest = &p->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
+-}
+-
+-void LzmaEnc_RestoreState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *dest = (CLzmaEnc *)pp;
+-  const CSaveState *p = &dest->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
+-}
+-
+ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE
+   while (symbol < 0x10000);
+ }
+ 
+-void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
+ {
+   UInt32 i;
+   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
+@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc
+   p->matchPriceCount = 0;
+ }
+ 
+-void LzmaEnc_Construct(CLzmaEnc *p)
++static void LzmaEnc_Construct(CLzmaEnc *p)
+ {
+   RangeEnc_Construct(&p->rc);
+   MatchFinder_Construct(&p->matchFinderBase);
+@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+   return p;
+ }
+ 
+-void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->litProbs);
+   alloc->Free(alloc, p->saveState.litProbs);
+@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl
+   p->saveState.litProbs = 0;
+ }
+ 
+-void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   #ifndef _7ZIP_ST
+   MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
+@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U
+   return SZ_OK;
+ }
+ 
+-void LzmaEnc_Init(CLzmaEnc *p)
++static void LzmaEnc_Init(CLzmaEnc *p)
+ {
+   UInt32 i;
+   p->state = 0;
+@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p)
+   p->lpMask = (1 << p->lp) - 1;
+ }
+ 
+-void LzmaEnc_InitPrices(CLzmaEnc *p)
++static void LzmaEnc_InitPrices(CLzmaEnc *p)
+ {
+   if (!p->fastMode)
+   {
+@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
+   return SZ_OK;
+ }
+ 
+-static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  p->rc.outStream = outStream;
+-  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
+-}
+-
+-SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
+-    ISeqInStream *inStream, UInt32 keepWindowSize,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+-}
+-
+ static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
+ {
+   p->matchFinderBase.directInput = 1;
+@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc
+   p->matchFinderBase.directInputRem = srcLen;
+ }
+ 
+-SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+     UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
+   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+ }
+ 
+-void LzmaEnc_Finish(CLzmaEncHandle pp)
++static void LzmaEnc_Finish(CLzmaEncHandle pp)
+ {
+   #ifndef _7ZIP_ST
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo
+   return size;
+ }
+ 
+-
+-UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+-}
+-
+-const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+-}
+-
+-SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
+-    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  UInt64 nowPos64;
+-  SRes res;
+-  CSeqOutStreamBuf outStream;
+-
+-  outStream.funcTable.Write = MyWrite;
+-  outStream.data = dest;
+-  outStream.rem = *destLen;
+-  outStream.overflow = False;
+-
+-  p->writeEndMark = False;
+-  p->finished = False;
+-  p->result = SZ_OK;
+-
+-  if (reInit)
+-    LzmaEnc_Init(p);
+-  LzmaEnc_InitPrices(p);
+-  nowPos64 = p->nowPos64;
+-  RangeEnc_Init(&p->rc);
+-  p->rc.outStream = &outStream.funcTable;
+-
+-  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
+-  
+-  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+-  *destLen -= outStream.rem;
+-  if (outStream.overflow)
+-    return SZ_ERROR_OUTPUT_EOF;
+-
+-  return res;
+-}
+-
+ static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
+ {
+   SRes res = SZ_OK;
+@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p,
+   return res;
+ }
+ 
+-SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
+-  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
+-}
+-
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
+     return SZ_ERROR_OUTPUT_EOF;
+   return res;
+ }
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
+-  SRes res;
+-  if (p == 0)
+-    return SZ_ERROR_MEM;
+-
+-  res = LzmaEnc_SetProps(p, props);
+-  if (res == SZ_OK)
+-  {
+-    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
+-    if (res == SZ_OK)
+-      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
+-          writeEndMark, progress, alloc, allocBig);
+-  }
+-
+-  LzmaEnc_Destroy(p, alloc, allocBig);
+-  return res;
+-}
+--- a/include/linux/lzma/LzFind.h
++++ b/include/linux/lzma/LzFind.h
+@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
+ 
+ #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p);
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+-void MatchFinder_MoveBlock(CMatchFinder *p);
+-void MatchFinder_ReadIfRequired(CMatchFinder *p);
+-
+ void MatchFinder_Construct(CMatchFinder *p);
+ 
+ /* Conditions:
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 
+     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+     ISzAlloc *alloc);
+ void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+-    UInt32 *distances, UInt32 maxLen);
+ 
+ /*
+ Conditions:
+@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
+ 
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+ 
+-void MatchFinder_Init(CMatchFinder *p);
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzFind.c
++++ b/lib/lzma/LzFind.c
+@@ -14,9 +14,15 @@
+ 
+ #define kStartMaxLen 3
+ 
++#if 0
++#define DIRECT_INPUT	p->directInput
++#else
++#define DIRECT_INPUT	1
++#endif
++
+ static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
+ {
+-  if (!p->directInput)
++  if (!DIRECT_INPUT)
+   {
+     alloc->Free(alloc, p->bufferBase);
+     p->bufferBase = 0;
+@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder
+ static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
+ {
+   UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     p->blockSize = blockSize;
+     return 1;
+@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde
+   return (p->bufferBase != 0);
+ }
+ 
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+-Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
+ 
+-UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+ 
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+ {
+   p->posLimit -= subValue;
+   p->pos -= subValue;
+@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch
+ {
+   if (p->streamEndWasReached || p->result != SZ_OK)
+     return;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     UInt32 curSize = 0xFFFFFFFF - p->streamPos;
+     if (curSize > p->directInputRem)
+@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch
+   }
+ }
+ 
+-void MatchFinder_MoveBlock(CMatchFinder *p)
++static void MatchFinder_MoveBlock(CMatchFinder *p)
+ {
+   memmove(p->bufferBase,
+     p->buffer - p->keepSizeBefore,
+@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder 
+   p->buffer = p->bufferBase + p->keepSizeBefore;
+ }
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p)
++static int MatchFinder_NeedMove(CMatchFinder *p)
+ {
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+     return 0;
+   /* if (p->streamEndWasReached) return 0; */
+   return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
+ }
+ 
+-void MatchFinder_ReadIfRequired(CMatchFinder *p)
+-{
+-  if (p->streamEndWasReached)
+-    return;
+-  if (p->keepSizeAfter >= p->streamPos - p->pos)
+-    MatchFinder_ReadBlock(p);
+-}
+-
+ static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
+ {
+   if (MatchFinder_NeedMove(p))
+@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch
+   p->posLimit = p->pos + limit;
+ }
+ 
+-void MatchFinder_Init(CMatchFinder *p)
++static void MatchFinder_Init(CMatchFinder *p)
+ {
+   UInt32 i;
+   for (i = 0; i < p->hashSizeSum; i++)
+@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM
+   return (p->pos - p->historySize - 1) & kNormalizeMask;
+ }
+ 
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
+ {
+   UInt32 i;
+   for (i = 0; i < numItems; i++)
+@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat
+   MatchFinder_SetLimits(p);
+ }
+ 
+-static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+-    UInt32 *distances, UInt32 maxLen)
+-{
+-  son[_cyclicBufferPos] = curMatch;
+-  for (;;)
+-  {
+-    UInt32 delta = pos - curMatch;
+-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+-      return distances;
+-    {
+-      const Byte *pb = cur - delta;
+-      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+-      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
+-      {
+-        UInt32 len = 0;
+-        while (++len != lenLimit)
+-          if (pb[len] != cur[len])
+-            break;
+-        if (maxLen < len)
+-        {
+-          *distances++ = maxLen = len;
+-          *distances++ = delta - 1;
+-          if (len == lenLimit)
+-            return distances;
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+     UInt32 *distances, UInt32 maxLen)
+ {
+@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi
+   p->buffer++; \
+   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
+ 
+-#define MOVE_POS_RET MOVE_POS return offset;
+-
+ static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
+ 
++#define MOVE_POS_RET MatchFinder_MovePos(p); return offset;
++
+ #define GET_MATCHES_HEADER2(minLen, ret_op) \
+   UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
+   lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
+@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi
+   distances + offset, maxLen) - distances); MOVE_POS_RET;
+ 
+ #define SKIP_FOOTER \
+-  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
+-
+-static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(2)
+-  HASH2_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 1)
+-}
+-
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 2)
+-}
+-
+-static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, delta2, maxLen, offset;
+-  GET_MATCHES_HEADER(3)
+-
+-  HASH3_CALC;
+-
+-  delta2 = p->pos - p->hash[hash2Value];
+-  curMatch = p->hash[kFix3HashSize + hashValue];
+-  
+-  p->hash[hash2Value] =
+-  p->hash[kFix3HashSize + hashValue] = p->pos;
+-
+-
+-  maxLen = 2;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[0] = maxLen;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-    if (maxLen == lenLimit)
+-    {
+-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+-      MOVE_POS_RET;
+-    }
+-  }
+-  GET_MATCHES_FOOTER(offset, maxLen)
+-}
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p);
+ 
+ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+ {
+@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches
+   GET_MATCHES_FOOTER(offset, maxLen)
+ }
+ 
+-static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
+-  GET_MATCHES_HEADER(4)
+-
+-  HASH4_CALC;
+-
+-  delta2 = p->pos - p->hash[                hash2Value];
+-  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
+-  curMatch = p->hash[kFix4HashSize + hashValue];
+-
+-  p->hash[                hash2Value] =
+-  p->hash[kFix3HashSize + hash3Value] =
+-  p->hash[kFix4HashSize + hashValue] = p->pos;
+-
+-  maxLen = 1;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    distances[0] = maxLen = 2;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-  }
+-  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
+-  {
+-    maxLen = 3;
+-    distances[offset + 1] = delta3 - 1;
+-    offset += 2;
+-    delta2 = delta3;
+-  }
+-  if (offset != 0)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[offset - 2] = maxLen;
+-    if (maxLen == lenLimit)
+-    {
+-      p->son[p->cyclicBufferPos] = curMatch;
+-      MOVE_POS_RET;
+-    }
+-  }
+-  if (maxLen < 3)
+-    maxLen = 3;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances + offset, maxLen) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances, 2) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(2)
+-    HASH2_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value;
+-    SKIP_HEADER(3)
+-    HASH3_CALC;
+-    curMatch = p->hash[kFix3HashSize + hashValue];
+-    p->hash[hash2Value] =
+-    p->hash[kFix3HashSize + hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+ static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+ {
+   do
+@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF
+   while (--num != 0);
+ }
+ 
+-static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value, hash3Value;
+-    SKIP_HEADER(4)
+-    HASH4_CALC;
+-    curMatch = p->hash[kFix4HashSize + hashValue];
+-    p->hash[                hash2Value] =
+-    p->hash[kFix3HashSize + hash3Value] =
+-    p->hash[kFix4HashSize + hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
+ {
+   vTable->Init = (Mf_Init_Func)MatchFinder_Init;
+   vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
+   vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
+   vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
+-  if (!p->btMode)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 2)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 3)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
+-  }
+-  else
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+-  }
++  vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++  vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+ }
diff --git a/trunk/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch b/trunk/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch
new file mode 100644
index 00000000..26917906
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch
@@ -0,0 +1,56 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
+ 	dbg_fsbuild("scanned flash completely\n");
+ 	jffs2_dbg_dump_block_lists_nolock(c);
+ 
++	if (c->flags & (1 << 7)) {
++		printk("%s(): unlocking the mtd device... ", __func__);
++		mtd_unlock(c->mtd, 0, c->mtd->size);
++		printk("done.\n");
++
++		printk("%s(): erasing all blocks after the end marker... ", __func__);
++		jffs2_erase_pending_blocks(c, -1);
++		printk("done.\n");
++	}
++
+ 	dbg_fsbuild("pass 1 starting\n");
+ 	c->flags |= JFFS2_SB_FLAG_BUILDING;
+ 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in
+ 		/* reset summary info for next eraseblock scan */
+ 		jffs2_sum_reset_collected(s);
+ 
+-		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
+-						buf_size, s);
++		if (c->flags & (1 << 7)) {
++			if (mtd_block_isbad(c->mtd, jeb->offset))
++				ret = BLK_STATE_BADBLOCK;
++			else
++				ret = BLK_STATE_ALLFF;
++		} else
++			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
++							buf_size, s);
+ 
+ 		if (ret < 0)
+ 			goto out;
+@@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct
+ 			return err;
+ 	}
+ 
++	if ((buf[0] == 0xde) &&
++		(buf[1] == 0xad) &&
++		(buf[2] == 0xc0) &&
++		(buf[3] == 0xde)) {
++		/* end of filesystem. erase everything after this point */
++		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
++		c->flags |= (1 << 7);
++
++		return BLK_STATE_ALLFF;
++	}
++
+ 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+ 	ofs = 0;
+ 	max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
diff --git a/trunk/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch
new file mode 100644
index 00000000..00b0b7ca
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/540-crypto-xz-decompression-support.patch
@@ -0,0 +1,146 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1437,6 +1437,13 @@ config CRYPTO_LZ4HC
+ 	help
+ 	  This is the LZ4 high compression mode algorithm.
+ 
++config CRYPTO_XZ
++	tristate "XZ compression algorithm"
++	select CRYPTO_ALGAPI
++	select XZ_DEC
++	help
++	  This is the XZ algorithm. Only decompression is supported for now.
++
+ comment "Random Number Generation"
+ 
+ config CRYPTO_ANSI_CPRNG
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -89,6 +89,7 @@ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.
+ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
+ obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
+ obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o
++obj-$(CONFIG_CRYPTO_XZ) += xz.o
+ obj-$(CONFIG_CRYPTO_842) += 842.o
+ obj-$(CONFIG_CRYPTO_RNG2) += rng.o
+ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
+--- /dev/null
++++ b/crypto/xz.c
+@@ -0,0 +1,117 @@
++/*
++ * Cryptographic API.
++ *
++ * XZ decompression support.
++ *
++ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ *
++ */
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/crypto.h>
++#include <linux/xz.h>
++#include <linux/interrupt.h>
++#include <linux/mm.h>
++#include <linux/net.h>
++
++struct xz_comp_ctx {
++	struct xz_dec	*decomp_state;
++	struct xz_buf	decomp_buf;
++};
++
++static int crypto_xz_decomp_init(struct xz_comp_ctx *ctx)
++{
++	ctx->decomp_state = xz_dec_init(XZ_SINGLE, 0);
++	if (!ctx->decomp_state)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void crypto_xz_decomp_exit(struct xz_comp_ctx *ctx)
++{
++	xz_dec_end(ctx->decomp_state);
++}
++
++static int crypto_xz_init(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	return crypto_xz_decomp_init(ctx);
++}
++
++static void crypto_xz_exit(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	crypto_xz_decomp_exit(ctx);
++}
++
++static int crypto_xz_compress(struct crypto_tfm *tfm, const u8 *src,
++			      unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	return -EOPNOTSUPP;
++}
++
++static int crypto_xz_decompress(struct crypto_tfm *tfm, const u8 *src,
++				unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	struct xz_comp_ctx *dctx = crypto_tfm_ctx(tfm);
++	struct xz_buf *xz_buf = &dctx->decomp_buf;
++	int ret;
++
++	memset(xz_buf, '\0', sizeof(struct xz_buf));
++
++	xz_buf->in = (u8 *) src;
++	xz_buf->in_pos = 0;
++	xz_buf->in_size = slen;
++	xz_buf->out = (u8 *) dst;
++	xz_buf->out_pos = 0;
++	xz_buf->out_size = *dlen;
++
++	ret = xz_dec_run(dctx->decomp_state, xz_buf);
++	if (ret != XZ_STREAM_END) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	*dlen = xz_buf->out_pos;
++	ret = 0;
++
++out:
++	return ret;
++}
++
++static struct crypto_alg crypto_xz_alg = {
++	.cra_name		= "xz",
++	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,
++	.cra_ctxsize		= sizeof(struct xz_comp_ctx),
++	.cra_module		= THIS_MODULE,
++	.cra_list		= LIST_HEAD_INIT(crypto_xz_alg.cra_list),
++	.cra_init		= crypto_xz_init,
++	.cra_exit		= crypto_xz_exit,
++	.cra_u			= { .compress = {
++	.coa_compress 		= crypto_xz_compress,
++	.coa_decompress  	= crypto_xz_decompress } }
++};
++
++static int __init crypto_xz_mod_init(void)
++{
++	return crypto_register_alg(&crypto_xz_alg);
++}
++
++static void __exit crypto_xz_mod_exit(void)
++{
++	crypto_unregister_alg(&crypto_xz_alg);
++}
++
++module_init(crypto_xz_mod_init);
++module_exit(crypto_xz_mod_exit);
++
++MODULE_LICENSE("GPL v2");
++MODULE_DESCRIPTION("Crypto XZ decompression support");
++MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/trunk/target/linux/generic/patches-3.18/541-ubifs-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.18/541-ubifs-xz-decompression-support.patch
new file mode 100644
index 00000000..f85689c5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/541-ubifs-xz-decompression-support.patch
@@ -0,0 +1,92 @@
+--- a/fs/ubifs/Kconfig
++++ b/fs/ubifs/Kconfig
+@@ -5,8 +5,10 @@ config UBIFS_FS
+ 	select CRYPTO if UBIFS_FS_ADVANCED_COMPR
+ 	select CRYPTO if UBIFS_FS_LZO
+ 	select CRYPTO if UBIFS_FS_ZLIB
++	select CRYPTO if UBIFS_FS_XZ
+ 	select CRYPTO_LZO if UBIFS_FS_LZO
+ 	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
++	select CRYPTO_XZ if UBIFS_FS_XZ
+ 	depends on MTD_UBI
+ 	help
+ 	  UBIFS is a file system for flash devices which works on top of UBI.
+@@ -35,3 +37,12 @@ config UBIFS_FS_ZLIB
+ 	default y
+ 	help
+ 	  Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
++
++config UBIFS_FS_XZ
++	bool "XZ decompression support" if UBIFS_FS_ADVANCED_COMPR
++	depends on UBIFS_FS
++	default y
++	help
++	  XZ compresses better the ZLIB but it is slower..
++	  Say 'Y' if unsure.
++
+--- a/fs/ubifs/compress.c
++++ b/fs/ubifs/compress.c
+@@ -71,6 +71,24 @@ static struct ubifs_compressor zlib_comp
+ };
+ #endif
+ 
++#ifdef CONFIG_UBIFS_FS_XZ
++static DEFINE_MUTEX(xz_enc_mutex);
++static DEFINE_MUTEX(xz_dec_mutex);
++
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.comp_mutex = &xz_enc_mutex,
++	.decomp_mutex = &xz_dec_mutex,
++	.name = "xz",
++	.capi_name = "xz",
++};
++#else
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.name = "xz",
++};
++#endif
++
+ /* All UBIFS compressors */
+ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
+ 
+@@ -232,9 +250,15 @@ int __init ubifs_compressors_init(void)
+ 	if (err)
+ 		goto out_lzo;
+ 
++	err = compr_init(&xz_compr);
++	if (err)
++		goto out_zlib;
++
+ 	ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+ 	return 0;
+ 
++out_zlib:
++	compr_exit(&zlib_compr);
+ out_lzo:
+ 	compr_exit(&lzo_compr);
+ 	return err;
+@@ -247,4 +271,5 @@ void ubifs_compressors_exit(void)
+ {
+ 	compr_exit(&lzo_compr);
+ 	compr_exit(&zlib_compr);
++	compr_exit(&xz_compr);
+ }
+--- a/fs/ubifs/ubifs-media.h
++++ b/fs/ubifs/ubifs-media.h
+@@ -332,12 +332,14 @@ enum {
+  * UBIFS_COMPR_NONE: no compression
+  * UBIFS_COMPR_LZO: LZO compression
+  * UBIFS_COMPR_ZLIB: ZLIB compression
++ * UBIFS_COMPR_XZ: XZ compression
+  * UBIFS_COMPR_TYPES_CNT: count of supported compression types
+  */
+ enum {
+ 	UBIFS_COMPR_NONE,
+ 	UBIFS_COMPR_LZO,
+ 	UBIFS_COMPR_ZLIB,
++	UBIFS_COMPR_XZ,
+ 	UBIFS_COMPR_TYPES_CNT,
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch b/trunk/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
new file mode 100644
index 00000000..d3f2ccca
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
@@ -0,0 +1,55 @@
+--- a/fs/ubifs/file.c
++++ b/fs/ubifs/file.c
+@@ -1573,6 +1573,10 @@ const struct inode_operations ubifs_syml
+ 	.follow_link = ubifs_follow_link,
+ 	.setattr     = ubifs_setattr,
+ 	.getattr     = ubifs_getattr,
++	.setxattr    = ubifs_setxattr,
++	.getxattr    = ubifs_getxattr,
++	.listxattr   = ubifs_listxattr,
++	.removexattr = ubifs_removexattr,
+ };
+ 
+ const struct file_operations ubifs_file_operations = {
+--- a/fs/ubifs/journal.c
++++ b/fs/ubifs/journal.c
+@@ -572,6 +572,13 @@ int ubifs_jnl_update(struct ubifs_info *
+ 	aligned_dlen = ALIGN(dlen, 8);
+ 	aligned_ilen = ALIGN(ilen, 8);
+ 	len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
++	if (xent) {
++		/*
++		 * Make sure to account for host_ui->data_len in
++		 * length calculation in case there is extended attribute.
++		 */
++		len += host_ui->data_len;
++	}
+ 	dent = kmalloc(len, GFP_NOFS);
+ 	if (!dent)
+ 		return -ENOMEM;
+@@ -648,7 +655,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	ino_key_init(c, &ino_key, dir->i_ino);
+ 	ino_offs += aligned_ilen;
+-	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ);
++	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs,
++			    UBIFS_INO_NODE_SZ + host_ui->data_len);
+ 	if (err)
+ 		goto out_ro;
+ 
+--- a/fs/ubifs/xattr.c
++++ b/fs/ubifs/xattr.c
+@@ -209,12 +209,12 @@ static int change_xattr(struct ubifs_inf
+ 		goto out_free;
+ 	}
+ 	inode->i_size = ui->ui_size = size;
+-	ui->data_len = size;
+ 
+ 	mutex_lock(&host_ui->ui_mutex);
+ 	host->i_ctime = ubifs_current_time(host);
+ 	host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len);
+ 	host_ui->xattr_size += CALC_XATTR_BYTES(size);
++	ui->data_len = size;
+ 
+ 	/*
+ 	 * It is important to write the host inode after the xattr inode
diff --git a/trunk/target/linux/generic/patches-3.18/551-ubifs-fix-default-compression-selection.patch b/trunk/target/linux/generic/patches-3.18/551-ubifs-fix-default-compression-selection.patch
new file mode 100644
index 00000000..1b0f3071
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/551-ubifs-fix-default-compression-selection.patch
@@ -0,0 +1,29 @@
+--- a/fs/ubifs/sb.c
++++ b/fs/ubifs/sb.c
+@@ -63,6 +63,17 @@
+ /* Default time granularity in nanoseconds */
+ #define DEFAULT_TIME_GRAN 1000000000
+ 
++static int get_default_compressor(void)
++{
++	if (ubifs_compr_present(UBIFS_COMPR_LZO))
++		return UBIFS_COMPR_LZO;
++
++	if (ubifs_compr_present(UBIFS_COMPR_ZLIB))
++		return UBIFS_COMPR_ZLIB;
++
++	return UBIFS_COMPR_NONE;
++}
++
+ /**
+  * create_default_filesystem - format empty UBI volume.
+  * @c: UBIFS file-system description object
+@@ -183,7 +194,7 @@ static int create_default_filesystem(str
+ 	if (c->mount_opts.override_compr)
+ 		sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
+ 	else
+-		sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO);
++		sup->default_compr = cpu_to_le16(get_default_compressor());
+ 
+ 	generate_random_uuid(sup->uuid);
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/600-netfilter_layer7_2.22.patch b/trunk/target/linux/generic/patches-3.18/600-netfilter_layer7_2.22.patch
new file mode 100644
index 00000000..bdf6c88e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/600-netfilter_layer7_2.22.patch
@@ -0,0 +1,2141 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1381,6 +1381,27 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on NETFILTER_XTABLES
++	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
++       depends on NETFILTER_ADVANCED
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++        bool 'Layer 7 debugging output'
++        depends on NETFILTER_XT_MATCH_LAYER7
++        help
++          Say Y to get lots of debugging output.
++
++
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -165,6 +165,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
+--- /dev/null
++++ b/net/netfilter/xt_layer7.c
+@@ -0,0 +1,666 @@
++/*
++  Kernel module to match application layer (OSI layer 7) data in connections.
++
++  http://l7-filter.sf.net
++
++  (C) 2003-2009 Matthew Strait and Ethan Sommer.
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU General Public License
++  as published by the Free Software Foundation; either version
++  2 of the License, or (at your option) any later version.
++  http://www.gnu.org/licenses/gpl.txt
++
++  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
++  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
++  Ethan Sommer, Justin Levandoski.
++*/
++
++#include <linux/spinlock.h>
++#include <linux/version.h>
++#include <net/ip.h>
++#include <net/tcp.h>
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_acct.h>
++#endif
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_layer7.h>
++#include <linux/ctype.h>
++#include <linux/proc_fs.h>
++
++#include "regexp/regexp.c"
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
++MODULE_DESCRIPTION("iptables application layer match module");
++MODULE_ALIAS("ipt_layer7");
++MODULE_VERSION("2.21");
++
++static int maxdatalen = 2048; // this is the default
++module_param(maxdatalen, int, 0444);
++MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
++#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
++	#define DPRINTK(format,args...) printk(format,##args)
++#else
++	#define DPRINTK(format,args...)
++#endif
++
++/* Number of packets whose data we look at.
++This can be modified through /proc/net/layer7_numpackets */
++static int num_packets = 10;
++
++static struct pattern_cache {
++	char * regex_string;
++	regexp * pattern;
++	struct pattern_cache * next;
++} * first_pattern_cache = NULL;
++
++DEFINE_SPINLOCK(l7_lock);
++
++static int total_acct_packets(struct nf_conn *ct)
++{
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
++	BUG_ON(ct == NULL);
++	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
++#else
++	struct nf_conn_counter *acct;
++
++	BUG_ON(ct == NULL);
++	acct = nf_conn_acct_find(ct);
++	if (!acct)
++		return 0;
++	return (atomic64_read(&acct[IP_CT_DIR_ORIGINAL].packets) + atomic64_read(&acct[IP_CT_DIR_REPLY].packets));
++#endif
++}
++
++#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++/* Converts an unfriendly string into a friendly one by
++replacing unprintables with periods and all whitespace with " ". */
++static char * friendly_print(unsigned char * s)
++{
++	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
++	int i;
++
++	if(!f) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"friendly_print, bailing.\n");
++		return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++){
++		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
++		else if(isspace(s[i]))		f[i] = ' ';
++		else 				f[i] = '.';
++	}
++	f[i] = '\0';
++	return f;
++}
++
++static char dec2hex(int i)
++{
++	switch (i) {
++		case 0 ... 9:
++			return (i + '0');
++			break;
++		case 10 ... 15:
++			return (i - 10 + 'a');
++			break;
++		default:
++			if (net_ratelimit())
++				printk("layer7: Problem in dec2hex\n");
++			return '\0';
++	}
++}
++
++static char * hex_print(unsigned char * s)
++{
++	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
++	int i;
++
++	if(!g) {
++	       if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in hex_print, "
++					"bailing.\n");
++	       return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++) {
++		g[i*3    ] = dec2hex(s[i]/16);
++		g[i*3 + 1] = dec2hex(s[i]%16);
++		g[i*3 + 2] = ' ';
++	}
++	g[i*3] = '\0';
++
++	return g;
++}
++#endif // DEBUG
++
++/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
++over again, it make sense to cache the results. */
++static regexp * compile_and_cache(const char * regex_string, 
++                                  const char * protocol)
++{
++	struct pattern_cache * node               = first_pattern_cache;
++	struct pattern_cache * last_pattern_cache = first_pattern_cache;
++	struct pattern_cache * tmp;
++	unsigned int len;
++
++	while (node != NULL) {
++		if (!strcmp(node->regex_string, regex_string))
++		return node->pattern;
++
++		last_pattern_cache = node;/* points at the last non-NULL node */
++		node = node->next;
++	}
++
++	/* If we reach the end of the list, then we have not yet cached
++	   the pattern for this regex. Let's do that now.
++	   Be paranoid about running out of memory to avoid list corruption. */
++	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
++
++	if(!tmp) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		return NULL;
++	}
++
++	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
++	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
++	tmp->next = NULL;
++
++	if(!tmp->regex_string || !tmp->pattern) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		kfree(tmp->regex_string);
++		kfree(tmp->pattern);
++		kfree(tmp);
++		return NULL;
++	}
++
++	/* Ok.  The new node is all ready now. */
++	node = tmp;
++
++	if(first_pattern_cache == NULL) /* list is empty */
++		first_pattern_cache = node; /* make node the beginning */
++	else
++		last_pattern_cache->next = node; /* attach node to the end */
++
++	/* copy the string and compile the regex */
++	len = strlen(regex_string);
++	DPRINTK("About to compile this: \"%s\"\n", regex_string);
++	node->pattern = regcomp((char *)regex_string, &len);
++	if ( !node->pattern ) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: Error compiling regexp "
++					"\"%s\" (%s)\n", 
++					regex_string, protocol);
++		/* pattern is now cached as NULL, so we won't try again. */
++	}
++
++	strcpy(node->regex_string, regex_string);
++	return node->pattern;
++}
++
++static int can_handle(const struct sk_buff *skb)
++{
++	if(!ip_hdr(skb)) /* not IP */
++		return 0;
++	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
++	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
++	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
++		return 0;
++	return 1;
++}
++
++/* Returns offset the into the skb->data that the application data starts */
++static int app_data_offset(const struct sk_buff *skb)
++{
++	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
++	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
++	int ip_hl = 4*ip_hdr(skb)->ihl;
++
++	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
++		/* 12 == offset into TCP header for the header length field.
++		Can't get this with skb->h.th->doff because the tcphdr
++		struct doesn't get set when routing (this is confirmed to be
++		true in Netfilter as well as QoS.) */
++		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
++
++		return ip_hl + tcp_hl;
++	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
++		return ip_hl + 8; /* UDP header is always 8 bytes */
++	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
++		return ip_hl + 8; /* ICMP header is 8 bytes */
++	} else {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: tried to handle unknown "
++					"protocol!\n");
++		return ip_hl + 8; /* something reasonable */
++	}
++}
++
++/* handles whether there's a match when we aren't appending data anymore */
++static int match_no_append(struct nf_conn * conntrack, 
++                           struct nf_conn * master_conntrack, 
++                           enum ip_conntrack_info ctinfo,
++                           enum ip_conntrack_info master_ctinfo,
++                           const struct xt_layer7_info * info)
++{
++	/* If we're in here, throw the app data away */
++	if(master_conntrack->layer7.app_data != NULL) {
++
++	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++		if(!master_conntrack->layer7.app_proto) {
++			char * f = 
++			  friendly_print(master_conntrack->layer7.app_data);
++			char * g = 
++			  hex_print(master_conntrack->layer7.app_data);
++			DPRINTK("\nl7-filter gave up after %d bytes "
++				"(%d packets):\n%s\n",
++				strlen(f), total_acct_packets(master_conntrack), f);
++			kfree(f);
++			DPRINTK("In hex: %s\n", g);
++			kfree(g);
++		}
++	#endif
++
++		kfree(master_conntrack->layer7.app_data);
++		master_conntrack->layer7.app_data = NULL; /* don't free again */
++	}
++
++	if(master_conntrack->layer7.app_proto){
++		/* Here child connections set their .app_proto (for /proc) */
++		if(!conntrack->layer7.app_proto) {
++			conntrack->layer7.app_proto = 
++			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
++			    GFP_ATOMIC);
++			if(!conntrack->layer7.app_proto){
++				if (net_ratelimit())
++					printk(KERN_ERR "layer7: out of memory "
++							"in match_no_append, "
++							"bailing.\n");
++				return 1;
++			}
++			strcpy(conntrack->layer7.app_proto, 
++				master_conntrack->layer7.app_proto);
++		}
++
++		return (!strcmp(master_conntrack->layer7.app_proto, 
++				info->protocol));
++	}
++	else {
++		/* If not classified, set to "unknown" to distinguish from
++		connections that are still being tested. */
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match_no_append, bailing.\n");
++			return 1;
++		}
++		strcpy(master_conntrack->layer7.app_proto, "unknown");
++		return 0;
++	}
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length = 0, i;
++	int oldlength = master_conntrack->layer7.app_data_len;
++
++	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
++	   clear on whether the race condition exists or whether this really 
++	   fixes it.  I might just be being dense... Anyway, if it's not really 
++	   a fix, all it does is waste a very small amount of time. */
++	if(!master_conntrack->layer7.app_data) return 0;
++
++	/* Strip nulls. Make everything lower case (our regex lib doesn't
++	do case insensitivity).  Add it to the end of the current data. */
++	for(i = 0; i < maxdatalen-oldlength-1 &&
++		   i < appdatalen; i++) {
++		if(app_data[i] != '\0') {
++			/* the kernel version of tolower mungs 'upper ascii' */
++			master_conntrack->layer7.app_data[length+oldlength] =
++				isascii(app_data[i])? 
++					tolower(app_data[i]) : app_data[i];
++			length++;
++		}
++	}
++
++	master_conntrack->layer7.app_data[length+oldlength] = '\0';
++	master_conntrack->layer7.app_data_len = length + oldlength;
++
++	return length;
++}
++
++/* taken from drivers/video/modedb.c */
++static int my_atoi(const char *s)
++{
++	int val = 0;
++
++	for (;; s++) {
++		switch (*s) {
++			case '0'...'9':
++			val = 10*val+(*s-'0');
++			break;
++		default:
++			return val;
++		}
++	}
++}
++
++/* write out num_packets to userland. */
++static int layer7_read_proc(char* page, char ** start, off_t off, int count,
++                            int* eof, void * data)
++{
++	if(num_packets > 99 && net_ratelimit())
++		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
++
++	page[0] = num_packets/10 + '0';
++	page[1] = num_packets%10 + '0';
++	page[2] = '\n';
++	page[3] = '\0';
++
++	*eof=1;
++
++	return 3;
++}
++
++/* Read in num_packets from userland */
++static int layer7_write_proc(struct file* file, const char* buffer,
++                             unsigned long count, void *data)
++{
++	char * foo = kmalloc(count, GFP_ATOMIC);
++
++	if(!foo){
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory, bailing. "
++					"num_packets unchanged.\n");
++		return count;
++	}
++
++	if(copy_from_user(foo, buffer, count)) {
++		return -EFAULT;
++	}
++
++
++	num_packets = my_atoi(foo);
++	kfree (foo);
++
++	/* This has an arbitrary limit to make the math easier. I'm lazy.
++	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
++	if(num_packets > 99) {
++		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
++		num_packets = 99;
++	} else if(num_packets < 1) {
++		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
++		num_packets = 1;
++	}
++
++	return count;
++}
++
++static bool
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++match(const struct sk_buff *skbin, const struct xt_match_param *par)
++#else
++match(const struct sk_buff *skbin,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      bool *hotdrop)
++#endif
++{
++	/* sidestep const without getting a compiler warning... */
++	struct sk_buff * skb = (struct sk_buff *)skbin; 
++
++	const struct xt_layer7_info * info = 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++		par->matchinfo;
++	#else
++		matchinfo;
++	#endif
++
++	enum ip_conntrack_info master_ctinfo, ctinfo;
++	struct nf_conn *master_conntrack, *conntrack;
++	unsigned char * app_data;
++	unsigned int pattern_result, appdatalen;
++	regexp * comppattern;
++
++	/* Be paranoid/incompetent - lock the entire match function. */
++	spin_lock_bh(&l7_lock);
++
++	if(!can_handle(skb)){
++		DPRINTK("layer7: This is some protocol I can't handle.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Treat parent & all its children together as one connection, except
++	for the purpose of setting conntrack->layer7.app_proto in the actual
++	connection. This makes /proc/net/ip_conntrack more satisfying. */
++	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
++	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
++		DPRINTK("layer7: couldn't get conntrack.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
++	while (master_ct(master_conntrack) != NULL)
++		master_conntrack = master_ct(master_conntrack);
++
++	/* if we've classified it or seen too many packets */
++	if(total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto) {
++
++		pattern_result = match_no_append(conntrack, master_conntrack, 
++						 ctinfo, master_ctinfo, info);
++
++		/* skb->cb[0] == seen. Don't do things twice if there are 
++		multiple l7 rules. I'm not sure that using cb for this purpose 
++		is correct, even though it says "put your private variables 
++		there". But it doesn't look like it is being used for anything
++		else in the skbs that make it here. */
++		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
++
++		spin_unlock_bh(&l7_lock);
++		return (pattern_result ^ info->invert);
++	}
++
++	if(skb_is_nonlinear(skb)){
++		if(skb_linearize(skb) != 0){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: failed to linearize "
++						"packet, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* now that the skb is linearized, it's safe to set these. */
++	app_data = skb->data + app_data_offset(skb);
++	appdatalen = skb_tail_pointer(skb) - app_data;
++
++	/* the return value gets checked later, when we're ready to use it */
++	comppattern = compile_and_cache(info->pattern, info->protocol);
++
++	/* On the first packet of a connection, allocate space for app data */
++	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
++	   !master_conntrack->layer7.app_data){
++		master_conntrack->layer7.app_data = 
++			kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++
++		master_conntrack->layer7.app_data[0] = '\0';
++	}
++
++	/* Can be here, but unallocated, if numpackets is increased near
++	the beginning of a connection */
++	if(master_conntrack->layer7.app_data == NULL){
++		spin_unlock_bh(&l7_lock);
++		return info->invert; /* unmatched */
++	}
++
++	if(!skb->cb[0]){
++		int newbytes;
++		newbytes = add_data(master_conntrack, app_data, appdatalen);
++
++		if(newbytes == 0) { /* didn't add any data */
++			skb->cb[0] = 1;
++			/* Didn't match before, not going to match now */
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* If looking for "unknown", then never match.  "Unknown" means that
++	we've given up; we're still trying with these packets. */
++	if(!strcmp(info->protocol, "unknown")) {
++		pattern_result = 0;
++	/* If looking for "unset", then always match. "Unset" means that we
++	haven't yet classified the connection. */
++	} else if(!strcmp(info->protocol, "unset")) {
++		pattern_result = 2;
++		DPRINTK("layer7: matched unset: not yet classified "
++			"(%d/%d packets)\n",
++                        total_acct_packets(master_conntrack), num_packets);
++	/* If the regexp failed to compile, don't bother running it */
++	} else if(comppattern && 
++		  regexec(comppattern, master_conntrack->layer7.app_data)){
++		DPRINTK("layer7: matched %s\n", info->protocol);
++		pattern_result = 1;
++	} else pattern_result = 0;
++
++	if(pattern_result == 1) {
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return (pattern_result ^ info->invert);
++		}
++		strcpy(master_conntrack->layer7.app_proto, info->protocol);
++	} else if(pattern_result > 1) { /* cleanup from "unset" */
++		pattern_result = 1;
++	}
++
++	/* mark the packet seen */
++	skb->cb[0] = 1;
++
++	spin_unlock_bh(&l7_lock);
++	return (pattern_result ^ info->invert);
++}
++
++// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++static bool check(const struct xt_mtchk_param *par)
++{
++        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", par->match->family);
++#else
++static bool check(const char *tablename, const void *inf,
++		 const struct xt_match *match, void *matchinfo,
++		 unsigned int hook_mask)
++{
++        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", match->family);
++#endif
++                return 0;
++        }
++	return 1;
++}
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++	static void destroy(const struct xt_mtdtor_param *par)
++	{
++		nf_ct_l3proto_module_put(par->match->family);
++	}
++#else
++	static void destroy(const struct xt_match *match, void *matchinfo)
++	{
++		nf_ct_l3proto_module_put(match->family);
++	}
++#endif
++
++static struct xt_match xt_layer7_match[] __read_mostly = {
++{
++	.name		= "layer7",
++	.family		= AF_INET,
++	.checkentry	= check,
++	.match		= match,
++	.destroy	= destroy,
++	.matchsize	= sizeof(struct xt_layer7_info),
++	.me		= THIS_MODULE
++}
++};
++
++static void layer7_cleanup_proc(void)
++{
++	remove_proc_entry("layer7_numpackets", init_net.proc_net);
++}
++
++/* register the proc file */
++static void layer7_init_proc(void)
++{
++	struct proc_dir_entry* entry;
++	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
++	entry->read_proc = layer7_read_proc;
++	entry->write_proc = layer7_write_proc;
++}
++
++static int __init xt_layer7_init(void)
++{
++	need_conntrack();
++
++	layer7_init_proc();
++	if(maxdatalen < 1) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
++			"using 1\n");
++		maxdatalen = 1;
++	}
++	/* This is not a hard limit.  It's just here to prevent people from
++	bringing their slow machines to a grinding halt. */
++	else if(maxdatalen > 65536) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
++			"using 65536\n");
++		maxdatalen = 65536;
++	}
++	return xt_register_matches(xt_layer7_match,
++				   ARRAY_SIZE(xt_layer7_match));
++}
++
++static void __exit xt_layer7_fini(void)
++{
++	layer7_cleanup_proc();
++	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
++}
++
++module_init(xt_layer7_init);
++module_exit(xt_layer7_fini);
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.c
+@@ -0,0 +1,1197 @@
++/*
++ * regcomp and regexec -- regsub and regerror are elsewhere
++ * @(#)regexp.c	1.3 of 18 April 87
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ * Beware that some of this code is subtly aware of the way operator
++ * precedence is structured in regular expressions.  Serious changes in
++ * regular-expression syntax might require a total rethink.
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ * Modified slightly by Matthew Strait to use more modern C.
++ */
++
++#include "regexp.h"
++#include "regmagic.h"
++
++/* added by ethan and matt.  Lets it work in both kernel and user space.
++(So iptables can use it, for instance.)  Yea, it goes both ways... */
++#if __KERNEL__
++  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
++#else
++  #define printk(format,args...) printf(format,##args)
++#endif
++
++void regerror(char * s)
++{
++        printk("<3>Regexp: %s\n", s);
++        /* NOTREACHED */
++}
++
++/*
++ * The "internal use only" fields in regexp.h are present to pass info from
++ * compile to execute that permits the execute phase to run lots faster on
++ * simple cases.  They are:
++ *
++ * regstart	char that must begin a match; '\0' if none obvious
++ * reganch	is the match anchored (at beginning-of-line only)?
++ * regmust	string (pointer into program) that match must include, or NULL
++ * regmlen	length of regmust string
++ *
++ * Regstart and reganch permit very fast decisions on suitable starting points
++ * for a match, cutting down the work a lot.  Regmust permits fast rejection
++ * of lines that cannot possibly match.  The regmust tests are costly enough
++ * that regcomp() supplies a regmust only if the r.e. contains something
++ * potentially expensive (at present, the only such thing detected is * or +
++ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
++ * supplied because the test in regexec() needs it and regcomp() is computing
++ * it anyway.
++ */
++
++/*
++ * Structure for regexp "program".  This is essentially a linear encoding
++ * of a nondeterministic finite-state machine (aka syntax charts or
++ * "railroad normal form" in parsing technology).  Each node is an opcode
++ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
++ * all nodes except BRANCH implement concatenation; a "next" pointer with
++ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
++ * have one of the subtle syntax dependencies:  an individual BRANCH (as
++ * opposed to a collection of them) is never concatenated with anything
++ * because of operator precedence.)  The operand of some types of node is
++ * a literal string; for others, it is a node leading into a sub-FSM.  In
++ * particular, the operand of a BRANCH node is the first node of the branch.
++ * (NB this is *not* a tree structure:  the tail of the branch connects
++ * to the thing following the set of BRANCHes.)  The opcodes are:
++ */
++
++/* definition	number	opnd?	meaning */
++#define	END	0	/* no	End of program. */
++#define	BOL	1	/* no	Match "" at beginning of line. */
++#define	EOL	2	/* no	Match "" at end of line. */
++#define	ANY	3	/* no	Match any one character. */
++#define	ANYOF	4	/* str	Match any character in this string. */
++#define	ANYBUT	5	/* str	Match any character not in this string. */
++#define	BRANCH	6	/* node	Match this alternative, or the next... */
++#define	BACK	7	/* no	Match "", "next" ptr points backward. */
++#define	EXACTLY	8	/* str	Match this string. */
++#define	NOTHING	9	/* no	Match empty string. */
++#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
++#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
++#define	OPEN	20	/* no	Mark this point in input as start of #n. */
++			/*	OPEN+1 is number 1, etc. */
++#define	CLOSE	30	/* no	Analogous to OPEN. */
++
++/*
++ * Opcode notes:
++ *
++ * BRANCH	The set of branches constituting a single choice are hooked
++ *		together with their "next" pointers, since precedence prevents
++ *		anything being concatenated to any individual branch.  The
++ *		"next" pointer of the last BRANCH in a choice points to the
++ *		thing following the whole choice.  This is also where the
++ *		final "next" pointer of each individual branch points; each
++ *		branch starts with the operand node of a BRANCH node.
++ *
++ * BACK		Normal "next" pointers all implicitly point forward; BACK
++ *		exists to make loop structures possible.
++ *
++ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
++ *		BRANCH structures using BACK.  Simple cases (one character
++ *		per match) are implemented with STAR and PLUS for speed
++ *		and to minimize recursive plunges.
++ *
++ * OPEN,CLOSE	...are numbered at compile time.
++ */
++
++/*
++ * A node is one char of opcode followed by two chars of "next" pointer.
++ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
++ * value is a positive offset from the opcode of the node containing it.
++ * An operand, if any, simply follows the node.  (Note that much of the
++ * code generation knows about this implicit relationship.)
++ *
++ * Using two bytes for the "next" pointer is vast overkill for most things,
++ * but allows patterns to get big without disasters.
++ */
++#define	OP(p)	(*(p))
++#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
++#define	OPERAND(p)	((p) + 3)
++
++/*
++ * See regmagic.h for one further detail of program structure.
++ */
++
++
++/*
++ * Utility definitions.
++ */
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#define	FAIL(m)	{ regerror(m); return(NULL); }
++#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
++#define	META	"^$.[()|?+*\\"
++
++/*
++ * Flags to be passed up and down.
++ */
++#define	HASWIDTH	01	/* Known never to match null string. */
++#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
++#define	SPSTART		04	/* Starts with * or +. */
++#define	WORST		0	/* Worst case. */
++
++/*
++ * Global work variables for regcomp().
++ */
++struct match_globals {
++char *reginput;		/* String-input pointer. */
++char *regbol;		/* Beginning of input, for ^ check. */
++char **regstartp;	/* Pointer to startp array. */
++char **regendp;		/* Ditto for endp. */
++char *regparse;		/* Input-scan pointer. */
++int regnpar;		/* () count. */
++char regdummy;
++char *regcode;		/* Code-emit pointer; &regdummy = don't. */
++long regsize;		/* Code size. */
++};
++
++/*
++ * Forward declarations for regcomp()'s friends.
++ */
++#ifndef STATIC
++#define	STATIC	static
++#endif
++STATIC char *reg(struct match_globals *g, int paren,int *flagp);
++STATIC char *regbranch(struct match_globals *g, int *flagp);
++STATIC char *regpiece(struct match_globals *g, int *flagp);
++STATIC char *regatom(struct match_globals *g, int *flagp);
++STATIC char *regnode(struct match_globals *g, char op);
++STATIC char *regnext(struct match_globals *g, char *p);
++STATIC void regc(struct match_globals *g, char b);
++STATIC void reginsert(struct match_globals *g, char op, char *opnd);
++STATIC void regtail(struct match_globals *g, char *p, char *val);
++STATIC void regoptail(struct match_globals *g, char *p, char *val);
++
++
++__kernel_size_t my_strcspn(const char *s1,const char *s2)
++{
++        char *scan1;
++        char *scan2;
++        int count;
++
++        count = 0;
++        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
++                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
++                        if (*scan1 == *scan2++)
++                                return(count);
++                count++;
++        }
++        return(count);
++}
++
++/*
++ - regcomp - compile a regular expression into internal code
++ *
++ * We can't allocate space until we know how big the compiled form will be,
++ * but we can't compile it (and thus know how big it is) until we've got a
++ * place to put the code.  So we cheat:  we compile it twice, once with code
++ * generation turned off and size counting turned on, and once "for real".
++ * This also means that we don't allocate space until we are sure that the
++ * thing really will compile successfully, and we never have to move the
++ * code and thus invalidate pointers into it.  (Note that it has to be in
++ * one piece because free() must be able to free it all.)
++ *
++ * Beware that the optimization-preparation code in here knows about some
++ * of the structure of the compiled regexp.
++ */
++regexp *
++regcomp(char *exp,int *patternsize)
++{
++	register regexp *r;
++	register char *scan;
++	register char *longest;
++	register int len;
++	int flags;
++	struct match_globals g;
++	
++	/* commented out by ethan
++	   extern char *malloc();
++	*/
++
++	if (exp == NULL)
++		FAIL("NULL argument");
++
++	/* First pass: determine size, legality. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regsize = 0L;
++	g.regcode = &g.regdummy;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Small enough for pointer-storage convention? */
++	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
++		FAIL("regexp too big");
++
++	/* Allocate space. */
++	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
++	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
++	if (r == NULL)
++		FAIL("out of space");
++
++	/* Second pass: emit code. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regcode = r->program;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Dig out information for optimizations. */
++	r->regstart = '\0';	/* Worst-case defaults. */
++	r->reganch = 0;
++	r->regmust = NULL;
++	r->regmlen = 0;
++	scan = r->program+1;			/* First BRANCH. */
++	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
++		scan = OPERAND(scan);
++
++		/* Starting-point info. */
++		if (OP(scan) == EXACTLY)
++			r->regstart = *OPERAND(scan);
++		else if (OP(scan) == BOL)
++			r->reganch++;
++
++		/*
++		 * If there's something expensive in the r.e., find the
++		 * longest literal string that must appear and make it the
++		 * regmust.  Resolve ties in favor of later strings, since
++		 * the regstart check works with the beginning of the r.e.
++		 * and avoiding duplication strengthens checking.  Not a
++		 * strong reason, but sufficient in the absence of others.
++		 */
++		if (flags&SPSTART) {
++			longest = NULL;
++			len = 0;
++			for (; scan != NULL; scan = regnext(&g, scan))
++				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
++					longest = OPERAND(scan);
++					len = strlen(OPERAND(scan));
++				}
++			r->regmust = longest;
++			r->regmlen = len;
++		}
++	}
++
++	return(r);
++}
++
++/*
++ - reg - regular expression, i.e. main body or parenthesized thing
++ *
++ * Caller must absorb opening parenthesis.
++ *
++ * Combining parenthesis handling with the base level of regular expression
++ * is a trifle forced, but the need to tie the tails of the branches to what
++ * follows makes it hard to avoid.
++ */
++static char *
++reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
++{
++	register char *ret;
++	register char *br;
++	register char *ender;
++	register int parno = 0; /* 0 makes gcc happy */
++	int flags;
++
++	*flagp = HASWIDTH;	/* Tentatively. */
++
++	/* Make an OPEN node, if parenthesized. */
++	if (paren) {
++		if (g->regnpar >= NSUBEXP)
++			FAIL("too many ()");
++		parno = g->regnpar;
++		g->regnpar++;
++		ret = regnode(g, OPEN+parno);
++	} else
++		ret = NULL;
++
++	/* Pick up the branches, linking them together. */
++	br = regbranch(g, &flags);
++	if (br == NULL)
++		return(NULL);
++	if (ret != NULL)
++		regtail(g, ret, br);	/* OPEN -> first. */
++	else
++		ret = br;
++	if (!(flags&HASWIDTH))
++		*flagp &= ~HASWIDTH;
++	*flagp |= flags&SPSTART;
++	while (*g->regparse == '|') {
++		g->regparse++;
++		br = regbranch(g, &flags);
++		if (br == NULL)
++			return(NULL);
++		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
++		if (!(flags&HASWIDTH))
++			*flagp &= ~HASWIDTH;
++		*flagp |= flags&SPSTART;
++	}
++
++	/* Make a closing node, and hook it on the end. */
++	ender = regnode(g, (paren) ? CLOSE+parno : END);	
++	regtail(g, ret, ender);
++
++	/* Hook the tails of the branches to the closing node. */
++	for (br = ret; br != NULL; br = regnext(g, br))
++		regoptail(g, br, ender);
++
++	/* Check for proper termination. */
++	if (paren && *g->regparse++ != ')') {
++		FAIL("unmatched ()");
++	} else if (!paren && *g->regparse != '\0') {
++		if (*g->regparse == ')') {
++			FAIL("unmatched ()");
++		} else
++			FAIL("junk on end");	/* "Can't happen". */
++		/* NOTREACHED */
++	}
++
++	return(ret);
++}
++
++/*
++ - regbranch - one alternative of an | operator
++ *
++ * Implements the concatenation operator.
++ */
++static char *
++regbranch(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char *chain;
++	register char *latest;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	ret = regnode(g, BRANCH);
++	chain = NULL;
++	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
++		latest = regpiece(g, &flags);
++		if (latest == NULL)
++			return(NULL);
++		*flagp |= flags&HASWIDTH;
++		if (chain == NULL)	/* First piece. */
++			*flagp |= flags&SPSTART;
++		else
++			regtail(g, chain, latest);
++		chain = latest;
++	}
++	if (chain == NULL)	/* Loop ran zero times. */
++		(void) regnode(g, NOTHING);
++
++	return(ret);
++}
++
++/*
++ - regpiece - something followed by possible [*+?]
++ *
++ * Note that the branching code sequences used for ? and the general cases
++ * of * and + are somewhat optimized:  they use the same NOTHING node as
++ * both the endmarker for their branch list and the body of the last branch.
++ * It might seem that this node could be dispensed with entirely, but the
++ * endmarker role is not redundant.
++ */
++static char *
++regpiece(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char op;
++	register char *next;
++	int flags;
++
++	ret = regatom(g, &flags);
++	if (ret == NULL)
++		return(NULL);
++
++	op = *g->regparse;
++	if (!ISMULT(op)) {
++		*flagp = flags;
++		return(ret);
++	}
++
++	if (!(flags&HASWIDTH) && op != '?')
++		FAIL("*+ operand could be empty");
++	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
++
++	if (op == '*' && (flags&SIMPLE))
++		reginsert(g, STAR, ret);
++	else if (op == '*') {
++		/* Emit x* as (x&|), where & means "self". */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regoptail(g, ret, regnode(g, BACK));		/* and loop */
++		regoptail(g, ret, ret);			/* back */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '+' && (flags&SIMPLE))
++		reginsert(g, PLUS, ret);
++	else if (op == '+') {
++		/* Emit x+ as x(&|), where & means "self". */
++		next = regnode(g, BRANCH);			/* Either */
++		regtail(g, ret, next);
++		regtail(g, regnode(g, BACK), ret);		/* loop back */
++		regtail(g, next, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '?') {
++		/* Emit x? as (x|) */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		next = regnode(g, NOTHING);		/* null. */
++		regtail(g, ret, next);
++		regoptail(g, ret, next);
++	}
++	g->regparse++;
++	if (ISMULT(*g->regparse))
++		FAIL("nested *?+");
++
++	return(ret);
++}
++
++/*
++ - regatom - the lowest level
++ *
++ * Optimization:  gobbles an entire sequence of ordinary characters so that
++ * it can turn them into a single node, which is smaller to store and
++ * faster to run.  Backslashed characters are exceptions, each becoming a
++ * separate node; the code is simpler that way and it's not worth fixing.
++ */
++static char *
++regatom(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	switch (*g->regparse++) {
++	case '^':
++		ret = regnode(g, BOL);
++		break;
++	case '$':
++		ret = regnode(g, EOL);
++		break;
++	case '.':
++		ret = regnode(g, ANY);
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	case '[': {
++			register int class;
++			register int classend;
++
++			if (*g->regparse == '^') {	/* Complement of range. */
++				ret = regnode(g, ANYBUT);
++				g->regparse++;
++			} else
++				ret = regnode(g, ANYOF);
++			if (*g->regparse == ']' || *g->regparse == '-')
++				regc(g, *g->regparse++);
++			while (*g->regparse != '\0' && *g->regparse != ']') {
++				if (*g->regparse == '-') {
++					g->regparse++;
++					if (*g->regparse == ']' || *g->regparse == '\0')
++						regc(g, '-');
++					else {
++						class = UCHARAT(g->regparse-2)+1;
++						classend = UCHARAT(g->regparse);
++						if (class > classend+1)
++							FAIL("invalid [] range");
++						for (; class <= classend; class++)
++							regc(g, class);
++						g->regparse++;
++					}
++				} else
++					regc(g, *g->regparse++);
++			}
++			regc(g, '\0');
++			if (*g->regparse != ']')
++				FAIL("unmatched []");
++			g->regparse++;
++			*flagp |= HASWIDTH|SIMPLE;
++		}
++		break;
++	case '(':
++		ret = reg(g, 1, &flags);
++		if (ret == NULL)
++			return(NULL);
++		*flagp |= flags&(HASWIDTH|SPSTART);
++		break;
++	case '\0':
++	case '|':
++	case ')':
++		FAIL("internal urp");	/* Supposed to be caught earlier. */
++		break;
++	case '?':
++	case '+':
++	case '*':
++		FAIL("?+* follows nothing");
++		break;
++	case '\\':
++		if (*g->regparse == '\0')
++			FAIL("trailing \\");
++		ret = regnode(g, EXACTLY);
++		regc(g, *g->regparse++);
++		regc(g, '\0');
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	default: {
++			register int len;
++			register char ender;
++
++			g->regparse--;
++			len = my_strcspn((const char *)g->regparse, (const char *)META);
++			if (len <= 0)
++				FAIL("internal disaster");
++			ender = *(g->regparse+len);
++			if (len > 1 && ISMULT(ender))
++				len--;		/* Back off clear of ?+* operand. */
++			*flagp |= HASWIDTH;
++			if (len == 1)
++				*flagp |= SIMPLE;
++			ret = regnode(g, EXACTLY);
++			while (len > 0) {
++				regc(g, *g->regparse++);
++				len--;
++			}
++			regc(g, '\0');
++		}
++		break;
++	}
++
++	return(ret);
++}
++
++/*
++ - regnode - emit a node
++ */
++static char *			/* Location. */
++regnode(struct match_globals *g, char op)
++{
++	register char *ret;
++	register char *ptr;
++
++	ret = g->regcode;
++	if (ret == &g->regdummy) {
++		g->regsize += 3;
++		return(ret);
++	}
++
++	ptr = ret;
++	*ptr++ = op;
++	*ptr++ = '\0';		/* Null "next" pointer. */
++	*ptr++ = '\0';
++	g->regcode = ptr;
++
++	return(ret);
++}
++
++/*
++ - regc - emit (if appropriate) a byte of code
++ */
++static void
++regc(struct match_globals *g, char b)
++{
++	if (g->regcode != &g->regdummy)
++		*g->regcode++ = b;
++	else
++		g->regsize++;
++}
++
++/*
++ - reginsert - insert an operator in front of already-emitted operand
++ *
++ * Means relocating the operand.
++ */
++static void
++reginsert(struct match_globals *g, char op, char* opnd)
++{
++	register char *src;
++	register char *dst;
++	register char *place;
++
++	if (g->regcode == &g->regdummy) {
++		g->regsize += 3;
++		return;
++	}
++
++	src = g->regcode;
++	g->regcode += 3;
++	dst = g->regcode;
++	while (src > opnd)
++		*--dst = *--src;
++
++	place = opnd;		/* Op node, where operand used to be. */
++	*place++ = op;
++	*place++ = '\0';
++	*place++ = '\0';
++}
++
++/*
++ - regtail - set the next-pointer at the end of a node chain
++ */
++static void
++regtail(struct match_globals *g, char *p, char *val)
++{
++	register char *scan;
++	register char *temp;
++	register int offset;
++
++	if (p == &g->regdummy)
++		return;
++
++	/* Find last node. */
++	scan = p;
++	for (;;) {
++		temp = regnext(g, scan);
++		if (temp == NULL)
++			break;
++		scan = temp;
++	}
++
++	if (OP(scan) == BACK)
++		offset = scan - val;
++	else
++		offset = val - scan;
++	*(scan+1) = (offset>>8)&0377;
++	*(scan+2) = offset&0377;
++}
++
++/*
++ - regoptail - regtail on operand of first argument; nop if operandless
++ */
++static void
++regoptail(struct match_globals *g, char *p, char *val)
++{
++	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
++	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
++		return;
++	regtail(g, OPERAND(p), val);
++}
++
++/*
++ * regexec and friends
++ */
++
++
++/*
++ * Forwards.
++ */
++STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
++STATIC int regmatch(struct match_globals *g, char *prog);
++STATIC int regrepeat(struct match_globals *g, char *p);
++
++#ifdef DEBUG
++int regnarrate = 0;
++void regdump();
++STATIC char *regprop(char *op);
++#endif
++
++/*
++ - regexec - match a regexp against a string
++ */
++int
++regexec(regexp *prog, char *string)
++{
++	register char *s;
++	struct match_globals g;
++
++	/* Be paranoid... */
++	if (prog == NULL || string == NULL) {
++		printk("<3>Regexp: NULL parameter\n");
++		return(0);
++	}
++
++	/* Check validity of program. */
++	if (UCHARAT(prog->program) != MAGIC) {
++		printk("<3>Regexp: corrupted program\n");
++		return(0);
++	}
++
++	/* If there is a "must appear" string, look for it. */
++	if (prog->regmust != NULL) {
++		s = string;
++		while ((s = strchr(s, prog->regmust[0])) != NULL) {
++			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
++				break;	/* Found it. */
++			s++;
++		}
++		if (s == NULL)	/* Not present. */
++			return(0);
++	}
++
++	/* Mark beginning of line for ^ . */
++	g.regbol = string;
++
++	/* Simplest case:  anchored match need be tried only once. */
++	if (prog->reganch)
++		return(regtry(&g, prog, string));
++
++	/* Messy cases:  unanchored match. */
++	s = string;
++	if (prog->regstart != '\0')
++		/* We know what char it must start with. */
++		while ((s = strchr(s, prog->regstart)) != NULL) {
++			if (regtry(&g, prog, s))
++				return(1);
++			s++;
++		}
++	else
++		/* We don't -- general case. */
++		do {
++			if (regtry(&g, prog, s))
++				return(1);
++		} while (*s++ != '\0');
++
++	/* Failure. */
++	return(0);
++}
++
++/*
++ - regtry - try match at specific point
++ */
++static int			/* 0 failure, 1 success */
++regtry(struct match_globals *g, regexp *prog, char *string)
++{
++	register int i;
++	register char **sp;
++	register char **ep;
++
++	g->reginput = string;
++	g->regstartp = prog->startp;
++	g->regendp = prog->endp;
++
++	sp = prog->startp;
++	ep = prog->endp;
++	for (i = NSUBEXP; i > 0; i--) {
++		*sp++ = NULL;
++		*ep++ = NULL;
++	}
++	if (regmatch(g, prog->program + 1)) {
++		prog->startp[0] = string;
++		prog->endp[0] = g->reginput;
++		return(1);
++	} else
++		return(0);
++}
++
++/*
++ - regmatch - main matching routine
++ *
++ * Conceptually the strategy is simple:  check to see whether the current
++ * node matches, call self recursively to see whether the rest matches,
++ * and then act accordingly.  In practice we make some effort to avoid
++ * recursion, in particular by going through "ordinary" nodes (that don't
++ * need to know whether the rest of the match failed) by a loop instead of
++ * by recursion.
++ */
++static int			/* 0 failure, 1 success */
++regmatch(struct match_globals *g, char *prog)
++{
++	register char *scan = prog; /* Current node. */
++	char *next;		    /* Next node. */
++
++#ifdef DEBUG
++	if (scan != NULL && regnarrate)
++		fprintf(stderr, "%s(\n", regprop(scan));
++#endif
++	while (scan != NULL) {
++#ifdef DEBUG
++		if (regnarrate)
++			fprintf(stderr, "%s...\n", regprop(scan));
++#endif
++		next = regnext(g, scan);
++
++		switch (OP(scan)) {
++		case BOL:
++			if (g->reginput != g->regbol)
++				return(0);
++			break;
++		case EOL:
++			if (*g->reginput != '\0')
++				return(0);
++			break;
++		case ANY:
++			if (*g->reginput == '\0')
++				return(0);
++			g->reginput++;
++			break;
++		case EXACTLY: {
++				register int len;
++				register char *opnd;
++
++				opnd = OPERAND(scan);
++				/* Inline the first character, for speed. */
++				if (*opnd != *g->reginput)
++					return(0);
++				len = strlen(opnd);
++				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
++					return(0);
++				g->reginput += len;
++			}
++			break;
++		case ANYOF:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case ANYBUT:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case NOTHING:
++		case BACK:
++			break;
++		case OPEN+1:
++		case OPEN+2:
++		case OPEN+3:
++		case OPEN+4:
++		case OPEN+5:
++		case OPEN+6:
++		case OPEN+7:
++		case OPEN+8:
++		case OPEN+9: {
++				register int no;
++				register char *save;
++
++				no = OP(scan) - OPEN;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set startp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regstartp[no] == NULL)
++						g->regstartp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case CLOSE+1:
++		case CLOSE+2:
++		case CLOSE+3:
++		case CLOSE+4:
++		case CLOSE+5:
++		case CLOSE+6:
++		case CLOSE+7:
++		case CLOSE+8:
++		case CLOSE+9:
++			{
++				register int no;
++				register char *save;
++
++				no = OP(scan) - CLOSE;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set endp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regendp[no] == NULL)
++						g->regendp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case BRANCH: {
++				register char *save;
++
++				if (OP(next) != BRANCH)		/* No choice. */
++					next = OPERAND(scan);	/* Avoid recursion. */
++				else {
++					do {
++						save = g->reginput;
++						if (regmatch(g, OPERAND(scan)))
++							return(1);
++						g->reginput = save;
++						scan = regnext(g, scan);
++					} while (scan != NULL && OP(scan) == BRANCH);
++					return(0);
++					/* NOTREACHED */
++				}
++			}
++			break;
++		case STAR:
++		case PLUS: {
++				register char nextch;
++				register int no;
++				register char *save;
++				register int min;
++
++				/*
++				 * Lookahead to avoid useless match attempts
++				 * when we know what character comes next.
++				 */
++				nextch = '\0';
++				if (OP(next) == EXACTLY)
++					nextch = *OPERAND(next);
++				min = (OP(scan) == STAR) ? 0 : 1;
++				save = g->reginput;
++				no = regrepeat(g, OPERAND(scan));
++				while (no >= min) {
++					/* If it could work, try it. */
++					if (nextch == '\0' || *g->reginput == nextch)
++						if (regmatch(g, next))
++							return(1);
++					/* Couldn't or didn't -- back up. */
++					no--;
++					g->reginput = save + no;
++				}
++				return(0);
++			}
++			break;
++		case END:
++			return(1);	/* Success! */
++			break;
++		default:
++			printk("<3>Regexp: memory corruption\n");
++			return(0);
++			break;
++		}
++
++		scan = next;
++	}
++
++	/*
++	 * We get here only if there's trouble -- normally "case END" is
++	 * the terminating point.
++	 */
++	printk("<3>Regexp: corrupted pointers\n");
++	return(0);
++}
++
++/*
++ - regrepeat - repeatedly match something simple, report how many
++ */
++static int
++regrepeat(struct match_globals *g, char *p)
++{
++	register int count = 0;
++	register char *scan;
++	register char *opnd;
++
++	scan = g->reginput;
++	opnd = OPERAND(p);
++	switch (OP(p)) {
++	case ANY:
++		count = strlen(scan);
++		scan += count;
++		break;
++	case EXACTLY:
++		while (*opnd == *scan) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYOF:
++		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYBUT:
++		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	default:		/* Oh dear.  Called inappropriately. */
++		printk("<3>Regexp: internal foulup\n");
++		count = 0;	/* Best compromise. */
++		break;
++	}
++	g->reginput = scan;
++
++	return(count);
++}
++
++/*
++ - regnext - dig the "next" pointer out of a node
++ */
++static char*
++regnext(struct match_globals *g, char *p)
++{
++	register int offset;
++
++	if (p == &g->regdummy)
++		return(NULL);
++
++	offset = NEXT(p);
++	if (offset == 0)
++		return(NULL);
++
++	if (OP(p) == BACK)
++		return(p-offset);
++	else
++		return(p+offset);
++}
++
++#ifdef DEBUG
++
++STATIC char *regprop();
++
++/*
++ - regdump - dump a regexp onto stdout in vaguely comprehensible form
++ */
++void
++regdump(regexp *r)
++{
++	register char *s;
++	register char op = EXACTLY;	/* Arbitrary non-END op. */
++	register char *next;
++	/* extern char *strchr(); */
++
++
++	s = r->program + 1;
++	while (op != END) {	/* While that wasn't END last time... */
++		op = OP(s);
++		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
++		next = regnext(s);
++		if (next == NULL)		/* Next ptr. */
++			printf("(0)");
++		else
++			printf("(%d)", (s-r->program)+(next-s));
++		s += 3;
++		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
++			/* Literal string, where present. */
++			while (*s != '\0') {
++				putchar(*s);
++				s++;
++			}
++			s++;
++		}
++		putchar('\n');
++	}
++
++	/* Header fields of interest. */
++	if (r->regstart != '\0')
++		printf("start `%c' ", r->regstart);
++	if (r->reganch)
++		printf("anchored ");
++	if (r->regmust != NULL)
++		printf("must have \"%s\"", r->regmust);
++	printf("\n");
++}
++
++/*
++ - regprop - printable representation of opcode
++ */
++static char *
++regprop(char *op)
++{
++#define BUFLEN 50
++	register char *p;
++	static char buf[BUFLEN];
++
++	strcpy(buf, ":");
++
++	switch (OP(op)) {
++	case BOL:
++		p = "BOL";
++		break;
++	case EOL:
++		p = "EOL";
++		break;
++	case ANY:
++		p = "ANY";
++		break;
++	case ANYOF:
++		p = "ANYOF";
++		break;
++	case ANYBUT:
++		p = "ANYBUT";
++		break;
++	case BRANCH:
++		p = "BRANCH";
++		break;
++	case EXACTLY:
++		p = "EXACTLY";
++		break;
++	case NOTHING:
++		p = "NOTHING";
++		break;
++	case BACK:
++		p = "BACK";
++		break;
++	case END:
++		p = "END";
++		break;
++	case OPEN+1:
++	case OPEN+2:
++	case OPEN+3:
++	case OPEN+4:
++	case OPEN+5:
++	case OPEN+6:
++	case OPEN+7:
++	case OPEN+8:
++	case OPEN+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
++		p = NULL;
++		break;
++	case CLOSE+1:
++	case CLOSE+2:
++	case CLOSE+3:
++	case CLOSE+4:
++	case CLOSE+5:
++	case CLOSE+6:
++	case CLOSE+7:
++	case CLOSE+8:
++	case CLOSE+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
++		p = NULL;
++		break;
++	case STAR:
++		p = "STAR";
++		break;
++	case PLUS:
++		p = "PLUS";
++		break;
++	default:
++		printk("<3>Regexp: corrupted opcode\n");
++		break;
++	}
++	if (p != NULL)
++		strncat(buf, p, BUFLEN-strlen(buf));
++	return(buf);
++}
++#endif
++
++
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.h
+@@ -0,0 +1,41 @@
++/*
++ * Definitions etc. for regexp(3) routines.
++ *
++ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
++ * not the System V one.
++ */
++
++#ifndef REGEXP_H
++#define REGEXP_H
++
++
++/*
++http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
++which contains a version of this library, says:
++
++ *
++ * NSUBEXP must be at least 10, and no greater than 117 or the parser
++ * will not work properly.
++ *
++
++However, it looks rather like this library is limited to 10.  If you think
++otherwise, let us know.
++*/
++
++#define NSUBEXP  10
++typedef struct regexp {
++	char *startp[NSUBEXP];
++	char *endp[NSUBEXP];
++	char regstart;		/* Internal use only. */
++	char reganch;		/* Internal use only. */
++	char *regmust;		/* Internal use only. */
++	int regmlen;		/* Internal use only. */
++	char program[1];	/* Unwarranted chumminess with compiler. */
++} regexp;
++
++regexp * regcomp(char *exp, int *patternsize);
++int regexec(regexp *prog, char *string);
++void regsub(regexp *prog, char *source, char *dest);
++void regerror(char *s);
++
++#endif
+--- /dev/null
++++ b/net/netfilter/regexp/regmagic.h
+@@ -0,0 +1,5 @@
++/*
++ * The first byte of the regexp internal "program" is actually this magic
++ * number; the start node begins in the second byte.
++ */
++#define	MAGIC	0234
+--- /dev/null
++++ b/net/netfilter/regexp/regsub.c
+@@ -0,0 +1,95 @@
++/*
++ * regsub
++ * @(#)regsub.c	1.3 of 2 April 86
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ */
++#include "regexp.h"
++#include "regmagic.h"
++#include <linux/string.h>
++
++
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#if 0
++//void regerror(char * s)
++//{
++//        printk("regexp(3): %s", s);
++//        /* NOTREACHED */
++//}
++#endif
++
++/*
++ - regsub - perform substitutions after a regexp match
++ */
++void
++regsub(regexp * prog, char * source, char * dest)
++{
++	register char *src;
++	register char *dst;
++	register char c;
++	register int no;
++	register int len;
++	
++	/* Not necessary and gcc doesn't like it -MLS */
++	/*extern char *strncpy();*/
++
++	if (prog == NULL || source == NULL || dest == NULL) {
++		regerror("NULL parm to regsub");
++		return;
++	}
++	if (UCHARAT(prog->program) != MAGIC) {
++		regerror("damaged regexp fed to regsub");
++		return;
++	}
++
++	src = source;
++	dst = dest;
++	while ((c = *src++) != '\0') {
++		if (c == '&')
++			no = 0;
++		else if (c == '\\' && '0' <= *src && *src <= '9')
++			no = *src++ - '0';
++		else
++			no = -1;
++
++		if (no < 0) {	/* Ordinary character. */
++			if (c == '\\' && (*src == '\\' || *src == '&'))
++				c = *src++;
++			*dst++ = c;
++		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
++			len = prog->endp[no] - prog->startp[no];
++			(void) strncpy(dst, prog->startp[no], len);
++			dst += len;
++			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
++				regerror("damaged match string");
++				return;
++			}
++		}
++	}
++	*dst++ = '\0';
++}
+--- a/net/netfilter/nf_conntrack_core.c
++++ b/net/netfilter/nf_conntrack_core.c
+@@ -278,6 +278,13 @@ static void nf_ct_del_from_dying_or_unco
+ {
+ 	struct ct_pcpu *pcpu;
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto)
++		kfree(ct->layer7.app_proto);
++	if(ct->layer7.app_data)
++		kfree(ct->layer7.app_data);
++#endif
++
+ 	/* We overload first tuple to link into unconfirmed or dying list.*/
+ 	pcpu = per_cpu_ptr(nf_ct_net(ct)->ct.pcpu_lists, ct->cpu);
+ 
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -240,6 +240,12 @@ static int ct_seq_show(struct seq_file *
+ 	if (ct_show_delta_time(s, ct))
+ 		goto release;
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto &&
++           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
++		return -ENOSPC;
++#endif
++
+ 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
+ 		goto release;
+ 
+--- a/include/net/netfilter/nf_conntrack.h
++++ b/include/net/netfilter/nf_conntrack.h
+@@ -112,6 +112,22 @@ struct nf_conn {
+ 	struct net *ct_net;
+ #endif
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
++    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	struct {
++		/*
++		 * e.g. "http". NULL before decision. "unknown" after decision
++		 * if no match.
++		 */
++		char *app_proto;
++		/*
++		 * application layer data so far. NULL after match decision.
++		 */
++		char *app_data;
++		unsigned int app_data_len;
++	} layer7;
++#endif
++
+ 	/* Storage reserved for other modules, must be the last member */
+ 	union nf_conntrack_proto proto;
+ };
+--- /dev/null
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -0,0 +1,13 @@
++#ifndef _XT_LAYER7_H
++#define _XT_LAYER7_H
++
++#define MAX_PATTERN_LEN 8192
++#define MAX_PROTOCOL_LEN 256
++
++struct xt_layer7_info {
++    char protocol[MAX_PROTOCOL_LEN];
++    char pattern[MAX_PATTERN_LEN];
++    u_int8_t invert;
++};
++
++#endif /* _XT_LAYER7_H */
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -59,6 +59,7 @@ header-y += xt_ipcomp.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+ header-y += xt_l2tp.h
++header-y += xt_layer7.h
+ header-y += xt_length.h
+ header-y += xt_limit.h
+ header-y += xt_mac.h
diff --git a/trunk/target/linux/generic/patches-3.18/601-netfilter_layer7_pktmatch.patch b/trunk/target/linux/generic/patches-3.18/601-netfilter_layer7_pktmatch.patch
new file mode 100644
index 00000000..f65e301f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/601-netfilter_layer7_pktmatch.patch
@@ -0,0 +1,108 @@
+--- a/include/linux/netfilter/xt_layer7.h
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
+     char protocol[MAX_PROTOCOL_LEN];
+     char pattern[MAX_PATTERN_LEN];
+     u_int8_t invert;
++    u_int8_t pkt;
+ };
+ 
+ #endif /* _XT_LAYER7_H */
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
+ }
+ 
+ /* add the new app data to the conntrack.  Return number of bytes added. */
+-static int add_data(struct nf_conn * master_conntrack,
+-                    char * app_data, int appdatalen)
++static int add_datastr(char *target, int offset, char *app_data, int len)
+ {
+ 	int length = 0, i;
+-	int oldlength = master_conntrack->layer7.app_data_len;
+-
+-	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
+-	   clear on whether the race condition exists or whether this really 
+-	   fixes it.  I might just be being dense... Anyway, if it's not really 
+-	   a fix, all it does is waste a very small amount of time. */
+-	if(!master_conntrack->layer7.app_data) return 0;
++	if (!target) return 0;
+ 
+ 	/* Strip nulls. Make everything lower case (our regex lib doesn't
+ 	do case insensitivity).  Add it to the end of the current data. */
+-	for(i = 0; i < maxdatalen-oldlength-1 &&
+-		   i < appdatalen; i++) {
++ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
+ 		if(app_data[i] != '\0') {
+ 			/* the kernel version of tolower mungs 'upper ascii' */
+-			master_conntrack->layer7.app_data[length+oldlength] =
++			target[length+offset] =
+ 				isascii(app_data[i])? 
+ 					tolower(app_data[i]) : app_data[i];
+ 			length++;
+ 		}
+ 	}
++	target[length+offset] = '\0';
++
++	return length;
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length;
+ 
+-	master_conntrack->layer7.app_data[length+oldlength] = '\0';
+-	master_conntrack->layer7.app_data_len = length + oldlength;
++	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
++	master_conntrack->layer7.app_data_len += length;
+ 
+ 	return length;
+ }
+@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
+ 
+ 	enum ip_conntrack_info master_ctinfo, ctinfo;
+ 	struct nf_conn *master_conntrack, *conntrack;
+-	unsigned char * app_data;
++	unsigned char *app_data, *tmp_data;
+ 	unsigned int pattern_result, appdatalen;
+ 	regexp * comppattern;
+ 
+@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
+ 		master_conntrack = master_ct(master_conntrack);
+ 
+ 	/* if we've classified it or seen too many packets */
+-	if(total_acct_packets(master_conntrack) > num_packets ||
+-	   master_conntrack->layer7.app_proto) {
++	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto)) {
+ 
+ 		pattern_result = match_no_append(conntrack, master_conntrack, 
+ 						 ctinfo, master_ctinfo, info);
+@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
+ 	/* the return value gets checked later, when we're ready to use it */
+ 	comppattern = compile_and_cache(info->pattern, info->protocol);
+ 
++	if (info->pkt) {
++		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!tmp_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
++			return info->invert;
++		}
++
++		tmp_data[0] = '\0';
++		add_datastr(tmp_data, 0, app_data, appdatalen);
++		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
++
++		kfree(tmp_data);
++		tmp_data = NULL;
++		spin_unlock_bh(&l7_lock);
++
++		return (pattern_result ^ info->invert);
++	}
++
+ 	/* On the first packet of a connection, allocate space for app data */
+ 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
+ 	   !master_conntrack->layer7.app_data){
diff --git a/trunk/target/linux/generic/patches-3.18/602-netfilter_layer7_match.patch b/trunk/target/linux/generic/patches-3.18/602-netfilter_layer7_match.patch
new file mode 100644
index 00000000..b2e48c82
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/602-netfilter_layer7_match.patch
@@ -0,0 +1,51 @@
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
+ 
+ static bool
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
+ #else
+ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
+ 
+ // load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
+ {
+         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ 		 const struct xt_match *match, void *matchinfo,
+ 		 unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++		return -EINVAL;
++	}
++	return 0;
++#else
+                 return 0;
+         }
+ 	return 1;
++#endif
+ }
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/603-netfilter_layer7_2.6.36_fix.patch b/trunk/target/linux/generic/patches-3.18/603-netfilter_layer7_2.6.36_fix.patch
new file mode 100644
index 00000000..024e37f9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/603-netfilter_layer7_2.6.36_fix.patch
@@ -0,0 +1,61 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1187,6 +1187,27 @@ config NETFILTER_XT_MATCH_L2TP
+ 
+ 	To compile it as a module, choose M here. If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on EXPERIMENTAL
++	depends on NETFILTER_XTABLES
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
++
+ config NETFILTER_XT_MATCH_LENGTH
+ 	tristate '"length" match support'
+ 	depends on NETFILTER_ADVANCED
+@@ -1381,26 +1402,11 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
+-config NETFILTER_XT_MATCH_LAYER7
+-	tristate '"layer7" match support'
+-	depends on NETFILTER_XTABLES
+-	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
+-       depends on NETFILTER_ADVANCED
+-	help
+-	  Say Y if you want to be able to classify connections (and their
+-	  packets) based on regular expression matching of their application
+-	  layer data.   This is one way to classify applications such as
+-	  peer-to-peer filesharing systems that do not always use the same
+-	  port.
+-
+-	  To compile it as a module, choose M here.  If unsure, say N.
+-
+ config NETFILTER_XT_MATCH_LAYER7_DEBUG
+-        bool 'Layer 7 debugging output'
+-        depends on NETFILTER_XT_MATCH_LAYER7
+-        help
+-          Say Y to get lots of debugging output.
+-
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
+ 
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
diff --git a/trunk/target/linux/generic/patches-3.18/604-netfilter_conntrack_flush.patch b/trunk/target/linux/generic/patches-3.18/604-netfilter_conntrack_flush.patch
new file mode 100644
index 00000000..83cd04ac
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,86 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -17,6 +17,7 @@
+ #include <linux/percpu.h>
+ #include <linux/netdevice.h>
+ #include <linux/security.h>
++#include <linux/inet.h>
+ #include <net/net_namespace.h>
+ #ifdef CONFIG_SYSCTL
+ #include <linux/sysctl.h>
+@@ -268,10 +269,66 @@ static int ct_open(struct inode *inode,
+ 			sizeof(struct ct_iter_state));
+ }
+ 
++struct kill_request {
++	u16 family;
++	union nf_inet_addr addr;
++};
++
++static int kill_matching(struct nf_conn *i, void *data)
++{
++	struct kill_request *kr = data;
++	struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
++	struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
++
++	if (!kr->family)
++		return 1;
++
++	if (t1->src.l3num != kr->family)
++		return 0;
++
++	return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++			     size_t count, loff_t *ppos)
++{
++	struct seq_file *seq = file->private_data;
++	struct net *net = seq_file_net(seq);
++	struct kill_request kr = { };
++	char req[INET6_ADDRSTRLEN] = { };
++
++	if (count == 0)
++		return 0;
++
++	if (count >= INET6_ADDRSTRLEN)
++		count = INET6_ADDRSTRLEN - 1;
++
++	if (copy_from_user(req, buf, count))
++		return -EFAULT;
++
++	if (strnchr(req, count, ':')) {
++		kr.family = AF_INET6;
++		if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	} else if (strnchr(req, count, '.')) {
++		kr.family = AF_INET;
++		if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	}
++
++	nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0);
++
++	return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ 	.owner   = THIS_MODULE,
+ 	.open    = ct_open,
+ 	.read    = seq_read,
++	.write	 = ct_file_write,
+ 	.llseek  = seq_lseek,
+ 	.release = seq_release_net,
+ };
+@@ -373,7 +430,7 @@ static int nf_conntrack_standalone_init_
+ {
+ 	struct proc_dir_entry *pde;
+ 
+-	pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops);
++	pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops);
+ 	if (!pde)
+ 		goto out_nf_conntrack;
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch b/trunk/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
new file mode 100644
index 00000000..f652dafd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/610-netfilter_match_bypass_default_checks.patch
@@ -0,0 +1,93 @@
+--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
++++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
+@@ -87,6 +87,7 @@ struct ipt_ip {
+ #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
+ #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
+ #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
++#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
+ 
+ /* Values for "inv" field in struct ipt_ip. */
+ #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -82,6 +82,9 @@ ip_packet_match(const struct iphdr *ip,
+ 
+ #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
+ 
++	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
++		return true;
++
+ 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+ 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+@@ -135,6 +138,29 @@ ip_packet_match(const struct iphdr *ip,
+ 	return true;
+ }
+ 
++static void
++ip_checkdefault(struct ipt_ip *ip)
++{
++	static const char iface_mask[IFNAMSIZ] = {};
++
++	if (ip->invflags || ip->flags & IPT_F_FRAG)
++		return;
++
++	if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (ip->smsk.s_addr || ip->dmsk.s_addr)
++		return;
++
++	if (ip->proto)
++		return;
++
++	ip->flags |= IPT_F_NO_DEF_MATCH;
++}
++
+ static bool
+ ip_checkentry(const struct ipt_ip *ip)
+ {
+@@ -565,7 +591,7 @@ static void cleanup_match(struct xt_entr
+ }
+ 
+ static int
+-check_entry(const struct ipt_entry *e, const char *name)
++check_entry(struct ipt_entry *e, const char *name)
+ {
+ 	const struct xt_entry_target *t;
+ 
+@@ -574,6 +600,8 @@ check_entry(const struct ipt_entry *e, c
+ 		return -EINVAL;
+ 	}
+ 
++	ip_checkdefault(&e->ip);
++
+ 	if (e->target_offset + sizeof(struct xt_entry_target) >
+ 	    e->next_offset)
+ 		return -EINVAL;
+@@ -935,6 +963,7 @@ copy_entries_to_user(unsigned int total_
+ 	const struct xt_table_info *private = table->private;
+ 	int ret = 0;
+ 	const void *loc_cpu_entry;
++	u8 flags;
+ 
+ 	counters = alloc_counters(table);
+ 	if (IS_ERR(counters))
+@@ -966,6 +995,14 @@ copy_entries_to_user(unsigned int total_
+ 			goto free_counters;
+ 		}
+ 
++		flags = e->ip.flags & IPT_F_MASK;
++		if (copy_to_user(userptr + off
++				 + offsetof(struct ipt_entry, ip.flags),
++				 &flags, sizeof(flags)) != 0) {
++			ret = -EFAULT;
++			goto free_counters;
++		}
++
+ 		for (i = sizeof(struct ipt_entry);
+ 		     i < e->target_offset;
+ 		     i += m->u.match_size) {
diff --git a/trunk/target/linux/generic/patches-3.18/611-netfilter_match_bypass_default_table.patch b/trunk/target/linux/generic/patches-3.18/611-netfilter_match_bypass_default_table.patch
new file mode 100644
index 00000000..ef993c86
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/611-netfilter_match_bypass_default_table.patch
@@ -0,0 +1,94 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -310,6 +310,33 @@ struct ipt_entry *ipt_next_entry(const s
+ 	return (void *)entry + entry->next_offset;
+ }
+ 
++static bool
++ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
++{
++	struct xt_entry_target *t;
++	struct xt_standard_target *st;
++
++	if (e->target_offset != sizeof(struct ipt_entry))
++		return false;
++
++	if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
++		return false;
++
++	t = ipt_get_target(e);
++	if (t->u.kernel.target->target)
++		return false;
++
++	st = (struct xt_standard_target *) t;
++	if (st->verdict == XT_RETURN)
++		return false;
++
++	if (st->verdict >= 0)
++		return false;
++
++	*verdict = (unsigned)(-st->verdict) - 1;
++	return true;
++}
++
+ /* Returns one of the generic firewall policies, like NF_ACCEPT. */
+ unsigned int
+ ipt_do_table(struct sk_buff *skb,
+@@ -331,9 +358,33 @@ ipt_do_table(struct sk_buff *skb,
+ 	unsigned int addend;
+ 
+ 	/* Initialization */
++	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++	local_bh_disable();
++	private = table->private;
++	cpu        = smp_processor_id();
++	/*
++	 * Ensure we load private-> members after we've fetched the base
++	 * pointer.
++	 */
++	smp_read_barrier_depends();
++	table_base = private->entries[cpu];
++
++	e = get_entry(table_base, private->hook_entry[hook]);
++	if (ipt_handle_default_rule(e, &verdict)) {
++		ADD_COUNTER(e->counters, skb->len, 1);
++		local_bh_enable();
++		return verdict;
++	}
++
+ 	ip = ip_hdr(skb);
+ 	indev = in ? in->name : nulldevname;
+ 	outdev = out ? out->name : nulldevname;
++
++	addend = xt_write_recseq_begin();
++	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
++	stackptr   = per_cpu_ptr(private->stackptr, cpu);
++	origptr    = *stackptr;
++
+ 	/* We handle fragments by dealing with the first fragment as
+ 	 * if it was a normal packet.  All other fragments are treated
+ 	 * normally, except that they will NEVER match rules that ask
+@@ -348,23 +399,6 @@ ipt_do_table(struct sk_buff *skb,
+ 	acpar.family  = NFPROTO_IPV4;
+ 	acpar.hooknum = hook;
+ 
+-	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+-	local_bh_disable();
+-	addend = xt_write_recseq_begin();
+-	private = table->private;
+-	cpu        = smp_processor_id();
+-	/*
+-	 * Ensure we load private-> members after we've fetched the base
+-	 * pointer.
+-	 */
+-	smp_read_barrier_depends();
+-	table_base = private->entries[cpu];
+-	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
+-	stackptr   = per_cpu_ptr(private->stackptr, cpu);
+-	origptr    = *stackptr;
+-
+-	e = get_entry(table_base, private->hook_entry[hook]);
+-
+ 	pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n",
+ 		 table->name, hook, origptr,
+ 		 get_entry(table_base, private->underflow[hook]));
diff --git a/trunk/target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch b/trunk/target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 00000000..72172d8b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/612-netfilter_match_reduce_memory_access.patch
@@ -0,0 +1,16 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -85,9 +85,11 @@ ip_packet_match(const struct iphdr *ip,
+ 	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
+ 		return true;
+ 
+-	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
++	if (FWINV(ipinfo->smsk.s_addr &&
++		  (ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+-	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
++	    FWINV(ipinfo->dmsk.s_addr &&
++		  (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+ 		  IPT_INV_DSTIP)) {
+ 		dprintf("Source or dest mismatch.\n");
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/613-netfilter_optional_tcp_window_check.patch b/trunk/target/linux/generic/patches-3.18/613-netfilter_optional_tcp_window_check.patch
new file mode 100644
index 00000000..1d3b37cc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/613-netfilter_optional_tcp_window_check.patch
@@ -0,0 +1,36 @@
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -33,6 +33,9 @@
+ #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
+ #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
+ 
++/* Do not check the TCP window for incoming packets  */
++static int nf_ct_tcp_no_window_check __read_mostly = 1;
++
+ /* "Be conservative in what you do,
+     be liberal in what you accept from others."
+     If it's non-zero, we mark only out of window RST segments as INVALID. */
+@@ -515,6 +518,9 @@ static bool tcp_in_window(const struct n
+ 	s32 receiver_offset;
+ 	bool res, in_recv_win;
+ 
++	if (nf_ct_tcp_no_window_check)
++		return true;
++
+ 	/*
+ 	 * Get the required data from the packet.
+ 	 */
+@@ -1452,6 +1458,13 @@ static struct ctl_table tcp_sysctl_table
+ 		.mode		= 0644,
+ 		.proc_handler	= proc_dointvec,
+ 	},
++	{
++		.procname       = "nf_conntrack_tcp_no_window_check",
++		.data           = &nf_ct_tcp_no_window_check,
++		.maxlen         = sizeof(unsigned int),
++		.mode           = 0644,
++		.proc_handler   = proc_dointvec,
++	},
+ 	{ }
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch b/trunk/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch
new file mode 100644
index 00000000..cbb9b2b8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch
@@ -0,0 +1,95 @@
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -55,6 +55,7 @@ header-y += xt_ecn.h
+ header-y += xt_esp.h
+ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
++header-y += xt_id.h
+ header-y += xt_ipcomp.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+--- /dev/null
++++ b/include/uapi/linux/netfilter/xt_id.h
+@@ -0,0 +1,8 @@
++#ifndef _XT_ID_H
++#define _XT_ID_H
++
++struct xt_id_info {
++	u32 id;
++};
++
++#endif /* XT_ID_H */
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1157,6 +1157,13 @@ config NETFILTER_XT_MATCH_IPCOMP
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_ID
++	tristate '"id" match support'
++	depends on NETFILTER_ADVANCED
++	---help---
++	This option adds a `id' dummy-match, which allows you to put
++	numeric IDs into your iptables ruleset.
++
+ config NETFILTER_XT_MATCH_IPRANGE
+ 	tristate '"iprange" address range match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -143,6 +143,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += 
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_ID) += xt_id.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPCOMP) += xt_ipcomp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o
+--- /dev/null
++++ b/net/netfilter/xt_id.c
+@@ -0,0 +1,45 @@
++/*
++ * Implements a dummy match to allow attaching IDs to rules
++ *
++ * 2014-08-01 Jo-Philipp Wich <jow@openwrt.org>
++ */
++
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_id.h>
++
++MODULE_AUTHOR("Jo-Philipp Wich <jow@openwrt.org>");
++MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_id");
++MODULE_ALIAS("ip6t_id");
++
++static bool
++id_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++	/* We always match */
++	return true;
++}
++
++static struct xt_match id_mt_reg __read_mostly = {
++	.name      = "id",
++	.revision  = 0,
++	.family    = NFPROTO_UNSPEC,
++	.match     = id_mt,
++	.matchsize = sizeof(struct xt_id_info),
++	.me        = THIS_MODULE,
++};
++
++static int __init id_mt_init(void)
++{
++	return xt_register_match(&id_mt_reg);
++}
++
++static void __exit id_mt_exit(void)
++{
++	xt_unregister_match(&id_mt_reg);
++}
++
++module_init(id_mt_init);
++module_exit(id_mt_exit);
diff --git a/trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch b/trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch
new file mode 100644
index 00000000..2a64d542
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch
@@ -0,0 +1,12 @@
+--- a/net/netfilter/nf_nat_core.c
++++ b/net/netfilter/nf_nat_core.c
+@@ -90,6 +90,9 @@ int nf_xfrm_me_harder(struct sk_buff *sk
+ 	struct dst_entry *dst;
+ 	int err;
+ 
++	if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++		return 0;
++
+ 	err = xfrm_decode_session(skb, &fl, family);
+ 	if (err < 0)
+ 		return err;
diff --git a/trunk/target/linux/generic/patches-3.18/617-netfilter_skip_filter_sysctl.patch b/trunk/target/linux/generic/patches-3.18/617-netfilter_skip_filter_sysctl.patch
new file mode 100644
index 00000000..247d3539
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/617-netfilter_skip_filter_sysctl.patch
@@ -0,0 +1,87 @@
+--- a/include/net/netns/conntrack.h
++++ b/include/net/netns/conntrack.h
+@@ -86,6 +86,7 @@ struct netns_ct {
+ 	struct ctl_table_header	*helper_sysctl_header;
+ #endif
+ 	char			*slabname;
++	int			skip_filter;
+ 	unsigned int		sysctl_log_invalid; /* Log invalid packets */
+ 	int			sysctl_events;
+ 	int			sysctl_acct;
+--- a/net/ipv4/netfilter/iptable_filter.c
++++ b/net/ipv4/netfilter/iptable_filter.c
+@@ -15,6 +15,7 @@
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ #include <linux/slab.h>
+ #include <net/ip.h>
++#include <net/netfilter/nf_conntrack.h>
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+@@ -37,6 +38,7 @@ iptable_filter_hook(const struct nf_hook
+ 		    const struct net_device *in, const struct net_device *out,
+ 		    int (*okfn)(struct sk_buff *))
+ {
++	enum ip_conntrack_info ctinfo;
+ 	const struct net *net;
+ 
+ 	if (ops->hooknum == NF_INET_LOCAL_OUT &&
+@@ -46,6 +48,11 @@ iptable_filter_hook(const struct nf_hook
+ 		return NF_ACCEPT;
+ 
+ 	net = dev_net((in != NULL) ? in : out);
++	nf_ct_get(skb, &ctinfo);
++	if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) &&
++	    net->ct.skip_filter)
++	    return NF_ACCEPT;
++
+ 	return ipt_do_table(skb, ops->hooknum, in, out,
+ 			    net->ipv4.iptable_filter);
+ }
+--- a/net/ipv6/netfilter/ip6table_filter.c
++++ b/net/ipv6/netfilter/ip6table_filter.c
+@@ -13,6 +13,7 @@
+ #include <linux/moduleparam.h>
+ #include <linux/netfilter_ipv6/ip6_tables.h>
+ #include <linux/slab.h>
++#include <net/netfilter/nf_conntrack.h>
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+@@ -37,6 +38,12 @@ ip6table_filter_hook(const struct nf_hoo
+ 		     int (*okfn)(struct sk_buff *))
+ {
+ 	const struct net *net = dev_net((in != NULL) ? in : out);
++	enum ip_conntrack_info ctinfo;
++
++	nf_ct_get(skb, &ctinfo);
++	if ((ctinfo == IP_CT_ESTABLISHED_REPLY || ctinfo == IP_CT_ESTABLISHED) &&
++	    net->ct.skip_filter)
++	    return NF_ACCEPT;
+ 
+ 	return ip6t_do_table(skb, ops->hooknum, in, out,
+ 			     net->ipv6.ip6table_filter);
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -510,6 +510,13 @@ static struct ctl_table nf_ct_sysctl_tab
+ 		.extra2		= &log_invalid_proto_max,
+ 	},
+ 	{
++		.procname	= "nf_conntrack_skip_filter",
++		.data		= &init_net.ct.skip_filter,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec,
++	},
++	{
+ 		.procname	= "nf_conntrack_expect_max",
+ 		.data		= &nf_ct_expect_max,
+ 		.maxlen		= sizeof(int),
+@@ -545,6 +552,7 @@ static int nf_conntrack_standalone_init_
+ 	table[2].data = &net->ct.htable_size;
+ 	table[3].data = &net->ct.sysctl_checksum;
+ 	table[4].data = &net->ct.sysctl_log_invalid;
++	table[5].data = &net->ct.skip_filter;
+ 
+ 	/* Don't export sysctls to unprivileged users */
+ 	if (net->user_ns != &init_user_ns)
diff --git a/trunk/target/linux/generic/patches-3.18/620-sched_esfq.patch b/trunk/target/linux/generic/patches-3.18/620-sched_esfq.patch
new file mode 100644
index 00000000..9726e4ac
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/620-sched_esfq.patch
@@ -0,0 +1,791 @@
+--- a/include/uapi/linux/pkt_sched.h
++++ b/include/uapi/linux/pkt_sched.h
+@@ -226,6 +226,33 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++	TCA_SFQ_HASH_CLASSIC,
++	TCA_SFQ_HASH_DST,
++	TCA_SFQ_HASH_SRC,
++	TCA_SFQ_HASH_FWMARK,
++	/* conntrack */
++	TCA_SFQ_HASH_CTORIGDST,
++	TCA_SFQ_HASH_CTORIGSRC,
++	TCA_SFQ_HASH_CTREPLDST,
++	TCA_SFQ_HASH_CTREPLSRC,
++	TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++	unsigned	quantum;	/* Bytes per round allocated to flow */
++	int		perturb_period;	/* Period of hash perturbation */
++	__u32		limit;		/* Maximal packets in queue */
++	unsigned	divisor;	/* Hash divisor  */
++	unsigned	flows;		/* Maximal number of flows  */
++	unsigned	hash_kind;	/* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -148,6 +148,37 @@ config NET_SCH_SFQ
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called sch_sfq.
+ 
++config NET_SCH_ESFQ
++	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
++	---help---
++	  Say Y here if you want to use the Enhanced Stochastic Fairness
++	  Queueing (ESFQ) packet scheduling algorithm for some of your network
++	  devices or as a leaf discipline for a classful qdisc such as HTB or
++	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
++	  references to the SFQ algorithm).
++
++	  This is an enchanced SFQ version which allows you to control some
++	  hardcoded values in the SFQ scheduler.
++
++	  ESFQ also adds control of the hash function used to identify packet
++	  flows. The original SFQ discipline hashes by connection; ESFQ add
++	  several other hashing methods, such as by src IP or by dst IP, which
++	  can be more fair to users in some networking situations.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called sch_esfq.
++
++config NET_SCH_ESFQ_NFCT
++	bool "Connection Tracking Hash Types"
++	depends on NET_SCH_ESFQ && NF_CONNTRACK
++	---help---
++	  Say Y here to enable support for hashing based on netfilter connection
++	  tracking information. This is useful for a router that is also using
++	  NAT to connect privately-addressed hosts to the Internet. If you want
++	  to provide fair distribution of upstream bandwidth, ESFQ must use
++	  connection tracking information, since all outgoing packets will share
++	  the same source address.
++
+ config NET_SCH_TEQL
+ 	tristate "True Link Equalizer (TEQL)"
+ 	---help---
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ing
+ obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
+ obj-$(CONFIG_NET_SCH_SFB)	+= sch_sfb.o
+ obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
++obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
+ obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
+ obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
+ obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
+--- /dev/null
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,702 @@
++/*
++ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:	Alexander Atanasov, <alex@ssi.bg>
++ *		Added dynamic depth,limit,divisor,hash_kind options.
++ *		Added dst and src hashes.
++ *
++ * 		Alexander Clouter, <alex@digriz.org.uk>
++ *		Ported ESFQ to Linux 2.6.
++ *
++ * 		Corey Hickey, <bugfood-c@fatooh.org>
++ *		Maintenance of the Linux 2.6 port.
++ *		Added fwmark hash (thanks to Robert Kurjata).
++ *		Added usage of jhash.
++ *		Added conntrack support.
++ *		Added ctnatchg hash (thanks to Ben Pfountz).
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <linux/bitops.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/socket.h>
++#include <linux/sockios.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/if_ether.h>
++#include <linux/inet.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/notifier.h>
++#include <linux/init.h>
++#include <net/ip.h>
++#include <net/netlink.h>
++#include <linux/ipv6.h>
++#include <net/route.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/pkt_sched.h>
++#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++#include <net/netfilter/nf_conntrack.h>
++#endif
++
++/*	Stochastic Fairness Queuing algorithm.
++	For more comments look at sch_sfq.c.
++	The difference is that you can change limit, depth,
++	hash table size and choose alternate hash types.
++
++	classic:	same as in sch_sfq.c
++	dst:		destination IP address
++	src:		source IP address
++	fwmark:		netfilter mark value
++	ctorigdst:	original destination IP address
++	ctorigsrc:	original source IP address
++	ctrepldst:	reply destination IP address
++	ctreplsrc:	reply source IP
++
++*/
++
++#define ESFQ_HEAD 0
++#define ESFQ_TAIL 1
++
++/* This type should contain at least SFQ_DEPTH*2 values */
++typedef unsigned int esfq_index;
++
++struct esfq_head
++{
++	esfq_index	next;
++	esfq_index	prev;
++};
++
++struct esfq_sched_data
++{
++/* Parameters */
++	int		perturb_period;
++	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
++	int		limit;
++	unsigned	depth;
++	unsigned	hash_divisor;
++	unsigned	hash_kind;
++/* Variables */
++	struct timer_list perturb_timer;
++	int		perturbation;
++	esfq_index	tail;		/* Index of current slot in round */
++	esfq_index	max_depth;	/* Maximal depth */
++
++	esfq_index	*ht;			/* Hash table */
++	esfq_index	*next;			/* Active slots link */
++	short		*allot;			/* Current allotment per slot */
++	unsigned short	*hash;			/* Hash value indexed by slots */
++	struct sk_buff_head	*qs;		/* Slot queue */
++	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
++};
++
++/* This contains the info we will hash. */
++struct esfq_packet_info
++{
++	u32	proto;		/* protocol or port */
++	u32	src;		/* source from packet header */
++	u32	dst;		/* destination from packet header */
++	u32	ctorigsrc;	/* original source from conntrack */
++	u32	ctorigdst;	/* original destination from conntrack */
++	u32	ctreplsrc;	/* reply source from conntrack */
++	u32	ctrepldst;	/* reply destination from conntrack */
++	u32	mark;		/* netfilter mark (fwmark) */
++};
++
++static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
++{
++	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
++{
++	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
++{
++	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
++}
++
++static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
++{
++	struct esfq_packet_info info;
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	enum ip_conntrack_info ctinfo;
++	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
++#endif
++
++	switch (skb->protocol) {
++	case __constant_htons(ETH_P_IP):
++	{
++		struct iphdr *iph = ip_hdr(skb);
++		info.dst = iph->daddr;
++		info.src = iph->saddr;
++		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
++		    (iph->protocol == IPPROTO_TCP ||
++		     iph->protocol == IPPROTO_UDP ||
++		     iph->protocol == IPPROTO_SCTP ||
++		     iph->protocol == IPPROTO_DCCP ||
++		     iph->protocol == IPPROTO_ESP))
++			info.proto = *(((u32*)iph) + iph->ihl);
++		else
++			info.proto = iph->protocol;
++		break;
++	}
++	case __constant_htons(ETH_P_IPV6):
++	{
++		struct ipv6hdr *iph = ipv6_hdr(skb);
++		/* Hash ipv6 addresses into a u32. This isn't ideal,
++		 * but the code is simple. */
++		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
++		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
++		if (iph->nexthdr == IPPROTO_TCP ||
++		    iph->nexthdr == IPPROTO_UDP ||
++		    iph->nexthdr == IPPROTO_SCTP ||
++		    iph->nexthdr == IPPROTO_DCCP ||
++		    iph->nexthdr == IPPROTO_ESP)
++			info.proto = *(u32*)&iph[1];
++		else
++			info.proto = iph->nexthdr;
++		break;
++	}
++	default:
++		info.dst   = (u32)(unsigned long)skb_dst(skb);
++		info.src   = (u32)(unsigned long)skb->sk;
++		info.proto = skb->protocol;
++	}
++
++	info.mark = skb->mark;
++
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	/* defaults if there is no conntrack info */
++	info.ctorigsrc = info.src;
++	info.ctorigdst = info.dst;
++	info.ctreplsrc = info.dst;
++	info.ctrepldst = info.src;
++	/* collect conntrack info */
++	if (ct && ct != &nf_conntrack_untracked) {
++		if (skb->protocol == __constant_htons(ETH_P_IP)) {
++			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
++			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
++			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++		}
++		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
++			/* Again, hash ipv6 addresses into a single u32. */
++			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
++			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
++		}
++
++	}
++#endif
++
++	switch(q->hash_kind) {
++	case TCA_SFQ_HASH_CLASSIC:
++		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++	case TCA_SFQ_HASH_DST:
++		return esfq_jhash_1word(q, info.dst);
++	case TCA_SFQ_HASH_SRC:
++		return esfq_jhash_1word(q, info.src);
++	case TCA_SFQ_HASH_FWMARK:
++		return esfq_jhash_1word(q, info.mark);
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	case TCA_SFQ_HASH_CTORIGDST:
++		return esfq_jhash_1word(q, info.ctorigdst);
++	case TCA_SFQ_HASH_CTORIGSRC:
++		return esfq_jhash_1word(q, info.ctorigsrc);
++	case TCA_SFQ_HASH_CTREPLDST:
++		return esfq_jhash_1word(q, info.ctrepldst);
++	case TCA_SFQ_HASH_CTREPLSRC:
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	case TCA_SFQ_HASH_CTNATCHG:
++	{
++		if (info.ctorigdst == info.ctreplsrc)
++			return esfq_jhash_1word(q, info.ctorigsrc);
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	}
++#endif
++	default:
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
++	}
++	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++}
++
++static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d = q->qs[x].qlen + q->depth;
++
++	p = d;
++	n = q->dep[d].next;
++	q->dep[x].next = n;
++	q->dep[x].prev = p;
++	q->dep[p].next = q->dep[n].prev = x;
++}
++
++static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++
++	if (n == p && q->max_depth == q->qs[x].qlen + 1)
++		q->max_depth--;
++
++	esfq_link(q, x);
++}
++
++static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++	d = q->qs[x].qlen;
++	if (q->max_depth < d)
++		q->max_depth = d;
++
++	esfq_link(q, x);
++}
++
++static unsigned int esfq_drop(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index d = q->max_depth;
++	struct sk_buff *skb;
++	unsigned int len;
++
++	/* Queue is full! Find the longest slot and
++	   drop a packet from it */
++
++	if (d > 1) {
++		esfq_index x = q->dep[d+q->depth].next;
++		skb = q->qs[x].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[x]);
++		kfree_skb(skb);
++		esfq_dec(q, x);
++		sch->q.qlen--;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	if (d == 1) {
++		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
++		d = q->next[q->tail];
++		q->next[q->tail] = q->next[d];
++		q->allot[q->next[d]] += q->quantum;
++		skb = q->qs[d].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[d]);
++		kfree_skb(skb);
++		esfq_dec(q, d);
++		sch->q.qlen--;
++		q->ht[q->hash[d]] = q->depth;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	return 0;
++}
++
++static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
++{
++	unsigned hash = esfq_hash(q, skb);
++	unsigned depth = q->depth;
++	esfq_index x;
++
++	x = q->ht[hash];
++	if (x == depth) {
++		q->ht[hash] = x = q->dep[depth].next;
++		q->hash[x] = hash;
++	}
++
++	if (end == ESFQ_TAIL)
++		__skb_queue_tail(&q->qs[x], skb);
++	else
++		__skb_queue_head(&q->qs[x], skb);
++
++	esfq_inc(q, x);
++	if (q->qs[x].qlen == 1) {		/* The flow is new */
++		if (q->tail == depth) {	/* It is the first flow */
++			q->tail = x;
++			q->next[x] = x;
++			q->allot[x] = q->quantum;
++		} else {
++			q->next[x] = q->next[q->tail];
++			q->next[q->tail] = x;
++			q->tail = x;
++		}
++	}
++}
++
++static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_enqueue(skb, q, ESFQ_TAIL);
++	sch->qstats.backlog += skb->len;
++	if (++sch->q.qlen < q->limit-1) {
++		sch->bstats.bytes += skb->len;
++		sch->bstats.packets++;
++		return 0;
++	}
++
++	sch->qstats.drops++;
++	esfq_drop(sch);
++	return NET_XMIT_CN;
++}
++
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index a;
++
++	/* No active slots */
++	if (q->tail == q->depth)
++		return NULL;
++
++	a = q->next[q->tail];
++	return skb_peek(&q->qs[a]);
++}
++
++static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
++{
++	struct sk_buff *skb;
++	unsigned depth = q->depth;
++	esfq_index a, old_a;
++
++	/* No active slots */
++	if (q->tail == depth)
++		return NULL;
++
++	a = old_a = q->next[q->tail];
++
++	/* Grab packet */
++	skb = __skb_dequeue(&q->qs[a]);
++	esfq_dec(q, a);
++
++	/* Is the slot empty? */
++	if (q->qs[a].qlen == 0) {
++		q->ht[q->hash[a]] = depth;
++		a = q->next[a];
++		if (a == old_a) {
++			q->tail = depth;
++			return skb;
++		}
++		q->next[q->tail] = a;
++		q->allot[a] += q->quantum;
++	} else if ((q->allot[a] -= skb->len) <= 0) {
++		q->tail = a;
++		a = q->next[a];
++		q->allot[a] += q->quantum;
++	}
++
++	return skb;
++}
++
++static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++
++	skb = esfq_q_dequeue(q);
++	if (skb == NULL)
++		return NULL;
++	sch->q.qlen--;
++	sch->qstats.backlog -= skb->len;
++	return skb;
++}
++
++static void esfq_q_destroy(struct esfq_sched_data *q)
++{
++	del_timer(&q->perturb_timer);
++	if(q->ht)
++		kfree(q->ht);
++	if(q->dep)
++		kfree(q->dep);
++	if(q->next)
++		kfree(q->next);
++	if(q->allot)
++		kfree(q->allot);
++	if(q->hash)
++		kfree(q->hash);
++	if(q->qs)
++		kfree(q->qs);
++}
++
++static void esfq_destroy(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_destroy(q);
++}
++
++
++static void esfq_reset(struct Qdisc* sch)
++{
++	struct sk_buff *skb;
++
++	while ((skb = esfq_dequeue(sch)) != NULL)
++		kfree_skb(skb);
++}
++
++static void esfq_perturbation(unsigned long arg)
++{
++	struct Qdisc *sch = (struct Qdisc*)arg;
++	struct esfq_sched_data *q = qdisc_priv(sch);
++
++	q->perturbation = prandom_u32()&0x1F;
++
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++}
++
++static unsigned int esfq_check_hash(unsigned int kind)
++{
++	switch (kind) {
++	case TCA_SFQ_HASH_CTORIGDST:
++	case TCA_SFQ_HASH_CTORIGSRC:
++	case TCA_SFQ_HASH_CTREPLDST:
++	case TCA_SFQ_HASH_CTREPLSRC:
++	case TCA_SFQ_HASH_CTNATCHG:
++#ifndef CONFIG_NET_SCH_ESFQ_NFCT
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++#endif
++	case TCA_SFQ_HASH_CLASSIC:
++	case TCA_SFQ_HASH_DST:
++	case TCA_SFQ_HASH_SRC:
++	case TCA_SFQ_HASH_FWMARK:
++		return kind;
++	default:
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++	}
++}
++
++static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
++{
++	struct tc_esfq_qopt *ctl = nla_data(opt);
++	esfq_index p = ~0U/2;
++	int i;
++
++	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
++		return -EINVAL;
++
++	q->perturbation = 0;
++	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
++	q->max_depth = 0;
++	if (opt == NULL) {
++		q->perturb_period = 0;
++		q->hash_divisor = 1024;
++		q->tail = q->limit = q->depth = 128;
++
++	} else {
++		struct tc_esfq_qopt *ctl = nla_data(opt);
++		if (ctl->quantum)
++			q->quantum = ctl->quantum;
++		q->perturb_period = ctl->perturb_period*HZ;
++		q->hash_divisor = ctl->divisor ? : 1024;
++		q->tail = q->limit = q->depth = ctl->flows ? : 128;
++
++		if ( q->depth > p - 1 )
++			return -EINVAL;
++
++		if (ctl->limit)
++			q->limit = min_t(u32, ctl->limit, q->depth);
++
++		if (ctl->hash_kind) {
++			q->hash_kind = esfq_check_hash(ctl->hash_kind);
++		}
++	}
++
++	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->ht)
++		goto err_case;
++	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
++	if (!q->dep)
++		goto err_case;
++	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->next)
++		goto err_case;
++	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
++	if (!q->allot)
++		goto err_case;
++	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
++	if (!q->hash)
++		goto err_case;
++	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
++	if (!q->qs)
++		goto err_case;
++
++	for (i=0; i< q->hash_divisor; i++)
++		q->ht[i] = q->depth;
++	for (i=0; i<q->depth; i++) {
++		skb_queue_head_init(&q->qs[i]);
++		q->dep[i+q->depth].next = i+q->depth;
++		q->dep[i+q->depth].prev = i+q->depth;
++	}
++
++	for (i=0; i<q->depth; i++)
++		esfq_link(q, i);
++	return 0;
++err_case:
++	esfq_q_destroy(q);
++	return -ENOBUFS;
++}
++
++static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	int err;
++
++	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(q, opt)))
++		return err;
++
++	init_timer(&q->perturb_timer);
++	q->perturb_timer.data = (unsigned long)sch;
++	q->perturb_timer.function = esfq_perturbation;
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++
++	return 0;
++}
++
++static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct esfq_sched_data new;
++	struct sk_buff *skb;
++	int err;
++
++	/* set up new queue */
++	memset(&new, 0, sizeof(struct esfq_sched_data));
++	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(&new, opt)))
++		return err;
++
++	/* copy all packets from the old queue to the new queue */
++	sch_tree_lock(sch);
++	while ((skb = esfq_q_dequeue(q)) != NULL)
++		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
++
++	/* clean up the old queue */
++	esfq_q_destroy(q);
++
++	/* copy elements of the new queue into the old queue */
++	q->perturb_period = new.perturb_period;
++	q->quantum        = new.quantum;
++	q->limit          = new.limit;
++	q->depth          = new.depth;
++	q->hash_divisor   = new.hash_divisor;
++	q->hash_kind      = new.hash_kind;
++	q->tail           = new.tail;
++	q->max_depth      = new.max_depth;
++	q->ht    = new.ht;
++	q->dep   = new.dep;
++	q->next  = new.next;
++	q->allot = new.allot;
++	q->hash  = new.hash;
++	q->qs    = new.qs;
++
++	/* finish up */
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	} else {
++		q->perturbation = 0;
++	}
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	unsigned char *b = skb_tail_pointer(skb);
++	struct tc_esfq_qopt opt;
++
++	opt.quantum = q->quantum;
++	opt.perturb_period = q->perturb_period/HZ;
++
++	opt.limit = q->limit;
++	opt.divisor = q->hash_divisor;
++	opt.flows = q->depth;
++	opt.hash_kind = q->hash_kind;
++
++	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
++		goto nla_put_failure;
++
++	return skb->len;
++
++nla_put_failure:
++	nlmsg_trim(skb, b);
++	return -1;
++}
++
++static struct Qdisc_ops esfq_qdisc_ops =
++{
++	.next		=	NULL,
++	.cl_ops		=	NULL,
++	.id		=	"esfq",
++	.priv_size	=	sizeof(struct esfq_sched_data),
++	.enqueue	=	esfq_enqueue,
++	.dequeue	=	esfq_dequeue,
++	.peek		=	esfq_peek,
++	.drop		=	esfq_drop,
++	.init		=	esfq_init,
++	.reset		=	esfq_reset,
++	.destroy	=	esfq_destroy,
++	.change		=	esfq_change,
++	.dump		=	esfq_dump,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init esfq_module_init(void)
++{
++	return register_qdisc(&esfq_qdisc_ops);
++}
++static void __exit esfq_module_exit(void)
++{
++	unregister_qdisc(&esfq_qdisc_ops);
++}
++module_init(esfq_module_init)
++module_exit(esfq_module_exit)
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.18/621-sched_act_connmark.patch b/trunk/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
new file mode 100644
index 00000000..94597498
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
@@ -0,0 +1,161 @@
+--- /dev/null
++++ b/net/sched/act_connmark.c
+@@ -0,0 +1,126 @@
++/*
++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/skbuff.h>
++#include <linux/rtnetlink.h>
++#include <linux/pkt_cls.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <net/netlink.h>
++#include <net/pkt_sched.h>
++#include <net/act_api.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++
++#define TCA_ACT_CONNMARK	20
++
++#define CONNMARK_TAB_MASK     3
++
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
++		       struct tcf_result *res)
++{
++	struct nf_conn *c;
++	enum ip_conntrack_info ctinfo;
++	int proto;
++	int r;
++
++	if (skb->protocol == htons(ETH_P_IP)) {
++		if (skb->len < sizeof(struct iphdr))
++			goto out;
++		proto = PF_INET;
++	} else if (skb->protocol == htons(ETH_P_IPV6)) {
++		if (skb->len < sizeof(struct ipv6hdr))
++			goto out;
++		proto = PF_INET6;
++	} else
++		goto out;
++
++	r = nf_conntrack_in(dev_net(skb->dev), proto, NF_INET_PRE_ROUTING, skb);
++	if (r != NF_ACCEPT)
++		goto out;
++
++	c = nf_ct_get(skb, &ctinfo);
++	if (!c)
++		goto out;
++
++	skb->mark = c->mark;
++	nf_conntrack_put(skb->nfct);
++	skb->nfct = NULL;
++
++out:
++	return TC_ACT_PIPE;
++}
++
++static int tcf_connmark_init(struct net *net, struct nlattr *nla,
++			     struct nlattr *est, struct tc_action *a,
++			     int ovr, int bind)
++{
++	int ret = 0;
++
++	if (!tcf_hash_check(0, a, bind)) {
++		ret = tcf_hash_create(0, est, a, sizeof(struct tcf_common), bind);
++		if (ret)
++		    return ret;
++
++		tcf_hash_insert(a);
++		ret = ACT_P_CREATED;
++	} else {
++		if (!ovr) {
++			tcf_hash_release(a, bind);
++			return -EEXIST;
++		}
++	}
++
++	return ret;
++}
++
++static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
++				int bind, int ref)
++{
++	return skb->len;
++}
++
++static struct tc_action_ops act_connmark_ops = {
++	.kind		=	"connmark",
++	.type		=	TCA_ACT_CONNMARK,
++	.owner		=	THIS_MODULE,
++	.act		=	tcf_connmark,
++	.dump		=	tcf_connmark_dump,
++	.init		=	tcf_connmark_init,
++};
++
++MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_DESCRIPTION("Connection tracking mark restoring");
++MODULE_LICENSE("GPL");
++
++static int __init connmark_init_module(void)
++{
++
++	return tcf_register_action(&act_connmark_ops, CONNMARK_TAB_MASK);
++}
++
++static void __exit connmark_cleanup_module(void)
++{
++	tcf_unregister_action(&act_connmark_ops);
++}
++
++module_init(connmark_init_module);
++module_exit(connmark_cleanup_module);
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -717,6 +717,19 @@ config NET_ACT_CSUM
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called act_csum.
+ 
++config NET_ACT_CONNMARK
++        tristate "Connection Tracking Marking"
++        depends on NET_CLS_ACT
++        depends on NF_CONNTRACK
++	 depends on NF_CONNTRACK_MARK
++        ---help---
++	  Say Y here to restore the connmark from a scheduler action
++
++	  If unsure, say N.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called act_connmark.
++
+ config NET_CLS_IND
+ 	bool "Incoming device classification"
+ 	depends on NET_CLS_U32 || NET_CLS_FW
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit
+ obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+ obj-$(CONFIG_NET_ACT_SKBEDIT)	+= act_skbedit.o
+ obj-$(CONFIG_NET_ACT_CSUM)	+= act_csum.o
++obj-$(CONFIG_NET_ACT_CONNMARK)	+= act_connmark.o
+ obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
+ obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
+ obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
diff --git a/trunk/target/linux/generic/patches-3.18/630-packet_socket_type.patch b/trunk/target/linux/generic/patches-3.18/630-packet_socket_type.patch
new file mode 100644
index 00000000..06bd167a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/630-packet_socket_type.patch
@@ -0,0 +1,134 @@
+This patch allows the user to specify desired packet types (outgoing,
+broadcast, unicast, etc.) on packet sockets via setsockopt.
+This can reduce the load in situations where only a limited number
+of packet types are necessary
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/include/uapi/linux/if_packet.h
++++ b/include/uapi/linux/if_packet.h
+@@ -31,6 +31,8 @@ struct sockaddr_ll {
+ #define PACKET_KERNEL		7		/* To kernel space	*/
+ /* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */
+ #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
++#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
++
+ 
+ /* Packet socket options */
+ 
+@@ -54,6 +56,7 @@ struct sockaddr_ll {
+ #define PACKET_FANOUT			18
+ #define PACKET_TX_HAS_OFF		19
+ #define PACKET_QDISC_BYPASS		20
++#define PACKET_RECV_TYPE		21
+ 
+ #define PACKET_FANOUT_HASH		0
+ #define PACKET_FANOUT_LB		1
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -1530,6 +1530,7 @@ static int packet_rcv_spkt(struct sk_buf
+ {
+ 	struct sock *sk;
+ 	struct sockaddr_pkt *spkt;
++	struct packet_sock *po;
+ 
+ 	/*
+ 	 *	When we registered the protocol we saved the socket in the data
+@@ -1537,6 +1538,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 */
+ 
+ 	sk = pt->af_packet_priv;
++	po = pkt_sk(sk);
+ 
+ 	/*
+ 	 *	Yank back the headers [hope the device set this
+@@ -1549,7 +1551,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 *	so that this procedure is noop.
+ 	 */
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
+ 		goto out;
+ 
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+@@ -1756,12 +1758,12 @@ static int packet_rcv(struct sk_buff *sk
+ 	int skb_len = skb->len;
+ 	unsigned int snaplen, res;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -1881,12 +1883,12 @@ static int tpacket_rcv(struct sk_buff *s
+ 	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
+ 	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -2823,6 +2825,7 @@ static int packet_create(struct net *net
+ 	spin_lock_init(&po->bind_lock);
+ 	mutex_init(&po->pg_vec_lock);
+ 	po->prot_hook.func = packet_rcv;
++	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
+ 
+ 	if (sock->type == SOCK_PACKET)
+ 		po->prot_hook.func = packet_rcv_spkt;
+@@ -3403,6 +3406,16 @@ packet_setsockopt(struct socket *sock, i
+ 		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
+ 		return 0;
+ 	}
++        case PACKET_RECV_TYPE:
++        {
++                unsigned int val;
++                if (optlen != sizeof(val))
++                        return -EINVAL;
++                if (copy_from_user(&val, optval, sizeof(val)))
++                        return -EFAULT;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
++                return 0;
++        }
+ 	default:
+ 		return -ENOPROTOOPT;
+ 	}
+@@ -3454,6 +3467,13 @@ static int packet_getsockopt(struct sock
+ 	case PACKET_VNET_HDR:
+ 		val = po->has_vnet_hdr;
+ 		break;
++	case PACKET_RECV_TYPE:
++		if (len > sizeof(unsigned int))
++			len = sizeof(unsigned int);
++		val = po->pkt_type;
++
++		data = &val;
++		break;
+ 	case PACKET_VERSION:
+ 		val = po->tp_version;
+ 		break;
+--- a/net/packet/internal.h
++++ b/net/packet/internal.h
+@@ -117,6 +117,7 @@ struct packet_sock {
+ 	struct net_device __rcu	*cached_dev;
+ 	int			(*xmit)(struct sk_buff *skb);
+ 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
++	unsigned int		pkt_type;
+ };
+ 
+ static struct packet_sock *pkt_sk(struct sock *sk)
diff --git a/trunk/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch b/trunk/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
new file mode 100644
index 00000000..acbf1e20
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -97,7 +97,11 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 	dst = NULL;
+ 
+-	if (is_broadcast_ether_addr(dest)) {
++	if (skb->protocol == htons(ETH_P_PAE)) {
++		skb2 = skb;
++		/* Do not forward 802.1x/EAP frames */
++
++	} else if (is_broadcast_ether_addr(dest)) {
+ 		skb2 = skb;
+ 		unicast = false;
+ 	} else if (is_multicast_ether_addr(dest)) {
diff --git a/trunk/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch b/trunk/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch
new file mode 100644
index 00000000..d20773a4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch
@@ -0,0 +1,11 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -84,7 +84,7 @@ int br_handle_frame_finish(struct sk_buf
+ 	    br_multicast_rcv(br, p, skb, vid))
+ 		goto drop;
+ 
+-	if (p->state == BR_STATE_LEARNING)
++	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
+ 		goto drop;
+ 
+ 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
diff --git a/trunk/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch b/trunk/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch
new file mode 100644
index 00000000..c98b9479
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch
@@ -0,0 +1,102 @@
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -172,6 +172,7 @@ struct net_bridge_port
+ #define BR_FLOOD		0x00000040
+ #define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING)
+ #define BR_PROMISC		0x00000080
++#define BR_ISOLATE_MODE		0x00000100
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	struct bridge_mcast_own_query	ip4_own_query;
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -171,6 +171,22 @@ BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLO
+ BRPORT_ATTR_FLAG(learning, BR_LEARNING);
+ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD);
+ 
++static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
++{
++	int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
++	return sprintf(buf, "%d\n", isolate_mode);
++}
++static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
++{
++	if (v)
++		p->flags |= BR_ISOLATE_MODE;
++	else
++		p->flags &= ~BR_ISOLATE_MODE;
++	return 0;
++}
++static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
++		   show_isolate_mode, store_isolate_mode);
++
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+ {
+@@ -213,6 +229,7 @@ static const struct brport_attribute *br
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
+ #endif
++	&brport_attr_isolate_mode,
+ 	NULL
+ };
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -120,8 +120,8 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 		unicast = false;
+ 		br->dev->stats.multicast++;
+-	} else if ((dst = __br_fdb_get(br, dest, vid)) &&
+-			dst->is_local) {
++	} else if ((p->flags & BR_ISOLATE_MODE) ||
++		   ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local)) {
+ 		skb2 = skb;
+ 		/* Do not forward the packet since it's local. */
+ 		skb = NULL;
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -117,7 +117,7 @@ EXPORT_SYMBOL_GPL(br_deliver);
+ /* called with rcu_read_lock */
+ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
+ {
+-	if (should_deliver(to, skb)) {
++	if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
+ 		if (skb0)
+ 			deliver_clone(to, skb, __br_forward);
+ 		else
+@@ -173,7 +173,7 @@ static void br_flood(struct net_bridge *
+ 		     struct sk_buff *skb0,
+ 		     void (*__packet_hook)(const struct net_bridge_port *p,
+ 					   struct sk_buff *skb),
+-		     bool unicast)
++		     				bool unicast, bool forward)
+ {
+ 	struct net_bridge_port *p;
+ 	struct net_bridge_port *prev;
+@@ -181,6 +181,8 @@ static void br_flood(struct net_bridge *
+ 	prev = NULL;
+ 
+ 	list_for_each_entry_rcu(p, &br->port_list, list) {
++		if (forward && (p->flags & BR_ISOLATE_MODE))
++			continue;
+ 		/* Do not flood unicast traffic to ports that turn it off */
+ 		if (unicast && !(p->flags & BR_FLOOD))
+ 			continue;
+@@ -207,14 +209,14 @@ out:
+ /* called with rcu_read_lock */
+ void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast)
+ {
+-	br_flood(br, skb, NULL, __br_deliver, unicast);
++	br_flood(br, skb, NULL, __br_deliver, unicast, false);
+ }
+ 
+ /* called under bridge lock */
+ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
+ 		      struct sk_buff *skb2, bool unicast)
+ {
+-	br_flood(br, skb, skb2, __br_forward, unicast);
++	br_flood(br, skb, skb2, __br_forward, unicast, true);
+ }
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
diff --git a/trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch b/trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch
new file mode 100644
index 00000000..e8b21e50
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch
@@ -0,0 +1,110 @@
+--- a/include/net/addrconf.h
++++ b/include/net/addrconf.h
+@@ -88,6 +88,12 @@ int ipv6_rcv_saddr_equal(const struct so
+ void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr);
+ void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr);
+ 
++extern int			(*ipv6_dev_get_saddr_hook)(struct net *net,
++						const struct net_device *dev,
++						const struct in6_addr *daddr,
++						unsigned int prefs,
++						struct in6_addr *saddr);
++
+ static inline unsigned long addrconf_timeout_fixup(u32 timeout,
+ 						   unsigned int unit)
+ {
+--- a/net/bridge/Kconfig
++++ b/net/bridge/Kconfig
+@@ -6,7 +6,6 @@ config BRIDGE
+ 	tristate "802.1d Ethernet Bridging"
+ 	select LLC
+ 	select STP
+-	depends on IPV6 || IPV6=n
+ 	---help---
+ 	  If you say Y here, then your Linux box will be able to act as an
+ 	  Ethernet bridge, which means that the different Ethernet segments it
+--- a/net/ipv6/Makefile
++++ b/net/ipv6/Makefile
+@@ -45,6 +45,7 @@ obj-y += addrconf_core.o exthdrs_core.o
+ obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
+ 
+ obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
++obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
+ 
+ ifneq ($(CONFIG_IPV6),)
+ obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1317,7 +1317,7 @@ out:
+ 	return ret;
+ }
+ 
+-int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++static int __ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+ 		       struct in6_addr *saddr)
+ {
+@@ -1442,7 +1442,6 @@ try_nextdev:
+ 	in6_ifa_put(hiscore->ifa);
+ 	return 0;
+ }
+-EXPORT_SYMBOL(ipv6_dev_get_saddr);
+ 
+ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
+ 		      u32 banned_flags)
+@@ -5434,6 +5433,9 @@ int __init addrconf_init(void)
+ 
+ 	ipv6_addr_label_rtnl_register();
+ 
++	BUG_ON(ipv6_dev_get_saddr_hook != NULL);
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, __ipv6_dev_get_saddr);
++
+ 	return 0;
+ errout:
+ 	rtnl_af_unregister(&inet6_ops);
+@@ -5453,6 +5455,9 @@ void addrconf_cleanup(void)
+ 	struct net_device *dev;
+ 	int i;
+ 
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, NULL);
++	synchronize_rcu();
++
+ 	unregister_netdevice_notifier(&ipv6_dev_notf);
+ 	unregister_pernet_subsys(&addrconf_ops);
+ 	ipv6_addr_label_cleanup();
+--- /dev/null
++++ b/net/ipv6/inet6_stubs.c
+@@ -0,0 +1,33 @@
++/*
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ */
++#include <linux/export.h>
++#include <net/ipv6.h>
++
++int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr);
++
++EXPORT_SYMBOL(ipv6_dev_get_saddr_hook);
++
++int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr)
++{
++	int ret = -EADDRNOTAVAIL;
++	typeof(ipv6_dev_get_saddr_hook) dev_get_saddr;
++
++	rcu_read_lock();
++	dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook);
++
++	if (dev_get_saddr)
++		ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr);
++
++	rcu_read_unlock();
++	return ret;
++}
++EXPORT_SYMBOL(ipv6_dev_get_saddr);
++
diff --git a/trunk/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch b/trunk/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch
new file mode 100644
index 00000000..4df94ca9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/644-bridge_optimize_netfilter_hooks.patch
@@ -0,0 +1,172 @@
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit
+ 
+ int br_forward_finish(struct sk_buff *skb)
+ {
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ 		       br_dev_queue_push_xmit);
+ 
+ }
+@@ -77,7 +77,7 @@ static void __br_deliver(const struct ne
+ 		return;
+ 	}
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+@@ -98,7 +98,7 @@ static void __br_forward(const struct ne
+ 	skb->dev = to->dev;
+ 	skb_forward_csum(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -53,7 +53,7 @@ static int br_pass_frame_up(struct sk_bu
+ 	if (!skb)
+ 		return NET_RX_DROP;
+ 
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+ 		       netif_receive_skb);
+ }
+ 
+@@ -219,7 +219,7 @@ rx_handler_result_t br_handle_frame(stru
+ 		}
+ 
+ 		/* Deliver packet to local host only */
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+ 			    NULL, br_handle_local_finish)) {
+ 			return RX_HANDLER_CONSUMED; /* consumed by filter */
+ 		} else {
+@@ -234,7 +234,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_local_finish))
+ 			break;
+ 
+@@ -256,7 +256,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_frame_finish);
+ 		break;
+ 	default:
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -814,7 +814,7 @@ static void __br_multicast_send_query(st
+ 
+ 	if (port) {
+ 		skb->dev = port->dev;
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 			br_dev_queue_push_xmit);
+ 	} else {
+ 		br_multicast_select_own_querier(br, ip, skb);
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -73,6 +73,15 @@ static int brnf_pass_vlan_indev __read_m
+ #define IS_ARP(skb) \
+ 	(!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
+ 
++int brnf_call_ebtables __read_mostly = 0;
++EXPORT_SYMBOL_GPL(brnf_call_ebtables);
++
++bool br_netfilter_run_hooks(void)
++{
++	return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables |
++	       brnf_call_ebtables;
++}
++
+ static inline __be16 vlan_proto(const struct sk_buff *skb)
+ {
+ 	if (vlan_tx_tag_present(skb))
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -778,6 +778,24 @@ static inline void br_nf_core_fini(void)
+ #define br_netfilter_rtable_init(x)
+ #endif
+ 
++#if IS_BUILTIN(CONFIG_BRIDGE_NETFILTER)
++extern int brnf_call_ebtables;
++bool br_netfilter_run_hooks(void);
++#else
++#define br_netfilter_run_hooks()	false
++#endif
++
++static inline int
++BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
++	struct net_device *in, struct net_device *out,
++	int (*okfn)(struct sk_buff *))
++{
++	if (!br_netfilter_run_hooks())
++		return okfn(skb);
++
++	return NF_HOOK(pf, hook, skb, in, out, okfn);
++}
++
+ /* br_stp.c */
+ void br_log_state(const struct net_bridge_port *p);
+ void br_set_state(struct net_bridge_port *p, unsigned int state);
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid
+ 
+ 	skb_reset_mac_header(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		dev_queue_xmit);
+ }
+ 
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -2414,11 +2414,19 @@ static int __init ebtables_init(void)
+ 	}
+ 
+ 	printk(KERN_INFO "Ebtables v2.0 registered\n");
++
++#if IS_BUILTIN(CONFIG_BRIDGE_NETFILTER)
++	brnf_call_ebtables = 1;
++#endif
++
+ 	return 0;
+ }
+ 
+ static void __exit ebtables_fini(void)
+ {
++#if IS_BUILTIN(CONFIG_BRIDGE_NETFILTER)
++	brnf_call_ebtables = 0;
++#endif
+ 	nf_unregister_sockopt(&ebt_sockopts);
+ 	xt_unregister_target(&ebt_standard_target);
+ 	printk(KERN_INFO "Ebtables v2.0 unregistered\n");
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -177,11 +177,11 @@ config NETFILTER_ADVANCED
+ 	  If unsure, say Y.
+ 
+ config BRIDGE_NETFILTER
+-	tristate "Bridged IP/ARP packets filtering"
++	bool "Bridged IP/ARP packets filtering"
+ 	depends on BRIDGE
+ 	depends on NETFILTER && INET
+ 	depends on NETFILTER_ADVANCED
+-	default m
++	default y
+ 	---help---
+ 	  Enabling this option will let arptables resp. iptables see bridged
+ 	  ARP resp. IP traffic. If you want a bridging firewall, you probably
diff --git a/trunk/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch b/trunk/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
new file mode 100644
index 00000000..8d0da3c6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
@@ -0,0 +1,373 @@
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -635,7 +635,8 @@ struct net_bridge_port_group *br_multica
+ 			struct net_bridge_port *port,
+ 			struct br_ip *group,
+ 			struct net_bridge_port_group __rcu *next,
+-			unsigned char state)
++			unsigned char state,
++			const unsigned char *src)
+ {
+ 	struct net_bridge_port_group *p;
+ 
+@@ -650,12 +651,33 @@ struct net_bridge_port_group *br_multica
+ 	hlist_add_head(&p->mglist, &port->mglist);
+ 	setup_timer(&p->timer, br_multicast_port_group_expired,
+ 		    (unsigned long)p);
++	if ((port->flags & BR_MULTICAST_TO_UCAST) && src) {
++		memcpy(p->eth_addr, src, ETH_ALEN);
++		p->unicast = true;
++	}
+ 	return p;
+ }
+ 
++static bool br_port_group_equal(struct net_bridge_port_group *p,
++				struct net_bridge_port *port,
++				const unsigned char *src)
++{
++	if (p->port != port)
++		return false;
++
++	if (!p->unicast)
++		return true;
++
++	if (!src)
++		return false;
++
++	return ether_addr_equal(src, p->eth_addr);
++}
++
+ static int br_multicast_add_group(struct net_bridge *br,
+ 				  struct net_bridge_port *port,
+-				  struct br_ip *group)
++				  struct br_ip *group,
++				  const unsigned char *src)
+ {
+ 	struct net_bridge_mdb_entry *mp;
+ 	struct net_bridge_port_group *p;
+@@ -682,13 +704,13 @@ static int br_multicast_add_group(struct
+ 	for (pp = &mp->ports;
+ 	     (p = mlock_dereference(*pp, br)) != NULL;
+ 	     pp = &p->next) {
+-		if (p->port == port)
++		if (br_port_group_equal(p, port, src))
+ 			goto found;
+ 		if ((unsigned long)p->port < (unsigned long)port)
+ 			break;
+ 	}
+ 
+-	p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);
++	p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY, src);
+ 	if (unlikely(!p))
+ 		goto err;
+ 	rcu_assign_pointer(*pp, p);
+@@ -707,7 +729,7 @@ err:
+ static int br_ip4_multicast_add_group(struct net_bridge *br,
+ 				      struct net_bridge_port *port,
+ 				      __be32 group,
+-				      __u16 vid)
++				      __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 
+@@ -718,14 +740,14 @@ static int br_ip4_multicast_add_group(st
+ 	br_group.proto = htons(ETH_P_IP);
+ 	br_group.vid = vid;
+ 
+-	return br_multicast_add_group(br, port, &br_group);
++	return br_multicast_add_group(br, port, &br_group, src);
+ }
+ 
+ #if IS_ENABLED(CONFIG_IPV6)
+ static int br_ip6_multicast_add_group(struct net_bridge *br,
+ 				      struct net_bridge_port *port,
+ 				      const struct in6_addr *group,
+-				      __u16 vid)
++				      __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 
+@@ -736,7 +758,7 @@ static int br_ip6_multicast_add_group(st
+ 	br_group.proto = htons(ETH_P_IPV6);
+ 	br_group.vid = vid;
+ 
+-	return br_multicast_add_group(br, port, &br_group);
++	return br_multicast_add_group(br, port, &br_group, src);
+ }
+ #endif
+ 
+@@ -965,6 +987,7 @@ static int br_ip4_multicast_igmp3_report
+ 					 struct sk_buff *skb,
+ 					 u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct igmpv3_report *ih;
+ 	struct igmpv3_grec *grec;
+ 	int i;
+@@ -1008,7 +1031,7 @@ static int br_ip4_multicast_igmp3_report
+ 			continue;
+ 		}
+ 
+-		err = br_ip4_multicast_add_group(br, port, group, vid);
++		err = br_ip4_multicast_add_group(br, port, group, vid, src);
+ 		if (err)
+ 			break;
+ 	}
+@@ -1022,6 +1045,7 @@ static int br_ip6_multicast_mld2_report(
+ 					struct sk_buff *skb,
+ 					u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct icmp6hdr *icmp6h;
+ 	struct mld2_grec *grec;
+ 	int i;
+@@ -1070,7 +1094,7 @@ static int br_ip6_multicast_mld2_report(
+ 		}
+ 
+ 		err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
+-						 vid);
++						 vid, src);
+ 		if (!err)
+ 			break;
+ 	}
+@@ -1407,7 +1431,8 @@ br_multicast_leave_group(struct net_brid
+ 			 struct net_bridge_port *port,
+ 			 struct br_ip *group,
+ 			 struct bridge_mcast_other_query *other_query,
+-			 struct bridge_mcast_own_query *own_query)
++			 struct bridge_mcast_own_query *own_query,
++			 const unsigned char *src)
+ {
+ 	struct net_bridge_mdb_htable *mdb;
+ 	struct net_bridge_mdb_entry *mp;
+@@ -1457,7 +1482,7 @@ br_multicast_leave_group(struct net_brid
+ 		for (pp = &mp->ports;
+ 		     (p = mlock_dereference(*pp, br)) != NULL;
+ 		     pp = &p->next) {
+-			if (p->port != port)
++			if (!br_port_group_equal(p, port, src))
+ 				continue;
+ 
+ 			rcu_assign_pointer(*pp, p->next);
+@@ -1491,7 +1516,7 @@ br_multicast_leave_group(struct net_brid
+ 	for (p = mlock_dereference(mp->ports, br);
+ 	     p != NULL;
+ 	     p = mlock_dereference(p->next, br)) {
+-		if (p->port != port)
++		if (!br_port_group_equal(p, port, src))
+ 			continue;
+ 
+ 		if (!hlist_unhashed(&p->mglist) &&
+@@ -1509,8 +1534,8 @@ out:
+ 
+ static void br_ip4_multicast_leave_group(struct net_bridge *br,
+ 					 struct net_bridge_port *port,
+-					 __be32 group,
+-					 __u16 vid)
++					 __be32 group, __u16 vid,
++					 const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 	struct bridge_mcast_own_query *own_query;
+@@ -1525,14 +1550,14 @@ static void br_ip4_multicast_leave_group
+ 	br_group.vid = vid;
+ 
+ 	br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
+-				 own_query);
++				 own_query, src);
+ }
+ 
+ #if IS_ENABLED(CONFIG_IPV6)
+ static void br_ip6_multicast_leave_group(struct net_bridge *br,
+ 					 struct net_bridge_port *port,
+ 					 const struct in6_addr *group,
+-					 __u16 vid)
++					 __u16 vid, const unsigned char *src)
+ {
+ 	struct br_ip br_group;
+ 	struct bridge_mcast_own_query *own_query;
+@@ -1547,7 +1572,7 @@ static void br_ip6_multicast_leave_group
+ 	br_group.vid = vid;
+ 
+ 	br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
+-				 own_query);
++				 own_query, src);
+ }
+ #endif
+ 
+@@ -1556,6 +1581,7 @@ static int br_multicast_ipv4_rcv(struct
+ 				 struct sk_buff *skb,
+ 				 u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct sk_buff *skb2 = skb;
+ 	const struct iphdr *iph;
+ 	struct igmphdr *ih;
+@@ -1629,7 +1655,7 @@ static int br_multicast_ipv4_rcv(struct
+ 	case IGMP_HOST_MEMBERSHIP_REPORT:
+ 	case IGMPV2_HOST_MEMBERSHIP_REPORT:
+ 		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
+-		err = br_ip4_multicast_add_group(br, port, ih->group, vid);
++		err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
+ 		break;
+ 	case IGMPV3_HOST_MEMBERSHIP_REPORT:
+ 		err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
+@@ -1638,7 +1664,7 @@ static int br_multicast_ipv4_rcv(struct
+ 		err = br_ip4_multicast_query(br, port, skb2, vid);
+ 		break;
+ 	case IGMP_HOST_LEAVE_MESSAGE:
+-		br_ip4_multicast_leave_group(br, port, ih->group, vid);
++		br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
+ 		break;
+ 	}
+ 
+@@ -1656,6 +1682,7 @@ static int br_multicast_ipv6_rcv(struct
+ 				 struct sk_buff *skb,
+ 				 u16 vid)
+ {
++	const unsigned char *src = eth_hdr(skb)->h_source;
+ 	struct sk_buff *skb2;
+ 	const struct ipv6hdr *ip6h;
+ 	u8 icmp6_type;
+@@ -1765,7 +1792,8 @@ static int br_multicast_ipv6_rcv(struct
+ 		}
+ 		mld = (struct mld_msg *)skb_transport_header(skb2);
+ 		BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
+-		err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
++		err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
++						 src);
+ 		break;
+ 	    }
+ 	case ICMPV6_MLD2_REPORT:
+@@ -1782,7 +1810,7 @@ static int br_multicast_ipv6_rcv(struct
+ 			goto out;
+ 		}
+ 		mld = (struct mld_msg *)skb_transport_header(skb2);
+-		br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
++		br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
+ 	    }
+ 	}
+ 
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -112,6 +112,9 @@ struct net_bridge_port_group {
+ 	struct timer_list		timer;
+ 	struct br_ip			addr;
+ 	unsigned char			state;
++
++	unsigned char			eth_addr[ETH_ALEN];
++	bool				unicast;
+ };
+ 
+ struct net_bridge_mdb_entry
+@@ -173,6 +176,7 @@ struct net_bridge_port
+ #define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING)
+ #define BR_PROMISC		0x00000080
+ #define BR_ISOLATE_MODE		0x00000100
++#define BR_MULTICAST_TO_UCAST	0x00000200
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	struct bridge_mcast_own_query	ip4_own_query;
+@@ -485,7 +489,8 @@ void br_multicast_free_pg(struct rcu_hea
+ struct net_bridge_port_group *
+ br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
+ 			    struct net_bridge_port_group __rcu *next,
+-			    unsigned char state);
++			    unsigned char state,
++		       const unsigned char *src);
+ void br_mdb_init(void);
+ void br_mdb_uninit(void);
+ void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
+--- a/net/bridge/br_mdb.c
++++ b/net/bridge/br_mdb.c
+@@ -342,7 +342,7 @@ static int br_mdb_add_group(struct net_b
+ 			break;
+ 	}
+ 
+-	p = br_multicast_new_port_group(port, group, *pp, state);
++	p = br_multicast_new_port_group(port, group, *pp, state, NULL);
+ 	if (unlikely(!p))
+ 		return -ENOMEM;
+ 	rcu_assign_pointer(*pp, p);
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -168,6 +168,29 @@ out:
+ 	return p;
+ }
+ 
++static struct net_bridge_port *maybe_deliver_addr(
++	struct net_bridge_port *prev, struct net_bridge_port *p,
++	struct sk_buff *skb, const unsigned char *addr,
++	void (*__packet_hook)(const struct net_bridge_port *p,
++			      struct sk_buff *skb))
++{
++	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
++
++	if (!should_deliver(p, skb))
++		return prev;
++
++	skb = skb_copy(skb, GFP_ATOMIC);
++	if (!skb) {
++		dev->stats.tx_dropped++;
++		return prev;
++	}
++
++	memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
++	__packet_hook(p, skb);
++
++	return prev;
++}
++
+ /* called under bridge lock */
+ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 		     struct sk_buff *skb0,
+@@ -232,6 +255,7 @@ static void br_multicast_flood(struct ne
+ 	struct net_bridge_port *prev = NULL;
+ 	struct net_bridge_port_group *p;
+ 	struct hlist_node *rp;
++	const unsigned char *addr;
+ 
+ 	rp = rcu_dereference(hlist_first_rcu(&br->router_list));
+ 	p = mdst ? rcu_dereference(mdst->ports) : NULL;
+@@ -242,10 +266,19 @@ static void br_multicast_flood(struct ne
+ 		rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
+ 			     NULL;
+ 
+-		port = (unsigned long)lport > (unsigned long)rport ?
+-		       lport : rport;
+-
+-		prev = maybe_deliver(prev, port, skb, __packet_hook);
++		if ((unsigned long)lport > (unsigned long)rport) {
++			port = lport;
++			addr = p->unicast ? p->eth_addr : NULL;
++		} else {
++			port = rport;
++			addr = NULL;
++		}
++
++		if (addr)
++			prev = maybe_deliver_addr(prev, port, skb, addr,
++						  __packet_hook);
++		else
++			prev = maybe_deliver(prev, port, skb, __packet_hook);
+ 		if (IS_ERR(prev))
+ 			goto out;
+ 
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -202,6 +202,7 @@ static BRPORT_ATTR(multicast_router, S_I
+ 		   store_multicast_router);
+ 
+ BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
++BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
+ #endif
+ 
+ static const struct brport_attribute *brport_attrs[] = {
+@@ -228,6 +229,7 @@ static const struct brport_attribute *br
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
++	&brport_attr_multicast_to_unicast,
+ #endif
+ 	&brport_attr_isolate_mode,
+ 	NULL
diff --git a/trunk/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch b/trunk/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
new file mode 100644
index 00000000..a89a9f3b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/ppp/pppoe.c
++++ b/drivers/net/ppp/pppoe.c
+@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 		goto end;
+ 
+ 
+-	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
++	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
+ 			   0, GFP_KERNEL);
+ 	if (!skb) {
+ 		error = -ENOMEM;
+@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 	}
+ 
+ 	/* Reserve space for headers. */
+-	skb_reserve(skb, dev->hard_header_len);
++	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
+ 	skb_reset_network_header(skb);
+ 
+ 	skb->dev = dev;
diff --git a/trunk/target/linux/generic/patches-3.18/651-wireless_mesh_header.patch b/trunk/target/linux/generic/patches-3.18/651-wireless_mesh_header.patch
new file mode 100644
index 00000000..16da5cd6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/651-wireless_mesh_header.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -130,7 +130,7 @@ static inline bool dev_xmit_complete(int
+  */
+ 
+ #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ #  define LL_MAX_HEADER 128
+ # else
+ #  define LL_MAX_HEADER 96
diff --git a/trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch b/trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch
new file mode 100644
index 00000000..7e568592
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/652-atm_header_changes.patch
@@ -0,0 +1,12 @@
+--- a/include/uapi/linux/atm.h
++++ b/include/uapi/linux/atm.h
+@@ -139,6 +139,9 @@ struct atm_trafprm {
+ 	int		min_pcr;	/* minimum PCR in cells per second */
+ 	int		max_cdv;	/* maximum CDV in microseconds */
+ 	int		max_sdu;	/* maximum SDU in bytes */
++	int		scr;		/* sustained rate in cells per second */
++	int		mbs;		/* maximum burst size (MBS) in cells */
++	int		cdv;		/* Cell delay varition */
+         /* extra params for ABR */
+         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
+         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/trunk/target/linux/generic/patches-3.18/653-disable_netlink_trim.patch b/trunk/target/linux/generic/patches-3.18/653-disable_netlink_trim.patch
new file mode 100644
index 00000000..6b25a2e8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/653-disable_netlink_trim.patch
@@ -0,0 +1,30 @@
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -1715,27 +1715,7 @@ void netlink_detachskb(struct sock *sk,
+ 
+ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
+ {
+-	int delta;
+-
+ 	WARN_ON(skb->sk != NULL);
+-	if (netlink_skb_is_mmaped(skb))
+-		return skb;
+-
+-	delta = skb->end - skb->tail;
+-	if (is_vmalloc_addr(skb->head) || delta * 2 < skb->truesize)
+-		return skb;
+-
+-	if (skb_shared(skb)) {
+-		struct sk_buff *nskb = skb_clone(skb, allocation);
+-		if (!nskb)
+-			return skb;
+-		consume_skb(skb);
+-		skb = nskb;
+-	}
+-
+-	if (!pskb_expand_head(skb, 0, -delta, allocation))
+-		skb->truesize -= delta;
+-
+ 	return skb;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/655-increase_skb_pad.patch b/trunk/target/linux/generic/patches-3.18/655-increase_skb_pad.patch
new file mode 100644
index 00000000..96da1678
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/655-increase_skb_pad.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(
+  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
+  */
+ #ifndef NET_SKB_PAD
+-#define NET_SKB_PAD	max(32, L1_CACHE_BYTES)
++#define NET_SKB_PAD	max(64, L1_CACHE_BYTES)
+ #endif
+ 
+ int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/trunk/target/linux/generic/patches-3.18/656-skb_reduce_truesize-helper.patch b/trunk/target/linux/generic/patches-3.18/656-skb_reduce_truesize-helper.patch
new file mode 100644
index 00000000..48277930
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/656-skb_reduce_truesize-helper.patch
@@ -0,0 +1,41 @@
+From 4593a806e31119c5bd3faa00c7210ad862d515af Mon Sep 17 00:00:00 2001
+From: Dave Taht <dave.taht@bufferbloat.net>
+Date: Mon, 31 Dec 2012 10:02:21 -0800
+Subject: [PATCH 3/7] skb_reduce_truesize: helper function for shrinking skbs
+ whenever needed
+
+On embedded devices in particular, large queues of small packets from the rx
+path with a large truesize can exist. Reducing their size can reduce
+memory pressure. skb_reduce_truesize is a helper function for doing this,
+when needed.
+---
+ include/linux/skbuff.h |   18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -2067,6 +2067,24 @@ static inline void pskb_trim_unique(stru
+ 	BUG_ON(err);
+ }
+ 
++/*
++ * Caller wants to reduce memory needs before queueing skb
++ * The (expensive) copy should not be be done in fast path.
++ */
++static inline struct sk_buff *skb_reduce_truesize(struct sk_buff *skb)
++{
++	if (skb->truesize > 2 * SKB_TRUESIZE(skb->len)) {
++		struct sk_buff *nskb;
++		nskb = skb_copy_expand(skb, skb_headroom(skb), 0,
++			GFP_ATOMIC | __GFP_NOWARN);
++		if (nskb) {
++			__kfree_skb(skb);
++			skb = nskb;
++		}
++	}
++	return skb;
++}
++
+ /**
+  *	skb_orphan - orphan a buffer
+  *	@skb: buffer to orphan
diff --git a/trunk/target/linux/generic/patches-3.18/657-qdisc_reduce_truesize.patch b/trunk/target/linux/generic/patches-3.18/657-qdisc_reduce_truesize.patch
new file mode 100644
index 00000000..6777eecf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/657-qdisc_reduce_truesize.patch
@@ -0,0 +1,63 @@
+From bc9fec2f87d57bdbff30d296605e24504513f65c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dave=20T=C3=A4ht?= <dave.taht@bufferbloat.net>
+Date: Mon, 17 Sep 2012 19:20:22 -0700
+Subject: [PATCH 4/7] net: add skb_reduce_truesize support to common qdiscs
+
+Reduce skb size under load when queues begin to fill on the
+commont qdiscs.
+---
+ net/sched/sch_codel.c    |    2 ++
+ net/sched/sch_fifo.c     |   12 ++++++++----
+ net/sched/sch_fq_codel.c |    2 ++
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+--- a/net/sched/sch_codel.c
++++ b/net/sched/sch_codel.c
+@@ -96,6 +96,8 @@ static int codel_qdisc_enqueue(struct sk
+ 	struct codel_sched_data *q;
+ 
+ 	if (likely(qdisc_qlen(sch) < sch->limit)) {
++		if(qdisc_qlen(sch) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		codel_set_enqueue_time(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+ 	}
+--- a/net/sched/sch_fifo.c
++++ b/net/sched/sch_fifo.c
+@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff
+ 
+ static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	return qdisc_reshape_fail(skb, sch);
+ }
+ 
+ static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	/* queue full, remove one skb to fulfill the limit */
+ 	__qdisc_queue_drop_head(sch, &sch->q);
+ 	qdisc_qstats_drop(sch);
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -185,6 +185,8 @@ static int fq_codel_enqueue(struct sk_bu
+ 		return ret;
+ 	}
+ 	idx--;
++	if (sch->q.qlen > 128)
++		skb = skb_reduce_truesize(skb);
+ 
+ 	codel_set_enqueue_time(skb);
+ 	flow = &q->flows[idx];
diff --git a/trunk/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch b/trunk/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch
new file mode 100644
index 00000000..f7f4659e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/660-fq_codel_defaults.patch
@@ -0,0 +1,14 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -387,9 +387,9 @@ static int fq_codel_init(struct Qdisc *s
+ 	struct fq_codel_sched_data *q = qdisc_priv(sch);
+ 	int i;
+ 
+-	sch->limit = 10*1024;
++	sch->limit = 1024;
+ 	q->flows_cnt = 1024;
+-	q->quantum = psched_mtu(qdisc_dev(sch));
++	q->quantum = 300;
+ 	q->perturbation = prandom_u32();
+ 	INIT_LIST_HEAD(&q->new_flows);
+ 	INIT_LIST_HEAD(&q->old_flows);
diff --git a/trunk/target/linux/generic/patches-3.18/661-fq_codel_keep_dropped_stats.patch b/trunk/target/linux/generic/patches-3.18/661-fq_codel_keep_dropped_stats.patch
new file mode 100644
index 00000000..45a8d683
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/661-fq_codel_keep_dropped_stats.patch
@@ -0,0 +1,10 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -198,7 +198,6 @@ static int fq_codel_enqueue(struct sk_bu
+ 		list_add_tail(&flow->flowchain, &q->new_flows);
+ 		q->new_flow_count++;
+ 		flow->deficit = q->quantum;
+-		flow->dropped = 0;
+ 	}
+ 	if (++sch->q.qlen <= sch->limit)
+ 		return NET_XMIT_SUCCESS;
diff --git a/trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch b/trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
new file mode 100644
index 00000000..6a67a894
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
@@ -0,0 +1,75 @@
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -3,8 +3,9 @@
+ # 
+ 
+ menuconfig NET_SCHED
+-	bool "QoS and/or fair queueing"
++	def_bool y
+ 	select NET_SCH_FIFO
++	select NET_SCH_FQ_CODEL
+ 	---help---
+ 	  When the kernel has several packets to send out over a network
+ 	  device, it has to decide which ones to send first, which ones to
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -592,7 +592,7 @@ static const struct Qdisc_class_ops fq_c
+ 	.walk		=	fq_codel_walk,
+ };
+ 
+-static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
++struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
+ 	.cl_ops		=	&fq_codel_class_ops,
+ 	.id		=	"fq_codel",
+ 	.priv_size	=	sizeof(struct fq_codel_sched_data),
+@@ -608,6 +608,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+ 	.dump_stats =	fq_codel_dump_stats,
+ 	.owner		=	THIS_MODULE,
+ };
++EXPORT_SYMBOL(fq_codel_qdisc_ops);
+ 
+ static int __init fq_codel_module_init(void)
+ {
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -344,6 +344,7 @@ extern struct Qdisc noop_qdisc;
+ extern struct Qdisc_ops noop_qdisc_ops;
+ extern struct Qdisc_ops pfifo_fast_ops;
+ extern struct Qdisc_ops mq_qdisc_ops;
++extern struct Qdisc_ops fq_codel_qdisc_ops;
+ extern const struct Qdisc_ops *default_qdisc_ops;
+ 
+ struct Qdisc_class_common {
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -737,7 +737,7 @@ static void attach_one_default_qdisc(str
+ 
+ 	if (dev->tx_queue_len) {
+ 		qdisc = qdisc_create_dflt(dev_queue,
+-					  default_qdisc_ops, TC_H_ROOT);
++					  &fq_codel_qdisc_ops, TC_H_ROOT);
+ 		if (!qdisc) {
+ 			netdev_info(dev, "activation failed\n");
+ 			return;
+--- a/net/sched/sch_mq.c
++++ b/net/sched/sch_mq.c
+@@ -57,7 +57,7 @@ static int mq_init(struct Qdisc *sch, st
+ 
+ 	for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
+ 		dev_queue = netdev_get_tx_queue(dev, ntx);
+-		qdisc = qdisc_create_dflt(dev_queue, default_qdisc_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(ntx + 1)));
+ 		if (qdisc == NULL)
+--- a/net/sched/sch_mqprio.c
++++ b/net/sched/sch_mqprio.c
+@@ -124,7 +124,7 @@ static int mqprio_init(struct Qdisc *sch
+ 
+ 	for (i = 0; i < dev->num_tx_queues; i++) {
+ 		dev_queue = netdev_get_tx_queue(dev, i);
+-		qdisc = qdisc_create_dflt(dev_queue, default_qdisc_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(i + 1)));
+ 		if (qdisc == NULL) {
diff --git a/trunk/target/linux/generic/patches-3.18/663-remove_pfifo_fast.patch b/trunk/target/linux/generic/patches-3.18/663-remove_pfifo_fast.patch
new file mode 100644
index 00000000..5b26ca35
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/663-remove_pfifo_fast.patch
@@ -0,0 +1,143 @@
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -442,140 +442,6 @@ static struct Qdisc noqueue_qdisc = {
+ 	.busylock	=	__SPIN_LOCK_UNLOCKED(noqueue_qdisc.busylock),
+ };
+ 
+-
+-static const u8 prio2band[TC_PRIO_MAX + 1] = {
+-	1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
+-};
+-
+-/* 3-band FIFO queue: old style, but should be a bit faster than
+-   generic prio+fifo combination.
+- */
+-
+-#define PFIFO_FAST_BANDS 3
+-
+-/*
+- * Private data for a pfifo_fast scheduler containing:
+- * 	- queues for the three band
+- * 	- bitmap indicating which of the bands contain skbs
+- */
+-struct pfifo_fast_priv {
+-	u32 bitmap;
+-	struct sk_buff_head q[PFIFO_FAST_BANDS];
+-};
+-
+-/*
+- * Convert a bitmap to the first band number where an skb is queued, where:
+- * 	bitmap=0 means there are no skbs on any band.
+- * 	bitmap=1 means there is an skb on band 0.
+- *	bitmap=7 means there are skbs on all 3 bands, etc.
+- */
+-static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
+-
+-static inline struct sk_buff_head *band2list(struct pfifo_fast_priv *priv,
+-					     int band)
+-{
+-	return priv->q + band;
+-}
+-
+-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc)
+-{
+-	if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
+-		int band = prio2band[skb->priority & TC_PRIO_MAX];
+-		struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		priv->bitmap |= (1 << band);
+-		qdisc->q.qlen++;
+-		return __qdisc_enqueue_tail(skb, qdisc, list);
+-	}
+-
+-	return qdisc_drop(skb, qdisc);
+-}
+-
+-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (likely(band >= 0)) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-		struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
+-
+-		qdisc->q.qlen--;
+-		if (skb_queue_empty(list))
+-			priv->bitmap &= ~(1 << band);
+-
+-		return skb;
+-	}
+-
+-	return NULL;
+-}
+-
+-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (band >= 0) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		return skb_peek(list);
+-	}
+-
+-	return NULL;
+-}
+-
+-static void pfifo_fast_reset(struct Qdisc *qdisc)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		__qdisc_reset_queue(qdisc, band2list(priv, prio));
+-
+-	priv->bitmap = 0;
+-	qdisc->qstats.backlog = 0;
+-	qdisc->q.qlen = 0;
+-}
+-
+-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
+-{
+-	struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
+-
+-	memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
+-	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
+-		goto nla_put_failure;
+-	return skb->len;
+-
+-nla_put_failure:
+-	return -1;
+-}
+-
+-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		__skb_queue_head_init(band2list(priv, prio));
+-
+-	/* Can by-pass the queue discipline */
+-	qdisc->flags |= TCQ_F_CAN_BYPASS;
+-	return 0;
+-}
+-
+-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
+-	.id		=	"pfifo_fast",
+-	.priv_size	=	sizeof(struct pfifo_fast_priv),
+-	.enqueue	=	pfifo_fast_enqueue,
+-	.dequeue	=	pfifo_fast_dequeue,
+-	.peek		=	pfifo_fast_peek,
+-	.init		=	pfifo_fast_init,
+-	.reset		=	pfifo_fast_reset,
+-	.dump		=	pfifo_fast_dump,
+-	.owner		=	THIS_MODULE,
+-};
+-
+ static struct lock_class_key qdisc_tx_busylock;
+ 
+ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
diff --git a/trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch b/trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch
new file mode 100644
index 00000000..2682441b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/664-codel_fix_3_12.patch
@@ -0,0 +1,22 @@
+--- a/net/sched/sch_api.c
++++ b/net/sched/sch_api.c
+@@ -1945,7 +1945,7 @@ static int __init pktsched_init(void)
+ 		return err;
+ 	}
+ 
+-	register_qdisc(&pfifo_fast_ops);
++	register_qdisc(&fq_codel_qdisc_ops);
+ 	register_qdisc(&pfifo_qdisc_ops);
+ 	register_qdisc(&bfifo_qdisc_ops);
+ 	register_qdisc(&pfifo_head_drop_qdisc_ops);
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -31,7 +31,7 @@
+ #include <net/dst.h>
+ 
+ /* Qdisc to use by default */
+-const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
++const struct Qdisc_ops *default_qdisc_ops = &fq_codel_qdisc_ops;
+ EXPORT_SYMBOL(default_qdisc_ops);
+ 
+ /* Main transmission queue. */
diff --git a/trunk/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/trunk/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
new file mode 100644
index 00000000..000665f0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -0,0 +1,481 @@
+From 775d6fe74d1eaec2ba387535b068dde2dc89de9e Mon Sep 17 00:00:00 2001
+From: Steven Barth <steven@midlink.org>
+Date: Thu, 22 May 2014 09:49:05 +0200
+Subject: [PATCH] Add support for MAP-E FMRs (mesh mode)
+
+MAP-E FMRs (draft-ietf-softwire-map-10) are rules for IPv4-communication
+between MAP CEs (mesh mode) without the need to forward such data to a
+border relay. This is similar to how 6rd works but for IPv4 over IPv6.
+
+Signed-off-by: Steven Barth <cyrus@openwrt.org>
+---
+ include/net/ip6_tunnel.h       |  13 ++
+ include/uapi/linux/if_tunnel.h |  13 ++
+ net/ipv6/ip6_tunnel.c          | 276 +++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 291 insertions(+), 11 deletions(-)
+
+--- a/include/net/ip6_tunnel.h
++++ b/include/net/ip6_tunnel.h
+@@ -15,6 +15,18 @@
+ /* determine capability on a per-packet basis */
+ #define IP6_TNL_F_CAP_PER_PACKET 0x40000
+ 
++/* IPv6 tunnel FMR */
++struct __ip6_tnl_fmr {
++	struct __ip6_tnl_fmr *next; /* next fmr in list */
++	struct in6_addr ip6_prefix;
++	struct in_addr ip4_prefix;
++
++	__u8 ip6_prefix_len;
++	__u8 ip4_prefix_len;
++	__u8 ea_len;
++	__u8 offset;
++};
++
+ struct __ip6_tnl_parm {
+ 	char name[IFNAMSIZ];	/* name of tunnel device */
+ 	int link;		/* ifindex of underlying L2 interface */
+@@ -25,6 +37,7 @@ struct __ip6_tnl_parm {
+ 	__u32 flags;		/* tunnel flags */
+ 	struct in6_addr laddr;	/* local tunnel end-point address */
+ 	struct in6_addr raddr;	/* remote tunnel end-point address */
++	struct __ip6_tnl_fmr *fmrs;	/* FMRs */
+ 
+ 	__be16			i_flags;
+ 	__be16			o_flags;
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -57,10 +57,23 @@ enum {
+ 	IFLA_IPTUN_ENCAP_FLAGS,
+ 	IFLA_IPTUN_ENCAP_SPORT,
+ 	IFLA_IPTUN_ENCAP_DPORT,
++	IFLA_IPTUN_FMRS,
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+ 
++enum {
++	IFLA_IPTUN_FMR_UNSPEC,
++	IFLA_IPTUN_FMR_IP6_PREFIX,
++	IFLA_IPTUN_FMR_IP4_PREFIX,
++	IFLA_IPTUN_FMR_IP6_PREFIX_LEN,
++	IFLA_IPTUN_FMR_IP4_PREFIX_LEN,
++	IFLA_IPTUN_FMR_EA_LEN,
++	IFLA_IPTUN_FMR_OFFSET,
++	__IFLA_IPTUN_FMR_MAX,
++};
++#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1)
++
+ enum tunnel_encap_types {
+ 	TUNNEL_ENCAP_NONE,
+ 	TUNNEL_ENCAP_FOU,
+--- a/net/ipv6/ip6_tunnel.c
++++ b/net/ipv6/ip6_tunnel.c
+@@ -16,6 +16,8 @@
+  *      as published by the Free Software Foundation; either version
+  *      2 of the License, or (at your option) any later version.
+  *
++ *	Changes:
++ * Steven Barth <cyrus@openwrt.org>:		MAP-E FMR support
+  */
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+@@ -77,11 +79,9 @@ static bool log_ecn_error = true;
+ module_param(log_ecn_error, bool, 0644);
+ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
+ 
+-static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
++static u32 HASH(const struct in6_addr *addr)
+ {
+-	u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2);
+-
+-	return hash_32(hash, HASH_SIZE_SHIFT);
++	return hash_32(ipv6_addr_hash(addr), HASH_SIZE_SHIFT);
+ }
+ 
+ static int ip6_tnl_dev_init(struct net_device *dev);
+@@ -180,15 +180,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store);
+ static struct ip6_tnl *
+ ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
+ {
+-	unsigned int hash = HASH(remote, local);
++	unsigned int hash = HASH(local);
+ 	struct ip6_tnl *t;
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
+-		if (ipv6_addr_equal(local, &t->parms.laddr) &&
+-		    ipv6_addr_equal(remote, &t->parms.raddr) &&
+-		    (t->dev->flags & IFF_UP))
++		if (!ipv6_addr_equal(local, &t->parms.laddr) ||
++				!(t->dev->flags & IFF_UP))
++			continue;
++
++		if (ipv6_addr_equal(remote, &t->parms.raddr))
+ 			return t;
++
++		for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++			if (ipv6_prefix_equal(remote, &fmr->ip6_prefix,
++					fmr->ip6_prefix_len))
++				return t;
++		}
+ 	}
+ 	t = rcu_dereference(ip6n->tnls_wc[0]);
+ 	if (t && (t->dev->flags & IFF_UP))
+@@ -218,7 +227,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
+ 
+ 	if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
+ 		prio = 1;
+-		h = HASH(remote, local);
++		h = HASH(local);
+ 	}
+ 	return &ip6n->tnls[prio][h];
+ }
+@@ -388,6 +397,12 @@ ip6_tnl_dev_uninit(struct net_device *de
+ 	struct net *net = t->net;
+ 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
+ 
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++
+ 	if (dev == ip6n->fb_tnl_dev)
+ 		RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
+ 	else
+@@ -771,6 +786,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+ }
+ EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
+ 
++
++/**
++ * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR
++ *   @dest: destination IPv6 address buffer
++ *   @skb: received socket buffer
++ *   @fmr: MAP FMR
++ *   @xmit: Calculate for xmit or rcv
++ **/
++static void ip4ip6_fmr_calc(struct in6_addr *dest,
++		const struct iphdr *iph, const uint8_t *end,
++		const struct __ip6_tnl_fmr *fmr, bool xmit)
++{
++	int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len);
++	u8 *portp = NULL;
++	bool use_dest_addr;
++	const struct iphdr *dsth = iph;
++
++	if ((u8*)dsth >= end)
++		return;
++
++	/* find significant IP header */
++	if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++		if (ih && ((u8*)&ih[1]) <= end && (
++			ih->type == ICMP_DEST_UNREACH ||
++			ih->type == ICMP_SOURCE_QUENCH ||
++			ih->type == ICMP_TIME_EXCEEDED ||
++			ih->type == ICMP_PARAMETERPROB ||
++			ih->type == ICMP_REDIRECT))
++				dsth = (const struct iphdr*)&ih[1];
++	}
++
++	/* in xmit-path use dest port by default and source port only if
++		this is an ICMP reply to something else; vice versa in rcv-path */
++	use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph);
++
++	/* get dst port */
++	if (((u8*)&dsth[1]) <= end && (
++		dsth->protocol == IPPROTO_UDP ||
++		dsth->protocol == IPPROTO_TCP ||
++		dsth->protocol == IPPROTO_SCTP ||
++		dsth->protocol == IPPROTO_DCCP)) {
++			/* for UDP, TCP, SCTP and DCCP source and dest port
++			follow IPv4 header directly */
++			portp = ((u8*)dsth) + dsth->ihl * 4;
++
++			if (use_dest_addr)
++				portp += sizeof(u16);
++	} else if (iph->protocol == IPPROTO_ICMP) {
++		struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4);
++
++		/* use icmp identifier as port */
++		if (((u8*)&ih) <= end && (
++		    (use_dest_addr && (
++		    ih->type == ICMP_ECHOREPLY ||
++			ih->type == ICMP_TIMESTAMPREPLY ||
++			ih->type == ICMP_INFO_REPLY ||
++			ih->type == ICMP_ADDRESSREPLY)) ||
++			(!use_dest_addr && (
++			ih->type == ICMP_ECHO ||
++			ih->type == ICMP_TIMESTAMP ||
++			ih->type == ICMP_INFO_REQUEST ||
++			ih->type == ICMP_ADDRESS)
++			)))
++				portp = (u8*)&ih->un.echo.id;
++	}
++
++	if ((portp && &portp[2] <= end) || psidlen == 0) {
++		int frombyte = fmr->ip6_prefix_len / 8;
++		int fromrem = fmr->ip6_prefix_len % 8;
++		int bytes = sizeof(struct in6_addr) - frombyte;
++		const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr;
++		u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len);
++		u64 t = 0;
++
++		/* extract PSID from port and add it to eabits */
++		u16 psidbits = 0;
++		if (psidlen > 0) {
++			psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]);
++			psidbits >>= 16 - psidlen - fmr->offset;
++			psidbits = (u16)(psidbits << (16 - psidlen));
++			eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen));
++		}
++
++		/* rewrite destination address */
++		*dest = fmr->ip6_prefix;
++		memcpy(&dest->s6_addr[10], addr, sizeof(*addr));
++		dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen));
++
++		if (bytes > sizeof(u64))
++			bytes = sizeof(u64);
++
++		/* insert eabits */
++		memcpy(&t, &dest->s6_addr[frombyte], bytes);
++		t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1)
++			<< (64 - fmr->ea_len - fromrem));
++		t = cpu_to_be64(t | (eabits >> fromrem));
++		memcpy(&dest->s6_addr[frombyte], &t, bytes);
++	}
++}
++
++
+ /**
+  * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally
+  *   @skb: received socket buffer
+@@ -815,6 +932,26 @@ static int ip6_tnl_rcv(struct sk_buff *s
+ 		skb_reset_network_header(skb);
+ 		skb->protocol = htons(protocol);
+ 		memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
++		if (protocol == ETH_P_IP &&
++			!ipv6_addr_equal(&ipv6h->saddr, &t->parms.raddr)) {
++				/* Packet didn't come from BR, so lookup FMR */
++				struct __ip6_tnl_fmr *fmr;
++				struct in6_addr expected = t->parms.raddr;
++				for (fmr = t->parms.fmrs; fmr; fmr = fmr->next)
++					if (ipv6_prefix_equal(&ipv6h->saddr,
++						&fmr->ip6_prefix, fmr->ip6_prefix_len))
++							break;
++
++				/* Check that IPv6 matches IPv4 source to prevent spoofing */
++				if (fmr)
++					ip4ip6_fmr_calc(&expected, ip_hdr(skb),
++							skb_tail_pointer(skb), fmr, false);
++
++				if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) {
++					rcu_read_unlock();
++					goto discard;
++				}
++		}
+ 
+ 		__skb_tunnel_rx(skb, t->dev, t->net);
+ 
+@@ -1076,6 +1213,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	__u8 dsfield;
+ 	__u32 mtu;
+ 	int err;
++	struct __ip6_tnl_fmr *fmr;
+ 
+ 	if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
+ 	    !ip6_tnl_xmit_ctl(t))
+@@ -1095,6 +1233,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
+ 	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
+ 		fl6.flowi6_mark = skb->mark;
+ 
++	/* try to find matching FMR */
++	for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
++		unsigned mshift = 32 - fmr->ip4_prefix_len;
++		if (ntohl(fmr->ip4_prefix.s_addr) >> mshift ==
++				ntohl(iph->daddr) >> mshift)
++			break;
++	}
++
++	/* change dstaddr according to FMR */
++	if (fmr)
++		ip4ip6_fmr_calc(&fl6.daddr, iph, skb_tail_pointer(skb), fmr, true);
++
+ 	err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
+ 	if (err != 0) {
+ 		/* XXX: send ICMP error even if DF is not set. */
+@@ -1263,6 +1413,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+ 	t->parms.flowinfo = p->flowinfo;
+ 	t->parms.link = p->link;
+ 	t->parms.proto = p->proto;
++
++	while (t->parms.fmrs) {
++		struct __ip6_tnl_fmr *next = t->parms.fmrs->next;
++		kfree(t->parms.fmrs);
++		t->parms.fmrs = next;
++	}
++	t->parms.fmrs = p->fmrs;
++
+ 	ip6_tnl_dst_reset(t);
+ 	ip6_tnl_link_config(t);
+ 	return 0;
+@@ -1293,6 +1451,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+ 	p->flowinfo = u->flowinfo;
+ 	p->link = u->link;
+ 	p->proto = u->proto;
++	p->fmrs = NULL;
+ 	memcpy(p->name, u->name, sizeof(u->name));
+ }
+ 
+@@ -1568,6 +1727,15 @@ static int ip6_tnl_validate(struct nlatt
+ 	return 0;
+ }
+ 
++static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = {
++	[IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) },
++	[IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) },
++	[IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 },
++	[IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 }
++};
++
+ static void ip6_tnl_netlink_parms(struct nlattr *data[],
+ 				  struct __ip6_tnl_parm *parms)
+ {
+@@ -1601,6 +1769,46 @@ static void ip6_tnl_netlink_parms(struct
+ 
+ 	if (data[IFLA_IPTUN_PROTO])
+ 		parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
++
++	if (data[IFLA_IPTUN_FMRS]) {
++		unsigned rem;
++		struct nlattr *fmr;
++		nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) {
++			struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c;
++			struct __ip6_tnl_fmr *nfmr;
++
++			nla_parse_nested(fmrd, IFLA_IPTUN_FMR_MAX,
++				fmr, ip6_tnl_fmr_policy);
++
++			if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL)))
++				continue;
++
++			nfmr->offset = 6;
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX]))
++				nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX],
++					sizeof(nfmr->ip6_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX]))
++				nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX],
++					sizeof(nfmr->ip4_prefix));
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN]))
++				nfmr->ip6_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN]))
++				nfmr->ip4_prefix_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN]))
++				nfmr->ea_len = nla_get_u8(c);
++
++			if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET]))
++				nfmr->offset = nla_get_u8(c);
++
++			nfmr->next = parms->fmrs;
++			parms->fmrs = nfmr;
++		}
++	}
+ }
+ 
+ static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
+@@ -1653,6 +1861,12 @@ static void ip6_tnl_dellink(struct net_d
+ 
+ static size_t ip6_tnl_get_size(const struct net_device *dev)
+ {
++	const struct ip6_tnl *t = netdev_priv(dev);
++	struct __ip6_tnl_fmr *c;
++	int fmrs = 0;
++	for (c = t->parms.fmrs; c; c = c->next)
++		++fmrs;
++
+ 	return
+ 		/* IFLA_IPTUN_LINK */
+ 		nla_total_size(4) +
+@@ -1670,6 +1884,24 @@ static size_t ip6_tnl_get_size(const str
+ 		nla_total_size(4) +
+ 		/* IFLA_IPTUN_PROTO */
+ 		nla_total_size(1) +
++		/* IFLA_IPTUN_FMRS */
++		nla_total_size(0) +
++		(
++			/* nest */
++			nla_total_size(0) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX */
++			nla_total_size(sizeof(struct in6_addr)) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX */
++			nla_total_size(sizeof(struct in_addr)) +
++			/* IFLA_IPTUN_FMR_EA_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */
++			nla_total_size(1) +
++			/* IFLA_IPTUN_FMR_OFFSET */
++			nla_total_size(1)
++		) * fmrs +
+ 		0;
+ }
+ 
+@@ -1677,6 +1909,9 @@ static int ip6_tnl_fill_info(struct sk_b
+ {
+ 	struct ip6_tnl *tunnel = netdev_priv(dev);
+ 	struct __ip6_tnl_parm *parm = &tunnel->parms;
++	struct __ip6_tnl_fmr *c;
++	int fmrcnt = 0;
++	struct nlattr *fmrs;
+ 
+ 	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
+ 	    nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
+@@ -1687,8 +1922,27 @@ static int ip6_tnl_fill_info(struct sk_b
+ 	    nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
+ 	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
+ 	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
+-	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto))
++	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
++	    !(fmrs = nla_nest_start(skb, IFLA_IPTUN_FMRS)))
+ 		goto nla_put_failure;
++
++	for (c = parm->fmrs; c; c = c->next) {
++		struct nlattr *fmr = nla_nest_start(skb, ++fmrcnt);
++		if (!fmr ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX,
++				sizeof(c->ip6_prefix), &c->ip6_prefix) ||
++			nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX,
++				sizeof(c->ip4_prefix), &c->ip4_prefix) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) ||
++			nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset))
++				goto nla_put_failure;
++
++		nla_nest_end(skb, fmr);
++	}
++	nla_nest_end(skb, fmrs);
++
+ 	return 0;
+ 
+ nla_put_failure:
+@@ -1704,6 +1958,7 @@ static const struct nla_policy ip6_tnl_p
+ 	[IFLA_IPTUN_FLOWINFO]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_FLAGS]		= { .type = NLA_U32 },
+ 	[IFLA_IPTUN_PROTO]		= { .type = NLA_U8 },
++	[IFLA_IPTUN_FMRS]		= { .type = NLA_NESTED },
+ };
+ 
+ static struct rtnl_link_ops ip6_link_ops __read_mostly = {
diff --git a/trunk/target/linux/generic/patches-3.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/trunk/target/linux/generic/patches-3.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
new file mode 100644
index 00000000..d76375ef
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -0,0 +1,249 @@
+From 1b5aaa4b16f6e6471ab1c07b38068197a1b4c395 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Fri, 24 May 2013 14:40:54 +0200
+Subject: [PATCH 1/2] ipv6: allow rejecting with "source address failed policy"
+
+RFC6204 L-14 requires rejecting traffic from invalid addresses with
+ICMPv6 Destination Unreachable, Code 5 (Source address failed ingress/
+egress policy) on the LAN side, so add an appropriate rule for that.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ include/net/netns/ipv6.h       |  1 +
+ include/uapi/linux/fib_rules.h |  4 +++
+ include/uapi/linux/rtnetlink.h |  1 +
+ net/ipv4/fib_semantics.c       |  4 +++
+ net/ipv4/fib_trie.c            |  1 +
+ net/ipv4/ipmr.c                |  1 +
+ net/ipv6/fib6_rules.c          |  4 +++
+ net/ipv6/ip6mr.c               |  2 ++
+ net/ipv6/route.c               | 58 +++++++++++++++++++++++++++++++++++++++++-
+ 9 files changed, 75 insertions(+), 1 deletion(-)
+
+--- a/include/net/netns/ipv6.h
++++ b/include/net/netns/ipv6.h
+@@ -59,6 +59,7 @@ struct netns_ipv6 {
+ 	unsigned long		 ip6_rt_last_gc;
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	struct rt6_info         *ip6_prohibit_entry;
++	struct rt6_info		*ip6_policy_failed_entry;
+ 	struct rt6_info         *ip6_blk_hole_entry;
+ 	struct fib6_table       *fib6_local_tbl;
+ 	struct fib_rules_ops    *fib6_rules_ops;
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -64,6 +64,10 @@ enum {
+ 	FR_ACT_BLACKHOLE,	/* Drop without notification */
+ 	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
+ 	FR_ACT_PROHIBIT,	/* Drop with EACCES */
++	FR_ACT_RES9,
++	FR_ACT_RES10,
++	FR_ACT_RES11,
++	FR_ACT_POLICY_FAILED,	/* Drop with EACCES */
+ 	__FR_ACT_MAX,
+ };
+ 
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -203,6 +203,7 @@ enum {
+ 	RTN_THROW,		/* Not in this table		*/
+ 	RTN_NAT,		/* Translate this address	*/
+ 	RTN_XRESOLVE,		/* Use external resolver	*/
++	RTN_POLICY_FAILED,	/* Failed ingress/egress policy */
+ 	__RTN_MAX
+ };
+ 
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX
+ 		.error	= -EINVAL,
+ 		.scope	= RT_SCOPE_NOWHERE,
+ 	},
++	[RTN_POLICY_FAILED] = {
++		.error	= -EACCES,
++		.scope	= RT_SCOPE_UNIVERSE,
++	},
+ };
+ 
+ static void rt_fibinfo_free(struct rtable __rcu **rtp)
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2324,6 +2324,7 @@ static const char *const rtn_type_names[
+ 	[RTN_THROW] = "THROW",
+ 	[RTN_NAT] = "NAT",
+ 	[RTN_XRESOLVE] = "XRESOLVE",
++	[RTN_POLICY_FAILED] = "POLICY_FAILED",
+ };
+ 
+ static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
+--- a/net/ipv4/ipmr.c
++++ b/net/ipv4/ipmr.c
+@@ -184,6 +184,7 @@ static int ipmr_rule_action(struct fib_r
+ 	case FR_ACT_UNREACHABLE:
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
++	case FR_ACT_POLICY_FAILED:
+ 		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+--- a/net/ipv6/fib6_rules.c
++++ b/net/ipv6/fib6_rules.c
+@@ -73,6 +73,10 @@ static int fib6_rule_action(struct fib_r
+ 		err = -EACCES;
+ 		rt = net->ipv6.ip6_prohibit_entry;
+ 		goto discard_pkt;
++	case FR_ACT_POLICY_FAILED:
++		err = -EACCES;
++		rt = net->ipv6.ip6_policy_failed_entry;
++		goto discard_pkt;
+ 	}
+ 
+ 	table = fib6_get_table(net, rule->table);
+--- a/net/ipv6/ip6mr.c
++++ b/net/ipv6/ip6mr.c
+@@ -169,6 +169,8 @@ static int ip6mr_rule_action(struct fib_
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
+ 		return -EACCES;
++	case FR_ACT_POLICY_FAILED:
++		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+ 		return -EINVAL;
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -87,6 +87,8 @@ static int		ip6_pkt_discard(struct sk_bu
+ static int		ip6_pkt_discard_out(struct sock *sk, struct sk_buff *skb);
+ static int		ip6_pkt_prohibit(struct sk_buff *skb);
+ static int		ip6_pkt_prohibit_out(struct sock *sk, struct sk_buff *skb);
++static int		ip6_pkt_policy_failed(struct sk_buff *skb);
++static int		ip6_pkt_policy_failed_out(struct sock *sk, struct sk_buff *skb);
+ static void		ip6_link_failure(struct sk_buff *skb);
+ static void		ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
+ 					   struct sk_buff *skb, u32 mtu);
+@@ -283,6 +285,21 @@ static const struct rt6_info ip6_prohibi
+ 	.rt6i_ref	= ATOMIC_INIT(1),
+ };
+ 
++static const struct rt6_info ip6_policy_failed_entry_template = {
++	.dst = {
++		.__refcnt	= ATOMIC_INIT(1),
++		.__use		= 1,
++		.obsolete	= DST_OBSOLETE_FORCE_CHK,
++		.error		= -EACCES,
++		.input		= ip6_pkt_policy_failed,
++		.output		= ip6_pkt_policy_failed_out,
++	},
++	.rt6i_flags	= (RTF_REJECT | RTF_NONEXTHOP),
++	.rt6i_protocol	= RTPROT_KERNEL,
++	.rt6i_metric	= ~(u32) 0,
++	.rt6i_ref	= ATOMIC_INIT(1),
++};
++
+ static const struct rt6_info ip6_blk_hole_entry_template = {
+ 	.dst = {
+ 		.__refcnt	= ATOMIC_INIT(1),
+@@ -1581,6 +1598,11 @@ int ip6_route_add(struct fib6_config *cf
+ 			rt->dst.output = ip6_pkt_prohibit_out;
+ 			rt->dst.input = ip6_pkt_prohibit;
+ 			break;
++		case RTN_POLICY_FAILED:
++			rt->dst.error = -EACCES;
++			rt->dst.output = ip6_pkt_policy_failed_out;
++			rt->dst.input = ip6_pkt_policy_failed;
++			break;
+ 		case RTN_THROW:
+ 		default:
+ 			rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN
+@@ -2142,6 +2164,17 @@ static int ip6_pkt_prohibit_out(struct s
+ 	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
+ }
+ 
++static int ip6_pkt_policy_failed(struct sk_buff *skb)
++{
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_INNOROUTES);
++}
++
++static int ip6_pkt_policy_failed_out(struct sock *sk, struct sk_buff *skb)
++{
++	skb->dev = skb_dst(skb)->dev;
++	return ip6_pkt_drop(skb, ICMPV6_POLICY_FAIL, IPSTATS_MIB_OUTNOROUTES);
++}
++
+ /*
+  *	Allocate a dst for local (unicast / anycast) address.
+  */
+@@ -2365,7 +2398,8 @@ static int rtm_to_fib6_config(struct sk_
+ 	if (rtm->rtm_type == RTN_UNREACHABLE ||
+ 	    rtm->rtm_type == RTN_BLACKHOLE ||
+ 	    rtm->rtm_type == RTN_PROHIBIT ||
+-	    rtm->rtm_type == RTN_THROW)
++	    rtm->rtm_type == RTN_THROW ||
++	    rtm->rtm_type == RTN_POLICY_FAILED)
+ 		cfg->fc_flags |= RTF_REJECT;
+ 
+ 	if (rtm->rtm_type == RTN_LOCAL)
+@@ -2567,6 +2601,9 @@ static int rt6_fill_node(struct net *net
+ 		case -EACCES:
+ 			rtm->rtm_type = RTN_PROHIBIT;
+ 			break;
++		case -EPERM:
++			rtm->rtm_type = RTN_POLICY_FAILED;
++			break;
+ 		case -EAGAIN:
+ 			rtm->rtm_type = RTN_THROW;
+ 			break;
+@@ -2820,6 +2857,8 @@ static int ip6_route_dev_notify(struct n
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
+ 		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
++		net->ipv6.ip6_policy_failed_entry->dst.dev = dev;
++		net->ipv6.ip6_policy_failed_entry->rt6i_idev = in6_dev_get(dev);
+ 		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
+ 		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
+ #endif
+@@ -3036,6 +3075,17 @@ static int __net_init ip6_route_net_init
+ 	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
+ 	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
+ 			 ip6_template_metrics, true);
++
++	net->ipv6.ip6_policy_failed_entry =
++		kmemdup(&ip6_policy_failed_entry_template,
++			sizeof(*net->ipv6.ip6_policy_failed_entry), GFP_KERNEL);
++	if (!net->ipv6.ip6_policy_failed_entry)
++		goto out_ip6_blk_hole_entry;
++	net->ipv6.ip6_policy_failed_entry->dst.path =
++		(struct dst_entry *)net->ipv6.ip6_policy_failed_entry;
++	net->ipv6.ip6_policy_failed_entry->dst.ops = &net->ipv6.ip6_dst_ops;
++	dst_init_metrics(&net->ipv6.ip6_policy_failed_entry->dst,
++			 ip6_template_metrics, true);
+ #endif
+ 
+ 	net->ipv6.sysctl.flush_delay = 0;
+@@ -3054,6 +3104,8 @@ out:
+ 	return ret;
+ 
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
++out_ip6_blk_hole_entry:
++	kfree(net->ipv6.ip6_blk_hole_entry);
+ out_ip6_prohibit_entry:
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ out_ip6_null_entry:
+@@ -3071,6 +3123,7 @@ static void __net_exit ip6_route_net_exi
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ 	kfree(net->ipv6.ip6_blk_hole_entry);
++	kfree(net->ipv6.ip6_policy_failed_entry);
+ #endif
+ 	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
+ }
+@@ -3167,6 +3220,9 @@ int __init ip6_route_init(void)
+ 	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
+ 	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
+ 	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
++	init_net.ipv6.ip6_policy_failed_entry->dst.dev = init_net.loopback_dev;
++	init_net.ipv6.ip6_policy_failed_entry->rt6i_idev =
++		in6_dev_get(init_net.loopback_dev);
+   #endif
+ 	ret = fib6_init();
+ 	if (ret)
diff --git a/trunk/target/linux/generic/patches-3.18/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch b/trunk/target/linux/generic/patches-3.18/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
new file mode 100644
index 00000000..25a86393
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch
@@ -0,0 +1,53 @@
+From 7749b481ce5d7e232b1f7da5e6b2c44816f51681 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sun, 19 Jan 2014 20:45:51 +0100
+Subject: [PATCH 2/2] net: provide defines for _POLICY_FAILED until all code is
+ updated
+
+Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
+unreachable, conflicting with our name.
+
+Add appropriate defines to allow our code to build with the new
+name until we have updated our local patches for older kernels
+and userspace packages.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ include/uapi/linux/fib_rules.h | 2 ++
+ include/uapi/linux/icmpv6.h    | 2 ++
+ include/uapi/linux/rtnetlink.h | 2 ++
+ 3 files changed, 6 insertions(+)
+
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -71,6 +71,8 @@ enum {
+ 	__FR_ACT_MAX,
+ };
+ 
++#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
++
+ #define FR_ACT_MAX (__FR_ACT_MAX - 1)
+ 
+ #endif
+--- a/include/uapi/linux/icmpv6.h
++++ b/include/uapi/linux/icmpv6.h
+@@ -118,6 +118,8 @@ struct icmp6hdr {
+ #define ICMPV6_POLICY_FAIL		5
+ #define ICMPV6_REJECT_ROUTE		6
+ 
++#define ICMPV6_FAILED_POLICY		ICMPV6_POLICY_FAIL
++
+ /*
+  *	Codes for Time Exceeded
+  */
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -207,6 +207,8 @@ enum {
+ 	__RTN_MAX
+ };
+ 
++#define RTN_FAILED_POLICY RTN_POLICY_FAILED
++
+ #define RTN_MAX (__RTN_MAX - 1)
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/700-swconfig.patch b/trunk/target/linux/generic/patches-3.18/700-swconfig.patch
new file mode 100644
index 00000000..6d241493
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/700-swconfig.patch
@@ -0,0 +1,39 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,16 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config SWCONFIG
++	tristate "Switch configuration API"
++	---help---
++	  Switch configuration API using netlink. This allows
++	  you to configure the VLAN features of certain switches.
++
++config SWCONFIG_LEDS
++	bool "Switch LED trigger support"
++	depends on (SWCONFIG && LEDS_TRIGGERS)
++
+ comment "MII PHY device drivers"
+ 
+ config AT803X_PHY
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -3,6 +3,7 @@
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
++obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
+ obj-$(CONFIG_CICADA_PHY)	+= cicada.o
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -375,6 +375,7 @@ header-y += stddef.h
+ header-y += string.h
+ header-y += suspend_ioctls.h
+ header-y += swab.h
++header-y += switch.h
+ header-y += synclink.h
+ header-y += sysctl.h
+ header-y += sysinfo.h
diff --git a/trunk/target/linux/generic/patches-3.18/701-phy_extension.patch b/trunk/target/linux/generic/patches-3.18/701-phy_extension.patch
new file mode 100644
index 00000000..6da486bb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/701-phy_extension.patch
@@ -0,0 +1,63 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -338,6 +338,50 @@ int phy_ethtool_gset(struct phy_device *
+ }
+ EXPORT_SYMBOL(phy_ethtool_gset);
+ 
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
++{
++	u32 cmd;
++	int tmp;
++	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
++	struct ethtool_value edata = { ETHTOOL_GLINK };
++
++	if (get_user(cmd, (u32 *) useraddr))
++		return -EFAULT;
++
++	switch (cmd) {
++	case ETHTOOL_GSET:
++		phy_ethtool_gset(phydev, &ecmd);
++		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
++			return -EFAULT;
++		return 0;
++
++	case ETHTOOL_SSET:
++		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
++			return -EFAULT;
++		return phy_ethtool_sset(phydev, &ecmd);
++
++	case ETHTOOL_NWAY_RST:
++		/* if autoneg is off, it's an error */
++		tmp = phy_read(phydev, MII_BMCR);
++		if (tmp & BMCR_ANENABLE) {
++			tmp |= (BMCR_ANRESTART);
++			phy_write(phydev, MII_BMCR, tmp);
++			return 0;
++		}
++		return -EINVAL;
++
++	case ETHTOOL_GLINK:
++		edata.data = (phy_read(phydev,
++				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
++		if (copy_to_user(useraddr, &edata, sizeof(edata)))
++			return -EFAULT;
++		return 0;
++	}
++
++	return -EOPNOTSUPP;
++}
++EXPORT_SYMBOL(phy_ethtool_ioctl);
++
+ /**
+  * phy_mii_ioctl - generic PHY MII ioctl interface
+  * @phydev: the phy_device struct
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -748,6 +748,7 @@ void phy_start_machine(struct phy_device
+ void phy_stop_machine(struct phy_device *phydev);
+ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
+ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
+ int phy_start_interrupts(struct phy_device *phydev);
+ void phy_print_status(struct phy_device *phydev);
diff --git a/trunk/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch b/trunk/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
new file mode 100644
index 00000000..42bddfee
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,27 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -484,6 +484,12 @@ struct phy_driver {
+ 	/* Determines the negotiated speed and duplex */
+ 	int (*read_status)(struct phy_device *phydev);
+ 
++	/* 
++	 * Update the value in phydev->link to reflect the 
++	 * current link value
++	 */
++	int (*update_link)(struct phy_device *phydev);
++
+ 	/* Clears any pending interrupts */
+ 	int (*ack_interrupt)(struct phy_device *phydev);
+ 
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -914,6 +914,9 @@ int genphy_update_link(struct phy_device
+ {
+ 	int status;
+ 
++	if (phydev->drv->update_link)
++		return phydev->drv->update_link(phydev);
++
+ 	/* Do a fake read */
+ 	status = phy_read(phydev, MII_BMSR);
+ 	if (status < 0)
diff --git a/trunk/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch b/trunk/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 00000000..061e40fb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -674,6 +674,9 @@ void phy_detach(struct phy_device *phyde
+ {
+ 	int i;
+ 
++	if (phydev->drv && phydev->drv->detach)
++		phydev->drv->detach(phydev);
++
+ 	if (phydev->bus->dev.driver)
+ 		module_put(phydev->bus->dev.driver->owner);
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -502,6 +502,12 @@ struct phy_driver {
+ 	 */
+ 	int (*did_interrupt)(struct phy_device *phydev);
+ 
++	/*
++	 * Called before an ethernet device is detached
++	 * from the PHY.
++	 */
++	void (*detach)(struct phy_device *phydev);
++
+ 	/* Clears up any memory if needed */
+ 	void (*remove)(struct phy_device *phydev);
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch b/trunk/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
new file mode 100644
index 00000000..cc3cb244
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
@@ -0,0 +1,192 @@
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -38,6 +38,8 @@
+ 
+ #include <asm/irq.h>
+ 
++#include "mdio-boardinfo.h"
++
+ /**
+  * mdiobus_alloc_size - allocate a mii_bus structure
+  * @size: extra amount of memory to allocate for private storage.
+@@ -335,9 +337,21 @@ void mdiobus_free(struct mii_bus *bus)
+ }
+ EXPORT_SYMBOL(mdiobus_free);
+ 
++static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus,
++						struct phy_device *phydev,
++						struct mdio_board_info *bi)
++{
++	if (strcmp(bus->id, bi->bus_id) ||
++	    bi->phy_addr != phydev->addr)
++	    return;
++
++	phydev->dev.platform_data = (void *) bi->platform_data;
++}
++
+ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
+ {
+ 	struct phy_device *phydev;
++	struct mdio_board_entry *be;
+ 	int err;
+ 
+ 	phydev = get_phy_device(bus, addr, false);
+@@ -350,6 +364,12 @@ struct phy_device *mdiobus_scan(struct m
+ 	 */
+ 	of_mdiobus_link_phydev(bus, phydev);
+ 
++	mutex_lock(&__mdio_board_lock);
++	list_for_each_entry(be, &__mdio_board_list, list)
++		mdiobus_setup_phydev_from_boardinfo(bus, phydev,
++						    &be->board_info);
++	mutex_unlock(&__mdio_board_lock);
++
+ 	err = phy_device_register(phydev);
+ 	if (err) {
+ 		phy_device_free(phydev);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -785,4 +785,22 @@ int __init mdio_bus_init(void);
+ void mdio_bus_exit(void);
+ 
+ extern struct bus_type mdio_bus_type;
++
++struct mdio_board_info {
++	const char	*bus_id;
++	int		phy_addr;
++
++	const void	*platform_data;
++};
++
++#ifdef CONFIG_MDIO_BOARDINFO
++int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n);
++#else
++static inline int
++mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n)
++{
++	return 0;
++}
++#endif
++
+ #endif /* __PHY_H */
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -12,6 +12,10 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config MDIO_BOARDINFO
++	bool
++	default y
++
+ config SWCONFIG
+ 	tristate "Switch configuration API"
+ 	---help---
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -2,6 +2,8 @@
+ 
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
++obj-$(CONFIG_MDIO_BOARDINFO)	+= mdio-boardinfo.o
++
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
+ obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.c
+@@ -0,0 +1,58 @@
++/*
++ * mdio-boardinfo.c - collect pre-declarations of PHY devices
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/phy.h>
++#include <linux/slab.h>
++#include <linux/export.h>
++#include <linux/mutex.h>
++#include <linux/phy.h>
++
++#include "mdio-boardinfo.h"
++
++/*
++ * These symbols are exported ONLY FOR the mdio_bus component.
++ * No other users will be supported.
++ */
++
++LIST_HEAD(__mdio_board_list);
++EXPORT_SYMBOL_GPL(__mdio_board_list);
++
++DEFINE_MUTEX(__mdio_board_lock);
++EXPORT_SYMBOL_GPL(__mdio_board_lock);
++
++/**
++ * mdio_register_board_info - register PHY devices for a given board
++ * @info: array of chip descriptors
++ * @n: how many descriptors are provided
++ * Context: can sleep
++ *
++ * The board info passed can safely be __initdata ... but be careful of
++ * any embedded pointers (platform_data, etc), they're copied as-is.
++ */
++int __init
++mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n)
++{
++	struct mdio_board_entry *be;
++	int i;
++
++	be = kzalloc(n * sizeof(*be), GFP_KERNEL);
++	if (!be)
++		return -ENOMEM;
++
++	for (i = 0; i < n; i++, be++, info++) {
++		memcpy(&be->board_info, info, sizeof(*info));
++		mutex_lock(&__mdio_board_lock);
++		list_add_tail(&be->list, &__mdio_board_list);
++		mutex_unlock(&__mdio_board_lock);
++	}
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.h
+@@ -0,0 +1,22 @@
++/*
++ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/mutex.h>
++
++struct mdio_board_entry {
++	struct list_head	list;
++	struct mdio_board_info	board_info;
++};
++
++/* __mdio_board_lock protects __mdio_board_list
++ * only mdio_bus components are allowed to use these symbols.
++ */
++extern struct mutex __mdio_board_lock;
++extern struct list_head __mdio_board_list;
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -15,7 +15,7 @@ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_NET) += Space.o loopback.o
+ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+-obj-$(CONFIG_PHYLIB) += phy/
++obj-y += phy/
+ obj-$(CONFIG_RIONET) += rionet.o
+ obj-$(CONFIG_NET_TEAM) += team/
+ obj-$(CONFIG_TUN) += tun.o
diff --git a/trunk/target/linux/generic/patches-3.18/720-phy_adm6996.patch b/trunk/target/linux/generic/patches-3.18/720-phy_adm6996.patch
new file mode 100644
index 00000000..b0b8db4e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/720-phy_adm6996.patch
@@ -0,0 +1,26 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -132,6 +132,13 @@ config MICREL_PHY
+ 	---help---
+ 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
+ 
++config ADM6996_PHY
++	tristate "Driver for ADM6996 switches"
++	select SWCONFIG
++	---help---
++	  Currently supports the ADM6996FC and ADM6996M switches.
++	  Support for FC is very limited.
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM7XXX_PHY)	+= bcm7xxx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
++obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.18/721-phy_packets.patch b/trunk/target/linux/generic/patches-3.18/721-phy_packets.patch
new file mode 100644
index 00000000..0e21ff30
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/721-phy_packets.patch
@@ -0,0 +1,161 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -1216,6 +1216,7 @@ enum netdev_priv_flags {
+ 	IFF_LIVE_ADDR_CHANGE		= 1<<20,
+ 	IFF_MACVLAN			= 1<<21,
+ 	IFF_XMIT_DST_RELEASE_PERM	= 1<<22,
++	IFF_NO_IP_ALIGN			= 1<<23,
+ };
+ 
+ #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN
+@@ -1241,6 +1242,7 @@ enum netdev_priv_flags {
+ #define IFF_LIVE_ADDR_CHANGE		IFF_LIVE_ADDR_CHANGE
+ #define IFF_MACVLAN			IFF_MACVLAN
+ #define IFF_XMIT_DST_RELEASE_PERM	IFF_XMIT_DST_RELEASE_PERM
++#define IFF_NO_IP_ALIGN		IFF_NO_IP_ALIGN
+ 
+ /**
+  *	struct net_device - The DEVICE structure.
+@@ -1511,6 +1513,11 @@ struct net_device {
+ 	const struct ethtool_ops *ethtool_ops;
+ 	const struct forwarding_accel_ops *fwd_ops;
+ 
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
++	struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
++#endif
++
+ 	const struct header_ops *header_ops;
+ 
+ 	unsigned int		flags;
+@@ -1573,6 +1580,10 @@ struct net_device {
+ 	void			*ax25_ptr;
+ 	struct wireless_dev	*ieee80211_ptr;
+ 
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void			*phy_ptr; /* PHY device specific data */
++#endif
++
+ /*
+  * Cache lines mostly used on receive path (including eth_type_trans())
+  */
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -2052,6 +2052,10 @@ static inline int pskb_trim(struct sk_bu
+ 	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
+ }
+ 
++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp);
++
++
+ /**
+  *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
+  *	@skb: buffer to alter
+@@ -2178,16 +2182,6 @@ static inline struct sk_buff *dev_alloc_
+ }
+ 
+ 
+-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
+-		unsigned int length, gfp_t gfp)
+-{
+-	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
+-
+-	if (NET_IP_ALIGN && skb)
+-		skb_reserve(skb, NET_IP_ALIGN);
+-	return skb;
+-}
+-
+ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+ 		unsigned int length)
+ {
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -25,6 +25,12 @@ menuconfig NET
+ 
+ if NET
+ 
++config ETHERNET_PACKET_MANGLE
++	bool
++	help
++	  This option can be selected by phy drivers that need to mangle
++	  packets going in or out of an ethernet device.
++
+ config WANT_COMPAT_NETLINK_MESSAGES
+ 	bool
+ 	help
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2607,10 +2607,20 @@ static int xmit_one(struct sk_buff *skb,
+ 	if (!list_empty(&ptype_all))
+ 		dev_queue_xmit_nit(skb, dev);
+ 
+-	len = skb->len;
+-	trace_net_dev_start_xmit(skb, dev);
+-	rc = netdev_start_xmit(skb, dev, txq, more);
+-	trace_net_dev_xmit(skb, rc, dev, len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (!dev->eth_mangle_tx ||
++	    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
++#else
++	if (1)
++#endif
++	{
++		len = skb->len;
++		trace_net_dev_start_xmit(skb, dev);
++		rc = netdev_start_xmit(skb, dev, txq, more);
++		trace_net_dev_xmit(skb, rc, dev, len);
++	} else {
++		rc = NETDEV_TX_OK;
++	}
+ 
+ 	return rc;
+ }
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -63,6 +63,7 @@
+ #include <linux/errqueue.h>
+ #include <linux/prefetch.h>
+ #include <linux/if_vlan.h>
++#include <linux/if.h>
+ 
+ #include <net/protocol.h>
+ #include <net/dst.h>
+@@ -451,6 +452,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+ }
+ EXPORT_SYMBOL(__netdev_alloc_skb);
+ 
++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp)
++{
++	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
++		return skb;
++#endif
++
++	if (NET_IP_ALIGN && skb)
++		skb_reserve(skb, NET_IP_ALIGN);
++	return skb;
++}
++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
++
+ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 		     int size, unsigned int truesize)
+ {
+--- a/net/ethernet/eth.c
++++ b/net/ethernet/eth.c
+@@ -188,6 +188,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+ 	const struct ethhdr *eth;
+ 
+ 	skb->dev = dev;
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev->eth_mangle_rx)
++		dev->eth_mangle_rx(dev, skb);
++#endif
++
+ 	skb_reset_mac_header(skb);
+ 	skb_pull_inline(skb, ETH_HLEN);
+ 	eth = eth_hdr(skb);
diff --git a/trunk/target/linux/generic/patches-3.18/722-phy_mvswitch.patch b/trunk/target/linux/generic/patches-3.18/722-phy_mvswitch.patch
new file mode 100644
index 00000000..f577a9f6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/722-phy_mvswitch.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -139,6 +139,10 @@ config ADM6996_PHY
+ 	  Currently supports the ADM6996FC and ADM6996M switches.
+ 	  Support for FC is very limited.
+ 
++config MVSWITCH_PHY
++	tristate "Driver for Marvell 88E6060 switches"
++	select ETHERNET_PACKET_MANGLE
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM7XXX_PHY)	+= bcm7xxx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
++obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.18/723-phy_ip175c.patch b/trunk/target/linux/generic/patches-3.18/723-phy_ip175c.patch
new file mode 100644
index 00000000..c7c4f99e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/723-phy_ip175c.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -143,6 +143,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config IP17XX_PHY
++	tristate "Driver for IC+ IP17xx switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.18/724-phy_ar8216.patch b/trunk/target/linux/generic/patches-3.18/724-phy_ar8216.patch
new file mode 100644
index 00000000..869081e8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/724-phy_ar8216.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -147,6 +147,11 @@ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+ 
++config AR8216_PHY
++	tristate "Driver for Atheros AR8216 switches"
++	select ETHERNET_PACKET_MANGLE
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.18/725-phy_rtl8306.patch b/trunk/target/linux/generic/patches-3.18/725-phy_rtl8306.patch
new file mode 100644
index 00000000..6629700d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/725-phy_rtl8306.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -152,6 +152,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config RTL8306_PHY
++	tristate "Driver for Realtek RTL8306S switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -23,6 +23,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.18/726-phy_rtl8366.patch b/trunk/target/linux/generic/patches-3.18/726-phy_rtl8366.patch
new file mode 100644
index 00000000..833bb22a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/726-phy_rtl8366.patch
@@ -0,0 +1,45 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -250,6 +250,30 @@ config MDIO_BCM_UNIMAC
+ 	  controllers as well as some Broadcom Ethernet switches such as the
+ 	  Starfighter 2 switches.
+ 
++config RTL8366_SMI
++	tristate "Driver for the RTL8366 SMI interface"
++	depends on GPIOLIB
++	---help---
++	  This module implements the SMI interface protocol which is used
++	  by some RTL8366 ethernet switch devices via the generic GPIO API.
++
++if RTL8366_SMI
++
++config RTL8366_SMI_DEBUG_FS
++	bool "RTL8366 SMI interface debugfs support"
++        depends on DEBUG_FS
++        default n
++
++config RTL8366S_PHY
++	tristate "Driver for the Realtek RTL8366S switch"
++	select SWCONFIG
++
++config RTL8366RB_PHY
++	tristate "Driver for the Realtek RTL8366RB switch"
++	select SWCONFIG
++
++endif # RTL8366_SMI
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -24,6 +24,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
++obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
++obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.18/727-phy-rtl8367.patch b/trunk/target/linux/generic/patches-3.18/727-phy-rtl8367.patch
new file mode 100644
index 00000000..8481b589
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/727-phy-rtl8367.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -272,6 +272,10 @@ config RTL8366RB_PHY
+ 	tristate "Driver for the Realtek RTL8366RB switch"
+ 	select SWCONFIG
+ 
++config RTL8367_PHY
++	tristate "Driver for the Realtek RTL8367R/M switches"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
++obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.18/728-phy-micrel.patch b/trunk/target/linux/generic/patches-3.18/728-phy-micrel.patch
new file mode 100644
index 00000000..95199a43
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/728-phy-micrel.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -156,6 +156,11 @@ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
+ 
++config MICREL_PHY
++	tristate "Drivers for Micrel/Kendin PHYs"
++	---help---
++	  Currently has a driver for the KSZ8041
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -29,6 +29,7 @@ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
++obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.18/729-phy-rtl8367b.patch b/trunk/target/linux/generic/patches-3.18/729-phy-rtl8367b.patch
new file mode 100644
index 00000000..cc4f7940
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/729-phy-rtl8367b.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -281,6 +281,10 @@ config RTL8367_PHY
+ 	tristate "Driver for the Realtek RTL8367R/M switches"
+ 	select SWCONFIG
+ 
++config RTL8367B_PHY
++	tristate "Driver fot the Realtek RTL8367R-VB switch"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
++obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.18/729-phy-tantos.patch b/trunk/target/linux/generic/patches-3.18/729-phy-tantos.patch
new file mode 100644
index 00000000..6262ef98
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/729-phy-tantos.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -292,3 +292,8 @@ endif # PHYLIB
+ config MICREL_KS8995MA
+ 	tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
+ 	depends on SPI
++
++config PSB6970_PHY
++	tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
++	select SWCONFIG
++	select ETHERNET_PACKET_MANGLE
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -31,6 +31,7 @@ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
++obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.18/730-phy_b53.patch b/trunk/target/linux/generic/patches-3.18/730-phy_b53.patch
new file mode 100644
index 00000000..5e137976
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/730-phy_b53.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -287,6 +287,8 @@ config RTL8367B_PHY
+ 
+ endif # RTL8366_SMI
+ 
++source "drivers/net/phy/b53/Kconfig"
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -32,6 +32,7 @@ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
++obj-$(CONFIG_B53)		+= b53/
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch b/trunk/target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch
new file mode 100644
index 00000000..2053bd2f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/731-phy_mvswitch_3.10_compilation.patch
@@ -0,0 +1,35 @@
+From e6a5abb9a02be0bceb4782d9f736bfb4ae217505 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sat, 21 Sep 2013 13:56:51 +0200
+Subject: [PATCH] phy: mvswitch: fix 3.10 compilation
+
+Update to API changes in 3.10.
+
+Signed-off-by: Jonas Gorsi <jogo@openwrt.org>
+---
+ target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/phy/mvswitch.c
++++ b/drivers/net/phy/mvswitch.c
+@@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de
+ 	if (vlan == -1)
+ 		return;
+ 
+-	__vlan_hwaccel_put_tag(skb, vlan);
++	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
+ }
+ 
+ 
+@@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
+ 
+ #ifdef HEADER_MODE
+ 	dev->priv_flags |= IFF_NO_IP_ALIGN;
+-	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
+ #else
+-	dev->features |= NETIF_F_HW_VLAN_RX;
++	dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
+ #endif
+ 
+ 	return 0;
diff --git a/trunk/target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch b/trunk/target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch
new file mode 100644
index 00000000..c7539675
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -152,6 +152,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config AR8216_PHY_LEDS
++	bool "Atheros AR8216 switch LED support"
++	depends on (AR8216_PHY && LEDS_CLASS)
++
+ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
diff --git a/trunk/target/linux/generic/patches-3.18/733-phy_mvsw6171.patch b/trunk/target/linux/generic/patches-3.18/733-phy_mvsw6171.patch
new file mode 100644
index 00000000..29116479
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/733-phy_mvsw6171.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -143,6 +143,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config MVSW6171_PHY
++	tristate "Driver for Marvell 88E6171 switches"
++	select SWCONFIG
++
+ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_MVSW6171_PHY)	+= mvsw6171.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
diff --git a/trunk/target/linux/generic/patches-3.18/750-hostap_txpower.patch b/trunk/target/linux/generic/patches-3.18/750-hostap_txpower.patch
new file mode 100644
index 00000000..768c80f7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/750-hostap_txpower.patch
@@ -0,0 +1,154 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t
+ 		addr[count].sa_family = ARPHRD_ETHER;
+ 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+ 		if (sta->last_rx_silence == 0)
+-			qual[count].qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			qual[count].qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+ 		qual[count].updated = sta->last_rx_updated;
+ 
+ 		sta->last_rx_updated = IW_QUAL_DBM;
+@@ -2475,13 +2475,13 @@ int prism2_ap_translate_scan(struct net_
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = IWEVQUAL;
+ 		if (sta->last_rx_silence == 0)
+-			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			iwe.u.qual.qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+ 		iwe.u.qual.updated = sta->last_rx_updated;
+ 		iwe.len = IW_EV_QUAL_LEN;
+ 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++#define RAW_TXPOWER_SETTING
++
+ #endif /* HOSTAP_CONFIG_H */
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;
+ 
+ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++int hostap_restore_power(struct net_device *dev);
+ 
+ 
+ #endif /* HOSTAP_H */
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -928,6 +928,7 @@ static int hfa384x_set_rid(struct net_de
+ 			prism2_hw_reset(dev);
+ 	}
+ 
++	hostap_restore_power(dev);
+ 	return res;
+ }
+ 
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -435,6 +435,11 @@ static void handle_info_queue_linkstatus
+ 	}
+ 
+ 	/* Get BSSID if we have a valid AP address */
++
++	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++	     val == HFA384X_LINKSTATUS_DISCONNECTED )
++			hostap_restore_power(local->dev);
++
+ 	if (connected) {
+ 		netif_carrier_on(local->dev);
+ 		netif_carrier_on(local->ddev);
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1479,23 +1479,20 @@ static int prism2_txpower_hfa386x_to_dBm
+ 		val = 255;
+ 
+ 	tmp = val;
+-	tmp >>= 2;
+ 
+-	return -12 - tmp;
++	return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+ 	signed char tmp;
+ 
+-	if (val > 20)
+-		return 128;
+-	else if (val < -43)
++	if (val > 127)
+ 		return 127;
++	else if (val < -128)
++		return 128;
+ 
+ 	tmp = val;
+-	tmp = -12 - tmp;
+-	tmp <<= 2;
+ 
+ 	return (unsigned char) tmp;
+ }
+@@ -4052,3 +4049,35 @@ int hostap_ioctl(struct net_device *dev,
+ 
+ 	return ret;
+ }
++
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = netdev_priv(dev);
++       local_info_t *local = iface->local;
++
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
++EXPORT_SYMBOL(hostap_restore_power);
diff --git a/trunk/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch b/trunk/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
new file mode 100644
index 00000000..fe52ccc3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
@@ -0,0 +1,72 @@
+Register switch connected to srab
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -16,6 +16,7 @@
+ #include <linux/phy.h>
+ #include <linux/interrupt.h>
+ #include <linux/dma-mapping.h>
++#include <linux/platform_data/b53.h>
+ #include <bcm47xx_nvram.h>
+ 
+ static const struct bcma_device_id bgmac_bcma_tbl[] = {
+@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct
+ 	mdiobus_free(mii_bus);
+ }
+ 
++static struct b53_platform_data bgmac_b53_pdata = {
++};
++
++static struct platform_device bgmac_b53_dev = {
++	.name		= "b53-srab-switch",
++	.id		= -1,
++	.dev		= {
++		.platform_data = &bgmac_b53_pdata,
++	},
++};
++
+ /**************************************************
+  * BCMA bus ops
+  **************************************************/
+@@ -1521,6 +1533,16 @@ static int bgmac_probe(struct bcma_devic
+ 		goto err_dma_free;
+ 	}
+ 
++	if (core->id.id != BCMA_CHIP_ID_BCM4707 &&
++	    core->id.id != BCMA_CHIP_ID_BCM53018 &&
++	    !bgmac_b53_pdata.regs) {
++		bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
++
++		err = platform_device_register(&bgmac_b53_dev);
++		if (!err)
++			bgmac->b53_device = &bgmac_b53_dev;
++	}
++
+ 	err = register_netdev(bgmac->net_dev);
+ 	if (err) {
+ 		bgmac_err(bgmac, "Cannot register net device\n");
+@@ -1549,6 +1571,10 @@ static void bgmac_remove(struct bcma_dev
+ {
+ 	struct bgmac *bgmac = bcma_get_drvdata(core);
+ 
++	if (bgmac->b53_device)
++		platform_device_unregister(&bgmac_b53_dev);
++	bgmac->b53_device = NULL;
++
+ 	netif_napi_del(&bgmac->napi);
+ 	unregister_netdev(bgmac->net_dev);
+ 	bgmac_mii_unregister(bgmac);
+--- a/drivers/net/ethernet/broadcom/bgmac.h
++++ b/drivers/net/ethernet/broadcom/bgmac.h
+@@ -457,6 +457,9 @@ struct bgmac {
+ 	bool has_robosw;
+ 
+ 	bool loopback;
++
++	/* platform device for associated switch */
++	struct platform_device *b53_device;
+ };
+ 
+ static inline u32 bgmac_read(struct bgmac *bgmac, u16 offset)
diff --git a/trunk/target/linux/generic/patches-3.18/775-bgmac-check-length-of-received-frame.patch b/trunk/target/linux/generic/patches-3.18/775-bgmac-check-length-of-received-frame.patch
new file mode 100644
index 00000000..c3d63b65
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/775-bgmac-check-length-of-received-frame.patch
@@ -0,0 +1,39 @@
+From 2d12a9abf3f81de5b51852e3cfcba8cedac82642 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Fri, 6 Dec 2013 01:14:52 +0100
+Subject: [PATCH] bgmac: check length of received frame
+
+---
+ drivers/net/ethernet/broadcom/bgmac.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma
+ 			dma_addr_t old_dma_addr = slot->dma_addr;
+ 			int err;
+ 
++			if (len > BGMAC_RX_MAX_FRAME_SIZE) {
++				struct bgmac_dma_desc *dma_desc = ring->cpu_base + ring->start;
++
++				bgmac_err(bgmac, "Hardware reported invalid packet length %d for slot %d!\n", len, ring->start);
++				bgmac_err(bgmac, "flags: 0x%04X\n", flags);
++				bgmac_err(bgmac, "ctl0: 0x%08X\tctl1: 0x%08X\n", le32_to_cpu(dma_desc->ctl0), le32_to_cpu(dma_desc->ctl1));
++
++				bgmac_err(bgmac, "   BGMAC_DMA_RX_CTL: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_INDEX: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGLO: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGLO));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGHI: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGHI));
++				bgmac_err(bgmac, "BGMAC_DMA_RX_STATUS: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_STATUS));
++				bgmac_err(bgmac, " BGMAC_DMA_RX_ERROR: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_ERROR));
++
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
++			}
++
+ 			/* Check for poison and drop or pass the packet */
+ 			if (len == 0xdead && flags == 0xbeef) {
+ 				bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
diff --git a/trunk/target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch b/trunk/target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch
new file mode 100644
index 00000000..e541b2c2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch
@@ -0,0 +1,40 @@
+From cb06d102327eadcd1bdc480bfd9f8876251d1007 Mon Sep 17 00:00:00 2001
+From: Christoph Paasch <christoph.paasch@uclouvain.be>
+Date: Fri, 21 Mar 2014 03:48:19 -0700
+Subject: [PATCH] igb: Fix Null-pointer dereference in igb_reset_q_vector
+
+When igb_set_interrupt_capability() calls
+igb_reset_interrupt_capability() (e.g., because CONFIG_PCI_MSI is unset),
+num_q_vectors has been set but no vector has yet been allocated.
+
+igb_reset_interrupt_capability() will then call igb_reset_q_vector,
+which assumes that the vector is allocated. As this is not the case, we
+are accessing a NULL-pointer.
+
+This patch fixes it by checking that q_vector is indeed different from
+NULL.
+
+Fixes: 02ef6e1d0b0023 (igb: Fix queue allocation method to accommodate changing during runtime)
+Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
+Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
+Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+---
+ drivers/net/ethernet/intel/igb/igb_main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -1034,6 +1034,12 @@ static void igb_reset_q_vector(struct ig
+ 	if (!q_vector)
+ 		return;
+ 
++	/* Coming from igb_set_interrupt_capability, the vectors are not yet
++	 * allocated. So, q_vector is NULL so we should stop here.
++	 */
++	if (!q_vector)
++		return;
++
+ 	if (q_vector->tx.ring)
+ 		adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/785-hso-support-0af0-9300.patch b/trunk/target/linux/generic/patches-3.18/785-hso-support-0af0-9300.patch
new file mode 100644
index 00000000..7938135c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/785-hso-support-0af0-9300.patch
@@ -0,0 +1,25 @@
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -468,6 +468,7 @@ static const struct usb_device_id hso_id
+ 	{USB_DEVICE(0x0af0, 0x8900)},
+ 	{USB_DEVICE(0x0af0, 0x9000)},
+ 	{USB_DEVICE(0x0af0, 0x9200)},		/* Option GTM671WFS */
++	{USB_DEVICE(0x0af0, 0x9300)},		/* GTM 66xxWFS */
+ 	{USB_DEVICE(0x0af0, 0xd035)},
+ 	{USB_DEVICE(0x0af0, 0xd055)},
+ 	{USB_DEVICE(0x0af0, 0xd155)},
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1323,6 +1323,12 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		0 ),
+ 
++UNUSUAL_DEV( 0x0af0, 0x9300, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 66xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
+ UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000,
+ 		"Option",
+ 		"GI 070x SD-Card",
diff --git a/trunk/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch b/trunk/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
new file mode 100644
index 00000000..ef811c6f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
@@ -0,0 +1,51 @@
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -58,6 +58,12 @@ config XEN_PCIDEV_FRONTEND
+           The PCI device frontend driver allows the kernel to import arbitrary
+           PCI devices from a PCI backend to support PCI driver domains.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++	bool "PCI disable common quirks"
++	depends on PCI
++	help
++	  If you don't know what to do here, say N.
++
+ config HT_IRQ
+ 	bool "Interrupts on hypertransport devices"
+ 	default y
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -41,6 +41,7 @@ static void quirk_mmio_always_on(struct
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
+ 				PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -2871,6 +2872,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ /*
+  * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.  To
+@@ -2927,6 +2929,8 @@ static void fixup_debug_report(struct pc
+ 	}
+ }
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ /*
+  * Some BIOS implementations leave the Intel GPU interrupts enabled,
+  * even though no one is handling them (f.e. i915 driver is never loaded).
+@@ -2961,6 +2965,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
+ /*
+  * PCI devices which are on Intel chips can skip the 10ms delay
+  * before entering D3 mode.
diff --git a/trunk/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch b/trunk/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 00000000..9cc6df0f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,101 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -97,6 +97,8 @@ struct amd_chipset_type {
+ 	u8 rev;
+ };
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static struct amd_chipset_info {
+ 	struct pci_dev	*nb_dev;
+ 	struct pci_dev	*smbus_dev;
+@@ -454,6 +456,10 @@ void usb_amd_dev_put(void)
+ }
+ EXPORT_SYMBOL_GPL(usb_amd_dev_put);
+ 
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
++#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
++
+ /*
+  * Make sure the controller is completely inactive, unable to
+  * generate interrupts or do DMA.
+@@ -533,8 +539,17 @@ reset_needed:
+ 	uhci_reset_hc(pdev, base);
+ 	return 1;
+ }
++#else
++int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
++{
++	return 0;
++}
++
++#endif
+ EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ {
+ 	u16 cmd;
+@@ -1083,3 +1098,4 @@ static void quirk_usb_early_handoff(stru
+ }
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+ 			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
++#endif
+--- a/drivers/usb/host/pci-quirks.h
++++ b/drivers/usb/host/pci-quirks.h
+@@ -4,6 +4,9 @@
+ #ifdef CONFIG_PCI
+ void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
+ int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
++#endif  /* CONFIG_PCI */
++
++#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ int usb_amd_find_chipset_info(void);
+ int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev);
+ bool usb_amd_hang_symptom_quirk(void);
+@@ -16,11 +19,24 @@ void usb_disable_xhci_ports(struct pci_d
+ void sb800_prefetch(struct device *dev, int on);
+ #else
+ struct pci_dev;
++static inline int usb_amd_find_chipset_info(void)
++{
++	return 0;
++}
++static inline bool usb_amd_hang_symptom_quirk(void)
++{
++	return false;
++}
++static inline bool usb_amd_prefetch_quirk(void)
++{
++	return false;
++}
+ static inline void usb_amd_quirk_pll_disable(void) {}
+ static inline void usb_amd_quirk_pll_enable(void) {}
+ static inline void usb_amd_dev_put(void) {}
+ static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
+ static inline void sb800_prefetch(struct device *dev, int on) {}
+-#endif  /* CONFIG_PCI */
++static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
++#endif
+ 
+ #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -442,7 +442,14 @@ extern int usb_hcd_pci_probe(struct pci_
+ extern void usb_hcd_pci_remove(struct pci_dev *dev);
+ extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
++#else
++static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
++{
++	return 0;
++}
++#endif
+ 
+ #ifdef CONFIG_PM
+ extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
diff --git a/trunk/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch b/trunk/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch
new file mode 100644
index 00000000..ad0ec06a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch
@@ -0,0 +1,84 @@
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -690,6 +690,71 @@ int __usb_get_extra_descriptor(char *buf
+ }
+ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
+ 
++static struct usb_device *match_device_name(struct usb_device *dev,
++					    const char *name)
++{
++	struct usb_device *ret_dev = NULL;
++	struct usb_device *childdev = NULL;
++	int child;
++
++	dev_dbg(&dev->dev, "check for name %s ...\n", name);
++
++	/* see if this device matches */
++	if (strcmp(dev_name(&dev->dev), name) == 0 ) {
++		dev_dbg(&dev->dev, "matched this device!\n");
++		ret_dev = usb_get_dev(dev);
++		goto exit;
++	}
++	/* look through all of the children of this device */
++	usb_hub_for_each_child(dev, child, childdev) {
++		if (childdev) {
++			usb_lock_device(childdev);
++			ret_dev = match_device_name(childdev, name);
++			usb_unlock_device(childdev);
++			if (ret_dev)
++				goto exit;
++		}
++	}
++exit:
++	return ret_dev;
++}
++
++/**
++ * usb_find_device_by_name - find a specific usb device in the system
++ * @name: the name of the device to find
++ *
++ * Returns a pointer to a struct usb_device if such a specified usb
++ * device is present in the system currently.  The usage count of the
++ * device will be incremented if a device is found.  Make sure to call
++ * usb_put_dev() when the caller is finished with the device.
++ *
++ * If a device with the specified bus id is not found, NULL is returned.
++ */
++struct usb_device *usb_find_device_by_name(const char *name)
++{
++	struct list_head *buslist;
++	struct usb_bus *bus;
++	struct usb_device *dev = NULL;
++
++	mutex_lock(&usb_bus_list_lock);
++	for (buslist = usb_bus_list.next;
++	     buslist != &usb_bus_list;
++	     buslist = buslist->next) {
++		bus = container_of(buslist, struct usb_bus, bus_list);
++		if (!bus->root_hub)
++			continue;
++		usb_lock_device(bus->root_hub);
++		dev = match_device_name(bus->root_hub, name);
++		usb_unlock_device(bus->root_hub);
++		if (dev)
++			goto exit;
++	}
++exit:
++	mutex_unlock(&usb_bus_list_lock);
++	return dev;
++}
++EXPORT_SYMBOL_GPL(usb_find_device_by_name);
++
+ /**
+  * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP
+  * @dev: device the buffer will be used with
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -700,6 +700,7 @@ static inline bool usb_device_no_sg_cons
+ 	return udev && udev->bus && udev->bus->no_sg_constraint;
+ }
+ 
++extern struct usb_device *usb_find_device_by_name(const char *name);
+ 
+ /*-------------------------------------------------------------------------*/
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/830-ledtrig_morse.patch b/trunk/target/linux/generic/patches-3.18/830-ledtrig_morse.patch
new file mode 100644
index 00000000..a41facc0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/830-ledtrig_morse.patch
@@ -0,0 +1,28 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA
+ 	  This enables direct flash/torch on/off by the driver, kernel space.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_MORSE
++	tristate "LED Morse Trigger"
++	depends on LEDS_TRIGGERS
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -62,3 +62,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ 
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
++obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+--- a/drivers/leds/ledtrig-morse.c
++++ b/drivers/leds/ledtrig-morse.c
+@@ -26,7 +26,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/leds.h>
diff --git a/trunk/target/linux/generic/patches-3.18/831-ledtrig_netdev.patch b/trunk/target/linux/generic/patches-3.18/831-ledtrig_netdev.patch
new file mode 100644
index 00000000..3f39fb6a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/831-ledtrig_netdev.patch
@@ -0,0 +1,60 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE
+ 	tristate "LED Morse Trigger"
+ 	depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_NETDEV
++	tristate "LED Netdev Trigger"
++	depends on NET && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by network device activity.
++	  If unsure, say Y.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -63,3 +63,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
++obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+--- a/drivers/leds/ledtrig-netdev.c
++++ b/drivers/leds/ledtrig-netdev.c
+@@ -22,7 +22,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/netdevice.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+@@ -254,7 +253,7 @@ static int netdev_trig_notify(struct not
+ 			      unsigned long evt,
+ 			      void *dv)
+ {
+-	struct net_device *dev = dv;
++	struct net_device *dev = netdev_notifier_info_to_dev((struct netdev_notifier_info *) dv);
+ 	struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
+ 
+ 	if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
+@@ -294,8 +293,9 @@ done:
+ static void netdev_trig_timer(unsigned long arg)
+ {
+ 	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
+-	const struct net_device_stats *dev_stats;
++	struct rtnl_link_stats64 *dev_stats;
+ 	unsigned new_activity;
++	struct rtnl_link_stats64 temp;
+ 
+ 	write_lock(&trigger_data->lock);
+ 
+@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
+ 		goto no_restart;
+ 	}
+ 
+-	dev_stats = dev_get_stats(trigger_data->net_dev);
++	dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
+ 	new_activity =
+ 		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
+ 		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
diff --git a/trunk/target/linux/generic/patches-3.18/832-ledtrig_usbdev.patch b/trunk/target/linux/generic/patches-3.18/832-ledtrig_usbdev.patch
new file mode 100644
index 00000000..d8c94928
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/832-ledtrig_usbdev.patch
@@ -0,0 +1,31 @@
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV
+ 	  This allows LEDs to be controlled by network device activity.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_USBDEV
++	tristate "LED USB device Trigger"
++	depends on USB && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by the presence/activity of
++	  an USB device. If unsure, say N.
++
+ endif # LEDS_TRIGGERS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -64,3 +64,4 @@ obj-$(CONFIG_LEDS_DAC124S085)		+= leds-d
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= trigger/
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
++obj-$(CONFIG_LEDS_TRIGGER_USBDEV)	+= ledtrig-usbdev.o
+--- a/drivers/leds/ledtrig-usbdev.c
++++ b/drivers/leds/ledtrig-usbdev.c
+@@ -24,7 +24,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/slab.h>
diff --git a/trunk/target/linux/generic/patches-3.18/840-rtc7301.patch b/trunk/target/linux/generic/patches-3.18/840-rtc7301.patch
new file mode 100644
index 00000000..2134d874
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/840-rtc7301.patch
@@ -0,0 +1,250 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -979,6 +979,15 @@ config RTC_DRV_NUC900
+ 	  If you say yes here you get support for the RTC subsystem of the
+ 	  NUC910/NUC920 used in embedded systems.
+ 
++config RTC_DRV_RTC7301
++	tristate "Epson RTC-7301 SF/DG"
++	help
++	  If you say Y here you will get support for the
++	  Epson RTC-7301 SF/DG RTC chips.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-7301.
++
+ comment "on-CPU RTC drivers"
+ 
+ config RTC_DRV_DAVINCI
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -115,6 +115,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
+ obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
+ obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
+ obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
++obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
+ obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o
+ obj-$(CONFIG_RTC_DRV_RX4581)	+= rtc-rx4581.o
+ obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
+--- /dev/null
++++ b/drivers/rtc/rtc-rtc7301.c
+@@ -0,0 +1,219 @@
++/*
++ * Driver for Epson RTC-7301SF/DG
++ *
++ * Copyright (C) 2009 Jose Vasconcellos
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/rtc.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/bcd.h>
++
++#define RTC_NAME "rtc7301"
++#define RTC_VERSION "0.1"
++
++/* Epson RTC-7301 register addresses */
++#define RTC7301_SEC		0x00
++#define RTC7301_SEC10		0x01
++#define RTC7301_MIN		0x02
++#define RTC7301_MIN10		0x03
++#define RTC7301_HOUR		0x04
++#define RTC7301_HOUR10		0x05
++#define RTC7301_WEEKDAY		0x06
++#define RTC7301_DAY		0x07
++#define RTC7301_DAY10		0x08
++#define RTC7301_MON		0x09
++#define RTC7301_MON10		0x0A
++#define RTC7301_YEAR		0x0B
++#define RTC7301_YEAR10		0x0C
++#define RTC7301_YEAR100		0x0D
++#define RTC7301_YEAR1000	0x0E
++#define RTC7301_CTRLREG		0x0F
++
++static uint8_t __iomem *rtc7301_base;
++
++#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
++#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
++
++#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
++
++static void rtc7301_init_settings(void)
++{
++	int i;
++
++	write_reg(RTC7301_CTRLREG, 2);
++	write_reg(RTC7301_YEAR1000, 2);
++	udelay(122);
++
++	/* bank 1 */
++	write_reg(RTC7301_CTRLREG, 6);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++
++	/* bank 2 */
++	write_reg(RTC7301_CTRLREG, 14);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++	write_reg(RTC7301_CTRLREG, 0);
++}
++
++static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int cnt;
++	uint8_t buf[16];
++
++	cnt = 0;
++	while (rtc7301_isbusy()) {
++		udelay(244);
++		if (cnt++ > 100) {
++			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
++			return -EIO;
++		}
++	}
++
++	for (cnt=0; cnt<16; cnt++)
++		buf[cnt] = read_reg(cnt);
++
++	if (buf[RTC7301_SEC10] & 8) {
++		dev_err(dev, "%s: RTC not set\n", __func__);
++		return -EINVAL;
++	}
++
++	memset(dt, 0, sizeof(*dt));
++
++	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
++	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
++	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
++
++	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
++	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
++	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
++		      buf[RTC7301_YEAR100]*100 +
++		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
++
++	/* the rtc device may contain illegal values on power up
++	 * according to the data sheet. make sure they are valid.
++	 */
++
++	return rtc_valid_tm(dt);
++}
++
++static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int data;
++
++	data = dt->tm_year + 1900;
++	if (data >= 2100 || data < 1900)
++		return -EINVAL;
++
++	write_reg(RTC7301_CTRLREG, 2);
++       	udelay(122);
++
++	data = bin2bcd(dt->tm_sec);
++	write_reg(RTC7301_SEC, data);
++	write_reg(RTC7301_SEC10, (data >> 4));
++
++	data = bin2bcd(dt->tm_min);
++	write_reg(RTC7301_MIN, data );
++	write_reg(RTC7301_MIN10, (data >> 4));
++
++	data = bin2bcd(dt->tm_hour);
++	write_reg(RTC7301_HOUR, data);
++	write_reg(RTC7301_HOUR10, (data >> 4));
++
++	data = bin2bcd(dt->tm_mday);
++	write_reg(RTC7301_DAY, data);
++	write_reg(RTC7301_DAY10, (data>> 4));
++
++	data = bin2bcd(dt->tm_mon + 1);
++	write_reg(RTC7301_MON, data);
++	write_reg(RTC7301_MON10, (data >> 4));
++
++	data = bin2bcd(dt->tm_year % 100);
++	write_reg(RTC7301_YEAR, data);
++	write_reg(RTC7301_YEAR10, (data >> 4));
++	data = bin2bcd((1900 + dt->tm_year) / 100);
++	write_reg(RTC7301_YEAR100, data);
++
++	data = bin2bcd(dt->tm_wday);
++	write_reg(RTC7301_WEEKDAY, data);
++
++	write_reg(RTC7301_CTRLREG, 0);
++
++	return 0;
++}
++
++static const struct rtc_class_ops rtc7301_rtc_ops = {
++	.read_time	= rtc7301_get_datetime,
++	.set_time	= rtc7301_set_datetime,
++};
++
++static int rtc7301_probe(struct platform_device *pdev)
++{
++	struct rtc_device *rtc;
++	struct resource *res;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENOENT;
++
++	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
++	if (!rtc7301_base)
++		return -EINVAL;
++
++	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
++				&rtc7301_rtc_ops, THIS_MODULE);
++	if (IS_ERR(rtc)) {
++		iounmap(rtc7301_base);
++		return PTR_ERR(rtc);
++	}
++
++	platform_set_drvdata(pdev, rtc);
++
++	rtc7301_init_settings();
++	return 0;
++}
++
++static int rtc7301_remove(struct platform_device *pdev)
++{
++	struct rtc_device *rtc = platform_get_drvdata(pdev);
++
++	if (rtc)
++		rtc_device_unregister(rtc);
++	if (rtc7301_base)
++		iounmap(rtc7301_base);
++	return 0;
++}
++
++static struct platform_driver rtc7301_driver = {
++	.driver = {
++		.name	= RTC_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe	= rtc7301_probe,
++	.remove = rtc7301_remove,
++};
++
++static __init int rtc7301_init(void)
++{
++	return platform_driver_register(&rtc7301_driver);
++}
++module_init(rtc7301_init);
++
++static __exit void rtc7301_exit(void)
++{
++	platform_driver_unregister(&rtc7301_driver);
++}
++module_exit(rtc7301_exit);
++
++MODULE_DESCRIPTION("Epson 7301 RTC driver");
++MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" RTC_NAME);
++MODULE_VERSION(RTC_VERSION);
diff --git a/trunk/target/linux/generic/patches-3.18/841-rtc_pt7c4338.patch b/trunk/target/linux/generic/patches-3.18/841-rtc_pt7c4338.patch
new file mode 100644
index 00000000..83b0232e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/841-rtc_pt7c4338.patch
@@ -0,0 +1,247 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -567,6 +567,15 @@ config RTC_DRV_S5M
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-s5m.
+ 
++config RTC_DRV_PT7C4338
++	tristate "Pericom Technology Inc. PT7C4338 RTC"
++	help
++	  If you say yes here you get support for the Pericom Technology
++	  Inc. PT7C4338 RTC chip.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-pt7c4338.
++
+ endif # I2C
+ 
+ comment "SPI RTC drivers"
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -106,6 +106,7 @@ obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030
+ obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
+ obj-$(CONFIG_RTC_DRV_PM8XXX)	+= rtc-pm8xxx.o
+ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
++obj-$(CONFIG_RTC_DRV_PT7C4338)	+= rtc-pt7c4338.o
+ obj-$(CONFIG_RTC_DRV_PUV3)	+= rtc-puv3.o
+ obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
+ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
+--- /dev/null
++++ b/drivers/rtc/rtc-pt7c4338.c
+@@ -0,0 +1,216 @@
++/*
++ * Copyright 2010 Freescale Semiconductor, Inc.
++ *
++ * Author:	Priyanka Jain <Priyanka.Jain@freescale.com>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++
++/*
++ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
++ *
++ * This file is based on drivers/rtc/rtc-ds1307.c
++ *
++ * PT7C4338 chip is manufactured by Pericom Technology Inc.
++ * It is a serial real-time clock which provides
++ * 1)Low-power clock/calendar.
++ * 2)Programmable square-wave output.
++ * It has 56 bytes of nonvolatile RAM.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++
++/* RTC register addresses */
++#define PT7C4338_REG_SECONDS          0x00
++#define PT7C4338_REG_MINUTES          0x01
++#define PT7C4338_REG_HOURS            0x02
++#define PT7C4338_REG_AMPM             0x02
++#define PT7C4338_REG_DAY              0x03
++#define PT7C4338_REG_DATE             0x04
++#define PT7C4338_REG_MONTH            0x05
++#define PT7C4338_REG_YEAR             0x06
++#define PT7C4338_REG_CTRL_STAT        0x07
++
++/* RTC second register address bit */
++#define PT7C4338_SEC_BIT_CH           0x80	/*Clock Halt (in Register 0)*/
++
++/* RTC control and status register bits */
++#define PT7C4338_CTRL_STAT_BIT_RS0    0x1	/*Rate select 0*/
++#define PT7C4338_CTRL_STAT_BIT_RS1    0x2	/*Rate select 1*/
++#define PT7C4338_CTRL_STAT_BIT_SQWE   0x10	/*Square Wave Enable*/
++#define PT7C4338_CTRL_STAT_BIT_OSF    0x20	/*Oscillator Stop Flag*/
++#define PT7C4338_CTRL_STAT_BIT_OUT    0x80	/*Output Level Control*/
++
++static const struct i2c_device_id pt7c4338_id[] = {
++	{ "pt7c4338", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, pt7c4338_id);
++
++struct pt7c4338{
++	struct i2c_client *client;
++	struct rtc_device *rtc;
++};
++
++static int pt7c4338_read_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	int ret;
++	u8 buf[7];
++	u8 year, month, day, hour, minute, second;
++	u8 week, twelve_hr, am_pm;
++
++	ret = i2c_smbus_read_i2c_block_data(client,
++			PT7C4338_REG_SECONDS, 7, buf);
++	if (ret < 0)
++		return ret;
++	if (ret < 7)
++		return -EIO;
++
++	second = buf[0];
++	minute = buf[1];
++	hour = buf[2];
++	week = buf[3];
++	day = buf[4];
++	month = buf[5];
++	year = buf[6];
++
++	/* Extract additional information for AM/PM */
++	twelve_hr = hour & 0x40;
++	am_pm = hour & 0x20;
++
++	/* Write to rtc_time structure */
++	time->tm_sec = bcd2bin(second & 0x7f);
++	time->tm_min = bcd2bin(minute & 0x7f);
++	if (twelve_hr) {
++		/* Convert to 24 hr */
++		if (am_pm)
++			time->tm_hour = bcd2bin(hour & 0x10) + 12;
++		else
++			time->tm_hour = bcd2bin(hour & 0xBF);
++	} else {
++		time->tm_hour = bcd2bin(hour);
++	}
++
++	time->tm_wday = bcd2bin(week & 0x07) - 1;
++	time->tm_mday = bcd2bin(day & 0x3f);
++	time->tm_mon = bcd2bin(month & 0x1F) - 1;
++	/* assume 20YY not 19YY */
++	time->tm_year = bcd2bin(year) + 100;
++
++	return 0;
++}
++
++static int pt7c4338_set_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	u8 buf[7];
++
++	/* Extract time from rtc_time and load into pt7c4338*/
++	buf[0] = bin2bcd(time->tm_sec);
++	buf[1] = bin2bcd(time->tm_min);
++	buf[2] = bin2bcd(time->tm_hour);
++	buf[3] = bin2bcd(time->tm_wday + 1); /* Day of the week */
++	buf[4] = bin2bcd(time->tm_mday); /* Date */
++	buf[5] = bin2bcd(time->tm_mon + 1);
++
++	/* assume 20YY not 19YY */
++	if (time->tm_year >= 100)
++		buf[6] = bin2bcd(time->tm_year - 100);
++	else
++		buf[6] = bin2bcd(time->tm_year);
++
++	return i2c_smbus_write_i2c_block_data(client,
++					PT7C4338_REG_SECONDS, 7, buf);
++}
++
++static const struct rtc_class_ops pt7c4338_rtc_ops = {
++	.read_time = pt7c4338_read_time,
++	.set_time = pt7c4338_set_time,
++};
++
++static int pt7c4338_probe(struct i2c_client *client,
++		const struct i2c_device_id *id)
++{
++	struct pt7c4338 *pt7c4338;
++	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
++	int ret;
++
++	pt7c4338 = kzalloc(sizeof(struct pt7c4338), GFP_KERNEL);
++	if (!pt7c4338)
++		return -ENOMEM;
++
++	pt7c4338->client = client;
++	i2c_set_clientdata(client, pt7c4338);
++	pt7c4338->rtc = rtc_device_register(client->name, &client->dev,
++					&pt7c4338_rtc_ops, THIS_MODULE);
++	if (IS_ERR(pt7c4338->rtc)) {
++		ret = PTR_ERR(pt7c4338->rtc);
++		dev_err(&client->dev, "unable to register the class device\n");
++		goto out_free;
++	}
++
++	return 0;
++out_free:
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return ret;
++}
++
++static int pt7c4338_remove(struct i2c_client *client)
++{
++	struct pt7c4338 *pt7c4338 = i2c_get_clientdata(client);
++
++	rtc_device_unregister(pt7c4338->rtc);
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return 0;
++}
++
++static struct i2c_driver pt7c4338_driver = {
++	.driver = {
++		.name = "rtc-pt7c4338",
++		.owner = THIS_MODULE,
++	},
++	.probe = pt7c4338_probe,
++	.remove = pt7c4338_remove,
++	.id_table = pt7c4338_id,
++};
++
++static int __init pt7c4338_init(void)
++{
++	return i2c_add_driver(&pt7c4338_driver);
++}
++
++static void __exit pt7c4338_exit(void)
++{
++	i2c_del_driver(&pt7c4338_driver);
++}
++
++module_init(pt7c4338_init);
++module_exit(pt7c4338_exit);
++
++MODULE_AUTHOR("Priyanka Jain <Priyanka.Jain@freescale.com>");
++MODULE_DESCRIPTION("pericom Technology Inc. PT7C4338 RTC Driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.18/861-04_spi_gpio_implement_spi_delay.patch b/trunk/target/linux/generic/patches-3.18/861-04_spi_gpio_implement_spi_delay.patch
new file mode 100644
index 00000000..e7b32a50
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/861-04_spi_gpio_implement_spi_delay.patch
@@ -0,0 +1,58 @@
+Implement the SPI-GPIO delay function for busses that need speed limitation.
+
+--mb
+
+
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -21,6 +21,7 @@
+ #include <linux/module.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/delay.h>
+ #include <linux/of.h>
+ #include <linux/of_device.h>
+ #include <linux/of_gpio.h>
+@@ -73,6 +74,7 @@ struct spi_gpio {
+  *		#define	SPI_MOSI_GPIO	120
+  *		#define	SPI_SCK_GPIO	121
+  *		#define	SPI_N_CHIPSEL	4
++ *		#undef NEED_SPIDELAY
+  *		#include "spi-gpio.c"
+  */
+ 
+@@ -80,6 +82,7 @@ struct spi_gpio {
+ #define DRIVER_NAME	"spi_gpio"
+ 
+ #define GENERIC_BITBANG	/* vs tight inlines */
++#define NEED_SPIDELAY	1
+ 
+ /* all functions referencing these symbols must define pdata */
+ #define SPI_MISO_GPIO	((pdata)->miso)
+@@ -130,12 +133,20 @@ static inline int getmiso(const struct s
+ #undef pdata
+ 
+ /*
+- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
+- * requested device clock.  Software overhead means we usually have trouble
+- * reaching even one Mbit/sec (except when we can inline bitops), so for now
+- * we'll just assume we never need additional per-bit slowdowns.
++ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
++ * and spi_transfer.speed_hz to 0.
++ * Otherwise this is a function of the requested device clock.
++ * Software overhead means we usually have trouble
++ * reaching even one Mbit/sec (except when we can inline bitops). So on small
++ * embedded devices with fast SPI slaves you usually don't need a delay.
+  */
+-#define spidelay(nsecs)	do {} while (0)
++static inline void spidelay(unsigned nsecs)
++{
++#ifdef NEED_SPIDELAY
++	if (unlikely(nsecs))
++		ndelay(nsecs);
++#endif /* NEED_SPIDELAY */
++}
+ 
+ #include "spi-bitbang-txrx.h"
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/862-gpio_spi_driver.patch b/trunk/target/linux/generic/patches-3.18/862-gpio_spi_driver.patch
new file mode 100644
index 00000000..70bf11f8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/862-gpio_spi_driver.patch
@@ -0,0 +1,373 @@
+THIS CODE IS DEPRECATED.
+
+Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+--mb
+
+
+
+---
+ drivers/spi/Kconfig              |    9 +
+ drivers/spi/Makefile             |    1 
+ drivers/spi/spi_gpio_old.c       |  251 +++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi_gpio_old.h |   73 +++++++++++
+ 4 files changed, 334 insertions(+)
+
+--- /dev/null
++++ b/include/linux/spi/spi_gpio_old.h
+@@ -0,0 +1,73 @@
++/*
++ * spi_gpio interface to platform code
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++#ifndef _LINUX_SPI_SPI_GPIO
++#define _LINUX_SPI_SPI_GPIO
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++
++
++/**
++ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
++ *
++ * This structure holds information about a GPIO-based SPI device.
++ *
++ * @pin_clk: The GPIO pin number of the CLOCK pin.
++ *
++ * @pin_miso: The GPIO pin number of the MISO pin.
++ *
++ * @pin_mosi: The GPIO pin number of the MOSI pin.
++ *
++ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
++ *
++ * @cs_activelow: If true, the chip is selected when the CS line is low.
++ *
++ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
++ *                Note that doing no delay is not standards compliant,
++ *                but it might be needed to speed up transfers on some
++ *                slow embedded machines.
++ *
++ * @boardinfo_setup: This callback is called after the
++ *                   SPI master device was registered, but before the
++ *                   device is registered.
++ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
++ */
++struct spi_gpio_platform_data {
++	unsigned int pin_clk;
++	unsigned int pin_miso;
++	unsigned int pin_mosi;
++	unsigned int pin_cs;
++	bool cs_activelow;
++	bool no_spi_delay;
++	int (*boardinfo_setup)(struct spi_board_info *bi,
++			       struct spi_master *master,
++			       void *data);
++	void *boardinfo_setup_data;
++};
++
++/**
++ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a spi-gpio device.
++ */
++#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
++
++/**
++ * spi_gpio_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int spi_gpio_next_id(void);
++
++#endif /* _LINUX_SPI_SPI_GPIO */
+--- /dev/null
++++ b/drivers/spi/spi_gpio_old.c
+@@ -0,0 +1,251 @@
++/*
++ * Bitbanging SPI bus driver using GPIO API
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * based on spi_s3c2410_gpio.c
++ *   Copyright (c) 2006 Ben Dooks
++ *   Copyright (c) 2006 Simtec Electronics
++ * and on i2c-gpio.c
++ *   Copyright (C) 2007 Atmel Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/spi_bitbang.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++struct spi_gpio {
++	struct spi_bitbang bitbang;
++	struct spi_gpio_platform_data *info;
++	struct platform_device *pdev;
++	struct spi_board_info bi;
++};
++
++
++static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
++{
++	return dev->controller_data;
++}
++
++static inline void setsck(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
++}
++
++static inline void setmosi(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
++}
++
++static inline u32 getmiso(struct spi_device *dev)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
++}
++
++static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (!sp->info->no_spi_delay)
++		ndelay(nsecs);
++}
++
++#define spidelay(nsecs) do {					\
++	/* Steal the spi_device pointer from our caller.	\
++	 * The bitbang-API should probably get fixed here... */	\
++	do_spidelay(spi, nsecs);				\
++  } while (0)
++
++#define EXPAND_BITBANG_TXRX
++#include "spi-bitbang-txrx.h"
++
++static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
++}
++
++static void spi_gpio_chipselect(struct spi_device *dev, int on)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (sp->info->cs_activelow)
++		on = !on;
++	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
++}
++
++static int spi_gpio_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct spi_gpio_platform_data *pdata;
++	struct spi_gpio *sp;
++	struct spi_device *spidev;
++	int err;
++
++	pdata = pdev->dev.platform_data;
++	if (!pdata)
++		return -ENXIO;
++
++	err = -ENOMEM;
++	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
++	if (!master)
++		goto err_alloc_master;
++
++	sp = spi_master_get_devdata(master);
++	platform_set_drvdata(pdev, sp);
++	sp->info = pdata;
++
++	err = gpio_request(pdata->pin_clk, "spi_clock");
++	if (err)
++		goto err_request_clk;
++	err = gpio_request(pdata->pin_mosi, "spi_mosi");
++	if (err)
++		goto err_request_mosi;
++	err = gpio_request(pdata->pin_miso, "spi_miso");
++	if (err)
++		goto err_request_miso;
++	err = gpio_request(pdata->pin_cs, "spi_cs");
++	if (err)
++		goto err_request_cs;
++
++	sp->bitbang.master = spi_master_get(master);
++	sp->bitbang.master->bus_num = -1;
++	sp->bitbang.master->num_chipselect = 1;
++	sp->bitbang.chipselect = spi_gpio_chipselect;
++	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
++	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
++	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
++	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
++
++	gpio_direction_output(pdata->pin_clk, 0);
++	gpio_direction_output(pdata->pin_mosi, 0);
++	gpio_direction_output(pdata->pin_cs,
++			      pdata->cs_activelow ? 1 : 0);
++	gpio_direction_input(pdata->pin_miso);
++
++	err = spi_bitbang_start(&sp->bitbang);
++	if (err)
++		goto err_no_bitbang;
++	err = pdata->boardinfo_setup(&sp->bi, master,
++				     pdata->boardinfo_setup_data);
++	if (err)
++		goto err_bi_setup;
++	sp->bi.controller_data = sp;
++	spidev = spi_new_device(master, &sp->bi);
++	if (!spidev)
++		goto err_new_dev;
++
++	return 0;
++
++err_new_dev:
++err_bi_setup:
++	spi_bitbang_stop(&sp->bitbang);
++err_no_bitbang:
++	spi_master_put(sp->bitbang.master);
++	gpio_free(pdata->pin_cs);
++err_request_cs:
++	gpio_free(pdata->pin_miso);
++err_request_miso:
++	gpio_free(pdata->pin_mosi);
++err_request_mosi:
++	gpio_free(pdata->pin_clk);
++err_request_clk:
++	kfree(master);
++
++err_alloc_master:
++	return err;
++}
++
++static int spi_gpio_remove(struct platform_device *pdev)
++{
++	struct spi_gpio *sp;
++	struct spi_gpio_platform_data *pdata;
++
++	pdata = pdev->dev.platform_data;
++	sp = platform_get_drvdata(pdev);
++
++	gpio_free(pdata->pin_clk);
++	gpio_free(pdata->pin_mosi);
++	gpio_free(pdata->pin_miso);
++	gpio_free(pdata->pin_cs);
++	spi_bitbang_stop(&sp->bitbang);
++	spi_master_put(sp->bitbang.master);
++
++	return 0;
++}
++
++static struct platform_driver spi_gpio_driver = {
++	.driver		= {
++		.name	= SPI_GPIO_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe		= spi_gpio_probe,
++	.remove		= spi_gpio_remove,
++};
++
++int spi_gpio_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(spi_gpio_next_id);
++
++static int __init spi_gpio_init(void)
++{
++	int err;
++
++	err = platform_driver_register(&spi_gpio_driver);
++	if (err)
++		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
++
++	return err;
++}
++module_init(spi_gpio_init);
++
++static void __exit spi_gpio_exit(void)
++{
++	platform_driver_unregister(&spi_gpio_driver);
++}
++module_exit(spi_gpio_exit);
++
++MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
++MODULE_LICENSE("GPL v2");
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -225,6 +225,15 @@ config SPI_GPIO
+ 	  GPIO operations, you should be able to leverage that for better
+ 	  speed with a custom version of this driver; see the source code.
+ 
++config SPI_GPIO_OLD
++	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
++	depends on SPI_MASTER && GPIOLIB
++	select SPI_BITBANG
++	help
++	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
++
++	  If unsure, say N.
++
+ config SPI_IMX
+ 	tristate "Freescale i.MX SPI controllers"
+ 	depends on ARCH_MXC || COMPILE_TEST
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -40,6 +40,7 @@ obj-$(CONFIG_SPI_FSL_LIB)		+= spi-fsl-li
+ obj-$(CONFIG_SPI_FSL_ESPI)		+= spi-fsl-espi.o
+ obj-$(CONFIG_SPI_FSL_SPI)		+= spi-fsl-spi.o
+ obj-$(CONFIG_SPI_GPIO)			+= spi-gpio.o
++obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
+ obj-$(CONFIG_SPI_IMX)			+= spi-imx.o
+ obj-$(CONFIG_SPI_LM70_LLP)		+= spi-lm70llp.o
+ obj-$(CONFIG_SPI_MPC512x_PSC)		+= spi-mpc512x-psc.o
diff --git a/trunk/target/linux/generic/patches-3.18/863-gpiommc.patch b/trunk/target/linux/generic/patches-3.18/863-gpiommc.patch
new file mode 100644
index 00000000..29293333
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/863-gpiommc.patch
@@ -0,0 +1,844 @@
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
+@@ -0,0 +1,609 @@
++/*
++ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
++ * This module hooks up the mmc_spi and spi_gpio modules and also
++ * provides a configfs interface.
++ *
++ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/module.h>
++#include <linux/mmc/gpiommc.h>
++#include <linux/platform_device.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/configfs.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++#define PFX				"gpio-mmc: "
++
++
++struct gpiommc_device {
++	struct platform_device *pdev;
++	struct platform_device *spi_pdev;
++	struct spi_board_info boardinfo;
++};
++
++
++MODULE_DESCRIPTION("GPIO based MMC driver");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_LICENSE("GPL");
++
++
++static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
++				   struct spi_master *master,
++				   void *data)
++{
++	struct gpiommc_device *d = data;
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	/* Bind the SPI master to the MMC-SPI host driver. */
++	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
++
++	bi->max_speed_hz = pdata->max_bus_speed;
++	bi->bus_num = master->bus_num;
++	bi->mode = pdata->mode;
++
++	return 0;
++}
++
++static int gpiommc_probe(struct platform_device *pdev)
++{
++	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
++	struct spi_gpio_platform_data spi_pdata;
++	struct gpiommc_device *d;
++	int err;
++
++	err = -ENXIO;
++	if (!mmc_pdata)
++		goto error;
++
++#ifdef CONFIG_MMC_SPI_MODULE
++	err = request_module("mmc_spi");
++	if (err) {
++		printk(KERN_WARNING PFX
++		       "Failed to request mmc_spi module.\n");
++	}
++#endif /* CONFIG_MMC_SPI_MODULE */
++
++	/* Allocate the GPIO-MMC device */
++	err = -ENOMEM;
++	d = kzalloc(sizeof(*d), GFP_KERNEL);
++	if (!d)
++		goto error;
++	d->pdev = pdev;
++
++	/* Create the SPI-GPIO device */
++	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
++					    spi_gpio_next_id());
++	if (!d->spi_pdev)
++		goto err_free_d;
++
++	memset(&spi_pdata, 0, sizeof(spi_pdata));
++	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
++	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
++	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
++	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
++	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
++	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
++	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
++	spi_pdata.boardinfo_setup_data = d;
++
++	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
++				       sizeof(spi_pdata));
++	if (err)
++		goto err_free_pdev;
++	err = platform_device_add(d->spi_pdev);
++	if (err)
++		goto err_free_pdata;
++	platform_set_drvdata(pdev, d);
++
++	printk(KERN_INFO PFX "MMC-Card \"%s\" "
++	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
++	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
++	       mmc_pdata->pins.gpio_do,
++	       mmc_pdata->pins.gpio_clk,
++	       mmc_pdata->pins.gpio_cs);
++
++	return 0;
++
++err_free_pdata:
++	kfree(d->spi_pdev->dev.platform_data);
++	d->spi_pdev->dev.platform_data = NULL;
++err_free_pdev:
++	platform_device_put(d->spi_pdev);
++err_free_d:
++	kfree(d);
++error:
++	return err;
++}
++
++static int gpiommc_remove(struct platform_device *pdev)
++{
++	struct gpiommc_device *d = platform_get_drvdata(pdev);
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	platform_device_unregister(d->spi_pdev);
++	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
++	       pdata->name);
++	platform_device_put(d->spi_pdev);
++
++	return 0;
++}
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++
++/* A device that was created through configfs */
++struct gpiommc_configfs_device {
++	struct config_item item;
++	/* The platform device, after registration. */
++	struct platform_device *pdev;
++	/* The configuration */
++	struct gpiommc_platform_data pdata;
++};
++
++#define GPIO_INVALID	-1
++
++static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
++{
++	return (dev->pdev != NULL);
++}
++
++static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
++{
++	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
++}
++
++static struct configfs_attribute gpiommc_attr_DI = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_in",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_DO = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_out",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CLK = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_clock",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS_activelow = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect_activelow",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spimode = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_mode",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spidelay = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_delay",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_max_bus_speed = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "max_bus_speed",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_register = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "register",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute *gpiommc_config_attrs[] = {
++	&gpiommc_attr_DI,
++	&gpiommc_attr_DO,
++	&gpiommc_attr_CLK,
++	&gpiommc_attr_CS,
++	&gpiommc_attr_CS_activelow,
++	&gpiommc_attr_spimode,
++	&gpiommc_attr_spidelay,
++	&gpiommc_attr_max_bus_speed,
++	&gpiommc_attr_register,
++	NULL,
++};
++
++static ssize_t gpiommc_config_attr_show(struct config_item *item,
++					struct configfs_attribute *attr,
++					char *page)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	ssize_t count = 0;
++	unsigned int gpio;
++	int err = 0;
++
++	if (attr == &gpiommc_attr_DI) {
++		gpio = dev->pdata.pins.gpio_di;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		gpio = dev->pdata.pins.gpio_do;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		gpio = dev->pdata.pins.gpio_clk;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		gpio = dev->pdata.pins.gpio_cs;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.pins.cs_activelow);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.mode);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 !dev->pdata.no_spi_delay);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.max_bus_speed);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_register) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 gpiommc_is_registered(dev));
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
++			       const char *name)
++{
++	int err;
++
++	if (gpiommc_is_registered(dev))
++		return 0;
++
++	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
++		printk(KERN_ERR PFX
++		       "configfs: Invalid GPIO pin number(s)\n");
++		return -EINVAL;
++	}
++
++	strlcpy(dev->pdata.name, name,
++		sizeof(dev->pdata.name));
++
++	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
++					  gpiommc_next_id());
++	if (!dev->pdev)
++		return -ENOMEM;
++	err = platform_device_add_data(dev->pdev, &dev->pdata,
++				       sizeof(dev->pdata));
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++	err = platform_device_add(dev->pdev);
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++
++	return 0;
++}
++
++static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
++{
++	if (!gpiommc_is_registered(dev))
++		return;
++
++	platform_device_unregister(dev->pdev);
++	dev->pdev = NULL;
++}
++
++static ssize_t gpiommc_config_attr_store(struct config_item *item,
++					 struct configfs_attribute *attr,
++					 const char *page, size_t count)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	int err = -EINVAL;
++	unsigned long data;
++
++	if (attr == &gpiommc_attr_register) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data == 1)
++			err = gpiommc_do_register(dev, item->ci_name);
++		if (data == 0) {
++			gpiommc_do_unregister(dev);
++			err = 0;
++		}
++		goto out;
++	}
++
++	if (gpiommc_is_registered(dev)) {
++		/* The rest of the config parameters can only be set
++		 * as long as the device is not registered, yet. */
++		err = -EBUSY;
++		goto out;
++	}
++
++	if (attr == &gpiommc_attr_DI) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_di = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_do = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_clk = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_cs = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.pins.cs_activelow = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		switch (data) {
++		case 0:
++			dev->pdata.mode = SPI_MODE_0;
++			break;
++		case 1:
++			dev->pdata.mode = SPI_MODE_1;
++			break;
++		case 2:
++			dev->pdata.mode = SPI_MODE_2;
++			break;
++		case 3:
++			dev->pdata.mode = SPI_MODE_3;
++			break;
++		default:
++			goto out;
++		}
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.no_spi_delay = !data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data > UINT_MAX)
++			goto out;
++		dev->pdata.max_bus_speed = data;
++		err = 0;
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static void gpiommc_config_item_release(struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	kfree(dev);
++}
++
++static struct configfs_item_operations gpiommc_config_item_ops = {
++	.release		= gpiommc_config_item_release,
++	.show_attribute		= gpiommc_config_attr_show,
++	.store_attribute	= gpiommc_config_attr_store,
++};
++
++static struct config_item_type gpiommc_dev_ci_type = {
++	.ct_item_ops	= &gpiommc_config_item_ops,
++	.ct_attrs	= gpiommc_config_attrs,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct config_item *gpiommc_make_item(struct config_group *group,
++					     const char *name)
++{
++	struct gpiommc_configfs_device *dev;
++
++	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
++		printk(KERN_ERR PFX "configfs: device name too long\n");
++		return NULL;
++	}
++
++	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++	if (!dev)
++		return NULL;
++
++	config_item_init_type_name(&dev->item, name,
++				   &gpiommc_dev_ci_type);
++
++	/* Assign default configuration */
++	dev->pdata.pins.gpio_di = GPIO_INVALID;
++	dev->pdata.pins.gpio_do = GPIO_INVALID;
++	dev->pdata.pins.gpio_clk = GPIO_INVALID;
++	dev->pdata.pins.gpio_cs = GPIO_INVALID;
++	dev->pdata.pins.cs_activelow = 1;
++	dev->pdata.mode = SPI_MODE_0;
++	dev->pdata.no_spi_delay = 0;
++	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
++
++	return &(dev->item);
++}
++
++static void gpiommc_drop_item(struct config_group *group,
++			      struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	gpiommc_do_unregister(dev);
++	kfree(dev);
++}
++
++static struct configfs_group_operations gpiommc_ct_group_ops = {
++	.make_item	= gpiommc_make_item,
++	.drop_item	= gpiommc_drop_item,
++};
++
++static struct config_item_type gpiommc_ci_type = {
++	.ct_group_ops	= &gpiommc_ct_group_ops,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct configfs_subsystem gpiommc_subsys = {
++	.su_group = {
++		.cg_item = {
++			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
++			.ci_type = &gpiommc_ci_type,
++		},
++	},
++	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
++};
++
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++static struct platform_driver gpiommc_plat_driver = {
++	.probe	= gpiommc_probe,
++	.remove	= gpiommc_remove,
++	.driver	= {
++		.name	= GPIOMMC_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++};
++
++int gpiommc_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(gpiommc_next_id);
++
++static int __init gpiommc_modinit(void)
++{
++	int err;
++
++	err = platform_driver_register(&gpiommc_plat_driver);
++	if (err)
++		return err;
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	config_group_init(&gpiommc_subsys.su_group);
++	err = configfs_register_subsystem(&gpiommc_subsys);
++	if (err) {
++		platform_driver_unregister(&gpiommc_plat_driver);
++		return err;
++	}
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++	return 0;
++}
++module_init(gpiommc_modinit);
++
++static void __exit gpiommc_modexit(void)
++{
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	configfs_unregister_subsystem(&gpiommc_subsys);
++#endif
++	platform_driver_unregister(&gpiommc_plat_driver);
++}
++module_exit(gpiommc_modexit);
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -534,6 +534,31 @@ config MMC_SDHI
+ 	  This provides support for the SDHI SD/SDIO controller found in
+ 	  SuperH and ARM SH-Mobile SoCs
+ 
++config GPIOMMC
++	tristate "MMC/SD over GPIO-based SPI"
++	depends on MMC && MMC_SPI && SPI_GPIO_OLD
++	help
++	  This driver hooks up the mmc_spi and spi_gpio modules so that
++	  MMC/SD cards can be used on a GPIO based bus by bitbanging
++	  the SPI protocol in software.
++
++	  This driver provides a configfs interface to dynamically create
++	  and destroy GPIO-based MMC/SD card devices. It also provides
++	  a platform device interface API.
++	  See Documentation/gpiommc.txt for details.
++
++	  The module will be called gpiommc.
++
++	  If unsure, say N.
++
++config GPIOMMC_CONFIGFS
++	bool
++	depends on GPIOMMC && CONFIGFS_FS
++	default y
++	help
++	  This option automatically enables configfs support for gpiommc
++	  if configfs is available.
++
+ config MMC_CB710
+ 	tristate "ENE CB710 MMC/SD Interface support"
+ 	depends on PCI
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -40,6 +40,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
+ obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o
+ obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
++obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
+ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
+ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
+ obj-$(CONFIG_MMC_DW_PLTFM)	+= dw_mmc-pltfm.o
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
+@@ -0,0 +1,71 @@
++/*
++ * Device driver for MMC/SD cards driven over a GPIO bus.
++ *
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * Licensed under the GNU/GPL version 2.
++ */
++#ifndef LINUX_GPIOMMC_H_
++#define LINUX_GPIOMMC_H_
++
++#include <linux/types.h>
++
++
++#define GPIOMMC_MAX_NAMELEN		15
++#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
++
++/**
++ * struct gpiommc_pins - Hardware pin assignments
++ *
++ * @gpio_di: The GPIO number of the DATA IN pin
++ * @gpio_do: The GPIO number of the DATA OUT pin
++ * @gpio_clk: The GPIO number of the CLOCK pin
++ * @gpio_cs: The GPIO number of the CHIPSELECT pin
++ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
++ */
++struct gpiommc_pins {
++	unsigned int gpio_di;
++	unsigned int gpio_do;
++	unsigned int gpio_clk;
++	unsigned int gpio_cs;
++	bool cs_activelow;
++};
++
++/**
++ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
++ *
++ * @name: The unique name string of the device.
++ * @pins: The hardware pin assignments.
++ * @mode: The hardware mode. This is either SPI_MODE_0,
++ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
++ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
++ *                This is not standards compliant, but may be required for some
++ *                embedded machines to gain reasonable speed.
++ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
++ */
++struct gpiommc_platform_data {
++	char name[GPIOMMC_MAX_NAMELEN + 1];
++	struct gpiommc_pins pins;
++	u8 mode;
++	bool no_spi_delay;
++	unsigned int max_bus_speed;
++};
++
++/**
++ * GPIOMMC_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a gpiommc device.
++ */
++#define GPIOMMC_PLATDEV_NAME	"gpiommc"
++
++/**
++ * gpiommc_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int gpiommc_next_id(void);
++
++#endif /* LINUX_GPIOMMC_H_ */
+--- /dev/null
++++ b/Documentation/gpiommc.txt
+@@ -0,0 +1,97 @@
++GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
++================================================================
++
++The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
++MMC or SD card on GPIO pins.
++
++Two interfaces for registering a new MMC/SD card device are provided:
++A static platform-device based mechanism and a dynamic configfs based interface.
++
++
++Registering devices via platform-device
++=======================================
++
++The platform-device interface is used for registering MMC/SD devices that are
++part of the hardware platform. This is most useful only for embedded machines
++with MMC/SD devices statically connected to the platform GPIO bus.
++
++The data structures are declared in <linux/mmc/gpiommc.h>.
++
++To register a new device, define an instance of struct gpiommc_platform_data.
++This structure holds any information about how the device is hooked up to the
++GPIO pins and what hardware modes the device supports. See the docbook-style
++documentation in the header file for more information on the struct fields.
++
++Then allocate a new instance of a platform device by doing:
++
++	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
++
++This will allocate the platform device data structures and hook it up to the
++gpiommc driver.
++Then add the gpiommc_platform_data to the platform device.
++
++	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
++
++You may free the local instance of struct gpiommc_platform_data now. (So the
++struct may be allocated on the stack, too).
++Now simply register the platform device.
++
++	err = platform_device_add(pdev);
++
++Done. The gpiommc probe routine will be invoked now and you should see a kernel
++log message for the added device.
++
++
++Registering devices via configfs
++================================
++
++MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
++selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
++hardware are a common situation.
++So we provide a dynamic interface to conveniently handle adding and removing
++devices from userspace, without the need to recompile the kernel.
++
++The "gpiommc" subdirectory at the configfs mountpoint is used for handling
++the dynamic configuration.
++
++To create a new device, it must first be allocated with mkdir.
++The following command will allocate a device named "my_mmc":
++	mkdir /config/gpiommc/my_mmc
++
++There are several configuration files available in the new
++/config/gpiommc/my_mmc/ directory:
++
++gpio_data_in			= The SPI data-IN GPIO pin number.
++gpio_data_out			= The SPI data-OUT GPIO pin number.
++gpio_clock			= The SPI Clock GPIO pin number.
++gpio_chipselect			= The SPI Chipselect GPIO pin number.
++gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
++				  If 1, Chipselect is active-LOW.
++spi_mode			= The SPI data mode. Can be 0-3.
++spi_delay			= Enable all delays in the lowlevel bitbanging.
++max_bus_speed			= The maximum SPI bus speed. In Hertz.
++
++register			= Not a configuration parameter.
++				  Used to register the configured card
++				  with the kernel.
++
++The device must first get configured and then registered by writing "1" to
++the "register" file.
++The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
++and "gpio_chipselect" are essential and _must_ be configured before writing
++"1" to the "register" file. The registration will fail, otherwise.
++
++The default values for the other parameters are:
++gpio_chipselect_activelow	= 1		(CS active-LOW)
++spi_mode			= 0		(SPI_MODE_0)
++spi_delay			= 1		(enabled)
++max_bus_speed			= 5000000	(5 Mhz)
++
++Configuration values can not be changed after registration. To unregister
++the device, write a "0" to the "register" file. The configuration can be
++changed again after unregistering.
++
++To completely remove the device, simply rmdir the directory
++(/config/gpiommc/my_mmc in this example).
++There's no need to first unregister the device before removing it. That will
++be done automatically.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -4279,6 +4279,11 @@ T:	git git://linuxtv.org/anttip/media_tr
+ S:	Maintained
+ F:	drivers/media/usb/hackrf/
+ 
++GPIOMMC DRIVER
++P:	Michael Buesch
++M:	mb@bu3sch.de
++S:	Maintained
++
+ HARDWARE MONITORING
+ M:	Jean Delvare <jdelvare@suse.de>
+ M:	Guenter Roeck <linux@roeck-us.net>
diff --git a/trunk/target/linux/generic/patches-3.18/864-gpiommc_configfs_locking.patch b/trunk/target/linux/generic/patches-3.18/864-gpiommc_configfs_locking.patch
new file mode 100644
index 00000000..92815d91
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/864-gpiommc_configfs_locking.patch
@@ -0,0 +1,58 @@
+The gpiommc configfs context structure needs locking, as configfs
+does not lock access between files.
+
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
+ 	struct platform_device *pdev;
+ 	/* The configuration */
+ 	struct gpiommc_platform_data pdata;
++	/* Mutex to protect this structure */
++	struct mutex mutex;
+ };
+ 
+ #define GPIO_INVALID	-1
+@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	unsigned int gpio;
+ 	int err = 0;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_DI) {
+ 		gpio = dev->pdata.pins.gpio_di;
+ 		if (gpio == GPIO_INVALID)
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
+ 	int err = -EINVAL;
+ 	unsigned long data;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_register) {
+ 		err = kstrtoul(page, 10, &data);
+ 		if (err)
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
+ 	if (!dev)
+ 		return NULL;
+ 
++	mutex_init(&dev->mutex);
+ 	config_item_init_type_name(&dev->item, name,
+ 				   &gpiommc_dev_ci_type);
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/870-hifn795x_byteswap.patch b/trunk/target/linux/generic/patches-3.18/870-hifn795x_byteswap.patch
new file mode 100644
index 00000000..3a37c951
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/870-hifn795x_byteswap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/crypto/hifn_795x.c
++++ b/drivers/crypto/hifn_795x.c
+@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
+ 
+ static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
++	writel(val, dev->bar[0] + reg);
+ }
+ 
+ static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
++	writel(val, dev->bar[1] + reg);
+ }
+ 
+ static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/trunk/target/linux/generic/patches-3.18/880-gateworks_system_controller.patch b/trunk/target/linux/generic/patches-3.18/880-gateworks_system_controller.patch
new file mode 100644
index 00000000..55e95be7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/880-gateworks_system_controller.patch
@@ -0,0 +1,339 @@
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -507,6 +507,15 @@ config SENSORS_G762
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called g762.
+ 
++config SENSORS_GSC
++	tristate "Gateworks System Controller"
++	depends on I2C
++	help
++	  If you say yes here you get support for the Gateworks System Controller.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called gsc.
++
+ config SENSORS_GPIO_FAN
+ 	tristate "GPIO fan"
+ 	depends on GPIOLIB
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -153,6 +153,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l7
+ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
+ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
+ obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
++obj-$(CONFIG_SENSORS_GSC)	+= gsc.o
+ 
+ obj-$(CONFIG_PMBUS)		+= pmbus/
+ 
+--- /dev/null
++++ b/drivers/hwmon/gsc.c
+@@ -0,0 +1,308 @@
++/*
++ * A hwmon driver for the Gateworks System Controller 
++ * Copyright (C) 2009 Gateworks Corporation
++ *
++ * Author: Chris Lang <clang@gateworks.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License,
++ * as published by the Free Software Foundation - version 2.
++ */
++
++#include <linux/module.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++
++#define DRV_VERSION "0.2"
++
++enum chips { gsp };
++
++/* AD7418 registers */
++#define GSP_REG_TEMP_IN		0x00
++#define GSP_REG_VIN		0x02
++#define GSP_REG_3P3		0x05
++#define GSP_REG_BAT		0x08
++#define GSP_REG_5P0		0x0b
++#define GSP_REG_CORE		0x0e
++#define GSP_REG_CPU1		0x11
++#define GSP_REG_CPU2		0x14
++#define GSP_REG_DRAM		0x17
++#define GSP_REG_EXT_BAT		0x1a
++#define GSP_REG_IO1		0x1d
++#define GSP_REG_IO2 		0x20
++#define GSP_REG_PCIE		0x23
++#define GSP_REG_CURRENT		0x26
++#define GSP_FAN_0		0x2C
++#define GSP_FAN_1		0x2E
++#define GSP_FAN_2		0x30
++#define GSP_FAN_3		0x32
++#define GSP_FAN_4		0x34
++#define GSP_FAN_5		0x36
++
++struct gsp_sensor_info {
++	const char* name;
++	int reg;
++};
++
++static const struct gsp_sensor_info gsp_sensors[] = {
++	{"temp", GSP_REG_TEMP_IN},
++	{"vin", GSP_REG_VIN},
++	{"3p3", GSP_REG_3P3},
++	{"bat", GSP_REG_BAT},
++	{"5p0", GSP_REG_5P0},
++	{"core", GSP_REG_CORE},
++	{"cpu1", GSP_REG_CPU1},
++	{"cpu2", GSP_REG_CPU2},
++	{"dram", GSP_REG_DRAM},
++	{"ext_bat", GSP_REG_EXT_BAT},
++	{"io1", GSP_REG_IO1},
++	{"io2", GSP_REG_IO2},
++	{"pci2", GSP_REG_PCIE},
++	{"current", GSP_REG_CURRENT},
++	{"fan_point0", GSP_FAN_0},
++	{"fan_point1", GSP_FAN_1},
++	{"fan_point2", GSP_FAN_2},
++	{"fan_point3", GSP_FAN_3},
++	{"fan_point4", GSP_FAN_4},
++	{"fan_point5", GSP_FAN_5},
++};
++
++struct gsp_data {
++	struct device		*hwmon_dev;
++	struct attribute_group	attrs;
++	enum chips		type;
++};
++
++static int gsp_probe(struct i2c_client *client,
++			const struct i2c_device_id *id);
++static int gsp_remove(struct i2c_client *client);
++
++static const struct i2c_device_id gsp_id[] = {
++	{ "gsp", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, gsp_id);
++
++static struct i2c_driver gsp_driver = {
++	.driver = {
++		.name	= "gsp",
++	},
++	.probe		= gsp_probe,
++	.remove		= gsp_remove,
++	.id_table	= gsp_id,
++};
++
++/* All registers are word-sized, except for the configuration registers.
++ * AD7418 uses a high-byte first convention. Do NOT use those functions to
++ * access the configuration registers CONF and CONF2, as they are byte-sized.
++ */
++static inline int gsp_read(struct i2c_client *client, u8 reg)
++{
++	unsigned int adc = 0;
++	if (reg == GSP_REG_TEMP_IN || reg > GSP_REG_CURRENT)
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		return adc;
++	}
++	else
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		adc |= i2c_smbus_read_byte_data(client, reg + 2) << 16;
++		return adc;
++	}
++}
++
++static inline int gsp_write(struct i2c_client *client, u8 reg, u16 value)
++{
++	i2c_smbus_write_byte_data(client, reg, value & 0xff);
++	i2c_smbus_write_byte_data(client, reg + 1, ((value >> 8) & 0xff));
++	return 1;
++}
++
++static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
++			char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	return sprintf(buf, "%d\n", gsp_read(client, gsp_sensors[attr->index].reg));
++}
++
++static ssize_t show_label(struct device *dev,
++			struct device_attribute *devattr, char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++
++	return sprintf(buf, "%s\n", gsp_sensors[attr->index].name);
++}
++
++static ssize_t store_fan(struct device *dev,
++			struct device_attribute *devattr, const char *buf, size_t count)
++{
++	u16 val;
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	val = simple_strtoul(buf, NULL, 10);
++	gsp_write(client, gsp_sensors[attr->index].reg, val);
++	return count;
++}
++
++static SENSOR_DEVICE_ATTR(temp0_input, S_IRUGO, show_adc, NULL, 0);
++static SENSOR_DEVICE_ATTR(temp0_label, S_IRUGO, show_label, NULL, 0);
++
++static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_adc, NULL, 1);
++static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, show_label, NULL, 1);
++static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 2);
++static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, show_label, NULL, 2);
++static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 3);
++static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, show_label, NULL, 3);
++static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 4);
++static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 4);
++static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 5);
++static SENSOR_DEVICE_ATTR(in4_label, S_IRUGO, show_label, NULL, 5);
++static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_adc, NULL, 6);
++static SENSOR_DEVICE_ATTR(in5_label, S_IRUGO, show_label, NULL, 6);
++static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_adc, NULL, 7);
++static SENSOR_DEVICE_ATTR(in6_label, S_IRUGO, show_label, NULL, 7);
++static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_adc, NULL, 8);
++static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 8);
++static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, show_adc, NULL, 9);
++static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 9);
++static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_adc, NULL, 10);
++static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 10);
++static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_adc, NULL, 11);
++static SENSOR_DEVICE_ATTR(in10_label, S_IRUGO, show_label, NULL, 11);
++static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, show_adc, NULL, 12);
++static SENSOR_DEVICE_ATTR(in11_label, S_IRUGO, show_label, NULL, 12);
++static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, show_adc, NULL, 13);
++static SENSOR_DEVICE_ATTR(in12_label, S_IRUGO, show_label, NULL, 13);
++
++static SENSOR_DEVICE_ATTR(fan0_point0, S_IRUGO | S_IWUSR, show_adc, store_fan, 14);
++static SENSOR_DEVICE_ATTR(fan0_point1, S_IRUGO | S_IWUSR, show_adc, store_fan, 15);
++static SENSOR_DEVICE_ATTR(fan0_point2, S_IRUGO | S_IWUSR, show_adc, store_fan, 16);
++static SENSOR_DEVICE_ATTR(fan0_point3, S_IRUGO | S_IWUSR, show_adc, store_fan, 17);
++static SENSOR_DEVICE_ATTR(fan0_point4, S_IRUGO | S_IWUSR, show_adc, store_fan, 18);
++static SENSOR_DEVICE_ATTR(fan0_point5, S_IRUGO | S_IWUSR, show_adc, store_fan, 19);
++
++static struct attribute *gsp_attributes[] = {
++	&sensor_dev_attr_temp0_input.dev_attr.attr,
++	&sensor_dev_attr_in0_input.dev_attr.attr,
++	&sensor_dev_attr_in1_input.dev_attr.attr,
++	&sensor_dev_attr_in2_input.dev_attr.attr,
++	&sensor_dev_attr_in3_input.dev_attr.attr,
++	&sensor_dev_attr_in4_input.dev_attr.attr,
++	&sensor_dev_attr_in5_input.dev_attr.attr,
++	&sensor_dev_attr_in6_input.dev_attr.attr,
++	&sensor_dev_attr_in7_input.dev_attr.attr,
++	&sensor_dev_attr_in8_input.dev_attr.attr,
++	&sensor_dev_attr_in9_input.dev_attr.attr,
++	&sensor_dev_attr_in10_input.dev_attr.attr,
++	&sensor_dev_attr_in11_input.dev_attr.attr,
++	&sensor_dev_attr_in12_input.dev_attr.attr,
++
++	&sensor_dev_attr_temp0_label.dev_attr.attr,
++	&sensor_dev_attr_in0_label.dev_attr.attr,
++	&sensor_dev_attr_in1_label.dev_attr.attr,
++	&sensor_dev_attr_in2_label.dev_attr.attr,
++	&sensor_dev_attr_in3_label.dev_attr.attr,
++	&sensor_dev_attr_in4_label.dev_attr.attr,
++	&sensor_dev_attr_in5_label.dev_attr.attr,
++	&sensor_dev_attr_in6_label.dev_attr.attr,
++	&sensor_dev_attr_in7_label.dev_attr.attr,
++	&sensor_dev_attr_in8_label.dev_attr.attr,
++	&sensor_dev_attr_in9_label.dev_attr.attr,
++	&sensor_dev_attr_in10_label.dev_attr.attr,
++	&sensor_dev_attr_in11_label.dev_attr.attr,
++	&sensor_dev_attr_in12_label.dev_attr.attr,
++
++	&sensor_dev_attr_fan0_point0.dev_attr.attr,
++	&sensor_dev_attr_fan0_point1.dev_attr.attr,
++	&sensor_dev_attr_fan0_point2.dev_attr.attr,
++	&sensor_dev_attr_fan0_point3.dev_attr.attr,
++	&sensor_dev_attr_fan0_point4.dev_attr.attr,
++	&sensor_dev_attr_fan0_point5.dev_attr.attr,
++	NULL
++};
++
++
++static int gsp_probe(struct i2c_client *client,
++			 const struct i2c_device_id *id)
++{
++	struct i2c_adapter *adapter = client->adapter;
++	struct gsp_data *data;
++	int err;
++
++	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
++					I2C_FUNC_SMBUS_WORD_DATA)) {
++		err = -EOPNOTSUPP;
++		goto exit;
++	}
++
++	if (!(data = kzalloc(sizeof(struct gsp_data), GFP_KERNEL))) {
++		err = -ENOMEM;
++		goto exit;
++	}
++
++	i2c_set_clientdata(client, data);
++
++	data->type = id->driver_data;
++
++	switch (data->type) {
++	case 0:
++		data->attrs.attrs = gsp_attributes;
++		break;
++	}
++
++	dev_info(&client->dev, "%s chip found\n", client->name);
++
++	/* Register sysfs hooks */
++	if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
++		goto exit_free;
++
++	data->hwmon_dev = hwmon_device_register(&client->dev);
++	if (IS_ERR(data->hwmon_dev)) {
++		err = PTR_ERR(data->hwmon_dev);
++		goto exit_remove;
++	}
++
++	return 0;
++
++exit_remove:
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++exit_free:
++	kfree(data);
++exit:
++	return err;
++}
++
++static int gsp_remove(struct i2c_client *client)
++{
++	struct gsp_data *data = i2c_get_clientdata(client);
++	hwmon_device_unregister(data->hwmon_dev);
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++	kfree(data);
++	return 0;
++}
++
++static int __init gsp_init(void)
++{
++	return i2c_add_driver(&gsp_driver);
++}
++
++static void __exit gsp_exit(void)
++{
++	i2c_del_driver(&gsp_driver);
++}
++
++module_init(gsp_init);
++module_exit(gsp_exit);
++
++MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
++MODULE_DESCRIPTION("GSC HWMON driver");
++MODULE_LICENSE("GPL");
++MODULE_VERSION(DRV_VERSION);
++
diff --git a/trunk/target/linux/generic/patches-3.18/890-8250_optional_sysrq.patch b/trunk/target/linux/generic/patches-3.18/890-8250_optional_sysrq.patch
new file mode 100644
index 00000000..8815e4c6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/890-8250_optional_sysrq.patch
@@ -0,0 +1,24 @@
+--- a/drivers/tty/serial/8250/8250_core.c
++++ b/drivers/tty/serial/8250/8250_core.c
+@@ -16,7 +16,7 @@
+  *  membase is an 'ioremapped' cookie.
+  */
+ 
+-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
++#if defined(CONFIG_SERIAL_8250_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ)
+ #define SUPPORT_SYSRQ
+ #endif
+ 
+--- a/drivers/tty/serial/8250/Kconfig
++++ b/drivers/tty/serial/8250/Kconfig
+@@ -91,6 +91,10 @@ config SERIAL_8250_CONSOLE
+ 
+ 	  If unsure, say N.
+ 
++config SERIAL_8250_SYSRQ
++	bool "Magic sysrq support on 8250/16550 devices"
++	depends on SERIAL_8250_CONSOLE
++
+ config SERIAL_8250_GSC
+ 	tristate
+ 	depends on SERIAL_8250 && GSC
diff --git a/trunk/target/linux/generic/patches-3.18/900-slab_maxsize.patch b/trunk/target/linux/generic/patches-3.18/900-slab_maxsize.patch
new file mode 100644
index 00000000..9375305c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/900-slab_maxsize.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -172,8 +172,8 @@ size_t ksize(const void *);
+  * to do various tricks to work around compiler limitations in order to
+  * ensure proper constant folding.
+  */
+-#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
+-				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
++#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
++				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
+ #define KMALLOC_SHIFT_MAX	KMALLOC_SHIFT_HIGH
+ #ifndef KMALLOC_SHIFT_LOW
+ #define KMALLOC_SHIFT_LOW	5
diff --git a/trunk/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch b/trunk/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch
new file mode 100644
index 00000000..d172d1b8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch
@@ -0,0 +1,45 @@
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -89,6 +89,9 @@ source "net/netlabel/Kconfig"
+ 
+ endif # if INET
+ 
++config SOCK_DIAG
++	bool
++
+ config NETWORK_SECMARK
+ 	bool "Security Marking"
+ 	help
+--- a/net/core/Makefile
++++ b/net/core/Makefile
+@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
+ 
+ obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
+ 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
+-			sock_diag.o dev_ioctl.o tso.o
++			dev_ioctl.o tso.o
+ 
++obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
+ obj-$(CONFIG_XFRM) += flow.o
+ obj-y += net-sysfs.o
+ obj-$(CONFIG_PROC_FS) += net-procfs.o
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -419,6 +419,7 @@ config INET_LRO
+ 
+ config INET_DIAG
+ 	tristate "INET: socket monitoring interface"
++	select SOCK_DIAG
+ 	default y
+ 	---help---
+ 	  Support for INET (TCP, DCCP, etc) socket monitoring interface used by
+--- a/net/unix/Kconfig
++++ b/net/unix/Kconfig
+@@ -22,6 +22,7 @@ config UNIX
+ config UNIX_DIAG
+ 	tristate "UNIX: socket monitoring interface"
+ 	depends on UNIX
++	select SOCK_DIAG
+ 	default n
+ 	---help---
+ 	  Support for UNIX socket monitoring interface used by the ss tool.
diff --git a/trunk/target/linux/generic/patches-3.18/902-debloat_proc.patch b/trunk/target/linux/generic/patches-3.18/902-debloat_proc.patch
new file mode 100644
index 00000000..1134b83d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/902-debloat_proc.patch
@@ -0,0 +1,341 @@
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -2611,6 +2611,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_locks_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("locks", 0, NULL, &proc_locks_operations);
+ 	return 0;
+ }
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -71,3 +71,8 @@ config PROC_PAGE_MONITOR
+ 	  /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
+ 	  /proc/kpagecount, and /proc/kpageflags. Disabling these
+           interfaces will reduce the size of the kernel by approximately 4kb.
++
++config PROC_STRIPPED
++	default n
++	depends on EXPERT
++	bool "Strip non-essential /proc functionality to reduce code size"
+--- a/fs/proc/consoles.c
++++ b/fs/proc/consoles.c
+@@ -106,6 +106,9 @@ static const struct file_operations proc
+ 
+ static int __init proc_consoles_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	proc_create("consoles", 0, NULL, &proc_consoles_operations);
+ 	return 0;
+ }
+--- a/fs/proc/proc_tty.c
++++ b/fs/proc/proc_tty.c
+@@ -143,7 +143,10 @@ static const struct file_operations proc
+ void proc_tty_register_driver(struct tty_driver *driver)
+ {
+ 	struct proc_dir_entry *ent;
+-		
++
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!driver->driver_name || driver->proc_entry ||
+ 	    !driver->ops->proc_fops)
+ 		return;
+@@ -160,6 +163,9 @@ void proc_tty_unregister_driver(struct t
+ {
+ 	struct proc_dir_entry *ent;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ent = driver->proc_entry;
+ 	if (!ent)
+ 		return;
+@@ -174,6 +180,9 @@ void proc_tty_unregister_driver(struct t
+  */
+ void __init proc_tty_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!proc_mkdir("tty", NULL))
+ 		return;
+ 	proc_mkdir("tty/ldisc", NULL);	/* Preserved: it's userspace visible */
+--- a/kernel/exec_domain.c
++++ b/kernel/exec_domain.c
+@@ -176,6 +176,8 @@ static const struct file_operations exec
+ 
+ static int __init proc_execdomains_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
+ 	return 0;
+ }
+--- a/kernel/irq/proc.c
++++ b/kernel/irq/proc.c
+@@ -311,6 +311,9 @@ void register_irq_proc(unsigned int irq,
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
+ 		return;
+ 
+@@ -347,6 +350,9 @@ void unregister_irq_proc(unsigned int ir
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || !desc->dir)
+ 		return;
+ #ifdef CONFIG_SMP
+@@ -382,6 +388,9 @@ void init_irq_proc(void)
+ 	unsigned int irq;
+ 	struct irq_desc *desc;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	/* create /proc/irq */
+ 	root_irq_dir = proc_mkdir("irq", NULL);
+ 	if (!root_irq_dir)
+--- a/kernel/time/timer_list.c
++++ b/kernel/time/timer_list.c
+@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs
+ {
+ 	struct proc_dir_entry *pe;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
+ 	if (!pe)
+ 		return -ENOMEM;
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -2662,6 +2662,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_vmalloc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
+ 	return 0;
+ }
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -1424,10 +1424,12 @@ static int __init setup_vmstat(void)
+ 	cpu_notifier_register_done();
+ #endif
+ #ifdef CONFIG_PROC_FS
+-	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
+-	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
++		proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++		proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
++	}
+ 	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
+-	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
+ #endif
+ 	return 0;
+ }
+--- a/net/8021q/vlanproc.c
++++ b/net/8021q/vlanproc.c
+@@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net)
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (vn->proc_vlan_conf)
+ 		remove_proc_entry(name_conf, vn->proc_vlan_dir);
+ 
+@@ -146,6 +149,9 @@ int __net_init vlan_proc_init(struct net
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
+ 	if (!vn->proc_vlan_dir)
+ 		goto err;
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2915,6 +2915,8 @@ static __net_initdata struct pernet_oper
+ 
+ static int __init proto_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	return register_pernet_subsys(&proto_net_ops);
+ }
+ 
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2581,10 +2581,12 @@ static const struct file_operations fib_
+ 
+ int __net_init fib_proc_init(struct net *net)
+ {
+-	if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
+ 		goto out1;
+ 
+-	if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("fib_triestat", S_IRUGO, net->proc_net,
+ 			 &fib_triestat_fops))
+ 		goto out2;
+ 
+@@ -2594,17 +2596,21 @@ int __net_init fib_proc_init(struct net
+ 	return 0;
+ 
+ out3:
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_triestat", net->proc_net);
+ out2:
+-	remove_proc_entry("fib_trie", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("fib_trie", net->proc_net);
+ out1:
+ 	return -ENOMEM;
+ }
+ 
+ void __net_exit fib_proc_exit(struct net *net)
+ {
+-	remove_proc_entry("fib_trie", net->proc_net);
+-	remove_proc_entry("fib_triestat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("fib_trie", net->proc_net);
++		remove_proc_entry("fib_triestat", net->proc_net);
++	}
+ 	remove_proc_entry("route", net->proc_net);
+ }
+ 
+--- a/net/ipv4/proc.c
++++ b/net/ipv4/proc.c
+@@ -524,6 +524,9 @@ static __net_initdata struct pernet_oper
+ 
+ int __init ip_misc_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_proc_ops);
+ }
+ 
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -416,6 +416,9 @@ static struct pernet_operations ip_rt_pr
+ 
+ static int __init ip_rt_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_rt_proc_ops);
+ }
+ 
+--- a/ipc/msg.c
++++ b/ipc/msg.c
+@@ -1072,6 +1072,9 @@ void __init msg_init(void)
+ 	printk(KERN_INFO "msgmni has been set to %d\n",
+ 		init_ipc_ns.msg_ctlmni);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ipc_init_proc_interface("sysvipc/msg",
+ 				"       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
+ 				IPC_MSG_IDS, sysvipc_msg_proc_show);
+--- a/ipc/sem.c
++++ b/ipc/sem.c
+@@ -191,6 +191,8 @@ void sem_exit_ns(struct ipc_namespace *n
+ void __init sem_init(void)
+ {
+ 	sem_init_ns(&init_ipc_ns);
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/sem",
+ 				"       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
+ 				IPC_SEM_IDS, sysvipc_sem_proc_show);
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init);
+ 
+ void __init shm_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/shm",
+ #if BITS_PER_LONG <= 32
+ 				"       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
+--- a/ipc/util.c
++++ b/ipc/util.c
+@@ -161,6 +161,9 @@ void __init ipc_init_proc_interface(cons
+ 	struct proc_dir_entry *pde;
+ 	struct ipc_proc_iface *iface;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	iface = kmalloc(sizeof(*iface), GFP_KERNEL);
+ 	if (!iface)
+ 		return;
+--- a/net/core/net-procfs.c
++++ b/net/core/net-procfs.c
+@@ -318,10 +318,12 @@ static int __net_init dev_proc_net_init(
+ 
+ 	if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
+ 		goto out;
+-	if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("softnet_stat", S_IRUGO, net->proc_net,
+ 			 &softnet_seq_fops))
+ 		goto out_dev;
+-	if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++		!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
+ 		goto out_softnet;
+ 
+ 	if (wext_proc_init(net))
+@@ -330,9 +332,11 @@ static int __net_init dev_proc_net_init(
+ out:
+ 	return rc;
+ out_ptype:
+-	remove_proc_entry("ptype", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("ptype", net->proc_net);
+ out_softnet:
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		remove_proc_entry("softnet_stat", net->proc_net);
+ out_dev:
+ 	remove_proc_entry("dev", net->proc_net);
+ 	goto out;
+@@ -342,8 +346,10 @@ static void __net_exit dev_proc_net_exit
+ {
+ 	wext_proc_exit(net);
+ 
+-	remove_proc_entry("ptype", net->proc_net);
+-	remove_proc_entry("softnet_stat", net->proc_net);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		remove_proc_entry("ptype", net->proc_net);
++		remove_proc_entry("softnet_stat", net->proc_net);
++	}
+ 	remove_proc_entry("dev", net->proc_net);
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.18/903-debloat_direct_io.patch b/trunk/target/linux/generic/patches-3.18/903-debloat_direct_io.patch
new file mode 100644
index 00000000..c633ed1e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/903-debloat_direct_io.patch
@@ -0,0 +1,83 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -62,6 +62,11 @@ config FILE_LOCKING
+           for filesystems like NFS and for the flock() system
+           call. Disabling this option saves about 11k.
+ 
++config DIRECT_IO
++	bool "Enable O_DIRECT support" if EXPERT
++	depends on BLOCK
++	default y
++
+ source "fs/notify/Kconfig"
+ 
+ source "fs/quota/Kconfig"
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -14,7 +14,8 @@ obj-y :=	open.o read_write.o file_table.
+ 		stack.o fs_struct.o statfs.o fs_pin.o
+ 
+ ifeq ($(CONFIG_BLOCK),y)
+-obj-y +=	buffer.o block_dev.o direct-io.o mpage.o
++obj-y +=	buffer.o block_dev.o mpage.o
++obj-$(CONFIG_DIRECT_IO) += direct-io.o
+ else
+ obj-y +=	no-block.o
+ endif
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2530,12 +2530,25 @@ enum {
+ 	DIO_ASYNC_EXTEND = 0x04,
+ };
+ 
++#ifdef CONFIG_DIRECT_IO
+ void dio_end_io(struct bio *bio, int error);
+ 
+ ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
+ 	struct block_device *bdev, struct iov_iter *iter, loff_t offset,
+ 	get_block_t get_block, dio_iodone_t end_io,
+ 	dio_submit_t submit_io,	int flags);
++#else
++static inline void dio_end_io(struct bio *bio, int error)
++{
++}
++static inline ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
++	struct block_device *bdev, struct iov_iter *iter, loff_t offset,
++	get_block_t get_block, dio_iodone_t end_io,
++	dio_submit_t submit_io,	int flags)
++{
++	return -EOPNOTSUPP;
++}
++#endif
+ 
+ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
+ 		struct inode *inode, struct iov_iter *iter, loff_t offset,
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -52,8 +52,10 @@ static int setfl(int fd, struct file * f
+ 		   arg |= O_NONBLOCK;
+ 
+ 	if (arg & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!filp->f_mapping || !filp->f_mapping->a_ops ||
+ 			!filp->f_mapping->a_ops->direct_IO)
++#endif
+ 				return -EINVAL;
+ 	}
+ 
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -655,9 +655,12 @@ int open_check_o_direct(struct file *f)
+ {
+ 	/* NB: we're sure to have correct a_ops only after f_op->open */
+ 	if (f->f_flags & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!f->f_mapping->a_ops ||
+ 		    ((!f->f_mapping->a_ops->direct_IO) &&
+-		    (!f->f_mapping->a_ops->get_xip_mem))) {
++		    (!f->f_mapping->a_ops->get_xip_mem)))
++#endif
++		{
+ 			return -EINVAL;
+ 		}
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.18/910-kobject_uevent.patch b/trunk/target/linux/generic/patches-3.18/910-kobject_uevent.patch
new file mode 100644
index 00000000..f69294b4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/910-kobject_uevent.patch
@@ -0,0 +1,21 @@
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -53,6 +53,18 @@ static const char *kobject_actions[] = {
+ 	[KOBJ_OFFLINE] =	"offline",
+ };
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	mutex_lock(&uevent_sock_mutex);
++	seq = ++uevent_seqnum;
++	mutex_unlock(&uevent_sock_mutex);
++
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ /**
+  * kobject_action_type - translate action string to numeric type
+  *
diff --git a/trunk/target/linux/generic/patches-3.18/911-kobject_add_broadcast_uevent.patch b/trunk/target/linux/generic/patches-3.18/911-kobject_add_broadcast_uevent.patch
new file mode 100644
index 00000000..6e4c1402
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/911-kobject_add_broadcast_uevent.patch
@@ -0,0 +1,65 @@
+--- a/include/linux/kobject.h
++++ b/include/linux/kobject.h
+@@ -32,6 +32,8 @@
+ #define UEVENT_NUM_ENVP			32	/* number of env pointers */
+ #define UEVENT_BUFFER_SIZE		2048	/* buffer for the variables */
+ 
++struct sk_buff;
++
+ #ifdef CONFIG_UEVENT_HELPER
+ /* path to the userspace helper executed on an event */
+ extern char uevent_helper[];
+@@ -221,4 +223,7 @@ int add_uevent_var(struct kobj_uevent_en
+ int kobject_action_type(const char *buf, size_t count,
+ 			enum kobject_action *type);
+ 
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation);
++
+ #endif /* _KOBJECT_H_ */
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -424,6 +424,43 @@ int add_uevent_var(struct kobj_uevent_en
+ EXPORT_SYMBOL_GPL(add_uevent_var);
+ 
+ #if defined(CONFIG_NET)
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	struct uevent_sock *ue_sk;
++	int err = 0;
++
++	/* send netlink message */
++	mutex_lock(&uevent_sock_mutex);
++	list_for_each_entry(ue_sk, &uevent_sock_list, list) {
++		struct sock *uevent_sock = ue_sk->sk;
++		struct sk_buff *skb2;
++
++		skb2 = skb_clone(skb, allocation);
++		if (!skb2)
++			break;
++
++		err = netlink_broadcast(uevent_sock, skb2, pid, group,
++					allocation);
++		if (err)
++			break;
++	}
++	mutex_unlock(&uevent_sock_mutex);
++
++	kfree_skb(skb);
++	return err;
++}
++#else
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	kfree_skb(skb);
++	return 0;
++}
++#endif
++EXPORT_SYMBOL_GPL(broadcast_uevent);
++
++#if defined(CONFIG_NET)
+ static int uevent_net_init(struct net *net)
+ {
+ 	struct uevent_sock *ue_sk;
diff --git a/trunk/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch b/trunk/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
new file mode 100644
index 00000000..d297e3bc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
@@ -0,0 +1,12 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -962,7 +962,8 @@ static int __ref kernel_init(void *unuse
+ 		pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
+ 			execute_command, ret);
+ 	}
+-	if (!try_to_run_init_process("/sbin/init") ||
++	if (!try_to_run_init_process("/etc/preinit") ||
++	    !try_to_run_init_process("/sbin/init") ||
+ 	    !try_to_run_init_process("/etc/init") ||
+ 	    !try_to_run_init_process("/bin/init") ||
+ 	    !try_to_run_init_process("/bin/sh"))
diff --git a/trunk/target/linux/generic/patches-3.18/922-always-create-console-node-in-initramfs.patch b/trunk/target/linux/generic/patches-3.18/922-always-create-console-node-in-initramfs.patch
new file mode 100644
index 00000000..3b308dd2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/922-always-create-console-node-in-initramfs.patch
@@ -0,0 +1,30 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -59,6 +59,18 @@ default_initramfs() {
+ 	EOF
+ }
+ 
++list_librecmc_initramfs() {
++	:
++}
++
++librecmc_initramfs() {
++	# make sure that /dev/console exists
++	cat <<-EOF >> ${output}
++		dir /dev 0755 0 0
++		nod /dev/console 0600 0 0 c 5 1
++	EOF
++}
++
+ filetype() {
+ 	local argv1="$1"
+ 
+@@ -177,6 +189,8 @@ dir_filelist() {
+ 	if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
+ 		${dep_list}print_mtime "$1"
+ 
++		${dep_list}librecmc_initramfs
++
+ 		echo "${dirlist}" | \
+ 		while read x; do
+ 			${dep_list}parse ${x}
diff --git a/trunk/target/linux/generic/patches-3.18/930-crashlog.patch b/trunk/target/linux/generic/patches-3.18/930-crashlog.patch
new file mode 100644
index 00000000..b1c38a70
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/930-crashlog.patch
@@ -0,0 +1,276 @@
+--- /dev/null
++++ b/include/linux/crashlog.h
+@@ -0,0 +1,17 @@
++#ifndef __CRASHLOG_H
++#define __CRASHLOG_H
++
++#ifdef CONFIG_CRASHLOG
++void crashlog_init_bootmem(struct bootmem_data *bdata);
++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
++#else
++static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
++{
++}
++
++static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++}
++#endif
++
++#endif
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1279,6 +1279,10 @@ config RELAY
+ 
+ 	  If unsure, say N.
+ 
++config CRASHLOG
++	bool "Crash logging"
++	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !(ARM || SPARC || PPC)
++
+ config BLK_DEV_INITRD
+ 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+ 	depends on BROKEN || !FRV
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -96,6 +96,7 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
+ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
+ obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
+ obj-$(CONFIG_TORTURE_TEST) += torture.o
++obj-$(CONFIG_CRASHLOG) += crashlog.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
+--- /dev/null
++++ b/kernel/crashlog.c
+@@ -0,0 +1,181 @@
++/*
++ * Crash information logger
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ *
++ * Based on ramoops.c
++ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
++ *
++ * This program is free software; you can redistribute 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 that 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/bootmem.h>
++#include <linux/memblock.h>
++#include <linux/debugfs.h>
++#include <linux/crashlog.h>
++#include <linux/kmsg_dump.h>
++#include <linux/module.h>
++#include <linux/pfn.h>
++#include <asm/io.h>
++
++#define CRASHLOG_PAGES	4
++#define CRASHLOG_SIZE	(CRASHLOG_PAGES * PAGE_SIZE)
++#define CRASHLOG_MAGIC	0xa1eedead
++
++/*
++ * Start the log at 1M before the end of RAM, as some boot loaders like
++ * to use the end of the RAM for stack usage and other things
++ * If this fails, fall back to using the last part.
++ */
++#define CRASHLOG_OFFSET	(1024 * 1024)
++
++struct crashlog_data {
++	u32 magic;
++	u32 len;
++	u8 data[];
++};
++
++static struct debugfs_blob_wrapper crashlog_blob;
++static unsigned long crashlog_addr = 0;
++static struct crashlog_data *crashlog_buf;
++static struct kmsg_dumper dump;
++static bool first = true;
++
++extern struct list_head *crashlog_modules;
++
++#ifndef CONFIG_NO_BOOTMEM
++void __init crashlog_init_bootmem(bootmem_data_t *bdata)
++{
++	unsigned long addr;
++
++	if (crashlog_addr)
++		return;
++
++	addr = PFN_PHYS(bdata->node_low_pfn) - CRASHLOG_OFFSET;
++	if (reserve_bootmem(addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", addr);
++		bdata->node_low_pfn -= CRASHLOG_PAGES;
++		addr = PFN_PHYS(bdata->node_low_pfn);
++	}
++	crashlog_addr = addr;
++}
++#endif
++
++#ifdef CONFIG_HAVE_MEMBLOCK
++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++	if (crashlog_addr)
++		return;
++
++	addr += size - CRASHLOG_OFFSET;
++	if (memblock_reserve(addr, CRASHLOG_SIZE)) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", (unsigned long) addr);
++		return;
++	}
++
++	crashlog_addr = addr;
++}
++#endif
++
++static void __init crashlog_copy(void)
++{
++	if (crashlog_buf->magic != CRASHLOG_MAGIC)
++		return;
++
++	if (!crashlog_buf->len || crashlog_buf->len >
++	    CRASHLOG_SIZE - sizeof(*crashlog_buf))
++		return;
++
++	crashlog_blob.size = crashlog_buf->len;
++	crashlog_blob.data = kmemdup(crashlog_buf->data,
++		crashlog_buf->len, GFP_KERNEL);
++
++	debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
++}
++
++static int get_maxlen(void)
++{
++	return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
++}
++
++static void crashlog_printf(const char *fmt, ...)
++{
++	va_list args;
++	int len = get_maxlen();
++
++	if (!len)
++		return;
++
++	va_start(args, fmt);
++	crashlog_buf->len += vscnprintf(
++		&crashlog_buf->data[crashlog_buf->len],
++		len, fmt, args);
++	va_end(args);
++}
++
++static void crashlog_do_dump(struct kmsg_dumper *dumper,
++		enum kmsg_dump_reason reason)
++{
++	struct timeval tv;
++	struct module *m;
++	char *buf;
++	size_t len;
++
++	if (!first)
++		crashlog_printf("\n===================================\n");
++
++	do_gettimeofday(&tv);
++	crashlog_printf("Time: %lu.%lu\n",
++		(long)tv.tv_sec, (long)tv.tv_usec);
++
++	if (first) {
++		crashlog_printf("Modules:");
++		list_for_each_entry(m, crashlog_modules, list) {
++			crashlog_printf("\t%s@%p+%x", m->name,
++			m->module_core, m->core_size,
++			m->module_init, m->init_size);
++		}
++		crashlog_printf("\n");
++		first = false;
++	}
++
++	buf = (char *)&crashlog_buf->data[crashlog_buf->len];
++
++	kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
++
++	crashlog_buf->len += len;
++}
++
++
++int __init crashlog_init_fs(void)
++{
++	if (!crashlog_addr)
++		return -ENOMEM;
++
++	crashlog_buf = ioremap(crashlog_addr, CRASHLOG_SIZE);
++
++	crashlog_copy();
++
++	crashlog_buf->magic = CRASHLOG_MAGIC;
++	crashlog_buf->len = 0;
++
++	dump.max_reason = KMSG_DUMP_OOPS;
++	dump.dump = crashlog_do_dump;
++	kmsg_dump_register(&dump);
++
++	return 0;
++}
++module_init(crashlog_init_fs);
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -15,6 +15,7 @@
+ #include <linux/export.h>
+ #include <linux/kmemleak.h>
+ #include <linux/range.h>
++#include <linux/crashlog.h>
+ #include <linux/memblock.h>
+ #include <linux/bug.h>
+ #include <linux/io.h>
+@@ -177,6 +178,7 @@ static unsigned long __init free_all_boo
+ 	if (!bdata->node_bootmem_map)
+ 		return 0;
+ 
++	crashlog_init_bootmem(bdata);
+ 	map = bdata->node_bootmem_map;
+ 	start = bdata->node_min_pfn;
+ 	end = bdata->node_low_pfn;
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -105,6 +105,9 @@ static LIST_HEAD(modules);
+ #ifdef CONFIG_KGDB_KDB
+ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+ #endif /* CONFIG_KGDB_KDB */
++#ifdef CONFIG_CRASHLOG
++struct list_head *crashlog_modules = &modules;
++#endif
+ 
+ #ifdef CONFIG_MODULE_SIG
+ #ifdef CONFIG_MODULE_SIG_FORCE
+--- a/mm/memblock.c
++++ b/mm/memblock.c
+@@ -19,6 +19,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+ #include <linux/memblock.h>
++#include <linux/crashlog.h>
+ 
+ #include <asm-generic/sections.h>
+ #include <linux/io.h>
+@@ -477,6 +478,8 @@ static void __init_memblock memblock_ins
+ 	memblock_set_region_node(rgn, nid);
+ 	type->cnt++;
+ 	type->total_size += size;
++	if (type == &memblock.memory && idx == 0)
++		crashlog_init_memblock(base, size);
+ }
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch b/trunk/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch
new file mode 100644
index 00000000..240f15eb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/940-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1519,3 +1519,6 @@ source "drivers/crypto/Kconfig"
+ source crypto/asymmetric_keys/Kconfig
+ 
+ endif	# if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -101,6 +101,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
+ obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
+ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
+ 
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #
diff --git a/trunk/target/linux/generic/patches-3.18/941-ocf_20120127.patch b/trunk/target/linux/generic/patches-3.18/941-ocf_20120127.patch
new file mode 100644
index 00000000..cc512f83
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/941-ocf_20120127.patch
@@ -0,0 +1,166 @@
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -139,6 +139,9 @@
+  * that might otherwise be identical and have very little entropy
+  * available to them (particularly common in the embedded world).
+  *
++ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++ *      int random_input_wait(void);
++ *
+  * add_input_randomness() uses the input layer interrupt timing, as well as
+  * the event type information from the hardware.
+  *
+@@ -152,6 +155,13 @@
+  * seek times do not make for good sources of entropy, as their seek
+  * times are usually fairly consistent.
+  *
++ * random_input_words() just provides a raw block of entropy to the input
++ * pool, such as from a hardware entropy generator.
++ *
++ * random_input_wait() suspends the caller until such time as the
++ * entropy pool falls below the write threshold, and returns a count of how
++ * much entropy (in bits) is needed to sustain the pool.
++ *
+  * All of these routines try to estimate how many bits of randomness a
+  * particular randomness source.  They do this by keeping track of the
+  * first and second order deltas of the event timings.
+@@ -938,6 +948,63 @@ void add_disk_randomness(struct gendisk
+ EXPORT_SYMBOL_GPL(add_disk_randomness);
+ #endif
+ 
++/*
++ * random_input_words - add bulk entropy to pool
++ *
++ * @buf: buffer to add
++ * @wordcount: number of __u32 words to add
++ * @ent_count: total amount of entropy (in bits) to credit
++ *
++ * this provides bulk input of entropy to the input pool
++ *
++ */
++void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++{
++	mix_pool_bytes(&input_pool, buf, wordcount*4);
++
++	credit_entropy_bits(&input_pool, ent_count);
++
++	pr_notice("crediting %d bits => %d\n",
++		  ent_count, input_pool.entropy_count);
++	/*
++	 * Wake up waiting processes if we have enough
++	 * entropy.
++	 */
++	if (input_pool.entropy_count >= random_read_wakeup_bits)
++		wake_up_interruptible(&random_read_wait);
++}
++EXPORT_SYMBOL(random_input_words);
++
++/*
++ * random_input_wait - wait until random needs entropy
++ *
++ * this function sleeps until the /dev/random subsystem actually
++ * needs more entropy, and then return the amount of entropy
++ * that it would be nice to have added to the system.
++ */
++int random_input_wait(void)
++{
++	int count;
++
++	wait_event_interruptible(random_write_wait, 
++			 input_pool.entropy_count < random_write_wakeup_bits);
++
++	count = random_write_wakeup_bits - input_pool.entropy_count;
++
++        /* likely we got woken up due to a signal */
++	if (count <= 0) count = random_read_wakeup_bits; 
++
++	pr_notice("requesting %d bits from input_wait()er %d<%d\n",
++		  count,
++		  input_pool.entropy_count, random_write_wakeup_bits);
++
++	return count;
++}
++EXPORT_SYMBOL(random_input_wait);
++
++
++#define EXTRACT_SIZE 10
++
+ /*********************************************************************
+  *
+  * Entropy extraction routines
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -140,6 +140,7 @@ pid_t f_getown(struct file *filp)
+ 	read_unlock(&filp->f_owner.lock);
+ 	return pid;
+ }
++EXPORT_SYMBOL(sys_dup);
+ 
+ static int f_setown_ex(struct file *filp, unsigned long arg)
+ {
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -19,6 +19,7 @@
+ #define APOLLO_MOUSE_MINOR	7	/* unused */
+ #define PC110PAD_MINOR		9	/* unused */
+ /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
++#define CRYPTODEV_MINOR		70	/* /dev/crypto */
+ #define WATCHDOG_MINOR		130	/* Watchdog timer     */
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+--- a/include/uapi/linux/random.h
++++ b/include/uapi/linux/random.h
+@@ -34,6 +34,30 @@
+ /* Clear the entropy pool and associated counters.  (Superuser only.) */
+ #define RNDCLEARPOOL	_IO( 'R', 0x06 )
+ 
++#ifdef CONFIG_FIPS_RNG
++
++/* Size of seed value - equal to AES blocksize */
++#define AES_BLOCK_SIZE_BYTES	16
++#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
++/* Size of AES key */
++#define KEY_SIZE_BYTES		16
++
++/* ioctl() structure used by FIPS 140-2 Tests */
++struct rand_fips_test {
++	unsigned char key[KEY_SIZE_BYTES];			/* Input */
++	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
++	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
++	unsigned char result[SEED_SIZE_BYTES];		/* Output */
++};
++
++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
++#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
++
++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
++#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
++
++#endif /* #ifdef CONFIG_FIPS_RNG */
++
+ struct rand_pool_info {
+ 	int	entropy_count;
+ 	int	buf_size;
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -13,6 +13,10 @@ extern void add_input_randomness(unsigne
+ 				 unsigned int value);
+ extern void add_interrupt_randomness(int irq, int irq_flags);
+ 
++extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
++extern int random_input_wait(void);
++#define HAS_RANDOM_INPUT_WAIT 1
++
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -425,6 +425,7 @@ void transfer_pid(struct task_struct *ol
+ 	new->pids[type].pid = old->pids[type].pid;
+ 	hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
diff --git a/trunk/target/linux/generic/patches-3.18/960-decompress_unlzo_fix.patch b/trunk/target/linux/generic/patches-3.18/960-decompress_unlzo_fix.patch
new file mode 100644
index 00000000..ee7c118e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/960-decompress_unlzo_fix.patch
@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/include/linux/decompress/unlzo_mm.h
+@@ -0,0 +1,10 @@
++#ifndef UNLZO_MM_H
++#define UNLZO_MM_H
++
++#ifdef STATIC
++#define INIT
++#else
++#define INIT __init
++#endif
++
++#endif
+--- a/lib/decompress_unlzo.c
++++ b/lib/decompress_unlzo.c
+@@ -38,6 +38,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/lzo.h>
++#include <linux/decompress/unlzo_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #include <linux/compiler.h>
diff --git a/trunk/target/linux/generic/patches-3.18/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/trunk/target/linux/generic/patches-3.18/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 00000000..ac13c9e6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/970-remove-unsane-filenames-from-deps_initramfs-list.patch
@@ -0,0 +1,29 @@
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data
+ 	include $(obj)/.initramfs_data.cpio.d
+ endif
+ 
++deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
++
+ quiet_cmd_initfs = GEN     $@
+       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+ 
+@@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra
+ 	initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
+ 	initramfs_data.cpio
+ # do not try to update files included in initramfs
+-$(deps_initramfs): ;
++$(deps_initramfs_sane): ;
+ 
+-$(deps_initramfs): klibcdirs
++$(deps_initramfs_sane): klibcdirs
+ # We rebuild initramfs_data.cpio if:
+ # 1) Any included file is newer then initramfs_data.cpio
+ # 2) There are changes in which files are included (added or deleted)
+ # 3) If gen_init_cpio are newer than initramfs_data.cpio
+ # 4) arguments to gen_initramfs.sh changes
+-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
++$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
+ 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
+ 	$(call if_changed,initfs)
diff --git a/trunk/target/linux/generic/patches-3.18/980-arm_openwrt_machtypes.patch b/trunk/target/linux/generic/patches-3.18/980-arm_openwrt_machtypes.patch
new file mode 100644
index 00000000..8303344b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/980-arm_openwrt_machtypes.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1007,3 +1007,29 @@ eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572
+ eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573
+ domotab			MACH_DOMOTAB		DOMOTAB			4574
+ pfla03			MACH_PFLA03		PFLA03			4575
++#
++# Additional mach-types supported by libreCMC
++#
++wg302v1			MACH_WG302V1		WG302V1			889
++pronghorn		MACH_PRONGHORN		PRONGHORN		928
++pronghorn_metro		MACH_PRONGHORNMETRO	PRONGHORNMETRO		1040
++sidewinder		MACH_SIDEWINDER		SIDEWINDER		1041
++wrt300nv2		MACH_WRT300NV2		WRT300NV2		1077
++compex42x		MACH_COMPEXWP18		COMPEXWP18		1273
++goldfish		MACH_GOLDFISH		GOLDFISH		1441
++cambria			MACH_CAMBRIA		CAMBRIA			1468
++dt2			MACH_DT2		DT2			1514
++ap1000			MACH_AP1000		AP1000			1543
++tw2662			MACH_TW2662		TW2662			1658
++tw5334			MACH_TW5334		TW5334			1664
++usr8200			MACH_USR8200		USR8200			1762
++mi424wr			MACH_MI424WR		MI424WR			1778
++gw2388			MACH_GW2388		GW2388			2635
++iconnect		MACH_ICONNECT		ICONNECT		2870
++nsb3ast			MACH_NSB3AST		NSB3AST			2917
++goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089
++nas6210			MACH_NAS6210		NAS6210			3104
++ns_k330			MACH_NS_K330		NS_K330			3108
++bcm2708			MACH_BCM2708		BCM2708			3138
++wn802t			MACH_WN802T		WN802T			3306
++nsa310			MACH_NSA310		NSA310			4022
diff --git a/trunk/target/linux/generic/patches-3.18/990-gpio_wdt.patch b/trunk/target/linux/generic/patches-3.18/990-gpio_wdt.patch
new file mode 100644
index 00000000..0d8d862e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/990-gpio_wdt.patch
@@ -0,0 +1,360 @@
+This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
+
+Signed-off-by: Mathias Adam <m.adam--librecmc@adamis.de>
+
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -1139,6 +1139,15 @@ config WDT_MTX1
+ 	  Hardware driver for the MTX-1 boards. This is a watchdog timer that
+ 	  will reboot the machine after a 100 seconds timer expired.
+ 
++config GPIO_WDT
++	tristate "GPIO Hardware Watchdog"
++ 	help
++	  Hardware driver for GPIO-controlled watchdogs. GPIO pin and
++	  toggle interval settings are platform-specific. The driver
++	  will stop toggling the GPIO (i.e. machine reboots) after a
++	  100 second timer expired and no process has written to
++	  /dev/watchdog during that time.
++
+ config PNX833X_WDT
+ 	tristate "PNX833x Hardware Watchdog"
+ 	depends on SOC_PNX8335
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -134,6 +134,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
+ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
++obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o
+ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
+ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
+ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+--- /dev/null
++++ b/drivers/watchdog/old_gpio_wdt.c
+@@ -0,0 +1,301 @@
++/*
++ *      Driver for GPIO-controlled Hardware Watchdogs.
++ *
++ *      Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *      Replaces mtx1_wdt (driver for the MTX-1 Watchdog):
++ *
++ *      (C) Copyright 2005 4G Systems <info@4g-systems.biz>,
++ *                              All Rights Reserved.
++ *                              http://www.4g-systems.biz
++ *
++ *      (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
++ *
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ *
++ *      Neither Michael Stickel nor 4G Systems admit liability nor provide
++ *      warranty for any of this software. This material is provided
++ *      "AS-IS" and at no charge.
++ *
++ *      (c) Copyright 2005    4G Systems <info@4g-systems.biz>
++ *
++ *      Release 0.01.
++ *      Author: Michael Stickel  michael.stickel@4g-systems.biz
++ *
++ *      Release 0.02.
++ *      Author: Florian Fainelli florian@openwrt.org
++ *              use the Linux watchdog/timer APIs
++ *
++ *      Release 0.03.
++ *      Author: Mathias Adam <m.adam--linux@adamis.de>
++ *              make it a generic gpio watchdog driver
++ *
++ *      The Watchdog is configured to reset the MTX-1
++ *      if it is not triggered for 100 seconds.
++ *      It should not be triggered more often than 1.6 seconds.
++ *
++ *      A timer triggers the watchdog every 5 seconds, until
++ *      it is opened for the first time. After the first open
++ *      it MUST be triggered every 2..95 seconds.
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/miscdevice.h>
++#include <linux/fs.h>
++#include <linux/init.h>
++#include <linux/ioport.h>
++#include <linux/timer.h>
++#include <linux/completion.h>
++#include <linux/jiffies.h>
++#include <linux/watchdog.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/uaccess.h>
++#include <linux/gpio.h>
++#include <linux/old_gpio_wdt.h>
++
++static int ticks = 100 * HZ;
++
++static struct {
++	struct completion stop;
++	spinlock_t lock;
++	int running;
++	struct timer_list timer;
++	int queue;
++	int default_ticks;
++	unsigned long inuse;
++	unsigned gpio;
++	unsigned int gstate;
++	int interval;
++	int first_interval;
++} gpio_wdt_device;
++
++static void gpio_wdt_trigger(unsigned long unused)
++{
++	spin_lock(&gpio_wdt_device.lock);
++	if (gpio_wdt_device.running && ticks > 0)
++		ticks -= gpio_wdt_device.interval;
++
++	/* toggle wdt gpio */
++	gpio_wdt_device.gstate = !gpio_wdt_device.gstate;
++	gpio_set_value(gpio_wdt_device.gpio, gpio_wdt_device.gstate);
++
++	if (gpio_wdt_device.queue && ticks > 0)
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.interval);
++	else
++		complete(&gpio_wdt_device.stop);
++	spin_unlock(&gpio_wdt_device.lock);
++}
++
++static void gpio_wdt_reset(void)
++{
++	ticks = gpio_wdt_device.default_ticks;
++}
++
++
++static void gpio_wdt_start(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (!gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 1;
++		gpio_wdt_device.gstate = 1;
++		gpio_set_value(gpio_wdt_device.gpio, 1);
++		mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.first_interval);
++	}
++	gpio_wdt_device.running++;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++}
++
++static int gpio_wdt_stop(void)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&gpio_wdt_device.lock, flags);
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		gpio_wdt_device.gstate = 0;
++		gpio_set_value(gpio_wdt_device.gpio, 0);
++	}
++	ticks = gpio_wdt_device.default_ticks;
++	spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
++	return 0;
++}
++
++/* Filesystem functions */
++
++static int gpio_wdt_open(struct inode *inode, struct file *file)
++{
++	if (test_and_set_bit(0, &gpio_wdt_device.inuse))
++		return -EBUSY;
++	return nonseekable_open(inode, file);
++}
++
++
++static int gpio_wdt_release(struct inode *inode, struct file *file)
++{
++	clear_bit(0, &gpio_wdt_device.inuse);
++	return 0;
++}
++
++static long gpio_wdt_ioctl(struct file *file, unsigned int cmd,
++							unsigned long arg)
++{
++	void __user *argp = (void __user *)arg;
++	int __user *p = (int __user *)argp;
++	unsigned int value;
++	static const struct watchdog_info ident = {
++		.options = WDIOF_CARDRESET,
++		.identity = "GPIO WDT",
++	};
++
++	switch (cmd) {
++	case WDIOC_GETSUPPORT:
++		if (copy_to_user(argp, &ident, sizeof(ident)))
++			return -EFAULT;
++		break;
++	case WDIOC_GETSTATUS:
++	case WDIOC_GETBOOTSTATUS:
++		put_user(0, p);
++		break;
++	case WDIOC_SETOPTIONS:
++		if (get_user(value, p))
++			return -EFAULT;
++		if (value & WDIOS_ENABLECARD)
++			gpio_wdt_start();
++		else if (value & WDIOS_DISABLECARD)
++			gpio_wdt_stop();
++		else
++			return -EINVAL;
++		return 0;
++	case WDIOC_KEEPALIVE:
++		gpio_wdt_reset();
++		break;
++	default:
++		return -ENOTTY;
++	}
++	return 0;
++}
++
++
++static ssize_t gpio_wdt_write(struct file *file, const char *buf,
++						size_t count, loff_t *ppos)
++{
++	if (!count)
++		return -EIO;
++	gpio_wdt_reset();
++	return count;
++}
++
++static const struct file_operations gpio_wdt_fops = {
++	.owner		= THIS_MODULE,
++	.llseek		= no_llseek,
++	.unlocked_ioctl	= gpio_wdt_ioctl,
++	.open		= gpio_wdt_open,
++	.write		= gpio_wdt_write,
++	.release	= gpio_wdt_release,
++};
++
++
++static struct miscdevice gpio_wdt_misc = {
++	.minor	= WATCHDOG_MINOR,
++	.name	= "watchdog",
++	.fops	= &gpio_wdt_fops,
++};
++
++
++static int gpio_wdt_probe(struct platform_device *pdev)
++{
++	int ret;
++	struct gpio_wdt_platform_data *gpio_wdt_data = pdev->dev.platform_data;
++
++	gpio_wdt_device.gpio = gpio_wdt_data->gpio;
++	gpio_wdt_device.interval = gpio_wdt_data->interval;
++	gpio_wdt_device.first_interval = gpio_wdt_data->first_interval;
++	if (gpio_wdt_device.first_interval <= 0) {
++		gpio_wdt_device.first_interval = gpio_wdt_device.interval;
++	}
++
++	ret = gpio_request(gpio_wdt_device.gpio, "gpio-wdt");
++	if (ret < 0) {
++		dev_err(&pdev->dev, "failed to request gpio");
++		return ret;
++	}
++
++	spin_lock_init(&gpio_wdt_device.lock);
++	init_completion(&gpio_wdt_device.stop);
++	gpio_wdt_device.queue = 0;
++	clear_bit(0, &gpio_wdt_device.inuse);
++	setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
++	gpio_wdt_device.default_ticks = ticks;
++
++	gpio_wdt_start();
++	dev_info(&pdev->dev, "GPIO Hardware Watchdog driver (gpio=%i interval=%i/%i)\n",
++		gpio_wdt_data->gpio, gpio_wdt_data->first_interval, gpio_wdt_data->interval);
++	return 0;
++}
++
++static int gpio_wdt_remove(struct platform_device *pdev)
++{
++	/* FIXME: do we need to lock this test ? */
++	if (gpio_wdt_device.queue) {
++		gpio_wdt_device.queue = 0;
++		wait_for_completion(&gpio_wdt_device.stop);
++	}
++
++	gpio_free(gpio_wdt_device.gpio);
++	misc_deregister(&gpio_wdt_misc);
++	return 0;
++}
++
++static struct platform_driver gpio_wdt_driver = {
++	.probe = gpio_wdt_probe,
++	.remove = gpio_wdt_remove,
++	.driver.name = "gpio-wdt",
++	.driver.owner = THIS_MODULE,
++};
++
++static int __init gpio_wdt_init(void)
++{
++	return platform_driver_register(&gpio_wdt_driver);
++}
++arch_initcall(gpio_wdt_init);
++
++/*
++ * We do wdt initialization in two steps: arch_initcall probes the wdt
++ * very early to start pinging the watchdog (misc devices are not yet
++ * available), and later module_init() just registers the misc device.
++ */
++static int gpio_wdt_init_late(void)
++{
++	int ret;
++
++	ret = misc_register(&gpio_wdt_misc);
++	if (ret < 0) {
++		pr_err("GPIO_WDT: failed to register misc device\n");
++		return ret;
++	}
++	return 0;
++}
++#ifndef MODULE
++module_init(gpio_wdt_init_late);
++#endif
++
++static void __exit gpio_wdt_exit(void)
++{
++	platform_driver_unregister(&gpio_wdt_driver);
++}
++module_exit(gpio_wdt_exit);
++
++MODULE_AUTHOR("Michael Stickel, Florian Fainelli, Mathias Adam");
++MODULE_DESCRIPTION("Driver for GPIO hardware watchdogs");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
++MODULE_ALIAS("platform:gpio-wdt");
+--- /dev/null
++++ b/include/linux/old_gpio_wdt.h
+@@ -0,0 +1,21 @@
++/*
++ *  Definitions for the GPIO watchdog driver
++ *
++ *  Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ *
++ */
++
++#ifndef _GPIO_WDT_H_
++#define _GPIO_WDT_H_
++
++struct gpio_wdt_platform_data {
++	int	gpio;		/* GPIO line number */
++	int	interval;	/* watchdog reset interval in system ticks */
++	int	first_interval;	/* first wd reset interval in system ticks */
++};
++
++#endif /* _GPIO_WDT_H_ */
diff --git a/trunk/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch b/trunk/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
new file mode 100644
index 00000000..572e280c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -903,6 +903,9 @@ int __init early_init_dt_scan_chosen(uns
+ 	p = of_get_flat_dt_prop(node, "bootargs", &l);
+ 	if (p != NULL && l > 0)
+ 		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
++	p = of_get_flat_dt_prop(node, "bootargs-append", &l);
++	if (p != NULL && l > 0)
++		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
+ 
+ 	/*
+ 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
diff --git a/trunk/target/linux/generic/patches-3.18/998-enable_wilink_platform_without_drivers.patch b/trunk/target/linux/generic/patches-3.18/998-enable_wilink_platform_without_drivers.patch
new file mode 100644
index 00000000..d317de11
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.18/998-enable_wilink_platform_without_drivers.patch
@@ -0,0 +1,15 @@
+We use backports for driver updates - make sure we can compile in the glue code regardless
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+
+--- a/drivers/net/wireless/ti/Kconfig
++++ b/drivers/net/wireless/ti/Kconfig
+@@ -15,7 +15,7 @@ source "drivers/net/wireless/ti/wlcore/K
+ 
+ config WILINK_PLATFORM_DATA
+ 	bool "TI WiLink platform data"
+-	depends on WLCORE_SDIO || WL1251_SDIO
++	depends on WLCORE_SDIO || WL1251_SDIO || ARCH_OMAP2PLUS
+ 	default y
+ 	---help---
+ 	Small platform data bit needed to pass data to the sdio modules.
diff --git a/trunk/target/linux/generic/patches-3.3/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch b/trunk/target/linux/generic/patches-3.3/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
new file mode 100644
index 00000000..07061b0b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
@@ -0,0 +1,250 @@
+From 455bd4c430b0c0a361f38e8658a0d6cb469942b5 Mon Sep 17 00:00:00 2001
+From: Ivan Djelic <ivan.djelic@parrot.com>
+Date: Wed, 6 Mar 2013 20:09:27 +0100
+Subject: [PATCH] ARM: 7668/1: fix memset-related crashes caused by recent GCC
+ (4.7.2) optimizations
+
+Recent GCC versions (e.g. GCC-4.7.2) perform optimizations based on
+assumptions about the implementation of memset and similar functions.
+The current ARM optimized memset code does not return the value of
+its first argument, as is usually expected from standard implementations.
+
+For instance in the following function:
+
+void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
+{
+	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
+	waiter->magic = waiter;
+	INIT_LIST_HEAD(&waiter->list);
+}
+
+compiled as:
+
+800554d0 <debug_mutex_lock_common>:
+800554d0:       e92d4008        push    {r3, lr}
+800554d4:       e1a00001        mov     r0, r1
+800554d8:       e3a02010        mov     r2, #16 ; 0x10
+800554dc:       e3a01011        mov     r1, #17 ; 0x11
+800554e0:       eb04426e        bl      80165ea0 <memset>
+800554e4:       e1a03000        mov     r3, r0
+800554e8:       e583000c        str     r0, [r3, #12]
+800554ec:       e5830000        str     r0, [r3]
+800554f0:       e5830004        str     r0, [r3, #4]
+800554f4:       e8bd8008        pop     {r3, pc}
+
+GCC assumes memset returns the value of pointer 'waiter' in register r0; causing
+register/memory corruptions.
+
+This patch fixes the return value of the assembly version of memset.
+It adds a 'mov' instruction and merges an additional load+store into
+existing load/store instructions.
+For ease of review, here is a breakdown of the patch into 4 simple steps:
+
+Step 1
+======
+Perform the following substitutions:
+ip -> r8, then
+r0 -> ip,
+and insert 'mov ip, r0' as the first statement of the function.
+At this point, we have a memset() implementation returning the proper result,
+but corrupting r8 on some paths (the ones that were using ip).
+
+Step 2
+======
+Make sure r8 is saved and restored when (! CALGN(1)+0) == 1:
+
+save r8:
+-       str     lr, [sp, #-4]!
++       stmfd   sp!, {r8, lr}
+
+and restore r8 on both exit paths:
+-       ldmeqfd sp!, {pc}               @ Now <64 bytes to go.
++       ldmeqfd sp!, {r8, pc}           @ Now <64 bytes to go.
+(...)
+        tst     r2, #16
+        stmneia ip!, {r1, r3, r8, lr}
+-       ldr     lr, [sp], #4
++       ldmfd   sp!, {r8, lr}
+
+Step 3
+======
+Make sure r8 is saved and restored when (! CALGN(1)+0) == 0:
+
+save r8:
+-       stmfd   sp!, {r4-r7, lr}
++       stmfd   sp!, {r4-r8, lr}
+
+and restore r8 on both exit paths:
+        bgt     3b
+-       ldmeqfd sp!, {r4-r7, pc}
++       ldmeqfd sp!, {r4-r8, pc}
+(...)
+        tst     r2, #16
+        stmneia ip!, {r4-r7}
+-       ldmfd   sp!, {r4-r7, lr}
++       ldmfd   sp!, {r4-r8, lr}
+
+Step 4
+======
+Rewrite register list "r4-r7, r8" as "r4-r8".
+
+Signed-off-by: Ivan Djelic <ivan.djelic@parrot.com>
+Reviewed-by: Nicolas Pitre <nico@linaro.org>
+Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/lib/memset.S | 85 ++++++++++++++++++++++++++-------------------------
+ 1 file changed, 44 insertions(+), 41 deletions(-)
+
+--- a/arch/arm/lib/memset.S
++++ b/arch/arm/lib/memset.S
+@@ -19,9 +19,9 @@
+ 1:	subs	r2, r2, #4		@ 1 do we have enough
+ 	blt	5f			@ 1 bytes to align with?
+ 	cmp	r3, #2			@ 1
+-	strltb	r1, [r0], #1		@ 1
+-	strleb	r1, [r0], #1		@ 1
+-	strb	r1, [r0], #1		@ 1
++	strltb	r1, [ip], #1		@ 1
++	strleb	r1, [ip], #1		@ 1
++	strb	r1, [ip], #1		@ 1
+ 	add	r2, r2, r3		@ 1 (r2 = r2 - (4 - r3))
+ /*
+  * The pointer is now aligned and the length is adjusted.  Try doing the
+@@ -29,10 +29,14 @@
+  */
+ 
+ ENTRY(memset)
+-	ands	r3, r0, #3		@ 1 unaligned?
++/*
++ * Preserve the contents of r0 for the return value.
++ */
++	mov	ip, r0
++	ands	r3, ip, #3		@ 1 unaligned?
+ 	bne	1b			@ 1
+ /*
+- * we know that the pointer in r0 is aligned to a word boundary.
++ * we know that the pointer in ip is aligned to a word boundary.
+  */
+ 	orr	r1, r1, r1, lsl #8
+ 	orr	r1, r1, r1, lsl #16
+@@ -43,29 +47,28 @@ ENTRY(memset)
+ #if ! CALGN(1)+0
+ 
+ /*
+- * We need an extra register for this loop - save the return address and
+- * use the LR
++ * We need 2 extra registers for this loop - use r8 and the LR
+  */
+-	str	lr, [sp, #-4]!
+-	mov	ip, r1
++	stmfd	sp!, {r8, lr}
++	mov	r8, r1
+ 	mov	lr, r1
+ 
+ 2:	subs	r2, r2, #64
+-	stmgeia	r0!, {r1, r3, ip, lr}	@ 64 bytes at a time.
+-	stmgeia	r0!, {r1, r3, ip, lr}
+-	stmgeia	r0!, {r1, r3, ip, lr}
+-	stmgeia	r0!, {r1, r3, ip, lr}
++	stmgeia	ip!, {r1, r3, r8, lr}	@ 64 bytes at a time.
++	stmgeia	ip!, {r1, r3, r8, lr}
++	stmgeia	ip!, {r1, r3, r8, lr}
++	stmgeia	ip!, {r1, r3, r8, lr}
+ 	bgt	2b
+-	ldmeqfd	sp!, {pc}		@ Now <64 bytes to go.
++	ldmeqfd	sp!, {r8, pc}		@ Now <64 bytes to go.
+ /*
+  * No need to correct the count; we're only testing bits from now on
+  */
+ 	tst	r2, #32
+-	stmneia	r0!, {r1, r3, ip, lr}
+-	stmneia	r0!, {r1, r3, ip, lr}
++	stmneia	ip!, {r1, r3, r8, lr}
++	stmneia	ip!, {r1, r3, r8, lr}
+ 	tst	r2, #16
+-	stmneia	r0!, {r1, r3, ip, lr}
+-	ldr	lr, [sp], #4
++	stmneia	ip!, {r1, r3, r8, lr}
++	ldmfd	sp!, {r8, lr}
+ 
+ #else
+ 
+@@ -74,54 +77,54 @@ ENTRY(memset)
+  * whole cache lines at once.
+  */
+ 
+-	stmfd	sp!, {r4-r7, lr}
++	stmfd	sp!, {r4-r8, lr}
+ 	mov	r4, r1
+ 	mov	r5, r1
+ 	mov	r6, r1
+ 	mov	r7, r1
+-	mov	ip, r1
++	mov	r8, r1
+ 	mov	lr, r1
+ 
+ 	cmp	r2, #96
+-	tstgt	r0, #31
++	tstgt	ip, #31
+ 	ble	3f
+ 
+-	and	ip, r0, #31
+-	rsb	ip, ip, #32
+-	sub	r2, r2, ip
+-	movs	ip, ip, lsl #(32 - 4)
+-	stmcsia	r0!, {r4, r5, r6, r7}
+-	stmmiia	r0!, {r4, r5}
+-	tst	ip, #(1 << 30)
+-	mov	ip, r1
+-	strne	r1, [r0], #4
++	and	r8, ip, #31
++	rsb	r8, r8, #32
++	sub	r2, r2, r8
++	movs	r8, r8, lsl #(32 - 4)
++	stmcsia	ip!, {r4, r5, r6, r7}
++	stmmiia	ip!, {r4, r5}
++	tst	r8, #(1 << 30)
++	mov	r8, r1
++	strne	r1, [ip], #4
+ 
+ 3:	subs	r2, r2, #64
+-	stmgeia	r0!, {r1, r3-r7, ip, lr}
+-	stmgeia	r0!, {r1, r3-r7, ip, lr}
++	stmgeia	ip!, {r1, r3-r8, lr}
++	stmgeia	ip!, {r1, r3-r8, lr}
+ 	bgt	3b
+-	ldmeqfd	sp!, {r4-r7, pc}
++	ldmeqfd	sp!, {r4-r8, pc}
+ 
+ 	tst	r2, #32
+-	stmneia	r0!, {r1, r3-r7, ip, lr}
++	stmneia	ip!, {r1, r3-r8, lr}
+ 	tst	r2, #16
+-	stmneia	r0!, {r4-r7}
+-	ldmfd	sp!, {r4-r7, lr}
++	stmneia	ip!, {r4-r7}
++	ldmfd	sp!, {r4-r8, lr}
+ 
+ #endif
+ 
+ 4:	tst	r2, #8
+-	stmneia	r0!, {r1, r3}
++	stmneia	ip!, {r1, r3}
+ 	tst	r2, #4
+-	strne	r1, [r0], #4
++	strne	r1, [ip], #4
+ /*
+  * When we get here, we've got less than 4 bytes to zero.  We
+  * may have an unaligned pointer as well.
+  */
+ 5:	tst	r2, #2
+-	strneb	r1, [r0], #1
+-	strneb	r1, [r0], #1
++	strneb	r1, [ip], #1
++	strneb	r1, [ip], #1
+ 	tst	r2, #1
+-	strneb	r1, [r0], #1
++	strneb	r1, [ip], #1
+ 	mov	pc, lr
+ ENDPROC(memset)
diff --git a/trunk/target/linux/generic/patches-3.3/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch b/trunk/target/linux/generic/patches-3.3/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
new file mode 100644
index 00000000..266e507e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
@@ -0,0 +1,78 @@
+From 418df63adac56841ef6b0f1fcf435bc64d4ed177 Mon Sep 17 00:00:00 2001
+From: Nicolas Pitre <nicolas.pitre@linaro.org>
+Date: Tue, 12 Mar 2013 13:00:42 +0100
+Subject: [PATCH] ARM: 7670/1: fix the memset fix
+
+Commit 455bd4c430b0 ("ARM: 7668/1: fix memset-related crashes caused by
+recent GCC (4.7.2) optimizations") attempted to fix a compliance issue
+with the memset return value.  However the memset itself became broken
+by that patch for misaligned pointers.
+
+This fixes the above by branching over the entry code from the
+misaligned fixup code to avoid reloading the original pointer.
+
+Also, because the function entry alignment is wrong in the Thumb mode
+compilation, that fixup code is moved to the end.
+
+While at it, the entry instructions are slightly reworked to help dual
+issue pipelines.
+
+Signed-off-by: Nicolas Pitre <nico@linaro.org>
+Tested-by: Alexander Holler <holler@ahsoftware.de>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/lib/memset.S | 33 +++++++++++++--------------------
+ 1 file changed, 13 insertions(+), 20 deletions(-)
+
+--- a/arch/arm/lib/memset.S
++++ b/arch/arm/lib/memset.S
+@@ -14,31 +14,15 @@
+ 
+ 	.text
+ 	.align	5
+-	.word	0
+-
+-1:	subs	r2, r2, #4		@ 1 do we have enough
+-	blt	5f			@ 1 bytes to align with?
+-	cmp	r3, #2			@ 1
+-	strltb	r1, [ip], #1		@ 1
+-	strleb	r1, [ip], #1		@ 1
+-	strb	r1, [ip], #1		@ 1
+-	add	r2, r2, r3		@ 1 (r2 = r2 - (4 - r3))
+-/*
+- * The pointer is now aligned and the length is adjusted.  Try doing the
+- * memset again.
+- */
+ 
+ ENTRY(memset)
+-/*
+- * Preserve the contents of r0 for the return value.
+- */
+-	mov	ip, r0
+-	ands	r3, ip, #3		@ 1 unaligned?
+-	bne	1b			@ 1
++	ands	r3, r0, #3		@ 1 unaligned?
++	mov	ip, r0			@ preserve r0 as return value
++	bne	6f			@ 1
+ /*
+  * we know that the pointer in ip is aligned to a word boundary.
+  */
+-	orr	r1, r1, r1, lsl #8
++1:	orr	r1, r1, r1, lsl #8
+ 	orr	r1, r1, r1, lsl #16
+ 	mov	r3, r1
+ 	cmp	r2, #16
+@@ -127,4 +111,13 @@ ENTRY(memset)
+ 	tst	r2, #1
+ 	strneb	r1, [ip], #1
+ 	mov	pc, lr
++
++6:	subs	r2, r2, #4		@ 1 do we have enough
++	blt	5b			@ 1 bytes to align with?
++	cmp	r3, #2			@ 1
++	strltb	r1, [ip], #1		@ 1
++	strleb	r1, [ip], #1		@ 1
++	strb	r1, [ip], #1		@ 1
++	add	r2, r2, r3		@ 1 (r2 = r2 - (4 - r3))
++	b	1b
+ ENDPROC(memset)
diff --git a/trunk/target/linux/generic/patches-3.3/003-MIPS-Refactor-clear_page-and-copy_page-functions.patch b/trunk/target/linux/generic/patches-3.3/003-MIPS-Refactor-clear_page-and-copy_page-functions.patch
new file mode 100644
index 00000000..da85701a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/003-MIPS-Refactor-clear_page-and-copy_page-functions.patch
@@ -0,0 +1,249 @@
+From c022630633624a75b3b58f43dd3c6cc896a56cff Mon Sep 17 00:00:00 2001
+From: "Steven J. Hill" <sjhill@mips.com>
+Date: Fri, 6 Jul 2012 21:56:01 +0200
+Subject: [PATCH] MIPS: Refactor 'clear_page' and 'copy_page' functions.
+
+Remove usage of the '__attribute__((alias("...")))' hack that aliased
+to integer arrays containing micro-assembled instructions. This hack
+breaks when building a microMIPS kernel. It also makes the code much
+easier to understand.
+
+[ralf@linux-mips.org: Added back export of the clear_page and copy_page
+symbols so certain modules will work again.  Also fixed build with
+CONFIG_SIBYTE_DMA_PAGEOPS enabled.]
+
+Signed-off-by: Steven J. Hill <sjhill@mips.com>
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/3866/
+Acked-by: David Daney <david.daney@cavium.com>
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ arch/mips/kernel/mips_ksyms.c |    8 ++++-
+ arch/mips/mm/Makefile         |    4 +--
+ arch/mips/mm/page-funcs.S     |   50 ++++++++++++++++++++++++++++++
+ arch/mips/mm/page.c           |   67 +++++++++++------------------------------
+ 4 files changed, 77 insertions(+), 52 deletions(-)
+ create mode 100644 arch/mips/mm/page-funcs.S
+
+--- a/arch/mips/kernel/mips_ksyms.c
++++ b/arch/mips/kernel/mips_ksyms.c
+@@ -5,7 +5,7 @@
+  * License.  See the file "COPYING" in the main directory of this archive
+  * for more details.
+  *
+- * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05 by Ralf Baechle
++ * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05, 12 by Ralf Baechle
+  * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc.
+  */
+ #include <linux/interrupt.h>
+@@ -35,6 +35,12 @@ EXPORT_SYMBOL(memmove);
+ EXPORT_SYMBOL(kernel_thread);
+ 
+ /*
++ * Functions that operate on entire pages.  Mostly used by memory management.
++ */
++EXPORT_SYMBOL(clear_page);
++EXPORT_SYMBOL(copy_page);
++
++/*
+  * Userspace access stuff.
+  */
+ EXPORT_SYMBOL(__copy_user);
+--- a/arch/mips/mm/Makefile
++++ b/arch/mips/mm/Makefile
+@@ -3,8 +3,8 @@
+ #
+ 
+ obj-y				+= cache.o dma-default.o extable.o fault.o \
+-				   gup.o init.o mmap.o page.o tlbex.o \
+-				   tlbex-fault.o uasm.o
++				   gup.o init.o mmap.o page.o page-funcs.o \
++				   tlbex.o tlbex-fault.o uasm.o
+ 
+ obj-$(CONFIG_32BIT)		+= ioremap.o pgtable-32.o
+ obj-$(CONFIG_64BIT)		+= pgtable-64.o
+--- /dev/null
++++ b/arch/mips/mm/page-funcs.S
+@@ -0,0 +1,50 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Micro-assembler generated clear_page/copy_page functions.
++ *
++ * Copyright (C) 2012  MIPS Technologies, Inc.
++ * Copyright (C) 2012  Ralf Baechle <ralf@linux-mips.org>
++ */
++#include <asm/asm.h>
++#include <asm/regdef.h>
++
++#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
++#define cpu_clear_page_function_name	clear_page_cpu
++#define cpu_copy_page_function_name	copy_page_cpu
++#else
++#define cpu_clear_page_function_name	clear_page
++#define cpu_copy_page_function_name	copy_page
++#endif
++
++/*
++ * Maximum sizes:
++ *
++ * R4000 128 bytes S-cache:		0x058 bytes
++ * R4600 v1.7:				0x05c bytes
++ * R4600 v2.0:				0x060 bytes
++ * With prefetching, 16 word strides	0x120 bytes
++ */
++EXPORT(__clear_page_start)
++LEAF(cpu_clear_page_function_name)
++1:	j	1b		/* Dummy, will be replaced. */
++	.space 288
++END(cpu_clear_page_function_name)
++EXPORT(__clear_page_end)
++
++/*
++ * Maximum sizes:
++ *
++ * R4000 128 bytes S-cache:		0x11c bytes
++ * R4600 v1.7:				0x080 bytes
++ * R4600 v2.0:				0x07c bytes
++ * With prefetching, 16 word strides	0x540 bytes
++ */
++EXPORT(__copy_page_start)
++LEAF(cpu_copy_page_function_name)
++1:	j	1b		/* Dummy, will be replaced. */
++	.space 1344
++END(cpu_copy_page_function_name)
++EXPORT(__copy_page_end)
+--- a/arch/mips/mm/page.c
++++ b/arch/mips/mm/page.c
+@@ -6,6 +6,7 @@
+  * Copyright (C) 2003, 04, 05 Ralf Baechle (ralf@linux-mips.org)
+  * Copyright (C) 2007  Maciej W. Rozycki
+  * Copyright (C) 2008  Thiemo Seufer
++ * Copyright (C) 2012  MIPS Technologies, Inc.
+  */
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+@@ -72,45 +73,6 @@ static struct uasm_reloc __cpuinitdata r
+ #define cpu_is_r4600_v1_x()	((read_c0_prid() & 0xfffffff0) == 0x00002010)
+ #define cpu_is_r4600_v2_x()	((read_c0_prid() & 0xfffffff0) == 0x00002020)
+ 
+-/*
+- * Maximum sizes:
+- *
+- * R4000 128 bytes S-cache:		0x058 bytes
+- * R4600 v1.7:				0x05c bytes
+- * R4600 v2.0:				0x060 bytes
+- * With prefetching, 16 word strides	0x120 bytes
+- */
+-
+-static u32 clear_page_array[0x120 / 4];
+-
+-#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
+-void clear_page_cpu(void *page) __attribute__((alias("clear_page_array")));
+-#else
+-void clear_page(void *page) __attribute__((alias("clear_page_array")));
+-#endif
+-
+-EXPORT_SYMBOL(clear_page);
+-
+-/*
+- * Maximum sizes:
+- *
+- * R4000 128 bytes S-cache:		0x11c bytes
+- * R4600 v1.7:				0x080 bytes
+- * R4600 v2.0:				0x07c bytes
+- * With prefetching, 16 word strides	0x540 bytes
+- */
+-static u32 copy_page_array[0x540 / 4];
+-
+-#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
+-void
+-copy_page_cpu(void *to, void *from) __attribute__((alias("copy_page_array")));
+-#else
+-void copy_page(void *to, void *from) __attribute__((alias("copy_page_array")));
+-#endif
+-
+-EXPORT_SYMBOL(copy_page);
+-
+-
+ static int pref_bias_clear_store __cpuinitdata;
+ static int pref_bias_copy_load __cpuinitdata;
+ static int pref_bias_copy_store __cpuinitdata;
+@@ -283,10 +245,15 @@ static inline void __cpuinit build_clear
+ 		}
+ }
+ 
++extern u32 __clear_page_start;
++extern u32 __clear_page_end;
++extern u32 __copy_page_start;
++extern u32 __copy_page_end;
++
+ void __cpuinit build_clear_page(void)
+ {
+ 	int off;
+-	u32 *buf = (u32 *)&clear_page_array;
++	u32 *buf = &__clear_page_start;
+ 	struct uasm_label *l = labels;
+ 	struct uasm_reloc *r = relocs;
+ 	int i;
+@@ -357,17 +324,17 @@ void __cpuinit build_clear_page(void)
+ 	uasm_i_jr(&buf, RA);
+ 	uasm_i_nop(&buf);
+ 
+-	BUG_ON(buf > clear_page_array + ARRAY_SIZE(clear_page_array));
++	BUG_ON(buf > &__clear_page_end);
+ 
+ 	uasm_resolve_relocs(relocs, labels);
+ 
+ 	pr_debug("Synthesized clear page handler (%u instructions).\n",
+-		 (u32)(buf - clear_page_array));
++		 (u32)(buf - &__clear_page_start));
+ 
+ 	pr_debug("\t.set push\n");
+ 	pr_debug("\t.set noreorder\n");
+-	for (i = 0; i < (buf - clear_page_array); i++)
+-		pr_debug("\t.word 0x%08x\n", clear_page_array[i]);
++	for (i = 0; i < (buf - &__clear_page_start); i++)
++		pr_debug("\t.word 0x%08x\n", (&__clear_page_start)[i]);
+ 	pr_debug("\t.set pop\n");
+ }
+ 
+@@ -428,7 +395,7 @@ static inline void build_copy_store_pref
+ void __cpuinit build_copy_page(void)
+ {
+ 	int off;
+-	u32 *buf = (u32 *)&copy_page_array;
++	u32 *buf = &__copy_page_start;
+ 	struct uasm_label *l = labels;
+ 	struct uasm_reloc *r = relocs;
+ 	int i;
+@@ -596,21 +563,23 @@ void __cpuinit build_copy_page(void)
+ 	uasm_i_jr(&buf, RA);
+ 	uasm_i_nop(&buf);
+ 
+-	BUG_ON(buf > copy_page_array + ARRAY_SIZE(copy_page_array));
++	BUG_ON(buf > &__copy_page_end);
+ 
+ 	uasm_resolve_relocs(relocs, labels);
+ 
+ 	pr_debug("Synthesized copy page handler (%u instructions).\n",
+-		 (u32)(buf - copy_page_array));
++		 (u32)(buf - &__copy_page_start));
+ 
+ 	pr_debug("\t.set push\n");
+ 	pr_debug("\t.set noreorder\n");
+-	for (i = 0; i < (buf - copy_page_array); i++)
+-		pr_debug("\t.word 0x%08x\n", copy_page_array[i]);
++	for (i = 0; i < (buf - &__copy_page_start); i++)
++		pr_debug("\t.word 0x%08x\n", (&__copy_page_start)[i]);
+ 	pr_debug("\t.set pop\n");
+ }
+ 
+ #ifdef CONFIG_SIBYTE_DMA_PAGEOPS
++extern void clear_page_cpu(void *page);
++extern void copy_page_cpu(void *to, void *from);
+ 
+ /*
+  * Pad descriptors to cacheline, since each is exclusively owned by a
diff --git a/trunk/target/linux/generic/patches-3.3/006-arm_kernel_xz_support.patch b/trunk/target/linux/generic/patches-3.3/006-arm_kernel_xz_support.patch
new file mode 100644
index 00000000..bfb17575
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/006-arm_kernel_xz_support.patch
@@ -0,0 +1,96 @@
+From 2d303b4683145f7dbc918bd14d04e1396581b2ce Mon Sep 17 00:00:00 2001
+From: Imre Kaloz <kaloz@openwrt.org>
+Date: Thu, 7 Jul 2011 12:05:21 +0200
+Subject: [PATCH] ARM: support XZ compressed kernels
+
+Wire up support for the XZ decompressor
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+---
+ arch/arm/Kconfig                        |    1 +
+ arch/arm/boot/compressed/Makefile       |   11 +++++++++--
+ arch/arm/boot/compressed/decompress.c   |    4 ++++
+ arch/arm/boot/compressed/piggy.xzkern.S |    6 ++++++
+ lib/xz/xz_dec_stream.c                  |    1 +
+ 5 files changed, 21 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm/boot/compressed/piggy.xzkern.S
+
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -21,6 +21,7 @@ config ARM
+ 	select HAVE_KERNEL_GZIP
+ 	select HAVE_KERNEL_LZO
+ 	select HAVE_KERNEL_LZMA
++	select HAVE_KERNEL_XZ
+ 	select HAVE_IRQ_WORK
+ 	select HAVE_PERF_EVENTS
+ 	select PERF_USE_VMALLOC
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -92,6 +92,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/
+ suffix_$(CONFIG_KERNEL_GZIP) = gzip
+ suffix_$(CONFIG_KERNEL_LZO)  = lzo
+ suffix_$(CONFIG_KERNEL_LZMA) = lzma
++suffix_$(CONFIG_KERNEL_XZ)   = xzkern
+ 
+ # Borrowed libfdt files for the ATAG compatibility mode
+ 
+@@ -115,7 +116,7 @@ targets       := vmlinux vmlinux.lds \
+ 		 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS)
+ 
+ # Make sure files are removed during clean
+-extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs)
++extra-y       += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern lib1funcs.S ashldi3.S $(libfdt) $(libfdt_hdrs)
+ 
+ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+@@ -171,8 +172,14 @@ if [ $(words $(ZRELADDR)) -gt 1 -a "$(CO
+ 	false; \
+ fi
+ 
++# For __aeabi_llsl
++ashldi3 = $(obj)/ashldi3.o
++
++$(obj)/ashldi3.S: $(srctree)/arch/$(SRCARCH)/lib/ashldi3.S FORCE
++	$(call cmd,shipped)
++
+ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
+-	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE
++	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) FORCE
+ 	@$(check_for_multiple_zreladdr)
+ 	$(call if_changed,ld)
+ 	@$(check_for_bad_syms)
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -44,6 +44,12 @@ extern void error(char *);
+ #include "../../../../lib/decompress_unlzma.c"
+ #endif
+ 
++#ifdef CONFIG_KERNEL_XZ
++#define memmove memmove
++#define memcpy memcpy
++#include "../../../../lib/decompress_unxz.c"
++#endif
++
+ int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
+ {
+ 	return decompress(input, len, NULL, NULL, output, NULL, error);
+--- /dev/null
++++ b/arch/arm/boot/compressed/piggy.xzkern.S
+@@ -0,0 +1,6 @@
++	.section .piggydata,#alloc
++	.globl	input_data
++input_data:
++	.incbin	"arch/arm/boot/compressed/piggy.xzkern"
++	.globl	input_data_end
++input_data_end:
+--- a/lib/xz/xz_dec_stream.c
++++ b/lib/xz/xz_dec_stream.c
+@@ -9,6 +9,7 @@
+ 
+ #include "xz_private.h"
+ #include "xz_stream.h"
++#include <linux/kernel.h>
+ 
+ /* Hash used to validate the Index field */
+ struct xz_dec_hash {
diff --git a/trunk/target/linux/generic/patches-3.3/007-hso-Earlier-catch-of-error-condition.patch b/trunk/target/linux/generic/patches-3.3/007-hso-Earlier-catch-of-error-condition.patch
new file mode 100644
index 00000000..bbc2b822
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/007-hso-Earlier-catch-of-error-condition.patch
@@ -0,0 +1,40 @@
+From 35e57e1b49a351aa804dab6010cd46ae6112a541 Mon Sep 17 00:00:00 2001
+From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Date: Wed, 21 Aug 2013 01:43:07 -0700
+Subject: [PATCH 1/2] hso: Earlier catch of error condition
+
+There is no need to get an interface specification if we know it's the
+wrong one.
+
+Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/hso.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -2927,6 +2927,11 @@ static int hso_probe(struct usb_interfac
+ 	struct hso_shared_int *shared_int;
+ 	struct hso_device *tmp_dev = NULL;
+ 
++	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
++		dev_err(&interface->dev, "Not our interface\n");
++		return -ENODEV;
++	}
++
+ 	if_num = interface->altsetting->desc.bInterfaceNumber;
+ 
+ 	/* Get the interface/port specification from either driver_info or from
+@@ -2936,10 +2941,6 @@ static int hso_probe(struct usb_interfac
+ 	else
+ 		port_spec = hso_get_config_data(interface);
+ 
+-	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
+-		dev_err(&interface->dev, "Not our interface\n");
+-		return -ENODEV;
+-	}
+ 	/* Check if we need to switch to alt interfaces prior to port
+ 	 * configuration */
+ 	if (interface->num_altsetting > 1)
diff --git a/trunk/target/linux/generic/patches-3.3/008-hso-Fix-stack-corruption-on-some-architectures.patch b/trunk/target/linux/generic/patches-3.3/008-hso-Fix-stack-corruption-on-some-architectures.patch
new file mode 100644
index 00000000..e5b7e4b7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/008-hso-Fix-stack-corruption-on-some-architectures.patch
@@ -0,0 +1,48 @@
+From e75dc677ff8d06ffa61bef6fee436227ae5440c6 Mon Sep 17 00:00:00 2001
+From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Date: Wed, 21 Aug 2013 01:43:19 -0700
+Subject: [PATCH 2/2] hso: Fix stack corruption on some architectures
+
+As Sergei Shtylyov explained in the #mipslinux IRC channel:
+[Mon 2013-08-19 12:28:21 PM PDT] <headless> guys, are you sure it's not "DMA off stack" case?
+[Mon 2013-08-19 12:28:35 PM PDT] <headless> it's a known stack corruptor on non-coherent arches
+[Mon 2013-08-19 12:31:48 PM PDT] <DonkeyHotei> headless: for usb/ehci?
+[Mon 2013-08-19 12:34:11 PM PDT] <DonkeyHotei> headless: explain
+[Mon 2013-08-19 12:35:38 PM PDT] <headless> usb_control_msg() (or other such func) should not use buffer on stack. DMA from/to stack is prohibited
+[Mon 2013-08-19 12:35:58 PM PDT] <headless> and EHCI uses DMA on control xfers (as well as all the others)
+
+Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/hso.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -2857,13 +2857,16 @@ exit:
+ static int hso_get_config_data(struct usb_interface *interface)
+ {
+ 	struct usb_device *usbdev = interface_to_usbdev(interface);
+-	u8 config_data[17];
++	u8 *config_data = kmalloc(17, GFP_KERNEL);
+ 	u32 if_num = interface->altsetting->desc.bInterfaceNumber;
+ 	s32 result;
+ 
++	if (!config_data)
++		return -ENOMEM;
+ 	if (usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
+ 			    0x86, 0xC0, 0, 0, config_data, 17,
+ 			    USB_CTRL_SET_TIMEOUT) != 0x11) {
++		kfree(config_data);
+ 		return -EIO;
+ 	}
+ 
+@@ -2914,6 +2917,7 @@ static int hso_get_config_data(struct us
+ 	if (config_data[16] & 0x1)
+ 		result |= HSO_INFO_CRC_BUG;
+ 
++	kfree(config_data);
+ 	return result;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/020-ssb_update.patch b/trunk/target/linux/generic/patches-3.3/020-ssb_update.patch
new file mode 100644
index 00000000..5354cc7b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/020-ssb_update.patch
@@ -0,0 +1,3206 @@
+--- a/arch/mips/bcm47xx/nvram.c
++++ b/arch/mips/bcm47xx/nvram.c
+@@ -43,8 +43,8 @@ static void early_nvram_init(void)
+ #ifdef CONFIG_BCM47XX_SSB
+ 	case BCM47XX_BUS_TYPE_SSB:
+ 		mcore_ssb = &bcm47xx_bus.ssb.mipscore;
+-		base = mcore_ssb->flash_window;
+-		lim = mcore_ssb->flash_window_size;
++		base = mcore_ssb->pflash.window;
++		lim = mcore_ssb->pflash.window_size;
+ 		break;
+ #endif
+ #ifdef CONFIG_BCM47XX_BCMA
+--- a/arch/mips/bcm47xx/wgt634u.c
++++ b/arch/mips/bcm47xx/wgt634u.c
+@@ -156,10 +156,10 @@ static int __init wgt634u_init(void)
+ 					    SSB_CHIPCO_IRQ_GPIO);
+ 		}
+ 
+-		wgt634u_flash_data.width = mcore->flash_buswidth;
+-		wgt634u_flash_resource.start = mcore->flash_window;
+-		wgt634u_flash_resource.end = mcore->flash_window
+-					   + mcore->flash_window_size
++		wgt634u_flash_data.width = mcore->pflash.buswidth;
++		wgt634u_flash_resource.start = mcore->pflash.window;
++		wgt634u_flash_resource.end = mcore->pflash.window
++					   + mcore->pflash.window_size
+ 					   - 1;
+ 		return platform_add_devices(wgt634u_devices,
+ 					    ARRAY_SIZE(wgt634u_devices));
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -136,10 +136,15 @@ config SSB_DRIVER_MIPS
+ 
+ 	  If unsure, say N
+ 
++config SSB_SFLASH
++	bool "SSB serial flash support"
++	depends on SSB_DRIVER_MIPS
++	default y
++
+ # Assumption: We are on embedded, if we compile the MIPS core.
+ config SSB_EMBEDDED
+ 	bool
+-	depends on SSB_DRIVER_MIPS
++	depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
+ 	default y
+ 
+ config SSB_DRIVER_EXTIF
+@@ -160,4 +165,12 @@ config SSB_DRIVER_GIGE
+ 
+ 	  If unsure, say N
+ 
++config SSB_DRIVER_GPIO
++	bool "SSB GPIO driver"
++	depends on SSB && GPIOLIB
++	help
++	  Driver to provide access to the GPIO pins on the bus.
++
++	  If unsure, say N
++
+ endmenu
+--- a/drivers/ssb/Makefile
++++ b/drivers/ssb/Makefile
+@@ -11,10 +11,12 @@ ssb-$(CONFIG_SSB_SDIOHOST)		+= sdio.o
+ # built-in drivers
+ ssb-y					+= driver_chipcommon.o
+ ssb-y					+= driver_chipcommon_pmu.o
++ssb-$(CONFIG_SSB_SFLASH)		+= driver_chipcommon_sflash.o
+ ssb-$(CONFIG_SSB_DRIVER_MIPS)		+= driver_mipscore.o
+ ssb-$(CONFIG_SSB_DRIVER_EXTIF)		+= driver_extif.o
+ ssb-$(CONFIG_SSB_DRIVER_PCICORE)	+= driver_pcicore.o
+ ssb-$(CONFIG_SSB_DRIVER_GIGE)		+= driver_gige.o
++ssb-$(CONFIG_SSB_DRIVER_GPIO)		+= driver_gpio.o
+ 
+ # b43 pci-ssb-bridge driver
+ # Not strictly a part of SSB, but kept here for convenience
+--- a/drivers/ssb/b43_pci_bridge.c
++++ b/drivers/ssb/b43_pci_bridge.c
+@@ -29,11 +29,15 @@ static const struct pci_device_id b43_pc
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4322) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43222) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
+ 	{ 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
+--- a/drivers/ssb/driver_chipcommon.c
++++ b/drivers/ssb/driver_chipcommon.c
+@@ -4,6 +4,7 @@
+  *
+  * Copyright 2005, Broadcom Corporation
+  * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
++ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
+  *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+@@ -12,6 +13,7 @@
+ #include <linux/ssb/ssb_regs.h>
+ #include <linux/export.h>
+ #include <linux/pci.h>
++#include <linux/bcm47xx_wdt.h>
+ 
+ #include "ssb_private.h"
+ 
+@@ -280,13 +282,79 @@ static void calc_fast_powerup_delay(stru
+ 	cc->fast_pwrup_delay = tmp;
+ }
+ 
++static u32 ssb_chipco_alp_clock(struct ssb_chipcommon *cc)
++{
++	if (cc->capabilities & SSB_CHIPCO_CAP_PMU)
++		return ssb_pmu_get_alp_clock(cc);
++
++	return 20000000;
++}
++
++static u32 ssb_chipco_watchdog_get_max_timer(struct ssb_chipcommon *cc)
++{
++	u32 nb;
++
++	if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
++		if (cc->dev->id.revision < 26)
++			nb = 16;
++		else
++			nb = (cc->dev->id.revision >= 37) ? 32 : 24;
++	} else {
++		nb = 28;
++	}
++	if (nb == 32)
++		return 0xffffffff;
++	else
++		return (1 << nb) - 1;
++}
++
++u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks)
++{
++	struct ssb_chipcommon *cc = bcm47xx_wdt_get_drvdata(wdt);
++
++	if (cc->dev->bus->bustype != SSB_BUSTYPE_SSB)
++		return 0;
++
++	return ssb_chipco_watchdog_timer_set(cc, ticks);
++}
++
++u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms)
++{
++	struct ssb_chipcommon *cc = bcm47xx_wdt_get_drvdata(wdt);
++	u32 ticks;
++
++	if (cc->dev->bus->bustype != SSB_BUSTYPE_SSB)
++		return 0;
++
++	ticks = ssb_chipco_watchdog_timer_set(cc, cc->ticks_per_ms * ms);
++	return ticks / cc->ticks_per_ms;
++}
++
++static int ssb_chipco_watchdog_ticks_per_ms(struct ssb_chipcommon *cc)
++{
++	struct ssb_bus *bus = cc->dev->bus;
++
++	if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
++			/* based on 32KHz ILP clock */
++			return 32;
++	} else {
++		if (cc->dev->id.revision < 18)
++			return ssb_clockspeed(bus) / 1000;
++		else
++			return ssb_chipco_alp_clock(cc) / 1000;
++	}
++}
++
+ void ssb_chipcommon_init(struct ssb_chipcommon *cc)
+ {
+ 	if (!cc->dev)
+ 		return; /* We don't have a ChipCommon */
++
++	spin_lock_init(&cc->gpio_lock);
++
+ 	if (cc->dev->id.revision >= 11)
+ 		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
+-	ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);
++	ssb_dbg("chipcommon status is 0x%x\n", cc->status);
+ 
+ 	if (cc->dev->id.revision >= 20) {
+ 		chipco_write32(cc, SSB_CHIPCO_GPIOPULLUP, 0);
+@@ -297,6 +365,11 @@ void ssb_chipcommon_init(struct ssb_chip
+ 	chipco_powercontrol_init(cc);
+ 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
+ 	calc_fast_powerup_delay(cc);
++
++	if (cc->dev->bus->bustype == SSB_BUSTYPE_SSB) {
++		cc->ticks_per_ms = ssb_chipco_watchdog_ticks_per_ms(cc);
++		cc->max_timer_ms = ssb_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;
++	}
+ }
+ 
+ void ssb_chipco_suspend(struct ssb_chipcommon *cc)
+@@ -395,10 +468,27 @@ void ssb_chipco_timing_init(struct ssb_c
+ }
+ 
+ /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
+-void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
++u32 ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
+ {
+-	/* instant NMI */
+-	chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
++	u32 maxt;
++	enum ssb_clkmode clkmode;
++
++	maxt = ssb_chipco_watchdog_get_max_timer(cc);
++	if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
++		if (ticks == 1)
++			ticks = 2;
++		else if (ticks > maxt)
++			ticks = maxt;
++		chipco_write32(cc, SSB_CHIPCO_PMU_WATCHDOG, ticks);
++	} else {
++		clkmode = ticks ? SSB_CLKMODE_FAST : SSB_CLKMODE_DYNAMIC;
++		ssb_chipco_set_clockmode(cc, clkmode);
++		if (ticks > maxt)
++			ticks = maxt;
++		/* instant NMI */
++		chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
++	}
++	return ticks;
+ }
+ 
+ void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value)
+@@ -418,28 +508,93 @@ u32 ssb_chipco_gpio_in(struct ssb_chipco
+ 
+ u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
+ {
+-	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
+ {
+-	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value)
+ {
+-	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ EXPORT_SYMBOL(ssb_chipco_gpio_control);
+ 
+ u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
+ {
+-	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOIRQ, mask, value);
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = chipco_write32_masked(cc, SSB_CHIPCO_GPIOIRQ, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value)
+ {
+-	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOPOL, mask, value);
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = chipco_write32_masked(cc, SSB_CHIPCO_GPIOPOL, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
++}
++
++u32 ssb_chipco_gpio_pullup(struct ssb_chipcommon *cc, u32 mask, u32 value)
++{
++	unsigned long flags;
++	u32 res = 0;
++
++	if (cc->dev->id.revision < 20)
++		return 0xffffffff;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = chipco_write32_masked(cc, SSB_CHIPCO_GPIOPULLUP, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
++}
++
++u32 ssb_chipco_gpio_pulldown(struct ssb_chipcommon *cc, u32 mask, u32 value)
++{
++	unsigned long flags;
++	u32 res = 0;
++
++	if (cc->dev->id.revision < 20)
++		return 0xffffffff;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = chipco_write32_masked(cc, SSB_CHIPCO_GPIOPULLDOWN, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ #ifdef CONFIG_SSB_SERIAL
+@@ -473,12 +628,7 @@ int ssb_chipco_serial_init(struct ssb_ch
+ 				       chipco_read32(cc, SSB_CHIPCO_CORECTL)
+ 				       | SSB_CHIPCO_CORECTL_UARTCLK0);
+ 		} else if ((ccrev >= 11) && (ccrev != 15)) {
+-			/* Fixed ALP clock */
+-			baud_base = 20000000;
+-			if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
+-				/* FIXME: baud_base is different for devices with a PMU */
+-				SSB_WARN_ON(1);
+-			}
++			baud_base = ssb_chipco_alp_clock(cc);
+ 			div = 1;
+ 			if (ccrev >= 21) {
+ 				/* Turn off UART clock before switching clocksource. */
+--- a/drivers/ssb/driver_chipcommon_pmu.c
++++ b/drivers/ssb/driver_chipcommon_pmu.c
+@@ -13,6 +13,9 @@
+ #include <linux/ssb/ssb_driver_chipcommon.h>
+ #include <linux/delay.h>
+ #include <linux/export.h>
++#ifdef CONFIG_BCM47XX
++#include <asm/mach-bcm47xx/nvram.h>
++#endif
+ 
+ #include "ssb_private.h"
+ 
+@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
+ 	u32 pmuctl, tmp, pllctl;
+ 	unsigned int i;
+ 
+-	if ((bus->chip_id == 0x5354) && !crystalfreq) {
+-		/* The 5354 crystal freq is 25MHz */
+-		crystalfreq = 25000;
+-	}
+ 	if (crystalfreq)
+ 		e = pmu0_plltab_find_entry(crystalfreq);
+ 	if (!e)
+@@ -111,8 +110,8 @@ static void ssb_pmu0_pllinit_r0(struct s
+ 		return;
+ 	}
+ 
+-	ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
+-		   (crystalfreq / 1000), (crystalfreq % 1000));
++	ssb_info("Programming PLL to %u.%03u MHz\n",
++		 crystalfreq / 1000, crystalfreq % 1000);
+ 
+ 	/* First turn the PLL off. */
+ 	switch (bus->chip_id) {
+@@ -139,7 +138,7 @@ static void ssb_pmu0_pllinit_r0(struct s
+ 	}
+ 	tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
+ 	if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
+-		ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
++		ssb_emerg("Failed to turn the PLL off!\n");
+ 
+ 	/* Set PDIV in PLL control 0. */
+ 	pllctl = ssb_chipco_pll_read(cc, SSB_PMU0_PLLCTL0);
+@@ -250,8 +249,8 @@ static void ssb_pmu1_pllinit_r0(struct s
+ 		return;
+ 	}
+ 
+-	ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
+-		   (crystalfreq / 1000), (crystalfreq % 1000));
++	ssb_info("Programming PLL to %u.%03u MHz\n",
++		 crystalfreq / 1000, crystalfreq % 1000);
+ 
+ 	/* First turn the PLL off. */
+ 	switch (bus->chip_id) {
+@@ -276,7 +275,7 @@ static void ssb_pmu1_pllinit_r0(struct s
+ 	}
+ 	tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
+ 	if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
+-		ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
++		ssb_emerg("Failed to turn the PLL off!\n");
+ 
+ 	/* Set p1div and p2div. */
+ 	pllctl = ssb_chipco_pll_read(cc, SSB_PMU1_PLLCTL0);
+@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
+ 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
+ 
+ 	if (bus->bustype == SSB_BUSTYPE_SSB) {
+-		/* TODO: The user may override the crystal frequency. */
++#ifdef CONFIG_BCM47XX
++		char buf[20];
++		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
++			crystalfreq = simple_strtoul(buf, NULL, 0);
++#endif
+ 	}
+ 
+ 	switch (bus->chip_id) {
+@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
+ 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
+ 		break;
+ 	case 0x4328:
++		ssb_pmu0_pllinit_r0(cc, crystalfreq);
++		break;
+ 	case 0x5354:
++		if (crystalfreq == 0)
++			crystalfreq = 25000;
+ 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
+ 		break;
+ 	case 0x4322:
+@@ -339,10 +346,11 @@ static void ssb_pmu_pll_init(struct ssb_
+ 			chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
+ 		}
+ 		break;
++	case 43222:
++		break;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "ERROR: PLL init unknown for device %04X\n",
+-			   bus->chip_id);
++		ssb_err("ERROR: PLL init unknown for device %04X\n",
++			bus->chip_id);
+ 	}
+ }
+ 
+@@ -427,6 +435,7 @@ static void ssb_pmu_resources_init(struc
+ 		 min_msk = 0xCBB;
+ 		 break;
+ 	case 0x4322:
++	case 43222:
+ 		/* We keep the default settings:
+ 		 * min_msk = 0xCBB
+ 		 * max_msk = 0x7FFFF
+@@ -462,9 +471,8 @@ static void ssb_pmu_resources_init(struc
+ 		max_msk = 0xFFFFF;
+ 		break;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "ERROR: PMU resource config unknown for device %04X\n",
+-			   bus->chip_id);
++		ssb_err("ERROR: PMU resource config unknown for device %04X\n",
++			bus->chip_id);
+ 	}
+ 
+ 	if (updown_tab) {
+@@ -516,8 +524,8 @@ void ssb_pmu_init(struct ssb_chipcommon
+ 	pmucap = chipco_read32(cc, SSB_CHIPCO_PMU_CAP);
+ 	cc->pmu.rev = (pmucap & SSB_CHIPCO_PMU_CAP_REVISION);
+ 
+-	ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
+-		    cc->pmu.rev, pmucap);
++	ssb_dbg("Found rev %u PMU (capabilities 0x%08X)\n",
++		cc->pmu.rev, pmucap);
+ 
+ 	if (cc->pmu.rev == 1)
+ 		chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
+@@ -607,3 +615,102 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
+ 
+ EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
+ EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
++
++static u32 ssb_pmu_get_alp_clock_clk0(struct ssb_chipcommon *cc)
++{
++	u32 crystalfreq;
++	const struct pmu0_plltab_entry *e = NULL;
++
++	crystalfreq = chipco_read32(cc, SSB_CHIPCO_PMU_CTL) &
++		      SSB_CHIPCO_PMU_CTL_XTALFREQ >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT;
++	e = pmu0_plltab_find_entry(crystalfreq);
++	BUG_ON(!e);
++	return e->freq * 1000;
++}
++
++u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc)
++{
++	struct ssb_bus *bus = cc->dev->bus;
++
++	switch (bus->chip_id) {
++	case 0x5354:
++		ssb_pmu_get_alp_clock_clk0(cc);
++	default:
++		ssb_err("ERROR: PMU alp clock unknown for device %04X\n",
++			bus->chip_id);
++		return 0;
++	}
++}
++
++u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
++{
++	struct ssb_bus *bus = cc->dev->bus;
++
++	switch (bus->chip_id) {
++	case 0x5354:
++		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
++		return 240000000;
++	default:
++		ssb_err("ERROR: PMU cpu clock unknown for device %04X\n",
++			bus->chip_id);
++		return 0;
++	}
++}
++
++u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
++{
++	struct ssb_bus *bus = cc->dev->bus;
++
++	switch (bus->chip_id) {
++	case 0x5354:
++		return 120000000;
++	default:
++		ssb_err("ERROR: PMU controlclock unknown for device %04X\n",
++			bus->chip_id);
++		return 0;
++	}
++}
++
++void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid)
++{
++	u32 pmu_ctl = 0;
++
++	switch (cc->dev->bus->chip_id) {
++	case 0x4322:
++		ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11100070);
++		ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x1014140a);
++		ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888854);
++		if (spuravoid == 1)
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x05201828);
++		else
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x05001828);
++		pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
++		break;
++	case 43222:
++		if (spuravoid == 1) {
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11500008);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0C000C06);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x0F600a08);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x2001E920);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888815);
++		} else {
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11100008);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0c000c06);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x03000a08);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x200005c0);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888855);
++		}
++		pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
++		break;
++	default:
++		ssb_printk(KERN_ERR PFX
++			   "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
++			   cc->dev->bus->chip_id);
++		return;
++	}
++
++	chipco_set32(cc, SSB_CHIPCO_PMU_CTL, pmu_ctl);
++}
++EXPORT_SYMBOL_GPL(ssb_pmu_spuravoid_pllupdate);
+--- /dev/null
++++ b/drivers/ssb/driver_chipcommon_sflash.c
+@@ -0,0 +1,164 @@
++/*
++ * Sonics Silicon Backplane
++ * ChipCommon serial flash interface
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/ssb/ssb.h>
++
++#include "ssb_private.h"
++
++static struct resource ssb_sflash_resource = {
++	.name	= "ssb_sflash",
++	.start	= SSB_FLASH2,
++	.end	= 0,
++	.flags  = IORESOURCE_MEM | IORESOURCE_READONLY,
++};
++
++struct platform_device ssb_sflash_dev = {
++	.name		= "ssb_sflash",
++	.resource	= &ssb_sflash_resource,
++	.num_resources	= 1,
++};
++
++struct ssb_sflash_tbl_e {
++	char *name;
++	u32 id;
++	u32 blocksize;
++	u16 numblocks;
++};
++
++static const struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
++	{ "M25P20", 0x11, 0x10000, 4, },
++	{ "M25P40", 0x12, 0x10000, 8, },
++
++	{ "M25P16", 0x14, 0x10000, 32, },
++	{ "M25P32", 0x15, 0x10000, 64, },
++	{ "M25P64", 0x16, 0x10000, 128, },
++	{ "M25FL128", 0x17, 0x10000, 256, },
++	{ 0 },
++};
++
++static const struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
++	{ "SST25WF512", 1, 0x1000, 16, },
++	{ "SST25VF512", 0x48, 0x1000, 16, },
++	{ "SST25WF010", 2, 0x1000, 32, },
++	{ "SST25VF010", 0x49, 0x1000, 32, },
++	{ "SST25WF020", 3, 0x1000, 64, },
++	{ "SST25VF020", 0x43, 0x1000, 64, },
++	{ "SST25WF040", 4, 0x1000, 128, },
++	{ "SST25VF040", 0x44, 0x1000, 128, },
++	{ "SST25VF040B", 0x8d, 0x1000, 128, },
++	{ "SST25WF080", 5, 0x1000, 256, },
++	{ "SST25VF080B", 0x8e, 0x1000, 256, },
++	{ "SST25VF016", 0x41, 0x1000, 512, },
++	{ "SST25VF032", 0x4a, 0x1000, 1024, },
++	{ "SST25VF064", 0x4b, 0x1000, 2048, },
++	{ 0 },
++};
++
++static const struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
++	{ "AT45DB011", 0xc, 256, 512, },
++	{ "AT45DB021", 0x14, 256, 1024, },
++	{ "AT45DB041", 0x1c, 256, 2048, },
++	{ "AT45DB081", 0x24, 256, 4096, },
++	{ "AT45DB161", 0x2c, 512, 4096, },
++	{ "AT45DB321", 0x34, 512, 8192, },
++	{ "AT45DB642", 0x3c, 1024, 8192, },
++	{ 0 },
++};
++
++static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode)
++{
++	int i;
++	chipco_write32(cc, SSB_CHIPCO_FLASHCTL,
++		       SSB_CHIPCO_FLASHCTL_START | opcode);
++	for (i = 0; i < 1000; i++) {
++		if (!(chipco_read32(cc, SSB_CHIPCO_FLASHCTL) &
++		      SSB_CHIPCO_FLASHCTL_BUSY))
++			return;
++		cpu_relax();
++	}
++	pr_err("SFLASH control command failed (timeout)!\n");
++}
++
++/* Initialize serial flash access */
++int ssb_sflash_init(struct ssb_chipcommon *cc)
++{
++	struct ssb_sflash *sflash = &cc->dev->bus->mipscore.sflash;
++	const struct ssb_sflash_tbl_e *e;
++	u32 id, id2;
++
++	switch (cc->capabilities & SSB_CHIPCO_CAP_FLASHT) {
++	case SSB_CHIPCO_FLASHT_STSER:
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_DP);
++
++		chipco_write32(cc, SSB_CHIPCO_FLASHADDR, 0);
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_RES);
++		id = chipco_read32(cc, SSB_CHIPCO_FLASHDATA);
++
++		chipco_write32(cc, SSB_CHIPCO_FLASHADDR, 1);
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_RES);
++		id2 = chipco_read32(cc, SSB_CHIPCO_FLASHDATA);
++
++		switch (id) {
++		case 0xbf:
++			for (e = ssb_sflash_sst_tbl; e->name; e++) {
++				if (e->id == id2)
++					break;
++			}
++			break;
++		case 0x13:
++			return -ENOTSUPP;
++		default:
++			for (e = ssb_sflash_st_tbl; e->name; e++) {
++				if (e->id == id)
++					break;
++			}
++			break;
++		}
++		if (!e->name) {
++			pr_err("Unsupported ST serial flash (id: 0x%X, id2: 0x%X)\n",
++			       id, id2);
++			return -ENOTSUPP;
++		}
++
++		break;
++	case SSB_CHIPCO_FLASHT_ATSER:
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_AT_STATUS);
++		id = chipco_read32(cc, SSB_CHIPCO_FLASHDATA) & 0x3c;
++
++		for (e = ssb_sflash_at_tbl; e->name; e++) {
++			if (e->id == id)
++				break;
++		}
++		if (!e->name) {
++			pr_err("Unsupported Atmel serial flash (id: 0x%X)\n",
++			       id);
++			return -ENOTSUPP;
++		}
++
++		break;
++	default:
++		pr_err("Unsupported flash type\n");
++		return -ENOTSUPP;
++	}
++
++	sflash->window = SSB_FLASH2;
++	sflash->blocksize = e->blocksize;
++	sflash->numblocks = e->numblocks;
++	sflash->size = sflash->blocksize * sflash->numblocks;
++	sflash->present = true;
++
++	pr_info("Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n",
++		e->name, sflash->size / 1024, e->blocksize, e->numblocks);
++
++	/* Prepare platform device, but don't register it yet. It's too early,
++	 * malloc (required by device_private_init) is not available yet. */
++	ssb_sflash_dev.resource[0].end = ssb_sflash_dev.resource[0].start +
++					 sflash->size;
++	ssb_sflash_dev.dev.platform_data = sflash;
++
++	return 0;
++}
+--- a/drivers/ssb/driver_extif.c
++++ b/drivers/ssb/driver_extif.c
+@@ -112,10 +112,37 @@ void ssb_extif_get_clockcontrol(struct s
+ 	*m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
+ }
+ 
+-void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+-				  u32 ticks)
++u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks)
+ {
++	struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt);
++
++	return ssb_extif_watchdog_timer_set(extif, ticks);
++}
++
++u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms)
++{
++	struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt);
++	u32 ticks = (SSB_EXTIF_WATCHDOG_CLK / 1000) * ms;
++
++	ticks = ssb_extif_watchdog_timer_set(extif, ticks);
++
++	return (ticks * 1000) / SSB_EXTIF_WATCHDOG_CLK;
++}
++
++u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)
++{
++	if (ticks > SSB_EXTIF_WATCHDOG_MAX_TIMER)
++		ticks = SSB_EXTIF_WATCHDOG_MAX_TIMER;
+ 	extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);
++
++	return ticks;
++}
++
++void ssb_extif_init(struct ssb_extif *extif)
++{
++	if (!extif->dev)
++		return; /* We don't have a Extif core */
++	spin_lock_init(&extif->gpio_lock);
+ }
+ 
+ u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
+@@ -125,22 +152,50 @@ u32 ssb_extif_gpio_in(struct ssb_extif *
+ 
+ u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
+ {
+-	return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0),
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&extif->gpio_lock, flags);
++	res = extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0),
+ 				   mask, value);
++	spin_unlock_irqrestore(&extif->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
+ {
+-	return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0),
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&extif->gpio_lock, flags);
++	res = extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0),
+ 				   mask, value);
++	spin_unlock_irqrestore(&extif->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value)
+ {
+-	return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTPOL, mask, value);
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&extif->gpio_lock, flags);
++	res = extif_write32_masked(extif, SSB_EXTIF_GPIO_INTPOL, mask, value);
++	spin_unlock_irqrestore(&extif->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value)
+ {
+-	return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value);
++	unsigned long flags;
++	u32 res = 0;
++
++	spin_lock_irqsave(&extif->gpio_lock, flags);
++	res = extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value);
++	spin_unlock_irqrestore(&extif->gpio_lock, flags);
++
++	return res;
+ }
+--- /dev/null
++++ b/drivers/ssb/driver_gpio.c
+@@ -0,0 +1,210 @@
++/*
++ * Sonics Silicon Backplane
++ * GPIO driver
++ *
++ * Copyright 2011, Broadcom Corporation
++ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/gpio.h>
++#include <linux/export.h>
++#include <linux/ssb/ssb.h>
++
++#include "ssb_private.h"
++
++static struct ssb_bus *ssb_gpio_get_bus(struct gpio_chip *chip)
++{
++	return container_of(chip, struct ssb_bus, gpio);
++}
++
++static int ssb_gpio_chipco_get_value(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	return !!ssb_chipco_gpio_in(&bus->chipco, 1 << gpio);
++}
++
++static void ssb_gpio_chipco_set_value(struct gpio_chip *chip, unsigned gpio,
++				      int value)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	ssb_chipco_gpio_out(&bus->chipco, 1 << gpio, value ? 1 << gpio : 0);
++}
++
++static int ssb_gpio_chipco_direction_input(struct gpio_chip *chip,
++					   unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	ssb_chipco_gpio_outen(&bus->chipco, 1 << gpio, 0);
++	return 0;
++}
++
++static int ssb_gpio_chipco_direction_output(struct gpio_chip *chip,
++					    unsigned gpio, int value)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	ssb_chipco_gpio_outen(&bus->chipco, 1 << gpio, 1 << gpio);
++	ssb_chipco_gpio_out(&bus->chipco, 1 << gpio, value ? 1 << gpio : 0);
++	return 0;
++}
++
++static int ssb_gpio_chipco_request(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	ssb_chipco_gpio_control(&bus->chipco, 1 << gpio, 0);
++	/* clear pulldown */
++	ssb_chipco_gpio_pulldown(&bus->chipco, 1 << gpio, 0);
++	/* Set pullup */
++	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 1 << gpio);
++
++	return 0;
++}
++
++static void ssb_gpio_chipco_free(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	/* clear pullup */
++	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);
++}
++
++static int ssb_gpio_chipco_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		return ssb_mips_irq(bus->chipco.dev) + 2;
++	else
++		return -EINVAL;
++}
++
++static int ssb_gpio_chipco_init(struct ssb_bus *bus)
++{
++	struct gpio_chip *chip = &bus->gpio;
++
++	chip->label		= "ssb_chipco_gpio";
++	chip->owner		= THIS_MODULE;
++	chip->request		= ssb_gpio_chipco_request;
++	chip->free		= ssb_gpio_chipco_free;
++	chip->get		= ssb_gpio_chipco_get_value;
++	chip->set		= ssb_gpio_chipco_set_value;
++	chip->direction_input	= ssb_gpio_chipco_direction_input;
++	chip->direction_output	= ssb_gpio_chipco_direction_output;
++	chip->to_irq		= ssb_gpio_chipco_to_irq;
++	chip->ngpio		= 16;
++	/* There is just one SoC in one device and its GPIO addresses should be
++	 * deterministic to address them more easily. The other buses could get
++	 * a random base number. */
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		chip->base		= 0;
++	else
++		chip->base		= -1;
++
++	return gpiochip_add(chip);
++}
++
++#ifdef CONFIG_SSB_DRIVER_EXTIF
++
++static int ssb_gpio_extif_get_value(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	return !!ssb_extif_gpio_in(&bus->extif, 1 << gpio);
++}
++
++static void ssb_gpio_extif_set_value(struct gpio_chip *chip, unsigned gpio,
++				     int value)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	ssb_extif_gpio_out(&bus->extif, 1 << gpio, value ? 1 << gpio : 0);
++}
++
++static int ssb_gpio_extif_direction_input(struct gpio_chip *chip,
++					  unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	ssb_extif_gpio_outen(&bus->extif, 1 << gpio, 0);
++	return 0;
++}
++
++static int ssb_gpio_extif_direction_output(struct gpio_chip *chip,
++					   unsigned gpio, int value)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	ssb_extif_gpio_outen(&bus->extif, 1 << gpio, 1 << gpio);
++	ssb_extif_gpio_out(&bus->extif, 1 << gpio, value ? 1 << gpio : 0);
++	return 0;
++}
++
++static int ssb_gpio_extif_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		return ssb_mips_irq(bus->extif.dev) + 2;
++	else
++		return -EINVAL;
++}
++
++static int ssb_gpio_extif_init(struct ssb_bus *bus)
++{
++	struct gpio_chip *chip = &bus->gpio;
++
++	chip->label		= "ssb_extif_gpio";
++	chip->owner		= THIS_MODULE;
++	chip->get		= ssb_gpio_extif_get_value;
++	chip->set		= ssb_gpio_extif_set_value;
++	chip->direction_input	= ssb_gpio_extif_direction_input;
++	chip->direction_output	= ssb_gpio_extif_direction_output;
++	chip->to_irq		= ssb_gpio_extif_to_irq;
++	chip->ngpio		= 5;
++	/* There is just one SoC in one device and its GPIO addresses should be
++	 * deterministic to address them more easily. The other buses could get
++	 * a random base number. */
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		chip->base		= 0;
++	else
++		chip->base		= -1;
++
++	return gpiochip_add(chip);
++}
++
++#else
++static int ssb_gpio_extif_init(struct ssb_bus *bus)
++{
++	return -ENOTSUPP;
++}
++#endif
++
++int ssb_gpio_init(struct ssb_bus *bus)
++{
++	if (ssb_chipco_available(&bus->chipco))
++		return ssb_gpio_chipco_init(bus);
++	else if (ssb_extif_available(&bus->extif))
++		return ssb_gpio_extif_init(bus);
++	else
++		SSB_WARN_ON(1);
++
++	return -1;
++}
++
++int ssb_gpio_unregister(struct ssb_bus *bus)
++{
++	if (ssb_chipco_available(&bus->chipco) ||
++	    ssb_extif_available(&bus->extif)) {
++		return gpiochip_remove(&bus->gpio);
++	} else {
++		SSB_WARN_ON(1);
++	}
++
++	return -1;
++}
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
+@@ -10,6 +10,7 @@
+ 
+ #include <linux/ssb/ssb.h>
+ 
++#include <linux/mtd/physmap.h>
+ #include <linux/serial.h>
+ #include <linux/serial_core.h>
+ #include <linux/serial_reg.h>
+@@ -17,6 +18,25 @@
+ 
+ #include "ssb_private.h"
+ 
++static const char * const part_probes[] = { "bcm47xxpart", NULL };
++
++static struct physmap_flash_data ssb_pflash_data = {
++	.part_probe_types	= part_probes,
++};
++
++static struct resource ssb_pflash_resource = {
++	.name	= "ssb_pflash",
++	.flags  = IORESOURCE_MEM,
++};
++
++struct platform_device ssb_pflash_dev = {
++	.name		= "physmap-flash",
++	.dev		= {
++		.platform_data  = &ssb_pflash_data,
++	},
++	.resource	= &ssb_pflash_resource,
++	.num_resources	= 1,
++};
+ 
+ static inline u32 mips_read32(struct ssb_mipscore *mcore,
+ 			      u16 offset)
+@@ -147,21 +167,22 @@ static void set_irq(struct ssb_device *d
+ 		irqflag |= (ipsflag & ~ipsflag_irq_mask[irq]);
+ 		ssb_write32(mdev, SSB_IPSFLAG, irqflag);
+ 	}
+-	ssb_dprintk(KERN_INFO PFX
+-		    "set_irq: core 0x%04x, irq %d => %d\n",
+-		    dev->id.coreid, oldirq+2, irq+2);
++	ssb_dbg("set_irq: core 0x%04x, irq %d => %d\n",
++		dev->id.coreid, oldirq+2, irq+2);
+ }
+ 
+ static void print_irq(struct ssb_device *dev, unsigned int irq)
+ {
+-	int i;
+ 	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
+-	ssb_dprintk(KERN_INFO PFX
+-		"core 0x%04x, irq :", dev->id.coreid);
+-	for (i = 0; i <= 6; i++) {
+-		ssb_dprintk(" %s%s", irq_name[i], i==irq?"*":" ");
+-	}
+-	ssb_dprintk("\n");
++	ssb_dbg("core 0x%04x, irq : %s%s %s%s %s%s %s%s %s%s %s%s %s%s\n",
++		dev->id.coreid,
++		irq_name[0], irq == 0 ? "*" : " ",
++		irq_name[1], irq == 1 ? "*" : " ",
++		irq_name[2], irq == 2 ? "*" : " ",
++		irq_name[3], irq == 3 ? "*" : " ",
++		irq_name[4], irq == 4 ? "*" : " ",
++		irq_name[5], irq == 5 ? "*" : " ",
++		irq_name[6], irq == 6 ? "*" : " ");
+ }
+ 
+ static void dump_irq(struct ssb_bus *bus)
+@@ -178,9 +199,9 @@ static void ssb_mips_serial_init(struct
+ {
+ 	struct ssb_bus *bus = mcore->dev->bus;
+ 
+-	if (bus->extif.dev)
++	if (ssb_extif_available(&bus->extif))
+ 		mcore->nr_serial_ports = ssb_extif_serial_init(&bus->extif, mcore->serial_ports);
+-	else if (bus->chipco.dev)
++	else if (ssb_chipco_available(&bus->chipco))
+ 		mcore->nr_serial_ports = ssb_chipco_serial_init(&bus->chipco, mcore->serial_ports);
+ 	else
+ 		mcore->nr_serial_ports = 0;
+@@ -189,17 +210,42 @@ static void ssb_mips_serial_init(struct
+ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
+ {
+ 	struct ssb_bus *bus = mcore->dev->bus;
++	struct ssb_pflash *pflash = &mcore->pflash;
+ 
+-	mcore->flash_buswidth = 2;
+-	if (bus->chipco.dev) {
+-		mcore->flash_window = 0x1c000000;
+-		mcore->flash_window_size = 0x02000000;
++	/* When there is no chipcommon on the bus there is 4MB flash */
++	if (!ssb_chipco_available(&bus->chipco)) {
++		pflash->present = true;
++		pflash->buswidth = 2;
++		pflash->window = SSB_FLASH1;
++		pflash->window_size = SSB_FLASH1_SZ;
++		goto ssb_pflash;
++	}
++
++	/* There is ChipCommon, so use it to read info about flash */
++	switch (bus->chipco.capabilities & SSB_CHIPCO_CAP_FLASHT) {
++	case SSB_CHIPCO_FLASHT_STSER:
++	case SSB_CHIPCO_FLASHT_ATSER:
++		pr_debug("Found serial flash\n");
++		ssb_sflash_init(&bus->chipco);
++		break;
++	case SSB_CHIPCO_FLASHT_PARA:
++		pr_debug("Found parallel flash\n");
++		pflash->present = true;
++		pflash->window = SSB_FLASH2;
++		pflash->window_size = SSB_FLASH2_SZ;
+ 		if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG)
+ 		               & SSB_CHIPCO_CFG_DS16) == 0)
+-			mcore->flash_buswidth = 1;
+-	} else {
+-		mcore->flash_window = 0x1fc00000;
+-		mcore->flash_window_size = 0x00400000;
++			pflash->buswidth = 1;
++		else
++			pflash->buswidth = 2;
++		break;
++	}
++
++ssb_pflash:
++	if (pflash->present) {
++		ssb_pflash_data.width = pflash->buswidth;
++		ssb_pflash_resource.start = pflash->window;
++		ssb_pflash_resource.end = pflash->window + pflash->window_size;
+ 	}
+ }
+ 
+@@ -208,9 +254,12 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
+ 	struct ssb_bus *bus = mcore->dev->bus;
+ 	u32 pll_type, n, m, rate = 0;
+ 
+-	if (bus->extif.dev) {
++	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
++		return ssb_pmu_get_cpu_clock(&bus->chipco);
++
++	if (ssb_extif_available(&bus->extif)) {
+ 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
+-	} else if (bus->chipco.dev) {
++	} else if (ssb_chipco_available(&bus->chipco)) {
+ 		ssb_chipco_get_clockcpu(&bus->chipco, &pll_type, &n, &m);
+ 	} else
+ 		return 0;
+@@ -238,7 +287,7 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 	if (!mcore->dev)
+ 		return; /* We don't have a MIPS core */
+ 
+-	ssb_dprintk(KERN_INFO PFX "Initializing MIPS core...\n");
++	ssb_dbg("Initializing MIPS core...\n");
+ 
+ 	bus = mcore->dev->bus;
+ 	hz = ssb_clockspeed(bus);
+@@ -246,9 +295,9 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 		hz = 100000000;
+ 	ns = 1000000000 / hz;
+ 
+-	if (bus->extif.dev)
++	if (ssb_extif_available(&bus->extif))
+ 		ssb_extif_timing_init(&bus->extif, ns);
+-	else if (bus->chipco.dev)
++	else if (ssb_chipco_available(&bus->chipco))
+ 		ssb_chipco_timing_init(&bus->chipco, ns);
+ 
+ 	/* Assign IRQs to all cores on the bus, start with irq line 2, because serial usually takes 1 */
+@@ -286,7 +335,7 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 			break;
+ 		}
+ 	}
+-	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
++	ssb_dbg("after irq reconfiguration\n");
+ 	dump_irq(bus);
+ 
+ 	ssb_mips_serial_init(mcore);
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -263,8 +263,7 @@ int ssb_pcicore_plat_dev_init(struct pci
+ 		return -ENODEV;
+ 	}
+ 
+-	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
+-		   pci_name(d));
++	ssb_info("PCI: Fixing up device %s\n", pci_name(d));
+ 
+ 	/* Fix up interrupt lines */
+ 	d->irq = ssb_mips_irq(extpci_core->dev) + 2;
+@@ -285,12 +284,12 @@ static void ssb_pcicore_fixup_pcibridge(
+ 	if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) != 0)
+ 		return;
+ 
+-	ssb_printk(KERN_INFO "PCI: Fixing up bridge %s\n", pci_name(dev));
++	ssb_info("PCI: Fixing up bridge %s\n", pci_name(dev));
+ 
+ 	/* Enable PCI bridge bus mastering and memory space */
+ 	pci_set_master(dev);
+ 	if (pcibios_enable_device(dev, ~0) < 0) {
+-		ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n");
++		ssb_err("PCI: SSB bridge enable failed\n");
+ 		return;
+ 	}
+ 
+@@ -299,8 +298,8 @@ static void ssb_pcicore_fixup_pcibridge(
+ 
+ 	/* Make sure our latency is high enough to handle the devices behind us */
+ 	lat = 168;
+-	ssb_printk(KERN_INFO "PCI: Fixing latency timer of device %s to %u\n",
+-		   pci_name(dev), lat);
++	ssb_info("PCI: Fixing latency timer of device %s to %u\n",
++		 pci_name(dev), lat);
+ 	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_pcicore_fixup_pcibridge);
+@@ -323,7 +322,7 @@ static void __devinit ssb_pcicore_init_h
+ 		return;
+ 	extpci_core = pc;
+ 
+-	ssb_dprintk(KERN_INFO PFX "PCIcore in host mode found\n");
++	ssb_dbg("PCIcore in host mode found\n");
+ 	/* Reset devices on the external PCI bus */
+ 	val = SSB_PCICORE_CTL_RST_OE;
+ 	val |= SSB_PCICORE_CTL_CLK_OE;
+@@ -338,7 +337,7 @@ static void __devinit ssb_pcicore_init_h
+ 	udelay(1); /* Assertion time demanded by the PCI standard */
+ 
+ 	if (pc->dev->bus->has_cardbus_slot) {
+-		ssb_dprintk(KERN_INFO PFX "CardBus slot detected\n");
++		ssb_dbg("CardBus slot detected\n");
+ 		pc->cardbusmode = 1;
+ 		/* GPIO 1 resets the bridge */
+ 		ssb_gpio_out(pc->dev->bus, 1, 1);
+--- a/drivers/ssb/embedded.c
++++ b/drivers/ssb/embedded.c
+@@ -4,11 +4,13 @@
+  *
+  * Copyright 2005-2008, Broadcom Corporation
+  * Copyright 2006-2008, Michael Buesch <m@bues.ch>
++ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
+  *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
+ #include <linux/export.h>
++#include <linux/platform_device.h>
+ #include <linux/ssb/ssb.h>
+ #include <linux/ssb/ssb_embedded.h>
+ #include <linux/ssb/ssb_driver_pci.h>
+@@ -32,6 +34,38 @@ int ssb_watchdog_timer_set(struct ssb_bu
+ }
+ EXPORT_SYMBOL(ssb_watchdog_timer_set);
+ 
++int ssb_watchdog_register(struct ssb_bus *bus)
++{
++	struct bcm47xx_wdt wdt = {};
++	struct platform_device *pdev;
++
++	if (ssb_chipco_available(&bus->chipco)) {
++		wdt.driver_data = &bus->chipco;
++		wdt.timer_set = ssb_chipco_watchdog_timer_set_wdt;
++		wdt.timer_set_ms = ssb_chipco_watchdog_timer_set_ms;
++		wdt.max_timer_ms = bus->chipco.max_timer_ms;
++	} else if (ssb_extif_available(&bus->extif)) {
++		wdt.driver_data = &bus->extif;
++		wdt.timer_set = ssb_extif_watchdog_timer_set_wdt;
++		wdt.timer_set_ms = ssb_extif_watchdog_timer_set_ms;
++		wdt.max_timer_ms = SSB_EXTIF_WATCHDOG_MAX_TIMER_MS;
++	} else {
++		return -ENODEV;
++	}
++
++	pdev = platform_device_register_data(NULL, "bcm47xx-wdt",
++					     bus->busnumber, &wdt,
++					     sizeof(wdt));
++	if (IS_ERR(pdev)) {
++		ssb_dbg("can not register watchdog device, err: %li\n",
++			PTR_ERR(pdev));
++		return PTR_ERR(pdev);
++	}
++
++	bus->watchdog = pdev;
++	return 0;
++}
++
+ u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask)
+ {
+ 	unsigned long flags;
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -13,6 +13,7 @@
+ #include <linux/delay.h>
+ #include <linux/io.h>
+ #include <linux/module.h>
++#include <linux/platform_device.h>
+ #include <linux/ssb/ssb.h>
+ #include <linux/ssb/ssb_regs.h>
+ #include <linux/ssb/ssb_driver_gige.h>
+@@ -289,8 +290,8 @@ int ssb_devices_thaw(struct ssb_freeze_c
+ 
+ 		err = sdrv->probe(sdev, &sdev->id);
+ 		if (err) {
+-			ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
+-				   dev_name(sdev->dev));
++			ssb_err("Failed to thaw device %s\n",
++				dev_name(sdev->dev));
+ 			result = err;
+ 		}
+ 		ssb_driver_put(sdrv);
+@@ -449,10 +450,23 @@ static void ssb_devices_unregister(struc
+ 		if (sdev->dev)
+ 			device_unregister(sdev->dev);
+ 	}
++
++#ifdef CONFIG_SSB_EMBEDDED
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		platform_device_unregister(bus->watchdog);
++#endif
+ }
+ 
+ void ssb_bus_unregister(struct ssb_bus *bus)
+ {
++	int err;
++
++	err = ssb_gpio_unregister(bus);
++	if (err == -EBUSY)
++		ssb_dbg("Some GPIOs are still in use\n");
++	else if (err)
++		ssb_dbg("Can not unregister GPIO driver: %i\n", err);
++
+ 	ssb_buses_lock();
+ 	ssb_devices_unregister(bus);
+ 	list_del(&bus->list);
+@@ -498,8 +512,7 @@ static int ssb_devices_register(struct s
+ 
+ 		devwrap = kzalloc(sizeof(*devwrap), GFP_KERNEL);
+ 		if (!devwrap) {
+-			ssb_printk(KERN_ERR PFX
+-				   "Could not allocate device\n");
++			ssb_err("Could not allocate device\n");
+ 			err = -ENOMEM;
+ 			goto error;
+ 		}
+@@ -538,9 +551,7 @@ static int ssb_devices_register(struct s
+ 		sdev->dev = dev;
+ 		err = device_register(dev);
+ 		if (err) {
+-			ssb_printk(KERN_ERR PFX
+-				   "Could not register %s\n",
+-				   dev_name(dev));
++			ssb_err("Could not register %s\n", dev_name(dev));
+ 			/* Set dev to NULL to not unregister
+ 			 * dev on error unwinding. */
+ 			sdev->dev = NULL;
+@@ -550,6 +561,22 @@ static int ssb_devices_register(struct s
+ 		dev_idx++;
+ 	}
+ 
++#ifdef CONFIG_SSB_DRIVER_MIPS
++	if (bus->mipscore.pflash.present) {
++		err = platform_device_register(&ssb_pflash_dev);
++		if (err)
++			pr_err("Error registering parallel flash\n");
++	}
++#endif
++
++#ifdef CONFIG_SSB_SFLASH
++	if (bus->mipscore.sflash.present) {
++		err = platform_device_register(&ssb_sflash_dev);
++		if (err)
++			pr_err("Error registering serial flash\n");
++	}
++#endif
++
+ 	return 0;
+ error:
+ 	/* Unwind the already registered devices. */
+@@ -577,6 +604,8 @@ static int __devinit ssb_attach_queued_b
+ 		if (err)
+ 			goto error;
+ 		ssb_pcicore_init(&bus->pcicore);
++		if (bus->bustype == SSB_BUSTYPE_SSB)
++			ssb_watchdog_register(bus);
+ 		ssb_bus_may_powerdown(bus);
+ 
+ 		err = ssb_devices_register(bus);
+@@ -812,7 +841,13 @@ static int __devinit ssb_bus_register(st
+ 	if (err)
+ 		goto err_pcmcia_exit;
+ 	ssb_chipcommon_init(&bus->chipco);
++	ssb_extif_init(&bus->extif);
+ 	ssb_mipscore_init(&bus->mipscore);
++	err = ssb_gpio_init(bus);
++	if (err == -ENOTSUPP)
++		ssb_dbg("GPIO driver not activated\n");
++	else if (err)
++		ssb_dbg("Error registering GPIO driver: %i\n", err);
+ 	err = ssb_fetch_invariants(bus, get_invariants);
+ 	if (err) {
+ 		ssb_bus_may_powerdown(bus);
+@@ -863,11 +898,11 @@ int __devinit ssb_bus_pcibus_register(st
+ 
+ 	err = ssb_bus_register(bus, ssb_pci_get_invariants, 0);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
+-			   "PCI device %s\n", dev_name(&host_pci->dev));
++		ssb_info("Sonics Silicon Backplane found on PCI device %s\n",
++			 dev_name(&host_pci->dev));
+ 	} else {
+-		ssb_printk(KERN_ERR PFX "Failed to register PCI version"
+-			   " of SSB with error %d\n", err);
++		ssb_err("Failed to register PCI version of SSB with error %d\n",
++			err);
+ 	}
+ 
+ 	return err;
+@@ -888,8 +923,8 @@ int __devinit ssb_bus_pcmciabus_register
+ 
+ 	err = ssb_bus_register(bus, ssb_pcmcia_get_invariants, baseaddr);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
+-			   "PCMCIA device %s\n", pcmcia_dev->devname);
++		ssb_info("Sonics Silicon Backplane found on PCMCIA device %s\n",
++			 pcmcia_dev->devname);
+ 	}
+ 
+ 	return err;
+@@ -911,8 +946,8 @@ int __devinit ssb_bus_sdiobus_register(s
+ 
+ 	err = ssb_bus_register(bus, ssb_sdio_get_invariants, ~0);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
+-			   "SDIO device %s\n", sdio_func_id(func));
++		ssb_info("Sonics Silicon Backplane found on SDIO device %s\n",
++			 sdio_func_id(func));
+ 	}
+ 
+ 	return err;
+@@ -931,8 +966,8 @@ int __devinit ssb_bus_ssbbus_register(st
+ 
+ 	err = ssb_bus_register(bus, get_invariants, baseaddr);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found at "
+-			   "address 0x%08lX\n", baseaddr);
++		ssb_info("Sonics Silicon Backplane found at address 0x%08lX\n",
++			 baseaddr);
+ 	}
+ 
+ 	return err;
+@@ -1094,6 +1129,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+ 	u32 plltype;
+ 	u32 clkctl_n, clkctl_m;
+ 
++	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
++		return ssb_pmu_get_controlclock(&bus->chipco);
++
+ 	if (ssb_extif_available(&bus->extif))
+ 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
+ 					   &clkctl_n, &clkctl_m);
+@@ -1131,8 +1169,7 @@ static u32 ssb_tmslow_reject_bitmask(str
+ 	case SSB_IDLOW_SSBREV_27:     /* same here */
+ 		return SSB_TMSLOW_REJECT;	/* this is a guess */
+ 	default:
+-		printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
+-		WARN_ON(1);
++		WARN(1, KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
+ 	}
+ 	return (SSB_TMSLOW_REJECT | SSB_TMSLOW_REJECT_23);
+ }
+@@ -1324,7 +1361,7 @@ out:
+ #endif
+ 	return err;
+ error:
+-	ssb_printk(KERN_ERR PFX "Bus powerdown failed\n");
++	ssb_err("Bus powerdown failed\n");
+ 	goto out;
+ }
+ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1347,7 +1384,7 @@ int ssb_bus_powerup(struct ssb_bus *bus,
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
++	ssb_err("Bus powerup failed\n");
+ 	return err;
+ }
+ EXPORT_SYMBOL(ssb_bus_powerup);
+@@ -1455,15 +1492,13 @@ static int __init ssb_modinit(void)
+ 
+ 	err = b43_pci_ssb_bridge_init();
+ 	if (err) {
+-		ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
+-			   "initialization failed\n");
++		ssb_err("Broadcom 43xx PCI-SSB-bridge initialization failed\n");
+ 		/* don't fail SSB init because of this */
+ 		err = 0;
+ 	}
+ 	err = ssb_gige_init();
+ 	if (err) {
+-		ssb_printk(KERN_ERR "SSB Broadcom Gigabit Ethernet "
+-			   "driver initialization failed\n");
++		ssb_err("SSB Broadcom Gigabit Ethernet driver initialization failed\n");
+ 		/* don't fail SSB init because of this */
+ 		err = 0;
+ 	}
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -56,7 +56,7 @@ int ssb_pci_switch_coreidx(struct ssb_bu
+ 	}
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
++	ssb_err("Failed to switch to core %u\n", coreidx);
+ 	return -ENODEV;
+ }
+ 
+@@ -67,10 +67,9 @@ int ssb_pci_switch_core(struct ssb_bus *
+ 	unsigned long flags;
+ 
+ #if SSB_VERBOSE_PCICORESWITCH_DEBUG
+-	ssb_printk(KERN_INFO PFX
+-		   "Switching to %s core, index %d\n",
+-		   ssb_core_name(dev->id.coreid),
+-		   dev->core_index);
++	ssb_info("Switching to %s core, index %d\n",
++		 ssb_core_name(dev->id.coreid),
++		 dev->core_index);
+ #endif
+ 
+ 	spin_lock_irqsave(&bus->bar_lock, flags);
+@@ -178,6 +177,18 @@ err_pci:
+ #define SPEX(_outvar, _offset, _mask, _shift) \
+ 	SPEX16(_outvar, _offset, _mask, _shift)
+ 
++#define SPEX_ARRAY8(_field, _offset, _mask, _shift)	\
++	do {	\
++		SPEX(_field[0], _offset +  0, _mask, _shift);	\
++		SPEX(_field[1], _offset +  2, _mask, _shift);	\
++		SPEX(_field[2], _offset +  4, _mask, _shift);	\
++		SPEX(_field[3], _offset +  6, _mask, _shift);	\
++		SPEX(_field[4], _offset +  8, _mask, _shift);	\
++		SPEX(_field[5], _offset + 10, _mask, _shift);	\
++		SPEX(_field[6], _offset + 12, _mask, _shift);	\
++		SPEX(_field[7], _offset + 14, _mask, _shift);	\
++	} while (0)
++
+ 
+ static inline u8 ssb_crc8(u8 crc, u8 data)
+ {
+@@ -219,6 +230,15 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
+ 	return t[crc ^ data];
+ }
+ 
++static void sprom_get_mac(char *mac, const u16 *in)
++{
++	int i;
++	for (i = 0; i < 3; i++) {
++		*mac++ = in[i] >> 8;
++		*mac++ = in[i];
++	}
++}
++
+ static u8 ssb_sprom_crc(const u16 *sprom, u16 size)
+ {
+ 	int word;
+@@ -266,7 +286,7 @@ static int sprom_do_write(struct ssb_bus
+ 	u32 spromctl;
+ 	u16 size = bus->sprom_size;
+ 
+-	ssb_printk(KERN_NOTICE PFX "Writing SPROM. Do NOT turn off the power! Please stand by...\n");
++	ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
+ 	err = pci_read_config_dword(pdev, SSB_SPROMCTL, &spromctl);
+ 	if (err)
+ 		goto err_ctlreg;
+@@ -274,17 +294,17 @@ static int sprom_do_write(struct ssb_bus
+ 	err = pci_write_config_dword(pdev, SSB_SPROMCTL, spromctl);
+ 	if (err)
+ 		goto err_ctlreg;
+-	ssb_printk(KERN_NOTICE PFX "[ 0%%");
++	ssb_notice("[ 0%%");
+ 	msleep(500);
+ 	for (i = 0; i < size; i++) {
+ 		if (i == size / 4)
+-			ssb_printk("25%%");
++			ssb_cont("25%%");
+ 		else if (i == size / 2)
+-			ssb_printk("50%%");
++			ssb_cont("50%%");
+ 		else if (i == (size * 3) / 4)
+-			ssb_printk("75%%");
++			ssb_cont("75%%");
+ 		else if (i % 2)
+-			ssb_printk(".");
++			ssb_cont(".");
+ 		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
+ 		mmiowb();
+ 		msleep(20);
+@@ -297,12 +317,12 @@ static int sprom_do_write(struct ssb_bus
+ 	if (err)
+ 		goto err_ctlreg;
+ 	msleep(500);
+-	ssb_printk("100%% ]\n");
+-	ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
++	ssb_cont("100%% ]\n");
++	ssb_notice("SPROM written\n");
+ 
+ 	return 0;
+ err_ctlreg:
+-	ssb_printk(KERN_ERR PFX "Could not access SPROM control register.\n");
++	ssb_err("Could not access SPROM control register.\n");
+ 	return err;
+ }
+ 
+@@ -327,11 +347,23 @@ static s8 r123_extract_antgain(u8 sprom_
+ 	return (s8)gain;
+ }
+ 
++static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in)
++{
++	SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
++	SPEX(opo, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);
++	SPEX(pa1lob0, SSB_SPROM2_PA1LOB0, 0xFFFF, 0);
++	SPEX(pa1lob1, SSB_SPROM2_PA1LOB1, 0xFFFF, 0);
++	SPEX(pa1lob2, SSB_SPROM2_PA1LOB2, 0xFFFF, 0);
++	SPEX(pa1hib0, SSB_SPROM2_PA1HIB0, 0xFFFF, 0);
++	SPEX(pa1hib1, SSB_SPROM2_PA1HIB1, 0xFFFF, 0);
++	SPEX(pa1hib2, SSB_SPROM2_PA1HIB2, 0xFFFF, 0);
++	SPEX(maxpwr_ah, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_HI, 0);
++	SPEX(maxpwr_al, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_LO,
++	     SSB_SPROM2_MAXP_A_LO_SHIFT);
++}
++
+ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
+ {
+-	int i;
+-	u16 v;
+-	s8 gain;
+ 	u16 loc[3];
+ 
+ 	if (out->revision == 3)			/* rev 3 moved MAC */
+@@ -341,19 +373,10 @@ static void sprom_extract_r123(struct ss
+ 		loc[1] = SSB_SPROM1_ET0MAC;
+ 		loc[2] = SSB_SPROM1_ET1MAC;
+ 	}
+-	for (i = 0; i < 3; i++) {
+-		v = in[SPOFF(loc[0]) + i];
+-		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
+-	}
++	sprom_get_mac(out->il0mac, &in[SPOFF(loc[0])]);
+ 	if (out->revision < 3) { 	/* only rev 1-2 have et0, et1 */
+-		for (i = 0; i < 3; i++) {
+-			v = in[SPOFF(loc[1]) + i];
+-			*(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
+-		}
+-		for (i = 0; i < 3; i++) {
+-			v = in[SPOFF(loc[2]) + i];
+-			*(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
+-		}
++		sprom_get_mac(out->et0mac, &in[SPOFF(loc[1])]);
++		sprom_get_mac(out->et1mac, &in[SPOFF(loc[2])]);
+ 	}
+ 	SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);
+ 	SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,
+@@ -361,8 +384,10 @@ static void sprom_extract_r123(struct ss
+ 	SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);
+ 	SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);
+ 	SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);
+-	SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
+-	     SSB_SPROM1_BINF_CCODE_SHIFT);
++	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
++	if (out->revision == 1)
++		SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
++		     SSB_SPROM1_BINF_CCODE_SHIFT);
+ 	SPEX(ant_available_a, SSB_SPROM1_BINF, SSB_SPROM1_BINF_ANTA,
+ 	     SSB_SPROM1_BINF_ANTA_SHIFT);
+ 	SPEX(ant_available_bg, SSB_SPROM1_BINF, SSB_SPROM1_BINF_ANTBG,
+@@ -386,24 +411,19 @@ static void sprom_extract_r123(struct ss
+ 	     SSB_SPROM1_ITSSI_A_SHIFT);
+ 	SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
+ 	SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
+-	if (out->revision >= 2)
+-		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
++
++	SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8);
++	SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	gain = r123_extract_antgain(out->revision, in,
+-				    SSB_SPROM1_AGAIN_BG,
+-				    SSB_SPROM1_AGAIN_BG_SHIFT);
+-	out->antenna_gain.ghz24.a0 = gain;
+-	out->antenna_gain.ghz24.a1 = gain;
+-	out->antenna_gain.ghz24.a2 = gain;
+-	out->antenna_gain.ghz24.a3 = gain;
+-	gain = r123_extract_antgain(out->revision, in,
+-				    SSB_SPROM1_AGAIN_A,
+-				    SSB_SPROM1_AGAIN_A_SHIFT);
+-	out->antenna_gain.ghz5.a0 = gain;
+-	out->antenna_gain.ghz5.a1 = gain;
+-	out->antenna_gain.ghz5.a2 = gain;
+-	out->antenna_gain.ghz5.a3 = gain;
++	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
++						    SSB_SPROM1_AGAIN_BG,
++						    SSB_SPROM1_AGAIN_BG_SHIFT);
++	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
++						    SSB_SPROM1_AGAIN_A,
++						    SSB_SPROM1_AGAIN_A_SHIFT);
++	if (out->revision >= 2)
++		sprom_extract_r23(out, in);
+ }
+ 
+ /* Revs 4 5 and 8 have partially shared layout */
+@@ -448,30 +468,30 @@ static void sprom_extract_r458(struct ss
+ 
+ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
+ {
+-	int i;
+-	u16 v;
+ 	u16 il0mac_offset;
+ 
+ 	if (out->revision == 4)
+ 		il0mac_offset = SSB_SPROM4_IL0MAC;
+ 	else
+ 		il0mac_offset = SSB_SPROM5_IL0MAC;
+-	/* extract the MAC address */
+-	for (i = 0; i < 3; i++) {
+-		v = in[SPOFF(il0mac_offset) + i];
+-		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
+-	}
++
++	sprom_get_mac(out->il0mac, &in[SPOFF(il0mac_offset)]);
++
+ 	SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
+ 	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
+ 	     SSB_SPROM4_ETHPHY_ET1A_SHIFT);
++	SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
++	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
+ 	if (out->revision == 4) {
+-		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
++		SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
++		SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
+ 		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
+ 		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
+ 		SPEX(boardflags2_lo, SSB_SPROM4_BFL2LO, 0xFFFF, 0);
+ 		SPEX(boardflags2_hi, SSB_SPROM4_BFL2HI, 0xFFFF, 0);
+ 	} else {
+-		SPEX(country_code, SSB_SPROM5_CCODE, 0xFFFF, 0);
++		SPEX(alpha2[0], SSB_SPROM5_CCODE, 0xff00, 8);
++		SPEX(alpha2[1], SSB_SPROM5_CCODE, 0x00ff, 0);
+ 		SPEX(boardflags_lo, SSB_SPROM5_BFLLO, 0xFFFF, 0);
+ 		SPEX(boardflags_hi, SSB_SPROM5_BFLHI, 0xFFFF, 0);
+ 		SPEX(boardflags2_lo, SSB_SPROM5_BFL2LO, 0xFFFF, 0);
+@@ -504,16 +524,14 @@ static void sprom_extract_r45(struct ssb
+ 	}
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
++	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
+ 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
++	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
+ 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
++	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
+ 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
++	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
+ 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
+-	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+-	       sizeof(out->antenna_gain.ghz5));
+ 
+ 	sprom_extract_r458(out, in);
+ 
+@@ -523,14 +541,21 @@ static void sprom_extract_r45(struct ssb
+ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
+ {
+ 	int i;
+-	u16 v;
++	u16 o;
++	u16 pwr_info_offset[] = {
++		SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
++		SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
++	};
++	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
++			ARRAY_SIZE(out->core_pwr_info));
+ 
+ 	/* extract the MAC address */
+-	for (i = 0; i < 3; i++) {
+-		v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
+-		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
+-	}
+-	SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
++	sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]);
++
++	SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
++	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
++	SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
++	SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
+ 	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
+ 	SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);
+ 	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);
+@@ -596,16 +621,46 @@ static void sprom_extract_r8(struct ssb_
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
+ 
+ 	/* Extract the antenna gain values. */
+-	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
++	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
+ 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
+-	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
++	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
+ 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
+-	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
++	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
+ 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
+-	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
++	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
+ 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
+-	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+-	       sizeof(out->antenna_gain.ghz5));
++
++	/* Extract cores power info info */
++	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
++		o = pwr_info_offset[i];
++		SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
++			SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
++			SSB_SPROM8_2G_MAXP, 0);
++
++		SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
++
++		SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
++			SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
++			SSB_SPROM8_5G_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
++			SSB_SPROM8_5GH_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
++			SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
++
++		SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
++	}
+ 
+ 	/* Extract FEM info */
+ 	SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,
+@@ -630,6 +685,63 @@ static void sprom_extract_r8(struct ssb_
+ 	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
+ 		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
+ 
++	SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
++	     SSB_SPROM8_LEDDC_ON_SHIFT);
++	SPEX(leddc_off_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_OFF,
++	     SSB_SPROM8_LEDDC_OFF_SHIFT);
++
++	SPEX(txchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_TXCHAIN,
++	     SSB_SPROM8_TXRXC_TXCHAIN_SHIFT);
++	SPEX(rxchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_RXCHAIN,
++	     SSB_SPROM8_TXRXC_RXCHAIN_SHIFT);
++	SPEX(antswitch, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_SWITCH,
++	     SSB_SPROM8_TXRXC_SWITCH_SHIFT);
++
++	SPEX(opo, SSB_SPROM8_OFDM2GPO, 0x00ff, 0);
++
++	SPEX_ARRAY8(mcs2gpo, SSB_SPROM8_2G_MCSPO, ~0, 0);
++	SPEX_ARRAY8(mcs5gpo, SSB_SPROM8_5G_MCSPO, ~0, 0);
++	SPEX_ARRAY8(mcs5glpo, SSB_SPROM8_5GL_MCSPO, ~0, 0);
++	SPEX_ARRAY8(mcs5ghpo, SSB_SPROM8_5GH_MCSPO, ~0, 0);
++
++	SPEX(rawtempsense, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_RAWTEMP,
++	     SSB_SPROM8_RAWTS_RAWTEMP_SHIFT);
++	SPEX(measpower, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_MEASPOWER,
++	     SSB_SPROM8_RAWTS_MEASPOWER_SHIFT);
++	SPEX(tempsense_slope, SSB_SPROM8_OPT_CORRX,
++	     SSB_SPROM8_OPT_CORRX_TEMP_SLOPE,
++	     SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT);
++	SPEX(tempcorrx, SSB_SPROM8_OPT_CORRX, SSB_SPROM8_OPT_CORRX_TEMPCORRX,
++	     SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT);
++	SPEX(tempsense_option, SSB_SPROM8_OPT_CORRX,
++	     SSB_SPROM8_OPT_CORRX_TEMP_OPTION,
++	     SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT);
++	SPEX(freqoffset_corr, SSB_SPROM8_HWIQ_IQSWP,
++	     SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR,
++	     SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT);
++	SPEX(iqcal_swp_dis, SSB_SPROM8_HWIQ_IQSWP,
++	     SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP,
++	     SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT);
++	SPEX(hw_iqcal_en, SSB_SPROM8_HWIQ_IQSWP, SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL,
++	     SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT);
++
++	SPEX(bw40po, SSB_SPROM8_BW40PO, ~0, 0);
++	SPEX(cddpo, SSB_SPROM8_CDDPO, ~0, 0);
++	SPEX(stbcpo, SSB_SPROM8_STBCPO, ~0, 0);
++	SPEX(bwduppo, SSB_SPROM8_BWDUPPO, ~0, 0);
++
++	SPEX(tempthresh, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_TRESH,
++	     SSB_SPROM8_THERMAL_TRESH_SHIFT);
++	SPEX(tempoffset, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_OFFSET,
++	     SSB_SPROM8_THERMAL_OFFSET_SHIFT);
++	SPEX(phycal_tempdelta, SSB_SPROM8_TEMPDELTA,
++	     SSB_SPROM8_TEMPDELTA_PHYCAL,
++	     SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT);
++	SPEX(temps_period, SSB_SPROM8_TEMPDELTA, SSB_SPROM8_TEMPDELTA_PERIOD,
++	     SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT);
++	SPEX(temps_hysteresis, SSB_SPROM8_TEMPDELTA,
++	     SSB_SPROM8_TEMPDELTA_HYSTERESIS,
++	     SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT);
+ 	sprom_extract_r458(out, in);
+ 
+ 	/* TODO - get remaining rev 8 stuff needed */
+@@ -641,7 +753,7 @@ static int sprom_extract(struct ssb_bus
+ 	memset(out, 0, sizeof(*out));
+ 
+ 	out->revision = in[size - 1] & 0x00FF;
+-	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
++	ssb_dbg("SPROM revision %d detected\n", out->revision);
+ 	memset(out->et0mac, 0xFF, 6);		/* preset et0 and et1 mac */
+ 	memset(out->et1mac, 0xFF, 6);
+ 
+@@ -650,7 +762,7 @@ static int sprom_extract(struct ssb_bus
+ 		 * number stored in the SPROM.
+ 		 * Always extract r1. */
+ 		out->revision = 1;
+-		ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
++		ssb_dbg("SPROM treated as revision %d\n", out->revision);
+ 	}
+ 
+ 	switch (out->revision) {
+@@ -667,9 +779,8 @@ static int sprom_extract(struct ssb_bus
+ 		sprom_extract_r8(out, in);
+ 		break;
+ 	default:
+-		ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
+-			   " revision %d detected. Will extract"
+-			   " v1\n", out->revision);
++		ssb_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
++			 out->revision);
+ 		out->revision = 1;
+ 		sprom_extract_r123(out, in);
+ 	}
+@@ -689,7 +800,7 @@ static int ssb_pci_sprom_get(struct ssb_
+ 	u16 *buf;
+ 
+ 	if (!ssb_is_sprom_available(bus)) {
+-		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
++		ssb_err("No SPROM available!\n");
+ 		return -ENODEV;
+ 	}
+ 	if (bus->chipco.dev) {	/* can be unavailable! */
+@@ -708,7 +819,7 @@ static int ssb_pci_sprom_get(struct ssb_
+ 	} else {
+ 		bus->sprom_offset = SSB_SPROM_BASE1;
+ 	}
+-	ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset);
++	ssb_dbg("SPROM offset is 0x%x\n", bus->sprom_offset);
+ 
+ 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
+ 	if (!buf)
+@@ -733,18 +844,15 @@ static int ssb_pci_sprom_get(struct ssb_
+ 			 * available for this device in some other storage */
+ 			err = ssb_fill_sprom_with_fallback(bus, sprom);
+ 			if (err) {
+-				ssb_printk(KERN_WARNING PFX "WARNING: Using"
+-					   " fallback SPROM failed (err %d)\n",
+-					   err);
++				ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n",
++					 err);
+ 			} else {
+-				ssb_dprintk(KERN_DEBUG PFX "Using SPROM"
+-					    " revision %d provided by"
+-					    " platform.\n", sprom->revision);
++				ssb_dbg("Using SPROM revision %d provided by platform\n",
++					sprom->revision);
+ 				err = 0;
+ 				goto out_free;
+ 			}
+-			ssb_printk(KERN_WARNING PFX "WARNING: Invalid"
+-				   " SPROM CRC (corrupt SPROM)\n");
++			ssb_warn("WARNING: Invalid SPROM CRC (corrupt SPROM)\n");
+ 		}
+ 	}
+ 	err = sprom_extract(bus, sprom, buf, bus->sprom_size);
+@@ -759,7 +867,6 @@ static void ssb_pci_get_boardinfo(struct
+ {
+ 	bi->vendor = bus->host_pci->subsystem_vendor;
+ 	bi->type = bus->host_pci->subsystem_device;
+-	bi->rev = bus->host_pci->revision;
+ }
+ 
+ int ssb_pci_get_invariants(struct ssb_bus *bus,
+--- a/drivers/ssb/pcihost_wrapper.c
++++ b/drivers/ssb/pcihost_wrapper.c
+@@ -38,7 +38,7 @@ static int ssb_pcihost_resume(struct pci
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+-	pci_set_power_state(dev, 0);
++	pci_set_power_state(dev, PCI_D0);
+ 	err = pci_enable_device(dev);
+ 	if (err)
+ 		return err;
+--- a/drivers/ssb/pcmcia.c
++++ b/drivers/ssb/pcmcia.c
+@@ -143,7 +143,7 @@ int ssb_pcmcia_switch_coreidx(struct ssb
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
++	ssb_err("Failed to switch to core %u\n", coreidx);
+ 	return err;
+ }
+ 
+@@ -153,10 +153,9 @@ int ssb_pcmcia_switch_core(struct ssb_bu
+ 	int err;
+ 
+ #if SSB_VERBOSE_PCMCIACORESWITCH_DEBUG
+-	ssb_printk(KERN_INFO PFX
+-		   "Switching to %s core, index %d\n",
+-		   ssb_core_name(dev->id.coreid),
+-		   dev->core_index);
++	ssb_info("Switching to %s core, index %d\n",
++		 ssb_core_name(dev->id.coreid),
++		 dev->core_index);
+ #endif
+ 
+ 	err = ssb_pcmcia_switch_coreidx(bus, dev->core_index);
+@@ -192,7 +191,7 @@ int ssb_pcmcia_switch_segment(struct ssb
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to switch pcmcia segment\n");
++	ssb_err("Failed to switch pcmcia segment\n");
+ 	return err;
+ }
+ 
+@@ -549,44 +548,39 @@ static int ssb_pcmcia_sprom_write_all(st
+ 	bool failed = 0;
+ 	size_t size = SSB_PCMCIA_SPROM_SIZE;
+ 
+-	ssb_printk(KERN_NOTICE PFX
+-		   "Writing SPROM. Do NOT turn off the power! "
+-		   "Please stand by...\n");
++	ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
+ 	err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEEN);
+ 	if (err) {
+-		ssb_printk(KERN_NOTICE PFX
+-			   "Could not enable SPROM write access.\n");
++		ssb_notice("Could not enable SPROM write access\n");
+ 		return -EBUSY;
+ 	}
+-	ssb_printk(KERN_NOTICE PFX "[ 0%%");
++	ssb_notice("[ 0%%");
+ 	msleep(500);
+ 	for (i = 0; i < size; i++) {
+ 		if (i == size / 4)
+-			ssb_printk("25%%");
++			ssb_cont("25%%");
+ 		else if (i == size / 2)
+-			ssb_printk("50%%");
++			ssb_cont("50%%");
+ 		else if (i == (size * 3) / 4)
+-			ssb_printk("75%%");
++			ssb_cont("75%%");
+ 		else if (i % 2)
+-			ssb_printk(".");
++			ssb_cont(".");
+ 		err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
+ 		if (err) {
+-			ssb_printk(KERN_NOTICE PFX
+-				   "Failed to write to SPROM.\n");
++			ssb_notice("Failed to write to SPROM\n");
+ 			failed = 1;
+ 			break;
+ 		}
+ 	}
+ 	err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
+ 	if (err) {
+-		ssb_printk(KERN_NOTICE PFX
+-			   "Could not disable SPROM write access.\n");
++		ssb_notice("Could not disable SPROM write access\n");
+ 		failed = 1;
+ 	}
+ 	msleep(500);
+ 	if (!failed) {
+-		ssb_printk("100%% ]\n");
+-		ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
++		ssb_cont("100%% ]\n");
++		ssb_notice("SPROM written\n");
+ 	}
+ 
+ 	return failed ? -EBUSY : 0;
+@@ -676,14 +670,10 @@ static int ssb_pcmcia_do_get_invariants(
+ 	case SSB_PCMCIA_CIS_ANTGAIN:
+ 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
+ 			"antg tpl size");
+-		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
+-		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
+-		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
+-		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
+-		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
+-		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
+-		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
+-		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
++		sprom->antenna_gain.a0 = tuple->TupleData[1];
++		sprom->antenna_gain.a1 = tuple->TupleData[1];
++		sprom->antenna_gain.a2 = tuple->TupleData[1];
++		sprom->antenna_gain.a3 = tuple->TupleData[1];
+ 		break;
+ 	case SSB_PCMCIA_CIS_BFLAGS:
+ 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
+@@ -704,7 +694,7 @@ static int ssb_pcmcia_do_get_invariants(
+ 	return -ENOSPC; /* continue with next entry */
+ 
+ error:
+-	ssb_printk(KERN_ERR PFX
++	ssb_err(
+ 		   "PCMCIA: Failed to fetch device invariants: %s\n",
+ 		   error_description);
+ 	return -ENODEV;
+@@ -726,7 +716,7 @@ int ssb_pcmcia_get_invariants(struct ssb
+ 	res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
+ 				ssb_pcmcia_get_mac, sprom);
+ 	if (res != 0) {
+-		ssb_printk(KERN_ERR PFX
++		ssb_err(
+ 			"PCMCIA: Failed to fetch MAC address\n");
+ 		return -ENODEV;
+ 	}
+@@ -737,7 +727,7 @@ int ssb_pcmcia_get_invariants(struct ssb
+ 	if ((res == 0) || (res == -ENOSPC))
+ 		return 0;
+ 
+-	ssb_printk(KERN_ERR PFX
++	ssb_err(
+ 			"PCMCIA: Failed to fetch device invariants\n");
+ 	return -ENODEV;
+ }
+@@ -847,6 +837,6 @@ int ssb_pcmcia_init(struct ssb_bus *bus)
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to initialize PCMCIA host device\n");
++	ssb_err("Failed to initialize PCMCIA host device\n");
+ 	return err;
+ }
+--- a/drivers/ssb/scan.c
++++ b/drivers/ssb/scan.c
+@@ -90,6 +90,8 @@ const char *ssb_core_name(u16 coreid)
+ 		return "ARM 1176";
+ 	case SSB_DEV_ARM_7TDMI:
+ 		return "ARM 7TDMI";
++	case SSB_DEV_ARM_CM3:
++		return "ARM Cortex M3";
+ 	}
+ 	return "UNKNOWN";
+ }
+@@ -123,8 +125,7 @@ static u16 pcidev_to_chipid(struct pci_d
+ 		chipid_fallback = 0x4401;
+ 		break;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "PCI-ID not in fallback list\n");
++		ssb_err("PCI-ID not in fallback list\n");
+ 	}
+ 
+ 	return chipid_fallback;
+@@ -150,8 +151,7 @@ static u8 chipid_to_nrcores(u16 chipid)
+ 	case 0x4704:
+ 		return 9;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "CHIPID not in nrcores fallback list\n");
++		ssb_err("CHIPID not in nrcores fallback list\n");
+ 	}
+ 
+ 	return 1;
+@@ -318,12 +318,13 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 			bus->chip_package = 0;
+ 		}
+ 	}
++	ssb_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
++		 bus->chip_id, bus->chip_rev, bus->chip_package);
+ 	if (!bus->nr_devices)
+ 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
+ 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
+-		ssb_printk(KERN_ERR PFX
+-			   "More than %d ssb cores found (%d)\n",
+-			   SSB_MAX_NR_CORES, bus->nr_devices);
++		ssb_err("More than %d ssb cores found (%d)\n",
++			SSB_MAX_NR_CORES, bus->nr_devices);
+ 		goto err_unmap;
+ 	}
+ 	if (bus->bustype == SSB_BUSTYPE_SSB) {
+@@ -365,8 +366,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 			nr_80211_cores++;
+ 			if (nr_80211_cores > 1) {
+ 				if (!we_support_multiple_80211_cores(bus)) {
+-					ssb_dprintk(KERN_INFO PFX "Ignoring additional "
+-						    "802.11 core\n");
++					ssb_dbg("Ignoring additional 802.11 core\n");
+ 					continue;
+ 				}
+ 			}
+@@ -374,8 +374,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 		case SSB_DEV_EXTIF:
+ #ifdef CONFIG_SSB_DRIVER_EXTIF
+ 			if (bus->extif.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple EXTIFs found\n");
++				ssb_warn("WARNING: Multiple EXTIFs found\n");
+ 				break;
+ 			}
+ 			bus->extif.dev = dev;
+@@ -383,8 +382,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 			break;
+ 		case SSB_DEV_CHIPCOMMON:
+ 			if (bus->chipco.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple ChipCommon found\n");
++				ssb_warn("WARNING: Multiple ChipCommon found\n");
+ 				break;
+ 			}
+ 			bus->chipco.dev = dev;
+@@ -393,8 +391,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 		case SSB_DEV_MIPS_3302:
+ #ifdef CONFIG_SSB_DRIVER_MIPS
+ 			if (bus->mipscore.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple MIPS cores found\n");
++				ssb_warn("WARNING: Multiple MIPS cores found\n");
+ 				break;
+ 			}
+ 			bus->mipscore.dev = dev;
+@@ -415,8 +412,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 				}
+ 			}
+ 			if (bus->pcicore.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple PCI(E) cores found\n");
++				ssb_warn("WARNING: Multiple PCI(E) cores found\n");
+ 				break;
+ 			}
+ 			bus->pcicore.dev = dev;
+--- a/drivers/ssb/sdio.c
++++ b/drivers/ssb/sdio.c
+@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
+ 			case SSB_SDIO_CIS_ANTGAIN:
+ 				GOTO_ERROR_ON(tuple->size != 2,
+ 					      "antg tpl size");
+-				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
+-				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
+-				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
+-				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
+-				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
+-				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
+-				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
+-				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
++				sprom->antenna_gain.a0 = tuple->data[1];
++				sprom->antenna_gain.a1 = tuple->data[1];
++				sprom->antenna_gain.a2 = tuple->data[1];
++				sprom->antenna_gain.a3 = tuple->data[1];
+ 				break;
+ 			case SSB_SDIO_CIS_BFLAGS:
+ 				GOTO_ERROR_ON((tuple->size != 3) &&
+--- a/drivers/ssb/sprom.c
++++ b/drivers/ssb/sprom.c
+@@ -54,7 +54,7 @@ static int hex2sprom(u16 *sprom, const c
+ 	while (cnt < sprom_size_words) {
+ 		memcpy(tmp, dump, 4);
+ 		dump += 4;
+-		err = strict_strtoul(tmp, 16, &parsed);
++		err = kstrtoul(tmp, 16, &parsed);
+ 		if (err)
+ 			return err;
+ 		sprom[cnt++] = swab16((u16)parsed);
+@@ -127,13 +127,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
+ 		goto out_kfree;
+ 	err = ssb_devices_freeze(bus, &freeze);
+ 	if (err) {
+-		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
++		ssb_err("SPROM write: Could not freeze all devices\n");
+ 		goto out_unlock;
+ 	}
+ 	res = sprom_write(bus, sprom);
+ 	err = ssb_devices_thaw(&freeze);
+ 	if (err)
+-		ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
++		ssb_err("SPROM write: Could not thaw all devices\n");
+ out_unlock:
+ 	mutex_unlock(&bus->sprom_mutex);
+ out_kfree:
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
+@@ -3,21 +3,33 @@
+ 
+ #include <linux/ssb/ssb.h>
+ #include <linux/types.h>
++#include <linux/bcm47xx_wdt.h>
+ 
+ 
+ #define PFX	"ssb: "
+ 
+ #ifdef CONFIG_SSB_SILENT
+-# define ssb_printk(fmt, x...)	do { /* nothing */ } while (0)
++# define ssb_printk(fmt, ...)					\
++	do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
+ #else
+-# define ssb_printk		printk
++# define ssb_printk(fmt, ...)					\
++	printk(fmt, ##__VA_ARGS__)
+ #endif /* CONFIG_SSB_SILENT */
+ 
++#define ssb_emerg(fmt, ...)	ssb_printk(KERN_EMERG PFX fmt, ##__VA_ARGS__)
++#define ssb_err(fmt, ...)	ssb_printk(KERN_ERR PFX fmt, ##__VA_ARGS__)
++#define ssb_warn(fmt, ...)	ssb_printk(KERN_WARNING PFX fmt, ##__VA_ARGS__)
++#define ssb_notice(fmt, ...)	ssb_printk(KERN_NOTICE PFX fmt, ##__VA_ARGS__)
++#define ssb_info(fmt, ...)	ssb_printk(KERN_INFO PFX fmt, ##__VA_ARGS__)
++#define ssb_cont(fmt, ...)	ssb_printk(KERN_CONT fmt, ##__VA_ARGS__)
++
+ /* dprintk: Debugging printk; vanishes for non-debug compilation */
+ #ifdef CONFIG_SSB_DEBUG
+-# define ssb_dprintk(fmt, x...)	ssb_printk(fmt , ##x)
++# define ssb_dbg(fmt, ...)					\
++	ssb_printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__)
+ #else
+-# define ssb_dprintk(fmt, x...)	do { /* nothing */ } while (0)
++# define ssb_dbg(fmt, ...)					\
++	do { if (0) printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__); } while (0)
+ #endif
+ 
+ #ifdef CONFIG_SSB_DEBUG
+@@ -207,4 +219,79 @@ static inline void b43_pci_ssb_bridge_ex
+ }
+ #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
+ 
++/* driver_chipcommon_pmu.c */
++extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
++extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
++extern u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc);
++
++extern u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,
++					     u32 ticks);
++extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
++
++/* driver_chipcommon_sflash.c */
++#ifdef CONFIG_SSB_SFLASH
++int ssb_sflash_init(struct ssb_chipcommon *cc);
++#else
++static inline int ssb_sflash_init(struct ssb_chipcommon *cc)
++{
++	pr_err("Serial flash not supported\n");
++	return 0;
++}
++#endif /* CONFIG_SSB_SFLASH */
++
++#ifdef CONFIG_SSB_DRIVER_MIPS
++extern struct platform_device ssb_pflash_dev;
++#endif
++
++#ifdef CONFIG_SSB_SFLASH
++extern struct platform_device ssb_sflash_dev;
++#endif
++
++#ifdef CONFIG_SSB_DRIVER_EXTIF
++extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);
++extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
++#else
++static inline u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,
++						   u32 ticks)
++{
++	return 0;
++}
++static inline u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt,
++						  u32 ms)
++{
++	return 0;
++}
++#endif
++
++#ifdef CONFIG_SSB_EMBEDDED
++extern int ssb_watchdog_register(struct ssb_bus *bus);
++#else /* CONFIG_SSB_EMBEDDED */
++static inline int ssb_watchdog_register(struct ssb_bus *bus)
++{
++	return 0;
++}
++#endif /* CONFIG_SSB_EMBEDDED */
++
++#ifdef CONFIG_SSB_DRIVER_EXTIF
++extern void ssb_extif_init(struct ssb_extif *extif);
++#else
++static inline void ssb_extif_init(struct ssb_extif *extif)
++{
++}
++#endif
++
++#ifdef CONFIG_SSB_DRIVER_GPIO
++extern int ssb_gpio_init(struct ssb_bus *bus);
++extern int ssb_gpio_unregister(struct ssb_bus *bus);
++#else /* CONFIG_SSB_DRIVER_GPIO */
++static inline int ssb_gpio_init(struct ssb_bus *bus)
++{
++	return -ENOTSUPP;
++}
++static inline int ssb_gpio_unregister(struct ssb_bus *bus)
++{
++	return 0;
++}
++#endif /* CONFIG_SSB_DRIVER_GPIO */
++
+ #endif /* LINUX_SSB_PRIVATE_H_ */
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -6,8 +6,10 @@
+ #include <linux/types.h>
+ #include <linux/spinlock.h>
+ #include <linux/pci.h>
++#include <linux/gpio.h>
+ #include <linux/mod_devicetable.h>
+ #include <linux/dma-mapping.h>
++#include <linux/platform_device.h>
+ 
+ #include <linux/ssb/ssb_regs.h>
+ 
+@@ -16,19 +18,29 @@ struct pcmcia_device;
+ struct ssb_bus;
+ struct ssb_driver;
+ 
++struct ssb_sprom_core_pwr_info {
++	u8 itssi_2g, itssi_5g;
++	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
++	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
++};
++
+ struct ssb_sprom {
+ 	u8 revision;
+-	u8 il0mac[6];		/* MAC address for 802.11b/g */
+-	u8 et0mac[6];		/* MAC address for Ethernet */
+-	u8 et1mac[6];		/* MAC address for 802.11a */
++	u8 il0mac[6] __aligned(sizeof(u16));	/* MAC address for 802.11b/g */
++	u8 et0mac[6] __aligned(sizeof(u16));	/* MAC address for Ethernet */
++	u8 et1mac[6] __aligned(sizeof(u16));	/* MAC address for 802.11a */
+ 	u8 et0phyaddr;		/* MII address for enet0 */
+ 	u8 et1phyaddr;		/* MII address for enet1 */
+ 	u8 et0mdcport;		/* MDIO for enet0 */
+ 	u8 et1mdcport;		/* MDIO for enet1 */
++	u16 dev_id;		/* Device ID overriding e.g. PCI ID */
+ 	u16 board_rev;		/* Board revision number from SPROM. */
++	u16 board_num;		/* Board number from SPROM. */
++	u16 board_type;		/* Board type from SPROM. */
+ 	u8 country_code;	/* Country Code */
+-	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+-	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
++	char alpha2[2];		/* Country Code as two chars like EU or US */
++	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
++	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+ 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
+ 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
+ 	u16 pa0b0;
+@@ -47,10 +59,10 @@ struct ssb_sprom {
+ 	u8 gpio1;		/* GPIO pin 1 */
+ 	u8 gpio2;		/* GPIO pin 2 */
+ 	u8 gpio3;		/* GPIO pin 3 */
+-	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
+-	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
+-	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
+-	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
++	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
++	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
++	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
++	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
+ 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
+ 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
+ 	u8 tri2g;		/* 2.4GHz TX isolation */
+@@ -61,8 +73,8 @@ struct ssb_sprom {
+ 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
+ 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
+ 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
+-	u8 rxpo2g;		/* 2GHz RX power offset */
+-	u8 rxpo5g;		/* 5GHz RX power offset */
++	s8 rxpo2g;		/* 2GHz RX power offset */
++	s8 rxpo5g;		/* 5GHz RX power offset */
+ 	u8 rssisav2g;		/* 2GHz RSSI params */
+ 	u8 rssismc2g;
+ 	u8 rssismf2g;
+@@ -82,16 +94,13 @@ struct ssb_sprom {
+ 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
+ 	/* TODO store board flags in a single u64 */
+ 
++	struct ssb_sprom_core_pwr_info core_pwr_info[4];
++
+ 	/* Antenna gain values for up to 4 antennas
+ 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
+ 	 * loss in the connectors is bigger than the gain. */
+ 	struct {
+-		struct {
+-			s8 a0, a1, a2, a3;
+-		} ghz24;	/* 2.4GHz band */
+-		struct {
+-			s8 a0, a1, a2, a3;
+-		} ghz5;		/* 5GHz band */
++		s8 a0, a1, a2, a3;
+ 	} antenna_gain;
+ 
+ 	struct {
+@@ -103,14 +112,85 @@ struct ssb_sprom {
+ 		} ghz5;
+ 	} fem;
+ 
+-	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
++	u16 mcs2gpo[8];
++	u16 mcs5gpo[8];
++	u16 mcs5glpo[8];
++	u16 mcs5ghpo[8];
++	u8 opo;
++
++	u8 rxgainerr2ga[3];
++	u8 rxgainerr5gla[3];
++	u8 rxgainerr5gma[3];
++	u8 rxgainerr5gha[3];
++	u8 rxgainerr5gua[3];
++
++	u8 noiselvl2ga[3];
++	u8 noiselvl5gla[3];
++	u8 noiselvl5gma[3];
++	u8 noiselvl5gha[3];
++	u8 noiselvl5gua[3];
++
++	u8 regrev;
++	u8 txchain;
++	u8 rxchain;
++	u8 antswitch;
++	u16 cddpo;
++	u16 stbcpo;
++	u16 bw40po;
++	u16 bwduppo;
++
++	u8 tempthresh;
++	u8 tempoffset;
++	u16 rawtempsense;
++	u8 measpower;
++	u8 tempsense_slope;
++	u8 tempcorrx;
++	u8 tempsense_option;
++	u8 freqoffset_corr;
++	u8 iqcal_swp_dis;
++	u8 hw_iqcal_en;
++	u8 elna2g;
++	u8 elna5g;
++	u8 phycal_tempdelta;
++	u8 temps_period;
++	u8 temps_hysteresis;
++	u8 measpower1;
++	u8 measpower2;
++	u8 pcieingress_war;
++
++	/* power per rate from sromrev 9 */
++	u16 cckbw202gpo;
++	u16 cckbw20ul2gpo;
++	u32 legofdmbw202gpo;
++	u32 legofdmbw20ul2gpo;
++	u32 legofdmbw205glpo;
++	u32 legofdmbw20ul5glpo;
++	u32 legofdmbw205gmpo;
++	u32 legofdmbw20ul5gmpo;
++	u32 legofdmbw205ghpo;
++	u32 legofdmbw20ul5ghpo;
++	u32 mcsbw202gpo;
++	u32 mcsbw20ul2gpo;
++	u32 mcsbw402gpo;
++	u32 mcsbw205glpo;
++	u32 mcsbw20ul5glpo;
++	u32 mcsbw405glpo;
++	u32 mcsbw205gmpo;
++	u32 mcsbw20ul5gmpo;
++	u32 mcsbw405gmpo;
++	u32 mcsbw205ghpo;
++	u32 mcsbw20ul5ghpo;
++	u32 mcsbw405ghpo;
++	u16 mcs32po;
++	u16 legofdm40duppo;
++	u8 sar2g;
++	u8 sar5g;
+ };
+ 
+ /* Information about the PCB the circuitry is soldered on. */
+ struct ssb_boardinfo {
+ 	u16 vendor;
+ 	u16 type;
+-	u8  rev;
+ };
+ 
+ 
+@@ -166,6 +246,7 @@ struct ssb_bus_ops {
+ #define SSB_DEV_MINI_MACPHY	0x823
+ #define SSB_DEV_ARM_1176	0x824
+ #define SSB_DEV_ARM_7TDMI	0x825
++#define SSB_DEV_ARM_CM3		0x82A
+ 
+ /* Vendor-ID values */
+ #define SSB_VENDOR_BROADCOM	0x4243
+@@ -260,13 +341,61 @@ enum ssb_bustype {
+ #define SSB_BOARDVENDOR_DELL	0x1028	/* Dell */
+ #define SSB_BOARDVENDOR_HP	0x0E11	/* HP */
+ /* board_type */
++#define SSB_BOARD_BCM94301CB	0x0406
++#define SSB_BOARD_BCM94301MP	0x0407
++#define SSB_BOARD_BU4309	0x040A
++#define SSB_BOARD_BCM94309CB	0x040B
++#define SSB_BOARD_BCM4309MP	0x040C
++#define SSB_BOARD_BU4306	0x0416
+ #define SSB_BOARD_BCM94306MP	0x0418
+ #define SSB_BOARD_BCM4309G	0x0421
+ #define SSB_BOARD_BCM4306CB	0x0417
+-#define SSB_BOARD_BCM4309MP	0x040C
++#define SSB_BOARD_BCM94306PC	0x0425	/* pcmcia 3.3v 4306 card */
++#define SSB_BOARD_BCM94306CBSG	0x042B	/* with SiGe PA */
++#define SSB_BOARD_PCSG94306	0x042D	/* with SiGe PA */
++#define SSB_BOARD_BU4704SD	0x042E	/* with sdram */
++#define SSB_BOARD_BCM94704AGR	0x042F	/* dual 11a/11g Router */
++#define SSB_BOARD_BCM94308MP	0x0430	/* 11a-only minipci */
++#define SSB_BOARD_BU4318	0x0447
++#define SSB_BOARD_CB4318	0x0448
++#define SSB_BOARD_MPG4318	0x0449
+ #define SSB_BOARD_MP4318	0x044A
+-#define SSB_BOARD_BU4306	0x0416
+-#define SSB_BOARD_BU4309	0x040A
++#define SSB_BOARD_SD4318	0x044B
++#define SSB_BOARD_BCM94306P	0x044C	/* with SiGe */
++#define SSB_BOARD_BCM94303MP	0x044E
++#define SSB_BOARD_BCM94306MPM	0x0450
++#define SSB_BOARD_BCM94306MPL	0x0453
++#define SSB_BOARD_PC4303	0x0454	/* pcmcia */
++#define SSB_BOARD_BCM94306MPLNA	0x0457
++#define SSB_BOARD_BCM94306MPH	0x045B
++#define SSB_BOARD_BCM94306PCIV	0x045C
++#define SSB_BOARD_BCM94318MPGH	0x0463
++#define SSB_BOARD_BU4311	0x0464
++#define SSB_BOARD_BCM94311MC	0x0465
++#define SSB_BOARD_BCM94311MCAG	0x0466
++/* 4321 boards */
++#define SSB_BOARD_BU4321	0x046B
++#define SSB_BOARD_BU4321E	0x047C
++#define SSB_BOARD_MP4321	0x046C
++#define SSB_BOARD_CB2_4321	0x046D
++#define SSB_BOARD_CB2_4321_AG	0x0066
++#define SSB_BOARD_MC4321	0x046E
++/* 4325 boards */
++#define SSB_BOARD_BCM94325DEVBU	0x0490
++#define SSB_BOARD_BCM94325BGABU	0x0491
++#define SSB_BOARD_BCM94325SDGWB	0x0492
++#define SSB_BOARD_BCM94325SDGMDL	0x04AA
++#define SSB_BOARD_BCM94325SDGMDL2	0x04C6
++#define SSB_BOARD_BCM94325SDGMDL3	0x04C9
++#define SSB_BOARD_BCM94325SDABGWBA	0x04E1
++/* 4322 boards */
++#define SSB_BOARD_BCM94322MC	0x04A4
++#define SSB_BOARD_BCM94322USB	0x04A8	/* dualband */
++#define SSB_BOARD_BCM94322HM	0x04B0
++#define SSB_BOARD_BCM94322USB2D	0x04Bf	/* single band discrete front end */
++/* 4312 boards */
++#define SSB_BOARD_BU4312	0x048A
++#define SSB_BOARD_BCM4312MCGSG	0x04B5
+ /* chip_package */
+ #define SSB_CHIPPACK_BCM4712S	1	/* Small 200pin 4712 */
+ #define SSB_CHIPPACK_BCM4712M	2	/* Medium 225pin 4712 */
+@@ -354,7 +483,11 @@ struct ssb_bus {
+ #ifdef CONFIG_SSB_EMBEDDED
+ 	/* Lock for GPIO register access. */
+ 	spinlock_t gpio_lock;
++	struct platform_device *watchdog;
+ #endif /* EMBEDDED */
++#ifdef CONFIG_SSB_DRIVER_GPIO
++	struct gpio_chip gpio;
++#endif /* DRIVER_GPIO */
+ 
+ 	/* Internal-only stuff follows. Do not touch. */
+ 	struct list_head list;
+--- a/include/linux/ssb/ssb_driver_chipcommon.h
++++ b/include/linux/ssb/ssb_driver_chipcommon.h
+@@ -219,6 +219,7 @@
+ #define SSB_CHIPCO_PMU_CTL			0x0600 /* PMU control */
+ #define  SSB_CHIPCO_PMU_CTL_ILP_DIV		0xFFFF0000 /* ILP div mask */
+ #define  SSB_CHIPCO_PMU_CTL_ILP_DIV_SHIFT	16
++#define  SSB_CHIPCO_PMU_CTL_PLL_UPD		0x00000400
+ #define  SSB_CHIPCO_PMU_CTL_NOILPONW		0x00000200 /* No ILP on wait */
+ #define  SSB_CHIPCO_PMU_CTL_HTREQEN		0x00000100 /* HT req enable */
+ #define  SSB_CHIPCO_PMU_CTL_ALPREQEN		0x00000080 /* ALP req enable */
+@@ -504,7 +505,9 @@
+ #define SSB_CHIPCO_FLASHCTL_ST_SE	0x02D8		/* Sector Erase */
+ #define SSB_CHIPCO_FLASHCTL_ST_BE	0x00C7		/* Bulk Erase */
+ #define SSB_CHIPCO_FLASHCTL_ST_DP	0x00B9		/* Deep Power-down */
+-#define SSB_CHIPCO_FLASHCTL_ST_RSIG	0x03AB		/* Read Electronic Signature */
++#define SSB_CHIPCO_FLASHCTL_ST_RES	0x03AB		/* Read Electronic Signature */
++#define SSB_CHIPCO_FLASHCTL_ST_CSA	0x1000		/* Keep chip select asserted */
++#define SSB_CHIPCO_FLASHCTL_ST_SSE	0x0220		/* Sub-sector Erase */
+ 
+ /* Status register bits for ST flashes */
+ #define SSB_CHIPCO_FLASHSTA_ST_WIP	0x01		/* Write In Progress */
+@@ -588,7 +591,10 @@ struct ssb_chipcommon {
+ 	u32 status;
+ 	/* Fast Powerup Delay constant */
+ 	u16 fast_pwrup_delay;
++	spinlock_t gpio_lock;
+ 	struct ssb_chipcommon_pmu pmu;
++	u32 ticks_per_ms;
++	u32 max_timer_ms;
+ };
+ 
+ static inline bool ssb_chipco_available(struct ssb_chipcommon *cc)
+@@ -628,8 +634,7 @@ enum ssb_clkmode {
+ extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
+ 				     enum ssb_clkmode mode);
+ 
+-extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
+-					  u32 ticks);
++extern u32 ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks);
+ 
+ void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value);
+ 
+@@ -642,6 +647,8 @@ u32 ssb_chipco_gpio_outen(struct ssb_chi
+ u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value);
+ u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value);
+ u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value);
++u32 ssb_chipco_gpio_pullup(struct ssb_chipcommon *cc, u32 mask, u32 value);
++u32 ssb_chipco_gpio_pulldown(struct ssb_chipcommon *cc, u32 mask, u32 value);
+ 
+ #ifdef CONFIG_SSB_SERIAL
+ extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
+@@ -661,5 +668,6 @@ enum ssb_pmu_ldo_volt_id {
+ void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
+ 			     enum ssb_pmu_ldo_volt_id id, u32 voltage);
+ void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
++void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid);
+ 
+ #endif /* LINUX_SSB_CHIPCO_H_ */
+--- a/include/linux/ssb/ssb_driver_extif.h
++++ b/include/linux/ssb/ssb_driver_extif.h
+@@ -152,12 +152,16 @@
+ /* watchdog */
+ #define SSB_EXTIF_WATCHDOG_CLK		48000000	/* Hz */
+ 
++#define SSB_EXTIF_WATCHDOG_MAX_TIMER	((1 << 28) - 1)
++#define SSB_EXTIF_WATCHDOG_MAX_TIMER_MS	(SSB_EXTIF_WATCHDOG_MAX_TIMER \
++					 / (SSB_EXTIF_WATCHDOG_CLK / 1000))
+ 
+ 
+ #ifdef CONFIG_SSB_DRIVER_EXTIF
+ 
+ struct ssb_extif {
+ 	struct ssb_device *dev;
++	spinlock_t gpio_lock;
+ };
+ 
+ static inline bool ssb_extif_available(struct ssb_extif *extif)
+@@ -171,8 +175,7 @@ extern void ssb_extif_get_clockcontrol(s
+ extern void ssb_extif_timing_init(struct ssb_extif *extif,
+ 				  unsigned long ns);
+ 
+-extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+-					 u32 ticks);
++extern u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks);
+ 
+ /* Extif GPIO pin access */
+ u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
+@@ -205,10 +208,52 @@ void ssb_extif_get_clockcontrol(struct s
+ }
+ 
+ static inline
+-void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+-				  u32 ticks)
++void ssb_extif_timing_init(struct ssb_extif *extif, unsigned long ns)
+ {
+ }
+ 
++static inline
++u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)
++{
++	return 0;
++}
++
++static inline u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
++{
++	return 0;
++}
++
++static inline u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask,
++				     u32 value)
++{
++	return 0;
++}
++
++static inline u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask,
++				       u32 value)
++{
++	return 0;
++}
++
++static inline u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask,
++					  u32 value)
++{
++	return 0;
++}
++
++static inline u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask,
++					 u32 value)
++{
++	return 0;
++}
++
++#ifdef CONFIG_SSB_SERIAL
++static inline int ssb_extif_serial_init(struct ssb_extif *extif,
++					struct ssb_serial_port *ports)
++{
++	return 0;
++}
++#endif /* CONFIG_SSB_SERIAL */
++
+ #endif /* CONFIG_SSB_DRIVER_EXTIF */
+ #endif /* LINUX_SSB_EXTIFCORE_H_ */
+--- a/include/linux/ssb/ssb_driver_gige.h
++++ b/include/linux/ssb/ssb_driver_gige.h
+@@ -2,6 +2,7 @@
+ #define LINUX_SSB_DRIVER_GIGE_H_
+ 
+ #include <linux/ssb/ssb.h>
++#include <linux/bug.h>
+ #include <linux/pci.h>
+ #include <linux/spinlock.h>
+ 
+@@ -96,21 +97,16 @@ static inline bool ssb_gige_must_flush_p
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_BCM47XX
+-#include <asm/mach-bcm47xx/nvram.h>
+ /* Get the device MAC address */
+-static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+-{
+-	char buf[20];
+-	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
+-		return;
+-	nvram_parse_macaddr(buf, macaddr);
+-}
+-#else
+-static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
++static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+ {
++	struct ssb_gige *dev = pdev_to_ssb_gige(pdev);
++	if (!dev)
++		return -ENODEV;
++
++	memcpy(macaddr, dev->dev->bus->sprom.et0mac, 6);
++	return 0;
+ }
+-#endif
+ 
+ extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
+ 					  struct pci_dev *pdev);
+@@ -174,6 +170,10 @@ static inline bool ssb_gige_must_flush_p
+ {
+ 	return 0;
+ }
++static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
++{
++	return -ENODEV;
++}
+ 
+ #endif /* CONFIG_SSB_DRIVER_GIGE */
+ #endif /* LINUX_SSB_DRIVER_GIGE_H_ */
+--- a/include/linux/ssb/ssb_driver_mips.h
++++ b/include/linux/ssb/ssb_driver_mips.h
+@@ -13,6 +13,24 @@ struct ssb_serial_port {
+ 	unsigned int reg_shift;
+ };
+ 
++struct ssb_pflash {
++	bool present;
++	u8 buswidth;
++	u32 window;
++	u32 window_size;
++};
++
++#ifdef CONFIG_SSB_SFLASH
++struct ssb_sflash {
++	bool present;
++	u32 window;
++	u32 blocksize;
++	u16 numblocks;
++	u32 size;
++
++	void *priv;
++};
++#endif
+ 
+ struct ssb_mipscore {
+ 	struct ssb_device *dev;
+@@ -20,9 +38,10 @@ struct ssb_mipscore {
+ 	int nr_serial_ports;
+ 	struct ssb_serial_port serial_ports[4];
+ 
+-	u8 flash_buswidth;
+-	u32 flash_window;
+-	u32 flash_window_size;
++	struct ssb_pflash pflash;
++#ifdef CONFIG_SSB_SFLASH
++	struct ssb_sflash sflash;
++#endif
+ };
+ 
+ extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
+@@ -41,6 +60,11 @@ void ssb_mipscore_init(struct ssb_mipsco
+ {
+ }
+ 
++static inline unsigned int ssb_mips_irq(struct ssb_device *dev)
++{
++	return 0;
++}
++
+ #endif /* CONFIG_SSB_DRIVER_MIPS */
+ 
+ #endif /* LINUX_SSB_MIPSCORE_H_ */
+--- a/include/linux/ssb/ssb_regs.h
++++ b/include/linux/ssb/ssb_regs.h
+@@ -172,6 +172,7 @@
+ #define SSB_SPROMSIZE_WORDS_R4		220
+ #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
+ #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
++#define SSB_SPROMSIZE_WORDS_R10		230
+ #define SSB_SPROM_BASE1			0x1000
+ #define SSB_SPROM_BASE31		0x0800
+ #define SSB_SPROM_REVISION		0x007E
+@@ -228,6 +229,7 @@
+ #define  SSB_SPROM1_AGAIN_BG_SHIFT	0
+ #define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */
+ #define  SSB_SPROM1_AGAIN_A_SHIFT	8
++#define SSB_SPROM1_CCODE		0x0076
+ 
+ /* SPROM Revision 2 (inherits from rev 1) */
+ #define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */
+@@ -267,6 +269,7 @@
+ #define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
+ 
+ /* SPROM Revision 4 */
++#define SSB_SPROM4_BOARDREV		0x0042	/* Board revision */
+ #define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */
+ #define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */
+ #define SSB_SPROM4_BFL2LO		0x0048	/* Board flags 2 (low 16 bits) */
+@@ -287,11 +290,11 @@
+ #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
+ #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
+ #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
+-#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
+-#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
+-#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
+-#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
+-#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
++#define SSB_SPROM4_ANTAVAIL		0x005C  /* Antenna available bitfields */
++#define  SSB_SPROM4_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	0
++#define  SSB_SPROM4_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	8
+ #define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
+ #define  SSB_SPROM4_AGAIN0_SHIFT	0
+@@ -389,6 +392,11 @@
+ #define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
+ #define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
+ #define  SSB_SPROM8_GPIOB_P3_SHIFT	8
++#define SSB_SPROM8_LEDDC		0x009A
++#define  SSB_SPROM8_LEDDC_ON		0xFF00	/* oncount */
++#define  SSB_SPROM8_LEDDC_ON_SHIFT	8
++#define  SSB_SPROM8_LEDDC_OFF		0x00FF	/* offcount */
++#define  SSB_SPROM8_LEDDC_OFF_SHIFT	0
+ #define SSB_SPROM8_ANTAVAIL		0x009C  /* Antenna available bitfields*/
+ #define  SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
+ #define  SSB_SPROM8_ANTAVAIL_A_SHIFT	8
+@@ -404,6 +412,13 @@
+ #define  SSB_SPROM8_AGAIN2_SHIFT	0
+ #define  SSB_SPROM8_AGAIN3		0xFF00	/* Antenna 3 */
+ #define  SSB_SPROM8_AGAIN3_SHIFT	8
++#define SSB_SPROM8_TXRXC		0x00A2
++#define  SSB_SPROM8_TXRXC_TXCHAIN	0x000f
++#define  SSB_SPROM8_TXRXC_TXCHAIN_SHIFT	0
++#define  SSB_SPROM8_TXRXC_RXCHAIN	0x00f0
++#define  SSB_SPROM8_TXRXC_RXCHAIN_SHIFT	4
++#define  SSB_SPROM8_TXRXC_SWITCH	0xff00
++#define  SSB_SPROM8_TXRXC_SWITCH_SHIFT	8
+ #define SSB_SPROM8_RSSIPARM2G		0x00A4	/* RSSI params for 2GHz */
+ #define  SSB_SPROM8_RSSISMF2G		0x000F
+ #define  SSB_SPROM8_RSSISMC2G		0x00F0
+@@ -430,6 +445,7 @@
+ #define  SSB_SPROM8_TRI5GH_SHIFT	8
+ #define SSB_SPROM8_RXPO			0x00AC  /* RX power offsets */
+ #define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
++#define  SSB_SPROM8_RXPO2G_SHIFT	0
+ #define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
+ #define  SSB_SPROM8_RXPO5G_SHIFT	8
+ #define SSB_SPROM8_FEM2G		0x00AE
+@@ -445,10 +461,71 @@
+ #define  SSB_SROM8_FEM_ANTSWLUT		0xF800
+ #define  SSB_SROM8_FEM_ANTSWLUT_SHIFT	11
+ #define SSB_SPROM8_THERMAL		0x00B2
+-#define SSB_SPROM8_MPWR_RAWTS		0x00B4
+-#define SSB_SPROM8_TS_SLP_OPT_CORRX	0x00B6
+-#define SSB_SPROM8_FOC_HWIQ_IQSWP	0x00B8
+-#define SSB_SPROM8_PHYCAL_TEMPDELTA	0x00BA
++#define  SSB_SPROM8_THERMAL_OFFSET	0x00ff
++#define  SSB_SPROM8_THERMAL_OFFSET_SHIFT	0
++#define  SSB_SPROM8_THERMAL_TRESH	0xff00
++#define  SSB_SPROM8_THERMAL_TRESH_SHIFT	8
++/* Temp sense related entries */
++#define SSB_SPROM8_RAWTS		0x00B4
++#define  SSB_SPROM8_RAWTS_RAWTEMP	0x01ff
++#define  SSB_SPROM8_RAWTS_RAWTEMP_SHIFT	0
++#define  SSB_SPROM8_RAWTS_MEASPOWER	0xfe00
++#define  SSB_SPROM8_RAWTS_MEASPOWER_SHIFT	9
++#define SSB_SPROM8_OPT_CORRX		0x00B6
++#define  SSB_SPROM8_OPT_CORRX_TEMP_SLOPE	0x00ff
++#define  SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT	0
++#define  SSB_SPROM8_OPT_CORRX_TEMPCORRX	0xfc00
++#define  SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT	10
++#define  SSB_SPROM8_OPT_CORRX_TEMP_OPTION	0x0300
++#define  SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT	8
++/* FOC: freiquency offset correction, HWIQ: H/W IOCAL enable, IQSWP: IQ CAL swap disable */
++#define SSB_SPROM8_HWIQ_IQSWP		0x00B8
++#define  SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR	0x000f
++#define  SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT	0
++#define  SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP	0x0010
++#define  SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT	4
++#define  SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL	0x0020
++#define  SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT	5
++#define SSB_SPROM8_TEMPDELTA		0x00BC
++#define  SSB_SPROM8_TEMPDELTA_PHYCAL	0x00ff
++#define  SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT	0
++#define  SSB_SPROM8_TEMPDELTA_PERIOD	0x0f00
++#define  SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT	8
++#define  SSB_SPROM8_TEMPDELTA_HYSTERESIS	0xf000
++#define  SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT	12
++
++/* There are 4 blocks with power info sharing the same layout */
++#define SSB_SROM8_PWR_INFO_CORE0	0x00C0
++#define SSB_SROM8_PWR_INFO_CORE1	0x00E0
++#define SSB_SROM8_PWR_INFO_CORE2	0x0100
++#define SSB_SROM8_PWR_INFO_CORE3	0x0120
++
++#define SSB_SROM8_2G_MAXP_ITSSI		0x00
++#define  SSB_SPROM8_2G_MAXP		0x00FF
++#define  SSB_SPROM8_2G_ITSSI		0xFF00
++#define  SSB_SPROM8_2G_ITSSI_SHIFT	8
++#define SSB_SROM8_2G_PA_0		0x02	/* 2GHz power amp settings */
++#define SSB_SROM8_2G_PA_1		0x04
++#define SSB_SROM8_2G_PA_2		0x06
++#define SSB_SROM8_5G_MAXP_ITSSI		0x08	/* 5GHz ITSSI and 5.3GHz Max Power */
++#define  SSB_SPROM8_5G_MAXP		0x00FF
++#define  SSB_SPROM8_5G_ITSSI		0xFF00
++#define  SSB_SPROM8_5G_ITSSI_SHIFT	8
++#define SSB_SPROM8_5GHL_MAXP		0x0A	/* 5.2GHz and 5.8GHz Max Power */
++#define  SSB_SPROM8_5GH_MAXP		0x00FF
++#define  SSB_SPROM8_5GL_MAXP		0xFF00
++#define  SSB_SPROM8_5GL_MAXP_SHIFT	8
++#define SSB_SROM8_5G_PA_0		0x0C	/* 5.3GHz power amp settings */
++#define SSB_SROM8_5G_PA_1		0x0E
++#define SSB_SROM8_5G_PA_2		0x10
++#define SSB_SROM8_5GL_PA_0		0x12	/* 5.2GHz power amp settings */
++#define SSB_SROM8_5GL_PA_1		0x14
++#define SSB_SROM8_5GL_PA_2		0x16
++#define SSB_SROM8_5GH_PA_0		0x18	/* 5.8GHz power amp settings */
++#define SSB_SROM8_5GH_PA_1		0x1A
++#define SSB_SROM8_5GH_PA_2		0x1C
++
++/* TODO: Make it deprecated */
+ #define SSB_SPROM8_MAXP_BG		0x00C0  /* Max Power 2GHz in path 1 */
+ #define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
+ #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
+@@ -473,12 +550,23 @@
+ #define SSB_SPROM8_PA1HIB0		0x00D8	/* 5.8GHz power amp settings */
+ #define SSB_SPROM8_PA1HIB1		0x00DA
+ #define SSB_SPROM8_PA1HIB2		0x00DC
++
+ #define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
+ #define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
+ #define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
+ #define SSB_SPROM8_OFDM5GLPO		0x014A	/* 5.2GHz OFDM power offset */
+ #define SSB_SPROM8_OFDM5GHPO		0x014E	/* 5.8GHz OFDM power offset */
+ 
++#define SSB_SPROM8_2G_MCSPO		0x0152
++#define SSB_SPROM8_5G_MCSPO		0x0162
++#define SSB_SPROM8_5GL_MCSPO		0x0172
++#define SSB_SPROM8_5GH_MCSPO		0x0182
++
++#define SSB_SPROM8_CDDPO		0x0192
++#define SSB_SPROM8_STBCPO		0x0194
++#define SSB_SPROM8_BW40PO		0x0196
++#define SSB_SPROM8_BWDUPPO		0x0198
++
+ /* Values for boardflags_lo read from SPROM */
+ #define SSB_BFL_BTCOEXIST		0x0001	/* implements Bluetooth coexistance */
+ #define SSB_BFL_PACTRL			0x0002	/* GPIO 9 controlling the PA */
+--- /dev/null
++++ b/include/linux/bcm47xx_wdt.h
+@@ -0,0 +1,19 @@
++#ifndef LINUX_BCM47XX_WDT_H_
++#define LINUX_BCM47XX_WDT_H_
++
++#include <linux/types.h>
++
++
++struct bcm47xx_wdt {
++	u32 (*timer_set)(struct bcm47xx_wdt *, u32);
++	u32 (*timer_set_ms)(struct bcm47xx_wdt *, u32);
++	u32 max_timer_ms;
++
++	void *driver_data;
++};
++
++static inline void *bcm47xx_wdt_get_drvdata(struct bcm47xx_wdt *wdt)
++{
++	return wdt->driver_data;
++}
++#endif /* LINUX_BCM47XX_WDT_H_ */
+--- a/drivers/net/wireless/b43/phy_n.c
++++ b/drivers/net/wireless/b43/phy_n.c
+@@ -4259,7 +4259,8 @@ static void b43_nphy_pmu_spur_avoid(stru
+ #endif
+ #ifdef CONFIG_B43_SSB
+ 	case B43_BUS_SSB:
+-		/* FIXME */
++		ssb_pmu_spuravoid_pllupdate(&dev->dev->sdev->bus->chipco,
++					    avoid);
+ 		break;
+ #endif
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.3/025-bcma_backport.patch b/trunk/target/linux/generic/patches-3.3/025-bcma_backport.patch
new file mode 100644
index 00000000..df80ec43
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/025-bcma_backport.patch
@@ -0,0 +1,5794 @@
+--- a/arch/mips/bcm47xx/serial.c
++++ b/arch/mips/bcm47xx/serial.c
+@@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(voi
+ 
+ 		p->mapbase = (unsigned int) bcma_port->regs;
+ 		p->membase = (void *) bcma_port->regs;
+-		p->irq = bcma_port->irq + 2;
++		p->irq = bcma_port->irq;
+ 		p->uartclk = bcma_port->baud_base;
+ 		p->regshift = bcma_port->reg_shift;
+ 		p->iotype = UPIO_MEM;
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -26,16 +26,23 @@ config BCMA_HOST_PCI_POSSIBLE
+ config BCMA_HOST_PCI
+ 	bool "Support for BCMA on PCI-host bus"
+ 	depends on BCMA_HOST_PCI_POSSIBLE
++	default y
+ 
+ config BCMA_DRIVER_PCI_HOSTMODE
+ 	bool "Driver for PCI core working in hostmode"
+-	depends on BCMA && MIPS
++	depends on BCMA && MIPS && BCMA_HOST_PCI
+ 	help
+ 	  PCI core hostmode operation (external PCI bus).
+ 
+ config BCMA_HOST_SOC
+-	bool
+-	depends on BCMA_DRIVER_MIPS
++	bool "Support for BCMA in a SoC"
++	depends on BCMA
++	help
++	  Host interface for a Broadcom AIX bus directly mapped into
++	  the memory. This only works with the Broadcom SoCs from the
++	  BCM47XX line.
++
++	  If unsure, say N
+ 
+ config BCMA_DRIVER_MIPS
+ 	bool "BCMA Broadcom MIPS core driver"
+@@ -46,6 +53,33 @@ config BCMA_DRIVER_MIPS
+ 
+ 	  If unsure, say N
+ 
++config BCMA_SFLASH
++	bool
++	depends on BCMA_DRIVER_MIPS
++	default y
++
++config BCMA_NFLASH
++	bool
++	depends on BCMA_DRIVER_MIPS
++	default y
++
++config BCMA_DRIVER_GMAC_CMN
++	bool "BCMA Broadcom GBIT MAC COMMON core driver"
++	depends on BCMA
++	help
++	  Driver for the Broadcom GBIT MAC COMMON core attached to Broadcom
++	  specific Advanced Microcontroller Bus.
++
++	  If unsure, say N
++
++config BCMA_DRIVER_GPIO
++	bool "BCMA GPIO driver"
++	depends on BCMA && GPIOLIB
++	help
++	  Driver to provide access to the GPIO pins of the bcma bus.
++
++	  If unsure, say N
++
+ config BCMA_DEBUG
+ 	bool "BCMA debugging"
+ 	depends on BCMA
+--- a/drivers/bcma/Makefile
++++ b/drivers/bcma/Makefile
+@@ -1,8 +1,12 @@
+ bcma-y					+= main.o scan.o core.o sprom.o
+ bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
++bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o
++bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o
+ bcma-y					+= driver_pci.o
+ bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)	+= driver_pci_host.o
+ bcma-$(CONFIG_BCMA_DRIVER_MIPS)		+= driver_mips.o
++bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)	+= driver_gmac_cmn.o
++bcma-$(CONFIG_BCMA_DRIVER_GPIO)		+= driver_gpio.o
+ bcma-$(CONFIG_BCMA_HOST_PCI)		+= host_pci.o
+ bcma-$(CONFIG_BCMA_HOST_SOC)		+= host_soc.o
+ obj-$(CONFIG_BCMA)			+= bcma.o
+--- a/drivers/bcma/bcma_private.h
++++ b/drivers/bcma/bcma_private.h
+@@ -10,10 +10,21 @@
+ 
+ #define BCMA_CORE_SIZE		0x1000
+ 
++#define bcma_err(bus, fmt, ...) \
++	pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
++#define bcma_warn(bus, fmt, ...) \
++	pr_warn("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
++#define bcma_info(bus, fmt, ...) \
++	pr_info("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
++#define bcma_debug(bus, fmt, ...) \
++	pr_debug("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
++
+ struct bcma_bus;
+ 
+ /* main.c */
+-int bcma_bus_register(struct bcma_bus *bus);
++bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
++		     int timeout);
++int __devinit bcma_bus_register(struct bcma_bus *bus);
+ void bcma_bus_unregister(struct bcma_bus *bus);
+ int __init bcma_bus_early_register(struct bcma_bus *bus,
+ 				   struct bcma_device *core_cc,
+@@ -22,6 +33,8 @@ int __init bcma_bus_early_register(struc
+ int bcma_bus_suspend(struct bcma_bus *bus);
+ int bcma_bus_resume(struct bcma_bus *bus);
+ #endif
++struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
++					u8 unit);
+ 
+ /* scan.c */
+ int bcma_bus_scan(struct bcma_bus *bus);
+@@ -36,11 +49,36 @@ int bcma_sprom_get(struct bcma_bus *bus)
+ /* driver_chipcommon.c */
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+ void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
++extern struct platform_device bcma_pflash_dev;
+ #endif /* CONFIG_BCMA_DRIVER_MIPS */
+ 
+ /* driver_chipcommon_pmu.c */
+-u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc);
+-u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc);
++u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);
++u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);
++
++#ifdef CONFIG_BCMA_SFLASH
++/* driver_chipcommon_sflash.c */
++int bcma_sflash_init(struct bcma_drv_cc *cc);
++extern struct platform_device bcma_sflash_dev;
++#else
++static inline int bcma_sflash_init(struct bcma_drv_cc *cc)
++{
++	bcma_err(cc->core->bus, "Serial flash not supported\n");
++	return 0;
++}
++#endif /* CONFIG_BCMA_SFLASH */
++
++#ifdef CONFIG_BCMA_NFLASH
++/* driver_chipcommon_nflash.c */
++int bcma_nflash_init(struct bcma_drv_cc *cc);
++extern struct platform_device bcma_nflash_dev;
++#else
++static inline int bcma_nflash_init(struct bcma_drv_cc *cc)
++{
++	bcma_err(cc->core->bus, "NAND flash not supported\n");
++	return 0;
++}
++#endif /* CONFIG_BCMA_NFLASH */
+ 
+ #ifdef CONFIG_BCMA_HOST_PCI
+ /* host_pci.c */
+@@ -48,8 +86,29 @@ extern int __init bcma_host_pci_init(voi
+ extern void __exit bcma_host_pci_exit(void);
+ #endif /* CONFIG_BCMA_HOST_PCI */
+ 
++/* driver_pci.c */
++u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
++
++extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);
++
+ #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
+-void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
++bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);
++void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
+ #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
+ 
++#ifdef CONFIG_BCMA_DRIVER_GPIO
++/* driver_gpio.c */
++int bcma_gpio_init(struct bcma_drv_cc *cc);
++int bcma_gpio_unregister(struct bcma_drv_cc *cc);
++#else
++static inline int bcma_gpio_init(struct bcma_drv_cc *cc)
++{
++	return -ENOTSUPP;
++}
++static inline int bcma_gpio_unregister(struct bcma_drv_cc *cc)
++{
++	return 0;
++}
++#endif /* CONFIG_BCMA_DRIVER_GPIO */
++
+ #endif
+--- a/drivers/bcma/core.c
++++ b/drivers/bcma/core.c
+@@ -9,6 +9,25 @@
+ #include <linux/export.h>
+ #include <linux/bcma/bcma.h>
+ 
++static bool bcma_core_wait_value(struct bcma_device *core, u16 reg, u32 mask,
++				 u32 value, int timeout)
++{
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
++
++	do {
++		val = bcma_aread32(core, reg);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);
++
++	return false;
++}
++
+ bool bcma_core_is_enabled(struct bcma_device *core)
+ {
+ 	if ((bcma_aread32(core, BCMA_IOCTL) & (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC))
+@@ -25,12 +44,15 @@ void bcma_core_disable(struct bcma_devic
+ 	if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)
+ 		return;
+ 
+-	bcma_awrite32(core, BCMA_IOCTL, flags);
+-	bcma_aread32(core, BCMA_IOCTL);
+-	udelay(10);
++	bcma_core_wait_value(core, BCMA_RESET_ST, ~0, 0, 300);
+ 
+ 	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
++	bcma_aread32(core, BCMA_RESET_CTL);
+ 	udelay(1);
++
++	bcma_awrite32(core, BCMA_IOCTL, flags);
++	bcma_aread32(core, BCMA_IOCTL);
++	udelay(10);
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_disable);
+ 
+@@ -42,6 +64,7 @@ int bcma_core_enable(struct bcma_device
+ 	bcma_aread32(core, BCMA_IOCTL);
+ 
+ 	bcma_awrite32(core, BCMA_RESET_CTL, 0);
++	bcma_aread32(core, BCMA_RESET_CTL);
+ 	udelay(1);
+ 
+ 	bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));
+@@ -64,7 +87,7 @@ void bcma_core_set_clockmode(struct bcma
+ 	switch (clkmode) {
+ 	case BCMA_CLKMODE_FAST:
+ 		bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
+-		udelay(64);
++		usleep_range(64, 300);
+ 		for (i = 0; i < 1500; i++) {
+ 			if (bcma_read32(core, BCMA_CLKCTLST) &
+ 			    BCMA_CLKCTLST_HAVEHT) {
+@@ -74,10 +97,10 @@ void bcma_core_set_clockmode(struct bcma
+ 			udelay(10);
+ 		}
+ 		if (i)
+-			pr_err("HT force timeout\n");
++			bcma_err(core->bus, "HT force timeout\n");
+ 		break;
+ 	case BCMA_CLKMODE_DYNAMIC:
+-		pr_warn("Dynamic clockmode not supported yet!\n");
++		bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT);
+ 		break;
+ 	}
+ }
+@@ -101,9 +124,15 @@ void bcma_core_pll_ctl(struct bcma_devic
+ 			udelay(10);
+ 		}
+ 		if (i)
+-			pr_err("PLL enable timeout\n");
++			bcma_err(core->bus, "PLL enable timeout\n");
+ 	} else {
+-		pr_warn("Disabling PLL not supported yet!\n");
++		/*
++		 * Mask the PLL but don't wait for it to be disabled. PLL may be
++		 * shared between cores and will be still up if there is another
++		 * core using it.
++		 */
++		bcma_mask32(core, BCMA_CLKCTLST, ~req);
++		bcma_read32(core, BCMA_CLKCTLST);
+ 	}
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
+@@ -119,8 +148,8 @@ u32 bcma_core_dma_translation(struct bcm
+ 		else
+ 			return BCMA_DMA_TRANSLATION_DMA32_CMT;
+ 	default:
+-		pr_err("DMA translation unknown for host %d\n",
+-		       core->bus->hosttype);
++		bcma_err(core->bus, "DMA translation unknown for host %d\n",
++			 core->bus->hosttype);
+ 	}
+ 	return BCMA_DMA_TRANSLATION_NONE;
+ }
+--- a/drivers/bcma/driver_chipcommon.c
++++ b/drivers/bcma/driver_chipcommon.c
+@@ -4,12 +4,15 @@
+  *
+  * Copyright 2005, Broadcom Corporation
+  * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
++ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
+  *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
+ #include "bcma_private.h"
++#include <linux/bcm47xx_wdt.h>
+ #include <linux/export.h>
++#include <linux/platform_device.h>
+ #include <linux/bcma/bcma.h>
+ 
+ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
+@@ -22,29 +25,136 @@ static inline u32 bcma_cc_write32_masked
+ 	return value;
+ }
+ 
+-void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
++u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)
+ {
+-	u32 leddc_on = 10;
+-	u32 leddc_off = 90;
++	if (cc->capabilities & BCMA_CC_CAP_PMU)
++		return bcma_pmu_get_alp_clock(cc);
+ 
+-	if (cc->setup_done)
++	return 20000000;
++}
++EXPORT_SYMBOL_GPL(bcma_chipco_get_alp_clock);
++
++static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc)
++{
++	struct bcma_bus *bus = cc->core->bus;
++	u32 nb;
++
++	if (cc->capabilities & BCMA_CC_CAP_PMU) {
++		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)
++			nb = 32;
++		else if (cc->core->id.rev < 26)
++			nb = 16;
++		else
++			nb = (cc->core->id.rev >= 37) ? 32 : 24;
++	} else {
++		nb = 28;
++	}
++	if (nb == 32)
++		return 0xffffffff;
++	else
++		return (1 << nb) - 1;
++}
++
++static u32 bcma_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,
++					      u32 ticks)
++{
++	struct bcma_drv_cc *cc = bcm47xx_wdt_get_drvdata(wdt);
++
++	return bcma_chipco_watchdog_timer_set(cc, ticks);
++}
++
++static u32 bcma_chipco_watchdog_timer_set_ms_wdt(struct bcm47xx_wdt *wdt,
++						 u32 ms)
++{
++	struct bcma_drv_cc *cc = bcm47xx_wdt_get_drvdata(wdt);
++	u32 ticks;
++
++	ticks = bcma_chipco_watchdog_timer_set(cc, cc->ticks_per_ms * ms);
++	return ticks / cc->ticks_per_ms;
++}
++
++static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc)
++{
++	struct bcma_bus *bus = cc->core->bus;
++
++	if (cc->capabilities & BCMA_CC_CAP_PMU) {
++		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)
++			/* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */
++			return bcma_chipco_get_alp_clock(cc) / 4000;
++		else
++			/* based on 32KHz ILP clock */
++			return 32;
++	} else {
++		return bcma_chipco_get_alp_clock(cc) / 1000;
++	}
++}
++
++int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc)
++{
++	struct bcm47xx_wdt wdt = {};
++	struct platform_device *pdev;
++
++	wdt.driver_data = cc;
++	wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt;
++	wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt;
++	wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;
++
++	pdev = platform_device_register_data(NULL, "bcm47xx-wdt",
++					     cc->core->bus->num, &wdt,
++					     sizeof(wdt));
++	if (IS_ERR(pdev))
++		return PTR_ERR(pdev);
++
++	cc->watchdog = pdev;
++
++	return 0;
++}
++
++void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
++{
++	if (cc->early_setup_done)
+ 		return;
+ 
++	spin_lock_init(&cc->gpio_lock);
++
+ 	if (cc->core->id.rev >= 11)
+ 		cc->status = bcma_cc_read32(cc, BCMA_CC_CHIPSTAT);
+ 	cc->capabilities = bcma_cc_read32(cc, BCMA_CC_CAP);
+ 	if (cc->core->id.rev >= 35)
+ 		cc->capabilities_ext = bcma_cc_read32(cc, BCMA_CC_CAP_EXT);
+ 
++	if (cc->capabilities & BCMA_CC_CAP_PMU)
++		bcma_pmu_early_init(cc);
++
++	cc->early_setup_done = true;
++}
++
++void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
++{
++	u32 leddc_on = 10;
++	u32 leddc_off = 90;
++
++	if (cc->setup_done)
++		return;
++
++	bcma_core_chipcommon_early_init(cc);
++
+ 	if (cc->core->id.rev >= 20) {
+-		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, 0);
+-		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, 0);
++		u32 pullup = 0, pulldown = 0;
++
++		if (cc->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM43142) {
++			pullup = 0x402e0;
++			pulldown = 0x20500;
++		}
++
++		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, pullup);
++		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, pulldown);
+ 	}
+ 
+ 	if (cc->capabilities & BCMA_CC_CAP_PMU)
+ 		bcma_pmu_init(cc);
+ 	if (cc->capabilities & BCMA_CC_CAP_PCTL)
+-		pr_err("Power control not implemented!\n");
++		bcma_err(cc->core->bus, "Power control not implemented!\n");
+ 
+ 	if (cc->core->id.rev >= 16) {
+ 		if (cc->core->bus->sprom.leddc_on_time &&
+@@ -56,15 +166,33 @@ void bcma_core_chipcommon_init(struct bc
+ 			((leddc_on << BCMA_CC_GPIOTIMER_ONTIME_SHIFT) |
+ 			 (leddc_off << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT)));
+ 	}
++	cc->ticks_per_ms = bcma_chipco_watchdog_ticks_per_ms(cc);
+ 
+ 	cc->setup_done = true;
+ }
+ 
+ /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
+-void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)
++u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)
+ {
+-	/* instant NMI */
+-	bcma_cc_write32(cc, BCMA_CC_WATCHDOG, ticks);
++	u32 maxt;
++	enum bcma_clkmode clkmode;
++
++	maxt = bcma_chipco_watchdog_get_max_timer(cc);
++	if (cc->capabilities & BCMA_CC_CAP_PMU) {
++		if (ticks == 1)
++			ticks = 2;
++		else if (ticks > maxt)
++			ticks = maxt;
++		bcma_cc_write32(cc, BCMA_CC_PMU_WATCHDOG, ticks);
++	} else {
++		clkmode = ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC;
++		bcma_core_set_clockmode(cc->core, clkmode);
++		if (ticks > maxt)
++			ticks = maxt;
++		/* instant NMI */
++		bcma_cc_write32(cc, BCMA_CC_WATCHDOG, ticks);
++	}
++	return ticks;
+ }
+ 
+ void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value)
+@@ -84,28 +212,99 @@ u32 bcma_chipco_gpio_in(struct bcma_drv_
+ 
+ u32 bcma_chipco_gpio_out(struct bcma_drv_cc *cc, u32 mask, u32 value)
+ {
+-	return bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUT, mask, value);
++	unsigned long flags;
++	u32 res;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUT, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
++EXPORT_SYMBOL_GPL(bcma_chipco_gpio_out);
+ 
+ u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)
+ {
+-	return bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUTEN, mask, value);
++	unsigned long flags;
++	u32 res;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUTEN, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
++EXPORT_SYMBOL_GPL(bcma_chipco_gpio_outen);
+ 
++/*
++ * If the bit is set to 0, chipcommon controlls this GPIO,
++ * if the bit is set to 1, it is used by some part of the chip and not our code.
++ */
+ u32 bcma_chipco_gpio_control(struct bcma_drv_cc *cc, u32 mask, u32 value)
+ {
+-	return bcma_cc_write32_masked(cc, BCMA_CC_GPIOCTL, mask, value);
++	unsigned long flags;
++	u32 res;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOCTL, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ EXPORT_SYMBOL_GPL(bcma_chipco_gpio_control);
+ 
+ u32 bcma_chipco_gpio_intmask(struct bcma_drv_cc *cc, u32 mask, u32 value)
+ {
+-	return bcma_cc_write32_masked(cc, BCMA_CC_GPIOIRQ, mask, value);
++	unsigned long flags;
++	u32 res;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOIRQ, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ u32 bcma_chipco_gpio_polarity(struct bcma_drv_cc *cc, u32 mask, u32 value)
+ {
+-	return bcma_cc_write32_masked(cc, BCMA_CC_GPIOPOL, mask, value);
++	unsigned long flags;
++	u32 res;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOPOL, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
++}
++
++u32 bcma_chipco_gpio_pullup(struct bcma_drv_cc *cc, u32 mask, u32 value)
++{
++	unsigned long flags;
++	u32 res;
++
++	if (cc->core->id.rev < 20)
++		return 0;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOPULLUP, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
++}
++
++u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value)
++{
++	unsigned long flags;
++	u32 res;
++
++	if (cc->core->id.rev < 20)
++		return 0;
++
++	spin_lock_irqsave(&cc->gpio_lock, flags);
++	res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOPULLDOWN, mask, value);
++	spin_unlock_irqrestore(&cc->gpio_lock, flags);
++
++	return res;
+ }
+ 
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+@@ -118,8 +317,7 @@ void bcma_chipco_serial_init(struct bcma
+ 	struct bcma_serial_port *ports = cc->serial_ports;
+ 
+ 	if (ccrev >= 11 && ccrev != 15) {
+-		/* Fixed ALP clock */
+-		baud_base = bcma_pmu_alp_clock(cc);
++		baud_base = bcma_chipco_get_alp_clock(cc);
+ 		if (ccrev >= 21) {
+ 			/* Turn off UART clock before switching clocksource. */
+ 			bcma_cc_write32(cc, BCMA_CC_CORECTL,
+@@ -137,12 +335,11 @@ void bcma_chipco_serial_init(struct bcma
+ 				       | BCMA_CC_CORECTL_UARTCLKEN);
+ 		}
+ 	} else {
+-		pr_err("serial not supported on this device ccrev: 0x%x\n",
+-		       ccrev);
++		bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev);
+ 		return;
+ 	}
+ 
+-	irq = bcma_core_mips_irq(cc->core);
++	irq = bcma_core_irq(cc->core);
+ 
+ 	/* Determine the registers of the UARTs */
+ 	cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
+--- /dev/null
++++ b/drivers/bcma/driver_chipcommon_nflash.c
+@@ -0,0 +1,44 @@
++/*
++ * Broadcom specific AMBA
++ * ChipCommon NAND flash interface
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++
++#include <linux/platform_device.h>
++#include <linux/bcma/bcma.h>
++
++struct platform_device bcma_nflash_dev = {
++	.name		= "bcma_nflash",
++	.num_resources	= 0,
++};
++
++/* Initialize NAND flash access */
++int bcma_nflash_init(struct bcma_drv_cc *cc)
++{
++	struct bcma_bus *bus = cc->core->bus;
++
++	if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4706 &&
++	    cc->core->id.rev != 38) {
++		bcma_err(bus, "NAND flash on unsupported board!\n");
++		return -ENOTSUPP;
++	}
++
++	if (!(cc->capabilities & BCMA_CC_CAP_NFLASH)) {
++		bcma_err(bus, "NAND flash not present according to ChipCommon\n");
++		return -ENODEV;
++	}
++
++	cc->nflash.present = true;
++	if (cc->core->id.rev == 38 &&
++	    (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT))
++		cc->nflash.boot = true;
++
++	/* Prepare platform device, but don't register it yet. It's too early,
++	 * malloc (required by device_private_init) is not available yet. */
++	bcma_nflash_dev.dev.platform_data = &cc->nflash;
++
++	return 0;
++}
+--- a/drivers/bcma/driver_chipcommon_pmu.c
++++ b/drivers/bcma/driver_chipcommon_pmu.c
+@@ -3,7 +3,8 @@
+  * ChipCommon Power Management Unit driver
+  *
+  * Copyright 2009, Michael Buesch <m@bues.ch>
+- * Copyright 2007, Broadcom Corporation
++ * Copyright 2007, 2011, Broadcom Corporation
++ * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
+  *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+@@ -12,12 +13,13 @@
+ #include <linux/export.h>
+ #include <linux/bcma/bcma.h>
+ 
+-static u32 bcma_chipco_pll_read(struct bcma_drv_cc *cc, u32 offset)
++u32 bcma_chipco_pll_read(struct bcma_drv_cc *cc, u32 offset)
+ {
+ 	bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);
+ 	bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);
+ 	return bcma_cc_read32(cc, BCMA_CC_PLLCTL_DATA);
+ }
++EXPORT_SYMBOL_GPL(bcma_chipco_pll_read);
+ 
+ void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset, u32 value)
+ {
+@@ -54,19 +56,106 @@ void bcma_chipco_regctl_maskset(struct b
+ }
+ EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset);
+ 
++static u32 bcma_pmu_xtalfreq(struct bcma_drv_cc *cc)
++{
++	u32 ilp_ctl, alp_hz;
++
++	if (!(bcma_cc_read32(cc, BCMA_CC_PMU_STAT) &
++	      BCMA_CC_PMU_STAT_EXT_LPO_AVAIL))
++		return 0;
++
++	bcma_cc_write32(cc, BCMA_CC_PMU_XTAL_FREQ,
++			BIT(BCMA_CC_PMU_XTAL_FREQ_MEASURE_SHIFT));
++	usleep_range(1000, 2000);
++
++	ilp_ctl = bcma_cc_read32(cc, BCMA_CC_PMU_XTAL_FREQ);
++	ilp_ctl &= BCMA_CC_PMU_XTAL_FREQ_ILPCTL_MASK;
++
++	bcma_cc_write32(cc, BCMA_CC_PMU_XTAL_FREQ, 0);
++
++	alp_hz = ilp_ctl * 32768 / 4;
++	return (alp_hz + 50000) / 100000 * 100;
++}
++
++static void bcma_pmu2_pll_init0(struct bcma_drv_cc *cc, u32 xtalfreq)
++{
++	struct bcma_bus *bus = cc->core->bus;
++	u32 freq_tgt_target = 0, freq_tgt_current;
++	u32 pll0, mask;
++
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		/* pmu2_xtaltab0_adfll_485 */
++		switch (xtalfreq) {
++		case 12000:
++			freq_tgt_target = 0x50D52;
++			break;
++		case 20000:
++			freq_tgt_target = 0x307FE;
++			break;
++		case 26000:
++			freq_tgt_target = 0x254EA;
++			break;
++		case 37400:
++			freq_tgt_target = 0x19EF8;
++			break;
++		case 52000:
++			freq_tgt_target = 0x12A75;
++			break;
++		}
++		break;
++	}
++
++	if (!freq_tgt_target) {
++		bcma_err(bus, "Unknown TGT frequency for xtalfreq %d\n",
++			 xtalfreq);
++		return;
++	}
++
++	pll0 = bcma_chipco_pll_read(cc, BCMA_CC_PMU15_PLL_PLLCTL0);
++	freq_tgt_current = (pll0 & BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK) >>
++		BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT;
++
++	if (freq_tgt_current == freq_tgt_target) {
++		bcma_debug(bus, "Target TGT frequency already set\n");
++		return;
++	}
++
++	/* Turn off PLL */
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		mask = (u32)~(BCMA_RES_4314_HT_AVAIL |
++			      BCMA_RES_4314_MACPHY_CLK_AVAIL);
++
++		bcma_cc_mask32(cc, BCMA_CC_PMU_MINRES_MSK, mask);
++		bcma_cc_mask32(cc, BCMA_CC_PMU_MAXRES_MSK, mask);
++		bcma_wait_value(cc->core, BCMA_CLKCTLST,
++				BCMA_CLKCTLST_HAVEHT, 0, 20000);
++		break;
++	}
++
++	pll0 &= ~BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK;
++	pll0 |= freq_tgt_target << BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT;
++	bcma_chipco_pll_write(cc, BCMA_CC_PMU15_PLL_PLLCTL0, pll0);
++
++	/* Flush */
++	if (cc->pmu.rev >= 2)
++		bcma_cc_set32(cc, BCMA_CC_PMU_CTL, BCMA_CC_PMU_CTL_PLL_UPD);
++
++	/* TODO: Do we need to update OTP? */
++}
++
+ static void bcma_pmu_pll_init(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
++	u32 xtalfreq = bcma_pmu_xtalfreq(cc);
+ 
+ 	switch (bus->chipinfo.id) {
+-	case 0x4313:
+-	case 0x4331:
+-	case 43224:
+-	case 43225:
++	case BCMA_CHIP_ID_BCM43142:
++		if (xtalfreq == 0)
++			xtalfreq = 20000;
++		bcma_pmu2_pll_init0(cc, xtalfreq);
+ 		break;
+-	default:
+-		pr_err("PLL init unknown for device 0x%04X\n",
+-			bus->chipinfo.id);
+ 	}
+ }
+ 
+@@ -76,16 +165,32 @@ static void bcma_pmu_resources_init(stru
+ 	u32 min_msk = 0, max_msk = 0;
+ 
+ 	switch (bus->chipinfo.id) {
+-	case 0x4313:
++	case BCMA_CHIP_ID_BCM4313:
+ 		min_msk = 0x200D;
+ 		max_msk = 0xFFFF;
+ 		break;
+-	case 43224:
+-	case 43225:
++	case BCMA_CHIP_ID_BCM43142:
++		min_msk = BCMA_RES_4314_LPLDO_PU |
++			  BCMA_RES_4314_PMU_SLEEP_DIS |
++			  BCMA_RES_4314_PMU_BG_PU |
++			  BCMA_RES_4314_CBUCK_LPOM_PU |
++			  BCMA_RES_4314_CBUCK_PFM_PU |
++			  BCMA_RES_4314_CLDO_PU |
++			  BCMA_RES_4314_LPLDO2_LVM |
++			  BCMA_RES_4314_WL_PMU_PU |
++			  BCMA_RES_4314_LDO3P3_PU |
++			  BCMA_RES_4314_OTP_PU |
++			  BCMA_RES_4314_WL_PWRSW_PU |
++			  BCMA_RES_4314_LQ_AVAIL |
++			  BCMA_RES_4314_LOGIC_RET |
++			  BCMA_RES_4314_MEM_SLEEP |
++			  BCMA_RES_4314_MACPHY_RET |
++			  BCMA_RES_4314_WL_CORE_READY;
++		max_msk = 0x3FFFFFFF;
+ 		break;
+ 	default:
+-		pr_err("PMU resource config unknown for device 0x%04X\n",
+-			bus->chipinfo.id);
++		bcma_debug(bus, "PMU resource config unknown or not needed for device 0x%04X\n",
++			   bus->chipinfo.id);
+ 	}
+ 
+ 	/* Set the resource masks. */
+@@ -93,22 +198,12 @@ static void bcma_pmu_resources_init(stru
+ 		bcma_cc_write32(cc, BCMA_CC_PMU_MINRES_MSK, min_msk);
+ 	if (max_msk)
+ 		bcma_cc_write32(cc, BCMA_CC_PMU_MAXRES_MSK, max_msk);
+-}
+ 
+-void bcma_pmu_swreg_init(struct bcma_drv_cc *cc)
+-{
+-	struct bcma_bus *bus = cc->core->bus;
+-
+-	switch (bus->chipinfo.id) {
+-	case 0x4313:
+-	case 0x4331:
+-	case 43224:
+-	case 43225:
+-		break;
+-	default:
+-		pr_err("PMU switch/regulators init unknown for device "
+-			"0x%04X\n", bus->chipinfo.id);
+-	}
++	/*
++	 * Add some delay; allow resources to come up and settle.
++	 * Delay is required for SoC (early init).
++	 */
++	mdelay(2);
+ }
+ 
+ /* Disable to allow reading SPROM. Don't know the adventages of enabling it. */
+@@ -122,51 +217,69 @@ void bcma_chipco_bcm4331_ext_pa_lines_ct
+ 		val |= BCMA_CHIPCTL_4331_EXTPA_EN;
+ 		if (bus->chipinfo.pkg == 9 || bus->chipinfo.pkg == 11)
+ 			val |= BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5;
++		else if (bus->chipinfo.rev > 0)
++			val |= BCMA_CHIPCTL_4331_EXTPA_EN2;
+ 	} else {
+ 		val &= ~BCMA_CHIPCTL_4331_EXTPA_EN;
++		val &= ~BCMA_CHIPCTL_4331_EXTPA_EN2;
+ 		val &= ~BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5;
+ 	}
+ 	bcma_cc_write32(cc, BCMA_CC_CHIPCTL, val);
+ }
+ 
+-void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
++static void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+ 
+ 	switch (bus->chipinfo.id) {
+-	case 0x4313:
+-		bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7);
++	case BCMA_CHIP_ID_BCM4313:
++		/* enable 12 mA drive strenth for 4313 and set chipControl
++		   register bit 1 */
++		bcma_chipco_chipctl_maskset(cc, 0,
++					    ~BCMA_CCTRL_4313_12MA_LED_DRIVE,
++					    BCMA_CCTRL_4313_12MA_LED_DRIVE);
+ 		break;
+-	case 0x4331:
+-		/* BCM4331 workaround is SPROM-related, we put it in sprom.c */
++	case BCMA_CHIP_ID_BCM4331:
++	case BCMA_CHIP_ID_BCM43431:
++		/* Ext PA lines must be enabled for tx on BCM4331 */
++		bcma_chipco_bcm4331_ext_pa_lines_ctl(cc, true);
+ 		break;
+-	case 43224:
++	case BCMA_CHIP_ID_BCM43224:
++	case BCMA_CHIP_ID_BCM43421:
++		/* enable 12 mA drive strenth for 43224 and set chipControl
++		   register bit 15 */
+ 		if (bus->chipinfo.rev == 0) {
+-			pr_err("Workarounds for 43224 rev 0 not fully "
+-				"implemented\n");
+-			bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x00F000F0);
++			bcma_cc_maskset32(cc, BCMA_CC_CHIPCTL,
++					  ~BCMA_CCTRL_43224_GPIO_TOGGLE,
++					  BCMA_CCTRL_43224_GPIO_TOGGLE);
++			bcma_chipco_chipctl_maskset(cc, 0,
++						    ~BCMA_CCTRL_43224A0_12MA_LED_DRIVE,
++						    BCMA_CCTRL_43224A0_12MA_LED_DRIVE);
+ 		} else {
+-			bcma_chipco_chipctl_maskset(cc, 0, ~0, 0xF0);
++			bcma_chipco_chipctl_maskset(cc, 0,
++						    ~BCMA_CCTRL_43224B0_12MA_LED_DRIVE,
++						    BCMA_CCTRL_43224B0_12MA_LED_DRIVE);
+ 		}
+ 		break;
+-	case 43225:
+-		break;
+ 	default:
+-		pr_err("Workarounds unknown for device 0x%04X\n",
+-			bus->chipinfo.id);
++		bcma_debug(bus, "Workarounds unknown or not needed for device 0x%04X\n",
++			   bus->chipinfo.id);
+ 	}
+ }
+ 
+-void bcma_pmu_init(struct bcma_drv_cc *cc)
++void bcma_pmu_early_init(struct bcma_drv_cc *cc)
+ {
+ 	u32 pmucap;
+ 
+ 	pmucap = bcma_cc_read32(cc, BCMA_CC_PMU_CAP);
+ 	cc->pmu.rev = (pmucap & BCMA_CC_PMU_CAP_REVISION);
+ 
+-	pr_debug("Found rev %u PMU (capabilities 0x%08X)\n", cc->pmu.rev,
+-		 pmucap);
++	bcma_debug(cc->core->bus, "Found rev %u PMU (capabilities 0x%08X)\n",
++		   cc->pmu.rev, pmucap);
++}
+ 
++void bcma_pmu_init(struct bcma_drv_cc *cc)
++{
+ 	if (cc->pmu.rev == 1)
+ 		bcma_cc_mask32(cc, BCMA_CC_PMU_CTL,
+ 			      ~BCMA_CC_PMU_CTL_NOILPONW);
+@@ -174,37 +287,48 @@ void bcma_pmu_init(struct bcma_drv_cc *c
+ 		bcma_cc_set32(cc, BCMA_CC_PMU_CTL,
+ 			     BCMA_CC_PMU_CTL_NOILPONW);
+ 
+-	if (cc->core->id.id == 0x4329 && cc->core->id.rev == 2)
+-		pr_err("Fix for 4329b0 bad LPOM state not implemented!\n");
+-
+ 	bcma_pmu_pll_init(cc);
+ 	bcma_pmu_resources_init(cc);
+-	bcma_pmu_swreg_init(cc);
+ 	bcma_pmu_workarounds(cc);
+ }
+ 
+-u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc)
++u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+ 
+ 	switch (bus->chipinfo.id) {
+-	case 0x4716:
+-	case 0x4748:
+-	case 47162:
+-	case 0x4313:
+-	case 0x5357:
+-	case 0x4749:
+-	case 53572:
++	case BCMA_CHIP_ID_BCM4313:
++	case BCMA_CHIP_ID_BCM43224:
++	case BCMA_CHIP_ID_BCM43225:
++	case BCMA_CHIP_ID_BCM43227:
++	case BCMA_CHIP_ID_BCM43228:
++	case BCMA_CHIP_ID_BCM4331:
++	case BCMA_CHIP_ID_BCM43421:
++	case BCMA_CHIP_ID_BCM43428:
++	case BCMA_CHIP_ID_BCM43431:
++	case BCMA_CHIP_ID_BCM4716:
++	case BCMA_CHIP_ID_BCM47162:
++	case BCMA_CHIP_ID_BCM4748:
++	case BCMA_CHIP_ID_BCM4749:
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM53572:
++	case BCMA_CHIP_ID_BCM6362:
+ 		/* always 20Mhz */
+ 		return 20000 * 1000;
+-	case 0x5356:
+-	case 0x5300:
++	case BCMA_CHIP_ID_BCM4706:
++	case BCMA_CHIP_ID_BCM5356:
+ 		/* always 25Mhz */
+ 		return 25000 * 1000;
++	case BCMA_CHIP_ID_BCM43460:
++	case BCMA_CHIP_ID_BCM4352:
++	case BCMA_CHIP_ID_BCM4360:
++		if (cc->status & BCMA_CC_CHIPST_4360_XTAL_40MZ)
++			return 40000 * 1000;
++		else
++			return 20000 * 1000;
+ 	default:
+-		pr_warn("No ALP clock specified for %04X device, "
+-			"pmu rev. %d, using default %d Hz\n",
+-			bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
++		bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
++			  bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
+ 	}
+ 	return BCMA_CC_PMU_ALP_CLOCK;
+ }
+@@ -212,7 +336,7 @@ u32 bcma_pmu_alp_clock(struct bcma_drv_c
+ /* Find the output of the "m" pll divider given pll controls that start with
+  * pllreg "pll0" i.e. 12 for main 6 for phy, 0 for misc.
+  */
+-static u32 bcma_pmu_clock(struct bcma_drv_cc *cc, u32 pll0, u32 m)
++static u32 bcma_pmu_pll_clock(struct bcma_drv_cc *cc, u32 pll0, u32 m)
+ {
+ 	u32 tmp, div, ndiv, p1, p2, fc;
+ 	struct bcma_bus *bus = cc->core->bus;
+@@ -221,7 +345,8 @@ static u32 bcma_pmu_clock(struct bcma_dr
+ 
+ 	BUG_ON(!m || m > 4);
+ 
+-	if (bus->chipinfo.id == 0x5357 || bus->chipinfo.id == 0x4749) {
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM5357 ||
++	    bus->chipinfo.id == BCMA_CHIP_ID_BCM4749) {
+ 		/* Detect failure in clock setting */
+ 		tmp = bcma_cc_read32(cc, BCMA_CC_CHIPSTAT);
+ 		if (tmp & 0x40000)
+@@ -240,60 +365,96 @@ static u32 bcma_pmu_clock(struct bcma_dr
+ 	ndiv = (tmp & BCMA_CC_PPL_NDIV_MASK) >> BCMA_CC_PPL_NDIV_SHIFT;
+ 
+ 	/* Do calculation in Mhz */
+-	fc = bcma_pmu_alp_clock(cc) / 1000000;
++	fc = bcma_pmu_get_alp_clock(cc) / 1000000;
+ 	fc = (p1 * ndiv * fc) / p2;
+ 
+ 	/* Return clock in Hertz */
+ 	return (fc / div) * 1000000;
+ }
+ 
++static u32 bcma_pmu_pll_clock_bcm4706(struct bcma_drv_cc *cc, u32 pll0, u32 m)
++{
++	u32 tmp, ndiv, p1div, p2div;
++	u32 clock;
++
++	BUG_ON(!m || m > 4);
++
++	/* Get N, P1 and P2 dividers to determine CPU clock */
++	tmp = bcma_chipco_pll_read(cc, pll0 + BCMA_CC_PMU6_4706_PROCPLL_OFF);
++	ndiv = (tmp & BCMA_CC_PMU6_4706_PROC_NDIV_INT_MASK)
++		>> BCMA_CC_PMU6_4706_PROC_NDIV_INT_SHIFT;
++	p1div = (tmp & BCMA_CC_PMU6_4706_PROC_P1DIV_MASK)
++		>> BCMA_CC_PMU6_4706_PROC_P1DIV_SHIFT;
++	p2div = (tmp & BCMA_CC_PMU6_4706_PROC_P2DIV_MASK)
++		>> BCMA_CC_PMU6_4706_PROC_P2DIV_SHIFT;
++
++	tmp = bcma_cc_read32(cc, BCMA_CC_CHIPSTAT);
++	if (tmp & BCMA_CC_CHIPST_4706_PKG_OPTION)
++		/* Low cost bonding: Fixed reference clock 25MHz and m = 4 */
++		clock = (25000000 / 4) * ndiv * p2div / p1div;
++	else
++		/* Fixed reference clock 25MHz and m = 2 */
++		clock = (25000000 / 2) * ndiv * p2div / p1div;
++
++	if (m == BCMA_CC_PMU5_MAINPLL_SSB)
++		clock = clock / 4;
++
++	return clock;
++}
++
+ /* query bus clock frequency for PMU-enabled chipcommon */
+-u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc)
++u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+ 
+ 	switch (bus->chipinfo.id) {
+-	case 0x4716:
+-	case 0x4748:
+-	case 47162:
+-		return bcma_pmu_clock(cc, BCMA_CC_PMU4716_MAINPLL_PLL0,
+-				      BCMA_CC_PMU5_MAINPLL_SSB);
+-	case 0x5356:
+-		return bcma_pmu_clock(cc, BCMA_CC_PMU5356_MAINPLL_PLL0,
+-				      BCMA_CC_PMU5_MAINPLL_SSB);
+-	case 0x5357:
+-	case 0x4749:
+-		return bcma_pmu_clock(cc, BCMA_CC_PMU5357_MAINPLL_PLL0,
+-				      BCMA_CC_PMU5_MAINPLL_SSB);
+-	case 0x5300:
+-		return bcma_pmu_clock(cc, BCMA_CC_PMU4706_MAINPLL_PLL0,
+-				      BCMA_CC_PMU5_MAINPLL_SSB);
+-	case 53572:
++	case BCMA_CHIP_ID_BCM4716:
++	case BCMA_CHIP_ID_BCM4748:
++	case BCMA_CHIP_ID_BCM47162:
++		return bcma_pmu_pll_clock(cc, BCMA_CC_PMU4716_MAINPLL_PLL0,
++					  BCMA_CC_PMU5_MAINPLL_SSB);
++	case BCMA_CHIP_ID_BCM5356:
++		return bcma_pmu_pll_clock(cc, BCMA_CC_PMU5356_MAINPLL_PLL0,
++					  BCMA_CC_PMU5_MAINPLL_SSB);
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM4749:
++		return bcma_pmu_pll_clock(cc, BCMA_CC_PMU5357_MAINPLL_PLL0,
++					  BCMA_CC_PMU5_MAINPLL_SSB);
++	case BCMA_CHIP_ID_BCM4706:
++		return bcma_pmu_pll_clock_bcm4706(cc,
++						  BCMA_CC_PMU4706_MAINPLL_PLL0,
++						  BCMA_CC_PMU5_MAINPLL_SSB);
++	case BCMA_CHIP_ID_BCM53572:
+ 		return 75000000;
+ 	default:
+-		pr_warn("No backplane clock specified for %04X device, "
+-			"pmu rev. %d, using default %d Hz\n",
+-			bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_HT_CLOCK);
++		bcma_warn(bus, "No bus clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
++			  bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_HT_CLOCK);
+ 	}
+ 	return BCMA_CC_PMU_HT_CLOCK;
+ }
++EXPORT_SYMBOL_GPL(bcma_pmu_get_bus_clock);
+ 
+ /* query cpu clock frequency for PMU-enabled chipcommon */
+-u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc)
++u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+ 
+-	if (bus->chipinfo.id == 53572)
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM53572)
+ 		return 300000000;
+ 
++	/* New PMUs can have different clock for bus and CPU */
+ 	if (cc->pmu.rev >= 5) {
+ 		u32 pll;
+ 		switch (bus->chipinfo.id) {
+-		case 0x5356:
++		case BCMA_CHIP_ID_BCM4706:
++			return bcma_pmu_pll_clock_bcm4706(cc,
++						BCMA_CC_PMU4706_MAINPLL_PLL0,
++						BCMA_CC_PMU5_MAINPLL_CPU);
++		case BCMA_CHIP_ID_BCM5356:
+ 			pll = BCMA_CC_PMU5356_MAINPLL_PLL0;
+ 			break;
+-		case 0x5357:
+-		case 0x4749:
++		case BCMA_CHIP_ID_BCM5357:
++		case BCMA_CHIP_ID_BCM4749:
+ 			pll = BCMA_CC_PMU5357_MAINPLL_PLL0;
+ 			break;
+ 		default:
+@@ -301,10 +462,189 @@ u32 bcma_pmu_get_clockcpu(struct bcma_dr
+ 			break;
+ 		}
+ 
+-		/* TODO: if (bus->chipinfo.id == 0x5300)
+-		  return si_4706_pmu_clock(sih, osh, cc, PMU4706_MAINPLL_PLL0, PMU5_MAINPLL_CPU); */
+-		return bcma_pmu_clock(cc, pll, BCMA_CC_PMU5_MAINPLL_CPU);
++		return bcma_pmu_pll_clock(cc, pll, BCMA_CC_PMU5_MAINPLL_CPU);
++	}
++
++	/* On old PMUs CPU has the same clock as the bus */
++	return bcma_pmu_get_bus_clock(cc);
++}
++
++static void bcma_pmu_spuravoid_pll_write(struct bcma_drv_cc *cc, u32 offset,
++					 u32 value)
++{
++	bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);
++	bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, value);
++}
++
++void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid)
++{
++	u32 tmp = 0;
++	u8 phypll_offset = 0;
++	u8 bcm5357_bcm43236_p1div[] = {0x1, 0x5, 0x5};
++	u8 bcm5357_bcm43236_ndiv[] = {0x30, 0xf6, 0xfc};
++	struct bcma_bus *bus = cc->core->bus;
++
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM4749:
++	case BCMA_CHIP_ID_BCM53572:
++		/* 5357[ab]0, 43236[ab]0, and 6362b0 */
++
++		/* BCM5357 needs to touch PLL1_PLLCTL[02],
++		   so offset PLL0_PLLCTL[02] by 6 */
++		phypll_offset = (bus->chipinfo.id == BCMA_CHIP_ID_BCM5357 ||
++		       bus->chipinfo.id == BCMA_CHIP_ID_BCM4749 ||
++		       bus->chipinfo.id == BCMA_CHIP_ID_BCM53572) ? 6 : 0;
++
++		/* RMW only the P1 divider */
++		bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR,
++				BCMA_CC_PMU_PLL_CTL0 + phypll_offset);
++		tmp = bcma_cc_read32(cc, BCMA_CC_PLLCTL_DATA);
++		tmp &= (~(BCMA_CC_PMU1_PLL0_PC0_P1DIV_MASK));
++		tmp |= (bcm5357_bcm43236_p1div[spuravoid] << BCMA_CC_PMU1_PLL0_PC0_P1DIV_SHIFT);
++		bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, tmp);
++
++		/* RMW only the int feedback divider */
++		bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR,
++				BCMA_CC_PMU_PLL_CTL2 + phypll_offset);
++		tmp = bcma_cc_read32(cc, BCMA_CC_PLLCTL_DATA);
++		tmp &= ~(BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_MASK);
++		tmp |= (bcm5357_bcm43236_ndiv[spuravoid]) << BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT;
++		bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, tmp);
++
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
++		break;
++
++	case BCMA_CHIP_ID_BCM4331:
++	case BCMA_CHIP_ID_BCM43431:
++		if (spuravoid == 2) {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11500014);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x0FC00a08);
++		} else if (spuravoid == 1) {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11500014);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x0F600a08);
++		} else {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11100014);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x03000a08);
++		}
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
++		break;
++
++	case BCMA_CHIP_ID_BCM43224:
++	case BCMA_CHIP_ID_BCM43225:
++	case BCMA_CHIP_ID_BCM43421:
++		if (spuravoid == 1) {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11500010);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL1,
++						     0x000C0C06);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x0F600a08);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL3,
++						     0x00000000);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL4,
++						     0x2001E920);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
++						     0x88888815);
++		} else {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11100010);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL1,
++						     0x000c0c06);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x03000a08);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL3,
++						     0x00000000);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL4,
++						     0x200005c0);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
++						     0x88888815);
++		}
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
++		break;
++
++	case BCMA_CHIP_ID_BCM4716:
++	case BCMA_CHIP_ID_BCM4748:
++	case BCMA_CHIP_ID_BCM47162:
++		if (spuravoid == 1) {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11500060);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL1,
++						     0x080C0C06);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x0F600000);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL3,
++						     0x00000000);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL4,
++						     0x2001E924);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
++						     0x88888815);
++		} else {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11100060);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL1,
++						     0x080c0c06);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x03000000);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL3,
++						     0x00000000);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL4,
++						     0x200005c0);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
++						     0x88888815);
++		}
++
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;
++		break;
++
++	case BCMA_CHIP_ID_BCM43227:
++	case BCMA_CHIP_ID_BCM43228:
++	case BCMA_CHIP_ID_BCM43428:
++		/* LCNXN */
++		/* PLL Settings for spur avoidance on/off mode,
++		   no on2 support for 43228A0 */
++		if (spuravoid == 1) {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x01100014);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL1,
++						     0x040C0C06);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x03140A08);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL3,
++						     0x00333333);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL4,
++						     0x202C2820);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
++						     0x88888815);
++		} else {
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,
++						     0x11100014);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL1,
++						     0x040c0c06);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
++						     0x03000a08);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL3,
++						     0x00000000);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL4,
++						     0x200005c0);
++			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
++						     0x88888815);
++		}
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
++		break;
++	default:
++		bcma_err(bus, "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
++			 bus->chipinfo.id);
++		break;
+ 	}
+ 
+-	return bcma_pmu_get_clockcontrol(cc);
++	tmp |= bcma_cc_read32(cc, BCMA_CC_PMU_CTL);
++	bcma_cc_write32(cc, BCMA_CC_PMU_CTL, tmp);
+ }
++EXPORT_SYMBOL_GPL(bcma_pmu_spuravoid_pllupdate);
+--- /dev/null
++++ b/drivers/bcma/driver_chipcommon_sflash.c
+@@ -0,0 +1,165 @@
++/*
++ * Broadcom specific AMBA
++ * ChipCommon serial flash interface
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++
++#include <linux/platform_device.h>
++#include <linux/bcma/bcma.h>
++
++static struct resource bcma_sflash_resource = {
++	.name	= "bcma_sflash",
++	.start	= BCMA_SOC_FLASH2,
++	.end	= 0,
++	.flags  = IORESOURCE_MEM | IORESOURCE_READONLY,
++};
++
++struct platform_device bcma_sflash_dev = {
++	.name		= "bcma_sflash",
++	.resource	= &bcma_sflash_resource,
++	.num_resources	= 1,
++};
++
++struct bcma_sflash_tbl_e {
++	char *name;
++	u32 id;
++	u32 blocksize;
++	u16 numblocks;
++};
++
++static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
++	{ "M25P20", 0x11, 0x10000, 4, },
++	{ "M25P40", 0x12, 0x10000, 8, },
++
++	{ "M25P16", 0x14, 0x10000, 32, },
++	{ "M25P32", 0x15, 0x10000, 64, },
++	{ "M25P64", 0x16, 0x10000, 128, },
++	{ "M25FL128", 0x17, 0x10000, 256, },
++	{ 0 },
++};
++
++static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
++	{ "SST25WF512", 1, 0x1000, 16, },
++	{ "SST25VF512", 0x48, 0x1000, 16, },
++	{ "SST25WF010", 2, 0x1000, 32, },
++	{ "SST25VF010", 0x49, 0x1000, 32, },
++	{ "SST25WF020", 3, 0x1000, 64, },
++	{ "SST25VF020", 0x43, 0x1000, 64, },
++	{ "SST25WF040", 4, 0x1000, 128, },
++	{ "SST25VF040", 0x44, 0x1000, 128, },
++	{ "SST25VF040B", 0x8d, 0x1000, 128, },
++	{ "SST25WF080", 5, 0x1000, 256, },
++	{ "SST25VF080B", 0x8e, 0x1000, 256, },
++	{ "SST25VF016", 0x41, 0x1000, 512, },
++	{ "SST25VF032", 0x4a, 0x1000, 1024, },
++	{ "SST25VF064", 0x4b, 0x1000, 2048, },
++	{ 0 },
++};
++
++static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
++	{ "AT45DB011", 0xc, 256, 512, },
++	{ "AT45DB021", 0x14, 256, 1024, },
++	{ "AT45DB041", 0x1c, 256, 2048, },
++	{ "AT45DB081", 0x24, 256, 4096, },
++	{ "AT45DB161", 0x2c, 512, 4096, },
++	{ "AT45DB321", 0x34, 512, 8192, },
++	{ "AT45DB642", 0x3c, 1024, 8192, },
++	{ 0 },
++};
++
++static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode)
++{
++	int i;
++	bcma_cc_write32(cc, BCMA_CC_FLASHCTL,
++			BCMA_CC_FLASHCTL_START | opcode);
++	for (i = 0; i < 1000; i++) {
++		if (!(bcma_cc_read32(cc, BCMA_CC_FLASHCTL) &
++		      BCMA_CC_FLASHCTL_BUSY))
++			return;
++		cpu_relax();
++	}
++	bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n");
++}
++
++/* Initialize serial flash access */
++int bcma_sflash_init(struct bcma_drv_cc *cc)
++{
++	struct bcma_bus *bus = cc->core->bus;
++	struct bcma_sflash *sflash = &cc->sflash;
++	const struct bcma_sflash_tbl_e *e;
++	u32 id, id2;
++
++	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
++	case BCMA_CC_FLASHT_STSER:
++		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_ST_DP);
++
++		bcma_cc_write32(cc, BCMA_CC_FLASHADDR, 0);
++		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_ST_RES);
++		id = bcma_cc_read32(cc, BCMA_CC_FLASHDATA);
++
++		bcma_cc_write32(cc, BCMA_CC_FLASHADDR, 1);
++		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_ST_RES);
++		id2 = bcma_cc_read32(cc, BCMA_CC_FLASHDATA);
++
++		switch (id) {
++		case 0xbf:
++			for (e = bcma_sflash_sst_tbl; e->name; e++) {
++				if (e->id == id2)
++					break;
++			}
++			break;
++		case 0x13:
++			return -ENOTSUPP;
++		default:
++			for (e = bcma_sflash_st_tbl; e->name; e++) {
++				if (e->id == id)
++					break;
++			}
++			break;
++		}
++		if (!e->name) {
++			bcma_err(bus, "Unsupported ST serial flash (id: 0x%X, id2: 0x%X)\n", id, id2);
++			return -ENOTSUPP;
++		}
++
++		break;
++	case BCMA_CC_FLASHT_ATSER:
++		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_AT_STATUS);
++		id = bcma_cc_read32(cc, BCMA_CC_FLASHDATA) & 0x3c;
++
++		for (e = bcma_sflash_at_tbl; e->name; e++) {
++			if (e->id == id)
++				break;
++		}
++		if (!e->name) {
++			bcma_err(bus, "Unsupported Atmel serial flash (id: 0x%X)\n", id);
++			return -ENOTSUPP;
++		}
++
++		break;
++	default:
++		bcma_err(bus, "Unsupported flash type\n");
++		return -ENOTSUPP;
++	}
++
++	sflash->window = BCMA_SOC_FLASH2;
++	sflash->blocksize = e->blocksize;
++	sflash->numblocks = e->numblocks;
++	sflash->size = sflash->blocksize * sflash->numblocks;
++	sflash->present = true;
++
++	bcma_info(bus, "Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n",
++		  e->name, sflash->size / 1024, sflash->blocksize,
++		  sflash->numblocks);
++
++	/* Prepare platform device, but don't register it yet. It's too early,
++	 * malloc (required by device_private_init) is not available yet. */
++	bcma_sflash_dev.resource[0].end = bcma_sflash_dev.resource[0].start +
++					  sflash->size;
++	bcma_sflash_dev.dev.platform_data = sflash;
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/bcma/driver_gmac_cmn.c
+@@ -0,0 +1,14 @@
++/*
++ * Broadcom specific AMBA
++ * GBIT MAC COMMON Core
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include "bcma_private.h"
++#include <linux/bcma/bcma.h>
++
++void __devinit bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc)
++{
++	mutex_init(&gc->phy_mutex);
++}
+--- /dev/null
++++ b/drivers/bcma/driver_gpio.c
+@@ -0,0 +1,114 @@
++/*
++ * Broadcom specific AMBA
++ * GPIO driver
++ *
++ * Copyright 2011, Broadcom Corporation
++ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/gpio.h>
++#include <linux/export.h>
++#include <linux/bcma/bcma.h>
++
++#include "bcma_private.h"
++
++static inline struct bcma_drv_cc *bcma_gpio_get_cc(struct gpio_chip *chip)
++{
++	return container_of(chip, struct bcma_drv_cc, gpio);
++}
++
++static int bcma_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	return !!bcma_chipco_gpio_in(cc, 1 << gpio);
++}
++
++static void bcma_gpio_set_value(struct gpio_chip *chip, unsigned gpio,
++				int value)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	bcma_chipco_gpio_out(cc, 1 << gpio, value ? 1 << gpio : 0);
++}
++
++static int bcma_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	bcma_chipco_gpio_outen(cc, 1 << gpio, 0);
++	return 0;
++}
++
++static int bcma_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
++				      int value)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	bcma_chipco_gpio_outen(cc, 1 << gpio, 1 << gpio);
++	bcma_chipco_gpio_out(cc, 1 << gpio, value ? 1 << gpio : 0);
++	return 0;
++}
++
++static int bcma_gpio_request(struct gpio_chip *chip, unsigned gpio)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	bcma_chipco_gpio_control(cc, 1 << gpio, 0);
++	/* clear pulldown */
++	bcma_chipco_gpio_pulldown(cc, 1 << gpio, 0);
++	/* Set pullup */
++	bcma_chipco_gpio_pullup(cc, 1 << gpio, 1 << gpio);
++
++	return 0;
++}
++
++static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	/* clear pullup */
++	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
++}
++
++static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
++		return bcma_core_irq(cc->core);
++	else
++		return -EINVAL;
++}
++
++int bcma_gpio_init(struct bcma_drv_cc *cc)
++{
++	struct gpio_chip *chip = &cc->gpio;
++
++	chip->label		= "bcma_gpio";
++	chip->owner		= THIS_MODULE;
++	chip->request		= bcma_gpio_request;
++	chip->free		= bcma_gpio_free;
++	chip->get		= bcma_gpio_get_value;
++	chip->set		= bcma_gpio_set_value;
++	chip->direction_input	= bcma_gpio_direction_input;
++	chip->direction_output	= bcma_gpio_direction_output;
++	chip->to_irq		= bcma_gpio_to_irq;
++	chip->ngpio		= 16;
++	/* There is just one SoC in one device and its GPIO addresses should be
++	 * deterministic to address them more easily. The other buses could get
++	 * a random base number. */
++	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
++		chip->base		= 0;
++	else
++		chip->base		= -1;
++
++	return gpiochip_add(chip);
++}
++
++int bcma_gpio_unregister(struct bcma_drv_cc *cc)
++{
++	return gpiochip_remove(&cc->gpio);
++}
+--- a/drivers/bcma/driver_mips.c
++++ b/drivers/bcma/driver_mips.c
+@@ -14,23 +14,45 @@
+ 
+ #include <linux/bcma/bcma.h>
+ 
++#include <linux/mtd/physmap.h>
++#include <linux/platform_device.h>
+ #include <linux/serial.h>
+ #include <linux/serial_core.h>
+ #include <linux/serial_reg.h>
+ #include <linux/time.h>
+ 
++static const char * const part_probes[] = { "bcm47xxpart", NULL };
++
++static struct physmap_flash_data bcma_pflash_data = {
++	.part_probe_types	= part_probes,
++};
++
++static struct resource bcma_pflash_resource = {
++	.name	= "bcma_pflash",
++	.flags  = IORESOURCE_MEM,
++};
++
++struct platform_device bcma_pflash_dev = {
++	.name		= "physmap-flash",
++	.dev		= {
++		.platform_data  = &bcma_pflash_data,
++	},
++	.resource	= &bcma_pflash_resource,
++	.num_resources	= 1,
++};
++
+ /* The 47162a0 hangs when reading MIPS DMP registers registers */
+ static inline bool bcma_core_mips_bcm47162a0_quirk(struct bcma_device *dev)
+ {
+-	return dev->bus->chipinfo.id == 47162 && dev->bus->chipinfo.rev == 0 &&
+-	       dev->id.id == BCMA_CORE_MIPS_74K;
++	return dev->bus->chipinfo.id == BCMA_CHIP_ID_BCM47162 &&
++	       dev->bus->chipinfo.rev == 0 && dev->id.id == BCMA_CORE_MIPS_74K;
+ }
+ 
+ /* The 5357b0 hangs when reading USB20H DMP registers */
+ static inline bool bcma_core_mips_bcm5357b0_quirk(struct bcma_device *dev)
+ {
+-	return (dev->bus->chipinfo.id == 0x5357 ||
+-		dev->bus->chipinfo.id == 0x4749) &&
++	return (dev->bus->chipinfo.id == BCMA_CHIP_ID_BCM5357 ||
++		dev->bus->chipinfo.id == BCMA_CHIP_ID_BCM4749) &&
+ 	       dev->bus->chipinfo.pkg == 11 &&
+ 	       dev->id.id == BCMA_CORE_USB20_HOST;
+ }
+@@ -74,28 +96,41 @@ static u32 bcma_core_mips_irqflag(struct
+ 		return dev->core_index;
+ 	flag = bcma_aread32(dev, BCMA_MIPS_OOBSELOUTA30);
+ 
+-	return flag & 0x1F;
++	if (flag)
++		return flag & 0x1F;
++	else
++		return 0x3f;
+ }
+ 
+ /* Get the MIPS IRQ assignment for a specified device.
+  * If unassigned, 0 is returned.
++ * If disabled, 5 is returned.
++ * If not supported, 6 is returned.
+  */
+-unsigned int bcma_core_mips_irq(struct bcma_device *dev)
++static unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	struct bcma_device *mdev = dev->bus->drv_mips.core;
+ 	u32 irqflag;
+ 	unsigned int irq;
+ 
+ 	irqflag = bcma_core_mips_irqflag(dev);
++	if (irqflag == 0x3f)
++		return 6;
+ 
+-	for (irq = 1; irq <= 4; irq++)
++	for (irq = 0; irq <= 4; irq++)
+ 		if (bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq)) &
+ 		    (1 << irqflag))
+ 			return irq;
+ 
+-	return 0;
++	return 5;
++}
++
++unsigned int bcma_core_irq(struct bcma_device *dev)
++{
++	unsigned int mips_irq = bcma_core_mips_irq(dev);
++	return mips_irq <= 4 ? mips_irq + 2 : 0;
+ }
+-EXPORT_SYMBOL(bcma_core_mips_irq);
++EXPORT_SYMBOL(bcma_core_irq);
+ 
+ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
+ {
+@@ -114,8 +149,8 @@ static void bcma_core_mips_set_irq(struc
+ 		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0),
+ 			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
+ 			    ~(1 << irqflag));
+-	else
+-		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0);
++	else if (oldirq != 5)
++		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);
+ 
+ 	/* assign the new one */
+ 	if (irq == 0) {
+@@ -123,17 +158,17 @@ static void bcma_core_mips_set_irq(struc
+ 			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) |
+ 			    (1 << irqflag));
+ 	} else {
+-		u32 oldirqflag = bcma_read32(mdev,
+-					     BCMA_MIPS_MIPS74K_INTMASK(irq));
+-		if (oldirqflag) {
++		u32 irqinitmask = bcma_read32(mdev,
++					      BCMA_MIPS_MIPS74K_INTMASK(irq));
++		if (irqinitmask) {
+ 			struct bcma_device *core;
+ 
+ 			/* backplane irq line is in use, find out who uses
+ 			 * it and set user to irq 0
+ 			 */
+-			list_for_each_entry_reverse(core, &bus->cores, list) {
++			list_for_each_entry(core, &bus->cores, list) {
+ 				if ((1 << bcma_core_mips_irqflag(core)) ==
+-				    oldirqflag) {
++				    irqinitmask) {
+ 					bcma_core_mips_set_irq(core, 0);
+ 					break;
+ 				}
+@@ -143,15 +178,31 @@ static void bcma_core_mips_set_irq(struc
+ 			     1 << irqflag);
+ 	}
+ 
+-	pr_info("set_irq: core 0x%04x, irq %d => %d\n",
+-		dev->id.id, oldirq + 2, irq + 2);
++	bcma_debug(bus, "set_irq: core 0x%04x, irq %d => %d\n",
++		   dev->id.id, oldirq <= 4 ? oldirq + 2 : 0, irq + 2);
++}
++
++static void bcma_core_mips_set_irq_name(struct bcma_bus *bus, unsigned int irq,
++					u16 coreid, u8 unit)
++{
++	struct bcma_device *core;
++
++	core = bcma_find_core_unit(bus, coreid, unit);
++	if (!core) {
++		bcma_warn(bus,
++			  "Can not find core (id: 0x%x, unit %i) for IRQ configuration.\n",
++			  coreid, unit);
++		return;
++	}
++
++	bcma_core_mips_set_irq(core, irq);
+ }
+ 
+ static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq)
+ {
+ 	int i;
+ 	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
+-	printk(KERN_INFO KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
++	printk(KERN_DEBUG KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
+ 	for (i = 0; i <= 6; i++)
+ 		printk(" %s%s", irq_name[i], i == irq ? "*" : " ");
+ 	printk("\n");
+@@ -161,7 +212,7 @@ static void bcma_core_mips_dump_irq(stru
+ {
+ 	struct bcma_device *core;
+ 
+-	list_for_each_entry_reverse(core, &bus->cores, list) {
++	list_for_each_entry(core, &bus->cores, list) {
+ 		bcma_core_mips_print_irq(core, bcma_core_mips_irq(core));
+ 	}
+ }
+@@ -171,9 +222,9 @@ u32 bcma_cpu_clock(struct bcma_drv_mips
+ 	struct bcma_bus *bus = mcore->core->bus;
+ 
+ 	if (bus->drv_cc.capabilities & BCMA_CC_CAP_PMU)
+-		return bcma_pmu_get_clockcpu(&bus->drv_cc);
++		return bcma_pmu_get_cpu_clock(&bus->drv_cc);
+ 
+-	pr_err("No PMU available, need this to get the cpu clock\n");
++	bcma_err(bus, "No PMU available, need this to get the cpu clock\n");
+ 	return 0;
+ }
+ EXPORT_SYMBOL(bcma_cpu_clock);
+@@ -181,25 +232,81 @@ EXPORT_SYMBOL(bcma_cpu_clock);
+ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
+ {
+ 	struct bcma_bus *bus = mcore->core->bus;
++	struct bcma_drv_cc *cc = &bus->drv_cc;
++	struct bcma_pflash *pflash = &cc->pflash;
+ 
+-	switch (bus->drv_cc.capabilities & BCMA_CC_CAP_FLASHT) {
++	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
+ 	case BCMA_CC_FLASHT_STSER:
+ 	case BCMA_CC_FLASHT_ATSER:
+-		pr_err("Serial flash not supported.\n");
++		bcma_debug(bus, "Found serial flash\n");
++		bcma_sflash_init(cc);
+ 		break;
+ 	case BCMA_CC_FLASHT_PARA:
+-		pr_info("found parallel flash.\n");
+-		bus->drv_cc.pflash.window = 0x1c000000;
+-		bus->drv_cc.pflash.window_size = 0x02000000;
++		bcma_debug(bus, "Found parallel flash\n");
++		pflash->present = true;
++		pflash->window = BCMA_SOC_FLASH2;
++		pflash->window_size = BCMA_SOC_FLASH2_SZ;
+ 
+-		if ((bcma_read32(bus->drv_cc.core, BCMA_CC_FLASH_CFG) &
++		if ((bcma_read32(cc->core, BCMA_CC_FLASH_CFG) &
+ 		     BCMA_CC_FLASH_CFG_DS) == 0)
+-			bus->drv_cc.pflash.buswidth = 1;
++			pflash->buswidth = 1;
+ 		else
+-			bus->drv_cc.pflash.buswidth = 2;
++			pflash->buswidth = 2;
++
++		bcma_pflash_data.width = pflash->buswidth;
++		bcma_pflash_resource.start = pflash->window;
++		bcma_pflash_resource.end = pflash->window + pflash->window_size;
++
+ 		break;
+ 	default:
+-		pr_err("flash not supported.\n");
++		bcma_err(bus, "Flash type not supported\n");
++	}
++
++	if (cc->core->id.rev == 38 ||
++	    bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {
++		if (cc->capabilities & BCMA_CC_CAP_NFLASH) {
++			bcma_debug(bus, "Found NAND flash\n");
++			bcma_nflash_init(cc);
++		}
++	}
++}
++
++void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
++{
++	struct bcma_bus *bus = mcore->core->bus;
++
++	if (mcore->early_setup_done)
++		return;
++
++	bcma_chipco_serial_init(&bus->drv_cc);
++	bcma_core_mips_flash_detect(mcore);
++
++	mcore->early_setup_done = true;
++}
++
++static void bcma_fix_i2s_irqflag(struct bcma_bus *bus)
++{
++	struct bcma_device *cpu, *pcie, *i2s;
++
++	/* Fixup the interrupts in 4716/4748 for i2s core (2010 Broadcom SDK)
++	 * (IRQ flags > 7 are ignored when setting the interrupt masks)
++	 */
++	if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4716 &&
++	    bus->chipinfo.id != BCMA_CHIP_ID_BCM4748)
++		return;
++
++	cpu = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
++	pcie = bcma_find_core(bus, BCMA_CORE_PCIE);
++	i2s = bcma_find_core(bus, BCMA_CORE_I2S);
++	if (cpu && pcie && i2s &&
++	    bcma_aread32(cpu, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
++	    bcma_aread32(pcie, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
++	    bcma_aread32(i2s, BCMA_MIPS_OOBSELOUTA30) == 0x88) {
++		bcma_awrite32(cpu, BCMA_MIPS_OOBSELINA74, 0x07060504);
++		bcma_awrite32(pcie, BCMA_MIPS_OOBSELINA74, 0x07060504);
++		bcma_awrite32(i2s, BCMA_MIPS_OOBSELOUTA30, 0x87);
++		bcma_debug(bus,
++			   "Moved i2s interrupt to oob line 7 instead of 8\n");
+ 	}
+ }
+ 
+@@ -209,48 +316,59 @@ void bcma_core_mips_init(struct bcma_drv
+ 	struct bcma_device *core;
+ 	bus = mcore->core->bus;
+ 
+-	pr_info("Initializing MIPS core...\n");
++	if (mcore->setup_done)
++		return;
+ 
+-	if (!mcore->setup_done)
+-		mcore->assigned_irqs = 1;
++	bcma_debug(bus, "Initializing MIPS core...\n");
+ 
+-	/* Assign IRQs to all cores on the bus */
+-	list_for_each_entry_reverse(core, &bus->cores, list) {
+-		int mips_irq;
+-		if (core->irq)
+-			continue;
+-
+-		mips_irq = bcma_core_mips_irq(core);
+-		if (mips_irq > 4)
+-			core->irq = 0;
+-		else
+-			core->irq = mips_irq + 2;
+-		if (core->irq > 5)
+-			continue;
+-		switch (core->id.id) {
+-		case BCMA_CORE_PCI:
+-		case BCMA_CORE_PCIE:
+-		case BCMA_CORE_ETHERNET:
+-		case BCMA_CORE_ETHERNET_GBIT:
+-		case BCMA_CORE_MAC_GBIT:
+-		case BCMA_CORE_80211:
+-		case BCMA_CORE_USB20_HOST:
+-			/* These devices get their own IRQ line if available,
+-			 * the rest goes on IRQ0
+-			 */
+-			if (mcore->assigned_irqs <= 4)
+-				bcma_core_mips_set_irq(core,
+-						       mcore->assigned_irqs++);
+-			break;
++	bcma_core_mips_early_init(mcore);
++
++	bcma_fix_i2s_irqflag(bus);
++
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM4716:
++	case BCMA_CHIP_ID_BCM4748:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
++		bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_USB20_HOST, 0);
++		bcma_core_mips_set_irq_name(bus, 4, BCMA_CORE_PCIE, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_I2S, 0);
++		break;
++	case BCMA_CHIP_ID_BCM5356:
++	case BCMA_CHIP_ID_BCM47162:
++	case BCMA_CHIP_ID_BCM53572:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
++		break;
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM4749:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
++		bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_USB20_HOST, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_I2S, 0);
++		break;
++	case BCMA_CHIP_ID_BCM4706:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_PCIE, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_4706_MAC_GBIT,
++					    0);
++		bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_PCIE, 1);
++		bcma_core_mips_set_irq_name(bus, 4, BCMA_CORE_USB20_HOST, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_4706_CHIPCOMMON,
++					    0);
++		break;
++	default:
++		list_for_each_entry(core, &bus->cores, list) {
++			core->irq = bcma_core_irq(core);
+ 		}
++		bcma_err(bus,
++			 "Unknown device (0x%x) found, can not configure IRQs\n",
++			 bus->chipinfo.id);
+ 	}
+-	pr_info("IRQ reconfiguration done\n");
++	bcma_debug(bus, "IRQ reconfiguration done\n");
+ 	bcma_core_mips_dump_irq(bus);
+ 
+-	if (mcore->setup_done)
+-		return;
+-
+-	bcma_chipco_serial_init(&bus->drv_cc);
+-	bcma_core_mips_flash_detect(mcore);
+ 	mcore->setup_done = true;
+ }
+--- a/drivers/bcma/driver_pci.c
++++ b/drivers/bcma/driver_pci.c
+@@ -2,8 +2,9 @@
+  * Broadcom specific AMBA
+  * PCI Core
+  *
+- * Copyright 2005, Broadcom Corporation
++ * Copyright 2005, 2011, Broadcom Corporation
+  * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
++ * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
+  *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+@@ -16,120 +17,131 @@
+  * R/W ops.
+  **************************************************/
+ 
+-static u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address)
++u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address)
+ {
+-	pcicore_write32(pc, 0x130, address);
+-	pcicore_read32(pc, 0x130);
+-	return pcicore_read32(pc, 0x134);
++	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
++	pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
++	return pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_DATA);
+ }
+ 
+-#if 0
+ static void bcma_pcie_write(struct bcma_drv_pci *pc, u32 address, u32 data)
+ {
+-	pcicore_write32(pc, 0x130, address);
+-	pcicore_read32(pc, 0x130);
+-	pcicore_write32(pc, 0x134, data);
++	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
++	pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
++	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_DATA, data);
+ }
+-#endif
+ 
+-static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy)
++static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u16 phy)
+ {
+-	const u16 mdio_control = 0x128;
+-	const u16 mdio_data = 0x12C;
+ 	u32 v;
+ 	int i;
+ 
+-	v = (1 << 30); /* Start of Transaction */
+-	v |= (1 << 28); /* Write Transaction */
+-	v |= (1 << 17); /* Turnaround */
+-	v |= (0x1F << 18);
++	v = BCMA_CORE_PCI_MDIODATA_START;
++	v |= BCMA_CORE_PCI_MDIODATA_WRITE;
++	v |= (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
++	      BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
++	v |= (BCMA_CORE_PCI_MDIODATA_BLK_ADDR <<
++	      BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
++	v |= BCMA_CORE_PCI_MDIODATA_TA;
+ 	v |= (phy << 4);
+-	pcicore_write32(pc, mdio_data, v);
++	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
+ 
+ 	udelay(10);
+ 	for (i = 0; i < 200; i++) {
+-		v = pcicore_read32(pc, mdio_control);
+-		if (v & 0x100 /* Trans complete */)
++		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
++		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)
+ 			break;
+-		msleep(1);
++		usleep_range(1000, 2000);
+ 	}
+ }
+ 
+-static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address)
++static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address)
+ {
+-	const u16 mdio_control = 0x128;
+-	const u16 mdio_data = 0x12C;
+ 	int max_retries = 10;
+ 	u16 ret = 0;
+ 	u32 v;
+ 	int i;
+ 
+-	v = 0x80; /* Enable Preamble Sequence */
+-	v |= 0x2; /* MDIO Clock Divisor */
+-	pcicore_write32(pc, mdio_control, v);
++	/* enable mdio access to SERDES */
++	v = BCMA_CORE_PCI_MDIOCTL_PREAM_EN;
++	v |= BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL;
++	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, v);
+ 
+ 	if (pc->core->id.rev >= 10) {
+ 		max_retries = 200;
+ 		bcma_pcie_mdio_set_phy(pc, device);
++		v = (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
++		     BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
++		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
++	} else {
++		v = (device << BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD);
++		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
+ 	}
+ 
+-	v = (1 << 30); /* Start of Transaction */
+-	v |= (1 << 29); /* Read Transaction */
+-	v |= (1 << 17); /* Turnaround */
+-	if (pc->core->id.rev < 10)
+-		v |= (u32)device << 22;
+-	v |= (u32)address << 18;
+-	pcicore_write32(pc, mdio_data, v);
++	v = BCMA_CORE_PCI_MDIODATA_START;
++	v |= BCMA_CORE_PCI_MDIODATA_READ;
++	v |= BCMA_CORE_PCI_MDIODATA_TA;
++
++	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
+ 	/* Wait for the device to complete the transaction */
+ 	udelay(10);
+ 	for (i = 0; i < max_retries; i++) {
+-		v = pcicore_read32(pc, mdio_control);
+-		if (v & 0x100 /* Trans complete */) {
++		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
++		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE) {
+ 			udelay(10);
+-			ret = pcicore_read32(pc, mdio_data);
++			ret = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_DATA);
+ 			break;
+ 		}
+-		msleep(1);
++		usleep_range(1000, 2000);
+ 	}
+-	pcicore_write32(pc, mdio_control, 0);
++	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
+ 	return ret;
+ }
+ 
+-static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device,
++static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device,
+ 				u8 address, u16 data)
+ {
+-	const u16 mdio_control = 0x128;
+-	const u16 mdio_data = 0x12C;
+ 	int max_retries = 10;
+ 	u32 v;
+ 	int i;
+ 
+-	v = 0x80; /* Enable Preamble Sequence */
+-	v |= 0x2; /* MDIO Clock Divisor */
+-	pcicore_write32(pc, mdio_control, v);
++	/* enable mdio access to SERDES */
++	v = BCMA_CORE_PCI_MDIOCTL_PREAM_EN;
++	v |= BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL;
++	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, v);
+ 
+ 	if (pc->core->id.rev >= 10) {
+ 		max_retries = 200;
+ 		bcma_pcie_mdio_set_phy(pc, device);
++		v = (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
++		     BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
++		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
++	} else {
++		v = (device << BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD);
++		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
+ 	}
+ 
+-	v = (1 << 30); /* Start of Transaction */
+-	v |= (1 << 28); /* Write Transaction */
+-	v |= (1 << 17); /* Turnaround */
+-	if (pc->core->id.rev < 10)
+-		v |= (u32)device << 22;
+-	v |= (u32)address << 18;
++	v = BCMA_CORE_PCI_MDIODATA_START;
++	v |= BCMA_CORE_PCI_MDIODATA_WRITE;
++	v |= BCMA_CORE_PCI_MDIODATA_TA;
+ 	v |= data;
+-	pcicore_write32(pc, mdio_data, v);
++	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
+ 	/* Wait for the device to complete the transaction */
+ 	udelay(10);
+ 	for (i = 0; i < max_retries; i++) {
+-		v = pcicore_read32(pc, mdio_control);
+-		if (v & 0x100 /* Trans complete */)
++		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
++		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)
+ 			break;
+-		msleep(1);
++		usleep_range(1000, 2000);
+ 	}
+-	pcicore_write32(pc, mdio_control, 0);
++	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
++}
++
++static u16 bcma_pcie_mdio_writeread(struct bcma_drv_pci *pc, u16 device,
++				    u8 address, u16 data)
++{
++	bcma_pcie_mdio_write(pc, device, address, data);
++	return bcma_pcie_mdio_read(pc, device, address);
+ }
+ 
+ /**************************************************
+@@ -138,88 +150,134 @@ static void bcma_pcie_mdio_write(struct
+ 
+ static u8 bcma_pcicore_polarity_workaround(struct bcma_drv_pci *pc)
+ {
+-	return (bcma_pcie_read(pc, 0x204) & 0x10) ? 0xC0 : 0x80;
++	u32 tmp;
++
++	tmp = bcma_pcie_read(pc, BCMA_CORE_PCI_PLP_STATUSREG);
++	if (tmp & BCMA_CORE_PCI_PLP_POLARITYINV_STAT)
++		return BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE |
++		       BCMA_CORE_PCI_SERDES_RX_CTRL_POLARITY;
++	else
++		return BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE;
+ }
+ 
+ static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc)
+ {
+-	const u8 serdes_pll_device = 0x1D;
+-	const u8 serdes_rx_device = 0x1F;
+ 	u16 tmp;
+ 
+-	bcma_pcie_mdio_write(pc, serdes_rx_device, 1 /* Control */,
+-			      bcma_pcicore_polarity_workaround(pc));
+-	tmp = bcma_pcie_mdio_read(pc, serdes_pll_device, 1 /* Control */);
+-	if (tmp & 0x4000)
+-		bcma_pcie_mdio_write(pc, serdes_pll_device, 1, tmp & ~0x4000);
++	bcma_pcie_mdio_write(pc, BCMA_CORE_PCI_MDIODATA_DEV_RX,
++	                     BCMA_CORE_PCI_SERDES_RX_CTRL,
++			     bcma_pcicore_polarity_workaround(pc));
++	tmp = bcma_pcie_mdio_read(pc, BCMA_CORE_PCI_MDIODATA_DEV_PLL,
++	                          BCMA_CORE_PCI_SERDES_PLL_CTRL);
++	if (tmp & BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN)
++		bcma_pcie_mdio_write(pc, BCMA_CORE_PCI_MDIODATA_DEV_PLL,
++		                     BCMA_CORE_PCI_SERDES_PLL_CTRL,
++		                     tmp & ~BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN);
++}
++
++static void bcma_core_pci_fixcfg(struct bcma_drv_pci *pc)
++{
++	struct bcma_device *core = pc->core;
++	u16 val16, core_index;
++	uint regoff;
++
++	regoff = BCMA_CORE_PCI_SPROM(BCMA_CORE_PCI_SPROM_PI_OFFSET);
++	core_index = (u16)core->core_index;
++
++	val16 = pcicore_read16(pc, regoff);
++	if (((val16 & BCMA_CORE_PCI_SPROM_PI_MASK) >> BCMA_CORE_PCI_SPROM_PI_SHIFT)
++	     != core_index) {
++		val16 = (core_index << BCMA_CORE_PCI_SPROM_PI_SHIFT) |
++			(val16 & ~BCMA_CORE_PCI_SPROM_PI_MASK);
++		pcicore_write16(pc, regoff, val16);
++	}
++}
++
++/* Fix MISC config to allow coming out of L2/L3-Ready state w/o PRST */
++/* Needs to happen when coming out of 'standby'/'hibernate' */
++static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc)
++{
++	u16 val16;
++	uint regoff;
++
++	regoff = BCMA_CORE_PCI_SPROM(BCMA_CORE_PCI_SPROM_MISC_CONFIG);
++
++	val16 = pcicore_read16(pc, regoff);
++
++	if (!(val16 & BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST)) {
++		val16 |= BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST;
++		pcicore_write16(pc, regoff, val16);
++	}
+ }
+ 
+ /**************************************************
+  * Init.
+  **************************************************/
+ 
+-static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
++static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
+ {
++	bcma_core_pci_fixcfg(pc);
+ 	bcma_pcicore_serdes_workaround(pc);
++	bcma_core_pci_config_fixup(pc);
+ }
+ 
+-static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
+-{
+-	struct bcma_bus *bus = pc->core->bus;
+-	u16 chipid_top;
+-
+-	chipid_top = (bus->chipinfo.id & 0xFF00);
+-	if (chipid_top != 0x4700 &&
+-	    chipid_top != 0x5300)
+-		return false;
+-
+-#ifdef CONFIG_SSB_DRIVER_PCICORE
+-	if (bus->sprom.boardflags_lo & SSB_BFL_NOPCI)
+-		return false;
+-#endif /* CONFIG_SSB_DRIVER_PCICORE */
+-
+-#if 0
+-	/* TODO: on BCMA we use address from EROM instead of magic formula */
+-	u32 tmp;
+-	return !mips_busprobe32(tmp, (bus->mmio +
+-		(pc->core->core_index * BCMA_CORE_SIZE)));
+-#endif
+-
+-	return true;
+-}
+-
+-void bcma_core_pci_init(struct bcma_drv_pci *pc)
++void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
+ {
+ 	if (pc->setup_done)
+ 		return;
+ 
+-	if (bcma_core_pci_is_in_hostmode(pc)) {
+ #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
++	pc->hostmode = bcma_core_pci_is_in_hostmode(pc);
++	if (pc->hostmode)
+ 		bcma_core_pci_hostmode_init(pc);
+-#else
+-		pr_err("Driver compiled without support for hostmode PCI\n");
+ #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
+-	} else {
++
++	if (!pc->hostmode)
+ 		bcma_core_pci_clientmode_init(pc);
+-	}
++}
++
++void bcma_core_pci_power_save(struct bcma_bus *bus, bool up)
++{
++	struct bcma_drv_pci *pc;
++	u16 data;
+ 
+-	pc->setup_done = true;
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	if (pc->core->id.rev >= 15 && pc->core->id.rev <= 20) {
++		data = up ? 0x74 : 0x7C;
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7F64);
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);
++	} else if (pc->core->id.rev >= 21 && pc->core->id.rev <= 22) {
++		data = up ? 0x75 : 0x7D;
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7E65);
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);
++	}
+ }
++EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);
+ 
+ int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
+ 			  bool enable)
+ {
+-	struct pci_dev *pdev = pc->core->bus->host_pci;
++	struct pci_dev *pdev;
+ 	u32 coremask, tmp;
+ 	int err = 0;
+ 
+-	if (core->bus->hosttype != BCMA_HOSTTYPE_PCI) {
++	if (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) {
+ 		/* This bcma device is not on a PCI host-bus. So the IRQs are
+ 		 * not routed through the PCI core.
+ 		 * So we must not enable routing through the PCI core. */
+ 		goto out;
+ 	}
+ 
++	pdev = pc->core->bus->host_pci;
++
+ 	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
+ 	if (err)
+ 		goto out;
+@@ -236,3 +294,42 @@ out:
+ 	return err;
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);
++
++static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)
++{
++	u32 w;
++
++	w = bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);
++	if (extend)
++		w |= BCMA_CORE_PCI_ASPMTIMER_EXTEND;
++	else
++		w &= ~BCMA_CORE_PCI_ASPMTIMER_EXTEND;
++	bcma_pcie_write(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG, w);
++	bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);
++}
++
++void bcma_core_pci_up(struct bcma_bus *bus)
++{
++	struct bcma_drv_pci *pc;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	bcma_core_pci_extend_L1timer(pc, true);
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_up);
++
++void bcma_core_pci_down(struct bcma_bus *bus)
++{
++	struct bcma_drv_pci *pc;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	bcma_core_pci_extend_L1timer(pc, false);
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_down);
+--- a/drivers/bcma/driver_pci_host.c
++++ b/drivers/bcma/driver_pci_host.c
+@@ -2,13 +2,622 @@
+  * Broadcom specific AMBA
+  * PCI Core in hostmode
+  *
++ * Copyright 2005 - 2011, Broadcom Corporation
++ * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
++ * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
++ *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
+ #include "bcma_private.h"
++#include <linux/pci.h>
++#include <linux/export.h>
+ #include <linux/bcma/bcma.h>
++#include <asm/paccess.h>
++
++/* Probe a 32bit value on the bus and catch bus exceptions.
++ * Returns nonzero on a bus exception.
++ * This is MIPS specific */
++#define mips_busprobe32(val, addr)	get_dbe((val), ((u32 *)(addr)))
++
++/* Assume one-hot slot wiring */
++#define BCMA_PCI_SLOT_MAX	16
++#define	PCI_CONFIG_SPACE_SIZE	256
++
++bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
++{
++	struct bcma_bus *bus = pc->core->bus;
++	u16 chipid_top;
++	u32 tmp;
++
++	chipid_top = (bus->chipinfo.id & 0xFF00);
++	if (chipid_top != 0x4700 &&
++	    chipid_top != 0x5300)
++		return false;
++
++	bcma_core_enable(pc->core, 0);
++
++	return !mips_busprobe32(tmp, pc->core->io_addr);
++}
++
++static u32 bcma_pcie_read_config(struct bcma_drv_pci *pc, u32 address)
++{
++	pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_ADDR, address);
++	pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_ADDR);
++	return pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_DATA);
++}
++
++static void bcma_pcie_write_config(struct bcma_drv_pci *pc, u32 address,
++				   u32 data)
++{
++	pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_ADDR, address);
++	pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_ADDR);
++	pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_DATA, data);
++}
++
++static u32 bcma_get_cfgspace_addr(struct bcma_drv_pci *pc, unsigned int dev,
++			     unsigned int func, unsigned int off)
++{
++	u32 addr = 0;
++
++	/* Issue config commands only when the data link is up (atleast
++	 * one external pcie device is present).
++	 */
++	if (dev >= 2 || !(bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_LSREG)
++			  & BCMA_CORE_PCI_DLLP_LSREG_LINKUP))
++		goto out;
++
++	/* Type 0 transaction */
++	/* Slide the PCI window to the appropriate slot */
++	pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI1, BCMA_CORE_PCI_SBTOPCI_CFG0);
++	/* Calculate the address */
++	addr = pc->host_controller->host_cfg_addr;
++	addr |= (dev << BCMA_CORE_PCI_CFG_SLOT_SHIFT);
++	addr |= (func << BCMA_CORE_PCI_CFG_FUN_SHIFT);
++	addr |= (off & ~3);
++
++out:
++	return addr;
++}
++
++static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
++				  unsigned int func, unsigned int off,
++				  void *buf, int len)
++{
++	int err = -EINVAL;
++	u32 addr, val;
++	void __iomem *mmio = 0;
++
++	WARN_ON(!pc->hostmode);
++	if (unlikely(len != 1 && len != 2 && len != 4))
++		goto out;
++	if (dev == 0) {
++		/* we support only two functions on device 0 */
++		if (func > 1)
++			goto out;
++
++		/* accesses to config registers with offsets >= 256
++		 * requires indirect access.
++		 */
++		if (off >= PCI_CONFIG_SPACE_SIZE) {
++			addr = (func << 12);
++			addr |= (off & 0x0FFC);
++			val = bcma_pcie_read_config(pc, addr);
++		} else {
++			addr = BCMA_CORE_PCI_PCICFG0;
++			addr |= (func << 8);
++			addr |= (off & 0xFC);
++			val = pcicore_read32(pc, addr);
++		}
++	} else {
++		addr = bcma_get_cfgspace_addr(pc, dev, func, off);
++		if (unlikely(!addr))
++			goto out;
++		err = -ENOMEM;
++		mmio = ioremap_nocache(addr, sizeof(val));
++		if (!mmio)
++			goto out;
++
++		if (mips_busprobe32(val, mmio)) {
++			val = 0xFFFFFFFF;
++			goto unmap;
++		}
++	}
++	val >>= (8 * (off & 3));
++
++	switch (len) {
++	case 1:
++		*((u8 *)buf) = (u8)val;
++		break;
++	case 2:
++		*((u16 *)buf) = (u16)val;
++		break;
++	case 4:
++		*((u32 *)buf) = (u32)val;
++		break;
++	}
++	err = 0;
++unmap:
++	if (mmio)
++		iounmap(mmio);
++out:
++	return err;
++}
+ 
+-void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
++static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
++				   unsigned int func, unsigned int off,
++				   const void *buf, int len)
+ {
+-	pr_err("No support for PCI core in hostmode yet\n");
++	int err = -EINVAL;
++	u32 addr, val;
++	void __iomem *mmio = 0;
++	u16 chipid = pc->core->bus->chipinfo.id;
++
++	WARN_ON(!pc->hostmode);
++	if (unlikely(len != 1 && len != 2 && len != 4))
++		goto out;
++	if (dev == 0) {
++		/* we support only two functions on device 0 */
++		if (func > 1)
++			goto out;
++
++		/* accesses to config registers with offsets >= 256
++		 * requires indirect access.
++		 */
++		if (off >= PCI_CONFIG_SPACE_SIZE) {
++			addr = (func << 12);
++			addr |= (off & 0x0FFC);
++			val = bcma_pcie_read_config(pc, addr);
++		} else {
++			addr = BCMA_CORE_PCI_PCICFG0;
++			addr |= (func << 8);
++			addr |= (off & 0xFC);
++			val = pcicore_read32(pc, addr);
++		}
++	} else {
++		addr = bcma_get_cfgspace_addr(pc, dev, func, off);
++		if (unlikely(!addr))
++			goto out;
++		err = -ENOMEM;
++		mmio = ioremap_nocache(addr, sizeof(val));
++		if (!mmio)
++			goto out;
++
++		if (mips_busprobe32(val, mmio)) {
++			val = 0xFFFFFFFF;
++			goto unmap;
++		}
++	}
++
++	switch (len) {
++	case 1:
++		val &= ~(0xFF << (8 * (off & 3)));
++		val |= *((const u8 *)buf) << (8 * (off & 3));
++		break;
++	case 2:
++		val &= ~(0xFFFF << (8 * (off & 3)));
++		val |= *((const u16 *)buf) << (8 * (off & 3));
++		break;
++	case 4:
++		val = *((const u32 *)buf);
++		break;
++	}
++	if (dev == 0) {
++		/* accesses to config registers with offsets >= 256
++		 * requires indirect access.
++		 */
++		if (off >= PCI_CONFIG_SPACE_SIZE)
++			bcma_pcie_write_config(pc, addr, val);
++		else
++			pcicore_write32(pc, addr, val);
++	} else {
++		writel(val, mmio);
++
++		if (chipid == BCMA_CHIP_ID_BCM4716 ||
++		    chipid == BCMA_CHIP_ID_BCM4748)
++			readl(mmio);
++	}
++
++	err = 0;
++unmap:
++	if (mmio)
++		iounmap(mmio);
++out:
++	return err;
++}
++
++static int bcma_core_pci_hostmode_read_config(struct pci_bus *bus,
++					      unsigned int devfn,
++					      int reg, int size, u32 *val)
++{
++	unsigned long flags;
++	int err;
++	struct bcma_drv_pci *pc;
++	struct bcma_drv_pci_host *pc_host;
++
++	pc_host = container_of(bus->ops, struct bcma_drv_pci_host, pci_ops);
++	pc = pc_host->pdev;
++
++	spin_lock_irqsave(&pc_host->cfgspace_lock, flags);
++	err = bcma_extpci_read_config(pc, PCI_SLOT(devfn),
++				     PCI_FUNC(devfn), reg, val, size);
++	spin_unlock_irqrestore(&pc_host->cfgspace_lock, flags);
++
++	return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
++}
++
++static int bcma_core_pci_hostmode_write_config(struct pci_bus *bus,
++					       unsigned int devfn,
++					       int reg, int size, u32 val)
++{
++	unsigned long flags;
++	int err;
++	struct bcma_drv_pci *pc;
++	struct bcma_drv_pci_host *pc_host;
++
++	pc_host = container_of(bus->ops, struct bcma_drv_pci_host, pci_ops);
++	pc = pc_host->pdev;
++
++	spin_lock_irqsave(&pc_host->cfgspace_lock, flags);
++	err = bcma_extpci_write_config(pc, PCI_SLOT(devfn),
++				      PCI_FUNC(devfn), reg, &val, size);
++	spin_unlock_irqrestore(&pc_host->cfgspace_lock, flags);
++
++	return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
++}
++
++/* return cap_offset if requested capability exists in the PCI config space */
++static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc,
++					     unsigned int dev,
++					     unsigned int func, u8 req_cap_id,
++					     unsigned char *buf, u32 *buflen)
++{
++	u8 cap_id;
++	u8 cap_ptr = 0;
++	u32 bufsize;
++	u8 byte_val;
++
++	/* check for Header type 0 */
++	bcma_extpci_read_config(pc, dev, func, PCI_HEADER_TYPE, &byte_val,
++				sizeof(u8));
++	if ((byte_val & 0x7F) != PCI_HEADER_TYPE_NORMAL)
++		return cap_ptr;
++
++	/* check if the capability pointer field exists */
++	bcma_extpci_read_config(pc, dev, func, PCI_STATUS, &byte_val,
++				sizeof(u8));
++	if (!(byte_val & PCI_STATUS_CAP_LIST))
++		return cap_ptr;
++
++	/* check if the capability pointer is 0x00 */
++	bcma_extpci_read_config(pc, dev, func, PCI_CAPABILITY_LIST, &cap_ptr,
++				sizeof(u8));
++	if (cap_ptr == 0x00)
++		return cap_ptr;
++
++	/* loop thr'u the capability list and see if the requested capabilty
++	 * exists */
++	bcma_extpci_read_config(pc, dev, func, cap_ptr, &cap_id, sizeof(u8));
++	while (cap_id != req_cap_id) {
++		bcma_extpci_read_config(pc, dev, func, cap_ptr + 1, &cap_ptr,
++					sizeof(u8));
++		if (cap_ptr == 0x00)
++			return cap_ptr;
++		bcma_extpci_read_config(pc, dev, func, cap_ptr, &cap_id,
++					sizeof(u8));
++	}
++
++	/* found the caller requested capability */
++	if ((buf != NULL) && (buflen != NULL)) {
++		u8 cap_data;
++
++		bufsize = *buflen;
++		if (!bufsize)
++			return cap_ptr;
++
++		*buflen = 0;
++
++		/* copy the cpability data excluding cap ID and next ptr */
++		cap_data = cap_ptr + 2;
++		if ((bufsize + cap_data)  > PCI_CONFIG_SPACE_SIZE)
++			bufsize = PCI_CONFIG_SPACE_SIZE - cap_data;
++		*buflen = bufsize;
++		while (bufsize--) {
++			bcma_extpci_read_config(pc, dev, func, cap_data, buf,
++						sizeof(u8));
++			cap_data++;
++			buf++;
++		}
++	}
++
++	return cap_ptr;
++}
++
++/* If the root port is capable of returning Config Request
++ * Retry Status (CRS) Completion Status to software then
++ * enable the feature.
++ */
++static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc)
++{
++	struct bcma_bus *bus = pc->core->bus;
++	u8 cap_ptr, root_ctrl, root_cap, dev;
++	u16 val16;
++	int i;
++
++	cap_ptr = bcma_find_pci_capability(pc, 0, 0, PCI_CAP_ID_EXP, NULL,
++					   NULL);
++	root_cap = cap_ptr + PCI_EXP_RTCAP;
++	bcma_extpci_read_config(pc, 0, 0, root_cap, &val16, sizeof(u16));
++	if (val16 & BCMA_CORE_PCI_RC_CRS_VISIBILITY) {
++		/* Enable CRS software visibility */
++		root_ctrl = cap_ptr + PCI_EXP_RTCTL;
++		val16 = PCI_EXP_RTCTL_CRSSVE;
++		bcma_extpci_read_config(pc, 0, 0, root_ctrl, &val16,
++					sizeof(u16));
++
++		/* Initiate a configuration request to read the vendor id
++		 * field of the device function's config space header after
++		 * 100 ms wait time from the end of Reset. If the device is
++		 * not done with its internal initialization, it must at
++		 * least return a completion TLP, with a completion status
++		 * of "Configuration Request Retry Status (CRS)". The root
++		 * complex must complete the request to the host by returning
++		 * a read-data value of 0001h for the Vendor ID field and
++		 * all 1s for any additional bytes included in the request.
++		 * Poll using the config reads for max wait time of 1 sec or
++		 * until we receive the successful completion status. Repeat
++		 * the procedure for all the devices.
++		 */
++		for (dev = 1; dev < BCMA_PCI_SLOT_MAX; dev++) {
++			for (i = 0; i < 100000; i++) {
++				bcma_extpci_read_config(pc, dev, 0,
++							PCI_VENDOR_ID, &val16,
++							sizeof(val16));
++				if (val16 != 0x1)
++					break;
++				udelay(10);
++			}
++			if (val16 == 0x1)
++				bcma_err(bus, "PCI: Broken device in slot %d\n",
++					 dev);
++		}
++	}
++}
++
++void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
++{
++	struct bcma_bus *bus = pc->core->bus;
++	struct bcma_drv_pci_host *pc_host;
++	u32 tmp;
++	u32 pci_membase_1G;
++	unsigned long io_map_base;
++
++	bcma_info(bus, "PCIEcore in host mode found\n");
++
++	if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) {
++		bcma_info(bus, "This PCIE core is disabled and not working\n");
++		return;
++	}
++
++	pc_host = kzalloc(sizeof(*pc_host), GFP_KERNEL);
++	if (!pc_host)  {
++		bcma_err(bus, "can not allocate memory");
++		return;
++	}
++
++	spin_lock_init(&pc_host->cfgspace_lock);
++
++	pc->host_controller = pc_host;
++	pc_host->pci_controller.io_resource = &pc_host->io_resource;
++	pc_host->pci_controller.mem_resource = &pc_host->mem_resource;
++	pc_host->pci_controller.pci_ops = &pc_host->pci_ops;
++	pc_host->pdev = pc;
++
++	pci_membase_1G = BCMA_SOC_PCI_DMA;
++	pc_host->host_cfg_addr = BCMA_SOC_PCI_CFG;
++
++	pc_host->pci_ops.read = bcma_core_pci_hostmode_read_config;
++	pc_host->pci_ops.write = bcma_core_pci_hostmode_write_config;
++
++	pc_host->mem_resource.name = "BCMA PCIcore external memory",
++	pc_host->mem_resource.start = BCMA_SOC_PCI_DMA;
++	pc_host->mem_resource.end = BCMA_SOC_PCI_DMA + BCMA_SOC_PCI_DMA_SZ - 1;
++	pc_host->mem_resource.flags = IORESOURCE_MEM | IORESOURCE_PCI_FIXED;
++
++	pc_host->io_resource.name = "BCMA PCIcore external I/O",
++	pc_host->io_resource.start = 0x100;
++	pc_host->io_resource.end = 0x7FF;
++	pc_host->io_resource.flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED;
++
++	/* Reset RC */
++	usleep_range(3000, 5000);
++	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE);
++	msleep(50);
++	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST |
++			BCMA_CORE_PCI_CTL_RST_OE);
++
++	/* 64 MB I/O access window. On 4716, use
++	 * sbtopcie0 to access the device registers. We
++	 * can't use address match 2 (1 GB window) region
++	 * as mips can't generate 64-bit address on the
++	 * backplane.
++	 */
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4716 ||
++	    bus->chipinfo.id == BCMA_CHIP_ID_BCM4748) {
++		pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
++		pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
++					    BCMA_SOC_PCI_MEM_SZ - 1;
++		pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
++				BCMA_CORE_PCI_SBTOPCI_MEM | BCMA_SOC_PCI_MEM);
++	} else if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {
++		tmp = BCMA_CORE_PCI_SBTOPCI_MEM;
++		tmp |= BCMA_CORE_PCI_SBTOPCI_PREF;
++		tmp |= BCMA_CORE_PCI_SBTOPCI_BURST;
++		if (pc->core->core_unit == 0) {
++			pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
++			pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
++						    BCMA_SOC_PCI_MEM_SZ - 1;
++			pc_host->io_resource.start = 0x100;
++			pc_host->io_resource.end = 0x47F;
++			pci_membase_1G = BCMA_SOC_PCIE_DMA_H32;
++			pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
++					tmp | BCMA_SOC_PCI_MEM);
++		} else if (pc->core->core_unit == 1) {
++			pc_host->mem_resource.start = BCMA_SOC_PCI1_MEM;
++			pc_host->mem_resource.end = BCMA_SOC_PCI1_MEM +
++						    BCMA_SOC_PCI_MEM_SZ - 1;
++			pc_host->io_resource.start = 0x480;
++			pc_host->io_resource.end = 0x7FF;
++			pci_membase_1G = BCMA_SOC_PCIE1_DMA_H32;
++			pc_host->host_cfg_addr = BCMA_SOC_PCI1_CFG;
++			pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
++					tmp | BCMA_SOC_PCI1_MEM);
++		}
++	} else
++		pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
++				BCMA_CORE_PCI_SBTOPCI_IO);
++
++	/* 64 MB configuration access window */
++	pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI1, BCMA_CORE_PCI_SBTOPCI_CFG0);
++
++	/* 1 GB memory access window */
++	pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI2,
++			BCMA_CORE_PCI_SBTOPCI_MEM | pci_membase_1G);
++
++
++	/* As per PCI Express Base Spec 1.1 we need to wait for
++	 * at least 100 ms from the end of a reset (cold/warm/hot)
++	 * before issuing configuration requests to PCI Express
++	 * devices.
++	 */
++	msleep(100);
++
++	bcma_core_pci_enable_crs(pc);
++
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706 ||
++	    bus->chipinfo.id == BCMA_CHIP_ID_BCM4716) {
++		u16 val16;
++		bcma_extpci_read_config(pc, 0, 0, BCMA_CORE_PCI_CFG_DEVCTRL,
++					&val16, sizeof(val16));
++		val16 |= (2 << 5);	/* Max payload size of 512 */
++		val16 |= (2 << 12);	/* MRRS 512 */
++		bcma_extpci_write_config(pc, 0, 0, BCMA_CORE_PCI_CFG_DEVCTRL,
++					 &val16, sizeof(val16));
++	}
++
++	/* Enable PCI bridge BAR0 memory & master access */
++	tmp = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
++	bcma_extpci_write_config(pc, 0, 0, PCI_COMMAND, &tmp, sizeof(tmp));
++
++	/* Enable PCI interrupts */
++	pcicore_write32(pc, BCMA_CORE_PCI_IMASK, BCMA_CORE_PCI_IMASK_INTA);
++
++	/* Ok, ready to run, register it to the system.
++	 * The following needs change, if we want to port hostmode
++	 * to non-MIPS platform. */
++	io_map_base = (unsigned long)ioremap_nocache(pc_host->mem_resource.start,
++						     resource_size(&pc_host->mem_resource));
++	pc_host->pci_controller.io_map_base = io_map_base;
++	set_io_port_base(pc_host->pci_controller.io_map_base);
++	/* Give some time to the PCI controller to configure itself with the new
++	 * values. Not waiting at this point causes crashes of the machine. */
++	usleep_range(10000, 15000);
++	register_pci_controller(&pc_host->pci_controller);
++	return;
++}
++
++/* Early PCI fixup for a device on the PCI-core bridge. */
++static void bcma_core_pci_fixup_pcibridge(struct pci_dev *dev)
++{
++	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
++		/* This is not a device on the PCI-core bridge. */
++		return;
++	}
++	if (PCI_SLOT(dev->devfn) != 0)
++		return;
++
++	pr_info("PCI: Fixing up bridge %s\n", pci_name(dev));
++
++	/* Enable PCI bridge bus mastering and memory space */
++	pci_set_master(dev);
++	if (pcibios_enable_device(dev, ~0) < 0) {
++		pr_err("PCI: BCMA bridge enable failed\n");
++		return;
++	}
++
++	/* Enable PCI bridge BAR1 prefetch and burst */
++	pci_write_config_dword(dev, BCMA_PCI_BAR1_CONTROL, 3);
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_pcibridge);
++
++/* Early PCI fixup for all PCI-cores to set the correct memory address. */
++static void bcma_core_pci_fixup_addresses(struct pci_dev *dev)
++{
++	struct resource *res;
++	int pos, err;
++
++	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
++		/* This is not a device on the PCI-core bridge. */
++		return;
++	}
++	if (PCI_SLOT(dev->devfn) == 0)
++		return;
++
++	pr_info("PCI: Fixing up addresses %s\n", pci_name(dev));
++
++	for (pos = 0; pos < 6; pos++) {
++		res = &dev->resource[pos];
++		if (res->flags & (IORESOURCE_IO | IORESOURCE_MEM)) {
++			err = pci_assign_resource(dev, pos);
++			if (err)
++				pr_err("PCI: Problem fixing up the addresses on %s\n",
++				       pci_name(dev));
++		}
++	}
++}
++DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_addresses);
++
++/* This function is called when doing a pci_enable_device().
++ * We must first check if the device is a device on the PCI-core bridge. */
++int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
++{
++	struct bcma_drv_pci_host *pc_host;
++	int readrq;
++
++	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
++		/* This is not a device on the PCI-core bridge. */
++		return -ENODEV;
++	}
++	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
++			       pci_ops);
++
++	pr_info("PCI: Fixing up device %s\n", pci_name(dev));
++
++	/* Fix up interrupt lines */
++	dev->irq = bcma_core_irq(pc_host->pdev->core);
++	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
++
++	readrq = pcie_get_readrq(dev);
++	if (readrq > 128) {
++		pr_info("change PCIe max read request size from %i to 128\n", readrq);
++		pcie_set_readrq(dev, 128);
++	}
++	return 0;
++}
++EXPORT_SYMBOL(bcma_core_pci_plat_dev_init);
++
++/* PCI device IRQ mapping. */
++int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev)
++{
++	struct bcma_drv_pci_host *pc_host;
++
++	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
++		/* This is not a device on the PCI-core bridge. */
++		return -ENODEV;
++	}
++
++	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
++			       pci_ops);
++	return bcma_core_irq(pc_host->pdev->core);
+ }
++EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -18,7 +18,7 @@ static void bcma_host_pci_switch_core(st
+ 	pci_write_config_dword(core->bus->host_pci, BCMA_PCI_BAR0_WIN2,
+ 			       core->wrap);
+ 	core->bus->mapped_core = core;
+-	pr_debug("Switched to core: 0x%X\n", core->id.id);
++	bcma_debug(core->bus, "Switched to core: 0x%X\n", core->id.id);
+ }
+ 
+ /* Provides access to the requested core. Returns base offset that has to be
+@@ -77,8 +77,8 @@ static void bcma_host_pci_write32(struct
+ }
+ 
+ #ifdef CONFIG_BCMA_BLOCKIO
+-void bcma_host_pci_block_read(struct bcma_device *core, void *buffer,
+-			      size_t count, u16 offset, u8 reg_width)
++static void bcma_host_pci_block_read(struct bcma_device *core, void *buffer,
++				     size_t count, u16 offset, u8 reg_width)
+ {
+ 	void __iomem *addr = core->bus->mmio + offset;
+ 	if (core->bus->mapped_core != core)
+@@ -100,8 +100,9 @@ void bcma_host_pci_block_read(struct bcm
+ 	}
+ }
+ 
+-void bcma_host_pci_block_write(struct bcma_device *core, const void *buffer,
+-			       size_t count, u16 offset, u8 reg_width)
++static void bcma_host_pci_block_write(struct bcma_device *core,
++				      const void *buffer, size_t count,
++				      u16 offset, u8 reg_width)
+ {
+ 	void __iomem *addr = core->bus->mmio + offset;
+ 	if (core->bus->mapped_core != core)
+@@ -139,7 +140,7 @@ static void bcma_host_pci_awrite32(struc
+ 	iowrite32(value, core->bus->mmio + (1 * BCMA_CORE_SIZE) + offset);
+ }
+ 
+-const struct bcma_host_ops bcma_host_pci_ops = {
++static const struct bcma_host_ops bcma_host_pci_ops = {
+ 	.read8		= bcma_host_pci_read8,
+ 	.read16		= bcma_host_pci_read16,
+ 	.read32		= bcma_host_pci_read32,
+@@ -154,8 +155,8 @@ const struct bcma_host_ops bcma_host_pci
+ 	.awrite32	= bcma_host_pci_awrite32,
+ };
+ 
+-static int bcma_host_pci_probe(struct pci_dev *dev,
+-			     const struct pci_device_id *id)
++static int __devinit bcma_host_pci_probe(struct pci_dev *dev,
++					 const struct pci_device_id *id)
+ {
+ 	struct bcma_bus *bus;
+ 	int err = -ENOMEM;
+@@ -188,7 +189,7 @@ static int bcma_host_pci_probe(struct pc
+ 
+ 	/* SSB needed additional powering up, do we have any AMBA PCI cards? */
+ 	if (!pci_is_pcie(dev))
+-		pr_err("PCI card detected, report problems.\n");
++		bcma_err(bus, "PCI card detected, report problems.\n");
+ 
+ 	/* Map MMIO */
+ 	err = -ENOMEM;
+@@ -201,6 +202,9 @@ static int bcma_host_pci_probe(struct pc
+ 	bus->hosttype = BCMA_HOSTTYPE_PCI;
+ 	bus->ops = &bcma_host_pci_ops;
+ 
++	bus->boardinfo.vendor = bus->host_pci->subsystem_vendor;
++	bus->boardinfo.type = bus->host_pci->subsystem_device;
++
+ 	/* Register */
+ 	err = bcma_bus_register(bus);
+ 	if (err)
+@@ -222,7 +226,7 @@ err_kfree_bus:
+ 	return err;
+ }
+ 
+-static void bcma_host_pci_remove(struct pci_dev *dev)
++static void __devexit bcma_host_pci_remove(struct pci_dev *dev)
+ {
+ 	struct bcma_bus *bus = pci_get_drvdata(dev);
+ 
+@@ -234,7 +238,7 @@ static void bcma_host_pci_remove(struct
+ 	pci_set_drvdata(dev, NULL);
+ }
+ 
+-#ifdef CONFIG_PM
++#ifdef CONFIG_PM_SLEEP
+ static int bcma_host_pci_suspend(struct device *dev)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(dev);
+@@ -257,17 +261,21 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc
+ 			 bcma_host_pci_resume);
+ #define BCMA_PM_OPS	(&bcma_pm_ops)
+ 
+-#else /* CONFIG_PM */
++#else /* CONFIG_PM_SLEEP */
+ 
+ #define BCMA_PM_OPS     NULL
+ 
+-#endif /* CONFIG_PM */
++#endif /* CONFIG_PM_SLEEP */
+ 
+ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
+ 	{ 0, },
+ };
+@@ -277,7 +285,7 @@ static struct pci_driver bcma_pci_bridge
+ 	.name = "bcma-pci-bridge",
+ 	.id_table = bcma_pci_bridge_tbl,
+ 	.probe = bcma_host_pci_probe,
+-	.remove = bcma_host_pci_remove,
++	.remove = __devexit_p(bcma_host_pci_remove),
+ 	.driver.pm = BCMA_PM_OPS,
+ };
+ 
+--- a/drivers/bcma/host_soc.c
++++ b/drivers/bcma/host_soc.c
+@@ -143,7 +143,7 @@ static void bcma_host_soc_awrite32(struc
+ 	writel(value, core->io_wrap + offset);
+ }
+ 
+-const struct bcma_host_ops bcma_host_soc_ops = {
++static const struct bcma_host_ops bcma_host_soc_ops = {
+ 	.read8		= bcma_host_soc_read8,
+ 	.read16		= bcma_host_soc_read16,
+ 	.read32		= bcma_host_soc_read32,
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -7,12 +7,19 @@
+ 
+ #include "bcma_private.h"
+ #include <linux/module.h>
++#include <linux/platform_device.h>
+ #include <linux/bcma/bcma.h>
+ #include <linux/slab.h>
+ 
+ MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
+ MODULE_LICENSE("GPL");
+ 
++/* contains the number the next bus should get. */
++static unsigned int bcma_bus_next_num = 0;
++
++/* bcma_buses_mutex locks the bcma_bus_next_num */
++static DEFINE_MUTEX(bcma_buses_mutex);
++
+ static int bcma_bus_match(struct device *dev, struct device_driver *drv);
+ static int bcma_device_probe(struct device *dev);
+ static int bcma_device_remove(struct device *dev);
+@@ -55,7 +62,14 @@ static struct bus_type bcma_bus_type = {
+ 	.dev_attrs	= bcma_device_attrs,
+ };
+ 
+-static struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
++static u16 bcma_cc_core_id(struct bcma_bus *bus)
++{
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)
++		return BCMA_CORE_4706_CHIPCOMMON;
++	return BCMA_CORE_CHIPCOMMON;
++}
++
++struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
+ {
+ 	struct bcma_device *core;
+ 
+@@ -65,6 +79,38 @@ static struct bcma_device *bcma_find_cor
+ 	}
+ 	return NULL;
+ }
++EXPORT_SYMBOL_GPL(bcma_find_core);
++
++struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
++					u8 unit)
++{
++	struct bcma_device *core;
++
++	list_for_each_entry(core, &bus->cores, list) {
++		if (core->id.id == coreid && core->core_unit == unit)
++			return core;
++	}
++	return NULL;
++}
++
++bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
++		     int timeout)
++{
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
++
++	do {
++		val = bcma_read32(core, reg);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);
++
++	return false;
++}
+ 
+ static void bcma_release_core_dev(struct device *dev)
+ {
+@@ -84,16 +130,23 @@ static int bcma_register_cores(struct bc
+ 	list_for_each_entry(core, &bus->cores, list) {
+ 		/* We support that cores ourself */
+ 		switch (core->id.id) {
++		case BCMA_CORE_4706_CHIPCOMMON:
+ 		case BCMA_CORE_CHIPCOMMON:
+ 		case BCMA_CORE_PCI:
+ 		case BCMA_CORE_PCIE:
+ 		case BCMA_CORE_MIPS_74K:
++		case BCMA_CORE_4706_MAC_GBIT_COMMON:
+ 			continue;
+ 		}
+ 
++		/* Only first GMAC core on BCM4706 is connected and working */
++		if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
++		    core->core_unit > 0)
++			continue;
++
+ 		core->dev.release = bcma_release_core_dev;
+ 		core->dev.bus = &bcma_bus_type;
+-		dev_set_name(&core->dev, "bcma%d:%d", 0/*bus->num*/, dev_id);
++		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
+ 
+ 		switch (bus->hosttype) {
+ 		case BCMA_HOSTTYPE_PCI:
+@@ -111,41 +164,98 @@ static int bcma_register_cores(struct bc
+ 
+ 		err = device_register(&core->dev);
+ 		if (err) {
+-			pr_err("Could not register dev for core 0x%03X\n",
+-			       core->id.id);
++			bcma_err(bus,
++				 "Could not register dev for core 0x%03X\n",
++				 core->id.id);
+ 			continue;
+ 		}
+ 		core->dev_registered = true;
+ 		dev_id++;
+ 	}
+ 
++#ifdef CONFIG_BCMA_DRIVER_MIPS
++	if (bus->drv_cc.pflash.present) {
++		err = platform_device_register(&bcma_pflash_dev);
++		if (err)
++			bcma_err(bus, "Error registering parallel flash\n");
++	}
++#endif
++
++#ifdef CONFIG_BCMA_SFLASH
++	if (bus->drv_cc.sflash.present) {
++		err = platform_device_register(&bcma_sflash_dev);
++		if (err)
++			bcma_err(bus, "Error registering serial flash\n");
++	}
++#endif
++
++#ifdef CONFIG_BCMA_NFLASH
++	if (bus->drv_cc.nflash.present) {
++		err = platform_device_register(&bcma_nflash_dev);
++		if (err)
++			bcma_err(bus, "Error registering NAND flash\n");
++	}
++#endif
++	err = bcma_gpio_init(&bus->drv_cc);
++	if (err == -ENOTSUPP)
++		bcma_debug(bus, "GPIO driver not activated\n");
++	else if (err)
++		bcma_err(bus, "Error registering GPIO driver: %i\n", err);
++
++	if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
++		err = bcma_chipco_watchdog_register(&bus->drv_cc);
++		if (err)
++			bcma_err(bus, "Error registering watchdog driver\n");
++	}
++
+ 	return 0;
+ }
+ 
+ static void bcma_unregister_cores(struct bcma_bus *bus)
+ {
+-	struct bcma_device *core;
++	struct bcma_device *core, *tmp;
+ 
+-	list_for_each_entry(core, &bus->cores, list) {
++	list_for_each_entry_safe(core, tmp, &bus->cores, list) {
++		list_del(&core->list);
+ 		if (core->dev_registered)
+ 			device_unregister(&core->dev);
+ 	}
++	if (bus->hosttype == BCMA_HOSTTYPE_SOC)
++		platform_device_unregister(bus->drv_cc.watchdog);
+ }
+ 
+-int bcma_bus_register(struct bcma_bus *bus)
++int __devinit bcma_bus_register(struct bcma_bus *bus)
+ {
+ 	int err;
+ 	struct bcma_device *core;
+ 
++	mutex_lock(&bcma_buses_mutex);
++	bus->num = bcma_bus_next_num++;
++	mutex_unlock(&bcma_buses_mutex);
++
+ 	/* Scan for devices (cores) */
+ 	err = bcma_bus_scan(bus);
+ 	if (err) {
+-		pr_err("Failed to scan: %d\n", err);
+-		return -1;
++		bcma_err(bus, "Failed to scan: %d\n", err);
++		return err;
+ 	}
+ 
++	/* Early init CC core */
++	core = bcma_find_core(bus, bcma_cc_core_id(bus));
++	if (core) {
++		bus->drv_cc.core = core;
++		bcma_core_chipcommon_early_init(&bus->drv_cc);
++	}
++
++	/* Try to get SPROM */
++	err = bcma_sprom_get(bus);
++	if (err == -ENOENT) {
++		bcma_err(bus, "No SPROM available\n");
++	} else if (err)
++		bcma_err(bus, "Failed to get SPROM: %d\n", err);
++
+ 	/* Init CC core */
+-	core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
++	core = bcma_find_core(bus, bcma_cc_core_id(bus));
+ 	if (core) {
+ 		bus->drv_cc.core = core;
+ 		bcma_core_chipcommon_init(&bus->drv_cc);
+@@ -159,30 +269,54 @@ int bcma_bus_register(struct bcma_bus *b
+ 	}
+ 
+ 	/* Init PCIE core */
+-	core = bcma_find_core(bus, BCMA_CORE_PCIE);
++	core = bcma_find_core_unit(bus, BCMA_CORE_PCIE, 0);
+ 	if (core) {
+-		bus->drv_pci.core = core;
+-		bcma_core_pci_init(&bus->drv_pci);
++		bus->drv_pci[0].core = core;
++		bcma_core_pci_init(&bus->drv_pci[0]);
+ 	}
+ 
+-	/* Try to get SPROM */
+-	err = bcma_sprom_get(bus);
+-	if (err == -ENOENT) {
+-		pr_err("No SPROM available\n");
+-	} else if (err)
+-		pr_err("Failed to get SPROM: %d\n", err);
++	/* Init PCIE core */
++	core = bcma_find_core_unit(bus, BCMA_CORE_PCIE, 1);
++	if (core) {
++		bus->drv_pci[1].core = core;
++		bcma_core_pci_init(&bus->drv_pci[1]);
++	}
++
++	/* Init GBIT MAC COMMON core */
++	core = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
++	if (core) {
++		bus->drv_gmac_cmn.core = core;
++		bcma_core_gmac_cmn_init(&bus->drv_gmac_cmn);
++	}
+ 
+ 	/* Register found cores */
+ 	bcma_register_cores(bus);
+ 
+-	pr_info("Bus registered\n");
++	bcma_info(bus, "Bus registered\n");
+ 
+ 	return 0;
+ }
+ 
+ void bcma_bus_unregister(struct bcma_bus *bus)
+ {
++	struct bcma_device *cores[3];
++	int err;
++
++	err = bcma_gpio_unregister(&bus->drv_cc);
++	if (err == -EBUSY)
++		bcma_err(bus, "Some GPIOs are still in use.\n");
++	else if (err)
++		bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
++
++	cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
++	cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);
++	cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
++
+ 	bcma_unregister_cores(bus);
++
++	kfree(cores[2]);
++	kfree(cores[1]);
++	kfree(cores[0]);
+ }
+ 
+ int __init bcma_bus_early_register(struct bcma_bus *bus,
+@@ -196,14 +330,14 @@ int __init bcma_bus_early_register(struc
+ 	bcma_init_bus(bus);
+ 
+ 	match.manuf = BCMA_MANUF_BCM;
+-	match.id = BCMA_CORE_CHIPCOMMON;
++	match.id = bcma_cc_core_id(bus);
+ 	match.class = BCMA_CL_SIM;
+ 	match.rev = BCMA_ANY_REV;
+ 
+ 	/* Scan for chip common core */
+ 	err = bcma_bus_scan_early(bus, &match, core_cc);
+ 	if (err) {
+-		pr_err("Failed to scan for common core: %d\n", err);
++		bcma_err(bus, "Failed to scan for common core: %d\n", err);
+ 		return -1;
+ 	}
+ 
+@@ -215,25 +349,25 @@ int __init bcma_bus_early_register(struc
+ 	/* Scan for mips core */
+ 	err = bcma_bus_scan_early(bus, &match, core_mips);
+ 	if (err) {
+-		pr_err("Failed to scan for mips core: %d\n", err);
++		bcma_err(bus, "Failed to scan for mips core: %d\n", err);
+ 		return -1;
+ 	}
+ 
+-	/* Init CC core */
+-	core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
++	/* Early init CC core */
++	core = bcma_find_core(bus, bcma_cc_core_id(bus));
+ 	if (core) {
+ 		bus->drv_cc.core = core;
+-		bcma_core_chipcommon_init(&bus->drv_cc);
++		bcma_core_chipcommon_early_init(&bus->drv_cc);
+ 	}
+ 
+-	/* Init MIPS core */
++	/* Early init MIPS core */
+ 	core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+ 	if (core) {
+ 		bus->drv_mips.core = core;
+-		bcma_core_mips_init(&bus->drv_mips);
++		bcma_core_mips_early_init(&bus->drv_mips);
+ 	}
+ 
+-	pr_info("Early bus registered\n");
++	bcma_info(bus, "Early bus registered\n");
+ 
+ 	return 0;
+ }
+@@ -259,8 +393,7 @@ int bcma_bus_resume(struct bcma_bus *bus
+ 	struct bcma_device *core;
+ 
+ 	/* Init CC core */
+-	core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
+-	if (core) {
++	if (bus->drv_cc.core) {
+ 		bus->drv_cc.setup_done = false;
+ 		bcma_core_chipcommon_init(&bus->drv_cc);
+ 	}
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -19,15 +19,39 @@ struct bcma_device_id_name {
+ 	u16 id;
+ 	const char *name;
+ };
+-struct bcma_device_id_name bcma_device_names[] = {
++
++static const struct bcma_device_id_name bcma_arm_device_names[] = {
++	{ BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
++	{ BCMA_CORE_ARM_1176, "ARM 1176" },
++	{ BCMA_CORE_ARM_7TDMI, "ARM 7TDMI" },
++	{ BCMA_CORE_ARM_CM3, "ARM CM3" },
++};
++
++static const struct bcma_device_id_name bcma_bcm_device_names[] = {
+ 	{ BCMA_CORE_OOB_ROUTER, "OOB Router" },
++	{ BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
++	{ BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
++	{ BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
++	{ BCMA_CORE_PCIEG2, "PCIe Gen 2" },
++	{ BCMA_CORE_DMA, "DMA" },
++	{ BCMA_CORE_SDIO3, "SDIO3" },
++	{ BCMA_CORE_USB20, "USB 2.0" },
++	{ BCMA_CORE_USB30, "USB 3.0" },
++	{ BCMA_CORE_A9JTAG, "ARM Cortex A9 JTAG" },
++	{ BCMA_CORE_DDR23, "Denali DDR2/DDR3 memory controller" },
++	{ BCMA_CORE_ROM, "ROM" },
++	{ BCMA_CORE_NAND, "NAND flash controller" },
++	{ BCMA_CORE_QSPI, "SPI flash controller" },
++	{ BCMA_CORE_CHIPCOMMON_B, "Chipcommon B" },
++	{ BCMA_CORE_ARMCA9, "ARM Cortex A9 core (ihost)" },
++	{ BCMA_CORE_AMEMC, "AMEMC (DDR)" },
++	{ BCMA_CORE_ALTA, "ALTA (I2S)" },
+ 	{ BCMA_CORE_INVALID, "Invalid" },
+ 	{ BCMA_CORE_CHIPCOMMON, "ChipCommon" },
+ 	{ BCMA_CORE_ILINE20, "ILine 20" },
+ 	{ BCMA_CORE_SRAM, "SRAM" },
+ 	{ BCMA_CORE_SDRAM, "SDRAM" },
+ 	{ BCMA_CORE_PCI, "PCI" },
+-	{ BCMA_CORE_MIPS, "MIPS" },
+ 	{ BCMA_CORE_ETHERNET, "Fast Ethernet" },
+ 	{ BCMA_CORE_V90, "V90" },
+ 	{ BCMA_CORE_USB11_HOSTDEV, "USB 1.1 Hostdev" },
+@@ -44,7 +68,6 @@ struct bcma_device_id_name bcma_device_n
+ 	{ BCMA_CORE_PHY_A, "PHY A" },
+ 	{ BCMA_CORE_PHY_B, "PHY B" },
+ 	{ BCMA_CORE_PHY_G, "PHY G" },
+-	{ BCMA_CORE_MIPS_3302, "MIPS 3302" },
+ 	{ BCMA_CORE_USB11_HOST, "USB 1.1 Host" },
+ 	{ BCMA_CORE_USB11_DEV, "USB 1.1 Device" },
+ 	{ BCMA_CORE_USB20_HOST, "USB 2.0 Host" },
+@@ -58,15 +81,11 @@ struct bcma_device_id_name bcma_device_n
+ 	{ BCMA_CORE_PHY_N, "PHY N" },
+ 	{ BCMA_CORE_SRAM_CTL, "SRAM Controller" },
+ 	{ BCMA_CORE_MINI_MACPHY, "Mini MACPHY" },
+-	{ BCMA_CORE_ARM_1176, "ARM 1176" },
+-	{ BCMA_CORE_ARM_7TDMI, "ARM 7TDMI" },
+ 	{ BCMA_CORE_PHY_LP, "PHY LP" },
+ 	{ BCMA_CORE_PMU, "PMU" },
+ 	{ BCMA_CORE_PHY_SSN, "PHY SSN" },
+ 	{ BCMA_CORE_SDIO_DEV, "SDIO Device" },
+-	{ BCMA_CORE_ARM_CM3, "ARM CM3" },
+ 	{ BCMA_CORE_PHY_HT, "PHY HT" },
+-	{ BCMA_CORE_MIPS_74K, "MIPS 74K" },
+ 	{ BCMA_CORE_MAC_GBIT, "GBit MAC" },
+ 	{ BCMA_CORE_DDR12_MEM_CTL, "DDR1/DDR2 Memory Controller" },
+ 	{ BCMA_CORE_PCIE_RC, "PCIe Root Complex" },
+@@ -77,18 +96,45 @@ struct bcma_device_id_name bcma_device_n
+ 	{ BCMA_CORE_I2S, "I2S" },
+ 	{ BCMA_CORE_SDR_DDR1_MEM_CTL, "SDR/DDR1 Memory Controller" },
+ 	{ BCMA_CORE_SHIM, "SHIM" },
++	{ BCMA_CORE_PCIE2, "PCIe Gen2" },
++	{ BCMA_CORE_ARM_CR4, "ARM CR4" },
+ 	{ BCMA_CORE_DEFAULT, "Default" },
+ };
+-const char *bcma_device_name(struct bcma_device_id *id)
++
++static const struct bcma_device_id_name bcma_mips_device_names[] = {
++	{ BCMA_CORE_MIPS, "MIPS" },
++	{ BCMA_CORE_MIPS_3302, "MIPS 3302" },
++	{ BCMA_CORE_MIPS_74K, "MIPS 74K" },
++};
++
++static const char *bcma_device_name(const struct bcma_device_id *id)
+ {
+-	int i;
++	const struct bcma_device_id_name *names;
++	int size, i;
+ 
+-	if (id->manuf == BCMA_MANUF_BCM) {
+-		for (i = 0; i < ARRAY_SIZE(bcma_device_names); i++) {
+-			if (bcma_device_names[i].id == id->id)
+-				return bcma_device_names[i].name;
+-		}
++	/* search manufacturer specific names */
++	switch (id->manuf) {
++	case BCMA_MANUF_ARM:
++		names = bcma_arm_device_names;
++		size = ARRAY_SIZE(bcma_arm_device_names);
++		break;
++	case BCMA_MANUF_BCM:
++		names = bcma_bcm_device_names;
++		size = ARRAY_SIZE(bcma_bcm_device_names);
++		break;
++	case BCMA_MANUF_MIPS:
++		names = bcma_mips_device_names;
++		size = ARRAY_SIZE(bcma_mips_device_names);
++		break;
++	default:
++		return "UNKNOWN";
++	}
++
++	for (i = 0; i < size; i++) {
++		if (names[i].id == id->id)
++			return names[i].name;
+ 	}
++
+ 	return "UNKNOWN";
+ }
+ 
+@@ -105,19 +151,19 @@ static void bcma_scan_switch_core(struct
+ 				       addr);
+ }
+ 
+-static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 **eromptr)
++static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = readl(*eromptr);
+ 	(*eromptr)++;
+ 	return ent;
+ }
+ 
+-static void bcma_erom_push_ent(u32 **eromptr)
++static void bcma_erom_push_ent(u32 __iomem **eromptr)
+ {
+ 	(*eromptr)--;
+ }
+ 
+-static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr)
++static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	if (!(ent & SCAN_ER_VALID))
+@@ -127,14 +173,14 @@ static s32 bcma_erom_get_ci(struct bcma_
+ 	return ent;
+ }
+ 
+-static bool bcma_erom_is_end(struct bcma_bus *bus, u32 **eromptr)
++static bool bcma_erom_is_end(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	bcma_erom_push_ent(eromptr);
+ 	return (ent == (SCAN_ER_TAG_END | SCAN_ER_VALID));
+ }
+ 
+-static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr)
++static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	bcma_erom_push_ent(eromptr);
+@@ -143,7 +189,7 @@ static bool bcma_erom_is_bridge(struct b
+ 		((ent & SCAN_ADDR_TYPE) == SCAN_ADDR_TYPE_BRIDGE));
+ }
+ 
+-static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr)
++static void bcma_erom_skip_component(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent;
+ 	while (1) {
+@@ -157,7 +203,7 @@ static void bcma_erom_skip_component(str
+ 	bcma_erom_push_ent(eromptr);
+ }
+ 
+-static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr)
++static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	if (!(ent & SCAN_ER_VALID))
+@@ -167,7 +213,7 @@ static s32 bcma_erom_get_mst_port(struct
+ 	return ent;
+ }
+ 
+-static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 **eromptr,
++static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
+ 				  u32 type, u8 port)
+ {
+ 	u32 addrl, addrh, sizel, sizeh = 0;
+@@ -179,7 +225,7 @@ static s32 bcma_erom_get_addr_desc(struc
+ 	    ((ent & SCAN_ADDR_TYPE) != type) ||
+ 	    (((ent & SCAN_ADDR_PORT) >> SCAN_ADDR_PORT_SHIFT) != port)) {
+ 		bcma_erom_push_ent(eromptr);
+-		return -EINVAL;
++		return (u32)-EINVAL;
+ 	}
+ 
+ 	addrl = ent & SCAN_ADDR_ADDR;
+@@ -212,11 +258,24 @@ static struct bcma_device *bcma_find_cor
+ 	return NULL;
+ }
+ 
++static struct bcma_device *bcma_find_core_reverse(struct bcma_bus *bus, u16 coreid)
++{
++	struct bcma_device *core;
++
++	list_for_each_entry_reverse(core, &bus->cores, list) {
++		if (core->id.id == coreid)
++			return core;
++	}
++	return NULL;
++}
++
++#define IS_ERR_VALUE_U32(x) ((x) >= (u32)-MAX_ERRNO)
++
+ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
+ 			      struct bcma_device_id *match, int core_num,
+ 			      struct bcma_device *core)
+ {
+-	s32 tmp;
++	u32 tmp;
+ 	u8 i, j;
+ 	s32 cia, cib;
+ 	u8 ports[2], wrappers[2];
+@@ -252,11 +311,15 @@ static int bcma_get_next_core(struct bcm
+ 
+ 	/* check if component is a core at all */
+ 	if (wrappers[0] + wrappers[1] == 0) {
+-		/* we could save addrl of the router
+-		if (cid == BCMA_CORE_OOB_ROUTER)
+-		 */
+-		bcma_erom_skip_component(bus, eromptr);
+-		return -ENXIO;
++		/* Some specific cores don't need wrappers */
++		switch (core->id.id) {
++		case BCMA_CORE_4706_MAC_GBIT_COMMON:
++		/* Not used yet: case BCMA_CORE_OOB_ROUTER: */
++			break;
++		default:
++			bcma_erom_skip_component(bus, eromptr);
++			return -ENXIO;
++		}
+ 	}
+ 
+ 	if (bcma_erom_is_bridge(bus, eromptr)) {
+@@ -286,19 +349,36 @@ static int bcma_get_next_core(struct bcm
+ 			return -EILSEQ;
+ 	}
+ 
++	/* First Slave Address Descriptor should be port 0:
++	 * the main register space for the core
++	 */
++	tmp = bcma_erom_get_addr_desc(bus, eromptr, SCAN_ADDR_TYPE_SLAVE, 0);
++	if (tmp == 0 || IS_ERR_VALUE_U32(tmp)) {
++		/* Try again to see if it is a bridge */
++		tmp = bcma_erom_get_addr_desc(bus, eromptr,
++					      SCAN_ADDR_TYPE_BRIDGE, 0);
++		if (tmp == 0 || IS_ERR_VALUE_U32(tmp)) {
++			return -EILSEQ;
++		} else {
++			bcma_info(bus, "Bridge found\n");
++			return -ENXIO;
++		}
++	}
++	core->addr = tmp;
++
+ 	/* get & parse slave ports */
+ 	for (i = 0; i < ports[1]; i++) {
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_SLAVE, i);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: slave port %d "
+ 				 * "has %d descriptors\n", i, j); */
+ 				break;
+ 			} else {
+ 				if (i == 0 && j == 0)
+-					core->addr = tmp;
++					core->addr1 = tmp;
+ 			}
+ 		}
+ 	}
+@@ -308,7 +388,7 @@ static int bcma_get_next_core(struct bcm
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_MWRAP, i);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: master wrapper %d "
+ 				 * "has %d descriptors\n", i, j); */
+@@ -326,7 +406,7 @@ static int bcma_get_next_core(struct bcm
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_SWRAP, i + hack);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: master wrapper %d "
+ 				 * has %d descriptors\n", i, j); */
+@@ -353,6 +433,7 @@ static int bcma_get_next_core(struct bcm
+ void bcma_init_bus(struct bcma_bus *bus)
+ {
+ 	s32 tmp;
++	struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
+ 
+ 	if (bus->init_done)
+ 		return;
+@@ -363,9 +444,12 @@ void bcma_init_bus(struct bcma_bus *bus)
+ 	bcma_scan_switch_core(bus, BCMA_ADDR_BASE);
+ 
+ 	tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);
+-	bus->chipinfo.id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
+-	bus->chipinfo.rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
+-	bus->chipinfo.pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
++	chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
++	chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
++	chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
++	bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
++		  chipinfo->id, chipinfo->rev, chipinfo->pkg);
++
+ 	bus->init_done = true;
+ }
+ 
+@@ -392,9 +476,12 @@ int bcma_bus_scan(struct bcma_bus *bus)
+ 	bcma_scan_switch_core(bus, erombase);
+ 
+ 	while (eromptr < eromend) {
++		struct bcma_device *other_core;
+ 		struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL);
+-		if (!core)
+-			return -ENOMEM;
++		if (!core) {
++			err = -ENOMEM;
++			goto out;
++		}
+ 		INIT_LIST_HEAD(&core->list);
+ 		core->bus = bus;
+ 
+@@ -409,25 +496,28 @@ int bcma_bus_scan(struct bcma_bus *bus)
+ 			} else if (err == -ESPIPE) {
+ 				break;
+ 			}
+-			return err;
++			goto out;
+ 		}
+ 
+ 		core->core_index = core_num++;
+ 		bus->nr_cores++;
++		other_core = bcma_find_core_reverse(bus, core->id.id);
++		core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
+ 
+-		pr_info("Core %d found: %s "
+-			"(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
+-			core->core_index, bcma_device_name(&core->id),
+-			core->id.manuf, core->id.id, core->id.rev,
+-			core->id.class);
++		bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
++			  core->core_index, bcma_device_name(&core->id),
++			  core->id.manuf, core->id.id, core->id.rev,
++			  core->id.class);
+ 
+-		list_add(&core->list, &bus->cores);
++		list_add_tail(&core->list, &bus->cores);
+ 	}
+ 
++	err = 0;
++out:
+ 	if (bus->hosttype == BCMA_HOSTTYPE_SOC)
+ 		iounmap(eromptr);
+ 
+-	return 0;
++	return err;
+ }
+ 
+ int __init bcma_bus_scan_early(struct bcma_bus *bus,
+@@ -467,21 +557,21 @@ int __init bcma_bus_scan_early(struct bc
+ 		else if (err == -ESPIPE)
+ 			break;
+ 		else if (err < 0)
+-			return err;
++			goto out;
+ 
+ 		core->core_index = core_num++;
+ 		bus->nr_cores++;
+-		pr_info("Core %d found: %s "
+-			"(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
+-			core->core_index, bcma_device_name(&core->id),
+-			core->id.manuf, core->id.id, core->id.rev,
+-			core->id.class);
++		bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
++			  core->core_index, bcma_device_name(&core->id),
++			  core->id.manuf, core->id.id, core->id.rev,
++			  core->id.class);
+ 
+-		list_add(&core->list, &bus->cores);
++		list_add_tail(&core->list, &bus->cores);
+ 		err = 0;
+ 		break;
+ 	}
+ 
++out:
+ 	if (bus->hosttype == BCMA_HOSTTYPE_SOC)
+ 		iounmap(eromptr);
+ 
+--- a/drivers/bcma/scan.h
++++ b/drivers/bcma/scan.h
+@@ -27,7 +27,7 @@
+ #define SCAN_CIB_NMW		0x0007C000
+ #define SCAN_CIB_NMW_SHIFT	14
+ #define SCAN_CIB_NSW		0x00F80000
+-#define SCAN_CIB_NSW_SHIFT	17
++#define SCAN_CIB_NSW_SHIFT	19
+ #define SCAN_CIB_REV		0xFF000000
+ #define SCAN_CIB_REV_SHIFT	24
+ 
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -2,6 +2,8 @@
+  * Broadcom specific AMBA
+  * SPROM reading
+  *
++ * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
++ *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
+@@ -14,18 +16,68 @@
+ #include <linux/dma-mapping.h>
+ #include <linux/slab.h>
+ 
+-#define SPOFF(offset)	((offset) / sizeof(u16))
++static int(*get_fallback_sprom)(struct bcma_bus *dev, struct ssb_sprom *out);
++
++/**
++ * bcma_arch_register_fallback_sprom - Registers a method providing a
++ * fallback SPROM if no SPROM is found.
++ *
++ * @sprom_callback: The callback function.
++ *
++ * With this function the architecture implementation may register a
++ * callback handler which fills the SPROM data structure. The fallback is
++ * used for PCI based BCMA devices, where no valid SPROM can be found
++ * in the shadow registers and to provide the SPROM for SoCs where BCMA is
++ * to controll the system bus.
++ *
++ * This function is useful for weird architectures that have a half-assed
++ * BCMA device hardwired to their PCI bus.
++ *
++ * This function is available for architecture code, only. So it is not
++ * exported.
++ */
++int bcma_arch_register_fallback_sprom(int (*sprom_callback)(struct bcma_bus *bus,
++				     struct ssb_sprom *out))
++{
++	if (get_fallback_sprom)
++		return -EEXIST;
++	get_fallback_sprom = sprom_callback;
++
++	return 0;
++}
++
++static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus,
++					 struct ssb_sprom *out)
++{
++	int err;
++
++	if (!get_fallback_sprom) {
++		err = -ENOENT;
++		goto fail;
++	}
++
++	err = get_fallback_sprom(bus, out);
++	if (err)
++		goto fail;
++
++	bcma_debug(bus, "Using SPROM revision %d provided by platform.\n",
++		   bus->sprom.revision);
++	return 0;
++fail:
++	bcma_warn(bus, "Using fallback SPROM failed (err %d)\n", err);
++	return err;
++}
+ 
+ /**************************************************
+  * R/W ops.
+  **************************************************/
+ 
+-static void bcma_sprom_read(struct bcma_bus *bus, u16 offset, u16 *sprom)
++static void bcma_sprom_read(struct bcma_bus *bus, u16 offset, u16 *sprom,
++			    size_t words)
+ {
+ 	int i;
+-	for (i = 0; i < SSB_SPROMSIZE_WORDS_R4; i++)
+-		sprom[i] = bcma_read16(bus->drv_cc.core,
+-				       offset + (i * 2));
++	for (i = 0; i < words; i++)
++		sprom[i] = bcma_read16(bus->drv_cc.core, offset + (i * 2));
+ }
+ 
+ /**************************************************
+@@ -72,29 +124,29 @@ static inline u8 bcma_crc8(u8 crc, u8 da
+ 	return t[crc ^ data];
+ }
+ 
+-static u8 bcma_sprom_crc(const u16 *sprom)
++static u8 bcma_sprom_crc(const u16 *sprom, size_t words)
+ {
+ 	int word;
+ 	u8 crc = 0xFF;
+ 
+-	for (word = 0; word < SSB_SPROMSIZE_WORDS_R4 - 1; word++) {
++	for (word = 0; word < words - 1; word++) {
+ 		crc = bcma_crc8(crc, sprom[word] & 0x00FF);
+ 		crc = bcma_crc8(crc, (sprom[word] & 0xFF00) >> 8);
+ 	}
+-	crc = bcma_crc8(crc, sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & 0x00FF);
++	crc = bcma_crc8(crc, sprom[words - 1] & 0x00FF);
+ 	crc ^= 0xFF;
+ 
+ 	return crc;
+ }
+ 
+-static int bcma_sprom_check_crc(const u16 *sprom)
++static int bcma_sprom_check_crc(const u16 *sprom, size_t words)
+ {
+ 	u8 crc;
+ 	u8 expected_crc;
+ 	u16 tmp;
+ 
+-	crc = bcma_sprom_crc(sprom);
+-	tmp = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_CRC;
++	crc = bcma_sprom_crc(sprom, words);
++	tmp = sprom[words - 1] & SSB_SPROM_REVISION_CRC;
+ 	expected_crc = tmp >> SSB_SPROM_REVISION_CRC_SHIFT;
+ 	if (crc != expected_crc)
+ 		return -EPROTO;
+@@ -102,21 +154,25 @@ static int bcma_sprom_check_crc(const u1
+ 	return 0;
+ }
+ 
+-static int bcma_sprom_valid(const u16 *sprom)
++static int bcma_sprom_valid(struct bcma_bus *bus, const u16 *sprom,
++			    size_t words)
+ {
+ 	u16 revision;
+ 	int err;
+ 
+-	err = bcma_sprom_check_crc(sprom);
++	err = bcma_sprom_check_crc(sprom, words);
+ 	if (err)
+ 		return err;
+ 
+-	revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_REV;
+-	if (revision != 8 && revision != 9) {
++	revision = sprom[words - 1] & SSB_SPROM_REVISION_REV;
++	if (revision != 8 && revision != 9 && revision != 10) {
+ 		pr_err("Unsupported SPROM revision: %d\n", revision);
+ 		return -ENOENT;
+ 	}
+ 
++	bus->sprom.revision = revision;
++	bcma_debug(bus, "Found SPROM revision %d\n", revision);
++
+ 	return 0;
+ }
+ 
+@@ -124,124 +180,439 @@ static int bcma_sprom_valid(const u16 *s
+  * SPROM extraction.
+  **************************************************/
+ 
++#define SPOFF(offset)	((offset) / sizeof(u16))
++
++#define SPEX(_field, _offset, _mask, _shift)	\
++	bus->sprom._field = ((sprom[SPOFF(_offset)] & (_mask)) >> (_shift))
++
++#define SPEX32(_field, _offset, _mask, _shift)	\
++	bus->sprom._field = ((((u32)sprom[SPOFF((_offset)+2)] << 16 | \
++				sprom[SPOFF(_offset)]) & (_mask)) >> (_shift))
++
++#define SPEX_ARRAY8(_field, _offset, _mask, _shift)	\
++	do {	\
++		SPEX(_field[0], _offset +  0, _mask, _shift);	\
++		SPEX(_field[1], _offset +  2, _mask, _shift);	\
++		SPEX(_field[2], _offset +  4, _mask, _shift);	\
++		SPEX(_field[3], _offset +  6, _mask, _shift);	\
++		SPEX(_field[4], _offset +  8, _mask, _shift);	\
++		SPEX(_field[5], _offset + 10, _mask, _shift);	\
++		SPEX(_field[6], _offset + 12, _mask, _shift);	\
++		SPEX(_field[7], _offset + 14, _mask, _shift);	\
++	} while (0)
++
+ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
+ {
+-	u16 v;
++	u16 v, o;
+ 	int i;
+-
+-	bus->sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &
+-		SSB_SPROM_REVISION_REV;
++	u16 pwr_info_offset[] = {
++		SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
++		SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
++	};
++	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
++			ARRAY_SIZE(bus->sprom.core_pwr_info));
+ 
+ 	for (i = 0; i < 3; i++) {
+ 		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];
+ 		*(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
+ 	}
+ 
+-	bus->sprom.board_rev = sprom[SPOFF(SSB_SPROM8_BOARDREV)];
++	SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);
++	SPEX(board_type, SSB_SPROM1_SPID, ~0, 0);
++
++	SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,
++	     SSB_SPROM4_TXPID2G0_SHIFT);
++	SPEX(txpid2g[1], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G1,
++	     SSB_SPROM4_TXPID2G1_SHIFT);
++	SPEX(txpid2g[2], SSB_SPROM4_TXPID2G23, SSB_SPROM4_TXPID2G2,
++	     SSB_SPROM4_TXPID2G2_SHIFT);
++	SPEX(txpid2g[3], SSB_SPROM4_TXPID2G23, SSB_SPROM4_TXPID2G3,
++	     SSB_SPROM4_TXPID2G3_SHIFT);
++
++	SPEX(txpid5gl[0], SSB_SPROM4_TXPID5GL01, SSB_SPROM4_TXPID5GL0,
++	     SSB_SPROM4_TXPID5GL0_SHIFT);
++	SPEX(txpid5gl[1], SSB_SPROM4_TXPID5GL01, SSB_SPROM4_TXPID5GL1,
++	     SSB_SPROM4_TXPID5GL1_SHIFT);
++	SPEX(txpid5gl[2], SSB_SPROM4_TXPID5GL23, SSB_SPROM4_TXPID5GL2,
++	     SSB_SPROM4_TXPID5GL2_SHIFT);
++	SPEX(txpid5gl[3], SSB_SPROM4_TXPID5GL23, SSB_SPROM4_TXPID5GL3,
++	     SSB_SPROM4_TXPID5GL3_SHIFT);
++
++	SPEX(txpid5g[0], SSB_SPROM4_TXPID5G01, SSB_SPROM4_TXPID5G0,
++	     SSB_SPROM4_TXPID5G0_SHIFT);
++	SPEX(txpid5g[1], SSB_SPROM4_TXPID5G01, SSB_SPROM4_TXPID5G1,
++	     SSB_SPROM4_TXPID5G1_SHIFT);
++	SPEX(txpid5g[2], SSB_SPROM4_TXPID5G23, SSB_SPROM4_TXPID5G2,
++	     SSB_SPROM4_TXPID5G2_SHIFT);
++	SPEX(txpid5g[3], SSB_SPROM4_TXPID5G23, SSB_SPROM4_TXPID5G3,
++	     SSB_SPROM4_TXPID5G3_SHIFT);
++
++	SPEX(txpid5gh[0], SSB_SPROM4_TXPID5GH01, SSB_SPROM4_TXPID5GH0,
++	     SSB_SPROM4_TXPID5GH0_SHIFT);
++	SPEX(txpid5gh[1], SSB_SPROM4_TXPID5GH01, SSB_SPROM4_TXPID5GH1,
++	     SSB_SPROM4_TXPID5GH1_SHIFT);
++	SPEX(txpid5gh[2], SSB_SPROM4_TXPID5GH23, SSB_SPROM4_TXPID5GH2,
++	     SSB_SPROM4_TXPID5GH2_SHIFT);
++	SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23, SSB_SPROM4_TXPID5GH3,
++	     SSB_SPROM4_TXPID5GH3_SHIFT);
++
++	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, ~0, 0);
++	SPEX(boardflags_hi, SSB_SPROM8_BFLHI, ~0, 0);
++	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, ~0, 0);
++	SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, ~0, 0);
++
++	SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
++	SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
++
++	/* Extract cores power info info */
++	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
++		o = pwr_info_offset[i];
++		SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
++			SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
++			SSB_SPROM8_2G_MAXP, 0);
++
++		SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
++
++		SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
++			SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
++		SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
++			SSB_SPROM8_5G_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
++			SSB_SPROM8_5GH_MAXP, 0);
++		SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
++			SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
++
++		SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
++		SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
++	}
++
++	SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TSSIPOS,
++	     SSB_SROM8_FEM_TSSIPOS_SHIFT);
++	SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_EXTPA_GAIN,
++	     SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
++	SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_PDET_RANGE,
++	     SSB_SROM8_FEM_PDET_RANGE_SHIFT);
++	SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TR_ISO,
++	     SSB_SROM8_FEM_TR_ISO_SHIFT);
++	SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_ANTSWLUT,
++	     SSB_SROM8_FEM_ANTSWLUT_SHIFT);
++
++	SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TSSIPOS,
++	     SSB_SROM8_FEM_TSSIPOS_SHIFT);
++	SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_EXTPA_GAIN,
++	     SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
++	SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_PDET_RANGE,
++	     SSB_SROM8_FEM_PDET_RANGE_SHIFT);
++	SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TR_ISO,
++	     SSB_SROM8_FEM_TR_ISO_SHIFT);
++	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_ANTSWLUT,
++	     SSB_SROM8_FEM_ANTSWLUT_SHIFT);
++
++	SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
++	     SSB_SPROM8_ANTAVAIL_A_SHIFT);
++	SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
++	     SSB_SPROM8_ANTAVAIL_BG_SHIFT);
++	SPEX(maxpwr_bg, SSB_SPROM8_MAXP_BG, SSB_SPROM8_MAXP_BG_MASK, 0);
++	SPEX(itssi_bg, SSB_SPROM8_MAXP_BG, SSB_SPROM8_ITSSI_BG,
++	     SSB_SPROM8_ITSSI_BG_SHIFT);
++	SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
++	SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
++	     SSB_SPROM8_ITSSI_A_SHIFT);
++	SPEX(maxpwr_ah, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AH_MASK, 0);
++	SPEX(maxpwr_al, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AL_MASK,
++	     SSB_SPROM8_MAXP_AL_SHIFT);
++	SPEX(gpio0, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P0, 0);
++	SPEX(gpio1, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P1,
++	     SSB_SPROM8_GPIOA_P1_SHIFT);
++	SPEX(gpio2, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P2, 0);
++	SPEX(gpio3, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P3,
++	     SSB_SPROM8_GPIOB_P3_SHIFT);
++	SPEX(tri2g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI2G, 0);
++	SPEX(tri5g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI5G,
++	     SSB_SPROM8_TRI5G_SHIFT);
++	SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);
++	SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,
++	     SSB_SPROM8_TRI5GH_SHIFT);
++	SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G,
++	     SSB_SPROM8_RXPO2G_SHIFT);
++	SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,
++	     SSB_SPROM8_RXPO5G_SHIFT);
++	SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);
++	SPEX(rssismc2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMC2G,
++	     SSB_SPROM8_RSSISMC2G_SHIFT);
++	SPEX(rssisav2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISAV2G,
++	     SSB_SPROM8_RSSISAV2G_SHIFT);
++	SPEX(bxa2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_BXA2G,
++	     SSB_SPROM8_BXA2G_SHIFT);
++	SPEX(rssismf5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMF5G, 0);
++	SPEX(rssismc5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMC5G,
++	     SSB_SPROM8_RSSISMC5G_SHIFT);
++	SPEX(rssisav5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISAV5G,
++	     SSB_SPROM8_RSSISAV5G_SHIFT);
++	SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,
++	     SSB_SPROM8_BXA5G_SHIFT);
++
++	SPEX(pa0b0, SSB_SPROM8_PA0B0, ~0, 0);
++	SPEX(pa0b1, SSB_SPROM8_PA0B1, ~0, 0);
++	SPEX(pa0b2, SSB_SPROM8_PA0B2, ~0, 0);
++	SPEX(pa1b0, SSB_SPROM8_PA1B0, ~0, 0);
++	SPEX(pa1b1, SSB_SPROM8_PA1B1, ~0, 0);
++	SPEX(pa1b2, SSB_SPROM8_PA1B2, ~0, 0);
++	SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, ~0, 0);
++	SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, ~0, 0);
++	SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, ~0, 0);
++	SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, ~0, 0);
++	SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, ~0, 0);
++	SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, ~0, 0);
++	SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, ~0, 0);
++	SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, ~0, 0);
++	SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, ~0, 0);
++	SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, ~0, 0);
++	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, ~0, 0);
++
++	/* Extract the antenna gain values. */
++	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
++	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
++	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
++	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
++	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
++	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
++	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
++	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
++
++	SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
++	     SSB_SPROM8_LEDDC_ON_SHIFT);
++	SPEX(leddc_off_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_OFF,
++	     SSB_SPROM8_LEDDC_OFF_SHIFT);
++
++	SPEX(txchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_TXCHAIN,
++	     SSB_SPROM8_TXRXC_TXCHAIN_SHIFT);
++	SPEX(rxchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_RXCHAIN,
++	     SSB_SPROM8_TXRXC_RXCHAIN_SHIFT);
++	SPEX(antswitch, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_SWITCH,
++	     SSB_SPROM8_TXRXC_SWITCH_SHIFT);
++
++	SPEX(opo, SSB_SPROM8_OFDM2GPO, 0x00ff, 0);
++
++	SPEX_ARRAY8(mcs2gpo, SSB_SPROM8_2G_MCSPO, ~0, 0);
++	SPEX_ARRAY8(mcs5gpo, SSB_SPROM8_5G_MCSPO, ~0, 0);
++	SPEX_ARRAY8(mcs5glpo, SSB_SPROM8_5GL_MCSPO, ~0, 0);
++	SPEX_ARRAY8(mcs5ghpo, SSB_SPROM8_5GH_MCSPO, ~0, 0);
++
++	SPEX(rawtempsense, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_RAWTEMP,
++	     SSB_SPROM8_RAWTS_RAWTEMP_SHIFT);
++	SPEX(measpower, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_MEASPOWER,
++	     SSB_SPROM8_RAWTS_MEASPOWER_SHIFT);
++	SPEX(tempsense_slope, SSB_SPROM8_OPT_CORRX,
++	     SSB_SPROM8_OPT_CORRX_TEMP_SLOPE,
++	     SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT);
++	SPEX(tempcorrx, SSB_SPROM8_OPT_CORRX, SSB_SPROM8_OPT_CORRX_TEMPCORRX,
++	     SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT);
++	SPEX(tempsense_option, SSB_SPROM8_OPT_CORRX,
++	     SSB_SPROM8_OPT_CORRX_TEMP_OPTION,
++	     SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT);
++	SPEX(freqoffset_corr, SSB_SPROM8_HWIQ_IQSWP,
++	     SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR,
++	     SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT);
++	SPEX(iqcal_swp_dis, SSB_SPROM8_HWIQ_IQSWP,
++	     SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP,
++	     SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT);
++	SPEX(hw_iqcal_en, SSB_SPROM8_HWIQ_IQSWP, SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL,
++	     SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT);
++
++	SPEX(bw40po, SSB_SPROM8_BW40PO, ~0, 0);
++	SPEX(cddpo, SSB_SPROM8_CDDPO, ~0, 0);
++	SPEX(stbcpo, SSB_SPROM8_STBCPO, ~0, 0);
++	SPEX(bwduppo, SSB_SPROM8_BWDUPPO, ~0, 0);
++
++	SPEX(tempthresh, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_TRESH,
++	     SSB_SPROM8_THERMAL_TRESH_SHIFT);
++	SPEX(tempoffset, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_OFFSET,
++	     SSB_SPROM8_THERMAL_OFFSET_SHIFT);
++	SPEX(phycal_tempdelta, SSB_SPROM8_TEMPDELTA,
++	     SSB_SPROM8_TEMPDELTA_PHYCAL,
++	     SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT);
++	SPEX(temps_period, SSB_SPROM8_TEMPDELTA, SSB_SPROM8_TEMPDELTA_PERIOD,
++	     SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT);
++	SPEX(temps_hysteresis, SSB_SPROM8_TEMPDELTA,
++	     SSB_SPROM8_TEMPDELTA_HYSTERESIS,
++	     SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT);
++}
++
++/*
++ * Indicates the presence of external SPROM.
++ */
++static bool bcma_sprom_ext_available(struct bcma_bus *bus)
++{
++	u32 chip_status;
++	u32 srom_control;
++	u32 present_mask;
++
++	if (bus->drv_cc.core->id.rev >= 31) {
++		if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
++			return false;
++
++		srom_control = bcma_read32(bus->drv_cc.core,
++					   BCMA_CC_SROM_CONTROL);
++		return srom_control & BCMA_CC_SROM_CONTROL_PRESENT;
++	}
++
++	/* older chipcommon revisions use chip status register */
++	chip_status = bcma_read32(bus->drv_cc.core, BCMA_CC_CHIPSTAT);
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM4313:
++		present_mask = BCMA_CC_CHIPST_4313_SPROM_PRESENT;
++		break;
++
++	case BCMA_CHIP_ID_BCM4331:
++		present_mask = BCMA_CC_CHIPST_4331_SPROM_PRESENT;
++		break;
+ 
+-	bus->sprom.txpid2g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &
+-	     SSB_SPROM4_TXPID2G0) >> SSB_SPROM4_TXPID2G0_SHIFT;
+-	bus->sprom.txpid2g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &
+-	     SSB_SPROM4_TXPID2G1) >> SSB_SPROM4_TXPID2G1_SHIFT;
+-	bus->sprom.txpid2g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &
+-	     SSB_SPROM4_TXPID2G2) >> SSB_SPROM4_TXPID2G2_SHIFT;
+-	bus->sprom.txpid2g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &
+-	     SSB_SPROM4_TXPID2G3) >> SSB_SPROM4_TXPID2G3_SHIFT;
+-
+-	bus->sprom.txpid5gl[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &
+-	     SSB_SPROM4_TXPID5GL0) >> SSB_SPROM4_TXPID5GL0_SHIFT;
+-	bus->sprom.txpid5gl[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &
+-	     SSB_SPROM4_TXPID5GL1) >> SSB_SPROM4_TXPID5GL1_SHIFT;
+-	bus->sprom.txpid5gl[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &
+-	     SSB_SPROM4_TXPID5GL2) >> SSB_SPROM4_TXPID5GL2_SHIFT;
+-	bus->sprom.txpid5gl[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &
+-	     SSB_SPROM4_TXPID5GL3) >> SSB_SPROM4_TXPID5GL3_SHIFT;
+-
+-	bus->sprom.txpid5g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &
+-	     SSB_SPROM4_TXPID5G0) >> SSB_SPROM4_TXPID5G0_SHIFT;
+-	bus->sprom.txpid5g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &
+-	     SSB_SPROM4_TXPID5G1) >> SSB_SPROM4_TXPID5G1_SHIFT;
+-	bus->sprom.txpid5g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &
+-	     SSB_SPROM4_TXPID5G2) >> SSB_SPROM4_TXPID5G2_SHIFT;
+-	bus->sprom.txpid5g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &
+-	     SSB_SPROM4_TXPID5G3) >> SSB_SPROM4_TXPID5G3_SHIFT;
+-
+-	bus->sprom.txpid5gh[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &
+-	     SSB_SPROM4_TXPID5GH0) >> SSB_SPROM4_TXPID5GH0_SHIFT;
+-	bus->sprom.txpid5gh[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &
+-	     SSB_SPROM4_TXPID5GH1) >> SSB_SPROM4_TXPID5GH1_SHIFT;
+-	bus->sprom.txpid5gh[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &
+-	     SSB_SPROM4_TXPID5GH2) >> SSB_SPROM4_TXPID5GH2_SHIFT;
+-	bus->sprom.txpid5gh[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &
+-	     SSB_SPROM4_TXPID5GH3) >> SSB_SPROM4_TXPID5GH3_SHIFT;
+-
+-	bus->sprom.boardflags_lo = sprom[SPOFF(SSB_SPROM8_BFLLO)];
+-	bus->sprom.boardflags_hi = sprom[SPOFF(SSB_SPROM8_BFLHI)];
+-	bus->sprom.boardflags2_lo = sprom[SPOFF(SSB_SPROM8_BFL2LO)];
+-	bus->sprom.boardflags2_hi = sprom[SPOFF(SSB_SPROM8_BFL2HI)];
+-
+-	bus->sprom.country_code = sprom[SPOFF(SSB_SPROM8_CCODE)];
+-
+-	bus->sprom.fem.ghz2.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
+-		SSB_SROM8_FEM_TSSIPOS) >> SSB_SROM8_FEM_TSSIPOS_SHIFT;
+-	bus->sprom.fem.ghz2.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
+-		SSB_SROM8_FEM_EXTPA_GAIN) >> SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;
+-	bus->sprom.fem.ghz2.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
+-		SSB_SROM8_FEM_PDET_RANGE) >> SSB_SROM8_FEM_PDET_RANGE_SHIFT;
+-	bus->sprom.fem.ghz2.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
+-		SSB_SROM8_FEM_TR_ISO) >> SSB_SROM8_FEM_TR_ISO_SHIFT;
+-	bus->sprom.fem.ghz2.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
+-		SSB_SROM8_FEM_ANTSWLUT) >> SSB_SROM8_FEM_ANTSWLUT_SHIFT;
+-
+-	bus->sprom.fem.ghz5.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
+-		SSB_SROM8_FEM_TSSIPOS) >> SSB_SROM8_FEM_TSSIPOS_SHIFT;
+-	bus->sprom.fem.ghz5.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
+-		SSB_SROM8_FEM_EXTPA_GAIN) >> SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;
+-	bus->sprom.fem.ghz5.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
+-		SSB_SROM8_FEM_PDET_RANGE) >> SSB_SROM8_FEM_PDET_RANGE_SHIFT;
+-	bus->sprom.fem.ghz5.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
+-		SSB_SROM8_FEM_TR_ISO) >> SSB_SROM8_FEM_TR_ISO_SHIFT;
+-	bus->sprom.fem.ghz5.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
+-		SSB_SROM8_FEM_ANTSWLUT) >> SSB_SROM8_FEM_ANTSWLUT_SHIFT;
++	default:
++		return true;
++	}
++
++	return chip_status & present_mask;
++}
++
++/*
++ * Indicates that on-chip OTP memory is present and enabled.
++ */
++static bool bcma_sprom_onchip_available(struct bcma_bus *bus)
++{
++	u32 chip_status;
++	u32 otpsize = 0;
++	bool present;
++
++	chip_status = bcma_read32(bus->drv_cc.core, BCMA_CC_CHIPSTAT);
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM4313:
++		present = chip_status & BCMA_CC_CHIPST_4313_OTP_PRESENT;
++		break;
++
++	case BCMA_CHIP_ID_BCM4331:
++		present = chip_status & BCMA_CC_CHIPST_4331_OTP_PRESENT;
++		break;
++	case BCMA_CHIP_ID_BCM43142:
++	case BCMA_CHIP_ID_BCM43224:
++	case BCMA_CHIP_ID_BCM43225:
++		/* for these chips OTP is always available */
++		present = true;
++		break;
++	case BCMA_CHIP_ID_BCM43227:
++	case BCMA_CHIP_ID_BCM43228:
++	case BCMA_CHIP_ID_BCM43428:
++		present = chip_status & BCMA_CC_CHIPST_43228_OTP_PRESENT;
++		break;
++	default:
++		present = false;
++		break;
++	}
++
++	if (present) {
++		otpsize = bus->drv_cc.capabilities & BCMA_CC_CAP_OTPS;
++		otpsize >>= BCMA_CC_CAP_OTPS_SHIFT;
++	}
++
++	return otpsize != 0;
++}
++
++/*
++ * Verify OTP is filled and determine the byte
++ * offset where SPROM data is located.
++ *
++ * On error, returns 0; byte offset otherwise.
++ */
++static int bcma_sprom_onchip_offset(struct bcma_bus *bus)
++{
++	struct bcma_device *cc = bus->drv_cc.core;
++	u32 offset;
++
++	/* verify OTP status */
++	if ((bcma_read32(cc, BCMA_CC_OTPS) & BCMA_CC_OTPS_GU_PROG_HW) == 0)
++		return 0;
++
++	/* obtain bit offset from otplayout register */
++	offset = (bcma_read32(cc, BCMA_CC_OTPL) & BCMA_CC_OTPL_GURGN_OFFSET);
++	return BCMA_CC_SPROM + (offset >> 3);
+ }
+ 
+ int bcma_sprom_get(struct bcma_bus *bus)
+ {
+-	u16 offset;
++	u16 offset = BCMA_CC_SPROM;
+ 	u16 *sprom;
+-	int err = 0;
++	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4,
++				 SSB_SPROMSIZE_WORDS_R10, };
++	int i, err = 0;
+ 
+ 	if (!bus->drv_cc.core)
+ 		return -EOPNOTSUPP;
+ 
+-	if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
+-		return -ENOENT;
++	if (!bcma_sprom_ext_available(bus)) {
++		bool sprom_onchip;
+ 
+-	sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
+-			GFP_KERNEL);
+-	if (!sprom)
+-		return -ENOMEM;
++		/*
++		 * External SPROM takes precedence so check
++		 * on-chip OTP only when no external SPROM
++		 * is present.
++		 */
++		sprom_onchip = bcma_sprom_onchip_available(bus);
++		if (sprom_onchip) {
++			/* determine offset */
++			offset = bcma_sprom_onchip_offset(bus);
++		}
++		if (!offset || !sprom_onchip) {
++			/*
++			 * Maybe there is no SPROM on the device?
++			 * Now we ask the arch code if there is some sprom
++			 * available for this device in some other storage.
++			 */
++			err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
++			return err;
++		}
++	}
+ 
+-	if (bus->chipinfo.id == 0x4331)
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 ||
++	    bus->chipinfo.id == BCMA_CHIP_ID_BCM43431)
+ 		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);
+ 
+-	/* Most cards have SPROM moved by additional offset 0x30 (48 dwords).
+-	 * According to brcm80211 this applies to cards with PCIe rev >= 6
+-	 * TODO: understand this condition and use it */
+-	offset = (bus->chipinfo.id == 0x4331) ? BCMA_CC_SPROM :
+-		BCMA_CC_SPROM_PCIE6;
+-	bcma_sprom_read(bus, offset, sprom);
++	bcma_debug(bus, "SPROM offset 0x%x\n", offset);
++	for (i = 0; i < ARRAY_SIZE(sprom_sizes); i++) {
++		size_t words = sprom_sizes[i];
++
++		sprom = kcalloc(words, sizeof(u16), GFP_KERNEL);
++		if (!sprom)
++			return -ENOMEM;
++
++		bcma_sprom_read(bus, offset, sprom, words);
++		err = bcma_sprom_valid(bus, sprom, words);
++		if (!err)
++			break;
+ 
+-	if (bus->chipinfo.id == 0x4331)
+-		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
++		kfree(sprom);
++	}
+ 
+-	err = bcma_sprom_valid(sprom);
+-	if (err)
+-		goto out;
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 ||
++	    bus->chipinfo.id == BCMA_CHIP_ID_BCM43431)
++		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
+ 
+-	bcma_sprom_extract_r8(bus, sprom);
++	if (err) {
++		bcma_warn(bus, "Invalid SPROM read from the PCIe card, trying to use fallback SPROM\n");
++		err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
++	} else {
++		bcma_sprom_extract_r8(bus, sprom);
++		kfree(sprom);
++	}
+ 
+-out:
+-	kfree(sprom);
+ 	return err;
+ }
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -7,9 +7,10 @@
+ #include <linux/bcma/bcma_driver_chipcommon.h>
+ #include <linux/bcma/bcma_driver_pci.h>
+ #include <linux/bcma/bcma_driver_mips.h>
++#include <linux/bcma/bcma_driver_gmac_cmn.h>
+ #include <linux/ssb/ssb.h> /* SPROM sharing */
+ 
+-#include "bcma_regs.h"
++#include <linux/bcma/bcma_regs.h>
+ 
+ struct bcma_device;
+ struct bcma_bus;
+@@ -26,6 +27,11 @@ struct bcma_chipinfo {
+ 	u8 pkg;
+ };
+ 
++struct bcma_boardinfo {
++	u16 vendor;
++	u16 type;
++};
++
+ enum bcma_clkmode {
+ 	BCMA_CLKMODE_FAST,
+ 	BCMA_CLKMODE_DYNAMIC,
+@@ -65,6 +71,25 @@ struct bcma_host_ops {
+ 
+ /* Core-ID values. */
+ #define BCMA_CORE_OOB_ROUTER		0x367	/* Out of band */
++#define BCMA_CORE_4706_CHIPCOMMON	0x500
++#define BCMA_CORE_PCIEG2		0x501
++#define BCMA_CORE_DMA			0x502
++#define BCMA_CORE_SDIO3			0x503
++#define BCMA_CORE_USB20			0x504
++#define BCMA_CORE_USB30			0x505
++#define BCMA_CORE_A9JTAG		0x506
++#define BCMA_CORE_DDR23			0x507
++#define BCMA_CORE_ROM			0x508
++#define BCMA_CORE_NAND			0x509
++#define BCMA_CORE_QSPI			0x50A
++#define BCMA_CORE_CHIPCOMMON_B		0x50B
++#define BCMA_CORE_4706_SOC_RAM		0x50E
++#define BCMA_CORE_ARMCA9		0x510
++#define BCMA_CORE_4706_MAC_GBIT		0x52D
++#define BCMA_CORE_AMEMC			0x52E	/* DDR1/2 memory controller core */
++#define BCMA_CORE_ALTA			0x534	/* I2S core */
++#define BCMA_CORE_4706_MAC_GBIT_COMMON	0x5DC
++#define BCMA_CORE_DDR23_PHY		0x5DD
+ #define BCMA_CORE_INVALID		0x700
+ #define BCMA_CORE_CHIPCOMMON		0x800
+ #define BCMA_CORE_ILINE20		0x801
+@@ -121,10 +146,112 @@ struct bcma_host_ops {
+ #define BCMA_CORE_I2S			0x834
+ #define BCMA_CORE_SDR_DDR1_MEM_CTL	0x835	/* SDR/DDR1 memory controller core */
+ #define BCMA_CORE_SHIM			0x837	/* SHIM component in ubus/6362 */
++#define BCMA_CORE_PHY_AC		0x83B
++#define BCMA_CORE_PCIE2			0x83C	/* PCI Express Gen2 */
++#define BCMA_CORE_USB30_DEV		0x83D
++#define BCMA_CORE_ARM_CR4		0x83E
+ #define BCMA_CORE_DEFAULT		0xFFF
+ 
+ #define BCMA_MAX_NR_CORES		16
+ 
++/* Chip IDs of PCIe devices */
++#define BCMA_CHIP_ID_BCM4313	0x4313
++#define BCMA_CHIP_ID_BCM43142	43142
++#define BCMA_CHIP_ID_BCM43131  43131
++#define BCMA_CHIP_ID_BCM43217  43217
++#define BCMA_CHIP_ID_BCM43222  43222
++#define BCMA_CHIP_ID_BCM43224	43224
++#define  BCMA_PKG_ID_BCM43224_FAB_CSM	0x8
++#define  BCMA_PKG_ID_BCM43224_FAB_SMIC	0xa
++#define BCMA_CHIP_ID_BCM43225	43225
++#define BCMA_CHIP_ID_BCM43227	43227
++#define BCMA_CHIP_ID_BCM43228	43228
++#define BCMA_CHIP_ID_BCM43421	43421
++#define BCMA_CHIP_ID_BCM43428	43428
++#define BCMA_CHIP_ID_BCM43431	43431
++#define BCMA_CHIP_ID_BCM43460	43460
++#define BCMA_CHIP_ID_BCM4331	0x4331
++#define BCMA_CHIP_ID_BCM6362	0x6362
++#define BCMA_CHIP_ID_BCM4360	0x4360
++#define BCMA_CHIP_ID_BCM4352	0x4352
++
++/* Chip IDs of SoCs */
++#define BCMA_CHIP_ID_BCM4706	0x5300
++#define  BCMA_PKG_ID_BCM4706L	1
++#define BCMA_CHIP_ID_BCM4716	0x4716
++#define  BCMA_PKG_ID_BCM4716	8
++#define  BCMA_PKG_ID_BCM4717	9
++#define  BCMA_PKG_ID_BCM4718	10
++#define BCMA_CHIP_ID_BCM47162	47162
++#define BCMA_CHIP_ID_BCM4748	0x4748
++#define BCMA_CHIP_ID_BCM4749	0x4749
++#define BCMA_CHIP_ID_BCM5356	0x5356
++#define BCMA_CHIP_ID_BCM5357	0x5357
++#define  BCMA_PKG_ID_BCM5358	9
++#define  BCMA_PKG_ID_BCM47186	10
++#define  BCMA_PKG_ID_BCM5357	11
++#define BCMA_CHIP_ID_BCM53572	53572
++#define  BCMA_PKG_ID_BCM47188	9
++#define BCMA_CHIP_ID_BCM4707	53010
++#define  BCMA_PKG_ID_BCM4707	1
++#define  BCMA_PKG_ID_BCM4708	2
++#define  BCMA_PKG_ID_BCM4709	0
++#define BCMA_CHIP_ID_BCM53018	53018
++
++/* Board types (on PCI usually equals to the subsystem dev id) */
++/* BCM4313 */
++#define BCMA_BOARD_TYPE_BCM94313BU	0X050F
++#define BCMA_BOARD_TYPE_BCM94313HM	0X0510
++#define BCMA_BOARD_TYPE_BCM94313EPA	0X0511
++#define BCMA_BOARD_TYPE_BCM94313HMG	0X051C
++/* BCM4716 */
++#define BCMA_BOARD_TYPE_BCM94716NR2	0X04CD
++/* BCM43224 */
++#define BCMA_BOARD_TYPE_BCM943224X21	0X056E
++#define BCMA_BOARD_TYPE_BCM943224X21_FCC	0X00D1
++#define BCMA_BOARD_TYPE_BCM943224X21B	0X00E9
++#define BCMA_BOARD_TYPE_BCM943224M93	0X008B
++#define BCMA_BOARD_TYPE_BCM943224M93A	0X0090
++#define BCMA_BOARD_TYPE_BCM943224X16	0X0093
++#define BCMA_BOARD_TYPE_BCM94322X9	0X008D
++#define BCMA_BOARD_TYPE_BCM94322M35E	0X008E
++/* BCM43228 */
++#define BCMA_BOARD_TYPE_BCM943228BU8	0X0540
++#define BCMA_BOARD_TYPE_BCM943228BU9	0X0541
++#define BCMA_BOARD_TYPE_BCM943228BU	0X0542
++#define BCMA_BOARD_TYPE_BCM943227HM4L	0X0543
++#define BCMA_BOARD_TYPE_BCM943227HMB	0X0544
++#define BCMA_BOARD_TYPE_BCM943228HM4L	0X0545
++#define BCMA_BOARD_TYPE_BCM943228SD	0X0573
++/* BCM4331 */
++#define BCMA_BOARD_TYPE_BCM94331X19	0X00D6
++#define BCMA_BOARD_TYPE_BCM94331X28	0X00E4
++#define BCMA_BOARD_TYPE_BCM94331X28B	0X010E
++#define BCMA_BOARD_TYPE_BCM94331PCIEBT3AX	0X00E4
++#define BCMA_BOARD_TYPE_BCM94331X12_2G	0X00EC
++#define BCMA_BOARD_TYPE_BCM94331X12_5G	0X00ED
++#define BCMA_BOARD_TYPE_BCM94331X29B	0X00EF
++#define BCMA_BOARD_TYPE_BCM94331CSAX	0X00EF
++#define BCMA_BOARD_TYPE_BCM94331X19C	0X00F5
++#define BCMA_BOARD_TYPE_BCM94331X33	0X00F4
++#define BCMA_BOARD_TYPE_BCM94331BU	0X0523
++#define BCMA_BOARD_TYPE_BCM94331S9BU	0X0524
++#define BCMA_BOARD_TYPE_BCM94331MC	0X0525
++#define BCMA_BOARD_TYPE_BCM94331MCI	0X0526
++#define BCMA_BOARD_TYPE_BCM94331PCIEBT4	0X0527
++#define BCMA_BOARD_TYPE_BCM94331HM	0X0574
++#define BCMA_BOARD_TYPE_BCM94331PCIEDUAL	0X059B
++#define BCMA_BOARD_TYPE_BCM94331MCH5	0X05A9
++#define BCMA_BOARD_TYPE_BCM94331CS	0X05C6
++#define BCMA_BOARD_TYPE_BCM94331CD	0X05DA
++/* BCM53572 */
++#define BCMA_BOARD_TYPE_BCM953572BU	0X058D
++#define BCMA_BOARD_TYPE_BCM953572NR2	0X058E
++#define BCMA_BOARD_TYPE_BCM947188NR2	0X058F
++#define BCMA_BOARD_TYPE_BCM953572SDRNR2	0X0590
++/* BCM43142 */
++#define BCMA_BOARD_TYPE_BCM943142HM	0X05E0
++
+ struct bcma_device {
+ 	struct bcma_bus *bus;
+ 	struct bcma_device_id id;
+@@ -136,8 +263,10 @@ struct bcma_device {
+ 	bool dev_registered;
+ 
+ 	u8 core_index;
++	u8 core_unit;
+ 
+ 	u32 addr;
++	u32 addr1;
+ 	u32 wrap;
+ 
+ 	void __iomem *io_addr;
+@@ -175,6 +304,12 @@ int __bcma_driver_register(struct bcma_d
+ 
+ extern void bcma_driver_unregister(struct bcma_driver *drv);
+ 
++/* Set a fallback SPROM.
++ * See kdoc at the function definition for complete documentation. */
++extern int bcma_arch_register_fallback_sprom(
++		int (*sprom_callback)(struct bcma_bus *bus,
++		struct ssb_sprom *out));
++
+ struct bcma_bus {
+ 	/* The MMIO area. */
+ 	void __iomem *mmio;
+@@ -191,14 +326,18 @@ struct bcma_bus {
+ 
+ 	struct bcma_chipinfo chipinfo;
+ 
++	struct bcma_boardinfo boardinfo;
++
+ 	struct bcma_device *mapped_core;
+ 	struct list_head cores;
+ 	u8 nr_cores;
+ 	u8 init_done:1;
++	u8 num;
+ 
+ 	struct bcma_drv_cc drv_cc;
+-	struct bcma_drv_pci drv_pci;
++	struct bcma_drv_pci drv_pci[2];
+ 	struct bcma_drv_mips drv_mips;
++	struct bcma_drv_gmac_cmn drv_gmac_cmn;
+ 
+ 	/* We decided to share SPROM struct with SSB as long as we do not need
+ 	 * any hacks for BCMA. This simplifies drivers code. */
+@@ -282,6 +421,7 @@ static inline void bcma_maskset16(struct
+ 	bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set);
+ }
+ 
++extern struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid);
+ extern bool bcma_core_is_enabled(struct bcma_device *core);
+ extern void bcma_core_disable(struct bcma_device *core, u32 flags);
+ extern int bcma_core_enable(struct bcma_device *core, u32 flags);
+@@ -289,6 +429,7 @@ extern void bcma_core_set_clockmode(stru
+ 				    enum bcma_clkmode clkmode);
+ extern void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status,
+ 			      bool on);
++extern u32 bcma_chipco_pll_read(struct bcma_drv_cc *cc, u32 offset);
+ #define BCMA_DMA_TRANSLATION_MASK	0xC0000000
+ #define  BCMA_DMA_TRANSLATION_NONE	0x00000000
+ #define  BCMA_DMA_TRANSLATION_DMA32_CMT	0x40000000 /* Client Mode Translation for 32-bit DMA */
+--- a/include/linux/bcma/bcma_driver_chipcommon.h
++++ b/include/linux/bcma/bcma_driver_chipcommon.h
+@@ -1,6 +1,9 @@
+ #ifndef LINUX_BCMA_DRIVER_CC_H_
+ #define LINUX_BCMA_DRIVER_CC_H_
+ 
++#include <linux/platform_device.h>
++#include <linux/gpio.h>
++
+ /** ChipCommon core registers. **/
+ #define BCMA_CC_ID			0x0000
+ #define  BCMA_CC_ID_ID			0x0000FFFF
+@@ -24,7 +27,7 @@
+ #define   BCMA_CC_FLASHT_NONE		0x00000000	/* No flash */
+ #define   BCMA_CC_FLASHT_STSER		0x00000100	/* ST serial flash */
+ #define   BCMA_CC_FLASHT_ATSER		0x00000200	/* Atmel serial flash */
+-#define   BCMA_CC_FLASHT_NFLASH		0x00000200
++#define   BCMA_CC_FLASHT_NAND		0x00000300	/* NAND flash */
+ #define	  BCMA_CC_FLASHT_PARA		0x00000700	/* Parallel flash */
+ #define  BCMA_CC_CAP_PLLT		0x00038000	/* PLL Type */
+ #define   BCMA_PLLTYPE_NONE		0x00000000
+@@ -45,6 +48,7 @@
+ #define  BCMA_CC_CAP_PMU		0x10000000	/* PMU available (rev >= 20) */
+ #define  BCMA_CC_CAP_ECI		0x20000000	/* ECI available (rev >= 20) */
+ #define  BCMA_CC_CAP_SPROM		0x40000000	/* SPROM present */
++#define  BCMA_CC_CAP_NFLASH		0x80000000	/* NAND flash present (rev >= 35 or BCM4706?) */
+ #define BCMA_CC_CORECTL			0x0008
+ #define  BCMA_CC_CORECTL_UARTCLK0	0x00000001	/* Drive UART with internal clock */
+ #define	 BCMA_CC_CORECTL_SE		0x00000002	/* sync clk out enable (corerev >= 3) */
+@@ -56,6 +60,9 @@
+ #define	 BCMA_CC_OTPS_HW_PROTECT	0x00000001
+ #define	 BCMA_CC_OTPS_SW_PROTECT	0x00000002
+ #define	 BCMA_CC_OTPS_CID_PROTECT	0x00000004
++#define  BCMA_CC_OTPS_GU_PROG_IND	0x00000F00	/* General Use programmed indication */
++#define  BCMA_CC_OTPS_GU_PROG_IND_SHIFT	8
++#define  BCMA_CC_OTPS_GU_PROG_HW	0x00000100	/* HW region programmed */
+ #define BCMA_CC_OTPC			0x0014		/* OTP control */
+ #define	 BCMA_CC_OTPC_RECWAIT		0xFF000000
+ #define	 BCMA_CC_OTPC_PROGWAIT		0x00FFFF00
+@@ -72,6 +79,8 @@
+ #define	 BCMA_CC_OTPP_READ		0x40000000
+ #define	 BCMA_CC_OTPP_START		0x80000000
+ #define	 BCMA_CC_OTPP_BUSY		0x80000000
++#define BCMA_CC_OTPL			0x001C		/* OTP layout */
++#define  BCMA_CC_OTPL_GURGN_OFFSET	0x00000FFF	/* offset of general use region */
+ #define BCMA_CC_IRQSTAT			0x0020
+ #define BCMA_CC_IRQMASK			0x0024
+ #define	 BCMA_CC_IRQ_GPIO		0x00000001	/* gpio intr */
+@@ -79,6 +88,23 @@
+ #define	 BCMA_CC_IRQ_WDRESET		0x80000000	/* watchdog reset occurred */
+ #define BCMA_CC_CHIPCTL			0x0028		/* Rev >= 11 only */
+ #define BCMA_CC_CHIPSTAT		0x002C		/* Rev >= 11 only */
++#define  BCMA_CC_CHIPST_4313_SPROM_PRESENT	1
++#define  BCMA_CC_CHIPST_4313_OTP_PRESENT	2
++#define  BCMA_CC_CHIPST_4331_SPROM_PRESENT	2
++#define  BCMA_CC_CHIPST_4331_OTP_PRESENT	4
++#define  BCMA_CC_CHIPST_43228_ILP_DIV_EN	0x00000001
++#define  BCMA_CC_CHIPST_43228_OTP_PRESENT	0x00000002
++#define  BCMA_CC_CHIPST_43228_SERDES_REFCLK_PADSEL	0x00000004
++#define  BCMA_CC_CHIPST_43228_SDIO_MODE		0x00000008
++#define  BCMA_CC_CHIPST_43228_SDIO_OTP_PRESENT	0x00000010
++#define  BCMA_CC_CHIPST_43228_SDIO_RESET	0x00000020
++#define  BCMA_CC_CHIPST_4706_PKG_OPTION		BIT(0) /* 0: full-featured package 1: low-cost package */
++#define  BCMA_CC_CHIPST_4706_SFLASH_PRESENT	BIT(1) /* 0: parallel, 1: serial flash is present */
++#define  BCMA_CC_CHIPST_4706_SFLASH_TYPE	BIT(2) /* 0: 8b-p/ST-s flash, 1: 16b-p/Atmal-s flash */
++#define  BCMA_CC_CHIPST_4706_MIPS_BENDIAN	BIT(3) /* 0: little, 1: big endian */
++#define  BCMA_CC_CHIPST_4706_PCIE1_DISABLE	BIT(5) /* PCIE1 enable strap pin */
++#define  BCMA_CC_CHIPST_5357_NAND_BOOT		BIT(4) /* NAND boot, valid for CC rev 38 and/or BCM5357 */
++#define  BCMA_CC_CHIPST_4360_XTAL_40MZ		0x00000001
+ #define BCMA_CC_JCMD			0x0030		/* Rev >= 10 only */
+ #define  BCMA_CC_JCMD_START		0x80000000
+ #define  BCMA_CC_JCMD_BUSY		0x80000000
+@@ -108,10 +134,58 @@
+ #define  BCMA_CC_JCTL_EXT_EN		2		/* Enable external targets */
+ #define  BCMA_CC_JCTL_EN		1		/* Enable Jtag master */
+ #define BCMA_CC_FLASHCTL		0x0040
++/* Start/busy bit in flashcontrol */
++#define  BCMA_CC_FLASHCTL_OPCODE	0x000000ff
++#define  BCMA_CC_FLASHCTL_ACTION	0x00000700
++#define  BCMA_CC_FLASHCTL_CS_ACTIVE	0x00001000	/* Chip Select Active, rev >= 20 */
+ #define  BCMA_CC_FLASHCTL_START		0x80000000
+ #define  BCMA_CC_FLASHCTL_BUSY		BCMA_CC_FLASHCTL_START
++/* Flashcontrol action + opcodes for ST flashes */
++#define  BCMA_CC_FLASHCTL_ST_WREN	0x0006		/* Write Enable */
++#define  BCMA_CC_FLASHCTL_ST_WRDIS	0x0004		/* Write Disable */
++#define  BCMA_CC_FLASHCTL_ST_RDSR	0x0105		/* Read Status Register */
++#define  BCMA_CC_FLASHCTL_ST_WRSR	0x0101		/* Write Status Register */
++#define  BCMA_CC_FLASHCTL_ST_READ	0x0303		/* Read Data Bytes */
++#define  BCMA_CC_FLASHCTL_ST_PP		0x0302		/* Page Program */
++#define  BCMA_CC_FLASHCTL_ST_SE		0x02d8		/* Sector Erase */
++#define  BCMA_CC_FLASHCTL_ST_BE		0x00c7		/* Bulk Erase */
++#define  BCMA_CC_FLASHCTL_ST_DP		0x00b9		/* Deep Power-down */
++#define  BCMA_CC_FLASHCTL_ST_RES	0x03ab		/* Read Electronic Signature */
++#define  BCMA_CC_FLASHCTL_ST_CSA	0x1000		/* Keep chip select asserted */
++#define  BCMA_CC_FLASHCTL_ST_SSE	0x0220		/* Sub-sector Erase */
++/* Flashcontrol action + opcodes for Atmel flashes */
++#define  BCMA_CC_FLASHCTL_AT_READ			0x07e8
++#define  BCMA_CC_FLASHCTL_AT_PAGE_READ			0x07d2
++#define  BCMA_CC_FLASHCTL_AT_STATUS			0x01d7
++#define  BCMA_CC_FLASHCTL_AT_BUF1_WRITE			0x0384
++#define  BCMA_CC_FLASHCTL_AT_BUF2_WRITE			0x0387
++#define  BCMA_CC_FLASHCTL_AT_BUF1_ERASE_PROGRAM		0x0283
++#define  BCMA_CC_FLASHCTL_AT_BUF2_ERASE_PROGRAM		0x0286
++#define  BCMA_CC_FLASHCTL_AT_BUF1_PROGRAM		0x0288
++#define  BCMA_CC_FLASHCTL_AT_BUF2_PROGRAM		0x0289
++#define  BCMA_CC_FLASHCTL_AT_PAGE_ERASE			0x0281
++#define  BCMA_CC_FLASHCTL_AT_BLOCK_ERASE		0x0250
++#define  BCMA_CC_FLASHCTL_AT_BUF1_WRITE_ERASE_PROGRAM	0x0382
++#define  BCMA_CC_FLASHCTL_AT_BUF2_WRITE_ERASE_PROGRAM	0x0385
++#define  BCMA_CC_FLASHCTL_AT_BUF1_LOAD			0x0253
++#define  BCMA_CC_FLASHCTL_AT_BUF2_LOAD			0x0255
++#define  BCMA_CC_FLASHCTL_AT_BUF1_COMPARE		0x0260
++#define  BCMA_CC_FLASHCTL_AT_BUF2_COMPARE		0x0261
++#define  BCMA_CC_FLASHCTL_AT_BUF1_REPROGRAM		0x0258
++#define  BCMA_CC_FLASHCTL_AT_BUF2_REPROGRAM		0x0259
+ #define BCMA_CC_FLASHADDR		0x0044
+ #define BCMA_CC_FLASHDATA		0x0048
++/* Status register bits for ST flashes */
++#define  BCMA_CC_FLASHDATA_ST_WIP	0x01		/* Write In Progress */
++#define  BCMA_CC_FLASHDATA_ST_WEL	0x02		/* Write Enable Latch */
++#define  BCMA_CC_FLASHDATA_ST_BP_MASK	0x1c		/* Block Protect */
++#define  BCMA_CC_FLASHDATA_ST_BP_SHIFT	2
++#define  BCMA_CC_FLASHDATA_ST_SRWD	0x80		/* Status Register Write Disable */
++/* Status register bits for Atmel flashes */
++#define  BCMA_CC_FLASHDATA_AT_READY	0x80
++#define  BCMA_CC_FLASHDATA_AT_MISMATCH	0x40
++#define  BCMA_CC_FLASHDATA_AT_ID_MASK	0x38
++#define  BCMA_CC_FLASHDATA_AT_ID_SHIFT	3
+ #define BCMA_CC_BCAST_ADDR		0x0050
+ #define BCMA_CC_BCAST_DATA		0x0054
+ #define BCMA_CC_GPIOPULLUP		0x0058		/* Rev >= 20 only */
+@@ -181,6 +255,45 @@
+ #define BCMA_CC_FLASH_CFG		0x0128
+ #define  BCMA_CC_FLASH_CFG_DS		0x0010	/* Data size, 0=8bit, 1=16bit */
+ #define BCMA_CC_FLASH_WAITCNT		0x012C
++#define BCMA_CC_SROM_CONTROL		0x0190
++#define  BCMA_CC_SROM_CONTROL_START	0x80000000
++#define  BCMA_CC_SROM_CONTROL_BUSY	0x80000000
++#define  BCMA_CC_SROM_CONTROL_OPCODE	0x60000000
++#define  BCMA_CC_SROM_CONTROL_OP_READ	0x00000000
++#define  BCMA_CC_SROM_CONTROL_OP_WRITE	0x20000000
++#define  BCMA_CC_SROM_CONTROL_OP_WRDIS	0x40000000
++#define  BCMA_CC_SROM_CONTROL_OP_WREN	0x60000000
++#define  BCMA_CC_SROM_CONTROL_OTPSEL	0x00000010
++#define  BCMA_CC_SROM_CONTROL_LOCK	0x00000008
++#define  BCMA_CC_SROM_CONTROL_SIZE_MASK	0x00000006
++#define  BCMA_CC_SROM_CONTROL_SIZE_1K	0x00000000
++#define  BCMA_CC_SROM_CONTROL_SIZE_4K	0x00000002
++#define  BCMA_CC_SROM_CONTROL_SIZE_16K	0x00000004
++#define  BCMA_CC_SROM_CONTROL_SIZE_SHIFT	1
++#define  BCMA_CC_SROM_CONTROL_PRESENT	0x00000001
++/* Block 0x140 - 0x190 registers are chipset specific */
++#define BCMA_CC_4706_FLASHSCFG		0x18C		/* Flash struct configuration */
++#define  BCMA_CC_4706_FLASHSCFG_MASK	0x000000ff
++#define  BCMA_CC_4706_FLASHSCFG_SF1	0x00000001	/* 2nd serial flash present */
++#define  BCMA_CC_4706_FLASHSCFG_PF1	0x00000002	/* 2nd parallel flash present */
++#define  BCMA_CC_4706_FLASHSCFG_SF1_TYPE	0x00000004	/* 2nd serial flash type : 0 : ST, 1 : Atmel */
++#define  BCMA_CC_4706_FLASHSCFG_NF1	0x00000008	/* 2nd NAND flash present */
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_MASK	0x000000f0
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_4MB	0x00000010	/* 4MB */
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_8MB	0x00000020	/* 8MB */
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_16MB	0x00000030	/* 16MB */
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_32MB	0x00000040	/* 32MB */
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_64MB	0x00000050	/* 64MB */
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_128MB	0x00000060	/* 128MB */
++#define  BCMA_CC_4706_FLASHSCFG_1ST_MADDR_SEG_256MB	0x00000070	/* 256MB */
++/* NAND flash registers for BCM4706 (corerev = 31) */
++#define BCMA_CC_NFLASH_CTL		0x01A0
++#define  BCMA_CC_NFLASH_CTL_ERR		0x08000000
++#define BCMA_CC_NFLASH_CONF		0x01A4
++#define BCMA_CC_NFLASH_COL_ADDR		0x01A8
++#define BCMA_CC_NFLASH_ROW_ADDR		0x01AC
++#define BCMA_CC_NFLASH_DATA		0x01B0
++#define BCMA_CC_NFLASH_WAITCNT0		0x01B4
+ /* 0x1E0 is defined as shared BCMA_CLKCTLST */
+ #define BCMA_CC_HW_WORKAROUND		0x01E4 /* Hardware workaround (rev >= 20) */
+ #define BCMA_CC_UART0_DATA		0x0300
+@@ -203,6 +316,9 @@
+ #define BCMA_CC_PMU_CTL			0x0600 /* PMU control */
+ #define  BCMA_CC_PMU_CTL_ILP_DIV	0xFFFF0000 /* ILP div mask */
+ #define  BCMA_CC_PMU_CTL_ILP_DIV_SHIFT	16
++#define  BCMA_CC_PMU_CTL_RES		0x00006000 /* reset control mask */
++#define  BCMA_CC_PMU_CTL_RES_SHIFT	13
++#define  BCMA_CC_PMU_CTL_RES_RELOAD	0x2	/* reload POR values */
+ #define  BCMA_CC_PMU_CTL_PLL_UPD	0x00000400
+ #define  BCMA_CC_PMU_CTL_NOILPONW	0x00000200 /* No ILP on wait */
+ #define  BCMA_CC_PMU_CTL_HTREQEN	0x00000100 /* HT req enable */
+@@ -214,6 +330,8 @@
+ #define BCMA_CC_PMU_CAP			0x0604 /* PMU capabilities */
+ #define  BCMA_CC_PMU_CAP_REVISION	0x000000FF /* Revision mask */
+ #define BCMA_CC_PMU_STAT		0x0608 /* PMU status */
++#define  BCMA_CC_PMU_STAT_EXT_LPO_AVAIL	0x00000100
++#define  BCMA_CC_PMU_STAT_WDRESET	0x00000080
+ #define  BCMA_CC_PMU_STAT_INTPEND	0x00000040 /* Interrupt pending */
+ #define  BCMA_CC_PMU_STAT_SBCLKST	0x00000030 /* Backplane clock status? */
+ #define  BCMA_CC_PMU_STAT_HAVEALP	0x00000008 /* ALP available */
+@@ -239,8 +357,66 @@
+ #define BCMA_CC_REGCTL_DATA		0x065C
+ #define BCMA_CC_PLLCTL_ADDR		0x0660
+ #define BCMA_CC_PLLCTL_DATA		0x0664
++#define BCMA_CC_PMU_STRAPOPT		0x0668 /* (corerev >= 28) */
++#define BCMA_CC_PMU_XTAL_FREQ		0x066C /* (pmurev >= 10) */
++#define  BCMA_CC_PMU_XTAL_FREQ_ILPCTL_MASK	0x00001FFF
++#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_MASK	0x80000000
++#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_SHIFT	31
+ #define BCMA_CC_SPROM			0x0800 /* SPROM beginning */
+-#define BCMA_CC_SPROM_PCIE6		0x0830 /* SPROM beginning on PCIe rev >= 6 */
++/* NAND flash MLC controller registers (corerev >= 38) */
++#define BCMA_CC_NAND_REVISION		0x0C00
++#define BCMA_CC_NAND_CMD_START		0x0C04
++#define BCMA_CC_NAND_CMD_ADDR_X		0x0C08
++#define BCMA_CC_NAND_CMD_ADDR		0x0C0C
++#define BCMA_CC_NAND_CMD_END_ADDR	0x0C10
++#define BCMA_CC_NAND_CS_NAND_SELECT	0x0C14
++#define BCMA_CC_NAND_CS_NAND_XOR	0x0C18
++#define BCMA_CC_NAND_SPARE_RD0		0x0C20
++#define BCMA_CC_NAND_SPARE_RD4		0x0C24
++#define BCMA_CC_NAND_SPARE_RD8		0x0C28
++#define BCMA_CC_NAND_SPARE_RD12		0x0C2C
++#define BCMA_CC_NAND_SPARE_WR0		0x0C30
++#define BCMA_CC_NAND_SPARE_WR4		0x0C34
++#define BCMA_CC_NAND_SPARE_WR8		0x0C38
++#define BCMA_CC_NAND_SPARE_WR12		0x0C3C
++#define BCMA_CC_NAND_ACC_CONTROL	0x0C40
++#define BCMA_CC_NAND_CONFIG		0x0C48
++#define BCMA_CC_NAND_TIMING_1		0x0C50
++#define BCMA_CC_NAND_TIMING_2		0x0C54
++#define BCMA_CC_NAND_SEMAPHORE		0x0C58
++#define BCMA_CC_NAND_DEVID		0x0C60
++#define BCMA_CC_NAND_DEVID_X		0x0C64
++#define BCMA_CC_NAND_BLOCK_LOCK_STATUS	0x0C68
++#define BCMA_CC_NAND_INTFC_STATUS	0x0C6C
++#define BCMA_CC_NAND_ECC_CORR_ADDR_X	0x0C70
++#define BCMA_CC_NAND_ECC_CORR_ADDR	0x0C74
++#define BCMA_CC_NAND_ECC_UNC_ADDR_X	0x0C78
++#define BCMA_CC_NAND_ECC_UNC_ADDR	0x0C7C
++#define BCMA_CC_NAND_READ_ERROR_COUNT	0x0C80
++#define BCMA_CC_NAND_CORR_STAT_THRESHOLD	0x0C84
++#define BCMA_CC_NAND_READ_ADDR_X	0x0C90
++#define BCMA_CC_NAND_READ_ADDR		0x0C94
++#define BCMA_CC_NAND_PAGE_PROGRAM_ADDR_X	0x0C98
++#define BCMA_CC_NAND_PAGE_PROGRAM_ADDR	0x0C9C
++#define BCMA_CC_NAND_COPY_BACK_ADDR_X	0x0CA0
++#define BCMA_CC_NAND_COPY_BACK_ADDR	0x0CA4
++#define BCMA_CC_NAND_BLOCK_ERASE_ADDR_X	0x0CA8
++#define BCMA_CC_NAND_BLOCK_ERASE_ADDR	0x0CAC
++#define BCMA_CC_NAND_INV_READ_ADDR_X	0x0CB0
++#define BCMA_CC_NAND_INV_READ_ADDR	0x0CB4
++#define BCMA_CC_NAND_BLK_WR_PROTECT	0x0CC0
++#define BCMA_CC_NAND_ACC_CONTROL_CS1	0x0CD0
++#define BCMA_CC_NAND_CONFIG_CS1		0x0CD4
++#define BCMA_CC_NAND_TIMING_1_CS1	0x0CD8
++#define BCMA_CC_NAND_TIMING_2_CS1	0x0CDC
++#define BCMA_CC_NAND_SPARE_RD16		0x0D30
++#define BCMA_CC_NAND_SPARE_RD20		0x0D34
++#define BCMA_CC_NAND_SPARE_RD24		0x0D38
++#define BCMA_CC_NAND_SPARE_RD28		0x0D3C
++#define BCMA_CC_NAND_CACHE_ADDR		0x0D40
++#define BCMA_CC_NAND_CACHE_DATA		0x0D44
++#define BCMA_CC_NAND_CTRL_CONFIG	0x0D48
++#define BCMA_CC_NAND_CTRL_STATUS	0x0D4C
+ 
+ /* Divider allocation in 4716/47162/5356 */
+ #define BCMA_CC_PMU5_MAINPLL_CPU	1
+@@ -256,6 +432,32 @@
+ 
+ /* 4706 PMU */
+ #define BCMA_CC_PMU4706_MAINPLL_PLL0	0
++#define BCMA_CC_PMU6_4706_PROCPLL_OFF	4	/* The CPU PLL */
++#define  BCMA_CC_PMU6_4706_PROC_P2DIV_MASK	0x000f0000
++#define  BCMA_CC_PMU6_4706_PROC_P2DIV_SHIFT	16
++#define  BCMA_CC_PMU6_4706_PROC_P1DIV_MASK	0x0000f000
++#define  BCMA_CC_PMU6_4706_PROC_P1DIV_SHIFT	12
++#define  BCMA_CC_PMU6_4706_PROC_NDIV_INT_MASK	0x00000ff8
++#define  BCMA_CC_PMU6_4706_PROC_NDIV_INT_SHIFT	3
++#define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_MASK	0x00000007
++#define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_SHIFT	0
++
++/* PMU rev 15 */
++#define BCMA_CC_PMU15_PLL_PLLCTL0	0
++#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_MASK	0x00000003
++#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_SHIFT	0
++#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK	0x003FFFFC
++#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT	2
++#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_MASK	0x00C00000
++#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_SHIFT	22
++#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_MASK	0x07000000
++#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_SHIFT	24
++#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_MASK	0x38000000
++#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_SHIFT	27
++#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_MASK	0x40000000
++#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_SHIFT	30
++#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_MASK	0x80000000
++#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_SHIFT	31
+ 
+ /* ALP clock on pre-PMU chips */
+ #define BCMA_CC_PMU_ALP_CLOCK		20000000
+@@ -284,6 +486,19 @@
+ #define BCMA_CC_PPL_PCHI_OFF		5
+ #define BCMA_CC_PPL_PCHI_MASK		0x0000003f
+ 
++#define BCMA_CC_PMU_PLL_CTL0		0
++#define BCMA_CC_PMU_PLL_CTL1		1
++#define BCMA_CC_PMU_PLL_CTL2		2
++#define BCMA_CC_PMU_PLL_CTL3		3
++#define BCMA_CC_PMU_PLL_CTL4		4
++#define BCMA_CC_PMU_PLL_CTL5		5
++
++#define BCMA_CC_PMU1_PLL0_PC0_P1DIV_MASK	0x00f00000
++#define BCMA_CC_PMU1_PLL0_PC0_P1DIV_SHIFT	20
++
++#define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_MASK	0x1ff00000
++#define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT	20
++
+ /* BCM4331 ChipControl numbers. */
+ #define BCMA_CHIPCTL_4331_BT_COEXIST		BIT(0)	/* 0 disable */
+ #define BCMA_CHIPCTL_4331_SECI			BIT(1)	/* 0 SECI is disabled (JATG functional) */
+@@ -297,9 +512,56 @@
+ #define BCMA_CHIPCTL_4331_OVR_PIPEAUXPWRDOWN	BIT(9)	/* override core control on pipe_AuxPowerDown */
+ #define BCMA_CHIPCTL_4331_PCIE_AUXCLKEN		BIT(10)	/* pcie_auxclkenable */
+ #define BCMA_CHIPCTL_4331_PCIE_PIPE_PLLDOWN	BIT(11)	/* pcie_pipe_pllpowerdown */
++#define BCMA_CHIPCTL_4331_EXTPA_EN2		BIT(12)	/* 0 ext pa disable, 1 ext pa enabled */
+ #define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4	BIT(16)	/* enable bt_shd0 at gpio4 */
+ #define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5	BIT(17)	/* enable bt_shd1 at gpio5 */
+ 
++/* 43224 chip-specific ChipControl register bits */
++#define BCMA_CCTRL_43224_GPIO_TOGGLE		0x8000		/* gpio[3:0] pins as btcoex or s/w gpio */
++#define BCMA_CCTRL_43224A0_12MA_LED_DRIVE	0x00F000F0	/* 12 mA drive strength */
++#define BCMA_CCTRL_43224B0_12MA_LED_DRIVE	0xF0		/* 12 mA drive strength for later 43224s */
++
++/* 4313 Chip specific ChipControl register bits */
++#define BCMA_CCTRL_4313_12MA_LED_DRIVE		0x00000007	/* 12 mA drive strengh for later 4313 */
++
++/* BCM5357 ChipControl register bits */
++#define BCMA_CHIPCTL_5357_EXTPA			BIT(14)
++#define BCMA_CHIPCTL_5357_ANT_MUX_2O3		BIT(15)
++#define BCMA_CHIPCTL_5357_NFLASH		BIT(16)
++#define BCMA_CHIPCTL_5357_I2S_PINS_ENABLE	BIT(18)
++#define BCMA_CHIPCTL_5357_I2CSPI_PINS_ENABLE	BIT(19)
++
++#define BCMA_RES_4314_LPLDO_PU			BIT(0)
++#define BCMA_RES_4314_PMU_SLEEP_DIS		BIT(1)
++#define BCMA_RES_4314_PMU_BG_PU			BIT(2)
++#define BCMA_RES_4314_CBUCK_LPOM_PU		BIT(3)
++#define BCMA_RES_4314_CBUCK_PFM_PU		BIT(4)
++#define BCMA_RES_4314_CLDO_PU			BIT(5)
++#define BCMA_RES_4314_LPLDO2_LVM		BIT(6)
++#define BCMA_RES_4314_WL_PMU_PU			BIT(7)
++#define BCMA_RES_4314_LNLDO_PU			BIT(8)
++#define BCMA_RES_4314_LDO3P3_PU			BIT(9)
++#define BCMA_RES_4314_OTP_PU			BIT(10)
++#define BCMA_RES_4314_XTAL_PU			BIT(11)
++#define BCMA_RES_4314_WL_PWRSW_PU		BIT(12)
++#define BCMA_RES_4314_LQ_AVAIL			BIT(13)
++#define BCMA_RES_4314_LOGIC_RET			BIT(14)
++#define BCMA_RES_4314_MEM_SLEEP			BIT(15)
++#define BCMA_RES_4314_MACPHY_RET		BIT(16)
++#define BCMA_RES_4314_WL_CORE_READY		BIT(17)
++#define BCMA_RES_4314_ILP_REQ			BIT(18)
++#define BCMA_RES_4314_ALP_AVAIL			BIT(19)
++#define BCMA_RES_4314_MISC_PWRSW_PU		BIT(20)
++#define BCMA_RES_4314_SYNTH_PWRSW_PU		BIT(21)
++#define BCMA_RES_4314_RX_PWRSW_PU		BIT(22)
++#define BCMA_RES_4314_RADIO_PU			BIT(23)
++#define BCMA_RES_4314_VCO_LDO_PU		BIT(24)
++#define BCMA_RES_4314_AFE_LDO_PU		BIT(25)
++#define BCMA_RES_4314_RX_LDO_PU			BIT(26)
++#define BCMA_RES_4314_TX_LDO_PU			BIT(27)
++#define BCMA_RES_4314_HT_AVAIL			BIT(28)
++#define BCMA_RES_4314_MACPHY_CLK_AVAIL		BIT(29)
++
+ /* Data for the PMU, if available.
+  * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
+  */
+@@ -310,11 +572,36 @@ struct bcma_chipcommon_pmu {
+ 
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+ struct bcma_pflash {
++	bool present;
+ 	u8 buswidth;
+ 	u32 window;
+ 	u32 window_size;
+ };
+ 
++#ifdef CONFIG_BCMA_SFLASH
++struct bcma_sflash {
++	bool present;
++	u32 window;
++	u32 blocksize;
++	u16 numblocks;
++	u32 size;
++
++	struct mtd_info *mtd;
++	void *priv;
++};
++#endif
++
++#ifdef CONFIG_BCMA_NFLASH
++struct mtd_info;
++
++struct bcma_nflash {
++	bool present;
++	bool boot;		/* This is the flash the SoC boots from */
++
++	struct mtd_info *mtd;
++};
++#endif
++
+ struct bcma_serial_port {
+ 	void *regs;
+ 	unsigned long clockspeed;
+@@ -330,15 +617,30 @@ struct bcma_drv_cc {
+ 	u32 capabilities;
+ 	u32 capabilities_ext;
+ 	u8 setup_done:1;
++	u8 early_setup_done:1;
+ 	/* Fast Powerup Delay constant */
+ 	u16 fast_pwrup_delay;
+ 	struct bcma_chipcommon_pmu pmu;
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+ 	struct bcma_pflash pflash;
++#ifdef CONFIG_BCMA_SFLASH
++	struct bcma_sflash sflash;
++#endif
++#ifdef CONFIG_BCMA_NFLASH
++	struct bcma_nflash nflash;
++#endif
+ 
+ 	int nr_serial_ports;
+ 	struct bcma_serial_port serial_ports[4];
+ #endif /* CONFIG_BCMA_DRIVER_MIPS */
++	u32 ticks_per_ms;
++	struct platform_device *watchdog;
++
++	/* Lock for GPIO register access. */
++	spinlock_t gpio_lock;
++#ifdef CONFIG_BCMA_DRIVER_GPIO
++	struct gpio_chip gpio;
++#endif
+ };
+ 
+ /* Register access */
+@@ -355,14 +657,16 @@ struct bcma_drv_cc {
+ 	bcma_cc_write32(cc, offset, (bcma_cc_read32(cc, offset) & (mask)) | (set))
+ 
+ extern void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
++extern void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);
+ 
+ extern void bcma_chipco_suspend(struct bcma_drv_cc *cc);
+ extern void bcma_chipco_resume(struct bcma_drv_cc *cc);
+ 
+ void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
+ 
+-extern void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc,
+-					  u32 ticks);
++extern u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks);
++
++extern u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc);
+ 
+ void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value);
+ 
+@@ -375,9 +679,12 @@ u32 bcma_chipco_gpio_outen(struct bcma_d
+ u32 bcma_chipco_gpio_control(struct bcma_drv_cc *cc, u32 mask, u32 value);
+ u32 bcma_chipco_gpio_intmask(struct bcma_drv_cc *cc, u32 mask, u32 value);
+ u32 bcma_chipco_gpio_polarity(struct bcma_drv_cc *cc, u32 mask, u32 value);
++u32 bcma_chipco_gpio_pullup(struct bcma_drv_cc *cc, u32 mask, u32 value);
++u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value);
+ 
+ /* PMU support */
+ extern void bcma_pmu_init(struct bcma_drv_cc *cc);
++extern void bcma_pmu_early_init(struct bcma_drv_cc *cc);
+ 
+ extern void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset,
+ 				  u32 value);
+@@ -387,5 +694,8 @@ extern void bcma_chipco_chipctl_maskset(
+ 					u32 offset, u32 mask, u32 set);
+ extern void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc,
+ 				       u32 offset, u32 mask, u32 set);
++extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid);
++
++extern u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc);
+ 
+ #endif /* LINUX_BCMA_DRIVER_CC_H_ */
+--- /dev/null
++++ b/include/linux/bcma/bcma_driver_gmac_cmn.h
+@@ -0,0 +1,100 @@
++#ifndef LINUX_BCMA_DRIVER_GMAC_CMN_H_
++#define LINUX_BCMA_DRIVER_GMAC_CMN_H_
++
++#include <linux/types.h>
++
++#define BCMA_GMAC_CMN_STAG0		0x000
++#define BCMA_GMAC_CMN_STAG1		0x004
++#define BCMA_GMAC_CMN_STAG2		0x008
++#define BCMA_GMAC_CMN_STAG3		0x00C
++#define BCMA_GMAC_CMN_PARSER_CTL	0x020
++#define BCMA_GMAC_CMN_MIB_MAX_LEN	0x024
++#define BCMA_GMAC_CMN_PHY_ACCESS	0x100
++#define  BCMA_GMAC_CMN_PA_DATA_MASK	0x0000ffff
++#define  BCMA_GMAC_CMN_PA_ADDR_MASK	0x001f0000
++#define  BCMA_GMAC_CMN_PA_ADDR_SHIFT	16
++#define  BCMA_GMAC_CMN_PA_REG_MASK	0x1f000000
++#define  BCMA_GMAC_CMN_PA_REG_SHIFT	24
++#define  BCMA_GMAC_CMN_PA_WRITE		0x20000000
++#define  BCMA_GMAC_CMN_PA_START		0x40000000
++#define BCMA_GMAC_CMN_PHY_CTL		0x104
++#define  BCMA_GMAC_CMN_PC_EPA_MASK	0x0000001f
++#define  BCMA_GMAC_CMN_PC_MCT_MASK	0x007f0000
++#define  BCMA_GMAC_CMN_PC_MCT_SHIFT	16
++#define  BCMA_GMAC_CMN_PC_MTE		0x00800000
++#define BCMA_GMAC_CMN_GMAC0_RGMII_CTL	0x110
++#define BCMA_GMAC_CMN_CFP_ACCESS	0x200
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA0	0x210
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA1	0x214
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA2	0x218
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA3	0x21C
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA4	0x220
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA5	0x224
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA6	0x228
++#define BCMA_GMAC_CMN_CFP_TCAM_DATA7	0x22C
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK0	0x230
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK1	0x234
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK2	0x238
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK3	0x23C
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK4	0x240
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK5	0x244
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK6	0x248
++#define BCMA_GMAC_CMN_CFP_TCAM_MASK7	0x24C
++#define BCMA_GMAC_CMN_CFP_ACTION_DATA	0x250
++#define BCMA_GMAC_CMN_TCAM_BIST_CTL	0x2A0
++#define BCMA_GMAC_CMN_TCAM_BIST_STATUS	0x2A4
++#define BCMA_GMAC_CMN_TCAM_CMP_STATUS	0x2A8
++#define BCMA_GMAC_CMN_TCAM_DISABLE	0x2AC
++#define BCMA_GMAC_CMN_TCAM_TEST_CTL	0x2F0
++#define BCMA_GMAC_CMN_UDF_0_A3_A0	0x300
++#define BCMA_GMAC_CMN_UDF_0_A7_A4	0x304
++#define BCMA_GMAC_CMN_UDF_0_A8		0x308
++#define BCMA_GMAC_CMN_UDF_1_A3_A0	0x310
++#define BCMA_GMAC_CMN_UDF_1_A7_A4	0x314
++#define BCMA_GMAC_CMN_UDF_1_A8		0x318
++#define BCMA_GMAC_CMN_UDF_2_A3_A0	0x320
++#define BCMA_GMAC_CMN_UDF_2_A7_A4	0x324
++#define BCMA_GMAC_CMN_UDF_2_A8		0x328
++#define BCMA_GMAC_CMN_UDF_0_B3_B0	0x330
++#define BCMA_GMAC_CMN_UDF_0_B7_B4	0x334
++#define BCMA_GMAC_CMN_UDF_0_B8		0x338
++#define BCMA_GMAC_CMN_UDF_1_B3_B0	0x340
++#define BCMA_GMAC_CMN_UDF_1_B7_B4	0x344
++#define BCMA_GMAC_CMN_UDF_1_B8		0x348
++#define BCMA_GMAC_CMN_UDF_2_B3_B0	0x350
++#define BCMA_GMAC_CMN_UDF_2_B7_B4	0x354
++#define BCMA_GMAC_CMN_UDF_2_B8		0x358
++#define BCMA_GMAC_CMN_UDF_0_C3_C0	0x360
++#define BCMA_GMAC_CMN_UDF_0_C7_C4	0x364
++#define BCMA_GMAC_CMN_UDF_0_C8		0x368
++#define BCMA_GMAC_CMN_UDF_1_C3_C0	0x370
++#define BCMA_GMAC_CMN_UDF_1_C7_C4	0x374
++#define BCMA_GMAC_CMN_UDF_1_C8		0x378
++#define BCMA_GMAC_CMN_UDF_2_C3_C0	0x380
++#define BCMA_GMAC_CMN_UDF_2_C7_C4	0x384
++#define BCMA_GMAC_CMN_UDF_2_C8		0x388
++#define BCMA_GMAC_CMN_UDF_0_D3_D0	0x390
++#define BCMA_GMAC_CMN_UDF_0_D7_D4	0x394
++#define BCMA_GMAC_CMN_UDF_0_D11_D8	0x394
++
++struct bcma_drv_gmac_cmn {
++	struct bcma_device *core;
++
++	/* Drivers accessing BCMA_GMAC_CMN_PHY_ACCESS and
++	 * BCMA_GMAC_CMN_PHY_CTL need to take that mutex first. */
++	struct mutex phy_mutex;
++};
++
++/* Register access */
++#define gmac_cmn_read16(gc, offset)		bcma_read16((gc)->core, offset)
++#define gmac_cmn_read32(gc, offset)		bcma_read32((gc)->core, offset)
++#define gmac_cmn_write16(gc, offset, val)	bcma_write16((gc)->core, offset, val)
++#define gmac_cmn_write32(gc, offset, val)	bcma_write32((gc)->core, offset, val)
++
++#ifdef CONFIG_BCMA_DRIVER_GMAC_CMN
++extern void __devinit bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc);
++#else
++static inline void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc) { }
++#endif
++
++#endif /* LINUX_BCMA_DRIVER_GMAC_CMN_H_ */
+--- a/include/linux/bcma/bcma_driver_mips.h
++++ b/include/linux/bcma/bcma_driver_mips.h
+@@ -28,6 +28,7 @@
+ #define BCMA_MIPS_MIPS74K_GPIOEN	0x0048
+ #define BCMA_MIPS_MIPS74K_CLKCTLST	0x01E0
+ 
++#define BCMA_MIPS_OOBSELINA74		0x004
+ #define BCMA_MIPS_OOBSELOUTA30		0x100
+ 
+ struct bcma_device;
+@@ -35,17 +36,24 @@ struct bcma_device;
+ struct bcma_drv_mips {
+ 	struct bcma_device *core;
+ 	u8 setup_done:1;
+-	unsigned int assigned_irqs;
++	u8 early_setup_done:1;
+ };
+ 
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+ extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
++extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);
++
++extern unsigned int bcma_core_irq(struct bcma_device *core);
+ #else
+ static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
++static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
++
++static inline unsigned int bcma_core_irq(struct bcma_device *core)
++{
++	return 0;
++}
+ #endif
+ 
+ extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
+ 
+-extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
+-
+ #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
+--- a/include/linux/bcma/bcma_driver_pci.h
++++ b/include/linux/bcma/bcma_driver_pci.h
+@@ -53,11 +53,47 @@ struct pci_dev;
+ #define  BCMA_CORE_PCI_SBTOPCI1_MASK		0xFC000000
+ #define BCMA_CORE_PCI_SBTOPCI2			0x0108	/* Backplane to PCI translation 2 (sbtopci2) */
+ #define  BCMA_CORE_PCI_SBTOPCI2_MASK		0xC0000000
++#define BCMA_CORE_PCI_CONFIG_ADDR		0x0120	/* pcie config space access */
++#define BCMA_CORE_PCI_CONFIG_DATA		0x0124	/* pcie config space access */
++#define BCMA_CORE_PCI_MDIO_CONTROL		0x0128	/* controls the mdio access */
++#define  BCMA_CORE_PCI_MDIOCTL_DIVISOR_MASK	0x7f	/* clock to be used on MDIO */
++#define  BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL	0x2
++#define  BCMA_CORE_PCI_MDIOCTL_PREAM_EN		0x80	/* Enable preamble sequnce */
++#define  BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE	0x100	/* Tranaction complete */
++#define BCMA_CORE_PCI_MDIO_DATA			0x012c	/* Data to the mdio access */
++#define  BCMA_CORE_PCI_MDIODATA_MASK		0x0000ffff /* data 2 bytes */
++#define  BCMA_CORE_PCI_MDIODATA_TA		0x00020000 /* Turnaround */
++#define  BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD	18	/* Regaddr shift (rev < 10) */
++#define  BCMA_CORE_PCI_MDIODATA_REGADDR_MASK_OLD	0x003c0000 /* Regaddr Mask (rev < 10) */
++#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD	22	/* Physmedia devaddr shift (rev < 10) */
++#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_MASK_OLD	0x0fc00000 /* Physmedia devaddr Mask (rev < 10) */
++#define  BCMA_CORE_PCI_MDIODATA_REGADDR_SHF	18	/* Regaddr shift */
++#define  BCMA_CORE_PCI_MDIODATA_REGADDR_MASK	0x007c0000 /* Regaddr Mask */
++#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF	23	/* Physmedia devaddr shift */
++#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_MASK	0x0f800000 /* Physmedia devaddr Mask */
++#define  BCMA_CORE_PCI_MDIODATA_WRITE		0x10000000 /* write Transaction */
++#define  BCMA_CORE_PCI_MDIODATA_READ		0x20000000 /* Read Transaction */
++#define  BCMA_CORE_PCI_MDIODATA_START		0x40000000 /* start of Transaction */
++#define  BCMA_CORE_PCI_MDIODATA_DEV_ADDR	0x0	/* dev address for serdes */
++#define  BCMA_CORE_PCI_MDIODATA_BLK_ADDR	0x1F	/* blk address for serdes */
++#define  BCMA_CORE_PCI_MDIODATA_DEV_PLL		0x1d	/* SERDES PLL Dev */
++#define  BCMA_CORE_PCI_MDIODATA_DEV_TX		0x1e	/* SERDES TX Dev */
++#define  BCMA_CORE_PCI_MDIODATA_DEV_RX		0x1f	/* SERDES RX Dev */
++#define BCMA_CORE_PCI_PCIEIND_ADDR		0x0130	/* indirect access to the internal register */
++#define BCMA_CORE_PCI_PCIEIND_DATA		0x0134	/* Data to/from the internal regsiter */
++#define BCMA_CORE_PCI_CLKREQENCTRL		0x0138	/*  >= rev 6, Clkreq rdma control */
+ #define BCMA_CORE_PCI_PCICFG0			0x0400	/* PCI config space 0 (rev >= 8) */
+ #define BCMA_CORE_PCI_PCICFG1			0x0500	/* PCI config space 1 (rev >= 8) */
+ #define BCMA_CORE_PCI_PCICFG2			0x0600	/* PCI config space 2 (rev >= 8) */
+ #define BCMA_CORE_PCI_PCICFG3			0x0700	/* PCI config space 3 (rev >= 8) */
+ #define BCMA_CORE_PCI_SPROM(wordoffset)		(0x0800 + ((wordoffset) * 2)) /* SPROM shadow area (72 bytes) */
++#define  BCMA_CORE_PCI_SPROM_PI_OFFSET		0	/* first word */
++#define   BCMA_CORE_PCI_SPROM_PI_MASK		0xf000	/* bit 15:12 */
++#define   BCMA_CORE_PCI_SPROM_PI_SHIFT		12	/* bit 15:12 */
++#define  BCMA_CORE_PCI_SPROM_MISC_CONFIG	5	/* word 5 */
++#define   BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST	0x8000	/* bit 15 */
++#define   BCMA_CORE_PCI_SPROM_CLKREQ_OFFSET_REV5	20	/* word 20 for srom rev <= 5 */
++#define   BCMA_CORE_PCI_SPROM_CLKREQ_ENB	0x0800	/* bit 11 */
+ 
+ /* SBtoPCIx */
+ #define BCMA_CORE_PCI_SBTOPCI_MEM		0x00000000
+@@ -72,20 +108,143 @@ struct pci_dev;
+ #define  BCMA_CORE_PCI_SBTOPCI_RC_READL		0x00000010 /* Memory read line */
+ #define  BCMA_CORE_PCI_SBTOPCI_RC_READM		0x00000020 /* Memory read multiple */
+ 
++/* PCIE protocol PHY diagnostic registers */
++#define BCMA_CORE_PCI_PLP_MODEREG		0x200	/* Mode */
++#define BCMA_CORE_PCI_PLP_STATUSREG		0x204	/* Status */
++#define  BCMA_CORE_PCI_PLP_POLARITYINV_STAT	0x10	/* Status reg PCIE_PLP_STATUSREG */
++#define BCMA_CORE_PCI_PLP_LTSSMCTRLREG		0x208	/* LTSSM control */
++#define BCMA_CORE_PCI_PLP_LTLINKNUMREG		0x20c	/* Link Training Link number */
++#define BCMA_CORE_PCI_PLP_LTLANENUMREG		0x210	/* Link Training Lane number */
++#define BCMA_CORE_PCI_PLP_LTNFTSREG		0x214	/* Link Training N_FTS */
++#define BCMA_CORE_PCI_PLP_ATTNREG		0x218	/* Attention */
++#define BCMA_CORE_PCI_PLP_ATTNMASKREG		0x21C	/* Attention Mask */
++#define BCMA_CORE_PCI_PLP_RXERRCTR		0x220	/* Rx Error */
++#define BCMA_CORE_PCI_PLP_RXFRMERRCTR		0x224	/* Rx Framing Error */
++#define BCMA_CORE_PCI_PLP_RXERRTHRESHREG	0x228	/* Rx Error threshold */
++#define BCMA_CORE_PCI_PLP_TESTCTRLREG		0x22C	/* Test Control reg */
++#define BCMA_CORE_PCI_PLP_SERDESCTRLOVRDREG	0x230	/* SERDES Control Override */
++#define BCMA_CORE_PCI_PLP_TIMINGOVRDREG		0x234	/* Timing param override */
++#define BCMA_CORE_PCI_PLP_RXTXSMDIAGREG		0x238	/* RXTX State Machine Diag */
++#define BCMA_CORE_PCI_PLP_LTSSMDIAGREG		0x23C	/* LTSSM State Machine Diag */
++
++/* PCIE protocol DLLP diagnostic registers */
++#define BCMA_CORE_PCI_DLLP_LCREG		0x100	/* Link Control */
++#define BCMA_CORE_PCI_DLLP_LSREG		0x104	/* Link Status */
++#define BCMA_CORE_PCI_DLLP_LAREG		0x108	/* Link Attention */
++#define  BCMA_CORE_PCI_DLLP_LSREG_LINKUP	(1 << 16)
++#define BCMA_CORE_PCI_DLLP_LAMASKREG		0x10C	/* Link Attention Mask */
++#define BCMA_CORE_PCI_DLLP_NEXTTXSEQNUMREG	0x110	/* Next Tx Seq Num */
++#define BCMA_CORE_PCI_DLLP_ACKEDTXSEQNUMREG	0x114	/* Acked Tx Seq Num */
++#define BCMA_CORE_PCI_DLLP_PURGEDTXSEQNUMREG	0x118	/* Purged Tx Seq Num */
++#define BCMA_CORE_PCI_DLLP_RXSEQNUMREG		0x11C	/* Rx Sequence Number */
++#define BCMA_CORE_PCI_DLLP_LRREG		0x120	/* Link Replay */
++#define BCMA_CORE_PCI_DLLP_LACKTOREG		0x124	/* Link Ack Timeout */
++#define BCMA_CORE_PCI_DLLP_PMTHRESHREG		0x128	/* Power Management Threshold */
++#define  BCMA_CORE_PCI_ASPMTIMER_EXTEND		0x01000000 /* > rev7: enable extend ASPM timer */
++#define BCMA_CORE_PCI_DLLP_RTRYWPREG		0x12C	/* Retry buffer write ptr */
++#define BCMA_CORE_PCI_DLLP_RTRYRPREG		0x130	/* Retry buffer Read ptr */
++#define BCMA_CORE_PCI_DLLP_RTRYPPREG		0x134	/* Retry buffer Purged ptr */
++#define BCMA_CORE_PCI_DLLP_RTRRWREG		0x138	/* Retry buffer Read/Write */
++#define BCMA_CORE_PCI_DLLP_ECTHRESHREG		0x13C	/* Error Count Threshold */
++#define BCMA_CORE_PCI_DLLP_TLPERRCTRREG		0x140	/* TLP Error Counter */
++#define BCMA_CORE_PCI_DLLP_ERRCTRREG		0x144	/* Error Counter */
++#define BCMA_CORE_PCI_DLLP_NAKRXCTRREG		0x148	/* NAK Received Counter */
++#define BCMA_CORE_PCI_DLLP_TESTREG		0x14C	/* Test */
++#define BCMA_CORE_PCI_DLLP_PKTBIST		0x150	/* Packet BIST */
++#define BCMA_CORE_PCI_DLLP_PCIE11		0x154	/* DLLP PCIE 1.1 reg */
++
++/* SERDES RX registers */
++#define BCMA_CORE_PCI_SERDES_RX_CTRL		1	/* Rx cntrl */
++#define  BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE	0x80	/* rxpolarity_force */
++#define  BCMA_CORE_PCI_SERDES_RX_CTRL_POLARITY	0x40	/* rxpolarity_value */
++#define BCMA_CORE_PCI_SERDES_RX_TIMER1		2	/* Rx Timer1 */
++#define BCMA_CORE_PCI_SERDES_RX_CDR		6	/* CDR */
++#define BCMA_CORE_PCI_SERDES_RX_CDRBW		7	/* CDR BW */
++
++/* SERDES PLL registers */
++#define BCMA_CORE_PCI_SERDES_PLL_CTRL		1	/* PLL control reg */
++#define BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN	0x4000	/* bit 14 is FREQDET on */
++
+ /* PCIcore specific boardflags */
+ #define BCMA_CORE_PCI_BFL_NOPCI			0x00000400 /* Board leaves PCI floating */
+ 
++/* PCIE Config space accessing MACROS */
++#define BCMA_CORE_PCI_CFG_BUS_SHIFT		24	/* Bus shift */
++#define BCMA_CORE_PCI_CFG_SLOT_SHIFT		19	/* Slot/Device shift */
++#define BCMA_CORE_PCI_CFG_FUN_SHIFT		16	/* Function shift */
++#define BCMA_CORE_PCI_CFG_OFF_SHIFT		0	/* Register shift */
++
++#define BCMA_CORE_PCI_CFG_BUS_MASK		0xff	/* Bus mask */
++#define BCMA_CORE_PCI_CFG_SLOT_MASK		0x1f	/* Slot/Device mask */
++#define BCMA_CORE_PCI_CFG_FUN_MASK		7	/* Function mask */
++#define BCMA_CORE_PCI_CFG_OFF_MASK		0xfff	/* Register mask */
++
++#define BCMA_CORE_PCI_CFG_DEVCTRL		0xd8
++
++#define BCMA_CORE_PCI_
++
++/* MDIO devices (SERDES modules) */
++#define BCMA_CORE_PCI_MDIO_IEEE0		0x000
++#define BCMA_CORE_PCI_MDIO_IEEE1		0x001
++#define BCMA_CORE_PCI_MDIO_BLK0			0x800
++#define BCMA_CORE_PCI_MDIO_BLK1			0x801
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT0		0x16
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT1		0x17
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT2		0x18
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT3		0x19
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT4		0x1A
++#define BCMA_CORE_PCI_MDIO_BLK2			0x802
++#define BCMA_CORE_PCI_MDIO_BLK3			0x803
++#define BCMA_CORE_PCI_MDIO_BLK4			0x804
++#define BCMA_CORE_PCI_MDIO_TXPLL		0x808	/* TXPLL register block idx */
++#define BCMA_CORE_PCI_MDIO_TXCTRL0		0x820
++#define BCMA_CORE_PCI_MDIO_SERDESID		0x831
++#define BCMA_CORE_PCI_MDIO_RXCTRL0		0x840
++
++/* PCIE Root Capability Register bits (Host mode only) */
++#define BCMA_CORE_PCI_RC_CRS_VISIBILITY		0x0001
++
++struct bcma_drv_pci;
++struct bcma_bus;
++
++#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
++struct bcma_drv_pci_host {
++	struct bcma_drv_pci *pdev;
++
++	u32 host_cfg_addr;
++	spinlock_t cfgspace_lock;
++
++	struct pci_controller pci_controller;
++	struct pci_ops pci_ops;
++	struct resource mem_resource;
++	struct resource io_resource;
++};
++#endif
++
+ struct bcma_drv_pci {
+ 	struct bcma_device *core;
+ 	u8 setup_done:1;
++	u8 hostmode:1;
++
++#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
++	struct bcma_drv_pci_host *host_controller;
++#endif
+ };
+ 
+ /* Register access */
++#define pcicore_read16(pc, offset)		bcma_read16((pc)->core, offset)
+ #define pcicore_read32(pc, offset)		bcma_read32((pc)->core, offset)
++#define pcicore_write16(pc, offset, val)	bcma_write16((pc)->core, offset, val)
+ #define pcicore_write32(pc, offset, val)	bcma_write32((pc)->core, offset, val)
+ 
+-extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
++extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc);
+ extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
+ 				 struct bcma_device *core, bool enable);
++extern void bcma_core_pci_up(struct bcma_bus *bus);
++extern void bcma_core_pci_down(struct bcma_bus *bus);
++extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up);
++
++extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
++extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
+ 
+ #endif /* LINUX_BCMA_DRIVER_PCI_H_ */
+--- a/include/linux/bcma/bcma_regs.h
++++ b/include/linux/bcma/bcma_regs.h
+@@ -11,11 +11,13 @@
+ #define  BCMA_CLKCTLST_HAVEHTREQ	0x00000010 /* HT available request */
+ #define  BCMA_CLKCTLST_HWCROFF		0x00000020 /* Force HW clock request off */
+ #define  BCMA_CLKCTLST_EXTRESREQ	0x00000700 /* Mask of external resource requests */
++#define  BCMA_CLKCTLST_EXTRESREQ_SHIFT	8
+ #define  BCMA_CLKCTLST_HAVEALP		0x00010000 /* ALP available */
+ #define  BCMA_CLKCTLST_HAVEHT		0x00020000 /* HT available */
+ #define  BCMA_CLKCTLST_BP_ON_ALP	0x00040000 /* RO: running on ALP clock */
+ #define  BCMA_CLKCTLST_BP_ON_HT		0x00080000 /* RO: running on HT clock */
+ #define  BCMA_CLKCTLST_EXTRESST		0x07000000 /* Mask of external resource status */
++#define  BCMA_CLKCTLST_EXTRESST_SHIFT	24
+ /* Is there any BCM4328 on BCMA bus? */
+ #define  BCMA_CLKCTLST_4328A0_HAVEHT	0x00010000 /* 4328a0 has reversed bits */
+ #define  BCMA_CLKCTLST_4328A0_HAVEALP	0x00020000 /* 4328a0 has reversed bits */
+@@ -35,6 +37,7 @@
+ #define  BCMA_IOST_BIST_DONE		0x8000
+ #define BCMA_RESET_CTL			0x0800
+ #define  BCMA_RESET_CTL_RESET		0x0001
++#define BCMA_RESET_ST			0x0804
+ 
+ /* BCMA PCI config space registers. */
+ #define BCMA_PCI_PMCSR			0x44
+@@ -56,4 +59,36 @@
+ #define  BCMA_PCI_GPIO_XTAL		0x40	/* PCI config space GPIO 14 for Xtal powerup */
+ #define  BCMA_PCI_GPIO_PLL		0x80	/* PCI config space GPIO 15 for PLL powerdown */
+ 
++/* SiliconBackplane Address Map.
++ * All regions may not exist on all chips.
++ */
++#define BCMA_SOC_SDRAM_BASE		0x00000000U	/* Physical SDRAM */
++#define BCMA_SOC_PCI_MEM		0x08000000U	/* Host Mode sb2pcitranslation0 (64 MB) */
++#define BCMA_SOC_PCI_MEM_SZ		(64 * 1024 * 1024)
++#define BCMA_SOC_PCI_CFG		0x0c000000U	/* Host Mode sb2pcitranslation1 (64 MB) */
++#define BCMA_SOC_SDRAM_SWAPPED		0x10000000U	/* Byteswapped Physical SDRAM */
++#define BCMA_SOC_SDRAM_R2		0x80000000U	/* Region 2 for sdram (512 MB) */
++
++
++#define BCMA_SOC_PCI_DMA		0x40000000U	/* Client Mode sb2pcitranslation2 (1 GB) */
++#define BCMA_SOC_PCI_DMA2		0x80000000U	/* Client Mode sb2pcitranslation2 (1 GB) */
++#define BCMA_SOC_PCI_DMA_SZ		0x40000000U	/* Client Mode sb2pcitranslation2 size in bytes */
++#define BCMA_SOC_PCIE_DMA_L32		0x00000000U	/* PCIE Client Mode sb2pcitranslation2
++							 * (2 ZettaBytes), low 32 bits
++							 */
++#define BCMA_SOC_PCIE_DMA_H32		0x80000000U	/* PCIE Client Mode sb2pcitranslation2
++							 * (2 ZettaBytes), high 32 bits
++							 */
++
++#define BCMA_SOC_PCI1_MEM		0x40000000U	/* Host Mode sb2pcitranslation0 (64 MB) */
++#define BCMA_SOC_PCI1_CFG		0x44000000U	/* Host Mode sb2pcitranslation1 (64 MB) */
++#define BCMA_SOC_PCIE1_DMA_H32		0xc0000000U	/* PCIE Client Mode sb2pcitranslation2
++							 * (2 ZettaBytes), high 32 bits
++							 */
++
++#define BCMA_SOC_FLASH1			0x1fc00000	/* MIPS Flash Region 1 */
++#define BCMA_SOC_FLASH1_SZ		0x00400000	/* MIPS Size of Flash Region 1 */
++#define BCMA_SOC_FLASH2			0x1c000000	/* Flash Region 2 (region 1 shadowed here) */
++#define BCMA_SOC_FLASH2_SZ		0x02000000	/* Size of Flash Region 2 */
++
+ #endif /* LINUX_BCMA_REGS_H_ */
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -4618,7 +4618,7 @@ static int b43_wireless_core_init(struct
+ 	switch (dev->dev->bus_type) {
+ #ifdef CONFIG_B43_BCMA
+ 	case B43_BUS_BCMA:
+-		bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci,
++		bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],
+ 				      dev->dev->bdev, true);
+ 		break;
+ #endif
+--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+@@ -533,7 +533,7 @@ ai_buscore_setup(struct si_info *sii, st
+ 
+ 	/* fixup necessary chip/core configurations */
+ 	if (!sii->pch) {
+-		sii->pch = pcicore_init(&sii->pub, sii->icbus->drv_pci.core);
++		sii->pch = pcicore_init(&sii->pub, sii->icbus->drv_pci[0].core);
+ 		if (sii->pch == NULL)
+ 			return false;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.3/040-Controlled-Delay-AQM.patch b/trunk/target/linux/generic/patches-3.3/040-Controlled-Delay-AQM.patch
new file mode 100644
index 00000000..85f563b9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/040-Controlled-Delay-AQM.patch
@@ -0,0 +1,757 @@
+From a93fd80d261f1dc2788442dba8dd5701363d3d6e Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Thu, 10 May 2012 07:51:25 +0000
+Subject: [PATCH] codel: Controlled Delay AQM
+
+commit 76e3cc126bb223013a6b9a0e2a51238d1ef2e409 upstream.
+
+An implementation of CoDel AQM, from Kathleen Nichols and Van Jacobson.
+
+http://queue.acm.org/detail.cfm?id=2209336
+
+This AQM main input is no longer queue size in bytes or packets, but the
+delay packets stay in (FIFO) queue.
+
+As we don't have infinite memory, we still can drop packets in enqueue()
+in case of massive load, but mean of CoDel is to drop packets in
+dequeue(), using a control law based on two simple parameters :
+
+target : target sojourn time (default 5ms)
+interval : width of moving time window (default 100ms)
+
+Based on initial work from Dave Taht.
+
+Refactored to help future codel inclusion as a plugin for other linux
+qdisc (FQ_CODEL, ...), like RED.
+
+include/net/codel.h contains codel algorithm as close as possible than
+Kathleen reference.
+
+net/sched/sch_codel.c contains the linux qdisc specific glue.
+
+Separate structures permit a memory efficient implementation of fq_codel
+(to be sent as a separate work) : Each flow has its own struct
+codel_vars.
+
+timestamps are taken at enqueue() time with 1024 ns precision, allowing
+a range of 2199 seconds in queue, and 100Gb links support. iproute2 uses
+usec as base unit.
+
+Selected packets are dropped, unless ECN is enabled and packets can get
+ECN mark instead.
+
+Tested from 2Mb to 10Gb speeds with no particular problems, on ixgbe and
+tg3 drivers (BQL enabled).
+
+Usage: tc qdisc ... codel [ limit PACKETS ] [ target TIME ]
+                          [ interval TIME ] [ ecn ]
+
+qdisc codel 10: parent 1:1 limit 2000p target 3.0ms interval 60.0ms ecn
+ Sent 13347099587 bytes 8815805 pkt (dropped 0, overlimits 0 requeues 0)
+ rate 202365Kbit 16708pps backlog 113550b 75p requeues 0
+  count 116 lastcount 98 ldelay 4.3ms dropping drop_next 816us
+  maxpacket 1514 ecn_mark 84399 drop_overlimit 0
+
+CoDel must be seen as a base module, and should be used keeping in mind
+there is still a FIFO queue. So a typical setup will probably need a
+hierarchy of several qdiscs and packet classifiers to be able to meet
+whatever constraints a user might have.
+
+One possible example would be to use fq_codel, which combines Fair
+Queueing and CoDel, in replacement of sfq / sfq_red.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: Dave Taht <dave.taht@bufferbloat.net>
+Cc: Kathleen Nichols <nichols@pollere.com>
+Cc: Van Jacobson <van@pollere.net>
+Cc: Tom Herbert <therbert@google.com>
+Cc: Matt Mathis <mattmathis@google.com>
+Cc: Yuchung Cheng <ycheng@google.com>
+Cc: Stephen Hemminger <shemminger@vyatta.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/linux/pkt_sched.h |   26 ++++
+ include/net/codel.h       |  332 +++++++++++++++++++++++++++++++++++++++++++++
+ net/sched/Kconfig         |   11 ++
+ net/sched/Makefile        |    1 +
+ net/sched/sch_codel.c     |  275 +++++++++++++++++++++++++++++++++++++
+ 5 files changed, 645 insertions(+)
+ create mode 100644 include/net/codel.h
+ create mode 100644 net/sched/sch_codel.c
+
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
+@@ -633,4 +633,30 @@ struct tc_qfq_stats {
+ 	__u32 lmax;
+ };
+ 
++/* CODEL */
++
++enum {
++	TCA_CODEL_UNSPEC,
++	TCA_CODEL_TARGET,
++	TCA_CODEL_LIMIT,
++	TCA_CODEL_INTERVAL,
++	TCA_CODEL_ECN,
++	__TCA_CODEL_MAX
++};
++
++#define TCA_CODEL_MAX	(__TCA_CODEL_MAX - 1)
++
++struct tc_codel_xstats {
++	__u32	maxpacket; /* largest packet we've seen so far */
++	__u32	count;	   /* how many drops we've done since the last time we
++			    * entered dropping state
++			    */
++	__u32	lastcount; /* count at entry to dropping state */
++	__u32	ldelay;    /* in-queue delay seen by most recently dequeued packet */
++	__s32	drop_next; /* time to drop next packet */
++	__u32	drop_overlimit; /* number of time max qdisc packet limit was hit */
++	__u32	ecn_mark;  /* number of packets we ECN marked instead of dropped */
++	__u32	dropping;  /* are we in dropping state ? */
++};
++
+ #endif
+--- /dev/null
++++ b/include/net/codel.h
+@@ -0,0 +1,332 @@
++#ifndef __NET_SCHED_CODEL_H
++#define __NET_SCHED_CODEL_H
++
++/*
++ * Codel - The Controlled-Delay Active Queue Management algorithm
++ *
++ *  Copyright (C) 2011-2012 Kathleen Nichols <nichols@pollere.com>
++ *  Copyright (C) 2011-2012 Van Jacobson <van@pollere.net>
++ *  Copyright (C) 2012 Michael D. Taht <dave.taht@bufferbloat.net>
++ *  Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the authors may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * Alternatively, provided that this notice is retained in full, this
++ * software may be distributed under the terms of the GNU General
++ * Public License ("GPL") version 2, in which case the provisions of the
++ * GPL apply INSTEAD OF those given above.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ * DAMAGE.
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/ktime.h>
++#include <linux/skbuff.h>
++#include <net/pkt_sched.h>
++#include <net/inet_ecn.h>
++
++/* Controlling Queue Delay (CoDel) algorithm
++ * =========================================
++ * Source : Kathleen Nichols and Van Jacobson
++ * http://queue.acm.org/detail.cfm?id=2209336
++ *
++ * Implemented on linux by Dave Taht and Eric Dumazet
++ */
++
++
++/* CoDel uses a 1024 nsec clock, encoded in u32
++ * This gives a range of 2199 seconds, because of signed compares
++ */
++typedef u32 codel_time_t;
++typedef s32 codel_tdiff_t;
++#define CODEL_SHIFT 10
++#define MS2TIME(a) ((a * NSEC_PER_MSEC) >> CODEL_SHIFT)
++
++static inline codel_time_t codel_get_time(void)
++{
++	u64 ns = ktime_to_ns(ktime_get());
++
++	return ns >> CODEL_SHIFT;
++}
++
++#define codel_time_after(a, b)		((s32)(a) - (s32)(b) > 0)
++#define codel_time_after_eq(a, b)	((s32)(a) - (s32)(b) >= 0)
++#define codel_time_before(a, b)		((s32)(a) - (s32)(b) < 0)
++#define codel_time_before_eq(a, b)	((s32)(a) - (s32)(b) <= 0)
++
++/* Qdiscs using codel plugin must use codel_skb_cb in their own cb[] */
++struct codel_skb_cb {
++	codel_time_t enqueue_time;
++};
++
++static struct codel_skb_cb *get_codel_cb(const struct sk_buff *skb)
++{
++	qdisc_cb_private_validate(skb, sizeof(struct codel_skb_cb));
++	return (struct codel_skb_cb *)qdisc_skb_cb(skb)->data;
++}
++
++static codel_time_t codel_get_enqueue_time(const struct sk_buff *skb)
++{
++	return get_codel_cb(skb)->enqueue_time;
++}
++
++static void codel_set_enqueue_time(struct sk_buff *skb)
++{
++	get_codel_cb(skb)->enqueue_time = codel_get_time();
++}
++
++static inline u32 codel_time_to_us(codel_time_t val)
++{
++	u64 valns = ((u64)val << CODEL_SHIFT);
++
++	do_div(valns, NSEC_PER_USEC);
++	return (u32)valns;
++}
++
++/**
++ * struct codel_params - contains codel parameters
++ * @target:	target queue size (in time units)
++ * @interval:	width of moving time window
++ * @ecn:	is Explicit Congestion Notification enabled
++ */
++struct codel_params {
++	codel_time_t	target;
++	codel_time_t	interval;
++	bool		ecn;
++};
++
++/**
++ * struct codel_vars - contains codel variables
++ * @count:		how many drops we've done since the last time we
++ *			entered dropping state
++ * @lastcount:		count at entry to dropping state
++ * @dropping:		set to true if in dropping state
++ * @first_above_time:	when we went (or will go) continuously above target
++ *			for interval
++ * @drop_next:		time to drop next packet, or when we dropped last
++ * @ldelay:		sojourn time of last dequeued packet
++ */
++struct codel_vars {
++	u32		count;
++	u32		lastcount;
++	bool		dropping;
++	codel_time_t	first_above_time;
++	codel_time_t	drop_next;
++	codel_time_t	ldelay;
++};
++
++/**
++ * struct codel_stats - contains codel shared variables and stats
++ * @maxpacket:	largest packet we've seen so far
++ * @drop_count:	temp count of dropped packets in dequeue()
++ * ecn_mark:	number of packets we ECN marked instead of dropping
++ */
++struct codel_stats {
++	u32		maxpacket;
++	u32		drop_count;
++	u32		ecn_mark;
++};
++
++static void codel_params_init(struct codel_params *params)
++{
++	params->interval = MS2TIME(100);
++	params->target = MS2TIME(5);
++	params->ecn = false;
++}
++
++static void codel_vars_init(struct codel_vars *vars)
++{
++	vars->drop_next = 0;
++	vars->first_above_time = 0;
++	vars->dropping = false; /* exit dropping state */
++	vars->count = 0;
++	vars->lastcount = 0;
++}
++
++static void codel_stats_init(struct codel_stats *stats)
++{
++	stats->maxpacket = 256;
++}
++
++/* return interval/sqrt(x) with good precision
++ * relies on int_sqrt(unsigned long x) kernel implementation
++ */
++static u32 codel_inv_sqrt(u32 _interval, u32 _x)
++{
++	u64 interval = _interval;
++	unsigned long x = _x;
++
++	/* Scale operands for max precision */
++
++#if BITS_PER_LONG == 64
++	x <<= 32; /* On 64bit arches, we can prescale x by 32bits */
++	interval <<= 16;
++#endif
++
++	while (x < (1UL << (BITS_PER_LONG - 2))) {
++		x <<= 2;
++		interval <<= 1;
++	}
++	do_div(interval, int_sqrt(x));
++	return (u32)interval;
++}
++
++static codel_time_t codel_control_law(codel_time_t t,
++				      codel_time_t interval,
++				      u32 count)
++{
++	return t + codel_inv_sqrt(interval, count);
++}
++
++
++static bool codel_should_drop(struct sk_buff *skb,
++			      unsigned int *backlog,
++			      struct codel_vars *vars,
++			      struct codel_params *params,
++			      struct codel_stats *stats,
++			      codel_time_t now)
++{
++	bool ok_to_drop;
++
++	if (!skb) {
++		vars->first_above_time = 0;
++		return false;
++	}
++
++	vars->ldelay = now - codel_get_enqueue_time(skb);
++	*backlog -= qdisc_pkt_len(skb);
++
++	if (unlikely(qdisc_pkt_len(skb) > stats->maxpacket))
++		stats->maxpacket = qdisc_pkt_len(skb);
++
++	if (codel_time_before(vars->ldelay, params->target) ||
++	    *backlog <= stats->maxpacket) {
++		/* went below - stay below for at least interval */
++		vars->first_above_time = 0;
++		return false;
++	}
++	ok_to_drop = false;
++	if (vars->first_above_time == 0) {
++		/* just went above from below. If we stay above
++		 * for at least interval we'll say it's ok to drop
++		 */
++		vars->first_above_time = now + params->interval;
++	} else if (codel_time_after(now, vars->first_above_time)) {
++		ok_to_drop = true;
++	}
++	return ok_to_drop;
++}
++
++typedef struct sk_buff * (*codel_skb_dequeue_t)(struct codel_vars *vars,
++						struct Qdisc *sch);
++
++static struct sk_buff *codel_dequeue(struct Qdisc *sch,
++				     struct codel_params *params,
++				     struct codel_vars *vars,
++				     struct codel_stats *stats,
++				     codel_skb_dequeue_t dequeue_func,
++				     u32 *backlog)
++{
++	struct sk_buff *skb = dequeue_func(vars, sch);
++	codel_time_t now;
++	bool drop;
++
++	if (!skb) {
++		vars->dropping = false;
++		return skb;
++	}
++	now = codel_get_time();
++	drop = codel_should_drop(skb, backlog, vars, params, stats, now);
++	if (vars->dropping) {
++		if (!drop) {
++			/* sojourn time below target - leave dropping state */
++			vars->dropping = false;
++		} else if (codel_time_after_eq(now, vars->drop_next)) {
++			/* It's time for the next drop. Drop the current
++			 * packet and dequeue the next. The dequeue might
++			 * take us out of dropping state.
++			 * If not, schedule the next drop.
++			 * A large backlog might result in drop rates so high
++			 * that the next drop should happen now,
++			 * hence the while loop.
++			 */
++			while (vars->dropping &&
++			       codel_time_after_eq(now, vars->drop_next)) {
++				if (++vars->count == 0) /* avoid zero divides */
++					vars->count = ~0U;
++				if (params->ecn && INET_ECN_set_ce(skb)) {
++					stats->ecn_mark++;
++					vars->drop_next =
++						codel_control_law(vars->drop_next,
++								  params->interval,
++								  vars->count);
++					goto end;
++				}
++				qdisc_drop(skb, sch);
++				stats->drop_count++;
++				skb = dequeue_func(vars, sch);
++				if (!codel_should_drop(skb, backlog,
++						       vars, params, stats, now)) {
++					/* leave dropping state */
++					vars->dropping = false;
++				} else {
++					/* and schedule the next drop */
++					vars->drop_next =
++						codel_control_law(vars->drop_next,
++								  params->interval,
++								  vars->count);
++				}
++			}
++		}
++	} else if (drop) {
++		if (params->ecn && INET_ECN_set_ce(skb)) {
++			stats->ecn_mark++;
++		} else {
++			qdisc_drop(skb, sch);
++			stats->drop_count++;
++
++			skb = dequeue_func(vars, sch);
++			drop = codel_should_drop(skb, backlog, vars, params,
++						 stats, now);
++		}
++		vars->dropping = true;
++		/* if min went above target close to when we last went below it
++		 * assume that the drop rate that controlled the queue on the
++		 * last cycle is a good starting point to control it now.
++		 */
++		if (codel_time_before(now - vars->drop_next,
++				      16 * params->interval)) {
++			vars->count = (vars->count - vars->lastcount) | 1;
++		} else {
++			vars->count = 1;
++		}
++		vars->lastcount = vars->count;
++		vars->drop_next = codel_control_law(now, params->interval,
++						    vars->count);
++	}
++end:
++	return skb;
++}
++#endif
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -250,6 +250,17 @@ config NET_SCH_QFQ
+ 
+ 	  If unsure, say N.
+ 
++config NET_SCH_CODEL
++	tristate "Controlled Delay AQM (CODEL)"
++	help
++	  Say Y here if you want to use the Controlled Delay (CODEL)
++	  packet scheduling algorithm.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called sch_codel.
++
++	  If unsure, say N.
++
+ config NET_SCH_INGRESS
+ 	tristate "Ingress Qdisc"
+ 	depends on NET_CLS_ACT
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -36,6 +36,7 @@ obj-$(CONFIG_NET_SCH_DRR)	+= sch_drr.o
+ obj-$(CONFIG_NET_SCH_MQPRIO)	+= sch_mqprio.o
+ obj-$(CONFIG_NET_SCH_CHOKE)	+= sch_choke.o
+ obj-$(CONFIG_NET_SCH_QFQ)	+= sch_qfq.o
++obj-$(CONFIG_NET_SCH_CODEL)	+= sch_codel.o
+ 
+ obj-$(CONFIG_NET_CLS_U32)	+= cls_u32.o
+ obj-$(CONFIG_NET_CLS_ROUTE4)	+= cls_route.o
+--- /dev/null
++++ b/net/sched/sch_codel.c
+@@ -0,0 +1,275 @@
++/*
++ * Codel - The Controlled-Delay Active Queue Management algorithm
++ *
++ *  Copyright (C) 2011-2012 Kathleen Nichols <nichols@pollere.com>
++ *  Copyright (C) 2011-2012 Van Jacobson <van@pollere.net>
++ *
++ *  Implemented on linux by :
++ *  Copyright (C) 2012 Michael D. Taht <dave.taht@bufferbloat.net>
++ *  Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The names of the authors may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * Alternatively, provided that this notice is retained in full, this
++ * software may be distributed under the terms of the GNU General
++ * Public License ("GPL") version 2, in which case the provisions of the
++ * GPL apply INSTEAD OF those given above.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ * DAMAGE.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/skbuff.h>
++#include <net/pkt_sched.h>
++#include <net/codel.h>
++
++
++#define DEFAULT_CODEL_LIMIT 1000
++
++struct codel_sched_data {
++	struct codel_params	params;
++	struct codel_vars	vars;
++	struct codel_stats	stats;
++	u32			drop_overlimit;
++};
++
++/* This is the specific function called from codel_dequeue()
++ * to dequeue a packet from queue. Note: backlog is handled in
++ * codel, we dont need to reduce it here.
++ */
++static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch)
++{
++	struct sk_buff *skb = __skb_dequeue(&sch->q);
++
++	prefetch(&skb->end); /* we'll need skb_shinfo() */
++	return skb;
++}
++
++static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch)
++{
++	struct codel_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++
++	skb = codel_dequeue(sch, &q->params, &q->vars, &q->stats,
++			    dequeue, &sch->qstats.backlog);
++	/* We cant call qdisc_tree_decrease_qlen() if our qlen is 0,
++	 * or HTB crashes. Defer it for next round.
++	 */
++	if (q->stats.drop_count && sch->q.qlen) {
++		qdisc_tree_decrease_qlen(sch, q->stats.drop_count);
++		q->stats.drop_count = 0;
++	}
++	if (skb)
++		qdisc_bstats_update(sch, skb);
++	return skb;
++}
++
++static int codel_qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
++{
++	struct codel_sched_data *q;
++
++	if (likely(qdisc_qlen(sch) < sch->limit)) {
++		codel_set_enqueue_time(skb);
++		return qdisc_enqueue_tail(skb, sch);
++	}
++	q = qdisc_priv(sch);
++	q->drop_overlimit++;
++	return qdisc_drop(skb, sch);
++}
++
++static const struct nla_policy codel_policy[TCA_CODEL_MAX + 1] = {
++	[TCA_CODEL_TARGET]	= { .type = NLA_U32 },
++	[TCA_CODEL_LIMIT]	= { .type = NLA_U32 },
++	[TCA_CODEL_INTERVAL]	= { .type = NLA_U32 },
++	[TCA_CODEL_ECN]		= { .type = NLA_U32 },
++};
++
++static int codel_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct codel_sched_data *q = qdisc_priv(sch);
++	struct nlattr *tb[TCA_CODEL_MAX + 1];
++	unsigned int qlen;
++	int err;
++
++	if (!opt)
++		return -EINVAL;
++
++	err = nla_parse_nested(tb, TCA_CODEL_MAX, opt, codel_policy);
++	if (err < 0)
++		return err;
++
++	sch_tree_lock(sch);
++
++	if (tb[TCA_CODEL_TARGET]) {
++		u32 target = nla_get_u32(tb[TCA_CODEL_TARGET]);
++
++		q->params.target = ((u64)target * NSEC_PER_USEC) >> CODEL_SHIFT;
++	}
++
++	if (tb[TCA_CODEL_INTERVAL]) {
++		u32 interval = nla_get_u32(tb[TCA_CODEL_INTERVAL]);
++
++		q->params.interval = ((u64)interval * NSEC_PER_USEC) >> CODEL_SHIFT;
++	}
++
++	if (tb[TCA_CODEL_LIMIT])
++		sch->limit = nla_get_u32(tb[TCA_CODEL_LIMIT]);
++
++	if (tb[TCA_CODEL_ECN])
++		q->params.ecn = !!nla_get_u32(tb[TCA_CODEL_ECN]);
++
++	qlen = sch->q.qlen;
++	while (sch->q.qlen > sch->limit) {
++		struct sk_buff *skb = __skb_dequeue(&sch->q);
++
++		sch->qstats.backlog -= qdisc_pkt_len(skb);
++		qdisc_drop(skb, sch);
++	}
++	qdisc_tree_decrease_qlen(sch, qlen - sch->q.qlen);
++
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static int codel_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct codel_sched_data *q = qdisc_priv(sch);
++
++	sch->limit = DEFAULT_CODEL_LIMIT;
++
++	codel_params_init(&q->params);
++	codel_vars_init(&q->vars);
++	codel_stats_init(&q->stats);
++
++	if (opt) {
++		int err = codel_change(sch, opt);
++
++		if (err)
++			return err;
++	}
++
++	if (sch->limit >= 1)
++		sch->flags |= TCQ_F_CAN_BYPASS;
++	else
++		sch->flags &= ~TCQ_F_CAN_BYPASS;
++
++	return 0;
++}
++
++static int codel_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct codel_sched_data *q = qdisc_priv(sch);
++	struct nlattr *opts;
++
++	opts = nla_nest_start(skb, TCA_OPTIONS);
++	if (opts == NULL)
++		goto nla_put_failure;
++
++	if (nla_put_u32(skb, TCA_CODEL_TARGET,
++			codel_time_to_us(q->params.target)) ||
++	    nla_put_u32(skb, TCA_CODEL_LIMIT,
++			sch->limit) ||
++	    nla_put_u32(skb, TCA_CODEL_INTERVAL,
++			codel_time_to_us(q->params.interval)) ||
++	    nla_put_u32(skb, TCA_CODEL_ECN,
++			q->params.ecn))
++		goto nla_put_failure;
++
++	return nla_nest_end(skb, opts);
++
++nla_put_failure:
++	nla_nest_cancel(skb, opts);
++	return -1;
++}
++
++static int codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
++{
++	const struct codel_sched_data *q = qdisc_priv(sch);
++	struct tc_codel_xstats st = {
++		.maxpacket	= q->stats.maxpacket,
++		.count		= q->vars.count,
++		.lastcount	= q->vars.lastcount,
++		.drop_overlimit = q->drop_overlimit,
++		.ldelay		= codel_time_to_us(q->vars.ldelay),
++		.dropping	= q->vars.dropping,
++		.ecn_mark	= q->stats.ecn_mark,
++	};
++
++	if (q->vars.dropping) {
++		codel_tdiff_t delta = q->vars.drop_next - codel_get_time();
++
++		if (delta >= 0)
++			st.drop_next = codel_time_to_us(delta);
++		else
++			st.drop_next = -codel_time_to_us(-delta);
++	}
++
++	return gnet_stats_copy_app(d, &st, sizeof(st));
++}
++
++static void codel_reset(struct Qdisc *sch)
++{
++	struct codel_sched_data *q = qdisc_priv(sch);
++
++	qdisc_reset_queue(sch);
++	codel_vars_init(&q->vars);
++}
++
++static struct Qdisc_ops codel_qdisc_ops __read_mostly = {
++	.id		=	"codel",
++	.priv_size	=	sizeof(struct codel_sched_data),
++
++	.enqueue	=	codel_qdisc_enqueue,
++	.dequeue	=	codel_qdisc_dequeue,
++	.peek		=	qdisc_peek_dequeued,
++	.init		=	codel_init,
++	.reset		=	codel_reset,
++	.change 	=	codel_change,
++	.dump		=	codel_dump,
++	.dump_stats	=	codel_dump_stats,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init codel_module_init(void)
++{
++	return register_qdisc(&codel_qdisc_ops);
++}
++
++static void __exit codel_module_exit(void)
++{
++	unregister_qdisc(&codel_qdisc_ops);
++}
++
++module_init(codel_module_init)
++module_exit(codel_module_exit)
++
++MODULE_DESCRIPTION("Controlled Delay queue discipline");
++MODULE_AUTHOR("Dave Taht");
++MODULE_AUTHOR("Eric Dumazet");
++MODULE_LICENSE("Dual BSD/GPL");
diff --git a/trunk/target/linux/generic/patches-3.3/041-codel-use-Newton-method-instead-of-sqrt-and-divides.patch b/trunk/target/linux/generic/patches-3.3/041-codel-use-Newton-method-instead-of-sqrt-and-divides.patch
new file mode 100644
index 00000000..f91b42ed
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/041-codel-use-Newton-method-instead-of-sqrt-and-divides.patch
@@ -0,0 +1,185 @@
+From 4a8056dfeef49b306ad6af24a5563d7d6867aae0 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Sat, 12 May 2012 03:32:13 +0000
+Subject: [PATCH] codel: use Newton method instead of sqrt() and divides
+
+commit 536edd67109df5e0cdb2c4ee759e9bade7976367 upstream.
+
+As Van pointed out, interval/sqrt(count) can be implemented using
+multiplies only.
+
+http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
+
+This patch implements the Newton method and reciprocal divide.
+
+Total cost is 15 cycles instead of 120 on my Corei5 machine (64bit
+kernel).
+
+There is a small 'error' for count values < 5, but we don't really care.
+
+I reuse a hole in struct codel_vars :
+ - pack the dropping boolean into one bit
+ - use 31bit to store the reciprocal value of sqrt(count).
+
+Suggested-by: Van Jacobson <van@pollere.net>
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: Dave Taht <dave.taht@bufferbloat.net>
+Cc: Kathleen Nichols <nichols@pollere.com>
+Cc: Tom Herbert <therbert@google.com>
+Cc: Matt Mathis <mattmathis@google.com>
+Cc: Yuchung Cheng <ycheng@google.com>
+Cc: Nandita Dukkipati <nanditad@google.com>
+Cc: Stephen Hemminger <shemminger@vyatta.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/codel.h |   68 ++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 37 insertions(+), 31 deletions(-)
+
+--- a/include/net/codel.h
++++ b/include/net/codel.h
+@@ -46,6 +46,7 @@
+ #include <linux/skbuff.h>
+ #include <net/pkt_sched.h>
+ #include <net/inet_ecn.h>
++#include <linux/reciprocal_div.h>
+ 
+ /* Controlling Queue Delay (CoDel) algorithm
+  * =========================================
+@@ -123,6 +124,7 @@ struct codel_params {
+  *			entered dropping state
+  * @lastcount:		count at entry to dropping state
+  * @dropping:		set to true if in dropping state
++ * @rec_inv_sqrt:	reciprocal value of sqrt(count) >> 1
+  * @first_above_time:	when we went (or will go) continuously above target
+  *			for interval
+  * @drop_next:		time to drop next packet, or when we dropped last
+@@ -131,7 +133,8 @@ struct codel_params {
+ struct codel_vars {
+ 	u32		count;
+ 	u32		lastcount;
+-	bool		dropping;
++	bool		dropping:1;
++	u32		rec_inv_sqrt:31;
+ 	codel_time_t	first_above_time;
+ 	codel_time_t	drop_next;
+ 	codel_time_t	ldelay;
+@@ -158,11 +161,7 @@ static void codel_params_init(struct cod
+ 
+ static void codel_vars_init(struct codel_vars *vars)
+ {
+-	vars->drop_next = 0;
+-	vars->first_above_time = 0;
+-	vars->dropping = false; /* exit dropping state */
+-	vars->count = 0;
+-	vars->lastcount = 0;
++	memset(vars, 0, sizeof(*vars));
+ }
+ 
+ static void codel_stats_init(struct codel_stats *stats)
+@@ -170,38 +169,37 @@ static void codel_stats_init(struct code
+ 	stats->maxpacket = 256;
+ }
+ 
+-/* return interval/sqrt(x) with good precision
+- * relies on int_sqrt(unsigned long x) kernel implementation
++/*
++ * http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
++ * new_invsqrt = (invsqrt / 2) * (3 - count * invsqrt^2)
++ *
++ * Here, invsqrt is a fixed point number (< 1.0), 31bit mantissa)
+  */
+-static u32 codel_inv_sqrt(u32 _interval, u32 _x)
++static void codel_Newton_step(struct codel_vars *vars)
+ {
+-	u64 interval = _interval;
+-	unsigned long x = _x;
+-
+-	/* Scale operands for max precision */
++	u32 invsqrt = vars->rec_inv_sqrt;
++	u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 31;
++	u64 val = (3LL << 31) - ((u64)vars->count * invsqrt2);
+ 
+-#if BITS_PER_LONG == 64
+-	x <<= 32; /* On 64bit arches, we can prescale x by 32bits */
+-	interval <<= 16;
+-#endif
++	val = (val * invsqrt) >> 32;
+ 
+-	while (x < (1UL << (BITS_PER_LONG - 2))) {
+-		x <<= 2;
+-		interval <<= 1;
+-	}
+-	do_div(interval, int_sqrt(x));
+-	return (u32)interval;
++	vars->rec_inv_sqrt = val;
+ }
+ 
++/*
++ * CoDel control_law is t + interval/sqrt(count)
++ * We maintain in rec_inv_sqrt the reciprocal value of sqrt(count) to avoid
++ * both sqrt() and divide operation.
++ */
+ static codel_time_t codel_control_law(codel_time_t t,
+ 				      codel_time_t interval,
+-				      u32 count)
++				      u32 rec_inv_sqrt)
+ {
+-	return t + codel_inv_sqrt(interval, count);
++	return t + reciprocal_divide(interval, rec_inv_sqrt << 1);
+ }
+ 
+ 
+-static bool codel_should_drop(struct sk_buff *skb,
++static bool codel_should_drop(const struct sk_buff *skb,
+ 			      unsigned int *backlog,
+ 			      struct codel_vars *vars,
+ 			      struct codel_params *params,
+@@ -274,14 +272,16 @@ static struct sk_buff *codel_dequeue(str
+ 			 */
+ 			while (vars->dropping &&
+ 			       codel_time_after_eq(now, vars->drop_next)) {
+-				if (++vars->count == 0) /* avoid zero divides */
+-					vars->count = ~0U;
++				vars->count++; /* dont care of possible wrap
++						* since there is no more divide
++						*/
++				codel_Newton_step(vars);
+ 				if (params->ecn && INET_ECN_set_ce(skb)) {
+ 					stats->ecn_mark++;
+ 					vars->drop_next =
+ 						codel_control_law(vars->drop_next,
+ 								  params->interval,
+-								  vars->count);
++								  vars->rec_inv_sqrt);
+ 					goto end;
+ 				}
+ 				qdisc_drop(skb, sch);
+@@ -296,7 +296,7 @@ static struct sk_buff *codel_dequeue(str
+ 					vars->drop_next =
+ 						codel_control_law(vars->drop_next,
+ 								  params->interval,
+-								  vars->count);
++								  vars->rec_inv_sqrt);
+ 				}
+ 			}
+ 		}
+@@ -319,12 +319,18 @@ static struct sk_buff *codel_dequeue(str
+ 		if (codel_time_before(now - vars->drop_next,
+ 				      16 * params->interval)) {
+ 			vars->count = (vars->count - vars->lastcount) | 1;
++			/* we dont care if rec_inv_sqrt approximation
++			 * is not very precise :
++			 * Next Newton steps will correct it quadratically.
++			 */
++			codel_Newton_step(vars);
+ 		} else {
+ 			vars->count = 1;
++			vars->rec_inv_sqrt = 0x7fffffff;
+ 		}
+ 		vars->lastcount = vars->count;
+ 		vars->drop_next = codel_control_law(now, params->interval,
+-						    vars->count);
++						    vars->rec_inv_sqrt);
+ 	}
+ end:
+ 	return skb;
diff --git a/trunk/target/linux/generic/patches-3.3/042-fq_codel-Fair-Queue-Codel-AQM.patch b/trunk/target/linux/generic/patches-3.3/042-fq_codel-Fair-Queue-Codel-AQM.patch
new file mode 100644
index 00000000..26bbbcb4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/042-fq_codel-Fair-Queue-Codel-AQM.patch
@@ -0,0 +1,839 @@
+From f8cf19c19528a468cc0b9846c0328a94cccdc605 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Fri, 11 May 2012 09:30:50 +0000
+Subject: [PATCH] fq_codel: Fair Queue Codel AQM
+
+commit 4b549a2ef4bef9965d97cbd992ba67930cd3e0fe upstream.
+
+Fair Queue Codel packet scheduler
+
+Principles :
+
+- Packets are classified (internal classifier or external) on flows.
+- This is a Stochastic model (as we use a hash, several flows might
+                              be hashed on same slot)
+- Each flow has a CoDel managed queue.
+- Flows are linked onto two (Round Robin) lists,
+  so that new flows have priority on old ones.
+
+- For a given flow, packets are not reordered (CoDel uses a FIFO)
+- head drops only.
+- ECN capability is on by default.
+- Very low memory footprint (64 bytes per flow)
+
+tc qdisc ... fq_codel [ limit PACKETS ] [ flows number ]
+                      [ target TIME ] [ interval TIME ] [ noecn ]
+                      [ quantum BYTES ]
+
+defaults : 1024 flows, 10240 packets limit, quantum : device MTU
+           target : 5ms (CoDel default)
+           interval : 100ms (CoDel default)
+
+Impressive results on load :
+
+class htb 1:1 root leaf 10: prio 0 quantum 1514 rate 200000Kbit ceil 200000Kbit burst 1475b/8 mpu 0b overhead 0b cburst 1475b/8 mpu 0b overhead 0b level 0
+ Sent 43304920109 bytes 33063109 pkt (dropped 0, overlimits 0 requeues 0)
+ rate 201691Kbit 28595pps backlog 0b 312p requeues 0
+ lended: 33063109 borrowed: 0 giants: 0
+ tokens: -912 ctokens: -912
+
+class fq_codel 10:1735 parent 10:
+ (dropped 1292, overlimits 0 requeues 0)
+ backlog 15140b 10p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 7.1ms
+class fq_codel 10:4524 parent 10:
+ (dropped 1291, overlimits 0 requeues 0)
+ backlog 16654b 11p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 7.1ms
+class fq_codel 10:4e74 parent 10:
+ (dropped 1290, overlimits 0 requeues 0)
+ backlog 6056b 4p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 6.4ms dropping drop_next 92.0ms
+class fq_codel 10:628a parent 10:
+ (dropped 1289, overlimits 0 requeues 0)
+ backlog 7570b 5p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 5.4ms dropping drop_next 90.9ms
+class fq_codel 10:a4b3 parent 10:
+ (dropped 302, overlimits 0 requeues 0)
+ backlog 16654b 11p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 7.1ms
+class fq_codel 10:c3c2 parent 10:
+ (dropped 1284, overlimits 0 requeues 0)
+ backlog 13626b 9p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 5.9ms
+class fq_codel 10:d331 parent 10:
+ (dropped 299, overlimits 0 requeues 0)
+ backlog 15140b 10p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 7.0ms
+class fq_codel 10:d526 parent 10:
+ (dropped 12160, overlimits 0 requeues 0)
+ backlog 35870b 211p requeues 0
+  deficit 1508 count 12160 lastcount 1 ldelay 15.3ms dropping drop_next 247us
+class fq_codel 10:e2c6 parent 10:
+ (dropped 1288, overlimits 0 requeues 0)
+ backlog 15140b 10p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 7.1ms
+class fq_codel 10:eab5 parent 10:
+ (dropped 1285, overlimits 0 requeues 0)
+ backlog 16654b 11p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 5.9ms
+class fq_codel 10:f220 parent 10:
+ (dropped 1289, overlimits 0 requeues 0)
+ backlog 15140b 10p requeues 0
+  deficit 1514 count 1 lastcount 1 ldelay 7.1ms
+
+qdisc htb 1: root refcnt 6 r2q 10 default 1 direct_packets_stat 0 ver 3.17
+ Sent 43331086547 bytes 33092812 pkt (dropped 0, overlimits 66063544 requeues 71)
+ rate 201697Kbit 28602pps backlog 0b 260p requeues 71
+qdisc fq_codel 10: parent 1:1 limit 10240p flows 65536 target 5.0ms interval 100.0ms ecn
+ Sent 43331086547 bytes 33092812 pkt (dropped 949359, overlimits 0 requeues 0)
+ rate 201697Kbit 28602pps backlog 189352b 260p requeues 0
+  maxpacket 1514 drop_overlimit 0 new_flow_count 5582 ecn_mark 125593
+  new_flows_len 0 old_flows_len 11
+
+PING 172.30.42.18 (172.30.42.18) 56(84) bytes of data.
+64 bytes from 172.30.42.18: icmp_req=1 ttl=64 time=0.227 ms
+64 bytes from 172.30.42.18: icmp_req=2 ttl=64 time=0.165 ms
+64 bytes from 172.30.42.18: icmp_req=3 ttl=64 time=0.166 ms
+64 bytes from 172.30.42.18: icmp_req=4 ttl=64 time=0.151 ms
+64 bytes from 172.30.42.18: icmp_req=5 ttl=64 time=0.164 ms
+64 bytes from 172.30.42.18: icmp_req=6 ttl=64 time=0.172 ms
+64 bytes from 172.30.42.18: icmp_req=7 ttl=64 time=0.175 ms
+64 bytes from 172.30.42.18: icmp_req=8 ttl=64 time=0.183 ms
+64 bytes from 172.30.42.18: icmp_req=9 ttl=64 time=0.158 ms
+64 bytes from 172.30.42.18: icmp_req=10 ttl=64 time=0.200 ms
+
+10 packets transmitted, 10 received, 0% packet loss, time 8999ms
+rtt min/avg/max/mdev = 0.151/0.176/0.227/0.022 ms
+
+Much better than SFQ because of priority given to new flows, and fast
+path dirtying less cache lines.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/linux/pkt_sched.h |   54 ++++
+ net/sched/Kconfig         |   11 +
+ net/sched/Makefile        |    1 +
+ net/sched/sch_fq_codel.c  |  624 +++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 690 insertions(+)
+ create mode 100644 net/sched/sch_fq_codel.c
+
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
+@@ -659,4 +659,58 @@ struct tc_codel_xstats {
+ 	__u32	dropping;  /* are we in dropping state ? */
+ };
+ 
++/* FQ_CODEL */
++
++enum {
++	TCA_FQ_CODEL_UNSPEC,
++	TCA_FQ_CODEL_TARGET,
++	TCA_FQ_CODEL_LIMIT,
++	TCA_FQ_CODEL_INTERVAL,
++	TCA_FQ_CODEL_ECN,
++	TCA_FQ_CODEL_FLOWS,
++	TCA_FQ_CODEL_QUANTUM,
++	__TCA_FQ_CODEL_MAX
++};
++
++#define TCA_FQ_CODEL_MAX	(__TCA_FQ_CODEL_MAX - 1)
++
++enum {
++	TCA_FQ_CODEL_XSTATS_QDISC,
++	TCA_FQ_CODEL_XSTATS_CLASS,
++};
++
++struct tc_fq_codel_qd_stats {
++	__u32	maxpacket;	/* largest packet we've seen so far */
++	__u32	drop_overlimit; /* number of time max qdisc
++				 * packet limit was hit
++				 */
++	__u32	ecn_mark;	/* number of packets we ECN marked
++				 * instead of being dropped
++				 */
++	__u32	new_flow_count; /* number of time packets
++				 * created a 'new flow'
++				 */
++	__u32	new_flows_len;	/* count of flows in new list */
++	__u32	old_flows_len;	/* count of flows in old list */
++};
++
++struct tc_fq_codel_cl_stats {
++	__s32	deficit;
++	__u32	ldelay;		/* in-queue delay seen by most recently
++				 * dequeued packet
++				 */
++	__u32	count;
++	__u32	lastcount;
++	__u32	dropping;
++	__s32	drop_next;
++};
++
++struct tc_fq_codel_xstats {
++	__u32	type;
++	union {
++		struct tc_fq_codel_qd_stats qdisc_stats;
++		struct tc_fq_codel_cl_stats class_stats;
++	};
++};
++
+ #endif
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -261,6 +261,17 @@ config NET_SCH_CODEL
+ 
+ 	  If unsure, say N.
+ 
++config NET_SCH_FQ_CODEL
++	tristate "Fair Queue Controlled Delay AQM (FQ_CODEL)"
++	help
++	  Say Y here if you want to use the FQ Controlled Delay (FQ_CODEL)
++	  packet scheduling algorithm.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called sch_fq_codel.
++
++	  If unsure, say N.
++
+ config NET_SCH_INGRESS
+ 	tristate "Ingress Qdisc"
+ 	depends on NET_CLS_ACT
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -37,6 +37,7 @@ obj-$(CONFIG_NET_SCH_MQPRIO)	+= sch_mqpr
+ obj-$(CONFIG_NET_SCH_CHOKE)	+= sch_choke.o
+ obj-$(CONFIG_NET_SCH_QFQ)	+= sch_qfq.o
+ obj-$(CONFIG_NET_SCH_CODEL)	+= sch_codel.o
++obj-$(CONFIG_NET_SCH_FQ_CODEL)	+= sch_fq_codel.o
+ 
+ obj-$(CONFIG_NET_CLS_U32)	+= cls_u32.o
+ obj-$(CONFIG_NET_CLS_ROUTE4)	+= cls_route.o
+--- /dev/null
++++ b/net/sched/sch_fq_codel.c
+@@ -0,0 +1,624 @@
++/*
++ * Fair Queue CoDel discipline
++ *
++ *	This program is free software; you can redistribute it and/or
++ *	modify it under the terms of the GNU General Public License
++ *	as published by the Free Software Foundation; either version
++ *	2 of the License, or (at your option) any later version.
++ *
++ *  Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
++ */
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/skbuff.h>
++#include <linux/jhash.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <net/netlink.h>
++#include <net/pkt_sched.h>
++#include <net/flow_keys.h>
++#include <net/codel.h>
++
++/*	Fair Queue CoDel.
++ *
++ * Principles :
++ * Packets are classified (internal classifier or external) on flows.
++ * This is a Stochastic model (as we use a hash, several flows
++ *			       might be hashed on same slot)
++ * Each flow has a CoDel managed queue.
++ * Flows are linked onto two (Round Robin) lists,
++ * so that new flows have priority on old ones.
++ *
++ * For a given flow, packets are not reordered (CoDel uses a FIFO)
++ * head drops only.
++ * ECN capability is on by default.
++ * Low memory footprint (64 bytes per flow)
++ */
++
++struct fq_codel_flow {
++	struct sk_buff	  *head;
++	struct sk_buff	  *tail;
++	struct list_head  flowchain;
++	int		  deficit;
++	u32		  dropped; /* number of drops (or ECN marks) on this flow */
++	struct codel_vars cvars;
++}; /* please try to keep this structure <= 64 bytes */
++
++struct fq_codel_sched_data {
++	struct tcf_proto *filter_list;	/* optional external classifier */
++	struct fq_codel_flow *flows;	/* Flows table [flows_cnt] */
++	u32		*backlogs;	/* backlog table [flows_cnt] */
++	u32		flows_cnt;	/* number of flows */
++	u32		perturbation;	/* hash perturbation */
++	u32		quantum;	/* psched_mtu(qdisc_dev(sch)); */
++	struct codel_params cparams;
++	struct codel_stats cstats;
++	u32		drop_overlimit;
++	u32		new_flow_count;
++
++	struct list_head new_flows;	/* list of new flows */
++	struct list_head old_flows;	/* list of old flows */
++};
++
++static unsigned int fq_codel_hash(const struct fq_codel_sched_data *q,
++				  const struct sk_buff *skb)
++{
++	struct flow_keys keys;
++	unsigned int hash;
++
++	skb_flow_dissect(skb, &keys);
++	hash = jhash_3words((__force u32)keys.dst,
++			    (__force u32)keys.src ^ keys.ip_proto,
++			    (__force u32)keys.ports, q->perturbation);
++	return ((u64)hash * q->flows_cnt) >> 32;
++}
++
++static unsigned int fq_codel_classify(struct sk_buff *skb, struct Qdisc *sch,
++				      int *qerr)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	struct tcf_result res;
++	int result;
++
++	if (TC_H_MAJ(skb->priority) == sch->handle &&
++	    TC_H_MIN(skb->priority) > 0 &&
++	    TC_H_MIN(skb->priority) <= q->flows_cnt)
++		return TC_H_MIN(skb->priority);
++
++	if (!q->filter_list)
++		return fq_codel_hash(q, skb) + 1;
++
++	*qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
++	result = tc_classify(skb, q->filter_list, &res);
++	if (result >= 0) {
++#ifdef CONFIG_NET_CLS_ACT
++		switch (result) {
++		case TC_ACT_STOLEN:
++		case TC_ACT_QUEUED:
++			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
++		case TC_ACT_SHOT:
++			return 0;
++		}
++#endif
++		if (TC_H_MIN(res.classid) <= q->flows_cnt)
++			return TC_H_MIN(res.classid);
++	}
++	return 0;
++}
++
++/* helper functions : might be changed when/if skb use a standard list_head */
++
++/* remove one skb from head of slot queue */
++static inline struct sk_buff *dequeue_head(struct fq_codel_flow *flow)
++{
++	struct sk_buff *skb = flow->head;
++
++	flow->head = skb->next;
++	skb->next = NULL;
++	return skb;
++}
++
++/* add skb to flow queue (tail add) */
++static inline void flow_queue_add(struct fq_codel_flow *flow,
++				  struct sk_buff *skb)
++{
++	if (flow->head == NULL)
++		flow->head = skb;
++	else
++		flow->tail->next = skb;
++	flow->tail = skb;
++	skb->next = NULL;
++}
++
++static unsigned int fq_codel_drop(struct Qdisc *sch)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++	unsigned int maxbacklog = 0, idx = 0, i, len;
++	struct fq_codel_flow *flow;
++
++	/* Queue is full! Find the fat flow and drop packet from it.
++	 * This might sound expensive, but with 1024 flows, we scan
++	 * 4KB of memory, and we dont need to handle a complex tree
++	 * in fast path (packet queue/enqueue) with many cache misses.
++	 */
++	for (i = 0; i < q->flows_cnt; i++) {
++		if (q->backlogs[i] > maxbacklog) {
++			maxbacklog = q->backlogs[i];
++			idx = i;
++		}
++	}
++	flow = &q->flows[idx];
++	skb = dequeue_head(flow);
++	len = qdisc_pkt_len(skb);
++	q->backlogs[idx] -= len;
++	kfree_skb(skb);
++	sch->q.qlen--;
++	sch->qstats.drops++;
++	sch->qstats.backlog -= len;
++	flow->dropped++;
++	return idx;
++}
++
++static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	unsigned int idx;
++	struct fq_codel_flow *flow;
++	int uninitialized_var(ret);
++
++	idx = fq_codel_classify(skb, sch, &ret);
++	if (idx == 0) {
++		if (ret & __NET_XMIT_BYPASS)
++			sch->qstats.drops++;
++		kfree_skb(skb);
++		return ret;
++	}
++	idx--;
++
++	codel_set_enqueue_time(skb);
++	flow = &q->flows[idx];
++	flow_queue_add(flow, skb);
++	q->backlogs[idx] += qdisc_pkt_len(skb);
++	sch->qstats.backlog += qdisc_pkt_len(skb);
++
++	if (list_empty(&flow->flowchain)) {
++		list_add_tail(&flow->flowchain, &q->new_flows);
++		codel_vars_init(&flow->cvars);
++		q->new_flow_count++;
++		flow->deficit = q->quantum;
++		flow->dropped = 0;
++	}
++	if (++sch->q.qlen < sch->limit)
++		return NET_XMIT_SUCCESS;
++
++	q->drop_overlimit++;
++	/* Return Congestion Notification only if we dropped a packet
++	 * from this flow.
++	 */
++	if (fq_codel_drop(sch) == idx)
++		return NET_XMIT_CN;
++
++	/* As we dropped a packet, better let upper stack know this */
++	qdisc_tree_decrease_qlen(sch, 1);
++	return NET_XMIT_SUCCESS;
++}
++
++/* This is the specific function called from codel_dequeue()
++ * to dequeue a packet from queue. Note: backlog is handled in
++ * codel, we dont need to reduce it here.
++ */
++static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch)
++{
++	struct fq_codel_flow *flow;
++	struct sk_buff *skb = NULL;
++
++	flow = container_of(vars, struct fq_codel_flow, cvars);
++	if (flow->head) {
++		skb = dequeue_head(flow);
++		sch->qstats.backlog -= qdisc_pkt_len(skb);
++		sch->q.qlen--;
++	}
++	return skb;
++}
++
++static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++	struct fq_codel_flow *flow;
++	struct list_head *head;
++	u32 prev_drop_count, prev_ecn_mark;
++
++begin:
++	head = &q->new_flows;
++	if (list_empty(head)) {
++		head = &q->old_flows;
++		if (list_empty(head))
++			return NULL;
++	}
++	flow = list_first_entry(head, struct fq_codel_flow, flowchain);
++
++	if (flow->deficit <= 0) {
++		flow->deficit += q->quantum;
++		list_move_tail(&flow->flowchain, &q->old_flows);
++		goto begin;
++	}
++
++	prev_drop_count = q->cstats.drop_count;
++	prev_ecn_mark = q->cstats.ecn_mark;
++
++	skb = codel_dequeue(sch, &q->cparams, &flow->cvars, &q->cstats,
++			    dequeue, &q->backlogs[flow - q->flows]);
++
++	flow->dropped += q->cstats.drop_count - prev_drop_count;
++	flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
++
++	if (!skb) {
++		/* force a pass through old_flows to prevent starvation */
++		if ((head == &q->new_flows) && !list_empty(&q->old_flows))
++			list_move_tail(&flow->flowchain, &q->old_flows);
++		else
++			list_del_init(&flow->flowchain);
++		goto begin;
++	}
++	qdisc_bstats_update(sch, skb);
++	flow->deficit -= qdisc_pkt_len(skb);
++	/* We cant call qdisc_tree_decrease_qlen() if our qlen is 0,
++	 * or HTB crashes. Defer it for next round.
++	 */
++	if (q->cstats.drop_count && sch->q.qlen) {
++		qdisc_tree_decrease_qlen(sch, q->cstats.drop_count);
++		q->cstats.drop_count = 0;
++	}
++	return skb;
++}
++
++static void fq_codel_reset(struct Qdisc *sch)
++{
++	struct sk_buff *skb;
++
++	while ((skb = fq_codel_dequeue(sch)) != NULL)
++		kfree_skb(skb);
++}
++
++static const struct nla_policy fq_codel_policy[TCA_FQ_CODEL_MAX + 1] = {
++	[TCA_FQ_CODEL_TARGET]	= { .type = NLA_U32 },
++	[TCA_FQ_CODEL_LIMIT]	= { .type = NLA_U32 },
++	[TCA_FQ_CODEL_INTERVAL]	= { .type = NLA_U32 },
++	[TCA_FQ_CODEL_ECN]	= { .type = NLA_U32 },
++	[TCA_FQ_CODEL_FLOWS]	= { .type = NLA_U32 },
++	[TCA_FQ_CODEL_QUANTUM]	= { .type = NLA_U32 },
++};
++
++static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	struct nlattr *tb[TCA_FQ_CODEL_MAX + 1];
++	int err;
++
++	if (!opt)
++		return -EINVAL;
++
++	err = nla_parse_nested(tb, TCA_FQ_CODEL_MAX, opt, fq_codel_policy);
++	if (err < 0)
++		return err;
++	if (tb[TCA_FQ_CODEL_FLOWS]) {
++		if (q->flows)
++			return -EINVAL;
++		q->flows_cnt = nla_get_u32(tb[TCA_FQ_CODEL_FLOWS]);
++		if (!q->flows_cnt ||
++		    q->flows_cnt > 65536)
++			return -EINVAL;
++	}
++	sch_tree_lock(sch);
++
++	if (tb[TCA_FQ_CODEL_TARGET]) {
++		u64 target = nla_get_u32(tb[TCA_FQ_CODEL_TARGET]);
++
++		q->cparams.target = (target * NSEC_PER_USEC) >> CODEL_SHIFT;
++	}
++
++	if (tb[TCA_FQ_CODEL_INTERVAL]) {
++		u64 interval = nla_get_u32(tb[TCA_FQ_CODEL_INTERVAL]);
++
++		q->cparams.interval = (interval * NSEC_PER_USEC) >> CODEL_SHIFT;
++	}
++
++	if (tb[TCA_FQ_CODEL_LIMIT])
++		sch->limit = nla_get_u32(tb[TCA_FQ_CODEL_LIMIT]);
++
++	if (tb[TCA_FQ_CODEL_ECN])
++		q->cparams.ecn = !!nla_get_u32(tb[TCA_FQ_CODEL_ECN]);
++
++	if (tb[TCA_FQ_CODEL_QUANTUM])
++		q->quantum = max(256U, nla_get_u32(tb[TCA_FQ_CODEL_QUANTUM]));
++
++	while (sch->q.qlen > sch->limit) {
++		struct sk_buff *skb = fq_codel_dequeue(sch);
++
++		kfree_skb(skb);
++		q->cstats.drop_count++;
++	}
++	qdisc_tree_decrease_qlen(sch, q->cstats.drop_count);
++	q->cstats.drop_count = 0;
++
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static void *fq_codel_zalloc(size_t sz)
++{
++	void *ptr = kzalloc(sz, GFP_KERNEL | __GFP_NOWARN);
++
++	if (!ptr)
++		ptr = vzalloc(sz);
++	return ptr;
++}
++
++static void fq_codel_free(void *addr)
++{
++	if (addr) {
++		if (is_vmalloc_addr(addr))
++			vfree(addr);
++		else
++			kfree(addr);
++	}
++}
++
++static void fq_codel_destroy(struct Qdisc *sch)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++
++	tcf_destroy_chain(&q->filter_list);
++	fq_codel_free(q->backlogs);
++	fq_codel_free(q->flows);
++}
++
++static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	int i;
++
++	sch->limit = 10*1024;
++	q->flows_cnt = 1024;
++	q->quantum = psched_mtu(qdisc_dev(sch));
++	q->perturbation = net_random();
++	INIT_LIST_HEAD(&q->new_flows);
++	INIT_LIST_HEAD(&q->old_flows);
++	codel_params_init(&q->cparams);
++	codel_stats_init(&q->cstats);
++	q->cparams.ecn = true;
++
++	if (opt) {
++		int err = fq_codel_change(sch, opt);
++		if (err)
++			return err;
++	}
++
++	if (!q->flows) {
++		q->flows = fq_codel_zalloc(q->flows_cnt *
++					   sizeof(struct fq_codel_flow));
++		if (!q->flows)
++			return -ENOMEM;
++		q->backlogs = fq_codel_zalloc(q->flows_cnt * sizeof(u32));
++		if (!q->backlogs) {
++			fq_codel_free(q->flows);
++			return -ENOMEM;
++		}
++		for (i = 0; i < q->flows_cnt; i++) {
++			struct fq_codel_flow *flow = q->flows + i;
++
++			INIT_LIST_HEAD(&flow->flowchain);
++		}
++	}
++	if (sch->limit >= 1)
++		sch->flags |= TCQ_F_CAN_BYPASS;
++	else
++		sch->flags &= ~TCQ_F_CAN_BYPASS;
++	return 0;
++}
++
++static int fq_codel_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	struct nlattr *opts;
++
++	opts = nla_nest_start(skb, TCA_OPTIONS);
++	if (opts == NULL)
++		goto nla_put_failure;
++
++	if (nla_put_u32(skb, TCA_FQ_CODEL_TARGET,
++			codel_time_to_us(q->cparams.target)) ||
++	    nla_put_u32(skb, TCA_FQ_CODEL_LIMIT,
++			sch->limit) ||
++	    nla_put_u32(skb, TCA_FQ_CODEL_INTERVAL,
++			codel_time_to_us(q->cparams.interval)) ||
++	    nla_put_u32(skb, TCA_FQ_CODEL_ECN,
++			q->cparams.ecn) ||
++	    nla_put_u32(skb, TCA_FQ_CODEL_QUANTUM,
++			q->quantum) ||
++	    nla_put_u32(skb, TCA_FQ_CODEL_FLOWS,
++			q->flows_cnt))
++		goto nla_put_failure;
++
++	nla_nest_end(skb, opts);
++	return skb->len;
++
++nla_put_failure:
++	return -1;
++}
++
++static int fq_codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	struct tc_fq_codel_xstats st = {
++		.type				= TCA_FQ_CODEL_XSTATS_QDISC,
++		.qdisc_stats.maxpacket		= q->cstats.maxpacket,
++		.qdisc_stats.drop_overlimit	= q->drop_overlimit,
++		.qdisc_stats.ecn_mark		= q->cstats.ecn_mark,
++		.qdisc_stats.new_flow_count	= q->new_flow_count,
++	};
++	struct list_head *pos;
++
++	list_for_each(pos, &q->new_flows)
++		st.qdisc_stats.new_flows_len++;
++
++	list_for_each(pos, &q->old_flows)
++		st.qdisc_stats.old_flows_len++;
++
++	return gnet_stats_copy_app(d, &st, sizeof(st));
++}
++
++static struct Qdisc *fq_codel_leaf(struct Qdisc *sch, unsigned long arg)
++{
++	return NULL;
++}
++
++static unsigned long fq_codel_get(struct Qdisc *sch, u32 classid)
++{
++	return 0;
++}
++
++static unsigned long fq_codel_bind(struct Qdisc *sch, unsigned long parent,
++			      u32 classid)
++{
++	/* we cannot bypass queue discipline anymore */
++	sch->flags &= ~TCQ_F_CAN_BYPASS;
++	return 0;
++}
++
++static void fq_codel_put(struct Qdisc *q, unsigned long cl)
++{
++}
++
++static struct tcf_proto **fq_codel_find_tcf(struct Qdisc *sch, unsigned long cl)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++
++	if (cl)
++		return NULL;
++	return &q->filter_list;
++}
++
++static int fq_codel_dump_class(struct Qdisc *sch, unsigned long cl,
++			  struct sk_buff *skb, struct tcmsg *tcm)
++{
++	tcm->tcm_handle |= TC_H_MIN(cl);
++	return 0;
++}
++
++static int fq_codel_dump_class_stats(struct Qdisc *sch, unsigned long cl,
++				     struct gnet_dump *d)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	u32 idx = cl - 1;
++	struct gnet_stats_queue qs = { 0 };
++	struct tc_fq_codel_xstats xstats;
++
++	if (idx < q->flows_cnt) {
++		const struct fq_codel_flow *flow = &q->flows[idx];
++		const struct sk_buff *skb = flow->head;
++
++		memset(&xstats, 0, sizeof(xstats));
++		xstats.type = TCA_FQ_CODEL_XSTATS_CLASS;
++		xstats.class_stats.deficit = flow->deficit;
++		xstats.class_stats.ldelay =
++			codel_time_to_us(flow->cvars.ldelay);
++		xstats.class_stats.count = flow->cvars.count;
++		xstats.class_stats.lastcount = flow->cvars.lastcount;
++		xstats.class_stats.dropping = flow->cvars.dropping;
++		if (flow->cvars.dropping) {
++			codel_tdiff_t delta = flow->cvars.drop_next -
++					      codel_get_time();
++
++			xstats.class_stats.drop_next = (delta >= 0) ?
++				codel_time_to_us(delta) :
++				-codel_time_to_us(-delta);
++		}
++		while (skb) {
++			qs.qlen++;
++			skb = skb->next;
++		}
++		qs.backlog = q->backlogs[idx];
++		qs.drops = flow->dropped;
++	}
++	if (gnet_stats_copy_queue(d, &qs) < 0)
++		return -1;
++	if (idx < q->flows_cnt)
++		return gnet_stats_copy_app(d, &xstats, sizeof(xstats));
++	return 0;
++}
++
++static void fq_codel_walk(struct Qdisc *sch, struct qdisc_walker *arg)
++{
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
++	unsigned int i;
++
++	if (arg->stop)
++		return;
++
++	for (i = 0; i < q->flows_cnt; i++) {
++		if (list_empty(&q->flows[i].flowchain) ||
++		    arg->count < arg->skip) {
++			arg->count++;
++			continue;
++		}
++		if (arg->fn(sch, i + 1, arg) < 0) {
++			arg->stop = 1;
++			break;
++		}
++		arg->count++;
++	}
++}
++
++static const struct Qdisc_class_ops fq_codel_class_ops = {
++	.leaf		=	fq_codel_leaf,
++	.get		=	fq_codel_get,
++	.put		=	fq_codel_put,
++	.tcf_chain	=	fq_codel_find_tcf,
++	.bind_tcf	=	fq_codel_bind,
++	.unbind_tcf	=	fq_codel_put,
++	.dump		=	fq_codel_dump_class,
++	.dump_stats	=	fq_codel_dump_class_stats,
++	.walk		=	fq_codel_walk,
++};
++
++static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
++	.cl_ops		=	&fq_codel_class_ops,
++	.id		=	"fq_codel",
++	.priv_size	=	sizeof(struct fq_codel_sched_data),
++	.enqueue	=	fq_codel_enqueue,
++	.dequeue	=	fq_codel_dequeue,
++	.peek		=	qdisc_peek_dequeued,
++	.drop		=	fq_codel_drop,
++	.init		=	fq_codel_init,
++	.reset		=	fq_codel_reset,
++	.destroy	=	fq_codel_destroy,
++	.change		=	fq_codel_change,
++	.dump		=	fq_codel_dump,
++	.dump_stats =	fq_codel_dump_stats,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init fq_codel_module_init(void)
++{
++	return register_qdisc(&fq_codel_qdisc_ops);
++}
++
++static void __exit fq_codel_module_exit(void)
++{
++	unregister_qdisc(&fq_codel_qdisc_ops);
++}
++
++module_init(fq_codel_module_init)
++module_exit(fq_codel_module_exit)
++MODULE_AUTHOR("Eric Dumazet");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.3/043-net-codel-Add-missing-include-linux-prefetch.h.patch b/trunk/target/linux/generic/patches-3.3/043-net-codel-Add-missing-include-linux-prefetch.h.patch
new file mode 100644
index 00000000..3510ee04
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/043-net-codel-Add-missing-include-linux-prefetch.h.patch
@@ -0,0 +1,33 @@
+From 18c12e496ead3306de00a82d0bc73d71b34d7c24 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert@linux-m68k.org>
+Date: Mon, 14 May 2012 09:47:05 +0000
+Subject: [PATCH] net/codel: Add missing #include <linux/prefetch.h>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit ce5b4b977127ee20c3f9c3fd3637cd3796f649f5 upstream.
+
+m68k allmodconfig:
+
+net/sched/sch_codel.c: In function ‘dequeue’:
+net/sched/sch_codel.c:70: error: implicit declaration of function ‘prefetch’
+make[1]: *** [net/sched/sch_codel.o] Error 1
+
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Acked-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/sched/sch_codel.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/sched/sch_codel.c
++++ b/net/sched/sch_codel.c
+@@ -46,6 +46,7 @@
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/skbuff.h>
++#include <linux/prefetch.h>
+ #include <net/pkt_sched.h>
+ #include <net/codel.h>
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/044-net-codel-fix-build-errors.patch b/trunk/target/linux/generic/patches-3.3/044-net-codel-fix-build-errors.patch
new file mode 100644
index 00000000..219285d7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/044-net-codel-fix-build-errors.patch
@@ -0,0 +1,51 @@
+From b49ab5f6bb7e609190065cb9a605de809e50ab60 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <levinsasha928@gmail.com>
+Date: Mon, 14 May 2012 11:57:06 +0000
+Subject: [PATCH] net: codel: fix build errors
+
+commit 669d67bf777def468970f2dcba1537edf3b2d329 upstream.
+
+Fix the following build error:
+
+net/sched/sch_fq_codel.c: In function 'fq_codel_dump_stats':
+net/sched/sch_fq_codel.c:464:3: error: unknown field 'qdisc_stats' specified in initializer
+net/sched/sch_fq_codel.c:464:3: warning: missing braces around initializer
+net/sched/sch_fq_codel.c:464:3: warning: (near initialization for 'st.<anonymous>')
+net/sched/sch_fq_codel.c:465:3: error: unknown field 'qdisc_stats' specified in initializer
+net/sched/sch_fq_codel.c:465:3: warning: excess elements in struct initializer
+net/sched/sch_fq_codel.c:465:3: warning: (near initialization for 'st')
+net/sched/sch_fq_codel.c:466:3: error: unknown field 'qdisc_stats' specified in initializer
+net/sched/sch_fq_codel.c:466:3: warning: excess elements in struct initializer
+net/sched/sch_fq_codel.c:466:3: warning: (near initialization for 'st')
+net/sched/sch_fq_codel.c:467:3: error: unknown field 'qdisc_stats' specified in initializer
+net/sched/sch_fq_codel.c:467:3: warning: excess elements in struct initializer
+net/sched/sch_fq_codel.c:467:3: warning: (near initialization for 'st')
+make[1]: *** [net/sched/sch_fq_codel.o] Error 1
+
+Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/sched/sch_fq_codel.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -461,13 +461,14 @@ static int fq_codel_dump_stats(struct Qd
+ 	struct fq_codel_sched_data *q = qdisc_priv(sch);
+ 	struct tc_fq_codel_xstats st = {
+ 		.type				= TCA_FQ_CODEL_XSTATS_QDISC,
+-		.qdisc_stats.maxpacket		= q->cstats.maxpacket,
+-		.qdisc_stats.drop_overlimit	= q->drop_overlimit,
+-		.qdisc_stats.ecn_mark		= q->cstats.ecn_mark,
+-		.qdisc_stats.new_flow_count	= q->new_flow_count,
+ 	};
+ 	struct list_head *pos;
+ 
++	st.qdisc_stats.maxpacket = q->cstats.maxpacket;
++	st.qdisc_stats.drop_overlimit = q->drop_overlimit;
++	st.qdisc_stats.ecn_mark = q->cstats.ecn_mark;
++	st.qdisc_stats.new_flow_count = q->new_flow_count;
++
+ 	list_for_each(pos, &q->new_flows)
+ 		st.qdisc_stats.new_flows_len++;
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/045-codel-use-u16-field-instead-of-31bits-for-rec_inv_sq.patch b/trunk/target/linux/generic/patches-3.3/045-codel-use-u16-field-instead-of-31bits-for-rec_inv_sq.patch
new file mode 100644
index 00000000..933a3dcd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/045-codel-use-u16-field-instead-of-31bits-for-rec_inv_sq.patch
@@ -0,0 +1,86 @@
+From 03333931c17d9c62ba4063d4e4fec1578c0729a7 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <eric.dumazet@gmail.com>
+Date: Sat, 12 May 2012 21:23:23 +0000
+Subject: [PATCH] codel: use u16 field instead of 31bits for rec_inv_sqrt
+
+commit 6ff272c9ad65eda219cd975b9da2dbc31cc812ee upstream.
+
+David pointed out gcc might generate poor code with 31bit fields.
+
+Using u16 is more than enough and permits a better code output.
+
+Also make the code intent more readable using constants, fixed point arithmetic
+not being trivial for everybody.
+
+Suggested-by: David Miller <davem@davemloft.net>
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/codel.h |   25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+--- a/include/net/codel.h
++++ b/include/net/codel.h
+@@ -133,13 +133,17 @@ struct codel_params {
+ struct codel_vars {
+ 	u32		count;
+ 	u32		lastcount;
+-	bool		dropping:1;
+-	u32		rec_inv_sqrt:31;
++	bool		dropping;
++	u16		rec_inv_sqrt;
+ 	codel_time_t	first_above_time;
+ 	codel_time_t	drop_next;
+ 	codel_time_t	ldelay;
+ };
+ 
++#define REC_INV_SQRT_BITS (8 * sizeof(u16)) /* or sizeof_in_bits(rec_inv_sqrt) */
++/* needed shift to get a Q0.32 number from rec_inv_sqrt */
++#define REC_INV_SQRT_SHIFT (32 - REC_INV_SQRT_BITS)
++
+ /**
+  * struct codel_stats - contains codel shared variables and stats
+  * @maxpacket:	largest packet we've seen so far
+@@ -173,17 +177,18 @@ static void codel_stats_init(struct code
+  * http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
+  * new_invsqrt = (invsqrt / 2) * (3 - count * invsqrt^2)
+  *
+- * Here, invsqrt is a fixed point number (< 1.0), 31bit mantissa)
++ * Here, invsqrt is a fixed point number (< 1.0), 32bit mantissa, aka Q0.32
+  */
+ static void codel_Newton_step(struct codel_vars *vars)
+ {
+-	u32 invsqrt = vars->rec_inv_sqrt;
+-	u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 31;
+-	u64 val = (3LL << 31) - ((u64)vars->count * invsqrt2);
++	u32 invsqrt = ((u32)vars->rec_inv_sqrt) << REC_INV_SQRT_SHIFT;
++	u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 32;
++	u64 val = (3LL << 32) - ((u64)vars->count * invsqrt2);
+ 
+-	val = (val * invsqrt) >> 32;
++	val >>= 2; /* avoid overflow in following multiply */
++	val = (val * invsqrt) >> (32 - 2 + 1);
+ 
+-	vars->rec_inv_sqrt = val;
++	vars->rec_inv_sqrt = val >> REC_INV_SQRT_SHIFT;
+ }
+ 
+ /*
+@@ -195,7 +200,7 @@ static codel_time_t codel_control_law(co
+ 				      codel_time_t interval,
+ 				      u32 rec_inv_sqrt)
+ {
+-	return t + reciprocal_divide(interval, rec_inv_sqrt << 1);
++	return t + reciprocal_divide(interval, rec_inv_sqrt << REC_INV_SQRT_SHIFT);
+ }
+ 
+ 
+@@ -326,7 +331,7 @@ static struct sk_buff *codel_dequeue(str
+ 			codel_Newton_step(vars);
+ 		} else {
+ 			vars->count = 1;
+-			vars->rec_inv_sqrt = 0x7fffffff;
++			vars->rec_inv_sqrt = ~0U >> REC_INV_SQRT_SHIFT;
+ 		}
+ 		vars->lastcount = vars->count;
+ 		vars->drop_next = codel_control_law(now, params->interval,
diff --git a/trunk/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch b/trunk/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch
new file mode 100644
index 00000000..f9bcbbd0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/046-fq_codel-qdisc-backlog.patch
@@ -0,0 +1,132 @@
+From 7bd90773f89001ea4960ed47676b550137f3facb Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 16 May 2012 04:39:09 +0000
+Subject: [PATCH] fq_codel: should use qdisc backlog as threshold
+
+commit 865ec5523dadbedefbc5710a68969f686a28d928 upstream.
+
+codel_should_drop() logic allows a packet being not dropped if queue
+size is under max packet size.
+
+In fq_codel, we have two possible backlogs : The qdisc global one, and
+the flow local one.
+
+The meaningful one for codel_should_drop() should be the global backlog,
+not the per flow one, so that thin flows can have a non zero drop/mark
+probability.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: Dave Taht <dave.taht@bufferbloat.net>
+Cc: Kathleen Nichols <nichols@pollere.com>
+Cc: Van Jacobson <van@pollere.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/codel.h      |   15 +++++++--------
+ net/sched/sch_codel.c    |    4 ++--
+ net/sched/sch_fq_codel.c |    5 +++--
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+--- a/include/net/codel.h
++++ b/include/net/codel.h
+@@ -205,7 +205,7 @@ static codel_time_t codel_control_law(co
+ 
+ 
+ static bool codel_should_drop(const struct sk_buff *skb,
+-			      unsigned int *backlog,
++			      struct Qdisc *sch,
+ 			      struct codel_vars *vars,
+ 			      struct codel_params *params,
+ 			      struct codel_stats *stats,
+@@ -219,13 +219,13 @@ static bool codel_should_drop(const stru
+ 	}
+ 
+ 	vars->ldelay = now - codel_get_enqueue_time(skb);
+-	*backlog -= qdisc_pkt_len(skb);
++	sch->qstats.backlog -= qdisc_pkt_len(skb);
+ 
+ 	if (unlikely(qdisc_pkt_len(skb) > stats->maxpacket))
+ 		stats->maxpacket = qdisc_pkt_len(skb);
+ 
+ 	if (codel_time_before(vars->ldelay, params->target) ||
+-	    *backlog <= stats->maxpacket) {
++	    sch->qstats.backlog <= stats->maxpacket) {
+ 		/* went below - stay below for at least interval */
+ 		vars->first_above_time = 0;
+ 		return false;
+@@ -249,8 +249,7 @@ static struct sk_buff *codel_dequeue(str
+ 				     struct codel_params *params,
+ 				     struct codel_vars *vars,
+ 				     struct codel_stats *stats,
+-				     codel_skb_dequeue_t dequeue_func,
+-				     u32 *backlog)
++				     codel_skb_dequeue_t dequeue_func)
+ {
+ 	struct sk_buff *skb = dequeue_func(vars, sch);
+ 	codel_time_t now;
+@@ -261,7 +260,7 @@ static struct sk_buff *codel_dequeue(str
+ 		return skb;
+ 	}
+ 	now = codel_get_time();
+-	drop = codel_should_drop(skb, backlog, vars, params, stats, now);
++	drop = codel_should_drop(skb, sch, vars, params, stats, now);
+ 	if (vars->dropping) {
+ 		if (!drop) {
+ 			/* sojourn time below target - leave dropping state */
+@@ -292,7 +291,7 @@ static struct sk_buff *codel_dequeue(str
+ 				qdisc_drop(skb, sch);
+ 				stats->drop_count++;
+ 				skb = dequeue_func(vars, sch);
+-				if (!codel_should_drop(skb, backlog,
++				if (!codel_should_drop(skb, sch,
+ 						       vars, params, stats, now)) {
+ 					/* leave dropping state */
+ 					vars->dropping = false;
+@@ -313,7 +312,7 @@ static struct sk_buff *codel_dequeue(str
+ 			stats->drop_count++;
+ 
+ 			skb = dequeue_func(vars, sch);
+-			drop = codel_should_drop(skb, backlog, vars, params,
++			drop = codel_should_drop(skb, sch, vars, params,
+ 						 stats, now);
+ 		}
+ 		vars->dropping = true;
+--- a/net/sched/sch_codel.c
++++ b/net/sched/sch_codel.c
+@@ -77,8 +77,8 @@ static struct sk_buff *codel_qdisc_deque
+ 	struct codel_sched_data *q = qdisc_priv(sch);
+ 	struct sk_buff *skb;
+ 
+-	skb = codel_dequeue(sch, &q->params, &q->vars, &q->stats,
+-			    dequeue, &sch->qstats.backlog);
++	skb = codel_dequeue(sch, &q->params, &q->vars, &q->stats, dequeue);
++
+ 	/* We cant call qdisc_tree_decrease_qlen() if our qlen is 0,
+ 	 * or HTB crashes. Defer it for next round.
+ 	 */
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -217,13 +217,14 @@ static int fq_codel_enqueue(struct sk_bu
+  */
+ static struct sk_buff *dequeue(struct codel_vars *vars, struct Qdisc *sch)
+ {
++	struct fq_codel_sched_data *q = qdisc_priv(sch);
+ 	struct fq_codel_flow *flow;
+ 	struct sk_buff *skb = NULL;
+ 
+ 	flow = container_of(vars, struct fq_codel_flow, cvars);
+ 	if (flow->head) {
+ 		skb = dequeue_head(flow);
+-		sch->qstats.backlog -= qdisc_pkt_len(skb);
++		q->backlogs[flow - q->flows] -= qdisc_pkt_len(skb);
+ 		sch->q.qlen--;
+ 	}
+ 	return skb;
+@@ -256,7 +257,7 @@ begin:
+ 	prev_ecn_mark = q->cstats.ecn_mark;
+ 
+ 	skb = codel_dequeue(sch, &q->cparams, &flow->cvars, &q->cstats,
+-			    dequeue, &q->backlogs[flow - q->flows]);
++			    dequeue);
+ 
+ 	flow->dropped += q->cstats.drop_count - prev_drop_count;
+ 	flow->dropped += q->cstats.ecn_mark - prev_ecn_mark;
diff --git a/trunk/target/linux/generic/patches-3.3/047-spi_message_queue.patch b/trunk/target/linux/generic/patches-3.3/047-spi_message_queue.patch
new file mode 100644
index 00000000..9aff0be2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/047-spi_message_queue.patch
@@ -0,0 +1,603 @@
+commit ffbbdd21329f3e15eeca6df2d4bc11c04d9d91c0
+Author: Linus Walleij <linus.walleij@linaro.org>
+Date:   Wed Feb 22 10:05:38 2012 +0100
+
+    spi: create a message queueing infrastructure
+    
+    This rips the message queue in the PL022 driver out and pushes
+    it into (optional) common infrastructure. Drivers that want to
+    use the message pumping thread will need to define the new
+    per-messags transfer methods and leave the deprecated transfer()
+    method as NULL.
+    
+    Most of the design is described in the documentation changes that
+    are included in this patch.
+    
+    Since there is a queue that need to be stopped when the system
+    is suspending/resuming, two new calls are implemented for the
+    device drivers to call in their suspend()/resume() functions:
+    spi_master_suspend() and spi_master_resume().
+    
+    ChangeLog v1->v2:
+    - Remove Kconfig entry and do not make the queue support optional
+      at all, instead be more agressive and have it as part of the
+      compulsory infrastructure.
+    - If the .transfer() method is implemented, delete print a small
+      deprecation notice and do not start the transfer pump.
+    - Fix a bitrotted comment.
+    ChangeLog v2->v3:
+    - Fix up a problematic sequence courtesy of Chris Blair.
+    - Stop rather than destroy the queue on suspend() courtesy of
+      Chris Blair.
+    
+    Signed-off-by: Chris Blair <chris.blair@stericsson.com>
+    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+    Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+    Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
+
+[Florian: dropped the changes on drivers/spi/spi-pl022.c, removed
+the dev_info() about unqueued drivers still using the master function]
+
+--- a/Documentation/spi/spi-summary
++++ b/Documentation/spi/spi-summary
+@@ -1,7 +1,7 @@
+ Overview of Linux kernel SPI support
+ ====================================
+ 
+-21-May-2007
++02-Feb-2012
+ 
+ What is SPI?
+ ------------
+@@ -483,9 +483,9 @@ also initialize its own internal state.
+ and those methods.)
+ 
+ After you initialize the spi_master, then use spi_register_master() to
+-publish it to the rest of the system.  At that time, device nodes for
+-the controller and any predeclared spi devices will be made available,
+-and the driver model core will take care of binding them to drivers.
++publish it to the rest of the system. At that time, device nodes for the
++controller and any predeclared spi devices will be made available, and
++the driver model core will take care of binding them to drivers.
+ 
+ If you need to remove your SPI controller driver, spi_unregister_master()
+ will reverse the effect of spi_register_master().
+@@ -521,21 +521,53 @@ SPI MASTER METHODS
+ 		** When you code setup(), ASSUME that the controller
+ 		** is actively processing transfers for another device.
+ 
+-    master->transfer(struct spi_device *spi, struct spi_message *message)
+-    	This must not sleep.  Its responsibility is arrange that the
+-	transfer happens and its complete() callback is issued.  The two
+-	will normally happen later, after other transfers complete, and
+-	if the controller is idle it will need to be kickstarted.
+-
+     master->cleanup(struct spi_device *spi)
+ 	Your controller driver may use spi_device.controller_state to hold
+ 	state it dynamically associates with that device.  If you do that,
+ 	be sure to provide the cleanup() method to free that state.
+ 
++    master->prepare_transfer_hardware(struct spi_master *master)
++	This will be called by the queue mechanism to signal to the driver
++	that a message is coming in soon, so the subsystem requests the
++	driver to prepare the transfer hardware by issuing this call.
++	This may sleep.
++
++    master->unprepare_transfer_hardware(struct spi_master *master)
++	This will be called by the queue mechanism to signal to the driver
++	that there are no more messages pending in the queue and it may
++	relax the hardware (e.g. by power management calls). This may sleep.
++
++    master->transfer_one_message(struct spi_master *master,
++				 struct spi_message *mesg)
++	The subsystem calls the driver to transfer a single message while
++	queuing transfers that arrive in the meantime. When the driver is
++	finished with this message, it must call
++	spi_finalize_current_message() so the subsystem can issue the next
++	transfer. This may sleep.
++
++    DEPRECATED METHODS
++
++    master->transfer(struct spi_device *spi, struct spi_message *message)
++	This must not sleep. Its responsibility is arrange that the
++	transfer happens and its complete() callback is issued. The two
++	will normally happen later, after other transfers complete, and
++	if the controller is idle it will need to be kickstarted. This
++	method is not used on queued controllers and must be NULL if
++	transfer_one_message() and (un)prepare_transfer_hardware() are
++	implemented.
++
+ 
+ SPI MESSAGE QUEUE
+ 
+-The bulk of the driver will be managing the I/O queue fed by transfer().
++If you are happy with the standard queueing mechanism provided by the
++SPI subsystem, just implement the queued methods specified above. Using
++the message queue has the upside of centralizing a lot of code and
++providing pure process-context execution of methods. The message queue
++can also be elevated to realtime priority on high-priority SPI traffic.
++
++Unless the queueing mechanism in the SPI subsystem is selected, the bulk
++of the driver will be managing the I/O queue fed by the now deprecated
++function transfer().
+ 
+ That queue could be purely conceptual.  For example, a driver used only
+ for low-frequency sensor access might be fine using synchronous PIO.
+@@ -561,4 +593,6 @@ Stephen Street
+ Mark Underwood
+ Andrew Victor
+ Vitaly Wool
+-
++Grant Likely
++Mark Brown
++Linus Walleij
+--- a/drivers/spi/spi.c
++++ b/drivers/spi/spi.c
+@@ -30,6 +30,9 @@
+ #include <linux/of_spi.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/export.h>
++#include <linux/sched.h>
++#include <linux/delay.h>
++#include <linux/kthread.h>
+ 
+ static void spidev_release(struct device *dev)
+ {
+@@ -507,6 +510,293 @@ spi_register_board_info(struct spi_board
+ 
+ /*-------------------------------------------------------------------------*/
+ 
++/**
++ * spi_pump_messages - kthread work function which processes spi message queue
++ * @work: pointer to kthread work struct contained in the master struct
++ *
++ * This function checks if there is any spi message in the queue that
++ * needs processing and if so call out to the driver to initialize hardware
++ * and transfer each message.
++ *
++ */
++static void spi_pump_messages(struct kthread_work *work)
++{
++	struct spi_master *master =
++		container_of(work, struct spi_master, pump_messages);
++	unsigned long flags;
++	bool was_busy = false;
++	int ret;
++
++	/* Lock queue and check for queue work */
++	spin_lock_irqsave(&master->queue_lock, flags);
++	if (list_empty(&master->queue) || !master->running) {
++		if (master->busy) {
++			ret = master->unprepare_transfer_hardware(master);
++			if (ret) {
++				dev_err(&master->dev,
++					"failed to unprepare transfer hardware\n");
++				return;
++			}
++		}
++		master->busy = false;
++		spin_unlock_irqrestore(&master->queue_lock, flags);
++		return;
++	}
++
++	/* Make sure we are not already running a message */
++	if (master->cur_msg) {
++		spin_unlock_irqrestore(&master->queue_lock, flags);
++		return;
++	}
++	/* Extract head of queue */
++	master->cur_msg =
++	    list_entry(master->queue.next, struct spi_message, queue);
++
++	list_del_init(&master->cur_msg->queue);
++	if (master->busy)
++		was_busy = true;
++	else
++		master->busy = true;
++	spin_unlock_irqrestore(&master->queue_lock, flags);
++
++	if (!was_busy) {
++		ret = master->prepare_transfer_hardware(master);
++		if (ret) {
++			dev_err(&master->dev,
++				"failed to prepare transfer hardware\n");
++			return;
++		}
++	}
++
++	ret = master->transfer_one_message(master, master->cur_msg);
++	if (ret) {
++		dev_err(&master->dev,
++			"failed to transfer one message from queue\n");
++		return;
++	}
++}
++
++static int spi_init_queue(struct spi_master *master)
++{
++	struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 };
++
++	INIT_LIST_HEAD(&master->queue);
++	spin_lock_init(&master->queue_lock);
++
++	master->running = false;
++	master->busy = false;
++
++	init_kthread_worker(&master->kworker);
++	master->kworker_task = kthread_run(kthread_worker_fn,
++					   &master->kworker,
++					   dev_name(&master->dev));
++	if (IS_ERR(master->kworker_task)) {
++		dev_err(&master->dev, "failed to create message pump task\n");
++		return -ENOMEM;
++	}
++	init_kthread_work(&master->pump_messages, spi_pump_messages);
++
++	/*
++	 * Master config will indicate if this controller should run the
++	 * message pump with high (realtime) priority to reduce the transfer
++	 * latency on the bus by minimising the delay between a transfer
++	 * request and the scheduling of the message pump thread. Without this
++	 * setting the message pump thread will remain at default priority.
++	 */
++	if (master->rt) {
++		dev_info(&master->dev,
++			"will run message pump with realtime priority\n");
++		sched_setscheduler(master->kworker_task, SCHED_FIFO, &param);
++	}
++
++	return 0;
++}
++
++/**
++ * spi_get_next_queued_message() - called by driver to check for queued
++ * messages
++ * @master: the master to check for queued messages
++ *
++ * If there are more messages in the queue, the next message is returned from
++ * this call.
++ */
++struct spi_message *spi_get_next_queued_message(struct spi_master *master)
++{
++	struct spi_message *next;
++	unsigned long flags;
++
++	/* get a pointer to the next message, if any */
++	spin_lock_irqsave(&master->queue_lock, flags);
++	if (list_empty(&master->queue))
++		next = NULL;
++	else
++		next = list_entry(master->queue.next,
++				  struct spi_message, queue);
++	spin_unlock_irqrestore(&master->queue_lock, flags);
++
++	return next;
++}
++EXPORT_SYMBOL_GPL(spi_get_next_queued_message);
++
++/**
++ * spi_finalize_current_message() - the current message is complete
++ * @master: the master to return the message to
++ *
++ * Called by the driver to notify the core that the message in the front of the
++ * queue is complete and can be removed from the queue.
++ */
++void spi_finalize_current_message(struct spi_master *master)
++{
++	struct spi_message *mesg;
++	unsigned long flags;
++
++	spin_lock_irqsave(&master->queue_lock, flags);
++	mesg = master->cur_msg;
++	master->cur_msg = NULL;
++
++	queue_kthread_work(&master->kworker, &master->pump_messages);
++	spin_unlock_irqrestore(&master->queue_lock, flags);
++
++	mesg->state = NULL;
++	if (mesg->complete)
++		mesg->complete(mesg->context);
++}
++EXPORT_SYMBOL_GPL(spi_finalize_current_message);
++
++static int spi_start_queue(struct spi_master *master)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&master->queue_lock, flags);
++
++	if (master->running || master->busy) {
++		spin_unlock_irqrestore(&master->queue_lock, flags);
++		return -EBUSY;
++	}
++
++	master->running = true;
++	master->cur_msg = NULL;
++	spin_unlock_irqrestore(&master->queue_lock, flags);
++
++	queue_kthread_work(&master->kworker, &master->pump_messages);
++
++	return 0;
++}
++
++static int spi_stop_queue(struct spi_master *master)
++{
++	unsigned long flags;
++	unsigned limit = 500;
++	int ret = 0;
++
++	spin_lock_irqsave(&master->queue_lock, flags);
++
++	/*
++	 * This is a bit lame, but is optimized for the common execution path.
++	 * A wait_queue on the master->busy could be used, but then the common
++	 * execution path (pump_messages) would be required to call wake_up or
++	 * friends on every SPI message. Do this instead.
++	 */
++	while ((!list_empty(&master->queue) || master->busy) && limit--) {
++		spin_unlock_irqrestore(&master->queue_lock, flags);
++		msleep(10);
++		spin_lock_irqsave(&master->queue_lock, flags);
++	}
++
++	if (!list_empty(&master->queue) || master->busy)
++		ret = -EBUSY;
++	else
++		master->running = false;
++
++	spin_unlock_irqrestore(&master->queue_lock, flags);
++
++	if (ret) {
++		dev_warn(&master->dev,
++			 "could not stop message queue\n");
++		return ret;
++	}
++	return ret;
++}
++
++static int spi_destroy_queue(struct spi_master *master)
++{
++	int ret;
++
++	ret = spi_stop_queue(master);
++
++	/*
++	 * flush_kthread_worker will block until all work is done.
++	 * If the reason that stop_queue timed out is that the work will never
++	 * finish, then it does no good to call flush/stop thread, so
++	 * return anyway.
++	 */
++	if (ret) {
++		dev_err(&master->dev, "problem destroying queue\n");
++		return ret;
++	}
++
++	flush_kthread_worker(&master->kworker);
++	kthread_stop(master->kworker_task);
++
++	return 0;
++}
++
++/**
++ * spi_queued_transfer - transfer function for queued transfers
++ * @spi: spi device which is requesting transfer
++ * @msg: spi message which is to handled is queued to driver queue
++ */
++static int spi_queued_transfer(struct spi_device *spi, struct spi_message *msg)
++{
++	struct spi_master *master = spi->master;
++	unsigned long flags;
++
++	spin_lock_irqsave(&master->queue_lock, flags);
++
++	if (!master->running) {
++		spin_unlock_irqrestore(&master->queue_lock, flags);
++		return -ESHUTDOWN;
++	}
++	msg->actual_length = 0;
++	msg->status = -EINPROGRESS;
++
++	list_add_tail(&msg->queue, &master->queue);
++	if (master->running && !master->busy)
++		queue_kthread_work(&master->kworker, &master->pump_messages);
++
++	spin_unlock_irqrestore(&master->queue_lock, flags);
++	return 0;
++}
++
++static int spi_master_initialize_queue(struct spi_master *master)
++{
++	int ret;
++
++	master->queued = true;
++	master->transfer = spi_queued_transfer;
++
++	/* Initialize and start queue */
++	ret = spi_init_queue(master);
++	if (ret) {
++		dev_err(&master->dev, "problem initializing queue\n");
++		goto err_init_queue;
++	}
++	ret = spi_start_queue(master);
++	if (ret) {
++		dev_err(&master->dev, "problem starting queue\n");
++		goto err_start_queue;
++	}
++
++	return 0;
++
++err_start_queue:
++err_init_queue:
++	spi_destroy_queue(master);
++	return ret;
++}
++
++/*-------------------------------------------------------------------------*/
++
+ static void spi_master_release(struct device *dev)
+ {
+ 	struct spi_master *master;
+@@ -522,6 +812,7 @@ static struct class spi_master_class = {
+ };
+ 
+ 
++
+ /**
+  * spi_alloc_master - allocate SPI master controller
+  * @dev: the controller, possibly using the platform_bus
+@@ -621,6 +912,15 @@ int spi_register_master(struct spi_maste
+ 	dev_dbg(dev, "registered master %s%s\n", dev_name(&master->dev),
+ 			dynamic ? " (dynamic)" : "");
+ 
++	/* If we're using a queued driver, start the queue */
++	if (!master->transfer) {
++		status = spi_master_initialize_queue(master);
++		if (status) {
++			device_unregister(&master->dev);
++			goto done;
++		}
++	}
++
+ 	mutex_lock(&board_lock);
+ 	list_add_tail(&master->list, &spi_master_list);
+ 	list_for_each_entry(bi, &board_list, list)
+@@ -636,7 +936,6 @@ done:
+ }
+ EXPORT_SYMBOL_GPL(spi_register_master);
+ 
+-
+ static int __unregister(struct device *dev, void *null)
+ {
+ 	spi_unregister_device(to_spi_device(dev));
+@@ -657,6 +956,11 @@ void spi_unregister_master(struct spi_ma
+ {
+ 	int dummy;
+ 
++	if (master->queued) {
++		if (spi_destroy_queue(master))
++			dev_err(&master->dev, "queue remove failed\n");
++	}
++
+ 	mutex_lock(&board_lock);
+ 	list_del(&master->list);
+ 	mutex_unlock(&board_lock);
+@@ -666,6 +970,37 @@ void spi_unregister_master(struct spi_ma
+ }
+ EXPORT_SYMBOL_GPL(spi_unregister_master);
+ 
++int spi_master_suspend(struct spi_master *master)
++{
++	int ret;
++
++	/* Basically no-ops for non-queued masters */
++	if (!master->queued)
++		return 0;
++
++	ret = spi_stop_queue(master);
++	if (ret)
++		dev_err(&master->dev, "queue stop failed\n");
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(spi_master_suspend);
++
++int spi_master_resume(struct spi_master *master)
++{
++	int ret;
++
++	if (!master->queued)
++		return 0;
++
++	ret = spi_start_queue(master);
++	if (ret)
++		dev_err(&master->dev, "queue restart failed\n");
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(spi_master_resume);
++
+ static int __spi_master_match(struct device *dev, void *data)
+ {
+ 	struct spi_master *m;
+--- a/include/linux/spi/spi.h
++++ b/include/linux/spi/spi.h
+@@ -22,6 +22,7 @@
+ #include <linux/device.h>
+ #include <linux/mod_devicetable.h>
+ #include <linux/slab.h>
++#include <linux/kthread.h>
+ 
+ /*
+  * INTERFACES between SPI master-side drivers and SPI infrastructure.
+@@ -235,6 +236,27 @@ static inline void spi_unregister_driver
+  *	the device whose settings are being modified.
+  * @transfer: adds a message to the controller's transfer queue.
+  * @cleanup: frees controller-specific state
++ * @queued: whether this master is providing an internal message queue
++ * @kworker: thread struct for message pump
++ * @kworker_task: pointer to task for message pump kworker thread
++ * @pump_messages: work struct for scheduling work to the message pump
++ * @queue_lock: spinlock to syncronise access to message queue
++ * @queue: message queue
++ * @cur_msg: the currently in-flight message
++ * @busy: message pump is busy
++ * @running: message pump is running
++ * @rt: whether this queue is set to run as a realtime task
++ * @prepare_transfer_hardware: a message will soon arrive from the queue
++ *	so the subsystem requests the driver to prepare the transfer hardware
++ *	by issuing this call
++ * @transfer_one_message: the subsystem calls the driver to transfer a single
++ *	message while queuing transfers that arrive in the meantime. When the
++ *	driver is finished with this message, it must call
++ *	spi_finalize_current_message() so the subsystem can issue the next
++ *	transfer
++ * @prepare_transfer_hardware: there are currently no more messages on the
++ *	queue so the subsystem notifies the driver that it may relax the
++ *	hardware by issuing this call
+  *
+  * Each SPI master controller can communicate with one or more @spi_device
+  * children.  These make a small bus, sharing MOSI, MISO and SCK signals
+@@ -318,6 +340,28 @@ struct spi_master {
+ 
+ 	/* called on release() to free memory provided by spi_master */
+ 	void			(*cleanup)(struct spi_device *spi);
++
++	/*
++	 * These hooks are for drivers that want to use the generic
++	 * master transfer queueing mechanism. If these are used, the
++	 * transfer() function above must NOT be specified by the driver.
++	 * Over time we expect SPI drivers to be phased over to this API.
++	 */
++	bool				queued;
++	struct kthread_worker		kworker;
++	struct task_struct		*kworker_task;
++	struct kthread_work		pump_messages;
++	spinlock_t			queue_lock;
++	struct list_head		queue;
++	struct spi_message		*cur_msg;
++	bool				busy;
++	bool				running;
++	bool				rt;
++
++	int (*prepare_transfer_hardware)(struct spi_master *master);
++	int (*transfer_one_message)(struct spi_master *master,
++				    struct spi_message *mesg);
++	int (*unprepare_transfer_hardware)(struct spi_master *master);
+ };
+ 
+ static inline void *spi_master_get_devdata(struct spi_master *master)
+@@ -343,6 +387,13 @@ static inline void spi_master_put(struct
+ 		put_device(&master->dev);
+ }
+ 
++/* PM calls that need to be issued by the driver */
++extern int spi_master_suspend(struct spi_master *master);
++extern int spi_master_resume(struct spi_master *master);
++
++/* Calls the driver make to interact with the message queue */
++extern struct spi_message *spi_get_next_queued_message(struct spi_master *master);
++extern void spi_finalize_current_message(struct spi_master *master);
+ 
+ /* the spi driver core manages memory for the spi_master classdev */
+ extern struct spi_master *
diff --git a/trunk/target/linux/generic/patches-3.3/048-spi-Dont-call-prepare-unprepare-transfer-if-not-popu.patch b/trunk/target/linux/generic/patches-3.3/048-spi-Dont-call-prepare-unprepare-transfer-if-not-popu.patch
new file mode 100644
index 00000000..deef32e4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/048-spi-Dont-call-prepare-unprepare-transfer-if-not-popu.patch
@@ -0,0 +1,39 @@
+From 7dfd2bd70228d1f8d468d58cb3d12ecd618479ed Mon Sep 17 00:00:00 2001
+From: Shubhrajyoti D <shubhrajyoti@ti.com>
+Date: Thu, 10 May 2012 19:20:41 +0530
+Subject: [PATCH] spi: Dont call prepare/unprepare transfer if not populated
+
+Currently the prepare/unprepare transfer are called unconditionally.
+The assumption is that every driver using the spi core queue infrastructure
+has to populate the prepare and unprepare functions. This encourages
+drivers to populate empty functions to prevent crashing.
+This patch prevents the call to prepare/unprepare if not populated.
+
+Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
+Acked-by: Linus Walleij <linus.walleij@linaro.org>
+[grant.likely: fix whitespace defect]
+Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
+---
+ drivers/spi/spi.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/spi/spi.c
++++ b/drivers/spi/spi.c
+@@ -530,7 +530,7 @@ static void spi_pump_messages(struct kth
+ 	/* Lock queue and check for queue work */
+ 	spin_lock_irqsave(&master->queue_lock, flags);
+ 	if (list_empty(&master->queue) || !master->running) {
+-		if (master->busy) {
++		if (master->busy && master->unprepare_transfer_hardware) {
+ 			ret = master->unprepare_transfer_hardware(master);
+ 			if (ret) {
+ 				dev_err(&master->dev,
+@@ -559,7 +559,7 @@ static void spi_pump_messages(struct kth
+ 		master->busy = true;
+ 	spin_unlock_irqrestore(&master->queue_lock, flags);
+ 
+-	if (!was_busy) {
++	if (!was_busy && master->prepare_transfer_hardware) {
+ 		ret = master->prepare_transfer_hardware(master);
+ 		if (ret) {
+ 			dev_err(&master->dev,
diff --git a/trunk/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch b/trunk/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch
new file mode 100644
index 00000000..bfb6ae20
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch
@@ -0,0 +1,52 @@
+From b8fc328668a74e1314a19266755a54abd875e5a6 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Sun, 29 Jul 2012 20:52:21 +0000
+Subject: [PATCH] codel: refine one condition to avoid a nul rec_inv_sqrt
+
+commit 2359a47671fc4fb0fe5e9945f76c2cb10792c0f8 upstream.
+
+One condition before codel_Newton_step() was not good if
+we never left the dropping state for a flow. As a result
+rec_inv_sqrt was 0, instead of the ~0 initial value.
+
+codel control law was then set to a very aggressive mode, dropping
+many packets before reaching 'target' and recovering from this problem.
+
+To keep codel_vars_init() as efficient as possible, refine
+the condition to make sure rec_inv_sqrt initial value is correct
+
+Many thanks to Anton Mich for discovering the issue and suggesting
+a fix.
+
+Reported-by: Anton Mich <lp2s1h@gmail.com>
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/codel.h |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/include/net/codel.h
++++ b/include/net/codel.h
+@@ -305,6 +305,8 @@ static struct sk_buff *codel_dequeue(str
+ 			}
+ 		}
+ 	} else if (drop) {
++		u32 delta;
++
+ 		if (params->ecn && INET_ECN_set_ce(skb)) {
+ 			stats->ecn_mark++;
+ 		} else {
+@@ -320,9 +322,11 @@ static struct sk_buff *codel_dequeue(str
+ 		 * assume that the drop rate that controlled the queue on the
+ 		 * last cycle is a good starting point to control it now.
+ 		 */
+-		if (codel_time_before(now - vars->drop_next,
++		delta = vars->count - vars->lastcount;
++		if (delta > 1 &&
++		    codel_time_before(now - vars->drop_next,
+ 				      16 * params->interval)) {
+-			vars->count = (vars->count - vars->lastcount) | 1;
++			vars->count = delta;
+ 			/* we dont care if rec_inv_sqrt approximation
+ 			 * is not very precise :
+ 			 * Next Newton steps will correct it quadratically.
diff --git a/trunk/target/linux/generic/patches-3.3/050-rng_git_backport.patch b/trunk/target/linux/generic/patches-3.3/050-rng_git_backport.patch
new file mode 100644
index 00000000..825eb73a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/050-rng_git_backport.patch
@@ -0,0 +1,783 @@
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -125,21 +125,26 @@
+  * The current exported interfaces for gathering environmental noise
+  * from the devices are:
+  *
++ *	void add_device_randomness(const void *buf, unsigned int size);
+  * 	void add_input_randomness(unsigned int type, unsigned int code,
+  *                                unsigned int value);
+- * 	void add_interrupt_randomness(int irq);
++ *	void add_interrupt_randomness(int irq, int irq_flags);
+  * 	void add_disk_randomness(struct gendisk *disk);
+  *
+  * add_input_randomness() uses the input layer interrupt timing, as well as
+  * the event type information from the hardware.
+  *
+- * add_interrupt_randomness() uses the inter-interrupt timing as random
+- * inputs to the entropy pool.  Note that not all interrupts are good
+- * sources of randomness!  For example, the timer interrupts is not a
+- * good choice, because the periodicity of the interrupts is too
+- * regular, and hence predictable to an attacker.  Network Interface
+- * Controller interrupts are a better measure, since the timing of the
+- * NIC interrupts are more unpredictable.
++ * add_interrupt_randomness() uses the interrupt timing as random
++ * inputs to the entropy pool. Using the cycle counters and the irq source
++ * as inputs, it feeds the randomness roughly once a second.
++ *
++ * add_device_randomness() is for adding data to the random pool that
++ * is likely to differ between two devices (or possibly even per boot).
++ * This would be things like MAC addresses or serial numbers, or the
++ * read-out of the RTC. This does *not* add any actual entropy to the
++ * pool, but it initializes the pool to different values for devices
++ * that might otherwise be identical and have very little entropy
++ * available to them (particularly common in the embedded world).
+  *
+  * add_disk_randomness() uses what amounts to the seek time of block
+  * layer request events, on a per-disk_devt basis, as input to the
+@@ -248,6 +253,7 @@
+ #include <linux/percpu.h>
+ #include <linux/cryptohash.h>
+ #include <linux/fips.h>
++#include <linux/ptrace.h>
+ 
+ #ifdef CONFIG_GENERIC_HARDIRQS
+ # include <linux/irq.h>
+@@ -256,8 +262,12 @@
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
+ #include <asm/irq.h>
++#include <asm/irq_regs.h>
+ #include <asm/io.h>
+ 
++#define CREATE_TRACE_POINTS
++#include <trace/events/random.h>
++
+ /*
+  * Configuration information
+  */
+@@ -420,8 +430,10 @@ struct entropy_store {
+ 	/* read-write data: */
+ 	spinlock_t lock;
+ 	unsigned add_ptr;
++	unsigned input_rotate;
+ 	int entropy_count;
+-	int input_rotate;
++	int entropy_total;
++	unsigned int initialized:1;
+ 	__u8 last_data[EXTRACT_SIZE];
+ };
+ 
+@@ -454,6 +466,10 @@ static struct entropy_store nonblocking_
+ 	.pool = nonblocking_pool_data
+ };
+ 
++static __u32 const twist_table[8] = {
++	0x00000000, 0x3b6e20c8, 0x76dc4190, 0x4db26158,
++	0xedb88320, 0xd6d6a3e8, 0x9b64c2b0, 0xa00ae278 };
++
+ /*
+  * This function adds bytes into the entropy "pool".  It does not
+  * update the entropy estimate.  The caller should call
+@@ -464,29 +480,24 @@ static struct entropy_store nonblocking_
+  * it's cheap to do so and helps slightly in the expected case where
+  * the entropy is concentrated in the low-order bits.
+  */
+-static void mix_pool_bytes_extract(struct entropy_store *r, const void *in,
+-				   int nbytes, __u8 out[64])
++static void _mix_pool_bytes(struct entropy_store *r, const void *in,
++			    int nbytes, __u8 out[64])
+ {
+-	static __u32 const twist_table[8] = {
+-		0x00000000, 0x3b6e20c8, 0x76dc4190, 0x4db26158,
+-		0xedb88320, 0xd6d6a3e8, 0x9b64c2b0, 0xa00ae278 };
+ 	unsigned long i, j, tap1, tap2, tap3, tap4, tap5;
+ 	int input_rotate;
+ 	int wordmask = r->poolinfo->poolwords - 1;
+ 	const char *bytes = in;
+ 	__u32 w;
+-	unsigned long flags;
+ 
+-	/* Taps are constant, so we can load them without holding r->lock.  */
+ 	tap1 = r->poolinfo->tap1;
+ 	tap2 = r->poolinfo->tap2;
+ 	tap3 = r->poolinfo->tap3;
+ 	tap4 = r->poolinfo->tap4;
+ 	tap5 = r->poolinfo->tap5;
+ 
+-	spin_lock_irqsave(&r->lock, flags);
+-	input_rotate = r->input_rotate;
+-	i = r->add_ptr;
++	smp_rmb();
++	input_rotate = ACCESS_ONCE(r->input_rotate);
++	i = ACCESS_ONCE(r->add_ptr);
+ 
+ 	/* mix one byte at a time to simplify size handling and churn faster */
+ 	while (nbytes--) {
+@@ -513,19 +524,61 @@ static void mix_pool_bytes_extract(struc
+ 		input_rotate += i ? 7 : 14;
+ 	}
+ 
+-	r->input_rotate = input_rotate;
+-	r->add_ptr = i;
++	ACCESS_ONCE(r->input_rotate) = input_rotate;
++	ACCESS_ONCE(r->add_ptr) = i;
++	smp_wmb();
+ 
+ 	if (out)
+ 		for (j = 0; j < 16; j++)
+ 			((__u32 *)out)[j] = r->pool[(i - j) & wordmask];
++}
++
++static void __mix_pool_bytes(struct entropy_store *r, const void *in,
++			     int nbytes, __u8 out[64])
++{
++	trace_mix_pool_bytes_nolock(r->name, nbytes, _RET_IP_);
++	_mix_pool_bytes(r, in, nbytes, out);
++}
+ 
++static void mix_pool_bytes(struct entropy_store *r, const void *in,
++			   int nbytes, __u8 out[64])
++{
++	unsigned long flags;
++
++	trace_mix_pool_bytes(r->name, nbytes, _RET_IP_);
++	spin_lock_irqsave(&r->lock, flags);
++	_mix_pool_bytes(r, in, nbytes, out);
+ 	spin_unlock_irqrestore(&r->lock, flags);
+ }
+ 
+-static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)
++struct fast_pool {
++	__u32		pool[4];
++	unsigned long	last;
++	unsigned short	count;
++	unsigned char	rotate;
++	unsigned char	last_timer_intr;
++};
++
++/*
++ * This is a fast mixing routine used by the interrupt randomness
++ * collector.  It's hardcoded for an 128 bit pool and assumes that any
++ * locks that might be needed are taken by the caller.
++ */
++static void fast_mix(struct fast_pool *f, const void *in, int nbytes)
+ {
+-       mix_pool_bytes_extract(r, in, bytes, NULL);
++	const char	*bytes = in;
++	__u32		w;
++	unsigned	i = f->count;
++	unsigned	input_rotate = f->rotate;
++
++	while (nbytes--) {
++		w = rol32(*bytes++, input_rotate & 31) ^ f->pool[i & 3] ^
++			f->pool[(i + 1) & 3];
++		f->pool[i & 3] = (w >> 3) ^ twist_table[w & 7];
++		input_rotate += (i++ & 3) ? 7 : 14;
++	}
++	f->count = i;
++	f->rotate = input_rotate;
+ }
+ 
+ /*
+@@ -533,30 +586,38 @@ static void mix_pool_bytes(struct entrop
+  */
+ static void credit_entropy_bits(struct entropy_store *r, int nbits)
+ {
+-	unsigned long flags;
+-	int entropy_count;
++	int entropy_count, orig;
+ 
+ 	if (!nbits)
+ 		return;
+ 
+-	spin_lock_irqsave(&r->lock, flags);
+-
+ 	DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name);
+-	entropy_count = r->entropy_count;
++retry:
++	entropy_count = orig = ACCESS_ONCE(r->entropy_count);
+ 	entropy_count += nbits;
++
+ 	if (entropy_count < 0) {
+ 		DEBUG_ENT("negative entropy/overflow\n");
+ 		entropy_count = 0;
+ 	} else if (entropy_count > r->poolinfo->POOLBITS)
+ 		entropy_count = r->poolinfo->POOLBITS;
+-	r->entropy_count = entropy_count;
++	if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
++		goto retry;
++
++	if (!r->initialized && nbits > 0) {
++		r->entropy_total += nbits;
++		if (r->entropy_total > 128)
++			r->initialized = 1;
++	}
++
++	trace_credit_entropy_bits(r->name, nbits, entropy_count,
++				  r->entropy_total, _RET_IP_);
+ 
+ 	/* should we wake readers? */
+ 	if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) {
+ 		wake_up_interruptible(&random_read_wait);
+ 		kill_fasync(&fasync, SIGIO, POLL_IN);
+ 	}
+-	spin_unlock_irqrestore(&r->lock, flags);
+ }
+ 
+ /*********************************************************************
+@@ -609,6 +670,25 @@ static void set_timer_rand_state(unsigne
+ }
+ #endif
+ 
++/*
++ * Add device- or boot-specific data to the input and nonblocking
++ * pools to help initialize them to unique values.
++ *
++ * None of this adds any entropy, it is meant to avoid the
++ * problem of the nonblocking pool having similar initial state
++ * across largely identical devices.
++ */
++void add_device_randomness(const void *buf, unsigned int size)
++{
++	unsigned long time = get_cycles() ^ jiffies;
++
++	mix_pool_bytes(&input_pool, buf, size, NULL);
++	mix_pool_bytes(&input_pool, &time, sizeof(time), NULL);
++	mix_pool_bytes(&nonblocking_pool, buf, size, NULL);
++	mix_pool_bytes(&nonblocking_pool, &time, sizeof(time), NULL);
++}
++EXPORT_SYMBOL(add_device_randomness);
++
+ static struct timer_rand_state input_timer_state;
+ 
+ /*
+@@ -637,13 +717,9 @@ static void add_timer_randomness(struct
+ 		goto out;
+ 
+ 	sample.jiffies = jiffies;
+-
+-	/* Use arch random value, fall back to cycles */
+-	if (!arch_get_random_int(&sample.cycles))
+-		sample.cycles = get_cycles();
+-
++	sample.cycles = get_cycles();
+ 	sample.num = num;
+-	mix_pool_bytes(&input_pool, &sample, sizeof(sample));
++	mix_pool_bytes(&input_pool, &sample, sizeof(sample), NULL);
+ 
+ 	/*
+ 	 * Calculate number of bits of randomness we probably added.
+@@ -700,17 +776,48 @@ void add_input_randomness(unsigned int t
+ }
+ EXPORT_SYMBOL_GPL(add_input_randomness);
+ 
+-void add_interrupt_randomness(int irq)
++static DEFINE_PER_CPU(struct fast_pool, irq_randomness);
++
++void add_interrupt_randomness(int irq, int irq_flags)
+ {
+-	struct timer_rand_state *state;
++	struct entropy_store	*r;
++	struct fast_pool	*fast_pool = &__get_cpu_var(irq_randomness);
++	struct pt_regs		*regs = get_irq_regs();
++	unsigned long		now = jiffies;
++	__u32			input[4], cycles = get_cycles();
++
++	input[0] = cycles ^ jiffies;
++	input[1] = irq;
++	if (regs) {
++		__u64 ip = instruction_pointer(regs);
++		input[2] = ip;
++		input[3] = ip >> 32;
++	}
+ 
+-	state = get_timer_rand_state(irq);
++	fast_mix(fast_pool, input, sizeof(input));
+ 
+-	if (state == NULL)
++	if ((fast_pool->count & 1023) &&
++	    !time_after(now, fast_pool->last + HZ))
+ 		return;
+ 
+-	DEBUG_ENT("irq event %d\n", irq);
+-	add_timer_randomness(state, 0x100 + irq);
++	fast_pool->last = now;
++
++	r = nonblocking_pool.initialized ? &input_pool : &nonblocking_pool;
++	__mix_pool_bytes(r, &fast_pool->pool, sizeof(fast_pool->pool), NULL);
++	/*
++	 * If we don't have a valid cycle counter, and we see
++	 * back-to-back timer interrupts, then skip giving credit for
++	 * any entropy.
++	 */
++	if (cycles == 0) {
++		if (irq_flags & __IRQF_TIMER) {
++			if (fast_pool->last_timer_intr)
++				return;
++			fast_pool->last_timer_intr = 1;
++		} else
++			fast_pool->last_timer_intr = 0;
++	}
++	credit_entropy_bits(r, 1);
+ }
+ 
+ #ifdef CONFIG_BLOCK
+@@ -742,7 +849,11 @@ static ssize_t extract_entropy(struct en
+  */
+ static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes)
+ {
+-	__u32 tmp[OUTPUT_POOL_WORDS];
++	union {
++		__u32	tmp[OUTPUT_POOL_WORDS];
++		long	hwrand[4];
++	} u;
++	int	i;
+ 
+ 	if (r->pull && r->entropy_count < nbytes * 8 &&
+ 	    r->entropy_count < r->poolinfo->POOLBITS) {
+@@ -753,17 +864,22 @@ static void xfer_secondary_pool(struct e
+ 		/* pull at least as many as BYTES as wakeup BITS */
+ 		bytes = max_t(int, bytes, random_read_wakeup_thresh / 8);
+ 		/* but never more than the buffer size */
+-		bytes = min_t(int, bytes, sizeof(tmp));
++		bytes = min_t(int, bytes, sizeof(u.tmp));
+ 
+ 		DEBUG_ENT("going to reseed %s with %d bits "
+ 			  "(%d of %d requested)\n",
+ 			  r->name, bytes * 8, nbytes * 8, r->entropy_count);
+ 
+-		bytes = extract_entropy(r->pull, tmp, bytes,
++		bytes = extract_entropy(r->pull, u.tmp, bytes,
+ 					random_read_wakeup_thresh / 8, rsvd);
+-		mix_pool_bytes(r, tmp, bytes);
++		mix_pool_bytes(r, u.tmp, bytes, NULL);
+ 		credit_entropy_bits(r, bytes*8);
+ 	}
++	for (i = 0; i < 4; i++)
++		if (arch_get_random_long(&u.hwrand[i]))
++			break;
++	if (i)
++		mix_pool_bytes(r, &u.hwrand, i * sizeof(u.hwrand[0]), 0);
+ }
+ 
+ /*
+@@ -822,9 +938,11 @@ static void extract_buf(struct entropy_s
+ 	int i;
+ 	__u32 hash[5], workspace[SHA_WORKSPACE_WORDS];
+ 	__u8 extract[64];
++	unsigned long flags;
+ 
+ 	/* Generate a hash across the pool, 16 words (512 bits) at a time */
+ 	sha_init(hash);
++	spin_lock_irqsave(&r->lock, flags);
+ 	for (i = 0; i < r->poolinfo->poolwords; i += 16)
+ 		sha_transform(hash, (__u8 *)(r->pool + i), workspace);
+ 
+@@ -837,7 +955,8 @@ static void extract_buf(struct entropy_s
+ 	 * brute-forcing the feedback as hard as brute-forcing the
+ 	 * hash.
+ 	 */
+-	mix_pool_bytes_extract(r, hash, sizeof(hash), extract);
++	__mix_pool_bytes(r, hash, sizeof(hash), extract);
++	spin_unlock_irqrestore(&r->lock, flags);
+ 
+ 	/*
+ 	 * To avoid duplicates, we atomically extract a portion of the
+@@ -860,12 +979,12 @@ static void extract_buf(struct entropy_s
+ }
+ 
+ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
+-			       size_t nbytes, int min, int reserved)
++				 size_t nbytes, int min, int reserved)
+ {
+ 	ssize_t ret = 0, i;
+ 	__u8 tmp[EXTRACT_SIZE];
+-	unsigned long flags;
+ 
++	trace_extract_entropy(r->name, nbytes, r->entropy_count, _RET_IP_);
+ 	xfer_secondary_pool(r, nbytes);
+ 	nbytes = account(r, nbytes, min, reserved);
+ 
+@@ -873,6 +992,8 @@ static ssize_t extract_entropy(struct en
+ 		extract_buf(r, tmp);
+ 
+ 		if (fips_enabled) {
++			unsigned long flags;
++
+ 			spin_lock_irqsave(&r->lock, flags);
+ 			if (!memcmp(tmp, r->last_data, EXTRACT_SIZE))
+ 				panic("Hardware RNG duplicated output!\n");
+@@ -898,6 +1019,7 @@ static ssize_t extract_entropy_user(stru
+ 	ssize_t ret = 0, i;
+ 	__u8 tmp[EXTRACT_SIZE];
+ 
++	trace_extract_entropy_user(r->name, nbytes, r->entropy_count, _RET_IP_);
+ 	xfer_secondary_pool(r, nbytes);
+ 	nbytes = account(r, nbytes, 0, 0);
+ 
+@@ -931,17 +1053,35 @@ static ssize_t extract_entropy_user(stru
+ 
+ /*
+  * This function is the exported kernel interface.  It returns some
+- * number of good random numbers, suitable for seeding TCP sequence
+- * numbers, etc.
++ * number of good random numbers, suitable for key generation, seeding
++ * TCP sequence numbers, etc.  It does not use the hw random number
++ * generator, if available; use get_random_bytes_arch() for that.
+  */
+ void get_random_bytes(void *buf, int nbytes)
+ {
++	extract_entropy(&nonblocking_pool, buf, nbytes, 0, 0);
++}
++EXPORT_SYMBOL(get_random_bytes);
++
++/*
++ * This function will use the architecture-specific hardware random
++ * number generator if it is available.  The arch-specific hw RNG will
++ * almost certainly be faster than what we can do in software, but it
++ * is impossible to verify that it is implemented securely (as
++ * opposed, to, say, the AES encryption of a sequence number using a
++ * key known by the NSA).  So it's useful if we need the speed, but
++ * only if we're willing to trust the hardware manufacturer not to
++ * have put in a back door.
++ */
++void get_random_bytes_arch(void *buf, int nbytes)
++{
+ 	char *p = buf;
+ 
++	trace_get_random_bytes(nbytes, _RET_IP_);
+ 	while (nbytes) {
+ 		unsigned long v;
+ 		int chunk = min(nbytes, (int)sizeof(unsigned long));
+-		
++
+ 		if (!arch_get_random_long(&v))
+ 			break;
+ 		
+@@ -950,9 +1090,11 @@ void get_random_bytes(void *buf, int nby
+ 		nbytes -= chunk;
+ 	}
+ 
+-	extract_entropy(&nonblocking_pool, p, nbytes, 0, 0);
++	if (nbytes)
++		extract_entropy(&nonblocking_pool, p, nbytes, 0, 0);
+ }
+-EXPORT_SYMBOL(get_random_bytes);
++EXPORT_SYMBOL(get_random_bytes_arch);
++
+ 
+ /*
+  * init_std_data - initialize pool with system data
+@@ -966,21 +1108,18 @@ EXPORT_SYMBOL(get_random_bytes);
+ static void init_std_data(struct entropy_store *r)
+ {
+ 	int i;
+-	ktime_t now;
+-	unsigned long flags;
++	ktime_t now = ktime_get_real();
++	unsigned long rv;
+ 
+-	spin_lock_irqsave(&r->lock, flags);
+ 	r->entropy_count = 0;
+-	spin_unlock_irqrestore(&r->lock, flags);
+-
+-	now = ktime_get_real();
+-	mix_pool_bytes(r, &now, sizeof(now));
+-	for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof flags) {
+-		if (!arch_get_random_long(&flags))
++	r->entropy_total = 0;
++	mix_pool_bytes(r, &now, sizeof(now), NULL);
++	for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof(rv)) {
++		if (!arch_get_random_long(&rv))
+ 			break;
+-		mix_pool_bytes(r, &flags, sizeof(flags));
++		mix_pool_bytes(r, &rv, sizeof(rv), NULL);
+ 	}
+-	mix_pool_bytes(r, utsname(), sizeof(*(utsname())));
++	mix_pool_bytes(r, utsname(), sizeof(*(utsname())), NULL);
+ }
+ 
+ static int rand_initialize(void)
+@@ -1117,7 +1256,7 @@ write_pool(struct entropy_store *r, cons
+ 		count -= bytes;
+ 		p += bytes;
+ 
+-		mix_pool_bytes(r, buf, bytes);
++		mix_pool_bytes(r, buf, bytes, NULL);
+ 		cond_resched();
+ 	}
+ 
+@@ -1274,6 +1413,7 @@ static int proc_do_uuid(ctl_table *table
+ }
+ 
+ static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
++extern ctl_table random_table[];
+ ctl_table random_table[] = {
+ 	{
+ 		.procname	= "poolsize",
+@@ -1339,7 +1479,7 @@ late_initcall(random_int_secret_init);
+  * value is not cryptographically secure but for several uses the cost of
+  * depleting entropy is too high
+  */
+-DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);
++static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);
+ unsigned int get_random_int(void)
+ {
+ 	__u32 *hash;
+--- a/drivers/mfd/ab3100-core.c
++++ b/drivers/mfd/ab3100-core.c
+@@ -409,8 +409,6 @@ static irqreturn_t ab3100_irq_handler(in
+ 	u32 fatevent;
+ 	int err;
+ 
+-	add_interrupt_randomness(irq);
+-
+ 	err = ab3100_get_register_page_interruptible(ab3100, AB3100_EVENTA1,
+ 				       event_regs, 3);
+ 	if (err)
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -24,6 +24,7 @@
+ #include <linux/kthread.h>
+ #include <linux/mutex.h>
+ #include <linux/freezer.h>
++#include <linux/random.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/byteorder.h>
+@@ -1896,6 +1897,14 @@ int usb_new_device(struct usb_device *ud
+ 	/* Tell the world! */
+ 	announce_device(udev);
+ 
++	if (udev->serial)
++		add_device_randomness(udev->serial, strlen(udev->serial));
++	if (udev->product)
++		add_device_randomness(udev->product, strlen(udev->product));
++	if (udev->manufacturer)
++		add_device_randomness(udev->manufacturer,
++				      strlen(udev->manufacturer));
++
+ 	device_enable_async_suspend(&udev->dev);
+ 	/* Register the device.  The device driver is responsible
+ 	 * for configuring the device and invoking the add-device
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -50,11 +50,13 @@ struct rnd_state {
+ 
+ extern void rand_initialize_irq(int irq);
+ 
++extern void add_device_randomness(const void *, unsigned int);
+ extern void add_input_randomness(unsigned int type, unsigned int code,
+ 				 unsigned int value);
+-extern void add_interrupt_randomness(int irq);
++extern void add_interrupt_randomness(int irq, int irq_flags);
+ 
+ extern void get_random_bytes(void *buf, int nbytes);
++extern void get_random_bytes_arch(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+ 
+ #ifndef MODULE
+--- /dev/null
++++ b/include/trace/events/random.h
+@@ -0,0 +1,134 @@
++#undef TRACE_SYSTEM
++#define TRACE_SYSTEM random
++
++#if !defined(_TRACE_RANDOM_H) || defined(TRACE_HEADER_MULTI_READ)
++#define _TRACE_RANDOM_H
++
++#include <linux/writeback.h>
++#include <linux/tracepoint.h>
++
++DECLARE_EVENT_CLASS(random__mix_pool_bytes,
++	TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
++
++	TP_ARGS(pool_name, bytes, IP),
++
++	TP_STRUCT__entry(
++		__field( const char *,	pool_name		)
++		__field(	  int,	bytes			)
++		__field(unsigned long,	IP			)
++	),
++
++	TP_fast_assign(
++		__entry->pool_name	= pool_name;
++		__entry->bytes		= bytes;
++		__entry->IP		= IP;
++	),
++
++	TP_printk("%s pool: bytes %d caller %pF",
++		  __entry->pool_name, __entry->bytes, (void *)__entry->IP)
++);
++
++DEFINE_EVENT(random__mix_pool_bytes, mix_pool_bytes,
++	TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
++
++	TP_ARGS(pool_name, bytes, IP)
++);
++
++DEFINE_EVENT(random__mix_pool_bytes, mix_pool_bytes_nolock,
++	TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
++
++	TP_ARGS(pool_name, bytes, IP)
++);
++
++TRACE_EVENT(credit_entropy_bits,
++	TP_PROTO(const char *pool_name, int bits, int entropy_count,
++		 int entropy_total, unsigned long IP),
++
++	TP_ARGS(pool_name, bits, entropy_count, entropy_total, IP),
++
++	TP_STRUCT__entry(
++		__field( const char *,	pool_name		)
++		__field(	  int,	bits			)
++		__field(	  int,	entropy_count		)
++		__field(	  int,	entropy_total		)
++		__field(unsigned long,	IP			)
++	),
++
++	TP_fast_assign(
++		__entry->pool_name	= pool_name;
++		__entry->bits		= bits;
++		__entry->entropy_count	= entropy_count;
++		__entry->entropy_total	= entropy_total;
++		__entry->IP		= IP;
++	),
++
++	TP_printk("%s pool: bits %d entropy_count %d entropy_total %d "
++		  "caller %pF", __entry->pool_name, __entry->bits,
++		  __entry->entropy_count, __entry->entropy_total,
++		  (void *)__entry->IP)
++);
++
++TRACE_EVENT(get_random_bytes,
++	TP_PROTO(int nbytes, unsigned long IP),
++
++	TP_ARGS(nbytes, IP),
++
++	TP_STRUCT__entry(
++		__field(	  int,	nbytes			)
++		__field(unsigned long,	IP			)
++	),
++
++	TP_fast_assign(
++		__entry->nbytes		= nbytes;
++		__entry->IP		= IP;
++	),
++
++	TP_printk("nbytes %d caller %pF", __entry->nbytes, (void *)__entry->IP)
++);
++
++DECLARE_EVENT_CLASS(random__extract_entropy,
++	TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
++		 unsigned long IP),
++
++	TP_ARGS(pool_name, nbytes, entropy_count, IP),
++
++	TP_STRUCT__entry(
++		__field( const char *,	pool_name		)
++		__field(	  int,	nbytes			)
++		__field(	  int,	entropy_count		)
++		__field(unsigned long,	IP			)
++	),
++
++	TP_fast_assign(
++		__entry->pool_name	= pool_name;
++		__entry->nbytes		= nbytes;
++		__entry->entropy_count	= entropy_count;
++		__entry->IP		= IP;
++	),
++
++	TP_printk("%s pool: nbytes %d entropy_count %d caller %pF",
++		  __entry->pool_name, __entry->nbytes, __entry->entropy_count,
++		  (void *)__entry->IP)
++);
++
++
++DEFINE_EVENT(random__extract_entropy, extract_entropy,
++	TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
++		 unsigned long IP),
++
++	TP_ARGS(pool_name, nbytes, entropy_count, IP)
++);
++
++DEFINE_EVENT(random__extract_entropy, extract_entropy_user,
++	TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
++		 unsigned long IP),
++
++	TP_ARGS(pool_name, nbytes, entropy_count, IP)
++);
++
++
++
++#endif /* _TRACE_RANDOM_H */
++
++/* This part must be outside protection */
++#include <trace/define_trace.h>
+--- a/kernel/irq/handle.c
++++ b/kernel/irq/handle.c
+@@ -117,7 +117,7 @@ irqreturn_t
+ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
+ {
+ 	irqreturn_t retval = IRQ_NONE;
+-	unsigned int random = 0, irq = desc->irq_data.irq;
++	unsigned int flags = 0, irq = desc->irq_data.irq;
+ 
+ 	do {
+ 		irqreturn_t res;
+@@ -145,7 +145,7 @@ handle_irq_event_percpu(struct irq_desc
+ 
+ 			/* Fall through to add to randomness */
+ 		case IRQ_HANDLED:
+-			random |= action->flags;
++			flags |= action->flags;
+ 			break;
+ 
+ 		default:
+@@ -156,8 +156,7 @@ handle_irq_event_percpu(struct irq_desc
+ 		action = action->next;
+ 	} while (action);
+ 
+-	if (random & IRQF_SAMPLE_RANDOM)
+-		add_interrupt_randomness(irq);
++	add_interrupt_randomness(irq, flags);
+ 
+ 	if (!noirqdebug)
+ 		note_interrupt(irq, desc, retval);
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -1176,6 +1176,7 @@ static int __dev_open(struct net_device
+ 		net_dmaengine_get();
+ 		dev_set_rx_mode(dev);
+ 		dev_activate(dev);
++		add_device_randomness(dev->dev_addr, dev->addr_len);
+ 	}
+ 
+ 	return ret;
+@@ -4823,6 +4824,7 @@ int dev_set_mac_address(struct net_devic
+ 	err = ops->ndo_set_mac_address(dev, sa);
+ 	if (!err)
+ 		call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
++	add_device_randomness(dev->dev_addr, dev->addr_len);
+ 	return err;
+ }
+ EXPORT_SYMBOL(dev_set_mac_address);
+@@ -5602,6 +5604,7 @@ int register_netdevice(struct net_device
+ 	dev_init_scheduler(dev);
+ 	dev_hold(dev);
+ 	list_netdevice(dev);
++	add_device_randomness(dev->dev_addr, dev->addr_len);
+ 
+ 	/* Notify protocols, that a new device appeared. */
+ 	ret = call_netdevice_notifiers(NETDEV_REGISTER, dev);
+--- a/net/core/rtnetlink.c
++++ b/net/core/rtnetlink.c
+@@ -1371,6 +1371,7 @@ static int do_setlink(struct net_device
+ 			goto errout;
+ 		send_addr_notify = 1;
+ 		modified = 1;
++		add_device_randomness(dev->dev_addr, dev->addr_len);
+ 	}
+ 
+ 	if (tb[IFLA_MTU]) {
diff --git a/trunk/target/linux/generic/patches-3.3/051-rng_git_backport-remove_irqf_sample_random.patch b/trunk/target/linux/generic/patches-3.3/051-rng_git_backport-remove_irqf_sample_random.patch
new file mode 100644
index 00000000..93706ed3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/051-rng_git_backport-remove_irqf_sample_random.patch
@@ -0,0 +1,543 @@
+--- a/arch/arm/mach-omap1/board-palmz71.c
++++ b/arch/arm/mach-omap1/board-palmz71.c
+@@ -291,8 +291,7 @@ palmz71_gpio_setup(int early)
+ 		}
+ 		gpio_direction_input(PALMZ71_USBDETECT_GPIO);
+ 		if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
+-				palmz71_powercable, IRQF_SAMPLE_RANDOM,
+-				"palmz71-cable", 0))
++				palmz71_powercable, 0, "palmz71-cable", 0))
+ 			printk(KERN_ERR
+ 					"IRQ request for power cable failed!\n");
+ 		palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), 0);
+--- a/arch/arm/mach-pxa/lubbock.c
++++ b/arch/arm/mach-pxa/lubbock.c
+@@ -455,7 +455,7 @@ static int lubbock_mci_init(struct devic
+ 	init_timer(&mmc_timer);
+ 	mmc_timer.data = (unsigned long) data;
+ 	return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,
+-			IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data);
++			   0, "lubbock-sd-detect", data);
+ }
+ 
+ static int lubbock_mci_get_ro(struct device *dev)
+--- a/arch/arm/mach-pxa/magician.c
++++ b/arch/arm/mach-pxa/magician.c
+@@ -617,9 +617,8 @@ static struct platform_device bq24022 =
+ static int magician_mci_init(struct device *dev,
+ 				irq_handler_t detect_irq, void *data)
+ {
+-	return request_irq(IRQ_MAGICIAN_SD, detect_irq,
+-				IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
+-				"mmc card detect", data);
++	return request_irq(IRQ_MAGICIAN_SD, detect_irq, IRQF_DISABLED,
++			   "mmc card detect", data);
+ }
+ 
+ static void magician_mci_exit(struct device *dev, void *data)
+--- a/arch/arm/mach-pxa/trizeps4.c
++++ b/arch/arm/mach-pxa/trizeps4.c
+@@ -332,8 +332,8 @@ static int trizeps4_mci_init(struct devi
+ 	int err;
+ 
+ 	err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,
+-		IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SAMPLE_RANDOM,
+-		"MMC card detect", data);
++			  IRQF_DISABLED | IRQF_TRIGGER_RISING,
++			  "MMC card detect", data);
+ 	if (err) {
+ 		printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request"
+ 						"MMC card detect IRQ\n");
+--- a/arch/ia64/kernel/irq_ia64.c
++++ b/arch/ia64/kernel/irq_ia64.c
+@@ -23,7 +23,6 @@
+ #include <linux/ioport.h>
+ #include <linux/kernel_stat.h>
+ #include <linux/ptrace.h>
+-#include <linux/random.h>	/* for rand_initialize_irq() */
+ #include <linux/signal.h>
+ #include <linux/smp.h>
+ #include <linux/threads.h>
+--- a/arch/sparc/kernel/ldc.c
++++ b/arch/sparc/kernel/ldc.c
+@@ -1250,14 +1250,12 @@ int ldc_bind(struct ldc_channel *lp, con
+ 	snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);
+ 	snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
+ 
+-	err = request_irq(lp->cfg.rx_irq, ldc_rx,
+-			  IRQF_SAMPLE_RANDOM | IRQF_DISABLED,
++	err = request_irq(lp->cfg.rx_irq, ldc_rx, IRQF_DISABLED,
+ 			  lp->rx_irq_name, lp);
+ 	if (err)
+ 		return err;
+ 
+-	err = request_irq(lp->cfg.tx_irq, ldc_tx,
+-			  IRQF_SAMPLE_RANDOM | IRQF_DISABLED,
++	err = request_irq(lp->cfg.tx_irq, ldc_tx, IRQF_DISABLED,
+ 			  lp->tx_irq_name, lp);
+ 	if (err) {
+ 		free_irq(lp->cfg.rx_irq, lp);
+--- a/arch/um/drivers/line.c
++++ b/arch/um/drivers/line.c
+@@ -371,7 +371,7 @@ static irqreturn_t line_write_interrupt(
+ int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
+ {
+ 	const struct line_driver *driver = line->driver;
+-	int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;
++	int err = 0, flags = IRQF_DISABLED | IRQF_SHARED;
+ 
+ 	if (input)
+ 		err = um_request_irq(driver->read_irq, fd, IRQ_READ,
+@@ -807,7 +807,7 @@ void register_winch_irq(int fd, int tty_
+ 				   .stack	= stack });
+ 
+ 	if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
+-			   IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
++			   IRQF_DISABLED | IRQF_SHARED,
+ 			   "winch", winch) < 0) {
+ 		printk(KERN_ERR "register_winch_irq - failed to register "
+ 		       "IRQ\n");
+--- a/arch/um/drivers/mconsole_kern.c
++++ b/arch/um/drivers/mconsole_kern.c
+@@ -773,7 +773,7 @@ static int __init mconsole_init(void)
+ 	register_reboot_notifier(&reboot_notifier);
+ 
+ 	err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,
+-			     IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
++			     IRQF_DISABLED | IRQF_SHARED,
+ 			     "mconsole", (void *)sock);
+ 	if (err) {
+ 		printk(KERN_ERR "Failed to get IRQ for management console\n");
+--- a/arch/um/drivers/port_kern.c
++++ b/arch/um/drivers/port_kern.c
+@@ -100,7 +100,7 @@ static int port_accept(struct port_list
+ 		  .port 	= port });
+ 
+ 	if (um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,
+-			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
++			  IRQF_DISABLED | IRQF_SHARED,
+ 			  "telnetd", conn)) {
+ 		printk(KERN_ERR "port_accept : failed to get IRQ for "
+ 		       "telnetd\n");
+@@ -184,7 +184,7 @@ void *port_data(int port_num)
+ 	}
+ 
+ 	if (um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt,
+-			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
++			  IRQF_DISABLED | IRQF_SHARED,
+ 			  "port", port)) {
+ 		printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);
+ 		goto out_close;
+--- a/arch/um/drivers/random.c
++++ b/arch/um/drivers/random.c
+@@ -131,8 +131,7 @@ static int __init rng_init (void)
+ 	random_fd = err;
+ 
+ 	err = um_request_irq(RANDOM_IRQ, random_fd, IRQ_READ, random_interrupt,
+-			     IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "random",
+-			     NULL);
++			     IRQF_DISABLED, "random", NULL);
+ 	if (err)
+ 		goto err_out_cleanup_hw;
+ 
+--- a/arch/um/drivers/xterm_kern.c
++++ b/arch/um/drivers/xterm_kern.c
+@@ -50,8 +50,7 @@ int xterm_fd(int socket, int *pid_out)
+ 	init_completion(&data->ready);
+ 
+ 	err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
+-			     IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+-			     "xterm", data);
++			     IRQF_DISABLED | IRQF_SHARED, "xterm", data);
+ 	if (err) {
+ 		printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
+ 		       "err = %d\n",  err);
+--- a/arch/um/kernel/sigio.c
++++ b/arch/um/kernel/sigio.c
+@@ -25,8 +25,7 @@ int write_sigio_irq(int fd)
+ 	int err;
+ 
+ 	err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt,
+-			     IRQF_DISABLED|IRQF_SAMPLE_RANDOM, "write sigio",
+-			     NULL);
++			     IRQF_DISABLED, "write sigio", NULL);
+ 	if (err) {
+ 		printk(KERN_ERR "write_sigio_irq : um_request_irq failed, "
+ 		       "err = %d\n", err);
+--- a/Documentation/feature-removal-schedule.txt
++++ b/Documentation/feature-removal-schedule.txt
+@@ -71,20 +71,6 @@ Who:	Luis R. Rodriguez <lrodriguez@ather
+ 
+ ---------------------------
+ 
+-What:	IRQF_SAMPLE_RANDOM
+-Check:	IRQF_SAMPLE_RANDOM
+-When:	July 2009
+-
+-Why:	Many of IRQF_SAMPLE_RANDOM users are technically bogus as entropy
+-	sources in the kernel's current entropy model. To resolve this, every
+-	input point to the kernel's entropy pool needs to better document the
+-	type of entropy source it actually is. This will be replaced with
+-	additional add_*_randomness functions in drivers/char/random.c
+-
+-Who:	Robin Getz <rgetz@blackfin.uclinux.org> & Matt Mackall <mpm@selenic.com>
+-
+----------------------------
+-
+ What:	The ieee80211_regdom module parameter
+ When:	March 2010 / desktop catchup
+ 
+--- a/drivers/block/xen-blkfront.c
++++ b/drivers/block/xen-blkfront.c
+@@ -852,9 +852,8 @@ static int setup_blkring(struct xenbus_d
+ 	if (err)
+ 		goto fail;
+ 
+-	err = bind_evtchn_to_irqhandler(info->evtchn,
+-					blkif_interrupt,
+-					IRQF_SAMPLE_RANDOM, "blkif", info);
++	err = bind_evtchn_to_irqhandler(info->evtchn, blkif_interrupt, 0,
++					"blkif", info);
+ 	if (err <= 0) {
+ 		xenbus_dev_fatal(dev, err,
+ 				 "bind_evtchn_to_irqhandler failed");
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -633,43 +633,6 @@ struct timer_rand_state {
+ 	unsigned dont_count_entropy:1;
+ };
+ 
+-#ifndef CONFIG_GENERIC_HARDIRQS
+-
+-static struct timer_rand_state *irq_timer_state[NR_IRQS];
+-
+-static struct timer_rand_state *get_timer_rand_state(unsigned int irq)
+-{
+-	return irq_timer_state[irq];
+-}
+-
+-static void set_timer_rand_state(unsigned int irq,
+-				 struct timer_rand_state *state)
+-{
+-	irq_timer_state[irq] = state;
+-}
+-
+-#else
+-
+-static struct timer_rand_state *get_timer_rand_state(unsigned int irq)
+-{
+-	struct irq_desc *desc;
+-
+-	desc = irq_to_desc(irq);
+-
+-	return desc->timer_rand_state;
+-}
+-
+-static void set_timer_rand_state(unsigned int irq,
+-				 struct timer_rand_state *state)
+-{
+-	struct irq_desc *desc;
+-
+-	desc = irq_to_desc(irq);
+-
+-	desc->timer_rand_state = state;
+-}
+-#endif
+-
+ /*
+  * Add device- or boot-specific data to the input and nonblocking
+  * pools to help initialize them to unique values.
+@@ -1131,24 +1094,6 @@ static int rand_initialize(void)
+ }
+ module_init(rand_initialize);
+ 
+-void rand_initialize_irq(int irq)
+-{
+-	struct timer_rand_state *state;
+-
+-	state = get_timer_rand_state(irq);
+-
+-	if (state)
+-		return;
+-
+-	/*
+-	 * If kzalloc returns null, we just won't use that entropy
+-	 * source.
+-	 */
+-	state = kzalloc(sizeof(struct timer_rand_state), GFP_KERNEL);
+-	if (state)
+-		set_timer_rand_state(irq, state);
+-}
+-
+ #ifdef CONFIG_BLOCK
+ void rand_initialize_disk(struct gendisk *disk)
+ {
+--- a/drivers/crypto/n2_core.c
++++ b/drivers/crypto/n2_core.c
+@@ -1607,8 +1607,7 @@ static int spu_map_ino(struct platform_d
+ 
+ 	sprintf(p->irq_name, "%s-%d", irq_name, index);
+ 
+-	return request_irq(p->irq, handler, IRQF_SAMPLE_RANDOM,
+-			   p->irq_name, p);
++	return request_irq(p->irq, handler, 0, p->irq_name, p);
+ }
+ 
+ static struct kmem_cache *queue_cache[2];
+--- a/drivers/hv/vmbus_drv.c
++++ b/drivers/hv/vmbus_drv.c
+@@ -545,8 +545,7 @@ static int vmbus_bus_init(int irq)
+ 	if (ret)
+ 		goto err_cleanup;
+ 
+-	ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
+-			driver_name, hv_acpi_dev);
++	ret = request_irq(irq, vmbus_isr, 0, driver_name, hv_acpi_dev);
+ 
+ 	if (ret != 0) {
+ 		pr_err("Unable to request IRQ %d\n",
+--- a/drivers/i2c/busses/i2c-pmcmsp.c
++++ b/drivers/i2c/busses/i2c-pmcmsp.c
+@@ -306,8 +306,7 @@ static int __devinit pmcmsptwi_probe(str
+ 	pmcmsptwi_data.irq = platform_get_irq(pldev, 0);
+ 	if (pmcmsptwi_data.irq) {
+ 		rc = request_irq(pmcmsptwi_data.irq, &pmcmsptwi_interrupt,
+-			IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+-			pldev->name, &pmcmsptwi_data);
++				 IRQF_SHARED, pldev->name, &pmcmsptwi_data);
+ 		if (rc == 0) {
+ 			/*
+ 			 * Enable 'DONE' interrupt only.
+--- a/drivers/input/serio/hp_sdc.c
++++ b/drivers/input/serio/hp_sdc.c
+@@ -879,7 +879,7 @@ static int __init hp_sdc_init(void)
+ #endif
+ 
+ 	errstr = "IRQ not available for";
+-	if (request_irq(hp_sdc.irq, &hp_sdc_isr, IRQF_SHARED|IRQF_SAMPLE_RANDOM,
++	if (request_irq(hp_sdc.irq, &hp_sdc_isr, IRQF_SHARED,
+ 			"HP SDC", &hp_sdc))
+ 		goto err1;
+ 
+--- a/drivers/mfd/ab3100-core.c
++++ b/drivers/mfd/ab3100-core.c
+@@ -937,9 +937,6 @@ static int __devinit ab3100_probe(struct
+ 
+ 	err = request_threaded_irq(client->irq, NULL, ab3100_irq_handler,
+ 				IRQF_ONESHOT, "ab3100-core", ab3100);
+-	/* This real unpredictable IRQ is of course sampled for entropy */
+-	rand_initialize_irq(client->irq);
+-
+ 	if (err)
+ 		goto exit_no_irq;
+ 
+--- a/drivers/mfd/tps65010.c
++++ b/drivers/mfd/tps65010.c
+@@ -563,8 +563,7 @@ static int tps65010_probe(struct i2c_cli
+ 	 */
+ 	if (client->irq > 0) {
+ 		status = request_irq(client->irq, tps65010_irq,
+-			IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_FALLING,
+-			DRIVER_NAME, tps);
++			IRQF_TRIGGER_FALLING, DRIVER_NAME, tps);
+ 		if (status < 0) {
+ 			dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
+ 					client->irq, status);
+--- a/drivers/net/ethernet/broadcom/tg3.c
++++ b/drivers/net/ethernet/broadcom/tg3.c
+@@ -9415,7 +9415,7 @@ static int tg3_test_interrupt(struct tg3
+ 	}
+ 
+ 	err = request_irq(tnapi->irq_vec, tg3_test_isr,
+-			  IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, tnapi);
++			  IRQF_SHARED, dev->name, tnapi);
+ 	if (err)
+ 		return err;
+ 
+--- a/drivers/power/pda_power.c
++++ b/drivers/power/pda_power.c
+@@ -24,11 +24,7 @@
+ 
+ static inline unsigned int get_irq_flags(struct resource *res)
+ {
+-	unsigned int flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
+-
+-	flags |= res->flags & IRQF_TRIGGER_MASK;
+-
+-	return flags;
++	return IRQF_SHARED | (res->flags & IRQF_TRIGGER_MASK);
+ }
+ 
+ static struct device *dev;
+--- a/drivers/tty/serial/uartlite.c
++++ b/drivers/tty/serial/uartlite.c
+@@ -216,8 +216,7 @@ static int ulite_startup(struct uart_por
+ {
+ 	int ret;
+ 
+-	ret = request_irq(port->irq, ulite_isr,
+-			  IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port);
++	ret = request_irq(port->irq, ulite_isr, IRQF_SHARED, "uartlite", port);
+ 	if (ret)
+ 		return ret;
+ 
+--- a/drivers/usb/gadget/goku_udc.c
++++ b/drivers/usb/gadget/goku_udc.c
+@@ -1839,7 +1839,7 @@ static int goku_probe(struct pci_dev *pd
+ 	/* init to known state, then setup irqs */
+ 	udc_reset(dev);
+ 	udc_reinit (dev);
+-	if (request_irq(pdev->irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/,
++	if (request_irq(pdev->irq, goku_irq, IRQF_SHARED,
+ 			driver_name, dev) != 0) {
+ 		DBG(dev, "request interrupt %d failed\n", pdev->irq);
+ 		retval = -EBUSY;
+--- a/drivers/usb/gadget/omap_udc.c
++++ b/drivers/usb/gadget/omap_udc.c
+@@ -2943,7 +2943,7 @@ known:
+ 
+ 	/* USB general purpose IRQ:  ep0, state changes, dma, etc */
+ 	status = request_irq(pdev->resource[1].start, omap_udc_irq,
+-			IRQF_SAMPLE_RANDOM, driver_name, udc);
++			     0, driver_name, udc);
+ 	if (status != 0) {
+ 		ERR("can't get irq %d, err %d\n",
+ 			(int) pdev->resource[1].start, status);
+@@ -2952,7 +2952,7 @@ known:
+ 
+ 	/* USB "non-iso" IRQ (PIO for all but ep0) */
+ 	status = request_irq(pdev->resource[2].start, omap_udc_pio_irq,
+-			IRQF_SAMPLE_RANDOM, "omap_udc pio", udc);
++			     0, "omap_udc pio", udc);
+ 	if (status != 0) {
+ 		ERR("can't get irq %d, err %d\n",
+ 			(int) pdev->resource[2].start, status);
+--- a/drivers/usb/gadget/pxa25x_udc.c
++++ b/drivers/usb/gadget/pxa25x_udc.c
+@@ -2202,19 +2202,15 @@ static int __init pxa25x_udc_probe(struc
+ 
+ #ifdef CONFIG_ARCH_LUBBOCK
+ 	if (machine_is_lubbock()) {
+-		retval = request_irq(LUBBOCK_USB_DISC_IRQ,
+-				lubbock_vbus_irq,
+-				IRQF_SAMPLE_RANDOM,
+-				driver_name, dev);
++		retval = request_irq(LUBBOCK_USB_DISC_IRQ, lubbock_vbus_irq,
++				     0, driver_name, dev);
+ 		if (retval != 0) {
+ 			pr_err("%s: can't get irq %i, err %d\n",
+ 				driver_name, LUBBOCK_USB_DISC_IRQ, retval);
+ 			goto err_irq_lub;
+ 		}
+-		retval = request_irq(LUBBOCK_USB_IRQ,
+-				lubbock_vbus_irq,
+-				IRQF_SAMPLE_RANDOM,
+-				driver_name, dev);
++		retval = request_irq(LUBBOCK_USB_IRQ, lubbock_vbus_irq,
++				     0, driver_name, dev);
+ 		if (retval != 0) {
+ 			pr_err("%s: can't get irq %i, err %d\n",
+ 				driver_name, LUBBOCK_USB_IRQ, retval);
+--- a/drivers/usb/otg/gpio_vbus.c
++++ b/drivers/usb/otg/gpio_vbus.c
+@@ -51,8 +51,7 @@ struct gpio_vbus_data {
+  * edges might be workable.
+  */
+ #define VBUS_IRQ_FLAGS \
+-	( IRQF_SAMPLE_RANDOM | IRQF_SHARED \
+-	| IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING )
++	( IRQF_SHARED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING )
+ 
+ 
+ /* interface to regulator framework */
+@@ -253,7 +252,7 @@ static int __init gpio_vbus_probe(struct
+ 	if (res) {
+ 		irq = res->start;
+ 		res->flags &= IRQF_TRIGGER_MASK;
+-		res->flags |= IRQF_SAMPLE_RANDOM | IRQF_SHARED;
++		res->flags |= IRQF_SHARED;
+ 	} else
+ 		irq = gpio_to_irq(gpio);
+ 
+--- a/drivers/usb/otg/isp1301_omap.c
++++ b/drivers/usb/otg/isp1301_omap.c
+@@ -1567,7 +1567,6 @@ isp1301_probe(struct i2c_client *i2c, co
+ 		isp->irq_type = IRQF_TRIGGER_FALLING;
+ 	}
+ 
+-	isp->irq_type |= IRQF_SAMPLE_RANDOM;
+ 	status = request_irq(i2c->irq, isp1301_irq,
+ 			isp->irq_type, DRIVER_NAME, isp);
+ 	if (status < 0) {
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -44,7 +44,6 @@
+  *
+  * IRQF_DISABLED - keep irqs disabled when calling the action handler.
+  *                 DEPRECATED. This flag is a NOOP and scheduled to be removed
+- * IRQF_SAMPLE_RANDOM - irq is used to feed the random generator
+  * IRQF_SHARED - allow sharing the irq among several devices
+  * IRQF_PROBE_SHARED - set by callers when they expect sharing mismatches to occur
+  * IRQF_TIMER - Flag to mark this interrupt as timer interrupt
+@@ -63,7 +62,6 @@
+  *                resume time.
+  */
+ #define IRQF_DISABLED		0x00000020
+-#define IRQF_SAMPLE_RANDOM	0x00000040
+ #define IRQF_SHARED		0x00000080
+ #define IRQF_PROBE_SHARED	0x00000100
+ #define __IRQF_TIMER		0x00000200
+--- a/include/linux/irqdesc.h
++++ b/include/linux/irqdesc.h
+@@ -39,7 +39,6 @@ struct module;
+  */
+ struct irq_desc {
+ 	struct irq_data		irq_data;
+-	struct timer_rand_state *timer_rand_state;
+ 	unsigned int __percpu	*kstat_irqs;
+ 	irq_flow_handler_t	handle_irq;
+ #ifdef CONFIG_IRQ_PREFLOW_FASTEOI
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -48,8 +48,6 @@ struct rnd_state {
+ 
+ #ifdef __KERNEL__
+ 
+-extern void rand_initialize_irq(int irq);
+-
+ extern void add_device_randomness(const void *, unsigned int);
+ extern void add_input_randomness(unsigned int type, unsigned int code,
+ 				 unsigned int value);
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -891,22 +891,6 @@ __setup_irq(unsigned int irq, struct irq
+ 		return -ENOSYS;
+ 	if (!try_module_get(desc->owner))
+ 		return -ENODEV;
+-	/*
+-	 * Some drivers like serial.c use request_irq() heavily,
+-	 * so we have to be careful not to interfere with a
+-	 * running system.
+-	 */
+-	if (new->flags & IRQF_SAMPLE_RANDOM) {
+-		/*
+-		 * This function might sleep, we want to call it first,
+-		 * outside of the atomic block.
+-		 * Yes, this might clear the entropy pool if the wrong
+-		 * driver is attempted to be loaded, without actually
+-		 * installing a new handler, but is this really a problem,
+-		 * only the sysadmin is able to do this.
+-		 */
+-		rand_initialize_irq(irq);
+-	}
+ 
+ 	/*
+ 	 * Check whether the interrupt nests into another interrupt
+@@ -1342,7 +1326,6 @@ EXPORT_SYMBOL(free_irq);
+  *	Flags:
+  *
+  *	IRQF_SHARED		Interrupt is shared
+- *	IRQF_SAMPLE_RANDOM	The interrupt can be used for entropy
+  *	IRQF_TRIGGER_*		Specify active edge(s) or level
+  *
+  */
diff --git a/trunk/target/linux/generic/patches-3.3/060-hso_devices.patch b/trunk/target/linux/generic/patches-3.3/060-hso_devices.patch
new file mode 100644
index 00000000..9b15c757
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/060-hso_devices.patch
@@ -0,0 +1,36 @@
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -476,8 +476,10 @@ static const struct usb_device_id hso_id
+ 	{USB_DEVICE(0x0af0, 0x8400)},
+ 	{USB_DEVICE(0x0af0, 0x8600)},
+ 	{USB_DEVICE(0x0af0, 0x8800)},
+-	{USB_DEVICE(0x0af0, 0x8900)},
+-	{USB_DEVICE(0x0af0, 0x9000)},
++	{USB_DEVICE(0x0af0, 0x8900)},  /* GTM 67xx */
++	{USB_DEVICE(0x0af0, 0x9000)},  /* GTM 66xx */
++	{USB_DEVICE(0x0af0, 0x9200)},  /* GTM 67xxWFS */
++	{USB_DEVICE(0x0af0, 0x9300)},  /* GTM 66xxWFS */
+ 	{USB_DEVICE(0x0af0, 0xd035)},
+ 	{USB_DEVICE(0x0af0, 0xd055)},
+ 	{USB_DEVICE(0x0af0, 0xd155)},
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1231,6 +1231,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		0 ),
+ 
++UNUSUAL_DEV( 0x0af0, 0x9200, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 67xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
++UNUSUAL_DEV( 0x0af0, 0x9300, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 66xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
+ UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000,
+ 		"Option",
+ 		"GI 070x SD-Card",
diff --git a/trunk/target/linux/generic/patches-3.3/060-tcp-ecn-dont-delay-ACKS-after-CE.patch b/trunk/target/linux/generic/patches-3.3/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
new file mode 100644
index 00000000..6f1cd124
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/060-tcp-ecn-dont-delay-ACKS-after-CE.patch
@@ -0,0 +1,61 @@
+From patchwork Mon Aug  6 21:04:43 2012
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [net-next] tcp: ecn: dont delay ACKS after CE
+Date: Mon, 06 Aug 2012 11:04:43 -0000
+From: Eric Dumazet <eric.dumazet@gmail.com>
+X-Patchwork-Id: 175453
+Message-Id: <1344287083.26674.83.camel@edumazet-glaptop>
+To: David Miller <davem@davemloft.net>
+Cc: netdev <netdev@vger.kernel.org>,
+	Neal Cardwell <ncardwell@google.com>
+
+From: Eric Dumazet <edumazet@google.com>
+
+While playing with CoDel and ECN marking, I discovered a
+non optimal behavior of receiver of CE (Congestion Encountered)
+segments.
+
+In pathological cases, sender has reduced its cwnd to low values,
+and receiver delays its ACK (by 40 ms).
+
+While RFC 3168 6.1.3 (The TCP Receiver) doesn't explicitly recommend
+to send immediate ACKS, we believe its better to not delay ACKS, because
+a CE segment should give same signal than a dropped segment, and its
+quite important to reduce RTT to give ECE/CWR signals as fast as
+possible.
+
+Note we already call tcp_enter_quickack_mode() from TCP_ECN_check_ce()
+if we receive a retransmit, for the same reason.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: Neal Cardwell <ncardwell@google.com>
+Acked-by: Neal Cardwell <ncardwell@google.com>
+
+---
+net/ipv4/tcp_input.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe netdev" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
+--- a/net/ipv4/tcp_input.c
++++ b/net/ipv4/tcp_input.c
+@@ -231,7 +231,11 @@ static inline void TCP_ECN_check_ce(stru
+ 			tcp_enter_quickack_mode((struct sock *)tp);
+ 		break;
+ 	case INET_ECN_CE:
+-		tp->ecn_flags |= TCP_ECN_DEMAND_CWR;
++		if (!(tp->ecn_flags & TCP_ECN_DEMAND_CWR)) {
++			/* Better not delay acks, sender can have a very low cwnd */
++			tcp_enter_quickack_mode((struct sock *)tp);
++			tp->ecn_flags |= TCP_ECN_DEMAND_CWR;
++		}
+ 		/* fallinto */
+ 	default:
+ 		tp->ecn_flags |= TCP_ECN_SEEN;
diff --git a/trunk/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch b/trunk/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
new file mode 100644
index 00000000..6699e98f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/061-fq_codel-dont-reinit-flow-state.patch
@@ -0,0 +1,36 @@
+From b379135c40163ae79ba7a54e6928b53983e74ee8 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <eric.dumazet@gmail.com>
+Date: Sat, 1 Sep 2012 03:19:57 +0000
+Subject: [PATCH 307/558] fq_codel: dont reinit flow state
+
+When fq_codel builds a new flow, it should not reset codel state.
+
+Codel algo needs to get previous values (lastcount, drop_next) to get
+proper behavior.
+
+Signed-off-by: Dave Taht <dave.taht@gmail.com>
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Acked-by: Dave Taht <dave.taht@bufferbloat.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/sched/sch_fq_codel.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -191,7 +191,6 @@ static int fq_codel_enqueue(struct sk_bu
+ 
+ 	if (list_empty(&flow->flowchain)) {
+ 		list_add_tail(&flow->flowchain, &q->new_flows);
+-		codel_vars_init(&flow->cvars);
+ 		q->new_flow_count++;
+ 		flow->deficit = q->quantum;
+ 		flow->dropped = 0;
+@@ -418,6 +417,7 @@ static int fq_codel_init(struct Qdisc *s
+ 			struct fq_codel_flow *flow = q->flows + i;
+ 
+ 			INIT_LIST_HEAD(&flow->flowchain);
++			codel_vars_init(&flow->cvars);
+ 		}
+ 	}
+ 	if (sch->limit >= 1)
diff --git a/trunk/target/linux/generic/patches-3.3/065-8139cp-fixes.patch b/trunk/target/linux/generic/patches-3.3/065-8139cp-fixes.patch
new file mode 100644
index 00000000..77c903c0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/065-8139cp-fixes.patch
@@ -0,0 +1,187 @@
+commit 01ffc0a7f1c1801a2354719dedbc32aff45b987d
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Sat Nov 24 12:11:21 2012 +0000
+
+    8139cp: re-enable interrupts after tx timeout
+    
+    Recovery doesn't work too well if we leave interrupts disabled...
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-by: Francois Romieu <romieu@fr.zoreil.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 871f0d4c153e1258d4becf306eca6761bf38b629
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Thu Nov 22 03:16:58 2012 +0000
+
+    8139cp: enable bql
+    
+    This adds support for byte queue limits on RTL8139C+
+    
+    Tested on real hardware.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-By: Dave Täht <dave.taht@bufferbloat.net>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit a9dbe40fc10cea2efe6e1ff9e03c62dd7579c5ba
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Wed Nov 21 10:27:19 2012 +0000
+
+    8139cp: set ring address after enabling C+ mode
+    
+    This fixes (for me) a regression introduced by commit b01af457 ("8139cp:
+    set ring address before enabling receiver"). That commit configured the
+    descriptor ring addresses earlier in the initialisation sequence, in
+    order to avoid the possibility of triggering stray DMA before the
+    correct address had been set up.
+    
+    Unfortunately, it seems that the hardware will scribble garbage into the
+    TxRingAddr registers when we enable "plus mode" Tx in the CpCmd
+    register. Observed on a Traverse Geos router board.
+    
+    To deal with this, while not reintroducing the problem which led to the
+    original commit, we augment cp_start_hw() to write to the CpCmd register
+    *first*, then set the descriptor ring addresses, and then finally to
+    enable Rx and Tx in the original 8139 Cmd register. The datasheet
+    actually indicates that we should enable Tx/Rx in the Cmd register
+    *before* configuring the descriptor addresses, but that would appear to
+    re-introduce the problem that the offending commit b01af457 was trying
+    to solve. And this variant appears to work fine on real hardware.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Cc: stable@kernel.org [3.5+]
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 071e3ef4a94a021b16a2912f3885c86f4ff36b49
+Author: David S. Miller <davem@davemloft.net>
+Date:   Sun Nov 25 15:52:09 2012 -0500
+
+    Revert "8139cp: revert "set ring address before enabling receiver""
+    
+    This reverts commit b26623dab7eeb1e9f5898c7a49458789dd492f20.
+    
+    This reverts the revert, in net-next we'll try another scheme
+    to fix this bug using patches from David Woodhouse.
+    
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+--- a/drivers/net/ethernet/realtek/8139cp.c
++++ b/drivers/net/ethernet/realtek/8139cp.c
+@@ -645,6 +645,7 @@ static void cp_tx (struct cp_private *cp
+ {
+ 	unsigned tx_head = cp->tx_head;
+ 	unsigned tx_tail = cp->tx_tail;
++	unsigned bytes_compl = 0, pkts_compl = 0;
+ 
+ 	while (tx_tail != tx_head) {
+ 		struct cp_desc *txd = cp->tx_ring + tx_tail;
+@@ -663,6 +664,9 @@ static void cp_tx (struct cp_private *cp
+ 				 le32_to_cpu(txd->opts1) & 0xffff,
+ 				 PCI_DMA_TODEVICE);
+ 
++		bytes_compl += skb->len;
++		pkts_compl++;
++
+ 		if (status & LastFrag) {
+ 			if (status & (TxError | TxFIFOUnder)) {
+ 				netif_dbg(cp, tx_err, cp->dev,
+@@ -694,6 +698,7 @@ static void cp_tx (struct cp_private *cp
+ 
+ 	cp->tx_tail = tx_tail;
+ 
++	netdev_completed_queue(cp->dev, pkts_compl, bytes_compl);
+ 	if (TX_BUFFS_AVAIL(cp) > (MAX_SKB_FRAGS + 1))
+ 		netif_wake_queue(cp->dev);
+ }
+@@ -840,6 +845,8 @@ static netdev_tx_t cp_start_xmit (struct
+ 		wmb();
+ 	}
+ 	cp->tx_head = entry;
++
++	netdev_sent_queue(dev, skb->len);
+ 	netif_dbg(cp, tx_queued, cp->dev, "tx queued, slot %d, skblen %d\n",
+ 		  entry, skb->len);
+ 	if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))
+@@ -934,6 +941,8 @@ static void cp_stop_hw (struct cp_privat
+ 
+ 	cp->rx_tail = 0;
+ 	cp->tx_head = cp->tx_tail = 0;
++
++	netdev_reset_queue(cp->dev);
+ }
+ 
+ static void cp_reset_hw (struct cp_private *cp)
+@@ -954,8 +963,38 @@ static void cp_reset_hw (struct cp_priva
+ 
+ static inline void cp_start_hw (struct cp_private *cp)
+ {
++	dma_addr_t ring_dma;
++
+ 	cpw16(CpCmd, cp->cpcmd);
++
++	/*
++	 * These (at least TxRingAddr) need to be configured after the
++	 * corresponding bits in CpCmd are enabled. Datasheet v1.6 §6.33
++	 * (C+ Command Register) recommends that these and more be configured
++	 * *after* the [RT]xEnable bits in CpCmd are set. And on some hardware
++	 * it's been observed that the TxRingAddr is actually reset to garbage
++	 * when C+ mode Tx is enabled in CpCmd.
++	 */
++	cpw32_f(HiTxRingAddr, 0);
++	cpw32_f(HiTxRingAddr + 4, 0);
++
++	ring_dma = cp->ring_dma;
++	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
++	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
++
++	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
++	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
++	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
++
++	/*
++	 * Strictly speaking, the datasheet says this should be enabled
++	 * *before* setting the descriptor addresses. But what, then, would
++	 * prevent it from doing DMA to random unconfigured addresses?
++	 * This variant appears to work fine.
++	 */
+ 	cpw8(Cmd, RxOn | TxOn);
++
++	netdev_reset_queue(cp->dev);
+ }
+ 
+ static void cp_enable_irq(struct cp_private *cp)
+@@ -966,7 +1005,6 @@ static void cp_enable_irq(struct cp_priv
+ static void cp_init_hw (struct cp_private *cp)
+ {
+ 	struct net_device *dev = cp->dev;
+-	dma_addr_t ring_dma;
+ 
+ 	cp_reset_hw(cp);
+ 
+@@ -989,17 +1027,6 @@ static void cp_init_hw (struct cp_privat
+ 
+ 	cpw8(Config5, cpr8(Config5) & PMEStatus);
+ 
+-	cpw32_f(HiTxRingAddr, 0);
+-	cpw32_f(HiTxRingAddr + 4, 0);
+-
+-	ring_dma = cp->ring_dma;
+-	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
+-	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
+-
+-	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
+-	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
+-	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
+-
+ 	cpw16(MultiIntr, 0);
+ 
+ 	cpw8_f(Cfg9346, Cfg9346_Lock);
+@@ -1188,6 +1215,7 @@ static void cp_tx_timeout(struct net_dev
+ 	cp_clean_rings(cp);
+ 	rc = cp_init_rings(cp);
+ 	cp_start_hw(cp);
++	cp_enable_irq(cp);
+ 
+ 	netif_wake_queue(dev);
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/070-gpio-add-flags-to-export-GPIOs-when-requesting.patch b/trunk/target/linux/generic/patches-3.3/070-gpio-add-flags-to-export-GPIOs-when-requesting.patch
new file mode 100644
index 00000000..fb4387eb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/070-gpio-add-flags-to-export-GPIOs-when-requesting.patch
@@ -0,0 +1,68 @@
+From fc3a1f04f5040255cbc086c419e4237f29f89f88 Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <w.sang@pengutronix.de>
+Date: Tue, 13 Dec 2011 18:34:01 +0100
+Subject: [PATCH] gpio: add flags to export GPIOs when requesting
+
+commit fc3a1f04f5040255cbc086c419e4237f29f89f88 upstream.
+
+Introduce new flags to automatically export GPIOs when using the convenience
+functions gpio_request_one() or gpio_request_array(). This eases support for
+custom boards where lots of GPIOs need to be exported for customer
+applications.
+
+Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
+---
+ Documentation/gpio.txt |    3 +++
+ drivers/gpio/gpiolib.c |   12 +++++++++++-
+ include/linux/gpio.h   |    5 +++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+--- a/Documentation/gpio.txt
++++ b/Documentation/gpio.txt
+@@ -303,6 +303,9 @@ where 'flags' is currently defined to sp
+ 	* GPIOF_INIT_LOW	- as output, set initial level to LOW
+ 	* GPIOF_INIT_HIGH	- as output, set initial level to HIGH
+ 
++	* GPIOF_EXPORT_DIR_FIXED	- export gpio to sysfs, keep direction
++	* GPIOF_EXPORT_DIR_CHANGEABLE	- also export, allow changing direction
++
+ since GPIOF_INIT_* are only valid when configured as output, so group valid
+ combinations as:
+ 
+--- a/drivers/gpio/gpiolib.c
++++ b/drivers/gpio/gpiolib.c
+@@ -1289,8 +1289,18 @@ int gpio_request_one(unsigned gpio, unsi
+ 				(flags & GPIOF_INIT_HIGH) ? 1 : 0);
+ 
+ 	if (err)
+-		gpio_free(gpio);
++		goto free_gpio;
+ 
++	if (flags & GPIOF_EXPORT) {
++		err = gpio_export(gpio, flags & GPIOF_EXPORT_CHANGEABLE);
++		if (err)
++			goto free_gpio;
++	}
++
++	return 0;
++
++ free_gpio:
++	gpio_free(gpio);
+ 	return err;
+ }
+ EXPORT_SYMBOL_GPL(gpio_request_one);
+--- a/include/linux/gpio.h
++++ b/include/linux/gpio.h
+@@ -14,6 +14,11 @@
+ #define GPIOF_OUT_INIT_LOW	(GPIOF_DIR_OUT | GPIOF_INIT_LOW)
+ #define GPIOF_OUT_INIT_HIGH	(GPIOF_DIR_OUT | GPIOF_INIT_HIGH)
+ 
++#define GPIOF_EXPORT		(1 << 2)
++#define GPIOF_EXPORT_CHANGEABLE	(1 << 3)
++#define GPIOF_EXPORT_DIR_FIXED	(GPIOF_EXPORT)
++#define GPIOF_EXPORT_DIR_CHANGEABLE (GPIOF_EXPORT | GPIOF_EXPORT_CHANGEABLE)
++
+ /**
+  * struct gpio - a structure describing a GPIO with configuration
+  * @gpio:	the GPIO number
diff --git a/trunk/target/linux/generic/patches-3.3/080-prot-release-cb.patch b/trunk/target/linux/generic/patches-3.3/080-prot-release-cb.patch
new file mode 100644
index 00000000..56cda6b7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/080-prot-release-cb.patch
@@ -0,0 +1,27 @@
+This was added in commit 46d3ceabd8d98ed0ad10f20c595ca784e34786c5 (tcp: 
+TCP Small Queues) but we need it for pppoatm too.
+
+--- a/include/net/sock.h
++++ b/include/net/sock.h
+@@ -810,6 +810,8 @@ struct proto {
+ 	int			(*backlog_rcv) (struct sock *sk, 
+ 						struct sk_buff *skb);
+ 
++	void		(*release_cb)(struct sock *sk);
++
+ 	/* Keeping track of sk's, looking them up, and port selection methods. */
+ 	void			(*hash)(struct sock *sk);
+ 	void			(*unhash)(struct sock *sk);
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2138,6 +2138,10 @@ void release_sock(struct sock *sk)
+ 	spin_lock_bh(&sk->sk_lock.slock);
+ 	if (sk->sk_backlog.tail)
+ 		__release_sock(sk);
++
++	if (sk->sk_prot->release_cb)
++		sk->sk_prot->release_cb(sk);
++
+ 	sk->sk_lock.owned = 0;
+ 	if (waitqueue_active(&sk->sk_lock.wq))
+ 		wake_up(&sk->sk_lock.wq);
diff --git a/trunk/target/linux/generic/patches-3.3/081-USB-OHCI-Add-a-generic-platform-device-driver.patch b/trunk/target/linux/generic/patches-3.3/081-USB-OHCI-Add-a-generic-platform-device-driver.patch
new file mode 100644
index 00000000..8ea102f1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/081-USB-OHCI-Add-a-generic-platform-device-driver.patch
@@ -0,0 +1,271 @@
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -393,6 +393,16 @@ config USB_CNS3XXX_OHCI
+ 	  Enable support for the CNS3XXX SOC's on-chip OHCI controller.
+ 	  It is needed for low-speed USB 1.0 device support.
+ 
++config USB_OHCI_HCD_PLATFORM
++	bool "Generic OHCI driver for a platform device"
++	depends on USB_OHCI_HCD && EXPERIMENTAL
++	default n
++	---help---
++	  Adds an OHCI host driver for a generic platform device, which
++	  provieds a memory space and an irq.
++
++	  If unsure, say N.
++
+ config USB_OHCI_BIG_ENDIAN_DESC
+ 	bool
+ 	depends on USB_OHCI_HCD
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1121,6 +1121,11 @@ MODULE_LICENSE ("GPL");
+ #define PLATFORM_DRIVER		ohci_xls_driver
+ #endif
+ 
++#ifdef CONFIG_USB_OHCI_HCD_PLATFORM
++#include "ohci-platform.c"
++#define PLATFORM_DRIVER		ohci_platform_driver
++#endif
++
+ #if	!defined(PCI_DRIVER) &&		\
+ 	!defined(PLATFORM_DRIVER) &&	\
+ 	!defined(OMAP1_PLATFORM_DRIVER) &&	\
+--- /dev/null
++++ b/drivers/usb/host/ohci-platform.c
+@@ -0,0 +1,194 @@
++/*
++ * Generic platform ohci driver
++ *
++ * Copyright 2007 Michael Buesch <m@bues.ch>
++ * Copyright 2011-2012 Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Derived from the OCHI-SSB driver
++ * Derived from the OHCI-PCI driver
++ * Copyright 1999 Roman Weissgaerber
++ * Copyright 2000-2002 David Brownell
++ * Copyright 1999 Linus Torvalds
++ * Copyright 1999 Gregory P. Smith
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++#include <linux/platform_device.h>
++#include <linux/usb/ohci_pdriver.h>
++
++static int ohci_platform_reset(struct usb_hcd *hcd)
++{
++	struct platform_device *pdev = to_platform_device(hcd->self.controller);
++	struct usb_ohci_pdata *pdata = pdev->dev.platform_data;
++	struct ohci_hcd *ohci = hcd_to_ohci(hcd);
++	int err;
++
++	if (pdata->big_endian_desc)
++		ohci->flags |= OHCI_QUIRK_BE_DESC;
++	if (pdata->big_endian_mmio)
++		ohci->flags |= OHCI_QUIRK_BE_MMIO;
++	if (pdata->no_big_frame_no)
++		ohci->flags |= OHCI_QUIRK_FRAME_NO;
++
++	ohci_hcd_init(ohci);
++	err = ohci_init(ohci);
++
++	return err;
++}
++
++static int ohci_platform_start(struct usb_hcd *hcd)
++{
++	struct ohci_hcd *ohci = hcd_to_ohci(hcd);
++	int err;
++
++	err = ohci_run(ohci);
++	if (err < 0) {
++		ohci_err(ohci, "can't start\n");
++		ohci_stop(hcd);
++	}
++
++	return err;
++}
++
++static const struct hc_driver ohci_platform_hc_driver = {
++	.description		= hcd_name,
++	.product_desc		= "Generic Platform OHCI Controller",
++	.hcd_priv_size		= sizeof(struct ohci_hcd),
++
++	.irq			= ohci_irq,
++	.flags			= HCD_MEMORY | HCD_USB11,
++
++	.reset			= ohci_platform_reset,
++	.start			= ohci_platform_start,
++	.stop			= ohci_stop,
++	.shutdown		= ohci_shutdown,
++
++	.urb_enqueue		= ohci_urb_enqueue,
++	.urb_dequeue		= ohci_urb_dequeue,
++	.endpoint_disable	= ohci_endpoint_disable,
++
++	.get_frame_number	= ohci_get_frame,
++
++	.hub_status_data	= ohci_hub_status_data,
++	.hub_control		= ohci_hub_control,
++#ifdef	CONFIG_PM
++	.bus_suspend		= ohci_bus_suspend,
++	.bus_resume		= ohci_bus_resume,
++#endif
++
++	.start_port_reset	= ohci_start_port_reset,
++};
++
++static int __devinit ohci_platform_probe(struct platform_device *dev)
++{
++	struct usb_hcd *hcd;
++	struct resource *res_mem;
++	int irq;
++	int err = -ENOMEM;
++
++	BUG_ON(!dev->dev.platform_data);
++
++	if (usb_disabled())
++		return -ENODEV;
++
++	irq = platform_get_irq(dev, 0);
++	if (irq < 0) {
++		pr_err("no irq provieded");
++		return irq;
++	}
++
++	res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
++	if (!res_mem) {
++		pr_err("no memory recourse provieded");
++		return -ENXIO;
++	}
++
++	hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
++			dev_name(&dev->dev));
++	if (!hcd)
++		return -ENOMEM;
++
++	hcd->rsrc_start = res_mem->start;
++	hcd->rsrc_len = resource_size(res_mem);
++
++	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
++		pr_err("controller already in use");
++		err = -EBUSY;
++		goto err_put_hcd;
++	}
++
++	hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
++	if (!hcd->regs)
++		goto err_release_region;
++	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
++	if (err)
++		goto err_iounmap;
++
++	platform_set_drvdata(dev, hcd);
++
++	return err;
++
++err_iounmap:
++	iounmap(hcd->regs);
++err_release_region:
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++err_put_hcd:
++	usb_put_hcd(hcd);
++	return err;
++}
++
++static int __devexit ohci_platform_remove(struct platform_device *dev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(dev);
++
++	usb_remove_hcd(hcd);
++	iounmap(hcd->regs);
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++	usb_put_hcd(hcd);
++	platform_set_drvdata(dev, NULL);
++
++	return 0;
++}
++
++#ifdef CONFIG_PM
++
++static int ohci_platform_suspend(struct device *dev)
++{
++	return 0;
++}
++
++static int ohci_platform_resume(struct device *dev)
++{
++	struct usb_hcd *hcd = dev_get_drvdata(dev);
++
++	ohci_finish_controller_resume(hcd);
++	return 0;
++}
++
++#else /* !CONFIG_PM */
++#define ohci_platform_suspend	NULL
++#define ohci_platform_resume	NULL
++#endif /* CONFIG_PM */
++
++static const struct platform_device_id ohci_platform_table[] = {
++	{ "ohci-platform", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(platform, ohci_platform_table);
++
++static const struct dev_pm_ops ohci_platform_pm_ops = {
++	.suspend	= ohci_platform_suspend,
++	.resume		= ohci_platform_resume,
++};
++
++static struct platform_driver ohci_platform_driver = {
++	.id_table	= ohci_platform_table,
++	.probe		= ohci_platform_probe,
++	.remove		= __devexit_p(ohci_platform_remove),
++	.shutdown	= usb_hcd_platform_shutdown,
++	.driver		= {
++		.owner	= THIS_MODULE,
++		.name	= "ohci-platform",
++		.pm	= &ohci_platform_pm_ops,
++	}
++};
+--- /dev/null
++++ b/include/linux/usb/ohci_pdriver.h
+@@ -0,0 +1,38 @@
++/*
++ * Copyright (C) 2012 Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#ifndef __USB_CORE_OHCI_PDRIVER_H
++#define __USB_CORE_OHCI_PDRIVER_H
++
++/**
++ * struct usb_ohci_pdata - platform_data for generic ohci driver
++ *
++ * @big_endian_desc:	BE descriptors
++ * @big_endian_mmio:	BE registers
++ * @no_big_frame_no:	no big endian frame_no shift
++ *
++ * These are general configuration options for the OHCI controller. All of
++ * these options are activating more or less workarounds for some hardware.
++ */
++struct usb_ohci_pdata {
++	unsigned	big_endian_desc:1;
++	unsigned	big_endian_mmio:1;
++	unsigned	no_big_frame_no:1;
++};
++
++#endif /* __USB_CORE_OHCI_PDRIVER_H */
diff --git a/trunk/target/linux/generic/patches-3.3/082-USB-EHCI-Add-a-generic-platform-device-driver.patch b/trunk/target/linux/generic/patches-3.3/082-USB-EHCI-Add-a-generic-platform-device-driver.patch
new file mode 100644
index 00000000..62eb87a8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/082-USB-EHCI-Add-a-generic-platform-device-driver.patch
@@ -0,0 +1,283 @@
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -403,6 +403,16 @@ config USB_OHCI_HCD_PLATFORM
+ 
+ 	  If unsure, say N.
+ 
++config USB_EHCI_HCD_PLATFORM
++	bool "Generic EHCI driver for a platform device"
++	depends on USB_EHCI_HCD && EXPERIMENTAL
++	default n
++	---help---
++	  Adds an EHCI host driver for a generic platform device, which
++	  provieds a memory space and an irq.
++
++	  If unsure, say N.
++
+ config USB_OHCI_BIG_ENDIAN_DESC
+ 	bool
+ 	depends on USB_OHCI_HCD
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -1381,6 +1381,11 @@ MODULE_LICENSE ("GPL");
+ #define        PLATFORM_DRIVER         ehci_mv_driver
+ #endif
+ 
++#ifdef CONFIG_USB_EHCI_HCD_PLATFORM
++#include "ehci-platform.c"
++#define PLATFORM_DRIVER		ehci_platform_driver
++#endif
++
+ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
+     !defined(XILINX_OF_PLATFORM_DRIVER)
+--- /dev/null
++++ b/drivers/usb/host/ehci-platform.c
+@@ -0,0 +1,198 @@
++/*
++ * Generic platform ehci driver
++ *
++ * Copyright 2007 Steven Brown <sbrown@cortland.com>
++ * Copyright 2010-2012 Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * Derived from the ohci-ssb driver
++ * Copyright 2007 Michael Buesch <m@bues.ch>
++ *
++ * Derived from the EHCI-PCI driver
++ * Copyright (c) 2000-2004 by David Brownell
++ *
++ * Derived from the ohci-pci driver
++ * Copyright 1999 Roman Weissgaerber
++ * Copyright 2000-2002 David Brownell
++ * Copyright 1999 Linus Torvalds
++ * Copyright 1999 Gregory P. Smith
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++#include <linux/platform_device.h>
++#include <linux/usb/ehci_pdriver.h>
++
++static int ehci_platform_reset(struct usb_hcd *hcd)
++{
++	struct platform_device *pdev = to_platform_device(hcd->self.controller);
++	struct usb_ehci_pdata *pdata = pdev->dev.platform_data;
++	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++	int retval;
++
++	hcd->has_tt = pdata->has_tt;
++	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
++	ehci->big_endian_desc = pdata->big_endian_desc;
++	ehci->big_endian_mmio = pdata->big_endian_mmio;
++
++	ehci->caps = hcd->regs + pdata->caps_offset;
++	retval = ehci_setup(hcd);
++	if (retval)
++		return retval;
++
++	if (pdata->port_power_on)
++		ehci_port_power(ehci, 1);
++	if (pdata->port_power_off)
++		ehci_port_power(ehci, 0);
++
++	return 0;
++}
++
++static const struct hc_driver ehci_platform_hc_driver = {
++	.description		= hcd_name,
++	.product_desc		= "Generic Platform EHCI Controller",
++	.hcd_priv_size		= sizeof(struct ehci_hcd),
++
++	.irq			= ehci_irq,
++	.flags			= HCD_MEMORY | HCD_USB2,
++
++	.reset			= ehci_platform_reset,
++	.start			= ehci_run,
++	.stop			= ehci_stop,
++	.shutdown		= ehci_shutdown,
++
++	.urb_enqueue		= ehci_urb_enqueue,
++	.urb_dequeue		= ehci_urb_dequeue,
++	.endpoint_disable	= ehci_endpoint_disable,
++	.endpoint_reset		= ehci_endpoint_reset,
++
++	.get_frame_number	= ehci_get_frame,
++
++	.hub_status_data	= ehci_hub_status_data,
++	.hub_control		= ehci_hub_control,
++#if defined(CONFIG_PM)
++	.bus_suspend		= ehci_bus_suspend,
++	.bus_resume		= ehci_bus_resume,
++#endif
++	.relinquish_port	= ehci_relinquish_port,
++	.port_handed_over	= ehci_port_handed_over,
++
++	.update_device		= ehci_update_device,
++
++	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
++};
++
++static int __devinit ehci_platform_probe(struct platform_device *dev)
++{
++	struct usb_hcd *hcd;
++	struct resource *res_mem;
++	int irq;
++	int err = -ENOMEM;
++
++	BUG_ON(!dev->dev.platform_data);
++
++	if (usb_disabled())
++		return -ENODEV;
++
++	irq = platform_get_irq(dev, 0);
++	if (irq < 0) {
++		pr_err("no irq provieded");
++		return irq;
++	}
++	res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
++	if (!res_mem) {
++		pr_err("no memory recourse provieded");
++		return -ENXIO;
++	}
++
++	hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev,
++			     dev_name(&dev->dev));
++	if (!hcd)
++		return -ENOMEM;
++
++	hcd->rsrc_start = res_mem->start;
++	hcd->rsrc_len = resource_size(res_mem);
++
++	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
++		pr_err("controller already in use");
++		err = -EBUSY;
++		goto err_put_hcd;
++	}
++
++	hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
++	if (!hcd->regs)
++		goto err_release_region;
++	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
++	if (err)
++		goto err_iounmap;
++
++	platform_set_drvdata(dev, hcd);
++
++	return err;
++
++err_iounmap:
++	iounmap(hcd->regs);
++err_release_region:
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++err_put_hcd:
++	usb_put_hcd(hcd);
++	return err;
++}
++
++static int __devexit ehci_platform_remove(struct platform_device *dev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(dev);
++
++	usb_remove_hcd(hcd);
++	iounmap(hcd->regs);
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++	usb_put_hcd(hcd);
++	platform_set_drvdata(dev, NULL);
++
++	return 0;
++}
++
++#ifdef CONFIG_PM
++
++static int ehci_platform_suspend(struct device *dev)
++{
++	struct usb_hcd *hcd = dev_get_drvdata(dev);
++	bool wakeup = device_may_wakeup(dev);
++
++	ehci_prepare_ports_for_controller_suspend(hcd_to_ehci(hcd), wakeup);
++	return 0;
++}
++
++static int ehci_platform_resume(struct device *dev)
++{
++	struct usb_hcd *hcd = dev_get_drvdata(dev);
++
++	ehci_prepare_ports_for_controller_resume(hcd_to_ehci(hcd));
++	return 0;
++}
++
++#else /* !CONFIG_PM */
++#define ehci_platform_suspend	NULL
++#define ehci_platform_resume	NULL
++#endif /* CONFIG_PM */
++
++static const struct platform_device_id ehci_platform_table[] = {
++	{ "ehci-platform", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(platform, ehci_platform_table);
++
++static const struct dev_pm_ops ehci_platform_pm_ops = {
++	.suspend	= ehci_platform_suspend,
++	.resume		= ehci_platform_resume,
++};
++
++static struct platform_driver ehci_platform_driver = {
++	.id_table	= ehci_platform_table,
++	.probe		= ehci_platform_probe,
++	.remove		= __devexit_p(ehci_platform_remove),
++	.shutdown	= usb_hcd_platform_shutdown,
++	.driver		= {
++		.owner	= THIS_MODULE,
++		.name	= "ehci-platform",
++		.pm	= &ehci_platform_pm_ops,
++	}
++};
+--- /dev/null
++++ b/include/linux/usb/ehci_pdriver.h
+@@ -0,0 +1,46 @@
++/*
++ * Copyright (C) 2012 Hauke Mehrtens <hauke@hauke-m.de>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#ifndef __USB_CORE_EHCI_PDRIVER_H
++#define __USB_CORE_EHCI_PDRIVER_H
++
++/**
++ * struct usb_ehci_pdata - platform_data for generic ehci driver
++ *
++ * @caps_offset:	offset of the EHCI Capability Registers to the start of
++ *			the io memory region provided to the driver.
++ * @has_tt:		set to 1 if TT is integrated in root hub.
++ * @port_power_on:	set to 1 if the controller needs a power up after
++ *			initialization.
++ * @port_power_off:	set to 1 if the controller needs to be powered down
++ *			after initialization.
++ *
++ * These are general configuration options for the EHCI controller. All of
++ * these options are activating more or less workarounds for some hardware.
++ */
++struct usb_ehci_pdata {
++	int		caps_offset;
++	unsigned	has_tt:1;
++	unsigned	has_synopsys_hc_bug:1;
++	unsigned	big_endian_desc:1;
++	unsigned	big_endian_mmio:1;
++	unsigned	port_power_on:1;
++	unsigned	port_power_off:1;
++};
++
++#endif /* __USB_CORE_EHCI_PDRIVER_H */
diff --git a/trunk/target/linux/generic/patches-3.3/083-USB-EHCI-platform-remove-update.patch b/trunk/target/linux/generic/patches-3.3/083-USB-EHCI-platform-remove-update.patch
new file mode 100644
index 00000000..e9a5b700
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/083-USB-EHCI-platform-remove-update.patch
@@ -0,0 +1,11 @@
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -75,8 +75,6 @@ static const struct hc_driver ehci_platf
+ 	.relinquish_port	= ehci_relinquish_port,
+ 	.port_handed_over	= ehci_port_handed_over,
+ 
+-	.update_device		= ehci_update_device,
+-
+ 	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch b/trunk/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch
new file mode 100644
index 00000000..95163a43
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/084-x86_fix_perf_uclibc_build.patch
@@ -0,0 +1,27 @@
+From 031d8ad2c3cee85c515e551fc8c0054bdedb7b8b Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Thu, 13 Dec 2012 18:02:11 +0100
+Subject: [PATCH] x86: fix perf build with uclibc toolchains
+
+libio.h is not provided by uClibc, in order to be able to test the
+definition of __UCLIBC__ we need to include stdlib.h, which also
+includes stddef.h, providing the definition of 'NULL'
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ tools/perf/arch/x86/util/dwarf-regs.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/tools/perf/arch/x86/util/dwarf-regs.c
++++ b/tools/perf/arch/x86/util/dwarf-regs.c
+@@ -20,7 +20,10 @@
+  *
+  */
+ 
++#include <stdlib.h>
++#ifndef __UCLIBC__
+ #include <libio.h>
++#endif
+ #include <dwarf-regs.h>
+ 
+ /*
diff --git a/trunk/target/linux/generic/patches-3.3/090-CVE-2013-1763.patch b/trunk/target/linux/generic/patches-3.3/090-CVE-2013-1763.patch
new file mode 100644
index 00000000..6c0c2236
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/090-CVE-2013-1763.patch
@@ -0,0 +1,27 @@
+From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001
+From: Mathias Krause <minipli@googlemail.com>
+Date: Sat, 23 Feb 2013 01:13:47 +0000
+Subject: sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
+
+Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY
+with a family greater or equal then AF_MAX -- the array size of
+sock_diag_handlers[]. The current code does not test for this
+condition therefore is vulnerable to an out-of-bound access opening
+doors for a privilege escalation.
+
+Signed-off-by: Mathias Krause <minipli@googlemail.com>
+Acked-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+--- a/net/core/sock_diag.c
++++ b/net/core/sock_diag.c
+@@ -126,6 +126,9 @@ static int __sock_diag_rcv_msg(struct sk
+ 	if (nlmsg_len(nlh) < sizeof(*req))
+ 		return -EINVAL;
+ 
++	if (req->sdiag_family >= AF_MAX)
++		return -EINVAL;
++
+ 	hndl = sock_diag_lock_handler(req->sdiag_family);
+ 	if (hndl == NULL)
+ 		err = -ENOENT;
diff --git a/trunk/target/linux/generic/patches-3.3/100-overlayfs_v12.patch b/trunk/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
new file mode 100644
index 00000000..14e65589
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
@@ -0,0 +1,3232 @@
+--- a/Documentation/filesystems/Locking
++++ b/Documentation/filesystems/Locking
+@@ -62,6 +62,7 @@ ata *);
+ 	int (*removexattr) (struct dentry *, const char *);
+ 	void (*truncate_range)(struct inode *, loff_t, loff_t);
+ 	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);
++	struct file *(*open)(struct dentry *,struct file *,const struct cred *);
+ 
+ locking rules:
+ 	all may block
+@@ -89,6 +90,7 @@ listxattr:	no
+ removexattr:	yes
+ truncate_range:	yes
+ fiemap:		no
++open:		no
+ 	Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
+ victim.
+ 	cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem.
+--- /dev/null
++++ b/Documentation/filesystems/overlayfs.txt
+@@ -0,0 +1,199 @@
++Written by: Neil Brown <neilb@suse.de>
++
++Overlay Filesystem
++==================
++
++This document describes a prototype for a new approach to providing
++overlay-filesystem functionality in Linux (sometimes referred to as
++union-filesystems).  An overlay-filesystem tries to present a
++filesystem which is the result over overlaying one filesystem on top
++of the other.
++
++The result will inevitably fail to look exactly like a normal
++filesystem for various technical reasons.  The expectation is that
++many use cases will be able to ignore these differences.
++
++This approach is 'hybrid' because the objects that appear in the
++filesystem do not all appear to belong to that filesystem.  In many
++cases an object accessed in the union will be indistinguishable
++from accessing the corresponding object from the original filesystem.
++This is most obvious from the 'st_dev' field returned by stat(2).
++
++While directories will report an st_dev from the overlay-filesystem,
++all non-directory objects will report an st_dev from the lower or
++upper filesystem that is providing the object.  Similarly st_ino will
++only be unique when combined with st_dev, and both of these can change
++over the lifetime of a non-directory object.  Many applications and
++tools ignore these values and will not be affected.
++
++Upper and Lower
++---------------
++
++An overlay filesystem combines two filesystems - an 'upper' filesystem
++and a 'lower' filesystem.  When a name exists in both filesystems, the
++object in the 'upper' filesystem is visible while the object in the
++'lower' filesystem is either hidden or, in the case of directories,
++merged with the 'upper' object.
++
++It would be more correct to refer to an upper and lower 'directory
++tree' rather than 'filesystem' as it is quite possible for both
++directory trees to be in the same filesystem and there is no
++requirement that the root of a filesystem be given for either upper or
++lower.
++
++The lower filesystem can be any filesystem supported by Linux and does
++not need to be writable.  The lower filesystem can even be another
++overlayfs.  The upper filesystem will normally be writable and if it
++is it must support the creation of trusted.* extended attributes, and
++must provide valid d_type in readdir responses, at least for symbolic
++links - so NFS is not suitable.
++
++A read-only overlay of two read-only filesystems may use any
++filesystem type.
++
++Directories
++-----------
++
++Overlaying mainly involved directories.  If a given name appears in both
++upper and lower filesystems and refers to a non-directory in either,
++then the lower object is hidden - the name refers only to the upper
++object.
++
++Where both upper and lower objects are directories, a merged directory
++is formed.
++
++At mount time, the two directories given as mount options are combined
++into a merged directory:
++
++  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper /overlay
++
++Then whenever a lookup is requested in such a merged directory, the
++lookup is performed in each actual directory and the combined result
++is cached in the dentry belonging to the overlay filesystem.  If both
++actual lookups find directories, both are stored and a merged
++directory is created, otherwise only one is stored: the upper if it
++exists, else the lower.
++
++Only the lists of names from directories are merged.  Other content
++such as metadata and extended attributes are reported for the upper
++directory only.  These attributes of the lower directory are hidden.
++
++whiteouts and opaque directories
++--------------------------------
++
++In order to support rm and rmdir without changing the lower
++filesystem, an overlay filesystem needs to record in the upper filesystem
++that files have been removed.  This is done using whiteouts and opaque
++directories (non-directories are always opaque).
++
++The overlay filesystem uses extended attributes with a
++"trusted.overlay."  prefix to record these details.
++
++A whiteout is created as a symbolic link with target
++"(overlay-whiteout)" and with xattr "trusted.overlay.whiteout" set to "y".
++When a whiteout is found in the upper level of a merged directory, any
++matching name in the lower level is ignored, and the whiteout itself
++is also hidden.
++
++A directory is made opaque by setting the xattr "trusted.overlay.opaque"
++to "y".  Where the upper filesystem contains an opaque directory, any
++directory in the lower filesystem with the same name is ignored.
++
++readdir
++-------
++
++When a 'readdir' request is made on a merged directory, the upper and
++lower directories are each read and the name lists merged in the
++obvious way (upper is read first, then lower - entries that already
++exist are not re-added).  This merged name list is cached in the
++'struct file' and so remains as long as the file is kept open.  If the
++directory is opened and read by two processes at the same time, they
++will each have separate caches.  A seekdir to the start of the
++directory (offset 0) followed by a readdir will cause the cache to be
++discarded and rebuilt.
++
++This means that changes to the merged directory do not appear while a
++directory is being read.  This is unlikely to be noticed by many
++programs.
++
++seek offsets are assigned sequentially when the directories are read.
++Thus if
++  - read part of a directory
++  - remember an offset, and close the directory
++  - re-open the directory some time later
++  - seek to the remembered offset
++
++there may be little correlation between the old and new locations in
++the list of filenames, particularly if anything has changed in the
++directory.
++
++Readdir on directories that are not merged is simply handled by the
++underlying directory (upper or lower).
++
++
++Non-directories
++---------------
++
++Objects that are not directories (files, symlinks, device-special
++files etc.) are presented either from the upper or lower filesystem as
++appropriate.  When a file in the lower filesystem is accessed in a way
++the requires write-access, such as opening for write access, changing
++some metadata etc., the file is first copied from the lower filesystem
++to the upper filesystem (copy_up).  Note that creating a hard-link
++also requires copy_up, though of course creation of a symlink does
++not.
++
++The copy_up may turn out to be unnecessary, for example if the file is
++opened for read-write but the data is not modified.
++
++The copy_up process first makes sure that the containing directory
++exists in the upper filesystem - creating it and any parents as
++necessary.  It then creates the object with the same metadata (owner,
++mode, mtime, symlink-target etc.) and then if the object is a file, the
++data is copied from the lower to the upper filesystem.  Finally any
++extended attributes are copied up.
++
++Once the copy_up is complete, the overlay filesystem simply
++provides direct access to the newly created file in the upper
++filesystem - future operations on the file are barely noticed by the
++overlay filesystem (though an operation on the name of the file such as
++rename or unlink will of course be noticed and handled).
++
++
++Non-standard behavior
++---------------------
++
++The copy_up operation essentially creates a new, identical file and
++moves it over to the old name.  The new file may be on a different
++filesystem, so both st_dev and st_ino of the file may change.
++
++Any open files referring to this inode will access the old data and
++metadata.  Similarly any file locks obtained before copy_up will not
++apply to the copied up file.
++
++On a file is opened with O_RDONLY fchmod(2), fchown(2), futimesat(2)
++and fsetxattr(2) will fail with EROFS.
++
++If a file with multiple hard links is copied up, then this will
++"break" the link.  Changes will not be propagated to other names
++referring to the same inode.
++
++Symlinks in /proc/PID/ and /proc/PID/fd which point to a non-directory
++object in overlayfs will not contain vaid absolute paths, only
++relative paths leading up to the filesystem's root.  This will be
++fixed in the future.
++
++Some operations are not atomic, for example a crash during copy_up or
++rename will leave the filesystem in an inconsitent state.  This will
++be addressed in the future.
++
++Changes to underlying filesystems
++---------------------------------
++
++Offline changes, when the overlay is not mounted, are allowed to either
++the upper or the lower trees.
++
++Changes to the underlying filesystems while part of a mounted overlay
++filesystem are not allowed.  If the underlying filesystem is changed,
++the behavior of the overlay is undefined, though it will not result in
++a crash or deadlock.
+--- a/Documentation/filesystems/vfs.txt
++++ b/Documentation/filesystems/vfs.txt
+@@ -364,6 +364,8 @@ struct inode_operations {
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ 	int (*removexattr) (struct dentry *, const char *);
+ 	void (*truncate_range)(struct inode *, loff_t, loff_t);
++	struct file *(*open) (struct dentry *, struct file *,
++			      const struct cred *);
+ };
+ 
+ Again, all methods are called without any locks being held, unless
+@@ -475,6 +477,12 @@ otherwise noted.
+   truncate_range: a method provided by the underlying filesystem to truncate a
+   	range of blocks , i.e. punch a hole somewhere in a file.
+ 
++  open: this is an alternative to f_op->open(), the difference is that this
++	method may return any open file, not necessarily originating from the
++	same filesystem as the one i_op->open() was called on.  It may be useful
++	for stacking filesystems which want to allow native I/O directly on
++	underlying files.
++
+ 
+ The Address Space Object
+ ========================
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -4955,6 +4955,13 @@ F:	drivers/scsi/osd/
+ F:	include/scsi/osd_*
+ F:	fs/exofs/
+ 
++OVERLAYFS FILESYSTEM
++M:	Miklos Szeredi <miklos@szeredi.hu>
++L:	linux-fsdevel@vger.kernel.org
++S:	Supported
++F:	fs/overlayfs/*
++F:	Documentation/filesystems/overlayfs.txt
++
+ P54 WIRELESS DRIVER
+ M:	Christian Lamparter <chunkeey@googlemail.com>
+ L:	linux-wireless@vger.kernel.org
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -63,6 +63,7 @@ source "fs/quota/Kconfig"
+ 
+ source "fs/autofs4/Kconfig"
+ source "fs/fuse/Kconfig"
++source "fs/overlayfs/Kconfig"
+ 
+ config CUSE
+ 	tristate "Character device in Userspace support"
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -105,6 +105,7 @@ obj-$(CONFIG_QNX4FS_FS)		+= qnx4/
+ obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
+ obj-$(CONFIG_ADFS_FS)		+= adfs/
+ obj-$(CONFIG_FUSE_FS)		+= fuse/
++obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/
+ obj-$(CONFIG_UDF_FS)		+= udf/
+ obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
+ obj-$(CONFIG_OMFS_FS)		+= omfs/
+--- a/fs/ecryptfs/main.c
++++ b/fs/ecryptfs/main.c
+@@ -544,6 +544,13 @@ static struct dentry *ecryptfs_mount(str
+ 	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
+ 	s->s_blocksize = path.dentry->d_sb->s_blocksize;
+ 	s->s_magic = ECRYPTFS_SUPER_MAGIC;
++	s->s_stack_depth = path.dentry->d_sb->s_stack_depth + 1;
++
++	rc = -EINVAL;
++	if (s->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		printk(KERN_ERR "eCryptfs: maximum fs stacking depth exceeded\n");
++		goto out_free;
++	}
+ 
+ 	inode = ecryptfs_get_inode(path.dentry->d_inode, s);
+ 	rc = PTR_ERR(inode);
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1325,6 +1325,24 @@ void drop_collected_mounts(struct vfsmou
+ 	release_mounts(&umount_list);
+ }
+ 
++struct vfsmount *clone_private_mount(struct path *path)
++{
++	struct mount *old_mnt = real_mount(path->mnt);
++	struct mount *new_mnt;
++
++	if (IS_MNT_UNBINDABLE(old_mnt))
++		return ERR_PTR(-EINVAL);
++
++	down_read(&namespace_sem);
++	new_mnt = clone_mnt(old_mnt, path->dentry, CL_PRIVATE);
++	up_read(&namespace_sem);
++	if (!new_mnt)
++		return ERR_PTR(-ENOMEM);
++
++	return &new_mnt->mnt;
++}
++EXPORT_SYMBOL_GPL(clone_private_mount);
++
+ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 		   struct vfsmount *root)
+ {
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -644,24 +644,24 @@ static inline int __get_file_write_acces
+ 	return error;
+ }
+ 
+-static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
+-					struct file *f,
+-					int (*open)(struct inode *, struct file *),
+-					const struct cred *cred)
++static struct file *__dentry_open(struct path *path, struct file *f,
++				  int (*open)(struct inode *, struct file *),
++				  const struct cred *cred)
+ {
+ 	static const struct file_operations empty_fops = {};
+ 	struct inode *inode;
+ 	int error;
+ 
++	path_get(path);
+ 	f->f_mode = OPEN_FMODE(f->f_flags) | FMODE_LSEEK |
+ 				FMODE_PREAD | FMODE_PWRITE;
+ 
+ 	if (unlikely(f->f_flags & O_PATH))
+ 		f->f_mode = FMODE_PATH;
+ 
+-	inode = dentry->d_inode;
++	inode = path->dentry->d_inode;
+ 	if (f->f_mode & FMODE_WRITE) {
+-		error = __get_file_write_access(inode, mnt);
++		error = __get_file_write_access(inode, path->mnt);
+ 		if (error)
+ 			goto cleanup_file;
+ 		if (!special_file(inode->i_mode))
+@@ -669,8 +669,7 @@ static struct file *__dentry_open(struct
+ 	}
+ 
+ 	f->f_mapping = inode->i_mapping;
+-	f->f_path.dentry = dentry;
+-	f->f_path.mnt = mnt;
++	f->f_path = *path;
+ 	f->f_pos = 0;
+ 	file_sb_list_add(f, inode->i_sb);
+ 
+@@ -727,7 +726,7 @@ cleanup_all:
+ 			 * here, so just reset the state.
+ 			 */
+ 			file_reset_write(f);
+-			mnt_drop_write(mnt);
++			mnt_drop_write(path->mnt);
+ 		}
+ 	}
+ 	file_sb_list_del(f);
+@@ -735,8 +734,7 @@ cleanup_all:
+ 	f->f_path.mnt = NULL;
+ cleanup_file:
+ 	put_filp(f);
+-	dput(dentry);
+-	mntput(mnt);
++	path_put(path);
+ 	return ERR_PTR(error);
+ }
+ 
+@@ -762,14 +760,14 @@ cleanup_file:
+ struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ 		int (*open)(struct inode *, struct file *))
+ {
++	struct path path = { .dentry = dentry, .mnt = nd->path.mnt };
+ 	const struct cred *cred = current_cred();
+ 
+ 	if (IS_ERR(nd->intent.open.file))
+ 		goto out;
+ 	if (IS_ERR(dentry))
+ 		goto out_err;
+-	nd->intent.open.file = __dentry_open(dget(dentry), mntget(nd->path.mnt),
+-					     nd->intent.open.file,
++	nd->intent.open.file = __dentry_open(&path, nd->intent.open.file,
+ 					     open, cred);
+ out:
+ 	return nd->intent.open.file;
+@@ -797,11 +795,9 @@ struct file *nameidata_to_filp(struct na
+ 	nd->intent.open.file = NULL;
+ 
+ 	/* Has the filesystem initialised the file for us? */
+-	if (filp->f_path.dentry == NULL) {
+-		path_get(&nd->path);
+-		filp = __dentry_open(nd->path.dentry, nd->path.mnt, filp,
+-				     NULL, cred);
+-	}
++	if (filp->f_path.dentry == NULL)
++		filp = vfs_open(&nd->path, filp, cred);
++
+ 	return filp;
+ }
+ 
+@@ -812,27 +808,48 @@ struct file *nameidata_to_filp(struct na
+ struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags,
+ 			 const struct cred *cred)
+ {
+-	int error;
+ 	struct file *f;
++	struct file *ret;
++	struct path path = { .dentry = dentry, .mnt = mnt };
+ 
+ 	validate_creds(cred);
+ 
+ 	/* We must always pass in a valid mount pointer. */
+ 	BUG_ON(!mnt);
+ 
+-	error = -ENFILE;
++	ret = ERR_PTR(-ENFILE);
+ 	f = get_empty_filp();
+-	if (f == NULL) {
+-		dput(dentry);
+-		mntput(mnt);
+-		return ERR_PTR(error);
++	if (f != NULL) {
++		f->f_flags = flags;
++		ret = vfs_open(&path, f, cred);
+ 	}
++	path_put(&path);
+ 
+-	f->f_flags = flags;
+-	return __dentry_open(dentry, mnt, f, NULL, cred);
++	return ret;
+ }
+ EXPORT_SYMBOL(dentry_open);
+ 
++/**
++ * vfs_open - open the file at the given path
++ * @path: path to open
++ * @filp: newly allocated file with f_flag initialized
++ * @cred: credentials to use
++ *
++ * Open the file.  If successful, the returned file will have acquired
++ * an additional reference for path.
++ */
++struct file *vfs_open(struct path *path, struct file *filp,
++		      const struct cred *cred)
++{
++	struct inode *inode = path->dentry->d_inode;
++
++	if (inode->i_op->open)
++		return inode->i_op->open(path->dentry, filp, cred);
++	else
++		return __dentry_open(path, filp, NULL, cred);
++}
++EXPORT_SYMBOL(vfs_open);
++
+ static void __put_unused_fd(struct files_struct *files, unsigned int fd)
+ {
+ 	struct fdtable *fdt = files_fdtable(files);
+--- /dev/null
++++ b/fs/overlayfs/Kconfig
+@@ -0,0 +1,4 @@
++config OVERLAYFS_FS
++	tristate "Overlay filesystem support"
++	help
++	  Add support for overlay filesystem.
+--- /dev/null
++++ b/fs/overlayfs/Makefile
+@@ -0,0 +1,7 @@
++#
++# Makefile for the overlay filesystem.
++#
++
++obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
++
++overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
+--- /dev/null
++++ b/fs/overlayfs/copy_up.c
+@@ -0,0 +1,384 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/file.h>
++#include <linux/splice.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/uaccess.h>
++#include "overlayfs.h"
++
++#define OVL_COPY_UP_CHUNK_SIZE (1 << 20)
++
++static int ovl_copy_up_xattr(struct dentry *old, struct dentry *new)
++{
++	ssize_t list_size, size;
++	char *buf, *name, *value;
++	int error;
++
++	if (!old->d_inode->i_op->getxattr ||
++	    !new->d_inode->i_op->getxattr)
++		return 0;
++
++	list_size = vfs_listxattr(old, NULL, 0);
++	if (list_size <= 0) {
++		if (list_size == -EOPNOTSUPP)
++			return 0;
++		return list_size;
++	}
++
++	buf = kzalloc(list_size, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++
++	error = -ENOMEM;
++	value = kmalloc(XATTR_SIZE_MAX, GFP_KERNEL);
++	if (!value)
++		goto out;
++
++	list_size = vfs_listxattr(old, buf, list_size);
++	if (list_size <= 0) {
++		error = list_size;
++		goto out_free_value;
++	}
++
++	for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
++		size = vfs_getxattr(old, name, value, XATTR_SIZE_MAX);
++		if (size <= 0) {
++			error = size;
++			goto out_free_value;
++		}
++		error = vfs_setxattr(new, name, value, size, 0);
++		if (error)
++			goto out_free_value;
++	}
++
++out_free_value:
++	kfree(value);
++out:
++	kfree(buf);
++	return error;
++}
++
++static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
++{
++	struct file *old_file;
++	struct file *new_file;
++	int error = 0;
++
++	if (len == 0)
++		return 0;
++
++	old_file = ovl_path_open(old, O_RDONLY);
++	if (IS_ERR(old_file))
++		return PTR_ERR(old_file);
++
++	new_file = ovl_path_open(new, O_WRONLY);
++	if (IS_ERR(new_file)) {
++		error = PTR_ERR(new_file);
++		goto out_fput;
++	}
++
++	/* FIXME: copy up sparse files efficiently */
++	while (len) {
++		loff_t offset = new_file->f_pos;
++		size_t this_len = OVL_COPY_UP_CHUNK_SIZE;
++		long bytes;
++
++		if (len < this_len)
++			this_len = len;
++
++		if (signal_pending_state(TASK_KILLABLE, current)) {
++			error = -EINTR;
++			break;
++		}
++
++		bytes = do_splice_direct(old_file, &offset, new_file, this_len,
++				 SPLICE_F_MOVE);
++		if (bytes <= 0) {
++			error = bytes;
++			break;
++		}
++
++		len -= bytes;
++	}
++
++	fput(new_file);
++out_fput:
++	fput(old_file);
++	return error;
++}
++
++static char *ovl_read_symlink(struct dentry *realdentry)
++{
++	int res;
++	char *buf;
++	struct inode *inode = realdentry->d_inode;
++	mm_segment_t old_fs;
++
++	res = -EINVAL;
++	if (!inode->i_op->readlink)
++		goto err;
++
++	res = -ENOMEM;
++	buf = (char *) __get_free_page(GFP_KERNEL);
++	if (!buf)
++		goto err;
++
++	old_fs = get_fs();
++	set_fs(get_ds());
++	/* The cast to a user pointer is valid due to the set_fs() */
++	res = inode->i_op->readlink(realdentry,
++				    (char __user *)buf, PAGE_SIZE - 1);
++	set_fs(old_fs);
++	if (res < 0) {
++		free_page((unsigned long) buf);
++		goto err;
++	}
++	buf[res] = '\0';
++
++	return buf;
++
++err:
++	return ERR_PTR(res);
++}
++
++static int ovl_set_timestamps(struct dentry *upperdentry, struct kstat *stat)
++{
++	struct iattr attr = {
++		.ia_valid =
++		     ATTR_ATIME | ATTR_MTIME | ATTR_ATIME_SET | ATTR_MTIME_SET,
++		.ia_atime = stat->atime,
++		.ia_mtime = stat->mtime,
++	};
++
++	return notify_change(upperdentry, &attr);
++}
++
++static int ovl_set_mode(struct dentry *upperdentry, umode_t mode)
++{
++	struct iattr attr = {
++		.ia_valid = ATTR_MODE,
++		.ia_mode = mode,
++	};
++
++	return notify_change(upperdentry, &attr);
++}
++
++static int ovl_copy_up_locked(struct dentry *upperdir, struct dentry *dentry,
++			      struct path *lowerpath, struct kstat *stat,
++			      const char *link)
++{
++	int err;
++	struct path newpath;
++	umode_t mode = stat->mode;
++
++	/* Can't properly set mode on creation because of the umask */
++	stat->mode &= S_IFMT;
++
++	ovl_path_upper(dentry, &newpath);
++	WARN_ON(newpath.dentry);
++	newpath.dentry = ovl_upper_create(upperdir, dentry, stat, link);
++	if (IS_ERR(newpath.dentry))
++		return PTR_ERR(newpath.dentry);
++
++	if (S_ISREG(stat->mode)) {
++		err = ovl_copy_up_data(lowerpath, &newpath, stat->size);
++		if (err)
++			goto err_remove;
++	}
++
++	err = ovl_copy_up_xattr(lowerpath->dentry, newpath.dentry);
++	if (err)
++		goto err_remove;
++
++	mutex_lock(&newpath.dentry->d_inode->i_mutex);
++	if (!S_ISLNK(stat->mode))
++		err = ovl_set_mode(newpath.dentry, mode);
++	if (!err)
++		err = ovl_set_timestamps(newpath.dentry, stat);
++	mutex_unlock(&newpath.dentry->d_inode->i_mutex);
++	if (err)
++		goto err_remove;
++
++	ovl_dentry_update(dentry, newpath.dentry);
++
++	/*
++	 * Easiest way to get rid of the lower dentry reference is to
++	 * drop this dentry.  This is neither needed nor possible for
++	 * directories.
++	 */
++	if (!S_ISDIR(stat->mode))
++		d_drop(dentry);
++
++	return 0;
++
++err_remove:
++	if (S_ISDIR(stat->mode))
++		vfs_rmdir(upperdir->d_inode, newpath.dentry);
++	else
++		vfs_unlink(upperdir->d_inode, newpath.dentry);
++
++	dput(newpath.dentry);
++
++	return err;
++}
++
++/*
++ * Copy up a single dentry
++ *
++ * Directory renames only allowed on "pure upper" (already created on
++ * upper filesystem, never copied up).  Directories which are on lower or
++ * are merged may not be renamed.  For these -EXDEV is returned and
++ * userspace has to deal with it.  This means, when copying up a
++ * directory we can rely on it and ancestors being stable.
++ *
++ * Non-directory renames start with copy up of source if necessary.  The
++ * actual rename will only proceed once the copy up was successful.  Copy
++ * up uses upper parent i_mutex for exclusion.  Since rename can change
++ * d_parent it is possible that the copy up will lock the old parent.  At
++ * that point the file will have already been copied up anyway.
++ */
++static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,
++			   struct path *lowerpath, struct kstat *stat)
++{
++	int err;
++	struct kstat pstat;
++	struct path parentpath;
++	struct dentry *upperdir;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	char *link = NULL;
++
++	ovl_path_upper(parent, &parentpath);
++	upperdir = parentpath.dentry;
++
++	err = vfs_getattr(parentpath.mnt, parentpath.dentry, &pstat);
++	if (err)
++		return err;
++
++	if (S_ISLNK(stat->mode)) {
++		link = ovl_read_symlink(lowerpath->dentry);
++		if (IS_ERR(link))
++			return PTR_ERR(link);
++	}
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out_free_link;
++
++	override_cred->fsuid = stat->uid;
++	override_cred->fsgid = stat->gid;
++	/*
++	 * CAP_SYS_ADMIN for copying up extended attributes
++	 * CAP_DAC_OVERRIDE for create
++	 * CAP_FOWNER for chmod, timestamp update
++	 * CAP_FSETID for chmod
++	 * CAP_MKNOD for mknod
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	cap_raise(override_cred->cap_effective, CAP_FSETID);
++	cap_raise(override_cred->cap_effective, CAP_MKNOD);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	if (ovl_path_type(dentry) != OVL_PATH_LOWER) {
++		err = 0;
++	} else {
++		err = ovl_copy_up_locked(upperdir, dentry, lowerpath,
++					 stat, link);
++		if (!err) {
++			/* Restore timestamps on parent (best effort) */
++			ovl_set_timestamps(upperdir, &pstat);
++		}
++	}
++
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++out_free_link:
++	if (link)
++		free_page((unsigned long) link);
++
++	return err;
++}
++
++int ovl_copy_up(struct dentry *dentry)
++{
++	int err;
++
++	err = 0;
++	while (!err) {
++		struct dentry *next;
++		struct dentry *parent;
++		struct path lowerpath;
++		struct kstat stat;
++		enum ovl_path_type type = ovl_path_type(dentry);
++
++		if (type != OVL_PATH_LOWER)
++			break;
++
++		next = dget(dentry);
++		/* find the topmost dentry not yet copied up */
++		for (;;) {
++			parent = dget_parent(next);
++
++			type = ovl_path_type(parent);
++			if (type != OVL_PATH_LOWER)
++				break;
++
++			dput(next);
++			next = parent;
++		}
++
++		ovl_path_lower(next, &lowerpath);
++		err = vfs_getattr(lowerpath.mnt, lowerpath.dentry, &stat);
++		if (!err)
++			err = ovl_copy_up_one(parent, next, &lowerpath, &stat);
++
++		dput(parent);
++		dput(next);
++	}
++
++	return err;
++}
++
++/* Optimize by not copying up the file first and truncating later */
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size)
++{
++	int err;
++	struct kstat stat;
++	struct path lowerpath;
++	struct dentry *parent = dget_parent(dentry);
++
++	err = ovl_copy_up(parent);
++	if (err)
++		goto out_dput_parent;
++
++	ovl_path_lower(dentry, &lowerpath);
++	err = vfs_getattr(lowerpath.mnt, lowerpath.dentry, &stat);
++	if (err)
++		goto out_dput_parent;
++
++	if (size < stat.size)
++		stat.size = size;
++
++	err = ovl_copy_up_one(parent, dentry, &lowerpath, &stat);
++
++out_dput_parent:
++	dput(parent);
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/dir.c
+@@ -0,0 +1,596 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include "overlayfs.h"
++
++static const char *ovl_whiteout_symlink = "(overlay-whiteout)";
++
++static int ovl_whiteout(struct dentry *upperdir, struct dentry *dentry)
++{
++	int err;
++	struct dentry *newdentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	/* FIXME: recheck lower dentry to see if whiteout is really needed */
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out;
++
++	/*
++	 * CAP_SYS_ADMIN for setxattr
++	 * CAP_DAC_OVERRIDE for symlink creation
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	override_cred->fsuid = 0;
++	override_cred->fsgid = 0;
++	old_cred = override_creds(override_cred);
++
++	newdentry = lookup_one_len(dentry->d_name.name, upperdir,
++				   dentry->d_name.len);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_put_cred;
++
++	/* Just been removed within the same locked region */
++	WARN_ON(newdentry->d_inode);
++
++	err = vfs_symlink(upperdir->d_inode, newdentry, ovl_whiteout_symlink);
++	if (err)
++		goto out_dput;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++
++	err = vfs_setxattr(newdentry, ovl_whiteout_xattr, "y", 1, 0);
++	if (err)
++		vfs_unlink(upperdir->d_inode, newdentry);
++
++out_dput:
++	dput(newdentry);
++out_put_cred:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++out:
++	if (err) {
++		/*
++		 * There's no way to recover from failure to whiteout.
++		 * What should we do?  Log a big fat error and... ?
++		 */
++		printk(KERN_ERR "overlayfs: ERROR - failed to whiteout '%s'\n",
++		       dentry->d_name.name);
++	}
++
++	return err;
++}
++
++static struct dentry *ovl_lookup_create(struct dentry *upperdir,
++					struct dentry *template)
++{
++	int err;
++	struct dentry *newdentry;
++	struct qstr *name = &template->d_name;
++
++	newdentry = lookup_one_len(name->name, upperdir, name->len);
++	if (IS_ERR(newdentry))
++		return newdentry;
++
++	if (newdentry->d_inode) {
++		const struct cred *old_cred;
++		struct cred *override_cred;
++
++		/* No need to check whiteout if lower parent is non-existent */
++		err = -EEXIST;
++		if (!ovl_dentry_lower(template->d_parent))
++			goto out_dput;
++
++		if (!S_ISLNK(newdentry->d_inode->i_mode))
++			goto out_dput;
++
++		err = -ENOMEM;
++		override_cred = prepare_creds();
++		if (!override_cred)
++			goto out_dput;
++
++		/*
++		 * CAP_SYS_ADMIN for getxattr
++		 * CAP_FOWNER for unlink in sticky directory
++		 */
++		cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++		cap_raise(override_cred->cap_effective, CAP_FOWNER);
++		old_cred = override_creds(override_cred);
++
++		err = -EEXIST;
++		if (ovl_is_whiteout(newdentry))
++			err = vfs_unlink(upperdir->d_inode, newdentry);
++
++		revert_creds(old_cred);
++		put_cred(override_cred);
++		if (err)
++			goto out_dput;
++
++		dput(newdentry);
++		newdentry = lookup_one_len(name->name, upperdir, name->len);
++		if (IS_ERR(newdentry)) {
++			ovl_whiteout(upperdir, template);
++			return newdentry;
++		}
++
++		/*
++		 * Whiteout just been successfully removed, parent
++		 * i_mutex is still held, there's no way the lookup
++		 * could return positive.
++		 */
++		WARN_ON(newdentry->d_inode);
++	}
++
++	return newdentry;
++
++out_dput:
++	dput(newdentry);
++	return ERR_PTR(err);
++}
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct inode *dir = upperdir->d_inode;
++
++	newdentry = ovl_lookup_create(upperdir, dentry);
++	if (IS_ERR(newdentry))
++		goto out;
++
++	switch (stat->mode & S_IFMT) {
++	case S_IFREG:
++		err = vfs_create(dir, newdentry, stat->mode, NULL);
++		break;
++
++	case S_IFDIR:
++		err = vfs_mkdir(dir, newdentry, stat->mode);
++		break;
++
++	case S_IFCHR:
++	case S_IFBLK:
++	case S_IFIFO:
++	case S_IFSOCK:
++		err = vfs_mknod(dir, newdentry, stat->mode, stat->rdev);
++		break;
++
++	case S_IFLNK:
++		err = vfs_symlink(dir, newdentry, link);
++		break;
++
++	default:
++		err = -EPERM;
++	}
++	if (err) {
++		if (ovl_dentry_is_opaque(dentry))
++			ovl_whiteout(upperdir, dentry);
++		dput(newdentry);
++		newdentry = ERR_PTR(err);
++	} else if (WARN_ON(!newdentry->d_inode)) {
++		/*
++		 * Not quite sure if non-instantiated dentry is legal or not.
++		 * VFS doesn't seem to care so check and warn here.
++		 */
++		dput(newdentry);
++		newdentry = ERR_PTR(-ENOENT);
++	}
++
++out:
++	return newdentry;
++
++}
++
++static int ovl_set_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for setxattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_setxattr(upperdentry, ovl_opaque_xattr, "y", 1, 0);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_remove_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for removexattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_removexattr(upperdentry, ovl_opaque_xattr);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_dir_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++
++	type = ovl_path_real(dentry, &realpath);
++	err = vfs_getattr(realpath.mnt, realpath.dentry, stat);
++	if (err)
++		return err;
++
++	stat->dev = dentry->d_sb->s_dev;
++	stat->ino = dentry->d_inode->i_ino;
++
++	/*
++	 * It's probably not worth it to count subdirs to get the
++	 * correct link count.  nlink=1 seems to pacify 'find' and
++	 * other utilities.
++	 */
++	if (type == OVL_PATH_MERGE)
++		stat->nlink = 1;
++
++	return 0;
++}
++
++static int ovl_create_object(struct dentry *dentry, int mode, dev_t rdev,
++			     const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *inode;
++	struct kstat stat = {
++		.mode = mode,
++		.rdev = rdev,
++	};
++
++	err = -ENOMEM;
++	inode = ovl_new_inode(dentry->d_sb, mode, dentry->d_fsdata);
++	if (!inode)
++		goto out;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		goto out_iput;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++
++	newdentry = ovl_upper_create(upperdir, dentry, &stat, link);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++	if (ovl_dentry_is_opaque(dentry) && S_ISDIR(mode)) {
++		err = ovl_set_opaque(newdentry);
++		if (err) {
++			vfs_rmdir(upperdir->d_inode, newdentry);
++			ovl_whiteout(upperdir, dentry);
++			goto out_dput;
++		}
++	}
++	ovl_dentry_update(dentry, newdentry);
++	d_instantiate(dentry, inode);
++	inode = NULL;
++	newdentry = NULL;
++	err = 0;
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out_iput:
++	iput(inode);
++out:
++	return err;
++}
++
++static int ovl_create(struct inode *dir, struct dentry *dentry, umode_t mode,
++			struct nameidata *nd)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFREG, 0, NULL);
++}
++
++static int ovl_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFDIR, 0, NULL);
++}
++
++static int ovl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
++		     dev_t rdev)
++{
++	return ovl_create_object(dentry, mode, rdev, NULL);
++}
++
++static int ovl_symlink(struct inode *dir, struct dentry *dentry,
++			 const char *link)
++{
++	return ovl_create_object(dentry, S_IFLNK, 0, link);
++}
++
++static int ovl_do_remove(struct dentry *dentry, bool is_dir)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++	struct dentry *upperdir;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		return err;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	type = ovl_path_real(dentry, &realpath);
++	if (type != OVL_PATH_LOWER) {
++		err = -ESTALE;
++		if (realpath.dentry->d_parent != upperdir)
++			goto out_d_drop;
++
++		/* FIXME: create whiteout up front and rename to target */
++
++		if (is_dir)
++			err = vfs_rmdir(upperdir->d_inode, realpath.dentry);
++		else
++			err = vfs_unlink(upperdir->d_inode, realpath.dentry);
++		if (err)
++			goto out_d_drop;
++
++		ovl_dentry_version_inc(dentry->d_parent);
++	}
++
++	if (type != OVL_PATH_UPPER || ovl_dentry_is_opaque(dentry))
++		err = ovl_whiteout(upperdir, dentry);
++
++	/*
++	 * Keeping this dentry hashed would mean having to release
++	 * upperpath/lowerpath, which could only be done if we are the
++	 * sole user of this dentry.  Too tricky...  Just unhash for
++	 * now.
++	 */
++out_d_drop:
++	d_drop(dentry);
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_unlink(struct inode *dir, struct dentry *dentry)
++{
++	return ovl_do_remove(dentry, false);
++}
++
++
++static int ovl_rmdir(struct inode *dir, struct dentry *dentry)
++{
++	int err;
++	enum ovl_path_type type;
++
++	type = ovl_path_type(dentry);
++	if (type != OVL_PATH_UPPER) {
++		err = ovl_check_empty_and_clear(dentry, type);
++		if (err)
++			return err;
++	}
++
++	return ovl_do_remove(dentry, true);
++}
++
++static int ovl_link(struct dentry *old, struct inode *newdir,
++		    struct dentry *new)
++{
++	int err;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++
++	err = ovl_copy_up(old);
++	if (err)
++		goto out;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		goto out;
++
++	upperdir = ovl_dentry_upper(new->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	newdentry = ovl_lookup_create(upperdir, new);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	olddentry = ovl_dentry_upper(old);
++	err = vfs_link(olddentry, upperdir->d_inode, newdentry);
++	if (!err) {
++		if (WARN_ON(!newdentry->d_inode)) {
++			dput(newdentry);
++			err = -ENOENT;
++			goto out_unlock;
++		}
++
++		ovl_dentry_version_inc(new->d_parent);
++		ovl_dentry_update(new, newdentry);
++
++		ihold(old->d_inode);
++		d_instantiate(new, old->d_inode);
++	} else {
++		if (ovl_dentry_is_opaque(new))
++			ovl_whiteout(upperdir, new);
++		dput(newdentry);
++	}
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out:
++	return err;
++
++}
++
++static int ovl_rename(struct inode *olddir, struct dentry *old,
++			struct inode *newdir, struct dentry *new)
++{
++	int err;
++	enum ovl_path_type old_type;
++	enum ovl_path_type new_type;
++	struct dentry *old_upperdir;
++	struct dentry *new_upperdir;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *trap;
++	bool old_opaque;
++	bool new_opaque;
++	bool new_create = false;
++	bool is_dir = S_ISDIR(old->d_inode->i_mode);
++
++	/* Don't copy up directory trees */
++	old_type = ovl_path_type(old);
++	if (old_type != OVL_PATH_UPPER && is_dir)
++		return -EXDEV;
++
++	if (new->d_inode) {
++		new_type = ovl_path_type(new);
++
++		if (new_type == OVL_PATH_LOWER && old_type == OVL_PATH_LOWER) {
++			if (ovl_dentry_lower(old)->d_inode ==
++			    ovl_dentry_lower(new)->d_inode)
++				return 0;
++		}
++		if (new_type != OVL_PATH_LOWER && old_type != OVL_PATH_LOWER) {
++			if (ovl_dentry_upper(old)->d_inode ==
++			    ovl_dentry_upper(new)->d_inode)
++				return 0;
++		}
++
++		if (new_type != OVL_PATH_UPPER &&
++		    S_ISDIR(new->d_inode->i_mode)) {
++			err = ovl_check_empty_and_clear(new, new_type);
++			if (err)
++				return err;
++		}
++	} else {
++		new_type = OVL_PATH_UPPER;
++	}
++
++	err = ovl_copy_up(old);
++	if (err)
++		return err;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		return err;
++
++	old_upperdir = ovl_dentry_upper(old->d_parent);
++	new_upperdir = ovl_dentry_upper(new->d_parent);
++
++	trap = lock_rename(new_upperdir, old_upperdir);
++
++	olddentry = ovl_dentry_upper(old);
++	newdentry = ovl_dentry_upper(new);
++	if (newdentry) {
++		dget(newdentry);
++	} else {
++		new_create = true;
++		newdentry = ovl_lookup_create(new_upperdir, new);
++		err = PTR_ERR(newdentry);
++		if (IS_ERR(newdentry))
++			goto out_unlock;
++	}
++
++	err = -ESTALE;
++	if (olddentry->d_parent != old_upperdir)
++		goto out_dput;
++	if (newdentry->d_parent != new_upperdir)
++		goto out_dput;
++	if (olddentry == trap)
++		goto out_dput;
++	if (newdentry == trap)
++		goto out_dput;
++
++	old_opaque = ovl_dentry_is_opaque(old);
++	new_opaque = ovl_dentry_is_opaque(new) || new_type != OVL_PATH_UPPER;
++
++	if (is_dir && !old_opaque && new_opaque) {
++		err = ovl_set_opaque(olddentry);
++		if (err)
++			goto out_dput;
++	}
++
++	err = vfs_rename(old_upperdir->d_inode, olddentry,
++			 new_upperdir->d_inode, newdentry);
++
++	if (err) {
++		if (new_create && ovl_dentry_is_opaque(new))
++			ovl_whiteout(new_upperdir, new);
++		if (is_dir && !old_opaque && new_opaque)
++			ovl_remove_opaque(olddentry);
++		goto out_dput;
++	}
++
++	if (old_type != OVL_PATH_UPPER || old_opaque)
++		err = ovl_whiteout(old_upperdir, old);
++	if (is_dir && old_opaque && !new_opaque)
++		ovl_remove_opaque(olddentry);
++
++	if (old_opaque != new_opaque)
++		ovl_dentry_set_opaque(old, new_opaque);
++
++	ovl_dentry_version_inc(old->d_parent);
++	ovl_dentry_version_inc(new->d_parent);
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	unlock_rename(new_upperdir, old_upperdir);
++	return err;
++}
++
++const struct inode_operations ovl_dir_inode_operations = {
++	.lookup		= ovl_lookup,
++	.mkdir		= ovl_mkdir,
++	.symlink	= ovl_symlink,
++	.unlink		= ovl_unlink,
++	.rmdir		= ovl_rmdir,
++	.rename		= ovl_rename,
++	.link		= ovl_link,
++	.setattr	= ovl_setattr,
++	.create		= ovl_create,
++	.mknod		= ovl_mknod,
++	.permission	= ovl_permission,
++	.getattr	= ovl_dir_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
+--- /dev/null
++++ b/fs/overlayfs/inode.c
+@@ -0,0 +1,384 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/xattr.h>
++#include "overlayfs.h"
++
++int ovl_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct dentry *upperdentry;
++	int err;
++
++	if ((attr->ia_valid & ATTR_SIZE) && !ovl_dentry_upper(dentry))
++		err = ovl_copy_up_truncate(dentry, attr->ia_size);
++	else
++		err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++
++	if (attr->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
++		attr->ia_valid &= ~ATTR_MODE;
++
++	mutex_lock(&upperdentry->d_inode->i_mutex);
++	err = notify_change(upperdentry, attr);
++	mutex_unlock(&upperdentry->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	struct path realpath;
++
++	ovl_path_real(dentry, &realpath);
++	return vfs_getattr(realpath.mnt, realpath.dentry, stat);
++}
++
++int ovl_permission(struct inode *inode, int mask)
++{
++	struct ovl_entry *oe;
++	struct dentry *alias = NULL;
++	struct inode *realinode;
++	struct dentry *realdentry;
++	bool is_upper;
++	int err;
++
++	if (S_ISDIR(inode->i_mode)) {
++		oe = inode->i_private;
++	} else if (mask & MAY_NOT_BLOCK) {
++		return -ECHILD;
++	} else {
++		/*
++		 * For non-directories find an alias and get the info
++		 * from there.
++		 */
++		spin_lock(&inode->i_lock);
++		if (WARN_ON(list_empty(&inode->i_dentry))) {
++			spin_unlock(&inode->i_lock);
++			return -ENOENT;
++		}
++		alias = list_entry(inode->i_dentry.next,
++				   struct dentry, d_alias);
++		dget(alias);
++		spin_unlock(&inode->i_lock);
++		oe = alias->d_fsdata;
++	}
++
++	realdentry = ovl_entry_real(oe, &is_upper);
++
++	/* Careful in RCU walk mode */
++	realinode = ACCESS_ONCE(realdentry->d_inode);
++	if (!realinode) {
++		WARN_ON(!(mask & MAY_NOT_BLOCK));
++		err = -ENOENT;
++		goto out_dput;
++	}
++
++	if (mask & MAY_WRITE) {
++		umode_t mode = realinode->i_mode;
++
++		/*
++		 * Writes will always be redirected to upper layer, so
++		 * ignore lower layer being read-only.
++		 *
++		 * If the overlay itself is read-only then proceed
++		 * with the permission check, don't return EROFS.
++		 * This will only happen if this is the lower layer of
++		 * another overlayfs.
++		 *
++		 * If upper fs becomes read-only after the overlay was
++		 * constructed return EROFS to prevent modification of
++		 * upper layer.
++		 */
++		err = -EROFS;
++		if (is_upper && !IS_RDONLY(inode) && IS_RDONLY(realinode) &&
++		    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
++			goto out_dput;
++
++		/*
++		 * Nobody gets write access to an immutable file.
++		 */
++		err = -EACCES;
++		if (IS_IMMUTABLE(realinode))
++			goto out_dput;
++	}
++
++	if (realinode->i_op->permission)
++		err = realinode->i_op->permission(realinode, mask);
++	else
++		err = generic_permission(realinode, mask);
++out_dput:
++	dput(alias);
++	return err;
++}
++
++
++struct ovl_link_data {
++	struct dentry *realdentry;
++	void *cookie;
++};
++
++static void *ovl_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	void *ret;
++	struct dentry *realdentry;
++	struct inode *realinode;
++
++	realdentry = ovl_dentry_real(dentry);
++	realinode = realdentry->d_inode;
++
++	if (WARN_ON(!realinode->i_op->follow_link))
++		return ERR_PTR(-EPERM);
++
++	ret = realinode->i_op->follow_link(realdentry, nd);
++	if (IS_ERR(ret))
++		return ret;
++
++	if (realinode->i_op->put_link) {
++		struct ovl_link_data *data;
++
++		data = kmalloc(sizeof(struct ovl_link_data), GFP_KERNEL);
++		if (!data) {
++			realinode->i_op->put_link(realdentry, nd, ret);
++			return ERR_PTR(-ENOMEM);
++		}
++		data->realdentry = realdentry;
++		data->cookie = ret;
++
++		return data;
++	} else {
++		return NULL;
++	}
++}
++
++static void ovl_put_link(struct dentry *dentry, struct nameidata *nd, void *c)
++{
++	struct inode *realinode;
++	struct ovl_link_data *data = c;
++
++	if (!data)
++		return;
++
++	realinode = data->realdentry->d_inode;
++	realinode->i_op->put_link(data->realdentry, nd, data->cookie);
++	kfree(data);
++}
++
++static int ovl_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
++{
++	struct path realpath;
++	struct inode *realinode;
++
++	ovl_path_real(dentry, &realpath);
++	realinode = realpath.dentry->d_inode;
++
++	if (!realinode->i_op->readlink)
++		return -EINVAL;
++
++	touch_atime(realpath.mnt, realpath.dentry);
++
++	return realinode->i_op->readlink(realpath.dentry, buf, bufsiz);
++}
++
++
++static bool ovl_is_private_xattr(const char *name)
++{
++	return strncmp(name, "trusted.overlay.", 14) == 0;
++}
++
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags)
++{
++	int err;
++	struct dentry *upperdentry;
++
++	if (ovl_is_private_xattr(name))
++		return -EPERM;
++
++	err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++	return  vfs_setxattr(upperdentry, name, value, size, flags);
++}
++
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size)
++{
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	return vfs_getxattr(ovl_dentry_real(dentry), name, value, size);
++}
++
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
++{
++	ssize_t res;
++	int off;
++
++	res = vfs_listxattr(ovl_dentry_real(dentry), list, size);
++	if (res <= 0 || size == 0)
++		return res;
++
++	if (ovl_path_type(dentry->d_parent) != OVL_PATH_MERGE)
++		return res;
++
++	/* filter out private xattrs */
++	for (off = 0; off < res;) {
++		char *s = list + off;
++		size_t slen = strlen(s) + 1;
++
++		BUG_ON(off + slen > res);
++
++		if (ovl_is_private_xattr(s)) {
++			res -= slen;
++			memmove(s, s + slen, res - off);
++		} else {
++			off += slen;
++		}
++	}
++
++	return res;
++}
++
++int ovl_removexattr(struct dentry *dentry, const char *name)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (type == OVL_PATH_LOWER) {
++		err = vfs_getxattr(realpath.dentry, name, NULL, 0);
++		if (err < 0)
++			return err;
++
++		err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_removexattr(realpath.dentry, name);
++}
++
++static bool ovl_open_need_copy_up(int flags, enum ovl_path_type type,
++				  struct dentry *realdentry)
++{
++	if (type != OVL_PATH_LOWER)
++		return false;
++
++	if (special_file(realdentry->d_inode->i_mode))
++		return false;
++
++	if (!(OPEN_FMODE(flags) & FMODE_WRITE) && !(flags & O_TRUNC))
++		return false;
++
++	return true;
++}
++
++static struct file *ovl_open(struct dentry *dentry, struct file *file,
++			     const struct cred *cred)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
++		if (file->f_flags & O_TRUNC)
++			err = ovl_copy_up_truncate(dentry, 0);
++		else
++			err = ovl_copy_up(dentry);
++		if (err)
++			return ERR_PTR(err);
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_open(&realpath, file, cred);
++}
++
++static const struct inode_operations ovl_file_inode_operations = {
++	.setattr	= ovl_setattr,
++	.permission	= ovl_permission,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++	.open		= ovl_open,
++};
++
++static const struct inode_operations ovl_symlink_inode_operations = {
++	.setattr	= ovl_setattr,
++	.follow_link	= ovl_follow_link,
++	.put_link	= ovl_put_link,
++	.readlink	= ovl_readlink,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe)
++{
++	struct inode *inode;
++
++	inode = new_inode(sb);
++	if (!inode)
++		return NULL;
++
++	mode &= S_IFMT;
++
++	inode->i_ino = get_next_ino();
++	inode->i_mode = mode;
++	inode->i_flags |= S_NOATIME | S_NOCMTIME;
++
++	switch (mode) {
++	case S_IFDIR:
++		inode->i_private = oe;
++		inode->i_op = &ovl_dir_inode_operations;
++		inode->i_fop = &ovl_dir_operations;
++		break;
++
++	case S_IFLNK:
++		inode->i_op = &ovl_symlink_inode_operations;
++		break;
++
++	case S_IFREG:
++	case S_IFSOCK:
++	case S_IFBLK:
++	case S_IFCHR:
++	case S_IFIFO:
++		inode->i_op = &ovl_file_inode_operations;
++		break;
++
++	default:
++		WARN(1, "illegal file type: %i\n", mode);
++		inode = NULL;
++	}
++
++	return inode;
++
++}
+--- /dev/null
++++ b/fs/overlayfs/overlayfs.h
+@@ -0,0 +1,64 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++struct ovl_entry;
++
++enum ovl_path_type {
++	OVL_PATH_UPPER,
++	OVL_PATH_MERGE,
++	OVL_PATH_LOWER,
++};
++
++extern const char *ovl_opaque_xattr;
++extern const char *ovl_whiteout_xattr;
++extern const struct dentry_operations ovl_dentry_operations;
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry);
++u64 ovl_dentry_version_get(struct dentry *dentry);
++void ovl_dentry_version_inc(struct dentry *dentry);
++void ovl_path_upper(struct dentry *dentry, struct path *path);
++void ovl_path_lower(struct dentry *dentry, struct path *path);
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path);
++struct dentry *ovl_dentry_upper(struct dentry *dentry);
++struct dentry *ovl_dentry_lower(struct dentry *dentry);
++struct dentry *ovl_dentry_real(struct dentry *dentry);
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper);
++bool ovl_dentry_is_opaque(struct dentry *dentry);
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque);
++bool ovl_is_whiteout(struct dentry *dentry);
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry);
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  struct nameidata *nd);
++struct file *ovl_path_open(struct path *path, int flags);
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link);
++
++/* readdir.c */
++extern const struct file_operations ovl_dir_operations;
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type);
++
++/* inode.c */
++int ovl_setattr(struct dentry *dentry, struct iattr *attr);
++int ovl_permission(struct inode *inode, int mask);
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags);
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size);
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
++int ovl_removexattr(struct dentry *dentry, const char *name);
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe);
++/* dir.c */
++extern const struct inode_operations ovl_dir_inode_operations;
++
++/* copy_up.c */
++int ovl_copy_up(struct dentry *dentry);
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size);
+--- /dev/null
++++ b/fs/overlayfs/readdir.c
+@@ -0,0 +1,565 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/namei.h>
++#include <linux/file.h>
++#include <linux/xattr.h>
++#include <linux/rbtree.h>
++#include <linux/security.h>
++#include "overlayfs.h"
++
++struct ovl_cache_entry {
++	const char *name;
++	unsigned int len;
++	unsigned int type;
++	u64 ino;
++	bool is_whiteout;
++	struct list_head l_node;
++	struct rb_node node;
++};
++
++struct ovl_readdir_data {
++	struct rb_root *root;
++	struct list_head *list;
++	struct list_head *middle;
++	struct dentry *dir;
++	int count;
++	int err;
++};
++
++struct ovl_dir_file {
++	bool is_real;
++	bool is_cached;
++	struct list_head cursor;
++	u64 cache_version;
++	struct list_head cache;
++	struct file *realfile;
++};
++
++static struct ovl_cache_entry *ovl_cache_entry_from_node(struct rb_node *n)
++{
++	return container_of(n, struct ovl_cache_entry, node);
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_find(struct rb_root *root,
++						    const char *name, int len)
++{
++	struct rb_node *node = root->rb_node;
++	int cmp;
++
++	while (node) {
++		struct ovl_cache_entry *p = ovl_cache_entry_from_node(node);
++
++		cmp = strncmp(name, p->name, len);
++		if (cmp > 0)
++			node = p->node.rb_right;
++		else if (cmp < 0 || len < p->len)
++			node = p->node.rb_left;
++		else
++			return p;
++	}
++
++	return NULL;
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_new(const char *name, int len,
++						   u64 ino, unsigned int d_type)
++{
++	struct ovl_cache_entry *p;
++
++	p = kmalloc(sizeof(*p) + len + 1, GFP_KERNEL);
++	if (p) {
++		char *name_copy = (char *) (p + 1);
++		memcpy(name_copy, name, len);
++		name_copy[len] = '\0';
++		p->name = name_copy;
++		p->len = len;
++		p->type = d_type;
++		p->ino = ino;
++		p->is_whiteout = false;
++	}
++
++	return p;
++}
++
++static int ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,
++				  const char *name, int len, u64 ino,
++				  unsigned int d_type)
++{
++	struct rb_node **newp = &rdd->root->rb_node;
++	struct rb_node *parent = NULL;
++	struct ovl_cache_entry *p;
++
++	while (*newp) {
++		int cmp;
++		struct ovl_cache_entry *tmp;
++
++		parent = *newp;
++		tmp = ovl_cache_entry_from_node(*newp);
++		cmp = strncmp(name, tmp->name, len);
++		if (cmp > 0)
++			newp = &tmp->node.rb_right;
++		else if (cmp < 0 || len < tmp->len)
++			newp = &tmp->node.rb_left;
++		else
++			return 0;
++	}
++
++	p = ovl_cache_entry_new(name, len, ino, d_type);
++	if (p == NULL)
++		return -ENOMEM;
++
++	list_add_tail(&p->l_node, rdd->list);
++	rb_link_node(&p->node, parent, newp);
++	rb_insert_color(&p->node, rdd->root);
++
++	return 0;
++}
++
++static int ovl_fill_lower(void *buf, const char *name, int namelen,
++			    loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++	struct ovl_cache_entry *p;
++
++	rdd->count++;
++	p = ovl_cache_entry_find(rdd->root, name, namelen);
++	if (p) {
++		list_move_tail(&p->l_node, rdd->middle);
++	} else {
++		p = ovl_cache_entry_new(name, namelen, ino, d_type);
++		if (p == NULL)
++			rdd->err = -ENOMEM;
++		else
++			list_add_tail(&p->l_node, rdd->middle);
++	}
++
++	return rdd->err;
++}
++
++static void ovl_cache_free(struct list_head *list)
++{
++	struct ovl_cache_entry *p;
++	struct ovl_cache_entry *n;
++
++	list_for_each_entry_safe(p, n, list, l_node)
++		kfree(p);
++
++	INIT_LIST_HEAD(list);
++}
++
++static int ovl_fill_upper(void *buf, const char *name, int namelen,
++			  loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++
++	rdd->count++;
++	return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);
++}
++
++static inline int ovl_dir_read(struct path *realpath,
++			       struct ovl_readdir_data *rdd, filldir_t filler)
++{
++	struct file *realfile;
++	int err;
++
++	realfile = ovl_path_open(realpath, O_RDONLY | O_DIRECTORY);
++	if (IS_ERR(realfile))
++		return PTR_ERR(realfile);
++
++	do {
++		rdd->count = 0;
++		rdd->err = 0;
++		err = vfs_readdir(realfile, filler, rdd);
++		if (err >= 0)
++			err = rdd->err;
++	} while (!err && rdd->count);
++	fput(realfile);
++
++	return 0;
++}
++
++static void ovl_dir_reset(struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++	enum ovl_path_type type = ovl_path_type(file->f_path.dentry);
++
++	if (ovl_dentry_version_get(file->f_path.dentry) != od->cache_version) {
++		list_del_init(&od->cursor);
++		ovl_cache_free(&od->cache);
++		od->is_cached = false;
++	}
++	WARN_ON(!od->is_real && type != OVL_PATH_MERGE);
++	if (od->is_real && type == OVL_PATH_MERGE) {
++		fput(od->realfile);
++		od->realfile = NULL;
++		od->is_real = false;
++	}
++}
++
++static int ovl_dir_mark_whiteouts(struct ovl_readdir_data *rdd)
++{
++	struct ovl_cache_entry *p;
++	struct dentry *dentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred) {
++		ovl_cache_free(rdd->list);
++		return -ENOMEM;
++	}
++
++	/*
++	 * CAP_SYS_ADMIN for getxattr
++	 * CAP_DAC_OVERRIDE for lookup
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock(&rdd->dir->d_inode->i_mutex);
++	list_for_each_entry(p, rdd->list, l_node) {
++		if (p->type != DT_LNK)
++			continue;
++
++		dentry = lookup_one_len(p->name, rdd->dir, p->len);
++		if (IS_ERR(dentry))
++			continue;
++
++		p->is_whiteout = ovl_is_whiteout(dentry);
++		dput(dentry);
++	}
++	mutex_unlock(&rdd->dir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return 0;
++}
++
++static inline int ovl_dir_read_merged(struct path *upperpath,
++				      struct path *lowerpath,
++				      struct ovl_readdir_data *rdd)
++{
++	int err;
++	struct rb_root root = RB_ROOT;
++	struct list_head middle;
++
++	rdd->root = &root;
++	if (upperpath->dentry) {
++		rdd->dir = upperpath->dentry;
++		err = ovl_dir_read(upperpath, rdd, ovl_fill_upper);
++		if (err)
++			goto out;
++
++		err = ovl_dir_mark_whiteouts(rdd);
++		if (err)
++			goto out;
++	}
++	/*
++	 * Insert lowerpath entries before upperpath ones, this allows
++	 * offsets to be reasonably constant
++	 */
++	list_add(&middle, rdd->list);
++	rdd->middle = &middle;
++	err = ovl_dir_read(lowerpath, rdd, ovl_fill_lower);
++	list_del(&middle);
++out:
++	rdd->root = NULL;
++
++	return err;
++}
++
++static void ovl_seek_cursor(struct ovl_dir_file *od, loff_t pos)
++{
++	struct list_head *l;
++	loff_t off;
++
++	l = od->cache.next;
++	for (off = 0; off < pos; off++) {
++		if (l == &od->cache)
++			break;
++		l = l->next;
++	}
++	list_move_tail(&od->cursor, l);
++}
++
++static int ovl_readdir(struct file *file, void *buf, filldir_t filler)
++{
++	struct ovl_dir_file *od = file->private_data;
++	int res;
++
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_readdir(od->realfile, filler, buf);
++		file->f_pos = od->realfile->f_pos;
++
++		return res;
++	}
++
++	if (!od->is_cached) {
++		struct path lowerpath;
++		struct path upperpath;
++		struct ovl_readdir_data rdd = { .list = &od->cache };
++
++		ovl_path_lower(file->f_path.dentry, &lowerpath);
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++
++		res = ovl_dir_read_merged(&upperpath, &lowerpath, &rdd);
++		if (res) {
++			ovl_cache_free(rdd.list);
++			return res;
++		}
++
++		od->cache_version = ovl_dentry_version_get(file->f_path.dentry);
++		od->is_cached = true;
++
++		ovl_seek_cursor(od, file->f_pos);
++	}
++
++	while (od->cursor.next != &od->cache) {
++		int over;
++		loff_t off;
++		struct ovl_cache_entry *p;
++
++		p = list_entry(od->cursor.next, struct ovl_cache_entry, l_node);
++		off = file->f_pos;
++		if (!p->is_whiteout) {
++			over = filler(buf, p->name, p->len, off, p->ino,
++				      p->type);
++			if (over)
++				break;
++		}
++		file->f_pos++;
++		list_move(&od->cursor, &p->l_node);
++	}
++
++	return 0;
++}
++
++static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
++{
++	loff_t res;
++	struct ovl_dir_file *od = file->private_data;
++
++	mutex_lock(&file->f_dentry->d_inode->i_mutex);
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_llseek(od->realfile, offset, origin);
++		file->f_pos = od->realfile->f_pos;
++	} else {
++		res = -EINVAL;
++
++		switch (origin) {
++		case SEEK_CUR:
++			offset += file->f_pos;
++			break;
++		case SEEK_SET:
++			break;
++		default:
++			goto out_unlock;
++		}
++		if (offset < 0)
++			goto out_unlock;
++
++		if (offset != file->f_pos) {
++			file->f_pos = offset;
++			if (od->is_cached)
++				ovl_seek_cursor(od, offset);
++		}
++		res = offset;
++	}
++out_unlock:
++	mutex_unlock(&file->f_dentry->d_inode->i_mutex);
++
++	return res;
++}
++
++static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
++			 int datasync)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	/* May need to reopen directory if it got copied up */
++	if (!od->realfile) {
++		struct path upperpath;
++
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++		od->realfile = ovl_path_open(&upperpath, O_RDONLY);
++		if (IS_ERR(od->realfile))
++			return PTR_ERR(od->realfile);
++	}
++
++	return vfs_fsync_range(od->realfile, start, end, datasync);
++}
++
++static int ovl_dir_release(struct inode *inode, struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	list_del(&od->cursor);
++	ovl_cache_free(&od->cache);
++	if (od->realfile)
++		fput(od->realfile);
++	kfree(od);
++
++	return 0;
++}
++
++static int ovl_dir_open(struct inode *inode, struct file *file)
++{
++	struct path realpath;
++	struct file *realfile;
++	struct ovl_dir_file *od;
++	enum ovl_path_type type;
++
++	od = kzalloc(sizeof(struct ovl_dir_file), GFP_KERNEL);
++	if (!od)
++		return -ENOMEM;
++
++	type = ovl_path_real(file->f_path.dentry, &realpath);
++	realfile = ovl_path_open(&realpath, file->f_flags);
++	if (IS_ERR(realfile)) {
++		kfree(od);
++		return PTR_ERR(realfile);
++	}
++	INIT_LIST_HEAD(&od->cache);
++	INIT_LIST_HEAD(&od->cursor);
++	od->is_cached = false;
++	od->realfile = realfile;
++	od->is_real = (type != OVL_PATH_MERGE);
++	file->private_data = od;
++
++	return 0;
++}
++
++const struct file_operations ovl_dir_operations = {
++	.read		= generic_read_dir,
++	.open		= ovl_dir_open,
++	.readdir	= ovl_readdir,
++	.llseek		= ovl_dir_llseek,
++	.fsync		= ovl_dir_fsync,
++	.release	= ovl_dir_release,
++};
++
++static int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
++{
++	int err;
++	struct path lowerpath;
++	struct path upperpath;
++	struct ovl_cache_entry *p;
++	struct ovl_readdir_data rdd = { .list = list };
++
++	ovl_path_upper(dentry, &upperpath);
++	ovl_path_lower(dentry, &lowerpath);
++
++	err = ovl_dir_read_merged(&upperpath, &lowerpath, &rdd);
++	if (err)
++		return err;
++
++	err = 0;
++
++	list_for_each_entry(p, list, l_node) {
++		if (p->is_whiteout)
++			continue;
++
++		if (p->name[0] == '.') {
++			if (p->len == 1)
++				continue;
++			if (p->len == 2 && p->name[1] == '.')
++				continue;
++		}
++		err = -ENOTEMPTY;
++		break;
++	}
++
++	return err;
++}
++
++static int ovl_remove_whiteouts(struct dentry *dir, struct list_head *list)
++{
++	struct path upperpath;
++	struct dentry *upperdir;
++	struct ovl_cache_entry *p;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	int err;
++
++	ovl_path_upper(dir, &upperpath);
++	upperdir = upperpath.dentry;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/*
++	 * CAP_DAC_OVERRIDE for lookup and unlink
++	 * CAP_SYS_ADMIN for setxattr of "trusted" namespace
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	old_cred = override_creds(override_cred);
++
++	err = vfs_setxattr(upperdir, ovl_opaque_xattr, "y", 1, 0);
++	if (err)
++		goto out_revert_creds;
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	list_for_each_entry(p, list, l_node) {
++		struct dentry *dentry;
++		int ret;
++
++		if (!p->is_whiteout)
++			continue;
++
++		dentry = lookup_one_len(p->name, upperdir, p->len);
++		if (IS_ERR(dentry)) {
++			printk(KERN_WARNING
++			    "overlayfs: failed to lookup whiteout %.*s: %li\n",
++			    p->len, p->name, PTR_ERR(dentry));
++			continue;
++		}
++		ret = vfs_unlink(upperdir->d_inode, dentry);
++		dput(dentry);
++		if (ret)
++			printk(KERN_WARNING
++			    "overlayfs: failed to unlink whiteout %.*s: %i\n",
++			    p->len, p->name, ret);
++	}
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++out_revert_creds:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type)
++{
++	int err;
++	LIST_HEAD(list);
++
++	err = ovl_check_empty_dir(dentry, &list);
++	if (!err && type == OVL_PATH_MERGE)
++		err = ovl_remove_whiteouts(dentry, &list);
++
++	ovl_cache_free(&list);
++
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/super.c
+@@ -0,0 +1,664 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/mount.h>
++#include <linux/slab.h>
++#include <linux/parser.h>
++#include <linux/module.h>
++#include <linux/seq_file.h>
++#include "overlayfs.h"
++
++MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
++MODULE_DESCRIPTION("Overlay filesystem");
++MODULE_LICENSE("GPL");
++
++struct ovl_config {
++	char *lowerdir;
++	char *upperdir;
++};
++
++/* private information held for overlayfs's superblock */
++struct ovl_fs {
++	struct vfsmount *upper_mnt;
++	struct vfsmount *lower_mnt;
++	/* pathnames of lower and upper dirs, for show_options */
++	struct ovl_config config;
++};
++
++/* private information held for every overlayfs dentry */
++struct ovl_entry {
++	/*
++	 * Keep "double reference" on upper dentries, so that
++	 * d_delete() doesn't think it's OK to reset d_inode to NULL.
++	 */
++	struct dentry *__upperdentry;
++	struct dentry *lowerdentry;
++	union {
++		struct {
++			u64 version;
++			bool opaque;
++		};
++		struct rcu_head rcu;
++	};
++};
++
++const char *ovl_whiteout_xattr = "trusted.overlay.whiteout";
++const char *ovl_opaque_xattr = "trusted.overlay.opaque";
++
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe->__upperdentry) {
++		if (oe->lowerdentry && S_ISDIR(dentry->d_inode->i_mode))
++			return OVL_PATH_MERGE;
++		else
++			return OVL_PATH_UPPER;
++	} else {
++		return OVL_PATH_LOWER;
++	}
++}
++
++static struct dentry *ovl_upperdentry_dereference(struct ovl_entry *oe)
++{
++	struct dentry *upperdentry = ACCESS_ONCE(oe->__upperdentry);
++	smp_read_barrier_depends();
++	return upperdentry;
++}
++
++void ovl_path_upper(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->upper_mnt;
++	path->dentry = ovl_upperdentry_dereference(oe);
++}
++
++void ovl_path_lower(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->lower_mnt;
++	path->dentry = oe->lowerdentry;
++}
++
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)
++{
++
++	enum ovl_path_type type = ovl_path_type(dentry);
++
++	if (type == OVL_PATH_LOWER)
++		ovl_path_lower(dentry, path);
++	else
++		ovl_path_upper(dentry, path);
++
++	return type;
++}
++
++struct dentry *ovl_dentry_upper(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return ovl_upperdentry_dereference(oe);
++}
++
++struct dentry *ovl_dentry_lower(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return oe->lowerdentry;
++}
++
++struct dentry *ovl_dentry_real(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (!realdentry)
++		realdentry = oe->lowerdentry;
++
++	return realdentry;
++}
++
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper)
++{
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (realdentry) {
++		*is_upper = true;
++	} else {
++		realdentry = oe->lowerdentry;
++		*is_upper = false;
++	}
++	return realdentry;
++}
++
++bool ovl_dentry_is_opaque(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	return oe->opaque;
++}
++
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	oe->opaque = opaque;
++}
++
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&upperdentry->d_parent->d_inode->i_mutex));
++	WARN_ON(oe->__upperdentry);
++	BUG_ON(!upperdentry->d_inode);
++	smp_wmb();
++	oe->__upperdentry = dget(upperdentry);
++}
++
++void ovl_dentry_version_inc(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	oe->version++;
++}
++
++u64 ovl_dentry_version_get(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	return oe->version;
++}
++
++bool ovl_is_whiteout(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!dentry)
++		return false;
++	if (!dentry->d_inode)
++		return false;
++	if (!S_ISLNK(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_whiteout_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static bool ovl_is_opaquedir(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!S_ISDIR(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_opaque_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static void ovl_entry_free(struct rcu_head *head)
++{
++	struct ovl_entry *oe = container_of(head, struct ovl_entry, rcu);
++	kfree(oe);
++}
++
++static void ovl_dentry_release(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe) {
++		dput(oe->__upperdentry);
++		dput(oe->__upperdentry);
++		dput(oe->lowerdentry);
++		call_rcu(&oe->rcu, ovl_entry_free);
++	}
++}
++
++const struct dentry_operations ovl_dentry_operations = {
++	.d_release = ovl_dentry_release,
++};
++
++static struct ovl_entry *ovl_alloc_entry(void)
++{
++	return kzalloc(sizeof(struct ovl_entry), GFP_KERNEL);
++}
++
++static inline struct dentry *ovl_lookup_real(struct dentry *dir,
++					     struct qstr *name)
++{
++	struct dentry *dentry;
++
++	mutex_lock(&dir->d_inode->i_mutex);
++	dentry = lookup_one_len(name->name, dir, name->len);
++	mutex_unlock(&dir->d_inode->i_mutex);
++
++	if (IS_ERR(dentry)) {
++		if (PTR_ERR(dentry) == -ENOENT)
++			dentry = NULL;
++	} else if (!dentry->d_inode) {
++		dput(dentry);
++		dentry = NULL;
++	}
++	return dentry;
++}
++
++static int ovl_do_lookup(struct dentry *dentry)
++{
++	struct ovl_entry *oe;
++	struct dentry *upperdir;
++	struct dentry *lowerdir;
++	struct dentry *upperdentry = NULL;
++	struct dentry *lowerdentry = NULL;
++	struct inode *inode = NULL;
++	int err;
++
++	err = -ENOMEM;
++	oe = ovl_alloc_entry();
++	if (!oe)
++		goto out;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	lowerdir = ovl_dentry_lower(dentry->d_parent);
++
++	if (upperdir) {
++		upperdentry = ovl_lookup_real(upperdir, &dentry->d_name);
++		err = PTR_ERR(upperdentry);
++		if (IS_ERR(upperdentry))
++			goto out_put_dir;
++
++		if (lowerdir && upperdentry &&
++		    (S_ISLNK(upperdentry->d_inode->i_mode) ||
++		     S_ISDIR(upperdentry->d_inode->i_mode))) {
++			const struct cred *old_cred;
++			struct cred *override_cred;
++
++			err = -ENOMEM;
++			override_cred = prepare_creds();
++			if (!override_cred)
++				goto out_dput_upper;
++
++			/* CAP_SYS_ADMIN needed for getxattr */
++			cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++			old_cred = override_creds(override_cred);
++
++			if (ovl_is_opaquedir(upperdentry)) {
++				oe->opaque = true;
++			} else if (ovl_is_whiteout(upperdentry)) {
++				dput(upperdentry);
++				upperdentry = NULL;
++				oe->opaque = true;
++			}
++			revert_creds(old_cred);
++			put_cred(override_cred);
++		}
++	}
++	if (lowerdir && !oe->opaque) {
++		lowerdentry = ovl_lookup_real(lowerdir, &dentry->d_name);
++		err = PTR_ERR(lowerdentry);
++		if (IS_ERR(lowerdentry))
++			goto out_dput_upper;
++	}
++
++	if (lowerdentry && upperdentry &&
++	    (!S_ISDIR(upperdentry->d_inode->i_mode) ||
++	     !S_ISDIR(lowerdentry->d_inode->i_mode))) {
++		dput(lowerdentry);
++		lowerdentry = NULL;
++		oe->opaque = true;
++	}
++
++	if (lowerdentry || upperdentry) {
++		struct dentry *realdentry;
++
++		realdentry = upperdentry ? upperdentry : lowerdentry;
++		err = -ENOMEM;
++		inode = ovl_new_inode(dentry->d_sb, realdentry->d_inode->i_mode,
++				      oe);
++		if (!inode)
++			goto out_dput;
++	}
++
++	if (upperdentry)
++		oe->__upperdentry = dget(upperdentry);
++
++	if (lowerdentry)
++		oe->lowerdentry = lowerdentry;
++
++	dentry->d_fsdata = oe;
++	dentry->d_op = &ovl_dentry_operations;
++	d_add(dentry, inode);
++
++	return 0;
++
++out_dput:
++	dput(lowerdentry);
++out_dput_upper:
++	dput(upperdentry);
++out_put_dir:
++	kfree(oe);
++out:
++	return err;
++}
++
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  struct nameidata *nd)
++{
++	int err = ovl_do_lookup(dentry);
++
++	if (err)
++		return ERR_PTR(err);
++
++	return NULL;
++}
++
++struct file *ovl_path_open(struct path *path, int flags)
++{
++	path_get(path);
++	return dentry_open(path->dentry, path->mnt, flags, current_cred());
++}
++
++static void ovl_put_super(struct super_block *sb)
++{
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++
++	mntput(ufs->upper_mnt);
++	mntput(ufs->lower_mnt);
++
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++	kfree(ufs);
++}
++
++static int ovl_remount_fs(struct super_block *sb, int *flagsp, char *data)
++{
++	int flags = *flagsp;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	/* When remounting rw or ro, we need to adjust the write access to the
++	 * upper fs.
++	 */
++	if (((flags ^ sb->s_flags) & MS_RDONLY) == 0)
++		/* No change to readonly status */
++		return 0;
++
++	if (flags & MS_RDONLY) {
++		mnt_drop_write(ufs->upper_mnt);
++		return 0;
++	} else
++		return mnt_want_write(ufs->upper_mnt);
++}
++
++/**
++ * ovl_statfs
++ * @sb: The overlayfs super block
++ * @buf: The struct kstatfs to fill in with stats
++ *
++ * Get the filesystem statistics.  As writes always target the upper layer
++ * filesystem pass the statfs to the same filesystem.
++ */
++static int ovl_statfs(struct dentry *dentry, struct kstatfs *buf)
++{
++	struct dentry *root_dentry = dentry->d_sb->s_root;
++	struct path path;
++	ovl_path_upper(root_dentry, &path);
++
++	if (!path.dentry->d_sb->s_op->statfs)
++		return -ENOSYS;
++	return path.dentry->d_sb->s_op->statfs(path.dentry, buf);
++}
++
++/**
++ * ovl_show_options
++ *
++ * Prints the mount options for a given superblock.
++ * Returns zero; does not fail.
++ */
++static int ovl_show_options(struct seq_file *m, struct dentry *dentry)
++{
++	struct super_block *sb = dentry->d_sb;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	seq_printf(m, ",lowerdir=%s", ufs->config.lowerdir);
++	seq_printf(m, ",upperdir=%s", ufs->config.upperdir);
++	return 0;
++}
++
++static const struct super_operations ovl_super_operations = {
++	.put_super	= ovl_put_super,
++	.remount_fs	= ovl_remount_fs,
++	.statfs		= ovl_statfs,
++	.show_options	= ovl_show_options,
++};
++
++enum {
++	Opt_lowerdir,
++	Opt_upperdir,
++	Opt_err,
++};
++
++static const match_table_t ovl_tokens = {
++	{Opt_lowerdir,			"lowerdir=%s"},
++	{Opt_upperdir,			"upperdir=%s"},
++	{Opt_err,			NULL}
++};
++
++static int ovl_parse_opt(char *opt, struct ovl_config *config)
++{
++	char *p;
++
++	config->upperdir = NULL;
++	config->lowerdir = NULL;
++
++	while ((p = strsep(&opt, ",")) != NULL) {
++		int token;
++		substring_t args[MAX_OPT_ARGS];
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, ovl_tokens, args);
++		switch (token) {
++		case Opt_upperdir:
++			kfree(config->upperdir);
++			config->upperdir = match_strdup(&args[0]);
++			if (!config->upperdir)
++				return -ENOMEM;
++			break;
++
++		case Opt_lowerdir:
++			kfree(config->lowerdir);
++			config->lowerdir = match_strdup(&args[0]);
++			if (!config->lowerdir)
++				return -ENOMEM;
++			break;
++
++		default:
++			return -EINVAL;
++		}
++	}
++	return 0;
++}
++
++static int ovl_fill_super(struct super_block *sb, void *data, int silent)
++{
++	struct path lowerpath;
++	struct path upperpath;
++	struct inode *root_inode;
++	struct dentry *root_dentry;
++	struct ovl_entry *oe;
++	struct ovl_fs *ufs;
++	int err;
++
++	err = -ENOMEM;
++	ufs = kmalloc(sizeof(struct ovl_fs), GFP_KERNEL);
++	if (!ufs)
++		goto out;
++
++	err = ovl_parse_opt((char *) data, &ufs->config);
++	if (err)
++		goto out_free_ufs;
++
++	err = -EINVAL;
++	if (!ufs->config.upperdir || !ufs->config.lowerdir) {
++		printk(KERN_ERR "overlayfs: missing upperdir or lowerdir\n");
++		goto out_free_config;
++	}
++
++	oe = ovl_alloc_entry();
++	if (oe == NULL)
++		goto out_free_config;
++
++	root_inode = ovl_new_inode(sb, S_IFDIR, oe);
++	if (!root_inode)
++		goto out_free_oe;
++
++	err = kern_path(ufs->config.upperdir, LOOKUP_FOLLOW, &upperpath);
++	if (err)
++		goto out_put_root;
++
++	err = kern_path(ufs->config.lowerdir, LOOKUP_FOLLOW, &lowerpath);
++	if (err)
++		goto out_put_upperpath;
++
++	err = -ENOTDIR;
++	if (!S_ISDIR(upperpath.dentry->d_inode->i_mode) ||
++	    !S_ISDIR(lowerpath.dentry->d_inode->i_mode))
++		goto out_put_lowerpath;
++
++	sb->s_stack_depth = max(upperpath.mnt->mnt_sb->s_stack_depth,
++				lowerpath.mnt->mnt_sb->s_stack_depth) + 1;
++
++	err = -EINVAL;
++	if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		printk(KERN_ERR "overlayfs: maximum fs stacking depth exceeded\n");
++		goto out_put_lowerpath;
++	}
++
++
++	ufs->upper_mnt = clone_private_mount(&upperpath);
++	err = PTR_ERR(ufs->upper_mnt);
++	if (IS_ERR(ufs->upper_mnt)) {
++		printk(KERN_ERR "overlayfs: failed to clone upperpath\n");
++		goto out_put_lowerpath;
++	}
++
++	ufs->lower_mnt = clone_private_mount(&lowerpath);
++	err = PTR_ERR(ufs->lower_mnt);
++	if (IS_ERR(ufs->lower_mnt)) {
++		printk(KERN_ERR "overlayfs: failed to clone lowerpath\n");
++		goto out_put_upper_mnt;
++	}
++
++	/*
++	 * Make lower_mnt R/O.  That way fchmod/fchown on lower file
++	 * will fail instead of modifying lower fs.
++	 */
++	ufs->lower_mnt->mnt_flags |= MNT_READONLY;
++
++	/* If the upper fs is r/o, we mark overlayfs r/o too */
++	if (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY)
++		sb->s_flags |= MS_RDONLY;
++
++	if (!(sb->s_flags & MS_RDONLY)) {
++		err = mnt_want_write(ufs->upper_mnt);
++		if (err)
++			goto out_put_lower_mnt;
++	}
++
++	err = -ENOMEM;
++	root_dentry = d_alloc_root(root_inode);
++	if (!root_dentry)
++		goto out_drop_write;
++
++	mntput(upperpath.mnt);
++	mntput(lowerpath.mnt);
++
++	oe->__upperdentry = dget(upperpath.dentry);
++	oe->lowerdentry = lowerpath.dentry;
++
++	root_dentry->d_fsdata = oe;
++	root_dentry->d_op = &ovl_dentry_operations;
++
++	sb->s_op = &ovl_super_operations;
++	sb->s_root = root_dentry;
++	sb->s_fs_info = ufs;
++
++	return 0;
++
++out_drop_write:
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++out_put_lower_mnt:
++	mntput(ufs->lower_mnt);
++out_put_upper_mnt:
++	mntput(ufs->upper_mnt);
++out_put_lowerpath:
++	path_put(&lowerpath);
++out_put_upperpath:
++	path_put(&upperpath);
++out_put_root:
++	iput(root_inode);
++out_free_oe:
++	kfree(oe);
++out_free_config:
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++out_free_ufs:
++	kfree(ufs);
++out:
++	return err;
++}
++
++static struct dentry *ovl_mount(struct file_system_type *fs_type, int flags,
++				const char *dev_name, void *raw_data)
++{
++	return mount_nodev(fs_type, flags, raw_data, ovl_fill_super);
++}
++
++static struct file_system_type ovl_fs_type = {
++	.owner		= THIS_MODULE,
++	.name		= "overlayfs",
++	.mount		= ovl_mount,
++	.kill_sb	= kill_anon_super,
++};
++
++static int __init ovl_init(void)
++{
++	return register_filesystem(&ovl_fs_type);
++}
++
++static void __exit ovl_exit(void)
++{
++	unregister_filesystem(&ovl_fs_type);
++}
++
++module_init(ovl_init);
++module_exit(ovl_exit);
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1302,6 +1302,7 @@ long do_splice_direct(struct file *in, l
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_splice_direct);
+ 
+ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
+ 			       struct pipe_inode_info *opipe,
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -484,6 +484,12 @@ struct iattr {
+  */
+ #include <linux/quota.h>
+ 
++/*
++ * Maximum number of layers of fs stack.  Needs to be limited to
++ * prevent kernel stack overflow
++ */
++#define FILESYSTEM_MAX_STACK_DEPTH 2
++
+ /** 
+  * enum positive_aop_returns - aop return codes with specific semantics
+  *
+@@ -1501,6 +1507,11 @@ struct super_block {
+ 
+ 	/* Being remounted read-only */
+ 	int s_readonly_remount;
++
++	/*
++	 * Indicates how deep in a filesystem stack this SB is
++	 */
++	int s_stack_depth;
+ };
+ 
+ /* superblock cache pruning functions */
+@@ -1658,6 +1669,8 @@ struct inode_operations {
+ 	void (*truncate_range)(struct inode *, loff_t, loff_t);
+ 	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
+ 		      u64 len);
++	struct file *(*open) (struct dentry *, struct file *,
++			      const struct cred *);
+ } ____cacheline_aligned;
+ 
+ struct seq_file;
+@@ -2028,6 +2041,7 @@ extern long do_sys_open(int dfd, const c
+ extern struct file *filp_open(const char *, int, umode_t);
+ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
+ 				   const char *, int);
++extern struct file *vfs_open(struct path *, struct file *, const struct cred *);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int,
+ 				 const struct cred *);
+ extern int filp_close(struct file *, fl_owner_t id);
+--- a/include/linux/mount.h
++++ b/include/linux/mount.h
+@@ -66,6 +66,9 @@ extern void mnt_pin(struct vfsmount *mnt
+ extern void mnt_unpin(struct vfsmount *mnt);
+ extern int __mnt_is_readonly(struct vfsmount *mnt);
+ 
++struct path;
++extern struct vfsmount *clone_private_mount(struct path *path);
++
+ struct file_system_type;
+ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
+ 				      int flags, const char *name,
diff --git a/trunk/target/linux/generic/patches-3.3/102-ehci_hcd_ignore_oc.patch b/trunk/target/linux/generic/patches-3.3/102-ehci_hcd_ignore_oc.patch
new file mode 100644
index 00000000..400d2ed8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/102-ehci_hcd_ignore_oc.patch
@@ -0,0 +1,41 @@
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -795,7 +795,7 @@ static int ehci_run (struct usb_hcd *hcd
+ 		"USB %x.%x started, EHCI %x.%02x%s\n",
+ 		((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
+ 		temp >> 8, temp & 0xff,
+-		ignore_oc ? ", overcurrent ignored" : "");
++		(ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
+ 
+ 	ehci_writel(ehci, INTR_MASK,
+ 		    &ehci->regs->intr_enable); /* Turn On Interrupts */
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -578,7 +578,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+ 	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
+ 	 * PORT_POWER; that's surprising, but maybe within-spec.
+ 	 */
+-	if (!ignore_oc)
++	if (!ignore_oc && !ehci->ignore_oc)
+ 		mask = PORT_CSC | PORT_PEC | PORT_OCC;
+ 	else
+ 		mask = PORT_CSC | PORT_PEC;
+@@ -803,7 +803,7 @@ static int ehci_hub_control (
+ 		if (temp & PORT_PEC)
+ 			status |= USB_PORT_STAT_C_ENABLE << 16;
+ 
+-		if ((temp & PORT_OCC) && !ignore_oc){
++		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
+ 			status |= USB_PORT_STAT_C_OVERCURRENT << 16;
+ 
+ 			/*
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -147,6 +147,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		use_dummy_qh:1;	/* AMD Frame List table quirk*/
+ 	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
+ 	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
++	unsigned		ignore_oc:1;
+ 
+ 	/* required for usb32 quirk */
+ 	#define OHCI_CTRL_HCFS          (3 << 6)
diff --git a/trunk/target/linux/generic/patches-3.3/110-fix_mtd_include.patch b/trunk/target/linux/generic/patches-3.3/110-fix_mtd_include.patch
new file mode 100644
index 00000000..c63dbc05
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/110-fix_mtd_include.patch
@@ -0,0 +1,10 @@
+--- a/include/linux/mtd/physmap.h
++++ b/include/linux/mtd/physmap.h
+@@ -17,6 +17,7 @@
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/platform_device.h>
+ 
+ struct map_info;
+ struct platform_device;
diff --git a/trunk/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch b/trunk/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch
new file mode 100644
index 00000000..247a3122
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch
@@ -0,0 +1,188 @@
+From 9d02daf754238adac48fa075ee79e7edd3d79ed3 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Sun, 8 Apr 2012 09:55:43 +0000
+Subject: [PATCH] pppoatm: Fix excessive queue bloat
+
+We discovered that PPPoATM has an excessively deep transmit queue. A
+queue the size of the default socket send buffer (wmem_default) is
+maintained between the PPP generic core and the ATM device.
+
+Fix it to queue a maximum of *two* packets. The one the ATM device is
+currently working on, and one more for the ATM driver to process
+immediately in its TX done interrupt handler. The PPP core is designed
+to feed packets to the channel with minimal latency, so that really
+ought to be enough to keep the ATM device busy.
+
+While we're at it, fix the fact that we were triggering the wakeup
+tasklet on *every* pppoatm_pop() call. The comment saying "this is
+inefficient, but doing it right is too hard" turns out to be overly
+pessimistic... I think :)
+
+On machines like the Traverse Geos, with a slow Geode CPU and two
+high-speed ADSL2+ interfaces, there were reports of extremely high CPU
+usage which could partly be attributed to the extra wakeups.
+
+(The wakeup handling could actually be made a whole lot easier if we
+ stop checking sk->sk_sndbuf altogether. Given that we now only queue
+ *two* packets ever, one wonders what the point is. As it is, you could
+ already deadlock the thing by setting the sk_sndbuf to a value lower
+ than the MTU of the device, and it'd just block for ever.)
+
+Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/atm/pppoatm.c |   95 +++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 85 insertions(+), 10 deletions(-)
+
+--- a/net/atm/pppoatm.c
++++ b/net/atm/pppoatm.c
+@@ -62,12 +62,25 @@ struct pppoatm_vcc {
+ 	void (*old_pop)(struct atm_vcc *, struct sk_buff *);
+ 					/* keep old push/pop for detaching */
+ 	enum pppoatm_encaps encaps;
++	atomic_t inflight;
++	unsigned long blocked;
+ 	int flags;			/* SC_COMP_PROT - compress protocol */
+ 	struct ppp_channel chan;	/* interface to generic ppp layer */
+ 	struct tasklet_struct wakeup_tasklet;
+ };
+ 
+ /*
++ * We want to allow two packets in the queue. The one that's currently in
++ * flight, and *one* queued up ready for the ATM device to send immediately
++ * from its TX done IRQ. We want to be able to use atomic_inc_not_zero(), so
++ * inflight == -2 represents an empty queue, -1 one packet, and zero means
++ * there are two packets in the queue.
++ */
++#define NONE_INFLIGHT -2
++
++#define BLOCKED 0
++
++/*
+  * Header used for LLC Encapsulated PPP (4 bytes) followed by the LCP protocol
+  * ID (0xC021) used in autodetection
+  */
+@@ -102,16 +115,30 @@ static void pppoatm_wakeup_sender(unsign
+ static void pppoatm_pop(struct atm_vcc *atmvcc, struct sk_buff *skb)
+ {
+ 	struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);
++
+ 	pvcc->old_pop(atmvcc, skb);
++	atomic_dec(&pvcc->inflight);
++
+ 	/*
+-	 * We don't really always want to do this since it's
+-	 * really inefficient - it would be much better if we could
+-	 * test if we had actually throttled the generic layer.
+-	 * Unfortunately then there would be a nasty SMP race where
+-	 * we could clear that flag just as we refuse another packet.
+-	 * For now we do the safe thing.
++	 * We always used to run the wakeup tasklet unconditionally here, for
++	 * fear of race conditions where we clear the BLOCKED flag just as we
++	 * refuse another packet in pppoatm_send(). This was quite inefficient.
++	 *
++	 * In fact it's OK. The PPP core will only ever call pppoatm_send()
++	 * while holding the channel->downl lock. And ppp_output_wakeup() as
++	 * called by the tasklet will *also* grab that lock. So even if another
++	 * CPU is in pppoatm_send() right now, the tasklet isn't going to race
++	 * with it. The wakeup *will* happen after the other CPU is safely out
++	 * of pppoatm_send() again.
++	 *
++	 * So if the CPU in pppoatm_send() has already set the BLOCKED bit and
++	 * it about to return, that's fine. We trigger a wakeup which will
++	 * happen later. And if the CPU in pppoatm_send() *hasn't* set the
++	 * BLOCKED bit yet, that's fine too because of the double check in
++	 * pppoatm_may_send() which is commented there.
+ 	 */
+-	tasklet_schedule(&pvcc->wakeup_tasklet);
++	if (test_and_clear_bit(BLOCKED, &pvcc->blocked))
++		tasklet_schedule(&pvcc->wakeup_tasklet);
+ }
+ 
+ /*
+@@ -184,6 +211,51 @@ error:
+ 	ppp_input_error(&pvcc->chan, 0);
+ }
+ 
++static inline int pppoatm_may_send(struct pppoatm_vcc *pvcc, int size)
++{
++	/*
++	 * It's not clear that we need to bother with using atm_may_send()
++	 * to check we don't exceed sk->sk_sndbuf. If userspace sets a
++	 * value of sk_sndbuf which is lower than the MTU, we're going to
++	 * block for ever. But the code always did that before we introduced
++	 * the packet count limit, so...
++	 */
++	if (atm_may_send(pvcc->atmvcc, size) &&
++	    atomic_inc_not_zero_hint(&pvcc->inflight, NONE_INFLIGHT))
++		return 1;
++
++	/*
++	 * We use test_and_set_bit() rather than set_bit() here because
++	 * we need to ensure there's a memory barrier after it. The bit
++	 * *must* be set before we do the atomic_inc() on pvcc->inflight.
++	 * There's no smp_mb__after_set_bit(), so it's this or abuse
++	 * smp_mb__after_clear_bit().
++	 */
++	test_and_set_bit(BLOCKED, &pvcc->blocked);
++
++	/*
++	 * We may have raced with pppoatm_pop(). If it ran for the
++	 * last packet in the queue, *just* before we set the BLOCKED
++	 * bit, then it might never run again and the channel could
++	 * remain permanently blocked. Cope with that race by checking
++	 * *again*. If it did run in that window, we'll have space on
++	 * the queue now and can return success. It's harmless to leave
++	 * the BLOCKED flag set, since it's only used as a trigger to
++	 * run the wakeup tasklet. Another wakeup will never hurt.
++	 * If pppoatm_pop() is running but hasn't got as far as making
++	 * space on the queue yet, then it hasn't checked the BLOCKED
++	 * flag yet either, so we're safe in that case too. It'll issue
++	 * an "immediate" wakeup... where "immediate" actually involves
++	 * taking the PPP channel's ->downl lock, which is held by the
++	 * code path that calls pppoatm_send(), and is thus going to
++	 * wait for us to finish.
++	 */
++	if (atm_may_send(pvcc->atmvcc, size) &&
++	    atomic_inc_not_zero(&pvcc->inflight))
++		return 1;
++
++	return 0;
++}
+ /*
+  * Called by the ppp_generic.c to send a packet - returns true if packet
+  * was accepted.  If we return false, then it's our job to call
+@@ -207,7 +279,7 @@ static int pppoatm_send(struct ppp_chann
+ 			struct sk_buff *n;
+ 			n = skb_realloc_headroom(skb, LLC_LEN);
+ 			if (n != NULL &&
+-			    !atm_may_send(pvcc->atmvcc, n->truesize)) {
++			    !pppoatm_may_send(pvcc, n->truesize)) {
+ 				kfree_skb(n);
+ 				goto nospace;
+ 			}
+@@ -215,12 +287,12 @@ static int pppoatm_send(struct ppp_chann
+ 			skb = n;
+ 			if (skb == NULL)
+ 				return DROP_PACKET;
+-		} else if (!atm_may_send(pvcc->atmvcc, skb->truesize))
++		} else if (!pppoatm_may_send(pvcc, skb->truesize))
+ 			goto nospace;
+ 		memcpy(skb_push(skb, LLC_LEN), pppllc, LLC_LEN);
+ 		break;
+ 	case e_vc:
+-		if (!atm_may_send(pvcc->atmvcc, skb->truesize))
++		if (!pppoatm_may_send(pvcc, skb->truesize))
+ 			goto nospace;
+ 		break;
+ 	case e_autodetect:
+@@ -285,6 +357,9 @@ static int pppoatm_assign_vcc(struct atm
+ 	if (pvcc == NULL)
+ 		return -ENOMEM;
+ 	pvcc->atmvcc = atmvcc;
++
++	/* Maximum is zero, so that we can use atomic_inc_not_zero() */
++	atomic_set(&pvcc->inflight, NONE_INFLIGHT);
+ 	pvcc->old_push = atmvcc->push;
+ 	pvcc->old_pop = atmvcc->pop;
+ 	pvcc->encaps = (enum pppoatm_encaps) be.encaps;
diff --git a/trunk/target/linux/generic/patches-3.3/131-atm-fixes.patch b/trunk/target/linux/generic/patches-3.3/131-atm-fixes.patch
new file mode 100644
index 00000000..690a1885
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/131-atm-fixes.patch
@@ -0,0 +1,900 @@
+commit d7d3d8f1ee4435e32bc6c93187798b7e2e3170a9
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Thu Nov 29 23:28:30 2012 +0000
+
+    solos-pci: remove list_vccs() debugging function
+    
+    No idea why we've gone so long dumping a list of VCCs with vci==0 on
+    every ->open() call...
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit c93967bfd3a3dffa759a3f28370167bf3cdbc3d0
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Thu Nov 29 23:27:20 2012 +0000
+
+    solos-pci: use GFP_KERNEL where possible, not GFP_ATOMIC
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit ad6999e17ae4f7b99f6d28f425ae970acb115347
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Thu Nov 29 23:15:30 2012 +0000
+
+    solos-pci: clean up pclose() function
+    
+     - Flush pending TX skbs from the queue rather than waiting for them all to
+       complete (suggested by Krzysztof Mazur <krzysiek@podlesie.net>).
+     - Clear ATM_VF_ADDR only when the PKT_PCLOSE packet has been submitted.
+     - Don't clear ATM_VF_READY at all — vcc_destroy_socket() does that for us.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit 2547e97f29d6d69d567947d5ef90b6b4fbcaf565
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Wed Nov 28 10:15:05 2012 +0000
+
+    pppoatm: optimise PPP channel wakeups after sock_owned_by_user()
+    
+    We don't need to schedule the wakeup tasklet on *every* unlock; only if we
+    actually blocked the channel in the first place.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-by: Krzysztof Mazur <krzysiek@podlesie.net>
+
+commit 990b0884a2e9668c08e9daa4d70a54d65329cb6f
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Wed Nov 28 09:08:04 2012 +0100
+
+    br2684: allow assign only on a connected socket
+    
+    The br2684 does not check if used vcc is in connected state,
+    causing potential Oops in pppoatm_send() when vcc->send() is called
+    on not fully connected socket.
+    
+    Now br2684 can be assigned only on connected sockets; otherwise
+    -EINVAL error is returned.
+    
+    Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit f49b6da01f0abebb17f6241473d53018d923f6b0
+Author: Nathan Williams <nathan@traverse.com.au>
+Date:   Tue Nov 27 17:34:09 2012 +1100
+
+    solos-pci: Fix leak of skb received for unknown vcc
+    
+    ... and ensure that the next skb is set up for RX in the DMA case.
+    
+    Signed-off-by: Nathan Williams <nathan@traverse.com.au>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit a61d37ff4a555886c4ebe31d2c6d893afb6f4d3c
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Wed Nov 28 00:46:45 2012 +0000
+
+    br2684: fix module_put() race
+    
+    The br2684 code used module_put() during unassignment from vcc with
+    hope that we have BKL. This assumption is no longer true.
+    
+    Now owner field in atmvcc is used to move this module_put()
+    to vcc_destroy_socket().
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-by: Krzysztof Mazur <krzysiek@podlesie.net>
+
+commit c52f40629884ddc62c7af445fd5d620fdb466fb2
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Wed Nov 28 00:05:52 2012 +0000
+
+    pppoatm: fix missing wakeup in pppoatm_send()
+    
+    Now that we can return zero from pppoatm_send() for reasons *other* than
+    the queue being full, that means we can't depend on a subsequent call to
+    pppoatm_pop() waking the queue, and we might leave it stalled
+    indefinitely.
+    
+    Use the ->release_cb() callback to wake the queue after the sock is
+    unlocked.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-by: Krzysztof Mazur <krzysiek@podlesie.net>
+
+commit 35826e7372fe39b7db7930eda0267c82d68d1a4c
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Tue Nov 27 23:28:36 2012 +0000
+
+    br2684: don't send frames on not-ready vcc
+    
+    Avoid submitting packets to a vcc which is being closed. Things go badly
+    wrong when the ->pop method gets later called after everything's been
+    torn down.
+    
+    Use the ATM socket lock for synchronisation with vcc_destroy_socket(),
+    which clears the ATM_VF_READY bit under the same lock. Otherwise, we
+    could end up submitting a packet to the device driver even after its
+    ->ops->close method has been called. And it could call the vcc's ->pop
+    method after the protocol has been shut down. Which leads to a panic.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-by: Krzysztof Mazur <krzysiek@podlesie.net>
+
+commit 7f940dde65de4a707f3dd723bb6ce9de90ca1eab
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Wed Nov 28 00:03:11 2012 +0000
+
+    atm: add release_cb() callback to vcc
+    
+    The immediate use case for this is that it will allow us to ensure that a
+    pppoatm queue is woken after it has to drop a packet due to the sock being
+    locked.
+    
+    Note that 'release_cb' is called when the socket is *unlocked*. This is
+    not to be confused with vcc_release() — which probably ought to be called
+    vcc_close().
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-by: Krzysztof Mazur <krzysiek@podlesie.net>
+
+commit def1b2f9083f84d0a77730e537c76429914d17c1
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Tue Nov 27 23:49:24 2012 +0000
+
+    solos-pci: wait for pending TX to complete when releasing vcc
+    
+    We should no longer be calling the old pop routine for the vcc, after
+    vcc_release() has completed. Make sure we wait for any pending TX skbs
+    to complete, by waiting for our own PKT_PCLOSE control skb to be sent.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit 397ff16dce53888ec693b3718640be2560204751
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Tue Nov 6 23:17:02 2012 +0100
+
+    pppoatm: do not inline pppoatm_may_send()
+    
+    The pppoatm_may_send() is quite heavy and it's called three times
+    in pppoatm_send() and inlining costs more than 200 bytes of code
+    (more than 10% of total pppoatm driver code size).
+    
+    add/remove: 1/0 grow/shrink: 0/1 up/down: 132/-367 (-235)
+    function                                     old     new   delta
+    pppoatm_may_send                               -     132    +132
+    pppoatm_send                                 900     533    -367
+    
+    Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit 071d93931a75dc1f82f0baa9959613af81c5a032
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Sat Nov 10 23:33:19 2012 +0100
+
+    pppoatm: drop frames to not-ready vcc
+    
+    The vcc_destroy_socket() closes vcc before the protocol is detached
+    from vcc by calling vcc->push() with NULL skb. This leaves some time
+    window, where the protocol may call vcc->send() on closed vcc
+    and crash.
+    
+    Now pppoatm_send(), like vcc_sendmsg(), checks for vcc flags that
+    indicate that vcc is not ready. If the vcc is not ready we just
+    drop frame. Queueing frames is much more complicated because we
+    don't have callbacks that inform us about vcc flags changes.
+    
+    Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit 3ac108006fd7f20cb8fc8ea2287f1497bcda00a1
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Tue Nov 6 23:17:00 2012 +0100
+
+    pppoatm: take ATM socket lock in pppoatm_send()
+    
+    The pppoatm_send() does not take any lock that will prevent concurrent
+    vcc_sendmsg(). This causes two problems:
+    
+    	- there is no locking between checking the send queue size
+    	  with atm_may_send() and incrementing sk_wmem_alloc,
+    	  and the real queue size can be a little higher than sk_sndbuf
+    
+    	- the vcc->sendmsg() can be called concurrently. I'm not sure
+    	  if it's allowed. Some drivers (eni, nicstar, ...) seem
+    	  to assume it will never happen.
+    
+    Now pppoatm_send() takes ATM socket lock, the same that is used
+    in vcc_sendmsg() and other ATM socket functions. The pppoatm_send()
+    is called with BH disabled, so bh_lock_sock() is used instead
+    of lock_sock().
+    
+    Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Cc: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit e41faed9cde1acce657f75a0b19a1787e9850d3f
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Tue Nov 6 23:16:59 2012 +0100
+
+    pppoatm: fix module_put() race
+    
+    The pppoatm used module_put() during unassignment from vcc with
+    hope that we have BKL. This assumption is no longer true.
+    
+    Now owner field in atmvcc is used to move this module_put()
+    to vcc_destroy_socket().
+    
+    Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit 3b1a914595f3f9beb9e38ff3ddc7bdafa092ba22
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Tue Nov 6 23:16:58 2012 +0100
+
+    pppoatm: allow assign only on a connected socket
+    
+    The pppoatm does not check if used vcc is in connected state,
+    causing an Oops in pppoatm_send() when vcc->send() is called
+    on not fully connected socket.
+    
+    Now pppoatm can be assigned only on connected sockets; otherwise
+    -EINVAL error is returned.
+    
+    Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Cc: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+commit ec809bd817dfa1905283468e4c813684ed4efe78
+Author: Krzysztof Mazur <krzysiek@podlesie.net>
+Date:   Tue Nov 6 23:16:57 2012 +0100
+
+    atm: add owner of push() callback to atmvcc
+    
+    The atm is using atmvcc->push(vcc, NULL) callback to notify protocol
+    that vcc will be closed and protocol must detach from it. This callback
+    is usually used by protocol to decrement module usage count by module_put(),
+    but it leaves small window then module is still used after module_put().
+    
+    Now the owner of push() callback is kept in atmvcc and
+    module_put(atmvcc->owner) is called after the protocol is detached from vcc.
+    
+    Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
+
+commit ae088d663beebb3cad0e7abaac67ee61a7c578d5
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Sun Nov 25 12:06:52 2012 +0000
+
+    atm: br2684: Fix excessive queue bloat
+    
+    There's really no excuse for an additional wmem_default of buffering
+    between the netdev queue and the ATM device. Two packets (one in-flight,
+    and one ready to send) ought to be fine. It's not as if it should take
+    long to get another from the netdev queue when we need it.
+    
+    If necessary we can make the queue space configurable later, but I don't
+    think it's likely to be necessary.
+    
+    cf. commit 9d02daf754238adac48fa075ee79e7edd3d79ed3 (pppoatm: Fix
+    excessive queue bloat) which did something very similar for PPPoATM.
+    
+    Note that there is a tremendously unlikely race condition which may
+    result in qspace temporarily going negative. If a CPU running the
+    br2684_pop() function goes off into the weeds for a long period of time
+    after incrementing qspace to 1, but before calling netdev_wake_queue()...
+    and another CPU ends up calling br2684_start_xmit() and *stopping* the
+    queue again before the first CPU comes back, the netdev queue could
+    end up being woken when qspace has already reached zero.
+    
+    An alternative approach to coping with this race would be to check in
+    br2684_start_xmit() for qspace==0 and return NETDEV_TX_BUSY, but just
+    using '> 0' and '< 1' for comparison instead of '== 0' and '!= 0' is
+    simpler. It just warranted a mention of *why* we do it that way...
+    
+    Move the call to atmvcc->send() to happen *after* the accounting and
+    potentially stopping the netdev queue, in br2684_xmit_vcc(). This matters
+    if the ->send() call suffers an immediate failure, because it'll call
+    br2684_pop() with the offending skb before returning. We want that to
+    happen *after* we've done the initial accounting for the packet in
+    question. Also make it return an appropriate success/failure indication
+    while we're at it.
+    
+    Tested by running 'ping -l 1000 bottomless.aaisp.net.uk' from within my
+    network, with only a single PPPoE-over-BR2684 link running. And after
+    setting txqueuelen on the nas0 interface to something low (5, in fact).
+    Before the patch, we'd see about 15 packets being queued and a resulting
+    latency of ~56ms being reached. After the patch, we see only about 8,
+    which is fairly much what we expect. And a max latency of ~36ms. On this
+    libreCMC box, wmem_default is 163840.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Reviewed-by: Krzysztof Mazur <krzysiek@podlesie.net>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+--- a/drivers/atm/solos-pci.c
++++ b/drivers/atm/solos-pci.c
+@@ -92,6 +92,7 @@ struct pkt_hdr {
+ };
+ 
+ struct solos_skb_cb {
++	struct completion c;
+ 	struct atm_vcc *vcc;
+ 	uint32_t dma_addr;
+ };
+@@ -164,7 +165,6 @@ static void fpga_queue(struct solos_card
+ static uint32_t fpga_tx(struct solos_card *);
+ static irqreturn_t solos_irq(int irq, void *dev_id);
+ static struct atm_vcc* find_vcc(struct atm_dev *dev, short vpi, int vci);
+-static int list_vccs(int vci);
+ static int atm_init(struct solos_card *, struct device *);
+ static void atm_remove(struct solos_card *);
+ static int send_command(struct solos_card *card, int dev, const char *buf, size_t size);
+@@ -710,7 +710,8 @@ void solos_bh(unsigned long card_arg)
+ 						dev_warn(&card->dev->dev, "Received packet for unknown VPI.VCI %d.%d on port %d\n",
+ 							 le16_to_cpu(header->vpi), le16_to_cpu(header->vci),
+ 							 port);
+-					continue;
++					dev_kfree_skb_any(skb);
++					break;
+ 				}
+ 				atm_charge(vcc, skb->truesize);
+ 				vcc->push(vcc, skb);
+@@ -790,44 +791,6 @@ static struct atm_vcc *find_vcc(struct a
+ 	return vcc;
+ }
+ 
+-static int list_vccs(int vci)
+-{
+-	struct hlist_head *head;
+-	struct atm_vcc *vcc;
+-	struct hlist_node *node;
+-	struct sock *s;
+-	int num_found = 0;
+-	int i;
+-
+-	read_lock(&vcc_sklist_lock);
+-	if (vci != 0){
+-		head = &vcc_hash[vci & (VCC_HTABLE_SIZE -1)];
+-		sk_for_each(s, node, head) {
+-			num_found ++;
+-			vcc = atm_sk(s);
+-			printk(KERN_DEBUG "Device: %d Vpi: %d Vci: %d\n",
+-			       vcc->dev->number,
+-			       vcc->vpi,
+-			       vcc->vci);
+-		}
+-	} else {
+-		for(i = 0; i < VCC_HTABLE_SIZE; i++){
+-			head = &vcc_hash[i];
+-			sk_for_each(s, node, head) {
+-				num_found ++;
+-				vcc = atm_sk(s);
+-				printk(KERN_DEBUG "Device: %d Vpi: %d Vci: %d\n",
+-				       vcc->dev->number,
+-				       vcc->vpi,
+-				       vcc->vci);
+-			}
+-		}
+-	}
+-	read_unlock(&vcc_sklist_lock);
+-	return num_found;
+-}
+-
+-
+ static int popen(struct atm_vcc *vcc)
+ {
+ 	struct solos_card *card = vcc->dev->dev_data;
+@@ -840,7 +803,7 @@ static int popen(struct atm_vcc *vcc)
+ 		return -EINVAL;
+ 	}
+ 
+-	skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
++	skb = alloc_skb(sizeof(*header), GFP_KERNEL);
+ 	if (!skb) {
+ 		if (net_ratelimit())
+ 			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
+@@ -857,8 +820,6 @@ static int popen(struct atm_vcc *vcc)
+ 
+ 	set_bit(ATM_VF_ADDR, &vcc->flags);
+ 	set_bit(ATM_VF_READY, &vcc->flags);
+-	list_vccs(0);
+-
+ 
+ 	return 0;
+ }
+@@ -866,10 +827,21 @@ static int popen(struct atm_vcc *vcc)
+ static void pclose(struct atm_vcc *vcc)
+ {
+ 	struct solos_card *card = vcc->dev->dev_data;
+-	struct sk_buff *skb;
++	unsigned char port = SOLOS_CHAN(vcc->dev);
++	struct sk_buff *skb, *tmpskb;
+ 	struct pkt_hdr *header;
+ 
+-	skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
++	/* Remove any yet-to-be-transmitted packets from the pending queue */
++	spin_lock(&card->tx_queue_lock);
++	skb_queue_walk_safe(&card->tx_queue[port], skb, tmpskb) {
++		if (SKB_CB(skb)->vcc == vcc) {
++			skb_unlink(skb, &card->tx_queue[port]);
++			solos_pop(vcc, skb);
++		}
++	}
++	spin_unlock(&card->tx_queue_lock);
++
++	skb = alloc_skb(sizeof(*header), GFP_KERNEL);
+ 	if (!skb) {
+ 		dev_warn(&card->dev->dev, "Failed to allocate sk_buff in pclose()\n");
+ 		return;
+@@ -881,15 +853,21 @@ static void pclose(struct atm_vcc *vcc)
+ 	header->vci = cpu_to_le16(vcc->vci);
+ 	header->type = cpu_to_le16(PKT_PCLOSE);
+ 
+-	fpga_queue(card, SOLOS_CHAN(vcc->dev), skb, NULL);
++	init_completion(&SKB_CB(skb)->c);
+ 
+-	clear_bit(ATM_VF_ADDR, &vcc->flags);
+-	clear_bit(ATM_VF_READY, &vcc->flags);
++	fpga_queue(card, port, skb, NULL);
++
++	if (!wait_for_completion_timeout(&SKB_CB(skb)->c, 5 * HZ))
++		dev_warn(&card->dev->dev, "Timeout waiting for VCC close on port %d\n",
++			 port);
+ 
+ 	/* Hold up vcc_destroy_socket() (our caller) until solos_bh() in the
+ 	   tasklet has finished processing any incoming packets (and, more to
+ 	   the point, using the vcc pointer). */
+ 	tasklet_unlock_wait(&card->tlet);
++
++	clear_bit(ATM_VF_ADDR, &vcc->flags);
++
+ 	return;
+ }
+ 
+@@ -1010,9 +988,12 @@ static uint32_t fpga_tx(struct solos_car
+ 			if (vcc) {
+ 				atomic_inc(&vcc->stats->tx);
+ 				solos_pop(vcc, oldskb);
+-			} else
++			} else {
++				struct pkt_hdr *header = (void *)oldskb->data;
++				if (le16_to_cpu(header->type) == PKT_PCLOSE)
++					complete(&SKB_CB(oldskb)->c);
+ 				dev_kfree_skb_irq(oldskb);
+-
++			}
+ 		}
+ 	}
+ 	/* For non-DMA TX, write the 'TX start' bit for all four ports simultaneously */
+@@ -1246,7 +1227,7 @@ static int atm_init(struct solos_card *c
+ 		card->atmdev[i]->phy_data = (void *)(unsigned long)i;
+ 		atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND);
+ 
+-		skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
++		skb = alloc_skb(sizeof(*header), GFP_KERNEL);
+ 		if (!skb) {
+ 			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in atm_init()\n");
+ 			continue;
+@@ -1343,6 +1324,8 @@ static struct pci_driver fpga_driver = {
+ 
+ static int __init solos_pci_init(void)
+ {
++	BUILD_BUG_ON(sizeof(struct solos_skb_cb) > sizeof(((struct sk_buff *)0)->cb));
++
+ 	printk(KERN_INFO "Solos PCI Driver Version %s\n", VERSION);
+ 	return pci_register_driver(&fpga_driver);
+ }
+--- a/include/linux/atmdev.h
++++ b/include/linux/atmdev.h
+@@ -307,6 +307,7 @@ struct atm_vcc {
+ 	struct atm_dev	*dev;		/* device back pointer */
+ 	struct atm_qos	qos;		/* QOS */
+ 	struct atm_sap	sap;		/* SAP */
++	void (*release_cb)(struct atm_vcc *vcc); /* release_sock callback */
+ 	void (*push)(struct atm_vcc *vcc,struct sk_buff *skb);
+ 	void (*pop)(struct atm_vcc *vcc,struct sk_buff *skb); /* optional */
+ 	int (*push_oam)(struct atm_vcc *vcc,void *cell);
+@@ -314,6 +315,7 @@ struct atm_vcc {
+ 	void		*dev_data;	/* per-device data */
+ 	void		*proto_data;	/* per-protocol data */
+ 	struct k_atm_aal_stats *stats;	/* pointer to AAL stats group */
++	struct module *owner;		/* owner of ->push function */
+ 	/* SVC part --- may move later ------------------------------------- */
+ 	short		itf;		/* interface number */
+ 	struct sockaddr_atmsvc local;
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
+@@ -68,12 +68,15 @@ struct br2684_vcc {
+ 	/* keep old push, pop functions for chaining */
+ 	void (*old_push)(struct atm_vcc *vcc, struct sk_buff *skb);
+ 	void (*old_pop)(struct atm_vcc *vcc, struct sk_buff *skb);
++	void (*old_release_cb)(struct atm_vcc *vcc);
++	struct module *old_owner;
+ 	enum br2684_encaps encaps;
+ 	struct list_head brvccs;
+ #ifdef CONFIG_ATM_BR2684_IPFILTER
+ 	struct br2684_filter filter;
+ #endif /* CONFIG_ATM_BR2684_IPFILTER */
+ 	unsigned copies_needed, copies_failed;
++	atomic_t qspace;
+ };
+ 
+ struct br2684_dev {
+@@ -181,18 +184,15 @@ static struct notifier_block atm_dev_not
+ static void br2684_pop(struct atm_vcc *vcc, struct sk_buff *skb)
+ {
+ 	struct br2684_vcc *brvcc = BR2684_VCC(vcc);
+-	struct net_device *net_dev = skb->dev;
+ 
+-	pr_debug("(vcc %p ; net_dev %p )\n", vcc, net_dev);
++	pr_debug("(vcc %p ; net_dev %p )\n", vcc, brvcc->device);
+ 	brvcc->old_pop(vcc, skb);
+ 
+-	if (!net_dev)
+-		return;
+-
+-	if (atm_may_send(vcc, 0))
+-		netif_wake_queue(net_dev);
+-
++	/* If the queue space just went up from zero, wake */
++	if (atomic_inc_return(&brvcc->qspace) == 1)
++		netif_wake_queue(brvcc->device);
+ }
++
+ /*
+  * Send a packet out a particular vcc.  Not to useful right now, but paves
+  * the way for multiple vcc's per itf.  Returns true if we can send,
+@@ -256,16 +256,30 @@ static int br2684_xmit_vcc(struct sk_buf
+ 	ATM_SKB(skb)->atm_options = atmvcc->atm_options;
+ 	dev->stats.tx_packets++;
+ 	dev->stats.tx_bytes += skb->len;
+-	atmvcc->send(atmvcc, skb);
+ 
+-	if (!atm_may_send(atmvcc, 0)) {
++	if (atomic_dec_return(&brvcc->qspace) < 1) {
++		/* No more please! */
+ 		netif_stop_queue(brvcc->device);
+-		/*check for race with br2684_pop*/
+-		if (atm_may_send(atmvcc, 0))
+-			netif_start_queue(brvcc->device);
++		/* We might have raced with br2684_pop() */
++		if (unlikely(atomic_read(&brvcc->qspace) > 0))
++			netif_wake_queue(brvcc->device);
+ 	}
+ 
+-	return 1;
++	/* If this fails immediately, the skb will be freed and br2684_pop()
++	   will wake the queue if appropriate. Just return an error so that
++	   the stats are updated correctly */
++	return !atmvcc->send(atmvcc, skb);
++}
++
++static void br2684_release_cb(struct atm_vcc *atmvcc)
++{
++	struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
++
++	if (atomic_read(&brvcc->qspace) > 0)
++		netif_wake_queue(brvcc->device);
++
++	if (brvcc->old_release_cb)
++		brvcc->old_release_cb(atmvcc);
+ }
+ 
+ static inline struct br2684_vcc *pick_outgoing_vcc(const struct sk_buff *skb,
+@@ -279,6 +293,8 @@ static netdev_tx_t br2684_start_xmit(str
+ {
+ 	struct br2684_dev *brdev = BRPRIV(dev);
+ 	struct br2684_vcc *brvcc;
++	struct atm_vcc *atmvcc;
++	netdev_tx_t ret = NETDEV_TX_OK;
+ 
+ 	pr_debug("skb_dst(skb)=%p\n", skb_dst(skb));
+ 	read_lock(&devs_lock);
+@@ -289,9 +305,26 @@ static netdev_tx_t br2684_start_xmit(str
+ 		dev->stats.tx_carrier_errors++;
+ 		/* netif_stop_queue(dev); */
+ 		dev_kfree_skb(skb);
+-		read_unlock(&devs_lock);
+-		return NETDEV_TX_OK;
++		goto out_devs;
+ 	}
++	atmvcc = brvcc->atmvcc;
++
++	bh_lock_sock(sk_atm(atmvcc));
++
++	if (test_bit(ATM_VF_RELEASED, &atmvcc->flags) ||
++	    test_bit(ATM_VF_CLOSE, &atmvcc->flags) ||
++	    !test_bit(ATM_VF_READY, &atmvcc->flags)) {
++		dev->stats.tx_dropped++;
++		dev_kfree_skb(skb);
++		goto out;
++	}
++
++	if (sock_owned_by_user(sk_atm(atmvcc))) {
++		netif_stop_queue(brvcc->device);
++		ret = NETDEV_TX_BUSY;
++		goto out;
++	}
++
+ 	if (!br2684_xmit_vcc(skb, dev, brvcc)) {
+ 		/*
+ 		 * We should probably use netif_*_queue() here, but that
+@@ -303,8 +336,11 @@ static netdev_tx_t br2684_start_xmit(str
+ 		dev->stats.tx_errors++;
+ 		dev->stats.tx_fifo_errors++;
+ 	}
++ out:
++	bh_unlock_sock(sk_atm(atmvcc));
++ out_devs:
+ 	read_unlock(&devs_lock);
+-	return NETDEV_TX_OK;
++	return ret;
+ }
+ 
+ /*
+@@ -377,9 +413,10 @@ static void br2684_close_vcc(struct br26
+ 	list_del(&brvcc->brvccs);
+ 	write_unlock_irq(&devs_lock);
+ 	brvcc->atmvcc->user_back = NULL;	/* what about vcc->recvq ??? */
++	brvcc->atmvcc->release_cb = brvcc->old_release_cb;
+ 	brvcc->old_push(brvcc->atmvcc, NULL);	/* pass on the bad news */
++	module_put(brvcc->old_owner);
+ 	kfree(brvcc);
+-	module_put(THIS_MODULE);
+ }
+ 
+ /* when AAL5 PDU comes in: */
+@@ -504,6 +541,13 @@ static int br2684_regvcc(struct atm_vcc
+ 	brvcc = kzalloc(sizeof(struct br2684_vcc), GFP_KERNEL);
+ 	if (!brvcc)
+ 		return -ENOMEM;
++	/*
++	 * Allow two packets in the ATM queue. One actually being sent, and one
++	 * for the ATM 'TX done' handler to send. It shouldn't take long to get
++	 * the next one from the netdev queue, when we need it. More than that
++	 * would be bufferbloat.
++	 */
++	atomic_set(&brvcc->qspace, 2);
+ 	write_lock_irq(&devs_lock);
+ 	net_dev = br2684_find_dev(&be.ifspec);
+ 	if (net_dev == NULL) {
+@@ -546,9 +590,13 @@ static int br2684_regvcc(struct atm_vcc
+ 	brvcc->encaps = (enum br2684_encaps)be.encaps;
+ 	brvcc->old_push = atmvcc->push;
+ 	brvcc->old_pop = atmvcc->pop;
++	brvcc->old_release_cb = atmvcc->release_cb;
++	brvcc->old_owner = atmvcc->owner;
+ 	barrier();
+ 	atmvcc->push = br2684_push;
+ 	atmvcc->pop = br2684_pop;
++	atmvcc->release_cb = br2684_release_cb;
++	atmvcc->owner = THIS_MODULE;
+ 
+ 	/* initialize netdev carrier state */
+ 	if (atmvcc->dev->signal == ATM_PHY_SIG_LOST)
+@@ -687,10 +735,13 @@ static int br2684_ioctl(struct socket *s
+ 			return -ENOIOCTLCMD;
+ 		if (!capable(CAP_NET_ADMIN))
+ 			return -EPERM;
+-		if (cmd == ATM_SETBACKEND)
++		if (cmd == ATM_SETBACKEND) {
++			if (sock->state != SS_CONNECTED)
++				return -EINVAL;
+ 			return br2684_regvcc(atmvcc, argp);
+-		else
++		} else {
+ 			return br2684_create(argp);
++		}
+ #ifdef CONFIG_ATM_BR2684_IPFILTER
+ 	case BR2684_SETFILT:
+ 		if (atmvcc->push != br2684_push)
+--- a/net/atm/common.c
++++ b/net/atm/common.c
+@@ -126,10 +126,19 @@ static void vcc_write_space(struct sock
+ 	rcu_read_unlock();
+ }
+ 
++static void vcc_release_cb(struct sock *sk)
++{
++	struct atm_vcc *vcc = atm_sk(sk);
++
++	if (vcc->release_cb)
++		vcc->release_cb(vcc);
++}
++
+ static struct proto vcc_proto = {
+ 	.name	  = "VCC",
+ 	.owner	  = THIS_MODULE,
+ 	.obj_size = sizeof(struct atm_vcc),
++	.release_cb = vcc_release_cb,
+ };
+ 
+ int vcc_create(struct net *net, struct socket *sock, int protocol, int family)
+@@ -156,7 +165,9 @@ int vcc_create(struct net *net, struct s
+ 	atomic_set(&sk->sk_rmem_alloc, 0);
+ 	vcc->push = NULL;
+ 	vcc->pop = NULL;
++	vcc->owner = NULL;
+ 	vcc->push_oam = NULL;
++	vcc->release_cb = NULL;
+ 	vcc->vpi = vcc->vci = 0; /* no VCI/VPI yet */
+ 	vcc->atm_options = vcc->aal_options = 0;
+ 	sk->sk_destruct = vcc_sock_destruct;
+@@ -175,6 +186,7 @@ static void vcc_destroy_socket(struct so
+ 			vcc->dev->ops->close(vcc);
+ 		if (vcc->push)
+ 			vcc->push(vcc, NULL); /* atmarpd has no push */
++		module_put(vcc->owner);
+ 
+ 		while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+ 			atm_return(vcc, skb->truesize);
+--- a/net/atm/pppoatm.c
++++ b/net/atm/pppoatm.c
+@@ -60,6 +60,8 @@ struct pppoatm_vcc {
+ 	struct atm_vcc	*atmvcc;	/* VCC descriptor */
+ 	void (*old_push)(struct atm_vcc *, struct sk_buff *);
+ 	void (*old_pop)(struct atm_vcc *, struct sk_buff *);
++	void (*old_release_cb)(struct atm_vcc *);
++	struct module *old_owner;
+ 					/* keep old push/pop for detaching */
+ 	enum pppoatm_encaps encaps;
+ 	atomic_t inflight;
+@@ -107,6 +109,24 @@ static void pppoatm_wakeup_sender(unsign
+ 	ppp_output_wakeup((struct ppp_channel *) arg);
+ }
+ 
++static void pppoatm_release_cb(struct atm_vcc *atmvcc)
++{
++	struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);
++
++	/*
++	 * As in pppoatm_pop(), it's safe to clear the BLOCKED bit here because
++	 * the wakeup *can't* race with pppoatm_send(). They both hold the PPP
++	 * channel's ->downl lock. And the potential race with *setting* it,
++	 * which leads to the double-check dance in pppoatm_may_send(), doesn't
++	 * exist here. In the sock_owned_by_user() case in pppoatm_send(), we
++	 * set the BLOCKED bit while the socket is still locked. We know that
++	 * ->release_cb() can't be called until that's done.
++	 */
++	if (test_and_clear_bit(BLOCKED, &pvcc->blocked))
++		tasklet_schedule(&pvcc->wakeup_tasklet);
++	if (pvcc->old_release_cb)
++		pvcc->old_release_cb(atmvcc);
++}
+ /*
+  * This gets called every time the ATM card has finished sending our
+  * skb.  The ->old_pop will take care up normal atm flow control,
+@@ -151,12 +171,11 @@ static void pppoatm_unassign_vcc(struct
+ 	pvcc = atmvcc_to_pvcc(atmvcc);
+ 	atmvcc->push = pvcc->old_push;
+ 	atmvcc->pop = pvcc->old_pop;
++	atmvcc->release_cb = pvcc->old_release_cb;
+ 	tasklet_kill(&pvcc->wakeup_tasklet);
+ 	ppp_unregister_channel(&pvcc->chan);
+ 	atmvcc->user_back = NULL;
+ 	kfree(pvcc);
+-	/* Gee, I hope we have the big kernel lock here... */
+-	module_put(THIS_MODULE);
+ }
+ 
+ /* Called when an AAL5 PDU comes in */
+@@ -165,9 +184,13 @@ static void pppoatm_push(struct atm_vcc
+ 	struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);
+ 	pr_debug("\n");
+ 	if (skb == NULL) {			/* VCC was closed */
++		struct module *module;
++
+ 		pr_debug("removing ATMPPP VCC %p\n", pvcc);
++		module = pvcc->old_owner;
+ 		pppoatm_unassign_vcc(atmvcc);
+ 		atmvcc->push(atmvcc, NULL);	/* Pass along bad news */
++		module_put(module);
+ 		return;
+ 	}
+ 	atm_return(atmvcc, skb->truesize);
+@@ -211,7 +234,7 @@ error:
+ 	ppp_input_error(&pvcc->chan, 0);
+ }
+ 
+-static inline int pppoatm_may_send(struct pppoatm_vcc *pvcc, int size)
++static int pppoatm_may_send(struct pppoatm_vcc *pvcc, int size)
+ {
+ 	/*
+ 	 * It's not clear that we need to bother with using atm_may_send()
+@@ -269,10 +292,33 @@ static inline int pppoatm_may_send(struc
+ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
+ {
+ 	struct pppoatm_vcc *pvcc = chan_to_pvcc(chan);
++	struct atm_vcc *vcc;
++	int ret;
++
+ 	ATM_SKB(skb)->vcc = pvcc->atmvcc;
+ 	pr_debug("(skb=0x%p, vcc=0x%p)\n", skb, pvcc->atmvcc);
+ 	if (skb->data[0] == '\0' && (pvcc->flags & SC_COMP_PROT))
+ 		(void) skb_pull(skb, 1);
++
++	vcc = ATM_SKB(skb)->vcc;
++	bh_lock_sock(sk_atm(vcc));
++	if (sock_owned_by_user(sk_atm(vcc))) {
++		/*
++		 * Needs to happen (and be flushed, hence test_and_) before we unlock
++		 * the socket. It needs to be seen by the time our ->release_cb gets
++		 * called.
++		 */
++		test_and_set_bit(BLOCKED, &pvcc->blocked);
++		goto nospace;
++	}
++	if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
++	    test_bit(ATM_VF_CLOSE, &vcc->flags) ||
++	    !test_bit(ATM_VF_READY, &vcc->flags)) {
++		bh_unlock_sock(sk_atm(vcc));
++		kfree_skb(skb);
++		return DROP_PACKET;
++	}
++
+ 	switch (pvcc->encaps) {		/* LLC encapsulation needed */
+ 	case e_llc:
+ 		if (skb_headroom(skb) < LLC_LEN) {
+@@ -285,8 +331,10 @@ static int pppoatm_send(struct ppp_chann
+ 			}
+ 			kfree_skb(skb);
+ 			skb = n;
+-			if (skb == NULL)
++			if (skb == NULL) {
++				bh_unlock_sock(sk_atm(vcc));
+ 				return DROP_PACKET;
++			}
+ 		} else if (!pppoatm_may_send(pvcc, skb->truesize))
+ 			goto nospace;
+ 		memcpy(skb_push(skb, LLC_LEN), pppllc, LLC_LEN);
+@@ -296,6 +344,7 @@ static int pppoatm_send(struct ppp_chann
+ 			goto nospace;
+ 		break;
+ 	case e_autodetect:
++		bh_unlock_sock(sk_atm(vcc));
+ 		pr_debug("Trying to send without setting encaps!\n");
+ 		kfree_skb(skb);
+ 		return 1;
+@@ -305,9 +354,12 @@ static int pppoatm_send(struct ppp_chann
+ 	ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options;
+ 	pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n",
+ 		 skb, ATM_SKB(skb)->vcc, ATM_SKB(skb)->vcc->dev);
+-	return ATM_SKB(skb)->vcc->send(ATM_SKB(skb)->vcc, skb)
++	ret = ATM_SKB(skb)->vcc->send(ATM_SKB(skb)->vcc, skb)
+ 	    ? DROP_PACKET : 1;
++	bh_unlock_sock(sk_atm(vcc));
++	return ret;
+ nospace:
++	bh_unlock_sock(sk_atm(vcc));
+ 	/*
+ 	 * We don't have space to send this SKB now, but we might have
+ 	 * already applied SC_COMP_PROT compression, so may need to undo
+@@ -362,6 +414,8 @@ static int pppoatm_assign_vcc(struct atm
+ 	atomic_set(&pvcc->inflight, NONE_INFLIGHT);
+ 	pvcc->old_push = atmvcc->push;
+ 	pvcc->old_pop = atmvcc->pop;
++	pvcc->old_owner = atmvcc->owner;
++	pvcc->old_release_cb = atmvcc->release_cb;
+ 	pvcc->encaps = (enum pppoatm_encaps) be.encaps;
+ 	pvcc->chan.private = pvcc;
+ 	pvcc->chan.ops = &pppoatm_ops;
+@@ -377,7 +431,9 @@ static int pppoatm_assign_vcc(struct atm
+ 	atmvcc->user_back = pvcc;
+ 	atmvcc->push = pppoatm_push;
+ 	atmvcc->pop = pppoatm_pop;
++	atmvcc->release_cb = pppoatm_release_cb;
+ 	__module_get(THIS_MODULE);
++	atmvcc->owner = THIS_MODULE;
+ 
+ 	/* re-process everything received between connection setup and
+ 	   backend setup */
+@@ -406,6 +462,8 @@ static int pppoatm_ioctl(struct socket *
+ 			return -ENOIOCTLCMD;
+ 		if (!capable(CAP_NET_ADMIN))
+ 			return -EPERM;
++		if (sock->state != SS_CONNECTED)
++			return -EINVAL;
+ 		return pppoatm_assign_vcc(atmvcc, argp);
+ 		}
+ 	case PPPIOCGCHAN:
diff --git a/trunk/target/linux/generic/patches-3.3/132-solos-dma.patch b/trunk/target/linux/generic/patches-3.3/132-solos-dma.patch
new file mode 100644
index 00000000..beba8912
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/132-solos-dma.patch
@@ -0,0 +1,442 @@
+commit b4bd8ad9bb311e8536f726f7a633620ccd358cde
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Thu May 24 04:58:27 2012 +0000
+
+    solos-pci: Fix DMA support
+    
+    DMA support has finally made its way to the top of the TODO list, having
+    realised that a Geode using MMIO can't keep up with two ADSL2+ lines
+    each running at 21Mb/s.
+    
+    This patch fixes a couple of bugs in the DMA support in the driver, so
+    once the corresponding FPGA update is complete and tested everything
+    should work properly.
+    
+    We weren't storing the currently-transmitting skb, so we were never
+    unmapping it and never freeing/popping it when the TX was done.
+    And the addition of pci_set_master() is fairly self-explanatory.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Cc: stable@kernel.org
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 152a2a8b5e1d4cbe91a7c66f1028db15164a3766
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Wed Dec 19 11:01:21 2012 +0000
+
+    solos-pci: ensure all TX packets are aligned to 4 bytes
+    
+    The FPGA can't handled unaligned DMA (yet). So copy into an aligned buffer,
+    if skb->data isn't suitably aligned.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 13af816469db3449c072afbae6c4c1bd9ccecccb
+Author: Nathan Williams <nathan@traverse.com.au>
+Date:   Wed Dec 19 11:01:20 2012 +0000
+
+    solos-pci: add firmware upgrade support for new models
+    
+    Signed-off-by: Nathan Williams <nathan@traverse.com.au>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit 7fbdadb5e951e4f0c0fc991ff5f50295568786e6
+Author: Nathan Williams <nathan@traverse.com.au>
+Date:   Wed Dec 19 11:01:19 2012 +0000
+
+    solos-pci: remove superfluous debug output
+    
+    Signed-off-by: Nathan Williams <nathan@traverse.com.au>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit f9baad02e7411d9f38d5ebe1a1cdcde4ceec100d
+Author: Nathan Williams <nathan@traverse.com.au>
+Date:   Wed Dec 19 11:01:18 2012 +0000
+
+    solos-pci: add GPIO support for newer versions on Geos board
+    
+    dwmw2: Tidy up a little, simpler matching on which GPIO is being accessed,
+           only register on newer boards, register under PCI device instead of
+           duplicating them under each ATM device.
+    
+    Signed-off-by: Nathan Williams <nathan@traverse.com.au>
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+commit cae49ede00ec3d0cda290b03fee55b72b49efc11
+Author: David Woodhouse <dwmw2@infradead.org>
+Date:   Tue Dec 11 14:57:14 2012 +0000
+
+    solos-pci: fix double-free of TX skb in DMA mode
+    
+    We weren't clearing card->tx_skb[port] when processing the TX done interrupt.
+    If there wasn't another skb ready to transmit immediately, this led to a
+    double-free because we'd free it *again* next time we did have a packet to
+    send.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+    Cc: stable@kernel.org
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+==
+There is a typo here so we do a double lock instead of an unlock.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+---
+Only needed in linux-next.  Introduced in f9baad02e7411d9 [14/17]
+solos-pci: add GPIO support for newer versions on Geos board
+
+
+--- a/drivers/atm/solos-pci.c
++++ b/drivers/atm/solos-pci.c
+@@ -42,7 +42,8 @@
+ #include <linux/swab.h>
+ #include <linux/slab.h>
+ 
+-#define VERSION "0.07"
++#define VERSION "1.04"
++#define DRIVER_VERSION 0x01
+ #define PTAG "solos-pci"
+ 
+ #define CONFIG_RAM_SIZE	128
+@@ -56,16 +57,21 @@
+ #define FLASH_BUSY	0x60
+ #define FPGA_MODE	0x5C
+ #define FLASH_MODE	0x58
++#define GPIO_STATUS	0x54
++#define DRIVER_VER	0x50
+ #define TX_DMA_ADDR(port)	(0x40 + (4 * (port)))
+ #define RX_DMA_ADDR(port)	(0x30 + (4 * (port)))
+ 
+ #define DATA_RAM_SIZE	32768
+ #define BUF_SIZE	2048
+ #define OLD_BUF_SIZE	4096 /* For FPGA versions <= 2*/
+-#define FPGA_PAGE	528 /* FPGA flash page size*/
+-#define SOLOS_PAGE	512 /* Solos flash page size*/
+-#define FPGA_BLOCK	(FPGA_PAGE * 8) /* FPGA flash block size*/
+-#define SOLOS_BLOCK	(SOLOS_PAGE * 8) /* Solos flash block size*/
++/* Old boards use ATMEL AD45DB161D flash */
++#define ATMEL_FPGA_PAGE	528 /* FPGA flash page size*/
++#define ATMEL_SOLOS_PAGE	512 /* Solos flash page size*/
++#define ATMEL_FPGA_BLOCK	(ATMEL_FPGA_PAGE * 8) /* FPGA block size*/
++#define ATMEL_SOLOS_BLOCK	(ATMEL_SOLOS_PAGE * 8) /* Solos block size*/
++/* Current boards use M25P/M25PE SPI flash */
++#define SPI_FLASH_BLOCK	(256 * 64)
+ 
+ #define RX_BUF(card, nr) ((card->buffers) + (nr)*(card->buffer_size)*2)
+ #define TX_BUF(card, nr) ((card->buffers) + (nr)*(card->buffer_size)*2 + (card->buffer_size))
+@@ -123,11 +129,14 @@ struct solos_card {
+ 	struct sk_buff_head cli_queue[4];
+ 	struct sk_buff *tx_skb[4];
+ 	struct sk_buff *rx_skb[4];
++	unsigned char *dma_bounce;
+ 	wait_queue_head_t param_wq;
+ 	wait_queue_head_t fw_wq;
+ 	int using_dma;
++	int dma_alignment;
+ 	int fpga_version;
+ 	int buffer_size;
++	int atmel_flash;
+ };
+ 
+ 
+@@ -452,7 +461,6 @@ static ssize_t console_show(struct devic
+ 
+ 	len = skb->len;
+ 	memcpy(buf, skb->data, len);
+-	dev_dbg(&card->dev->dev, "len: %d\n", len);
+ 
+ 	kfree_skb(skb);
+ 	return len;
+@@ -499,6 +507,78 @@ static ssize_t console_store(struct devi
+ 	return err?:count;
+ }
+ 
++struct geos_gpio_attr {
++	struct device_attribute attr;
++	int offset;
++};
++
++#define SOLOS_GPIO_ATTR(_name, _mode, _show, _store, _offset)	\
++	struct geos_gpio_attr gpio_attr_##_name = {		\
++		.attr = __ATTR(_name, _mode, _show, _store),	\
++		.offset = _offset }
++
++static ssize_t geos_gpio_store(struct device *dev, struct device_attribute *attr,
++			       const char *buf, size_t count)
++{
++	struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
++	struct geos_gpio_attr *gattr = container_of(attr, struct geos_gpio_attr, attr);
++	struct solos_card *card = pci_get_drvdata(pdev);
++	uint32_t data32;
++
++	if (count != 1 && (count != 2 || buf[1] != '\n'))
++		return -EINVAL;
++
++	spin_lock_irq(&card->param_queue_lock);
++	data32 = ioread32(card->config_regs + GPIO_STATUS);
++	if (buf[0] == '1') {
++		data32 |= 1 << gattr->offset;
++		iowrite32(data32, card->config_regs + GPIO_STATUS);
++	} else if (buf[0] == '0') {
++		data32 &= ~(1 << gattr->offset);
++		iowrite32(data32, card->config_regs + GPIO_STATUS);
++	} else {
++		count = -EINVAL;
++	}
++	spin_unlock_irq(&card->param_queue_lock);
++	return count;
++}
++
++static ssize_t geos_gpio_show(struct device *dev, struct device_attribute *attr,
++			      char *buf)
++{
++	struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
++	struct geos_gpio_attr *gattr = container_of(attr, struct geos_gpio_attr, attr);
++	struct solos_card *card = pci_get_drvdata(pdev);
++	uint32_t data32;
++
++	data32 = ioread32(card->config_regs + GPIO_STATUS);
++	data32 = (data32 >> gattr->offset) & 1;
++
++	return sprintf(buf, "%d\n", data32);
++}
++
++static ssize_t hardware_show(struct device *dev, struct device_attribute *attr,
++			     char *buf)
++{
++	struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
++	struct geos_gpio_attr *gattr = container_of(attr, struct geos_gpio_attr, attr);
++	struct solos_card *card = pci_get_drvdata(pdev);
++	uint32_t data32;
++
++	data32 = ioread32(card->config_regs + GPIO_STATUS);
++	switch (gattr->offset) {
++	case 0:
++		/* HardwareVersion */
++		data32 = data32 & 0x1F;
++		break;
++	case 1:
++		/* HardwareVariant */
++		data32 = (data32 >> 5) & 0x0F;
++		break;
++	}
++	return sprintf(buf, "%d\n", data32);
++}
++
+ static DEVICE_ATTR(console, 0644, console_show, console_store);
+ 
+ 
+@@ -507,6 +587,14 @@ static DEVICE_ATTR(console, 0644, consol
+ 
+ #include "solos-attrlist.c"
+ 
++static SOLOS_GPIO_ATTR(GPIO1, 0644, geos_gpio_show, geos_gpio_store, 9);
++static SOLOS_GPIO_ATTR(GPIO2, 0644, geos_gpio_show, geos_gpio_store, 10);
++static SOLOS_GPIO_ATTR(GPIO3, 0644, geos_gpio_show, geos_gpio_store, 11);
++static SOLOS_GPIO_ATTR(GPIO4, 0644, geos_gpio_show, geos_gpio_store, 12);
++static SOLOS_GPIO_ATTR(GPIO5, 0644, geos_gpio_show, geos_gpio_store, 13);
++static SOLOS_GPIO_ATTR(PushButton, 0444, geos_gpio_show, NULL, 14);
++static SOLOS_GPIO_ATTR(HardwareVersion, 0444, hardware_show, NULL, 0);
++static SOLOS_GPIO_ATTR(HardwareVariant, 0444, hardware_show, NULL, 1);
+ #undef SOLOS_ATTR_RO
+ #undef SOLOS_ATTR_RW
+ 
+@@ -523,6 +611,23 @@ static struct attribute_group solos_attr
+ 	.name = "parameters",
+ };
+ 
++static struct attribute *gpio_attrs[] = {
++	&gpio_attr_GPIO1.attr.attr,
++	&gpio_attr_GPIO2.attr.attr,
++	&gpio_attr_GPIO3.attr.attr,
++	&gpio_attr_GPIO4.attr.attr,
++	&gpio_attr_GPIO5.attr.attr,
++	&gpio_attr_PushButton.attr.attr,
++	&gpio_attr_HardwareVersion.attr.attr,
++	&gpio_attr_HardwareVariant.attr.attr,
++	NULL
++};
++
++static struct attribute_group gpio_attr_group = {
++	.attrs = gpio_attrs,
++	.name = "gpio",
++};
++
+ static int flash_upgrade(struct solos_card *card, int chip)
+ {
+ 	const struct firmware *fw;
+@@ -534,16 +639,25 @@ static int flash_upgrade(struct solos_ca
+ 	switch (chip) {
+ 	case 0:
+ 		fw_name = "solos-FPGA.bin";
+-		blocksize = FPGA_BLOCK;
++		if (card->atmel_flash)
++			blocksize = ATMEL_FPGA_BLOCK;
++		else
++			blocksize = SPI_FLASH_BLOCK;
+ 		break;
+ 	case 1:
+ 		fw_name = "solos-Firmware.bin";
+-		blocksize = SOLOS_BLOCK;
++		if (card->atmel_flash)
++			blocksize = ATMEL_SOLOS_BLOCK;
++		else
++			blocksize = SPI_FLASH_BLOCK;
+ 		break;
+ 	case 2:
+ 		if (card->fpga_version > LEGACY_BUFFERS){
+ 			fw_name = "solos-db-FPGA.bin";
+-			blocksize = FPGA_BLOCK;
++			if (card->atmel_flash)
++				blocksize = ATMEL_FPGA_BLOCK;
++			else
++				blocksize = SPI_FLASH_BLOCK;
+ 		} else {
+ 			dev_info(&card->dev->dev, "FPGA version doesn't support"
+ 					" daughter board upgrades\n");
+@@ -553,7 +667,10 @@ static int flash_upgrade(struct solos_ca
+ 	case 3:
+ 		if (card->fpga_version > LEGACY_BUFFERS){
+ 			fw_name = "solos-Firmware.bin";
+-			blocksize = SOLOS_BLOCK;
++			if (card->atmel_flash)
++				blocksize = ATMEL_SOLOS_BLOCK;
++			else
++				blocksize = SPI_FLASH_BLOCK;
+ 		} else {
+ 			dev_info(&card->dev->dev, "FPGA version doesn't support"
+ 					" daughter board upgrades\n");
+@@ -569,6 +686,9 @@ static int flash_upgrade(struct solos_ca
+ 
+ 	dev_info(&card->dev->dev, "Flash upgrade starting\n");
+ 
++	/* New FPGAs require driver version before permitting flash upgrades */
++	iowrite32(DRIVER_VERSION, card->config_regs + DRIVER_VER);
++
+ 	numblocks = fw->size / blocksize;
+ 	dev_info(&card->dev->dev, "Firmware size: %zd\n", fw->size);
+ 	dev_info(&card->dev->dev, "Number of blocks: %d\n", numblocks);
+@@ -598,9 +718,13 @@ static int flash_upgrade(struct solos_ca
+ 		/* dev_info(&card->dev->dev, "Set FPGA Flash mode to Block Write\n"); */
+ 		iowrite32(((chip * 2) + 1), card->config_regs + FLASH_MODE);
+ 
+-		/* Copy block to buffer, swapping each 16 bits */
++		/* Copy block to buffer, swapping each 16 bits for Atmel flash */
+ 		for(i = 0; i < blocksize; i += 4) {
+-			uint32_t word = swahb32p((uint32_t *)(fw->data + offset + i));
++			uint32_t word;
++			if (card->atmel_flash)
++				word = swahb32p((uint32_t *)(fw->data + offset + i));
++			else
++				word = *(uint32_t *)(fw->data + offset + i);
+ 			if(card->fpga_version > LEGACY_BUFFERS)
+ 				iowrite32(word, FLASH_BUF + i);
+ 			else
+@@ -945,10 +1069,11 @@ static uint32_t fpga_tx(struct solos_car
+ 	for (port = 0; tx_pending; tx_pending >>= 1, port++) {
+ 		if (tx_pending & 1) {
+ 			struct sk_buff *oldskb = card->tx_skb[port];
+-			if (oldskb)
++			if (oldskb) {
+ 				pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr,
+ 						 oldskb->len, PCI_DMA_TODEVICE);
+-
++				card->tx_skb[port] = NULL;
++			}
+ 			spin_lock(&card->tx_queue_lock);
+ 			skb = skb_dequeue(&card->tx_queue[port]);
+ 			if (!skb)
+@@ -960,8 +1085,14 @@ static uint32_t fpga_tx(struct solos_car
+ 				tx_started |= 1 << port;
+ 				oldskb = skb; /* We're done with this skb already */
+ 			} else if (skb && card->using_dma) {
+-				SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data,
++				unsigned char *data = skb->data;
++				if ((unsigned long)data & card->dma_alignment) {
++					data = card->dma_bounce + (BUF_SIZE * port);
++					memcpy(data, skb->data, skb->len);
++				}
++				SKB_CB(skb)->dma_addr = pci_map_single(card->dev, data,
+ 								       skb->len, PCI_DMA_TODEVICE);
++				card->tx_skb[port] = skb;
+ 				iowrite32(SKB_CB(skb)->dma_addr,
+ 					  card->config_regs + TX_DMA_ADDR(port));
+ 			}
+@@ -1133,17 +1264,33 @@ static int fpga_probe(struct pci_dev *de
+ 		db_fpga_upgrade = db_firmware_upgrade = 0;
+ 	}
+ 
+-	if (card->fpga_version >= DMA_SUPPORTED){
++	/* Stopped using Atmel flash after 0.03-38 */
++	if (fpga_ver < 39)
++		card->atmel_flash = 1;
++	else
++		card->atmel_flash = 0;
++
++	data32 = ioread32(card->config_regs + PORTS);
++	card->nr_ports = (data32 & 0x000000FF);
++
++	if (card->fpga_version >= DMA_SUPPORTED) {
++		pci_set_master(dev);
+ 		card->using_dma = 1;
++		if (1) { /* All known FPGA versions so far */
++			card->dma_alignment = 3;
++			card->dma_bounce = kmalloc(card->nr_ports * BUF_SIZE, GFP_KERNEL);
++			if (!card->dma_bounce) {
++				dev_warn(&card->dev->dev, "Failed to allocate DMA bounce buffers\n");
++				/* Fallback to MMIO doesn't work */
++				goto out_unmap_both;
++			}
++		}
+ 	} else {
+ 		card->using_dma = 0;
+ 		/* Set RX empty flag for all ports */
+ 		iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
+ 	}
+ 
+-	data32 = ioread32(card->config_regs + PORTS);
+-	card->nr_ports = (data32 & 0x000000FF);
+-
+ 	pci_set_drvdata(dev, card);
+ 
+ 	tasklet_init(&card->tlet, solos_bh, (unsigned long)card);
+@@ -1178,6 +1325,10 @@ static int fpga_probe(struct pci_dev *de
+ 	if (err)
+ 		goto out_free_irq;
+ 
++	if (card->fpga_version >= DMA_SUPPORTED &&
++	    sysfs_create_group(&card->dev->dev.kobj, &gpio_attr_group))
++		dev_err(&card->dev->dev, "Could not register parameter group for GPIOs\n");
++
+ 	return 0;
+ 
+  out_free_irq:
+@@ -1186,6 +1337,7 @@ static int fpga_probe(struct pci_dev *de
+ 	tasklet_kill(&card->tlet);
+ 	
+  out_unmap_both:
++	kfree(card->dma_bounce);
+ 	pci_set_drvdata(dev, NULL);
+ 	pci_iounmap(dev, card->buffers);
+  out_unmap_config:
+@@ -1288,11 +1440,16 @@ static void fpga_remove(struct pci_dev *
+ 	iowrite32(1, card->config_regs + FPGA_MODE);
+ 	(void)ioread32(card->config_regs + FPGA_MODE); 
+ 
++	if (card->fpga_version >= DMA_SUPPORTED)
++		sysfs_remove_group(&card->dev->dev.kobj, &gpio_attr_group);
++
+ 	atm_remove(card);
+ 
+ 	free_irq(dev->irq, card);
+ 	tasklet_kill(&card->tlet);
+ 
++	kfree(card->dma_bounce);
++
+ 	/* Release device from reset */
+ 	iowrite32(0, card->config_regs + FPGA_MODE);
+ 	(void)ioread32(card->config_regs + FPGA_MODE); 
diff --git a/trunk/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch b/trunk/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch
new file mode 100644
index 00000000..94acf378
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch
@@ -0,0 +1,39 @@
+From 32e857cd1fbb006f56a99a2eab998173b1576533 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 10 Sep 2012 10:18:57 +0200
+Subject: [PATCH net] ixp4xx_hss: fix build failure after logging conversion
+
+Commit c75bb2c6f0cf455c23e60f14d780e841dd47f801 (ixp4xx_hss: Update to
+current logging forms) converted the ixp4xx_hss module to use the current
+logging macros, but forgot to include linux/module.h, leading to the
+following build failures:
+
+  CC [M]  drivers/net/wan/ixp4xx_hss.o
+ drivers/net/wan/ixp4xx_hss.c:1412:20: error: expected ';', ',' or ')'
+ before string constant
+ drivers/net/wan/ixp4xx_hss.c:1413:25: error: expected ';', ',' or ')'
+ before string constant
+ drivers/net/wan/ixp4xx_hss.c:1414:21: error: expected ';', ',' or ')'
+ before string constant
+ drivers/net/wan/ixp4xx_hss.c:1415:19: error: expected ';', ',' or ')'
+ before string constant
+ make[8]: *** [drivers/net/wan/ixp4xx_hss.o] Error 1
+
+CC: stable@vger.kernel.org
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+[stable: 3.1+]
+
+ drivers/net/wan/ixp4xx_hss.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/wan/ixp4xx_hss.c
++++ b/drivers/net/wan/ixp4xx_hss.c
+@@ -10,6 +10,7 @@
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
++#include <linux/module.h>
+ #include <linux/bitops.h>
+ #include <linux/cdev.h>
+ #include <linux/dma-mapping.h>
diff --git a/trunk/target/linux/generic/patches-3.3/200-fix_localversion.patch b/trunk/target/linux/generic/patches-3.3/200-fix_localversion.patch
new file mode 100644
index 00000000..0d1bae8d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- a/scripts/setlocalversion
++++ b/scripts/setlocalversion
+@@ -168,7 +168,7 @@ else
+ 	# annotated or signed tagged state (as git describe only
+ 	# looks at signed or annotated tags - git tag -a/-s) and
+ 	# LOCALVERSION= is not specified
+-	if test "${LOCALVERSION+set}" != "set"; then
++	if test "${CONFIG_LOCALVERSION+set}" != "set"; then
+ 		scm=$(scm_version --short)
+ 		res="$res${scm:++}"
+ 	fi
diff --git a/trunk/target/linux/generic/patches-3.3/201-extra_optimization.patch b/trunk/target/linux/generic/patches-3.3/201-extra_optimization.patch
new file mode 100644
index 00000000..213e6d12
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/201-extra_optimization.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -559,9 +559,9 @@ endif # $(dot-config)
+ all: vmlinux
+ 
+ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+-KBUILD_CFLAGS	+= -Os
++KBUILD_CFLAGS	+= -Os $(EXTRA_OPTIMIZATION)
+ else
+-KBUILD_CFLAGS	+= -O2
++KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
+ endif
+ 
+ include $(srctree)/arch/$(SRCARCH)/Makefile
diff --git a/trunk/target/linux/generic/patches-3.3/202-reduce_module_size.patch b/trunk/target/linux/generic/patches-3.3/202-reduce_module_size.patch
new file mode 100644
index 00000000..bca1e356
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/202-reduce_module_size.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -374,7 +374,7 @@ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+ KBUILD_AFLAGS_MODULE  := -DMODULE
+ KBUILD_CFLAGS_MODULE  := -DMODULE
+-KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
++KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s)
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/trunk/target/linux/generic/patches-3.3/210-darwin_scripts_include.patch b/trunk/target/linux/generic/patches-3.3/210-darwin_scripts_include.patch
new file mode 100644
index 00000000..ccaf1427
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/210-darwin_scripts_include.patch
@@ -0,0 +1,3088 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -22,6 +22,35 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef __APPLE__
++/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
++void *memmem (const void *haystack, size_t haystack_len,
++                          const void *needle,  size_t needle_len)
++{
++  const char *begin;
++  const char *const last_possible
++    = (const char *) haystack + haystack_len - needle_len;
++
++  if (needle_len == 0)
++    /* The first occurrence of the empty string is deemed to occur at
++       the beginning of the string.  */
++    return (void *) haystack;
++
++  /* Sanity check, otherwise the loop might search through the whole
++     memory.  */
++  if (__builtin_expect (haystack_len < needle_len, 0))
++    return NULL;
++
++  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
++    if (begin[0] == ((const char *) needle)[0] &&
++        !memcmp ((const void *) &begin[1],
++                 (const void *) ((const char *) needle + 1),
++                 needle_len - 1))
++      return (void *) begin;
++
++  return NULL;
++}
++#endif
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -123,6 +123,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
+ # we really need to do so. (Do not call gcc as part of make mrproper)
+ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
+                     -DLOCALE
++ifeq ($(shell uname -s),Darwin)
++HOST_LOADLIBES  += -lncurses
++endif
+ 
+ # ===========================================================================
+ # Shared Makefile for the various kconfig executables:
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c
+@@ -1,7 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __APPLE__
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ int
+ main(int argc, char **argv)
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -7,7 +7,11 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ #include "elfconfig.h"
+ 
+--- /dev/null
++++ b/scripts/mod/elf.h
+@@ -0,0 +1,3007 @@
++/* This file defines standard ELF types, structures, and macros.
++   Copyright (C) 1995-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _ELF_H
++#define	_ELF_H 1
++
++/* Standard ELF types.  */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity.  */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities.  */
++typedef uint32_t Elf32_Word;
++typedef	int32_t  Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef	int32_t  Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities.  */
++typedef uint64_t Elf32_Xword;
++typedef	int64_t  Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef	int64_t  Elf64_Sxword;
++
++/* Type of addresses.  */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets.  */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities.  */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information.  */
++typedef Elf32_Half Elf32_Versym;
++typedef Elf64_Half Elf64_Versym;
++
++
++/* The ELF file header.  This appears at the start of every ELF file.  */
++
++#define EI_NIDENT (16)
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf32_Half	e_type;			/* Object file type */
++  Elf32_Half	e_machine;		/* Architecture */
++  Elf32_Word	e_version;		/* Object file version */
++  Elf32_Addr	e_entry;		/* Entry point virtual address */
++  Elf32_Off	e_phoff;		/* Program header table file offset */
++  Elf32_Off	e_shoff;		/* Section header table file offset */
++  Elf32_Word	e_flags;		/* Processor-specific flags */
++  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf32_Half	e_phentsize;		/* Program header table entry size */
++  Elf32_Half	e_phnum;		/* Program header table entry count */
++  Elf32_Half	e_shentsize;		/* Section header table entry size */
++  Elf32_Half	e_shnum;		/* Section header table entry count */
++  Elf32_Half	e_shstrndx;		/* Section header string table index */
++} Elf32_Ehdr;
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf64_Half	e_type;			/* Object file type */
++  Elf64_Half	e_machine;		/* Architecture */
++  Elf64_Word	e_version;		/* Object file version */
++  Elf64_Addr	e_entry;		/* Entry point virtual address */
++  Elf64_Off	e_phoff;		/* Program header table file offset */
++  Elf64_Off	e_shoff;		/* Section header table file offset */
++  Elf64_Word	e_flags;		/* Processor-specific flags */
++  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf64_Half	e_phentsize;		/* Program header table entry size */
++  Elf64_Half	e_phnum;		/* Program header table entry count */
++  Elf64_Half	e_shentsize;		/* Section header table entry size */
++  Elf64_Half	e_shnum;		/* Section header table entry count */
++  Elf64_Half	e_shstrndx;		/* Section header string table index */
++} Elf64_Ehdr;
++
++/* Fields in the e_ident array.  The EI_* macros are indices into the
++   array.  The macros under each EI_* macro are the values the byte
++   may have.  */
++
++#define EI_MAG0		0		/* File identification byte 0 index */
++#define ELFMAG0		0x7f		/* Magic number byte 0 */
++
++#define EI_MAG1		1		/* File identification byte 1 index */
++#define ELFMAG1		'E'		/* Magic number byte 1 */
++
++#define EI_MAG2		2		/* File identification byte 2 index */
++#define ELFMAG2		'L'		/* Magic number byte 2 */
++
++#define EI_MAG3		3		/* File identification byte 3 index */
++#define ELFMAG3		'F'		/* Magic number byte 3 */
++
++/* Conglomeration of the identification bytes, for easy testing as a word.  */
++#define	ELFMAG		"\177ELF"
++#define	SELFMAG		4
++
++#define EI_CLASS	4		/* File class byte index */
++#define ELFCLASSNONE	0		/* Invalid class */
++#define ELFCLASS32	1		/* 32-bit objects */
++#define ELFCLASS64	2		/* 64-bit objects */
++#define ELFCLASSNUM	3
++
++#define EI_DATA		5		/* Data encoding byte index */
++#define ELFDATANONE	0		/* Invalid data encoding */
++#define ELFDATA2LSB	1		/* 2's complement, little endian */
++#define ELFDATA2MSB	2		/* 2's complement, big endian */
++#define ELFDATANUM	3
++
++#define EI_VERSION	6		/* File version byte index */
++					/* Value must be EV_CURRENT */
++
++#define EI_OSABI	7		/* OS ABI identification */
++#define ELFOSABI_NONE		0	/* UNIX System V ABI */
++#define ELFOSABI_SYSV		0	/* Alias.  */
++#define ELFOSABI_HPUX		1	/* HP-UX */
++#define ELFOSABI_NETBSD		2	/* NetBSD.  */
++#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
++#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
++#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
++#define ELFOSABI_AIX		7	/* IBM AIX.  */
++#define ELFOSABI_IRIX		8	/* SGI Irix.  */
++#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
++#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
++#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
++#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
++#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
++#define ELFOSABI_ARM		97	/* ARM */
++#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
++
++#define EI_ABIVERSION	8		/* ABI version */
++
++#define EI_PAD		9		/* Byte index of padding bytes */
++
++/* Legal values for e_type (object file type).  */
++
++#define ET_NONE		0		/* No file type */
++#define ET_REL		1		/* Relocatable file */
++#define ET_EXEC		2		/* Executable file */
++#define ET_DYN		3		/* Shared object file */
++#define ET_CORE		4		/* Core file */
++#define	ET_NUM		5		/* Number of defined types */
++#define ET_LOOS		0xfe00		/* OS-specific range start */
++#define ET_HIOS		0xfeff		/* OS-specific range end */
++#define ET_LOPROC	0xff00		/* Processor-specific range start */
++#define ET_HIPROC	0xffff		/* Processor-specific range end */
++
++/* Legal values for e_machine (architecture).  */
++
++#define EM_NONE		 0		/* No machine */
++#define EM_M32		 1		/* AT&T WE 32100 */
++#define EM_SPARC	 2		/* SUN SPARC */
++#define EM_386		 3		/* Intel 80386 */
++#define EM_68K		 4		/* Motorola m68k family */
++#define EM_88K		 5		/* Motorola m88k family */
++#define EM_860		 7		/* Intel 80860 */
++#define EM_MIPS		 8		/* MIPS R3000 big-endian */
++#define EM_S370		 9		/* IBM System/370 */
++#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
++
++#define EM_PARISC	15		/* HPPA */
++#define EM_VPP500	17		/* Fujitsu VPP500 */
++#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
++#define EM_960		19		/* Intel 80960 */
++#define EM_PPC		20		/* PowerPC */
++#define EM_PPC64	21		/* PowerPC 64-bit */
++#define EM_S390		22		/* IBM S390 */
++
++#define EM_V800		36		/* NEC V800 series */
++#define EM_FR20		37		/* Fujitsu FR20 */
++#define EM_RH32		38		/* TRW RH-32 */
++#define EM_RCE		39		/* Motorola RCE */
++#define EM_ARM		40		/* ARM */
++#define EM_FAKE_ALPHA	41		/* Digital Alpha */
++#define EM_SH		42		/* Hitachi SH */
++#define EM_SPARCV9	43		/* SPARC v9 64-bit */
++#define EM_TRICORE	44		/* Siemens Tricore */
++#define EM_ARC		45		/* Argonaut RISC Core */
++#define EM_H8_300	46		/* Hitachi H8/300 */
++#define EM_H8_300H	47		/* Hitachi H8/300H */
++#define EM_H8S		48		/* Hitachi H8S */
++#define EM_H8_500	49		/* Hitachi H8/500 */
++#define EM_IA_64	50		/* Intel Merced */
++#define EM_MIPS_X	51		/* Stanford MIPS-X */
++#define EM_COLDFIRE	52		/* Motorola Coldfire */
++#define EM_68HC12	53		/* Motorola M68HC12 */
++#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP		55		/* Siemens PCP */
++#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
++#define EM_NDR1		57		/* Denso NDR1 microprocessor */
++#define EM_STARCORE	58		/* Motorola Start*Core processor */
++#define EM_ME16		59		/* Toyota ME16 processor */
++#define EM_ST100	60		/* STMicroelectronic ST100 processor */
++#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64	62		/* AMD x86-64 architecture */
++#define EM_PDSP		63		/* Sony DSP Processor */
++
++#define EM_FX66		66		/* Siemens FX66 microcontroller */
++#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
++#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
++#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
++#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
++#define EM_SVX		73		/* Silicon Graphics SVx */
++#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX		75		/* Digital VAX */
++#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
++#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY	81		/* Harvard University machine-independent object files */
++#define EM_PRISM	82		/* SiTera Prism */
++#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
++#define EM_FR30		84		/* Fujitsu FR30 */
++#define EM_D10V		85		/* Mitsubishi D10V */
++#define EM_D30V		86		/* Mitsubishi D30V */
++#define EM_V850		87		/* NEC v850 */
++#define EM_M32R		88		/* Mitsubishi M32R */
++#define EM_MN10300	89		/* Matsushita MN10300 */
++#define EM_MN10200	90		/* Matsushita MN10200 */
++#define EM_PJ		91		/* picoJava */
++#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
++#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
++#define EM_TILEPRO	188		/* Tilera TILEPro */
++#define EM_TILEGX	191		/* Tilera TILE-Gx */
++#define EM_NUM		192
++
++/* If it is necessary to assign new unofficial EM_* values, please
++   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
++   chances of collision with official or non-GNU unofficial values.  */
++
++#define EM_ALPHA	0x9026
++
++/* Legal values for e_version (version).  */
++
++#define EV_NONE		0		/* Invalid ELF version */
++#define EV_CURRENT	1		/* Current version */
++#define EV_NUM		2
++
++/* Section header.  */
++
++typedef struct
++{
++  Elf32_Word	sh_name;		/* Section name (string tbl index) */
++  Elf32_Word	sh_type;		/* Section type */
++  Elf32_Word	sh_flags;		/* Section flags */
++  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf32_Off	sh_offset;		/* Section file offset */
++  Elf32_Word	sh_size;		/* Section size in bytes */
++  Elf32_Word	sh_link;		/* Link to another section */
++  Elf32_Word	sh_info;		/* Additional section information */
++  Elf32_Word	sh_addralign;		/* Section alignment */
++  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
++} Elf32_Shdr;
++
++typedef struct
++{
++  Elf64_Word	sh_name;		/* Section name (string tbl index) */
++  Elf64_Word	sh_type;		/* Section type */
++  Elf64_Xword	sh_flags;		/* Section flags */
++  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf64_Off	sh_offset;		/* Section file offset */
++  Elf64_Xword	sh_size;		/* Section size in bytes */
++  Elf64_Word	sh_link;		/* Link to another section */
++  Elf64_Word	sh_info;		/* Additional section information */
++  Elf64_Xword	sh_addralign;		/* Section alignment */
++  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
++} Elf64_Shdr;
++
++/* Special section indices.  */
++
++#define SHN_UNDEF	0		/* Undefined section */
++#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
++#define SHN_LOPROC	0xff00		/* Start of processor-specific */
++#define SHN_BEFORE	0xff00		/* Order section before all others
++					   (Solaris).  */
++#define SHN_AFTER	0xff01		/* Order section after all others
++					   (Solaris).  */
++#define SHN_HIPROC	0xff1f		/* End of processor-specific */
++#define SHN_LOOS	0xff20		/* Start of OS-specific */
++#define SHN_HIOS	0xff3f		/* End of OS-specific */
++#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
++#define SHN_COMMON	0xfff2		/* Associated symbol is common */
++#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
++#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
++
++/* Legal values for sh_type (section type).  */
++
++#define SHT_NULL	  0		/* Section header table entry unused */
++#define SHT_PROGBITS	  1		/* Program data */
++#define SHT_SYMTAB	  2		/* Symbol table */
++#define SHT_STRTAB	  3		/* String table */
++#define SHT_RELA	  4		/* Relocation entries with addends */
++#define SHT_HASH	  5		/* Symbol hash table */
++#define SHT_DYNAMIC	  6		/* Dynamic linking information */
++#define SHT_NOTE	  7		/* Notes */
++#define SHT_NOBITS	  8		/* Program space with no data (bss) */
++#define SHT_REL		  9		/* Relocation entries, no addends */
++#define SHT_SHLIB	  10		/* Reserved */
++#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
++#define SHT_INIT_ARRAY	  14		/* Array of constructors */
++#define SHT_FINI_ARRAY	  15		/* Array of destructors */
++#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
++#define SHT_GROUP	  17		/* Section group */
++#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
++#define	SHT_NUM		  19		/* Number of defined types.  */
++#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
++#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
++#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
++#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
++#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
++#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
++#define SHT_SUNW_move	  0x6ffffffa
++#define SHT_SUNW_COMDAT   0x6ffffffb
++#define SHT_SUNW_syminfo  0x6ffffffc
++#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
++#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
++#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
++#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
++#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
++#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
++#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
++#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
++#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
++
++/* Legal values for sh_flags (section flags).  */
++
++#define SHF_WRITE	     (1 << 0)	/* Writable */
++#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
++#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
++#define SHF_MERGE	     (1 << 4)	/* Might be merged */
++#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
++#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
++#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
++#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
++					   required */
++#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
++#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
++#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
++#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
++#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
++					   (Solaris).  */
++#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
++					   referenced or allocated (Solaris).*/
++
++/* Section group handling.  */
++#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
++
++/* Symbol table entry.  */
++
++typedef struct
++{
++  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
++  Elf32_Addr	st_value;		/* Symbol value */
++  Elf32_Word	st_size;		/* Symbol size */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char	st_other;		/* Symbol visibility */
++  Elf32_Section	st_shndx;		/* Section index */
++} Elf32_Sym;
++
++typedef struct
++{
++  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char st_other;		/* Symbol visibility */
++  Elf64_Section	st_shndx;		/* Section index */
++  Elf64_Addr	st_value;		/* Symbol value */
++  Elf64_Xword	st_size;		/* Symbol size */
++} Elf64_Sym;
++
++/* The syminfo section if available contains additional information about
++   every dynamic symbol.  */
++
++typedef struct
++{
++  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf32_Half si_flags;			/* Per symbol flags */
++} Elf32_Syminfo;
++
++typedef struct
++{
++  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf64_Half si_flags;			/* Per symbol flags */
++} Elf64_Syminfo;
++
++/* Possible values for si_boundto.  */
++#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
++#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
++#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
++
++/* Possible bitmasks for si_flags.  */
++#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
++#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
++#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
++#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
++					   loaded */
++/* Syminfo version values.  */
++#define SYMINFO_NONE		0
++#define SYMINFO_CURRENT		1
++#define SYMINFO_NUM		2
++
++
++/* How to extract and insert information held in the st_info field.  */
++
++#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
++#define ELF32_ST_TYPE(val)		((val) & 0xf)
++#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
++
++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
++#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
++#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
++#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
++
++/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
++
++#define STB_LOCAL	0		/* Local symbol */
++#define STB_GLOBAL	1		/* Global symbol */
++#define STB_WEAK	2		/* Weak symbol */
++#define	STB_NUM		3		/* Number of defined types.  */
++#define STB_LOOS	10		/* Start of OS-specific */
++#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
++#define STB_HIOS	12		/* End of OS-specific */
++#define STB_LOPROC	13		/* Start of processor-specific */
++#define STB_HIPROC	15		/* End of processor-specific */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_NOTYPE	0		/* Symbol type is unspecified */
++#define STT_OBJECT	1		/* Symbol is a data object */
++#define STT_FUNC	2		/* Symbol is a code object */
++#define STT_SECTION	3		/* Symbol associated with a section */
++#define STT_FILE	4		/* Symbol's name is file name */
++#define STT_COMMON	5		/* Symbol is a common data object */
++#define STT_TLS		6		/* Symbol is thread-local data object*/
++#define	STT_NUM		7		/* Number of defined types.  */
++#define STT_LOOS	10		/* Start of OS-specific */
++#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
++#define STT_HIOS	12		/* End of OS-specific */
++#define STT_LOPROC	13		/* Start of processor-specific */
++#define STT_HIPROC	15		/* End of processor-specific */
++
++
++/* Symbol table indices are found in the hash buckets and chain table
++   of a symbol hash table section.  This special index value indicates
++   the end of a chain, meaning no further symbols are found in that bucket.  */
++
++#define STN_UNDEF	0		/* End of a chain.  */
++
++
++/* How to extract and insert information held in the st_other field.  */
++
++#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
++
++/* For ELF64 the definitions are the same.  */
++#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
++
++/* Symbol visibility specification encoded in the st_other field.  */
++#define STV_DEFAULT	0		/* Default symbol visibility rules */
++#define STV_INTERNAL	1		/* Processor specific hidden class */
++#define STV_HIDDEN	2		/* Sym unavailable in other modules */
++#define STV_PROTECTED	3		/* Not preemptible, not exported */
++
++
++/* Relocation table entry without addend (in section of type SHT_REL).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++} Elf32_Rel;
++
++/* I have seen two different definitions of the Elf64_Rel and
++   Elf64_Rela structures, so we'll leave them out until Novell (or
++   whoever) gets their act together.  */
++/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++} Elf64_Rel;
++
++/* Relocation table entry with addend (in section of type SHT_RELA).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++  Elf32_Sword	r_addend;		/* Addend */
++} Elf32_Rela;
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++  Elf64_Sxword	r_addend;		/* Addend */
++} Elf64_Rela;
++
++/* How to extract and insert information held in the r_info field.  */
++
++#define ELF32_R_SYM(val)		((val) >> 8)
++#define ELF32_R_TYPE(val)		((val) & 0xff)
++#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
++
++#define ELF64_R_SYM(i)			((i) >> 32)
++#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
++#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
++
++/* Program segment header.  */
++
++typedef struct
++{
++  Elf32_Word	p_type;			/* Segment type */
++  Elf32_Off	p_offset;		/* Segment file offset */
++  Elf32_Addr	p_vaddr;		/* Segment virtual address */
++  Elf32_Addr	p_paddr;		/* Segment physical address */
++  Elf32_Word	p_filesz;		/* Segment size in file */
++  Elf32_Word	p_memsz;		/* Segment size in memory */
++  Elf32_Word	p_flags;		/* Segment flags */
++  Elf32_Word	p_align;		/* Segment alignment */
++} Elf32_Phdr;
++
++typedef struct
++{
++  Elf64_Word	p_type;			/* Segment type */
++  Elf64_Word	p_flags;		/* Segment flags */
++  Elf64_Off	p_offset;		/* Segment file offset */
++  Elf64_Addr	p_vaddr;		/* Segment virtual address */
++  Elf64_Addr	p_paddr;		/* Segment physical address */
++  Elf64_Xword	p_filesz;		/* Segment size in file */
++  Elf64_Xword	p_memsz;		/* Segment size in memory */
++  Elf64_Xword	p_align;		/* Segment alignment */
++} Elf64_Phdr;
++
++/* Special value for e_phnum.  This indicates that the real number of
++   program headers is too large to fit into e_phnum.  Instead the real
++   value is in the field sh_info of section 0.  */
++
++#define PN_XNUM		0xffff
++
++/* Legal values for p_type (segment type).  */
++
++#define	PT_NULL		0		/* Program header table entry unused */
++#define PT_LOAD		1		/* Loadable program segment */
++#define PT_DYNAMIC	2		/* Dynamic linking information */
++#define PT_INTERP	3		/* Program interpreter */
++#define PT_NOTE		4		/* Auxiliary information */
++#define PT_SHLIB	5		/* Reserved */
++#define PT_PHDR		6		/* Entry for header table itself */
++#define PT_TLS		7		/* Thread-local storage segment */
++#define	PT_NUM		8		/* Number of defined types */
++#define PT_LOOS		0x60000000	/* Start of OS-specific */
++#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
++#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
++#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
++#define PT_LOSUNW	0x6ffffffa
++#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
++#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
++#define PT_HISUNW	0x6fffffff
++#define PT_HIOS		0x6fffffff	/* End of OS-specific */
++#define PT_LOPROC	0x70000000	/* Start of processor-specific */
++#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
++
++/* Legal values for p_flags (segment flags).  */
++
++#define PF_X		(1 << 0)	/* Segment is executable */
++#define PF_W		(1 << 1)	/* Segment is writable */
++#define PF_R		(1 << 2)	/* Segment is readable */
++#define PF_MASKOS	0x0ff00000	/* OS-specific */
++#define PF_MASKPROC	0xf0000000	/* Processor-specific */
++
++/* Legal values for note segment descriptor types for core files. */
++
++#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
++#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
++#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
++#define NT_PRXREG	4		/* Contains copy of prxregset struct */
++#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
++#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
++#define NT_AUXV		6		/* Contains copy of auxv array */
++#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
++#define NT_ASRS		8		/* Contains copy of asrset struct */
++#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
++#define NT_PSINFO	13		/* Contains copy of psinfo struct */
++#define NT_PRCRED	14		/* Contains copy of prcred struct */
++#define NT_UTSNAME	15		/* Contains copy of utsname struct */
++#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
++#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
++#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
++#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
++#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
++#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
++#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
++#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
++#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
++#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
++
++/* Legal values for the note segment descriptor types for object files.  */
++
++#define NT_VERSION	1		/* Contains a version string.  */
++
++
++/* Dynamic section entry.  */
++
++typedef struct
++{
++  Elf32_Sword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf32_Word d_val;			/* Integer value */
++      Elf32_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf32_Dyn;
++
++typedef struct
++{
++  Elf64_Sxword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf64_Xword d_val;		/* Integer value */
++      Elf64_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf64_Dyn;
++
++/* Legal values for d_tag (dynamic entry type).  */
++
++#define DT_NULL		0		/* Marks end of dynamic section */
++#define DT_NEEDED	1		/* Name of needed library */
++#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
++#define DT_PLTGOT	3		/* Processor defined value */
++#define DT_HASH		4		/* Address of symbol hash table */
++#define DT_STRTAB	5		/* Address of string table */
++#define DT_SYMTAB	6		/* Address of symbol table */
++#define DT_RELA		7		/* Address of Rela relocs */
++#define DT_RELASZ	8		/* Total size of Rela relocs */
++#define DT_RELAENT	9		/* Size of one Rela reloc */
++#define DT_STRSZ	10		/* Size of string table */
++#define DT_SYMENT	11		/* Size of one symbol table entry */
++#define DT_INIT		12		/* Address of init function */
++#define DT_FINI		13		/* Address of termination function */
++#define DT_SONAME	14		/* Name of shared object */
++#define DT_RPATH	15		/* Library search path (deprecated) */
++#define DT_SYMBOLIC	16		/* Start symbol search here */
++#define DT_REL		17		/* Address of Rel relocs */
++#define DT_RELSZ	18		/* Total size of Rel relocs */
++#define DT_RELENT	19		/* Size of one Rel reloc */
++#define DT_PLTREL	20		/* Type of reloc in PLT */
++#define DT_DEBUG	21		/* For debugging; unspecified */
++#define DT_TEXTREL	22		/* Reloc might modify .text */
++#define DT_JMPREL	23		/* Address of PLT relocs */
++#define	DT_BIND_NOW	24		/* Process relocations of object */
++#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
++#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
++#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
++#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
++#define DT_RUNPATH	29		/* Library search path */
++#define DT_FLAGS	30		/* Flags for the object being loaded */
++#define DT_ENCODING	32		/* Start of encoded range */
++#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
++#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
++#define	DT_NUM		34		/* Number used */
++#define DT_LOOS		0x6000000d	/* Start of OS-specific */
++#define DT_HIOS		0x6ffff000	/* End of OS-specific */
++#define DT_LOPROC	0x70000000	/* Start of processor-specific */
++#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
++#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
++
++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
++   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
++   approach.  */
++#define DT_VALRNGLO	0x6ffffd00
++#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
++#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
++#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
++#define DT_CHECKSUM	0x6ffffdf8
++#define DT_PLTPADSZ	0x6ffffdf9
++#define DT_MOVEENT	0x6ffffdfa
++#define DT_MOVESZ	0x6ffffdfb
++#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
++#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
++					   the following DT_* entry.  */
++#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
++#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
++#define DT_VALRNGHI	0x6ffffdff
++#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
++#define DT_VALNUM 12
++
++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
++   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
++
++   If any adjustment is made to the ELF object after it has been
++   built these entries will need to be adjusted.  */
++#define DT_ADDRRNGLO	0x6ffffe00
++#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
++#define DT_TLSDESC_PLT	0x6ffffef6
++#define DT_TLSDESC_GOT	0x6ffffef7
++#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
++#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
++#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
++#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
++#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
++#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
++#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
++#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
++#define DT_ADDRRNGHI	0x6ffffeff
++#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
++#define DT_ADDRNUM 11
++
++/* The versioning entry types.  The next are defined as part of the
++   GNU extension.  */
++#define DT_VERSYM	0x6ffffff0
++
++#define DT_RELACOUNT	0x6ffffff9
++#define DT_RELCOUNT	0x6ffffffa
++
++/* These were chosen by Sun.  */
++#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
++#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
++					   table */
++#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
++#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
++					   versions */
++#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
++#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
++#define DT_VERSIONTAGNUM 16
++
++/* Sun added these machine-independent extensions in the "processor-specific"
++   range.  Be compatible.  */
++#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
++#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
++#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
++#define DT_EXTRANUM	3
++
++/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
++#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
++#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
++#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
++#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
++#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
++
++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
++   entry in the dynamic section.  */
++#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
++#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
++#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
++#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
++#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
++#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
++#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
++#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
++#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
++#define DF_1_TRANS	0x00000200
++#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
++#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
++#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
++#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
++#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
++#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
++#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
++
++/* Flags for the feature selection in DT_FEATURE_1.  */
++#define DTF_1_PARINIT	0x00000001
++#define DTF_1_CONFEXP	0x00000002
++
++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
++#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
++#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
++					   generally available.  */
++
++/* Version definition sections.  */
++
++typedef struct
++{
++  Elf32_Half	vd_version;		/* Version revision */
++  Elf32_Half	vd_flags;		/* Version information */
++  Elf32_Half	vd_ndx;			/* Version Index */
++  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vd_hash;		/* Version name hash value */
++  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf32_Verdef;
++
++typedef struct
++{
++  Elf64_Half	vd_version;		/* Version revision */
++  Elf64_Half	vd_flags;		/* Version information */
++  Elf64_Half	vd_ndx;			/* Version Index */
++  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vd_hash;		/* Version name hash value */
++  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf64_Verdef;
++
++
++/* Legal values for vd_version (version revision).  */
++#define VER_DEF_NONE	0		/* No version */
++#define VER_DEF_CURRENT	1		/* Current version */
++#define VER_DEF_NUM	2		/* Given version number */
++
++/* Legal values for vd_flags (version information flags).  */
++#define VER_FLG_BASE	0x1		/* Version definition of file itself */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++/* Versym symbol index values.  */
++#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
++#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
++#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
++#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
++
++/* Auxialiary version information.  */
++
++typedef struct
++{
++  Elf32_Word	vda_name;		/* Version or dependency names */
++  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf32_Verdaux;
++
++typedef struct
++{
++  Elf64_Word	vda_name;		/* Version or dependency names */
++  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf64_Verdaux;
++
++
++/* Version dependency section.  */
++
++typedef struct
++{
++  Elf32_Half	vn_version;		/* Version of structure */
++  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf32_Verneed;
++
++typedef struct
++{
++  Elf64_Half	vn_version;		/* Version of structure */
++  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf64_Verneed;
++
++
++/* Legal values for vn_version (version revision).  */
++#define VER_NEED_NONE	 0		/* No version */
++#define VER_NEED_CURRENT 1		/* Current version */
++#define VER_NEED_NUM	 2		/* Given version number */
++
++/* Auxiliary needed version information.  */
++
++typedef struct
++{
++  Elf32_Word	vna_hash;		/* Hash value of dependency name */
++  Elf32_Half	vna_flags;		/* Dependency specific information */
++  Elf32_Half	vna_other;		/* Unused */
++  Elf32_Word	vna_name;		/* Dependency name string offset */
++  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf32_Vernaux;
++
++typedef struct
++{
++  Elf64_Word	vna_hash;		/* Hash value of dependency name */
++  Elf64_Half	vna_flags;		/* Dependency specific information */
++  Elf64_Half	vna_other;		/* Unused */
++  Elf64_Word	vna_name;		/* Dependency name string offset */
++  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf64_Vernaux;
++
++
++/* Legal values for vna_flags.  */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++
++/* Auxiliary vector.  */
++
++/* This vector is normally only used by the program interpreter.  The
++   usual definition in an ABI supplement uses the name auxv_t.  The
++   vector is not usually defined in a standard <elf.h> file, but it
++   can't hurt.  We rename it to avoid conflicts.  The sizes of these
++   types are an arrangement between the exec server and the program
++   interpreter, so we don't fully specify them here.  */
++
++typedef struct
++{
++  uint32_t a_type;		/* Entry type */
++  union
++    {
++      uint32_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf32_auxv_t;
++
++typedef struct
++{
++  uint64_t a_type;		/* Entry type */
++  union
++    {
++      uint64_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf64_auxv_t;
++
++/* Legal values for a_type (entry type).  */
++
++#define AT_NULL		0		/* End of vector */
++#define AT_IGNORE	1		/* Entry should be ignored */
++#define AT_EXECFD	2		/* File descriptor of program */
++#define AT_PHDR		3		/* Program headers for program */
++#define AT_PHENT	4		/* Size of program header entry */
++#define AT_PHNUM	5		/* Number of program headers */
++#define AT_PAGESZ	6		/* System page size */
++#define AT_BASE		7		/* Base address of interpreter */
++#define AT_FLAGS	8		/* Flags */
++#define AT_ENTRY	9		/* Entry point of program */
++#define AT_NOTELF	10		/* Program is not ELF */
++#define AT_UID		11		/* Real uid */
++#define AT_EUID		12		/* Effective uid */
++#define AT_GID		13		/* Real gid */
++#define AT_EGID		14		/* Effective gid */
++#define AT_CLKTCK	17		/* Frequency of times() */
++
++/* Some more special a_type values describing the hardware.  */
++#define AT_PLATFORM	15		/* String identifying platform.  */
++#define AT_HWCAP	16		/* Machine dependent hints about
++					   processor capabilities.  */
++
++/* This entry gives some information about the FPU initialization
++   performed by the kernel.  */
++#define AT_FPUCW	18		/* Used FPU control word.  */
++
++/* Cache block sizes.  */
++#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
++#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
++#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
++
++/* A special ignored value for PPC, used by the kernel to control the
++   interpretation of the AUXV. Must be > 16.  */
++#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
++
++#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
++
++#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
++
++#define AT_RANDOM	25		/* Address of 16 random bytes.  */
++
++#define AT_EXECFN	31		/* Filename of executable.  */
++
++/* Pointer to the global system page used for system calls and other
++   nice things.  */
++#define AT_SYSINFO	32
++#define AT_SYSINFO_EHDR	33
++
++/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
++   log2 of line size; mask those to get cache size.  */
++#define AT_L1I_CACHESHAPE	34
++#define AT_L1D_CACHESHAPE	35
++#define AT_L2_CACHESHAPE	36
++#define AT_L3_CACHESHAPE	37
++
++/* Note section contents.  Each entry in the note section begins with
++   a header of a fixed form.  */
++
++typedef struct
++{
++  Elf32_Word n_namesz;			/* Length of the note's name.  */
++  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf32_Word n_type;			/* Type of the note.  */
++} Elf32_Nhdr;
++
++typedef struct
++{
++  Elf64_Word n_namesz;			/* Length of the note's name.  */
++  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf64_Word n_type;			/* Type of the note.  */
++} Elf64_Nhdr;
++
++/* Known names of notes.  */
++
++/* Solaris entries in the note section have this name.  */
++#define ELF_NOTE_SOLARIS	"SUNW Solaris"
++
++/* Note entries for GNU systems have this name.  */
++#define ELF_NOTE_GNU		"GNU"
++
++
++/* Defined types of notes for Solaris.  */
++
++/* Value of descriptor (one word) is desired pagesize for the binary.  */
++#define ELF_NOTE_PAGESIZE_HINT	1
++
++
++/* Defined note types for GNU systems.  */
++
++/* ABI information.  The descriptor consists of words:
++   word 0: OS descriptor
++   word 1: major version of the ABI
++   word 2: minor version of the ABI
++   word 3: subminor version of the ABI
++*/
++#define NT_GNU_ABI_TAG	1
++#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
++
++/* Known OSes.  These values can appear in word 0 of an
++   NT_GNU_ABI_TAG note section entry.  */
++#define ELF_NOTE_OS_LINUX	0
++#define ELF_NOTE_OS_GNU		1
++#define ELF_NOTE_OS_SOLARIS2	2
++#define ELF_NOTE_OS_FREEBSD	3
++
++/* Synthetic hwcap information.  The descriptor begins with two words:
++   word 0: number of entries
++   word 1: bitmask of enabled entries
++   Then follow variable-length entries, one byte followed by a
++   '\0'-terminated hwcap name string.  The byte gives the bit
++   number to test if enabled, (1U << bit) & bitmask.  */
++#define NT_GNU_HWCAP	2
++
++/* Build ID bits as generated by ld --build-id.
++   The descriptor consists of any nonzero number of bytes.  */
++#define NT_GNU_BUILD_ID	3
++
++/* Version note generated by GNU gold containing a version string.  */
++#define NT_GNU_GOLD_VERSION	4
++
++
++/* Move records.  */
++typedef struct
++{
++  Elf32_Xword m_value;		/* Symbol value.  */
++  Elf32_Word m_info;		/* Size and index.  */
++  Elf32_Word m_poffset;		/* Symbol offset.  */
++  Elf32_Half m_repeat;		/* Repeat count.  */
++  Elf32_Half m_stride;		/* Stride info.  */
++} Elf32_Move;
++
++typedef struct
++{
++  Elf64_Xword m_value;		/* Symbol value.  */
++  Elf64_Xword m_info;		/* Size and index.  */
++  Elf64_Xword m_poffset;	/* Symbol offset.  */
++  Elf64_Half m_repeat;		/* Repeat count.  */
++  Elf64_Half m_stride;		/* Stride info.  */
++} Elf64_Move;
++
++/* Macro to construct move records.  */
++#define ELF32_M_SYM(info)	((info) >> 8)
++#define ELF32_M_SIZE(info)	((unsigned char) (info))
++#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
++
++#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
++#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
++#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
++
++
++/* Motorola 68k specific definitions.  */
++
++/* Values for Elf32_Ehdr.e_flags.  */
++#define EF_CPU32	0x00810000
++
++/* m68k relocs.  */
++
++#define R_68K_NONE	0		/* No reloc */
++#define R_68K_32	1		/* Direct 32 bit  */
++#define R_68K_16	2		/* Direct 16 bit  */
++#define R_68K_8		3		/* Direct 8 bit  */
++#define R_68K_PC32	4		/* PC relative 32 bit */
++#define R_68K_PC16	5		/* PC relative 16 bit */
++#define R_68K_PC8	6		/* PC relative 8 bit */
++#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
++#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
++#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
++#define R_68K_GOT32O	10		/* 32 bit GOT offset */
++#define R_68K_GOT16O	11		/* 16 bit GOT offset */
++#define R_68K_GOT8O	12		/* 8 bit GOT offset */
++#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
++#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
++#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
++#define R_68K_PLT32O	16		/* 32 bit PLT offset */
++#define R_68K_PLT16O	17		/* 16 bit PLT offset */
++#define R_68K_PLT8O	18		/* 8 bit PLT offset */
++#define R_68K_COPY	19		/* Copy symbol at runtime */
++#define R_68K_GLOB_DAT	20		/* Create GOT entry */
++#define R_68K_JMP_SLOT	21		/* Create PLT entry */
++#define R_68K_RELATIVE	22		/* Adjust by program base */
++#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
++#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
++#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
++#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
++#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
++#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
++#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
++#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
++#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
++#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
++#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
++#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
++#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
++#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
++#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
++/* Keep this the last entry.  */
++#define R_68K_NUM	43
++
++/* Intel 80386 specific definitions.  */
++
++/* i386 relocs.  */
++
++#define R_386_NONE	   0		/* No reloc */
++#define R_386_32	   1		/* Direct 32 bit  */
++#define R_386_PC32	   2		/* PC relative 32 bit */
++#define R_386_GOT32	   3		/* 32 bit GOT entry */
++#define R_386_PLT32	   4		/* 32 bit PLT address */
++#define R_386_COPY	   5		/* Copy symbol at runtime */
++#define R_386_GLOB_DAT	   6		/* Create GOT entry */
++#define R_386_JMP_SLOT	   7		/* Create PLT entry */
++#define R_386_RELATIVE	   8		/* Adjust by program base */
++#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
++#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
++#define R_386_32PLT	   11
++#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
++#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
++					   block offset */
++#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
++					   offset */
++#define R_386_TLS_LE	   17		/* Offset relative to static TLS
++					   block */
++#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
++					   general dynamic thread local data */
++#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
++					   local dynamic thread local data
++					   in LE code */
++#define R_386_16	   20
++#define R_386_PC16	   21
++#define R_386_8		   22
++#define R_386_PC8	   23
++#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
++					   thread local data */
++#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
++#define R_386_TLS_GD_CALL  26		/* Relocation for call to
++					   __tls_get_addr() */
++#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
++#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
++					   thread local data in LE code */
++#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
++#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
++					   __tls_get_addr() in LDM code */
++#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
++#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
++#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
++					   block offset */
++#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
++					   TLS block */
++#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
++#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
++#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
++/* 38? */
++#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
++#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
++					   descriptor for
++					   relaxation.  */
++#define R_386_TLS_DESC     41		/* TLS descriptor containing
++					   pointer to code and to
++					   argument, returning the TLS
++					   offset for the symbol.  */
++#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
++/* Keep this the last entry.  */
++#define R_386_NUM	   43
++
++/* SUN SPARC specific definitions.  */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
++
++/* Values for Elf64_Ehdr.e_flags.  */
++
++#define EF_SPARCV9_MM		3
++#define EF_SPARCV9_TSO		0
++#define EF_SPARCV9_PSO		1
++#define EF_SPARCV9_RMO		2
++#define EF_SPARC_LEDATA		0x800000 /* little endian data */
++#define EF_SPARC_EXT_MASK	0xFFFF00
++#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
++#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
++#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
++#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
++
++/* SPARC relocs.  */
++
++#define R_SPARC_NONE		0	/* No reloc */
++#define R_SPARC_8		1	/* Direct 8 bit */
++#define R_SPARC_16		2	/* Direct 16 bit */
++#define R_SPARC_32		3	/* Direct 32 bit */
++#define R_SPARC_DISP8		4	/* PC relative 8 bit */
++#define R_SPARC_DISP16		5	/* PC relative 16 bit */
++#define R_SPARC_DISP32		6	/* PC relative 32 bit */
++#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
++#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
++#define R_SPARC_HI22		9	/* High 22 bit */
++#define R_SPARC_22		10	/* Direct 22 bit */
++#define R_SPARC_13		11	/* Direct 13 bit */
++#define R_SPARC_LO10		12	/* Truncated 10 bit */
++#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
++#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
++#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
++#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
++#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
++#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
++#define R_SPARC_COPY		19	/* Copy symbol at runtime */
++#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
++#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
++#define R_SPARC_RELATIVE	22	/* Adjust by program base */
++#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
++
++/* Additional Sparc64 relocs.  */
++
++#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
++#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
++#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
++#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
++#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
++#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
++#define R_SPARC_10		30	/* Direct 10 bit */
++#define R_SPARC_11		31	/* Direct 11 bit */
++#define R_SPARC_64		32	/* Direct 64 bit */
++#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
++#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
++#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
++#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
++#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
++#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
++#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
++#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
++#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
++#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
++#define R_SPARC_7		43	/* Direct 7 bit */
++#define R_SPARC_5		44	/* Direct 5 bit */
++#define R_SPARC_6		45	/* Direct 6 bit */
++#define R_SPARC_DISP64		46	/* PC relative 64 bit */
++#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
++#define R_SPARC_HIX22		48	/* High 22 bit complemented */
++#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
++#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
++#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
++#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
++#define R_SPARC_REGISTER	53	/* Global register usage */
++#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
++#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
++#define R_SPARC_TLS_GD_HI22	56
++#define R_SPARC_TLS_GD_LO10	57
++#define R_SPARC_TLS_GD_ADD	58
++#define R_SPARC_TLS_GD_CALL	59
++#define R_SPARC_TLS_LDM_HI22	60
++#define R_SPARC_TLS_LDM_LO10	61
++#define R_SPARC_TLS_LDM_ADD	62
++#define R_SPARC_TLS_LDM_CALL	63
++#define R_SPARC_TLS_LDO_HIX22	64
++#define R_SPARC_TLS_LDO_LOX10	65
++#define R_SPARC_TLS_LDO_ADD	66
++#define R_SPARC_TLS_IE_HI22	67
++#define R_SPARC_TLS_IE_LO10	68
++#define R_SPARC_TLS_IE_LD	69
++#define R_SPARC_TLS_IE_LDX	70
++#define R_SPARC_TLS_IE_ADD	71
++#define R_SPARC_TLS_LE_HIX22	72
++#define R_SPARC_TLS_LE_LOX10	73
++#define R_SPARC_TLS_DTPMOD32	74
++#define R_SPARC_TLS_DTPMOD64	75
++#define R_SPARC_TLS_DTPOFF32	76
++#define R_SPARC_TLS_DTPOFF64	77
++#define R_SPARC_TLS_TPOFF32	78
++#define R_SPARC_TLS_TPOFF64	79
++#define R_SPARC_GOTDATA_HIX22	80
++#define R_SPARC_GOTDATA_LOX10	81
++#define R_SPARC_GOTDATA_OP_HIX22	82
++#define R_SPARC_GOTDATA_OP_LOX10	83
++#define R_SPARC_GOTDATA_OP	84
++#define R_SPARC_H34		85
++#define R_SPARC_SIZE32		86
++#define R_SPARC_SIZE64		87
++#define R_SPARC_WDISP10		88
++#define R_SPARC_JMP_IREL	248
++#define R_SPARC_IRELATIVE	249
++#define R_SPARC_GNU_VTINHERIT	250
++#define R_SPARC_GNU_VTENTRY	251
++#define R_SPARC_REV32		252
++/* Keep this the last entry.  */
++#define R_SPARC_NUM		253
++
++/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
++
++#define DT_SPARC_REGISTER 0x70000001
++#define DT_SPARC_NUM	2
++
++/* MIPS R3000 specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
++#define EF_MIPS_PIC	    2		/* Contains PIC code */
++#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
++#define EF_MIPS_XGOT	    8
++#define EF_MIPS_64BIT_WHIRL 16
++#define EF_MIPS_ABI2	    32
++#define EF_MIPS_ABI_ON32    64
++#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
++
++/* Legal values for MIPS architecture level.  */
++
++#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
++#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
++#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
++#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
++#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
++#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
++#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
++
++/* The following are non-official names and should not be used.  */
++
++#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
++#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
++#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
++#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
++#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
++#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
++#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
++
++/* Special section indices.  */
++
++#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
++#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
++#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
++#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
++#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
++#define SHT_MIPS_MSYM	       0x70000001
++#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
++#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
++#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
++#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
++#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
++#define SHT_MIPS_PACKAGE       0x70000007
++#define SHT_MIPS_PACKSYM       0x70000008
++#define SHT_MIPS_RELD	       0x70000009
++#define SHT_MIPS_IFACE         0x7000000b
++#define SHT_MIPS_CONTENT       0x7000000c
++#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
++#define SHT_MIPS_SHDR	       0x70000010
++#define SHT_MIPS_FDESC	       0x70000011
++#define SHT_MIPS_EXTSYM	       0x70000012
++#define SHT_MIPS_DENSE	       0x70000013
++#define SHT_MIPS_PDESC	       0x70000014
++#define SHT_MIPS_LOCSYM	       0x70000015
++#define SHT_MIPS_AUXSYM	       0x70000016
++#define SHT_MIPS_OPTSYM	       0x70000017
++#define SHT_MIPS_LOCSTR	       0x70000018
++#define SHT_MIPS_LINE	       0x70000019
++#define SHT_MIPS_RFDESC	       0x7000001a
++#define SHT_MIPS_DELTASYM      0x7000001b
++#define SHT_MIPS_DELTAINST     0x7000001c
++#define SHT_MIPS_DELTACLASS    0x7000001d
++#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
++#define SHT_MIPS_DELTADECL     0x7000001f
++#define SHT_MIPS_SYMBOL_LIB    0x70000020
++#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
++#define SHT_MIPS_TRANSLATE     0x70000022
++#define SHT_MIPS_PIXIE	       0x70000023
++#define SHT_MIPS_XLATE	       0x70000024
++#define SHT_MIPS_XLATE_DEBUG   0x70000025
++#define SHT_MIPS_WHIRL	       0x70000026
++#define SHT_MIPS_EH_REGION     0x70000027
++#define SHT_MIPS_XLATE_OLD     0x70000028
++#define SHT_MIPS_PDR_EXCEPTION 0x70000029
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
++#define SHF_MIPS_MERGE	 0x20000000
++#define SHF_MIPS_ADDR	 0x40000000
++#define SHF_MIPS_STRINGS 0x80000000
++#define SHF_MIPS_NOSTRIP 0x08000000
++#define SHF_MIPS_LOCAL	 0x04000000
++#define SHF_MIPS_NAMES	 0x02000000
++#define SHF_MIPS_NODUPE	 0x01000000
++
++
++/* Symbol tables.  */
++
++/* MIPS specific values for `st_other'.  */
++#define STO_MIPS_DEFAULT		0x0
++#define STO_MIPS_INTERNAL		0x1
++#define STO_MIPS_HIDDEN			0x2
++#define STO_MIPS_PROTECTED		0x3
++#define STO_MIPS_PLT			0x8
++#define STO_MIPS_SC_ALIGN_UNUSED	0xff
++
++/* MIPS specific values for `st_info'.  */
++#define STB_MIPS_SPLIT_COMMON		13
++
++/* Entries found in sections of type SHT_MIPS_GPTAB.  */
++
++typedef union
++{
++  struct
++    {
++      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
++      Elf32_Word gt_unused;		/* Not used */
++    } gt_header;			/* First entry in section */
++  struct
++    {
++      Elf32_Word gt_g_value;		/* If this value were used for -G */
++      Elf32_Word gt_bytes;		/* This many bytes would be used */
++    } gt_entry;				/* Subsequent entries in section */
++} Elf32_gptab;
++
++/* Entry found in sections of type SHT_MIPS_REGINFO.  */
++
++typedef struct
++{
++  Elf32_Word	ri_gprmask;		/* General registers used */
++  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
++  Elf32_Sword	ri_gp_value;		/* $gp register value */
++} Elf32_RegInfo;
++
++/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
++
++typedef struct
++{
++  unsigned char kind;		/* Determines interpretation of the
++				   variable part of descriptor.  */
++  unsigned char size;		/* Size of descriptor, including header.  */
++  Elf32_Section section;	/* Section header index of section affected,
++				   0 for global options.  */
++  Elf32_Word info;		/* Kind-specific information.  */
++} Elf_Options;
++
++/* Values for `kind' field in Elf_Options.  */
++
++#define ODK_NULL	0	/* Undefined.  */
++#define ODK_REGINFO	1	/* Register usage information.  */
++#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
++#define ODK_PAD		3	/* Section padding options.  */
++#define ODK_HWPATCH	4	/* Hardware workarounds performed */
++#define ODK_FILL	5	/* record the fill value used by the linker. */
++#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
++#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
++#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
++
++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
++
++#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
++#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
++#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
++#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
++#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
++#define OEX_PRECISEFP	OEX_FPDBUG
++#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
++
++#define OEX_FPU_INVAL	0x10
++#define OEX_FPU_DIV0	0x08
++#define OEX_FPU_OFLO	0x04
++#define OEX_FPU_UFLO	0x02
++#define OEX_FPU_INEX	0x01
++
++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
++
++#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
++#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
++#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
++#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
++
++#define OPAD_PREFIX	0x1
++#define OPAD_POSTFIX	0x2
++#define OPAD_SYMBOL	0x4
++
++/* Entry found in `.options' section.  */
++
++typedef struct
++{
++  Elf32_Word hwp_flags1;	/* Extra flags.  */
++  Elf32_Word hwp_flags2;	/* Extra flags.  */
++} Elf_Options_Hw;
++
++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
++
++#define OHWA0_R4KEOP_CHECKED	0x00000001
++#define OHWA1_R4KEOP_CLEAN	0x00000002
++
++/* MIPS relocs.  */
++
++#define R_MIPS_NONE		0	/* No reloc */
++#define R_MIPS_16		1	/* Direct 16 bit */
++#define R_MIPS_32		2	/* Direct 32 bit */
++#define R_MIPS_REL32		3	/* PC relative 32 bit */
++#define R_MIPS_26		4	/* Direct 26 bit shifted */
++#define R_MIPS_HI16		5	/* High 16 bit */
++#define R_MIPS_LO16		6	/* Low 16 bit */
++#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
++#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
++#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
++#define R_MIPS_PC16		10	/* PC relative 16 bit */
++#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
++#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
++
++#define R_MIPS_SHIFT5		16
++#define R_MIPS_SHIFT6		17
++#define R_MIPS_64		18
++#define R_MIPS_GOT_DISP		19
++#define R_MIPS_GOT_PAGE		20
++#define R_MIPS_GOT_OFST		21
++#define R_MIPS_GOT_HI16		22
++#define R_MIPS_GOT_LO16		23
++#define R_MIPS_SUB		24
++#define R_MIPS_INSERT_A		25
++#define R_MIPS_INSERT_B		26
++#define R_MIPS_DELETE		27
++#define R_MIPS_HIGHER		28
++#define R_MIPS_HIGHEST		29
++#define R_MIPS_CALL_HI16	30
++#define R_MIPS_CALL_LO16	31
++#define R_MIPS_SCN_DISP		32
++#define R_MIPS_REL16		33
++#define R_MIPS_ADD_IMMEDIATE	34
++#define R_MIPS_PJUMP		35
++#define R_MIPS_RELGOT		36
++#define R_MIPS_JALR		37
++#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
++#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
++#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
++#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
++#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
++#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
++#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
++#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
++#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
++#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
++#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
++#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
++#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
++#define R_MIPS_GLOB_DAT		51
++#define R_MIPS_COPY		126
++#define R_MIPS_JUMP_SLOT        127
++/* Keep this the last entry.  */
++#define R_MIPS_NUM		128
++
++/* Legal values for p_type field of Elf32_Phdr.  */
++
++#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
++#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
++#define PT_MIPS_OPTIONS 0x70000002
++
++/* Special program header types.  */
++
++#define PF_MIPS_LOCAL	0x10000000
++
++/* Legal values for d_tag field of Elf32_Dyn.  */
++
++#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
++#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
++#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
++#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
++#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
++#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
++#define DT_MIPS_MSYM	     0x70000007
++#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
++#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
++#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
++#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
++#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
++#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
++#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
++#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
++#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
++#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
++#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
++#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
++						DT_MIPS_DELTA_CLASS.  */
++#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
++						DT_MIPS_DELTA_INSTANCE.  */
++#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
++					     DT_MIPS_DELTA_RELOC.  */
++#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
++					   relocations refer to.  */
++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
++					   DT_MIPS_DELTA_SYM.  */
++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
++					     class declaration.  */
++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
++						DT_MIPS_DELTA_CLASSSYM.  */
++#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
++#define DT_MIPS_PIXIE_INIT   0x70000023
++#define DT_MIPS_SYMBOL_LIB   0x70000024
++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
++#define DT_MIPS_LOCAL_GOTIDX 0x70000026
++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
++#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
++#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
++						    function stored in GOT.  */
++#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
++					   by rld on dlopen() calls.  */
++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
++#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
++#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
++/* The address of .got.plt in an executable using the new non-PIC ABI.  */
++#define DT_MIPS_PLTGOT	     0x70000032
++/* The base of the PLT in an executable using the new non-PIC ABI if that
++   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
++   value.  */
++#define DT_MIPS_RWPLT        0x70000034
++#define DT_MIPS_NUM	     0x35
++
++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
++
++#define RHF_NONE		   0		/* No flags */
++#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
++#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
++#define RHF_NO_MOVE		   (1 << 3)
++#define RHF_SGI_ONLY		   (1 << 4)
++#define RHF_GUARANTEE_INIT	   (1 << 5)
++#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
++#define RHF_GUARANTEE_START_INIT   (1 << 7)
++#define RHF_PIXIE		   (1 << 8)
++#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
++#define RHF_REQUICKSTART	   (1 << 10)
++#define RHF_REQUICKSTARTED	   (1 << 11)
++#define RHF_CORD		   (1 << 12)
++#define RHF_NO_UNRES_UNDEF	   (1 << 13)
++#define RHF_RLD_ORDER_SAFE	   (1 << 14)
++
++/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
++
++typedef struct
++{
++  Elf32_Word l_name;		/* Name (string table index) */
++  Elf32_Word l_time_stamp;	/* Timestamp */
++  Elf32_Word l_checksum;	/* Checksum */
++  Elf32_Word l_version;		/* Interface version */
++  Elf32_Word l_flags;		/* Flags */
++} Elf32_Lib;
++
++typedef struct
++{
++  Elf64_Word l_name;		/* Name (string table index) */
++  Elf64_Word l_time_stamp;	/* Timestamp */
++  Elf64_Word l_checksum;	/* Checksum */
++  Elf64_Word l_version;		/* Interface version */
++  Elf64_Word l_flags;		/* Flags */
++} Elf64_Lib;
++
++
++/* Legal values for l_flags.  */
++
++#define LL_NONE		  0
++#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
++#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
++#define LL_REQUIRE_MINOR  (1 << 2)
++#define LL_EXPORTS	  (1 << 3)
++#define LL_DELAY_LOAD	  (1 << 4)
++#define LL_DELTA	  (1 << 5)
++
++/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
++
++typedef Elf32_Addr Elf32_Conflict;
++
++
++/* HPPA specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
++#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
++#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
++#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
++#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
++					      prediction.  */
++#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
++#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
++
++/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
++
++#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
++#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
++#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
++
++/* Additional section indeces.  */
++
++#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
++					      symbols in ANSI C.  */
++#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
++#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
++#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
++#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
++#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
++
++#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
++#define STT_HP_STUB		(STT_LOOS + 0x2)
++
++/* HPPA relocs.  */
++
++#define R_PARISC_NONE		0	/* No reloc.  */
++#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
++#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
++#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
++#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
++#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
++#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
++#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
++#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
++#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
++#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
++#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
++#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
++#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
++#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
++#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
++#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
++#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
++#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
++#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
++#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
++#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
++#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
++#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
++#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
++#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
++#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
++#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
++#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
++#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
++#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
++#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
++#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
++#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
++#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
++#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
++#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
++#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
++#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
++#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
++#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
++#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
++#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LORESERVE	128
++#define R_PARISC_COPY		128	/* Copy relocation.  */
++#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
++#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
++#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
++#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
++#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
++#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
++#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
++#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
++#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_GNU_VTENTRY	232
++#define R_PARISC_GNU_VTINHERIT	233
++#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
++#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
++#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
++#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
++#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
++#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
++#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
++#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
++#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
++#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
++#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
++#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
++#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
++#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
++#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
++#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
++#define R_PARISC_HIRESERVE	255
++
++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PT_HP_TLS		(PT_LOOS + 0x0)
++#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
++#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
++#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
++#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
++#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
++#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
++#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
++#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
++#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
++#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
++#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
++#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
++#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
++#define PT_HP_STACK		(PT_LOOS + 0x14)
++
++#define PT_PARISC_ARCHEXT	0x70000000
++#define PT_PARISC_UNWIND	0x70000001
++
++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PF_PARISC_SBP		0x08000000
++
++#define PF_HP_PAGE_SIZE		0x00100000
++#define PF_HP_FAR_SHARED	0x00200000
++#define PF_HP_NEAR_SHARED	0x00400000
++#define PF_HP_CODE		0x01000000
++#define PF_HP_MODIFY		0x02000000
++#define PF_HP_LAZYSWAP		0x04000000
++#define PF_HP_SBP		0x08000000
++
++
++/* Alpha specific definitions.  */
++
++/* Legal values for e_flags field of Elf64_Ehdr.  */
++
++#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
++#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
++
++/* Legal values for sh_type field of Elf64_Shdr.  */
++
++/* These two are primerily concerned with ECOFF debugging info.  */
++#define SHT_ALPHA_DEBUG		0x70000001
++#define SHT_ALPHA_REGINFO	0x70000002
++
++/* Legal values for sh_flags field of Elf64_Shdr.  */
++
++#define SHF_ALPHA_GPREL		0x10000000
++
++/* Legal values for st_other field of Elf64_Sym.  */
++#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
++#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
++
++/* Alpha relocs.  */
++
++#define R_ALPHA_NONE		0	/* No reloc */
++#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
++#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
++#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
++#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
++#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
++#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
++#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
++#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
++#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
++#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
++#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
++#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
++#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
++#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
++#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
++#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
++#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
++#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
++#define R_ALPHA_TLS_GD_HI	28
++#define R_ALPHA_TLSGD		29
++#define R_ALPHA_TLS_LDM		30
++#define R_ALPHA_DTPMOD64	31
++#define R_ALPHA_GOTDTPREL	32
++#define R_ALPHA_DTPREL64	33
++#define R_ALPHA_DTPRELHI	34
++#define R_ALPHA_DTPRELLO	35
++#define R_ALPHA_DTPREL16	36
++#define R_ALPHA_GOTTPREL	37
++#define R_ALPHA_TPREL64		38
++#define R_ALPHA_TPRELHI		39
++#define R_ALPHA_TPRELLO		40
++#define R_ALPHA_TPREL16		41
++/* Keep this the last entry.  */
++#define R_ALPHA_NUM		46
++
++/* Magic values of the LITUSE relocation addend.  */
++#define LITUSE_ALPHA_ADDR	0
++#define LITUSE_ALPHA_BASE	1
++#define LITUSE_ALPHA_BYTOFF	2
++#define LITUSE_ALPHA_JSR	3
++#define LITUSE_ALPHA_TLS_GD	4
++#define LITUSE_ALPHA_TLS_LDM	5
++
++/* Legal values for d_tag of Elf64_Dyn.  */
++#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
++#define DT_ALPHA_NUM		1
++
++/* PowerPC specific declarations */
++
++/* Values for Elf32/64_Ehdr.e_flags.  */
++#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
++
++/* Cygnus local bits below */
++#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
++#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
++						   flag */
++
++/* PowerPC relocations defined by the ABIs */
++#define R_PPC_NONE		0
++#define R_PPC_ADDR32		1	/* 32bit absolute address */
++#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
++#define R_PPC_ADDR16		3	/* 16bit absolute address */
++#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
++#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
++#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
++#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
++#define R_PPC_ADDR14_BRTAKEN	8
++#define R_PPC_ADDR14_BRNTAKEN	9
++#define R_PPC_REL24		10	/* PC relative 26 bit */
++#define R_PPC_REL14		11	/* PC relative 16 bit */
++#define R_PPC_REL14_BRTAKEN	12
++#define R_PPC_REL14_BRNTAKEN	13
++#define R_PPC_GOT16		14
++#define R_PPC_GOT16_LO		15
++#define R_PPC_GOT16_HI		16
++#define R_PPC_GOT16_HA		17
++#define R_PPC_PLTREL24		18
++#define R_PPC_COPY		19
++#define R_PPC_GLOB_DAT		20
++#define R_PPC_JMP_SLOT		21
++#define R_PPC_RELATIVE		22
++#define R_PPC_LOCAL24PC		23
++#define R_PPC_UADDR32		24
++#define R_PPC_UADDR16		25
++#define R_PPC_REL32		26
++#define R_PPC_PLT32		27
++#define R_PPC_PLTREL32		28
++#define R_PPC_PLT16_LO		29
++#define R_PPC_PLT16_HI		30
++#define R_PPC_PLT16_HA		31
++#define R_PPC_SDAREL16		32
++#define R_PPC_SECTOFF		33
++#define R_PPC_SECTOFF_LO	34
++#define R_PPC_SECTOFF_HI	35
++#define R_PPC_SECTOFF_HA	36
++
++/* PowerPC relocations defined for the TLS access ABI.  */
++#define R_PPC_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
++#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
++#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
++#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
++#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
++#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
++#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
++#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
++#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
++#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
++
++/* The remaining relocs are from the Embedded ELF ABI, and are not
++   in the SVR4 ELF ABI.  */
++#define R_PPC_EMB_NADDR32	101
++#define R_PPC_EMB_NADDR16	102
++#define R_PPC_EMB_NADDR16_LO	103
++#define R_PPC_EMB_NADDR16_HI	104
++#define R_PPC_EMB_NADDR16_HA	105
++#define R_PPC_EMB_SDAI16	106
++#define R_PPC_EMB_SDA2I16	107
++#define R_PPC_EMB_SDA2REL	108
++#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
++#define R_PPC_EMB_MRKREF	110
++#define R_PPC_EMB_RELSEC16	111
++#define R_PPC_EMB_RELST_LO	112
++#define R_PPC_EMB_RELST_HI	113
++#define R_PPC_EMB_RELST_HA	114
++#define R_PPC_EMB_BIT_FLD	115
++#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
++
++/* Diab tool relocations.  */
++#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
++#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
++#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
++#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
++#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
++#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC_IRELATIVE		248
++
++/* GNU relocs used in PIC code sequences.  */
++#define R_PPC_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
++#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
++#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
++
++/* This is a phony reloc to handle any old fashioned TOC16 references
++   that may still be in object files.  */
++#define R_PPC_TOC16		255
++
++/* PowerPC specific values for the Dyn d_tag field.  */
++#define DT_PPC_GOT		(DT_LOPROC + 0)
++#define DT_PPC_NUM		1
++
++/* PowerPC64 relocations defined by the ABIs */
++#define R_PPC64_NONE		R_PPC_NONE
++#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
++#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
++#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
++#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
++#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
++#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
++#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
++#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
++#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
++#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
++#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
++#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
++#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
++#define R_PPC64_GOT16		R_PPC_GOT16
++#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
++#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
++#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
++
++#define R_PPC64_COPY		R_PPC_COPY
++#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
++#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
++#define R_PPC64_RELATIVE	R_PPC_RELATIVE
++
++#define R_PPC64_UADDR32		R_PPC_UADDR32
++#define R_PPC64_UADDR16		R_PPC_UADDR16
++#define R_PPC64_REL32		R_PPC_REL32
++#define R_PPC64_PLT32		R_PPC_PLT32
++#define R_PPC64_PLTREL32	R_PPC_PLTREL32
++#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
++#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
++#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
++
++#define R_PPC64_SECTOFF		R_PPC_SECTOFF
++#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
++#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
++#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
++#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
++#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
++#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
++#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
++#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
++#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
++#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
++#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
++#define R_PPC64_PLT64		45 /* doubleword64 L + A */
++#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
++#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
++#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
++#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
++#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
++#define R_PPC64_TOC		51 /* doubleword64 .TOC */
++#define R_PPC64_PLTGOT16	52 /* half16* M + A */
++#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
++#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
++#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
++
++#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
++#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
++#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
++#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
++#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
++#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
++#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
++#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
++#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
++#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
++#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
++
++/* PowerPC64 relocations defined for the TLS access ABI.  */
++#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
++#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
++#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
++#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
++#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
++#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
++#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
++#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
++#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
++#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
++#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC64_JMP_IREL	247
++#define R_PPC64_IRELATIVE	248
++#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
++#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
++#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
++
++/* PowerPC64 specific values for the Dyn d_tag field.  */
++#define DT_PPC64_GLINK  (DT_LOPROC + 0)
++#define DT_PPC64_OPD	(DT_LOPROC + 1)
++#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
++#define DT_PPC64_NUM    3
++
++
++/* ARM specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_ARM_RELEXEC		0x01
++#define EF_ARM_HASENTRY		0x02
++#define EF_ARM_INTERWORK	0x04
++#define EF_ARM_APCS_26		0x08
++#define EF_ARM_APCS_FLOAT	0x10
++#define EF_ARM_PIC		0x20
++#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
++#define EF_ARM_NEW_ABI		0x80
++#define EF_ARM_OLD_ABI		0x100
++#define EF_ARM_SOFT_FLOAT	0x200
++#define EF_ARM_VFP_FLOAT	0x400
++#define EF_ARM_MAVERICK_FLOAT	0x800
++
++
++/* Other constants defined in the ARM ELF spec. version B-01.  */
++/* NB. These conflict with values defined above.  */
++#define EF_ARM_SYMSARESORTED	0x04
++#define EF_ARM_DYNSYMSUSESEGIDX	0x08
++#define EF_ARM_MAPSYMSFIRST	0x10
++#define EF_ARM_EABIMASK		0XFF000000
++
++/* Constants defined in AAELF.  */
++#define EF_ARM_BE8	    0x00800000
++#define EF_ARM_LE8	    0x00400000
++
++#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
++#define EF_ARM_EABI_UNKNOWN	0x00000000
++#define EF_ARM_EABI_VER1	0x01000000
++#define EF_ARM_EABI_VER2	0x02000000
++#define EF_ARM_EABI_VER3	0x03000000
++#define EF_ARM_EABI_VER4	0x04000000
++#define EF_ARM_EABI_VER5	0x05000000
++
++/* Additional symbol types for Thumb.  */
++#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
++#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
++
++/* ARM-specific values for sh_flags */
++#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
++#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
++					      in the input to a link step.  */
++
++/* ARM-specific program header flags */
++#define PF_ARM_SB		0x10000000 /* Segment contains the location
++					      addressed by the static base. */
++#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
++#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
++#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
++#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
++
++
++/* ARM relocs.  */
++
++#define R_ARM_NONE		0	/* No reloc */
++#define R_ARM_PC24		1	/* PC relative 26 bit branch */
++#define R_ARM_ABS32		2	/* Direct 32 bit  */
++#define R_ARM_REL32		3	/* PC relative 32 bit */
++#define R_ARM_PC13		4
++#define R_ARM_ABS16		5	/* Direct 16 bit */
++#define R_ARM_ABS12		6	/* Direct 12 bit */
++#define R_ARM_THM_ABS5		7
++#define R_ARM_ABS8		8	/* Direct 8 bit */
++#define R_ARM_SBREL32		9
++#define R_ARM_THM_PC22		10
++#define R_ARM_THM_PC8		11
++#define R_ARM_AMP_VCALL9	12
++#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
++#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
++#define R_ARM_THM_SWI8		14
++#define R_ARM_XPC25		15
++#define R_ARM_THM_XPC22		16
++#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
++#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
++#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
++#define R_ARM_COPY		20	/* Copy symbol at runtime */
++#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
++#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
++#define R_ARM_RELATIVE		23	/* Adjust by program base */
++#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
++#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
++#define R_ARM_GOT32		26	/* 32 bit GOT entry */
++#define R_ARM_PLT32		27	/* 32 bit PLT address */
++#define R_ARM_ALU_PCREL_7_0	32
++#define R_ARM_ALU_PCREL_15_8	33
++#define R_ARM_ALU_PCREL_23_15	34
++#define R_ARM_LDR_SBREL_11_0	35
++#define R_ARM_ALU_SBREL_19_12	36
++#define R_ARM_ALU_SBREL_27_20	37
++#define R_ARM_TLS_GOTDESC	90
++#define R_ARM_TLS_CALL		91
++#define R_ARM_TLS_DESCSEQ	92
++#define R_ARM_THM_TLS_CALL	93
++#define R_ARM_GNU_VTENTRY	100
++#define R_ARM_GNU_VTINHERIT	101
++#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
++#define R_ARM_THM_PC9		103	/* thumb conditional branch */
++#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
++					   thread local data */
++#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
++					   thread local data */
++#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
++					   block */
++#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
++					   static TLS block offset */
++#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
++					   TLS block */
++#define	R_ARM_THM_TLS_DESCSEQ	129
++#define R_ARM_IRELATIVE		160
++#define R_ARM_RXPC25		249
++#define R_ARM_RSBREL32		250
++#define R_ARM_THM_RPC22		251
++#define R_ARM_RREL32		252
++#define R_ARM_RABS22		253
++#define R_ARM_RPC24		254
++#define R_ARM_RBASE		255
++/* Keep this the last entry.  */
++#define R_ARM_NUM		256
++
++/* IA-64 specific declarations.  */
++
++/* Processor specific flags for the Ehdr e_flags field.  */
++#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
++#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
++#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
++#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
++#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
++#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
++#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
++
++/* Processor specific flags for the Phdr p_flags field.  */
++#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
++#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
++
++/* Processor specific flags for the Shdr sh_flags field.  */
++#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
++#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Dyn d_tag field.  */
++#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
++#define DT_IA_64_NUM		1
++
++/* IA-64 relocations.  */
++#define R_IA64_NONE		0x00	/* none */
++#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
++#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
++#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
++#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
++#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
++#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
++#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
++#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
++#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
++#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
++#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
++#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
++#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
++#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
++#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
++#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
++#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
++#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
++#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
++#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
++#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
++#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
++#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
++#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
++#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
++#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
++#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
++#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
++#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
++#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
++#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
++#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
++#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
++#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
++#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
++#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
++#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
++#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
++#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
++#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
++#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
++#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
++#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
++#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
++#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
++#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
++#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
++#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
++#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
++#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
++#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
++#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
++#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
++#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
++#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
++#define R_IA64_COPY		0x84	/* copy relocation */
++#define R_IA64_SUB		0x85	/* Addend and symbol difference */
++#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
++#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
++#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
++#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
++#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
++#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
++#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
++#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
++#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
++#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
++#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
++#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
++#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
++#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
++#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
++#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
++
++/* SH specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_SH_MACH_MASK		0x1f
++#define EF_SH_UNKNOWN		0x0
++#define EF_SH1			0x1
++#define EF_SH2			0x2
++#define EF_SH3			0x3
++#define EF_SH_DSP		0x4
++#define EF_SH3_DSP		0x5
++#define EF_SH4AL_DSP		0x6
++#define EF_SH3E			0x8
++#define EF_SH4			0x9
++#define EF_SH2E			0xb
++#define EF_SH4A			0xc
++#define EF_SH2A			0xd
++#define EF_SH4_NOFPU		0x10
++#define EF_SH4A_NOFPU		0x11
++#define EF_SH4_NOMMU_NOFPU	0x12
++#define EF_SH2A_NOFPU		0x13
++#define EF_SH3_NOMMU		0x14
++#define EF_SH2A_SH4_NOFPU	0x15
++#define EF_SH2A_SH3_NOFPU	0x16
++#define EF_SH2A_SH4		0x17
++#define EF_SH2A_SH3E		0x18
++
++/* SH relocs.  */
++#define	R_SH_NONE		0
++#define	R_SH_DIR32		1
++#define	R_SH_REL32		2
++#define	R_SH_DIR8WPN		3
++#define	R_SH_IND12W		4
++#define	R_SH_DIR8WPL		5
++#define	R_SH_DIR8WPZ		6
++#define	R_SH_DIR8BP		7
++#define	R_SH_DIR8W		8
++#define	R_SH_DIR8L		9
++#define	R_SH_SWITCH16		25
++#define	R_SH_SWITCH32		26
++#define	R_SH_USES		27
++#define	R_SH_COUNT		28
++#define	R_SH_ALIGN		29
++#define	R_SH_CODE		30
++#define	R_SH_DATA		31
++#define	R_SH_LABEL		32
++#define	R_SH_SWITCH8		33
++#define	R_SH_GNU_VTINHERIT	34
++#define	R_SH_GNU_VTENTRY	35
++#define	R_SH_TLS_GD_32		144
++#define	R_SH_TLS_LD_32		145
++#define	R_SH_TLS_LDO_32		146
++#define	R_SH_TLS_IE_32		147
++#define	R_SH_TLS_LE_32		148
++#define	R_SH_TLS_DTPMOD32	149
++#define	R_SH_TLS_DTPOFF32	150
++#define	R_SH_TLS_TPOFF32	151
++#define	R_SH_GOT32		160
++#define	R_SH_PLT32		161
++#define	R_SH_COPY		162
++#define	R_SH_GLOB_DAT		163
++#define	R_SH_JMP_SLOT		164
++#define	R_SH_RELATIVE		165
++#define	R_SH_GOTOFF		166
++#define	R_SH_GOTPC		167
++/* Keep this the last entry.  */
++#define	R_SH_NUM		256
++
++/* S/390 specific definitions.  */
++
++/* Valid values for the e_flags field.  */
++
++#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
++
++/* Additional s390 relocs */
++
++#define R_390_NONE		0	/* No reloc.  */
++#define R_390_8			1	/* Direct 8 bit.  */
++#define R_390_12		2	/* Direct 12 bit.  */
++#define R_390_16		3	/* Direct 16 bit.  */
++#define R_390_32		4	/* Direct 32 bit.  */
++#define R_390_PC32		5	/* PC relative 32 bit.	*/
++#define R_390_GOT12		6	/* 12 bit GOT offset.  */
++#define R_390_GOT32		7	/* 32 bit GOT offset.  */
++#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
++#define R_390_COPY		9	/* Copy symbol at runtime.  */
++#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
++#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
++#define R_390_RELATIVE		12	/* Adjust by program base.  */
++#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
++#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
++#define R_390_GOT16		15	/* 16 bit GOT offset.  */
++#define R_390_PC16		16	/* PC relative 16 bit.	*/
++#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
++#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
++#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
++#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
++#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
++#define R_390_64		22	/* Direct 64 bit.  */
++#define R_390_PC64		23	/* PC relative 64 bit.	*/
++#define R_390_GOT64		24	/* 64 bit GOT offset.  */
++#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
++#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
++#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
++#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
++#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
++#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
++#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
++#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
++#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
++#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
++#define R_390_TLS_GDCALL	38	/* Tag for function call in general
++					   dynamic TLS code. */
++#define R_390_TLS_LDCALL	39	/* Tag for function call in local
++					   dynamic TLS code. */
++#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
++					   thread local data.  */
++#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
++					  thread local data.  */
++#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
++					   block offset. */
++#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
++#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
++#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
++					   block.  */
++#define R_390_20		57	/* Direct 20 bit.  */
++#define R_390_GOT20		58	/* 20 bit GOT offset.  */
++#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
++#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
++/* Keep this the last entry.  */
++#define R_390_NUM		62
++
++
++/* CRIS relocations.  */
++#define R_CRIS_NONE		0
++#define R_CRIS_8		1
++#define R_CRIS_16		2
++#define R_CRIS_32		3
++#define R_CRIS_8_PCREL		4
++#define R_CRIS_16_PCREL		5
++#define R_CRIS_32_PCREL		6
++#define R_CRIS_GNU_VTINHERIT	7
++#define R_CRIS_GNU_VTENTRY	8
++#define R_CRIS_COPY		9
++#define R_CRIS_GLOB_DAT		10
++#define R_CRIS_JUMP_SLOT	11
++#define R_CRIS_RELATIVE		12
++#define R_CRIS_16_GOT		13
++#define R_CRIS_32_GOT		14
++#define R_CRIS_16_GOTPLT	15
++#define R_CRIS_32_GOTPLT	16
++#define R_CRIS_32_GOTREL	17
++#define R_CRIS_32_PLT_GOTREL	18
++#define R_CRIS_32_PLT_PCREL	19
++
++#define R_CRIS_NUM		20
++
++
++/* AMD x86-64 relocations.  */
++#define R_X86_64_NONE		0	/* No reloc */
++#define R_X86_64_64		1	/* Direct 64 bit  */
++#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
++#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
++#define R_X86_64_PLT32		4	/* 32 bit PLT address */
++#define R_X86_64_COPY		5	/* Copy symbol at runtime */
++#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
++#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
++#define R_X86_64_RELATIVE	8	/* Adjust by program base */
++#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
++					   offset to GOT */
++#define R_X86_64_32		10	/* Direct 32 bit zero extended */
++#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
++#define R_X86_64_16		12	/* Direct 16 bit zero extended */
++#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
++#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
++#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
++#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
++#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
++#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
++#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
++					   to two GOT entries for GD symbol */
++#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
++					   to two GOT entries for LD symbol */
++#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
++#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
++					   to GOT entry for IE symbol */
++#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
++#define R_X86_64_PC64		24	/* PC relative 64 bit */
++#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
++#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
++					   offset to GOT */
++#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
++#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
++					   to GOT entry */
++#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
++#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
++#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
++					   to PLT entry */
++#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
++#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
++#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
++#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
++					   descriptor.  */
++#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
++#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
++#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
++
++#define R_X86_64_NUM		39
++
++
++/* AM33 relocations.  */
++#define R_MN10300_NONE		0	/* No reloc.  */
++#define R_MN10300_32		1	/* Direct 32 bit.  */
++#define R_MN10300_16		2	/* Direct 16 bit.  */
++#define R_MN10300_8		3	/* Direct 8 bit.  */
++#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
++#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
++#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
++#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
++#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
++#define R_MN10300_24		9	/* Direct 24 bit.  */
++#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
++#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
++#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
++#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
++#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
++#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
++#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
++#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
++#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
++#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
++#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
++#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
++
++#define R_MN10300_NUM		24
++
++
++/* M32R relocs.  */
++#define R_M32R_NONE		0	/* No reloc. */
++#define R_M32R_16		1	/* Direct 16 bit. */
++#define R_M32R_32		2	/* Direct 32 bit. */
++#define R_M32R_24		3	/* Direct 24 bit. */
++#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
++#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
++#define R_M32R_LO16		9	/* Low 16 bit. */
++#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
++#define R_M32R_GNU_VTINHERIT	11
++#define R_M32R_GNU_VTENTRY	12
++/* M32R relocs use SHT_RELA.  */
++#define R_M32R_16_RELA		33	/* Direct 16 bit. */
++#define R_M32R_32_RELA		34	/* Direct 32 bit. */
++#define R_M32R_24_RELA		35	/* Direct 24 bit. */
++#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
++#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
++#define R_M32R_LO16_RELA	41	/* Low 16 bit */
++#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
++#define R_M32R_RELA_GNU_VTINHERIT	43
++#define R_M32R_RELA_GNU_VTENTRY	44
++#define R_M32R_REL32		45	/* PC relative 32 bit.  */
++
++#define R_M32R_GOT24		48	/* 24 bit GOT entry */
++#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
++#define R_M32R_COPY		50	/* Copy symbol at runtime */
++#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
++#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
++#define R_M32R_RELATIVE		53	/* Adjust by program base */
++#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
++#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
++#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
++					   low */
++#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
++					   low */
++#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
++#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
++					   GOT with unsigned low */
++#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
++					   GOT with signed low */
++#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
++					   GOT */
++#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
++					   with unsigned low */
++#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
++					   with signed low */
++#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
++#define R_M32R_NUM		256	/* Keep this the last entry. */
++
++
++/* TILEPro relocations.  */
++#define R_TILEPRO_NONE		0	/* No reloc */
++#define R_TILEPRO_32		1	/* Direct 32 bit */
++#define R_TILEPRO_16		2	/* Direct 16 bit */
++#define R_TILEPRO_8		3	/* Direct 8 bit */
++#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
++#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
++#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
++#define R_TILEPRO_LO16		7	/* Low 16 bit */
++#define R_TILEPRO_HI16		8	/* High 16 bit */
++#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
++#define R_TILEPRO_COPY		10	/* Copy relocation */
++#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
++#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
++#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
++#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
++#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
++#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
++#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
++#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
++#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
++#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
++#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
++#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
++#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
++#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
++#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
++#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
++#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
++#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
++#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
++/* Relocs 56-59 are currently not defined.  */
++#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
++#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
++#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
++#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
++#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
++#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
++
++#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEPRO_NUM		130
++
++
++/* TILE-Gx relocations.  */
++#define R_TILEGX_NONE		0	/* No reloc */
++#define R_TILEGX_64		1	/* Direct 64 bit */
++#define R_TILEGX_32		2	/* Direct 32 bit */
++#define R_TILEGX_16		3	/* Direct 16 bit */
++#define R_TILEGX_8		4	/* Direct 8 bit */
++#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
++#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
++#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
++#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
++#define R_TILEGX_HW0		9	/* hword 0 16-bit */
++#define R_TILEGX_HW1		10	/* hword 1 16-bit */
++#define R_TILEGX_HW2		11	/* hword 2 16-bit */
++#define R_TILEGX_HW3		12	/* hword 3 16-bit */
++#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
++#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
++#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
++#define R_TILEGX_COPY		16	/* Copy relocation */
++#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
++#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
++#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
++#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
++#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
++#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
++#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
++#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
++#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
++#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
++#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
++#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
++#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
++#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
++#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
++#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
++#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
++#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
++#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
++#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
++#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
++#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
++#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
++#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
++#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
++#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
++#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
++/* Relocs 66-71 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
++#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
++/* Relocs 76-77 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
++/* Relocs 90-91 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
++/* Relocs 94-99 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
++/* Relocs 104-105 are currently not defined.  */
++#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
++#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
++#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
++#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
++#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
++
++#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEGX_NUM		130
++
++#endif	/* elf.h */
diff --git a/trunk/target/linux/generic/patches-3.3/211-stddef_include.patch b/trunk/target/linux/generic/patches-3.3/211-stddef_include.patch
new file mode 100644
index 00000000..7fe248d8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/211-stddef_include.patch
@@ -0,0 +1,17 @@
+--- a/include/linux/stddef.h
++++ b/include/linux/stddef.h
+@@ -16,6 +16,7 @@ enum {
+ 	false	= 0,
+ 	true	= 1
+ };
++#endif /* __KERNEL__ */
+ 
+ #undef offsetof
+ #ifdef __compiler_offsetof
+@@ -23,6 +24,5 @@ enum {
+ #else
+ #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+ #endif
+-#endif /* __KERNEL__ */
+ 
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.3/212-x86_reloc_portability.patch b/trunk/target/linux/generic/patches-3.3/212-x86_reloc_portability.patch
new file mode 100644
index 00000000..d0c8106a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/212-x86_reloc_portability.patch
@@ -0,0 +1,22 @@
+--- a/arch/x86/tools/relocs.c
++++ b/arch/x86/tools/relocs.c
+@@ -10,7 +10,18 @@
+ #define USE_BSD
+ #include <endian.h>
+ #include <regex.h>
+-#include <tools/le_byteshift.h>
++
++static inline void __put_unaligned_le16(uint16_t val, uint8_t *p)
++{
++	*p++ = val;
++	*p++ = val >> 8;
++}
++
++static inline void put_unaligned_le32(uint32_t val, uint8_t *p)
++{
++	__put_unaligned_le16(val >> 16, p + 2);
++	__put_unaligned_le16(val, p);
++}
+ 
+ static void die(char *fmt, ...);
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/220-module_exports.patch b/trunk/target/linux/generic/patches-3.3/220-module_exports.patch
new file mode 100644
index 00000000..5b87c1a3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/220-module_exports.patch
@@ -0,0 +1,91 @@
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -52,6 +52,18 @@
+ #define LOAD_OFFSET 0
+ #endif
+ 
++#ifndef SYMTAB_KEEP_STR
++#define SYMTAB_KEEP *(SORT(___ksymtab+*))
++#define SYMTAB_KEEP_GPL *(SORT(___ksymtab_gpl+*))
++#define SYMTAB_KEEP_STR *(__ksymtab_strings+*)
++#endif
++
++#ifndef SYMTAB_DISCARD
++#define SYMTAB_DISCARD
++#define SYMTAB_DISCARD_GPL
++#define SYMTAB_DISCARD_STR
++#endif
++
+ #ifndef SYMBOL_PREFIX
+ #define VMLINUX_SYMBOL(sym) sym
+ #else
+@@ -275,14 +287,14 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		*(SORT(___ksymtab+*))					\
++		SYMTAB_KEEP						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		*(SORT(___ksymtab_gpl+*))				\
++		SYMTAB_KEEP_GPL						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -344,7 +356,7 @@
+ 									\
+ 	/* Kernel symbol table: strings */				\
+         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
+-		*(__ksymtab_strings)					\
++		SYMTAB_KEEP_STR						\
+ 	}								\
+ 									\
+ 	/* __*init sections */						\
+@@ -676,6 +688,9 @@
+ 	EXIT_TEXT							\
+ 	EXIT_DATA							\
+ 	EXIT_CALL							\
++	SYMTAB_DISCARD							\
++	SYMTAB_DISCARD_GPL						\
++	SYMTAB_DISCARD_STR						\
+ 	*(.discard)							\
+ 	*(.discard.*)							\
+ 	}
+--- a/include/linux/export.h
++++ b/include/linux/export.h
+@@ -45,12 +45,19 @@ extern struct module __this_module;
+ #define __CRC_SYMBOL(sym, sec)
+ #endif
+ 
++#ifdef MODULE
++#define __EXPORT_SUFFIX(sym)
++#else
++#define __EXPORT_SUFFIX(sym) "+" #sym
++#endif
++
+ /* For every exported symbol, place a struct in the __ksymtab section */
+ #define __EXPORT_SYMBOL(sym, sec)				\
+ 	extern typeof(sym) sym;					\
+ 	__CRC_SYMBOL(sym, sec)					\
+ 	static const char __kstrtab_##sym[]			\
+-	__attribute__((section("__ksymtab_strings"), aligned(1))) \
++	__attribute__((section("__ksymtab_strings"		\
++	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
+ 	= MODULE_SYMBOL_PREFIX #sym;				\
+ 	static const struct kernel_symbol __ksymtab_##sym	\
+ 	__used							\
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -346,7 +346,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
+ # Linker scripts preprocessor (.lds.S -> .lds)
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds_S = LDS     $@
+-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
++      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \
+ 	                     -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
+ 
+ $(obj)/%.lds: $(src)/%.lds.S FORCE
diff --git a/trunk/target/linux/generic/patches-3.3/230-openwrt_lzma_options.patch b/trunk/target/linux/generic/patches-3.3/230-openwrt_lzma_options.patch
new file mode 100644
index 00000000..f713bdd7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/230-openwrt_lzma_options.patch
@@ -0,0 +1,54 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -296,7 +296,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -226,7 +226,7 @@ cpio_list=
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -n -9 -f"
++compr="gzip -n -9 -f -"
+ 
+ arg="$1"
+ case "$arg" in
+@@ -240,9 +240,9 @@ case "$arg" in
+ 		output_file="$1"
+ 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
+ 		output=${cpio_list}
+-		echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f"
+-		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+-		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
++		echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f -"
++		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
++		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
+ 		echo "$output_file" | grep -q "\.xz$" && \
+ 				compr="xz --check=crc32 --lzma2=dict=1MiB"
+ 		echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
+@@ -303,7 +303,7 @@ if [ ! -z ${output_file} ]; then
+ 	if [ "${is_cpio_compressed}" = "compressed" ]; then
+ 		cat ${cpio_tfile} > ${output_file}
+ 	else
+-		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
++		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
+ 		|| (rm -f ${output_file} ; false)
+ 	fi
+ 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
+--- a/lib/decompress.c
++++ b/lib/decompress.c
+@@ -40,6 +40,7 @@ static const struct compress_format {
+ 	{ {037, 0236}, "gzip", gunzip },
+ 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
+ 	{ {0x5d, 0x00}, "lzma", unlzma },
++	{ {0x6d, 0x00}, "lzma-librecmc", unlzma },
+ 	{ {0xfd, 0x37}, "xz", unxz },
+ 	{ {0x89, 0x4c}, "lzo", unlzo },
+ 	{ {0, 0}, NULL, NULL }
diff --git a/trunk/target/linux/generic/patches-3.3/250-netfilter_depends.patch b/trunk/target/linux/generic/patches-3.3/250-netfilter_depends.patch
new file mode 100644
index 00000000..cbe38923
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/250-netfilter_depends.patch
@@ -0,0 +1,18 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -181,7 +181,6 @@ config NF_CONNTRACK_FTP
+ 
+ config NF_CONNTRACK_H323
+ 	tristate "H.323 protocol support"
+-	depends on (IPV6 || IPV6=n)
+ 	depends on NETFILTER_ADVANCED
+ 	help
+ 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
+@@ -627,7 +626,6 @@ config NETFILTER_XT_TARGET_SECMARK
+ 
+ config NETFILTER_XT_TARGET_TCPMSS
+ 	tristate '"TCPMSS" target support'
+-	depends on (IPV6 || IPV6=n)
+ 	default m if NETFILTER_ADVANCED=n
+ 	---help---
+ 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/trunk/target/linux/generic/patches-3.3/251-sound_kconfig.patch b/trunk/target/linux/generic/patches-3.3/251-sound_kconfig.patch
new file mode 100644
index 00000000..916363c8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/251-sound_kconfig.patch
@@ -0,0 +1,18 @@
+--- a/sound/core/Kconfig
++++ b/sound/core/Kconfig
+@@ -7,13 +7,13 @@ config SND_PCM
+ 	select SND_TIMER
+ 
+ config SND_HWDEP
+-	tristate
++	tristate "Sound hardware support"
+ 
+ config SND_RAWMIDI
+ 	tristate
+ 
+ config SND_COMPRESS_OFFLOAD
+-	tristate
++	tristate "Compression offloading support"
+ 
+ # To be effective this also requires INPUT - users should say:
+ #    select SND_JACK if INPUT=y || INPUT=SND
diff --git a/trunk/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch b/trunk/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch
new file mode 100644
index 00000000..53701458
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/252-mv_cesa_depends.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -172,6 +172,7 @@ config CRYPTO_DEV_MV_CESA
+ 	depends on PLAT_ORION
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES
++	select CRYPTO_HASH2
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_HASH
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.3/253-ssb_b43_default_on.patch b/trunk/target/linux/generic/patches-3.3/253-ssb_b43_default_on.patch
new file mode 100644
index 00000000..29d2a41a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/253-ssb_b43_default_on.patch
@@ -0,0 +1,29 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+ 	bool
+ 	depends on SSB
++	default y
+ 
+ config SSB_PCIHOST_POSSIBLE
+ 	bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
+ config SSB_B43_PCI_BRIDGE
+ 	bool
+ 	depends on SSB_PCIHOST
+-	default n
++	default y
+ 
+ config SSB_PCMCIAHOST_POSSIBLE
+ 	bool
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -17,6 +17,7 @@ config BCMA
+ config BCMA_BLOCKIO
+ 	bool
+ 	depends on BCMA
++	default y
+ 
+ config BCMA_HOST_PCI_POSSIBLE
+ 	bool
diff --git a/trunk/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
new file mode 100644
index 00000000..1659fda9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -207,16 +207,16 @@ config BCH_CONST_T
+ # Textsearch support is select'ed if needed
+ #
+ config TEXTSEARCH
+-	boolean
++	boolean	"Textsearch support"
+ 
+ config TEXTSEARCH_KMP
+-	tristate
++	tristate "Textsearch KMP"
+ 
+ config TEXTSEARCH_BM
+-	tristate
++	tristate "Textsearch BM"
+ 
+ config TEXTSEARCH_FSM
+-	tristate
++	tristate "Textsearch FSM"
+ 
+ config BTREE
+ 	boolean
diff --git a/trunk/target/linux/generic/patches-3.3/255-lib80211_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.3/255-lib80211_kconfig_hacks.patch
new file mode 100644
index 00000000..8dde331a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/255-lib80211_kconfig_hacks.patch
@@ -0,0 +1,19 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -143,13 +143,13 @@ config LIB80211
+ 	  you want this built into your kernel.
+ 
+ config LIB80211_CRYPT_WEP
+-	tristate
++	tristate "LIB80211_CRYPT_WEP"
+ 
+ config LIB80211_CRYPT_CCMP
+-	tristate
++	tristate "LIB80211_CRYPT_CCMP"
+ 
+ config LIB80211_CRYPT_TKIP
+-	tristate
++	tristate "LIB80211_CRYPT_TKIP"
+ 
+ config LIB80211_DEBUG
+ 	bool "lib80211 debugging messages"
diff --git a/trunk/target/linux/generic/patches-3.3/256-crypto_add_kconfig_prompts.patch b/trunk/target/linux/generic/patches-3.3/256-crypto_add_kconfig_prompts.patch
new file mode 100644
index 00000000..8462c711
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/256-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -31,7 +31,7 @@ config CRYPTO_FIPS
+ 	  this is.
+ 
+ config CRYPTO_ALGAPI
+-	tristate
++	tristate "ALGAPI"
+ 	select CRYPTO_ALGAPI2
+ 	help
+ 	  This option provides the API for cryptographic algorithms.
+@@ -40,7 +40,7 @@ config CRYPTO_ALGAPI2
+ 	tristate
+ 
+ config CRYPTO_AEAD
+-	tristate
++	tristate "AEAD"
+ 	select CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -49,7 +49,7 @@ config CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_BLKCIPHER
+-	tristate
++	tristate "BLKCIPHER"
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -60,7 +60,7 @@ config CRYPTO_BLKCIPHER2
+ 	select CRYPTO_WORKQUEUE
+ 
+ config CRYPTO_HASH
+-	tristate
++	tristate "HASH"
+ 	select CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -69,7 +69,7 @@ config CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_RNG
+-	tristate
++	tristate "RNG"
+ 	select CRYPTO_RNG2
+ 	select CRYPTO_ALGAPI
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/257-wireless_ext_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.3/257-wireless_ext_kconfig_hack.patch
new file mode 100644
index 00000000..daac5898
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/257-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-	bool
++	bool "Wireless extensions"
+ 
+ config WEXT_CORE
+ 	def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+ 	depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-	bool
++	bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-	bool
++	bool "WEXT_PRIV"
+ 
+ config CFG80211
+ 	tristate "cfg80211 - wireless configuration API"
diff --git a/trunk/target/linux/generic/patches-3.3/258-netfilter_netlink_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.3/258-netfilter_netlink_kconfig_hack.patch
new file mode 100644
index 00000000..9d827c25
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/258-netfilter_netlink_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -2,7 +2,7 @@ menu "Core Netfilter Configuration"
+ 	depends on NET && INET && NETFILTER
+ 
+ config NETFILTER_NETLINK
+-	tristate
++	tristate "Netfilter NFNETLINK interface"
+ 
+ config NETFILTER_NETLINK_ACCT
+ tristate "Netfilter NFACCT over NFNETLINK interface"
diff --git a/trunk/target/linux/generic/patches-3.3/259-compressor_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.3/259-compressor_kconfig_hack.patch
new file mode 100644
index 00000000..2cf86d08
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/259-compressor_kconfig_hack.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -105,16 +105,16 @@ config AUDIT_GENERIC
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++	tristate "ZLIB inflate support"
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "ZLIB deflate support"
+ 
+ config LZO_COMPRESS
+-	tristate
++	tristate "LZO compress support"
+ 
+ config LZO_DECOMPRESS
+-	tristate
++	tristate "LZO decompress support"
+ 
+ source "lib/xz/Kconfig"
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/260-move_bcm963xx_tag.patch b/trunk/target/linux/generic/patches-3.3/260-move_bcm963xx_tag.patch
new file mode 100644
index 00000000..604fde15
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/260-move_bcm963xx_tag.patch
@@ -0,0 +1,219 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
++++ /dev/null
+@@ -1,96 +0,0 @@
+-#ifndef __BCM963XX_TAG_H
+-#define __BCM963XX_TAG_H
+-
+-#define TAGVER_LEN		4	/* Length of Tag Version */
+-#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
+-#define SIG1_LEN		20	/* Company Signature 1 Length */
+-#define SIG2_LEN		14	/* Company Signature 2 Length */
+-#define BOARDID_LEN		16	/* Length of BoardId */
+-#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
+-#define CHIPID_LEN		6	/* Chip Id Length */
+-#define IMAGE_LEN		10	/* Length of Length Field */
+-#define ADDRESS_LEN		12	/* Length of Address field */
+-#define DUALFLAG_LEN		2	/* Dual Image flag Length */
+-#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
+-#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
+-#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
+-#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
+-#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
+-#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
+-
+-#define NUM_PIRELLI		2
+-#define IMAGETAG_CRC_START	0xFFFFFFFF
+-
+-#define PIRELLI_BOARDS { \
+-	"AGPF-S0", \
+-	"DWV-S0", \
+-}
+-
+-/*
+- * The broadcom firmware assumes the rootfs starts the image,
+- * therefore uses the rootfs start (flash_image_address)
+- * to determine where to flash the image.  Since we have the kernel first
+- * we have to give it the kernel address, but the crc uses the length
+- * associated with this address (root_length), which is added to the kernel
+- * length (kernel_length) to determine the length of image to flash and thus
+- * needs to be rootfs + deadcode (jffs2 EOF marker)
+-*/
+-
+-struct bcm_tag {
+-	/* 0-3: Version of the image tag */
+-	char tag_version[TAGVER_LEN];
+-	/* 4-23: Company Line 1 */
+-	char sig_1[SIG1_LEN];
+-	/*  24-37: Company Line 2 */
+-	char sig_2[SIG2_LEN];
+-	/* 38-43: Chip this image is for */
+-	char chip_id[CHIPID_LEN];
+-	/* 44-59: Board name */
+-	char board_id[BOARDID_LEN];
+-	/* 60-61: Map endianness -- 1 BE 0 LE */
+-	char big_endian[ENDIANFLAG_LEN];
+-	/* 62-71: Total length of image */
+-	char total_length[IMAGE_LEN];
+-	/* 72-83: Address in memory of CFE */
+-	char cfe__address[ADDRESS_LEN];
+-	/* 84-93: Size of CFE */
+-	char cfe_length[IMAGE_LEN];
+-	/* 94-105: Address in memory of image start
+-	 * (kernel for libreCMC, rootfs for stock firmware)
+-	 */
+-	char flash_image_start[ADDRESS_LEN];
+-	/* 106-115: Size of rootfs */
+-	char root_length[IMAGE_LEN];
+-	/* 116-127: Address in memory of kernel */
+-	char kernel_address[ADDRESS_LEN];
+-	/* 128-137: Size of kernel */
+-	char kernel_length[IMAGE_LEN];
+-	/* 138-139: Unused at the moment */
+-	char dual_image[DUALFLAG_LEN];
+-	/* 140-141: Unused at the moment */
+-	char inactive_flag[INACTIVEFLAG_LEN];
+-	/* 142-161: RSA Signature (not used; some vendors may use this) */
+-	char rsa_signature[RSASIG_LEN];
+-	/* 162-191: Compilation and related information (not used in libreCMC) */
+-	char information1[TAGINFO1_LEN];
+-	/* 192-195: Version flash layout */
+-	char flash_layout_ver[FLASHLAYOUTVER_LEN];
+-	/* 196-199: kernel+rootfs CRC32 */
+-	__u32 fskernel_crc;
+-	/* 200-215: Unused except on Alice Gate where is is information */
+-	char information2[TAGINFO2_LEN];
+-	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
+-	__u32 image_crc;
+-	/* 220-223: CRC32 of rootfs partition */
+-	__u32 rootfs_crc;
+-	/* 224-227: CRC32 of kernel partition */
+-	__u32 kernel_crc;
+-	/* 228-235: Unused at present */
+-	char reserved1[8];
+-	/* 236-239: CRC32 of header excluding last 20 bytes */
+-	__u32 header_crc;
+-	/* 240-255: Unused at present */
+-	char reserved2[16];
+-};
+-
+-#endif /* __BCM63XX_TAG_H */
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -32,7 +32,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
+-#include <asm/mach-bcm63xx/bcm963xx_tag.h>
++#include <linux/bcm963xx_tag.h>
+ #include <asm/mach-bcm63xx/board_bcm963xx.h>
+ 
+ #define BCM63XX_EXTENDED_SIZE	0xBFC00000	/* Extended flash address */
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -77,6 +77,7 @@ header-y += blk_types.h
+ header-y += blkpg.h
+ header-y += blktrace_api.h
+ header-y += bpqether.h
++header-y += bcm963xx_tag.h
+ header-y += bsg.h
+ header-y += can.h
+ header-y += capability.h
+--- /dev/null
++++ b/include/linux/bcm963xx_tag.h
+@@ -0,0 +1,96 @@
++#ifndef __BCM963XX_TAG_H
++#define __BCM963XX_TAG_H
++
++#define TAGVER_LEN		4	/* Length of Tag Version */
++#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
++#define SIG1_LEN		20	/* Company Signature 1 Length */
++#define SIG2_LEN		14	/* Company Signature 2 Length */
++#define BOARDID_LEN		16	/* Length of BoardId */
++#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
++#define CHIPID_LEN		6	/* Chip Id Length */
++#define IMAGE_LEN		10	/* Length of Length Field */
++#define ADDRESS_LEN		12	/* Length of Address field */
++#define DUALFLAG_LEN		2	/* Dual Image flag Length */
++#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
++#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
++#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
++#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
++#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
++#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
++
++#define NUM_PIRELLI		2
++#define IMAGETAG_CRC_START	0xFFFFFFFF
++
++#define PIRELLI_BOARDS { \
++	"AGPF-S0", \
++	"DWV-S0", \
++}
++
++/*
++ * The broadcom firmware assumes the rootfs starts the image,
++ * therefore uses the rootfs start (flash_image_address)
++ * to determine where to flash the image.  Since we have the kernel first
++ * we have to give it the kernel address, but the crc uses the length
++ * associated with this address (root_length), which is added to the kernel
++ * length (kernel_length) to determine the length of image to flash and thus
++ * needs to be rootfs + deadcode (jffs2 EOF marker)
++*/
++
++struct bcm_tag {
++	/* 0-3: Version of the image tag */
++	char tag_version[TAGVER_LEN];
++	/* 4-23: Company Line 1 */
++	char sig_1[SIG1_LEN];
++	/*  24-37: Company Line 2 */
++	char sig_2[SIG2_LEN];
++	/* 38-43: Chip this image is for */
++	char chip_id[CHIPID_LEN];
++	/* 44-59: Board name */
++	char board_id[BOARDID_LEN];
++	/* 60-61: Map endianness -- 1 BE 0 LE */
++	char big_endian[ENDIANFLAG_LEN];
++	/* 62-71: Total length of image */
++	char total_length[IMAGE_LEN];
++	/* 72-83: Address in memory of CFE */
++	char cfe__address[ADDRESS_LEN];
++	/* 84-93: Size of CFE */
++	char cfe_length[IMAGE_LEN];
++	/* 94-105: Address in memory of image start
++	 * (kernel for libreCMC, rootfs for stock firmware)
++	 */
++	char flash_image_start[ADDRESS_LEN];
++	/* 106-115: Size of rootfs */
++	char root_length[IMAGE_LEN];
++	/* 116-127: Address in memory of kernel */
++	char kernel_address[ADDRESS_LEN];
++	/* 128-137: Size of kernel */
++	char kernel_length[IMAGE_LEN];
++	/* 138-139: Unused at the moment */
++	char dual_image[DUALFLAG_LEN];
++	/* 140-141: Unused at the moment */
++	char inactive_flag[INACTIVEFLAG_LEN];
++	/* 142-161: RSA Signature (not used; some vendors may use this) */
++	char rsa_signature[RSASIG_LEN];
++	/* 162-191: Compilation and related information (not used in libreCMC) */
++	char information1[TAGINFO1_LEN];
++	/* 192-195: Version flash layout */
++	char flash_layout_ver[FLASHLAYOUTVER_LEN];
++	/* 196-199: kernel+rootfs CRC32 */
++	__u32 fskernel_crc;
++	/* 200-215: Unused except on Alice Gate where is is information */
++	char information2[TAGINFO2_LEN];
++	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
++	__u32 image_crc;
++	/* 220-223: CRC32 of rootfs partition */
++	__u32 rootfs_crc;
++	/* 224-227: CRC32 of kernel partition */
++	__u32 kernel_crc;
++	/* 228-235: Unused at present */
++	char reserved1[8];
++	/* 236-239: CRC32 of header excluding last 20 bytes */
++	__u32 header_crc;
++	/* 240-255: Unused at present */
++	char reserved2[16];
++};
++
++#endif /* __BCM63XX_TAG_H */
diff --git a/trunk/target/linux/generic/patches-3.3/270-regmap_dynamic.patch b/trunk/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
new file mode 100644
index 00000000..b1cfc8a6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/270-regmap_dynamic.patch
@@ -0,0 +1,55 @@
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
+@@ -3,16 +3,18 @@
+ # subsystems should select the appropriate symbols.
+ 
+ config REGMAP
+-	default y if (REGMAP_I2C || REGMAP_SPI)
+ 	select LZO_COMPRESS
+ 	select LZO_DECOMPRESS
+-	bool
++	tristate "Regmap"
+ 
+ config REGMAP_I2C
+-	tristate
++	select REGMAP
++	tristate "Regmap I2C"
+ 
+ config REGMAP_SPI
+-	tristate
++	select REGMAP
++	depends on SPI_MASTER
++	tristate "Regmap SPI"
+ 
+ config REGMAP_IRQ
+ 	bool
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
+@@ -1,6 +1,8 @@
+-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
+-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
+-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o
++ifdef CONFIG_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_IRQ) += regmap-irq.o
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/mutex.h>
++#include <linux/module.h>
+ #include <linux/err.h>
+ 
+ #define CREATE_TRACE_POINTS
+@@ -679,3 +680,5 @@ static int __init regmap_initcall(void)
+ 	return 0;
+ }
+ postcore_initcall(regmap_initcall);
++
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.3/300-mips_expose_boot_raw.patch b/trunk/target/linux/generic/patches-3.3/300-mips_expose_boot_raw.patch
new file mode 100644
index 00000000..b114ef40
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/300-mips_expose_boot_raw.patch
@@ -0,0 +1,39 @@
+From: Mark Miller <mark@mirell.org>
+
+This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
+certain Broadcom chipsets running CFE in order to load the kernel.
+
+Signed-off-by: Mark Miller <mark@mirell.org>
+Acked-by: Rob Landley <rob@landley.net>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -877,9 +877,6 @@ config ARC
+ config ARCH_MAY_HAVE_PC_FDC
+ 	bool
+ 
+-config BOOT_RAW
+-	bool
+-
+ config CEVT_BCM1480
+ 	bool
+ 
+@@ -2330,6 +2327,18 @@ config USE_OF
+ 	help
+ 	  Include support for flattened device tree machine descriptions.
+ 
++config BOOT_RAW
++	bool "Enable the kernel to be executed from the load address"
++	default n
++	help
++	 Allow the kernel to be executed from the load address for
++	 bootloaders which cannot read the ELF format. This places
++	 a jump to start_kernel at the load address.
++
++	 If unsure, say N.
++
++
++
+ endmenu
+ 
+ config LOCKDEP_SUPPORT
diff --git a/trunk/target/linux/generic/patches-3.3/301-mips_image_cmdline_hack.patch b/trunk/target/linux/generic/patches-3.3/301-mips_image_cmdline_hack.patch
new file mode 100644
index 00000000..36458da3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/301-mips_image_cmdline_hack.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -976,6 +976,10 @@ config SYNC_R4K
+ config MIPS_MACHINE
+ 	def_bool n
+ 
++config IMAGE_CMDLINE_HACK
++	bool "libreCMC specific image command line hack"
++	default n
++
+ config NO_IOPORT
+ 	def_bool n
+ 
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -141,6 +141,12 @@ FEXPORT(__kernel_entry)
+ 	j	kernel_entry
+ #endif
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++	.ascii	"CMDLINE:"
++EXPORT(__image_cmdline)
++	.fill	0x400
++#endif /* CONFIG_IMAGE_CMDLINE_HACK */
++
+ 	__REF
+ 
+ NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/trunk/target/linux/generic/patches-3.3/302-mips_use_generic_thread_info_allocator.patch b/trunk/target/linux/generic/patches-3.3/302-mips_use_generic_thread_info_allocator.patch
new file mode 100644
index 00000000..1bcc74b4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/302-mips_use_generic_thread_info_allocator.patch
@@ -0,0 +1,18 @@
+--- a/arch/mips/include/asm/thread_info.h
++++ b/arch/mips/include/asm/thread_info.h
+@@ -85,6 +85,7 @@ register struct thread_info *__current_t
+ 
+ #define STACK_WARN	(THREAD_SIZE / 8)
+ 
++#if 0
+ #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
+ 
+ #ifdef CONFIG_DEBUG_STACK_USAGE
+@@ -96,6 +97,7 @@ register struct thread_info *__current_t
+ #endif
+ 
+ #define free_thread_info(info) kfree(info)
++#endif
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/303-mips_fix_kexec.patch b/trunk/target/linux/generic/patches-3.3/303-mips_fix_kexec.patch
new file mode 100644
index 00000000..e6928dde
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/303-mips_fix_kexec.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
+ 	reboot_code_buffer =
+ 	  (unsigned long)page_address(image->control_code_page);
+ 
+-	kexec_start_address = image->start;
++	kexec_start_address = (unsigned long) phys_to_virt(image->start);
+ 	kexec_indirection_page =
+ 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/304-mips_disable_fpu.patch b/trunk/target/linux/generic/patches-3.3/304-mips_disable_fpu.patch
new file mode 100644
index 00000000..e747feac
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/304-mips_disable_fpu.patch
@@ -0,0 +1,160 @@
+MIPS: allow disabling the kernel FPU emulator
+
+This patch allows turning off the in-kernel Algorithmics
+FPU emulator support, which allows one to save a couple of
+precious blocks on an embedded system.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+--
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -961,6 +961,17 @@ config I8259
+ config MIPS_BONITO64
+ 	bool
+ 
++config MIPS_FPU_EMU
++	bool "Enable FPU emulation"
++	default y
++	help
++	   This option allows building a kernel with or without the Algorithmics
++	   FPU emulator enabled. Turning off this option results in a kernel which
++	   does not catch floating operations exceptions. Make sure that your toolchain
++	   is configured to enable software floating point emulation in that case.
++		
++	   If unsure say Y here.
++
+ config MIPS_MSC
+ 	bool
+ 
+--- a/arch/mips/math-emu/Makefile
++++ b/arch/mips/math-emu/Makefile
+@@ -2,11 +2,13 @@
+ # Makefile for the Linux/MIPS kernel FPU emulation.
+ #
+ 
+-obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
++obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
++
++obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
+ 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
+ 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
+ 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
+ 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
+ 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
+-	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
++	   dp_sqrt.o sp_sqrt.o
+ 
+--- a/arch/mips/math-emu/cp1emu.c
++++ b/arch/mips/math-emu/cp1emu.c
+@@ -58,7 +58,11 @@
+ #define __mips 4
+ 
+ /* Function which emulates a floating point instruction. */
++#ifdef CONFIG_DEBUG_FS
++DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
++#endif
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
+ 	mips_instruction);
+ 
+@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
+ 
+ /* Further private data for which no space exists in mips_fpu_struct */
+ 
+-#ifdef CONFIG_DEBUG_FS
+-DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
+-#endif
+-
+ /* Control registers */
+ 
+ #define FPCREG_RID	0	/* $0  = revision id */
+@@ -1360,7 +1360,6 @@ int fpu_emulator_cop1Handler(struct pt_r
+ 
+ 	return sig;
+ }
+-
+ #ifdef CONFIG_DEBUG_FS
+ 
+ static int fpuemu_stat_get(void *data, u64 *val)
+@@ -1409,4 +1408,11 @@ static int __init debugfs_fpuemu(void)
+ 	return 0;
+ }
+ __initcall(debugfs_fpuemu);
+-#endif
++#endif /* CONFIG_DEBUGFS */
++#else
++int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
++        int has_fpu)
++{
++	return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/math-emu/dsemul.c
++++ b/arch/mips/math-emu/dsemul.c
+@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
+ 	return SIGILL;		/* force out of emulation loop */
+ }
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ int do_dsemulret(struct pt_regs *xcp)
+ {
+ 	struct emuframe __user *fr;
+@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
+ 
+ 	return 1;
+ }
++#else
++int do_dsemulret(struct pt_regs *xcp)
++{
++	return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/math-emu/kernel_linkage.c
++++ b/arch/mips/math-emu/kernel_linkage.c
+@@ -29,6 +29,7 @@
+ 
+ #define SIGNALLING_NAN 0x7ff800007ff80000LL
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ void fpu_emulator_init_fpu(void)
+ {
+ 	static int first = 1;
+@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
+ 
+ 	return err;
+ }
+-#endif
++#endif	/* CONFIG_64BIT */
++#else
++
++void fpu_emulator_init_fpu(void)
++{
++	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
++		"was compiled with software floating point support (soft-float)\n");
++	return;
++}
++
++int fpu_emulator_save_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++
++#ifdef CONFIG_64BIT
++#endif	/* CONFIG_64BIT */
++#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/trunk/target/linux/generic/patches-3.3/305-mips_module_reloc.patch b/trunk/target/linux/generic/patches-3.3/305-mips_module_reloc.patch
new file mode 100644
index 00000000..b4b142cb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/305-mips_module_reloc.patch
@@ -0,0 +1,371 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -90,8 +90,8 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
+-KBUILD_AFLAGS_MODULE		+= -mlong-calls
+-KBUILD_CFLAGS_MODULE		+= -mlong-calls
++KBUILD_AFLAGS_MODULE		+= -mno-long-calls
++KBUILD_CFLAGS_MODULE		+= -mno-long-calls
+ 
+ cflags-y += -ffreestanding
+ 
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -9,6 +9,11 @@ struct mod_arch_specific {
+ 	struct list_head dbe_list;
+ 	const struct exception_table_entry *dbe_start;
+ 	const struct exception_table_entry *dbe_end;
++
++	void *phys_plt_tbl;
++	void *virt_plt_tbl;
++	unsigned int phys_plt_offset;
++	unsigned int virt_plt_offset;
+ };
+ 
+ typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -44,14 +44,219 @@ static struct mips_hi16 *mips_hi16_list;
+ static LIST_HEAD(dbe_list);
+ static DEFINE_SPINLOCK(dbe_lock);
+ 
+-#ifdef MODULE_START
++/*
++ * Get the potential max trampolines size required of the init and
++ * non-init sections. Only used if we cannot find enough contiguous
++ * physically mapped memory to put the module into.
++ */
++static unsigned int
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
++             const char *secstrings, unsigned int symindex, bool is_init)
++{
++	unsigned long ret = 0;
++	unsigned int i, j;
++	Elf_Sym *syms;
++
++	/* Everything marked ALLOC (this includes the exported symbols) */
++	for (i = 1; i < hdr->e_shnum; ++i) {
++		unsigned int info = sechdrs[i].sh_info;
++
++		if (sechdrs[i].sh_type != SHT_REL
++		    && sechdrs[i].sh_type != SHT_RELA)
++			continue;
++
++		/* Not a valid relocation section? */
++		if (info >= hdr->e_shnum)
++			continue;
++
++		/* Don't bother with non-allocated sections */
++		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
++			continue;
++
++		/* If it's called *.init*, and we're not init, we're
++                   not interested */
++		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
++		    != is_init)
++			continue;
++
++		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
++		if (sechdrs[i].sh_type == SHT_REL) {
++			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rel[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		} else {
++			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rela[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		}
++	}
++
++	return ret;
++}
++
++#ifndef MODULE_START
++static void *alloc_phys(unsigned long size)
++{
++	unsigned order;
++	struct page *page;
++	struct page *p;
++
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
++
++	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
++			__GFP_THISNODE, order);
++	if (!page)
++		return NULL;
++
++	split_page(page, order);
++
++	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
++		__free_page(p);
++
++	return page_address(page);
++}
++#endif
++
++static void free_phys(void *ptr, unsigned long size)
++{
++	struct page *page;
++	struct page *end;
++
++	page = virt_to_page(ptr);
++	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
++
++	for (; page < end; ++page)
++		__free_page(page);
++}
++
++
+ void *module_alloc(unsigned long size)
+ {
++#ifdef MODULE_START
+ 	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+ 				GFP_KERNEL, PAGE_KERNEL, -1,
+ 				__builtin_return_address(0));
++#else
++	void *ptr;
++
++	if (size == 0)
++		return NULL;
++
++	ptr = alloc_phys(size);
++
++	/* If we failed to allocate physically contiguous memory,
++	 * fall back to regular vmalloc. The module loader code will
++	 * create jump tables to handle long jumps */
++	if (!ptr)
++		return vmalloc(size);
++
++	return ptr;
++#endif
+ }
++
++static inline bool is_phys_addr(void *ptr)
++{
++#ifdef CONFIG_64BIT
++	return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else
++	return (KSEGX(ptr) == KSEG0);
+ #endif
++}
++
++/* Free memory returned from module_alloc */
++void module_free(struct module *mod, void *module_region)
++{
++	if (is_phys_addr(module_region)) {
++		if (mod->module_init == module_region)
++			free_phys(module_region, mod->init_size);
++		else if (mod->module_core == module_region)
++			free_phys(module_region, mod->core_size);
++		else
++			BUG();
++	} else {
++		vfree(module_region);
++	}
++}
++
++static void *__module_alloc(int size, bool phys)
++{
++	void *ptr;
++
++	if (phys)
++		ptr = kmalloc(size, GFP_KERNEL);
++	else
++		ptr = vmalloc(size);
++	return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++	if (is_phys_addr(ptr))
++		kfree(ptr);
++	else
++		vfree(ptr);
++}
++
++int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
++			      char *secstrings, struct module *mod)
++{
++	unsigned int symindex = 0;
++	unsigned int core_size, init_size;
++	int i;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (sechdrs[i].sh_type == SHT_SYMTAB)
++			symindex = i;
++
++	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
++	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
++
++	mod->arch.phys_plt_offset = 0;
++	mod->arch.virt_plt_offset = 0;
++	mod->arch.phys_plt_tbl = NULL;
++	mod->arch.virt_plt_tbl = NULL;
++
++	if ((core_size + init_size) == 0)
++		return 0;
++
++	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++	if (!mod->arch.phys_plt_tbl)
++		return -ENOMEM;
++
++	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++	if (!mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++		return -ENOMEM;
++	}
++
++	return 0;
++}
+ 
+ static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+ {
+@@ -72,28 +277,36 @@ static int apply_r_mips_32_rela(struct m
+ 	return 0;
+ }
+ 
+-static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
++static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
++				 void *start, Elf_Addr v)
+ {
+-	if (v % 4) {
+-		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
+-		       me->name);
+-		return -ENOEXEC;
+-	}
++	unsigned *tramp = start + *plt_offset;
++	*plt_offset += 4 * sizeof(int);
+ 
+-	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-		printk(KERN_ERR
+-		       "module %s: relocation overflow\n",
+-		       me->name);
+-		return -ENOEXEC;
+-	}
++	/* adjust carry for addiu */
++	if (v & 0x00008000)
++		v += 0x10000;
+ 
+-	*location = (*location & ~0x03ffffff) |
+-	            ((*location + (v >> 2)) & 0x03ffffff);
++	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
++	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
++	tramp[2] = 0x03200008;                  /* jr t9 */
++	tramp[3] = 0x00000000;                  /* nop */
+ 
+-	return 0;
++	return (Elf_Addr) tramp;
+ }
+ 
+-static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++	if (is_phys_addr(location))
++		return add_plt_entry_to(&me->arch.phys_plt_offset,
++				me->arch.phys_plt_tbl, v);
++	else
++		return add_plt_entry_to(&me->arch.virt_plt_offset,
++				me->arch.virt_plt_tbl, v);
++
++}
++
++static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
+ {
+ 	if (v % 4) {
+ 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
+@@ -102,17 +315,31 @@ static int apply_r_mips_26_rela(struct m
+ 	}
+ 
+ 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-		printk(KERN_ERR
++	    v = add_plt_entry(me, location, v + (ofs << 2));
++		if (!v) {
++			printk(KERN_ERR
+ 		       "module %s: relocation overflow\n",
+ 		       me->name);
+-		return -ENOEXEC;
++			return -ENOEXEC;
++		}
++		ofs = 0;
+ 	}
+ 
+-	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
++	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
+ 
+ 	return 0;
+ }
+ 
++static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
++{
++	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
++}
++
++static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
++{
++	return set_r_mips_26(me, location, 0, v);
++}
++
+ static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
+ {
+ 	struct mips_hi16 *n;
+@@ -380,11 +607,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		list_add(&me->arch.dbe_list, &dbe_list);
+ 		spin_unlock_irq(&dbe_lock);
+ 	}
++
++	/* Get rid of the fixup trampoline if we're running the module
++	 * from physically mapped address space */
++	if (me->arch.phys_plt_offset == 0) {
++		__module_free(me->arch.phys_plt_tbl);
++		me->arch.phys_plt_tbl = NULL;
++	}
++	if (me->arch.virt_plt_offset == 0) {
++		__module_free(me->arch.virt_plt_tbl);
++		me->arch.virt_plt_tbl = NULL;
++	}
++
+ 	return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++	if (mod->arch.phys_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++	}
++	if (mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.virt_plt_tbl);
++		mod->arch.virt_plt_tbl = NULL;
++	}
++
+ 	spin_lock_irq(&dbe_lock);
+ 	list_del(&mod->arch.dbe_list);
+ 	spin_unlock_irq(&dbe_lock);
diff --git a/trunk/target/linux/generic/patches-3.3/306-mips_mem_functions_performance.patch b/trunk/target/linux/generic/patches-3.3/306-mips_mem_functions_performance.patch
new file mode 100644
index 00000000..e4324717
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/306-mips_mem_functions_performance.patch
@@ -0,0 +1,83 @@
+--- a/arch/mips/include/asm/string.h
++++ b/arch/mips/include/asm/string.h
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+ 
+ #define __HAVE_ARCH_MEMSET
+ extern void *memset(void *__s, int __c, size_t __count);
++#define memset(__s, __c, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memset((__s), (__c), __len);		\
++	else							\
++		__ret = __builtin_memset((__s), (__c), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMCPY
+ extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
++#define memcpy(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memcpy((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memcpy((dst), (src), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMMOVE
+ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
++#define memmove(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memmove((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memmove((dst), (src), __len);	\
++	__ret;							\
++})
++
++#define __HAVE_ARCH_MEMCMP
++#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
+ 
+ #endif /* _ASM_STRING_H */
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
+@@ -3,7 +3,7 @@
+ #
+ 
+ lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
+-	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
++	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
+ 
+ obj-y			+= iomap.o
+ obj-$(CONFIG_PCI)	+= iomap-pci.o
+--- /dev/null
++++ b/arch/mips/lib/memcmp.c
+@@ -0,0 +1,22 @@
++/*
++ *  copied from linux/lib/string.c
++ *
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
++
++#include <linux/module.h>
++#include <linux/string.h>
++
++#undef memcmp
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++	const unsigned char *su1, *su2;
++	int res = 0;
++
++	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
++		if ((res = *su1 - *su2) != 0)
++			break;
++	return res;
++}
++EXPORT_SYMBOL(memcmp);
++
diff --git a/trunk/target/linux/generic/patches-3.3/307-mips_oprofile_fix.patch b/trunk/target/linux/generic/patches-3.3/307-mips_oprofile_fix.patch
new file mode 100644
index 00000000..f83c96bb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/307-mips_oprofile_fix.patch
@@ -0,0 +1,35 @@
+--- a/arch/mips/oprofile/op_model_mipsxx.c
++++ b/arch/mips/oprofile/op_model_mipsxx.c
+@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
+ 	}
+ }
+ 
++static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
++{
++	return mipsxx_perfcount_handler();
++}
++
+ static int __init mipsxx_init(void)
+ {
+ 	int counters;
+@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
+ 	save_perf_irq = perf_irq;
+ 	perf_irq = mipsxx_perfcount_handler;
+ 
++	if (cp0_perfcount_irq >= 0)
++		return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
++			IRQF_SHARED, "Perfcounter", save_perf_irq);
++
+ 	return 0;
+ }
+ 
+@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
+ {
+ 	int counters = op_model_mipsxx_ops.num_counters;
+ 
++	if (cp0_perfcount_irq >= 0)
++		free_irq(cp0_perfcount_irq, save_perf_irq);
++
+ 	counters = counters_per_cpu_to_total(counters);
+ 	on_each_cpu(reset_counters, (void *)(long)counters, 1);
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/308-mips-show-correct-cpu-name-for-24KEc.patch b/trunk/target/linux/generic/patches-3.3/308-mips-show-correct-cpu-name-for-24KEc.patch
new file mode 100644
index 00000000..ac6304a2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/308-mips-show-correct-cpu-name-for-24KEc.patch
@@ -0,0 +1,17 @@
+--- a/arch/mips/kernel/cpu-probe.c
++++ b/arch/mips/kernel/cpu-probe.c
+@@ -816,10 +816,13 @@ static inline void cpu_probe_mips(struct
+ 		__cpu_name[cpu] = "MIPS 20Kc";
+ 		break;
+ 	case PRID_IMP_24K:
+-	case PRID_IMP_24KE:
+ 		c->cputype = CPU_24K;
+ 		__cpu_name[cpu] = "MIPS 24Kc";
+ 		break;
++	case PRID_IMP_24KE:
++		c->cputype = CPU_24K;
++		__cpu_name[cpu] = "MIPS 24KEc";
++		break;
+ 	case PRID_IMP_25KF:
+ 		c->cputype = CPU_25KF;
+ 		__cpu_name[cpu] = "MIPS 25Kc";
diff --git a/trunk/target/linux/generic/patches-3.3/309-mips_fuse_workaround.patch b/trunk/target/linux/generic/patches-3.3/309-mips_fuse_workaround.patch
new file mode 100644
index 00000000..78ab64f0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/309-mips_fuse_workaround.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -39,6 +39,7 @@ void (*__flush_kernel_vmap_range)(unsign
+ void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);
+ 
+ EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
++EXPORT_SYMBOL(__flush_cache_all);
+ 
+ /* MIPS specific cache operations */
+ void (*flush_cache_sigtramp)(unsigned long addr);
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -19,6 +19,9 @@
+ #include <linux/pipe_fs_i.h>
+ #include <linux/swap.h>
+ #include <linux/splice.h>
++#ifdef CONFIG_MIPS
++#include <asm/cacheflush.h>
++#endif
+ 
+ MODULE_ALIAS_MISCDEV(FUSE_MINOR);
+ MODULE_ALIAS("devname:fuse");
+@@ -655,6 +658,9 @@ static int fuse_copy_fill(struct fuse_co
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
++#ifdef CONFIG_MIPS
++	__flush_cache_all();
++#endif
+ 	if (val) {
+ 		if (cs->write)
+ 			memcpy(cs->buf, *val, ncpy);
diff --git a/trunk/target/linux/generic/patches-3.3/310-arm_module_unresolved_weak_sym.patch b/trunk/target/linux/generic/patches-3.3/310-arm_module_unresolved_weak_sym.patch
new file mode 100644
index 00000000..d1eba550
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/310-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -81,6 +81,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+ 			return -ENOEXEC;
+ 		}
+ 
++		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
++			continue;
++
+ 		loc = dstsec->sh_addr + rel->r_offset;
+ 
+ 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/trunk/target/linux/generic/patches-3.3/320-ppc4xx_optimization.patch b/trunk/target/linux/generic/patches-3.3/320-ppc4xx_optimization.patch
new file mode 100644
index 00000000..3f67f1b6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/320-ppc4xx_optimization.patch
@@ -0,0 +1,31 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -130,7 +130,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS		+= -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++cpu-as-$(CONFIG_40x)		+= -Wa,-m405
++cpu-as-$(CONFIG_44x)		+= -Wa,-m440
+ cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec
+ cpu-as-$(CONFIG_E500)		+= -Wa,-me500
+ cpu-as-$(CONFIG_E200)		+= -Wa,-me200
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
+ DTC_FLAGS	?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
diff --git a/trunk/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch b/trunk/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch
new file mode 100644
index 00000000..941aa909
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -94,7 +94,6 @@ else
+ endif
+ endif
+ 
+-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
+ 
+ ifeq ($(CONFIG_TUNE_CELL),y)
+ 	KBUILD_CFLAGS += $(call cc-option,-mtune=cell)
diff --git a/trunk/target/linux/generic/patches-3.3/322-ppc4xx-crypto-compile-fix.patch b/trunk/target/linux/generic/patches-3.3/322-ppc4xx-crypto-compile-fix.patch
new file mode 100644
index 00000000..226e4115
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/322-ppc4xx-crypto-compile-fix.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/amcc/crypto4xx_core.c
++++ b/drivers/crypto/amcc/crypto4xx_core.c
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/interrupt.h>
+ #include <linux/spinlock_types.h>
+ #include <linux/random.h>
diff --git a/trunk/target/linux/generic/patches-3.3/330-mips-add-crash-and-kdump-support.patch b/trunk/target/linux/generic/patches-3.3/330-mips-add-crash-and-kdump-support.patch
new file mode 100644
index 00000000..7a79c414
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/330-mips-add-crash-and-kdump-support.patch
@@ -0,0 +1,616 @@
+From eee16330c9de9adf7880cce9f1d32e13f89706bb Mon Sep 17 00:00:00 2001
+From: Wu Zhangjin <wuzhangjin@gmail.com>
+Date: Tue, 11 Jan 2011 13:16:47 +0000
+Subject: MIPS: Add crash and kdump support
+
+From: http://patchwork.linux-mips.org/patch/1025/
+
+Hello folks,
+
+Please find here MIPS crash and kdump patches.
+This is patch set of 3 patches:
+1. generic MIPS changes (kernel);
+2. MIPS Cavium Octeon board kexec/kdump code (kernel);
+3. Kexec user space MIPS changes.
+
+Patches were tested on the latest linux-mips@ git kernel and the latest
+kexec-tools git on Cavium Octeon 50xx board.
+
+I also made the same code working on RMI XLR/XLS boards for both
+mips32 and mips64 kernels.
+
+Best regards,
+Maxim Uvarov.
+
+------
+[ Zhangjin: Several trivial building failure has been fixed.
+
+Note: the 2nd patch can not be cleanly applied, but may be a good
+reference for the other board development:
+
+	+ MIPS Cavium Octeon board kexec,kdump support
+	http://patchwork.linux-mips.org/patch/1026/
+
+And the 3rd patch has already been merged into the mainline kexec-tools:
+
+	+ some kexec MIPS improvements
+	http://patchwork.linux-mips.org/patch/1027/
+
+kexec-tools is available here:
+
+	+ http://horms.net/projects/kexec/
+	git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git
+]
+Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
+---
+(limited to 'arch/mips/kernel')
+
+--- a/arch/mips/kernel/Makefile
++++ b/arch/mips/kernel/Makefile
+@@ -97,7 +97,8 @@ obj-$(CONFIG_I8253)		+= i8253.o
+ 
+ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
+ 
+-obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
++obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
++obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
+ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
+ obj-$(CONFIG_SPINLOCK_TEST)	+= spinlock_test.o
+ obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
+--- /dev/null
++++ b/arch/mips/kernel/crash.c
+@@ -0,0 +1,75 @@
++#include <linux/kernel.h>
++#include <linux/smp.h>
++#include <linux/reboot.h>
++#include <linux/kexec.h>
++#include <linux/bootmem.h>
++#include <linux/crash_dump.h>
++#include <linux/delay.h>
++#include <linux/init.h>
++#include <linux/irq.h>
++#include <linux/types.h>
++#include <linux/sched.h>
++
++#ifdef CONFIG_CRASH_DUMP
++unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
++#endif
++
++/* This keeps a track of which one is crashing cpu. */
++int crashing_cpu = -1;
++static cpumask_t cpus_in_crash = CPU_MASK_NONE;
++
++#ifdef CONFIG_SMP
++void crash_shutdown_secondary(void *ignore)
++{
++	struct pt_regs *regs;
++	int cpu = smp_processor_id();
++
++	regs = task_pt_regs(current);
++
++	if (!cpu_online(cpu))
++		return;
++
++	local_irq_disable();
++	if (!cpu_isset(cpu, cpus_in_crash))
++		crash_save_cpu(regs, cpu);
++	cpu_set(cpu, cpus_in_crash);
++
++	while (!atomic_read(&kexec_ready_to_reboot))
++		cpu_relax();
++	relocated_kexec_smp_wait(NULL);
++	/* NOTREACHED */
++}
++
++static void crash_kexec_prepare_cpus(void)
++{
++	unsigned int msecs;
++
++	unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */
++
++	dump_send_ipi(crash_shutdown_secondary);
++	smp_wmb();
++
++	/*
++	 * The crash CPU sends an IPI and wait for other CPUs to
++	 * respond. Delay of at least 10 seconds.
++	 */
++	printk(KERN_EMERG "Sending IPI to other cpus...\n");
++	msecs = 10000;
++	while ((cpus_weight(cpus_in_crash) < ncpus) && (--msecs > 0)) {
++		cpu_relax();
++		mdelay(1);
++	}
++}
++
++#else
++static void crash_kexec_prepare_cpus(void) {}
++#endif
++
++void default_machine_crash_shutdown(struct pt_regs *regs)
++{
++	local_irq_disable();
++	crashing_cpu = smp_processor_id();
++	crash_save_cpu(regs, crashing_cpu);
++	crash_kexec_prepare_cpus();
++	cpu_set(crashing_cpu, cpus_in_crash);
++}
+--- /dev/null
++++ b/arch/mips/kernel/crash_dump.c
+@@ -0,0 +1,86 @@
++#include <linux/highmem.h>
++#include <linux/bootmem.h>
++#include <linux/crash_dump.h>
++#include <asm/uaccess.h>
++
++#ifdef CONFIG_PROC_VMCORE
++static int __init parse_elfcorehdr(char *p)
++{
++	if (p)
++		elfcorehdr_addr = memparse(p, &p);
++	return 1;
++}
++__setup("elfcorehdr=", parse_elfcorehdr);
++#endif
++
++static int __init parse_savemaxmem(char *p)
++{
++	if (p)
++		saved_max_pfn = (memparse(p, &p) >> PAGE_SHIFT) - 1;
++
++	return 1;
++}
++__setup("savemaxmem=", parse_savemaxmem);
++
++
++static void *kdump_buf_page;
++
++/**
++ * copy_oldmem_page - copy one page from "oldmem"
++ * @pfn: page frame number to be copied
++ * @buf: target memory address for the copy; this can be in kernel address
++ *	space or user address space (see @userbuf)
++ * @csize: number of bytes to copy
++ * @offset: offset in bytes into the page (based on pfn) to begin the copy
++ * @userbuf: if set, @buf is in user address space, use copy_to_user(),
++ *	otherwise @buf is in kernel address space, use memcpy().
++ *
++ * Copy a page from "oldmem". For this page, there is no pte mapped
++ * in the current kernel.
++ *
++ * Calling copy_to_user() in atomic context is not desirable. Hence first
++ * copying the data to a pre-allocated kernel page and then copying to user
++ * space in non-atomic context.
++ */
++ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
++		size_t csize, unsigned long offset, int userbuf)
++{
++	void  *vaddr;
++
++	if (!csize)
++		return 0;
++
++	vaddr = kmap_atomic_pfn(pfn, KM_PTE0);
++
++	if (!userbuf) {
++		memcpy(buf, (vaddr + offset), csize);
++		kunmap_atomic(vaddr, KM_PTE0);
++	} else {
++		if (!kdump_buf_page) {
++			printk(KERN_WARNING "Kdump: Kdump buffer page not"
++				" allocated\n");
++			return -EFAULT;
++		}
++		copy_page(kdump_buf_page, vaddr);
++		kunmap_atomic(vaddr, KM_PTE0);
++		if (copy_to_user(buf, (kdump_buf_page + offset), csize))
++			return -EFAULT;
++	}
++
++	return csize;
++}
++
++static int __init kdump_buf_page_init(void)
++{
++	int ret = 0;
++
++	kdump_buf_page = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if (!kdump_buf_page) {
++		printk(KERN_WARNING "Kdump: Failed to allocate kdump buffer"
++			 " page\n");
++		ret = -ENOMEM;
++	}
++
++	return ret;
++}
++arch_initcall(kdump_buf_page_init);
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -19,9 +19,19 @@ extern const size_t relocate_new_kernel_
+ extern unsigned long kexec_start_address;
+ extern unsigned long kexec_indirection_page;
+ 
++int (*_machine_kexec_prepare)(struct kimage *) = NULL;
++void (*_machine_kexec_shutdown)(void) = NULL;
++void (*_machine_crash_shutdown)(struct pt_regs *regs) = NULL;
++#ifdef CONFIG_SMP
++void (*relocated_kexec_smp_wait) (void *);
++atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);
++#endif
++
+ int
+ machine_kexec_prepare(struct kimage *kimage)
+ {
++	if (_machine_kexec_prepare)
++		return _machine_kexec_prepare(kimage);
+ 	return 0;
+ }
+ 
+@@ -33,11 +43,17 @@ machine_kexec_cleanup(struct kimage *kim
+ void
+ machine_shutdown(void)
+ {
++	if (_machine_kexec_shutdown)
++		_machine_kexec_shutdown();
+ }
+ 
+ void
+ machine_crash_shutdown(struct pt_regs *regs)
+ {
++	if (_machine_crash_shutdown)
++		_machine_crash_shutdown(regs);
++	else
++		default_machine_crash_shutdown(regs);
+ }
+ 
+ typedef void (*noretfun_t)(void) __attribute__((noreturn));
+@@ -52,7 +68,9 @@ machine_kexec(struct kimage *image)
+ 	reboot_code_buffer =
+ 	  (unsigned long)page_address(image->control_code_page);
+ 
+-	kexec_start_address = (unsigned long) phys_to_virt(image->start);
++	kexec_start_address =
++	  (unsigned long) phys_to_virt(image->start);
++
+ 	kexec_indirection_page =
+ 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
+ 
+@@ -63,7 +81,7 @@ machine_kexec(struct kimage *image)
+ 	 * The generic kexec code builds a page list with physical
+ 	 * addresses. they are directly accessible through KSEG0 (or
+ 	 * CKSEG0 or XPHYS if on 64bit system), hence the
+-	 * pys_to_virt() call.
++	 * phys_to_virt() call.
+ 	 */
+ 	for (ptr = &image->head; (entry = *ptr) && !(entry &IND_DONE);
+ 	     ptr = (entry & IND_INDIRECTION) ?
+@@ -81,5 +99,13 @@ machine_kexec(struct kimage *image)
+ 	printk("Will call new kernel at %08lx\n", image->start);
+ 	printk("Bye ...\n");
+ 	__flush_cache_all();
++#ifdef CONFIG_SMP
++	/* All secondary cpus now may jump to kexec_wait cycle */
++	relocated_kexec_smp_wait = reboot_code_buffer +
++		(void *)(kexec_smp_wait - relocate_new_kernel);
++	smp_wmb();
++	atomic_set(&kexec_ready_to_reboot, 1);
++#endif
+ 	((noretfun_t) reboot_code_buffer)();
+ }
++
+--- a/arch/mips/kernel/relocate_kernel.S
++++ b/arch/mips/kernel/relocate_kernel.S
+@@ -15,6 +15,11 @@
+ #include <asm/addrspace.h>
+ 
+ LEAF(relocate_new_kernel)
++	PTR_L a0,	arg0
++	PTR_L a1,	arg1
++	PTR_L a2,	arg2
++	PTR_L a3,	arg3
++
+ 	PTR_L		s0, kexec_indirection_page
+ 	PTR_L		s1, kexec_start_address
+ 
+@@ -26,7 +31,6 @@ process_entry:
+ 	and		s3, s2, 0x1
+ 	beq		s3, zero, 1f
+ 	and		s4, s2, ~0x1	/* store destination addr in s4 */
+-	move		a0, s4
+ 	b		process_entry
+ 
+ 1:
+@@ -60,23 +64,100 @@ copy_word:
+ 	b		process_entry
+ 
+ done:
++#ifdef CONFIG_SMP
++	/* kexec_flag reset is signal to other CPUs what kernel
++ 	   was moved to it's location. Note - we need relocated address
++ 	   of kexec_flag.  */
++
++ 	bal		1f
++ 1: 	move		t1,ra;
++ 	PTR_LA		t2,1b
++ 	PTR_LA		t0,kexec_flag
++ 	PTR_SUB		t0,t0,t2;
++ 	PTR_ADD		t0,t1,t0;
++ 	LONG_S		zero,(t0)
++#endif
++
++	sync
+ 	/* jump to kexec_start_address */
+ 	j		s1
+ 	END(relocate_new_kernel)
+ 
+-kexec_start_address:
+-	EXPORT(kexec_start_address)
++#ifdef CONFIG_SMP
++/*
++ * Other CPUs should wait until code is relocated and
++ * then start at entry (?) point.
++ */
++LEAF(kexec_smp_wait)
++	PTR_L		a0, s_arg0
++	PTR_L		a1, s_arg1
++	PTR_L		a2, s_arg2
++	PTR_L		a3, s_arg3
++	PTR_L		s1, kexec_start_address
++
++	/* Non-relocated address works for args and kexec_start_address ( old
++	 * kernel is not overwritten). But we need relocated address of
++	 * kexec_flag.
++	 */
++
++	bal		1f
++1:	move		t1,ra;
++	PTR_LA		t2,1b
++	PTR_LA		t0,kexec_flag
++	PTR_SUB		t0,t0,t2;
++	PTR_ADD		t0,t1,t0;
++
++1:	LONG_L		s0, (t0)
++	bne		s0, zero,1b
++
++	sync
++	j		s1
++	END(kexec_smp_wait)
++#endif
++
++#ifdef __mips64
++       /* all PTR's must be aligned to 8 byte in 64-bit mode */
++       .align  3
++#endif
++
++/* All parameters to new kernel are passed in registers a0-a3.
++ * kexec_args[0..3] are uses to prepare register values.
++ */
++
++EXPORT(kexec_args)
++arg0:	PTR		0x0
++arg1:	PTR		0x0
++arg2:	PTR		0x0
++arg3:	PTR		0x0
++	.size	kexec_args,PTRSIZE*4
++
++#ifdef CONFIG_SMP
++/*
++ * Secondary CPUs may have different kernel parameters in
++ * their registers a0-a3. secondary_kexec_args[0..3] are used
++ * to prepare register values.
++ */
++EXPORT(secondary_kexec_args)
++s_arg0:	PTR		0x0
++s_arg1:	PTR		0x0
++s_arg2:	PTR		0x0
++s_arg3:	PTR		0x0
++	.size	secondary_kexec_args,PTRSIZE*4
++kexec_flag:
++	LONG		0x1
++
++#endif
++
++EXPORT(kexec_start_address)
+ 	PTR		0x0
+ 	.size		kexec_start_address, PTRSIZE
+ 
+-kexec_indirection_page:
+-	EXPORT(kexec_indirection_page)
++EXPORT(kexec_indirection_page)
+ 	PTR		0
+ 	.size		kexec_indirection_page, PTRSIZE
+ 
+ relocate_new_kernel_end:
+ 
+-relocate_new_kernel_size:
+-	EXPORT(relocate_new_kernel_size)
++EXPORT(relocate_new_kernel_size)
+ 	PTR		relocate_new_kernel_end - relocate_new_kernel
+ 	.size		relocate_new_kernel_size, PTRSIZE
+--- a/arch/mips/kernel/setup.c
++++ b/arch/mips/kernel/setup.c
+@@ -22,6 +22,7 @@
+ #include <linux/console.h>
+ #include <linux/pfn.h>
+ #include <linux/debugfs.h>
++#include <linux/kexec.h>
+ 
+ #include <asm/addrspace.h>
+ #include <asm/bootinfo.h>
+@@ -523,12 +524,62 @@ static void __init arch_mem_init(char **
+ 	}
+ 
+ 	bootmem_init();
++#ifdef CONFIG_KEXEC
++	if (crashk_res.start != crashk_res.end)
++		reserve_bootmem(crashk_res.start,
++			crashk_res.end - crashk_res.start + 1,
++			BOOTMEM_DEFAULT);
++#endif
+ 	device_tree_init();
+ 	sparse_init();
+ 	plat_swiotlb_setup();
+ 	paging_init();
+ }
+ 
++#ifdef CONFIG_KEXEC
++static inline unsigned long long get_total_mem(void)
++{
++	unsigned long long total;
++	total = max_pfn - min_low_pfn;
++	return total << PAGE_SHIFT;
++}
++
++static void __init mips_parse_crashkernel(void)
++{
++	unsigned long long total_mem;
++	unsigned long long crash_size, crash_base;
++	int ret;
++
++	total_mem = get_total_mem();
++	ret = parse_crashkernel(boot_command_line, total_mem,
++			&crash_size, &crash_base);
++	if (ret != 0 || crash_size <= 0)
++		return;
++
++	crashk_res.start = crash_base;
++	crashk_res.end   = crash_base + crash_size - 1;
++}
++static void __init request_crashkernel(struct resource *res)
++{
++	int ret;
++
++	ret = request_resource(res, &crashk_res);
++	if (!ret)
++		printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
++			"for crashkernel\n",
++			(unsigned long)((crashk_res.end -
++				crashk_res.start + 1) >> 20),
++			(unsigned long)(crashk_res.start  >> 20));
++}
++#else
++static void __init mips_parse_crashkernel(void)
++{
++}
++static void __init request_crashkernel(struct resource *res)
++{
++}
++#endif
++
+ static void __init resource_init(void)
+ {
+ 	int i;
+@@ -544,6 +595,8 @@ static void __init resource_init(void)
+ 	/*
+ 	 * Request address space for all standard RAM.
+ 	 */
++	mips_parse_crashkernel();
++
+ 	for (i = 0; i < boot_mem_map.nr_map; i++) {
+ 		struct resource *res;
+ 		unsigned long start, end;
+@@ -580,6 +633,7 @@ static void __init resource_init(void)
+ 		 */
+ 		request_resource(res, &code_resource);
+ 		request_resource(res, &data_resource);
++		request_crashkernel(res);
+ 	}
+ }
+ 
+--- a/arch/mips/kernel/smp.c
++++ b/arch/mips/kernel/smp.c
+@@ -433,3 +433,21 @@ void flush_tlb_one(unsigned long vaddr)
+ 
+ EXPORT_SYMBOL(flush_tlb_page);
+ EXPORT_SYMBOL(flush_tlb_one);
++
++#if defined(CONFIG_KEXEC)
++void (*dump_ipi_function_ptr)(void *) = NULL;
++void dump_send_ipi(void (*dump_ipi_callback)(void *))
++{
++	int i;
++	int cpu = smp_processor_id();
++
++	dump_ipi_function_ptr = dump_ipi_callback;
++	smp_mb();
++	for_each_online_cpu(i)
++		if (i != cpu)
++			core_send_ipi(i, SMP_DUMP);
++
++}
++EXPORT_SYMBOL(dump_send_ipi);
++#endif
++
+--- a/arch/mips/include/asm/kexec.h
++++ b/arch/mips/include/asm/kexec.h
+@@ -9,22 +9,45 @@
+ #ifndef _MIPS_KEXEC
+ # define _MIPS_KEXEC
+ 
++#include <asm/stacktrace.h>
++
++extern unsigned long long elfcorehdr_addr;
++
+ /* Maximum physical address we can use pages from */
+ #define KEXEC_SOURCE_MEMORY_LIMIT (0x20000000)
+ /* Maximum address we can reach in physical address mode */
+ #define KEXEC_DESTINATION_MEMORY_LIMIT (0x20000000)
+  /* Maximum address we can use for the control code buffer */
+ #define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000)
+-
+-#define KEXEC_CONTROL_PAGE_SIZE 4096
++/* Reserve 3*4096 bytes for board-specific info */
++#define KEXEC_CONTROL_PAGE_SIZE (4096 + 3*4096)
+ 
+ /* The native architecture */
+ #define KEXEC_ARCH KEXEC_ARCH_MIPS
++#define MAX_NOTE_BYTES 1024
+ 
+ static inline void crash_setup_regs(struct pt_regs *newregs,
+-				    struct pt_regs *oldregs)
++					struct pt_regs *oldregs)
+ {
+-	/* Dummy implementation for now */
++	if (oldregs)
++		memcpy(newregs, oldregs, sizeof(*newregs));
++	else
++		prepare_frametrace(newregs);
+ }
+ 
++#ifdef CONFIG_KEXEC
++struct kimage;
++extern unsigned long kexec_args[4];
++extern int (*_machine_kexec_prepare)(struct kimage *);
++extern void (*_machine_kexec_shutdown)(void);
++extern void (*_machine_crash_shutdown)(struct pt_regs *regs);
++extern void default_machine_crash_shutdown(struct pt_regs *regs);
++#ifdef CONFIG_SMP
++extern const unsigned char kexec_smp_wait[];
++extern unsigned long secondary_kexec_args[4];
++extern void (*relocated_kexec_smp_wait) (void *);
++extern atomic_t kexec_ready_to_reboot;
++#endif
++#endif
++
+ #endif /* !_MIPS_KEXEC */
+--- a/arch/mips/include/asm/smp.h
++++ b/arch/mips/include/asm/smp.h
+@@ -40,6 +40,8 @@ extern int __cpu_logical_map[NR_CPUS];
+ #define SMP_CALL_FUNCTION	0x2
+ /* Octeon - Tell another core to flush its icache */
+ #define SMP_ICACHE_FLUSH	0x4
++/* Used by kexec crashdump to save all cpu's state */
++#define SMP_DUMP		0x8
+ 
+ extern volatile cpumask_t cpu_callin_map;
+ 
+@@ -91,4 +93,9 @@ static inline void arch_send_call_functi
+ 	mp_ops->send_ipi_mask(mask, SMP_CALL_FUNCTION);
+ }
+ 
++extern void core_send_ipi(int cpu, unsigned int action);
++#if defined(CONFIG_KEXEC)
++extern void (*dump_ipi_function_ptr)(void *);
++void dump_send_ipi(void (*dump_ipi_callback)(void *));
++#endif
+ #endif /* __ASM_SMP_H */
diff --git a/trunk/target/linux/generic/patches-3.3/331-mips-kexec-enhanche-the-support.patch b/trunk/target/linux/generic/patches-3.3/331-mips-kexec-enhanche-the-support.patch
new file mode 100644
index 00000000..21bbeed5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/331-mips-kexec-enhanche-the-support.patch
@@ -0,0 +1,157 @@
+From 03cd81fbca6b91317ec1a7b3b3c09fb8d08f83a6 Mon Sep 17 00:00:00 2001
+From: Wu Zhangjin <wuzhangjin@gmail.com>
+Date: Tue, 11 Jan 2011 18:42:08 +0000
+Subject: MIPS: Kexec: Enhance the support
+
+Changes:
+  o Print more information in machine_kexec() for debugging
+    E.g. with this information, the kexec_start_address has been found
+    it was wrong with 64bit kernel / o32 kexec-tools. Which must be
+    fixed later.
+  o Link relocate_kernel.S to a section for future extension
+    This allows more functions can be added for the kexec relocation
+    part even written in C. to add code into that section, you just need
+    to mark your function or data with __kexec or
+    __attribute__((__section__(".__kexec.relocate")))
+
+TODO:
+
+1. Make 64bit kernel / o32|n32|64 kexec-tools works
+
+Fix the user-space kexec-tools, seems the tool only work for 32bit
+machine. So, we need to add 64bit support for it. The address of the
+entry point(kexec_start_address) is wrong and make the "kexec -e" fail.
+the real entry point must be read from the new kernel image by the
+user-space kexec-tools, otherwise, it will not work.  The above 64bit
+support tested is 64bit kernel with o32 user-space kexec-tools. The root
+cause may be the different definition of virt_to_phys() and
+phys_to_virt() in the kexec-tools and kernel space for 64bit system /
+o32 kernel.
+
+Ref: http://www.linux-mips.org/archives/linux-mips/2009-08/msg00149.html
+
+2. Pass the arguments from kexec-tools to the new kernel image
+
+Please refer to: "MIPS: Loongson: Kexec: Pass parameters to new kernel"
+
+Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
+---
+--- a/arch/mips/include/asm/kexec.h
++++ b/arch/mips/include/asm/kexec.h
+@@ -36,6 +36,16 @@ static inline void crash_setup_regs(stru
+ }
+ 
+ #ifdef CONFIG_KEXEC
++
++#define __kexec __attribute__((__section__(".__kexec.relocate")))
++
++/* The linker tells us where the relocate_new_kernel part is. */
++extern const unsigned char __start___kexec_relocate;
++extern const unsigned char __end___kexec_relocate;
++
++extern unsigned long kexec_start_address;
++extern unsigned long kexec_indirection_page;
++
+ struct kimage;
+ extern unsigned long kexec_args[4];
+ extern int (*_machine_kexec_prepare)(struct kimage *);
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -14,10 +14,6 @@
+ #include <asm/page.h>
+ 
+ extern const unsigned char relocate_new_kernel[];
+-extern const size_t relocate_new_kernel_size;
+-
+-extern unsigned long kexec_start_address;
+-extern unsigned long kexec_indirection_page;
+ 
+ int (*_machine_kexec_prepare)(struct kimage *) = NULL;
+ void (*_machine_kexec_shutdown)(void) = NULL;
+@@ -61,21 +57,34 @@ typedef void (*noretfun_t)(void) __attri
+ void
+ machine_kexec(struct kimage *image)
+ {
++	unsigned long kexec_relocate_size;
+ 	unsigned long reboot_code_buffer;
+ 	unsigned long entry;
+ 	unsigned long *ptr;
+ 
++	kexec_relocate_size = (unsigned long)(&__end___kexec_relocate) -
++		(unsigned long)(&__start___kexec_relocate);
++	pr_info("kexec_relocate_size = %lu\n", kexec_relocate_size);
++
+ 	reboot_code_buffer =
+ 	  (unsigned long)page_address(image->control_code_page);
++	pr_info("reboot_code_buffer = %p\n", (void *)reboot_code_buffer);
+ 
+ 	kexec_start_address =
+ 	  (unsigned long) phys_to_virt(image->start);
++	pr_info("kexec_start_address(entry point of new kernel) = %p\n",
++			(void *)kexec_start_address);
+ 
+ 	kexec_indirection_page =
+ 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
++	pr_info("kexec_indirection_page = %p\n",
++			(void *)kexec_indirection_page);
+ 
+-	memcpy((void*)reboot_code_buffer, relocate_new_kernel,
+-	       relocate_new_kernel_size);
++	memcpy((void *)reboot_code_buffer, &__start___kexec_relocate,
++	       kexec_relocate_size);
++
++	pr_info("Copy kexec_relocate section from %p to reboot_code_buffer: %p\n",
++			&__start___kexec_relocate, (void *)reboot_code_buffer);
+ 
+ 	/*
+ 	 * The generic kexec code builds a page list with physical
+@@ -96,8 +105,8 @@ machine_kexec(struct kimage *image)
+ 	 */
+ 	local_irq_disable();
+ 
+-	printk("Will call new kernel at %08lx\n", image->start);
+-	printk("Bye ...\n");
++	pr_info("Will call new kernel at %p\n", (void *)kexec_start_address);
++	pr_info("Bye ...\n");
+ 	__flush_cache_all();
+ #ifdef CONFIG_SMP
+ 	/* All secondary cpus now may jump to kexec_wait cycle */
+@@ -108,4 +117,3 @@ machine_kexec(struct kimage *image)
+ #endif
+ 	((noretfun_t) reboot_code_buffer)();
+ }
+-
+--- a/arch/mips/kernel/relocate_kernel.S
++++ b/arch/mips/kernel/relocate_kernel.S
+@@ -14,6 +14,8 @@
+ #include <asm/stackframe.h>
+ #include <asm/addrspace.h>
+ 
++	.section	.kexec.relocate, "ax"
++
+ LEAF(relocate_new_kernel)
+ 	PTR_L a0,	arg0
+ 	PTR_L a1,	arg1
+@@ -155,9 +157,3 @@ EXPORT(kexec_start_address)
+ EXPORT(kexec_indirection_page)
+ 	PTR		0
+ 	.size		kexec_indirection_page, PTRSIZE
+-
+-relocate_new_kernel_end:
+-
+-EXPORT(relocate_new_kernel_size)
+-	PTR		relocate_new_kernel_end - relocate_new_kernel
+-	.size		relocate_new_kernel_size, PTRSIZE
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -50,6 +50,10 @@ SECTIONS
+ 		*(.text.*)
+ 		*(.fixup)
+ 		*(.gnu.warning)
++		__start___kexec_relocate = .;
++		KEEP(*(.kexec.relocate))
++		KEEP(*(.__kexec.relocate))
++		__end___kexec_relocate = .;
+ 	} :text = 0
+ 	_etext = .;	/* End of text section */
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/332-mips-kexec-init-the-arguments-for-the-new-kernel-image.patch b/trunk/target/linux/generic/patches-3.3/332-mips-kexec-init-the-arguments-for-the-new-kernel-image.patch
new file mode 100644
index 00000000..07d0af9e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/332-mips-kexec-init-the-arguments-for-the-new-kernel-image.patch
@@ -0,0 +1,52 @@
+From 49d07a29653b1f2c6ae273b3d8fe93d981f43004 Mon Sep 17 00:00:00 2001
+From: Wu Zhangjin <wuzhangjin@gmail.com>
+Date: Wed, 12 Jan 2011 20:59:32 +0000
+Subject: MIPS: Kexec: Init the arguments for the new kernel image
+
+Whenever the kexec-tools pass the command lines to the new kernel image,
+init the arguments as the ones for the 1st kernel image. This fixed the
+booting failure of Kexec on YeeLoong.
+
+Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
+---
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -10,6 +10,7 @@
+ #include <linux/mm.h>
+ #include <linux/delay.h>
+ 
++#include <asm/bootinfo.h>
+ #include <asm/cacheflush.h>
+ #include <asm/page.h>
+ 
+@@ -23,9 +24,30 @@ void (*relocated_kexec_smp_wait) (void *
+ atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);
+ #endif
+ 
++static void machine_kexec_init_args(void)
++{
++	kexec_args[0] = fw_arg0;
++	kexec_args[1] = fw_arg1;
++	kexec_args[2] = fw_arg2;
++	kexec_args[3] = fw_arg3;
++
++	pr_info("kexec_args[0] (argc): %lu\n", kexec_args[0]);
++	pr_info("kexec_args[1] (argv): %p\n", (void *)kexec_args[1]);
++	pr_info("kexec_args[2] (env ): %p\n", (void *)kexec_args[2]);
++	pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]);
++}
++
+ int
+ machine_kexec_prepare(struct kimage *kimage)
+ {
++	/*
++	 * Whenever arguments passed from kexec-tools, Init the arguments as
++	 * the original ones to avoid booting failure.
++	 *
++	 * This can be overrided by _machine_kexec_prepare().
++	 */
++	machine_kexec_init_args();
++
+ 	if (_machine_kexec_prepare)
+ 		return _machine_kexec_prepare(kimage);
+ 	return 0;
diff --git a/trunk/target/linux/generic/patches-3.3/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch b/trunk/target/linux/generic/patches-3.3/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch
new file mode 100644
index 00000000..44380dae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch
@@ -0,0 +1,88 @@
+From 240c76841b26f1b09aaced33414ee1d08b6454cf Mon Sep 17 00:00:00 2001
+From: Wu Zhangjin <wuzhangjin@gmail.com>
+Date: Sat, 15 Jan 2011 12:46:03 +0000
+Subject: MIPS: Get kernel parameters from kexec-tools
+
+Before, we simply use the command lines from the original bootloader,
+but it is not convenient. Now, we accept the kernel parameters from the
+--command-line or --append option of the kexec-tools.  But If not
+--command-line or --apend option indicated, will fall back to use the
+ones from the original bootloader.
+
+Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
+---
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -13,6 +13,7 @@
+ #include <asm/bootinfo.h>
+ #include <asm/cacheflush.h>
+ #include <asm/page.h>
++#include <asm/uaccess.h>
+ 
+ extern const unsigned char relocate_new_kernel[];
+ 
+@@ -37,6 +38,56 @@ static void machine_kexec_init_args(void
+ 	pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]);
+ }
+ 
++#define ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15)
++
++int machine_kexec_pass_args(struct kimage *image)
++{
++	int i, argc = 0;
++	char *bootloader = "kexec";
++	int *kexec_argv = (int *)kexec_args[1];
++
++	for (i = 0; i < image->nr_segments; i++) {
++		if (!strncmp(bootloader, (char *)image->segment[i].buf,
++				strlen(bootloader))) {
++			/*
++			 * convert command line string to array
++			 * of parameters (as bootloader does).
++			 */
++			/*
++			 * Note: we do treat the 1st string "kexec" as an
++			 * argument ;-) so, argc here is 1.
++			 */
++			char *str = (char *)image->segment[i].buf;
++			char *ptr = strchr(str, ' ');
++			char *kbuf = (char *)kexec_argv[0];
++			/* Whenever --command-line or --append used, "kexec" is copied */
++			argc = 1;
++			/* Parse the offset */
++			while (ptr && (ARGV_MAX_ARGS > argc)) {
++				*ptr = '\0';
++				if (ptr[1] != ' ' && ptr[1] != '\0') {
++					int offt = (int)(ptr - str + 1);
++					kexec_argv[argc] = (int)kbuf + offt;
++					argc++;
++				}
++				ptr = strchr(ptr + 1, ' ');
++			}
++			if (argc > 1) {
++				/* Copy to kernel space */
++				copy_from_user(kbuf, (char *)image->segment[i].buf, image->segment[i].bufsz);
++				fw_arg0 = kexec_args[0] = argc;
++			}
++			break;
++		}
++	}
++
++	pr_info("argc = %lu\n", kexec_args[0]);
++	for (i = 0; i < kexec_args[0]; i++)
++		pr_info("argv[%d] = %p, %s\n", i, (char *)kexec_argv[i], (char *)kexec_argv[i]);
++
++	return 0;
++}
++
+ int
+ machine_kexec_prepare(struct kimage *kimage)
+ {
+@@ -47,6 +98,7 @@ machine_kexec_prepare(struct kimage *kim
+ 	 * This can be overrided by _machine_kexec_prepare().
+ 	 */
+ 	machine_kexec_init_args();
++	machine_kexec_pass_args(kimage);
+ 
+ 	if (_machine_kexec_prepare)
+ 		return _machine_kexec_prepare(kimage);
diff --git a/trunk/target/linux/generic/patches-3.3/334-mips-fix-compiling-failure-of-relocate_kernel.patch b/trunk/target/linux/generic/patches-3.3/334-mips-fix-compiling-failure-of-relocate_kernel.patch
new file mode 100644
index 00000000..46a7395d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/334-mips-fix-compiling-failure-of-relocate_kernel.patch
@@ -0,0 +1,83 @@
+From 4aded085fa0057a9a1e1dcec631f950307360c1f Mon Sep 17 00:00:00 2001
+From: Wu Zhangjin <wuzhangjin@gmail.com>
+Date: Tue, 11 Jan 2011 13:46:19 +0000
+Subject: MIPS: Fix compiling failure of relocate_kernel.S
+
+The following errors is fixed with the help of <asm/asm_nosec.h>. for
+this file need to put different symbols in the same section, the
+original LEAF, NESTED and EXPORT (without explicit section indication)
+must be used, <asm/asm_nosec.h> does it.
+
+arch/mips/kernel/relocate_kernel.S: Assembler messages:
+arch/mips/kernel/relocate_kernel.S:162: Error: operation combines symbols in different segments
+
+Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
+---
+(limited to 'arch/mips/kernel')
+
+--- a/arch/mips/kernel/relocate_kernel.S
++++ b/arch/mips/kernel/relocate_kernel.S
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <asm/asm.h>
++#include <asm/asm_nosec.h>
+ #include <asm/asmmacro.h>
+ #include <asm/regdef.h>
+ #include <asm/page.h>
+--- /dev/null
++++ b/arch/mips/include/asm/asm_nosec.h
+@@ -0,0 +1,53 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 1995, 1996, 1997, 1999, 2001 by Ralf Baechle
++ * Copyright (C) 1999 by Silicon Graphics, Inc.
++ * Copyright (C) 2001 MIPS Technologies, Inc.
++ * Copyright (C) 2002  Maciej W. Rozycki
++ * Copyright (C) 2010  Wu Zhangjin <wuzhangjin@gmail.com>
++ *
++ * Derive from <asm/asm.h>
++ *
++ * Override the macros without -ffunction-sections and -fdata-sections support.
++ * If several functions or data must be put in the same section, please include
++ * this header file after the <asm/asm.h> to override the generic definition.
++ */
++
++#ifndef __ASM_ASM_NOSEC_H
++#define __ASM_ASM_NOSEC_H
++
++#undef LEAF
++#undef NESTED
++#undef EXPORT
++
++/*
++ * LEAF - declare leaf routine
++ */
++#define	LEAF(symbol)                                    \
++		.globl	symbol;                         \
++		.align	2;                              \
++		.type	symbol, @function;              \
++		.ent	symbol, 0;                      \
++symbol:		.frame	sp, 0, ra
++
++/*
++ * NESTED - declare nested routine entry point
++ */
++#define	NESTED(symbol, framesize, rpc)                  \
++		.globl	symbol;                         \
++		.align	2;                              \
++		.type	symbol, @function;              \
++		.ent	symbol, 0;                       \
++symbol:		.frame	sp, framesize, rpc
++
++/*
++ * EXPORT - export definition of symbol
++ */
++#define EXPORT(symbol)					\
++		.globl	symbol;                         \
++symbol:
++
++#endif /* __ASM_ASM_NOSEC_H */
diff --git a/trunk/target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/trunk/target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
new file mode 100644
index 00000000..e0a1103e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
@@ -0,0 +1,186 @@
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -25,67 +25,104 @@ void (*relocated_kexec_smp_wait) (void *
+ atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);
+ #endif
+ 
+-static void machine_kexec_init_args(void)
++#define KEXEC_MIPS_ARGV_BUF_SIZE	COMMAND_LINE_SIZE
++#define KEXEC_MIPS_ARGV_MAX_ARGS	(COMMAND_LINE_SIZE / 15)
++
++char kexec_argv_buf[KEXEC_MIPS_ARGV_BUF_SIZE] __kexec;
++char *kexec_argv[KEXEC_MIPS_ARGV_MAX_ARGS] __kexec;
++
++static void
++machine_kexec_print_args(void)
+ {
+-	kexec_args[0] = fw_arg0;
+-	kexec_args[1] = fw_arg1;
+-	kexec_args[2] = fw_arg2;
+-	kexec_args[3] = fw_arg3;
++	int i;
+ 
+ 	pr_info("kexec_args[0] (argc): %lu\n", kexec_args[0]);
+ 	pr_info("kexec_args[1] (argv): %p\n", (void *)kexec_args[1]);
+ 	pr_info("kexec_args[2] (env ): %p\n", (void *)kexec_args[2]);
+ 	pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]);
+-}
+ 
+-#define ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15)
++	for (i = 0; i < kexec_args[0]; i++)
++		pr_info("kexec_argv[%d] = %p, %s\n", i,
++			(char *)kexec_argv[i], (char *)kexec_argv[i]);
++}
+ 
+-int machine_kexec_pass_args(struct kimage *image)
++static void
++machine_kexec_init_argv(struct kimage *image)
+ {
+-	int i, argc = 0;
+-	char *bootloader = "kexec";
+-	int *kexec_argv = (int *)kexec_args[1];
++	void __user *buf = NULL;
++	size_t bufsz;
++	size_t size;
++	int i;
+ 
++	bufsz = 0;
+ 	for (i = 0; i < image->nr_segments; i++) {
+-		if (!strncmp(bootloader, (char *)image->segment[i].buf,
+-				strlen(bootloader))) {
+-			/*
+-			 * convert command line string to array
+-			 * of parameters (as bootloader does).
+-			 */
+-			/*
+-			 * Note: we do treat the 1st string "kexec" as an
+-			 * argument ;-) so, argc here is 1.
+-			 */
+-			char *str = (char *)image->segment[i].buf;
+-			char *ptr = strchr(str, ' ');
+-			char *kbuf = (char *)kexec_argv[0];
+-			/* Whenever --command-line or --append used, "kexec" is copied */
+-			argc = 1;
+-			/* Parse the offset */
+-			while (ptr && (ARGV_MAX_ARGS > argc)) {
+-				*ptr = '\0';
+-				if (ptr[1] != ' ' && ptr[1] != '\0') {
+-					int offt = (int)(ptr - str + 1);
+-					kexec_argv[argc] = (int)kbuf + offt;
+-					argc++;
+-				}
+-				ptr = strchr(ptr + 1, ' ');
+-			}
+-			if (argc > 1) {
+-				/* Copy to kernel space */
+-				copy_from_user(kbuf, (char *)image->segment[i].buf, image->segment[i].bufsz);
+-				fw_arg0 = kexec_args[0] = argc;
+-			}
+-			break;
++		struct kexec_segment *seg;
++
++		seg = &image->segment[i];
++		if (seg->bufsz < 6)
++			continue;
++
++		if (strncmp((char *) seg->buf, "kexec", 5))
++			continue;
++
++		/* don't copy "kexec" */
++		buf = seg->buf + 5;
++		bufsz = seg->bufsz - 5;
++		break;
++	}
++
++	if (!buf)
++		return;
++
++	size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
++	size = min(size, bufsz);
++	if (size < bufsz)
++		pr_warn("kexec command line truncated to %zd bytes\n", size);
++
++	/* Copy to kernel space */
++	copy_from_user(kexec_argv_buf, buf, size);
++}
++
++static void
++machine_kexec_parse_argv(struct kimage *image)
++{
++	char *reboot_code_buffer;
++	int reloc_delta;
++	char *ptr;
++	int argc;
++	int i;
++
++	ptr = kexec_argv_buf;
++	argc = 0;
++
++	/*
++	 * convert command line string to array of parameters
++	 * (as bootloader does).
++	 */
++	while (ptr && *ptr && (KEXEC_MIPS_ARGV_MAX_ARGS > argc)) {
++		if (*ptr == ' ') {
++			*ptr++ = '\0';
++			continue;
+ 		}
++
++		kexec_argv[argc++] = ptr;
++		ptr = strchr(ptr, ' ');
+ 	}
+ 
+-	pr_info("argc = %lu\n", kexec_args[0]);
+-	for (i = 0; i < kexec_args[0]; i++)
+-		pr_info("argv[%d] = %p, %s\n", i, (char *)kexec_argv[i], (char *)kexec_argv[i]);
++	if (!argc)
++		return;
+ 
+-	return 0;
++	kexec_args[0] = argc;
++	kexec_args[1] = (unsigned long)kexec_argv;
++	kexec_args[2] = 0;
++	kexec_args[3] = 0;
++
++	reboot_code_buffer = page_address(image->control_code_page);
++	reloc_delta = reboot_code_buffer - (char *) &__start___kexec_relocate;
++
++	kexec_args[1] += reloc_delta;
++	for (i = 0; i < argc; i++)
++		kexec_argv[i] += reloc_delta;
+ }
+ 
+ int
+@@ -97,8 +134,14 @@ machine_kexec_prepare(struct kimage *kim
+ 	 *
+ 	 * This can be overrided by _machine_kexec_prepare().
+ 	 */
+-	machine_kexec_init_args();
+-	machine_kexec_pass_args(kimage);
++
++	kexec_args[0] = fw_arg0;
++	kexec_args[1] = fw_arg1;
++	kexec_args[2] = fw_arg2;
++	kexec_args[3] = fw_arg3;
++
++	machine_kexec_init_argv(kimage);
++	machine_kexec_parse_argv(kimage);
+ 
+ 	if (_machine_kexec_prepare)
+ 		return _machine_kexec_prepare(kimage);
+@@ -154,11 +197,13 @@ machine_kexec(struct kimage *image)
+ 	pr_info("kexec_indirection_page = %p\n",
+ 			(void *)kexec_indirection_page);
+ 
++	pr_info("Copy kexec_relocate section from %p to reboot_code_buffer: %p\n",
++			&__start___kexec_relocate, (void *)reboot_code_buffer);
++
+ 	memcpy((void *)reboot_code_buffer, &__start___kexec_relocate,
+ 	       kexec_relocate_size);
+ 
+-	pr_info("Copy kexec_relocate section from %p to reboot_code_buffer: %p\n",
+-			&__start___kexec_relocate, (void *)reboot_code_buffer);
++	machine_kexec_print_args();
+ 
+ 	/*
+ 	 * The generic kexec code builds a page list with physical
diff --git a/trunk/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch b/trunk/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch
new file mode 100644
index 00000000..549df5a6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch
@@ -0,0 +1,20 @@
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2322,12 +2322,15 @@ static void dynamic_debug_remove(struct
+ 
+ void * __weak module_alloc(unsigned long size)
+ {
+-	return size == 0 ? NULL : vmalloc_exec(size);
++	return vmalloc_exec(size);
+ }
+ 
+ static void *module_alloc_update_bounds(unsigned long size)
+ {
+-	void *ret = module_alloc(size);
++	void *ret = NULL;
++
++	if (size)
++		ret = module_alloc(size);
+ 
+ 	if (ret) {
+ 		mutex_lock(&module_mutex);
diff --git a/trunk/target/linux/generic/patches-3.3/400-rootfs_split.patch b/trunk/target/linux/generic/patches-3.3/400-rootfs_split.patch
new file mode 100644
index 00000000..349185a3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/400-rootfs_split.patch
@@ -0,0 +1,327 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -23,6 +23,14 @@ config MTD_TESTS
+ 	  WARNING: some of the tests will ERASE entire MTD device which they
+ 	  test. Do not use these tests unless you really know what you do.
+ 
++config MTD_ROOTFS_ROOT_DEV
++	bool "Automatically set 'rootfs' partition to be root filesystem"
++	default y
++
++config MTD_ROOTFS_SPLIT
++	bool "Automatically split 'rootfs' partition for squashfs"
++	default y
++
+ config MTD_REDBOOT_PARTS
+ 	tristate "RedBoot partition table parsing"
+ 	---help---
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -29,6 +29,8 @@
+ #include <linux/kmod.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/root_dev.h>
++#include <linux/magic.h>
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
+@@ -50,7 +52,7 @@ struct mtd_part {
+  * the pointer to that structure with this macro.
+  */
+ #define PART(x)  ((struct mtd_part *)(x))
+-
++#define IS_PART(mtd) (mtd->read == part_read)
+ 
+ /*
+  * MTD methods which simply translate the effective address and pass through
+@@ -643,6 +645,155 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++#define ROOTFS_SPLIT_NAME "rootfs_data"
++#define ROOTFS_REMOVED_NAME "<removed>"
++
++struct squashfs_super_block {
++	__le32 s_magic;
++	__le32 pad0[9];
++	__le64 bytes_used;
++};
++
++
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++	struct squashfs_super_block sb;
++	int len, ret;
++
++	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
++	if (ret || (len != sizeof(sb))) {
++		printk(KERN_ALERT "split_squashfs: error occured while reading "
++			"from \"%s\"\n", master->name);
++		return -EINVAL;
++	}
++
++	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
++		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	if (le64_to_cpu((sb.bytes_used)) <= 0) {
++		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	len = (u32) le64_to_cpu(sb.bytes_used);
++	len += (offset & 0x000fffff);
++	len +=  (master->erasesize - 1);
++	len &= ~(master->erasesize - 1);
++	len -= (offset & 0x000fffff);
++	*split_offset = offset + len;
++
++	return 0;
++}
++
++static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
++{
++	struct mtd_partition *dpart;
++	struct mtd_part *slave = NULL;
++	struct mtd_part *spart;
++	int ret, split_offset = 0;
++
++	spart = PART(rpart);
++	ret = split_squashfs(master, spart->offset, &split_offset);
++	if (ret)
++		return ret;
++
++	if (split_offset <= 0)
++		return 0;
++
++	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
++	if (dpart == NULL) {
++		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
++			ROOTFS_SPLIT_NAME);
++		return -ENOMEM;
++	}
++
++	memcpy(dpart, part, sizeof(*part));
++	dpart->name = (unsigned char *)&dpart[1];
++	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
++
++	dpart->size = rpart->size - (split_offset - spart->offset);
++	dpart->offset = split_offset;
++
++	if (dpart == NULL)
++		return 1;
++
++	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
++		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
++
++	slave = allocate_partition(master, dpart, 0, split_offset);
++	if (IS_ERR(slave))
++		return PTR_ERR(slave);
++	mutex_lock(&mtd_partitions_mutex);
++	list_add(&slave->list, &mtd_partitions);
++	mutex_unlock(&mtd_partitions_mutex);
++
++	add_mtd_device(&slave->mtd);
++
++	rpart->split = &slave->mtd;
++
++	return 0;
++}
++
++static int refresh_rootfs_split(struct mtd_info *mtd)
++{
++	struct mtd_partition tpart;
++	struct mtd_part *part;
++	char *name;
++	//int index = 0;
++	int offset, size;
++	int ret;
++
++	part = PART(mtd);
++
++	/* check for the new squashfs offset first */
++	ret = split_squashfs(part->master, part->offset, &offset);
++	if (ret)
++		return ret;
++
++	if ((offset > 0) && !mtd->split) {
++		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
++		/* if we don't have a rootfs split partition, create a new one */
++		tpart.name = (char *) mtd->name;
++		tpart.size = mtd->size;
++		tpart.offset = part->offset;
++
++		return split_rootfs_data(part->master, &part->mtd, &tpart);
++	} else if ((offset > 0) && mtd->split) {
++		/* update the offsets of the existing partition */
++		size = mtd->size + part->offset - offset;
++
++		part = PART(mtd->split);
++		part->offset = offset;
++		part->mtd.size = size;
++		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
++			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
++			(u32) part->offset, (u32) part->mtd.size);
++		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
++		strcpy(name, ROOTFS_SPLIT_NAME);
++		part->mtd.name = name;
++	} else if ((offset <= 0) && mtd->split) {
++		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
++
++		/* mark existing partition as removed */
++		part = PART(mtd->split);
++		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
++		strcpy(name, ROOTFS_REMOVED_NAME);
++		part->mtd.name = name;
++		part->offset = 0;
++		part->mtd.size = 0;
++	}
++
++	return 0;
++}
++#endif /* CONFIG_MTD_ROOTFS_SPLIT */
++
+ /*
+  * This function, given a master MTD object and a partition table, creates
+  * and registers slave MTD objects which are bound to the master according to
+@@ -659,6 +810,9 @@ int add_mtd_partitions(struct mtd_info *
+ 	struct mtd_part *slave;
+ 	uint64_t cur_offset = 0;
+ 	int i;
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++	int ret;
++#endif
+ 
+ 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
+ 
+@@ -673,12 +827,53 @@ int add_mtd_partitions(struct mtd_info *
+ 
+ 		add_mtd_device(&slave->mtd);
+ 
++		if (!strcmp(parts[i].name, "rootfs")) {
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++			if (ROOT_DEV == 0) {
++				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
++					"set to be root filesystem\n");
++				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
++			}
++#endif
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
++			/* if (ret == 0)
++			 * 	j++; */
++#endif
++		}
++
+ 		cur_offset = slave->offset + slave->mtd.size;
+ 	}
+ 
+ 	return 0;
+ }
+ 
++int mtd_device_refresh(struct mtd_info *mtd)
++{
++	int ret = 0;
++
++	if (IS_PART(mtd)) {
++		struct mtd_part *part;
++		struct mtd_info *master;
++
++		part = PART(mtd);
++		master = part->master;
++		if (master->refresh_device)
++			ret = master->refresh_device(master);
++	}
++
++	if (!ret && mtd->refresh_device)
++		ret = mtd->refresh_device(mtd);
++
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
++		refresh_rootfs_split(mtd);
++#endif
++
++	return 0;
++}
++EXPORT_SYMBOL_GPL(mtd_device_refresh);
++
+ static DEFINE_SPINLOCK(part_parser_lock);
+ static LIST_HEAD(part_parsers);
+ 
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
+@@ -1005,6 +1005,12 @@ static int mtdchar_ioctl(struct file *fi
+ 		break;
+ 	}
+ 
++	case MTDREFRESH:
++	{
++		ret = mtd_device_refresh(mtd);
++		break;
++	}
++
+ 	default:
+ 		ret = -ENOTTY;
+ 	}
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -114,6 +114,7 @@ struct nand_ecclayout {
+ 
+ struct module;	/* only needed for owner field in mtd_info */
+ 
++struct mtd_info;
+ struct mtd_info {
+ 	u_char type;
+ 	uint32_t flags;
+@@ -214,6 +215,9 @@ struct mtd_info {
+ 	int (*block_markbad) (struct mtd_info *mtd, loff_t ofs);
+ 	int (*suspend) (struct mtd_info *mtd);
+ 	void (*resume) (struct mtd_info *mtd);
++	int (*refresh_device)(struct mtd_info *mtd);
++	struct mtd_info *split;
++
+ 	/*
+ 	 * If the driver is something smart, like UBI, it may need to maintain
+ 	 * its own reference counting. The below functions are only for driver.
+@@ -502,6 +506,7 @@ extern int mtd_device_parse_register(str
+ 			      int defnr_parts);
+ #define mtd_device_register(master, parts, nr_parts)	\
+ 	mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
++extern int mtd_device_refresh(struct mtd_info *master);
+ extern int mtd_device_unregister(struct mtd_info *master);
+ extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num);
+ extern int __get_mtd_device(struct mtd_info *mtd);
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -36,12 +36,14 @@
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
+ 
++struct mtd_partition;
+ struct mtd_partition {
+ 	char *name;			/* identifier string */
+ 	uint64_t size;			/* partition size */
+ 	uint64_t offset;		/* offset within the master MTD space */
+ 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
+ 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only) */
++	int (*refresh_partition)(struct mtd_info *);
+ };
+ 
+ #define MTDPART_OFS_RETAIN	(-3)
+--- a/include/mtd/mtd-abi.h
++++ b/include/mtd/mtd-abi.h
+@@ -202,6 +202,7 @@ struct otp_info {
+  * without OOB, e.g., NOR flash.
+  */
+ #define MEMWRITE		_IOWR('M', 24, struct mtd_write_req)
++#define MTDREFRESH		_IO('M', 50)
+ 
+ /*
+  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/trunk/target/linux/generic/patches-3.3/401-partial_eraseblock_write.patch b/trunk/target/linux/generic/patches-3.3/401-partial_eraseblock_write.patch
new file mode 100644
index 00000000..f9c1c5ea
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/401-partial_eraseblock_write.patch
@@ -0,0 +1,146 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -35,6 +35,8 @@
+ 
+ #include "mtdcore.h"
+ 
++#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
++
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+ static DEFINE_MUTEX(mtd_partitions_mutex);
+@@ -252,13 +254,61 @@ static int part_erase(struct mtd_info *m
+ 		return -EROFS;
+ 	if (instr->addr >= mtd->size)
+ 		return -EINVAL;
++
++	instr->partial_start = false;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		size_t readlen = 0;
++		u64 mtd_ofs;
++
++		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
++		if (!instr->erase_buf)
++			return -ENOMEM;
++
++		mtd_ofs = part->offset + instr->addr;
++		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
++
++		if (instr->erase_buf_ofs > 0) {
++			instr->addr -= instr->erase_buf_ofs;
++			ret = mtd_read(part->master,
++				instr->addr + part->offset,
++				part->master->erasesize,
++				&readlen, instr->erase_buf);
++
++			instr->len += instr->erase_buf_ofs;
++			instr->partial_start = true;
++		} else {
++			mtd_ofs = part->offset + part->mtd.size;
++			instr->erase_buf_ofs = part->master->erasesize -
++				do_div(mtd_ofs, part->master->erasesize);
++
++			if (instr->erase_buf_ofs > 0) {
++				instr->len += instr->erase_buf_ofs;
++				ret = mtd_read(part->master,
++					part->offset + instr->addr +
++					instr->len - part->master->erasesize,
++					part->master->erasesize, &readlen,
++					instr->erase_buf);
++			} else {
++				ret = 0;
++			}
++		}
++		if (ret < 0) {
++			kfree(instr->erase_buf);
++			return ret;
++		}
++
++	}
++
+ 	instr->addr += part->offset;
+ 	ret = mtd_erase(part->master, instr);
+ 	if (ret) {
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
++		if (mtd->flags & MTD_ERASE_PARTIAL)
++			kfree(instr->erase_buf);
+ 	}
++
+ 	return ret;
+ }
+ 
+@@ -266,7 +316,25 @@ void mtd_erase_callback(struct erase_inf
+ {
+ 	if (instr->mtd->erase == part_erase) {
+ 		struct mtd_part *part = PART(instr->mtd);
++		size_t wrlen = 0;
+ 
++		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
++			if (instr->partial_start) {
++				part->master->write(part->master,
++					instr->addr, instr->erase_buf_ofs,
++					&wrlen, instr->erase_buf);
++				instr->addr += instr->erase_buf_ofs;
++			} else {
++				instr->len -= instr->erase_buf_ofs;
++				part->master->write(part->master,
++					instr->addr + instr->len,
++					instr->erase_buf_ofs, &wrlen,
++					instr->erase_buf +
++					part->master->erasesize -
++					instr->erase_buf_ofs);
++			}
++			kfree(instr->erase_buf);
++		}
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
+@@ -537,18 +605,24 @@ static struct mtd_part *allocate_partiti
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+ 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
+ 		/* Doesn't start on a boundary of major erase size */
+-		/* FIXME: Let it be writable if it is on a boundary of
+-		 * _minor_ erase size though */
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
+-			part->name);
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++		if (((u32) slave->mtd.size) > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+-	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
+-			part->name);
++	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++
++		if ((u32) slave->mtd.size > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
++	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
++		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
++				part->name);
+ 
+ 	slave->mtd.ecclayout = master->ecclayout;
+ 	if (master->block_isbad) {
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -58,6 +58,10 @@ struct erase_info {
+ 	u_long priv;
+ 	u_char state;
+ 	struct erase_info *next;
++
++	u8 *erase_buf;
++	u32 erase_buf_ofs;
++	bool partial_start;
+ };
+ 
+ struct mtd_erase_region_info {
diff --git a/trunk/target/linux/generic/patches-3.3/410-mtd_info_move_forward_decl.patch b/trunk/target/linux/generic/patches-3.3/410-mtd_info_move_forward_decl.patch
new file mode 100644
index 00000000..251f522e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/410-mtd_info_move_forward_decl.patch
@@ -0,0 +1,18 @@
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -35,6 +35,7 @@
+  * Note: writeable partitions require their size and offset be
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
++struct mtd_info;
+ 
+ struct mtd_partition;
+ struct mtd_partition {
+@@ -52,7 +53,6 @@ struct mtd_partition {
+ #define MTDPART_SIZ_FULL	(0)
+ 
+ 
+-struct mtd_info;
+ struct device_node;
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.3/420-redboot_space.patch b/trunk/target/linux/generic/patches-3.3/420-redboot_space.patch
new file mode 100644
index 00000000..fb6700b0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/420-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -267,14 +267,21 @@ static int parse_redboot_partitions(stru
+ #endif
+ 		names += strlen(names)+1;
+ 
+-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+-			i++;
+-			parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-			parts[i].size = fl->next->img->flash_base - parts[i].offset;
+-			parts[i].name = nullname;
+-		}
++			if (!strcmp(parts[i].name, "rootfs")) {
++				parts[i].size = fl->next->img->flash_base;
++				parts[i].size &= ~(master->erasesize - 1);
++				parts[i].size -= parts[i].offset;
++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
++				nrparts--;
++			} else {
++				i++;
++				parts[i].offset = parts[i-1].size + parts[i-1].offset;
++				parts[i].size = fl->next->img->flash_base - parts[i].offset;
++				parts[i].name = nullname;
+ #endif
++			}
++		}
+ 		tmp_fl = fl;
+ 		fl = fl->next;
+ 		kfree(tmp_fl);
diff --git a/trunk/target/linux/generic/patches-3.3/430-mtd_myloader_partition_parser.patch b/trunk/target/linux/generic/patches-3.3/430-mtd_myloader_partition_parser.patch
new file mode 100644
index 00000000..d60126dc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/430-mtd_myloader_partition_parser.patch
@@ -0,0 +1,35 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -156,6 +156,22 @@ config MTD_BCM63XX_PARTS
+ 	  This provides partions parsing for BCM63xx devices with CFE
+ 	  bootloaders.
+ 
++config MTD_MYLOADER_PARTS
++	tristate "MyLoader partition parsing"
++	depends on ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX || ATH79
++	---help---
++	  MyLoader is a bootloader which allows the user to define partitions
++	  in flash devices, by putting a table in the second erase block
++	  on the device, similar to a partition table. This table gives the 
++	  offsets and lengths of the user defined partitions.
++
++	  If you need code which can detect and parse these tables, and
++	  register MTD 'partitions' corresponding to each image detected,
++	  enable this option.
++
++	  You will still need the parsing functions to be called by the driver
++	  for your particular device. It won't happen automatically.
++
+ comment "User Modules And Translation Layers"
+ 
+ config MTD_CHAR
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
+ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
++obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/trunk/target/linux/generic/patches-3.3/440-block2mtd_init.patch b/trunk/target/linux/generic/patches-3.3/440-block2mtd_init.patch
new file mode 100644
index 00000000..00208c87
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/440-block2mtd_init.patch
@@ -0,0 +1,116 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -14,6 +14,7 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
+ #include <linux/mutex.h>
+ #include <linux/mount.h>
+ #include <linux/slab.h>
+@@ -231,11 +232,12 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+ 	struct block_device *bdev;
+ 	struct block2mtd_dev *dev;
++	struct mtd_partition *part;
+ 	char *name;
+ 
+ 	if (!devname)
+@@ -274,13 +276,16 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+-	name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
++	if (!mtdname)
++		mtdname = devname;
++	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
+ 	if (!name)
+ 		goto devinit_err;
+ 
++	strcpy(name, mtdname);
+ 	dev->mtd.name = name;
+ 
+-	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
++	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
+ 	dev->mtd.erasesize = erase_size;
+ 	dev->mtd.writesize = 1;
+ 	dev->mtd.writebufsize = PAGE_SIZE;
+@@ -294,14 +299,17 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
+ 
+-	if (mtd_device_register(&dev->mtd, NULL, 0)) {
++	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
++	part->name = name;
++	part->offset = 0;
++	part->size = dev->mtd.size;
++	if (mtd_device_register(&dev->mtd, part, 1)) {
+ 		/* Device didn't get added, so free the entry */
+ 		goto devinit_err;
+ 	}
+ 	list_add(&dev->list, &blkmtd_device_list);
+ 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
+-			dev->mtd.name + strlen("block2mtd: "),
+-			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
++			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+ 	return dev;
+ 
+ devinit_err:
+@@ -374,9 +382,9 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12]; /* 80 for device, 12 for erase size */
++	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
+ 	char *str = buf;
+-	char *token[2];
++	char *token[3];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
+ 	int i, ret;
+@@ -387,7 +395,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 2; i++)
++	for (i = 0; i < 3; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str)
+@@ -406,8 +414,10 @@ static int block2mtd_setup2(const char *
+ 			parse_err("illegal erase size");
+ 		}
+ 	}
++	if (token[2] && (strlen(token[2]) + 1 > 80))
++		parse_err("mtd device name too long");
+ 
+-	add_device(name, erase_size);
++	add_device(name, erase_size, token[2]);
+ 
+ 	return 0;
+ }
+@@ -441,7 +451,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
+--- a/block/partition-generic.c
++++ b/block/partition-generic.c
+@@ -546,6 +546,7 @@ int invalidate_partitions(struct gendisk
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(rescan_partitions);
+ 
+ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
+ {
diff --git a/trunk/target/linux/generic/patches-3.3/441-block2mtd_refresh.patch b/trunk/target/linux/generic/patches-3.3/441-block2mtd_refresh.patch
new file mode 100644
index 00000000..979b43b6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/441-block2mtd_refresh.patch
@@ -0,0 +1,291 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -29,6 +29,8 @@ struct block2mtd_dev {
+ 	struct block_device *blkdev;
+ 	struct mtd_info mtd;
+ 	struct mutex write_mutex;
++	rwlock_t bdev_mutex;
++	char devname[0];
+ };
+ 
+ 
+@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
+ 	size_t len = instr->len;
+ 	int err;
+ 
++	read_lock(&dev->bdev_mutex);
++	if (!dev->blkdev) {
++		err = -EINVAL;
++		goto done;
++	}
++
+ 	instr->state = MTD_ERASING;
+ 	mutex_lock(&dev->write_mutex);
+ 	err = _block2mtd_erase(dev, from, len);
+@@ -92,6 +100,10 @@ static int block2mtd_erase(struct mtd_in
+ 		instr->state = MTD_ERASE_DONE;
+ 
+ 	mtd_erase_callback(instr);
++
++done:
++	read_unlock(&dev->bdev_mutex);
++
+ 	return err;
+ }
+ 
+@@ -103,10 +115,14 @@ static int block2mtd_read(struct mtd_inf
+ 	struct page *page;
+ 	int index = from >> PAGE_SHIFT;
+ 	int offset = from & (PAGE_SIZE-1);
+-	int cpylen;
++	int cpylen, err = 0;
++
++	read_lock(&dev->bdev_mutex);
++	if (!dev->blkdev || (from > mtd->size)) {
++		err = -EINVAL;
++		goto done;
++	}
+ 
+-	if (from > mtd->size)
+-		return -EINVAL;
+ 	if (from + len > mtd->size)
+ 		len = mtd->size - from;
+ 
+@@ -121,10 +137,14 @@ static int block2mtd_read(struct mtd_inf
+ 		len = len - cpylen;
+ 
+ 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
+-		if (!page)
+-			return -ENOMEM;
+-		if (IS_ERR(page))
+-			return PTR_ERR(page);
++		if (!page) {
++			err = -ENOMEM;
++			goto done;
++		}
++		if (IS_ERR(page)) {
++			err = PTR_ERR(page);
++			goto done;
++		}
+ 
+ 		memcpy(buf, page_address(page) + offset, cpylen);
+ 		page_cache_release(page);
+@@ -135,7 +155,10 @@ static int block2mtd_read(struct mtd_inf
+ 		offset = 0;
+ 		index++;
+ 	}
+-	return 0;
++
++done:
++	read_unlock(&dev->bdev_mutex);
++	return err;
+ }
+ 
+ 
+@@ -187,12 +210,22 @@ static int block2mtd_write(struct mtd_in
+ 		size_t *retlen, const u_char *buf)
+ {
+ 	struct block2mtd_dev *dev = mtd->priv;
+-	int err;
++	int err = 0;
++
++	read_lock(&dev->bdev_mutex);
++	if (!dev->blkdev) {
++		err = -EINVAL;
++		goto done;
++	}
+ 
+ 	if (!len)
+-		return 0;
+-	if (to >= mtd->size)
+-		return -ENOSPC;
++		goto done;
++
++	if (to >= mtd->size) {
++		err = -ENOSPC;
++		goto done;
++	}
++
+ 	if (to + len > mtd->size)
+ 		len = mtd->size - to;
+ 
+@@ -201,6 +234,9 @@ static int block2mtd_write(struct mtd_in
+ 	mutex_unlock(&dev->write_mutex);
+ 	if (err > 0)
+ 		err = 0;
++
++done:
++	read_unlock(&dev->bdev_mutex);
+ 	return err;
+ }
+ 
+@@ -209,33 +245,110 @@ static int block2mtd_write(struct mtd_in
+ static void block2mtd_sync(struct mtd_info *mtd)
+ {
+ 	struct block2mtd_dev *dev = mtd->priv;
++	read_lock(&dev->bdev_mutex);
++	if (dev->blkdev)
+ 	sync_blockdev(dev->blkdev);
++	read_unlock(&dev->bdev_mutex);
++
+ 	return;
+ }
+ 
+ 
++static int _open_bdev(struct block2mtd_dev *dev)
++{
++	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
++	struct block_device *bdev;
++
++	/* Get a handle on the device */
++	bdev = blkdev_get_by_path(dev->devname, mode, dev);
++#ifndef MODULE
++	if (IS_ERR(bdev)) {
++		dev_t devt;
++
++		/* We might not have rootfs mounted at this point. Try
++		   to resolve the device name by other means. */
++
++		devt = name_to_dev_t(dev->devname);
++		if (devt)
++			bdev = blkdev_get_by_dev(devt, mode, dev);
++	}
++#endif
++
++	if (IS_ERR(bdev)) {
++		ERROR("error: cannot open device %s", dev->devname);
++		return 1;
++	}
++	dev->blkdev = bdev;
++
++	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
++		ERROR("attempting to use an MTD device as a block device");
++		return 1;
++	}
++
++	return 0;
++}
++
++static void _close_bdev(struct block2mtd_dev *dev)
++{
++	struct block_device *bdev;
++
++	if (!dev->blkdev)
++		return;
++
++	bdev = dev->blkdev;
++	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
++	blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
++	dev->blkdev = NULL;
++}
++
+ static void block2mtd_free_device(struct block2mtd_dev *dev)
+ {
+ 	if (!dev)
+ 		return;
+ 
+ 	kfree(dev->mtd.name);
+-
+-	if (dev->blkdev) {
+-		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
+-					0, -1);
+-		blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
+-	}
+-
++	_close_bdev(dev);
+ 	kfree(dev);
+ }
+ 
+ 
+-/* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
++static int block2mtd_refresh(struct mtd_info *mtd)
+ {
+-	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
++	struct block2mtd_dev *dev = mtd->priv;
+ 	struct block_device *bdev;
++	dev_t devt;
++	int err = 0;
++
++	/* no other mtd function can run at this point */
++	write_lock(&dev->bdev_mutex);
++
++	/* get the device number for the whole disk */
++	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
++
++	/* close the old block device */
++	_close_bdev(dev);
++
++	/* open the whole disk, issue a partition rescan, then */
++	bdev = blkdev_get_by_dev(devt, FMODE_WRITE | FMODE_READ, mtd);
++	if (!bdev || !bdev->bd_disk)
++		err = -EINVAL;
++#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
++	else
++		err = rescan_partitions(bdev->bd_disk, bdev);
++#endif
++	if (bdev)
++		blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
++
++	/* try to open the partition block device again */
++	_open_bdev(dev);
++	write_unlock(&dev->bdev_mutex);
++
++	return err;
++}
++
++/* FIXME: ensure that mtd->size % erase_size == 0 */
++static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
++{
+ 	struct block2mtd_dev *dev;
+ 	struct mtd_partition *part;
+ 	char *name;
+@@ -243,36 +356,17 @@ static struct block2mtd_dev *add_device(
+ 	if (!devname)
+ 		return NULL;
+ 
+-	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
++	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
+ 	if (!dev)
+ 		return NULL;
+ 
+-	/* Get a handle on the device */
+-	bdev = blkdev_get_by_path(devname, mode, dev);
+-#ifndef MODULE
+-	if (IS_ERR(bdev)) {
+-
+-		/* We might not have rootfs mounted at this point. Try
+-		   to resolve the device name by other means. */
++	strcpy(dev->devname, devname);
+ 
+-		dev_t devt = name_to_dev_t(devname);
+-		if (devt)
+-			bdev = blkdev_get_by_dev(devt, mode, dev);
+-	}
+-#endif
+-
+-	if (IS_ERR(bdev)) {
+-		ERROR("error: cannot open device %s", devname);
++	if (_open_bdev(dev))
+ 		goto devinit_err;
+-	}
+-	dev->blkdev = bdev;
+-
+-	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
+-		ERROR("attempting to use an MTD device as a block device");
+-		goto devinit_err;
+-	}
+ 
+ 	mutex_init(&dev->write_mutex);
++	rwlock_init(&dev->bdev_mutex);
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+@@ -298,6 +392,7 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.read = block2mtd_read;
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
++	dev->mtd.refresh_device = block2mtd_refresh;
+ 
+ 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
+ 	part->name = name;
diff --git a/trunk/target/linux/generic/patches-3.3/442-block2mtd_probe.patch b/trunk/target/linux/generic/patches-3.3/442-block2mtd_probe.patch
new file mode 100644
index 00000000..c427e9fd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/442-block2mtd_probe.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
+ 		/* We might not have rootfs mounted at this point. Try
+ 		   to resolve the device name by other means. */
+ 
++		wait_for_device_probe();
+ 		devt = name_to_dev_t(dev->devname);
+ 		if (devt)
+ 			bdev = blkdev_get_by_dev(devt, mode, dev);
diff --git a/trunk/target/linux/generic/patches-3.3/443-block2mtd-avoid-recursive-call-of-mtd_writev.patch b/trunk/target/linux/generic/patches-3.3/443-block2mtd-avoid-recursive-call-of-mtd_writev.patch
new file mode 100644
index 00000000..0ce9368f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/443-block2mtd-avoid-recursive-call-of-mtd_writev.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -388,7 +388,6 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.flags = MTD_CAP_RAM;
+ 	dev->mtd.erase = block2mtd_erase;
+ 	dev->mtd.write = block2mtd_write;
+-	dev->mtd.writev = mtd_writev;
+ 	dev->mtd.sync = block2mtd_sync;
+ 	dev->mtd.read = block2mtd_read;
+ 	dev->mtd.priv = dev;
diff --git a/trunk/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch b/trunk/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch
new file mode 100644
index 00000000..fd2b9b57
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch
@@ -0,0 +1,37 @@
+---
+ drivers/mtd/nand/plat_nand.c |   13 ++++++++++++-
+ include/linux/mtd/nand.h     |    1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -622,6 +622,7 @@ struct platform_nand_chip {
+ 	unsigned int options;
+ 	unsigned int bbt_options;
+ 	const char **part_probe_types;
++	int (*chip_fixup)(struct mtd_info *mtd);
+ };
+ 
+ /* Keep gcc happy */
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -93,7 +93,18 @@ static int __devinit plat_nand_probe(str
+ 	}
+ 
+ 	/* Scan to find existence of the device */
+-	if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
++	if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
++		err = -ENXIO;
++		goto out;
++	}
++
++	if (pdata->chip.chip_fixup) {
++		err = pdata->chip.chip_fixup(&data->mtd);
++		if (err)
++			goto out;
++	}
++
++	if (nand_scan_tail(&data->mtd)) {
+ 		err = -ENXIO;
+ 		goto out;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.3/451-mtd_fix_nand_correct_data_return_code.patch b/trunk/target/linux/generic/patches-3.3/451-mtd_fix_nand_correct_data_return_code.patch
new file mode 100644
index 00000000..2f72d859
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/451-mtd_fix_nand_correct_data_return_code.patch
@@ -0,0 +1,12 @@
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
+ 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
+ 		return 1;	/* error in ECC data; no action needed */
+ 
+-	printk(KERN_ERR "uncorrectable error : ");
+-	return -1;
++	return -EBADMSG;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/460-cfi_cmdset_0002_no_erase_suspend.patch b/trunk/target/linux/generic/patches-3.3/460-cfi_cmdset_0002_no_erase_suspend.patch
new file mode 100644
index 00000000..0c4b9bea
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/460-cfi_cmdset_0002_no_erase_suspend.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -682,7 +682,7 @@ static int get_chip(struct map_info *map
+ 		return 0;
+ 
+ 	case FL_ERASING:
+-		if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
++		if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+ 		    !(mode == FL_READY || mode == FL_POINT ||
+ 		    (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
+ 			goto sleep;
diff --git a/trunk/target/linux/generic/patches-3.3/470-mtd_m25p80_add_pm25lv_flash_support.patch b/trunk/target/linux/generic/patches-3.3/470-mtd_m25p80_add_pm25lv_flash_support.patch
new file mode 100644
index 00000000..ff27d04f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/470-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -0,0 +1,39 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -45,6 +45,7 @@
+ #define	OPCODE_BE_4K		0x20	/* Erase 4KiB block */
+ #define	OPCODE_BE_32K		0x52	/* Erase 32KiB block */
+ #define	OPCODE_CHIP_ERASE	0xc7	/* Erase whole flash chip */
++#define	OPCODE_BE_4K_PMC	0xd7	/* Erase 4KiB block on PMC chips*/
+ #define	OPCODE_SE		0xd8	/* Sector erase (usually 64KiB) */
+ #define	OPCODE_RDID		0x9f	/* Read JEDEC ID */
+ 
+@@ -625,6 +626,7 @@ struct flash_info {
+ 	u16		flags;
+ #define	SECT_4K		0x01		/* OPCODE_BE_4K works uniformly */
+ #define	M25P_NO_ERASE	0x02		/* No erase command needed */
++#define	SECT_4K_PMC	0x04		/* OPCODE_BE_4K_PMC works uniformly */
+ };
+ 
+ #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)	\
+@@ -686,6 +688,10 @@ static const struct spi_device_id m25p_i
+ 	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
+ 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
+ 
++	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
++	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
++	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
++
+ 	/* Spansion -- single (large) sector size only, at least
+ 	 * for the chips listed here (without boot sectors).
+ 	 */
+@@ -921,6 +927,9 @@ static int __devinit m25p_probe(struct s
+ 	if (info->flags & SECT_4K) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
++	} else if (info->flags & SECT_4K_PMC) {
++		flash->erase_opcode = OPCODE_BE_4K_PMC;
++		flash->mtd.erasesize = 4096;
+ 	} else {
+ 		flash->erase_opcode = OPCODE_SE;
+ 		flash->mtd.erasesize = info->sector_size;
diff --git a/trunk/target/linux/generic/patches-3.3/473-mtd_m25p80_add_w25q128.patch b/trunk/target/linux/generic/patches-3.3/473-mtd_m25p80_add_w25q128.patch
new file mode 100644
index 00000000..b00c9fae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/473-mtd_m25p80_add_w25q128.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -765,6 +765,7 @@ static const struct spi_device_id m25p_i
+ 	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
+ 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
+ 	{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
++	{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
+ 
+ 	/* Catalyst / On Semiconductor -- non-JEDEC */
+ 	{ "cat25c11", CAT25_INFO(  16, 8, 16, 1) },
diff --git a/trunk/target/linux/generic/patches-3.3/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/trunk/target/linux/generic/patches-3.3/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
new file mode 100644
index 00000000..3b43535d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
@@ -0,0 +1,18 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Issue map read after Write Buffer Load command to ensure chip is ready
+to receive data.
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
+ 1 file changed, 1 insertion(+)
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1409,6 +1409,7 @@ static int __xipram do_write_buffer(stru
+ 
+ 	/* Write Buffer Load */
+ 	map_write(map, CMD(0x25), cmd_adr);
++	(void) map_read(map, cmd_adr);
+ 
+ 	chip->state = FL_WRITING_TO_BUFFER;
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/trunk/target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
new file mode 100644
index 00000000..231d4548
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -0,0 +1,41 @@
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
+@@ -102,6 +102,14 @@ config M25PXX_USE_FAST_READ
+ 	help
+ 	  This option enables FAST_READ access supported by ST M25Pxx.
+ 
++config M25PXX_PREFER_SMALL_SECTOR_ERASE
++	bool "Prefer small sector erase"
++	depends on MTD_M25P80
++	default y
++	help
++	  This option enables use of the small erase sectors if that is
++	  supported by the flash chip.
++
+ config MTD_SST25L
+ 	tristate "Support SST25L (non JEDEC) SPI Flash chips"
+ 	depends on SPI_MASTER
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -84,6 +84,12 @@
+ 
+ #define JEDEC_MFR(_jedec_id)	((_jedec_id) >> 16)
+ 
++#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE
++#define PREFER_SMALL_SECTOR_ERASE 1
++#else
++#define PREFER_SMALL_SECTOR_ERASE 0
++#endif
++
+ /****************************************************************************/
+ 
+ struct m25p {
+@@ -925,7 +931,7 @@ static int __devinit m25p_probe(struct s
+ 		flash->mtd.write = m25p80_write;
+ 
+ 	/* prefer "small sector" erase if possible */
+-	if (info->flags & SECT_4K) {
++	if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
+ 	} else if (info->flags & SECT_4K_PMC) {
diff --git a/trunk/target/linux/generic/patches-3.3/477-mtd-m25p80-add-support-for-the-EON-EN25Q64-chip.patch b/trunk/target/linux/generic/patches-3.3/477-mtd-m25p80-add-support-for-the-EON-EN25Q64-chip.patch
new file mode 100644
index 00000000..439cbde1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/477-mtd-m25p80-add-support-for-the-EON-EN25Q64-chip.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -677,6 +677,7 @@ static const struct spi_device_id m25p_i
+ 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
+ 	{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024,  64, 0) },
+ 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
++	{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
+ 
+ 	/* Intel/Numonyx -- xxxs33b */
+ 	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
diff --git a/trunk/target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch b/trunk/target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 00000000..d4d2940d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -357,7 +357,14 @@ static int part_unlock(struct mtd_info *
+ 	struct mtd_part *part = PART(mtd);
+ 	if ((len + ofs) > mtd->size)
+ 		return -EINVAL;
+-	return mtd_unlock(part->master, ofs + part->offset, len);
++
++	ofs += part->offset;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		/* round up len to next erasesize and round down offset to prev block */
++		len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++		ofs &= ~(part->master->erasesize - 1);
++	}
++	return mtd_unlock(part->master, ofs, len);
+ }
+ 
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/trunk/target/linux/generic/patches-3.3/520-squashfs_update_xz_comp_opts.patch b/trunk/target/linux/generic/patches-3.3/520-squashfs_update_xz_comp_opts.patch
new file mode 100644
index 00000000..523b89f9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/520-squashfs_update_xz_comp_opts.patch
@@ -0,0 +1,25 @@
+From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 12 Apr 2011 19:55:41 +0200
+Subject: [PATCH] squashfs: update xz compressor options struct.
+
+Update the xz compressor options struct to match the squashfs userspace
+one.
+---
+ fs/squashfs/xz_wrapper.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/fs/squashfs/xz_wrapper.c
++++ b/fs/squashfs/xz_wrapper.c
+@@ -39,8 +39,10 @@ struct squashfs_xz {
+ };
+ 
+ struct comp_opts {
+-	__le32 dictionary_size;
+ 	__le32 flags;
++	__le16 bit_opts;
++	__le16 fb;
++	__le32 dictionary_size;
+ };
+ 
+ static void *squashfs_xz_init(struct squashfs_sb_info *msblk, void *buff,
diff --git a/trunk/target/linux/generic/patches-3.3/530-jffs2_make_lzma_available.patch b/trunk/target/linux/generic/patches-3.3/530-jffs2_make_lzma_available.patch
new file mode 100644
index 00000000..fa79ba31
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/530-jffs2_make_lzma_available.patch
@@ -0,0 +1,5142 @@
+--- a/fs/jffs2/Kconfig
++++ b/fs/jffs2/Kconfig
+@@ -139,6 +139,15 @@ config JFFS2_LZO
+ 	  This feature was added in July, 2007. Say 'N' if you need
+ 	  compatibility with older bootloaders or kernels.
+ 
++config JFFS2_LZMA
++	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
++	select LZMA_COMPRESS
++	select LZMA_DECOMPRESS
++	depends on JFFS2_FS
++	default n
++	help
++	  JFFS2 wrapper to the LZMA C SDK
++
+ config JFFS2_RTIME
+ 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
+ 	depends on JFFS2_FS
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
+@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
+ jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
+ jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
+ jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
++jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
+ jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
++
++CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
+--- a/fs/jffs2/compr.c
++++ b/fs/jffs2/compr.c
+@@ -374,6 +374,9 @@ int __init jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ /* Setting default compression mode */
+ #ifdef CONFIG_JFFS2_CMODE_NONE
+ 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
+@@ -397,6 +400,9 @@ int __init jffs2_compressors_init(void)
+ int jffs2_compressors_exit(void)
+ {
+ /* Unregistering compressors */
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
+--- a/fs/jffs2/compr.h
++++ b/fs/jffs2/compr.h
+@@ -29,9 +29,9 @@
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_LZARI_PRIORITY     30
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
+-
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
+ #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
+@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/fs/jffs2/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -371,14 +371,41 @@ static int __init init_jffs2_fs(void)
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
+ 
+-	printk(KERN_INFO "JFFS2 version 2.2."
++	printk(KERN_INFO "JFFS2 version 2.2"
+ #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+ 	       " (NAND)"
+ #endif
+ #ifdef CONFIG_JFFS2_SUMMARY
+-	       " (SUMMARY) "
++	       " (SUMMARY)"
+ #endif
+-	       " © 2001-2006 Red Hat, Inc.\n");
++#ifdef CONFIG_JFFS2_ZLIB
++	       " (ZLIB)"
++#endif
++#ifdef CONFIG_JFFS2_LZO
++	       " (LZO)"
++#endif
++#ifdef CONFIG_JFFS2_LZMA
++	       " (LZMA)"
++#endif
++#ifdef CONFIG_JFFS2_RTIME
++	       " (RTIME)"
++#endif
++#ifdef CONFIG_JFFS2_RUBIN
++	       " (RUBIN)"
++#endif
++#ifdef  CONFIG_JFFS2_CMODE_NONE
++	       " (CMODE_NONE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_PRIORITY
++	       " (CMODE_PRIORITY)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_SIZE
++	       " (CMODE_SIZE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
++	       " (CMODE_FAVOURLZO)"
++#endif
++	       " (c) 2001-2006 Red Hat, Inc.\n");
+ 
+ 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
+ 					     sizeof(struct jffs2_inode_info),
+--- a/include/linux/jffs2.h
++++ b/include/linux/jffs2.h
+@@ -46,6 +46,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,62 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <asm/types.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,115 @@
++/* LzFind.h -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_FIND_H
++#define __LZ_FIND_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  size_t directInputRem;
++  int btMode;
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
++    UInt32 *distances, UInt32 maxLen);
++
++/*
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,54 @@
++/* LzHash.h -- HASH functions for LZ algorithms
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_HASH_H
++#define __LZ_HASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,231 @@
++/* LzmaDec.h -- LZMA Decoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_DEC_H
++#define __LZMA_DEC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs,
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum
++{
++  LZMA_FINISH_ANY,   /* finish at any point */
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
++        You must use correct finish mode in that case. */
++
++typedef enum
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually.
++   For Buffer Interface you must always use variant 1.
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */
++
++/* You can use it, if you want to eliminate the overhead for data copying from
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,80 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_ENC_H
++#define __LZMA_ENC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */
++  int lp;          /* 0 <= lp <= 4, default = 0 */
++  int pb;          /* 0 <= pb <= 4, default = 2 */
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,226 @@
++/* Types.h -- Basic types
++2009-11-23 : Igor Pavlov : Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#include <stddef.h>
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
++
++#ifndef EXTERN_C_BEGIN
++#ifdef __cplusplus
++#define EXTERN_C_BEGIN extern "C" {
++#define EXTERN_C_END }
++#else
++#define EXTERN_C_BEGIN
++#define EXTERN_C_END
++#endif
++#endif
++
++EXTERN_C_BEGIN
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifdef _WIN32
++typedef DWORD WRes;
++#else
++typedef int WRes;
++#endif
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++#ifdef _SZ_NO_INT_64
++
++/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
++   NOTES: Some code will work incorrectly in that case! */
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _WIN32
++#define MY_STD_CALL __stdcall
++#else
++#define MY_STD_CALL
++#endif
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_FAST_CALL __fastcall
++
++#else
++
++#define MY_CDECL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++/* it can return SZ_ERROR_INPUT_EOF */
++SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
++SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
++SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++       (result < size) means error */
++} ISeqOutStream;
++
++typedef enum
++{
++  SZ_SEEK_SET = 0,
++  SZ_SEEK_CUR = 1,
++  SZ_SEEK_END = 2
++} ESzSeek;
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ISeekInStream;
++
++typedef struct
++{
++  SRes (*Look)(void *p, void **buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) > input(*size)) is not allowed
++       (output(*size) < input(*size)) is allowed */
++  SRes (*Skip)(void *p, size_t offset);
++    /* offset must be <= output(*size) of Look */
++
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* reads directly (without buffer). It's same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ILookInStream;
++
++SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
++SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
++
++/* reads via ILookInStream::Read */
++SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
++SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
++
++#define LookToRead_BUF_SIZE (1 << 14)
++
++typedef struct
++{
++  ILookInStream s;
++  ISeekInStream *realStream;
++  size_t pos;
++  size_t size;
++  Byte buf[LookToRead_BUF_SIZE];
++} CLookToRead;
++
++void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
++void LookToRead_Init(CLookToRead *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToLook;
++
++void SecToLook_CreateVTable(CSecToLook *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToRead;
++
++void SecToRead_CreateVTable(CSecToRead *p);
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++EXTERN_C_END
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -118,6 +118,12 @@ config LZO_DECOMPRESS
+ 
+ source "lib/xz/Kconfig"
+ 
++config LZMA_COMPRESS
++    tristate
++
++config LZMA_DECOMPRESS
++    tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,6 +2,16 @@
+ # Makefile for some libs needed in the kernel.
+ #
+ 
++ifdef CONFIG_JFFS2_ZLIB
++	CONFIG_ZLIB_INFLATE:=y
++	CONFIG_ZLIB_DEFLATE:=y
++endif
++
++ifdef CONFIG_JFFS2_LZMA
++	CONFIG_LZMA_DECOMPRESS:=y
++	CONFIG_LZMA_COMPRESS:=y
++endif
++
+ ifdef CONFIG_FUNCTION_TRACER
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+@@ -73,6 +83,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/
+ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
+ obj-$(CONFIG_XZ_DEC) += xz/
+ obj-$(CONFIG_RAID6_PQ) += raid6/
++obj-$(CONFIG_LZMA_COMPRESS) += lzma/
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/lib/lzma/LzFind.c
+@@ -0,0 +1,761 @@
++/* LzFind.c -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  if (p->directInput)
++  {
++    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
++    if (curSize > p->directInputRem)
++      curSize = (UInt32)p->directInputRem;
++    p->directInputRem -= curSize;
++    p->streamPos += curSize;
++    if (p->directInputRem == 0)
++      p->streamEndWasReached = 1;
++    return;
++  }
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase,
++    p->buffer - p->keepSizeBefore,
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  if (p->directInput)
++    return 0;
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached)
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = historySize + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit)
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit)
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for (i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
++{
++  return (p->pos - p->historySize - 1) & kNormalizeMask;
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while (++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] =
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2)
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lib/lzma/LzmaDec.c
+@@ -0,0 +1,999 @@
++/* LzmaDec.c -- LZMA Decoder
++2009-09-20 : Igor Pavlov : Public domain */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; }
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded.
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
++Out:
++  Result:
++    SZ_OK - OK
++    SZ_ERROR_DATA - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        state -= (state < 4) ? state : 3;
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        state -= (state < 10) ? 3 : 6;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++      continue;
++    }
++    else
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance;
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while (--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1;
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++      }
++
++      len += kMatchMinLen;
++
++      if (limit == dicPos)
++        return SZ_ERROR_DATA;
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do
++            *(dest) = (Byte)*(dest + src);
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE *
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while (--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++{
++  p->needFlush = 1;
++  p->remainLen = 0;
++  p->tempBufSize = 0;
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p)
++{
++  p->dicPos = 0;
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1;
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = (SizeT)(p->buf - src);
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0)
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->probs);
++  p->probs = 0;
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->dic);
++  p->dic = 0;
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize;
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/LzmaEnc.c
+@@ -0,0 +1,2271 @@
++/* LzmaEnc.c -- LZMA Encoder
++2009-11-24 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include "LzmaEnc.h"
++
++/* disable MT */
++#define _7ZIP_ST
++
++#include "LzFind.h"
++#ifndef _7ZIP_ST
++#include "LzFindMt.h"
++#endif
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3;
++  if (p->lp < 0) p->lp = 0;
++  if (p->pb < 0) p->pb = 2;
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
++  if (p->numHashBytes < 0) p->numHashBytes = 4;
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0)
++    p->numThreads =
++      #ifndef _7ZIP_ST
++      ((p->btMode && p->algo) ? 2 : 1);
++      #else
++      1;
++      #endif
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos)
++{
++  UInt32 res;
++  BSR2_RET(pos, res);
++  return res;
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct
++{
++  UInt32 price;
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;
++
++  UInt32 posPrev;
++  UInt32 backPrev;
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6
++#define kDicLogSizeMin 0
++#define kDicLogSizeMax 32
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifndef _7ZIP_ST
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifndef _7ZIP_ST
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  UInt32 longestMatchLength;
++  UInt32 numPairs;
++  UInt32 numAvail;
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  int needInit;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifndef _7ZIP_ST
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++#define IsCharState(s) ((s) < 7)
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);
++  }
++  p->cacheSize++;
++  p->low = (UInt32)p->low << 8;
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++}
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numPairs;
++  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
++  ttt++;
++  {
++    UInt32 i;
++    for (i = 0; i < numPairs; i += 2)
++      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
++  }
++  #endif
++  if (numPairs > 0)
++  {
++    lenRes = p->matches[numPairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matches[numPairs - 1] + 1;
++      UInt32 numAvail = p->numAvail;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numPairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex;
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
++  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
++  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
++  UInt32 *matches;
++  const Byte *data;
++  Byte curByte, matchByte;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  if (numAvail < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++  curByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
++        (!IsCharState(p->state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == curByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= mainLen)
++  {
++    UInt32 offs = 0;
++    while (len > matches[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matches[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matches[offs])
++      {
++        offs += 2;
++        if (offs == numPairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
++    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
++    Bool nextIsChar;
++    Byte curByte, matchByte;
++    const Byte *data;
++    COptimal *curOpt;
++    COptimal *nextOpt;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    newLen = ReadMatchDistances(p, &numPairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numPairs = numPairs;
++      p->longestMatchLength = newLen;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price;
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    curByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price +=
++        (!IsCharState(state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++    }
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price)
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++    numAvailFull = p->numAvail;
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp < numAvailFull)
++        numAvailFull = temp;
++    }
++
++    if (numAvailFull < 2)
++      continue;
++    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
++
++    if (!nextIsChar && matchByte != curByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailFull)
++        limit = numAvailFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price +
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price)
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice =
++                price + p->repLenEnc.prices[posState][lenTest - 2] +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvail)
++    {
++      newLen = numAvail;
++      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
++      matches[numPairs] = newLen;
++      numPairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matches[offs])
++        offs += 2;
++      curBack = matches[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matches[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numPairs)
++            break;
++          curBack = matches[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
++  const Byte *data;
++  const UInt32 *matches;
++
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  *backRes = (UInt32)-1;
++  if (numAvail < 2)
++    return 1;
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++
++  repLen = repIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    if (len > repLen)
++    {
++      repIndex = i;
++      repLen = len;
++    }
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++
++  mainDist = 0; /* for GCC */
++  if (mainLen >= 2)
++  {
++    mainDist = matches[numPairs - 1];
++    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
++    {
++      if (!ChangePair(matches[numPairs - 3], mainDist))
++        break;
++      numPairs -= 2;
++      mainLen = matches[numPairs - 2];
++      mainDist = matches[numPairs - 1];
++    }
++    if (mainLen == 2 && mainDist >= 0x80)
++      mainLen = 1;
++  }
++
++  if (repLen >= 2 && (
++        (repLen + 1 >= mainLen) ||
++        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
++        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
++  {
++    *backRes = repIndex;
++    MovePos(p, repLen - 1);
++    return repLen;
++  }
++  
++  if (mainLen < 2 || numAvail <= 2)
++    return 1;
++
++  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
++  if (p->longestMatchLength >= 2)
++  {
++    UInt32 newDistance = matches[p->numPairs - 1];
++    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
++        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
++        (p->longestMatchLength > mainLen + 1) ||
++        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
++      return 1;
++  }
++  
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len, limit;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    limit = mainLen - 1;
++    for (len = 2; len < limit && data[len] == data2[len]; len++);
++    if (len >= limit)
++      return 1;
++  }
++  *backRes = mainDist + LZMA_NUM_REPS;
++  MovePos(p, mainLen - 2);
++  return mainLen;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  {
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->needInit)
++  {
++    p->matchFinder.Init(p->matchFinderObj);
++    p->needInit = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numPairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numPairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == (UInt32)-1)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifndef _7ZIP_ST
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifndef _7ZIP_ST
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for (i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize =
++  p->repLenEnc.tableSize =
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->matchFinderBase.directInput = 1;
++  p->matchFinderBase.bufferBase = (Byte *)src;
++  p->matchFinderBase.directInputRem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->needInit = 1;
++
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifndef _7ZIP_ST
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #else
++  pp = pp;
++  #endif
++}
++
++typedef struct
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
++{
++  SRes res = SZ_OK;
++
++  #ifndef _7ZIP_ST
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(p);
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
++  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++
++  p->rc.outStream = &outStream.funcTable;
++  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
++  if (res == SZ_OK)
++    res = LzmaEnc_Encode2(p, progress);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/Makefile
+@@ -0,0 +1,7 @@
++lzma_compress-objs := LzFind.o LzmaEnc.o
++lzma_decompress-objs := LzmaDec.o
++
++obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
++
++EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/trunk/target/linux/generic/patches-3.3/531-debloat_lzma.patch b/trunk/target/linux/generic/patches-3.3/531-debloat_lzma.patch
new file mode 100644
index 00000000..1e41661e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/531-debloat_lzma.patch
@@ -0,0 +1,485 @@
+--- a/include/linux/lzma/LzmaDec.h
++++ b/include/linux/lzma/LzmaDec.h
+@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
+   UInt32 dicSize;
+ } CLzmaProps;
+ 
+-/* LzmaProps_Decode - decodes properties
+-Returns:
+-  SZ_OK
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+-
+ 
+ /* ---------- LZMA Decoder state ---------- */
+ 
+@@ -70,8 +62,6 @@ typedef struct
+ 
+ #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
+ 
+-void LzmaDec_Init(CLzmaDec *p);
+-
+ /* There are two types of LZMA streams:
+      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
+      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+@@ -108,97 +98,6 @@ typedef enum
+ 
+ /* ELzmaStatus is used only as output value for function call */
+ 
+-
+-/* ---------- Interfaces ---------- */
+-
+-/* There are 3 levels of interfaces:
+-     1) Dictionary Interface
+-     2) Buffer Interface
+-     3) One Call Interface
+-   You can select any of these interfaces, but don't mix functions from different
+-   groups for same object. */
+-
+-
+-/* There are two variants to allocate state for Dictionary Interface:
+-     1) LzmaDec_Allocate / LzmaDec_Free
+-     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+-   You can use variant 2, if you set dictionary buffer manually.
+-   For Buffer Interface you must always use variant 1.
+-
+-LzmaDec_Allocate* can return:
+-  SZ_OK
+-  SZ_ERROR_MEM         - Memory allocation error
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-   
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
+-
+-SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
+-
+-/* ---------- Dictionary Interface ---------- */
+-
+-/* You can use it, if you want to eliminate the overhead for data copying from
+-   dictionary to some other external buffer.
+-   You must work with CLzmaDec variables directly in this interface.
+-
+-   STEPS:
+-     LzmaDec_Constr()
+-     LzmaDec_Allocate()
+-     for (each new stream)
+-     {
+-       LzmaDec_Init()
+-       while (it needs more decompression)
+-       {
+-         LzmaDec_DecodeToDic()
+-         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+-       }
+-     }
+-     LzmaDec_Free()
+-*/
+-
+-/* LzmaDec_DecodeToDic
+-   
+-   The decoding to internal dictionary buffer (CLzmaDec::dic).
+-   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (dicLimit).
+-  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+-  LZMA_FINISH_END - Stream must be finished after dicLimit.
+-
+-Returns:
+-  SZ_OK
+-    status:
+-      LZMA_STATUS_FINISHED_WITH_MARK
+-      LZMA_STATUS_NOT_FINISHED
+-      LZMA_STATUS_NEEDS_MORE_INPUT
+-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+-  SZ_ERROR_DATA - Data error
+-*/
+-
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+-/* ---------- Buffer Interface ---------- */
+-
+-/* It's zlib-like interface.
+-   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+-   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+-   to work with CLzmaDec variables manually.
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (*destLen).
+-  LZMA_FINISH_ANY - Decode just destLen bytes.
+-  LZMA_FINISH_END - Stream must be finished after (*destLen).
+-*/
+-
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+ /* ---------- One Call Interface ---------- */
+ 
+ /* LzmaDecode
+--- a/lib/lzma/LzmaDec.c
++++ b/lib/lzma/LzmaDec.c
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
+   p->needFlush = 0;
+ }
+ 
+-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+ {
+   p->needFlush = 1;
+   p->remainLen = 0;
+@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
+     p->needInitState = 1;
+ }
+ 
+-void LzmaDec_Init(CLzmaDec *p)
++static void LzmaDec_Init(CLzmaDec *p)
+ {
+   p->dicPos = 0;
+   LzmaDec_InitDicAndState(p, True, True);
+@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
+   p->needInitState = 0;
+ }
+ 
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+     ELzmaFinishMode finishMode, ELzmaStatus *status)
+ {
+   SizeT inSize = *srcLen;
+@@ -837,7 +837,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
+   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
+ }
+ 
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++static __maybe_unused SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+ {
+   SizeT outSize = *destLen;
+   SizeT inSize = *srcLen;
+@@ -877,7 +877,7 @@ SRes LzmaDec_DecodeToBuf(CLzmaDec *p, By
+   }
+ }
+ 
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->probs);
+   p->probs = 0;
+@@ -889,13 +889,13 @@ static void LzmaDec_FreeDict(CLzmaDec *p
+   p->dic = 0;
+ }
+ 
+-void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++static void __maybe_unused LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
+ {
+   LzmaDec_FreeProbs(p, alloc);
+   LzmaDec_FreeDict(p, alloc);
+ }
+ 
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+ {
+   UInt32 dicSize;
+   Byte d;
+@@ -935,7 +935,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+   return SZ_OK;
+ }
+ 
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++static SRes __maybe_unused LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+ {
+   CLzmaProps propNew;
+   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+@@ -944,7 +944,7 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
+   return SZ_OK;
+ }
+ 
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++static SRes __maybe_unused LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+ {
+   CLzmaProps propNew;
+   SizeT dicBufSize;
+--- a/include/linux/lzma/LzmaEnc.h
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
+ } CLzmaEncProps;
+ 
+ void LzmaEncProps_Init(CLzmaEncProps *p);
+-void LzmaEncProps_Normalize(CLzmaEncProps *p);
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+-
+ 
+ /* ---------- CLzmaEncHandle Interface ---------- */
+ 
+@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+ void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ 
+-/* ---------- One Call Interface ---------- */
+-
+-/* LzmaEncode
+-Return code:
+-  SZ_OK               - OK
+-  SZ_ERROR_MEM        - Memory allocation error
+-  SZ_ERROR_PARAM      - Incorrect paramater
+-  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+-  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+-*/
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzmaEnc.c
++++ b/lib/lzma/LzmaEnc.c
+@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
+   p->writeEndMark = 0;
+ }
+ 
+-void LzmaEncProps_Normalize(CLzmaEncProps *p)
++static void LzmaEncProps_Normalize(CLzmaEncProps *p)
+ {
+   int level = p->level;
+   if (level < 0) level = 5;
+@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
+       #endif
+ }
+ 
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+ {
+   CLzmaEncProps props = *props2;
+   LzmaEncProps_Normalize(&props);
+@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
+ 
+ #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
+ 
+-UInt32 GetPosSlot1(UInt32 pos)
++static UInt32 GetPosSlot1(UInt32 pos)
+ {
+   UInt32 res;
+   BSR2_RET(pos, res);
+@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
+ #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
+ #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+ 
+-void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
+ {
+   int c = 2, slotFast;
+   g_FastPos[0] = 0;
+@@ -339,7 +339,7 @@ typedef struct
+   CSaveState saveState;
+ } CLzmaEnc;
+ 
+-void LzmaEnc_SaveState(CLzmaEncHandle pp)
++static void __maybe_unused LzmaEnc_SaveState(CLzmaEncHandle pp)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+   CSaveState *dest = &p->saveState;
+@@ -365,7 +365,7 @@ void LzmaEnc_SaveState(CLzmaEncHandle pp
+   memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
+ }
+ 
+-void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++static void __maybe_unused LzmaEnc_RestoreState(CLzmaEncHandle pp)
+ {
+   CLzmaEnc *dest = (CLzmaEnc *)pp;
+   const CSaveState *p = &dest->saveState;
+@@ -600,7 +600,7 @@ static void LitEnc_EncodeMatched(CRangeE
+   while (symbol < 0x10000);
+ }
+ 
+-void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
+ {
+   UInt32 i;
+   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
+@@ -1676,7 +1676,7 @@ static void FillDistancesPrices(CLzmaEnc
+   p->matchPriceCount = 0;
+ }
+ 
+-void LzmaEnc_Construct(CLzmaEnc *p)
++static void LzmaEnc_Construct(CLzmaEnc *p)
+ {
+   RangeEnc_Construct(&p->rc);
+   MatchFinder_Construct(&p->matchFinderBase);
+@@ -1709,7 +1709,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+   return p;
+ }
+ 
+-void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->litProbs);
+   alloc->Free(alloc, p->saveState.litProbs);
+@@ -2074,7 +2074,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
+   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+ }
+ 
+-void LzmaEnc_Finish(CLzmaEncHandle pp)
++static void LzmaEnc_Finish(CLzmaEncHandle pp)
+ {
+   #ifndef _7ZIP_ST
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2108,7 +2108,7 @@ static size_t MyWrite(void *pp, const vo
+ }
+ 
+ 
+-UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++static UInt32 __maybe_unused LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+ {
+   const CLzmaEnc *p = (CLzmaEnc *)pp;
+   return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+@@ -2120,7 +2120,7 @@ const Byte *LzmaEnc_GetCurBuf(CLzmaEncHa
+   return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+ }
+ 
+-SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++static SRes __maybe_unused LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
+     Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2248,7 +2248,7 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
+   return res;
+ }
+ 
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++static __maybe_unused SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+     const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+     ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+--- a/include/linux/lzma/LzFind.h
++++ b/include/linux/lzma/LzFind.h
+@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
+ 
+ #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p);
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+-void MatchFinder_MoveBlock(CMatchFinder *p);
+-void MatchFinder_ReadIfRequired(CMatchFinder *p);
+-
+ void MatchFinder_Construct(CMatchFinder *p);
+ 
+ /* Conditions:
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
+     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+     ISzAlloc *alloc);
+ void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+-    UInt32 *distances, UInt32 maxLen);
+ 
+ /*
+ Conditions:
+@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
+ 
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+ 
+-void MatchFinder_Init(CMatchFinder *p);
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzFind.c
++++ b/lib/lzma/LzFind.c
+@@ -42,12 +42,12 @@ static int LzInWindow_Create(CMatchFinde
+   return (p->bufferBase != 0);
+ }
+ 
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+-Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
+ 
+-UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+ 
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+ {
+   p->posLimit -= subValue;
+   p->pos -= subValue;
+@@ -268,7 +268,7 @@ static void MatchFinder_SetLimits(CMatch
+   p->posLimit = p->pos + limit;
+ }
+ 
+-void MatchFinder_Init(CMatchFinder *p)
++static void MatchFinder_Init(CMatchFinder *p)
+ {
+   UInt32 i;
+   for (i = 0; i < p->hashSizeSum; i++)
+@@ -287,7 +287,7 @@ static UInt32 MatchFinder_GetSubValue(CM
+   return (p->pos - p->historySize - 1) & kNormalizeMask;
+ }
+ 
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
+ {
+   UInt32 i;
+   for (i = 0; i < numItems; i++)
+@@ -350,7 +350,7 @@ static UInt32 * Hc_GetMatchesSpec(UInt32
+   }
+ }
+ 
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+     UInt32 *distances, UInt32 maxLen)
+ {
+@@ -492,7 +492,7 @@ static UInt32 Bt2_MatchFinder_GetMatches
+   GET_MATCHES_FOOTER(offset, 1)
+ }
+ 
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++static __maybe_unused UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+ {
+   UInt32 offset;
+   GET_MATCHES_HEADER(3)
+@@ -632,7 +632,7 @@ static UInt32 Hc4_MatchFinder_GetMatches
+   MOVE_POS_RET
+ }
+ 
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++static __maybe_unused UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+ {
+   UInt32 offset;
+   GET_MATCHES_HEADER(3)
+@@ -657,7 +657,7 @@ static void Bt2_MatchFinder_Skip(CMatchF
+   while (--num != 0);
+ }
+ 
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++static __maybe_unused void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+ {
+   do
+   {
+@@ -718,7 +718,7 @@ static void Hc4_MatchFinder_Skip(CMatchF
+   while (--num != 0);
+ }
+ 
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++static __maybe_unused void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+ {
+   do
+   {
diff --git a/trunk/target/linux/generic/patches-3.3/532-jffs2_eofdetect.patch b/trunk/target/linux/generic/patches-3.3/532-jffs2_eofdetect.patch
new file mode 100644
index 00000000..1fac6d1f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/532-jffs2_eofdetect.patch
@@ -0,0 +1,132 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -112,6 +112,17 @@ static int jffs2_build_filesystem(struct
+ 	dbg_fsbuild("scanned flash completely\n");
+ 	jffs2_dbg_dump_block_lists_nolock(c);
+ 
++	if (c->flags & (1 << 7)) {
++		printk("%s(): unlocking the mtd device... ", __func__);
++		if (c->mtd->unlock)
++			c->mtd->unlock(c->mtd, 0, c->mtd->size);
++		printk("done.\n");
++
++		printk("%s(): erasing all blocks after the end marker... ", __func__);
++		jffs2_erase_pending_blocks(c, -1);
++		printk("done.\n");
++	}
++
+ 	dbg_fsbuild("pass 1 starting\n");
+ 	c->flags |= JFFS2_SB_FLAG_BUILDING;
+ 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
+ 		return ret;
+ 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
+ 		return ret;
+-	/* Turned wasted size into dirty, since we apparently 
++	/* Turned wasted size into dirty, since we apparently
+ 	   think it's recoverable now. */
+ 	jeb->dirty_size += jeb->wasted_size;
+ 	c->dirty_size += jeb->wasted_size;
+@@ -147,8 +147,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
+ 		/* reset summary info for next eraseblock scan */
+ 		jffs2_sum_reset_collected(s);
+ 
+-		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
+-						buf_size, s);
++		if (c->flags & (1 << 7))
++			ret = BLK_STATE_ALLFF;
++		else
++			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
++							buf_size, s);
+ 
+ 		if (ret < 0)
+ 			goto out;
+@@ -403,7 +406,7 @@ static int jffs2_scan_xref_node(struct j
+ 	if (!ref)
+ 		return -ENOMEM;
+ 
+-	/* BEFORE jffs2_build_xattr_subsystem() called, 
++	/* BEFORE jffs2_build_xattr_subsystem() called,
+ 	 * and AFTER xattr_ref is marked as a dead xref,
+ 	 * ref->xid is used to store 32bit xid, xd is not used
+ 	 * ref->ino is used to store 32bit inode-number, ic is not used
+@@ -476,7 +479,7 @@ static int jffs2_scan_eraseblock (struct
+ 		struct jffs2_sum_marker *sm;
+ 		void *sumptr = NULL;
+ 		uint32_t sumlen;
+-	      
++
+ 		if (!buf_size) {
+ 			/* XIP case. Just look, point at the summary if it's there */
+ 			sm = (void *)buf + c->sector_size - sizeof(*sm);
+@@ -492,9 +495,9 @@ static int jffs2_scan_eraseblock (struct
+ 				buf_len = sizeof(*sm);
+ 
+ 			/* Read as much as we want into the _end_ of the preallocated buffer */
+-			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
++			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
+ 						  jeb->offset + c->sector_size - buf_len,
+-						  buf_len);				
++						  buf_len);
+ 			if (err)
+ 				return err;
+ 
+@@ -513,9 +516,9 @@ static int jffs2_scan_eraseblock (struct
+ 				}
+ 				if (buf_len < sumlen) {
+ 					/* Need to read more so that the entire summary node is present */
+-					err = jffs2_fill_scan_buf(c, sumptr, 
++					err = jffs2_fill_scan_buf(c, sumptr,
+ 								  jeb->offset + c->sector_size - sumlen,
+-								  sumlen - buf_len);				
++								  sumlen - buf_len);
+ 					if (err)
+ 						return err;
+ 				}
+@@ -528,7 +531,7 @@ static int jffs2_scan_eraseblock (struct
+ 
+ 			if (buf_size && sumlen > buf_size)
+ 				kfree(sumptr);
+-			/* If it returns with a real error, bail. 
++			/* If it returns with a real error, bail.
+ 			   If it returns positive, that's a block classification
+ 			   (i.e. BLK_STATE_xxx) so return that too.
+ 			   If it returns zero, fall through to full scan. */
+@@ -549,6 +552,17 @@ static int jffs2_scan_eraseblock (struct
+ 			return err;
+ 	}
+ 
++	if ((buf[0] == 0xde) &&
++		(buf[1] == 0xad) &&
++		(buf[2] == 0xc0) &&
++		(buf[3] == 0xde)) {
++		/* end of filesystem. erase everything after this point */
++		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
++		c->flags |= (1 << 7);
++
++		return BLK_STATE_ALLFF;
++	}
++
+ 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+ 	ofs = 0;
+ 	max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
+@@ -674,7 +688,7 @@ scan_more:
+ 				scan_end = buf_len;
+ 				goto more_empty;
+ 			}
+-			
++
+ 			/* See how much more there is to read in this eraseblock... */
+ 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
+ 			if (!buf_len) {
+@@ -910,7 +924,7 @@ scan_more:
+ 
+ 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
+ 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
+-	
++
+ 	/* mark_node_obsolete can add to wasted !! */
+ 	if (jeb->wasted_size) {
+ 		jeb->dirty_size += jeb->wasted_size;
diff --git a/trunk/target/linux/generic/patches-3.3/540-crypto-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.3/540-crypto-xz-decompression-support.patch
new file mode 100644
index 00000000..3b370073
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/540-crypto-xz-decompression-support.patch
@@ -0,0 +1,146 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -924,6 +924,13 @@ config CRYPTO_LZO
+ 	help
+ 	  This is the LZO algorithm.
+ 
++config CRYPTO_XZ
++	tristate "XZ compression algorithm"
++	select CRYPTO_ALGAPI
++	select XZ_DEC
++	help
++	  This is the XZ algorithm. Only decompression is supported for now.
++
+ comment "Random Number Generation"
+ 
+ config CRYPTO_ANSI_CPRNG
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -82,6 +82,7 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich
+ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
+ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
++obj-$(CONFIG_CRYPTO_XZ) += xz.o
+ obj-$(CONFIG_CRYPTO_RNG2) += rng.o
+ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
+ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o
+--- /dev/null
++++ b/crypto/xz.c
+@@ -0,0 +1,117 @@
++/*
++ * Cryptographic API.
++ *
++ * XZ decompression support.
++ *
++ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ *
++ */
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/crypto.h>
++#include <linux/xz.h>
++#include <linux/interrupt.h>
++#include <linux/mm.h>
++#include <linux/net.h>
++
++struct xz_comp_ctx {
++	struct xz_dec	*decomp_state;
++	struct xz_buf	decomp_buf;
++};
++
++static int crypto_xz_decomp_init(struct xz_comp_ctx *ctx)
++{
++	ctx->decomp_state = xz_dec_init(XZ_SINGLE, 0);
++	if (!ctx->decomp_state)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void crypto_xz_decomp_exit(struct xz_comp_ctx *ctx)
++{
++	xz_dec_end(ctx->decomp_state);
++}
++
++static int crypto_xz_init(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	return crypto_xz_decomp_init(ctx);
++}
++
++static void crypto_xz_exit(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	crypto_xz_decomp_exit(ctx);
++}
++
++static int crypto_xz_compress(struct crypto_tfm *tfm, const u8 *src,
++			      unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	return -EOPNOTSUPP;
++}
++
++static int crypto_xz_decompress(struct crypto_tfm *tfm, const u8 *src,
++				unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	struct xz_comp_ctx *dctx = crypto_tfm_ctx(tfm);
++	struct xz_buf *xz_buf = &dctx->decomp_buf;
++	int ret;
++
++	memset(xz_buf, '\0', sizeof(struct xz_buf));
++
++	xz_buf->in = (u8 *) src;
++	xz_buf->in_pos = 0;
++	xz_buf->in_size = slen;
++	xz_buf->out = (u8 *) dst;
++	xz_buf->out_pos = 0;
++	xz_buf->out_size = *dlen;
++
++	ret = xz_dec_run(dctx->decomp_state, xz_buf);
++	if (ret != XZ_STREAM_END) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	*dlen = xz_buf->out_pos;
++	ret = 0;
++
++out:
++	return ret;
++}
++
++static struct crypto_alg crypto_xz_alg = {
++	.cra_name		= "xz",
++	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,
++	.cra_ctxsize		= sizeof(struct xz_comp_ctx),
++	.cra_module		= THIS_MODULE,
++	.cra_list		= LIST_HEAD_INIT(crypto_xz_alg.cra_list),
++	.cra_init		= crypto_xz_init,
++	.cra_exit		= crypto_xz_exit,
++	.cra_u			= { .compress = {
++	.coa_compress 		= crypto_xz_compress,
++	.coa_decompress  	= crypto_xz_decompress } }
++};
++
++static int __init crypto_xz_mod_init(void)
++{
++	return crypto_register_alg(&crypto_xz_alg);
++}
++
++static void __exit crypto_xz_mod_exit(void)
++{
++	crypto_unregister_alg(&crypto_xz_alg);
++}
++
++module_init(crypto_xz_mod_init);
++module_exit(crypto_xz_mod_exit);
++
++MODULE_LICENSE("GPL v2");
++MODULE_DESCRIPTION("Crypto XZ decompression support");
++MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/trunk/target/linux/generic/patches-3.3/541-ubifs-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.3/541-ubifs-xz-decompression-support.patch
new file mode 100644
index 00000000..3442d90d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/541-ubifs-xz-decompression-support.patch
@@ -0,0 +1,94 @@
+--- a/fs/ubifs/Kconfig
++++ b/fs/ubifs/Kconfig
+@@ -5,8 +5,10 @@ config UBIFS_FS
+ 	select CRYPTO if UBIFS_FS_ADVANCED_COMPR
+ 	select CRYPTO if UBIFS_FS_LZO
+ 	select CRYPTO if UBIFS_FS_ZLIB
++	select CRYPTO if UBIFS_FS_XZ
+ 	select CRYPTO_LZO if UBIFS_FS_LZO
+ 	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
++	select CRYPTO_XZ if UBIFS_FS_XZ
+ 	depends on MTD_UBI
+ 	help
+ 	  UBIFS is a file system for flash devices which works on top of UBI.
+@@ -42,6 +44,14 @@ config UBIFS_FS_ZLIB
+ 	help
+ 	  Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
+ 
++config UBIFS_FS_XZ
++	bool "XZ decompression support" if UBIFS_FS_ADVANCED_COMPR
++	depends on UBIFS_FS
++	default y
++	help
++	  XZ compresses better the ZLIB but it is slower. 
++	  Say 'Y' if unsure.
++
+ # Debugging-related stuff
+ config UBIFS_FS_DEBUG
+ 	bool "Enable debugging support"
+--- a/fs/ubifs/compress.c
++++ b/fs/ubifs/compress.c
+@@ -71,6 +71,24 @@ static struct ubifs_compressor zlib_comp
+ };
+ #endif
+ 
++#ifdef CONFIG_UBIFS_FS_XZ
++static DEFINE_MUTEX(xz_enc_mutex);
++static DEFINE_MUTEX(xz_dec_mutex);
++
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.comp_mutex = &xz_enc_mutex,
++	.decomp_mutex = &xz_dec_mutex,
++	.name = "xz",
++	.capi_name = "xz",
++};
++#else
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.name = "xz",
++};
++#endif
++
+ /* All UBIFS compressors */
+ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
+ 
+@@ -233,9 +251,15 @@ int __init ubifs_compressors_init(void)
+ 	if (err)
+ 		goto out_lzo;
+ 
++	err = compr_init(&xz_compr);
++	if (err)
++		goto out_zlib;
++
+ 	ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+ 	return 0;
+ 
++out_zlib:
++	compr_exit(&zlib_compr);
+ out_lzo:
+ 	compr_exit(&lzo_compr);
+ 	return err;
+@@ -248,4 +272,5 @@ void ubifs_compressors_exit(void)
+ {
+ 	compr_exit(&lzo_compr);
+ 	compr_exit(&zlib_compr);
++	compr_exit(&xz_compr);
+ }
+--- a/fs/ubifs/ubifs-media.h
++++ b/fs/ubifs/ubifs-media.h
+@@ -332,12 +332,14 @@ enum {
+  * UBIFS_COMPR_NONE: no compression
+  * UBIFS_COMPR_LZO: LZO compression
+  * UBIFS_COMPR_ZLIB: ZLIB compression
++ * UBIFS_COMPR_XZ: XZ compression
+  * UBIFS_COMPR_TYPES_CNT: count of supported compression types
+  */
+ enum {
+ 	UBIFS_COMPR_NONE,
+ 	UBIFS_COMPR_LZO,
+ 	UBIFS_COMPR_ZLIB,
++	UBIFS_COMPR_XZ,
+ 	UBIFS_COMPR_TYPES_CNT,
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/550-ubifs-symlink-xattr-support.patch b/trunk/target/linux/generic/patches-3.3/550-ubifs-symlink-xattr-support.patch
new file mode 100644
index 00000000..b0d818e8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/550-ubifs-symlink-xattr-support.patch
@@ -0,0 +1,67 @@
+--- a/fs/ubifs/file.c
++++ b/fs/ubifs/file.c
+@@ -1575,6 +1575,12 @@ const struct inode_operations ubifs_syml
+ 	.follow_link = ubifs_follow_link,
+ 	.setattr     = ubifs_setattr,
+ 	.getattr     = ubifs_getattr,
++#ifdef CONFIG_UBIFS_FS_XATTR
++	.setxattr    = ubifs_setxattr,
++	.getxattr    = ubifs_getxattr,
++	.listxattr   = ubifs_listxattr,
++	.removexattr = ubifs_removexattr,
++#endif
+ };
+ 
+ const struct file_operations ubifs_file_operations = {
+--- a/fs/ubifs/journal.c
++++ b/fs/ubifs/journal.c
+@@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu",
+ 		inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino);
+-	ubifs_assert(dir_ui->data_len == 0);
++	if (!xent)
++		ubifs_assert(dir_ui->data_len == 0);
+ 	ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex));
+ 
+ 	dlen = UBIFS_DENT_NODE_SZ + nm->len + 1;
+@@ -573,6 +574,13 @@ int ubifs_jnl_update(struct ubifs_info *
+ 	aligned_dlen = ALIGN(dlen, 8);
+ 	aligned_ilen = ALIGN(ilen, 8);
+ 	len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
++	if (xent) {
++		/*
++		 * Make sure to account for dir_ui->data_len in
++		 * length calculation in case there is extended attribute.
++		 */
++		len += dir_ui->data_len;
++	}
+ 	dent = kmalloc(len, GFP_NOFS);
+ 	if (!dent)
+ 		return -ENOMEM;
+@@ -649,7 +657,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	ino_key_init(c, &ino_key, dir->i_ino);
+ 	ino_offs += aligned_ilen;
+-	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ);
++	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs,
++			    UBIFS_INO_NODE_SZ + dir_ui->data_len);
+ 	if (err)
+ 		goto out_ro;
+ 
+--- a/fs/ubifs/xattr.c
++++ b/fs/ubifs/xattr.c
+@@ -209,12 +209,12 @@ static int change_xattr(struct ubifs_inf
+ 		goto out_free;
+ 	}
+ 	inode->i_size = ui->ui_size = size;
+-	ui->data_len = size;
+ 
+ 	mutex_lock(&host_ui->ui_mutex);
+ 	host->i_ctime = ubifs_current_time(host);
+ 	host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len);
+ 	host_ui->xattr_size += CALC_XATTR_BYTES(size);
++	ui->data_len = size;
+ 
+ 	/*
+ 	 * It is important to write the host inode after the xattr inode
diff --git a/trunk/target/linux/generic/patches-3.3/600-netfilter_layer7_2.22.patch b/trunk/target/linux/generic/patches-3.3/600-netfilter_layer7_2.22.patch
new file mode 100644
index 00000000..f3055590
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/600-netfilter_layer7_2.22.patch
@@ -0,0 +1,2142 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1053,6 +1053,27 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on NETFILTER_XTABLES
++	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
++       depends on NETFILTER_ADVANCED
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++        bool 'Layer 7 debugging output'
++        depends on NETFILTER_XT_MATCH_LAYER7
++        help
++          Say Y to get lots of debugging output.
++
++
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -105,6 +105,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
+--- /dev/null
++++ b/net/netfilter/xt_layer7.c
+@@ -0,0 +1,666 @@
++/*
++  Kernel module to match application layer (OSI layer 7) data in connections.
++
++  http://l7-filter.sf.net
++
++  (C) 2003-2009 Matthew Strait and Ethan Sommer.
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU General Public License
++  as published by the Free Software Foundation; either version
++  2 of the License, or (at your option) any later version.
++  http://www.gnu.org/licenses/gpl.txt
++
++  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
++  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
++  Ethan Sommer, Justin Levandoski.
++*/
++
++#include <linux/spinlock.h>
++#include <linux/version.h>
++#include <net/ip.h>
++#include <net/tcp.h>
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_acct.h>
++#endif
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_layer7.h>
++#include <linux/ctype.h>
++#include <linux/proc_fs.h>
++
++#include "regexp/regexp.c"
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
++MODULE_DESCRIPTION("iptables application layer match module");
++MODULE_ALIAS("ipt_layer7");
++MODULE_VERSION("2.21");
++
++static int maxdatalen = 2048; // this is the default
++module_param(maxdatalen, int, 0444);
++MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
++#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
++	#define DPRINTK(format,args...) printk(format,##args)
++#else
++	#define DPRINTK(format,args...)
++#endif
++
++/* Number of packets whose data we look at.
++This can be modified through /proc/net/layer7_numpackets */
++static int num_packets = 10;
++
++static struct pattern_cache {
++	char * regex_string;
++	regexp * pattern;
++	struct pattern_cache * next;
++} * first_pattern_cache = NULL;
++
++DEFINE_SPINLOCK(l7_lock);
++
++static int total_acct_packets(struct nf_conn *ct)
++{
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
++	BUG_ON(ct == NULL);
++	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
++#else
++	struct nf_conn_counter *acct;
++
++	BUG_ON(ct == NULL);
++	acct = nf_conn_acct_find(ct);
++	if (!acct)
++		return 0;
++	return (atomic64_read(&acct[IP_CT_DIR_ORIGINAL].packets) + atomic64_read(&acct[IP_CT_DIR_REPLY].packets));
++#endif
++}
++
++#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++/* Converts an unfriendly string into a friendly one by
++replacing unprintables with periods and all whitespace with " ". */
++static char * friendly_print(unsigned char * s)
++{
++	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
++	int i;
++
++	if(!f) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"friendly_print, bailing.\n");
++		return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++){
++		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
++		else if(isspace(s[i]))		f[i] = ' ';
++		else 				f[i] = '.';
++	}
++	f[i] = '\0';
++	return f;
++}
++
++static char dec2hex(int i)
++{
++	switch (i) {
++		case 0 ... 9:
++			return (i + '0');
++			break;
++		case 10 ... 15:
++			return (i - 10 + 'a');
++			break;
++		default:
++			if (net_ratelimit())
++				printk("layer7: Problem in dec2hex\n");
++			return '\0';
++	}
++}
++
++static char * hex_print(unsigned char * s)
++{
++	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
++	int i;
++
++	if(!g) {
++	       if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in hex_print, "
++					"bailing.\n");
++	       return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++) {
++		g[i*3    ] = dec2hex(s[i]/16);
++		g[i*3 + 1] = dec2hex(s[i]%16);
++		g[i*3 + 2] = ' ';
++	}
++	g[i*3] = '\0';
++
++	return g;
++}
++#endif // DEBUG
++
++/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
++over again, it make sense to cache the results. */
++static regexp * compile_and_cache(const char * regex_string, 
++                                  const char * protocol)
++{
++	struct pattern_cache * node               = first_pattern_cache;
++	struct pattern_cache * last_pattern_cache = first_pattern_cache;
++	struct pattern_cache * tmp;
++	unsigned int len;
++
++	while (node != NULL) {
++		if (!strcmp(node->regex_string, regex_string))
++		return node->pattern;
++
++		last_pattern_cache = node;/* points at the last non-NULL node */
++		node = node->next;
++	}
++
++	/* If we reach the end of the list, then we have not yet cached
++	   the pattern for this regex. Let's do that now.
++	   Be paranoid about running out of memory to avoid list corruption. */
++	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
++
++	if(!tmp) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		return NULL;
++	}
++
++	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
++	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
++	tmp->next = NULL;
++
++	if(!tmp->regex_string || !tmp->pattern) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		kfree(tmp->regex_string);
++		kfree(tmp->pattern);
++		kfree(tmp);
++		return NULL;
++	}
++
++	/* Ok.  The new node is all ready now. */
++	node = tmp;
++
++	if(first_pattern_cache == NULL) /* list is empty */
++		first_pattern_cache = node; /* make node the beginning */
++	else
++		last_pattern_cache->next = node; /* attach node to the end */
++
++	/* copy the string and compile the regex */
++	len = strlen(regex_string);
++	DPRINTK("About to compile this: \"%s\"\n", regex_string);
++	node->pattern = regcomp((char *)regex_string, &len);
++	if ( !node->pattern ) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: Error compiling regexp "
++					"\"%s\" (%s)\n", 
++					regex_string, protocol);
++		/* pattern is now cached as NULL, so we won't try again. */
++	}
++
++	strcpy(node->regex_string, regex_string);
++	return node->pattern;
++}
++
++static int can_handle(const struct sk_buff *skb)
++{
++	if(!ip_hdr(skb)) /* not IP */
++		return 0;
++	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
++	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
++	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
++		return 0;
++	return 1;
++}
++
++/* Returns offset the into the skb->data that the application data starts */
++static int app_data_offset(const struct sk_buff *skb)
++{
++	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
++	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
++	int ip_hl = 4*ip_hdr(skb)->ihl;
++
++	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
++		/* 12 == offset into TCP header for the header length field.
++		Can't get this with skb->h.th->doff because the tcphdr
++		struct doesn't get set when routing (this is confirmed to be
++		true in Netfilter as well as QoS.) */
++		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
++
++		return ip_hl + tcp_hl;
++	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
++		return ip_hl + 8; /* UDP header is always 8 bytes */
++	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
++		return ip_hl + 8; /* ICMP header is 8 bytes */
++	} else {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: tried to handle unknown "
++					"protocol!\n");
++		return ip_hl + 8; /* something reasonable */
++	}
++}
++
++/* handles whether there's a match when we aren't appending data anymore */
++static int match_no_append(struct nf_conn * conntrack, 
++                           struct nf_conn * master_conntrack, 
++                           enum ip_conntrack_info ctinfo,
++                           enum ip_conntrack_info master_ctinfo,
++                           const struct xt_layer7_info * info)
++{
++	/* If we're in here, throw the app data away */
++	if(master_conntrack->layer7.app_data != NULL) {
++
++	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++		if(!master_conntrack->layer7.app_proto) {
++			char * f = 
++			  friendly_print(master_conntrack->layer7.app_data);
++			char * g = 
++			  hex_print(master_conntrack->layer7.app_data);
++			DPRINTK("\nl7-filter gave up after %d bytes "
++				"(%d packets):\n%s\n",
++				strlen(f), total_acct_packets(master_conntrack), f);
++			kfree(f);
++			DPRINTK("In hex: %s\n", g);
++			kfree(g);
++		}
++	#endif
++
++		kfree(master_conntrack->layer7.app_data);
++		master_conntrack->layer7.app_data = NULL; /* don't free again */
++	}
++
++	if(master_conntrack->layer7.app_proto){
++		/* Here child connections set their .app_proto (for /proc) */
++		if(!conntrack->layer7.app_proto) {
++			conntrack->layer7.app_proto = 
++			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
++			    GFP_ATOMIC);
++			if(!conntrack->layer7.app_proto){
++				if (net_ratelimit())
++					printk(KERN_ERR "layer7: out of memory "
++							"in match_no_append, "
++							"bailing.\n");
++				return 1;
++			}
++			strcpy(conntrack->layer7.app_proto, 
++				master_conntrack->layer7.app_proto);
++		}
++
++		return (!strcmp(master_conntrack->layer7.app_proto, 
++				info->protocol));
++	}
++	else {
++		/* If not classified, set to "unknown" to distinguish from
++		connections that are still being tested. */
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match_no_append, bailing.\n");
++			return 1;
++		}
++		strcpy(master_conntrack->layer7.app_proto, "unknown");
++		return 0;
++	}
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length = 0, i;
++	int oldlength = master_conntrack->layer7.app_data_len;
++
++	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
++	   clear on whether the race condition exists or whether this really 
++	   fixes it.  I might just be being dense... Anyway, if it's not really 
++	   a fix, all it does is waste a very small amount of time. */
++	if(!master_conntrack->layer7.app_data) return 0;
++
++	/* Strip nulls. Make everything lower case (our regex lib doesn't
++	do case insensitivity).  Add it to the end of the current data. */
++	for(i = 0; i < maxdatalen-oldlength-1 &&
++		   i < appdatalen; i++) {
++		if(app_data[i] != '\0') {
++			/* the kernel version of tolower mungs 'upper ascii' */
++			master_conntrack->layer7.app_data[length+oldlength] =
++				isascii(app_data[i])? 
++					tolower(app_data[i]) : app_data[i];
++			length++;
++		}
++	}
++
++	master_conntrack->layer7.app_data[length+oldlength] = '\0';
++	master_conntrack->layer7.app_data_len = length + oldlength;
++
++	return length;
++}
++
++/* taken from drivers/video/modedb.c */
++static int my_atoi(const char *s)
++{
++	int val = 0;
++
++	for (;; s++) {
++		switch (*s) {
++			case '0'...'9':
++			val = 10*val+(*s-'0');
++			break;
++		default:
++			return val;
++		}
++	}
++}
++
++/* write out num_packets to userland. */
++static int layer7_read_proc(char* page, char ** start, off_t off, int count,
++                            int* eof, void * data)
++{
++	if(num_packets > 99 && net_ratelimit())
++		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
++
++	page[0] = num_packets/10 + '0';
++	page[1] = num_packets%10 + '0';
++	page[2] = '\n';
++	page[3] = '\0';
++
++	*eof=1;
++
++	return 3;
++}
++
++/* Read in num_packets from userland */
++static int layer7_write_proc(struct file* file, const char* buffer,
++                             unsigned long count, void *data)
++{
++	char * foo = kmalloc(count, GFP_ATOMIC);
++
++	if(!foo){
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory, bailing. "
++					"num_packets unchanged.\n");
++		return count;
++	}
++
++	if(copy_from_user(foo, buffer, count)) {
++		return -EFAULT;
++	}
++
++
++	num_packets = my_atoi(foo);
++	kfree (foo);
++
++	/* This has an arbitrary limit to make the math easier. I'm lazy.
++	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
++	if(num_packets > 99) {
++		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
++		num_packets = 99;
++	} else if(num_packets < 1) {
++		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
++		num_packets = 1;
++	}
++
++	return count;
++}
++
++static bool
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++match(const struct sk_buff *skbin, const struct xt_match_param *par)
++#else
++match(const struct sk_buff *skbin,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      bool *hotdrop)
++#endif
++{
++	/* sidestep const without getting a compiler warning... */
++	struct sk_buff * skb = (struct sk_buff *)skbin; 
++
++	const struct xt_layer7_info * info = 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++		par->matchinfo;
++	#else
++		matchinfo;
++	#endif
++
++	enum ip_conntrack_info master_ctinfo, ctinfo;
++	struct nf_conn *master_conntrack, *conntrack;
++	unsigned char * app_data;
++	unsigned int pattern_result, appdatalen;
++	regexp * comppattern;
++
++	/* Be paranoid/incompetent - lock the entire match function. */
++	spin_lock_bh(&l7_lock);
++
++	if(!can_handle(skb)){
++		DPRINTK("layer7: This is some protocol I can't handle.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Treat parent & all its children together as one connection, except
++	for the purpose of setting conntrack->layer7.app_proto in the actual
++	connection. This makes /proc/net/ip_conntrack more satisfying. */
++	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
++	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
++		DPRINTK("layer7: couldn't get conntrack.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
++	while (master_ct(master_conntrack) != NULL)
++		master_conntrack = master_ct(master_conntrack);
++
++	/* if we've classified it or seen too many packets */
++	if(total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto) {
++
++		pattern_result = match_no_append(conntrack, master_conntrack, 
++						 ctinfo, master_ctinfo, info);
++
++		/* skb->cb[0] == seen. Don't do things twice if there are 
++		multiple l7 rules. I'm not sure that using cb for this purpose 
++		is correct, even though it says "put your private variables 
++		there". But it doesn't look like it is being used for anything
++		else in the skbs that make it here. */
++		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
++
++		spin_unlock_bh(&l7_lock);
++		return (pattern_result ^ info->invert);
++	}
++
++	if(skb_is_nonlinear(skb)){
++		if(skb_linearize(skb) != 0){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: failed to linearize "
++						"packet, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* now that the skb is linearized, it's safe to set these. */
++	app_data = skb->data + app_data_offset(skb);
++	appdatalen = skb_tail_pointer(skb) - app_data;
++
++	/* the return value gets checked later, when we're ready to use it */
++	comppattern = compile_and_cache(info->pattern, info->protocol);
++
++	/* On the first packet of a connection, allocate space for app data */
++	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
++	   !master_conntrack->layer7.app_data){
++		master_conntrack->layer7.app_data = 
++			kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++
++		master_conntrack->layer7.app_data[0] = '\0';
++	}
++
++	/* Can be here, but unallocated, if numpackets is increased near
++	the beginning of a connection */
++	if(master_conntrack->layer7.app_data == NULL){
++		spin_unlock_bh(&l7_lock);
++		return info->invert; /* unmatched */
++	}
++
++	if(!skb->cb[0]){
++		int newbytes;
++		newbytes = add_data(master_conntrack, app_data, appdatalen);
++
++		if(newbytes == 0) { /* didn't add any data */
++			skb->cb[0] = 1;
++			/* Didn't match before, not going to match now */
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* If looking for "unknown", then never match.  "Unknown" means that
++	we've given up; we're still trying with these packets. */
++	if(!strcmp(info->protocol, "unknown")) {
++		pattern_result = 0;
++	/* If looking for "unset", then always match. "Unset" means that we
++	haven't yet classified the connection. */
++	} else if(!strcmp(info->protocol, "unset")) {
++		pattern_result = 2;
++		DPRINTK("layer7: matched unset: not yet classified "
++			"(%d/%d packets)\n",
++                        total_acct_packets(master_conntrack), num_packets);
++	/* If the regexp failed to compile, don't bother running it */
++	} else if(comppattern && 
++		  regexec(comppattern, master_conntrack->layer7.app_data)){
++		DPRINTK("layer7: matched %s\n", info->protocol);
++		pattern_result = 1;
++	} else pattern_result = 0;
++
++	if(pattern_result == 1) {
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return (pattern_result ^ info->invert);
++		}
++		strcpy(master_conntrack->layer7.app_proto, info->protocol);
++	} else if(pattern_result > 1) { /* cleanup from "unset" */
++		pattern_result = 1;
++	}
++
++	/* mark the packet seen */
++	skb->cb[0] = 1;
++
++	spin_unlock_bh(&l7_lock);
++	return (pattern_result ^ info->invert);
++}
++
++// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++static bool check(const struct xt_mtchk_param *par)
++{
++        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", par->match->family);
++#else
++static bool check(const char *tablename, const void *inf,
++		 const struct xt_match *match, void *matchinfo,
++		 unsigned int hook_mask)
++{
++        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", match->family);
++#endif
++                return 0;
++        }
++	return 1;
++}
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++	static void destroy(const struct xt_mtdtor_param *par)
++	{
++		nf_ct_l3proto_module_put(par->match->family);
++	}
++#else
++	static void destroy(const struct xt_match *match, void *matchinfo)
++	{
++		nf_ct_l3proto_module_put(match->family);
++	}
++#endif
++
++static struct xt_match xt_layer7_match[] __read_mostly = {
++{
++	.name		= "layer7",
++	.family		= AF_INET,
++	.checkentry	= check,
++	.match		= match,
++	.destroy	= destroy,
++	.matchsize	= sizeof(struct xt_layer7_info),
++	.me		= THIS_MODULE
++}
++};
++
++static void layer7_cleanup_proc(void)
++{
++	remove_proc_entry("layer7_numpackets", init_net.proc_net);
++}
++
++/* register the proc file */
++static void layer7_init_proc(void)
++{
++	struct proc_dir_entry* entry;
++	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
++	entry->read_proc = layer7_read_proc;
++	entry->write_proc = layer7_write_proc;
++}
++
++static int __init xt_layer7_init(void)
++{
++	need_conntrack();
++
++	layer7_init_proc();
++	if(maxdatalen < 1) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
++			"using 1\n");
++		maxdatalen = 1;
++	}
++	/* This is not a hard limit.  It's just here to prevent people from
++	bringing their slow machines to a grinding halt. */
++	else if(maxdatalen > 65536) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
++			"using 65536\n");
++		maxdatalen = 65536;
++	}
++	return xt_register_matches(xt_layer7_match,
++				   ARRAY_SIZE(xt_layer7_match));
++}
++
++static void __exit xt_layer7_fini(void)
++{
++	layer7_cleanup_proc();
++	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
++}
++
++module_init(xt_layer7_init);
++module_exit(xt_layer7_fini);
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.c
+@@ -0,0 +1,1197 @@
++/*
++ * regcomp and regexec -- regsub and regerror are elsewhere
++ * @(#)regexp.c	1.3 of 18 April 87
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ * Beware that some of this code is subtly aware of the way operator
++ * precedence is structured in regular expressions.  Serious changes in
++ * regular-expression syntax might require a total rethink.
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ * Modified slightly by Matthew Strait to use more modern C.
++ */
++
++#include "regexp.h"
++#include "regmagic.h"
++
++/* added by ethan and matt.  Lets it work in both kernel and user space.
++(So iptables can use it, for instance.)  Yea, it goes both ways... */
++#if __KERNEL__
++  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
++#else
++  #define printk(format,args...) printf(format,##args)
++#endif
++
++void regerror(char * s)
++{
++        printk("<3>Regexp: %s\n", s);
++        /* NOTREACHED */
++}
++
++/*
++ * The "internal use only" fields in regexp.h are present to pass info from
++ * compile to execute that permits the execute phase to run lots faster on
++ * simple cases.  They are:
++ *
++ * regstart	char that must begin a match; '\0' if none obvious
++ * reganch	is the match anchored (at beginning-of-line only)?
++ * regmust	string (pointer into program) that match must include, or NULL
++ * regmlen	length of regmust string
++ *
++ * Regstart and reganch permit very fast decisions on suitable starting points
++ * for a match, cutting down the work a lot.  Regmust permits fast rejection
++ * of lines that cannot possibly match.  The regmust tests are costly enough
++ * that regcomp() supplies a regmust only if the r.e. contains something
++ * potentially expensive (at present, the only such thing detected is * or +
++ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
++ * supplied because the test in regexec() needs it and regcomp() is computing
++ * it anyway.
++ */
++
++/*
++ * Structure for regexp "program".  This is essentially a linear encoding
++ * of a nondeterministic finite-state machine (aka syntax charts or
++ * "railroad normal form" in parsing technology).  Each node is an opcode
++ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
++ * all nodes except BRANCH implement concatenation; a "next" pointer with
++ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
++ * have one of the subtle syntax dependencies:  an individual BRANCH (as
++ * opposed to a collection of them) is never concatenated with anything
++ * because of operator precedence.)  The operand of some types of node is
++ * a literal string; for others, it is a node leading into a sub-FSM.  In
++ * particular, the operand of a BRANCH node is the first node of the branch.
++ * (NB this is *not* a tree structure:  the tail of the branch connects
++ * to the thing following the set of BRANCHes.)  The opcodes are:
++ */
++
++/* definition	number	opnd?	meaning */
++#define	END	0	/* no	End of program. */
++#define	BOL	1	/* no	Match "" at beginning of line. */
++#define	EOL	2	/* no	Match "" at end of line. */
++#define	ANY	3	/* no	Match any one character. */
++#define	ANYOF	4	/* str	Match any character in this string. */
++#define	ANYBUT	5	/* str	Match any character not in this string. */
++#define	BRANCH	6	/* node	Match this alternative, or the next... */
++#define	BACK	7	/* no	Match "", "next" ptr points backward. */
++#define	EXACTLY	8	/* str	Match this string. */
++#define	NOTHING	9	/* no	Match empty string. */
++#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
++#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
++#define	OPEN	20	/* no	Mark this point in input as start of #n. */
++			/*	OPEN+1 is number 1, etc. */
++#define	CLOSE	30	/* no	Analogous to OPEN. */
++
++/*
++ * Opcode notes:
++ *
++ * BRANCH	The set of branches constituting a single choice are hooked
++ *		together with their "next" pointers, since precedence prevents
++ *		anything being concatenated to any individual branch.  The
++ *		"next" pointer of the last BRANCH in a choice points to the
++ *		thing following the whole choice.  This is also where the
++ *		final "next" pointer of each individual branch points; each
++ *		branch starts with the operand node of a BRANCH node.
++ *
++ * BACK		Normal "next" pointers all implicitly point forward; BACK
++ *		exists to make loop structures possible.
++ *
++ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
++ *		BRANCH structures using BACK.  Simple cases (one character
++ *		per match) are implemented with STAR and PLUS for speed
++ *		and to minimize recursive plunges.
++ *
++ * OPEN,CLOSE	...are numbered at compile time.
++ */
++
++/*
++ * A node is one char of opcode followed by two chars of "next" pointer.
++ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
++ * value is a positive offset from the opcode of the node containing it.
++ * An operand, if any, simply follows the node.  (Note that much of the
++ * code generation knows about this implicit relationship.)
++ *
++ * Using two bytes for the "next" pointer is vast overkill for most things,
++ * but allows patterns to get big without disasters.
++ */
++#define	OP(p)	(*(p))
++#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
++#define	OPERAND(p)	((p) + 3)
++
++/*
++ * See regmagic.h for one further detail of program structure.
++ */
++
++
++/*
++ * Utility definitions.
++ */
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#define	FAIL(m)	{ regerror(m); return(NULL); }
++#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
++#define	META	"^$.[()|?+*\\"
++
++/*
++ * Flags to be passed up and down.
++ */
++#define	HASWIDTH	01	/* Known never to match null string. */
++#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
++#define	SPSTART		04	/* Starts with * or +. */
++#define	WORST		0	/* Worst case. */
++
++/*
++ * Global work variables for regcomp().
++ */
++struct match_globals {
++char *reginput;		/* String-input pointer. */
++char *regbol;		/* Beginning of input, for ^ check. */
++char **regstartp;	/* Pointer to startp array. */
++char **regendp;		/* Ditto for endp. */
++char *regparse;		/* Input-scan pointer. */
++int regnpar;		/* () count. */
++char regdummy;
++char *regcode;		/* Code-emit pointer; &regdummy = don't. */
++long regsize;		/* Code size. */
++};
++
++/*
++ * Forward declarations for regcomp()'s friends.
++ */
++#ifndef STATIC
++#define	STATIC	static
++#endif
++STATIC char *reg(struct match_globals *g, int paren,int *flagp);
++STATIC char *regbranch(struct match_globals *g, int *flagp);
++STATIC char *regpiece(struct match_globals *g, int *flagp);
++STATIC char *regatom(struct match_globals *g, int *flagp);
++STATIC char *regnode(struct match_globals *g, char op);
++STATIC char *regnext(struct match_globals *g, char *p);
++STATIC void regc(struct match_globals *g, char b);
++STATIC void reginsert(struct match_globals *g, char op, char *opnd);
++STATIC void regtail(struct match_globals *g, char *p, char *val);
++STATIC void regoptail(struct match_globals *g, char *p, char *val);
++
++
++__kernel_size_t my_strcspn(const char *s1,const char *s2)
++{
++        char *scan1;
++        char *scan2;
++        int count;
++
++        count = 0;
++        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
++                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
++                        if (*scan1 == *scan2++)
++                                return(count);
++                count++;
++        }
++        return(count);
++}
++
++/*
++ - regcomp - compile a regular expression into internal code
++ *
++ * We can't allocate space until we know how big the compiled form will be,
++ * but we can't compile it (and thus know how big it is) until we've got a
++ * place to put the code.  So we cheat:  we compile it twice, once with code
++ * generation turned off and size counting turned on, and once "for real".
++ * This also means that we don't allocate space until we are sure that the
++ * thing really will compile successfully, and we never have to move the
++ * code and thus invalidate pointers into it.  (Note that it has to be in
++ * one piece because free() must be able to free it all.)
++ *
++ * Beware that the optimization-preparation code in here knows about some
++ * of the structure of the compiled regexp.
++ */
++regexp *
++regcomp(char *exp,int *patternsize)
++{
++	register regexp *r;
++	register char *scan;
++	register char *longest;
++	register int len;
++	int flags;
++	struct match_globals g;
++	
++	/* commented out by ethan
++	   extern char *malloc();
++	*/
++
++	if (exp == NULL)
++		FAIL("NULL argument");
++
++	/* First pass: determine size, legality. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regsize = 0L;
++	g.regcode = &g.regdummy;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Small enough for pointer-storage convention? */
++	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
++		FAIL("regexp too big");
++
++	/* Allocate space. */
++	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
++	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
++	if (r == NULL)
++		FAIL("out of space");
++
++	/* Second pass: emit code. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regcode = r->program;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Dig out information for optimizations. */
++	r->regstart = '\0';	/* Worst-case defaults. */
++	r->reganch = 0;
++	r->regmust = NULL;
++	r->regmlen = 0;
++	scan = r->program+1;			/* First BRANCH. */
++	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
++		scan = OPERAND(scan);
++
++		/* Starting-point info. */
++		if (OP(scan) == EXACTLY)
++			r->regstart = *OPERAND(scan);
++		else if (OP(scan) == BOL)
++			r->reganch++;
++
++		/*
++		 * If there's something expensive in the r.e., find the
++		 * longest literal string that must appear and make it the
++		 * regmust.  Resolve ties in favor of later strings, since
++		 * the regstart check works with the beginning of the r.e.
++		 * and avoiding duplication strengthens checking.  Not a
++		 * strong reason, but sufficient in the absence of others.
++		 */
++		if (flags&SPSTART) {
++			longest = NULL;
++			len = 0;
++			for (; scan != NULL; scan = regnext(&g, scan))
++				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
++					longest = OPERAND(scan);
++					len = strlen(OPERAND(scan));
++				}
++			r->regmust = longest;
++			r->regmlen = len;
++		}
++	}
++
++	return(r);
++}
++
++/*
++ - reg - regular expression, i.e. main body or parenthesized thing
++ *
++ * Caller must absorb opening parenthesis.
++ *
++ * Combining parenthesis handling with the base level of regular expression
++ * is a trifle forced, but the need to tie the tails of the branches to what
++ * follows makes it hard to avoid.
++ */
++static char *
++reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
++{
++	register char *ret;
++	register char *br;
++	register char *ender;
++	register int parno = 0; /* 0 makes gcc happy */
++	int flags;
++
++	*flagp = HASWIDTH;	/* Tentatively. */
++
++	/* Make an OPEN node, if parenthesized. */
++	if (paren) {
++		if (g->regnpar >= NSUBEXP)
++			FAIL("too many ()");
++		parno = g->regnpar;
++		g->regnpar++;
++		ret = regnode(g, OPEN+parno);
++	} else
++		ret = NULL;
++
++	/* Pick up the branches, linking them together. */
++	br = regbranch(g, &flags);
++	if (br == NULL)
++		return(NULL);
++	if (ret != NULL)
++		regtail(g, ret, br);	/* OPEN -> first. */
++	else
++		ret = br;
++	if (!(flags&HASWIDTH))
++		*flagp &= ~HASWIDTH;
++	*flagp |= flags&SPSTART;
++	while (*g->regparse == '|') {
++		g->regparse++;
++		br = regbranch(g, &flags);
++		if (br == NULL)
++			return(NULL);
++		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
++		if (!(flags&HASWIDTH))
++			*flagp &= ~HASWIDTH;
++		*flagp |= flags&SPSTART;
++	}
++
++	/* Make a closing node, and hook it on the end. */
++	ender = regnode(g, (paren) ? CLOSE+parno : END);	
++	regtail(g, ret, ender);
++
++	/* Hook the tails of the branches to the closing node. */
++	for (br = ret; br != NULL; br = regnext(g, br))
++		regoptail(g, br, ender);
++
++	/* Check for proper termination. */
++	if (paren && *g->regparse++ != ')') {
++		FAIL("unmatched ()");
++	} else if (!paren && *g->regparse != '\0') {
++		if (*g->regparse == ')') {
++			FAIL("unmatched ()");
++		} else
++			FAIL("junk on end");	/* "Can't happen". */
++		/* NOTREACHED */
++	}
++
++	return(ret);
++}
++
++/*
++ - regbranch - one alternative of an | operator
++ *
++ * Implements the concatenation operator.
++ */
++static char *
++regbranch(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char *chain;
++	register char *latest;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	ret = regnode(g, BRANCH);
++	chain = NULL;
++	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
++		latest = regpiece(g, &flags);
++		if (latest == NULL)
++			return(NULL);
++		*flagp |= flags&HASWIDTH;
++		if (chain == NULL)	/* First piece. */
++			*flagp |= flags&SPSTART;
++		else
++			regtail(g, chain, latest);
++		chain = latest;
++	}
++	if (chain == NULL)	/* Loop ran zero times. */
++		(void) regnode(g, NOTHING);
++
++	return(ret);
++}
++
++/*
++ - regpiece - something followed by possible [*+?]
++ *
++ * Note that the branching code sequences used for ? and the general cases
++ * of * and + are somewhat optimized:  they use the same NOTHING node as
++ * both the endmarker for their branch list and the body of the last branch.
++ * It might seem that this node could be dispensed with entirely, but the
++ * endmarker role is not redundant.
++ */
++static char *
++regpiece(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char op;
++	register char *next;
++	int flags;
++
++	ret = regatom(g, &flags);
++	if (ret == NULL)
++		return(NULL);
++
++	op = *g->regparse;
++	if (!ISMULT(op)) {
++		*flagp = flags;
++		return(ret);
++	}
++
++	if (!(flags&HASWIDTH) && op != '?')
++		FAIL("*+ operand could be empty");
++	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
++
++	if (op == '*' && (flags&SIMPLE))
++		reginsert(g, STAR, ret);
++	else if (op == '*') {
++		/* Emit x* as (x&|), where & means "self". */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regoptail(g, ret, regnode(g, BACK));		/* and loop */
++		regoptail(g, ret, ret);			/* back */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '+' && (flags&SIMPLE))
++		reginsert(g, PLUS, ret);
++	else if (op == '+') {
++		/* Emit x+ as x(&|), where & means "self". */
++		next = regnode(g, BRANCH);			/* Either */
++		regtail(g, ret, next);
++		regtail(g, regnode(g, BACK), ret);		/* loop back */
++		regtail(g, next, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '?') {
++		/* Emit x? as (x|) */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		next = regnode(g, NOTHING);		/* null. */
++		regtail(g, ret, next);
++		regoptail(g, ret, next);
++	}
++	g->regparse++;
++	if (ISMULT(*g->regparse))
++		FAIL("nested *?+");
++
++	return(ret);
++}
++
++/*
++ - regatom - the lowest level
++ *
++ * Optimization:  gobbles an entire sequence of ordinary characters so that
++ * it can turn them into a single node, which is smaller to store and
++ * faster to run.  Backslashed characters are exceptions, each becoming a
++ * separate node; the code is simpler that way and it's not worth fixing.
++ */
++static char *
++regatom(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	switch (*g->regparse++) {
++	case '^':
++		ret = regnode(g, BOL);
++		break;
++	case '$':
++		ret = regnode(g, EOL);
++		break;
++	case '.':
++		ret = regnode(g, ANY);
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	case '[': {
++			register int class;
++			register int classend;
++
++			if (*g->regparse == '^') {	/* Complement of range. */
++				ret = regnode(g, ANYBUT);
++				g->regparse++;
++			} else
++				ret = regnode(g, ANYOF);
++			if (*g->regparse == ']' || *g->regparse == '-')
++				regc(g, *g->regparse++);
++			while (*g->regparse != '\0' && *g->regparse != ']') {
++				if (*g->regparse == '-') {
++					g->regparse++;
++					if (*g->regparse == ']' || *g->regparse == '\0')
++						regc(g, '-');
++					else {
++						class = UCHARAT(g->regparse-2)+1;
++						classend = UCHARAT(g->regparse);
++						if (class > classend+1)
++							FAIL("invalid [] range");
++						for (; class <= classend; class++)
++							regc(g, class);
++						g->regparse++;
++					}
++				} else
++					regc(g, *g->regparse++);
++			}
++			regc(g, '\0');
++			if (*g->regparse != ']')
++				FAIL("unmatched []");
++			g->regparse++;
++			*flagp |= HASWIDTH|SIMPLE;
++		}
++		break;
++	case '(':
++		ret = reg(g, 1, &flags);
++		if (ret == NULL)
++			return(NULL);
++		*flagp |= flags&(HASWIDTH|SPSTART);
++		break;
++	case '\0':
++	case '|':
++	case ')':
++		FAIL("internal urp");	/* Supposed to be caught earlier. */
++		break;
++	case '?':
++	case '+':
++	case '*':
++		FAIL("?+* follows nothing");
++		break;
++	case '\\':
++		if (*g->regparse == '\0')
++			FAIL("trailing \\");
++		ret = regnode(g, EXACTLY);
++		regc(g, *g->regparse++);
++		regc(g, '\0');
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	default: {
++			register int len;
++			register char ender;
++
++			g->regparse--;
++			len = my_strcspn((const char *)g->regparse, (const char *)META);
++			if (len <= 0)
++				FAIL("internal disaster");
++			ender = *(g->regparse+len);
++			if (len > 1 && ISMULT(ender))
++				len--;		/* Back off clear of ?+* operand. */
++			*flagp |= HASWIDTH;
++			if (len == 1)
++				*flagp |= SIMPLE;
++			ret = regnode(g, EXACTLY);
++			while (len > 0) {
++				regc(g, *g->regparse++);
++				len--;
++			}
++			regc(g, '\0');
++		}
++		break;
++	}
++
++	return(ret);
++}
++
++/*
++ - regnode - emit a node
++ */
++static char *			/* Location. */
++regnode(struct match_globals *g, char op)
++{
++	register char *ret;
++	register char *ptr;
++
++	ret = g->regcode;
++	if (ret == &g->regdummy) {
++		g->regsize += 3;
++		return(ret);
++	}
++
++	ptr = ret;
++	*ptr++ = op;
++	*ptr++ = '\0';		/* Null "next" pointer. */
++	*ptr++ = '\0';
++	g->regcode = ptr;
++
++	return(ret);
++}
++
++/*
++ - regc - emit (if appropriate) a byte of code
++ */
++static void
++regc(struct match_globals *g, char b)
++{
++	if (g->regcode != &g->regdummy)
++		*g->regcode++ = b;
++	else
++		g->regsize++;
++}
++
++/*
++ - reginsert - insert an operator in front of already-emitted operand
++ *
++ * Means relocating the operand.
++ */
++static void
++reginsert(struct match_globals *g, char op, char* opnd)
++{
++	register char *src;
++	register char *dst;
++	register char *place;
++
++	if (g->regcode == &g->regdummy) {
++		g->regsize += 3;
++		return;
++	}
++
++	src = g->regcode;
++	g->regcode += 3;
++	dst = g->regcode;
++	while (src > opnd)
++		*--dst = *--src;
++
++	place = opnd;		/* Op node, where operand used to be. */
++	*place++ = op;
++	*place++ = '\0';
++	*place++ = '\0';
++}
++
++/*
++ - regtail - set the next-pointer at the end of a node chain
++ */
++static void
++regtail(struct match_globals *g, char *p, char *val)
++{
++	register char *scan;
++	register char *temp;
++	register int offset;
++
++	if (p == &g->regdummy)
++		return;
++
++	/* Find last node. */
++	scan = p;
++	for (;;) {
++		temp = regnext(g, scan);
++		if (temp == NULL)
++			break;
++		scan = temp;
++	}
++
++	if (OP(scan) == BACK)
++		offset = scan - val;
++	else
++		offset = val - scan;
++	*(scan+1) = (offset>>8)&0377;
++	*(scan+2) = offset&0377;
++}
++
++/*
++ - regoptail - regtail on operand of first argument; nop if operandless
++ */
++static void
++regoptail(struct match_globals *g, char *p, char *val)
++{
++	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
++	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
++		return;
++	regtail(g, OPERAND(p), val);
++}
++
++/*
++ * regexec and friends
++ */
++
++
++/*
++ * Forwards.
++ */
++STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
++STATIC int regmatch(struct match_globals *g, char *prog);
++STATIC int regrepeat(struct match_globals *g, char *p);
++
++#ifdef DEBUG
++int regnarrate = 0;
++void regdump();
++STATIC char *regprop(char *op);
++#endif
++
++/*
++ - regexec - match a regexp against a string
++ */
++int
++regexec(regexp *prog, char *string)
++{
++	register char *s;
++	struct match_globals g;
++
++	/* Be paranoid... */
++	if (prog == NULL || string == NULL) {
++		printk("<3>Regexp: NULL parameter\n");
++		return(0);
++	}
++
++	/* Check validity of program. */
++	if (UCHARAT(prog->program) != MAGIC) {
++		printk("<3>Regexp: corrupted program\n");
++		return(0);
++	}
++
++	/* If there is a "must appear" string, look for it. */
++	if (prog->regmust != NULL) {
++		s = string;
++		while ((s = strchr(s, prog->regmust[0])) != NULL) {
++			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
++				break;	/* Found it. */
++			s++;
++		}
++		if (s == NULL)	/* Not present. */
++			return(0);
++	}
++
++	/* Mark beginning of line for ^ . */
++	g.regbol = string;
++
++	/* Simplest case:  anchored match need be tried only once. */
++	if (prog->reganch)
++		return(regtry(&g, prog, string));
++
++	/* Messy cases:  unanchored match. */
++	s = string;
++	if (prog->regstart != '\0')
++		/* We know what char it must start with. */
++		while ((s = strchr(s, prog->regstart)) != NULL) {
++			if (regtry(&g, prog, s))
++				return(1);
++			s++;
++		}
++	else
++		/* We don't -- general case. */
++		do {
++			if (regtry(&g, prog, s))
++				return(1);
++		} while (*s++ != '\0');
++
++	/* Failure. */
++	return(0);
++}
++
++/*
++ - regtry - try match at specific point
++ */
++static int			/* 0 failure, 1 success */
++regtry(struct match_globals *g, regexp *prog, char *string)
++{
++	register int i;
++	register char **sp;
++	register char **ep;
++
++	g->reginput = string;
++	g->regstartp = prog->startp;
++	g->regendp = prog->endp;
++
++	sp = prog->startp;
++	ep = prog->endp;
++	for (i = NSUBEXP; i > 0; i--) {
++		*sp++ = NULL;
++		*ep++ = NULL;
++	}
++	if (regmatch(g, prog->program + 1)) {
++		prog->startp[0] = string;
++		prog->endp[0] = g->reginput;
++		return(1);
++	} else
++		return(0);
++}
++
++/*
++ - regmatch - main matching routine
++ *
++ * Conceptually the strategy is simple:  check to see whether the current
++ * node matches, call self recursively to see whether the rest matches,
++ * and then act accordingly.  In practice we make some effort to avoid
++ * recursion, in particular by going through "ordinary" nodes (that don't
++ * need to know whether the rest of the match failed) by a loop instead of
++ * by recursion.
++ */
++static int			/* 0 failure, 1 success */
++regmatch(struct match_globals *g, char *prog)
++{
++	register char *scan = prog; /* Current node. */
++	char *next;		    /* Next node. */
++
++#ifdef DEBUG
++	if (scan != NULL && regnarrate)
++		fprintf(stderr, "%s(\n", regprop(scan));
++#endif
++	while (scan != NULL) {
++#ifdef DEBUG
++		if (regnarrate)
++			fprintf(stderr, "%s...\n", regprop(scan));
++#endif
++		next = regnext(g, scan);
++
++		switch (OP(scan)) {
++		case BOL:
++			if (g->reginput != g->regbol)
++				return(0);
++			break;
++		case EOL:
++			if (*g->reginput != '\0')
++				return(0);
++			break;
++		case ANY:
++			if (*g->reginput == '\0')
++				return(0);
++			g->reginput++;
++			break;
++		case EXACTLY: {
++				register int len;
++				register char *opnd;
++
++				opnd = OPERAND(scan);
++				/* Inline the first character, for speed. */
++				if (*opnd != *g->reginput)
++					return(0);
++				len = strlen(opnd);
++				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
++					return(0);
++				g->reginput += len;
++			}
++			break;
++		case ANYOF:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case ANYBUT:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case NOTHING:
++		case BACK:
++			break;
++		case OPEN+1:
++		case OPEN+2:
++		case OPEN+3:
++		case OPEN+4:
++		case OPEN+5:
++		case OPEN+6:
++		case OPEN+7:
++		case OPEN+8:
++		case OPEN+9: {
++				register int no;
++				register char *save;
++
++				no = OP(scan) - OPEN;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set startp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regstartp[no] == NULL)
++						g->regstartp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case CLOSE+1:
++		case CLOSE+2:
++		case CLOSE+3:
++		case CLOSE+4:
++		case CLOSE+5:
++		case CLOSE+6:
++		case CLOSE+7:
++		case CLOSE+8:
++		case CLOSE+9:
++			{
++				register int no;
++				register char *save;
++
++				no = OP(scan) - CLOSE;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set endp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regendp[no] == NULL)
++						g->regendp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case BRANCH: {
++				register char *save;
++
++				if (OP(next) != BRANCH)		/* No choice. */
++					next = OPERAND(scan);	/* Avoid recursion. */
++				else {
++					do {
++						save = g->reginput;
++						if (regmatch(g, OPERAND(scan)))
++							return(1);
++						g->reginput = save;
++						scan = regnext(g, scan);
++					} while (scan != NULL && OP(scan) == BRANCH);
++					return(0);
++					/* NOTREACHED */
++				}
++			}
++			break;
++		case STAR:
++		case PLUS: {
++				register char nextch;
++				register int no;
++				register char *save;
++				register int min;
++
++				/*
++				 * Lookahead to avoid useless match attempts
++				 * when we know what character comes next.
++				 */
++				nextch = '\0';
++				if (OP(next) == EXACTLY)
++					nextch = *OPERAND(next);
++				min = (OP(scan) == STAR) ? 0 : 1;
++				save = g->reginput;
++				no = regrepeat(g, OPERAND(scan));
++				while (no >= min) {
++					/* If it could work, try it. */
++					if (nextch == '\0' || *g->reginput == nextch)
++						if (regmatch(g, next))
++							return(1);
++					/* Couldn't or didn't -- back up. */
++					no--;
++					g->reginput = save + no;
++				}
++				return(0);
++			}
++			break;
++		case END:
++			return(1);	/* Success! */
++			break;
++		default:
++			printk("<3>Regexp: memory corruption\n");
++			return(0);
++			break;
++		}
++
++		scan = next;
++	}
++
++	/*
++	 * We get here only if there's trouble -- normally "case END" is
++	 * the terminating point.
++	 */
++	printk("<3>Regexp: corrupted pointers\n");
++	return(0);
++}
++
++/*
++ - regrepeat - repeatedly match something simple, report how many
++ */
++static int
++regrepeat(struct match_globals *g, char *p)
++{
++	register int count = 0;
++	register char *scan;
++	register char *opnd;
++
++	scan = g->reginput;
++	opnd = OPERAND(p);
++	switch (OP(p)) {
++	case ANY:
++		count = strlen(scan);
++		scan += count;
++		break;
++	case EXACTLY:
++		while (*opnd == *scan) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYOF:
++		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYBUT:
++		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	default:		/* Oh dear.  Called inappropriately. */
++		printk("<3>Regexp: internal foulup\n");
++		count = 0;	/* Best compromise. */
++		break;
++	}
++	g->reginput = scan;
++
++	return(count);
++}
++
++/*
++ - regnext - dig the "next" pointer out of a node
++ */
++static char*
++regnext(struct match_globals *g, char *p)
++{
++	register int offset;
++
++	if (p == &g->regdummy)
++		return(NULL);
++
++	offset = NEXT(p);
++	if (offset == 0)
++		return(NULL);
++
++	if (OP(p) == BACK)
++		return(p-offset);
++	else
++		return(p+offset);
++}
++
++#ifdef DEBUG
++
++STATIC char *regprop();
++
++/*
++ - regdump - dump a regexp onto stdout in vaguely comprehensible form
++ */
++void
++regdump(regexp *r)
++{
++	register char *s;
++	register char op = EXACTLY;	/* Arbitrary non-END op. */
++	register char *next;
++	/* extern char *strchr(); */
++
++
++	s = r->program + 1;
++	while (op != END) {	/* While that wasn't END last time... */
++		op = OP(s);
++		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
++		next = regnext(s);
++		if (next == NULL)		/* Next ptr. */
++			printf("(0)");
++		else
++			printf("(%d)", (s-r->program)+(next-s));
++		s += 3;
++		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
++			/* Literal string, where present. */
++			while (*s != '\0') {
++				putchar(*s);
++				s++;
++			}
++			s++;
++		}
++		putchar('\n');
++	}
++
++	/* Header fields of interest. */
++	if (r->regstart != '\0')
++		printf("start `%c' ", r->regstart);
++	if (r->reganch)
++		printf("anchored ");
++	if (r->regmust != NULL)
++		printf("must have \"%s\"", r->regmust);
++	printf("\n");
++}
++
++/*
++ - regprop - printable representation of opcode
++ */
++static char *
++regprop(char *op)
++{
++#define BUFLEN 50
++	register char *p;
++	static char buf[BUFLEN];
++
++	strcpy(buf, ":");
++
++	switch (OP(op)) {
++	case BOL:
++		p = "BOL";
++		break;
++	case EOL:
++		p = "EOL";
++		break;
++	case ANY:
++		p = "ANY";
++		break;
++	case ANYOF:
++		p = "ANYOF";
++		break;
++	case ANYBUT:
++		p = "ANYBUT";
++		break;
++	case BRANCH:
++		p = "BRANCH";
++		break;
++	case EXACTLY:
++		p = "EXACTLY";
++		break;
++	case NOTHING:
++		p = "NOTHING";
++		break;
++	case BACK:
++		p = "BACK";
++		break;
++	case END:
++		p = "END";
++		break;
++	case OPEN+1:
++	case OPEN+2:
++	case OPEN+3:
++	case OPEN+4:
++	case OPEN+5:
++	case OPEN+6:
++	case OPEN+7:
++	case OPEN+8:
++	case OPEN+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
++		p = NULL;
++		break;
++	case CLOSE+1:
++	case CLOSE+2:
++	case CLOSE+3:
++	case CLOSE+4:
++	case CLOSE+5:
++	case CLOSE+6:
++	case CLOSE+7:
++	case CLOSE+8:
++	case CLOSE+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
++		p = NULL;
++		break;
++	case STAR:
++		p = "STAR";
++		break;
++	case PLUS:
++		p = "PLUS";
++		break;
++	default:
++		printk("<3>Regexp: corrupted opcode\n");
++		break;
++	}
++	if (p != NULL)
++		strncat(buf, p, BUFLEN-strlen(buf));
++	return(buf);
++}
++#endif
++
++
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.h
+@@ -0,0 +1,41 @@
++/*
++ * Definitions etc. for regexp(3) routines.
++ *
++ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
++ * not the System V one.
++ */
++
++#ifndef REGEXP_H
++#define REGEXP_H
++
++
++/*
++http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
++which contains a version of this library, says:
++
++ *
++ * NSUBEXP must be at least 10, and no greater than 117 or the parser
++ * will not work properly.
++ *
++
++However, it looks rather like this library is limited to 10.  If you think
++otherwise, let us know.
++*/
++
++#define NSUBEXP  10
++typedef struct regexp {
++	char *startp[NSUBEXP];
++	char *endp[NSUBEXP];
++	char regstart;		/* Internal use only. */
++	char reganch;		/* Internal use only. */
++	char *regmust;		/* Internal use only. */
++	int regmlen;		/* Internal use only. */
++	char program[1];	/* Unwarranted chumminess with compiler. */
++} regexp;
++
++regexp * regcomp(char *exp, int *patternsize);
++int regexec(regexp *prog, char *string);
++void regsub(regexp *prog, char *source, char *dest);
++void regerror(char *s);
++
++#endif
+--- /dev/null
++++ b/net/netfilter/regexp/regmagic.h
+@@ -0,0 +1,5 @@
++/*
++ * The first byte of the regexp internal "program" is actually this magic
++ * number; the start node begins in the second byte.
++ */
++#define	MAGIC	0234
+--- /dev/null
++++ b/net/netfilter/regexp/regsub.c
+@@ -0,0 +1,95 @@
++/*
++ * regsub
++ * @(#)regsub.c	1.3 of 2 April 86
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ */
++#include "regexp.h"
++#include "regmagic.h"
++#include <linux/string.h>
++
++
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#if 0
++//void regerror(char * s)
++//{
++//        printk("regexp(3): %s", s);
++//        /* NOTREACHED */
++//}
++#endif
++
++/*
++ - regsub - perform substitutions after a regexp match
++ */
++void
++regsub(regexp * prog, char * source, char * dest)
++{
++	register char *src;
++	register char *dst;
++	register char c;
++	register int no;
++	register int len;
++	
++	/* Not necessary and gcc doesn't like it -MLS */
++	/*extern char *strncpy();*/
++
++	if (prog == NULL || source == NULL || dest == NULL) {
++		regerror("NULL parm to regsub");
++		return;
++	}
++	if (UCHARAT(prog->program) != MAGIC) {
++		regerror("damaged regexp fed to regsub");
++		return;
++	}
++
++	src = source;
++	dst = dest;
++	while ((c = *src++) != '\0') {
++		if (c == '&')
++			no = 0;
++		else if (c == '\\' && '0' <= *src && *src <= '9')
++			no = *src++ - '0';
++		else
++			no = -1;
++
++		if (no < 0) {	/* Ordinary character. */
++			if (c == '\\' && (*src == '\\' || *src == '&'))
++				c = *src++;
++			*dst++ = c;
++		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
++			len = prog->endp[no] - prog->startp[no];
++			(void) strncpy(dst, prog->startp[no], len);
++			dst += len;
++			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
++				regerror("damaged match string");
++				return;
++			}
++		}
++	}
++	*dst++ = '\0';
++}
+--- a/net/netfilter/nf_conntrack_core.c
++++ b/net/netfilter/nf_conntrack_core.c
+@@ -214,6 +214,14 @@ destroy_conntrack(struct nf_conntrack *n
+ 	 * too. */
+ 	nf_ct_remove_expectations(ct);
+ 
++	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto)
++		kfree(ct->layer7.app_proto);
++	if(ct->layer7.app_data)
++	kfree(ct->layer7.app_data);
++	#endif
++
++
+ 	/* We overload first tuple to link into unconfirmed list. */
+ 	if (!nf_ct_is_confirmed(ct)) {
+ 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -239,6 +239,12 @@ static int ct_seq_show(struct seq_file *
+ 	if (ct_show_delta_time(s, ct))
+ 		goto release;
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto &&
++           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
++		return -ENOSPC;
++#endif
++
+ 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
+ 		goto release;
+ 
+--- a/include/net/netfilter/nf_conntrack.h
++++ b/include/net/netfilter/nf_conntrack.h
+@@ -134,6 +134,22 @@ struct nf_conn {
+ 	struct net *ct_net;
+ #endif
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
++    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	struct {
++		/*
++		 * e.g. "http". NULL before decision. "unknown" after decision
++		 * if no match.
++		 */
++		char *app_proto;
++		/*
++		 * application layer data so far. NULL after match decision.
++		 */
++		char *app_data;
++		unsigned int app_data_len;
++	} layer7;
++#endif
++
+ 	/* Storage reserved for other modules, must be the last member */
+ 	union nf_conntrack_proto proto;
+ };
+--- /dev/null
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -0,0 +1,13 @@
++#ifndef _XT_LAYER7_H
++#define _XT_LAYER7_H
++
++#define MAX_PATTERN_LEN 8192
++#define MAX_PROTOCOL_LEN 256
++
++struct xt_layer7_info {
++    char protocol[MAX_PROTOCOL_LEN];
++    char pattern[MAX_PATTERN_LEN];
++    u_int8_t invert;
++};
++
++#endif /* _XT_LAYER7_H */
+--- a/include/linux/netfilter/Kbuild
++++ b/include/linux/netfilter/Kbuild
+@@ -49,6 +49,7 @@ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
++header-y += xt_layer7.h
+ header-y += xt_length.h
+ header-y += xt_limit.h
+ header-y += xt_mac.h
diff --git a/trunk/target/linux/generic/patches-3.3/601-netfilter_layer7_pktmatch.patch b/trunk/target/linux/generic/patches-3.3/601-netfilter_layer7_pktmatch.patch
new file mode 100644
index 00000000..f65e301f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/601-netfilter_layer7_pktmatch.patch
@@ -0,0 +1,108 @@
+--- a/include/linux/netfilter/xt_layer7.h
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
+     char protocol[MAX_PROTOCOL_LEN];
+     char pattern[MAX_PATTERN_LEN];
+     u_int8_t invert;
++    u_int8_t pkt;
+ };
+ 
+ #endif /* _XT_LAYER7_H */
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
+ }
+ 
+ /* add the new app data to the conntrack.  Return number of bytes added. */
+-static int add_data(struct nf_conn * master_conntrack,
+-                    char * app_data, int appdatalen)
++static int add_datastr(char *target, int offset, char *app_data, int len)
+ {
+ 	int length = 0, i;
+-	int oldlength = master_conntrack->layer7.app_data_len;
+-
+-	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
+-	   clear on whether the race condition exists or whether this really 
+-	   fixes it.  I might just be being dense... Anyway, if it's not really 
+-	   a fix, all it does is waste a very small amount of time. */
+-	if(!master_conntrack->layer7.app_data) return 0;
++	if (!target) return 0;
+ 
+ 	/* Strip nulls. Make everything lower case (our regex lib doesn't
+ 	do case insensitivity).  Add it to the end of the current data. */
+-	for(i = 0; i < maxdatalen-oldlength-1 &&
+-		   i < appdatalen; i++) {
++ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
+ 		if(app_data[i] != '\0') {
+ 			/* the kernel version of tolower mungs 'upper ascii' */
+-			master_conntrack->layer7.app_data[length+oldlength] =
++			target[length+offset] =
+ 				isascii(app_data[i])? 
+ 					tolower(app_data[i]) : app_data[i];
+ 			length++;
+ 		}
+ 	}
++	target[length+offset] = '\0';
++
++	return length;
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length;
+ 
+-	master_conntrack->layer7.app_data[length+oldlength] = '\0';
+-	master_conntrack->layer7.app_data_len = length + oldlength;
++	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
++	master_conntrack->layer7.app_data_len += length;
+ 
+ 	return length;
+ }
+@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
+ 
+ 	enum ip_conntrack_info master_ctinfo, ctinfo;
+ 	struct nf_conn *master_conntrack, *conntrack;
+-	unsigned char * app_data;
++	unsigned char *app_data, *tmp_data;
+ 	unsigned int pattern_result, appdatalen;
+ 	regexp * comppattern;
+ 
+@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
+ 		master_conntrack = master_ct(master_conntrack);
+ 
+ 	/* if we've classified it or seen too many packets */
+-	if(total_acct_packets(master_conntrack) > num_packets ||
+-	   master_conntrack->layer7.app_proto) {
++	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto)) {
+ 
+ 		pattern_result = match_no_append(conntrack, master_conntrack, 
+ 						 ctinfo, master_ctinfo, info);
+@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
+ 	/* the return value gets checked later, when we're ready to use it */
+ 	comppattern = compile_and_cache(info->pattern, info->protocol);
+ 
++	if (info->pkt) {
++		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!tmp_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
++			return info->invert;
++		}
++
++		tmp_data[0] = '\0';
++		add_datastr(tmp_data, 0, app_data, appdatalen);
++		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
++
++		kfree(tmp_data);
++		tmp_data = NULL;
++		spin_unlock_bh(&l7_lock);
++
++		return (pattern_result ^ info->invert);
++	}
++
+ 	/* On the first packet of a connection, allocate space for app data */
+ 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
+ 	   !master_conntrack->layer7.app_data){
diff --git a/trunk/target/linux/generic/patches-3.3/602-netfilter_layer7_match.patch b/trunk/target/linux/generic/patches-3.3/602-netfilter_layer7_match.patch
new file mode 100644
index 00000000..b2e48c82
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/602-netfilter_layer7_match.patch
@@ -0,0 +1,51 @@
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
+ 
+ static bool
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
+ #else
+ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
+ 
+ // load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
+ {
+         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ 		 const struct xt_match *match, void *matchinfo,
+ 		 unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++		return -EINVAL;
++	}
++	return 0;
++#else
+                 return 0;
+         }
+ 	return 1;
++#endif
+ }
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/603-netfilter_layer7_2.6.36_fix.patch b/trunk/target/linux/generic/patches-3.3/603-netfilter_layer7_2.6.36_fix.patch
new file mode 100644
index 00000000..92a72006
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/603-netfilter_layer7_2.6.36_fix.patch
@@ -0,0 +1,61 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -857,6 +857,27 @@ config NETFILTER_XT_MATCH_IPVS
+ 
+ 	  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on EXPERIMENTAL
++	depends on NETFILTER_XTABLES
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
++
+ config NETFILTER_XT_MATCH_LENGTH
+ 	tristate '"length" match support'
+ 	depends on NETFILTER_ADVANCED
+@@ -1053,26 +1074,11 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
+-config NETFILTER_XT_MATCH_LAYER7
+-	tristate '"layer7" match support'
+-	depends on NETFILTER_XTABLES
+-	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
+-       depends on NETFILTER_ADVANCED
+-	help
+-	  Say Y if you want to be able to classify connections (and their
+-	  packets) based on regular expression matching of their application
+-	  layer data.   This is one way to classify applications such as
+-	  peer-to-peer filesharing systems that do not always use the same
+-	  port.
+-
+-	  To compile it as a module, choose M here.  If unsure, say N.
+-
+ config NETFILTER_XT_MATCH_LAYER7_DEBUG
+-        bool 'Layer 7 debugging output'
+-        depends on NETFILTER_XT_MATCH_LAYER7
+-        help
+-          Say Y to get lots of debugging output.
+-
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
+ 
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
diff --git a/trunk/target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch b/trunk/target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch
new file mode 100644
index 00000000..a17ba1cf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,86 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -16,6 +16,7 @@
+ #include <linux/percpu.h>
+ #include <linux/netdevice.h>
+ #include <linux/security.h>
++#include <linux/inet.h>
+ #include <net/net_namespace.h>
+ #ifdef CONFIG_SYSCTL
+ #include <linux/sysctl.h>
+@@ -267,10 +268,66 @@ static int ct_open(struct inode *inode,
+ 			sizeof(struct ct_iter_state));
+ }
+ 
++struct kill_request {
++	u16 family;
++	union nf_inet_addr addr;
++};
++
++static int kill_matching(struct nf_conn *i, void *data)
++{
++	struct kill_request *kr = data;
++	struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
++	struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
++
++	if (!kr->family)
++		return 1;
++
++	if (t1->src.l3num != kr->family)
++		return 0;
++
++	return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++			     size_t count, loff_t *ppos)
++{
++	struct seq_file *seq = file->private_data;
++	struct net *net = seq_file_net(seq);
++	struct kill_request kr = { };
++	char req[INET6_ADDRSTRLEN] = { };
++
++	if (count == 0)
++		return 0;
++
++	if (count >= INET6_ADDRSTRLEN)
++		count = INET6_ADDRSTRLEN - 1;
++
++	if (copy_from_user(req, buf, count))
++		return -EFAULT;
++
++	if (strnchr(req, count, ':')) {
++		kr.family = AF_INET6;
++		if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	} else if (strnchr(req, count, '.')) {
++		kr.family = AF_INET;
++		if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	}
++
++	nf_ct_iterate_cleanup(net, kill_matching, &kr);
++
++	return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ 	.owner   = THIS_MODULE,
+ 	.open    = ct_open,
+ 	.read    = seq_read,
++	.write	 = ct_file_write,
+ 	.llseek  = seq_lseek,
+ 	.release = seq_release_net,
+ };
+@@ -372,7 +429,7 @@ static int nf_conntrack_standalone_init_
+ {
+ 	struct proc_dir_entry *pde;
+ 
+-	pde = proc_net_fops_create(net, "nf_conntrack", 0440, &ct_file_ops);
++	pde = proc_net_fops_create(net, "nf_conntrack", 0660, &ct_file_ops);
+ 	if (!pde)
+ 		goto out_nf_conntrack;
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/610-netfilter_match_bypass_default_checks.patch b/trunk/target/linux/generic/patches-3.3/610-netfilter_match_bypass_default_checks.patch
new file mode 100644
index 00000000..51c9e099
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/610-netfilter_match_bypass_default_checks.patch
@@ -0,0 +1,93 @@
+--- a/include/linux/netfilter_ipv4/ip_tables.h
++++ b/include/linux/netfilter_ipv4/ip_tables.h
+@@ -93,6 +93,7 @@ struct ipt_ip {
+ #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
+ #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
+ #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
++#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
+ 
+ /* Values for "inv" field in struct ipt_ip. */
+ #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -81,6 +81,9 @@ ip_packet_match(const struct iphdr *ip,
+ 
+ #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
+ 
++	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
++		return true;
++
+ 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+ 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+@@ -134,6 +137,29 @@ ip_packet_match(const struct iphdr *ip,
+ 	return true;
+ }
+ 
++static void
++ip_checkdefault(struct ipt_ip *ip)
++{
++	static const char iface_mask[IFNAMSIZ] = {};
++
++	if (ip->invflags || ip->flags & IPT_F_FRAG)
++		return;
++
++	if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (ip->smsk.s_addr || ip->dmsk.s_addr)
++		return;
++
++	if (ip->proto)
++		return;
++
++	ip->flags |= IPT_F_NO_DEF_MATCH;
++}
++
+ static bool
+ ip_checkentry(const struct ipt_ip *ip)
+ {
+@@ -561,7 +587,7 @@ static void cleanup_match(struct xt_entr
+ }
+ 
+ static int
+-check_entry(const struct ipt_entry *e, const char *name)
++check_entry(struct ipt_entry *e, const char *name)
+ {
+ 	const struct xt_entry_target *t;
+ 
+@@ -570,6 +596,8 @@ check_entry(const struct ipt_entry *e, c
+ 		return -EINVAL;
+ 	}
+ 
++	ip_checkdefault(&e->ip);
++
+ 	if (e->target_offset + sizeof(struct xt_entry_target) >
+ 	    e->next_offset)
+ 		return -EINVAL;
+@@ -931,6 +959,7 @@ copy_entries_to_user(unsigned int total_
+ 	const struct xt_table_info *private = table->private;
+ 	int ret = 0;
+ 	const void *loc_cpu_entry;
++	u8 flags;
+ 
+ 	counters = alloc_counters(table);
+ 	if (IS_ERR(counters))
+@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
+ 			ret = -EFAULT;
+ 			goto free_counters;
+ 		}
++
++		flags = e->ip.flags & IPT_F_MASK;
++		if (copy_to_user(userptr + off
++				 + offsetof(struct ipt_entry, ip.flags),
++				 &flags, sizeof(flags)) != 0) {
++			ret = -EFAULT;
++			goto free_counters;
++		}
+ 
+ 		for (i = sizeof(struct ipt_entry);
+ 		     i < e->target_offset;
diff --git a/trunk/target/linux/generic/patches-3.3/611-netfilter_match_bypass_default_table.patch b/trunk/target/linux/generic/patches-3.3/611-netfilter_match_bypass_default_table.patch
new file mode 100644
index 00000000..3cf0e5a3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/611-netfilter_match_bypass_default_table.patch
@@ -0,0 +1,81 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -310,6 +310,33 @@ struct ipt_entry *ipt_next_entry(const s
+ 	return (void *)entry + entry->next_offset;
+ }
+ 
++static bool
++ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
++{
++	struct xt_entry_target *t;
++	struct xt_standard_target *st;
++
++	if (e->target_offset != sizeof(struct ipt_entry))
++		return false;
++
++	if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
++		return false;
++
++	t = ipt_get_target(e);
++	if (t->u.kernel.target->target)
++		return false;
++
++	st = (struct xt_standard_target *) t;
++	if (st->verdict == XT_RETURN)
++		return false;
++
++	if (st->verdict >= 0)
++		return false;
++
++	*verdict = (unsigned)(-st->verdict) - 1;
++	return true;
++}
++
+ /* Returns one of the generic firewall policies, like NF_ACCEPT. */
+ unsigned int
+ ipt_do_table(struct sk_buff *skb,
+@@ -334,6 +361,25 @@ ipt_do_table(struct sk_buff *skb,
+ 	ip = ip_hdr(skb);
+ 	indev = in ? in->name : nulldevname;
+ 	outdev = out ? out->name : nulldevname;
++
++	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++	local_bh_disable();
++	addend = xt_write_recseq_begin();
++	private = table->private;
++	cpu        = smp_processor_id();
++	table_base = private->entries[cpu];
++	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
++	stackptr   = per_cpu_ptr(private->stackptr, cpu);
++	origptr    = *stackptr;
++
++	e = get_entry(table_base, private->hook_entry[hook]);
++	if (ipt_handle_default_rule(e, &verdict)) {
++		ADD_COUNTER(e->counters, skb->len, 1);
++		xt_write_recseq_end(addend);
++		local_bh_enable();
++		return verdict;
++	}
++
+ 	/* We handle fragments by dealing with the first fragment as
+ 	 * if it was a normal packet.  All other fragments are treated
+ 	 * normally, except that they will NEVER match rules that ask
+@@ -348,18 +394,6 @@ ipt_do_table(struct sk_buff *skb,
+ 	acpar.family  = NFPROTO_IPV4;
+ 	acpar.hooknum = hook;
+ 
+-	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+-	local_bh_disable();
+-	addend = xt_write_recseq_begin();
+-	private = table->private;
+-	cpu        = smp_processor_id();
+-	table_base = private->entries[cpu];
+-	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
+-	stackptr   = per_cpu_ptr(private->stackptr, cpu);
+-	origptr    = *stackptr;
+-
+-	e = get_entry(table_base, private->hook_entry[hook]);
+-
+ 	pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n",
+ 		 table->name, hook, origptr,
+ 		 get_entry(table_base, private->underflow[hook]));
diff --git a/trunk/target/linux/generic/patches-3.3/612-netfilter_match_reduce_memory_access.patch b/trunk/target/linux/generic/patches-3.3/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 00000000..f506165e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/612-netfilter_match_reduce_memory_access.patch
@@ -0,0 +1,16 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -84,9 +84,11 @@ ip_packet_match(const struct iphdr *ip,
+ 	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
+ 		return true;
+ 
+-	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
++	if (FWINV(ipinfo->smsk.s_addr &&
++		  (ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+-	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
++	    FWINV(ipinfo->dmsk.s_addr &&
++		  (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+ 		  IPT_INV_DSTIP)) {
+ 		dprintf("Source or dest mismatch.\n");
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/613-netfilter_optional_tcp_window_check.patch b/trunk/target/linux/generic/patches-3.3/613-netfilter_optional_tcp_window_check.patch
new file mode 100644
index 00000000..1c259d4f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/613-netfilter_optional_tcp_window_check.patch
@@ -0,0 +1,36 @@
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -29,6 +29,9 @@
+ #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
+ #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
+ 
++/* Do not check the TCP window for incoming packets  */
++static int nf_ct_tcp_no_window_check __read_mostly = 1;
++
+ /* "Be conservative in what you do,
+     be liberal in what you accept from others."
+     If it's non-zero, we mark only out of window RST segments as INVALID. */
+@@ -524,6 +527,9 @@ static bool tcp_in_window(const struct n
+ 	s16 receiver_offset;
+ 	bool res;
+ 
++	if (nf_ct_tcp_no_window_check)
++		return true;
++
+ 	/*
+ 	 * Get the required data from the packet.
+ 	 */
+@@ -1321,6 +1327,13 @@ static struct ctl_table tcp_sysctl_table
+ 		.proc_handler	= proc_dointvec,
+ 	},
+ 	{
++		.procname       = "nf_conntrack_tcp_no_window_check",
++		.data           = &nf_ct_tcp_no_window_check,
++		.maxlen         = sizeof(unsigned int),
++		.mode           = 0644,
++		.proc_handler   = proc_dointvec,
++	},
++	{
+ 		.procname       = "nf_conntrack_tcp_be_liberal",
+ 		.data           = &nf_ct_tcp_be_liberal,
+ 		.maxlen         = sizeof(unsigned int),
diff --git a/trunk/target/linux/generic/patches-3.3/615-netfilter_add_xt_id_match.patch b/trunk/target/linux/generic/patches-3.3/615-netfilter_add_xt_id_match.patch
new file mode 100644
index 00000000..14fe61b1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/615-netfilter_add_xt_id_match.patch
@@ -0,0 +1,95 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -837,6 +837,13 @@ config NETFILTER_XT_MATCH_HL
+ 	in the IPv6 header, or the time-to-live field in the IPv4
+ 	header of the packet.
+ 
++config NETFILTER_XT_MATCH_ID
++	tristate '"id" match support'
++	depends on NETFILTER_ADVANCED
++	---help---
++	This option adds a `id' dummy-match, which allows you to put
++	numeric IDs into your iptables ruleset.
++
+ config NETFILTER_XT_MATCH_IPRANGE
+ 	tristate '"iprange" address range match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -86,6 +86,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) +=
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_ID) += xt_id.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o
+--- /dev/null
++++ b/net/netfilter/xt_id.c
+@@ -0,0 +1,45 @@
++/*
++ * Implements a dummy match to allow attaching IDs to rules
++ *
++ * 2014-08-01 Jo-Philipp Wich <jow@openwrt.org>
++ */
++
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_id.h>
++
++MODULE_AUTHOR("Jo-Philipp Wich <jow@openwrt.org>");
++MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_id");
++MODULE_ALIAS("ip6t_id");
++
++static bool
++id_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++	/* We always match */
++	return true;
++}
++
++static struct xt_match id_mt_reg __read_mostly = {
++	.name      = "id",
++	.revision  = 0,
++	.family    = NFPROTO_UNSPEC,
++	.match     = id_mt,
++	.matchsize = sizeof(struct xt_id_info),
++	.me        = THIS_MODULE,
++};
++
++static int __init id_mt_init(void)
++{
++	return xt_register_match(&id_mt_reg);
++}
++
++static void __exit id_mt_exit(void)
++{
++	xt_unregister_match(&id_mt_reg);
++}
++
++module_init(id_mt_init);
++module_exit(id_mt_exit);
+--- a/include/linux/netfilter/Kbuild
++++ b/include/linux/netfilter/Kbuild
+@@ -47,6 +47,7 @@ header-y += xt_ecn.h
+ header-y += xt_esp.h
+ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
++header-y += xt_id.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+ header-y += xt_layer7.h
+--- /dev/null
++++ b/include/linux/netfilter/xt_id.h
+@@ -0,0 +1,8 @@
++#ifndef _XT_ID_H
++#define _XT_ID_H
++
++struct xt_id_info {
++	u32 id;
++};
++
++#endif /* XT_ID_H */
diff --git a/trunk/target/linux/generic/patches-3.3/620-sched_esfq.patch b/trunk/target/linux/generic/patches-3.3/620-sched_esfq.patch
new file mode 100644
index 00000000..1fdf09d0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/620-sched_esfq.patch
@@ -0,0 +1,791 @@
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
+@@ -193,6 +193,33 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++	TCA_SFQ_HASH_CLASSIC,
++	TCA_SFQ_HASH_DST,
++	TCA_SFQ_HASH_SRC,
++	TCA_SFQ_HASH_FWMARK,
++	/* conntrack */
++	TCA_SFQ_HASH_CTORIGDST,
++	TCA_SFQ_HASH_CTORIGSRC,
++	TCA_SFQ_HASH_CTREPLDST,
++	TCA_SFQ_HASH_CTREPLSRC,
++	TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++	unsigned	quantum;	/* Bytes per round allocated to flow */
++	int		perturb_period;	/* Period of hash perturbation */
++	__u32		limit;		/* Maximal packets in queue */
++	unsigned	divisor;	/* Hash divisor  */
++	unsigned	flows;		/* Maximal number of flows  */
++	unsigned	hash_kind;	/* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -148,6 +148,37 @@ config NET_SCH_SFQ
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called sch_sfq.
+ 
++config NET_SCH_ESFQ
++	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
++	---help---
++	  Say Y here if you want to use the Enhanced Stochastic Fairness
++	  Queueing (ESFQ) packet scheduling algorithm for some of your network
++	  devices or as a leaf discipline for a classful qdisc such as HTB or
++	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
++	  references to the SFQ algorithm).
++
++	  This is an enchanced SFQ version which allows you to control some
++	  hardcoded values in the SFQ scheduler.
++
++	  ESFQ also adds control of the hash function used to identify packet
++	  flows. The original SFQ discipline hashes by connection; ESFQ add
++	  several other hashing methods, such as by src IP or by dst IP, which
++	  can be more fair to users in some networking situations.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called sch_esfq.
++
++config NET_SCH_ESFQ_NFCT
++	bool "Connection Tracking Hash Types"
++	depends on NET_SCH_ESFQ && NF_CONNTRACK
++	---help---
++	  Say Y here to enable support for hashing based on netfilter connection
++	  tracking information. This is useful for a router that is also using
++	  NAT to connect privately-addressed hosts to the Internet. If you want
++	  to provide fair distribution of upstream bandwidth, ESFQ must use
++	  connection tracking information, since all outgoing packets will share
++	  the same source address.
++
+ config NET_SCH_TEQL
+ 	tristate "True Link Equalizer (TEQL)"
+ 	---help---
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ing
+ obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
+ obj-$(CONFIG_NET_SCH_SFB)	+= sch_sfb.o
+ obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
++obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
+ obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
+ obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
+ obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
+--- /dev/null
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,702 @@
++/*
++ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:	Alexander Atanasov, <alex@ssi.bg>
++ *		Added dynamic depth,limit,divisor,hash_kind options.
++ *		Added dst and src hashes.
++ *
++ * 		Alexander Clouter, <alex@digriz.org.uk>
++ *		Ported ESFQ to Linux 2.6.
++ *
++ * 		Corey Hickey, <bugfood-c@fatooh.org>
++ *		Maintenance of the Linux 2.6 port.
++ *		Added fwmark hash (thanks to Robert Kurjata).
++ *		Added usage of jhash.
++ *		Added conntrack support.
++ *		Added ctnatchg hash (thanks to Ben Pfountz).
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <asm/system.h>
++#include <linux/bitops.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/socket.h>
++#include <linux/sockios.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/if_ether.h>
++#include <linux/inet.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/notifier.h>
++#include <linux/init.h>
++#include <net/ip.h>
++#include <net/netlink.h>
++#include <linux/ipv6.h>
++#include <net/route.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/pkt_sched.h>
++#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++#include <net/netfilter/nf_conntrack.h>
++#endif
++
++/*	Stochastic Fairness Queuing algorithm.
++	For more comments look at sch_sfq.c.
++	The difference is that you can change limit, depth,
++	hash table size and choose alternate hash types.
++
++	classic:	same as in sch_sfq.c
++	dst:		destination IP address
++	src:		source IP address
++	fwmark:		netfilter mark value
++	ctorigdst:	original destination IP address
++	ctorigsrc:	original source IP address
++	ctrepldst:	reply destination IP address
++	ctreplsrc:	reply source IP
++
++*/
++
++#define ESFQ_HEAD 0
++#define ESFQ_TAIL 1
++
++/* This type should contain at least SFQ_DEPTH*2 values */
++typedef unsigned int esfq_index;
++
++struct esfq_head
++{
++	esfq_index	next;
++	esfq_index	prev;
++};
++
++struct esfq_sched_data
++{
++/* Parameters */
++	int		perturb_period;
++	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
++	int		limit;
++	unsigned	depth;
++	unsigned	hash_divisor;
++	unsigned	hash_kind;
++/* Variables */
++	struct timer_list perturb_timer;
++	int		perturbation;
++	esfq_index	tail;		/* Index of current slot in round */
++	esfq_index	max_depth;	/* Maximal depth */
++
++	esfq_index	*ht;			/* Hash table */
++	esfq_index	*next;			/* Active slots link */
++	short		*allot;			/* Current allotment per slot */
++	unsigned short	*hash;			/* Hash value indexed by slots */
++	struct sk_buff_head	*qs;		/* Slot queue */
++	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
++};
++
++/* This contains the info we will hash. */
++struct esfq_packet_info
++{
++	u32	proto;		/* protocol or port */
++	u32	src;		/* source from packet header */
++	u32	dst;		/* destination from packet header */
++	u32	ctorigsrc;	/* original source from conntrack */
++	u32	ctorigdst;	/* original destination from conntrack */
++	u32	ctreplsrc;	/* reply source from conntrack */
++	u32	ctrepldst;	/* reply destination from conntrack */
++	u32	mark;		/* netfilter mark (fwmark) */
++};
++
++static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
++{
++	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
++{
++	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
++{
++	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
++}
++
++static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
++{
++	struct esfq_packet_info info;
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	enum ip_conntrack_info ctinfo;
++	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
++#endif
++
++	switch (skb->protocol) {
++	case __constant_htons(ETH_P_IP):
++	{
++		struct iphdr *iph = ip_hdr(skb);
++		info.dst = iph->daddr;
++		info.src = iph->saddr;
++		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
++		    (iph->protocol == IPPROTO_TCP ||
++		     iph->protocol == IPPROTO_UDP ||
++		     iph->protocol == IPPROTO_SCTP ||
++		     iph->protocol == IPPROTO_DCCP ||
++		     iph->protocol == IPPROTO_ESP))
++			info.proto = *(((u32*)iph) + iph->ihl);
++		else
++			info.proto = iph->protocol;
++		break;
++	}
++	case __constant_htons(ETH_P_IPV6):
++	{
++		struct ipv6hdr *iph = ipv6_hdr(skb);
++		/* Hash ipv6 addresses into a u32. This isn't ideal,
++		 * but the code is simple. */
++		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
++		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
++		if (iph->nexthdr == IPPROTO_TCP ||
++		    iph->nexthdr == IPPROTO_UDP ||
++		    iph->nexthdr == IPPROTO_SCTP ||
++		    iph->nexthdr == IPPROTO_DCCP ||
++		    iph->nexthdr == IPPROTO_ESP)
++			info.proto = *(u32*)&iph[1];
++		else
++			info.proto = iph->nexthdr;
++		break;
++	}
++	default:
++		info.dst   = (u32)(unsigned long)skb_dst(skb);
++		info.src   = (u32)(unsigned long)skb->sk;
++		info.proto = skb->protocol;
++	}
++
++	info.mark = skb->mark;
++
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	/* defaults if there is no conntrack info */
++	info.ctorigsrc = info.src;
++	info.ctorigdst = info.dst;
++	info.ctreplsrc = info.dst;
++	info.ctrepldst = info.src;
++	/* collect conntrack info */
++	if (ct && ct != &nf_conntrack_untracked) {
++		if (skb->protocol == __constant_htons(ETH_P_IP)) {
++			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
++			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
++			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++		}
++		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
++			/* Again, hash ipv6 addresses into a single u32. */
++			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
++			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
++		}
++
++	}
++#endif
++
++	switch(q->hash_kind) {
++	case TCA_SFQ_HASH_CLASSIC:
++		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++	case TCA_SFQ_HASH_DST:
++		return esfq_jhash_1word(q, info.dst);
++	case TCA_SFQ_HASH_SRC:
++		return esfq_jhash_1word(q, info.src);
++	case TCA_SFQ_HASH_FWMARK:
++		return esfq_jhash_1word(q, info.mark);
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	case TCA_SFQ_HASH_CTORIGDST:
++		return esfq_jhash_1word(q, info.ctorigdst);
++	case TCA_SFQ_HASH_CTORIGSRC:
++		return esfq_jhash_1word(q, info.ctorigsrc);
++	case TCA_SFQ_HASH_CTREPLDST:
++		return esfq_jhash_1word(q, info.ctrepldst);
++	case TCA_SFQ_HASH_CTREPLSRC:
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	case TCA_SFQ_HASH_CTNATCHG:
++	{
++		if (info.ctorigdst == info.ctreplsrc)
++			return esfq_jhash_1word(q, info.ctorigsrc);
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	}
++#endif
++	default:
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
++	}
++	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++}
++
++static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d = q->qs[x].qlen + q->depth;
++
++	p = d;
++	n = q->dep[d].next;
++	q->dep[x].next = n;
++	q->dep[x].prev = p;
++	q->dep[p].next = q->dep[n].prev = x;
++}
++
++static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++
++	if (n == p && q->max_depth == q->qs[x].qlen + 1)
++		q->max_depth--;
++
++	esfq_link(q, x);
++}
++
++static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++	d = q->qs[x].qlen;
++	if (q->max_depth < d)
++		q->max_depth = d;
++
++	esfq_link(q, x);
++}
++
++static unsigned int esfq_drop(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index d = q->max_depth;
++	struct sk_buff *skb;
++	unsigned int len;
++
++	/* Queue is full! Find the longest slot and
++	   drop a packet from it */
++
++	if (d > 1) {
++		esfq_index x = q->dep[d+q->depth].next;
++		skb = q->qs[x].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[x]);
++		kfree_skb(skb);
++		esfq_dec(q, x);
++		sch->q.qlen--;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	if (d == 1) {
++		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
++		d = q->next[q->tail];
++		q->next[q->tail] = q->next[d];
++		q->allot[q->next[d]] += q->quantum;
++		skb = q->qs[d].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[d]);
++		kfree_skb(skb);
++		esfq_dec(q, d);
++		sch->q.qlen--;
++		q->ht[q->hash[d]] = q->depth;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	return 0;
++}
++
++static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
++{
++	unsigned hash = esfq_hash(q, skb);
++	unsigned depth = q->depth;
++	esfq_index x;
++
++	x = q->ht[hash];
++	if (x == depth) {
++		q->ht[hash] = x = q->dep[depth].next;
++		q->hash[x] = hash;
++	}
++
++	if (end == ESFQ_TAIL)
++		__skb_queue_tail(&q->qs[x], skb);
++	else
++		__skb_queue_head(&q->qs[x], skb);
++
++	esfq_inc(q, x);
++	if (q->qs[x].qlen == 1) {		/* The flow is new */
++		if (q->tail == depth) {	/* It is the first flow */
++			q->tail = x;
++			q->next[x] = x;
++			q->allot[x] = q->quantum;
++		} else {
++			q->next[x] = q->next[q->tail];
++			q->next[q->tail] = x;
++			q->tail = x;
++		}
++	}
++}
++
++static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_enqueue(skb, q, ESFQ_TAIL);
++	sch->qstats.backlog += skb->len;
++	if (++sch->q.qlen < q->limit-1) {
++		sch->bstats.bytes += skb->len;
++		sch->bstats.packets++;
++		return 0;
++	}
++
++	sch->qstats.drops++;
++	esfq_drop(sch);
++	return NET_XMIT_CN;
++}
++
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index a;
++
++	/* No active slots */
++	if (q->tail == q->depth)
++		return NULL;
++
++	a = q->next[q->tail];
++	return skb_peek(&q->qs[a]);
++}
++
++static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
++{
++	struct sk_buff *skb;
++	unsigned depth = q->depth;
++	esfq_index a, old_a;
++
++	/* No active slots */
++	if (q->tail == depth)
++		return NULL;
++
++	a = old_a = q->next[q->tail];
++
++	/* Grab packet */
++	skb = __skb_dequeue(&q->qs[a]);
++	esfq_dec(q, a);
++
++	/* Is the slot empty? */
++	if (q->qs[a].qlen == 0) {
++		q->ht[q->hash[a]] = depth;
++		a = q->next[a];
++		if (a == old_a) {
++			q->tail = depth;
++			return skb;
++		}
++		q->next[q->tail] = a;
++		q->allot[a] += q->quantum;
++	} else if ((q->allot[a] -= skb->len) <= 0) {
++		q->tail = a;
++		a = q->next[a];
++		q->allot[a] += q->quantum;
++	}
++
++	return skb;
++}
++
++static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++
++	skb = esfq_q_dequeue(q);
++	if (skb == NULL)
++		return NULL;
++	sch->q.qlen--;
++	sch->qstats.backlog -= skb->len;
++	return skb;
++}
++
++static void esfq_q_destroy(struct esfq_sched_data *q)
++{
++	del_timer(&q->perturb_timer);
++	if(q->ht)
++		kfree(q->ht);
++	if(q->dep)
++		kfree(q->dep);
++	if(q->next)
++		kfree(q->next);
++	if(q->allot)
++		kfree(q->allot);
++	if(q->hash)
++		kfree(q->hash);
++	if(q->qs)
++		kfree(q->qs);
++}
++
++static void esfq_destroy(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_destroy(q);
++}
++
++
++static void esfq_reset(struct Qdisc* sch)
++{
++	struct sk_buff *skb;
++
++	while ((skb = esfq_dequeue(sch)) != NULL)
++		kfree_skb(skb);
++}
++
++static void esfq_perturbation(unsigned long arg)
++{
++	struct Qdisc *sch = (struct Qdisc*)arg;
++	struct esfq_sched_data *q = qdisc_priv(sch);
++
++	q->perturbation = net_random()&0x1F;
++
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++}
++
++static unsigned int esfq_check_hash(unsigned int kind)
++{
++	switch (kind) {
++	case TCA_SFQ_HASH_CTORIGDST:
++	case TCA_SFQ_HASH_CTORIGSRC:
++	case TCA_SFQ_HASH_CTREPLDST:
++	case TCA_SFQ_HASH_CTREPLSRC:
++	case TCA_SFQ_HASH_CTNATCHG:
++#ifndef CONFIG_NET_SCH_ESFQ_NFCT
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++#endif
++	case TCA_SFQ_HASH_CLASSIC:
++	case TCA_SFQ_HASH_DST:
++	case TCA_SFQ_HASH_SRC:
++	case TCA_SFQ_HASH_FWMARK:
++		return kind;
++	default:
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++	}
++}
++
++static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
++{
++	struct tc_esfq_qopt *ctl = nla_data(opt);
++	esfq_index p = ~0U/2;
++	int i;
++
++	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
++		return -EINVAL;
++
++	q->perturbation = 0;
++	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
++	q->max_depth = 0;
++	if (opt == NULL) {
++		q->perturb_period = 0;
++		q->hash_divisor = 1024;
++		q->tail = q->limit = q->depth = 128;
++
++	} else {
++		struct tc_esfq_qopt *ctl = nla_data(opt);
++		if (ctl->quantum)
++			q->quantum = ctl->quantum;
++		q->perturb_period = ctl->perturb_period*HZ;
++		q->hash_divisor = ctl->divisor ? : 1024;
++		q->tail = q->limit = q->depth = ctl->flows ? : 128;
++
++		if ( q->depth > p - 1 )
++			return -EINVAL;
++
++		if (ctl->limit)
++			q->limit = min_t(u32, ctl->limit, q->depth);
++
++		if (ctl->hash_kind) {
++			q->hash_kind = esfq_check_hash(ctl->hash_kind);
++		}
++	}
++
++	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->ht)
++		goto err_case;
++	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
++	if (!q->dep)
++		goto err_case;
++	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->next)
++		goto err_case;
++	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
++	if (!q->allot)
++		goto err_case;
++	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
++	if (!q->hash)
++		goto err_case;
++	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
++	if (!q->qs)
++		goto err_case;
++
++	for (i=0; i< q->hash_divisor; i++)
++		q->ht[i] = q->depth;
++	for (i=0; i<q->depth; i++) {
++		skb_queue_head_init(&q->qs[i]);
++		q->dep[i+q->depth].next = i+q->depth;
++		q->dep[i+q->depth].prev = i+q->depth;
++	}
++
++	for (i=0; i<q->depth; i++)
++		esfq_link(q, i);
++	return 0;
++err_case:
++	esfq_q_destroy(q);
++	return -ENOBUFS;
++}
++
++static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	int err;
++
++	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(q, opt)))
++		return err;
++
++	init_timer(&q->perturb_timer);
++	q->perturb_timer.data = (unsigned long)sch;
++	q->perturb_timer.function = esfq_perturbation;
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++
++	return 0;
++}
++
++static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct esfq_sched_data new;
++	struct sk_buff *skb;
++	int err;
++
++	/* set up new queue */
++	memset(&new, 0, sizeof(struct esfq_sched_data));
++	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(&new, opt)))
++		return err;
++
++	/* copy all packets from the old queue to the new queue */
++	sch_tree_lock(sch);
++	while ((skb = esfq_q_dequeue(q)) != NULL)
++		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
++
++	/* clean up the old queue */
++	esfq_q_destroy(q);
++
++	/* copy elements of the new queue into the old queue */
++	q->perturb_period = new.perturb_period;
++	q->quantum        = new.quantum;
++	q->limit          = new.limit;
++	q->depth          = new.depth;
++	q->hash_divisor   = new.hash_divisor;
++	q->hash_kind      = new.hash_kind;
++	q->tail           = new.tail;
++	q->max_depth      = new.max_depth;
++	q->ht    = new.ht;
++	q->dep   = new.dep;
++	q->next  = new.next;
++	q->allot = new.allot;
++	q->hash  = new.hash;
++	q->qs    = new.qs;
++
++	/* finish up */
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	} else {
++		q->perturbation = 0;
++	}
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	unsigned char *b = skb_tail_pointer(skb);
++	struct tc_esfq_qopt opt;
++
++	opt.quantum = q->quantum;
++	opt.perturb_period = q->perturb_period/HZ;
++
++	opt.limit = q->limit;
++	opt.divisor = q->hash_divisor;
++	opt.flows = q->depth;
++	opt.hash_kind = q->hash_kind;
++
++	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
++
++	return skb->len;
++
++nla_put_failure:
++	nlmsg_trim(skb, b);
++	return -1;
++}
++
++static struct Qdisc_ops esfq_qdisc_ops =
++{
++	.next		=	NULL,
++	.cl_ops		=	NULL,
++	.id		=	"esfq",
++	.priv_size	=	sizeof(struct esfq_sched_data),
++	.enqueue	=	esfq_enqueue,
++	.dequeue	=	esfq_dequeue,
++	.peek		=	esfq_peek,
++	.drop		=	esfq_drop,
++	.init		=	esfq_init,
++	.reset		=	esfq_reset,
++	.destroy	=	esfq_destroy,
++	.change		=	esfq_change,
++	.dump		=	esfq_dump,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init esfq_module_init(void)
++{
++	return register_qdisc(&esfq_qdisc_ops);
++}
++static void __exit esfq_module_exit(void)
++{
++	unregister_qdisc(&esfq_qdisc_ops);
++}
++module_init(esfq_module_init)
++module_exit(esfq_module_exit)
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.3/621-sched_act_connmark.patch b/trunk/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
new file mode 100644
index 00000000..b6adce1f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
@@ -0,0 +1,172 @@
+--- /dev/null
++++ b/net/sched/act_connmark.c
+@@ -0,0 +1,137 @@
++/*
++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/skbuff.h>
++#include <linux/rtnetlink.h>
++#include <linux/pkt_cls.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <net/netlink.h>
++#include <net/pkt_sched.h>
++#include <net/act_api.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++
++#define TCA_ACT_CONNMARK	20
++
++#define CONNMARK_TAB_MASK     3
++static struct tcf_common *tcf_connmark_ht[CONNMARK_TAB_MASK + 1];
++static u32 connmark_idx_gen;
++static DEFINE_RWLOCK(connmark_lock);
++
++static struct tcf_hashinfo connmark_hash_info = {
++	.htab	=	tcf_connmark_ht,
++	.hmask	=	CONNMARK_TAB_MASK,
++	.lock	=	&connmark_lock,
++};
++
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
++		       struct tcf_result *res)
++{
++	struct nf_conn *c;
++	enum ip_conntrack_info ctinfo;
++	int proto;
++	int r;
++
++	if (skb->protocol == htons(ETH_P_IP)) {
++		if (skb->len < sizeof(struct iphdr))
++			goto out;
++		proto = PF_INET;
++	} else if (skb->protocol == htons(ETH_P_IPV6)) {
++		if (skb->len < sizeof(struct ipv6hdr))
++			goto out;
++		proto = PF_INET6;
++	} else
++		goto out;
++
++	r = nf_conntrack_in(dev_net(skb->dev), proto, NF_INET_PRE_ROUTING, skb);
++	if (r != NF_ACCEPT)
++		goto out;
++
++	c = nf_ct_get(skb, &ctinfo);
++	if (!c)
++		goto out;
++
++	skb->mark = c->mark;
++	nf_conntrack_put(skb->nfct);
++	skb->nfct = NULL;
++
++out:
++	return TC_ACT_PIPE;
++}
++
++static int tcf_connmark_init(struct nlattr *nla, struct nlattr *est,
++			 struct tc_action *a, int ovr, int bind)
++{
++	struct tcf_common *pc;
++
++	pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
++			     &connmark_idx_gen, &connmark_hash_info);
++	if (IS_ERR(pc))
++	    return PTR_ERR(pc);
++
++	tcf_hash_insert(pc, &connmark_hash_info);
++
++	return ACT_P_CREATED;
++}
++
++static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)
++{
++	if (a->priv)
++		return tcf_hash_release(a->priv, bind, &connmark_hash_info);
++	return 0;
++}
++
++static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
++				int bind, int ref)
++{
++	return skb->len;
++}
++
++static struct tc_action_ops act_connmark_ops = {
++	.kind		=	"connmark",
++	.hinfo		=	&connmark_hash_info,
++	.type		=	TCA_ACT_CONNMARK,
++	.capab		=	TCA_CAP_NONE,
++	.owner		=	THIS_MODULE,
++	.act		=	tcf_connmark,
++	.dump		=	tcf_connmark_dump,
++	.cleanup	=	tcf_connmark_cleanup,
++	.init		=	tcf_connmark_init,
++	.walk		=	tcf_generic_walker,
++};
++
++MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_DESCRIPTION("Connection tracking mark restoring");
++MODULE_LICENSE("GPL");
++
++static int __init connmark_init_module(void)
++{
++	return tcf_register_action(&act_connmark_ops);
++}
++
++static void __exit connmark_cleanup_module(void)
++{
++	tcf_unregister_action(&act_connmark_ops);
++}
++
++module_init(connmark_init_module);
++module_exit(connmark_cleanup_module);
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -624,6 +624,19 @@ config NET_ACT_CSUM
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called act_csum.
+ 
++config NET_ACT_CONNMARK
++        tristate "Connection Tracking Marking"
++        depends on NET_CLS_ACT
++        depends on NF_CONNTRACK
++	 depends on NF_CONNTRACK_MARK
++        ---help---
++	  Say Y here to restore the connmark from a scheduler action
++
++	  If unsure, say N.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called act_connmark.
++
+ config NET_CLS_IND
+ 	bool "Incoming device classification"
+ 	depends on NET_CLS_U32 || NET_CLS_FW
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit
+ obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+ obj-$(CONFIG_NET_ACT_SKBEDIT)	+= act_skbedit.o
+ obj-$(CONFIG_NET_ACT_CSUM)	+= act_csum.o
++obj-$(CONFIG_NET_ACT_CONNMARK)	+= act_connmark.o
+ obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
+ obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
+ obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
diff --git a/trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch b/trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch
new file mode 100644
index 00000000..bcb39914
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/630-packet_socket_type.patch
@@ -0,0 +1,132 @@
+This patch allows the user to specify desired packet types (outgoing,
+broadcast, unicast, etc.) on packet sockets via setsockopt.
+This can reduce the load in situations where only a limited number
+of packet types are necessary
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/include/linux/if_packet.h
++++ b/include/linux/if_packet.h
+@@ -29,6 +29,8 @@ struct sockaddr_ll {
+ /* These ones are invisible by user level */
+ #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
+ #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
++#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
++
+ 
+ /* Packet socket options */
+ 
+@@ -50,6 +52,7 @@ struct sockaddr_ll {
+ #define PACKET_TX_TIMESTAMP		16
+ #define PACKET_TIMESTAMP		17
+ #define PACKET_FANOUT			18
++#define PACKET_RECV_TYPE		19
+ 
+ #define PACKET_FANOUT_HASH		0
+ #define PACKET_FANOUT_LB		1
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -296,6 +296,7 @@ struct packet_sock {
+ 	unsigned int		tp_loss:1;
+ 	unsigned int		tp_tstamp;
+ 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
++	unsigned int		pkt_type;
+ };
+ 
+ #define PACKET_FANOUT_MAX	256
+@@ -1383,6 +1384,7 @@ static int packet_rcv_spkt(struct sk_buf
+ {
+ 	struct sock *sk;
+ 	struct sockaddr_pkt *spkt;
++	struct packet_sock *po;
+ 
+ 	/*
+ 	 *	When we registered the protocol we saved the socket in the data
+@@ -1390,6 +1392,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 */
+ 
+ 	sk = pt->af_packet_priv;
++	po = pkt_sk(sk);
+ 
+ 	/*
+ 	 *	Yank back the headers [hope the device set this
+@@ -1402,7 +1405,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 *	so that this procedure is noop.
+ 	 */
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
+ 		goto out;
+ 
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+@@ -1596,12 +1599,12 @@ static int packet_rcv(struct sk_buff *sk
+ 	int skb_len = skb->len;
+ 	unsigned int snaplen, res;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -1720,12 +1723,12 @@ static int tpacket_rcv(struct sk_buff *s
+ 	struct timespec ts;
+ 	struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -2595,6 +2598,7 @@ static int packet_create(struct net *net
+ 	spin_lock_init(&po->bind_lock);
+ 	mutex_init(&po->pg_vec_lock);
+ 	po->prot_hook.func = packet_rcv;
++	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
+ 
+ 	if (sock->type == SOCK_PACKET)
+ 		po->prot_hook.func = packet_rcv_spkt;
+@@ -3192,6 +3196,16 @@ packet_setsockopt(struct socket *sock, i
+ 
+ 		return fanout_add(sk, val & 0xffff, val >> 16);
+ 	}
++        case PACKET_RECV_TYPE:
++        {
++                unsigned int val;
++                if (optlen != sizeof(val))
++                        return -EINVAL;
++                if (copy_from_user(&val, optval, sizeof(val)))
++                        return -EFAULT;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
++                return 0;
++        }
+ 	default:
+ 		return -ENOPROTOOPT;
+ 	}
+@@ -3262,6 +3276,13 @@ static int packet_getsockopt(struct sock
+ 
+ 		data = &val;
+ 		break;
++	case PACKET_RECV_TYPE:
++		if (len > sizeof(unsigned int))
++			len = sizeof(unsigned int);
++		val = po->pkt_type;
++
++		data = &val;
++		break;
+ 	case PACKET_VERSION:
+ 		if (len > sizeof(int))
+ 			len = sizeof(int);
diff --git a/trunk/target/linux/generic/patches-3.3/640-bridge_no_eap_forward.patch b/trunk/target/linux/generic/patches-3.3/640-bridge_no_eap_forward.patch
new file mode 100644
index 00000000..bbdb3bf1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/640-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -78,7 +78,11 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 	dst = NULL;
+ 
+-	if (is_broadcast_ether_addr(dest))
++	if (skb->protocol == htons(ETH_P_PAE)) {
++		skb2 = skb;
++		/* Do not forward 802.1x/EAP frames */
++		skb = NULL;
++	} else if (is_broadcast_ether_addr(dest))
+ 		skb2 = skb;
+ 	else if (is_multicast_ether_addr(dest)) {
+ 		mdst = br_mdb_get(br, skb);
diff --git a/trunk/target/linux/generic/patches-3.3/641-bridge_always_accept_eap.patch b/trunk/target/linux/generic/patches-3.3/641-bridge_always_accept_eap.patch
new file mode 100644
index 00000000..e04199b3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/641-bridge_always_accept_eap.patch
@@ -0,0 +1,11 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -65,7 +65,7 @@ int br_handle_frame_finish(struct sk_buf
+ 	    br_multicast_rcv(br, p, skb))
+ 		goto drop;
+ 
+-	if (p->state == BR_STATE_LEARNING)
++	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
+ 		goto drop;
+ 
+ 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
diff --git a/trunk/target/linux/generic/patches-3.3/642-bridge_port_isolate.patch b/trunk/target/linux/generic/patches-3.3/642-bridge_port_isolate.patch
new file mode 100644
index 00000000..68434bfc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/642-bridge_port_isolate.patch
@@ -0,0 +1,103 @@
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -135,6 +135,7 @@ struct net_bridge_port
+ 
+ 	unsigned long 			flags;
+ #define BR_HAIRPIN_MODE		0x00000001
++#define BR_ISOLATE_MODE		0x00000002
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	u32				multicast_startup_queries_sent;
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -149,6 +149,22 @@ static int store_hairpin_mode(struct net
+ static BRPORT_ATTR(hairpin_mode, S_IRUGO | S_IWUSR,
+ 		   show_hairpin_mode, store_hairpin_mode);
+ 
++static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
++{
++	int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
++	return sprintf(buf, "%d\n", isolate_mode);
++}
++static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
++{
++	if (v)
++		p->flags |= BR_ISOLATE_MODE;
++	else
++		p->flags &= ~BR_ISOLATE_MODE;
++	return 0;
++}
++static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
++		   show_isolate_mode, store_isolate_mode);
++
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+ {
+@@ -181,6 +197,7 @@ static struct brport_attribute *brport_a
+ 	&brport_attr_hold_timer,
+ 	&brport_attr_flush,
+ 	&brport_attr_hairpin_mode,
++	&brport_attr_isolate_mode,
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	&brport_attr_multicast_router,
+ #endif
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -98,7 +98,8 @@ int br_handle_frame_finish(struct sk_buf
+ 			skb2 = skb;
+ 
+ 		br->dev->stats.multicast++;
+-	} else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
++	} else if ((p->flags & BR_ISOLATE_MODE) ||
++		   ((dst = __br_fdb_get(br, dest)) && dst->is_local)) {
+ 		skb2 = skb;
+ 		/* Do not forward the packet since it's local. */
+ 		skb = NULL;
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -109,7 +109,7 @@ void br_deliver(const struct net_bridge_
+ /* called with rcu_read_lock */
+ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
+ {
+-	if (should_deliver(to, skb)) {
++	if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
+ 		if (skb0)
+ 			deliver_clone(to, skb, __br_forward);
+ 		else
+@@ -164,7 +164,8 @@ out:
+ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 		     struct sk_buff *skb0,
+ 		     void (*__packet_hook)(const struct net_bridge_port *p,
+-					   struct sk_buff *skb))
++					   struct sk_buff *skb),
++		     bool forward)
+ {
+ 	struct net_bridge_port *p;
+ 	struct net_bridge_port *prev;
+@@ -172,6 +173,9 @@ static void br_flood(struct net_bridge *
+ 	prev = NULL;
+ 
+ 	list_for_each_entry_rcu(p, &br->port_list, list) {
++		if (forward && (p->flags & BR_ISOLATE_MODE))
++			continue;
++
+ 		prev = maybe_deliver(prev, p, skb, __packet_hook);
+ 		if (IS_ERR(prev))
+ 			goto out;
+@@ -195,14 +199,14 @@ out:
+ /* called with rcu_read_lock */
+ void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
+ {
+-	br_flood(br, skb, NULL, __br_deliver);
++	br_flood(br, skb, NULL, __br_deliver, false);
+ }
+ 
+ /* called under bridge lock */
+ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
+ 		      struct sk_buff *skb2)
+ {
+-	br_flood(br, skb, skb2, __br_forward);
++	br_flood(br, skb, skb2, __br_forward, true);
+ }
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
diff --git a/trunk/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch b/trunk/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch
new file mode 100644
index 00000000..301b6be4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch
@@ -0,0 +1,107 @@
+--- a/include/net/addrconf.h
++++ b/include/net/addrconf.h
+@@ -91,6 +91,12 @@ extern void			addrconf_join_solict(struc
+ extern void			addrconf_leave_solict(struct inet6_dev *idev,
+ 					const struct in6_addr *addr);
+ 
++extern int			(*ipv6_dev_get_saddr_hook)(struct net *net,
++						struct net_device *dev,
++						const struct in6_addr *daddr,
++						unsigned int srcprefs,
++						struct in6_addr *saddr);
++
+ static inline unsigned long addrconf_timeout_fixup(u32 timeout,
+ 						    unsigned unit)
+ {
+--- a/net/bridge/Kconfig
++++ b/net/bridge/Kconfig
+@@ -6,7 +6,6 @@ config BRIDGE
+ 	tristate "802.1d Ethernet Bridging"
+ 	select LLC
+ 	select STP
+-	depends on IPV6 || IPV6=n
+ 	---help---
+ 	  If you say Y here, then your Linux box will be able to act as an
+ 	  Ethernet bridge, which means that the different Ethernet segments it
+--- a/net/ipv6/Makefile
++++ b/net/ipv6/Makefile
+@@ -40,3 +40,4 @@ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.
+ obj-y += addrconf_core.o exthdrs_core.o
+ 
+ obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
++obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1103,7 +1103,7 @@ out:
+ 	return ret;
+ }
+ 
+-int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
++static int __ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+ 		       struct in6_addr *saddr)
+ {
+@@ -1228,7 +1228,6 @@ try_nextdev:
+ 	in6_ifa_put(hiscore->ifa);
+ 	return 0;
+ }
+-EXPORT_SYMBOL(ipv6_dev_get_saddr);
+ 
+ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
+ 		    unsigned char banned_flags)
+@@ -4840,6 +4839,9 @@ int __init addrconf_init(void)
+ 
+ 	ipv6_addr_label_rtnl_register();
+ 
++	BUG_ON(ipv6_dev_get_saddr_hook != NULL);
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, __ipv6_dev_get_saddr);
++
+ 	return 0;
+ errout:
+ 	rtnl_af_unregister(&inet6_ops);
+@@ -4858,6 +4860,9 @@ void addrconf_cleanup(void)
+ 	struct net_device *dev;
+ 	int i;
+ 
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, NULL);
++	synchronize_rcu();
++
+ 	unregister_netdevice_notifier(&ipv6_dev_notf);
+ 	unregister_pernet_subsys(&addrconf_ops);
+ 	ipv6_addr_label_cleanup();
+--- /dev/null
++++ b/net/ipv6/inet6_stubs.c
+@@ -0,0 +1,33 @@
++/*
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ */
++#include <linux/export.h>
++#include <net/ipv6.h>
++
++int (*ipv6_dev_get_saddr_hook)(struct net *net, struct net_device *dev,
++			const struct in6_addr *daddr, unsigned int srcprefs,
++			struct in6_addr *saddr);
++
++EXPORT_SYMBOL(ipv6_dev_get_saddr_hook);
++
++int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr)
++{
++	int ret = -EADDRNOTAVAIL;
++	typeof(ipv6_dev_get_saddr_hook) dev_get_saddr;
++
++	rcu_read_lock();
++	dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook);
++
++	if (dev_get_saddr)
++		ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr);
++
++	rcu_read_unlock();
++	return ret;
++}
++EXPORT_SYMBOL(ipv6_dev_get_saddr);
++
diff --git a/trunk/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch b/trunk/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
new file mode 100644
index 00000000..dafe4208
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
@@ -0,0 +1,146 @@
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -55,7 +55,7 @@ int br_dev_queue_push_xmit(struct sk_buf
+ 
+ int br_forward_finish(struct sk_buff *skb)
+ {
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ 		       br_dev_queue_push_xmit);
+ 
+ }
+@@ -74,7 +74,7 @@ static void __br_deliver(const struct ne
+ 		return;
+ 	}
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+@@ -91,7 +91,7 @@ static void __br_forward(const struct ne
+ 	skb->dev = to->dev;
+ 	skb_forward_csum(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -40,7 +40,7 @@ static int br_pass_frame_up(struct sk_bu
+ 	indev = skb->dev;
+ 	skb->dev = brdev;
+ 
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+ 		       netif_receive_skb);
+ }
+ 
+@@ -199,7 +199,7 @@ rx_handler_result_t br_handle_frame(stru
+ 		}
+ 
+ 		/* Deliver packet to local host only */
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+ 			    NULL, br_handle_local_finish)) {
+ 			return RX_HANDLER_CONSUMED; /* consumed by filter */
+ 		} else {
+@@ -224,7 +224,7 @@ forward:
+ 		if (!compare_ether_addr(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_frame_finish);
+ 		break;
+ 	default:
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -753,7 +753,7 @@ static void __br_multicast_send_query(st
+ 	if (port) {
+ 		__skb_push(skb, sizeof(struct ethhdr));
+ 		skb->dev = port->dev;
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 			dev_queue_xmit);
+ 	} else
+ 		netif_rx(skb);
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -71,6 +71,15 @@ static int brnf_filter_pppoe_tagged __re
+ #define IS_ARP(skb) \
+ 	(!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
+ 
++int brnf_call_ebtables __read_mostly = 0;
++EXPORT_SYMBOL_GPL(brnf_call_ebtables);
++
++bool br_netfilter_run_hooks(void)
++{
++	return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables |
++	       brnf_call_ebtables;
++}
++
+ static inline __be16 vlan_proto(const struct sk_buff *skb)
+ {
+ 	if (vlan_tx_tag_present(skb))
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -486,15 +486,29 @@ static inline bool br_multicast_is_route
+ 
+ /* br_netfilter.c */
+ #ifdef CONFIG_BRIDGE_NETFILTER
++extern int brnf_call_ebtables;
+ extern int br_netfilter_init(void);
+ extern void br_netfilter_fini(void);
+ extern void br_netfilter_rtable_init(struct net_bridge *);
++extern bool br_netfilter_run_hooks(void);
+ #else
+ #define br_netfilter_init()	(0)
+ #define br_netfilter_fini()	do { } while(0)
+ #define br_netfilter_rtable_init(x)
++#define br_netfilter_run_hooks()	false
+ #endif
+ 
++static inline int
++BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
++	struct net_device *in, struct net_device *out,
++	int (*okfn)(struct sk_buff *))
++{
++	if (!br_netfilter_run_hooks())
++		return okfn(skb);
++
++	return NF_HOOK(pf, hook, skb, in, out, okfn);
++}
++
+ /* br_stp.c */
+ extern void br_log_state(const struct net_bridge_port *p);
+ extern struct net_bridge_port *br_get_port(struct net_bridge *br,
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -52,7 +52,7 @@ static void br_send_bpdu(struct net_brid
+ 
+ 	skb_reset_mac_header(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		dev_queue_xmit);
+ }
+ 
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -2403,11 +2403,13 @@ static int __init ebtables_init(void)
+ 	}
+ 
+ 	printk(KERN_INFO "Ebtables v2.0 registered\n");
++	brnf_call_ebtables = 1;
+ 	return 0;
+ }
+ 
+ static void __exit ebtables_fini(void)
+ {
++	brnf_call_ebtables = 0;
+ 	nf_unregister_sockopt(&ebt_sockopts);
+ 	xt_unregister_target(&ebt_standard_target);
+ 	printk(KERN_INFO "Ebtables v2.0 unregistered\n");
diff --git a/trunk/target/linux/generic/patches-3.3/650-pppoe_header_pad.patch b/trunk/target/linux/generic/patches-3.3/650-pppoe_header_pad.patch
new file mode 100644
index 00000000..5862dc11
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/ppp/pppoe.c
++++ b/drivers/net/ppp/pppoe.c
+@@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 		goto end;
+ 
+ 
+-	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
++	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
+ 			   0, GFP_KERNEL);
+ 	if (!skb) {
+ 		error = -ENOMEM;
+@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 	}
+ 
+ 	/* Reserve space for headers. */
+-	skb_reserve(skb, dev->hard_header_len);
++	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
+ 	skb_reset_network_header(skb);
+ 
+ 	skb->dev = dev;
diff --git a/trunk/target/linux/generic/patches-3.3/651-wireless_mesh_header.patch b/trunk/target/linux/generic/patches-3.3/651-wireless_mesh_header.patch
new file mode 100644
index 00000000..5c83d194
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/651-wireless_mesh_header.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -145,7 +145,7 @@ static inline bool dev_xmit_complete(int
+  */
+ 
+ #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ #  define LL_MAX_HEADER 128
+ # else
+ #  define LL_MAX_HEADER 96
diff --git a/trunk/target/linux/generic/patches-3.3/652-atm_header_changes.patch b/trunk/target/linux/generic/patches-3.3/652-atm_header_changes.patch
new file mode 100644
index 00000000..238d6f81
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/652-atm_header_changes.patch
@@ -0,0 +1,12 @@
+--- a/include/linux/atm.h
++++ b/include/linux/atm.h
+@@ -139,6 +139,9 @@ struct atm_trafprm {
+ 	int		min_pcr;	/* minimum PCR in cells per second */
+ 	int		max_cdv;	/* maximum CDV in microseconds */
+ 	int		max_sdu;	/* maximum SDU in bytes */
++	int		scr;		/* sustained rate in cells per second */
++	int		mbs;		/* maximum burst size (MBS) in cells */
++	int		cdv;		/* Cell delay varition */
+         /* extra params for ABR */
+         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
+         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/trunk/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch b/trunk/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch
new file mode 100644
index 00000000..ffa6502c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch
@@ -0,0 +1,28 @@
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -854,25 +854,7 @@ void netlink_detachskb(struct sock *sk,
+ 
+ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
+ {
+-	int delta;
+-
+ 	skb_orphan(skb);
+-
+-	delta = skb->end - skb->tail;
+-	if (delta * 2 < skb->truesize)
+-		return skb;
+-
+-	if (skb_shared(skb)) {
+-		struct sk_buff *nskb = skb_clone(skb, allocation);
+-		if (!nskb)
+-			return skb;
+-		kfree_skb(skb);
+-		skb = nskb;
+-	}
+-
+-	if (!pskb_expand_head(skb, 0, -delta, allocation))
+-		skb->truesize -= delta;
+-
+ 	return skb;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch b/trunk/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch
new file mode 100644
index 00000000..5b253712
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch
@@ -0,0 +1,21 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1850,12 +1850,15 @@ static inline int skb_clone_writable(con
+ static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
+ 			    int cloned)
+ {
++	unsigned int alloc_headroom = headroom;
+ 	int delta = 0;
+ 
+ 	if (headroom < NET_SKB_PAD)
+-		headroom = NET_SKB_PAD;
+-	if (headroom > skb_headroom(skb))
+-		delta = headroom - skb_headroom(skb);
++		alloc_headroom = NET_SKB_PAD;
++	if (headroom > skb_headroom(skb) ||
++	    (cloned && alloc_headroom > skb_headroom(skb))) {
++		delta = alloc_headroom - skb_headroom(skb);
++	}
+ 
+ 	if (delta || cloned)
+ 		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
diff --git a/trunk/target/linux/generic/patches-3.3/655-increase_skb_pad.patch b/trunk/target/linux/generic/patches-3.3/655-increase_skb_pad.patch
new file mode 100644
index 00000000..c4c8c341
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/655-increase_skb_pad.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1558,7 +1558,7 @@ static inline int pskb_network_may_pull(
+  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
+  */
+ #ifndef NET_SKB_PAD
+-#define NET_SKB_PAD	max(32, L1_CACHE_BYTES)
++#define NET_SKB_PAD	max(64, L1_CACHE_BYTES)
+ #endif
+ 
+ extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/trunk/target/linux/generic/patches-3.3/700-swconfig.patch b/trunk/target/linux/generic/patches-3.3/700-swconfig.patch
new file mode 100644
index 00000000..a2009439
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/700-swconfig.patch
@@ -0,0 +1,39 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -13,6 +13,16 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config SWCONFIG
++	tristate "Switch configuration API"
++	---help---
++	  Switch configuration API using netlink. This allows
++	  you to configure the VLAN features of certain switches.
++
++config SWCONFIG_LEDS
++	bool "Switch LED trigger support"
++	depends on (SWCONFIG && LEDS_TRIGGERS)
++
+ comment "MII PHY device drivers"
+ 
+ config MARVELL_PHY
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -3,6 +3,7 @@
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
++obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
+ obj-$(CONFIG_CICADA_PHY)	+= cicada.o
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -354,6 +354,7 @@ header-y += stddef.h
+ header-y += string.h
+ header-y += suspend_ioctls.h
+ header-y += swab.h
++header-y += switch.h
+ header-y += synclink.h
+ header-y += sysctl.h
+ header-y += taskstats.h
diff --git a/trunk/target/linux/generic/patches-3.3/701-phy_extension.patch b/trunk/target/linux/generic/patches-3.3/701-phy_extension.patch
new file mode 100644
index 00000000..201c857d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/701-phy_extension.patch
@@ -0,0 +1,72 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
+ }
+ EXPORT_SYMBOL(phy_ethtool_gset);
+ 
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
++{
++	u32 cmd;
++	int tmp;
++	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
++	struct ethtool_value edata = { ETHTOOL_GLINK };
++
++	if (get_user(cmd, (u32 *) useraddr))
++		return -EFAULT;
++
++	switch (cmd) {
++	case ETHTOOL_GSET:
++		phy_ethtool_gset(phydev, &ecmd);
++		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
++			return -EFAULT;
++		return 0;
++
++	case ETHTOOL_SSET:
++		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
++			return -EFAULT;
++		return phy_ethtool_sset(phydev, &ecmd);
++
++	case ETHTOOL_NWAY_RST:
++		/* if autoneg is off, it's an error */
++		tmp = phy_read(phydev, MII_BMCR);
++		if (tmp & BMCR_ANENABLE) {
++			tmp |= (BMCR_ANRESTART);
++			phy_write(phydev, MII_BMCR, tmp);
++			return 0;
++		}
++		return -EINVAL;
++
++	case ETHTOOL_GLINK:
++		edata.data = (phy_read(phydev,
++				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
++		if (copy_to_user(useraddr, &edata, sizeof(edata)))
++			return -EFAULT;
++		return 0;
++	}
++
++	return -EOPNOTSUPP;
++}
++EXPORT_SYMBOL(phy_ethtool_ioctl);
++
+ /**
+  * phy_mii_ioctl - generic PHY MII ioctl interface
+  * @phydev: the phy_device struct
+@@ -474,7 +518,7 @@ static void phy_force_reduction(struct p
+ 	int idx;
+ 
+ 	idx = phy_find_setting(phydev->speed, phydev->duplex);
+-	
++
+ 	idx++;
+ 
+ 	idx = phy_find_valid(idx, phydev->supported);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -515,6 +515,7 @@ void phy_start_machine(struct phy_device
+ void phy_stop_machine(struct phy_device *phydev);
+ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
+ int phy_mii_ioctl(struct phy_device *phydev,
+ 		struct ifreq *ifr, int cmd);
+ int phy_start_interrupts(struct phy_device *phydev);
diff --git a/trunk/target/linux/generic/patches-3.3/702-phy_add_aneg_done_function.patch b/trunk/target/linux/generic/patches-3.3/702-phy_add_aneg_done_function.patch
new file mode 100644
index 00000000..0649afb1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,45 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -393,9 +393,18 @@ struct phy_driver {
+ 	 */
+ 	int (*config_aneg)(struct phy_device *phydev);
+ 
++	/* Determine if autonegotiation is done */
++	int (*aneg_done)(struct phy_device *phydev);
++
+ 	/* Determines the negotiated speed and duplex */
+ 	int (*read_status)(struct phy_device *phydev);
+ 
++	/* 
++	 * Update the value in phydev->link to reflect the 
++	 * current link value
++	 */
++	int (*update_link)(struct phy_device *phydev);
++
+ 	/* Clears any pending interrupts */
+ 	int (*ack_interrupt)(struct phy_device *phydev);
+ 
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -705,6 +705,9 @@ int genphy_update_link(struct phy_device
+ {
+ 	int status;
+ 
++	if (phydev->drv->update_link)
++		return phydev->drv->update_link(phydev);
++
+ 	/* Do a fake read */
+ 	status = phy_read(phydev, MII_BMSR);
+ 
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -106,6 +106,9 @@ static inline int phy_aneg_done(struct p
+ {
+ 	int retval;
+ 
++	if (phydev->drv->aneg_done)
++		return phydev->drv->aneg_done(phydev);
++
+ 	retval = phy_read(phydev, MII_BMSR);
+ 
+ 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/trunk/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch b/trunk/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 00000000..8af9a191
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -522,6 +522,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++	if (phydev->drv && phydev->drv->detach)
++		phydev->drv->detach(phydev);
++
+ 	phydev->attached_dev->phydev = NULL;
+ 	phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -417,6 +417,12 @@ struct phy_driver {
+ 	 */
+ 	int (*did_interrupt)(struct phy_device *phydev);
+ 
++	/*
++	 * Called before an ethernet device is detached
++	 * from the PHY.
++	 */
++	void (*detach)(struct phy_device *phydev);
++
+ 	/* Clears up any memory if needed */
+ 	void (*remove)(struct phy_device *phydev);
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch b/trunk/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
new file mode 100644
index 00000000..5e403946
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
@@ -0,0 +1,191 @@
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -36,6 +36,8 @@
+ #include <asm/irq.h>
+ #include <asm/uaccess.h>
+ 
++#include "mdio-boardinfo.h"
++
+ /**
+  * mdiobus_alloc_size - allocate a mii_bus structure
+  * @size: extra amount of memory to allocate for private storage.
+@@ -192,15 +194,33 @@ void mdiobus_free(struct mii_bus *bus)
+ }
+ EXPORT_SYMBOL(mdiobus_free);
+ 
++static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus,
++						struct phy_device *phydev,
++						struct mdio_board_info *bi)
++{
++	if (strcmp(bus->id, bi->bus_id) ||
++	    bi->phy_addr != phydev->addr)
++		return;
++
++	phydev->dev.platform_data = (void *) bi->platform_data;
++}
++
+ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
+ {
+ 	struct phy_device *phydev;
++	struct mdio_board_entry *be;
+ 	int err;
+ 
+ 	phydev = get_phy_device(bus, addr);
+ 	if (IS_ERR(phydev) || phydev == NULL)
+ 		return phydev;
+ 
++	mutex_lock(&__mdio_board_lock);
++	list_for_each_entry(be, &__mdio_board_list, list)
++		mdiobus_setup_phydev_from_boardinfo(bus, phydev,
++						    &be->board_info);
++	mutex_unlock(&__mdio_board_lock);
++
+ 	err = phy_device_register(phydev);
+ 	if (err) {
+ 		phy_device_free(phydev);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -549,4 +549,22 @@ int __init mdio_bus_init(void);
+ void mdio_bus_exit(void);
+ 
+ extern struct bus_type mdio_bus_type;
++
++struct mdio_board_info {
++	const char	*bus_id;
++	int		phy_addr;
++
++	const void	*platform_data;
++};
++
++#ifdef CONFIG_MDIO_BOARDINFO
++int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n);
++#else
++static inline int
++mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n)
++{
++	return 0;
++}
++#endif
++
+ #endif /* __PHY_H */
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -13,6 +13,10 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config MDIO_BOARDINFO
++	bool
++	default y
++
+ config SWCONFIG
+ 	tristate "Switch configuration API"
+ 	---help---
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -2,6 +2,8 @@
+ 
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
++obj-$(CONFIG_MDIO_BOARDINFO)	+= mdio-boardinfo.o
++
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
+ obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.c
+@@ -0,0 +1,58 @@
++/*
++ * mdio-boardinfo.c - collect pre-declarations of PHY devices
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/phy.h>
++#include <linux/slab.h>
++#include <linux/export.h>
++#include <linux/mutex.h>
++#include <linux/phy.h>
++
++#include "mdio-boardinfo.h"
++
++/*
++ * These symbols are exported ONLY FOR the mdio_bus component.
++ * No other users will be supported.
++ */
++
++LIST_HEAD(__mdio_board_list);
++EXPORT_SYMBOL_GPL(__mdio_board_list);
++
++DEFINE_MUTEX(__mdio_board_lock);
++EXPORT_SYMBOL_GPL(__mdio_board_lock);
++
++/**
++ * mdio_register_board_info - register PHY devices for a given board
++ * @info: array of chip descriptors
++ * @n: how many descriptors are provided
++ * Context: can sleep
++ *
++ * The board info passed can safely be __initdata ... but be careful of
++ * any embedded pointers (platform_data, etc), they're copied as-is.
++ */
++int __init
++mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n)
++{
++	struct mdio_board_entry *be;
++	int i;
++
++	be = kzalloc(n * sizeof(*be), GFP_KERNEL);
++	if (!be)
++		return -ENOMEM;
++
++	for (i = 0; i < n; i++, be++, info++) {
++		memcpy(&be->board_info, info, sizeof(*info));
++		mutex_lock(&__mdio_board_lock);
++		list_add_tail(&be->list, &__mdio_board_list);
++		mutex_unlock(&__mdio_board_lock);
++	}
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.h
+@@ -0,0 +1,22 @@
++/*
++ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/mutex.h>
++
++struct mdio_board_entry {
++	struct list_head	list;
++	struct mdio_board_info	board_info;
++};
++
++/* __mdio_board_lock protects __mdio_board_list
++ * only mdio_bus components are allowed to use these symbols.
++ */
++extern struct mutex __mdio_board_lock;
++extern struct list_head __mdio_board_list;
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -15,7 +15,7 @@ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_NET) += Space.o loopback.o
+ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+-obj-$(CONFIG_PHYLIB) += phy/
++obj-y += phy/
+ obj-$(CONFIG_RIONET) += rionet.o
+ obj-$(CONFIG_NET_TEAM) += team/
+ obj-$(CONFIG_TUN) += tun.o
diff --git a/trunk/target/linux/generic/patches-3.3/720-phy_adm6996.patch b/trunk/target/linux/generic/patches-3.3/720-phy_adm6996.patch
new file mode 100644
index 00000000..c99824a6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/720-phy_adm6996.patch
@@ -0,0 +1,26 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -106,6 +106,13 @@ config MICREL_PHY
+ 	---help---
+ 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
+ 
++config ADM6996_PHY
++	tristate "Driver for ADM6996 switches"
++	select SWCONFIG
++	---help---
++	  Currently supports the ADM6996FC and ADM6996M switches.
++	  Support for FC is very limited.
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
+ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
++obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.3/721-phy_packets.patch b/trunk/target/linux/generic/patches-3.3/721-phy_packets.patch
new file mode 100644
index 00000000..cdb01be1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/721-phy_packets.patch
@@ -0,0 +1,175 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -1078,6 +1078,11 @@ struct net_device {
+ 	const struct net_device_ops *netdev_ops;
+ 	const struct ethtool_ops *ethtool_ops;
+ 
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
++	struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
++#endif
++
+ 	/* Hardware header description */
+ 	const struct header_ops *header_ops;
+ 
+@@ -1134,6 +1139,9 @@ struct net_device {
+ 	void			*ax25_ptr;	/* AX.25 specific data */
+ 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
+ 						   assign before registering */
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void			*phy_ptr; /* PHY device specific data */
++#endif
+ 
+ /*
+  * Cache lines mostly used on receive path (including eth_type_trans())
+--- a/include/linux/if.h
++++ b/include/linux/if.h
+@@ -80,6 +80,7 @@
+ 					 * skbs on transmit */
+ #define IFF_UNICAST_FLT	0x20000		/* Supports unicast filtering	*/
+ #define IFF_TEAM_PORT	0x40000		/* device used as team port */
++#define IFF_NO_IP_ALIGN	0x80000		/* do not ip-align allocated rx pkts */
+ 
+ #define IF_GET_IFACE	0x0001		/* for querying only */
+ #define IF_GET_PROTO	0x0002
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1661,6 +1661,10 @@ extern struct sk_buff *dev_alloc_skb(uns
+ extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
+ 		unsigned int length, gfp_t gfp_mask);
+ 
++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp);
++
++
+ /**
+  *	netdev_alloc_skb - allocate an skbuff for rx on a specific device
+  *	@dev: network device to receive on
+@@ -1680,16 +1684,6 @@ static inline struct sk_buff *netdev_all
+ 	return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
+ }
+ 
+-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
+-		unsigned int length, gfp_t gfp)
+-{
+-	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
+-
+-	if (NET_IP_ALIGN && skb)
+-		skb_reserve(skb, NET_IP_ALIGN);
+-	return skb;
+-}
+-
+ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+ 		unsigned int length)
+ {
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -23,6 +23,12 @@ menuconfig NET
+ 
+ if NET
+ 
++config ETHERNET_PACKET_MANGLE
++	bool
++	help
++	  This option can be selected by phy drivers that need to mangle
++	  packets going in or out of an ethernet device.
++
+ config WANT_COMPAT_NETLINK_MESSAGES
+ 	bool
+ 	help
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2267,9 +2267,19 @@ int dev_hard_start_xmit(struct sk_buff *
+ 			}
+ 		}
+ 
+-		skb_len = skb->len;
+-		rc = ops->ndo_start_xmit(skb, dev);
+-		trace_net_dev_xmit(skb, rc, dev, skb_len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = skb->len;
++			rc = ops->ndo_start_xmit(skb, dev);
++			trace_net_dev_xmit(skb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (rc == NETDEV_TX_OK)
+ 			txq_trans_update(txq);
+ 		return rc;
+@@ -2289,9 +2299,19 @@ gso:
+ 		if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
+ 			skb_dst_drop(nskb);
+ 
+-		skb_len = nskb->len;
+-		rc = ops->ndo_start_xmit(nskb, dev);
+-		trace_net_dev_xmit(nskb, rc, dev, skb_len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (nskb = dev->eth_mangle_tx(dev, nskb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = nskb->len;
++			rc = ops->ndo_start_xmit(nskb, dev);
++			trace_net_dev_xmit(nskb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (unlikely(rc != NETDEV_TX_OK)) {
+ 			if (rc & ~NETDEV_TX_MASK)
+ 				goto out_kfree_gso_skb;
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -58,6 +58,7 @@
+ #include <linux/scatterlist.h>
+ #include <linux/errqueue.h>
+ #include <linux/prefetch.h>
++#include <linux/if.h>
+ 
+ #include <net/protocol.h>
+ #include <net/dst.h>
+@@ -320,6 +321,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+ }
+ EXPORT_SYMBOL(__netdev_alloc_skb);
+ 
++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp)
++{
++	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
++		return skb;
++#endif
++
++	if (NET_IP_ALIGN && skb)
++		skb_reserve(skb, NET_IP_ALIGN);
++	return skb;
++}
++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
++
+ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 		int size)
+ {
+--- a/net/ethernet/eth.c
++++ b/net/ethernet/eth.c
+@@ -160,6 +160,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+ 	struct ethhdr *eth;
+ 
+ 	skb->dev = dev;
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev->eth_mangle_rx)
++		dev->eth_mangle_rx(dev, skb);
++#endif
++
+ 	skb_reset_mac_header(skb);
+ 	skb_pull_inline(skb, ETH_HLEN);
+ 	eth = eth_hdr(skb);
diff --git a/trunk/target/linux/generic/patches-3.3/722-phy_mvswitch.patch b/trunk/target/linux/generic/patches-3.3/722-phy_mvswitch.patch
new file mode 100644
index 00000000..8a456117
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/722-phy_mvswitch.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -113,6 +113,10 @@ config ADM6996_PHY
+ 	  Currently supports the ADM6996FC and ADM6996M switches.
+ 	  Support for FC is very limited.
+ 
++config MVSWITCH_PHY
++	tristate "Driver for Marvell 88E6060 switches"
++	select ETHERNET_PACKET_MANGLE
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
++obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.3/723-phy_ip175c.patch b/trunk/target/linux/generic/patches-3.3/723-phy_ip175c.patch
new file mode 100644
index 00000000..8eff10cf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/723-phy_ip175c.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -117,6 +117,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config IP17XX_PHY
++	tristate "Driver for IC+ IP17xx switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.3/724-phy_ar8216.patch b/trunk/target/linux/generic/patches-3.3/724-phy_ar8216.patch
new file mode 100644
index 00000000..eed6e2b9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/724-phy_ar8216.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -121,6 +121,11 @@ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+ 
++config AR8216_PHY
++	tristate "Driver for Atheros AR8216 switches"
++	select ETHERNET_PACKET_MANGLE
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.3/725-phy_rtl8306.patch b/trunk/target/linux/generic/patches-3.3/725-phy_rtl8306.patch
new file mode 100644
index 00000000..db0ee658
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/725-phy_rtl8306.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -126,6 +126,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config RTL8306_PHY
++	tristate "Driver for Realtek RTL8306S switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.3/726-phy_rtl8366.patch b/trunk/target/linux/generic/patches-3.3/726-phy_rtl8366.patch
new file mode 100644
index 00000000..d258e4b5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/726-phy_rtl8366.patch
@@ -0,0 +1,45 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -168,6 +168,30 @@ config MDIO_OCTEON
+ 
+ 	  If in doubt, say Y.
+ 
++config RTL8366_SMI
++	tristate "Driver for the RTL8366 SMI interface"
++	depends on GENERIC_GPIO
++	---help---
++	  This module implements the SMI interface protocol which is used
++	  by some RTL8366 ethernet switch devices via the generic GPIO API.
++
++if RTL8366_SMI
++
++config RTL8366_SMI_DEBUG_FS
++	bool "RTL8366 SMI interface debugfs support"
++        depends on DEBUG_FS
++        default n
++
++config RTL8366S_PHY
++	tristate "Driver for the Realtek RTL8366S switch"
++	select SWCONFIG
++
++config RTL8366RB_PHY
++	tristate "Driver for the Realtek RTL8366RB switch"
++	select SWCONFIG
++
++endif # RTL8366_SMI
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
++obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
++obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.3/727-phy-rtl8367.patch b/trunk/target/linux/generic/patches-3.3/727-phy-rtl8367.patch
new file mode 100644
index 00000000..a24f497c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/727-phy-rtl8367.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -190,6 +190,10 @@ config RTL8366RB_PHY
+ 	tristate "Driver for the Realtek RTL8366RB switch"
+ 	select SWCONFIG
+ 
++config RTL8367_PHY
++	tristate "Driver for the Realtek RTL8367R/M switches"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -25,6 +25,7 @@ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
++obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.3/728-phy-micrel.patch b/trunk/target/linux/generic/patches-3.3/728-phy-micrel.patch
new file mode 100644
index 00000000..c41d0309
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/728-phy-micrel.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -130,6 +130,11 @@ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
+ 
++config MICREL_PHY
++	tristate "Drivers for Micrel/Kendin PHYs"
++	---help---
++	  Currently has a driver for the KSZ8041
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
++obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.3/729-phy-rtl8367b.patch b/trunk/target/linux/generic/patches-3.3/729-phy-rtl8367b.patch
new file mode 100644
index 00000000..82a7386f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/729-phy-rtl8367b.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -199,6 +199,10 @@ config RTL8367_PHY
+ 	tristate "Driver for the Realtek RTL8367R/M switches"
+ 	select SWCONFIG
+ 
++config RTL8367B_PHY
++	tristate "Driver fot the Realtek RTL8367R-VB switch"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
++obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.3/729-phy-tantos.patch b/trunk/target/linux/generic/patches-3.3/729-phy-tantos.patch
new file mode 100644
index 00000000..99a4e71e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/729-phy-tantos.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -210,3 +210,8 @@ endif # PHYLIB
+ config MICREL_KS8995MA
+ 	tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
+ 	depends on SPI
++
++config PSB6970_PHY
++	tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
++	select SWCONFIG
++	select ETHERNET_PACKET_MANGLE
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -29,6 +29,7 @@ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
++obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.3/750-hostap_txpower.patch b/trunk/target/linux/generic/patches-3.3/750-hostap_txpower.patch
new file mode 100644
index 00000000..8e2ec9af
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/750-hostap_txpower.patch
@@ -0,0 +1,154 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t
+ 		addr[count].sa_family = ARPHRD_ETHER;
+ 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+ 		if (sta->last_rx_silence == 0)
+-			qual[count].qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			qual[count].qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+ 		qual[count].updated = sta->last_rx_updated;
+ 
+ 		sta->last_rx_updated = IW_QUAL_DBM;
+@@ -2412,13 +2412,13 @@ int prism2_ap_translate_scan(struct net_
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = IWEVQUAL;
+ 		if (sta->last_rx_silence == 0)
+-			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			iwe.u.qual.qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+ 		iwe.u.qual.updated = sta->last_rx_updated;
+ 		iwe.len = IW_EV_QUAL_LEN;
+ 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++#define RAW_TXPOWER_SETTING
++
+ #endif /* HOSTAP_CONFIG_H */
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;
+ 
+ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++int hostap_restore_power(struct net_device *dev);
+ 
+ 
+ #endif /* HOSTAP_H */
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
+ 			prism2_hw_reset(dev);
+ 	}
+ 
++	hostap_restore_power(dev);
+ 	return res;
+ }
+ 
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
+ 	}
+ 
+ 	/* Get BSSID if we have a valid AP address */
++
++	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++	     val == HFA384X_LINKSTATUS_DISCONNECTED )
++			hostap_restore_power(local->dev);
++
+ 	if (connected) {
+ 		netif_carrier_on(local->dev);
+ 		netif_carrier_on(local->ddev);
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1478,23 +1478,20 @@ static int prism2_txpower_hfa386x_to_dBm
+ 		val = 255;
+ 
+ 	tmp = val;
+-	tmp >>= 2;
+ 
+-	return -12 - tmp;
++	return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+ 	signed char tmp;
+ 
+-	if (val > 20)
+-		return 128;
+-	else if (val < -43)
++	if (val > 127)
+ 		return 127;
++	else if (val < -128)
++		return 128;
+ 
+ 	tmp = val;
+-	tmp = -12 - tmp;
+-	tmp <<= 2;
+ 
+ 	return (unsigned char) tmp;
+ }
+@@ -4057,3 +4054,35 @@ int hostap_ioctl(struct net_device *dev,
+ 
+ 	return ret;
+ }
++
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = netdev_priv(dev);
++       local_info_t *local = iface->local;
++
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
++EXPORT_SYMBOL(hostap_restore_power);
diff --git a/trunk/target/linux/generic/patches-3.3/800-usb-ohci-multiple-platform-driver-fix.patch b/trunk/target/linux/generic/patches-3.3/800-usb-ohci-multiple-platform-driver-fix.patch
new file mode 100644
index 00000000..a2a213b3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/800-usb-ohci-multiple-platform-driver-fix.patch
@@ -0,0 +1,51 @@
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1123,7 +1123,7 @@ MODULE_LICENSE ("GPL");
+ 
+ #ifdef CONFIG_USB_OHCI_HCD_PLATFORM
+ #include "ohci-platform.c"
+-#define PLATFORM_DRIVER		ohci_platform_driver
++#define OHCI_PLATFORM_DRIVER		ohci_platform_driver
+ #endif
+ 
+ #if	!defined(PCI_DRIVER) &&		\
+@@ -1135,7 +1135,8 @@ MODULE_LICENSE ("GPL");
+ 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
+ 	!defined(SM501_OHCI_DRIVER) && \
+ 	!defined(TMIO_OHCI_DRIVER) && \
+-	!defined(SSB_OHCI_DRIVER)
++	!defined(SSB_OHCI_DRIVER) && \
++	!defined(OHCI_PLATFORM_DRIVER)
+ #error "missing bus glue for ohci-hcd"
+ #endif
+ 
+@@ -1219,9 +1220,19 @@ static int __init ohci_hcd_mod_init(void
+ 		goto error_tmio;
+ #endif
+ 
++#ifdef OHCI_PLATFORM_DRIVER
++	retval = platform_driver_register(&OHCI_PLATFORM_DRIVER);
++	if (retval < 0)
++		goto error_ohci;
++#endif
++
+ 	return retval;
+ 
+ 	/* Error path */
++#ifdef OHCI_PLATFORM_DRIVER
++	platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++ error_ohci:
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+ 	platform_driver_unregister(&TMIO_OHCI_DRIVER);
+  error_tmio:
+@@ -1275,6 +1286,9 @@ module_init(ohci_hcd_mod_init);
+ 
+ static void __exit ohci_hcd_mod_exit(void)
+ {
++#ifdef OHCI_PLATFORM_DRIVER
++	platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+ 	platform_driver_unregister(&TMIO_OHCI_DRIVER);
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch b/trunk/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch
new file mode 100644
index 00000000..9bf50976
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch
@@ -0,0 +1,47 @@
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -1383,12 +1383,12 @@ MODULE_LICENSE ("GPL");
+ 
+ #ifdef CONFIG_USB_EHCI_HCD_PLATFORM
+ #include "ehci-platform.c"
+-#define PLATFORM_DRIVER		ehci_platform_driver
++#define EHCI_PLATFORM_DRIVER	ehci_platform_driver
+ #endif
+ 
+ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
+-    !defined(XILINX_OF_PLATFORM_DRIVER)
++    !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER)
+ #error "missing bus glue for ehci-hcd"
+ #endif
+ 
+@@ -1448,8 +1448,19 @@ static int __init ehci_hcd_init(void)
+ 	if (retval < 0)
+ 		goto clean4;
+ #endif
++
++#ifdef EHCI_PLATFORM_DRIVER
++	retval = platform_driver_register(&EHCI_PLATFORM_DRIVER);
++	if (retval < 0)
++		goto clean5;
++#endif
++
+ 	return retval;
+ 
++#ifdef EHCI_PLATFORM_DRIVER
++	platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
++clean5:
++#endif
+ #ifdef XILINX_OF_PLATFORM_DRIVER
+ 	/* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */
+ clean4:
+@@ -1482,6 +1493,9 @@ module_init(ehci_hcd_init);
+ 
+ static void __exit ehci_hcd_cleanup(void)
+ {
++#ifdef EHCI_PLATFORM_DRIVER
++	platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
++#endif
+ #ifdef XILINX_OF_PLATFORM_DRIVER
+ 	platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.3/810-pci_disable_common_quirks.patch b/trunk/target/linux/generic/patches-3.3/810-pci_disable_common_quirks.patch
new file mode 100644
index 00000000..48021571
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/810-pci_disable_common_quirks.patch
@@ -0,0 +1,43 @@
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -51,6 +51,12 @@ config XEN_PCIDEV_FRONTEND
+           The PCI device frontend driver allows the kernel to import arbitrary
+           PCI devices from a PCI backend to support PCI driver domains.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++	bool "PCI disable common quirks"
++	depends on PCI
++	help
++	  If you don't know what to do here, say N.
++
+ config HT_IRQ
+ 	bool "Interrupts on hypertransport devices"
+ 	default y
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -105,6 +105,7 @@ static void __devinit quirk_mmio_always_
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -1990,7 +1991,9 @@ static void __devinit fixup_rev1_53c810(
+ 	}
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* Enable 1k I/O space granularity on the Intel P64H2 */
+ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
+ {
+@@ -2666,6 +2669,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+ 			quirk_msi_intx_disable_bug);
+ 
+ #endif /* CONFIG_PCI_MSI */
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ /* Allow manual resource allocation for PCI hotplug bridges
+  * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For
diff --git a/trunk/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch b/trunk/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 00000000..7bf8eaf1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,38 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -432,6 +432,8 @@ reset_needed:
+ }
+ EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ {
+ 	u16 cmd;
+@@ -928,3 +930,5 @@ static void __devinit quirk_usb_early_ha
+ 	pci_disable_device(pdev);
+ }
+ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
++
++#endif
+--- a/drivers/usb/host/pci-quirks.h
++++ b/drivers/usb/host/pci-quirks.h
+@@ -8,9 +8,17 @@ int usb_amd_find_chipset_info(void);
+ void usb_amd_dev_put(void);
+ void usb_amd_quirk_pll_disable(void);
+ void usb_amd_quirk_pll_enable(void);
++#if !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
+ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
+ #else
++static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
++{
++	return false;
++}
++static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {}
++#endif
++#else
+ static inline void usb_amd_quirk_pll_disable(void) {}
+ static inline void usb_amd_quirk_pll_enable(void) {}
+ static inline void usb_amd_dev_put(void) {}
diff --git a/trunk/target/linux/generic/patches-3.3/820-usb_add_usb_find_device_by_name.patch b/trunk/target/linux/generic/patches-3.3/820-usb_add_usb_find_device_by_name.patch
new file mode 100644
index 00000000..ee50ff90
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/820-usb_add_usb_find_device_by_name.patch
@@ -0,0 +1,84 @@
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -652,6 +652,71 @@ int __usb_get_extra_descriptor(char *buf
+ }
+ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
+ 
++static struct usb_device *match_device_name(struct usb_device *dev,
++					    const char *name)
++{
++	struct usb_device *ret_dev = NULL;
++	int child;
++
++	dev_dbg(&dev->dev, "check for name %s ...\n", name);
++
++	/* see if this device matches */
++	if (strcmp(dev_name(&dev->dev), name) == 0 ) {
++		dev_dbg(&dev->dev, "matched this device!\n");
++		ret_dev = usb_get_dev(dev);
++		goto exit;
++	}
++
++	/* look through all of the children of this device */
++	for (child = 0; child < dev->maxchild; ++child) {
++		if (dev->children[child]) {
++			usb_lock_device(dev->children[child]);
++			ret_dev = match_device_name(dev->children[child], name);
++			usb_unlock_device(dev->children[child]);
++			if (ret_dev)
++				goto exit;
++		}
++	}
++exit:
++	return ret_dev;
++}
++
++/**
++ * usb_find_device_by_name - find a specific usb device in the system
++ * @name: the name of the device to find
++ *
++ * Returns a pointer to a struct usb_device if such a specified usb
++ * device is present in the system currently.  The usage count of the
++ * device will be incremented if a device is found.  Make sure to call
++ * usb_put_dev() when the caller is finished with the device.
++ *
++ * If a device with the specified bus id is not found, NULL is returned.
++ */
++struct usb_device *usb_find_device_by_name(const char *name)
++{
++	struct list_head *buslist;
++	struct usb_bus *bus;
++	struct usb_device *dev = NULL;
++
++	mutex_lock(&usb_bus_list_lock);
++	for (buslist = usb_bus_list.next;
++	     buslist != &usb_bus_list;
++	     buslist = buslist->next) {
++		bus = container_of(buslist, struct usb_bus, bus_list);
++		if (!bus->root_hub)
++			continue;
++		usb_lock_device(bus->root_hub);
++		dev = match_device_name(bus->root_hub, name);
++		usb_unlock_device(bus->root_hub);
++		if (dev)
++			goto exit;
++	}
++exit:
++	mutex_unlock(&usb_bus_list_lock);
++	return dev;
++}
++EXPORT_SYMBOL_GPL(usb_find_device_by_name);
++
+ /**
+  * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP
+  * @dev: device the buffer will be used with
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -531,6 +531,7 @@ extern int usb_lock_device_for_reset(str
+ extern int usb_reset_device(struct usb_device *dev);
+ extern void usb_queue_reset_device(struct usb_interface *dev);
+ 
++extern struct usb_device *usb_find_device_by_name(const char *name);
+ 
+ /* USB autosuspend and autoresume */
+ #ifdef CONFIG_USB_SUSPEND
diff --git a/trunk/target/linux/generic/patches-3.3/830-ledtrig_morse.patch b/trunk/target/linux/generic/patches-3.3/830-ledtrig_morse.patch
new file mode 100644
index 00000000..3283807f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/830-ledtrig_morse.patch
@@ -0,0 +1,28 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -480,4 +480,8 @@ config LEDS_TRIGGER_DEFAULT_ON
+ comment "iptables trigger is under Netfilter config (LED target)"
+ 	depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_MORSE
++	tristate "LED Morse Trigger"
++	depends on LEDS_TRIGGERS
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
+ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
+ obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
++obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+--- a/drivers/leds/ledtrig-morse.c
++++ b/drivers/leds/ledtrig-morse.c
+@@ -26,7 +26,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/leds.h>
diff --git a/trunk/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch b/trunk/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch
new file mode 100644
index 00000000..c100277c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch
@@ -0,0 +1,51 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -484,4 +484,11 @@ config LEDS_TRIGGER_MORSE
+ 	tristate "LED Morse Trigger"
+ 	depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_NETDEV
++	tristate "LED Netdev Trigger"
++	depends on NET && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by network device activity.
++	  If unsure, say Y.
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -58,3 +58,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
+ obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
++obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+--- a/drivers/leds/ledtrig-netdev.c
++++ b/drivers/leds/ledtrig-netdev.c
+@@ -22,7 +22,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/netdevice.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+@@ -294,8 +293,9 @@ done:
+ static void netdev_trig_timer(unsigned long arg)
+ {
+ 	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
+-	const struct net_device_stats *dev_stats;
++	struct rtnl_link_stats64 *dev_stats;
+ 	unsigned new_activity;
++	struct rtnl_link_stats64 temp;
+ 
+ 	write_lock(&trigger_data->lock);
+ 
+@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
+ 		goto no_restart;
+ 	}
+ 
+-	dev_stats = dev_get_stats(trigger_data->net_dev);
++	dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
+ 	new_activity =
+ 		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
+ 		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
diff --git a/trunk/target/linux/generic/patches-3.3/832-ledtrig_usbdev.patch b/trunk/target/linux/generic/patches-3.3/832-ledtrig_usbdev.patch
new file mode 100644
index 00000000..8933497e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/832-ledtrig_usbdev.patch
@@ -0,0 +1,31 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -491,4 +491,11 @@ config LEDS_TRIGGER_NETDEV
+ 	  This allows LEDs to be controlled by network device activity.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_USBDEV
++	tristate "LED USB device Trigger"
++	depends on USB && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by the presence/activity of
++	  an USB device. If unsure, say N.
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -59,3 +59,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledt
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
++obj-$(CONFIG_LEDS_TRIGGER_USBDEV)	+= ledtrig-usbdev.o
+--- a/drivers/leds/ledtrig-usbdev.c
++++ b/drivers/leds/ledtrig-usbdev.c
+@@ -24,7 +24,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/slab.h>
diff --git a/trunk/target/linux/generic/patches-3.3/840-rtc7301.patch b/trunk/target/linux/generic/patches-3.3/840-rtc7301.patch
new file mode 100644
index 00000000..35dd3b8b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/840-rtc7301.patch
@@ -0,0 +1,250 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -719,6 +719,15 @@ config RTC_DRV_NUC900
+ 	  If you say yes here you get support for the RTC subsystem of the
+ 	  NUC910/NUC920 used in embedded systems.
+ 
++config RTC_DRV_RTC7301
++	tristate "Epson RTC-7301 SF/DG"
++	help
++	  If you say Y here you will get support for the
++	  Epson RTC-7301 SF/DG RTC chips.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-7301.
++
+ comment "on-CPU RTC drivers"
+ 
+ config RTC_DRV_DAVINCI
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -86,6 +86,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
+ obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
+ obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
+ obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
++obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
+ obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o
+ obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
+ obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
+--- /dev/null
++++ b/drivers/rtc/rtc-rtc7301.c
+@@ -0,0 +1,219 @@
++/*
++ * Driver for Epson RTC-7301SF/DG
++ *
++ * Copyright (C) 2009 Jose Vasconcellos
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/rtc.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/bcd.h>
++
++#define RTC_NAME "rtc7301"
++#define RTC_VERSION "0.1"
++
++/* Epson RTC-7301 register addresses */
++#define RTC7301_SEC		0x00
++#define RTC7301_SEC10		0x01
++#define RTC7301_MIN		0x02
++#define RTC7301_MIN10		0x03
++#define RTC7301_HOUR		0x04
++#define RTC7301_HOUR10		0x05
++#define RTC7301_WEEKDAY		0x06
++#define RTC7301_DAY		0x07
++#define RTC7301_DAY10		0x08
++#define RTC7301_MON		0x09
++#define RTC7301_MON10		0x0A
++#define RTC7301_YEAR		0x0B
++#define RTC7301_YEAR10		0x0C
++#define RTC7301_YEAR100		0x0D
++#define RTC7301_YEAR1000	0x0E
++#define RTC7301_CTRLREG		0x0F
++
++static uint8_t __iomem *rtc7301_base;
++
++#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
++#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
++
++#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
++
++static void rtc7301_init_settings(void)
++{
++	int i;
++
++	write_reg(RTC7301_CTRLREG, 2);
++	write_reg(RTC7301_YEAR1000, 2);
++	udelay(122);
++
++	/* bank 1 */
++	write_reg(RTC7301_CTRLREG, 6);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++
++	/* bank 2 */
++	write_reg(RTC7301_CTRLREG, 14);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++	write_reg(RTC7301_CTRLREG, 0);
++}
++
++static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int cnt;
++	uint8_t buf[16];
++
++	cnt = 0;
++	while (rtc7301_isbusy()) {
++		udelay(244);
++		if (cnt++ > 100) {
++			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
++			return -EIO;
++		}
++	}
++
++	for (cnt=0; cnt<16; cnt++)
++		buf[cnt] = read_reg(cnt);
++
++	if (buf[RTC7301_SEC10] & 8) {
++		dev_err(dev, "%s: RTC not set\n", __func__);
++		return -EINVAL;
++	}
++
++	memset(dt, 0, sizeof(*dt));
++
++	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
++	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
++	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
++
++	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
++	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
++	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
++		      buf[RTC7301_YEAR100]*100 +
++		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
++
++	/* the rtc device may contain illegal values on power up
++	 * according to the data sheet. make sure they are valid.
++	 */
++
++	return rtc_valid_tm(dt);
++}
++
++static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int data;
++
++	data = dt->tm_year + 1900;
++	if (data >= 2100 || data < 1900)
++		return -EINVAL;
++
++	write_reg(RTC7301_CTRLREG, 2);
++       	udelay(122);
++
++	data = bin2bcd(dt->tm_sec);
++	write_reg(RTC7301_SEC, data);
++	write_reg(RTC7301_SEC10, (data >> 4));
++
++	data = bin2bcd(dt->tm_min);
++	write_reg(RTC7301_MIN, data );
++	write_reg(RTC7301_MIN10, (data >> 4));
++
++	data = bin2bcd(dt->tm_hour);
++	write_reg(RTC7301_HOUR, data);
++	write_reg(RTC7301_HOUR10, (data >> 4));
++
++	data = bin2bcd(dt->tm_mday);
++	write_reg(RTC7301_DAY, data);
++	write_reg(RTC7301_DAY10, (data>> 4));
++
++	data = bin2bcd(dt->tm_mon + 1);
++	write_reg(RTC7301_MON, data);
++	write_reg(RTC7301_MON10, (data >> 4));
++
++	data = bin2bcd(dt->tm_year % 100);
++	write_reg(RTC7301_YEAR, data);
++	write_reg(RTC7301_YEAR10, (data >> 4));
++	data = bin2bcd((1900 + dt->tm_year) / 100);
++	write_reg(RTC7301_YEAR100, data);
++
++	data = bin2bcd(dt->tm_wday);
++	write_reg(RTC7301_WEEKDAY, data);
++
++	write_reg(RTC7301_CTRLREG, 0);
++
++	return 0;
++}
++
++static const struct rtc_class_ops rtc7301_rtc_ops = {
++	.read_time	= rtc7301_get_datetime,
++	.set_time	= rtc7301_set_datetime,
++};
++
++static int __devinit rtc7301_probe(struct platform_device *pdev)
++{
++	struct rtc_device *rtc;
++	struct resource *res;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENOENT;
++
++	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
++	if (!rtc7301_base)
++		return -EINVAL;
++
++	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
++				&rtc7301_rtc_ops, THIS_MODULE);
++	if (IS_ERR(rtc)) {
++		iounmap(rtc7301_base);
++		return PTR_ERR(rtc);
++	}
++
++	platform_set_drvdata(pdev, rtc);
++
++	rtc7301_init_settings();
++	return 0;
++}
++
++static int __devexit rtc7301_remove(struct platform_device *pdev)
++{
++	struct rtc_device *rtc = platform_get_drvdata(pdev);
++
++	if (rtc)
++		rtc_device_unregister(rtc);
++	if (rtc7301_base)
++		iounmap(rtc7301_base);
++	return 0;
++}
++
++static struct platform_driver rtc7301_driver = {
++	.driver = {
++		.name	= RTC_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe	= rtc7301_probe,
++	.remove = __devexit_p(rtc7301_remove),
++};
++
++static __init int rtc7301_init(void)
++{
++	return platform_driver_register(&rtc7301_driver);
++}
++module_init(rtc7301_init);
++
++static __exit void rtc7301_exit(void)
++{
++	platform_driver_unregister(&rtc7301_driver);
++}
++module_exit(rtc7301_exit);
++
++MODULE_DESCRIPTION("Epson 7301 RTC driver");
++MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" RTC_NAME);
++MODULE_VERSION(RTC_VERSION);
diff --git a/trunk/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch b/trunk/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch
new file mode 100644
index 00000000..2c9e6035
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch
@@ -0,0 +1,247 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -379,6 +379,15 @@ config RTC_DRV_RV3029C2
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-rv3029c2.
+ 
++config RTC_DRV_PT7C4338
++	tristate "Pericom Technology Inc. PT7C4338 RTC"
++	help
++	  If you say yes here you get support for the Pericom Technology
++	  Inc. PT7C4338 RTC chip.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-pt7c4338.
++
+ endif # I2C
+ 
+ comment "SPI RTC drivers"
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -79,6 +79,7 @@ obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030
+ obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
+ obj-$(CONFIG_RTC_DRV_PM8XXX)	+= rtc-pm8xxx.o
+ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
++obj-$(CONFIG_RTC_DRV_PT7C4338)	+= rtc-pt7c4338.o
+ obj-$(CONFIG_RTC_DRV_PUV3)	+= rtc-puv3.o
+ obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
+ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
+--- /dev/null
++++ b/drivers/rtc/rtc-pt7c4338.c
+@@ -0,0 +1,216 @@
++/*
++ * Copyright 2010 Freescale Semiconductor, Inc.
++ *
++ * Author:	Priyanka Jain <Priyanka.Jain@freescale.com>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++
++/*
++ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
++ *
++ * This file is based on drivers/rtc/rtc-ds1307.c
++ *
++ * PT7C4338 chip is manufactured by Pericom Technology Inc.
++ * It is a serial real-time clock which provides
++ * 1)Low-power clock/calendar.
++ * 2)Programmable square-wave output.
++ * It has 56 bytes of nonvolatile RAM.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++
++/* RTC register addresses */
++#define PT7C4338_REG_SECONDS          0x00
++#define PT7C4338_REG_MINUTES          0x01
++#define PT7C4338_REG_HOURS            0x02
++#define PT7C4338_REG_AMPM             0x02
++#define PT7C4338_REG_DAY              0x03
++#define PT7C4338_REG_DATE             0x04
++#define PT7C4338_REG_MONTH            0x05
++#define PT7C4338_REG_YEAR             0x06
++#define PT7C4338_REG_CTRL_STAT        0x07
++
++/* RTC second register address bit */
++#define PT7C4338_SEC_BIT_CH           0x80	/*Clock Halt (in Register 0)*/
++
++/* RTC control and status register bits */
++#define PT7C4338_CTRL_STAT_BIT_RS0    0x1	/*Rate select 0*/
++#define PT7C4338_CTRL_STAT_BIT_RS1    0x2	/*Rate select 1*/
++#define PT7C4338_CTRL_STAT_BIT_SQWE   0x10	/*Square Wave Enable*/
++#define PT7C4338_CTRL_STAT_BIT_OSF    0x20	/*Oscillator Stop Flag*/
++#define PT7C4338_CTRL_STAT_BIT_OUT    0x80	/*Output Level Control*/
++
++static const struct i2c_device_id pt7c4338_id[] = {
++	{ "pt7c4338", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, pt7c4338_id);
++
++struct pt7c4338{
++	struct i2c_client *client;
++	struct rtc_device *rtc;
++};
++
++static int pt7c4338_read_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	int ret;
++	u8 buf[7];
++	u8 year, month, day, hour, minute, second;
++	u8 week, twelve_hr, am_pm;
++
++	ret = i2c_smbus_read_i2c_block_data(client,
++			PT7C4338_REG_SECONDS, 7, buf);
++	if (ret < 0)
++		return ret;
++	if (ret < 7)
++		return -EIO;
++
++	second = buf[0];
++	minute = buf[1];
++	hour = buf[2];
++	week = buf[3];
++	day = buf[4];
++	month = buf[5];
++	year = buf[6];
++
++	/* Extract additional information for AM/PM */
++	twelve_hr = hour & 0x40;
++	am_pm = hour & 0x20;
++
++	/* Write to rtc_time structure */
++	time->tm_sec = bcd2bin(second & 0x7f);
++	time->tm_min = bcd2bin(minute & 0x7f);
++	if (twelve_hr) {
++		/* Convert to 24 hr */
++		if (am_pm)
++			time->tm_hour = bcd2bin(hour & 0x10) + 12;
++		else
++			time->tm_hour = bcd2bin(hour & 0xBF);
++	} else {
++		time->tm_hour = bcd2bin(hour);
++	}
++
++	time->tm_wday = bcd2bin(week & 0x07) - 1;
++	time->tm_mday = bcd2bin(day & 0x3f);
++	time->tm_mon = bcd2bin(month & 0x1F) - 1;
++	/* assume 20YY not 19YY */
++	time->tm_year = bcd2bin(year) + 100;
++
++	return 0;
++}
++
++static int pt7c4338_set_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	u8 buf[7];
++
++	/* Extract time from rtc_time and load into pt7c4338*/
++	buf[0] = bin2bcd(time->tm_sec);
++	buf[1] = bin2bcd(time->tm_min);
++	buf[2] = bin2bcd(time->tm_hour);
++	buf[3] = bin2bcd(time->tm_wday + 1); /* Day of the week */
++	buf[4] = bin2bcd(time->tm_mday); /* Date */
++	buf[5] = bin2bcd(time->tm_mon + 1);
++
++	/* assume 20YY not 19YY */
++	if (time->tm_year >= 100)
++		buf[6] = bin2bcd(time->tm_year - 100);
++	else
++		buf[6] = bin2bcd(time->tm_year);
++
++	return i2c_smbus_write_i2c_block_data(client,
++					PT7C4338_REG_SECONDS, 7, buf);
++}
++
++static const struct rtc_class_ops pt7c4338_rtc_ops = {
++	.read_time = pt7c4338_read_time,
++	.set_time = pt7c4338_set_time,
++};
++
++static int pt7c4338_probe(struct i2c_client *client,
++		const struct i2c_device_id *id)
++{
++	struct pt7c4338 *pt7c4338;
++	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
++	int ret;
++
++	pt7c4338 = kzalloc(sizeof(struct pt7c4338), GFP_KERNEL);
++	if (!pt7c4338)
++		return -ENOMEM;
++
++	pt7c4338->client = client;
++	i2c_set_clientdata(client, pt7c4338);
++	pt7c4338->rtc = rtc_device_register(client->name, &client->dev,
++					&pt7c4338_rtc_ops, THIS_MODULE);
++	if (IS_ERR(pt7c4338->rtc)) {
++		ret = PTR_ERR(pt7c4338->rtc);
++		dev_err(&client->dev, "unable to register the class device\n");
++		goto out_free;
++	}
++
++	return 0;
++out_free:
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return ret;
++}
++
++static int __devexit pt7c4338_remove(struct i2c_client *client)
++{
++	struct pt7c4338 *pt7c4338 = i2c_get_clientdata(client);
++
++	rtc_device_unregister(pt7c4338->rtc);
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return 0;
++}
++
++static struct i2c_driver pt7c4338_driver = {
++	.driver = {
++		.name = "rtc-pt7c4338",
++		.owner = THIS_MODULE,
++	},
++	.probe = pt7c4338_probe,
++	.remove = __devexit_p(pt7c4338_remove),
++	.id_table = pt7c4338_id,
++};
++
++static int __init pt7c4338_init(void)
++{
++	return i2c_add_driver(&pt7c4338_driver);
++}
++
++static void __exit pt7c4338_exit(void)
++{
++	i2c_del_driver(&pt7c4338_driver);
++}
++
++module_init(pt7c4338_init);
++module_exit(pt7c4338_exit);
++
++MODULE_AUTHOR("Priyanka Jain <Priyanka.Jain@freescale.com>");
++MODULE_DESCRIPTION("pericom Technology Inc. PT7C4338 RTC Driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.3/861-04_spi_gpio_implement_spi_delay.patch b/trunk/target/linux/generic/patches-3.3/861-04_spi_gpio_implement_spi_delay.patch
new file mode 100644
index 00000000..7828869c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/861-04_spi_gpio_implement_spi_delay.patch
@@ -0,0 +1,58 @@
+Implement the SPI-GPIO delay function for busses that need speed limitation.
+
+--mb
+
+
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -22,6 +22,7 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/delay.h>
+ 
+ #include <linux/spi/spi.h>
+ #include <linux/spi/spi_bitbang.h>
+@@ -70,6 +71,7 @@ struct spi_gpio {
+  *		#define	SPI_MOSI_GPIO	120
+  *		#define	SPI_SCK_GPIO	121
+  *		#define	SPI_N_CHIPSEL	4
++ *		#undef NEED_SPIDELAY
+  *		#include "spi-gpio.c"
+  */
+ 
+@@ -77,6 +79,7 @@ struct spi_gpio {
+ #define DRIVER_NAME	"spi_gpio"
+ 
+ #define GENERIC_BITBANG	/* vs tight inlines */
++#define NEED_SPIDELAY	1
+ 
+ /* all functions referencing these symbols must define pdata */
+ #define SPI_MISO_GPIO	((pdata)->miso)
+@@ -121,12 +124,20 @@ static inline int getmiso(const struct s
+ #undef pdata
+ 
+ /*
+- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
+- * requested device clock.  Software overhead means we usually have trouble
+- * reaching even one Mbit/sec (except when we can inline bitops), so for now
+- * we'll just assume we never need additional per-bit slowdowns.
++ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
++ * and spi_transfer.speed_hz to 0.
++ * Otherwise this is a function of the requested device clock.
++ * Software overhead means we usually have trouble
++ * reaching even one Mbit/sec (except when we can inline bitops). So on small
++ * embedded devices with fast SPI slaves you usually don't need a delay.
+  */
+-#define spidelay(nsecs)	do {} while (0)
++static inline void spidelay(unsigned nsecs)
++{
++#ifdef NEED_SPIDELAY
++	if (unlikely(nsecs))
++		ndelay(nsecs);
++#endif /* NEED_SPIDELAY */
++}
+ 
+ #include "spi-bitbang-txrx.h"
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/862-gpio_spi_driver.patch b/trunk/target/linux/generic/patches-3.3/862-gpio_spi_driver.patch
new file mode 100644
index 00000000..6cbea32a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/862-gpio_spi_driver.patch
@@ -0,0 +1,373 @@
+THIS CODE IS DEPRECATED.
+
+Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+--mb
+
+
+
+---
+ drivers/spi/Kconfig              |    9 +
+ drivers/spi/Makefile             |    1 
+ drivers/spi/spi_gpio_old.c       |  251 +++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi_gpio_old.h |   73 +++++++++++
+ 4 files changed, 334 insertions(+)
+
+--- /dev/null
++++ b/include/linux/spi/spi_gpio_old.h
+@@ -0,0 +1,73 @@
++/*
++ * spi_gpio interface to platform code
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++#ifndef _LINUX_SPI_SPI_GPIO
++#define _LINUX_SPI_SPI_GPIO
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++
++
++/**
++ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
++ *
++ * This structure holds information about a GPIO-based SPI device.
++ *
++ * @pin_clk: The GPIO pin number of the CLOCK pin.
++ *
++ * @pin_miso: The GPIO pin number of the MISO pin.
++ *
++ * @pin_mosi: The GPIO pin number of the MOSI pin.
++ *
++ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
++ *
++ * @cs_activelow: If true, the chip is selected when the CS line is low.
++ *
++ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
++ *                Note that doing no delay is not standards compliant,
++ *                but it might be needed to speed up transfers on some
++ *                slow embedded machines.
++ *
++ * @boardinfo_setup: This callback is called after the
++ *                   SPI master device was registered, but before the
++ *                   device is registered.
++ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
++ */
++struct spi_gpio_platform_data {
++	unsigned int pin_clk;
++	unsigned int pin_miso;
++	unsigned int pin_mosi;
++	unsigned int pin_cs;
++	bool cs_activelow;
++	bool no_spi_delay;
++	int (*boardinfo_setup)(struct spi_board_info *bi,
++			       struct spi_master *master,
++			       void *data);
++	void *boardinfo_setup_data;
++};
++
++/**
++ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a spi-gpio device.
++ */
++#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
++
++/**
++ * spi_gpio_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int spi_gpio_next_id(void);
++
++#endif /* _LINUX_SPI_SPI_GPIO */
+--- /dev/null
++++ b/drivers/spi/spi_gpio_old.c
+@@ -0,0 +1,251 @@
++/*
++ * Bitbanging SPI bus driver using GPIO API
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * based on spi_s3c2410_gpio.c
++ *   Copyright (c) 2006 Ben Dooks
++ *   Copyright (c) 2006 Simtec Electronics
++ * and on i2c-gpio.c
++ *   Copyright (C) 2007 Atmel Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/spi_bitbang.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++struct spi_gpio {
++	struct spi_bitbang bitbang;
++	struct spi_gpio_platform_data *info;
++	struct platform_device *pdev;
++	struct spi_board_info bi;
++};
++
++
++static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
++{
++	return dev->controller_data;
++}
++
++static inline void setsck(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
++}
++
++static inline void setmosi(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
++}
++
++static inline u32 getmiso(struct spi_device *dev)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
++}
++
++static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (!sp->info->no_spi_delay)
++		ndelay(nsecs);
++}
++
++#define spidelay(nsecs) do {					\
++	/* Steal the spi_device pointer from our caller.	\
++	 * The bitbang-API should probably get fixed here... */	\
++	do_spidelay(spi, nsecs);				\
++  } while (0)
++
++#define EXPAND_BITBANG_TXRX
++#include "spi-bitbang-txrx.h"
++
++static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
++}
++
++static void spi_gpio_chipselect(struct spi_device *dev, int on)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (sp->info->cs_activelow)
++		on = !on;
++	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
++}
++
++static int spi_gpio_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct spi_gpio_platform_data *pdata;
++	struct spi_gpio *sp;
++	struct spi_device *spidev;
++	int err;
++
++	pdata = pdev->dev.platform_data;
++	if (!pdata)
++		return -ENXIO;
++
++	err = -ENOMEM;
++	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
++	if (!master)
++		goto err_alloc_master;
++
++	sp = spi_master_get_devdata(master);
++	platform_set_drvdata(pdev, sp);
++	sp->info = pdata;
++
++	err = gpio_request(pdata->pin_clk, "spi_clock");
++	if (err)
++		goto err_request_clk;
++	err = gpio_request(pdata->pin_mosi, "spi_mosi");
++	if (err)
++		goto err_request_mosi;
++	err = gpio_request(pdata->pin_miso, "spi_miso");
++	if (err)
++		goto err_request_miso;
++	err = gpio_request(pdata->pin_cs, "spi_cs");
++	if (err)
++		goto err_request_cs;
++
++	sp->bitbang.master = spi_master_get(master);
++	sp->bitbang.master->bus_num = -1;
++	sp->bitbang.master->num_chipselect = 1;
++	sp->bitbang.chipselect = spi_gpio_chipselect;
++	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
++	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
++	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
++	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
++
++	gpio_direction_output(pdata->pin_clk, 0);
++	gpio_direction_output(pdata->pin_mosi, 0);
++	gpio_direction_output(pdata->pin_cs,
++			      pdata->cs_activelow ? 1 : 0);
++	gpio_direction_input(pdata->pin_miso);
++
++	err = spi_bitbang_start(&sp->bitbang);
++	if (err)
++		goto err_no_bitbang;
++	err = pdata->boardinfo_setup(&sp->bi, master,
++				     pdata->boardinfo_setup_data);
++	if (err)
++		goto err_bi_setup;
++	sp->bi.controller_data = sp;
++	spidev = spi_new_device(master, &sp->bi);
++	if (!spidev)
++		goto err_new_dev;
++
++	return 0;
++
++err_new_dev:
++err_bi_setup:
++	spi_bitbang_stop(&sp->bitbang);
++err_no_bitbang:
++	spi_master_put(sp->bitbang.master);
++	gpio_free(pdata->pin_cs);
++err_request_cs:
++	gpio_free(pdata->pin_miso);
++err_request_miso:
++	gpio_free(pdata->pin_mosi);
++err_request_mosi:
++	gpio_free(pdata->pin_clk);
++err_request_clk:
++	kfree(master);
++
++err_alloc_master:
++	return err;
++}
++
++static int __devexit spi_gpio_remove(struct platform_device *pdev)
++{
++	struct spi_gpio *sp;
++	struct spi_gpio_platform_data *pdata;
++
++	pdata = pdev->dev.platform_data;
++	sp = platform_get_drvdata(pdev);
++
++	gpio_free(pdata->pin_clk);
++	gpio_free(pdata->pin_mosi);
++	gpio_free(pdata->pin_miso);
++	gpio_free(pdata->pin_cs);
++	spi_bitbang_stop(&sp->bitbang);
++	spi_master_put(sp->bitbang.master);
++
++	return 0;
++}
++
++static struct platform_driver spi_gpio_driver = {
++	.driver		= {
++		.name	= SPI_GPIO_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe		= spi_gpio_probe,
++	.remove		= __devexit_p(spi_gpio_remove),
++};
++
++int spi_gpio_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(spi_gpio_next_id);
++
++static int __init spi_gpio_init(void)
++{
++	int err;
++
++	err = platform_driver_register(&spi_gpio_driver);
++	if (err)
++		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
++
++	return err;
++}
++module_init(spi_gpio_init);
++
++static void __exit spi_gpio_exit(void)
++{
++	platform_driver_unregister(&spi_gpio_driver);
++}
++module_exit(spi_gpio_exit);
++
++MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
++MODULE_LICENSE("GPL v2");
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -154,6 +154,15 @@ config SPI_GPIO
+ 	  GPIO operations, you should be able to leverage that for better
+ 	  speed with a custom version of this driver; see the source code.
+ 
++config SPI_GPIO_OLD
++	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
++	depends on SPI_MASTER && GENERIC_GPIO
++	select SPI_BITBANG
++	help
++	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
++
++	  If unsure, say N.
++
+ config SPI_IMX
+ 	tristate "Freescale i.MX SPI controllers"
+ 	depends on ARCH_MXC
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_FSL_LIB)		+= spi-fsl-li
+ obj-$(CONFIG_SPI_FSL_ESPI)		+= spi-fsl-espi.o
+ obj-$(CONFIG_SPI_FSL_SPI)		+= spi-fsl-spi.o
+ obj-$(CONFIG_SPI_GPIO)			+= spi-gpio.o
++obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
+ obj-$(CONFIG_SPI_IMX)			+= spi-imx.o
+ obj-$(CONFIG_SPI_LM70_LLP)		+= spi-lm70llp.o
+ obj-$(CONFIG_SPI_MPC512x_PSC)		+= spi-mpc512x-psc.o
diff --git a/trunk/target/linux/generic/patches-3.3/863-gpiommc.patch b/trunk/target/linux/generic/patches-3.3/863-gpiommc.patch
new file mode 100644
index 00000000..5e5325f1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/863-gpiommc.patch
@@ -0,0 +1,844 @@
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
+@@ -0,0 +1,609 @@
++/*
++ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
++ * This module hooks up the mmc_spi and spi_gpio modules and also
++ * provides a configfs interface.
++ *
++ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/module.h>
++#include <linux/mmc/gpiommc.h>
++#include <linux/platform_device.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/configfs.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++#define PFX				"gpio-mmc: "
++
++
++struct gpiommc_device {
++	struct platform_device *pdev;
++	struct platform_device *spi_pdev;
++	struct spi_board_info boardinfo;
++};
++
++
++MODULE_DESCRIPTION("GPIO based MMC driver");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_LICENSE("GPL");
++
++
++static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
++				   struct spi_master *master,
++				   void *data)
++{
++	struct gpiommc_device *d = data;
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	/* Bind the SPI master to the MMC-SPI host driver. */
++	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
++
++	bi->max_speed_hz = pdata->max_bus_speed;
++	bi->bus_num = master->bus_num;
++	bi->mode = pdata->mode;
++
++	return 0;
++}
++
++static int gpiommc_probe(struct platform_device *pdev)
++{
++	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
++	struct spi_gpio_platform_data spi_pdata;
++	struct gpiommc_device *d;
++	int err;
++
++	err = -ENXIO;
++	if (!mmc_pdata)
++		goto error;
++
++#ifdef CONFIG_MMC_SPI_MODULE
++	err = request_module("mmc_spi");
++	if (err) {
++		printk(KERN_WARNING PFX
++		       "Failed to request mmc_spi module.\n");
++	}
++#endif /* CONFIG_MMC_SPI_MODULE */
++
++	/* Allocate the GPIO-MMC device */
++	err = -ENOMEM;
++	d = kzalloc(sizeof(*d), GFP_KERNEL);
++	if (!d)
++		goto error;
++	d->pdev = pdev;
++
++	/* Create the SPI-GPIO device */
++	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
++					    spi_gpio_next_id());
++	if (!d->spi_pdev)
++		goto err_free_d;
++
++	memset(&spi_pdata, 0, sizeof(spi_pdata));
++	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
++	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
++	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
++	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
++	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
++	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
++	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
++	spi_pdata.boardinfo_setup_data = d;
++
++	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
++				       sizeof(spi_pdata));
++	if (err)
++		goto err_free_pdev;
++	err = platform_device_add(d->spi_pdev);
++	if (err)
++		goto err_free_pdata;
++	platform_set_drvdata(pdev, d);
++
++	printk(KERN_INFO PFX "MMC-Card \"%s\" "
++	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
++	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
++	       mmc_pdata->pins.gpio_do,
++	       mmc_pdata->pins.gpio_clk,
++	       mmc_pdata->pins.gpio_cs);
++
++	return 0;
++
++err_free_pdata:
++	kfree(d->spi_pdev->dev.platform_data);
++	d->spi_pdev->dev.platform_data = NULL;
++err_free_pdev:
++	platform_device_put(d->spi_pdev);
++err_free_d:
++	kfree(d);
++error:
++	return err;
++}
++
++static int gpiommc_remove(struct platform_device *pdev)
++{
++	struct gpiommc_device *d = platform_get_drvdata(pdev);
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	platform_device_unregister(d->spi_pdev);
++	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
++	       pdata->name);
++	platform_device_put(d->spi_pdev);
++
++	return 0;
++}
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++
++/* A device that was created through configfs */
++struct gpiommc_configfs_device {
++	struct config_item item;
++	/* The platform device, after registration. */
++	struct platform_device *pdev;
++	/* The configuration */
++	struct gpiommc_platform_data pdata;
++};
++
++#define GPIO_INVALID	-1
++
++static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
++{
++	return (dev->pdev != NULL);
++}
++
++static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
++{
++	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
++}
++
++static struct configfs_attribute gpiommc_attr_DI = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_in",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_DO = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_out",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CLK = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_clock",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS_activelow = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect_activelow",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spimode = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_mode",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spidelay = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_delay",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_max_bus_speed = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "max_bus_speed",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_register = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "register",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute *gpiommc_config_attrs[] = {
++	&gpiommc_attr_DI,
++	&gpiommc_attr_DO,
++	&gpiommc_attr_CLK,
++	&gpiommc_attr_CS,
++	&gpiommc_attr_CS_activelow,
++	&gpiommc_attr_spimode,
++	&gpiommc_attr_spidelay,
++	&gpiommc_attr_max_bus_speed,
++	&gpiommc_attr_register,
++	NULL,
++};
++
++static ssize_t gpiommc_config_attr_show(struct config_item *item,
++					struct configfs_attribute *attr,
++					char *page)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	ssize_t count = 0;
++	unsigned int gpio;
++	int err = 0;
++
++	if (attr == &gpiommc_attr_DI) {
++		gpio = dev->pdata.pins.gpio_di;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		gpio = dev->pdata.pins.gpio_do;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		gpio = dev->pdata.pins.gpio_clk;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		gpio = dev->pdata.pins.gpio_cs;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.pins.cs_activelow);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.mode);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 !dev->pdata.no_spi_delay);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.max_bus_speed);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_register) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 gpiommc_is_registered(dev));
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
++			       const char *name)
++{
++	int err;
++
++	if (gpiommc_is_registered(dev))
++		return 0;
++
++	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
++		printk(KERN_ERR PFX
++		       "configfs: Invalid GPIO pin number(s)\n");
++		return -EINVAL;
++	}
++
++	strlcpy(dev->pdata.name, name,
++		sizeof(dev->pdata.name));
++
++	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
++					  gpiommc_next_id());
++	if (!dev->pdev)
++		return -ENOMEM;
++	err = platform_device_add_data(dev->pdev, &dev->pdata,
++				       sizeof(dev->pdata));
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++	err = platform_device_add(dev->pdev);
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++
++	return 0;
++}
++
++static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
++{
++	if (!gpiommc_is_registered(dev))
++		return;
++
++	platform_device_unregister(dev->pdev);
++	dev->pdev = NULL;
++}
++
++static ssize_t gpiommc_config_attr_store(struct config_item *item,
++					 struct configfs_attribute *attr,
++					 const char *page, size_t count)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	int err = -EINVAL;
++	unsigned long data;
++
++	if (attr == &gpiommc_attr_register) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data == 1)
++			err = gpiommc_do_register(dev, item->ci_name);
++		if (data == 0) {
++			gpiommc_do_unregister(dev);
++			err = 0;
++		}
++		goto out;
++	}
++
++	if (gpiommc_is_registered(dev)) {
++		/* The rest of the config parameters can only be set
++		 * as long as the device is not registered, yet. */
++		err = -EBUSY;
++		goto out;
++	}
++
++	if (attr == &gpiommc_attr_DI) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_di = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_do = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_clk = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_cs = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.pins.cs_activelow = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		switch (data) {
++		case 0:
++			dev->pdata.mode = SPI_MODE_0;
++			break;
++		case 1:
++			dev->pdata.mode = SPI_MODE_1;
++			break;
++		case 2:
++			dev->pdata.mode = SPI_MODE_2;
++			break;
++		case 3:
++			dev->pdata.mode = SPI_MODE_3;
++			break;
++		default:
++			goto out;
++		}
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.no_spi_delay = !data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data > UINT_MAX)
++			goto out;
++		dev->pdata.max_bus_speed = data;
++		err = 0;
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static void gpiommc_config_item_release(struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	kfree(dev);
++}
++
++static struct configfs_item_operations gpiommc_config_item_ops = {
++	.release		= gpiommc_config_item_release,
++	.show_attribute		= gpiommc_config_attr_show,
++	.store_attribute	= gpiommc_config_attr_store,
++};
++
++static struct config_item_type gpiommc_dev_ci_type = {
++	.ct_item_ops	= &gpiommc_config_item_ops,
++	.ct_attrs	= gpiommc_config_attrs,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct config_item *gpiommc_make_item(struct config_group *group,
++					     const char *name)
++{
++	struct gpiommc_configfs_device *dev;
++
++	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
++		printk(KERN_ERR PFX "configfs: device name too long\n");
++		return NULL;
++	}
++
++	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++	if (!dev)
++		return NULL;
++
++	config_item_init_type_name(&dev->item, name,
++				   &gpiommc_dev_ci_type);
++
++	/* Assign default configuration */
++	dev->pdata.pins.gpio_di = GPIO_INVALID;
++	dev->pdata.pins.gpio_do = GPIO_INVALID;
++	dev->pdata.pins.gpio_clk = GPIO_INVALID;
++	dev->pdata.pins.gpio_cs = GPIO_INVALID;
++	dev->pdata.pins.cs_activelow = 1;
++	dev->pdata.mode = SPI_MODE_0;
++	dev->pdata.no_spi_delay = 0;
++	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
++
++	return &(dev->item);
++}
++
++static void gpiommc_drop_item(struct config_group *group,
++			      struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	gpiommc_do_unregister(dev);
++	kfree(dev);
++}
++
++static struct configfs_group_operations gpiommc_ct_group_ops = {
++	.make_item	= gpiommc_make_item,
++	.drop_item	= gpiommc_drop_item,
++};
++
++static struct config_item_type gpiommc_ci_type = {
++	.ct_group_ops	= &gpiommc_ct_group_ops,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct configfs_subsystem gpiommc_subsys = {
++	.su_group = {
++		.cg_item = {
++			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
++			.ci_type = &gpiommc_ci_type,
++		},
++	},
++	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
++};
++
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++static struct platform_driver gpiommc_plat_driver = {
++	.probe	= gpiommc_probe,
++	.remove	= gpiommc_remove,
++	.driver	= {
++		.name	= GPIOMMC_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++};
++
++int gpiommc_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(gpiommc_next_id);
++
++static int __init gpiommc_modinit(void)
++{
++	int err;
++
++	err = platform_driver_register(&gpiommc_plat_driver);
++	if (err)
++		return err;
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	config_group_init(&gpiommc_subsys.su_group);
++	err = configfs_register_subsystem(&gpiommc_subsys);
++	if (err) {
++		platform_driver_unregister(&gpiommc_plat_driver);
++		return err;
++	}
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++	return 0;
++}
++module_init(gpiommc_modinit);
++
++static void __exit gpiommc_modexit(void)
++{
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	configfs_unregister_subsystem(&gpiommc_subsys);
++#endif
++	platform_driver_unregister(&gpiommc_plat_driver);
++}
++module_exit(gpiommc_modexit);
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -474,6 +474,31 @@ config MMC_SDHI
+ 	  This provides support for the SDHI SD/SDIO controller found in
+ 	  SuperH and ARM SH-Mobile SoCs
+ 
++config GPIOMMC
++	tristate "MMC/SD over GPIO-based SPI"
++	depends on MMC && MMC_SPI && SPI_GPIO_OLD
++	help
++	  This driver hooks up the mmc_spi and spi_gpio modules so that
++	  MMC/SD cards can be used on a GPIO based bus by bitbanging
++	  the SPI protocol in software.
++
++	  This driver provides a configfs interface to dynamically create
++	  and destroy GPIO-based MMC/SD card devices. It also provides
++	  a platform device interface API.
++	  See Documentation/gpiommc.txt for details.
++
++	  The module will be called gpiommc.
++
++	  If unsure, say N.
++
++config GPIOMMC_CONFIGFS
++	bool
++	depends on GPIOMMC && CONFIGFS_FS
++	default y
++	help
++	  This option automatically enables configfs support for gpiommc
++	  if configfs is available.
++
+ config MMC_CB710
+ 	tristate "ENE CB710 MMC/SD Interface support"
+ 	depends on PCI
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -37,6 +37,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
+ obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o
+ obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
++obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
+ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
+ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
+ obj-$(CONFIG_MMC_SH_MMCIF)	+= sh_mmcif.o
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
+@@ -0,0 +1,71 @@
++/*
++ * Device driver for MMC/SD cards driven over a GPIO bus.
++ *
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * Licensed under the GNU/GPL version 2.
++ */
++#ifndef LINUX_GPIOMMC_H_
++#define LINUX_GPIOMMC_H_
++
++#include <linux/types.h>
++
++
++#define GPIOMMC_MAX_NAMELEN		15
++#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
++
++/**
++ * struct gpiommc_pins - Hardware pin assignments
++ *
++ * @gpio_di: The GPIO number of the DATA IN pin
++ * @gpio_do: The GPIO number of the DATA OUT pin
++ * @gpio_clk: The GPIO number of the CLOCK pin
++ * @gpio_cs: The GPIO number of the CHIPSELECT pin
++ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
++ */
++struct gpiommc_pins {
++	unsigned int gpio_di;
++	unsigned int gpio_do;
++	unsigned int gpio_clk;
++	unsigned int gpio_cs;
++	bool cs_activelow;
++};
++
++/**
++ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
++ *
++ * @name: The unique name string of the device.
++ * @pins: The hardware pin assignments.
++ * @mode: The hardware mode. This is either SPI_MODE_0,
++ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
++ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
++ *                This is not standards compliant, but may be required for some
++ *                embedded machines to gain reasonable speed.
++ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
++ */
++struct gpiommc_platform_data {
++	char name[GPIOMMC_MAX_NAMELEN + 1];
++	struct gpiommc_pins pins;
++	u8 mode;
++	bool no_spi_delay;
++	unsigned int max_bus_speed;
++};
++
++/**
++ * GPIOMMC_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a gpiommc device.
++ */
++#define GPIOMMC_PLATDEV_NAME	"gpiommc"
++
++/**
++ * gpiommc_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int gpiommc_next_id(void);
++
++#endif /* LINUX_GPIOMMC_H_ */
+--- /dev/null
++++ b/Documentation/gpiommc.txt
+@@ -0,0 +1,97 @@
++GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
++================================================================
++
++The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
++MMC or SD card on GPIO pins.
++
++Two interfaces for registering a new MMC/SD card device are provided:
++A static platform-device based mechanism and a dynamic configfs based interface.
++
++
++Registering devices via platform-device
++=======================================
++
++The platform-device interface is used for registering MMC/SD devices that are
++part of the hardware platform. This is most useful only for embedded machines
++with MMC/SD devices statically connected to the platform GPIO bus.
++
++The data structures are declared in <linux/mmc/gpiommc.h>.
++
++To register a new device, define an instance of struct gpiommc_platform_data.
++This structure holds any information about how the device is hooked up to the
++GPIO pins and what hardware modes the device supports. See the docbook-style
++documentation in the header file for more information on the struct fields.
++
++Then allocate a new instance of a platform device by doing:
++
++	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
++
++This will allocate the platform device data structures and hook it up to the
++gpiommc driver.
++Then add the gpiommc_platform_data to the platform device.
++
++	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
++
++You may free the local instance of struct gpiommc_platform_data now. (So the
++struct may be allocated on the stack, too).
++Now simply register the platform device.
++
++	err = platform_device_add(pdev);
++
++Done. The gpiommc probe routine will be invoked now and you should see a kernel
++log message for the added device.
++
++
++Registering devices via configfs
++================================
++
++MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
++selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
++hardware are a common situation.
++So we provide a dynamic interface to conveniently handle adding and removing
++devices from userspace, without the need to recompile the kernel.
++
++The "gpiommc" subdirectory at the configfs mountpoint is used for handling
++the dynamic configuration.
++
++To create a new device, it must first be allocated with mkdir.
++The following command will allocate a device named "my_mmc":
++	mkdir /config/gpiommc/my_mmc
++
++There are several configuration files available in the new
++/config/gpiommc/my_mmc/ directory:
++
++gpio_data_in			= The SPI data-IN GPIO pin number.
++gpio_data_out			= The SPI data-OUT GPIO pin number.
++gpio_clock			= The SPI Clock GPIO pin number.
++gpio_chipselect			= The SPI Chipselect GPIO pin number.
++gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
++				  If 1, Chipselect is active-LOW.
++spi_mode			= The SPI data mode. Can be 0-3.
++spi_delay			= Enable all delays in the lowlevel bitbanging.
++max_bus_speed			= The maximum SPI bus speed. In Hertz.
++
++register			= Not a configuration parameter.
++				  Used to register the configured card
++				  with the kernel.
++
++The device must first get configured and then registered by writing "1" to
++the "register" file.
++The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
++and "gpio_chipselect" are essential and _must_ be configured before writing
++"1" to the "register" file. The registration will fail, otherwise.
++
++The default values for the other parameters are:
++gpio_chipselect_activelow	= 1		(CS active-LOW)
++spi_mode			= 0		(SPI_MODE_0)
++spi_delay			= 1		(enabled)
++max_bus_speed			= 5000000	(5 Mhz)
++
++Configuration values can not be changed after registration. To unregister
++the device, write a "0" to the "register" file. The configuration can be
++changed again after unregistering.
++
++To completely remove the device, simply rmdir the directory
++(/config/gpiommc/my_mmc in this example).
++There's no need to first unregister the device before removing it. That will
++be done automatically.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3045,6 +3045,11 @@ L:	linuxppc-dev@lists.ozlabs.org
+ S:	Odd Fixes
+ F:	drivers/tty/hvc/
+ 
++GPIOMMC DRIVER
++P:	Michael Buesch
++M:	mb@bu3sch.de
++S:	Maintained
++
+ HARDWARE MONITORING
+ M:	Jean Delvare <khali@linux-fr.org>
+ M:	Guenter Roeck <guenter.roeck@ericsson.com>
diff --git a/trunk/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch b/trunk/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch
new file mode 100644
index 00000000..92815d91
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch
@@ -0,0 +1,58 @@
+The gpiommc configfs context structure needs locking, as configfs
+does not lock access between files.
+
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
+ 	struct platform_device *pdev;
+ 	/* The configuration */
+ 	struct gpiommc_platform_data pdata;
++	/* Mutex to protect this structure */
++	struct mutex mutex;
+ };
+ 
+ #define GPIO_INVALID	-1
+@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	unsigned int gpio;
+ 	int err = 0;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_DI) {
+ 		gpio = dev->pdata.pins.gpio_di;
+ 		if (gpio == GPIO_INVALID)
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
+ 	int err = -EINVAL;
+ 	unsigned long data;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_register) {
+ 		err = kstrtoul(page, 10, &data);
+ 		if (err)
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
+ 	if (!dev)
+ 		return NULL;
+ 
++	mutex_init(&dev->mutex);
+ 	config_item_init_type_name(&dev->item, name,
+ 				   &gpiommc_dev_ci_type);
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/870-hifn795x_byteswap.patch b/trunk/target/linux/generic/patches-3.3/870-hifn795x_byteswap.patch
new file mode 100644
index 00000000..3a37c951
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/870-hifn795x_byteswap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/crypto/hifn_795x.c
++++ b/drivers/crypto/hifn_795x.c
+@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
+ 
+ static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
++	writel(val, dev->bar[0] + reg);
+ }
+ 
+ static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
++	writel(val, dev->bar[1] + reg);
+ }
+ 
+ static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/trunk/target/linux/generic/patches-3.3/880-gateworks_system_controller.patch b/trunk/target/linux/generic/patches-3.3/880-gateworks_system_controller.patch
new file mode 100644
index 00000000..d9a64810
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/880-gateworks_system_controller.patch
@@ -0,0 +1,339 @@
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -423,6 +423,15 @@ config SENSORS_GL520SM
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called gl520sm.
+ 
++config SENSORS_GSC
++	tristate "Gateworks System Controller"
++	depends on I2C
++	help
++	  If you say yes here you get support for the Gateworks System Controller.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called gsc.
++
+ config SENSORS_GPIO_FAN
+ 	tristate "GPIO fan"
+ 	depends on GENERIC_GPIO
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -125,6 +125,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l7
+ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
+ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
+ obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
++obj-$(CONFIG_SENSORS_GSC)	+= gsc.o
+ 
+ obj-$(CONFIG_PMBUS)		+= pmbus/
+ 
+--- /dev/null
++++ b/drivers/hwmon/gsc.c
+@@ -0,0 +1,308 @@
++/*
++ * A hwmon driver for the Gateworks System Controller 
++ * Copyright (C) 2009 Gateworks Corporation
++ *
++ * Author: Chris Lang <clang@gateworks.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License,
++ * as published by the Free Software Foundation - version 2.
++ */
++
++#include <linux/module.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++
++#define DRV_VERSION "0.2"
++
++enum chips { gsp };
++
++/* AD7418 registers */
++#define GSP_REG_TEMP_IN		0x00
++#define GSP_REG_VIN		0x02
++#define GSP_REG_3P3		0x05
++#define GSP_REG_BAT		0x08
++#define GSP_REG_5P0		0x0b
++#define GSP_REG_CORE		0x0e
++#define GSP_REG_CPU1		0x11
++#define GSP_REG_CPU2		0x14
++#define GSP_REG_DRAM		0x17
++#define GSP_REG_EXT_BAT		0x1a
++#define GSP_REG_IO1		0x1d
++#define GSP_REG_IO2 		0x20
++#define GSP_REG_PCIE		0x23
++#define GSP_REG_CURRENT		0x26
++#define GSP_FAN_0		0x2C
++#define GSP_FAN_1		0x2E
++#define GSP_FAN_2		0x30
++#define GSP_FAN_3		0x32
++#define GSP_FAN_4		0x34
++#define GSP_FAN_5		0x36
++
++struct gsp_sensor_info {
++	const char* name;
++	int reg;
++};
++
++static const struct gsp_sensor_info gsp_sensors[] = {
++	{"temp", GSP_REG_TEMP_IN},
++	{"vin", GSP_REG_VIN},
++	{"3p3", GSP_REG_3P3},
++	{"bat", GSP_REG_BAT},
++	{"5p0", GSP_REG_5P0},
++	{"core", GSP_REG_CORE},
++	{"cpu1", GSP_REG_CPU1},
++	{"cpu2", GSP_REG_CPU2},
++	{"dram", GSP_REG_DRAM},
++	{"ext_bat", GSP_REG_EXT_BAT},
++	{"io1", GSP_REG_IO1},
++	{"io2", GSP_REG_IO2},
++	{"pci2", GSP_REG_PCIE},
++	{"current", GSP_REG_CURRENT},
++	{"fan_point0", GSP_FAN_0},
++	{"fan_point1", GSP_FAN_1},
++	{"fan_point2", GSP_FAN_2},
++	{"fan_point3", GSP_FAN_3},
++	{"fan_point4", GSP_FAN_4},
++	{"fan_point5", GSP_FAN_5},
++};
++
++struct gsp_data {
++	struct device		*hwmon_dev;
++	struct attribute_group	attrs;
++	enum chips		type;
++};
++
++static int gsp_probe(struct i2c_client *client,
++			const struct i2c_device_id *id);
++static int gsp_remove(struct i2c_client *client);
++
++static const struct i2c_device_id gsp_id[] = {
++	{ "gsp", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, gsp_id);
++
++static struct i2c_driver gsp_driver = {
++	.driver = {
++		.name	= "gsp",
++	},
++	.probe		= gsp_probe,
++	.remove		= gsp_remove,
++	.id_table	= gsp_id,
++};
++
++/* All registers are word-sized, except for the configuration registers.
++ * AD7418 uses a high-byte first convention. Do NOT use those functions to
++ * access the configuration registers CONF and CONF2, as they are byte-sized.
++ */
++static inline int gsp_read(struct i2c_client *client, u8 reg)
++{
++	unsigned int adc = 0;
++	if (reg == GSP_REG_TEMP_IN || reg > GSP_REG_CURRENT)
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		return adc;
++	}
++	else
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		adc |= i2c_smbus_read_byte_data(client, reg + 2) << 16;
++		return adc;
++	}
++}
++
++static inline int gsp_write(struct i2c_client *client, u8 reg, u16 value)
++{
++	i2c_smbus_write_byte_data(client, reg, value & 0xff);
++	i2c_smbus_write_byte_data(client, reg + 1, ((value >> 8) & 0xff));
++	return 1;
++}
++
++static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
++			char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	return sprintf(buf, "%d\n", gsp_read(client, gsp_sensors[attr->index].reg));
++}
++
++static ssize_t show_label(struct device *dev,
++			struct device_attribute *devattr, char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++
++	return sprintf(buf, "%s\n", gsp_sensors[attr->index].name);
++}
++
++static ssize_t store_fan(struct device *dev,
++			struct device_attribute *devattr, const char *buf, size_t count)
++{
++	u16 val;
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	val = simple_strtoul(buf, NULL, 10);
++	gsp_write(client, gsp_sensors[attr->index].reg, val);
++	return count;
++}
++
++static SENSOR_DEVICE_ATTR(temp0_input, S_IRUGO, show_adc, NULL, 0);
++static SENSOR_DEVICE_ATTR(temp0_label, S_IRUGO, show_label, NULL, 0);
++
++static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_adc, NULL, 1);
++static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, show_label, NULL, 1);
++static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 2);
++static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, show_label, NULL, 2);
++static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 3);
++static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, show_label, NULL, 3);
++static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 4);
++static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 4);
++static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 5);
++static SENSOR_DEVICE_ATTR(in4_label, S_IRUGO, show_label, NULL, 5);
++static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_adc, NULL, 6);
++static SENSOR_DEVICE_ATTR(in5_label, S_IRUGO, show_label, NULL, 6);
++static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_adc, NULL, 7);
++static SENSOR_DEVICE_ATTR(in6_label, S_IRUGO, show_label, NULL, 7);
++static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_adc, NULL, 8);
++static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 8);
++static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, show_adc, NULL, 9);
++static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 9);
++static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_adc, NULL, 10);
++static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 10);
++static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_adc, NULL, 11);
++static SENSOR_DEVICE_ATTR(in10_label, S_IRUGO, show_label, NULL, 11);
++static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, show_adc, NULL, 12);
++static SENSOR_DEVICE_ATTR(in11_label, S_IRUGO, show_label, NULL, 12);
++static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, show_adc, NULL, 13);
++static SENSOR_DEVICE_ATTR(in12_label, S_IRUGO, show_label, NULL, 13);
++
++static SENSOR_DEVICE_ATTR(fan0_point0, S_IRUGO | S_IWUSR, show_adc, store_fan, 14);
++static SENSOR_DEVICE_ATTR(fan0_point1, S_IRUGO | S_IWUSR, show_adc, store_fan, 15);
++static SENSOR_DEVICE_ATTR(fan0_point2, S_IRUGO | S_IWUSR, show_adc, store_fan, 16);
++static SENSOR_DEVICE_ATTR(fan0_point3, S_IRUGO | S_IWUSR, show_adc, store_fan, 17);
++static SENSOR_DEVICE_ATTR(fan0_point4, S_IRUGO | S_IWUSR, show_adc, store_fan, 18);
++static SENSOR_DEVICE_ATTR(fan0_point5, S_IRUGO | S_IWUSR, show_adc, store_fan, 19);
++
++static struct attribute *gsp_attributes[] = {
++	&sensor_dev_attr_temp0_input.dev_attr.attr,
++	&sensor_dev_attr_in0_input.dev_attr.attr,
++	&sensor_dev_attr_in1_input.dev_attr.attr,
++	&sensor_dev_attr_in2_input.dev_attr.attr,
++	&sensor_dev_attr_in3_input.dev_attr.attr,
++	&sensor_dev_attr_in4_input.dev_attr.attr,
++	&sensor_dev_attr_in5_input.dev_attr.attr,
++	&sensor_dev_attr_in6_input.dev_attr.attr,
++	&sensor_dev_attr_in7_input.dev_attr.attr,
++	&sensor_dev_attr_in8_input.dev_attr.attr,
++	&sensor_dev_attr_in9_input.dev_attr.attr,
++	&sensor_dev_attr_in10_input.dev_attr.attr,
++	&sensor_dev_attr_in11_input.dev_attr.attr,
++	&sensor_dev_attr_in12_input.dev_attr.attr,
++
++	&sensor_dev_attr_temp0_label.dev_attr.attr,
++	&sensor_dev_attr_in0_label.dev_attr.attr,
++	&sensor_dev_attr_in1_label.dev_attr.attr,
++	&sensor_dev_attr_in2_label.dev_attr.attr,
++	&sensor_dev_attr_in3_label.dev_attr.attr,
++	&sensor_dev_attr_in4_label.dev_attr.attr,
++	&sensor_dev_attr_in5_label.dev_attr.attr,
++	&sensor_dev_attr_in6_label.dev_attr.attr,
++	&sensor_dev_attr_in7_label.dev_attr.attr,
++	&sensor_dev_attr_in8_label.dev_attr.attr,
++	&sensor_dev_attr_in9_label.dev_attr.attr,
++	&sensor_dev_attr_in10_label.dev_attr.attr,
++	&sensor_dev_attr_in11_label.dev_attr.attr,
++	&sensor_dev_attr_in12_label.dev_attr.attr,
++
++	&sensor_dev_attr_fan0_point0.dev_attr.attr,
++	&sensor_dev_attr_fan0_point1.dev_attr.attr,
++	&sensor_dev_attr_fan0_point2.dev_attr.attr,
++	&sensor_dev_attr_fan0_point3.dev_attr.attr,
++	&sensor_dev_attr_fan0_point4.dev_attr.attr,
++	&sensor_dev_attr_fan0_point5.dev_attr.attr,
++	NULL
++};
++
++
++static int gsp_probe(struct i2c_client *client,
++			 const struct i2c_device_id *id)
++{
++	struct i2c_adapter *adapter = client->adapter;
++	struct gsp_data *data;
++	int err;
++
++	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
++					I2C_FUNC_SMBUS_WORD_DATA)) {
++		err = -EOPNOTSUPP;
++		goto exit;
++	}
++
++	if (!(data = kzalloc(sizeof(struct gsp_data), GFP_KERNEL))) {
++		err = -ENOMEM;
++		goto exit;
++	}
++
++	i2c_set_clientdata(client, data);
++
++	data->type = id->driver_data;
++
++	switch (data->type) {
++	case 0:
++		data->attrs.attrs = gsp_attributes;
++		break;
++	}
++
++	dev_info(&client->dev, "%s chip found\n", client->name);
++
++	/* Register sysfs hooks */
++	if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
++		goto exit_free;
++
++	data->hwmon_dev = hwmon_device_register(&client->dev);
++	if (IS_ERR(data->hwmon_dev)) {
++		err = PTR_ERR(data->hwmon_dev);
++		goto exit_remove;
++	}
++
++	return 0;
++
++exit_remove:
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++exit_free:
++	kfree(data);
++exit:
++	return err;
++}
++
++static int gsp_remove(struct i2c_client *client)
++{
++	struct gsp_data *data = i2c_get_clientdata(client);
++	hwmon_device_unregister(data->hwmon_dev);
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++	kfree(data);
++	return 0;
++}
++
++static int __init gsp_init(void)
++{
++	return i2c_add_driver(&gsp_driver);
++}
++
++static void __exit gsp_exit(void)
++{
++	i2c_del_driver(&gsp_driver);
++}
++
++module_init(gsp_init);
++module_exit(gsp_exit);
++
++MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
++MODULE_DESCRIPTION("GSC HWMON driver");
++MODULE_LICENSE("GPL");
++MODULE_VERSION(DRV_VERSION);
++
diff --git a/trunk/target/linux/generic/patches-3.3/900-slab_maxsize.patch b/trunk/target/linux/generic/patches-3.3/900-slab_maxsize.patch
new file mode 100644
index 00000000..1c956945
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/900-slab_maxsize.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -127,8 +127,8 @@ unsigned int kmem_cache_size(struct kmem
+  * to do various tricks to work around compiler limitations in order to
+  * ensure proper constant folding.
+  */
+-#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
+-				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
++#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
++				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
+ 
+ #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
+ #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/trunk/target/linux/generic/patches-3.3/910-kobject_uevent.patch b/trunk/target/linux/generic/patches-3.3/910-kobject_uevent.patch
new file mode 100644
index 00000000..aa9a40f0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/910-kobject_uevent.patch
@@ -0,0 +1,21 @@
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -50,6 +50,18 @@ static const char *kobject_actions[] = {
+ 	[KOBJ_OFFLINE] =	"offline",
+ };
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	mutex_lock(&uevent_sock_mutex);
++	seq = ++uevent_seqnum;
++	mutex_unlock(&uevent_sock_mutex);
++
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ /**
+  * kobject_action_type - translate action string to numeric type
+  *
diff --git a/trunk/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch b/trunk/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch
new file mode 100644
index 00000000..104df13b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/911-kobject_add_broadcast_uevent.patch
@@ -0,0 +1,85 @@
+--- a/include/linux/kobject.h
++++ b/include/linux/kobject.h
+@@ -31,6 +31,8 @@
+ #define UEVENT_NUM_ENVP			32	/* number of env pointers */
+ #define UEVENT_BUFFER_SIZE		2048	/* buffer for the variables */
+ 
++struct sk_buff;
++
+ /* path to the userspace helper executed on an event */
+ extern char uevent_helper[];
+ 
+@@ -213,6 +215,10 @@ int add_uevent_var(struct kobj_uevent_en
+ 
+ int kobject_action_type(const char *buf, size_t count,
+ 			enum kobject_action *type);
++
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation);
++
+ #else
+ static inline int kobject_uevent(struct kobject *kobj,
+ 				 enum kobject_action action)
+@@ -229,6 +235,16 @@ int add_uevent_var(struct kobj_uevent_en
+ static inline int kobject_action_type(const char *buf, size_t count,
+ 				      enum kobject_action *type)
+ { return -EINVAL; }
++
++void kfree_skb(struct sk_buff *);
++
++static inline int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++				   gfp_t allocation)
++{
++	kfree_skb(skb);
++	return 0;
++}
++
+ #endif
+ 
+ #endif /* _KOBJECT_H_ */
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -381,6 +381,43 @@ int add_uevent_var(struct kobj_uevent_en
+ EXPORT_SYMBOL_GPL(add_uevent_var);
+ 
+ #if defined(CONFIG_NET)
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	struct uevent_sock *ue_sk;
++	int err = 0;
++
++	/* send netlink message */
++	mutex_lock(&uevent_sock_mutex);
++	list_for_each_entry(ue_sk, &uevent_sock_list, list) {
++		struct sock *uevent_sock = ue_sk->sk;
++		struct sk_buff *skb2;
++
++		skb2 = skb_clone(skb, allocation);
++		if (!skb2)
++			break;
++
++		err = netlink_broadcast(uevent_sock, skb2, pid, group,
++					allocation);
++		if (err)
++			break;
++	}
++	mutex_unlock(&uevent_sock_mutex);
++
++	kfree_skb(skb);
++	return err;
++}
++#else
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	kfree_skb(skb);
++	return 0;
++}
++#endif
++EXPORT_SYMBOL_GPL(broadcast_uevent);
++
++#if defined(CONFIG_NET)
+ static int uevent_net_init(struct net *net)
+ {
+ 	struct uevent_sock *ue_sk;
diff --git a/trunk/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch b/trunk/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch
new file mode 100644
index 00000000..a71251dc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch
@@ -0,0 +1,14 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -774,10 +774,7 @@ static noinline int init_post(void)
+ 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
+ 					"defaults...\n", execute_command);
+ 	}
+-	run_init_process("/sbin/init");
+-	run_init_process("/etc/init");
+-	run_init_process("/bin/init");
+-	run_init_process("/bin/sh");
++	run_init_process("/etc/preinit");
+ 
+ 	panic("No init found.  Try passing init= option to kernel. "
+ 	      "See Linux Documentation/init.txt for guidance.");
diff --git a/trunk/target/linux/generic/patches-3.3/922-always-create-console-node-in-initramfs.patch b/trunk/target/linux/generic/patches-3.3/922-always-create-console-node-in-initramfs.patch
new file mode 100644
index 00000000..3b308dd2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/922-always-create-console-node-in-initramfs.patch
@@ -0,0 +1,30 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -59,6 +59,18 @@ default_initramfs() {
+ 	EOF
+ }
+ 
++list_librecmc_initramfs() {
++	:
++}
++
++librecmc_initramfs() {
++	# make sure that /dev/console exists
++	cat <<-EOF >> ${output}
++		dir /dev 0755 0 0
++		nod /dev/console 0600 0 0 c 5 1
++	EOF
++}
++
+ filetype() {
+ 	local argv1="$1"
+ 
+@@ -177,6 +189,8 @@ dir_filelist() {
+ 	if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
+ 		${dep_list}print_mtime "$1"
+ 
++		${dep_list}librecmc_initramfs
++
+ 		echo "${dirlist}" | \
+ 		while read x; do
+ 			${dep_list}parse ${x}
diff --git a/trunk/target/linux/generic/patches-3.3/930-crashlog.patch b/trunk/target/linux/generic/patches-3.3/930-crashlog.patch
new file mode 100644
index 00000000..9a10723d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/930-crashlog.patch
@@ -0,0 +1,285 @@
+--- /dev/null
++++ b/include/linux/crashlog.h
+@@ -0,0 +1,17 @@
++#ifndef __CRASHLOG_H
++#define __CRASHLOG_H
++
++#ifdef CONFIG_CRASHLOG
++void crashlog_init_bootmem(struct bootmem_data *bdata);
++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
++#else
++static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
++{
++}
++
++static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++}
++#endif
++
++#endif
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -926,6 +926,10 @@ config RELAY
+ 
+ 	  If unsure, say N.
+ 
++config CRASHLOG
++	bool "Crash logging"
++	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !(ARM || SPARC || PPC)
++
+ config BLK_DEV_INITRD
+ 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+ 	depends on BROKEN || !FRV
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -107,6 +107,7 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += us
+ obj-$(CONFIG_PADATA) += padata.o
+ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
+ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
++obj-$(CONFIG_CRASHLOG) += crashlog.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
+--- /dev/null
++++ b/kernel/crashlog.c
+@@ -0,0 +1,190 @@
++/*
++ * Crash information logger
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ *
++ * Based on ramoops.c
++ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
++ *
++ * This program is free software; you can redistribute 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 that 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/bootmem.h>
++#include <linux/memblock.h>
++#include <linux/debugfs.h>
++#include <linux/crashlog.h>
++#include <linux/kmsg_dump.h>
++#include <linux/module.h>
++#include <linux/pfn.h>
++#include <asm/io.h>
++
++#define CRASHLOG_PAGES	4
++#define CRASHLOG_SIZE	(CRASHLOG_PAGES * PAGE_SIZE)
++#define CRASHLOG_MAGIC	0xa1eedead
++
++/*
++ * Start the log at 1M before the end of RAM, as some boot loaders like
++ * to use the end of the RAM for stack usage and other things
++ * If this fails, fall back to using the last part.
++ */
++#define CRASHLOG_OFFSET	(1024 * 1024)
++
++struct crashlog_data {
++	u32 magic;
++	u32 len;
++	u8 data[];
++};
++
++static struct debugfs_blob_wrapper crashlog_blob;
++static unsigned long crashlog_addr = 0;
++static struct crashlog_data *crashlog_buf;
++static struct kmsg_dumper dump;
++static bool first = true;
++
++extern struct list_head *crashlog_modules;
++
++#ifndef CONFIG_NO_BOOTMEM
++void __init crashlog_init_bootmem(bootmem_data_t *bdata)
++{
++	unsigned long addr;
++
++	if (crashlog_addr)
++		return;
++
++	addr = PFN_PHYS(bdata->node_low_pfn) - CRASHLOG_OFFSET;
++	if (reserve_bootmem(addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", addr);
++		bdata->node_low_pfn -= CRASHLOG_PAGES;
++		addr = PFN_PHYS(bdata->node_low_pfn);
++	}
++	crashlog_addr = addr;
++}
++#endif
++
++#ifdef CONFIG_HAVE_MEMBLOCK
++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++	if (crashlog_addr)
++		return;
++
++	addr += size - CRASHLOG_OFFSET;
++	if (memblock_reserve(addr, CRASHLOG_SIZE)) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", (unsigned long) addr);
++		return;
++	}
++
++	crashlog_addr = addr;
++}
++#endif
++
++static void __init crashlog_copy(void)
++{
++	if (crashlog_buf->magic != CRASHLOG_MAGIC)
++		return;
++
++	if (!crashlog_buf->len || crashlog_buf->len >
++	    CRASHLOG_SIZE - sizeof(*crashlog_buf))
++		return;
++
++	crashlog_blob.size = crashlog_buf->len;
++	crashlog_blob.data = kmemdup(crashlog_buf->data,
++		crashlog_buf->len, GFP_KERNEL);
++
++	debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
++}
++
++static int get_maxlen(void)
++{
++	return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
++}
++
++static void crashlog_printf(const char *fmt, ...)
++{
++	va_list args;
++	int len = get_maxlen();
++
++	if (!len)
++		return;
++
++	va_start(args, fmt);
++	crashlog_buf->len += vscnprintf(
++		&crashlog_buf->data[crashlog_buf->len],
++		len, fmt, args);
++	va_end(args);
++}
++
++static void crashlog_do_dump(struct kmsg_dumper *dumper,
++		enum kmsg_dump_reason reason, const char *s1, unsigned long l1,
++		const char *s2, unsigned long l2)
++{
++	unsigned long s1_start, s2_start;
++	unsigned long l1_cpy, l2_cpy;
++	struct timeval tv;
++	struct module *m;
++	char *buf;
++	int len;
++
++	if (!first)
++		crashlog_printf("\n===================================\n");
++
++	do_gettimeofday(&tv);
++	crashlog_printf("Time: %lu.%lu\n",
++		(long)tv.tv_sec, (long)tv.tv_usec);
++
++	if (first) {
++		crashlog_printf("Modules:");
++		list_for_each_entry(m, crashlog_modules, list) {
++			crashlog_printf("\t%s@%p+%x", m->name,
++			m->module_core, m->core_size,
++			m->module_init, m->init_size);
++		}
++		crashlog_printf("\n");
++		first = false;
++	}
++
++	buf = (char *)&crashlog_buf->data[crashlog_buf->len];
++	len = get_maxlen();
++
++	l2_cpy = min(l2, (unsigned long)len);
++	l1_cpy = min(l1, (unsigned long)len - l2_cpy);
++
++	s2_start = l2 - l2_cpy;
++	s1_start = l1 - l1_cpy;
++
++	memcpy(buf, s1 + s1_start, l1_cpy);
++	memcpy(buf + l1_cpy, s2 + s2_start, l2_cpy);
++	crashlog_buf->len += l1_cpy + l2_cpy;
++}
++
++
++int __init crashlog_init_fs(void)
++{
++	if (!crashlog_addr)
++		return -ENOMEM;
++
++	crashlog_buf = ioremap(crashlog_addr, CRASHLOG_SIZE);
++
++	crashlog_copy();
++
++	crashlog_buf->magic = CRASHLOG_MAGIC;
++	crashlog_buf->len = 0;
++
++	dump.dump = crashlog_do_dump;
++	kmsg_dump_register(&dump);
++
++	return 0;
++}
++module_init(crashlog_init_fs);
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -15,6 +15,7 @@
+ #include <linux/export.h>
+ #include <linux/kmemleak.h>
+ #include <linux/range.h>
++#include <linux/crashlog.h>
+ #include <linux/memblock.h>
+ 
+ #include <asm/bug.h>
+@@ -177,6 +178,7 @@ static unsigned long __init free_all_boo
+ 	if (!bdata->node_bootmem_map)
+ 		return 0;
+ 
++	crashlog_init_bootmem(bdata);
+ 	start = bdata->node_min_pfn;
+ 	end = bdata->node_low_pfn;
+ 
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -101,6 +101,9 @@ static LIST_HEAD(modules);
+ #ifdef CONFIG_KGDB_KDB
+ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+ #endif /* CONFIG_KGDB_KDB */
++#ifdef CONFIG_CRASHLOG
++struct list_head *crashlog_modules = &modules;
++#endif
+ 
+ 
+ /* Block module loading/unloading? */
+--- a/mm/memblock.c
++++ b/mm/memblock.c
+@@ -19,6 +19,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+ #include <linux/memblock.h>
++#include <linux/crashlog.h>
+ 
+ static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
+ static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
+@@ -305,6 +306,8 @@ static void __init_memblock memblock_ins
+ 	memblock_set_region_node(rgn, nid);
+ 	type->cnt++;
+ 	type->total_size += size;
++	if (type == &memblock.memory && idx == 0)
++		crashlog_init_memblock(base, size);
+ }
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch b/trunk/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
new file mode 100644
index 00000000..b5cce90a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/940-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -968,3 +968,6 @@ config CRYPTO_USER_API_SKCIPHER
+ source "drivers/crypto/Kconfig"
+ 
+ endif	# if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -92,6 +92,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
+ obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
+ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
+ 
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #
diff --git a/trunk/target/linux/generic/patches-3.3/941-ocf_20120127.patch b/trunk/target/linux/generic/patches-3.3/941-ocf_20120127.patch
new file mode 100644
index 00000000..794627a8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/941-ocf_20120127.patch
@@ -0,0 +1,164 @@
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -131,6 +131,9 @@
+  *	void add_interrupt_randomness(int irq, int irq_flags);
+  * 	void add_disk_randomness(struct gendisk *disk);
+  *
++ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++ *      int random_input_wait(void);
++ *
+  * add_input_randomness() uses the input layer interrupt timing, as well as
+  * the event type information from the hardware.
+  *
+@@ -152,6 +155,13 @@
+  * seek times do not make for good sources of entropy, as their seek
+  * times are usually fairly consistent.
+  *
++ * random_input_words() just provides a raw block of entropy to the input
++ * pool, such as from a hardware entropy generator.
++ *
++ * random_input_wait() suspends the caller until such time as the
++ * entropy pool falls below the write threshold, and returns a count of how
++ * much entropy (in bits) is needed to sustain the pool.
++ *
+  * All of these routines try to estimate how many bits of randomness a
+  * particular randomness source.  They do this by keeping track of the
+  * first and second order deltas of the event timings.
+@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk
+ }
+ #endif
+ 
++/*
++ * random_input_words - add bulk entropy to pool
++ *
++ * @buf: buffer to add
++ * @wordcount: number of __u32 words to add
++ * @ent_count: total amount of entropy (in bits) to credit
++ *
++ * this provides bulk input of entropy to the input pool
++ *
++ */
++void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++{
++	mix_pool_bytes(&input_pool, buf, wordcount*4, NULL);
++
++	credit_entropy_bits(&input_pool, ent_count);
++
++	DEBUG_ENT("crediting %d bits => %d\n",
++		  ent_count, input_pool.entropy_count);
++	/*
++	 * Wake up waiting processes if we have enough
++	 * entropy.
++	 */
++	if (input_pool.entropy_count >= random_read_wakeup_thresh)
++		wake_up_interruptible(&random_read_wait);
++}
++EXPORT_SYMBOL(random_input_words);
++
++/*
++ * random_input_wait - wait until random needs entropy
++ *
++ * this function sleeps until the /dev/random subsystem actually
++ * needs more entropy, and then return the amount of entropy
++ * that it would be nice to have added to the system.
++ */
++int random_input_wait(void)
++{
++	int count;
++
++	wait_event_interruptible(random_write_wait, 
++			 input_pool.entropy_count < random_write_wakeup_thresh);
++
++	count = random_write_wakeup_thresh - input_pool.entropy_count;
++
++        /* likely we got woken up due to a signal */
++	if (count <= 0) count = random_read_wakeup_thresh; 
++
++	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
++		  count,
++		  input_pool.entropy_count, random_write_wakeup_thresh);
++
++	return count;
++}
++EXPORT_SYMBOL(random_input_wait);
++
++
++#define EXTRACT_SIZE 10
++
+ /*********************************************************************
+  *
+  * Entropy extraction routines
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
+ 	}
+ 	return ret;
+ }
++EXPORT_SYMBOL(sys_dup);
+ 
+ #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
+ 
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -19,6 +19,7 @@
+ #define APOLLO_MOUSE_MINOR	7
+ #define PC110PAD_MINOR		9
+ /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
++#define CRYPTODEV_MINOR		70	/* /dev/crypto */
+ #define WATCHDOG_MINOR		130	/* Watchdog timer     */
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -34,6 +34,30 @@
+ /* Clear the entropy pool and associated counters.  (Superuser only.) */
+ #define RNDCLEARPOOL	_IO( 'R', 0x06 )
+ 
++#ifdef CONFIG_FIPS_RNG
++
++/* Size of seed value - equal to AES blocksize */
++#define AES_BLOCK_SIZE_BYTES	16
++#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
++/* Size of AES key */
++#define KEY_SIZE_BYTES		16
++
++/* ioctl() structure used by FIPS 140-2 Tests */
++struct rand_fips_test {
++	unsigned char key[KEY_SIZE_BYTES];			/* Input */
++	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
++	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
++	unsigned char result[SEED_SIZE_BYTES];		/* Output */
++};
++
++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
++#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
++
++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
++#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
++
++#endif /* #ifdef CONFIG_FIPS_RNG */
++
+ struct rand_pool_info {
+ 	int	entropy_count;
+ 	int	buf_size;
+@@ -53,6 +77,10 @@ extern void add_input_randomness(unsigne
+ 				 unsigned int value);
+ extern void add_interrupt_randomness(int irq, int irq_flags);
+ 
++extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
++extern int random_input_wait(void);
++#define HAS_RANDOM_INPUT_WAIT 1
++
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -430,6 +430,7 @@ struct task_struct *find_task_by_vpid(pi
+ {
+ 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
+ {
diff --git a/trunk/target/linux/generic/patches-3.3/960-decompress_unlzo_fix.patch b/trunk/target/linux/generic/patches-3.3/960-decompress_unlzo_fix.patch
new file mode 100644
index 00000000..ee7c118e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/960-decompress_unlzo_fix.patch
@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/include/linux/decompress/unlzo_mm.h
+@@ -0,0 +1,10 @@
++#ifndef UNLZO_MM_H
++#define UNLZO_MM_H
++
++#ifdef STATIC
++#define INIT
++#else
++#define INIT __init
++#endif
++
++#endif
+--- a/lib/decompress_unlzo.c
++++ b/lib/decompress_unlzo.c
+@@ -38,6 +38,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/lzo.h>
++#include <linux/decompress/unlzo_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #include <linux/compiler.h>
diff --git a/trunk/target/linux/generic/patches-3.3/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/trunk/target/linux/generic/patches-3.3/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 00000000..65c6ef7d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/970-remove-unsane-filenames-from-deps_initramfs-list.patch
@@ -0,0 +1,28 @@
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -50,20 +50,22 @@ ifneq ($(wildcard $(obj)/.initramfs_data
+ 	include $(obj)/.initramfs_data.cpio.d
+ endif
+ 
++deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
++
+ quiet_cmd_initfs = GEN     $@
+       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+ 
+ targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.xz initramfs_data.cpio.lzo initramfs_data.cpio
+ # do not try to update files included in initramfs
+-$(deps_initramfs): ;
++$(deps_initramfs_sane): ;
+ 
+-$(deps_initramfs): klibcdirs
++$(deps_initramfs_sane): klibcdirs
+ # We rebuild initramfs_data.cpio if:
+ # 1) Any included file is newer then initramfs_data.cpio
+ # 2) There are changes in which files are included (added or deleted)
+ # 3) If gen_init_cpio are newer than initramfs_data.cpio
+ # 4) arguments to gen_initramfs.sh changes
+-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
++$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
+ 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
+ 	$(call if_changed,initfs)
+ 
diff --git a/trunk/target/linux/generic/patches-3.3/980-arm_openwrt_machtypes.patch b/trunk/target/linux/generic/patches-3.3/980-arm_openwrt_machtypes.patch
new file mode 100644
index 00000000..df4d30e9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/980-arm_openwrt_machtypes.patch
@@ -0,0 +1,34 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1169,3 +1169,31 @@ elite_ulk		MACH_ELITE_ULK		ELITE_ULK		38
+ pov2			MACH_POV2		POV2			3889
+ ipod_touch_2g		MACH_IPOD_TOUCH_2G	IPOD_TOUCH_2G		3890
+ da850_pqab		MACH_DA850_PQAB		DA850_PQAB		3891
++#
++# Additional mach-types supported by libreCMC
++#
++wg302v1			MACH_WG302V1		WG302V1			889
++pronghorn		MACH_PRONGHORN		PRONGHORN		928
++pronghorn_metro		MACH_PRONGHORNMETRO	PRONGHORNMETRO		1040
++sidewinder		MACH_SIDEWINDER		SIDEWINDER		1041
++wrt300nv2		MACH_WRT300NV2		WRT300NV2		1077
++compex42x		MACH_COMPEXWP18		COMPEXWP18		1273
++goldfish		MACH_GOLDFISH		GOLDFISH		1441
++cambria			MACH_CAMBRIA		CAMBRIA			1468
++dt2			MACH_DT2		DT2			1514
++ap1000			MACH_AP1000		AP1000			1543
++tw2662			MACH_TW2662		TW2662			1658
++tw5334			MACH_TW5334		TW5334			1664
++usr8200			MACH_USR8200		USR8200			1762
++mi424wr			MACH_MI424WR		MI424WR			1778
++gw2388			MACH_GW2388		GW2388			2635
++iconnect		MACH_ICONNECT		ICONNECT		2870
++nsb3ast			MACH_NSB3AST		NSB3AST			2917
++goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089
++nas6210			MACH_NAS6210		NAS6210			3104
++ns_k330			MACH_NS_K330		NS_K330			3108
++bcm2708			MACH_BCM2708		BCM2708			3138
++wn802t			MACH_WN802T		WN802T			3306
++nsa310			MACH_NSA310		NSA310			4022
++wnr3500			MACH_WNR3500		WNR3500			4407
++ap42x			MACH_AP42X		AP42X			4418
diff --git a/trunk/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/trunk/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch
new file mode 100644
index 00000000..fb16e2aa
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch
@@ -0,0 +1,64 @@
+Although the commit "98af057092f8f0dabe63c5df08adc2bbfbddb1d2
+ ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes"
+resolved long standing mpcore_wdt driver build problems, it
+introduced an error in the relationship between the MPcore watchdog
+timer clock rate and mpcore_margin, "MPcore timer margin in seconds",
+such that watchdog timeouts are now arbitrary rather than the number
+of seconds specified by mpcore_margin.
+
+This change restores mpcore_wdt_keepalive() to its equivalent
+implementation prior to commit 98af057 such that watchdog timeouts now
+occur as specified by mpcore_margin.
+
+The variable 'mpcore_timer_rate' which caused that build failure was
+replaced by 'twd_timer_rate'. Adding exported function to obtain
+'twd_timer_rate' value in mpcore_wdt driver.
+
+MPCORE_WATCHDOG needed to build 'mpcore_wdt' already depends on
+HAVE_ARM_TWD needed to build 'smp_twd', so from the point of view of
+'mpcore_wdt' driver the exported function will always exist.
+
+Signed-off-by: Valentine Barshak <vbarshak@mvista.com>
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+
+ arch/arm/include/asm/smp_twd.h |    1 +
+ arch/arm/kernel/smp_twd.c      |    7 +++++++
+ drivers/watchdog/mpcore_wdt.c  |    4 +---
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/include/asm/smp_twd.h
++++ b/arch/arm/include/asm/smp_twd.h
+@@ -24,5 +24,6 @@ extern void __iomem *twd_base;
+ 
+ void twd_timer_setup(struct clock_event_device *);
+ void twd_timer_stop(struct clock_event_device *);
++unsigned long twd_timer_get_rate(void);
+ 
+ #endif
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -268,3 +268,10 @@ void __cpuinit twd_timer_setup(struct cl
+ 					0xf, 0xffffffff);
+ 	enable_percpu_irq(clk->irq, 0);
+ }
++
++/* Needed by mpcore_wdt */
++unsigned long twd_timer_get_rate(void)
++{
++	return twd_timer_rate;
++}
++EXPORT_SYMBOL_GPL(twd_timer_get_rate);
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct
+ 
+ 	spin_lock(&wdt_lock);
+ 	/* Assume prescale is set to 256 */
+-	count =  __raw_readl(wdt->base + TWD_WDOG_COUNTER);
+-	count = (0xFFFFFFFFU - count) * (HZ / 5);
+-	count = (count / 256) * mpcore_margin;
++	count = (twd_timer_get_rate() / 256) * mpcore_margin;
+ 
+ 	/* Reload the counter */
+ 	writel(count + wdt->perturb, wdt->base + TWD_WDOG_LOAD);
diff --git a/trunk/target/linux/generic/patches-3.3/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch b/trunk/target/linux/generic/patches-3.3/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
new file mode 100644
index 00000000..fa261ce6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
@@ -0,0 +1,29 @@
+According to the include/linux/watchdog.h WDIOC_SETOPTIONS is
+classified as 'read from device' ioctl call:
+  #define WDIOC_SETOPTIONS        _IOR(WATCHDOG_IOCTL_BASE, 4, int)
+
+However, the driver 'mpcore_wdt' performs 'copy_from_user' only if
+_IOC_WRITE is set, thus the local variable 'uarg' which is used in
+WDIOC_SETOPTIONS handling remains uninitialized.
+
+The proper way to fix this is to bind WDIOC_SETOPTIONS to _IOW,
+but this will break compatibility.
+So adding additional condition for performing 'copy_from_user'.
+
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+ drivers/watchdog/mpcore_wdt.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -233,7 +233,8 @@ static long mpcore_wdt_ioctl(struct file
+ 	if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
+ 		return -ENOTTY;
+ 
+-	if (_IOC_DIR(cmd) & _IOC_WRITE) {
++	if ((_IOC_DIR(cmd) & _IOC_WRITE)
++			|| cmd == WDIOC_SETOPTIONS) {
+ 		ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd));
+ 		if (ret)
+ 			return -EFAULT;
diff --git a/trunk/target/linux/generic/patches-3.3/994-mpcore_wdt_fix_timer_mode_setup.patch b/trunk/target/linux/generic/patches-3.3/994-mpcore_wdt_fix_timer_mode_setup.patch
new file mode 100644
index 00000000..00909237
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/994-mpcore_wdt_fix_timer_mode_setup.patch
@@ -0,0 +1,57 @@
+Allow watchdog to set its iterrupt as pending when it is configured
+for timer mode (in other words, allow emitting interrupt).
+Also add macros for all Watchdog Control Register flags.
+
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+ arch/arm/include/asm/smp_twd.h |    6 ++++++
+ drivers/watchdog/mpcore_wdt.c  |   15 +++++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/include/asm/smp_twd.h
++++ b/arch/arm/include/asm/smp_twd.h
+@@ -18,6 +18,12 @@
+ #define TWD_TIMER_CONTROL_PERIODIC	(1 << 1)
+ #define TWD_TIMER_CONTROL_IT_ENABLE	(1 << 2)
+ 
++#define TWD_WDOG_CONTROL_ENABLE		(1 << 0)
++#define TWD_WDOG_CONTROL_PERIODIC	(1 << 1)
++#define TWD_WDOG_CONTROL_IT_ENABLE	(1 << 2)
++#define TWD_WDOG_CONTROL_TIMER_MODE	(0 << 3)
++#define TWD_WDOG_CONTROL_WATCHDOG_MODE	(1 << 3)
++
+ struct clock_event_device;
+ 
+ extern void __iomem *twd_base;
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -118,18 +118,25 @@ static void mpcore_wdt_stop(struct mpcor
+ 
+ static void mpcore_wdt_start(struct mpcore_wdt *wdt)
+ {
++	u32 mode;
++
+ 	dev_printk(KERN_INFO, wdt->dev, "enabling watchdog.\n");
+ 
+ 	/* This loads the count register but does NOT start the count yet */
+ 	mpcore_wdt_keepalive(wdt);
+ 
++	/* Setup watchdog - prescale=256, enable=1 */
++	mode = (255 << 8) | TWD_WDOG_CONTROL_ENABLE;
++
+ 	if (mpcore_noboot) {
+-		/* Enable watchdog - prescale=256, watchdog mode=0, enable=1 */
+-		writel(0x0000FF01, wdt->base + TWD_WDOG_CONTROL);
++		/* timer mode, send interrupt */
++		mode |=	TWD_WDOG_CONTROL_TIMER_MODE |
++				TWD_WDOG_CONTROL_IT_ENABLE;
+ 	} else {
+-		/* Enable watchdog - prescale=256, watchdog mode=1, enable=1 */
+-		writel(0x0000FF09, wdt->base + TWD_WDOG_CONTROL);
++		/* watchdog mode */
++		mode |=	TWD_WDOG_CONTROL_WATCHDOG_MODE;
+ 	}
++	writel(mode, wdt->base + TWD_WDOG_CONTROL);
+ }
+ 
+ static int mpcore_wdt_set_heartbeat(int t)
diff --git a/trunk/target/linux/generic/patches-3.3/a01-swconfig_leds-define-leds_set_brightness.patch b/trunk/target/linux/generic/patches-3.3/a01-swconfig_leds-define-leds_set_brightness.patch
new file mode 100644
index 00000000..e9362e42
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/a01-swconfig_leds-define-leds_set_brightness.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/phy/swconfig_leds.c
++++ b/drivers/net/phy/swconfig_leds.c
+@@ -20,6 +20,8 @@
+ #define SWCONFIG_LED_TIMER_INTERVAL	(HZ / 10)
+ #define SWCONFIG_LED_NUM_PORTS		32
+ 
++#define led_set_brightness(_led, _switch)	led_brightness_set((_led), (_switch))
++
+ struct switch_led_trigger {
+ 	struct led_trigger trig;
+ 	struct switch_dev *swdev;
diff --git a/trunk/target/linux/generic/patches-3.3/a02-swconfig-revert-portid-snd_portid-usage.patch b/trunk/target/linux/generic/patches-3.3/a02-swconfig-revert-portid-snd_portid-usage.patch
new file mode 100644
index 00000000..03f4685c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/a02-swconfig-revert-portid-snd_portid-usage.patch
@@ -0,0 +1,30 @@
+reverted:
+--- a/drivers/net/phy/swconfig.c
++++ b/drivers/net/phy/swconfig.c
+@@ -378,7 +378,7 @@ swconfig_dump_attr(struct swconfig_callb
+ 	int id = cb->args[0];
+ 	void *hdr;
+ 
+-	hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
++	hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
+ 			NLM_F_MULTI, SWITCH_CMD_NEW_ATTR);
+ 	if (IS_ERR(hdr))
+ 		return -1;
+@@ -801,7 +801,7 @@ swconfig_get_attr(struct sk_buff *skb, s
+ 	if (!msg)
+ 		goto error;
+ 
+-	hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
++	hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
+ 			0, cmd);
+ 	if (IS_ERR(hdr))
+ 		goto nla_put_failure;
+@@ -906,7 +906,7 @@ static int swconfig_dump_switches(struct
+ 	list_for_each_entry(dev, &swdevs, dev_list) {
+ 		if (++idx <= start)
+ 			continue;
+-		if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).portid,
++		if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).pid,
+ 				cb->nlh->nlmsg_seq, NLM_F_MULTI,
+ 				dev) < 0)
+ 			break;
diff --git a/trunk/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch b/trunk/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch
new file mode 100644
index 00000000..a214c150
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch
@@ -0,0 +1,109 @@
+--- a/include/linux/switch.h
++++ b/include/linux/switch.h
+@@ -13,11 +13,95 @@
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  */
+-#ifndef _LINUX_SWITCH_H
+-#define _LINUX_SWITCH_H
+ 
++#ifndef __LINUX_SWITCH_H
++#define __LINUX_SWITCH_H
++
++#include <linux/types.h>
++#include <linux/netdevice.h>
++#include <linux/netlink.h>
++#include <linux/genetlink.h>
++#ifndef __KERNEL__
++#include <netlink/netlink.h>
++#include <netlink/genl/genl.h>
++#include <netlink/genl/ctrl.h>
++#else
+ #include <net/genetlink.h>
+-#include <uapi/linux/switch.h>
++#endif
++
++/* main attributes */
++enum {
++	SWITCH_ATTR_UNSPEC,
++	/* global */
++	SWITCH_ATTR_TYPE,
++	/* device */
++	SWITCH_ATTR_ID,
++	SWITCH_ATTR_DEV_NAME,
++	SWITCH_ATTR_ALIAS,
++	SWITCH_ATTR_NAME,
++	SWITCH_ATTR_VLANS,
++	SWITCH_ATTR_PORTS,
++	SWITCH_ATTR_PORTMAP,
++	SWITCH_ATTR_CPU_PORT,
++	/* attributes */
++	SWITCH_ATTR_OP_ID,
++	SWITCH_ATTR_OP_TYPE,
++	SWITCH_ATTR_OP_NAME,
++	SWITCH_ATTR_OP_PORT,
++	SWITCH_ATTR_OP_VLAN,
++	SWITCH_ATTR_OP_VALUE_INT,
++	SWITCH_ATTR_OP_VALUE_STR,
++	SWITCH_ATTR_OP_VALUE_PORTS,
++	SWITCH_ATTR_OP_DESCRIPTION,
++	/* port lists */
++	SWITCH_ATTR_PORT,
++	SWITCH_ATTR_MAX
++};
++
++enum {
++	/* port map */
++	SWITCH_PORTMAP_PORTS,
++	SWITCH_PORTMAP_SEGMENT,
++	SWITCH_PORTMAP_VIRT,
++	SWITCH_PORTMAP_MAX
++};
++
++/* commands */
++enum {
++	SWITCH_CMD_UNSPEC,
++	SWITCH_CMD_GET_SWITCH,
++	SWITCH_CMD_NEW_ATTR,
++	SWITCH_CMD_LIST_GLOBAL,
++	SWITCH_CMD_GET_GLOBAL,
++	SWITCH_CMD_SET_GLOBAL,
++	SWITCH_CMD_LIST_PORT,
++	SWITCH_CMD_GET_PORT,
++	SWITCH_CMD_SET_PORT,
++	SWITCH_CMD_LIST_VLAN,
++	SWITCH_CMD_GET_VLAN,
++	SWITCH_CMD_SET_VLAN
++};
++
++/* data types */
++enum switch_val_type {
++	SWITCH_TYPE_UNSPEC,
++	SWITCH_TYPE_INT,
++	SWITCH_TYPE_STRING,
++	SWITCH_TYPE_PORTS,
++	SWITCH_TYPE_NOVAL,
++};
++
++/* port nested attributes */
++enum {
++	SWITCH_PORT_UNSPEC,
++	SWITCH_PORT_ID,
++	SWITCH_PORT_FLAG_TAGGED,
++	SWITCH_PORT_ATTR_MAX
++};
++
++#define SWITCH_ATTR_DEFAULTS_OFFSET	0x1000
++
++#ifdef __KERNEL__
+ 
+ struct switch_dev;
+ struct switch_op;
+@@ -164,4 +248,6 @@ struct switch_attr {
+ 	int max;
+ };
+ 
+-#endif /* _LINUX_SWITCH_H */
++#endif
++
++#endif
diff --git a/trunk/target/linux/generic/patches-3.8/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch b/trunk/target/linux/generic/patches-3.8/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
new file mode 100644
index 00000000..07061b0b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/001-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
@@ -0,0 +1,250 @@
+From 455bd4c430b0c0a361f38e8658a0d6cb469942b5 Mon Sep 17 00:00:00 2001
+From: Ivan Djelic <ivan.djelic@parrot.com>
+Date: Wed, 6 Mar 2013 20:09:27 +0100
+Subject: [PATCH] ARM: 7668/1: fix memset-related crashes caused by recent GCC
+ (4.7.2) optimizations
+
+Recent GCC versions (e.g. GCC-4.7.2) perform optimizations based on
+assumptions about the implementation of memset and similar functions.
+The current ARM optimized memset code does not return the value of
+its first argument, as is usually expected from standard implementations.
+
+For instance in the following function:
+
+void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
+{
+	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
+	waiter->magic = waiter;
+	INIT_LIST_HEAD(&waiter->list);
+}
+
+compiled as:
+
+800554d0 <debug_mutex_lock_common>:
+800554d0:       e92d4008        push    {r3, lr}
+800554d4:       e1a00001        mov     r0, r1
+800554d8:       e3a02010        mov     r2, #16 ; 0x10
+800554dc:       e3a01011        mov     r1, #17 ; 0x11
+800554e0:       eb04426e        bl      80165ea0 <memset>
+800554e4:       e1a03000        mov     r3, r0
+800554e8:       e583000c        str     r0, [r3, #12]
+800554ec:       e5830000        str     r0, [r3]
+800554f0:       e5830004        str     r0, [r3, #4]
+800554f4:       e8bd8008        pop     {r3, pc}
+
+GCC assumes memset returns the value of pointer 'waiter' in register r0; causing
+register/memory corruptions.
+
+This patch fixes the return value of the assembly version of memset.
+It adds a 'mov' instruction and merges an additional load+store into
+existing load/store instructions.
+For ease of review, here is a breakdown of the patch into 4 simple steps:
+
+Step 1
+======
+Perform the following substitutions:
+ip -> r8, then
+r0 -> ip,
+and insert 'mov ip, r0' as the first statement of the function.
+At this point, we have a memset() implementation returning the proper result,
+but corrupting r8 on some paths (the ones that were using ip).
+
+Step 2
+======
+Make sure r8 is saved and restored when (! CALGN(1)+0) == 1:
+
+save r8:
+-       str     lr, [sp, #-4]!
++       stmfd   sp!, {r8, lr}
+
+and restore r8 on both exit paths:
+-       ldmeqfd sp!, {pc}               @ Now <64 bytes to go.
++       ldmeqfd sp!, {r8, pc}           @ Now <64 bytes to go.
+(...)
+        tst     r2, #16
+        stmneia ip!, {r1, r3, r8, lr}
+-       ldr     lr, [sp], #4
++       ldmfd   sp!, {r8, lr}
+
+Step 3
+======
+Make sure r8 is saved and restored when (! CALGN(1)+0) == 0:
+
+save r8:
+-       stmfd   sp!, {r4-r7, lr}
++       stmfd   sp!, {r4-r8, lr}
+
+and restore r8 on both exit paths:
+        bgt     3b
+-       ldmeqfd sp!, {r4-r7, pc}
++       ldmeqfd sp!, {r4-r8, pc}
+(...)
+        tst     r2, #16
+        stmneia ip!, {r4-r7}
+-       ldmfd   sp!, {r4-r7, lr}
++       ldmfd   sp!, {r4-r8, lr}
+
+Step 4
+======
+Rewrite register list "r4-r7, r8" as "r4-r8".
+
+Signed-off-by: Ivan Djelic <ivan.djelic@parrot.com>
+Reviewed-by: Nicolas Pitre <nico@linaro.org>
+Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/lib/memset.S | 85 ++++++++++++++++++++++++++-------------------------
+ 1 file changed, 44 insertions(+), 41 deletions(-)
+
+--- a/arch/arm/lib/memset.S
++++ b/arch/arm/lib/memset.S
+@@ -19,9 +19,9 @@
+ 1:	subs	r2, r2, #4		@ 1 do we have enough
+ 	blt	5f			@ 1 bytes to align with?
+ 	cmp	r3, #2			@ 1
+-	strltb	r1, [r0], #1		@ 1
+-	strleb	r1, [r0], #1		@ 1
+-	strb	r1, [r0], #1		@ 1
++	strltb	r1, [ip], #1		@ 1
++	strleb	r1, [ip], #1		@ 1
++	strb	r1, [ip], #1		@ 1
+ 	add	r2, r2, r3		@ 1 (r2 = r2 - (4 - r3))
+ /*
+  * The pointer is now aligned and the length is adjusted.  Try doing the
+@@ -29,10 +29,14 @@
+  */
+ 
+ ENTRY(memset)
+-	ands	r3, r0, #3		@ 1 unaligned?
++/*
++ * Preserve the contents of r0 for the return value.
++ */
++	mov	ip, r0
++	ands	r3, ip, #3		@ 1 unaligned?
+ 	bne	1b			@ 1
+ /*
+- * we know that the pointer in r0 is aligned to a word boundary.
++ * we know that the pointer in ip is aligned to a word boundary.
+  */
+ 	orr	r1, r1, r1, lsl #8
+ 	orr	r1, r1, r1, lsl #16
+@@ -43,29 +47,28 @@ ENTRY(memset)
+ #if ! CALGN(1)+0
+ 
+ /*
+- * We need an extra register for this loop - save the return address and
+- * use the LR
++ * We need 2 extra registers for this loop - use r8 and the LR
+  */
+-	str	lr, [sp, #-4]!
+-	mov	ip, r1
++	stmfd	sp!, {r8, lr}
++	mov	r8, r1
+ 	mov	lr, r1
+ 
+ 2:	subs	r2, r2, #64
+-	stmgeia	r0!, {r1, r3, ip, lr}	@ 64 bytes at a time.
+-	stmgeia	r0!, {r1, r3, ip, lr}
+-	stmgeia	r0!, {r1, r3, ip, lr}
+-	stmgeia	r0!, {r1, r3, ip, lr}
++	stmgeia	ip!, {r1, r3, r8, lr}	@ 64 bytes at a time.
++	stmgeia	ip!, {r1, r3, r8, lr}
++	stmgeia	ip!, {r1, r3, r8, lr}
++	stmgeia	ip!, {r1, r3, r8, lr}
+ 	bgt	2b
+-	ldmeqfd	sp!, {pc}		@ Now <64 bytes to go.
++	ldmeqfd	sp!, {r8, pc}		@ Now <64 bytes to go.
+ /*
+  * No need to correct the count; we're only testing bits from now on
+  */
+ 	tst	r2, #32
+-	stmneia	r0!, {r1, r3, ip, lr}
+-	stmneia	r0!, {r1, r3, ip, lr}
++	stmneia	ip!, {r1, r3, r8, lr}
++	stmneia	ip!, {r1, r3, r8, lr}
+ 	tst	r2, #16
+-	stmneia	r0!, {r1, r3, ip, lr}
+-	ldr	lr, [sp], #4
++	stmneia	ip!, {r1, r3, r8, lr}
++	ldmfd	sp!, {r8, lr}
+ 
+ #else
+ 
+@@ -74,54 +77,54 @@ ENTRY(memset)
+  * whole cache lines at once.
+  */
+ 
+-	stmfd	sp!, {r4-r7, lr}
++	stmfd	sp!, {r4-r8, lr}
+ 	mov	r4, r1
+ 	mov	r5, r1
+ 	mov	r6, r1
+ 	mov	r7, r1
+-	mov	ip, r1
++	mov	r8, r1
+ 	mov	lr, r1
+ 
+ 	cmp	r2, #96
+-	tstgt	r0, #31
++	tstgt	ip, #31
+ 	ble	3f
+ 
+-	and	ip, r0, #31
+-	rsb	ip, ip, #32
+-	sub	r2, r2, ip
+-	movs	ip, ip, lsl #(32 - 4)
+-	stmcsia	r0!, {r4, r5, r6, r7}
+-	stmmiia	r0!, {r4, r5}
+-	tst	ip, #(1 << 30)
+-	mov	ip, r1
+-	strne	r1, [r0], #4
++	and	r8, ip, #31
++	rsb	r8, r8, #32
++	sub	r2, r2, r8
++	movs	r8, r8, lsl #(32 - 4)
++	stmcsia	ip!, {r4, r5, r6, r7}
++	stmmiia	ip!, {r4, r5}
++	tst	r8, #(1 << 30)
++	mov	r8, r1
++	strne	r1, [ip], #4
+ 
+ 3:	subs	r2, r2, #64
+-	stmgeia	r0!, {r1, r3-r7, ip, lr}
+-	stmgeia	r0!, {r1, r3-r7, ip, lr}
++	stmgeia	ip!, {r1, r3-r8, lr}
++	stmgeia	ip!, {r1, r3-r8, lr}
+ 	bgt	3b
+-	ldmeqfd	sp!, {r4-r7, pc}
++	ldmeqfd	sp!, {r4-r8, pc}
+ 
+ 	tst	r2, #32
+-	stmneia	r0!, {r1, r3-r7, ip, lr}
++	stmneia	ip!, {r1, r3-r8, lr}
+ 	tst	r2, #16
+-	stmneia	r0!, {r4-r7}
+-	ldmfd	sp!, {r4-r7, lr}
++	stmneia	ip!, {r4-r7}
++	ldmfd	sp!, {r4-r8, lr}
+ 
+ #endif
+ 
+ 4:	tst	r2, #8
+-	stmneia	r0!, {r1, r3}
++	stmneia	ip!, {r1, r3}
+ 	tst	r2, #4
+-	strne	r1, [r0], #4
++	strne	r1, [ip], #4
+ /*
+  * When we get here, we've got less than 4 bytes to zero.  We
+  * may have an unaligned pointer as well.
+  */
+ 5:	tst	r2, #2
+-	strneb	r1, [r0], #1
+-	strneb	r1, [r0], #1
++	strneb	r1, [ip], #1
++	strneb	r1, [ip], #1
+ 	tst	r2, #1
+-	strneb	r1, [r0], #1
++	strneb	r1, [ip], #1
+ 	mov	pc, lr
+ ENDPROC(memset)
diff --git a/trunk/target/linux/generic/patches-3.8/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch b/trunk/target/linux/generic/patches-3.8/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
new file mode 100644
index 00000000..266e507e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
@@ -0,0 +1,78 @@
+From 418df63adac56841ef6b0f1fcf435bc64d4ed177 Mon Sep 17 00:00:00 2001
+From: Nicolas Pitre <nicolas.pitre@linaro.org>
+Date: Tue, 12 Mar 2013 13:00:42 +0100
+Subject: [PATCH] ARM: 7670/1: fix the memset fix
+
+Commit 455bd4c430b0 ("ARM: 7668/1: fix memset-related crashes caused by
+recent GCC (4.7.2) optimizations") attempted to fix a compliance issue
+with the memset return value.  However the memset itself became broken
+by that patch for misaligned pointers.
+
+This fixes the above by branching over the entry code from the
+misaligned fixup code to avoid reloading the original pointer.
+
+Also, because the function entry alignment is wrong in the Thumb mode
+compilation, that fixup code is moved to the end.
+
+While at it, the entry instructions are slightly reworked to help dual
+issue pipelines.
+
+Signed-off-by: Nicolas Pitre <nico@linaro.org>
+Tested-by: Alexander Holler <holler@ahsoftware.de>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/lib/memset.S | 33 +++++++++++++--------------------
+ 1 file changed, 13 insertions(+), 20 deletions(-)
+
+--- a/arch/arm/lib/memset.S
++++ b/arch/arm/lib/memset.S
+@@ -14,31 +14,15 @@
+ 
+ 	.text
+ 	.align	5
+-	.word	0
+-
+-1:	subs	r2, r2, #4		@ 1 do we have enough
+-	blt	5f			@ 1 bytes to align with?
+-	cmp	r3, #2			@ 1
+-	strltb	r1, [ip], #1		@ 1
+-	strleb	r1, [ip], #1		@ 1
+-	strb	r1, [ip], #1		@ 1
+-	add	r2, r2, r3		@ 1 (r2 = r2 - (4 - r3))
+-/*
+- * The pointer is now aligned and the length is adjusted.  Try doing the
+- * memset again.
+- */
+ 
+ ENTRY(memset)
+-/*
+- * Preserve the contents of r0 for the return value.
+- */
+-	mov	ip, r0
+-	ands	r3, ip, #3		@ 1 unaligned?
+-	bne	1b			@ 1
++	ands	r3, r0, #3		@ 1 unaligned?
++	mov	ip, r0			@ preserve r0 as return value
++	bne	6f			@ 1
+ /*
+  * we know that the pointer in ip is aligned to a word boundary.
+  */
+-	orr	r1, r1, r1, lsl #8
++1:	orr	r1, r1, r1, lsl #8
+ 	orr	r1, r1, r1, lsl #16
+ 	mov	r3, r1
+ 	cmp	r2, #16
+@@ -127,4 +111,13 @@ ENTRY(memset)
+ 	tst	r2, #1
+ 	strneb	r1, [ip], #1
+ 	mov	pc, lr
++
++6:	subs	r2, r2, #4		@ 1 do we have enough
++	blt	5b			@ 1 bytes to align with?
++	cmp	r3, #2			@ 1
++	strltb	r1, [ip], #1		@ 1
++	strleb	r1, [ip], #1		@ 1
++	strb	r1, [ip], #1		@ 1
++	add	r2, r2, r3		@ 1 (r2 = r2 - (4 - r3))
++	b	1b
+ ENDPROC(memset)
diff --git a/trunk/target/linux/generic/patches-3.8/007-hso-Earlier-catch-of-error-condition.patch b/trunk/target/linux/generic/patches-3.8/007-hso-Earlier-catch-of-error-condition.patch
new file mode 100644
index 00000000..a8a62257
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/007-hso-Earlier-catch-of-error-condition.patch
@@ -0,0 +1,40 @@
+From 35e57e1b49a351aa804dab6010cd46ae6112a541 Mon Sep 17 00:00:00 2001
+From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Date: Wed, 21 Aug 2013 01:43:07 -0700
+Subject: [PATCH 1/2] hso: Earlier catch of error condition
+
+There is no need to get an interface specification if we know it's the
+wrong one.
+
+Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/hso.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -2908,6 +2908,11 @@ static int hso_probe(struct usb_interfac
+ 	struct hso_shared_int *shared_int;
+ 	struct hso_device *tmp_dev = NULL;
+ 
++	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
++		dev_err(&interface->dev, "Not our interface\n");
++		return -ENODEV;
++	}
++
+ 	if_num = interface->altsetting->desc.bInterfaceNumber;
+ 
+ 	/* Get the interface/port specification from either driver_info or from
+@@ -2917,10 +2922,6 @@ static int hso_probe(struct usb_interfac
+ 	else
+ 		port_spec = hso_get_config_data(interface);
+ 
+-	if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
+-		dev_err(&interface->dev, "Not our interface\n");
+-		return -ENODEV;
+-	}
+ 	/* Check if we need to switch to alt interfaces prior to port
+ 	 * configuration */
+ 	if (interface->num_altsetting > 1)
diff --git a/trunk/target/linux/generic/patches-3.8/008-hso-Fix-stack-corruption-on-some-architectures.patch b/trunk/target/linux/generic/patches-3.8/008-hso-Fix-stack-corruption-on-some-architectures.patch
new file mode 100644
index 00000000..c562c1ba
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/008-hso-Fix-stack-corruption-on-some-architectures.patch
@@ -0,0 +1,48 @@
+From e75dc677ff8d06ffa61bef6fee436227ae5440c6 Mon Sep 17 00:00:00 2001
+From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Date: Wed, 21 Aug 2013 01:43:19 -0700
+Subject: [PATCH 2/2] hso: Fix stack corruption on some architectures
+
+As Sergei Shtylyov explained in the #mipslinux IRC channel:
+[Mon 2013-08-19 12:28:21 PM PDT] <headless> guys, are you sure it's not "DMA off stack" case?
+[Mon 2013-08-19 12:28:35 PM PDT] <headless> it's a known stack corruptor on non-coherent arches
+[Mon 2013-08-19 12:31:48 PM PDT] <DonkeyHotei> headless: for usb/ehci?
+[Mon 2013-08-19 12:34:11 PM PDT] <DonkeyHotei> headless: explain
+[Mon 2013-08-19 12:35:38 PM PDT] <headless> usb_control_msg() (or other such func) should not use buffer on stack. DMA from/to stack is prohibited
+[Mon 2013-08-19 12:35:58 PM PDT] <headless> and EHCI uses DMA on control xfers (as well as all the others)
+
+Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/hso.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -2838,13 +2838,16 @@ exit:
+ static int hso_get_config_data(struct usb_interface *interface)
+ {
+ 	struct usb_device *usbdev = interface_to_usbdev(interface);
+-	u8 config_data[17];
++	u8 *config_data = kmalloc(17, GFP_KERNEL);
+ 	u32 if_num = interface->altsetting->desc.bInterfaceNumber;
+ 	s32 result;
+ 
++	if (!config_data)
++		return -ENOMEM;
+ 	if (usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
+ 			    0x86, 0xC0, 0, 0, config_data, 17,
+ 			    USB_CTRL_SET_TIMEOUT) != 0x11) {
++		kfree(config_data);
+ 		return -EIO;
+ 	}
+ 
+@@ -2895,6 +2898,7 @@ static int hso_get_config_data(struct us
+ 	if (config_data[16] & 0x1)
+ 		result |= HSO_INFO_CRC_BUG;
+ 
++	kfree(config_data);
+ 	return result;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/010-mtd_mp25p80_add_gd25q32_gd25q64.patch b/trunk/target/linux/generic/patches-3.8/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
new file mode 100644
index 00000000..6ec137ff
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -642,6 +642,10 @@ static const struct spi_device_id m25p_i
+ 	/* Everspin */
+ 	{ "mr25h256", CAT25_INFO(  32 * 1024, 1, 256, 2) },
+ 
++	/* GigaDevice */
++	{ "gd25q32", INFO(0xc84016, 0, 64 * 1024,  64, SECT_4K) },
++	{ "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) },
++
+ 	/* Intel/Numonyx -- xxxs33b */
+ 	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
+ 	{ "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
diff --git a/trunk/target/linux/generic/patches-3.8/020-ssb_update.patch b/trunk/target/linux/generic/patches-3.8/020-ssb_update.patch
new file mode 100644
index 00000000..7baa17d4
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/020-ssb_update.patch
@@ -0,0 +1,1589 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -136,10 +136,15 @@ config SSB_DRIVER_MIPS
+ 
+ 	  If unsure, say N
+ 
++config SSB_SFLASH
++	bool "SSB serial flash support"
++	depends on SSB_DRIVER_MIPS
++	default y
++
+ # Assumption: We are on embedded, if we compile the MIPS core.
+ config SSB_EMBEDDED
+ 	bool
+-	depends on SSB_DRIVER_MIPS
++	depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
+ 	default y
+ 
+ config SSB_DRIVER_EXTIF
+--- a/drivers/ssb/Makefile
++++ b/drivers/ssb/Makefile
+@@ -11,6 +11,7 @@ ssb-$(CONFIG_SSB_SDIOHOST)		+= sdio.o
+ # built-in drivers
+ ssb-y					+= driver_chipcommon.o
+ ssb-y					+= driver_chipcommon_pmu.o
++ssb-$(CONFIG_SSB_SFLASH)		+= driver_chipcommon_sflash.o
+ ssb-$(CONFIG_SSB_DRIVER_MIPS)		+= driver_mipscore.o
+ ssb-$(CONFIG_SSB_DRIVER_EXTIF)		+= driver_extif.o
+ ssb-$(CONFIG_SSB_DRIVER_PCICORE)	+= driver_pcicore.o
+--- a/drivers/ssb/driver_chipcommon.c
++++ b/drivers/ssb/driver_chipcommon.c
+@@ -354,7 +354,7 @@ void ssb_chipcommon_init(struct ssb_chip
+ 
+ 	if (cc->dev->id.revision >= 11)
+ 		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
+-	ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);
++	ssb_dbg("chipcommon status is 0x%x\n", cc->status);
+ 
+ 	if (cc->dev->id.revision >= 20) {
+ 		chipco_write32(cc, SSB_CHIPCO_GPIOPULLUP, 0);
+--- a/drivers/ssb/driver_chipcommon_pmu.c
++++ b/drivers/ssb/driver_chipcommon_pmu.c
+@@ -110,8 +110,8 @@ static void ssb_pmu0_pllinit_r0(struct s
+ 		return;
+ 	}
+ 
+-	ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
+-		   (crystalfreq / 1000), (crystalfreq % 1000));
++	ssb_info("Programming PLL to %u.%03u MHz\n",
++		 crystalfreq / 1000, crystalfreq % 1000);
+ 
+ 	/* First turn the PLL off. */
+ 	switch (bus->chip_id) {
+@@ -138,7 +138,7 @@ static void ssb_pmu0_pllinit_r0(struct s
+ 	}
+ 	tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
+ 	if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
+-		ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
++		ssb_emerg("Failed to turn the PLL off!\n");
+ 
+ 	/* Set PDIV in PLL control 0. */
+ 	pllctl = ssb_chipco_pll_read(cc, SSB_PMU0_PLLCTL0);
+@@ -249,8 +249,8 @@ static void ssb_pmu1_pllinit_r0(struct s
+ 		return;
+ 	}
+ 
+-	ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
+-		   (crystalfreq / 1000), (crystalfreq % 1000));
++	ssb_info("Programming PLL to %u.%03u MHz\n",
++		 crystalfreq / 1000, crystalfreq % 1000);
+ 
+ 	/* First turn the PLL off. */
+ 	switch (bus->chip_id) {
+@@ -275,7 +275,7 @@ static void ssb_pmu1_pllinit_r0(struct s
+ 	}
+ 	tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
+ 	if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
+-		ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
++		ssb_emerg("Failed to turn the PLL off!\n");
+ 
+ 	/* Set p1div and p2div. */
+ 	pllctl = ssb_chipco_pll_read(cc, SSB_PMU1_PLLCTL0);
+@@ -349,9 +349,8 @@ static void ssb_pmu_pll_init(struct ssb_
+ 	case 43222:
+ 		break;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "ERROR: PLL init unknown for device %04X\n",
+-			   bus->chip_id);
++		ssb_err("ERROR: PLL init unknown for device %04X\n",
++			bus->chip_id);
+ 	}
+ }
+ 
+@@ -472,9 +471,8 @@ static void ssb_pmu_resources_init(struc
+ 		max_msk = 0xFFFFF;
+ 		break;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "ERROR: PMU resource config unknown for device %04X\n",
+-			   bus->chip_id);
++		ssb_err("ERROR: PMU resource config unknown for device %04X\n",
++			bus->chip_id);
+ 	}
+ 
+ 	if (updown_tab) {
+@@ -526,8 +524,8 @@ void ssb_pmu_init(struct ssb_chipcommon
+ 	pmucap = chipco_read32(cc, SSB_CHIPCO_PMU_CAP);
+ 	cc->pmu.rev = (pmucap & SSB_CHIPCO_PMU_CAP_REVISION);
+ 
+-	ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
+-		    cc->pmu.rev, pmucap);
++	ssb_dbg("Found rev %u PMU (capabilities 0x%08X)\n",
++		cc->pmu.rev, pmucap);
+ 
+ 	if (cc->pmu.rev == 1)
+ 		chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
+@@ -638,9 +636,8 @@ u32 ssb_pmu_get_alp_clock(struct ssb_chi
+ 	case 0x5354:
+ 		ssb_pmu_get_alp_clock_clk0(cc);
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "ERROR: PMU alp clock unknown for device %04X\n",
+-			   bus->chip_id);
++		ssb_err("ERROR: PMU alp clock unknown for device %04X\n",
++			bus->chip_id);
+ 		return 0;
+ 	}
+ }
+@@ -654,9 +651,8 @@ u32 ssb_pmu_get_cpu_clock(struct ssb_chi
+ 		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
+ 		return 240000000;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "ERROR: PMU cpu clock unknown for device %04X\n",
+-			   bus->chip_id);
++		ssb_err("ERROR: PMU cpu clock unknown for device %04X\n",
++			bus->chip_id);
+ 		return 0;
+ 	}
+ }
+@@ -669,9 +665,8 @@ u32 ssb_pmu_get_controlclock(struct ssb_
+ 	case 0x5354:
+ 		return 120000000;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "ERROR: PMU controlclock unknown for device %04X\n",
+-			   bus->chip_id);
++		ssb_err("ERROR: PMU controlclock unknown for device %04X\n",
++			bus->chip_id);
+ 		return 0;
+ 	}
+ }
+@@ -692,8 +687,23 @@ void ssb_pmu_spuravoid_pllupdate(struct
+ 		pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
+ 		break;
+ 	case 43222:
+-		/* TODO: BCM43222 requires updating PLLs too */
+-		return;
++		if (spuravoid == 1) {
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11500008);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0C000C06);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x0F600a08);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x2001E920);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888815);
++		} else {
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11100008);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0c000c06);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x03000a08);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x200005c0);
++			ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888855);
++		}
++		pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
++		break;
+ 	default:
+ 		ssb_printk(KERN_ERR PFX
+ 			   "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
+--- /dev/null
++++ b/drivers/ssb/driver_chipcommon_sflash.c
+@@ -0,0 +1,164 @@
++/*
++ * Sonics Silicon Backplane
++ * ChipCommon serial flash interface
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/ssb/ssb.h>
++
++#include "ssb_private.h"
++
++static struct resource ssb_sflash_resource = {
++	.name	= "ssb_sflash",
++	.start	= SSB_FLASH2,
++	.end	= 0,
++	.flags  = IORESOURCE_MEM | IORESOURCE_READONLY,
++};
++
++struct platform_device ssb_sflash_dev = {
++	.name		= "ssb_sflash",
++	.resource	= &ssb_sflash_resource,
++	.num_resources	= 1,
++};
++
++struct ssb_sflash_tbl_e {
++	char *name;
++	u32 id;
++	u32 blocksize;
++	u16 numblocks;
++};
++
++static const struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
++	{ "M25P20", 0x11, 0x10000, 4, },
++	{ "M25P40", 0x12, 0x10000, 8, },
++
++	{ "M25P16", 0x14, 0x10000, 32, },
++	{ "M25P32", 0x15, 0x10000, 64, },
++	{ "M25P64", 0x16, 0x10000, 128, },
++	{ "M25FL128", 0x17, 0x10000, 256, },
++	{ 0 },
++};
++
++static const struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
++	{ "SST25WF512", 1, 0x1000, 16, },
++	{ "SST25VF512", 0x48, 0x1000, 16, },
++	{ "SST25WF010", 2, 0x1000, 32, },
++	{ "SST25VF010", 0x49, 0x1000, 32, },
++	{ "SST25WF020", 3, 0x1000, 64, },
++	{ "SST25VF020", 0x43, 0x1000, 64, },
++	{ "SST25WF040", 4, 0x1000, 128, },
++	{ "SST25VF040", 0x44, 0x1000, 128, },
++	{ "SST25VF040B", 0x8d, 0x1000, 128, },
++	{ "SST25WF080", 5, 0x1000, 256, },
++	{ "SST25VF080B", 0x8e, 0x1000, 256, },
++	{ "SST25VF016", 0x41, 0x1000, 512, },
++	{ "SST25VF032", 0x4a, 0x1000, 1024, },
++	{ "SST25VF064", 0x4b, 0x1000, 2048, },
++	{ 0 },
++};
++
++static const struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
++	{ "AT45DB011", 0xc, 256, 512, },
++	{ "AT45DB021", 0x14, 256, 1024, },
++	{ "AT45DB041", 0x1c, 256, 2048, },
++	{ "AT45DB081", 0x24, 256, 4096, },
++	{ "AT45DB161", 0x2c, 512, 4096, },
++	{ "AT45DB321", 0x34, 512, 8192, },
++	{ "AT45DB642", 0x3c, 1024, 8192, },
++	{ 0 },
++};
++
++static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode)
++{
++	int i;
++	chipco_write32(cc, SSB_CHIPCO_FLASHCTL,
++		       SSB_CHIPCO_FLASHCTL_START | opcode);
++	for (i = 0; i < 1000; i++) {
++		if (!(chipco_read32(cc, SSB_CHIPCO_FLASHCTL) &
++		      SSB_CHIPCO_FLASHCTL_BUSY))
++			return;
++		cpu_relax();
++	}
++	pr_err("SFLASH control command failed (timeout)!\n");
++}
++
++/* Initialize serial flash access */
++int ssb_sflash_init(struct ssb_chipcommon *cc)
++{
++	struct ssb_sflash *sflash = &cc->dev->bus->mipscore.sflash;
++	const struct ssb_sflash_tbl_e *e;
++	u32 id, id2;
++
++	switch (cc->capabilities & SSB_CHIPCO_CAP_FLASHT) {
++	case SSB_CHIPCO_FLASHT_STSER:
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_DP);
++
++		chipco_write32(cc, SSB_CHIPCO_FLASHADDR, 0);
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_RES);
++		id = chipco_read32(cc, SSB_CHIPCO_FLASHDATA);
++
++		chipco_write32(cc, SSB_CHIPCO_FLASHADDR, 1);
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_RES);
++		id2 = chipco_read32(cc, SSB_CHIPCO_FLASHDATA);
++
++		switch (id) {
++		case 0xbf:
++			for (e = ssb_sflash_sst_tbl; e->name; e++) {
++				if (e->id == id2)
++					break;
++			}
++			break;
++		case 0x13:
++			return -ENOTSUPP;
++		default:
++			for (e = ssb_sflash_st_tbl; e->name; e++) {
++				if (e->id == id)
++					break;
++			}
++			break;
++		}
++		if (!e->name) {
++			pr_err("Unsupported ST serial flash (id: 0x%X, id2: 0x%X)\n",
++			       id, id2);
++			return -ENOTSUPP;
++		}
++
++		break;
++	case SSB_CHIPCO_FLASHT_ATSER:
++		ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_AT_STATUS);
++		id = chipco_read32(cc, SSB_CHIPCO_FLASHDATA) & 0x3c;
++
++		for (e = ssb_sflash_at_tbl; e->name; e++) {
++			if (e->id == id)
++				break;
++		}
++		if (!e->name) {
++			pr_err("Unsupported Atmel serial flash (id: 0x%X)\n",
++			       id);
++			return -ENOTSUPP;
++		}
++
++		break;
++	default:
++		pr_err("Unsupported flash type\n");
++		return -ENOTSUPP;
++	}
++
++	sflash->window = SSB_FLASH2;
++	sflash->blocksize = e->blocksize;
++	sflash->numblocks = e->numblocks;
++	sflash->size = sflash->blocksize * sflash->numblocks;
++	sflash->present = true;
++
++	pr_info("Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n",
++		e->name, sflash->size / 1024, e->blocksize, e->numblocks);
++
++	/* Prepare platform device, but don't register it yet. It's too early,
++	 * malloc (required by device_private_init) is not available yet. */
++	ssb_sflash_dev.resource[0].end = ssb_sflash_dev.resource[0].start +
++					 sflash->size;
++	ssb_sflash_dev.dev.platform_data = sflash;
++
++	return 0;
++}
+--- a/drivers/ssb/driver_gpio.c
++++ b/drivers/ssb/driver_gpio.c
+@@ -74,6 +74,16 @@ static void ssb_gpio_chipco_free(struct
+ 	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);
+ }
+ 
++static int ssb_gpio_chipco_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		return ssb_mips_irq(bus->chipco.dev) + 2;
++	else
++		return -EINVAL;
++}
++
+ static int ssb_gpio_chipco_init(struct ssb_bus *bus)
+ {
+ 	struct gpio_chip *chip = &bus->gpio;
+@@ -86,6 +96,7 @@ static int ssb_gpio_chipco_init(struct s
+ 	chip->set		= ssb_gpio_chipco_set_value;
+ 	chip->direction_input	= ssb_gpio_chipco_direction_input;
+ 	chip->direction_output	= ssb_gpio_chipco_direction_output;
++	chip->to_irq		= ssb_gpio_chipco_to_irq;
+ 	chip->ngpio		= 16;
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+@@ -134,6 +145,16 @@ static int ssb_gpio_extif_direction_outp
+ 	return 0;
+ }
+ 
++static int ssb_gpio_extif_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
++
++	if (bus->bustype == SSB_BUSTYPE_SSB)
++		return ssb_mips_irq(bus->extif.dev) + 2;
++	else
++		return -EINVAL;
++}
++
+ static int ssb_gpio_extif_init(struct ssb_bus *bus)
+ {
+ 	struct gpio_chip *chip = &bus->gpio;
+@@ -144,6 +165,7 @@ static int ssb_gpio_extif_init(struct ss
+ 	chip->set		= ssb_gpio_extif_set_value;
+ 	chip->direction_input	= ssb_gpio_extif_direction_input;
+ 	chip->direction_output	= ssb_gpio_extif_direction_output;
++	chip->to_irq		= ssb_gpio_extif_to_irq;
+ 	chip->ngpio		= 5;
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
+@@ -10,6 +10,7 @@
+ 
+ #include <linux/ssb/ssb.h>
+ 
++#include <linux/mtd/physmap.h>
+ #include <linux/serial.h>
+ #include <linux/serial_core.h>
+ #include <linux/serial_reg.h>
+@@ -17,6 +18,25 @@
+ 
+ #include "ssb_private.h"
+ 
++static const char *part_probes[] = { "bcm47xxpart", NULL };
++
++static struct physmap_flash_data ssb_pflash_data = {
++	.part_probe_types	= part_probes,
++};
++
++static struct resource ssb_pflash_resource = {
++	.name	= "ssb_pflash",
++	.flags  = IORESOURCE_MEM,
++};
++
++struct platform_device ssb_pflash_dev = {
++	.name		= "physmap-flash",
++	.dev		= {
++		.platform_data  = &ssb_pflash_data,
++	},
++	.resource	= &ssb_pflash_resource,
++	.num_resources	= 1,
++};
+ 
+ static inline u32 mips_read32(struct ssb_mipscore *mcore,
+ 			      u16 offset)
+@@ -147,21 +167,22 @@ static void set_irq(struct ssb_device *d
+ 		irqflag |= (ipsflag & ~ipsflag_irq_mask[irq]);
+ 		ssb_write32(mdev, SSB_IPSFLAG, irqflag);
+ 	}
+-	ssb_dprintk(KERN_INFO PFX
+-		    "set_irq: core 0x%04x, irq %d => %d\n",
+-		    dev->id.coreid, oldirq+2, irq+2);
++	ssb_dbg("set_irq: core 0x%04x, irq %d => %d\n",
++		dev->id.coreid, oldirq+2, irq+2);
+ }
+ 
+ static void print_irq(struct ssb_device *dev, unsigned int irq)
+ {
+-	int i;
+ 	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
+-	ssb_dprintk(KERN_INFO PFX
+-		"core 0x%04x, irq :", dev->id.coreid);
+-	for (i = 0; i <= 6; i++) {
+-		ssb_dprintk(" %s%s", irq_name[i], i==irq?"*":" ");
+-	}
+-	ssb_dprintk("\n");
++	ssb_dbg("core 0x%04x, irq : %s%s %s%s %s%s %s%s %s%s %s%s %s%s\n",
++		dev->id.coreid,
++		irq_name[0], irq == 0 ? "*" : " ",
++		irq_name[1], irq == 1 ? "*" : " ",
++		irq_name[2], irq == 2 ? "*" : " ",
++		irq_name[3], irq == 3 ? "*" : " ",
++		irq_name[4], irq == 4 ? "*" : " ",
++		irq_name[5], irq == 5 ? "*" : " ",
++		irq_name[6], irq == 6 ? "*" : " ");
+ }
+ 
+ static void dump_irq(struct ssb_bus *bus)
+@@ -189,34 +210,43 @@ static void ssb_mips_serial_init(struct
+ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
+ {
+ 	struct ssb_bus *bus = mcore->dev->bus;
++	struct ssb_pflash *pflash = &mcore->pflash;
+ 
+ 	/* When there is no chipcommon on the bus there is 4MB flash */
+ 	if (!ssb_chipco_available(&bus->chipco)) {
+-		mcore->pflash.present = true;
+-		mcore->pflash.buswidth = 2;
+-		mcore->pflash.window = SSB_FLASH1;
+-		mcore->pflash.window_size = SSB_FLASH1_SZ;
+-		return;
++		pflash->present = true;
++		pflash->buswidth = 2;
++		pflash->window = SSB_FLASH1;
++		pflash->window_size = SSB_FLASH1_SZ;
++		goto ssb_pflash;
+ 	}
+ 
+ 	/* There is ChipCommon, so use it to read info about flash */
+ 	switch (bus->chipco.capabilities & SSB_CHIPCO_CAP_FLASHT) {
+ 	case SSB_CHIPCO_FLASHT_STSER:
+ 	case SSB_CHIPCO_FLASHT_ATSER:
+-		pr_err("Serial flash not supported\n");
++		pr_debug("Found serial flash\n");
++		ssb_sflash_init(&bus->chipco);
+ 		break;
+ 	case SSB_CHIPCO_FLASHT_PARA:
+ 		pr_debug("Found parallel flash\n");
+-		mcore->pflash.present = true;
+-		mcore->pflash.window = SSB_FLASH2;
+-		mcore->pflash.window_size = SSB_FLASH2_SZ;
++		pflash->present = true;
++		pflash->window = SSB_FLASH2;
++		pflash->window_size = SSB_FLASH2_SZ;
+ 		if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG)
+ 		               & SSB_CHIPCO_CFG_DS16) == 0)
+-			mcore->pflash.buswidth = 1;
++			pflash->buswidth = 1;
+ 		else
+-			mcore->pflash.buswidth = 2;
++			pflash->buswidth = 2;
+ 		break;
+ 	}
++
++ssb_pflash:
++	if (pflash->present) {
++		ssb_pflash_data.width = pflash->buswidth;
++		ssb_pflash_resource.start = pflash->window;
++		ssb_pflash_resource.end = pflash->window + pflash->window_size;
++	}
+ }
+ 
+ u32 ssb_cpu_clock(struct ssb_mipscore *mcore)
+@@ -257,7 +287,7 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 	if (!mcore->dev)
+ 		return; /* We don't have a MIPS core */
+ 
+-	ssb_dprintk(KERN_INFO PFX "Initializing MIPS core...\n");
++	ssb_dbg("Initializing MIPS core...\n");
+ 
+ 	bus = mcore->dev->bus;
+ 	hz = ssb_clockspeed(bus);
+@@ -305,7 +335,7 @@ void ssb_mipscore_init(struct ssb_mipsco
+ 			break;
+ 		}
+ 	}
+-	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
++	ssb_dbg("after irq reconfiguration\n");
+ 	dump_irq(bus);
+ 
+ 	ssb_mips_serial_init(mcore);
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -263,8 +263,7 @@ int ssb_pcicore_plat_dev_init(struct pci
+ 		return -ENODEV;
+ 	}
+ 
+-	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
+-		   pci_name(d));
++	ssb_info("PCI: Fixing up device %s\n", pci_name(d));
+ 
+ 	/* Fix up interrupt lines */
+ 	d->irq = ssb_mips_irq(extpci_core->dev) + 2;
+@@ -285,12 +284,12 @@ static void ssb_pcicore_fixup_pcibridge(
+ 	if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) != 0)
+ 		return;
+ 
+-	ssb_printk(KERN_INFO "PCI: Fixing up bridge %s\n", pci_name(dev));
++	ssb_info("PCI: Fixing up bridge %s\n", pci_name(dev));
+ 
+ 	/* Enable PCI bridge bus mastering and memory space */
+ 	pci_set_master(dev);
+ 	if (pcibios_enable_device(dev, ~0) < 0) {
+-		ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n");
++		ssb_err("PCI: SSB bridge enable failed\n");
+ 		return;
+ 	}
+ 
+@@ -299,8 +298,8 @@ static void ssb_pcicore_fixup_pcibridge(
+ 
+ 	/* Make sure our latency is high enough to handle the devices behind us */
+ 	lat = 168;
+-	ssb_printk(KERN_INFO "PCI: Fixing latency timer of device %s to %u\n",
+-		   pci_name(dev), lat);
++	ssb_info("PCI: Fixing latency timer of device %s to %u\n",
++		 pci_name(dev), lat);
+ 	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_pcicore_fixup_pcibridge);
+@@ -323,7 +322,7 @@ static void ssb_pcicore_init_hostmode(st
+ 		return;
+ 	extpci_core = pc;
+ 
+-	ssb_dprintk(KERN_INFO PFX "PCIcore in host mode found\n");
++	ssb_dbg("PCIcore in host mode found\n");
+ 	/* Reset devices on the external PCI bus */
+ 	val = SSB_PCICORE_CTL_RST_OE;
+ 	val |= SSB_PCICORE_CTL_CLK_OE;
+@@ -338,7 +337,7 @@ static void ssb_pcicore_init_hostmode(st
+ 	udelay(1); /* Assertion time demanded by the PCI standard */
+ 
+ 	if (pc->dev->bus->has_cardbus_slot) {
+-		ssb_dprintk(KERN_INFO PFX "CardBus slot detected\n");
++		ssb_dbg("CardBus slot detected\n");
+ 		pc->cardbusmode = 1;
+ 		/* GPIO 1 resets the bridge */
+ 		ssb_gpio_out(pc->dev->bus, 1, 1);
+--- a/drivers/ssb/embedded.c
++++ b/drivers/ssb/embedded.c
+@@ -57,9 +57,8 @@ int ssb_watchdog_register(struct ssb_bus
+ 					     bus->busnumber, &wdt,
+ 					     sizeof(wdt));
+ 	if (IS_ERR(pdev)) {
+-		ssb_dprintk(KERN_INFO PFX
+-			    "can not register watchdog device, err: %li\n",
+-			    PTR_ERR(pdev));
++		ssb_dbg("can not register watchdog device, err: %li\n",
++			PTR_ERR(pdev));
+ 		return PTR_ERR(pdev);
+ 	}
+ 
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -275,8 +275,8 @@ int ssb_devices_thaw(struct ssb_freeze_c
+ 
+ 		err = sdrv->probe(sdev, &sdev->id);
+ 		if (err) {
+-			ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
+-				   dev_name(sdev->dev));
++			ssb_err("Failed to thaw device %s\n",
++				dev_name(sdev->dev));
+ 			result = err;
+ 		}
+ 		ssb_device_put(sdev);
+@@ -447,10 +447,9 @@ void ssb_bus_unregister(struct ssb_bus *
+ 
+ 	err = ssb_gpio_unregister(bus);
+ 	if (err == -EBUSY)
+-		ssb_dprintk(KERN_ERR PFX "Some GPIOs are still in use.\n");
++		ssb_dbg("Some GPIOs are still in use\n");
+ 	else if (err)
+-		ssb_dprintk(KERN_ERR PFX
+-			    "Can not unregister GPIO driver: %i\n", err);
++		ssb_dbg("Can not unregister GPIO driver: %i\n", err);
+ 
+ 	ssb_buses_lock();
+ 	ssb_devices_unregister(bus);
+@@ -497,8 +496,7 @@ static int ssb_devices_register(struct s
+ 
+ 		devwrap = kzalloc(sizeof(*devwrap), GFP_KERNEL);
+ 		if (!devwrap) {
+-			ssb_printk(KERN_ERR PFX
+-				   "Could not allocate device\n");
++			ssb_err("Could not allocate device\n");
+ 			err = -ENOMEM;
+ 			goto error;
+ 		}
+@@ -537,9 +535,7 @@ static int ssb_devices_register(struct s
+ 		sdev->dev = dev;
+ 		err = device_register(dev);
+ 		if (err) {
+-			ssb_printk(KERN_ERR PFX
+-				   "Could not register %s\n",
+-				   dev_name(dev));
++			ssb_err("Could not register %s\n", dev_name(dev));
+ 			/* Set dev to NULL to not unregister
+ 			 * dev on error unwinding. */
+ 			sdev->dev = NULL;
+@@ -549,6 +545,22 @@ static int ssb_devices_register(struct s
+ 		dev_idx++;
+ 	}
+ 
++#ifdef CONFIG_SSB_DRIVER_MIPS
++	if (bus->mipscore.pflash.present) {
++		err = platform_device_register(&ssb_pflash_dev);
++		if (err)
++			pr_err("Error registering parallel flash\n");
++	}
++#endif
++
++#ifdef CONFIG_SSB_SFLASH
++	if (bus->mipscore.sflash.present) {
++		err = platform_device_register(&ssb_sflash_dev);
++		if (err)
++			pr_err("Error registering serial flash\n");
++	}
++#endif
++
+ 	return 0;
+ error:
+ 	/* Unwind the already registered devices. */
+@@ -817,10 +829,9 @@ static int ssb_bus_register(struct ssb_b
+ 	ssb_mipscore_init(&bus->mipscore);
+ 	err = ssb_gpio_init(bus);
+ 	if (err == -ENOTSUPP)
+-		ssb_dprintk(KERN_DEBUG PFX "GPIO driver not activated\n");
++		ssb_dbg("GPIO driver not activated\n");
+ 	else if (err)
+-		ssb_dprintk(KERN_ERR PFX
+-			   "Error registering GPIO driver: %i\n", err);
++		ssb_dbg("Error registering GPIO driver: %i\n", err);
+ 	err = ssb_fetch_invariants(bus, get_invariants);
+ 	if (err) {
+ 		ssb_bus_may_powerdown(bus);
+@@ -870,11 +881,11 @@ int ssb_bus_pcibus_register(struct ssb_b
+ 
+ 	err = ssb_bus_register(bus, ssb_pci_get_invariants, 0);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
+-			   "PCI device %s\n", dev_name(&host_pci->dev));
++		ssb_info("Sonics Silicon Backplane found on PCI device %s\n",
++			 dev_name(&host_pci->dev));
+ 	} else {
+-		ssb_printk(KERN_ERR PFX "Failed to register PCI version"
+-			   " of SSB with error %d\n", err);
++		ssb_err("Failed to register PCI version of SSB with error %d\n",
++			err);
+ 	}
+ 
+ 	return err;
+@@ -895,8 +906,8 @@ int ssb_bus_pcmciabus_register(struct ss
+ 
+ 	err = ssb_bus_register(bus, ssb_pcmcia_get_invariants, baseaddr);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
+-			   "PCMCIA device %s\n", pcmcia_dev->devname);
++		ssb_info("Sonics Silicon Backplane found on PCMCIA device %s\n",
++			 pcmcia_dev->devname);
+ 	}
+ 
+ 	return err;
+@@ -917,8 +928,8 @@ int ssb_bus_sdiobus_register(struct ssb_
+ 
+ 	err = ssb_bus_register(bus, ssb_sdio_get_invariants, ~0);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
+-			   "SDIO device %s\n", sdio_func_id(func));
++		ssb_info("Sonics Silicon Backplane found on SDIO device %s\n",
++			 sdio_func_id(func));
+ 	}
+ 
+ 	return err;
+@@ -936,8 +947,8 @@ int ssb_bus_ssbbus_register(struct ssb_b
+ 
+ 	err = ssb_bus_register(bus, get_invariants, baseaddr);
+ 	if (!err) {
+-		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found at "
+-			   "address 0x%08lX\n", baseaddr);
++		ssb_info("Sonics Silicon Backplane found at address 0x%08lX\n",
++			 baseaddr);
+ 	}
+ 
+ 	return err;
+@@ -1331,7 +1342,7 @@ out:
+ #endif
+ 	return err;
+ error:
+-	ssb_printk(KERN_ERR PFX "Bus powerdown failed\n");
++	ssb_err("Bus powerdown failed\n");
+ 	goto out;
+ }
+ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1354,7 +1365,7 @@ int ssb_bus_powerup(struct ssb_bus *bus,
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
++	ssb_err("Bus powerup failed\n");
+ 	return err;
+ }
+ EXPORT_SYMBOL(ssb_bus_powerup);
+@@ -1462,15 +1473,13 @@ static int __init ssb_modinit(void)
+ 
+ 	err = b43_pci_ssb_bridge_init();
+ 	if (err) {
+-		ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
+-			   "initialization failed\n");
++		ssb_err("Broadcom 43xx PCI-SSB-bridge initialization failed\n");
+ 		/* don't fail SSB init because of this */
+ 		err = 0;
+ 	}
+ 	err = ssb_gige_init();
+ 	if (err) {
+-		ssb_printk(KERN_ERR "SSB Broadcom Gigabit Ethernet "
+-			   "driver initialization failed\n");
++		ssb_err("SSB Broadcom Gigabit Ethernet driver initialization failed\n");
+ 		/* don't fail SSB init because of this */
+ 		err = 0;
+ 	}
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -56,7 +56,7 @@ int ssb_pci_switch_coreidx(struct ssb_bu
+ 	}
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
++	ssb_err("Failed to switch to core %u\n", coreidx);
+ 	return -ENODEV;
+ }
+ 
+@@ -67,10 +67,9 @@ int ssb_pci_switch_core(struct ssb_bus *
+ 	unsigned long flags;
+ 
+ #if SSB_VERBOSE_PCICORESWITCH_DEBUG
+-	ssb_printk(KERN_INFO PFX
+-		   "Switching to %s core, index %d\n",
+-		   ssb_core_name(dev->id.coreid),
+-		   dev->core_index);
++	ssb_info("Switching to %s core, index %d\n",
++		 ssb_core_name(dev->id.coreid),
++		 dev->core_index);
+ #endif
+ 
+ 	spin_lock_irqsave(&bus->bar_lock, flags);
+@@ -231,6 +230,15 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
+ 	return t[crc ^ data];
+ }
+ 
++static void sprom_get_mac(char *mac, const u16 *in)
++{
++	int i;
++	for (i = 0; i < 3; i++) {
++		*mac++ = in[i] >> 8;
++		*mac++ = in[i];
++	}
++}
++
+ static u8 ssb_sprom_crc(const u16 *sprom, u16 size)
+ {
+ 	int word;
+@@ -278,7 +286,7 @@ static int sprom_do_write(struct ssb_bus
+ 	u32 spromctl;
+ 	u16 size = bus->sprom_size;
+ 
+-	ssb_printk(KERN_NOTICE PFX "Writing SPROM. Do NOT turn off the power! Please stand by...\n");
++	ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
+ 	err = pci_read_config_dword(pdev, SSB_SPROMCTL, &spromctl);
+ 	if (err)
+ 		goto err_ctlreg;
+@@ -286,17 +294,17 @@ static int sprom_do_write(struct ssb_bus
+ 	err = pci_write_config_dword(pdev, SSB_SPROMCTL, spromctl);
+ 	if (err)
+ 		goto err_ctlreg;
+-	ssb_printk(KERN_NOTICE PFX "[ 0%%");
++	ssb_notice("[ 0%%");
+ 	msleep(500);
+ 	for (i = 0; i < size; i++) {
+ 		if (i == size / 4)
+-			ssb_printk("25%%");
++			ssb_cont("25%%");
+ 		else if (i == size / 2)
+-			ssb_printk("50%%");
++			ssb_cont("50%%");
+ 		else if (i == (size * 3) / 4)
+-			ssb_printk("75%%");
++			ssb_cont("75%%");
+ 		else if (i % 2)
+-			ssb_printk(".");
++			ssb_cont(".");
+ 		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
+ 		mmiowb();
+ 		msleep(20);
+@@ -309,12 +317,12 @@ static int sprom_do_write(struct ssb_bus
+ 	if (err)
+ 		goto err_ctlreg;
+ 	msleep(500);
+-	ssb_printk("100%% ]\n");
+-	ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
++	ssb_cont("100%% ]\n");
++	ssb_notice("SPROM written\n");
+ 
+ 	return 0;
+ err_ctlreg:
+-	ssb_printk(KERN_ERR PFX "Could not access SPROM control register.\n");
++	ssb_err("Could not access SPROM control register.\n");
+ 	return err;
+ }
+ 
+@@ -339,10 +347,23 @@ static s8 r123_extract_antgain(u8 sprom_
+ 	return (s8)gain;
+ }
+ 
++static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in)
++{
++	SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
++	SPEX(opo, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);
++	SPEX(pa1lob0, SSB_SPROM2_PA1LOB0, 0xFFFF, 0);
++	SPEX(pa1lob1, SSB_SPROM2_PA1LOB1, 0xFFFF, 0);
++	SPEX(pa1lob2, SSB_SPROM2_PA1LOB2, 0xFFFF, 0);
++	SPEX(pa1hib0, SSB_SPROM2_PA1HIB0, 0xFFFF, 0);
++	SPEX(pa1hib1, SSB_SPROM2_PA1HIB1, 0xFFFF, 0);
++	SPEX(pa1hib2, SSB_SPROM2_PA1HIB2, 0xFFFF, 0);
++	SPEX(maxpwr_ah, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_HI, 0);
++	SPEX(maxpwr_al, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_LO,
++	     SSB_SPROM2_MAXP_A_LO_SHIFT);
++}
++
+ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
+ {
+-	int i;
+-	u16 v;
+ 	u16 loc[3];
+ 
+ 	if (out->revision == 3)			/* rev 3 moved MAC */
+@@ -352,19 +373,10 @@ static void sprom_extract_r123(struct ss
+ 		loc[1] = SSB_SPROM1_ET0MAC;
+ 		loc[2] = SSB_SPROM1_ET1MAC;
+ 	}
+-	for (i = 0; i < 3; i++) {
+-		v = in[SPOFF(loc[0]) + i];
+-		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
+-	}
++	sprom_get_mac(out->il0mac, &in[SPOFF(loc[0])]);
+ 	if (out->revision < 3) { 	/* only rev 1-2 have et0, et1 */
+-		for (i = 0; i < 3; i++) {
+-			v = in[SPOFF(loc[1]) + i];
+-			*(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
+-		}
+-		for (i = 0; i < 3; i++) {
+-			v = in[SPOFF(loc[2]) + i];
+-			*(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
+-		}
++		sprom_get_mac(out->et0mac, &in[SPOFF(loc[1])]);
++		sprom_get_mac(out->et1mac, &in[SPOFF(loc[2])]);
+ 	}
+ 	SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);
+ 	SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,
+@@ -372,6 +384,7 @@ static void sprom_extract_r123(struct ss
+ 	SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);
+ 	SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);
+ 	SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);
++	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
+ 	if (out->revision == 1)
+ 		SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
+ 		     SSB_SPROM1_BINF_CCODE_SHIFT);
+@@ -398,8 +411,7 @@ static void sprom_extract_r123(struct ss
+ 	     SSB_SPROM1_ITSSI_A_SHIFT);
+ 	SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
+ 	SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
+-	if (out->revision >= 2)
+-		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
++
+ 	SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8);
+ 	SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
+ 
+@@ -410,6 +422,8 @@ static void sprom_extract_r123(struct ss
+ 	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
+ 						    SSB_SPROM1_AGAIN_A,
+ 						    SSB_SPROM1_AGAIN_A_SHIFT);
++	if (out->revision >= 2)
++		sprom_extract_r23(out, in);
+ }
+ 
+ /* Revs 4 5 and 8 have partially shared layout */
+@@ -454,23 +468,20 @@ static void sprom_extract_r458(struct ss
+ 
+ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
+ {
+-	int i;
+-	u16 v;
+ 	u16 il0mac_offset;
+ 
+ 	if (out->revision == 4)
+ 		il0mac_offset = SSB_SPROM4_IL0MAC;
+ 	else
+ 		il0mac_offset = SSB_SPROM5_IL0MAC;
+-	/* extract the MAC address */
+-	for (i = 0; i < 3; i++) {
+-		v = in[SPOFF(il0mac_offset) + i];
+-		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
+-	}
++
++	sprom_get_mac(out->il0mac, &in[SPOFF(il0mac_offset)]);
++
+ 	SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
+ 	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
+ 	     SSB_SPROM4_ETHPHY_ET1A_SHIFT);
+ 	SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
++	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
+ 	if (out->revision == 4) {
+ 		SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
+ 		SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
+@@ -530,7 +541,7 @@ static void sprom_extract_r45(struct ssb
+ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
+ {
+ 	int i;
+-	u16 v, o;
++	u16 o;
+ 	u16 pwr_info_offset[] = {
+ 		SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
+ 		SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
+@@ -539,11 +550,10 @@ static void sprom_extract_r8(struct ssb_
+ 			ARRAY_SIZE(out->core_pwr_info));
+ 
+ 	/* extract the MAC address */
+-	for (i = 0; i < 3; i++) {
+-		v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
+-		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
+-	}
++	sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]);
++
+ 	SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
++	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
+ 	SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
+ 	SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
+ 	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
+@@ -743,7 +753,7 @@ static int sprom_extract(struct ssb_bus
+ 	memset(out, 0, sizeof(*out));
+ 
+ 	out->revision = in[size - 1] & 0x00FF;
+-	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
++	ssb_dbg("SPROM revision %d detected\n", out->revision);
+ 	memset(out->et0mac, 0xFF, 6);		/* preset et0 and et1 mac */
+ 	memset(out->et1mac, 0xFF, 6);
+ 
+@@ -752,7 +762,7 @@ static int sprom_extract(struct ssb_bus
+ 		 * number stored in the SPROM.
+ 		 * Always extract r1. */
+ 		out->revision = 1;
+-		ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
++		ssb_dbg("SPROM treated as revision %d\n", out->revision);
+ 	}
+ 
+ 	switch (out->revision) {
+@@ -769,9 +779,8 @@ static int sprom_extract(struct ssb_bus
+ 		sprom_extract_r8(out, in);
+ 		break;
+ 	default:
+-		ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
+-			   " revision %d detected. Will extract"
+-			   " v1\n", out->revision);
++		ssb_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
++			 out->revision);
+ 		out->revision = 1;
+ 		sprom_extract_r123(out, in);
+ 	}
+@@ -791,7 +800,7 @@ static int ssb_pci_sprom_get(struct ssb_
+ 	u16 *buf;
+ 
+ 	if (!ssb_is_sprom_available(bus)) {
+-		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
++		ssb_err("No SPROM available!\n");
+ 		return -ENODEV;
+ 	}
+ 	if (bus->chipco.dev) {	/* can be unavailable! */
+@@ -810,7 +819,7 @@ static int ssb_pci_sprom_get(struct ssb_
+ 	} else {
+ 		bus->sprom_offset = SSB_SPROM_BASE1;
+ 	}
+-	ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset);
++	ssb_dbg("SPROM offset is 0x%x\n", bus->sprom_offset);
+ 
+ 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
+ 	if (!buf)
+@@ -835,18 +844,15 @@ static int ssb_pci_sprom_get(struct ssb_
+ 			 * available for this device in some other storage */
+ 			err = ssb_fill_sprom_with_fallback(bus, sprom);
+ 			if (err) {
+-				ssb_printk(KERN_WARNING PFX "WARNING: Using"
+-					   " fallback SPROM failed (err %d)\n",
+-					   err);
++				ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n",
++					 err);
+ 			} else {
+-				ssb_dprintk(KERN_DEBUG PFX "Using SPROM"
+-					    " revision %d provided by"
+-					    " platform.\n", sprom->revision);
++				ssb_dbg("Using SPROM revision %d provided by platform\n",
++					sprom->revision);
+ 				err = 0;
+ 				goto out_free;
+ 			}
+-			ssb_printk(KERN_WARNING PFX "WARNING: Invalid"
+-				   " SPROM CRC (corrupt SPROM)\n");
++			ssb_warn("WARNING: Invalid SPROM CRC (corrupt SPROM)\n");
+ 		}
+ 	}
+ 	err = sprom_extract(bus, sprom, buf, bus->sprom_size);
+--- a/drivers/ssb/pcihost_wrapper.c
++++ b/drivers/ssb/pcihost_wrapper.c
+@@ -38,7 +38,7 @@ static int ssb_pcihost_resume(struct pci
+ 	struct ssb_bus *ssb = pci_get_drvdata(dev);
+ 	int err;
+ 
+-	pci_set_power_state(dev, 0);
++	pci_set_power_state(dev, PCI_D0);
+ 	err = pci_enable_device(dev);
+ 	if (err)
+ 		return err;
+--- a/drivers/ssb/pcmcia.c
++++ b/drivers/ssb/pcmcia.c
+@@ -143,7 +143,7 @@ int ssb_pcmcia_switch_coreidx(struct ssb
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
++	ssb_err("Failed to switch to core %u\n", coreidx);
+ 	return err;
+ }
+ 
+@@ -153,10 +153,9 @@ int ssb_pcmcia_switch_core(struct ssb_bu
+ 	int err;
+ 
+ #if SSB_VERBOSE_PCMCIACORESWITCH_DEBUG
+-	ssb_printk(KERN_INFO PFX
+-		   "Switching to %s core, index %d\n",
+-		   ssb_core_name(dev->id.coreid),
+-		   dev->core_index);
++	ssb_info("Switching to %s core, index %d\n",
++		 ssb_core_name(dev->id.coreid),
++		 dev->core_index);
+ #endif
+ 
+ 	err = ssb_pcmcia_switch_coreidx(bus, dev->core_index);
+@@ -192,7 +191,7 @@ int ssb_pcmcia_switch_segment(struct ssb
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to switch pcmcia segment\n");
++	ssb_err("Failed to switch pcmcia segment\n");
+ 	return err;
+ }
+ 
+@@ -549,44 +548,39 @@ static int ssb_pcmcia_sprom_write_all(st
+ 	bool failed = 0;
+ 	size_t size = SSB_PCMCIA_SPROM_SIZE;
+ 
+-	ssb_printk(KERN_NOTICE PFX
+-		   "Writing SPROM. Do NOT turn off the power! "
+-		   "Please stand by...\n");
++	ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
+ 	err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEEN);
+ 	if (err) {
+-		ssb_printk(KERN_NOTICE PFX
+-			   "Could not enable SPROM write access.\n");
++		ssb_notice("Could not enable SPROM write access\n");
+ 		return -EBUSY;
+ 	}
+-	ssb_printk(KERN_NOTICE PFX "[ 0%%");
++	ssb_notice("[ 0%%");
+ 	msleep(500);
+ 	for (i = 0; i < size; i++) {
+ 		if (i == size / 4)
+-			ssb_printk("25%%");
++			ssb_cont("25%%");
+ 		else if (i == size / 2)
+-			ssb_printk("50%%");
++			ssb_cont("50%%");
+ 		else if (i == (size * 3) / 4)
+-			ssb_printk("75%%");
++			ssb_cont("75%%");
+ 		else if (i % 2)
+-			ssb_printk(".");
++			ssb_cont(".");
+ 		err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
+ 		if (err) {
+-			ssb_printk(KERN_NOTICE PFX
+-				   "Failed to write to SPROM.\n");
++			ssb_notice("Failed to write to SPROM\n");
+ 			failed = 1;
+ 			break;
+ 		}
+ 	}
+ 	err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
+ 	if (err) {
+-		ssb_printk(KERN_NOTICE PFX
+-			   "Could not disable SPROM write access.\n");
++		ssb_notice("Could not disable SPROM write access\n");
+ 		failed = 1;
+ 	}
+ 	msleep(500);
+ 	if (!failed) {
+-		ssb_printk("100%% ]\n");
+-		ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
++		ssb_cont("100%% ]\n");
++		ssb_notice("SPROM written\n");
+ 	}
+ 
+ 	return failed ? -EBUSY : 0;
+@@ -700,7 +694,7 @@ static int ssb_pcmcia_do_get_invariants(
+ 	return -ENOSPC; /* continue with next entry */
+ 
+ error:
+-	ssb_printk(KERN_ERR PFX
++	ssb_err(
+ 		   "PCMCIA: Failed to fetch device invariants: %s\n",
+ 		   error_description);
+ 	return -ENODEV;
+@@ -722,7 +716,7 @@ int ssb_pcmcia_get_invariants(struct ssb
+ 	res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
+ 				ssb_pcmcia_get_mac, sprom);
+ 	if (res != 0) {
+-		ssb_printk(KERN_ERR PFX
++		ssb_err(
+ 			"PCMCIA: Failed to fetch MAC address\n");
+ 		return -ENODEV;
+ 	}
+@@ -733,7 +727,7 @@ int ssb_pcmcia_get_invariants(struct ssb
+ 	if ((res == 0) || (res == -ENOSPC))
+ 		return 0;
+ 
+-	ssb_printk(KERN_ERR PFX
++	ssb_err(
+ 			"PCMCIA: Failed to fetch device invariants\n");
+ 	return -ENODEV;
+ }
+@@ -843,6 +837,6 @@ int ssb_pcmcia_init(struct ssb_bus *bus)
+ 
+ 	return 0;
+ error:
+-	ssb_printk(KERN_ERR PFX "Failed to initialize PCMCIA host device\n");
++	ssb_err("Failed to initialize PCMCIA host device\n");
+ 	return err;
+ }
+--- a/drivers/ssb/scan.c
++++ b/drivers/ssb/scan.c
+@@ -125,8 +125,7 @@ static u16 pcidev_to_chipid(struct pci_d
+ 		chipid_fallback = 0x4401;
+ 		break;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "PCI-ID not in fallback list\n");
++		ssb_err("PCI-ID not in fallback list\n");
+ 	}
+ 
+ 	return chipid_fallback;
+@@ -152,8 +151,7 @@ static u8 chipid_to_nrcores(u16 chipid)
+ 	case 0x4704:
+ 		return 9;
+ 	default:
+-		ssb_printk(KERN_ERR PFX
+-			   "CHIPID not in nrcores fallback list\n");
++		ssb_err("CHIPID not in nrcores fallback list\n");
+ 	}
+ 
+ 	return 1;
+@@ -320,15 +318,13 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 			bus->chip_package = 0;
+ 		}
+ 	}
+-	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
+-		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
+-		   bus->chip_package);
++	ssb_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
++		 bus->chip_id, bus->chip_rev, bus->chip_package);
+ 	if (!bus->nr_devices)
+ 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
+ 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
+-		ssb_printk(KERN_ERR PFX
+-			   "More than %d ssb cores found (%d)\n",
+-			   SSB_MAX_NR_CORES, bus->nr_devices);
++		ssb_err("More than %d ssb cores found (%d)\n",
++			SSB_MAX_NR_CORES, bus->nr_devices);
+ 		goto err_unmap;
+ 	}
+ 	if (bus->bustype == SSB_BUSTYPE_SSB) {
+@@ -370,8 +366,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 			nr_80211_cores++;
+ 			if (nr_80211_cores > 1) {
+ 				if (!we_support_multiple_80211_cores(bus)) {
+-					ssb_dprintk(KERN_INFO PFX "Ignoring additional "
+-						    "802.11 core\n");
++					ssb_dbg("Ignoring additional 802.11 core\n");
+ 					continue;
+ 				}
+ 			}
+@@ -379,8 +374,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 		case SSB_DEV_EXTIF:
+ #ifdef CONFIG_SSB_DRIVER_EXTIF
+ 			if (bus->extif.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple EXTIFs found\n");
++				ssb_warn("WARNING: Multiple EXTIFs found\n");
+ 				break;
+ 			}
+ 			bus->extif.dev = dev;
+@@ -388,8 +382,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 			break;
+ 		case SSB_DEV_CHIPCOMMON:
+ 			if (bus->chipco.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple ChipCommon found\n");
++				ssb_warn("WARNING: Multiple ChipCommon found\n");
+ 				break;
+ 			}
+ 			bus->chipco.dev = dev;
+@@ -398,8 +391,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 		case SSB_DEV_MIPS_3302:
+ #ifdef CONFIG_SSB_DRIVER_MIPS
+ 			if (bus->mipscore.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple MIPS cores found\n");
++				ssb_warn("WARNING: Multiple MIPS cores found\n");
+ 				break;
+ 			}
+ 			bus->mipscore.dev = dev;
+@@ -420,8 +412,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+ 				}
+ 			}
+ 			if (bus->pcicore.dev) {
+-				ssb_printk(KERN_WARNING PFX
+-					   "WARNING: Multiple PCI(E) cores found\n");
++				ssb_warn("WARNING: Multiple PCI(E) cores found\n");
+ 				break;
+ 			}
+ 			bus->pcicore.dev = dev;
+--- a/drivers/ssb/sprom.c
++++ b/drivers/ssb/sprom.c
+@@ -54,7 +54,7 @@ static int hex2sprom(u16 *sprom, const c
+ 	while (cnt < sprom_size_words) {
+ 		memcpy(tmp, dump, 4);
+ 		dump += 4;
+-		err = strict_strtoul(tmp, 16, &parsed);
++		err = kstrtoul(tmp, 16, &parsed);
+ 		if (err)
+ 			return err;
+ 		sprom[cnt++] = swab16((u16)parsed);
+@@ -127,13 +127,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
+ 		goto out_kfree;
+ 	err = ssb_devices_freeze(bus, &freeze);
+ 	if (err) {
+-		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
++		ssb_err("SPROM write: Could not freeze all devices\n");
+ 		goto out_unlock;
+ 	}
+ 	res = sprom_write(bus, sprom);
+ 	err = ssb_devices_thaw(&freeze);
+ 	if (err)
+-		ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
++		ssb_err("SPROM write: Could not thaw all devices\n");
+ out_unlock:
+ 	mutex_unlock(&bus->sprom_mutex);
+ out_kfree:
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
+@@ -9,16 +9,27 @@
+ #define PFX	"ssb: "
+ 
+ #ifdef CONFIG_SSB_SILENT
+-# define ssb_printk(fmt, x...)	do { /* nothing */ } while (0)
++# define ssb_printk(fmt, ...)					\
++	do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
+ #else
+-# define ssb_printk		printk
++# define ssb_printk(fmt, ...)					\
++	printk(fmt, ##__VA_ARGS__)
+ #endif /* CONFIG_SSB_SILENT */
+ 
++#define ssb_emerg(fmt, ...)	ssb_printk(KERN_EMERG PFX fmt, ##__VA_ARGS__)
++#define ssb_err(fmt, ...)	ssb_printk(KERN_ERR PFX fmt, ##__VA_ARGS__)
++#define ssb_warn(fmt, ...)	ssb_printk(KERN_WARNING PFX fmt, ##__VA_ARGS__)
++#define ssb_notice(fmt, ...)	ssb_printk(KERN_NOTICE PFX fmt, ##__VA_ARGS__)
++#define ssb_info(fmt, ...)	ssb_printk(KERN_INFO PFX fmt, ##__VA_ARGS__)
++#define ssb_cont(fmt, ...)	ssb_printk(KERN_CONT fmt, ##__VA_ARGS__)
++
+ /* dprintk: Debugging printk; vanishes for non-debug compilation */
+ #ifdef CONFIG_SSB_DEBUG
+-# define ssb_dprintk(fmt, x...)	ssb_printk(fmt , ##x)
++# define ssb_dbg(fmt, ...)					\
++	ssb_printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__)
+ #else
+-# define ssb_dprintk(fmt, x...)	do { /* nothing */ } while (0)
++# define ssb_dbg(fmt, ...)					\
++	do { if (0) printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__); } while (0)
+ #endif
+ 
+ #ifdef CONFIG_SSB_DEBUG
+@@ -217,6 +228,25 @@ extern u32 ssb_chipco_watchdog_timer_set
+ 					     u32 ticks);
+ extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
+ 
++/* driver_chipcommon_sflash.c */
++#ifdef CONFIG_SSB_SFLASH
++int ssb_sflash_init(struct ssb_chipcommon *cc);
++#else
++static inline int ssb_sflash_init(struct ssb_chipcommon *cc)
++{
++	pr_err("Serial flash not supported\n");
++	return 0;
++}
++#endif /* CONFIG_SSB_SFLASH */
++
++#ifdef CONFIG_SSB_DRIVER_MIPS
++extern struct platform_device ssb_pflash_dev;
++#endif
++
++#ifdef CONFIG_SSB_SFLASH
++extern struct platform_device ssb_sflash_dev;
++#endif
++
+ #ifdef CONFIG_SSB_DRIVER_EXTIF
+ extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);
+ extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -26,13 +26,14 @@ struct ssb_sprom_core_pwr_info {
+ 
+ struct ssb_sprom {
+ 	u8 revision;
+-	u8 il0mac[6];		/* MAC address for 802.11b/g */
+-	u8 et0mac[6];		/* MAC address for Ethernet */
+-	u8 et1mac[6];		/* MAC address for 802.11a */
++	u8 il0mac[6] __aligned(sizeof(u16));	/* MAC address for 802.11b/g */
++	u8 et0mac[6] __aligned(sizeof(u16));	/* MAC address for Ethernet */
++	u8 et1mac[6] __aligned(sizeof(u16));	/* MAC address for 802.11a */
+ 	u8 et0phyaddr;		/* MII address for enet0 */
+ 	u8 et1phyaddr;		/* MII address for enet1 */
+ 	u8 et0mdcport;		/* MDIO for enet0 */
+ 	u8 et1mdcport;		/* MDIO for enet1 */
++	u16 dev_id;		/* Device ID overriding e.g. PCI ID */
+ 	u16 board_rev;		/* Board revision number from SPROM. */
+ 	u16 board_num;		/* Board number from SPROM. */
+ 	u16 board_type;		/* Board type from SPROM. */
+@@ -340,13 +341,61 @@ enum ssb_bustype {
+ #define SSB_BOARDVENDOR_DELL	0x1028	/* Dell */
+ #define SSB_BOARDVENDOR_HP	0x0E11	/* HP */
+ /* board_type */
++#define SSB_BOARD_BCM94301CB	0x0406
++#define SSB_BOARD_BCM94301MP	0x0407
++#define SSB_BOARD_BU4309	0x040A
++#define SSB_BOARD_BCM94309CB	0x040B
++#define SSB_BOARD_BCM4309MP	0x040C
++#define SSB_BOARD_BU4306	0x0416
+ #define SSB_BOARD_BCM94306MP	0x0418
+ #define SSB_BOARD_BCM4309G	0x0421
+ #define SSB_BOARD_BCM4306CB	0x0417
+-#define SSB_BOARD_BCM4309MP	0x040C
++#define SSB_BOARD_BCM94306PC	0x0425	/* pcmcia 3.3v 4306 card */
++#define SSB_BOARD_BCM94306CBSG	0x042B	/* with SiGe PA */
++#define SSB_BOARD_PCSG94306	0x042D	/* with SiGe PA */
++#define SSB_BOARD_BU4704SD	0x042E	/* with sdram */
++#define SSB_BOARD_BCM94704AGR	0x042F	/* dual 11a/11g Router */
++#define SSB_BOARD_BCM94308MP	0x0430	/* 11a-only minipci */
++#define SSB_BOARD_BU4318	0x0447
++#define SSB_BOARD_CB4318	0x0448
++#define SSB_BOARD_MPG4318	0x0449
+ #define SSB_BOARD_MP4318	0x044A
+-#define SSB_BOARD_BU4306	0x0416
+-#define SSB_BOARD_BU4309	0x040A
++#define SSB_BOARD_SD4318	0x044B
++#define SSB_BOARD_BCM94306P	0x044C	/* with SiGe */
++#define SSB_BOARD_BCM94303MP	0x044E
++#define SSB_BOARD_BCM94306MPM	0x0450
++#define SSB_BOARD_BCM94306MPL	0x0453
++#define SSB_BOARD_PC4303	0x0454	/* pcmcia */
++#define SSB_BOARD_BCM94306MPLNA	0x0457
++#define SSB_BOARD_BCM94306MPH	0x045B
++#define SSB_BOARD_BCM94306PCIV	0x045C
++#define SSB_BOARD_BCM94318MPGH	0x0463
++#define SSB_BOARD_BU4311	0x0464
++#define SSB_BOARD_BCM94311MC	0x0465
++#define SSB_BOARD_BCM94311MCAG	0x0466
++/* 4321 boards */
++#define SSB_BOARD_BU4321	0x046B
++#define SSB_BOARD_BU4321E	0x047C
++#define SSB_BOARD_MP4321	0x046C
++#define SSB_BOARD_CB2_4321	0x046D
++#define SSB_BOARD_CB2_4321_AG	0x0066
++#define SSB_BOARD_MC4321	0x046E
++/* 4325 boards */
++#define SSB_BOARD_BCM94325DEVBU	0x0490
++#define SSB_BOARD_BCM94325BGABU	0x0491
++#define SSB_BOARD_BCM94325SDGWB	0x0492
++#define SSB_BOARD_BCM94325SDGMDL	0x04AA
++#define SSB_BOARD_BCM94325SDGMDL2	0x04C6
++#define SSB_BOARD_BCM94325SDGMDL3	0x04C9
++#define SSB_BOARD_BCM94325SDABGWBA	0x04E1
++/* 4322 boards */
++#define SSB_BOARD_BCM94322MC	0x04A4
++#define SSB_BOARD_BCM94322USB	0x04A8	/* dualband */
++#define SSB_BOARD_BCM94322HM	0x04B0
++#define SSB_BOARD_BCM94322USB2D	0x04Bf	/* single band discrete front end */
++/* 4312 boards */
++#define SSB_BOARD_BU4312	0x048A
++#define SSB_BOARD_BCM4312MCGSG	0x04B5
+ /* chip_package */
+ #define SSB_CHIPPACK_BCM4712S	1	/* Small 200pin 4712 */
+ #define SSB_CHIPPACK_BCM4712M	2	/* Medium 225pin 4712 */
+--- a/include/linux/ssb/ssb_driver_gige.h
++++ b/include/linux/ssb/ssb_driver_gige.h
+@@ -97,21 +97,16 @@ static inline bool ssb_gige_must_flush_p
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_BCM47XX
+-#include <asm/mach-bcm47xx/nvram.h>
+ /* Get the device MAC address */
+-static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+-{
+-	char buf[20];
+-	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
+-		return;
+-	nvram_parse_macaddr(buf, macaddr);
+-}
+-#else
+-static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
++static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+ {
++	struct ssb_gige *dev = pdev_to_ssb_gige(pdev);
++	if (!dev)
++		return -ENODEV;
++
++	memcpy(macaddr, dev->dev->bus->sprom.et0mac, 6);
++	return 0;
+ }
+-#endif
+ 
+ extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
+ 					  struct pci_dev *pdev);
+@@ -175,6 +170,10 @@ static inline bool ssb_gige_must_flush_p
+ {
+ 	return 0;
+ }
++static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
++{
++	return -ENODEV;
++}
+ 
+ #endif /* CONFIG_SSB_DRIVER_GIGE */
+ #endif /* LINUX_SSB_DRIVER_GIGE_H_ */
+--- a/include/linux/ssb/ssb_driver_mips.h
++++ b/include/linux/ssb/ssb_driver_mips.h
+@@ -20,6 +20,18 @@ struct ssb_pflash {
+ 	u32 window_size;
+ };
+ 
++#ifdef CONFIG_SSB_SFLASH
++struct ssb_sflash {
++	bool present;
++	u32 window;
++	u32 blocksize;
++	u16 numblocks;
++	u32 size;
++
++	void *priv;
++};
++#endif
++
+ struct ssb_mipscore {
+ 	struct ssb_device *dev;
+ 
+@@ -27,6 +39,9 @@ struct ssb_mipscore {
+ 	struct ssb_serial_port serial_ports[4];
+ 
+ 	struct ssb_pflash pflash;
++#ifdef CONFIG_SSB_SFLASH
++	struct ssb_sflash sflash;
++#endif
+ };
+ 
+ extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
+@@ -45,6 +60,11 @@ void ssb_mipscore_init(struct ssb_mipsco
+ {
+ }
+ 
++static inline unsigned int ssb_mips_irq(struct ssb_device *dev)
++{
++	return 0;
++}
++
+ #endif /* CONFIG_SSB_DRIVER_MIPS */
+ 
+ #endif /* LINUX_SSB_MIPSCORE_H_ */
+--- a/include/linux/ssb/ssb_regs.h
++++ b/include/linux/ssb/ssb_regs.h
+@@ -172,6 +172,7 @@
+ #define SSB_SPROMSIZE_WORDS_R4		220
+ #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
+ #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
++#define SSB_SPROMSIZE_WORDS_R10		230
+ #define SSB_SPROM_BASE1			0x1000
+ #define SSB_SPROM_BASE31		0x0800
+ #define SSB_SPROM_REVISION		0x007E
+@@ -289,11 +290,11 @@
+ #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
+ #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
+ #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
+-#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
+-#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
+-#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
+-#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
+-#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
++#define SSB_SPROM4_ANTAVAIL		0x005C  /* Antenna available bitfields */
++#define  SSB_SPROM4_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	0
++#define  SSB_SPROM4_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
++#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	8
+ #define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
+ #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
+ #define  SSB_SPROM4_AGAIN0_SHIFT	0
+--- a/arch/mips/bcm47xx/sprom.c
++++ b/arch/mips/bcm47xx/sprom.c
+@@ -168,6 +168,7 @@ static void nvram_read_alpha2(const char
+ static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
+ 					const char *prefix, bool fallback)
+ {
++	nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
+ 	nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);
diff --git a/trunk/target/linux/generic/patches-3.8/025-bcma_backport.patch b/trunk/target/linux/generic/patches-3.8/025-bcma_backport.patch
new file mode 100644
index 00000000..21cffb1e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/025-bcma_backport.patch
@@ -0,0 +1,1988 @@
+--- a/arch/mips/bcm47xx/serial.c
++++ b/arch/mips/bcm47xx/serial.c
+@@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(voi
+ 
+ 		p->mapbase = (unsigned int) bcma_port->regs;
+ 		p->membase = (void *) bcma_port->regs;
+-		p->irq = bcma_port->irq + 2;
++		p->irq = bcma_port->irq;
+ 		p->uartclk = bcma_port->baud_base;
+ 		p->regshift = bcma_port->reg_shift;
+ 		p->iotype = UPIO_MEM;
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -26,6 +26,7 @@ config BCMA_HOST_PCI_POSSIBLE
+ config BCMA_HOST_PCI
+ 	bool "Support for BCMA on PCI-host bus"
+ 	depends on BCMA_HOST_PCI_POSSIBLE
++	default y
+ 
+ config BCMA_DRIVER_PCI_HOSTMODE
+ 	bool "Driver for PCI core working in hostmode"
+@@ -34,8 +35,14 @@ config BCMA_DRIVER_PCI_HOSTMODE
+ 	  PCI core hostmode operation (external PCI bus).
+ 
+ config BCMA_HOST_SOC
+-	bool
+-	depends on BCMA_DRIVER_MIPS
++	bool "Support for BCMA in a SoC"
++	depends on BCMA
++	help
++	  Host interface for a Broadcom AIX bus directly mapped into
++	  the memory. This only works with the Broadcom SoCs from the
++	  BCM47XX line.
++
++	  If unsure, say N
+ 
+ config BCMA_DRIVER_MIPS
+ 	bool "BCMA Broadcom MIPS core driver"
+--- a/drivers/bcma/bcma_private.h
++++ b/drivers/bcma/bcma_private.h
+@@ -22,6 +22,8 @@
+ struct bcma_bus;
+ 
+ /* main.c */
++bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
++		     int timeout);
+ int bcma_bus_register(struct bcma_bus *bus);
+ void bcma_bus_unregister(struct bcma_bus *bus);
+ int __init bcma_bus_early_register(struct bcma_bus *bus,
+@@ -31,6 +33,8 @@ int __init bcma_bus_early_register(struc
+ int bcma_bus_suspend(struct bcma_bus *bus);
+ int bcma_bus_resume(struct bcma_bus *bus);
+ #endif
++struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
++					u8 unit);
+ 
+ /* scan.c */
+ int bcma_bus_scan(struct bcma_bus *bus);
+@@ -45,6 +49,7 @@ int bcma_sprom_get(struct bcma_bus *bus)
+ /* driver_chipcommon.c */
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+ void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
++extern struct platform_device bcma_pflash_dev;
+ #endif /* CONFIG_BCMA_DRIVER_MIPS */
+ 
+ /* driver_chipcommon_pmu.c */
+--- a/drivers/bcma/core.c
++++ b/drivers/bcma/core.c
+@@ -9,6 +9,25 @@
+ #include <linux/export.h>
+ #include <linux/bcma/bcma.h>
+ 
++static bool bcma_core_wait_value(struct bcma_device *core, u16 reg, u32 mask,
++				 u32 value, int timeout)
++{
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
++
++	do {
++		val = bcma_aread32(core, reg);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);
++
++	return false;
++}
++
+ bool bcma_core_is_enabled(struct bcma_device *core)
+ {
+ 	if ((bcma_aread32(core, BCMA_IOCTL) & (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC))
+@@ -25,13 +44,15 @@ void bcma_core_disable(struct bcma_devic
+ 	if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)
+ 		return;
+ 
+-	bcma_awrite32(core, BCMA_IOCTL, flags);
+-	bcma_aread32(core, BCMA_IOCTL);
+-	udelay(10);
++	bcma_core_wait_value(core, BCMA_RESET_ST, ~0, 0, 300);
+ 
+ 	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
+ 	bcma_aread32(core, BCMA_RESET_CTL);
+ 	udelay(1);
++
++	bcma_awrite32(core, BCMA_IOCTL, flags);
++	bcma_aread32(core, BCMA_IOCTL);
++	udelay(10);
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_disable);
+ 
+@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device
+ 	bcma_aread32(core, BCMA_IOCTL);
+ 
+ 	bcma_awrite32(core, BCMA_RESET_CTL, 0);
++	bcma_aread32(core, BCMA_RESET_CTL);
+ 	udelay(1);
+ 
+ 	bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));
+@@ -104,7 +126,13 @@ void bcma_core_pll_ctl(struct bcma_devic
+ 		if (i)
+ 			bcma_err(core->bus, "PLL enable timeout\n");
+ 	} else {
+-		bcma_warn(core->bus, "Disabling PLL not supported yet!\n");
++		/*
++		 * Mask the PLL but don't wait for it to be disabled. PLL may be
++		 * shared between cores and will be still up if there is another
++		 * core using it.
++		 */
++		bcma_mask32(core, BCMA_CLKCTLST, ~req);
++		bcma_read32(core, BCMA_CLKCTLST);
+ 	}
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
+--- a/drivers/bcma/driver_chipcommon.c
++++ b/drivers/bcma/driver_chipcommon.c
+@@ -25,13 +25,14 @@ static inline u32 bcma_cc_write32_masked
+ 	return value;
+ }
+ 
+-static u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)
++u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)
+ {
+ 	if (cc->capabilities & BCMA_CC_CAP_PMU)
+ 		return bcma_pmu_get_alp_clock(cc);
+ 
+ 	return 20000000;
+ }
++EXPORT_SYMBOL_GPL(bcma_chipco_get_alp_clock);
+ 
+ static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc)
+ {
+@@ -139,8 +140,15 @@ void bcma_core_chipcommon_init(struct bc
+ 	bcma_core_chipcommon_early_init(cc);
+ 
+ 	if (cc->core->id.rev >= 20) {
+-		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, 0);
+-		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, 0);
++		u32 pullup = 0, pulldown = 0;
++
++		if (cc->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM43142) {
++			pullup = 0x402e0;
++			pulldown = 0x20500;
++		}
++
++		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, pullup);
++		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, pulldown);
+ 	}
+ 
+ 	if (cc->capabilities & BCMA_CC_CAP_PMU)
+@@ -213,6 +221,7 @@ u32 bcma_chipco_gpio_out(struct bcma_drv
+ 
+ 	return res;
+ }
++EXPORT_SYMBOL_GPL(bcma_chipco_gpio_out);
+ 
+ u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)
+ {
+@@ -225,6 +234,7 @@ u32 bcma_chipco_gpio_outen(struct bcma_d
+ 
+ 	return res;
+ }
++EXPORT_SYMBOL_GPL(bcma_chipco_gpio_outen);
+ 
+ /*
+  * If the bit is set to 0, chipcommon controlls this GPIO,
+@@ -329,7 +339,7 @@ void bcma_chipco_serial_init(struct bcma
+ 		return;
+ 	}
+ 
+-	irq = bcma_core_mips_irq(cc->core);
++	irq = bcma_core_irq(cc->core);
+ 
+ 	/* Determine the registers of the UARTs */
+ 	cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
+--- a/drivers/bcma/driver_chipcommon_nflash.c
++++ b/drivers/bcma/driver_chipcommon_nflash.c
+@@ -5,11 +5,11 @@
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
++#include "bcma_private.h"
++
+ #include <linux/platform_device.h>
+ #include <linux/bcma/bcma.h>
+ 
+-#include "bcma_private.h"
+-
+ struct platform_device bcma_nflash_dev = {
+ 	.name		= "bcma_nflash",
+ 	.num_resources	= 0,
+--- a/drivers/bcma/driver_chipcommon_pmu.c
++++ b/drivers/bcma/driver_chipcommon_pmu.c
+@@ -56,6 +56,109 @@ void bcma_chipco_regctl_maskset(struct b
+ }
+ EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset);
+ 
++static u32 bcma_pmu_xtalfreq(struct bcma_drv_cc *cc)
++{
++	u32 ilp_ctl, alp_hz;
++
++	if (!(bcma_cc_read32(cc, BCMA_CC_PMU_STAT) &
++	      BCMA_CC_PMU_STAT_EXT_LPO_AVAIL))
++		return 0;
++
++	bcma_cc_write32(cc, BCMA_CC_PMU_XTAL_FREQ,
++			BIT(BCMA_CC_PMU_XTAL_FREQ_MEASURE_SHIFT));
++	usleep_range(1000, 2000);
++
++	ilp_ctl = bcma_cc_read32(cc, BCMA_CC_PMU_XTAL_FREQ);
++	ilp_ctl &= BCMA_CC_PMU_XTAL_FREQ_ILPCTL_MASK;
++
++	bcma_cc_write32(cc, BCMA_CC_PMU_XTAL_FREQ, 0);
++
++	alp_hz = ilp_ctl * 32768 / 4;
++	return (alp_hz + 50000) / 100000 * 100;
++}
++
++static void bcma_pmu2_pll_init0(struct bcma_drv_cc *cc, u32 xtalfreq)
++{
++	struct bcma_bus *bus = cc->core->bus;
++	u32 freq_tgt_target = 0, freq_tgt_current;
++	u32 pll0, mask;
++
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		/* pmu2_xtaltab0_adfll_485 */
++		switch (xtalfreq) {
++		case 12000:
++			freq_tgt_target = 0x50D52;
++			break;
++		case 20000:
++			freq_tgt_target = 0x307FE;
++			break;
++		case 26000:
++			freq_tgt_target = 0x254EA;
++			break;
++		case 37400:
++			freq_tgt_target = 0x19EF8;
++			break;
++		case 52000:
++			freq_tgt_target = 0x12A75;
++			break;
++		}
++		break;
++	}
++
++	if (!freq_tgt_target) {
++		bcma_err(bus, "Unknown TGT frequency for xtalfreq %d\n",
++			 xtalfreq);
++		return;
++	}
++
++	pll0 = bcma_chipco_pll_read(cc, BCMA_CC_PMU15_PLL_PLLCTL0);
++	freq_tgt_current = (pll0 & BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK) >>
++		BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT;
++
++	if (freq_tgt_current == freq_tgt_target) {
++		bcma_debug(bus, "Target TGT frequency already set\n");
++		return;
++	}
++
++	/* Turn off PLL */
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		mask = (u32)~(BCMA_RES_4314_HT_AVAIL |
++			      BCMA_RES_4314_MACPHY_CLK_AVAIL);
++
++		bcma_cc_mask32(cc, BCMA_CC_PMU_MINRES_MSK, mask);
++		bcma_cc_mask32(cc, BCMA_CC_PMU_MAXRES_MSK, mask);
++		bcma_wait_value(cc->core, BCMA_CLKCTLST,
++				BCMA_CLKCTLST_HAVEHT, 0, 20000);
++		break;
++	}
++
++	pll0 &= ~BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK;
++	pll0 |= freq_tgt_target << BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT;
++	bcma_chipco_pll_write(cc, BCMA_CC_PMU15_PLL_PLLCTL0, pll0);
++
++	/* Flush */
++	if (cc->pmu.rev >= 2)
++		bcma_cc_set32(cc, BCMA_CC_PMU_CTL, BCMA_CC_PMU_CTL_PLL_UPD);
++
++	/* TODO: Do we need to update OTP? */
++}
++
++static void bcma_pmu_pll_init(struct bcma_drv_cc *cc)
++{
++	struct bcma_bus *bus = cc->core->bus;
++	u32 xtalfreq = bcma_pmu_xtalfreq(cc);
++
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM43142:
++		if (xtalfreq == 0)
++			xtalfreq = 20000;
++		bcma_pmu2_pll_init0(cc, xtalfreq);
++		break;
++	}
++}
++
+ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+@@ -66,6 +169,25 @@ static void bcma_pmu_resources_init(stru
+ 		min_msk = 0x200D;
+ 		max_msk = 0xFFFF;
+ 		break;
++	case BCMA_CHIP_ID_BCM43142:
++		min_msk = BCMA_RES_4314_LPLDO_PU |
++			  BCMA_RES_4314_PMU_SLEEP_DIS |
++			  BCMA_RES_4314_PMU_BG_PU |
++			  BCMA_RES_4314_CBUCK_LPOM_PU |
++			  BCMA_RES_4314_CBUCK_PFM_PU |
++			  BCMA_RES_4314_CLDO_PU |
++			  BCMA_RES_4314_LPLDO2_LVM |
++			  BCMA_RES_4314_WL_PMU_PU |
++			  BCMA_RES_4314_LDO3P3_PU |
++			  BCMA_RES_4314_OTP_PU |
++			  BCMA_RES_4314_WL_PWRSW_PU |
++			  BCMA_RES_4314_LQ_AVAIL |
++			  BCMA_RES_4314_LOGIC_RET |
++			  BCMA_RES_4314_MEM_SLEEP |
++			  BCMA_RES_4314_MACPHY_RET |
++			  BCMA_RES_4314_WL_CORE_READY;
++		max_msk = 0x3FFFFFFF;
++		break;
+ 	default:
+ 		bcma_debug(bus, "PMU resource config unknown or not needed for device 0x%04X\n",
+ 			   bus->chipinfo.id);
+@@ -165,6 +287,7 @@ void bcma_pmu_init(struct bcma_drv_cc *c
+ 		bcma_cc_set32(cc, BCMA_CC_PMU_CTL,
+ 			     BCMA_CC_PMU_CTL_NOILPONW);
+ 
++	bcma_pmu_pll_init(cc);
+ 	bcma_pmu_resources_init(cc);
+ 	bcma_pmu_workarounds(cc);
+ }
+@@ -174,19 +297,35 @@ u32 bcma_pmu_get_alp_clock(struct bcma_d
+ 	struct bcma_bus *bus = cc->core->bus;
+ 
+ 	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM4313:
++	case BCMA_CHIP_ID_BCM43224:
++	case BCMA_CHIP_ID_BCM43225:
++	case BCMA_CHIP_ID_BCM43227:
++	case BCMA_CHIP_ID_BCM43228:
++	case BCMA_CHIP_ID_BCM4331:
++	case BCMA_CHIP_ID_BCM43421:
++	case BCMA_CHIP_ID_BCM43428:
++	case BCMA_CHIP_ID_BCM43431:
+ 	case BCMA_CHIP_ID_BCM4716:
+-	case BCMA_CHIP_ID_BCM4748:
+ 	case BCMA_CHIP_ID_BCM47162:
+-	case BCMA_CHIP_ID_BCM4313:
+-	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM4748:
+ 	case BCMA_CHIP_ID_BCM4749:
++	case BCMA_CHIP_ID_BCM5357:
+ 	case BCMA_CHIP_ID_BCM53572:
++	case BCMA_CHIP_ID_BCM6362:
+ 		/* always 20Mhz */
+ 		return 20000 * 1000;
+-	case BCMA_CHIP_ID_BCM5356:
+ 	case BCMA_CHIP_ID_BCM4706:
++	case BCMA_CHIP_ID_BCM5356:
+ 		/* always 25Mhz */
+ 		return 25000 * 1000;
++	case BCMA_CHIP_ID_BCM43460:
++	case BCMA_CHIP_ID_BCM4352:
++	case BCMA_CHIP_ID_BCM4360:
++		if (cc->status & BCMA_CC_CHIPST_4360_XTAL_40MZ)
++			return 40000 * 1000;
++		else
++			return 20000 * 1000;
+ 	default:
+ 		bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
+ 			  bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
+@@ -264,7 +403,7 @@ static u32 bcma_pmu_pll_clock_bcm4706(st
+ }
+ 
+ /* query bus clock frequency for PMU-enabled chipcommon */
+-static u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc)
++u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc)
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+ 
+@@ -293,6 +432,7 @@ static u32 bcma_pmu_get_bus_clock(struct
+ 	}
+ 	return BCMA_CC_PMU_HT_CLOCK;
+ }
++EXPORT_SYMBOL_GPL(bcma_pmu_get_bus_clock);
+ 
+ /* query cpu clock frequency for PMU-enabled chipcommon */
+ u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc)
+@@ -372,7 +512,7 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 		tmp |= (bcm5357_bcm43236_ndiv[spuravoid]) << BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT;
+ 		bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, tmp);
+ 
+-		tmp = 1 << 10;
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
+ 		break;
+ 
+ 	case BCMA_CHIP_ID_BCM4331:
+@@ -393,7 +533,7 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL2,
+ 						     0x03000a08);
+ 		}
+-		tmp = 1 << 10;
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
+ 		break;
+ 
+ 	case BCMA_CHIP_ID_BCM43224:
+@@ -426,7 +566,7 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
+ 						     0x88888815);
+ 		}
+-		tmp = 1 << 10;
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
+ 		break;
+ 
+ 	case BCMA_CHIP_ID_BCM4716:
+@@ -460,7 +600,7 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 						     0x88888815);
+ 		}
+ 
+-		tmp = 3 << 9;
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW;
+ 		break;
+ 
+ 	case BCMA_CHIP_ID_BCM43227:
+@@ -496,7 +636,7 @@ void bcma_pmu_spuravoid_pllupdate(struct
+ 			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL5,
+ 						     0x88888815);
+ 		}
+-		tmp = 1 << 10;
++		tmp = BCMA_CC_PMU_CTL_PLL_UPD;
+ 		break;
+ 	default:
+ 		bcma_err(bus, "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
+--- a/drivers/bcma/driver_chipcommon_sflash.c
++++ b/drivers/bcma/driver_chipcommon_sflash.c
+@@ -5,11 +5,11 @@
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
++#include "bcma_private.h"
++
+ #include <linux/platform_device.h>
+ #include <linux/bcma/bcma.h>
+ 
+-#include "bcma_private.h"
+-
+ static struct resource bcma_sflash_resource = {
+ 	.name	= "bcma_sflash",
+ 	.start	= BCMA_SOC_FLASH2,
+@@ -30,7 +30,7 @@ struct bcma_sflash_tbl_e {
+ 	u16 numblocks;
+ };
+ 
+-static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
++static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
+ 	{ "M25P20", 0x11, 0x10000, 4, },
+ 	{ "M25P40", 0x12, 0x10000, 8, },
+ 
+@@ -41,7 +41,7 @@ static struct bcma_sflash_tbl_e bcma_sfl
+ 	{ 0 },
+ };
+ 
+-static struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
++static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
+ 	{ "SST25WF512", 1, 0x1000, 16, },
+ 	{ "SST25VF512", 0x48, 0x1000, 16, },
+ 	{ "SST25WF010", 2, 0x1000, 32, },
+@@ -59,7 +59,7 @@ static struct bcma_sflash_tbl_e bcma_sfl
+ 	{ 0 },
+ };
+ 
+-static struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
++static const struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
+ 	{ "AT45DB011", 0xc, 256, 512, },
+ 	{ "AT45DB021", 0x14, 256, 1024, },
+ 	{ "AT45DB041", 0x1c, 256, 2048, },
+@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc
+ {
+ 	struct bcma_bus *bus = cc->core->bus;
+ 	struct bcma_sflash *sflash = &cc->sflash;
+-	struct bcma_sflash_tbl_e *e;
++	const struct bcma_sflash_tbl_e *e;
+ 	u32 id, id2;
+ 
+ 	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
+--- a/drivers/bcma/driver_gpio.c
++++ b/drivers/bcma/driver_gpio.c
+@@ -73,6 +73,16 @@ static void bcma_gpio_free(struct gpio_c
+ 	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
+ }
+ 
++static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
++{
++	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
++
++	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
++		return bcma_core_irq(cc->core);
++	else
++		return -EINVAL;
++}
++
+ int bcma_gpio_init(struct bcma_drv_cc *cc)
+ {
+ 	struct gpio_chip *chip = &cc->gpio;
+@@ -85,6 +95,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
+ 	chip->set		= bcma_gpio_set_value;
+ 	chip->direction_input	= bcma_gpio_direction_input;
+ 	chip->direction_output	= bcma_gpio_direction_output;
++	chip->to_irq		= bcma_gpio_to_irq;
+ 	chip->ngpio		= 16;
+ 	/* There is just one SoC in one device and its GPIO addresses should be
+ 	 * deterministic to address them more easily. The other buses could get
+--- a/drivers/bcma/driver_mips.c
++++ b/drivers/bcma/driver_mips.c
+@@ -14,11 +14,33 @@
+ 
+ #include <linux/bcma/bcma.h>
+ 
++#include <linux/mtd/physmap.h>
++#include <linux/platform_device.h>
+ #include <linux/serial.h>
+ #include <linux/serial_core.h>
+ #include <linux/serial_reg.h>
+ #include <linux/time.h>
+ 
++static const char *part_probes[] = { "bcm47xxpart", NULL };
++
++static struct physmap_flash_data bcma_pflash_data = {
++	.part_probe_types	= part_probes,
++};
++
++static struct resource bcma_pflash_resource = {
++	.name	= "bcma_pflash",
++	.flags  = IORESOURCE_MEM,
++};
++
++struct platform_device bcma_pflash_dev = {
++	.name		= "physmap-flash",
++	.dev		= {
++		.platform_data  = &bcma_pflash_data,
++	},
++	.resource	= &bcma_pflash_resource,
++	.num_resources	= 1,
++};
++
+ /* The 47162a0 hangs when reading MIPS DMP registers registers */
+ static inline bool bcma_core_mips_bcm47162a0_quirk(struct bcma_device *dev)
+ {
+@@ -74,28 +96,41 @@ static u32 bcma_core_mips_irqflag(struct
+ 		return dev->core_index;
+ 	flag = bcma_aread32(dev, BCMA_MIPS_OOBSELOUTA30);
+ 
+-	return flag & 0x1F;
++	if (flag)
++		return flag & 0x1F;
++	else
++		return 0x3f;
+ }
+ 
+ /* Get the MIPS IRQ assignment for a specified device.
+  * If unassigned, 0 is returned.
++ * If disabled, 5 is returned.
++ * If not supported, 6 is returned.
+  */
+-unsigned int bcma_core_mips_irq(struct bcma_device *dev)
++static unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+ {
+ 	struct bcma_device *mdev = dev->bus->drv_mips.core;
+ 	u32 irqflag;
+ 	unsigned int irq;
+ 
+ 	irqflag = bcma_core_mips_irqflag(dev);
++	if (irqflag == 0x3f)
++		return 6;
+ 
+-	for (irq = 1; irq <= 4; irq++)
++	for (irq = 0; irq <= 4; irq++)
+ 		if (bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq)) &
+ 		    (1 << irqflag))
+ 			return irq;
+ 
+-	return 0;
++	return 5;
+ }
+-EXPORT_SYMBOL(bcma_core_mips_irq);
++
++unsigned int bcma_core_irq(struct bcma_device *dev)
++{
++	unsigned int mips_irq = bcma_core_mips_irq(dev);
++	return mips_irq <= 4 ? mips_irq + 2 : 0;
++}
++EXPORT_SYMBOL(bcma_core_irq);
+ 
+ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
+ {
+@@ -114,7 +149,7 @@ static void bcma_core_mips_set_irq(struc
+ 		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0),
+ 			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
+ 			    ~(1 << irqflag));
+-	else
++	else if (oldirq != 5)
+ 		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);
+ 
+ 	/* assign the new one */
+@@ -123,9 +158,9 @@ static void bcma_core_mips_set_irq(struc
+ 			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) |
+ 			    (1 << irqflag));
+ 	} else {
+-		u32 oldirqflag = bcma_read32(mdev,
+-					     BCMA_MIPS_MIPS74K_INTMASK(irq));
+-		if (oldirqflag) {
++		u32 irqinitmask = bcma_read32(mdev,
++					      BCMA_MIPS_MIPS74K_INTMASK(irq));
++		if (irqinitmask) {
+ 			struct bcma_device *core;
+ 
+ 			/* backplane irq line is in use, find out who uses
+@@ -133,7 +168,7 @@ static void bcma_core_mips_set_irq(struc
+ 			 */
+ 			list_for_each_entry(core, &bus->cores, list) {
+ 				if ((1 << bcma_core_mips_irqflag(core)) ==
+-				    oldirqflag) {
++				    irqinitmask) {
+ 					bcma_core_mips_set_irq(core, 0);
+ 					break;
+ 				}
+@@ -143,15 +178,31 @@ static void bcma_core_mips_set_irq(struc
+ 			     1 << irqflag);
+ 	}
+ 
+-	bcma_info(bus, "set_irq: core 0x%04x, irq %d => %d\n",
+-		  dev->id.id, oldirq + 2, irq + 2);
++	bcma_debug(bus, "set_irq: core 0x%04x, irq %d => %d\n",
++		   dev->id.id, oldirq <= 4 ? oldirq + 2 : 0, irq + 2);
++}
++
++static void bcma_core_mips_set_irq_name(struct bcma_bus *bus, unsigned int irq,
++					u16 coreid, u8 unit)
++{
++	struct bcma_device *core;
++
++	core = bcma_find_core_unit(bus, coreid, unit);
++	if (!core) {
++		bcma_warn(bus,
++			  "Can not find core (id: 0x%x, unit %i) for IRQ configuration.\n",
++			  coreid, unit);
++		return;
++	}
++
++	bcma_core_mips_set_irq(core, irq);
+ }
+ 
+ static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq)
+ {
+ 	int i;
+ 	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
+-	printk(KERN_INFO KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
++	printk(KERN_DEBUG KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
+ 	for (i = 0; i <= 6; i++)
+ 		printk(" %s%s", irq_name[i], i == irq ? "*" : " ");
+ 	printk("\n");
+@@ -182,6 +233,7 @@ static void bcma_core_mips_flash_detect(
+ {
+ 	struct bcma_bus *bus = mcore->core->bus;
+ 	struct bcma_drv_cc *cc = &bus->drv_cc;
++	struct bcma_pflash *pflash = &cc->pflash;
+ 
+ 	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
+ 	case BCMA_CC_FLASHT_STSER:
+@@ -191,15 +243,20 @@ static void bcma_core_mips_flash_detect(
+ 		break;
+ 	case BCMA_CC_FLASHT_PARA:
+ 		bcma_debug(bus, "Found parallel flash\n");
+-		cc->pflash.present = true;
+-		cc->pflash.window = BCMA_SOC_FLASH2;
+-		cc->pflash.window_size = BCMA_SOC_FLASH2_SZ;
++		pflash->present = true;
++		pflash->window = BCMA_SOC_FLASH2;
++		pflash->window_size = BCMA_SOC_FLASH2_SZ;
+ 
+ 		if ((bcma_read32(cc->core, BCMA_CC_FLASH_CFG) &
+ 		     BCMA_CC_FLASH_CFG_DS) == 0)
+-			cc->pflash.buswidth = 1;
++			pflash->buswidth = 1;
+ 		else
+-			cc->pflash.buswidth = 2;
++			pflash->buswidth = 2;
++
++		bcma_pflash_data.width = pflash->buswidth;
++		bcma_pflash_resource.start = pflash->window;
++		bcma_pflash_resource.end = pflash->window + pflash->window_size;
++
+ 		break;
+ 	default:
+ 		bcma_err(bus, "Flash type not supported\n");
+@@ -227,6 +284,32 @@ void bcma_core_mips_early_init(struct bc
+ 	mcore->early_setup_done = true;
+ }
+ 
++static void bcma_fix_i2s_irqflag(struct bcma_bus *bus)
++{
++	struct bcma_device *cpu, *pcie, *i2s;
++
++	/* Fixup the interrupts in 4716/4748 for i2s core (2010 Broadcom SDK)
++	 * (IRQ flags > 7 are ignored when setting the interrupt masks)
++	 */
++	if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4716 &&
++	    bus->chipinfo.id != BCMA_CHIP_ID_BCM4748)
++		return;
++
++	cpu = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
++	pcie = bcma_find_core(bus, BCMA_CORE_PCIE);
++	i2s = bcma_find_core(bus, BCMA_CORE_I2S);
++	if (cpu && pcie && i2s &&
++	    bcma_aread32(cpu, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
++	    bcma_aread32(pcie, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
++	    bcma_aread32(i2s, BCMA_MIPS_OOBSELOUTA30) == 0x88) {
++		bcma_awrite32(cpu, BCMA_MIPS_OOBSELINA74, 0x07060504);
++		bcma_awrite32(pcie, BCMA_MIPS_OOBSELINA74, 0x07060504);
++		bcma_awrite32(i2s, BCMA_MIPS_OOBSELOUTA30, 0x87);
++		bcma_debug(bus,
++			   "Moved i2s interrupt to oob line 7 instead of 8\n");
++	}
++}
++
+ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
+ {
+ 	struct bcma_bus *bus;
+@@ -236,43 +319,55 @@ void bcma_core_mips_init(struct bcma_drv
+ 	if (mcore->setup_done)
+ 		return;
+ 
+-	bcma_info(bus, "Initializing MIPS core...\n");
++	bcma_debug(bus, "Initializing MIPS core...\n");
+ 
+ 	bcma_core_mips_early_init(mcore);
+ 
+-	mcore->assigned_irqs = 1;
++	bcma_fix_i2s_irqflag(bus);
+ 
+-	/* Assign IRQs to all cores on the bus */
+-	list_for_each_entry(core, &bus->cores, list) {
+-		int mips_irq;
+-		if (core->irq)
+-			continue;
+-
+-		mips_irq = bcma_core_mips_irq(core);
+-		if (mips_irq > 4)
+-			core->irq = 0;
+-		else
+-			core->irq = mips_irq + 2;
+-		if (core->irq > 5)
+-			continue;
+-		switch (core->id.id) {
+-		case BCMA_CORE_PCI:
+-		case BCMA_CORE_PCIE:
+-		case BCMA_CORE_ETHERNET:
+-		case BCMA_CORE_ETHERNET_GBIT:
+-		case BCMA_CORE_MAC_GBIT:
+-		case BCMA_CORE_80211:
+-		case BCMA_CORE_USB20_HOST:
+-			/* These devices get their own IRQ line if available,
+-			 * the rest goes on IRQ0
+-			 */
+-			if (mcore->assigned_irqs <= 4)
+-				bcma_core_mips_set_irq(core,
+-						       mcore->assigned_irqs++);
+-			break;
++	switch (bus->chipinfo.id) {
++	case BCMA_CHIP_ID_BCM4716:
++	case BCMA_CHIP_ID_BCM4748:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
++		bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_USB20_HOST, 0);
++		bcma_core_mips_set_irq_name(bus, 4, BCMA_CORE_PCIE, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_I2S, 0);
++		break;
++	case BCMA_CHIP_ID_BCM5356:
++	case BCMA_CHIP_ID_BCM47162:
++	case BCMA_CHIP_ID_BCM53572:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
++		break;
++	case BCMA_CHIP_ID_BCM5357:
++	case BCMA_CHIP_ID_BCM4749:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
++		bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_USB20_HOST, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_I2S, 0);
++		break;
++	case BCMA_CHIP_ID_BCM4706:
++		bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_PCIE, 0);
++		bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_4706_MAC_GBIT,
++					    0);
++		bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_PCIE, 1);
++		bcma_core_mips_set_irq_name(bus, 4, BCMA_CORE_USB20_HOST, 0);
++		bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_4706_CHIPCOMMON,
++					    0);
++		break;
++	default:
++		list_for_each_entry(core, &bus->cores, list) {
++			core->irq = bcma_core_irq(core);
+ 		}
++		bcma_err(bus,
++			 "Unknown device (0x%x) found, can not configure IRQs\n",
++			 bus->chipinfo.id);
+ 	}
+-	bcma_info(bus, "IRQ reconfiguration done\n");
++	bcma_debug(bus, "IRQ reconfiguration done\n");
+ 	bcma_core_mips_dump_irq(bus);
+ 
+ 	mcore->setup_done = true;
+--- a/drivers/bcma/driver_pci_host.c
++++ b/drivers/bcma/driver_pci_host.c
+@@ -94,19 +94,19 @@ static int bcma_extpci_read_config(struc
+ 	if (dev == 0) {
+ 		/* we support only two functions on device 0 */
+ 		if (func > 1)
+-			return -EINVAL;
++			goto out;
+ 
+ 		/* accesses to config registers with offsets >= 256
+ 		 * requires indirect access.
+ 		 */
+ 		if (off >= PCI_CONFIG_SPACE_SIZE) {
+ 			addr = (func << 12);
+-			addr |= (off & 0x0FFF);
++			addr |= (off & 0x0FFC);
+ 			val = bcma_pcie_read_config(pc, addr);
+ 		} else {
+ 			addr = BCMA_CORE_PCI_PCICFG0;
+ 			addr |= (func << 8);
+-			addr |= (off & 0xfc);
++			addr |= (off & 0xFC);
+ 			val = pcicore_read32(pc, addr);
+ 		}
+ 	} else {
+@@ -119,11 +119,9 @@ static int bcma_extpci_read_config(struc
+ 			goto out;
+ 
+ 		if (mips_busprobe32(val, mmio)) {
+-			val = 0xffffffff;
++			val = 0xFFFFFFFF;
+ 			goto unmap;
+ 		}
+-
+-		val = readl(mmio);
+ 	}
+ 	val >>= (8 * (off & 3));
+ 
+@@ -151,7 +149,7 @@ static int bcma_extpci_write_config(stru
+ 				   const void *buf, int len)
+ {
+ 	int err = -EINVAL;
+-	u32 addr = 0, val = 0;
++	u32 addr, val;
+ 	void __iomem *mmio = 0;
+ 	u16 chipid = pc->core->bus->chipinfo.id;
+ 
+@@ -159,16 +157,22 @@ static int bcma_extpci_write_config(stru
+ 	if (unlikely(len != 1 && len != 2 && len != 4))
+ 		goto out;
+ 	if (dev == 0) {
++		/* we support only two functions on device 0 */
++		if (func > 1)
++			goto out;
++
+ 		/* accesses to config registers with offsets >= 256
+ 		 * requires indirect access.
+ 		 */
+-		if (off < PCI_CONFIG_SPACE_SIZE) {
+-			addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0;
++		if (off >= PCI_CONFIG_SPACE_SIZE) {
++			addr = (func << 12);
++			addr |= (off & 0x0FFC);
++			val = bcma_pcie_read_config(pc, addr);
++		} else {
++			addr = BCMA_CORE_PCI_PCICFG0;
+ 			addr |= (func << 8);
+-			addr |= (off & 0xfc);
+-			mmio = ioremap_nocache(addr, sizeof(val));
+-			if (!mmio)
+-				goto out;
++			addr |= (off & 0xFC);
++			val = pcicore_read32(pc, addr);
+ 		}
+ 	} else {
+ 		addr = bcma_get_cfgspace_addr(pc, dev, func, off);
+@@ -180,19 +184,17 @@ static int bcma_extpci_write_config(stru
+ 			goto out;
+ 
+ 		if (mips_busprobe32(val, mmio)) {
+-			val = 0xffffffff;
++			val = 0xFFFFFFFF;
+ 			goto unmap;
+ 		}
+ 	}
+ 
+ 	switch (len) {
+ 	case 1:
+-		val = readl(mmio);
+ 		val &= ~(0xFF << (8 * (off & 3)));
+ 		val |= *((const u8 *)buf) << (8 * (off & 3));
+ 		break;
+ 	case 2:
+-		val = readl(mmio);
+ 		val &= ~(0xFFFF << (8 * (off & 3)));
+ 		val |= *((const u16 *)buf) << (8 * (off & 3));
+ 		break;
+@@ -200,13 +202,14 @@ static int bcma_extpci_write_config(stru
+ 		val = *((const u32 *)buf);
+ 		break;
+ 	}
+-	if (dev == 0 && !addr) {
++	if (dev == 0) {
+ 		/* accesses to config registers with offsets >= 256
+ 		 * requires indirect access.
+ 		 */
+-		addr = (func << 12);
+-		addr |= (off & 0x0FFF);
+-		bcma_pcie_write_config(pc, addr, val);
++		if (off >= PCI_CONFIG_SPACE_SIZE)
++			bcma_pcie_write_config(pc, addr, val);
++		else
++			pcicore_write32(pc, addr, val);
+ 	} else {
+ 		writel(val, mmio);
+ 
+@@ -276,7 +279,7 @@ static u8 bcma_find_pci_capability(struc
+ 	/* check for Header type 0 */
+ 	bcma_extpci_read_config(pc, dev, func, PCI_HEADER_TYPE, &byte_val,
+ 				sizeof(u8));
+-	if ((byte_val & 0x7f) != PCI_HEADER_TYPE_NORMAL)
++	if ((byte_val & 0x7F) != PCI_HEADER_TYPE_NORMAL)
+ 		return cap_ptr;
+ 
+ 	/* check if the capability pointer field exists */
+@@ -401,6 +404,8 @@ void bcma_core_pci_hostmode_init(struct
+ 		return;
+ 	}
+ 
++	spin_lock_init(&pc_host->cfgspace_lock);
++
+ 	pc->host_controller = pc_host;
+ 	pc_host->pci_controller.io_resource = &pc_host->io_resource;
+ 	pc_host->pci_controller.mem_resource = &pc_host->mem_resource;
+@@ -426,7 +431,7 @@ void bcma_core_pci_hostmode_init(struct
+ 	/* Reset RC */
+ 	usleep_range(3000, 5000);
+ 	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE);
+-	usleep_range(1000, 2000);
++	msleep(50);
+ 	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST |
+ 			BCMA_CORE_PCI_CTL_RST_OE);
+ 
+@@ -488,6 +493,17 @@ void bcma_core_pci_hostmode_init(struct
+ 
+ 	bcma_core_pci_enable_crs(pc);
+ 
++	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706 ||
++	    bus->chipinfo.id == BCMA_CHIP_ID_BCM4716) {
++		u16 val16;
++		bcma_extpci_read_config(pc, 0, 0, BCMA_CORE_PCI_CFG_DEVCTRL,
++					&val16, sizeof(val16));
++		val16 |= (2 << 5);	/* Max payload size of 512 */
++		val16 |= (2 << 12);	/* MRRS 512 */
++		bcma_extpci_write_config(pc, 0, 0, BCMA_CORE_PCI_CFG_DEVCTRL,
++					 &val16, sizeof(val16));
++	}
++
+ 	/* Enable PCI bridge BAR0 memory & master access */
+ 	tmp = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+ 	bcma_extpci_write_config(pc, 0, 0, PCI_COMMAND, &tmp, sizeof(tmp));
+@@ -565,6 +581,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI
+ int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
+ {
+ 	struct bcma_drv_pci_host *pc_host;
++	int readrq;
+ 
+ 	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
+ 		/* This is not a device on the PCI-core bridge. */
+@@ -576,9 +593,14 @@ int bcma_core_pci_plat_dev_init(struct p
+ 	pr_info("PCI: Fixing up device %s\n", pci_name(dev));
+ 
+ 	/* Fix up interrupt lines */
+-	dev->irq = bcma_core_mips_irq(pc_host->pdev->core) + 2;
++	dev->irq = bcma_core_irq(pc_host->pdev->core);
+ 	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+ 
++	readrq = pcie_get_readrq(dev);
++	if (readrq > 128) {
++		pr_info("change PCIe max read request size from %i to 128\n", readrq);
++		pcie_set_readrq(dev, 128);
++	}
+ 	return 0;
+ }
+ EXPORT_SYMBOL(bcma_core_pci_plat_dev_init);
+@@ -595,6 +617,6 @@ int bcma_core_pci_pcibios_map_irq(const
+ 
+ 	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
+ 			       pci_ops);
+-	return bcma_core_mips_irq(pc_host->pdev->core) + 2;
++	return bcma_core_irq(pc_host->pdev->core);
+ }
+ EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -275,6 +275,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
+ 	{ 0, },
+ };
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -81,8 +81,8 @@ struct bcma_device *bcma_find_core(struc
+ }
+ EXPORT_SYMBOL_GPL(bcma_find_core);
+ 
+-static struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+-					       u8 unit)
++struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
++					u8 unit)
+ {
+ 	struct bcma_device *core;
+ 
+@@ -93,6 +93,25 @@ static struct bcma_device *bcma_find_cor
+ 	return NULL;
+ }
+ 
++bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
++		     int timeout)
++{
++	unsigned long deadline = jiffies + timeout;
++	u32 val;
++
++	do {
++		val = bcma_read32(core, reg);
++		if ((val & mask) == value)
++			return true;
++		cpu_relax();
++		udelay(10);
++	} while (!time_after_eq(jiffies, deadline));
++
++	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);
++
++	return false;
++}
++
+ static void bcma_release_core_dev(struct device *dev)
+ {
+ 	struct bcma_device *core = container_of(dev, struct bcma_device, dev);
+@@ -120,6 +139,11 @@ static int bcma_register_cores(struct bc
+ 			continue;
+ 		}
+ 
++		/* Only first GMAC core on BCM4706 is connected and working */
++		if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
++		    core->core_unit > 0)
++			continue;
++
+ 		core->dev.release = bcma_release_core_dev;
+ 		core->dev.bus = &bcma_bus_type;
+ 		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
+@@ -149,6 +173,14 @@ static int bcma_register_cores(struct bc
+ 		dev_id++;
+ 	}
+ 
++#ifdef CONFIG_BCMA_DRIVER_MIPS
++	if (bus->drv_cc.pflash.present) {
++		err = platform_device_register(&bcma_pflash_dev);
++		if (err)
++			bcma_err(bus, "Error registering parallel flash\n");
++	}
++#endif
++
+ #ifdef CONFIG_BCMA_SFLASH
+ 	if (bus->drv_cc.sflash.present) {
+ 		err = platform_device_register(&bcma_sflash_dev);
+@@ -205,7 +237,7 @@ int bcma_bus_register(struct bcma_bus *b
+ 	err = bcma_bus_scan(bus);
+ 	if (err) {
+ 		bcma_err(bus, "Failed to scan: %d\n", err);
+-		return -1;
++		return err;
+ 	}
+ 
+ 	/* Early init CC core */
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -32,6 +32,18 @@ static const struct bcma_device_id_name
+ 	{ BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
+ 	{ BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
+ 	{ BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
++	{ BCMA_CORE_PCIEG2, "PCIe Gen 2" },
++	{ BCMA_CORE_DMA, "DMA" },
++	{ BCMA_CORE_SDIO3, "SDIO3" },
++	{ BCMA_CORE_USB20, "USB 2.0" },
++	{ BCMA_CORE_USB30, "USB 3.0" },
++	{ BCMA_CORE_A9JTAG, "ARM Cortex A9 JTAG" },
++	{ BCMA_CORE_DDR23, "Denali DDR2/DDR3 memory controller" },
++	{ BCMA_CORE_ROM, "ROM" },
++	{ BCMA_CORE_NAND, "NAND flash controller" },
++	{ BCMA_CORE_QSPI, "SPI flash controller" },
++	{ BCMA_CORE_CHIPCOMMON_B, "Chipcommon B" },
++	{ BCMA_CORE_ARMCA9, "ARM Cortex A9 core (ihost)" },
+ 	{ BCMA_CORE_AMEMC, "AMEMC (DDR)" },
+ 	{ BCMA_CORE_ALTA, "ALTA (I2S)" },
+ 	{ BCMA_CORE_INVALID, "Invalid" },
+@@ -84,6 +96,8 @@ static const struct bcma_device_id_name
+ 	{ BCMA_CORE_I2S, "I2S" },
+ 	{ BCMA_CORE_SDR_DDR1_MEM_CTL, "SDR/DDR1 Memory Controller" },
+ 	{ BCMA_CORE_SHIM, "SHIM" },
++	{ BCMA_CORE_PCIE2, "PCIe Gen2" },
++	{ BCMA_CORE_ARM_CR4, "ARM CR4" },
+ 	{ BCMA_CORE_DEFAULT, "Default" },
+ };
+ 
+@@ -137,19 +151,19 @@ static void bcma_scan_switch_core(struct
+ 				       addr);
+ }
+ 
+-static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 **eromptr)
++static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = readl(*eromptr);
+ 	(*eromptr)++;
+ 	return ent;
+ }
+ 
+-static void bcma_erom_push_ent(u32 **eromptr)
++static void bcma_erom_push_ent(u32 __iomem **eromptr)
+ {
+ 	(*eromptr)--;
+ }
+ 
+-static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr)
++static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	if (!(ent & SCAN_ER_VALID))
+@@ -159,14 +173,14 @@ static s32 bcma_erom_get_ci(struct bcma_
+ 	return ent;
+ }
+ 
+-static bool bcma_erom_is_end(struct bcma_bus *bus, u32 **eromptr)
++static bool bcma_erom_is_end(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	bcma_erom_push_ent(eromptr);
+ 	return (ent == (SCAN_ER_TAG_END | SCAN_ER_VALID));
+ }
+ 
+-static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr)
++static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	bcma_erom_push_ent(eromptr);
+@@ -175,7 +189,7 @@ static bool bcma_erom_is_bridge(struct b
+ 		((ent & SCAN_ADDR_TYPE) == SCAN_ADDR_TYPE_BRIDGE));
+ }
+ 
+-static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr)
++static void bcma_erom_skip_component(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent;
+ 	while (1) {
+@@ -189,7 +203,7 @@ static void bcma_erom_skip_component(str
+ 	bcma_erom_push_ent(eromptr);
+ }
+ 
+-static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr)
++static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)
+ {
+ 	u32 ent = bcma_erom_get_ent(bus, eromptr);
+ 	if (!(ent & SCAN_ER_VALID))
+@@ -199,7 +213,7 @@ static s32 bcma_erom_get_mst_port(struct
+ 	return ent;
+ }
+ 
+-static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 **eromptr,
++static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
+ 				  u32 type, u8 port)
+ {
+ 	u32 addrl, addrh, sizel, sizeh = 0;
+@@ -211,7 +225,7 @@ static s32 bcma_erom_get_addr_desc(struc
+ 	    ((ent & SCAN_ADDR_TYPE) != type) ||
+ 	    (((ent & SCAN_ADDR_PORT) >> SCAN_ADDR_PORT_SHIFT) != port)) {
+ 		bcma_erom_push_ent(eromptr);
+-		return -EINVAL;
++		return (u32)-EINVAL;
+ 	}
+ 
+ 	addrl = ent & SCAN_ADDR_ADDR;
+@@ -255,11 +269,13 @@ static struct bcma_device *bcma_find_cor
+ 	return NULL;
+ }
+ 
++#define IS_ERR_VALUE_U32(x) ((x) >= (u32)-MAX_ERRNO)
++
+ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
+ 			      struct bcma_device_id *match, int core_num,
+ 			      struct bcma_device *core)
+ {
+-	s32 tmp;
++	u32 tmp;
+ 	u8 i, j;
+ 	s32 cia, cib;
+ 	u8 ports[2], wrappers[2];
+@@ -337,11 +353,11 @@ static int bcma_get_next_core(struct bcm
+ 	 * the main register space for the core
+ 	 */
+ 	tmp = bcma_erom_get_addr_desc(bus, eromptr, SCAN_ADDR_TYPE_SLAVE, 0);
+-	if (tmp <= 0) {
++	if (tmp == 0 || IS_ERR_VALUE_U32(tmp)) {
+ 		/* Try again to see if it is a bridge */
+ 		tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 					      SCAN_ADDR_TYPE_BRIDGE, 0);
+-		if (tmp <= 0) {
++		if (tmp == 0 || IS_ERR_VALUE_U32(tmp)) {
+ 			return -EILSEQ;
+ 		} else {
+ 			bcma_info(bus, "Bridge found\n");
+@@ -355,7 +371,7 @@ static int bcma_get_next_core(struct bcm
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_SLAVE, i);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: slave port %d "
+ 				 * "has %d descriptors\n", i, j); */
+@@ -372,7 +388,7 @@ static int bcma_get_next_core(struct bcm
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_MWRAP, i);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: master wrapper %d "
+ 				 * "has %d descriptors\n", i, j); */
+@@ -390,7 +406,7 @@ static int bcma_get_next_core(struct bcm
+ 		for (j = 0; ; j++) {
+ 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
+ 				SCAN_ADDR_TYPE_SWRAP, i + hack);
+-			if (tmp < 0) {
++			if (IS_ERR_VALUE_U32(tmp)) {
+ 				/* no more entries for port _i_ */
+ 				/* pr_debug("erom: master wrapper %d "
+ 				 * has %d descriptors\n", i, j); */
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -72,12 +72,12 @@ fail:
+  * R/W ops.
+  **************************************************/
+ 
+-static void bcma_sprom_read(struct bcma_bus *bus, u16 offset, u16 *sprom)
++static void bcma_sprom_read(struct bcma_bus *bus, u16 offset, u16 *sprom,
++			    size_t words)
+ {
+ 	int i;
+-	for (i = 0; i < SSB_SPROMSIZE_WORDS_R4; i++)
+-		sprom[i] = bcma_read16(bus->drv_cc.core,
+-				       offset + (i * 2));
++	for (i = 0; i < words; i++)
++		sprom[i] = bcma_read16(bus->drv_cc.core, offset + (i * 2));
+ }
+ 
+ /**************************************************
+@@ -124,29 +124,29 @@ static inline u8 bcma_crc8(u8 crc, u8 da
+ 	return t[crc ^ data];
+ }
+ 
+-static u8 bcma_sprom_crc(const u16 *sprom)
++static u8 bcma_sprom_crc(const u16 *sprom, size_t words)
+ {
+ 	int word;
+ 	u8 crc = 0xFF;
+ 
+-	for (word = 0; word < SSB_SPROMSIZE_WORDS_R4 - 1; word++) {
++	for (word = 0; word < words - 1; word++) {
+ 		crc = bcma_crc8(crc, sprom[word] & 0x00FF);
+ 		crc = bcma_crc8(crc, (sprom[word] & 0xFF00) >> 8);
+ 	}
+-	crc = bcma_crc8(crc, sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & 0x00FF);
++	crc = bcma_crc8(crc, sprom[words - 1] & 0x00FF);
+ 	crc ^= 0xFF;
+ 
+ 	return crc;
+ }
+ 
+-static int bcma_sprom_check_crc(const u16 *sprom)
++static int bcma_sprom_check_crc(const u16 *sprom, size_t words)
+ {
+ 	u8 crc;
+ 	u8 expected_crc;
+ 	u16 tmp;
+ 
+-	crc = bcma_sprom_crc(sprom);
+-	tmp = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_CRC;
++	crc = bcma_sprom_crc(sprom, words);
++	tmp = sprom[words - 1] & SSB_SPROM_REVISION_CRC;
+ 	expected_crc = tmp >> SSB_SPROM_REVISION_CRC_SHIFT;
+ 	if (crc != expected_crc)
+ 		return -EPROTO;
+@@ -154,21 +154,25 @@ static int bcma_sprom_check_crc(const u1
+ 	return 0;
+ }
+ 
+-static int bcma_sprom_valid(const u16 *sprom)
++static int bcma_sprom_valid(struct bcma_bus *bus, const u16 *sprom,
++			    size_t words)
+ {
+ 	u16 revision;
+ 	int err;
+ 
+-	err = bcma_sprom_check_crc(sprom);
++	err = bcma_sprom_check_crc(sprom, words);
+ 	if (err)
+ 		return err;
+ 
+-	revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] & SSB_SPROM_REVISION_REV;
+-	if (revision != 8 && revision != 9) {
++	revision = sprom[words - 1] & SSB_SPROM_REVISION_REV;
++	if (revision != 8 && revision != 9 && revision != 10) {
+ 		pr_err("Unsupported SPROM revision: %d\n", revision);
+ 		return -ENOENT;
+ 	}
+ 
++	bus->sprom.revision = revision;
++	bcma_debug(bus, "Found SPROM revision %d\n", revision);
++
+ 	return 0;
+ }
+ 
+@@ -208,15 +212,13 @@ static void bcma_sprom_extract_r8(struct
+ 	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
+ 			ARRAY_SIZE(bus->sprom.core_pwr_info));
+ 
+-	bus->sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &
+-		SSB_SPROM_REVISION_REV;
+-
+ 	for (i = 0; i < 3; i++) {
+ 		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];
+ 		*(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
+ 	}
+ 
+ 	SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);
++	SPEX(board_type, SSB_SPROM1_SPID, ~0, 0);
+ 
+ 	SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,
+ 	     SSB_SPROM4_TXPID2G0_SHIFT);
+@@ -501,7 +503,7 @@ static bool bcma_sprom_onchip_available(
+ 	case BCMA_CHIP_ID_BCM4331:
+ 		present = chip_status & BCMA_CC_CHIPST_4331_OTP_PRESENT;
+ 		break;
+-
++	case BCMA_CHIP_ID_BCM43142:
+ 	case BCMA_CHIP_ID_BCM43224:
+ 	case BCMA_CHIP_ID_BCM43225:
+ 		/* for these chips OTP is always available */
+@@ -549,7 +551,9 @@ int bcma_sprom_get(struct bcma_bus *bus)
+ {
+ 	u16 offset = BCMA_CC_SPROM;
+ 	u16 *sprom;
+-	int err = 0;
++	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4,
++				 SSB_SPROMSIZE_WORDS_R10, };
++	int i, err = 0;
+ 
+ 	if (!bus->drv_cc.core)
+ 		return -EOPNOTSUPP;
+@@ -578,32 +582,37 @@ int bcma_sprom_get(struct bcma_bus *bus)
+ 		}
+ 	}
+ 
+-	sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
+-			GFP_KERNEL);
+-	if (!sprom)
+-		return -ENOMEM;
+-
+ 	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 ||
+ 	    bus->chipinfo.id == BCMA_CHIP_ID_BCM43431)
+ 		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);
+ 
+ 	bcma_debug(bus, "SPROM offset 0x%x\n", offset);
+-	bcma_sprom_read(bus, offset, sprom);
++	for (i = 0; i < ARRAY_SIZE(sprom_sizes); i++) {
++		size_t words = sprom_sizes[i];
++
++		sprom = kcalloc(words, sizeof(u16), GFP_KERNEL);
++		if (!sprom)
++			return -ENOMEM;
++
++		bcma_sprom_read(bus, offset, sprom, words);
++		err = bcma_sprom_valid(bus, sprom, words);
++		if (!err)
++			break;
++
++		kfree(sprom);
++	}
+ 
+ 	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 ||
+ 	    bus->chipinfo.id == BCMA_CHIP_ID_BCM43431)
+ 		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
+ 
+-	err = bcma_sprom_valid(sprom);
+ 	if (err) {
+-		bcma_warn(bus, "invalid sprom read from the PCIe card, try to use fallback sprom\n");
++		bcma_warn(bus, "Invalid SPROM read from the PCIe card, trying to use fallback SPROM\n");
+ 		err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
+-		goto out;
++	} else {
++		bcma_sprom_extract_r8(bus, sprom);
++		kfree(sprom);
+ 	}
+ 
+-	bcma_sprom_extract_r8(bus, sprom);
+-
+-out:
+-	kfree(sprom);
+ 	return err;
+ }
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -72,7 +72,19 @@ struct bcma_host_ops {
+ /* Core-ID values. */
+ #define BCMA_CORE_OOB_ROUTER		0x367	/* Out of band */
+ #define BCMA_CORE_4706_CHIPCOMMON	0x500
++#define BCMA_CORE_PCIEG2		0x501
++#define BCMA_CORE_DMA			0x502
++#define BCMA_CORE_SDIO3			0x503
++#define BCMA_CORE_USB20			0x504
++#define BCMA_CORE_USB30			0x505
++#define BCMA_CORE_A9JTAG		0x506
++#define BCMA_CORE_DDR23			0x507
++#define BCMA_CORE_ROM			0x508
++#define BCMA_CORE_NAND			0x509
++#define BCMA_CORE_QSPI			0x50A
++#define BCMA_CORE_CHIPCOMMON_B		0x50B
+ #define BCMA_CORE_4706_SOC_RAM		0x50E
++#define BCMA_CORE_ARMCA9		0x510
+ #define BCMA_CORE_4706_MAC_GBIT		0x52D
+ #define BCMA_CORE_AMEMC			0x52E	/* DDR1/2 memory controller core */
+ #define BCMA_CORE_ALTA			0x534	/* I2S core */
+@@ -134,12 +146,20 @@ struct bcma_host_ops {
+ #define BCMA_CORE_I2S			0x834
+ #define BCMA_CORE_SDR_DDR1_MEM_CTL	0x835	/* SDR/DDR1 memory controller core */
+ #define BCMA_CORE_SHIM			0x837	/* SHIM component in ubus/6362 */
++#define BCMA_CORE_PHY_AC		0x83B
++#define BCMA_CORE_PCIE2			0x83C	/* PCI Express Gen2 */
++#define BCMA_CORE_USB30_DEV		0x83D
++#define BCMA_CORE_ARM_CR4		0x83E
+ #define BCMA_CORE_DEFAULT		0xFFF
+ 
+ #define BCMA_MAX_NR_CORES		16
+ 
+ /* Chip IDs of PCIe devices */
+ #define BCMA_CHIP_ID_BCM4313	0x4313
++#define BCMA_CHIP_ID_BCM43142	43142
++#define BCMA_CHIP_ID_BCM43131  43131
++#define BCMA_CHIP_ID_BCM43217  43217
++#define BCMA_CHIP_ID_BCM43222  43222
+ #define BCMA_CHIP_ID_BCM43224	43224
+ #define  BCMA_PKG_ID_BCM43224_FAB_CSM	0x8
+ #define  BCMA_PKG_ID_BCM43224_FAB_SMIC	0xa
+@@ -172,6 +192,65 @@ struct bcma_host_ops {
+ #define  BCMA_PKG_ID_BCM5357	11
+ #define BCMA_CHIP_ID_BCM53572	53572
+ #define  BCMA_PKG_ID_BCM47188	9
++#define BCMA_CHIP_ID_BCM4707	53010
++#define  BCMA_PKG_ID_BCM4707	1
++#define  BCMA_PKG_ID_BCM4708	2
++#define  BCMA_PKG_ID_BCM4709	0
++#define BCMA_CHIP_ID_BCM53018	53018
++
++/* Board types (on PCI usually equals to the subsystem dev id) */
++/* BCM4313 */
++#define BCMA_BOARD_TYPE_BCM94313BU	0X050F
++#define BCMA_BOARD_TYPE_BCM94313HM	0X0510
++#define BCMA_BOARD_TYPE_BCM94313EPA	0X0511
++#define BCMA_BOARD_TYPE_BCM94313HMG	0X051C
++/* BCM4716 */
++#define BCMA_BOARD_TYPE_BCM94716NR2	0X04CD
++/* BCM43224 */
++#define BCMA_BOARD_TYPE_BCM943224X21	0X056E
++#define BCMA_BOARD_TYPE_BCM943224X21_FCC	0X00D1
++#define BCMA_BOARD_TYPE_BCM943224X21B	0X00E9
++#define BCMA_BOARD_TYPE_BCM943224M93	0X008B
++#define BCMA_BOARD_TYPE_BCM943224M93A	0X0090
++#define BCMA_BOARD_TYPE_BCM943224X16	0X0093
++#define BCMA_BOARD_TYPE_BCM94322X9	0X008D
++#define BCMA_BOARD_TYPE_BCM94322M35E	0X008E
++/* BCM43228 */
++#define BCMA_BOARD_TYPE_BCM943228BU8	0X0540
++#define BCMA_BOARD_TYPE_BCM943228BU9	0X0541
++#define BCMA_BOARD_TYPE_BCM943228BU	0X0542
++#define BCMA_BOARD_TYPE_BCM943227HM4L	0X0543
++#define BCMA_BOARD_TYPE_BCM943227HMB	0X0544
++#define BCMA_BOARD_TYPE_BCM943228HM4L	0X0545
++#define BCMA_BOARD_TYPE_BCM943228SD	0X0573
++/* BCM4331 */
++#define BCMA_BOARD_TYPE_BCM94331X19	0X00D6
++#define BCMA_BOARD_TYPE_BCM94331X28	0X00E4
++#define BCMA_BOARD_TYPE_BCM94331X28B	0X010E
++#define BCMA_BOARD_TYPE_BCM94331PCIEBT3AX	0X00E4
++#define BCMA_BOARD_TYPE_BCM94331X12_2G	0X00EC
++#define BCMA_BOARD_TYPE_BCM94331X12_5G	0X00ED
++#define BCMA_BOARD_TYPE_BCM94331X29B	0X00EF
++#define BCMA_BOARD_TYPE_BCM94331CSAX	0X00EF
++#define BCMA_BOARD_TYPE_BCM94331X19C	0X00F5
++#define BCMA_BOARD_TYPE_BCM94331X33	0X00F4
++#define BCMA_BOARD_TYPE_BCM94331BU	0X0523
++#define BCMA_BOARD_TYPE_BCM94331S9BU	0X0524
++#define BCMA_BOARD_TYPE_BCM94331MC	0X0525
++#define BCMA_BOARD_TYPE_BCM94331MCI	0X0526
++#define BCMA_BOARD_TYPE_BCM94331PCIEBT4	0X0527
++#define BCMA_BOARD_TYPE_BCM94331HM	0X0574
++#define BCMA_BOARD_TYPE_BCM94331PCIEDUAL	0X059B
++#define BCMA_BOARD_TYPE_BCM94331MCH5	0X05A9
++#define BCMA_BOARD_TYPE_BCM94331CS	0X05C6
++#define BCMA_BOARD_TYPE_BCM94331CD	0X05DA
++/* BCM53572 */
++#define BCMA_BOARD_TYPE_BCM953572BU	0X058D
++#define BCMA_BOARD_TYPE_BCM953572NR2	0X058E
++#define BCMA_BOARD_TYPE_BCM947188NR2	0X058F
++#define BCMA_BOARD_TYPE_BCM953572SDRNR2	0X0590
++/* BCM43142 */
++#define BCMA_BOARD_TYPE_BCM943142HM	0X05E0
+ 
+ struct bcma_device {
+ 	struct bcma_bus *bus;
+--- a/include/linux/bcma/bcma_driver_chipcommon.h
++++ b/include/linux/bcma/bcma_driver_chipcommon.h
+@@ -27,7 +27,7 @@
+ #define   BCMA_CC_FLASHT_NONE		0x00000000	/* No flash */
+ #define   BCMA_CC_FLASHT_STSER		0x00000100	/* ST serial flash */
+ #define   BCMA_CC_FLASHT_ATSER		0x00000200	/* Atmel serial flash */
+-#define   BCMA_CC_FLASHT_NFLASH		0x00000200	/* NAND flash */
++#define   BCMA_CC_FLASHT_NAND		0x00000300	/* NAND flash */
+ #define	  BCMA_CC_FLASHT_PARA		0x00000700	/* Parallel flash */
+ #define  BCMA_CC_CAP_PLLT		0x00038000	/* PLL Type */
+ #define   BCMA_PLLTYPE_NONE		0x00000000
+@@ -104,6 +104,7 @@
+ #define  BCMA_CC_CHIPST_4706_MIPS_BENDIAN	BIT(3) /* 0: little, 1: big endian */
+ #define  BCMA_CC_CHIPST_4706_PCIE1_DISABLE	BIT(5) /* PCIE1 enable strap pin */
+ #define  BCMA_CC_CHIPST_5357_NAND_BOOT		BIT(4) /* NAND boot, valid for CC rev 38 and/or BCM5357 */
++#define  BCMA_CC_CHIPST_4360_XTAL_40MZ		0x00000001
+ #define BCMA_CC_JCMD			0x0030		/* Rev >= 10 only */
+ #define  BCMA_CC_JCMD_START		0x80000000
+ #define  BCMA_CC_JCMD_BUSY		0x80000000
+@@ -315,6 +316,9 @@
+ #define BCMA_CC_PMU_CTL			0x0600 /* PMU control */
+ #define  BCMA_CC_PMU_CTL_ILP_DIV	0xFFFF0000 /* ILP div mask */
+ #define  BCMA_CC_PMU_CTL_ILP_DIV_SHIFT	16
++#define  BCMA_CC_PMU_CTL_RES		0x00006000 /* reset control mask */
++#define  BCMA_CC_PMU_CTL_RES_SHIFT	13
++#define  BCMA_CC_PMU_CTL_RES_RELOAD	0x2	/* reload POR values */
+ #define  BCMA_CC_PMU_CTL_PLL_UPD	0x00000400
+ #define  BCMA_CC_PMU_CTL_NOILPONW	0x00000200 /* No ILP on wait */
+ #define  BCMA_CC_PMU_CTL_HTREQEN	0x00000100 /* HT req enable */
+@@ -326,6 +330,8 @@
+ #define BCMA_CC_PMU_CAP			0x0604 /* PMU capabilities */
+ #define  BCMA_CC_PMU_CAP_REVISION	0x000000FF /* Revision mask */
+ #define BCMA_CC_PMU_STAT		0x0608 /* PMU status */
++#define  BCMA_CC_PMU_STAT_EXT_LPO_AVAIL	0x00000100
++#define  BCMA_CC_PMU_STAT_WDRESET	0x00000080
+ #define  BCMA_CC_PMU_STAT_INTPEND	0x00000040 /* Interrupt pending */
+ #define  BCMA_CC_PMU_STAT_SBCLKST	0x00000030 /* Backplane clock status? */
+ #define  BCMA_CC_PMU_STAT_HAVEALP	0x00000008 /* ALP available */
+@@ -351,6 +357,11 @@
+ #define BCMA_CC_REGCTL_DATA		0x065C
+ #define BCMA_CC_PLLCTL_ADDR		0x0660
+ #define BCMA_CC_PLLCTL_DATA		0x0664
++#define BCMA_CC_PMU_STRAPOPT		0x0668 /* (corerev >= 28) */
++#define BCMA_CC_PMU_XTAL_FREQ		0x066C /* (pmurev >= 10) */
++#define  BCMA_CC_PMU_XTAL_FREQ_ILPCTL_MASK	0x00001FFF
++#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_MASK	0x80000000
++#define  BCMA_CC_PMU_XTAL_FREQ_MEASURE_SHIFT	31
+ #define BCMA_CC_SPROM			0x0800 /* SPROM beginning */
+ /* NAND flash MLC controller registers (corerev >= 38) */
+ #define BCMA_CC_NAND_REVISION		0x0C00
+@@ -431,6 +442,23 @@
+ #define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_MASK	0x00000007
+ #define  BCMA_CC_PMU6_4706_PROC_NDIV_MODE_SHIFT	0
+ 
++/* PMU rev 15 */
++#define BCMA_CC_PMU15_PLL_PLLCTL0	0
++#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_MASK	0x00000003
++#define  BCMA_CC_PMU15_PLL_PC0_CLKSEL_SHIFT	0
++#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_MASK	0x003FFFFC
++#define  BCMA_CC_PMU15_PLL_PC0_FREQTGT_SHIFT	2
++#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_MASK	0x00C00000
++#define  BCMA_CC_PMU15_PLL_PC0_PRESCALE_SHIFT	22
++#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_MASK	0x07000000
++#define  BCMA_CC_PMU15_PLL_PC0_KPCTRL_SHIFT	24
++#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_MASK	0x38000000
++#define  BCMA_CC_PMU15_PLL_PC0_FCNTCTRL_SHIFT	27
++#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_MASK	0x40000000
++#define  BCMA_CC_PMU15_PLL_PC0_FDCMODE_SHIFT	30
++#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_MASK	0x80000000
++#define  BCMA_CC_PMU15_PLL_PC0_CTRLBIAS_SHIFT	31
++
+ /* ALP clock on pre-PMU chips */
+ #define BCMA_CC_PMU_ALP_CLOCK		20000000
+ /* HT clock for systems with PMU-enabled chipcommon */
+@@ -503,6 +531,37 @@
+ #define BCMA_CHIPCTL_5357_I2S_PINS_ENABLE	BIT(18)
+ #define BCMA_CHIPCTL_5357_I2CSPI_PINS_ENABLE	BIT(19)
+ 
++#define BCMA_RES_4314_LPLDO_PU			BIT(0)
++#define BCMA_RES_4314_PMU_SLEEP_DIS		BIT(1)
++#define BCMA_RES_4314_PMU_BG_PU			BIT(2)
++#define BCMA_RES_4314_CBUCK_LPOM_PU		BIT(3)
++#define BCMA_RES_4314_CBUCK_PFM_PU		BIT(4)
++#define BCMA_RES_4314_CLDO_PU			BIT(5)
++#define BCMA_RES_4314_LPLDO2_LVM		BIT(6)
++#define BCMA_RES_4314_WL_PMU_PU			BIT(7)
++#define BCMA_RES_4314_LNLDO_PU			BIT(8)
++#define BCMA_RES_4314_LDO3P3_PU			BIT(9)
++#define BCMA_RES_4314_OTP_PU			BIT(10)
++#define BCMA_RES_4314_XTAL_PU			BIT(11)
++#define BCMA_RES_4314_WL_PWRSW_PU		BIT(12)
++#define BCMA_RES_4314_LQ_AVAIL			BIT(13)
++#define BCMA_RES_4314_LOGIC_RET			BIT(14)
++#define BCMA_RES_4314_MEM_SLEEP			BIT(15)
++#define BCMA_RES_4314_MACPHY_RET		BIT(16)
++#define BCMA_RES_4314_WL_CORE_READY		BIT(17)
++#define BCMA_RES_4314_ILP_REQ			BIT(18)
++#define BCMA_RES_4314_ALP_AVAIL			BIT(19)
++#define BCMA_RES_4314_MISC_PWRSW_PU		BIT(20)
++#define BCMA_RES_4314_SYNTH_PWRSW_PU		BIT(21)
++#define BCMA_RES_4314_RX_PWRSW_PU		BIT(22)
++#define BCMA_RES_4314_RADIO_PU			BIT(23)
++#define BCMA_RES_4314_VCO_LDO_PU		BIT(24)
++#define BCMA_RES_4314_AFE_LDO_PU		BIT(25)
++#define BCMA_RES_4314_RX_LDO_PU			BIT(26)
++#define BCMA_RES_4314_TX_LDO_PU			BIT(27)
++#define BCMA_RES_4314_HT_AVAIL			BIT(28)
++#define BCMA_RES_4314_MACPHY_CLK_AVAIL		BIT(29)
++
+ /* Data for the PMU, if available.
+  * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
+  */
+@@ -528,6 +587,7 @@ struct bcma_sflash {
+ 	u32 size;
+ 
+ 	struct mtd_info *mtd;
++	void *priv;
+ };
+ #endif
+ 
+@@ -606,6 +666,8 @@ void bcma_chipco_bcm4331_ext_pa_lines_ct
+ 
+ extern u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks);
+ 
++extern u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc);
++
+ void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value);
+ 
+ u32 bcma_chipco_irq_status(struct bcma_drv_cc *cc, u32 mask);
+@@ -634,4 +696,6 @@ extern void bcma_chipco_regctl_maskset(s
+ 				       u32 offset, u32 mask, u32 set);
+ extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid);
+ 
++extern u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc);
++
+ #endif /* LINUX_BCMA_DRIVER_CC_H_ */
+--- a/include/linux/bcma/bcma_driver_mips.h
++++ b/include/linux/bcma/bcma_driver_mips.h
+@@ -28,6 +28,7 @@
+ #define BCMA_MIPS_MIPS74K_GPIOEN	0x0048
+ #define BCMA_MIPS_MIPS74K_CLKCTLST	0x01E0
+ 
++#define BCMA_MIPS_OOBSELINA74		0x004
+ #define BCMA_MIPS_OOBSELOUTA30		0x100
+ 
+ struct bcma_device;
+@@ -36,19 +37,23 @@ struct bcma_drv_mips {
+ 	struct bcma_device *core;
+ 	u8 setup_done:1;
+ 	u8 early_setup_done:1;
+-	unsigned int assigned_irqs;
+ };
+ 
+ #ifdef CONFIG_BCMA_DRIVER_MIPS
+ extern void bcma_core_mips_init(struct bcma_drv_mips *mcore);
+ extern void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);
++
++extern unsigned int bcma_core_irq(struct bcma_device *core);
+ #else
+ static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore) { }
+ static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
++
++static inline unsigned int bcma_core_irq(struct bcma_device *core)
++{
++	return 0;
++}
+ #endif
+ 
+ extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
+ 
+-extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
+-
+ #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
+--- a/include/linux/bcma/bcma_driver_pci.h
++++ b/include/linux/bcma/bcma_driver_pci.h
+@@ -179,10 +179,33 @@ struct pci_dev;
+ #define BCMA_CORE_PCI_CFG_FUN_MASK		7	/* Function mask */
+ #define BCMA_CORE_PCI_CFG_OFF_MASK		0xfff	/* Register mask */
+ 
++#define BCMA_CORE_PCI_CFG_DEVCTRL		0xd8
++
++#define BCMA_CORE_PCI_
++
++/* MDIO devices (SERDES modules) */
++#define BCMA_CORE_PCI_MDIO_IEEE0		0x000
++#define BCMA_CORE_PCI_MDIO_IEEE1		0x001
++#define BCMA_CORE_PCI_MDIO_BLK0			0x800
++#define BCMA_CORE_PCI_MDIO_BLK1			0x801
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT0		0x16
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT1		0x17
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT2		0x18
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT3		0x19
++#define  BCMA_CORE_PCI_MDIO_BLK1_MGMT4		0x1A
++#define BCMA_CORE_PCI_MDIO_BLK2			0x802
++#define BCMA_CORE_PCI_MDIO_BLK3			0x803
++#define BCMA_CORE_PCI_MDIO_BLK4			0x804
++#define BCMA_CORE_PCI_MDIO_TXPLL		0x808	/* TXPLL register block idx */
++#define BCMA_CORE_PCI_MDIO_TXCTRL0		0x820
++#define BCMA_CORE_PCI_MDIO_SERDESID		0x831
++#define BCMA_CORE_PCI_MDIO_RXCTRL0		0x840
++
+ /* PCIE Root Capability Register bits (Host mode only) */
+ #define BCMA_CORE_PCI_RC_CRS_VISIBILITY		0x0001
+ 
+ struct bcma_drv_pci;
++struct bcma_bus;
+ 
+ #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
+ struct bcma_drv_pci_host {
+@@ -217,7 +240,9 @@ struct bcma_drv_pci {
+ extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
+ extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
+ 				 struct bcma_device *core, bool enable);
+-extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend);
++extern void bcma_core_pci_up(struct bcma_bus *bus);
++extern void bcma_core_pci_down(struct bcma_bus *bus);
++extern void bcma_core_pci_power_save(struct bcma_bus *bus, bool up);
+ 
+ extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
+ extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
+--- a/include/linux/bcma/bcma_regs.h
++++ b/include/linux/bcma/bcma_regs.h
+@@ -37,6 +37,7 @@
+ #define  BCMA_IOST_BIST_DONE		0x8000
+ #define BCMA_RESET_CTL			0x0800
+ #define  BCMA_RESET_CTL_RESET		0x0001
++#define BCMA_RESET_ST			0x0804
+ 
+ /* BCMA PCI config space registers. */
+ #define BCMA_PCI_PMCSR			0x44
+--- a/drivers/bcma/driver_pci.c
++++ b/drivers/bcma/driver_pci.c
+@@ -31,7 +31,7 @@ static void bcma_pcie_write(struct bcma_
+ 	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_DATA, data);
+ }
+ 
+-static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy)
++static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u16 phy)
+ {
+ 	u32 v;
+ 	int i;
+@@ -55,7 +55,7 @@ static void bcma_pcie_mdio_set_phy(struc
+ 	}
+ }
+ 
+-static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address)
++static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address)
+ {
+ 	int max_retries = 10;
+ 	u16 ret = 0;
+@@ -98,7 +98,7 @@ static u16 bcma_pcie_mdio_read(struct bc
+ 	return ret;
+ }
+ 
+-static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device,
++static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device,
+ 				u8 address, u16 data)
+ {
+ 	int max_retries = 10;
+@@ -137,6 +137,13 @@ static void bcma_pcie_mdio_write(struct
+ 	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
+ }
+ 
++static u16 bcma_pcie_mdio_writeread(struct bcma_drv_pci *pc, u16 device,
++				    u8 address, u16 data)
++{
++	bcma_pcie_mdio_write(pc, device, address, data);
++	return bcma_pcie_mdio_read(pc, device, address);
++}
++
+ /**************************************************
+  * Workarounds.
+  **************************************************/
+@@ -229,6 +236,32 @@ void bcma_core_pci_init(struct bcma_drv_
+ 		bcma_core_pci_clientmode_init(pc);
+ }
+ 
++void bcma_core_pci_power_save(struct bcma_bus *bus, bool up)
++{
++	struct bcma_drv_pci *pc;
++	u16 data;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	if (pc->core->id.rev >= 15 && pc->core->id.rev <= 20) {
++		data = up ? 0x74 : 0x7C;
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7F64);
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);
++	} else if (pc->core->id.rev >= 21 && pc->core->id.rev <= 22) {
++		data = up ? 0x75 : 0x7D;
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7E65);
++		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,
++					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);
++	}
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);
++
+ int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
+ 			  bool enable)
+ {
+@@ -262,7 +295,7 @@ out:
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);
+ 
+-void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)
++static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)
+ {
+ 	u32 w;
+ 
+@@ -274,4 +307,29 @@ void bcma_core_pci_extend_L1timer(struct
+ 	bcma_pcie_write(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG, w);
+ 	bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);
+ }
+-EXPORT_SYMBOL_GPL(bcma_core_pci_extend_L1timer);
++
++void bcma_core_pci_up(struct bcma_bus *bus)
++{
++	struct bcma_drv_pci *pc;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	bcma_core_pci_extend_L1timer(pc, true);
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_up);
++
++void bcma_core_pci_down(struct bcma_bus *bus)
++{
++	struct bcma_drv_pci *pc;
++
++	if (bus->hosttype != BCMA_HOSTTYPE_PCI)
++		return;
++
++	pc = &bus->drv_pci[0];
++
++	bcma_core_pci_extend_L1timer(pc, false);
++}
++EXPORT_SYMBOL_GPL(bcma_core_pci_down);
+--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+@@ -685,27 +685,6 @@ bool ai_clkctl_cc(struct si_pub *sih, en
+ 	return mode == BCMA_CLKMODE_FAST;
+ }
+ 
+-void ai_pci_up(struct si_pub *sih)
+-{
+-	struct si_info *sii;
+-
+-	sii = container_of(sih, struct si_info, pub);
+-
+-	if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
+-		bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);
+-}
+-
+-/* Unconfigure and/or apply various WARs when going down */
+-void ai_pci_down(struct si_pub *sih)
+-{
+-	struct si_info *sii;
+-
+-	sii = container_of(sih, struct si_info, pub);
+-
+-	if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
+-		bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);
+-}
+-
+ /* Enable BT-COEX & Ex-PA for 4313 */
+ void ai_epa_4313war(struct si_pub *sih)
+ {
+--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
++++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+@@ -183,9 +183,6 @@ extern u16 ai_clkctl_fast_pwrup_delay(st
+ extern bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode);
+ extern bool ai_deviceremoved(struct si_pub *sih);
+ 
+-extern void ai_pci_down(struct si_pub *sih);
+-extern void ai_pci_up(struct si_pub *sih);
+-
+ /* Enable Ex-PA for 4313 */
+ extern void ai_epa_4313war(struct si_pub *sih);
+ 
+--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
+@@ -4648,7 +4648,7 @@ static int brcms_b_attach(struct brcms_c
+ 	brcms_c_coredisable(wlc_hw);
+ 
+ 	/* Match driver "down" state */
+-	ai_pci_down(wlc_hw->sih);
++	bcma_core_pci_down(wlc_hw->d11core->bus);
+ 
+ 	/* turn off pll and xtal to match driver "down" state */
+ 	brcms_b_xtal(wlc_hw, OFF);
+@@ -4991,12 +4991,12 @@ static int brcms_b_up_prep(struct brcms_
+ 	 */
+ 	if (brcms_b_radio_read_hwdisabled(wlc_hw)) {
+ 		/* put SB PCI in down state again */
+-		ai_pci_down(wlc_hw->sih);
++		bcma_core_pci_down(wlc_hw->d11core->bus);
+ 		brcms_b_xtal(wlc_hw, OFF);
+ 		return -ENOMEDIUM;
+ 	}
+ 
+-	ai_pci_up(wlc_hw->sih);
++	bcma_core_pci_up(wlc_hw->d11core->bus);
+ 
+ 	/* reset the d11 core */
+ 	brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
+@@ -5193,7 +5193,7 @@ static int brcms_b_down_finish(struct br
+ 
+ 		/* turn off primary xtal and pll */
+ 		if (!wlc_hw->noreset) {
+-			ai_pci_down(wlc_hw->sih);
++			bcma_core_pci_down(wlc_hw->d11core->bus);
+ 			brcms_b_xtal(wlc_hw, OFF);
+ 		}
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.8/030-backport-lib-devres-Introduce-devm_ioremap_resource.patch b/trunk/target/linux/generic/patches-3.8/030-backport-lib-devres-Introduce-devm_ioremap_resource.patch
new file mode 100644
index 00000000..b9022234
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/030-backport-lib-devres-Introduce-devm_ioremap_resource.patch
@@ -0,0 +1,251 @@
+From 75096579c3ac39ddc2f8b0d9a8924eba31f4d920 Mon Sep 17 00:00:00 2001
+From: Thierry Reding <thierry.reding@avionic-design.de>
+Date: Mon, 21 Jan 2013 11:08:54 +0100
+Subject: [PATCH] lib: devres: Introduce devm_ioremap_resource()
+
+The devm_request_and_ioremap() function is very useful and helps avoid a
+whole lot of boilerplate. However, one issue that keeps popping up is
+its lack of a specific error code to determine which of the steps that
+it performs failed. Furthermore, while the function gives an example and
+suggests what error code to return on failure, a wide variety of error
+codes are used throughout the tree.
+
+In an attempt to fix these problems, this patch adds a new function that
+drivers can transition to. The devm_ioremap_resource() returns a pointer
+to the remapped I/O memory on success or an ERR_PTR() encoded error code
+on failure. Callers can check for failure using IS_ERR() and determine
+its cause by extracting the error code using PTR_ERR().
+
+devm_request_and_ioremap() is implemented as a wrapper around the new
+API and return NULL on failure as before. This ensures that backwards
+compatibility is maintained until all users have been converted to the
+new API, at which point the old devm_request_and_ioremap() function
+should be removed.
+
+A semantic patch is included which can be used to convert from the old
+devm_request_and_ioremap() API to the new devm_ioremap_resource() API.
+Some non-trivial cases may require manual intervention, though.
+
+Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/driver-model/devres.txt              |    3 +-
+ include/linux/device.h                             |    1 +
+ lib/devres.c                                       |   57 ++++++++++---
+ scripts/coccinelle/api/devm_ioremap_resource.cocci |   90 ++++++++++++++++++++
+ 4 files changed, 137 insertions(+), 14 deletions(-)
+ create mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci
+
+--- a/Documentation/driver-model/devres.txt
++++ b/Documentation/driver-model/devres.txt
+@@ -266,7 +266,8 @@ IOMAP
+   devm_ioremap()
+   devm_ioremap_nocache()
+   devm_iounmap()
+-  devm_request_and_ioremap() : checks resource, requests region, ioremaps
++  devm_ioremap_resource() : checks resource, requests memory region, ioremaps
++  devm_request_and_ioremap() : obsoleted by devm_ioremap_resource()
+   pcim_iomap()
+   pcim_iounmap()
+   pcim_iomap_table()	: array of mapped addresses indexed by BAR
+--- a/include/linux/device.h
++++ b/include/linux/device.h
+@@ -573,6 +573,7 @@ extern int devres_release_group(struct d
+ extern void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp);
+ extern void devm_kfree(struct device *dev, void *p);
+ 
++void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
+ void __iomem *devm_request_and_ioremap(struct device *dev,
+ 			struct resource *res);
+ 
+--- a/lib/devres.c
++++ b/lib/devres.c
+@@ -86,22 +86,24 @@ void devm_iounmap(struct device *dev, vo
+ EXPORT_SYMBOL(devm_iounmap);
+ 
+ /**
+- * devm_request_and_ioremap() - Check, request region, and ioremap resource
+- * @dev: Generic device to handle the resource for
++ * devm_ioremap_resource() - check, request region, and ioremap resource
++ * @dev: generic device to handle the resource for
+  * @res: resource to be handled
+  *
+- * Takes all necessary steps to ioremap a mem resource. Uses managed device, so
+- * everything is undone on driver detach. Checks arguments, so you can feed
+- * it the result from e.g. platform_get_resource() directly. Returns the
+- * remapped pointer or NULL on error. Usage example:
++ * Checks that a resource is a valid memory region, requests the memory region
++ * and ioremaps it either as cacheable or as non-cacheable memory depending on
++ * the resource's flags. All operations are managed and will be undone on
++ * driver detach.
++ *
++ * Returns a pointer to the remapped memory or an ERR_PTR() encoded error code
++ * on failure. Usage example:
+  *
+  *	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+- *	base = devm_request_and_ioremap(&pdev->dev, res);
+- *	if (!base)
+- *		return -EADDRNOTAVAIL;
++ *	base = devm_ioremap_resource(&pdev->dev, res);
++ *	if (IS_ERR(base))
++ *		return PTR_ERR(base);
+  */
+-void __iomem *devm_request_and_ioremap(struct device *dev,
+-			struct resource *res)
++void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
+ {
+ 	resource_size_t size;
+ 	const char *name;
+@@ -111,7 +113,7 @@ void __iomem *devm_request_and_ioremap(s
+ 
+ 	if (!res || resource_type(res) != IORESOURCE_MEM) {
+ 		dev_err(dev, "invalid resource\n");
+-		return NULL;
++		return ERR_PTR(-EINVAL);
+ 	}
+ 
+ 	size = resource_size(res);
+@@ -119,7 +121,7 @@ void __iomem *devm_request_and_ioremap(s
+ 
+ 	if (!devm_request_mem_region(dev, res->start, size, name)) {
+ 		dev_err(dev, "can't request region for resource %pR\n", res);
+-		return NULL;
++		return ERR_PTR(-EBUSY);
+ 	}
+ 
+ 	if (res->flags & IORESOURCE_CACHEABLE)
+@@ -130,10 +132,39 @@ void __iomem *devm_request_and_ioremap(s
+ 	if (!dest_ptr) {
+ 		dev_err(dev, "ioremap failed for resource %pR\n", res);
+ 		devm_release_mem_region(dev, res->start, size);
++		dest_ptr = ERR_PTR(-ENOMEM);
+ 	}
+ 
+ 	return dest_ptr;
+ }
++EXPORT_SYMBOL(devm_ioremap_resource);
++
++/**
++ * devm_request_and_ioremap() - Check, request region, and ioremap resource
++ * @dev: Generic device to handle the resource for
++ * @res: resource to be handled
++ *
++ * Takes all necessary steps to ioremap a mem resource. Uses managed device, so
++ * everything is undone on driver detach. Checks arguments, so you can feed
++ * it the result from e.g. platform_get_resource() directly. Returns the
++ * remapped pointer or NULL on error. Usage example:
++ *
++ *	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ *	base = devm_request_and_ioremap(&pdev->dev, res);
++ *	if (!base)
++ *		return -EADDRNOTAVAIL;
++ */
++void __iomem *devm_request_and_ioremap(struct device *device,
++				       struct resource *res)
++{
++	void __iomem *dest_ptr;
++
++	dest_ptr = devm_ioremap_resource(device, res);
++	if (IS_ERR(dest_ptr))
++		return NULL;
++
++	return dest_ptr;
++}
+ EXPORT_SYMBOL(devm_request_and_ioremap);
+ 
+ #ifdef CONFIG_HAS_IOPORT
+--- /dev/null
++++ b/scripts/coccinelle/api/devm_ioremap_resource.cocci
+@@ -0,0 +1,90 @@
++virtual patch
++virtual report
++
++@depends on patch@
++expression base, dev, res;
++@@
++
++-base = devm_request_and_ioremap(dev, res);
+++base = devm_ioremap_resource(dev, res);
++ ...
++ if (
++-base == NULL
+++IS_ERR(base)
++ || ...) {
++<...
++-	return ...;
+++	return PTR_ERR(base);
++...>
++ }
++
++@depends on patch@
++expression e, E, ret;
++identifier l;
++@@
++
++ e = devm_ioremap_resource(...);
++ ...
++ if (IS_ERR(e) || ...) {
++ 	... when any
++-	ret = E;
+++	ret = PTR_ERR(e);
++ 	...
++(
++ 	return ret;
++|
++ 	goto l;
++)
++ }
++
++@depends on patch@
++expression e;
++@@
++
++ e = devm_ioremap_resource(...);
++ ...
++ if (IS_ERR(e) || ...) {
++ 	...
++-	\(dev_dbg\|dev_err\|pr_debug\|pr_err\|DRM_ERROR\)(...);
++ 	...
++ }
++
++@depends on patch@
++expression e;
++identifier l;
++@@
++
++ e = devm_ioremap_resource(...);
++ ...
++ if (IS_ERR(e) || ...)
++-{
++(
++ 	return ...;
++|
++ 	goto l;
++)
++-}
++
++@r depends on report@
++expression e;
++identifier l;
++position p1;
++@@
++
++*e = devm_request_and_ioremap@p1(...);
++ ...
++ if (e == NULL || ...) {
++ 	...
++(
++ 	return ...;
++|
++ 	goto l;
++)
++ }
++
++@script:python depends on r@
++p1 << r.p1;
++@@
++
++msg = "ERROR: deprecated devm_request_and_ioremap() API used on line %s" % (p1[0].line)
++coccilib.report.print_report(p1[0], msg)
diff --git a/trunk/target/linux/generic/patches-3.8/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch b/trunk/target/linux/generic/patches-3.8/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch
new file mode 100644
index 00000000..4a12da20
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/031-PCI-Remove-__weak-annotation-from-pcibios_get_phb_of.patch
@@ -0,0 +1,40 @@
+From 10629d711ed780470937ecda50d9ffa0e925a4ee Mon Sep 17 00:00:00 2001
+From: Bjorn Helgaas <bhelgaas@google.com>
+Date: Wed, 10 Apr 2013 09:56:54 -0600
+Subject: [PATCH 1/2] PCI: Remove __weak annotation from
+ pcibios_get_phb_of_node decl
+
+The __weak annotation on the pcibios_get_phb_of_node() declaration
+causes *every* definition to be marked "weak."  The linker then
+selects one based on link order, which may be the wrong one.
+
+Gabor found that on MIPS, the linker selected the generic implementation
+from drivers/pci even though arch/mips supplied a definition without the
+__weak annotation:
+
+$ mipsel-librecmc-linux-readelf -s arch/mips/pci/built-in.o \
+    drivers/pci/built-in.o vmlinux.o | grep pcibios_get_phb_of_node
+      86: 0000046c    12 FUNC    WEAK   DEFAULT    2 pcibios_get_phb_of_node
+    1430: 00012e2c   104 FUNC    WEAK   DEFAULT    2 pcibios_get_phb_of_node
+   31898: 0017e4ec   104 FUNC    WEAK   DEFAULT    2 pcibios_get_phb_of_node
+
+This removes the __weak annotation from the pcibios_get_phb_of_node()
+declaration so arch-specific non-weak implementations work reliably.
+
+Suggested-by: Gabor Juhos <juhosg@openwrt.org>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+---
+ include/linux/pci.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -1803,7 +1803,7 @@ extern void pci_set_bus_of_node(struct p
+ extern void pci_release_bus_of_node(struct pci_bus *bus);
+ 
+ /* Arch may override this (weak) */
+-extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus);
++extern struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
+ 
+ static inline struct device_node *
+ pci_device_to_OF_node(const struct pci_dev *pdev)
diff --git a/trunk/target/linux/generic/patches-3.8/032-MIPS-PCI-Implement-pcibios_get_phb_of_node.patch b/trunk/target/linux/generic/patches-3.8/032-MIPS-PCI-Implement-pcibios_get_phb_of_node.patch
new file mode 100644
index 00000000..cd43c27f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/032-MIPS-PCI-Implement-pcibios_get_phb_of_node.patch
@@ -0,0 +1,48 @@
+From 9a97cd43f4ef62520a852b5a2348233b0f37455b Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Thu, 4 Apr 2013 20:01:23 +0200
+Subject: [PATCH 2/2] MIPS/PCI: Implement pcibios_get_phb_of_node
+
+The of_node field of the device assigned to a
+PCI bus is used during scanning of the PCI bus.
+However on MIPS, the of_node field is assigned
+only after the bus has been scanned.
+
+Implement the architecture specific version of
+'pcibios_get_phb_of_node'. Which ensures that the
+PCI driver core will initialize the of_node field
+before starting the scan.
+
+Also remove the local assignment of bus->dev.of_node,
+it is not needed after the patch.
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+---
+ arch/mips/pci/pci.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/pci/pci.c
++++ b/arch/mips/pci/pci.c
+@@ -115,7 +115,6 @@ static void pcibios_scanbus(struct pci_c
+ 			pci_bus_assign_resources(bus);
+ 			pci_enable_bridges(bus);
+ 		}
+-		bus->dev.of_node = hose->of_node;
+ 	}
+ }
+ 
+@@ -169,6 +168,13 @@ void pci_load_of_ranges(struct pci_contr
+ 		}
+ 	}
+ }
++
++struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
++{
++	struct pci_controller *hose = bus->sysdata;
++
++	return of_node_get(hose->of_node);
++}
+ #endif
+ 
+ static DEFINE_MUTEX(pci_scan_mutex);
diff --git a/trunk/target/linux/generic/patches-3.8/033-backport-spi-of-Use-DT-aliases-for-assigning-bus-number.patch b/trunk/target/linux/generic/patches-3.8/033-backport-spi-of-Use-DT-aliases-for-assigning-bus-number.patch
new file mode 100644
index 00000000..02a2eca1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/033-backport-spi-of-Use-DT-aliases-for-assigning-bus-number.patch
@@ -0,0 +1,37 @@
+From bb29785e0d6d150181704be2efcc3141044625e2 Mon Sep 17 00:00:00 2001
+From: Grant Likely <grant.likely@secretlab.ca>
+Date: Fri, 21 Dec 2012 19:32:09 +0000
+Subject: [PATCH] spi/of: Use DT aliases for assigning bus number
+
+Linux assigns a number to each spi_master in the system, but when the
+platform used the device tree, the numbers are dynamically assigned and
+are not predictable. In general this shouldn't matter since the kernel
+doesn't use the bus number for anything other than matching a bus to
+spi_boardinfo (not used for DT). However, sometimes userspace needs to
+figure out which bus is which, so it makes sense to use the global
+/aliases namespace to choose a specific bus number.
+
+It is safe to derive the bus number from an alias because aliases will
+never cause two buses to try and use the same bus number. (At one time
+the cell-index property was used for this purpose, but cell-index has
+the risk of an id collision).
+
+Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
+Cc: Anatolij Gustschin <agust@denx.de>
+Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
+---
+ drivers/spi/spi.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/spi/spi.c
++++ b/drivers/spi/spi.c
+@@ -1135,6 +1135,9 @@ int spi_register_master(struct spi_maste
+ 	if (master->num_chipselect == 0)
+ 		return -EINVAL;
+ 
++	if ((master->bus_num < 0) && master->dev.of_node)
++		master->bus_num = of_alias_get_id(master->dev.of_node, "spi");
++
+ 	/* convention:  dynamically assigned bus IDs count down from the max */
+ 	if (master->bus_num < 0) {
+ 		/* FIXME switch to an IDR based scheme, something like
diff --git a/trunk/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch b/trunk/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch
new file mode 100644
index 00000000..b54ce59e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch
@@ -0,0 +1,25 @@
+--- a/drivers/leds/leds-gpio.c
++++ b/drivers/leds/leds-gpio.c
+@@ -107,6 +107,10 @@ static int create_gpio_led(const struct
+ 		return 0;
+ 	}
+ 
++	ret = devm_gpio_request(parent, template->gpio, template->name);
++	if (ret < 0)
++		return ret;
++
+ 	led_dat->cdev.name = template->name;
+ 	led_dat->cdev.default_trigger = template->default_trigger;
+ 	led_dat->gpio = template->gpio;
+@@ -126,10 +130,7 @@ static int create_gpio_led(const struct
+ 	if (!template->retain_state_suspended)
+ 		led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
+ 
+-	ret = devm_gpio_request_one(parent, template->gpio,
+-				    (led_dat->active_low ^ state) ?
+-				    GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
+-				    template->name);
++	ret = gpio_direction_output(led_dat->gpio, led_dat->active_low ^ state);
+ 	if (ret < 0)
+ 		return ret;
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/060-hso_devices.patch b/trunk/target/linux/generic/patches-3.8/060-hso_devices.patch
new file mode 100644
index 00000000..ab0c120d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/060-hso_devices.patch
@@ -0,0 +1,36 @@
+--- a/drivers/net/usb/hso.c
++++ b/drivers/net/usb/hso.c
+@@ -468,8 +468,10 @@ static const struct usb_device_id hso_id
+ 	{USB_DEVICE(0x0af0, 0x8400)},
+ 	{USB_DEVICE(0x0af0, 0x8600)},
+ 	{USB_DEVICE(0x0af0, 0x8800)},
+-	{USB_DEVICE(0x0af0, 0x8900)},
+-	{USB_DEVICE(0x0af0, 0x9000)},
++	{USB_DEVICE(0x0af0, 0x8900)},  /* GTM 67xx */
++	{USB_DEVICE(0x0af0, 0x9000)},  /* GTM 66xx */
++	{USB_DEVICE(0x0af0, 0x9200)},  /* GTM 67xxWFS */
++	{USB_DEVICE(0x0af0, 0x9300)},  /* GTM 66xxWFS */
+ 	{USB_DEVICE(0x0af0, 0xd035)},
+ 	{USB_DEVICE(0x0af0, 0xd055)},
+ 	{USB_DEVICE(0x0af0, 0xd155)},
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1244,6 +1244,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		0 ),
+ 
++UNUSUAL_DEV( 0x0af0, 0x9200, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 67xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
++UNUSUAL_DEV( 0x0af0, 0x9300, 0x0000, 0x0000,
++		"Option",
++		"Globetrotter 66xxWFS SD-Card",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		0 ),
++
+ UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000,
+ 		"Option",
+ 		"GI 070x SD-Card",
diff --git a/trunk/target/linux/generic/patches-3.8/061-arm_xz_decompressor_build_fix.patch b/trunk/target/linux/generic/patches-3.8/061-arm_xz_decompressor_build_fix.patch
new file mode 100644
index 00000000..e39a4294
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/061-arm_xz_decompressor_build_fix.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -50,6 +50,7 @@ extern char * strstr(const char * s1, co
+ #ifdef CONFIG_KERNEL_XZ
+ #define memmove memmove
+ #define memcpy memcpy
++extern char * strstr(const char *, const char *);
+ #include "../../../../lib/decompress_unxz.c"
+ #endif
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/062-mips_decompressor_build_fix.patch b/trunk/target/linux/generic/patches-3.8/062-mips_decompressor_build_fix.patch
new file mode 100644
index 00000000..52c45c38
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/062-mips_decompressor_build_fix.patch
@@ -0,0 +1,66 @@
+From 0db3db45f5bd6df4bdc03bbd5dec672e16164c4e Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 12 Nov 2012 12:31:55 +0100
+Subject: [PATCH] MIPS: decompressor: fix build failure on memcpy() in
+ decompress.c
+
+The decompress.c file includes linux/kernel.h which causes the following
+inclusion chain to be pulled:
+linux/kernel.h ->
+	linux/dynamic_debug.h ->
+		linux/string.h ->
+			asm/string.h
+
+We end up having a the GCC builtin + architecture specific memcpy() expanding
+into this:
+
+void *({ size_t __len = (size_t n); void *__ret; if
+(__builtin_constant_p(size_t n) && __len >= 64) __ret = memcpy((void *dest),
+(const void *src), __len); else __ret = __builtin_memcpy((void *dest), (const
+void *src), __len); __ret; })
+{
+ [memcpy implementation in decompress.c starts here]
+ int i;
+ const char *s = src;
+ char *d = dest;
+
+ for (i = 0; i < n; i++)
+  d[i] = s[i];
+ return dest;
+}
+
+raising the following compilation error:
+arch/mips/boot/compressed/decompress.c:46:8: error: expected identifier or '('
+before '{' token
+
+There are at least three possibilities to fix this issue:
+
+1) define _LINUX_STRING_H_ at the beginning of decompress.c to prevent
+   further linux/string.h definitions and declarations from being used, and add
+   an explicit strstr() declaration for linux/dynamic_debug.h
+
+2) remove the inclusion of linux/kernel.h because we actually use no definition
+   or declaration from this header file
+
+3) undefine memcpy or re-define memcpy to memcpy thus resulting in picking up
+   the local memcpy() implementation to this compilation unit
+
+This patch uses the second option which is the less intrusive one.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ arch/mips/boot/compressed/decompress.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/mips/boot/compressed/decompress.c
++++ b/arch/mips/boot/compressed/decompress.c
+@@ -10,9 +10,7 @@
+  * Free Software Foundation;  either version 2 of the  License, or (at your
+  * option) any later version.
+  */
+-
+ #include <linux/types.h>
+-#include <linux/kernel.h>
+ 
+ #include <asm/addrspace.h>
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/084-x86_fix_perf_uclibc_build.patch b/trunk/target/linux/generic/patches-3.8/084-x86_fix_perf_uclibc_build.patch
new file mode 100644
index 00000000..95163a43
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/084-x86_fix_perf_uclibc_build.patch
@@ -0,0 +1,27 @@
+From 031d8ad2c3cee85c515e551fc8c0054bdedb7b8b Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Thu, 13 Dec 2012 18:02:11 +0100
+Subject: [PATCH] x86: fix perf build with uclibc toolchains
+
+libio.h is not provided by uClibc, in order to be able to test the
+definition of __UCLIBC__ we need to include stdlib.h, which also
+includes stddef.h, providing the definition of 'NULL'
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ tools/perf/arch/x86/util/dwarf-regs.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/tools/perf/arch/x86/util/dwarf-regs.c
++++ b/tools/perf/arch/x86/util/dwarf-regs.c
+@@ -20,7 +20,10 @@
+  *
+  */
+ 
++#include <stdlib.h>
++#ifndef __UCLIBC__
+ #include <libio.h>
++#endif
+ #include <dwarf-regs.h>
+ 
+ /*
diff --git a/trunk/target/linux/generic/patches-3.8/100-overlayfs.patch b/trunk/target/linux/generic/patches-3.8/100-overlayfs.patch
new file mode 100644
index 00000000..26f373d1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/100-overlayfs.patch
@@ -0,0 +1,3191 @@
+--- a/Documentation/filesystems/Locking
++++ b/Documentation/filesystems/Locking
+@@ -64,6 +64,7 @@ prototypes:
+ 	int (*atomic_open)(struct inode *, struct dentry *,
+ 				struct file *, unsigned open_flag,
+ 				umode_t create_mode, int *opened);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ 
+ locking rules:
+ 	all may block
+@@ -91,6 +92,7 @@ removexattr:	yes
+ fiemap:		no
+ update_time:	no
+ atomic_open:	yes
++dentry_open:	no
+ 
+ 	Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
+ victim.
+--- /dev/null
++++ b/Documentation/filesystems/overlayfs.txt
+@@ -0,0 +1,199 @@
++Written by: Neil Brown <neilb@suse.de>
++
++Overlay Filesystem
++==================
++
++This document describes a prototype for a new approach to providing
++overlay-filesystem functionality in Linux (sometimes referred to as
++union-filesystems).  An overlay-filesystem tries to present a
++filesystem which is the result over overlaying one filesystem on top
++of the other.
++
++The result will inevitably fail to look exactly like a normal
++filesystem for various technical reasons.  The expectation is that
++many use cases will be able to ignore these differences.
++
++This approach is 'hybrid' because the objects that appear in the
++filesystem do not all appear to belong to that filesystem.  In many
++cases an object accessed in the union will be indistinguishable
++from accessing the corresponding object from the original filesystem.
++This is most obvious from the 'st_dev' field returned by stat(2).
++
++While directories will report an st_dev from the overlay-filesystem,
++all non-directory objects will report an st_dev from the lower or
++upper filesystem that is providing the object.  Similarly st_ino will
++only be unique when combined with st_dev, and both of these can change
++over the lifetime of a non-directory object.  Many applications and
++tools ignore these values and will not be affected.
++
++Upper and Lower
++---------------
++
++An overlay filesystem combines two filesystems - an 'upper' filesystem
++and a 'lower' filesystem.  When a name exists in both filesystems, the
++object in the 'upper' filesystem is visible while the object in the
++'lower' filesystem is either hidden or, in the case of directories,
++merged with the 'upper' object.
++
++It would be more correct to refer to an upper and lower 'directory
++tree' rather than 'filesystem' as it is quite possible for both
++directory trees to be in the same filesystem and there is no
++requirement that the root of a filesystem be given for either upper or
++lower.
++
++The lower filesystem can be any filesystem supported by Linux and does
++not need to be writable.  The lower filesystem can even be another
++overlayfs.  The upper filesystem will normally be writable and if it
++is it must support the creation of trusted.* extended attributes, and
++must provide valid d_type in readdir responses, at least for symbolic
++links - so NFS is not suitable.
++
++A read-only overlay of two read-only filesystems may use any
++filesystem type.
++
++Directories
++-----------
++
++Overlaying mainly involves directories.  If a given name appears in both
++upper and lower filesystems and refers to a non-directory in either,
++then the lower object is hidden - the name refers only to the upper
++object.
++
++Where both upper and lower objects are directories, a merged directory
++is formed.
++
++At mount time, the two directories given as mount options are combined
++into a merged directory:
++
++  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper /overlay
++
++Then whenever a lookup is requested in such a merged directory, the
++lookup is performed in each actual directory and the combined result
++is cached in the dentry belonging to the overlay filesystem.  If both
++actual lookups find directories, both are stored and a merged
++directory is created, otherwise only one is stored: the upper if it
++exists, else the lower.
++
++Only the lists of names from directories are merged.  Other content
++such as metadata and extended attributes are reported for the upper
++directory only.  These attributes of the lower directory are hidden.
++
++whiteouts and opaque directories
++--------------------------------
++
++In order to support rm and rmdir without changing the lower
++filesystem, an overlay filesystem needs to record in the upper filesystem
++that files have been removed.  This is done using whiteouts and opaque
++directories (non-directories are always opaque).
++
++The overlay filesystem uses extended attributes with a
++"trusted.overlay."  prefix to record these details.
++
++A whiteout is created as a symbolic link with target
++"(overlay-whiteout)" and with xattr "trusted.overlay.whiteout" set to "y".
++When a whiteout is found in the upper level of a merged directory, any
++matching name in the lower level is ignored, and the whiteout itself
++is also hidden.
++
++A directory is made opaque by setting the xattr "trusted.overlay.opaque"
++to "y".  Where the upper filesystem contains an opaque directory, any
++directory in the lower filesystem with the same name is ignored.
++
++readdir
++-------
++
++When a 'readdir' request is made on a merged directory, the upper and
++lower directories are each read and the name lists merged in the
++obvious way (upper is read first, then lower - entries that already
++exist are not re-added).  This merged name list is cached in the
++'struct file' and so remains as long as the file is kept open.  If the
++directory is opened and read by two processes at the same time, they
++will each have separate caches.  A seekdir to the start of the
++directory (offset 0) followed by a readdir will cause the cache to be
++discarded and rebuilt.
++
++This means that changes to the merged directory do not appear while a
++directory is being read.  This is unlikely to be noticed by many
++programs.
++
++seek offsets are assigned sequentially when the directories are read.
++Thus if
++  - read part of a directory
++  - remember an offset, and close the directory
++  - re-open the directory some time later
++  - seek to the remembered offset
++
++there may be little correlation between the old and new locations in
++the list of filenames, particularly if anything has changed in the
++directory.
++
++Readdir on directories that are not merged is simply handled by the
++underlying directory (upper or lower).
++
++
++Non-directories
++---------------
++
++Objects that are not directories (files, symlinks, device-special
++files etc.) are presented either from the upper or lower filesystem as
++appropriate.  When a file in the lower filesystem is accessed in a way
++the requires write-access, such as opening for write access, changing
++some metadata etc., the file is first copied from the lower filesystem
++to the upper filesystem (copy_up).  Note that creating a hard-link
++also requires copy_up, though of course creation of a symlink does
++not.
++
++The copy_up may turn out to be unnecessary, for example if the file is
++opened for read-write but the data is not modified.
++
++The copy_up process first makes sure that the containing directory
++exists in the upper filesystem - creating it and any parents as
++necessary.  It then creates the object with the same metadata (owner,
++mode, mtime, symlink-target etc.) and then if the object is a file, the
++data is copied from the lower to the upper filesystem.  Finally any
++extended attributes are copied up.
++
++Once the copy_up is complete, the overlay filesystem simply
++provides direct access to the newly created file in the upper
++filesystem - future operations on the file are barely noticed by the
++overlay filesystem (though an operation on the name of the file such as
++rename or unlink will of course be noticed and handled).
++
++
++Non-standard behavior
++---------------------
++
++The copy_up operation essentially creates a new, identical file and
++moves it over to the old name.  The new file may be on a different
++filesystem, so both st_dev and st_ino of the file may change.
++
++Any open files referring to this inode will access the old data and
++metadata.  Similarly any file locks obtained before copy_up will not
++apply to the copied up file.
++
++On a file opened with O_RDONLY fchmod(2), fchown(2), futimesat(2) and
++fsetxattr(2) will fail with EROFS.
++
++If a file with multiple hard links is copied up, then this will
++"break" the link.  Changes will not be propagated to other names
++referring to the same inode.
++
++Symlinks in /proc/PID/ and /proc/PID/fd which point to a non-directory
++object in overlayfs will not contain valid absolute paths, only
++relative paths leading up to the filesystem's root.  This will be
++fixed in the future.
++
++Some operations are not atomic, for example a crash during copy_up or
++rename will leave the filesystem in an inconsistent state.  This will
++be addressed in the future.
++
++Changes to underlying filesystems
++---------------------------------
++
++Offline changes, when the overlay is not mounted, are allowed to either
++the upper or the lower trees.
++
++Changes to the underlying filesystems while part of a mounted overlay
++filesystem are not allowed.  If the underlying filesystem is changed,
++the behavior of the overlay is undefined, though it will not result in
++a crash or deadlock.
+--- a/Documentation/filesystems/vfs.txt
++++ b/Documentation/filesystems/vfs.txt
+@@ -362,6 +362,7 @@ struct inode_operations {
+ 	int (*atomic_open)(struct inode *, struct dentry *,
+ 				struct file *, unsigned open_flag,
+ 				umode_t create_mode, int *opened);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ };
+ 
+ Again, all methods are called without any locks being held, unless
+@@ -681,6 +682,12 @@ struct address_space_operations {
+   	but instead uses bmap to find out where the blocks in the file
+   	are and uses those addresses directly.
+ 
++  dentry_open: this is an alternative to f_op->open(), the difference is that
++	this method may open a file not necessarily originating from the same
++	filesystem as the one i_op->open() was called on.  It may be
++	useful for stacking filesystems which want to allow native I/O directly
++	on underlying files.
++
+ 
+   invalidatepage: If a page has PagePrivate set, then invalidatepage
+         will be called when part or all of the page is to be removed
+--- a/fs/ecryptfs/main.c
++++ b/fs/ecryptfs/main.c
+@@ -567,6 +567,13 @@ static struct dentry *ecryptfs_mount(str
+ 	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
+ 	s->s_blocksize = path.dentry->d_sb->s_blocksize;
+ 	s->s_magic = ECRYPTFS_SUPER_MAGIC;
++	s->s_stack_depth = path.dentry->d_sb->s_stack_depth + 1;
++
++	rc = -EINVAL;
++	if (s->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		printk(KERN_ERR "eCryptfs: maximum fs stacking depth exceeded\n");
++		goto out_free;
++	}
+ 
+ 	inode = ecryptfs_get_inode(path.dentry->d_inode, s);
+ 	rc = PTR_ERR(inode);
+--- a/fs/internal.h
++++ b/fs/internal.h
+@@ -42,11 +42,6 @@ static inline int __sync_blockdev(struct
+ extern void __init chrdev_init(void);
+ 
+ /*
+- * namei.c
+- */
+-extern int __inode_permission(struct inode *, int);
+-
+-/*
+  * namespace.c
+  */
+ extern int copy_mount_options(const void __user *, unsigned long *);
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -67,6 +67,7 @@ source "fs/quota/Kconfig"
+ 
+ source "fs/autofs4/Kconfig"
+ source "fs/fuse/Kconfig"
++source "fs/overlayfs/Kconfig"
+ 
+ config GENERIC_ACL
+ 	bool
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -107,6 +107,7 @@ obj-$(CONFIG_QNX6FS_FS)		+= qnx6/
+ obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
+ obj-$(CONFIG_ADFS_FS)		+= adfs/
+ obj-$(CONFIG_FUSE_FS)		+= fuse/
++obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/
+ obj-$(CONFIG_UDF_FS)		+= udf/
+ obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
+ obj-$(CONFIG_OMFS_FS)		+= omfs/
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -402,6 +402,7 @@ int __inode_permission(struct inode *ino
+ 
+ 	return security_inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(__inode_permission);
+ 
+ /**
+  * sb_permission - Check superblock-level permissions
+@@ -2876,9 +2877,12 @@ finish_open_created:
+ 	error = may_open(&nd->path, acc_mode, open_flag);
+ 	if (error)
+ 		goto out;
+-	file->f_path.mnt = nd->path.mnt;
+-	error = finish_open(file, nd->path.dentry, NULL, opened);
+-	if (error) {
++
++	BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
++	error = vfs_open(&nd->path, file, current_cred());
++	if (!error) {
++		*opened |= FILE_OPENED;
++	} else {
+ 		if (error == -EOPENSTALE)
+ 			goto stale_open;
+ 		goto out;
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1421,6 +1421,24 @@ void drop_collected_mounts(struct vfsmou
+ 	release_mounts(&umount_list);
+ }
+ 
++struct vfsmount *clone_private_mount(struct path *path)
++{
++	struct mount *old_mnt = real_mount(path->mnt);
++	struct mount *new_mnt;
++
++	if (IS_MNT_UNBINDABLE(old_mnt))
++		return ERR_PTR(-EINVAL);
++
++	down_read(&namespace_sem);
++	new_mnt = clone_mnt(old_mnt, path->dentry, CL_PRIVATE);
++	up_read(&namespace_sem);
++	if (!new_mnt)
++		return ERR_PTR(-ENOMEM);
++
++	return &new_mnt->mnt;
++}
++EXPORT_SYMBOL_GPL(clone_private_mount);
++
+ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 		   struct vfsmount *root)
+ {
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -816,8 +816,7 @@ struct file *dentry_open(const struct pa
+ 		return ERR_PTR(error);
+ 
+ 	f->f_flags = flags;
+-	f->f_path = *path;
+-	error = do_dentry_open(f, NULL, cred);
++	error = vfs_open(path, f, cred);
+ 	if (!error) {
+ 		error = open_check_o_direct(f);
+ 		if (error) {
+@@ -832,6 +831,26 @@ struct file *dentry_open(const struct pa
+ }
+ EXPORT_SYMBOL(dentry_open);
+ 
++/**
++ * vfs_open - open the file at the given path
++ * @path: path to open
++ * @filp: newly allocated file with f_flag initialized
++ * @cred: credentials to use
++ */
++int vfs_open(const struct path *path, struct file *filp,
++	     const struct cred *cred)
++{
++	struct inode *inode = path->dentry->d_inode;
++
++	if (inode->i_op->dentry_open)
++		return inode->i_op->dentry_open(path->dentry, filp, cred);
++	else {
++		filp->f_path = *path;
++		return do_dentry_open(filp, NULL, cred);
++	}
++}
++EXPORT_SYMBOL(vfs_open);
++
+ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op)
+ {
+ 	int lookup_flags = 0;
+--- /dev/null
++++ b/fs/overlayfs/copy_up.c
+@@ -0,0 +1,385 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/file.h>
++#include <linux/splice.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/uaccess.h>
++#include <linux/sched.h>
++#include "overlayfs.h"
++
++#define OVL_COPY_UP_CHUNK_SIZE (1 << 20)
++
++static int ovl_copy_up_xattr(struct dentry *old, struct dentry *new)
++{
++	ssize_t list_size, size;
++	char *buf, *name, *value;
++	int error;
++
++	if (!old->d_inode->i_op->getxattr ||
++	    !new->d_inode->i_op->getxattr)
++		return 0;
++
++	list_size = vfs_listxattr(old, NULL, 0);
++	if (list_size <= 0) {
++		if (list_size == -EOPNOTSUPP)
++			return 0;
++		return list_size;
++	}
++
++	buf = kzalloc(list_size, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++
++	error = -ENOMEM;
++	value = kmalloc(XATTR_SIZE_MAX, GFP_KERNEL);
++	if (!value)
++		goto out;
++
++	list_size = vfs_listxattr(old, buf, list_size);
++	if (list_size <= 0) {
++		error = list_size;
++		goto out_free_value;
++	}
++
++	for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
++		size = vfs_getxattr(old, name, value, XATTR_SIZE_MAX);
++		if (size <= 0) {
++			error = size;
++			goto out_free_value;
++		}
++		error = vfs_setxattr(new, name, value, size, 0);
++		if (error)
++			goto out_free_value;
++	}
++
++out_free_value:
++	kfree(value);
++out:
++	kfree(buf);
++	return error;
++}
++
++static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
++{
++	struct file *old_file;
++	struct file *new_file;
++	int error = 0;
++
++	if (len == 0)
++		return 0;
++
++	old_file = ovl_path_open(old, O_RDONLY);
++	if (IS_ERR(old_file))
++		return PTR_ERR(old_file);
++
++	new_file = ovl_path_open(new, O_WRONLY);
++	if (IS_ERR(new_file)) {
++		error = PTR_ERR(new_file);
++		goto out_fput;
++	}
++
++	/* FIXME: copy up sparse files efficiently */
++	while (len) {
++		loff_t offset = new_file->f_pos;
++		size_t this_len = OVL_COPY_UP_CHUNK_SIZE;
++		long bytes;
++
++		if (len < this_len)
++			this_len = len;
++
++		if (signal_pending_state(TASK_KILLABLE, current)) {
++			error = -EINTR;
++			break;
++		}
++
++		bytes = do_splice_direct(old_file, &offset, new_file, this_len,
++				 SPLICE_F_MOVE);
++		if (bytes <= 0) {
++			error = bytes;
++			break;
++		}
++
++		len -= bytes;
++	}
++
++	fput(new_file);
++out_fput:
++	fput(old_file);
++	return error;
++}
++
++static char *ovl_read_symlink(struct dentry *realdentry)
++{
++	int res;
++	char *buf;
++	struct inode *inode = realdentry->d_inode;
++	mm_segment_t old_fs;
++
++	res = -EINVAL;
++	if (!inode->i_op->readlink)
++		goto err;
++
++	res = -ENOMEM;
++	buf = (char *) __get_free_page(GFP_KERNEL);
++	if (!buf)
++		goto err;
++
++	old_fs = get_fs();
++	set_fs(get_ds());
++	/* The cast to a user pointer is valid due to the set_fs() */
++	res = inode->i_op->readlink(realdentry,
++				    (char __user *)buf, PAGE_SIZE - 1);
++	set_fs(old_fs);
++	if (res < 0) {
++		free_page((unsigned long) buf);
++		goto err;
++	}
++	buf[res] = '\0';
++
++	return buf;
++
++err:
++	return ERR_PTR(res);
++}
++
++static int ovl_set_timestamps(struct dentry *upperdentry, struct kstat *stat)
++{
++	struct iattr attr = {
++		.ia_valid =
++		     ATTR_ATIME | ATTR_MTIME | ATTR_ATIME_SET | ATTR_MTIME_SET,
++		.ia_atime = stat->atime,
++		.ia_mtime = stat->mtime,
++	};
++
++	return notify_change(upperdentry, &attr);
++}
++
++static int ovl_set_mode(struct dentry *upperdentry, umode_t mode)
++{
++	struct iattr attr = {
++		.ia_valid = ATTR_MODE,
++		.ia_mode = mode,
++	};
++
++	return notify_change(upperdentry, &attr);
++}
++
++static int ovl_copy_up_locked(struct dentry *upperdir, struct dentry *dentry,
++			      struct path *lowerpath, struct kstat *stat,
++			      const char *link)
++{
++	int err;
++	struct path newpath;
++	umode_t mode = stat->mode;
++
++	/* Can't properly set mode on creation because of the umask */
++	stat->mode &= S_IFMT;
++
++	ovl_path_upper(dentry, &newpath);
++	WARN_ON(newpath.dentry);
++	newpath.dentry = ovl_upper_create(upperdir, dentry, stat, link);
++	if (IS_ERR(newpath.dentry))
++		return PTR_ERR(newpath.dentry);
++
++	if (S_ISREG(stat->mode)) {
++		err = ovl_copy_up_data(lowerpath, &newpath, stat->size);
++		if (err)
++			goto err_remove;
++	}
++
++	err = ovl_copy_up_xattr(lowerpath->dentry, newpath.dentry);
++	if (err)
++		goto err_remove;
++
++	mutex_lock(&newpath.dentry->d_inode->i_mutex);
++	if (!S_ISLNK(stat->mode))
++		err = ovl_set_mode(newpath.dentry, mode);
++	if (!err)
++		err = ovl_set_timestamps(newpath.dentry, stat);
++	mutex_unlock(&newpath.dentry->d_inode->i_mutex);
++	if (err)
++		goto err_remove;
++
++	ovl_dentry_update(dentry, newpath.dentry);
++
++	/*
++	 * Easiest way to get rid of the lower dentry reference is to
++	 * drop this dentry.  This is neither needed nor possible for
++	 * directories.
++	 */
++	if (!S_ISDIR(stat->mode))
++		d_drop(dentry);
++
++	return 0;
++
++err_remove:
++	if (S_ISDIR(stat->mode))
++		vfs_rmdir(upperdir->d_inode, newpath.dentry);
++	else
++		vfs_unlink(upperdir->d_inode, newpath.dentry);
++
++	dput(newpath.dentry);
++
++	return err;
++}
++
++/*
++ * Copy up a single dentry
++ *
++ * Directory renames only allowed on "pure upper" (already created on
++ * upper filesystem, never copied up).  Directories which are on lower or
++ * are merged may not be renamed.  For these -EXDEV is returned and
++ * userspace has to deal with it.  This means, when copying up a
++ * directory we can rely on it and ancestors being stable.
++ *
++ * Non-directory renames start with copy up of source if necessary.  The
++ * actual rename will only proceed once the copy up was successful.  Copy
++ * up uses upper parent i_mutex for exclusion.  Since rename can change
++ * d_parent it is possible that the copy up will lock the old parent.  At
++ * that point the file will have already been copied up anyway.
++ */
++static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,
++			   struct path *lowerpath, struct kstat *stat)
++{
++	int err;
++	struct kstat pstat;
++	struct path parentpath;
++	struct dentry *upperdir;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	char *link = NULL;
++
++	ovl_path_upper(parent, &parentpath);
++	upperdir = parentpath.dentry;
++
++	err = vfs_getattr(parentpath.mnt, parentpath.dentry, &pstat);
++	if (err)
++		return err;
++
++	if (S_ISLNK(stat->mode)) {
++		link = ovl_read_symlink(lowerpath->dentry);
++		if (IS_ERR(link))
++			return PTR_ERR(link);
++	}
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out_free_link;
++
++	override_cred->fsuid = stat->uid;
++	override_cred->fsgid = stat->gid;
++	/*
++	 * CAP_SYS_ADMIN for copying up extended attributes
++	 * CAP_DAC_OVERRIDE for create
++	 * CAP_FOWNER for chmod, timestamp update
++	 * CAP_FSETID for chmod
++	 * CAP_MKNOD for mknod
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	cap_raise(override_cred->cap_effective, CAP_FSETID);
++	cap_raise(override_cred->cap_effective, CAP_MKNOD);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	if (ovl_path_type(dentry) != OVL_PATH_LOWER) {
++		err = 0;
++	} else {
++		err = ovl_copy_up_locked(upperdir, dentry, lowerpath,
++					 stat, link);
++		if (!err) {
++			/* Restore timestamps on parent (best effort) */
++			ovl_set_timestamps(upperdir, &pstat);
++		}
++	}
++
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++out_free_link:
++	if (link)
++		free_page((unsigned long) link);
++
++	return err;
++}
++
++int ovl_copy_up(struct dentry *dentry)
++{
++	int err;
++
++	err = 0;
++	while (!err) {
++		struct dentry *next;
++		struct dentry *parent;
++		struct path lowerpath;
++		struct kstat stat;
++		enum ovl_path_type type = ovl_path_type(dentry);
++
++		if (type != OVL_PATH_LOWER)
++			break;
++
++		next = dget(dentry);
++		/* find the topmost dentry not yet copied up */
++		for (;;) {
++			parent = dget_parent(next);
++
++			type = ovl_path_type(parent);
++			if (type != OVL_PATH_LOWER)
++				break;
++
++			dput(next);
++			next = parent;
++		}
++
++		ovl_path_lower(next, &lowerpath);
++		err = vfs_getattr(lowerpath.mnt, lowerpath.dentry, &stat);
++		if (!err)
++			err = ovl_copy_up_one(parent, next, &lowerpath, &stat);
++
++		dput(parent);
++		dput(next);
++	}
++
++	return err;
++}
++
++/* Optimize by not copying up the file first and truncating later */
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size)
++{
++	int err;
++	struct kstat stat;
++	struct path lowerpath;
++	struct dentry *parent = dget_parent(dentry);
++
++	err = ovl_copy_up(parent);
++	if (err)
++		goto out_dput_parent;
++
++	ovl_path_lower(dentry, &lowerpath);
++	err = vfs_getattr(lowerpath.mnt, lowerpath.dentry, &stat);
++	if (err)
++		goto out_dput_parent;
++
++	if (size < stat.size)
++		stat.size = size;
++
++	err = ovl_copy_up_one(parent, dentry, &lowerpath, &stat);
++
++out_dput_parent:
++	dput(parent);
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/dir.c
+@@ -0,0 +1,604 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++static const char *ovl_whiteout_symlink = "(overlay-whiteout)";
++
++static int ovl_whiteout(struct dentry *upperdir, struct dentry *dentry)
++{
++	int err;
++	struct dentry *newdentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	/* FIXME: recheck lower dentry to see if whiteout is really needed */
++
++	err = -ENOMEM;
++	override_cred = prepare_creds();
++	if (!override_cred)
++		goto out;
++
++	/*
++	 * CAP_SYS_ADMIN for setxattr
++	 * CAP_DAC_OVERRIDE for symlink creation
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	override_cred->fsuid = GLOBAL_ROOT_UID;
++	override_cred->fsgid = GLOBAL_ROOT_GID;
++	old_cred = override_creds(override_cred);
++
++	newdentry = lookup_one_len(dentry->d_name.name, upperdir,
++				   dentry->d_name.len);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_put_cred;
++
++	/* Just been removed within the same locked region */
++	WARN_ON(newdentry->d_inode);
++
++	err = vfs_symlink(upperdir->d_inode, newdentry, ovl_whiteout_symlink);
++	if (err)
++		goto out_dput;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++
++	err = vfs_setxattr(newdentry, ovl_whiteout_xattr, "y", 1, 0);
++	if (err)
++		vfs_unlink(upperdir->d_inode, newdentry);
++
++out_dput:
++	dput(newdentry);
++out_put_cred:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++out:
++	if (err) {
++		/*
++		 * There's no way to recover from failure to whiteout.
++		 * What should we do?  Log a big fat error and... ?
++		 */
++		printk(KERN_ERR "overlayfs: ERROR - failed to whiteout '%s'\n",
++		       dentry->d_name.name);
++	}
++
++	return err;
++}
++
++static struct dentry *ovl_lookup_create(struct dentry *upperdir,
++					struct dentry *template)
++{
++	int err;
++	struct dentry *newdentry;
++	struct qstr *name = &template->d_name;
++
++	newdentry = lookup_one_len(name->name, upperdir, name->len);
++	if (IS_ERR(newdentry))
++		return newdentry;
++
++	if (newdentry->d_inode) {
++		const struct cred *old_cred;
++		struct cred *override_cred;
++
++		/* No need to check whiteout if lower parent is non-existent */
++		err = -EEXIST;
++		if (!ovl_dentry_lower(template->d_parent))
++			goto out_dput;
++
++		if (!S_ISLNK(newdentry->d_inode->i_mode))
++			goto out_dput;
++
++		err = -ENOMEM;
++		override_cred = prepare_creds();
++		if (!override_cred)
++			goto out_dput;
++
++		/*
++		 * CAP_SYS_ADMIN for getxattr
++		 * CAP_FOWNER for unlink in sticky directory
++		 */
++		cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++		cap_raise(override_cred->cap_effective, CAP_FOWNER);
++		old_cred = override_creds(override_cred);
++
++		err = -EEXIST;
++		if (ovl_is_whiteout(newdentry))
++			err = vfs_unlink(upperdir->d_inode, newdentry);
++
++		revert_creds(old_cred);
++		put_cred(override_cred);
++		if (err)
++			goto out_dput;
++
++		dput(newdentry);
++		newdentry = lookup_one_len(name->name, upperdir, name->len);
++		if (IS_ERR(newdentry)) {
++			ovl_whiteout(upperdir, template);
++			return newdentry;
++		}
++
++		/*
++		 * Whiteout just been successfully removed, parent
++		 * i_mutex is still held, there's no way the lookup
++		 * could return positive.
++		 */
++		WARN_ON(newdentry->d_inode);
++	}
++
++	return newdentry;
++
++out_dput:
++	dput(newdentry);
++	return ERR_PTR(err);
++}
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct inode *dir = upperdir->d_inode;
++
++	newdentry = ovl_lookup_create(upperdir, dentry);
++	if (IS_ERR(newdentry))
++		goto out;
++
++	switch (stat->mode & S_IFMT) {
++	case S_IFREG:
++		err = vfs_create(dir, newdentry, stat->mode, NULL);
++		break;
++
++	case S_IFDIR:
++		err = vfs_mkdir(dir, newdentry, stat->mode);
++		break;
++
++	case S_IFCHR:
++	case S_IFBLK:
++	case S_IFIFO:
++	case S_IFSOCK:
++		err = vfs_mknod(dir, newdentry, stat->mode, stat->rdev);
++		break;
++
++	case S_IFLNK:
++		err = vfs_symlink(dir, newdentry, link);
++		break;
++
++	default:
++		err = -EPERM;
++	}
++	if (err) {
++		if (ovl_dentry_is_opaque(dentry))
++			ovl_whiteout(upperdir, dentry);
++		dput(newdentry);
++		newdentry = ERR_PTR(err);
++	} else if (WARN_ON(!newdentry->d_inode)) {
++		/*
++		 * Not quite sure if non-instantiated dentry is legal or not.
++		 * VFS doesn't seem to care so check and warn here.
++		 */
++		dput(newdentry);
++		newdentry = ERR_PTR(-ENOENT);
++	}
++
++out:
++	return newdentry;
++
++}
++
++static int ovl_set_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for setxattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_setxattr(upperdentry, ovl_opaque_xattr, "y", 1, 0);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_remove_opaque(struct dentry *upperdentry)
++{
++	int err;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/* CAP_SYS_ADMIN for removexattr of "trusted" namespace */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	old_cred = override_creds(override_cred);
++	err = vfs_removexattr(upperdentry, ovl_opaque_xattr);
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++static int ovl_dir_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++
++	type = ovl_path_real(dentry, &realpath);
++	err = vfs_getattr(realpath.mnt, realpath.dentry, stat);
++	if (err)
++		return err;
++
++	stat->dev = dentry->d_sb->s_dev;
++	stat->ino = dentry->d_inode->i_ino;
++
++	/*
++	 * It's probably not worth it to count subdirs to get the
++	 * correct link count.  nlink=1 seems to pacify 'find' and
++	 * other utilities.
++	 */
++	if (type == OVL_PATH_MERGE)
++		stat->nlink = 1;
++
++	return 0;
++}
++
++static int ovl_create_object(struct dentry *dentry, int mode, dev_t rdev,
++			     const char *link)
++{
++	int err;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *inode;
++	struct kstat stat = {
++		.mode = mode,
++		.rdev = rdev,
++	};
++
++	err = -ENOMEM;
++	inode = ovl_new_inode(dentry->d_sb, mode, dentry->d_fsdata);
++	if (!inode)
++		goto out;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		goto out_iput;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++
++	newdentry = ovl_upper_create(upperdir, dentry, &stat, link);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	ovl_dentry_version_inc(dentry->d_parent);
++	if (ovl_dentry_is_opaque(dentry) && S_ISDIR(mode)) {
++		err = ovl_set_opaque(newdentry);
++		if (err) {
++			vfs_rmdir(upperdir->d_inode, newdentry);
++			ovl_whiteout(upperdir, dentry);
++			goto out_dput;
++		}
++	}
++	ovl_dentry_update(dentry, newdentry);
++	ovl_copyattr(newdentry->d_inode, inode);
++	d_instantiate(dentry, inode);
++	inode = NULL;
++	newdentry = NULL;
++	err = 0;
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out_iput:
++	iput(inode);
++out:
++	return err;
++}
++
++static int ovl_create(struct inode *dir, struct dentry *dentry, umode_t mode,
++		      bool excl)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFREG, 0, NULL);
++}
++
++static int ovl_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
++{
++	return ovl_create_object(dentry, (mode & 07777) | S_IFDIR, 0, NULL);
++}
++
++static int ovl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
++		     dev_t rdev)
++{
++	return ovl_create_object(dentry, mode, rdev, NULL);
++}
++
++static int ovl_symlink(struct inode *dir, struct dentry *dentry,
++			 const char *link)
++{
++	return ovl_create_object(dentry, S_IFLNK, 0, link);
++}
++
++static int ovl_do_remove(struct dentry *dentry, bool is_dir)
++{
++	int err;
++	enum ovl_path_type type;
++	struct path realpath;
++	struct dentry *upperdir;
++
++	err = ovl_copy_up(dentry->d_parent);
++	if (err)
++		return err;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	type = ovl_path_real(dentry, &realpath);
++	if (type != OVL_PATH_LOWER) {
++		err = -ESTALE;
++		if (realpath.dentry->d_parent != upperdir)
++			goto out_d_drop;
++
++		/* FIXME: create whiteout up front and rename to target */
++
++		if (is_dir)
++			err = vfs_rmdir(upperdir->d_inode, realpath.dentry);
++		else
++			err = vfs_unlink(upperdir->d_inode, realpath.dentry);
++		if (err)
++			goto out_d_drop;
++
++		ovl_dentry_version_inc(dentry->d_parent);
++	}
++
++	if (type != OVL_PATH_UPPER || ovl_dentry_is_opaque(dentry))
++		err = ovl_whiteout(upperdir, dentry);
++
++	/*
++	 * Keeping this dentry hashed would mean having to release
++	 * upperpath/lowerpath, which could only be done if we are the
++	 * sole user of this dentry.  Too tricky...  Just unhash for
++	 * now.
++	 */
++out_d_drop:
++	d_drop(dentry);
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_unlink(struct inode *dir, struct dentry *dentry)
++{
++	return ovl_do_remove(dentry, false);
++}
++
++
++static int ovl_rmdir(struct inode *dir, struct dentry *dentry)
++{
++	int err;
++	enum ovl_path_type type;
++
++	type = ovl_path_type(dentry);
++	if (type != OVL_PATH_UPPER) {
++		err = ovl_check_empty_and_clear(dentry, type);
++		if (err)
++			return err;
++	}
++
++	return ovl_do_remove(dentry, true);
++}
++
++static int ovl_link(struct dentry *old, struct inode *newdir,
++		    struct dentry *new)
++{
++	int err;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *upperdir;
++	struct inode *newinode;
++
++	err = ovl_copy_up(old);
++	if (err)
++		goto out;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		goto out;
++
++	upperdir = ovl_dentry_upper(new->d_parent);
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	newdentry = ovl_lookup_create(upperdir, new);
++	err = PTR_ERR(newdentry);
++	if (IS_ERR(newdentry))
++		goto out_unlock;
++
++	olddentry = ovl_dentry_upper(old);
++	err = vfs_link(olddentry, upperdir->d_inode, newdentry);
++	if (!err) {
++		if (WARN_ON(!newdentry->d_inode)) {
++			dput(newdentry);
++			err = -ENOENT;
++			goto out_unlock;
++		}
++		newinode = ovl_new_inode(old->d_sb, newdentry->d_inode->i_mode,
++				new->d_fsdata);
++		if (!newinode)
++			goto link_fail;
++		ovl_copyattr(upperdir->d_inode, newinode);
++
++		ovl_dentry_version_inc(new->d_parent);
++		ovl_dentry_update(new, newdentry);
++
++		d_instantiate(new, newinode);
++	} else {
++link_fail:
++		if (ovl_dentry_is_opaque(new))
++			ovl_whiteout(upperdir, new);
++		dput(newdentry);
++	}
++out_unlock:
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++out:
++	return err;
++
++}
++
++static int ovl_rename(struct inode *olddir, struct dentry *old,
++			struct inode *newdir, struct dentry *new)
++{
++	int err;
++	enum ovl_path_type old_type;
++	enum ovl_path_type new_type;
++	struct dentry *old_upperdir;
++	struct dentry *new_upperdir;
++	struct dentry *olddentry;
++	struct dentry *newdentry;
++	struct dentry *trap;
++	bool old_opaque;
++	bool new_opaque;
++	bool new_create = false;
++	bool is_dir = S_ISDIR(old->d_inode->i_mode);
++
++	/* Don't copy up directory trees */
++	old_type = ovl_path_type(old);
++	if (old_type != OVL_PATH_UPPER && is_dir)
++		return -EXDEV;
++
++	if (new->d_inode) {
++		new_type = ovl_path_type(new);
++
++		if (new_type == OVL_PATH_LOWER && old_type == OVL_PATH_LOWER) {
++			if (ovl_dentry_lower(old)->d_inode ==
++			    ovl_dentry_lower(new)->d_inode)
++				return 0;
++		}
++		if (new_type != OVL_PATH_LOWER && old_type != OVL_PATH_LOWER) {
++			if (ovl_dentry_upper(old)->d_inode ==
++			    ovl_dentry_upper(new)->d_inode)
++				return 0;
++		}
++
++		if (new_type != OVL_PATH_UPPER &&
++		    S_ISDIR(new->d_inode->i_mode)) {
++			err = ovl_check_empty_and_clear(new, new_type);
++			if (err)
++				return err;
++		}
++	} else {
++		new_type = OVL_PATH_UPPER;
++	}
++
++	err = ovl_copy_up(old);
++	if (err)
++		return err;
++
++	err = ovl_copy_up(new->d_parent);
++	if (err)
++		return err;
++
++	old_upperdir = ovl_dentry_upper(old->d_parent);
++	new_upperdir = ovl_dentry_upper(new->d_parent);
++
++	trap = lock_rename(new_upperdir, old_upperdir);
++
++	olddentry = ovl_dentry_upper(old);
++	newdentry = ovl_dentry_upper(new);
++	if (newdentry) {
++		dget(newdentry);
++	} else {
++		new_create = true;
++		newdentry = ovl_lookup_create(new_upperdir, new);
++		err = PTR_ERR(newdentry);
++		if (IS_ERR(newdentry))
++			goto out_unlock;
++	}
++
++	err = -ESTALE;
++	if (olddentry->d_parent != old_upperdir)
++		goto out_dput;
++	if (newdentry->d_parent != new_upperdir)
++		goto out_dput;
++	if (olddentry == trap)
++		goto out_dput;
++	if (newdentry == trap)
++		goto out_dput;
++
++	old_opaque = ovl_dentry_is_opaque(old);
++	new_opaque = ovl_dentry_is_opaque(new) || new_type != OVL_PATH_UPPER;
++
++	if (is_dir && !old_opaque && new_opaque) {
++		err = ovl_set_opaque(olddentry);
++		if (err)
++			goto out_dput;
++	}
++
++	err = vfs_rename(old_upperdir->d_inode, olddentry,
++			 new_upperdir->d_inode, newdentry);
++
++	if (err) {
++		if (new_create && ovl_dentry_is_opaque(new))
++			ovl_whiteout(new_upperdir, new);
++		if (is_dir && !old_opaque && new_opaque)
++			ovl_remove_opaque(olddentry);
++		goto out_dput;
++	}
++
++	if (old_type != OVL_PATH_UPPER || old_opaque)
++		err = ovl_whiteout(old_upperdir, old);
++	if (is_dir && old_opaque && !new_opaque)
++		ovl_remove_opaque(olddentry);
++
++	if (old_opaque != new_opaque)
++		ovl_dentry_set_opaque(old, new_opaque);
++
++	ovl_dentry_version_inc(old->d_parent);
++	ovl_dentry_version_inc(new->d_parent);
++
++out_dput:
++	dput(newdentry);
++out_unlock:
++	unlock_rename(new_upperdir, old_upperdir);
++	return err;
++}
++
++const struct inode_operations ovl_dir_inode_operations = {
++	.lookup		= ovl_lookup,
++	.mkdir		= ovl_mkdir,
++	.symlink	= ovl_symlink,
++	.unlink		= ovl_unlink,
++	.rmdir		= ovl_rmdir,
++	.rename		= ovl_rename,
++	.link		= ovl_link,
++	.setattr	= ovl_setattr,
++	.create		= ovl_create,
++	.mknod		= ovl_mknod,
++	.permission	= ovl_permission,
++	.getattr	= ovl_dir_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
+--- /dev/null
++++ b/fs/overlayfs/inode.c
+@@ -0,0 +1,372 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/xattr.h>
++#include "overlayfs.h"
++
++int ovl_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct dentry *upperdentry;
++	int err;
++
++	if ((attr->ia_valid & ATTR_SIZE) && !ovl_dentry_upper(dentry))
++		err = ovl_copy_up_truncate(dentry, attr->ia_size);
++	else
++		err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++
++	if (attr->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
++		attr->ia_valid &= ~ATTR_MODE;
++
++	mutex_lock(&upperdentry->d_inode->i_mutex);
++	err = notify_change(upperdentry, attr);
++	if (!err)
++		ovl_copyattr(upperdentry->d_inode, dentry->d_inode);
++	mutex_unlock(&upperdentry->d_inode->i_mutex);
++
++	return err;
++}
++
++static int ovl_getattr(struct vfsmount *mnt, struct dentry *dentry,
++			 struct kstat *stat)
++{
++	struct path realpath;
++
++	ovl_path_real(dentry, &realpath);
++	return vfs_getattr(realpath.mnt, realpath.dentry, stat);
++}
++
++int ovl_permission(struct inode *inode, int mask)
++{
++	struct ovl_entry *oe;
++	struct dentry *alias = NULL;
++	struct inode *realinode;
++	struct dentry *realdentry;
++	bool is_upper;
++	int err;
++
++	if (S_ISDIR(inode->i_mode)) {
++		oe = inode->i_private;
++	} else if (mask & MAY_NOT_BLOCK) {
++		return -ECHILD;
++	} else {
++		/*
++		 * For non-directories find an alias and get the info
++		 * from there.
++		 */
++		alias = d_find_any_alias(inode);
++		if (WARN_ON(!alias))
++			return -ENOENT;
++
++		oe = alias->d_fsdata;
++	}
++
++	realdentry = ovl_entry_real(oe, &is_upper);
++
++	/* Careful in RCU walk mode */
++	realinode = ACCESS_ONCE(realdentry->d_inode);
++	if (!realinode) {
++		WARN_ON(!(mask & MAY_NOT_BLOCK));
++		err = -ENOENT;
++		goto out_dput;
++	}
++
++	if (mask & MAY_WRITE) {
++		umode_t mode = realinode->i_mode;
++
++		/*
++		 * Writes will always be redirected to upper layer, so
++		 * ignore lower layer being read-only.
++		 *
++		 * If the overlay itself is read-only then proceed
++		 * with the permission check, don't return EROFS.
++		 * This will only happen if this is the lower layer of
++		 * another overlayfs.
++		 *
++		 * If upper fs becomes read-only after the overlay was
++		 * constructed return EROFS to prevent modification of
++		 * upper layer.
++		 */
++		err = -EROFS;
++		if (is_upper && !IS_RDONLY(inode) && IS_RDONLY(realinode) &&
++		    (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
++			goto out_dput;
++	}
++
++	err = __inode_permission(realinode, mask);
++out_dput:
++	dput(alias);
++	return err;
++}
++
++
++struct ovl_link_data {
++	struct dentry *realdentry;
++	void *cookie;
++};
++
++static void *ovl_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	void *ret;
++	struct dentry *realdentry;
++	struct inode *realinode;
++
++	realdentry = ovl_dentry_real(dentry);
++	realinode = realdentry->d_inode;
++
++	if (WARN_ON(!realinode->i_op->follow_link))
++		return ERR_PTR(-EPERM);
++
++	ret = realinode->i_op->follow_link(realdentry, nd);
++	if (IS_ERR(ret))
++		return ret;
++
++	if (realinode->i_op->put_link) {
++		struct ovl_link_data *data;
++
++		data = kmalloc(sizeof(struct ovl_link_data), GFP_KERNEL);
++		if (!data) {
++			realinode->i_op->put_link(realdentry, nd, ret);
++			return ERR_PTR(-ENOMEM);
++		}
++		data->realdentry = realdentry;
++		data->cookie = ret;
++
++		return data;
++	} else {
++		return NULL;
++	}
++}
++
++static void ovl_put_link(struct dentry *dentry, struct nameidata *nd, void *c)
++{
++	struct inode *realinode;
++	struct ovl_link_data *data = c;
++
++	if (!data)
++		return;
++
++	realinode = data->realdentry->d_inode;
++	realinode->i_op->put_link(data->realdentry, nd, data->cookie);
++	kfree(data);
++}
++
++static int ovl_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
++{
++	struct path realpath;
++	struct inode *realinode;
++
++	ovl_path_real(dentry, &realpath);
++	realinode = realpath.dentry->d_inode;
++
++	if (!realinode->i_op->readlink)
++		return -EINVAL;
++
++	touch_atime(&realpath);
++
++	return realinode->i_op->readlink(realpath.dentry, buf, bufsiz);
++}
++
++
++static bool ovl_is_private_xattr(const char *name)
++{
++	return strncmp(name, "trusted.overlay.", 14) == 0;
++}
++
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags)
++{
++	int err;
++	struct dentry *upperdentry;
++
++	if (ovl_is_private_xattr(name))
++		return -EPERM;
++
++	err = ovl_copy_up(dentry);
++	if (err)
++		return err;
++
++	upperdentry = ovl_dentry_upper(dentry);
++	return  vfs_setxattr(upperdentry, name, value, size, flags);
++}
++
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size)
++{
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	return vfs_getxattr(ovl_dentry_real(dentry), name, value, size);
++}
++
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
++{
++	ssize_t res;
++	int off;
++
++	res = vfs_listxattr(ovl_dentry_real(dentry), list, size);
++	if (res <= 0 || size == 0)
++		return res;
++
++	if (ovl_path_type(dentry->d_parent) != OVL_PATH_MERGE)
++		return res;
++
++	/* filter out private xattrs */
++	for (off = 0; off < res;) {
++		char *s = list + off;
++		size_t slen = strlen(s) + 1;
++
++		BUG_ON(off + slen > res);
++
++		if (ovl_is_private_xattr(s)) {
++			res -= slen;
++			memmove(s, s + slen, res - off);
++		} else {
++			off += slen;
++		}
++	}
++
++	return res;
++}
++
++int ovl_removexattr(struct dentry *dentry, const char *name)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
++	    ovl_is_private_xattr(name))
++		return -ENODATA;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (type == OVL_PATH_LOWER) {
++		err = vfs_getxattr(realpath.dentry, name, NULL, 0);
++		if (err < 0)
++			return err;
++
++		err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_removexattr(realpath.dentry, name);
++}
++
++static bool ovl_open_need_copy_up(int flags, enum ovl_path_type type,
++				  struct dentry *realdentry)
++{
++	if (type != OVL_PATH_LOWER)
++		return false;
++
++	if (special_file(realdentry->d_inode->i_mode))
++		return false;
++
++	if (!(OPEN_FMODE(flags) & FMODE_WRITE) && !(flags & O_TRUNC))
++		return false;
++
++	return true;
++}
++
++static int ovl_dentry_open(struct dentry *dentry, struct file *file,
++		    const struct cred *cred)
++{
++	int err;
++	struct path realpath;
++	enum ovl_path_type type;
++
++	type = ovl_path_real(dentry, &realpath);
++	if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
++		if (file->f_flags & O_TRUNC)
++			err = ovl_copy_up_truncate(dentry, 0);
++		else
++			err = ovl_copy_up(dentry);
++		if (err)
++			return err;
++
++		ovl_path_upper(dentry, &realpath);
++	}
++
++	return vfs_open(&realpath, file, cred);
++}
++
++static const struct inode_operations ovl_file_inode_operations = {
++	.setattr	= ovl_setattr,
++	.permission	= ovl_permission,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++	.dentry_open	= ovl_dentry_open,
++};
++
++static const struct inode_operations ovl_symlink_inode_operations = {
++	.setattr	= ovl_setattr,
++	.follow_link	= ovl_follow_link,
++	.put_link	= ovl_put_link,
++	.readlink	= ovl_readlink,
++	.getattr	= ovl_getattr,
++	.setxattr	= ovl_setxattr,
++	.getxattr	= ovl_getxattr,
++	.listxattr	= ovl_listxattr,
++	.removexattr	= ovl_removexattr,
++};
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe)
++{
++	struct inode *inode;
++
++	inode = new_inode(sb);
++	if (!inode)
++		return NULL;
++
++	mode &= S_IFMT;
++
++	inode->i_ino = get_next_ino();
++	inode->i_mode = mode;
++	inode->i_flags |= S_NOATIME | S_NOCMTIME;
++
++	switch (mode) {
++	case S_IFDIR:
++		inode->i_private = oe;
++		inode->i_op = &ovl_dir_inode_operations;
++		inode->i_fop = &ovl_dir_operations;
++		break;
++
++	case S_IFLNK:
++		inode->i_op = &ovl_symlink_inode_operations;
++		break;
++
++	case S_IFREG:
++	case S_IFSOCK:
++	case S_IFBLK:
++	case S_IFCHR:
++	case S_IFIFO:
++		inode->i_op = &ovl_file_inode_operations;
++		break;
++
++	default:
++		WARN(1, "illegal file type: %i\n", mode);
++		iput(inode);
++		inode = NULL;
++	}
++
++	return inode;
++
++}
+--- /dev/null
++++ b/fs/overlayfs/Kconfig
+@@ -0,0 +1,4 @@
++config OVERLAYFS_FS
++	tristate "Overlay filesystem support"
++	help
++	  Add support for overlay filesystem.
+--- /dev/null
++++ b/fs/overlayfs/Makefile
+@@ -0,0 +1,7 @@
++#
++# Makefile for the overlay filesystem.
++#
++
++obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
++
++overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
+--- /dev/null
++++ b/fs/overlayfs/overlayfs.h
+@@ -0,0 +1,70 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++struct ovl_entry;
++
++enum ovl_path_type {
++	OVL_PATH_UPPER,
++	OVL_PATH_MERGE,
++	OVL_PATH_LOWER,
++};
++
++extern const char *ovl_opaque_xattr;
++extern const char *ovl_whiteout_xattr;
++extern const struct dentry_operations ovl_dentry_operations;
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry);
++u64 ovl_dentry_version_get(struct dentry *dentry);
++void ovl_dentry_version_inc(struct dentry *dentry);
++void ovl_path_upper(struct dentry *dentry, struct path *path);
++void ovl_path_lower(struct dentry *dentry, struct path *path);
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path);
++struct dentry *ovl_dentry_upper(struct dentry *dentry);
++struct dentry *ovl_dentry_lower(struct dentry *dentry);
++struct dentry *ovl_dentry_real(struct dentry *dentry);
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper);
++bool ovl_dentry_is_opaque(struct dentry *dentry);
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque);
++bool ovl_is_whiteout(struct dentry *dentry);
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry);
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags);
++struct file *ovl_path_open(struct path *path, int flags);
++
++struct dentry *ovl_upper_create(struct dentry *upperdir, struct dentry *dentry,
++				struct kstat *stat, const char *link);
++
++/* readdir.c */
++extern const struct file_operations ovl_dir_operations;
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type);
++
++/* inode.c */
++int ovl_setattr(struct dentry *dentry, struct iattr *attr);
++int ovl_permission(struct inode *inode, int mask);
++int ovl_setxattr(struct dentry *dentry, const char *name,
++		 const void *value, size_t size, int flags);
++ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
++		     void *value, size_t size);
++ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
++int ovl_removexattr(struct dentry *dentry, const char *name);
++
++struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
++			    struct ovl_entry *oe);
++static inline void ovl_copyattr(struct inode *from, struct inode *to)
++{
++	to->i_uid = from->i_uid;
++	to->i_gid = from->i_gid;
++}
++
++/* dir.c */
++extern const struct inode_operations ovl_dir_inode_operations;
++
++/* copy_up.c */
++int ovl_copy_up(struct dentry *dentry);
++int ovl_copy_up_truncate(struct dentry *dentry, loff_t size);
+--- /dev/null
++++ b/fs/overlayfs/readdir.c
+@@ -0,0 +1,566 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/slab.h>
++#include <linux/namei.h>
++#include <linux/file.h>
++#include <linux/xattr.h>
++#include <linux/rbtree.h>
++#include <linux/security.h>
++#include <linux/cred.h>
++#include "overlayfs.h"
++
++struct ovl_cache_entry {
++	const char *name;
++	unsigned int len;
++	unsigned int type;
++	u64 ino;
++	bool is_whiteout;
++	struct list_head l_node;
++	struct rb_node node;
++};
++
++struct ovl_readdir_data {
++	struct rb_root *root;
++	struct list_head *list;
++	struct list_head *middle;
++	struct dentry *dir;
++	int count;
++	int err;
++};
++
++struct ovl_dir_file {
++	bool is_real;
++	bool is_cached;
++	struct list_head cursor;
++	u64 cache_version;
++	struct list_head cache;
++	struct file *realfile;
++};
++
++static struct ovl_cache_entry *ovl_cache_entry_from_node(struct rb_node *n)
++{
++	return container_of(n, struct ovl_cache_entry, node);
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_find(struct rb_root *root,
++						    const char *name, int len)
++{
++	struct rb_node *node = root->rb_node;
++	int cmp;
++
++	while (node) {
++		struct ovl_cache_entry *p = ovl_cache_entry_from_node(node);
++
++		cmp = strncmp(name, p->name, len);
++		if (cmp > 0)
++			node = p->node.rb_right;
++		else if (cmp < 0 || len < p->len)
++			node = p->node.rb_left;
++		else
++			return p;
++	}
++
++	return NULL;
++}
++
++static struct ovl_cache_entry *ovl_cache_entry_new(const char *name, int len,
++						   u64 ino, unsigned int d_type)
++{
++	struct ovl_cache_entry *p;
++
++	p = kmalloc(sizeof(*p) + len + 1, GFP_KERNEL);
++	if (p) {
++		char *name_copy = (char *) (p + 1);
++		memcpy(name_copy, name, len);
++		name_copy[len] = '\0';
++		p->name = name_copy;
++		p->len = len;
++		p->type = d_type;
++		p->ino = ino;
++		p->is_whiteout = false;
++	}
++
++	return p;
++}
++
++static int ovl_cache_entry_add_rb(struct ovl_readdir_data *rdd,
++				  const char *name, int len, u64 ino,
++				  unsigned int d_type)
++{
++	struct rb_node **newp = &rdd->root->rb_node;
++	struct rb_node *parent = NULL;
++	struct ovl_cache_entry *p;
++
++	while (*newp) {
++		int cmp;
++		struct ovl_cache_entry *tmp;
++
++		parent = *newp;
++		tmp = ovl_cache_entry_from_node(*newp);
++		cmp = strncmp(name, tmp->name, len);
++		if (cmp > 0)
++			newp = &tmp->node.rb_right;
++		else if (cmp < 0 || len < tmp->len)
++			newp = &tmp->node.rb_left;
++		else
++			return 0;
++	}
++
++	p = ovl_cache_entry_new(name, len, ino, d_type);
++	if (p == NULL)
++		return -ENOMEM;
++
++	list_add_tail(&p->l_node, rdd->list);
++	rb_link_node(&p->node, parent, newp);
++	rb_insert_color(&p->node, rdd->root);
++
++	return 0;
++}
++
++static int ovl_fill_lower(void *buf, const char *name, int namelen,
++			    loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++	struct ovl_cache_entry *p;
++
++	rdd->count++;
++	p = ovl_cache_entry_find(rdd->root, name, namelen);
++	if (p) {
++		list_move_tail(&p->l_node, rdd->middle);
++	} else {
++		p = ovl_cache_entry_new(name, namelen, ino, d_type);
++		if (p == NULL)
++			rdd->err = -ENOMEM;
++		else
++			list_add_tail(&p->l_node, rdd->middle);
++	}
++
++	return rdd->err;
++}
++
++static void ovl_cache_free(struct list_head *list)
++{
++	struct ovl_cache_entry *p;
++	struct ovl_cache_entry *n;
++
++	list_for_each_entry_safe(p, n, list, l_node)
++		kfree(p);
++
++	INIT_LIST_HEAD(list);
++}
++
++static int ovl_fill_upper(void *buf, const char *name, int namelen,
++			  loff_t offset, u64 ino, unsigned int d_type)
++{
++	struct ovl_readdir_data *rdd = buf;
++
++	rdd->count++;
++	return ovl_cache_entry_add_rb(rdd, name, namelen, ino, d_type);
++}
++
++static inline int ovl_dir_read(struct path *realpath,
++			       struct ovl_readdir_data *rdd, filldir_t filler)
++{
++	struct file *realfile;
++	int err;
++
++	realfile = ovl_path_open(realpath, O_RDONLY | O_DIRECTORY);
++	if (IS_ERR(realfile))
++		return PTR_ERR(realfile);
++
++	do {
++		rdd->count = 0;
++		rdd->err = 0;
++		err = vfs_readdir(realfile, filler, rdd);
++		if (err >= 0)
++			err = rdd->err;
++	} while (!err && rdd->count);
++	fput(realfile);
++
++	return 0;
++}
++
++static void ovl_dir_reset(struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++	enum ovl_path_type type = ovl_path_type(file->f_path.dentry);
++
++	if (ovl_dentry_version_get(file->f_path.dentry) != od->cache_version) {
++		list_del_init(&od->cursor);
++		ovl_cache_free(&od->cache);
++		od->is_cached = false;
++	}
++	WARN_ON(!od->is_real && type != OVL_PATH_MERGE);
++	if (od->is_real && type == OVL_PATH_MERGE) {
++		fput(od->realfile);
++		od->realfile = NULL;
++		od->is_real = false;
++	}
++}
++
++static int ovl_dir_mark_whiteouts(struct ovl_readdir_data *rdd)
++{
++	struct ovl_cache_entry *p;
++	struct dentry *dentry;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++
++	override_cred = prepare_creds();
++	if (!override_cred) {
++		ovl_cache_free(rdd->list);
++		return -ENOMEM;
++	}
++
++	/*
++	 * CAP_SYS_ADMIN for getxattr
++	 * CAP_DAC_OVERRIDE for lookup
++	 */
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	old_cred = override_creds(override_cred);
++
++	mutex_lock(&rdd->dir->d_inode->i_mutex);
++	list_for_each_entry(p, rdd->list, l_node) {
++		if (p->type != DT_LNK)
++			continue;
++
++		dentry = lookup_one_len(p->name, rdd->dir, p->len);
++		if (IS_ERR(dentry))
++			continue;
++
++		p->is_whiteout = ovl_is_whiteout(dentry);
++		dput(dentry);
++	}
++	mutex_unlock(&rdd->dir->d_inode->i_mutex);
++
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return 0;
++}
++
++static inline int ovl_dir_read_merged(struct path *upperpath,
++				      struct path *lowerpath,
++				      struct ovl_readdir_data *rdd)
++{
++	int err;
++	struct rb_root root = RB_ROOT;
++	struct list_head middle;
++
++	rdd->root = &root;
++	if (upperpath->dentry) {
++		rdd->dir = upperpath->dentry;
++		err = ovl_dir_read(upperpath, rdd, ovl_fill_upper);
++		if (err)
++			goto out;
++
++		err = ovl_dir_mark_whiteouts(rdd);
++		if (err)
++			goto out;
++	}
++	/*
++	 * Insert lowerpath entries before upperpath ones, this allows
++	 * offsets to be reasonably constant
++	 */
++	list_add(&middle, rdd->list);
++	rdd->middle = &middle;
++	err = ovl_dir_read(lowerpath, rdd, ovl_fill_lower);
++	list_del(&middle);
++out:
++	rdd->root = NULL;
++
++	return err;
++}
++
++static void ovl_seek_cursor(struct ovl_dir_file *od, loff_t pos)
++{
++	struct list_head *l;
++	loff_t off;
++
++	l = od->cache.next;
++	for (off = 0; off < pos; off++) {
++		if (l == &od->cache)
++			break;
++		l = l->next;
++	}
++	list_move_tail(&od->cursor, l);
++}
++
++static int ovl_readdir(struct file *file, void *buf, filldir_t filler)
++{
++	struct ovl_dir_file *od = file->private_data;
++	int res;
++
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_readdir(od->realfile, filler, buf);
++		file->f_pos = od->realfile->f_pos;
++
++		return res;
++	}
++
++	if (!od->is_cached) {
++		struct path lowerpath;
++		struct path upperpath;
++		struct ovl_readdir_data rdd = { .list = &od->cache };
++
++		ovl_path_lower(file->f_path.dentry, &lowerpath);
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++
++		res = ovl_dir_read_merged(&upperpath, &lowerpath, &rdd);
++		if (res) {
++			ovl_cache_free(rdd.list);
++			return res;
++		}
++
++		od->cache_version = ovl_dentry_version_get(file->f_path.dentry);
++		od->is_cached = true;
++
++		ovl_seek_cursor(od, file->f_pos);
++	}
++
++	while (od->cursor.next != &od->cache) {
++		int over;
++		loff_t off;
++		struct ovl_cache_entry *p;
++
++		p = list_entry(od->cursor.next, struct ovl_cache_entry, l_node);
++		off = file->f_pos;
++		if (!p->is_whiteout) {
++			over = filler(buf, p->name, p->len, off, p->ino,
++				      p->type);
++			if (over)
++				break;
++		}
++		file->f_pos++;
++		list_move(&od->cursor, &p->l_node);
++	}
++
++	return 0;
++}
++
++static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
++{
++	loff_t res;
++	struct ovl_dir_file *od = file->private_data;
++
++	mutex_lock(&file->f_dentry->d_inode->i_mutex);
++	if (!file->f_pos)
++		ovl_dir_reset(file);
++
++	if (od->is_real) {
++		res = vfs_llseek(od->realfile, offset, origin);
++		file->f_pos = od->realfile->f_pos;
++	} else {
++		res = -EINVAL;
++
++		switch (origin) {
++		case SEEK_CUR:
++			offset += file->f_pos;
++			break;
++		case SEEK_SET:
++			break;
++		default:
++			goto out_unlock;
++		}
++		if (offset < 0)
++			goto out_unlock;
++
++		if (offset != file->f_pos) {
++			file->f_pos = offset;
++			if (od->is_cached)
++				ovl_seek_cursor(od, offset);
++		}
++		res = offset;
++	}
++out_unlock:
++	mutex_unlock(&file->f_dentry->d_inode->i_mutex);
++
++	return res;
++}
++
++static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
++			 int datasync)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	/* May need to reopen directory if it got copied up */
++	if (!od->realfile) {
++		struct path upperpath;
++
++		ovl_path_upper(file->f_path.dentry, &upperpath);
++		od->realfile = ovl_path_open(&upperpath, O_RDONLY);
++		if (IS_ERR(od->realfile))
++			return PTR_ERR(od->realfile);
++	}
++
++	return vfs_fsync_range(od->realfile, start, end, datasync);
++}
++
++static int ovl_dir_release(struct inode *inode, struct file *file)
++{
++	struct ovl_dir_file *od = file->private_data;
++
++	list_del(&od->cursor);
++	ovl_cache_free(&od->cache);
++	if (od->realfile)
++		fput(od->realfile);
++	kfree(od);
++
++	return 0;
++}
++
++static int ovl_dir_open(struct inode *inode, struct file *file)
++{
++	struct path realpath;
++	struct file *realfile;
++	struct ovl_dir_file *od;
++	enum ovl_path_type type;
++
++	od = kzalloc(sizeof(struct ovl_dir_file), GFP_KERNEL);
++	if (!od)
++		return -ENOMEM;
++
++	type = ovl_path_real(file->f_path.dentry, &realpath);
++	realfile = ovl_path_open(&realpath, file->f_flags);
++	if (IS_ERR(realfile)) {
++		kfree(od);
++		return PTR_ERR(realfile);
++	}
++	INIT_LIST_HEAD(&od->cache);
++	INIT_LIST_HEAD(&od->cursor);
++	od->is_cached = false;
++	od->realfile = realfile;
++	od->is_real = (type != OVL_PATH_MERGE);
++	file->private_data = od;
++
++	return 0;
++}
++
++const struct file_operations ovl_dir_operations = {
++	.read		= generic_read_dir,
++	.open		= ovl_dir_open,
++	.readdir	= ovl_readdir,
++	.llseek		= ovl_dir_llseek,
++	.fsync		= ovl_dir_fsync,
++	.release	= ovl_dir_release,
++};
++
++static int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
++{
++	int err;
++	struct path lowerpath;
++	struct path upperpath;
++	struct ovl_cache_entry *p;
++	struct ovl_readdir_data rdd = { .list = list };
++
++	ovl_path_upper(dentry, &upperpath);
++	ovl_path_lower(dentry, &lowerpath);
++
++	err = ovl_dir_read_merged(&upperpath, &lowerpath, &rdd);
++	if (err)
++		return err;
++
++	err = 0;
++
++	list_for_each_entry(p, list, l_node) {
++		if (p->is_whiteout)
++			continue;
++
++		if (p->name[0] == '.') {
++			if (p->len == 1)
++				continue;
++			if (p->len == 2 && p->name[1] == '.')
++				continue;
++		}
++		err = -ENOTEMPTY;
++		break;
++	}
++
++	return err;
++}
++
++static int ovl_remove_whiteouts(struct dentry *dir, struct list_head *list)
++{
++	struct path upperpath;
++	struct dentry *upperdir;
++	struct ovl_cache_entry *p;
++	const struct cred *old_cred;
++	struct cred *override_cred;
++	int err;
++
++	ovl_path_upper(dir, &upperpath);
++	upperdir = upperpath.dentry;
++
++	override_cred = prepare_creds();
++	if (!override_cred)
++		return -ENOMEM;
++
++	/*
++	 * CAP_DAC_OVERRIDE for lookup and unlink
++	 * CAP_SYS_ADMIN for setxattr of "trusted" namespace
++	 * CAP_FOWNER for unlink in sticky directory
++	 */
++	cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE);
++	cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++	cap_raise(override_cred->cap_effective, CAP_FOWNER);
++	old_cred = override_creds(override_cred);
++
++	err = vfs_setxattr(upperdir, ovl_opaque_xattr, "y", 1, 0);
++	if (err)
++		goto out_revert_creds;
++
++	mutex_lock_nested(&upperdir->d_inode->i_mutex, I_MUTEX_PARENT);
++	list_for_each_entry(p, list, l_node) {
++		struct dentry *dentry;
++		int ret;
++
++		if (!p->is_whiteout)
++			continue;
++
++		dentry = lookup_one_len(p->name, upperdir, p->len);
++		if (IS_ERR(dentry)) {
++			printk(KERN_WARNING
++			    "overlayfs: failed to lookup whiteout %.*s: %li\n",
++			    p->len, p->name, PTR_ERR(dentry));
++			continue;
++		}
++		ret = vfs_unlink(upperdir->d_inode, dentry);
++		dput(dentry);
++		if (ret)
++			printk(KERN_WARNING
++			    "overlayfs: failed to unlink whiteout %.*s: %i\n",
++			    p->len, p->name, ret);
++	}
++	mutex_unlock(&upperdir->d_inode->i_mutex);
++
++out_revert_creds:
++	revert_creds(old_cred);
++	put_cred(override_cred);
++
++	return err;
++}
++
++int ovl_check_empty_and_clear(struct dentry *dentry, enum ovl_path_type type)
++{
++	int err;
++	LIST_HEAD(list);
++
++	err = ovl_check_empty_dir(dentry, &list);
++	if (!err && type == OVL_PATH_MERGE)
++		err = ovl_remove_whiteouts(dentry, &list);
++
++	ovl_cache_free(&list);
++
++	return err;
++}
+--- /dev/null
++++ b/fs/overlayfs/super.c
+@@ -0,0 +1,685 @@
++/*
++ *
++ * Copyright (C) 2011 Novell Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/xattr.h>
++#include <linux/security.h>
++#include <linux/mount.h>
++#include <linux/slab.h>
++#include <linux/parser.h>
++#include <linux/module.h>
++#include <linux/cred.h>
++#include <linux/sched.h>
++#include <linux/statfs.h>
++#include <linux/seq_file.h>
++#include "overlayfs.h"
++
++MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
++MODULE_DESCRIPTION("Overlay filesystem");
++MODULE_LICENSE("GPL");
++
++#define OVERLAYFS_SUPER_MAGIC 0x794c764f
++
++struct ovl_config {
++	char *lowerdir;
++	char *upperdir;
++};
++
++/* private information held for overlayfs's superblock */
++struct ovl_fs {
++	struct vfsmount *upper_mnt;
++	struct vfsmount *lower_mnt;
++	long lower_namelen;
++	/* pathnames of lower and upper dirs, for show_options */
++	struct ovl_config config;
++};
++
++/* private information held for every overlayfs dentry */
++struct ovl_entry {
++	/*
++	 * Keep "double reference" on upper dentries, so that
++	 * d_delete() doesn't think it's OK to reset d_inode to NULL.
++	 */
++	struct dentry *__upperdentry;
++	struct dentry *lowerdentry;
++	union {
++		struct {
++			u64 version;
++			bool opaque;
++		};
++		struct rcu_head rcu;
++	};
++};
++
++const char *ovl_whiteout_xattr = "trusted.overlay.whiteout";
++const char *ovl_opaque_xattr = "trusted.overlay.opaque";
++
++
++enum ovl_path_type ovl_path_type(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe->__upperdentry) {
++		if (oe->lowerdentry && S_ISDIR(dentry->d_inode->i_mode))
++			return OVL_PATH_MERGE;
++		else
++			return OVL_PATH_UPPER;
++	} else {
++		return OVL_PATH_LOWER;
++	}
++}
++
++static struct dentry *ovl_upperdentry_dereference(struct ovl_entry *oe)
++{
++	struct dentry *upperdentry = ACCESS_ONCE(oe->__upperdentry);
++	smp_read_barrier_depends();
++	return upperdentry;
++}
++
++void ovl_path_upper(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->upper_mnt;
++	path->dentry = ovl_upperdentry_dereference(oe);
++}
++
++void ovl_path_lower(struct dentry *dentry, struct path *path)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	path->mnt = ofs->lower_mnt;
++	path->dentry = oe->lowerdentry;
++}
++
++enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)
++{
++
++	enum ovl_path_type type = ovl_path_type(dentry);
++
++	if (type == OVL_PATH_LOWER)
++		ovl_path_lower(dentry, path);
++	else
++		ovl_path_upper(dentry, path);
++
++	return type;
++}
++
++struct dentry *ovl_dentry_upper(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return ovl_upperdentry_dereference(oe);
++}
++
++struct dentry *ovl_dentry_lower(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	return oe->lowerdentry;
++}
++
++struct dentry *ovl_dentry_real(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (!realdentry)
++		realdentry = oe->lowerdentry;
++
++	return realdentry;
++}
++
++struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper)
++{
++	struct dentry *realdentry;
++
++	realdentry = ovl_upperdentry_dereference(oe);
++	if (realdentry) {
++		*is_upper = true;
++	} else {
++		realdentry = oe->lowerdentry;
++		*is_upper = false;
++	}
++	return realdentry;
++}
++
++bool ovl_dentry_is_opaque(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	return oe->opaque;
++}
++
++void ovl_dentry_set_opaque(struct dentry *dentry, bool opaque)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++	oe->opaque = opaque;
++}
++
++void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&upperdentry->d_parent->d_inode->i_mutex));
++	WARN_ON(oe->__upperdentry);
++	BUG_ON(!upperdentry->d_inode);
++	smp_wmb();
++	oe->__upperdentry = dget(upperdentry);
++}
++
++void ovl_dentry_version_inc(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	oe->version++;
++}
++
++u64 ovl_dentry_version_get(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
++	return oe->version;
++}
++
++bool ovl_is_whiteout(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!dentry)
++		return false;
++	if (!dentry->d_inode)
++		return false;
++	if (!S_ISLNK(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_whiteout_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static bool ovl_is_opaquedir(struct dentry *dentry)
++{
++	int res;
++	char val;
++
++	if (!S_ISDIR(dentry->d_inode->i_mode))
++		return false;
++
++	res = vfs_getxattr(dentry, ovl_opaque_xattr, &val, 1);
++	if (res == 1 && val == 'y')
++		return true;
++
++	return false;
++}
++
++static void ovl_entry_free(struct rcu_head *head)
++{
++	struct ovl_entry *oe = container_of(head, struct ovl_entry, rcu);
++	kfree(oe);
++}
++
++static void ovl_dentry_release(struct dentry *dentry)
++{
++	struct ovl_entry *oe = dentry->d_fsdata;
++
++	if (oe) {
++		dput(oe->__upperdentry);
++		dput(oe->__upperdentry);
++		dput(oe->lowerdentry);
++		call_rcu(&oe->rcu, ovl_entry_free);
++	}
++}
++
++const struct dentry_operations ovl_dentry_operations = {
++	.d_release = ovl_dentry_release,
++};
++
++static struct ovl_entry *ovl_alloc_entry(void)
++{
++	return kzalloc(sizeof(struct ovl_entry), GFP_KERNEL);
++}
++
++static inline struct dentry *ovl_lookup_real(struct dentry *dir,
++					     struct qstr *name)
++{
++	struct dentry *dentry;
++
++	mutex_lock(&dir->d_inode->i_mutex);
++	dentry = lookup_one_len(name->name, dir, name->len);
++	mutex_unlock(&dir->d_inode->i_mutex);
++
++	if (IS_ERR(dentry)) {
++		if (PTR_ERR(dentry) == -ENOENT)
++			dentry = NULL;
++	} else if (!dentry->d_inode) {
++		dput(dentry);
++		dentry = NULL;
++	}
++	return dentry;
++}
++
++static int ovl_do_lookup(struct dentry *dentry)
++{
++	struct ovl_entry *oe;
++	struct dentry *upperdir;
++	struct dentry *lowerdir;
++	struct dentry *upperdentry = NULL;
++	struct dentry *lowerdentry = NULL;
++	struct inode *inode = NULL;
++	int err;
++
++	err = -ENOMEM;
++	oe = ovl_alloc_entry();
++	if (!oe)
++		goto out;
++
++	upperdir = ovl_dentry_upper(dentry->d_parent);
++	lowerdir = ovl_dentry_lower(dentry->d_parent);
++
++	if (upperdir) {
++		upperdentry = ovl_lookup_real(upperdir, &dentry->d_name);
++		err = PTR_ERR(upperdentry);
++		if (IS_ERR(upperdentry))
++			goto out_put_dir;
++
++		if (lowerdir && upperdentry &&
++		    (S_ISLNK(upperdentry->d_inode->i_mode) ||
++		     S_ISDIR(upperdentry->d_inode->i_mode))) {
++			const struct cred *old_cred;
++			struct cred *override_cred;
++
++			err = -ENOMEM;
++			override_cred = prepare_creds();
++			if (!override_cred)
++				goto out_dput_upper;
++
++			/* CAP_SYS_ADMIN needed for getxattr */
++			cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN);
++			old_cred = override_creds(override_cred);
++
++			if (ovl_is_opaquedir(upperdentry)) {
++				oe->opaque = true;
++			} else if (ovl_is_whiteout(upperdentry)) {
++				dput(upperdentry);
++				upperdentry = NULL;
++				oe->opaque = true;
++			}
++			revert_creds(old_cred);
++			put_cred(override_cred);
++		}
++	}
++	if (lowerdir && !oe->opaque) {
++		lowerdentry = ovl_lookup_real(lowerdir, &dentry->d_name);
++		err = PTR_ERR(lowerdentry);
++		if (IS_ERR(lowerdentry))
++			goto out_dput_upper;
++	}
++
++	if (lowerdentry && upperdentry &&
++	    (!S_ISDIR(upperdentry->d_inode->i_mode) ||
++	     !S_ISDIR(lowerdentry->d_inode->i_mode))) {
++		dput(lowerdentry);
++		lowerdentry = NULL;
++		oe->opaque = true;
++	}
++
++	if (lowerdentry || upperdentry) {
++		struct dentry *realdentry;
++
++		realdentry = upperdentry ? upperdentry : lowerdentry;
++		err = -ENOMEM;
++		inode = ovl_new_inode(dentry->d_sb, realdentry->d_inode->i_mode,
++				      oe);
++		if (!inode)
++			goto out_dput;
++		ovl_copyattr(realdentry->d_inode, inode);
++	}
++
++	if (upperdentry)
++		oe->__upperdentry = dget(upperdentry);
++
++	if (lowerdentry)
++		oe->lowerdentry = lowerdentry;
++
++	dentry->d_fsdata = oe;
++	dentry->d_op = &ovl_dentry_operations;
++	d_add(dentry, inode);
++
++	return 0;
++
++out_dput:
++	dput(lowerdentry);
++out_dput_upper:
++	dput(upperdentry);
++out_put_dir:
++	kfree(oe);
++out:
++	return err;
++}
++
++struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
++			  unsigned int flags)
++{
++	int err = ovl_do_lookup(dentry);
++
++	if (err)
++		return ERR_PTR(err);
++
++	return NULL;
++}
++
++struct file *ovl_path_open(struct path *path, int flags)
++{
++	path_get(path);
++	return dentry_open(path, flags, current_cred());
++}
++
++static void ovl_put_super(struct super_block *sb)
++{
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++
++	mntput(ufs->upper_mnt);
++	mntput(ufs->lower_mnt);
++
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++	kfree(ufs);
++}
++
++static int ovl_remount_fs(struct super_block *sb, int *flagsp, char *data)
++{
++	int flags = *flagsp;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	/* When remounting rw or ro, we need to adjust the write access to the
++	 * upper fs.
++	 */
++	if (((flags ^ sb->s_flags) & MS_RDONLY) == 0)
++		/* No change to readonly status */
++		return 0;
++
++	if (flags & MS_RDONLY) {
++		mnt_drop_write(ufs->upper_mnt);
++		return 0;
++	} else
++		return mnt_want_write(ufs->upper_mnt);
++}
++
++/**
++ * ovl_statfs
++ * @sb: The overlayfs super block
++ * @buf: The struct kstatfs to fill in with stats
++ *
++ * Get the filesystem statistics.  As writes always target the upper layer
++ * filesystem pass the statfs to the same filesystem.
++ */
++static int ovl_statfs(struct dentry *dentry, struct kstatfs *buf)
++{
++	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
++	struct dentry *root_dentry = dentry->d_sb->s_root;
++	struct path path;
++	int err;
++
++	ovl_path_upper(root_dentry, &path);
++
++	err = vfs_statfs(&path, buf);
++	if (!err) {
++		buf->f_namelen = max(buf->f_namelen, ofs->lower_namelen);
++		buf->f_type = OVERLAYFS_SUPER_MAGIC;
++	}
++
++	return err;
++}
++
++/**
++ * ovl_show_options
++ *
++ * Prints the mount options for a given superblock.
++ * Returns zero; does not fail.
++ */
++static int ovl_show_options(struct seq_file *m, struct dentry *dentry)
++{
++	struct super_block *sb = dentry->d_sb;
++	struct ovl_fs *ufs = sb->s_fs_info;
++
++	seq_printf(m, ",lowerdir=%s", ufs->config.lowerdir);
++	seq_printf(m, ",upperdir=%s", ufs->config.upperdir);
++	return 0;
++}
++
++static const struct super_operations ovl_super_operations = {
++	.put_super	= ovl_put_super,
++	.remount_fs	= ovl_remount_fs,
++	.statfs		= ovl_statfs,
++	.show_options	= ovl_show_options,
++};
++
++enum {
++	Opt_lowerdir,
++	Opt_upperdir,
++	Opt_err,
++};
++
++static const match_table_t ovl_tokens = {
++	{Opt_lowerdir,			"lowerdir=%s"},
++	{Opt_upperdir,			"upperdir=%s"},
++	{Opt_err,			NULL}
++};
++
++static int ovl_parse_opt(char *opt, struct ovl_config *config)
++{
++	char *p;
++
++	config->upperdir = NULL;
++	config->lowerdir = NULL;
++
++	while ((p = strsep(&opt, ",")) != NULL) {
++		int token;
++		substring_t args[MAX_OPT_ARGS];
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, ovl_tokens, args);
++		switch (token) {
++		case Opt_upperdir:
++			kfree(config->upperdir);
++			config->upperdir = match_strdup(&args[0]);
++			if (!config->upperdir)
++				return -ENOMEM;
++			break;
++
++		case Opt_lowerdir:
++			kfree(config->lowerdir);
++			config->lowerdir = match_strdup(&args[0]);
++			if (!config->lowerdir)
++				return -ENOMEM;
++			break;
++
++		default:
++			return -EINVAL;
++		}
++	}
++	return 0;
++}
++
++static int ovl_fill_super(struct super_block *sb, void *data, int silent)
++{
++	struct path lowerpath;
++	struct path upperpath;
++	struct inode *root_inode;
++	struct dentry *root_dentry;
++	struct ovl_entry *oe;
++	struct ovl_fs *ufs;
++	struct kstatfs statfs;
++	int err;
++
++	err = -ENOMEM;
++	ufs = kmalloc(sizeof(struct ovl_fs), GFP_KERNEL);
++	if (!ufs)
++		goto out;
++
++	err = ovl_parse_opt((char *) data, &ufs->config);
++	if (err)
++		goto out_free_ufs;
++
++	err = -EINVAL;
++	if (!ufs->config.upperdir || !ufs->config.lowerdir) {
++		printk(KERN_ERR "overlayfs: missing upperdir or lowerdir\n");
++		goto out_free_config;
++	}
++
++	oe = ovl_alloc_entry();
++	if (oe == NULL)
++		goto out_free_config;
++
++	err = kern_path(ufs->config.upperdir, LOOKUP_FOLLOW, &upperpath);
++	if (err)
++		goto out_free_oe;
++
++	err = kern_path(ufs->config.lowerdir, LOOKUP_FOLLOW, &lowerpath);
++	if (err)
++		goto out_put_upperpath;
++
++	err = -ENOTDIR;
++	if (!S_ISDIR(upperpath.dentry->d_inode->i_mode) ||
++	    !S_ISDIR(lowerpath.dentry->d_inode->i_mode))
++		goto out_put_lowerpath;
++
++	err = vfs_statfs(&lowerpath, &statfs);
++	if (err) {
++		printk(KERN_ERR "overlayfs: statfs failed on lowerpath\n");
++		goto out_put_lowerpath;
++	}
++	ufs->lower_namelen = statfs.f_namelen;
++
++	sb->s_stack_depth = max(upperpath.mnt->mnt_sb->s_stack_depth,
++				lowerpath.mnt->mnt_sb->s_stack_depth) + 1;
++
++	err = -EINVAL;
++	if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
++		printk(KERN_ERR "overlayfs: maximum fs stacking depth exceeded\n");
++		goto out_put_lowerpath;
++	}
++
++
++	ufs->upper_mnt = clone_private_mount(&upperpath);
++	err = PTR_ERR(ufs->upper_mnt);
++	if (IS_ERR(ufs->upper_mnt)) {
++		printk(KERN_ERR "overlayfs: failed to clone upperpath\n");
++		goto out_put_lowerpath;
++	}
++
++	ufs->lower_mnt = clone_private_mount(&lowerpath);
++	err = PTR_ERR(ufs->lower_mnt);
++	if (IS_ERR(ufs->lower_mnt)) {
++		printk(KERN_ERR "overlayfs: failed to clone lowerpath\n");
++		goto out_put_upper_mnt;
++	}
++
++	/*
++	 * Make lower_mnt R/O.  That way fchmod/fchown on lower file
++	 * will fail instead of modifying lower fs.
++	 */
++	ufs->lower_mnt->mnt_flags |= MNT_READONLY;
++
++	/* If the upper fs is r/o, we mark overlayfs r/o too */
++	if (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY)
++		sb->s_flags |= MS_RDONLY;
++
++	if (!(sb->s_flags & MS_RDONLY)) {
++		err = mnt_want_write(ufs->upper_mnt);
++		if (err)
++			goto out_put_lower_mnt;
++	}
++
++	err = -ENOMEM;
++	root_inode = ovl_new_inode(sb, S_IFDIR, oe);
++	if (!root_inode)
++		goto out_drop_write;
++
++	root_dentry = d_make_root(root_inode);
++	if (!root_dentry)
++		goto out_drop_write;
++
++	mntput(upperpath.mnt);
++	mntput(lowerpath.mnt);
++
++	oe->__upperdentry = dget(upperpath.dentry);
++	oe->lowerdentry = lowerpath.dentry;
++
++	root_dentry->d_fsdata = oe;
++	root_dentry->d_op = &ovl_dentry_operations;
++
++	sb->s_magic = OVERLAYFS_SUPER_MAGIC;
++	sb->s_op = &ovl_super_operations;
++	sb->s_root = root_dentry;
++	sb->s_fs_info = ufs;
++
++	return 0;
++
++out_drop_write:
++	if (!(sb->s_flags & MS_RDONLY))
++		mnt_drop_write(ufs->upper_mnt);
++out_put_lower_mnt:
++	mntput(ufs->lower_mnt);
++out_put_upper_mnt:
++	mntput(ufs->upper_mnt);
++out_put_lowerpath:
++	path_put(&lowerpath);
++out_put_upperpath:
++	path_put(&upperpath);
++out_free_oe:
++	kfree(oe);
++out_free_config:
++	kfree(ufs->config.lowerdir);
++	kfree(ufs->config.upperdir);
++out_free_ufs:
++	kfree(ufs);
++out:
++	return err;
++}
++
++static struct dentry *ovl_mount(struct file_system_type *fs_type, int flags,
++				const char *dev_name, void *raw_data)
++{
++	return mount_nodev(fs_type, flags, raw_data, ovl_fill_super);
++}
++
++static struct file_system_type ovl_fs_type = {
++	.owner		= THIS_MODULE,
++	.name		= "overlayfs",
++	.mount		= ovl_mount,
++	.kill_sb	= kill_anon_super,
++};
++
++static int __init ovl_init(void)
++{
++	return register_filesystem(&ovl_fs_type);
++}
++
++static void __exit ovl_exit(void)
++{
++	unregister_filesystem(&ovl_fs_type);
++}
++
++module_init(ovl_init);
++module_exit(ovl_exit);
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1307,6 +1307,7 @@ long do_splice_direct(struct file *in, l
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_splice_direct);
+ 
+ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
+ 			       struct pipe_inode_info *opipe,
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -244,6 +244,12 @@ struct iattr {
+  */
+ #include <linux/quota.h>
+ 
++/*
++ * Maximum number of layers of fs stack.  Needs to be limited to
++ * prevent kernel stack overflow
++ */
++#define FILESYSTEM_MAX_STACK_DEPTH 2
++
+ /** 
+  * enum positive_aop_returns - aop return codes with specific semantics
+  *
+@@ -1320,6 +1326,11 @@ struct super_block {
+ 
+ 	/* Being remounted read-only */
+ 	int s_readonly_remount;
++
++	/*
++	 * Indicates how deep in a filesystem stack this SB is
++	 */
++	int s_stack_depth;
+ };
+ 
+ /* superblock cache pruning functions */
+@@ -1573,6 +1584,7 @@ struct inode_operations {
+ 	int (*atomic_open)(struct inode *, struct dentry *,
+ 			   struct file *, unsigned open_flag,
+ 			   umode_t create_mode, int *opened);
++	int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
+ } ____cacheline_aligned;
+ 
+ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -2005,6 +2017,7 @@ extern struct file *file_open_name(struc
+ extern struct file *filp_open(const char *, int, umode_t);
+ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
+ 				   const char *, int);
++extern int vfs_open(const struct path *, struct file *, const struct cred *);
+ extern struct file * dentry_open(const struct path *, int, const struct cred *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ 
+@@ -2210,6 +2223,7 @@ extern sector_t bmap(struct inode *, sec
+ #endif
+ extern int notify_change(struct dentry *, struct iattr *);
+ extern int inode_permission(struct inode *, int);
++extern int __inode_permission(struct inode *, int);
+ extern int generic_permission(struct inode *, int);
+ 
+ static inline bool execute_ok(struct inode *inode)
+--- a/include/linux/mount.h
++++ b/include/linux/mount.h
+@@ -68,6 +68,9 @@ extern void mnt_pin(struct vfsmount *mnt
+ extern void mnt_unpin(struct vfsmount *mnt);
+ extern int __mnt_is_readonly(struct vfsmount *mnt);
+ 
++struct path;
++extern struct vfsmount *clone_private_mount(struct path *path);
++
+ struct file_system_type;
+ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
+ 				      int flags, const char *name,
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -5666,6 +5666,13 @@ F:	drivers/scsi/osd/
+ F:	include/scsi/osd_*
+ F:	fs/exofs/
+ 
++OVERLAYFS FILESYSTEM
++M:	Miklos Szeredi <miklos@szeredi.hu>
++L:	linux-fsdevel@vger.kernel.org
++S:	Supported
++F:	fs/overlayfs/*
++F:	Documentation/filesystems/overlayfs.txt
++
+ P54 WIRELESS DRIVER
+ M:	Christian Lamparter <chunkeey@googlemail.com>
+ L:	linux-wireless@vger.kernel.org
diff --git a/trunk/target/linux/generic/patches-3.8/101-overlayfs_path_ref.patch b/trunk/target/linux/generic/patches-3.8/101-overlayfs_path_ref.patch
new file mode 100644
index 00000000..0891ddf5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/101-overlayfs_path_ref.patch
@@ -0,0 +1,10 @@
+--- a/fs/overlayfs/super.c
++++ b/fs/overlayfs/super.c
+@@ -385,7 +385,6 @@ struct dentry *ovl_lookup(struct inode *
+ 
+ struct file *ovl_path_open(struct path *path, int flags)
+ {
+-	path_get(path);
+ 	return dentry_open(path, flags, current_cred());
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch b/trunk/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch
new file mode 100644
index 00000000..bed5f2d0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch
@@ -0,0 +1,81 @@
+From 1e311820ec3055e3f08e687de6564692a7cec675 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 28 Jan 2013 20:06:29 +0100
+Subject: [PATCH 11/12] USB: EHCI: add ignore_oc flag to disable overcurrent
+ checking
+
+This patch adds an ignore_oc flag which can be set by EHCI controller
+not supporting or wanting to disable overcurrent checking. The EHCI
+platform data in include/linux/usb/ehci_pdriver.h is also augmented to
+take advantage of this new flag.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+ drivers/usb/host/ehci-hcd.c      |    2 +-
+ drivers/usb/host/ehci-hub.c      |    4 ++--
+ drivers/usb/host/ehci-platform.c |    1 +
+ drivers/usb/host/ehci.h          |    1 +
+ include/linux/usb/ehci_pdriver.h |    1 +
+ 5 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -631,7 +631,7 @@ static int ehci_run (struct usb_hcd *hcd
+ 		"USB %x.%x started, EHCI %x.%02x%s\n",
+ 		((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
+ 		temp >> 8, temp & 0xff,
+-		ignore_oc ? ", overcurrent ignored" : "");
++		(ignore_oc || ehci->ignore_oc) ? ", overcurrent ignored" : "");
+ 
+ 	ehci_writel(ehci, INTR_MASK,
+ 		    &ehci->regs->intr_enable); /* Turn On Interrupts */
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -611,7 +611,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+ 	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
+ 	 * PORT_POWER; that's surprising, but maybe within-spec.
+ 	 */
+-	if (!ignore_oc)
++	if (!ignore_oc && !ehci->ignore_oc)
+ 		mask = PORT_CSC | PORT_PEC | PORT_OCC;
+ 	else
+ 		mask = PORT_CSC | PORT_PEC;
+@@ -829,7 +829,7 @@ static int ehci_hub_control (
+ 		if (temp & PORT_PEC)
+ 			status |= USB_PORT_STAT_C_ENABLE << 16;
+ 
+-		if ((temp & PORT_OCC) && !ignore_oc){
++		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
+ 			status |= USB_PORT_STAT_C_OVERCURRENT << 16;
+ 
+ 			/*
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -44,6 +44,7 @@ static int ehci_platform_reset(struct us
+ 	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
+ 	ehci->big_endian_desc = pdata->big_endian_desc;
+ 	ehci->big_endian_mmio = pdata->big_endian_mmio;
++	ehci->ignore_oc = pdata->ignore_oc;
+ 
+ 	ehci->caps = hcd->regs + pdata->caps_offset;
+ 	retval = ehci_setup(hcd);
+--- a/drivers/usb/host/ehci.h
++++ b/drivers/usb/host/ehci.h
+@@ -200,6 +200,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		use_dummy_qh:1;	/* AMD Frame List table quirk*/
+ 	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
+ 	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
++	unsigned		ignore_oc:1;
+ 
+ 	/* required for usb32 quirk */
+ 	#define OHCI_CTRL_HCFS          (3 << 6)
+--- a/include/linux/usb/ehci_pdriver.h
++++ b/include/linux/usb/ehci_pdriver.h
+@@ -42,6 +42,7 @@ struct usb_ehci_pdata {
+ 	unsigned	big_endian_desc:1;
+ 	unsigned	big_endian_mmio:1;
+ 	unsigned	no_io_watchdog:1;
++	unsigned	ignore_oc:1;
+ 
+ 	/* Turn on all power and clocks */
+ 	int (*power_on)(struct platform_device *pdev);
diff --git a/trunk/target/linux/generic/patches-3.8/110-fix_mtd_include.patch b/trunk/target/linux/generic/patches-3.8/110-fix_mtd_include.patch
new file mode 100644
index 00000000..c63dbc05
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/110-fix_mtd_include.patch
@@ -0,0 +1,10 @@
+--- a/include/linux/mtd/physmap.h
++++ b/include/linux/mtd/physmap.h
+@@ -17,6 +17,7 @@
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/platform_device.h>
+ 
+ struct map_info;
+ struct platform_device;
diff --git a/trunk/target/linux/generic/patches-3.8/200-fix_localversion.patch b/trunk/target/linux/generic/patches-3.8/200-fix_localversion.patch
new file mode 100644
index 00000000..6c16dd1b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/200-fix_localversion.patch
@@ -0,0 +1,11 @@
+--- a/scripts/setlocalversion
++++ b/scripts/setlocalversion
+@@ -167,7 +167,7 @@ else
+ 	# annotated or signed tagged state (as git describe only
+ 	# looks at signed or annotated tags - git tag -a/-s) and
+ 	# LOCALVERSION= is not specified
+-	if test "${LOCALVERSION+set}" != "set"; then
++	if test "${CONFIG_LOCALVERSION+set}" != "set"; then
+ 		scm=$(scm_version --short)
+ 		res="$res${scm:++}"
+ 	fi
diff --git a/trunk/target/linux/generic/patches-3.8/201-extra_optimization.patch b/trunk/target/linux/generic/patches-3.8/201-extra_optimization.patch
new file mode 100644
index 00000000..a7d4bdce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/201-extra_optimization.patch
@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -570,9 +570,9 @@ endif # $(dot-config)
+ all: vmlinux
+ 
+ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+-KBUILD_CFLAGS	+= -Os
++KBUILD_CFLAGS	+= -Os $(EXTRA_OPTIMIZATION)
+ else
+-KBUILD_CFLAGS	+= -O2
++KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
+ endif
+ 
+ include $(srctree)/arch/$(SRCARCH)/Makefile
diff --git a/trunk/target/linux/generic/patches-3.8/202-reduce_module_size.patch b/trunk/target/linux/generic/patches-3.8/202-reduce_module_size.patch
new file mode 100644
index 00000000..dee60198
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/202-reduce_module_size.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -379,7 +379,7 @@ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+ KBUILD_AFLAGS_MODULE  := -DMODULE
+ KBUILD_CFLAGS_MODULE  := -DMODULE
+-KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
++KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s)
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
diff --git a/trunk/target/linux/generic/patches-3.8/203-kallsyms_uncompressed.patch b/trunk/target/linux/generic/patches-3.8/203-kallsyms_uncompressed.patch
new file mode 100644
index 00000000..dbb4f8ff
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/203-kallsyms_uncompressed.patch
@@ -0,0 +1,108 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -54,6 +54,7 @@ static struct text_range text_ranges[] =
+ static struct sym_entry *table;
+ static unsigned int table_size, table_cnt;
+ static int all_symbols = 0;
++static int uncompressed = 0;
+ static char symbol_prefix_char = '\0';
+ 
+ int token_profit[0x10000];
+@@ -360,6 +361,9 @@ static void write_src(void)
+ 
+ 	free(markers);
+ 
++	if (uncompressed)
++		return;
++
+ 	output_label("kallsyms_token_table");
+ 	off = 0;
+ 	for (i = 0; i < 256; i++) {
+@@ -418,6 +422,9 @@ static void *find_token(unsigned char *s
+ {
+ 	int i;
+ 
++	if (uncompressed)
++		return NULL;
++
+ 	for (i = 0; i < len - 1; i++) {
+ 		if (str[i] == token[0] && str[i+1] == token[1])
+ 			return &str[i];
+@@ -490,6 +497,9 @@ static void optimize_result(void)
+ {
+ 	int i, best;
+ 
++	if (uncompressed)
++		return;
++
+ 	/* using the '\0' symbol last allows compress_symbols to use standard
+ 	 * fast string functions */
+ 	for (i = 255; i >= 0; i--) {
+@@ -646,7 +656,9 @@ int main(int argc, char **argv)
+ 				if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
+ 					p++;
+ 				symbol_prefix_char = *p;
+-			} else
++			} else if (strcmp(argv[i], "--uncompressed") == 0)
++				uncompressed = 1;
++			else
+ 				usage();
+ 		}
+ 	} else if (argc != 1)
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1257,6 +1257,17 @@ config KALLSYMS_ALL
+ 
+ 	   Say N unless you really need all symbols.
+ 
++config KALLSYMS_UNCOMPRESSED
++	bool "Keep kallsyms uncompressed"
++	depends on KALLSYMS
++	help
++		Normally kallsyms contains compressed symbols (using a token table),
++		reducing the uncompressed kernel image size. Keeping the symbol table
++		uncompressed significantly improves the size of this part in compressed
++		kernel images.
++
++		Say N unless you need compressed kernel images to be small.
++
+ config HOTPLUG
+ 	def_bool y
+ 
+--- a/scripts/link-vmlinux.sh
++++ b/scripts/link-vmlinux.sh
+@@ -83,6 +83,10 @@ kallsyms()
+ 		kallsymopt="${kallsymopt} --all-symbols"
+ 	fi
+ 
++	if [ -n "${CONFIG_KALLSYMS_UNCOMPRESSED}" ]; then
++		kallsymopt="${kallsymopt} --uncompressed"
++	fi
++
+ 	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
+ 		      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+ 
+--- a/kernel/kallsyms.c
++++ b/kernel/kallsyms.c
+@@ -106,6 +106,11 @@ static unsigned int kallsyms_expand_symb
+ 	 * For every byte on the compressed symbol data, copy the table
+ 	 * entry for that byte.
+ 	 */
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	memcpy(result, data + 1, len - 1);
++	result += len - 1;
++	len = 0;
++#endif
+ 	while (len) {
+ 		tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
+ 		data++;
+@@ -133,6 +138,9 @@ static unsigned int kallsyms_expand_symb
+  */
+ static char kallsyms_get_symbol_type(unsigned int off)
+ {
++#ifdef CONFIG_KALLSYMS_UNCOMPRESSED
++	return kallsyms_names[off + 1];
++#endif
+ 	/*
+ 	 * Get just the first code, look it up in the token table,
+ 	 * and return the first char from this token.
diff --git a/trunk/target/linux/generic/patches-3.8/204-module_strip.patch b/trunk/target/linux/generic/patches-3.8/204-module_strip.patch
new file mode 100644
index 00000000..df5c483e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/204-module_strip.patch
@@ -0,0 +1,200 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] build: add a hack for removing non-essential module info
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -82,7 +82,7 @@ void sort_extable(struct exception_table
+ void sort_main_extable(void);
+ void trim_init_extable(struct module *m);
+ 
+-#ifdef MODULE
++#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
+ #define MODULE_GENERIC_TABLE(gtype,name)			\
+ extern const struct gtype##_id __mod_##gtype##_table		\
+   __attribute__ ((unused, alias(__stringify(name))))
+@@ -93,9 +93,10 @@ extern const struct gtype##_id __mod_##g
+ 
+ /* Generic info of form tag = "info" */
+ #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
++#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
+ 
+ /* For userspace: you can also call me... */
+-#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
++#define MODULE_ALIAS(_alias) MODULE_INFO_STRIP(alias, _alias)
+ 
+ /*
+  * The following license idents are currently accepted as indicating free
+@@ -131,10 +132,10 @@ extern const struct gtype##_id __mod_##g
+  * Author(s), use "Name <email>" or just "Name", for multiple
+  * authors use multiple MODULE_AUTHOR() statements/lines.
+  */
+-#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
++#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
+   
+ /* What your module does. */
+-#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
++#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
+ 
+ #define MODULE_DEVICE_TABLE(type,name)		\
+   MODULE_GENERIC_TABLE(type##_device,name)
+@@ -155,7 +156,9 @@ extern const struct gtype##_id __mod_##g
+ */
+ 
+ #if defined(MODULE) || !defined(CONFIG_SYSFS)
+-#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
++#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
++#elif defined(CONFIG_MODULE_STRIPPED)
++#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
+ #else
+ #define MODULE_VERSION(_version)					\
+ 	static struct module_version_attribute ___modver_attr = {	\
+@@ -177,7 +180,7 @@ extern const struct gtype##_id __mod_##g
+ /* Optional firmware file (or files) needed by the module
+  * format is simply firmware file name.  Multiple firmware
+  * files require multiple MODULE_FIRMWARE() specifiers */
+-#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
++#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
+ 
+ /* Given an address, look for it in the exception tables */
+ const struct exception_table_entry *search_exception_tables(unsigned long add);
+--- a/include/linux/moduleparam.h
++++ b/include/linux/moduleparam.h
+@@ -16,6 +16,16 @@
+ /* Chosen so that structs with an unsigned long line up. */
+ #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
+ 
++/* This struct is here for syntactic coherency, it is not used */
++#define __MODULE_INFO_DISABLED(name)					  \
++  struct __UNIQUE_ID(name) {}
++
++#ifdef CONFIG_MODULE_STRIPPED
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
++#else
++#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
++#endif
++
+ #ifdef MODULE
+ #define __MODULE_INFO(tag, name, info)					  \
+ static const char __UNIQUE_ID(name)[]					  \
+@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]
+   = __stringify(tag) "=" info
+ #else  /* !MODULE */
+ /* This struct is here for syntactic coherency, it is not used */
+-#define __MODULE_INFO(tag, name, info)					  \
+-  struct __UNIQUE_ID(name) {}
++#define __MODULE_INFO(tag, name, info) __MODULE_INFO_DISABLED(name)
+ #endif
+ #define __MODULE_PARM_TYPE(name, _type)					  \
+   __MODULE_INFO(parmtype, name##type, #name ":" _type)
+@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]
+ /* One for each parameter, describing how to use it.  Some files do
+    multiple of these per line, so can't just use MODULE_INFO. */
+ #define MODULE_PARM_DESC(_parm, desc) \
+-	__MODULE_INFO(parm, _parm, #_parm ":" desc)
++	__MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
+ 
+ struct kernel_param;
+ 
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1708,6 +1708,13 @@ config MODULE_SIG_SHA512
+ 
+ endchoice
+ 
++config MODULE_STRIPPED
++	bool "Reduce module size"
++	depends on MODULES
++	help
++	  Remove module parameter descriptions, author info, version, aliases,
++	  device tables, etc.
++
+ endif # MODULES
+ 
+ config INIT_ALL_POSSIBLE
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2682,6 +2682,7 @@ static struct module *setup_load_info(st
+ 
+ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	const char *modmagic = get_modinfo(info, "vermagic");
+ 	int err;
+ 
+@@ -2708,6 +2709,7 @@ static int check_modinfo(struct module *
+ 		       " the quality is unknown, you have been warned.\n",
+ 		       mod->name);
+ 	}
++#endif
+ 
+ 	/* Set up license info based on the info section */
+ 	set_license(mod, get_modinfo(info, "license"));
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -1736,7 +1736,9 @@ static void read_symbols(char *modname)
+ 		symname = info.strtab + sym->st_name;
+ 
+ 		handle_modversions(mod, &info, sym, symname);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		handle_moddevtable(mod, &info, sym, symname);
++#endif
+ 	}
+ 	if (!is_vmlinux(modname) ||
+ 	     (is_vmlinux(modname) && vmlinux_section_warnings))
+@@ -1859,7 +1861,9 @@ static void add_header(struct buffer *b,
+ 	buf_printf(b, "#include <linux/vermagic.h>\n");
+ 	buf_printf(b, "#include <linux/compiler.h>\n");
+ 	buf_printf(b, "\n");
++#ifndef CONFIG_MODULE_STRIPPED
+ 	buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
++#endif
+ 	buf_printf(b, "\n");
+ 	buf_printf(b, "struct module __this_module\n");
+ 	buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
+@@ -1876,16 +1880,20 @@ static void add_header(struct buffer *b,
+ 
+ static void add_intree_flag(struct buffer *b, int is_intree)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (is_intree)
+ 		buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
++#endif
+ }
+ 
+ static void add_staging_flag(struct buffer *b, const char *name)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	static const char *staging_dir = "drivers/staging";
+ 
+ 	if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
+ 		buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
++#endif
+ }
+ 
+ /**
+@@ -1977,11 +1985,13 @@ static void add_depends(struct buffer *b
+ 
+ static void add_srcversion(struct buffer *b, struct module *mod)
+ {
++#ifndef CONFIG_MODULE_STRIPPED
+ 	if (mod->srcversion[0]) {
+ 		buf_printf(b, "\n");
+ 		buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
+ 			   mod->srcversion);
+ 	}
++#endif
+ }
+ 
+ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -2204,7 +2214,9 @@ int main(int argc, char **argv)
+ 		add_staging_flag(&buf, mod->name);
+ 		err |= add_versions(&buf, mod);
+ 		add_depends(&buf, mod, modules);
++#ifndef CONFIG_MODULE_STRIPPED
+ 		add_moddevtable(&buf, mod);
++#endif
+ 		add_srcversion(&buf, mod);
+ 
+ 		sprintf(fname, "%s.mod.c", mod->name);
diff --git a/trunk/target/linux/generic/patches-3.8/210-darwin_scripts_include.patch b/trunk/target/linux/generic/patches-3.8/210-darwin_scripts_include.patch
new file mode 100644
index 00000000..a43d3454
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/210-darwin_scripts_include.patch
@@ -0,0 +1,3088 @@
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -22,6 +22,35 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef __APPLE__
++/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
++void *memmem (const void *haystack, size_t haystack_len,
++                          const void *needle,  size_t needle_len)
++{
++  const char *begin;
++  const char *const last_possible
++    = (const char *) haystack + haystack_len - needle_len;
++
++  if (needle_len == 0)
++    /* The first occurrence of the empty string is deemed to occur at
++       the beginning of the string.  */
++    return (void *) haystack;
++
++  /* Sanity check, otherwise the loop might search through the whole
++     memory.  */
++  if (__builtin_expect (haystack_len < needle_len, 0))
++    return NULL;
++
++  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
++    if (begin[0] == ((const char *) needle)[0] &&
++        !memcmp ((const void *) &begin[1],
++                 (const void *) ((const char *) needle + 1),
++                 needle_len - 1))
++      return (void *) begin;
++
++  return NULL;
++}
++#endif
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -129,6 +129,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
+ # we really need to do so. (Do not call gcc as part of make mrproper)
+ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
+                     -DLOCALE
++ifeq ($(shell uname -s),Darwin)
++HOST_LOADLIBES  += -lncurses
++endif
+ 
+ # ===========================================================================
+ # Shared Makefile for the various kconfig executables:
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c
+@@ -1,7 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __APPLE__
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ int
+ main(int argc, char **argv)
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h
+@@ -7,7 +7,11 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#if !(defined(__APPLE__) || defined(__CYGWIN__))
+ #include <elf.h>
++#else
++#include "elf.h"
++#endif
+ 
+ #include "elfconfig.h"
+ 
+--- /dev/null
++++ b/scripts/mod/elf.h
+@@ -0,0 +1,3007 @@
++/* This file defines standard ELF types, structures, and macros.
++   Copyright (C) 1995-2012 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _ELF_H
++#define	_ELF_H 1
++
++/* Standard ELF types.  */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity.  */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities.  */
++typedef uint32_t Elf32_Word;
++typedef	int32_t  Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef	int32_t  Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities.  */
++typedef uint64_t Elf32_Xword;
++typedef	int64_t  Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef	int64_t  Elf64_Sxword;
++
++/* Type of addresses.  */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets.  */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities.  */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information.  */
++typedef Elf32_Half Elf32_Versym;
++typedef Elf64_Half Elf64_Versym;
++
++
++/* The ELF file header.  This appears at the start of every ELF file.  */
++
++#define EI_NIDENT (16)
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf32_Half	e_type;			/* Object file type */
++  Elf32_Half	e_machine;		/* Architecture */
++  Elf32_Word	e_version;		/* Object file version */
++  Elf32_Addr	e_entry;		/* Entry point virtual address */
++  Elf32_Off	e_phoff;		/* Program header table file offset */
++  Elf32_Off	e_shoff;		/* Section header table file offset */
++  Elf32_Word	e_flags;		/* Processor-specific flags */
++  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf32_Half	e_phentsize;		/* Program header table entry size */
++  Elf32_Half	e_phnum;		/* Program header table entry count */
++  Elf32_Half	e_shentsize;		/* Section header table entry size */
++  Elf32_Half	e_shnum;		/* Section header table entry count */
++  Elf32_Half	e_shstrndx;		/* Section header string table index */
++} Elf32_Ehdr;
++
++typedef struct
++{
++  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
++  Elf64_Half	e_type;			/* Object file type */
++  Elf64_Half	e_machine;		/* Architecture */
++  Elf64_Word	e_version;		/* Object file version */
++  Elf64_Addr	e_entry;		/* Entry point virtual address */
++  Elf64_Off	e_phoff;		/* Program header table file offset */
++  Elf64_Off	e_shoff;		/* Section header table file offset */
++  Elf64_Word	e_flags;		/* Processor-specific flags */
++  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
++  Elf64_Half	e_phentsize;		/* Program header table entry size */
++  Elf64_Half	e_phnum;		/* Program header table entry count */
++  Elf64_Half	e_shentsize;		/* Section header table entry size */
++  Elf64_Half	e_shnum;		/* Section header table entry count */
++  Elf64_Half	e_shstrndx;		/* Section header string table index */
++} Elf64_Ehdr;
++
++/* Fields in the e_ident array.  The EI_* macros are indices into the
++   array.  The macros under each EI_* macro are the values the byte
++   may have.  */
++
++#define EI_MAG0		0		/* File identification byte 0 index */
++#define ELFMAG0		0x7f		/* Magic number byte 0 */
++
++#define EI_MAG1		1		/* File identification byte 1 index */
++#define ELFMAG1		'E'		/* Magic number byte 1 */
++
++#define EI_MAG2		2		/* File identification byte 2 index */
++#define ELFMAG2		'L'		/* Magic number byte 2 */
++
++#define EI_MAG3		3		/* File identification byte 3 index */
++#define ELFMAG3		'F'		/* Magic number byte 3 */
++
++/* Conglomeration of the identification bytes, for easy testing as a word.  */
++#define	ELFMAG		"\177ELF"
++#define	SELFMAG		4
++
++#define EI_CLASS	4		/* File class byte index */
++#define ELFCLASSNONE	0		/* Invalid class */
++#define ELFCLASS32	1		/* 32-bit objects */
++#define ELFCLASS64	2		/* 64-bit objects */
++#define ELFCLASSNUM	3
++
++#define EI_DATA		5		/* Data encoding byte index */
++#define ELFDATANONE	0		/* Invalid data encoding */
++#define ELFDATA2LSB	1		/* 2's complement, little endian */
++#define ELFDATA2MSB	2		/* 2's complement, big endian */
++#define ELFDATANUM	3
++
++#define EI_VERSION	6		/* File version byte index */
++					/* Value must be EV_CURRENT */
++
++#define EI_OSABI	7		/* OS ABI identification */
++#define ELFOSABI_NONE		0	/* UNIX System V ABI */
++#define ELFOSABI_SYSV		0	/* Alias.  */
++#define ELFOSABI_HPUX		1	/* HP-UX */
++#define ELFOSABI_NETBSD		2	/* NetBSD.  */
++#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
++#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
++#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
++#define ELFOSABI_AIX		7	/* IBM AIX.  */
++#define ELFOSABI_IRIX		8	/* SGI Irix.  */
++#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
++#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
++#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
++#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
++#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
++#define ELFOSABI_ARM		97	/* ARM */
++#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
++
++#define EI_ABIVERSION	8		/* ABI version */
++
++#define EI_PAD		9		/* Byte index of padding bytes */
++
++/* Legal values for e_type (object file type).  */
++
++#define ET_NONE		0		/* No file type */
++#define ET_REL		1		/* Relocatable file */
++#define ET_EXEC		2		/* Executable file */
++#define ET_DYN		3		/* Shared object file */
++#define ET_CORE		4		/* Core file */
++#define	ET_NUM		5		/* Number of defined types */
++#define ET_LOOS		0xfe00		/* OS-specific range start */
++#define ET_HIOS		0xfeff		/* OS-specific range end */
++#define ET_LOPROC	0xff00		/* Processor-specific range start */
++#define ET_HIPROC	0xffff		/* Processor-specific range end */
++
++/* Legal values for e_machine (architecture).  */
++
++#define EM_NONE		 0		/* No machine */
++#define EM_M32		 1		/* AT&T WE 32100 */
++#define EM_SPARC	 2		/* SUN SPARC */
++#define EM_386		 3		/* Intel 80386 */
++#define EM_68K		 4		/* Motorola m68k family */
++#define EM_88K		 5		/* Motorola m88k family */
++#define EM_860		 7		/* Intel 80860 */
++#define EM_MIPS		 8		/* MIPS R3000 big-endian */
++#define EM_S370		 9		/* IBM System/370 */
++#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
++
++#define EM_PARISC	15		/* HPPA */
++#define EM_VPP500	17		/* Fujitsu VPP500 */
++#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
++#define EM_960		19		/* Intel 80960 */
++#define EM_PPC		20		/* PowerPC */
++#define EM_PPC64	21		/* PowerPC 64-bit */
++#define EM_S390		22		/* IBM S390 */
++
++#define EM_V800		36		/* NEC V800 series */
++#define EM_FR20		37		/* Fujitsu FR20 */
++#define EM_RH32		38		/* TRW RH-32 */
++#define EM_RCE		39		/* Motorola RCE */
++#define EM_ARM		40		/* ARM */
++#define EM_FAKE_ALPHA	41		/* Digital Alpha */
++#define EM_SH		42		/* Hitachi SH */
++#define EM_SPARCV9	43		/* SPARC v9 64-bit */
++#define EM_TRICORE	44		/* Siemens Tricore */
++#define EM_ARC		45		/* Argonaut RISC Core */
++#define EM_H8_300	46		/* Hitachi H8/300 */
++#define EM_H8_300H	47		/* Hitachi H8/300H */
++#define EM_H8S		48		/* Hitachi H8S */
++#define EM_H8_500	49		/* Hitachi H8/500 */
++#define EM_IA_64	50		/* Intel Merced */
++#define EM_MIPS_X	51		/* Stanford MIPS-X */
++#define EM_COLDFIRE	52		/* Motorola Coldfire */
++#define EM_68HC12	53		/* Motorola M68HC12 */
++#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP		55		/* Siemens PCP */
++#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
++#define EM_NDR1		57		/* Denso NDR1 microprocessor */
++#define EM_STARCORE	58		/* Motorola Start*Core processor */
++#define EM_ME16		59		/* Toyota ME16 processor */
++#define EM_ST100	60		/* STMicroelectronic ST100 processor */
++#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64	62		/* AMD x86-64 architecture */
++#define EM_PDSP		63		/* Sony DSP Processor */
++
++#define EM_FX66		66		/* Siemens FX66 microcontroller */
++#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
++#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
++#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
++#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
++#define EM_SVX		73		/* Silicon Graphics SVx */
++#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX		75		/* Digital VAX */
++#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
++#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY	81		/* Harvard University machine-independent object files */
++#define EM_PRISM	82		/* SiTera Prism */
++#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
++#define EM_FR30		84		/* Fujitsu FR30 */
++#define EM_D10V		85		/* Mitsubishi D10V */
++#define EM_D30V		86		/* Mitsubishi D30V */
++#define EM_V850		87		/* NEC v850 */
++#define EM_M32R		88		/* Mitsubishi M32R */
++#define EM_MN10300	89		/* Matsushita MN10300 */
++#define EM_MN10200	90		/* Matsushita MN10200 */
++#define EM_PJ		91		/* picoJava */
++#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
++#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
++#define EM_TILEPRO	188		/* Tilera TILEPro */
++#define EM_TILEGX	191		/* Tilera TILE-Gx */
++#define EM_NUM		192
++
++/* If it is necessary to assign new unofficial EM_* values, please
++   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
++   chances of collision with official or non-GNU unofficial values.  */
++
++#define EM_ALPHA	0x9026
++
++/* Legal values for e_version (version).  */
++
++#define EV_NONE		0		/* Invalid ELF version */
++#define EV_CURRENT	1		/* Current version */
++#define EV_NUM		2
++
++/* Section header.  */
++
++typedef struct
++{
++  Elf32_Word	sh_name;		/* Section name (string tbl index) */
++  Elf32_Word	sh_type;		/* Section type */
++  Elf32_Word	sh_flags;		/* Section flags */
++  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf32_Off	sh_offset;		/* Section file offset */
++  Elf32_Word	sh_size;		/* Section size in bytes */
++  Elf32_Word	sh_link;		/* Link to another section */
++  Elf32_Word	sh_info;		/* Additional section information */
++  Elf32_Word	sh_addralign;		/* Section alignment */
++  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
++} Elf32_Shdr;
++
++typedef struct
++{
++  Elf64_Word	sh_name;		/* Section name (string tbl index) */
++  Elf64_Word	sh_type;		/* Section type */
++  Elf64_Xword	sh_flags;		/* Section flags */
++  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
++  Elf64_Off	sh_offset;		/* Section file offset */
++  Elf64_Xword	sh_size;		/* Section size in bytes */
++  Elf64_Word	sh_link;		/* Link to another section */
++  Elf64_Word	sh_info;		/* Additional section information */
++  Elf64_Xword	sh_addralign;		/* Section alignment */
++  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
++} Elf64_Shdr;
++
++/* Special section indices.  */
++
++#define SHN_UNDEF	0		/* Undefined section */
++#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
++#define SHN_LOPROC	0xff00		/* Start of processor-specific */
++#define SHN_BEFORE	0xff00		/* Order section before all others
++					   (Solaris).  */
++#define SHN_AFTER	0xff01		/* Order section after all others
++					   (Solaris).  */
++#define SHN_HIPROC	0xff1f		/* End of processor-specific */
++#define SHN_LOOS	0xff20		/* Start of OS-specific */
++#define SHN_HIOS	0xff3f		/* End of OS-specific */
++#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
++#define SHN_COMMON	0xfff2		/* Associated symbol is common */
++#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
++#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
++
++/* Legal values for sh_type (section type).  */
++
++#define SHT_NULL	  0		/* Section header table entry unused */
++#define SHT_PROGBITS	  1		/* Program data */
++#define SHT_SYMTAB	  2		/* Symbol table */
++#define SHT_STRTAB	  3		/* String table */
++#define SHT_RELA	  4		/* Relocation entries with addends */
++#define SHT_HASH	  5		/* Symbol hash table */
++#define SHT_DYNAMIC	  6		/* Dynamic linking information */
++#define SHT_NOTE	  7		/* Notes */
++#define SHT_NOBITS	  8		/* Program space with no data (bss) */
++#define SHT_REL		  9		/* Relocation entries, no addends */
++#define SHT_SHLIB	  10		/* Reserved */
++#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
++#define SHT_INIT_ARRAY	  14		/* Array of constructors */
++#define SHT_FINI_ARRAY	  15		/* Array of destructors */
++#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
++#define SHT_GROUP	  17		/* Section group */
++#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
++#define	SHT_NUM		  19		/* Number of defined types.  */
++#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
++#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
++#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
++#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
++#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
++#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
++#define SHT_SUNW_move	  0x6ffffffa
++#define SHT_SUNW_COMDAT   0x6ffffffb
++#define SHT_SUNW_syminfo  0x6ffffffc
++#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
++#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
++#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
++#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
++#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
++#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
++#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
++#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
++#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
++
++/* Legal values for sh_flags (section flags).  */
++
++#define SHF_WRITE	     (1 << 0)	/* Writable */
++#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
++#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
++#define SHF_MERGE	     (1 << 4)	/* Might be merged */
++#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
++#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
++#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
++#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
++					   required */
++#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
++#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
++#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
++#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
++#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
++					   (Solaris).  */
++#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
++					   referenced or allocated (Solaris).*/
++
++/* Section group handling.  */
++#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
++
++/* Symbol table entry.  */
++
++typedef struct
++{
++  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
++  Elf32_Addr	st_value;		/* Symbol value */
++  Elf32_Word	st_size;		/* Symbol size */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char	st_other;		/* Symbol visibility */
++  Elf32_Section	st_shndx;		/* Section index */
++} Elf32_Sym;
++
++typedef struct
++{
++  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
++  unsigned char	st_info;		/* Symbol type and binding */
++  unsigned char st_other;		/* Symbol visibility */
++  Elf64_Section	st_shndx;		/* Section index */
++  Elf64_Addr	st_value;		/* Symbol value */
++  Elf64_Xword	st_size;		/* Symbol size */
++} Elf64_Sym;
++
++/* The syminfo section if available contains additional information about
++   every dynamic symbol.  */
++
++typedef struct
++{
++  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf32_Half si_flags;			/* Per symbol flags */
++} Elf32_Syminfo;
++
++typedef struct
++{
++  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
++  Elf64_Half si_flags;			/* Per symbol flags */
++} Elf64_Syminfo;
++
++/* Possible values for si_boundto.  */
++#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
++#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
++#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
++
++/* Possible bitmasks for si_flags.  */
++#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
++#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
++#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
++#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
++					   loaded */
++/* Syminfo version values.  */
++#define SYMINFO_NONE		0
++#define SYMINFO_CURRENT		1
++#define SYMINFO_NUM		2
++
++
++/* How to extract and insert information held in the st_info field.  */
++
++#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
++#define ELF32_ST_TYPE(val)		((val) & 0xf)
++#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
++
++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
++#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
++#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
++#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
++
++/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
++
++#define STB_LOCAL	0		/* Local symbol */
++#define STB_GLOBAL	1		/* Global symbol */
++#define STB_WEAK	2		/* Weak symbol */
++#define	STB_NUM		3		/* Number of defined types.  */
++#define STB_LOOS	10		/* Start of OS-specific */
++#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
++#define STB_HIOS	12		/* End of OS-specific */
++#define STB_LOPROC	13		/* Start of processor-specific */
++#define STB_HIPROC	15		/* End of processor-specific */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_NOTYPE	0		/* Symbol type is unspecified */
++#define STT_OBJECT	1		/* Symbol is a data object */
++#define STT_FUNC	2		/* Symbol is a code object */
++#define STT_SECTION	3		/* Symbol associated with a section */
++#define STT_FILE	4		/* Symbol's name is file name */
++#define STT_COMMON	5		/* Symbol is a common data object */
++#define STT_TLS		6		/* Symbol is thread-local data object*/
++#define	STT_NUM		7		/* Number of defined types.  */
++#define STT_LOOS	10		/* Start of OS-specific */
++#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
++#define STT_HIOS	12		/* End of OS-specific */
++#define STT_LOPROC	13		/* Start of processor-specific */
++#define STT_HIPROC	15		/* End of processor-specific */
++
++
++/* Symbol table indices are found in the hash buckets and chain table
++   of a symbol hash table section.  This special index value indicates
++   the end of a chain, meaning no further symbols are found in that bucket.  */
++
++#define STN_UNDEF	0		/* End of a chain.  */
++
++
++/* How to extract and insert information held in the st_other field.  */
++
++#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
++
++/* For ELF64 the definitions are the same.  */
++#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
++
++/* Symbol visibility specification encoded in the st_other field.  */
++#define STV_DEFAULT	0		/* Default symbol visibility rules */
++#define STV_INTERNAL	1		/* Processor specific hidden class */
++#define STV_HIDDEN	2		/* Sym unavailable in other modules */
++#define STV_PROTECTED	3		/* Not preemptible, not exported */
++
++
++/* Relocation table entry without addend (in section of type SHT_REL).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++} Elf32_Rel;
++
++/* I have seen two different definitions of the Elf64_Rel and
++   Elf64_Rela structures, so we'll leave them out until Novell (or
++   whoever) gets their act together.  */
++/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++} Elf64_Rel;
++
++/* Relocation table entry with addend (in section of type SHT_RELA).  */
++
++typedef struct
++{
++  Elf32_Addr	r_offset;		/* Address */
++  Elf32_Word	r_info;			/* Relocation type and symbol index */
++  Elf32_Sword	r_addend;		/* Addend */
++} Elf32_Rela;
++
++typedef struct
++{
++  Elf64_Addr	r_offset;		/* Address */
++  Elf64_Xword	r_info;			/* Relocation type and symbol index */
++  Elf64_Sxword	r_addend;		/* Addend */
++} Elf64_Rela;
++
++/* How to extract and insert information held in the r_info field.  */
++
++#define ELF32_R_SYM(val)		((val) >> 8)
++#define ELF32_R_TYPE(val)		((val) & 0xff)
++#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
++
++#define ELF64_R_SYM(i)			((i) >> 32)
++#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
++#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
++
++/* Program segment header.  */
++
++typedef struct
++{
++  Elf32_Word	p_type;			/* Segment type */
++  Elf32_Off	p_offset;		/* Segment file offset */
++  Elf32_Addr	p_vaddr;		/* Segment virtual address */
++  Elf32_Addr	p_paddr;		/* Segment physical address */
++  Elf32_Word	p_filesz;		/* Segment size in file */
++  Elf32_Word	p_memsz;		/* Segment size in memory */
++  Elf32_Word	p_flags;		/* Segment flags */
++  Elf32_Word	p_align;		/* Segment alignment */
++} Elf32_Phdr;
++
++typedef struct
++{
++  Elf64_Word	p_type;			/* Segment type */
++  Elf64_Word	p_flags;		/* Segment flags */
++  Elf64_Off	p_offset;		/* Segment file offset */
++  Elf64_Addr	p_vaddr;		/* Segment virtual address */
++  Elf64_Addr	p_paddr;		/* Segment physical address */
++  Elf64_Xword	p_filesz;		/* Segment size in file */
++  Elf64_Xword	p_memsz;		/* Segment size in memory */
++  Elf64_Xword	p_align;		/* Segment alignment */
++} Elf64_Phdr;
++
++/* Special value for e_phnum.  This indicates that the real number of
++   program headers is too large to fit into e_phnum.  Instead the real
++   value is in the field sh_info of section 0.  */
++
++#define PN_XNUM		0xffff
++
++/* Legal values for p_type (segment type).  */
++
++#define	PT_NULL		0		/* Program header table entry unused */
++#define PT_LOAD		1		/* Loadable program segment */
++#define PT_DYNAMIC	2		/* Dynamic linking information */
++#define PT_INTERP	3		/* Program interpreter */
++#define PT_NOTE		4		/* Auxiliary information */
++#define PT_SHLIB	5		/* Reserved */
++#define PT_PHDR		6		/* Entry for header table itself */
++#define PT_TLS		7		/* Thread-local storage segment */
++#define	PT_NUM		8		/* Number of defined types */
++#define PT_LOOS		0x60000000	/* Start of OS-specific */
++#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
++#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
++#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
++#define PT_LOSUNW	0x6ffffffa
++#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
++#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
++#define PT_HISUNW	0x6fffffff
++#define PT_HIOS		0x6fffffff	/* End of OS-specific */
++#define PT_LOPROC	0x70000000	/* Start of processor-specific */
++#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
++
++/* Legal values for p_flags (segment flags).  */
++
++#define PF_X		(1 << 0)	/* Segment is executable */
++#define PF_W		(1 << 1)	/* Segment is writable */
++#define PF_R		(1 << 2)	/* Segment is readable */
++#define PF_MASKOS	0x0ff00000	/* OS-specific */
++#define PF_MASKPROC	0xf0000000	/* Processor-specific */
++
++/* Legal values for note segment descriptor types for core files. */
++
++#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
++#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
++#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
++#define NT_PRXREG	4		/* Contains copy of prxregset struct */
++#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
++#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
++#define NT_AUXV		6		/* Contains copy of auxv array */
++#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
++#define NT_ASRS		8		/* Contains copy of asrset struct */
++#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
++#define NT_PSINFO	13		/* Contains copy of psinfo struct */
++#define NT_PRCRED	14		/* Contains copy of prcred struct */
++#define NT_UTSNAME	15		/* Contains copy of utsname struct */
++#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
++#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
++#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
++#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
++#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
++#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
++#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
++#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
++#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
++#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
++
++/* Legal values for the note segment descriptor types for object files.  */
++
++#define NT_VERSION	1		/* Contains a version string.  */
++
++
++/* Dynamic section entry.  */
++
++typedef struct
++{
++  Elf32_Sword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf32_Word d_val;			/* Integer value */
++      Elf32_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf32_Dyn;
++
++typedef struct
++{
++  Elf64_Sxword	d_tag;			/* Dynamic entry type */
++  union
++    {
++      Elf64_Xword d_val;		/* Integer value */
++      Elf64_Addr d_ptr;			/* Address value */
++    } d_un;
++} Elf64_Dyn;
++
++/* Legal values for d_tag (dynamic entry type).  */
++
++#define DT_NULL		0		/* Marks end of dynamic section */
++#define DT_NEEDED	1		/* Name of needed library */
++#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
++#define DT_PLTGOT	3		/* Processor defined value */
++#define DT_HASH		4		/* Address of symbol hash table */
++#define DT_STRTAB	5		/* Address of string table */
++#define DT_SYMTAB	6		/* Address of symbol table */
++#define DT_RELA		7		/* Address of Rela relocs */
++#define DT_RELASZ	8		/* Total size of Rela relocs */
++#define DT_RELAENT	9		/* Size of one Rela reloc */
++#define DT_STRSZ	10		/* Size of string table */
++#define DT_SYMENT	11		/* Size of one symbol table entry */
++#define DT_INIT		12		/* Address of init function */
++#define DT_FINI		13		/* Address of termination function */
++#define DT_SONAME	14		/* Name of shared object */
++#define DT_RPATH	15		/* Library search path (deprecated) */
++#define DT_SYMBOLIC	16		/* Start symbol search here */
++#define DT_REL		17		/* Address of Rel relocs */
++#define DT_RELSZ	18		/* Total size of Rel relocs */
++#define DT_RELENT	19		/* Size of one Rel reloc */
++#define DT_PLTREL	20		/* Type of reloc in PLT */
++#define DT_DEBUG	21		/* For debugging; unspecified */
++#define DT_TEXTREL	22		/* Reloc might modify .text */
++#define DT_JMPREL	23		/* Address of PLT relocs */
++#define	DT_BIND_NOW	24		/* Process relocations of object */
++#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
++#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
++#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
++#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
++#define DT_RUNPATH	29		/* Library search path */
++#define DT_FLAGS	30		/* Flags for the object being loaded */
++#define DT_ENCODING	32		/* Start of encoded range */
++#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
++#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
++#define	DT_NUM		34		/* Number used */
++#define DT_LOOS		0x6000000d	/* Start of OS-specific */
++#define DT_HIOS		0x6ffff000	/* End of OS-specific */
++#define DT_LOPROC	0x70000000	/* Start of processor-specific */
++#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
++#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
++
++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
++   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
++   approach.  */
++#define DT_VALRNGLO	0x6ffffd00
++#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
++#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
++#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
++#define DT_CHECKSUM	0x6ffffdf8
++#define DT_PLTPADSZ	0x6ffffdf9
++#define DT_MOVEENT	0x6ffffdfa
++#define DT_MOVESZ	0x6ffffdfb
++#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
++#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
++					   the following DT_* entry.  */
++#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
++#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
++#define DT_VALRNGHI	0x6ffffdff
++#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
++#define DT_VALNUM 12
++
++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
++   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
++
++   If any adjustment is made to the ELF object after it has been
++   built these entries will need to be adjusted.  */
++#define DT_ADDRRNGLO	0x6ffffe00
++#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
++#define DT_TLSDESC_PLT	0x6ffffef6
++#define DT_TLSDESC_GOT	0x6ffffef7
++#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
++#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
++#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
++#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
++#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
++#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
++#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
++#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
++#define DT_ADDRRNGHI	0x6ffffeff
++#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
++#define DT_ADDRNUM 11
++
++/* The versioning entry types.  The next are defined as part of the
++   GNU extension.  */
++#define DT_VERSYM	0x6ffffff0
++
++#define DT_RELACOUNT	0x6ffffff9
++#define DT_RELCOUNT	0x6ffffffa
++
++/* These were chosen by Sun.  */
++#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
++#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
++					   table */
++#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
++#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
++					   versions */
++#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
++#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
++#define DT_VERSIONTAGNUM 16
++
++/* Sun added these machine-independent extensions in the "processor-specific"
++   range.  Be compatible.  */
++#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
++#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
++#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
++#define DT_EXTRANUM	3
++
++/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
++#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
++#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
++#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
++#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
++#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
++
++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
++   entry in the dynamic section.  */
++#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
++#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
++#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
++#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
++#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
++#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
++#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
++#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
++#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
++#define DF_1_TRANS	0x00000200
++#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
++#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
++#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
++#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
++#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
++#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
++#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
++
++/* Flags for the feature selection in DT_FEATURE_1.  */
++#define DTF_1_PARINIT	0x00000001
++#define DTF_1_CONFEXP	0x00000002
++
++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
++#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
++#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
++					   generally available.  */
++
++/* Version definition sections.  */
++
++typedef struct
++{
++  Elf32_Half	vd_version;		/* Version revision */
++  Elf32_Half	vd_flags;		/* Version information */
++  Elf32_Half	vd_ndx;			/* Version Index */
++  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vd_hash;		/* Version name hash value */
++  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf32_Verdef;
++
++typedef struct
++{
++  Elf64_Half	vd_version;		/* Version revision */
++  Elf64_Half	vd_flags;		/* Version information */
++  Elf64_Half	vd_ndx;			/* Version Index */
++  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vd_hash;		/* Version name hash value */
++  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
++  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
++					   entry */
++} Elf64_Verdef;
++
++
++/* Legal values for vd_version (version revision).  */
++#define VER_DEF_NONE	0		/* No version */
++#define VER_DEF_CURRENT	1		/* Current version */
++#define VER_DEF_NUM	2		/* Given version number */
++
++/* Legal values for vd_flags (version information flags).  */
++#define VER_FLG_BASE	0x1		/* Version definition of file itself */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++/* Versym symbol index values.  */
++#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
++#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
++#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
++#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
++
++/* Auxialiary version information.  */
++
++typedef struct
++{
++  Elf32_Word	vda_name;		/* Version or dependency names */
++  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf32_Verdaux;
++
++typedef struct
++{
++  Elf64_Word	vda_name;		/* Version or dependency names */
++  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
++					   entry */
++} Elf64_Verdaux;
++
++
++/* Version dependency section.  */
++
++typedef struct
++{
++  Elf32_Half	vn_version;		/* Version of structure */
++  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf32_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf32_Verneed;
++
++typedef struct
++{
++  Elf64_Half	vn_version;		/* Version of structure */
++  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
++  Elf64_Word	vn_file;		/* Offset of filename for this
++					   dependency */
++  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
++  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
++					   entry */
++} Elf64_Verneed;
++
++
++/* Legal values for vn_version (version revision).  */
++#define VER_NEED_NONE	 0		/* No version */
++#define VER_NEED_CURRENT 1		/* Current version */
++#define VER_NEED_NUM	 2		/* Given version number */
++
++/* Auxiliary needed version information.  */
++
++typedef struct
++{
++  Elf32_Word	vna_hash;		/* Hash value of dependency name */
++  Elf32_Half	vna_flags;		/* Dependency specific information */
++  Elf32_Half	vna_other;		/* Unused */
++  Elf32_Word	vna_name;		/* Dependency name string offset */
++  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf32_Vernaux;
++
++typedef struct
++{
++  Elf64_Word	vna_hash;		/* Hash value of dependency name */
++  Elf64_Half	vna_flags;		/* Dependency specific information */
++  Elf64_Half	vna_other;		/* Unused */
++  Elf64_Word	vna_name;		/* Dependency name string offset */
++  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
++					   entry */
++} Elf64_Vernaux;
++
++
++/* Legal values for vna_flags.  */
++#define VER_FLG_WEAK	0x2		/* Weak version identifier */
++
++
++/* Auxiliary vector.  */
++
++/* This vector is normally only used by the program interpreter.  The
++   usual definition in an ABI supplement uses the name auxv_t.  The
++   vector is not usually defined in a standard <elf.h> file, but it
++   can't hurt.  We rename it to avoid conflicts.  The sizes of these
++   types are an arrangement between the exec server and the program
++   interpreter, so we don't fully specify them here.  */
++
++typedef struct
++{
++  uint32_t a_type;		/* Entry type */
++  union
++    {
++      uint32_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf32_auxv_t;
++
++typedef struct
++{
++  uint64_t a_type;		/* Entry type */
++  union
++    {
++      uint64_t a_val;		/* Integer value */
++      /* We use to have pointer elements added here.  We cannot do that,
++	 though, since it does not work when using 32-bit definitions
++	 on 64-bit platforms and vice versa.  */
++    } a_un;
++} Elf64_auxv_t;
++
++/* Legal values for a_type (entry type).  */
++
++#define AT_NULL		0		/* End of vector */
++#define AT_IGNORE	1		/* Entry should be ignored */
++#define AT_EXECFD	2		/* File descriptor of program */
++#define AT_PHDR		3		/* Program headers for program */
++#define AT_PHENT	4		/* Size of program header entry */
++#define AT_PHNUM	5		/* Number of program headers */
++#define AT_PAGESZ	6		/* System page size */
++#define AT_BASE		7		/* Base address of interpreter */
++#define AT_FLAGS	8		/* Flags */
++#define AT_ENTRY	9		/* Entry point of program */
++#define AT_NOTELF	10		/* Program is not ELF */
++#define AT_UID		11		/* Real uid */
++#define AT_EUID		12		/* Effective uid */
++#define AT_GID		13		/* Real gid */
++#define AT_EGID		14		/* Effective gid */
++#define AT_CLKTCK	17		/* Frequency of times() */
++
++/* Some more special a_type values describing the hardware.  */
++#define AT_PLATFORM	15		/* String identifying platform.  */
++#define AT_HWCAP	16		/* Machine dependent hints about
++					   processor capabilities.  */
++
++/* This entry gives some information about the FPU initialization
++   performed by the kernel.  */
++#define AT_FPUCW	18		/* Used FPU control word.  */
++
++/* Cache block sizes.  */
++#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
++#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
++#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
++
++/* A special ignored value for PPC, used by the kernel to control the
++   interpretation of the AUXV. Must be > 16.  */
++#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
++
++#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
++
++#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
++
++#define AT_RANDOM	25		/* Address of 16 random bytes.  */
++
++#define AT_EXECFN	31		/* Filename of executable.  */
++
++/* Pointer to the global system page used for system calls and other
++   nice things.  */
++#define AT_SYSINFO	32
++#define AT_SYSINFO_EHDR	33
++
++/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
++   log2 of line size; mask those to get cache size.  */
++#define AT_L1I_CACHESHAPE	34
++#define AT_L1D_CACHESHAPE	35
++#define AT_L2_CACHESHAPE	36
++#define AT_L3_CACHESHAPE	37
++
++/* Note section contents.  Each entry in the note section begins with
++   a header of a fixed form.  */
++
++typedef struct
++{
++  Elf32_Word n_namesz;			/* Length of the note's name.  */
++  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf32_Word n_type;			/* Type of the note.  */
++} Elf32_Nhdr;
++
++typedef struct
++{
++  Elf64_Word n_namesz;			/* Length of the note's name.  */
++  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
++  Elf64_Word n_type;			/* Type of the note.  */
++} Elf64_Nhdr;
++
++/* Known names of notes.  */
++
++/* Solaris entries in the note section have this name.  */
++#define ELF_NOTE_SOLARIS	"SUNW Solaris"
++
++/* Note entries for GNU systems have this name.  */
++#define ELF_NOTE_GNU		"GNU"
++
++
++/* Defined types of notes for Solaris.  */
++
++/* Value of descriptor (one word) is desired pagesize for the binary.  */
++#define ELF_NOTE_PAGESIZE_HINT	1
++
++
++/* Defined note types for GNU systems.  */
++
++/* ABI information.  The descriptor consists of words:
++   word 0: OS descriptor
++   word 1: major version of the ABI
++   word 2: minor version of the ABI
++   word 3: subminor version of the ABI
++*/
++#define NT_GNU_ABI_TAG	1
++#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
++
++/* Known OSes.  These values can appear in word 0 of an
++   NT_GNU_ABI_TAG note section entry.  */
++#define ELF_NOTE_OS_LINUX	0
++#define ELF_NOTE_OS_GNU		1
++#define ELF_NOTE_OS_SOLARIS2	2
++#define ELF_NOTE_OS_FREEBSD	3
++
++/* Synthetic hwcap information.  The descriptor begins with two words:
++   word 0: number of entries
++   word 1: bitmask of enabled entries
++   Then follow variable-length entries, one byte followed by a
++   '\0'-terminated hwcap name string.  The byte gives the bit
++   number to test if enabled, (1U << bit) & bitmask.  */
++#define NT_GNU_HWCAP	2
++
++/* Build ID bits as generated by ld --build-id.
++   The descriptor consists of any nonzero number of bytes.  */
++#define NT_GNU_BUILD_ID	3
++
++/* Version note generated by GNU gold containing a version string.  */
++#define NT_GNU_GOLD_VERSION	4
++
++
++/* Move records.  */
++typedef struct
++{
++  Elf32_Xword m_value;		/* Symbol value.  */
++  Elf32_Word m_info;		/* Size and index.  */
++  Elf32_Word m_poffset;		/* Symbol offset.  */
++  Elf32_Half m_repeat;		/* Repeat count.  */
++  Elf32_Half m_stride;		/* Stride info.  */
++} Elf32_Move;
++
++typedef struct
++{
++  Elf64_Xword m_value;		/* Symbol value.  */
++  Elf64_Xword m_info;		/* Size and index.  */
++  Elf64_Xword m_poffset;	/* Symbol offset.  */
++  Elf64_Half m_repeat;		/* Repeat count.  */
++  Elf64_Half m_stride;		/* Stride info.  */
++} Elf64_Move;
++
++/* Macro to construct move records.  */
++#define ELF32_M_SYM(info)	((info) >> 8)
++#define ELF32_M_SIZE(info)	((unsigned char) (info))
++#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
++
++#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
++#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
++#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
++
++
++/* Motorola 68k specific definitions.  */
++
++/* Values for Elf32_Ehdr.e_flags.  */
++#define EF_CPU32	0x00810000
++
++/* m68k relocs.  */
++
++#define R_68K_NONE	0		/* No reloc */
++#define R_68K_32	1		/* Direct 32 bit  */
++#define R_68K_16	2		/* Direct 16 bit  */
++#define R_68K_8		3		/* Direct 8 bit  */
++#define R_68K_PC32	4		/* PC relative 32 bit */
++#define R_68K_PC16	5		/* PC relative 16 bit */
++#define R_68K_PC8	6		/* PC relative 8 bit */
++#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
++#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
++#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
++#define R_68K_GOT32O	10		/* 32 bit GOT offset */
++#define R_68K_GOT16O	11		/* 16 bit GOT offset */
++#define R_68K_GOT8O	12		/* 8 bit GOT offset */
++#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
++#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
++#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
++#define R_68K_PLT32O	16		/* 32 bit PLT offset */
++#define R_68K_PLT16O	17		/* 16 bit PLT offset */
++#define R_68K_PLT8O	18		/* 8 bit PLT offset */
++#define R_68K_COPY	19		/* Copy symbol at runtime */
++#define R_68K_GLOB_DAT	20		/* Create GOT entry */
++#define R_68K_JMP_SLOT	21		/* Create PLT entry */
++#define R_68K_RELATIVE	22		/* Adjust by program base */
++#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
++#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
++#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
++#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
++#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
++#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
++#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
++#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
++#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
++#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
++#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
++#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
++#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
++					   static TLS block */
++#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
++#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
++#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
++/* Keep this the last entry.  */
++#define R_68K_NUM	43
++
++/* Intel 80386 specific definitions.  */
++
++/* i386 relocs.  */
++
++#define R_386_NONE	   0		/* No reloc */
++#define R_386_32	   1		/* Direct 32 bit  */
++#define R_386_PC32	   2		/* PC relative 32 bit */
++#define R_386_GOT32	   3		/* 32 bit GOT entry */
++#define R_386_PLT32	   4		/* 32 bit PLT address */
++#define R_386_COPY	   5		/* Copy symbol at runtime */
++#define R_386_GLOB_DAT	   6		/* Create GOT entry */
++#define R_386_JMP_SLOT	   7		/* Create PLT entry */
++#define R_386_RELATIVE	   8		/* Adjust by program base */
++#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
++#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
++#define R_386_32PLT	   11
++#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
++#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
++					   block offset */
++#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
++					   offset */
++#define R_386_TLS_LE	   17		/* Offset relative to static TLS
++					   block */
++#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
++					   general dynamic thread local data */
++#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
++					   local dynamic thread local data
++					   in LE code */
++#define R_386_16	   20
++#define R_386_PC16	   21
++#define R_386_8		   22
++#define R_386_PC8	   23
++#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
++					   thread local data */
++#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
++#define R_386_TLS_GD_CALL  26		/* Relocation for call to
++					   __tls_get_addr() */
++#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
++#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
++					   thread local data in LE code */
++#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
++#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
++					   __tls_get_addr() in LDM code */
++#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
++#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
++#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
++					   block offset */
++#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
++					   TLS block */
++#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
++#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
++#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
++/* 38? */
++#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
++#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
++					   descriptor for
++					   relaxation.  */
++#define R_386_TLS_DESC     41		/* TLS descriptor containing
++					   pointer to code and to
++					   argument, returning the TLS
++					   offset for the symbol.  */
++#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
++/* Keep this the last entry.  */
++#define R_386_NUM	   43
++
++/* SUN SPARC specific definitions.  */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
++
++/* Values for Elf64_Ehdr.e_flags.  */
++
++#define EF_SPARCV9_MM		3
++#define EF_SPARCV9_TSO		0
++#define EF_SPARCV9_PSO		1
++#define EF_SPARCV9_RMO		2
++#define EF_SPARC_LEDATA		0x800000 /* little endian data */
++#define EF_SPARC_EXT_MASK	0xFFFF00
++#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
++#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
++#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
++#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
++
++/* SPARC relocs.  */
++
++#define R_SPARC_NONE		0	/* No reloc */
++#define R_SPARC_8		1	/* Direct 8 bit */
++#define R_SPARC_16		2	/* Direct 16 bit */
++#define R_SPARC_32		3	/* Direct 32 bit */
++#define R_SPARC_DISP8		4	/* PC relative 8 bit */
++#define R_SPARC_DISP16		5	/* PC relative 16 bit */
++#define R_SPARC_DISP32		6	/* PC relative 32 bit */
++#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
++#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
++#define R_SPARC_HI22		9	/* High 22 bit */
++#define R_SPARC_22		10	/* Direct 22 bit */
++#define R_SPARC_13		11	/* Direct 13 bit */
++#define R_SPARC_LO10		12	/* Truncated 10 bit */
++#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
++#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
++#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
++#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
++#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
++#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
++#define R_SPARC_COPY		19	/* Copy symbol at runtime */
++#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
++#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
++#define R_SPARC_RELATIVE	22	/* Adjust by program base */
++#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
++
++/* Additional Sparc64 relocs.  */
++
++#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
++#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
++#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
++#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
++#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
++#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
++#define R_SPARC_10		30	/* Direct 10 bit */
++#define R_SPARC_11		31	/* Direct 11 bit */
++#define R_SPARC_64		32	/* Direct 64 bit */
++#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
++#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
++#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
++#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
++#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
++#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
++#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
++#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
++#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
++#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
++#define R_SPARC_7		43	/* Direct 7 bit */
++#define R_SPARC_5		44	/* Direct 5 bit */
++#define R_SPARC_6		45	/* Direct 6 bit */
++#define R_SPARC_DISP64		46	/* PC relative 64 bit */
++#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
++#define R_SPARC_HIX22		48	/* High 22 bit complemented */
++#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
++#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
++#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
++#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
++#define R_SPARC_REGISTER	53	/* Global register usage */
++#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
++#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
++#define R_SPARC_TLS_GD_HI22	56
++#define R_SPARC_TLS_GD_LO10	57
++#define R_SPARC_TLS_GD_ADD	58
++#define R_SPARC_TLS_GD_CALL	59
++#define R_SPARC_TLS_LDM_HI22	60
++#define R_SPARC_TLS_LDM_LO10	61
++#define R_SPARC_TLS_LDM_ADD	62
++#define R_SPARC_TLS_LDM_CALL	63
++#define R_SPARC_TLS_LDO_HIX22	64
++#define R_SPARC_TLS_LDO_LOX10	65
++#define R_SPARC_TLS_LDO_ADD	66
++#define R_SPARC_TLS_IE_HI22	67
++#define R_SPARC_TLS_IE_LO10	68
++#define R_SPARC_TLS_IE_LD	69
++#define R_SPARC_TLS_IE_LDX	70
++#define R_SPARC_TLS_IE_ADD	71
++#define R_SPARC_TLS_LE_HIX22	72
++#define R_SPARC_TLS_LE_LOX10	73
++#define R_SPARC_TLS_DTPMOD32	74
++#define R_SPARC_TLS_DTPMOD64	75
++#define R_SPARC_TLS_DTPOFF32	76
++#define R_SPARC_TLS_DTPOFF64	77
++#define R_SPARC_TLS_TPOFF32	78
++#define R_SPARC_TLS_TPOFF64	79
++#define R_SPARC_GOTDATA_HIX22	80
++#define R_SPARC_GOTDATA_LOX10	81
++#define R_SPARC_GOTDATA_OP_HIX22	82
++#define R_SPARC_GOTDATA_OP_LOX10	83
++#define R_SPARC_GOTDATA_OP	84
++#define R_SPARC_H34		85
++#define R_SPARC_SIZE32		86
++#define R_SPARC_SIZE64		87
++#define R_SPARC_WDISP10		88
++#define R_SPARC_JMP_IREL	248
++#define R_SPARC_IRELATIVE	249
++#define R_SPARC_GNU_VTINHERIT	250
++#define R_SPARC_GNU_VTENTRY	251
++#define R_SPARC_REV32		252
++/* Keep this the last entry.  */
++#define R_SPARC_NUM		253
++
++/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
++
++#define DT_SPARC_REGISTER 0x70000001
++#define DT_SPARC_NUM	2
++
++/* MIPS R3000 specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
++#define EF_MIPS_PIC	    2		/* Contains PIC code */
++#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
++#define EF_MIPS_XGOT	    8
++#define EF_MIPS_64BIT_WHIRL 16
++#define EF_MIPS_ABI2	    32
++#define EF_MIPS_ABI_ON32    64
++#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
++
++/* Legal values for MIPS architecture level.  */
++
++#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
++#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
++#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
++#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
++#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
++#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
++#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
++
++/* The following are non-official names and should not be used.  */
++
++#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
++#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
++#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
++#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
++#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
++#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
++#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
++
++/* Special section indices.  */
++
++#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
++#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
++#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
++#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
++#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
++#define SHT_MIPS_MSYM	       0x70000001
++#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
++#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
++#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
++#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
++#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
++#define SHT_MIPS_PACKAGE       0x70000007
++#define SHT_MIPS_PACKSYM       0x70000008
++#define SHT_MIPS_RELD	       0x70000009
++#define SHT_MIPS_IFACE         0x7000000b
++#define SHT_MIPS_CONTENT       0x7000000c
++#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
++#define SHT_MIPS_SHDR	       0x70000010
++#define SHT_MIPS_FDESC	       0x70000011
++#define SHT_MIPS_EXTSYM	       0x70000012
++#define SHT_MIPS_DENSE	       0x70000013
++#define SHT_MIPS_PDESC	       0x70000014
++#define SHT_MIPS_LOCSYM	       0x70000015
++#define SHT_MIPS_AUXSYM	       0x70000016
++#define SHT_MIPS_OPTSYM	       0x70000017
++#define SHT_MIPS_LOCSTR	       0x70000018
++#define SHT_MIPS_LINE	       0x70000019
++#define SHT_MIPS_RFDESC	       0x7000001a
++#define SHT_MIPS_DELTASYM      0x7000001b
++#define SHT_MIPS_DELTAINST     0x7000001c
++#define SHT_MIPS_DELTACLASS    0x7000001d
++#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
++#define SHT_MIPS_DELTADECL     0x7000001f
++#define SHT_MIPS_SYMBOL_LIB    0x70000020
++#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
++#define SHT_MIPS_TRANSLATE     0x70000022
++#define SHT_MIPS_PIXIE	       0x70000023
++#define SHT_MIPS_XLATE	       0x70000024
++#define SHT_MIPS_XLATE_DEBUG   0x70000025
++#define SHT_MIPS_WHIRL	       0x70000026
++#define SHT_MIPS_EH_REGION     0x70000027
++#define SHT_MIPS_XLATE_OLD     0x70000028
++#define SHT_MIPS_PDR_EXCEPTION 0x70000029
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
++#define SHF_MIPS_MERGE	 0x20000000
++#define SHF_MIPS_ADDR	 0x40000000
++#define SHF_MIPS_STRINGS 0x80000000
++#define SHF_MIPS_NOSTRIP 0x08000000
++#define SHF_MIPS_LOCAL	 0x04000000
++#define SHF_MIPS_NAMES	 0x02000000
++#define SHF_MIPS_NODUPE	 0x01000000
++
++
++/* Symbol tables.  */
++
++/* MIPS specific values for `st_other'.  */
++#define STO_MIPS_DEFAULT		0x0
++#define STO_MIPS_INTERNAL		0x1
++#define STO_MIPS_HIDDEN			0x2
++#define STO_MIPS_PROTECTED		0x3
++#define STO_MIPS_PLT			0x8
++#define STO_MIPS_SC_ALIGN_UNUSED	0xff
++
++/* MIPS specific values for `st_info'.  */
++#define STB_MIPS_SPLIT_COMMON		13
++
++/* Entries found in sections of type SHT_MIPS_GPTAB.  */
++
++typedef union
++{
++  struct
++    {
++      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
++      Elf32_Word gt_unused;		/* Not used */
++    } gt_header;			/* First entry in section */
++  struct
++    {
++      Elf32_Word gt_g_value;		/* If this value were used for -G */
++      Elf32_Word gt_bytes;		/* This many bytes would be used */
++    } gt_entry;				/* Subsequent entries in section */
++} Elf32_gptab;
++
++/* Entry found in sections of type SHT_MIPS_REGINFO.  */
++
++typedef struct
++{
++  Elf32_Word	ri_gprmask;		/* General registers used */
++  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
++  Elf32_Sword	ri_gp_value;		/* $gp register value */
++} Elf32_RegInfo;
++
++/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
++
++typedef struct
++{
++  unsigned char kind;		/* Determines interpretation of the
++				   variable part of descriptor.  */
++  unsigned char size;		/* Size of descriptor, including header.  */
++  Elf32_Section section;	/* Section header index of section affected,
++				   0 for global options.  */
++  Elf32_Word info;		/* Kind-specific information.  */
++} Elf_Options;
++
++/* Values for `kind' field in Elf_Options.  */
++
++#define ODK_NULL	0	/* Undefined.  */
++#define ODK_REGINFO	1	/* Register usage information.  */
++#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
++#define ODK_PAD		3	/* Section padding options.  */
++#define ODK_HWPATCH	4	/* Hardware workarounds performed */
++#define ODK_FILL	5	/* record the fill value used by the linker. */
++#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
++#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
++#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
++
++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
++
++#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
++#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
++#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
++#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
++#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
++#define OEX_PRECISEFP	OEX_FPDBUG
++#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
++
++#define OEX_FPU_INVAL	0x10
++#define OEX_FPU_DIV0	0x08
++#define OEX_FPU_OFLO	0x04
++#define OEX_FPU_UFLO	0x02
++#define OEX_FPU_INEX	0x01
++
++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
++
++#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
++#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
++#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
++#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
++
++#define OPAD_PREFIX	0x1
++#define OPAD_POSTFIX	0x2
++#define OPAD_SYMBOL	0x4
++
++/* Entry found in `.options' section.  */
++
++typedef struct
++{
++  Elf32_Word hwp_flags1;	/* Extra flags.  */
++  Elf32_Word hwp_flags2;	/* Extra flags.  */
++} Elf_Options_Hw;
++
++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
++
++#define OHWA0_R4KEOP_CHECKED	0x00000001
++#define OHWA1_R4KEOP_CLEAN	0x00000002
++
++/* MIPS relocs.  */
++
++#define R_MIPS_NONE		0	/* No reloc */
++#define R_MIPS_16		1	/* Direct 16 bit */
++#define R_MIPS_32		2	/* Direct 32 bit */
++#define R_MIPS_REL32		3	/* PC relative 32 bit */
++#define R_MIPS_26		4	/* Direct 26 bit shifted */
++#define R_MIPS_HI16		5	/* High 16 bit */
++#define R_MIPS_LO16		6	/* Low 16 bit */
++#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
++#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
++#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
++#define R_MIPS_PC16		10	/* PC relative 16 bit */
++#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
++#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
++
++#define R_MIPS_SHIFT5		16
++#define R_MIPS_SHIFT6		17
++#define R_MIPS_64		18
++#define R_MIPS_GOT_DISP		19
++#define R_MIPS_GOT_PAGE		20
++#define R_MIPS_GOT_OFST		21
++#define R_MIPS_GOT_HI16		22
++#define R_MIPS_GOT_LO16		23
++#define R_MIPS_SUB		24
++#define R_MIPS_INSERT_A		25
++#define R_MIPS_INSERT_B		26
++#define R_MIPS_DELETE		27
++#define R_MIPS_HIGHER		28
++#define R_MIPS_HIGHEST		29
++#define R_MIPS_CALL_HI16	30
++#define R_MIPS_CALL_LO16	31
++#define R_MIPS_SCN_DISP		32
++#define R_MIPS_REL16		33
++#define R_MIPS_ADD_IMMEDIATE	34
++#define R_MIPS_PJUMP		35
++#define R_MIPS_RELGOT		36
++#define R_MIPS_JALR		37
++#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
++#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
++#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
++#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
++#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
++#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
++#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
++#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
++#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
++#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
++#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
++#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
++#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
++#define R_MIPS_GLOB_DAT		51
++#define R_MIPS_COPY		126
++#define R_MIPS_JUMP_SLOT        127
++/* Keep this the last entry.  */
++#define R_MIPS_NUM		128
++
++/* Legal values for p_type field of Elf32_Phdr.  */
++
++#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
++#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
++#define PT_MIPS_OPTIONS 0x70000002
++
++/* Special program header types.  */
++
++#define PF_MIPS_LOCAL	0x10000000
++
++/* Legal values for d_tag field of Elf32_Dyn.  */
++
++#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
++#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
++#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
++#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
++#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
++#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
++#define DT_MIPS_MSYM	     0x70000007
++#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
++#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
++#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
++#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
++#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
++#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
++#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
++#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
++#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
++#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
++#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
++#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
++						DT_MIPS_DELTA_CLASS.  */
++#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
++						DT_MIPS_DELTA_INSTANCE.  */
++#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
++					     DT_MIPS_DELTA_RELOC.  */
++#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
++					   relocations refer to.  */
++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
++					   DT_MIPS_DELTA_SYM.  */
++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
++					     class declaration.  */
++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
++						DT_MIPS_DELTA_CLASSSYM.  */
++#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
++#define DT_MIPS_PIXIE_INIT   0x70000023
++#define DT_MIPS_SYMBOL_LIB   0x70000024
++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
++#define DT_MIPS_LOCAL_GOTIDX 0x70000026
++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
++#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
++#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
++						    function stored in GOT.  */
++#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
++					   by rld on dlopen() calls.  */
++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
++#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
++#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
++/* The address of .got.plt in an executable using the new non-PIC ABI.  */
++#define DT_MIPS_PLTGOT	     0x70000032
++/* The base of the PLT in an executable using the new non-PIC ABI if that
++   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
++   value.  */
++#define DT_MIPS_RWPLT        0x70000034
++#define DT_MIPS_NUM	     0x35
++
++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
++
++#define RHF_NONE		   0		/* No flags */
++#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
++#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
++#define RHF_NO_MOVE		   (1 << 3)
++#define RHF_SGI_ONLY		   (1 << 4)
++#define RHF_GUARANTEE_INIT	   (1 << 5)
++#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
++#define RHF_GUARANTEE_START_INIT   (1 << 7)
++#define RHF_PIXIE		   (1 << 8)
++#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
++#define RHF_REQUICKSTART	   (1 << 10)
++#define RHF_REQUICKSTARTED	   (1 << 11)
++#define RHF_CORD		   (1 << 12)
++#define RHF_NO_UNRES_UNDEF	   (1 << 13)
++#define RHF_RLD_ORDER_SAFE	   (1 << 14)
++
++/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
++
++typedef struct
++{
++  Elf32_Word l_name;		/* Name (string table index) */
++  Elf32_Word l_time_stamp;	/* Timestamp */
++  Elf32_Word l_checksum;	/* Checksum */
++  Elf32_Word l_version;		/* Interface version */
++  Elf32_Word l_flags;		/* Flags */
++} Elf32_Lib;
++
++typedef struct
++{
++  Elf64_Word l_name;		/* Name (string table index) */
++  Elf64_Word l_time_stamp;	/* Timestamp */
++  Elf64_Word l_checksum;	/* Checksum */
++  Elf64_Word l_version;		/* Interface version */
++  Elf64_Word l_flags;		/* Flags */
++} Elf64_Lib;
++
++
++/* Legal values for l_flags.  */
++
++#define LL_NONE		  0
++#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
++#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
++#define LL_REQUIRE_MINOR  (1 << 2)
++#define LL_EXPORTS	  (1 << 3)
++#define LL_DELAY_LOAD	  (1 << 4)
++#define LL_DELTA	  (1 << 5)
++
++/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
++
++typedef Elf32_Addr Elf32_Conflict;
++
++
++/* HPPA specific definitions.  */
++
++/* Legal values for e_flags field of Elf32_Ehdr.  */
++
++#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
++#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
++#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
++#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
++#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
++					      prediction.  */
++#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
++#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
++
++/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
++
++#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
++#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
++#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
++
++/* Additional section indeces.  */
++
++#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
++					      symbols in ANSI C.  */
++#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
++
++/* Legal values for sh_type field of Elf32_Shdr.  */
++
++#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
++#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
++#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
++
++/* Legal values for sh_flags field of Elf32_Shdr.  */
++
++#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
++#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
++#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
++
++#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
++
++#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
++#define STT_HP_STUB		(STT_LOOS + 0x2)
++
++/* HPPA relocs.  */
++
++#define R_PARISC_NONE		0	/* No reloc.  */
++#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
++#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
++#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
++#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
++#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
++#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
++#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
++#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
++#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
++#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
++#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
++#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
++#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
++#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
++#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
++#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
++#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
++#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
++#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
++#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
++#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
++#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
++#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
++#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
++#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
++#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
++#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
++#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
++#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
++#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
++#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
++#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
++#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
++#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
++#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
++#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
++#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
++#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
++#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
++#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
++#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
++#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
++#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
++#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
++#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
++#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
++#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
++#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
++#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
++#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
++#define R_PARISC_LORESERVE	128
++#define R_PARISC_COPY		128	/* Copy relocation.  */
++#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
++#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
++#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
++#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
++#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
++#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
++#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
++#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
++#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
++#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
++#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
++#define R_PARISC_GNU_VTENTRY	232
++#define R_PARISC_GNU_VTINHERIT	233
++#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
++#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
++#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
++#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
++#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
++#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
++#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
++#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
++#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
++#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
++#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
++#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
++#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
++#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
++#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
++#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
++#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
++#define R_PARISC_HIRESERVE	255
++
++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PT_HP_TLS		(PT_LOOS + 0x0)
++#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
++#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
++#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
++#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
++#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
++#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
++#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
++#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
++#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
++#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
++#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
++#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
++#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
++#define PT_HP_STACK		(PT_LOOS + 0x14)
++
++#define PT_PARISC_ARCHEXT	0x70000000
++#define PT_PARISC_UNWIND	0x70000001
++
++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
++
++#define PF_PARISC_SBP		0x08000000
++
++#define PF_HP_PAGE_SIZE		0x00100000
++#define PF_HP_FAR_SHARED	0x00200000
++#define PF_HP_NEAR_SHARED	0x00400000
++#define PF_HP_CODE		0x01000000
++#define PF_HP_MODIFY		0x02000000
++#define PF_HP_LAZYSWAP		0x04000000
++#define PF_HP_SBP		0x08000000
++
++
++/* Alpha specific definitions.  */
++
++/* Legal values for e_flags field of Elf64_Ehdr.  */
++
++#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
++#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
++
++/* Legal values for sh_type field of Elf64_Shdr.  */
++
++/* These two are primerily concerned with ECOFF debugging info.  */
++#define SHT_ALPHA_DEBUG		0x70000001
++#define SHT_ALPHA_REGINFO	0x70000002
++
++/* Legal values for sh_flags field of Elf64_Shdr.  */
++
++#define SHF_ALPHA_GPREL		0x10000000
++
++/* Legal values for st_other field of Elf64_Sym.  */
++#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
++#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
++
++/* Alpha relocs.  */
++
++#define R_ALPHA_NONE		0	/* No reloc */
++#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
++#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
++#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
++#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
++#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
++#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
++#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
++#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
++#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
++#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
++#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
++#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
++#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
++#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
++#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
++#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
++#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
++#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
++#define R_ALPHA_TLS_GD_HI	28
++#define R_ALPHA_TLSGD		29
++#define R_ALPHA_TLS_LDM		30
++#define R_ALPHA_DTPMOD64	31
++#define R_ALPHA_GOTDTPREL	32
++#define R_ALPHA_DTPREL64	33
++#define R_ALPHA_DTPRELHI	34
++#define R_ALPHA_DTPRELLO	35
++#define R_ALPHA_DTPREL16	36
++#define R_ALPHA_GOTTPREL	37
++#define R_ALPHA_TPREL64		38
++#define R_ALPHA_TPRELHI		39
++#define R_ALPHA_TPRELLO		40
++#define R_ALPHA_TPREL16		41
++/* Keep this the last entry.  */
++#define R_ALPHA_NUM		46
++
++/* Magic values of the LITUSE relocation addend.  */
++#define LITUSE_ALPHA_ADDR	0
++#define LITUSE_ALPHA_BASE	1
++#define LITUSE_ALPHA_BYTOFF	2
++#define LITUSE_ALPHA_JSR	3
++#define LITUSE_ALPHA_TLS_GD	4
++#define LITUSE_ALPHA_TLS_LDM	5
++
++/* Legal values for d_tag of Elf64_Dyn.  */
++#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
++#define DT_ALPHA_NUM		1
++
++/* PowerPC specific declarations */
++
++/* Values for Elf32/64_Ehdr.e_flags.  */
++#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
++
++/* Cygnus local bits below */
++#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
++#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
++						   flag */
++
++/* PowerPC relocations defined by the ABIs */
++#define R_PPC_NONE		0
++#define R_PPC_ADDR32		1	/* 32bit absolute address */
++#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
++#define R_PPC_ADDR16		3	/* 16bit absolute address */
++#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
++#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
++#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
++#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
++#define R_PPC_ADDR14_BRTAKEN	8
++#define R_PPC_ADDR14_BRNTAKEN	9
++#define R_PPC_REL24		10	/* PC relative 26 bit */
++#define R_PPC_REL14		11	/* PC relative 16 bit */
++#define R_PPC_REL14_BRTAKEN	12
++#define R_PPC_REL14_BRNTAKEN	13
++#define R_PPC_GOT16		14
++#define R_PPC_GOT16_LO		15
++#define R_PPC_GOT16_HI		16
++#define R_PPC_GOT16_HA		17
++#define R_PPC_PLTREL24		18
++#define R_PPC_COPY		19
++#define R_PPC_GLOB_DAT		20
++#define R_PPC_JMP_SLOT		21
++#define R_PPC_RELATIVE		22
++#define R_PPC_LOCAL24PC		23
++#define R_PPC_UADDR32		24
++#define R_PPC_UADDR16		25
++#define R_PPC_REL32		26
++#define R_PPC_PLT32		27
++#define R_PPC_PLTREL32		28
++#define R_PPC_PLT16_LO		29
++#define R_PPC_PLT16_HI		30
++#define R_PPC_PLT16_HA		31
++#define R_PPC_SDAREL16		32
++#define R_PPC_SECTOFF		33
++#define R_PPC_SECTOFF_LO	34
++#define R_PPC_SECTOFF_HI	35
++#define R_PPC_SECTOFF_HA	36
++
++/* PowerPC relocations defined for the TLS access ABI.  */
++#define R_PPC_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
++#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
++#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
++#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
++#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
++#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
++#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
++#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
++#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
++#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
++
++/* The remaining relocs are from the Embedded ELF ABI, and are not
++   in the SVR4 ELF ABI.  */
++#define R_PPC_EMB_NADDR32	101
++#define R_PPC_EMB_NADDR16	102
++#define R_PPC_EMB_NADDR16_LO	103
++#define R_PPC_EMB_NADDR16_HI	104
++#define R_PPC_EMB_NADDR16_HA	105
++#define R_PPC_EMB_SDAI16	106
++#define R_PPC_EMB_SDA2I16	107
++#define R_PPC_EMB_SDA2REL	108
++#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
++#define R_PPC_EMB_MRKREF	110
++#define R_PPC_EMB_RELSEC16	111
++#define R_PPC_EMB_RELST_LO	112
++#define R_PPC_EMB_RELST_HI	113
++#define R_PPC_EMB_RELST_HA	114
++#define R_PPC_EMB_BIT_FLD	115
++#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
++
++/* Diab tool relocations.  */
++#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
++#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
++#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
++#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
++#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
++#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC_IRELATIVE		248
++
++/* GNU relocs used in PIC code sequences.  */
++#define R_PPC_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
++#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
++#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
++
++/* This is a phony reloc to handle any old fashioned TOC16 references
++   that may still be in object files.  */
++#define R_PPC_TOC16		255
++
++/* PowerPC specific values for the Dyn d_tag field.  */
++#define DT_PPC_GOT		(DT_LOPROC + 0)
++#define DT_PPC_NUM		1
++
++/* PowerPC64 relocations defined by the ABIs */
++#define R_PPC64_NONE		R_PPC_NONE
++#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
++#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
++#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
++#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
++#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
++#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
++#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
++#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
++#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
++#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
++#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
++#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
++#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
++#define R_PPC64_GOT16		R_PPC_GOT16
++#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
++#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
++#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
++
++#define R_PPC64_COPY		R_PPC_COPY
++#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
++#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
++#define R_PPC64_RELATIVE	R_PPC_RELATIVE
++
++#define R_PPC64_UADDR32		R_PPC_UADDR32
++#define R_PPC64_UADDR16		R_PPC_UADDR16
++#define R_PPC64_REL32		R_PPC_REL32
++#define R_PPC64_PLT32		R_PPC_PLT32
++#define R_PPC64_PLTREL32	R_PPC_PLTREL32
++#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
++#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
++#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
++
++#define R_PPC64_SECTOFF		R_PPC_SECTOFF
++#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
++#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
++#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
++#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
++#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
++#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
++#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
++#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
++#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
++#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
++#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
++#define R_PPC64_PLT64		45 /* doubleword64 L + A */
++#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
++#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
++#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
++#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
++#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
++#define R_PPC64_TOC		51 /* doubleword64 .TOC */
++#define R_PPC64_PLTGOT16	52 /* half16* M + A */
++#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
++#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
++#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
++
++#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
++#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
++#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
++#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
++#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
++#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
++#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
++#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
++#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
++#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
++#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
++
++/* PowerPC64 relocations defined for the TLS access ABI.  */
++#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
++#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
++#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
++#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
++#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
++#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
++#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
++#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
++#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
++#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
++#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
++#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
++#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
++#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
++#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
++#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
++#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
++#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
++#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
++#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
++#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
++#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
++#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
++#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
++#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
++#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
++#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
++
++/* GNU extension to support local ifunc.  */
++#define R_PPC64_JMP_IREL	247
++#define R_PPC64_IRELATIVE	248
++#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
++#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
++#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
++#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
++
++/* PowerPC64 specific values for the Dyn d_tag field.  */
++#define DT_PPC64_GLINK  (DT_LOPROC + 0)
++#define DT_PPC64_OPD	(DT_LOPROC + 1)
++#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
++#define DT_PPC64_NUM    3
++
++
++/* ARM specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_ARM_RELEXEC		0x01
++#define EF_ARM_HASENTRY		0x02
++#define EF_ARM_INTERWORK	0x04
++#define EF_ARM_APCS_26		0x08
++#define EF_ARM_APCS_FLOAT	0x10
++#define EF_ARM_PIC		0x20
++#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
++#define EF_ARM_NEW_ABI		0x80
++#define EF_ARM_OLD_ABI		0x100
++#define EF_ARM_SOFT_FLOAT	0x200
++#define EF_ARM_VFP_FLOAT	0x400
++#define EF_ARM_MAVERICK_FLOAT	0x800
++
++
++/* Other constants defined in the ARM ELF spec. version B-01.  */
++/* NB. These conflict with values defined above.  */
++#define EF_ARM_SYMSARESORTED	0x04
++#define EF_ARM_DYNSYMSUSESEGIDX	0x08
++#define EF_ARM_MAPSYMSFIRST	0x10
++#define EF_ARM_EABIMASK		0XFF000000
++
++/* Constants defined in AAELF.  */
++#define EF_ARM_BE8	    0x00800000
++#define EF_ARM_LE8	    0x00400000
++
++#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
++#define EF_ARM_EABI_UNKNOWN	0x00000000
++#define EF_ARM_EABI_VER1	0x01000000
++#define EF_ARM_EABI_VER2	0x02000000
++#define EF_ARM_EABI_VER3	0x03000000
++#define EF_ARM_EABI_VER4	0x04000000
++#define EF_ARM_EABI_VER5	0x05000000
++
++/* Additional symbol types for Thumb.  */
++#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
++#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
++
++/* ARM-specific values for sh_flags */
++#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
++#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
++					      in the input to a link step.  */
++
++/* ARM-specific program header flags */
++#define PF_ARM_SB		0x10000000 /* Segment contains the location
++					      addressed by the static base. */
++#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
++#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
++#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
++#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
++
++
++/* ARM relocs.  */
++
++#define R_ARM_NONE		0	/* No reloc */
++#define R_ARM_PC24		1	/* PC relative 26 bit branch */
++#define R_ARM_ABS32		2	/* Direct 32 bit  */
++#define R_ARM_REL32		3	/* PC relative 32 bit */
++#define R_ARM_PC13		4
++#define R_ARM_ABS16		5	/* Direct 16 bit */
++#define R_ARM_ABS12		6	/* Direct 12 bit */
++#define R_ARM_THM_ABS5		7
++#define R_ARM_ABS8		8	/* Direct 8 bit */
++#define R_ARM_SBREL32		9
++#define R_ARM_THM_PC22		10
++#define R_ARM_THM_PC8		11
++#define R_ARM_AMP_VCALL9	12
++#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
++#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
++#define R_ARM_THM_SWI8		14
++#define R_ARM_XPC25		15
++#define R_ARM_THM_XPC22		16
++#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
++#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
++#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
++#define R_ARM_COPY		20	/* Copy symbol at runtime */
++#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
++#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
++#define R_ARM_RELATIVE		23	/* Adjust by program base */
++#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
++#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
++#define R_ARM_GOT32		26	/* 32 bit GOT entry */
++#define R_ARM_PLT32		27	/* 32 bit PLT address */
++#define R_ARM_ALU_PCREL_7_0	32
++#define R_ARM_ALU_PCREL_15_8	33
++#define R_ARM_ALU_PCREL_23_15	34
++#define R_ARM_LDR_SBREL_11_0	35
++#define R_ARM_ALU_SBREL_19_12	36
++#define R_ARM_ALU_SBREL_27_20	37
++#define R_ARM_TLS_GOTDESC	90
++#define R_ARM_TLS_CALL		91
++#define R_ARM_TLS_DESCSEQ	92
++#define R_ARM_THM_TLS_CALL	93
++#define R_ARM_GNU_VTENTRY	100
++#define R_ARM_GNU_VTINHERIT	101
++#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
++#define R_ARM_THM_PC9		103	/* thumb conditional branch */
++#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
++					   thread local data */
++#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
++					   thread local data */
++#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
++					   block */
++#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
++					   static TLS block offset */
++#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
++					   TLS block */
++#define	R_ARM_THM_TLS_DESCSEQ	129
++#define R_ARM_IRELATIVE		160
++#define R_ARM_RXPC25		249
++#define R_ARM_RSBREL32		250
++#define R_ARM_THM_RPC22		251
++#define R_ARM_RREL32		252
++#define R_ARM_RABS22		253
++#define R_ARM_RPC24		254
++#define R_ARM_RBASE		255
++/* Keep this the last entry.  */
++#define R_ARM_NUM		256
++
++/* IA-64 specific declarations.  */
++
++/* Processor specific flags for the Ehdr e_flags field.  */
++#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
++#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
++#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
++
++/* Processor specific values for the Phdr p_type field.  */
++#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
++#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
++#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
++#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
++#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
++
++/* Processor specific flags for the Phdr p_flags field.  */
++#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Shdr sh_type field.  */
++#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
++#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
++
++/* Processor specific flags for the Shdr sh_flags field.  */
++#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
++#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
++
++/* Processor specific values for the Dyn d_tag field.  */
++#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
++#define DT_IA_64_NUM		1
++
++/* IA-64 relocations.  */
++#define R_IA64_NONE		0x00	/* none */
++#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
++#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
++#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
++#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
++#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
++#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
++#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
++#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
++#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
++#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
++#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
++#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
++#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
++#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
++#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
++#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
++#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
++#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
++#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
++#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
++#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
++#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
++#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
++#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
++#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
++#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
++#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
++#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
++#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
++#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
++#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
++#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
++#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
++#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
++#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
++#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
++#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
++#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
++#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
++#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
++#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
++#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
++#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
++#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
++#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
++#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
++#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
++#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
++#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
++#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
++#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
++#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
++#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
++#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
++#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
++#define R_IA64_COPY		0x84	/* copy relocation */
++#define R_IA64_SUB		0x85	/* Addend and symbol difference */
++#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
++#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
++#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
++#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
++#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
++#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
++#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
++#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
++#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
++#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
++#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
++#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
++#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
++#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
++#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
++#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
++
++/* SH specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field.  */
++#define EF_SH_MACH_MASK		0x1f
++#define EF_SH_UNKNOWN		0x0
++#define EF_SH1			0x1
++#define EF_SH2			0x2
++#define EF_SH3			0x3
++#define EF_SH_DSP		0x4
++#define EF_SH3_DSP		0x5
++#define EF_SH4AL_DSP		0x6
++#define EF_SH3E			0x8
++#define EF_SH4			0x9
++#define EF_SH2E			0xb
++#define EF_SH4A			0xc
++#define EF_SH2A			0xd
++#define EF_SH4_NOFPU		0x10
++#define EF_SH4A_NOFPU		0x11
++#define EF_SH4_NOMMU_NOFPU	0x12
++#define EF_SH2A_NOFPU		0x13
++#define EF_SH3_NOMMU		0x14
++#define EF_SH2A_SH4_NOFPU	0x15
++#define EF_SH2A_SH3_NOFPU	0x16
++#define EF_SH2A_SH4		0x17
++#define EF_SH2A_SH3E		0x18
++
++/* SH relocs.  */
++#define	R_SH_NONE		0
++#define	R_SH_DIR32		1
++#define	R_SH_REL32		2
++#define	R_SH_DIR8WPN		3
++#define	R_SH_IND12W		4
++#define	R_SH_DIR8WPL		5
++#define	R_SH_DIR8WPZ		6
++#define	R_SH_DIR8BP		7
++#define	R_SH_DIR8W		8
++#define	R_SH_DIR8L		9
++#define	R_SH_SWITCH16		25
++#define	R_SH_SWITCH32		26
++#define	R_SH_USES		27
++#define	R_SH_COUNT		28
++#define	R_SH_ALIGN		29
++#define	R_SH_CODE		30
++#define	R_SH_DATA		31
++#define	R_SH_LABEL		32
++#define	R_SH_SWITCH8		33
++#define	R_SH_GNU_VTINHERIT	34
++#define	R_SH_GNU_VTENTRY	35
++#define	R_SH_TLS_GD_32		144
++#define	R_SH_TLS_LD_32		145
++#define	R_SH_TLS_LDO_32		146
++#define	R_SH_TLS_IE_32		147
++#define	R_SH_TLS_LE_32		148
++#define	R_SH_TLS_DTPMOD32	149
++#define	R_SH_TLS_DTPOFF32	150
++#define	R_SH_TLS_TPOFF32	151
++#define	R_SH_GOT32		160
++#define	R_SH_PLT32		161
++#define	R_SH_COPY		162
++#define	R_SH_GLOB_DAT		163
++#define	R_SH_JMP_SLOT		164
++#define	R_SH_RELATIVE		165
++#define	R_SH_GOTOFF		166
++#define	R_SH_GOTPC		167
++/* Keep this the last entry.  */
++#define	R_SH_NUM		256
++
++/* S/390 specific definitions.  */
++
++/* Valid values for the e_flags field.  */
++
++#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
++
++/* Additional s390 relocs */
++
++#define R_390_NONE		0	/* No reloc.  */
++#define R_390_8			1	/* Direct 8 bit.  */
++#define R_390_12		2	/* Direct 12 bit.  */
++#define R_390_16		3	/* Direct 16 bit.  */
++#define R_390_32		4	/* Direct 32 bit.  */
++#define R_390_PC32		5	/* PC relative 32 bit.	*/
++#define R_390_GOT12		6	/* 12 bit GOT offset.  */
++#define R_390_GOT32		7	/* 32 bit GOT offset.  */
++#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
++#define R_390_COPY		9	/* Copy symbol at runtime.  */
++#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
++#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
++#define R_390_RELATIVE		12	/* Adjust by program base.  */
++#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
++#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
++#define R_390_GOT16		15	/* 16 bit GOT offset.  */
++#define R_390_PC16		16	/* PC relative 16 bit.	*/
++#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
++#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
++#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
++#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
++#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
++#define R_390_64		22	/* Direct 64 bit.  */
++#define R_390_PC64		23	/* PC relative 64 bit.	*/
++#define R_390_GOT64		24	/* 64 bit GOT offset.  */
++#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
++#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
++#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
++#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
++#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
++#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
++#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
++#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
++#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
++#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
++#define R_390_TLS_GDCALL	38	/* Tag for function call in general
++					   dynamic TLS code. */
++#define R_390_TLS_LDCALL	39	/* Tag for function call in local
++					   dynamic TLS code. */
++#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
++					   thread local data.  */
++#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
++					  thread local data.  */
++#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
++					   block offset. */
++#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
++#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
++#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
++					   block.  */
++#define R_390_20		57	/* Direct 20 bit.  */
++#define R_390_GOT20		58	/* 20 bit GOT offset.  */
++#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
++#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
++/* Keep this the last entry.  */
++#define R_390_NUM		62
++
++
++/* CRIS relocations.  */
++#define R_CRIS_NONE		0
++#define R_CRIS_8		1
++#define R_CRIS_16		2
++#define R_CRIS_32		3
++#define R_CRIS_8_PCREL		4
++#define R_CRIS_16_PCREL		5
++#define R_CRIS_32_PCREL		6
++#define R_CRIS_GNU_VTINHERIT	7
++#define R_CRIS_GNU_VTENTRY	8
++#define R_CRIS_COPY		9
++#define R_CRIS_GLOB_DAT		10
++#define R_CRIS_JUMP_SLOT	11
++#define R_CRIS_RELATIVE		12
++#define R_CRIS_16_GOT		13
++#define R_CRIS_32_GOT		14
++#define R_CRIS_16_GOTPLT	15
++#define R_CRIS_32_GOTPLT	16
++#define R_CRIS_32_GOTREL	17
++#define R_CRIS_32_PLT_GOTREL	18
++#define R_CRIS_32_PLT_PCREL	19
++
++#define R_CRIS_NUM		20
++
++
++/* AMD x86-64 relocations.  */
++#define R_X86_64_NONE		0	/* No reloc */
++#define R_X86_64_64		1	/* Direct 64 bit  */
++#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
++#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
++#define R_X86_64_PLT32		4	/* 32 bit PLT address */
++#define R_X86_64_COPY		5	/* Copy symbol at runtime */
++#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
++#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
++#define R_X86_64_RELATIVE	8	/* Adjust by program base */
++#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
++					   offset to GOT */
++#define R_X86_64_32		10	/* Direct 32 bit zero extended */
++#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
++#define R_X86_64_16		12	/* Direct 16 bit zero extended */
++#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
++#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
++#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
++#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
++#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
++#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
++#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
++					   to two GOT entries for GD symbol */
++#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
++					   to two GOT entries for LD symbol */
++#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
++#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
++					   to GOT entry for IE symbol */
++#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
++#define R_X86_64_PC64		24	/* PC relative 64 bit */
++#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
++#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
++					   offset to GOT */
++#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
++#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
++					   to GOT entry */
++#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
++#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
++#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
++					   to PLT entry */
++#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
++#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
++#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
++#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
++					   descriptor.  */
++#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
++#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
++#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
++
++#define R_X86_64_NUM		39
++
++
++/* AM33 relocations.  */
++#define R_MN10300_NONE		0	/* No reloc.  */
++#define R_MN10300_32		1	/* Direct 32 bit.  */
++#define R_MN10300_16		2	/* Direct 16 bit.  */
++#define R_MN10300_8		3	/* Direct 8 bit.  */
++#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
++#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
++#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
++#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
++#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
++#define R_MN10300_24		9	/* Direct 24 bit.  */
++#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
++#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
++#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
++#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
++#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
++#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
++#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
++#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
++#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
++#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
++#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
++#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
++#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
++
++#define R_MN10300_NUM		24
++
++
++/* M32R relocs.  */
++#define R_M32R_NONE		0	/* No reloc. */
++#define R_M32R_16		1	/* Direct 16 bit. */
++#define R_M32R_32		2	/* Direct 32 bit. */
++#define R_M32R_24		3	/* Direct 24 bit. */
++#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
++#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
++#define R_M32R_LO16		9	/* Low 16 bit. */
++#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
++#define R_M32R_GNU_VTINHERIT	11
++#define R_M32R_GNU_VTENTRY	12
++/* M32R relocs use SHT_RELA.  */
++#define R_M32R_16_RELA		33	/* Direct 16 bit. */
++#define R_M32R_32_RELA		34	/* Direct 32 bit. */
++#define R_M32R_24_RELA		35	/* Direct 24 bit. */
++#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
++#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
++#define R_M32R_LO16_RELA	41	/* Low 16 bit */
++#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
++#define R_M32R_RELA_GNU_VTINHERIT	43
++#define R_M32R_RELA_GNU_VTENTRY	44
++#define R_M32R_REL32		45	/* PC relative 32 bit.  */
++
++#define R_M32R_GOT24		48	/* 24 bit GOT entry */
++#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
++#define R_M32R_COPY		50	/* Copy symbol at runtime */
++#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
++#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
++#define R_M32R_RELATIVE		53	/* Adjust by program base */
++#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
++#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
++#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
++					   low */
++#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
++					   low */
++#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
++#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
++					   GOT with unsigned low */
++#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
++					   GOT with signed low */
++#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
++					   GOT */
++#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
++					   with unsigned low */
++#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
++					   with signed low */
++#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
++#define R_M32R_NUM		256	/* Keep this the last entry. */
++
++
++/* TILEPro relocations.  */
++#define R_TILEPRO_NONE		0	/* No reloc */
++#define R_TILEPRO_32		1	/* Direct 32 bit */
++#define R_TILEPRO_16		2	/* Direct 16 bit */
++#define R_TILEPRO_8		3	/* Direct 8 bit */
++#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
++#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
++#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
++#define R_TILEPRO_LO16		7	/* Low 16 bit */
++#define R_TILEPRO_HI16		8	/* High 16 bit */
++#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
++#define R_TILEPRO_COPY		10	/* Copy relocation */
++#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
++#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
++#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
++#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
++#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
++#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
++#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
++#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
++#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
++#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
++#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
++#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
++#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
++#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
++#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
++#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
++#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
++#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
++#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
++#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
++#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
++#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
++#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
++#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
++#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
++#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
++#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
++#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
++#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
++/* Relocs 56-59 are currently not defined.  */
++#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
++#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
++#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
++#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
++#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
++#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
++#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
++#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
++
++#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEPRO_NUM		130
++
++
++/* TILE-Gx relocations.  */
++#define R_TILEGX_NONE		0	/* No reloc */
++#define R_TILEGX_64		1	/* Direct 64 bit */
++#define R_TILEGX_32		2	/* Direct 32 bit */
++#define R_TILEGX_16		3	/* Direct 16 bit */
++#define R_TILEGX_8		4	/* Direct 8 bit */
++#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
++#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
++#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
++#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
++#define R_TILEGX_HW0		9	/* hword 0 16-bit */
++#define R_TILEGX_HW1		10	/* hword 1 16-bit */
++#define R_TILEGX_HW2		11	/* hword 2 16-bit */
++#define R_TILEGX_HW3		12	/* hword 3 16-bit */
++#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
++#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
++#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
++#define R_TILEGX_COPY		16	/* Copy relocation */
++#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
++#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
++#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
++#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
++#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
++#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
++#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
++#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
++#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
++#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
++#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
++#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
++#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
++#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
++#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
++#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
++#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
++#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
++#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
++#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
++#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
++#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
++#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
++#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
++#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
++#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
++#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
++#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
++#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
++#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
++#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
++#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
++/* Relocs 66-71 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
++#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
++#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
++/* Relocs 76-77 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
++#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
++/* Relocs 90-91 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
++#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
++/* Relocs 94-99 are currently not defined.  */
++#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
++#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
++#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
++/* Relocs 104-105 are currently not defined.  */
++#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
++#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
++#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
++#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
++#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
++#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
++#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
++#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
++#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
++#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
++
++#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
++#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
++
++#define R_TILEGX_NUM		130
++
++#endif	/* elf.h */
diff --git a/trunk/target/linux/generic/patches-3.8/212-byteshift_portability.patch b/trunk/target/linux/generic/patches-3.8/212-byteshift_portability.patch
new file mode 100644
index 00000000..bba55f53
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/212-byteshift_portability.patch
@@ -0,0 +1,53 @@
+--- a/tools/include/tools/be_byteshift.h
++++ b/tools/include/tools/be_byteshift.h
+@@ -1,7 +1,11 @@
+ #ifndef _TOOLS_BE_BYTESHIFT_H
+ #define _TOOLS_BE_BYTESHIFT_H
+ 
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#include "linux_types.h"
++#endif
+ 
+ static inline __u16 __get_unaligned_be16(const __u8 *p)
+ {
+--- a/tools/include/tools/le_byteshift.h
++++ b/tools/include/tools/le_byteshift.h
+@@ -1,7 +1,11 @@
+ #ifndef _TOOLS_LE_BYTESHIFT_H
+ #define _TOOLS_LE_BYTESHIFT_H
+ 
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#include "linux_types.h"
++#endif
+ 
+ static inline __u16 __get_unaligned_le16(const __u8 *p)
+ {
+--- /dev/null
++++ b/tools/include/tools/linux_types.h
+@@ -0,0 +1,22 @@
++#ifndef __LINUX_TYPES_H
++#define __LINUX_TYPES_H
++
++#include <stdint.h>
++
++typedef uint8_t __u8;
++typedef uint8_t __be8;
++typedef uint8_t __le8;
++
++typedef uint16_t __u16;
++typedef uint16_t __be16;
++typedef uint16_t __le16;
++
++typedef uint32_t __u32;
++typedef uint32_t __be32;
++typedef uint32_t __le32;
++
++typedef uint64_t __u64;
++typedef uint64_t __be64;
++typedef uint64_t __le64;
++
++#endif
diff --git a/trunk/target/linux/generic/patches-3.8/220-gc_sections.patch b/trunk/target/linux/generic/patches-3.8/220-gc_sections.patch
new file mode 100644
index 00000000..998403fc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/220-gc_sections.patch
@@ -0,0 +1,483 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -89,10 +89,14 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ #
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
+ cflags-y			+= -msoft-float
+-LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
++LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
++endif
++
+ cflags-y += -ffreestanding
+ 
+ #
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -67,7 +67,7 @@ SECTIONS
+ 	/* Exception table for data bus errors */
+ 	__dbe_table : {
+ 		__start___dbe_table = .;
+-		*(__dbe_table)
++		KEEP(*(__dbe_table))
+ 		__stop___dbe_table = .;
+ 	}
+ 
+@@ -112,7 +112,7 @@ SECTIONS
+ 	. = ALIGN(4);
+ 	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
+ 		__mips_machines_start = .;
+-		*(.mips.machines.init)
++		KEEP(*(.mips.machines.init))
+ 		__mips_machines_end = .;
+ 	}
+ 
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -101,7 +101,7 @@
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ #define MCOUNT_REC()	. = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__start_mcount_loc) = .; \
+-			*(__mcount_loc)				\
++			KEEP(*(__mcount_loc))			\
+ 			VMLINUX_SYMBOL(__stop_mcount_loc) = .;
+ #else
+ #define MCOUNT_REC()
+@@ -109,7 +109,7 @@
+ 
+ #ifdef CONFIG_TRACE_BRANCH_PROFILING
+ #define LIKELY_PROFILE()	VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
+-				*(_ftrace_annotated_branch)			      \
++				KEEP(*(_ftrace_annotated_branch))		      \
+ 				VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
+ #else
+ #define LIKELY_PROFILE()
+@@ -117,7 +117,7 @@
+ 
+ #ifdef CONFIG_PROFILE_ALL_BRANCHES
+ #define BRANCH_PROFILE()	VMLINUX_SYMBOL(__start_branch_profile) = .;   \
+-				*(_ftrace_branch)			      \
++				KEEP(*(_ftrace_branch))			      \
+ 				VMLINUX_SYMBOL(__stop_branch_profile) = .;
+ #else
+ #define BRANCH_PROFILE()
+@@ -126,7 +126,7 @@
+ #ifdef CONFIG_EVENT_TRACING
+ #define FTRACE_EVENTS()	. = ALIGN(8);					\
+ 			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\
+-			*(_ftrace_events)				\
++			KEEP(*(_ftrace_events))				\
+ 			VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+ #else
+ #define FTRACE_EVENTS()
+@@ -134,7 +134,7 @@
+ 
+ #ifdef CONFIG_TRACING
+ #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .;      \
+-			 *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
++			 KEEP(*(__trace_printk_fmt)) /* Trace_printk fmt' pointer */ \
+ 			 VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
+ #else
+ #define TRACE_PRINTKS()
+@@ -143,7 +143,7 @@
+ #ifdef CONFIG_FTRACE_SYSCALLS
+ #define TRACE_SYSCALLS() . = ALIGN(8);					\
+ 			 VMLINUX_SYMBOL(__start_syscalls_metadata) = .;	\
+-			 *(__syscalls_metadata)				\
++			 KEEP(*(__syscalls_metadata))			\
+ 			 VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
+ #else
+ #define TRACE_SYSCALLS()
+@@ -153,7 +153,7 @@
+ #define KERNEL_DTB()							\
+ 	STRUCT_ALIGN();							\
+ 	VMLINUX_SYMBOL(__dtb_start) = .;				\
+-	*(.dtb.init.rodata)						\
++	KEEP(*(.dtb.init.rodata))					\
+ 	VMLINUX_SYMBOL(__dtb_end) = .;
+ 
+ /* .data section */
+@@ -173,15 +173,16 @@
+ 	/* implement dynamic printk debug */				\
+ 	. = ALIGN(8);                                                   \
+ 	VMLINUX_SYMBOL(__start___jump_table) = .;                       \
+-	*(__jump_table)                                                 \
++	KEEP(*(__jump_table))                                           \
+ 	VMLINUX_SYMBOL(__stop___jump_table) = .;                        \
+ 	. = ALIGN(8);							\
+ 	VMLINUX_SYMBOL(__start___verbose) = .;                          \
+-	*(__verbose)                                                    \
++	KEEP(*(__verbose))                                              \
+ 	VMLINUX_SYMBOL(__stop___verbose) = .;				\
+ 	LIKELY_PROFILE()		       				\
+ 	BRANCH_PROFILE()						\
+-	TRACE_PRINTKS()
++	TRACE_PRINTKS()							\
++	*(.data.[a-zA-Z_]*)
+ 
+ /*
+  * Data section helpers
+@@ -235,39 +236,39 @@
+ 	/* PCI quirks */						\
+ 	.pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_early) = .;		\
+-		*(.pci_fixup_early)					\
++		KEEP(*(.pci_fixup_early))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_early) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_header) = .;		\
+-		*(.pci_fixup_header)					\
++		KEEP(*(.pci_fixup_header))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_header) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_final) = .;		\
+-		*(.pci_fixup_final)					\
++		KEEP(*(.pci_fixup_final))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_final) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;		\
+-		*(.pci_fixup_enable)					\
++		KEEP(*(.pci_fixup_enable))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;		\
+-		*(.pci_fixup_resume)					\
++		KEEP(*(.pci_fixup_resume))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;		\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;	\
+-		*(.pci_fixup_resume_early)				\
++		KEEP(*(.pci_fixup_resume_early))			\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;	\
+ 		VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;		\
+-		*(.pci_fixup_suspend)					\
++		KEEP(*(.pci_fixup_suspend))				\
+ 		VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;		\
+ 	}								\
+ 									\
+ 	/* Built-in firmware blobs */					\
+ 	.builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start_builtin_fw) = .;			\
+-		*(.builtin_fw)						\
++		KEEP(*(.builtin_fw))					\
+ 		VMLINUX_SYMBOL(__end_builtin_fw) = .;			\
+ 	}								\
+ 									\
+ 	/* RapidIO route ops */						\
+ 	.rio_ops        : AT(ADDR(.rio_ops) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start_rio_switch_ops) = .;		\
+-		*(.rio_switch_ops)					\
++		KEEP(*(.rio_switch_ops))				\
+ 		VMLINUX_SYMBOL(__end_rio_switch_ops) = .;		\
+ 	}								\
+ 									\
+@@ -276,49 +277,49 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		*(SORT(___ksymtab+*))					\
++		KEEP(*(SORT(___ksymtab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		*(SORT(___ksymtab_gpl+*))				\
++		KEEP(*(SORT(___ksymtab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal unused symbols */		\
+ 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
+-		*(SORT(___ksymtab_unused+*))				\
++		KEEP(*(SORT(___ksymtab_unused+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
+-		*(SORT(___ksymtab_unused_gpl+*))			\
++		KEEP(*(SORT(___ksymtab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
+-		*(SORT(___ksymtab_gpl_future+*))			\
++		KEEP(*(SORT(___ksymtab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__kcrctab         : AT(ADDR(__kcrctab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___kcrctab) = .;			\
+-		*(SORT(___kcrctab+*))					\
++		KEEP(*(SORT(___kcrctab+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__kcrctab_gpl     : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl) = .;		\
+-		*(SORT(___kcrctab_gpl+*))				\
++		KEEP(*(SORT(___kcrctab_gpl+*)))				\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -332,14 +333,14 @@
+ 	/* Kernel symbol table: GPL-only unused symbols */		\
+ 	__kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .;	\
+-		*(SORT(___kcrctab_unused_gpl+*))			\
++		KEEP(*(SORT(___kcrctab_unused_gpl+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .;	\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-future-only symbols */		\
+ 	__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \
+ 		VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .;	\
+-		*(SORT(___kcrctab_gpl_future+*))			\
++		KEEP(*(SORT(___kcrctab_gpl_future+*)))			\
+ 		VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .;	\
+ 	}								\
+ 									\
+@@ -362,14 +363,14 @@
+ 	/* Built-in module parameters. */				\
+ 	__param : AT(ADDR(__param) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___param) = .;			\
+-		*(__param)						\
++		KEEP(*(__param))					\
+ 		VMLINUX_SYMBOL(__stop___param) = .;			\
+ 	}								\
+ 									\
+ 	/* Built-in module versions. */					\
+ 	__modver : AT(ADDR(__modver) - LOAD_OFFSET) {			\
+ 		VMLINUX_SYMBOL(__start___modver) = .;			\
+-		*(__modver)						\
++		KEEP(*(__modver))					\
+ 		VMLINUX_SYMBOL(__stop___modver) = .;			\
+ 		. = ALIGN((align));					\
+ 		VMLINUX_SYMBOL(__end_rodata) = .;			\
+@@ -429,7 +430,7 @@
+ #define ENTRY_TEXT							\
+ 		ALIGN_FUNCTION();					\
+ 		VMLINUX_SYMBOL(__entry_text_start) = .;			\
+-		*(.entry.text)						\
++		KEEP(*(.entry.text))					\
+ 		VMLINUX_SYMBOL(__entry_text_end) = .;
+ 
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+@@ -457,7 +458,7 @@
+ 	. = ALIGN(align);						\
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ex_table) = .;			\
+-		*(__ex_table)						\
++		KEEP(*(__ex_table))						\
+ 		VMLINUX_SYMBOL(__stop___ex_table) = .;			\
+ 	}
+ 
+@@ -473,7 +474,7 @@
+ #ifdef CONFIG_CONSTRUCTORS
+ #define KERNEL_CTORS()	. = ALIGN(8);			   \
+ 			VMLINUX_SYMBOL(__ctors_start) = .; \
+-			*(.ctors)			   \
++			KEEP(*(.ctors))			   \
+ 			VMLINUX_SYMBOL(__ctors_end) = .;
+ #else
+ #define KERNEL_CTORS()
+@@ -526,7 +527,7 @@
+ #define SBSS(sbss_align)						\
+ 	. = ALIGN(sbss_align);						\
+ 	.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {				\
+-		*(.sbss)						\
++		*(.sbss .sbss.*)					\
+ 		*(.scommon)						\
+ 	}
+ 
+@@ -544,7 +545,7 @@
+ 		BSS_FIRST_SECTIONS					\
+ 		*(.bss..page_aligned)					\
+ 		*(.dynbss)						\
+-		*(.bss)							\
++		*(.bss .bss.*)						\
+ 		*(COMMON)						\
+ 	}
+ 
+@@ -593,7 +594,7 @@
+ 	. = ALIGN(8);							\
+ 	__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___bug_table) = .;		\
+-		*(__bug_table)						\
++		KEEP(*(__bug_table))					\
+ 		VMLINUX_SYMBOL(__stop___bug_table) = .;			\
+ 	}
+ #else
+@@ -605,7 +606,7 @@
+ 	. = ALIGN(4);							\
+ 	.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__tracedata_start) = .;			\
+-		*(.tracedata)						\
++		KEEP(*(.tracedata))					\
+ 		VMLINUX_SYMBOL(__tracedata_end) = .;			\
+ 	}
+ #else
+@@ -622,17 +623,17 @@
+ #define INIT_SETUP(initsetup_align)					\
+ 		. = ALIGN(initsetup_align);				\
+ 		VMLINUX_SYMBOL(__setup_start) = .;			\
+-		*(.init.setup)						\
++		KEEP(*(.init.setup))					\
+ 		VMLINUX_SYMBOL(__setup_end) = .;
+ 
+ #define INIT_CALLS_LEVEL(level)						\
+ 		VMLINUX_SYMBOL(__initcall##level##_start) = .;		\
+-		*(.initcall##level##.init)				\
+-		*(.initcall##level##s.init)				\
++		KEEP(*(.initcall##level##.init))			\
++		KEEP(*(.initcall##level##s.init))			\
+ 
+ #define INIT_CALLS							\
+ 		VMLINUX_SYMBOL(__initcall_start) = .;			\
+-		*(.initcallearly.init)					\
++		KEEP(*(.initcallearly.init))				\
+ 		INIT_CALLS_LEVEL(0)					\
+ 		INIT_CALLS_LEVEL(1)					\
+ 		INIT_CALLS_LEVEL(2)					\
+@@ -646,21 +647,21 @@
+ 
+ #define CON_INITCALL							\
+ 		VMLINUX_SYMBOL(__con_initcall_start) = .;		\
+-		*(.con_initcall.init)					\
++		KEEP(*(.con_initcall.init))				\
+ 		VMLINUX_SYMBOL(__con_initcall_end) = .;
+ 
+ #define SECURITY_INITCALL						\
+ 		VMLINUX_SYMBOL(__security_initcall_start) = .;		\
+-		*(.security_initcall.init)				\
++		KEEP(*(.security_initcall.init))			\
+ 		VMLINUX_SYMBOL(__security_initcall_end) = .;
+ 
+ #ifdef CONFIG_BLK_DEV_INITRD
+ #define INIT_RAM_FS							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__initramfs_start) = .;				\
+-	*(.init.ramfs)							\
++	KEEP(*(.init.ramfs))						\
+ 	. = ALIGN(8);							\
+-	*(.init.ramfs.info)
++	KEEP(*(.init.ramfs.info))
+ #else
+ #define INIT_RAM_FS
+ #endif
+--- a/arch/arm/Makefile
++++ b/arch/arm/Makefile
+@@ -17,11 +17,16 @@ LDFLAGS_vmlinux	:=-p --no-undefined -X
+ ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
+ LDFLAGS_vmlinux	+= --be8
+ endif
++LDFLAGS_vmlinux += --gc-sections --sort-section=name
+ 
+ OBJCOPYFLAGS	:=-O binary -R .comment -S
+ GZFLAGS		:=-9
+ #KBUILD_CFLAGS	+=-pipe
+ 
++ifndef CONFIG_FUNCTION_TRACER
++KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
++endif
++
+ # Never generate .eh_frame
+ KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
+ 
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -12,13 +12,13 @@
+ #define PROC_INFO							\
+ 	. = ALIGN(4);							\
+ 	VMLINUX_SYMBOL(__proc_info_begin) = .;				\
+-	*(.proc.info.init)						\
++	KEEP(*(.proc.info.init))					\
+ 	VMLINUX_SYMBOL(__proc_info_end) = .;
+ 
+ #define IDMAP_TEXT							\
+ 	ALIGN_FUNCTION();						\
+ 	VMLINUX_SYMBOL(__idmap_text_start) = .;				\
+-	*(.idmap.text)							\
++	KEEP(*(.idmap.text))						\
+ 	VMLINUX_SYMBOL(__idmap_text_end) = .;
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
+@@ -93,7 +93,7 @@ SECTIONS
+ 	.text : {			/* Real text segment		*/
+ 		_stext = .;		/* Text and read-only data	*/
+ 			__exception_text_start = .;
+-			*(.exception.text)
++			KEEP(*(.exception.text))
+ 			__exception_text_end = .;
+ 			IRQENTRY_TEXT
+ 			TEXT_TEXT
+@@ -118,7 +118,7 @@ SECTIONS
+ 	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+ 		__start___ex_table = .;
+ #ifdef CONFIG_MMU
+-		*(__ex_table)
++		KEEP(*(__ex_table))
+ #endif
+ 		__stop___ex_table = .;
+ 	}
+@@ -130,12 +130,12 @@ SECTIONS
+ 	. = ALIGN(8);
+ 	.ARM.unwind_idx : {
+ 		__start_unwind_idx = .;
+-		*(.ARM.exidx*)
++		KEEP(*(.ARM.exidx*))
+ 		__stop_unwind_idx = .;
+ 	}
+ 	.ARM.unwind_tab : {
+ 		__start_unwind_tab = .;
+-		*(.ARM.extab*)
++		KEEP(*(.ARM.extab*))
+ 		__stop_unwind_tab = .;
+ 	}
+ #endif
+@@ -158,24 +158,24 @@ SECTIONS
+ 	}
+ 	.init.arch.info : {
+ 		__arch_info_begin = .;
+-		*(.arch.info.init)
++		KEEP(*(.arch.info.init))
+ 		__arch_info_end = .;
+ 	}
+ 	.init.tagtable : {
+ 		__tagtable_begin = .;
+-		*(.taglist.init)
++		KEEP(*(.taglist.init))
+ 		__tagtable_end = .;
+ 	}
+ #ifdef CONFIG_SMP_ON_UP
+ 	.init.smpalt : {
+ 		__smpalt_begin = .;
+-		*(.alt.smp.init)
++		KEEP(*(.alt.smp.init))
+ 		__smpalt_end = .;
+ 	}
+ #endif
+ 	.init.pv_table : {
+ 		__pv_table_begin = .;
+-		*(.pv_table)
++		KEEP(*(.pv_table))
+ 		__pv_table_end = .;
+ 	}
+ 	.init.data : {
+--- a/arch/arm/boot/compressed/Makefile
++++ b/arch/arm/boot/compressed/Makefile
+@@ -119,6 +119,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
+ endif
++KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
+ 
+ ccflags-y := -fpic -fno-builtin -I$(obj)
+ asflags-y := -Wa,-march=all -DZIMAGE
diff --git a/trunk/target/linux/generic/patches-3.8/221-module_exports.patch b/trunk/target/linux/generic/patches-3.8/221-module_exports.patch
new file mode 100644
index 00000000..da08de62
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/221-module_exports.patch
@@ -0,0 +1,88 @@
+--- a/include/asm-generic/vmlinux.lds.h
++++ b/include/asm-generic/vmlinux.lds.h
+@@ -52,6 +52,16 @@
+ #define LOAD_OFFSET 0
+ #endif
+ 
++#ifndef SYMTAB_KEEP
++#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*)))
++#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*)))
++#endif
++
++#ifndef SYMTAB_DISCARD
++#define SYMTAB_DISCARD
++#define SYMTAB_DISCARD_GPL
++#endif
++
+ #ifndef SYMBOL_PREFIX
+ #define VMLINUX_SYMBOL(sym) sym
+ #else
+@@ -277,14 +287,14 @@
+ 	/* Kernel symbol table: Normal symbols */			\
+ 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
+ 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
+-		KEEP(*(SORT(___ksymtab+*)))				\
++		SYMTAB_KEEP						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
+ 	}								\
+ 									\
+ 	/* Kernel symbol table: GPL-only symbols */			\
+ 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
+ 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
+-		KEEP(*(SORT(___ksymtab_gpl+*)))				\
++		SYMTAB_KEEP_GPL						\
+ 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
+ 	}								\
+ 									\
+@@ -346,7 +356,7 @@
+ 									\
+ 	/* Kernel symbol table: strings */				\
+         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
+-		*(__ksymtab_strings)					\
++		*(__ksymtab_strings+*)					\
+ 	}								\
+ 									\
+ 	/* __*init sections */						\
+@@ -680,6 +690,8 @@
+ 	EXIT_TEXT							\
+ 	EXIT_DATA							\
+ 	EXIT_CALL							\
++	SYMTAB_DISCARD							\
++	SYMTAB_DISCARD_GPL						\
+ 	*(.discard)							\
+ 	*(.discard.*)							\
+ 	}
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -348,7 +348,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
+ # Linker scripts preprocessor (.lds.S -> .lds)
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds_S = LDS     $@
+-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
++      cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -C -U$(ARCH) \
+ 	                     -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
+ 
+ $(obj)/%.lds: $(src)/%.lds.S FORCE
+--- a/include/linux/export.h
++++ b/include/linux/export.h
+@@ -45,12 +45,19 @@ extern struct module __this_module;
+ #define __CRC_SYMBOL(sym, sec)
+ #endif
+ 
++#ifdef MODULE
++#define __EXPORT_SUFFIX(sym)
++#else
++#define __EXPORT_SUFFIX(sym) "+" #sym
++#endif
++
+ /* For every exported symbol, place a struct in the __ksymtab section */
+ #define __EXPORT_SYMBOL(sym, sec)				\
+ 	extern typeof(sym) sym;					\
+ 	__CRC_SYMBOL(sym, sec)					\
+ 	static const char __kstrtab_##sym[]			\
+-	__attribute__((section("__ksymtab_strings"), aligned(1))) \
++	__attribute__((section("__ksymtab_strings"		\
++	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
+ 	= MODULE_SYMBOL_PREFIX #sym;				\
+ 	static const struct kernel_symbol __ksymtab_##sym	\
+ 	__used							\
diff --git a/trunk/target/linux/generic/patches-3.8/230-openwrt_lzma_options.patch b/trunk/target/linux/generic/patches-3.8/230-openwrt_lzma_options.patch
new file mode 100644
index 00000000..744d6b7d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/230-openwrt_lzma_options.patch
@@ -0,0 +1,54 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -299,7 +299,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -226,7 +226,7 @@ cpio_list=
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -n -9 -f"
++compr="gzip -n -9 -f -"
+ 
+ arg="$1"
+ case "$arg" in
+@@ -240,9 +240,9 @@ case "$arg" in
+ 		output_file="$1"
+ 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
+ 		output=${cpio_list}
+-		echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f"
+-		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+-		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
++		echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f -"
++		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
++		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
+ 		echo "$output_file" | grep -q "\.xz$" && \
+ 				compr="xz --check=crc32 --lzma2=dict=1MiB"
+ 		echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
+@@ -303,7 +303,7 @@ if [ ! -z ${output_file} ]; then
+ 	if [ "${is_cpio_compressed}" = "compressed" ]; then
+ 		cat ${cpio_tfile} > ${output_file}
+ 	else
+-		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
++		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
+ 		|| (rm -f ${output_file} ; false)
+ 	fi
+ 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
+--- a/lib/decompress.c
++++ b/lib/decompress.c
+@@ -43,6 +43,7 @@ static const struct compress_format comp
+ 	{ {037, 0236}, "gzip", gunzip },
+ 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
+ 	{ {0x5d, 0x00}, "lzma", unlzma },
++	{ {0x6d, 0x00}, "lzma-librecmc", unlzma },
+ 	{ {0xfd, 0x37}, "xz", unxz },
+ 	{ {0x89, 0x4c}, "lzo", unlzo },
+ 	{ {0, 0}, NULL, NULL }
diff --git a/trunk/target/linux/generic/patches-3.8/250-netfilter_depends.patch b/trunk/target/linux/generic/patches-3.8/250-netfilter_depends.patch
new file mode 100644
index 00000000..218df4cf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/250-netfilter_depends.patch
@@ -0,0 +1,18 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -191,7 +191,6 @@ config NF_CONNTRACK_FTP
+ 
+ config NF_CONNTRACK_H323
+ 	tristate "H.323 protocol support"
+-	depends on (IPV6 || IPV6=n)
+ 	depends on NETFILTER_ADVANCED
+ 	help
+ 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
+@@ -757,7 +756,6 @@ config NETFILTER_XT_TARGET_SECMARK
+ 
+ config NETFILTER_XT_TARGET_TCPMSS
+ 	tristate '"TCPMSS" target support'
+-	depends on (IPV6 || IPV6=n)
+ 	default m if NETFILTER_ADVANCED=n
+ 	---help---
+ 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/trunk/target/linux/generic/patches-3.8/251-sound_kconfig.patch b/trunk/target/linux/generic/patches-3.8/251-sound_kconfig.patch
new file mode 100644
index 00000000..916363c8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/251-sound_kconfig.patch
@@ -0,0 +1,18 @@
+--- a/sound/core/Kconfig
++++ b/sound/core/Kconfig
+@@ -7,13 +7,13 @@ config SND_PCM
+ 	select SND_TIMER
+ 
+ config SND_HWDEP
+-	tristate
++	tristate "Sound hardware support"
+ 
+ config SND_RAWMIDI
+ 	tristate
+ 
+ config SND_COMPRESS_OFFLOAD
+-	tristate
++	tristate "Compression offloading support"
+ 
+ # To be effective this also requires INPUT - users should say:
+ #    select SND_JACK if INPUT=y || INPUT=SND
diff --git a/trunk/target/linux/generic/patches-3.8/252-mv_cesa_depends.patch b/trunk/target/linux/generic/patches-3.8/252-mv_cesa_depends.patch
new file mode 100644
index 00000000..fee28db1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/252-mv_cesa_depends.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
+ 	depends on PLAT_ORION
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES
++	select CRYPTO_HASH2
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_HASH
+ 	help
diff --git a/trunk/target/linux/generic/patches-3.8/253-ssb_b43_default_on.patch b/trunk/target/linux/generic/patches-3.8/253-ssb_b43_default_on.patch
new file mode 100644
index 00000000..29d2a41a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/253-ssb_b43_default_on.patch
@@ -0,0 +1,29 @@
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+ 	bool
+ 	depends on SSB
++	default y
+ 
+ config SSB_PCIHOST_POSSIBLE
+ 	bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
+ config SSB_B43_PCI_BRIDGE
+ 	bool
+ 	depends on SSB_PCIHOST
+-	default n
++	default y
+ 
+ config SSB_PCMCIAHOST_POSSIBLE
+ 	bool
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -17,6 +17,7 @@ config BCMA
+ config BCMA_BLOCKIO
+ 	bool
+ 	depends on BCMA
++	default y
+ 
+ config BCMA_HOST_PCI_POSSIBLE
+ 	bool
diff --git a/trunk/target/linux/generic/patches-3.8/254-textsearch_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.8/254-textsearch_kconfig_hacks.patch
new file mode 100644
index 00000000..9b0ed648
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/254-textsearch_kconfig_hacks.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -280,16 +280,16 @@ config BCH_CONST_T
+ # Textsearch support is select'ed if needed
+ #
+ config TEXTSEARCH
+-	boolean
++	boolean	"Textsearch support"
+ 
+ config TEXTSEARCH_KMP
+-	tristate
++	tristate "Textsearch KMP"
+ 
+ config TEXTSEARCH_BM
+-	tristate
++	tristate "Textsearch BM"
+ 
+ config TEXTSEARCH_FSM
+-	tristate
++	tristate "Textsearch FSM"
+ 
+ config BTREE
+ 	boolean
diff --git a/trunk/target/linux/generic/patches-3.8/255-lib80211_kconfig_hacks.patch b/trunk/target/linux/generic/patches-3.8/255-lib80211_kconfig_hacks.patch
new file mode 100644
index 00000000..8cc6ba35
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/255-lib80211_kconfig_hacks.patch
@@ -0,0 +1,19 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -149,13 +149,13 @@ config LIB80211
+ 	  Drivers should select this themselves if needed.
+ 
+ config LIB80211_CRYPT_WEP
+-	tristate
++	tristate "LIB80211_CRYPT_WEP"
+ 
+ config LIB80211_CRYPT_CCMP
+-	tristate
++	tristate "LIB80211_CRYPT_CCMP"
+ 
+ config LIB80211_CRYPT_TKIP
+-	tristate
++	tristate "LIB80211_CRYPT_TKIP"
+ 
+ config LIB80211_DEBUG
+ 	bool "lib80211 debugging messages"
diff --git a/trunk/target/linux/generic/patches-3.8/256-crypto_add_kconfig_prompts.patch b/trunk/target/linux/generic/patches-3.8/256-crypto_add_kconfig_prompts.patch
new file mode 100644
index 00000000..8462c711
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/256-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -31,7 +31,7 @@ config CRYPTO_FIPS
+ 	  this is.
+ 
+ config CRYPTO_ALGAPI
+-	tristate
++	tristate "ALGAPI"
+ 	select CRYPTO_ALGAPI2
+ 	help
+ 	  This option provides the API for cryptographic algorithms.
+@@ -40,7 +40,7 @@ config CRYPTO_ALGAPI2
+ 	tristate
+ 
+ config CRYPTO_AEAD
+-	tristate
++	tristate "AEAD"
+ 	select CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -49,7 +49,7 @@ config CRYPTO_AEAD2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_BLKCIPHER
+-	tristate
++	tristate "BLKCIPHER"
+ 	select CRYPTO_BLKCIPHER2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -60,7 +60,7 @@ config CRYPTO_BLKCIPHER2
+ 	select CRYPTO_WORKQUEUE
+ 
+ config CRYPTO_HASH
+-	tristate
++	tristate "HASH"
+ 	select CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI
+ 
+@@ -69,7 +69,7 @@ config CRYPTO_HASH2
+ 	select CRYPTO_ALGAPI2
+ 
+ config CRYPTO_RNG
+-	tristate
++	tristate "RNG"
+ 	select CRYPTO_RNG2
+ 	select CRYPTO_ALGAPI
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/257-wireless_ext_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.8/257-wireless_ext_kconfig_hack.patch
new file mode 100644
index 00000000..daac5898
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/257-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-	bool
++	bool "Wireless extensions"
+ 
+ config WEXT_CORE
+ 	def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+ 	depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-	bool
++	bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-	bool
++	bool "WEXT_PRIV"
+ 
+ config CFG80211
+ 	tristate "cfg80211 - wireless configuration API"
diff --git a/trunk/target/linux/generic/patches-3.8/258-netfilter_netlink_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.8/258-netfilter_netlink_kconfig_hack.patch
new file mode 100644
index 00000000..9d827c25
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/258-netfilter_netlink_kconfig_hack.patch
@@ -0,0 +1,11 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -2,7 +2,7 @@ menu "Core Netfilter Configuration"
+ 	depends on NET && INET && NETFILTER
+ 
+ config NETFILTER_NETLINK
+-	tristate
++	tristate "Netfilter NFNETLINK interface"
+ 
+ config NETFILTER_NETLINK_ACCT
+ tristate "Netfilter NFACCT over NFNETLINK interface"
diff --git a/trunk/target/linux/generic/patches-3.8/259-regmap_dynamic.patch b/trunk/target/linux/generic/patches-3.8/259-regmap_dynamic.patch
new file mode 100644
index 00000000..87c03f1a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/259-regmap_dynamic.patch
@@ -0,0 +1,72 @@
+--- a/drivers/base/regmap/Kconfig
++++ b/drivers/base/regmap/Kconfig
+@@ -3,20 +3,24 @@
+ # subsystems should select the appropriate symbols.
+ 
+ config REGMAP
+-	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_MMIO || REGMAP_IRQ)
+ 	select LZO_COMPRESS
+ 	select LZO_DECOMPRESS
+ 	select IRQ_DOMAIN if REGMAP_IRQ
+-	bool
++	tristate "Regmap"
+ 
+ config REGMAP_I2C
+-	tristate
++	select REGMAP
++	tristate "Regmap I2C"
+ 
+ config REGMAP_SPI
+-	tristate
++	select REGMAP
++	depends on SPI_MASTER
++	tristate "Regmap SPI"
+ 
+ config REGMAP_MMIO
++	select REGMAP
+ 	tristate
+ 
+ config REGMAP_IRQ
++	select REGMAP
+ 	bool
+--- a/include/linux/regmap.h
++++ b/include/linux/regmap.h
+@@ -44,7 +44,7 @@ struct reg_default {
+ 	unsigned int def;
+ };
+ 
+-#ifdef CONFIG_REGMAP
++#if IS_ENABLED(CONFIG_REGMAP)
+ 
+ enum regmap_endian {
+ 	/* Unspecified -> 0 -> Backwards compatible default */
+--- a/drivers/base/regmap/Makefile
++++ b/drivers/base/regmap/Makefile
+@@ -1,6 +1,8 @@
+-obj-$(CONFIG_REGMAP) += regmap.o regcache.o
+-obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
+-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
++regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-lzo.o
++ifdef CONFIG_DEBUG_FS
++regmap-core-objs += regmap-debugfs.o
++endif
++obj-$(CONFIG_REGMAP) += regmap-core.o
+ obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
+ obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
+ obj-$(CONFIG_REGMAP_MMIO) += regmap-mmio.o
+--- a/drivers/base/regmap/regmap.c
++++ b/drivers/base/regmap/regmap.c
+@@ -13,6 +13,7 @@
+ #include <linux/device.h>
+ #include <linux/slab.h>
+ #include <linux/export.h>
++#include <linux/module.h>
+ #include <linux/mutex.h>
+ #include <linux/err.h>
+ #include <linux/rbtree.h>
+@@ -1530,3 +1531,5 @@ static int __init regmap_initcall(void)
+ 	return 0;
+ }
+ postcore_initcall(regmap_initcall);
++
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.8/260-crypto_test_dependencies.patch b/trunk/target/linux/generic/patches-3.8/260-crypto_test_dependencies.patch
new file mode 100644
index 00000000..8cc15e47
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/260-crypto_test_dependencies.patch
@@ -0,0 +1,37 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -95,10 +95,10 @@ config CRYPTO_MANAGER
+ 
+ config CRYPTO_MANAGER2
+ 	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+-	select CRYPTO_AEAD2
+-	select CRYPTO_HASH2
+-	select CRYPTO_BLKCIPHER2
+-	select CRYPTO_PCOMP2
++	select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS
++	select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS
+ 
+ config CRYPTO_USER
+ 	tristate "Userspace cryptographic algorithm configuration"
+--- a/crypto/algboss.c
++++ b/crypto/algboss.c
+@@ -247,6 +247,9 @@ static int cryptomgr_schedule_test(struc
+ 	type = alg->cra_flags;
+ 
+ 	/* This piece of crap needs to disappear into per-type test hooks. */
++#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
++	type |= CRYPTO_ALG_TESTED;
++#else
+ 	if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
+ 	       CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
+ 	     ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+@@ -255,6 +258,7 @@ static int cryptomgr_schedule_test(struc
+ 	    (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
+ 	     alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
+ 		type |= CRYPTO_ALG_TESTED;
++#endif
+ 
+ 	param->type = type;
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/261-move_bcm963xx_tag.patch b/trunk/target/linux/generic/patches-3.8/261-move_bcm963xx_tag.patch
new file mode 100644
index 00000000..6b654a8a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/261-move_bcm963xx_tag.patch
@@ -0,0 +1,219 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
++++ /dev/null
+@@ -1,96 +0,0 @@
+-#ifndef __BCM963XX_TAG_H
+-#define __BCM963XX_TAG_H
+-
+-#define TAGVER_LEN		4	/* Length of Tag Version */
+-#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
+-#define SIG1_LEN		20	/* Company Signature 1 Length */
+-#define SIG2_LEN		14	/* Company Signature 2 Length */
+-#define BOARDID_LEN		16	/* Length of BoardId */
+-#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
+-#define CHIPID_LEN		6	/* Chip Id Length */
+-#define IMAGE_LEN		10	/* Length of Length Field */
+-#define ADDRESS_LEN		12	/* Length of Address field */
+-#define DUALFLAG_LEN		2	/* Dual Image flag Length */
+-#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
+-#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
+-#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
+-#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
+-#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
+-#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
+-
+-#define NUM_PIRELLI		2
+-#define IMAGETAG_CRC_START	0xFFFFFFFF
+-
+-#define PIRELLI_BOARDS { \
+-	"AGPF-S0", \
+-	"DWV-S0", \
+-}
+-
+-/*
+- * The broadcom firmware assumes the rootfs starts the image,
+- * therefore uses the rootfs start (flash_image_address)
+- * to determine where to flash the image.  Since we have the kernel first
+- * we have to give it the kernel address, but the crc uses the length
+- * associated with this address (root_length), which is added to the kernel
+- * length (kernel_length) to determine the length of image to flash and thus
+- * needs to be rootfs + deadcode (jffs2 EOF marker)
+-*/
+-
+-struct bcm_tag {
+-	/* 0-3: Version of the image tag */
+-	char tag_version[TAGVER_LEN];
+-	/* 4-23: Company Line 1 */
+-	char sig_1[SIG1_LEN];
+-	/*  24-37: Company Line 2 */
+-	char sig_2[SIG2_LEN];
+-	/* 38-43: Chip this image is for */
+-	char chip_id[CHIPID_LEN];
+-	/* 44-59: Board name */
+-	char board_id[BOARDID_LEN];
+-	/* 60-61: Map endianness -- 1 BE 0 LE */
+-	char big_endian[ENDIANFLAG_LEN];
+-	/* 62-71: Total length of image */
+-	char total_length[IMAGE_LEN];
+-	/* 72-83: Address in memory of CFE */
+-	char cfe__address[ADDRESS_LEN];
+-	/* 84-93: Size of CFE */
+-	char cfe_length[IMAGE_LEN];
+-	/* 94-105: Address in memory of image start
+-	 * (kernel for libreCMC, rootfs for stock firmware)
+-	 */
+-	char flash_image_start[ADDRESS_LEN];
+-	/* 106-115: Size of rootfs */
+-	char root_length[IMAGE_LEN];
+-	/* 116-127: Address in memory of kernel */
+-	char kernel_address[ADDRESS_LEN];
+-	/* 128-137: Size of kernel */
+-	char kernel_length[IMAGE_LEN];
+-	/* 138-139: Unused at the moment */
+-	char dual_image[DUALFLAG_LEN];
+-	/* 140-141: Unused at the moment */
+-	char inactive_flag[INACTIVEFLAG_LEN];
+-	/* 142-161: RSA Signature (not used; some vendors may use this) */
+-	char rsa_signature[RSASIG_LEN];
+-	/* 162-191: Compilation and related information (not used in libreCMC) */
+-	char information1[TAGINFO1_LEN];
+-	/* 192-195: Version flash layout */
+-	char flash_layout_ver[FLASHLAYOUTVER_LEN];
+-	/* 196-199: kernel+rootfs CRC32 */
+-	__u32 fskernel_crc;
+-	/* 200-215: Unused except on Alice Gate where is is information */
+-	char information2[TAGINFO2_LEN];
+-	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
+-	__u32 image_crc;
+-	/* 220-223: CRC32 of rootfs partition */
+-	__u32 rootfs_crc;
+-	/* 224-227: CRC32 of kernel partition */
+-	__u32 kernel_crc;
+-	/* 228-235: Unused at present */
+-	char reserved1[8];
+-	/* 236-239: CRC32 of header excluding last 20 bytes */
+-	__u32 header_crc;
+-	/* 240-255: Unused at present */
+-	char reserved2[16];
+-};
+-
+-#endif /* __BCM63XX_TAG_H */
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -32,7 +32,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
+-#include <asm/mach-bcm63xx/bcm963xx_tag.h>
++#include <linux/bcm963xx_tag.h>
+ #include <asm/mach-bcm63xx/board_bcm963xx.h>
+ 
+ #define BCM63XX_EXTENDED_SIZE	0xBFC00000	/* Extended flash address */
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -67,6 +67,7 @@ header-y += binfmts.h
+ header-y += blkpg.h
+ header-y += blktrace_api.h
+ header-y += bpqether.h
++header-y += bcm963xx_tag.h
+ header-y += bsg.h
+ header-y += can.h
+ header-y += capability.h
+--- /dev/null
++++ b/include/uapi/linux/bcm963xx_tag.h
+@@ -0,0 +1,96 @@
++#ifndef __BCM963XX_TAG_H
++#define __BCM963XX_TAG_H
++
++#define TAGVER_LEN		4	/* Length of Tag Version */
++#define TAGLAYOUT_LEN		4	/* Length of FlashLayoutVer */
++#define SIG1_LEN		20	/* Company Signature 1 Length */
++#define SIG2_LEN		14	/* Company Signature 2 Length */
++#define BOARDID_LEN		16	/* Length of BoardId */
++#define ENDIANFLAG_LEN		2	/* Endian Flag Length */
++#define CHIPID_LEN		6	/* Chip Id Length */
++#define IMAGE_LEN		10	/* Length of Length Field */
++#define ADDRESS_LEN		12	/* Length of Address field */
++#define DUALFLAG_LEN		2	/* Dual Image flag Length */
++#define INACTIVEFLAG_LEN	2	/* Inactie Flag Length */
++#define RSASIG_LEN		20	/* Length of RSA Signature in tag */
++#define TAGINFO1_LEN		30	/* Length of vendor information field1 in tag */
++#define FLASHLAYOUTVER_LEN	4	/* Length of Flash Layout Version String tag */
++#define TAGINFO2_LEN		16	/* Length of vendor information field2 in tag */
++#define ALTTAGINFO_LEN		54	/* Alternate length for vendor information; Pirelli */
++
++#define NUM_PIRELLI		2
++#define IMAGETAG_CRC_START	0xFFFFFFFF
++
++#define PIRELLI_BOARDS { \
++	"AGPF-S0", \
++	"DWV-S0", \
++}
++
++/*
++ * The broadcom firmware assumes the rootfs starts the image,
++ * therefore uses the rootfs start (flash_image_address)
++ * to determine where to flash the image.  Since we have the kernel first
++ * we have to give it the kernel address, but the crc uses the length
++ * associated with this address (root_length), which is added to the kernel
++ * length (kernel_length) to determine the length of image to flash and thus
++ * needs to be rootfs + deadcode (jffs2 EOF marker)
++*/
++
++struct bcm_tag {
++	/* 0-3: Version of the image tag */
++	char tag_version[TAGVER_LEN];
++	/* 4-23: Company Line 1 */
++	char sig_1[SIG1_LEN];
++	/*  24-37: Company Line 2 */
++	char sig_2[SIG2_LEN];
++	/* 38-43: Chip this image is for */
++	char chip_id[CHIPID_LEN];
++	/* 44-59: Board name */
++	char board_id[BOARDID_LEN];
++	/* 60-61: Map endianness -- 1 BE 0 LE */
++	char big_endian[ENDIANFLAG_LEN];
++	/* 62-71: Total length of image */
++	char total_length[IMAGE_LEN];
++	/* 72-83: Address in memory of CFE */
++	char cfe__address[ADDRESS_LEN];
++	/* 84-93: Size of CFE */
++	char cfe_length[IMAGE_LEN];
++	/* 94-105: Address in memory of image start
++	 * (kernel for libreCMC, rootfs for stock firmware)
++	 */
++	char flash_image_start[ADDRESS_LEN];
++	/* 106-115: Size of rootfs */
++	char root_length[IMAGE_LEN];
++	/* 116-127: Address in memory of kernel */
++	char kernel_address[ADDRESS_LEN];
++	/* 128-137: Size of kernel */
++	char kernel_length[IMAGE_LEN];
++	/* 138-139: Unused at the moment */
++	char dual_image[DUALFLAG_LEN];
++	/* 140-141: Unused at the moment */
++	char inactive_flag[INACTIVEFLAG_LEN];
++	/* 142-161: RSA Signature (not used; some vendors may use this) */
++	char rsa_signature[RSASIG_LEN];
++	/* 162-191: Compilation and related information (not used in libreCMC) */
++	char information1[TAGINFO1_LEN];
++	/* 192-195: Version flash layout */
++	char flash_layout_ver[FLASHLAYOUTVER_LEN];
++	/* 196-199: kernel+rootfs CRC32 */
++	__u32 fskernel_crc;
++	/* 200-215: Unused except on Alice Gate where is is information */
++	char information2[TAGINFO2_LEN];
++	/* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */
++	__u32 image_crc;
++	/* 220-223: CRC32 of rootfs partition */
++	__u32 rootfs_crc;
++	/* 224-227: CRC32 of kernel partition */
++	__u32 kernel_crc;
++	/* 228-235: Unused at present */
++	char reserved1[8];
++	/* 236-239: CRC32 of header excluding last 20 bytes */
++	__u32 header_crc;
++	/* 240-255: Unused at present */
++	char reserved2[16];
++};
++
++#endif /* __BCM63XX_TAG_H */
diff --git a/trunk/target/linux/generic/patches-3.8/262-compressor_kconfig_hack.patch b/trunk/target/linux/generic/patches-3.8/262-compressor_kconfig_hack.patch
new file mode 100644
index 00000000..0a89a090
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/262-compressor_kconfig_hack.patch
@@ -0,0 +1,23 @@
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -178,16 +178,16 @@ config AUDIT_GENERIC
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++	tristate "ZLIB inflate support"
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "ZLIB deflate support"
+ 
+ config LZO_COMPRESS
+-	tristate
++	tristate "LZO compress support"
+ 
+ config LZO_DECOMPRESS
+-	tristate
++	tristate "LZO decompress support"
+ 
+ source "lib/xz/Kconfig"
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/300-mips_expose_boot_raw.patch b/trunk/target/linux/generic/patches-3.8/300-mips_expose_boot_raw.patch
new file mode 100644
index 00000000..59b500d1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/300-mips_expose_boot_raw.patch
@@ -0,0 +1,39 @@
+From: Mark Miller <mark@mirell.org>
+
+This exposes the CONFIG_BOOT_RAW symbol in Kconfig. This is needed on
+certain Broadcom chipsets running CFE in order to load the kernel.
+
+Signed-off-by: Mark Miller <mark@mirell.org>
+Acked-by: Rob Landley <rob@landley.net>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -893,9 +893,6 @@ config FW_ARC
+ config ARCH_MAY_HAVE_PC_FDC
+ 	bool
+ 
+-config BOOT_RAW
+-	bool
+-
+ config CEVT_BCM1480
+ 	bool
+ 
+@@ -2374,6 +2371,18 @@ config USE_OF
+ 	select OF_EARLY_FLATTREE
+ 	select IRQ_DOMAIN
+ 
++config BOOT_RAW
++	bool "Enable the kernel to be executed from the load address"
++	default n
++	help
++	 Allow the kernel to be executed from the load address for
++	 bootloaders which cannot read the ELF format. This places
++	 a jump to start_kernel at the load address.
++
++	 If unsure, say N.
++
++
++
+ endmenu
+ 
+ config LOCKDEP_SUPPORT
diff --git a/trunk/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch b/trunk/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch
new file mode 100644
index 00000000..c685bc01
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/301-mips_image_cmdline_hack.patch
@@ -0,0 +1,28 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -984,6 +984,10 @@ config SYNC_R4K
+ config MIPS_MACHINE
+ 	def_bool n
+ 
++config IMAGE_CMDLINE_HACK
++	bool "libreCMC specific image command line hack"
++	default n
++
+ config NO_IOPORT
+ 	def_bool n
+ 
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
+@@ -140,6 +140,12 @@ FEXPORT(__kernel_entry)
+ 	j	kernel_entry
+ #endif
+ 
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++	.ascii	"CMDLINE:"
++EXPORT(__image_cmdline)
++	.fill	0x400
++#endif /* CONFIG_IMAGE_CMDLINE_HACK */
++
+ 	__REF
+ 
+ NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/trunk/target/linux/generic/patches-3.8/302-mips_no_branch_likely.patch b/trunk/target/linux/generic/patches-3.8/302-mips_no_branch_likely.patch
new file mode 100644
index 00000000..19adcb80
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/302-mips_no_branch_likely.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -87,7 +87,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ # machines may also.  Since BFD is incredibly buggy with respect to
+ # crossformat linking we rely on the elf2ecoff tool for format conversion.
+ #
+-cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
++cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
diff --git a/trunk/target/linux/generic/patches-3.8/304-mips_disable_fpu.patch b/trunk/target/linux/generic/patches-3.8/304-mips_disable_fpu.patch
new file mode 100644
index 00000000..89beeec5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/304-mips_disable_fpu.patch
@@ -0,0 +1,160 @@
+MIPS: allow disabling the kernel FPU emulator
+
+This patch allows turning off the in-kernel Algorithmics
+FPU emulator support, which allows one to save a couple of
+precious blocks on an embedded system.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+--
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -969,6 +969,17 @@ config I8259
+ config MIPS_BONITO64
+ 	bool
+ 
++config MIPS_FPU_EMU
++	bool "Enable FPU emulation"
++	default y
++	help
++	   This option allows building a kernel with or without the Algorithmics
++	   FPU emulator enabled. Turning off this option results in a kernel which
++	   does not catch floating operations exceptions. Make sure that your toolchain
++	   is configured to enable software floating point emulation in that case.
++		
++	   If unsure say Y here.
++
+ config MIPS_MSC
+ 	bool
+ 
+--- a/arch/mips/math-emu/Makefile
++++ b/arch/mips/math-emu/Makefile
+@@ -2,11 +2,13 @@
+ # Makefile for the Linux/MIPS kernel FPU emulation.
+ #
+ 
+-obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
++obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
++
++obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
+ 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
+ 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
+ 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
+ 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
+ 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
+-	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
++	   dp_sqrt.o sp_sqrt.o
+ 
+--- a/arch/mips/math-emu/cp1emu.c
++++ b/arch/mips/math-emu/cp1emu.c
+@@ -58,7 +58,11 @@
+ #define __mips 4
+ 
+ /* Function which emulates a floating point instruction. */
++#ifdef CONFIG_DEBUG_FS
++DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
++#endif
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
+ 	mips_instruction);
+ 
+@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
+ 
+ /* Further private data for which no space exists in mips_fpu_struct */
+ 
+-#ifdef CONFIG_DEBUG_FS
+-DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
+-#endif
+-
+ /* Control registers */
+ 
+ #define FPCREG_RID	0	/* $0  = revision id */
+@@ -1361,7 +1361,6 @@ int fpu_emulator_cop1Handler(struct pt_r
+ 
+ 	return sig;
+ }
+-
+ #ifdef CONFIG_DEBUG_FS
+ 
+ static int fpuemu_stat_get(void *data, u64 *val)
+@@ -1410,4 +1409,11 @@ static int __init debugfs_fpuemu(void)
+ 	return 0;
+ }
+ __initcall(debugfs_fpuemu);
+-#endif
++#endif /* CONFIG_DEBUGFS */
++#else
++int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
++        int has_fpu)
++{
++	return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/math-emu/dsemul.c
++++ b/arch/mips/math-emu/dsemul.c
+@@ -108,6 +108,7 @@ int mips_dsemul(struct pt_regs *regs, mi
+ 	return SIGILL;		/* force out of emulation loop */
+ }
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ int do_dsemulret(struct pt_regs *xcp)
+ {
+ 	struct emuframe __user *fr;
+@@ -164,3 +165,9 @@ int do_dsemulret(struct pt_regs *xcp)
+ 
+ 	return 1;
+ }
++#else
++int do_dsemulret(struct pt_regs *xcp)
++{
++	return 0;
++}
++#endif /* CONFIG_MIPS_FPU_EMU */
+--- a/arch/mips/math-emu/kernel_linkage.c
++++ b/arch/mips/math-emu/kernel_linkage.c
+@@ -29,6 +29,7 @@
+ 
+ #define SIGNALLING_NAN 0x7ff800007ff80000LL
+ 
++#ifdef CONFIG_MIPS_FPU_EMU
+ void fpu_emulator_init_fpu(void)
+ {
+ 	static int first = 1;
+@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
+ 
+ 	return err;
+ }
+-#endif
++#endif	/* CONFIG_64BIT */
++#else
++
++void fpu_emulator_init_fpu(void)
++{
++	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
++		"was compiled with software floating point support (soft-float)\n");
++	return;
++}
++
++int fpu_emulator_save_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context(struct sigcontext __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++
++int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
++{
++	return 0;
++}
++
++#ifdef CONFIG_64BIT
++#endif	/* CONFIG_64BIT */
++#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/trunk/target/linux/generic/patches-3.8/305-mips_module_reloc.patch b/trunk/target/linux/generic/patches-3.8/305-mips_module_reloc.patch
new file mode 100644
index 00000000..31be9d92
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/305-mips_module_reloc.patch
@@ -0,0 +1,350 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
+ cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
+ cflags-y			+= -msoft-float
+ LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib --gc-sections --sort-section=name
++ifdef CONFIG_64BIT
+ KBUILD_AFLAGS_MODULE		+= -mlong-calls
+ KBUILD_CFLAGS_MODULE		+= -mlong-calls
++else
++KBUILD_AFLAGS_MODULE		+= -mno-long-calls
++KBUILD_CFLAGS_MODULE		+= -mno-long-calls
++endif
+ 
+ ifndef CONFIG_FUNCTION_TRACER
+ KBUILD_CFLAGS_KERNEL		+= -ffunction-sections -fdata-sections
+--- a/arch/mips/include/asm/module.h
++++ b/arch/mips/include/asm/module.h
+@@ -11,6 +11,11 @@ struct mod_arch_specific {
+ 	const struct exception_table_entry *dbe_start;
+ 	const struct exception_table_entry *dbe_end;
+ 	struct mips_hi16 *r_mips_hi16_list;
++
++	void *phys_plt_tbl;
++	void *virt_plt_tbl;
++	unsigned int phys_plt_offset;
++	unsigned int virt_plt_offset;
+ };
+ 
+ typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
+--- a/arch/mips/kernel/module.c
++++ b/arch/mips/kernel/module.c
+@@ -42,14 +42,219 @@ struct mips_hi16 {
+ static LIST_HEAD(dbe_list);
+ static DEFINE_SPINLOCK(dbe_lock);
+ 
+-#ifdef MODULE_START
++/*
++ * Get the potential max trampolines size required of the init and
++ * non-init sections. Only used if we cannot find enough contiguous
++ * physically mapped memory to put the module into.
++ */
++static unsigned int
++get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
++             const char *secstrings, unsigned int symindex, bool is_init)
++{
++	unsigned long ret = 0;
++	unsigned int i, j;
++	Elf_Sym *syms;
++
++	/* Everything marked ALLOC (this includes the exported symbols) */
++	for (i = 1; i < hdr->e_shnum; ++i) {
++		unsigned int info = sechdrs[i].sh_info;
++
++		if (sechdrs[i].sh_type != SHT_REL
++		    && sechdrs[i].sh_type != SHT_RELA)
++			continue;
++
++		/* Not a valid relocation section? */
++		if (info >= hdr->e_shnum)
++			continue;
++
++		/* Don't bother with non-allocated sections */
++		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
++			continue;
++
++		/* If it's called *.init*, and we're not init, we're
++                   not interested */
++		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
++		    != is_init)
++			continue;
++
++		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
++		if (sechdrs[i].sh_type == SHT_REL) {
++			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rel[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		} else {
++			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
++			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
++
++			for (j = 0; j < size; ++j) {
++				Elf_Sym *sym;
++
++				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
++					continue;
++
++				sym = syms + ELF_MIPS_R_SYM(rela[j]);
++				if (!is_init && sym->st_shndx != SHN_UNDEF)
++					continue;
++
++				ret += 4 * sizeof(int);
++			}
++		}
++	}
++
++	return ret;
++}
++
++#ifndef MODULE_START
++static void *alloc_phys(unsigned long size)
++{
++	unsigned order;
++	struct page *page;
++	struct page *p;
++
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
++
++	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
++			__GFP_THISNODE, order);
++	if (!page)
++		return NULL;
++
++	split_page(page, order);
++
++	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
++		__free_page(p);
++
++	return page_address(page);
++}
++#endif
++
++static void free_phys(void *ptr, unsigned long size)
++{
++	struct page *page;
++	struct page *end;
++
++	page = virt_to_page(ptr);
++	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
++
++	for (; page < end; ++page)
++		__free_page(page);
++}
++
++
+ void *module_alloc(unsigned long size)
+ {
++#ifdef MODULE_START
+ 	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+ 				GFP_KERNEL, PAGE_KERNEL, -1,
+ 				__builtin_return_address(0));
++#else
++	void *ptr;
++
++	if (size == 0)
++		return NULL;
++
++	ptr = alloc_phys(size);
++
++	/* If we failed to allocate physically contiguous memory,
++	 * fall back to regular vmalloc. The module loader code will
++	 * create jump tables to handle long jumps */
++	if (!ptr)
++		return vmalloc(size);
++
++	return ptr;
++#endif
+ }
++
++static inline bool is_phys_addr(void *ptr)
++{
++#ifdef CONFIG_64BIT
++	return (KSEGX((unsigned long)ptr) == CKSEG0);
++#else
++	return (KSEGX(ptr) == KSEG0);
+ #endif
++}
++
++/* Free memory returned from module_alloc */
++void module_free(struct module *mod, void *module_region)
++{
++	if (is_phys_addr(module_region)) {
++		if (mod->module_init == module_region)
++			free_phys(module_region, mod->init_size);
++		else if (mod->module_core == module_region)
++			free_phys(module_region, mod->core_size);
++		else
++			BUG();
++	} else {
++		vfree(module_region);
++	}
++}
++
++static void *__module_alloc(int size, bool phys)
++{
++	void *ptr;
++
++	if (phys)
++		ptr = kmalloc(size, GFP_KERNEL);
++	else
++		ptr = vmalloc(size);
++	return ptr;
++}
++
++static void __module_free(void *ptr)
++{
++	if (is_phys_addr(ptr))
++		kfree(ptr);
++	else
++		vfree(ptr);
++}
++
++int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
++			      char *secstrings, struct module *mod)
++{
++	unsigned int symindex = 0;
++	unsigned int core_size, init_size;
++	int i;
++
++	for (i = 1; i < hdr->e_shnum; i++)
++		if (sechdrs[i].sh_type == SHT_SYMTAB)
++			symindex = i;
++
++	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
++	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
++
++	mod->arch.phys_plt_offset = 0;
++	mod->arch.virt_plt_offset = 0;
++	mod->arch.phys_plt_tbl = NULL;
++	mod->arch.virt_plt_tbl = NULL;
++
++	if ((core_size + init_size) == 0)
++		return 0;
++
++	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
++	if (!mod->arch.phys_plt_tbl)
++		return -ENOMEM;
++
++	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
++	if (!mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++		return -ENOMEM;
++	}
++
++	return 0;
++}
+ 
+ int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+ {
+@@ -63,8 +268,39 @@ static int apply_r_mips_32_rel(struct mo
+ 	return 0;
+ }
+ 
++static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
++				 void *start, Elf_Addr v)
++{
++	unsigned *tramp = start + *plt_offset;
++	*plt_offset += 4 * sizeof(int);
++
++	/* adjust carry for addiu */
++	if (v & 0x00008000)
++		v += 0x10000;
++
++	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
++	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
++	tramp[2] = 0x03200008;                  /* jr t9 */
++	tramp[3] = 0x00000000;                  /* nop */
++
++	return (Elf_Addr) tramp;
++}
++
++static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
++{
++	if (is_phys_addr(location))
++		return add_plt_entry_to(&me->arch.phys_plt_offset,
++				me->arch.phys_plt_tbl, v);
++	else
++		return add_plt_entry_to(&me->arch.virt_plt_offset,
++				me->arch.virt_plt_tbl, v);
++
++}
++
+ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
+ {
++	u32 ofs = *location & 0x03ffffff;
++
+ 	if (v % 4) {
+ 		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
+ 		       me->name);
+@@ -72,14 +308,17 @@ static int apply_r_mips_26_rel(struct mo
+ 	}
+ 
+ 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+-		printk(KERN_ERR
+-		       "module %s: relocation overflow\n",
+-		       me->name);
+-		return -ENOEXEC;
++	    v = add_plt_entry(me, location, v + (ofs << 2));
++		if (!v) {
++			printk(KERN_ERR
++			       "module %s: relocation overflow\n",
++			       me->name);
++			return -ENOEXEC;
++		}
++		ofs = 0;
+ 	}
+ 
+-	*location = (*location & ~0x03ffffff) |
+-	            ((*location + (v >> 2)) & 0x03ffffff);
++	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
+ 
+ 	return 0;
+ }
+@@ -286,11 +525,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		list_add(&me->arch.dbe_list, &dbe_list);
+ 		spin_unlock_irq(&dbe_lock);
+ 	}
++
++	/* Get rid of the fixup trampoline if we're running the module
++	 * from physically mapped address space */
++	if (me->arch.phys_plt_offset == 0) {
++		__module_free(me->arch.phys_plt_tbl);
++		me->arch.phys_plt_tbl = NULL;
++	}
++	if (me->arch.virt_plt_offset == 0) {
++		__module_free(me->arch.virt_plt_tbl);
++		me->arch.virt_plt_tbl = NULL;
++	}
++
+ 	return 0;
+ }
+ 
+ void module_arch_cleanup(struct module *mod)
+ {
++	if (mod->arch.phys_plt_tbl) {
++		__module_free(mod->arch.phys_plt_tbl);
++		mod->arch.phys_plt_tbl = NULL;
++	}
++	if (mod->arch.virt_plt_tbl) {
++		__module_free(mod->arch.virt_plt_tbl);
++		mod->arch.virt_plt_tbl = NULL;
++	}
++
+ 	spin_lock_irq(&dbe_lock);
+ 	list_del(&mod->arch.dbe_list);
+ 	spin_unlock_irq(&dbe_lock);
diff --git a/trunk/target/linux/generic/patches-3.8/306-mips_mem_functions_performance.patch b/trunk/target/linux/generic/patches-3.8/306-mips_mem_functions_performance.patch
new file mode 100644
index 00000000..98186774
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/306-mips_mem_functions_performance.patch
@@ -0,0 +1,83 @@
+--- a/arch/mips/include/asm/string.h
++++ b/arch/mips/include/asm/string.h
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+ 
+ #define __HAVE_ARCH_MEMSET
+ extern void *memset(void *__s, int __c, size_t __count);
++#define memset(__s, __c, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memset((__s), (__c), __len);		\
++	else							\
++		__ret = __builtin_memset((__s), (__c), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMCPY
+ extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
++#define memcpy(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memcpy((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memcpy((dst), (src), __len);	\
++	__ret;							\
++})
+ 
+ #define __HAVE_ARCH_MEMMOVE
+ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
++#define memmove(dst, src, len)					\
++({								\
++	size_t __len = (len);					\
++	void *__ret;						\
++	if (__builtin_constant_p(len) && __len >= 64)		\
++		__ret = memmove((dst), (src), __len);		\
++	else							\
++		__ret = __builtin_memmove((dst), (src), __len);	\
++	__ret;							\
++})
++
++#define __HAVE_ARCH_MEMCMP
++#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
+ 
+ #endif /* _ASM_STRING_H */
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
+@@ -4,7 +4,7 @@
+ 
+ lib-y	+= bitops.o csum_partial.o delay.o memcpy.o memset.o \
+ 	   mips-atomic.o strlen_user.o strncpy_user.o \
+-	   strnlen_user.o uncached.o
++	   strnlen_user.o uncached.o memcmp.o
+ 
+ obj-y			+= iomap.o
+ obj-$(CONFIG_PCI)	+= iomap-pci.o
+--- /dev/null
++++ b/arch/mips/lib/memcmp.c
+@@ -0,0 +1,22 @@
++/*
++ *  copied from linux/lib/string.c
++ *
++ *  Copyright (C) 1991, 1992  Linus Torvalds
++ */
++
++#include <linux/module.h>
++#include <linux/string.h>
++
++#undef memcmp
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++	const unsigned char *su1, *su2;
++	int res = 0;
++
++	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
++		if ((res = *su1 - *su2) != 0)
++			break;
++	return res;
++}
++EXPORT_SYMBOL(memcmp);
++
diff --git a/trunk/target/linux/generic/patches-3.8/308-mips-show-correct-cpu-name-for-24KEc.patch b/trunk/target/linux/generic/patches-3.8/308-mips-show-correct-cpu-name-for-24KEc.patch
new file mode 100644
index 00000000..923992e8
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/308-mips-show-correct-cpu-name-for-24KEc.patch
@@ -0,0 +1,17 @@
+--- a/arch/mips/kernel/cpu-probe.c
++++ b/arch/mips/kernel/cpu-probe.c
+@@ -838,10 +838,13 @@ static inline void cpu_probe_mips(struct
+ 		__cpu_name[cpu] = "MIPS 20Kc";
+ 		break;
+ 	case PRID_IMP_24K:
+-	case PRID_IMP_24KE:
+ 		c->cputype = CPU_24K;
+ 		__cpu_name[cpu] = "MIPS 24Kc";
+ 		break;
++	case PRID_IMP_24KE:
++		c->cputype = CPU_24K;
++		__cpu_name[cpu] = "MIPS 24KEc";
++		break;
+ 	case PRID_IMP_25KF:
+ 		c->cputype = CPU_25KF;
+ 		__cpu_name[cpu] = "MIPS 25Kc";
diff --git a/trunk/target/linux/generic/patches-3.8/309-mips_fuse_workaround.patch b/trunk/target/linux/generic/patches-3.8/309-mips_fuse_workaround.patch
new file mode 100644
index 00000000..5cc27a70
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/309-mips_fuse_workaround.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -39,6 +39,7 @@ void (*__flush_kernel_vmap_range)(unsign
+ void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);
+ 
+ EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
++EXPORT_SYMBOL(__flush_cache_all);
+ 
+ /* MIPS specific cache operations */
+ void (*flush_cache_sigtramp)(unsigned long addr);
+--- a/fs/fuse/dev.c
++++ b/fs/fuse/dev.c
+@@ -19,6 +19,9 @@
+ #include <linux/pipe_fs_i.h>
+ #include <linux/swap.h>
+ #include <linux/splice.h>
++#ifdef CONFIG_MIPS
++#include <asm/cacheflush.h>
++#endif
+ 
+ MODULE_ALIAS_MISCDEV(FUSE_MINOR);
+ MODULE_ALIAS("devname:fuse");
+@@ -654,6 +657,9 @@ static int fuse_copy_fill(struct fuse_co
+ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
+ {
+ 	unsigned ncpy = min(*size, cs->len);
++#ifdef CONFIG_MIPS
++	__flush_cache_all();
++#endif
+ 	if (val) {
+ 		if (cs->write)
+ 			memcpy(cs->buf, *val, ncpy);
diff --git a/trunk/target/linux/generic/patches-3.8/310-arm_module_unresolved_weak_sym.patch b/trunk/target/linux/generic/patches-3.8/310-arm_module_unresolved_weak_sym.patch
new file mode 100644
index 00000000..d1eba550
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/310-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -81,6 +81,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+ 			return -ENOEXEC;
+ 		}
+ 
++		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
++		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
++			continue;
++
+ 		loc = dstsec->sh_addr + rel->r_offset;
+ 
+ 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/trunk/target/linux/generic/patches-3.8/320-ppc4xx_optimization.patch b/trunk/target/linux/generic/patches-3.8/320-ppc4xx_optimization.patch
new file mode 100644
index 00000000..885f347d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/320-ppc4xx_optimization.patch
@@ -0,0 +1,31 @@
+Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
+they still want to support gcc 3.3 -- well, we don't.
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -119,7 +119,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ KBUILD_CFLAGS		+= -mno-sched-epilog
+ endif
+ 
+-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++cpu-as-$(CONFIG_40x)		+= -Wa,-m405
++cpu-as-$(CONFIG_44x)		+= -Wa,-m440
+ cpu-as-$(CONFIG_ALTIVEC)	+= -Wa,-maltivec
+ cpu-as-$(CONFIG_E500)		+= -Wa,-me500
+ cpu-as-$(CONFIG_E200)		+= -Wa,-me200
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
+ DTC_FLAGS	?= -p 1024
+ 
+ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
++$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
+-$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
++$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
++$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
+ $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
diff --git a/trunk/target/linux/generic/patches-3.8/321-powerpc_crtsavres_prereq.patch b/trunk/target/linux/generic/patches-3.8/321-powerpc_crtsavres_prereq.patch
new file mode 100644
index 00000000..fe5d7c57
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/321-powerpc_crtsavres_prereq.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -86,7 +86,6 @@ CPP		= $(CC) -E $(KBUILD_CFLAGS)
+ 
+ CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
+ 
+-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
+ 
+ # No AltiVec or VSX instructions when building kernel
+ KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
diff --git a/trunk/target/linux/generic/patches-3.8/322-ppc4xx-crypto-compile-fix.patch b/trunk/target/linux/generic/patches-3.8/322-ppc4xx-crypto-compile-fix.patch
new file mode 100644
index 00000000..226e4115
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/322-ppc4xx-crypto-compile-fix.patch
@@ -0,0 +1,10 @@
+--- a/drivers/crypto/amcc/crypto4xx_core.c
++++ b/drivers/crypto/amcc/crypto4xx_core.c
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/interrupt.h>
+ #include <linux/spinlock_types.h>
+ #include <linux/random.h>
diff --git a/trunk/target/linux/generic/patches-3.8/400-rootfs_split.patch b/trunk/target/linux/generic/patches-3.8/400-rootfs_split.patch
new file mode 100644
index 00000000..88929fd3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/400-rootfs_split.patch
@@ -0,0 +1,316 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -23,6 +23,14 @@ config MTD_TESTS
+ 	  WARNING: some of the tests will ERASE entire MTD device which they
+ 	  test. Do not use these tests unless you really know what you do.
+ 
++config MTD_ROOTFS_ROOT_DEV
++	bool "Automatically set 'rootfs' partition to be root filesystem"
++	default y
++
++config MTD_ROOTFS_SPLIT
++	bool "Automatically split 'rootfs' partition for squashfs"
++	default y
++
+ config MTD_REDBOOT_PARTS
+ 	tristate "RedBoot partition table parsing"
+ 	---help---
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -29,6 +29,8 @@
+ #include <linux/kmod.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/root_dev.h>
++#include <linux/magic.h>
+ #include <linux/err.h>
+ 
+ #include "mtdcore.h"
+@@ -50,7 +52,7 @@ struct mtd_part {
+  * the pointer to that structure with this macro.
+  */
+ #define PART(x)  ((struct mtd_part *)(x))
+-
++#define IS_PART(mtd) (mtd->_read == part_read)
+ 
+ /*
+  * MTD methods which simply translate the effective address and pass through
+@@ -613,6 +615,144 @@ int mtd_del_partition(struct mtd_info *m
+ }
+ EXPORT_SYMBOL_GPL(mtd_del_partition);
+ 
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++#define ROOTFS_SPLIT_NAME "rootfs_data"
++#define ROOTFS_REMOVED_NAME "<removed>"
++
++struct squashfs_super_block {
++	__le32 s_magic;
++	__le32 pad0[9];
++	__le64 bytes_used;
++};
++
++
++static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
++{
++	struct squashfs_super_block sb;
++	int len, ret;
++
++	ret = mtd_read(master, offset, sizeof(sb), &len, (void *) &sb);
++	if (ret || (len != sizeof(sb))) {
++		printk(KERN_ALERT "split_squashfs: error occured while reading "
++			"from \"%s\"\n", master->name);
++		return -EINVAL;
++	}
++
++	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
++		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	if (le64_to_cpu((sb.bytes_used)) <= 0) {
++		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
++			master->name);
++		*split_offset = 0;
++		return 0;
++	}
++
++	len = (u32) le64_to_cpu(sb.bytes_used);
++	len += (offset & 0x000fffff);
++	len +=  (master->erasesize - 1);
++	len &= ~(master->erasesize - 1);
++	len -= (offset & 0x000fffff);
++	*split_offset = offset + len;
++
++	return 0;
++}
++
++static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
++{
++	struct mtd_partition dpart;
++	struct mtd_part *slave = NULL;
++	struct mtd_part *spart;
++	int ret, split_offset = 0;
++
++	spart = PART(rpart);
++	ret = split_squashfs(master, spart->offset, &split_offset);
++	if (ret)
++		return ret;
++
++	if (split_offset <= 0)
++		return 0;
++
++	memcpy(&dpart, part, sizeof(dpart));
++	dpart.name = ROOTFS_SPLIT_NAME;
++
++	dpart.size = rpart->size - (split_offset - spart->offset);
++	dpart.offset = split_offset;
++
++	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
++		ROOTFS_SPLIT_NAME, dpart.offset, dpart.size);
++
++	slave = allocate_partition(master, &dpart, 0, split_offset);
++	if (IS_ERR(slave))
++		return PTR_ERR(slave);
++	mutex_lock(&mtd_partitions_mutex);
++	list_add(&slave->list, &mtd_partitions);
++	mutex_unlock(&mtd_partitions_mutex);
++
++	add_mtd_device(&slave->mtd);
++
++	rpart->split = &slave->mtd;
++
++	return 0;
++}
++
++static int refresh_rootfs_split(struct mtd_info *mtd)
++{
++	struct mtd_partition tpart;
++	struct mtd_part *part;
++	char *name;
++	//int index = 0;
++	int offset, size;
++	int ret;
++
++	part = PART(mtd);
++
++	/* check for the new squashfs offset first */
++	ret = split_squashfs(part->master, part->offset, &offset);
++	if (ret)
++		return ret;
++
++	if ((offset > 0) && !mtd->split) {
++		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
++		/* if we don't have a rootfs split partition, create a new one */
++		tpart.name = (char *) mtd->name;
++		tpart.size = mtd->size;
++		tpart.offset = part->offset;
++
++		return split_rootfs_data(part->master, &part->mtd, &tpart);
++	} else if ((offset > 0) && mtd->split) {
++		/* update the offsets of the existing partition */
++		size = mtd->size + part->offset - offset;
++
++		part = PART(mtd->split);
++		part->offset = offset;
++		part->mtd.size = size;
++		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
++			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
++			(u32) part->offset, (u32) part->mtd.size);
++		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
++		strcpy(name, ROOTFS_SPLIT_NAME);
++		part->mtd.name = name;
++	} else if ((offset <= 0) && mtd->split) {
++		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
++
++		/* mark existing partition as removed */
++		part = PART(mtd->split);
++		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
++		strcpy(name, ROOTFS_REMOVED_NAME);
++		part->mtd.name = name;
++		part->offset = 0;
++		part->mtd.size = 0;
++	}
++
++	return 0;
++}
++#endif /* CONFIG_MTD_ROOTFS_SPLIT */
++
+ /*
+  * This function, given a master MTD object and a partition table, creates
+  * and registers slave MTD objects which are bound to the master according to
+@@ -629,6 +769,9 @@ int add_mtd_partitions(struct mtd_info *
+ 	struct mtd_part *slave;
+ 	uint64_t cur_offset = 0;
+ 	int i;
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++	int ret;
++#endif
+ 
+ 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
+ 
+@@ -643,12 +786,53 @@ int add_mtd_partitions(struct mtd_info *
+ 
+ 		add_mtd_device(&slave->mtd);
+ 
++		if (!strcmp(parts[i].name, "rootfs")) {
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++			if (ROOT_DEV == 0) {
++				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
++					"set to be root filesystem\n");
++				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
++			}
++#endif
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
++			/* if (ret == 0)
++			 * 	j++; */
++#endif
++		}
++
+ 		cur_offset = slave->offset + slave->mtd.size;
+ 	}
+ 
+ 	return 0;
+ }
+ 
++int mtd_device_refresh(struct mtd_info *mtd)
++{
++	int ret = 0;
++
++	if (IS_PART(mtd)) {
++		struct mtd_part *part;
++		struct mtd_info *master;
++
++		part = PART(mtd);
++		master = part->master;
++		if (master->refresh_device)
++			ret = master->refresh_device(master);
++	}
++
++	if (!ret && mtd->refresh_device)
++		ret = mtd->refresh_device(mtd);
++
++#ifdef CONFIG_MTD_ROOTFS_SPLIT
++	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
++		refresh_rootfs_split(mtd);
++#endif
++
++	return 0;
++}
++EXPORT_SYMBOL_GPL(mtd_device_refresh);
++
+ static DEFINE_SPINLOCK(part_parser_lock);
+ static LIST_HEAD(part_parsers);
+ 
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
+@@ -1012,6 +1012,12 @@ static int mtdchar_ioctl(struct file *fi
+ 		break;
+ 	}
+ 
++	case MTDREFRESH:
++	{
++		ret = mtd_device_refresh(mtd);
++		break;
++	}
++
+ 	default:
+ 		ret = -ENOTTY;
+ 	}
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -114,6 +114,7 @@ struct nand_ecclayout {
+ 
+ struct module;	/* only needed for owner field in mtd_info */
+ 
++struct mtd_info;
+ struct mtd_info {
+ 	u_char type;
+ 	uint32_t flags;
+@@ -226,6 +227,9 @@ struct mtd_info {
+ 	int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs);
+ 	int (*_suspend) (struct mtd_info *mtd);
+ 	void (*_resume) (struct mtd_info *mtd);
++	int (*refresh_device)(struct mtd_info *mtd);
++	struct mtd_info *split;
++
+ 	/*
+ 	 * If the driver is something smart, like UBI, it may need to maintain
+ 	 * its own reference counting. The below functions are only for driver.
+@@ -368,6 +372,7 @@ extern int mtd_device_parse_register(str
+ 			      int defnr_parts);
+ #define mtd_device_register(master, parts, nr_parts)	\
+ 	mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
++extern int mtd_device_refresh(struct mtd_info *master);
+ extern int mtd_device_unregister(struct mtd_info *master);
+ extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num);
+ extern int __get_mtd_device(struct mtd_info *mtd);
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -36,12 +36,14 @@
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
+ 
++struct mtd_partition;
+ struct mtd_partition {
+ 	char *name;			/* identifier string */
+ 	uint64_t size;			/* partition size */
+ 	uint64_t offset;		/* offset within the master MTD space */
+ 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
+ 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only) */
++	int (*refresh_partition)(struct mtd_info *);
+ };
+ 
+ #define MTDPART_OFS_RETAIN	(-3)
+--- a/include/uapi/mtd/mtd-abi.h
++++ b/include/uapi/mtd/mtd-abi.h
+@@ -202,6 +202,7 @@ struct otp_info {
+  * without OOB, e.g., NOR flash.
+  */
+ #define MEMWRITE		_IOWR('M', 24, struct mtd_write_req)
++#define MTDREFRESH		_IO('M', 50)
+ 
+ /*
+  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/trunk/target/linux/generic/patches-3.8/401-partial_eraseblock_write.patch b/trunk/target/linux/generic/patches-3.8/401-partial_eraseblock_write.patch
new file mode 100644
index 00000000..f367e1e9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/401-partial_eraseblock_write.patch
@@ -0,0 +1,146 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -35,6 +35,8 @@
+ 
+ #include "mtdcore.h"
+ 
++#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
++
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+ static DEFINE_MUTEX(mtd_partitions_mutex);
+@@ -230,13 +232,61 @@ static int part_erase(struct mtd_info *m
+ 	struct mtd_part *part = PART(mtd);
+ 	int ret;
+ 
++
++	instr->partial_start = false;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		size_t readlen = 0;
++		u64 mtd_ofs;
++
++		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
++		if (!instr->erase_buf)
++			return -ENOMEM;
++
++		mtd_ofs = part->offset + instr->addr;
++		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
++
++		if (instr->erase_buf_ofs > 0) {
++			instr->addr -= instr->erase_buf_ofs;
++			ret = mtd_read(part->master,
++				instr->addr + part->offset,
++				part->master->erasesize,
++				&readlen, instr->erase_buf);
++
++			instr->len += instr->erase_buf_ofs;
++			instr->partial_start = true;
++		} else {
++			mtd_ofs = part->offset + part->mtd.size;
++			instr->erase_buf_ofs = part->master->erasesize -
++				do_div(mtd_ofs, part->master->erasesize);
++
++			if (instr->erase_buf_ofs > 0) {
++				instr->len += instr->erase_buf_ofs;
++				ret = mtd_read(part->master,
++					part->offset + instr->addr +
++					instr->len - part->master->erasesize,
++					part->master->erasesize, &readlen,
++					instr->erase_buf);
++			} else {
++				ret = 0;
++			}
++		}
++		if (ret < 0) {
++			kfree(instr->erase_buf);
++			return ret;
++		}
++
++	}
++
+ 	instr->addr += part->offset;
+ 	ret = part->master->_erase(part->master, instr);
+ 	if (ret) {
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
++		if (mtd->flags & MTD_ERASE_PARTIAL)
++			kfree(instr->erase_buf);
+ 	}
++
+ 	return ret;
+ }
+ 
+@@ -244,7 +294,25 @@ void mtd_erase_callback(struct erase_inf
+ {
+ 	if (instr->mtd->_erase == part_erase) {
+ 		struct mtd_part *part = PART(instr->mtd);
++		size_t wrlen = 0;
+ 
++		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
++			if (instr->partial_start) {
++				part->master->_write(part->master,
++					instr->addr, instr->erase_buf_ofs,
++					&wrlen, instr->erase_buf);
++				instr->addr += instr->erase_buf_ofs;
++			} else {
++				instr->len -= instr->erase_buf_ofs;
++				part->master->_write(part->master,
++					instr->addr + instr->len,
++					instr->erase_buf_ofs, &wrlen,
++					instr->erase_buf +
++					part->master->erasesize -
++					instr->erase_buf_ofs);
++			}
++			kfree(instr->erase_buf);
++		}
+ 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
+ 			instr->fail_addr -= part->offset;
+ 		instr->addr -= part->offset;
+@@ -504,18 +572,24 @@ static struct mtd_part *allocate_partiti
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+ 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
+ 		/* Doesn't start on a boundary of major erase size */
+-		/* FIXME: Let it be writable if it is on a boundary of
+-		 * _minor_ erase size though */
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
+-			part->name);
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++		if (((u32) slave->mtd.size) > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
+ 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
+-	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
+-		slave->mtd.flags &= ~MTD_WRITEABLE;
+-		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
+-			part->name);
++	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
++		slave->mtd.flags |= MTD_ERASE_PARTIAL;
++
++		if ((u32) slave->mtd.size > master->erasesize)
++			slave->mtd.flags &= ~MTD_WRITEABLE;
++		else
++			slave->mtd.erasesize = slave->mtd.size;
+ 	}
++	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
++		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
++				part->name);
+ 
+ 	slave->mtd.ecclayout = master->ecclayout;
+ 	slave->mtd.ecc_strength = master->ecc_strength;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -58,6 +58,10 @@ struct erase_info {
+ 	u_long priv;
+ 	u_char state;
+ 	struct erase_info *next;
++
++	u8 *erase_buf;
++	u32 erase_buf_ofs;
++	bool partial_start;
+ };
+ 
+ struct mtd_erase_region_info {
diff --git a/trunk/target/linux/generic/patches-3.8/410-mtd_info_move_forward_decl.patch b/trunk/target/linux/generic/patches-3.8/410-mtd_info_move_forward_decl.patch
new file mode 100644
index 00000000..251f522e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/410-mtd_info_move_forward_decl.patch
@@ -0,0 +1,18 @@
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -35,6 +35,7 @@
+  * Note: writeable partitions require their size and offset be
+  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
+  */
++struct mtd_info;
+ 
+ struct mtd_partition;
+ struct mtd_partition {
+@@ -52,7 +53,6 @@ struct mtd_partition {
+ #define MTDPART_SIZ_FULL	(0)
+ 
+ 
+-struct mtd_info;
+ struct device_node;
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.8/420-redboot_space.patch b/trunk/target/linux/generic/patches-3.8/420-redboot_space.patch
new file mode 100644
index 00000000..f74affce
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/420-redboot_space.patch
@@ -0,0 +1,30 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -265,14 +265,21 @@ static int parse_redboot_partitions(stru
+ #endif
+ 		names += strlen(names)+1;
+ 
+-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
+-			i++;
+-			parts[i].offset = parts[i-1].size + parts[i-1].offset;
+-			parts[i].size = fl->next->img->flash_base - parts[i].offset;
+-			parts[i].name = nullname;
+-		}
++			if (!strcmp(parts[i].name, "rootfs")) {
++				parts[i].size = fl->next->img->flash_base;
++				parts[i].size &= ~(master->erasesize - 1);
++				parts[i].size -= parts[i].offset;
++#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
++				nrparts--;
++			} else {
++				i++;
++				parts[i].offset = parts[i-1].size + parts[i-1].offset;
++				parts[i].size = fl->next->img->flash_base - parts[i].offset;
++				parts[i].name = nullname;
+ #endif
++			}
++		}
+ 		tmp_fl = fl;
+ 		fl = fl->next;
+ 		kfree(tmp_fl);
diff --git a/trunk/target/linux/generic/patches-3.8/430-mtd_myloader_partition_parser.patch b/trunk/target/linux/generic/patches-3.8/430-mtd_myloader_partition_parser.patch
new file mode 100644
index 00000000..0f337989
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/430-mtd_myloader_partition_parser.patch
@@ -0,0 +1,35 @@
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -163,6 +163,22 @@ config MTD_BCM47XX_PARTS
+ 	  This provides partitions parser for devices based on BCM47xx
+ 	  boards.
+ 
++config MTD_MYLOADER_PARTS
++	tristate "MyLoader partition parsing"
++	depends on ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX || ATH79
++	---help---
++	  MyLoader is a bootloader which allows the user to define partitions
++	  in flash devices, by putting a table in the second erase block
++	  on the device, similar to a partition table. This table gives the 
++	  offsets and lengths of the user defined partitions.
++
++	  If you need code which can detect and parse these tables, and
++	  register MTD 'partitions' corresponding to each image detected,
++	  enable this option.
++
++	  You will still need the parsing functions to be called by the driver
++	  for your particular device. It won't happen automatically.
++
+ comment "User Modules And Translation Layers"
+ 
+ config MTD_CHAR
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
+ obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ obj-$(CONFIG_MTD_BCM63XX_PARTS)	+= bcm63xxpart.o
+ obj-$(CONFIG_MTD_BCM47XX_PARTS)	+= bcm47xxpart.o
++obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/trunk/target/linux/generic/patches-3.8/440-block2mtd_init.patch b/trunk/target/linux/generic/patches-3.8/440-block2mtd_init.patch
new file mode 100644
index 00000000..7ea827db
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/440-block2mtd_init.patch
@@ -0,0 +1,116 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -14,6 +14,7 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
+ #include <linux/mutex.h>
+ #include <linux/mount.h>
+ #include <linux/slab.h>
+@@ -210,11 +211,12 @@ static void block2mtd_free_device(struct
+ 
+ 
+ /* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size)
++static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+ {
+ 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
+ 	struct block_device *bdev;
+ 	struct block2mtd_dev *dev;
++	struct mtd_partition *part;
+ 	char *name;
+ 
+ 	if (!devname)
+@@ -253,13 +255,16 @@ static struct block2mtd_dev *add_device(
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+-	name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
++	if (!mtdname)
++		mtdname = devname;
++	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
+ 	if (!name)
+ 		goto devinit_err;
+ 
++	strcpy(name, mtdname);
+ 	dev->mtd.name = name;
+ 
+-	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
++	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
+ 	dev->mtd.erasesize = erase_size;
+ 	dev->mtd.writesize = 1;
+ 	dev->mtd.writebufsize = PAGE_SIZE;
+@@ -272,14 +277,17 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
+ 
+-	if (mtd_device_register(&dev->mtd, NULL, 0)) {
++	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
++	part->name = name;
++	part->offset = 0;
++	part->size = dev->mtd.size;
++	if (mtd_device_register(&dev->mtd, part, 1)) {
+ 		/* Device didn't get added, so free the entry */
+ 		goto devinit_err;
+ 	}
+ 	list_add(&dev->list, &blkmtd_device_list);
+ 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
+-			dev->mtd.name + strlen("block2mtd: "),
+-			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
++			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+ 	return dev;
+ 
+ devinit_err:
+@@ -352,9 +360,9 @@ static char block2mtd_paramline[80 + 12]
+ 
+ static int block2mtd_setup2(const char *val)
+ {
+-	char buf[80 + 12]; /* 80 for device, 12 for erase size */
++	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
+ 	char *str = buf;
+-	char *token[2];
++	char *token[3];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
+ 	int i, ret;
+@@ -365,7 +373,7 @@ static int block2mtd_setup2(const char *
+ 	strcpy(str, val);
+ 	kill_final_newline(str);
+ 
+-	for (i = 0; i < 2; i++)
++	for (i = 0; i < 3; i++)
+ 		token[i] = strsep(&str, ",");
+ 
+ 	if (str)
+@@ -384,8 +392,10 @@ static int block2mtd_setup2(const char *
+ 			parse_err("illegal erase size");
+ 		}
+ 	}
++	if (token[2] && (strlen(token[2]) + 1 > 80))
++		parse_err("mtd device name too long");
+ 
+-	add_device(name, erase_size);
++	add_device(name, erase_size, token[2]);
+ 
+ 	return 0;
+ }
+@@ -419,7 +429,7 @@ static int block2mtd_setup(const char *v
+ 
+ 
+ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
+-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
++MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
+ 
+ static int __init block2mtd_init(void)
+ {
+--- a/block/partition-generic.c
++++ b/block/partition-generic.c
+@@ -548,6 +548,7 @@ int invalidate_partitions(struct gendisk
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(rescan_partitions);
+ 
+ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
+ {
diff --git a/trunk/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch b/trunk/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch
new file mode 100644
index 00000000..67657443
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch
@@ -0,0 +1,269 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -29,6 +29,8 @@ struct block2mtd_dev {
+ 	struct block_device *blkdev;
+ 	struct mtd_info mtd;
+ 	struct mutex write_mutex;
++	rwlock_t bdev_mutex;
++	char devname[0];
+ };
+ 
+ 
+@@ -80,6 +82,12 @@ static int block2mtd_erase(struct mtd_in
+ 	size_t len = instr->len;
+ 	int err;
+ 
++	read_lock(&dev->bdev_mutex);
++	if (!dev->blkdev) {
++		err = -EINVAL;
++		goto done;
++	}
++
+ 	instr->state = MTD_ERASING;
+ 	mutex_lock(&dev->write_mutex);
+ 	err = _block2mtd_erase(dev, from, len);
+@@ -91,6 +99,10 @@ static int block2mtd_erase(struct mtd_in
+ 		instr->state = MTD_ERASE_DONE;
+ 
+ 	mtd_erase_callback(instr);
++
++done:
++	read_unlock(&dev->bdev_mutex);
++
+ 	return err;
+ }
+ 
+@@ -102,7 +114,13 @@ static int block2mtd_read(struct mtd_inf
+ 	struct page *page;
+ 	int index = from >> PAGE_SHIFT;
+ 	int offset = from & (PAGE_SIZE-1);
+-	int cpylen;
++	int cpylen, err = 0;
++
++	read_lock(&dev->bdev_mutex);
++	if (!dev->blkdev || (from > mtd->size)) {
++		err = -EINVAL;
++		goto done;
++	}
+ 
+ 	while (len) {
+ 		if ((offset + len) > PAGE_SIZE)
+@@ -112,8 +130,10 @@ static int block2mtd_read(struct mtd_inf
+ 		len = len - cpylen;
+ 
+ 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
+-		if (IS_ERR(page))
+-			return PTR_ERR(page);
++		if (IS_ERR(page)) {
++			err = PTR_ERR(page);
++			goto done;
++		}
+ 
+ 		memcpy(buf, page_address(page) + offset, cpylen);
+ 		page_cache_release(page);
+@@ -124,7 +144,10 @@ static int block2mtd_read(struct mtd_inf
+ 		offset = 0;
+ 		index++;
+ 	}
+-	return 0;
++
++done:
++	read_unlock(&dev->bdev_mutex);
++	return err;
+ }
+ 
+ 
+@@ -173,13 +196,22 @@ static int block2mtd_write(struct mtd_in
+ 		size_t *retlen, const u_char *buf)
+ {
+ 	struct block2mtd_dev *dev = mtd->priv;
+-	int err;
++	int err = 0;
++
++	read_lock(&dev->bdev_mutex);
++	if (!dev->blkdev) {
++		err = -EINVAL;
++		goto done;
++	}
+ 
+ 	mutex_lock(&dev->write_mutex);
+ 	err = _block2mtd_write(dev, buf, to, len, retlen);
+ 	mutex_unlock(&dev->write_mutex);
+ 	if (err > 0)
+ 		err = 0;
++
++done:
++	read_unlock(&dev->bdev_mutex);
+ 	return err;
+ }
+ 
+@@ -188,33 +220,110 @@ static int block2mtd_write(struct mtd_in
+ static void block2mtd_sync(struct mtd_info *mtd)
+ {
+ 	struct block2mtd_dev *dev = mtd->priv;
++	read_lock(&dev->bdev_mutex);
++	if (dev->blkdev)
+ 	sync_blockdev(dev->blkdev);
++	read_unlock(&dev->bdev_mutex);
++
+ 	return;
+ }
+ 
+ 
++static int _open_bdev(struct block2mtd_dev *dev)
++{
++	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
++	struct block_device *bdev;
++
++	/* Get a handle on the device */
++	bdev = blkdev_get_by_path(dev->devname, mode, dev);
++#ifndef MODULE
++	if (IS_ERR(bdev)) {
++		dev_t devt;
++
++		/* We might not have rootfs mounted at this point. Try
++		   to resolve the device name by other means. */
++
++		devt = name_to_dev_t(dev->devname);
++		if (devt)
++			bdev = blkdev_get_by_dev(devt, mode, dev);
++	}
++#endif
++
++	if (IS_ERR(bdev)) {
++		ERROR("error: cannot open device %s", dev->devname);
++		return 1;
++	}
++	dev->blkdev = bdev;
++
++	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
++		ERROR("attempting to use an MTD device as a block device");
++		return 1;
++	}
++
++	return 0;
++}
++
++static void _close_bdev(struct block2mtd_dev *dev)
++{
++	struct block_device *bdev;
++
++	if (!dev->blkdev)
++		return;
++
++	bdev = dev->blkdev;
++	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
++	blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
++	dev->blkdev = NULL;
++}
++
+ static void block2mtd_free_device(struct block2mtd_dev *dev)
+ {
+ 	if (!dev)
+ 		return;
+ 
+ 	kfree(dev->mtd.name);
+-
+-	if (dev->blkdev) {
+-		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
+-					0, -1);
+-		blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
+-	}
+-
++	_close_bdev(dev);
+ 	kfree(dev);
+ }
+ 
+ 
+-/* FIXME: ensure that mtd->size % erase_size == 0 */
+-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
++static int block2mtd_refresh(struct mtd_info *mtd)
+ {
+-	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
++	struct block2mtd_dev *dev = mtd->priv;
+ 	struct block_device *bdev;
++	dev_t devt;
++	int err = 0;
++
++	/* no other mtd function can run at this point */
++	write_lock(&dev->bdev_mutex);
++
++	/* get the device number for the whole disk */
++	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
++
++	/* close the old block device */
++	_close_bdev(dev);
++
++	/* open the whole disk, issue a partition rescan, then */
++	bdev = blkdev_get_by_dev(devt, FMODE_WRITE | FMODE_READ, mtd);
++	if (!bdev || !bdev->bd_disk)
++		err = -EINVAL;
++#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
++	else
++		err = rescan_partitions(bdev->bd_disk, bdev);
++#endif
++	if (bdev)
++		blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
++
++	/* try to open the partition block device again */
++	_open_bdev(dev);
++	write_unlock(&dev->bdev_mutex);
++
++	return err;
++}
++
++/* FIXME: ensure that mtd->size % erase_size == 0 */
++static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
++{
+ 	struct block2mtd_dev *dev;
+ 	struct mtd_partition *part;
+ 	char *name;
+@@ -222,36 +331,17 @@ static struct block2mtd_dev *add_device(
+ 	if (!devname)
+ 		return NULL;
+ 
+-	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
++	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
+ 	if (!dev)
+ 		return NULL;
+ 
+-	/* Get a handle on the device */
+-	bdev = blkdev_get_by_path(devname, mode, dev);
+-#ifndef MODULE
+-	if (IS_ERR(bdev)) {
+-
+-		/* We might not have rootfs mounted at this point. Try
+-		   to resolve the device name by other means. */
+-
+-		dev_t devt = name_to_dev_t(devname);
+-		if (devt)
+-			bdev = blkdev_get_by_dev(devt, mode, dev);
+-	}
+-#endif
+-
+-	if (IS_ERR(bdev)) {
+-		ERROR("error: cannot open device %s", devname);
+-		goto devinit_err;
+-	}
+-	dev->blkdev = bdev;
++	strcpy(dev->devname, devname);
+ 
+-	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
+-		ERROR("attempting to use an MTD device as a block device");
++	if (_open_bdev(dev))
+ 		goto devinit_err;
+-	}
+ 
+ 	mutex_init(&dev->write_mutex);
++	rwlock_init(&dev->bdev_mutex);
+ 
+ 	/* Setup the MTD structure */
+ 	/* make the name contain the block device in */
+@@ -276,6 +366,7 @@ static struct block2mtd_dev *add_device(
+ 	dev->mtd._read = block2mtd_read;
+ 	dev->mtd.priv = dev;
+ 	dev->mtd.owner = THIS_MODULE;
++	dev->mtd.refresh_device = block2mtd_refresh;
+ 
+ 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
+ 	part->name = name;
diff --git a/trunk/target/linux/generic/patches-3.8/442-block2mtd_probe.patch b/trunk/target/linux/generic/patches-3.8/442-block2mtd_probe.patch
new file mode 100644
index 00000000..244c31e1
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/442-block2mtd_probe.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
+@@ -243,6 +243,7 @@ static int _open_bdev(struct block2mtd_d
+ 		/* We might not have rootfs mounted at this point. Try
+ 		   to resolve the device name by other means. */
+ 
++		wait_for_device_probe();
+ 		devt = name_to_dev_t(dev->devname);
+ 		if (devt)
+ 			bdev = blkdev_get_by_dev(devt, mode, dev);
diff --git a/trunk/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch b/trunk/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch
new file mode 100644
index 00000000..c82c1762
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch
@@ -0,0 +1,37 @@
+---
+ drivers/mtd/nand/plat_nand.c |   13 ++++++++++++-
+ include/linux/mtd/nand.h     |    1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -654,6 +654,7 @@ struct platform_nand_chip {
+ 	unsigned int options;
+ 	unsigned int bbt_options;
+ 	const char **part_probe_types;
++	int (*chip_fixup)(struct mtd_info *mtd);
+ };
+ 
+ /* Keep gcc happy */
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -103,7 +103,18 @@ static int plat_nand_probe(struct platfo
+ 	}
+ 
+ 	/* Scan to find existence of the device */
+-	if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
++	if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) {
++		err = -ENXIO;
++		goto out;
++	}
++
++	if (pdata->chip.chip_fixup) {
++		err = pdata->chip.chip_fixup(&data->mtd);
++		if (err)
++			goto out;
++	}
++
++	if (nand_scan_tail(&data->mtd)) {
+ 		err = -ENXIO;
+ 		goto out;
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.8/451-mtd_fix_nand_correct_data_return_code.patch b/trunk/target/linux/generic/patches-3.8/451-mtd_fix_nand_correct_data_return_code.patch
new file mode 100644
index 00000000..2f72d859
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/451-mtd_fix_nand_correct_data_return_code.patch
@@ -0,0 +1,12 @@
+--- a/drivers/mtd/nand/nand_ecc.c
++++ b/drivers/mtd/nand/nand_ecc.c
+@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
+ 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
+ 		return 1;	/* error in ECC data; no action needed */
+ 
+-	printk(KERN_ERR "uncorrectable error : ");
+-	return -1;
++	return -EBADMSG;
+ }
+ EXPORT_SYMBOL(__nand_correct_data);
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/460-cfi_cmdset_0002_no_erase_suspend.patch b/trunk/target/linux/generic/patches-3.8/460-cfi_cmdset_0002_no_erase_suspend.patch
new file mode 100644
index 00000000..d64f340d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/460-cfi_cmdset_0002_no_erase_suspend.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -762,7 +762,7 @@ static int get_chip(struct map_info *map
+ 		return 0;
+ 
+ 	case FL_ERASING:
+-		if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
++		if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+ 		    !(mode == FL_READY || mode == FL_POINT ||
+ 		    (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
+ 			goto sleep;
diff --git a/trunk/target/linux/generic/patches-3.8/470-mtd_m25p80_add_pm25lv_flash_support.patch b/trunk/target/linux/generic/patches-3.8/470-mtd_m25p80_add_pm25lv_flash_support.patch
new file mode 100644
index 00000000..16d92c31
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/470-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -0,0 +1,39 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -45,6 +45,7 @@
+ #define	OPCODE_BE_4K		0x20	/* Erase 4KiB block */
+ #define	OPCODE_BE_32K		0x52	/* Erase 32KiB block */
+ #define	OPCODE_CHIP_ERASE	0xc7	/* Erase whole flash chip */
++#define	OPCODE_BE_4K_PMC	0xd7	/* Erase 4KiB block on PMC chips*/
+ #define	OPCODE_SE		0xd8	/* Sector erase (usually 64KiB) */
+ #define	OPCODE_RDID		0x9f	/* Read JEDEC ID */
+ 
+@@ -591,6 +592,7 @@ struct flash_info {
+ 	u16		flags;
+ #define	SECT_4K		0x01		/* OPCODE_BE_4K works uniformly */
+ #define	M25P_NO_ERASE	0x02		/* No erase command needed */
++#define	SECT_4K_PMC	0x04		/* OPCODE_BE_4K_PMC works uniformly */
+ };
+ 
+ #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)	\
+@@ -669,6 +671,10 @@ static const struct spi_device_id m25p_i
+ 	{ "n25q128a13",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
+ 	{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
+ 
++	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
++	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
++	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
++
+ 	/* Spansion -- single (large) sector size only, at least
+ 	 * for the chips listed here (without boot sectors).
+ 	 */
+@@ -913,6 +919,9 @@ static int m25p_probe(struct spi_device
+ 	if (info->flags & SECT_4K) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
++	} else if (info->flags & SECT_4K_PMC) {
++		flash->erase_opcode = OPCODE_BE_4K_PMC;
++		flash->mtd.erasesize = 4096;
+ 	} else {
+ 		flash->erase_opcode = OPCODE_SE;
+ 		flash->mtd.erasesize = info->sector_size;
diff --git a/trunk/target/linux/generic/patches-3.8/473-mtd_m25p80_add_w25q128.patch b/trunk/target/linux/generic/patches-3.8/473-mtd_m25p80_add_w25q128.patch
new file mode 100644
index 00000000..896240db
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/473-mtd_m25p80_add_w25q128.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -754,6 +754,7 @@ static const struct spi_device_id m25p_i
+ 	{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
+ 	{ "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
+ 	{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024,  16, SECT_4K) },
++	{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
+ 	{ "w25q256", INFO(0xef4019, 0, 64 * 1024, 512, SECT_4K) },
+ 
+ 	/* Catalyst / On Semiconductor -- non-JEDEC */
diff --git a/trunk/target/linux/generic/patches-3.8/474-mtd_mp25p80_add_pm25lq032.patch b/trunk/target/linux/generic/patches-3.8/474-mtd_mp25p80_add_pm25lq032.patch
new file mode 100644
index 00000000..5347563c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/474-mtd_mp25p80_add_pm25lq032.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -674,6 +674,7 @@ static const struct spi_device_id m25p_i
+ 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
+ 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
+ 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
++	{ "pm25lq032", INFO(0x7F9D46, 0, 64 * 1024,  64, SECT_4K) },
+ 
+ 	/* Spansion -- single (large) sector size only, at least
+ 	 * for the chips listed here (without boot sectors).
diff --git a/trunk/target/linux/generic/patches-3.8/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/trunk/target/linux/generic/patches-3.8/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
new file mode 100644
index 00000000..ea5d9581
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
@@ -0,0 +1,18 @@
+From: George Kashperko <george@znau.edu.ua>
+
+Issue map read after Write Buffer Load command to ensure chip is ready
+to receive data.
+Signed-off-by: George Kashperko <george@znau.edu.ua>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c |    1 +
+ 1 file changed, 1 insertion(+)
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1480,6 +1480,7 @@ static int __xipram do_write_buffer(stru
+ 
+ 	/* Write Buffer Load */
+ 	map_write(map, CMD(0x25), cmd_adr);
++	(void) map_read(map, cmd_adr);
+ 
+ 	chip->state = FL_WRITING_TO_BUFFER;
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/trunk/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
new file mode 100644
index 00000000..ff4981cc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -0,0 +1,41 @@
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
+@@ -110,6 +110,14 @@ config MTD_SPEAR_SMI
+ 	help
+ 	  This enable SNOR support on SPEAR platforms using SMI controller
+ 
++config M25PXX_PREFER_SMALL_SECTOR_ERASE
++	bool "Prefer small sector erase"
++	depends on MTD_M25P80
++	default y
++	help
++	  This option enables use of the small erase sectors if that is
++	  supported by the flash chip.
++
+ config MTD_SST25L
+ 	tristate "Support SST25L (non JEDEC) SPI Flash chips"
+ 	depends on SPI_MASTER
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -76,6 +76,12 @@
+ 
+ #define JEDEC_MFR(_jedec_id)	((_jedec_id) >> 16)
+ 
++#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE
++#define PREFER_SMALL_SECTOR_ERASE 1
++#else
++#define PREFER_SMALL_SECTOR_ERASE 0
++#endif
++
+ /****************************************************************************/
+ 
+ struct m25p {
+@@ -918,7 +924,7 @@ static int m25p_probe(struct spi_device
+ 		flash->mtd._write = m25p80_write;
+ 
+ 	/* prefer "small sector" erase if possible */
+-	if (info->flags & SECT_4K) {
++	if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) {
+ 		flash->erase_opcode = OPCODE_BE_4K;
+ 		flash->mtd.erasesize = 4096;
+ 	} else if (info->flags & SECT_4K_PMC) {
diff --git a/trunk/target/linux/generic/patches-3.8/478-mtd-partial_eraseblock_unlock.patch b/trunk/target/linux/generic/patches-3.8/478-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 00000000..134f6571
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/478-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -331,7 +331,14 @@ static int part_lock(struct mtd_info *mt
+ static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+ {
+ 	struct mtd_part *part = PART(mtd);
+-	return part->master->_unlock(part->master, ofs + part->offset, len);
++
++	ofs += part->offset;
++	if (mtd->flags & MTD_ERASE_PARTIAL) {
++		/* round up len to next erasesize and round down offset to prev block */
++		len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++		ofs &= ~(part->master->erasesize - 1);
++	}
++	return part->master->_unlock(part->master, ofs, len);
+ }
+ 
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
diff --git a/trunk/target/linux/generic/patches-3.8/500-yaffs-Kbuild-integration.patch b/trunk/target/linux/generic/patches-3.8/500-yaffs-Kbuild-integration.patch
new file mode 100644
index 00000000..3940c105
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/500-yaffs-Kbuild-integration.patch
@@ -0,0 +1,18 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -39,6 +39,7 @@ source "fs/gfs2/Kconfig"
+ source "fs/ocfs2/Kconfig"
+ source "fs/btrfs/Kconfig"
+ source "fs/nilfs2/Kconfig"
++source "fs/yaffs2/Kconfig"
+ 
+ endif # BLOCK
+ 
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -128,3 +128,5 @@ obj-$(CONFIG_F2FS_FS)		+= f2fs/
+ obj-y				+= exofs/ # Multiple modules
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
+ obj-$(CONFIG_PSTORE)		+= pstore/
++obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
++
diff --git a/trunk/target/linux/generic/patches-3.8/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch b/trunk/target/linux/generic/patches-3.8/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
new file mode 100644
index 00000000..c1f7367d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch
@@ -0,0 +1,155 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -329,6 +329,33 @@ static int yaffs_readpage(struct file *f
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++#define YCRED_FSUID()	from_kuid(&init_user_ns, current_fsuid())
++#define YCRED_FSGID()	from_kgid(&init_user_ns, current_fsgid())
++#else
++#define YCRED_FSUID()	YCRED(current)->fsuid
++#define YCRED_FSGID()	YCRED(current)->fsgid
++
++static inline uid_t i_uid_read(const struct inode *inode)
++{
++	return inode->i_uid;
++}
++
++static inline gid_t i_gid_read(const struct inode *inode)
++{
++	return inode->i_gid;
++}
++
++static inline void i_uid_write(struct inode *inode, uid_t uid)
++{
++	inode->i_uid = uid;
++}
++
++static inline void i_gid_write(struct inode *inode, gid_t gid)
++{
++	inode->i_gid = gid;
++}
++#endif
+ 
+ static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+ {
+@@ -1225,9 +1252,9 @@ static int yaffs_mknod(struct inode *dir
+ 	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
+ 
+ 	int error = -ENOSPC;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+ 		mode |= S_ISGID;
+@@ -1424,9 +1451,9 @@ static int yaffs_symlink(struct inode *d
+ {
+ 	struct yaffs_obj *obj;
+ 	struct yaffs_dev *dev;
+-	uid_t uid = YCRED(current)->fsuid;
++	uid_t uid = YCRED_FSUID();
+ 	gid_t gid =
+-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
++	    (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID();
+ 
+ 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
+ 
+@@ -1829,8 +1856,8 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		inode->i_ino = obj->obj_id;
+ 		inode->i_mode = obj->yst_mode;
+-		inode->i_uid = obj->yst_uid;
+-		inode->i_gid = obj->yst_gid;
++		i_uid_write(inode, obj->yst_uid);
++		i_gid_write(inode, obj->yst_gid);
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+ 		inode->i_blksize = inode->i_sb->s_blocksize;
+ #endif
+@@ -1856,7 +1883,7 @@ static void yaffs_fill_inode_from_obj(st
+ 
+ 		yaffs_trace(YAFFS_TRACE_OS,
+ 			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+-			inode->i_mode, inode->i_uid, inode->i_gid,
++			inode->i_mode, i_uid_read(inode), i_gid_read(inode),
+ 			inode->i_size, atomic_read(&inode->i_count));
+ 
+ 		switch (obj->yst_mode & S_IFMT) {
+--- a/fs/yaffs2/yaffs_attribs.c
++++ b/fs/yaffs2/yaffs_attribs.c
+@@ -14,6 +14,48 @@
+ #include "yaffs_guts.h"
+ #include "yaffs_attribs.h"
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return from_kuid(&init_user_ns, iattr->ia_uid);
++}
++
++static inline gid_t ia_gid_read(const struct iattr *iattr)
++{
++	return from_kgid(&init_user_ns, iattr->ia_gid);
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = make_kuid(&init_user_ns, uid);
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = make_kgid(&init_user_ns, gid);
++}
++#else
++static inline uid_t ia_uid_read(const struct iattr *iattr)
++{
++	return iattr->ia_uid;
++}
++
++static inline gid_t ia_gid_read(const struct iattr *inode)
++{
++	return iattr->ia_gid;
++}
++
++static inline void ia_uid_write(struct iattr *iattr, uid_t uid)
++{
++	iattr->ia_uid = uid;
++}
++
++static inline void ia_gid_write(struct iattr *iattr, gid_t gid)
++{
++	iattr->ia_gid = gid;
++}
++#endif
++
+ void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
+ {
+ 	obj->yst_uid = oh->yst_uid;
+@@ -77,9 +119,9 @@ int yaffs_set_attribs(struct yaffs_obj *
+ 	if (valid & ATTR_MODE)
+ 		obj->yst_mode = attr->ia_mode;
+ 	if (valid & ATTR_UID)
+-		obj->yst_uid = attr->ia_uid;
++		obj->yst_uid =  ia_uid_read(attr);
+ 	if (valid & ATTR_GID)
+-		obj->yst_gid = attr->ia_gid;
++		obj->yst_gid =  ia_gid_read(attr);
+ 
+ 	if (valid & ATTR_ATIME)
+ 		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
+@@ -103,9 +145,9 @@ int yaffs_get_attribs(struct yaffs_obj *
+ 
+ 	attr->ia_mode = obj->yst_mode;
+ 	valid |= ATTR_MODE;
+-	attr->ia_uid = obj->yst_uid;
++	ia_uid_write(attr, obj->yst_uid);
+ 	valid |= ATTR_UID;
+-	attr->ia_gid = obj->yst_gid;
++	ia_gid_write(attr, obj->yst_gid);
+ 	valid |= ATTR_GID;
+ 
+ 	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
diff --git a/trunk/target/linux/generic/patches-3.8/520-squashfs_update_xz_comp_opts.patch b/trunk/target/linux/generic/patches-3.8/520-squashfs_update_xz_comp_opts.patch
new file mode 100644
index 00000000..523b89f9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/520-squashfs_update_xz_comp_opts.patch
@@ -0,0 +1,25 @@
+From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 12 Apr 2011 19:55:41 +0200
+Subject: [PATCH] squashfs: update xz compressor options struct.
+
+Update the xz compressor options struct to match the squashfs userspace
+one.
+---
+ fs/squashfs/xz_wrapper.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/fs/squashfs/xz_wrapper.c
++++ b/fs/squashfs/xz_wrapper.c
+@@ -39,8 +39,10 @@ struct squashfs_xz {
+ };
+ 
+ struct comp_opts {
+-	__le32 dictionary_size;
+ 	__le32 flags;
++	__le16 bit_opts;
++	__le16 fb;
++	__le32 dictionary_size;
+ };
+ 
+ static void *squashfs_xz_init(struct squashfs_sb_info *msblk, void *buff,
diff --git a/trunk/target/linux/generic/patches-3.8/530-jffs2_make_lzma_available.patch b/trunk/target/linux/generic/patches-3.8/530-jffs2_make_lzma_available.patch
new file mode 100644
index 00000000..dae8092e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/530-jffs2_make_lzma_available.patch
@@ -0,0 +1,5142 @@
+--- a/fs/jffs2/Kconfig
++++ b/fs/jffs2/Kconfig
+@@ -139,6 +139,15 @@ config JFFS2_LZO
+ 	  This feature was added in July, 2007. Say 'N' if you need
+ 	  compatibility with older bootloaders or kernels.
+ 
++config JFFS2_LZMA
++	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
++	select LZMA_COMPRESS
++	select LZMA_DECOMPRESS
++	depends on JFFS2_FS
++	default n
++	help
++	  JFFS2 wrapper to the LZMA C SDK
++
+ config JFFS2_RTIME
+ 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
+ 	depends on JFFS2_FS
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
+@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
+ jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
+ jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
+ jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
++jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
+ jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
++
++CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
+--- a/fs/jffs2/compr.c
++++ b/fs/jffs2/compr.c
+@@ -378,6 +378,9 @@ int __init jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ /* Setting default compression mode */
+ #ifdef CONFIG_JFFS2_CMODE_NONE
+ 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
+@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
+ int jffs2_compressors_exit(void)
+ {
+ /* Unregistering compressors */
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
+--- a/fs/jffs2/compr.h
++++ b/fs/jffs2/compr.h
+@@ -29,9 +29,9 @@
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_LZARI_PRIORITY     30
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
+-
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
+ #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
+@@ -101,5 +101,9 @@ void jffs2_zlib_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/fs/jffs2/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -373,14 +373,41 @@ static int __init init_jffs2_fs(void)
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
+ 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
+ 
+-	pr_info("version 2.2."
++	pr_info("version 2.2"
+ #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
+ 	       " (NAND)"
+ #endif
+ #ifdef CONFIG_JFFS2_SUMMARY
+-	       " (SUMMARY) "
++	       " (SUMMARY)"
+ #endif
+-	       " © 2001-2006 Red Hat, Inc.\n");
++#ifdef CONFIG_JFFS2_ZLIB
++	       " (ZLIB)"
++#endif
++#ifdef CONFIG_JFFS2_LZO
++	       " (LZO)"
++#endif
++#ifdef CONFIG_JFFS2_LZMA
++	       " (LZMA)"
++#endif
++#ifdef CONFIG_JFFS2_RTIME
++	       " (RTIME)"
++#endif
++#ifdef CONFIG_JFFS2_RUBIN
++	       " (RUBIN)"
++#endif
++#ifdef  CONFIG_JFFS2_CMODE_NONE
++	       " (CMODE_NONE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_PRIORITY
++	       " (CMODE_PRIORITY)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_SIZE
++	       " (CMODE_SIZE)"
++#endif
++#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
++	       " (CMODE_FAVOURLZO)"
++#endif
++	       " (c) 2001-2006 Red Hat, Inc.\n");
+ 
+ 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
+ 					     sizeof(struct jffs2_inode_info),
+--- a/include/uapi/linux/jffs2.h
++++ b/include/uapi/linux/jffs2.h
+@@ -46,6 +46,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,62 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <asm/types.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,115 @@
++/* LzFind.h -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_FIND_H
++#define __LZ_FIND_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  size_t directInputRem;
++  int btMode;
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
++    UInt32 *distances, UInt32 maxLen);
++
++/*
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,54 @@
++/* LzHash.h -- HASH functions for LZ algorithms
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZ_HASH_H
++#define __LZ_HASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,231 @@
++/* LzmaDec.h -- LZMA Decoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_DEC_H
++#define __LZMA_DEC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs,
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum
++{
++  LZMA_FINISH_ANY,   /* finish at any point */
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
++        You must use correct finish mode in that case. */
++
++typedef enum
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually.
++   For Buffer Interface you must always use variant 1.
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */
++
++/* You can use it, if you want to eliminate the overhead for data copying from
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,80 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2009-02-07 : Igor Pavlov : Public domain */
++
++#ifndef __LZMA_ENC_H
++#define __LZMA_ENC_H
++
++#include "Types.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */
++  int lp;          /* 0 <= lp <= 4, default = 0 */
++  int pb;          /* 0 <= pb <= 4, default = 2 */
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,226 @@
++/* Types.h -- Basic types
++2009-11-23 : Igor Pavlov : Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#include <stddef.h>
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
++
++#ifndef EXTERN_C_BEGIN
++#ifdef __cplusplus
++#define EXTERN_C_BEGIN extern "C" {
++#define EXTERN_C_END }
++#else
++#define EXTERN_C_BEGIN
++#define EXTERN_C_END
++#endif
++#endif
++
++EXTERN_C_BEGIN
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifdef _WIN32
++typedef DWORD WRes;
++#else
++typedef int WRes;
++#endif
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++#ifdef _SZ_NO_INT_64
++
++/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
++   NOTES: Some code will work incorrectly in that case! */
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _WIN32
++#define MY_STD_CALL __stdcall
++#else
++#define MY_STD_CALL
++#endif
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_FAST_CALL __fastcall
++
++#else
++
++#define MY_CDECL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++/* it can return SZ_ERROR_INPUT_EOF */
++SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
++SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
++SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++       (result < size) means error */
++} ISeqOutStream;
++
++typedef enum
++{
++  SZ_SEEK_SET = 0,
++  SZ_SEEK_CUR = 1,
++  SZ_SEEK_END = 2
++} ESzSeek;
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ISeekInStream;
++
++typedef struct
++{
++  SRes (*Look)(void *p, void **buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) > input(*size)) is not allowed
++       (output(*size) < input(*size)) is allowed */
++  SRes (*Skip)(void *p, size_t offset);
++    /* offset must be <= output(*size) of Look */
++
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* reads directly (without buffer). It's same as ISeqInStream::Read */
++  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
++} ILookInStream;
++
++SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
++SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
++
++/* reads via ILookInStream::Read */
++SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
++SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
++
++#define LookToRead_BUF_SIZE (1 << 14)
++
++typedef struct
++{
++  ILookInStream s;
++  ISeekInStream *realStream;
++  size_t pos;
++  size_t size;
++  Byte buf[LookToRead_BUF_SIZE];
++} CLookToRead;
++
++void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
++void LookToRead_Init(CLookToRead *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToLook;
++
++void SecToLook_CreateVTable(CSecToLook *p);
++
++typedef struct
++{
++  ISeqInStream s;
++  ILookInStream *realStream;
++} CSecToRead;
++
++void SecToRead_CreateVTable(CSecToRead *p);
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++EXTERN_C_END
++
++#endif
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -191,6 +191,12 @@ config LZO_DECOMPRESS
+ 
+ source "lib/xz/Kconfig"
+ 
++config LZMA_COMPRESS
++    tristate
++
++config LZMA_DECOMPRESS
++    tristate
++
+ #
+ # These all provide a common interface (hence the apparent duplication with
+ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,6 +2,16 @@
+ # Makefile for some libs needed in the kernel.
+ #
+ 
++ifdef CONFIG_JFFS2_ZLIB
++	CONFIG_ZLIB_INFLATE:=y
++	CONFIG_ZLIB_DEFLATE:=y
++endif
++
++ifdef CONFIG_JFFS2_LZMA
++	CONFIG_LZMA_DECOMPRESS:=y
++	CONFIG_LZMA_COMPRESS:=y
++endif
++
+ ifdef CONFIG_FUNCTION_TRACER
+ ORIG_CFLAGS := $(KBUILD_CFLAGS)
+ KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+@@ -74,6 +84,8 @@ obj-$(CONFIG_LZO_COMPRESS) += lzo/
+ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
+ obj-$(CONFIG_XZ_DEC) += xz/
+ obj-$(CONFIG_RAID6_PQ) += raid6/
++obj-$(CONFIG_LZMA_COMPRESS) += lzma/
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
+ 
+ lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+ lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+--- /dev/null
++++ b/lib/lzma/LzFind.c
+@@ -0,0 +1,761 @@
++/* LzFind.c -- Match finder for LZ algorithms
++2009-04-22 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  if (p->directInput)
++  {
++    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
++    if (curSize > p->directInputRem)
++      curSize = (UInt32)p->directInputRem;
++    p->directInputRem -= curSize;
++    p->streamPos += curSize;
++    if (p->directInputRem == 0)
++      p->streamEndWasReached = 1;
++    return;
++  }
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase,
++    p->buffer - p->keepSizeBefore,
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  if (p->directInput)
++    return 0;
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached)
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = historySize + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit)
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit)
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for (i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
++{
++  return (p->pos - p->historySize - 1) & kNormalizeMask;
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while (++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while (++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] =
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET;
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2)
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lib/lzma/LzmaDec.c
+@@ -0,0 +1,999 @@
++/* LzmaDec.c -- LZMA Decoder
++2009-09-20 : Igor Pavlov : Public domain */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; }
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded.
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
++Out:
++  Result:
++    SZ_OK - OK
++    SZ_ERROR_DATA - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        state -= (state < 4) ? state : 3;
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        state -= (state < 10) ? 3 : 6;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++      continue;
++    }
++    else
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance;
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while (--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1;
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++      }
++
++      len += kMatchMinLen;
++
++      if (limit == dicPos)
++        return SZ_ERROR_DATA;
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do
++            *(dest) = (Byte)*(dest + src);
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE *
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while (--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++{
++  p->needFlush = 1;
++  p->remainLen = 0;
++  p->tempBufSize = 0;
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p)
++{
++  p->dicPos = 0;
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1;
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = (SizeT)(p->buf - src);
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0)
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->probs);
++  p->probs = 0;
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->dic);
++  p->dic = 0;
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize;
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/LzmaEnc.c
+@@ -0,0 +1,2271 @@
++/* LzmaEnc.c -- LZMA Encoder
++2009-11-24 : Igor Pavlov : Public domain */
++
++#include <string.h>
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include "LzmaEnc.h"
++
++/* disable MT */
++#define _7ZIP_ST
++
++#include "LzFind.h"
++#ifndef _7ZIP_ST
++#include "LzFindMt.h"
++#endif
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3;
++  if (p->lp < 0) p->lp = 0;
++  if (p->pb < 0) p->pb = 2;
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
++  if (p->numHashBytes < 0) p->numHashBytes = 4;
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0)
++    p->numThreads =
++      #ifndef _7ZIP_ST
++      ((p->btMode && p->algo) ? 2 : 1);
++      #else
++      1;
++      #endif
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos)
++{
++  UInt32 res;
++  BSR2_RET(pos, res);
++  return res;
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct
++{
++  UInt32 price;
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;
++
++  UInt32 posPrev;
++  UInt32 backPrev;
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6
++#define kDicLogSizeMin 0
++#define kDicLogSizeMax 32
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifndef _7ZIP_ST
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifndef _7ZIP_ST
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  UInt32 longestMatchLength;
++  UInt32 numPairs;
++  UInt32 numAvail;
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  int needInit;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifndef _7ZIP_ST
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++#define IsCharState(s) ((s) < 7)
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);
++  }
++  p->cacheSize++;
++  p->low = (UInt32)p->low << 8;
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++}
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++}
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numPairs;
++  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
++  ttt++;
++  {
++    UInt32 i;
++    for (i = 0; i < numPairs; i += 2)
++      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
++  }
++  #endif
++  if (numPairs > 0)
++  {
++    lenRes = p->matches[numPairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matches[numPairs - 1] + 1;
++      UInt32 numAvail = p->numAvail;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numPairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex;
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
++  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
++  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
++  UInt32 *matches;
++  const Byte *data;
++  Byte curByte, matchByte;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  if (numAvail < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++  curByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
++        (!IsCharState(p->state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == curByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= mainLen)
++  {
++    UInt32 offs = 0;
++    while (len > matches[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matches[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price)
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matches[offs])
++      {
++        offs += 2;
++        if (offs == numPairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
++    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
++    Bool nextIsChar;
++    Byte curByte, matchByte;
++    const Byte *data;
++    COptimal *curOpt;
++    COptimal *nextOpt;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    newLen = ReadMatchDistances(p, &numPairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numPairs = numPairs;
++      p->longestMatchLength = newLen;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price;
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    curByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price +=
++        (!IsCharState(state) ?
++          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
++    }
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price)
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++    numAvailFull = p->numAvail;
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp < numAvailFull)
++        numAvailFull = temp;
++    }
++
++    if (numAvailFull < 2)
++      continue;
++    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
++
++    if (!nextIsChar && matchByte != curByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailFull)
++        limit = numAvailFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price +
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price)
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice =
++                price + p->repLenEnc.prices[posState][lenTest - 2] +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvail)
++    {
++      newLen = numAvail;
++      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
++      matches[numPairs] = newLen;
++      numPairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matches[offs])
++        offs += 2;
++      curBack = matches[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price)
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matches[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailFull)
++            limit = numAvailFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice +
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice +
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price)
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numPairs)
++            break;
++          curBack = matches[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
++  const Byte *data;
++  const UInt32 *matches;
++
++  if (p->additionalOffset == 0)
++    mainLen = ReadMatchDistances(p, &numPairs);
++  else
++  {
++    mainLen = p->longestMatchLength;
++    numPairs = p->numPairs;
++  }
++
++  numAvail = p->numAvail;
++  *backRes = (UInt32)-1;
++  if (numAvail < 2)
++    return 1;
++  if (numAvail > LZMA_MATCH_LEN_MAX)
++    numAvail = LZMA_MATCH_LEN_MAX;
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++
++  repLen = repIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    if (len > repLen)
++    {
++      repIndex = i;
++      repLen = len;
++    }
++  }
++
++  matches = p->matches;
++  if (mainLen >= p->numFastBytes)
++  {
++    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
++    MovePos(p, mainLen - 1);
++    return mainLen;
++  }
++
++  mainDist = 0; /* for GCC */
++  if (mainLen >= 2)
++  {
++    mainDist = matches[numPairs - 1];
++    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
++    {
++      if (!ChangePair(matches[numPairs - 3], mainDist))
++        break;
++      numPairs -= 2;
++      mainLen = matches[numPairs - 2];
++      mainDist = matches[numPairs - 1];
++    }
++    if (mainLen == 2 && mainDist >= 0x80)
++      mainLen = 1;
++  }
++
++  if (repLen >= 2 && (
++        (repLen + 1 >= mainLen) ||
++        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
++        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
++  {
++    *backRes = repIndex;
++    MovePos(p, repLen - 1);
++    return repLen;
++  }
++  
++  if (mainLen < 2 || numAvail <= 2)
++    return 1;
++
++  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
++  if (p->longestMatchLength >= 2)
++  {
++    UInt32 newDistance = matches[p->numPairs - 1];
++    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
++        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
++        (p->longestMatchLength > mainLen + 1) ||
++        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
++      return 1;
++  }
++  
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 len, limit;
++    const Byte *data2 = data - (p->reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++      continue;
++    limit = mainLen - 1;
++    for (len = 2; len < limit && data[len] == data2[len]; len++);
++    if (len >= limit)
++      return 1;
++  }
++  *backRes = mainDist + LZMA_NUM_REPS;
++  MovePos(p, mainLen - 2);
++  return mainLen;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  {
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifndef _7ZIP_ST
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->needInit)
++  {
++    p->matchFinder.Init(p->matchFinderObj);
++    p->needInit = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numPairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numPairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == (UInt32)-1)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifndef _7ZIP_ST
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifndef _7ZIP_ST
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for (i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize =
++  p->repLenEnc.tableSize =
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->matchFinderBase.stream = inStream;
++  p->needInit = 1;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->matchFinderBase.directInput = 1;
++  p->matchFinderBase.bufferBase = (Byte *)src;
++  p->matchFinderBase.directInputRem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->needInit = 1;
++
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifndef _7ZIP_ST
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #else
++  pp = pp;
++  #endif
++}
++
++typedef struct
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
++{
++  SRes res = SZ_OK;
++
++  #ifndef _7ZIP_ST
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(p);
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
++  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++
++  p->rc.outStream = &outStream.funcTable;
++  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
++  if (res == SZ_OK)
++    res = LzmaEnc_Encode2(p, progress);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- /dev/null
++++ b/lib/lzma/Makefile
+@@ -0,0 +1,7 @@
++lzma_compress-objs := LzFind.o LzmaEnc.o
++lzma_decompress-objs := LzmaDec.o
++
++obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
++obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
++
++EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/trunk/target/linux/generic/patches-3.8/531-debloat_lzma.patch b/trunk/target/linux/generic/patches-3.8/531-debloat_lzma.patch
new file mode 100644
index 00000000..aa3c4980
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/531-debloat_lzma.patch
@@ -0,0 +1,1024 @@
+--- a/include/linux/lzma/LzmaDec.h
++++ b/include/linux/lzma/LzmaDec.h
+@@ -31,14 +31,6 @@ typedef struct _CLzmaProps
+   UInt32 dicSize;
+ } CLzmaProps;
+ 
+-/* LzmaProps_Decode - decodes properties
+-Returns:
+-  SZ_OK
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+-
+ 
+ /* ---------- LZMA Decoder state ---------- */
+ 
+@@ -70,8 +62,6 @@ typedef struct
+ 
+ #define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
+ 
+-void LzmaDec_Init(CLzmaDec *p);
+-
+ /* There are two types of LZMA streams:
+      0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
+      1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+@@ -108,97 +98,6 @@ typedef enum
+ 
+ /* ELzmaStatus is used only as output value for function call */
+ 
+-
+-/* ---------- Interfaces ---------- */
+-
+-/* There are 3 levels of interfaces:
+-     1) Dictionary Interface
+-     2) Buffer Interface
+-     3) One Call Interface
+-   You can select any of these interfaces, but don't mix functions from different
+-   groups for same object. */
+-
+-
+-/* There are two variants to allocate state for Dictionary Interface:
+-     1) LzmaDec_Allocate / LzmaDec_Free
+-     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+-   You can use variant 2, if you set dictionary buffer manually.
+-   For Buffer Interface you must always use variant 1.
+-
+-LzmaDec_Allocate* can return:
+-  SZ_OK
+-  SZ_ERROR_MEM         - Memory allocation error
+-  SZ_ERROR_UNSUPPORTED - Unsupported properties
+-*/
+-   
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
+-
+-SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
+-void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
+-
+-/* ---------- Dictionary Interface ---------- */
+-
+-/* You can use it, if you want to eliminate the overhead for data copying from
+-   dictionary to some other external buffer.
+-   You must work with CLzmaDec variables directly in this interface.
+-
+-   STEPS:
+-     LzmaDec_Constr()
+-     LzmaDec_Allocate()
+-     for (each new stream)
+-     {
+-       LzmaDec_Init()
+-       while (it needs more decompression)
+-       {
+-         LzmaDec_DecodeToDic()
+-         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+-       }
+-     }
+-     LzmaDec_Free()
+-*/
+-
+-/* LzmaDec_DecodeToDic
+-   
+-   The decoding to internal dictionary buffer (CLzmaDec::dic).
+-   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (dicLimit).
+-  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+-  LZMA_FINISH_END - Stream must be finished after dicLimit.
+-
+-Returns:
+-  SZ_OK
+-    status:
+-      LZMA_STATUS_FINISHED_WITH_MARK
+-      LZMA_STATUS_NOT_FINISHED
+-      LZMA_STATUS_NEEDS_MORE_INPUT
+-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+-  SZ_ERROR_DATA - Data error
+-*/
+-
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+-/* ---------- Buffer Interface ---------- */
+-
+-/* It's zlib-like interface.
+-   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+-   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+-   to work with CLzmaDec variables manually.
+-
+-finishMode:
+-  It has meaning only if the decoding reaches output limit (*destLen).
+-  LZMA_FINISH_ANY - Decode just destLen bytes.
+-  LZMA_FINISH_END - Stream must be finished after (*destLen).
+-*/
+-
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+-
+-
+ /* ---------- One Call Interface ---------- */
+ 
+ /* LzmaDecode
+--- a/lib/lzma/LzmaDec.c
++++ b/lib/lzma/LzmaDec.c
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
+   p->needFlush = 0;
+ }
+ 
+-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
++static void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
+ {
+   p->needFlush = 1;
+   p->remainLen = 0;
+@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p
+     p->needInitState = 1;
+ }
+ 
+-void LzmaDec_Init(CLzmaDec *p)
++static void LzmaDec_Init(CLzmaDec *p)
+ {
+   p->dicPos = 0;
+   LzmaDec_InitDicAndState(p, True, True);
+@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD
+   p->needInitState = 0;
+ }
+ 
+-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
++static SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+     ELzmaFinishMode finishMode, ELzmaStatus *status)
+ {
+   SizeT inSize = *srcLen;
+@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si
+   return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
+ }
+ 
+-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+-{
+-  SizeT outSize = *destLen;
+-  SizeT inSize = *srcLen;
+-  *srcLen = *destLen = 0;
+-  for (;;)
+-  {
+-    SizeT inSizeCur = inSize, outSizeCur, dicPos;
+-    ELzmaFinishMode curFinishMode;
+-    SRes res;
+-    if (p->dicPos == p->dicBufSize)
+-      p->dicPos = 0;
+-    dicPos = p->dicPos;
+-    if (outSize > p->dicBufSize - dicPos)
+-    {
+-      outSizeCur = p->dicBufSize;
+-      curFinishMode = LZMA_FINISH_ANY;
+-    }
+-    else
+-    {
+-      outSizeCur = dicPos + outSize;
+-      curFinishMode = finishMode;
+-    }
+-
+-    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
+-    src += inSizeCur;
+-    inSize -= inSizeCur;
+-    *srcLen += inSizeCur;
+-    outSizeCur = p->dicPos - dicPos;
+-    memcpy(dest, p->dic + dicPos, outSizeCur);
+-    dest += outSizeCur;
+-    outSize -= outSizeCur;
+-    *destLen += outSizeCur;
+-    if (res != 0)
+-      return res;
+-    if (outSizeCur == 0 || outSize == 0)
+-      return SZ_OK;
+-  }
+-}
+-
+-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
++static void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->probs);
+   p->probs = 0;
+ }
+ 
+-static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  alloc->Free(alloc, p->dic);
+-  p->dic = 0;
+-}
+-
+-void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
+-{
+-  LzmaDec_FreeProbs(p, alloc);
+-  LzmaDec_FreeDict(p, alloc);
+-}
+-
+-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++static SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+ {
+   UInt32 dicSize;
+   Byte d;
+@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+   return SZ_OK;
+ }
+ 
+-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+ {
+   CLzmaProps propNew;
+   RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
+   p->prop = propNew;
+   return SZ_OK;
+ }
+-
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+-{
+-  CLzmaProps propNew;
+-  SizeT dicBufSize;
+-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+-  dicBufSize = propNew.dicSize;
+-  if (p->dic == 0 || dicBufSize != p->dicBufSize)
+-  {
+-    LzmaDec_FreeDict(p, alloc);
+-    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
+-    if (p->dic == 0)
+-    {
+-      LzmaDec_FreeProbs(p, alloc);
+-      return SZ_ERROR_MEM;
+-    }
+-  }
+-  p->dicBufSize = dicBufSize;
+-  p->prop = propNew;
+-  return SZ_OK;
+-}
+ 
+ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+     const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
+--- a/include/linux/lzma/LzmaEnc.h
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
+ } CLzmaEncProps;
+ 
+ void LzmaEncProps_Init(CLzmaEncProps *p);
+-void LzmaEncProps_Normalize(CLzmaEncProps *p);
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+-
+ 
+ /* ---------- CLzmaEncHandle Interface ---------- */
+ 
+@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+ void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+     int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ 
+-/* ---------- One Call Interface ---------- */
+-
+-/* LzmaEncode
+-Return code:
+-  SZ_OK               - OK
+-  SZ_ERROR_MEM        - Memory allocation error
+-  SZ_ERROR_PARAM      - Incorrect paramater
+-  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+-  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+-*/
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzmaEnc.c
++++ b/lib/lzma/LzmaEnc.c
+@@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p)
+   p->writeEndMark = 0;
+ }
+ 
+-void LzmaEncProps_Normalize(CLzmaEncProps *p)
++static void LzmaEncProps_Normalize(CLzmaEncProps *p)
+ {
+   int level = p->level;
+   if (level < 0) level = 5;
+@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp
+       #endif
+ }
+ 
+-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++static UInt32 __maybe_unused LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+ {
+   CLzmaEncProps props = *props2;
+   LzmaEncProps_Normalize(&props);
+@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL
+ 
+ #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
+ 
+-UInt32 GetPosSlot1(UInt32 pos)
++static UInt32 GetPosSlot1(UInt32 pos)
+ {
+   UInt32 res;
+   BSR2_RET(pos, res);
+@@ -107,7 +107,7 @@ UInt32 GetPosSlot1(UInt32 pos)
+ #define kNumLogBits (9 + (int)sizeof(size_t) / 2)
+ #define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+ 
+-void LzmaEnc_FastPosInit(Byte *g_FastPos)
++static void LzmaEnc_FastPosInit(Byte *g_FastPos)
+ {
+   int c = 2, slotFast;
+   g_FastPos[0] = 0;
+@@ -339,58 +339,6 @@ typedef struct
+   CSaveState saveState;
+ } CLzmaEnc;
+ 
+-void LzmaEnc_SaveState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  CSaveState *dest = &p->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
+-}
+-
+-void LzmaEnc_RestoreState(CLzmaEncHandle pp)
+-{
+-  CLzmaEnc *dest = (CLzmaEnc *)pp;
+-  const CSaveState *p = &dest->saveState;
+-  int i;
+-  dest->lenEnc = p->lenEnc;
+-  dest->repLenEnc = p->repLenEnc;
+-  dest->state = p->state;
+-
+-  for (i = 0; i < kNumStates; i++)
+-  {
+-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
+-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
+-  }
+-  for (i = 0; i < kNumLenToPosStates; i++)
+-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
+-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
+-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
+-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
+-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
+-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
+-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
+-  memcpy(dest->reps, p->reps, sizeof(p->reps));
+-  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
+-}
+-
+ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE
+   while (symbol < 0x10000);
+ }
+ 
+-void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++static void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
+ {
+   UInt32 i;
+   for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
+@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc
+   p->matchPriceCount = 0;
+ }
+ 
+-void LzmaEnc_Construct(CLzmaEnc *p)
++static void LzmaEnc_Construct(CLzmaEnc *p)
+ {
+   RangeEnc_Construct(&p->rc);
+   MatchFinder_Construct(&p->matchFinderBase);
+@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *
+   return p;
+ }
+ 
+-void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++static void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
+ {
+   alloc->Free(alloc, p->litProbs);
+   alloc->Free(alloc, p->saveState.litProbs);
+@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl
+   p->saveState.litProbs = 0;
+ }
+ 
+-void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++static void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   #ifndef _7ZIP_ST
+   MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
+@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U
+   return SZ_OK;
+ }
+ 
+-void LzmaEnc_Init(CLzmaEnc *p)
++static void LzmaEnc_Init(CLzmaEnc *p)
+ {
+   UInt32 i;
+   p->state = 0;
+@@ -2005,7 +1953,7 @@ void LzmaEnc_Init(CLzmaEnc *p)
+   p->lpMask = (1 << p->lp) - 1;
+ }
+ 
+-void LzmaEnc_InitPrices(CLzmaEnc *p)
++static void LzmaEnc_InitPrices(CLzmaEnc *p)
+ {
+   if (!p->fastMode)
+   {
+@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
+   return SZ_OK;
+ }
+ 
+-static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  p->rc.outStream = outStream;
+-  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
+-}
+-
+-SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
+-    ISeqInStream *inStream, UInt32 keepWindowSize,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  p->matchFinderBase.stream = inStream;
+-  p->needInit = 1;
+-  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+-}
+-
+ static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
+ {
+   p->matchFinderBase.directInput = 1;
+@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc
+   p->matchFinderBase.directInputRem = srcLen;
+ }
+ 
+-SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++static SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+     UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p
+   return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+ }
+ 
+-void LzmaEnc_Finish(CLzmaEncHandle pp)
++static void LzmaEnc_Finish(CLzmaEncHandle pp)
+ {
+   #ifndef _7ZIP_ST
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo
+   return size;
+ }
+ 
+-
+-UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+-}
+-
+-const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
+-{
+-  const CLzmaEnc *p = (CLzmaEnc *)pp;
+-  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+-}
+-
+-SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
+-    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)pp;
+-  UInt64 nowPos64;
+-  SRes res;
+-  CSeqOutStreamBuf outStream;
+-
+-  outStream.funcTable.Write = MyWrite;
+-  outStream.data = dest;
+-  outStream.rem = *destLen;
+-  outStream.overflow = False;
+-
+-  p->writeEndMark = False;
+-  p->finished = False;
+-  p->result = SZ_OK;
+-
+-  if (reInit)
+-    LzmaEnc_Init(p);
+-  LzmaEnc_InitPrices(p);
+-  nowPos64 = p->nowPos64;
+-  RangeEnc_Init(&p->rc);
+-  p->rc.outStream = &outStream.funcTable;
+-
+-  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
+-  
+-  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+-  *destLen -= outStream.rem;
+-  if (outStream.overflow)
+-    return SZ_ERROR_OUTPUT_EOF;
+-
+-  return res;
+-}
+-
+ static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
+ {
+   SRes res = SZ_OK;
+@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p,
+   return res;
+ }
+ 
+-SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
+-    ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
+-  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
+-}
+-
+ SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
+ {
+   CLzmaEnc *p = (CLzmaEnc *)pp;
+@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp
+     return SZ_ERROR_OUTPUT_EOF;
+   return res;
+ }
+-
+-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
+-{
+-  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
+-  SRes res;
+-  if (p == 0)
+-    return SZ_ERROR_MEM;
+-
+-  res = LzmaEnc_SetProps(p, props);
+-  if (res == SZ_OK)
+-  {
+-    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
+-    if (res == SZ_OK)
+-      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
+-          writeEndMark, progress, alloc, allocBig);
+-  }
+-
+-  LzmaEnc_Destroy(p, alloc, allocBig);
+-  return res;
+-}
+--- a/include/linux/lzma/LzFind.h
++++ b/include/linux/lzma/LzFind.h
+@@ -55,11 +55,6 @@ typedef struct _CMatchFinder
+ 
+ #define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p);
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+-void MatchFinder_MoveBlock(CMatchFinder *p);
+-void MatchFinder_ReadIfRequired(CMatchFinder *p);
+-
+ void MatchFinder_Construct(CMatchFinder *p);
+ 
+ /* Conditions:
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
+     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+     ISzAlloc *alloc);
+ void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+-    UInt32 *distances, UInt32 maxLen);
+ 
+ /*
+ Conditions:
+@@ -102,12 +91,6 @@ typedef struct _IMatchFinder
+ 
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+ 
+-void MatchFinder_Init(CMatchFinder *p);
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/lib/lzma/LzFind.c
++++ b/lib/lzma/LzFind.c
+@@ -14,9 +14,15 @@
+ 
+ #define kStartMaxLen 3
+ 
++#if 0
++#define DIRECT_INPUT	p->directInput
++#else
++#define DIRECT_INPUT	1
++#endif
++
+ static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
+ {
+-  if (!p->directInput)
++  if (!DIRECT_INPUT)
+   {
+     alloc->Free(alloc, p->bufferBase);
+     p->bufferBase = 0;
+@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder
+ static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
+ {
+   UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     p->blockSize = blockSize;
+     return 1;
+@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde
+   return (p->bufferBase != 0);
+ }
+ 
+-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+-Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++static Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++static Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
+ 
+-UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++static UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+ 
+-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++static void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+ {
+   p->posLimit -= subValue;
+   p->pos -= subValue;
+@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch
+ {
+   if (p->streamEndWasReached || p->result != SZ_OK)
+     return;
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+   {
+     UInt32 curSize = 0xFFFFFFFF - p->streamPos;
+     if (curSize > p->directInputRem)
+@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch
+   }
+ }
+ 
+-void MatchFinder_MoveBlock(CMatchFinder *p)
++static void MatchFinder_MoveBlock(CMatchFinder *p)
+ {
+   memmove(p->bufferBase,
+     p->buffer - p->keepSizeBefore,
+@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder
+   p->buffer = p->bufferBase + p->keepSizeBefore;
+ }
+ 
+-int MatchFinder_NeedMove(CMatchFinder *p)
++static int MatchFinder_NeedMove(CMatchFinder *p)
+ {
+-  if (p->directInput)
++  if (DIRECT_INPUT)
+     return 0;
+   /* if (p->streamEndWasReached) return 0; */
+   return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
+ }
+ 
+-void MatchFinder_ReadIfRequired(CMatchFinder *p)
+-{
+-  if (p->streamEndWasReached)
+-    return;
+-  if (p->keepSizeAfter >= p->streamPos - p->pos)
+-    MatchFinder_ReadBlock(p);
+-}
+-
+ static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
+ {
+   if (MatchFinder_NeedMove(p))
+@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch
+   p->posLimit = p->pos + limit;
+ }
+ 
+-void MatchFinder_Init(CMatchFinder *p)
++static void MatchFinder_Init(CMatchFinder *p)
+ {
+   UInt32 i;
+   for (i = 0; i < p->hashSizeSum; i++)
+@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM
+   return (p->pos - p->historySize - 1) & kNormalizeMask;
+ }
+ 
+-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++static void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
+ {
+   UInt32 i;
+   for (i = 0; i < numItems; i++)
+@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat
+   MatchFinder_SetLimits(p);
+ }
+ 
+-static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+-    UInt32 *distances, UInt32 maxLen)
+-{
+-  son[_cyclicBufferPos] = curMatch;
+-  for (;;)
+-  {
+-    UInt32 delta = pos - curMatch;
+-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+-      return distances;
+-    {
+-      const Byte *pb = cur - delta;
+-      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+-      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
+-      {
+-        UInt32 len = 0;
+-        while (++len != lenLimit)
+-          if (pb[len] != cur[len])
+-            break;
+-        if (maxLen < len)
+-        {
+-          *distances++ = maxLen = len;
+-          *distances++ = delta - 1;
+-          if (len == lenLimit)
+-            return distances;
+-        }
+-      }
+-    }
+-  }
+-}
+-
+-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
++static UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+     UInt32 *distances, UInt32 maxLen)
+ {
+@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi
+   p->buffer++; \
+   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
+ 
+-#define MOVE_POS_RET MOVE_POS return offset;
+-
+ static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
+ 
++#define MOVE_POS_RET MatchFinder_MovePos(p); return offset;
++
+ #define GET_MATCHES_HEADER2(minLen, ret_op) \
+   UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
+   lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
+@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi
+   distances + offset, maxLen) - distances); MOVE_POS_RET;
+ 
+ #define SKIP_FOOTER \
+-  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
+-
+-static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(2)
+-  HASH2_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 1)
+-}
+-
+-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = 0;
+-  GET_MATCHES_FOOTER(offset, 2)
+-}
+-
+-static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, delta2, maxLen, offset;
+-  GET_MATCHES_HEADER(3)
+-
+-  HASH3_CALC;
+-
+-  delta2 = p->pos - p->hash[hash2Value];
+-  curMatch = p->hash[kFix3HashSize + hashValue];
+-  
+-  p->hash[hash2Value] =
+-  p->hash[kFix3HashSize + hashValue] = p->pos;
+-
+-
+-  maxLen = 2;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[0] = maxLen;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-    if (maxLen == lenLimit)
+-    {
+-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+-      MOVE_POS_RET;
+-    }
+-  }
+-  GET_MATCHES_FOOTER(offset, maxLen)
+-}
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MatchFinder_MovePos(p);
+ 
+ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+ {
+@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches
+   GET_MATCHES_FOOTER(offset, maxLen)
+ }
+ 
+-static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
+-  GET_MATCHES_HEADER(4)
+-
+-  HASH4_CALC;
+-
+-  delta2 = p->pos - p->hash[                hash2Value];
+-  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
+-  curMatch = p->hash[kFix4HashSize + hashValue];
+-
+-  p->hash[                hash2Value] =
+-  p->hash[kFix3HashSize + hash3Value] =
+-  p->hash[kFix4HashSize + hashValue] = p->pos;
+-
+-  maxLen = 1;
+-  offset = 0;
+-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
+-  {
+-    distances[0] = maxLen = 2;
+-    distances[1] = delta2 - 1;
+-    offset = 2;
+-  }
+-  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
+-  {
+-    maxLen = 3;
+-    distances[offset + 1] = delta3 - 1;
+-    offset += 2;
+-    delta2 = delta3;
+-  }
+-  if (offset != 0)
+-  {
+-    for (; maxLen != lenLimit; maxLen++)
+-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
+-        break;
+-    distances[offset - 2] = maxLen;
+-    if (maxLen == lenLimit)
+-    {
+-      p->son[p->cyclicBufferPos] = curMatch;
+-      MOVE_POS_RET;
+-    }
+-  }
+-  if (maxLen < 3)
+-    maxLen = 3;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances + offset, maxLen) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+-{
+-  UInt32 offset;
+-  GET_MATCHES_HEADER(3)
+-  HASH_ZIP_CALC;
+-  curMatch = p->hash[hashValue];
+-  p->hash[hashValue] = p->pos;
+-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+-    distances, 2) - (distances));
+-  MOVE_POS_RET
+-}
+-
+-static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(2)
+-    HASH2_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+-static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value;
+-    SKIP_HEADER(3)
+-    HASH3_CALC;
+-    curMatch = p->hash[kFix3HashSize + hashValue];
+-    p->hash[hash2Value] =
+-    p->hash[kFix3HashSize + hashValue] = p->pos;
+-    SKIP_FOOTER
+-  }
+-  while (--num != 0);
+-}
+-
+ static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+ {
+   do
+@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF
+   while (--num != 0);
+ }
+ 
+-static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    UInt32 hash2Value, hash3Value;
+-    SKIP_HEADER(4)
+-    HASH4_CALC;
+-    curMatch = p->hash[kFix4HashSize + hashValue];
+-    p->hash[                hash2Value] =
+-    p->hash[kFix3HashSize + hash3Value] =
+-    p->hash[kFix4HashSize + hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+-{
+-  do
+-  {
+-    SKIP_HEADER(3)
+-    HASH_ZIP_CALC;
+-    curMatch = p->hash[hashValue];
+-    p->hash[hashValue] = p->pos;
+-    p->son[p->cyclicBufferPos] = curMatch;
+-    MOVE_POS
+-  }
+-  while (--num != 0);
+-}
+-
+ void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
+ {
+   vTable->Init = (Mf_Init_Func)MatchFinder_Init;
+   vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
+   vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
+   vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
+-  if (!p->btMode)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 2)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
+-  }
+-  else if (p->numHashBytes == 3)
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
+-  }
+-  else
+-  {
+-    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
+-    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+-  }
++  vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++  vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+ }
diff --git a/trunk/target/linux/generic/patches-3.8/532-jffs2_eofdetect.patch b/trunk/target/linux/generic/patches-3.8/532-jffs2_eofdetect.patch
new file mode 100644
index 00000000..f36131e9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/532-jffs2_eofdetect.patch
@@ -0,0 +1,53 @@
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
+@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
+ 	dbg_fsbuild("scanned flash completely\n");
+ 	jffs2_dbg_dump_block_lists_nolock(c);
+ 
++	if (c->flags & (1 << 7)) {
++		printk("%s(): unlocking the mtd device... ", __func__);
++		mtd_unlock(c->mtd, 0, c->mtd->size);
++		printk("done.\n");
++
++		printk("%s(): erasing all blocks after the end marker... ", __func__);
++		jffs2_erase_pending_blocks(c, -1);
++		printk("done.\n");
++	}
++
+ 	dbg_fsbuild("pass 1 starting\n");
+ 	c->flags |= JFFS2_SB_FLAG_BUILDING;
+ 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -148,8 +148,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
+ 		/* reset summary info for next eraseblock scan */
+ 		jffs2_sum_reset_collected(s);
+ 
+-		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
+-						buf_size, s);
++		if (c->flags & (1 << 7))
++			ret = BLK_STATE_ALLFF;
++		else
++			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
++							buf_size, s);
+ 
+ 		if (ret < 0)
+ 			goto out;
+@@ -556,6 +559,17 @@ static int jffs2_scan_eraseblock (struct
+ 			return err;
+ 	}
+ 
++	if ((buf[0] == 0xde) &&
++		(buf[1] == 0xad) &&
++		(buf[2] == 0xc0) &&
++		(buf[3] == 0xde)) {
++		/* end of filesystem. erase everything after this point */
++		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
++		c->flags |= (1 << 7);
++
++		return BLK_STATE_ALLFF;
++	}
++
+ 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
+ 	ofs = 0;
+ 	max_ofs = EMPTY_SCAN_SIZE(c->sector_size);
diff --git a/trunk/target/linux/generic/patches-3.8/540-crypto-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.8/540-crypto-xz-decompression-support.patch
new file mode 100644
index 00000000..cf5a8d61
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/540-crypto-xz-decompression-support.patch
@@ -0,0 +1,146 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1223,6 +1223,13 @@ config CRYPTO_842
+ 	help
+ 	  This is the 842 algorithm.
+ 
++config CRYPTO_XZ
++	tristate "XZ compression algorithm"
++	select CRYPTO_ALGAPI
++	select XZ_DEC
++	help
++	  This is the XZ algorithm. Only decompression is supported for now.
++
+ comment "Random Number Generation"
+ 
+ config CRYPTO_ANSI_CPRNG
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -83,6 +83,7 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich
+ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
+ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
++obj-$(CONFIG_CRYPTO_XZ) += xz.o
+ obj-$(CONFIG_CRYPTO_842) += 842.o
+ obj-$(CONFIG_CRYPTO_RNG2) += rng.o
+ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
+--- /dev/null
++++ b/crypto/xz.c
+@@ -0,0 +1,117 @@
++/*
++ * Cryptographic API.
++ *
++ * XZ decompression support.
++ *
++ * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ *
++ */
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/crypto.h>
++#include <linux/xz.h>
++#include <linux/interrupt.h>
++#include <linux/mm.h>
++#include <linux/net.h>
++
++struct xz_comp_ctx {
++	struct xz_dec	*decomp_state;
++	struct xz_buf	decomp_buf;
++};
++
++static int crypto_xz_decomp_init(struct xz_comp_ctx *ctx)
++{
++	ctx->decomp_state = xz_dec_init(XZ_SINGLE, 0);
++	if (!ctx->decomp_state)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void crypto_xz_decomp_exit(struct xz_comp_ctx *ctx)
++{
++	xz_dec_end(ctx->decomp_state);
++}
++
++static int crypto_xz_init(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	return crypto_xz_decomp_init(ctx);
++}
++
++static void crypto_xz_exit(struct crypto_tfm *tfm)
++{
++	struct xz_comp_ctx *ctx = crypto_tfm_ctx(tfm);
++
++	crypto_xz_decomp_exit(ctx);
++}
++
++static int crypto_xz_compress(struct crypto_tfm *tfm, const u8 *src,
++			      unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	return -EOPNOTSUPP;
++}
++
++static int crypto_xz_decompress(struct crypto_tfm *tfm, const u8 *src,
++				unsigned int slen, u8 *dst, unsigned int *dlen)
++{
++	struct xz_comp_ctx *dctx = crypto_tfm_ctx(tfm);
++	struct xz_buf *xz_buf = &dctx->decomp_buf;
++	int ret;
++
++	memset(xz_buf, '\0', sizeof(struct xz_buf));
++
++	xz_buf->in = (u8 *) src;
++	xz_buf->in_pos = 0;
++	xz_buf->in_size = slen;
++	xz_buf->out = (u8 *) dst;
++	xz_buf->out_pos = 0;
++	xz_buf->out_size = *dlen;
++
++	ret = xz_dec_run(dctx->decomp_state, xz_buf);
++	if (ret != XZ_STREAM_END) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	*dlen = xz_buf->out_pos;
++	ret = 0;
++
++out:
++	return ret;
++}
++
++static struct crypto_alg crypto_xz_alg = {
++	.cra_name		= "xz",
++	.cra_flags		= CRYPTO_ALG_TYPE_COMPRESS,
++	.cra_ctxsize		= sizeof(struct xz_comp_ctx),
++	.cra_module		= THIS_MODULE,
++	.cra_list		= LIST_HEAD_INIT(crypto_xz_alg.cra_list),
++	.cra_init		= crypto_xz_init,
++	.cra_exit		= crypto_xz_exit,
++	.cra_u			= { .compress = {
++	.coa_compress 		= crypto_xz_compress,
++	.coa_decompress  	= crypto_xz_decompress } }
++};
++
++static int __init crypto_xz_mod_init(void)
++{
++	return crypto_register_alg(&crypto_xz_alg);
++}
++
++static void __exit crypto_xz_mod_exit(void)
++{
++	crypto_unregister_alg(&crypto_xz_alg);
++}
++
++module_init(crypto_xz_mod_init);
++module_exit(crypto_xz_mod_exit);
++
++MODULE_LICENSE("GPL v2");
++MODULE_DESCRIPTION("Crypto XZ decompression support");
++MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
diff --git a/trunk/target/linux/generic/patches-3.8/541-ubifs-xz-decompression-support.patch b/trunk/target/linux/generic/patches-3.8/541-ubifs-xz-decompression-support.patch
new file mode 100644
index 00000000..f85689c5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/541-ubifs-xz-decompression-support.patch
@@ -0,0 +1,92 @@
+--- a/fs/ubifs/Kconfig
++++ b/fs/ubifs/Kconfig
+@@ -5,8 +5,10 @@ config UBIFS_FS
+ 	select CRYPTO if UBIFS_FS_ADVANCED_COMPR
+ 	select CRYPTO if UBIFS_FS_LZO
+ 	select CRYPTO if UBIFS_FS_ZLIB
++	select CRYPTO if UBIFS_FS_XZ
+ 	select CRYPTO_LZO if UBIFS_FS_LZO
+ 	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
++	select CRYPTO_XZ if UBIFS_FS_XZ
+ 	depends on MTD_UBI
+ 	help
+ 	  UBIFS is a file system for flash devices which works on top of UBI.
+@@ -35,3 +37,12 @@ config UBIFS_FS_ZLIB
+ 	default y
+ 	help
+ 	  Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
++
++config UBIFS_FS_XZ
++	bool "XZ decompression support" if UBIFS_FS_ADVANCED_COMPR
++	depends on UBIFS_FS
++	default y
++	help
++	  XZ compresses better the ZLIB but it is slower..
++	  Say 'Y' if unsure.
++
+--- a/fs/ubifs/compress.c
++++ b/fs/ubifs/compress.c
+@@ -71,6 +71,24 @@ static struct ubifs_compressor zlib_comp
+ };
+ #endif
+ 
++#ifdef CONFIG_UBIFS_FS_XZ
++static DEFINE_MUTEX(xz_enc_mutex);
++static DEFINE_MUTEX(xz_dec_mutex);
++
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.comp_mutex = &xz_enc_mutex,
++	.decomp_mutex = &xz_dec_mutex,
++	.name = "xz",
++	.capi_name = "xz",
++};
++#else
++static struct ubifs_compressor xz_compr = {
++	.compr_type = UBIFS_COMPR_XZ,
++	.name = "xz",
++};
++#endif
++
+ /* All UBIFS compressors */
+ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT];
+ 
+@@ -232,9 +250,15 @@ int __init ubifs_compressors_init(void)
+ 	if (err)
+ 		goto out_lzo;
+ 
++	err = compr_init(&xz_compr);
++	if (err)
++		goto out_zlib;
++
+ 	ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+ 	return 0;
+ 
++out_zlib:
++	compr_exit(&zlib_compr);
+ out_lzo:
+ 	compr_exit(&lzo_compr);
+ 	return err;
+@@ -247,4 +271,5 @@ void ubifs_compressors_exit(void)
+ {
+ 	compr_exit(&lzo_compr);
+ 	compr_exit(&zlib_compr);
++	compr_exit(&xz_compr);
+ }
+--- a/fs/ubifs/ubifs-media.h
++++ b/fs/ubifs/ubifs-media.h
+@@ -332,12 +332,14 @@ enum {
+  * UBIFS_COMPR_NONE: no compression
+  * UBIFS_COMPR_LZO: LZO compression
+  * UBIFS_COMPR_ZLIB: ZLIB compression
++ * UBIFS_COMPR_XZ: XZ compression
+  * UBIFS_COMPR_TYPES_CNT: count of supported compression types
+  */
+ enum {
+ 	UBIFS_COMPR_NONE,
+ 	UBIFS_COMPR_LZO,
+ 	UBIFS_COMPR_ZLIB,
++	UBIFS_COMPR_XZ,
+ 	UBIFS_COMPR_TYPES_CNT,
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch b/trunk/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch
new file mode 100644
index 00000000..61039c02
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch
@@ -0,0 +1,65 @@
+--- a/fs/ubifs/file.c
++++ b/fs/ubifs/file.c
+@@ -1574,6 +1574,10 @@ const struct inode_operations ubifs_syml
+ 	.follow_link = ubifs_follow_link,
+ 	.setattr     = ubifs_setattr,
+ 	.getattr     = ubifs_getattr,
++	.setxattr    = ubifs_setxattr,
++	.getxattr    = ubifs_getxattr,
++	.listxattr   = ubifs_listxattr,
++	.removexattr = ubifs_removexattr,
+ };
+ 
+ const struct file_operations ubifs_file_operations = {
+--- a/fs/ubifs/journal.c
++++ b/fs/ubifs/journal.c
+@@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu",
+ 		inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino);
+-	ubifs_assert(dir_ui->data_len == 0);
++	if (!xent)
++		ubifs_assert(dir_ui->data_len == 0);
+ 	ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex));
+ 
+ 	dlen = UBIFS_DENT_NODE_SZ + nm->len + 1;
+@@ -573,6 +574,13 @@ int ubifs_jnl_update(struct ubifs_info *
+ 	aligned_dlen = ALIGN(dlen, 8);
+ 	aligned_ilen = ALIGN(ilen, 8);
+ 	len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
++	if (xent) {
++		/*
++		 * Make sure to account for dir_ui->data_len in
++		 * length calculation in case there is extended attribute.
++		 */
++		len += dir_ui->data_len;
++	}
+ 	dent = kmalloc(len, GFP_NOFS);
+ 	if (!dent)
+ 		return -ENOMEM;
+@@ -649,7 +657,8 @@ int ubifs_jnl_update(struct ubifs_info *
+ 
+ 	ino_key_init(c, &ino_key, dir->i_ino);
+ 	ino_offs += aligned_ilen;
+-	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ);
++	err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs,
++			    UBIFS_INO_NODE_SZ + dir_ui->data_len);
+ 	if (err)
+ 		goto out_ro;
+ 
+--- a/fs/ubifs/xattr.c
++++ b/fs/ubifs/xattr.c
+@@ -209,12 +209,12 @@ static int change_xattr(struct ubifs_inf
+ 		goto out_free;
+ 	}
+ 	inode->i_size = ui->ui_size = size;
+-	ui->data_len = size;
+ 
+ 	mutex_lock(&host_ui->ui_mutex);
+ 	host->i_ctime = ubifs_current_time(host);
+ 	host_ui->xattr_size -= CALC_XATTR_BYTES(ui->data_len);
+ 	host_ui->xattr_size += CALC_XATTR_BYTES(size);
++	ui->data_len = size;
+ 
+ 	/*
+ 	 * It is important to write the host inode after the xattr inode
diff --git a/trunk/target/linux/generic/patches-3.8/551-ubifs-fix-default-compression-selection.patch b/trunk/target/linux/generic/patches-3.8/551-ubifs-fix-default-compression-selection.patch
new file mode 100644
index 00000000..1b0f3071
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/551-ubifs-fix-default-compression-selection.patch
@@ -0,0 +1,29 @@
+--- a/fs/ubifs/sb.c
++++ b/fs/ubifs/sb.c
+@@ -63,6 +63,17 @@
+ /* Default time granularity in nanoseconds */
+ #define DEFAULT_TIME_GRAN 1000000000
+ 
++static int get_default_compressor(void)
++{
++	if (ubifs_compr_present(UBIFS_COMPR_LZO))
++		return UBIFS_COMPR_LZO;
++
++	if (ubifs_compr_present(UBIFS_COMPR_ZLIB))
++		return UBIFS_COMPR_ZLIB;
++
++	return UBIFS_COMPR_NONE;
++}
++
+ /**
+  * create_default_filesystem - format empty UBI volume.
+  * @c: UBIFS file-system description object
+@@ -183,7 +194,7 @@ static int create_default_filesystem(str
+ 	if (c->mount_opts.override_compr)
+ 		sup->default_compr = cpu_to_le16(c->mount_opts.compr_type);
+ 	else
+-		sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO);
++		sup->default_compr = cpu_to_le16(get_default_compressor());
+ 
+ 	generate_random_uuid(sup->uuid);
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch b/trunk/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch
new file mode 100644
index 00000000..08c012cd
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/600-netfilter_layer7_2.22.patch
@@ -0,0 +1,2141 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -1183,6 +1183,27 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on NETFILTER_XTABLES
++	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
++       depends on NETFILTER_ADVANCED
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++        bool 'Layer 7 debugging output'
++        depends on NETFILTER_XT_MATCH_LAYER7
++        help
++          Say Y to get lots of debugging output.
++
++
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -131,6 +131,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
+--- /dev/null
++++ b/net/netfilter/xt_layer7.c
+@@ -0,0 +1,666 @@
++/*
++  Kernel module to match application layer (OSI layer 7) data in connections.
++
++  http://l7-filter.sf.net
++
++  (C) 2003-2009 Matthew Strait and Ethan Sommer.
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU General Public License
++  as published by the Free Software Foundation; either version
++  2 of the License, or (at your option) any later version.
++  http://www.gnu.org/licenses/gpl.txt
++
++  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
++  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
++  Ethan Sommer, Justin Levandoski.
++*/
++
++#include <linux/spinlock.h>
++#include <linux/version.h>
++#include <net/ip.h>
++#include <net/tcp.h>
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++#include <net/netfilter/nf_conntrack_extend.h>
++#include <net/netfilter/nf_conntrack_acct.h>
++#endif
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_layer7.h>
++#include <linux/ctype.h>
++#include <linux/proc_fs.h>
++
++#include "regexp/regexp.c"
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
++MODULE_DESCRIPTION("iptables application layer match module");
++MODULE_ALIAS("ipt_layer7");
++MODULE_VERSION("2.21");
++
++static int maxdatalen = 2048; // this is the default
++module_param(maxdatalen, int, 0444);
++MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
++#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
++	#define DPRINTK(format,args...) printk(format,##args)
++#else
++	#define DPRINTK(format,args...)
++#endif
++
++/* Number of packets whose data we look at.
++This can be modified through /proc/net/layer7_numpackets */
++static int num_packets = 10;
++
++static struct pattern_cache {
++	char * regex_string;
++	regexp * pattern;
++	struct pattern_cache * next;
++} * first_pattern_cache = NULL;
++
++DEFINE_SPINLOCK(l7_lock);
++
++static int total_acct_packets(struct nf_conn *ct)
++{
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
++	BUG_ON(ct == NULL);
++	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
++#else
++	struct nf_conn_counter *acct;
++
++	BUG_ON(ct == NULL);
++	acct = nf_conn_acct_find(ct);
++	if (!acct)
++		return 0;
++	return (atomic64_read(&acct[IP_CT_DIR_ORIGINAL].packets) + atomic64_read(&acct[IP_CT_DIR_REPLY].packets));
++#endif
++}
++
++#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++/* Converts an unfriendly string into a friendly one by
++replacing unprintables with periods and all whitespace with " ". */
++static char * friendly_print(unsigned char * s)
++{
++	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
++	int i;
++
++	if(!f) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"friendly_print, bailing.\n");
++		return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++){
++		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
++		else if(isspace(s[i]))		f[i] = ' ';
++		else 				f[i] = '.';
++	}
++	f[i] = '\0';
++	return f;
++}
++
++static char dec2hex(int i)
++{
++	switch (i) {
++		case 0 ... 9:
++			return (i + '0');
++			break;
++		case 10 ... 15:
++			return (i - 10 + 'a');
++			break;
++		default:
++			if (net_ratelimit())
++				printk("layer7: Problem in dec2hex\n");
++			return '\0';
++	}
++}
++
++static char * hex_print(unsigned char * s)
++{
++	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
++	int i;
++
++	if(!g) {
++	       if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in hex_print, "
++					"bailing.\n");
++	       return NULL;
++	}
++
++	for(i = 0; i < strlen(s); i++) {
++		g[i*3    ] = dec2hex(s[i]/16);
++		g[i*3 + 1] = dec2hex(s[i]%16);
++		g[i*3 + 2] = ' ';
++	}
++	g[i*3] = '\0';
++
++	return g;
++}
++#endif // DEBUG
++
++/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
++over again, it make sense to cache the results. */
++static regexp * compile_and_cache(const char * regex_string, 
++                                  const char * protocol)
++{
++	struct pattern_cache * node               = first_pattern_cache;
++	struct pattern_cache * last_pattern_cache = first_pattern_cache;
++	struct pattern_cache * tmp;
++	unsigned int len;
++
++	while (node != NULL) {
++		if (!strcmp(node->regex_string, regex_string))
++		return node->pattern;
++
++		last_pattern_cache = node;/* points at the last non-NULL node */
++		node = node->next;
++	}
++
++	/* If we reach the end of the list, then we have not yet cached
++	   the pattern for this regex. Let's do that now.
++	   Be paranoid about running out of memory to avoid list corruption. */
++	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
++
++	if(!tmp) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		return NULL;
++	}
++
++	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
++	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
++	tmp->next = NULL;
++
++	if(!tmp->regex_string || !tmp->pattern) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory in "
++					"compile_and_cache, bailing.\n");
++		kfree(tmp->regex_string);
++		kfree(tmp->pattern);
++		kfree(tmp);
++		return NULL;
++	}
++
++	/* Ok.  The new node is all ready now. */
++	node = tmp;
++
++	if(first_pattern_cache == NULL) /* list is empty */
++		first_pattern_cache = node; /* make node the beginning */
++	else
++		last_pattern_cache->next = node; /* attach node to the end */
++
++	/* copy the string and compile the regex */
++	len = strlen(regex_string);
++	DPRINTK("About to compile this: \"%s\"\n", regex_string);
++	node->pattern = regcomp((char *)regex_string, &len);
++	if ( !node->pattern ) {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: Error compiling regexp "
++					"\"%s\" (%s)\n", 
++					regex_string, protocol);
++		/* pattern is now cached as NULL, so we won't try again. */
++	}
++
++	strcpy(node->regex_string, regex_string);
++	return node->pattern;
++}
++
++static int can_handle(const struct sk_buff *skb)
++{
++	if(!ip_hdr(skb)) /* not IP */
++		return 0;
++	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
++	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
++	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
++		return 0;
++	return 1;
++}
++
++/* Returns offset the into the skb->data that the application data starts */
++static int app_data_offset(const struct sk_buff *skb)
++{
++	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
++	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
++	int ip_hl = 4*ip_hdr(skb)->ihl;
++
++	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
++		/* 12 == offset into TCP header for the header length field.
++		Can't get this with skb->h.th->doff because the tcphdr
++		struct doesn't get set when routing (this is confirmed to be
++		true in Netfilter as well as QoS.) */
++		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
++
++		return ip_hl + tcp_hl;
++	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
++		return ip_hl + 8; /* UDP header is always 8 bytes */
++	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
++		return ip_hl + 8; /* ICMP header is 8 bytes */
++	} else {
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: tried to handle unknown "
++					"protocol!\n");
++		return ip_hl + 8; /* something reasonable */
++	}
++}
++
++/* handles whether there's a match when we aren't appending data anymore */
++static int match_no_append(struct nf_conn * conntrack, 
++                           struct nf_conn * master_conntrack, 
++                           enum ip_conntrack_info ctinfo,
++                           enum ip_conntrack_info master_ctinfo,
++                           const struct xt_layer7_info * info)
++{
++	/* If we're in here, throw the app data away */
++	if(master_conntrack->layer7.app_data != NULL) {
++
++	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
++		if(!master_conntrack->layer7.app_proto) {
++			char * f = 
++			  friendly_print(master_conntrack->layer7.app_data);
++			char * g = 
++			  hex_print(master_conntrack->layer7.app_data);
++			DPRINTK("\nl7-filter gave up after %d bytes "
++				"(%d packets):\n%s\n",
++				strlen(f), total_acct_packets(master_conntrack), f);
++			kfree(f);
++			DPRINTK("In hex: %s\n", g);
++			kfree(g);
++		}
++	#endif
++
++		kfree(master_conntrack->layer7.app_data);
++		master_conntrack->layer7.app_data = NULL; /* don't free again */
++	}
++
++	if(master_conntrack->layer7.app_proto){
++		/* Here child connections set their .app_proto (for /proc) */
++		if(!conntrack->layer7.app_proto) {
++			conntrack->layer7.app_proto = 
++			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
++			    GFP_ATOMIC);
++			if(!conntrack->layer7.app_proto){
++				if (net_ratelimit())
++					printk(KERN_ERR "layer7: out of memory "
++							"in match_no_append, "
++							"bailing.\n");
++				return 1;
++			}
++			strcpy(conntrack->layer7.app_proto, 
++				master_conntrack->layer7.app_proto);
++		}
++
++		return (!strcmp(master_conntrack->layer7.app_proto, 
++				info->protocol));
++	}
++	else {
++		/* If not classified, set to "unknown" to distinguish from
++		connections that are still being tested. */
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match_no_append, bailing.\n");
++			return 1;
++		}
++		strcpy(master_conntrack->layer7.app_proto, "unknown");
++		return 0;
++	}
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length = 0, i;
++	int oldlength = master_conntrack->layer7.app_data_len;
++
++	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
++	   clear on whether the race condition exists or whether this really 
++	   fixes it.  I might just be being dense... Anyway, if it's not really 
++	   a fix, all it does is waste a very small amount of time. */
++	if(!master_conntrack->layer7.app_data) return 0;
++
++	/* Strip nulls. Make everything lower case (our regex lib doesn't
++	do case insensitivity).  Add it to the end of the current data. */
++	for(i = 0; i < maxdatalen-oldlength-1 &&
++		   i < appdatalen; i++) {
++		if(app_data[i] != '\0') {
++			/* the kernel version of tolower mungs 'upper ascii' */
++			master_conntrack->layer7.app_data[length+oldlength] =
++				isascii(app_data[i])? 
++					tolower(app_data[i]) : app_data[i];
++			length++;
++		}
++	}
++
++	master_conntrack->layer7.app_data[length+oldlength] = '\0';
++	master_conntrack->layer7.app_data_len = length + oldlength;
++
++	return length;
++}
++
++/* taken from drivers/video/modedb.c */
++static int my_atoi(const char *s)
++{
++	int val = 0;
++
++	for (;; s++) {
++		switch (*s) {
++			case '0'...'9':
++			val = 10*val+(*s-'0');
++			break;
++		default:
++			return val;
++		}
++	}
++}
++
++/* write out num_packets to userland. */
++static int layer7_read_proc(char* page, char ** start, off_t off, int count,
++                            int* eof, void * data)
++{
++	if(num_packets > 99 && net_ratelimit())
++		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
++
++	page[0] = num_packets/10 + '0';
++	page[1] = num_packets%10 + '0';
++	page[2] = '\n';
++	page[3] = '\0';
++
++	*eof=1;
++
++	return 3;
++}
++
++/* Read in num_packets from userland */
++static int layer7_write_proc(struct file* file, const char* buffer,
++                             unsigned long count, void *data)
++{
++	char * foo = kmalloc(count, GFP_ATOMIC);
++
++	if(!foo){
++		if (net_ratelimit())
++			printk(KERN_ERR "layer7: out of memory, bailing. "
++					"num_packets unchanged.\n");
++		return count;
++	}
++
++	if(copy_from_user(foo, buffer, count)) {
++		return -EFAULT;
++	}
++
++
++	num_packets = my_atoi(foo);
++	kfree (foo);
++
++	/* This has an arbitrary limit to make the math easier. I'm lazy.
++	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
++	if(num_packets > 99) {
++		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
++		num_packets = 99;
++	} else if(num_packets < 1) {
++		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
++		num_packets = 1;
++	}
++
++	return count;
++}
++
++static bool
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++match(const struct sk_buff *skbin, const struct xt_match_param *par)
++#else
++match(const struct sk_buff *skbin,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      bool *hotdrop)
++#endif
++{
++	/* sidestep const without getting a compiler warning... */
++	struct sk_buff * skb = (struct sk_buff *)skbin; 
++
++	const struct xt_layer7_info * info = 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++		par->matchinfo;
++	#else
++		matchinfo;
++	#endif
++
++	enum ip_conntrack_info master_ctinfo, ctinfo;
++	struct nf_conn *master_conntrack, *conntrack;
++	unsigned char * app_data;
++	unsigned int pattern_result, appdatalen;
++	regexp * comppattern;
++
++	/* Be paranoid/incompetent - lock the entire match function. */
++	spin_lock_bh(&l7_lock);
++
++	if(!can_handle(skb)){
++		DPRINTK("layer7: This is some protocol I can't handle.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Treat parent & all its children together as one connection, except
++	for the purpose of setting conntrack->layer7.app_proto in the actual
++	connection. This makes /proc/net/ip_conntrack more satisfying. */
++	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
++	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
++		DPRINTK("layer7: couldn't get conntrack.\n");
++		spin_unlock_bh(&l7_lock);
++		return info->invert;
++	}
++
++	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
++	while (master_ct(master_conntrack) != NULL)
++		master_conntrack = master_ct(master_conntrack);
++
++	/* if we've classified it or seen too many packets */
++	if(total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto) {
++
++		pattern_result = match_no_append(conntrack, master_conntrack, 
++						 ctinfo, master_ctinfo, info);
++
++		/* skb->cb[0] == seen. Don't do things twice if there are 
++		multiple l7 rules. I'm not sure that using cb for this purpose 
++		is correct, even though it says "put your private variables 
++		there". But it doesn't look like it is being used for anything
++		else in the skbs that make it here. */
++		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
++
++		spin_unlock_bh(&l7_lock);
++		return (pattern_result ^ info->invert);
++	}
++
++	if(skb_is_nonlinear(skb)){
++		if(skb_linearize(skb) != 0){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: failed to linearize "
++						"packet, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* now that the skb is linearized, it's safe to set these. */
++	app_data = skb->data + app_data_offset(skb);
++	appdatalen = skb_tail_pointer(skb) - app_data;
++
++	/* the return value gets checked later, when we're ready to use it */
++	comppattern = compile_and_cache(info->pattern, info->protocol);
++
++	/* On the first packet of a connection, allocate space for app data */
++	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
++	   !master_conntrack->layer7.app_data){
++		master_conntrack->layer7.app_data = 
++			kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++
++		master_conntrack->layer7.app_data[0] = '\0';
++	}
++
++	/* Can be here, but unallocated, if numpackets is increased near
++	the beginning of a connection */
++	if(master_conntrack->layer7.app_data == NULL){
++		spin_unlock_bh(&l7_lock);
++		return info->invert; /* unmatched */
++	}
++
++	if(!skb->cb[0]){
++		int newbytes;
++		newbytes = add_data(master_conntrack, app_data, appdatalen);
++
++		if(newbytes == 0) { /* didn't add any data */
++			skb->cb[0] = 1;
++			/* Didn't match before, not going to match now */
++			spin_unlock_bh(&l7_lock);
++			return info->invert;
++		}
++	}
++
++	/* If looking for "unknown", then never match.  "Unknown" means that
++	we've given up; we're still trying with these packets. */
++	if(!strcmp(info->protocol, "unknown")) {
++		pattern_result = 0;
++	/* If looking for "unset", then always match. "Unset" means that we
++	haven't yet classified the connection. */
++	} else if(!strcmp(info->protocol, "unset")) {
++		pattern_result = 2;
++		DPRINTK("layer7: matched unset: not yet classified "
++			"(%d/%d packets)\n",
++                        total_acct_packets(master_conntrack), num_packets);
++	/* If the regexp failed to compile, don't bother running it */
++	} else if(comppattern && 
++		  regexec(comppattern, master_conntrack->layer7.app_data)){
++		DPRINTK("layer7: matched %s\n", info->protocol);
++		pattern_result = 1;
++	} else pattern_result = 0;
++
++	if(pattern_result == 1) {
++		master_conntrack->layer7.app_proto = 
++			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
++		if(!master_conntrack->layer7.app_proto){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in "
++						"match, bailing.\n");
++			spin_unlock_bh(&l7_lock);
++			return (pattern_result ^ info->invert);
++		}
++		strcpy(master_conntrack->layer7.app_proto, info->protocol);
++	} else if(pattern_result > 1) { /* cleanup from "unset" */
++		pattern_result = 1;
++	}
++
++	/* mark the packet seen */
++	skb->cb[0] = 1;
++
++	spin_unlock_bh(&l7_lock);
++	return (pattern_result ^ info->invert);
++}
++
++// load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++static bool check(const struct xt_mtchk_param *par)
++{
++        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", par->match->family);
++#else
++static bool check(const char *tablename, const void *inf,
++		 const struct xt_match *match, void *matchinfo,
++		 unsigned int hook_mask)
++{
++        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
++                printk(KERN_WARNING "can't load conntrack support for "
++                                    "proto=%d\n", match->family);
++#endif
++                return 0;
++        }
++	return 1;
++}
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++	static void destroy(const struct xt_mtdtor_param *par)
++	{
++		nf_ct_l3proto_module_put(par->match->family);
++	}
++#else
++	static void destroy(const struct xt_match *match, void *matchinfo)
++	{
++		nf_ct_l3proto_module_put(match->family);
++	}
++#endif
++
++static struct xt_match xt_layer7_match[] __read_mostly = {
++{
++	.name		= "layer7",
++	.family		= AF_INET,
++	.checkentry	= check,
++	.match		= match,
++	.destroy	= destroy,
++	.matchsize	= sizeof(struct xt_layer7_info),
++	.me		= THIS_MODULE
++}
++};
++
++static void layer7_cleanup_proc(void)
++{
++	remove_proc_entry("layer7_numpackets", init_net.proc_net);
++}
++
++/* register the proc file */
++static void layer7_init_proc(void)
++{
++	struct proc_dir_entry* entry;
++	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
++	entry->read_proc = layer7_read_proc;
++	entry->write_proc = layer7_write_proc;
++}
++
++static int __init xt_layer7_init(void)
++{
++	need_conntrack();
++
++	layer7_init_proc();
++	if(maxdatalen < 1) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
++			"using 1\n");
++		maxdatalen = 1;
++	}
++	/* This is not a hard limit.  It's just here to prevent people from
++	bringing their slow machines to a grinding halt. */
++	else if(maxdatalen > 65536) {
++		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
++			"using 65536\n");
++		maxdatalen = 65536;
++	}
++	return xt_register_matches(xt_layer7_match,
++				   ARRAY_SIZE(xt_layer7_match));
++}
++
++static void __exit xt_layer7_fini(void)
++{
++	layer7_cleanup_proc();
++	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
++}
++
++module_init(xt_layer7_init);
++module_exit(xt_layer7_fini);
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.c
+@@ -0,0 +1,1197 @@
++/*
++ * regcomp and regexec -- regsub and regerror are elsewhere
++ * @(#)regexp.c	1.3 of 18 April 87
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ * Beware that some of this code is subtly aware of the way operator
++ * precedence is structured in regular expressions.  Serious changes in
++ * regular-expression syntax might require a total rethink.
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ * Modified slightly by Matthew Strait to use more modern C.
++ */
++
++#include "regexp.h"
++#include "regmagic.h"
++
++/* added by ethan and matt.  Lets it work in both kernel and user space.
++(So iptables can use it, for instance.)  Yea, it goes both ways... */
++#if __KERNEL__
++  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
++#else
++  #define printk(format,args...) printf(format,##args)
++#endif
++
++void regerror(char * s)
++{
++        printk("<3>Regexp: %s\n", s);
++        /* NOTREACHED */
++}
++
++/*
++ * The "internal use only" fields in regexp.h are present to pass info from
++ * compile to execute that permits the execute phase to run lots faster on
++ * simple cases.  They are:
++ *
++ * regstart	char that must begin a match; '\0' if none obvious
++ * reganch	is the match anchored (at beginning-of-line only)?
++ * regmust	string (pointer into program) that match must include, or NULL
++ * regmlen	length of regmust string
++ *
++ * Regstart and reganch permit very fast decisions on suitable starting points
++ * for a match, cutting down the work a lot.  Regmust permits fast rejection
++ * of lines that cannot possibly match.  The regmust tests are costly enough
++ * that regcomp() supplies a regmust only if the r.e. contains something
++ * potentially expensive (at present, the only such thing detected is * or +
++ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
++ * supplied because the test in regexec() needs it and regcomp() is computing
++ * it anyway.
++ */
++
++/*
++ * Structure for regexp "program".  This is essentially a linear encoding
++ * of a nondeterministic finite-state machine (aka syntax charts or
++ * "railroad normal form" in parsing technology).  Each node is an opcode
++ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
++ * all nodes except BRANCH implement concatenation; a "next" pointer with
++ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
++ * have one of the subtle syntax dependencies:  an individual BRANCH (as
++ * opposed to a collection of them) is never concatenated with anything
++ * because of operator precedence.)  The operand of some types of node is
++ * a literal string; for others, it is a node leading into a sub-FSM.  In
++ * particular, the operand of a BRANCH node is the first node of the branch.
++ * (NB this is *not* a tree structure:  the tail of the branch connects
++ * to the thing following the set of BRANCHes.)  The opcodes are:
++ */
++
++/* definition	number	opnd?	meaning */
++#define	END	0	/* no	End of program. */
++#define	BOL	1	/* no	Match "" at beginning of line. */
++#define	EOL	2	/* no	Match "" at end of line. */
++#define	ANY	3	/* no	Match any one character. */
++#define	ANYOF	4	/* str	Match any character in this string. */
++#define	ANYBUT	5	/* str	Match any character not in this string. */
++#define	BRANCH	6	/* node	Match this alternative, or the next... */
++#define	BACK	7	/* no	Match "", "next" ptr points backward. */
++#define	EXACTLY	8	/* str	Match this string. */
++#define	NOTHING	9	/* no	Match empty string. */
++#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
++#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
++#define	OPEN	20	/* no	Mark this point in input as start of #n. */
++			/*	OPEN+1 is number 1, etc. */
++#define	CLOSE	30	/* no	Analogous to OPEN. */
++
++/*
++ * Opcode notes:
++ *
++ * BRANCH	The set of branches constituting a single choice are hooked
++ *		together with their "next" pointers, since precedence prevents
++ *		anything being concatenated to any individual branch.  The
++ *		"next" pointer of the last BRANCH in a choice points to the
++ *		thing following the whole choice.  This is also where the
++ *		final "next" pointer of each individual branch points; each
++ *		branch starts with the operand node of a BRANCH node.
++ *
++ * BACK		Normal "next" pointers all implicitly point forward; BACK
++ *		exists to make loop structures possible.
++ *
++ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
++ *		BRANCH structures using BACK.  Simple cases (one character
++ *		per match) are implemented with STAR and PLUS for speed
++ *		and to minimize recursive plunges.
++ *
++ * OPEN,CLOSE	...are numbered at compile time.
++ */
++
++/*
++ * A node is one char of opcode followed by two chars of "next" pointer.
++ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
++ * value is a positive offset from the opcode of the node containing it.
++ * An operand, if any, simply follows the node.  (Note that much of the
++ * code generation knows about this implicit relationship.)
++ *
++ * Using two bytes for the "next" pointer is vast overkill for most things,
++ * but allows patterns to get big without disasters.
++ */
++#define	OP(p)	(*(p))
++#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
++#define	OPERAND(p)	((p) + 3)
++
++/*
++ * See regmagic.h for one further detail of program structure.
++ */
++
++
++/*
++ * Utility definitions.
++ */
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#define	FAIL(m)	{ regerror(m); return(NULL); }
++#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
++#define	META	"^$.[()|?+*\\"
++
++/*
++ * Flags to be passed up and down.
++ */
++#define	HASWIDTH	01	/* Known never to match null string. */
++#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
++#define	SPSTART		04	/* Starts with * or +. */
++#define	WORST		0	/* Worst case. */
++
++/*
++ * Global work variables for regcomp().
++ */
++struct match_globals {
++char *reginput;		/* String-input pointer. */
++char *regbol;		/* Beginning of input, for ^ check. */
++char **regstartp;	/* Pointer to startp array. */
++char **regendp;		/* Ditto for endp. */
++char *regparse;		/* Input-scan pointer. */
++int regnpar;		/* () count. */
++char regdummy;
++char *regcode;		/* Code-emit pointer; &regdummy = don't. */
++long regsize;		/* Code size. */
++};
++
++/*
++ * Forward declarations for regcomp()'s friends.
++ */
++#ifndef STATIC
++#define	STATIC	static
++#endif
++STATIC char *reg(struct match_globals *g, int paren,int *flagp);
++STATIC char *regbranch(struct match_globals *g, int *flagp);
++STATIC char *regpiece(struct match_globals *g, int *flagp);
++STATIC char *regatom(struct match_globals *g, int *flagp);
++STATIC char *regnode(struct match_globals *g, char op);
++STATIC char *regnext(struct match_globals *g, char *p);
++STATIC void regc(struct match_globals *g, char b);
++STATIC void reginsert(struct match_globals *g, char op, char *opnd);
++STATIC void regtail(struct match_globals *g, char *p, char *val);
++STATIC void regoptail(struct match_globals *g, char *p, char *val);
++
++
++__kernel_size_t my_strcspn(const char *s1,const char *s2)
++{
++        char *scan1;
++        char *scan2;
++        int count;
++
++        count = 0;
++        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
++                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
++                        if (*scan1 == *scan2++)
++                                return(count);
++                count++;
++        }
++        return(count);
++}
++
++/*
++ - regcomp - compile a regular expression into internal code
++ *
++ * We can't allocate space until we know how big the compiled form will be,
++ * but we can't compile it (and thus know how big it is) until we've got a
++ * place to put the code.  So we cheat:  we compile it twice, once with code
++ * generation turned off and size counting turned on, and once "for real".
++ * This also means that we don't allocate space until we are sure that the
++ * thing really will compile successfully, and we never have to move the
++ * code and thus invalidate pointers into it.  (Note that it has to be in
++ * one piece because free() must be able to free it all.)
++ *
++ * Beware that the optimization-preparation code in here knows about some
++ * of the structure of the compiled regexp.
++ */
++regexp *
++regcomp(char *exp,int *patternsize)
++{
++	register regexp *r;
++	register char *scan;
++	register char *longest;
++	register int len;
++	int flags;
++	struct match_globals g;
++	
++	/* commented out by ethan
++	   extern char *malloc();
++	*/
++
++	if (exp == NULL)
++		FAIL("NULL argument");
++
++	/* First pass: determine size, legality. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regsize = 0L;
++	g.regcode = &g.regdummy;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Small enough for pointer-storage convention? */
++	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
++		FAIL("regexp too big");
++
++	/* Allocate space. */
++	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
++	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
++	if (r == NULL)
++		FAIL("out of space");
++
++	/* Second pass: emit code. */
++	g.regparse = exp;
++	g.regnpar = 1;
++	g.regcode = r->program;
++	regc(&g, MAGIC);
++	if (reg(&g, 0, &flags) == NULL)
++		return(NULL);
++
++	/* Dig out information for optimizations. */
++	r->regstart = '\0';	/* Worst-case defaults. */
++	r->reganch = 0;
++	r->regmust = NULL;
++	r->regmlen = 0;
++	scan = r->program+1;			/* First BRANCH. */
++	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
++		scan = OPERAND(scan);
++
++		/* Starting-point info. */
++		if (OP(scan) == EXACTLY)
++			r->regstart = *OPERAND(scan);
++		else if (OP(scan) == BOL)
++			r->reganch++;
++
++		/*
++		 * If there's something expensive in the r.e., find the
++		 * longest literal string that must appear and make it the
++		 * regmust.  Resolve ties in favor of later strings, since
++		 * the regstart check works with the beginning of the r.e.
++		 * and avoiding duplication strengthens checking.  Not a
++		 * strong reason, but sufficient in the absence of others.
++		 */
++		if (flags&SPSTART) {
++			longest = NULL;
++			len = 0;
++			for (; scan != NULL; scan = regnext(&g, scan))
++				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
++					longest = OPERAND(scan);
++					len = strlen(OPERAND(scan));
++				}
++			r->regmust = longest;
++			r->regmlen = len;
++		}
++	}
++
++	return(r);
++}
++
++/*
++ - reg - regular expression, i.e. main body or parenthesized thing
++ *
++ * Caller must absorb opening parenthesis.
++ *
++ * Combining parenthesis handling with the base level of regular expression
++ * is a trifle forced, but the need to tie the tails of the branches to what
++ * follows makes it hard to avoid.
++ */
++static char *
++reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
++{
++	register char *ret;
++	register char *br;
++	register char *ender;
++	register int parno = 0; /* 0 makes gcc happy */
++	int flags;
++
++	*flagp = HASWIDTH;	/* Tentatively. */
++
++	/* Make an OPEN node, if parenthesized. */
++	if (paren) {
++		if (g->regnpar >= NSUBEXP)
++			FAIL("too many ()");
++		parno = g->regnpar;
++		g->regnpar++;
++		ret = regnode(g, OPEN+parno);
++	} else
++		ret = NULL;
++
++	/* Pick up the branches, linking them together. */
++	br = regbranch(g, &flags);
++	if (br == NULL)
++		return(NULL);
++	if (ret != NULL)
++		regtail(g, ret, br);	/* OPEN -> first. */
++	else
++		ret = br;
++	if (!(flags&HASWIDTH))
++		*flagp &= ~HASWIDTH;
++	*flagp |= flags&SPSTART;
++	while (*g->regparse == '|') {
++		g->regparse++;
++		br = regbranch(g, &flags);
++		if (br == NULL)
++			return(NULL);
++		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
++		if (!(flags&HASWIDTH))
++			*flagp &= ~HASWIDTH;
++		*flagp |= flags&SPSTART;
++	}
++
++	/* Make a closing node, and hook it on the end. */
++	ender = regnode(g, (paren) ? CLOSE+parno : END);	
++	regtail(g, ret, ender);
++
++	/* Hook the tails of the branches to the closing node. */
++	for (br = ret; br != NULL; br = regnext(g, br))
++		regoptail(g, br, ender);
++
++	/* Check for proper termination. */
++	if (paren && *g->regparse++ != ')') {
++		FAIL("unmatched ()");
++	} else if (!paren && *g->regparse != '\0') {
++		if (*g->regparse == ')') {
++			FAIL("unmatched ()");
++		} else
++			FAIL("junk on end");	/* "Can't happen". */
++		/* NOTREACHED */
++	}
++
++	return(ret);
++}
++
++/*
++ - regbranch - one alternative of an | operator
++ *
++ * Implements the concatenation operator.
++ */
++static char *
++regbranch(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char *chain;
++	register char *latest;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	ret = regnode(g, BRANCH);
++	chain = NULL;
++	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
++		latest = regpiece(g, &flags);
++		if (latest == NULL)
++			return(NULL);
++		*flagp |= flags&HASWIDTH;
++		if (chain == NULL)	/* First piece. */
++			*flagp |= flags&SPSTART;
++		else
++			regtail(g, chain, latest);
++		chain = latest;
++	}
++	if (chain == NULL)	/* Loop ran zero times. */
++		(void) regnode(g, NOTHING);
++
++	return(ret);
++}
++
++/*
++ - regpiece - something followed by possible [*+?]
++ *
++ * Note that the branching code sequences used for ? and the general cases
++ * of * and + are somewhat optimized:  they use the same NOTHING node as
++ * both the endmarker for their branch list and the body of the last branch.
++ * It might seem that this node could be dispensed with entirely, but the
++ * endmarker role is not redundant.
++ */
++static char *
++regpiece(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	register char op;
++	register char *next;
++	int flags;
++
++	ret = regatom(g, &flags);
++	if (ret == NULL)
++		return(NULL);
++
++	op = *g->regparse;
++	if (!ISMULT(op)) {
++		*flagp = flags;
++		return(ret);
++	}
++
++	if (!(flags&HASWIDTH) && op != '?')
++		FAIL("*+ operand could be empty");
++	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
++
++	if (op == '*' && (flags&SIMPLE))
++		reginsert(g, STAR, ret);
++	else if (op == '*') {
++		/* Emit x* as (x&|), where & means "self". */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regoptail(g, ret, regnode(g, BACK));		/* and loop */
++		regoptail(g, ret, ret);			/* back */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '+' && (flags&SIMPLE))
++		reginsert(g, PLUS, ret);
++	else if (op == '+') {
++		/* Emit x+ as x(&|), where & means "self". */
++		next = regnode(g, BRANCH);			/* Either */
++		regtail(g, ret, next);
++		regtail(g, regnode(g, BACK), ret);		/* loop back */
++		regtail(g, next, regnode(g, BRANCH));		/* or */
++		regtail(g, ret, regnode(g, NOTHING));		/* null. */
++	} else if (op == '?') {
++		/* Emit x? as (x|) */
++		reginsert(g, BRANCH, ret);			/* Either x */
++		regtail(g, ret, regnode(g, BRANCH));		/* or */
++		next = regnode(g, NOTHING);		/* null. */
++		regtail(g, ret, next);
++		regoptail(g, ret, next);
++	}
++	g->regparse++;
++	if (ISMULT(*g->regparse))
++		FAIL("nested *?+");
++
++	return(ret);
++}
++
++/*
++ - regatom - the lowest level
++ *
++ * Optimization:  gobbles an entire sequence of ordinary characters so that
++ * it can turn them into a single node, which is smaller to store and
++ * faster to run.  Backslashed characters are exceptions, each becoming a
++ * separate node; the code is simpler that way and it's not worth fixing.
++ */
++static char *
++regatom(struct match_globals *g, int *flagp)
++{
++	register char *ret;
++	int flags;
++
++	*flagp = WORST;		/* Tentatively. */
++
++	switch (*g->regparse++) {
++	case '^':
++		ret = regnode(g, BOL);
++		break;
++	case '$':
++		ret = regnode(g, EOL);
++		break;
++	case '.':
++		ret = regnode(g, ANY);
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	case '[': {
++			register int class;
++			register int classend;
++
++			if (*g->regparse == '^') {	/* Complement of range. */
++				ret = regnode(g, ANYBUT);
++				g->regparse++;
++			} else
++				ret = regnode(g, ANYOF);
++			if (*g->regparse == ']' || *g->regparse == '-')
++				regc(g, *g->regparse++);
++			while (*g->regparse != '\0' && *g->regparse != ']') {
++				if (*g->regparse == '-') {
++					g->regparse++;
++					if (*g->regparse == ']' || *g->regparse == '\0')
++						regc(g, '-');
++					else {
++						class = UCHARAT(g->regparse-2)+1;
++						classend = UCHARAT(g->regparse);
++						if (class > classend+1)
++							FAIL("invalid [] range");
++						for (; class <= classend; class++)
++							regc(g, class);
++						g->regparse++;
++					}
++				} else
++					regc(g, *g->regparse++);
++			}
++			regc(g, '\0');
++			if (*g->regparse != ']')
++				FAIL("unmatched []");
++			g->regparse++;
++			*flagp |= HASWIDTH|SIMPLE;
++		}
++		break;
++	case '(':
++		ret = reg(g, 1, &flags);
++		if (ret == NULL)
++			return(NULL);
++		*flagp |= flags&(HASWIDTH|SPSTART);
++		break;
++	case '\0':
++	case '|':
++	case ')':
++		FAIL("internal urp");	/* Supposed to be caught earlier. */
++		break;
++	case '?':
++	case '+':
++	case '*':
++		FAIL("?+* follows nothing");
++		break;
++	case '\\':
++		if (*g->regparse == '\0')
++			FAIL("trailing \\");
++		ret = regnode(g, EXACTLY);
++		regc(g, *g->regparse++);
++		regc(g, '\0');
++		*flagp |= HASWIDTH|SIMPLE;
++		break;
++	default: {
++			register int len;
++			register char ender;
++
++			g->regparse--;
++			len = my_strcspn((const char *)g->regparse, (const char *)META);
++			if (len <= 0)
++				FAIL("internal disaster");
++			ender = *(g->regparse+len);
++			if (len > 1 && ISMULT(ender))
++				len--;		/* Back off clear of ?+* operand. */
++			*flagp |= HASWIDTH;
++			if (len == 1)
++				*flagp |= SIMPLE;
++			ret = regnode(g, EXACTLY);
++			while (len > 0) {
++				regc(g, *g->regparse++);
++				len--;
++			}
++			regc(g, '\0');
++		}
++		break;
++	}
++
++	return(ret);
++}
++
++/*
++ - regnode - emit a node
++ */
++static char *			/* Location. */
++regnode(struct match_globals *g, char op)
++{
++	register char *ret;
++	register char *ptr;
++
++	ret = g->regcode;
++	if (ret == &g->regdummy) {
++		g->regsize += 3;
++		return(ret);
++	}
++
++	ptr = ret;
++	*ptr++ = op;
++	*ptr++ = '\0';		/* Null "next" pointer. */
++	*ptr++ = '\0';
++	g->regcode = ptr;
++
++	return(ret);
++}
++
++/*
++ - regc - emit (if appropriate) a byte of code
++ */
++static void
++regc(struct match_globals *g, char b)
++{
++	if (g->regcode != &g->regdummy)
++		*g->regcode++ = b;
++	else
++		g->regsize++;
++}
++
++/*
++ - reginsert - insert an operator in front of already-emitted operand
++ *
++ * Means relocating the operand.
++ */
++static void
++reginsert(struct match_globals *g, char op, char* opnd)
++{
++	register char *src;
++	register char *dst;
++	register char *place;
++
++	if (g->regcode == &g->regdummy) {
++		g->regsize += 3;
++		return;
++	}
++
++	src = g->regcode;
++	g->regcode += 3;
++	dst = g->regcode;
++	while (src > opnd)
++		*--dst = *--src;
++
++	place = opnd;		/* Op node, where operand used to be. */
++	*place++ = op;
++	*place++ = '\0';
++	*place++ = '\0';
++}
++
++/*
++ - regtail - set the next-pointer at the end of a node chain
++ */
++static void
++regtail(struct match_globals *g, char *p, char *val)
++{
++	register char *scan;
++	register char *temp;
++	register int offset;
++
++	if (p == &g->regdummy)
++		return;
++
++	/* Find last node. */
++	scan = p;
++	for (;;) {
++		temp = regnext(g, scan);
++		if (temp == NULL)
++			break;
++		scan = temp;
++	}
++
++	if (OP(scan) == BACK)
++		offset = scan - val;
++	else
++		offset = val - scan;
++	*(scan+1) = (offset>>8)&0377;
++	*(scan+2) = offset&0377;
++}
++
++/*
++ - regoptail - regtail on operand of first argument; nop if operandless
++ */
++static void
++regoptail(struct match_globals *g, char *p, char *val)
++{
++	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
++	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
++		return;
++	regtail(g, OPERAND(p), val);
++}
++
++/*
++ * regexec and friends
++ */
++
++
++/*
++ * Forwards.
++ */
++STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
++STATIC int regmatch(struct match_globals *g, char *prog);
++STATIC int regrepeat(struct match_globals *g, char *p);
++
++#ifdef DEBUG
++int regnarrate = 0;
++void regdump();
++STATIC char *regprop(char *op);
++#endif
++
++/*
++ - regexec - match a regexp against a string
++ */
++int
++regexec(regexp *prog, char *string)
++{
++	register char *s;
++	struct match_globals g;
++
++	/* Be paranoid... */
++	if (prog == NULL || string == NULL) {
++		printk("<3>Regexp: NULL parameter\n");
++		return(0);
++	}
++
++	/* Check validity of program. */
++	if (UCHARAT(prog->program) != MAGIC) {
++		printk("<3>Regexp: corrupted program\n");
++		return(0);
++	}
++
++	/* If there is a "must appear" string, look for it. */
++	if (prog->regmust != NULL) {
++		s = string;
++		while ((s = strchr(s, prog->regmust[0])) != NULL) {
++			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
++				break;	/* Found it. */
++			s++;
++		}
++		if (s == NULL)	/* Not present. */
++			return(0);
++	}
++
++	/* Mark beginning of line for ^ . */
++	g.regbol = string;
++
++	/* Simplest case:  anchored match need be tried only once. */
++	if (prog->reganch)
++		return(regtry(&g, prog, string));
++
++	/* Messy cases:  unanchored match. */
++	s = string;
++	if (prog->regstart != '\0')
++		/* We know what char it must start with. */
++		while ((s = strchr(s, prog->regstart)) != NULL) {
++			if (regtry(&g, prog, s))
++				return(1);
++			s++;
++		}
++	else
++		/* We don't -- general case. */
++		do {
++			if (regtry(&g, prog, s))
++				return(1);
++		} while (*s++ != '\0');
++
++	/* Failure. */
++	return(0);
++}
++
++/*
++ - regtry - try match at specific point
++ */
++static int			/* 0 failure, 1 success */
++regtry(struct match_globals *g, regexp *prog, char *string)
++{
++	register int i;
++	register char **sp;
++	register char **ep;
++
++	g->reginput = string;
++	g->regstartp = prog->startp;
++	g->regendp = prog->endp;
++
++	sp = prog->startp;
++	ep = prog->endp;
++	for (i = NSUBEXP; i > 0; i--) {
++		*sp++ = NULL;
++		*ep++ = NULL;
++	}
++	if (regmatch(g, prog->program + 1)) {
++		prog->startp[0] = string;
++		prog->endp[0] = g->reginput;
++		return(1);
++	} else
++		return(0);
++}
++
++/*
++ - regmatch - main matching routine
++ *
++ * Conceptually the strategy is simple:  check to see whether the current
++ * node matches, call self recursively to see whether the rest matches,
++ * and then act accordingly.  In practice we make some effort to avoid
++ * recursion, in particular by going through "ordinary" nodes (that don't
++ * need to know whether the rest of the match failed) by a loop instead of
++ * by recursion.
++ */
++static int			/* 0 failure, 1 success */
++regmatch(struct match_globals *g, char *prog)
++{
++	register char *scan = prog; /* Current node. */
++	char *next;		    /* Next node. */
++
++#ifdef DEBUG
++	if (scan != NULL && regnarrate)
++		fprintf(stderr, "%s(\n", regprop(scan));
++#endif
++	while (scan != NULL) {
++#ifdef DEBUG
++		if (regnarrate)
++			fprintf(stderr, "%s...\n", regprop(scan));
++#endif
++		next = regnext(g, scan);
++
++		switch (OP(scan)) {
++		case BOL:
++			if (g->reginput != g->regbol)
++				return(0);
++			break;
++		case EOL:
++			if (*g->reginput != '\0')
++				return(0);
++			break;
++		case ANY:
++			if (*g->reginput == '\0')
++				return(0);
++			g->reginput++;
++			break;
++		case EXACTLY: {
++				register int len;
++				register char *opnd;
++
++				opnd = OPERAND(scan);
++				/* Inline the first character, for speed. */
++				if (*opnd != *g->reginput)
++					return(0);
++				len = strlen(opnd);
++				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
++					return(0);
++				g->reginput += len;
++			}
++			break;
++		case ANYOF:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case ANYBUT:
++			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
++				return(0);
++			g->reginput++;
++			break;
++		case NOTHING:
++		case BACK:
++			break;
++		case OPEN+1:
++		case OPEN+2:
++		case OPEN+3:
++		case OPEN+4:
++		case OPEN+5:
++		case OPEN+6:
++		case OPEN+7:
++		case OPEN+8:
++		case OPEN+9: {
++				register int no;
++				register char *save;
++
++				no = OP(scan) - OPEN;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set startp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regstartp[no] == NULL)
++						g->regstartp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case CLOSE+1:
++		case CLOSE+2:
++		case CLOSE+3:
++		case CLOSE+4:
++		case CLOSE+5:
++		case CLOSE+6:
++		case CLOSE+7:
++		case CLOSE+8:
++		case CLOSE+9:
++			{
++				register int no;
++				register char *save;
++
++				no = OP(scan) - CLOSE;
++				save = g->reginput;
++
++				if (regmatch(g, next)) {
++					/*
++					 * Don't set endp if some later
++					 * invocation of the same parentheses
++					 * already has.
++					 */
++					if (g->regendp[no] == NULL)
++						g->regendp[no] = save;
++					return(1);
++				} else
++					return(0);
++			}
++			break;
++		case BRANCH: {
++				register char *save;
++
++				if (OP(next) != BRANCH)		/* No choice. */
++					next = OPERAND(scan);	/* Avoid recursion. */
++				else {
++					do {
++						save = g->reginput;
++						if (regmatch(g, OPERAND(scan)))
++							return(1);
++						g->reginput = save;
++						scan = regnext(g, scan);
++					} while (scan != NULL && OP(scan) == BRANCH);
++					return(0);
++					/* NOTREACHED */
++				}
++			}
++			break;
++		case STAR:
++		case PLUS: {
++				register char nextch;
++				register int no;
++				register char *save;
++				register int min;
++
++				/*
++				 * Lookahead to avoid useless match attempts
++				 * when we know what character comes next.
++				 */
++				nextch = '\0';
++				if (OP(next) == EXACTLY)
++					nextch = *OPERAND(next);
++				min = (OP(scan) == STAR) ? 0 : 1;
++				save = g->reginput;
++				no = regrepeat(g, OPERAND(scan));
++				while (no >= min) {
++					/* If it could work, try it. */
++					if (nextch == '\0' || *g->reginput == nextch)
++						if (regmatch(g, next))
++							return(1);
++					/* Couldn't or didn't -- back up. */
++					no--;
++					g->reginput = save + no;
++				}
++				return(0);
++			}
++			break;
++		case END:
++			return(1);	/* Success! */
++			break;
++		default:
++			printk("<3>Regexp: memory corruption\n");
++			return(0);
++			break;
++		}
++
++		scan = next;
++	}
++
++	/*
++	 * We get here only if there's trouble -- normally "case END" is
++	 * the terminating point.
++	 */
++	printk("<3>Regexp: corrupted pointers\n");
++	return(0);
++}
++
++/*
++ - regrepeat - repeatedly match something simple, report how many
++ */
++static int
++regrepeat(struct match_globals *g, char *p)
++{
++	register int count = 0;
++	register char *scan;
++	register char *opnd;
++
++	scan = g->reginput;
++	opnd = OPERAND(p);
++	switch (OP(p)) {
++	case ANY:
++		count = strlen(scan);
++		scan += count;
++		break;
++	case EXACTLY:
++		while (*opnd == *scan) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYOF:
++		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	case ANYBUT:
++		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
++			count++;
++			scan++;
++		}
++		break;
++	default:		/* Oh dear.  Called inappropriately. */
++		printk("<3>Regexp: internal foulup\n");
++		count = 0;	/* Best compromise. */
++		break;
++	}
++	g->reginput = scan;
++
++	return(count);
++}
++
++/*
++ - regnext - dig the "next" pointer out of a node
++ */
++static char*
++regnext(struct match_globals *g, char *p)
++{
++	register int offset;
++
++	if (p == &g->regdummy)
++		return(NULL);
++
++	offset = NEXT(p);
++	if (offset == 0)
++		return(NULL);
++
++	if (OP(p) == BACK)
++		return(p-offset);
++	else
++		return(p+offset);
++}
++
++#ifdef DEBUG
++
++STATIC char *regprop();
++
++/*
++ - regdump - dump a regexp onto stdout in vaguely comprehensible form
++ */
++void
++regdump(regexp *r)
++{
++	register char *s;
++	register char op = EXACTLY;	/* Arbitrary non-END op. */
++	register char *next;
++	/* extern char *strchr(); */
++
++
++	s = r->program + 1;
++	while (op != END) {	/* While that wasn't END last time... */
++		op = OP(s);
++		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
++		next = regnext(s);
++		if (next == NULL)		/* Next ptr. */
++			printf("(0)");
++		else
++			printf("(%d)", (s-r->program)+(next-s));
++		s += 3;
++		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
++			/* Literal string, where present. */
++			while (*s != '\0') {
++				putchar(*s);
++				s++;
++			}
++			s++;
++		}
++		putchar('\n');
++	}
++
++	/* Header fields of interest. */
++	if (r->regstart != '\0')
++		printf("start `%c' ", r->regstart);
++	if (r->reganch)
++		printf("anchored ");
++	if (r->regmust != NULL)
++		printf("must have \"%s\"", r->regmust);
++	printf("\n");
++}
++
++/*
++ - regprop - printable representation of opcode
++ */
++static char *
++regprop(char *op)
++{
++#define BUFLEN 50
++	register char *p;
++	static char buf[BUFLEN];
++
++	strcpy(buf, ":");
++
++	switch (OP(op)) {
++	case BOL:
++		p = "BOL";
++		break;
++	case EOL:
++		p = "EOL";
++		break;
++	case ANY:
++		p = "ANY";
++		break;
++	case ANYOF:
++		p = "ANYOF";
++		break;
++	case ANYBUT:
++		p = "ANYBUT";
++		break;
++	case BRANCH:
++		p = "BRANCH";
++		break;
++	case EXACTLY:
++		p = "EXACTLY";
++		break;
++	case NOTHING:
++		p = "NOTHING";
++		break;
++	case BACK:
++		p = "BACK";
++		break;
++	case END:
++		p = "END";
++		break;
++	case OPEN+1:
++	case OPEN+2:
++	case OPEN+3:
++	case OPEN+4:
++	case OPEN+5:
++	case OPEN+6:
++	case OPEN+7:
++	case OPEN+8:
++	case OPEN+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
++		p = NULL;
++		break;
++	case CLOSE+1:
++	case CLOSE+2:
++	case CLOSE+3:
++	case CLOSE+4:
++	case CLOSE+5:
++	case CLOSE+6:
++	case CLOSE+7:
++	case CLOSE+8:
++	case CLOSE+9:
++		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
++		p = NULL;
++		break;
++	case STAR:
++		p = "STAR";
++		break;
++	case PLUS:
++		p = "PLUS";
++		break;
++	default:
++		printk("<3>Regexp: corrupted opcode\n");
++		break;
++	}
++	if (p != NULL)
++		strncat(buf, p, BUFLEN-strlen(buf));
++	return(buf);
++}
++#endif
++
++
+--- /dev/null
++++ b/net/netfilter/regexp/regexp.h
+@@ -0,0 +1,41 @@
++/*
++ * Definitions etc. for regexp(3) routines.
++ *
++ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
++ * not the System V one.
++ */
++
++#ifndef REGEXP_H
++#define REGEXP_H
++
++
++/*
++http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
++which contains a version of this library, says:
++
++ *
++ * NSUBEXP must be at least 10, and no greater than 117 or the parser
++ * will not work properly.
++ *
++
++However, it looks rather like this library is limited to 10.  If you think
++otherwise, let us know.
++*/
++
++#define NSUBEXP  10
++typedef struct regexp {
++	char *startp[NSUBEXP];
++	char *endp[NSUBEXP];
++	char regstart;		/* Internal use only. */
++	char reganch;		/* Internal use only. */
++	char *regmust;		/* Internal use only. */
++	int regmlen;		/* Internal use only. */
++	char program[1];	/* Unwarranted chumminess with compiler. */
++} regexp;
++
++regexp * regcomp(char *exp, int *patternsize);
++int regexec(regexp *prog, char *string);
++void regsub(regexp *prog, char *source, char *dest);
++void regerror(char *s);
++
++#endif
+--- /dev/null
++++ b/net/netfilter/regexp/regmagic.h
+@@ -0,0 +1,5 @@
++/*
++ * The first byte of the regexp internal "program" is actually this magic
++ * number; the start node begins in the second byte.
++ */
++#define	MAGIC	0234
+--- /dev/null
++++ b/net/netfilter/regexp/regsub.c
+@@ -0,0 +1,95 @@
++/*
++ * regsub
++ * @(#)regsub.c	1.3 of 2 April 86
++ *
++ *	Copyright (c) 1986 by University of Toronto.
++ *	Written by Henry Spencer.  Not derived from licensed software.
++ *
++ *	Permission is granted to anyone to use this software for any
++ *	purpose on any computer system, and to redistribute it freely,
++ *	subject to the following restrictions:
++ *
++ *	1. The author is not responsible for the consequences of use of
++ *		this software, no matter how awful, even if they arise
++ *		from defects in it.
++ *
++ *	2. The origin of this software must not be misrepresented, either
++ *		by explicit claim or by omission.
++ *
++ *	3. Altered versions must be plainly marked as such, and must not
++ *		be misrepresented as being the original software.
++ *
++ *
++ * This code was modified by Ethan Sommer to work within the kernel
++ * (it now uses kmalloc etc..)
++ *
++ */
++#include "regexp.h"
++#include "regmagic.h"
++#include <linux/string.h>
++
++
++#ifndef CHARBITS
++#define	UCHARAT(p)	((int)*(unsigned char *)(p))
++#else
++#define	UCHARAT(p)	((int)*(p)&CHARBITS)
++#endif
++
++#if 0
++//void regerror(char * s)
++//{
++//        printk("regexp(3): %s", s);
++//        /* NOTREACHED */
++//}
++#endif
++
++/*
++ - regsub - perform substitutions after a regexp match
++ */
++void
++regsub(regexp * prog, char * source, char * dest)
++{
++	register char *src;
++	register char *dst;
++	register char c;
++	register int no;
++	register int len;
++	
++	/* Not necessary and gcc doesn't like it -MLS */
++	/*extern char *strncpy();*/
++
++	if (prog == NULL || source == NULL || dest == NULL) {
++		regerror("NULL parm to regsub");
++		return;
++	}
++	if (UCHARAT(prog->program) != MAGIC) {
++		regerror("damaged regexp fed to regsub");
++		return;
++	}
++
++	src = source;
++	dst = dest;
++	while ((c = *src++) != '\0') {
++		if (c == '&')
++			no = 0;
++		else if (c == '\\' && '0' <= *src && *src <= '9')
++			no = *src++ - '0';
++		else
++			no = -1;
++
++		if (no < 0) {	/* Ordinary character. */
++			if (c == '\\' && (*src == '\\' || *src == '&'))
++				c = *src++;
++			*dst++ = c;
++		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
++			len = prog->endp[no] - prog->startp[no];
++			(void) strncpy(dst, prog->startp[no], len);
++			dst += len;
++			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
++				regerror("damaged match string");
++				return;
++			}
++		}
++	}
++	*dst++ = '\0';
++}
+--- a/net/netfilter/nf_conntrack_core.c
++++ b/net/netfilter/nf_conntrack_core.c
+@@ -221,6 +221,13 @@ destroy_conntrack(struct nf_conntrack *n
+ 	 * too. */
+ 	nf_ct_remove_expectations(ct);
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto)
++		kfree(ct->layer7.app_proto);
++	if(ct->layer7.app_data)
++		kfree(ct->layer7.app_data);
++#endif
++
+ 	/* We overload first tuple to link into unconfirmed or dying list.*/
+ 	BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
+ 	hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -239,6 +239,12 @@ static int ct_seq_show(struct seq_file *
+ 	if (ct_show_delta_time(s, ct))
+ 		goto release;
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	if(ct->layer7.app_proto &&
++           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
++		return -ENOSPC;
++#endif
++
+ 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
+ 		goto release;
+ 
+--- a/include/net/netfilter/nf_conntrack.h
++++ b/include/net/netfilter/nf_conntrack.h
+@@ -105,6 +105,22 @@ struct nf_conn {
+ 	struct net *ct_net;
+ #endif
+ 
++#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
++    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	struct {
++		/*
++		 * e.g. "http". NULL before decision. "unknown" after decision
++		 * if no match.
++		 */
++		char *app_proto;
++		/*
++		 * application layer data so far. NULL after match decision.
++		 */
++		char *app_data;
++		unsigned int app_data_len;
++	} layer7;
++#endif
++
+ 	/* Storage reserved for other modules, must be the last member */
+ 	union nf_conntrack_proto proto;
+ };
+--- /dev/null
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -0,0 +1,13 @@
++#ifndef _XT_LAYER7_H
++#define _XT_LAYER7_H
++
++#define MAX_PATTERN_LEN 8192
++#define MAX_PROTOCOL_LEN 256
++
++struct xt_layer7_info {
++    char protocol[MAX_PROTOCOL_LEN];
++    char pattern[MAX_PATTERN_LEN];
++    u_int8_t invert;
++};
++
++#endif /* _XT_LAYER7_H */
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -51,6 +51,7 @@ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
++header-y += xt_layer7.h
+ header-y += xt_length.h
+ header-y += xt_limit.h
+ header-y += xt_mac.h
diff --git a/trunk/target/linux/generic/patches-3.8/601-netfilter_layer7_pktmatch.patch b/trunk/target/linux/generic/patches-3.8/601-netfilter_layer7_pktmatch.patch
new file mode 100644
index 00000000..f65e301f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/601-netfilter_layer7_pktmatch.patch
@@ -0,0 +1,108 @@
+--- a/include/linux/netfilter/xt_layer7.h
++++ b/include/linux/netfilter/xt_layer7.h
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
+     char protocol[MAX_PROTOCOL_LEN];
+     char pattern[MAX_PATTERN_LEN];
+     u_int8_t invert;
++    u_int8_t pkt;
+ };
+ 
+ #endif /* _XT_LAYER7_H */
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
+ }
+ 
+ /* add the new app data to the conntrack.  Return number of bytes added. */
+-static int add_data(struct nf_conn * master_conntrack,
+-                    char * app_data, int appdatalen)
++static int add_datastr(char *target, int offset, char *app_data, int len)
+ {
+ 	int length = 0, i;
+-	int oldlength = master_conntrack->layer7.app_data_len;
+-
+-	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
+-	   clear on whether the race condition exists or whether this really 
+-	   fixes it.  I might just be being dense... Anyway, if it's not really 
+-	   a fix, all it does is waste a very small amount of time. */
+-	if(!master_conntrack->layer7.app_data) return 0;
++	if (!target) return 0;
+ 
+ 	/* Strip nulls. Make everything lower case (our regex lib doesn't
+ 	do case insensitivity).  Add it to the end of the current data. */
+-	for(i = 0; i < maxdatalen-oldlength-1 &&
+-		   i < appdatalen; i++) {
++ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
+ 		if(app_data[i] != '\0') {
+ 			/* the kernel version of tolower mungs 'upper ascii' */
+-			master_conntrack->layer7.app_data[length+oldlength] =
++			target[length+offset] =
+ 				isascii(app_data[i])? 
+ 					tolower(app_data[i]) : app_data[i];
+ 			length++;
+ 		}
+ 	}
++	target[length+offset] = '\0';
++
++	return length;
++}
++
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct nf_conn * master_conntrack,
++                    char * app_data, int appdatalen)
++{
++	int length;
+ 
+-	master_conntrack->layer7.app_data[length+oldlength] = '\0';
+-	master_conntrack->layer7.app_data_len = length + oldlength;
++	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
++	master_conntrack->layer7.app_data_len += length;
+ 
+ 	return length;
+ }
+@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
+ 
+ 	enum ip_conntrack_info master_ctinfo, ctinfo;
+ 	struct nf_conn *master_conntrack, *conntrack;
+-	unsigned char * app_data;
++	unsigned char *app_data, *tmp_data;
+ 	unsigned int pattern_result, appdatalen;
+ 	regexp * comppattern;
+ 
+@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
+ 		master_conntrack = master_ct(master_conntrack);
+ 
+ 	/* if we've classified it or seen too many packets */
+-	if(total_acct_packets(master_conntrack) > num_packets ||
+-	   master_conntrack->layer7.app_proto) {
++	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
++	   master_conntrack->layer7.app_proto)) {
+ 
+ 		pattern_result = match_no_append(conntrack, master_conntrack, 
+ 						 ctinfo, master_ctinfo, info);
+@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
+ 	/* the return value gets checked later, when we're ready to use it */
+ 	comppattern = compile_and_cache(info->pattern, info->protocol);
+ 
++	if (info->pkt) {
++		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
++		if(!tmp_data){
++			if (net_ratelimit())
++				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
++			return info->invert;
++		}
++
++		tmp_data[0] = '\0';
++		add_datastr(tmp_data, 0, app_data, appdatalen);
++		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
++
++		kfree(tmp_data);
++		tmp_data = NULL;
++		spin_unlock_bh(&l7_lock);
++
++		return (pattern_result ^ info->invert);
++	}
++
+ 	/* On the first packet of a connection, allocate space for app data */
+ 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
+ 	   !master_conntrack->layer7.app_data){
diff --git a/trunk/target/linux/generic/patches-3.8/602-netfilter_layer7_match.patch b/trunk/target/linux/generic/patches-3.8/602-netfilter_layer7_match.patch
new file mode 100644
index 00000000..b2e48c82
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/602-netfilter_layer7_match.patch
@@ -0,0 +1,51 @@
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
+ 
+ static bool
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
+ #else
+ match(const struct sk_buff *skbin,
+@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin,
+ }
+ 
+ // load nf_conntrack_ipv4
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int
++#else
++static bool
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+-static bool check(const struct xt_mtchk_param *par)
++check(const struct xt_mtchk_param *par)
+ {
+         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", par->match->family);
+ #else
+-static bool check(const char *tablename, const void *inf,
++check(const char *tablename, const void *inf,
+ 		 const struct xt_match *match, void *matchinfo,
+ 		 unsigned int hook_mask)
+ {
+@@ -612,9 +619,15 @@ static bool check(const char *tablename,
+                 printk(KERN_WARNING "can't load conntrack support for "
+                                     "proto=%d\n", match->family);
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++		return -EINVAL;
++	}
++	return 0;
++#else
+                 return 0;
+         }
+ 	return 1;
++#endif
+ }
+ 
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch b/trunk/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch
new file mode 100644
index 00000000..e3f20328
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/603-netfilter_layer7_2.6.36_fix.patch
@@ -0,0 +1,61 @@
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -987,6 +987,27 @@ config NETFILTER_XT_MATCH_IPVS
+ 
+ 	  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_LAYER7
++	tristate '"layer7" match support'
++	depends on EXPERIMENTAL
++	depends on NETFILTER_XTABLES
++	depends on NETFILTER_ADVANCED
++	depends on NF_CONNTRACK
++	help
++	  Say Y if you want to be able to classify connections (and their
++	  packets) based on regular expression matching of their application
++	  layer data.   This is one way to classify applications such as
++	  peer-to-peer filesharing systems that do not always use the same
++	  port.
++
++	  To compile it as a module, choose M here.  If unsure, say N.
++
++config NETFILTER_XT_MATCH_LAYER7_DEBUG
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
++
+ config NETFILTER_XT_MATCH_LENGTH
+ 	tristate '"length" match support'
+ 	depends on NETFILTER_ADVANCED
+@@ -1183,26 +1204,11 @@ config NETFILTER_XT_MATCH_STATE
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
+-config NETFILTER_XT_MATCH_LAYER7
+-	tristate '"layer7" match support'
+-	depends on NETFILTER_XTABLES
+-	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
+-       depends on NETFILTER_ADVANCED
+-	help
+-	  Say Y if you want to be able to classify connections (and their
+-	  packets) based on regular expression matching of their application
+-	  layer data.   This is one way to classify applications such as
+-	  peer-to-peer filesharing systems that do not always use the same
+-	  port.
+-
+-	  To compile it as a module, choose M here.  If unsure, say N.
+-
+ config NETFILTER_XT_MATCH_LAYER7_DEBUG
+-        bool 'Layer 7 debugging output'
+-        depends on NETFILTER_XT_MATCH_LAYER7
+-        help
+-          Say Y to get lots of debugging output.
+-
++	bool 'Layer 7 debugging output'
++	depends on NETFILTER_XT_MATCH_LAYER7
++	help
++	  Say Y to get lots of debugging output.
+ 
+ config NETFILTER_XT_MATCH_STATISTIC
+ 	tristate '"statistic" match support'
diff --git a/trunk/target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch b/trunk/target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch
new file mode 100644
index 00000000..a17ba1cf
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,86 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -16,6 +16,7 @@
+ #include <linux/percpu.h>
+ #include <linux/netdevice.h>
+ #include <linux/security.h>
++#include <linux/inet.h>
+ #include <net/net_namespace.h>
+ #ifdef CONFIG_SYSCTL
+ #include <linux/sysctl.h>
+@@ -267,10 +268,66 @@ static int ct_open(struct inode *inode,
+ 			sizeof(struct ct_iter_state));
+ }
+ 
++struct kill_request {
++	u16 family;
++	union nf_inet_addr addr;
++};
++
++static int kill_matching(struct nf_conn *i, void *data)
++{
++	struct kill_request *kr = data;
++	struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
++	struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple;
++
++	if (!kr->family)
++		return 1;
++
++	if (t1->src.l3num != kr->family)
++		return 0;
++
++	return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->src.u3) ||
++	        nf_inet_addr_cmp(&kr->addr, &t2->dst.u3));
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++			     size_t count, loff_t *ppos)
++{
++	struct seq_file *seq = file->private_data;
++	struct net *net = seq_file_net(seq);
++	struct kill_request kr = { };
++	char req[INET6_ADDRSTRLEN] = { };
++
++	if (count == 0)
++		return 0;
++
++	if (count >= INET6_ADDRSTRLEN)
++		count = INET6_ADDRSTRLEN - 1;
++
++	if (copy_from_user(req, buf, count))
++		return -EFAULT;
++
++	if (strnchr(req, count, ':')) {
++		kr.family = AF_INET6;
++		if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	} else if (strnchr(req, count, '.')) {
++		kr.family = AF_INET;
++		if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL))
++			return -EINVAL;
++	}
++
++	nf_ct_iterate_cleanup(net, kill_matching, &kr);
++
++	return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ 	.owner   = THIS_MODULE,
+ 	.open    = ct_open,
+ 	.read    = seq_read,
++	.write	 = ct_file_write,
+ 	.llseek  = seq_lseek,
+ 	.release = seq_release_net,
+ };
+@@ -372,7 +429,7 @@ static int nf_conntrack_standalone_init_
+ {
+ 	struct proc_dir_entry *pde;
+ 
+-	pde = proc_net_fops_create(net, "nf_conntrack", 0440, &ct_file_ops);
++	pde = proc_net_fops_create(net, "nf_conntrack", 0660, &ct_file_ops);
+ 	if (!pde)
+ 		goto out_nf_conntrack;
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch b/trunk/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
new file mode 100644
index 00000000..0081da01
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/610-netfilter_match_bypass_default_checks.patch
@@ -0,0 +1,93 @@
+--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
++++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
+@@ -87,6 +87,7 @@ struct ipt_ip {
+ #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
+ #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
+ #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
++#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
+ 
+ /* Values for "inv" field in struct ipt_ip. */
+ #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -81,6 +81,9 @@ ip_packet_match(const struct iphdr *ip,
+ 
+ #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
+ 
++	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
++		return true;
++
+ 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+ 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+@@ -134,6 +137,29 @@ ip_packet_match(const struct iphdr *ip,
+ 	return true;
+ }
+ 
++static void
++ip_checkdefault(struct ipt_ip *ip)
++{
++	static const char iface_mask[IFNAMSIZ] = {};
++
++	if (ip->invflags || ip->flags & IPT_F_FRAG)
++		return;
++
++	if (memcmp(ip->iniface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (memcmp(ip->outiface_mask, iface_mask, IFNAMSIZ) != 0)
++		return;
++
++	if (ip->smsk.s_addr || ip->dmsk.s_addr)
++		return;
++
++	if (ip->proto)
++		return;
++
++	ip->flags |= IPT_F_NO_DEF_MATCH;
++}
++
+ static bool
+ ip_checkentry(const struct ipt_ip *ip)
+ {
+@@ -560,7 +586,7 @@ static void cleanup_match(struct xt_entr
+ }
+ 
+ static int
+-check_entry(const struct ipt_entry *e, const char *name)
++check_entry(struct ipt_entry *e, const char *name)
+ {
+ 	const struct xt_entry_target *t;
+ 
+@@ -569,6 +595,8 @@ check_entry(const struct ipt_entry *e, c
+ 		return -EINVAL;
+ 	}
+ 
++	ip_checkdefault(&e->ip);
++
+ 	if (e->target_offset + sizeof(struct xt_entry_target) >
+ 	    e->next_offset)
+ 		return -EINVAL;
+@@ -930,6 +958,7 @@ copy_entries_to_user(unsigned int total_
+ 	const struct xt_table_info *private = table->private;
+ 	int ret = 0;
+ 	const void *loc_cpu_entry;
++	u8 flags;
+ 
+ 	counters = alloc_counters(table);
+ 	if (IS_ERR(counters))
+@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_
+ 			ret = -EFAULT;
+ 			goto free_counters;
+ 		}
++
++		flags = e->ip.flags & IPT_F_MASK;
++		if (copy_to_user(userptr + off
++				 + offsetof(struct ipt_entry, ip.flags),
++				 &flags, sizeof(flags)) != 0) {
++			ret = -EFAULT;
++			goto free_counters;
++		}
+ 
+ 		for (i = sizeof(struct ipt_entry);
+ 		     i < e->target_offset;
diff --git a/trunk/target/linux/generic/patches-3.8/611-netfilter_match_bypass_default_table.patch b/trunk/target/linux/generic/patches-3.8/611-netfilter_match_bypass_default_table.patch
new file mode 100644
index 00000000..10f9250b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/611-netfilter_match_bypass_default_table.patch
@@ -0,0 +1,81 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -309,6 +309,33 @@ struct ipt_entry *ipt_next_entry(const s
+ 	return (void *)entry + entry->next_offset;
+ }
+ 
++static bool
++ipt_handle_default_rule(struct ipt_entry *e, unsigned int *verdict)
++{
++	struct xt_entry_target *t;
++	struct xt_standard_target *st;
++
++	if (e->target_offset != sizeof(struct ipt_entry))
++		return false;
++
++	if (!(e->ip.flags & IPT_F_NO_DEF_MATCH))
++		return false;
++
++	t = ipt_get_target(e);
++	if (t->u.kernel.target->target)
++		return false;
++
++	st = (struct xt_standard_target *) t;
++	if (st->verdict == XT_RETURN)
++		return false;
++
++	if (st->verdict >= 0)
++		return false;
++
++	*verdict = (unsigned)(-st->verdict) - 1;
++	return true;
++}
++
+ /* Returns one of the generic firewall policies, like NF_ACCEPT. */
+ unsigned int
+ ipt_do_table(struct sk_buff *skb,
+@@ -333,6 +360,25 @@ ipt_do_table(struct sk_buff *skb,
+ 	ip = ip_hdr(skb);
+ 	indev = in ? in->name : nulldevname;
+ 	outdev = out ? out->name : nulldevname;
++
++	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++	local_bh_disable();
++	addend = xt_write_recseq_begin();
++	private = table->private;
++	cpu        = smp_processor_id();
++	table_base = private->entries[cpu];
++	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
++	stackptr   = per_cpu_ptr(private->stackptr, cpu);
++	origptr    = *stackptr;
++
++	e = get_entry(table_base, private->hook_entry[hook]);
++	if (ipt_handle_default_rule(e, &verdict)) {
++		ADD_COUNTER(e->counters, skb->len, 1);
++		xt_write_recseq_end(addend);
++		local_bh_enable();
++		return verdict;
++	}
++
+ 	/* We handle fragments by dealing with the first fragment as
+ 	 * if it was a normal packet.  All other fragments are treated
+ 	 * normally, except that they will NEVER match rules that ask
+@@ -347,18 +393,6 @@ ipt_do_table(struct sk_buff *skb,
+ 	acpar.family  = NFPROTO_IPV4;
+ 	acpar.hooknum = hook;
+ 
+-	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+-	local_bh_disable();
+-	addend = xt_write_recseq_begin();
+-	private = table->private;
+-	cpu        = smp_processor_id();
+-	table_base = private->entries[cpu];
+-	jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
+-	stackptr   = per_cpu_ptr(private->stackptr, cpu);
+-	origptr    = *stackptr;
+-
+-	e = get_entry(table_base, private->hook_entry[hook]);
+-
+ 	pr_debug("Entering %s(hook %u); sp at %u (UF %p)\n",
+ 		 table->name, hook, origptr,
+ 		 get_entry(table_base, private->underflow[hook]));
diff --git a/trunk/target/linux/generic/patches-3.8/612-netfilter_match_reduce_memory_access.patch b/trunk/target/linux/generic/patches-3.8/612-netfilter_match_reduce_memory_access.patch
new file mode 100644
index 00000000..f506165e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/612-netfilter_match_reduce_memory_access.patch
@@ -0,0 +1,16 @@
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -84,9 +84,11 @@ ip_packet_match(const struct iphdr *ip,
+ 	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
+ 		return true;
+ 
+-	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
++	if (FWINV(ipinfo->smsk.s_addr &&
++		  (ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
+ 		  IPT_INV_SRCIP) ||
+-	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
++	    FWINV(ipinfo->dmsk.s_addr &&
++		  (ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
+ 		  IPT_INV_DSTIP)) {
+ 		dprintf("Source or dest mismatch.\n");
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/613-netfilter_optional_tcp_window_check.patch b/trunk/target/linux/generic/patches-3.8/613-netfilter_optional_tcp_window_check.patch
new file mode 100644
index 00000000..a828ef42
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/613-netfilter_optional_tcp_window_check.patch
@@ -0,0 +1,36 @@
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -29,6 +29,9 @@
+ #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
+ #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
+ 
++/* Do not check the TCP window for incoming packets  */
++static int nf_ct_tcp_no_window_check __read_mostly = 1;
++
+ /* "Be conservative in what you do,
+     be liberal in what you accept from others."
+     If it's non-zero, we mark only out of window RST segments as INVALID. */
+@@ -526,6 +529,9 @@ static bool tcp_in_window(const struct n
+ 	s16 receiver_offset;
+ 	bool res;
+ 
++	if (nf_ct_tcp_no_window_check)
++		return true;
++
+ 	/*
+ 	 * Get the required data from the packet.
+ 	 */
+@@ -1438,6 +1444,13 @@ static struct ctl_table tcp_sysctl_table
+ 		.mode		= 0644,
+ 		.proc_handler	= proc_dointvec,
+ 	},
++	{
++		.procname       = "nf_conntrack_tcp_no_window_check",
++		.data           = &nf_ct_tcp_no_window_check,
++		.maxlen         = sizeof(unsigned int),
++		.mode           = 0644,
++		.proc_handler   = proc_dointvec,
++	},
+ 	{ }
+ };
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/615-netfilter_add_xt_id_match.patch b/trunk/target/linux/generic/patches-3.8/615-netfilter_add_xt_id_match.patch
new file mode 100644
index 00000000..2251a872
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/615-netfilter_add_xt_id_match.patch
@@ -0,0 +1,95 @@
+--- a/include/uapi/linux/netfilter/Kbuild
++++ b/include/uapi/linux/netfilter/Kbuild
+@@ -49,6 +49,7 @@ header-y += xt_ecn.h
+ header-y += xt_esp.h
+ header-y += xt_hashlimit.h
+ header-y += xt_helper.h
++header-y += xt_id.h
+ header-y += xt_iprange.h
+ header-y += xt_ipvs.h
+ header-y += xt_layer7.h
+--- /dev/null
++++ b/include/uapi/linux/netfilter/xt_id.h
+@@ -0,0 +1,8 @@
++#ifndef _XT_ID_H
++#define _XT_ID_H
++
++struct xt_id_info {
++	u32 id;
++};
++
++#endif /* XT_ID_H */
+--- a/net/netfilter/Kconfig
++++ b/net/netfilter/Kconfig
+@@ -967,6 +967,13 @@ config NETFILTER_XT_MATCH_HL
+ 	in the IPv6 header, or the time-to-live field in the IPv4
+ 	header of the packet.
+ 
++config NETFILTER_XT_MATCH_ID
++	tristate '"id" match support'
++	depends on NETFILTER_ADVANCED
++	---help---
++	This option adds a `id' dummy-match, which allows you to put
++	numeric IDs into your iptables ruleset.
++
+ config NETFILTER_XT_MATCH_IPRANGE
+ 	tristate '"iprange" address range match support'
+ 	depends on NETFILTER_ADVANCED
+--- a/net/netfilter/Makefile
++++ b/net/netfilter/Makefile
+@@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) +=
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_ID) += xt_id.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPRANGE) += xt_iprange.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_IPVS) += xt_ipvs.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o
+--- /dev/null
++++ b/net/netfilter/xt_id.c
+@@ -0,0 +1,45 @@
++/*
++ * Implements a dummy match to allow attaching IDs to rules
++ *
++ * 2014-08-01 Jo-Philipp Wich <jow@openwrt.org>
++ */
++
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_id.h>
++
++MODULE_AUTHOR("Jo-Philipp Wich <jow@openwrt.org>");
++MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_id");
++MODULE_ALIAS("ip6t_id");
++
++static bool
++id_mt(const struct sk_buff *skb, struct xt_action_param *par)
++{
++	/* We always match */
++	return true;
++}
++
++static struct xt_match id_mt_reg __read_mostly = {
++	.name      = "id",
++	.revision  = 0,
++	.family    = NFPROTO_UNSPEC,
++	.match     = id_mt,
++	.matchsize = sizeof(struct xt_id_info),
++	.me        = THIS_MODULE,
++};
++
++static int __init id_mt_init(void)
++{
++	return xt_register_match(&id_mt_reg);
++}
++
++static void __exit id_mt_exit(void)
++{
++	xt_unregister_match(&id_mt_reg);
++}
++
++module_init(id_mt_init);
++module_exit(id_mt_exit);
diff --git a/trunk/target/linux/generic/patches-3.8/620-sched_esfq.patch b/trunk/target/linux/generic/patches-3.8/620-sched_esfq.patch
new file mode 100644
index 00000000..e037dcf3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/620-sched_esfq.patch
@@ -0,0 +1,791 @@
+--- a/include/uapi/linux/pkt_sched.h
++++ b/include/uapi/linux/pkt_sched.h
+@@ -214,6 +214,33 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
+ 
++/* ESFQ section */
++
++enum
++{
++        /* traditional */
++	TCA_SFQ_HASH_CLASSIC,
++	TCA_SFQ_HASH_DST,
++	TCA_SFQ_HASH_SRC,
++	TCA_SFQ_HASH_FWMARK,
++	/* conntrack */
++	TCA_SFQ_HASH_CTORIGDST,
++	TCA_SFQ_HASH_CTORIGSRC,
++	TCA_SFQ_HASH_CTREPLDST,
++	TCA_SFQ_HASH_CTREPLSRC,
++	TCA_SFQ_HASH_CTNATCHG,
++};
++
++struct tc_esfq_qopt
++{
++	unsigned	quantum;	/* Bytes per round allocated to flow */
++	int		perturb_period;	/* Period of hash perturbation */
++	__u32		limit;		/* Maximal packets in queue */
++	unsigned	divisor;	/* Hash divisor  */
++	unsigned	flows;		/* Maximal number of flows  */
++	unsigned	hash_kind;	/* Hash function to use for flow identification */
++};
++
+ /* RED section */
+ 
+ enum {
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -148,6 +148,37 @@ config NET_SCH_SFQ
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called sch_sfq.
+ 
++config NET_SCH_ESFQ
++	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
++	---help---
++	  Say Y here if you want to use the Enhanced Stochastic Fairness
++	  Queueing (ESFQ) packet scheduling algorithm for some of your network
++	  devices or as a leaf discipline for a classful qdisc such as HTB or
++	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
++	  references to the SFQ algorithm).
++
++	  This is an enchanced SFQ version which allows you to control some
++	  hardcoded values in the SFQ scheduler.
++
++	  ESFQ also adds control of the hash function used to identify packet
++	  flows. The original SFQ discipline hashes by connection; ESFQ add
++	  several other hashing methods, such as by src IP or by dst IP, which
++	  can be more fair to users in some networking situations.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called sch_esfq.
++
++config NET_SCH_ESFQ_NFCT
++	bool "Connection Tracking Hash Types"
++	depends on NET_SCH_ESFQ && NF_CONNTRACK
++	---help---
++	  Say Y here to enable support for hashing based on netfilter connection
++	  tracking information. This is useful for a router that is also using
++	  NAT to connect privately-addressed hosts to the Internet. If you want
++	  to provide fair distribution of upstream bandwidth, ESFQ must use
++	  connection tracking information, since all outgoing packets will share
++	  the same source address.
++
+ config NET_SCH_TEQL
+ 	tristate "True Link Equalizer (TEQL)"
+ 	---help---
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ing
+ obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
+ obj-$(CONFIG_NET_SCH_SFB)	+= sch_sfb.o
+ obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
++obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
+ obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
+ obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
+ obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
+--- /dev/null
++++ b/net/sched/sch_esfq.c
+@@ -0,0 +1,702 @@
++/*
++ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:	Alexander Atanasov, <alex@ssi.bg>
++ *		Added dynamic depth,limit,divisor,hash_kind options.
++ *		Added dst and src hashes.
++ *
++ * 		Alexander Clouter, <alex@digriz.org.uk>
++ *		Ported ESFQ to Linux 2.6.
++ *
++ * 		Corey Hickey, <bugfood-c@fatooh.org>
++ *		Maintenance of the Linux 2.6 port.
++ *		Added fwmark hash (thanks to Robert Kurjata).
++ *		Added usage of jhash.
++ *		Added conntrack support.
++ *		Added ctnatchg hash (thanks to Ben Pfountz).
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++#include <linux/bitops.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/jiffies.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/socket.h>
++#include <linux/sockios.h>
++#include <linux/in.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/if_ether.h>
++#include <linux/inet.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/notifier.h>
++#include <linux/init.h>
++#include <net/ip.h>
++#include <net/netlink.h>
++#include <linux/ipv6.h>
++#include <net/route.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/pkt_sched.h>
++#include <linux/jhash.h>
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++#include <net/netfilter/nf_conntrack.h>
++#endif
++
++/*	Stochastic Fairness Queuing algorithm.
++	For more comments look at sch_sfq.c.
++	The difference is that you can change limit, depth,
++	hash table size and choose alternate hash types.
++
++	classic:	same as in sch_sfq.c
++	dst:		destination IP address
++	src:		source IP address
++	fwmark:		netfilter mark value
++	ctorigdst:	original destination IP address
++	ctorigsrc:	original source IP address
++	ctrepldst:	reply destination IP address
++	ctreplsrc:	reply source IP
++
++*/
++
++#define ESFQ_HEAD 0
++#define ESFQ_TAIL 1
++
++/* This type should contain at least SFQ_DEPTH*2 values */
++typedef unsigned int esfq_index;
++
++struct esfq_head
++{
++	esfq_index	next;
++	esfq_index	prev;
++};
++
++struct esfq_sched_data
++{
++/* Parameters */
++	int		perturb_period;
++	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
++	int		limit;
++	unsigned	depth;
++	unsigned	hash_divisor;
++	unsigned	hash_kind;
++/* Variables */
++	struct timer_list perturb_timer;
++	int		perturbation;
++	esfq_index	tail;		/* Index of current slot in round */
++	esfq_index	max_depth;	/* Maximal depth */
++
++	esfq_index	*ht;			/* Hash table */
++	esfq_index	*next;			/* Active slots link */
++	short		*allot;			/* Current allotment per slot */
++	unsigned short	*hash;			/* Hash value indexed by slots */
++	struct sk_buff_head	*qs;		/* Slot queue */
++	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
++};
++
++/* This contains the info we will hash. */
++struct esfq_packet_info
++{
++	u32	proto;		/* protocol or port */
++	u32	src;		/* source from packet header */
++	u32	dst;		/* destination from packet header */
++	u32	ctorigsrc;	/* original source from conntrack */
++	u32	ctorigdst;	/* original destination from conntrack */
++	u32	ctreplsrc;	/* reply source from conntrack */
++	u32	ctrepldst;	/* reply destination from conntrack */
++	u32	mark;		/* netfilter mark (fwmark) */
++};
++
++static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
++{
++	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
++{
++	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
++}
++
++static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
++{
++	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
++}
++
++static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
++{
++	struct esfq_packet_info info;
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	enum ip_conntrack_info ctinfo;
++	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
++#endif
++
++	switch (skb->protocol) {
++	case __constant_htons(ETH_P_IP):
++	{
++		struct iphdr *iph = ip_hdr(skb);
++		info.dst = iph->daddr;
++		info.src = iph->saddr;
++		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
++		    (iph->protocol == IPPROTO_TCP ||
++		     iph->protocol == IPPROTO_UDP ||
++		     iph->protocol == IPPROTO_SCTP ||
++		     iph->protocol == IPPROTO_DCCP ||
++		     iph->protocol == IPPROTO_ESP))
++			info.proto = *(((u32*)iph) + iph->ihl);
++		else
++			info.proto = iph->protocol;
++		break;
++	}
++	case __constant_htons(ETH_P_IPV6):
++	{
++		struct ipv6hdr *iph = ipv6_hdr(skb);
++		/* Hash ipv6 addresses into a u32. This isn't ideal,
++		 * but the code is simple. */
++		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
++		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
++		if (iph->nexthdr == IPPROTO_TCP ||
++		    iph->nexthdr == IPPROTO_UDP ||
++		    iph->nexthdr == IPPROTO_SCTP ||
++		    iph->nexthdr == IPPROTO_DCCP ||
++		    iph->nexthdr == IPPROTO_ESP)
++			info.proto = *(u32*)&iph[1];
++		else
++			info.proto = iph->nexthdr;
++		break;
++	}
++	default:
++		info.dst   = (u32)(unsigned long)skb_dst(skb);
++		info.src   = (u32)(unsigned long)skb->sk;
++		info.proto = skb->protocol;
++	}
++
++	info.mark = skb->mark;
++
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	/* defaults if there is no conntrack info */
++	info.ctorigsrc = info.src;
++	info.ctorigdst = info.dst;
++	info.ctreplsrc = info.dst;
++	info.ctrepldst = info.src;
++	/* collect conntrack info */
++	if (ct && ct != &nf_conntrack_untracked) {
++		if (skb->protocol == __constant_htons(ETH_P_IP)) {
++			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
++			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
++			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
++			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
++		}
++		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
++			/* Again, hash ipv6 addresses into a single u32. */
++			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
++			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
++			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
++		}
++
++	}
++#endif
++
++	switch(q->hash_kind) {
++	case TCA_SFQ_HASH_CLASSIC:
++		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++	case TCA_SFQ_HASH_DST:
++		return esfq_jhash_1word(q, info.dst);
++	case TCA_SFQ_HASH_SRC:
++		return esfq_jhash_1word(q, info.src);
++	case TCA_SFQ_HASH_FWMARK:
++		return esfq_jhash_1word(q, info.mark);
++#ifdef CONFIG_NET_SCH_ESFQ_NFCT
++	case TCA_SFQ_HASH_CTORIGDST:
++		return esfq_jhash_1word(q, info.ctorigdst);
++	case TCA_SFQ_HASH_CTORIGSRC:
++		return esfq_jhash_1word(q, info.ctorigsrc);
++	case TCA_SFQ_HASH_CTREPLDST:
++		return esfq_jhash_1word(q, info.ctrepldst);
++	case TCA_SFQ_HASH_CTREPLSRC:
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	case TCA_SFQ_HASH_CTNATCHG:
++	{
++		if (info.ctorigdst == info.ctreplsrc)
++			return esfq_jhash_1word(q, info.ctorigsrc);
++		return esfq_jhash_1word(q, info.ctreplsrc);
++	}
++#endif
++	default:
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
++	}
++	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
++}
++
++static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d = q->qs[x].qlen + q->depth;
++
++	p = d;
++	n = q->dep[d].next;
++	q->dep[x].next = n;
++	q->dep[x].prev = p;
++	q->dep[p].next = q->dep[n].prev = x;
++}
++
++static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++
++	if (n == p && q->max_depth == q->qs[x].qlen + 1)
++		q->max_depth--;
++
++	esfq_link(q, x);
++}
++
++static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
++{
++	esfq_index p, n;
++	int d;
++
++	n = q->dep[x].next;
++	p = q->dep[x].prev;
++	q->dep[p].next = n;
++	q->dep[n].prev = p;
++	d = q->qs[x].qlen;
++	if (q->max_depth < d)
++		q->max_depth = d;
++
++	esfq_link(q, x);
++}
++
++static unsigned int esfq_drop(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index d = q->max_depth;
++	struct sk_buff *skb;
++	unsigned int len;
++
++	/* Queue is full! Find the longest slot and
++	   drop a packet from it */
++
++	if (d > 1) {
++		esfq_index x = q->dep[d+q->depth].next;
++		skb = q->qs[x].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[x]);
++		kfree_skb(skb);
++		esfq_dec(q, x);
++		sch->q.qlen--;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	if (d == 1) {
++		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
++		d = q->next[q->tail];
++		q->next[q->tail] = q->next[d];
++		q->allot[q->next[d]] += q->quantum;
++		skb = q->qs[d].prev;
++		len = skb->len;
++		__skb_unlink(skb, &q->qs[d]);
++		kfree_skb(skb);
++		esfq_dec(q, d);
++		sch->q.qlen--;
++		q->ht[q->hash[d]] = q->depth;
++		sch->qstats.drops++;
++		sch->qstats.backlog -= len;
++		return len;
++	}
++
++	return 0;
++}
++
++static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
++{
++	unsigned hash = esfq_hash(q, skb);
++	unsigned depth = q->depth;
++	esfq_index x;
++
++	x = q->ht[hash];
++	if (x == depth) {
++		q->ht[hash] = x = q->dep[depth].next;
++		q->hash[x] = hash;
++	}
++
++	if (end == ESFQ_TAIL)
++		__skb_queue_tail(&q->qs[x], skb);
++	else
++		__skb_queue_head(&q->qs[x], skb);
++
++	esfq_inc(q, x);
++	if (q->qs[x].qlen == 1) {		/* The flow is new */
++		if (q->tail == depth) {	/* It is the first flow */
++			q->tail = x;
++			q->next[x] = x;
++			q->allot[x] = q->quantum;
++		} else {
++			q->next[x] = q->next[q->tail];
++			q->next[q->tail] = x;
++			q->tail = x;
++		}
++	}
++}
++
++static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_enqueue(skb, q, ESFQ_TAIL);
++	sch->qstats.backlog += skb->len;
++	if (++sch->q.qlen < q->limit-1) {
++		sch->bstats.bytes += skb->len;
++		sch->bstats.packets++;
++		return 0;
++	}
++
++	sch->qstats.drops++;
++	esfq_drop(sch);
++	return NET_XMIT_CN;
++}
++
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_index a;
++
++	/* No active slots */
++	if (q->tail == q->depth)
++		return NULL;
++
++	a = q->next[q->tail];
++	return skb_peek(&q->qs[a]);
++}
++
++static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
++{
++	struct sk_buff *skb;
++	unsigned depth = q->depth;
++	esfq_index a, old_a;
++
++	/* No active slots */
++	if (q->tail == depth)
++		return NULL;
++
++	a = old_a = q->next[q->tail];
++
++	/* Grab packet */
++	skb = __skb_dequeue(&q->qs[a]);
++	esfq_dec(q, a);
++
++	/* Is the slot empty? */
++	if (q->qs[a].qlen == 0) {
++		q->ht[q->hash[a]] = depth;
++		a = q->next[a];
++		if (a == old_a) {
++			q->tail = depth;
++			return skb;
++		}
++		q->next[q->tail] = a;
++		q->allot[a] += q->quantum;
++	} else if ((q->allot[a] -= skb->len) <= 0) {
++		q->tail = a;
++		a = q->next[a];
++		q->allot[a] += q->quantum;
++	}
++
++	return skb;
++}
++
++static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct sk_buff *skb;
++
++	skb = esfq_q_dequeue(q);
++	if (skb == NULL)
++		return NULL;
++	sch->q.qlen--;
++	sch->qstats.backlog -= skb->len;
++	return skb;
++}
++
++static void esfq_q_destroy(struct esfq_sched_data *q)
++{
++	del_timer(&q->perturb_timer);
++	if(q->ht)
++		kfree(q->ht);
++	if(q->dep)
++		kfree(q->dep);
++	if(q->next)
++		kfree(q->next);
++	if(q->allot)
++		kfree(q->allot);
++	if(q->hash)
++		kfree(q->hash);
++	if(q->qs)
++		kfree(q->qs);
++}
++
++static void esfq_destroy(struct Qdisc *sch)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	esfq_q_destroy(q);
++}
++
++
++static void esfq_reset(struct Qdisc* sch)
++{
++	struct sk_buff *skb;
++
++	while ((skb = esfq_dequeue(sch)) != NULL)
++		kfree_skb(skb);
++}
++
++static void esfq_perturbation(unsigned long arg)
++{
++	struct Qdisc *sch = (struct Qdisc*)arg;
++	struct esfq_sched_data *q = qdisc_priv(sch);
++
++	q->perturbation = net_random()&0x1F;
++
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++}
++
++static unsigned int esfq_check_hash(unsigned int kind)
++{
++	switch (kind) {
++	case TCA_SFQ_HASH_CTORIGDST:
++	case TCA_SFQ_HASH_CTORIGSRC:
++	case TCA_SFQ_HASH_CTREPLDST:
++	case TCA_SFQ_HASH_CTREPLSRC:
++	case TCA_SFQ_HASH_CTNATCHG:
++#ifndef CONFIG_NET_SCH_ESFQ_NFCT
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++#endif
++	case TCA_SFQ_HASH_CLASSIC:
++	case TCA_SFQ_HASH_DST:
++	case TCA_SFQ_HASH_SRC:
++	case TCA_SFQ_HASH_FWMARK:
++		return kind;
++	default:
++	{
++		if (net_ratelimit())
++			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
++		return TCA_SFQ_HASH_CLASSIC;
++	}
++	}
++}
++
++static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
++{
++	struct tc_esfq_qopt *ctl = nla_data(opt);
++	esfq_index p = ~0U/2;
++	int i;
++
++	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
++		return -EINVAL;
++
++	q->perturbation = 0;
++	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
++	q->max_depth = 0;
++	if (opt == NULL) {
++		q->perturb_period = 0;
++		q->hash_divisor = 1024;
++		q->tail = q->limit = q->depth = 128;
++
++	} else {
++		struct tc_esfq_qopt *ctl = nla_data(opt);
++		if (ctl->quantum)
++			q->quantum = ctl->quantum;
++		q->perturb_period = ctl->perturb_period*HZ;
++		q->hash_divisor = ctl->divisor ? : 1024;
++		q->tail = q->limit = q->depth = ctl->flows ? : 128;
++
++		if ( q->depth > p - 1 )
++			return -EINVAL;
++
++		if (ctl->limit)
++			q->limit = min_t(u32, ctl->limit, q->depth);
++
++		if (ctl->hash_kind) {
++			q->hash_kind = esfq_check_hash(ctl->hash_kind);
++		}
++	}
++
++	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->ht)
++		goto err_case;
++	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
++	if (!q->dep)
++		goto err_case;
++	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
++	if (!q->next)
++		goto err_case;
++	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
++	if (!q->allot)
++		goto err_case;
++	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
++	if (!q->hash)
++		goto err_case;
++	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
++	if (!q->qs)
++		goto err_case;
++
++	for (i=0; i< q->hash_divisor; i++)
++		q->ht[i] = q->depth;
++	for (i=0; i<q->depth; i++) {
++		skb_queue_head_init(&q->qs[i]);
++		q->dep[i+q->depth].next = i+q->depth;
++		q->dep[i+q->depth].prev = i+q->depth;
++	}
++
++	for (i=0; i<q->depth; i++)
++		esfq_link(q, i);
++	return 0;
++err_case:
++	esfq_q_destroy(q);
++	return -ENOBUFS;
++}
++
++static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	int err;
++
++	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(q, opt)))
++		return err;
++
++	init_timer(&q->perturb_timer);
++	q->perturb_timer.data = (unsigned long)sch;
++	q->perturb_timer.function = esfq_perturbation;
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	}
++
++	return 0;
++}
++
++static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	struct esfq_sched_data new;
++	struct sk_buff *skb;
++	int err;
++
++	/* set up new queue */
++	memset(&new, 0, sizeof(struct esfq_sched_data));
++	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
++	if ((err = esfq_q_init(&new, opt)))
++		return err;
++
++	/* copy all packets from the old queue to the new queue */
++	sch_tree_lock(sch);
++	while ((skb = esfq_q_dequeue(q)) != NULL)
++		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
++
++	/* clean up the old queue */
++	esfq_q_destroy(q);
++
++	/* copy elements of the new queue into the old queue */
++	q->perturb_period = new.perturb_period;
++	q->quantum        = new.quantum;
++	q->limit          = new.limit;
++	q->depth          = new.depth;
++	q->hash_divisor   = new.hash_divisor;
++	q->hash_kind      = new.hash_kind;
++	q->tail           = new.tail;
++	q->max_depth      = new.max_depth;
++	q->ht    = new.ht;
++	q->dep   = new.dep;
++	q->next  = new.next;
++	q->allot = new.allot;
++	q->hash  = new.hash;
++	q->qs    = new.qs;
++
++	/* finish up */
++	if (q->perturb_period) {
++		q->perturb_timer.expires = jiffies + q->perturb_period;
++		add_timer(&q->perturb_timer);
++	} else {
++		q->perturbation = 0;
++	}
++	sch_tree_unlock(sch);
++	return 0;
++}
++
++static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
++{
++	struct esfq_sched_data *q = qdisc_priv(sch);
++	unsigned char *b = skb_tail_pointer(skb);
++	struct tc_esfq_qopt opt;
++
++	opt.quantum = q->quantum;
++	opt.perturb_period = q->perturb_period/HZ;
++
++	opt.limit = q->limit;
++	opt.divisor = q->hash_divisor;
++	opt.flows = q->depth;
++	opt.hash_kind = q->hash_kind;
++
++	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
++		goto nla_put_failure;
++
++	return skb->len;
++
++nla_put_failure:
++	nlmsg_trim(skb, b);
++	return -1;
++}
++
++static struct Qdisc_ops esfq_qdisc_ops =
++{
++	.next		=	NULL,
++	.cl_ops		=	NULL,
++	.id		=	"esfq",
++	.priv_size	=	sizeof(struct esfq_sched_data),
++	.enqueue	=	esfq_enqueue,
++	.dequeue	=	esfq_dequeue,
++	.peek		=	esfq_peek,
++	.drop		=	esfq_drop,
++	.init		=	esfq_init,
++	.reset		=	esfq_reset,
++	.destroy	=	esfq_destroy,
++	.change		=	esfq_change,
++	.dump		=	esfq_dump,
++	.owner		=	THIS_MODULE,
++};
++
++static int __init esfq_module_init(void)
++{
++	return register_qdisc(&esfq_qdisc_ops);
++}
++static void __exit esfq_module_exit(void)
++{
++	unregister_qdisc(&esfq_qdisc_ops);
++}
++module_init(esfq_module_init)
++module_exit(esfq_module_exit)
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.8/621-sched_act_connmark.patch b/trunk/target/linux/generic/patches-3.8/621-sched_act_connmark.patch
new file mode 100644
index 00000000..0393f158
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/621-sched_act_connmark.patch
@@ -0,0 +1,172 @@
+--- /dev/null
++++ b/net/sched/act_connmark.c
+@@ -0,0 +1,137 @@
++/*
++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/skbuff.h>
++#include <linux/rtnetlink.h>
++#include <linux/pkt_cls.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++#include <net/netlink.h>
++#include <net/pkt_sched.h>
++#include <net/act_api.h>
++
++#include <net/netfilter/nf_conntrack.h>
++#include <net/netfilter/nf_conntrack_core.h>
++
++#define TCA_ACT_CONNMARK	20
++
++#define CONNMARK_TAB_MASK     3
++static struct tcf_common *tcf_connmark_ht[CONNMARK_TAB_MASK + 1];
++static u32 connmark_idx_gen;
++static DEFINE_RWLOCK(connmark_lock);
++
++static struct tcf_hashinfo connmark_hash_info = {
++	.htab	=	tcf_connmark_ht,
++	.hmask	=	CONNMARK_TAB_MASK,
++	.lock	=	&connmark_lock,
++};
++
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
++		       struct tcf_result *res)
++{
++	struct nf_conn *c;
++	enum ip_conntrack_info ctinfo;
++	int proto;
++	int r;
++
++	if (skb->protocol == htons(ETH_P_IP)) {
++		if (skb->len < sizeof(struct iphdr))
++			goto out;
++		proto = PF_INET;
++	} else if (skb->protocol == htons(ETH_P_IPV6)) {
++		if (skb->len < sizeof(struct ipv6hdr))
++			goto out;
++		proto = PF_INET6;
++	} else
++		goto out;
++
++	r = nf_conntrack_in(dev_net(skb->dev), proto, NF_INET_PRE_ROUTING, skb);
++	if (r != NF_ACCEPT)
++		goto out;
++
++	c = nf_ct_get(skb, &ctinfo);
++	if (!c)
++		goto out;
++
++	skb->mark = c->mark;
++	nf_conntrack_put(skb->nfct);
++	skb->nfct = NULL;
++
++out:
++	return TC_ACT_PIPE;
++}
++
++static int tcf_connmark_init(struct nlattr *nla, struct nlattr *est,
++			 struct tc_action *a, int ovr, int bind)
++{
++	struct tcf_common *pc;
++
++	pc = tcf_hash_create(0, est, a, sizeof(*pc), bind,
++			     &connmark_idx_gen, &connmark_hash_info);
++	if (IS_ERR(pc))
++	    return PTR_ERR(pc);
++
++	tcf_hash_insert(pc, &connmark_hash_info);
++
++	return ACT_P_CREATED;
++}
++
++static inline int tcf_connmark_cleanup(struct tc_action *a, int bind)
++{
++	if (a->priv)
++		return tcf_hash_release(a->priv, bind, &connmark_hash_info);
++	return 0;
++}
++
++static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
++				int bind, int ref)
++{
++	return skb->len;
++}
++
++static struct tc_action_ops act_connmark_ops = {
++	.kind		=	"connmark",
++	.hinfo		=	&connmark_hash_info,
++	.type		=	TCA_ACT_CONNMARK,
++	.capab		=	TCA_CAP_NONE,
++	.owner		=	THIS_MODULE,
++	.act		=	tcf_connmark,
++	.dump		=	tcf_connmark_dump,
++	.cleanup	=	tcf_connmark_cleanup,
++	.init		=	tcf_connmark_init,
++	.walk		=	tcf_generic_walker,
++};
++
++MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_DESCRIPTION("Connection tracking mark restoring");
++MODULE_LICENSE("GPL");
++
++static int __init connmark_init_module(void)
++{
++	return tcf_register_action(&act_connmark_ops);
++}
++
++static void __exit connmark_cleanup_module(void)
++{
++	tcf_unregister_action(&act_connmark_ops);
++}
++
++module_init(connmark_init_module);
++module_exit(connmark_cleanup_module);
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -670,6 +670,19 @@ config NET_ACT_CSUM
+ 	  To compile this code as a module, choose M here: the
+ 	  module will be called act_csum.
+ 
++config NET_ACT_CONNMARK
++        tristate "Connection Tracking Marking"
++        depends on NET_CLS_ACT
++        depends on NF_CONNTRACK
++	 depends on NF_CONNTRACK_MARK
++        ---help---
++	  Say Y here to restore the connmark from a scheduler action
++
++	  If unsure, say N.
++
++	  To compile this code as a module, choose M here: the
++	  module will be called act_connmark.
++
+ config NET_CLS_IND
+ 	bool "Incoming device classification"
+ 	depends on NET_CLS_U32 || NET_CLS_FW
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit
+ obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+ obj-$(CONFIG_NET_ACT_SKBEDIT)	+= act_skbedit.o
+ obj-$(CONFIG_NET_ACT_CSUM)	+= act_csum.o
++obj-$(CONFIG_NET_ACT_CONNMARK)	+= act_connmark.o
+ obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
+ obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
+ obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
diff --git a/trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch b/trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch
new file mode 100644
index 00000000..d1a9ee23
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/630-packet_socket_type.patch
@@ -0,0 +1,134 @@
+This patch allows the user to specify desired packet types (outgoing,
+broadcast, unicast, etc.) on packet sockets via setsockopt.
+This can reduce the load in situations where only a limited number
+of packet types are necessary
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/include/uapi/linux/if_packet.h
++++ b/include/uapi/linux/if_packet.h
+@@ -29,6 +29,8 @@ struct sockaddr_ll {
+ /* These ones are invisible by user level */
+ #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
+ #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
++#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
++
+ 
+ /* Packet socket options */
+ 
+@@ -51,6 +53,7 @@ struct sockaddr_ll {
+ #define PACKET_TIMESTAMP		17
+ #define PACKET_FANOUT			18
+ #define PACKET_TX_HAS_OFF		19
++#define PACKET_RECV_TYPE		20
+ 
+ #define PACKET_FANOUT_HASH		0
+ #define PACKET_FANOUT_LB		1
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -1273,6 +1273,7 @@ static int packet_rcv_spkt(struct sk_buf
+ {
+ 	struct sock *sk;
+ 	struct sockaddr_pkt *spkt;
++	struct packet_sock *po;
+ 
+ 	/*
+ 	 *	When we registered the protocol we saved the socket in the data
+@@ -1280,6 +1281,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 */
+ 
+ 	sk = pt->af_packet_priv;
++	po = pkt_sk(sk);
+ 
+ 	/*
+ 	 *	Yank back the headers [hope the device set this
+@@ -1292,7 +1294,7 @@ static int packet_rcv_spkt(struct sk_buf
+ 	 *	so that this procedure is noop.
+ 	 */
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
+ 		goto out;
+ 
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+@@ -1498,12 +1500,12 @@ static int packet_rcv(struct sk_buff *sk
+ 	int skb_len = skb->len;
+ 	unsigned int snaplen, res;
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -1622,12 +1624,12 @@ static int tpacket_rcv(struct sk_buff *s
+ 	struct timespec ts;
+ 	struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
+ 
+-	if (skb->pkt_type == PACKET_LOOPBACK)
+-		goto drop;
+-
+ 	sk = pt->af_packet_priv;
+ 	po = pkt_sk(sk);
+ 
++	if (!(po->pkt_type & (1 << skb->pkt_type)))
++		goto drop;
++
+ 	if (!net_eq(dev_net(dev), sock_net(sk)))
+ 		goto drop;
+ 
+@@ -2539,6 +2541,7 @@ static int packet_create(struct net *net
+ 	spin_lock_init(&po->bind_lock);
+ 	mutex_init(&po->pg_vec_lock);
+ 	po->prot_hook.func = packet_rcv;
++	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
+ 
+ 	if (sock->type == SOCK_PACKET)
+ 		po->prot_hook.func = packet_rcv_spkt;
+@@ -3152,6 +3155,16 @@ packet_setsockopt(struct socket *sock, i
+ 		po->tp_tx_has_off = !!val;
+ 		return 0;
+ 	}
++        case PACKET_RECV_TYPE:
++        {
++                unsigned int val;
++                if (optlen != sizeof(val))
++                        return -EINVAL;
++                if (copy_from_user(&val, optval, sizeof(val)))
++                        return -EFAULT;
++                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
++                return 0;
++        }
+ 	default:
+ 		return -ENOPROTOOPT;
+ 	}
+@@ -3206,6 +3219,13 @@ static int packet_getsockopt(struct sock
+ 	case PACKET_VNET_HDR:
+ 		val = po->has_vnet_hdr;
+ 		break;
++	case PACKET_RECV_TYPE:
++		if (len > sizeof(unsigned int))
++			len = sizeof(unsigned int);
++		val = po->pkt_type;
++
++		data = &val;
++		break;
+ 	case PACKET_VERSION:
+ 		val = po->tp_version;
+ 		break;
+--- a/net/packet/internal.h
++++ b/net/packet/internal.h
+@@ -112,6 +112,7 @@ struct packet_sock {
+ 	unsigned int		tp_tx_has_off:1;
+ 	unsigned int		tp_tstamp;
+ 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
++	unsigned int		pkt_type;
+ };
+ 
+ static struct packet_sock *pkt_sk(struct sock *sk)
diff --git a/trunk/target/linux/generic/patches-3.8/640-bridge_no_eap_forward.patch b/trunk/target/linux/generic/patches-3.8/640-bridge_no_eap_forward.patch
new file mode 100644
index 00000000..92982aba
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/640-bridge_no_eap_forward.patch
@@ -0,0 +1,15 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -75,7 +75,11 @@ int br_handle_frame_finish(struct sk_buf
+ 
+ 	dst = NULL;
+ 
+-	if (is_broadcast_ether_addr(dest))
++	if (skb->protocol == htons(ETH_P_PAE)) {
++		skb2 = skb;
++		/* Do not forward 802.1x/EAP frames */
++		skb = NULL;
++	} else if (is_broadcast_ether_addr(dest))
+ 		skb2 = skb;
+ 	else if (is_multicast_ether_addr(dest)) {
+ 		mdst = br_mdb_get(br, skb);
diff --git a/trunk/target/linux/generic/patches-3.8/641-bridge_always_accept_eap.patch b/trunk/target/linux/generic/patches-3.8/641-bridge_always_accept_eap.patch
new file mode 100644
index 00000000..13824e07
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/641-bridge_always_accept_eap.patch
@@ -0,0 +1,11 @@
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -62,7 +62,7 @@ int br_handle_frame_finish(struct sk_buf
+ 	    br_multicast_rcv(br, p, skb))
+ 		goto drop;
+ 
+-	if (p->state == BR_STATE_LEARNING)
++	if ((p->state == BR_STATE_LEARNING) && skb->protocol != htons(ETH_P_PAE))
+ 		goto drop;
+ 
+ 	BR_INPUT_SKB_CB(skb)->brdev = br->dev;
diff --git a/trunk/target/linux/generic/patches-3.8/642-bridge_port_isolate.patch b/trunk/target/linux/generic/patches-3.8/642-bridge_port_isolate.patch
new file mode 100644
index 00000000..395dd955
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/642-bridge_port_isolate.patch
@@ -0,0 +1,103 @@
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -139,6 +139,7 @@ struct net_bridge_port
+ #define BR_BPDU_GUARD           0x00000002
+ #define BR_ROOT_BLOCK		0x00000004
+ #define BR_MULTICAST_FAST_LEAVE	0x00000008
++#define BR_ISOLATE_MODE		0x00000010
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ 	u32				multicast_startup_queries_sent;
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -159,6 +159,22 @@ BRPORT_ATTR_FLAG(hairpin_mode, BR_HAIRPI
+ BRPORT_ATTR_FLAG(bpdu_guard, BR_BPDU_GUARD);
+ BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLOCK);
+ 
++static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
++{
++	int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
++	return sprintf(buf, "%d\n", isolate_mode);
++}
++static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
++{
++	if (v)
++		p->flags |= BR_ISOLATE_MODE;
++	else
++		p->flags &= ~BR_ISOLATE_MODE;
++	return 0;
++}
++static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
++		   show_isolate_mode, store_isolate_mode);
++
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
+ {
+@@ -199,6 +215,7 @@ static const struct brport_attribute *br
+ 	&brport_attr_multicast_router,
+ 	&brport_attr_multicast_fast_leave,
+ #endif
++	&brport_attr_isolate_mode,
+ 	NULL
+ };
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -95,7 +95,8 @@ int br_handle_frame_finish(struct sk_buf
+ 			skb2 = skb;
+ 
+ 		br->dev->stats.multicast++;
+-	} else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
++	} else if ((p->flags & BR_ISOLATE_MODE) ||
++		   ((dst = __br_fdb_get(br, dest)) && dst->is_local)) {
+ 		skb2 = skb;
+ 		/* Do not forward the packet since it's local. */
+ 		skb = NULL;
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -110,7 +110,7 @@ void br_deliver(const struct net_bridge_
+ /* called with rcu_read_lock */
+ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
+ {
+-	if (should_deliver(to, skb)) {
++	if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
+ 		if (skb0)
+ 			deliver_clone(to, skb, __br_forward);
+ 		else
+@@ -165,7 +165,8 @@ out:
+ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
+ 		     struct sk_buff *skb0,
+ 		     void (*__packet_hook)(const struct net_bridge_port *p,
+-					   struct sk_buff *skb))
++					   struct sk_buff *skb),
++		     bool forward)
+ {
+ 	struct net_bridge_port *p;
+ 	struct net_bridge_port *prev;
+@@ -173,6 +174,9 @@ static void br_flood(struct net_bridge *
+ 	prev = NULL;
+ 
+ 	list_for_each_entry_rcu(p, &br->port_list, list) {
++		if (forward && (p->flags & BR_ISOLATE_MODE))
++			continue;
++
+ 		prev = maybe_deliver(prev, p, skb, __packet_hook);
+ 		if (IS_ERR(prev))
+ 			goto out;
+@@ -196,14 +200,14 @@ out:
+ /* called with rcu_read_lock */
+ void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb)
+ {
+-	br_flood(br, skb, NULL, __br_deliver);
++	br_flood(br, skb, NULL, __br_deliver, false);
+ }
+ 
+ /* called under bridge lock */
+ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
+ 		      struct sk_buff *skb2)
+ {
+-	br_flood(br, skb, skb2, __br_forward);
++	br_flood(br, skb, skb2, __br_forward, true);
+ }
+ 
+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
diff --git a/trunk/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch b/trunk/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
new file mode 100644
index 00000000..9fad8b99
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
@@ -0,0 +1,107 @@
+--- a/include/net/addrconf.h
++++ b/include/net/addrconf.h
+@@ -92,6 +92,12 @@ extern void			addrconf_join_solict(struc
+ extern void			addrconf_leave_solict(struct inet6_dev *idev,
+ 					const struct in6_addr *addr);
+ 
++extern int			(*ipv6_dev_get_saddr_hook)(struct net *net,
++						const struct net_device *dev,
++						const struct in6_addr *daddr,
++						unsigned int prefs,
++						struct in6_addr *saddr);
++
+ static inline unsigned long addrconf_timeout_fixup(u32 timeout,
+ 						   unsigned int unit)
+ {
+--- a/net/bridge/Kconfig
++++ b/net/bridge/Kconfig
+@@ -6,7 +6,6 @@ config BRIDGE
+ 	tristate "802.1d Ethernet Bridging"
+ 	select LLC
+ 	select STP
+-	depends on IPV6 || IPV6=n
+ 	---help---
+ 	  If you say Y here, then your Linux box will be able to act as an
+ 	  Ethernet bridge, which means that the different Ethernet segments it
+--- a/net/ipv6/Makefile
++++ b/net/ipv6/Makefile
+@@ -44,3 +44,4 @@ obj-y += addrconf_core.o exthdrs_core.o
+ obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
+ 
+ obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
++obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1243,7 +1243,7 @@ out:
+ 	return ret;
+ }
+ 
+-int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++static int __ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+ 		       struct in6_addr *saddr)
+ {
+@@ -1368,7 +1368,6 @@ try_nextdev:
+ 	in6_ifa_put(hiscore->ifa);
+ 	return 0;
+ }
+-EXPORT_SYMBOL(ipv6_dev_get_saddr);
+ 
+ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
+ 		    unsigned char banned_flags)
+@@ -4968,6 +4967,9 @@ int __init addrconf_init(void)
+ 
+ 	ipv6_addr_label_rtnl_register();
+ 
++	BUG_ON(ipv6_dev_get_saddr_hook != NULL);
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, __ipv6_dev_get_saddr);
++
+ 	return 0;
+ errout:
+ 	rtnl_af_unregister(&inet6_ops);
+@@ -4986,6 +4988,9 @@ void addrconf_cleanup(void)
+ 	struct net_device *dev;
+ 	int i;
+ 
++	rcu_assign_pointer(ipv6_dev_get_saddr_hook, NULL);
++	synchronize_rcu();
++
+ 	unregister_netdevice_notifier(&ipv6_dev_notf);
+ 	unregister_pernet_subsys(&addrconf_ops);
+ 	ipv6_addr_label_cleanup();
+--- /dev/null
++++ b/net/ipv6/inet6_stubs.c
+@@ -0,0 +1,33 @@
++/*
++ *      This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      as published by the Free Software Foundation; either version
++ *      2 of the License, or (at your option) any later version.
++ */
++#include <linux/export.h>
++#include <net/ipv6.h>
++
++int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr);
++
++EXPORT_SYMBOL(ipv6_dev_get_saddr_hook);
++
++int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
++			const struct in6_addr *daddr, unsigned int prefs,
++			struct in6_addr *saddr)
++{
++	int ret = -EADDRNOTAVAIL;
++	typeof(ipv6_dev_get_saddr_hook) dev_get_saddr;
++
++	rcu_read_lock();
++	dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook);
++
++	if (dev_get_saddr)
++		ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr);
++
++	rcu_read_unlock();
++	return ret;
++}
++EXPORT_SYMBOL(ipv6_dev_get_saddr);
++
diff --git a/trunk/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch b/trunk/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
new file mode 100644
index 00000000..8eb8560a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/644-bridge_optimize_netfilter_hooks.patch
@@ -0,0 +1,146 @@
+--- a/net/bridge/br_forward.c
++++ b/net/bridge/br_forward.c
+@@ -56,7 +56,7 @@ int br_dev_queue_push_xmit(struct sk_buf
+ 
+ int br_forward_finish(struct sk_buff *skb)
+ {
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ 		       br_dev_queue_push_xmit);
+ 
+ }
+@@ -75,7 +75,7 @@ static void __br_deliver(const struct ne
+ 		return;
+ 	}
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+@@ -92,7 +92,7 @@ static void __br_forward(const struct ne
+ 	skb->dev = to->dev;
+ 	skb_forward_csum(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+ 		br_forward_finish);
+ }
+ 
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -37,7 +37,7 @@ static int br_pass_frame_up(struct sk_bu
+ 	indev = skb->dev;
+ 	skb->dev = brdev;
+ 
+-	return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
++	return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+ 		       netif_receive_skb);
+ }
+ 
+@@ -184,7 +184,7 @@ rx_handler_result_t br_handle_frame(stru
+ 		}
+ 
+ 		/* Deliver packet to local host only */
+-		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
++		if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+ 			    NULL, br_handle_local_finish)) {
+ 			return RX_HANDLER_CONSUMED; /* consumed by filter */
+ 		} else {
+@@ -209,7 +209,7 @@ forward:
+ 		if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ 			skb->pkt_type = PACKET_HOST;
+ 
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ 			br_handle_frame_finish);
+ 		break;
+ 	default:
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -772,7 +772,7 @@ static void __br_multicast_send_query(st
+ 	if (port) {
+ 		__skb_push(skb, sizeof(struct ethhdr));
+ 		skb->dev = port->dev;
+-		NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++		BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 			dev_queue_xmit);
+ 	} else
+ 		netif_rx(skb);
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -73,6 +73,15 @@ static int brnf_pass_vlan_indev __read_m
+ #define IS_ARP(skb) \
+ 	(!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP))
+ 
++int brnf_call_ebtables __read_mostly = 0;
++EXPORT_SYMBOL_GPL(brnf_call_ebtables);
++
++bool br_netfilter_run_hooks(void)
++{
++	return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables |
++	       brnf_call_ebtables;
++}
++
+ static inline __be16 vlan_proto(const struct sk_buff *skb)
+ {
+ 	if (vlan_tx_tag_present(skb))
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -537,15 +537,29 @@ static inline void br_mdb_uninit(void)
+ 
+ /* br_netfilter.c */
+ #ifdef CONFIG_BRIDGE_NETFILTER
++extern int brnf_call_ebtables;
+ extern int br_netfilter_init(void);
+ extern void br_netfilter_fini(void);
+ extern void br_netfilter_rtable_init(struct net_bridge *);
++extern bool br_netfilter_run_hooks(void);
+ #else
+ #define br_netfilter_init()	(0)
+ #define br_netfilter_fini()	do { } while(0)
+ #define br_netfilter_rtable_init(x)
++#define br_netfilter_run_hooks()	false
+ #endif
+ 
++static inline int
++BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb,
++	struct net_device *in, struct net_device *out,
++	int (*okfn)(struct sk_buff *))
++{
++	if (!br_netfilter_run_hooks())
++		return okfn(skb);
++
++	return NF_HOOK(pf, hook, skb, in, out, okfn);
++}
++
+ /* br_stp.c */
+ extern void br_log_state(const struct net_bridge_port *p);
+ extern struct net_bridge_port *br_get_port(struct net_bridge *br,
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid
+ 
+ 	skb_reset_mac_header(skb);
+ 
+-	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
++	BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+ 		dev_queue_xmit);
+ }
+ 
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -2403,11 +2403,13 @@ static int __init ebtables_init(void)
+ 	}
+ 
+ 	printk(KERN_INFO "Ebtables v2.0 registered\n");
++	brnf_call_ebtables = 1;
+ 	return 0;
+ }
+ 
+ static void __exit ebtables_fini(void)
+ {
++	brnf_call_ebtables = 0;
+ 	nf_unregister_sockopt(&ebt_sockopts);
+ 	xt_unregister_target(&ebt_standard_target);
+ 	printk(KERN_INFO "Ebtables v2.0 unregistered\n");
diff --git a/trunk/target/linux/generic/patches-3.8/650-pppoe_header_pad.patch b/trunk/target/linux/generic/patches-3.8/650-pppoe_header_pad.patch
new file mode 100644
index 00000000..a89a9f3b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/ppp/pppoe.c
++++ b/drivers/net/ppp/pppoe.c
+@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 		goto end;
+ 
+ 
+-	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
++	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
+ 			   0, GFP_KERNEL);
+ 	if (!skb) {
+ 		error = -ENOMEM;
+@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
+ 	}
+ 
+ 	/* Reserve space for headers. */
+-	skb_reserve(skb, dev->hard_header_len);
++	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
+ 	skb_reset_network_header(skb);
+ 
+ 	skb->dev = dev;
diff --git a/trunk/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch b/trunk/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch
new file mode 100644
index 00000000..c21b0077
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int
+  */
+ 
+ #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ #  define LL_MAX_HEADER 128
+ # else
+ #  define LL_MAX_HEADER 96
diff --git a/trunk/target/linux/generic/patches-3.8/652-atm_header_changes.patch b/trunk/target/linux/generic/patches-3.8/652-atm_header_changes.patch
new file mode 100644
index 00000000..7e568592
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/652-atm_header_changes.patch
@@ -0,0 +1,12 @@
+--- a/include/uapi/linux/atm.h
++++ b/include/uapi/linux/atm.h
+@@ -139,6 +139,9 @@ struct atm_trafprm {
+ 	int		min_pcr;	/* minimum PCR in cells per second */
+ 	int		max_cdv;	/* maximum CDV in microseconds */
+ 	int		max_sdu;	/* maximum SDU in bytes */
++	int		scr;		/* sustained rate in cells per second */
++	int		mbs;		/* maximum burst size (MBS) in cells */
++	int		cdv;		/* Cell delay varition */
+         /* extra params for ABR */
+         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
+         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/trunk/target/linux/generic/patches-3.8/653-disable_netlink_trim.patch b/trunk/target/linux/generic/patches-3.8/653-disable_netlink_trim.patch
new file mode 100644
index 00000000..870ae944
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/653-disable_netlink_trim.patch
@@ -0,0 +1,28 @@
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -898,25 +898,7 @@ void netlink_detachskb(struct sock *sk,
+ 
+ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
+ {
+-	int delta;
+-
+ 	skb_orphan(skb);
+-
+-	delta = skb->end - skb->tail;
+-	if (delta * 2 < skb->truesize)
+-		return skb;
+-
+-	if (skb_shared(skb)) {
+-		struct sk_buff *nskb = skb_clone(skb, allocation);
+-		if (!nskb)
+-			return skb;
+-		consume_skb(skb);
+-		skb = nskb;
+-	}
+-
+-	if (!pskb_expand_head(skb, 0, -delta, allocation))
+-		skb->truesize -= delta;
+-
+ 	return skb;
+ }
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/655-increase_skb_pad.patch b/trunk/target/linux/generic/patches-3.8/655-increase_skb_pad.patch
new file mode 100644
index 00000000..9f0b3dc9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/655-increase_skb_pad.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1727,7 +1727,7 @@ static inline int pskb_network_may_pull(
+  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
+  */
+ #ifndef NET_SKB_PAD
+-#define NET_SKB_PAD	max(32, L1_CACHE_BYTES)
++#define NET_SKB_PAD	max(64, L1_CACHE_BYTES)
+ #endif
+ 
+ extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
diff --git a/trunk/target/linux/generic/patches-3.8/656-skb_reduce_truesize-helper.patch b/trunk/target/linux/generic/patches-3.8/656-skb_reduce_truesize-helper.patch
new file mode 100644
index 00000000..e538eade
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/656-skb_reduce_truesize-helper.patch
@@ -0,0 +1,41 @@
+From 4593a806e31119c5bd3faa00c7210ad862d515af Mon Sep 17 00:00:00 2001
+From: Dave Taht <dave.taht@bufferbloat.net>
+Date: Mon, 31 Dec 2012 10:02:21 -0800
+Subject: [PATCH 3/7] skb_reduce_truesize: helper function for shrinking skbs
+ whenever needed
+
+On embedded devices in particular, large queues of small packets from the rx
+path with a large truesize can exist. Reducing their size can reduce
+memory pressure. skb_reduce_truesize is a helper function for doing this,
+when needed.
+---
+ include/linux/skbuff.h |   18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1772,6 +1772,24 @@ static inline void pskb_trim_unique(stru
+ 	BUG_ON(err);
+ }
+ 
++/*
++ * Caller wants to reduce memory needs before queueing skb
++ * The (expensive) copy should not be be done in fast path.
++ */
++static inline struct sk_buff *skb_reduce_truesize(struct sk_buff *skb)
++{
++	if (skb->truesize > 2 * SKB_TRUESIZE(skb->len)) {
++		struct sk_buff *nskb;
++		nskb = skb_copy_expand(skb, skb_headroom(skb), 0,
++			GFP_ATOMIC | __GFP_NOWARN);
++		if (nskb) {
++			__kfree_skb(skb);
++			skb = nskb;
++		}
++	}
++	return skb;
++}
++
+ /**
+  *	skb_orphan - orphan a buffer
+  *	@skb: buffer to orphan
diff --git a/trunk/target/linux/generic/patches-3.8/657-qdisc_reduce_truesize.patch b/trunk/target/linux/generic/patches-3.8/657-qdisc_reduce_truesize.patch
new file mode 100644
index 00000000..93ff7ba7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/657-qdisc_reduce_truesize.patch
@@ -0,0 +1,63 @@
+From bc9fec2f87d57bdbff30d296605e24504513f65c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dave=20T=C3=A4ht?= <dave.taht@bufferbloat.net>
+Date: Mon, 17 Sep 2012 19:20:22 -0700
+Subject: [PATCH 4/7] net: add skb_reduce_truesize support to common qdiscs
+
+Reduce skb size under load when queues begin to fill on the
+commont qdiscs.
+---
+ net/sched/sch_codel.c    |    2 ++
+ net/sched/sch_fifo.c     |   12 ++++++++----
+ net/sched/sch_fq_codel.c |    2 ++
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+--- a/net/sched/sch_codel.c
++++ b/net/sched/sch_codel.c
+@@ -96,6 +96,8 @@ static int codel_qdisc_enqueue(struct sk
+ 	struct codel_sched_data *q;
+ 
+ 	if (likely(qdisc_qlen(sch) < sch->limit)) {
++		if(qdisc_qlen(sch) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		codel_set_enqueue_time(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+ 	}
+--- a/net/sched/sch_fifo.c
++++ b/net/sched/sch_fifo.c
+@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff
+ 
+ static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	return qdisc_reshape_fail(skb, sch);
+ }
+ 
+ static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+ {
+-	if (likely(skb_queue_len(&sch->q) < sch->limit))
++	if (likely(skb_queue_len(&sch->q) < sch->limit)) {
++		if (skb_queue_len(&sch->q) > 128)
++			skb = skb_reduce_truesize(skb);
+ 		return qdisc_enqueue_tail(skb, sch);
+-
++	}
+ 	/* queue full, remove one skb to fulfill the limit */
+ 	__qdisc_queue_drop_head(sch, &sch->q);
+ 	sch->qstats.drops++;
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -182,6 +182,8 @@ static int fq_codel_enqueue(struct sk_bu
+ 		return ret;
+ 	}
+ 	idx--;
++	if (sch->q.qlen > 128)
++		skb = skb_reduce_truesize(skb);
+ 
+ 	codel_set_enqueue_time(skb);
+ 	flow = &q->flows[idx];
diff --git a/trunk/target/linux/generic/patches-3.8/660-fq_codel_defaults.patch b/trunk/target/linux/generic/patches-3.8/660-fq_codel_defaults.patch
new file mode 100644
index 00000000..c08b2191
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/660-fq_codel_defaults.patch
@@ -0,0 +1,14 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -389,9 +389,9 @@ static int fq_codel_init(struct Qdisc *s
+ 	struct fq_codel_sched_data *q = qdisc_priv(sch);
+ 	int i;
+ 
+-	sch->limit = 10*1024;
++	sch->limit = 1024;
+ 	q->flows_cnt = 1024;
+-	q->quantum = psched_mtu(qdisc_dev(sch));
++	q->quantum = 300;
+ 	q->perturbation = net_random();
+ 	INIT_LIST_HEAD(&q->new_flows);
+ 	INIT_LIST_HEAD(&q->old_flows);
diff --git a/trunk/target/linux/generic/patches-3.8/661-fq_codel_keep_dropped_stats.patch b/trunk/target/linux/generic/patches-3.8/661-fq_codel_keep_dropped_stats.patch
new file mode 100644
index 00000000..d51c7e58
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/661-fq_codel_keep_dropped_stats.patch
@@ -0,0 +1,10 @@
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -195,7 +195,6 @@ static int fq_codel_enqueue(struct sk_bu
+ 		list_add_tail(&flow->flowchain, &q->new_flows);
+ 		q->new_flow_count++;
+ 		flow->deficit = q->quantum;
+-		flow->dropped = 0;
+ 	}
+ 	if (++sch->q.qlen <= sch->limit)
+ 		return NET_XMIT_SUCCESS;
diff --git a/trunk/target/linux/generic/patches-3.8/662-use_fq_codel_by_default.patch b/trunk/target/linux/generic/patches-3.8/662-use_fq_codel_by_default.patch
new file mode 100644
index 00000000..25e44ad9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/662-use_fq_codel_by_default.patch
@@ -0,0 +1,75 @@
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -3,8 +3,9 @@
+ # 
+ 
+ menuconfig NET_SCHED
+-	bool "QoS and/or fair queueing"
++	def_bool y
+ 	select NET_SCH_FIFO
++	select NET_SCH_FQ_CODEL
+ 	---help---
+ 	  When the kernel has several packets to send out over a network
+ 	  device, it has to decide which ones to send first, which ones to
+--- a/net/sched/sch_fq_codel.c
++++ b/net/sched/sch_fq_codel.c
+@@ -594,7 +594,7 @@ static const struct Qdisc_class_ops fq_c
+ 	.walk		=	fq_codel_walk,
+ };
+ 
+-static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
++struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = {
+ 	.cl_ops		=	&fq_codel_class_ops,
+ 	.id		=	"fq_codel",
+ 	.priv_size	=	sizeof(struct fq_codel_sched_data),
+@@ -610,6 +610,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+ 	.dump_stats =	fq_codel_dump_stats,
+ 	.owner		=	THIS_MODULE,
+ };
++EXPORT_SYMBOL(fq_codel_qdisc_ops);
+ 
+ static int __init fq_codel_module_init(void)
+ {
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -315,6 +315,7 @@ extern struct Qdisc noop_qdisc;
+ extern struct Qdisc_ops noop_qdisc_ops;
+ extern struct Qdisc_ops pfifo_fast_ops;
+ extern struct Qdisc_ops mq_qdisc_ops;
++extern struct Qdisc_ops fq_codel_qdisc_ops;
+ 
+ struct Qdisc_class_common {
+ 	u32			classid;
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -680,7 +680,7 @@ static void attach_one_default_qdisc(str
+ 
+ 	if (dev->tx_queue_len) {
+ 		qdisc = qdisc_create_dflt(dev_queue,
+-					  &pfifo_fast_ops, TC_H_ROOT);
++					  &fq_codel_qdisc_ops, TC_H_ROOT);
+ 		if (!qdisc) {
+ 			netdev_info(dev, "activation failed\n");
+ 			return;
+--- a/net/sched/sch_mq.c
++++ b/net/sched/sch_mq.c
+@@ -57,7 +57,7 @@ static int mq_init(struct Qdisc *sch, st
+ 
+ 	for (ntx = 0; ntx < dev->num_tx_queues; ntx++) {
+ 		dev_queue = netdev_get_tx_queue(dev, ntx);
+-		qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(ntx + 1)));
+ 		if (qdisc == NULL)
+--- a/net/sched/sch_mqprio.c
++++ b/net/sched/sch_mqprio.c
+@@ -124,7 +124,7 @@ static int mqprio_init(struct Qdisc *sch
+ 
+ 	for (i = 0; i < dev->num_tx_queues; i++) {
+ 		dev_queue = netdev_get_tx_queue(dev, i);
+-		qdisc = qdisc_create_dflt(dev_queue, &pfifo_fast_ops,
++		qdisc = qdisc_create_dflt(dev_queue, &fq_codel_qdisc_ops,
+ 					  TC_H_MAKE(TC_H_MAJ(sch->handle),
+ 						    TC_H_MIN(i + 1)));
+ 		if (qdisc == NULL) {
diff --git a/trunk/target/linux/generic/patches-3.8/663-remove_pfifo_fast.patch b/trunk/target/linux/generic/patches-3.8/663-remove_pfifo_fast.patch
new file mode 100644
index 00000000..c4bfd9d2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/663-remove_pfifo_fast.patch
@@ -0,0 +1,144 @@
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -391,141 +391,6 @@ static struct Qdisc noqueue_qdisc = {
+ 	.busylock	=	__SPIN_LOCK_UNLOCKED(noqueue_qdisc.busylock),
+ };
+ 
+-
+-static const u8 prio2band[TC_PRIO_MAX + 1] = {
+-	1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
+-};
+-
+-/* 3-band FIFO queue: old style, but should be a bit faster than
+-   generic prio+fifo combination.
+- */
+-
+-#define PFIFO_FAST_BANDS 3
+-
+-/*
+- * Private data for a pfifo_fast scheduler containing:
+- * 	- queues for the three band
+- * 	- bitmap indicating which of the bands contain skbs
+- */
+-struct pfifo_fast_priv {
+-	u32 bitmap;
+-	struct sk_buff_head q[PFIFO_FAST_BANDS];
+-};
+-
+-/*
+- * Convert a bitmap to the first band number where an skb is queued, where:
+- * 	bitmap=0 means there are no skbs on any band.
+- * 	bitmap=1 means there is an skb on band 0.
+- *	bitmap=7 means there are skbs on all 3 bands, etc.
+- */
+-static const int bitmap2band[] = {-1, 0, 1, 0, 2, 0, 1, 0};
+-
+-static inline struct sk_buff_head *band2list(struct pfifo_fast_priv *priv,
+-					     int band)
+-{
+-	return priv->q + band;
+-}
+-
+-static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc)
+-{
+-	if (skb_queue_len(&qdisc->q) < qdisc_dev(qdisc)->tx_queue_len) {
+-		int band = prio2band[skb->priority & TC_PRIO_MAX];
+-		struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		priv->bitmap |= (1 << band);
+-		qdisc->q.qlen++;
+-		return __qdisc_enqueue_tail(skb, qdisc, list);
+-	}
+-
+-	return qdisc_drop(skb, qdisc);
+-}
+-
+-static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (likely(band >= 0)) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-		struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
+-
+-		qdisc->q.qlen--;
+-		if (skb_queue_empty(list))
+-			priv->bitmap &= ~(1 << band);
+-
+-		return skb;
+-	}
+-
+-	return NULL;
+-}
+-
+-static struct sk_buff *pfifo_fast_peek(struct Qdisc *qdisc)
+-{
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-	int band = bitmap2band[priv->bitmap];
+-
+-	if (band >= 0) {
+-		struct sk_buff_head *list = band2list(priv, band);
+-
+-		return skb_peek(list);
+-	}
+-
+-	return NULL;
+-}
+-
+-static void pfifo_fast_reset(struct Qdisc *qdisc)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		__qdisc_reset_queue(qdisc, band2list(priv, prio));
+-
+-	priv->bitmap = 0;
+-	qdisc->qstats.backlog = 0;
+-	qdisc->q.qlen = 0;
+-}
+-
+-static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
+-{
+-	struct tc_prio_qopt opt = { .bands = PFIFO_FAST_BANDS };
+-
+-	memcpy(&opt.priomap, prio2band, TC_PRIO_MAX + 1);
+-	if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt))
+-		goto nla_put_failure;
+-	return skb->len;
+-
+-nla_put_failure:
+-	return -1;
+-}
+-
+-static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
+-{
+-	int prio;
+-	struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
+-
+-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
+-		skb_queue_head_init(band2list(priv, prio));
+-
+-	/* Can by-pass the queue discipline */
+-	qdisc->flags |= TCQ_F_CAN_BYPASS;
+-	return 0;
+-}
+-
+-struct Qdisc_ops pfifo_fast_ops __read_mostly = {
+-	.id		=	"pfifo_fast",
+-	.priv_size	=	sizeof(struct pfifo_fast_priv),
+-	.enqueue	=	pfifo_fast_enqueue,
+-	.dequeue	=	pfifo_fast_dequeue,
+-	.peek		=	pfifo_fast_peek,
+-	.init		=	pfifo_fast_init,
+-	.reset		=	pfifo_fast_reset,
+-	.dump		=	pfifo_fast_dump,
+-	.owner		=	THIS_MODULE,
+-};
+-EXPORT_SYMBOL(pfifo_fast_ops);
+-
+ static struct lock_class_key qdisc_tx_busylock;
+ 
+ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
diff --git a/trunk/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/trunk/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
new file mode 100644
index 00000000..942b6ca5
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -0,0 +1,241 @@
+--- a/include/net/netns/ipv6.h
++++ b/include/net/netns/ipv6.h
+@@ -54,6 +54,7 @@ struct netns_ipv6 {
+ 	unsigned long		 ip6_rt_last_gc;
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	struct rt6_info         *ip6_prohibit_entry;
++	struct rt6_info		*ip6_failed_policy_entry;
+ 	struct rt6_info         *ip6_blk_hole_entry;
+ 	struct fib6_table       *fib6_local_tbl;
+ 	struct fib_rules_ops    *fib6_rules_ops;
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -64,6 +64,10 @@ enum {
+ 	FR_ACT_BLACKHOLE,	/* Drop without notification */
+ 	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
+ 	FR_ACT_PROHIBIT,	/* Drop with EACCES */
++	FR_ACT_RES9,
++	FR_ACT_RES10,
++	FR_ACT_RES11,
++	FR_ACT_FAILED_POLICY,	/* Drop with EPERM */
+ 	__FR_ACT_MAX,
+ };
+ 
+--- a/include/uapi/linux/icmpv6.h
++++ b/include/uapi/linux/icmpv6.h
+@@ -115,6 +115,7 @@ struct icmp6hdr {
+ #define ICMPV6_NOT_NEIGHBOUR		2
+ #define ICMPV6_ADDR_UNREACH		3
+ #define ICMPV6_PORT_UNREACH		4
++#define ICMPV6_FAILED_POLICY		5
+ 
+ /*
+  *	Codes for Time Exceeded
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -203,6 +203,7 @@ enum {
+ 	RTN_THROW,		/* Not in this table		*/
+ 	RTN_NAT,		/* Translate this address	*/
+ 	RTN_XRESOLVE,		/* Use external resolver	*/
++	RTN_FAILED_POLICY,	/* Failed ingress/egress policy */
+ 	__RTN_MAX
+ };
+ 
+--- a/net/ipv4/fib_rules.c
++++ b/net/ipv4/fib_rules.c
+@@ -84,6 +84,10 @@ static int fib4_rule_action(struct fib_r
+ 		err = -EACCES;
+ 		goto errout;
+ 
++	case FR_ACT_FAILED_POLICY:
++		err = -EPERM;
++		goto errout;
++
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+ 		err = -EINVAL;
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX
+ 		.error	= -EINVAL,
+ 		.scope	= RT_SCOPE_NOWHERE,
+ 	},
++	[RTN_FAILED_POLICY] = {
++		.error	= -EPERM,
++		.scope	= RT_SCOPE_UNIVERSE,
++	},
+ };
+ 
+ static void rt_fibinfo_free(struct rtable __rcu **rtp)
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2350,6 +2350,7 @@ static const char *const rtn_type_names[
+ 	[RTN_THROW] = "THROW",
+ 	[RTN_NAT] = "NAT",
+ 	[RTN_XRESOLVE] = "XRESOLVE",
++	[RTN_FAILED_POLICY] = "FAILED_POLICY",
+ };
+ 
+ static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
+--- a/net/ipv4/ipmr.c
++++ b/net/ipv4/ipmr.c
+@@ -181,6 +181,7 @@ static int ipmr_rule_action(struct fib_r
+ 	case FR_ACT_UNREACHABLE:
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
++	case FR_ACT_FAILED_POLICY:
+ 		return -EACCES;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+--- a/net/ipv6/fib6_rules.c
++++ b/net/ipv6/fib6_rules.c
+@@ -69,6 +69,9 @@ static int fib6_rule_action(struct fib_r
+ 	case FR_ACT_PROHIBIT:
+ 		rt = net->ipv6.ip6_prohibit_entry;
+ 		goto discard_pkt;
++	case FR_ACT_FAILED_POLICY:
++		rt = net->ipv6.ip6_failed_policy_entry;
++		goto discard_pkt;
+ 	}
+ 
+ 	table = fib6_get_table(net, rule->table);
+--- a/net/ipv6/ip6mr.c
++++ b/net/ipv6/ip6mr.c
+@@ -166,6 +166,8 @@ static int ip6mr_rule_action(struct fib_
+ 		return -ENETUNREACH;
+ 	case FR_ACT_PROHIBIT:
+ 		return -EACCES;
++	case FR_ACT_FAILED_POLICY:
++		return -EPERM;
+ 	case FR_ACT_BLACKHOLE:
+ 	default:
+ 		return -EINVAL;
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -258,6 +258,24 @@ static const struct rt6_info ip6_prohibi
+ 	.rt6i_ref	= ATOMIC_INIT(1),
+ };
+ 
++static int ip6_pkt_failed_policy(struct sk_buff *skb);
++static int ip6_pkt_failed_policy_out(struct sk_buff *skb);
++
++static const struct rt6_info ip6_failed_policy_entry_template = {
++	.dst = {
++		.__refcnt	= ATOMIC_INIT(1),
++		.__use		= 1,
++		.obsolete	= DST_OBSOLETE_FORCE_CHK,
++		.error		= -EPERM,
++		.input		= ip6_pkt_failed_policy,
++		.output		= ip6_pkt_failed_policy_out,
++	},
++	.rt6i_flags	= (RTF_REJECT | RTF_NONEXTHOP),
++	.rt6i_protocol	= RTPROT_KERNEL,
++	.rt6i_metric	= ~(u32) 0,
++	.rt6i_ref	= ATOMIC_INIT(1),
++};
++
+ static const struct rt6_info ip6_blk_hole_entry_template = {
+ 	.dst = {
+ 		.__refcnt	= ATOMIC_INIT(1),
+@@ -1516,6 +1534,9 @@ int ip6_route_add(struct fib6_config *cf
+ 		case RTN_THROW:
+ 			rt->dst.error = -EAGAIN;
+ 			break;
++		case RTN_FAILED_POLICY:
++			rt->dst.error = -EPERM;
++			break;
+ 		default:
+ 			rt->dst.error = -ENETUNREACH;
+ 			break;
+@@ -2110,6 +2131,17 @@ static int ip6_pkt_prohibit_out(struct s
+ 	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
+ }
+ 
++static int ip6_pkt_failed_policy(struct sk_buff *skb)
++{
++	return ip6_pkt_drop(skb, ICMPV6_FAILED_POLICY, IPSTATS_MIB_INNOROUTES);
++}
++
++static int ip6_pkt_failed_policy_out(struct sk_buff *skb)
++{
++	skb->dev = skb_dst(skb)->dev;
++	return ip6_pkt_drop(skb, ICMPV6_FAILED_POLICY, IPSTATS_MIB_OUTNOROUTES);
++}
++
+ #endif
+ 
+ /*
+@@ -2321,7 +2353,8 @@ static int rtm_to_fib6_config(struct sk_
+ 	if (rtm->rtm_type == RTN_UNREACHABLE ||
+ 	    rtm->rtm_type == RTN_BLACKHOLE ||
+ 	    rtm->rtm_type == RTN_PROHIBIT ||
+-	    rtm->rtm_type == RTN_THROW)
++	    rtm->rtm_type == RTN_THROW ||
++	    rtm->rtm_type == RTN_FAILED_POLICY)
+ 		cfg->fc_flags |= RTF_REJECT;
+ 
+ 	if (rtm->rtm_type == RTN_LOCAL)
+@@ -2524,6 +2557,9 @@ static int rt6_fill_node(struct net *net
+ 		case -EACCES:
+ 			rtm->rtm_type = RTN_PROHIBIT;
+ 			break;
++		case -EPERM:
++			rtm->rtm_type = RTN_FAILED_POLICY;
++			break;
+ 		case -EAGAIN:
+ 			rtm->rtm_type = RTN_THROW;
+ 			break;
+@@ -2775,6 +2811,8 @@ static int ip6_route_dev_notify(struct n
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
+ 		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
++		net->ipv6.ip6_failed_policy_entry->dst.dev = dev;
++		net->ipv6.ip6_failed_policy_entry->rt6i_idev = in6_dev_get(dev);
+ 		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
+ 		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
+ #endif
+@@ -3037,6 +3075,17 @@ static int __net_init ip6_route_net_init
+ 	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
+ 	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
+ 			 ip6_template_metrics, true);
++
++	net->ipv6.ip6_failed_policy_entry =
++		kmemdup(&ip6_failed_policy_entry_template,
++			sizeof(*net->ipv6.ip6_failed_policy_entry), GFP_KERNEL);
++	if (!net->ipv6.ip6_failed_policy_entry)
++		goto out_ip6_blk_hole_entry;
++	net->ipv6.ip6_failed_policy_entry->dst.path =
++		(struct dst_entry *)net->ipv6.ip6_failed_policy_entry;
++	net->ipv6.ip6_failed_policy_entry->dst.ops = &net->ipv6.ip6_dst_ops;
++	dst_init_metrics(&net->ipv6.ip6_failed_policy_entry->dst,
++			 ip6_template_metrics, true);
+ #endif
+ 
+ 	net->ipv6.sysctl.flush_delay = 0;
+@@ -3055,6 +3104,8 @@ out:
+ 	return ret;
+ 
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
++out_ip6_blk_hole_entry:
++	kfree(net->ipv6.ip6_blk_hole_entry);
+ out_ip6_prohibit_entry:
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ out_ip6_null_entry:
+@@ -3072,6 +3123,7 @@ static void __net_exit ip6_route_net_exi
+ #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+ 	kfree(net->ipv6.ip6_prohibit_entry);
+ 	kfree(net->ipv6.ip6_blk_hole_entry);
++	kfree(net->ipv6.ip6_failed_policy_entry);
+ #endif
+ 	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
+ }
+@@ -3168,6 +3220,9 @@ int __init ip6_route_init(void)
+ 	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
+ 	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
+ 	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
++	init_net.ipv6.ip6_failed_policy_entry->dst.dev = init_net.loopback_dev;
++	init_net.ipv6.ip6_failed_policy_entry->rt6i_idev =
++		in6_dev_get(init_net.loopback_dev);
+   #endif
+ 	ret = fib6_init();
+ 	if (ret)
diff --git a/trunk/target/linux/generic/patches-3.8/700-swconfig.patch b/trunk/target/linux/generic/patches-3.8/700-swconfig.patch
new file mode 100644
index 00000000..654172e7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/700-swconfig.patch
@@ -0,0 +1,39 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -13,6 +13,16 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config SWCONFIG
++	tristate "Switch configuration API"
++	---help---
++	  Switch configuration API using netlink. This allows
++	  you to configure the VLAN features of certain switches.
++
++config SWCONFIG_LEDS
++	bool "Switch LED trigger support"
++	depends on (SWCONFIG && LEDS_TRIGGERS)
++
+ comment "MII PHY device drivers"
+ 
+ config AT803X_PHY
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -3,6 +3,7 @@
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
++obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
+ obj-$(CONFIG_CICADA_PHY)	+= cicada.o
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -357,6 +357,7 @@ header-y += stddef.h
+ header-y += string.h
+ header-y += suspend_ioctls.h
+ header-y += swab.h
++header-y += switch.h
+ header-y += synclink.h
+ header-y += sysctl.h
+ header-y += sysinfo.h
diff --git a/trunk/target/linux/generic/patches-3.8/701-phy_extension.patch b/trunk/target/linux/generic/patches-3.8/701-phy_extension.patch
new file mode 100644
index 00000000..45464ac7
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/701-phy_extension.patch
@@ -0,0 +1,72 @@
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -301,6 +301,50 @@ int phy_ethtool_gset(struct phy_device *
+ }
+ EXPORT_SYMBOL(phy_ethtool_gset);
+ 
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
++{
++	u32 cmd;
++	int tmp;
++	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
++	struct ethtool_value edata = { ETHTOOL_GLINK };
++
++	if (get_user(cmd, (u32 *) useraddr))
++		return -EFAULT;
++
++	switch (cmd) {
++	case ETHTOOL_GSET:
++		phy_ethtool_gset(phydev, &ecmd);
++		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
++			return -EFAULT;
++		return 0;
++
++	case ETHTOOL_SSET:
++		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
++			return -EFAULT;
++		return phy_ethtool_sset(phydev, &ecmd);
++
++	case ETHTOOL_NWAY_RST:
++		/* if autoneg is off, it's an error */
++		tmp = phy_read(phydev, MII_BMCR);
++		if (tmp & BMCR_ANENABLE) {
++			tmp |= (BMCR_ANRESTART);
++			phy_write(phydev, MII_BMCR, tmp);
++			return 0;
++		}
++		return -EINVAL;
++
++	case ETHTOOL_GLINK:
++		edata.data = (phy_read(phydev,
++				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
++		if (copy_to_user(useraddr, &edata, sizeof(edata)))
++			return -EFAULT;
++		return 0;
++	}
++
++	return -EOPNOTSUPP;
++}
++EXPORT_SYMBOL(phy_ethtool_ioctl);
++
+ /**
+  * phy_mii_ioctl - generic PHY MII ioctl interface
+  * @phydev: the phy_device struct
+@@ -476,7 +520,7 @@ static void phy_force_reduction(struct p
+ 	int idx;
+ 
+ 	idx = phy_find_setting(phydev->speed, phydev->duplex);
+-	
++
+ 	idx++;
+ 
+ 	idx = phy_find_valid(idx, phydev->supported);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -542,6 +542,7 @@ void phy_start_machine(struct phy_device
+ void phy_stop_machine(struct phy_device *phydev);
+ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
++int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
+ int phy_mii_ioctl(struct phy_device *phydev,
+ 		struct ifreq *ifr, int cmd);
+ int phy_start_interrupts(struct phy_device *phydev);
diff --git a/trunk/target/linux/generic/patches-3.8/702-phy_add_aneg_done_function.patch b/trunk/target/linux/generic/patches-3.8/702-phy_add_aneg_done_function.patch
new file mode 100644
index 00000000..8e444360
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,45 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -408,9 +408,18 @@ struct phy_driver {
+ 	 */
+ 	int (*config_aneg)(struct phy_device *phydev);
+ 
++	/* Determine if autonegotiation is done */
++	int (*aneg_done)(struct phy_device *phydev);
++
+ 	/* Determines the negotiated speed and duplex */
+ 	int (*read_status)(struct phy_device *phydev);
+ 
++	/* 
++	 * Update the value in phydev->link to reflect the 
++	 * current link value
++	 */
++	int (*update_link)(struct phy_device *phydev);
++
+ 	/* Clears any pending interrupts */
+ 	int (*ack_interrupt)(struct phy_device *phydev);
+ 
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -796,6 +796,9 @@ int genphy_update_link(struct phy_device
+ {
+ 	int status;
+ 
++	if (phydev->drv->update_link)
++		return phydev->drv->update_link(phydev);
++
+ 	/* Do a fake read */
+ 	status = phy_read(phydev, MII_BMSR);
+ 
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -108,6 +108,9 @@ static inline int phy_aneg_done(struct p
+ {
+ 	int retval;
+ 
++	if (phydev->drv->aneg_done)
++		return phydev->drv->aneg_done(phydev);
++
+ 	retval = phy_read(phydev, MII_BMSR);
+ 
+ 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/trunk/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch b/trunk/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 00000000..b98f3533
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++	if (phydev->drv && phydev->drv->detach)
++		phydev->drv->detach(phydev);
++
+ 	phydev->attached_dev->phydev = NULL;
+ 	phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+ 	 */
+ 	int (*did_interrupt)(struct phy_device *phydev);
+ 
++	/*
++	 * Called before an ethernet device is detached
++	 * from the PHY.
++	 */
++	void (*detach)(struct phy_device *phydev);
++
+ 	/* Clears up any memory if needed */
+ 	void (*remove)(struct phy_device *phydev);
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch b/trunk/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
new file mode 100644
index 00000000..9a68feac
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
@@ -0,0 +1,191 @@
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -41,6 +41,8 @@
+ #include <asm/irq.h>
+ #include <asm/uaccess.h>
+ 
++#include "mdio-boardinfo.h"
++
+ /**
+  * mdiobus_alloc_size - allocate a mii_bus structure
+  * @size: extra amount of memory to allocate for private storage.
+@@ -229,15 +231,33 @@ void mdiobus_free(struct mii_bus *bus)
+ }
+ EXPORT_SYMBOL(mdiobus_free);
+ 
++static void mdiobus_setup_phydev_from_boardinfo(struct mii_bus *bus,
++						struct phy_device *phydev,
++						struct mdio_board_info *bi)
++{
++	if (strcmp(bus->id, bi->bus_id) ||
++	    bi->phy_addr != phydev->addr)
++	    return;
++
++	phydev->dev.platform_data = (void *) bi->platform_data;
++}
++
+ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
+ {
+ 	struct phy_device *phydev;
++	struct mdio_board_entry *be;
+ 	int err;
+ 
+ 	phydev = get_phy_device(bus, addr, false);
+ 	if (IS_ERR(phydev) || phydev == NULL)
+ 		return phydev;
+ 
++	mutex_lock(&__mdio_board_lock);
++	list_for_each_entry(be, &__mdio_board_list, list)
++		mdiobus_setup_phydev_from_boardinfo(bus, phydev,
++						    &be->board_info);
++	mutex_unlock(&__mdio_board_lock);
++
+ 	err = phy_device_register(phydev);
+ 	if (err) {
+ 		phy_device_free(phydev);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -581,4 +581,22 @@ int __init mdio_bus_init(void);
+ void mdio_bus_exit(void);
+ 
+ extern struct bus_type mdio_bus_type;
++
++struct mdio_board_info {
++	const char	*bus_id;
++	int		phy_addr;
++
++	const void	*platform_data;
++};
++
++#ifdef CONFIG_MDIO_BOARDINFO
++int mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n);
++#else
++static inline int
++mdiobus_register_board_info(const struct mdio_board_info *info, unsigned n)
++{
++	return 0;
++}
++#endif
++
+ #endif /* __PHY_H */
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -13,6 +13,10 @@ menuconfig PHYLIB
+ 
+ if PHYLIB
+ 
++config MDIO_BOARDINFO
++	bool
++	default y
++
+ config SWCONFIG
+ 	tristate "Switch configuration API"
+ 	---help---
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -2,6 +2,8 @@
+ 
+ libphy-objs			:= phy.o phy_device.o mdio_bus.o
+ 
++obj-$(CONFIG_MDIO_BOARDINFO)	+= mdio-boardinfo.o
++
+ obj-$(CONFIG_PHYLIB)		+= libphy.o
+ obj-$(CONFIG_SWCONFIG)		+= swconfig.o
+ obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.c
+@@ -0,0 +1,58 @@
++/*
++ * mdio-boardinfo.c - collect pre-declarations of PHY devices
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/phy.h>
++#include <linux/slab.h>
++#include <linux/export.h>
++#include <linux/mutex.h>
++#include <linux/phy.h>
++
++#include "mdio-boardinfo.h"
++
++/*
++ * These symbols are exported ONLY FOR the mdio_bus component.
++ * No other users will be supported.
++ */
++
++LIST_HEAD(__mdio_board_list);
++EXPORT_SYMBOL_GPL(__mdio_board_list);
++
++DEFINE_MUTEX(__mdio_board_lock);
++EXPORT_SYMBOL_GPL(__mdio_board_lock);
++
++/**
++ * mdio_register_board_info - register PHY devices for a given board
++ * @info: array of chip descriptors
++ * @n: how many descriptors are provided
++ * Context: can sleep
++ *
++ * The board info passed can safely be __initdata ... but be careful of
++ * any embedded pointers (platform_data, etc), they're copied as-is.
++ */
++int __init
++mdiobus_register_board_info(struct mdio_board_info const *info, unsigned n)
++{
++	struct mdio_board_entry *be;
++	int i;
++
++	be = kzalloc(n * sizeof(*be), GFP_KERNEL);
++	if (!be)
++		return -ENOMEM;
++
++	for (i = 0; i < n; i++, be++, info++) {
++		memcpy(&be->board_info, info, sizeof(*info));
++		mutex_lock(&__mdio_board_lock);
++		list_add_tail(&be->list, &__mdio_board_list);
++		mutex_unlock(&__mdio_board_lock);
++	}
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/net/phy/mdio-boardinfo.h
+@@ -0,0 +1,22 @@
++/*
++ * mdio-boardinfo.h - boardinfo interface internal to the mdio_bus component
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/mutex.h>
++
++struct mdio_board_entry {
++	struct list_head	list;
++	struct mdio_board_info	board_info;
++};
++
++/* __mdio_board_lock protects __mdio_board_list
++ * only mdio_bus components are allowed to use these symbols.
++ */
++extern struct mutex __mdio_board_lock;
++extern struct list_head __mdio_board_list;
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -15,7 +15,7 @@ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_NET) += Space.o loopback.o
+ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+-obj-$(CONFIG_PHYLIB) += phy/
++obj-y += phy/
+ obj-$(CONFIG_RIONET) += rionet.o
+ obj-$(CONFIG_NET_TEAM) += team/
+ obj-$(CONFIG_TUN) += tun.o
diff --git a/trunk/target/linux/generic/patches-3.8/720-phy_adm6996.patch b/trunk/target/linux/generic/patches-3.8/720-phy_adm6996.patch
new file mode 100644
index 00000000..04d49e9c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/720-phy_adm6996.patch
@@ -0,0 +1,26 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -121,6 +121,13 @@ config MICREL_PHY
+ 	---help---
+ 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
+ 
++config ADM6996_PHY
++	tristate "Driver for ADM6996 switches"
++	select SWCONFIG
++	---help---
++	  Currently supports the ADM6996FC and ADM6996M switches.
++	  Support for FC is very limited.
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
+ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
++obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.8/721-phy_packets.patch b/trunk/target/linux/generic/patches-3.8/721-phy_packets.patch
new file mode 100644
index 00000000..d17f16ed
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/721-phy_packets.patch
@@ -0,0 +1,175 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -1093,6 +1093,11 @@ struct net_device {
+ 	const struct net_device_ops *netdev_ops;
+ 	const struct ethtool_ops *ethtool_ops;
+ 
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);
++	struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);
++#endif
++
+ 	/* Hardware header description */
+ 	const struct header_ops *header_ops;
+ 
+@@ -1149,6 +1154,9 @@ struct net_device {
+ 	void			*ax25_ptr;	/* AX.25 specific data */
+ 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
+ 						   assign before registering */
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	void			*phy_ptr; /* PHY device specific data */
++#endif
+ 
+ /*
+  * Cache lines mostly used on receive path (including eth_type_trans())
+--- a/include/uapi/linux/if.h
++++ b/include/uapi/linux/if.h
+@@ -83,6 +83,7 @@
+ #define IFF_SUPP_NOFCS	0x80000		/* device supports sending custom FCS */
+ #define IFF_LIVE_ADDR_CHANGE 0x100000	/* device supports hardware address
+ 					 * change when it's running */
++#define IFF_NO_IP_ALIGN	0x200000	/* do not ip-align allocated rx pkts */
+ 
+ 
+ #define IF_GET_IFACE	0x0001		/* for querying only */
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1757,6 +1757,10 @@ static inline int pskb_trim(struct sk_bu
+ 	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
+ }
+ 
++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp);
++
++
+ /**
+  *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
+  *	@skb: buffer to alter
+@@ -1877,16 +1881,6 @@ static inline struct sk_buff *dev_alloc_
+ }
+ 
+ 
+-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
+-		unsigned int length, gfp_t gfp)
+-{
+-	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
+-
+-	if (NET_IP_ALIGN && skb)
+-		skb_reserve(skb, NET_IP_ALIGN);
+-	return skb;
+-}
+-
+ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+ 		unsigned int length)
+ {
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -23,6 +23,12 @@ menuconfig NET
+ 
+ if NET
+ 
++config ETHERNET_PACKET_MANGLE
++	bool
++	help
++	  This option can be selected by phy drivers that need to mangle
++	  packets going in or out of an ethernet device.
++
+ config WANT_COMPAT_NETLINK_MESSAGES
+ 	bool
+ 	help
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2364,9 +2364,19 @@ int dev_hard_start_xmit(struct sk_buff *
+ 		if (!list_empty(&ptype_all))
+ 			dev_queue_xmit_nit(skb, dev);
+ 
+-		skb_len = skb->len;
+-		rc = ops->ndo_start_xmit(skb, dev);
+-		trace_net_dev_xmit(skb, rc, dev, skb_len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = skb->len;
++			rc = ops->ndo_start_xmit(skb, dev);
++			trace_net_dev_xmit(skb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (rc == NETDEV_TX_OK)
+ 			txq_trans_update(txq);
+ 		return rc;
+@@ -2389,9 +2399,19 @@ gso:
+ 		if (!list_empty(&ptype_all))
+ 			dev_queue_xmit_nit(nskb, dev);
+ 
+-		skb_len = nskb->len;
+-		rc = ops->ndo_start_xmit(nskb, dev);
+-		trace_net_dev_xmit(nskb, rc, dev, skb_len);
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++		if (!dev->eth_mangle_tx ||
++		    (nskb = dev->eth_mangle_tx(dev, nskb)) != NULL)
++#else
++		if (1)
++#endif
++		{
++			skb_len = nskb->len;
++			rc = ops->ndo_start_xmit(nskb, dev);
++			trace_net_dev_xmit(nskb, rc, dev, skb_len);
++		} else {
++			rc = NETDEV_TX_OK;
++		}
+ 		if (unlikely(rc != NETDEV_TX_OK)) {
+ 			if (rc & ~NETDEV_TX_MASK)
+ 				goto out_kfree_gso_skb;
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -60,6 +60,7 @@
+ #include <linux/scatterlist.h>
+ #include <linux/errqueue.h>
+ #include <linux/prefetch.h>
++#include <linux/if.h>
+ 
+ #include <net/protocol.h>
+ #include <net/dst.h>
+@@ -455,6 +456,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+ }
+ EXPORT_SYMBOL(__netdev_alloc_skb);
+ 
++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,
++		unsigned int length, gfp_t gfp)
++{
++	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
++		return skb;
++#endif
++
++	if (NET_IP_ALIGN && skb)
++		skb_reserve(skb, NET_IP_ALIGN);
++	return skb;
++}
++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);
++
+ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 		     int size, unsigned int truesize)
+ {
+--- a/net/ethernet/eth.c
++++ b/net/ethernet/eth.c
+@@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+ 	struct ethhdr *eth;
+ 
+ 	skb->dev = dev;
++
++#ifdef CONFIG_ETHERNET_PACKET_MANGLE
++	if (dev->eth_mangle_rx)
++		dev->eth_mangle_rx(dev, skb);
++#endif
++
+ 	skb_reset_mac_header(skb);
+ 	skb_pull_inline(skb, ETH_HLEN);
+ 	eth = eth_hdr(skb);
diff --git a/trunk/target/linux/generic/patches-3.8/722-phy_mvswitch.patch b/trunk/target/linux/generic/patches-3.8/722-phy_mvswitch.patch
new file mode 100644
index 00000000..fe6a7d31
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/722-phy_mvswitch.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -128,6 +128,10 @@ config ADM6996_PHY
+ 	  Currently supports the ADM6996FC and ADM6996M switches.
+ 	  Support for FC is very limited.
+ 
++config MVSWITCH_PHY
++	tristate "Driver for Marvell 88E6060 switches"
++	select ETHERNET_PACKET_MANGLE
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
+ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
++obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.8/723-phy_ip175c.patch b/trunk/target/linux/generic/patches-3.8/723-phy_ip175c.patch
new file mode 100644
index 00000000..0d84caf2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/723-phy_ip175c.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -132,6 +132,10 @@ config MVSWITCH_PHY
+ 	tristate "Driver for Marvell 88E6060 switches"
+ 	select ETHERNET_PACKET_MANGLE
+ 
++config IP17XX_PHY
++	tristate "Driver for IC+ IP17xx switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
++obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.8/724-phy_ar8216.patch b/trunk/target/linux/generic/patches-3.8/724-phy_ar8216.patch
new file mode 100644
index 00000000..d196032b
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/724-phy_ar8216.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -136,6 +136,11 @@ config IP17XX_PHY
+ 	tristate "Driver for IC+ IP17xx switches"
+ 	select SWCONFIG
+ 
++config AR8216_PHY
++	tristate "Driver for Atheros AR8216 switches"
++	select ETHERNET_PACKET_MANGLE
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.8/725-phy_rtl8306.patch b/trunk/target/linux/generic/patches-3.8/725-phy_rtl8306.patch
new file mode 100644
index 00000000..aeab9fbb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/725-phy_rtl8306.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -141,6 +141,10 @@ config AR8216_PHY
+ 	select ETHERNET_PACKET_MANGLE
+ 	select SWCONFIG
+ 
++config RTL8306_PHY
++	tristate "Driver for Realtek RTL8306S switches"
++	select SWCONFIG
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.8/726-phy_rtl8366.patch b/trunk/target/linux/generic/patches-3.8/726-phy_rtl8366.patch
new file mode 100644
index 00000000..12f8a362
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/726-phy_rtl8366.patch
@@ -0,0 +1,45 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -215,6 +215,30 @@ config MDIO_BUS_MUX_MMIOREG
+ 
+ 	  Currently, only 8-bit registers are supported.
+ 
++config RTL8366_SMI
++	tristate "Driver for the RTL8366 SMI interface"
++	depends on GENERIC_GPIO
++	---help---
++	  This module implements the SMI interface protocol which is used
++	  by some RTL8366 ethernet switch devices via the generic GPIO API.
++
++if RTL8366_SMI
++
++config RTL8366_SMI_DEBUG_FS
++	bool "RTL8366 SMI interface debugfs support"
++        depends on DEBUG_FS
++        default n
++
++config RTL8366S_PHY
++	tristate "Driver for the Realtek RTL8366S switch"
++	select SWCONFIG
++
++config RTL8366RB_PHY
++	tristate "Driver for the Realtek RTL8366RB switch"
++	select SWCONFIG
++
++endif # RTL8366_SMI
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
++obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
++obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
++obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.8/727-phy-rtl8367.patch b/trunk/target/linux/generic/patches-3.8/727-phy-rtl8367.patch
new file mode 100644
index 00000000..a9fe6d4f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/727-phy-rtl8367.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -237,6 +237,10 @@ config RTL8366RB_PHY
+ 	tristate "Driver for the Realtek RTL8366RB switch"
+ 	select SWCONFIG
+ 
++config RTL8367_PHY
++	tristate "Driver for the Realtek RTL8367R/M switches"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
++obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/trunk/target/linux/generic/patches-3.8/728-phy-micrel.patch b/trunk/target/linux/generic/patches-3.8/728-phy-micrel.patch
new file mode 100644
index 00000000..6172e236
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/728-phy-micrel.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -145,6 +145,11 @@ config RTL8306_PHY
+ 	tristate "Driver for Realtek RTL8306S switches"
+ 	select SWCONFIG
+ 
++config MICREL_PHY
++	tristate "Drivers for Micrel/Kendin PHYs"
++	---help---
++	  Currently has a driver for the KSZ8041
++
+ config FIXED_PHY
+ 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
++obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.8/729-phy-rtl8367b.patch b/trunk/target/linux/generic/patches-3.8/729-phy-rtl8367b.patch
new file mode 100644
index 00000000..4ab329fb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/729-phy-rtl8367b.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -246,6 +246,10 @@ config RTL8367_PHY
+ 	tristate "Driver for the Realtek RTL8367R/M switches"
+ 	select SWCONFIG
+ 
++config RTL8367B_PHY
++	tristate "Driver fot the Realtek RTL8367R-VB switch"
++	select SWCONFIG
++
+ endif # RTL8366_SMI
+ 
+ endif # PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi
+ obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
+ obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
+ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
++obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/trunk/target/linux/generic/patches-3.8/729-phy-tantos.patch b/trunk/target/linux/generic/patches-3.8/729-phy-tantos.patch
new file mode 100644
index 00000000..bc8be2b0
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/729-phy-tantos.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -257,3 +257,8 @@ endif # PHYLIB
+ config MICREL_KS8995MA
+ 	tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
+ 	depends on SPI
++
++config PSB6970_PHY
++	tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
++	select SWCONFIG
++	select ETHERNET_PACKET_MANGLE
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -30,6 +30,7 @@ obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
+ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
++obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.8/730-phy_b53.patch b/trunk/target/linux/generic/patches-3.8/730-phy_b53.patch
new file mode 100644
index 00000000..75972e58
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/730-phy_b53.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -252,6 +252,8 @@ config RTL8367B_PHY
+ 
+ endif # RTL8366_SMI
+ 
++source "drivers/net/phy/b53/Kconfig"
++
+ endif # PHYLIB
+ 
+ config MICREL_KS8995MA
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -31,6 +31,7 @@ obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
+ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
+ obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
++obj-$(CONFIG_B53)		+= b53/
+ obj-$(CONFIG_FIXED_PHY)		+= fixed.o
+ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
+ obj-$(CONFIG_MDIO_GPIO)		+= mdio-gpio.o
diff --git a/trunk/target/linux/generic/patches-3.8/750-hostap_txpower.patch b/trunk/target/linux/generic/patches-3.8/750-hostap_txpower.patch
new file mode 100644
index 00000000..814406df
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/750-hostap_txpower.patch
@@ -0,0 +1,154 @@
+--- a/drivers/net/wireless/hostap/hostap_ap.c
++++ b/drivers/net/wireless/hostap/hostap_ap.c
+@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t
+ 		addr[count].sa_family = ARPHRD_ETHER;
+ 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+ 		if (sta->last_rx_silence == 0)
+-			qual[count].qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
++                                0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			qual[count].qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        qual[count].qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                qual[count].level = sta->last_rx_signal;
++                qual[count].noise = sta->last_rx_silence;
+ 		qual[count].updated = sta->last_rx_updated;
+ 
+ 		sta->last_rx_updated = IW_QUAL_DBM;
+@@ -2412,13 +2412,13 @@ int prism2_ap_translate_scan(struct net_
+ 		memset(&iwe, 0, sizeof(iwe));
+ 		iwe.cmd = IWEVQUAL;
+ 		if (sta->last_rx_silence == 0)
+-			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+-				0 : (sta->last_rx_signal - 27) * 92 / 127;
++	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
++	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
+ 		else
+-			iwe.u.qual.qual = sta->last_rx_signal -
+-				sta->last_rx_silence - 35;
+-		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+-		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
++                        iwe.u.qual.qual = (sta->last_rx_signal -
++                                sta->last_rx_silence) * 92 / 64;
++                iwe.u.qual.level = sta->last_rx_signal;
++                iwe.u.qual.noise = sta->last_rx_silence;
+ 		iwe.u.qual.updated = sta->last_rx_updated;
+ 		iwe.len = IW_EV_QUAL_LEN;
+ 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
+--- a/drivers/net/wireless/hostap/hostap_config.h
++++ b/drivers/net/wireless/hostap/hostap_config.h
+@@ -45,4 +45,9 @@
+  */
+ /* #define PRISM2_NO_STATION_MODES */
+ 
++/* Enable TX power Setting functions
++ * (min att = -128 , max att =  127)
++ */
++#define RAW_TXPOWER_SETTING
++
+ #endif /* HOSTAP_CONFIG_H */
+--- a/drivers/net/wireless/hostap/hostap.h
++++ b/drivers/net/wireless/hostap/hostap.h
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
+ extern const struct ethtool_ops prism2_ethtool_ops;
+ 
+ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++int hostap_restore_power(struct net_device *dev);
+ 
+ 
+ #endif /* HOSTAP_H */
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -928,6 +928,7 @@ static int hfa384x_set_rid(struct net_de
+ 			prism2_hw_reset(dev);
+ 	}
+ 
++	hostap_restore_power(dev);
+ 	return res;
+ }
+ 
+--- a/drivers/net/wireless/hostap/hostap_info.c
++++ b/drivers/net/wireless/hostap/hostap_info.c
+@@ -435,6 +435,11 @@ static void handle_info_queue_linkstatus
+ 	}
+ 
+ 	/* Get BSSID if we have a valid AP address */
++
++	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
++	     val == HFA384X_LINKSTATUS_DISCONNECTED )
++			hostap_restore_power(local->dev);
++
+ 	if (connected) {
+ 		netif_carrier_on(local->dev);
+ 		netif_carrier_on(local->ddev);
+--- a/drivers/net/wireless/hostap/hostap_ioctl.c
++++ b/drivers/net/wireless/hostap/hostap_ioctl.c
+@@ -1479,23 +1479,20 @@ static int prism2_txpower_hfa386x_to_dBm
+ 		val = 255;
+ 
+ 	tmp = val;
+-	tmp >>= 2;
+ 
+-	return -12 - tmp;
++	return tmp;
+ }
+ 
+ static u16 prism2_txpower_dBm_to_hfa386x(int val)
+ {
+ 	signed char tmp;
+ 
+-	if (val > 20)
+-		return 128;
+-	else if (val < -43)
++	if (val > 127)
+ 		return 127;
++	else if (val < -128)
++		return 128;
+ 
+ 	tmp = val;
+-	tmp = -12 - tmp;
+-	tmp <<= 2;
+ 
+ 	return (unsigned char) tmp;
+ }
+@@ -4052,3 +4049,35 @@ int hostap_ioctl(struct net_device *dev,
+ 
+ 	return ret;
+ }
++
++/* BUG FIX: Restore power setting value when lost due to F/W bug */
++
++int hostap_restore_power(struct net_device *dev)
++{
++        struct hostap_interface *iface = netdev_priv(dev);
++       local_info_t *local = iface->local;
++
++       u16 val;
++       int ret = 0;
++
++       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
++                       val = 0xff; /* use all standby and sleep modes */
++                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                                              HFA386X_CR_A_D_TEST_MODES2,
++                                              &val, NULL);
++       }
++
++#ifdef RAW_TXPOWER_SETTING
++       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
++               val = HFA384X_TEST_CFG_BIT_ALC;
++               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
++                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
++               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
++               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
++                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
++       }
++#endif /* RAW_TXPOWER_SETTING */
++       return (ret ? -EOPNOTSUPP : 0);
++}
++
++EXPORT_SYMBOL(hostap_restore_power);
diff --git a/trunk/target/linux/generic/patches-3.8/800-usb-ohci-multiple-platform-driver-fix.patch b/trunk/target/linux/generic/patches-3.8/800-usb-ohci-multiple-platform-driver-fix.patch
new file mode 100644
index 00000000..d691c515
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/800-usb-ohci-multiple-platform-driver-fix.patch
@@ -0,0 +1,51 @@
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1188,7 +1188,7 @@ MODULE_LICENSE ("GPL");
+ 
+ #ifdef CONFIG_USB_OHCI_HCD_PLATFORM
+ #include "ohci-platform.c"
+-#define PLATFORM_DRIVER		ohci_platform_driver
++#define OHCI_PLATFORM_DRIVER		ohci_platform_driver
+ #endif
+ 
+ #if	!defined(PCI_DRIVER) &&		\
+@@ -1199,7 +1199,8 @@ MODULE_LICENSE ("GPL");
+ 	!defined(SA1111_DRIVER) &&	\
+ 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
+ 	!defined(SM501_OHCI_DRIVER) && \
+-	!defined(TMIO_OHCI_DRIVER)
++	!defined(TMIO_OHCI_DRIVER) && \
++	!defined(OHCI_PLATFORM_DRIVER)
+ #error "missing bus glue for ohci-hcd"
+ #endif
+ 
+@@ -1277,9 +1278,19 @@ static int __init ohci_hcd_mod_init(void
+ 		goto error_tmio;
+ #endif
+ 
++#ifdef OHCI_PLATFORM_DRIVER
++	retval = platform_driver_register(&OHCI_PLATFORM_DRIVER);
++	if (retval < 0)
++		goto error_ohci;
++#endif
++
+ 	return retval;
+ 
+ 	/* Error path */
++#ifdef OHCI_PLATFORM_DRIVER
++	platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++ error_ohci:
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+ 	platform_driver_unregister(&TMIO_OHCI_DRIVER);
+  error_tmio:
+@@ -1329,6 +1340,9 @@ module_init(ohci_hcd_mod_init);
+ 
+ static void __exit ohci_hcd_mod_exit(void)
+ {
++#ifdef OHCI_PLATFORM_DRIVER
++	platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+ 	platform_driver_unregister(&TMIO_OHCI_DRIVER);
+ #endif
diff --git a/trunk/target/linux/generic/patches-3.8/810-pci_disable_common_quirks.patch b/trunk/target/linux/generic/patches-3.8/810-pci_disable_common_quirks.patch
new file mode 100644
index 00000000..cd8551bc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/810-pci_disable_common_quirks.patch
@@ -0,0 +1,51 @@
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -63,6 +63,12 @@ config XEN_PCIDEV_FRONTEND
+           The PCI device frontend driver allows the kernel to import arbitrary
+           PCI devices from a PCI backend to support PCI driver domains.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++	bool "PCI disable common quirks"
++	depends on PCI
++	help
++	  If you don't know what to do here, say N.
++
+ config HT_IRQ
+ 	bool "Interrupts on hypertransport devices"
+ 	default y
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -44,6 +44,7 @@ static void quirk_mmio_always_on(struct
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
+ 				PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -2886,6 +2887,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ static ktime_t fixup_debug_start(struct pci_dev *dev,
+ 				 void (*fn)(struct pci_dev *dev))
+@@ -2917,6 +2919,8 @@ static void fixup_debug_report(struct pc
+ 	}
+ }
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ /*
+  * Some BIOS implementations leave the Intel GPU interrupts enabled,
+  * even though no one is handling them (f.e. i915 driver is never loaded).
+@@ -2951,6 +2955,8 @@ static void disable_igfx_irq(struct pci_
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+ 
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
+ /*
+  * Some devices may pass our check in pci_intx_mask_supported if
+  * PCI_COMMAND_INTX_DISABLE works though they actually do not properly
diff --git a/trunk/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch b/trunk/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
new file mode 100644
index 00000000..59eb97bb
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/811-pci_disable_usb_common_quirks.patch
@@ -0,0 +1,80 @@
+
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -79,6 +79,8 @@
+ #define USB_INTEL_USB3_PSSEN   0xD8
+ #define USB_INTEL_USB3PRM      0xDC
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static struct amd_chipset_info {
+ 	struct pci_dev	*nb_dev;
+ 	struct pci_dev	*smbus_dev;
+@@ -353,6 +355,10 @@ void usb_amd_dev_put(void)
+ }
+ EXPORT_SYMBOL_GPL(usb_amd_dev_put);
+ 
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
++
++#if IS_ENABLED(CONFIG_USB_UHCI_HCD)
++
+ /*
+  * Make sure the controller is completely inactive, unable to
+  * generate interrupts or do DMA.
+@@ -432,8 +438,17 @@ reset_needed:
+ 	uhci_reset_hc(pdev, base);
+ 	return 1;
+ }
++#else
++int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
++{
++	return 0;
++}
++
++#endif
+ EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
++
+ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ {
+ 	u16 cmd;
+@@ -974,3 +989,4 @@ static void quirk_usb_early_handoff(stru
+ }
+ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+ 			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
++#endif /* CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+--- a/drivers/usb/host/pci-quirks.h
++++ b/drivers/usb/host/pci-quirks.h
+@@ -4,6 +4,9 @@
+ #ifdef CONFIG_PCI
+ void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);
+ int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);
++#endif  /* CONFIG_PCI */
++
++#if defined(CONFIG_PCI) && !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS)
+ int usb_amd_find_chipset_info(void);
+ void usb_amd_dev_put(void);
+ void usb_amd_quirk_pll_disable(void);
+@@ -12,10 +15,20 @@ bool usb_is_intel_switchable_xhci(struct
+ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
+ void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
+ #else
++static inline int usb_amd_find_chipset_info(void)
++{
++	return 0;
++}
+ static inline void usb_amd_quirk_pll_disable(void) {}
+ static inline void usb_amd_quirk_pll_enable(void) {}
+ static inline void usb_amd_dev_put(void) {}
++
++static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
++{
++	return false;
++}
++static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {}
+ static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
+-#endif  /* CONFIG_PCI */
++#endif
+ 
+ #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
diff --git a/trunk/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch b/trunk/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch
new file mode 100644
index 00000000..5ffd451a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/820-usb_add_usb_find_device_by_name.patch
@@ -0,0 +1,84 @@
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -644,6 +644,71 @@ int __usb_get_extra_descriptor(char *buf
+ }
+ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
+ 
++static struct usb_device *match_device_name(struct usb_device *dev,
++					    const char *name)
++{
++	struct usb_device *ret_dev = NULL;
++	struct usb_device *childdev = NULL;
++	int child;
++
++	dev_dbg(&dev->dev, "check for name %s ...\n", name);
++
++	/* see if this device matches */
++	if (strcmp(dev_name(&dev->dev), name) == 0 ) {
++		dev_dbg(&dev->dev, "matched this device!\n");
++		ret_dev = usb_get_dev(dev);
++		goto exit;
++	}
++	/* look through all of the children of this device */
++	usb_hub_for_each_child(dev, child, childdev) {
++		if (childdev) {
++			usb_lock_device(childdev);
++			ret_dev = match_device_name(childdev, name);
++			usb_unlock_device(childdev);
++			if (ret_dev)
++				goto exit;
++		}
++	}
++exit:
++	return ret_dev;
++}
++
++/**
++ * usb_find_device_by_name - find a specific usb device in the system
++ * @name: the name of the device to find
++ *
++ * Returns a pointer to a struct usb_device if such a specified usb
++ * device is present in the system currently.  The usage count of the
++ * device will be incremented if a device is found.  Make sure to call
++ * usb_put_dev() when the caller is finished with the device.
++ *
++ * If a device with the specified bus id is not found, NULL is returned.
++ */
++struct usb_device *usb_find_device_by_name(const char *name)
++{
++	struct list_head *buslist;
++	struct usb_bus *bus;
++	struct usb_device *dev = NULL;
++
++	mutex_lock(&usb_bus_list_lock);
++	for (buslist = usb_bus_list.next;
++	     buslist != &usb_bus_list;
++	     buslist = buslist->next) {
++		bus = container_of(buslist, struct usb_bus, bus_list);
++		if (!bus->root_hub)
++			continue;
++		usb_lock_device(bus->root_hub);
++		dev = match_device_name(bus->root_hub, name);
++		usb_unlock_device(bus->root_hub);
++		if (dev)
++			goto exit;
++	}
++exit:
++	mutex_unlock(&usb_bus_list_lock);
++	return dev;
++}
++EXPORT_SYMBOL_GPL(usb_find_device_by_name);
++
+ /**
+  * usb_alloc_coherent - allocate dma-consistent buffer for URB_NO_xxx_DMA_MAP
+  * @dev: device the buffer will be used with
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -677,6 +677,7 @@ static inline bool usb_device_supports_l
+ 	return udev->bos->ss_cap->bmAttributes & USB_LTM_SUPPORT;
+ }
+ 
++extern struct usb_device *usb_find_device_by_name(const char *name);
+ 
+ /*-------------------------------------------------------------------------*/
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/830-ledtrig_morse.patch b/trunk/target/linux/generic/patches-3.8/830-ledtrig_morse.patch
new file mode 100644
index 00000000..a5639d9f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/830-ledtrig_morse.patch
@@ -0,0 +1,28 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -561,4 +561,8 @@ config LEDS_TRIGGER_TRANSIENT
+ 	  GPIO/PWM based hardware.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_MORSE
++	tristate "LED Morse Trigger"
++	depends on LEDS_TRIGGERS
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledt
+ obj-$(CONFIG_LEDS_TRIGGER_CPU)		+= ledtrig-cpu.o
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o
++obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+--- a/drivers/leds/ledtrig-morse.c
++++ b/drivers/leds/ledtrig-morse.c
+@@ -26,7 +26,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/leds.h>
diff --git a/trunk/target/linux/generic/patches-3.8/831-ledtrig_netdev.patch b/trunk/target/linux/generic/patches-3.8/831-ledtrig_netdev.patch
new file mode 100644
index 00000000..2939ab7a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/831-ledtrig_netdev.patch
@@ -0,0 +1,51 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -565,4 +565,11 @@ config LEDS_TRIGGER_MORSE
+ 	tristate "LED Morse Trigger"
+ 	depends on LEDS_TRIGGERS
+ 
++config LEDS_TRIGGER_NETDEV
++	tristate "LED Netdev Trigger"
++	depends on NET && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by network device activity.
++	  If unsure, say Y.
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_TRIGGER_CPU)		+= ledtr
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
+ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
++obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+--- a/drivers/leds/ledtrig-netdev.c
++++ b/drivers/leds/ledtrig-netdev.c
+@@ -22,7 +22,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/netdevice.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+@@ -294,8 +293,9 @@ done:
+ static void netdev_trig_timer(unsigned long arg)
+ {
+ 	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
+-	const struct net_device_stats *dev_stats;
++	struct rtnl_link_stats64 *dev_stats;
+ 	unsigned new_activity;
++	struct rtnl_link_stats64 temp;
+ 
+ 	write_lock(&trigger_data->lock);
+ 
+@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
+ 		goto no_restart;
+ 	}
+ 
+-	dev_stats = dev_get_stats(trigger_data->net_dev);
++	dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
+ 	new_activity =
+ 		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
+ 		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
diff --git a/trunk/target/linux/generic/patches-3.8/832-ledtrig_usbdev.patch b/trunk/target/linux/generic/patches-3.8/832-ledtrig_usbdev.patch
new file mode 100644
index 00000000..5b07f17a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/832-ledtrig_usbdev.patch
@@ -0,0 +1,31 @@
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -572,4 +572,11 @@ config LEDS_TRIGGER_NETDEV
+ 	  This allows LEDs to be controlled by network device activity.
+ 	  If unsure, say Y.
+ 
++config LEDS_TRIGGER_USBDEV
++	tristate "LED USB device Trigger"
++	depends on USB && LEDS_TRIGGERS
++	help
++	  This allows LEDs to be controlled by the presence/activity of
++	  an USB device. If unsure, say N.
++
+ endif # NEW_LEDS
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -67,3 +67,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+=
+ obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o
+ obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
+ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
++obj-$(CONFIG_LEDS_TRIGGER_USBDEV)	+= ledtrig-usbdev.o
+--- a/drivers/leds/ledtrig-usbdev.c
++++ b/drivers/leds/ledtrig-usbdev.c
+@@ -24,7 +24,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/ctype.h>
+ #include <linux/slab.h>
diff --git a/trunk/target/linux/generic/patches-3.8/840-rtc7301.patch b/trunk/target/linux/generic/patches-3.8/840-rtc7301.patch
new file mode 100644
index 00000000..ad837eb9
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/840-rtc7301.patch
@@ -0,0 +1,250 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -781,6 +781,15 @@ config RTC_DRV_NUC900
+ 	  If you say yes here you get support for the RTC subsystem of the
+ 	  NUC910/NUC920 used in embedded systems.
+ 
++config RTC_DRV_RTC7301
++	tristate "Epson RTC-7301 SF/DG"
++	help
++	  If you say Y here you will get support for the
++	  Epson RTC-7301 SF/DG RTC chips.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-7301.
++
+ comment "on-CPU RTC drivers"
+ 
+ config RTC_DRV_DAVINCI
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -94,6 +94,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
+ obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
+ obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
+ obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
++obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
+ obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o
+ obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
+ obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
+--- /dev/null
++++ b/drivers/rtc/rtc-rtc7301.c
+@@ -0,0 +1,219 @@
++/*
++ * Driver for Epson RTC-7301SF/DG
++ *
++ * Copyright (C) 2009 Jose Vasconcellos
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/rtc.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/bcd.h>
++
++#define RTC_NAME "rtc7301"
++#define RTC_VERSION "0.1"
++
++/* Epson RTC-7301 register addresses */
++#define RTC7301_SEC		0x00
++#define RTC7301_SEC10		0x01
++#define RTC7301_MIN		0x02
++#define RTC7301_MIN10		0x03
++#define RTC7301_HOUR		0x04
++#define RTC7301_HOUR10		0x05
++#define RTC7301_WEEKDAY		0x06
++#define RTC7301_DAY		0x07
++#define RTC7301_DAY10		0x08
++#define RTC7301_MON		0x09
++#define RTC7301_MON10		0x0A
++#define RTC7301_YEAR		0x0B
++#define RTC7301_YEAR10		0x0C
++#define RTC7301_YEAR100		0x0D
++#define RTC7301_YEAR1000	0x0E
++#define RTC7301_CTRLREG		0x0F
++
++static uint8_t __iomem *rtc7301_base;
++
++#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
++#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
++
++#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
++
++static void rtc7301_init_settings(void)
++{
++	int i;
++
++	write_reg(RTC7301_CTRLREG, 2);
++	write_reg(RTC7301_YEAR1000, 2);
++	udelay(122);
++
++	/* bank 1 */
++	write_reg(RTC7301_CTRLREG, 6);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++
++	/* bank 2 */
++	write_reg(RTC7301_CTRLREG, 14);
++	for (i=0; i<15; i++)
++		write_reg(i, 0);
++	write_reg(RTC7301_CTRLREG, 0);
++}
++
++static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int cnt;
++	uint8_t buf[16];
++
++	cnt = 0;
++	while (rtc7301_isbusy()) {
++		udelay(244);
++		if (cnt++ > 100) {
++			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
++			return -EIO;
++		}
++	}
++
++	for (cnt=0; cnt<16; cnt++)
++		buf[cnt] = read_reg(cnt);
++
++	if (buf[RTC7301_SEC10] & 8) {
++		dev_err(dev, "%s: RTC not set\n", __func__);
++		return -EINVAL;
++	}
++
++	memset(dt, 0, sizeof(*dt));
++
++	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
++	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
++	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
++
++	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
++	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
++	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
++		      buf[RTC7301_YEAR100]*100 +
++		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
++
++	/* the rtc device may contain illegal values on power up
++	 * according to the data sheet. make sure they are valid.
++	 */
++
++	return rtc_valid_tm(dt);
++}
++
++static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
++{
++	int data;
++
++	data = dt->tm_year + 1900;
++	if (data >= 2100 || data < 1900)
++		return -EINVAL;
++
++	write_reg(RTC7301_CTRLREG, 2);
++       	udelay(122);
++
++	data = bin2bcd(dt->tm_sec);
++	write_reg(RTC7301_SEC, data);
++	write_reg(RTC7301_SEC10, (data >> 4));
++
++	data = bin2bcd(dt->tm_min);
++	write_reg(RTC7301_MIN, data );
++	write_reg(RTC7301_MIN10, (data >> 4));
++
++	data = bin2bcd(dt->tm_hour);
++	write_reg(RTC7301_HOUR, data);
++	write_reg(RTC7301_HOUR10, (data >> 4));
++
++	data = bin2bcd(dt->tm_mday);
++	write_reg(RTC7301_DAY, data);
++	write_reg(RTC7301_DAY10, (data>> 4));
++
++	data = bin2bcd(dt->tm_mon + 1);
++	write_reg(RTC7301_MON, data);
++	write_reg(RTC7301_MON10, (data >> 4));
++
++	data = bin2bcd(dt->tm_year % 100);
++	write_reg(RTC7301_YEAR, data);
++	write_reg(RTC7301_YEAR10, (data >> 4));
++	data = bin2bcd((1900 + dt->tm_year) / 100);
++	write_reg(RTC7301_YEAR100, data);
++
++	data = bin2bcd(dt->tm_wday);
++	write_reg(RTC7301_WEEKDAY, data);
++
++	write_reg(RTC7301_CTRLREG, 0);
++
++	return 0;
++}
++
++static const struct rtc_class_ops rtc7301_rtc_ops = {
++	.read_time	= rtc7301_get_datetime,
++	.set_time	= rtc7301_set_datetime,
++};
++
++static int rtc7301_probe(struct platform_device *pdev)
++{
++	struct rtc_device *rtc;
++	struct resource *res;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENOENT;
++
++	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
++	if (!rtc7301_base)
++		return -EINVAL;
++
++	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
++				&rtc7301_rtc_ops, THIS_MODULE);
++	if (IS_ERR(rtc)) {
++		iounmap(rtc7301_base);
++		return PTR_ERR(rtc);
++	}
++
++	platform_set_drvdata(pdev, rtc);
++
++	rtc7301_init_settings();
++	return 0;
++}
++
++static int rtc7301_remove(struct platform_device *pdev)
++{
++	struct rtc_device *rtc = platform_get_drvdata(pdev);
++
++	if (rtc)
++		rtc_device_unregister(rtc);
++	if (rtc7301_base)
++		iounmap(rtc7301_base);
++	return 0;
++}
++
++static struct platform_driver rtc7301_driver = {
++	.driver = {
++		.name	= RTC_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe	= rtc7301_probe,
++	.remove = rtc7301_remove,
++};
++
++static __init int rtc7301_init(void)
++{
++	return platform_driver_register(&rtc7301_driver);
++}
++module_init(rtc7301_init);
++
++static __exit void rtc7301_exit(void)
++{
++	platform_driver_unregister(&rtc7301_driver);
++}
++module_exit(rtc7301_exit);
++
++MODULE_DESCRIPTION("Epson 7301 RTC driver");
++MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" RTC_NAME);
++MODULE_VERSION(RTC_VERSION);
diff --git a/trunk/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch b/trunk/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch
new file mode 100644
index 00000000..7d763146
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/841-rtc_pt7c4338.patch
@@ -0,0 +1,247 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -436,6 +436,15 @@ config RTC_DRV_RV3029C2
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called rtc-rv3029c2.
+ 
++config RTC_DRV_PT7C4338
++	tristate "Pericom Technology Inc. PT7C4338 RTC"
++	help
++	  If you say yes here you get support for the Pericom Technology
++	  Inc. PT7C4338 RTC chip.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called rtc-pt7c4338.
++
+ endif # I2C
+ 
+ comment "SPI RTC drivers"
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -86,6 +86,7 @@ obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030
+ obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o
+ obj-$(CONFIG_RTC_DRV_PM8XXX)	+= rtc-pm8xxx.o
+ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
++obj-$(CONFIG_RTC_DRV_PT7C4338)	+= rtc-pt7c4338.o
+ obj-$(CONFIG_RTC_DRV_PUV3)	+= rtc-puv3.o
+ obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o
+ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o
+--- /dev/null
++++ b/drivers/rtc/rtc-pt7c4338.c
+@@ -0,0 +1,216 @@
++/*
++ * Copyright 2010 Freescale Semiconductor, Inc.
++ *
++ * Author:	Priyanka Jain <Priyanka.Jain@freescale.com>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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
++ */
++
++/*
++ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
++ *
++ * This file is based on drivers/rtc/rtc-ds1307.c
++ *
++ * PT7C4338 chip is manufactured by Pericom Technology Inc.
++ * It is a serial real-time clock which provides
++ * 1)Low-power clock/calendar.
++ * 2)Programmable square-wave output.
++ * It has 56 bytes of nonvolatile RAM.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++
++/* RTC register addresses */
++#define PT7C4338_REG_SECONDS          0x00
++#define PT7C4338_REG_MINUTES          0x01
++#define PT7C4338_REG_HOURS            0x02
++#define PT7C4338_REG_AMPM             0x02
++#define PT7C4338_REG_DAY              0x03
++#define PT7C4338_REG_DATE             0x04
++#define PT7C4338_REG_MONTH            0x05
++#define PT7C4338_REG_YEAR             0x06
++#define PT7C4338_REG_CTRL_STAT        0x07
++
++/* RTC second register address bit */
++#define PT7C4338_SEC_BIT_CH           0x80	/*Clock Halt (in Register 0)*/
++
++/* RTC control and status register bits */
++#define PT7C4338_CTRL_STAT_BIT_RS0    0x1	/*Rate select 0*/
++#define PT7C4338_CTRL_STAT_BIT_RS1    0x2	/*Rate select 1*/
++#define PT7C4338_CTRL_STAT_BIT_SQWE   0x10	/*Square Wave Enable*/
++#define PT7C4338_CTRL_STAT_BIT_OSF    0x20	/*Oscillator Stop Flag*/
++#define PT7C4338_CTRL_STAT_BIT_OUT    0x80	/*Output Level Control*/
++
++static const struct i2c_device_id pt7c4338_id[] = {
++	{ "pt7c4338", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, pt7c4338_id);
++
++struct pt7c4338{
++	struct i2c_client *client;
++	struct rtc_device *rtc;
++};
++
++static int pt7c4338_read_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	int ret;
++	u8 buf[7];
++	u8 year, month, day, hour, minute, second;
++	u8 week, twelve_hr, am_pm;
++
++	ret = i2c_smbus_read_i2c_block_data(client,
++			PT7C4338_REG_SECONDS, 7, buf);
++	if (ret < 0)
++		return ret;
++	if (ret < 7)
++		return -EIO;
++
++	second = buf[0];
++	minute = buf[1];
++	hour = buf[2];
++	week = buf[3];
++	day = buf[4];
++	month = buf[5];
++	year = buf[6];
++
++	/* Extract additional information for AM/PM */
++	twelve_hr = hour & 0x40;
++	am_pm = hour & 0x20;
++
++	/* Write to rtc_time structure */
++	time->tm_sec = bcd2bin(second & 0x7f);
++	time->tm_min = bcd2bin(minute & 0x7f);
++	if (twelve_hr) {
++		/* Convert to 24 hr */
++		if (am_pm)
++			time->tm_hour = bcd2bin(hour & 0x10) + 12;
++		else
++			time->tm_hour = bcd2bin(hour & 0xBF);
++	} else {
++		time->tm_hour = bcd2bin(hour);
++	}
++
++	time->tm_wday = bcd2bin(week & 0x07) - 1;
++	time->tm_mday = bcd2bin(day & 0x3f);
++	time->tm_mon = bcd2bin(month & 0x1F) - 1;
++	/* assume 20YY not 19YY */
++	time->tm_year = bcd2bin(year) + 100;
++
++	return 0;
++}
++
++static int pt7c4338_set_time(struct device *dev, struct rtc_time *time)
++{
++	struct i2c_client *client = to_i2c_client(dev);
++	u8 buf[7];
++
++	/* Extract time from rtc_time and load into pt7c4338*/
++	buf[0] = bin2bcd(time->tm_sec);
++	buf[1] = bin2bcd(time->tm_min);
++	buf[2] = bin2bcd(time->tm_hour);
++	buf[3] = bin2bcd(time->tm_wday + 1); /* Day of the week */
++	buf[4] = bin2bcd(time->tm_mday); /* Date */
++	buf[5] = bin2bcd(time->tm_mon + 1);
++
++	/* assume 20YY not 19YY */
++	if (time->tm_year >= 100)
++		buf[6] = bin2bcd(time->tm_year - 100);
++	else
++		buf[6] = bin2bcd(time->tm_year);
++
++	return i2c_smbus_write_i2c_block_data(client,
++					PT7C4338_REG_SECONDS, 7, buf);
++}
++
++static const struct rtc_class_ops pt7c4338_rtc_ops = {
++	.read_time = pt7c4338_read_time,
++	.set_time = pt7c4338_set_time,
++};
++
++static int pt7c4338_probe(struct i2c_client *client,
++		const struct i2c_device_id *id)
++{
++	struct pt7c4338 *pt7c4338;
++	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
++	int ret;
++
++	pt7c4338 = kzalloc(sizeof(struct pt7c4338), GFP_KERNEL);
++	if (!pt7c4338)
++		return -ENOMEM;
++
++	pt7c4338->client = client;
++	i2c_set_clientdata(client, pt7c4338);
++	pt7c4338->rtc = rtc_device_register(client->name, &client->dev,
++					&pt7c4338_rtc_ops, THIS_MODULE);
++	if (IS_ERR(pt7c4338->rtc)) {
++		ret = PTR_ERR(pt7c4338->rtc);
++		dev_err(&client->dev, "unable to register the class device\n");
++		goto out_free;
++	}
++
++	return 0;
++out_free:
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return ret;
++}
++
++static int pt7c4338_remove(struct i2c_client *client)
++{
++	struct pt7c4338 *pt7c4338 = i2c_get_clientdata(client);
++
++	rtc_device_unregister(pt7c4338->rtc);
++	i2c_set_clientdata(client, NULL);
++	kfree(pt7c4338);
++	return 0;
++}
++
++static struct i2c_driver pt7c4338_driver = {
++	.driver = {
++		.name = "rtc-pt7c4338",
++		.owner = THIS_MODULE,
++	},
++	.probe = pt7c4338_probe,
++	.remove = pt7c4338_remove,
++	.id_table = pt7c4338_id,
++};
++
++static int __init pt7c4338_init(void)
++{
++	return i2c_add_driver(&pt7c4338_driver);
++}
++
++static void __exit pt7c4338_exit(void)
++{
++	i2c_del_driver(&pt7c4338_driver);
++}
++
++module_init(pt7c4338_init);
++module_exit(pt7c4338_exit);
++
++MODULE_AUTHOR("Priyanka Jain <Priyanka.Jain@freescale.com>");
++MODULE_DESCRIPTION("pericom Technology Inc. PT7C4338 RTC Driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/generic/patches-3.8/861-04_spi_gpio_implement_spi_delay.patch b/trunk/target/linux/generic/patches-3.8/861-04_spi_gpio_implement_spi_delay.patch
new file mode 100644
index 00000000..4be08956
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/861-04_spi_gpio_implement_spi_delay.patch
@@ -0,0 +1,58 @@
+Implement the SPI-GPIO delay function for busses that need speed limitation.
+
+--mb
+
+
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -22,6 +22,7 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/delay.h>
+ #include <linux/of_device.h>
+ #include <linux/of_gpio.h>
+ 
+@@ -73,6 +74,7 @@ struct spi_gpio {
+  *		#define	SPI_MOSI_GPIO	120
+  *		#define	SPI_SCK_GPIO	121
+  *		#define	SPI_N_CHIPSEL	4
++ *		#undef NEED_SPIDELAY
+  *		#include "spi-gpio.c"
+  */
+ 
+@@ -80,6 +82,7 @@ struct spi_gpio {
+ #define DRIVER_NAME	"spi_gpio"
+ 
+ #define GENERIC_BITBANG	/* vs tight inlines */
++#define NEED_SPIDELAY	1
+ 
+ /* all functions referencing these symbols must define pdata */
+ #define SPI_MISO_GPIO	((pdata)->miso)
+@@ -130,12 +133,20 @@ static inline int getmiso(const struct s
+ #undef pdata
+ 
+ /*
+- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
+- * requested device clock.  Software overhead means we usually have trouble
+- * reaching even one Mbit/sec (except when we can inline bitops), so for now
+- * we'll just assume we never need additional per-bit slowdowns.
++ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
++ * and spi_transfer.speed_hz to 0.
++ * Otherwise this is a function of the requested device clock.
++ * Software overhead means we usually have trouble
++ * reaching even one Mbit/sec (except when we can inline bitops). So on small
++ * embedded devices with fast SPI slaves you usually don't need a delay.
+  */
+-#define spidelay(nsecs)	do {} while (0)
++static inline void spidelay(unsigned nsecs)
++{
++#ifdef NEED_SPIDELAY
++	if (unlikely(nsecs))
++		ndelay(nsecs);
++#endif /* NEED_SPIDELAY */
++}
+ 
+ #include "spi-bitbang-txrx.h"
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch b/trunk/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch
new file mode 100644
index 00000000..e68f808c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/862-gpio_spi_driver.patch
@@ -0,0 +1,373 @@
+THIS CODE IS DEPRECATED.
+
+Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+
+--mb
+
+
+
+---
+ drivers/spi/Kconfig              |    9 +
+ drivers/spi/Makefile             |    1 
+ drivers/spi/spi_gpio_old.c       |  251 +++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi_gpio_old.h |   73 +++++++++++
+ 4 files changed, 334 insertions(+)
+
+--- /dev/null
++++ b/include/linux/spi/spi_gpio_old.h
+@@ -0,0 +1,73 @@
++/*
++ * spi_gpio interface to platform code
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++#ifndef _LINUX_SPI_SPI_GPIO
++#define _LINUX_SPI_SPI_GPIO
++
++#include <linux/types.h>
++#include <linux/spi/spi.h>
++
++
++/**
++ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
++ *
++ * This structure holds information about a GPIO-based SPI device.
++ *
++ * @pin_clk: The GPIO pin number of the CLOCK pin.
++ *
++ * @pin_miso: The GPIO pin number of the MISO pin.
++ *
++ * @pin_mosi: The GPIO pin number of the MOSI pin.
++ *
++ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
++ *
++ * @cs_activelow: If true, the chip is selected when the CS line is low.
++ *
++ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
++ *                Note that doing no delay is not standards compliant,
++ *                but it might be needed to speed up transfers on some
++ *                slow embedded machines.
++ *
++ * @boardinfo_setup: This callback is called after the
++ *                   SPI master device was registered, but before the
++ *                   device is registered.
++ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
++ */
++struct spi_gpio_platform_data {
++	unsigned int pin_clk;
++	unsigned int pin_miso;
++	unsigned int pin_mosi;
++	unsigned int pin_cs;
++	bool cs_activelow;
++	bool no_spi_delay;
++	int (*boardinfo_setup)(struct spi_board_info *bi,
++			       struct spi_master *master,
++			       void *data);
++	void *boardinfo_setup_data;
++};
++
++/**
++ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a spi-gpio device.
++ */
++#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
++
++/**
++ * spi_gpio_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int spi_gpio_next_id(void);
++
++#endif /* _LINUX_SPI_SPI_GPIO */
+--- /dev/null
++++ b/drivers/spi/spi_gpio_old.c
+@@ -0,0 +1,251 @@
++/*
++ * Bitbanging SPI bus driver using GPIO API
++ *
++ * Copyright (c) 2008 Piotr Skamruk
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * based on spi_s3c2410_gpio.c
++ *   Copyright (c) 2006 Ben Dooks
++ *   Copyright (c) 2006 Simtec Electronics
++ * and on i2c-gpio.c
++ *   Copyright (C) 2007 Atmel Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/workqueue.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/spi_bitbang.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++struct spi_gpio {
++	struct spi_bitbang bitbang;
++	struct spi_gpio_platform_data *info;
++	struct platform_device *pdev;
++	struct spi_board_info bi;
++};
++
++
++static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
++{
++	return dev->controller_data;
++}
++
++static inline void setsck(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
++}
++
++static inline void setmosi(struct spi_device *dev, int val)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
++}
++
++static inline u32 getmiso(struct spi_device *dev)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
++}
++
++static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (!sp->info->no_spi_delay)
++		ndelay(nsecs);
++}
++
++#define spidelay(nsecs) do {					\
++	/* Steal the spi_device pointer from our caller.	\
++	 * The bitbang-API should probably get fixed here... */	\
++	do_spidelay(spi, nsecs);				\
++  } while (0)
++
++#define EXPAND_BITBANG_TXRX
++#include "spi-bitbang-txrx.h"
++
++static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
++}
++
++static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
++			       unsigned nsecs, u32 word, u8 bits)
++{
++	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
++}
++
++static void spi_gpio_chipselect(struct spi_device *dev, int on)
++{
++	struct spi_gpio *sp = spidev_to_sg(dev);
++
++	if (sp->info->cs_activelow)
++		on = !on;
++	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
++}
++
++static int spi_gpio_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct spi_gpio_platform_data *pdata;
++	struct spi_gpio *sp;
++	struct spi_device *spidev;
++	int err;
++
++	pdata = pdev->dev.platform_data;
++	if (!pdata)
++		return -ENXIO;
++
++	err = -ENOMEM;
++	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
++	if (!master)
++		goto err_alloc_master;
++
++	sp = spi_master_get_devdata(master);
++	platform_set_drvdata(pdev, sp);
++	sp->info = pdata;
++
++	err = gpio_request(pdata->pin_clk, "spi_clock");
++	if (err)
++		goto err_request_clk;
++	err = gpio_request(pdata->pin_mosi, "spi_mosi");
++	if (err)
++		goto err_request_mosi;
++	err = gpio_request(pdata->pin_miso, "spi_miso");
++	if (err)
++		goto err_request_miso;
++	err = gpio_request(pdata->pin_cs, "spi_cs");
++	if (err)
++		goto err_request_cs;
++
++	sp->bitbang.master = spi_master_get(master);
++	sp->bitbang.master->bus_num = -1;
++	sp->bitbang.master->num_chipselect = 1;
++	sp->bitbang.chipselect = spi_gpio_chipselect;
++	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
++	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
++	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
++	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
++
++	gpio_direction_output(pdata->pin_clk, 0);
++	gpio_direction_output(pdata->pin_mosi, 0);
++	gpio_direction_output(pdata->pin_cs,
++			      pdata->cs_activelow ? 1 : 0);
++	gpio_direction_input(pdata->pin_miso);
++
++	err = spi_bitbang_start(&sp->bitbang);
++	if (err)
++		goto err_no_bitbang;
++	err = pdata->boardinfo_setup(&sp->bi, master,
++				     pdata->boardinfo_setup_data);
++	if (err)
++		goto err_bi_setup;
++	sp->bi.controller_data = sp;
++	spidev = spi_new_device(master, &sp->bi);
++	if (!spidev)
++		goto err_new_dev;
++
++	return 0;
++
++err_new_dev:
++err_bi_setup:
++	spi_bitbang_stop(&sp->bitbang);
++err_no_bitbang:
++	spi_master_put(sp->bitbang.master);
++	gpio_free(pdata->pin_cs);
++err_request_cs:
++	gpio_free(pdata->pin_miso);
++err_request_miso:
++	gpio_free(pdata->pin_mosi);
++err_request_mosi:
++	gpio_free(pdata->pin_clk);
++err_request_clk:
++	kfree(master);
++
++err_alloc_master:
++	return err;
++}
++
++static int spi_gpio_remove(struct platform_device *pdev)
++{
++	struct spi_gpio *sp;
++	struct spi_gpio_platform_data *pdata;
++
++	pdata = pdev->dev.platform_data;
++	sp = platform_get_drvdata(pdev);
++
++	gpio_free(pdata->pin_clk);
++	gpio_free(pdata->pin_mosi);
++	gpio_free(pdata->pin_miso);
++	gpio_free(pdata->pin_cs);
++	spi_bitbang_stop(&sp->bitbang);
++	spi_master_put(sp->bitbang.master);
++
++	return 0;
++}
++
++static struct platform_driver spi_gpio_driver = {
++	.driver		= {
++		.name	= SPI_GPIO_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++	.probe		= spi_gpio_probe,
++	.remove		= spi_gpio_remove,
++};
++
++int spi_gpio_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(spi_gpio_next_id);
++
++static int __init spi_gpio_init(void)
++{
++	int err;
++
++	err = platform_driver_register(&spi_gpio_driver);
++	if (err)
++		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
++
++	return err;
++}
++module_init(spi_gpio_init);
++
++static void __exit spi_gpio_exit(void)
++{
++	platform_driver_unregister(&spi_gpio_driver);
++}
++module_exit(spi_gpio_exit);
++
++MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
++MODULE_LICENSE("GPL v2");
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -177,6 +177,15 @@ config SPI_GPIO
+ 	  GPIO operations, you should be able to leverage that for better
+ 	  speed with a custom version of this driver; see the source code.
+ 
++config SPI_GPIO_OLD
++	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
++	depends on SPI_MASTER && GENERIC_GPIO
++	select SPI_BITBANG
++	help
++	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
++
++	  If unsure, say N.
++
+ config SPI_IMX
+ 	tristate "Freescale i.MX SPI controllers"
+ 	depends on ARCH_MXC
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -32,6 +32,7 @@ obj-$(CONFIG_SPI_FSL_LIB)		+= spi-fsl-li
+ obj-$(CONFIG_SPI_FSL_ESPI)		+= spi-fsl-espi.o
+ obj-$(CONFIG_SPI_FSL_SPI)		+= spi-fsl-spi.o
+ obj-$(CONFIG_SPI_GPIO)			+= spi-gpio.o
++obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
+ obj-$(CONFIG_SPI_IMX)			+= spi-imx.o
+ obj-$(CONFIG_SPI_LM70_LLP)		+= spi-lm70llp.o
+ obj-$(CONFIG_SPI_MPC512x_PSC)		+= spi-mpc512x-psc.o
diff --git a/trunk/target/linux/generic/patches-3.8/863-gpiommc.patch b/trunk/target/linux/generic/patches-3.8/863-gpiommc.patch
new file mode 100644
index 00000000..5f74f1bc
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/863-gpiommc.patch
@@ -0,0 +1,844 @@
+--- /dev/null
++++ b/drivers/mmc/host/gpiommc.c
+@@ -0,0 +1,609 @@
++/*
++ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
++ * This module hooks up the mmc_spi and spi_gpio modules and also
++ * provides a configfs interface.
++ *
++ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/module.h>
++#include <linux/mmc/gpiommc.h>
++#include <linux/platform_device.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/spi/spi_gpio_old.h>
++#include <linux/configfs.h>
++#include <linux/gpio.h>
++#include <asm/atomic.h>
++
++
++#define PFX				"gpio-mmc: "
++
++
++struct gpiommc_device {
++	struct platform_device *pdev;
++	struct platform_device *spi_pdev;
++	struct spi_board_info boardinfo;
++};
++
++
++MODULE_DESCRIPTION("GPIO based MMC driver");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_LICENSE("GPL");
++
++
++static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
++				   struct spi_master *master,
++				   void *data)
++{
++	struct gpiommc_device *d = data;
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	/* Bind the SPI master to the MMC-SPI host driver. */
++	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
++
++	bi->max_speed_hz = pdata->max_bus_speed;
++	bi->bus_num = master->bus_num;
++	bi->mode = pdata->mode;
++
++	return 0;
++}
++
++static int gpiommc_probe(struct platform_device *pdev)
++{
++	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
++	struct spi_gpio_platform_data spi_pdata;
++	struct gpiommc_device *d;
++	int err;
++
++	err = -ENXIO;
++	if (!mmc_pdata)
++		goto error;
++
++#ifdef CONFIG_MMC_SPI_MODULE
++	err = request_module("mmc_spi");
++	if (err) {
++		printk(KERN_WARNING PFX
++		       "Failed to request mmc_spi module.\n");
++	}
++#endif /* CONFIG_MMC_SPI_MODULE */
++
++	/* Allocate the GPIO-MMC device */
++	err = -ENOMEM;
++	d = kzalloc(sizeof(*d), GFP_KERNEL);
++	if (!d)
++		goto error;
++	d->pdev = pdev;
++
++	/* Create the SPI-GPIO device */
++	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
++					    spi_gpio_next_id());
++	if (!d->spi_pdev)
++		goto err_free_d;
++
++	memset(&spi_pdata, 0, sizeof(spi_pdata));
++	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
++	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
++	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
++	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
++	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
++	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
++	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
++	spi_pdata.boardinfo_setup_data = d;
++
++	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
++				       sizeof(spi_pdata));
++	if (err)
++		goto err_free_pdev;
++	err = platform_device_add(d->spi_pdev);
++	if (err)
++		goto err_free_pdata;
++	platform_set_drvdata(pdev, d);
++
++	printk(KERN_INFO PFX "MMC-Card \"%s\" "
++	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
++	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
++	       mmc_pdata->pins.gpio_do,
++	       mmc_pdata->pins.gpio_clk,
++	       mmc_pdata->pins.gpio_cs);
++
++	return 0;
++
++err_free_pdata:
++	kfree(d->spi_pdev->dev.platform_data);
++	d->spi_pdev->dev.platform_data = NULL;
++err_free_pdev:
++	platform_device_put(d->spi_pdev);
++err_free_d:
++	kfree(d);
++error:
++	return err;
++}
++
++static int gpiommc_remove(struct platform_device *pdev)
++{
++	struct gpiommc_device *d = platform_get_drvdata(pdev);
++	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
++
++	platform_device_unregister(d->spi_pdev);
++	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
++	       pdata->name);
++	platform_device_put(d->spi_pdev);
++
++	return 0;
++}
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++
++/* A device that was created through configfs */
++struct gpiommc_configfs_device {
++	struct config_item item;
++	/* The platform device, after registration. */
++	struct platform_device *pdev;
++	/* The configuration */
++	struct gpiommc_platform_data pdata;
++};
++
++#define GPIO_INVALID	-1
++
++static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
++{
++	return (dev->pdev != NULL);
++}
++
++static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
++{
++	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
++}
++
++static struct configfs_attribute gpiommc_attr_DI = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_in",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_DO = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_data_out",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CLK = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_clock",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_CS_activelow = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "gpio_chipselect_activelow",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spimode = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_mode",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_spidelay = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "spi_delay",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_max_bus_speed = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "max_bus_speed",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute gpiommc_attr_register = {
++	.ca_owner = THIS_MODULE,
++	.ca_name = "register",
++	.ca_mode = S_IRUGO | S_IWUSR,
++};
++
++static struct configfs_attribute *gpiommc_config_attrs[] = {
++	&gpiommc_attr_DI,
++	&gpiommc_attr_DO,
++	&gpiommc_attr_CLK,
++	&gpiommc_attr_CS,
++	&gpiommc_attr_CS_activelow,
++	&gpiommc_attr_spimode,
++	&gpiommc_attr_spidelay,
++	&gpiommc_attr_max_bus_speed,
++	&gpiommc_attr_register,
++	NULL,
++};
++
++static ssize_t gpiommc_config_attr_show(struct config_item *item,
++					struct configfs_attribute *attr,
++					char *page)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	ssize_t count = 0;
++	unsigned int gpio;
++	int err = 0;
++
++	if (attr == &gpiommc_attr_DI) {
++		gpio = dev->pdata.pins.gpio_di;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		gpio = dev->pdata.pins.gpio_do;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		gpio = dev->pdata.pins.gpio_clk;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		gpio = dev->pdata.pins.gpio_cs;
++		if (gpio == GPIO_INVALID)
++			count = snprintf(page, PAGE_SIZE, "not configured\n");
++		else
++			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.pins.cs_activelow);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.mode);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 !dev->pdata.no_spi_delay);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 dev->pdata.max_bus_speed);
++		goto out;
++	}
++	if (attr == &gpiommc_attr_register) {
++		count = snprintf(page, PAGE_SIZE, "%u\n",
++				 gpiommc_is_registered(dev));
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
++			       const char *name)
++{
++	int err;
++
++	if (gpiommc_is_registered(dev))
++		return 0;
++
++	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
++	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
++		printk(KERN_ERR PFX
++		       "configfs: Invalid GPIO pin number(s)\n");
++		return -EINVAL;
++	}
++
++	strlcpy(dev->pdata.name, name,
++		sizeof(dev->pdata.name));
++
++	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
++					  gpiommc_next_id());
++	if (!dev->pdev)
++		return -ENOMEM;
++	err = platform_device_add_data(dev->pdev, &dev->pdata,
++				       sizeof(dev->pdata));
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++	err = platform_device_add(dev->pdev);
++	if (err) {
++		platform_device_put(dev->pdev);
++		return err;
++	}
++
++	return 0;
++}
++
++static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
++{
++	if (!gpiommc_is_registered(dev))
++		return;
++
++	platform_device_unregister(dev->pdev);
++	dev->pdev = NULL;
++}
++
++static ssize_t gpiommc_config_attr_store(struct config_item *item,
++					 struct configfs_attribute *attr,
++					 const char *page, size_t count)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++	int err = -EINVAL;
++	unsigned long data;
++
++	if (attr == &gpiommc_attr_register) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data == 1)
++			err = gpiommc_do_register(dev, item->ci_name);
++		if (data == 0) {
++			gpiommc_do_unregister(dev);
++			err = 0;
++		}
++		goto out;
++	}
++
++	if (gpiommc_is_registered(dev)) {
++		/* The rest of the config parameters can only be set
++		 * as long as the device is not registered, yet. */
++		err = -EBUSY;
++		goto out;
++	}
++
++	if (attr == &gpiommc_attr_DI) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_di = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_DO) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_do = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CLK) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_clk = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (!gpio_is_valid(data))
++			goto out;
++		dev->pdata.pins.gpio_cs = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_CS_activelow) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.pins.cs_activelow = data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spimode) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		switch (data) {
++		case 0:
++			dev->pdata.mode = SPI_MODE_0;
++			break;
++		case 1:
++			dev->pdata.mode = SPI_MODE_1;
++			break;
++		case 2:
++			dev->pdata.mode = SPI_MODE_2;
++			break;
++		case 3:
++			dev->pdata.mode = SPI_MODE_3;
++			break;
++		default:
++			goto out;
++		}
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_spidelay) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data != 0 && data != 1)
++			goto out;
++		dev->pdata.no_spi_delay = !data;
++		err = 0;
++		goto out;
++	}
++	if (attr == &gpiommc_attr_max_bus_speed) {
++		err = kstrtoul(page, 10, &data);
++		if (err)
++			goto out;
++		err = -EINVAL;
++		if (data > UINT_MAX)
++			goto out;
++		dev->pdata.max_bus_speed = data;
++		err = 0;
++		goto out;
++	}
++	WARN_ON(1);
++	err = -ENOSYS;
++out:
++	return err ? err : count;
++}
++
++static void gpiommc_config_item_release(struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	kfree(dev);
++}
++
++static struct configfs_item_operations gpiommc_config_item_ops = {
++	.release		= gpiommc_config_item_release,
++	.show_attribute		= gpiommc_config_attr_show,
++	.store_attribute	= gpiommc_config_attr_store,
++};
++
++static struct config_item_type gpiommc_dev_ci_type = {
++	.ct_item_ops	= &gpiommc_config_item_ops,
++	.ct_attrs	= gpiommc_config_attrs,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct config_item *gpiommc_make_item(struct config_group *group,
++					     const char *name)
++{
++	struct gpiommc_configfs_device *dev;
++
++	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
++		printk(KERN_ERR PFX "configfs: device name too long\n");
++		return NULL;
++	}
++
++	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++	if (!dev)
++		return NULL;
++
++	config_item_init_type_name(&dev->item, name,
++				   &gpiommc_dev_ci_type);
++
++	/* Assign default configuration */
++	dev->pdata.pins.gpio_di = GPIO_INVALID;
++	dev->pdata.pins.gpio_do = GPIO_INVALID;
++	dev->pdata.pins.gpio_clk = GPIO_INVALID;
++	dev->pdata.pins.gpio_cs = GPIO_INVALID;
++	dev->pdata.pins.cs_activelow = 1;
++	dev->pdata.mode = SPI_MODE_0;
++	dev->pdata.no_spi_delay = 0;
++	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
++
++	return &(dev->item);
++}
++
++static void gpiommc_drop_item(struct config_group *group,
++			      struct config_item *item)
++{
++	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
++
++	gpiommc_do_unregister(dev);
++	kfree(dev);
++}
++
++static struct configfs_group_operations gpiommc_ct_group_ops = {
++	.make_item	= gpiommc_make_item,
++	.drop_item	= gpiommc_drop_item,
++};
++
++static struct config_item_type gpiommc_ci_type = {
++	.ct_group_ops	= &gpiommc_ct_group_ops,
++	.ct_owner	= THIS_MODULE,
++};
++
++static struct configfs_subsystem gpiommc_subsys = {
++	.su_group = {
++		.cg_item = {
++			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
++			.ci_type = &gpiommc_ci_type,
++		},
++	},
++	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
++};
++
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++static struct platform_driver gpiommc_plat_driver = {
++	.probe	= gpiommc_probe,
++	.remove	= gpiommc_remove,
++	.driver	= {
++		.name	= GPIOMMC_PLATDEV_NAME,
++		.owner	= THIS_MODULE,
++	},
++};
++
++int gpiommc_next_id(void)
++{
++	static atomic_t counter = ATOMIC_INIT(-1);
++
++	return atomic_inc_return(&counter);
++}
++EXPORT_SYMBOL(gpiommc_next_id);
++
++static int __init gpiommc_modinit(void)
++{
++	int err;
++
++	err = platform_driver_register(&gpiommc_plat_driver);
++	if (err)
++		return err;
++
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	config_group_init(&gpiommc_subsys.su_group);
++	err = configfs_register_subsystem(&gpiommc_subsys);
++	if (err) {
++		platform_driver_unregister(&gpiommc_plat_driver);
++		return err;
++	}
++#endif /* CONFIG_GPIOMMC_CONFIGFS */
++
++	return 0;
++}
++module_init(gpiommc_modinit);
++
++static void __exit gpiommc_modexit(void)
++{
++#ifdef CONFIG_GPIOMMC_CONFIGFS
++	configfs_unregister_subsystem(&gpiommc_subsys);
++#endif
++	platform_driver_unregister(&gpiommc_plat_driver);
++}
++module_exit(gpiommc_modexit);
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -449,6 +449,31 @@ config MMC_SDHI
+ 	  This provides support for the SDHI SD/SDIO controller found in
+ 	  SuperH and ARM SH-Mobile SoCs
+ 
++config GPIOMMC
++	tristate "MMC/SD over GPIO-based SPI"
++	depends on MMC && MMC_SPI && SPI_GPIO_OLD
++	help
++	  This driver hooks up the mmc_spi and spi_gpio modules so that
++	  MMC/SD cards can be used on a GPIO based bus by bitbanging
++	  the SPI protocol in software.
++
++	  This driver provides a configfs interface to dynamically create
++	  and destroy GPIO-based MMC/SD card devices. It also provides
++	  a platform device interface API.
++	  See Documentation/gpiommc.txt for details.
++
++	  The module will be called gpiommc.
++
++	  If unsure, say N.
++
++config GPIOMMC_CONFIGFS
++	bool
++	depends on GPIOMMC && CONFIGFS_FS
++	default y
++	help
++	  This option automatically enables configfs support for gpiommc
++	  if configfs is available.
++
+ config MMC_CB710
+ 	tristate "ENE CB710 MMC/SD Interface support"
+ 	depends on PCI
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -36,6 +36,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S
+ obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o
+ obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o
+ obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
++obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
+ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
+ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
+ obj-$(CONFIG_MMC_DW_PLTFM)	+= dw_mmc-pltfm.o
+--- /dev/null
++++ b/include/linux/mmc/gpiommc.h
+@@ -0,0 +1,71 @@
++/*
++ * Device driver for MMC/SD cards driven over a GPIO bus.
++ *
++ * Copyright (c) 2008 Michael Buesch
++ *
++ * Licensed under the GNU/GPL version 2.
++ */
++#ifndef LINUX_GPIOMMC_H_
++#define LINUX_GPIOMMC_H_
++
++#include <linux/types.h>
++
++
++#define GPIOMMC_MAX_NAMELEN		15
++#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
++
++/**
++ * struct gpiommc_pins - Hardware pin assignments
++ *
++ * @gpio_di: The GPIO number of the DATA IN pin
++ * @gpio_do: The GPIO number of the DATA OUT pin
++ * @gpio_clk: The GPIO number of the CLOCK pin
++ * @gpio_cs: The GPIO number of the CHIPSELECT pin
++ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
++ */
++struct gpiommc_pins {
++	unsigned int gpio_di;
++	unsigned int gpio_do;
++	unsigned int gpio_clk;
++	unsigned int gpio_cs;
++	bool cs_activelow;
++};
++
++/**
++ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
++ *
++ * @name: The unique name string of the device.
++ * @pins: The hardware pin assignments.
++ * @mode: The hardware mode. This is either SPI_MODE_0,
++ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
++ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
++ *                This is not standards compliant, but may be required for some
++ *                embedded machines to gain reasonable speed.
++ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
++ */
++struct gpiommc_platform_data {
++	char name[GPIOMMC_MAX_NAMELEN + 1];
++	struct gpiommc_pins pins;
++	u8 mode;
++	bool no_spi_delay;
++	unsigned int max_bus_speed;
++};
++
++/**
++ * GPIOMMC_PLATDEV_NAME - The platform device name string.
++ *
++ * The name string that has to be used for platform_device_alloc
++ * when allocating a gpiommc device.
++ */
++#define GPIOMMC_PLATDEV_NAME	"gpiommc"
++
++/**
++ * gpiommc_next_id - Get another platform device ID number.
++ *
++ * This returns the next platform device ID number that has to be used
++ * for platform_device_alloc. The ID is opaque and should not be used for
++ * anything else.
++ */
++int gpiommc_next_id(void);
++
++#endif /* LINUX_GPIOMMC_H_ */
+--- /dev/null
++++ b/Documentation/gpiommc.txt
+@@ -0,0 +1,97 @@
++GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
++================================================================
++
++The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
++MMC or SD card on GPIO pins.
++
++Two interfaces for registering a new MMC/SD card device are provided:
++A static platform-device based mechanism and a dynamic configfs based interface.
++
++
++Registering devices via platform-device
++=======================================
++
++The platform-device interface is used for registering MMC/SD devices that are
++part of the hardware platform. This is most useful only for embedded machines
++with MMC/SD devices statically connected to the platform GPIO bus.
++
++The data structures are declared in <linux/mmc/gpiommc.h>.
++
++To register a new device, define an instance of struct gpiommc_platform_data.
++This structure holds any information about how the device is hooked up to the
++GPIO pins and what hardware modes the device supports. See the docbook-style
++documentation in the header file for more information on the struct fields.
++
++Then allocate a new instance of a platform device by doing:
++
++	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
++
++This will allocate the platform device data structures and hook it up to the
++gpiommc driver.
++Then add the gpiommc_platform_data to the platform device.
++
++	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
++
++You may free the local instance of struct gpiommc_platform_data now. (So the
++struct may be allocated on the stack, too).
++Now simply register the platform device.
++
++	err = platform_device_add(pdev);
++
++Done. The gpiommc probe routine will be invoked now and you should see a kernel
++log message for the added device.
++
++
++Registering devices via configfs
++================================
++
++MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
++selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
++hardware are a common situation.
++So we provide a dynamic interface to conveniently handle adding and removing
++devices from userspace, without the need to recompile the kernel.
++
++The "gpiommc" subdirectory at the configfs mountpoint is used for handling
++the dynamic configuration.
++
++To create a new device, it must first be allocated with mkdir.
++The following command will allocate a device named "my_mmc":
++	mkdir /config/gpiommc/my_mmc
++
++There are several configuration files available in the new
++/config/gpiommc/my_mmc/ directory:
++
++gpio_data_in			= The SPI data-IN GPIO pin number.
++gpio_data_out			= The SPI data-OUT GPIO pin number.
++gpio_clock			= The SPI Clock GPIO pin number.
++gpio_chipselect			= The SPI Chipselect GPIO pin number.
++gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
++				  If 1, Chipselect is active-LOW.
++spi_mode			= The SPI data mode. Can be 0-3.
++spi_delay			= Enable all delays in the lowlevel bitbanging.
++max_bus_speed			= The maximum SPI bus speed. In Hertz.
++
++register			= Not a configuration parameter.
++				  Used to register the configured card
++				  with the kernel.
++
++The device must first get configured and then registered by writing "1" to
++the "register" file.
++The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
++and "gpio_chipselect" are essential and _must_ be configured before writing
++"1" to the "register" file. The registration will fail, otherwise.
++
++The default values for the other parameters are:
++gpio_chipselect_activelow	= 1		(CS active-LOW)
++spi_mode			= 0		(SPI_MODE_0)
++spi_delay			= 1		(enabled)
++max_bus_speed			= 5000000	(5 Mhz)
++
++Configuration values can not be changed after registration. To unregister
++the device, write a "0" to the "register" file. The configuration can be
++changed again after unregistering.
++
++To completely remove the device, simply rmdir the directory
++(/config/gpiommc/my_mmc in this example).
++There's no need to first unregister the device before removing it. That will
++be done automatically.
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3507,6 +3507,11 @@ L:	linuxppc-dev@lists.ozlabs.org
+ S:	Odd Fixes
+ F:	drivers/tty/hvc/
+ 
++GPIOMMC DRIVER
++P:	Michael Buesch
++M:	mb@bu3sch.de
++S:	Maintained
++
+ HARDWARE MONITORING
+ M:	Jean Delvare <khali@linux-fr.org>
+ M:	Guenter Roeck <linux@roeck-us.net>
diff --git a/trunk/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch b/trunk/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch
new file mode 100644
index 00000000..92815d91
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch
@@ -0,0 +1,58 @@
+The gpiommc configfs context structure needs locking, as configfs
+does not lock access between files.
+
+--- a/drivers/mmc/host/gpiommc.c
++++ b/drivers/mmc/host/gpiommc.c
+@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
+ 	struct platform_device *pdev;
+ 	/* The configuration */
+ 	struct gpiommc_platform_data pdata;
++	/* Mutex to protect this structure */
++	struct mutex mutex;
+ };
+ 
+ #define GPIO_INVALID	-1
+@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	unsigned int gpio;
+ 	int err = 0;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_DI) {
+ 		gpio = dev->pdata.pins.gpio_di;
+ 		if (gpio == GPIO_INVALID)
+@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
+ 	int err = -EINVAL;
+ 	unsigned long data;
+ 
++	mutex_lock(&dev->mutex);
++
+ 	if (attr == &gpiommc_attr_register) {
+ 		err = kstrtoul(page, 10, &data);
+ 		if (err)
+@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
+ 	WARN_ON(1);
+ 	err = -ENOSYS;
+ out:
++	mutex_unlock(&dev->mutex);
++
+ 	return err ? err : count;
+ }
+ 
+@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
+ 	if (!dev)
+ 		return NULL;
+ 
++	mutex_init(&dev->mutex);
+ 	config_item_init_type_name(&dev->item, name,
+ 				   &gpiommc_dev_ci_type);
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/870-hifn795x_byteswap.patch b/trunk/target/linux/generic/patches-3.8/870-hifn795x_byteswap.patch
new file mode 100644
index 00000000..3a37c951
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/870-hifn795x_byteswap.patch
@@ -0,0 +1,17 @@
+--- a/drivers/crypto/hifn_795x.c
++++ b/drivers/crypto/hifn_795x.c
+@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
+ 
+ static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
++	writel(val, dev->bar[0] + reg);
+ }
+ 
+ static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
+ {
+-	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
++	writel(val, dev->bar[1] + reg);
+ }
+ 
+ static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/trunk/target/linux/generic/patches-3.8/880-gateworks_system_controller.patch b/trunk/target/linux/generic/patches-3.8/880-gateworks_system_controller.patch
new file mode 100644
index 00000000..1ec09606
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/880-gateworks_system_controller.patch
@@ -0,0 +1,339 @@
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -444,6 +444,15 @@ config SENSORS_GL520SM
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called gl520sm.
+ 
++config SENSORS_GSC
++	tristate "Gateworks System Controller"
++	depends on I2C
++	help
++	  If you say yes here you get support for the Gateworks System Controller.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called gsc.
++
+ config SENSORS_GPIO_FAN
+ 	tristate "GPIO fan"
+ 	depends on GPIOLIB
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -132,6 +132,7 @@ obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l7
+ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
+ obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
+ obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
++obj-$(CONFIG_SENSORS_GSC)	+= gsc.o
+ 
+ obj-$(CONFIG_PMBUS)		+= pmbus/
+ 
+--- /dev/null
++++ b/drivers/hwmon/gsc.c
+@@ -0,0 +1,308 @@
++/*
++ * A hwmon driver for the Gateworks System Controller 
++ * Copyright (C) 2009 Gateworks Corporation
++ *
++ * Author: Chris Lang <clang@gateworks.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License,
++ * as published by the Free Software Foundation - version 2.
++ */
++
++#include <linux/module.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++
++#define DRV_VERSION "0.2"
++
++enum chips { gsp };
++
++/* AD7418 registers */
++#define GSP_REG_TEMP_IN		0x00
++#define GSP_REG_VIN		0x02
++#define GSP_REG_3P3		0x05
++#define GSP_REG_BAT		0x08
++#define GSP_REG_5P0		0x0b
++#define GSP_REG_CORE		0x0e
++#define GSP_REG_CPU1		0x11
++#define GSP_REG_CPU2		0x14
++#define GSP_REG_DRAM		0x17
++#define GSP_REG_EXT_BAT		0x1a
++#define GSP_REG_IO1		0x1d
++#define GSP_REG_IO2 		0x20
++#define GSP_REG_PCIE		0x23
++#define GSP_REG_CURRENT		0x26
++#define GSP_FAN_0		0x2C
++#define GSP_FAN_1		0x2E
++#define GSP_FAN_2		0x30
++#define GSP_FAN_3		0x32
++#define GSP_FAN_4		0x34
++#define GSP_FAN_5		0x36
++
++struct gsp_sensor_info {
++	const char* name;
++	int reg;
++};
++
++static const struct gsp_sensor_info gsp_sensors[] = {
++	{"temp", GSP_REG_TEMP_IN},
++	{"vin", GSP_REG_VIN},
++	{"3p3", GSP_REG_3P3},
++	{"bat", GSP_REG_BAT},
++	{"5p0", GSP_REG_5P0},
++	{"core", GSP_REG_CORE},
++	{"cpu1", GSP_REG_CPU1},
++	{"cpu2", GSP_REG_CPU2},
++	{"dram", GSP_REG_DRAM},
++	{"ext_bat", GSP_REG_EXT_BAT},
++	{"io1", GSP_REG_IO1},
++	{"io2", GSP_REG_IO2},
++	{"pci2", GSP_REG_PCIE},
++	{"current", GSP_REG_CURRENT},
++	{"fan_point0", GSP_FAN_0},
++	{"fan_point1", GSP_FAN_1},
++	{"fan_point2", GSP_FAN_2},
++	{"fan_point3", GSP_FAN_3},
++	{"fan_point4", GSP_FAN_4},
++	{"fan_point5", GSP_FAN_5},
++};
++
++struct gsp_data {
++	struct device		*hwmon_dev;
++	struct attribute_group	attrs;
++	enum chips		type;
++};
++
++static int gsp_probe(struct i2c_client *client,
++			const struct i2c_device_id *id);
++static int gsp_remove(struct i2c_client *client);
++
++static const struct i2c_device_id gsp_id[] = {
++	{ "gsp", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, gsp_id);
++
++static struct i2c_driver gsp_driver = {
++	.driver = {
++		.name	= "gsp",
++	},
++	.probe		= gsp_probe,
++	.remove		= gsp_remove,
++	.id_table	= gsp_id,
++};
++
++/* All registers are word-sized, except for the configuration registers.
++ * AD7418 uses a high-byte first convention. Do NOT use those functions to
++ * access the configuration registers CONF and CONF2, as they are byte-sized.
++ */
++static inline int gsp_read(struct i2c_client *client, u8 reg)
++{
++	unsigned int adc = 0;
++	if (reg == GSP_REG_TEMP_IN || reg > GSP_REG_CURRENT)
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		return adc;
++	}
++	else
++	{
++		adc |= i2c_smbus_read_byte_data(client, reg);
++		adc |= i2c_smbus_read_byte_data(client, reg + 1) << 8;
++		adc |= i2c_smbus_read_byte_data(client, reg + 2) << 16;
++		return adc;
++	}
++}
++
++static inline int gsp_write(struct i2c_client *client, u8 reg, u16 value)
++{
++	i2c_smbus_write_byte_data(client, reg, value & 0xff);
++	i2c_smbus_write_byte_data(client, reg + 1, ((value >> 8) & 0xff));
++	return 1;
++}
++
++static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
++			char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	return sprintf(buf, "%d\n", gsp_read(client, gsp_sensors[attr->index].reg));
++}
++
++static ssize_t show_label(struct device *dev,
++			struct device_attribute *devattr, char *buf)
++{
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++
++	return sprintf(buf, "%s\n", gsp_sensors[attr->index].name);
++}
++
++static ssize_t store_fan(struct device *dev,
++			struct device_attribute *devattr, const char *buf, size_t count)
++{
++	u16 val;
++	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++	struct i2c_client *client = to_i2c_client(dev);
++	val = simple_strtoul(buf, NULL, 10);
++	gsp_write(client, gsp_sensors[attr->index].reg, val);
++	return count;
++}
++
++static SENSOR_DEVICE_ATTR(temp0_input, S_IRUGO, show_adc, NULL, 0);
++static SENSOR_DEVICE_ATTR(temp0_label, S_IRUGO, show_label, NULL, 0);
++
++static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_adc, NULL, 1);
++static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, show_label, NULL, 1);
++static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 2);
++static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, show_label, NULL, 2);
++static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 3);
++static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, show_label, NULL, 3);
++static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 4);
++static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 4);
++static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 5);
++static SENSOR_DEVICE_ATTR(in4_label, S_IRUGO, show_label, NULL, 5);
++static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_adc, NULL, 6);
++static SENSOR_DEVICE_ATTR(in5_label, S_IRUGO, show_label, NULL, 6);
++static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_adc, NULL, 7);
++static SENSOR_DEVICE_ATTR(in6_label, S_IRUGO, show_label, NULL, 7);
++static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_adc, NULL, 8);
++static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 8);
++static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, show_adc, NULL, 9);
++static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 9);
++static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_adc, NULL, 10);
++static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 10);
++static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_adc, NULL, 11);
++static SENSOR_DEVICE_ATTR(in10_label, S_IRUGO, show_label, NULL, 11);
++static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, show_adc, NULL, 12);
++static SENSOR_DEVICE_ATTR(in11_label, S_IRUGO, show_label, NULL, 12);
++static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, show_adc, NULL, 13);
++static SENSOR_DEVICE_ATTR(in12_label, S_IRUGO, show_label, NULL, 13);
++
++static SENSOR_DEVICE_ATTR(fan0_point0, S_IRUGO | S_IWUSR, show_adc, store_fan, 14);
++static SENSOR_DEVICE_ATTR(fan0_point1, S_IRUGO | S_IWUSR, show_adc, store_fan, 15);
++static SENSOR_DEVICE_ATTR(fan0_point2, S_IRUGO | S_IWUSR, show_adc, store_fan, 16);
++static SENSOR_DEVICE_ATTR(fan0_point3, S_IRUGO | S_IWUSR, show_adc, store_fan, 17);
++static SENSOR_DEVICE_ATTR(fan0_point4, S_IRUGO | S_IWUSR, show_adc, store_fan, 18);
++static SENSOR_DEVICE_ATTR(fan0_point5, S_IRUGO | S_IWUSR, show_adc, store_fan, 19);
++
++static struct attribute *gsp_attributes[] = {
++	&sensor_dev_attr_temp0_input.dev_attr.attr,
++	&sensor_dev_attr_in0_input.dev_attr.attr,
++	&sensor_dev_attr_in1_input.dev_attr.attr,
++	&sensor_dev_attr_in2_input.dev_attr.attr,
++	&sensor_dev_attr_in3_input.dev_attr.attr,
++	&sensor_dev_attr_in4_input.dev_attr.attr,
++	&sensor_dev_attr_in5_input.dev_attr.attr,
++	&sensor_dev_attr_in6_input.dev_attr.attr,
++	&sensor_dev_attr_in7_input.dev_attr.attr,
++	&sensor_dev_attr_in8_input.dev_attr.attr,
++	&sensor_dev_attr_in9_input.dev_attr.attr,
++	&sensor_dev_attr_in10_input.dev_attr.attr,
++	&sensor_dev_attr_in11_input.dev_attr.attr,
++	&sensor_dev_attr_in12_input.dev_attr.attr,
++
++	&sensor_dev_attr_temp0_label.dev_attr.attr,
++	&sensor_dev_attr_in0_label.dev_attr.attr,
++	&sensor_dev_attr_in1_label.dev_attr.attr,
++	&sensor_dev_attr_in2_label.dev_attr.attr,
++	&sensor_dev_attr_in3_label.dev_attr.attr,
++	&sensor_dev_attr_in4_label.dev_attr.attr,
++	&sensor_dev_attr_in5_label.dev_attr.attr,
++	&sensor_dev_attr_in6_label.dev_attr.attr,
++	&sensor_dev_attr_in7_label.dev_attr.attr,
++	&sensor_dev_attr_in8_label.dev_attr.attr,
++	&sensor_dev_attr_in9_label.dev_attr.attr,
++	&sensor_dev_attr_in10_label.dev_attr.attr,
++	&sensor_dev_attr_in11_label.dev_attr.attr,
++	&sensor_dev_attr_in12_label.dev_attr.attr,
++
++	&sensor_dev_attr_fan0_point0.dev_attr.attr,
++	&sensor_dev_attr_fan0_point1.dev_attr.attr,
++	&sensor_dev_attr_fan0_point2.dev_attr.attr,
++	&sensor_dev_attr_fan0_point3.dev_attr.attr,
++	&sensor_dev_attr_fan0_point4.dev_attr.attr,
++	&sensor_dev_attr_fan0_point5.dev_attr.attr,
++	NULL
++};
++
++
++static int gsp_probe(struct i2c_client *client,
++			 const struct i2c_device_id *id)
++{
++	struct i2c_adapter *adapter = client->adapter;
++	struct gsp_data *data;
++	int err;
++
++	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
++					I2C_FUNC_SMBUS_WORD_DATA)) {
++		err = -EOPNOTSUPP;
++		goto exit;
++	}
++
++	if (!(data = kzalloc(sizeof(struct gsp_data), GFP_KERNEL))) {
++		err = -ENOMEM;
++		goto exit;
++	}
++
++	i2c_set_clientdata(client, data);
++
++	data->type = id->driver_data;
++
++	switch (data->type) {
++	case 0:
++		data->attrs.attrs = gsp_attributes;
++		break;
++	}
++
++	dev_info(&client->dev, "%s chip found\n", client->name);
++
++	/* Register sysfs hooks */
++	if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
++		goto exit_free;
++
++	data->hwmon_dev = hwmon_device_register(&client->dev);
++	if (IS_ERR(data->hwmon_dev)) {
++		err = PTR_ERR(data->hwmon_dev);
++		goto exit_remove;
++	}
++
++	return 0;
++
++exit_remove:
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++exit_free:
++	kfree(data);
++exit:
++	return err;
++}
++
++static int gsp_remove(struct i2c_client *client)
++{
++	struct gsp_data *data = i2c_get_clientdata(client);
++	hwmon_device_unregister(data->hwmon_dev);
++	sysfs_remove_group(&client->dev.kobj, &data->attrs);
++	kfree(data);
++	return 0;
++}
++
++static int __init gsp_init(void)
++{
++	return i2c_add_driver(&gsp_driver);
++}
++
++static void __exit gsp_exit(void)
++{
++	i2c_del_driver(&gsp_driver);
++}
++
++module_init(gsp_init);
++module_exit(gsp_exit);
++
++MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
++MODULE_DESCRIPTION("GSC HWMON driver");
++MODULE_LICENSE("GPL");
++MODULE_VERSION(DRV_VERSION);
++
diff --git a/trunk/target/linux/generic/patches-3.8/890-8250_optional_sysrq.patch b/trunk/target/linux/generic/patches-3.8/890-8250_optional_sysrq.patch
new file mode 100644
index 00000000..1748a048
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/890-8250_optional_sysrq.patch
@@ -0,0 +1,24 @@
+--- a/drivers/tty/serial/8250/Kconfig
++++ b/drivers/tty/serial/8250/Kconfig
+@@ -74,6 +74,10 @@ config SERIAL_8250_CONSOLE
+ 
+ 	  If unsure, say N.
+ 
++config SERIAL_8250_SYSRQ
++	bool "Magic sysrq support on 8250/16550 devices"
++	depends on SERIAL_8250_CONSOLE
++
+ config FIX_EARLYCON_MEM
+ 	bool
+ 	depends on X86
+--- a/drivers/tty/serial/8250/8250.c
++++ b/drivers/tty/serial/8250/8250.c
+@@ -16,7 +16,7 @@
+  *  membase is an 'ioremapped' cookie.
+  */
+ 
+-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
++#if defined(CONFIG_SERIAL_8250_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ)
+ #define SUPPORT_SYSRQ
+ #endif
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/900-slab_maxsize.patch b/trunk/target/linux/generic/patches-3.8/900-slab_maxsize.patch
new file mode 100644
index 00000000..8c404ea6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/900-slab_maxsize.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -156,8 +156,8 @@ void kmem_cache_free(struct kmem_cache *
+  * to do various tricks to work around compiler limitations in order to
+  * ensure proper constant folding.
+  */
+-#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
+-				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
++#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
++				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
+ 
+ #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
+ #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/trunk/target/linux/generic/patches-3.8/901-debloat_sock_diag.patch b/trunk/target/linux/generic/patches-3.8/901-debloat_sock_diag.patch
new file mode 100644
index 00000000..4065f8ae
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/901-debloat_sock_diag.patch
@@ -0,0 +1,46 @@
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -87,6 +87,9 @@ source "net/netlabel/Kconfig"
+ 
+ endif # if INET
+ 
++config SOCK_DIAG
++	bool
++
+ config NETWORK_SECMARK
+ 	bool "Security Marking"
+ 	help
+--- a/net/core/Makefile
++++ b/net/core/Makefile
+@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o
+ obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
+ 
+ obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
+-			neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
+-			sock_diag.o
++			neighbour.o rtnetlink.o utils.o link_watch.o filter.o
+ 
++obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
+ obj-$(CONFIG_XFRM) += flow.o
+ obj-y += net-sysfs.o
+ obj-$(CONFIG_NET_PKTGEN) += pktgen.o
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -404,6 +404,7 @@ config INET_LRO
+ 
+ config INET_DIAG
+ 	tristate "INET: socket monitoring interface"
++	select SOCK_DIAG
+ 	default y
+ 	---help---
+ 	  Support for INET (TCP, DCCP, etc) socket monitoring interface used by
+--- a/net/unix/Kconfig
++++ b/net/unix/Kconfig
+@@ -22,6 +22,7 @@ config UNIX
+ config UNIX_DIAG
+ 	tristate "UNIX: socket monitoring interface"
+ 	depends on UNIX
++	select SOCK_DIAG
+ 	default n
+ 	---help---
+ 	  Support for UNIX socket monitoring interface used by the ss tool.
diff --git a/trunk/target/linux/generic/patches-3.8/902-debloat_proc.patch b/trunk/target/linux/generic/patches-3.8/902-debloat_proc.patch
new file mode 100644
index 00000000..3ac9914f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/902-debloat_proc.patch
@@ -0,0 +1,327 @@
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -2267,6 +2267,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_locks_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("locks", 0, NULL, &proc_locks_operations);
+ 	return 0;
+ }
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -67,3 +67,8 @@ config PROC_PAGE_MONITOR
+ 	  /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap,
+ 	  /proc/kpagecount, and /proc/kpageflags. Disabling these
+           interfaces will reduce the size of the kernel by approximately 4kb.
++
++config PROC_STRIPPED
++	default n
++	depends on EXPERT
++	bool "Strip non-essential /proc functionality to reduce code size"
+--- a/fs/proc/consoles.c
++++ b/fs/proc/consoles.c
+@@ -108,6 +108,9 @@ static const struct file_operations proc
+ 
+ static int __init proc_consoles_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	proc_create("consoles", 0, NULL, &proc_consoles_operations);
+ 	return 0;
+ }
+--- a/fs/proc/proc_tty.c
++++ b/fs/proc/proc_tty.c
+@@ -143,7 +143,10 @@ static const struct file_operations proc
+ void proc_tty_register_driver(struct tty_driver *driver)
+ {
+ 	struct proc_dir_entry *ent;
+-		
++
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!driver->driver_name || driver->proc_entry ||
+ 	    !driver->ops->proc_fops)
+ 		return;
+@@ -160,6 +163,9 @@ void proc_tty_unregister_driver(struct t
+ {
+ 	struct proc_dir_entry *ent;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ent = driver->proc_entry;
+ 	if (!ent)
+ 		return;
+@@ -174,6 +180,9 @@ void proc_tty_unregister_driver(struct t
+  */
+ void __init proc_tty_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (!proc_mkdir("tty", NULL))
+ 		return;
+ 	proc_tty_ldisc = proc_mkdir("tty/ldisc", NULL);
+--- a/kernel/exec_domain.c
++++ b/kernel/exec_domain.c
+@@ -173,6 +173,8 @@ static const struct file_operations exec
+ 
+ static int __init proc_execdomains_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
+ 	return 0;
+ }
+--- a/kernel/irq/proc.c
++++ b/kernel/irq/proc.c
+@@ -311,6 +311,9 @@ void register_irq_proc(unsigned int irq,
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir)
+ 		return;
+ 
+@@ -347,6 +350,9 @@ void unregister_irq_proc(unsigned int ir
+ {
+ 	char name [MAX_NAMELEN];
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	if (!root_irq_dir || !desc->dir)
+ 		return;
+ #ifdef CONFIG_SMP
+@@ -386,6 +392,9 @@ void init_irq_proc(void)
+ 	unsigned int irq;
+ 	struct irq_desc *desc;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
++		return;
++
+ 	/* create /proc/irq */
+ 	root_irq_dir = proc_mkdir("irq", NULL);
+ 	if (!root_irq_dir)
+--- a/kernel/time/timer_list.c
++++ b/kernel/time/timer_list.c
+@@ -293,6 +293,8 @@ static int __init init_timer_list_procfs
+ {
+ 	struct proc_dir_entry *pe;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
+ 	if (!pe)
+ 		return -ENOMEM;
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -2638,6 +2638,8 @@ static const struct file_operations proc
+ 
+ static int __init proc_vmalloc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
+ 	return 0;
+ }
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -1238,10 +1238,12 @@ static int __init setup_vmstat(void)
+ 		start_cpu_timer(cpu);
+ #endif
+ #ifdef CONFIG_PROC_FS
+-	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
+-	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
++		proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
++		proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
++	}
+ 	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
+-	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
+ #endif
+ 	return 0;
+ }
+--- a/net/8021q/vlanproc.c
++++ b/net/8021q/vlanproc.c
+@@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net)
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	if (vn->proc_vlan_conf)
+ 		remove_proc_entry(name_conf, vn->proc_vlan_dir);
+ 
+@@ -146,6 +149,9 @@ int __net_init vlan_proc_init(struct net
+ {
+ 	struct vlan_net *vn = net_generic(net, vlan_net_id);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
+ 	if (!vn->proc_vlan_dir)
+ 		goto err;
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -4588,9 +4588,11 @@ static int __net_init dev_proc_net_init(
+ 
+ 	if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops))
+ 		goto out;
+-	if (!proc_net_fops_create(net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++	    !proc_net_fops_create(net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
+ 		goto out_dev;
+-	if (!proc_net_fops_create(net, "ptype", S_IRUGO, &ptype_seq_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++	    !proc_net_fops_create(net, "ptype", S_IRUGO, &ptype_seq_fops))
+ 		goto out_softnet;
+ 
+ 	if (wext_proc_init(net))
+@@ -4599,9 +4601,11 @@ static int __net_init dev_proc_net_init(
+ out:
+ 	return rc;
+ out_ptype:
+-	proc_net_remove(net, "ptype");
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		proc_net_remove(net, "ptype");
+ out_softnet:
+-	proc_net_remove(net, "softnet_stat");
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
++		proc_net_remove(net, "softnet_stat");
+ out_dev:
+ 	proc_net_remove(net, "dev");
+ 	goto out;
+@@ -4611,8 +4615,10 @@ static void __net_exit dev_proc_net_exit
+ {
+ 	wext_proc_exit(net);
+ 
+-	proc_net_remove(net, "ptype");
+-	proc_net_remove(net, "softnet_stat");
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		proc_net_remove(net, "ptype");
++		proc_net_remove(net, "softnet_stat");
++	}
+ 	proc_net_remove(net, "dev");
+ }
+ 
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2837,6 +2837,8 @@ static __net_initdata struct pernet_oper
+ 
+ static int __init proto_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
+ 	return register_pernet_subsys(&proto_net_ops);
+ }
+ 
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2608,10 +2608,12 @@ static const struct file_operations fib_
+ 
+ int __net_init fib_proc_init(struct net *net)
+ {
+-	if (!proc_net_fops_create(net, "fib_trie", S_IRUGO, &fib_trie_fops))
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++	    !proc_net_fops_create(net, "fib_trie", S_IRUGO, &fib_trie_fops))
+ 		goto out1;
+ 
+-	if (!proc_net_fops_create(net, "fib_triestat", S_IRUGO,
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
++	    !proc_net_fops_create(net, "fib_triestat", S_IRUGO,
+ 				  &fib_triestat_fops))
+ 		goto out2;
+ 
+@@ -2630,8 +2632,10 @@ out1:
+ 
+ void __net_exit fib_proc_exit(struct net *net)
+ {
+-	proc_net_remove(net, "fib_trie");
+-	proc_net_remove(net, "fib_triestat");
++	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
++		proc_net_remove(net, "fib_trie");
++		proc_net_remove(net, "fib_triestat");
++	}
+ 	proc_net_remove(net, "route");
+ }
+ 
+--- a/net/ipv4/proc.c
++++ b/net/ipv4/proc.c
+@@ -502,6 +502,9 @@ static __net_initdata struct pernet_oper
+ 
+ int __init ip_misc_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_proc_ops);
+ }
+ 
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -427,6 +427,9 @@ static struct pernet_operations ip_rt_pr
+ 
+ static int __init ip_rt_proc_init(void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return 0;
++
+ 	return register_pernet_subsys(&ip_rt_proc_ops);
+ }
+ 
+--- a/ipc/msg.c
++++ b/ipc/msg.c
+@@ -135,6 +135,9 @@ void __init msg_init(void)
+ 	printk(KERN_INFO "msgmni has been set to %d\n",
+ 		init_ipc_ns.msg_ctlmni);
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	ipc_init_proc_interface("sysvipc/msg",
+ 				"       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
+ 				IPC_MSG_IDS, sysvipc_msg_proc_show);
+--- a/ipc/sem.c
++++ b/ipc/sem.c
+@@ -185,6 +185,8 @@ void sem_exit_ns(struct ipc_namespace *n
+ void __init sem_init (void)
+ {
+ 	sem_init_ns(&init_ipc_ns);
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/sem",
+ 				"       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
+ 				IPC_SEM_IDS, sysvipc_sem_proc_show);
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -115,6 +115,8 @@ pure_initcall(ipc_ns_init);
+ 
+ void __init shm_init (void)
+ {
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
+ 	ipc_init_proc_interface("sysvipc/shm",
+ #if BITS_PER_LONG <= 32
+ 				"       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
+--- a/ipc/util.c
++++ b/ipc/util.c
+@@ -149,6 +149,9 @@ void __init ipc_init_proc_interface(cons
+ 	struct proc_dir_entry *pde;
+ 	struct ipc_proc_iface *iface;
+ 
++	if (IS_ENABLED(CONFIG_PROC_STRIPPED))
++		return;
++
+ 	iface = kmalloc(sizeof(*iface), GFP_KERNEL);
+ 	if (!iface)
+ 		return;
diff --git a/trunk/target/linux/generic/patches-3.8/903-debloat_direct_io.patch b/trunk/target/linux/generic/patches-3.8/903-debloat_direct_io.patch
new file mode 100644
index 00000000..30d0238f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/903-debloat_direct_io.patch
@@ -0,0 +1,84 @@
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -62,6 +62,11 @@ config FILE_LOCKING
+           for filesystems like NFS and for the flock() system
+           call. Disabling this option saves about 11k.
+ 
++config DIRECT_IO
++	bool "Enable O_DIRECT support" if EXPERT
++	depends on BLOCK
++	default y
++
+ source "fs/notify/Kconfig"
+ 
+ source "fs/quota/Kconfig"
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -14,7 +14,8 @@ obj-y :=	open.o read_write.o file_table.
+ 		stack.o fs_struct.o statfs.o
+ 
+ ifeq ($(CONFIG_BLOCK),y)
+-obj-y +=	buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
++obj-y +=	buffer.o bio.o block_dev.o mpage.o ioprio.o
++obj-$(CONFIG_DIRECT_IO) += direct-io.o
+ else
+ obj-y +=	no-block.o
+ endif
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2442,12 +2442,26 @@ enum {
+ 	DIO_SKIP_HOLES	= 0x02,
+ };
+ 
++#ifdef CONFIG_DIRECT_IO
+ void dio_end_io(struct bio *bio, int error);
+ 
+ ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
+ 	struct block_device *bdev, const struct iovec *iov, loff_t offset,
+ 	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
+ 	dio_submit_t submit_io,	int flags);
++#else
++static inline void dio_end_io(struct bio *bio, int error)
++{
++}
++static inline ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
++	struct block_device *bdev, const struct iovec *iov, loff_t offset,
++	unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
++	dio_submit_t submit_io,	int flags)
++{
++	return -EOPNOTSUPP;
++}
++#endif
++
+ 
+ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
+ 		struct inode *inode, const struct iovec *iov, loff_t offset,
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -51,8 +51,10 @@ static int setfl(int fd, struct file * f
+ 		   arg |= O_NONBLOCK;
+ 
+ 	if (arg & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!filp->f_mapping || !filp->f_mapping->a_ops ||
+ 			!filp->f_mapping->a_ops->direct_IO)
++#endif
+ 				return -EINVAL;
+ 	}
+ 
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -665,9 +665,12 @@ int open_check_o_direct(struct file *f)
+ {
+ 	/* NB: we're sure to have correct a_ops only after f_op->open */
+ 	if (f->f_flags & O_DIRECT) {
++#ifdef CONFIG_DIRECT_IO
+ 		if (!f->f_mapping->a_ops ||
+ 		    ((!f->f_mapping->a_ops->direct_IO) &&
+-		    (!f->f_mapping->a_ops->get_xip_mem))) {
++		    (!f->f_mapping->a_ops->get_xip_mem)))
++#endif
++		{
+ 			return -EINVAL;
+ 		}
+ 	}
diff --git a/trunk/target/linux/generic/patches-3.8/910-kobject_uevent.patch b/trunk/target/linux/generic/patches-3.8/910-kobject_uevent.patch
new file mode 100644
index 00000000..9ee9cff6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/910-kobject_uevent.patch
@@ -0,0 +1,21 @@
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -51,6 +51,18 @@ static const char *kobject_actions[] = {
+ 	[KOBJ_OFFLINE] =	"offline",
+ };
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	mutex_lock(&uevent_sock_mutex);
++	seq = ++uevent_seqnum;
++	mutex_unlock(&uevent_sock_mutex);
++
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ /**
+  * kobject_action_type - translate action string to numeric type
+  *
diff --git a/trunk/target/linux/generic/patches-3.8/911-kobject_add_broadcast_uevent.patch b/trunk/target/linux/generic/patches-3.8/911-kobject_add_broadcast_uevent.patch
new file mode 100644
index 00000000..14c55bc6
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/911-kobject_add_broadcast_uevent.patch
@@ -0,0 +1,65 @@
+--- a/include/linux/kobject.h
++++ b/include/linux/kobject.h
+@@ -31,6 +31,8 @@
+ #define UEVENT_NUM_ENVP			32	/* number of env pointers */
+ #define UEVENT_BUFFER_SIZE		2048	/* buffer for the variables */
+ 
++struct sk_buff;
++
+ /* path to the userspace helper executed on an event */
+ extern char uevent_helper[];
+ 
+@@ -213,4 +215,7 @@ int add_uevent_var(struct kobj_uevent_en
+ int kobject_action_type(const char *buf, size_t count,
+ 			enum kobject_action *type);
+ 
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation);
++
+ #endif /* _KOBJECT_H_ */
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -382,6 +382,43 @@ int add_uevent_var(struct kobj_uevent_en
+ EXPORT_SYMBOL_GPL(add_uevent_var);
+ 
+ #if defined(CONFIG_NET)
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	struct uevent_sock *ue_sk;
++	int err = 0;
++
++	/* send netlink message */
++	mutex_lock(&uevent_sock_mutex);
++	list_for_each_entry(ue_sk, &uevent_sock_list, list) {
++		struct sock *uevent_sock = ue_sk->sk;
++		struct sk_buff *skb2;
++
++		skb2 = skb_clone(skb, allocation);
++		if (!skb2)
++			break;
++
++		err = netlink_broadcast(uevent_sock, skb2, pid, group,
++					allocation);
++		if (err)
++			break;
++	}
++	mutex_unlock(&uevent_sock_mutex);
++
++	kfree_skb(skb);
++	return err;
++}
++#else
++int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
++		     gfp_t allocation)
++{
++	kfree_skb(skb);
++	return 0;
++}
++#endif
++EXPORT_SYMBOL_GPL(broadcast_uevent);
++
++#if defined(CONFIG_NET)
+ static int uevent_net_init(struct net *net)
+ {
+ 	struct uevent_sock *ue_sk;
diff --git a/trunk/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch b/trunk/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch
new file mode 100644
index 00000000..ef3b9c2a
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch
@@ -0,0 +1,12 @@
+--- a/init/main.c
++++ b/init/main.c
+@@ -835,7 +835,8 @@ static int __ref kernel_init(void *unuse
+ 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
+ 					"defaults...\n", execute_command);
+ 	}
+-	if (!run_init_process("/sbin/init") ||
++	if (!run_init_process("/etc/preinit") ||
++	    !run_init_process("/sbin/init") ||
+ 	    !run_init_process("/etc/init") ||
+ 	    !run_init_process("/bin/init") ||
+ 	    !run_init_process("/bin/sh"))
diff --git a/trunk/target/linux/generic/patches-3.8/922-always-create-console-node-in-initramfs.patch b/trunk/target/linux/generic/patches-3.8/922-always-create-console-node-in-initramfs.patch
new file mode 100644
index 00000000..3b308dd2
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/922-always-create-console-node-in-initramfs.patch
@@ -0,0 +1,30 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -59,6 +59,18 @@ default_initramfs() {
+ 	EOF
+ }
+ 
++list_librecmc_initramfs() {
++	:
++}
++
++librecmc_initramfs() {
++	# make sure that /dev/console exists
++	cat <<-EOF >> ${output}
++		dir /dev 0755 0 0
++		nod /dev/console 0600 0 0 c 5 1
++	EOF
++}
++
+ filetype() {
+ 	local argv1="$1"
+ 
+@@ -177,6 +189,8 @@ dir_filelist() {
+ 	if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
+ 		${dep_list}print_mtime "$1"
+ 
++		${dep_list}librecmc_initramfs
++
+ 		echo "${dirlist}" | \
+ 		while read x; do
+ 			${dep_list}parse ${x}
diff --git a/trunk/target/linux/generic/patches-3.8/930-crashlog.patch b/trunk/target/linux/generic/patches-3.8/930-crashlog.patch
new file mode 100644
index 00000000..4d0fc029
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/930-crashlog.patch
@@ -0,0 +1,276 @@
+--- /dev/null
++++ b/include/linux/crashlog.h
+@@ -0,0 +1,17 @@
++#ifndef __CRASHLOG_H
++#define __CRASHLOG_H
++
++#ifdef CONFIG_CRASHLOG
++void crashlog_init_bootmem(struct bootmem_data *bdata);
++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
++#else
++static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
++{
++}
++
++static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++}
++#endif
++
++#endif
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1154,6 +1154,10 @@ config RELAY
+ 
+ 	  If unsure, say N.
+ 
++config CRASHLOG
++	bool "Crash logging"
++	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !(ARM || SPARC || PPC)
++
+ config BLK_DEV_INITRD
+ 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+ 	depends on BROKEN || !FRV
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -111,6 +111,7 @@ obj-$(CONFIG_PADATA) += padata.o
+ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
+ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
+ obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
++obj-$(CONFIG_CRASHLOG) += crashlog.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
+--- /dev/null
++++ b/kernel/crashlog.c
+@@ -0,0 +1,181 @@
++/*
++ * Crash information logger
++ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ *
++ * Based on ramoops.c
++ *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
++ *
++ * This program is free software; you can redistribute 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 that 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/bootmem.h>
++#include <linux/memblock.h>
++#include <linux/debugfs.h>
++#include <linux/crashlog.h>
++#include <linux/kmsg_dump.h>
++#include <linux/module.h>
++#include <linux/pfn.h>
++#include <asm/io.h>
++
++#define CRASHLOG_PAGES	4
++#define CRASHLOG_SIZE	(CRASHLOG_PAGES * PAGE_SIZE)
++#define CRASHLOG_MAGIC	0xa1eedead
++
++/*
++ * Start the log at 1M before the end of RAM, as some boot loaders like
++ * to use the end of the RAM for stack usage and other things
++ * If this fails, fall back to using the last part.
++ */
++#define CRASHLOG_OFFSET	(1024 * 1024)
++
++struct crashlog_data {
++	u32 magic;
++	u32 len;
++	u8 data[];
++};
++
++static struct debugfs_blob_wrapper crashlog_blob;
++static unsigned long crashlog_addr = 0;
++static struct crashlog_data *crashlog_buf;
++static struct kmsg_dumper dump;
++static bool first = true;
++
++extern struct list_head *crashlog_modules;
++
++#ifndef CONFIG_NO_BOOTMEM
++void __init crashlog_init_bootmem(bootmem_data_t *bdata)
++{
++	unsigned long addr;
++
++	if (crashlog_addr)
++		return;
++
++	addr = PFN_PHYS(bdata->node_low_pfn) - CRASHLOG_OFFSET;
++	if (reserve_bootmem(addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", addr);
++		bdata->node_low_pfn -= CRASHLOG_PAGES;
++		addr = PFN_PHYS(bdata->node_low_pfn);
++	}
++	crashlog_addr = addr;
++}
++#endif
++
++#ifdef CONFIG_HAVE_MEMBLOCK
++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++{
++	if (crashlog_addr)
++		return;
++
++	addr += size - CRASHLOG_OFFSET;
++	if (memblock_reserve(addr, CRASHLOG_SIZE)) {
++		printk("Crashlog failed to allocate RAM at address 0x%lx\n", (unsigned long) addr);
++		return;
++	}
++
++	crashlog_addr = addr;
++}
++#endif
++
++static void __init crashlog_copy(void)
++{
++	if (crashlog_buf->magic != CRASHLOG_MAGIC)
++		return;
++
++	if (!crashlog_buf->len || crashlog_buf->len >
++	    CRASHLOG_SIZE - sizeof(*crashlog_buf))
++		return;
++
++	crashlog_blob.size = crashlog_buf->len;
++	crashlog_blob.data = kmemdup(crashlog_buf->data,
++		crashlog_buf->len, GFP_KERNEL);
++
++	debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
++}
++
++static int get_maxlen(void)
++{
++	return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
++}
++
++static void crashlog_printf(const char *fmt, ...)
++{
++	va_list args;
++	int len = get_maxlen();
++
++	if (!len)
++		return;
++
++	va_start(args, fmt);
++	crashlog_buf->len += vscnprintf(
++		&crashlog_buf->data[crashlog_buf->len],
++		len, fmt, args);
++	va_end(args);
++}
++
++static void crashlog_do_dump(struct kmsg_dumper *dumper,
++		enum kmsg_dump_reason reason)
++{
++	struct timeval tv;
++	struct module *m;
++	char *buf;
++	size_t len;
++
++	if (!first)
++		crashlog_printf("\n===================================\n");
++
++	do_gettimeofday(&tv);
++	crashlog_printf("Time: %lu.%lu\n",
++		(long)tv.tv_sec, (long)tv.tv_usec);
++
++	if (first) {
++		crashlog_printf("Modules:");
++		list_for_each_entry(m, crashlog_modules, list) {
++			crashlog_printf("\t%s@%p+%x", m->name,
++			m->module_core, m->core_size,
++			m->module_init, m->init_size);
++		}
++		crashlog_printf("\n");
++		first = false;
++	}
++
++	buf = (char *)&crashlog_buf->data[crashlog_buf->len];
++
++	kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
++
++	crashlog_buf->len += len;
++}
++
++
++int __init crashlog_init_fs(void)
++{
++	if (!crashlog_addr)
++		return -ENOMEM;
++
++	crashlog_buf = ioremap(crashlog_addr, CRASHLOG_SIZE);
++
++	crashlog_copy();
++
++	crashlog_buf->magic = CRASHLOG_MAGIC;
++	crashlog_buf->len = 0;
++
++	dump.max_reason = KMSG_DUMP_OOPS;
++	dump.dump = crashlog_do_dump;
++	kmsg_dump_register(&dump);
++
++	return 0;
++}
++module_init(crashlog_init_fs);
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -15,6 +15,7 @@
+ #include <linux/export.h>
+ #include <linux/kmemleak.h>
+ #include <linux/range.h>
++#include <linux/crashlog.h>
+ #include <linux/memblock.h>
+ 
+ #include <asm/bug.h>
+@@ -177,6 +178,7 @@ static unsigned long __init free_all_boo
+ 	if (!bdata->node_bootmem_map)
+ 		return 0;
+ 
++	crashlog_init_bootmem(bdata);
+ 	start = bdata->node_min_pfn;
+ 	end = bdata->node_low_pfn;
+ 
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -106,6 +106,9 @@ static LIST_HEAD(modules);
+ #ifdef CONFIG_KGDB_KDB
+ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+ #endif /* CONFIG_KGDB_KDB */
++#ifdef CONFIG_CRASHLOG
++struct list_head *crashlog_modules = &modules;
++#endif
+ 
+ #ifdef CONFIG_MODULE_SIG
+ #ifdef CONFIG_MODULE_SIG_FORCE
+--- a/mm/memblock.c
++++ b/mm/memblock.c
+@@ -19,6 +19,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+ #include <linux/memblock.h>
++#include <linux/crashlog.h>
+ 
+ static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
+ static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
+@@ -343,6 +344,8 @@ static void __init_memblock memblock_ins
+ 	memblock_set_region_node(rgn, nid);
+ 	type->cnt++;
+ 	type->total_size += size;
++	if (type == &memblock.memory && idx == 0)
++		crashlog_init_memblock(base, size);
+ }
+ 
+ /**
diff --git a/trunk/target/linux/generic/patches-3.8/940-ocf_kbuild_integration.patch b/trunk/target/linux/generic/patches-3.8/940-ocf_kbuild_integration.patch
new file mode 100644
index 00000000..99781e16
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/940-ocf_kbuild_integration.patch
@@ -0,0 +1,20 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -1268,3 +1268,6 @@ source "drivers/crypto/Kconfig"
+ source crypto/asymmetric_keys/Kconfig
+ 
+ endif	# if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -94,6 +94,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.
+ obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
+ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
+ 
++obj-$(CONFIG_OCF_OCF) += ocf/
++
+ #
+ # generic algorithms and the async_tx api
+ #
diff --git a/trunk/target/linux/generic/patches-3.8/941-ocf_20120127.patch b/trunk/target/linux/generic/patches-3.8/941-ocf_20120127.patch
new file mode 100644
index 00000000..3c2ba0d3
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/941-ocf_20120127.patch
@@ -0,0 +1,166 @@
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -139,6 +139,9 @@
+  * that might otherwise be identical and have very little entropy
+  * available to them (particularly common in the embedded world).
+  *
++ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++ *      int random_input_wait(void);
++ *
+  * add_input_randomness() uses the input layer interrupt timing, as well as
+  * the event type information from the hardware.
+  *
+@@ -152,6 +155,13 @@
+  * seek times do not make for good sources of entropy, as their seek
+  * times are usually fairly consistent.
+  *
++ * random_input_words() just provides a raw block of entropy to the input
++ * pool, such as from a hardware entropy generator.
++ *
++ * random_input_wait() suspends the caller until such time as the
++ * entropy pool falls below the write threshold, and returns a count of how
++ * much entropy (in bits) is needed to sustain the pool.
++ *
+  * All of these routines try to estimate how many bits of randomness a
+  * particular randomness source.  They do this by keeping track of the
+  * first and second order deltas of the event timings.
+@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk
+ }
+ #endif
+ 
++/*
++ * random_input_words - add bulk entropy to pool
++ *
++ * @buf: buffer to add
++ * @wordcount: number of __u32 words to add
++ * @ent_count: total amount of entropy (in bits) to credit
++ *
++ * this provides bulk input of entropy to the input pool
++ *
++ */
++void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
++{
++	mix_pool_bytes(&input_pool, buf, wordcount*4, NULL);
++
++	credit_entropy_bits(&input_pool, ent_count);
++
++	DEBUG_ENT("crediting %d bits => %d\n",
++		  ent_count, input_pool.entropy_count);
++	/*
++	 * Wake up waiting processes if we have enough
++	 * entropy.
++	 */
++	if (input_pool.entropy_count >= random_read_wakeup_thresh)
++		wake_up_interruptible(&random_read_wait);
++}
++EXPORT_SYMBOL(random_input_words);
++
++/*
++ * random_input_wait - wait until random needs entropy
++ *
++ * this function sleeps until the /dev/random subsystem actually
++ * needs more entropy, and then return the amount of entropy
++ * that it would be nice to have added to the system.
++ */
++int random_input_wait(void)
++{
++	int count;
++
++	wait_event_interruptible(random_write_wait, 
++			 input_pool.entropy_count < random_write_wakeup_thresh);
++
++	count = random_write_wakeup_thresh - input_pool.entropy_count;
++
++        /* likely we got woken up due to a signal */
++	if (count <= 0) count = random_read_wakeup_thresh; 
++
++	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
++		  count,
++		  input_pool.entropy_count, random_write_wakeup_thresh);
++
++	return count;
++}
++EXPORT_SYMBOL(random_input_wait);
++
++
++#define EXTRACT_SIZE 10
++
+ /*********************************************************************
+  *
+  * Entropy extraction routines
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -148,6 +148,7 @@ pid_t f_getown(struct file *filp)
+ 	read_unlock(&filp->f_owner.lock);
+ 	return pid;
+ }
++EXPORT_SYMBOL(sys_dup);
+ 
+ static int f_setown_ex(struct file *filp, unsigned long arg)
+ {
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -19,6 +19,7 @@
+ #define APOLLO_MOUSE_MINOR	7
+ #define PC110PAD_MINOR		9
+ /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
++#define CRYPTODEV_MINOR		70	/* /dev/crypto */
+ #define WATCHDOG_MINOR		130	/* Watchdog timer     */
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+--- a/include/uapi/linux/random.h
++++ b/include/uapi/linux/random.h
+@@ -34,6 +34,30 @@
+ /* Clear the entropy pool and associated counters.  (Superuser only.) */
+ #define RNDCLEARPOOL	_IO( 'R', 0x06 )
+ 
++#ifdef CONFIG_FIPS_RNG
++
++/* Size of seed value - equal to AES blocksize */
++#define AES_BLOCK_SIZE_BYTES	16
++#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
++/* Size of AES key */
++#define KEY_SIZE_BYTES		16
++
++/* ioctl() structure used by FIPS 140-2 Tests */
++struct rand_fips_test {
++	unsigned char key[KEY_SIZE_BYTES];			/* Input */
++	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
++	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
++	unsigned char result[SEED_SIZE_BYTES];		/* Output */
++};
++
++/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
++#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
++
++/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
++#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
++
++#endif /* #ifdef CONFIG_FIPS_RNG */
++
+ struct rand_pool_info {
+ 	int	entropy_count;
+ 	int	buf_size;
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -14,6 +14,10 @@ extern void add_input_randomness(unsigne
+ 				 unsigned int value);
+ extern void add_interrupt_randomness(int irq, int irq_flags);
+ 
++extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
++extern int random_input_wait(void);
++#define HAS_RANDOM_INPUT_WAIT 1
++
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
+ void generate_random_uuid(unsigned char uuid_out[16]);
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -421,6 +421,7 @@ void transfer_pid(struct task_struct *ol
+ 	new->pids[type].pid = old->pids[type].pid;
+ 	hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
diff --git a/trunk/target/linux/generic/patches-3.8/960-decompress_unlzo_fix.patch b/trunk/target/linux/generic/patches-3.8/960-decompress_unlzo_fix.patch
new file mode 100644
index 00000000..ee7c118e
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/960-decompress_unlzo_fix.patch
@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/include/linux/decompress/unlzo_mm.h
+@@ -0,0 +1,10 @@
++#ifndef UNLZO_MM_H
++#define UNLZO_MM_H
++
++#ifdef STATIC
++#define INIT
++#else
++#define INIT __init
++#endif
++
++#endif
+--- a/lib/decompress_unlzo.c
++++ b/lib/decompress_unlzo.c
+@@ -38,6 +38,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/lzo.h>
++#include <linux/decompress/unlzo_mm.h>
+ #include <linux/decompress/mm.h>
+ 
+ #include <linux/compiler.h>
diff --git a/trunk/target/linux/generic/patches-3.8/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/trunk/target/linux/generic/patches-3.8/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 00000000..65c6ef7d
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/970-remove-unsane-filenames-from-deps_initramfs-list.patch
@@ -0,0 +1,28 @@
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -50,20 +50,22 @@ ifneq ($(wildcard $(obj)/.initramfs_data
+ 	include $(obj)/.initramfs_data.cpio.d
+ endif
+ 
++deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
++
+ quiet_cmd_initfs = GEN     $@
+       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+ 
+ targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 initramfs_data.cpio.lzma initramfs_data.cpio.xz initramfs_data.cpio.lzo initramfs_data.cpio
+ # do not try to update files included in initramfs
+-$(deps_initramfs): ;
++$(deps_initramfs_sane): ;
+ 
+-$(deps_initramfs): klibcdirs
++$(deps_initramfs_sane): klibcdirs
+ # We rebuild initramfs_data.cpio if:
+ # 1) Any included file is newer then initramfs_data.cpio
+ # 2) There are changes in which files are included (added or deleted)
+ # 3) If gen_init_cpio are newer than initramfs_data.cpio
+ # 4) arguments to gen_initramfs.sh changes
+-$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
++$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
+ 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
+ 	$(call if_changed,initfs)
+ 
diff --git a/trunk/target/linux/generic/patches-3.8/980-arm_openwrt_machtypes.patch b/trunk/target/linux/generic/patches-3.8/980-arm_openwrt_machtypes.patch
new file mode 100644
index 00000000..a6cfa910
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/980-arm_openwrt_machtypes.patch
@@ -0,0 +1,34 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1204,3 +1204,31 @@ baileys			MACH_BAILEYS		BAILEYS			4169
+ familybox		MACH_FAMILYBOX		FAMILYBOX		4170
+ ensemble_mx35		MACH_ENSEMBLE_MX35	ENSEMBLE_MX35		4171
+ sc_sps_1		MACH_SC_SPS_1		SC_SPS_1		4172
++#
++# Additional mach-types supported by libreCMC
++#
++wg302v1			MACH_WG302V1		WG302V1			889
++pronghorn		MACH_PRONGHORN		PRONGHORN		928
++pronghorn_metro		MACH_PRONGHORNMETRO	PRONGHORNMETRO		1040
++sidewinder		MACH_SIDEWINDER		SIDEWINDER		1041
++wrt300nv2		MACH_WRT300NV2		WRT300NV2		1077
++compex42x		MACH_COMPEXWP18		COMPEXWP18		1273
++goldfish		MACH_GOLDFISH		GOLDFISH		1441
++cambria			MACH_CAMBRIA		CAMBRIA			1468
++dt2			MACH_DT2		DT2			1514
++ap1000			MACH_AP1000		AP1000			1543
++tw2662			MACH_TW2662		TW2662			1658
++tw5334			MACH_TW5334		TW5334			1664
++usr8200			MACH_USR8200		USR8200			1762
++mi424wr			MACH_MI424WR		MI424WR			1778
++gw2388			MACH_GW2388		GW2388			2635
++iconnect		MACH_ICONNECT		ICONNECT		2870
++nsb3ast			MACH_NSB3AST		NSB3AST			2917
++goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089
++nas6210			MACH_NAS6210		NAS6210			3104
++ns_k330			MACH_NS_K330		NS_K330			3108
++bcm2708			MACH_BCM2708		BCM2708			3138
++wn802t			MACH_WN802T		WN802T			3306
++nsa310			MACH_NSA310		NSA310			4022
++wnr3500			MACH_WNR3500		WNR3500			4407
++ap42x			MACH_AP42X		AP42X			4418
diff --git a/trunk/target/linux/generic/patches-3.8/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/trunk/target/linux/generic/patches-3.8/992-mpcore_wdt_fix_watchdog_counter_loading.patch
new file mode 100644
index 00000000..888e7f8f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/992-mpcore_wdt_fix_watchdog_counter_loading.patch
@@ -0,0 +1,76 @@
+Although the commit "98af057092f8f0dabe63c5df08adc2bbfbddb1d2
+ ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes"
+resolved long standing mpcore_wdt driver build problems, it
+introduced an error in the relationship between the MPcore watchdog
+timer clock rate and mpcore_margin, "MPcore timer margin in seconds",
+such that watchdog timeouts are now arbitrary rather than the number
+of seconds specified by mpcore_margin.
+
+This change restores mpcore_wdt_keepalive() to its equivalent
+implementation prior to commit 98af057 such that watchdog timeouts now
+occur as specified by mpcore_margin.
+
+The variable 'mpcore_timer_rate' which caused that build failure was
+replaced by 'twd_timer_rate'. Adding exported function to obtain
+'twd_timer_rate' value in mpcore_wdt driver.
+
+MPCORE_WATCHDOG needed to build 'mpcore_wdt' already depends on
+HAVE_ARM_TWD needed to build 'smp_twd', so from the point of view of
+'mpcore_wdt' driver the exported function will always exist.
+
+Signed-off-by: Valentine Barshak <vbarshak@mvista.com>
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+
+ arch/arm/include/asm/smp_twd.h |    1 +
+ arch/arm/kernel/smp_twd.c      |    7 +++++++
+ drivers/watchdog/mpcore_wdt.c  |    4 +---
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/include/asm/smp_twd.h
++++ b/arch/arm/include/asm/smp_twd.h
+@@ -33,6 +33,7 @@ struct twd_local_timer name __initdata =
+ };
+ 
+ int twd_local_timer_register(struct twd_local_timer *);
++unsigned long twd_timer_get_rate(void);
+ 
+ #ifdef CONFIG_HAVE_ARM_TWD
+ void twd_local_timer_of_register(void);
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -10,6 +10,7 @@
+  */
+ #include <linux/init.h>
+ #include <linux/kernel.h>
++#include <linux/export.h>
+ #include <linux/clk.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+@@ -376,6 +377,13 @@ int __init twd_local_timer_register(stru
+ 	return twd_local_timer_common_register();
+ }
+ 
++/* Needed by mpcore_wdt */
++unsigned long twd_timer_get_rate(void)
++{
++	return twd_timer_rate;
++}
++EXPORT_SYMBOL_GPL(twd_timer_get_rate);
++
+ #ifdef CONFIG_OF
+ const static struct of_device_id twd_of_match[] __initconst = {
+ 	{ .compatible = "arm,cortex-a9-twd-timer",	},
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct
+ 
+ 	spin_lock(&wdt_lock);
+ 	/* Assume prescale is set to 256 */
+-	count =  __raw_readl(wdt->base + TWD_WDOG_COUNTER);
+-	count = (0xFFFFFFFFU - count) * (HZ / 5);
+-	count = (count / 256) * mpcore_margin;
++	count = (twd_timer_get_rate() / 256) * mpcore_margin;
+ 
+ 	/* Reload the counter */
+ 	writel(count + wdt->perturb, wdt->base + TWD_WDOG_LOAD);
diff --git a/trunk/target/linux/generic/patches-3.8/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch b/trunk/target/linux/generic/patches-3.8/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
new file mode 100644
index 00000000..c986ac8f
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch
@@ -0,0 +1,29 @@
+According to the include/linux/watchdog.h WDIOC_SETOPTIONS is
+classified as 'read from device' ioctl call:
+  #define WDIOC_SETOPTIONS        _IOR(WATCHDOG_IOCTL_BASE, 4, int)
+
+However, the driver 'mpcore_wdt' performs 'copy_from_user' only if
+_IOC_WRITE is set, thus the local variable 'uarg' which is used in
+WDIOC_SETOPTIONS handling remains uninitialized.
+
+The proper way to fix this is to bind WDIOC_SETOPTIONS to _IOW,
+but this will break compatibility.
+So adding additional condition for performing 'copy_from_user'.
+
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+ drivers/watchdog/mpcore_wdt.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -235,7 +235,8 @@ static long mpcore_wdt_ioctl(struct file
+ 	if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
+ 		return -ENOTTY;
+ 
+-	if (_IOC_DIR(cmd) & _IOC_WRITE) {
++	if ((_IOC_DIR(cmd) & _IOC_WRITE)
++			|| cmd == WDIOC_SETOPTIONS) {
+ 		ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd));
+ 		if (ret)
+ 			return -EFAULT;
diff --git a/trunk/target/linux/generic/patches-3.8/994-mpcore_wdt_fix_timer_mode_setup.patch b/trunk/target/linux/generic/patches-3.8/994-mpcore_wdt_fix_timer_mode_setup.patch
new file mode 100644
index 00000000..ecc2452c
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/994-mpcore_wdt_fix_timer_mode_setup.patch
@@ -0,0 +1,57 @@
+Allow watchdog to set its iterrupt as pending when it is configured
+for timer mode (in other words, allow emitting interrupt).
+Also add macros for all Watchdog Control Register flags.
+
+Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+---
+ arch/arm/include/asm/smp_twd.h |    6 ++++++
+ drivers/watchdog/mpcore_wdt.c  |   15 +++++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/include/asm/smp_twd.h
++++ b/arch/arm/include/asm/smp_twd.h
+@@ -18,6 +18,12 @@
+ #define TWD_TIMER_CONTROL_PERIODIC	(1 << 1)
+ #define TWD_TIMER_CONTROL_IT_ENABLE	(1 << 2)
+ 
++#define TWD_WDOG_CONTROL_ENABLE		(1 << 0)
++#define TWD_WDOG_CONTROL_PERIODIC	(1 << 1)
++#define TWD_WDOG_CONTROL_IT_ENABLE	(1 << 2)
++#define TWD_WDOG_CONTROL_TIMER_MODE	(0 << 3)
++#define TWD_WDOG_CONTROL_WATCHDOG_MODE	(1 << 3)
++
+ #include <linux/ioport.h>
+ 
+ struct twd_local_timer {
+--- a/drivers/watchdog/mpcore_wdt.c
++++ b/drivers/watchdog/mpcore_wdt.c
+@@ -120,18 +120,25 @@ static void mpcore_wdt_stop(struct mpcor
+ 
+ static void mpcore_wdt_start(struct mpcore_wdt *wdt)
+ {
++	u32 mode;
++
+ 	dev_info(wdt->dev, "enabling watchdog\n");
+ 
+ 	/* This loads the count register but does NOT start the count yet */
+ 	mpcore_wdt_keepalive(wdt);
+ 
++	/* Setup watchdog - prescale=256, enable=1 */
++	mode = (255 << 8) | TWD_WDOG_CONTROL_ENABLE;
++
+ 	if (mpcore_noboot) {
+-		/* Enable watchdog - prescale=256, watchdog mode=0, enable=1 */
+-		writel(0x0000FF01, wdt->base + TWD_WDOG_CONTROL);
++		/* timer mode, send interrupt */
++		mode |=	TWD_WDOG_CONTROL_TIMER_MODE |
++				TWD_WDOG_CONTROL_IT_ENABLE;
+ 	} else {
+-		/* Enable watchdog - prescale=256, watchdog mode=1, enable=1 */
+-		writel(0x0000FF09, wdt->base + TWD_WDOG_CONTROL);
++		/* watchdog mode */
++		mode |=	TWD_WDOG_CONTROL_WATCHDOG_MODE;
+ 	}
++	writel(mode, wdt->base + TWD_WDOG_CONTROL);
+ }
+ 
+ static int mpcore_wdt_set_heartbeat(int t)
diff --git a/trunk/target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch b/trunk/target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch
new file mode 100644
index 00000000..bd5cf523
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/995-mpcore_twd_calibrate_single_core.patch
@@ -0,0 +1,23 @@
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -189,7 +189,7 @@ core_initcall(twd_cpufreq_init);
+ 
+ #endif
+ 
+-static void __cpuinit twd_calibrate_rate(void)
++static int twd_calibrate_rate(void)
+ {
+ 	unsigned long count;
+ 	u64 waitjiffies;
+@@ -226,8 +226,11 @@ static void __cpuinit twd_calibrate_rate
+ 		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
+ 			(twd_timer_rate / 10000) % 100);
+ 	}
++	return 0;
+ }
+ 
++device_initcall(twd_calibrate_rate);
++
+ static irqreturn_t twd_handler(int irq, void *dev_id)
+ {
+ 	struct clock_event_device *evt = *(struct clock_event_device **)dev_id;
diff --git a/trunk/target/linux/generic/patches-3.8/996-zsmalloc_allow_module_build.patch b/trunk/target/linux/generic/patches-3.8/996-zsmalloc_allow_module_build.patch
new file mode 100644
index 00000000..eaa9fc60
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/996-zsmalloc_allow_module_build.patch
@@ -0,0 +1,9 @@
+--- a/drivers/staging/zsmalloc/Kconfig
++++ b/drivers/staging/zsmalloc/Kconfig
+@@ -1,5 +1,5 @@
+ config ZSMALLOC
+-	bool "Memory allocator for compressed pages"
++	tristate "Memory allocator for compressed pages"
+ 	default n
+ 	help
+ 	  zsmalloc is a slab-based memory allocator designed to store
diff --git a/trunk/target/linux/generic/patches-3.8/997-device_tree_cmdline.patch b/trunk/target/linux/generic/patches-3.8/997-device_tree_cmdline.patch
new file mode 100644
index 00000000..8009a297
--- /dev/null
+++ b/trunk/target/linux/generic/patches-3.8/997-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -677,6 +677,9 @@ int __init early_init_dt_scan_chosen(uns
+ 	p = of_get_flat_dt_prop(node, "bootargs", &l);
+ 	if (p != NULL && l > 0)
+ 		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
++	p = of_get_flat_dt_prop(node, "bootargs-append", &l);
++	if (p != NULL && l > 0)
++		strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE));
+ 
+ 	/*
+ 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
diff --git a/trunk/target/linux/sunxi/Makefile b/trunk/target/linux/sunxi/Makefile
new file mode 100644
index 00000000..0deb2d8f
--- /dev/null
+++ b/trunk/target/linux/sunxi/Makefile
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+ARCH:=arm
+BOARD:=sunxi
+BOARDNAME:=Allwinner A1x/A20/A3x
+FEATURES:=fpu usb ext4 display rtc
+CPU_TYPE:=cortex-a8
+CPU_SUBTYPE:=vfpv3
+MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
+
+KERNEL_PATCHVER:=3.14
+KERNELNAME:=zImage dtbs
+DEFAULT_PACKAGES += uboot-envtools uboot-sunxi kmod-eeprom-sunxi kmod-wdt-sunxi
+
+# A10: Cortex-A8
+# A13: Cortex-A8
+# A20: dual Cortex-A7
+# A31: quad Cortex-A7
+
+include $(INCLUDE_DIR)/target.mk
+
+$(eval $(call BuildTarget))
diff --git a/trunk/target/linux/sunxi/base-files.mk b/trunk/target/linux/sunxi/base-files.mk
new file mode 100644
index 00000000..fdd2c714
--- /dev/null
+++ b/trunk/target/linux/sunxi/base-files.mk
@@ -0,0 +1,3 @@
+define Package/base-files/install-target
+	rm -f $(1)/etc/config/network
+endef
diff --git a/trunk/target/linux/sunxi/base-files/etc/inittab b/trunk/target/linux/sunxi/base-files/etc/inittab
new file mode 100644
index 00000000..e9de30bc
--- /dev/null
+++ b/trunk/target/linux/sunxi/base-files/etc/inittab
@@ -0,0 +1,5 @@
+::sysinit:/etc/init.d/rcS S boot
+::shutdown:/etc/init.d/rcS K shutdown
+tts/0::askfirst:/bin/ash --login
+ttyS0::askfirst:/bin/ash --login
+tty1::askfirst:/bin/ash --login
diff --git a/trunk/target/linux/sunxi/base-files/etc/uci-defaults/02_network b/trunk/target/linux/sunxi/base-files/etc/uci-defaults/02_network
new file mode 100644
index 00000000..f0d73c09
--- /dev/null
+++ b/trunk/target/linux/sunxi/base-files/etc/uci-defaults/02_network
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
+
+. /lib/functions/uci-defaults.sh
+
+ucidef_set_interface_loopback
+
+case "`cat /proc/device-tree/model`" in
+"Cubietech Cubieboard" |\
+"Cubietech Cubieboard2" |\
+"Lemaker bananaPi" |\
+"LinkSprite pcDuino" |\
+"LinkSprite pcDuino V3" |\
+"LinkSprite pcDuino3" |\
+"Olimex A10-OLinuXino-LIME" |\
+"Olimex A20-OLinuXino-LIME" |\
+"Olimex A20-Olinuxino Micro")
+	ucidef_set_interface_lan 'eth0'
+	;;
+"Olimex A13-Olinuxino")
+	ucidef_set_interface_lan 'wlan0'
+	;;
+esac
+
+uci commit network
+
+exit 0
diff --git a/trunk/target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh b/trunk/target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh
new file mode 100644
index 00000000..f221dbc5
--- /dev/null
+++ b/trunk/target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_sunxi() {
+        . /lib/sunxi.sh
+
+        sunxi_board_detect
+}
+
+boot_hook_add preinit_main do_sunxi
diff --git a/trunk/target/linux/sunxi/base-files/lib/sunxi.sh b/trunk/target/linux/sunxi/base-files/lib/sunxi.sh
new file mode 100644
index 00000000..adf9f846
--- /dev/null
+++ b/trunk/target/linux/sunxi/base-files/lib/sunxi.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# defaults
+SUNXI_BOARD_NAME="generic sunxi"
+SUNXI_BOARD_MODEL="generic sunxi"
+SUNXI_ENV_DEV=/dev/mmcblk0
+
+#Helper functions 
+get_cmdline_opt() 
+{
+cat /proc/cmdline | awk -F$1= '{print $2}' | awk '{print $1}'
+}
+
+#Since fw_getenv doesn't work with blockdevs let's make a hack
+uboot_getenv() 
+{
+    dd if=$SUNXI_ENV_DEV bs=1024 skip=544 count=128 2>dev/null |\strings|grep $1|cut -d"=" -f2
+}
+
+#Actual routines go below
+sunxi_env_dev()
+{
+    local dev
+    dev=`get_cmdline_opt root|cut -d"p" -f1`
+    SUNXI_ENV_DEV=$dev
+    echo "probing $dev for uboot env data"
+}
+
+sunxi_board_detect() {
+    local board
+    local model
+    sunxi_env_dev
+    [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+    board="`uboot_getenv wrt_board`"
+    model="`uboot_getenv wrt_model`"
+    if [ "$board" != "" ]; then
+	SUNXI_BOARD_NAME="$board"
+    fi
+    if [ "$model" != "" ]; then
+	SUNXI_BOARD_MODEL="$model"
+    fi
+    echo "$SUNXI_BOARD_NAME" > /tmp/sysinfo/board_name
+    echo "$SUNXI_BOARD_MODEL" > /tmp/sysinfo/model
+    echo "Detected $SUNXI_BOARD_NAME // $SUNXI_BOARD_MODEL"
+}
diff --git a/trunk/target/linux/sunxi/config-3.14 b/trunk/target/linux/sunxi/config-3.14
new file mode 100644
index 00000000..5c9c09f2
--- /dev/null
+++ b/trunk/target/linux/sunxi/config-3.14
@@ -0,0 +1,468 @@
+CONFIG_AHCI_SUNXI=y
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_APM_EMULATION is not set
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_MULTI_CPU_AUTO is not set
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_ARCH_NR_GPIO=288
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARM=y
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_ARM_CPU_SUSPEND is not set
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+# CONFIG_ARM_LPAE is not set
+CONFIG_ARM_NR_BANKS=8
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARM_PSCI=y
+CONFIG_ARM_THUMB=y
+# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_ATA=y
+CONFIG_ATAGS=y
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+CONFIG_AUDIT_GENERIC=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_AVERAGE=y
+CONFIG_BINFMT_MISC=y
+CONFIG_BLK_CGROUP=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_BOUNCE=y
+# CONFIG_CACHE_L2X0 is not set
+CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_NET_CLASSID is not set
+# CONFIG_CGROUP_PERF is not set
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_CLKSRC_OF=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_CMDLINE="console=ttyS0,115200 earlyprintk rootwait root=/dev/mmcblk0p2"
+CONFIG_CMDLINE_FORCE=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMPACTION=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_CONNECTOR=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_COREDUMP=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_CPUSETS=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_HAS_ASID=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_RMAP=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_V7=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DEV_SUNXI_SS=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_UART_8250 is not set
+# CONFIG_DEBUG_UART_PL01X is not set
+# CONFIG_DEBUG_USER is not set
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DIRECT_IO=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_OF=y
+CONFIG_DNOTIFY=y
+CONFIG_DTC=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DWMAC_SUNXI=y
+# CONFIG_DW_DMAC_CORE is not set
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_EEPROM_SUNXI_SID is not set
+CONFIG_ELF_CORE=y
+# CONFIG_EMBEDDED is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_EXPERT is not set
+CONFIG_EXT4_FS=y
+CONFIG_FRAME_POINTER=y
+CONFIG_FRAME_WARN=2048
+CONFIG_FREEZER=y
+CONFIG_FS_MBCACHE=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_GARP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HAMRADIO is not set
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_SMP=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_UID16=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_HWMON=y
+CONFIG_HW_CONSOLE=y
+CONFIG_HZ_FIXED=0
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_MUX=y
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+CONFIG_I2C_MUX_PINCTRL=y
+CONFIG_I2C_MV64XXX=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INPUT=y
+CONFIG_INPUT_AXP20X_PEK=y
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_IPC_NS=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_BOOTP is not set
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_IRQCHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_XZ is not set
+CONFIG_KEYBOARD_SUN4I_LRADC=y
+CONFIG_KSM=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_REGULATOR is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MDIO_BOARDINFO=y
+CONFIG_MDIO_SUN4I=y
+# CONFIG_MEMCG is not set
+CONFIG_MFD_AXP20X=y
+CONFIG_MFD_CORE=y
+CONFIG_MIGRATION=y
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
+CONFIG_MMC_SUNXI=y
+CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NAMESPACES=y
+CONFIG_NEED_DMA_MAP_STATE=y
+# CONFIG_NEON is not set
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_FLOW_LIMIT=y
+CONFIG_NET_NS=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_NLS=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_NO_HZ=y
+CONFIG_NO_HZ_COMMON=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NR_CPUS=4
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_MTD=y
+CONFIG_OF_NET=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_PCI_SYSCALL is not set
+CONFIG_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SUN4I_USB=y
+CONFIG_PID_NS=y
+CONFIG_PINCTRL=y
+# CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_PM=y
+CONFIG_PM_CLK=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_RUNTIME=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_PPS=y
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_RCU=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_PROC_DEVICETREE=y
+CONFIG_PROC_EVENTS=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PWM=y
+CONFIG_PWM_SUNXI=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_QFMT_V1 is not set
+# CONFIG_QFMT_V2 is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_CPU_STALL_VERBOSE=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+CONFIG_RD_XZ=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_AXP20X=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_RELAY=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_RFKILL_REGULATOR is not set
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SCHED_HRTICK=y
+CONFIG_SCSI=y
+CONFIG_SECURITYFS=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_NR_UARTS=8
+CONFIG_SERIAL_8250_RUNTIME_UARTS=8
+CONFIG_SERIAL_8250_SYSRQ=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_OLPC_APSP is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_SUN4I=y
+CONFIG_SPI_SUN6I=y
+# CONFIG_STAGING is not set
+# CONFIG_STMMAC_DA is not set
+# CONFIG_STMMAC_DEBUG_FS is not set
+CONFIG_STMMAC_ETH=y
+CONFIG_STMMAC_PLATFORM=y
+CONFIG_STOP_MACHINE=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_SUN4I_EMAC is not set
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
+CONFIG_SUNXI_WATCHDOG=y
+CONFIG_SWIOTLB=y
+CONFIG_SWP_EMULATE=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_TASK_XACCT=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
+CONFIG_TOUCHSCREEN_SUN4I=y
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_UID16=y
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SUPPORT=y
+# CONFIG_USER_NS is not set
+CONFIG_USE_OF=y
+CONFIG_UTS_NS=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_XEN is not set
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+CONFIG_XPS=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_ZBOOT_ROM_TEXT=0
+# CONFIG_ZBUD is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/trunk/target/linux/sunxi/config-3.18 b/trunk/target/linux/sunxi/config-3.18
new file mode 100644
index 00000000..9d4d932c
--- /dev/null
+++ b/trunk/target/linux/sunxi/config-3.18
@@ -0,0 +1,529 @@
+CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_AHCI_SUNXI is not set
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_APM_EMULATION is not set
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+# CONFIG_ARCH_MSM is not set
+CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_MULTI_CPU_AUTO is not set
+CONFIG_ARCH_MULTI_V6_V7=y
+CONFIG_ARCH_MULTI_V7=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_ARCH_NR_GPIO=416
+# CONFIG_ARCH_QCOM is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ARM=y
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_ARM_CCN is not set
+# CONFIG_ARM_CPU_SUSPEND is not set
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+# CONFIG_ARM_LPAE is not set
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARM_PSCI=y
+CONFIG_ARM_THUMB=y
+# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_ATA=y
+CONFIG_ATAGS=y
+# CONFIG_ATA_SFF is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+CONFIG_AUDIT_GENERIC=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_AVERAGE=y
+CONFIG_BINFMT_MISC=y
+CONFIG_BLK_CGROUP=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_BOUNCE=y
+# CONFIG_BPF_SYSCALL is not set
+CONFIG_BUILD_BIN2C=y
+# CONFIG_CACHE_L2X0 is not set
+CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_NET_CLASSID is not set
+# CONFIG_CGROUP_PERF is not set
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_CLKSRC_OF=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_CMDLINE="console=ttyS0,115200 earlyprintk rootwait root=/dev/mmcblk0p2"
+CONFIG_CMDLINE_FORCE=y
+CONFIG_COMMON_CLK=y
+# CONFIG_COMMON_CLK_PXA is not set
+CONFIG_COMPACTION=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_CONNECTOR=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_COREDUMP=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_CPUSETS=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_HAS_ASID=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_RMAP=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_V7=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DEV_SUNXI_SS=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_UART_8250 is not set
+# CONFIG_DEBUG_UART_BCM63XX is not set
+# CONFIG_DEBUG_UART_PL01X is not set
+# CONFIG_DEBUG_USER is not set
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DIRECT_IO=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_OF=y
+CONFIG_DMA_SUN6I=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DNOTIFY=y
+CONFIG_DTC=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DWMAC_SUNXI=y
+# CONFIG_DW_DMAC_CORE is not set
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_EEPROM_SUNXI_SID is not set
+CONFIG_ELF_CORE=y
+# CONFIG_EMAC_ROCKCHIP is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_EXPERT is not set
+CONFIG_EXT4_FS=y
+CONFIG_FRAME_POINTER=y
+CONFIG_FRAME_WARN=2048
+CONFIG_FREEZER=y
+# CONFIG_FSL_EDMA is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_GARP=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GLOB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HAMRADIO is not set
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_SMP=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_UID16=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_HWMON=y
+CONFIG_HW_CONSOLE=y
+CONFIG_HZ_FIXED=0
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_MUX=y
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+CONFIG_I2C_MUX_PINCTRL=y
+CONFIG_I2C_MV64XXX=y
+# CONFIG_I2C_SUN6I_P2WI is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_IMX_IPUV3_CORE is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INPUT=y
+# CONFIG_INPUT_AXP20X_PEK is not set
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_INTEL_SOC_PMIC is not set
+CONFIG_IOMMU_HELPER=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_IPC_NS=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_BOOTP is not set
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_IRQCHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_XZ is not set
+CONFIG_KERNFS=y
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_SUN4I_LRADC is not set
+CONFIG_KSM=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_REGULATOR is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LIBFDT=y
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+# CONFIG_MACH_SUN8I is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MDIO_BOARDINFO=y
+CONFIG_MDIO_SUN4I=y
+# CONFIG_MEMCG is not set
+CONFIG_MFD_AXP20X=y
+CONFIG_MFD_CORE=y
+CONFIG_MFD_SUN6I_PRCM=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_MIGHT_HAVE_PCI=y
+CONFIG_MIGRATION=y
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
+CONFIG_MMC_SUNXI=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NAMESPACES=y
+# CONFIG_NBPFAXI_DMA is not set
+CONFIG_NEED_DMA_MAP_STATE=y
+# CONFIG_NEON is not set
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_FLOW_LIMIT=y
+CONFIG_NET_NS=y
+CONFIG_NET_PTP_CLASSIFY=y
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_NLS=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_NO_HZ=y
+CONFIG_NO_HZ_COMMON=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NR_CPUS=4
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_MTD=y
+CONFIG_OF_NET=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_TOUCHSCREEN=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_PCI is not set
+# CONFIG_PCI_SYSCALL is not set
+CONFIG_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_SUN4I_USB=y
+CONFIG_PID_NS=y
+CONFIG_PINCTRL=y
+# CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I_A10S=y
+CONFIG_PINCTRL_SUN5I_A13=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN7I_A20=y
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+CONFIG_PINCTRL_SUNXI_COMMON=y
+CONFIG_PM=y
+CONFIG_PM_CLK=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_RUNTIME=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_PPS=y
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_RCU=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_PROC_DEVICETREE=y
+CONFIG_PROC_EVENTS=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PWM=y
+# CONFIG_PWM_FSL_FTM is not set
+CONFIG_PWM_SUN4I=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_QFMT_V1 is not set
+# CONFIG_QFMT_V2 is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_CPU_STALL_VERBOSE=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+CONFIG_RD_XZ=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_AXP20X=y
+# CONFIG_REGULATOR_DA9211 is not set
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_RELAY=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_RFKILL_REGULATOR is not set
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SCHED_HRTICK=y
+CONFIG_SCSI=y
+CONFIG_SECURITYFS=y
+# CONFIG_SENSORS_PWM_FAN is not set
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_NR_UARTS=8
+CONFIG_SERIAL_8250_RUNTIME_UARTS=8
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_APBPS2 is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_SUN4I=y
+CONFIG_SPI_SUN6I=y
+# CONFIG_STAGING is not set
+# CONFIG_STMMAC_DA is not set
+# CONFIG_STMMAC_DEBUG_FS is not set
+CONFIG_STMMAC_ETH=y
+CONFIG_STMMAC_PLATFORM=y
+CONFIG_STOP_MACHINE=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_SUN4I_EMAC is not set
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
+CONFIG_SUNXI_WATCHDOG=y
+CONFIG_SWIOTLB=y
+CONFIG_SWP_EMULATE=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_TASK_XACCT=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
+CONFIG_TOUCHSCREEN_SUN4I=y
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_UID16=y
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USELIB=y
+# CONFIG_USER_NS is not set
+CONFIG_USE_OF=y
+CONFIG_UTS_NS=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_XEN is not set
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+CONFIG_XPS=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/trunk/target/linux/sunxi/image/Config.in b/trunk/target/linux/sunxi/image/Config.in
new file mode 100644
index 00000000..0d6861c6
--- /dev/null
+++ b/trunk/target/linux/sunxi/image/Config.in
@@ -0,0 +1,5 @@
+config SUNXI_SD_BOOT_PARTSIZE
+	int "Boot (SD Card) filesystem partition size (in MB)"
+	depends on TARGET_sunxi
+	default 20
+
diff --git a/trunk/target/linux/sunxi/image/Makefile b/trunk/target/linux/sunxi/image/Makefile
new file mode 100644
index 00000000..1693e6d6
--- /dev/null
+++ b/trunk/target/linux/sunxi/image/Makefile
@@ -0,0 +1,112 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+include $(INCLUDE_DIR)/host.mk
+
+FAT32_BLOCK_SIZE=1024
+FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
+
+BOARDS:= \
+	sun4i-a10-cubieboard \
+	sun4i-a10-olinuxino-lime \
+	sun4i-a10-pcduino \
+	sun5i-a13-olinuxino \
+	sun6i-a31-colombus \
+	sun7i-a20-bananapi \
+	sun7i-a20-cubieboard2 \
+	sun7i-a20-cubietruck \
+	sun7i-a20-olinuxino-lime \
+	sun7i-a20-olinuxino-micro \
+	sun7i-a20-pcduino3
+
+define Image/BuildKernel
+	mkimage -A arm -O linux -T kernel -C none \
+		-a 0x40008000 -e 0x40008000 \
+		-n 'ARM libreCMC Linux-$(LINUX_VERSION)' \
+		-d $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+	
+    ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+	$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
+	echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
+	$(call Image/BuildKernel/MkuImage, \
+		none, 0x40008000, 0x40008000, \
+		$(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs, \
+		$(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \
+	)
+    endif
+
+	$(foreach board,$(BOARDS),
+		$(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/
+	)
+endef
+
+define Image/Build/SDCard
+	rm -f $(KDIR)/boot.img
+	mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS)
+	
+	mcopy -i $(KDIR)/boot.img $(BIN_DIR)/uboot-sunxi-$(PROFILE)/librecmc-sunxi-$(PROFILE)-uEnv.txt ::uEnv.txt
+	mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(2).dtb ::dtb
+	mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage
+	
+	./gen_sunxi_sdcard_img.sh \
+		$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img \
+		$(KDIR)/boot.img \
+		$(KDIR)/root.$(1) \
+		$(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \
+		$(CONFIG_TARGET_ROOTFS_PARTSIZE) \
+		$(BIN_DIR)/uboot-sunxi-$(PROFILE)/librecmc-sunxi-$(PROFILE)-u-boot-with-spl.bin
+endef
+
+define Image/Build/Profile/A10-OLinuXino-Lime
+	$(call Image/Build/SDCard,$(1),sun4i-a10-olinuxino-lime)
+endef
+
+define Image/Build/Profile/A13-OLinuXino
+	$(call Image/Build/SDCard,$(1),sun5i-a13-olinuxino)
+endef
+
+define Image/Build/Profile/A20-OLinuXino_Lime
+	$(call Image/Build/SDCard,$(1),sun7i-a20-olinuxino-lime)
+endef
+
+define Image/Build/Profile/A20-OLinuXino_MICRO
+	$(call Image/Build/SDCard,$(1),sun7i-a20-olinuxino-micro)
+endef
+
+define Image/Build/Profile/Bananapi
+	$(call Image/Build/SDCard,$(1),sun7i-a20-bananapi)
+endef
+
+define Image/Build/Profile/Cubieboard
+	$(call Image/Build/SDCard,$(1),sun4i-a10-cubieboard)
+endef
+
+define Image/Build/Profile/Cubieboard2
+	$(call Image/Build/SDCard,$(1),sun7i-a20-cubieboard2)
+endef
+
+define Image/Build/Profile/OLIMEX-A13-SOM
+	$(call Image/Build/SDCard,$(1),sun5i-a13-olinuxino)
+endef
+
+define Image/Build/Profile/pcDuino
+	$(call Image/Build/SDCard,$(1),sun4i-a10-pcduino)
+endef
+
+define Image/Build/Profile/Linksprite_pcDuino3
+	$(call Image/Build/SDCard,$(1),sun7i-a20-pcduino3)
+endef
+
+define Image/Build
+	$(call Image/Build/$(1),$(1))
+	$(call Image/Build/Profile/$(PROFILE),$(1))
+	
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/librecmc-$(BOARD)-root.$(1) bs=128k conv=sync
+endef
+
+$(eval $(call BuildImage))
diff --git a/trunk/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh b/trunk/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh
new file mode 100755
index 00000000..2a09306a
--- /dev/null
+++ b/trunk/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+set -x 
+[ $# -eq 6 ] || {
+    echo "SYNTAX: $0 <file> <bootfs image> <rootfs image> <bootfs size> <rootfs size> <u-boot image>"
+    exit 1
+}
+
+OUTPUT="$1"
+BOOTFS="$2"
+ROOTFS="$3"
+BOOTFSSIZE="$4"
+ROOTFSSIZE="$5"
+UBOOT="$6"
+
+head=4
+sect=63
+
+set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
+
+BOOTOFFSET="$(($1 / 512))"
+BOOTSIZE="$(($2 / 512))"
+ROOTFSOFFSET="$(($3 / 512))"
+ROOTFSSIZE="$(($4 / 512))"
+
+dd bs=1024 if="$UBOOT" of="$OUTPUT" seek=8 conv=notrunc
+dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
+dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/trunk/target/linux/sunxi/modules.mk b/trunk/target/linux/sunxi/modules.mk
new file mode 100644
index 00000000..a4c71b9b
--- /dev/null
+++ b/trunk/target/linux/sunxi/modules.mk
@@ -0,0 +1,104 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+define KernelPackage/rtc-sunxi
+    SUBMENU:=$(OTHER_MENU)
+    TITLE:=Sunxi SoC built-in RTC support
+    DEPENDS:=@TARGET_sunxi
+    $(call AddDepends/rtc)
+    KCONFIG:= \
+	CONFIG_RTC_CLASS=y \
+	CONFIG_RTC_DRV_SUNXI=m
+    FILES:=$(LINUX_DIR)/drivers/rtc/rtc-sunxi.ko
+    AUTOLOAD:=$(call AutoLoad,50,rtc-sunxi)
+endef
+
+define KernelPackage/rtc-sunxi/description
+ Support for the AllWinner sunXi SoC's onboard RTC
+endef
+
+$(eval $(call KernelPackage,rtc-sunxi))
+
+define KernelPackage/sunxi-ir
+    SUBMENU:=$(OTHER_MENU)
+    TITLE:=Sunxi SoC built-in IR support (A20)
+    DEPENDS:=@TARGET_sunxi +kmod-input-core
+    $(call AddDepends/rtc)
+    KCONFIG:= \
+	CONFIG_MEDIA_SUPPORT=y \
+	CONFIG_MEDIA_RC_SUPPORT=y \
+	CONFIG_RC_DEVICES=y \
+	CONFIG_IR_SUNXI
+    FILES:=$(LINUX_DIR)/drivers/media/rc/sunxi-cir.ko
+    AUTOLOAD:=$(call AutoLoad,50,sunxi-cir)
+endef
+
+define KernelPackage/sunxi-ir/description
+ Support for the AllWinner sunXi SoC's onboard IR (A20)
+endef
+
+$(eval $(call KernelPackage,sunxi-ir))
+
+define KernelPackage/eeprom-sunxi
+    SUBMENU:=$(OTHER_MENU)
+    TITLE:=AllWinner Security ID fuse support
+    DEPENDS:=@TARGET_sunxi
+    KCONFIG:= \
+	CONFIG_EEPROM_SUNXI_SID
+    FILES:=$(LINUX_DIR)/drivers/misc/eeprom/sunxi_sid.ko
+    AUTOLOAD:=$(call AutoLoad,50,sunxi_sid)
+endef
+
+define KernelPackage/eeprom-sunxi/description
+ Support for the AllWinner Security ID fuse support
+endef
+
+$(eval $(call KernelPackage,eeprom-sunxi))
+
+define KernelPackage/ata-sunxi
+    TITLE:=AllWinner sunXi AHCI SATA support
+    SUBMENU:=$(BLOCK_MENU)
+    DEPENDS:=@TARGET_sunxi +kmod-scsi-core
+    KCONFIG:=\
+	CONFIG_AHCI_SUNXI \
+	CONFIG_SATA_AHCI_PLATFORM
+    FILES:=$(LINUX_DIR)/drivers/ata/ahci_sunxi.ko
+    AUTOLOAD:=$(call AutoLoad,41,ahci_sunxi,1)
+endef
+
+define KernelPackage/ata-sunxi/description
+ SATA support for the AllWinner sunXi SoC's onboard AHCI SATA
+endef
+
+$(eval $(call KernelPackage,ata-sunxi))
+
+define KernelPackage/sun4i-emac
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=AllWinner EMAC Ethernet support
+  DEPENDS:=@TARGET_sunxi
+  KCONFIG:=CONFIG_SUN4I_EMAC
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/allwinner/sun4i-emac.ko
+  AUTOLOAD:=$(call AutoProbe,sun4i-emac)
+endef
+
+$(eval $(call KernelPackage,sun4i-emac))
+
+
+define KernelPackage/wdt-sunxi
+    SUBMENU:=$(OTHER_MENU)
+    TITLE:=AllWinner sunXi Watchdog timer
+    DEPENDS:=@TARGET_sunxi
+    KCONFIG:=CONFIG_SUNXI_WATCHDOG
+    FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sunxi_wdt.ko
+    AUTOLOAD:=$(call AutoLoad,51,sunxi_wdt)
+endef
+
+define KernelPackage/wdt-sunxi/description
+    Kernel module for AllWinner sunXi watchdog timer.
+endef
+
+$(eval $(call KernelPackage,wdt-sunxi))
+
diff --git a/trunk/target/linux/sunxi/patches-3.14/100-dt-sun4i-add-missing-serial-aliases.patch b/trunk/target/linux/sunxi/patches-3.14/100-dt-sun4i-add-missing-serial-aliases.patch
new file mode 100644
index 00000000..caa5d158
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/100-dt-sun4i-add-missing-serial-aliases.patch
@@ -0,0 +1,28 @@
+From b25983b215e889447ae670a158b1af5e7f253091 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 2 Jan 2014 22:05:04 +0100
+Subject: [PATCH] ARM: sun4i: a10: Add missing serial aliases
+
+Some UART aliases have been defined, but not all of them. Add the remaining
+ones to be consistent and to ease the parsing of the DT by the bootloaders.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -19,6 +19,12 @@
+ 		ethernet0 = &emac;
+ 		serial0 = &uart0;
+ 		serial1 = &uart1;
++		serial2 = &uart2;
++		serial3 = &uart3;
++		serial4 = &uart4;
++		serial5 = &uart5;
++		serial6 = &uart6;
++		serial7 = &uart7;
+ 	};
+ 
+ 	cpus {
diff --git a/trunk/target/linux/sunxi/patches-3.14/101-dt-sun6i-add-missing-serial-aliases.patch b/trunk/target/linux/sunxi/patches-3.14/101-dt-sun6i-add-missing-serial-aliases.patch
new file mode 100644
index 00000000..dd0f741b
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/101-dt-sun6i-add-missing-serial-aliases.patch
@@ -0,0 +1,32 @@
+From b6e3460ee25b8af673d00df0435a304f5dbf7c40 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 2 Jan 2014 22:05:04 +0100
+Subject: [PATCH] ARM: sun6i: Add missing serial aliases
+
+Some UART aliases have been defined, but not all of them. Add the remaining
+ones to be consistent and to ease the parsing of the DT by the bootloaders.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -16,6 +16,16 @@
+ / {
+ 	interrupt-parent = <&gic>;
+ 
++	aliases {
++		serial0 = &uart0;
++		serial1 = &uart1;
++		serial2 = &uart2;
++		serial3 = &uart3;
++		serial4 = &uart4;
++		serial5 = &uart5;
++	};
++
++
+ 	cpus {
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/102-dt-sun7i-add-missing-serial-aliases.patch b/trunk/target/linux/sunxi/patches-3.14/102-dt-sun7i-add-missing-serial-aliases.patch
new file mode 100644
index 00000000..80daddc1
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/102-dt-sun7i-add-missing-serial-aliases.patch
@@ -0,0 +1,30 @@
+From 1070f51b55d11e8831317d718acf2af46a181311 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 2 Jan 2014 22:05:04 +0100
+Subject: [PATCH] ARM: sun7i: Add missing serial aliases
+
+Some UART aliases have been defined, but not all of them. Add the remaining
+ones to be consistent and to ease the parsing of the DT by the bootloaders.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -18,6 +18,14 @@
+ 
+ 	aliases {
+ 		ethernet0 = &emac;
++		serial0 = &uart0;
++		serial1 = &uart1;
++		serial2 = &uart2;
++		serial3 = &uart3;
++		serial4 = &uart4;
++		serial5 = &uart5;
++		serial6 = &uart6;
++		serial7 = &uart7;
+ 	};
+ 
+ 	cpus {
diff --git a/trunk/target/linux/sunxi/patches-3.14/103-dt-sun5i-add-missing-serial-aliases.patch b/trunk/target/linux/sunxi/patches-3.14/103-dt-sun5i-add-missing-serial-aliases.patch
new file mode 100644
index 00000000..cd991dd6
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/103-dt-sun5i-add-missing-serial-aliases.patch
@@ -0,0 +1,27 @@
+From 0ffac463caf4b0022cf0d917552d51b3ec82849a Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Mon, 13 Jan 2014 11:08:47 +0100
+Subject: [PATCH] ARM: sun5i: a13: Add missing serial aliases
+
+Some UART aliases have been defined, but not all of them. Add the remaining
+ones to be consistent and to ease the parsing of the DT by the bootloaders.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun5i-a13.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -16,6 +16,11 @@
+ / {
+ 	interrupt-parent = <&intc>;
+ 
++	aliases {
++		serial0 = &uart1;
++		serial1 = &uart3;
++	};
++
+ 	cpus {
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/104-dt-sun7i-add-pinmuxing-for-uart2.patch b/trunk/target/linux/sunxi/patches-3.14/104-dt-sun7i-add-pinmuxing-for-uart2.patch
new file mode 100644
index 00000000..84baf392
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/104-dt-sun7i-add-pinmuxing-for-uart2.patch
@@ -0,0 +1,30 @@
+From 875f2d579db0c3ea113f6367af9ccb32b3dbebcc Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Tue, 14 Jan 2014 22:49:50 +0800
+Subject: [PATCH] ARM: dts: sun7i: add pin muxing options for UART2
+
+UART2 is used on CubieTruck to connect to the Bluetooth module.
+Add the pin set used in this case.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -381,6 +381,13 @@
+ 				allwinner,pull = <0>;
+ 			};
+ 
++			uart2_pins_a: uart2@0 {
++				allwinner,pins = "PI16", "PI17", "PI18", "PI19";
++				allwinner,function = "uart2";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
+ 			uart6_pins_a: uart6@0 {
+ 				allwinner,pins = "PI12", "PI13";
+ 				allwinner,function = "uart6";
diff --git a/trunk/target/linux/sunxi/patches-3.14/105-dt-sun4i-add-linksprite-pcduino.patch b/trunk/target/linux/sunxi/patches-3.14/105-dt-sun4i-add-linksprite-pcduino.patch
new file mode 100644
index 00000000..54638198
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/105-dt-sun4i-add-linksprite-pcduino.patch
@@ -0,0 +1,78 @@
+From 2fc6dcd5e7c76c203d2e174e70ef21393a231163 Mon Sep 17 00:00:00 2001
+From: Zoltan HERPAI <wigyori@uid0.hu>
+Date: Mon, 13 Jan 2014 14:15:01 +0100
+Subject: [PATCH] ARM: sun4i: dt: Add basic board support for LinkSprite
+ pcDuino
+
+This patch will add a basic board support DT for the
+LinkSprite pcDuino board.
+
+Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/Makefile              |  1 +
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 48 +++++++++++++++++++++++++++++++++
+ 2 files changed, 49 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun4i-a10-pcduino.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -284,6 +284,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
+ 	sun4i-a10-cubieboard.dtb \
+ 	sun4i-a10-mini-xplus.dtb \
+ 	sun4i-a10-hackberry.dtb \
++	sun4i-a10-pcduino.dtb \
+ 	sun5i-a10s-olinuxino-micro.dtb \
+ 	sun5i-a13-olinuxino.dtb \
+ 	sun5i-a13-olinuxino-micro.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+@@ -0,0 +1,48 @@
++/*
++ * Copyright 2014 Zoltan HERPAI
++ * Zoltan HERPAI <wigyori@uid0.hu>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "sun4i-a10.dtsi"
++
++/ {
++	model = "LinkSprite pcDuino";
++	compatible = "linksprite,a10-pcduino", "allwinner,sun4i-a10";
++
++	soc@01c00000 {
++		emac: ethernet@01c0b000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&emac_pins_a>;
++			phy = <&phy1>;
++			status = "okay";
++		};
++
++		mdio@01c0b080 {
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
++
++		uart0: serial@01c28000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart0_pins_a>;
++			status = "okay";
++		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++		};
++	};
++};
diff --git a/trunk/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch b/trunk/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch
new file mode 100644
index 00000000..386f0429
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch
@@ -0,0 +1,31 @@
+From 0f9bb2cf6171f47d932df46e34cc5cfce384ff3d Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Tue, 18 Feb 2014 14:04:44 +0000
+Subject: [PATCH] ARM: sun7i: add arch timer node
+
+The Allwinner A20 SoC is built around a pair of Cortex-A7 cores,
+which have the usual generic timers. Report this in the DT.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -49,6 +49,14 @@
+ 		reg = <0x40000000 0x80000000>;
+ 	};
+ 
++	timer {
++		compatible = "arm,armv7-timer";
++		interrupts = <1 13 0xf08>,
++			     <1 14 0xf08>,
++			     <1 11 0xf08>,
++			     <1 10 0xf08>;
++	};
++
+ 	clocks {
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/107-dt-sun4i-add-a10-lime.patch b/trunk/target/linux/sunxi/patches-3.14/107-dt-sun4i-add-a10-lime.patch
new file mode 100644
index 00000000..d50f362f
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/107-dt-sun4i-add-a10-lime.patch
@@ -0,0 +1,141 @@
+From a1c70ed831e4d5356618834202b0da3aa34e218e Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 10 Jan 2014 23:23:06 +0100
+Subject: [PATCH] ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
+
+This add support for the A10-OLinuXino-LIME:
+https://www.olimex.com/Products/OLinuXino/A10/A10-OLinuXino-LIME
+
+A low cost Allwinner A10 based dev-board, with sata, ethernet, hdmi and 2x USB.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/Makefile                     |   1 +
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 111 +++++++++++++++++++++++++
+ 2 files changed, 112 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -284,6 +284,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
+ 	sun4i-a10-cubieboard.dtb \
+ 	sun4i-a10-mini-xplus.dtb \
+ 	sun4i-a10-hackberry.dtb \
++	sun4i-a10-olinuxino-lime.dtb \
+ 	sun4i-a10-pcduino.dtb \
+ 	sun5i-a10s-olinuxino-micro.dtb \
+ 	sun5i-a13-olinuxino.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+@@ -0,0 +1,111 @@
++/*
++ * Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "sun4i-a10.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
++
++/ {
++	model = "Olimex A10-OLinuXino-LIME";
++	compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10";
++
++	soc@01c00000 {
++		emac: ethernet@01c0b000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&emac_pins_a>;
++			phy = <&phy1>;
++			status = "okay";
++		};
++
++		mdio@01c0b080 {
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
++
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
++		pinctrl@01c20800 {
++			ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
++				allwinner,pins = "PC3";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			led_pins_olinuxinolime: led_pins@0 {
++				allwinner,pins = "PH2";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <1>;
++				allwinner,pull = <0>;
++			};
++		};
++
++		uart0: serial@01c28000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart0_pins_a>;
++			status = "okay";
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_olinuxinolime>;
++
++		green {
++			label = "a10-olinuxino-lime:green:usr";
++			gpios = <&pio 7 2 0>;
++			default-state = "on";
++		};
++	};
++
++	reg_ahci_5v: ahci-5v {
++		pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
++		gpio = <&pio 2 3 0>;
++		status = "okay";
++	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
++};
diff --git a/trunk/target/linux/sunxi/patches-3.14/110-dt-sun6i-add-pll-and-spi-modclocks.patch b/trunk/target/linux/sunxi/patches-3.14/110-dt-sun6i-add-pll-and-spi-modclocks.patch
new file mode 100644
index 00000000..7d8c2cfb
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/110-dt-sun6i-add-pll-and-spi-modclocks.patch
@@ -0,0 +1,77 @@
+From 7f94ebf35b017f1664e957857a7f36752e2577cd Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Wed, 5 Feb 2014 14:05:04 +0100
+Subject: [PATCH] ARM: sun6i: dt: Add PLL6 and SPI module clocks
+
+The module clocks in the A31 are still compatible with the A10 one. Add the SPI
+module clocks and the PLL6 in the device tree to allow their use by the SPI
+controllers.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 46 ++++++++++++++++++++++++++++++++--------
+ 1 file changed, 37 insertions(+), 9 deletions(-)
+
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -83,16 +83,12 @@
+ 			clocks = <&osc24M>;
+ 		};
+ 
+-		/*
+-		 * This is a dummy clock, to be used as placeholder on
+-		 * other mux clocks when a specific parent clock is not
+-		 * yet implemented. It should be dropped when the driver
+-		 * is complete.
+-		 */
+-		pll6: pll6 {
++		pll6: clk@01c20028 {
+ 			#clock-cells = <0>;
+-			compatible = "fixed-clock";
+-			clock-frequency = <0>;
++			compatible = "allwinner,sun6i-a31-pll6-clk";
++			reg = <0x01c20028 0x4>;
++			clocks = <&osc24M>;
++			clock-output-names = "pll6";
+ 		};
+ 
+ 		cpu: cpu@01c20050 {
+@@ -192,6 +188,38 @@
+ 					"apb2_uart1", "apb2_uart2", "apb2_uart3",
+ 					"apb2_uart4", "apb2_uart5";
+ 		};
++
++		spi0_clk: clk@01c200a0 {
++			#clock-cells = <0>;
++			compatible = "allwinner,sun4i-mod0-clk";
++			reg = <0x01c200a0 0x4>;
++			clocks = <&osc24M>, <&pll6>;
++			clock-output-names = "spi0";
++		};
++
++		spi1_clk: clk@01c200a4 {
++			#clock-cells = <0>;
++			compatible = "allwinner,sun4i-mod0-clk";
++			reg = <0x01c200a4 0x4>;
++			clocks = <&osc24M>, <&pll6>;
++			clock-output-names = "spi1";
++		};
++
++		spi2_clk: clk@01c200a8 {
++			#clock-cells = <0>;
++			compatible = "allwinner,sun4i-mod0-clk";
++			reg = <0x01c200a8 0x4>;
++			clocks = <&osc24M>, <&pll6>;
++			clock-output-names = "spi2";
++		};
++
++		spi3_clk: clk@01c200ac {
++			#clock-cells = <0>;
++			compatible = "allwinner,sun4i-mod0-clk";
++			reg = <0x01c200ac 0x4>;
++			clocks = <&osc24M>, <&pll6>;
++			clock-output-names = "spi3";
++		};
+ 	};
+ 
+ 	soc@01c00000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/111-dt-sun4i-rename-clocknodes.patch b/trunk/target/linux/sunxi/patches-3.14/111-dt-sun4i-rename-clocknodes.patch
new file mode 100644
index 00000000..9846d5cd
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/111-dt-sun4i-rename-clocknodes.patch
@@ -0,0 +1,134 @@
+From 35b7dfc295f4d6079572a22a225c7444134e1f72 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:41 +0800
+Subject: [PATCH] ARM: dts: sun4i: rename clock node names to clk@N
+
+Device tree naming conventions state that node names should match
+node function. Change fully functioning clock nodes to match and
+add clock-output-names to all sunxi clock nodes.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -58,34 +58,38 @@
+ 			clock-frequency = <0>;
+ 		};
+ 
+-		osc24M: osc24M@01c20050 {
++		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
++			clock-output-names = "osc24M";
+ 		};
+ 
+-		osc32k: osc32k {
++		osc32k: clk@0 {
+ 			#clock-cells = <0>;
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <32768>;
++			clock-output-names = "osc32k";
+ 		};
+ 
+-		pll1: pll1@01c20000 {
++		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll1";
+ 		};
+ 
+-		pll4: pll4@01c20018 {
++		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll4";
+ 		};
+ 
+-		pll5: pll5@01c20020 {
++		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+@@ -93,7 +97,7 @@
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+ 		};
+ 
+-		pll6: pll6@01c20028 {
++		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+@@ -107,6 +111,7 @@
+ 			compatible = "allwinner,sun4i-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&dummy>;
++			clock-output-names = "cpu";
+ 		};
+ 
+ 		axi: axi@01c20054 {
+@@ -114,9 +119,10 @@
+ 			compatible = "allwinner,sun4i-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
++			clock-output-names = "axi";
+ 		};
+ 
+-		axi_gates: axi_gates@01c2005c {
++		axi_gates: clk@01c2005c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-axi-gates-clk";
+ 			reg = <0x01c2005c 0x4>;
+@@ -129,9 +135,10 @@
+ 			compatible = "allwinner,sun4i-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
++			clock-output-names = "ahb";
+ 		};
+ 
+-		ahb_gates: ahb_gates@01c20060 {
++		ahb_gates: clk@01c20060 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-ahb-gates-clk";
+ 			reg = <0x01c20060 0x8>;
+@@ -154,9 +161,10 @@
+ 			compatible = "allwinner,sun4i-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
++			clock-output-names = "apb0";
+ 		};
+ 
+-		apb0_gates: apb0_gates@01c20068 {
++		apb0_gates: clk@01c20068 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-apb0-gates-clk";
+ 			reg = <0x01c20068 0x4>;
+@@ -171,6 +179,7 @@
+ 			compatible = "allwinner,sun4i-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
++			clock-output-names = "apb1_mux";
+ 		};
+ 
+ 		apb1: apb1@01c20058 {
+@@ -178,9 +187,10 @@
+ 			compatible = "allwinner,sun4i-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
++			clock-output-names = "apb1";
+ 		};
+ 
+-		apb1_gates: apb1_gates@01c2006c {
++		apb1_gates: clk@01c2006c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-apb1-gates-clk";
+ 			reg = <0x01c2006c 0x4>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/112-dt-sun5i-rename-clocknodes.patch b/trunk/target/linux/sunxi/patches-3.14/112-dt-sun5i-rename-clocknodes.patch
new file mode 100644
index 00000000..d3e65a5e
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/112-dt-sun5i-rename-clocknodes.patch
@@ -0,0 +1,254 @@
+From 266f79cef78cdf3545065a4786506eee0ae012b3 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:42 +0800
+Subject: [PATCH] ARM: dts: sun5i: rename clock node names to clk@N
+
+Device tree naming conventions state that node names should match
+node function. Change fully functioning clock nodes to match and
+add clock-output-names to all sunxi clock nodes.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 30 ++++++++++++++++++++----------
+ arch/arm/boot/dts/sun5i-a13.dtsi  | 30 ++++++++++++++++++++----------
+ 2 files changed, 40 insertions(+), 20 deletions(-)
+
+--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
+@@ -47,34 +47,38 @@
+ 			clock-frequency = <0>;
+ 		};
+ 
+-		osc24M: osc24M@01c20050 {
++		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
++			clock-output-names = "osc24M";
+ 		};
+ 
+-		osc32k: osc32k {
++		osc32k: clk@0 {
+ 			#clock-cells = <0>;
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <32768>;
++			clock-output-names = "osc32k";
+ 		};
+ 
+-		pll1: pll1@01c20000 {
++		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll1";
+ 		};
+ 
+-		pll4: pll4@01c20018 {
++		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll4";
+ 		};
+ 
+-		pll5: pll5@01c20020 {
++		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+@@ -82,7 +86,7 @@
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+ 		};
+ 
+-		pll6: pll6@01c20028 {
++		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+@@ -96,6 +100,7 @@
+ 			compatible = "allwinner,sun4i-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&dummy>;
++			clock-output-names = "cpu";
+ 		};
+ 
+ 		axi: axi@01c20054 {
+@@ -103,9 +108,10 @@
+ 			compatible = "allwinner,sun4i-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
++			clock-output-names = "axi";
+ 		};
+ 
+-		axi_gates: axi_gates@01c2005c {
++		axi_gates: clk@01c2005c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-axi-gates-clk";
+ 			reg = <0x01c2005c 0x4>;
+@@ -118,9 +124,10 @@
+ 			compatible = "allwinner,sun4i-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
++			clock-output-names = "ahb";
+ 		};
+ 
+-		ahb_gates: ahb_gates@01c20060 {
++		ahb_gates: clk@01c20060 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun5i-a10s-ahb-gates-clk";
+ 			reg = <0x01c20060 0x8>;
+@@ -139,9 +146,10 @@
+ 			compatible = "allwinner,sun4i-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
++			clock-output-names = "apb0";
+ 		};
+ 
+-		apb0_gates: apb0_gates@01c20068 {
++		apb0_gates: clk@01c20068 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun5i-a10s-apb0-gates-clk";
+ 			reg = <0x01c20068 0x4>;
+@@ -155,6 +163,7 @@
+ 			compatible = "allwinner,sun4i-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
++			clock-output-names = "apb1_mux";
+ 		};
+ 
+ 		apb1: apb1@01c20058 {
+@@ -162,9 +171,10 @@
+ 			compatible = "allwinner,sun4i-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
++			clock-output-names = "apb1";
+ 		};
+ 
+-		apb1_gates: apb1_gates@01c2006c {
++		apb1_gates: clk@01c2006c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun5i-a10s-apb1-gates-clk";
+ 			reg = <0x01c2006c 0x4>;
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -52,34 +52,38 @@
+ 			clock-frequency = <0>;
+ 		};
+ 
+-		osc24M: osc24M@01c20050 {
++		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
++			clock-output-names = "osc24M";
+ 		};
+ 
+-		osc32k: osc32k {
++		osc32k: clk@0 {
+ 			#clock-cells = <0>;
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <32768>;
++			clock-output-names = "osc32k";
+ 		};
+ 
+-		pll1: pll1@01c20000 {
++		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll1";
+ 		};
+ 
+-		pll4: pll4@01c20018 {
++		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll4";
+ 		};
+ 
+-		pll5: pll5@01c20020 {
++		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+@@ -87,7 +91,7 @@
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+ 		};
+ 
+-		pll6: pll6@01c20028 {
++		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+@@ -101,6 +105,7 @@
+ 			compatible = "allwinner,sun4i-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&dummy>;
++			clock-output-names = "cpu";
+ 		};
+ 
+ 		axi: axi@01c20054 {
+@@ -108,9 +113,10 @@
+ 			compatible = "allwinner,sun4i-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
++			clock-output-names = "axi";
+ 		};
+ 
+-		axi_gates: axi_gates@01c2005c {
++		axi_gates: clk@01c2005c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-axi-gates-clk";
+ 			reg = <0x01c2005c 0x4>;
+@@ -123,9 +129,10 @@
+ 			compatible = "allwinner,sun4i-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
++			clock-output-names = "ahb";
+ 		};
+ 
+-		ahb_gates: ahb_gates@01c20060 {
++		ahb_gates: clk@01c20060 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun5i-a13-ahb-gates-clk";
+ 			reg = <0x01c20060 0x8>;
+@@ -143,9 +150,10 @@
+ 			compatible = "allwinner,sun4i-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
++			clock-output-names = "apb0";
+ 		};
+ 
+-		apb0_gates: apb0_gates@01c20068 {
++		apb0_gates: clk@01c20068 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun5i-a13-apb0-gates-clk";
+ 			reg = <0x01c20068 0x4>;
+@@ -158,6 +166,7 @@
+ 			compatible = "allwinner,sun4i-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
++			clock-output-names = "apb1_mux";
+ 		};
+ 
+ 		apb1: apb1@01c20058 {
+@@ -165,9 +174,10 @@
+ 			compatible = "allwinner,sun4i-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
++			clock-output-names = "apb1";
+ 		};
+ 
+-		apb1_gates: apb1_gates@01c2006c {
++		apb1_gates: clk@01c2006c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun5i-a13-apb1-gates-clk";
+ 			reg = <0x01c2006c 0x4>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/113-dt-sun6i-rename-clocknodes.patch b/trunk/target/linux/sunxi/patches-3.14/113-dt-sun6i-rename-clocknodes.patch
new file mode 100644
index 00000000..b0f76480
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/113-dt-sun6i-rename-clocknodes.patch
@@ -0,0 +1,107 @@
+From 8bd1bb3a670aae791c4b2e9ab13c92768233368a Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:43 +0800
+Subject: [PATCH] ARM: dts: sun6i: rename clock node names to clk@N
+
+Device tree naming conventions state that node names should match
+node function. Change fully functioning clock nodes to match and
+add clock-output-names to all sunxi clock nodes.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -70,17 +70,19 @@
+ 			clock-frequency = <24000000>;
+ 		};
+ 
+-		osc32k: osc32k {
++		osc32k: clk@0 {
+ 			#clock-cells = <0>;
+ 			compatible = "fixed-clock";
+ 			clock-frequency = <32768>;
++			clock-output-names = "osc32k";
+ 		};
+ 
+-		pll1: pll1@01c20000 {
++		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun6i-a31-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll1";
+ 		};
+ 
+ 		pll6: clk@01c20028 {
+@@ -103,6 +105,7 @@
+ 			 * Allwinner.
+ 			 */
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll1>;
++			clock-output-names = "cpu";
+ 		};
+ 
+ 		axi: axi@01c20050 {
+@@ -110,6 +113,7 @@
+ 			compatible = "allwinner,sun4i-axi-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clocks = <&cpu>;
++			clock-output-names = "axi";
+ 		};
+ 
+ 		ahb1_mux: ahb1_mux@01c20054 {
+@@ -117,6 +121,7 @@
+ 			compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
++			clock-output-names = "ahb1_mux";
+ 		};
+ 
+ 		ahb1: ahb1@01c20054 {
+@@ -124,9 +129,10 @@
+ 			compatible = "allwinner,sun4i-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb1_mux>;
++			clock-output-names = "ahb1";
+ 		};
+ 
+-		ahb1_gates: ahb1_gates@01c20060 {
++		ahb1_gates: clk@01c20060 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun6i-a31-ahb1-gates-clk";
+ 			reg = <0x01c20060 0x8>;
+@@ -152,9 +158,10 @@
+ 			compatible = "allwinner,sun4i-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb1>;
++			clock-output-names = "apb1";
+ 		};
+ 
+-		apb1_gates: apb1_gates@01c20060 {
++		apb1_gates: clk@01c20068 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun6i-a31-apb1-gates-clk";
+ 			reg = <0x01c20068 0x4>;
+@@ -169,6 +176,7 @@
+ 			compatible = "allwinner,sun4i-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
++			clock-output-names = "apb2_mux";
+ 		};
+ 
+ 		apb2: apb2@01c20058 {
+@@ -176,9 +184,10 @@
+ 			compatible = "allwinner,sun6i-a31-apb2-div-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb2_mux>;
++			clock-output-names = "apb2";
+ 		};
+ 
+-		apb2_gates: apb2_gates@01c2006c {
++		apb2_gates: clk@01c2006c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun6i-a31-apb2-gates-clk";
+ 			reg = <0x01c2006c 0x4>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/114-dt-sun7i-rename-clocknodes.patch b/trunk/target/linux/sunxi/patches-3.14/114-dt-sun7i-rename-clocknodes.patch
new file mode 100644
index 00000000..a8a6993e
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/114-dt-sun7i-rename-clocknodes.patch
@@ -0,0 +1,127 @@
+From c57b781689bba48dad635caf005962cc9c8e5e3d Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:44 +0800
+Subject: [PATCH] ARM: dts: sun7i: rename clock node names to clk@N
+
+Device tree naming conventions state that node names should match
+node function. Change fully functioning clock nodes to match and
+add clock-output-names to all sunxi clock nodes.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 25 +++++++++++++++++--------
+ 1 file changed, 17 insertions(+), 8 deletions(-)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -62,11 +62,12 @@
+ 		#size-cells = <1>;
+ 		ranges;
+ 
+-		osc24M: osc24M@01c20050 {
++		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
++			clock-output-names = "osc24M";
+ 		};
+ 
+ 		osc32k: clk@0 {
+@@ -76,21 +77,23 @@
+ 			clock-output-names = "osc32k";
+ 		};
+ 
+-		pll1: pll1@01c20000 {
++		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll1";
+ 		};
+ 
+-		pll4: pll4@01c20018 {
++		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
++			clock-output-names = "pll4";
+ 		};
+ 
+-		pll5: pll5@01c20020 {
++		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+@@ -98,7 +101,7 @@
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+ 		};
+ 
+-		pll6: pll6@01c20028 {
++		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun4i-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+@@ -111,6 +114,7 @@
+ 			compatible = "allwinner,sun4i-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll6 1>;
++			clock-output-names = "cpu";
+ 		};
+ 
+ 		axi: axi@01c20054 {
+@@ -118,6 +122,7 @@
+ 			compatible = "allwinner,sun4i-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
++			clock-output-names = "axi";
+ 		};
+ 
+ 		ahb: ahb@01c20054 {
+@@ -125,9 +130,10 @@
+ 			compatible = "allwinner,sun4i-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
++			clock-output-names = "ahb";
+ 		};
+ 
+-		ahb_gates: ahb_gates@01c20060 {
++		ahb_gates: clk@01c20060 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun7i-a20-ahb-gates-clk";
+ 			reg = <0x01c20060 0x8>;
+@@ -152,9 +158,10 @@
+ 			compatible = "allwinner,sun4i-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
++			clock-output-names = "apb0";
+ 		};
+ 
+-		apb0_gates: apb0_gates@01c20068 {
++		apb0_gates: clk@01c20068 {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun7i-a20-apb0-gates-clk";
+ 			reg = <0x01c20068 0x4>;
+@@ -170,6 +177,7 @@
+ 			compatible = "allwinner,sun4i-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
++			clock-output-names = "apb1_mux";
+ 		};
+ 
+ 		apb1: apb1@01c20058 {
+@@ -177,9 +185,10 @@
+ 			compatible = "allwinner,sun4i-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
++			clock-output-names = "apb1";
+ 		};
+ 
+-		apb1_gates: apb1_gates@01c2006c {
++		apb1_gates: clk@01c2006c {
+ 			#clock-cells = <1>;
+ 			compatible = "allwinner,sun7i-a20-apb1-gates-clk";
+ 			reg = <0x01c2006c 0x4>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch b/trunk/target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch
new file mode 100644
index 00000000..f2644a1d
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/115-dt-sun6i-fix-mod0-compat.patch
@@ -0,0 +1,51 @@
+From 95c1fe603fbea0fd01d98262bd5ff7d5442a86db Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Mon, 24 Feb 2014 17:29:06 +0100
+Subject: [PATCH] ARM: sun6i: dt: Fix mod0 compatible
+
+The module 0 clock compatibles were changed between the time the patch was sent
+and it was merged. Update the compatibles.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -200,7 +200,7 @@
+ 
+ 		spi0_clk: clk@01c200a0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a0 0x4>;
+ 			clocks = <&osc24M>, <&pll6>;
+ 			clock-output-names = "spi0";
+@@ -208,7 +208,7 @@
+ 
+ 		spi1_clk: clk@01c200a4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a4 0x4>;
+ 			clocks = <&osc24M>, <&pll6>;
+ 			clock-output-names = "spi1";
+@@ -216,7 +216,7 @@
+ 
+ 		spi2_clk: clk@01c200a8 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a8 0x4>;
+ 			clocks = <&osc24M>, <&pll6>;
+ 			clock-output-names = "spi2";
+@@ -224,7 +224,7 @@
+ 
+ 		spi3_clk: clk@01c200ac {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200ac 0x4>;
+ 			clocks = <&osc24M>, <&pll6>;
+ 			clock-output-names = "spi3";
diff --git a/trunk/target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch b/trunk/target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch
new file mode 100644
index 00000000..529665e2
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch
@@ -0,0 +1,23 @@
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -26,6 +26,20 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++                        usb1_vbus_pin: usb1_vbus_pin@0 {
++                                        allwinner,pins = "PH6";
++                                        allwinner,function = "gpio_out";
++                                        allwinner,drive = <0>;
++                                        allwinner,pull = <2>;
++                        };
++
++                        usb2_vbus_pin: usb2_vbus_pin@0 {
++                                        allwinner,pins = "PH3";
++                                        allwinner,function = "gpio_out";
++                                        allwinner,drive = <0>;
++                                        allwinner,pull = <2>;
++                        };
+ 		};
+ 
+ 		uart0: serial@01c28000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch b/trunk/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch
new file mode 100644
index 00000000..9a1e485f
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch
@@ -0,0 +1,51 @@
+From 3e1660161aacc5aeeebb09a0c8d91ad01399e5cd Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:48 +0800
+Subject: [PATCH] ARM: dts: sun7i: Add GMAC clock node to sun7i DTSI
+
+The GMAC uses 1 of 2 sources for its transmit clock, depending on the
+PHY interface mode. Add both sources as dummy clocks, and as parents
+to the GMAC clock node.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -330,6 +330,34 @@
+ 		};
+ 
+ 		/*
++		 * The following two are dummy clocks, placeholders used in the gmac_tx
++		 * clock. The gmac driver will choose one parent depending on the PHY
++		 * interface mode, using clk_set_rate auto-reparenting.
++		 * The actual TX clock rate is not controlled by the gmac_tx clock.
++		 */
++		mii_phy_tx_clk: clk@2 {
++			#clock-cells = <0>;
++			compatible = "fixed-clock";
++			clock-frequency = <25000000>;
++			clock-output-names = "mii_phy_tx";
++		};
++
++		gmac_int_tx_clk: clk@3 {
++			#clock-cells = <0>;
++			compatible = "fixed-clock";
++			clock-frequency = <125000000>;
++			clock-output-names = "gmac_int_tx";
++		};
++
++		gmac_tx_clk: clk@01c20164 {
++			#clock-cells = <0>;
++			compatible = "allwinner,sun7i-a20-gmac-clk";
++			reg = <0x01c20164 0x4>;
++			clocks = <&mii_phy_tx_clk>, <&gmac_int_tx_clk>;
++			clock-output-names = "gmac_tx";
++		};
++
++		/*
+ 		 * Dummy clock used by output clocks
+ 		 */
+ 		osc24M_32k: clk@1 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch b/trunk/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch
new file mode 100644
index 00000000..3ddb55ec
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch
@@ -0,0 +1,34 @@
+From 22b9ac16c600694b12479a75461bce031295e4b9 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:49 +0800
+Subject: [PATCH] ARM: dts: sun7i: Add GMAC controller node to sun7i DTSI
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -653,6 +653,21 @@
+ 			status = "disabled";
+ 		};
+ 
++		gmac: ethernet@01c50000 {
++			compatible = "allwinner,sun7i-a20-gmac";
++			reg = <0x01c50000 0x10000>;
++			interrupts = <0 85 4>;
++			interrupt-names = "macirq";
++			clocks = <&ahb_gates 49>, <&gmac_tx_clk>;
++			clock-names = "stmmaceth", "allwinner_gmac_tx";
++			snps,pbl = <2>;
++			snps,fixed-burst;
++			snps,force_sf_dma_mode;
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
+ 		hstimer@01c60000 {
+ 			compatible = "allwinner,sun7i-a20-hstimer";
+ 			reg = <0x01c60000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/122-dt-sun7i-add-pinmuxing-for-gmac.patch b/trunk/target/linux/sunxi/patches-3.14/122-dt-sun7i-add-pinmuxing-for-gmac.patch
new file mode 100644
index 00000000..d539af24
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/122-dt-sun7i-add-pinmuxing-for-gmac.patch
@@ -0,0 +1,48 @@
+From 9f6deb688f4cb733cd3f36e0cc88f14d2f81982d Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:50 +0800
+Subject: [PATCH] ARM: dts: sun7i: Add pin muxing options for the GMAC
+
+The A20 has EMAC and GMAC muxed on the same pins.
+Add pin sets with gmac function for MII and RGMII mode to the DTSI.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -492,6 +492,32 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			gmac_pins_mii_a: gmac_mii@0 {
++				allwinner,pins = "PA0", "PA1", "PA2",
++						"PA3", "PA4", "PA5", "PA6",
++						"PA7", "PA8", "PA9", "PA10",
++						"PA11", "PA12", "PA13", "PA14",
++						"PA15", "PA16";
++				allwinner,function = "gmac";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			gmac_pins_rgmii_a: gmac_rgmii@0 {
++				allwinner,pins = "PA0", "PA1", "PA2",
++						"PA3", "PA4", "PA5", "PA6",
++						"PA7", "PA8", "PA10",
++						"PA11", "PA12", "PA13",
++						"PA15", "PA16";
++				allwinner,function = "gmac";
++				/*
++				 * data lines in RGMII mode use DDR mode
++				 * and need a higher signal drive strength
++				 */
++				allwinner,drive = <3>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		timer@01c20c00 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/123-dt-sun7i-cubietruck-enable-gmac.patch b/trunk/target/linux/sunxi/patches-3.14/123-dt-sun7i-cubietruck-enable-gmac.patch
new file mode 100644
index 00000000..bac445f3
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/123-dt-sun7i-cubietruck-enable-gmac.patch
@@ -0,0 +1,33 @@
+From d09483e1cfcc00be70450c469c3c23496a063d98 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:51 +0800
+Subject: [PATCH] ARM: dts: sun7i: cubietruck: Enable the GMAC
+
+The CubieTruck uses the GMAC with an RGMII phy.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -65,6 +65,18 @@
+ 			pinctrl-0 = <&i2c2_pins_a>;
+ 			status = "okay";
+ 		};
++
++		gmac: ethernet@01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_rgmii_a>;
++			phy = <&phy1>;
++			phy-mode = "rgmii";
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
+ 	};
+ 
+ 	leds {
diff --git a/trunk/target/linux/sunxi/patches-3.14/124-dt-sun7i-cubieboard2-enable-gmac.patch b/trunk/target/linux/sunxi/patches-3.14/124-dt-sun7i-cubieboard2-enable-gmac.patch
new file mode 100644
index 00000000..c4744e9b
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/124-dt-sun7i-cubieboard2-enable-gmac.patch
@@ -0,0 +1,56 @@
+From 856cae07bff4d7e7a111affd4f15803142d29880 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:52 +0800
+Subject: [PATCH] ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC
+
+GMAC has better performance and fewer hardware issues.
+Use the GMAC in MII mode for ethernet instead of the EMAC.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 27 ++++++++++++---------------
+ 1 file changed, 12 insertions(+), 15 deletions(-)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -19,21 +19,6 @@
+ 	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
+-		emac: ethernet@01c0b000 {
+-			pinctrl-names = "default";
+-			pinctrl-0 = <&emac_pins_a>;
+-			phy = <&phy1>;
+-			status = "okay";
+-		};
+-
+-		mdio@01c0b080 {
+-			status = "okay";
+-
+-			phy1: ethernet-phy@1 {
+-				reg = <1>;
+-			};
+-		};
+-
+ 		pinctrl@01c20800 {
+ 			led_pins_cubieboard2: led_pins@0 {
+ 				allwinner,pins = "PH20", "PH21";
+@@ -60,6 +45,18 @@
+ 			pinctrl-0 = <&i2c1_pins_a>;
+ 			status = "okay";
+ 		};
++
++		gmac: ethernet@01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_mii_a>;
++			phy = <&phy1>;
++			phy-mode = "mii";
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
+ 	};
+ 
+ 	leds {
diff --git a/trunk/target/linux/sunxi/patches-3.14/125-dt-sun7i-olinuxinom-enable-gmac.patch b/trunk/target/linux/sunxi/patches-3.14/125-dt-sun7i-olinuxinom-enable-gmac.patch
new file mode 100644
index 00000000..b4648c81
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/125-dt-sun7i-olinuxinom-enable-gmac.patch
@@ -0,0 +1,57 @@
+From f5b426a2eb246e91eb2de0cd215565d38d1d5ce7 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:53 +0800
+Subject: [PATCH] ARM: dts: sun7i: a20-olinuxino-micro: Enable GMAC instead of
+ EMAC
+
+GMAC has better performance and fewer hardware issues.
+Use the GMAC in MII mode for ethernet instead of the EMAC.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 27 +++++++++++--------------
+ 1 file changed, 12 insertions(+), 15 deletions(-)
+
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -19,21 +19,6 @@
+ 	compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
+-		emac: ethernet@01c0b000 {
+-			pinctrl-names = "default";
+-			pinctrl-0 = <&emac_pins_a>;
+-			phy = <&phy1>;
+-			status = "okay";
+-		};
+-
+-		mdio@01c0b080 {
+-			status = "okay";
+-
+-			phy1: ethernet-phy@1 {
+-				reg = <1>;
+-			};
+-		};
+-
+ 		pinctrl@01c20800 {
+ 			led_pins_olinuxino: led_pins@0 {
+ 				allwinner,pins = "PH2";
+@@ -78,6 +63,18 @@
+ 			pinctrl-0 = <&i2c2_pins_a>;
+ 			status = "okay";
+ 		};
++
++		gmac: ethernet@01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_mii_a>;
++			phy = <&phy1>;
++			phy-mode = "mii";
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
+ 	};
+ 
+ 	leds {
diff --git a/trunk/target/linux/sunxi/patches-3.14/126-dt-sun7i-add-eth-alias-for-gmac.patch b/trunk/target/linux/sunxi/patches-3.14/126-dt-sun7i-add-eth-alias-for-gmac.patch
new file mode 100644
index 00000000..01405880
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/126-dt-sun7i-add-eth-alias-for-gmac.patch
@@ -0,0 +1,26 @@
+From 614b4b996be81daca9d8333e1ac163d23e1701c4 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:54 +0800
+Subject: [PATCH] ARM: dts: sun7i: Add ethernet alias for GMAC
+
+All Allwinner A20 boards we support can only use either EMAC or GMAC,
+as they share the same pins. As we have switched all supported to
+GMAC, we should alias GMAC (the active controller) as ethernet0,
+so u-boot will insert the MAC address for the correct controller.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -17,7 +17,7 @@
+ 	interrupt-parent = <&gic>;
+ 
+ 	aliases {
+-		ethernet0 = &emac;
++		ethernet0 = &gmac;
+ 		serial0 = &uart0;
+ 		serial1 = &uart1;
+ 		serial2 = &uart2;
diff --git a/trunk/target/linux/sunxi/patches-3.14/130-dt-sun4i-add-usbclock-bindings.patch b/trunk/target/linux/sunxi/patches-3.14/130-dt-sun4i-add-usbclock-bindings.patch
new file mode 100644
index 00000000..b94aeaf8
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/130-dt-sun4i-add-usbclock-bindings.patch
@@ -0,0 +1,30 @@
+From b5325f9813a6a7cf80ede22fbee66376abbe2384 Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Fri, 7 Feb 2014 16:21:51 +0100
+Subject: [PATCH] ARM: sun4i: dt: Add bindings for USB clocks
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -315,6 +315,15 @@
+ 			clock-output-names = "ir1";
+ 		};
+ 
++		usb_clk: clk@01c200cc {
++			#clock-cells = <1>;
++		        #reset-cells = <1>;
++			compatible = "allwinner,sun4i-a10-usb-clk";
++			reg = <0x01c200cc 0x4>;
++			clocks = <&pll6 1>;
++			clock-output-names = "usb_ohci0", "usb_ohci1", "usb_phy";
++		};
++
+ 		spi3_clk: clk@01c200d4 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-mod0-clk";
diff --git a/trunk/target/linux/sunxi/patches-3.14/131-dt-sun5i-add-usbclock-bindings.patch b/trunk/target/linux/sunxi/patches-3.14/131-dt-sun5i-add-usbclock-bindings.patch
new file mode 100644
index 00000000..366adb4b
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/131-dt-sun5i-add-usbclock-bindings.patch
@@ -0,0 +1,49 @@
+From 5b08dd0d672b59fff16d02239ca6a36aaecdb1ca Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Fri, 7 Feb 2014 16:21:52 +0100
+Subject: [PATCH] ARM: sun5i: dt: Add bindings for USB clocks
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 9 +++++++++
+ arch/arm/boot/dts/sun5i-a13.dtsi  | 9 +++++++++
+ 2 files changed, 18 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
+@@ -272,6 +272,15 @@
+ 			clock-output-names = "ir0";
+ 		};
+ 
++		usb_clk: clk@01c200cc {
++			#clock-cells = <1>;
++		        #reset-cells = <1>;
++			compatible = "allwinner,sun5i-a13-usb-clk";
++			reg = <0x01c200cc 0x4>;
++			clocks = <&pll6 1>;
++			clock-output-names = "usb_ohci0", "usb_phy";
++		};
++
+ 		mbus_clk: clk@01c2015c {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-mod0-clk";
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -274,6 +274,15 @@
+ 			clock-output-names = "ir0";
+ 		};
+ 
++		usb_clk: clk@01c200cc {
++			#clock-cells = <1>;
++		        #reset-cells = <1>;
++			compatible = "allwinner,sun5i-a13-usb-clk";
++			reg = <0x01c200cc 0x4>;
++			clocks = <&pll6 1>;
++			clock-output-names = "usb_ohci0", "usb_phy";
++		};
++
+ 		mbus_clk: clk@01c2015c {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-mod0-clk";
diff --git a/trunk/target/linux/sunxi/patches-3.14/132-dt-sun7i-add-usbclock-bindings.patch b/trunk/target/linux/sunxi/patches-3.14/132-dt-sun7i-add-usbclock-bindings.patch
new file mode 100644
index 00000000..1a97faef
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/132-dt-sun7i-add-usbclock-bindings.patch
@@ -0,0 +1,30 @@
+From 25a1ac92997df2b1e2c76a374d444605cbc96a9f Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Fri, 7 Feb 2014 16:21:53 +0100
+Subject: [PATCH] ARM: sun7i: dt: Add bindings for USB clocks
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -313,6 +313,15 @@
+ 			clock-output-names = "ir1";
+ 		};
+ 
++		usb_clk: clk@01c200cc {
++			#clock-cells = <1>;
++		        #reset-cells = <1>;
++			compatible = "allwinner,sun4i-a10-usb-clk";
++			reg = <0x01c200cc 0x4>;
++			clocks = <&pll6 1>;
++			clock-output-names = "usb_ohci0", "usb_ohci1", "usb_phy";
++		};
++
+ 		spi3_clk: clk@01c200d4 {
+ 			#clock-cells = <0>;
+ 			compatible = "allwinner,sun4i-mod0-clk";
diff --git a/trunk/target/linux/sunxi/patches-3.14/135-pinctrl-fixes.patch b/trunk/target/linux/sunxi/patches-3.14/135-pinctrl-fixes.patch
new file mode 100644
index 00000000..5eb1fabc
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/135-pinctrl-fixes.patch
@@ -0,0 +1,78 @@
+From 68a7d9940935cb71440a9ff384e5859592b0dbfd Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sat, 14 Dec 2013 17:20:13 +0100
+Subject: [PATCH] pinctrl-sunxi: Fix sun5i-a13 port F multiplexing
+
+The correct value for selecting the mmc0 function on port F pins is 2 not 4,
+as per the data-sheet:
+http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ drivers/pinctrl/pinctrl-sunxi-pins.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/pinctrl/pinctrl-sunxi-pins.h
++++ b/drivers/pinctrl/pinctrl-sunxi-pins.h
+@@ -1932,27 +1932,27 @@ static const struct sunxi_desc_pin sun5i
+ 	SUNXI_PIN(SUNXI_PINCTRL_PIN_PF0,
+ 		  SUNXI_FUNCTION(0x0, "gpio_in"),
+ 		  SUNXI_FUNCTION(0x1, "gpio_out"),
+-		  SUNXI_FUNCTION(0x4, "mmc0")),		/* D1 */
++		  SUNXI_FUNCTION(0x2, "mmc0")),		/* D1 */
+ 	SUNXI_PIN(SUNXI_PINCTRL_PIN_PF1,
+ 		  SUNXI_FUNCTION(0x0, "gpio_in"),
+ 		  SUNXI_FUNCTION(0x1, "gpio_out"),
+-		  SUNXI_FUNCTION(0x4, "mmc0")),		/* D0 */
++		  SUNXI_FUNCTION(0x2, "mmc0")),		/* D0 */
+ 	SUNXI_PIN(SUNXI_PINCTRL_PIN_PF2,
+ 		  SUNXI_FUNCTION(0x0, "gpio_in"),
+ 		  SUNXI_FUNCTION(0x1, "gpio_out"),
+-		  SUNXI_FUNCTION(0x4, "mmc0")),		/* CLK */
++		  SUNXI_FUNCTION(0x2, "mmc0")),		/* CLK */
+ 	SUNXI_PIN(SUNXI_PINCTRL_PIN_PF3,
+ 		  SUNXI_FUNCTION(0x0, "gpio_in"),
+ 		  SUNXI_FUNCTION(0x1, "gpio_out"),
+-		  SUNXI_FUNCTION(0x4, "mmc0")),		/* CMD */
++		  SUNXI_FUNCTION(0x2, "mmc0")),		/* CMD */
+ 	SUNXI_PIN(SUNXI_PINCTRL_PIN_PF4,
+ 		  SUNXI_FUNCTION(0x0, "gpio_in"),
+ 		  SUNXI_FUNCTION(0x1, "gpio_out"),
+-		  SUNXI_FUNCTION(0x4, "mmc0")),		/* D3 */
++		  SUNXI_FUNCTION(0x2, "mmc0")),		/* D3 */
+ 	SUNXI_PIN(SUNXI_PINCTRL_PIN_PF5,
+ 		  SUNXI_FUNCTION(0x0, "gpio_in"),
+ 		  SUNXI_FUNCTION(0x1, "gpio_out"),
+-		  SUNXI_FUNCTION(0x4, "mmc0")),		/* D2 */
++		  SUNXI_FUNCTION(0x2, "mmc0")),		/* D2 */
+ 	/* Hole */
+ 	SUNXI_PIN(SUNXI_PINCTRL_PIN_PG0,
+ 		  SUNXI_FUNCTION(0x0, "gpio_in"),
+--- a/drivers/pinctrl/pinctrl-sunxi.c
++++ b/drivers/pinctrl/pinctrl-sunxi.c
+@@ -13,6 +13,7 @@
+ #include <linux/io.h>
+ #include <linux/clk.h>
+ #include <linux/gpio.h>
++#include <linux/irqchip/chained_irq.h>
+ #include <linux/irqdomain.h>
+ #include <linux/irqchip/chained_irq.h>
+ #include <linux/module.h>
+@@ -670,6 +671,8 @@ static void sunxi_pinctrl_irq_handler(un
+ 	struct sunxi_pinctrl *pctl = irq_get_handler_data(irq);
+ 	const unsigned long reg = readl(pctl->membase + IRQ_STATUS_REG);
+ 
++	chained_irq_enter(chip, desc);
++
+ 	/* Clear all interrupts */
+ 	writel(reg, pctl->membase + IRQ_STATUS_REG);
+ 
+@@ -683,6 +686,7 @@ static void sunxi_pinctrl_irq_handler(un
+ 		}
+ 		chained_irq_exit(chip, desc);
+ 	}
++	chained_irq_exit(chip, desc);
+ }
+ 
+ static struct of_device_id sunxi_pinctrl_match[] = {
diff --git a/trunk/target/linux/sunxi/patches-3.14/136-1-irqchip-sun4i-fixes.patch b/trunk/target/linux/sunxi/patches-3.14/136-1-irqchip-sun4i-fixes.patch
new file mode 100644
index 00000000..4345d3e0
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/136-1-irqchip-sun4i-fixes.patch
@@ -0,0 +1,217 @@
+From 843da234cfc0e7014f9e2da82786a485e0820665 Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 13 Mar 2014 15:32:05 +0100
+Subject: [PATCH] irq: Add a new IRQCHIP_EOI_THREADED flag
+
+This flag must be used in combination with handle_fasteoi_irq, when set
+handle_fasteoi_irq will delay the calling of chip->irq_eoi until the threaded
+handler has run.
+
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Tested-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ include/linux/irq.h    |  3 +++
+ kernel/irq/chip.c      | 48 ++++++++++++++++++++++++++++++++++++++++--------
+ kernel/irq/internals.h |  1 +
+ kernel/irq/manage.c    |  2 +-
+ 4 files changed, 45 insertions(+), 9 deletions(-)
+
+--- a/include/linux/irq.h
++++ b/include/linux/irq.h
+@@ -349,6 +349,8 @@ struct irq_chip {
+  * IRQCHIP_ONOFFLINE_ENABLED:	Only call irq_on/off_line callbacks
+  *				when irq enabled
+  * IRQCHIP_SKIP_SET_WAKE:	Skip chip.irq_set_wake(), for this irq chip
++ * IRQCHIP_ONESHOT_SAFE:	One shot does not require mask/unmask
++ * IRQCHIP_EOI_THREADED:	Chip requires eoi() on unmask in threaded mode
+  */
+ enum {
+ 	IRQCHIP_SET_TYPE_MASKED		= (1 <<  0),
+@@ -357,6 +359,7 @@ enum {
+ 	IRQCHIP_ONOFFLINE_ENABLED	= (1 <<  3),
+ 	IRQCHIP_SKIP_SET_WAKE		= (1 <<  4),
+ 	IRQCHIP_ONESHOT_SAFE		= (1 <<  5),
++	IRQCHIP_EOI_THREADED		= (1 <<  6),
+ };
+ 
+ /* This include will go away once we isolated irq_desc usage to core code */
+--- a/kernel/irq/chip.c
++++ b/kernel/irq/chip.c
+@@ -281,6 +281,19 @@ void unmask_irq(struct irq_desc *desc)
+ 	}
+ }
+ 
++void unmask_threaded_irq(struct irq_desc *desc)
++{
++	struct irq_chip *chip = desc->irq_data.chip;
++
++	if (chip->flags & IRQCHIP_EOI_THREADED)
++		chip->irq_eoi(&desc->irq_data);
++
++	if (chip->irq_unmask) {
++		chip->irq_unmask(&desc->irq_data);
++		irq_state_clr_masked(desc);
++	}
++}
++
+ /*
+  *	handle_nested_irq - Handle a nested irq from a irq thread
+  *	@irq:	the interrupt number
+@@ -435,6 +448,27 @@ static inline void preflow_handler(struc
+ static inline void preflow_handler(struct irq_desc *desc) { }
+ #endif
+ 
++static void cond_unmask_eoi_irq(struct irq_desc *desc, struct irq_chip *chip)
++{
++	if (!(desc->istate & IRQS_ONESHOT)) {
++		chip->irq_eoi(&desc->irq_data);
++		return;
++	}
++	/*
++	 * We need to unmask in the following cases:
++	 * - Oneshot irq which did not wake the thread (caused by a
++	 *   spurious interrupt or a primary handler handling it
++	 *   completely).
++	 */
++	if (!irqd_irq_disabled(&desc->irq_data) &&
++	    irqd_irq_masked(&desc->irq_data) && !desc->threads_oneshot) {
++		chip->irq_eoi(&desc->irq_data);
++		unmask_irq(desc);
++	} else if (!(chip->flags & IRQCHIP_EOI_THREADED)) {
++		chip->irq_eoi(&desc->irq_data);
++	}
++}
++
+ /**
+  *	handle_fasteoi_irq - irq handler for transparent controllers
+  *	@irq:	the interrupt number
+@@ -448,6 +482,8 @@ static inline void preflow_handler(struc
+ void
+ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
+ {
++	struct irq_chip *chip = desc->irq_data.chip;
++
+ 	raw_spin_lock(&desc->lock);
+ 
+ 	if (unlikely(irqd_irq_inprogress(&desc->irq_data)))
+@@ -473,18 +509,14 @@ handle_fasteoi_irq(unsigned int irq, str
+ 	preflow_handler(desc);
+ 	handle_irq_event(desc);
+ 
+-	if (desc->istate & IRQS_ONESHOT)
+-		cond_unmask_irq(desc);
++	cond_unmask_eoi_irq(desc, chip);
+ 
+-out_eoi:
+-	desc->irq_data.chip->irq_eoi(&desc->irq_data);
+-out_unlock:
+ 	raw_spin_unlock(&desc->lock);
+ 	return;
+ out:
+-	if (!(desc->irq_data.chip->flags & IRQCHIP_EOI_IF_HANDLED))
+-		goto out_eoi;
+-	goto out_unlock;
++	if (!(chip->flags & IRQCHIP_EOI_IF_HANDLED))
++		chip->irq_eoi(&desc->irq_data);
++	raw_spin_unlock(&desc->lock);
+ }
+ 
+ /**
+--- a/kernel/irq/internals.h
++++ b/kernel/irq/internals.h
+@@ -73,6 +73,7 @@ extern void irq_percpu_enable(struct irq
+ extern void irq_percpu_disable(struct irq_desc *desc, unsigned int cpu);
+ extern void mask_irq(struct irq_desc *desc);
+ extern void unmask_irq(struct irq_desc *desc);
++extern void unmask_threaded_irq(struct irq_desc *desc);
+ 
+ extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
+ 
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -713,7 +713,7 @@ again:
+ 
+ 	if (!desc->threads_oneshot && !irqd_irq_disabled(&desc->irq_data) &&
+ 	    irqd_irq_masked(&desc->irq_data))
+-		unmask_irq(desc);
++		unmask_threaded_irq(desc);
+ 
+ out_unlock:
+ 	raw_spin_unlock_irq(&desc->lock);
+--- a/drivers/irqchip/irq-sun4i.c
++++ b/drivers/irqchip/irq-sun4i.c
+@@ -41,13 +41,11 @@ static asmlinkage void __exception_irq_e
+ static void sun4i_irq_ack(struct irq_data *irqd)
+ {
+ 	unsigned int irq = irqd_to_hwirq(irqd);
+-	unsigned int irq_off = irq % 32;
+-	int reg = irq / 32;
+-	u32 val;
+ 
+-	val = readl(sun4i_irq_base + SUN4I_IRQ_PENDING_REG(reg));
+-	writel(val | (1 << irq_off),
+-	       sun4i_irq_base + SUN4I_IRQ_PENDING_REG(reg));
++	if (irq != 0)
++		return; /* Only IRQ 0 / the ENMI needs to be acked */
++
++	writel(BIT(0), sun4i_irq_base + SUN4I_IRQ_PENDING_REG(0));
+ }
+ 
+ static void sun4i_irq_mask(struct irq_data *irqd)
+@@ -76,16 +74,16 @@ static void sun4i_irq_unmask(struct irq_
+ 
+ static struct irq_chip sun4i_irq_chip = {
+ 	.name		= "sun4i_irq",
+-	.irq_ack	= sun4i_irq_ack,
++	.irq_eoi	= sun4i_irq_ack,
+ 	.irq_mask	= sun4i_irq_mask,
+ 	.irq_unmask	= sun4i_irq_unmask,
++	.flags		= IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED,
+ };
+ 
+ static int sun4i_irq_map(struct irq_domain *d, unsigned int virq,
+ 			 irq_hw_number_t hw)
+ {
+-	irq_set_chip_and_handler(virq, &sun4i_irq_chip,
+-				 handle_level_irq);
++	irq_set_chip_and_handler(virq, &sun4i_irq_chip, handle_fasteoi_irq);
+ 	set_irq_flags(virq, IRQF_VALID | IRQF_PROBE);
+ 
+ 	return 0;
+@@ -109,7 +107,7 @@ static int __init sun4i_of_init(struct d
+ 	writel(0, sun4i_irq_base + SUN4I_IRQ_ENABLE_REG(1));
+ 	writel(0, sun4i_irq_base + SUN4I_IRQ_ENABLE_REG(2));
+ 
+-	/* Mask all the interrupts */
++	/* Unmask all the interrupts, ENABLE_REG(x) is used for masking */
+ 	writel(0, sun4i_irq_base + SUN4I_IRQ_MASK_REG(0));
+ 	writel(0, sun4i_irq_base + SUN4I_IRQ_MASK_REG(1));
+ 	writel(0, sun4i_irq_base + SUN4I_IRQ_MASK_REG(2));
+@@ -140,10 +138,24 @@ static asmlinkage void __exception_irq_e
+ {
+ 	u32 irq, hwirq;
+ 
++	/*
++	 * hwirq == 0 can mean one of 3 things:
++	 * 1) no more irqs pending
++	 * 2) irq 0 pending
++	 * 3) spurious irq
++	 * So if we immediately get a reading of 0, check the irq-pending reg
++	 * to differentiate between 2 and 3. We only do this once to avoid
++	 * the extra check in the common case of 1 hapening after having
++	 * read the vector-reg once.
++	 */
+ 	hwirq = readl(sun4i_irq_base + SUN4I_IRQ_VECTOR_REG) >> 2;
+-	while (hwirq != 0) {
++	if (hwirq == 0 &&
++		  !(readl(sun4i_irq_base + SUN4I_IRQ_PENDING_REG(0)) & BIT(0)))
++		return;
++
++	do {
+ 		irq = irq_find_mapping(sun4i_irq_domain, hwirq);
+ 		handle_IRQ(irq, regs);
+ 		hwirq = readl(sun4i_irq_base + SUN4I_IRQ_VECTOR_REG) >> 2;
+-	}
++	} while (hwirq != 0);
+ }
diff --git a/trunk/target/linux/sunxi/patches-3.14/137-1-pinctrl-create-irq-pin-mapping.patch b/trunk/target/linux/sunxi/patches-3.14/137-1-pinctrl-create-irq-pin-mapping.patch
new file mode 100644
index 00000000..1e4f1c79
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/137-1-pinctrl-create-irq-pin-mapping.patch
@@ -0,0 +1,36 @@
+From 4c228d02d1339a286e259893062ea445be82b573 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Tue, 7 Jan 2014 18:56:29 +0800
+Subject: [PATCH] pinctrl: sunxi: create irq/pin mapping during init
+
+The irq/pin mapping is used to lookup the pin to mux to the irq
+function when the irq is enabled. It is created when gpio_to_irq
+is called. Creating the mapping during init allows us to map the
+interrupts directly from the device tree.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ drivers/pinctrl/pinctrl-sunxi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/pinctrl/pinctrl-sunxi.c
++++ b/drivers/pinctrl/pinctrl-sunxi.c
+@@ -531,8 +531,6 @@ static int sunxi_pinctrl_gpio_to_irq(str
+ 	if (!desc)
+ 		return -EINVAL;
+ 
+-	pctl->irq_array[desc->irqnum] = offset;
+-
+ 	dev_dbg(chip->dev, "%s: request IRQ for GPIO %d, return %d\n",
+ 		chip->label, offset + chip->base, desc->irqnum);
+ 
+@@ -759,6 +757,9 @@ static int sunxi_pinctrl_build_state(str
+ 		struct sunxi_desc_function *func = pin->functions;
+ 
+ 		while (func->name) {
++			/* Create interrupt mapping while we're at it */
++			if (!strcmp(func->name, "irq"))
++				pctl->irq_array[func->irqnum] = pin->pin.number;
+ 			sunxi_pinctrl_add_function(pctl, func->name);
+ 			func++;
+ 		}
diff --git a/trunk/target/linux/sunxi/patches-3.14/137-2-pinctrl-add-IRQCHIP_SKIP_SET_WAKE.patch b/trunk/target/linux/sunxi/patches-3.14/137-2-pinctrl-add-IRQCHIP_SKIP_SET_WAKE.patch
new file mode 100644
index 00000000..58e13946
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/137-2-pinctrl-add-IRQCHIP_SKIP_SET_WAKE.patch
@@ -0,0 +1,26 @@
+From 77f1265dd02dfd5dcaa0ebd6d3ea1d131bc095e2 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Tue, 7 Jan 2014 19:01:29 +0800
+Subject: [PATCH] pinctrl: sunxi: add IRQCHIP_SKIP_SET_WAKE flag for pinctrl
+ irq chip
+
+The sunxi pinctrl irq chip driver does not support wakeup at the
+moment. Adding IRQCHIP_SKIP_SET_WAKE lets the irqs work with drivers
+using wakeup.
+
+Also add a name to the irq chip.
+---
+ drivers/pinctrl/pinctrl-sunxi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/pinctrl/pinctrl-sunxi.c
++++ b/drivers/pinctrl/pinctrl-sunxi.c
+@@ -661,6 +661,8 @@ static struct irq_chip sunxi_pinctrl_irq
+ 	.irq_mask_ack	= sunxi_pinctrl_irq_mask_ack,
+ 	.irq_unmask	= sunxi_pinctrl_irq_unmask,
+ 	.irq_set_type	= sunxi_pinctrl_irq_set_type,
++	.name		= "sunxi-pio",
++	.flags		= IRQCHIP_SKIP_SET_WAKE,
+ };
+ 
+ static void sunxi_pinctrl_irq_handler(unsigned irq, struct irq_desc *desc)
diff --git a/trunk/target/linux/sunxi/patches-3.14/137-3-dt-sun7i-add-interrupt-cells.patch b/trunk/target/linux/sunxi/patches-3.14/137-3-dt-sun7i-add-interrupt-cells.patch
new file mode 100644
index 00000000..fb3b5cde
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/137-3-dt-sun7i-add-interrupt-cells.patch
@@ -0,0 +1,26 @@
+From eda34c0692e479dd9cd2b7cb70986ae57f15187f Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Tue, 7 Jan 2014 18:50:01 +0800
+Subject: [PATCH] ARM: dts: sun7i: Add #interrupt-cells to pinctrl node
+
+The pinctrl device is also an interrupt controller for external
+interrupts. Add the missing #interrupt-cells property.
+
+Also remove the unused #address-cells property.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -424,7 +424,7 @@
+ 			clocks = <&apb0_gates 5>;
+ 			gpio-controller;
+ 			interrupt-controller;
+-			#address-cells = <1>;
++			#interrupt-cells = <2>;
+ 			#size-cells = <0>;
+ 			#gpio-cells = <3>;
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/140-dt-sunxi-convert-to-new-clock-compats.patch b/trunk/target/linux/sunxi/patches-3.14/140-dt-sunxi-convert-to-new-clock-compats.patch
new file mode 100644
index 00000000..875aea14
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/140-dt-sunxi-convert-to-new-clock-compats.patch
@@ -0,0 +1,1017 @@
+From 46b2ee17d7321149b4d48dd86ee2e346624aa141 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 6 Feb 2014 09:55:58 +0100
+Subject: [PATCH] ARM: sunxi: dt: Convert to the new clock compatibles
+
+Switch the device tree to the new compatibles introduced in the clock drivers
+to have a common pattern accross all Allwinner SoCs.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi  | 60 +++++++++++++++++++--------------------
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 48 +++++++++++++++----------------
+ arch/arm/boot/dts/sun5i-a13.dtsi  | 48 +++++++++++++++----------------
+ arch/arm/boot/dts/sun6i-a31.dtsi  | 10 +++----
+ arch/arm/boot/dts/sun7i-a20.dtsi  | 54 +++++++++++++++++------------------
+ 5 files changed, 110 insertions(+), 110 deletions(-)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -60,7 +60,7 @@
+ 
+ 		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-osc-clk";
++			compatible = "allwinner,sun4i-a10-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
+ 			clock-output-names = "osc24M";
+@@ -75,7 +75,7 @@
+ 
+ 		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll1";
+@@ -83,7 +83,7 @@
+ 
+ 		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll4";
+@@ -91,7 +91,7 @@
+ 
+ 		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll5-clk";
++			compatible = "allwinner,sun4i-a10-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+@@ -99,7 +99,7 @@
+ 
+ 		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll6-clk";
++			compatible = "allwinner,sun4i-a10-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll6_sata", "pll6_other", "pll6";
+@@ -108,7 +108,7 @@
+ 		/* dummy is 200M */
+ 		cpu: cpu@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-cpu-clk";
++			compatible = "allwinner,sun4i-a10-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&dummy>;
+ 			clock-output-names = "cpu";
+@@ -116,7 +116,7 @@
+ 
+ 		axi: axi@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-axi-clk";
++			compatible = "allwinner,sun4i-a10-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
+ 			clock-output-names = "axi";
+@@ -124,7 +124,7 @@
+ 
+ 		axi_gates: clk@01c2005c {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-axi-gates-clk";
++			compatible = "allwinner,sun4i-a10-axi-gates-clk";
+ 			reg = <0x01c2005c 0x4>;
+ 			clocks = <&axi>;
+ 			clock-output-names = "axi_dram";
+@@ -132,7 +132,7 @@
+ 
+ 		ahb: ahb@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-ahb-clk";
++			compatible = "allwinner,sun4i-a10-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
+ 			clock-output-names = "ahb";
+@@ -140,7 +140,7 @@
+ 
+ 		ahb_gates: clk@01c20060 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-ahb-gates-clk";
++			compatible = "allwinner,sun4i-a10-ahb-gates-clk";
+ 			reg = <0x01c20060 0x8>;
+ 			clocks = <&ahb>;
+ 			clock-output-names = "ahb_usb0", "ahb_ehci0",
+@@ -158,7 +158,7 @@
+ 
+ 		apb0: apb0@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb0-clk";
++			compatible = "allwinner,sun4i-a10-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
+ 			clock-output-names = "apb0";
+@@ -166,7 +166,7 @@
+ 
+ 		apb0_gates: clk@01c20068 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-apb0-gates-clk";
++			compatible = "allwinner,sun4i-a10-apb0-gates-clk";
+ 			reg = <0x01c20068 0x4>;
+ 			clocks = <&apb0>;
+ 			clock-output-names = "apb0_codec", "apb0_spdif",
+@@ -176,7 +176,7 @@
+ 
+ 		apb1_mux: apb1_mux@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-mux-clk";
++			compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+ 			clock-output-names = "apb1_mux";
+@@ -184,7 +184,7 @@
+ 
+ 		apb1: apb1@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-clk";
++			compatible = "allwinner,sun4i-a10-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
+ 			clock-output-names = "apb1";
+@@ -192,7 +192,7 @@
+ 
+ 		apb1_gates: clk@01c2006c {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-apb1-gates-clk";
++			compatible = "allwinner,sun4i-a10-apb1-gates-clk";
+ 			reg = <0x01c2006c 0x4>;
+ 			clocks = <&apb1>;
+ 			clock-output-names = "apb1_i2c0", "apb1_i2c1",
+@@ -205,7 +205,7 @@
+ 
+ 		nand_clk: clk@01c20080 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20080 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "nand";
+@@ -213,7 +213,7 @@
+ 
+ 		ms_clk: clk@01c20084 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20084 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ms";
+@@ -221,7 +221,7 @@
+ 
+ 		mmc0_clk: clk@01c20088 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20088 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc0";
+@@ -229,7 +229,7 @@
+ 
+ 		mmc1_clk: clk@01c2008c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2008c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc1";
+@@ -237,7 +237,7 @@
+ 
+ 		mmc2_clk: clk@01c20090 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20090 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc2";
+@@ -245,7 +245,7 @@
+ 
+ 		mmc3_clk: clk@01c20094 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20094 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc3";
+@@ -253,7 +253,7 @@
+ 
+ 		ts_clk: clk@01c20098 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20098 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ts";
+@@ -261,7 +261,7 @@
+ 
+ 		ss_clk: clk@01c2009c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2009c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ss";
+@@ -269,7 +269,7 @@
+ 
+ 		spi0_clk: clk@01c200a0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi0";
+@@ -277,7 +277,7 @@
+ 
+ 		spi1_clk: clk@01c200a4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi1";
+@@ -285,7 +285,7 @@
+ 
+ 		spi2_clk: clk@01c200a8 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a8 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi2";
+@@ -293,7 +293,7 @@
+ 
+ 		pata_clk: clk@01c200ac {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200ac 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "pata";
+@@ -301,7 +301,7 @@
+ 
+ 		ir0_clk: clk@01c200b0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200b0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ir0";
+@@ -309,7 +309,7 @@
+ 
+ 		ir1_clk: clk@01c200b4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200b4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ir1";
+@@ -326,7 +326,7 @@
+ 
+ 		spi3_clk: clk@01c200d4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200d4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi3";
+--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
+@@ -49,7 +49,7 @@
+ 
+ 		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-osc-clk";
++			compatible = "allwinner,sun4i-a10-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
+ 			clock-output-names = "osc24M";
+@@ -64,7 +64,7 @@
+ 
+ 		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll1";
+@@ -72,7 +72,7 @@
+ 
+ 		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll4";
+@@ -80,7 +80,7 @@
+ 
+ 		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll5-clk";
++			compatible = "allwinner,sun4i-a10-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+@@ -88,7 +88,7 @@
+ 
+ 		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll6-clk";
++			compatible = "allwinner,sun4i-a10-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll6_sata", "pll6_other", "pll6";
+@@ -97,7 +97,7 @@
+ 		/* dummy is 200M */
+ 		cpu: cpu@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-cpu-clk";
++			compatible = "allwinner,sun4i-a10-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&dummy>;
+ 			clock-output-names = "cpu";
+@@ -105,7 +105,7 @@
+ 
+ 		axi: axi@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-axi-clk";
++			compatible = "allwinner,sun4i-a10-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
+ 			clock-output-names = "axi";
+@@ -113,7 +113,7 @@
+ 
+ 		axi_gates: clk@01c2005c {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-axi-gates-clk";
++			compatible = "allwinner,sun4i-a10-axi-gates-clk";
+ 			reg = <0x01c2005c 0x4>;
+ 			clocks = <&axi>;
+ 			clock-output-names = "axi_dram";
+@@ -121,7 +121,7 @@
+ 
+ 		ahb: ahb@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-ahb-clk";
++			compatible = "allwinner,sun4i-a10-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
+ 			clock-output-names = "ahb";
+@@ -143,7 +143,7 @@
+ 
+ 		apb0: apb0@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb0-clk";
++			compatible = "allwinner,sun4i-a10-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
+ 			clock-output-names = "apb0";
+@@ -160,7 +160,7 @@
+ 
+ 		apb1_mux: apb1_mux@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-mux-clk";
++			compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+ 			clock-output-names = "apb1_mux";
+@@ -168,7 +168,7 @@
+ 
+ 		apb1: apb1@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-clk";
++			compatible = "allwinner,sun4i-a10-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
+ 			clock-output-names = "apb1";
+@@ -186,7 +186,7 @@
+ 
+ 		nand_clk: clk@01c20080 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20080 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "nand";
+@@ -194,7 +194,7 @@
+ 
+ 		ms_clk: clk@01c20084 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20084 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ms";
+@@ -202,7 +202,7 @@
+ 
+ 		mmc0_clk: clk@01c20088 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20088 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc0";
+@@ -210,7 +210,7 @@
+ 
+ 		mmc1_clk: clk@01c2008c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2008c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc1";
+@@ -218,7 +218,7 @@
+ 
+ 		mmc2_clk: clk@01c20090 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20090 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc2";
+@@ -226,7 +226,7 @@
+ 
+ 		ts_clk: clk@01c20098 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20098 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ts";
+@@ -234,7 +234,7 @@
+ 
+ 		ss_clk: clk@01c2009c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2009c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ss";
+@@ -242,7 +242,7 @@
+ 
+ 		spi0_clk: clk@01c200a0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi0";
+@@ -250,7 +250,7 @@
+ 
+ 		spi1_clk: clk@01c200a4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi1";
+@@ -258,7 +258,7 @@
+ 
+ 		spi2_clk: clk@01c200a8 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a8 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi2";
+@@ -266,7 +266,7 @@
+ 
+ 		ir0_clk: clk@01c200b0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200b0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ir0";
+@@ -283,7 +283,7 @@
+ 
+ 		mbus_clk: clk@01c2015c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2015c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mbus";
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -54,7 +54,7 @@
+ 
+ 		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-osc-clk";
++			compatible = "allwinner,sun4i-a10-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
+ 			clock-output-names = "osc24M";
+@@ -69,7 +69,7 @@
+ 
+ 		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll1";
+@@ -77,7 +77,7 @@
+ 
+ 		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll4";
+@@ -85,7 +85,7 @@
+ 
+ 		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll5-clk";
++			compatible = "allwinner,sun4i-a10-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+@@ -93,7 +93,7 @@
+ 
+ 		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll6-clk";
++			compatible = "allwinner,sun4i-a10-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll6_sata", "pll6_other", "pll6";
+@@ -102,7 +102,7 @@
+ 		/* dummy is 200M */
+ 		cpu: cpu@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-cpu-clk";
++			compatible = "allwinner,sun4i-a10-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&dummy>;
+ 			clock-output-names = "cpu";
+@@ -110,7 +110,7 @@
+ 
+ 		axi: axi@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-axi-clk";
++			compatible = "allwinner,sun4i-a10-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
+ 			clock-output-names = "axi";
+@@ -118,7 +118,7 @@
+ 
+ 		axi_gates: clk@01c2005c {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-axi-gates-clk";
++			compatible = "allwinner,sun4i-a10-axi-gates-clk";
+ 			reg = <0x01c2005c 0x4>;
+ 			clocks = <&axi>;
+ 			clock-output-names = "axi_dram";
+@@ -126,7 +126,7 @@
+ 
+ 		ahb: ahb@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-ahb-clk";
++			compatible = "allwinner,sun4i-a10-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
+ 			clock-output-names = "ahb";
+@@ -147,7 +147,7 @@
+ 
+ 		apb0: apb0@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb0-clk";
++			compatible = "allwinner,sun4i-a10-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
+ 			clock-output-names = "apb0";
+@@ -163,7 +163,7 @@
+ 
+ 		apb1_mux: apb1_mux@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-mux-clk";
++			compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+ 			clock-output-names = "apb1_mux";
+@@ -171,7 +171,7 @@
+ 
+ 		apb1: apb1@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-clk";
++			compatible = "allwinner,sun4i-a10-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
+ 			clock-output-names = "apb1";
+@@ -188,7 +188,7 @@
+ 
+ 		nand_clk: clk@01c20080 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20080 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "nand";
+@@ -196,7 +196,7 @@
+ 
+ 		ms_clk: clk@01c20084 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20084 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ms";
+@@ -204,7 +204,7 @@
+ 
+ 		mmc0_clk: clk@01c20088 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20088 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc0";
+@@ -212,7 +212,7 @@
+ 
+ 		mmc1_clk: clk@01c2008c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2008c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc1";
+@@ -220,7 +220,7 @@
+ 
+ 		mmc2_clk: clk@01c20090 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20090 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc2";
+@@ -228,7 +228,7 @@
+ 
+ 		ts_clk: clk@01c20098 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20098 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ts";
+@@ -236,7 +236,7 @@
+ 
+ 		ss_clk: clk@01c2009c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2009c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ss";
+@@ -244,7 +244,7 @@
+ 
+ 		spi0_clk: clk@01c200a0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi0";
+@@ -252,7 +252,7 @@
+ 
+ 		spi1_clk: clk@01c200a4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi1";
+@@ -260,7 +260,7 @@
+ 
+ 		spi2_clk: clk@01c200a8 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a8 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi2";
+@@ -268,7 +268,7 @@
+ 
+ 		ir0_clk: clk@01c200b0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200b0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ir0";
+@@ -285,7 +285,7 @@
+ 
+ 		mbus_clk: clk@01c2015c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2015c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mbus";
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -95,7 +95,7 @@
+ 
+ 		cpu: cpu@01c20050 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-cpu-clk";
++			compatible = "allwinner,sun4i-a10-cpu-clk";
+ 			reg = <0x01c20050 0x4>;
+ 
+ 			/*
+@@ -110,7 +110,7 @@
+ 
+ 		axi: axi@01c20050 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-axi-clk";
++			compatible = "allwinner,sun4i-a10-axi-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clocks = <&cpu>;
+ 			clock-output-names = "axi";
+@@ -126,7 +126,7 @@
+ 
+ 		ahb1: ahb1@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-ahb-clk";
++			compatible = "allwinner,sun4i-a10-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb1_mux>;
+ 			clock-output-names = "ahb1";
+@@ -155,7 +155,7 @@
+ 
+ 		apb1: apb1@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb0-clk";
++			compatible = "allwinner,sun4i-a10-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb1>;
+ 			clock-output-names = "apb1";
+@@ -173,7 +173,7 @@
+ 
+ 		apb2_mux: apb2_mux@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-mux-clk";
++			compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
+ 			clock-output-names = "apb2_mux";
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -64,7 +64,7 @@
+ 
+ 		osc24M: clk@01c20050 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-osc-clk";
++			compatible = "allwinner,sun4i-a10-osc-clk";
+ 			reg = <0x01c20050 0x4>;
+ 			clock-frequency = <24000000>;
+ 			clock-output-names = "osc24M";
+@@ -79,7 +79,7 @@
+ 
+ 		pll1: clk@01c20000 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20000 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll1";
+@@ -87,7 +87,7 @@
+ 
+ 		pll4: clk@01c20018 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-pll1-clk";
++			compatible = "allwinner,sun4i-a10-pll1-clk";
+ 			reg = <0x01c20018 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll4";
+@@ -95,7 +95,7 @@
+ 
+ 		pll5: clk@01c20020 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll5-clk";
++			compatible = "allwinner,sun4i-a10-pll5-clk";
+ 			reg = <0x01c20020 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll5_ddr", "pll5_other";
+@@ -103,7 +103,7 @@
+ 
+ 		pll6: clk@01c20028 {
+ 			#clock-cells = <1>;
+-			compatible = "allwinner,sun4i-pll6-clk";
++			compatible = "allwinner,sun4i-a10-pll6-clk";
+ 			reg = <0x01c20028 0x4>;
+ 			clocks = <&osc24M>;
+ 			clock-output-names = "pll6_sata", "pll6_other", "pll6";
+@@ -111,7 +111,7 @@
+ 
+ 		cpu: cpu@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-cpu-clk";
++			compatible = "allwinner,sun4i-a10-cpu-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll6 1>;
+ 			clock-output-names = "cpu";
+@@ -119,7 +119,7 @@
+ 
+ 		axi: axi@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-axi-clk";
++			compatible = "allwinner,sun4i-a10-axi-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&cpu>;
+ 			clock-output-names = "axi";
+@@ -127,7 +127,7 @@
+ 
+ 		ahb: ahb@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-ahb-clk";
++			compatible = "allwinner,sun4i-a10-ahb-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&axi>;
+ 			clock-output-names = "ahb";
+@@ -155,7 +155,7 @@
+ 
+ 		apb0: apb0@01c20054 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb0-clk";
++			compatible = "allwinner,sun4i-a10-apb0-clk";
+ 			reg = <0x01c20054 0x4>;
+ 			clocks = <&ahb>;
+ 			clock-output-names = "apb0";
+@@ -174,7 +174,7 @@
+ 
+ 		apb1_mux: apb1_mux@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-mux-clk";
++			compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
+ 			clock-output-names = "apb1_mux";
+@@ -182,7 +182,7 @@
+ 
+ 		apb1: apb1@01c20058 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-apb1-clk";
++			compatible = "allwinner,sun4i-a10-apb1-clk";
+ 			reg = <0x01c20058 0x4>;
+ 			clocks = <&apb1_mux>;
+ 			clock-output-names = "apb1";
+@@ -203,7 +203,7 @@
+ 
+ 		nand_clk: clk@01c20080 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20080 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "nand";
+@@ -211,7 +211,7 @@
+ 
+ 		ms_clk: clk@01c20084 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20084 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ms";
+@@ -219,7 +219,7 @@
+ 
+ 		mmc0_clk: clk@01c20088 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20088 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc0";
+@@ -227,7 +227,7 @@
+ 
+ 		mmc1_clk: clk@01c2008c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2008c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc1";
+@@ -235,7 +235,7 @@
+ 
+ 		mmc2_clk: clk@01c20090 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20090 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc2";
+@@ -243,7 +243,7 @@
+ 
+ 		mmc3_clk: clk@01c20094 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20094 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "mmc3";
+@@ -251,7 +251,7 @@
+ 
+ 		ts_clk: clk@01c20098 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c20098 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ts";
+@@ -259,7 +259,7 @@
+ 
+ 		ss_clk: clk@01c2009c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2009c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ss";
+@@ -267,7 +267,7 @@
+ 
+ 		spi0_clk: clk@01c200a0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi0";
+@@ -275,7 +275,7 @@
+ 
+ 		spi1_clk: clk@01c200a4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi1";
+@@ -283,7 +283,7 @@
+ 
+ 		spi2_clk: clk@01c200a8 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200a8 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi2";
+@@ -291,7 +291,7 @@
+ 
+ 		pata_clk: clk@01c200ac {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200ac 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "pata";
+@@ -299,7 +299,7 @@
+ 
+ 		ir0_clk: clk@01c200b0 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200b0 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ir0";
+@@ -307,7 +307,7 @@
+ 
+ 		ir1_clk: clk@01c200b4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200b4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "ir1";
+@@ -324,7 +324,7 @@
+ 
+ 		spi3_clk: clk@01c200d4 {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c200d4 0x4>;
+ 			clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
+ 			clock-output-names = "spi3";
+@@ -332,7 +332,7 @@
+ 
+ 		mbus_clk: clk@01c2015c {
+ 			#clock-cells = <0>;
+-			compatible = "allwinner,sun4i-mod0-clk";
++			compatible = "allwinner,sun4i-a10-mod0-clk";
+ 			reg = <0x01c2015c 0x4>;
+ 			clocks = <&osc24M>, <&pll6 2>, <&pll5 1>;
+ 			clock-output-names = "mbus";
diff --git a/trunk/target/linux/sunxi/patches-3.14/141-dt-sunxi-add-common-regulator-include.patch b/trunk/target/linux/sunxi/patches-3.14/141-dt-sunxi-add-common-regulator-include.patch
new file mode 100644
index 00000000..32f4f72a
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/141-dt-sunxi-add-common-regulator-include.patch
@@ -0,0 +1,97 @@
+From 6e763a8ebe7a16ae5635ade146fd2930749ed775 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sat, 1 Mar 2014 14:57:56 +0100
+Subject: [PATCH] ARM: sunxi: dt: Add sunxi-common-regulators include file
+
+Most sunxi boards with a sata connector also have a gpio controlled connector
+for sata target power and almost all sunxi boards have a gpio controlled vbus
+for usb1 and usb2.
+
+This commit adds an include file for the regulators representing these
+supplies, avoiding the need to copy and paste the regulator code to allmost
+all sunxi board dts files.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sunxi-common-regulators.dtsi | 75 ++++++++++++++++++++++++++
+ 1 file changed, 75 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sunxi-common-regulators.dtsi
+
+--- /dev/null
++++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
+@@ -0,0 +1,75 @@
++/*
++ * sunxi boards common regulator (ahci target power supply, usb-vbus) code
++ *
++ * Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/ {
++	soc@01c00000 {
++		pio: pinctrl@01c20800 {
++			ahci_pwr_pin_a: ahci_pwr_pin@0 {
++				allwinner,pins = "PB8";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			usb1_vbus_pin_a: usb1_vbus_pin@0 {
++				allwinner,pins = "PH6";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			usb2_vbus_pin_a: usb2_vbus_pin@0 {
++				allwinner,pins = "PH3";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++		};
++	};
++
++	reg_ahci_5v: ahci-5v {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		pinctrl-0 = <&ahci_pwr_pin_a>;
++		regulator-name = "ahci-5v";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		enable-active-high;
++		gpio = <&pio 1 8 0>;
++		status = "disabled";
++	};
++
++	reg_usb1_vbus: usb1-vbus {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		pinctrl-0 = <&usb1_vbus_pin_a>;
++		regulator-name = "usb1-vbus";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		enable-active-high;
++		gpio = <&pio 7 6 0>;
++		status = "disabled";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		pinctrl-0 = <&usb2_vbus_pin_a>;
++		regulator-name = "usb2-vbus";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		enable-active-high;
++		gpio = <&pio 7 3 0>;
++		status = "disabled";
++	};
++};
diff --git a/trunk/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch b/trunk/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch
new file mode 100644
index 00000000..9f8f00c6
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch
@@ -0,0 +1,73 @@
+From c9bfaadf8973cb4d9074e80c4bf8708deca62712 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 22 Feb 2014 22:35:54 +0100
+Subject: [PATCH] ARM: dt: sun7i: Add A20 SPI controller nodes
+
+The A20 has 4 SPI controllers compatible with the one found in the A10. Add
+them in the DT.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 44 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -401,6 +401,28 @@
+ 		#size-cells = <1>;
+ 		ranges;
+ 
++		spi0: spi@01c05000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c05000 0x1000>;
++			interrupts = <0 10 4>;
++			clocks = <&ahb_gates 20>, <&spi0_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
++		spi1: spi@01c06000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c06000 0x1000>;
++			interrupts = <0 11 4>;
++			clocks = <&ahb_gates 21>, <&spi1_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
+ 		emac: ethernet@01c0b000 {
+ 			compatible = "allwinner,sun4i-a10-emac";
+ 			reg = <0x01c0b000 0x1000>;
+@@ -417,6 +439,28 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		spi2: spi@01c17000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c17000 0x1000>;
++			interrupts = <0 12 4>;
++			clocks = <&ahb_gates 22>, <&spi2_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
++		spi3: spi@01c1f000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c1f000 0x1000>;
++			interrupts = <0 50 4>;
++			clocks = <&ahb_gates 23>, <&spi3_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
+ 		pio: pinctrl@01c20800 {
+ 			compatible = "allwinner,sun7i-a20-pinctrl";
+ 			reg = <0x01c20800 0x400>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/145-2-dt-sun4i-add-a10-spi.patch b/trunk/target/linux/sunxi/patches-3.14/145-2-dt-sun4i-add-a10-spi.patch
new file mode 100644
index 00000000..4bc9ea00
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/145-2-dt-sun4i-add-a10-spi.patch
@@ -0,0 +1,72 @@
+From cac3c4d67c80c4895d0d44e609beb535d66af6a3 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 22 Feb 2014 22:35:55 +0100
+Subject: [PATCH] ARM: dt: sun4i: Add A10 SPI controller nodes
+
+The A10 has 4 SPI controllers that are now supported. Add them in the DT.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 44 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -339,6 +339,28 @@
+ 		#size-cells = <1>;
+ 		ranges;
+ 
++		spi0: spi@01c05000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c05000 0x1000>;
++			interrupts = <10>;
++			clocks = <&ahb_gates 20>, <&spi0_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
++		spi1: spi@01c06000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c06000 0x1000>;
++			interrupts = <11>;
++			clocks = <&ahb_gates 21>, <&spi1_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
+ 		emac: ethernet@01c0b000 {
+ 			compatible = "allwinner,sun4i-a10-emac";
+ 			reg = <0x01c0b000 0x1000>;
+@@ -355,6 +377,28 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		spi2: spi@01c17000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c17000 0x1000>;
++			interrupts = <12>;
++			clocks = <&ahb_gates 22>, <&spi2_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
++		spi3: spi@01c1f000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c1f000 0x1000>;
++			interrupts = <50>;
++			clocks = <&ahb_gates 23>, <&spi3_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
+ 		intc: interrupt-controller@01c20400 {
+ 			compatible = "allwinner,sun4i-ic";
+ 			reg = <0x01c20400 0x400>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/145-3-dt-sun5i-add-a13-spi.patch b/trunk/target/linux/sunxi/patches-3.14/145-3-dt-sun5i-add-a13-spi.patch
new file mode 100644
index 00000000..7558d562
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/145-3-dt-sun5i-add-a13-spi.patch
@@ -0,0 +1,55 @@
+From aeb3b73fc416e14afd25f25e69f8713488edcc1b Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 22 Feb 2014 22:35:57 +0100
+Subject: [PATCH] ARM: dt: sun5i: Add A13 SPI controller nodes
+
+The A13 has 3 SPI controllers compatible with the one found in the A10. Add
+them in the DT.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun5i-a13.dtsi | 33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -298,6 +298,39 @@
+ 		#size-cells = <1>;
+ 		ranges;
+ 
++		spi0: spi@01c05000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c05000 0x1000>;
++			interrupts = <10>;
++			clocks = <&ahb_gates 20>, <&spi0_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
++		spi1: spi@01c06000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c06000 0x1000>;
++			interrupts = <11>;
++			clocks = <&ahb_gates 21>, <&spi1_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
++		spi2: spi@01c17000 {
++			compatible = "allwinner,sun4i-a10-spi";
++			reg = <0x01c17000 0x1000>;
++			interrupts = <12>;
++			clocks = <&ahb_gates 22>, <&spi2_clk>;
++			clock-names = "ahb", "mod";
++			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
+ 		intc: interrupt-controller@01c20400 {
+ 			compatible = "allwinner,sun4i-ic";
+ 			reg = <0x01c20400 0x400>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/146-1-spi-add-a31-spi.patch b/trunk/target/linux/sunxi/patches-3.14/146-1-spi-add-a31-spi.patch
new file mode 100644
index 00000000..761ecc18
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/146-1-spi-add-a31-spi.patch
@@ -0,0 +1,559 @@
+From 86cb7c7ab176112f8b0031dc7c8d19103ba52277 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Wed, 5 Feb 2014 14:05:05 +0100
+Subject: [PATCH] spi: sunxi: Add Allwinner A31 SPI controller driver
+
+The Allwinner A31 has a new SPI controller IP compared to the older Allwinner
+SoCs.
+
+It supports DMA, but the driver only does PIO for now, and DMA will be
+supported eventually.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ .../devicetree/bindings/spi/spi-sun6i.txt          |  24 +
+ drivers/spi/Kconfig                                |   6 +
+ drivers/spi/Makefile                               |   1 +
+ drivers/spi/spi-sun6i.c                            | 483 +++++++++++++++++++++
+ 4 files changed, 514 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sun6i.txt
+ create mode 100644 drivers/spi/spi-sun6i.c
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/spi/spi-sun6i.txt
+@@ -0,0 +1,24 @@
++Allwinner A31 SPI controller
++
++Required properties:
++- compatible: Should be "allwinner,sun6i-a31-spi".
++- reg: Should contain register location and length.
++- interrupts: Should contain interrupt.
++- clocks: phandle to the clocks feeding the SPI controller. Two are
++          needed:
++  - "ahb": the gated AHB parent clock
++  - "mod": the parent module clock
++- clock-names: Must contain the clock names described just above
++- resets: phandle to the reset controller asserting this device in
++          reset
++
++Example:
++
++spi1: spi@01c69000 {
++	compatible = "allwinner,sun6i-a31-spi";
++	reg = <0x01c69000 0x1000>;
++	interrupts = <0 66 4>;
++	clocks = <&ahb1_gates 21>, <&spi1_clk>;
++	clock-names = "ahb", "mod";
++	resets = <&ahb1_rst 21>;
++};
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -455,6 +455,12 @@ config SPI_SIRF
+ 	help
+ 	  SPI driver for CSR SiRFprimaII SoCs
+ 
++config SPI_SUN6I
++	tristate "Allwinner A31 SPI controller"
++	depends on ARCH_SUNXI || COMPILE_TEST
++	help
++	  This enables using the SPI controller on the Allwinner A31 SoCs.
++
+ config SPI_MXS
+ 	tristate "Freescale MXS SPI controller"
+ 	depends on ARCH_MXS
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -71,6 +71,7 @@ obj-$(CONFIG_SPI_SH_HSPI)		+= spi-sh-hsp
+ obj-$(CONFIG_SPI_SH_MSIOF)		+= spi-sh-msiof.o
+ obj-$(CONFIG_SPI_SH_SCI)		+= spi-sh-sci.o
+ obj-$(CONFIG_SPI_SIRF)		+= spi-sirf.o
++obj-$(CONFIG_SPI_SUN6I)			+= spi-sun6i.o
+ obj-$(CONFIG_SPI_TEGRA114)		+= spi-tegra114.o
+ obj-$(CONFIG_SPI_TEGRA20_SFLASH)	+= spi-tegra20-sflash.o
+ obj-$(CONFIG_SPI_TEGRA20_SLINK)		+= spi-tegra20-slink.o
+--- /dev/null
++++ b/drivers/spi/spi-sun6i.c
+@@ -0,0 +1,483 @@
++/*
++ * Copyright (C) 2012 - 2014 Allwinner Tech
++ * Pan Nan <pannan@allwinnertech.com>
++ *
++ * Copyright (C) 2014 Maxime Ripard
++ * Maxime Ripard <maxime.ripard@free-electrons.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ */
++
++#include <linux/clk.h>
++#include <linux/delay.h>
++#include <linux/device.h>
++#include <linux/interrupt.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/pm_runtime.h>
++#include <linux/reset.h>
++#include <linux/workqueue.h>
++
++#include <linux/spi/spi.h>
++
++#define SUN6I_FIFO_DEPTH		128
++
++#define SUN6I_GBL_CTL_REG		0x04
++#define SUN6I_GBL_CTL_BUS_ENABLE		BIT(0)
++#define SUN6I_GBL_CTL_MASTER			BIT(1)
++#define SUN6I_GBL_CTL_TP			BIT(7)
++#define SUN6I_GBL_CTL_RST			BIT(31)
++
++#define SUN6I_TFR_CTL_REG		0x08
++#define SUN6I_TFR_CTL_CPHA			BIT(0)
++#define SUN6I_TFR_CTL_CPOL			BIT(1)
++#define SUN6I_TFR_CTL_SPOL			BIT(2)
++#define SUN6I_TFR_CTL_CS_MASK			0x3
++#define SUN6I_TFR_CTL_CS(cs)			(((cs) & SUN6I_TFR_CTL_CS_MASK) << 4)
++#define SUN6I_TFR_CTL_CS_MANUAL			BIT(6)
++#define SUN6I_TFR_CTL_CS_LEVEL			BIT(7)
++#define SUN6I_TFR_CTL_DHB			BIT(8)
++#define SUN6I_TFR_CTL_FBS			BIT(12)
++#define SUN6I_TFR_CTL_XCH			BIT(31)
++
++#define SUN6I_INT_CTL_REG		0x10
++#define SUN6I_INT_CTL_RF_OVF			BIT(8)
++#define SUN6I_INT_CTL_TC			BIT(12)
++
++#define SUN6I_INT_STA_REG		0x14
++
++#define SUN6I_FIFO_CTL_REG		0x18
++#define SUN6I_FIFO_CTL_RF_RST			BIT(15)
++#define SUN6I_FIFO_CTL_TF_RST			BIT(31)
++
++#define SUN6I_FIFO_STA_REG		0x1c
++#define SUN6I_FIFO_STA_RF_CNT_MASK		0x7f
++#define SUN6I_FIFO_STA_RF_CNT_BITS		0
++#define SUN6I_FIFO_STA_TF_CNT_MASK		0x7f
++#define SUN6I_FIFO_STA_TF_CNT_BITS		16
++
++#define SUN6I_CLK_CTL_REG		0x24
++#define SUN6I_CLK_CTL_CDR2_MASK			0xff
++#define SUN6I_CLK_CTL_CDR2(div)			(((div) & SUN6I_CLK_CTL_CDR2_MASK) << 0)
++#define SUN6I_CLK_CTL_CDR1_MASK			0xf
++#define SUN6I_CLK_CTL_CDR1(div)			(((div) & SUN6I_CLK_CTL_CDR1_MASK) << 8)
++#define SUN6I_CLK_CTL_DRS			BIT(12)
++
++#define SUN6I_BURST_CNT_REG		0x30
++#define SUN6I_BURST_CNT(cnt)			((cnt) & 0xffffff)
++
++#define SUN6I_XMIT_CNT_REG		0x34
++#define SUN6I_XMIT_CNT(cnt)			((cnt) & 0xffffff)
++
++#define SUN6I_BURST_CTL_CNT_REG		0x38
++#define SUN6I_BURST_CTL_CNT_STC(cnt)		((cnt) & 0xffffff)
++
++#define SUN6I_TXDATA_REG		0x200
++#define SUN6I_RXDATA_REG		0x300
++
++struct sun6i_spi {
++	struct spi_master	*master;
++	void __iomem		*base_addr;
++	struct clk		*hclk;
++	struct clk		*mclk;
++	struct reset_control	*rstc;
++
++	struct completion	done;
++
++	const u8		*tx_buf;
++	u8			*rx_buf;
++	int			len;
++};
++
++static inline u32 sun6i_spi_read(struct sun6i_spi *sspi, u32 reg)
++{
++	return readl(sspi->base_addr + reg);
++}
++
++static inline void sun6i_spi_write(struct sun6i_spi *sspi, u32 reg, u32 value)
++{
++	writel(value, sspi->base_addr + reg);
++}
++
++static inline void sun6i_spi_drain_fifo(struct sun6i_spi *sspi, int len)
++{
++	u32 reg, cnt;
++	u8 byte;
++
++	/* See how much data is available */
++	reg = sun6i_spi_read(sspi, SUN6I_FIFO_STA_REG);
++	reg &= SUN6I_FIFO_STA_RF_CNT_MASK;
++	cnt = reg >> SUN6I_FIFO_STA_RF_CNT_BITS;
++
++	if (len > cnt)
++		len = cnt;
++
++	while (len--) {
++		byte = readb(sspi->base_addr + SUN6I_RXDATA_REG);
++		if (sspi->rx_buf)
++			*sspi->rx_buf++ = byte;
++	}
++}
++
++static inline void sun6i_spi_fill_fifo(struct sun6i_spi *sspi, int len)
++{
++	u8 byte;
++
++	if (len > sspi->len)
++		len = sspi->len;
++
++	while (len--) {
++		byte = sspi->tx_buf ? *sspi->tx_buf++ : 0;
++		writeb(byte, sspi->base_addr + SUN6I_TXDATA_REG);
++		sspi->len--;
++	}
++}
++
++static void sun6i_spi_set_cs(struct spi_device *spi, bool enable)
++{
++	struct sun6i_spi *sspi = spi_master_get_devdata(spi->master);
++	u32 reg;
++
++	reg = sun6i_spi_read(sspi, SUN6I_TFR_CTL_REG);
++	reg &= ~SUN6I_TFR_CTL_CS_MASK;
++	reg |= SUN6I_TFR_CTL_CS(spi->chip_select);
++
++	if (enable)
++		reg |= SUN6I_TFR_CTL_CS_LEVEL;
++	else
++		reg &= ~SUN6I_TFR_CTL_CS_LEVEL;
++
++	sun6i_spi_write(sspi, SUN6I_TFR_CTL_REG, reg);
++}
++
++
++static int sun6i_spi_transfer_one(struct spi_master *master,
++				  struct spi_device *spi,
++				  struct spi_transfer *tfr)
++{
++	struct sun6i_spi *sspi = spi_master_get_devdata(master);
++	unsigned int mclk_rate, div, timeout;
++	unsigned int tx_len = 0;
++	int ret = 0;
++	u32 reg;
++
++	/* We don't support transfer larger than the FIFO */
++	if (tfr->len > SUN6I_FIFO_DEPTH)
++		return -EINVAL;
++
++	reinit_completion(&sspi->done);
++	sspi->tx_buf = tfr->tx_buf;
++	sspi->rx_buf = tfr->rx_buf;
++	sspi->len = tfr->len;
++
++	/* Clear pending interrupts */
++	sun6i_spi_write(sspi, SUN6I_INT_STA_REG, ~0);
++
++	/* Reset FIFO */
++	sun6i_spi_write(sspi, SUN6I_FIFO_CTL_REG,
++			SUN6I_FIFO_CTL_RF_RST | SUN6I_FIFO_CTL_TF_RST);
++
++	/*
++	 * Setup the transfer control register: Chip Select,
++	 * polarities, etc.
++	 */
++	reg = sun6i_spi_read(sspi, SUN6I_TFR_CTL_REG);
++
++	if (spi->mode & SPI_CPOL)
++		reg |= SUN6I_TFR_CTL_CPOL;
++	else
++		reg &= ~SUN6I_TFR_CTL_CPOL;
++
++	if (spi->mode & SPI_CPHA)
++		reg |= SUN6I_TFR_CTL_CPHA;
++	else
++		reg &= ~SUN6I_TFR_CTL_CPHA;
++
++	if (spi->mode & SPI_LSB_FIRST)
++		reg |= SUN6I_TFR_CTL_FBS;
++	else
++		reg &= ~SUN6I_TFR_CTL_FBS;
++
++	/*
++	 * If it's a TX only transfer, we don't want to fill the RX
++	 * FIFO with bogus data
++	 */
++	if (sspi->rx_buf)
++		reg &= ~SUN6I_TFR_CTL_DHB;
++	else
++		reg |= SUN6I_TFR_CTL_DHB;
++
++	/* We want to control the chip select manually */
++	reg |= SUN6I_TFR_CTL_CS_MANUAL;
++
++	sun6i_spi_write(sspi, SUN6I_TFR_CTL_REG, reg);
++
++	/* Ensure that we have a parent clock fast enough */
++	mclk_rate = clk_get_rate(sspi->mclk);
++	if (mclk_rate < (2 * spi->max_speed_hz)) {
++		clk_set_rate(sspi->mclk, 2 * spi->max_speed_hz);
++		mclk_rate = clk_get_rate(sspi->mclk);
++	}
++
++	/*
++	 * Setup clock divider.
++	 *
++	 * We have two choices there. Either we can use the clock
++	 * divide rate 1, which is calculated thanks to this formula:
++	 * SPI_CLK = MOD_CLK / (2 ^ cdr)
++	 * Or we can use CDR2, which is calculated with the formula:
++	 * SPI_CLK = MOD_CLK / (2 * (cdr + 1))
++	 * Wether we use the former or the latter is set through the
++	 * DRS bit.
++	 *
++	 * First try CDR2, and if we can't reach the expected
++	 * frequency, fall back to CDR1.
++	 */
++	div = mclk_rate / (2 * spi->max_speed_hz);
++	if (div <= (SUN6I_CLK_CTL_CDR2_MASK + 1)) {
++		if (div > 0)
++			div--;
++
++		reg = SUN6I_CLK_CTL_CDR2(div) | SUN6I_CLK_CTL_DRS;
++	} else {
++		div = ilog2(mclk_rate) - ilog2(spi->max_speed_hz);
++		reg = SUN6I_CLK_CTL_CDR1(div);
++	}
++
++	sun6i_spi_write(sspi, SUN6I_CLK_CTL_REG, reg);
++
++	/* Setup the transfer now... */
++	if (sspi->tx_buf)
++		tx_len = tfr->len;
++
++	/* Setup the counters */
++	sun6i_spi_write(sspi, SUN6I_BURST_CNT_REG, SUN6I_BURST_CNT(tfr->len));
++	sun6i_spi_write(sspi, SUN6I_XMIT_CNT_REG, SUN6I_XMIT_CNT(tx_len));
++	sun6i_spi_write(sspi, SUN6I_BURST_CTL_CNT_REG,
++			SUN6I_BURST_CTL_CNT_STC(tx_len));
++
++	/* Fill the TX FIFO */
++	sun6i_spi_fill_fifo(sspi, SUN6I_FIFO_DEPTH);
++
++	/* Enable the interrupts */
++	sun6i_spi_write(sspi, SUN6I_INT_CTL_REG, SUN6I_INT_CTL_TC);
++
++	/* Start the transfer */
++	reg = sun6i_spi_read(sspi, SUN6I_TFR_CTL_REG);
++	sun6i_spi_write(sspi, SUN6I_TFR_CTL_REG, reg | SUN6I_TFR_CTL_XCH);
++
++	timeout = wait_for_completion_timeout(&sspi->done,
++					      msecs_to_jiffies(1000));
++	if (!timeout) {
++		ret = -ETIMEDOUT;
++		goto out;
++	}
++
++	sun6i_spi_drain_fifo(sspi, SUN6I_FIFO_DEPTH);
++
++out:
++	sun6i_spi_write(sspi, SUN6I_INT_CTL_REG, 0);
++
++	return ret;
++}
++
++static irqreturn_t sun6i_spi_handler(int irq, void *dev_id)
++{
++	struct sun6i_spi *sspi = dev_id;
++	u32 status = sun6i_spi_read(sspi, SUN6I_INT_STA_REG);
++
++	/* Transfer complete */
++	if (status & SUN6I_INT_CTL_TC) {
++		sun6i_spi_write(sspi, SUN6I_INT_STA_REG, SUN6I_INT_CTL_TC);
++		complete(&sspi->done);
++		return IRQ_HANDLED;
++	}
++
++	return IRQ_NONE;
++}
++
++static int sun6i_spi_runtime_resume(struct device *dev)
++{
++	struct spi_master *master = dev_get_drvdata(dev);
++	struct sun6i_spi *sspi = spi_master_get_devdata(master);
++	int ret;
++
++	ret = clk_prepare_enable(sspi->hclk);
++	if (ret) {
++		dev_err(dev, "Couldn't enable AHB clock\n");
++		goto out;
++	}
++
++	ret = clk_prepare_enable(sspi->mclk);
++	if (ret) {
++		dev_err(dev, "Couldn't enable module clock\n");
++		goto err;
++	}
++
++	ret = reset_control_deassert(sspi->rstc);
++	if (ret) {
++		dev_err(dev, "Couldn't deassert the device from reset\n");
++		goto err2;
++	}
++
++	sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG,
++			SUN6I_GBL_CTL_BUS_ENABLE | SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP);
++
++	return 0;
++
++err2:
++	clk_disable_unprepare(sspi->mclk);
++err:
++	clk_disable_unprepare(sspi->hclk);
++out:
++	return ret;
++}
++
++static int sun6i_spi_runtime_suspend(struct device *dev)
++{
++	struct spi_master *master = dev_get_drvdata(dev);
++	struct sun6i_spi *sspi = spi_master_get_devdata(master);
++
++	reset_control_assert(sspi->rstc);
++	clk_disable_unprepare(sspi->mclk);
++	clk_disable_unprepare(sspi->hclk);
++
++	return 0;
++}
++
++static int sun6i_spi_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct sun6i_spi *sspi;
++	struct resource	*res;
++	int ret = 0, irq;
++
++	master = spi_alloc_master(&pdev->dev, sizeof(struct sun6i_spi));
++	if (!master) {
++		dev_err(&pdev->dev, "Unable to allocate SPI Master\n");
++		return -ENOMEM;
++	}
++
++	platform_set_drvdata(pdev, master);
++	sspi = spi_master_get_devdata(master);
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	sspi->base_addr = devm_ioremap_resource(&pdev->dev, res);
++	if (IS_ERR(sspi->base_addr)) {
++		ret = PTR_ERR(sspi->base_addr);
++		goto err_free_master;
++	}
++
++	irq = platform_get_irq(pdev, 0);
++	if (irq < 0) {
++		dev_err(&pdev->dev, "No spi IRQ specified\n");
++		ret = -ENXIO;
++		goto err_free_master;
++	}
++
++	ret = devm_request_irq(&pdev->dev, irq, sun6i_spi_handler,
++			       0, "sun6i-spi", sspi);
++	if (ret) {
++		dev_err(&pdev->dev, "Cannot request IRQ\n");
++		goto err_free_master;
++	}
++
++	sspi->master = master;
++	master->set_cs = sun6i_spi_set_cs;
++	master->transfer_one = sun6i_spi_transfer_one;
++	master->num_chipselect = 4;
++	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;
++	master->dev.of_node = pdev->dev.of_node;
++	master->auto_runtime_pm = true;
++
++	sspi->hclk = devm_clk_get(&pdev->dev, "ahb");
++	if (IS_ERR(sspi->hclk)) {
++		dev_err(&pdev->dev, "Unable to acquire AHB clock\n");
++		ret = PTR_ERR(sspi->hclk);
++		goto err_free_master;
++	}
++
++	sspi->mclk = devm_clk_get(&pdev->dev, "mod");
++	if (IS_ERR(sspi->mclk)) {
++		dev_err(&pdev->dev, "Unable to acquire module clock\n");
++		ret = PTR_ERR(sspi->mclk);
++		goto err_free_master;
++	}
++
++	init_completion(&sspi->done);
++
++	sspi->rstc = devm_reset_control_get(&pdev->dev, NULL);
++	if (IS_ERR(sspi->rstc)) {
++		dev_err(&pdev->dev, "Couldn't get reset controller\n");
++		ret = PTR_ERR(sspi->rstc);
++		goto err_free_master;
++	}
++
++	/*
++	 * This wake-up/shutdown pattern is to be able to have the
++	 * device woken up, even if runtime_pm is disabled
++	 */
++	ret = sun6i_spi_runtime_resume(&pdev->dev);
++	if (ret) {
++		dev_err(&pdev->dev, "Couldn't resume the device\n");
++		goto err_free_master;
++	}
++
++	pm_runtime_set_active(&pdev->dev);
++	pm_runtime_enable(&pdev->dev);
++	pm_runtime_idle(&pdev->dev);
++
++	ret = devm_spi_register_master(&pdev->dev, master);
++	if (ret) {
++		dev_err(&pdev->dev, "cannot register SPI master\n");
++		goto err_pm_disable;
++	}
++
++	return 0;
++
++err_pm_disable:
++	pm_runtime_disable(&pdev->dev);
++	sun6i_spi_runtime_suspend(&pdev->dev);
++err_free_master:
++	spi_master_put(master);
++	return ret;
++}
++
++static int sun6i_spi_remove(struct platform_device *pdev)
++{
++	pm_runtime_disable(&pdev->dev);
++
++	return 0;
++}
++
++static const struct of_device_id sun6i_spi_match[] = {
++	{ .compatible = "allwinner,sun6i-a31-spi", },
++	{}
++};
++MODULE_DEVICE_TABLE(of, sun6i_spi_match);
++
++static const struct dev_pm_ops sun6i_spi_pm_ops = {
++	.runtime_resume		= sun6i_spi_runtime_resume,
++	.runtime_suspend	= sun6i_spi_runtime_suspend,
++};
++
++static struct platform_driver sun6i_spi_driver = {
++	.probe	= sun6i_spi_probe,
++	.remove	= sun6i_spi_remove,
++	.driver	= {
++		.name		= "sun6i-spi",
++		.owner		= THIS_MODULE,
++		.of_match_table	= sun6i_spi_match,
++		.pm		= &sun6i_spi_pm_ops,
++	},
++};
++module_platform_driver(sun6i_spi_driver);
++
++MODULE_AUTHOR("Pan Nan <pannan@allwinnertech.com>");
++MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
++MODULE_DESCRIPTION("Allwinner A31 SPI controller driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.14/146-2-spi-add-a10-spi.patch b/trunk/target/linux/sunxi/patches-3.14/146-2-spi-add-a10-spi.patch
new file mode 100644
index 00000000..483d216a
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/146-2-spi-add-a10-spi.patch
@@ -0,0 +1,558 @@
+From 1ae7667375308c27023d793372d6be1f3b89f5b5 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 22 Feb 2014 22:35:53 +0100
+Subject: [PATCH] spi: sunxi: Add Allwinner A10 SPI controller driver
+
+The older Allwinner SoCs (A10, A13, A10s and A20) all have the same SPI
+controller.
+
+Unfortunately, this SPI controller, even though quite similar, is significantly
+different from the recently supported A31 SPI controller (different registers
+offset, split/merged registers, etc.). Supporting both controllers in a single
+driver would be unreasonable, hence the addition of a new driver.
+
+Like its more recent counterpart, it supports DMA, but the driver only does PIO
+until we have a dmaengine driver for this platform.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ .../devicetree/bindings/spi/spi-sun4i.txt          |  24 ++
+ drivers/spi/Kconfig                                |   6 +
+ drivers/spi/Makefile                               |   1 +
+ drivers/spi/spi-sun4i.c                            | 477 +++++++++++++++++++++
+ 4 files changed, 508 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sun4i.txt
+ create mode 100644 drivers/spi/spi-sun4i.c
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/spi/spi-sun4i.txt
+@@ -0,0 +1,24 @@
++Allwinner A10 SPI controller
++
++Required properties:
++- compatible: Should be "allwinner,sun4-a10-spi".
++- reg: Should contain register location and length.
++- interrupts: Should contain interrupt.
++- clocks: phandle to the clocks feeding the SPI controller. Two are
++          needed:
++  - "ahb": the gated AHB parent clock
++  - "mod": the parent module clock
++- clock-names: Must contain the clock names described just above
++
++Example:
++
++spi1: spi@01c06000 {
++	compatible = "allwinner,sun4i-a10-spi";
++	reg = <0x01c06000 0x1000>;
++	interrupts = <11>;
++	clocks = <&ahb_gates 21>, <&spi1_clk>;
++	clock-names = "ahb", "mod";
++	status = "disabled";
++	#address-cells = <1>;
++	#size-cells = <0>;
++};
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -455,6 +455,12 @@ config SPI_SIRF
+ 	help
+ 	  SPI driver for CSR SiRFprimaII SoCs
+ 
++config SPI_SUN4I
++	tristate "Allwinner A10 SoCs SPI controller"
++	depends on ARCH_SUNXI || COMPILE_TEST
++	help
++	  SPI driver for Allwinner sun4i, sun5i and sun7i SoCs
++
+ config SPI_SUN6I
+ 	tristate "Allwinner A31 SPI controller"
+ 	depends on ARCH_SUNXI || COMPILE_TEST
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -71,6 +71,7 @@ obj-$(CONFIG_SPI_SH_HSPI)		+= spi-sh-hsp
+ obj-$(CONFIG_SPI_SH_MSIOF)		+= spi-sh-msiof.o
+ obj-$(CONFIG_SPI_SH_SCI)		+= spi-sh-sci.o
+ obj-$(CONFIG_SPI_SIRF)		+= spi-sirf.o
++obj-$(CONFIG_SPI_SUN4I)			+= spi-sun4i.o
+ obj-$(CONFIG_SPI_SUN6I)			+= spi-sun6i.o
+ obj-$(CONFIG_SPI_TEGRA114)		+= spi-tegra114.o
+ obj-$(CONFIG_SPI_TEGRA20_SFLASH)	+= spi-tegra20-sflash.o
+--- /dev/null
++++ b/drivers/spi/spi-sun4i.c
+@@ -0,0 +1,477 @@
++/*
++ * Copyright (C) 2012 - 2014 Allwinner Tech
++ * Pan Nan <pannan@allwinnertech.com>
++ *
++ * Copyright (C) 2014 Maxime Ripard
++ * Maxime Ripard <maxime.ripard@free-electrons.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ */
++
++#include <linux/clk.h>
++#include <linux/delay.h>
++#include <linux/device.h>
++#include <linux/interrupt.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/pm_runtime.h>
++#include <linux/workqueue.h>
++
++#include <linux/spi/spi.h>
++
++#define SUN4I_FIFO_DEPTH		64
++
++#define SUN4I_RXDATA_REG		0x00
++
++#define SUN4I_TXDATA_REG		0x04
++
++#define SUN4I_CTL_REG			0x08
++#define SUN4I_CTL_ENABLE			BIT(0)
++#define SUN4I_CTL_MASTER			BIT(1)
++#define SUN4I_CTL_CPHA				BIT(2)
++#define SUN4I_CTL_CPOL				BIT(3)
++#define SUN4I_CTL_CS_ACTIVE_LOW			BIT(4)
++#define SUN4I_CTL_LMTF				BIT(6)
++#define SUN4I_CTL_TF_RST			BIT(8)
++#define SUN4I_CTL_RF_RST			BIT(9)
++#define SUN4I_CTL_XCH				BIT(10)
++#define SUN4I_CTL_CS_MASK			0x3000
++#define SUN4I_CTL_CS(cs)			(((cs) << 12) & SUN4I_CTL_CS_MASK)
++#define SUN4I_CTL_DHB				BIT(15)
++#define SUN4I_CTL_CS_MANUAL			BIT(16)
++#define SUN4I_CTL_CS_LEVEL			BIT(17)
++#define SUN4I_CTL_TP				BIT(18)
++
++#define SUN4I_INT_CTL_REG		0x0c
++#define SUN4I_INT_CTL_TC			BIT(16)
++
++#define SUN4I_INT_STA_REG		0x10
++
++#define SUN4I_DMA_CTL_REG		0x14
++
++#define SUN4I_WAIT_REG			0x18
++
++#define SUN4I_CLK_CTL_REG		0x1c
++#define SUN4I_CLK_CTL_CDR2_MASK			0xff
++#define SUN4I_CLK_CTL_CDR2(div)			((div) & SUN4I_CLK_CTL_CDR2_MASK)
++#define SUN4I_CLK_CTL_CDR1_MASK			0xf
++#define SUN4I_CLK_CTL_CDR1(div)			(((div) & SUN4I_CLK_CTL_CDR1_MASK) << 8)
++#define SUN4I_CLK_CTL_DRS			BIT(12)
++
++#define SUN4I_BURST_CNT_REG		0x20
++#define SUN4I_BURST_CNT(cnt)			((cnt) & 0xffffff)
++
++#define SUN4I_XMIT_CNT_REG		0x24
++#define SUN4I_XMIT_CNT(cnt)			((cnt) & 0xffffff)
++
++#define SUN4I_FIFO_STA_REG		0x28
++#define SUN4I_FIFO_STA_RF_CNT_MASK		0x7f
++#define SUN4I_FIFO_STA_RF_CNT_BITS		0
++#define SUN4I_FIFO_STA_TF_CNT_MASK		0x7f
++#define SUN4I_FIFO_STA_TF_CNT_BITS		16
++
++struct sun4i_spi {
++	struct spi_master	*master;
++	void __iomem		*base_addr;
++	struct clk		*hclk;
++	struct clk		*mclk;
++
++	struct completion	done;
++
++	const u8		*tx_buf;
++	u8			*rx_buf;
++	int			len;
++};
++
++static inline u32 sun4i_spi_read(struct sun4i_spi *sspi, u32 reg)
++{
++	return readl(sspi->base_addr + reg);
++}
++
++static inline void sun4i_spi_write(struct sun4i_spi *sspi, u32 reg, u32 value)
++{
++	writel(value, sspi->base_addr + reg);
++}
++
++static inline void sun4i_spi_drain_fifo(struct sun4i_spi *sspi, int len)
++{
++	u32 reg, cnt;
++	u8 byte;
++
++	/* See how much data is available */
++	reg = sun4i_spi_read(sspi, SUN4I_FIFO_STA_REG);
++	reg &= SUN4I_FIFO_STA_RF_CNT_MASK;
++	cnt = reg >> SUN4I_FIFO_STA_RF_CNT_BITS;
++
++	if (len > cnt)
++		len = cnt;
++
++	while (len--) {
++		byte = readb(sspi->base_addr + SUN4I_RXDATA_REG);
++		if (sspi->rx_buf)
++			*sspi->rx_buf++ = byte;
++	}
++}
++
++static inline void sun4i_spi_fill_fifo(struct sun4i_spi *sspi, int len)
++{
++	u8 byte;
++
++	if (len > sspi->len)
++		len = sspi->len;
++
++	while (len--) {
++		byte = sspi->tx_buf ? *sspi->tx_buf++ : 0;
++		writeb(byte, sspi->base_addr + SUN4I_TXDATA_REG);
++		sspi->len--;
++	}
++}
++
++static void sun4i_spi_set_cs(struct spi_device *spi, bool enable)
++{
++	struct sun4i_spi *sspi = spi_master_get_devdata(spi->master);
++	u32 reg;
++
++	reg = sun4i_spi_read(sspi, SUN4I_CTL_REG);
++
++	reg &= ~SUN4I_CTL_CS_MASK;
++	reg |= SUN4I_CTL_CS(spi->chip_select);
++
++	if (enable)
++		reg |= SUN4I_CTL_CS_LEVEL;
++	else
++		reg &= ~SUN4I_CTL_CS_LEVEL;
++
++	/*
++	 * Even though this looks irrelevant since we are supposed to
++	 * be controlling the chip select manually, this bit also
++	 * controls the levels of the chip select for inactive
++	 * devices.
++	 *
++	 * If we don't set it, the chip select level will go low by
++	 * default when the device is idle, which is not really
++	 * expected in the common case where the chip select is active
++	 * low.
++	 */
++	if (spi->mode & SPI_CS_HIGH)
++		reg &= ~SUN4I_CTL_CS_ACTIVE_LOW;
++	else
++		reg |= SUN4I_CTL_CS_ACTIVE_LOW;
++
++	sun4i_spi_write(sspi, SUN4I_CTL_REG, reg);
++}
++
++static int sun4i_spi_transfer_one(struct spi_master *master,
++				  struct spi_device *spi,
++				  struct spi_transfer *tfr)
++{
++	struct sun4i_spi *sspi = spi_master_get_devdata(master);
++	unsigned int mclk_rate, div, timeout;
++	unsigned int tx_len = 0;
++	int ret = 0;
++	u32 reg;
++
++	/* We don't support transfer larger than the FIFO */
++	if (tfr->len > SUN4I_FIFO_DEPTH)
++		return -EINVAL;
++
++	reinit_completion(&sspi->done);
++	sspi->tx_buf = tfr->tx_buf;
++	sspi->rx_buf = tfr->rx_buf;
++	sspi->len = tfr->len;
++
++	/* Clear pending interrupts */
++	sun4i_spi_write(sspi, SUN4I_INT_STA_REG, ~0);
++
++
++	reg = sun4i_spi_read(sspi, SUN4I_CTL_REG);
++
++	/* Reset FIFOs */
++	sun4i_spi_write(sspi, SUN4I_CTL_REG,
++			reg | SUN4I_CTL_RF_RST | SUN4I_CTL_TF_RST);
++
++	/*
++	 * Setup the transfer control register: Chip Select,
++	 * polarities, etc.
++	 */
++	if (spi->mode & SPI_CPOL)
++		reg |= SUN4I_CTL_CPOL;
++	else
++		reg &= ~SUN4I_CTL_CPOL;
++
++	if (spi->mode & SPI_CPHA)
++		reg |= SUN4I_CTL_CPHA;
++	else
++		reg &= ~SUN4I_CTL_CPHA;
++
++	if (spi->mode & SPI_LSB_FIRST)
++		reg |= SUN4I_CTL_LMTF;
++	else
++		reg &= ~SUN4I_CTL_LMTF;
++
++
++	/*
++	 * If it's a TX only transfer, we don't want to fill the RX
++	 * FIFO with bogus data
++	 */
++	if (sspi->rx_buf)
++		reg &= ~SUN4I_CTL_DHB;
++	else
++		reg |= SUN4I_CTL_DHB;
++
++	/* We want to control the chip select manually */
++	reg |= SUN4I_CTL_CS_MANUAL;
++
++	sun4i_spi_write(sspi, SUN4I_CTL_REG, reg);
++
++	/* Ensure that we have a parent clock fast enough */
++	mclk_rate = clk_get_rate(sspi->mclk);
++	if (mclk_rate < (2 * spi->max_speed_hz)) {
++		clk_set_rate(sspi->mclk, 2 * spi->max_speed_hz);
++		mclk_rate = clk_get_rate(sspi->mclk);
++	}
++
++	/*
++	 * Setup clock divider.
++	 *
++	 * We have two choices there. Either we can use the clock
++	 * divide rate 1, which is calculated thanks to this formula:
++	 * SPI_CLK = MOD_CLK / (2 ^ (cdr + 1))
++	 * Or we can use CDR2, which is calculated with the formula:
++	 * SPI_CLK = MOD_CLK / (2 * (cdr + 1))
++	 * Wether we use the former or the latter is set through the
++	 * DRS bit.
++	 *
++	 * First try CDR2, and if we can't reach the expected
++	 * frequency, fall back to CDR1.
++	 */
++	div = mclk_rate / (2 * spi->max_speed_hz);
++	if (div <= (SUN4I_CLK_CTL_CDR2_MASK + 1)) {
++		if (div > 0)
++			div--;
++
++		reg = SUN4I_CLK_CTL_CDR2(div) | SUN4I_CLK_CTL_DRS;
++	} else {
++		div = ilog2(mclk_rate) - ilog2(spi->max_speed_hz);
++		reg = SUN4I_CLK_CTL_CDR1(div);
++	}
++
++	sun4i_spi_write(sspi, SUN4I_CLK_CTL_REG, reg);
++
++	/* Setup the transfer now... */
++	if (sspi->tx_buf)
++		tx_len = tfr->len;
++
++	/* Setup the counters */
++	sun4i_spi_write(sspi, SUN4I_BURST_CNT_REG, SUN4I_BURST_CNT(tfr->len));
++	sun4i_spi_write(sspi, SUN4I_XMIT_CNT_REG, SUN4I_XMIT_CNT(tx_len));
++
++	/* Fill the TX FIFO */
++	sun4i_spi_fill_fifo(sspi, SUN4I_FIFO_DEPTH);
++
++	/* Enable the interrupts */
++	sun4i_spi_write(sspi, SUN4I_INT_CTL_REG, SUN4I_INT_CTL_TC);
++
++	/* Start the transfer */
++	reg = sun4i_spi_read(sspi, SUN4I_CTL_REG);
++	sun4i_spi_write(sspi, SUN4I_CTL_REG, reg | SUN4I_CTL_XCH);
++
++	timeout = wait_for_completion_timeout(&sspi->done,
++					      msecs_to_jiffies(1000));
++	if (!timeout) {
++		ret = -ETIMEDOUT;
++		goto out;
++	}
++
++	sun4i_spi_drain_fifo(sspi, SUN4I_FIFO_DEPTH);
++
++out:
++	sun4i_spi_write(sspi, SUN4I_INT_CTL_REG, 0);
++
++	return ret;
++}
++
++static irqreturn_t sun4i_spi_handler(int irq, void *dev_id)
++{
++	struct sun4i_spi *sspi = dev_id;
++	u32 status = sun4i_spi_read(sspi, SUN4I_INT_STA_REG);
++
++	/* Transfer complete */
++	if (status & SUN4I_INT_CTL_TC) {
++		sun4i_spi_write(sspi, SUN4I_INT_STA_REG, SUN4I_INT_CTL_TC);
++		complete(&sspi->done);
++		return IRQ_HANDLED;
++	}
++
++	return IRQ_NONE;
++}
++
++static int sun4i_spi_runtime_resume(struct device *dev)
++{
++	struct spi_master *master = dev_get_drvdata(dev);
++	struct sun4i_spi *sspi = spi_master_get_devdata(master);
++	int ret;
++
++	ret = clk_prepare_enable(sspi->hclk);
++	if (ret) {
++		dev_err(dev, "Couldn't enable AHB clock\n");
++		goto out;
++	}
++
++	ret = clk_prepare_enable(sspi->mclk);
++	if (ret) {
++		dev_err(dev, "Couldn't enable module clock\n");
++		goto err;
++	}
++
++	sun4i_spi_write(sspi, SUN4I_CTL_REG,
++			SUN4I_CTL_ENABLE | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
++
++	return 0;
++
++err:
++	clk_disable_unprepare(sspi->hclk);
++out:
++	return ret;
++}
++
++static int sun4i_spi_runtime_suspend(struct device *dev)
++{
++	struct spi_master *master = dev_get_drvdata(dev);
++	struct sun4i_spi *sspi = spi_master_get_devdata(master);
++
++	clk_disable_unprepare(sspi->mclk);
++	clk_disable_unprepare(sspi->hclk);
++
++	return 0;
++}
++
++static int sun4i_spi_probe(struct platform_device *pdev)
++{
++	struct spi_master *master;
++	struct sun4i_spi *sspi;
++	struct resource	*res;
++	int ret = 0, irq;
++
++	master = spi_alloc_master(&pdev->dev, sizeof(struct sun4i_spi));
++	if (!master) {
++		dev_err(&pdev->dev, "Unable to allocate SPI Master\n");
++		return -ENOMEM;
++	}
++
++	platform_set_drvdata(pdev, master);
++	sspi = spi_master_get_devdata(master);
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	sspi->base_addr = devm_ioremap_resource(&pdev->dev, res);
++	if (IS_ERR(sspi->base_addr)) {
++		ret = PTR_ERR(sspi->base_addr);
++		goto err_free_master;
++	}
++
++	irq = platform_get_irq(pdev, 0);
++	if (irq < 0) {
++		dev_err(&pdev->dev, "No spi IRQ specified\n");
++		ret = -ENXIO;
++		goto err_free_master;
++	}
++
++	ret = devm_request_irq(&pdev->dev, irq, sun4i_spi_handler,
++			       0, "sun4i-spi", sspi);
++	if (ret) {
++		dev_err(&pdev->dev, "Cannot request IRQ\n");
++		goto err_free_master;
++	}
++
++	sspi->master = master;
++	master->set_cs = sun4i_spi_set_cs;
++	master->transfer_one = sun4i_spi_transfer_one;
++	master->num_chipselect = 4;
++	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;
++	master->dev.of_node = pdev->dev.of_node;
++	master->auto_runtime_pm = true;
++
++	sspi->hclk = devm_clk_get(&pdev->dev, "ahb");
++	if (IS_ERR(sspi->hclk)) {
++		dev_err(&pdev->dev, "Unable to acquire AHB clock\n");
++		ret = PTR_ERR(sspi->hclk);
++		goto err_free_master;
++	}
++
++	sspi->mclk = devm_clk_get(&pdev->dev, "mod");
++	if (IS_ERR(sspi->mclk)) {
++		dev_err(&pdev->dev, "Unable to acquire module clock\n");
++		ret = PTR_ERR(sspi->mclk);
++		goto err_free_master;
++	}
++
++	init_completion(&sspi->done);
++
++	/*
++	 * This wake-up/shutdown pattern is to be able to have the
++	 * device woken up, even if runtime_pm is disabled
++	 */
++	ret = sun4i_spi_runtime_resume(&pdev->dev);
++	if (ret) {
++		dev_err(&pdev->dev, "Couldn't resume the device\n");
++		goto err_free_master;
++	}
++
++	pm_runtime_set_active(&pdev->dev);
++	pm_runtime_enable(&pdev->dev);
++	pm_runtime_idle(&pdev->dev);
++
++	ret = devm_spi_register_master(&pdev->dev, master);
++	if (ret) {
++		dev_err(&pdev->dev, "cannot register SPI master\n");
++		goto err_pm_disable;
++	}
++
++	return 0;
++
++err_pm_disable:
++	pm_runtime_disable(&pdev->dev);
++	sun4i_spi_runtime_suspend(&pdev->dev);
++err_free_master:
++	spi_master_put(master);
++	return ret;
++}
++
++static int sun4i_spi_remove(struct platform_device *pdev)
++{
++	pm_runtime_disable(&pdev->dev);
++
++	return 0;
++}
++
++static const struct of_device_id sun4i_spi_match[] = {
++	{ .compatible = "allwinner,sun4i-a10-spi", },
++	{}
++};
++MODULE_DEVICE_TABLE(of, sun4i_spi_match);
++
++static const struct dev_pm_ops sun4i_spi_pm_ops = {
++	.runtime_resume		= sun4i_spi_runtime_resume,
++	.runtime_suspend	= sun4i_spi_runtime_suspend,
++};
++
++static struct platform_driver sun4i_spi_driver = {
++	.probe	= sun4i_spi_probe,
++	.remove	= sun4i_spi_remove,
++	.driver	= {
++		.name		= "sun4i-spi",
++		.owner		= THIS_MODULE,
++		.of_match_table	= sun4i_spi_match,
++		.pm		= &sun4i_spi_pm_ops,
++	},
++};
++module_platform_driver(sun4i_spi_driver);
++
++MODULE_AUTHOR("Pan Nan <pannan@allwinnertech.com>");
++MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
++MODULE_DESCRIPTION("Allwinner A1X/A20 SPI controller driver");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch b/trunk/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch
new file mode 100644
index 00000000..6f2dbe53
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/147-sun6i-enable-spi-in-defconfig.patch
@@ -0,0 +1,29 @@
+From 3aa7ff0de5bddc825406ffff49dc4a38b13ebac3 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Wed, 5 Feb 2014 14:05:07 +0100
+Subject: [PATCH] ARM: sunxi: Enable A31 SPI and SID in the defconfig
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/configs/sunxi_defconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/arm/configs/sunxi_defconfig
++++ b/arch/arm/configs/sunxi_defconfig
+@@ -24,6 +24,7 @@ CONFIG_IP_PNP_BOOTP=y
+ # CONFIG_WIRELESS is not set
+ CONFIG_DEVTMPFS=y
+ CONFIG_DEVTMPFS_MOUNT=y
++CONFIG_EEPROM_SUNXI_SID=y
+ CONFIG_NETDEVICES=y
+ CONFIG_SUN4I_EMAC=y
+ # CONFIG_NET_CADENCE is not set
+@@ -48,6 +49,8 @@ CONFIG_I2C=y
+ # CONFIG_I2C_COMPAT is not set
+ CONFIG_I2C_CHARDEV=y
+ CONFIG_I2C_MV64XXX=y
++CONFIG_SPI=y
++CONFIG_SPI_SUN6I=y
+ CONFIG_GPIO_SYSFS=y
+ # CONFIG_HWMON is not set
+ CONFIG_WATCHDOG=y
diff --git a/trunk/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch b/trunk/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch
new file mode 100644
index 00000000..0c78fa4b
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch
@@ -0,0 +1,33 @@
+From c38fe0f410a59e194ef5e58429658506d853f1b4 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 22 Feb 2014 22:35:58 +0100
+Subject: [PATCH] ARM: dt: sun7i: Add SPI muxing options
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -571,6 +571,20 @@
+ 				allwinner,drive = <3>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			spi1_pins_a: spi1@0 {
++				allwinner,pins = "PI16", "PI17", "PI18", "PI19";
++				allwinner,function = "spi1";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			spi2_pins_a: spi2@0 {
++				allwinner,pins = "PC19", "PC20", "PC21", "PC22";
++				allwinner,function = "spi2";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		timer@01c20c00 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/149-dt-sun7i-add-spi-on-olinuxinom.patch b/trunk/target/linux/sunxi/patches-3.14/149-dt-sun7i-add-spi-on-olinuxinom.patch
new file mode 100644
index 00000000..cbcfea7c
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/149-dt-sun7i-add-spi-on-olinuxinom.patch
@@ -0,0 +1,41 @@
+From 3f134732aaf4d785532c716f4ef7703d631a510b Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 22 Feb 2014 22:35:59 +0100
+Subject: [PATCH] ARM: dts: sun7i: Enable the SPI controllers of the
+ A20-olinuxino-micro
+
+The A20-Olinuxino-micro has two SPI bus exposed on its UEXT connectors, enable
+them.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -18,7 +18,24 @@
+ 	model = "Olimex A20-Olinuxino Micro";
+ 	compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
+ 
++	aliases {
++		spi0 = &spi1;
++		spi1 = &spi2;
++	};
++
+ 	soc@01c00000 {
++		spi1: spi@01c06000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi1_pins_a>;
++			status = "okay";
++		};
++
++		spi2: spi@01c17000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi2_pins_a>;
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_olinuxino: led_pins@0 {
+ 				allwinner,pins = "PH2";
diff --git a/trunk/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch b/trunk/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch
new file mode 100644
index 00000000..6c10a98d
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch
@@ -0,0 +1,78 @@
+From a9868f7ef1d3828e55de36cfeac2f84a77653a1e Mon Sep 17 00:00:00 2001
+From: Oliver Schinagl <oliver@schinagl.nl>
+Date: Tue, 3 Dec 2013 12:10:11 +0100
+Subject: [PATCH] ARM: sun4i: dt: Add ahci / sata support
+
+This patch adds sunxi sata support to A10 boards that have such a connector.
+Some boards also feature a regulator via a GPIO and support for this is also
+added.
+
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10-a1000.dts      |  4 ++++
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 10 ++++++++++
+ arch/arm/boot/dts/sun4i-a10.dtsi           |  8 ++++++++
+ 3 files changed, 22 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
++++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
+@@ -35,6 +35,10 @@
+ 			};
+ 		};
+ 
++		ahci: sata@01c18000 {
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			emac_power_pin_a1000: emac_power_pin@0 {
+ 				allwinner,pins = "PH15";
+--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
++++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+@@ -12,6 +12,7 @@
+ 
+ /dts-v1/;
+ /include/ "sun4i-a10.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "Cubietech Cubieboard";
+@@ -33,6 +34,11 @@
+ 			};
+ 		};
+ 
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_cubieboard: led_pins@0 {
+ 				allwinner,pins = "PH20", "PH21";
+@@ -77,4 +83,8 @@
+ 			linux,default-trigger = "heartbeat";
+ 		};
+ 	};
++
++	reg_ahci_5v: ahci-5v {
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -388,6 +388,14 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		ahci: sata@01c18000 {
++			compatible = "allwinner,sun4i-a10-ahci";
++			reg = <0x01c18000 0x1000>;
++			interrupts = <56>;
++			clocks = <&pll6 0>, <&ahb_gates 25>;
++			status = "disabled";
++		};
++
+ 		spi3: spi@01c1f000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c1f000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/151-dt-sun7i-add-ahci.patch b/trunk/target/linux/sunxi/patches-3.14/151-dt-sun7i-add-ahci.patch
new file mode 100644
index 00000000..bd3cc5f5
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/151-dt-sun7i-add-ahci.patch
@@ -0,0 +1,136 @@
+From cf454a47b64ef78ff85b097c8cb404120c14e6a5 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 3 Jan 2014 10:27:51 +0100
+Subject: [PATCH] ARM: sun7i: dt: Add ahci / sata support
+
+This patch adds sunxi sata support to A20 boards that have such a connector.
+Some boards also feature a regulator via a GPIO and support for this is also
+added.
+
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts     | 10 ++++++++++
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts      | 19 +++++++++++++++++++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 ++++++++++
+ arch/arm/boot/dts/sun7i-a20.dtsi                |  8 ++++++++
+ 4 files changed, 47 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -13,12 +13,18 @@
+ 
+ /dts-v1/;
+ /include/ "sun7i-a20.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "Cubietech Cubieboard2";
+ 	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_cubieboard2: led_pins@0 {
+ 				allwinner,pins = "PH20", "PH21";
+@@ -74,4 +80,8 @@
+ 			gpios = <&pio 7 20 0>;
+ 		};
+ 	};
++
++	reg_ahci_5v: ahci-5v {
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -13,13 +13,26 @@
+ 
+ /dts-v1/;
+ /include/ "sun7i-a20.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "Cubietech Cubietruck";
+ 	compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
++			ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {
++				allwinner,pins = "PH12";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
+ 			led_pins_cubietruck: led_pins@0 {
+ 				allwinner,pins = "PH7", "PH11", "PH20", "PH21";
+ 				allwinner,function = "gpio_out";
+@@ -104,4 +117,10 @@
+ 			gpios = <&pio 7 7 0>;
+ 		};
+ 	};
++
++	reg_ahci_5v: ahci-5v {
++		pinctrl-0 = <&ahci_pwr_pin_cubietruck>;
++		gpio = <&pio 7 12 0>;
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -13,6 +13,7 @@
+ 
+ /dts-v1/;
+ /include/ "sun7i-a20.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "Olimex A20-Olinuxino Micro";
+@@ -36,6 +37,11 @@
+ 			status = "okay";
+ 		};
+ 
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_olinuxino: led_pins@0 {
+ 				allwinner,pins = "PH2";
+@@ -105,4 +111,8 @@
+ 			default-state = "on";
+ 		};
+ 	};
++
++	reg_ahci_5v: ahci-5v {
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -450,6 +450,14 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		ahci: sata@01c18000 {
++			compatible = "allwinner,sun4i-a10-ahci";
++			reg = <0x01c18000 0x1000>;
++			interrupts = <0 56 4>;
++			clocks = <&pll6 0>, <&ahb_gates 25>;
++			status = "disabled";
++		};
++
+ 		spi3: spi@01c1f000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c1f000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch b/trunk/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch
new file mode 100644
index 00000000..75c444d6
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch
@@ -0,0 +1,46 @@
+From ac45fe6b0056d1f92b7c7e5f13514b591a6a9caf Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sun, 2 Feb 2014 14:55:23 +0100
+Subject: [PATCH] wdt: sunxi: Introduce a new compatible for the A10 and A31
+
+For historical reasons, the Allwinner A10 compatibles are not following the
+patterns used for this other Allwinner SoCs.
+
+Introduce a new compatible following the usual pattern, and deprecate the olders.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 7 ++++---
+ drivers/watchdog/sunxi_wdt.c                             | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+--- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
++++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+@@ -2,13 +2,14 @@ Allwinner SoCs Watchdog timer
+ 
+ Required properties:
+ 
+-- compatible : should be "allwinner,<soc-family>-wdt", the currently supported
+-  SoC families being sun4i and sun6i
++- compatible : should be either "allwinner,sun4i-a10-wdt" or
++               "allwinner,sun6i-a31-wdt" (deprecated:
++               "allwinner,sun4i-wdt", "allwinner,sun6i-wdt")
+ - reg : Specifies base physical address and size of the registers.
+ 
+ Example:
+ 
+ wdt: watchdog@01c20c90 {
+-	compatible = "allwinner,sun4i-wdt";
++	compatible = "allwinner,sun4i-a10-wdt";
+ 	reg = <0x01c20c90 0x10>;
+ };
+--- a/drivers/watchdog/sunxi_wdt.c
++++ b/drivers/watchdog/sunxi_wdt.c
+@@ -206,6 +206,7 @@ static void sunxi_wdt_shutdown(struct pl
+ 
+ static const struct of_device_id sunxi_wdt_dt_ids[] = {
+ 	{ .compatible = "allwinner,sun4i-wdt" },
++	{ .compatible = "allwinner,sun4i-a10-wdt" },
+ 	{ /* sentinel */ }
+ };
+ MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);
diff --git a/trunk/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch b/trunk/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch
new file mode 100644
index 00000000..235550b4
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch
@@ -0,0 +1,73 @@
+From f722ea226581a75107ef16b46db1b7b5b999c93a Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sun, 2 Feb 2014 14:55:25 +0100
+Subject: [PATCH] ARM: sunxi: dt: Update the watchdog compatibles
+
+The watchdog compatibles were following a different pattern than the one found
+in the other devices. Now that the driver supports the right pattern, switch to
+it in the DT.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi  | 2 +-
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi  | 2 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi  | 2 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi  | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -487,7 +487,7 @@
+ 		};
+ 
+ 		wdt: watchdog@01c20c90 {
+-			compatible = "allwinner,sun4i-wdt";
++			compatible = "allwinner,sun4i-a10-wdt";
+ 			reg = <0x01c20c90 0x10>;
+ 		};
+ 
+--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
+@@ -392,7 +392,7 @@
+ 		};
+ 
+ 		wdt: watchdog@01c20c90 {
+-			compatible = "allwinner,sun4i-wdt";
++			compatible = "allwinner,sun4i-a10-wdt";
+ 			reg = <0x01c20c90 0x10>;
+ 		};
+ 
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -393,7 +393,7 @@
+ 		};
+ 
+ 		wdt: watchdog@01c20c90 {
+-			compatible = "allwinner,sun4i-wdt";
++			compatible = "allwinner,sun4i-a10-wdt";
+ 			reg = <0x01c20c90 0x10>;
+ 		};
+ 
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -289,7 +289,7 @@
+ 		};
+ 
+ 		wdt1: watchdog@01c20ca0 {
+-			compatible = "allwinner,sun6i-wdt";
++			compatible = "allwinner,sun6i-a31-wdt";
+ 			reg = <0x01c20ca0 0x20>;
+ 		};
+ 
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -608,7 +608,7 @@
+ 		};
+ 
+ 		wdt: watchdog@01c20c90 {
+-			compatible = "allwinner,sun4i-wdt";
++			compatible = "allwinner,sun4i-a10-wdt";
+ 			reg = <0x01c20c90 0x10>;
+ 		};
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch b/trunk/target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch
new file mode 100644
index 00000000..6dcda3ae
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch
@@ -0,0 +1,26 @@
+From 30e5365b3ad3858bbdf40e8364c1e3260861b4e4 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sun, 2 Feb 2014 14:55:24 +0100
+Subject: [PATCH] ARM: sunxi: Add the new watchog compatibles to the reboot
+ code
+
+Now that the watchdog driver has new compatibles, we need to support them in
+the machine reboot code too.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/mach-sunxi/sunxi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm/mach-sunxi/sunxi.c
++++ b/arch/arm/mach-sunxi/sunxi.c
+@@ -95,7 +95,9 @@ static void sun6i_restart(enum reboot_mo
+ 
+ static struct of_device_id sunxi_restart_ids[] = {
+ 	{ .compatible = "allwinner,sun4i-wdt" },
++	{ .compatible = "allwinner,sun4i-a10-wdt" },
+ 	{ .compatible = "allwinner,sun6i-wdt" },
++	{ .compatible = "allwinner,sun6i-a31-wdt" },
+ 	{ /*sentinel*/ }
+ };
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/160-dt-sun4i-add-usb-host-bindings.patch b/trunk/target/linux/sunxi/patches-3.14/160-dt-sun4i-add-usb-host-bindings.patch
new file mode 100644
index 00000000..f1853dfb
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/160-dt-sun4i-add-usb-host-bindings.patch
@@ -0,0 +1,81 @@
+From 991b5f6d2af837b56adfcb3b3a1fe167647b9fdb Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Wed, 18 Sep 2013 00:30:04 +0200
+Subject: [PATCH] ARM: sun4i: dt: Add USB host bindings
+
+Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 52 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -377,6 +377,38 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		usbphy: phy@01c13400 {
++			#phy-cells = <1>;
++			compatible = "allwinner,sun4i-a10-usb-phy";
++			reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>;
++			reg-names = "phy_ctrl", "pmu1", "pmu2";
++			clocks = <&usb_clk 8>;
++			clock-names = "usb_phy";
++			resets = <&usb_clk 1>, <&usb_clk 2>;
++			reset-names = "usb1_reset", "usb2_reset";
++			status = "disabled";
++		};
++
++		ehci0: usb@01c14000 {
++			compatible = "allwinner,sun4i-a10-ehci", "generic-ehci";
++			reg = <0x01c14000 0x100>;
++			interrupts = <39>;
++			clocks = <&ahb_gates 1>;
++			phys = <&usbphy 1>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
++		ohci0: usb@01c14400 {
++			compatible = "allwinner,sun4i-a10-ohci", "generic-ohci";
++			reg = <0x01c14400 0x100>;
++			interrupts = <64>;
++			clocks = <&usb_clk 6>, <&ahb_gates 2>;
++			phys = <&usbphy 1>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
+ 		spi2: spi@01c17000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c17000 0x1000>;
+@@ -396,6 +428,26 @@
+ 			status = "disabled";
+ 		};
+ 
++		ehci1: usb@01c1c000 {
++			compatible = "allwinner,sun4i-a10-ehci", "generic-ehci";
++			reg = <0x01c1c000 0x100>;
++			interrupts = <40>;
++			clocks = <&ahb_gates 3>;
++			phys = <&usbphy 2>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
++		ohci1: usb@01c1c400 {
++			compatible = "allwinner,sun4i-a10-ohci", "generic-ohci";
++			reg = <0x01c1c400 0x100>;
++			interrupts = <65>;
++			clocks = <&usb_clk 7>, <&ahb_gates 4>;
++			phys = <&usbphy 2>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
+ 		spi3: spi@01c1f000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c1f000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/161-dt-sun5i-add-usb-host-bindings.patch b/trunk/target/linux/sunxi/patches-3.14/161-dt-sun5i-add-usb-host-bindings.patch
new file mode 100644
index 00000000..7b014954
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/161-dt-sun5i-add-usb-host-bindings.patch
@@ -0,0 +1,55 @@
+From 1b5a1b92147936c5aa2acec1683663b4d22e9ae6 Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Tue, 24 Sep 2013 20:03:40 +0200
+Subject: [PATCH] ARM: sun5i: dt: Add USB host bindings
+
+Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 32 ++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/sun5i-a13.dtsi  | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 64 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -320,6 +320,38 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		usbphy: phy@01c13400 {
++			#phy-cells = <1>;
++			compatible = "allwinner,sun5i-a13-usb-phy";
++			reg = <0x01c13400 0x10 0x01c14800 0x4>;
++			reg-names = "phy_ctrl", "pmu1";
++			clocks = <&usb_clk 8>;
++			clock-names = "usb_phy";
++			resets = <&usb_clk 1>;
++			reset-names = "usb1_reset";
++			status = "disabled";
++		};
++
++		ehci0: usb@01c14000 {
++			compatible = "allwinner,sun5i-a13-ehci", "generic-ehci";
++			reg = <0x01c14000 0x100>;
++			interrupts = <39>;
++			clocks = <&ahb_gates 1>;
++			phys = <&usbphy 1>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
++		ohci0: usb@01c14400 {
++			compatible = "allwinner,sun5i-a13-ohci", "generic-ohci";
++			reg = <0x01c14400 0x100>;
++			interrupts = <40>;
++			clocks = <&usb_clk 6>, <&ahb_gates 2>;
++			phys = <&usbphy 1>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
+ 		spi2: spi@01c17000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c17000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/162-dt-sun7i-add-usb-host-bindings.patch b/trunk/target/linux/sunxi/patches-3.14/162-dt-sun7i-add-usb-host-bindings.patch
new file mode 100644
index 00000000..a8d0f171
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/162-dt-sun7i-add-usb-host-bindings.patch
@@ -0,0 +1,81 @@
+From 008dffff2fa751c988671c4fc0c9a404ea808280 Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Thu, 19 Sep 2013 21:36:10 +0200
+Subject: [PATCH] ARM: sun7i: dt: Add USB host bindings
+
+Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 52 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -439,6 +439,38 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		usbphy: phy@01c13400 {
++			#phy-cells = <1>;
++			compatible = "allwinner,sun7i-a20-usb-phy";
++			reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>;
++			reg-names = "phy_ctrl", "pmu1", "pmu2";
++			clocks = <&usb_clk 8>;
++			clock-names = "usb_phy";
++			resets = <&usb_clk 1>, <&usb_clk 2>;
++			reset-names = "usb1_reset", "usb2_reset";
++			status = "disabled";
++		};
++
++		ehci0: usb@01c14000 {
++			compatible = "allwinner,sun7i-a20-ehci", "generic-ehci";
++			reg = <0x01c14000 0x100>;
++			interrupts = <0 39 4>;
++			clocks = <&ahb_gates 1>;
++			phys = <&usbphy 1>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
++		ohci0: usb@01c14400 {
++			compatible = "allwinner,sun7i-a20-ohci", "generic-ohci";
++			reg = <0x01c14400 0x100>;
++			interrupts = <0 64 4>;
++			clocks = <&usb_clk 6>, <&ahb_gates 2>;
++			phys = <&usbphy 1>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
+ 		spi2: spi@01c17000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c17000 0x1000>;
+@@ -458,6 +490,26 @@
+ 			status = "disabled";
+ 		};
+ 
++		ehci1: usb@01c1c000 {
++			compatible = "allwinner,sun7i-a20-ehci", "generic-ehci";
++			reg = <0x01c1c000 0x100>;
++			interrupts = <0 40 4>;
++			clocks = <&ahb_gates 3>;
++			phys = <&usbphy 2>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
++		ohci1: usb@01c1c400 {
++			compatible = "allwinner,sun7i-a20-ohci", "generic-ohci";
++			reg = <0x01c1c400 0x100>;
++			interrupts = <0 65 4>;
++			clocks = <&usb_clk 7>, <&ahb_gates 4>;
++			phys = <&usbphy 2>;
++			phy-names = "usb";
++			status = "disabled";
++		};
++
+ 		spi3: spi@01c1f000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c1f000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/163-dt-sun4i-add-usb-host-to-boards.patch b/trunk/target/linux/sunxi/patches-3.14/163-dt-sun4i-add-usb-host-to-boards.patch
new file mode 100644
index 00000000..ce78cb75
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/163-dt-sun4i-add-usb-host-to-boards.patch
@@ -0,0 +1,240 @@
+From f2509ec45a09013e300460a967f694561d169b98 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sat, 11 Jan 2014 04:47:38 +0100
+Subject: [PATCH] ARM: sun4i: dt: Add USB host nodes to hackberry dts
+
+Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
+
+Based on fex file settings, the fex file also contains a mysterious line:
+usb_hub_vcc_en_gpio = port:PB09<1><0><default><0>
+
+Which also clashes with usbc0, which has:
+usb_drv_vbus_gpio = port:PB09<1><0><default><0>
+
+So if usb does not work properly we need someone with a hackberry to look
+closer into this.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 40 +++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
++++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+@@ -13,6 +13,7 @@
+ 
+ /dts-v1/;
+ /include/ "sun4i-a10.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "Miniand Hackberry";
+@@ -35,6 +36,28 @@
+ 			};
+ 		};
+ 
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
+ 		pio: pinctrl@01c20800 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&hackberry_hogs>;
+@@ -45,6 +68,13 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {
++					allwinner,pins = "PH12";
++					allwinner,function = "gpio_out";
++					allwinner,drive = <0>;
++					allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		uart0: serial@01c28000 {
+@@ -66,4 +96,14 @@
+ 			gpio = <&pio 7 19 0>;
+ 		};
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		pinctrl-0 = <&usb2_vbus_pin_hackberry>;
++		gpio = <&pio 7 12 0>;
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
++++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+@@ -13,16 +13,47 @@
+ 
+ /dts-v1/;
+ /include/ "sun4i-a10.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "PineRiver Mini X-Plus";
+ 	compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";
+ 
+ 	soc@01c00000 {
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
+ 			status = "okay";
+ 		};
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
++++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+@@ -12,6 +12,7 @@
+ 
+ /dts-v1/;
+ /include/ "sun4i-a10.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "LinkSprite pcDuino";
+@@ -33,6 +34,28 @@
+ 			};
+ 		};
+ 
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
+@@ -45,4 +68,12 @@
+ 			status = "okay";
+ 		};
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
++++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+@@ -34,11 +34,33 @@
+ 			};
+ 		};
+ 
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
+ 		ahci: sata@01c18000 {
+ 			target-supply = <&reg_ahci_5v>;
+ 			status = "okay";
+ 		};
+ 
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_cubieboard: led_pins@0 {
+ 				allwinner,pins = "PH20", "PH21";
+@@ -87,4 +109,12 @@
+ 	reg_ahci_5v: ahci-5v {
+ 		status = "okay";
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/164-dt-sun5i-add-usb-host-to-boards.patch b/trunk/target/linux/sunxi/patches-3.14/164-dt-sun5i-add-usb-host-to-boards.patch
new file mode 100644
index 00000000..9776f5ba
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/164-dt-sun5i-add-usb-host-to-boards.patch
@@ -0,0 +1,121 @@
+From 9f193366e6094f6e2087c4767e7e413a395bf0d2 Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Tue, 24 Sep 2013 20:07:53 +0200
+Subject: [PATCH] ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
+
+Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
++++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+@@ -13,12 +13,26 @@
+ 
+ /dts-v1/;
+ /include/ "sun5i-a13.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "Olimex A13-Olinuxino";
+ 	compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
+ 
+ 	soc@01c00000 {
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_olinuxino: led_pins@0 {
+ 				allwinner,pins = "PG9";
+@@ -26,6 +40,13 @@
+ 				allwinner,drive = <1>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {
++				allwinner,pins = "PG11";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		uart1: serial@01c28400 {
+@@ -63,4 +84,10 @@
+ 			default-state = "on";
+ 		};
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		pinctrl-0 = <&usb1_vbus_pin_olinuxino>;
++		gpio = <&pio 6 11 0>;
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+@@ -14,12 +14,26 @@
+ 
+ /dts-v1/;
+ /include/ "sun5i-a13.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ 
+ / {
+ 	model = "Olimex A13-Olinuxino Micro";
+ 	compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";
+ 
+ 	soc@01c00000 {
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_olinuxinom: led_pins@0 {
+ 				allwinner,pins = "PG9";
+@@ -27,6 +41,13 @@
+ 				allwinner,drive = <1>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 {
++				allwinner,pins = "PG11";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		uart1: serial@01c28400 {
+@@ -65,4 +86,10 @@
+ 			default-state = "on";
+ 		};
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		pinctrl-0 = <&usb1_vbus_pin_olinuxinom>;
++		gpio = <&pio 6 11 0>;
++		status = "okay";
++	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/165-dt-sun7i-add-usb-host-to-boards.patch b/trunk/target/linux/sunxi/patches-3.14/165-dt-sun7i-add-usb-host-to-boards.patch
new file mode 100644
index 00000000..6bfb1b5c
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/165-dt-sun7i-add-usb-host-to-boards.patch
@@ -0,0 +1,161 @@
+From 56de1b69bf6782338193e373cee06fff252b31da Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 17 Dec 2013 23:04:57 +0100
+Subject: [PATCH] ARM: sun7i: dt: Add USB host nodes to cubietruck dts
+
+Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -20,11 +20,33 @@
+ 	compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
+ 		ahci: sata@01c18000 {
+ 			target-supply = <&reg_ahci_5v>;
+ 			status = "okay";
+ 		};
+ 
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {
+ 				allwinner,pins = "PH12";
+@@ -123,4 +145,12 @@
+ 		gpio = <&pio 7 12 0>;
+ 		status = "okay";
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -20,11 +20,33 @@
+ 	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
+ 		ahci: sata@01c18000 {
+ 			target-supply = <&reg_ahci_5v>;
+ 			status = "okay";
+ 		};
+ 
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_cubieboard2: led_pins@0 {
+ 				allwinner,pins = "PH20", "PH21";
+@@ -84,4 +106,12 @@
+ 	reg_ahci_5v: ahci-5v {
+ 		status = "okay";
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
+ };
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -31,6 +31,20 @@
+ 			status = "okay";
+ 		};
+ 
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
+ 		spi2: spi@01c17000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&spi2_pins_a>;
+@@ -42,6 +56,14 @@
+ 			status = "okay";
+ 		};
+ 
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
+ 		pinctrl@01c20800 {
+ 			led_pins_olinuxino: led_pins@0 {
+ 				allwinner,pins = "PH2";
+@@ -115,4 +137,12 @@
+ 	reg_ahci_5v: ahci-5v {
+ 		status = "okay";
+ 	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/170-input-add-sun4i-ts-driver.patch b/trunk/target/linux/sunxi/patches-3.14/170-input-add-sun4i-ts-driver.patch
new file mode 100644
index 00000000..bde35b1f
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/170-input-add-sun4i-ts-driver.patch
@@ -0,0 +1,341 @@
+From afbd58e1b1219cbcbe2cc07273fc51f658891e9b Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 23 Dec 2013 16:21:02 +0100
+Subject: [PATCH] input: Add new sun4i-ts driver for Allwinner sunxi SoC's rtp
+ controller
+
+Note the sun4i-ts controller is capable of detecting a second touch, but when
+a second touch is present then the accuracy becomes so bad the reported touch
+location is not useable.
+
+The original android driver contains some complicated heuristics using the
+aprox. distance between the 2 touches to see if the user is making a pinch
+open / close movement, and then reports emulated multi-touch events around
+the last touch coordinate (as the dual-touch coordinates are worthless).
+
+These kinds of heuristics are just asking for trouble (and don't belong
+in the kernel). So this driver offers straight forward, reliable single
+touch functionality only.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ .../bindings/input/touchscreen/sun4i.txt           |  15 ++
+ drivers/input/touchscreen/Kconfig                  |  10 +
+ drivers/input/touchscreen/Makefile                 |   1 +
+ drivers/input/touchscreen/sun4i-ts.c               | 262 +++++++++++++++++++++
+ 4 files changed, 288 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+ create mode 100644 drivers/input/touchscreen/sun4i-ts.c
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+@@ -0,0 +1,15 @@
++sun4i resistive touchscreen controller
++--------------------------------------
++
++Required properties:
++ - compatible: "allwinner,sun4i-ts"
++ - reg: mmio address range of the chip
++ - interrupts: interrupt to which the chip is connected
++
++Example:
++
++	rtp: rtp@01c25000 {
++		compatible = "allwinner,sun4i-ts";
++		reg = <0x01c25000 0x100>;
++		interrupts = <29>;
++	};
+--- a/drivers/input/touchscreen/Kconfig
++++ b/drivers/input/touchscreen/Kconfig
+@@ -906,6 +906,16 @@ config TOUCHSCREEN_STMPE
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called stmpe-ts.
+ 
++config TOUCHSCREEN_SUN4I
++	tristate "Allwinner sun4i resistive touchscreen controller support"
++	depends on ARCH_SUNXI
++	help
++	  This selects support for the resistive touchscreen controller
++	  found on Allwinner sunxi SoCs.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called sun4i-ts.
++
+ config TOUCHSCREEN_SUR40
+ 	tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"
+ 	depends on USB
+--- a/drivers/input/touchscreen/Makefile
++++ b/drivers/input/touchscreen/Makefile
+@@ -54,6 +54,7 @@ obj-$(CONFIG_TOUCHSCREEN_PIXCIR)	+= pixc
+ obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_ST1232)	+= st1232.o
+ obj-$(CONFIG_TOUCHSCREEN_STMPE)		+= stmpe-ts.o
++obj-$(CONFIG_TOUCHSCREEN_SUN4I)		+= sun4i-ts.o
+ obj-$(CONFIG_TOUCHSCREEN_SUR40)		+= sur40.o
+ obj-$(CONFIG_TOUCHSCREEN_TI_AM335X_TSC)	+= ti_am335x_tsc.o
+ obj-$(CONFIG_TOUCHSCREEN_TNETV107X)	+= tnetv107x-ts.o
+--- /dev/null
++++ b/drivers/input/touchscreen/sun4i-ts.c
+@@ -0,0 +1,262 @@
++/*
++ * Allwinner sunxi resistive touchscreen controller driver
++ *
++ * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++/*
++ * The sun4i-ts controller is capable of detecting a second touch, but when a
++ * second touch is present then the accuracy becomes so bad the reported touch
++ * location is not useable.
++ *
++ * The original android driver contains some complicated heuristics using the
++ * aprox. distance between the 2 touches to see if the user is making a pinch
++ * open / close movement, and then reports emulated multi-touch events around
++ * the last touch coordinate (as the dual-touch coordinates are worthless).
++ *
++ * These kinds of heuristics are just asking for trouble (and don't belong
++ * in the kernel). So this driver offers straight forward, reliable single
++ * touch functionality only.
++ */
++
++#include <linux/err.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of_platform.h>
++#include <linux/platform_device.h>
++#include <linux/slab.h>
++
++#define TP_CTRL0		0x00
++#define TP_CTRL1		0x04
++#define TP_CTRL2		0x08
++#define TP_CTRL3		0x0c
++#define TP_INT_FIFOC		0x10
++#define TP_INT_FIFOS		0x14
++#define TP_TPR			0x18
++#define TP_CDAT			0x1c
++#define TEMP_DATA		0x20
++#define TP_DATA			0x24
++
++/* TP_CTRL0 bits */
++#define ADC_FIRST_DLY(x)	((x) << 24) /* 8 bits */
++#define ADC_FIRST_DLY_MODE(x)	((x) << 23)
++#define ADC_CLK_SEL(x)		((x) << 22)
++#define ADC_CLK_DIV(x)		((x) << 20) /* 3 bits */
++#define FS_DIV(x)		((x) << 16) /* 4 bits */
++#define T_ACQ(x)		((x) << 0) /* 16 bits */
++
++/* TP_CTRL1 bits */
++#define STYLUS_UP_DEBOUN(x)	((x) << 12) /* 8 bits */
++#define STYLUS_UP_DEBOUN_EN(x)	((x) << 9)
++#define TOUCH_PAN_CALI_EN(x)	((x) << 6)
++#define TP_DUAL_EN(x)		((x) << 5)
++#define TP_MODE_EN(x)		((x) << 4)
++#define TP_ADC_SELECT(x)	((x) << 3)
++#define ADC_CHAN_SELECT(x)	((x) << 0)  /* 3 bits */
++
++/* TP_CTRL2 bits */
++#define TP_SENSITIVE_ADJUST(x)	((x) << 28) /* 4 bits */
++#define TP_MODE_SELECT(x)	((x) << 26) /* 2 bits */
++#define PRE_MEA_EN(x)		((x) << 24)
++#define PRE_MEA_THRE_CNT(x)	((x) << 0) /* 24 bits */
++
++/* TP_CTRL3 bits */
++#define FILTER_EN(x)		((x) << 2)
++#define FILTER_TYPE(x)		((x) << 0)  /* 2 bits */
++
++/* TP_INT_FIFOC irq and fifo mask / control bits */
++#define TEMP_IRQ_EN(x)		((x) << 18)
++#define OVERRUN_IRQ_EN(x)	((x) << 17)
++#define DATA_IRQ_EN(x)		((x) << 16)
++#define TP_DATA_XY_CHANGE(x)	((x) << 13)
++#define FIFO_TRIG(x)		((x) << 8)  /* 5 bits */
++#define DATA_DRQ_EN(x)		((x) << 7)
++#define FIFO_FLUSH(x)		((x) << 4)
++#define TP_UP_IRQ_EN(x)		((x) << 1)
++#define TP_DOWN_IRQ_EN(x)	((x) << 0)
++
++/* TP_INT_FIFOS irq and fifo status bits */
++#define TEMP_DATA_PENDING	BIT(18)
++#define FIFO_OVERRUN_PENDING	BIT(17)
++#define FIFO_DATA_PENDING	BIT(16)
++#define TP_IDLE_FLG		BIT(2)
++#define TP_UP_PENDING		BIT(1)
++#define TP_DOWN_PENDING		BIT(0)
++
++/* TP_TPR bits */
++#define TEMP_ENABLE(x)		((x) << 16)
++#define TEMP_PERIOD(x)		((x) << 0)  /* t = x * 256 * 16 / clkin */
++
++struct sun4i_ts_data {
++	struct device *dev;
++	struct input_dev *input;
++	void __iomem *base;
++	unsigned int irq;
++	bool ignore_fifo_data;
++};
++
++static irqreturn_t sun4i_ts_irq(int irq, void *dev_id)
++{
++	struct sun4i_ts_data *ts = dev_id;
++	u32 reg_val, x, y;
++
++	reg_val  = readl(ts->base + TP_INT_FIFOS);
++
++	if (reg_val & FIFO_DATA_PENDING) {
++		x = readl(ts->base + TP_DATA);
++		y = readl(ts->base + TP_DATA);
++		/* The 1st location reported after an up event is unreliable */
++		if (!ts->ignore_fifo_data) {
++			input_report_abs(ts->input, ABS_X, x);
++			input_report_abs(ts->input, ABS_Y, y);
++			/*
++			 * The hardware has a separate down status bit, but
++			 * that gets set before we get the first location,
++			 * resulting in reporting a click on the old location.
++			 */
++			input_report_key(ts->input, BTN_TOUCH, 1);
++			input_sync(ts->input);
++		} else {
++			ts->ignore_fifo_data = false;
++		}
++	}
++
++	if (reg_val & TP_UP_PENDING) {
++		ts->ignore_fifo_data = true;
++		input_report_key(ts->input, BTN_TOUCH, 0);
++		input_sync(ts->input);
++	}
++
++	writel(reg_val, ts->base + TP_INT_FIFOS);
++
++	return IRQ_HANDLED;
++}
++
++static int sun4i_ts_open(struct input_dev *dev)
++{
++	struct sun4i_ts_data *ts = input_get_drvdata(dev);
++
++	/* Flush, set trig level to 1, enable data and up irqs */
++	writel(DATA_IRQ_EN(1) | FIFO_TRIG(1) | FIFO_FLUSH(1) | TP_UP_IRQ_EN(1),
++	       ts->base + TP_INT_FIFOC);
++
++	return 0;
++}
++
++static void sun4i_ts_close(struct input_dev *dev)
++{
++	struct sun4i_ts_data *ts = input_get_drvdata(dev);
++
++	/* Deactivate all IRQs */
++	writel(0, ts->base + TP_INT_FIFOC);
++}
++
++static int sun4i_ts_probe(struct platform_device *pdev)
++{
++	struct sun4i_ts_data *ts;
++	struct device *dev = &pdev->dev;
++	int ret;
++
++	ts = devm_kzalloc(dev, sizeof(struct sun4i_ts_data), GFP_KERNEL);
++	if (!ts)
++		return -ENOMEM;
++
++	ts->dev = dev;
++	ts->ignore_fifo_data = true;
++
++	ts->input = devm_input_allocate_device(dev);
++	if (!ts->input)
++		return -ENOMEM;
++
++	ts->input->name = pdev->name;
++	ts->input->phys = "sun4i_ts/input0";
++	ts->input->open = sun4i_ts_open;
++	ts->input->close = sun4i_ts_close;
++	ts->input->id.bustype = BUS_HOST;
++	ts->input->id.vendor = 0x0001;
++	ts->input->id.product = 0x0001;
++	ts->input->id.version = 0x0100;
++	ts->input->evbit[0] =  BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS);
++	set_bit(BTN_TOUCH, ts->input->keybit);
++	input_set_abs_params(ts->input, ABS_X, 0, 4095, 0, 0);
++	input_set_abs_params(ts->input, ABS_Y, 0, 4095, 0, 0);
++	input_set_drvdata(ts->input, ts);
++
++	ts->base = devm_ioremap_resource(dev,
++			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
++	if (IS_ERR(ts->base))
++		return PTR_ERR(ts->base);
++
++	ts->irq = platform_get_irq(pdev, 0);
++	ret = devm_request_irq(dev, ts->irq, sun4i_ts_irq, 0, "sun4i-ts", ts);
++	if (ret)
++		return ret;
++
++	/*
++	 * Select HOSC clk, clkin = clk / 6, adc samplefreq = clkin / 8192,
++	 * t_acq = clkin / (16 * 64)
++	 */
++	writel(ADC_CLK_SEL(0) | ADC_CLK_DIV(2) | FS_DIV(7) | T_ACQ(63),
++	       ts->base + TP_CTRL0);
++
++	/*
++	 * sensitive_adjust = 15 : max, which is not all that sensitive,
++	 * tp_mode = 0 : only x and y coordinates, as we don't use dual touch
++	 */
++	writel(TP_SENSITIVE_ADJUST(15) | TP_MODE_SELECT(0),
++	       ts->base + TP_CTRL2);
++
++	/* Enable median filter, type 1 : 5/3 */
++	writel(FILTER_EN(1) | FILTER_TYPE(1), ts->base + TP_CTRL3);
++
++	/* Enable temperature measurement, period 1953 (2 seconds) */
++	writel(TEMP_ENABLE(1) | TEMP_PERIOD(1953), ts->base + TP_TPR);
++
++	/*
++	 * Set stylus up debounce to aprox 10 ms, enable debounce, and
++	 * finally enable tp mode.
++	 */
++	writel(STYLUS_UP_DEBOUN(5) | STYLUS_UP_DEBOUN_EN(1) | TP_MODE_EN(1),
++	       ts->base + TP_CTRL1);
++
++	ret = input_register_device(ts->input);
++	if (ret)
++		return ret;
++
++	platform_set_drvdata(pdev, ts);
++	return 0;
++}
++
++static const struct of_device_id sun4i_ts_of_match[] = {
++	{ .compatible = "allwinner,sun4i-ts", },
++	{ /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, sun4i_ts_of_match);
++
++static struct platform_driver sun4i_ts_driver = {
++	.driver = {
++		.owner	= THIS_MODULE,
++		.name	= "sun4i-ts",
++		.of_match_table = of_match_ptr(sun4i_ts_of_match),
++	},
++	.probe	= sun4i_ts_probe,
++};
++
++module_platform_driver(sun4i_ts_driver);
++
++MODULE_DESCRIPTION("Allwinner sun4i resistive touchscreen controller driver");
++MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.14/171-input-add-temp-sensor-support.patch b/trunk/target/linux/sunxi/patches-3.14/171-input-add-temp-sensor-support.patch
new file mode 100644
index 00000000..bad8df76
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/171-input-add-temp-sensor-support.patch
@@ -0,0 +1,256 @@
+From d8b5553dbf60e519d565dbd83327b08865e960e2 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 27 Dec 2013 15:25:28 +0100
+Subject: [PATCH] input: sun4i-ts: Add support for temperature sensor
+
+The sun4i resisitive touchscreen controller also comes with a built-in
+temperature sensor. This commit adds support for it.
+
+This commit also introduces a new "ts-attached" device-tree property,
+when this is not set, the input part of the driver won't register. This way
+the internal temperature sensor can be used to measure the SoC temperature
+independent of there actually being a touchscreen attached to the controller.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ .../bindings/input/touchscreen/sun4i.txt           |   5 +
+ drivers/input/touchscreen/sun4i-ts.c               | 140 ++++++++++++++++-----
+ 2 files changed, 114 insertions(+), 31 deletions(-)
+
+--- a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
++++ b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+@@ -6,10 +6,15 @@ Required properties:
+  - reg: mmio address range of the chip
+  - interrupts: interrupt to which the chip is connected
+ 
++Optional properties:
++ - allwinner,ts-attached: boolean indicating that an actual touchscreen is
++			  attached to the controller
++
+ Example:
+ 
+ 	rtp: rtp@01c25000 {
+ 		compatible = "allwinner,sun4i-ts";
+ 		reg = <0x01c25000 0x100>;
+ 		interrupts = <29>;
++		allwinner,ts-attached;
+ 	};
+--- a/drivers/input/touchscreen/sun4i-ts.c
++++ b/drivers/input/touchscreen/sun4i-ts.c
+@@ -3,6 +3,9 @@
+  *
+  * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com>
+  *
++ * The hwmon parts are based on work by Corentin LABBE which is:
++ * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+@@ -30,6 +33,7 @@
+  */
+ 
+ #include <linux/err.h>
++#include <linux/hwmon.h>
+ #include <linux/init.h>
+ #include <linux/input.h>
+ #include <linux/interrupt.h>
+@@ -106,14 +110,12 @@ struct sun4i_ts_data {
+ 	void __iomem *base;
+ 	unsigned int irq;
+ 	bool ignore_fifo_data;
++	int temp_data;
+ };
+ 
+-static irqreturn_t sun4i_ts_irq(int irq, void *dev_id)
++static void sun4i_ts_irq_handle_input(struct sun4i_ts_data *ts, u32 reg_val)
+ {
+-	struct sun4i_ts_data *ts = dev_id;
+-	u32 reg_val, x, y;
+-
+-	reg_val  = readl(ts->base + TP_INT_FIFOS);
++	u32 x, y;
+ 
+ 	if (reg_val & FIFO_DATA_PENDING) {
+ 		x = readl(ts->base + TP_DATA);
+@@ -139,6 +141,20 @@ static irqreturn_t sun4i_ts_irq(int irq,
+ 		input_report_key(ts->input, BTN_TOUCH, 0);
+ 		input_sync(ts->input);
+ 	}
++}
++
++static irqreturn_t sun4i_ts_irq(int irq, void *dev_id)
++{
++	struct sun4i_ts_data *ts = dev_id;
++	u32 reg_val;
++
++	reg_val  = readl(ts->base + TP_INT_FIFOS);
++
++	if (reg_val & TEMP_DATA_PENDING)
++		ts->temp_data = readl(ts->base + TEMP_DATA);
++
++	if (ts->input)
++		sun4i_ts_irq_handle_input(ts, reg_val);
+ 
+ 	writel(reg_val, ts->base + TP_INT_FIFOS);
+ 
+@@ -149,9 +165,9 @@ static int sun4i_ts_open(struct input_de
+ {
+ 	struct sun4i_ts_data *ts = input_get_drvdata(dev);
+ 
+-	/* Flush, set trig level to 1, enable data and up irqs */
+-	writel(DATA_IRQ_EN(1) | FIFO_TRIG(1) | FIFO_FLUSH(1) | TP_UP_IRQ_EN(1),
+-	       ts->base + TP_INT_FIFOC);
++	/* Flush, set trig level to 1, enable temp, data and up irqs */
++	writel(TEMP_IRQ_EN(1) | DATA_IRQ_EN(1) | FIFO_TRIG(1) | FIFO_FLUSH(1) |
++		TP_UP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
+ 
+ 	return 0;
+ }
+@@ -160,15 +176,48 @@ static void sun4i_ts_close(struct input_
+ {
+ 	struct sun4i_ts_data *ts = input_get_drvdata(dev);
+ 
+-	/* Deactivate all IRQs */
+-	writel(0, ts->base + TP_INT_FIFOC);
++	/* Deactivate all input IRQs */
++	writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
++}
++
++static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
++			 char *buf)
++{
++	struct sun4i_ts_data *ts = dev_get_drvdata(dev);
++
++	/* No temp_data until the first irq */
++	if (ts->temp_data == -1)
++		return -EAGAIN;
++
++	return sprintf(buf, "%d\n", (ts->temp_data - 1447) * 100);
++}
++
++static ssize_t show_temp_label(struct device *dev,
++			      struct device_attribute *devattr, char *buf)
++{
++	return sprintf(buf, "SoC temperature\n");
+ }
+ 
++static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL);
++static DEVICE_ATTR(temp1_label, S_IRUGO, show_temp_label, NULL);
++
++static struct attribute *sun4i_ts_attrs[] = {
++	&dev_attr_temp1_input.attr,
++	&dev_attr_temp1_label.attr,
++	NULL
++};
++ATTRIBUTE_GROUPS(sun4i_ts);
++
+ static int sun4i_ts_probe(struct platform_device *pdev)
+ {
+ 	struct sun4i_ts_data *ts;
+ 	struct device *dev = &pdev->dev;
++	struct device_node *np = dev->of_node;
++	struct device *hwmon;
+ 	int ret;
++	bool ts_attached;
++
++	ts_attached = of_property_read_bool(np, "allwinner,ts-attached");
+ 
+ 	ts = devm_kzalloc(dev, sizeof(struct sun4i_ts_data), GFP_KERNEL);
+ 	if (!ts)
+@@ -176,24 +225,27 @@ static int sun4i_ts_probe(struct platfor
+ 
+ 	ts->dev = dev;
+ 	ts->ignore_fifo_data = true;
++	ts->temp_data = -1;
+ 
+-	ts->input = devm_input_allocate_device(dev);
+-	if (!ts->input)
+-		return -ENOMEM;
+-
+-	ts->input->name = pdev->name;
+-	ts->input->phys = "sun4i_ts/input0";
+-	ts->input->open = sun4i_ts_open;
+-	ts->input->close = sun4i_ts_close;
+-	ts->input->id.bustype = BUS_HOST;
+-	ts->input->id.vendor = 0x0001;
+-	ts->input->id.product = 0x0001;
+-	ts->input->id.version = 0x0100;
+-	ts->input->evbit[0] =  BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS);
+-	set_bit(BTN_TOUCH, ts->input->keybit);
+-	input_set_abs_params(ts->input, ABS_X, 0, 4095, 0, 0);
+-	input_set_abs_params(ts->input, ABS_Y, 0, 4095, 0, 0);
+-	input_set_drvdata(ts->input, ts);
++	if (ts_attached) {
++		ts->input = devm_input_allocate_device(dev);
++		if (!ts->input)
++			return -ENOMEM;
++
++		ts->input->name = pdev->name;
++		ts->input->phys = "sun4i_ts/input0";
++		ts->input->open = sun4i_ts_open;
++		ts->input->close = sun4i_ts_close;
++		ts->input->id.bustype = BUS_HOST;
++		ts->input->id.vendor = 0x0001;
++		ts->input->id.product = 0x0001;
++		ts->input->id.version = 0x0100;
++		ts->input->evbit[0] =  BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS);
++		set_bit(BTN_TOUCH, ts->input->keybit);
++		input_set_abs_params(ts->input, ABS_X, 0, 4095, 0, 0);
++		input_set_abs_params(ts->input, ABS_Y, 0, 4095, 0, 0);
++		input_set_drvdata(ts->input, ts);
++	}
+ 
+ 	ts->base = devm_ioremap_resource(dev,
+ 			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
+@@ -232,14 +284,39 @@ static int sun4i_ts_probe(struct platfor
+ 	writel(STYLUS_UP_DEBOUN(5) | STYLUS_UP_DEBOUN_EN(1) | TP_MODE_EN(1),
+ 	       ts->base + TP_CTRL1);
+ 
+-	ret = input_register_device(ts->input);
+-	if (ret)
+-		return ret;
++	hwmon = devm_hwmon_device_register_with_groups(ts->dev, "sun4i_ts",
++						       ts, sun4i_ts_groups);
++	if (IS_ERR(hwmon))
++		return PTR_ERR(hwmon);
++
++	writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
++
++	if (ts_attached) {
++		ret = input_register_device(ts->input);
++		if (ret) {
++			writel(0, ts->base + TP_INT_FIFOC);
++			return ret;
++		}
++	}
+ 
+ 	platform_set_drvdata(pdev, ts);
+ 	return 0;
+ }
+ 
++static int sun4i_ts_remove(struct platform_device *pdev)
++{
++	struct sun4i_ts_data *ts = platform_get_drvdata(pdev);
++
++	/* Explicit unregister to avoid open/close changing the imask later */
++	if (ts->input)
++		input_unregister_device(ts->input);
++
++	/* Deactivate all IRQs */
++	writel(0, ts->base + TP_INT_FIFOC);
++
++	return 0;
++}
++
+ static const struct of_device_id sun4i_ts_of_match[] = {
+ 	{ .compatible = "allwinner,sun4i-ts", },
+ 	{ /* sentinel */ }
+@@ -253,6 +330,7 @@ static struct platform_driver sun4i_ts_d
+ 		.of_match_table = of_match_ptr(sun4i_ts_of_match),
+ 	},
+ 	.probe	= sun4i_ts_probe,
++	.remove	= sun4i_ts_remove,
+ };
+ 
+ module_platform_driver(sun4i_ts_driver);
diff --git a/trunk/target/linux/sunxi/patches-3.14/172-input-add-lradc-keys-driver.patch b/trunk/target/linux/sunxi/patches-3.14/172-input-add-lradc-keys-driver.patch
new file mode 100644
index 00000000..859a7f1a
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/172-input-add-lradc-keys-driver.patch
@@ -0,0 +1,326 @@
+From 3f8fd9b9e2daefb7be4c46369f86af1c7bb2f1ca Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 19:44:49 +0100
+Subject: [PATCH] input: Add new sun4i-lradc-keys driver
+
+Allwinnner sunxi SoCs have a low resolution adc (called lradc) which is
+specifically designed to have various (tablet) keys (ie home, back, search,
+etc). attached to it using a resistor network. This adds a driver for this.
+
+There are 2 channels, currently this driver only supports chan0 since there
+are no boards known to use chan1. The devicetree properties are already
+prefixed with chan0 as preparation for chan1 support in the future.
+
+This has been tested on an olimex a10s-olinuxino-micro, a13-olinuxino, and
+a20-olinuxino-micro.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ .../devicetree/bindings/input/sun4i-lradc-keys.txt |  22 ++
+ drivers/input/keyboard/Kconfig                     |  10 +
+ drivers/input/keyboard/Makefile                    |   1 +
+ drivers/input/keyboard/sun4i-lradc-keys.c          | 243 +++++++++++++++++++++
+ 4 files changed, 276 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+ create mode 100644 drivers/input/keyboard/sun4i-lradc-keys.c
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+@@ -0,0 +1,22 @@
++Allwinner sun4i low res adc attached tablet keys
++------------------------------------------------
++
++Required properties:
++ - compatible: "allwinner,sun4i-lradc-keys"
++ - reg: mmio address range of the chip
++ - interrupts: interrupt to which the chip is connected
++ - allwinner,chan0-step: step in mV between keys must be 150 or 200
++ - linux,chan0-keycodes: array of dt-bindings/input/input.h KEY_ codes
++
++Example:
++
++#include <dt-bindings/input/input.h>
++
++	lradc: lradc@01c22800 {
++		compatible = "allwinner,sun4i-lradc-keys";
++		reg = <0x01c22800 0x100>;
++		interrupts = <31>;
++		allwinner,chan0-step = <200>;
++		linux,chan0-keycodes = <KEY_VOLUMEUP KEY_VOLUMEDOWN
++					KEY_MENU KEY_ENTER KEY_HOME>;
++	};
+--- a/drivers/input/keyboard/Kconfig
++++ b/drivers/input/keyboard/Kconfig
+@@ -544,6 +544,16 @@ config KEYBOARD_STMPE
+ 	  To compile this driver as a module, choose M here: the module will be
+ 	  called stmpe-keypad.
+ 
++config KEYBOARD_SUN4I_LRADC
++	tristate "Allwinner sun4i low res adc attached tablet keys support"
++	depends on ARCH_SUNXI
++	help
++	  This selects support for the Allwinner low res adc attached tablet
++	  keys found on Allwinner sunxi SoCs.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called sun4i-lradc-keys.
++
+ config KEYBOARD_DAVINCI
+ 	tristate "TI DaVinci Key Scan"
+ 	depends on ARCH_DAVINCI_DM365
+--- a/drivers/input/keyboard/Makefile
++++ b/drivers/input/keyboard/Makefile
+@@ -50,6 +50,7 @@ obj-$(CONFIG_KEYBOARD_SH_KEYSC)		+= sh_k
+ obj-$(CONFIG_KEYBOARD_SPEAR)		+= spear-keyboard.o
+ obj-$(CONFIG_KEYBOARD_STMPE)		+= stmpe-keypad.o
+ obj-$(CONFIG_KEYBOARD_STOWAWAY)		+= stowaway.o
++obj-$(CONFIG_KEYBOARD_SUN4I_LRADC)	+= sun4i-lradc-keys.o
+ obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
+ obj-$(CONFIG_KEYBOARD_TC3589X)		+= tc3589x-keypad.o
+ obj-$(CONFIG_KEYBOARD_TEGRA)		+= tegra-kbc.o
+--- /dev/null
++++ b/drivers/input/keyboard/sun4i-lradc-keys.c
+@@ -0,0 +1,243 @@
++/*
++ * Allwinner sun4i low res adc attached tablet keys driver
++ *
++ * Copyright (C) 2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++/*
++ * Allwinnner sunxi SoCs have a lradc which is specifically designed to have
++ * various (tablet) keys (ie home, back, search, etc). attached to it using
++ * a resistor network. This driver is for the keys on such boards.
++ *
++ * There are 2 channels, currently this driver only supports chan0 since there
++ * are no boards known to use chan1. The devicetree properties are already
++ * prefixed with chan0 as preparation for chan1 support in the future.
++ */
++
++#include <linux/err.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of_platform.h>
++#include <linux/platform_device.h>
++#include <linux/slab.h>
++
++#define LRADC_CTRL		0x00
++#define LRADC_INTC		0x04
++#define LRADC_INTS		0x08
++#define LRADC_DATA0		0x0c
++#define LRADC_DATA1		0x10
++
++/* LRADC_CTRL bits */
++#define FIRST_CONVERT_DLY(x)	((x) << 24) /* 8 bits */
++#define CHAN_SELECT(x)		((x) << 22) /* 2 bits */
++#define CONTINUE_TIME_SEL(x)	((x) << 16) /* 4 bits */
++#define KEY_MODE_SEL(x)		((x) << 12) /* 2 bits */
++#define LEVELA_B_CNT(x)		((x) << 8)  /* 4 bits */
++#define HOLD_EN(x)		((x) << 6)
++#define LEVELB_VOL(x)		((x) << 4)  /* 2 bits */
++#define SAMPLE_RATE(x)		((x) << 2)  /* 2 bits */
++#define ENABLE(x)		((x) << 0)
++
++/* LRADC_INTC and LRADC_INTS bits */
++#define CHAN1_KEYUP_IRQ		BIT(12)
++#define CHAN1_ALRDY_HOLD_IRQ	BIT(11)
++#define CHAN1_HOLD_IRQ		BIT(10)
++#define	CHAN1_KEYDOWN_IRQ	BIT(9)
++#define CHAN1_DATA_IRQ		BIT(8)
++#define CHAN0_KEYUP_IRQ		BIT(4)
++#define CHAN0_ALRDY_HOLD_IRQ	BIT(3)
++#define CHAN0_HOLD_IRQ		BIT(2)
++#define	CHAN0_KEYDOWN_IRQ	BIT(1)
++#define CHAN0_DATA_IRQ		BIT(0)
++
++#define MAX_KEYS		13
++
++/* Lookup table to map the adc val to a keycode index for 150 mv step size */
++static const u8 adc_val_to_key_index_step150[64] = {
++	0, 0, 0,
++	1, 1, 1, 1, 1,
++	2, 2, 2, 2, 2,
++	3, 3, 3, 3,
++	4, 4, 4, 4, 4,
++	5, 5, 5, 5, 5,
++	6, 6, 6, 6, 6,
++	7, 7, 7, 7,
++	8, 8, 8, 8, 8,
++	9, 9, 9, 9, 9,
++	10, 10, 10, 10,
++	11, 11, 11, 11,
++	12, 12, 12, 12, 12, 12, 12, 12, 12, 12
++};
++
++/* Lookup table to map the adc val to a keycode index for 200 mv step size */
++static const u8 adc_val_to_key_index_step200[64] = {
++	0, 0, 0, 0, 0, 0, 0, 0,
++	1, 1, 1, 1, 1, 1, 1,
++	2, 2, 2, 2, 2, 2, 2,
++	3, 3, 3, 3, 3, 3,
++	4, 4, 4, 4, 4, 4,
++	5, 5, 5, 5, 5, 5,
++	6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
++	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
++};
++
++struct sun4i_lradc_data {
++	struct device *dev;
++	struct input_dev *input;
++	void __iomem *base;
++	u32 chan0_step;
++	u32 chan0_keycode;
++	u32 chan0_keycodes[MAX_KEYS];
++};
++
++static irqreturn_t sun4i_lradc_irq(int irq, void *dev_id)
++{
++	struct sun4i_lradc_data *lradc = dev_id;
++	u32 ints, val;
++
++	ints  = readl(lradc->base + LRADC_INTS);
++
++	/*
++	 * lradc supports only one keypress at a time, release does not give
++	 * any info as to which key was released, so we cache the keycode.
++	 */
++	if ((ints & CHAN0_KEYDOWN_IRQ) && lradc->chan0_keycode == 0) {
++		val = readl(lradc->base + LRADC_DATA0);
++		if (lradc->chan0_step == 150)
++			val = adc_val_to_key_index_step150[val];
++		else
++			val = adc_val_to_key_index_step200[val];
++
++		lradc->chan0_keycode = lradc->chan0_keycodes[val];
++		input_report_key(lradc->input, lradc->chan0_keycode, 1);
++	}
++
++	if (ints & CHAN0_KEYUP_IRQ) {
++		input_report_key(lradc->input, lradc->chan0_keycode, 0);
++		lradc->chan0_keycode = 0;
++	}
++
++	input_sync(lradc->input);
++
++	writel(ints, lradc->base + LRADC_INTS);
++
++	return IRQ_HANDLED;
++}
++
++static int sun4i_lradc_open(struct input_dev *dev)
++{
++	struct sun4i_lradc_data *lradc = input_get_drvdata(dev);
++
++	/*
++	 * Set sample time to 16 ms / 62.5 Hz. Wait 2 * 16 ms for key to
++	 * stabilize on press, wait (1 + 1) * 16 ms for key release
++	 */
++	writel(FIRST_CONVERT_DLY(2) | LEVELA_B_CNT(1) | HOLD_EN(1) |
++		SAMPLE_RATE(2) | ENABLE(1), lradc->base + LRADC_CTRL);
++
++	writel(CHAN0_KEYUP_IRQ | CHAN0_KEYDOWN_IRQ, lradc->base + LRADC_INTC);
++
++	return 0;
++}
++
++static void sun4i_lradc_close(struct input_dev *dev)
++{
++	struct sun4i_lradc_data *lradc = input_get_drvdata(dev);
++
++	/* Disable lradc, leave other settings unchanged */
++	writel(FIRST_CONVERT_DLY(2) | LEVELA_B_CNT(1) | HOLD_EN(1) |
++		SAMPLE_RATE(2), lradc->base + LRADC_CTRL);
++	writel(0, lradc->base + LRADC_INTC);
++}
++
++static int sun4i_lradc_probe(struct platform_device *pdev)
++{
++	struct sun4i_lradc_data *lradc;
++	struct device *dev = &pdev->dev;
++	struct device_node *np = dev->of_node;
++	int i, ret;
++
++	lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data), GFP_KERNEL);
++	if (!lradc)
++		return -ENOMEM;
++
++	ret = of_property_read_u32(np, "allwinner,chan0-step",
++				   &lradc->chan0_step);
++	if (ret || (lradc->chan0_step != 150 && lradc->chan0_step != 200)) {
++		dev_err(dev, "Invalid allwinner,chan0-step dt-property\n");
++		return -EINVAL;
++	}
++
++	for (i = 0; i < MAX_KEYS; i++)
++		of_property_read_u32_index(np, "linux,chan0-keycodes",
++					   i, &lradc->chan0_keycodes[i]);
++
++	lradc->dev = dev;
++	lradc->input = devm_input_allocate_device(dev);
++	if (!lradc->input)
++		return -ENOMEM;
++
++	lradc->input->name = pdev->name;
++	lradc->input->phys = "sun4i_lradc/input0";
++	lradc->input->open = sun4i_lradc_open;
++	lradc->input->close = sun4i_lradc_close;
++	lradc->input->id.bustype = BUS_HOST;
++	lradc->input->id.vendor = 0x0001;
++	lradc->input->id.product = 0x0001;
++	lradc->input->id.version = 0x0100;
++	lradc->input->evbit[0] =  BIT(EV_SYN) | BIT(EV_KEY);
++	for (i = 0; i < MAX_KEYS; i++)
++		set_bit(lradc->chan0_keycodes[i], lradc->input->keybit);
++	input_set_drvdata(lradc->input, lradc);
++
++	lradc->base = devm_ioremap_resource(dev,
++			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
++	if (IS_ERR(lradc->base))
++		return PTR_ERR(lradc->base);
++
++	ret = devm_request_irq(dev, platform_get_irq(pdev, 0), sun4i_lradc_irq,
++			       0, "sun4i-lradc-keys", lradc);
++	if (ret)
++		return ret;
++
++	ret = input_register_device(lradc->input);
++	if (ret)
++		return ret;
++
++	platform_set_drvdata(pdev, lradc);
++	return 0;
++}
++
++static const struct of_device_id sun4i_lradc_of_match[] = {
++	{ .compatible = "allwinner,sun4i-lradc-keys", },
++	{ /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, sun4i_lradc_of_match);
++
++static struct platform_driver sun4i_lradc_driver = {
++	.driver = {
++		.owner	= THIS_MODULE,
++		.name	= "sun4i-lradc-keys",
++		.of_match_table = of_match_ptr(sun4i_lradc_of_match),
++	},
++	.probe	= sun4i_lradc_probe,
++};
++
++module_platform_driver(sun4i_lradc_driver);
++
++MODULE_DESCRIPTION("Allwinner sun4i low res adc attached tablet keys driver");
++MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.14/173-1-dt-sun4i-add-lradc-node.patch b/trunk/target/linux/sunxi/patches-3.14/173-1-dt-sun4i-add-lradc-node.patch
new file mode 100644
index 00000000..544528d8
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/173-1-dt-sun4i-add-lradc-node.patch
@@ -0,0 +1,26 @@
+From 87d0c26803eec56971c8a7e6299aefc4d72dfb3c Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 19:51:36 +0100
+Subject: [PATCH] ARM: dts: sun4i: Add lradc node
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -549,6 +549,13 @@
+ 			interrupts = <24>;
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			compatible = "allwinner,sun4i-lradc-keys";
++			reg = <0x01c22800 0x100>;
++			interrupts = <31>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun4i-sid";
+ 			reg = <0x01c23800 0x10>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/173-2-dt-sun5i-add-lradc-node.patch b/trunk/target/linux/sunxi/patches-3.14/173-2-dt-sun5i-add-lradc-node.patch
new file mode 100644
index 00000000..6fa1c2b9
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/173-2-dt-sun5i-add-lradc-node.patch
@@ -0,0 +1,53 @@
+From 9041b1f6118b32929e6357affb53db28439a11e7 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 19:50:33 +0100
+Subject: [PATCH] ARM: dts: sun5i: Add lradc node
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 8 ++++++++
+ arch/arm/boot/dts/sun5i-a10s.dtsi                | 7 +++++++
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts        | 8 ++++++++
+ arch/arm/boot/dts/sun5i-a13.dtsi                 | 7 +++++++
+ 4 files changed, 30 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
++++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+@@ -14,6 +14,7 @@
+ /dts-v1/;
+ /include/ "sun5i-a13.dtsi"
+ /include/ "sunxi-common-regulators.dtsi"
++#include <dt-bindings/input/input.h>
+ 
+ / {
+ 	model = "Olimex A13-Olinuxino";
+@@ -49,6 +50,13 @@
+ 			};
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			allwinner,chan0-step = <200>;
++			linux,chan0-keycodes = <KEY_VOLUMEUP KEY_VOLUMEDOWN
++						KEY_MENU KEY_ENTER KEY_HOME>;
++			status = "okay";
++		};
++
+ 		uart1: serial@01c28400 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart1_pins_b>;
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -429,6 +429,13 @@
+ 			reg = <0x01c20c90 0x10>;
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			compatible = "allwinner,sun4i-lradc-keys";
++			reg = <0x01c22800 0x100>;
++			interrupts = <31>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun4i-sid";
+ 			reg = <0x01c23800 0x10>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch b/trunk/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch
new file mode 100644
index 00000000..44e9f53c
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/173-3-dt-sun7i-add-lradc-node.patch
@@ -0,0 +1,52 @@
+From 98e21d18a26032912bf6c979f084c200a94e976b Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 20:26:21 +0100
+Subject: [PATCH] ARM: dts: sun7i: Add lradc node
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 9 +++++++++
+ arch/arm/boot/dts/sun7i-a20.dtsi                | 7 +++++++
+ 2 files changed, 16 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -14,6 +14,7 @@
+ /dts-v1/;
+ /include/ "sun7i-a20.dtsi"
+ /include/ "sunxi-common-regulators.dtsi"
++#include <dt-bindings/input/input.h>
+ 
+ / {
+ 	model = "Olimex A20-Olinuxino Micro";
+@@ -73,6 +74,14 @@
+ 			};
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			allwinner,chan0-step = <200>;
++			linux,chan0-keycodes = <KEY_VOLUMEUP KEY_VOLUMEDOWN
++						KEY_MENU KEY_SEARCH KEY_HOME
++						KEY_ESC KEY_ENTER>;
++			status = "okay";
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -670,6 +670,13 @@
+ 			interrupts = <0 24 4>;
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			compatible = "allwinner,sun4i-lradc-keys";
++			reg = <0x01c22800 0x100>;
++			interrupts = <0 31 4>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun7i-a20-sid";
+ 			reg = <0x01c23800 0x200>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/175-reset-add-of_reset_control_get.patch b/trunk/target/linux/sunxi/patches-3.14/175-reset-add-of_reset_control_get.patch
new file mode 100644
index 00000000..3b6db99d
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/175-reset-add-of_reset_control_get.patch
@@ -0,0 +1,112 @@
+From bfea2b9be28b20e076d5df8863c25e966f413fa3 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Fri, 20 Dec 2013 22:41:07 +0100
+Subject: [PATCH] reset: Add of_reset_control_get
+
+In some cases, you might need to deassert from reset an hardware block that
+doesn't associated to a struct device (CPUs, timers, etc.).
+
+Add a small helper to retrieve the reset controller from the device tree
+without the need to pass a struct device.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ drivers/reset/core.c  | 39 ++++++++++++++++++++++++++++++---------
+ include/linux/reset.h |  4 ++++
+ 2 files changed, 34 insertions(+), 9 deletions(-)
+
+--- a/drivers/reset/core.c
++++ b/drivers/reset/core.c
+@@ -127,15 +127,16 @@ int reset_control_deassert(struct reset_
+ EXPORT_SYMBOL_GPL(reset_control_deassert);
+ 
+ /**
+- * reset_control_get - Lookup and obtain a reference to a reset controller.
+- * @dev: device to be reset by the controller
++ * of_reset_control_get - Lookup and obtain a reference to a reset controller.
++ * @node: device to be reset by the controller
+  * @id: reset line name
+  *
+  * Returns a struct reset_control or IS_ERR() condition containing errno.
+  *
+  * Use of id names is optional.
+  */
+-struct reset_control *reset_control_get(struct device *dev, const char *id)
++struct reset_control *of_reset_control_get(struct device_node *node,
++					   const char *id)
+ {
+ 	struct reset_control *rstc = ERR_PTR(-EPROBE_DEFER);
+ 	struct reset_controller_dev *r, *rcdev;
+@@ -144,13 +145,10 @@ struct reset_control *reset_control_get(
+ 	int rstc_id;
+ 	int ret;
+ 
+-	if (!dev)
+-		return ERR_PTR(-EINVAL);
+-
+ 	if (id)
+-		index = of_property_match_string(dev->of_node,
++		index = of_property_match_string(node,
+ 						 "reset-names", id);
+-	ret = of_parse_phandle_with_args(dev->of_node, "resets", "#reset-cells",
++	ret = of_parse_phandle_with_args(node, "resets", "#reset-cells",
+ 					 index, &args);
+ 	if (ret)
+ 		return ERR_PTR(ret);
+@@ -185,12 +183,35 @@ struct reset_control *reset_control_get(
+ 		return ERR_PTR(-ENOMEM);
+ 	}
+ 
+-	rstc->dev = dev;
+ 	rstc->rcdev = rcdev;
+ 	rstc->id = rstc_id;
+ 
+ 	return rstc;
+ }
++EXPORT_SYMBOL_GPL(of_reset_control_get);
++
++/**
++ * reset_control_get - Lookup and obtain a reference to a reset controller.
++ * @dev: device to be reset by the controller
++ * @id: reset line name
++ *
++ * Returns a struct reset_control or IS_ERR() condition containing errno.
++ *
++ * Use of id names is optional.
++ */
++struct reset_control *reset_control_get(struct device *dev, const char *id)
++{
++	struct reset_control *rstc;
++
++	if (!dev)
++		return ERR_PTR(-EINVAL);
++
++	rstc = of_reset_control_get(dev->of_node, id);
++	if (!IS_ERR(rstc))
++		rstc->dev = dev;
++
++	return rstc;
++}
+ EXPORT_SYMBOL_GPL(reset_control_get);
+ 
+ /**
+--- a/include/linux/reset.h
++++ b/include/linux/reset.h
+@@ -1,6 +1,8 @@
+ #ifndef _LINUX_RESET_H_
+ #define _LINUX_RESET_H_
+ 
++#include <linux/of.h>
++
+ struct device;
+ struct reset_control;
+ 
+@@ -8,6 +10,8 @@ int reset_control_reset(struct reset_con
+ int reset_control_assert(struct reset_control *rstc);
+ int reset_control_deassert(struct reset_control *rstc);
+ 
++struct reset_control *of_reset_control_get(struct device_node *node,
++					   const char *id);
+ struct reset_control *reset_control_get(struct device *dev, const char *id);
+ void reset_control_put(struct reset_control *rstc);
+ struct reset_control *devm_reset_control_get(struct device *dev, const char *id);
diff --git a/trunk/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch b/trunk/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch
new file mode 100644
index 00000000..3986d193
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch
@@ -0,0 +1,62 @@
+From 3ec31fa2ce161d35f787354037f94d9d22d825d1 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Fri, 20 Dec 2013 22:41:08 +0100
+Subject: [PATCH] clocksource: sun5i: Add support for reset controller
+
+The Allwinner A31 that uses this timer has the timer IP asserted in reset.
+Add an optional reset property to the DT, and deassert the timer from reset if
+it's there.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ .../devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt       | 4 ++++
+ drivers/clocksource/timer-sun5i.c                                   | 6 ++++++
+ 2 files changed, 10 insertions(+)
+
+--- a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
++++ b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
+@@ -9,6 +9,9 @@ Required properties:
+ 		one)
+ - clocks: phandle to the source clock (usually the AHB clock)
+ 
++Optionnal properties:
++- resets: phandle to a reset controller asserting the timer
++
+ Example:
+ 
+ timer@01c60000 {
+@@ -19,4 +22,5 @@ timer@01c60000 {
+ 		     <0 53 1>,
+ 		     <0 54 1>;
+ 	clocks = <&ahb1_gates 19>;
++	resets = <&ahb1rst 19>;
+ };
+--- a/drivers/clocksource/timer-sun5i.c
++++ b/drivers/clocksource/timer-sun5i.c
+@@ -16,6 +16,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/irq.h>
+ #include <linux/irqreturn.h>
++#include <linux/reset.h>
+ #include <linux/sched_clock.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
+@@ -143,6 +144,7 @@ static u64 sun5i_timer_sched_read(void)
+ 
+ static void __init sun5i_timer_init(struct device_node *node)
+ {
++	struct reset_control *rstc;
+ 	unsigned long rate;
+ 	struct clk *clk;
+ 	int ret, irq;
+@@ -162,6 +164,10 @@ static void __init sun5i_timer_init(stru
+ 	clk_prepare_enable(clk);
+ 	rate = clk_get_rate(clk);
+ 
++	rstc = of_reset_control_get(node, NULL);
++	if (!IS_ERR(rstc))
++		reset_control_deassert(rstc);
++
+ 	writel(~0, timer_base + TIMER_INTVAL_LO_REG(1));
+ 	writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
+ 	       timer_base + TIMER_CTL_REG(1));
diff --git a/trunk/target/linux/sunxi/patches-3.14/180-clk-sunxi-add-clock-output-names-dt-prop-support.patch b/trunk/target/linux/sunxi/patches-3.14/180-clk-sunxi-add-clock-output-names-dt-prop-support.patch
new file mode 100644
index 00000000..73caeb9b
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/180-clk-sunxi-add-clock-output-names-dt-prop-support.patch
@@ -0,0 +1,50 @@
+From 0bf618fda3ad24649add0bf943d16a9b4f5c3463 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:37 +0800
+Subject: [PATCH] clk: sunxi: add clock-output-names dt property support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+sunxi clock drivers use dt node name as clock name, but clock
+nodes should be named clk@X, so the names would be the same.
+Let the drivers read clock names from dt clock-output-names
+property.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Mike Turquette <mturquette@linaro.org>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ drivers/clk/sunxi/clk-sunxi.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -51,6 +51,8 @@ static void __init sun4i_osc_clk_setup(s
+ 	if (!gate)
+ 		goto err_free_fixed;
+ 
++	of_property_read_string(node, "clock-output-names", &clk_name);
++
+ 	/* set up gate and fixed rate properties */
+ 	gate->reg = of_iomap(node, 0);
+ 	gate->bit_idx = SUNXI_OSC24M_GATE;
+@@ -601,6 +603,8 @@ static void __init sunxi_mux_clk_setup(s
+ 	       (parents[i] = of_clk_get_parent_name(node, i)) != NULL)
+ 		i++;
+ 
++	of_property_read_string(node, "clock-output-names", &clk_name);
++
+ 	clk = clk_register_mux(NULL, clk_name, parents, i,
+ 			       CLK_SET_RATE_NO_REPARENT, reg,
+ 			       data->shift, SUNXI_MUX_GATE_WIDTH,
+@@ -660,6 +664,8 @@ static void __init sunxi_divider_clk_set
+ 
+ 	clk_parent = of_clk_get_parent_name(node, 0);
+ 
++	of_property_read_string(node, "clock-output-names", &clk_name);
++
+ 	clk = clk_register_divider(NULL, clk_name, clk_parent, 0,
+ 				   reg, data->shift, data->width,
+ 				   data->pow ? CLK_DIVIDER_POWER_OF_TWO : 0,
diff --git a/trunk/target/linux/sunxi/patches-3.14/181-clk-sunxi-add-names-for-pll56.patch b/trunk/target/linux/sunxi/patches-3.14/181-clk-sunxi-add-names-for-pll56.patch
new file mode 100644
index 00000000..4229fa4f
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/181-clk-sunxi-add-names-for-pll56.patch
@@ -0,0 +1,78 @@
+From 8f3156f3f2b70128b2761526c208c8e3bfda694e Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:39 +0800
+Subject: [PATCH] clk: sunxi: add names for pll5, pll6 parent clocks to
+ factors_data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some factor clocks, such as the parent clock of pll5 and pll6, have
+multiple output names. Add the corresponding names to factors_data
+tied to compatible string.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Mike Turquette <mturquette@linaro.org>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ drivers/clk/sunxi/clk-sunxi.c | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -389,6 +389,7 @@ struct factors_data {
+ 	int mux;
+ 	struct clk_factors_config *table;
+ 	void (*getter) (u32 *rate, u32 parent_rate, u8 *n, u8 *k, u8 *m, u8 *p);
++	const char *name;
+ };
+ 
+ static struct clk_factors_config sun4i_pll1_config = {
+@@ -457,6 +458,14 @@ static const struct factors_data sun4i_p
+ 	.enable = 31,
+ 	.table = &sun4i_pll5_config,
+ 	.getter = sun4i_get_pll5_factors,
++	.name = "pll5",
++};
++
++static const struct factors_data sun4i_pll6_data __initconst = {
++	.enable = 31,
++	.table = &sun4i_pll5_config,
++	.getter = sun4i_get_pll5_factors,
++	.name = "pll6",
+ };
+ 
+ static const struct factors_data sun4i_apb1_data __initconst = {
+@@ -499,14 +508,14 @@ static struct clk * __init sunxi_factors
+ 	       (parents[i] = of_clk_get_parent_name(node, i)) != NULL)
+ 		i++;
+ 
+-	/* Nodes should be providing the name via clock-output-names
+-	 * but originally our dts didn't, and so we used node->name.
+-	 * The new, better nodes look like clk@deadbeef, so we pull the
+-	 * name just in this case */
+-	if (!strcmp("clk", clk_name)) {
+-		of_property_read_string_index(node, "clock-output-names",
+-					      0, &clk_name);
+-	}
++	/*
++	 * some factor clocks, such as pll5 and pll6, may have multiple
++	 * outputs, and have their name designated in factors_data
++	 */
++	if (data->name)
++		clk_name = data->name;
++	else
++		of_property_read_string(node, "clock-output-names", &clk_name);
+ 
+ 	factors = kzalloc(sizeof(struct clk_factors), GFP_KERNEL);
+ 	if (!factors)
+@@ -838,7 +847,7 @@ static const struct divs_data pll5_divs_
+ };
+ 
+ static const struct divs_data pll6_divs_data __initconst = {
+-	.factors = &sun4i_pll5_data,
++	.factors = &sun4i_pll6_data,
+ 	.div = {
+ 		{ .shift = 0, .table = pll6_sata_tbl, .gate = 14 }, /* M, SATA */
+ 		{ .fixed = 2 }, /* P, other */
diff --git a/trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch b/trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch
new file mode 100644
index 00000000..e8977362
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch
@@ -0,0 +1,128 @@
+From 0643a93746775da2189ab0afd8f748afcaa791c5 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 7 Feb 2014 16:21:49 +0100
+Subject: [PATCH] clk: sunxi: Add support for USB clock-register reset bits
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The usb-clk register is special in that it not only contains clk gate bits,
+but also has a few reset bits. This commit adds support for this by allowing
+gates type sunxi clks to also register a reset controller.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ drivers/clk/sunxi/clk-sunxi.c | 71 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 71 insertions(+)
+
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -18,6 +18,7 @@
+ #include <linux/clkdev.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
++#include <linux/reset-controller.h>
+ 
+ #include "clk-factors.h"
+ 
+@@ -688,6 +689,59 @@ static void __init sunxi_divider_clk_set
+ 
+ 
+ /**
++ * sunxi_gates_reset... - reset bits in leaf gate clk registers handling
++ */
++
++struct gates_reset_data {
++	void __iomem			*reg;
++	spinlock_t			*lock;
++	struct reset_controller_dev	rcdev;
++};
++
++static int sunxi_gates_reset_assert(struct reset_controller_dev *rcdev,
++			      unsigned long id)
++{
++	struct gates_reset_data *data = container_of(rcdev,
++						     struct gates_reset_data,
++						     rcdev);
++	unsigned long flags;
++	u32 reg;
++
++	spin_lock_irqsave(data->lock, flags);
++
++	reg = readl(data->reg);
++	writel(reg & ~BIT(id), data->reg);
++
++	spin_unlock_irqrestore(data->lock, flags);
++
++	return 0;
++}
++
++static int sunxi_gates_reset_deassert(struct reset_controller_dev *rcdev,
++				unsigned long id)
++{
++	struct gates_reset_data *data = container_of(rcdev,
++						     struct gates_reset_data,
++						     rcdev);
++	unsigned long flags;
++	u32 reg;
++
++	spin_lock_irqsave(data->lock, flags);
++
++	reg = readl(data->reg);
++	writel(reg | BIT(id), data->reg);
++
++	spin_unlock_irqrestore(data->lock, flags);
++
++	return 0;
++}
++
++static struct reset_control_ops sunxi_gates_reset_ops = {
++	.assert		= sunxi_gates_reset_assert,
++	.deassert	= sunxi_gates_reset_deassert,
++};
++
++/**
+  * sunxi_gates_clk_setup() - Setup function for leaf gates on clocks
+  */
+ 
+@@ -695,6 +749,7 @@ static void __init sunxi_divider_clk_set
+ 
+ struct gates_data {
+ 	DECLARE_BITMAP(mask, SUNXI_GATES_MAX_SIZE);
++	u32 reset_mask;
+ };
+ 
+ static const struct gates_data sun4i_axi_gates_data __initconst = {
+@@ -765,6 +820,7 @@ static void __init sunxi_gates_clk_setup
+ 					 struct gates_data *data)
+ {
+ 	struct clk_onecell_data *clk_data;
++	struct gates_reset_data *reset_data;
+ 	const char *clk_parent;
+ 	const char *clk_name;
+ 	void *reg;
+@@ -808,6 +864,21 @@ static void __init sunxi_gates_clk_setup
+ 	clk_data->clk_num = i;
+ 
+ 	of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
++
++	/* Register a reset controler for gates with reset bits */
++	if (data->reset_mask == 0)
++		return;
++
++	reset_data = kzalloc(sizeof(*reset_data), GFP_KERNEL);
++	if (!reset_data)
++		return;
++
++	reset_data->reg = reg;
++	reset_data->lock = &clk_lock;
++	reset_data->rcdev.nr_resets = __fls(data->reset_mask) + 1;
++	reset_data->rcdev.ops = &sunxi_gates_reset_ops;
++	reset_data->rcdev.of_node = node;
++	reset_controller_register(&reset_data->rcdev);
+ }
+ 
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch b/trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch
new file mode 100644
index 00000000..777dfde8
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch
@@ -0,0 +1,40 @@
+From 0566b74f93eaf6b2281d2605a63e06e6ba809334 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 3 Feb 2014 09:51:40 +0800
+Subject: [PATCH] clk: sunxi: get divs parent clock name from parent factor
+ clock
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Divs clocks consist of a parent factor clock with multiple outputs,
+and seperate clocks for each output. Get the name of the parent
+clock from the parent factor clock, instead of the DT node name.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Mike Turquette <mturquette@linaro.org>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ drivers/clk/sunxi/clk-sunxi.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -940,7 +940,7 @@ static void __init sunxi_divs_clk_setup(
+ 					struct divs_data *data)
+ {
+ 	struct clk_onecell_data *clk_data;
+-	const char *parent  = node->name;
++	const char *parent;
+ 	const char *clk_name;
+ 	struct clk **clks, *pclk;
+ 	struct clk_hw *gate_hw, *rate_hw;
+@@ -954,6 +954,7 @@ static void __init sunxi_divs_clk_setup(
+ 
+ 	/* Set up factor clock that we will be dividing */
+ 	pclk = sunxi_factors_clk_setup(node, data->factors);
++	parent = __clk_get_name(pclk);
+ 
+ 	reg = of_iomap(node, 0);
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/183-clk-sunxi-add-usb-clockreg-defs.patch b/trunk/target/linux/sunxi/patches-3.14/183-clk-sunxi-add-usb-clockreg-defs.patch
new file mode 100644
index 00000000..c79f8031
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/183-clk-sunxi-add-usb-clockreg-defs.patch
@@ -0,0 +1,69 @@
+From c61dfeb17581d32360a817ba40636aaed85caade Mon Sep 17 00:00:00 2001
+From: Roman Byshko <rbyshko@gmail.com>
+Date: Fri, 7 Feb 2014 16:21:50 +0100
+Subject: [PATCH] clk: sunxi: Add USB clock register defintions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add register definitions for the usb-clk register found on sun4i, sun5i and
+sun7i SoCs.
+
+Signed-off-by: Roman Byshko <rbyshko@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ Documentation/devicetree/bindings/clock/sunxi.txt |  5 +++++
+ drivers/clk/sunxi/clk-sunxi.c                     | 12 ++++++++++++
+ 2 files changed, 17 insertions(+)
+
+--- a/Documentation/devicetree/bindings/clock/sunxi.txt
++++ b/Documentation/devicetree/bindings/clock/sunxi.txt
+@@ -37,6 +37,8 @@ Required properties:
+ 	"allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31
+ 	"allwinner,sun4i-mod0-clk" - for the module 0 family of clocks
+ 	"allwinner,sun7i-a20-out-clk" - for the external output clocks
++	"allwinner,sun4i-a10-usb-clk" - for usb gates + resets on A10 / A20
++	"allwinner,sun5i-a13-usb-clk" - for usb gates + resets on A13
+ 
+ Required properties for all clocks:
+ - reg : shall be the control register address for the clock.
+@@ -49,6 +51,9 @@ Required properties for all clocks:
+ Additionally, "allwinner,*-gates-clk" clocks require:
+ - clock-output-names : the corresponding gate names that the clock controls
+ 
++And "allwinner,*-usb-clk" clocks also require:
++- reset-cells : shall be set to 1
++
+ Clock consumers should specify the desired clocks they use with a
+ "clocks" phandle cell. Consumers that are using a gated clock should
+ provide an additional ID in their clock property. This ID is the
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -816,6 +816,16 @@ static const struct gates_data sun7i_a20
+ 	.mask = { 0xff80ff },
+ };
+ 
++static const struct gates_data sun4i_a10_usb_gates_data __initconst = {
++	.mask = {0x1C0},
++	.reset_mask = 0x07,
++};
++
++static const struct gates_data sun5i_a13_usb_gates_data __initconst = {
++	.mask = {0x140},
++	.reset_mask = 0x03,
++};
++
+ static void __init sunxi_gates_clk_setup(struct device_node *node,
+ 					 struct gates_data *data)
+ {
+@@ -1107,6 +1117,8 @@ static const struct of_device_id clk_gat
+ 	{.compatible = "allwinner,sun6i-a31-apb1-gates-clk", .data = &sun6i_a31_apb1_gates_data,},
+ 	{.compatible = "allwinner,sun7i-a20-apb1-gates-clk", .data = &sun7i_a20_apb1_gates_data,},
+ 	{.compatible = "allwinner,sun6i-a31-apb2-gates-clk", .data = &sun6i_a31_apb2_gates_data,},
++	{.compatible = "allwinner,sun4i-a10-usb-clk", .data = &sun4i_a10_usb_gates_data,},
++	{.compatible = "allwinner,sun5i-a13-usb-clk", .data = &sun5i_a13_usb_gates_data,},
+ 	{}
+ };
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/184-clk-sunxi-add-pll6-on-a31.patch b/trunk/target/linux/sunxi/patches-3.14/184-clk-sunxi-add-pll6-on-a31.patch
new file mode 100644
index 00000000..7193c502
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/184-clk-sunxi-add-pll6-on-a31.patch
@@ -0,0 +1,104 @@
+From c225f78660cd61914f25dd00499c7ae71d1d6919 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Wed, 5 Feb 2014 14:05:03 +0100
+Subject: [PATCH] clk: sunxi: Add support for PLL6 on the A31
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The A31 has a slightly different PLL6 clock. Add support for this new clock in
+our driver.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ Documentation/devicetree/bindings/clock/sunxi.txt |  1 +
+ drivers/clk/sunxi/clk-sunxi.c                     | 45 +++++++++++++++++++++++
+ 2 files changed, 46 insertions(+)
+
+--- a/Documentation/devicetree/bindings/clock/sunxi.txt
++++ b/Documentation/devicetree/bindings/clock/sunxi.txt
+@@ -11,6 +11,7 @@ Required properties:
+ 	"allwinner,sun6i-a31-pll1-clk" - for the main PLL clock on A31
+ 	"allwinner,sun4i-pll5-clk" - for the PLL5 clock
+ 	"allwinner,sun4i-pll6-clk" - for the PLL6 clock
++	"allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31
+ 	"allwinner,sun4i-cpu-clk" - for the CPU multiplexer clock
+ 	"allwinner,sun4i-axi-clk" - for the AXI clock
+ 	"allwinner,sun4i-axi-gates-clk" - for the AXI gates
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -252,7 +252,38 @@ static void sun4i_get_pll5_factors(u32 *
+ 	*n = DIV_ROUND_UP(div, (*k+1));
+ }
+ 
++/**
++ * sun6i_a31_get_pll6_factors() - calculates n, k factors for A31 PLL6
++ * PLL6 rate is calculated as follows
++ * rate = parent_rate * n * (k + 1) / 2
++ * parent_rate is always 24Mhz
++ */
++
++static void sun6i_a31_get_pll6_factors(u32 *freq, u32 parent_rate,
++				       u8 *n, u8 *k, u8 *m, u8 *p)
++{
++	u8 div;
++
++	/*
++	 * We always have 24MHz / 2, so we can just say that our
++	 * parent clock is 12MHz.
++	 */
++	parent_rate = parent_rate / 2;
++
++	/* Normalize value to a parent_rate multiple (24M / 2) */
++	div = *freq / parent_rate;
++	*freq = parent_rate * div;
++
++	/* we were called to round the frequency, we can now return */
++	if (n == NULL)
++		return;
+ 
++	*k = div / 32;
++	if (*k > 3)
++		*k = 3;
++
++	*n = DIV_ROUND_UP(div, (*k+1));
++}
+ 
+ /**
+  * sun4i_get_apb1_factors() - calculates m, p factors for APB1
+@@ -420,6 +451,13 @@ static struct clk_factors_config sun4i_p
+ 	.kwidth = 2,
+ };
+ 
++static struct clk_factors_config sun6i_a31_pll6_config = {
++	.nshift	= 8,
++	.nwidth = 5,
++	.kshift = 4,
++	.kwidth = 2,
++};
++
+ static struct clk_factors_config sun4i_apb1_config = {
+ 	.mshift = 0,
+ 	.mwidth = 5,
+@@ -469,6 +507,12 @@ static const struct factors_data sun4i_p
+ 	.name = "pll6",
+ };
+ 
++static const struct factors_data sun6i_a31_pll6_data __initconst = {
++	.enable = 31,
++	.table = &sun6i_a31_pll6_config,
++	.getter = sun6i_a31_get_pll6_factors,
++};
++
+ static const struct factors_data sun4i_apb1_data __initconst = {
+ 	.table = &sun4i_apb1_config,
+ 	.getter = sun4i_get_apb1_factors,
+@@ -1069,6 +1113,7 @@ free_clkdata:
+ static const struct of_device_id clk_factors_match[] __initconst = {
+ 	{.compatible = "allwinner,sun4i-pll1-clk", .data = &sun4i_pll1_data,},
+ 	{.compatible = "allwinner,sun6i-a31-pll1-clk", .data = &sun6i_a31_pll1_data,},
++	{.compatible = "allwinner,sun6i-a31-pll6-clk", .data = &sun6i_a31_pll6_data,},
+ 	{.compatible = "allwinner,sun4i-apb1-clk", .data = &sun4i_apb1_data,},
+ 	{.compatible = "allwinner,sun4i-mod0-clk", .data = &sun4i_mod0_data,},
+ 	{.compatible = "allwinner,sun7i-a20-out-clk", .data = &sun7i_a20_out_data,},
diff --git a/trunk/target/linux/sunxi/patches-3.14/185-clk-sunxi-add-a20-a31-gmac-clock.patch b/trunk/target/linux/sunxi/patches-3.14/185-clk-sunxi-add-a20-a31-gmac-clock.patch
new file mode 100644
index 00000000..86d63019
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/185-clk-sunxi-add-a20-a31-gmac-clock.patch
@@ -0,0 +1,175 @@
+From dd91dc4b9c55c8fa24738249214274442e2fcbd3 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 10 Feb 2014 18:35:47 +0800
+Subject: [PATCH] clk: sunxi: Add Allwinner A20/A31 GMAC clock unit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Allwinner A20/A31 clock module controls the transmit clock source
+and interface type of the GMAC ethernet controller. Model this as
+a single clock for GMAC drivers to use.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ Documentation/devicetree/bindings/clock/sunxi.txt | 30 +++++++
+ drivers/clk/sunxi/clk-sunxi.c                     | 96 +++++++++++++++++++++++
+ 2 files changed, 126 insertions(+)
+
+--- a/Documentation/devicetree/bindings/clock/sunxi.txt
++++ b/Documentation/devicetree/bindings/clock/sunxi.txt
+@@ -38,6 +38,7 @@ Required properties:
+ 	"allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31
+ 	"allwinner,sun4i-mod0-clk" - for the module 0 family of clocks
+ 	"allwinner,sun7i-a20-out-clk" - for the external output clocks
++	"allwinner,sun7i-a20-gmac-clk" - for the GMAC clock module on A20/A31
+ 	"allwinner,sun4i-a10-usb-clk" - for usb gates + resets on A10 / A20
+ 	"allwinner,sun5i-a13-usb-clk" - for usb gates + resets on A13
+ 
+@@ -55,6 +56,9 @@ Additionally, "allwinner,*-gates-clk" cl
+ And "allwinner,*-usb-clk" clocks also require:
+ - reset-cells : shall be set to 1
+ 
++For "allwinner,sun7i-a20-gmac-clk", the parent clocks shall be fixed rate
++dummy clocks at 25 MHz and 125 MHz, respectively. See example.
++
+ Clock consumers should specify the desired clocks they use with a
+ "clocks" phandle cell. Consumers that are using a gated clock should
+ provide an additional ID in their clock property. This ID is the
+@@ -82,3 +86,29 @@ cpu: cpu@01c20054 {
+ 	reg = <0x01c20054 0x4>;
+ 	clocks = <&osc32k>, <&osc24M>, <&pll1>;
+ };
++
++mii_phy_tx_clk: clk@2 {
++	#clock-cells = <0>;
++	compatible = "fixed-clock";
++	clock-frequency = <25000000>;
++	clock-output-names = "mii_phy_tx";
++};
++
++gmac_int_tx_clk: clk@3 {
++	#clock-cells = <0>;
++	compatible = "fixed-clock";
++	clock-frequency = <125000000>;
++	clock-output-names = "gmac_int_tx";
++};
++
++gmac_clk: clk@01c20164 {
++	#clock-cells = <0>;
++	compatible = "allwinner,sun7i-a20-gmac-clk";
++	reg = <0x01c20164 0x4>;
++	/*
++	 * The first clock must be fixed at 25MHz;
++	 * the second clock must be fixed at 125MHz
++	 */
++	clocks = <&mii_phy_tx_clk>, <&gmac_int_tx_clk>;
++	clock-output-names = "gmac";
++};
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -411,6 +411,102 @@ static void sun7i_a20_get_out_factors(u3
+ 
+ 
+ /**
++ * sun7i_a20_gmac_clk_setup - Setup function for A20/A31 GMAC clock module
++ *
++ * This clock looks something like this
++ *                               ________________________
++ *  MII TX clock from PHY >-----|___________    _________|----> to GMAC core
++ *  GMAC Int. RGMII TX clk >----|___________\__/__gate---|----> to PHY
++ *  Ext. 125MHz RGMII TX clk >--|__divider__/            |
++ *                              |________________________|
++ *
++ * The external 125 MHz reference is optional, i.e. GMAC can use its
++ * internal TX clock just fine. The A31 GMAC clock module does not have
++ * the divider controls for the external reference.
++ *
++ * To keep it simple, let the GMAC use either the MII TX clock for MII mode,
++ * and its internal TX clock for GMII and RGMII modes. The GMAC driver should
++ * select the appropriate source and gate/ungate the output to the PHY.
++ *
++ * Only the GMAC should use this clock. Altering the clock so that it doesn't
++ * match the GMAC's operation parameters will result in the GMAC not being
++ * able to send traffic out. The GMAC driver should set the clock rate and
++ * enable/disable this clock to configure the required state. The clock
++ * driver then responds by auto-reparenting the clock.
++ */
++
++#define SUN7I_A20_GMAC_GPIT	2
++#define SUN7I_A20_GMAC_MASK	0x3
++#define SUN7I_A20_GMAC_PARENTS	2
++
++static void __init sun7i_a20_gmac_clk_setup(struct device_node *node)
++{
++	struct clk *clk;
++	struct clk_mux *mux;
++	struct clk_gate *gate;
++	const char *clk_name = node->name;
++	const char *parents[SUN7I_A20_GMAC_PARENTS];
++	void *reg;
++
++	if (of_property_read_string(node, "clock-output-names", &clk_name))
++		return;
++
++	/* allocate mux and gate clock structs */
++	mux = kzalloc(sizeof(struct clk_mux), GFP_KERNEL);
++	if (!mux)
++		return;
++
++	gate = kzalloc(sizeof(struct clk_gate), GFP_KERNEL);
++	if (!gate)
++		goto free_mux;
++
++	/* gmac clock requires exactly 2 parents */
++	parents[0] = of_clk_get_parent_name(node, 0);
++	parents[1] = of_clk_get_parent_name(node, 1);
++	if (!parents[0] || !parents[1])
++		goto free_gate;
++
++	reg = of_iomap(node, 0);
++	if (!reg)
++		goto free_gate;
++
++	/* set up gate and fixed rate properties */
++	gate->reg = reg;
++	gate->bit_idx = SUN7I_A20_GMAC_GPIT;
++	gate->lock = &clk_lock;
++	mux->reg = reg;
++	mux->mask = SUN7I_A20_GMAC_MASK;
++	mux->flags = CLK_MUX_INDEX_BIT;
++	mux->lock = &clk_lock;
++
++	clk = clk_register_composite(NULL, clk_name,
++			parents, SUN7I_A20_GMAC_PARENTS,
++			&mux->hw, &clk_mux_ops,
++			NULL, NULL,
++			&gate->hw, &clk_gate_ops,
++			0);
++
++	if (IS_ERR(clk))
++		goto iounmap_reg;
++
++	of_clk_add_provider(node, of_clk_src_simple_get, clk);
++	clk_register_clkdev(clk, clk_name, NULL);
++
++	return;
++
++iounmap_reg:
++	iounmap(reg);
++free_gate:
++	kfree(gate);
++free_mux:
++	kfree(mux);
++}
++CLK_OF_DECLARE(sun7i_a20_gmac, "allwinner,sun7i-a20-gmac-clk",
++		sun7i_a20_gmac_clk_setup);
++
++
++
++/**
+  * sunxi_factors_clk_setup() - Setup function for factor clocks
+  */
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/186-clk-sunxi-add-new-clock-compats.patch b/trunk/target/linux/sunxi/patches-3.14/186-clk-sunxi-add-new-clock-compats.patch
new file mode 100644
index 00000000..f842a239
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/186-clk-sunxi-add-new-clock-compats.patch
@@ -0,0 +1,178 @@
+From 45ff9697ed1668e82ca3902b32309e157464e745 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 6 Feb 2014 09:55:57 +0100
+Subject: [PATCH] clk: sunxi: Add new clock compatibles
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Allwinner A10 compatibles were following a slightly different compatible
+patterns than the rest of the SoCs for historical reasons. Add compatibles
+matching the other pattern to the clock driver for consistency, and keep the
+older one for backward compatibility.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ Documentation/devicetree/bindings/clock/sunxi.txt | 36 +++++++++++------------
+ drivers/clk/sunxi/clk-sunxi.c                     | 30 +++++++++----------
+ 2 files changed, 33 insertions(+), 33 deletions(-)
+
+--- a/Documentation/devicetree/bindings/clock/sunxi.txt
++++ b/Documentation/devicetree/bindings/clock/sunxi.txt
+@@ -6,37 +6,37 @@ This binding uses the common clock bindi
+ 
+ Required properties:
+ - compatible : shall be one of the following:
+-	"allwinner,sun4i-osc-clk" - for a gatable oscillator
+-	"allwinner,sun4i-pll1-clk" - for the main PLL clock and PLL4
++	"allwinner,sun4i-a10-osc-clk" - for a gatable oscillator
++	"allwinner,sun4i-a10-pll1-clk" - for the main PLL clock and PLL4
+ 	"allwinner,sun6i-a31-pll1-clk" - for the main PLL clock on A31
+-	"allwinner,sun4i-pll5-clk" - for the PLL5 clock
+-	"allwinner,sun4i-pll6-clk" - for the PLL6 clock
++	"allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock
++	"allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock
+ 	"allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31
+-	"allwinner,sun4i-cpu-clk" - for the CPU multiplexer clock
+-	"allwinner,sun4i-axi-clk" - for the AXI clock
+-	"allwinner,sun4i-axi-gates-clk" - for the AXI gates
+-	"allwinner,sun4i-ahb-clk" - for the AHB clock
+-	"allwinner,sun4i-ahb-gates-clk" - for the AHB gates on A10
++	"allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock
++	"allwinner,sun4i-a10-axi-clk" - for the AXI clock
++	"allwinner,sun4i-a10-axi-gates-clk" - for the AXI gates
++	"allwinner,sun4i-a10-ahb-clk" - for the AHB clock
++	"allwinner,sun4i-a10-ahb-gates-clk" - for the AHB gates on A10
+ 	"allwinner,sun5i-a13-ahb-gates-clk" - for the AHB gates on A13
+ 	"allwinner,sun5i-a10s-ahb-gates-clk" - for the AHB gates on A10s
+ 	"allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20
+ 	"allwinner,sun6i-a31-ahb1-mux-clk" - for the AHB1 multiplexer on A31
+ 	"allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31
+-	"allwinner,sun4i-apb0-clk" - for the APB0 clock
+-	"allwinner,sun4i-apb0-gates-clk" - for the APB0 gates on A10
++	"allwinner,sun4i-a10-apb0-clk" - for the APB0 clock
++	"allwinner,sun4i-a10-apb0-gates-clk" - for the APB0 gates on A10
+ 	"allwinner,sun5i-a13-apb0-gates-clk" - for the APB0 gates on A13
+ 	"allwinner,sun5i-a10s-apb0-gates-clk" - for the APB0 gates on A10s
+ 	"allwinner,sun7i-a20-apb0-gates-clk" - for the APB0 gates on A20
+-	"allwinner,sun4i-apb1-clk" - for the APB1 clock
+-	"allwinner,sun4i-apb1-mux-clk" - for the APB1 clock muxing
+-	"allwinner,sun4i-apb1-gates-clk" - for the APB1 gates on A10
++	"allwinner,sun4i-a10-apb1-clk" - for the APB1 clock
++	"allwinner,sun4i-a10-apb1-mux-clk" - for the APB1 clock muxing
++	"allwinner,sun4i-a10-apb1-gates-clk" - for the APB1 gates on A10
+ 	"allwinner,sun5i-a13-apb1-gates-clk" - for the APB1 gates on A13
+ 	"allwinner,sun5i-a10s-apb1-gates-clk" - for the APB1 gates on A10s
+ 	"allwinner,sun6i-a31-apb1-gates-clk" - for the APB1 gates on A31
+ 	"allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20
+ 	"allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31
+ 	"allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31
+-	"allwinner,sun4i-mod0-clk" - for the module 0 family of clocks
++	"allwinner,sun4i-a10-mod0-clk" - for the module 0 family of clocks
+ 	"allwinner,sun7i-a20-out-clk" - for the external output clocks
+ 	"allwinner,sun7i-a20-gmac-clk" - for the GMAC clock module on A20/A31
+ 	"allwinner,sun4i-a10-usb-clk" - for usb gates + resets on A10 / A20
+@@ -68,21 +68,21 @@ For example:
+ 
+ osc24M: osc24M@01c20050 {
+ 	#clock-cells = <0>;
+-	compatible = "allwinner,sun4i-osc-clk";
++	compatible = "allwinner,sun4i-a10-osc-clk";
+ 	reg = <0x01c20050 0x4>;
+ 	clocks = <&osc24M_fixed>;
+ };
+ 
+ pll1: pll1@01c20000 {
+ 	#clock-cells = <0>;
+-	compatible = "allwinner,sun4i-pll1-clk";
++	compatible = "allwinner,sun4i-a10-pll1-clk";
+ 	reg = <0x01c20000 0x4>;
+ 	clocks = <&osc24M>;
+ };
+ 
+ cpu: cpu@01c20054 {
+ 	#clock-cells = <0>;
+-	compatible = "allwinner,sun4i-cpu-clk";
++	compatible = "allwinner,sun4i-a10-cpu-clk";
+ 	reg = <0x01c20054 0x4>;
+ 	clocks = <&osc32k>, <&osc24M>, <&pll1>;
+ };
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -80,7 +80,7 @@ err_free_gate:
+ err_free_fixed:
+ 	kfree(fixed);
+ }
+-CLK_OF_DECLARE(sun4i_osc, "allwinner,sun4i-osc-clk", sun4i_osc_clk_setup);
++CLK_OF_DECLARE(sun4i_osc, "allwinner,sun4i-a10-osc-clk", sun4i_osc_clk_setup);
+ 
+ 
+ 
+@@ -1207,52 +1207,52 @@ free_clkdata:
+ 
+ /* Matches for factors clocks */
+ static const struct of_device_id clk_factors_match[] __initconst = {
+-	{.compatible = "allwinner,sun4i-pll1-clk", .data = &sun4i_pll1_data,},
++	{.compatible = "allwinner,sun4i-a10-pll1-clk", .data = &sun4i_pll1_data,},
+ 	{.compatible = "allwinner,sun6i-a31-pll1-clk", .data = &sun6i_a31_pll1_data,},
+ 	{.compatible = "allwinner,sun6i-a31-pll6-clk", .data = &sun6i_a31_pll6_data,},
+-	{.compatible = "allwinner,sun4i-apb1-clk", .data = &sun4i_apb1_data,},
+-	{.compatible = "allwinner,sun4i-mod0-clk", .data = &sun4i_mod0_data,},
++	{.compatible = "allwinner,sun4i-a10-apb1-clk", .data = &sun4i_apb1_data,},
++	{.compatible = "allwinner,sun4i-a10-mod0-clk", .data = &sun4i_mod0_data,},
+ 	{.compatible = "allwinner,sun7i-a20-out-clk", .data = &sun7i_a20_out_data,},
+ 	{}
+ };
+ 
+ /* Matches for divider clocks */
+ static const struct of_device_id clk_div_match[] __initconst = {
+-	{.compatible = "allwinner,sun4i-axi-clk", .data = &sun4i_axi_data,},
+-	{.compatible = "allwinner,sun4i-ahb-clk", .data = &sun4i_ahb_data,},
+-	{.compatible = "allwinner,sun4i-apb0-clk", .data = &sun4i_apb0_data,},
++	{.compatible = "allwinner,sun4i-a10-axi-clk", .data = &sun4i_axi_data,},
++	{.compatible = "allwinner,sun4i-a10-ahb-clk", .data = &sun4i_ahb_data,},
++	{.compatible = "allwinner,sun4i-a10-apb0-clk", .data = &sun4i_apb0_data,},
+ 	{.compatible = "allwinner,sun6i-a31-apb2-div-clk", .data = &sun6i_a31_apb2_div_data,},
+ 	{}
+ };
+ 
+ /* Matches for divided outputs */
+ static const struct of_device_id clk_divs_match[] __initconst = {
+-	{.compatible = "allwinner,sun4i-pll5-clk", .data = &pll5_divs_data,},
+-	{.compatible = "allwinner,sun4i-pll6-clk", .data = &pll6_divs_data,},
++	{.compatible = "allwinner,sun4i-a10-pll5-clk", .data = &pll5_divs_data,},
++	{.compatible = "allwinner,sun4i-a10-pll6-clk", .data = &pll6_divs_data,},
+ 	{}
+ };
+ 
+ /* Matches for mux clocks */
+ static const struct of_device_id clk_mux_match[] __initconst = {
+-	{.compatible = "allwinner,sun4i-cpu-clk", .data = &sun4i_cpu_mux_data,},
+-	{.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &sun4i_apb1_mux_data,},
++	{.compatible = "allwinner,sun4i-a10-cpu-clk", .data = &sun4i_cpu_mux_data,},
++	{.compatible = "allwinner,sun4i-a10-apb1-mux-clk", .data = &sun4i_apb1_mux_data,},
+ 	{.compatible = "allwinner,sun6i-a31-ahb1-mux-clk", .data = &sun6i_a31_ahb1_mux_data,},
+ 	{}
+ };
+ 
+ /* Matches for gate clocks */
+ static const struct of_device_id clk_gates_match[] __initconst = {
+-	{.compatible = "allwinner,sun4i-axi-gates-clk", .data = &sun4i_axi_gates_data,},
+-	{.compatible = "allwinner,sun4i-ahb-gates-clk", .data = &sun4i_ahb_gates_data,},
++	{.compatible = "allwinner,sun4i-a10-axi-gates-clk", .data = &sun4i_axi_gates_data,},
++	{.compatible = "allwinner,sun4i-a10-ahb-gates-clk", .data = &sun4i_ahb_gates_data,},
+ 	{.compatible = "allwinner,sun5i-a10s-ahb-gates-clk", .data = &sun5i_a10s_ahb_gates_data,},
+ 	{.compatible = "allwinner,sun5i-a13-ahb-gates-clk", .data = &sun5i_a13_ahb_gates_data,},
+ 	{.compatible = "allwinner,sun6i-a31-ahb1-gates-clk", .data = &sun6i_a31_ahb1_gates_data,},
+ 	{.compatible = "allwinner,sun7i-a20-ahb-gates-clk", .data = &sun7i_a20_ahb_gates_data,},
+-	{.compatible = "allwinner,sun4i-apb0-gates-clk", .data = &sun4i_apb0_gates_data,},
++	{.compatible = "allwinner,sun4i-a10-apb0-gates-clk", .data = &sun4i_apb0_gates_data,},
+ 	{.compatible = "allwinner,sun5i-a10s-apb0-gates-clk", .data = &sun5i_a10s_apb0_gates_data,},
+ 	{.compatible = "allwinner,sun5i-a13-apb0-gates-clk", .data = &sun5i_a13_apb0_gates_data,},
+ 	{.compatible = "allwinner,sun7i-a20-apb0-gates-clk", .data = &sun7i_a20_apb0_gates_data,},
+-	{.compatible = "allwinner,sun4i-apb1-gates-clk", .data = &sun4i_apb1_gates_data,},
++	{.compatible = "allwinner,sun4i-a10-apb1-gates-clk", .data = &sun4i_apb1_gates_data,},
+ 	{.compatible = "allwinner,sun5i-a10s-apb1-gates-clk", .data = &sun5i_a10s_apb1_gates_data,},
+ 	{.compatible = "allwinner,sun5i-a13-apb1-gates-clk", .data = &sun5i_a13_apb1_gates_data,},
+ 	{.compatible = "allwinner,sun6i-a31-apb1-gates-clk", .data = &sun6i_a31_apb1_gates_data,},
diff --git a/trunk/target/linux/sunxi/patches-3.14/187-clk-sunxi-automatic-reparenting.patch b/trunk/target/linux/sunxi/patches-3.14/187-clk-sunxi-automatic-reparenting.patch
new file mode 100644
index 00000000..2cd8a263
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/187-clk-sunxi-automatic-reparenting.patch
@@ -0,0 +1,68 @@
+From b416520f239aeaa4207ebe84c22247cff2da444f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar>
+Date: Thu, 5 Sep 2013 19:52:41 -0300
+Subject: [PATCH] clk: sunxi: factors: automatic reparenting support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit implements .determine_rate, so that our factor clocks can be
+reparented when needed.
+
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+---
+ drivers/clk/sunxi/clk-factors.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+--- a/drivers/clk/sunxi/clk-factors.c
++++ b/drivers/clk/sunxi/clk-factors.c
+@@ -77,6 +77,41 @@ static long clk_factors_round_rate(struc
+ 	return rate;
+ }
+ 
++static long clk_factors_determine_rate(struct clk_hw *hw, unsigned long rate,
++				       unsigned long *best_parent_rate,
++				       struct clk **best_parent_p)
++{
++	struct clk *clk = hw->clk, *parent, *best_parent = NULL;
++	int i, num_parents;
++	unsigned long parent_rate, best = 0, child_rate, best_child_rate = 0;
++
++	/* find the parent that can help provide the fastest rate <= rate */
++	num_parents = __clk_get_num_parents(clk);
++	for (i = 0; i < num_parents; i++) {
++		parent = clk_get_parent_by_index(clk, i);
++		if (!parent)
++			continue;
++		if (__clk_get_flags(clk) & CLK_SET_RATE_PARENT)
++			parent_rate = __clk_round_rate(parent, rate);
++		else
++			parent_rate = __clk_get_rate(parent);
++
++		child_rate = clk_factors_round_rate(hw, rate, &parent_rate);
++
++		if (child_rate <= rate && child_rate > best_child_rate) {
++			best_parent = parent;
++			best = parent_rate;
++			best_child_rate = child_rate;
++		}
++	}
++
++	if (best_parent)
++		*best_parent_p = best_parent;
++	*best_parent_rate = best;
++
++	return best_child_rate;
++}
++
+ static int clk_factors_set_rate(struct clk_hw *hw, unsigned long rate,
+ 				unsigned long parent_rate)
+ {
+@@ -113,6 +148,7 @@ static int clk_factors_set_rate(struct c
+ }
+ 
+ const struct clk_ops clk_factors_ops = {
++	.determine_rate = clk_factors_determine_rate,
+ 	.recalc_rate = clk_factors_recalc_rate,
+ 	.round_rate = clk_factors_round_rate,
+ 	.set_rate = clk_factors_set_rate,
diff --git a/trunk/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch b/trunk/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch
new file mode 100644
index 00000000..c191b350
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/188-clk-sunxi-implement-mmc-phasectrl.patch
@@ -0,0 +1,87 @@
+From 36268d704307282109ec246f65cac2a42c825629 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar>
+Date: Fri, 20 Sep 2013 20:29:17 -0300
+Subject: [PATCH] clk: sunxi: Implement MMC phase control
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+HdG: add header exporting clk_sunxi_mmc_phase_control
+
+Signed-off-by: Emilio López <emilio@elopez.com.ar>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/clk/sunxi/clk-sunxi.c | 35 +++++++++++++++++++++++++++++++++++
+ include/linux/clk/sunxi.h     | 22 ++++++++++++++++++++++
+ 2 files changed, 57 insertions(+)
+ create mode 100644 include/linux/clk/sunxi.h
+
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -507,6 +507,41 @@ CLK_OF_DECLARE(sun7i_a20_gmac, "allwinne
+ 
+ 
+ /**
++ * clk_sunxi_mmc_phase_control() - configures MMC clock phase control
++ */
++
++void clk_sunxi_mmc_phase_control(struct clk_hw *hw, u8 sample, u8 output)
++{
++	#define to_clk_composite(_hw) container_of(_hw, struct clk_composite, hw)
++	#define to_clk_factors(_hw) container_of(_hw, struct clk_factors, hw)
++
++	struct clk_composite *composite = to_clk_composite(hw);
++	struct clk_hw *rate_hw = composite->rate_hw;
++	struct clk_factors *factors = to_clk_factors(rate_hw);
++	unsigned long flags = 0;
++	u32 reg;
++
++	if (factors->lock)
++		spin_lock_irqsave(factors->lock, flags);
++
++	reg = readl(factors->reg);
++
++	/* set sample clock phase control */
++	reg &= ~(0x7 << 20);
++	reg |= ((sample & 0x7) << 20);
++
++	/* set output clock phase control */
++	reg &= ~(0x7 << 8);
++	reg |= ((output & 0x7) << 8);
++
++	writel(reg, factors->reg);
++
++	if (factors->lock)
++		spin_unlock_irqrestore(factors->lock, flags);
++}
++
++
++/**
+  * sunxi_factors_clk_setup() - Setup function for factor clocks
+  */
+ 
+--- /dev/null
++++ b/include/linux/clk/sunxi.h
+@@ -0,0 +1,22 @@
++/*
++ * Copyright 2013 - Hans de Goede <hdegoede@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++#ifndef __LINUX_CLK_SUNXI_H_
++#define __LINUX_CLK_SUNXI_H_
++
++#include <linux/clk.h>
++
++void clk_sunxi_mmc_phase_control(struct clk_hw *hw, u8 sample, u8 output);
++
++#endif
diff --git a/trunk/target/linux/sunxi/patches-3.14/190-ahci-libahci-changes.patch b/trunk/target/linux/sunxi/patches-3.14/190-ahci-libahci-changes.patch
new file mode 100644
index 00000000..c4d918d5
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/190-ahci-libahci-changes.patch
@@ -0,0 +1,872 @@
+From 3b5db9d024f173c30ef4060c31bb8e9fbd194cc1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 2 Dec 2013 16:13:32 +0100
+Subject: [PATCH] libahci: Allow drivers to override start_engine
+
+Allwinner A10 and A20 ARM SoCs have an AHCI sata controller which needs a
+special register to be poked before starting the DMA engine.
+
+This register gets reset on an ahci_stop_engine call, so there is no other
+place then ahci_start_engine where this poking can be done.
+
+This commit allows drivers to override ahci_start_engine behavior for use by
+the Allwinner AHCI driver (and potentially other drivers in the future).
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/ata/ahci.c          |  6 ++++--
+ drivers/ata/ahci.h          |  6 ++++++
+ drivers/ata/libahci.c       | 26 +++++++++++++++++++-------
+ drivers/ata/sata_highbank.c |  3 ++-
+ 4 files changed, 31 insertions(+), 10 deletions(-)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -606,6 +606,7 @@ static int ahci_vt8251_hardreset(struct 
+ 				 unsigned long deadline)
+ {
+ 	struct ata_port *ap = link->ap;
++	struct ahci_host_priv *hpriv = ap->host->private_data;
+ 	bool online;
+ 	int rc;
+ 
+@@ -616,7 +617,7 @@ static int ahci_vt8251_hardreset(struct 
+ 	rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),
+ 				 deadline, &online, NULL);
+ 
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ 
+ 	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
+ 
+@@ -631,6 +632,7 @@ static int ahci_p5wdh_hardreset(struct a
+ {
+ 	struct ata_port *ap = link->ap;
+ 	struct ahci_port_priv *pp = ap->private_data;
++	struct ahci_host_priv *hpriv = ap->host->private_data;
+ 	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
+ 	struct ata_taskfile tf;
+ 	bool online;
+@@ -646,7 +648,7 @@ static int ahci_p5wdh_hardreset(struct a
+ 	rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),
+ 				 deadline, &online, NULL);
+ 
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ 
+ 	/* The pseudo configuration device on SIMG4726 attached to
+ 	 * ASUS P5W-DH Deluxe doesn't send signature FIS after
+--- a/drivers/ata/ahci.h
++++ b/drivers/ata/ahci.h
+@@ -37,6 +37,7 @@
+ 
+ #include <linux/clk.h>
+ #include <linux/libata.h>
++#include <linux/regulator/consumer.h>
+ 
+ /* Enclosure Management Control */
+ #define EM_CTRL_MSG_TYPE              0x000f0000
+@@ -51,6 +52,7 @@
+ 
+ enum {
+ 	AHCI_MAX_PORTS		= 32,
++	AHCI_MAX_CLKS		= 3,
+ 	AHCI_MAX_SG		= 168, /* hardware max is 64K */
+ 	AHCI_DMA_BOUNDARY	= 0xffffffff,
+ 	AHCI_MAX_CMDS		= 32,
+@@ -322,8 +324,15 @@ struct ahci_host_priv {
+ 	u32 			em_loc; /* enclosure management location */
+ 	u32			em_buf_sz;	/* EM buffer size in byte */
+ 	u32			em_msg_type;	/* EM message type */
+-	struct clk		*clk;		/* Only for platforms supporting clk */
++	struct clk		*clks[AHCI_MAX_CLKS]; /* Optional */
++	struct regulator	*target_pwr;	/* Optional */
+ 	void			*plat_data;	/* Other platform data */
++	/*
++	 * Optional ahci_start_engine override, if not set this gets set to the
++	 * default ahci_start_engine during ahci_save_initial_config, this can
++	 * be overridden anytime before the host is activated.
++	 */
++	void			(*start_engine)(struct ata_port *ap);
+ };
+ 
+ extern int ahci_ignore_sss;
+--- a/drivers/ata/libahci.c
++++ b/drivers/ata/libahci.c
+@@ -394,6 +394,9 @@ static ssize_t ahci_show_em_supported(st
+  *
+  *	If inconsistent, config values are fixed up by this function.
+  *
++ *	If it is not set already this function sets hpriv->start_engine to
++ *	ahci_start_engine.
++ *
+  *	LOCKING:
+  *	None.
+  */
+@@ -500,6 +503,9 @@ void ahci_save_initial_config(struct dev
+ 	hpriv->cap = cap;
+ 	hpriv->cap2 = cap2;
+ 	hpriv->port_map = port_map;
++
++	if (!hpriv->start_engine)
++		hpriv->start_engine = ahci_start_engine;
+ }
+ EXPORT_SYMBOL_GPL(ahci_save_initial_config);
+ 
+@@ -766,7 +772,7 @@ static void ahci_start_port(struct ata_p
+ 
+ 	/* enable DMA */
+ 	if (!(hpriv->flags & AHCI_HFLAG_DELAY_ENGINE))
+-		ahci_start_engine(ap);
++		hpriv->start_engine(ap);
+ 
+ 	/* turn on LEDs */
+ 	if (ap->flags & ATA_FLAG_EM) {
+@@ -1234,7 +1240,7 @@ int ahci_kick_engine(struct ata_port *ap
+ 
+ 	/* restart engine */
+  out_restart:
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ 	return rc;
+ }
+ EXPORT_SYMBOL_GPL(ahci_kick_engine);
+@@ -1426,6 +1432,7 @@ static int ahci_hardreset(struct ata_lin
+ 	const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);
+ 	struct ata_port *ap = link->ap;
+ 	struct ahci_port_priv *pp = ap->private_data;
++	struct ahci_host_priv *hpriv = ap->host->private_data;
+ 	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
+ 	struct ata_taskfile tf;
+ 	bool online;
+@@ -1443,7 +1450,7 @@ static int ahci_hardreset(struct ata_lin
+ 	rc = sata_link_hardreset(link, timing, deadline, &online,
+ 				 ahci_check_ready);
+ 
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ 
+ 	if (online)
+ 		*class = ahci_dev_classify(ap);
+@@ -2007,10 +2014,12 @@ static void ahci_thaw(struct ata_port *a
+ 
+ void ahci_error_handler(struct ata_port *ap)
+ {
++	struct ahci_host_priv *hpriv = ap->host->private_data;
++
+ 	if (!(ap->pflags & ATA_PFLAG_FROZEN)) {
+ 		/* restart engine */
+ 		ahci_stop_engine(ap);
+-		ahci_start_engine(ap);
++		hpriv->start_engine(ap);
+ 	}
+ 
+ 	sata_pmp_error_handler(ap);
+@@ -2031,6 +2040,7 @@ static void ahci_post_internal_cmd(struc
+ 
+ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)
+ {
++	struct ahci_host_priv *hpriv = ap->host->private_data;
+ 	void __iomem *port_mmio = ahci_port_base(ap);
+ 	struct ata_device *dev = ap->link.device;
+ 	u32 devslp, dm, dito, mdat, deto;
+@@ -2094,7 +2104,7 @@ static void ahci_set_aggressive_devslp(s
+ 		   PORT_DEVSLP_ADSE);
+ 	writel(devslp, port_mmio + PORT_DEVSLP);
+ 
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ 
+ 	/* enable device sleep feature for the drive */
+ 	err_mask = ata_dev_set_feature(dev,
+@@ -2106,6 +2116,7 @@ static void ahci_set_aggressive_devslp(s
+ 
+ static void ahci_enable_fbs(struct ata_port *ap)
+ {
++	struct ahci_host_priv *hpriv = ap->host->private_data;
+ 	struct ahci_port_priv *pp = ap->private_data;
+ 	void __iomem *port_mmio = ahci_port_base(ap);
+ 	u32 fbs;
+@@ -2134,11 +2145,12 @@ static void ahci_enable_fbs(struct ata_p
+ 	} else
+ 		dev_err(ap->host->dev, "Failed to enable FBS\n");
+ 
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ }
+ 
+ static void ahci_disable_fbs(struct ata_port *ap)
+ {
++	struct ahci_host_priv *hpriv = ap->host->private_data;
+ 	struct ahci_port_priv *pp = ap->private_data;
+ 	void __iomem *port_mmio = ahci_port_base(ap);
+ 	u32 fbs;
+@@ -2166,7 +2178,7 @@ static void ahci_disable_fbs(struct ata_
+ 		pp->fbs_enabled = false;
+ 	}
+ 
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ }
+ 
+ static void ahci_pmp_attach(struct ata_port *ap)
+--- a/drivers/ata/sata_highbank.c
++++ b/drivers/ata/sata_highbank.c
+@@ -403,6 +403,7 @@ static int ahci_highbank_hardreset(struc
+ 	static const unsigned long timing[] = { 5, 100, 500};
+ 	struct ata_port *ap = link->ap;
+ 	struct ahci_port_priv *pp = ap->private_data;
++	struct ahci_host_priv *hpriv = ap->host->private_data;
+ 	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
+ 	struct ata_taskfile tf;
+ 	bool online;
+@@ -431,7 +432,7 @@ static int ahci_highbank_hardreset(struc
+ 			break;
+ 	} while (!online && retry--);
+ 
+-	ahci_start_engine(ap);
++	hpriv->start_engine(ap);
+ 
+ 	if (online)
+ 		*class = ahci_dev_classify(ap);
+--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
++++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
+@@ -10,6 +10,8 @@ Required properties:
+ 
+ Optional properties:
+ - dma-coherent      : Present if dma operations are coherent
++- clocks            : a list of phandle + clock specifier pairs
++- target-supply     : regulator for SATA target power
+ 
+ Example:
+         sata@ffe08000 {
+--- a/drivers/ata/ahci_platform.c
++++ b/drivers/ata/ahci_platform.c
+@@ -87,78 +87,252 @@ static struct scsi_host_template ahci_pl
+ 	AHCI_SHT("ahci_platform"),
+ };
+ 
+-static int ahci_probe(struct platform_device *pdev)
++/**
++ *	ahci_platform_enable_clks - Enable platform clocks
++ *	@hpriv: host private area to store config values
++ *
++ *	This function enables all the clks found in hpriv->clks, starting
++ *	at index 0. If any clk fails to enable it disables all the clks
++ *	already enabled in reverse order, and then returns an error.
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	0 on success otherwise a negative error code
++ */
++int ahci_platform_enable_clks(struct ahci_host_priv *hpriv)
+ {
+-	struct device *dev = &pdev->dev;
+-	struct ahci_platform_data *pdata = dev_get_platdata(dev);
+-	const struct platform_device_id *id = platform_get_device_id(pdev);
+-	struct ata_port_info pi = ahci_port_info[id ? id->driver_data : 0];
+-	const struct ata_port_info *ppi[] = { &pi, NULL };
+-	struct ahci_host_priv *hpriv;
+-	struct ata_host *host;
+-	struct resource *mem;
+-	int irq;
+-	int n_ports;
+-	int i;
+-	int rc;
++	int c, rc;
+ 
+-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+-	if (!mem) {
+-		dev_err(dev, "no mmio space\n");
+-		return -EINVAL;
++	for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++) {
++		rc = clk_prepare_enable(hpriv->clks[c]);
++		if (rc)
++			goto disable_unprepare_clk;
+ 	}
++	return 0;
+ 
+-	irq = platform_get_irq(pdev, 0);
+-	if (irq <= 0) {
+-		dev_err(dev, "no irq\n");
+-		return -EINVAL;
+-	}
++disable_unprepare_clk:
++	while (--c >= 0)
++		clk_disable_unprepare(hpriv->clks[c]);
++	return rc;
++}
++EXPORT_SYMBOL_GPL(ahci_platform_enable_clks);
+ 
+-	if (pdata && pdata->ata_port_info)
+-		pi = *pdata->ata_port_info;
++/**
++ *	ahci_platform_disable_clks - Disable platform clocks
++ *	@hpriv: host private area to store config values
++ *
++ *	This function disables all the clks found in hpriv->clks, in reverse
++ *	order of ahci_platform_enable_clks (starting at the end of the array).
++ *
++ *	LOCKING:
++ *	None.
++ */
++void ahci_platform_disable_clks(struct ahci_host_priv *hpriv)
++{
++	int c;
+ 
+-	hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
+-	if (!hpriv) {
+-		dev_err(dev, "can't alloc ahci_host_priv\n");
+-		return -ENOMEM;
++	for (c = AHCI_MAX_CLKS - 1; c >= 0; c--)
++		if (hpriv->clks[c])
++			clk_disable_unprepare(hpriv->clks[c]);
++}
++EXPORT_SYMBOL_GPL(ahci_platform_disable_clks);
++
++/**
++ *	ahci_platform_enable_resources - Enable platform resources
++ *	@hpriv: host private area to store config values
++ *
++ *	This function enables all ahci_platform managed resources in
++ *	the following order:
++ *	1) Regulator
++ *	2) Clocks (through ahci_platform_enable_clks)
++ *
++ *	If resource enabling fails at any point the previous enabled
++ *	resources are disabled in reverse order.
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	0 on success otherwise a negative error code
++ */
++int ahci_platform_enable_resources(struct ahci_host_priv *hpriv)
++{
++	int rc;
++
++	if (hpriv->target_pwr) {
++		rc = regulator_enable(hpriv->target_pwr);
++		if (rc)
++			return rc;
+ 	}
+ 
+-	hpriv->flags |= (unsigned long)pi.private_data;
++	rc = ahci_platform_enable_clks(hpriv);
++	if (rc)
++		goto disable_regulator;
++
++	return 0;
++
++disable_regulator:
++	if (hpriv->target_pwr)
++		regulator_disable(hpriv->target_pwr);
++	return rc;
++}
++EXPORT_SYMBOL_GPL(ahci_platform_enable_resources);
++
++/**
++ *	ahci_platform_disable_resources - Disable platform resources
++ *	@hpriv: host private area to store config values
++ *
++ *	This function disables all ahci_platform managed resources in
++ *	the following order:
++ *	1) Clocks (through ahci_platform_disable_clks)
++ *	2) Regulator
++ *
++ *	LOCKING:
++ *	None.
++ */
++void ahci_platform_disable_resources(struct ahci_host_priv *hpriv)
++{
++	ahci_platform_disable_clks(hpriv);
+ 
+-	hpriv->mmio = devm_ioremap(dev, mem->start, resource_size(mem));
++	if (hpriv->target_pwr)
++		regulator_disable(hpriv->target_pwr);
++}
++EXPORT_SYMBOL_GPL(ahci_platform_disable_resources);
++
++static void ahci_platform_put_resources(struct device *dev, void *res)
++{
++	struct ahci_host_priv *hpriv = res;
++	int c;
++
++	for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++)
++		clk_put(hpriv->clks[c]);
++}
++
++/**
++ *	ahci_platform_get_resources - Get platform resources
++ *	@pdev: platform device to get resources for
++ *
++ *	This function allocates an ahci_host_priv struct, and gets the
++ *	following resources, storing a reference to them inside the returned
++ *	struct:
++ *
++ *	1) mmio registers (IORESOURCE_MEM 0, mandatory)
++ *	2) regulator for controlling the targets power (optional)
++ *	3) 0 - AHCI_MAX_CLKS clocks, as specified in the devs devicetree node,
++ *	   or for non devicetree enabled platforms a single clock
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	The allocated ahci_host_priv on success, otherwise an ERR_PTR value
++ */
++struct ahci_host_priv *ahci_platform_get_resources(
++	struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct ahci_host_priv *hpriv;
++	struct clk *clk;
++	int i, rc = -ENOMEM;
++
++	if (!devres_open_group(dev, NULL, GFP_KERNEL))
++		return ERR_PTR(-ENOMEM);
++
++	hpriv = devres_alloc(ahci_platform_put_resources, sizeof(*hpriv),
++			     GFP_KERNEL);
++	if (!hpriv)
++		goto err_out;
++
++	devres_add(dev, hpriv);
++
++	hpriv->mmio = devm_ioremap_resource(dev,
++			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
+ 	if (!hpriv->mmio) {
+-		dev_err(dev, "can't map %pR\n", mem);
+-		return -ENOMEM;
++		dev_err(dev, "no mmio space\n");
++		goto err_out;
+ 	}
+ 
+-	hpriv->clk = clk_get(dev, NULL);
+-	if (IS_ERR(hpriv->clk)) {
+-		dev_err(dev, "can't get clock\n");
+-	} else {
+-		rc = clk_prepare_enable(hpriv->clk);
+-		if (rc) {
+-			dev_err(dev, "clock prepare enable failed");
+-			goto free_clk;
++	hpriv->target_pwr = devm_regulator_get_optional(dev, "target");
++	if (IS_ERR(hpriv->target_pwr)) {
++		rc = PTR_ERR(hpriv->target_pwr);
++		if (rc == -EPROBE_DEFER)
++			goto err_out;
++		hpriv->target_pwr = NULL;
++	}
++
++	for (i = 0; i < AHCI_MAX_CLKS; i++) {
++		/*
++		 * For now we must use clk_get(dev, NULL) for the first clock,
++		 * because some platforms (da850, spear13xx) are not yet
++		 * converted to use devicetree for clocks.  For new platforms
++		 * this is equivalent to of_clk_get(dev->of_node, 0).
++		 */
++		if (i == 0)
++			clk = clk_get(dev, NULL);
++		else
++			clk = of_clk_get(dev->of_node, i);
++
++		if (IS_ERR(clk)) {
++			rc = PTR_ERR(clk);
++			if (rc == -EPROBE_DEFER)
++				goto err_out;
++			break;
+ 		}
++		hpriv->clks[i] = clk;
+ 	}
+ 
+-	/*
+-	 * Some platforms might need to prepare for mmio region access,
+-	 * which could be done in the following init call. So, the mmio
+-	 * region shouldn't be accessed before init (if provided) has
+-	 * returned successfully.
+-	 */
+-	if (pdata && pdata->init) {
+-		rc = pdata->init(dev, hpriv->mmio);
+-		if (rc)
+-			goto disable_unprepare_clk;
+-	}
++	devres_remove_group(dev, NULL);
++	return hpriv;
++
++err_out:
++	devres_release_group(dev, NULL);
++	return ERR_PTR(rc);
++}
++EXPORT_SYMBOL_GPL(ahci_platform_get_resources);
++
++/**
++ *	ahci_platform_init_host - Bring up an ahci-platform host
++ *	@pdev: platform device pointer for the host
++ *	@hpriv: ahci-host private data for the host
++ *	@pi_template: template for the ata_port_info to use
++ *	@force_port_map: param passed to ahci_save_initial_config
++ *	@mask_port_map: param passed to ahci_save_initial_config
++ *
++ *	This function does all the usual steps needed to bring up an
++ *	ahci-platform host, note any necessary resources (ie clks, phy, etc.)
++ *	must be initialized / enabled before calling this.
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	0 on success otherwise a negative error code
++ */
++int ahci_platform_init_host(struct platform_device *pdev,
++			    struct ahci_host_priv *hpriv,
++			    const struct ata_port_info *pi_template,
++			    unsigned int force_port_map,
++			    unsigned int mask_port_map)
++{
++	struct device *dev = &pdev->dev;
++	struct ata_port_info pi = *pi_template;
++	const struct ata_port_info *ppi[] = { &pi, NULL };
++	struct ata_host *host;
++	int i, irq, n_ports, rc;
+ 
+-	ahci_save_initial_config(dev, hpriv,
+-		pdata ? pdata->force_port_map : 0,
+-		pdata ? pdata->mask_port_map  : 0);
++	irq = platform_get_irq(pdev, 0);
++	if (irq <= 0) {
++		dev_err(dev, "no irq\n");
++		return -EINVAL;
++	}
+ 
+ 	/* prepare host */
++	hpriv->flags |= (unsigned long)pi.private_data;
++
++	ahci_save_initial_config(dev, hpriv, force_port_map, mask_port_map);
++
+ 	if (hpriv->cap & HOST_CAP_NCQ)
+ 		pi.flags |= ATA_FLAG_NCQ;
+ 
+@@ -175,10 +349,8 @@ static int ahci_probe(struct platform_de
+ 	n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map));
+ 
+ 	host = ata_host_alloc_pinfo(dev, ppi, n_ports);
+-	if (!host) {
+-		rc = -ENOMEM;
+-		goto pdata_exit;
+-	}
++	if (!host)
++		return -ENOMEM;
+ 
+ 	host->private_data = hpriv;
+ 
+@@ -193,7 +365,8 @@ static int ahci_probe(struct platform_de
+ 	for (i = 0; i < host->n_ports; i++) {
+ 		struct ata_port *ap = host->ports[i];
+ 
+-		ata_port_desc(ap, "mmio %pR", mem);
++		ata_port_desc(ap, "mmio %pR",
++			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
+ 		ata_port_desc(ap, "port 0x%x", 0x100 + ap->port_no * 0x80);
+ 
+ 		/* set enclosure management message type */
+@@ -207,13 +380,53 @@ static int ahci_probe(struct platform_de
+ 
+ 	rc = ahci_reset_controller(host);
+ 	if (rc)
+-		goto pdata_exit;
++		return rc;
+ 
+ 	ahci_init_controller(host);
+ 	ahci_print_info(host, "platform");
+ 
+-	rc = ata_host_activate(host, irq, ahci_interrupt, IRQF_SHARED,
+-			       &ahci_platform_sht);
++	return ata_host_activate(host, irq, ahci_interrupt, IRQF_SHARED,
++				 &ahci_platform_sht);
++}
++EXPORT_SYMBOL_GPL(ahci_platform_init_host);
++
++static int ahci_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct ahci_platform_data *pdata = dev_get_platdata(dev);
++	const struct platform_device_id *id = platform_get_device_id(pdev);
++	const struct ata_port_info *pi_template;
++	struct ahci_host_priv *hpriv;
++	int rc;
++
++	hpriv = ahci_platform_get_resources(pdev);
++	if (IS_ERR(hpriv))
++		return PTR_ERR(hpriv);
++
++	rc = ahci_platform_enable_resources(hpriv);
++	if (rc)
++		return rc;
++
++	/*
++	 * Some platforms might need to prepare for mmio region access,
++	 * which could be done in the following init call. So, the mmio
++	 * region shouldn't be accessed before init (if provided) has
++	 * returned successfully.
++	 */
++	if (pdata && pdata->init) {
++		rc = pdata->init(dev, hpriv->mmio);
++		if (rc)
++			goto disable_resources;
++	}
++
++	if (pdata && pdata->ata_port_info)
++		pi_template = pdata->ata_port_info;
++	else
++		pi_template = &ahci_port_info[id ? id->driver_data : 0];
++
++	rc = ahci_platform_init_host(pdev, hpriv, pi_template,
++				     pdata ? pdata->force_port_map : 0,
++				     pdata ? pdata->mask_port_map  : 0);
+ 	if (rc)
+ 		goto pdata_exit;
+ 
+@@ -221,12 +434,8 @@ static int ahci_probe(struct platform_de
+ pdata_exit:
+ 	if (pdata && pdata->exit)
+ 		pdata->exit(dev);
+-disable_unprepare_clk:
+-	if (!IS_ERR(hpriv->clk))
+-		clk_disable_unprepare(hpriv->clk);
+-free_clk:
+-	if (!IS_ERR(hpriv->clk))
+-		clk_put(hpriv->clk);
++disable_resources:
++	ahci_platform_disable_resources(hpriv);
+ 	return rc;
+ }
+ 
+@@ -239,21 +448,30 @@ static void ahci_host_stop(struct ata_ho
+ 	if (pdata && pdata->exit)
+ 		pdata->exit(dev);
+ 
+-	if (!IS_ERR(hpriv->clk)) {
+-		clk_disable_unprepare(hpriv->clk);
+-		clk_put(hpriv->clk);
+-	}
++	ahci_platform_disable_resources(hpriv);
+ }
+ 
+ #ifdef CONFIG_PM_SLEEP
+-static int ahci_suspend(struct device *dev)
++/**
++ *	ahci_platform_suspend_host - Suspend an ahci-platform host
++ *	@dev: device pointer for the host
++ *
++ *	This function does all the usual steps needed to suspend an
++ *	ahci-platform host, note any necessary resources (ie clks, phy, etc.)
++ *	must be disabled after calling this.
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	0 on success otherwise a negative error code
++ */
++int ahci_platform_suspend_host(struct device *dev)
+ {
+-	struct ahci_platform_data *pdata = dev_get_platdata(dev);
+ 	struct ata_host *host = dev_get_drvdata(dev);
+ 	struct ahci_host_priv *hpriv = host->private_data;
+ 	void __iomem *mmio = hpriv->mmio;
+ 	u32 ctl;
+-	int rc;
+ 
+ 	if (hpriv->flags & AHCI_HFLAG_NO_SUSPEND) {
+ 		dev_err(dev, "firmware update required for suspend/resume\n");
+@@ -270,61 +488,122 @@ static int ahci_suspend(struct device *d
+ 	writel(ctl, mmio + HOST_CTL);
+ 	readl(mmio + HOST_CTL); /* flush */
+ 
+-	rc = ata_host_suspend(host, PMSG_SUSPEND);
++	return ata_host_suspend(host, PMSG_SUSPEND);
++}
++EXPORT_SYMBOL_GPL(ahci_platform_suspend_host);
++
++/**
++ *	ahci_platform_resume_host - Resume an ahci-platform host
++ *	@dev: device pointer for the host
++ *
++ *	This function does all the usual steps needed to resume an
++ *	ahci-platform host, note any necessary resources (ie clks, phy, etc.)
++ *	must be initialized / enabled before calling this.
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	0 on success otherwise a negative error code
++ */
++int ahci_platform_resume_host(struct device *dev)
++{
++	struct ata_host *host = dev_get_drvdata(dev);
++	int rc;
++
++	if (dev->power.power_state.event == PM_EVENT_SUSPEND) {
++		rc = ahci_reset_controller(host);
++		if (rc)
++			return rc;
++
++		ahci_init_controller(host);
++	}
++
++	ata_host_resume(host);
++
++	return 0;
++}
++EXPORT_SYMBOL_GPL(ahci_platform_resume_host);
++
++/**
++ *	ahci_platform_suspend - Suspend an ahci-platform device
++ *	@dev: the platform device to suspend
++ *
++ *	This function suspends the host associated with the device, followed
++ *	by disabling all the resources of the device.
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	0 on success otherwise a negative error code
++ */
++int ahci_platform_suspend(struct device *dev)
++{
++	struct ahci_platform_data *pdata = dev_get_platdata(dev);
++	struct ata_host *host = dev_get_drvdata(dev);
++	struct ahci_host_priv *hpriv = host->private_data;
++	int rc;
++
++	rc = ahci_platform_suspend_host(dev);
+ 	if (rc)
+ 		return rc;
+ 
+ 	if (pdata && pdata->suspend)
+ 		return pdata->suspend(dev);
+ 
+-	if (!IS_ERR(hpriv->clk))
+-		clk_disable_unprepare(hpriv->clk);
++	ahci_platform_disable_resources(hpriv);
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL_GPL(ahci_platform_suspend);
+ 
+-static int ahci_resume(struct device *dev)
++/**
++ *	ahci_platform_resume - Resume an ahci-platform device
++ *	@dev: the platform device to resume
++ *
++ *	This function enables all the resources of the device followed by
++ *	resuming the host associated with the device.
++ *
++ *	LOCKING:
++ *	None.
++ *
++ *	RETURNS:
++ *	0 on success otherwise a negative error code
++ */
++int ahci_platform_resume(struct device *dev)
+ {
+ 	struct ahci_platform_data *pdata = dev_get_platdata(dev);
+ 	struct ata_host *host = dev_get_drvdata(dev);
+ 	struct ahci_host_priv *hpriv = host->private_data;
+ 	int rc;
+ 
+-	if (!IS_ERR(hpriv->clk)) {
+-		rc = clk_prepare_enable(hpriv->clk);
+-		if (rc) {
+-			dev_err(dev, "clock prepare enable failed");
+-			return rc;
+-		}
+-	}
++	rc = ahci_platform_enable_resources(hpriv);
++	if (rc)
++		return rc;
+ 
+ 	if (pdata && pdata->resume) {
+ 		rc = pdata->resume(dev);
+ 		if (rc)
+-			goto disable_unprepare_clk;
+-	}
+-
+-	if (dev->power.power_state.event == PM_EVENT_SUSPEND) {
+-		rc = ahci_reset_controller(host);
+-		if (rc)
+-			goto disable_unprepare_clk;
+-
+-		ahci_init_controller(host);
++			goto disable_resources;
+ 	}
+ 
+-	ata_host_resume(host);
++	rc = ahci_platform_resume_host(dev);
++	if (rc)
++		goto disable_resources;
+ 
+ 	return 0;
+ 
+-disable_unprepare_clk:
+-	if (!IS_ERR(hpriv->clk))
+-		clk_disable_unprepare(hpriv->clk);
++disable_resources:
++	ahci_platform_disable_resources(hpriv);
+ 
+ 	return rc;
+ }
++EXPORT_SYMBOL_GPL(ahci_platform_resume);
+ #endif
+ 
+-static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_suspend, ahci_resume);
++static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,
++			 ahci_platform_resume);
+ 
+ static const struct of_device_id ahci_of_match[] = {
+ 	{ .compatible = "snps,spear-ahci", },
+--- a/include/linux/ahci_platform.h
++++ b/include/linux/ahci_platform.h
+@@ -19,7 +19,15 @@
+ 
+ struct device;
+ struct ata_port_info;
++struct ahci_host_priv;
++struct platform_device;
+ 
++/*
++ * Note ahci_platform_data is deprecated, it is only kept around for use
++ * by the old da850 and spear13xx ahci code.
++ * New drivers should instead declare their own platform_driver struct, and
++ * use ahci_platform* functions in their own probe, suspend and resume methods.
++ */
+ struct ahci_platform_data {
+ 	int (*init)(struct device *dev, void __iomem *addr);
+ 	void (*exit)(struct device *dev);
+@@ -30,4 +38,21 @@ struct ahci_platform_data {
+ 	unsigned int mask_port_map;
+ };
+ 
++int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);
++void ahci_platform_disable_clks(struct ahci_host_priv *hpriv);
++int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
++void ahci_platform_disable_resources(struct ahci_host_priv *hpriv);
++struct ahci_host_priv *ahci_platform_get_resources(
++	struct platform_device *pdev);
++int ahci_platform_init_host(struct platform_device *pdev,
++			    struct ahci_host_priv *hpriv,
++			    const struct ata_port_info *pi_template,
++			    unsigned int force_port_map,
++			    unsigned int mask_port_map);
++
++int ahci_platform_suspend_host(struct device *dev);
++int ahci_platform_resume_host(struct device *dev);
++int ahci_platform_suspend(struct device *dev);
++int ahci_platform_resume(struct device *dev);
++
+ #endif /* _AHCI_PLATFORM_H */
diff --git a/trunk/target/linux/sunxi/patches-3.14/191-ahci-add-sunxi-driver.patch b/trunk/target/linux/sunxi/patches-3.14/191-ahci-add-sunxi-driver.patch
new file mode 100644
index 00000000..563b19d3
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/191-ahci-add-sunxi-driver.patch
@@ -0,0 +1,340 @@
+From 49270be12ed66b6aff84292f63c16ed77a62e8a6 Mon Sep 17 00:00:00 2001
+From: Olliver Schinagl <oliver@schinagl.nl>
+Date: Sat, 18 Jan 2014 15:00:45 +0100
+Subject: [PATCH] ARM: sunxi: Add support for Allwinner SUNXi SoCs sata to
+ ahci_platform
+
+This patch adds support for the ahci sata controler found on Allwinner A10
+and A20 SoCs to the ahci_platform driver.
+
+Orignally written by Olliver Schinagl using the approach of having a platform
+device which probe method creates a new child platform device which gets
+driven by ahci_platform.c, as done by ahci_imx.c .
+
+Refactored by Hans de Goede to add most of the non sunxi specific functionality
+to ahci_platform.c and use a platform_data pointer from of_device_id for the
+sunxi specific bits.
+
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ .../devicetree/bindings/ata/ahci-platform.txt      |  15 +-
+ drivers/ata/Kconfig                                |   9 +
+ drivers/ata/Makefile                               |   1 +
+ drivers/ata/ahci_sunxi.c                           | 249 +++++++++++++++++++++
+ 4 files changed, 271 insertions(+), 3 deletions(-)
+ create mode 100644 drivers/ata/ahci_sunxi.c
+
+--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
++++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
+@@ -4,7 +4,9 @@ SATA nodes are defined to describe on-ch
+ Each SATA controller should have its own node.
+ 
+ Required properties:
+-- compatible        : compatible list, contains "snps,spear-ahci"
++- compatible        : compatible list, one of "snps,spear-ahci",
++                      "snps,exynos5440-ahci", "ibm,476gtr-ahci", or
++                      "allwinner,sun4i-a10-ahci"
+ - interrupts        : <interrupt mapping for SATA IRQ>
+ - reg               : <registers mapping>
+ 
+@@ -13,10 +15,17 @@ Optional properties:
+ - clocks            : a list of phandle + clock specifier pairs
+ - target-supply     : regulator for SATA target power
+ 
+-Example:
++Examples:
+         sata@ffe08000 {
+ 		compatible = "snps,spear-ahci";
+ 		reg = <0xffe08000 0x1000>;
+ 		interrupts = <115>;
+-
+         };
++
++	ahci: sata@01c18000 {
++		compatible = "allwinner,sun4i-a10-ahci";
++		reg = <0x01c18000 0x1000>;
++		interrupts = <56>;
++		clocks = <&pll6 0>, <&ahb_gates 25>;
++		target-supply = <&reg_ahci_5v>;
++	};
+--- a/drivers/ata/Kconfig
++++ b/drivers/ata/Kconfig
+@@ -106,6 +106,15 @@ config AHCI_IMX
+ 
+ 	  If unsure, say N.
+ 
++config AHCI_SUNXI
++	tristate "Allwinner sunxi AHCI SATA support"
++	depends on ARCH_SUNXI && SATA_AHCI_PLATFORM
++	help
++	  This option enables support for the Allwinner sunxi SoC's
++	  onboard AHCI SATA.
++
++	  If unsure, say N.
++
+ config SATA_FSL
+ 	tristate "Freescale 3.0Gbps SATA support"
+ 	depends on FSL_SOC
+--- a/drivers/ata/Makefile
++++ b/drivers/ata/Makefile
+@@ -11,6 +11,7 @@ obj-$(CONFIG_SATA_SIL24)	+= sata_sil24.o
+ obj-$(CONFIG_SATA_DWC)		+= sata_dwc_460ex.o
+ obj-$(CONFIG_SATA_HIGHBANK)	+= sata_highbank.o libahci.o
+ obj-$(CONFIG_AHCI_IMX)		+= ahci_imx.o
++obj-$(CONFIG_AHCI_SUNXI)	+= ahci_sunxi.o
+ 
+ # SFF w/ custom DMA
+ obj-$(CONFIG_PDC_ADMA)		+= pdc_adma.o
+--- /dev/null
++++ b/drivers/ata/ahci_sunxi.c
+@@ -0,0 +1,249 @@
++/*
++ * Allwinner sunxi AHCI SATA platform driver
++ * Copyright 2013 Olliver Schinagl <oliver@schinagl.nl>
++ * Copyright 2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * based on the AHCI SATA platform driver by Jeff Garzik and Anton Vorontsov
++ * Based on code from Allwinner Technology Co., Ltd. <www.allwinnertech.com>,
++ * Daniel Wang <danielwang@allwinnertech.com>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions 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.
++ */
++
++#include <linux/ahci_platform.h>
++#include <linux/clk.h>
++#include <linux/errno.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include <linux/regulator/consumer.h>
++#include "ahci.h"
++
++#define AHCI_BISTAFR 0x00a0
++#define AHCI_BISTCR 0x00a4
++#define AHCI_BISTFCTR 0x00a8
++#define AHCI_BISTSR 0x00ac
++#define AHCI_BISTDECR 0x00b0
++#define AHCI_DIAGNR0 0x00b4
++#define AHCI_DIAGNR1 0x00b8
++#define AHCI_OOBR 0x00bc
++#define AHCI_PHYCS0R 0x00c0
++#define AHCI_PHYCS1R 0x00c4
++#define AHCI_PHYCS2R 0x00c8
++#define AHCI_TIMER1MS 0x00e0
++#define AHCI_GPARAM1R 0x00e8
++#define AHCI_GPARAM2R 0x00ec
++#define AHCI_PPARAMR 0x00f0
++#define AHCI_TESTR 0x00f4
++#define AHCI_VERSIONR 0x00f8
++#define AHCI_IDR 0x00fc
++#define AHCI_RWCR 0x00fc
++#define AHCI_P0DMACR 0x0170
++#define AHCI_P0PHYCR 0x0178
++#define AHCI_P0PHYSR 0x017c
++
++static void sunxi_clrbits(void __iomem *reg, u32 clr_val)
++{
++	u32 reg_val;
++
++	reg_val = readl(reg);
++	reg_val &= ~(clr_val);
++	writel(reg_val, reg);
++}
++
++static void sunxi_setbits(void __iomem *reg, u32 set_val)
++{
++	u32 reg_val;
++
++	reg_val = readl(reg);
++	reg_val |= set_val;
++	writel(reg_val, reg);
++}
++
++static void sunxi_clrsetbits(void __iomem *reg, u32 clr_val, u32 set_val)
++{
++	u32 reg_val;
++
++	reg_val = readl(reg);
++	reg_val &= ~(clr_val);
++	reg_val |= set_val;
++	writel(reg_val, reg);
++}
++
++static u32 sunxi_getbits(void __iomem *reg, u8 mask, u8 shift)
++{
++	return (readl(reg) >> shift) & mask;
++}
++
++static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base)
++{
++	u32 reg_val;
++	int timeout;
++
++	/* This magic is from the original code */
++	writel(0, reg_base + AHCI_RWCR);
++	mdelay(5);
++
++	sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19));
++	sunxi_clrsetbits(reg_base + AHCI_PHYCS0R,
++			 (0x7 << 24),
++			 (0x5 << 24) | BIT(23) | BIT(18));
++	sunxi_clrsetbits(reg_base + AHCI_PHYCS1R,
++			 (0x3 << 16) | (0x1f << 8) | (0x3 << 6),
++			 (0x2 << 16) | (0x6 << 8) | (0x2 << 6));
++	sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(28) | BIT(15));
++	sunxi_clrbits(reg_base + AHCI_PHYCS1R, BIT(19));
++	sunxi_clrsetbits(reg_base + AHCI_PHYCS0R,
++			 (0x7 << 20), (0x3 << 20));
++	sunxi_clrsetbits(reg_base + AHCI_PHYCS2R,
++			 (0x1f << 5), (0x19 << 5));
++	mdelay(5);
++
++	sunxi_setbits(reg_base + AHCI_PHYCS0R, (0x1 << 19));
++
++	timeout = 250; /* Power up takes aprox 50 us */
++	do {
++		reg_val = sunxi_getbits(reg_base + AHCI_PHYCS0R, 0x7, 28);
++		if (reg_val == 0x02)
++			break;
++
++		if (--timeout == 0) {
++			dev_err(dev, "PHY power up failed.\n");
++			return -EIO;
++		}
++		udelay(1);
++	} while (1);
++
++	sunxi_setbits(reg_base + AHCI_PHYCS2R, (0x1 << 24));
++
++	timeout = 100; /* Calibration takes aprox 10 us */
++	do {
++		reg_val = sunxi_getbits(reg_base + AHCI_PHYCS2R, 0x1, 24);
++		if (reg_val == 0x00)
++			break;
++
++		if (--timeout == 0) {
++			dev_err(dev, "PHY calibration failed.\n");
++			return -EIO;
++		}
++		udelay(1);
++	} while (1);
++
++	mdelay(15);
++
++	writel(0x7, reg_base + AHCI_RWCR);
++
++	return 0;
++}
++
++static void ahci_sunxi_start_engine(struct ata_port *ap)
++{
++	void __iomem *port_mmio = ahci_port_base(ap);
++	struct ahci_host_priv *hpriv = ap->host->private_data;
++
++	/* Setup DMA before DMA start */
++	sunxi_clrsetbits(hpriv->mmio + AHCI_P0DMACR, 0x0000ff00, 0x00004400);
++
++	/* Start DMA */
++	sunxi_setbits(port_mmio + PORT_CMD, PORT_CMD_START);
++}
++
++static const struct ata_port_info ahci_sunxi_port_info = {
++	AHCI_HFLAGS(AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
++			  AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
++	.flags		= AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
++	.pio_mask	= ATA_PIO4,
++	.udma_mask	= ATA_UDMA6,
++	.port_ops	= &ahci_platform_ops,
++};
++
++static int ahci_sunxi_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct ahci_host_priv *hpriv;
++	int rc;
++
++	hpriv = ahci_platform_get_resources(pdev);
++	if (IS_ERR(hpriv))
++		return PTR_ERR(hpriv);
++
++	hpriv->start_engine = ahci_sunxi_start_engine;
++
++	rc = ahci_platform_enable_resources(hpriv);
++	if (rc)
++		return rc;
++
++	rc = ahci_sunxi_phy_init(dev, hpriv->mmio);
++	if (rc)
++		goto disable_resources;
++
++	rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info, 0, 0);
++	if (rc)
++		goto disable_resources;
++
++	return 0;
++
++disable_resources:
++	ahci_platform_disable_resources(hpriv);
++	return rc;
++}
++
++#ifdef CONFIG_PM_SLEEP
++int ahci_sunxi_resume(struct device *dev)
++{
++	struct ata_host *host = dev_get_drvdata(dev);
++	struct ahci_host_priv *hpriv = host->private_data;
++	int rc;
++
++	rc = ahci_platform_enable_resources(hpriv);
++	if (rc)
++		return rc;
++
++	rc = ahci_sunxi_phy_init(dev, hpriv->mmio);
++	if (rc)
++		goto disable_resources;
++
++	rc = ahci_platform_resume_host(dev);
++	if (rc)
++		goto disable_resources;
++
++	return 0;
++
++disable_resources:
++	ahci_platform_disable_resources(hpriv);
++	return rc;
++}
++#endif
++
++static SIMPLE_DEV_PM_OPS(ahci_sunxi_pm_ops, ahci_platform_suspend,
++			 ahci_sunxi_resume);
++
++static const struct of_device_id ahci_sunxi_of_match[] = {
++	{ .compatible = "allwinner,sun4i-a10-ahci", },
++	{ },
++};
++MODULE_DEVICE_TABLE(of, ahci_sunxi_of_match);
++
++static struct platform_driver ahci_sunxi_driver = {
++	.probe = ahci_sunxi_probe,
++	.remove = ata_platform_remove_one,
++	.driver = {
++		.name = "ahci-sunxi",
++		.owner = THIS_MODULE,
++		.of_match_table = ahci_sunxi_of_match,
++		.pm = &ahci_sunxi_pm_ops,
++	},
++};
++module_platform_driver(ahci_sunxi_driver);
++
++MODULE_DESCRIPTION("Allwinner sunxi AHCI SATA driver");
++MODULE_AUTHOR("Olliver Schinagl <oliver@schinagl.nl>");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.14/192-ahci-platform-changes.patch b/trunk/target/linux/sunxi/patches-3.14/192-ahci-platform-changes.patch
new file mode 100644
index 00000000..a5f4fc50
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/192-ahci-platform-changes.patch
@@ -0,0 +1,202 @@
+From a52ae09871d171d6771b4bef2d4c56dd435e740f Mon Sep 17 00:00:00 2001
+From: Roger Quadros <rogerq@ti.com>
+Date: Mon, 20 Jan 2014 16:32:33 +0200
+Subject: [PATCH] ata: ahci_platform: Add DT compatible for Synopsis DWC AHCI
+ controller
+
+Add compatible string "snps,dwc-ahci", which should be used
+for Synopsis Designware SATA cores. e.g. on TI OMAP5 and DRA7 platforms.
+
+Signed-off-by: Roger Quadros <rogerq@ti.com>
+Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/ata/ahci_platform.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/ata/ahci_platform.c
++++ b/drivers/ata/ahci_platform.c
+@@ -23,6 +23,8 @@
+ #include <linux/platform_device.h>
+ #include <linux/libata.h>
+ #include <linux/ahci_platform.h>
++#include <linux/phy/phy.h>
++#include <linux/pm_runtime.h>
+ #include "ahci.h"
+ 
+ static void ahci_host_stop(struct ata_host *host);
+@@ -147,6 +149,7 @@ EXPORT_SYMBOL_GPL(ahci_platform_disable_
+  *	the following order:
+  *	1) Regulator
+  *	2) Clocks (through ahci_platform_enable_clks)
++ *	3) Phy
+  *
+  *	If resource enabling fails at any point the previous enabled
+  *	resources are disabled in reverse order.
+@@ -171,8 +174,23 @@ int ahci_platform_enable_resources(struc
+ 	if (rc)
+ 		goto disable_regulator;
+ 
++	if (hpriv->phy) {
++		rc = phy_init(hpriv->phy);
++		if (rc)
++			goto disable_clks;
++
++		rc = phy_power_on(hpriv->phy);
++		if (rc) {
++			phy_exit(hpriv->phy);
++			goto disable_clks;
++		}
++	}
++
+ 	return 0;
+ 
++disable_clks:
++	ahci_platform_disable_clks(hpriv);
++
+ disable_regulator:
+ 	if (hpriv->target_pwr)
+ 		regulator_disable(hpriv->target_pwr);
+@@ -186,14 +204,20 @@ EXPORT_SYMBOL_GPL(ahci_platform_enable_r
+  *
+  *	This function disables all ahci_platform managed resources in
+  *	the following order:
+- *	1) Clocks (through ahci_platform_disable_clks)
+- *	2) Regulator
++ *	1) Phy
++ *	2) Clocks (through ahci_platform_disable_clks)
++ *	3) Regulator
+  *
+  *	LOCKING:
+  *	None.
+  */
+ void ahci_platform_disable_resources(struct ahci_host_priv *hpriv)
+ {
++	if (hpriv->phy) {
++		phy_power_off(hpriv->phy);
++		phy_exit(hpriv->phy);
++	}
++
+ 	ahci_platform_disable_clks(hpriv);
+ 
+ 	if (hpriv->target_pwr)
+@@ -206,6 +230,11 @@ static void ahci_platform_put_resources(
+ 	struct ahci_host_priv *hpriv = res;
+ 	int c;
+ 
++	if (hpriv->got_runtime_pm) {
++		pm_runtime_put_sync(dev);
++		pm_runtime_disable(dev);
++	}
++
+ 	for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++)
+ 		clk_put(hpriv->clks[c]);
+ }
+@@ -222,6 +251,7 @@ static void ahci_platform_put_resources(
+  *	2) regulator for controlling the targets power (optional)
+  *	3) 0 - AHCI_MAX_CLKS clocks, as specified in the devs devicetree node,
+  *	   or for non devicetree enabled platforms a single clock
++ *	4) phy (optional)
+  *
+  *	LOCKING:
+  *	None.
+@@ -283,6 +313,29 @@ struct ahci_host_priv *ahci_platform_get
+ 		hpriv->clks[i] = clk;
+ 	}
+ 
++	hpriv->phy = devm_phy_get(dev, "sata-phy");
++	if (IS_ERR(hpriv->phy)) {
++		rc = PTR_ERR(hpriv->phy);
++		switch (rc) {
++		case -ENODEV:
++		case -ENOSYS:
++			/* continue normally */
++			hpriv->phy = NULL;
++			break;
++
++		case -EPROBE_DEFER:
++			goto err_out;
++
++		default:
++			dev_err(dev, "couldn't get sata-phy\n");
++			goto err_out;
++		}
++	}
++
++	pm_runtime_enable(dev);
++	pm_runtime_get_sync(dev);
++	hpriv->got_runtime_pm = true;
++
+ 	devres_remove_group(dev, NULL);
+ 	return hpriv;
+ 
+@@ -592,6 +645,11 @@ int ahci_platform_resume(struct device *
+ 	if (rc)
+ 		goto disable_resources;
+ 
++	/* We resumed so update PM runtime state */
++	pm_runtime_disable(dev);
++	pm_runtime_set_active(dev);
++	pm_runtime_enable(dev);
++
+ 	return 0;
+ 
+ disable_resources:
+@@ -609,6 +667,7 @@ static const struct of_device_id ahci_of
+ 	{ .compatible = "snps,spear-ahci", },
+ 	{ .compatible = "snps,exynos5440-ahci", },
+ 	{ .compatible = "ibm,476gtr-ahci", },
++	{ .compatible = "snps,dwc-ahci", },
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(of, ahci_of_match);
+--- a/drivers/ata/ahci.h
++++ b/drivers/ata/ahci.h
+@@ -37,6 +37,7 @@
+ 
+ #include <linux/clk.h>
+ #include <linux/libata.h>
++#include <linux/phy/phy.h>
+ #include <linux/regulator/consumer.h>
+ 
+ /* Enclosure Management Control */
+@@ -324,8 +325,10 @@ struct ahci_host_priv {
+ 	u32 			em_loc; /* enclosure management location */
+ 	u32			em_buf_sz;	/* EM buffer size in byte */
+ 	u32			em_msg_type;	/* EM message type */
++	bool			got_runtime_pm; /* Did we do pm_runtime_get? */
+ 	struct clk		*clks[AHCI_MAX_CLKS]; /* Optional */
+ 	struct regulator	*target_pwr;	/* Optional */
++	struct phy		*phy;		/* If platform uses phy */
+ 	void			*plat_data;	/* Other platform data */
+ 	/*
+ 	 * Optional ahci_start_engine override, if not set this gets set to the
+--- a/drivers/ata/ahci_sunxi.c
++++ b/drivers/ata/ahci_sunxi.c
+@@ -90,7 +90,7 @@ static int ahci_sunxi_phy_init(struct de
+ 
+ 	/* This magic is from the original code */
+ 	writel(0, reg_base + AHCI_RWCR);
+-	mdelay(5);
++	msleep(5);
+ 
+ 	sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19));
+ 	sunxi_clrsetbits(reg_base + AHCI_PHYCS0R,
+@@ -105,7 +105,7 @@ static int ahci_sunxi_phy_init(struct de
+ 			 (0x7 << 20), (0x3 << 20));
+ 	sunxi_clrsetbits(reg_base + AHCI_PHYCS2R,
+ 			 (0x1f << 5), (0x19 << 5));
+-	mdelay(5);
++	msleep(5);
+ 
+ 	sunxi_setbits(reg_base + AHCI_PHYCS0R, (0x1 << 19));
+ 
+@@ -137,7 +137,7 @@ static int ahci_sunxi_phy_init(struct de
+ 		udelay(1);
+ 	} while (1);
+ 
+-	mdelay(15);
++	msleep(15);
+ 
+ 	writel(0x7, reg_base + AHCI_RWCR);
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/195-1-ohci-plat-changes.patch b/trunk/target/linux/sunxi/patches-3.14/195-1-ohci-plat-changes.patch
new file mode 100644
index 00000000..fb4c87ea
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/195-1-ohci-plat-changes.patch
@@ -0,0 +1,344 @@
+From 49ff47db168655cac5213cf5dd1844b08fb9823c Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sun, 5 Jan 2014 14:42:39 +0100
+Subject: [PATCH] ohci-platform: Add support for devicetree instantiation
+
+Add support for ohci-platform instantiation from devicetree, including
+optionally getting clks and a phy from devicetree, and enabling / disabling
+those on power_on / off.
+
+This should allow using ohci-platform from devicetree in various cases.
+Specifically after this commit it can be used for the ohci controller found
+on Allwinner sunxi SoCs.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+---
+ Documentation/devicetree/bindings/usb/usb-ohci.txt |  22 +++
+ drivers/usb/host/ohci-platform.c                   | 162 ++++++++++++++++++---
+ 2 files changed, 162 insertions(+), 22 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/usb-ohci.txt
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt
+@@ -0,0 +1,25 @@
++USB OHCI controllers
++
++Required properties:
++- compatible : "generic-ohci"
++- reg : ohci controller register range (address and length)
++- interrupts : ohci controller interrupt
++
++Optional properties:
++- big-endian-regs : boolean, set this for hcds with big-endian registers
++- big-endian-desc : boolean, set this for hcds with big-endian descriptors
++- big-endian : boolean, for hcds with big-endian-regs + big-endian-desc
++- clocks : a list of phandle + clock specifier pairs
++- phys : phandle + phy specifier pair
++- phy-names : "usb"
++
++Example:
++
++	ohci0: usb@01c14400 {
++		compatible = "allwinner,sun4i-a10-ohci", "generic-ohci";
++		reg = <0x01c14400 0x100>;
++		interrupts = <64>;
++		clocks = <&usb_clk 6>, <&ahb_gates 2>;
++		phys = <&usbphy 1>;
++		phy-names = "usb";
++	};
+--- a/drivers/usb/host/ohci-platform.c
++++ b/drivers/usb/host/ohci-platform.c
+@@ -3,6 +3,7 @@
+  *
+  * Copyright 2007 Michael Buesch <m@bues.ch>
+  * Copyright 2011-2012 Hauke Mehrtens <hauke@hauke-m.de>
++ * Copyright 2014 Hans de Goede <hdegoede@redhat.com>
+  *
+  * Derived from the OCHI-SSB driver
+  * Derived from the OHCI-PCI driver
+@@ -14,11 +15,14 @@
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
+ 
++#include <linux/clk.h>
++#include <linux/dma-mapping.h>
+ #include <linux/hrtimer.h>
+ #include <linux/io.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/err.h>
++#include <linux/phy/phy.h>
+ #include <linux/platform_device.h>
+ #include <linux/usb/ohci_pdriver.h>
+ #include <linux/usb.h>
+@@ -27,6 +31,13 @@
+ #include "ohci.h"
+ 
+ #define DRIVER_DESC "OHCI generic platform driver"
++#define OHCI_MAX_CLKS 3
++#define hcd_to_ohci_priv(h) ((struct ohci_platform_priv *)hcd_to_ohci(h)->priv)
++
++struct ohci_platform_priv {
++	struct clk *clks[OHCI_MAX_CLKS];
++	struct phy *phy;
++};
+ 
+ static const char hcd_name[] = "ohci-platform";
+ 
+@@ -48,11 +59,67 @@ static int ohci_platform_reset(struct us
+ 	return ohci_setup(hcd);
+ }
+ 
++static int ohci_platform_power_on(struct platform_device *dev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(dev);
++	struct ohci_platform_priv *priv = hcd_to_ohci_priv(hcd);
++	int clk, ret;
++
++	for (clk = 0; clk < OHCI_MAX_CLKS && priv->clks[clk]; clk++) {
++		ret = clk_prepare_enable(priv->clks[clk]);
++		if (ret)
++			goto err_disable_clks;
++	}
++
++	if (priv->phy) {
++		ret = phy_init(priv->phy);
++		if (ret)
++			goto err_disable_clks;
++
++		ret = phy_power_on(priv->phy);
++		if (ret)
++			goto err_exit_phy;
++	}
++
++	return 0;
++
++err_exit_phy:
++	phy_exit(priv->phy);
++err_disable_clks:
++	while (--clk >= 0)
++		clk_disable_unprepare(priv->clks[clk]);
++
++	return ret;
++}
++
++static void ohci_platform_power_off(struct platform_device *dev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(dev);
++	struct ohci_platform_priv *priv = hcd_to_ohci_priv(hcd);
++	int clk;
++
++	if (priv->phy) {
++		phy_power_off(priv->phy);
++		phy_exit(priv->phy);
++	}
++
++	for (clk = OHCI_MAX_CLKS - 1; clk >= 0; clk--)
++		if (priv->clks[clk])
++			clk_disable_unprepare(priv->clks[clk]);
++}
++
+ static struct hc_driver __read_mostly ohci_platform_hc_driver;
+ 
+ static const struct ohci_driver_overrides platform_overrides __initconst = {
+-	.product_desc =	"Generic Platform OHCI controller",
+-	.reset =	ohci_platform_reset,
++	.product_desc =		"Generic Platform OHCI controller",
++	.reset =		ohci_platform_reset,
++	.extra_priv_size =	sizeof(struct ohci_platform_priv),
++};
++
++static struct usb_ohci_pdata ohci_platform_defaults = {
++	.power_on =		ohci_platform_power_on,
++	.power_suspend =	ohci_platform_power_off,
++	.power_off =		ohci_platform_power_off,
+ };
+ 
+ static int ohci_platform_probe(struct platform_device *dev)
+@@ -60,17 +127,24 @@ static int ohci_platform_probe(struct pl
+ 	struct usb_hcd *hcd;
+ 	struct resource *res_mem;
+ 	struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
+-	int irq;
+-	int err = -ENOMEM;
+-
+-	if (!pdata) {
+-		WARN_ON(1);
+-		return -ENODEV;
+-	}
++	struct ohci_platform_priv *priv;
++	struct ohci_hcd *ohci;
++	int err, irq, clk = 0;
+ 
+ 	if (usb_disabled())
+ 		return -ENODEV;
+ 
++	/*
++	 * Use reasonable defaults so platforms don't have to provide these
++	 * with DT probing on ARM.
++	 */
++	if (!pdata)
++		pdata = &ohci_platform_defaults;
++
++	err = dma_coerce_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
++	if (err)
++		return err;
++
+ 	irq = platform_get_irq(dev, 0);
+ 	if (irq < 0) {
+ 		dev_err(&dev->dev, "no irq provided");
+@@ -83,17 +157,66 @@ static int ohci_platform_probe(struct pl
+ 		return -ENXIO;
+ 	}
+ 
++	hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
++			dev_name(&dev->dev));
++	if (!hcd)
++		return -ENOMEM;
++
++	platform_set_drvdata(dev, hcd);
++	dev->dev.platform_data = pdata;
++	priv = hcd_to_ohci_priv(hcd);
++	ohci = hcd_to_ohci(hcd);
++
++	if (pdata == &ohci_platform_defaults && dev->dev.of_node) {
++		if (of_property_read_bool(dev->dev.of_node, "big-endian-regs"))
++			ohci->flags |= OHCI_QUIRK_BE_MMIO;
++
++		if (of_property_read_bool(dev->dev.of_node, "big-endian-desc"))
++			ohci->flags |= OHCI_QUIRK_BE_DESC;
++
++		if (of_property_read_bool(dev->dev.of_node, "big-endian"))
++			ohci->flags |= OHCI_QUIRK_BE_MMIO | OHCI_QUIRK_BE_DESC;
++
++#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
++		if (ohci->flags & OHCI_QUIRK_BE_MMIO) {
++			dev_err(&dev->dev,
++				"Error big-endian-regs not compiled in\n");
++			err = -EINVAL;
++			goto err_put_hcd;
++		}
++#endif
++#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_DESC
++		if (ohci->flags & OHCI_QUIRK_BE_DESC) {
++			dev_err(&dev->dev,
++				"Error big-endian-desc not compiled in\n");
++			err = -EINVAL;
++			goto err_put_hcd;
++		}
++#endif
++		priv->phy = devm_phy_get(&dev->dev, "usb");
++		if (IS_ERR(priv->phy)) {
++			err = PTR_ERR(priv->phy);
++			if (err == -EPROBE_DEFER)
++				goto err_put_hcd;
++			priv->phy = NULL;
++		}
++
++		for (clk = 0; clk < OHCI_MAX_CLKS; clk++) {
++			priv->clks[clk] = of_clk_get(dev->dev.of_node, clk);
++			if (IS_ERR(priv->clks[clk])) {
++				err = PTR_ERR(priv->clks[clk]);
++				if (err == -EPROBE_DEFER)
++					goto err_put_clks;
++				priv->clks[clk] = NULL;
++				break;
++			}
++		}
++	}
++
+ 	if (pdata->power_on) {
+ 		err = pdata->power_on(dev);
+ 		if (err < 0)
+-			return err;
+-	}
+-
+-	hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
+-			dev_name(&dev->dev));
+-	if (!hcd) {
+-		err = -ENOMEM;
+-		goto err_power;
++			goto err_put_clks;
+ 	}
+ 
+ 	hcd->rsrc_start = res_mem->start;
+@@ -102,11 +225,11 @@ static int ohci_platform_probe(struct pl
+ 	hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
+ 	if (IS_ERR(hcd->regs)) {
+ 		err = PTR_ERR(hcd->regs);
+-		goto err_put_hcd;
++		goto err_power;
+ 	}
+ 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
+ 	if (err)
+-		goto err_put_hcd;
++		goto err_power;
+ 
+ 	device_wakeup_enable(hcd->self.controller);
+ 
+@@ -114,11 +237,17 @@ static int ohci_platform_probe(struct pl
+ 
+ 	return err;
+ 
+-err_put_hcd:
+-	usb_put_hcd(hcd);
+ err_power:
+ 	if (pdata->power_off)
+ 		pdata->power_off(dev);
++err_put_clks:
++	while (--clk >= 0)
++		clk_put(priv->clks[clk]);
++err_put_hcd:
++	if (pdata == &ohci_platform_defaults)
++		dev->dev.platform_data = NULL;
++
++	usb_put_hcd(hcd);
+ 
+ 	return err;
+ }
+@@ -127,13 +256,22 @@ static int ohci_platform_remove(struct p
+ {
+ 	struct usb_hcd *hcd = platform_get_drvdata(dev);
+ 	struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
++	struct ohci_platform_priv *priv = hcd_to_ohci_priv(hcd);
++	int clk;
+ 
+ 	usb_remove_hcd(hcd);
+-	usb_put_hcd(hcd);
+ 
+ 	if (pdata->power_off)
+ 		pdata->power_off(dev);
+ 
++	for (clk = 0; clk < OHCI_MAX_CLKS && priv->clks[clk]; clk++)
++		clk_put(priv->clks[clk]);
++
++	usb_put_hcd(hcd);
++
++	if (pdata == &ohci_platform_defaults)
++		dev->dev.platform_data = NULL;
++
+ 	return 0;
+ }
+ 
+@@ -180,6 +318,12 @@ static int ohci_platform_resume(struct d
+ #define ohci_platform_resume	NULL
+ #endif /* CONFIG_PM */
+ 
++static const struct of_device_id ohci_platform_ids[] = {
++	{ .compatible = "generic-ohci", },
++	{ }
++};
++MODULE_DEVICE_TABLE(of, ohci_platform_ids);
++
+ static const struct platform_device_id ohci_platform_table[] = {
+ 	{ "ohci-platform", 0 },
+ 	{ }
+@@ -200,6 +344,7 @@ static struct platform_driver ohci_platf
+ 		.owner	= THIS_MODULE,
+ 		.name	= "ohci-platform",
+ 		.pm	= &ohci_platform_pm_ops,
++		.of_match_table = ohci_platform_ids,
+ 	}
+ };
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/195-2-ehci-plat-changes.patch b/trunk/target/linux/sunxi/patches-3.14/195-2-ehci-plat-changes.patch
new file mode 100644
index 00000000..425993c7
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/195-2-ehci-plat-changes.patch
@@ -0,0 +1,414 @@
+From 738b350437abfca820dae226549ecf4fb100fa30 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sun, 5 Jan 2014 00:04:02 +0100
+Subject: [PATCH] ehci-platform: Add support for clks and phy passed through
+ devicetree
+
+Currently ehci-platform is only used in combination with devicetree when used
+with some Via socs. By extending it to (optionally) get clks and a phy from
+devicetree, and enabling / disabling those on power_on / off, it can be used
+more generically. Specifically after this commit it can be used for the
+ehci controller on Allwinner sunxi SoCs.
+
+Since ehci-platform is intended to handle any generic enough non pci ehci
+device, add a "usb-ehci" compatibility string.
+
+There already is a usb-ehci device-tree bindings document, update this
+with clks and phy bindings info.
+
+Although actually quite generic so far the via,vt8500 compatibilty string
+had its own bindings document. Somehow we even ended up with 2 of them. Since
+these provide no extra information over the generic usb-ehci documentation,
+this patch removes them.
+
+The ehci-ppc-of.c driver also claims the usb-ehci compatibility string,
+even though it mostly is ibm,usb-ehci-440epx specific. ehci-platform.c is
+not needed on ppc platforms, so add a !PPC_OF dependency to it to avoid
+2 drivers claiming the same compatibility string getting build on ppc.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+---
+ Documentation/devicetree/bindings/usb/usb-ehci.txt |  25 +++-
+ .../devicetree/bindings/usb/via,vt8500-ehci.txt    |  15 ---
+ .../devicetree/bindings/usb/vt8500-ehci.txt        |  12 --
+ drivers/usb/host/Kconfig                           |   1 +
+ drivers/usb/host/ehci-platform.c                   | 147 +++++++++++++++++----
+ 5 files changed, 142 insertions(+), 58 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
+ delete mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
+
+--- a/Documentation/devicetree/bindings/usb/usb-ehci.txt
++++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt
+@@ -1,19 +1,20 @@
+ USB EHCI controllers
+ 
+ Required properties:
+-  - compatible : should be "usb-ehci".
++  - compatible : should be "generic-ehci".
+   - reg : should contain at least address and length of the standard EHCI
+     register set for the device. Optional platform-dependent registers
+     (debug-port or other) can be also specified here, but only after
+     definition of standard EHCI registers.
+   - interrupts : one EHCI interrupt should be described here.
+-If device registers are implemented in big endian mode, the device
+-node should have "big-endian-regs" property.
+-If controller implementation operates with big endian descriptors,
+-"big-endian-desc" property should be specified.
+-If both big endian registers and descriptors are used by the controller
+-implementation, "big-endian" property can be specified instead of having
+-both "big-endian-regs" and "big-endian-desc".
++
++Optional properties:
++ - big-endian-regs : boolean, set this for hcds with big-endian registers
++ - big-endian-desc : boolean, set this for hcds with big-endian descriptors
++ - big-endian : boolean, for hcds with big-endian-regs + big-endian-desc
++ - clocks : a list of phandle + clock specifier pairs
++ - phys : phandle + phy specifier pair
++ - phy-names : "usb"
+ 
+ Example (Sequoia 440EPx):
+     ehci@e0000300 {
+@@ -23,3 +24,13 @@ Example (Sequoia 440EPx):
+ 	   reg = <0 e0000300 90 0 e0000390 70>;
+ 	   big-endian;
+    };
++
++Example (Allwinner sun4i A10 SoC):
++   ehci0: usb@01c14000 {
++	   compatible = "allwinner,sun4i-a10-ehci", "generic-ehci";
++	   reg = <0x01c14000 0x100>;
++	   interrupts = <39>;
++	   clocks = <&ahb_gates 1>;
++	   phys = <&usbphy 1>;
++	   phy-names = "usb";
++   };
+--- a/Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
++++ /dev/null
+@@ -1,15 +0,0 @@
+-VIA/Wondermedia VT8500 EHCI Controller
+------------------------------------------------------
+-
+-Required properties:
+-- compatible : "via,vt8500-ehci"
+-- reg : Should contain 1 register ranges(address and length)
+-- interrupts : ehci controller interrupt
+-
+-Example:
+-
+-	ehci@d8007900 {
+-		compatible = "via,vt8500-ehci";
+-		reg = <0xd8007900 0x200>;
+-		interrupts = <43>;
+-	};
+--- a/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
++++ /dev/null
+@@ -1,12 +0,0 @@
+-VIA VT8500 and Wondermedia WM8xxx SoC USB controllers.
+-
+-Required properties:
+- - compatible: Should be "via,vt8500-ehci" or "wm,prizm-ehci".
+- - reg: Address range of the ehci registers. size should be 0x200
+- - interrupts: Should contain the ehci interrupt.
+-
+-usb: ehci@D8007100 {
+-	compatible = "wm,prizm-ehci", "usb-ehci";
+-	reg = <0xD8007100 0x200>;
+-	interrupts = <1>;
+-};
+--- a/drivers/usb/host/ehci-platform.c
++++ b/drivers/usb/host/ehci-platform.c
+@@ -3,6 +3,7 @@
+  *
+  * Copyright 2007 Steven Brown <sbrown@cortland.com>
+  * Copyright 2010-2012 Hauke Mehrtens <hauke@hauke-m.de>
++ * Copyright 2014 Hans de Goede <hdegoede@redhat.com>
+  *
+  * Derived from the ohci-ssb driver
+  * Copyright 2007 Michael Buesch <m@bues.ch>
+@@ -18,6 +19,7 @@
+  *
+  * Licensed under the GNU/GPL. See COPYING for details.
+  */
++#include <linux/clk.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/err.h>
+ #include <linux/kernel.h>
+@@ -25,6 +27,7 @@
+ #include <linux/io.h>
+ #include <linux/module.h>
+ #include <linux/of.h>
++#include <linux/phy/phy.h>
+ #include <linux/platform_device.h>
+ #include <linux/usb.h>
+ #include <linux/usb/hcd.h>
+@@ -33,6 +36,13 @@
+ #include "ehci.h"
+ 
+ #define DRIVER_DESC "EHCI generic platform driver"
++#define EHCI_MAX_CLKS 3
++#define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv)
++
++struct ehci_platform_priv {
++	struct clk *clks[EHCI_MAX_CLKS];
++	struct phy *phy;
++};
+ 
+ static const char hcd_name[] = "ehci-platform";
+ 
+@@ -45,8 +55,10 @@ static int ehci_platform_reset(struct us
+ 
+ 	hcd->has_tt = pdata->has_tt;
+ 	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
+-	ehci->big_endian_desc = pdata->big_endian_desc;
+-	ehci->big_endian_mmio = pdata->big_endian_mmio;
++	if (pdata->big_endian_desc)
++		ehci->big_endian_desc = 1;
++	if (pdata->big_endian_mmio)
++		ehci->big_endian_mmio = 1;
+ 	ehci->ignore_oc = pdata->ignore_oc;
+ 
+ 	if (pdata->pre_setup) {
+@@ -65,38 +77,91 @@ static int ehci_platform_reset(struct us
+ 	return 0;
+ }
+ 
++static int ehci_platform_power_on(struct platform_device *dev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(dev);
++	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
++	int clk, ret;
++
++	for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++) {
++		ret = clk_prepare_enable(priv->clks[clk]);
++		if (ret)
++			goto err_disable_clks;
++	}
++
++	if (priv->phy) {
++		ret = phy_init(priv->phy);
++		if (ret)
++			goto err_disable_clks;
++
++		ret = phy_power_on(priv->phy);
++		if (ret)
++			goto err_exit_phy;
++	}
++
++	return 0;
++
++err_exit_phy:
++	phy_exit(priv->phy);
++err_disable_clks:
++	while (--clk >= 0)
++		clk_disable_unprepare(priv->clks[clk]);
++
++	return ret;
++}
++
++static void ehci_platform_power_off(struct platform_device *dev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(dev);
++	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
++	int clk;
++
++	if (priv->phy) {
++		phy_power_off(priv->phy);
++		phy_exit(priv->phy);
++	}
++
++	for (clk = EHCI_MAX_CLKS - 1; clk >= 0; clk--)
++		if (priv->clks[clk])
++			clk_disable_unprepare(priv->clks[clk]);
++}
++
+ static struct hc_driver __read_mostly ehci_platform_hc_driver;
+ 
+ static const struct ehci_driver_overrides platform_overrides __initconst = {
+-	.reset =	ehci_platform_reset,
++	.reset =		ehci_platform_reset,
++	.extra_priv_size =	sizeof(struct ehci_platform_priv),
+ };
+ 
+-static struct usb_ehci_pdata ehci_platform_defaults;
++static struct usb_ehci_pdata ehci_platform_defaults = {
++	.power_on =		ehci_platform_power_on,
++	.power_suspend =	ehci_platform_power_off,
++	.power_off =		ehci_platform_power_off,
++};
+ 
+ static int ehci_platform_probe(struct platform_device *dev)
+ {
+ 	struct usb_hcd *hcd;
+ 	struct resource *res_mem;
+-	struct usb_ehci_pdata *pdata;
+-	int irq;
+-	int err;
++	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
++	struct ehci_platform_priv *priv;
++	struct ehci_hcd *ehci;
++	int err, irq, clk = 0;
+ 
+ 	if (usb_disabled())
+ 		return -ENODEV;
+ 
+ 	/*
+-	 * use reasonable defaults so platforms don't have to provide these.
+-	 * with DT probing on ARM, none of these are set.
++	 * Use reasonable defaults so platforms don't have to provide these
++	 * with DT probing on ARM.
+ 	 */
+-	if (!dev_get_platdata(&dev->dev))
+-		dev->dev.platform_data = &ehci_platform_defaults;
++	if (!pdata)
++		pdata = &ehci_platform_defaults;
+ 
+ 	err = dma_coerce_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
+ 	if (err)
+ 		return err;
+ 
+-	pdata = dev_get_platdata(&dev->dev);
+-
+ 	irq = platform_get_irq(dev, 0);
+ 	if (irq < 0) {
+ 		dev_err(&dev->dev, "no irq provided");
+@@ -108,17 +173,66 @@ static int ehci_platform_probe(struct pl
+ 		return -ENXIO;
+ 	}
+ 
++	hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev,
++			     dev_name(&dev->dev));
++	if (!hcd)
++		return -ENOMEM;
++
++	platform_set_drvdata(dev, hcd);
++	dev->dev.platform_data = pdata;
++	priv = hcd_to_ehci_priv(hcd);
++	ehci = hcd_to_ehci(hcd);
++
++	if (pdata == &ehci_platform_defaults && dev->dev.of_node) {
++		if (of_property_read_bool(dev->dev.of_node, "big-endian-regs"))
++			ehci->big_endian_mmio = 1;
++
++		if (of_property_read_bool(dev->dev.of_node, "big-endian-desc"))
++			ehci->big_endian_desc = 1;
++
++		if (of_property_read_bool(dev->dev.of_node, "big-endian"))
++			ehci->big_endian_mmio = ehci->big_endian_desc = 1;
++
++#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
++		if (ehci->big_endian_mmio) {
++			dev_err(&dev->dev,
++				"Error big-endian-regs not compiled in\n");
++			err = -EINVAL;
++			goto err_put_hcd;
++		}
++#endif
++#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_DESC
++		if (ehci->big_endian_desc) {
++			dev_err(&dev->dev,
++				"Error big-endian-desc not compiled in\n");
++			err = -EINVAL;
++			goto err_put_hcd;
++		}
++#endif
++		priv->phy = devm_phy_get(&dev->dev, "usb");
++		if (IS_ERR(priv->phy)) {
++			err = PTR_ERR(priv->phy);
++			if (err == -EPROBE_DEFER)
++				goto err_put_hcd;
++			priv->phy = NULL;
++		}
++
++		for (clk = 0; clk < EHCI_MAX_CLKS; clk++) {
++			priv->clks[clk] = of_clk_get(dev->dev.of_node, clk);
++			if (IS_ERR(priv->clks[clk])) {
++				err = PTR_ERR(priv->clks[clk]);
++				if (err == -EPROBE_DEFER)
++					goto err_put_clks;
++				priv->clks[clk] = NULL;
++				break;
++			}
++		}
++	}
++
+ 	if (pdata->power_on) {
+ 		err = pdata->power_on(dev);
+ 		if (err < 0)
+-			return err;
+-	}
+-
+-	hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev,
+-			     dev_name(&dev->dev));
+-	if (!hcd) {
+-		err = -ENOMEM;
+-		goto err_power;
++			goto err_put_clks;
+ 	}
+ 
+ 	hcd->rsrc_start = res_mem->start;
+@@ -127,22 +241,28 @@ static int ehci_platform_probe(struct pl
+ 	hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
+ 	if (IS_ERR(hcd->regs)) {
+ 		err = PTR_ERR(hcd->regs);
+-		goto err_put_hcd;
++		goto err_power;
+ 	}
+ 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
+ 	if (err)
+-		goto err_put_hcd;
++		goto err_power;
+ 
+ 	device_wakeup_enable(hcd->self.controller);
+ 	platform_set_drvdata(dev, hcd);
+ 
+ 	return err;
+ 
+-err_put_hcd:
+-	usb_put_hcd(hcd);
+ err_power:
+ 	if (pdata->power_off)
+ 		pdata->power_off(dev);
++err_put_clks:
++	while (--clk >= 0)
++		clk_put(priv->clks[clk]);
++err_put_hcd:
++	if (pdata == &ehci_platform_defaults)
++		dev->dev.platform_data = NULL;
++
++	usb_put_hcd(hcd);
+ 
+ 	return err;
+ }
+@@ -151,13 +271,19 @@ static int ehci_platform_remove(struct p
+ {
+ 	struct usb_hcd *hcd = platform_get_drvdata(dev);
+ 	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
++	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
++	int clk;
+ 
+ 	usb_remove_hcd(hcd);
+-	usb_put_hcd(hcd);
+ 
+ 	if (pdata->power_off)
+ 		pdata->power_off(dev);
+ 
++	for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++)
++		clk_put(priv->clks[clk]);
++
++	usb_put_hcd(hcd);
++
+ 	if (pdata == &ehci_platform_defaults)
+ 		dev->dev.platform_data = NULL;
+ 
+@@ -208,8 +334,10 @@ static int ehci_platform_resume(struct d
+ static const struct of_device_id vt8500_ehci_ids[] = {
+ 	{ .compatible = "via,vt8500-ehci", },
+ 	{ .compatible = "wm,prizm-ehci", },
++	{ .compatible = "generic-ehci", },
+ 	{}
+ };
++MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
+ 
+ static const struct platform_device_id ehci_platform_table[] = {
+ 	{ "ehci-platform", 0 },
diff --git a/trunk/target/linux/sunxi/patches-3.14/195-3-uhci-plat-changes.patch b/trunk/target/linux/sunxi/patches-3.14/195-3-uhci-plat-changes.patch
new file mode 100644
index 00000000..53c808fb
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/195-3-uhci-plat-changes.patch
@@ -0,0 +1,72 @@
+From 2adf0917bc9d6db8d957d56c8289a623be4027b6 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 11 Feb 2014 17:41:48 +0100
+Subject: [PATCH] uhci-platform: Change compatible string from platform-uhci to
+ generic-uhci
+
+This brings the uhci-platform bindings in sync with what we've done for
+the ohci- and ehci-platform drivers. As discussed there using platform as a
+prefix is a bit weird as the platform bus is a Linux specific thing and
+the bindings are supposed to be OS agnostic.
+
+Note that the old platform-uhci compatible string is kept around for, well,
+compatibility reasons.
+
+While at it rename the bindings txt file to match the name of all the
+other ?hci-platform bindings docs.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ Documentation/devicetree/bindings/usb/platform-uhci.txt | 15 ---------------
+ Documentation/devicetree/bindings/usb/usb-uhci.txt      | 15 +++++++++++++++
+ drivers/usb/host/uhci-platform.c                        |  1 +
+ 3 files changed, 16 insertions(+), 15 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/usb/platform-uhci.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/usb-uhci.txt
+
+--- a/Documentation/devicetree/bindings/usb/platform-uhci.txt
++++ /dev/null
+@@ -1,15 +0,0 @@
+-Generic Platform UHCI Controller
+------------------------------------------------------
+-
+-Required properties:
+-- compatible : "platform-uhci"
+-- reg : Should contain 1 register ranges(address and length)
+-- interrupts : UHCI controller interrupt
+-
+-Example:
+-
+-	uhci@d8007b00 {
+-		compatible = "platform-uhci";
+-		reg = <0xd8007b00 0x200>;
+-		interrupts = <43>;
+-	};
+--- /dev/null
++++ b/Documentation/devicetree/bindings/usb/usb-uhci.txt
+@@ -0,0 +1,15 @@
++Generic Platform UHCI Controller
++-----------------------------------------------------
++
++Required properties:
++- compatible : "generic-uhci" (deprecated: "platform-uhci")
++- reg : Should contain 1 register ranges(address and length)
++- interrupts : UHCI controller interrupt
++
++Example:
++
++	uhci@d8007b00 {
++		compatible = "generic-uhci";
++		reg = <0xd8007b00 0x200>;
++		interrupts = <43>;
++	};
+--- a/drivers/usb/host/uhci-platform.c
++++ b/drivers/usb/host/uhci-platform.c
+@@ -148,6 +148,7 @@ static void uhci_hcd_platform_shutdown(s
+ }
+ 
+ static const struct of_device_id platform_uhci_ids[] = {
++	{ .compatible = "generic-uhci", },
+ 	{ .compatible = "platform-uhci", },
+ 	{}
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch b/trunk/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
new file mode 100644
index 00000000..09c3076c
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
@@ -0,0 +1,49 @@
+From 8fd033e1b6cdd30c32762ef1c5e2216226dd61e1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 11 Feb 2014 17:50:51 +0100
+Subject: [PATCH] xhci-platform: Change compatible string from xhci-platform to
+ generic-xhci
+
+This brings the xhci-platform bindings in sync with what we've done for
+the ohci- and ehci-platform drivers. As discussed there using platform as a
+postfix is a bit weird as the platform bus is a Linux specific thing and
+the bindings are supposed to be OS agnostic.
+
+Note that the old xhci-platform compatible string is kept around for, well,
+compatibility reasons.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 ++--
+ drivers/usb/host/xhci-plat.c                       | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
++++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
+@@ -1,14 +1,14 @@
+ USB xHCI controllers
+ 
+ Required properties:
+-  - compatible: should be "xhci-platform".
++  - compatible: should be "generic-xhci" (deprecated: "xhci-platform").
+   - reg: should contain address and length of the standard XHCI
+     register set for the device.
+   - interrupts: one XHCI interrupt should be described here.
+ 
+ Example:
+ 	usb@f0931000 {
+-		compatible = "xhci-platform";
++		compatible = "generic-xhci";
+ 		reg = <0xf0931000 0x8c8>;
+ 		interrupts = <0x0 0x4e 0x0>;
+ 	};
+--- a/drivers/usb/host/xhci-plat.c
++++ b/drivers/usb/host/xhci-plat.c
+@@ -234,6 +234,7 @@ static const struct dev_pm_ops xhci_plat
+ 
+ #ifdef CONFIG_OF
+ static const struct of_device_id usb_xhci_of_match[] = {
++	{ .compatible = "generic-xhci" },
+ 	{ .compatible = "xhci-platform" },
+ 	{ },
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/196-usb-add-sunxi-phy-driver.patch b/trunk/target/linux/sunxi/patches-3.14/196-usb-add-sunxi-phy-driver.patch
new file mode 100644
index 00000000..5f1ea836
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/196-usb-add-sunxi-phy-driver.patch
@@ -0,0 +1,410 @@
+From 56feaa546c5ce4152fe14f725e9fc6b85f8a565b Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sat, 4 Jan 2014 23:56:17 +0100
+Subject: [PATCH] PHY: sunxi: Add driver for sunxi usb phy
+
+The Allwinner A1x / A2x SoCs have 2 or 3 usb phys which are all accessed
+through a single set of registers. Besides this there are also some other
+phy related bits which need poking, which are per phy, but shared between the
+ohci and ehci controllers, so these are also controlled from this new phy
+driver.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ .../devicetree/bindings/phy/sun4i-usb-phy.txt      |  26 ++
+ drivers/phy/Kconfig                                |  11 +
+ drivers/phy/Makefile                               |   1 +
+ drivers/phy/phy-sun4i-usb.c                        | 331 +++++++++++++++++++++
+ 4 files changed, 369 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
+ create mode 100644 drivers/phy/phy-sun4i-usb.c
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
+@@ -0,0 +1,26 @@
++Allwinner sun4i USB PHY
++-----------------------
++
++Required properties:
++- compatible : should be one of "allwinner,sun4i-a10-usb-phy",
++  "allwinner,sun5i-a13-usb-phy" or "allwinner,sun7i-a20-usb-phy"
++- reg : a list of offset + length pairs
++- reg-names : "phy_ctrl", "pmu1" and for sun4i or sun7i "pmu2"
++- #phy-cells : from the generic phy bindings, must be 1
++- clocks : phandle + clock specifier for the phy clock
++- clock-names : "usb_phy"
++- resets : a list of phandle + reset specifier pairs
++- reset-names : "usb0_reset", "usb1_reset" and for sun4i or sun7i "usb2_reset"
++
++Example:
++	usbphy: phy@0x01c13400 {
++		#phy-cells = <1>;
++		compatible = "allwinner,sun4i-a10-usb-phy";
++		/* phy base regs, phy1 pmu reg, phy2 pmu reg */
++		reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>;
++		reg-names = "phy_ctrl", "pmu1", "pmu2";
++		clocks = <&usb_clk 8>;
++		clock-names = "usb_phy";
++		resets = <&usb_clk 1>, <&usb_clk 2>;
++		reset-names = "usb1_reset", "usb2_reset";
++	};
+--- a/drivers/phy/Kconfig
++++ b/drivers/phy/Kconfig
+@@ -65,4 +65,15 @@ config BCM_KONA_USB2_PHY
+ 	help
+ 	  Enable this to support the Broadcom Kona USB 2.0 PHY.
+ 
++config PHY_SUN4I_USB
++	tristate "Allwinner sunxi SoC USB PHY driver"
++	depends on ARCH_SUNXI && HAS_IOMEM && OF
++	select GENERIC_PHY
++	help
++	  Enable this to support the transceiver that is part of Allwinner
++	  sunxi SoCs.
++
++	  This driver controls the entire USB PHY block, both the USB OTG
++	  parts, as well as the 2 regular USB 2 host PHYs.
++
+ endmenu
+--- a/drivers/phy/Makefile
++++ b/drivers/phy/Makefile
+@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)	+= p
+ obj-$(CONFIG_PHY_MVEBU_SATA)		+= phy-mvebu-sata.o
+ obj-$(CONFIG_OMAP_USB2)			+= phy-omap-usb2.o
+ obj-$(CONFIG_TWL4030_USB)		+= phy-twl4030-usb.o
++obj-$(CONFIG_PHY_SUN4I_USB)		+= phy-sun4i-usb.o
+--- /dev/null
++++ b/drivers/phy/phy-sun4i-usb.c
+@@ -0,0 +1,331 @@
++/*
++ * Allwinner sun4i USB phy driver
++ *
++ * Copyright (C) 2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * Based on code from
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ *
++ * Modelled after: Samsung S5P/EXYNOS SoC series MIPI CSIS/DSIM DPHY driver
++ * Copyright (C) 2013 Samsung Electronics Co., Ltd.
++ * Author: Sylwester Nawrocki <s.nawrocki@samsung.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++#include <linux/clk.h>
++#include <linux/io.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++#include <linux/of.h>
++#include <linux/of_address.h>
++#include <linux/phy/phy.h>
++#include <linux/platform_device.h>
++#include <linux/regulator/consumer.h>
++#include <linux/reset.h>
++
++#define REG_ISCR			0x00
++#define REG_PHYCTL			0x04
++#define REG_PHYBIST			0x08
++#define REG_PHYTUNE			0x0c
++
++#define PHYCTL_DATA			BIT(7)
++
++#define SUNXI_AHB_ICHR8_EN		BIT(10)
++#define SUNXI_AHB_INCR4_BURST_EN	BIT(9)
++#define SUNXI_AHB_INCRX_ALIGN_EN	BIT(8)
++#define SUNXI_ULPI_BYPASS_EN		BIT(0)
++
++/* Common Control Bits for Both PHYs */
++#define PHY_PLL_BW			0x03
++#define PHY_RES45_CAL_EN		0x0c
++
++/* Private Control Bits for Each PHY */
++#define PHY_TX_AMPLITUDE_TUNE		0x20
++#define PHY_TX_SLEWRATE_TUNE		0x22
++#define PHY_VBUSVALID_TH_SEL		0x25
++#define PHY_PULLUP_RES_SEL		0x27
++#define PHY_OTG_FUNC_EN			0x28
++#define PHY_VBUS_DET_EN			0x29
++#define PHY_DISCON_TH_SEL		0x2a
++
++#define MAX_PHYS			3
++
++struct sun4i_usb_phy_data {
++	struct clk *clk;
++	void __iomem *base;
++	struct mutex mutex;
++	int num_phys;
++	u32 disc_thresh;
++	struct sun4i_usb_phy {
++		struct phy *phy;
++		void __iomem *pmu;
++		struct regulator *vbus;
++		struct reset_control *reset;
++		int index;
++	} phys[MAX_PHYS];
++};
++
++#define to_sun4i_usb_phy_data(phy) \
++	container_of((phy), struct sun4i_usb_phy_data, phys[(phy)->index])
++
++static void sun4i_usb_phy_write(struct sun4i_usb_phy *phy, u32 addr, u32 data,
++				int len)
++{
++	struct sun4i_usb_phy_data *phy_data = to_sun4i_usb_phy_data(phy);
++	u32 temp, usbc_bit = BIT(phy->index * 2);
++	int i;
++
++	mutex_lock(&phy_data->mutex);
++
++	for (i = 0; i < len; i++) {
++		temp = readl(phy_data->base + REG_PHYCTL);
++
++		/* clear the address portion */
++		temp &= ~(0xff << 8);
++
++		/* set the address */
++		temp |= ((addr + i) << 8);
++		writel(temp, phy_data->base + REG_PHYCTL);
++
++		/* set the data bit and clear usbc bit*/
++		temp = readb(phy_data->base + REG_PHYCTL);
++		if (data & 0x1)
++			temp |= PHYCTL_DATA;
++		else
++			temp &= ~PHYCTL_DATA;
++		temp &= ~usbc_bit;
++		writeb(temp, phy_data->base + REG_PHYCTL);
++
++		/* pulse usbc_bit */
++		temp = readb(phy_data->base + REG_PHYCTL);
++		temp |= usbc_bit;
++		writeb(temp, phy_data->base + REG_PHYCTL);
++
++		temp = readb(phy_data->base + REG_PHYCTL);
++		temp &= ~usbc_bit;
++		writeb(temp, phy_data->base + REG_PHYCTL);
++
++		data >>= 1;
++	}
++	mutex_unlock(&phy_data->mutex);
++}
++
++static void sun4i_usb_phy_passby(struct sun4i_usb_phy *phy, int enable)
++{
++	u32 bits, reg_value;
++
++	if (!phy->pmu)
++		return;
++
++	bits = SUNXI_AHB_ICHR8_EN | SUNXI_AHB_INCR4_BURST_EN |
++		SUNXI_AHB_INCRX_ALIGN_EN | SUNXI_ULPI_BYPASS_EN;
++
++	reg_value = readl(phy->pmu);
++
++	if (enable)
++		reg_value |= bits;
++	else
++		reg_value &= ~bits;
++
++	writel(reg_value, phy->pmu);
++}
++
++static int sun4i_usb_phy_init(struct phy *_phy)
++{
++	struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
++	struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
++	int ret;
++
++	ret = clk_prepare_enable(data->clk);
++	if (ret)
++		return ret;
++
++	ret = reset_control_deassert(phy->reset);
++	if (ret) {
++		clk_disable_unprepare(data->clk);
++		return ret;
++	}
++
++	/* Adjust PHY's magnitude and rate */
++	sun4i_usb_phy_write(phy, PHY_TX_AMPLITUDE_TUNE, 0x14, 5);
++
++	/* Disconnect threshold adjustment */
++	sun4i_usb_phy_write(phy, PHY_DISCON_TH_SEL, data->disc_thresh, 2);
++
++	sun4i_usb_phy_passby(phy, 1);
++
++	return 0;
++}
++
++static int sun4i_usb_phy_exit(struct phy *_phy)
++{
++	struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
++	struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
++
++	sun4i_usb_phy_passby(phy, 0);
++	reset_control_assert(phy->reset);
++	clk_disable_unprepare(data->clk);
++
++	return 0;
++}
++
++static int sun4i_usb_phy_power_on(struct phy *_phy)
++{
++	struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
++	int ret = 0;
++
++	if (phy->vbus)
++		ret = regulator_enable(phy->vbus);
++
++	return ret;
++}
++
++static int sun4i_usb_phy_power_off(struct phy *_phy)
++{
++	struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
++
++	if (phy->vbus)
++		regulator_disable(phy->vbus);
++
++	return 0;
++}
++
++static struct phy_ops sun4i_usb_phy_ops = {
++	.init		= sun4i_usb_phy_init,
++	.exit		= sun4i_usb_phy_exit,
++	.power_on	= sun4i_usb_phy_power_on,
++	.power_off	= sun4i_usb_phy_power_off,
++	.owner		= THIS_MODULE,
++};
++
++static struct phy *sun4i_usb_phy_xlate(struct device *dev,
++					struct of_phandle_args *args)
++{
++	struct sun4i_usb_phy_data *data = dev_get_drvdata(dev);
++
++	if (WARN_ON(args->args[0] == 0 || args->args[0] >= data->num_phys))
++		return ERR_PTR(-ENODEV);
++
++	return data->phys[args->args[0]].phy;
++}
++
++static int sun4i_usb_phy_probe(struct platform_device *pdev)
++{
++	struct sun4i_usb_phy_data *data;
++	struct device *dev = &pdev->dev;
++	struct device_node *np = dev->of_node;
++	void __iomem *pmu = NULL;
++	struct phy_provider *phy_provider;
++	struct reset_control *reset;
++	struct regulator *vbus;
++	struct resource *res;
++	struct phy *phy;
++	char name[16];
++	int i;
++
++	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
++	if (!data)
++		return -ENOMEM;
++
++	mutex_init(&data->mutex);
++
++	if (of_device_is_compatible(np, "allwinner,sun5i-a13-usb-phy"))
++		data->num_phys = 2;
++	else
++		data->num_phys = 3;
++
++	if (of_device_is_compatible(np, "allwinner,sun4i-a10-usb-phy"))
++		data->disc_thresh = 3;
++	else
++		data->disc_thresh = 2;
++
++	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy_ctrl");
++	data->base = devm_ioremap_resource(dev, res);
++	if (IS_ERR(data->base))
++		return PTR_ERR(data->base);
++
++	data->clk = devm_clk_get(dev, "usb_phy");
++	if (IS_ERR(data->clk)) {
++		dev_err(dev, "could not get usb_phy clock\n");
++		return PTR_ERR(data->clk);
++	}
++
++	/* Skip 0, 0 is the phy for otg which is not yet supported. */
++	for (i = 1; i < data->num_phys; i++) {
++		snprintf(name, sizeof(name), "usb%d_vbus", i);
++		vbus = devm_regulator_get_optional(dev, name);
++		if (IS_ERR(vbus)) {
++			if (PTR_ERR(vbus) == -EPROBE_DEFER)
++				return -EPROBE_DEFER;
++			vbus = NULL;
++		}
++
++		snprintf(name, sizeof(name), "usb%d_reset", i);
++		reset = devm_reset_control_get(dev, name);
++		if (IS_ERR(reset)) {
++			dev_err(dev, "failed to get reset %s\n", name);
++			return PTR_ERR(reset);
++		}
++
++		if (i) { /* No pmu for usbc0 */
++			snprintf(name, sizeof(name), "pmu%d", i);
++			res = platform_get_resource_byname(pdev,
++							IORESOURCE_MEM, name);
++			pmu = devm_ioremap_resource(dev, res);
++			if (IS_ERR(pmu))
++				return PTR_ERR(pmu);
++		}
++
++		phy = devm_phy_create(dev, &sun4i_usb_phy_ops, NULL);
++		if (IS_ERR(phy)) {
++			dev_err(dev, "failed to create PHY %d\n", i);
++			return PTR_ERR(phy);
++		}
++
++		data->phys[i].phy = phy;
++		data->phys[i].pmu = pmu;
++		data->phys[i].vbus = vbus;
++		data->phys[i].reset = reset;
++		data->phys[i].index = i;
++		phy_set_drvdata(phy, &data->phys[i]);
++	}
++
++	dev_set_drvdata(dev, data);
++	phy_provider = devm_of_phy_provider_register(dev, sun4i_usb_phy_xlate);
++	if (IS_ERR(phy_provider))
++		return PTR_ERR(phy_provider);
++
++	return 0;
++}
++
++static const struct of_device_id sun4i_usb_phy_of_match[] = {
++	{ .compatible = "allwinner,sun4i-a10-usb-phy" },
++	{ .compatible = "allwinner,sun5i-a13-usb-phy" },
++	{ .compatible = "allwinner,sun7i-a20-usb-phy" },
++	{ },
++};
++MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match);
++
++static struct platform_driver sun4i_usb_phy_driver = {
++	.probe	= sun4i_usb_phy_probe,
++	.driver = {
++		.of_match_table	= sun4i_usb_phy_of_match,
++		.name  = "sun4i-usb-phy",
++		.owner = THIS_MODULE,
++	}
++};
++module_platform_driver(sun4i_usb_phy_driver);
++
++MODULE_DESCRIPTION("Allwinner sun4i USB phy driver");
++MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
++MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/sunxi/patches-3.14/200-mmc-add-driver.patch b/trunk/target/linux/sunxi/patches-3.14/200-mmc-add-driver.patch
new file mode 100644
index 00000000..ece71540
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/200-mmc-add-driver.patch
@@ -0,0 +1,1150 @@
+From a2fb45195f1b90058e96e09892c071ef4207b593 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= <david.lanzendoerfer@o2s.ch>
+Date: Sat, 22 Feb 2014 09:13:55 +0100
+Subject: [PATCH] ARM: sunxi: Add driver for SD/MMC hosts found on Allwinner
+ sunxi SoCs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is based on the driver Allwinner ships in their Android kernel sources.
+
+Initial porting to upstream kernels done by David Lanzendörfer, additional
+fixes and cleanups by Hans de Goede.
+
+It uses dma in bus-master mode using a built-in designware idmac controller,
+which is identical to the one found in the mmc-dw hosts.
+The rest of the host is not identical to mmc-dw.
+
+Signed-off-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/mmc/host/Kconfig     |   7 +
+ drivers/mmc/host/Makefile    |   2 +
+ drivers/mmc/host/sunxi-mmc.c | 853 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/mmc/host/sunxi-mmc.h | 238 ++++++++++++
+ 4 files changed, 1100 insertions(+)
+ create mode 100644 drivers/mmc/host/sunxi-mmc.c
+ create mode 100644 drivers/mmc/host/sunxi-mmc.h
+
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -714,3 +714,10 @@ config MMC_REALTEK_PCI
+ 	help
+ 	  Say Y here to include driver code to support SD/MMC card interface
+ 	  of Realtek PCI-E card reader
++
++config MMC_SUNXI
++	tristate "Allwinner sunxi SD/MMC Host Controller support"
++	depends on ARCH_SUNXI
++	help
++	  This selects support for the SD/MMC Host Controller on
++	  Allwinner sunxi SoCs.
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -55,6 +55,8 @@ obj-$(CONFIG_MMC_WMT)		+= wmt-sdmmc.o
+ 
+ obj-$(CONFIG_MMC_REALTEK_PCI)	+= rtsx_pci_sdmmc.o
+ 
++obj-$(CONFIG_MMC_SUNXI)		+= sunxi-mmc.o
++
+ obj-$(CONFIG_MMC_SDHCI_PLTFM)		+= sdhci-pltfm.o
+ obj-$(CONFIG_MMC_SDHCI_CNS3XXX)		+= sdhci-cns3xxx.o
+ obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX)	+= sdhci-esdhc-imx.o
+--- /dev/null
++++ b/drivers/mmc/host/sunxi-mmc.c
+@@ -0,0 +1,853 @@
++/*
++ * Driver for sunxi SD/MMC host controllers
++ * (C) Copyright 2007-2011 Reuuimlla Technology Co., Ltd.
++ * (C) Copyright 2007-2011 Aaron Maoye <leafy.myeh@reuuimllatech.com>
++ * (C) Copyright 2013-2014 O2S GmbH <www.o2s.ch>
++ * (C) Copyright 2013-2014 David Lanzendörfer <david.lanzendoerfer@o2s.ch>
++ * (C) Copyright 2013-2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/io.h>
++#include <linux/device.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/err.h>
++
++#include <linux/clk.h>
++#include <linux/clk-private.h>
++#include <linux/clk/sunxi.h>
++
++#include <linux/gpio.h>
++#include <linux/platform_device.h>
++#include <linux/spinlock.h>
++#include <linux/scatterlist.h>
++#include <linux/dma-mapping.h>
++#include <linux/slab.h>
++#include <linux/regulator/consumer.h>
++
++#include <linux/of_address.h>
++#include <linux/of_gpio.h>
++#include <linux/of_platform.h>
++
++#include <linux/mmc/host.h>
++#include <linux/mmc/sd.h>
++#include <linux/mmc/sdio.h>
++#include <linux/mmc/mmc.h>
++#include <linux/mmc/core.h>
++#include <linux/mmc/card.h>
++#include <linux/mmc/slot-gpio.h>
++
++#include "sunxi-mmc.h"
++
++static int sunxi_mmc_init_host(struct mmc_host *mmc)
++{
++	u32 rval;
++	struct sunxi_mmc_host *smc_host = mmc_priv(mmc);
++	int ret;
++
++	ret =  clk_prepare_enable(smc_host->clk_ahb);
++	if (ret) {
++		dev_err(mmc_dev(smc_host->mmc), "AHB clk err %d\n", ret);
++		return ret;
++	}
++	ret =  clk_prepare_enable(smc_host->clk_mod);
++	if (ret) {
++		dev_err(mmc_dev(smc_host->mmc), "MOD clk err %d\n", ret);
++		clk_disable_unprepare(smc_host->clk_ahb);
++		return ret;
++	}
++
++	/* reset controller */
++	rval = mci_readl(smc_host, REG_GCTRL) | SDXC_HARDWARE_RESET;
++	mci_writel(smc_host, REG_GCTRL, rval);
++
++	mci_writel(smc_host, REG_FTRGL, 0x20070008);
++	mci_writel(smc_host, REG_TMOUT, 0xffffffff);
++	mci_writel(smc_host, REG_IMASK, smc_host->sdio_imask);
++	mci_writel(smc_host, REG_RINTR, 0xffffffff);
++	mci_writel(smc_host, REG_DBGC, 0xdeb);
++	mci_writel(smc_host, REG_FUNS, 0xceaa0000);
++	mci_writel(smc_host, REG_DLBA, smc_host->sg_dma);
++	rval = mci_readl(smc_host, REG_GCTRL)|SDXC_INTERRUPT_ENABLE_BIT;
++	rval &= ~SDXC_ACCESS_DONE_DIRECT;
++	mci_writel(smc_host, REG_GCTRL, rval);
++
++	return 0;
++}
++
++static void sunxi_mmc_exit_host(struct sunxi_mmc_host *smc_host)
++{
++	mci_writel(smc_host, REG_GCTRL, SDXC_HARDWARE_RESET);
++	clk_disable_unprepare(smc_host->clk_ahb);
++	clk_disable_unprepare(smc_host->clk_mod);
++}
++
++/* /\* UHS-I Operation Modes */
++/*  * DS		25MHz	12.5MB/s	3.3V */
++/*  * HS		50MHz	25MB/s		3.3V */
++/*  * SDR12	25MHz	12.5MB/s	1.8V */
++/*  * SDR25	50MHz	25MB/s		1.8V */
++/*  * SDR50	100MHz	50MB/s		1.8V */
++/*  * SDR104	208MHz	104MB/s		1.8V */
++/*  * DDR50	50MHz	50MB/s		1.8V */
++/*  * MMC Operation Modes */
++/*  * DS		26MHz	26MB/s		3/1.8/1.2V */
++/*  * HS		52MHz	52MB/s		3/1.8/1.2V */
++/*  * HSDDR	52MHz	104MB/s		3/1.8/1.2V */
++/*  * HS200	200MHz	200MB/s		1.8/1.2V */
++/*  * */
++/*  * Spec. Timing */
++/*  * SD3.0 */
++/*  * Fcclk    Tcclk   Fsclk   Tsclk   Tis     Tih     odly  RTis     RTih */
++/*  * 400K     2.5us   24M     41ns    5ns     5ns     1     2209ns   41ns */
++/*  * 25M      40ns    600M    1.67ns  5ns     5ns     3     14.99ns  5.01ns */
++/*  * 50M      20ns    600M    1.67ns  6ns     2ns     3     14.99ns  5.01ns */
++/*  * 50MDDR   20ns    600M    1.67ns  6ns     0.8ns   2     6.67ns   3.33ns */
++/*  * 104M     9.6ns   600M    1.67ns  3ns     0.8ns   1     7.93ns   1.67ns */
++/*  * 208M     4.8ns   600M    1.67ns  1.4ns   0.8ns   1     3.33ns   1.67ns */
++
++/*  * 25M      40ns    300M    3.33ns  5ns     5ns     2     13.34ns   6.66ns */
++/*  * 50M      20ns    300M    3.33ns  6ns     2ns     2     13.34ns   6.66ns */
++/*  * 50MDDR   20ns    300M    3.33ns  6ns     0.8ns   1     6.67ns    3.33ns */
++/*  * 104M     9.6ns   300M    3.33ns  3ns     0.8ns   0     7.93ns    1.67ns */
++/*  * 208M     4.8ns   300M    3.33ns  1.4ns   0.8ns   0     3.13ns    1.67ns */
++
++/*  * eMMC4.5 */
++/*  * 400K     2.5us   24M     41ns    3ns     3ns     1     2209ns    41ns */
++/*  * 25M      40ns    600M    1.67ns  3ns     3ns     3     14.99ns   5.01ns */
++/*  * 50M      20ns    600M    1.67ns  3ns     3ns     3     14.99ns   5.01ns */
++/*  * 50MDDR   20ns    600M    1.67ns  2.5ns   2.5ns   2     6.67ns    3.33ns */
++/*  * 200M     5ns     600M    1.67ns  1.4ns   0.8ns   1     3.33ns    1.67ns */
++/*  *\/ */
++
++static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host,
++				    struct mmc_data *data)
++{
++	struct sunxi_idma_des *pdes = (struct sunxi_idma_des *)host->sg_cpu;
++	struct sunxi_idma_des *pdes_pa = (struct sunxi_idma_des *)host->sg_dma;
++	int i, max_len = (1 << host->idma_des_size_bits);
++
++	for (i = 0; i < data->sg_len; i++) {
++		pdes[i].config = SDXC_IDMAC_DES0_CH | SDXC_IDMAC_DES0_OWN |
++				 SDXC_IDMAC_DES0_DIC;
++
++		if (data->sg[i].length == max_len)
++			pdes[i].buf_size = 0; /* 0 == max_len */
++		else
++			pdes[i].buf_size = data->sg[i].length;
++
++		pdes[i].buf_addr_ptr1 = sg_dma_address(&data->sg[i]);
++		pdes[i].buf_addr_ptr2 = (u32)&pdes_pa[i + 1];
++	}
++
++	pdes[0].config |= SDXC_IDMAC_DES0_FD;
++	pdes[i - 1].config = SDXC_IDMAC_DES0_OWN | SDXC_IDMAC_DES0_LD;
++
++	wmb(); /* Ensure idma_des hit main mem before we start the idmac */
++}
++
++static enum dma_data_direction sunxi_mmc_get_dma_dir(struct mmc_data *data)
++{
++	if (data->flags & MMC_DATA_WRITE)
++		return DMA_TO_DEVICE;
++	else
++		return DMA_FROM_DEVICE;
++}
++
++static int sunxi_mmc_prepare_dma(struct sunxi_mmc_host *smc_host,
++				 struct mmc_data *data)
++{
++	u32 dma_len;
++	u32 i;
++	u32 temp;
++	struct scatterlist *sg;
++
++	dma_len = dma_map_sg(mmc_dev(smc_host->mmc), data->sg, data->sg_len,
++			     sunxi_mmc_get_dma_dir(data));
++	if (dma_len == 0) {
++		dev_err(mmc_dev(smc_host->mmc), "dma_map_sg failed\n");
++		return -ENOMEM;
++	}
++
++	for_each_sg(data->sg, sg, data->sg_len, i) {
++		if (sg->offset & 3 || sg->length & 3) {
++			dev_err(mmc_dev(smc_host->mmc),
++				"unaligned scatterlist: os %x length %d\n",
++				sg->offset, sg->length);
++			return -EINVAL;
++		}
++	}
++
++	sunxi_mmc_init_idma_des(smc_host, data);
++
++	temp = mci_readl(smc_host, REG_GCTRL);
++	temp |= SDXC_DMA_ENABLE_BIT;
++	mci_writel(smc_host, REG_GCTRL, temp);
++	temp |= SDXC_DMA_RESET;
++	mci_writel(smc_host, REG_GCTRL, temp);
++	mci_writel(smc_host, REG_DMAC, SDXC_IDMAC_SOFT_RESET);
++
++	if (!(data->flags & MMC_DATA_WRITE))
++		mci_writel(smc_host, REG_IDIE, SDXC_IDMAC_RECEIVE_INTERRUPT);
++
++	mci_writel(smc_host, REG_DMAC, SDXC_IDMAC_FIX_BURST | SDXC_IDMAC_IDMA_ON);
++
++	return 0;
++}
++
++static void sunxi_mmc_send_manual_stop(struct sunxi_mmc_host *host,
++				       struct mmc_request *req)
++{
++	u32 cmd_val = SDXC_START | SDXC_RESP_EXPIRE | SDXC_STOP_ABORT_CMD
++			| SDXC_CHECK_RESPONSE_CRC | MMC_STOP_TRANSMISSION;
++	u32 ri = 0;
++	unsigned long expire = jiffies + msecs_to_jiffies(1000);
++
++	mci_writel(host, REG_CARG, 0);
++	mci_writel(host, REG_CMDR, cmd_val);
++
++	do {
++		ri = mci_readl(host, REG_RINTR);
++	} while (!(ri & (SDXC_COMMAND_DONE | SDXC_INTERRUPT_ERROR_BIT)) &&
++		 time_before(jiffies, expire));
++
++	if (ri & SDXC_INTERRUPT_ERROR_BIT) {
++		dev_err(mmc_dev(host->mmc), "send stop command failed\n");
++		if (req->stop)
++			req->stop->resp[0] = -ETIMEDOUT;
++	} else {
++		if (req->stop)
++			req->stop->resp[0] = mci_readl(host, REG_RESP0);
++	}
++
++	mci_writel(host, REG_RINTR, 0xffff);
++}
++
++static void sunxi_mmc_dump_errinfo(struct sunxi_mmc_host *smc_host)
++{
++	struct mmc_command *cmd = smc_host->mrq->cmd;
++	struct mmc_data *data = smc_host->mrq->data;
++
++	/* For some cmds timeout is normal with sd/mmc cards */
++	if ((smc_host->int_sum & SDXC_INTERRUPT_ERROR_BIT) == SDXC_RESP_TIMEOUT &&
++			(cmd->opcode == SD_IO_SEND_OP_COND || cmd->opcode == SD_IO_RW_DIRECT))
++		return;
++
++	dev_err(mmc_dev(smc_host->mmc),
++		"smc %d err, cmd %d,%s%s%s%s%s%s%s%s%s%s !!\n",
++		smc_host->mmc->index, cmd->opcode,
++		data ? (data->flags & MMC_DATA_WRITE ? " WR" : " RD") : "",
++		smc_host->int_sum & SDXC_RESP_ERROR     ? " RE"     : "",
++		smc_host->int_sum & SDXC_RESP_CRC_ERROR  ? " RCE"    : "",
++		smc_host->int_sum & SDXC_DATA_CRC_ERROR  ? " DCE"    : "",
++		smc_host->int_sum & SDXC_RESP_TIMEOUT ? " RTO"    : "",
++		smc_host->int_sum & SDXC_DATA_TIMEOUT ? " DTO"    : "",
++		smc_host->int_sum & SDXC_FIFO_RUN_ERROR  ? " FE"     : "",
++		smc_host->int_sum & SDXC_HARD_WARE_LOCKED ? " HL"     : "",
++		smc_host->int_sum & SDXC_START_BIT_ERROR ? " SBE"    : "",
++		smc_host->int_sum & SDXC_END_BIT_ERROR   ? " EBE"    : ""
++		);
++}
++
++static void sunxi_mmc_finalize_request(struct sunxi_mmc_host *host)
++{
++	struct mmc_request *mrq;
++	unsigned long iflags;
++
++	spin_lock_irqsave(&host->lock, iflags);
++
++	mrq = host->mrq;
++	if (!mrq) {
++		spin_unlock_irqrestore(&host->lock, iflags);
++		dev_err(mmc_dev(host->mmc), "no request to finalize\n");
++		return;
++	}
++
++	if (host->int_sum & SDXC_INTERRUPT_ERROR_BIT) {
++		sunxi_mmc_dump_errinfo(host);
++		mrq->cmd->error = -ETIMEDOUT;
++		if (mrq->data)
++			mrq->data->error = -ETIMEDOUT;
++		if (mrq->stop)
++			mrq->stop->error = -ETIMEDOUT;
++	} else {
++		if (mrq->cmd->flags & MMC_RSP_136) {
++			mrq->cmd->resp[0] = mci_readl(host, REG_RESP3);
++			mrq->cmd->resp[1] = mci_readl(host, REG_RESP2);
++			mrq->cmd->resp[2] = mci_readl(host, REG_RESP1);
++			mrq->cmd->resp[3] = mci_readl(host, REG_RESP0);
++		} else {
++			mrq->cmd->resp[0] = mci_readl(host, REG_RESP0);
++		}
++		if (mrq->data)
++			mrq->data->bytes_xfered =
++				mrq->data->blocks * mrq->data->blksz;
++	}
++
++	if (mrq->data) {
++		struct mmc_data *data = mrq->data;
++		u32 temp;
++
++		mci_writel(host, REG_IDST, 0x337);
++		mci_writel(host, REG_DMAC, 0);
++		temp = mci_readl(host, REG_GCTRL);
++		mci_writel(host, REG_GCTRL, temp|SDXC_DMA_RESET);
++		temp &= ~SDXC_DMA_ENABLE_BIT;
++		mci_writel(host, REG_GCTRL, temp);
++		temp |= SDXC_FIFO_RESET;
++		mci_writel(host, REG_GCTRL, temp);
++		dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
++				     sunxi_mmc_get_dma_dir(data));
++	}
++
++	mci_writel(host, REG_RINTR, 0xffff);
++
++	dev_dbg(mmc_dev(host->mmc), "req done, resp %08x %08x %08x %08x\n",
++		mrq->cmd->resp[0], mrq->cmd->resp[1],
++		mrq->cmd->resp[2], mrq->cmd->resp[3]);
++
++	host->mrq = NULL;
++	host->int_sum = 0;
++	host->wait_dma = 0;
++
++	spin_unlock_irqrestore(&host->lock, iflags);
++
++	if (mrq->data && mrq->data->error) {
++		dev_err(mmc_dev(host->mmc),
++			"data error, sending stop command\n");
++		sunxi_mmc_send_manual_stop(host, mrq);
++	}
++
++	mmc_request_done(host->mmc, mrq);
++}
++
++static irqreturn_t sunxi_mmc_irq(int irq, void *dev_id)
++{
++	struct sunxi_mmc_host *host = dev_id;
++	u32 finalize = 0;
++	u32 sdio_int = 0;
++	u32 msk_int;
++	u32 idma_int;
++
++	spin_lock(&host->lock);
++
++	idma_int  = mci_readl(host, REG_IDST);
++	msk_int   = mci_readl(host, REG_MISTA);
++
++	dev_dbg(mmc_dev(host->mmc), "irq: rq %p mi %08x idi %08x\n",
++		host->mrq, msk_int, idma_int);
++
++	if (host->mrq) {
++		if (idma_int & SDXC_IDMAC_RECEIVE_INTERRUPT)
++			host->wait_dma = 0;
++
++		host->int_sum |= msk_int;
++
++		/* Wait for COMMAND_DONE on RESPONSE_TIMEOUT before finishing the req */
++		if ((host->int_sum & SDXC_RESP_TIMEOUT) &&
++				!(host->int_sum & SDXC_COMMAND_DONE))
++			mci_writel(host, REG_IMASK,
++				   host->sdio_imask | SDXC_COMMAND_DONE);
++		else if (host->int_sum & SDXC_INTERRUPT_ERROR_BIT)
++			finalize = 1; /* Don't wait for dma on error */
++		else if (host->int_sum & SDXC_INTERRUPT_DONE_BIT && !host->wait_dma)
++			finalize = 1; /* Done */
++
++		if (finalize) {
++			mci_writel(host, REG_IMASK, host->sdio_imask);
++			mci_writel(host, REG_IDIE, 0);
++		}
++	}
++
++	if (msk_int & SDXC_SDIO_INTERRUPT)
++		sdio_int = 1;
++
++	mci_writel(host, REG_RINTR, msk_int);
++	mci_writel(host, REG_IDST, idma_int);
++
++	spin_unlock(&host->lock);
++
++	if (finalize)
++		tasklet_schedule(&host->tasklet);
++
++	if (sdio_int)
++		mmc_signal_sdio_irq(host->mmc);
++
++	return IRQ_HANDLED;
++}
++
++static void sunxi_mmc_tasklet(unsigned long data)
++{
++	struct sunxi_mmc_host *smc_host = (struct sunxi_mmc_host *) data;
++	sunxi_mmc_finalize_request(smc_host);
++}
++
++static void sunxi_mmc_oclk_onoff(struct sunxi_mmc_host *host, u32 oclk_en)
++{
++	unsigned long expire = jiffies + msecs_to_jiffies(2000);
++	u32 rval;
++
++	rval = mci_readl(host, REG_CLKCR);
++	rval &= ~(SDXC_CARD_CLOCK_ON | SDXC_LOW_POWER_ON);
++
++	if (oclk_en)
++		rval |= SDXC_CARD_CLOCK_ON;
++
++	mci_writel(host, REG_CLKCR, rval);
++
++	rval = SDXC_START | SDXC_UPCLK_ONLY | SDXC_WAIT_PRE_OVER;
++	if (host->voltage_switching)
++		rval |= SDXC_VOLTAGE_SWITCH;
++	mci_writel(host, REG_CMDR, rval);
++
++	do {
++		rval = mci_readl(host, REG_CMDR);
++	} while (time_before(jiffies, expire) && (rval & SDXC_START));
++
++	if (rval & SDXC_START) {
++		dev_err(mmc_dev(host->mmc), "fatal err update clk timeout\n");
++		host->ferror = 1;
++	}
++}
++
++struct sunxi_mmc_clk_dly mmc_clk_dly[MMC_CLK_MOD_NUM] = {
++	{ MMC_CLK_400K, 0, 7 },
++	{ MMC_CLK_25M, 0, 5 },
++	{ MMC_CLK_50M, 3, 5 },
++	{ MMC_CLK_50MDDR, 2, 4 },
++	{ MMC_CLK_50MDDR_8BIT, 2, 4 },
++	{ MMC_CLK_100M, 1, 4 },
++	{ MMC_CLK_200M, 1, 4 },
++};
++
++static void sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *smc_host,
++				   unsigned int rate)
++{
++	u32 newrate;
++	u32 src_clk;
++	u32 oclk_dly;
++	u32 sclk_dly;
++	u32 temp;
++	struct sunxi_mmc_clk_dly *dly = NULL;
++	struct clk_hw *hw = __clk_get_hw(smc_host->clk_mod);
++
++	newrate = clk_round_rate(smc_host->clk_mod, rate);
++	if (smc_host->clk_mod_rate == newrate) {
++		dev_dbg(mmc_dev(smc_host->mmc), "clk already %d, rounded %d\n",
++			rate, newrate);
++		return;
++	}
++
++	dev_dbg(mmc_dev(smc_host->mmc), "setting clk to %d, rounded %d\n",
++		rate, newrate);
++
++	/* setting clock rate */
++	clk_disable(smc_host->clk_mod);
++	clk_set_rate(smc_host->clk_mod, newrate);
++	clk_enable(smc_host->clk_mod);
++	smc_host->clk_mod_rate = newrate = clk_get_rate(smc_host->clk_mod);
++	dev_dbg(mmc_dev(smc_host->mmc), "clk is now %d\n", newrate);
++
++	sunxi_mmc_oclk_onoff(smc_host, 0);
++	/* clear internal divider */
++	temp = mci_readl(smc_host, REG_CLKCR);
++	temp &= ~0xff;
++	mci_writel(smc_host, REG_CLKCR, temp);
++
++	/* determine delays */
++	if (rate <= 400000) {
++		dly = &mmc_clk_dly[MMC_CLK_400K];
++	} else if (rate <= 25000000) {
++		dly = &mmc_clk_dly[MMC_CLK_25M];
++	} else if (rate <= 50000000) {
++		if (smc_host->ddr) {
++			if (smc_host->bus_width == 8)
++				dly = &mmc_clk_dly[MMC_CLK_50MDDR_8BIT];
++			else
++				dly = &mmc_clk_dly[MMC_CLK_50MDDR];
++		} else {
++			dly = &mmc_clk_dly[MMC_CLK_50M];
++		}
++	} else if (rate <= 104000000) {
++		dly = &mmc_clk_dly[MMC_CLK_100M];
++	} else if (rate <= 208000000) {
++		dly = &mmc_clk_dly[MMC_CLK_200M];
++	} else {
++		dly = &mmc_clk_dly[MMC_CLK_50M];
++	}
++
++	oclk_dly = dly->oclk_dly;
++	sclk_dly = dly->sclk_dly;
++
++	src_clk = clk_get_rate(clk_get_parent(smc_host->clk_mod));
++
++	if (src_clk >= 300000000 && src_clk <= 400000000) {
++		if (oclk_dly)
++			oclk_dly--;
++		if (sclk_dly)
++			sclk_dly--;
++	}
++
++	clk_sunxi_mmc_phase_control(hw, sclk_dly, oclk_dly);
++	sunxi_mmc_oclk_onoff(smc_host, 1);
++
++	/* oclk_onoff sets various irq status bits, clear these */
++	mci_writel(smc_host, REG_RINTR,
++		   mci_readl(smc_host, REG_RINTR) & ~SDXC_SDIO_INTERRUPT);
++}
++
++static void sunxi_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
++{
++	struct sunxi_mmc_host *host = mmc_priv(mmc);
++	u32 temp;
++	s32 err;
++
++	/* Set the power state */
++	switch (ios->power_mode) {
++	case MMC_POWER_ON:
++		break;
++
++	case MMC_POWER_UP:
++		if (!IS_ERR(host->vmmc)) {
++			mmc_regulator_set_ocr(host->mmc, host->vmmc, ios->vdd);
++			udelay(200);
++		}
++
++		err = sunxi_mmc_init_host(mmc);
++		if (err) {
++			host->ferror = 1;
++			return;
++		}
++		enable_irq(host->irq);
++
++		dev_dbg(mmc_dev(host->mmc), "power on!\n");
++		host->ferror = 0;
++		break;
++
++	case MMC_POWER_OFF:
++		dev_dbg(mmc_dev(host->mmc), "power off!\n");
++		disable_irq(host->irq);
++		sunxi_mmc_exit_host(host);
++		if (!IS_ERR(host->vmmc))
++			mmc_regulator_set_ocr(host->mmc, host->vmmc, 0);
++		host->ferror = 0;
++		break;
++	}
++
++	/* set bus width */
++	switch (ios->bus_width) {
++	case MMC_BUS_WIDTH_1:
++		mci_writel(host, REG_WIDTH, SDXC_WIDTH1);
++		host->bus_width = 1;
++		break;
++	case MMC_BUS_WIDTH_4:
++		mci_writel(host, REG_WIDTH, SDXC_WIDTH4);
++		host->bus_width = 4;
++		break;
++	case MMC_BUS_WIDTH_8:
++		mci_writel(host, REG_WIDTH, SDXC_WIDTH8);
++		host->bus_width = 8;
++		break;
++	}
++
++	/* set ddr mode */
++	temp = mci_readl(host, REG_GCTRL);
++	if (ios->timing == MMC_TIMING_UHS_DDR50) {
++		temp |= SDXC_DDR_MODE;
++		host->ddr = 1;
++	} else {
++		temp &= ~SDXC_DDR_MODE;
++		host->ddr = 0;
++	}
++	mci_writel(host, REG_GCTRL, temp);
++
++	/* set up clock */
++	if (ios->clock && ios->power_mode) {
++		dev_dbg(mmc_dev(host->mmc), "ios->clock: %d\n", ios->clock);
++		sunxi_mmc_clk_set_rate(host, ios->clock);
++		usleep_range(50000, 55000);
++	}
++}
++
++static void sunxi_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
++{
++	struct sunxi_mmc_host *smc_host = mmc_priv(mmc);
++	unsigned long flags;
++	u32 imask;
++
++	spin_lock_irqsave(&smc_host->lock, flags);
++
++	imask = mci_readl(smc_host, REG_IMASK);
++	if (enable) {
++		smc_host->sdio_imask = SDXC_SDIO_INTERRUPT;
++		imask |= SDXC_SDIO_INTERRUPT;
++	} else {
++		smc_host->sdio_imask = 0;
++		imask &= ~SDXC_SDIO_INTERRUPT;
++	}
++	mci_writel(smc_host, REG_IMASK, imask);
++	spin_unlock_irqrestore(&smc_host->lock, flags);
++}
++
++static void sunxi_mmc_hw_reset(struct mmc_host *mmc)
++{
++	struct sunxi_mmc_host *smc_host = mmc_priv(mmc);
++	mci_writel(smc_host, REG_HWRST, 0);
++	udelay(10);
++	mci_writel(smc_host, REG_HWRST, 1);
++	udelay(300);
++}
++
++static void sunxi_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
++{
++	struct sunxi_mmc_host *host = mmc_priv(mmc);
++	struct mmc_command *cmd = mrq->cmd;
++	struct mmc_data *data = mrq->data;
++	unsigned long iflags;
++	u32 imask = SDXC_INTERRUPT_ERROR_BIT;
++	u32 cmd_val = SDXC_START | (cmd->opcode & 0x3f);
++	u32 byte_cnt = 0;
++	int ret;
++
++	if (!mmc_gpio_get_cd(mmc) || host->ferror) {
++		dev_dbg(mmc_dev(host->mmc), "no medium present\n");
++		mrq->cmd->error = -ENOMEDIUM;
++		mmc_request_done(mmc, mrq);
++		return;
++	}
++
++	if (data) {
++		byte_cnt = data->blksz * data->blocks;
++		mci_writel(host, REG_BLKSZ, data->blksz);
++		mci_writel(host, REG_BCNTR, byte_cnt);
++		ret = sunxi_mmc_prepare_dma(host, data);
++		if (ret < 0) {
++			dev_err(mmc_dev(host->mmc), "prepare DMA failed\n");
++			cmd->error = ret;
++			cmd->data->error = ret;
++			mmc_request_done(host->mmc, mrq);
++			return;
++		}
++	}
++
++	if (cmd->opcode == MMC_GO_IDLE_STATE) {
++		cmd_val |= SDXC_SEND_INIT_SEQUENCE;
++		imask |= SDXC_COMMAND_DONE;
++	}
++
++	if (cmd->opcode == SD_SWITCH_VOLTAGE) {
++		cmd_val |= SDXC_VOLTAGE_SWITCH;
++		imask |= SDXC_VOLTAGE_CHANGE_DONE;
++		host->voltage_switching = 1;
++		sunxi_mmc_oclk_onoff(host, 1);
++	}
++
++	if (cmd->flags & MMC_RSP_PRESENT) {
++		cmd_val |= SDXC_RESP_EXPIRE;
++		if (cmd->flags & MMC_RSP_136)
++			cmd_val |= SDXC_LONG_RESPONSE;
++		if (cmd->flags & MMC_RSP_CRC)
++			cmd_val |= SDXC_CHECK_RESPONSE_CRC;
++
++		if ((cmd->flags & MMC_CMD_MASK) == MMC_CMD_ADTC) {
++			cmd_val |= SDXC_DATA_EXPIRE | SDXC_WAIT_PRE_OVER;
++			if (cmd->data->flags & MMC_DATA_STREAM) {
++				imask |= SDXC_AUTO_COMMAND_DONE;
++				cmd_val |= SDXC_SEQUENCE_MODE | SDXC_SEND_AUTO_STOP;
++			}
++			if (cmd->data->stop) {
++				imask |= SDXC_AUTO_COMMAND_DONE;
++				cmd_val |= SDXC_SEND_AUTO_STOP;
++			} else
++				imask |= SDXC_DATA_OVER;
++
++			if (cmd->data->flags & MMC_DATA_WRITE)
++				cmd_val |= SDXC_WRITE;
++			else
++				host->wait_dma = 1;
++		} else
++			imask |= SDXC_COMMAND_DONE;
++	} else
++		imask |= SDXC_COMMAND_DONE;
++
++	dev_dbg(mmc_dev(host->mmc), "cmd %d(%08x) arg %x ie 0x%08x len %d\n",
++		cmd_val & 0x3f, cmd_val, cmd->arg, imask,
++		mrq->data ? mrq->data->blksz * mrq->data->blocks : 0);
++
++	spin_lock_irqsave(&host->lock, iflags);
++	host->mrq = mrq;
++	mci_writel(host, REG_IMASK, host->sdio_imask | imask);
++	spin_unlock_irqrestore(&host->lock, iflags);
++
++	mci_writel(host, REG_CARG, cmd->arg);
++	mci_writel(host, REG_CMDR, cmd_val);
++}
++
++static const struct of_device_id sunxi_mmc_of_match[] = {
++	{ .compatible = "allwinner,sun4i-a10-mmc", },
++	{ .compatible = "allwinner,sun5i-a13-mmc", },
++	{ /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
++
++static struct mmc_host_ops sunxi_mmc_ops = {
++	.request	 = sunxi_mmc_request,
++	.set_ios	 = sunxi_mmc_set_ios,
++	.get_ro		 = mmc_gpio_get_ro,
++	.get_cd		 = mmc_gpio_get_cd,
++	.enable_sdio_irq = sunxi_mmc_enable_sdio_irq,
++	.hw_reset	 = sunxi_mmc_hw_reset,
++};
++
++static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host,
++				      struct platform_device *pdev)
++{
++	struct device_node *np = pdev->dev.of_node;
++	int ret;
++
++	if (of_device_is_compatible(np, "allwinner,sun4i-a10-mmc"))
++		host->idma_des_size_bits = 13;
++	else
++		host->idma_des_size_bits = 16;
++
++	host->vmmc = devm_regulator_get_optional(&pdev->dev, "vmmc");
++	if (IS_ERR(host->vmmc) && PTR_ERR(host->vmmc) == -EPROBE_DEFER)
++		return -EPROBE_DEFER;
++
++	host->reg_base = devm_ioremap_resource(&pdev->dev,
++			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
++	if (IS_ERR(host->reg_base))
++		return PTR_ERR(host->reg_base);
++
++	host->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
++	if (IS_ERR(host->clk_ahb)) {
++		dev_err(&pdev->dev, "Could not get ahb clock\n");
++		return PTR_ERR(host->clk_ahb);
++	}
++
++	host->clk_mod = devm_clk_get(&pdev->dev, "mod");
++	if (IS_ERR(host->clk_mod)) {
++		dev_err(&pdev->dev, "Could not get mod clock\n");
++		return PTR_ERR(host->clk_mod);
++	}
++
++	/* Make sure the controller is in a sane state before enabling irqs */
++	ret = sunxi_mmc_init_host(host->mmc);
++	if (ret)
++		return ret;
++
++	host->irq = platform_get_irq(pdev, 0);
++	ret = devm_request_irq(&pdev->dev, host->irq, sunxi_mmc_irq, 0,
++			       "sunxi-mmc", host);
++	if (ret == 0)
++		disable_irq(host->irq);
++
++	/* And put it back in reset */
++	sunxi_mmc_exit_host(host);
++
++	return ret;
++}
++
++static int sunxi_mmc_probe(struct platform_device *pdev)
++{
++	struct sunxi_mmc_host *host;
++	struct mmc_host *mmc;
++	int ret;
++
++	mmc = mmc_alloc_host(sizeof(struct sunxi_mmc_host), &pdev->dev);
++	if (!mmc) {
++		dev_err(&pdev->dev, "mmc alloc host failed\n");
++		return -ENOMEM;
++	}
++
++	host = mmc_priv(mmc);
++	host->mmc = mmc;
++	spin_lock_init(&host->lock);
++	tasklet_init(&host->tasklet, sunxi_mmc_tasklet, (unsigned long)host);
++
++	ret = sunxi_mmc_resource_request(host, pdev);
++	if (ret)
++		goto error_free_host;
++
++	host->sg_cpu = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
++					  &host->sg_dma, GFP_KERNEL);
++	if (!host->sg_cpu) {
++		dev_err(&pdev->dev, "Failed to allocate DMA descriptor mem\n");
++		ret = -ENOMEM;
++		goto error_free_host;
++	}
++
++	mmc->ops		= &sunxi_mmc_ops;
++	mmc->max_blk_count	= 8192;
++	mmc->max_blk_size	= 4096;
++	mmc->max_segs		= PAGE_SIZE / sizeof(struct sunxi_idma_des);
++	mmc->max_seg_size	= (1 << host->idma_des_size_bits);
++	mmc->max_req_size	= mmc->max_seg_size * mmc->max_segs;
++	/* 400kHz ~ 50MHz */
++	mmc->f_min		=   400000;
++	mmc->f_max		= 50000000;
++	/* available voltages */
++	if (!IS_ERR(host->vmmc))
++		mmc->ocr_avail = mmc_regulator_get_ocrmask(host->vmmc);
++	else
++		mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
++
++	mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
++		     MMC_CAP_SDIO_IRQ;
++	mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP;
++
++	ret = mmc_of_parse(mmc);
++	if (ret)
++		goto error_free_dma;
++
++	ret = mmc_add_host(mmc);
++	if (ret)
++		goto error_free_dma;
++
++	dev_info(&pdev->dev, "base:0x%p irq:%u\n", host->reg_base, host->irq);
++	platform_set_drvdata(pdev, mmc);
++	return 0;
++
++error_free_dma:
++	dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
++error_free_host:
++	mmc_free_host(mmc);
++	return ret;
++}
++
++static int sunxi_mmc_remove(struct platform_device *pdev)
++{
++	struct mmc_host	*mmc = platform_get_drvdata(pdev);
++	struct sunxi_mmc_host *host = mmc_priv(mmc);
++
++	mmc_remove_host(mmc);
++	sunxi_mmc_exit_host(host);
++	tasklet_disable(&host->tasklet);
++	dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
++	mmc_free_host(mmc);
++
++	return 0;
++}
++
++static struct platform_driver sunxi_mmc_driver = {
++	.driver = {
++		.name	= "sunxi-mmc",
++		.owner	= THIS_MODULE,
++		.of_match_table = of_match_ptr(sunxi_mmc_of_match),
++	},
++	.probe		= sunxi_mmc_probe,
++	.remove		= sunxi_mmc_remove,
++};
++module_platform_driver(sunxi_mmc_driver);
++
++MODULE_DESCRIPTION("Allwinner's SD/MMC Card Controller Driver");
++MODULE_LICENSE("GPL v2");
++MODULE_AUTHOR("David Lanzendörfer <david.lanzendoerfer@o2s.ch>");
++MODULE_ALIAS("platform:sunxi-mmc");
+--- /dev/null
++++ b/drivers/mmc/host/sunxi-mmc.h
+@@ -0,0 +1,238 @@
++/*
++ * Driver for sunxi SD/MMC host controllers
++ * (C) Copyright 2007-2011 Reuuimlla Technology Co., Ltd.
++ * (C) Copyright 2007-2011 Aaron Maoye <leafy.myeh@reuuimllatech.com>
++ * (C) Copyright 2013-2014 O2S GmbH <www.o2s.ch>
++ * (C) Copyright 2013-2014 David Lanzendörfer <david.lanzendoerfer@o2s.ch>
++ * (C) Copyright 2013-2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ */
++
++#ifndef __SUNXI_MMC_H__
++#define __SUNXI_MMC_H__
++
++/* register offset definitions */
++#define SDXC_REG_GCTRL	(0x00) /* SMC Global Control Register */
++#define SDXC_REG_CLKCR	(0x04) /* SMC Clock Control Register */
++#define SDXC_REG_TMOUT	(0x08) /* SMC Time Out Register */
++#define SDXC_REG_WIDTH	(0x0C) /* SMC Bus Width Register */
++#define SDXC_REG_BLKSZ	(0x10) /* SMC Block Size Register */
++#define SDXC_REG_BCNTR	(0x14) /* SMC Byte Count Register */
++#define SDXC_REG_CMDR	(0x18) /* SMC Command Register */
++#define SDXC_REG_CARG	(0x1C) /* SMC Argument Register */
++#define SDXC_REG_RESP0	(0x20) /* SMC Response Register 0 */
++#define SDXC_REG_RESP1	(0x24) /* SMC Response Register 1 */
++#define SDXC_REG_RESP2	(0x28) /* SMC Response Register 2 */
++#define SDXC_REG_RESP3	(0x2C) /* SMC Response Register 3 */
++#define SDXC_REG_IMASK	(0x30) /* SMC Interrupt Mask Register */
++#define SDXC_REG_MISTA	(0x34) /* SMC Masked Interrupt Status Register */
++#define SDXC_REG_RINTR	(0x38) /* SMC Raw Interrupt Status Register */
++#define SDXC_REG_STAS	(0x3C) /* SMC Status Register */
++#define SDXC_REG_FTRGL	(0x40) /* SMC FIFO Threshold Watermark Registe */
++#define SDXC_REG_FUNS	(0x44) /* SMC Function Select Register */
++#define SDXC_REG_CBCR	(0x48) /* SMC CIU Byte Count Register */
++#define SDXC_REG_BBCR	(0x4C) /* SMC BIU Byte Count Register */
++#define SDXC_REG_DBGC	(0x50) /* SMC Debug Enable Register */
++#define SDXC_REG_HWRST	(0x78) /* SMC Card Hardware Reset for Register */
++#define SDXC_REG_DMAC	(0x80) /* SMC IDMAC Control Register */
++#define SDXC_REG_DLBA	(0x84) /* SMC IDMAC Descriptor List Base Addre */
++#define SDXC_REG_IDST	(0x88) /* SMC IDMAC Status Register */
++#define SDXC_REG_IDIE	(0x8C) /* SMC IDMAC Interrupt Enable Register */
++#define SDXC_REG_CHDA	(0x90)
++#define SDXC_REG_CBDA	(0x94)
++
++#define mci_readl(host, reg) \
++	readl((host)->reg_base + SDXC_##reg)
++#define mci_writel(host, reg, value) \
++	writel((value), (host)->reg_base + SDXC_##reg)
++
++/* global control register bits */
++#define SDXC_SOFT_RESET		BIT(0)
++#define SDXC_FIFO_RESET		BIT(1)
++#define SDXC_DMA_RESET		BIT(2)
++#define SDXC_HARDWARE_RESET		(SDXC_SOFT_RESET|SDXC_FIFO_RESET|SDXC_DMA_RESET)
++#define SDXC_INTERRUPT_ENABLE_BIT		BIT(4)
++#define SDXC_DMA_ENABLE_BIT		BIT(5)
++#define SDXC_DEBOUNCE_ENABLE_BIT	BIT(8)
++#define SDXC_POSEDGE_LATCH_DATA	BIT(9)
++#define SDXC_DDR_MODE		BIT(10)
++#define SDXC_MEMORY_ACCESS_DONE	BIT(29)
++#define SDXC_ACCESS_DONE_DIRECT	BIT(30)
++#define SDXC_ACCESS_BY_AHB	BIT(31)
++#define SDXC_ACCESS_BY_DMA	(0U << 31)
++/* clock control bits */
++#define SDXC_CARD_CLOCK_ON		BIT(16)
++#define SDXC_LOW_POWER_ON		BIT(17)
++/* bus width */
++#define SDXC_WIDTH1		(0)
++#define SDXC_WIDTH4		(1)
++#define SDXC_WIDTH8		(2)
++/* smc command bits */
++#define SDXC_RESP_EXPIRE		BIT(6)
++#define SDXC_LONG_RESPONSE		BIT(7)
++#define SDXC_CHECK_RESPONSE_CRC	BIT(8)
++#define SDXC_DATA_EXPIRE		BIT(9)
++#define SDXC_WRITE		BIT(10)
++#define SDXC_SEQUENCE_MODE		BIT(11)
++#define SDXC_SEND_AUTO_STOP	BIT(12)
++#define SDXC_WAIT_PRE_OVER	BIT(13)
++#define SDXC_STOP_ABORT_CMD	BIT(14)
++#define SDXC_SEND_INIT_SEQUENCE	BIT(15)
++#define SDXC_UPCLK_ONLY		BIT(21)
++#define SDXC_READ_CEATA_DEV		BIT(22)
++#define SDXC_CCS_EXPIRE		BIT(23)
++#define SDXC_ENABLE_BIT_BOOT		BIT(24)
++#define SDXC_ALT_BOOT_OPTIONS		BIT(25)
++#define SDXC_BOOT_ACK_EXPIRE		BIT(26)
++#define SDXC_BOOT_ABORT		BIT(27)
++#define SDXC_VOLTAGE_SWITCH	        BIT(28)
++#define SDXC_USE_HOLD_REGISTER	        BIT(29)
++#define SDXC_START	        BIT(31)
++/* interrupt bits */
++#define SDXC_RESP_ERROR		BIT(1)
++#define SDXC_COMMAND_DONE		BIT(2)
++#define SDXC_DATA_OVER		BIT(3)
++#define SDXC_TX_DATA_REQUEST		BIT(4)
++#define SDXC_RX_DATA_REQUEST		BIT(5)
++#define SDXC_RESP_CRC_ERROR		BIT(6)
++#define SDXC_DATA_CRC_ERROR		BIT(7)
++#define SDXC_RESP_TIMEOUT	BIT(8)
++#define SDXC_DATA_TIMEOUT	BIT(9)
++#define SDXC_VOLTAGE_CHANGE_DONE		BIT(10)
++#define SDXC_FIFO_RUN_ERROR		BIT(11)
++#define SDXC_HARD_WARE_LOCKED	BIT(12)
++#define SDXC_START_BIT_ERROR	BIT(13)
++#define SDXC_AUTO_COMMAND_DONE	BIT(14)
++#define SDXC_END_BIT_ERROR		BIT(15)
++#define SDXC_SDIO_INTERRUPT		BIT(16)
++#define SDXC_CARD_INSERT		BIT(30)
++#define SDXC_CARD_REMOVE		BIT(31)
++#define SDXC_INTERRUPT_ERROR_BIT		(SDXC_RESP_ERROR | SDXC_RESP_CRC_ERROR | \
++				 SDXC_DATA_CRC_ERROR | SDXC_RESP_TIMEOUT | \
++				 SDXC_DATA_TIMEOUT | SDXC_FIFO_RUN_ERROR | \
++				 SDXC_HARD_WARE_LOCKED | SDXC_START_BIT_ERROR | \
++				 SDXC_END_BIT_ERROR) /* 0xbbc2 */
++#define SDXC_INTERRUPT_DONE_BIT		(SDXC_AUTO_COMMAND_DONE | SDXC_DATA_OVER | \
++				 SDXC_COMMAND_DONE | SDXC_VOLTAGE_CHANGE_DONE)
++/* status */
++#define SDXC_RXWL_FLAG		BIT(0)
++#define SDXC_TXWL_FLAG		BIT(1)
++#define SDXC_FIFO_EMPTY		BIT(2)
++#define SDXC_FIFO_FULL		BIT(3)
++#define SDXC_CARD_PRESENT	BIT(8)
++#define SDXC_CARD_DATA_BUSY	BIT(9)
++#define SDXC_DATA_FSM_BUSY	BIT(10)
++#define SDXC_DMA_REQUEST		BIT(31)
++#define SDXC_FIFO_SIZE		(16)
++/* Function select */
++#define SDXC_CEATA_ON		(0xceaaU << 16)
++#define SDXC_SEND_IRQ_RESPONSE		BIT(0)
++#define SDXC_SDIO_READ_WAIT		BIT(1)
++#define SDXC_ABORT_READ_DATA		BIT(2)
++#define SDXC_SEND_CCSD		BIT(8)
++#define SDXC_SEND_AUTO_STOPCCSD	BIT(9)
++#define SDXC_CEATA_DEV_INTERRUPT_ENABLE_BIT	BIT(10)
++/* IDMA controller bus mod bit field */
++#define SDXC_IDMAC_SOFT_RESET	BIT(0)
++#define SDXC_IDMAC_FIX_BURST	BIT(1)
++#define SDXC_IDMAC_IDMA_ON	BIT(7)
++#define SDXC_IDMAC_REFETCH_DES	BIT(31)
++/* IDMA status bit field */
++#define SDXC_IDMAC_TRANSMIT_INTERRUPT	BIT(0)
++#define SDXC_IDMAC_RECEIVE_INTERRUPT	BIT(1)
++#define SDXC_IDMAC_FATAL_BUS_ERROR	BIT(2)
++#define SDXC_IDMAC_DESTINATION_INVALID	BIT(4)
++#define SDXC_IDMAC_CARD_ERROR_SUM	BIT(5)
++#define SDXC_IDMAC_NORMAL_INTERRUPT_SUM	BIT(8)
++#define SDXC_IDMAC_ABNORMAL_INTERRUPT_SUM BIT(9)
++#define SDXC_IDMAC_HOST_ABORT_INTERRUPT_TX	BIT(10)
++#define SDXC_IDMAC_HOST_ABORT_INTERRUPT_RX	BIT(10)
++#define SDXC_IDMAC_IDLE		(0U << 13)
++#define SDXC_IDMAC_SUSPEND	(1U << 13)
++#define SDXC_IDMAC_DESC_READ	(2U << 13)
++#define SDXC_IDMAC_DESC_CHECK	(3U << 13)
++#define SDXC_IDMAC_READ_REQUEST_WAIT	(4U << 13)
++#define SDXC_IDMAC_WRITE_REQUEST_WAIT	(5U << 13)
++#define SDXC_IDMAC_READ		(6U << 13)
++#define SDXC_IDMAC_WRITE		(7U << 13)
++#define SDXC_IDMAC_DESC_CLOSE	(8U << 13)
++
++/*
++* If the idma-des-size-bits of property is ie 13, bufsize bits are:
++*  Bits  0-12: buf1 size
++*  Bits 13-25: buf2 size
++*  Bits 26-31: not used
++* Since we only ever set buf1 size, we can simply store it directly.
++*/
++#define SDXC_IDMAC_DES0_DIC	BIT(1)  /* disable interrupt on completion */
++#define SDXC_IDMAC_DES0_LD	BIT(2)  /* last descriptor */
++#define SDXC_IDMAC_DES0_FD	BIT(3)  /* first descriptor */
++#define SDXC_IDMAC_DES0_CH	BIT(4)  /* chain mode */
++#define SDXC_IDMAC_DES0_ER	BIT(5)  /* end of ring */
++#define SDXC_IDMAC_DES0_CES	BIT(30) /* card error summary */
++#define SDXC_IDMAC_DES0_OWN	BIT(31) /* 1-idma owns it, 0-host owns it */
++
++struct sunxi_idma_des {
++	u32	config;
++	u32	buf_size;
++	u32	buf_addr_ptr1;
++	u32	buf_addr_ptr2;
++};
++
++struct sunxi_mmc_host {
++	struct mmc_host *mmc;
++	struct regulator *vmmc;
++
++	/* IO mapping base */
++	void __iomem *reg_base;
++
++	spinlock_t lock;
++	struct tasklet_struct tasklet;
++
++	/* clock management */
++	struct clk *clk_ahb;
++	struct clk *clk_mod;
++
++	/* ios information */
++	u32		clk_mod_rate;
++	u32		bus_width;
++	u32		idma_des_size_bits;
++	u32		ddr;
++	u32		voltage_switching;
++
++	/* irq */
++	int		irq;
++	u32		int_sum;
++	u32		sdio_imask;
++
++	/* flags */
++	u32		power_on:1;
++	u32		wait_dma:1;
++
++	dma_addr_t	sg_dma;
++	void		*sg_cpu;
++
++	struct mmc_request *mrq;
++	u32		ferror;
++};
++
++#define MMC_CLK_400K            0
++#define MMC_CLK_25M             1
++#define MMC_CLK_50M             2
++#define MMC_CLK_50MDDR          3
++#define MMC_CLK_50MDDR_8BIT     4
++#define MMC_CLK_100M            5
++#define MMC_CLK_200M            6
++#define MMC_CLK_MOD_NUM         7
++
++struct sunxi_mmc_clk_dly {
++	u32 mode;
++	u32 oclk_dly;
++	u32 sclk_dly;
++};
++
++#endif
diff --git a/trunk/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch b/trunk/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch
new file mode 100644
index 00000000..10d4d582
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch
@@ -0,0 +1,159 @@
+From b66989fe7a41e1093b1f825967ab29963e06cccd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= <david.lanzendoerfer@o2s.ch>
+Date: Sat, 15 Feb 2014 14:02:51 +0100
+Subject: [PATCH] ARM: dts: sun4i: Add support for mmc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10-a1000.dts      |  8 +++++
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts |  8 +++++
+ arch/arm/boot/dts/sun4i-a10.dtsi           | 58 ++++++++++++++++++++++++++++++
+ 3 files changed, 74 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
++++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+@@ -34,6 +34,14 @@
+ 			};
+ 		};
+ 
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -377,6 +377,50 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		mmc0: mmc@01c0f000 {
++			compatible = "allwinner,sun4i-a10-mmc";
++			reg = <0x01c0f000 0x1000>;
++			clocks = <&ahb_gates 8>, <&mmc0_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <32>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
++		mmc1: mmc@01c10000 {
++			compatible = "allwinner,sun4i-a10-mmc";
++			reg = <0x01c10000 0x1000>;
++			clocks = <&ahb_gates 9>, <&mmc1_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <33>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
++		mmc2: mmc@01c11000 {
++			compatible = "allwinner,sun4i-a10-mmc";
++			reg = <0x01c11000 0x1000>;
++			clocks = <&ahb_gates 10>, <&mmc2_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <34>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
++		mmc3: mmc@01c12000 {
++			compatible = "allwinner,sun4i-a10-mmc";
++			reg = <0x01c12000 0x1000>;
++			clocks = <&ahb_gates 11>, <&mmc3_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <35>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			#phy-cells = <1>;
+ 			compatible = "allwinner,sun4i-a10-usb-phy";
+@@ -529,6 +573,20 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			mmc0_pins_a: mmc0@0 {
++				allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
++				allwinner,function = "mmc0";
++				allwinner,drive = <2>;
++				allwinner,pull = <0>;
++			};
++
++			mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
++				allwinner,pins = "PH1";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <1>;
++			};
+ 		};
+ 
+ 		timer@01c20c00 {
+--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
++++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+@@ -20,6 +20,14 @@
+ 	compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";
+ 
+ 	soc@01c00000 {
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
+--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
++++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+@@ -33,6 +33,15 @@
+ 			};
+ 		};
+ 
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			cd-mode = <1>;
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
+--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
++++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+@@ -34,6 +34,14 @@
+ 			};
+ 		};
+ 
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/202-dt-sun5i-add-mmc-nodes.patch b/trunk/target/linux/sunxi/patches-3.14/202-dt-sun5i-add-mmc-nodes.patch
new file mode 100644
index 00000000..541cef68
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/202-dt-sun5i-add-mmc-nodes.patch
@@ -0,0 +1,125 @@
+From 7afa5fb704679e84c59e5ad25bbdf7605844c5ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= <david.lanzendoerfer@o2s.ch>
+Date: Sat, 15 Feb 2014 14:02:29 +0100
+Subject: [PATCH] ARM: dts: sun5i: Add support for mmc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 30 +++++++++++++++
+ arch/arm/boot/dts/sun5i-a10s.dtsi                | 47 ++++++++++++++++++++++++
+ arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts  | 15 ++++++++
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts        | 15 ++++++++
+ arch/arm/boot/dts/sun5i-a13.dtsi                 | 29 +++++++++++++++
+ 5 files changed, 136 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+@@ -21,6 +21,14 @@
+ 	compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";
+ 
+ 	soc@01c00000 {
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_olinuxinom>;
++			cd-gpios = <&pio 6 0 0>; /* PG0 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			status = "okay";
+@@ -35,6 +43,13 @@
+ 		};
+ 
+ 		pinctrl@01c20800 {
++			mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {
++				allwinner,pins = "PG0";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <1>;
++			};
++
+ 			led_pins_olinuxinom: led_pins@0 {
+ 				allwinner,pins = "PG9";
+ 				allwinner,function = "gpio_out";
+--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
++++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+@@ -21,6 +21,14 @@
+ 	compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
+ 
+ 	soc@01c00000 {
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_olinuxino>;
++			cd-gpios = <&pio 6 0 0>; /* PG0 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			status = "okay";
+@@ -35,6 +43,13 @@
+ 		};
+ 
+ 		pinctrl@01c20800 {
++			mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
++				allwinner,pins = "PG0";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <1>;
++			};
++
+ 			led_pins_olinuxino: led_pins@0 {
+ 				allwinner,pins = "PG9";
+ 				allwinner,function = "gpio_out";
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -320,6 +320,28 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		mmc0: mmc@01c0f000 {
++			compatible = "allwinner,sun5i-a13-mmc";
++			reg = <0x01c0f000 0x1000>;
++			clocks = <&ahb_gates 8>, <&mmc0_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <32>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
++		mmc2: mmc@01c11000 {
++			compatible = "allwinner,sun5i-a13-mmc";
++			reg = <0x01c11000 0x1000>;
++			clocks = <&ahb_gates 10>, <&mmc2_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <34>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			#phy-cells = <1>;
+ 			compatible = "allwinner,sun5i-a13-usb-phy";
+@@ -415,6 +437,13 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			mmc0_pins_a: mmc0@0 {
++				allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
++				allwinner,function = "mmc0";
++				allwinner,drive = <2>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		timer@01c20c00 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/203-dt-sun7i-add-mmc-nodes.patch b/trunk/target/linux/sunxi/patches-3.14/203-dt-sun7i-add-mmc-nodes.patch
new file mode 100644
index 00000000..1a0459cb
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/203-dt-sun7i-add-mmc-nodes.patch
@@ -0,0 +1,171 @@
+From 33654facee61ebbd88684c9cf482ec2ea41f575e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= <david.lanzendoerfer@o2s.ch>
+Date: Sat, 15 Feb 2014 14:02:01 +0100
+Subject: [PATCH] ARM: dts: sun7i: Add support for mmc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts     |  8 +++
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts      |  8 +++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 23 +++++++++
+ arch/arm/boot/dts/sun7i-a20.dtsi                | 65 +++++++++++++++++++++++++
+ 4 files changed, 104 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -20,6 +20,14 @@
+ 	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -20,6 +20,14 @@
+ 	compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
+ 
+ 	soc@01c00000 {
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -32,6 +32,22 @@
+ 			status = "okay";
+ 		};
+ 
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			status = "okay";
++		};
++
++		mmc3: mmc@01c12000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc3_pins_a>;
++			pinctrl-1 = <&mmc3_cd_pin_olinuxinom>;
++			cd-gpios = <&pio 7 11 0>; /* PH11 */
++			status = "okay";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
+@@ -66,6 +82,13 @@
+ 		};
+ 
+ 		pinctrl@01c20800 {
++			mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
++				allwinner,pins = "PH11";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <1>;
++			};
++
+ 			led_pins_olinuxino: led_pins@0 {
+ 				allwinner,pins = "PH2";
+ 				allwinner,function = "gpio_out";
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -439,6 +439,50 @@
+ 			#size-cells = <0>;
+ 		};
+ 
++		mmc0: mmc@01c0f000 {
++			compatible = "allwinner,sun5i-a13-mmc";
++			reg = <0x01c0f000 0x1000>;
++			clocks = <&ahb_gates 8>, <&mmc0_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <0 32 4>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
++		mmc1: mmc@01c10000 {
++			compatible = "allwinner,sun5i-a13-mmc";
++			reg = <0x01c10000 0x1000>;
++			clocks = <&ahb_gates 9>, <&mmc1_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <0 33 4>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
++		mmc2: mmc@01c11000 {
++			compatible = "allwinner,sun5i-a13-mmc";
++			reg = <0x01c11000 0x1000>;
++			clocks = <&ahb_gates 10>, <&mmc2_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <0 34 4>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
++		mmc3: mmc@01c12000 {
++			compatible = "allwinner,sun5i-a13-mmc";
++			reg = <0x01c12000 0x1000>;
++			clocks = <&ahb_gates 11>, <&mmc3_clk>;
++			clock-names = "ahb", "mod";
++			interrupts = <0 35 4>;
++			bus-width = <4>;
++			cd-inverted;
++			status = "disabled";
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			#phy-cells = <1>;
+ 			compatible = "allwinner,sun7i-a20-usb-phy";
+@@ -645,6 +689,27 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			mmc0_pins_a: mmc0@0 {
++				allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
++				allwinner,function = "mmc0";
++				allwinner,drive = <2>;
++				allwinner,pull = <0>;
++			};
++
++			mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
++				allwinner,pins = "PH1";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <1>;
++			};
++
++			mmc3_pins_a: mmc3@0 {
++				allwinner,pins = "PI4","PI5","PI6","PI7","PI8","PI9";
++				allwinner,function = "mmc3";
++				allwinner,drive = <2>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		timer@01c20c00 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/205-nmi-add-driver.patch b/trunk/target/linux/sunxi/patches-3.14/205-nmi-add-driver.patch
new file mode 100644
index 00000000..98b5fe74
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/205-nmi-add-driver.patch
@@ -0,0 +1,239 @@
+From b9ad0253e6c68ac3d37fd2ed8ed9bf8a334e4b65 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@caione.org>
+Date: Sat, 15 Mar 2014 14:40:59 +0100
+Subject: [PATCH] ARM: sun7i/sun6i: irqchip: Add irqchip driver for NMI
+ controller
+
+Allwinner A20/A31 SoCs have special registers to control / (un)mask /
+acknowledge NMI. This NMI controller is separated and independent from GIC.
+This patch adds a new irqchip to manage NMI.
+
+Signed-off-by: Carlo Caione <carlo@caione.org>
+Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ drivers/irqchip/Makefile        |   1 +
+ drivers/irqchip/irq-sunxi-nmi.c | 208 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 209 insertions(+)
+ create mode 100644 drivers/irqchip/irq-sunxi-nmi.c
+
+--- a/drivers/irqchip/Makefile
++++ b/drivers/irqchip/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)	+= 
+ obj-$(CONFIG_ARCH_MOXART)		+= irq-moxart.o
+ obj-$(CONFIG_ORION_IRQCHIP)		+= irq-orion.o
+ obj-$(CONFIG_ARCH_SUNXI)		+= irq-sun4i.o
++obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi-nmi.o
+ obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o
+ obj-$(CONFIG_ARM_GIC)			+= irq-gic.o
+ obj-$(CONFIG_ARM_NVIC)			+= irq-nvic.o
+--- /dev/null
++++ b/drivers/irqchip/irq-sunxi-nmi.c
+@@ -0,0 +1,208 @@
++/*
++ * Allwinner A20/A31 SoCs NMI IRQ chip driver.
++ *
++ * Carlo Caione <carlo.caione@gmail.com>
++ *
++ * This file is licensed under the terms of the GNU General Public
++ * License version 2.  This program is licensed "as is" without any
++ * warranty of any kind, whether express or implied.
++ */
++
++#include <linux/bitops.h>
++#include <linux/device.h>
++#include <linux/io.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/irqdomain.h>
++#include <linux/of_irq.h>
++#include <linux/of_address.h>
++#include <linux/of_platform.h>
++#include <linux/irqchip/chained_irq.h>
++#include "irqchip.h"
++
++#define SUNXI_NMI_SRC_TYPE_MASK	0x00000003
++
++enum {
++	SUNXI_SRC_TYPE_LEVEL_LOW = 0,
++	SUNXI_SRC_TYPE_EDGE_FALLING,
++	SUNXI_SRC_TYPE_LEVEL_HIGH,
++	SUNXI_SRC_TYPE_EDGE_RISING,
++};
++
++struct sunxi_sc_nmi_reg_offs {
++	u32 ctrl;
++	u32 pend;
++	u32 enable;
++};
++
++static struct sunxi_sc_nmi_reg_offs sun7i_reg_offs = {
++	.ctrl	= 0x00,
++	.pend	= 0x04,
++	.enable	= 0x08,
++};
++
++static struct sunxi_sc_nmi_reg_offs sun6i_reg_offs = {
++	.ctrl	= 0x00,
++	.pend	= 0x04,
++	.enable	= 0x34,
++};
++
++static inline void sunxi_sc_nmi_write(struct irq_chip_generic *gc, u32 off,
++				      u32 val)
++{
++	irq_reg_writel(val, gc->reg_base + off);
++}
++
++static inline u32 sunxi_sc_nmi_read(struct irq_chip_generic *gc, u32 off)
++{
++	return irq_reg_readl(gc->reg_base + off);
++}
++
++static void sunxi_sc_nmi_handle_irq(unsigned int irq, struct irq_desc *desc)
++{
++	struct irq_domain *domain = irq_desc_get_handler_data(desc);
++	struct irq_chip *chip = irq_get_chip(irq);
++	unsigned int virq = irq_find_mapping(domain, 0);
++
++	chained_irq_enter(chip, desc);
++	generic_handle_irq(virq);
++	chained_irq_exit(chip, desc);
++}
++
++static int sunxi_sc_nmi_set_type(struct irq_data *data, unsigned int flow_type)
++{
++	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
++	struct irq_chip_type *ct = gc->chip_types;
++	u32 src_type_reg;
++	u32 ctrl_off = ct->regs.type;
++	unsigned int src_type;
++	unsigned int i;
++
++	irq_gc_lock(gc);
++
++	switch (flow_type & IRQF_TRIGGER_MASK) {
++	case IRQ_TYPE_EDGE_FALLING:
++		src_type = SUNXI_SRC_TYPE_EDGE_FALLING;
++		break;
++	case IRQ_TYPE_EDGE_RISING:
++		src_type = SUNXI_SRC_TYPE_EDGE_RISING;
++		break;
++	case IRQ_TYPE_LEVEL_HIGH:
++		src_type = SUNXI_SRC_TYPE_LEVEL_HIGH;
++		break;
++	case IRQ_TYPE_NONE:
++	case IRQ_TYPE_LEVEL_LOW:
++		src_type = SUNXI_SRC_TYPE_LEVEL_LOW;
++		break;
++	default:
++		irq_gc_unlock(gc);
++		pr_err("%s: Cannot assign multiple trigger modes to IRQ %d.\n",
++			__func__, data->irq);
++		return -EBADR;
++	}
++
++	irqd_set_trigger_type(data, flow_type);
++	irq_setup_alt_chip(data, flow_type);
++
++	for (i = 0; i <= gc->num_ct; i++, ct++)
++		if (ct->type & flow_type)
++			ctrl_off = ct->regs.type;
++
++	src_type_reg = sunxi_sc_nmi_read(gc, ctrl_off);
++	src_type_reg &= ~SUNXI_NMI_SRC_TYPE_MASK;
++	src_type_reg |= src_type;
++	sunxi_sc_nmi_write(gc, ctrl_off, src_type_reg);
++
++	irq_gc_unlock(gc);
++
++	return IRQ_SET_MASK_OK;
++}
++
++static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
++					struct sunxi_sc_nmi_reg_offs *reg_offs)
++{
++	struct irq_domain *domain;
++	struct irq_chip_generic *gc;
++	unsigned int irq;
++	unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
++	int ret;
++
++
++	domain = irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL);
++	if (!domain) {
++		pr_err("%s: Could not register interrupt domain.\n", node->name);
++		return -ENOMEM;
++	}
++
++	ret = irq_alloc_domain_generic_chips(domain, 1, 2, node->name,
++					     handle_fasteoi_irq, clr, 0,
++					     IRQ_GC_INIT_MASK_CACHE);
++	if (ret) {
++		 pr_err("%s: Could not allocate generic interrupt chip.\n",
++			 node->name);
++		 goto fail_irqd_remove;
++	}
++
++	irq = irq_of_parse_and_map(node, 0);
++	if (irq <= 0) {
++		pr_err("%s: unable to parse irq\n", node->name);
++		ret = -EINVAL;
++		goto fail_irqd_remove;
++	}
++
++	gc = irq_get_domain_generic_chip(domain, 0);
++	gc->reg_base = of_iomap(node, 0);
++	if (!gc->reg_base) {
++		pr_err("%s: unable to map resource\n", node->name);
++		ret = -ENOMEM;
++		goto fail_irqd_remove;
++	}
++
++	gc->chip_types[0].type			= IRQ_TYPE_LEVEL_MASK;
++	gc->chip_types[0].chip.irq_mask		= irq_gc_mask_clr_bit;
++	gc->chip_types[0].chip.irq_unmask	= irq_gc_mask_set_bit;
++	gc->chip_types[0].chip.irq_eoi		= irq_gc_ack_set_bit;
++	gc->chip_types[0].chip.irq_set_type	= sunxi_sc_nmi_set_type;
++	gc->chip_types[0].chip.flags		= IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED;
++	gc->chip_types[0].regs.ack		= reg_offs->pend;
++	gc->chip_types[0].regs.mask		= reg_offs->enable;
++	gc->chip_types[0].regs.type		= reg_offs->ctrl;
++
++	gc->chip_types[1].type			= IRQ_TYPE_EDGE_BOTH;
++	gc->chip_types[1].chip.name		= gc->chip_types[0].chip.name;
++	gc->chip_types[1].chip.irq_ack		= irq_gc_ack_set_bit;
++	gc->chip_types[1].chip.irq_mask		= irq_gc_mask_clr_bit;
++	gc->chip_types[1].chip.irq_unmask	= irq_gc_mask_set_bit;
++	gc->chip_types[1].chip.irq_set_type	= sunxi_sc_nmi_set_type;
++	gc->chip_types[1].regs.ack		= reg_offs->pend;
++	gc->chip_types[1].regs.mask		= reg_offs->enable;
++	gc->chip_types[1].regs.type		= reg_offs->ctrl;
++	gc->chip_types[1].handler		= handle_edge_irq;
++
++	sunxi_sc_nmi_write(gc, reg_offs->enable, 0);
++	sunxi_sc_nmi_write(gc, reg_offs->pend, 0x1);
++
++	irq_set_handler_data(irq, domain);
++	irq_set_chained_handler(irq, sunxi_sc_nmi_handle_irq);
++
++	return 0;
++
++fail_irqd_remove:
++	irq_domain_remove(domain);
++
++	return ret;
++}
++
++static int __init sun6i_sc_nmi_irq_init(struct device_node *node,
++					struct device_node *parent)
++{
++	return sunxi_sc_nmi_irq_init(node, &sun6i_reg_offs);
++}
++IRQCHIP_DECLARE(sun6i_sc_nmi, "allwinner,sun6i-a31-sc-nmi", sun6i_sc_nmi_irq_init);
++
++static int __init sun7i_sc_nmi_irq_init(struct device_node *node,
++					struct device_node *parent)
++{
++	return sunxi_sc_nmi_irq_init(node, &sun7i_reg_offs);
++}
++IRQCHIP_DECLARE(sun7i_sc_nmi, "allwinner,sun7i-a20-sc-nmi", sun7i_sc_nmi_irq_init);
diff --git a/trunk/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch b/trunk/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch
new file mode 100644
index 00000000..3f18c50d
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/206-dt-sun67i-add-nmi-irqchip.patch
@@ -0,0 +1,47 @@
+From eebb592523672ee7288b9327bd222165db638d1a Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@caione.org>
+Date: Thu, 27 Feb 2014 20:34:21 +0100
+Subject: [PATCH] ARM: sun7i/sun6i: dts: Add NMI irqchip support
+
+This patch adds DTS entries for NMI controller as child of GIC.
+
+Signed-off-by: Carlo Caione <carlo@caione.org>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++
+ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -370,6 +370,14 @@
+ 			interrupts = <1 9 0xf04>;
+ 		};
+ 
++		nmi_intc: interrupt-controller@01f00c0c {
++			compatible = "allwinner,sun6i-a31-sc-nmi";
++			interrupt-controller;
++			#interrupt-cells = <2>;
++			reg = <0x01f00c0c 0x38>;
++			interrupts = <0 32 4>;
++		};
++
+ 		cpucfg@01f01c00 {
+ 			compatible = "allwinner,sun6i-a31-cpuconfig";
+ 			reg = <0x01f01c00 0x300>;
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -401,6 +401,14 @@
+ 		#size-cells = <1>;
+ 		ranges;
+ 
++		nmi_intc: interrupt-controller@01c00030 {
++			compatible = "allwinner,sun7i-a20-sc-nmi";
++			interrupt-controller;
++			#interrupt-cells = <2>;
++			reg = <0x01c00030 0x0c>;
++			interrupts = <0 0 4>;
++		};
++
+ 		spi0: spi@01c05000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c05000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/210-mfd-add-axp20x-pmic-driver.patch b/trunk/target/linux/sunxi/patches-3.14/210-mfd-add-axp20x-pmic-driver.patch
new file mode 100644
index 00000000..6197300e
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/210-mfd-add-axp20x-pmic-driver.patch
@@ -0,0 +1,502 @@
+From 509326e0138b762067904c0c60f818e9bdba4cd4 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@caione.org>
+Date: Sat, 1 Mar 2014 17:45:46 +0100
+Subject: [PATCH] mfd: AXP20x: Add mfd driver for AXP20x PMIC
+
+This patch introduces the preliminary support for PMICs X-Powers AXP202
+and AXP209. The AXP209 and AXP202 are the PMUs (Power Management Unit)
+used by A10, A13 and A20 SoCs and developed by X-Powers, a sister company
+of Allwinner.
+
+The core enables support for two subsystems:
+- PEK (Power Enable Key)
+- Regulators
+
+Signed-off-by: Carlo Caione <carlo@caione.org>
+---
+ arch/arm/configs/sunxi_defconfig |   1 +
+ drivers/mfd/Kconfig              |  12 ++
+ drivers/mfd/Makefile             |   1 +
+ drivers/mfd/axp20x.c             | 250 +++++++++++++++++++++++++++++++++++++++
+ include/linux/mfd/axp20x.h       | 180 ++++++++++++++++++++++++++++
+ 5 files changed, 444 insertions(+)
+ create mode 100644 drivers/mfd/axp20x.c
+ create mode 100644 include/linux/mfd/axp20x.h
+
+--- a/arch/arm/configs/sunxi_defconfig
++++ b/arch/arm/configs/sunxi_defconfig
+@@ -55,6 +55,7 @@ CONFIG_GPIO_SYSFS=y
+ # CONFIG_HWMON is not set
+ CONFIG_WATCHDOG=y
+ CONFIG_SUNXI_WATCHDOG=y
++CONFIG_MFD_AXP20X=y
+ # CONFIG_USB_SUPPORT is not set
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -59,6 +59,18 @@ config MFD_AAT2870_CORE
+ 	  additional drivers must be enabled in order to use the
+ 	  functionality of the device.
+ 
++config MFD_AXP20X
++	bool "X-Powers AXP20X"
++	select MFD_CORE
++	select REGMAP_I2C
++	select REGMAP_IRQ
++	depends on I2C=y
++	help
++	  If you say Y here you get support for the AXP20X.
++	  This driver provides common support for accessing the device,
++	  additional drivers must be enabled in order to use the
++	  functionality of the device.
++
+ config MFD_CROS_EC
+ 	tristate "ChromeOS Embedded Controller"
+ 	select MFD_CORE
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -101,6 +101,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-irq.
+ obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
+ obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
+ obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
++obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
+ 
+ obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
+ obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
+--- /dev/null
++++ b/drivers/mfd/axp20x.c
+@@ -0,0 +1,250 @@
++/*
++ * axp20x.c - mfd core driver for the X-Powers AXP202 and AXP209
++ *
++ * Author: Carlo Caione <carlo@caione.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/err.h>
++#include <linux/i2c.h>
++#include <linux/interrupt.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/pm_runtime.h>
++#include <linux/regmap.h>
++#include <linux/slab.h>
++#include <linux/regulator/consumer.h>
++#include <linux/mfd/axp20x.h>
++#include <linux/mfd/core.h>
++#include <linux/of_device.h>
++#include <linux/of_irq.h>
++
++#define AXP20X_OFF	0x80
++
++static const struct regmap_range axp20x_writeable_ranges[] = {
++	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ5_STATE),
++	regmap_reg_range(AXP20X_DCDC_MODE, AXP20X_FG_RES),
++};
++
++static const struct regmap_range axp20x_volatile_ranges[] = {
++	regmap_reg_range(AXP20X_IRQ1_EN, AXP20X_IRQ5_STATE),
++};
++
++static const struct regmap_access_table axp20x_writeable_table = {
++	.yes_ranges	= axp20x_writeable_ranges,
++	.n_yes_ranges	= ARRAY_SIZE(axp20x_writeable_ranges),
++};
++
++static const struct regmap_access_table axp20x_volatile_table = {
++	.yes_ranges	= axp20x_volatile_ranges,
++	.n_yes_ranges	= ARRAY_SIZE(axp20x_volatile_ranges),
++};
++
++static struct resource axp20x_pek_resources[] = {
++	{
++		.name	= "PEK_DBR",
++		.start	= AXP20X_IRQ_PEK_RIS_EDGE,
++		.end	= AXP20X_IRQ_PEK_RIS_EDGE,
++		.flags	= IORESOURCE_IRQ,
++	},
++	{
++		.name	= "PEK_DBF",
++		.start	= AXP20X_IRQ_PEK_FAL_EDGE,
++		.end	= AXP20X_IRQ_PEK_FAL_EDGE,
++		.flags	= IORESOURCE_IRQ,
++	},
++};
++
++static const struct regmap_config axp20x_regmap_config = {
++	.reg_bits	= 8,
++	.val_bits	= 8,
++	.wr_table	= &axp20x_writeable_table,
++	.volatile_table	= &axp20x_volatile_table,
++	.max_register	= AXP20X_FG_RES,
++	.cache_type	= REGCACHE_RBTREE,
++};
++
++#define AXP20X_IRQ(_irq, _off, _mask) \
++	[AXP20X_IRQ_##_irq] = { .reg_offset = (_off), .mask = BIT(_mask) }
++
++static const struct regmap_irq axp20x_regmap_irqs[] = {
++	AXP20X_IRQ(ACIN_OVER_V,		0, 7),
++	AXP20X_IRQ(ACIN_PLUGIN,		0, 6),
++	AXP20X_IRQ(ACIN_REMOVAL,	0, 5),
++	AXP20X_IRQ(VBUS_OVER_V,		0, 4),
++	AXP20X_IRQ(VBUS_PLUGIN,		0, 3),
++	AXP20X_IRQ(VBUS_REMOVAL,	0, 2),
++	AXP20X_IRQ(VBUS_V_LOW,		0, 1),
++	AXP20X_IRQ(BATT_PLUGIN,		1, 7),
++	AXP20X_IRQ(BATT_REMOVAL,	1, 6),
++	AXP20X_IRQ(BATT_ENT_ACT_MODE,	1, 5),
++	AXP20X_IRQ(BATT_EXIT_ACT_MODE,	1, 4),
++	AXP20X_IRQ(CHARG,		1, 3),
++	AXP20X_IRQ(CHARG_DONE,		1, 2),
++	AXP20X_IRQ(BATT_TEMP_HIGH,	1, 1),
++	AXP20X_IRQ(BATT_TEMP_LOW,	1, 0),
++	AXP20X_IRQ(DIE_TEMP_HIGH,	2, 7),
++	AXP20X_IRQ(CHARG_I_LOW,		2, 6),
++	AXP20X_IRQ(DCDC1_V_LONG,	2, 5),
++	AXP20X_IRQ(DCDC2_V_LONG,	2, 4),
++	AXP20X_IRQ(DCDC3_V_LONG,	2, 3),
++	AXP20X_IRQ(PEK_SHORT,		2, 1),
++	AXP20X_IRQ(PEK_LONG,		2, 0),
++	AXP20X_IRQ(N_OE_PWR_ON,		3, 7),
++	AXP20X_IRQ(N_OE_PWR_OFF,	3, 6),
++	AXP20X_IRQ(VBUS_VALID,		3, 5),
++	AXP20X_IRQ(VBUS_NOT_VALID,	3, 4),
++	AXP20X_IRQ(VBUS_SESS_VALID,	3, 3),
++	AXP20X_IRQ(VBUS_SESS_END,	3, 2),
++	AXP20X_IRQ(LOW_PWR_LVL1,	3, 1),
++	AXP20X_IRQ(LOW_PWR_LVL2,	3, 0),
++	AXP20X_IRQ(TIMER,		4, 7),
++	AXP20X_IRQ(PEK_RIS_EDGE,	4, 6),
++	AXP20X_IRQ(PEK_FAL_EDGE,	4, 5),
++	AXP20X_IRQ(GPIO3_INPUT,		4, 3),
++	AXP20X_IRQ(GPIO2_INPUT,		4, 2),
++	AXP20X_IRQ(GPIO1_INPUT,		4, 1),
++	AXP20X_IRQ(GPIO0_INPUT,		4, 0),
++};
++
++static const struct regmap_irq_chip axp20x_regmap_irq_chip = {
++	.name			= "axp20x_irq_chip",
++	.status_base		= AXP20X_IRQ1_STATE,
++	.ack_base		= AXP20X_IRQ1_STATE,
++	.mask_base		= AXP20X_IRQ1_EN,
++	.num_regs		= 5,
++	.irqs			= axp20x_regmap_irqs,
++	.num_irqs		= ARRAY_SIZE(axp20x_regmap_irqs),
++	.mask_invert		= true,
++	.init_ack_masked	= true,
++};
++
++static struct mfd_cell axp20x_cells[] = {
++	{
++		.name		= "axp20x-pek",
++		.of_compatible	= "x-powers,axp20x-pek",
++		.num_resources	= ARRAY_SIZE(axp20x_pek_resources),
++		.resources	= axp20x_pek_resources,
++	}, {
++		.name		= "axp20x-regulator",
++	},
++};
++
++const struct of_device_id axp20x_of_match[] = {
++	{ .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
++	{ .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
++	{ },
++};
++
++static struct axp20x_dev *axp20x_pm_power_off;
++static void axp20x_power_off(void)
++{
++	regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL,
++		     AXP20X_OFF);
++}
++
++static int axp20x_i2c_probe(struct i2c_client *i2c,
++			 const struct i2c_device_id *id)
++{
++	struct axp20x_dev *axp20x;
++	const struct of_device_id *of_id;
++	struct device_node *node = i2c->dev.of_node;
++	int ret;
++
++	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
++	if (!axp20x)
++		return -ENOMEM;
++
++	of_id = of_match_device(axp20x_of_match, &i2c->dev);
++	if (!of_id) {
++		dev_err(&i2c->dev, "Unable to setup AXP20X data\n");
++		return -ENODEV;
++	}
++	axp20x->variant = (int) of_id->data;
++
++	axp20x->i2c_client = i2c;
++	axp20x->dev = &i2c->dev;
++	dev_set_drvdata(axp20x->dev, axp20x);
++
++	axp20x->regmap = devm_regmap_init_i2c(i2c, &axp20x_regmap_config);
++	if (IS_ERR(axp20x->regmap)) {
++		ret = PTR_ERR(axp20x->regmap);
++		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
++		return ret;
++	}
++
++	axp20x->irq = i2c->irq;
++	ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
++				  IRQF_ONESHOT | IRQF_SHARED, -1,
++				  &axp20x_regmap_irq_chip,
++				  &axp20x->regmap_irqc);
++	if (ret) {
++		dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
++		return ret;
++	}
++
++	ret = mfd_add_devices(axp20x->dev, -1, axp20x_cells,
++			      ARRAY_SIZE(axp20x_cells), NULL, 0, NULL);
++	if (ret) {
++		dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
++		goto mfd_err;
++	}
++
++	axp20x->pm_off = of_property_read_bool(node, "axp,system-power-controller");
++
++	if (axp20x->pm_off && !pm_power_off) {
++		axp20x_pm_power_off = axp20x;
++		pm_power_off = axp20x_power_off;
++	}
++
++	dev_info(&i2c->dev, "AXP20X driver loaded\n");
++
++	return 0;
++
++mfd_err:
++	regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
++
++	return ret;
++}
++
++static int axp20x_i2c_remove(struct i2c_client *i2c)
++{
++	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
++
++	if (axp20x == axp20x_pm_power_off) {
++		axp20x_pm_power_off = NULL;
++		pm_power_off = NULL;
++	}
++
++	mfd_remove_devices(axp20x->dev);
++	regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
++
++	return 0;
++}
++
++static const struct i2c_device_id axp20x_i2c_id[] = {
++	{ "axp202", AXP202_ID },
++	{ "axp209", AXP209_ID },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
++
++static struct i2c_driver axp20x_i2c_driver = {
++	.driver = {
++		.name	= "axp20x",
++		.owner	= THIS_MODULE,
++		.of_match_table	= of_match_ptr(axp20x_of_match),
++	},
++	.probe		= axp20x_i2c_probe,
++	.remove		= axp20x_i2c_remove,
++	.id_table	= axp20x_i2c_id,
++};
++
++module_i2c_driver(axp20x_i2c_driver);
++
++MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
++MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
++MODULE_LICENSE("GPL");
+--- /dev/null
++++ b/include/linux/mfd/axp20x.h
+@@ -0,0 +1,180 @@
++/*
++ * Functions to access AXP20X power management chip.
++ *
++ * Copyright (C) 2013, Carlo Caione <carlo@caione.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#ifndef __LINUX_MFD_AXP20X_H
++#define __LINUX_MFD_AXP20X_H
++
++#define AXP202_ID			0
++#define AXP209_ID			1
++
++#define AXP20X_DATACACHE(m)		(0x04 + (m))
++
++/* Power supply */
++#define AXP20X_PWR_INPUT_STATUS		0x00
++#define AXP20X_PWR_OP_MODE		0x01
++#define AXP20X_USB_OTG_STATUS		0x02
++#define AXP20X_PWR_OUT_CTRL		0x12
++#define AXP20X_DCDC2_V_OUT		0x23
++#define AXP20X_DCDC2_LDO3_V_SCAL	0x25
++#define AXP20X_DCDC3_V_OUT		0x27
++#define AXP20X_LDO24_V_OUT		0x28
++#define AXP20X_LDO3_V_OUT		0x29
++#define AXP20X_VBUS_IPSOUT_MGMT		0x30
++#define AXP20X_V_OFF			0x31
++#define AXP20X_OFF_CTRL			0x32
++#define AXP20X_CHRG_CTRL1		0x33
++#define AXP20X_CHRG_CTRL2		0x34
++#define AXP20X_CHRG_BAK_CTRL		0x35
++#define AXP20X_PEK_KEY			0x36
++#define AXP20X_DCDC_FREQ		0x37
++#define AXP20X_V_LTF_CHRG		0x38
++#define AXP20X_V_HTF_CHRG		0x39
++#define AXP20X_APS_WARN_L1		0x3a
++#define AXP20X_APS_WARN_L2		0x3b
++#define AXP20X_V_LTF_DISCHRG		0x3c
++#define AXP20X_V_HTF_DISCHRG		0x3d
++
++/* Interrupt */
++#define AXP20X_IRQ1_EN			0x40
++#define AXP20X_IRQ2_EN			0x41
++#define AXP20X_IRQ3_EN			0x42
++#define AXP20X_IRQ4_EN			0x43
++#define AXP20X_IRQ5_EN			0x44
++#define AXP20X_IRQ1_STATE		0x48
++#define AXP20X_IRQ2_STATE		0x49
++#define AXP20X_IRQ3_STATE		0x4a
++#define AXP20X_IRQ4_STATE		0x4b
++#define AXP20X_IRQ5_STATE		0x4c
++
++/* ADC */
++#define AXP20X_ACIN_V_ADC_H		0x56
++#define AXP20X_ACIN_V_ADC_L		0x57
++#define AXP20X_ACIN_I_ADC_H		0x58
++#define AXP20X_ACIN_I_ADC_L		0x59
++#define AXP20X_VBUS_V_ADC_H		0x5a
++#define AXP20X_VBUS_V_ADC_L		0x5b
++#define AXP20X_VBUS_I_ADC_H		0x5c
++#define AXP20X_VBUS_I_ADC_L		0x5d
++#define AXP20X_TEMP_ADC_H		0x5e
++#define AXP20X_TEMP_ADC_L		0x5f
++#define AXP20X_TS_IN_H			0x62
++#define AXP20X_TS_IN_L			0x63
++#define AXP20X_GPIO0_V_ADC_H		0x64
++#define AXP20X_GPIO0_V_ADC_L		0x65
++#define AXP20X_GPIO1_V_ADC_H		0x66
++#define AXP20X_GPIO1_V_ADC_L		0x67
++#define AXP20X_PWR_BATT_H		0x70
++#define AXP20X_PWR_BATT_M		0x71
++#define AXP20X_PWR_BATT_L		0x72
++#define AXP20X_BATT_V_H			0x78
++#define AXP20X_BATT_V_L			0x79
++#define AXP20X_BATT_CHRG_I_H		0x7a
++#define AXP20X_BATT_CHRG_I_L		0x7b
++#define AXP20X_BATT_DISCHRG_I_H		0x7c
++#define AXP20X_BATT_DISCHRG_I_L		0x7d
++#define AXP20X_IPSOUT_V_HIGH_H		0x7e
++#define AXP20X_IPSOUT_V_HIGH_L		0x7f
++
++/* Power supply */
++#define AXP20X_DCDC_MODE		0x80
++#define AXP20X_ADC_EN1			0x82
++#define AXP20X_ADC_EN2			0x83
++#define AXP20X_ADC_RATE			0x84
++#define AXP20X_GPIO10_IN_RANGE		0x85
++#define AXP20X_GPIO1_ADC_IRQ_RIS	0x86
++#define AXP20X_GPIO1_ADC_IRQ_FAL	0x87
++#define AXP20X_TIMER_CTRL		0x8a
++#define AXP20X_VBUS_MON			0x8b
++#define AXP20X_OVER_TMP			0x8f
++
++/* GPIO */
++#define AXP20X_GPIO0_CTRL		0x90
++#define AXP20X_LDO5_V_OUT		0x91
++#define AXP20X_GPIO1_CTRL		0x92
++#define AXP20X_GPIO2_CTRL		0x93
++#define AXP20X_GPIO20_SS		0x94
++#define AXP20X_GPIO3_CTRL		0x95
++
++/* Battery */
++#define AXP20X_CHRG_CC_31_24		0xb0
++#define AXP20X_CHRG_CC_23_16		0xb1
++#define AXP20X_CHRG_CC_15_8		0xb2
++#define AXP20X_CHRG_CC_7_0		0xb3
++#define AXP20X_DISCHRG_CC_31_24		0xb4
++#define AXP20X_DISCHRG_CC_23_16		0xb5
++#define AXP20X_DISCHRG_CC_15_8		0xb6
++#define AXP20X_DISCHRG_CC_7_0		0xb7
++#define AXP20X_CC_CTRL			0xb8
++#define AXP20X_FG_RES			0xb9
++
++/* Regulators IDs */
++enum {
++	AXP20X_LDO1 = 0,
++	AXP20X_LDO2,
++	AXP20X_LDO3,
++	AXP20X_LDO4,
++	AXP20X_LDO5,
++	AXP20X_DCDC2,
++	AXP20X_DCDC3,
++	AXP20X_REG_ID_MAX,
++};
++
++/* IRQs */
++enum {
++	AXP20X_IRQ_ACIN_OVER_V = 1,
++	AXP20X_IRQ_ACIN_PLUGIN,
++	AXP20X_IRQ_ACIN_REMOVAL,
++	AXP20X_IRQ_VBUS_OVER_V,
++	AXP20X_IRQ_VBUS_PLUGIN,
++	AXP20X_IRQ_VBUS_REMOVAL,
++	AXP20X_IRQ_VBUS_V_LOW,
++	AXP20X_IRQ_BATT_PLUGIN,
++	AXP20X_IRQ_BATT_REMOVAL,
++	AXP20X_IRQ_BATT_ENT_ACT_MODE,
++	AXP20X_IRQ_BATT_EXIT_ACT_MODE,
++	AXP20X_IRQ_CHARG,
++	AXP20X_IRQ_CHARG_DONE,
++	AXP20X_IRQ_BATT_TEMP_HIGH,
++	AXP20X_IRQ_BATT_TEMP_LOW,
++	AXP20X_IRQ_DIE_TEMP_HIGH,
++	AXP20X_IRQ_CHARG_I_LOW,
++	AXP20X_IRQ_DCDC1_V_LONG,
++	AXP20X_IRQ_DCDC2_V_LONG,
++	AXP20X_IRQ_DCDC3_V_LONG,
++	AXP20X_IRQ_PEK_SHORT = 22,
++	AXP20X_IRQ_PEK_LONG,
++	AXP20X_IRQ_N_OE_PWR_ON,
++	AXP20X_IRQ_N_OE_PWR_OFF,
++	AXP20X_IRQ_VBUS_VALID,
++	AXP20X_IRQ_VBUS_NOT_VALID,
++	AXP20X_IRQ_VBUS_SESS_VALID,
++	AXP20X_IRQ_VBUS_SESS_END,
++	AXP20X_IRQ_LOW_PWR_LVL1,
++	AXP20X_IRQ_LOW_PWR_LVL2,
++	AXP20X_IRQ_TIMER,
++	AXP20X_IRQ_PEK_RIS_EDGE,
++	AXP20X_IRQ_PEK_FAL_EDGE,
++	AXP20X_IRQ_GPIO3_INPUT,
++	AXP20X_IRQ_GPIO2_INPUT,
++	AXP20X_IRQ_GPIO1_INPUT,
++	AXP20X_IRQ_GPIO0_INPUT,
++};
++
++struct axp20x_dev {
++	struct device			*dev;
++	struct i2c_client		*i2c_client;
++	struct regmap			*regmap;
++	struct regmap_irq_chip_data	*regmap_irqc;
++	int				variant;
++	int				irq;
++	bool				pm_off;
++};
++
++#endif /* __LINUX_MFD_AXP20X_H */
diff --git a/trunk/target/linux/sunxi/patches-3.14/211-input-add-axp20x-power-enable-key-support.patch b/trunk/target/linux/sunxi/patches-3.14/211-input-add-axp20x-power-enable-key-support.patch
new file mode 100644
index 00000000..c7ce5e22
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/211-input-add-axp20x-power-enable-key-support.patch
@@ -0,0 +1,327 @@
+From 656b9ff9781aa3ffeb4231f32dfc545c92d04a12 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@caione.org>
+Date: Sat, 1 Mar 2014 17:45:49 +0100
+Subject: [PATCH] input: misc: Add driver for AXP20x Power Enable Key
+
+This patch add support for the Power Enable Key found on MFD AXP202 and
+AXP209. Besides the basic support for the button, the driver adds two
+entries in sysfs to configure the time delay for power on/off.
+
+Signed-off-by: Carlo Caione <carlo@caione.org>
+---
+ arch/arm/configs/sunxi_defconfig |   2 +
+ drivers/input/misc/Kconfig       |  11 ++
+ drivers/input/misc/Makefile      |   1 +
+ drivers/input/misc/axp20x-pek.c  | 265 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 279 insertions(+)
+ create mode 100644 drivers/input/misc/axp20x-pek.c
+
+--- a/arch/arm/configs/sunxi_defconfig
++++ b/arch/arm/configs/sunxi_defconfig
+@@ -40,6 +40,8 @@ CONFIG_SUN4I_EMAC=y
+ # CONFIG_NET_VENDOR_STMICRO is not set
+ # CONFIG_NET_VENDOR_WIZNET is not set
+ # CONFIG_WLAN is not set
++CONFIG_INPUT_MISC=y
++CONFIG_INPUT_AXP20X_PEK=y
+ CONFIG_SERIAL_8250=y
+ CONFIG_SERIAL_8250_CONSOLE=y
+ CONFIG_SERIAL_8250_NR_UARTS=8
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -393,6 +393,17 @@ config INPUT_RETU_PWRBUTTON
+ 	  To compile this driver as a module, choose M here. The module will
+ 	  be called retu-pwrbutton.
+ 
++config INPUT_AXP20X_PEK
++	tristate "X-Powers AXP20X power button driver"
++	depends on MFD_AXP20X
++	help
++	  Say Y here if you want to enable power key reporting via the
++	  AXP20X PMIC.
++
++	  To compile this driver as a module, choose M here. The module will
++	  be called axp20x-pek.
++
++
+ config INPUT_TWL4030_PWRBUTTON
+ 	tristate "TWL4030 Power button Driver"
+ 	depends on TWL4030_CORE
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -50,6 +50,7 @@ obj-$(CONFIG_INPUT_POWERMATE)		+= powerm
+ obj-$(CONFIG_INPUT_PWM_BEEPER)		+= pwm-beeper.o
+ obj-$(CONFIG_INPUT_RB532_BUTTON)	+= rb532_button.o
+ obj-$(CONFIG_INPUT_RETU_PWRBUTTON)	+= retu-pwrbutton.o
++obj-$(CONFIG_INPUT_AXP20X_PEK)		+= axp20x-pek.o
+ obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER)	+= rotary_encoder.o
+ obj-$(CONFIG_INPUT_SGI_BTNS)		+= sgi_btns.o
+ obj-$(CONFIG_INPUT_SIRFSOC_ONKEY)	+= sirfsoc-onkey.o
+--- /dev/null
++++ b/drivers/input/misc/axp20x-pek.c
+@@ -0,0 +1,265 @@
++/*
++ * axp20x power button driver.
++ *
++ * Copyright (C) 2013 Carlo Caione <carlo@caione.org>
++ *
++ * This file is subject to the terms and conditions of the GNU General
++ * Public License. See the file "COPYING" in the main directory of this
++ * archive for more details.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++#include <linux/errno.h>
++#include <linux/irq.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/kernel.h>
++#include <linux/mfd/axp20x.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/regmap.h>
++#include <linux/slab.h>
++
++#define AXP20X_PEK_STARTUP_MASK		(0xc0)
++#define AXP20X_PEK_SHUTDOWN_MASK	(0x03)
++
++static const char const *startup_time[] = { "128mS", "3S" , "1S", "2S" };
++static const char const *shutdown_time[] = { "4S", "6S" , "8S", "10S" };
++
++struct axp20x_pek {
++	struct axp20x_dev *axp20x;
++	struct input_dev *input;
++	int irq_dbr;
++	int irq_dbf;
++};
++
++struct axp20x_pek_ext_attr {
++	const char const **str;
++	unsigned int mask;
++};
++
++static struct axp20x_pek_ext_attr axp20x_pek_startup_ext_attr = {
++	.str	= startup_time,
++	.mask	= AXP20X_PEK_STARTUP_MASK,
++};
++
++static struct axp20x_pek_ext_attr axp20x_pek_shutdown_ext_attr = {
++	.str	= shutdown_time,
++	.mask	= AXP20X_PEK_SHUTDOWN_MASK,
++};
++
++static struct axp20x_pek_ext_attr *get_axp_ext_attr(struct device_attribute *attr)
++{
++	return container_of(attr, struct dev_ext_attribute, attr)->var;
++}
++
++ssize_t axp20x_show_ext_attr(struct device *dev, struct device_attribute *attr,
++			     char *buf)
++{
++	struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
++	struct axp20x_pek_ext_attr *axp20x_ea = get_axp_ext_attr(attr);
++	unsigned int val;
++	int ret, i;
++	int cnt = 0;
++
++	ret = regmap_read(axp20x_pek->axp20x->regmap, AXP20X_PEK_KEY, &val);
++	if (ret != 0)
++		return ret;
++
++	val &= axp20x_ea->mask;
++	val >>= ffs(axp20x_ea->mask) - 1;
++
++	for (i = 0; i < 4; i++) {
++		if (val == i)
++			cnt += sprintf(buf + cnt, "[%s] ", axp20x_ea->str[i]);
++		else
++			cnt += sprintf(buf + cnt, "%s ", axp20x_ea->str[i]);
++	}
++
++	cnt += sprintf(buf + cnt, "\n");
++
++	return cnt;
++}
++
++ssize_t axp20x_store_ext_attr(struct device *dev, struct device_attribute *attr,
++			      const char *buf, size_t count)
++{
++	struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
++	struct axp20x_pek_ext_attr *axp20x_ea = get_axp_ext_attr(attr);
++	char val_str[20];
++	int ret, i;
++	size_t len;
++
++	val_str[sizeof(val_str) - 1] = '\0';
++	strncpy(val_str, buf, sizeof(val_str) - 1);
++	len = strlen(val_str);
++
++	if (len && val_str[len - 1] == '\n')
++		val_str[len - 1] = '\0';
++
++	for (i = 0; i < 4; i++) {
++		if (!strcmp(val_str, axp20x_ea->str[i])) {
++			ret = regmap_update_bits(axp20x_pek->axp20x->regmap,
++						 AXP20X_PEK_KEY,
++						 axp20x_ea->mask, i);
++			if (ret != 0)
++				return -EINVAL;
++			return count;
++		}
++	}
++
++	return -EINVAL;
++}
++
++static struct dev_ext_attribute axp20x_dev_attr_startup = {
++	.attr	= __ATTR(startup, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr),
++	.var	= &axp20x_pek_startup_ext_attr
++};
++
++static struct dev_ext_attribute axp20x_dev_attr_shutdown = {
++	__ATTR(shutdown, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr),
++	&axp20x_pek_shutdown_ext_attr
++};
++
++static struct attribute *dev_attrs[] = {
++	&axp20x_dev_attr_startup.attr.attr,
++	&axp20x_dev_attr_shutdown.attr.attr,
++	NULL,
++};
++
++static struct attribute_group dev_attr_group = {
++	.attrs	= dev_attrs,
++};
++
++static const struct attribute_group *dev_attr_groups[] = {
++	&dev_attr_group,
++	NULL,
++};
++
++static irqreturn_t axp20x_pek_irq(int irq, void *pwr)
++{
++	struct input_dev *idev = pwr;
++	struct axp20x_pek *axp20x_pek = input_get_drvdata(idev);
++
++	if (irq == axp20x_pek->irq_dbr)
++		input_report_key(idev, KEY_POWER, true);
++	else if (irq == axp20x_pek->irq_dbf)
++		input_report_key(idev, KEY_POWER, false);
++
++	input_sync(idev);
++
++	return IRQ_HANDLED;
++}
++
++static int axp20x_pek_probe(struct platform_device *pdev)
++{
++	struct axp20x_pek *axp20x_pek;
++	struct axp20x_dev *axp20x;
++	struct input_dev *idev;
++	int error;
++
++	axp20x_pek = devm_kzalloc(&pdev->dev, sizeof(struct axp20x_pek),
++				  GFP_KERNEL);
++	if (!axp20x_pek)
++		return -ENOMEM;
++
++	axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
++	axp20x = axp20x_pek->axp20x;
++
++	axp20x_pek->irq_dbr = platform_get_irq_byname(pdev, "PEK_DBR");
++	if (axp20x_pek->irq_dbr < 0) {
++		dev_err(&pdev->dev, "No IRQ for PEK_DBR, error=%d\n",
++				axp20x_pek->irq_dbr);
++		return axp20x_pek->irq_dbr;
++	}
++	axp20x_pek->irq_dbr = regmap_irq_get_virq(axp20x->regmap_irqc,
++						  axp20x_pek->irq_dbr);
++
++	axp20x_pek->irq_dbf = platform_get_irq_byname(pdev, "PEK_DBF");
++	if (axp20x_pek->irq_dbf < 0) {
++		dev_err(&pdev->dev, "No IRQ for PEK_DBF, error=%d\n",
++				axp20x_pek->irq_dbf);
++		return axp20x_pek->irq_dbf;
++	}
++	axp20x_pek->irq_dbf = regmap_irq_get_virq(axp20x->regmap_irqc,
++						  axp20x_pek->irq_dbf);
++
++	axp20x_pek->input = devm_input_allocate_device(&pdev->dev);
++	if (!axp20x_pek->input)
++		return -ENOMEM;
++
++	idev = axp20x_pek->input;
++
++	idev->name = "axp20x-pek";
++	idev->phys = "m1kbd/input2";
++	idev->dev.parent = &pdev->dev;
++
++	input_set_capability(idev, EV_KEY, KEY_POWER);
++
++	input_set_drvdata(idev, axp20x_pek);
++
++	error = devm_request_threaded_irq(&pdev->dev, axp20x_pek->irq_dbr,
++					  NULL, axp20x_pek_irq, 0,
++					  "axp20x-pek-dbr", idev);
++	if (error) {
++		dev_err(axp20x->dev, "Failed to request dbr IRQ#%d: %d\n",
++			axp20x_pek->irq_dbr, error);
++
++		return error;
++	}
++
++	error = devm_request_threaded_irq(&pdev->dev, axp20x_pek->irq_dbf,
++					  NULL, axp20x_pek_irq, 0,
++					  "axp20x-pek-dbf", idev);
++	if (error) {
++		dev_err(axp20x->dev, "Failed to request dbf IRQ#%d: %d\n",
++			axp20x_pek->irq_dbf, error);
++		return error;
++	}
++
++	idev->dev.groups = dev_attr_groups;
++	error = input_register_device(idev);
++	if (error) {
++		dev_err(axp20x->dev, "Can't register input device: %d\n", error);
++		return error;
++	}
++
++	platform_set_drvdata(pdev, axp20x_pek);
++
++	return 0;
++}
++
++static int axp20x_pek_remove(struct platform_device *pdev)
++{
++	struct axp20x_pek *axp20x_pek = platform_get_drvdata(pdev);
++
++	input_unregister_device(axp20x_pek->input);
++
++	return 0;
++}
++
++static const struct of_device_id axp20x_pek_match[] = {
++	{ .compatible = "x-powers,axp20x-pek", },
++	{ /* sentinel */ },
++};
++MODULE_DEVICE_TABLE(of, axp20x_pek_match);
++
++static struct platform_driver axp20x_pek_driver = {
++	.probe		= axp20x_pek_probe,
++	.remove		= axp20x_pek_remove,
++	.driver		= {
++		.name		= "axp20x-pek",
++		.owner		= THIS_MODULE,
++		.of_match_table	= axp20x_pek_match,
++	},
++};
++module_platform_driver(axp20x_pek_driver);
++
++MODULE_DESCRIPTION("axp20x Power Button");
++MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.14/212-regulator-add-axp20x-regulator-support.patch b/trunk/target/linux/sunxi/patches-3.14/212-regulator-add-axp20x-regulator-support.patch
new file mode 100644
index 00000000..1ec041ce
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/212-regulator-add-axp20x-regulator-support.patch
@@ -0,0 +1,402 @@
+From c3af279a9031b3375d3e5a684619c1adbbe30da9 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@caione.org>
+Date: Sat, 1 Mar 2014 17:45:51 +0100
+Subject: [PATCH] regulator: AXP20x: Add support for regulators subsystem
+
+AXP202 and AXP209 come with two synchronous step-down DC-DCs and five
+LDOs. This patch introduces basic support for those regulators.
+
+Signed-off-by: Carlo Caione <carlo@caione.org>
+---
+ arch/arm/configs/sunxi_defconfig     |   1 +
+ drivers/regulator/Kconfig            |   7 +
+ drivers/regulator/Makefile           |   1 +
+ drivers/regulator/axp20x-regulator.c | 349 +++++++++++++++++++++++++++++++++++
+ 4 files changed, 358 insertions(+)
+ create mode 100644 drivers/regulator/axp20x-regulator.c
+
+--- a/arch/arm/configs/sunxi_defconfig
++++ b/arch/arm/configs/sunxi_defconfig
+@@ -72,3 +72,4 @@ CONFIG_NFS_FS=y
+ CONFIG_ROOT_NFS=y
+ CONFIG_NLS=y
+ CONFIG_PRINTK_TIME=y
++CONFIG_REGULATOR_AXP20X=y
+--- a/drivers/regulator/Kconfig
++++ b/drivers/regulator/Kconfig
+@@ -139,6 +139,13 @@ config REGULATOR_AS3722
+ 	  AS3722 PMIC. This will enable support for all the software
+ 	  controllable DCDC/LDO regulators.
+ 
++config REGULATOR_AXP20X
++	tristate "X-POWERS AXP20X PMIC Regulators"
++	depends on MFD_AXP20X
++	help
++	  This driver provides support for the voltage regulators on the
++	  AXP20X PMIC.
++
+ config REGULATOR_DA903X
+ 	tristate "Dialog Semiconductor DA9030/DA9034 regulators"
+ 	depends on PMIC_DA903X
+--- a/drivers/regulator/Makefile
++++ b/drivers/regulator/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_REGULATOR_ANATOP) += anatop
+ obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
+ obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
+ obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o
++obj-$(CONFIG_REGULATOR_AXP20X) += axp20x-regulator.o
+ obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o
+ obj-$(CONFIG_REGULATOR_DA9052)	+= da9052-regulator.o
+ obj-$(CONFIG_REGULATOR_DA9055)	+= da9055-regulator.o
+--- /dev/null
++++ b/drivers/regulator/axp20x-regulator.c
+@@ -0,0 +1,349 @@
++/*
++ * axp20x regulators driver.
++ *
++ * Copyright (C) 2013 Carlo Caione <carlo@caione.org>
++ *
++ * This file is subject to the terms and conditions of the GNU General
++ * Public License. See the file "COPYING" in the main directory of this
++ * archive for more details.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <linux/platform_device.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/regulator/driver.h>
++#include <linux/regulator/of_regulator.h>
++#include <linux/mfd/axp20x.h>
++#include <linux/regmap.h>
++
++#define AXP20X_IO_ENABLED		(0x03)
++
++#define AXP20X_WORKMODE_DCDC2_MASK	BIT(2)
++#define AXP20X_WORKMODE_DCDC3_MASK	BIT(1)
++
++#define AXP20X_FREQ_DCDC_MASK		(0x0f)
++
++struct axp20x_regulators {
++	struct regulator_desc	rdesc[AXP20X_REG_ID_MAX];
++	struct regulator_dev	*rdev[AXP20X_REG_ID_MAX];
++	struct axp20x_dev	*axp20x;
++};
++
++#define AXP20X_DESC(_id, _min, _max, _step, _vreg, _vmask, _ereg, _emask) 	\
++	[AXP20X_##_id] = {							\
++		.name		= #_id,						\
++		.type		= REGULATOR_VOLTAGE,				\
++		.id		= AXP20X_##_id,					\
++		.n_voltages	= (((_max) - (_min)) / (_step) + 1),		\
++		.owner		= THIS_MODULE,					\
++		.min_uV		= (_min) * 1000,				\
++		.uV_step	= (_step) * 1000,				\
++		.vsel_reg	= (_vreg),					\
++		.vsel_mask	= (_vmask),					\
++		.enable_reg	= (_ereg),					\
++		.enable_mask	= (_emask),					\
++		.ops		= &axp20x_ops,					\
++	}
++
++#define AXP20X_DESC_IO(_id, _min, _max, _step, _vreg, _vmask, _ereg, _emask)	\
++	[AXP20X_##_id] = {							\
++		.name		= #_id,						\
++		.type		= REGULATOR_VOLTAGE,				\
++		.id		= AXP20X_##_id,					\
++		.n_voltages	= (((_max) - (_min)) / (_step) + 1),		\
++		.owner		= THIS_MODULE,					\
++		.min_uV		= (_min) * 1000,				\
++		.uV_step	= (_step) * 1000,				\
++		.vsel_reg	= (_vreg),					\
++		.vsel_mask	= (_vmask),					\
++		.enable_reg	= (_ereg),					\
++		.enable_mask	= (_emask),					\
++		.ops		= &axp20x_ops_io,				\
++	}
++
++#define AXP20X_DESC_FIXED(_id, _volt)						\
++	[AXP20X_##_id] = {							\
++		.name		= #_id,						\
++		.type		= REGULATOR_VOLTAGE,				\
++		.id		= AXP20X_##_id,					\
++		.n_voltages	= 1,						\
++		.owner		= THIS_MODULE,					\
++		.min_uV		= (_volt) * 1000,				\
++		.ops		= &axp20x_ops,					\
++	}
++
++#define AXP20X_DESC_TABLE(_id, _table, _vreg, _vmask, _ereg, _emask)		\
++	[AXP20X_##_id] = {							\
++		.name		= #_id,						\
++		.type		= REGULATOR_VOLTAGE,				\
++		.id		= AXP20X_##_id,					\
++		.n_voltages	= ARRAY_SIZE(_table),				\
++		.owner		= THIS_MODULE,					\
++		.vsel_reg	= (_vreg),					\
++		.vsel_mask	= (_vmask),					\
++		.enable_reg	= (_ereg),					\
++		.enable_mask	= (_emask),					\
++		.volt_table	= (_table),					\
++		.ops		= &axp20x_ops_table,				\
++	}
++
++static int axp20x_ldo4_data[] = { 1250000, 1300000, 1400000, 1500000, 1600000, 1700000,
++				  1800000, 1900000, 2000000, 2500000, 2700000, 2800000,
++				  3000000, 3100000, 3200000, 3300000 };
++
++static int axp20x_set_suspend_voltage(struct regulator_dev *rdev, int uV)
++{
++	return regulator_set_voltage_sel_regmap(rdev, 0);
++}
++
++static int axp20x_io_enable_regmap(struct regulator_dev *rdev)
++{
++	return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
++				  rdev->desc->enable_mask, AXP20X_IO_ENABLED);
++}
++
++static int axp109_io_is_enabled_regmap(struct regulator_dev *rdev)
++{
++	unsigned int val;
++	int ret;
++
++	ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val);
++	if (ret != 0)
++		return ret;
++
++	val &= rdev->desc->enable_mask;
++	return (val == AXP20X_IO_ENABLED);
++}
++
++static struct regulator_ops axp20x_ops_table = {
++	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
++	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
++	.list_voltage		= regulator_list_voltage_table,
++	.enable			= regulator_enable_regmap,
++	.disable		= regulator_disable_regmap,
++	.is_enabled		= regulator_is_enabled_regmap,
++	.set_suspend_enable	= regulator_enable_regmap,
++	.set_suspend_disable	= regulator_disable_regmap,
++	.set_suspend_voltage	= axp20x_set_suspend_voltage,
++};
++
++
++static struct regulator_ops axp20x_ops = {
++	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
++	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
++	.list_voltage		= regulator_list_voltage_linear,
++	.enable			= regulator_enable_regmap,
++	.disable		= regulator_disable_regmap,
++	.is_enabled		= regulator_is_enabled_regmap,
++	.set_suspend_enable	= regulator_enable_regmap,
++	.set_suspend_disable	= regulator_disable_regmap,
++	.set_suspend_voltage	= axp20x_set_suspend_voltage,
++};
++
++static struct regulator_ops axp20x_ops_io = {
++	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
++	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
++	.list_voltage		= regulator_list_voltage_linear,
++	.enable			= axp20x_io_enable_regmap,
++	.disable		= regulator_disable_regmap,
++	.is_enabled		= axp109_io_is_enabled_regmap,
++	.set_suspend_enable	= regulator_enable_regmap,
++	.set_suspend_disable	= regulator_disable_regmap,
++	.set_suspend_voltage	= axp20x_set_suspend_voltage,
++};
++
++static struct regulator_desc axp20x_regulators[] = {
++	AXP20X_DESC(DCDC2, 700, 2275, 25, AXP20X_DCDC2_V_OUT, 0x3f,
++		    AXP20X_PWR_OUT_CTRL, 0x10),
++	AXP20X_DESC(DCDC3, 700, 3500, 25, AXP20X_DCDC3_V_OUT, 0x7f,
++		    AXP20X_PWR_OUT_CTRL, 0x02),
++	AXP20X_DESC_FIXED(LDO1, 1300),
++	AXP20X_DESC(LDO2, 1800, 3300, 100, AXP20X_LDO24_V_OUT, 0xf0,
++		    AXP20X_PWR_OUT_CTRL, 0x04),
++	AXP20X_DESC(LDO3, 700, 3500, 25, AXP20X_LDO3_V_OUT, 0x7f,
++		    AXP20X_PWR_OUT_CTRL, 0x40),
++	AXP20X_DESC_TABLE(LDO4, axp20x_ldo4_data, AXP20X_LDO24_V_OUT, 0x0f,
++			  AXP20X_PWR_OUT_CTRL, 0x08),
++	AXP20X_DESC_IO(LDO5, 1800, 3300, 100, AXP20X_LDO5_V_OUT, 0xf0,
++		       AXP20X_GPIO0_CTRL, 0x07),
++};
++
++#define AXP_MATCH(_name, _id) \
++	[AXP20X_##_id] = { \
++		.name		= #_name, \
++		.driver_data	= (void *) &axp20x_regulators[AXP20X_##_id], \
++	}
++
++static struct of_regulator_match axp20x_matches[] = {
++	AXP_MATCH(dcdc2, DCDC2),
++	AXP_MATCH(dcdc3, DCDC3),
++	AXP_MATCH(ldo1, LDO1),
++	AXP_MATCH(ldo2, LDO2),
++	AXP_MATCH(ldo3, LDO3),
++	AXP_MATCH(ldo4, LDO4),
++	AXP_MATCH(ldo5, LDO5),
++};
++
++static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
++{
++	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
++
++	if (dcdcfreq < 750)
++		dcdcfreq = 750;
++
++	if (dcdcfreq > 1875)
++		dcdcfreq = 1875;
++
++	dcdcfreq = (dcdcfreq - 750) / 75;
++
++	return regmap_update_bits(axp20x->regmap, AXP20X_DCDC_FREQ,
++				  AXP20X_FREQ_DCDC_MASK, dcdcfreq);
++}
++
++static int axp20x_regulator_parse_dt(struct platform_device *pdev)
++{
++	struct device_node *np, *regulators;
++	int ret;
++	u32 dcdcfreq;
++
++	np = of_node_get(pdev->dev.parent->of_node);
++	if (!np)
++		return 0;
++
++	regulators = of_find_node_by_name(np, "regulators");
++	if (!regulators) {
++		dev_err(&pdev->dev, "regulators node not found\n");
++		return -EINVAL;
++	}
++
++	ret = of_regulator_match(&pdev->dev, regulators, axp20x_matches,
++				 ARRAY_SIZE(axp20x_matches));
++	if (ret < 0) {
++		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
++			ret);
++		return ret;
++	}
++
++	dcdcfreq = 0x08;
++	of_property_read_u32(regulators, "dcdc-freq", &dcdcfreq);
++	ret = axp20x_set_dcdc_freq(pdev, dcdcfreq);
++	if (ret < 0) {
++		dev_err(&pdev->dev, "Error setting dcdc frequency: %d\n", ret);
++		return ret;
++	}
++
++	of_node_put(regulators);
++
++	return 0;
++}
++
++static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 workmode)
++{
++	unsigned int mask = AXP20X_WORKMODE_DCDC2_MASK;
++
++	if ((id != AXP20X_DCDC2) && (id != AXP20X_DCDC3))
++		return -EINVAL;
++
++	if (id == AXP20X_DCDC3)
++		mask = AXP20X_WORKMODE_DCDC3_MASK;
++
++	return regmap_update_bits(rdev->regmap, AXP20X_DCDC_MODE, mask, workmode);
++}
++
++static int axp20x_regulator_probe(struct platform_device *pdev)
++{
++	struct axp20x_regulators *pmic;
++	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
++	struct regulator_config config = { };
++	struct regulator_init_data *init_data;
++	int ret, i;
++	u32 workmode;
++
++	ret = axp20x_regulator_parse_dt(pdev);
++	if (ret)
++		return ret;
++
++	pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
++	if (!pmic) {
++		dev_err(&pdev->dev, "Failed to alloc pmic\n");
++		return -ENOMEM;
++	}
++
++	pmic->axp20x = axp20x;
++	memcpy(pmic->rdesc, axp20x_regulators, sizeof(pmic->rdesc));
++	platform_set_drvdata(pdev, pmic);
++
++	for (i = 0; i < AXP20X_REG_ID_MAX; i++) {
++		init_data = axp20x_matches[i].init_data;
++		if (!init_data)
++			continue;
++
++		config.dev = &pdev->dev;
++		config.init_data = init_data;
++		config.driver_data = pmic;
++		config.regmap = axp20x->regmap;
++		config.of_node = axp20x_matches[i].of_node;
++
++		pmic->rdev[i] = regulator_register(&pmic->rdesc[i], &config);
++		if (IS_ERR(pmic->rdev[i])) {
++			ret = PTR_ERR(pmic->rdev[i]);
++			dev_err(&pdev->dev, "Failed to register %s\n",
++				pmic->rdesc[i].name);
++
++			while (--i >= 0)
++				regulator_unregister(pmic->rdev[i]);
++
++			return ret;
++		}
++
++		ret = of_property_read_u32(axp20x_matches[i].of_node, "dcdc-workmode",
++					   &workmode);
++		if (!ret) {
++			ret = axp20x_set_dcdc_workmode(pmic->rdev[i], i, workmode);
++			if (ret)
++				dev_err(&pdev->dev, "Failed to set workmode on %s\n",
++					pmic->rdesc[i].name);
++		}
++	}
++
++	return 0;
++}
++
++static int axp20x_regulator_remove(struct platform_device *pdev)
++{
++	struct axp20x_regulators *pmic = platform_get_drvdata(pdev);
++	int i;
++
++	 for (i = 0; i < AXP20X_REG_ID_MAX; i++)
++		 regulator_unregister(pmic->rdev[i]);
++
++	 return 0;
++}
++
++static struct platform_driver axp20x_regulator_driver = {
++	.probe	= axp20x_regulator_probe,
++	.remove	= axp20x_regulator_remove,
++	.driver	= {
++		.name		= "axp20x-regulator",
++		.owner		= THIS_MODULE,
++	},
++};
++
++static int __init axp20x_regulator_init(void)
++{
++	return platform_driver_register(&axp20x_regulator_driver);
++}
++
++subsys_initcall(axp20x_regulator_init);
++
++MODULE_LICENSE("GPL v2");
++MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
++MODULE_DESCRIPTION("Regulator Driver for AXP20X PMIC");
diff --git a/trunk/target/linux/sunxi/patches-3.14/213-dt-sunxi-add-x-powers.patch b/trunk/target/linux/sunxi/patches-3.14/213-dt-sunxi-add-x-powers.patch
new file mode 100644
index 00000000..aa29a010
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/213-dt-sunxi-add-x-powers.patch
@@ -0,0 +1,77 @@
+From 7b42dc4ff2cca887e0c6e1ad291d65b30e64dd92 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 5 Mar 2014 20:30:41 +0100
+Subject: [PATCH] ARM: sunxi: dt: Add x-powers-axp209.dtsi file
+
+This dtsi describes the axp209 PMIC, and is to be included from inside
+the i2c controller node to which the axp209 is connected.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/x-powers-axp209.dtsi | 60 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 60 insertions(+)
+ create mode 100644 arch/arm/boot/dts/x-powers-axp209.dtsi
+
+--- /dev/null
++++ b/arch/arm/boot/dts/x-powers-axp209.dtsi
+@@ -0,0 +1,60 @@
++/*
++ * x-powers,axp209 common code to be include from inside the axp209 node
++ *
++ * Copyright 2014 - Carlo Caione <carlo@caione.org>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++	compatible = "x-powers,axp209";
++	interrupt-controller;
++	#interrupt-cells = <1>;
++
++	regulators {
++		dcdc-freq = "8";
++
++		axp_dcdc2: dcdc2 {
++			regulator-min-microvolt = <700000>;
++			regulator-max-microvolt = <2275000>;
++			dcdc-workmode = <0>;
++			regulator-always-on;
++		};
++
++		axp_dcdc3: dcdc3 {
++			regulator-min-microvolt = <700000>;
++			regulator-max-microvolt = <3500000>;
++			dcdc-workmode = <0>;
++			regulator-always-on;
++		};
++
++		axp_ldo1: ldo1 {
++			regulator-min-microvolt = <1300000>;
++			regulator-max-microvolt = <1300000>;
++		};
++
++		axp_ldo2: ldo2 {
++			regulator-min-microvolt = <1800000>;
++			regulator-max-microvolt = <3300000>;
++			regulator-always-on;
++		};
++
++		axp_ldo3: ldo3 {
++			regulator-min-microvolt = <700000>;
++			regulator-max-microvolt = <3500000>;
++		};
++
++		axp_ldo4: ldo4 {
++			regulator-min-microvolt = <1250000>;
++			regulator-max-microvolt = <3300000>;
++		};
++
++		axp_ldo5: ldo5 {
++			regulator-min-microvolt = <1800000>;
++			regulator-max-microvolt = <3300000>;
++		};
++	};
diff --git a/trunk/target/linux/sunxi/patches-3.14/214-1-dt-sun7i-add-axp209-to-cubieboard2.patch b/trunk/target/linux/sunxi/patches-3.14/214-1-dt-sun7i-add-axp209-to-cubieboard2.patch
new file mode 100644
index 00000000..f7f4d9af
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/214-1-dt-sun7i-add-axp209-to-cubieboard2.patch
@@ -0,0 +1,35 @@
+From c792a05efcfebcf94ba925135a778961700965f5 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@caione.org>
+Date: Sat, 1 Mar 2014 17:45:48 +0100
+Subject: [PATCH] ARM: sun7i: dt: Add AXP209 support to the cubieboard2
+
+AXP209 is the PMU used by Cubieboard2. This patch enables the AXP209
+support in the dts file.
+
+This patch requires: "ARM: sun7i/sun6i: irqchip: Add irqchip driver for
+NMI controller"
+
+Signed-off-by: Carlo Caione <carlo@caione.org>
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -74,6 +74,16 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupt-parent = <&nmi_intc>;
++				interrupts = <0 8>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/214-2-dt-sun4i-add-axp209-to-boards.patch b/trunk/target/linux/sunxi/patches-3.14/214-2-dt-sun4i-add-axp209-to-boards.patch
new file mode 100644
index 00000000..35dea879
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/214-2-dt-sun4i-add-axp209-to-boards.patch
@@ -0,0 +1,142 @@
+From d14c5523653ca6ce9f1487922c8ab4e571d17b62 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 11 Mar 2014 16:51:44 +0100
+Subject: [PATCH] ARM: sun4i: dt: Add AXP209 support to various boards
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10-a1000.dts          |  9 +++++++++
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts     |  9 +++++++++
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts      | 15 +++++++++++++++
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts      |  9 +++++++++
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts     | 15 +++++++++++++++
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 15 +++++++++++++++
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts        |  9 +++++++++
+ 7 files changed, 81 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
++++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
+@@ -65,6 +65,15 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupts = <0>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 	};
+ 
+--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
++++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+@@ -88,6 +88,15 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupts = <0>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
+--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
++++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+@@ -82,6 +82,21 @@
+ 			pinctrl-0 = <&uart0_pins_a>;
+ 			status = "okay";
+ 		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupts = <0>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
++		};
+ 	};
+ 
+ 	regulators {
+--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
++++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+@@ -55,6 +55,21 @@
+ 			pinctrl-0 = <&uart0_pins_a>;
+ 			status = "okay";
+ 		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupts = <0>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
++		};
+ 	};
+ 
+ 	reg_usb1_vbus: usb1-vbus {
+--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
++++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+@@ -90,6 +90,21 @@
+ 			pinctrl-0 = <&uart0_pins_a>;
+ 			status = "okay";
+ 		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupts = <0>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
++		};
+ 	};
+ 
+ 	leds {
+--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
++++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+@@ -74,6 +74,15 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupts = <0>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 	};
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch b/trunk/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
new file mode 100644
index 00000000..8764e9ed
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
@@ -0,0 +1,49 @@
+From 886f41537ad5e873caee522704e96e844a485961 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 5 Mar 2014 20:41:17 +0100
+Subject: [PATCH] ARM: sun7i: dt: Add AXP209 support to cubietruck
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts      | 10 ++++++++++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 ++++++++++
+ 2 files changed, 20 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -89,6 +89,16 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupt-parent = <&nmi_intc>;
++				interrupts = <0 8>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 
+ 		i2c0: i2c@01c2ac00 {
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -127,6 +127,16 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupt-parent = <&nmi_intc>;
++				interrupts = <0 8>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/215-2-dt-sun5i-add-address-and-sizecells-to-i2c.patch b/trunk/target/linux/sunxi/patches-3.14/215-2-dt-sun5i-add-address-and-sizecells-to-i2c.patch
new file mode 100644
index 00000000..9b5fd578
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/215-2-dt-sun5i-add-address-and-sizecells-to-i2c.patch
@@ -0,0 +1,40 @@
+From 505ad20db47442ae2650a41eca0a7a869aace789 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 5 Mar 2014 20:40:44 +0100
+Subject: [PATCH] ARM: sun5i: dt: Add address- and size-cells info to i2c
+ controller nodes
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-a13.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -503,6 +503,8 @@
+ 			clocks = <&apb1_gates 0>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
+@@ -512,6 +514,8 @@
+ 			clocks = <&apb1_gates 1>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c2: i2c@01c2b400 {
+@@ -521,6 +525,8 @@
+ 			clocks = <&apb1_gates 2>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		timer@01c60000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/215-3-dt-sun7i-add-address-and-sizecells-to-i2c.patch b/trunk/target/linux/sunxi/patches-3.14/215-3-dt-sun7i-add-address-and-sizecells-to-i2c.patch
new file mode 100644
index 00000000..35ae842f
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/215-3-dt-sun7i-add-address-and-sizecells-to-i2c.patch
@@ -0,0 +1,58 @@
+From 338560ad44f2e8b6f4eb095567830b6c78b35ba2 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 5 Mar 2014 20:40:57 +0100
+Subject: [PATCH] ARM: sun7i: dt: Add address- and size-cells info to i2c
+ controller nodes
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -848,6 +848,8 @@
+ 			clocks = <&apb1_gates 0>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
+@@ -857,6 +859,8 @@
+ 			clocks = <&apb1_gates 1>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c2: i2c@01c2b400 {
+@@ -866,6 +870,8 @@
+ 			clocks = <&apb1_gates 2>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c3: i2c@01c2b800 {
+@@ -875,6 +881,8 @@
+ 			clocks = <&apb1_gates 3>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c4: i2c@01c2bc00 {
+@@ -884,6 +892,8 @@
+ 			clocks = <&apb1_gates 15>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		gmac: ethernet@01c50000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/215-dt-sun4i-add-address-and-sizecells-to-i2c.patch b/trunk/target/linux/sunxi/patches-3.14/215-dt-sun4i-add-address-and-sizecells-to-i2c.patch
new file mode 100644
index 00000000..60fe06f5
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/215-dt-sun4i-add-address-and-sizecells-to-i2c.patch
@@ -0,0 +1,40 @@
+From 46d3d005e5f91d8221676cbb6307e790d4b63345 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 5 Mar 2014 20:40:26 +0100
+Subject: [PATCH] ARM: sun4i: dt: Add address- and size-cells info to i2c
+ controller nodes
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -712,6 +712,8 @@
+ 			clocks = <&apb1_gates 0>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
+@@ -721,6 +723,8 @@
+ 			clocks = <&apb1_gates 1>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 
+ 		i2c2: i2c@01c2b400 {
+@@ -730,6 +734,8 @@
+ 			clocks = <&apb1_gates 2>;
+ 			clock-frequency = <100000>;
+ 			status = "disabled";
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 		};
+ 	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/216-dt-sun7i-add-i2c-to-cubietruck.patch b/trunk/target/linux/sunxi/patches-3.14/216-dt-sun7i-add-i2c-to-cubietruck.patch
new file mode 100644
index 00000000..a8b0b615
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/216-dt-sun7i-add-i2c-to-cubietruck.patch
@@ -0,0 +1,43 @@
+From 6267355f0e513bed9a5009924abc7a1e7de22ab3 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Mon, 6 Jan 2014 13:58:12 +0800
+Subject: [PATCH] arm: sun7i: cubietruck: Enable the i2c controllers
+
+The Cubietruck makes use of the first three i2c controllers found on the
+Allwinner A20; i2c-0 is used internally for the PMIC, i2c-1 is exposed on
+the board headers, and i2c-2 is used for DDC on the VGA connector. This
+patch enables them in the device tree.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -130,6 +130,24 @@
+ 				reg = <1>;
+ 			};
+ 		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++		};
++
++		i2c1: i2c@01c2b000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c1_pins_a>;
++			status = "okay";
++		};
++
++		i2c2: i2c@01c2b400 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c2_pins_a>;
++			status = "okay";
++		};
+ 	};
+ 
+ 	leds {
diff --git a/trunk/target/linux/sunxi/patches-3.14/220-clk-sunxi-remove-calls-to-clk_put.patch b/trunk/target/linux/sunxi/patches-3.14/220-clk-sunxi-remove-calls-to-clk_put.patch
new file mode 100644
index 00000000..bac72f99
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/220-clk-sunxi-remove-calls-to-clk_put.patch
@@ -0,0 +1,36 @@
+From 81b745ee30dc7cd230f924f6263879f1b7ffbc0c Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 13 Mar 2014 16:14:13 +0100
+Subject: [PATCH] clk: sunxi: Remove calls to clk_put
+
+Callers of clk_put must disable the clock first. This also means that as long
+as the clock is enabled the driver should hold a reference to that clock.
+Hence, the call to clk_put here are bogus and should be removed.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ drivers/clk/sunxi/clk-sunxi.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -1325,17 +1325,13 @@ static void __init sunxi_clock_protect(v
+ 
+ 	/* memory bus clock - sun5i+ */
+ 	clk = clk_get(NULL, "mbus");
+-	if (!IS_ERR(clk)) {
++	if (!IS_ERR(clk))
+ 		clk_prepare_enable(clk);
+-		clk_put(clk);
+-	}
+ 
+ 	/* DDR clock - sun4i+ */
+ 	clk = clk_get(NULL, "pll5_ddr");
+-	if (!IS_ERR(clk)) {
++	if (!IS_ERR(clk))
+ 		clk_prepare_enable(clk);
+-		clk_put(clk);
+-	}
+ }
+ 
+ static void __init sunxi_init_clocks(void)
diff --git a/trunk/target/linux/sunxi/patches-3.14/230-net-rfkill-changes.patch b/trunk/target/linux/sunxi/patches-3.14/230-net-rfkill-changes.patch
new file mode 100644
index 00000000..d5e10787
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/230-net-rfkill-changes.patch
@@ -0,0 +1,148 @@
+From 5f6f6af41e39677c9b722376a4088d10732cdd44 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Fri, 17 Jan 2014 14:47:26 +0800
+Subject: [PATCH] net: rfkill: gpio: fix gpio name buffer size off by 1
+
+snprintf should be passed the complete size of the buffer, including
+the space for '\0'. The previous code resulted in the *_reset and
+*_shutdown strings being truncated.
+
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+---
+ net/rfkill/rfkill-gpio.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/net/rfkill/rfkill-gpio.c
++++ b/net/rfkill/rfkill-gpio.c
+@@ -26,6 +26,7 @@
+ #include <linux/slab.h>
+ #include <linux/acpi.h>
+ #include <linux/gpio/consumer.h>
++#include <linux/of_gpio.h>
+ 
+ #include <linux/rfkill-gpio.h>
+ 
+@@ -39,6 +40,7 @@ struct rfkill_gpio_data {
+ 	char			*reset_name;
+ 	char			*shutdown_name;
+ 	struct clk		*clk;
++	int			clk_frequency;
+ 
+ 	bool			clk_enabled;
+ };
+@@ -51,15 +53,15 @@ static int rfkill_gpio_set_power(void *d
+ 		gpiod_set_value(rfkill->shutdown_gpio, 0);
+ 		gpiod_set_value(rfkill->reset_gpio, 0);
+ 		if (!IS_ERR(rfkill->clk) && rfkill->clk_enabled)
+-			clk_disable(rfkill->clk);
++			clk_disable_unprepare(rfkill->clk);
+ 	} else {
+ 		if (!IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
+-			clk_enable(rfkill->clk);
++			clk_prepare_enable(rfkill->clk);
+ 		gpiod_set_value(rfkill->reset_gpio, 1);
+ 		gpiod_set_value(rfkill->shutdown_gpio, 1);
+ 	}
+ 
+-	rfkill->clk_enabled = blocked;
++	rfkill->clk_enabled = !blocked;
+ 
+ 	return 0;
+ }
+@@ -83,6 +85,19 @@ static int rfkill_gpio_acpi_probe(struct
+ 	return 0;
+ }
+ 
++static int rfkill_gpio_dt_probe(struct device *dev,
++				struct rfkill_gpio_data *rfkill)
++{
++	struct device_node * np = dev->of_node;
++
++	rfkill->name = np->name;
++	of_property_read_string(np, "rfkill-name", &rfkill->name);
++	of_property_read_u32(np, "rfkill-type", &rfkill->type);
++	of_property_read_u32(np, "clock-frequency", &rfkill->clk_frequency);
++
++	return 0;
++}
++
+ static int rfkill_gpio_probe(struct platform_device *pdev)
+ {
+ 	struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
+@@ -100,6 +115,10 @@ static int rfkill_gpio_probe(struct plat
+ 		ret = rfkill_gpio_acpi_probe(&pdev->dev, rfkill);
+ 		if (ret)
+ 			return ret;
++	} else if (&pdev->dev.of_node) {
++		ret = rfkill_gpio_dt_probe(&pdev->dev, rfkill);
++		if (ret)
++			return ret;
+ 	} else if (pdata) {
+ 		clk_name = pdata->power_clk_name;
+ 		rfkill->name = pdata->name;
+@@ -117,10 +136,12 @@ static int rfkill_gpio_probe(struct plat
+ 	if (!rfkill->shutdown_name)
+ 		return -ENOMEM;
+ 
+-	snprintf(rfkill->reset_name, len + 6 , "%s_reset", rfkill->name);
+-	snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", rfkill->name);
++	snprintf(rfkill->reset_name, len + 7 , "%s_reset", rfkill->name);
++	snprintf(rfkill->shutdown_name, len + 10, "%s_shutdown", rfkill->name);
+ 
+ 	rfkill->clk = devm_clk_get(&pdev->dev, clk_name);
++	if (!IS_ERR(rfkill->clk) && rfkill->clk_frequency > 0)
++		clk_set_rate(rfkill->clk, rfkill->clk_frequency);
+ 
+ 	gpio = devm_gpiod_get_index(&pdev->dev, rfkill->reset_name, 0);
+ 	if (!IS_ERR(gpio)) {
+@@ -189,6 +210,11 @@ static const struct acpi_device_id rfkil
+ 	{ },
+ };
+ 
++static const struct of_device_id rfkill_of_match[] = {
++	{ .compatible = "rfkill-gpio", },
++	{},
++};
++
+ static struct platform_driver rfkill_gpio_driver = {
+ 	.probe = rfkill_gpio_probe,
+ 	.remove = rfkill_gpio_remove,
+@@ -196,6 +222,7 @@ static struct platform_driver rfkill_gpi
+ 		.name = "rfkill_gpio",
+ 		.owner = THIS_MODULE,
+ 		.acpi_match_table = ACPI_PTR(rfkill_acpi_match),
++		.of_match_table = of_match_ptr(rfkill_of_match),
+ 	},
+ };
+ 
+--- /dev/null
++++ b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt
+@@ -0,0 +1,28 @@
++GPIO controlled RFKILL devices
++
++Required properties:
++- compatible	: Must be "rfkill-gpio".
++- rfkill-name	: Name of RFKILL device
++- rfkill-type	: Type of RFKILL device: 1 for WiFi, 2 for BlueTooth
++- NAME_shutdown-gpios	: GPIO phandle to shutdown control
++			  (phandle must be the second)
++- NAME_reset-gpios	: GPIO phandle to reset control
++
++NAME must match the rfkill-name property. NAME_shutdown-gpios or
++NAME_reset-gpios, or both, must be defined.
++
++Optional properties:
++- clocks		: phandle to clock to enable/disable
++- clock-frequency	: clock rate to set for the given clock
++
++Example:
++
++	rfkill_bt: rfkill@0 {
++		compatible = "rfkill-gpio";
++		rfkill-name = "bluetooth";
++		rfkill-type = <2>;
++		bluetooth_shutdown-gpios = <0>, <&pio 7 18 0>;
++		bluetooth_reset-gpios = <&pio 7 24 0>;
++		clocks = <&clk_out_a>;
++		clock-frequency = <32678>;
++	};
diff --git a/trunk/target/linux/sunxi/patches-3.14/231-1-brcmfmac-fix-sdio-sending.patch b/trunk/target/linux/sunxi/patches-3.14/231-1-brcmfmac-fix-sdio-sending.patch
new file mode 100644
index 00000000..7a8715ad
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/231-1-brcmfmac-fix-sdio-sending.patch
@@ -0,0 +1,32 @@
+From df25859babd9c164a61e86d953d5c88400009a14 Mon Sep 17 00:00:00 2001
+From: Hante Meuleman <meuleman@broadcom.com>
+Date: Wed, 29 Jan 2014 15:32:16 +0100
+Subject: [PATCH] brcmfmac: fix sdio sending of large buffers.
+
+the function brcmf_sdiod_ramrw is supposed to be able to send
+large blobs of data. However inside the loop the skb->len field
+did not correctly get reset each round. As a result only small
+blobs could be sent. This patch fixes this problem.
+
+Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
+Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+Signed-off-by: Arend van Spriel <arend@broadcom.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+---
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+@@ -827,7 +827,7 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev 
+ 		}
+ 		if (!write)
+ 			memcpy(data, pkt->data, dsize);
+-		skb_trim(pkt, dsize);
++		skb_trim(pkt, 0);
+ 
+ 		/* Adjust for next transfer (if any) */
+ 		size -= dsize;
diff --git a/trunk/target/linux/sunxi/patches-3.14/231-2-brcmfmac-fix-use-of-skb-ctrlbuf-in-SDIO.patch b/trunk/target/linux/sunxi/patches-3.14/231-2-brcmfmac-fix-use-of-skb-ctrlbuf-in-SDIO.patch
new file mode 100644
index 00000000..27d037c4
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/231-2-brcmfmac-fix-use-of-skb-ctrlbuf-in-SDIO.patch
@@ -0,0 +1,64 @@
+From 3eee5fd6d045dc744f98fd684258e3fdfa667fd6 Mon Sep 17 00:00:00 2001
+From: Arend van Spriel <arend@broadcom.com>
+Date: Tue, 25 Feb 2014 20:30:27 +0100
+Subject: [PATCH] brcmfmac: fix use of skb control buffer in SDIO driver part
+
+The SDIO driver has a 16-bit field defined in the skbuff control buffer.
+However, it is accessed as a u32 overwriting other control info. Another
+issue is that the field is not initialized for networking packets, but
+the control buffer content is unspecified as other networking layers can
+use it.
+
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Signed-off-by: Arend van Spriel <arend@broadcom.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+---
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+@@ -1955,7 +1955,7 @@ static int brcmf_sdio_txpkt_prep_sg(stru
+ 		memcpy(pkt_pad->data,
+ 		       pkt->data + pkt->len - tail_chop,
+ 		       tail_chop);
+-		*(u32 *)(pkt_pad->cb) = ALIGN_SKB_FLAG + tail_chop;
++		*(u16 *)(pkt_pad->cb) = ALIGN_SKB_FLAG + tail_chop;
+ 		skb_trim(pkt, pkt->len - tail_chop);
+ 		skb_trim(pkt_pad, tail_pad + tail_chop);
+ 		__skb_queue_after(pktq, pkt, pkt_pad);
+@@ -2003,7 +2003,7 @@ brcmf_sdio_txpkt_prep(struct brcmf_sdio 
+ 		 * already properly aligned and does not
+ 		 * need an sdpcm header.
+ 		 */
+-		if (*(u32 *)(pkt_next->cb) & ALIGN_SKB_FLAG)
++		if (*(u16 *)(pkt_next->cb) & ALIGN_SKB_FLAG)
+ 			continue;
+ 
+ 		/* align packet data pointer */
+@@ -2067,11 +2067,11 @@ brcmf_sdio_txpkt_postp(struct brcmf_sdio
+ 	u8 *hdr;
+ 	u32 dat_offset;
+ 	u16 tail_pad;
+-	u32 dummy_flags, chop_len;
++	u16 dummy_flags, chop_len;
+ 	struct sk_buff *pkt_next, *tmp, *pkt_prev;
+ 
+ 	skb_queue_walk_safe(pktq, pkt_next, tmp) {
+-		dummy_flags = *(u32 *)(pkt_next->cb);
++		dummy_flags = *(u16 *)(pkt_next->cb);
+ 		if (dummy_flags & ALIGN_SKB_FLAG) {
+ 			chop_len = dummy_flags & ALIGN_SKB_CHOP_LEN_MASK;
+ 			if (chop_len) {
+@@ -2554,6 +2554,8 @@ static int brcmf_sdio_bus_txdata(struct 
+ 
+ 	/* Priority based enq */
+ 	spin_lock_irqsave(&bus->txqlock, flags);
++	/* reset bus_flags in packet cb */
++	*(u16 *)(pkt->cb) = 0;
+ 	if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) {
+ 		skb_pull(pkt, bus->tx_hdrlen);
+ 		brcmf_err("out of bus->txq !!!\n");
diff --git a/trunk/target/linux/sunxi/patches-3.14/232-1-dt-sun7i-add-wifi-to-cubietruck.patch b/trunk/target/linux/sunxi/patches-3.14/232-1-dt-sun7i-add-wifi-to-cubietruck.patch
new file mode 100644
index 00000000..4b195793
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/232-1-dt-sun7i-add-wifi-to-cubietruck.patch
@@ -0,0 +1,91 @@
+From 3e7fc7d394db0783996519f2d5affde5152a628e Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Thu, 26 Dec 2013 17:14:33 +0800
+Subject: [PATCH] ARM: dts: sun7i: add WiFi module to Cubietruck DTS
+
+The CubieTruck has an AMPAK AP6210 WiFi+Bluetooth module. The WiFi
+part is a BCM43362 IC connected to MMC2 in the A20 SoC via SDIO.
+The IC also takes a 32.768 KHz low power clock input, and a power
+enable signal via GPIO.
+
+The WiFi module supports out-of-band interrupt signaling via GPIO,
+but this is not supported in this patch.
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 47 ++++++++++++++++++++++++++++++
+ 1 file changed, 47 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -28,6 +28,23 @@
+ 			status = "okay";
+ 		};
+ 
++		mmc3: mmc@01c12000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc3_pins_a>;
++			pinctrl-1 = <&wifi_host_wake_pin>;
++			vmmc-supply = <&reg_vmmc3>;
++			non-removable;
++			status = "okay";
++
++			brcmf: bcrmf@0 {
++				/* out of band interrupt not working */
++				/* compatible = "broadcom,bcm43362"; */
++				interrupt-parent = <&pio>;
++				interrupts = <10 2>; /* EINT10 */
++				status = "okay";
++			};
++		};
++
+ 		usbphy: phy@01c13400 {
+ 			usb1_vbus-supply = <&reg_usb1_vbus>;
+ 			usb2_vbus-supply = <&reg_usb2_vbus>;
+@@ -56,6 +73,18 @@
+ 		};
+ 
+ 		pinctrl@01c20800 {
++			mmc3_pins_a: mmc3@0 {
++				/* AP6210 requires pull-up */
++				allwinner,pull = <1>;
++			};
++
++			vmmc3_pin_cubietruck: vmmc3_pin@0 {
++				allwinner,pins = "PH9";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
+ 			ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {
+ 				allwinner,pins = "PH12";
+ 				allwinner,function = "gpio_out";
+@@ -99,6 +128,13 @@
+ 
+ 				/include/ "x-powers-axp209.dtsi"
+ 			};
++
++			wifi_host_wake_pin: wifi_host_wake_pin@0 {
++				allwinner,pins = "PH10";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		i2c0: i2c@01c2ac00 {
+@@ -189,4 +225,15 @@
+ 	reg_usb2_vbus: usb2-vbus {
+ 		status = "okay";
+ 	};
++
++	reg_vmmc3: vmmc3 {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		pinctrl-0 = <&vmmc3_pin_cubietruck>;
++		regulator-name = "vmmc3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		enable-active-high;
++		gpio = <&pio 7 9 0>;
++	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/232-2-dt-sun7i-add-bluetooth-to-cubietruck.patch b/trunk/target/linux/sunxi/patches-3.14/232-2-dt-sun7i-add-bluetooth-to-cubietruck.patch
new file mode 100644
index 00000000..ce1858c8
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/232-2-dt-sun7i-add-bluetooth-to-cubietruck.patch
@@ -0,0 +1,73 @@
+From 7ed66f828ad1ae46226ad7c1b56466d5ae6d67b9 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Thu, 26 Dec 2013 17:15:47 +0800
+Subject: [PATCH] ARM: dts: sun7i: add bluetooth module to CubieTruck DTS
+
+The CubieTruck has an AMPAK AP6210 WiFi+Bluetooth module. The
+Bluetooth part is a BCM20710 IC connected to UART2 in the A20
+SoC. The IC also takes a 32.768 KHz low power clock input, a power
+enable signal and a wake signal via GPIO.
+
+The Bluetooth module supports out-of-band interrupt signaling via
+GPIO, but this is not supported in this patch.
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 36 ++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -135,6 +135,20 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			bt_pwr_pin: bt_pwr_pin@0 {
++				allwinner,pins = "PH18";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			bt_wake_pin: bt_wake_pin@0 {
++				allwinner,pins = "PH24";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		i2c0: i2c@01c2ac00 {
+@@ -167,6 +181,12 @@
+ 			};
+ 		};
+ 
++		uart2: serial@01c28800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart2_pins_a>;
++			status = "okay";
++		};
++
+ 		i2c0: i2c@01c2ac00 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+@@ -236,4 +256,20 @@
+ 		enable-active-high;
+ 		gpio = <&pio 7 9 0>;
+ 	};
++
++	rfkill-switches {
++		compatible = "simple-bus";
++		pinctrl-names = "default";
++
++		rfkill_bt {
++			compatible = "rfkill-gpio";
++			pinctrl-0 = <&bt_pwr_pin>, <&clk_out_a_pins_a>;
++			rfkill-name = "bt";
++			rfkill-type = <2>;
++			bt_shutdown-gpios = <0>, <&pio 7 18 0>; /* PH18 */
++			bt_reset-gpios = <&pio 7 24 0>; /* PH24 */
++			clocks = <&clk_out_a>;
++			clock-frequency = <32768>;
++		};
++	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/250-pwm-add-driver.patch b/trunk/target/linux/sunxi/patches-3.14/250-pwm-add-driver.patch
new file mode 100644
index 00000000..d4af96fa
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/250-pwm-add-driver.patch
@@ -0,0 +1,369 @@
+--- a/drivers/pwm/Kconfig
++++ b/drivers/pwm/Kconfig
+@@ -187,6 +187,15 @@ config PWM_SPEAR
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called pwm-spear.
+ 
++config PWM_SUNXI
++	tristate "Allwinner PWM support"
++	depends on ARCH_SUNXI || COMPILE_TEST
++	help
++	  Generic PWM framework driver for Allwinner SoCs.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called pwm-sunxi.
++
+ config PWM_TEGRA
+ 	tristate "NVIDIA Tegra PWM support"
+ 	depends on ARCH_TEGRA
+--- a/drivers/pwm/Makefile
++++ b/drivers/pwm/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_PWM_PXA)		+= pwm-pxa.o
+ obj-$(CONFIG_PWM_RENESAS_TPU)	+= pwm-renesas-tpu.o
+ obj-$(CONFIG_PWM_SAMSUNG)	+= pwm-samsung.o
+ obj-$(CONFIG_PWM_SPEAR)		+= pwm-spear.o
++obj-$(CONFIG_PWM_SUNXI)		+= pwm-sunxi.o
+ obj-$(CONFIG_PWM_TEGRA)		+= pwm-tegra.o
+ obj-$(CONFIG_PWM_TIECAP)	+= pwm-tiecap.o
+ obj-$(CONFIG_PWM_TIEHRPWM)	+= pwm-tiehrpwm.o
+--- /dev/null
++++ b/drivers/pwm/pwm-sunxi.c
+@@ -0,0 +1,338 @@
++/*
++ * Driver for Allwinner Pulse Width Modulation Controller
++ *
++ * Copyright (C) 2014 Alexandre Belloni <alexandre.belloni@free-electrons.com>
++ *
++ * Licensed under GPLv2.
++ */
++
++#include <linux/bitops.h>
++#include <linux/clk.h>
++#include <linux/err.h>
++#include <linux/io.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include <linux/pwm.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++#include <linux/slab.h>
++
++#define PWM_CTRL_REG		0x0
++
++#define PWM_CH_PRD_BASE		0x4
++#define PWM_CH_PRD_OFF		0x4
++#define PWM_CH_PRD(x)		(PWM_CH_PRD_BASE + PWM_CH_PRD_OFF * (x))
++
++#define PWMCH_OFFSET		15
++#define PWM_PRESCAL_MASK	GENMASK(3, 0)
++#define PWM_PRESCAL_OFF		0
++#define PWM_EN			BIT(4)
++#define PWM_ACT_STATE		BIT(5)
++#define PWM_CLK_GATING		BIT(6)
++#define PWM_MODE		BIT(7)
++#define PWM_PULSE		BIT(8)
++#define PWM_BYPASS		BIT(9)
++
++#define PWM_RDY_BASE		28
++#define PWM_RDY_OFF		1
++#define PWM_RDY(x)		BIT(PWM_RDY_BASE + PWM_RDY_OFF * (x))
++
++#define PWM_PRD_ACT_MASK	GENMASK(7, 0)
++#define PWM_PRD(x)		((x - 1) << 16)
++#define PWM_PRD_MASK		GENMASK(7, 0)
++
++#define	BIT_CH(bit, chan)	(bit << (chan * PWMCH_OFFSET))
++
++u32 prescal_table[] = { 120, 180, 240, 360, 480, 0, 0, 0,
++			12000, 24000, 36000, 48000, 72000,
++			0, 0, 1 };
++
++struct sunxi_pwm_data {
++	bool has_rdy;
++};
++
++struct sunxi_pwm_chip {
++	struct pwm_chip chip;
++	struct clk *clk;
++	void __iomem *base;
++	struct mutex ctrl_lock;
++	const struct sunxi_pwm_data *data;
++};
++
++#define to_sunxi_pwm_chip(chip) container_of(chip, struct sunxi_pwm_chip, chip)
++
++static inline u32 sunxi_pwm_readl(struct sunxi_pwm_chip *chip,
++				  unsigned long offset)
++{
++	return readl(chip->base + offset);
++}
++
++static inline void sunxi_pwm_writel(struct sunxi_pwm_chip *chip,
++				    unsigned long offset, unsigned long val)
++{
++	writel(val, chip->base + offset);
++}
++
++static int sunxi_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
++			    int duty_ns, int period_ns)
++{
++	struct sunxi_pwm_chip *sunxi_pwm = to_sunxi_pwm_chip(chip);
++	u32 clk_rate, prd, dty;
++	u64 div;
++	u32 val, clk_gate;
++	int i, ret;
++
++	clk_rate = clk_get_rate(sunxi_pwm->clk);
++
++	/* First, test without any divider */
++	i = PWM_PRESCAL_MASK;
++	div = clk_rate * period_ns;
++	do_div(div, 1000000000);
++	if (div > PWM_PRD_MASK) {
++		/* Then go up from the first divider */
++		for (i = 0; i < PWM_PRESCAL_MASK; i++) {
++			if (!prescal_table[i])
++				continue;
++			div = clk_rate / prescal_table[i];
++			div = div * period_ns;
++			do_div(div, 1000000000);
++			if (div <= PWM_PRD_MASK)
++				break;
++		}
++	}
++
++	if (div > PWM_PRD_MASK) {
++		dev_err(chip->dev, "prescaler exceeds the maximum value\n");
++		return -EINVAL;
++	}
++
++	prd = div;
++	div *= duty_ns;
++	do_div(div, period_ns);
++	dty = div;
++
++	ret = clk_prepare_enable(sunxi_pwm->clk);
++	if (ret) {
++		dev_err(chip->dev, "failed to enable PWM clock\n");
++		return ret;
++	}
++
++	mutex_lock(&sunxi_pwm->ctrl_lock);
++	val = sunxi_pwm_readl(sunxi_pwm, PWM_CTRL_REG);
++
++	if (sunxi_pwm->data->has_rdy && (val & PWM_RDY(pwm->hwpwm))) {
++		mutex_unlock(&sunxi_pwm->ctrl_lock);
++		clk_disable_unprepare(sunxi_pwm->clk);
++		return -EBUSY;
++	}
++
++	clk_gate = val & BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++	if (clk_gate) {
++		val &= ~BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++		sunxi_pwm_writel(sunxi_pwm, PWM_CTRL_REG, val);
++	}
++
++	val = sunxi_pwm_readl(sunxi_pwm, PWM_CTRL_REG);
++	val &= ~BIT_CH(PWM_PRESCAL_MASK, pwm->hwpwm);
++	val |= i;
++	sunxi_pwm_writel(sunxi_pwm, PWM_CTRL_REG, val);
++
++	sunxi_pwm_writel(sunxi_pwm, PWM_CH_PRD(pwm->hwpwm), dty | PWM_PRD(prd));
++
++	if (clk_gate) {
++		val = sunxi_pwm_readl(sunxi_pwm, PWM_CTRL_REG);
++		val |= clk_gate;
++		sunxi_pwm_writel(sunxi_pwm, PWM_CTRL_REG, val);
++	}
++
++	mutex_unlock(&sunxi_pwm->ctrl_lock);
++	clk_disable_unprepare(sunxi_pwm->clk);
++
++	return 0;
++}
++
++static int sunxi_pwm_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm,
++				  enum pwm_polarity polarity)
++{
++	struct sunxi_pwm_chip *sunxi_pwm = to_sunxi_pwm_chip(chip);
++	u32 val;
++	int ret;
++
++	ret = clk_prepare_enable(sunxi_pwm->clk);
++	if (ret) {
++		dev_err(chip->dev, "failed to enable PWM clock\n");
++		return ret;
++	}
++
++	mutex_lock(&sunxi_pwm->ctrl_lock);
++	val = sunxi_pwm_readl(sunxi_pwm, PWM_CTRL_REG);
++
++	if (polarity != PWM_POLARITY_NORMAL)
++		val &= ~BIT_CH(PWM_ACT_STATE, pwm->hwpwm);
++	else
++		val |= BIT_CH(PWM_ACT_STATE, pwm->hwpwm);
++
++
++	sunxi_pwm_writel(sunxi_pwm, PWM_CTRL_REG, val);
++
++	mutex_unlock(&sunxi_pwm->ctrl_lock);
++	clk_disable_unprepare(sunxi_pwm->clk);
++
++	return 0;
++}
++
++static int sunxi_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
++{
++	struct sunxi_pwm_chip *sunxi_pwm = to_sunxi_pwm_chip(chip);
++	u32 val;
++	int ret;
++
++	ret = clk_prepare_enable(sunxi_pwm->clk);
++	if (ret) {
++		dev_err(chip->dev, "failed to enable PWM clock\n");
++		return ret;
++	}
++
++	mutex_lock(&sunxi_pwm->ctrl_lock);
++	val = sunxi_pwm_readl(sunxi_pwm, PWM_CTRL_REG);
++	val |= BIT_CH(PWM_EN, pwm->hwpwm);
++	val |= BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++	sunxi_pwm_writel(sunxi_pwm, PWM_CTRL_REG, val);
++	mutex_unlock(&sunxi_pwm->ctrl_lock);
++
++	return 0;
++}
++
++static void sunxi_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
++{
++	struct sunxi_pwm_chip *sunxi_pwm = to_sunxi_pwm_chip(chip);
++	u32 val;
++
++	mutex_lock(&sunxi_pwm->ctrl_lock);
++	val = sunxi_pwm_readl(sunxi_pwm, PWM_CTRL_REG);
++	val &= ~BIT_CH(PWM_EN, pwm->hwpwm);
++	val &= ~BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++	sunxi_pwm_writel(sunxi_pwm, PWM_CTRL_REG, val);
++	mutex_unlock(&sunxi_pwm->ctrl_lock);
++
++	clk_disable_unprepare(sunxi_pwm->clk);
++}
++
++static const struct pwm_ops sunxi_pwm_ops = {
++	.config = sunxi_pwm_config,
++	.set_polarity = sunxi_pwm_set_polarity,
++	.enable = sunxi_pwm_enable,
++	.disable = sunxi_pwm_disable,
++	.owner = THIS_MODULE,
++};
++
++static const struct sunxi_pwm_data sunxi_pwm_data_a10 = {
++	.has_rdy = false,
++};
++
++static const struct sunxi_pwm_data sunxi_pwm_data_a20 = {
++	.has_rdy = true,
++};
++
++static const struct of_device_id sunxi_pwm_dt_ids[] = {
++	{
++		.compatible = "allwinner,sun4i-a10-pwm",
++		.data = &sunxi_pwm_data_a10,
++	}, {
++		.compatible = "allwinner,sun7i-a20-pwm",
++		.data = &sunxi_pwm_data_a20,
++	}, {
++		/* sentinel */
++	},
++};
++MODULE_DEVICE_TABLE(of, sunxi_pwm_dt_ids);
++
++static int sunxi_pwm_probe(struct platform_device *pdev)
++{
++	struct sunxi_pwm_chip *sunxi_pwm;
++	struct resource *res;
++	int ret;
++
++	const struct of_device_id *match;
++
++	match = of_match_device(sunxi_pwm_dt_ids, &pdev->dev);
++	if (!match || !match->data)
++		return -ENODEV;
++
++	sunxi_pwm = devm_kzalloc(&pdev->dev, sizeof(*sunxi_pwm), GFP_KERNEL);
++	if (!sunxi_pwm)
++		return -ENOMEM;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	sunxi_pwm->base = devm_ioremap_resource(&pdev->dev, res);
++	if (IS_ERR(sunxi_pwm->base))
++		return PTR_ERR(sunxi_pwm->base);
++
++	sunxi_pwm->clk = devm_clk_get(&pdev->dev, NULL);
++	if (IS_ERR(sunxi_pwm->clk))
++		return PTR_ERR(sunxi_pwm->clk);
++
++	sunxi_pwm->chip.dev = &pdev->dev;
++	sunxi_pwm->chip.ops = &sunxi_pwm_ops;
++
++	sunxi_pwm->chip.base = -1;
++	sunxi_pwm->chip.npwm = 2;
++	sunxi_pwm->chip.can_sleep = true;
++	sunxi_pwm->chip.of_xlate = of_pwm_xlate_with_flags;
++	sunxi_pwm->chip.of_pwm_n_cells = 3;
++	sunxi_pwm->data = match->data;
++
++	mutex_init(&sunxi_pwm->ctrl_lock);
++
++	ret = clk_prepare_enable(sunxi_pwm->clk);
++	if (ret) {
++		dev_err(&pdev->dev, "failed to enable PWM clock\n");
++		goto error;
++	}
++
++	/* By default, the polarity is inversed, set it to normal */
++	sunxi_pwm_writel(sunxi_pwm, PWM_CTRL_REG,
++			 BIT_CH(PWM_ACT_STATE, 0) |
++			 BIT_CH(PWM_ACT_STATE, 1));
++	clk_disable_unprepare(sunxi_pwm->clk);
++
++	ret = pwmchip_add(&sunxi_pwm->chip);
++	if (ret < 0) {
++		dev_err(&pdev->dev, "failed to add PWM chip %d\n", ret);
++		goto error;
++	}
++
++	platform_set_drvdata(pdev, sunxi_pwm);
++
++	return ret;
++
++error:
++	mutex_destroy(&sunxi_pwm->ctrl_lock);
++	clk_disable_unprepare(sunxi_pwm->clk);
++	return ret;
++}
++
++static int sunxi_pwm_remove(struct platform_device *pdev)
++{
++	struct sunxi_pwm_chip *sunxi_pwm = platform_get_drvdata(pdev);
++
++	mutex_destroy(&sunxi_pwm->ctrl_lock);
++
++	return pwmchip_remove(&sunxi_pwm->chip);
++}
++
++static struct platform_driver sunxi_pwm_driver = {
++	.driver = {
++		.name = "sunxi-pwm",
++		.of_match_table = sunxi_pwm_dt_ids,
++	},
++	.probe = sunxi_pwm_probe,
++	.remove = sunxi_pwm_remove,
++};
++module_platform_driver(sunxi_pwm_driver);
++
++MODULE_ALIAS("platform:sunxi-pwm");
++MODULE_AUTHOR("Alexandre Belloni <alexandre.belloni@free-electrons.com>");
++MODULE_DESCRIPTION("Allwinner PWM driver");
++MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/sunxi/patches-3.14/251-1-dt-sun4i-add-pinmux-for-pwm.patch b/trunk/target/linux/sunxi/patches-3.14/251-1-dt-sun4i-add-pinmux-for-pwm.patch
new file mode 100644
index 00000000..5eb30b1a
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/251-1-dt-sun4i-add-pinmux-for-pwm.patch
@@ -0,0 +1,36 @@
+From 1d8e9db920352680e9091ec5d2873e90a4a53214 Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Date: Mon, 28 Apr 2014 18:17:10 +0200
+Subject: [PATCH] ARM: sun4i: dt: add pinmux configuration for the PWM
+
+Add the pinctrl descriptions for both PWM channels of the Allwinner A10.
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -521,6 +521,20 @@
+ 			#size-cells = <0>;
+ 			#gpio-cells = <3>;
+ 
++			pwm0_pins_a: pwm0@0 {
++				allwinner,pins = "PB2";
++				allwinner,function = "pwm";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			pwm1_pins_a: pwm1@0 {
++				allwinner,pins = "PI3";
++				allwinner,function = "pwm";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
+ 			uart0_pins_a: uart0@0 {
+ 				allwinner,pins = "PB22", "PB23";
+ 				allwinner,function = "uart0";
diff --git a/trunk/target/linux/sunxi/patches-3.14/251-2-dt-sun7i-add-pinmux-for-pwm.patch b/trunk/target/linux/sunxi/patches-3.14/251-2-dt-sun7i-add-pinmux-for-pwm.patch
new file mode 100644
index 00000000..12062376
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/251-2-dt-sun7i-add-pinmux-for-pwm.patch
@@ -0,0 +1,36 @@
+From cf34231072d53e643d6ef1baa95a8e9df644542e Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Date: Mon, 28 Apr 2014 18:17:12 +0200
+Subject: [PATCH] ARM: sun7i: dt: add pinmux configuration for the PWM
+
+Add the pinctrl descriptions for both PWM channels of the Allwinner A20.
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -584,6 +584,20 @@
+ 			#size-cells = <0>;
+ 			#gpio-cells = <3>;
+ 
++			pwm0_pins_a: pwm0@0 {
++				allwinner,pins = "PB2";
++				allwinner,function = "pwm";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			pwm1_pins_a: pwm1@0 {
++				allwinner,pins = "PI3";
++				allwinner,function = "pwm";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
+ 			uart0_pins_a: uart0@0 {
+ 				allwinner,pins = "PB22", "PB23";
+ 				allwinner,function = "uart0";
diff --git a/trunk/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch b/trunk/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
new file mode 100644
index 00000000..4b16ab20
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/252-1-dt-sun4i-add-pwm-support.patch
@@ -0,0 +1,30 @@
+From 25a4e0f1ac49c9ecafeba0d034806e25c491f012 Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Date: Mon, 28 Apr 2014 18:17:11 +0200
+Subject: [PATCH] ARM: sun4i: dt: add PWM support
+
+Add the PWM bindings for the Allwinner A10.
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -628,6 +628,14 @@
+ 			status = "disabled";
+ 		};
+ 
++		pwm: pwm@01c20e00 {
++			compatible = "allwinner,sun4i-a10-pwm";
++			reg = <0x01c20e00 0xc>;
++			clocks = <&osc24M>;
++			#pwm-cells = <3>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun4i-sid";
+ 			reg = <0x01c23800 0x10>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch b/trunk/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch
new file mode 100644
index 00000000..dc9636b9
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/252-2-dt-sun7i-add-pwm-support.patch
@@ -0,0 +1,30 @@
+From 216a4cc15c24d46a5b50b3f9a224576a69c1a83e Mon Sep 17 00:00:00 2001
+From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Date: Mon, 28 Apr 2014 18:17:13 +0200
+Subject: [PATCH] ARM: sun7i: dt: add PWM support
+
+Add the PWM bindings for the Allwinner A20.
+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -764,6 +764,14 @@
+ 			status = "disabled";
+ 		};
+ 
++		pwm: pwm@01c20e00 {
++			compatible = "allwinner,sun7i-a20-pwm";
++			reg = <0x01c20e00 0xc>;
++			clocks = <&osc24M>;
++			#pwm-cells = <3>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun7i-a20-sid";
+ 			reg = <0x01c23800 0x200>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/260-dt-sun7i-enable-arm-pmu.patch b/trunk/target/linux/sunxi/patches-3.14/260-dt-sun7i-enable-arm-pmu.patch
new file mode 100644
index 00000000..4f703e78
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/260-dt-sun7i-enable-arm-pmu.patch
@@ -0,0 +1,28 @@
+From 531f223d1426a826c7da4908e1a5e8eb3d40d6ed Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 17 Apr 2014 21:54:41 +0200
+Subject: [PATCH] ARM: sun7i: Add ARM PMU in A20 DTSI
+
+Enable the performance monitoring unit found in the A20 SoCs.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -57,6 +57,12 @@
+ 			     <1 10 0xf08>;
+ 	};
+ 
++	pmu {
++		compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu";
++		interrupts = <0 120 4>,
++			     <0 121 4>;
++	};
++
+ 	clocks {
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/270-dt-sun7i-add-ss-to-a20.patch b/trunk/target/linux/sunxi/patches-3.14/270-dt-sun7i-add-ss-to-a20.patch
new file mode 100644
index 00000000..11a6ed03
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/270-dt-sun7i-add-ss-to-a20.patch
@@ -0,0 +1,17 @@
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -529,6 +529,14 @@
+ 			status = "disabled";
+ 		};
+ 
++		crypto: crypto-engine@01c15000 {
++			compatible = "allwinner,sun7i-a20-crypto";
++			reg = <0x01c15000 0x1000>;
++			interrupts = <0 86 4>;
++			clocks = <&ahb_gates 5>, <&ss_clk>;
++			clock-names = "ahb", "mod";
++		};
++
+ 		spi2: spi@01c17000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c17000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/271-crypto-add-ss.patch b/trunk/target/linux/sunxi/patches-3.14/271-crypto-add-ss.patch
new file mode 100644
index 00000000..a5e2d067
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/271-crypto-add-ss.patch
@@ -0,0 +1,1241 @@
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -419,4 +419,21 @@ config CRYPTO_DEV_MXS_DCP
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called mxs-dcp.
+ 
++config CRYPTO_DEV_SUNXI_SS
++	tristate "Support for Allwinner Security System cryptographic accelerator"
++	depends on ARCH_SUNXI
++	select CRYPTO_MD5
++	select CRYPTO_SHA1
++	select CRYPTO_AES
++	select CRYPTO_DES
++	select CRYPTO_BLKCIPHER
++	help
++	  Some Allwinner SoC have a crypto accelerator named
++	  Security System. Select this if you want to use it.
++	  The Security System handle AES/DES/3DES ciphers in CBC mode
++	  and SHA1 and MD5 hash algorithms.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called sunxi-ss.
++
+ endif # CRYPTO_HW
+--- a/drivers/crypto/Makefile
++++ b/drivers/crypto/Makefile
+@@ -23,3 +23,4 @@ obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahar
+ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
+ obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
+ obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
++obj-$(CONFIG_CRYPTO_DEV_SUNXI_SS) += sunxi-ss/
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/Makefile
+@@ -0,0 +1,2 @@
++obj-$(CONFIG_CRYPTO_DEV_SUNXI_SS) += sunxi-ss.o
++sunxi-ss-y += sunxi-ss-core.o sunxi-ss-hash.o sunxi-ss-cipher.o
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss-cipher.c
+@@ -0,0 +1,461 @@
++/*
++ * sunxi-ss-cipher.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * This file add support for AES cipher with 128,192,256 bits
++ * keysize in CBC mode.
++ *
++ * You could find the datasheet at
++ * http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++#include "sunxi-ss.h"
++
++extern struct sunxi_ss_ctx *ss;
++
++static int sunxi_ss_cipher(struct ablkcipher_request *areq, u32 mode)
++{
++	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(areq);
++	struct sunxi_req_ctx *op = crypto_ablkcipher_ctx(tfm);
++	const char *cipher_type;
++
++	cipher_type = crypto_tfm_alg_name(crypto_ablkcipher_tfm(tfm));
++
++	if (areq->nbytes == 0) {
++		mutex_unlock(&ss->lock);
++		return 0;
++	}
++
++	if (areq->info == NULL) {
++		dev_err(ss->dev, "ERROR: Empty IV\n");
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++
++	if (areq->src == NULL || areq->dst == NULL) {
++		dev_err(ss->dev, "ERROR: Some SGs are NULL\n");
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++
++	if (strcmp("cbc(aes)", cipher_type) == 0) {
++		op->mode |= SS_OP_AES | SS_CBC | SS_ENABLED | mode;
++		return sunxi_ss_aes_poll(areq);
++	}
++	if (strcmp("cbc(des)", cipher_type) == 0) {
++		op->mode = SS_OP_DES | SS_CBC | SS_ENABLED | mode;
++		return sunxi_ss_des_poll(areq);
++	}
++	if (strcmp("cbc(des3_ede)", cipher_type) == 0) {
++		op->mode = SS_OP_3DES | SS_CBC | SS_ENABLED | mode;
++		return sunxi_ss_des_poll(areq);
++	}
++	dev_err(ss->dev, "ERROR: Cipher %s not handled\n", cipher_type);
++	mutex_unlock(&ss->lock);
++	return -EINVAL;
++}
++
++int sunxi_ss_cipher_encrypt(struct ablkcipher_request *areq)
++{
++	return sunxi_ss_cipher(areq, SS_ENCRYPTION);
++}
++
++int sunxi_ss_cipher_decrypt(struct ablkcipher_request *areq)
++{
++	return sunxi_ss_cipher(areq, SS_DECRYPTION);
++}
++
++int sunxi_ss_cipher_init(struct crypto_tfm *tfm)
++{
++	struct sunxi_req_ctx *op = crypto_tfm_ctx(tfm);
++
++	mutex_lock(&ss->lock);
++
++	memset(op, 0, sizeof(struct sunxi_req_ctx));
++	return 0;
++}
++
++int sunxi_ss_aes_poll(struct ablkcipher_request *areq)
++{
++	u32 spaces;
++	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(areq);
++	struct sunxi_req_ctx *op = crypto_ablkcipher_ctx(tfm);
++	unsigned int ivsize = crypto_ablkcipher_ivsize(tfm);
++	/* when activating SS, the default FIFO space is 32 */
++	u32 rx_cnt = 32;
++	u32 tx_cnt = 0;
++	u32 v;
++	int i;
++	struct scatterlist *in_sg;
++	struct scatterlist *out_sg;
++	void *src_addr;
++	void *dst_addr;
++	unsigned int ileft = areq->nbytes;
++	unsigned int oleft = areq->nbytes;
++	unsigned int sgileft = areq->src->length;
++	unsigned int sgoleft = areq->dst->length;
++	unsigned int todo;
++	u32 *src32;
++	u32 *dst32;
++
++	in_sg = areq->src;
++	out_sg = areq->dst;
++	for (i = 0; i < op->keylen; i += 4)
++		writel(*(op->key + i/4), ss->base + SS_KEY0 + i);
++	if (areq->info != NULL) {
++		for (i = 0; i < 4 && i < ivsize / 4; i++) {
++			v = *(u32 *)(areq->info + i * 4);
++			writel(v, ss->base + SS_IV0 + i * 4);
++		}
++	}
++	writel(op->mode, ss->base + SS_CTL);
++
++	/* If we have only one SG, we can use kmap_atomic */
++	if (sg_next(in_sg) == NULL && sg_next(out_sg) == NULL) {
++		src_addr = kmap_atomic(sg_page(in_sg)) + in_sg->offset;
++		if (src_addr == NULL) {
++			dev_err(ss->dev, "kmap_atomic error for src SG\n");
++			writel(0, ss->base + SS_CTL);
++			mutex_unlock(&ss->lock);
++			return -EINVAL;
++		}
++		dst_addr = kmap_atomic(sg_page(out_sg)) + out_sg->offset;
++		if (dst_addr == NULL) {
++			dev_err(ss->dev, "kmap_atomic error for dst SG\n");
++			writel(0, ss->base + SS_CTL);
++			kunmap_atomic(src_addr);
++			mutex_unlock(&ss->lock);
++			return -EINVAL;
++		}
++		src32 = (u32 *)src_addr;
++		dst32 = (u32 *)dst_addr;
++		ileft = areq->nbytes / 4;
++		oleft = areq->nbytes / 4;
++		i = 0;
++		do {
++			if (ileft > 0 && rx_cnt > 0) {
++				todo = min(rx_cnt, ileft);
++				ileft -= todo;
++				do {
++					writel_relaxed(*src32++,
++						       ss->base +
++						       SS_RXFIFO);
++					todo--;
++				} while (todo > 0);
++			}
++			if (tx_cnt > 0) {
++				todo = min(tx_cnt, oleft);
++				oleft -= todo;
++				do {
++					*dst32++ = readl_relaxed(ss->base +
++								SS_TXFIFO);
++					todo--;
++				} while (todo > 0);
++			}
++			spaces = readl_relaxed(ss->base + SS_FCSR);
++			rx_cnt = SS_RXFIFO_SPACES(spaces);
++			tx_cnt = SS_TXFIFO_SPACES(spaces);
++		} while (oleft > 0);
++		writel(0, ss->base + SS_CTL);
++		kunmap_atomic(src_addr);
++		kunmap_atomic(dst_addr);
++		mutex_unlock(&ss->lock);
++		return 0;
++	}
++
++	/* If we have more than one SG, we cannot use kmap_atomic since
++	 * we hold the mapping too long
++	 */
++	src_addr = kmap(sg_page(in_sg)) + in_sg->offset;
++	if (src_addr == NULL) {
++		dev_err(ss->dev, "KMAP error for src SG\n");
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++	dst_addr = kmap(sg_page(out_sg)) + out_sg->offset;
++	if (dst_addr == NULL) {
++		kunmap(sg_page(in_sg));
++		dev_err(ss->dev, "KMAP error for dst SG\n");
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++	src32 = (u32 *)src_addr;
++	dst32 = (u32 *)dst_addr;
++	ileft = areq->nbytes / 4;
++	oleft = areq->nbytes / 4;
++	sgileft = in_sg->length / 4;
++	sgoleft = out_sg->length / 4;
++	do {
++		spaces = readl_relaxed(ss->base + SS_FCSR);
++		rx_cnt = SS_RXFIFO_SPACES(spaces);
++		tx_cnt = SS_TXFIFO_SPACES(spaces);
++		todo = min3(rx_cnt, ileft, sgileft);
++		if (todo > 0) {
++			ileft -= todo;
++			sgileft -= todo;
++		}
++		while (todo > 0) {
++			writel_relaxed(*src32++, ss->base + SS_RXFIFO);
++			todo--;
++		}
++		if (in_sg != NULL && sgileft == 0 && ileft > 0) {
++			kunmap(sg_page(in_sg));
++			in_sg = sg_next(in_sg);
++			while (in_sg != NULL && in_sg->length == 0)
++				in_sg = sg_next(in_sg);
++			if (in_sg != NULL && ileft > 0) {
++				src_addr = kmap(sg_page(in_sg)) + in_sg->offset;
++				if (src_addr == NULL) {
++					dev_err(ss->dev, "ERROR: KMAP for src SG\n");
++					mutex_unlock(&ss->lock);
++					return -EINVAL;
++				}
++				src32 = src_addr;
++				sgileft = in_sg->length / 4;
++			}
++		}
++		/* do not test oleft since when oleft == 0 we have finished */
++		todo = min3(tx_cnt, oleft, sgoleft);
++		if (todo > 0) {
++			oleft -= todo;
++			sgoleft -= todo;
++		}
++		while (todo > 0) {
++			*dst32++ = readl_relaxed(ss->base + SS_TXFIFO);
++			todo--;
++		}
++		if (out_sg != NULL && sgoleft == 0 && oleft >= 0) {
++			kunmap(sg_page(out_sg));
++			out_sg = sg_next(out_sg);
++			while (out_sg != NULL && out_sg->length == 0)
++				out_sg = sg_next(out_sg);
++			if (out_sg != NULL && oleft > 0) {
++				dst_addr = kmap(sg_page(out_sg)) +
++					out_sg->offset;
++				if (dst_addr == NULL) {
++					dev_err(ss->dev, "KMAP error\n");
++					mutex_unlock(&ss->lock);
++					return -EINVAL;
++				}
++				dst32 = dst_addr;
++				sgoleft = out_sg->length / 4;
++			}
++		}
++	} while (oleft > 0);
++
++	writel(0, ss->base + SS_CTL);
++	mutex_unlock(&ss->lock);
++	return 0;
++}
++
++/* Pure CPU way of doing DES/3DES with SS
++ * Since DES and 3DES SGs could be smaller than 4 bytes, I use sg_copy_to_buffer
++ * for "linearize" them.
++ * The problem with that is that I alloc (2 x areq->nbytes) for buf_in/buf_out
++ * TODO: change this system
++ * SGsrc -> buf_in -> SS -> buf_out -> SGdst */
++int sunxi_ss_des_poll(struct ablkcipher_request *areq)
++{
++	u32 value, spaces;
++	size_t nb_in_sg_tx, nb_in_sg_rx;
++	size_t ir, it;
++	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(areq);
++	struct sunxi_req_ctx *op = crypto_ablkcipher_ctx(tfm);
++	unsigned int ivsize = crypto_ablkcipher_ivsize(tfm);
++	u32 tx_cnt = 0;
++	u32 rx_cnt = 0;
++	u32 v;
++	int i;
++	int no_chunk = 1;
++
++	/* if we have only SGs with size multiple of 4,
++	 * we can use the SS AES function */
++	struct scatterlist *in_sg;
++	struct scatterlist *out_sg;
++
++	in_sg = areq->src;
++	out_sg = areq->dst;
++
++	while (in_sg != NULL && no_chunk == 1) {
++		if ((in_sg->length % 4) != 0)
++			no_chunk = 0;
++		in_sg = sg_next(in_sg);
++	}
++	while (out_sg != NULL && no_chunk == 1) {
++		if ((out_sg->length % 4) != 0)
++			no_chunk = 0;
++		out_sg = sg_next(out_sg);
++	}
++
++	if (no_chunk == 1)
++		return sunxi_ss_aes_poll(areq);
++	in_sg = areq->src;
++	out_sg = areq->dst;
++
++	nb_in_sg_rx = sg_nents(in_sg);
++	nb_in_sg_tx = sg_nents(out_sg);
++
++	mutex_lock(&ss->bufin_lock);
++	if (ss->buf_in == NULL) {
++		ss->buf_in = kmalloc(areq->nbytes, GFP_KERNEL);
++		ss->buf_in_size = areq->nbytes;
++	} else {
++		if (areq->nbytes > ss->buf_in_size) {
++			kfree(ss->buf_in);
++			ss->buf_in = kmalloc(areq->nbytes, GFP_KERNEL);
++			ss->buf_in_size = areq->nbytes;
++		}
++	}
++	if (ss->buf_in == NULL) {
++		ss->buf_in_size = 0;
++		mutex_unlock(&ss->bufin_lock);
++		dev_err(ss->dev, "Unable to allocate pages.\n");
++		return -ENOMEM;
++	}
++	if (ss->buf_out == NULL) {
++		mutex_lock(&ss->bufout_lock);
++		ss->buf_out = kmalloc(areq->nbytes, GFP_KERNEL);
++		if (ss->buf_out == NULL) {
++			ss->buf_out_size = 0;
++			mutex_unlock(&ss->bufout_lock);
++			dev_err(ss->dev, "Unable to allocate pages.\n");
++			return -ENOMEM;
++		}
++		ss->buf_out_size = areq->nbytes;
++		mutex_unlock(&ss->bufout_lock);
++	} else {
++		if (areq->nbytes > ss->buf_out_size) {
++			mutex_lock(&ss->bufout_lock);
++			kfree(ss->buf_out);
++			ss->buf_out = kmalloc(areq->nbytes, GFP_KERNEL);
++			if (ss->buf_out == NULL) {
++				ss->buf_out_size = 0;
++				mutex_unlock(&ss->bufout_lock);
++				dev_err(ss->dev, "Unable to allocate pages.\n");
++				return -ENOMEM;
++			}
++			ss->buf_out_size = areq->nbytes;
++			mutex_unlock(&ss->bufout_lock);
++		}
++	}
++
++	sg_copy_to_buffer(areq->src, nb_in_sg_rx, ss->buf_in, areq->nbytes);
++
++	ir = 0;
++	it = 0;
++
++	for (i = 0; i < op->keylen; i += 4)
++		writel(*(op->key + i/4), ss->base + SS_KEY0 + i);
++	if (areq->info != NULL) {
++		for (i = 0; i < 4 && i < ivsize / 4; i++) {
++			v = *(u32 *)(areq->info + i * 4);
++			writel(v, ss->base + SS_IV0 + i * 4);
++		}
++	}
++	writel(op->mode, ss->base + SS_CTL);
++
++	do {
++		if (rx_cnt == 0 || tx_cnt == 0) {
++			spaces = readl(ss->base + SS_FCSR);
++			rx_cnt = SS_RXFIFO_SPACES(spaces);
++			tx_cnt = SS_TXFIFO_SPACES(spaces);
++		}
++		if (rx_cnt > 0 && ir < areq->nbytes) {
++			do {
++				value = *(u32 *)(ss->buf_in + ir);
++				writel(value, ss->base + SS_RXFIFO);
++				ir += 4;
++				rx_cnt--;
++			} while (rx_cnt > 0 && ir < areq->nbytes);
++		}
++		if (tx_cnt > 0 && it < areq->nbytes) {
++			do {
++				value = readl(ss->base + SS_TXFIFO);
++				*(u32 *)(ss->buf_out + it) = value;
++				it += 4;
++				tx_cnt--;
++			} while (tx_cnt > 0 && it < areq->nbytes);
++		}
++		if (ir == areq->nbytes) {
++			mutex_unlock(&ss->bufin_lock);
++			ir++;
++		}
++	} while (it < areq->nbytes);
++
++	writel(0, ss->base + SS_CTL);
++	mutex_unlock(&ss->lock);
++
++	/* a simple optimization, since we dont need the hardware for this copy
++	 * we release the lock and do the copy. With that we gain 5/10% perf */
++	mutex_lock(&ss->bufout_lock);
++	sg_copy_from_buffer(areq->dst, nb_in_sg_tx, ss->buf_out, areq->nbytes);
++
++	mutex_unlock(&ss->bufout_lock);
++	return 0;
++}
++
++/* check and set the AES key, prepare the mode to be used */
++int sunxi_ss_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen)
++{
++	struct sunxi_req_ctx *op = crypto_ablkcipher_ctx(tfm);
++
++	switch (keylen) {
++	case 128 / 8:
++		op->mode = SS_AES_128BITS;
++		break;
++	case 192 / 8:
++		op->mode = SS_AES_192BITS;
++		break;
++	case 256 / 8:
++		op->mode = SS_AES_256BITS;
++		break;
++	default:
++		dev_err(ss->dev, "ERROR: Invalid keylen %u\n", keylen);
++		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++	op->keylen = keylen;
++	memcpy(op->key, key, keylen);
++	return 0;
++}
++
++/* check and set the DES key, prepare the mode to be used */
++int sunxi_ss_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen)
++{
++	struct sunxi_req_ctx *op = crypto_ablkcipher_ctx(tfm);
++
++	if (keylen != DES_KEY_SIZE) {
++		dev_err(ss->dev, "Invalid keylen %u\n", keylen);
++		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++	op->keylen = keylen;
++	memcpy(op->key, key, keylen);
++	return 0;
++}
++
++/* check and set the 3DES key, prepare the mode to be used */
++int sunxi_ss_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen)
++{
++	struct sunxi_req_ctx *op = crypto_ablkcipher_ctx(tfm);
++
++	if (keylen != 3 * DES_KEY_SIZE) {
++		dev_err(ss->dev, "Invalid keylen %u\n", keylen);
++		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++	op->keylen = keylen;
++	memcpy(op->key, key, keylen);
++	return 0;
++}
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss-core.c
+@@ -0,0 +1,308 @@
++/*
++ * sunxi-ss.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * Core file which registers crypto algorithms supported by the SS.
++ *
++ * You could find the datasheet at
++ * http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
++ *
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++#include <linux/clk.h>
++#include <linux/crypto.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <crypto/scatterwalk.h>
++#include <linux/scatterlist.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++
++#include "sunxi-ss.h"
++
++struct sunxi_ss_ctx *ss;
++
++/* General notes:
++ * I cannot use a key/IV cache because each time one of these change ALL stuff
++ * need to be re-writed (rewrite SS_KEYX ans SS_IVX).
++ * And for example, with dm-crypt IV changes on each request.
++ *
++ * After each request the device must be disabled with a write of 0 in SS_CTL
++ *
++ * For performance reason, we use writel_relaxed/read_relaxed for all
++ * operations on RX and TX FIFO and also SS_FCSR.
++ * For all other registers, we use writel/readl.
++ * See http://permalink.gmane.org/gmane.linux.ports.arm.kernel/117644
++ * and http://permalink.gmane.org/gmane.linux.ports.arm.kernel/117640
++ * */
++
++static struct ahash_alg sunxi_md5_alg = {
++	.init = sunxi_hash_init,
++	.update = sunxi_hash_update,
++	.final = sunxi_hash_final,
++	.finup = sunxi_hash_finup,
++	.digest = sunxi_hash_digest,
++	.halg = {
++		.digestsize = MD5_DIGEST_SIZE,
++		.base = {
++			.cra_name = "md5",
++			.cra_driver_name = "md5-sunxi-ss",
++			.cra_priority = 300,
++			.cra_alignmask = 3,
++			.cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC,
++			.cra_blocksize = MD5_HMAC_BLOCK_SIZE,
++			.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++			.cra_module = THIS_MODULE,
++			.cra_type = &crypto_ahash_type
++		}
++	}
++};
++static struct ahash_alg sunxi_sha1_alg = {
++	.init = sunxi_hash_init,
++	.update = sunxi_hash_update,
++	.final = sunxi_hash_final,
++	.finup = sunxi_hash_finup,
++	.digest = sunxi_hash_digest,
++	.halg = {
++		.digestsize = SHA1_DIGEST_SIZE,
++		.base = {
++			.cra_name = "sha1",
++			.cra_driver_name = "sha1-sunxi-ss",
++			.cra_priority = 300,
++			.cra_alignmask = 3,
++			.cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC,
++			.cra_blocksize = SHA1_BLOCK_SIZE,
++			.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++			.cra_module = THIS_MODULE,
++			.cra_type = &crypto_ahash_type
++		}
++	}
++};
++
++static struct crypto_alg sunxi_cipher_algs[] = {
++{
++	.cra_name = "cbc(aes)",
++	.cra_driver_name = "cbc-aes-sunxi-ss",
++	.cra_priority = 300,
++	.cra_blocksize = AES_BLOCK_SIZE,
++	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
++	.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++	.cra_module = THIS_MODULE,
++	.cra_alignmask = 3,
++	.cra_type = &crypto_ablkcipher_type,
++	.cra_init = sunxi_ss_cipher_init,
++	.cra_u = {
++		.ablkcipher = {
++			.min_keysize    = AES_MIN_KEY_SIZE,
++			.max_keysize    = AES_MAX_KEY_SIZE,
++			.ivsize         = AES_BLOCK_SIZE,
++			.setkey         = sunxi_ss_aes_setkey,
++			.encrypt        = sunxi_ss_cipher_encrypt,
++			.decrypt        = sunxi_ss_cipher_decrypt,
++		}
++	}
++}, {
++	.cra_name = "cbc(des)",
++	.cra_driver_name = "cbc-des-sunxi-ss",
++	.cra_priority = 300,
++	.cra_blocksize = DES_BLOCK_SIZE,
++	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
++	.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++	.cra_module = THIS_MODULE,
++	.cra_alignmask = 3,
++	.cra_type = &crypto_ablkcipher_type,
++	.cra_init = sunxi_ss_cipher_init,
++	.cra_u.ablkcipher = {
++		.min_keysize    = DES_KEY_SIZE,
++		.max_keysize    = DES_KEY_SIZE,
++		.ivsize         = DES_BLOCK_SIZE,
++		.setkey         = sunxi_ss_des_setkey,
++		.encrypt        = sunxi_ss_cipher_encrypt,
++		.decrypt        = sunxi_ss_cipher_decrypt,
++	}
++}, {
++	.cra_name = "cbc(des3_ede)",
++	.cra_driver_name = "cbc-des3-sunxi-ss",
++	.cra_priority = 300,
++	.cra_blocksize = DES3_EDE_BLOCK_SIZE,
++	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
++	.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++	.cra_module = THIS_MODULE,
++	.cra_alignmask = 3,
++	.cra_type = &crypto_ablkcipher_type,
++	.cra_init = sunxi_ss_cipher_init,
++	.cra_u.ablkcipher = {
++		.min_keysize    = DES3_EDE_KEY_SIZE,
++		.max_keysize    = DES3_EDE_KEY_SIZE,
++		.ivsize         = DES3_EDE_BLOCK_SIZE,
++		.setkey         = sunxi_ss_des3_setkey,
++		.encrypt        = sunxi_ss_cipher_encrypt,
++		.decrypt        = sunxi_ss_cipher_decrypt,
++	}
++}
++};
++
++static int sunxi_ss_probe(struct platform_device *pdev)
++{
++	struct resource *res;
++	u32 v;
++	int err;
++	unsigned long cr;
++	const unsigned long cr_ahb = 24 * 1000 * 1000;
++	const unsigned long cr_mod = 150 * 1000 * 1000;
++
++	if (!pdev->dev.of_node)
++		return -ENODEV;
++
++	ss = devm_kzalloc(&pdev->dev, sizeof(*ss), GFP_KERNEL);
++	if (ss == NULL)
++		return -ENOMEM;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	ss->base = devm_ioremap_resource(&pdev->dev, res);
++	if (IS_ERR(ss->base)) {
++		dev_err(&pdev->dev, "Cannot request MMIO\n");
++		return PTR_ERR(ss->base);
++	}
++
++	ss->ssclk = devm_clk_get(&pdev->dev, "mod");
++	if (IS_ERR(ss->ssclk)) {
++		err = PTR_ERR(ss->ssclk);
++		dev_err(&pdev->dev, "Cannot get SS clock err=%d\n", err);
++		return err;
++	}
++	dev_dbg(&pdev->dev, "clock ss acquired\n");
++
++	ss->busclk = devm_clk_get(&pdev->dev, "ahb");
++	if (IS_ERR(ss->busclk)) {
++		err = PTR_ERR(ss->busclk);
++		dev_err(&pdev->dev, "Cannot get AHB SS clock err=%d\n", err);
++		return err;
++	}
++	dev_dbg(&pdev->dev, "clock ahb_ss acquired\n");
++
++	/* Enable the clocks */
++	err = clk_prepare_enable(ss->busclk);
++	if (err != 0) {
++		dev_err(&pdev->dev, "Cannot prepare_enable busclk\n");
++		return err;
++	}
++	err = clk_prepare_enable(ss->ssclk);
++	if (err != 0) {
++		dev_err(&pdev->dev, "Cannot prepare_enable ssclk\n");
++		clk_disable_unprepare(ss->busclk);
++		return err;
++	}
++
++	/* Check that clock have the correct rates gived in the datasheet */
++	/* Try to set the clock to the maximum allowed */
++	err = clk_set_rate(ss->ssclk, cr_mod);
++	if (err != 0) {
++		dev_err(&pdev->dev, "Cannot set clock rate to ssclk\n");
++		clk_disable_unprepare(ss->ssclk);
++		clk_disable_unprepare(ss->busclk);
++		return err;
++	}
++	cr = clk_get_rate(ss->busclk);
++	if (cr >= cr_ahb)
++		dev_dbg(&pdev->dev, "Clock bus %lu (%lu MHz) (must be >= %lu)\n",
++				cr, cr / 1000000, cr_ahb);
++	else
++		dev_warn(&pdev->dev, "Clock bus %lu (%lu MHz) (must be >= %lu)\n",
++				cr, cr / 1000000, cr_ahb);
++	cr = clk_get_rate(ss->ssclk);
++	if (cr == cr_mod)
++		dev_dbg(&pdev->dev, "Clock ss %lu (%lu MHz) (must be <= %lu)\n",
++				cr, cr / 1000000, cr_mod);
++	else {
++		dev_warn(&pdev->dev, "Clock ss is at %lu (%lu MHz) (must be <= %lu)\n",
++				cr, cr / 1000000, cr_mod);
++	}
++
++	/* TODO Does this information could be usefull ? */
++	writel(SS_ENABLED, ss->base + SS_CTL);
++	v = readl(ss->base + SS_CTL);
++	v >>= 16;
++	v &= 0x07;
++	dev_info(&pdev->dev, "Die ID %d\n", v);
++	writel(0, ss->base + SS_CTL);
++
++	ss->dev = &pdev->dev;
++
++	mutex_init(&ss->lock);
++	mutex_init(&ss->bufin_lock);
++	mutex_init(&ss->bufout_lock);
++
++	err = crypto_register_ahash(&sunxi_md5_alg);
++	if (err)
++		goto error_md5;
++	err = crypto_register_ahash(&sunxi_sha1_alg);
++	if (err)
++		goto error_sha1;
++	err = crypto_register_algs(sunxi_cipher_algs,
++			ARRAY_SIZE(sunxi_cipher_algs));
++	if (err)
++		goto error_ciphers;
++
++	return 0;
++error_ciphers:
++	crypto_unregister_ahash(&sunxi_sha1_alg);
++error_sha1:
++	crypto_unregister_ahash(&sunxi_md5_alg);
++error_md5:
++	clk_disable_unprepare(ss->ssclk);
++	clk_disable_unprepare(ss->busclk);
++	return err;
++}
++
++static int __exit sunxi_ss_remove(struct platform_device *pdev)
++{
++	if (!pdev->dev.of_node)
++		return 0;
++
++	crypto_unregister_ahash(&sunxi_md5_alg);
++	crypto_unregister_ahash(&sunxi_sha1_alg);
++	crypto_unregister_algs(sunxi_cipher_algs,
++			ARRAY_SIZE(sunxi_cipher_algs));
++
++	if (ss->buf_in != NULL)
++		kfree(ss->buf_in);
++	if (ss->buf_out != NULL)
++		kfree(ss->buf_out);
++
++	writel(0, ss->base + SS_CTL);
++	clk_disable_unprepare(ss->busclk);
++	clk_disable_unprepare(ss->ssclk);
++	return 0;
++}
++
++/*============================================================================*/
++/*============================================================================*/
++static const struct of_device_id a20ss_crypto_of_match_table[] = {
++	{ .compatible = "allwinner,sun7i-a20-crypto" },
++	{}
++};
++MODULE_DEVICE_TABLE(of, a20ss_crypto_of_match_table);
++
++static struct platform_driver sunxi_ss_driver = {
++	.probe          = sunxi_ss_probe,
++	.remove         = __exit_p(sunxi_ss_remove),
++	.driver         = {
++		.owner          = THIS_MODULE,
++		.name           = "sunxi-ss",
++		.of_match_table	= a20ss_crypto_of_match_table,
++	},
++};
++
++module_platform_driver(sunxi_ss_driver);
++
++MODULE_DESCRIPTION("Allwinner Security System cryptographic accelerator");
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Corentin LABBE <clabbe.montjoie@gmail.com>");
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss-hash.c
+@@ -0,0 +1,241 @@
++/*
++ * sunxi-ss-hash.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * This file add support for MD5 and SHA1.
++ *
++ * You could find the datasheet at
++ * http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++#include "sunxi-ss.h"
++
++extern struct sunxi_ss_ctx *ss;
++
++/* sunxi_hash_init: initialize request context
++ * Activate the SS, and configure it for MD5 or SHA1
++ */
++int sunxi_hash_init(struct ahash_request *areq)
++{
++	const char *hash_type;
++	struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
++	struct sunxi_req_ctx *op = crypto_ahash_ctx(tfm);
++
++	mutex_lock(&ss->lock);
++
++	hash_type = crypto_tfm_alg_name(areq->base.tfm);
++
++	op->byte_count = 0;
++	op->nbwait = 0;
++	op->waitbuf = 0;
++
++	/* Enable and configure SS for MD5 or SHA1 */
++	if (strcmp(hash_type, "sha1") == 0)
++		op->mode = SS_OP_SHA1;
++	else
++		op->mode = SS_OP_MD5;
++
++	writel(op->mode | SS_ENABLED, ss->base + SS_CTL);
++	return 0;
++}
++
++/*
++ * sunxi_hash_update: update hash engine
++ *
++ * Could be used for both SHA1 and MD5
++ * Write data by step of 32bits and put then in the SS.
++ * The remaining data is stored (nbwait bytes) in op->waitbuf
++ * As an optimisation, we do not check RXFIFO_SPACES, since SS handle
++ * the FIFO faster than our writes
++ */
++int sunxi_hash_update(struct ahash_request *areq)
++{
++	u32 v;
++	unsigned int i = 0;/* bytes read, to be compared to areq->nbytes */
++	struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
++	struct sunxi_req_ctx *op = crypto_ahash_ctx(tfm);
++	struct scatterlist *in_sg;
++	unsigned int in_i = 0;/* advancement in the current SG */
++	void *src_addr;
++
++	u8 *waitbuf = (u8 *)(&op->waitbuf);
++
++	if (areq->nbytes == 0)
++		return 0;
++
++	in_sg = areq->src;
++	do {
++		src_addr = kmap(sg_page(in_sg)) + in_sg->offset;
++		/* step 1, if some bytes remains from last SG,
++		 * try to complete them to 4 and sent its */
++		if (op->nbwait > 0) {
++			while (op->nbwait < 4 && i < areq->nbytes &&
++					in_i < in_sg->length) {
++				waitbuf[op->nbwait] = *(u8 *)(src_addr + in_i);
++				i++;
++				in_i++;
++				op->nbwait++;
++			}
++			if (op->nbwait == 4) {
++				writel(op->waitbuf, ss->base + SS_RXFIFO);
++				op->byte_count += 4;
++				op->nbwait = 0;
++				op->waitbuf = 0;
++			}
++		}
++		/* step 2, main loop, read data 4bytes at a time */
++		while (i < areq->nbytes && areq->nbytes - i >= 4 &&
++				in_i < in_sg->length &&
++				in_sg->length - in_i >= 4) {
++			v = *(u32 *)(src_addr + in_i);
++			writel_relaxed(v, ss->base + SS_RXFIFO);
++			i += 4;
++			op->byte_count += 4;
++			in_i += 4;
++		}
++		/* step 3, if we have less than 4 bytes, copy them in waitbuf
++		 * no need to check for op->nbwait < 4 since we cannot have
++		 * more than 4 bytes remaining */
++		if (in_i < in_sg->length && in_sg->length - in_i < 4 &&
++				i < areq->nbytes) {
++			do {
++				waitbuf[op->nbwait] = *(u8 *)(src_addr + in_i);
++				op->nbwait++;
++				in_i++;
++				i++;
++			} while (in_i < in_sg->length && i < areq->nbytes);
++		}
++		/* we have finished the current SG, try next one */
++		kunmap(sg_page(in_sg));
++		in_sg = sg_next(in_sg);
++		in_i = 0;
++	} while (in_sg != NULL && i < areq->nbytes);
++	return 0;
++}
++
++/*
++ * sunxi_hash_final: finalize hashing operation
++ *
++ * If we have some remaining bytes, send it.
++ * Then ask the SS for finalizing the hash
++ */
++int sunxi_hash_final(struct ahash_request *areq)
++{
++	u32 v;
++	unsigned int i;
++	int zeros;
++	unsigned int index, padlen;
++	__be64 bits;
++	struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
++	struct sunxi_req_ctx *op = crypto_ahash_ctx(tfm);
++
++	if (op->nbwait > 0) {
++		op->waitbuf |= ((1 << 7) << (op->nbwait * 8));
++		writel(op->waitbuf, ss->base + SS_RXFIFO);
++	} else {
++		writel((1 << 7), ss->base + SS_RXFIFO);
++	}
++
++	/* number of space to pad to obtain 64o minus 8(size) minus 4 (final 1)
++	 * example len=0
++	 * example len=56
++	 * */
++
++	/* we have already send 4 more byte of which nbwait data */
++	if (op->mode == SS_OP_MD5) {
++		index = (op->byte_count + 4) & 0x3f;
++		op->byte_count += op->nbwait;
++		if (index > 56)
++			zeros = (120 - index) / 4;
++		else
++			zeros = (56 - index) / 4;
++	} else {
++		op->byte_count += op->nbwait;
++		index = op->byte_count & 0x3f;
++		padlen = (index < 56) ? (56 - index) : ((64+56) - index);
++		zeros = (padlen - 1) / 4;
++	}
++	for (i = 0; i < zeros; i++)
++		writel(0, ss->base + SS_RXFIFO);
++
++	/* write the lenght */
++	if (op->mode == SS_OP_SHA1) {
++		bits = cpu_to_be64(op->byte_count << 3);
++		writel(bits & 0xffffffff, ss->base + SS_RXFIFO);
++		writel((bits >> 32) & 0xffffffff, ss->base + SS_RXFIFO);
++	} else {
++		writel((op->byte_count << 3) & 0xffffffff,
++				ss->base + SS_RXFIFO);
++		writel((op->byte_count >> 29) & 0xffffffff,
++				ss->base + SS_RXFIFO);
++	}
++
++	/* stop the hashing */
++	v = readl(ss->base + SS_CTL);
++	v |= SS_DATA_END;
++	writel(v, ss->base + SS_CTL);
++
++	/* check the end */
++	/* The timeout could happend only in case of bad overcloking */
++#define SS_TIMEOUT 100
++	i = 0;
++	do {
++		v = readl(ss->base + SS_CTL);
++		i++;
++	} while (i < SS_TIMEOUT && (v & SS_DATA_END) > 0);
++	if (i >= SS_TIMEOUT) {
++		dev_err(ss->dev, "ERROR: hash end timeout %d>%d\n",
++				i, SS_TIMEOUT);
++		writel(0, ss->base + SS_CTL);
++		mutex_unlock(&ss->lock);
++		return -1;
++	}
++
++	if (op->mode == SS_OP_SHA1) {
++		for (i = 0; i < 5; i++) {
++			v = cpu_to_be32(readl(ss->base + SS_MD0 + i * 4));
++			memcpy(areq->result + i * 4, &v, 4);
++		}
++	} else {
++		for (i = 0; i < 4; i++) {
++			v = readl(ss->base + SS_MD0 + i * 4);
++			memcpy(areq->result + i * 4, &v, 4);
++		}
++	}
++	writel(0, ss->base + SS_CTL);
++	mutex_unlock(&ss->lock);
++	return 0;
++}
++
++/* sunxi_hash_finup: finalize hashing operation after an update */
++int sunxi_hash_finup(struct ahash_request *areq)
++{
++	int err;
++
++	err = sunxi_hash_update(areq);
++	if (err != 0)
++		return err;
++
++	return sunxi_hash_final(areq);
++}
++
++/* combo of init/update/final functions */
++int sunxi_hash_digest(struct ahash_request *areq)
++{
++	int err;
++
++	err = sunxi_hash_init(areq);
++	if (err != 0)
++		return err;
++
++	err = sunxi_hash_update(areq);
++	if (err != 0)
++		return err;
++
++	return sunxi_hash_final(areq);
++}
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss.h
+@@ -0,0 +1,183 @@
++/*
++ * sunxi-ss.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * Support AES cipher with 128,192,256 bits keysize.
++ * Support MD5 and SHA1 hash algorithms.
++ * Support DES and 3DES
++ * Support PRNG
++ *
++ * You could find the datasheet at
++ * http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
++ *
++ *
++ * Licensed under the GPL-2.
++ */
++
++#include <linux/clk.h>
++#include <linux/crypto.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <crypto/scatterwalk.h>
++#include <linux/scatterlist.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <crypto/md5.h>
++#include <crypto/sha.h>
++#include <crypto/hash.h>
++#include <crypto/internal/hash.h>
++#include <crypto/aes.h>
++#include <crypto/des.h>
++#include <crypto/internal/rng.h>
++
++#define SS_CTL            0x00
++#define SS_KEY0           0x04
++#define SS_KEY1           0x08
++#define SS_KEY2           0x0C
++#define SS_KEY3           0x10
++#define SS_KEY4           0x14
++#define SS_KEY5           0x18
++#define SS_KEY6           0x1C
++#define SS_KEY7           0x20
++
++#define SS_IV0            0x24
++#define SS_IV1            0x28
++#define SS_IV2            0x2C
++#define SS_IV3            0x30
++
++#define SS_CNT0           0x34
++#define SS_CNT1           0x38
++#define SS_CNT2           0x3C
++#define SS_CNT3           0x40
++
++#define SS_FCSR           0x44
++#define SS_ICSR           0x48
++
++#define SS_MD0            0x4C
++#define SS_MD1            0x50
++#define SS_MD2            0x54
++#define SS_MD3            0x58
++#define SS_MD4            0x5C
++
++#define SS_RXFIFO         0x200
++#define SS_TXFIFO         0x204
++
++/* SS_CTL configuration values */
++
++/* PRNG generator mode - bit 15 */
++#define SS_PRNG_ONESHOT		(0 << 15)
++#define SS_PRNG_CONTINUE	(1 << 15)
++
++/* SS operation mode - bits 12-13 */
++#define SS_ECB			(0 << 12)
++#define SS_CBC			(1 << 12)
++#define SS_CNT			(2 << 12)
++
++/* Counter width for CNT mode - bits 10-11 */
++#define SS_CNT_16BITS		(0 << 10)
++#define SS_CNT_32BITS		(1 << 10)
++#define SS_CNT_64BITS		(2 << 10)
++
++/* Key size for AES - bits 8-9 */
++#define SS_AES_128BITS		(0 << 8)
++#define SS_AES_192BITS		(1 << 8)
++#define SS_AES_256BITS		(2 << 8)
++
++/* Operation direction - bit 7 */
++#define SS_ENCRYPTION		(0 << 7)
++#define SS_DECRYPTION		(1 << 7)
++
++/* SS Method - bits 4-6 */
++#define SS_OP_AES		(0 << 4)
++#define SS_OP_DES		(1 << 4)
++#define SS_OP_3DES		(2 << 4)
++#define SS_OP_SHA1		(3 << 4)
++#define SS_OP_MD5		(4 << 4)
++#define SS_OP_PRNG		(5 << 4)
++
++/* Data end bit - bit 2 */
++#define SS_DATA_END		(1 << 2)
++
++/* PRNG start bit - bit 1 */
++#define SS_PRNG_START		(1 << 1)
++
++/* SS Enable bit - bit 0 */
++#define SS_DISABLED		(0 << 0)
++#define SS_ENABLED		(1 << 0)
++
++/* SS_FCSR configuration values */
++/* RX FIFO status - bit 30 */
++#define SS_RXFIFO_FREE		(1 << 30)
++
++/* RX FIFO empty spaces - bits 24-29 */
++#define SS_RXFIFO_SPACES(val)	(((val) >> 24) & 0x3f)
++
++/* TX FIFO status - bit 22 */
++#define SS_TXFIFO_AVAILABLE	(1 << 22)
++
++/* TX FIFO available spaces - bits 16-21 */
++#define SS_TXFIFO_SPACES(val)	(((val) >> 16) & 0x3f)
++
++#define SS_RXFIFO_EMP_INT_PENDING	(1 << 10)
++#define SS_TXFIFO_AVA_INT_PENDING	(1 << 8)
++#define SS_RXFIFO_EMP_INT_ENABLE	(1 << 2)
++#define SS_TXFIFO_AVA_INT_ENABLE	(1 << 0)
++
++/* SS_ICSR configuration values */
++#define SS_ICS_DRQ_ENABLE		(1 << 4)
++
++struct sunxi_ss_ctx {
++	void __iomem *base;
++	int irq;
++	struct clk *busclk;
++	struct clk *ssclk;
++	struct device *dev;
++	struct resource *res;
++	void *buf_in; /* pointer to data to be uploaded to the device */
++	size_t buf_in_size; /* size of buf_in */
++	void *buf_out;
++	size_t buf_out_size;
++	struct mutex lock; /* control the use of the device */
++	struct mutex bufout_lock; /* control the use of buf_out*/
++	struct mutex bufin_lock; /* control the sue of buf_in*/
++};
++
++struct sunxi_req_ctx {
++	u32 key[AES_MAX_KEY_SIZE / 4];/* divided by sizeof(u32) */
++	u32 keylen;
++	u32 mode;
++	u64 byte_count; /* number of bytes "uploaded" to the device */
++	u32 waitbuf; /* a partial word waiting to be completed and
++			uploaded to the device */
++	/* number of bytes to be uploaded in the waitbuf word */
++	unsigned int nbwait;
++};
++
++#define SS_SEED_LEN (192/8)
++#define SS_DATA_LEN (160/8)
++
++struct prng_context {
++	u32 seed[SS_SEED_LEN/4];
++	unsigned int slen;
++};
++
++int sunxi_hash_init(struct ahash_request *areq);
++int sunxi_hash_update(struct ahash_request *areq);
++int sunxi_hash_final(struct ahash_request *areq);
++int sunxi_hash_finup(struct ahash_request *areq);
++int sunxi_hash_digest(struct ahash_request *areq);
++
++int sunxi_ss_aes_poll(struct ablkcipher_request *areq);
++int sunxi_ss_des_poll(struct ablkcipher_request *areq);
++int sunxi_ss_cipher_init(struct crypto_tfm *tfm);
++int sunxi_ss_cipher_encrypt(struct ablkcipher_request *areq);
++int sunxi_ss_cipher_decrypt(struct ablkcipher_request *areq);
++int sunxi_ss_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen);
++int sunxi_ss_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen);
++int sunxi_ss_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen);
diff --git a/trunk/target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch b/trunk/target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch
new file mode 100644
index 00000000..5b0ca8d3
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch
@@ -0,0 +1,29 @@
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -299,7 +299,7 @@ static void sun4i_get_apb1_factors(u32 *
+ 	if (parent_rate < *freq)
+ 		*freq = parent_rate;
+ 
+-	parent_rate = (parent_rate + (*freq - 1)) / *freq;
++	parent_rate = DIV_ROUND_UP(parent_rate, *freq);
+ 
+ 	/* Invalid rate! */
+ 	if (parent_rate > 32)
+@@ -344,7 +344,7 @@ static void sun4i_get_mod0_factors(u32 *
+ 	if (*freq > parent_rate)
+ 		*freq = parent_rate;
+ 
+-	div = parent_rate / *freq;
++	div = DIV_ROUND_UP(parent_rate, *freq);
+ 
+ 	if (div < 16)
+ 		calcp = 0;
+@@ -385,7 +385,7 @@ static void sun7i_a20_get_out_factors(u3
+ 	if (*freq > parent_rate)
+ 		*freq = parent_rate;
+ 
+-	div = parent_rate / *freq;
++	div = DIV_ROUND_UP(parent_rate, *freq);
+ 
+ 	if (div < 32)
+ 		calcp = 0;
diff --git a/trunk/target/linux/sunxi/patches-3.14/280-ir-add-driver.patch b/trunk/target/linux/sunxi/patches-3.14/280-ir-add-driver.patch
new file mode 100644
index 00000000..fe7bb535
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/280-ir-add-driver.patch
@@ -0,0 +1,363 @@
+From 601b6a88cd14e655ccd246fe122cbf496a891cbb Mon Sep 17 00:00:00 2001
+From: Alexander Bersenev <bay@hackerdom.ru>
+Date: Mon, 9 Jun 2014 00:08:10 +0600
+Subject: [PATCH] rc: add sunxi-ir driver
+
+This patch adds driver for sunxi IR controller.
+It is based on Alexsey Shestacov's work based on the original driver
+supplied by Allwinner.
+
+Signed-off-by: Alexander Bersenev <bay@hackerdom.ru>
+Signed-off-by: Alexsey Shestacov <wingrime@linux-sunxi.org>
+---
+ drivers/media/rc/Kconfig     |  10 ++
+ drivers/media/rc/Makefile    |   1 +
+ drivers/media/rc/sunxi-cir.c | 318 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 329 insertions(+)
+ create mode 100644 drivers/media/rc/sunxi-cir.c
+
+--- a/drivers/media/rc/Kconfig
++++ b/drivers/media/rc/Kconfig
+@@ -332,4 +332,14 @@ config RC_ST
+ 
+ 	 If you're not sure, select N here.
+ 
++config IR_SUNXI
++    tristate "SUNXI IR remote control"
++    depends on RC_CORE
++    depends on ARCH_SUNXI
++    ---help---
++      Say Y if you want to use sunXi internal IR Controller
++
++      To compile this driver as a module, choose M here: the module will
++      be called sunxi-ir.
++
+ endif #RC_DEVICES
+--- a/drivers/media/rc/Makefile
++++ b/drivers/media/rc/Makefile
+@@ -31,3 +31,4 @@ obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-rec
+ obj-$(CONFIG_IR_IGUANA) += iguanair.o
+ obj-$(CONFIG_IR_TTUSBIR) += ttusbir.o
+ obj-$(CONFIG_RC_ST) += st_rc.o
++obj-$(CONFIG_IR_SUNXI) += sunxi-cir.o
+--- /dev/null
++++ b/drivers/media/rc/sunxi-cir.c
+@@ -0,0 +1,318 @@
++/*
++ * Driver for Allwinner sunXi IR controller
++ *
++ * Copyright (C) 2014 Alexsey Shestacov <wingrime@linux-sunxi.org>
++ * Copyright (C) 2014 Alexander Bersenev <bay@hackerdom.ru>
++ *
++ * Based on sun5i-ir.c:
++ * Copyright (C) 2007-2012 Daniel Wang
++ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++#include <linux/clk.h>
++#include <linux/interrupt.h>
++#include <linux/module.h>
++#include <linux/of_platform.h>
++#include <media/rc-core.h>
++
++#define SUNXI_IR_DEV "sunxi-ir"
++
++/* Registers */
++/* IR Control */
++#define SUNXI_IR_CTL_REG      0x00
++/* Global Enable */
++#define REG_CTL_GEN			BIT(0)
++/* RX block enable */
++#define REG_CTL_RXEN			BIT(1)
++/* CIR mode */
++#define REG_CTL_MD			(BIT(4) | BIT(5))
++
++/* Rx Config */
++#define SUNXI_IR_RXCTL_REG    0x10
++/* Pulse Polarity Invert flag */
++#define REG_RXCTL_RPPI			BIT(2)
++
++/* Rx Data */
++#define SUNXI_IR_RXFIFO_REG   0x20
++
++/* Rx Interrupt Enable */
++#define SUNXI_IR_RXINT_REG    0x2C
++/* Rx FIFO Overflow */
++#define REG_RXINT_ROI_EN		BIT(0)
++/* Rx Packet End */
++#define REG_RXINT_RPEI_EN		BIT(1)
++/* Rx FIFO Data Available */
++#define REG_RXINT_RAI_EN		BIT(4)
++
++/* Rx FIFO available byte level */
++#define REG_RXINT_RAL(val)    (((val) << 8) & (GENMASK(11, 8)))
++
++/* Rx Interrupt Status */
++#define SUNXI_IR_RXSTA_REG    0x30
++/* RX FIFO Get Available Counter */
++#define REG_RXSTA_GET_AC(val) (((val) >> 8) & (GENMASK(5, 0)))
++/* Clear all interrupt status value */
++#define REG_RXSTA_CLEARALL    0xff
++
++/* IR Sample Config */
++#define SUNXI_IR_CIR_REG      0x34
++/* CIR_REG register noise threshold */
++#define REG_CIR_NTHR(val)    (((val) << 2) & (GENMASK(7, 2)))
++/* CIR_REG register idle threshold */
++#define REG_CIR_ITHR(val)    (((val) << 8) & (GENMASK(15, 8)))
++
++/* Hardware supported fifo size */
++#define SUNXI_IR_FIFO_SIZE    16
++/* How many messages in FIFO trigger IRQ */
++#define TRIGGER_LEVEL         8
++/* Required frequency for IR0 or IR1 clock in CIR mode */
++#define SUNXI_IR_BASE_CLK     8000000
++/* Frequency after IR internal divider  */
++#define SUNXI_IR_CLK          (SUNXI_IR_BASE_CLK / 64)
++/* Sample period in ns */
++#define SUNXI_IR_SAMPLE       (1000000000ul / SUNXI_IR_CLK)
++/* Noise threshold in samples  */
++#define SUNXI_IR_RXNOISE      1
++/* Idle Threshold in samples */
++#define SUNXI_IR_RXIDLE       20
++/* Time after which device stops sending data in ms */
++#define SUNXI_IR_TIMEOUT      120
++
++struct sunxi_ir {
++	spinlock_t      ir_lock;
++	struct rc_dev   *rc;
++	void __iomem    *base;
++	int             irq;
++	struct clk      *clk;
++	struct clk      *apb_clk;
++	const char      *map_name;
++};
++
++static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id)
++{
++	unsigned long status;
++	unsigned char dt;
++	unsigned int cnt, rc;
++	struct sunxi_ir *ir = dev_id;
++	DEFINE_IR_RAW_EVENT(rawir);
++
++	spin_lock(&ir->ir_lock);
++
++	status = readl(ir->base + SUNXI_IR_RXSTA_REG);
++
++	/* clean all pending statuses */
++	writel(status | REG_RXSTA_CLEARALL, ir->base + SUNXI_IR_RXSTA_REG);
++
++	if (status & REG_RXINT_RAI_EN) {
++		/* How many messages in fifo */
++		rc  = REG_RXSTA_GET_AC(status);
++		/* Sanity check */
++		rc = rc > SUNXI_IR_FIFO_SIZE ? SUNXI_IR_FIFO_SIZE : rc;
++		/* If we have data */
++		for (cnt = 0; cnt < rc; cnt++) {
++			/* for each bit in fifo */
++			dt = readb(ir->base + SUNXI_IR_RXFIFO_REG);
++			rawir.pulse = (dt & 0x80) != 0;
++			rawir.duration = ((dt & 0x7f) + 1) * SUNXI_IR_SAMPLE;
++			ir_raw_event_store_with_filter(ir->rc, &rawir);
++		}
++	}
++
++	if (status & REG_RXINT_ROI_EN) {
++		ir_raw_event_reset(ir->rc);
++	} else if (status & REG_RXINT_RPEI_EN) {
++		ir_raw_event_set_idle(ir->rc, true);
++		ir_raw_event_handle(ir->rc);
++	}
++
++	spin_unlock(&ir->ir_lock);
++
++	return IRQ_HANDLED;
++}
++
++static int sunxi_ir_probe(struct platform_device *pdev)
++{
++	int ret = 0;
++	unsigned long tmp = 0;
++
++	struct device *dev = &pdev->dev;
++	struct device_node *dn = dev->of_node;
++	struct resource *res;
++	struct sunxi_ir *ir;
++
++	ir = devm_kzalloc(dev, sizeof(struct sunxi_ir), GFP_KERNEL);
++	if (!ir)
++		return -ENOMEM;
++
++	/* Clock */
++	ir->apb_clk = devm_clk_get(dev, "apb");
++	if (IS_ERR(ir->apb_clk)) {
++		dev_err(dev, "failed to get a apb clock.\n");
++		return PTR_ERR(ir->apb_clk);
++	}
++	ir->clk = devm_clk_get(dev, "ir");
++	if (IS_ERR(ir->clk)) {
++		dev_err(dev, "failed to get a ir clock.\n");
++		return PTR_ERR(ir->clk);
++	}
++
++	ret = clk_set_rate(ir->clk, SUNXI_IR_BASE_CLK);
++	if (ret) {
++		dev_err(dev, "set ir base clock failed!\n");
++		return ret;
++	}
++
++	if (clk_prepare_enable(ir->apb_clk)) {
++		dev_err(dev, "try to enable apb_ir_clk failed\n");
++		return -EINVAL;
++	}
++
++	if (clk_prepare_enable(ir->clk)) {
++		dev_err(dev, "try to enable ir_clk failed\n");
++		ret = -EINVAL;
++		goto exit_clkdisable_apb_clk;
++	}
++
++	/* IO */
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	ir->base = devm_ioremap_resource(dev, res);
++	if (IS_ERR(ir->base)) {
++		dev_err(dev, "failed to map registers\n");
++		ret = PTR_ERR(ir->base);
++		goto exit_clkdisable_clk;
++	}
++
++	ir->rc = rc_allocate_device();
++	if (!ir->rc) {
++		dev_err(dev, "failed to allocate device\n");
++		ret = -ENOMEM;
++		goto exit_clkdisable_clk;
++	}
++
++	ir->rc->priv = ir;
++	ir->rc->input_name = SUNXI_IR_DEV;
++	ir->rc->input_phys = "sunxi-ir/input0";
++	ir->rc->input_id.bustype = BUS_HOST;
++	ir->rc->input_id.vendor = 0x0001;
++	ir->rc->input_id.product = 0x0001;
++	ir->rc->input_id.version = 0x0100;
++	ir->map_name = of_get_property(dn, "linux,rc-map-name", NULL);
++	ir->rc->map_name = ir->map_name ?: RC_MAP_EMPTY;
++	ir->rc->dev.parent = dev;
++	ir->rc->driver_type = RC_DRIVER_IR_RAW;
++	rc_set_allowed_protocols(ir->rc, RC_BIT_ALL);
++	ir->rc->rx_resolution = SUNXI_IR_SAMPLE;
++	ir->rc->timeout = MS_TO_NS(SUNXI_IR_TIMEOUT);
++	ir->rc->driver_name = SUNXI_IR_DEV;
++
++	ret = rc_register_device(ir->rc);
++	if (ret) {
++		dev_err(dev, "failed to register rc device\n");
++		goto exit_free_dev;
++	}
++
++	platform_set_drvdata(pdev, ir);
++
++	/* IRQ */
++	ir->irq = platform_get_irq(pdev, 0);
++	if (ir->irq < 0) {
++		dev_err(dev, "no irq resource\n");
++		ret = ir->irq;
++		goto exit_free_dev;
++	}
++
++	ret = devm_request_irq(dev, ir->irq, sunxi_ir_irq, 0, SUNXI_IR_DEV, ir);
++	if (ret) {
++		dev_err(dev, "failed request irq\n");
++		goto exit_free_dev;
++	}
++
++	/* Enable CIR Mode */
++	writel(REG_CTL_MD, ir->base+SUNXI_IR_CTL_REG);
++
++	/* Set noise threshold and idle threshold */
++	writel(REG_CIR_NTHR(SUNXI_IR_RXNOISE)|REG_CIR_ITHR(SUNXI_IR_RXIDLE),
++	       ir->base + SUNXI_IR_CIR_REG);
++
++	/* Invert Input Signal */
++	writel(REG_RXCTL_RPPI, ir->base + SUNXI_IR_RXCTL_REG);
++
++	/* Clear All Rx Interrupt Status */
++	writel(REG_RXSTA_CLEARALL, ir->base + SUNXI_IR_RXSTA_REG);
++
++	/*
++	 * Enable IRQ on overflow, packet end, FIFO available with trigger
++	 * level
++	 */
++	writel(REG_RXINT_ROI_EN | REG_RXINT_RPEI_EN |
++	       REG_RXINT_RAI_EN | REG_RXINT_RAL(TRIGGER_LEVEL - 1),
++	       ir->base + SUNXI_IR_RXINT_REG);
++
++	/* Enable IR Module */
++	tmp = readl(ir->base + SUNXI_IR_CTL_REG);
++	writel(tmp | REG_CTL_GEN | REG_CTL_RXEN, ir->base + SUNXI_IR_CTL_REG);
++
++	dev_info(dev, "initialized sunXi IR driver\n");
++	return 0;
++
++exit_free_dev:
++	rc_free_device(ir->rc);
++exit_clkdisable_clk:
++	clk_disable_unprepare(ir->clk);
++exit_clkdisable_apb_clk:
++	clk_disable_unprepare(ir->apb_clk);
++
++	return ret;
++}
++
++static int sunxi_ir_remove(struct platform_device *pdev)
++{
++	unsigned long flags;
++	struct sunxi_ir *ir = platform_get_drvdata(pdev);
++
++	clk_disable_unprepare(ir->clk);
++	clk_disable_unprepare(ir->apb_clk);
++
++	spin_lock_irqsave(&ir->ir_lock, flags);
++	/* disable IR IRQ */
++	writel(0, ir->base + SUNXI_IR_RXINT_REG);
++	/* clear All Rx Interrupt Status */
++	writel(REG_RXSTA_CLEARALL, ir->base + SUNXI_IR_RXSTA_REG);
++	/* disable IR */
++	writel(0, ir->base + SUNXI_IR_CTL_REG);
++	spin_unlock_irqrestore(&ir->ir_lock, flags);
++
++	rc_unregister_device(ir->rc);
++	return 0;
++}
++
++static const struct of_device_id sunxi_ir_match[] = {
++	{ .compatible = "allwinner,sun7i-a20-ir", },
++	{},
++};
++
++static struct platform_driver sunxi_ir_driver = {
++	.probe          = sunxi_ir_probe,
++	.remove         = sunxi_ir_remove,
++	.driver = {
++		.name = SUNXI_IR_DEV,
++		.owner = THIS_MODULE,
++		.of_match_table = sunxi_ir_match,
++	},
++};
++
++module_platform_driver(sunxi_ir_driver);
++
++MODULE_DESCRIPTION("Allwinner sunXi IR controller driver");
++MODULE_AUTHOR("Alexsey Shestacov <wingrime@linux-sunxi.org>");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.14/281-dt-sun7i-add-ir-pins.patch b/trunk/target/linux/sunxi/patches-3.14/281-dt-sun7i-add-ir-pins.patch
new file mode 100644
index 00000000..2389cf88
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/281-dt-sun7i-add-ir-pins.patch
@@ -0,0 +1,36 @@
+From 7720fe5faadae243806833c7a7ec5d15bae244c4 Mon Sep 17 00:00:00 2001
+From: Alexander Bersenev <bay@hackerdom.ru>
+Date: Mon, 9 Jun 2014 00:08:11 +0600
+Subject: [PATCH] ARM: sunxi: Add pins for IR controller on A20 to dtsi
+
+This patch adds pins for two IR controllers on A20
+
+Signed-off-by: Alexander Bersenev <bay@hackerdom.ru>
+Signed-off-by: Alexsey Shestacov <wingrime@linux-sunxi.org>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -746,6 +746,20 @@
+ 				allwinner,drive = <2>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			ir0_pins_a: ir0@0 {
++				    allwinner,pins = "PB3","PB4";
++				    allwinner,function = "ir0";
++				    allwinner,drive = <0>;
++				    allwinner,pull = <0>;
++			};
++
++			ir1_pins_a: ir1@0 {
++				    allwinner,pins = "PB22","PB23";
++				    allwinner,function = "ir1";
++				    allwinner,drive = <0>;
++				    allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		timer@01c20c00 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch b/trunk/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
new file mode 100644
index 00000000..f5763bad
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/282-dt-sun7i-add-ir-ctrlers.patch
@@ -0,0 +1,40 @@
+From 0af3258f87d590864187b0187c7aa7428801ef80 Mon Sep 17 00:00:00 2001
+From: Alexander Bersenev <bay@hackerdom.ru>
+Date: Mon, 9 Jun 2014 00:08:12 +0600
+Subject: [PATCH] ARM: sunxi: Add IR controllers on A20 to dtsi
+
+This patch adds records for two IR controllers on A20
+
+Signed-off-by: Alexander Bersenev <bay@hackerdom.ru>
+Signed-off-by: Alexsey Shestacov <wingrime@linux-sunxi.org>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -785,6 +785,24 @@
+ 			interrupts = <0 24 4>;
+ 		};
+ 
++		ir0: ir@01c21800 {
++			compatible = "allwinner,sun7i-a20-ir";
++			clocks = <&apb0_gates 6>, <&ir0_clk>;
++			clock-names = "apb", "ir";
++			interrupts = <0 5 4>;
++			reg = <0x01c21800 0x40>;
++			status = "disabled";
++		};
++
++		ir1: ir@01c21c00 {
++			compatible = "allwinner,sun7i-a20-ir";
++			clocks = <&apb0_gates 7>, <&ir1_clk>;
++			clock-names = "apb", "ir";
++			interrupts = <0 6 4>;
++			reg = <0x01c21c00 0x40>;
++			status = "disabled";
++		};
++
+ 		lradc: lradc@01c22800 {
+ 			compatible = "allwinner,sun4i-lradc-keys";
+ 			reg = <0x01c22800 0x100>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/283-dt-sun7i-add-ir-to-cb2-cbt.patch b/trunk/target/linux/sunxi/patches-3.14/283-dt-sun7i-add-ir-to-cb2-cbt.patch
new file mode 100644
index 00000000..aceb5669
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/283-dt-sun7i-add-ir-to-cb2-cbt.patch
@@ -0,0 +1,47 @@
+From 05cffcda932b0914d78a08891c13e61593a6ce02 Mon Sep 17 00:00:00 2001
+From: Alexander Bersenev <bay@hackerdom.ru>
+Date: Mon, 9 Jun 2014 00:08:13 +0600
+Subject: [PATCH] ARM: sunxi: Enable IR controller on cubieboard 2 and
+ cubietruck in dts
+
+This patch enables two IR devices in dts:
+- One IR device physically found on Cubieboard 2
+- One IR device physically found on Cubietruck
+
+Signed-off-by: Alexander Bersenev <bay@hackerdom.ru>
+Signed-off-by: Alexsey Shestacov <wingrime@linux-sunxi.org>
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 6 ++++++
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts  | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -64,6 +64,12 @@
+ 			};
+ 		};
+ 
++		ir0: ir@01c21800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&ir0_pins_a>;
++			status = "okay";
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -114,6 +114,12 @@
+                         };
+ 		};
+ 
++		ir0: ir@01c21800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&ir0_pins_a>;
++			status = "okay";
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/284-ir-backports-from-3.15.patch b/trunk/target/linux/sunxi/patches-3.14/284-ir-backports-from-3.15.patch
new file mode 100644
index 00000000..9e703e7d
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/284-ir-backports-from-3.15.patch
@@ -0,0 +1,1210 @@
+From 00942d1a1bd93ac108c1b92d504c568a37be1833 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Fri, 17 Jan 2014 10:58:49 -0300
+Subject: [PATCH] [media] media: rc: add sysfs scancode filtering interface
+
+Add and document a generic sysfs based scancode filtering interface for
+making use of IR data matching hardware to filter out uninteresting
+scancodes. Two filters exist, one for normal operation and one for
+filtering scancodes which are permitted to wake the system from suspend.
+
+The following files are added to /sys/class/rc/rc?/:
+ - filter: normal scancode filter value
+ - filter_mask: normal scancode filter mask
+ - wakeup_filter: wakeup scancode filter value
+ - wakeup_filter_mask: wakeup scancode filter mask
+
+A new s_filter() driver callback is added which must arrange for the
+specified filter to be applied at the right time. Drivers can convert
+the scancode filter into a raw IR data filter, which can be applied
+immediately or later (for wake up filters).
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
+Cc: linux-media@vger.kernel.org
+Cc: Rob Landley <rob@landley.net>
+Cc: linux-doc@vger.kernel.org
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ Documentation/ABI/testing/sysfs-class-rc |  58 +++++++++++++
+ drivers/media/rc/rc-main.c               | 136 +++++++++++++++++++++++++++++++
+ include/media/rc-core.h                  |  29 +++++++
+ 3 files changed, 223 insertions(+)
+
+From 7b802ce7e8c67510389fdbbe29edd87a75df3a93 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Mon, 10 Feb 2014 18:31:56 -0300
+Subject: [PATCH] [media] rc-main: store_filter: pass errors to userland
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Propagate errors returned by drivers from the s_filter callback back to
+userland when updating scancode filters. This allows userland to see
+when the filter couldn't be updated, usually because it's not a valid
+filter for the hardware.
+
+Previously the filter was being updated conditionally on success of
+s_filter, but the write always reported success back to userland.
+
+Reported-by: Antti Seppälä <a.seppala@gmail.com>
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ drivers/media/rc/rc-main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+From b8c7d915087c97a21fa415fa0e860e59739da202 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Fri, 28 Feb 2014 20:17:02 -0300
+Subject: [PATCH] [media] rc-main: add generic scancode filtering
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add generic scancode filtering of RC input events, and fall back to
+permitting any RC_FILTER_NORMAL scancode filter to be set if no s_filter
+callback exists. This allows raw IR decoder events to be filtered, and
+potentially allows hardware decoders to set looser filters and rely on
+generic code to filter out the corner cases.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Reviewed-by: Antti Seppälä <a.seppala@gmail.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ drivers/media/rc/rc-main.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+From 1a1934fab0c920f0d3bceeb60c9fe2dae8a56be9 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Fri, 28 Feb 2014 20:17:03 -0300
+Subject: [PATCH] [media] rc: abstract access to allowed/enabled protocols
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The allowed and enabled protocol masks need to be expanded to be per
+filter type in order to support wakeup filter protocol selection. To
+ease that process abstract access to the rc_dev::allowed_protos and
+rc_dev::enabled_protocols members with inline functions.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Reviewed-by: Antti Seppälä <a.seppala@gmail.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ drivers/hid/hid-picolcd_cir.c               |  2 +-
+ drivers/media/common/siano/smsir.c          |  2 +-
+ drivers/media/i2c/ir-kbd-i2c.c              |  4 ++--
+ drivers/media/pci/cx23885/cx23885-input.c   |  2 +-
+ drivers/media/pci/cx88/cx88-input.c         |  2 +-
+ drivers/media/rc/ati_remote.c               |  2 +-
+ drivers/media/rc/ene_ir.c                   |  2 +-
+ drivers/media/rc/fintek-cir.c               |  2 +-
+ drivers/media/rc/gpio-ir-recv.c             |  4 ++--
+ drivers/media/rc/iguanair.c                 |  2 +-
+ drivers/media/rc/imon.c                     |  7 ++++---
+ drivers/media/rc/ir-jvc-decoder.c           |  2 +-
+ drivers/media/rc/ir-lirc-codec.c            |  2 +-
+ drivers/media/rc/ir-mce_kbd-decoder.c       |  2 +-
+ drivers/media/rc/ir-nec-decoder.c           |  2 +-
+ drivers/media/rc/ir-raw.c                   |  2 +-
+ drivers/media/rc/ir-rc5-decoder.c           |  6 +++---
+ drivers/media/rc/ir-rc5-sz-decoder.c        |  2 +-
+ drivers/media/rc/ir-rc6-decoder.c           |  6 +++---
+ drivers/media/rc/ir-sanyo-decoder.c         |  2 +-
+ drivers/media/rc/ir-sharp-decoder.c         |  2 +-
+ drivers/media/rc/ir-sony-decoder.c          | 10 +++++-----
+ drivers/media/rc/ite-cir.c                  |  2 +-
+ drivers/media/rc/mceusb.c                   |  2 +-
+ drivers/media/rc/nuvoton-cir.c              |  2 +-
+ drivers/media/rc/rc-loopback.c              |  2 +-
+ drivers/media/rc/redrat3.c                  |  2 +-
+ drivers/media/rc/st_rc.c                    |  2 +-
+ drivers/media/rc/streamzap.c                |  2 +-
+ drivers/media/rc/ttusbir.c                  |  2 +-
+ drivers/media/rc/winbond-cir.c              |  2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c |  2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-remote.c  |  2 +-
+ drivers/media/usb/em28xx/em28xx-input.c     |  8 ++++----
+ drivers/media/usb/tm6000/tm6000-input.c     |  2 +-
+ include/media/rc-core.h                     | 22 ++++++++++++++++++++++
+ 36 files changed, 73 insertions(+), 50 deletions(-)
+
+From acff5f24732acc8a55d0a0f0ee1d19442267df63 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Fri, 28 Feb 2014 20:17:04 -0300
+Subject: [PATCH] [media] rc: add allowed/enabled wakeup protocol masks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only a single allowed and enabled protocol mask currently exists in
+struct rc_dev, however to support a separate wakeup filter protocol two
+of each are needed, ideally as an array.
+
+Therefore make both rc_dev::allowed_protos and rc_dev::enabled_protocols
+arrays, update all users to reference the first element
+(RC_FILTER_NORMAL), and add a couple more helper functions for drivers
+to use for setting the allowed and enabled wakeup protocols.
+
+We also rename allowed_protos to allowed_protocols while we're at it,
+which is more consistent with enabled_protocols.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Reviewed-by: Antti Seppälä <a.seppala@gmail.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ drivers/media/rc/rc-main.c | 10 +++++-----
+ include/media/rc-core.h    | 32 ++++++++++++++++++++++++--------
+ 2 files changed, 29 insertions(+), 13 deletions(-)
+
+From ab88c66deace78989aa71cb139284cf7fb227ba4 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Fri, 28 Feb 2014 20:17:05 -0300
+Subject: [PATCH] [media] rc: add wakeup_protocols sysfs file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a wakeup_protocols sysfs file which controls the new
+rc_dev::enabled_protocols[RC_FILTER_WAKEUP], which is the mask of
+protocols that are used for the wakeup filter.
+
+A new RC driver callback change_wakeup_protocol() is called to change
+the wakeup protocol mask.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Reviewed-by: Antti Seppälä <a.seppala@gmail.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ Documentation/ABI/testing/sysfs-class-rc           | 23 +++++-
+ .../DocBook/media/v4l/remote_controllers.xml       | 20 +++++-
+ drivers/media/rc/rc-main.c                         | 82 +++++++++++++---------
+ include/media/rc-core.h                            |  3 +
+ 4 files changed, 90 insertions(+), 38 deletions(-)
+
+From 6bea25af147fcddcd8fd4557f4184c847c5c6ffd Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Fri, 28 Feb 2014 20:17:06 -0300
+Subject: [PATCH] [media] rc-main: automatically refresh filter on protocol
+ change
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When either of the normal or wakeup filter protocols are changed,
+refresh the corresponding scancode filter, i.e. try and set the same
+scancode filter with the new protocol. If that fails clear the filter
+instead.
+
+If no protocol was selected the filter is just cleared, and if no
+s_filter callback exists the filter is left unmodified.
+
+Similarly clear the filter mask when the filter is set if no protocol is
+currently selected.
+
+This simplifies driver code which no longer has to explicitly worry
+about modifying the filter on a protocol change. This also allows the
+change_wakeup_protocol callback to be omitted entirely if there is only
+a single available wakeup protocol at a time, since selecting no
+protocol will automatically clear the wakeup filter, disabling wakeup.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Reviewed-by: Antti Seppälä <a.seppala@gmail.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ drivers/media/rc/rc-main.c | 41 +++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 39 insertions(+), 2 deletions(-)
+
+From 262912335c823a2bbcc87003ee55d62cc27f4e48 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Sat, 1 Mar 2014 19:52:25 -0300
+Subject: [PATCH] [media] rc-main: fix missing unlock if no devno left
+
+While playing with make coccicheck I noticed this message:
+drivers/media/rc/rc-main.c:1245:3-9: preceding lock on line 1238
+
+It was introduced by commit 587d1b06e07b ([media] rc-core: reuse device
+numbers) which returns -ENOMEM after a mutex_lock without first
+unlocking it when there are no more device numbers left. The added code
+doesn't depend on the device lock, so move it before the lock is taken.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ drivers/media/rc/rc-main.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/hid/hid-picolcd_cir.c
++++ b/drivers/hid/hid-picolcd_cir.c
+@@ -114,7 +114,7 @@ int picolcd_init_cir(struct picolcd_data
+ 
+ 	rdev->priv             = data;
+ 	rdev->driver_type      = RC_DRIVER_IR_RAW;
+-	rdev->allowed_protos   = RC_BIT_ALL;
++	rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+ 	rdev->open             = picolcd_cir_open;
+ 	rdev->close            = picolcd_cir_close;
+ 	rdev->input_name       = data->hdev->name;
+--- a/drivers/media/common/siano/smsir.c
++++ b/drivers/media/common/siano/smsir.c
+@@ -88,7 +88,7 @@ int sms_ir_init(struct smscore_device_t 
+ 
+ 	dev->priv = coredev;
+ 	dev->driver_type = RC_DRIVER_IR_RAW;
+-	dev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(dev, RC_BIT_ALL);
+ 	dev->map_name = sms_get_board(board_id)->rc_codes;
+ 	dev->driver_name = MODULE_NAME;
+ 
+--- a/drivers/media/i2c/ir-kbd-i2c.c
++++ b/drivers/media/i2c/ir-kbd-i2c.c
+@@ -431,8 +431,8 @@ static int ir_probe(struct i2c_client *c
+ 	 * Initialize the other fields of rc_dev
+ 	 */
+ 	rc->map_name       = ir->ir_codes;
+-	rc->allowed_protos = rc_type;
+-	rc->enabled_protocols = rc_type;
++	rc_set_allowed_protocols(rc, rc_type);
++	rc_set_enabled_protocols(rc, rc_type);
+ 	if (!rc->driver_name)
+ 		rc->driver_name = MODULE_NAME;
+ 
+--- a/drivers/media/pci/cx23885/cx23885-input.c
++++ b/drivers/media/pci/cx23885/cx23885-input.c
+@@ -346,7 +346,7 @@ int cx23885_input_init(struct cx23885_de
+ 	}
+ 	rc->dev.parent = &dev->pci->dev;
+ 	rc->driver_type = driver_type;
+-	rc->allowed_protos = allowed_protos;
++	rc_set_allowed_protocols(rc, allowed_protos);
+ 	rc->priv = kernel_ir;
+ 	rc->open = cx23885_input_ir_open;
+ 	rc->close = cx23885_input_ir_close;
+--- a/drivers/media/pci/cx88/cx88-input.c
++++ b/drivers/media/pci/cx88/cx88-input.c
+@@ -469,7 +469,7 @@ int cx88_ir_init(struct cx88_core *core,
+ 		dev->timeout = 10 * 1000 * 1000; /* 10 ms */
+ 	} else {
+ 		dev->driver_type = RC_DRIVER_SCANCODE;
+-		dev->allowed_protos = rc_type;
++		rc_set_allowed_protocols(dev, rc_type);
+ 	}
+ 
+ 	ir->core = core;
+--- a/drivers/media/rc/ati_remote.c
++++ b/drivers/media/rc/ati_remote.c
+@@ -784,7 +784,7 @@ static void ati_remote_rc_init(struct at
+ 
+ 	rdev->priv = ati_remote;
+ 	rdev->driver_type = RC_DRIVER_SCANCODE;
+-	rdev->allowed_protos = RC_BIT_OTHER;
++	rc_set_allowed_protocols(rdev, RC_BIT_OTHER);
+ 	rdev->driver_name = "ati_remote";
+ 
+ 	rdev->open = ati_remote_rc_open;
+--- a/drivers/media/rc/ene_ir.c
++++ b/drivers/media/rc/ene_ir.c
+@@ -1059,7 +1059,7 @@ static int ene_probe(struct pnp_dev *pnp
+ 		learning_mode_force = false;
+ 
+ 	rdev->driver_type = RC_DRIVER_IR_RAW;
+-	rdev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+ 	rdev->priv = dev;
+ 	rdev->open = ene_open;
+ 	rdev->close = ene_close;
+--- a/drivers/media/rc/fintek-cir.c
++++ b/drivers/media/rc/fintek-cir.c
+@@ -541,7 +541,7 @@ static int fintek_probe(struct pnp_dev *
+ 	/* Set up the rc device */
+ 	rdev->priv = fintek;
+ 	rdev->driver_type = RC_DRIVER_IR_RAW;
+-	rdev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+ 	rdev->open = fintek_open;
+ 	rdev->close = fintek_close;
+ 	rdev->input_name = FINTEK_DESCRIPTION;
+--- a/drivers/media/rc/gpio-ir-recv.c
++++ b/drivers/media/rc/gpio-ir-recv.c
+@@ -145,9 +145,9 @@ static int gpio_ir_recv_probe(struct pla
+ 	rcdev->dev.parent = &pdev->dev;
+ 	rcdev->driver_name = GPIO_IR_DRIVER_NAME;
+ 	if (pdata->allowed_protos)
+-		rcdev->allowed_protos = pdata->allowed_protos;
++		rc_set_allowed_protocols(rcdev, pdata->allowed_protos);
+ 	else
+-		rcdev->allowed_protos = RC_BIT_ALL;
++		rc_set_allowed_protocols(rcdev, RC_BIT_ALL);
+ 	rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;
+ 
+ 	gpio_dev->rcdev = rcdev;
+--- a/drivers/media/rc/iguanair.c
++++ b/drivers/media/rc/iguanair.c
+@@ -494,7 +494,7 @@ static int iguanair_probe(struct usb_int
+ 	usb_to_input_id(ir->udev, &rc->input_id);
+ 	rc->dev.parent = &intf->dev;
+ 	rc->driver_type = RC_DRIVER_IR_RAW;
+-	rc->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rc, RC_BIT_ALL);
+ 	rc->priv = ir;
+ 	rc->open = iguanair_open;
+ 	rc->close = iguanair_close;
+--- a/drivers/media/rc/imon.c
++++ b/drivers/media/rc/imon.c
+@@ -1017,7 +1017,7 @@ static int imon_ir_change_protocol(struc
+ 	unsigned char ir_proto_packet[] = {
+ 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
+ 
+-	if (*rc_type && !(*rc_type & rc->allowed_protos))
++	if (*rc_type && !rc_protocols_allowed(rc, *rc_type))
+ 		dev_warn(dev, "Looks like you're trying to use an IR protocol "
+ 			 "this device does not support\n");
+ 
+@@ -1867,7 +1867,8 @@ static struct rc_dev *imon_init_rdev(str
+ 
+ 	rdev->priv = ictx;
+ 	rdev->driver_type = RC_DRIVER_SCANCODE;
+-	rdev->allowed_protos = RC_BIT_OTHER | RC_BIT_RC6_MCE; /* iMON PAD or MCE */
++					/* iMON PAD or MCE */
++	rc_set_allowed_protocols(rdev, RC_BIT_OTHER | RC_BIT_RC6_MCE);
+ 	rdev->change_protocol = imon_ir_change_protocol;
+ 	rdev->driver_name = MOD_NAME;
+ 
+@@ -1880,7 +1881,7 @@ static struct rc_dev *imon_init_rdev(str
+ 
+ 	if (ictx->product == 0xffdc) {
+ 		imon_get_ffdc_type(ictx);
+-		rdev->allowed_protos = ictx->rc_type;
++		rc_set_allowed_protocols(rdev, ictx->rc_type);
+ 	}
+ 
+ 	imon_set_display_type(ictx);
+--- a/drivers/media/rc/ir-jvc-decoder.c
++++ b/drivers/media/rc/ir-jvc-decoder.c
+@@ -47,7 +47,7 @@ static int ir_jvc_decode(struct rc_dev *
+ {
+ 	struct jvc_dec *data = &dev->raw->jvc;
+ 
+-	if (!(dev->enabled_protocols & RC_BIT_JVC))
++	if (!rc_protocols_enabled(dev, RC_BIT_JVC))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+--- a/drivers/media/rc/ir-lirc-codec.c
++++ b/drivers/media/rc/ir-lirc-codec.c
+@@ -35,7 +35,7 @@ static int ir_lirc_decode(struct rc_dev 
+ 	struct lirc_codec *lirc = &dev->raw->lirc;
+ 	int sample;
+ 
+-	if (!(dev->enabled_protocols & RC_BIT_LIRC))
++	if (!rc_protocols_enabled(dev, RC_BIT_LIRC))
+ 		return 0;
+ 
+ 	if (!dev->raw->lirc.drv || !dev->raw->lirc.drv->rbuf)
+--- a/drivers/media/rc/ir-mce_kbd-decoder.c
++++ b/drivers/media/rc/ir-mce_kbd-decoder.c
+@@ -216,7 +216,7 @@ static int ir_mce_kbd_decode(struct rc_d
+ 	u32 scancode;
+ 	unsigned long delay;
+ 
+-	if (!(dev->enabled_protocols & RC_BIT_MCE_KBD))
++	if (!rc_protocols_enabled(dev, RC_BIT_MCE_KBD))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+--- a/drivers/media/rc/ir-nec-decoder.c
++++ b/drivers/media/rc/ir-nec-decoder.c
+@@ -52,7 +52,7 @@ static int ir_nec_decode(struct rc_dev *
+ 	u8 address, not_address, command, not_command;
+ 	bool send_32bits = false;
+ 
+-	if (!(dev->enabled_protocols & RC_BIT_NEC))
++	if (!rc_protocols_enabled(dev, RC_BIT_NEC))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+--- a/drivers/media/rc/ir-raw.c
++++ b/drivers/media/rc/ir-raw.c
+@@ -256,7 +256,7 @@ int ir_raw_event_register(struct rc_dev 
+ 		return -ENOMEM;
+ 
+ 	dev->raw->dev = dev;
+-	dev->enabled_protocols = ~0;
++	rc_set_enabled_protocols(dev, ~0);
+ 	rc = kfifo_alloc(&dev->raw->kfifo,
+ 			 sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
+ 			 GFP_KERNEL);
+--- a/drivers/media/rc/ir-rc5-decoder.c
++++ b/drivers/media/rc/ir-rc5-decoder.c
+@@ -52,7 +52,7 @@ static int ir_rc5_decode(struct rc_dev *
+ 	u8 toggle;
+ 	u32 scancode;
+ 
+-	if (!(dev->enabled_protocols & (RC_BIT_RC5 | RC_BIT_RC5X)))
++	if (!rc_protocols_enabled(dev, RC_BIT_RC5 | RC_BIT_RC5X))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+@@ -128,7 +128,7 @@ again:
+ 		if (data->wanted_bits == RC5X_NBITS) {
+ 			/* RC5X */
+ 			u8 xdata, command, system;
+-			if (!(dev->enabled_protocols & RC_BIT_RC5X)) {
++			if (!rc_protocols_enabled(dev, RC_BIT_RC5X)) {
+ 				data->state = STATE_INACTIVE;
+ 				return 0;
+ 			}
+@@ -145,7 +145,7 @@ again:
+ 		} else {
+ 			/* RC5 */
+ 			u8 command, system;
+-			if (!(dev->enabled_protocols & RC_BIT_RC5)) {
++			if (!rc_protocols_enabled(dev, RC_BIT_RC5)) {
+ 				data->state = STATE_INACTIVE;
+ 				return 0;
+ 			}
+--- a/drivers/media/rc/ir-rc5-sz-decoder.c
++++ b/drivers/media/rc/ir-rc5-sz-decoder.c
+@@ -48,7 +48,7 @@ static int ir_rc5_sz_decode(struct rc_de
+ 	u8 toggle, command, system;
+ 	u32 scancode;
+ 
+-	if (!(dev->enabled_protocols & RC_BIT_RC5_SZ))
++	if (!rc_protocols_enabled(dev, RC_BIT_RC5_SZ))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+--- a/drivers/media/rc/ir-rc6-decoder.c
++++ b/drivers/media/rc/ir-rc6-decoder.c
+@@ -89,9 +89,9 @@ static int ir_rc6_decode(struct rc_dev *
+ 	u32 scancode;
+ 	u8 toggle;
+ 
+-	if (!(dev->enabled_protocols &
+-	      (RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 |
+-	       RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE)))
++	if (!rc_protocols_enabled(dev, RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 |
++				  RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 |
++				  RC_BIT_RC6_MCE))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+--- a/drivers/media/rc/ir-sanyo-decoder.c
++++ b/drivers/media/rc/ir-sanyo-decoder.c
+@@ -58,7 +58,7 @@ static int ir_sanyo_decode(struct rc_dev
+ 	u32 scancode;
+ 	u8 address, command, not_command;
+ 
+-	if (!(dev->enabled_protocols & RC_BIT_SANYO))
++	if (!rc_protocols_enabled(dev, RC_BIT_SANYO))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+--- a/drivers/media/rc/ir-sony-decoder.c
++++ b/drivers/media/rc/ir-sony-decoder.c
+@@ -45,8 +45,8 @@ static int ir_sony_decode(struct rc_dev 
+ 	u32 scancode;
+ 	u8 device, subdevice, function;
+ 
+-	if (!(dev->enabled_protocols &
+-	      (RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20)))
++	if (!rc_protocols_enabled(dev, RC_BIT_SONY12 | RC_BIT_SONY15 |
++				  RC_BIT_SONY20))
+ 		return 0;
+ 
+ 	if (!is_timing_event(ev)) {
+@@ -124,7 +124,7 @@ static int ir_sony_decode(struct rc_dev 
+ 
+ 		switch (data->count) {
+ 		case 12:
+-			if (!(dev->enabled_protocols & RC_BIT_SONY12)) {
++			if (!rc_protocols_enabled(dev, RC_BIT_SONY12)) {
+ 				data->state = STATE_INACTIVE;
+ 				return 0;
+ 			}
+@@ -133,7 +133,7 @@ static int ir_sony_decode(struct rc_dev 
+ 			function  = bitrev8((data->bits >>  4) & 0xFE);
+ 			break;
+ 		case 15:
+-			if (!(dev->enabled_protocols & RC_BIT_SONY15)) {
++			if (!rc_protocols_enabled(dev, RC_BIT_SONY15)) {
+ 				data->state = STATE_INACTIVE;
+ 				return 0;
+ 			}
+@@ -142,7 +142,7 @@ static int ir_sony_decode(struct rc_dev 
+ 			function  = bitrev8((data->bits >>  7) & 0xFE);
+ 			break;
+ 		case 20:
+-			if (!(dev->enabled_protocols & RC_BIT_SONY20)) {
++			if (!rc_protocols_enabled(dev, RC_BIT_SONY20)) {
+ 				data->state = STATE_INACTIVE;
+ 				return 0;
+ 			}
+--- a/drivers/media/rc/ite-cir.c
++++ b/drivers/media/rc/ite-cir.c
+@@ -1563,7 +1563,7 @@ static int ite_probe(struct pnp_dev *pde
+ 	/* set up ir-core props */
+ 	rdev->priv = itdev;
+ 	rdev->driver_type = RC_DRIVER_IR_RAW;
+-	rdev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+ 	rdev->open = ite_open;
+ 	rdev->close = ite_close;
+ 	rdev->s_idle = ite_s_idle;
+--- a/drivers/media/rc/mceusb.c
++++ b/drivers/media/rc/mceusb.c
+@@ -1217,7 +1217,7 @@ static struct rc_dev *mceusb_init_rc_dev
+ 	rc->dev.parent = dev;
+ 	rc->priv = ir;
+ 	rc->driver_type = RC_DRIVER_IR_RAW;
+-	rc->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rc, RC_BIT_ALL);
+ 	rc->timeout = MS_TO_NS(100);
+ 	if (!ir->flags.no_tx) {
+ 		rc->s_tx_mask = mceusb_set_tx_mask;
+--- a/drivers/media/rc/nuvoton-cir.c
++++ b/drivers/media/rc/nuvoton-cir.c
+@@ -1042,7 +1042,7 @@ static int nvt_probe(struct pnp_dev *pde
+ 	/* Set up the rc device */
+ 	rdev->priv = nvt;
+ 	rdev->driver_type = RC_DRIVER_IR_RAW;
+-	rdev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+ 	rdev->open = nvt_open;
+ 	rdev->close = nvt_close;
+ 	rdev->tx_ir = nvt_tx_ir;
+--- a/drivers/media/rc/rc-loopback.c
++++ b/drivers/media/rc/rc-loopback.c
+@@ -195,7 +195,7 @@ static int __init loop_init(void)
+ 	rc->map_name		= RC_MAP_EMPTY;
+ 	rc->priv		= &loopdev;
+ 	rc->driver_type		= RC_DRIVER_IR_RAW;
+-	rc->allowed_protos	= RC_BIT_ALL;
++	rc_set_allowed_protocols(rc, RC_BIT_ALL);
+ 	rc->timeout		= 100 * 1000 * 1000; /* 100 ms */
+ 	rc->min_timeout		= 1;
+ 	rc->max_timeout		= UINT_MAX;
+--- a/drivers/media/rc/rc-main.c
++++ b/drivers/media/rc/rc-main.c
+@@ -633,6 +633,7 @@ EXPORT_SYMBOL_GPL(rc_repeat);
+ static void ir_do_keydown(struct rc_dev *dev, int scancode,
+ 			  u32 keycode, u8 toggle)
+ {
++	struct rc_scancode_filter *filter;
+ 	bool new_event = !dev->keypressed ||
+ 			 dev->last_scancode != scancode ||
+ 			 dev->last_toggle != toggle;
+@@ -640,6 +641,11 @@ static void ir_do_keydown(struct rc_dev 
+ 	if (new_event && dev->keypressed)
+ 		ir_do_keyup(dev, false);
+ 
++	/* Generic scancode filtering */
++	filter = &dev->scancode_filters[RC_FILTER_NORMAL];
++	if (filter->mask && ((scancode ^ filter->data) & filter->mask))
++		return;
++
+ 	input_event(dev->input_dev, EV_MSC, MSC_SCAN, scancode);
+ 
+ 	if (new_event && keycode != KEY_RESERVED) {
+@@ -795,13 +801,38 @@ static struct {
+ };
+ 
+ /**
+- * show_protocols() - shows the current IR protocol(s)
++ * struct rc_filter_attribute - Device attribute relating to a filter type.
++ * @attr:	Device attribute.
++ * @type:	Filter type.
++ * @mask:	false for filter value, true for filter mask.
++ */
++struct rc_filter_attribute {
++	struct device_attribute		attr;
++	enum rc_filter_type		type;
++	bool				mask;
++};
++#define to_rc_filter_attr(a) container_of(a, struct rc_filter_attribute, attr)
++
++#define RC_PROTO_ATTR(_name, _mode, _show, _store, _type)		\
++	struct rc_filter_attribute dev_attr_##_name = {			\
++		.attr = __ATTR(_name, _mode, _show, _store),		\
++		.type = (_type),					\
++	}
++#define RC_FILTER_ATTR(_name, _mode, _show, _store, _type, _mask)	\
++	struct rc_filter_attribute dev_attr_##_name = {			\
++		.attr = __ATTR(_name, _mode, _show, _store),		\
++		.type = (_type),					\
++		.mask = (_mask),					\
++	}
++
++/**
++ * show_protocols() - shows the current/wakeup IR protocol(s)
+  * @device:	the device descriptor
+  * @mattr:	the device attribute struct (unused)
+  * @buf:	a pointer to the output buffer
+  *
+  * This routine is a callback routine for input read the IR protocol type(s).
+- * it is trigged by reading /sys/class/rc/rc?/protocols.
++ * it is trigged by reading /sys/class/rc/rc?/[wakeup_]protocols.
+  * It returns the protocol names of supported protocols.
+  * Enabled protocols are printed in brackets.
+  *
+@@ -812,6 +843,7 @@ static ssize_t show_protocols(struct dev
+ 			      struct device_attribute *mattr, char *buf)
+ {
+ 	struct rc_dev *dev = to_rc_dev(device);
++	struct rc_filter_attribute *fattr = to_rc_filter_attr(mattr);
+ 	u64 allowed, enabled;
+ 	char *tmp = buf;
+ 	int i;
+@@ -822,9 +854,10 @@ static ssize_t show_protocols(struct dev
+ 
+ 	mutex_lock(&dev->lock);
+ 
+-	enabled = dev->enabled_protocols;
+-	if (dev->driver_type == RC_DRIVER_SCANCODE)
+-		allowed = dev->allowed_protos;
++	enabled = dev->enabled_protocols[fattr->type];
++	if (dev->driver_type == RC_DRIVER_SCANCODE ||
++	    fattr->type == RC_FILTER_WAKEUP)
++		allowed = dev->allowed_protocols[fattr->type];
+ 	else if (dev->raw)
+ 		allowed = ir_raw_get_allowed_protocols();
+ 	else {
+@@ -856,14 +889,14 @@ static ssize_t show_protocols(struct dev
+ }
+ 
+ /**
+- * store_protocols() - changes the current IR protocol(s)
++ * store_protocols() - changes the current/wakeup IR protocol(s)
+  * @device:	the device descriptor
+  * @mattr:	the device attribute struct (unused)
+  * @buf:	a pointer to the input buffer
+  * @len:	length of the input buffer
+  *
+  * This routine is for changing the IR protocol type.
+- * It is trigged by writing to /sys/class/rc/rc?/protocols.
++ * It is trigged by writing to /sys/class/rc/rc?/[wakeup_]protocols.
+  * Writing "+proto" will add a protocol to the list of enabled protocols.
+  * Writing "-proto" will remove a protocol from the list of enabled protocols.
+  * Writing "proto" will enable only "proto".
+@@ -880,12 +913,15 @@ static ssize_t store_protocols(struct de
+ 			       size_t len)
+ {
+ 	struct rc_dev *dev = to_rc_dev(device);
++	struct rc_filter_attribute *fattr = to_rc_filter_attr(mattr);
+ 	bool enable, disable;
+ 	const char *tmp;
+-	u64 type;
++	u64 old_type, type;
+ 	u64 mask;
+ 	int rc, i, count = 0;
+ 	ssize_t ret;
++	int (*change_protocol)(struct rc_dev *dev, u64 *rc_type);
++	struct rc_scancode_filter local_filter, *filter;
+ 
+ 	/* Device is being removed */
+ 	if (!dev)
+@@ -898,7 +934,8 @@ static ssize_t store_protocols(struct de
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+-	type = dev->enabled_protocols;
++	old_type = dev->enabled_protocols[fattr->type];
++	type = old_type;
+ 
+ 	while ((tmp = strsep((char **) &data, " \n")) != NULL) {
+ 		if (!*tmp)
+@@ -946,8 +983,10 @@ static ssize_t store_protocols(struct de
+ 		goto out;
+ 	}
+ 
+-	if (dev->change_protocol) {
+-		rc = dev->change_protocol(dev, &type);
++	change_protocol = (fattr->type == RC_FILTER_NORMAL)
++		? dev->change_protocol : dev->change_wakeup_protocol;
++	if (change_protocol) {
++		rc = change_protocol(dev, &type);
+ 		if (rc < 0) {
+ 			IR_dprintk(1, "Error setting protocols to 0x%llx\n",
+ 				   (long long)type);
+@@ -956,10 +995,40 @@ static ssize_t store_protocols(struct de
+ 		}
+ 	}
+ 
+-	dev->enabled_protocols = type;
++	dev->enabled_protocols[fattr->type] = type;
+ 	IR_dprintk(1, "Current protocol(s): 0x%llx\n",
+ 		   (long long)type);
+ 
++	/*
++	 * If the protocol is changed the filter needs updating.
++	 * Try setting the same filter with the new protocol (if any).
++	 * Fall back to clearing the filter.
++	 */
++	filter = &dev->scancode_filters[fattr->type];
++	if (old_type != type && filter->mask) {
++		local_filter = *filter;
++		if (!type) {
++			/* no protocol => clear filter */
++			ret = -1;
++		} else if (!dev->s_filter) {
++			/* generic filtering => accept any filter */
++			ret = 0;
++		} else {
++			/* hardware filtering => try setting, otherwise clear */
++			ret = dev->s_filter(dev, fattr->type, &local_filter);
++		}
++		if (ret < 0) {
++			/* clear the filter */
++			local_filter.data = 0;
++			local_filter.mask = 0;
++			if (dev->s_filter)
++				dev->s_filter(dev, fattr->type, &local_filter);
++		}
++
++		/* commit the new filter */
++		*filter = local_filter;
++	}
++
+ 	ret = len;
+ 
+ out:
+@@ -967,6 +1036,115 @@ out:
+ 	return ret;
+ }
+ 
++/**
++ * show_filter() - shows the current scancode filter value or mask
++ * @device:	the device descriptor
++ * @attr:	the device attribute struct
++ * @buf:	a pointer to the output buffer
++ *
++ * This routine is a callback routine to read a scancode filter value or mask.
++ * It is trigged by reading /sys/class/rc/rc?/[wakeup_]filter[_mask].
++ * It prints the current scancode filter value or mask of the appropriate filter
++ * type in hexadecimal into @buf and returns the size of the buffer.
++ *
++ * Bits of the filter value corresponding to set bits in the filter mask are
++ * compared against input scancodes and non-matching scancodes are discarded.
++ *
++ * dev->lock is taken to guard against races between device registration,
++ * store_filter and show_filter.
++ */
++static ssize_t show_filter(struct device *device,
++			   struct device_attribute *attr,
++			   char *buf)
++{
++	struct rc_dev *dev = to_rc_dev(device);
++	struct rc_filter_attribute *fattr = to_rc_filter_attr(attr);
++	u32 val;
++
++	/* Device is being removed */
++	if (!dev)
++		return -EINVAL;
++
++	mutex_lock(&dev->lock);
++	if (fattr->mask)
++		val = dev->scancode_filters[fattr->type].mask;
++	else
++		val = dev->scancode_filters[fattr->type].data;
++	mutex_unlock(&dev->lock);
++
++	return sprintf(buf, "%#x\n", val);
++}
++
++/**
++ * store_filter() - changes the scancode filter value
++ * @device:	the device descriptor
++ * @attr:	the device attribute struct
++ * @buf:	a pointer to the input buffer
++ * @len:	length of the input buffer
++ *
++ * This routine is for changing a scancode filter value or mask.
++ * It is trigged by writing to /sys/class/rc/rc?/[wakeup_]filter[_mask].
++ * Returns -EINVAL if an invalid filter value for the current protocol was
++ * specified or if scancode filtering is not supported by the driver, otherwise
++ * returns @len.
++ *
++ * Bits of the filter value corresponding to set bits in the filter mask are
++ * compared against input scancodes and non-matching scancodes are discarded.
++ *
++ * dev->lock is taken to guard against races between device registration,
++ * store_filter and show_filter.
++ */
++static ssize_t store_filter(struct device *device,
++			    struct device_attribute *attr,
++			    const char *buf,
++			    size_t count)
++{
++	struct rc_dev *dev = to_rc_dev(device);
++	struct rc_filter_attribute *fattr = to_rc_filter_attr(attr);
++	struct rc_scancode_filter local_filter, *filter;
++	int ret;
++	unsigned long val;
++
++	/* Device is being removed */
++	if (!dev)
++		return -EINVAL;
++
++	ret = kstrtoul(buf, 0, &val);
++	if (ret < 0)
++		return ret;
++
++	/* Scancode filter not supported (but still accept 0) */
++	if (!dev->s_filter && fattr->type != RC_FILTER_NORMAL)
++		return val ? -EINVAL : count;
++
++	mutex_lock(&dev->lock);
++
++	/* Tell the driver about the new filter */
++	filter = &dev->scancode_filters[fattr->type];
++	local_filter = *filter;
++	if (fattr->mask)
++		local_filter.mask = val;
++	else
++		local_filter.data = val;
++	if (!dev->enabled_protocols[fattr->type] && local_filter.mask) {
++		/* refuse to set a filter unless a protocol is enabled */
++		ret = -EINVAL;
++		goto unlock;
++	}
++	if (dev->s_filter) {
++		ret = dev->s_filter(dev, fattr->type, &local_filter);
++		if (ret < 0)
++			goto unlock;
++	}
++
++	/* Success, commit the new filter */
++	*filter = local_filter;
++
++unlock:
++	mutex_unlock(&dev->lock);
++	return (ret < 0) ? ret : count;
++}
++
+ static void rc_dev_release(struct device *device)
+ {
+ }
+@@ -996,11 +1174,26 @@ static int rc_dev_uevent(struct device *
+ /*
+  * Static device attribute struct with the sysfs attributes for IR's
+  */
+-static DEVICE_ATTR(protocols, S_IRUGO | S_IWUSR,
+-		   show_protocols, store_protocols);
++static RC_PROTO_ATTR(protocols, S_IRUGO | S_IWUSR,
++		     show_protocols, store_protocols, RC_FILTER_NORMAL);
++static RC_PROTO_ATTR(wakeup_protocols, S_IRUGO | S_IWUSR,
++		     show_protocols, store_protocols, RC_FILTER_WAKEUP);
++static RC_FILTER_ATTR(filter, S_IRUGO|S_IWUSR,
++		      show_filter, store_filter, RC_FILTER_NORMAL, false);
++static RC_FILTER_ATTR(filter_mask, S_IRUGO|S_IWUSR,
++		      show_filter, store_filter, RC_FILTER_NORMAL, true);
++static RC_FILTER_ATTR(wakeup_filter, S_IRUGO|S_IWUSR,
++		      show_filter, store_filter, RC_FILTER_WAKEUP, false);
++static RC_FILTER_ATTR(wakeup_filter_mask, S_IRUGO|S_IWUSR,
++		      show_filter, store_filter, RC_FILTER_WAKEUP, true);
+ 
+ static struct attribute *rc_dev_attrs[] = {
+-	&dev_attr_protocols.attr,
++	&dev_attr_protocols.attr.attr,
++	&dev_attr_wakeup_protocols.attr.attr,
++	&dev_attr_filter.attr.attr,
++	&dev_attr_filter_mask.attr.attr,
++	&dev_attr_wakeup_filter.attr.attr,
++	&dev_attr_wakeup_filter_mask.attr.attr,
+ 	NULL,
+ };
+ 
+@@ -1091,14 +1284,6 @@ int rc_register_device(struct rc_dev *de
+ 	if (dev->close)
+ 		dev->input_dev->close = ir_close;
+ 
+-	/*
+-	 * Take the lock here, as the device sysfs node will appear
+-	 * when device_add() is called, which may trigger an ir-keytable udev
+-	 * rule, which will in turn call show_protocols and access
+-	 * dev->enabled_protocols before it has been initialized.
+-	 */
+-	mutex_lock(&dev->lock);
+-
+ 	do {
+ 		devno = find_first_zero_bit(ir_core_dev_number,
+ 					    IRRCV_NUM_DEVICES);
+@@ -1107,6 +1292,14 @@ int rc_register_device(struct rc_dev *de
+ 			return -ENOMEM;
+ 	} while (test_and_set_bit(devno, ir_core_dev_number));
+ 
++	/*
++	 * Take the lock here, as the device sysfs node will appear
++	 * when device_add() is called, which may trigger an ir-keytable udev
++	 * rule, which will in turn call show_protocols and access
++	 * dev->enabled_protocols before it has been initialized.
++	 */
++	mutex_lock(&dev->lock);
++
+ 	dev->devno = devno;
+ 	dev_set_name(&dev->dev, "rc%ld", dev->devno);
+ 	dev_set_drvdata(&dev->dev, dev);
+@@ -1172,7 +1365,7 @@ int rc_register_device(struct rc_dev *de
+ 		rc = dev->change_protocol(dev, &rc_type);
+ 		if (rc < 0)
+ 			goto out_raw;
+-		dev->enabled_protocols = rc_type;
++		dev->enabled_protocols[RC_FILTER_NORMAL] = rc_type;
+ 	}
+ 
+ 	mutex_unlock(&dev->lock);
+--- a/drivers/media/rc/redrat3.c
++++ b/drivers/media/rc/redrat3.c
+@@ -922,7 +922,7 @@ static struct rc_dev *redrat3_init_rc_de
+ 	rc->dev.parent = dev;
+ 	rc->priv = rr3;
+ 	rc->driver_type = RC_DRIVER_IR_RAW;
+-	rc->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rc, RC_BIT_ALL);
+ 	rc->timeout = US_TO_NS(2750);
+ 	rc->tx_ir = redrat3_transmit_ir;
+ 	rc->s_tx_carrier = redrat3_set_tx_carrier;
+--- a/drivers/media/rc/st_rc.c
++++ b/drivers/media/rc/st_rc.c
+@@ -287,7 +287,7 @@ static int st_rc_probe(struct platform_d
+ 	st_rc_hardware_init(rc_dev);
+ 
+ 	rdev->driver_type = RC_DRIVER_IR_RAW;
+-	rdev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+ 	/* rx sampling rate is 10Mhz */
+ 	rdev->rx_resolution = 100;
+ 	rdev->timeout = US_TO_NS(MAX_SYMB_TIME);
+--- a/drivers/media/rc/streamzap.c
++++ b/drivers/media/rc/streamzap.c
+@@ -322,7 +322,7 @@ static struct rc_dev *streamzap_init_rc_
+ 	rdev->dev.parent = dev;
+ 	rdev->priv = sz;
+ 	rdev->driver_type = RC_DRIVER_IR_RAW;
+-	rdev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rdev, RC_BIT_ALL);
+ 	rdev->driver_name = DRIVER_NAME;
+ 	rdev->map_name = RC_MAP_STREAMZAP;
+ 
+--- a/drivers/media/rc/ttusbir.c
++++ b/drivers/media/rc/ttusbir.c
+@@ -318,7 +318,7 @@ static int ttusbir_probe(struct usb_inte
+ 	usb_to_input_id(tt->udev, &rc->input_id);
+ 	rc->dev.parent = &intf->dev;
+ 	rc->driver_type = RC_DRIVER_IR_RAW;
+-	rc->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(rc, RC_BIT_ALL);
+ 	rc->priv = tt;
+ 	rc->driver_name = DRIVER_NAME;
+ 	rc->map_name = RC_MAP_TT_1500;
+--- a/drivers/media/rc/winbond-cir.c
++++ b/drivers/media/rc/winbond-cir.c
+@@ -1082,7 +1082,7 @@ wbcir_probe(struct pnp_dev *device, cons
+ 	data->dev->dev.parent = &device->dev;
+ 	data->dev->timeout = MS_TO_NS(100);
+ 	data->dev->rx_resolution = US_TO_NS(2);
+-	data->dev->allowed_protos = RC_BIT_ALL;
++	rc_set_allowed_protocols(data->dev, RC_BIT_ALL);
+ 
+ 	err = rc_register_device(data->dev);
+ 	if (err)
+--- a/drivers/media/usb/dvb-usb/dvb-usb-remote.c
++++ b/drivers/media/usb/dvb-usb/dvb-usb-remote.c
+@@ -272,7 +272,7 @@ static int rc_core_dvb_usb_remote_init(s
+ 	dev->driver_name = d->props.rc.core.module_name;
+ 	dev->map_name = d->props.rc.core.rc_codes;
+ 	dev->change_protocol = d->props.rc.core.change_protocol;
+-	dev->allowed_protos = d->props.rc.core.allowed_protos;
++	rc_set_allowed_protocols(dev, d->props.rc.core.allowed_protos);
+ 	dev->driver_type = d->props.rc.core.driver_type;
+ 	usb_to_input_id(d->udev, &dev->input_id);
+ 	dev->input_name = "IR-receiver inside an USB DVB receiver";
+--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
++++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+@@ -164,7 +164,7 @@ static int dvb_usbv2_remote_init(struct 
+ 	dev->driver_name = (char *) d->props->driver_name;
+ 	dev->map_name = d->rc.map_name;
+ 	dev->driver_type = d->rc.driver_type;
+-	dev->allowed_protos = d->rc.allowed_protos;
++	rc_set_allowed_protocols(dev, d->rc.allowed_protos);
+ 	dev->change_protocol = d->rc.change_protocol;
+ 	dev->priv = d;
+ 
+--- a/drivers/media/usb/em28xx/em28xx-input.c
++++ b/drivers/media/usb/em28xx/em28xx-input.c
+@@ -725,7 +725,7 @@ static int em28xx_ir_init(struct em28xx 
+ 		case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
+ 			rc->map_name = RC_MAP_HAUPPAUGE;
+ 			ir->get_key_i2c = em28xx_get_key_em_haup;
+-			rc->allowed_protos = RC_BIT_RC5;
++			rc_set_allowed_protocols(rc, RC_BIT_RC5);
+ 			break;
+ 		case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
+ 			rc->map_name = RC_MAP_WINFAST_USBII_DELUXE;
+@@ -741,7 +741,7 @@ static int em28xx_ir_init(struct em28xx 
+ 		switch (dev->chip_id) {
+ 		case CHIP_ID_EM2860:
+ 		case CHIP_ID_EM2883:
+-			rc->allowed_protos = RC_BIT_RC5 | RC_BIT_NEC;
++			rc_set_allowed_protocols(rc, RC_BIT_RC5 | RC_BIT_NEC);
+ 			ir->get_key = default_polling_getkey;
+ 			break;
+ 		case CHIP_ID_EM2884:
+@@ -749,8 +749,8 @@ static int em28xx_ir_init(struct em28xx 
+ 		case CHIP_ID_EM28174:
+ 		case CHIP_ID_EM28178:
+ 			ir->get_key = em2874_polling_getkey;
+-			rc->allowed_protos = RC_BIT_RC5 | RC_BIT_NEC |
+-					     RC_BIT_RC6_0;
++			rc_set_allowed_protocols(rc, RC_BIT_RC5 | RC_BIT_NEC |
++						 RC_BIT_RC6_0);
+ 			break;
+ 		default:
+ 			err = -ENODEV;
+--- a/drivers/media/usb/tm6000/tm6000-input.c
++++ b/drivers/media/usb/tm6000/tm6000-input.c
+@@ -422,7 +422,7 @@ int tm6000_ir_init(struct tm6000_core *d
+ 	ir->rc = rc;
+ 
+ 	/* input setup */
+-	rc->allowed_protos = RC_BIT_RC5 | RC_BIT_NEC;
++	rc_set_allowed_protocols(rc, RC_BIT_RC5 | RC_BIT_NEC);
+ 	/* Neded, in order to support NEC remotes with 24 or 32 bits */
+ 	rc->scanmask = 0xffff;
+ 	rc->priv = ir;
+--- a/include/media/rc-core.h
++++ b/include/media/rc-core.h
+@@ -35,6 +35,29 @@ enum rc_driver_type {
+ };
+ 
+ /**
++ * struct rc_scancode_filter - Filter scan codes.
++ * @data:	Scancode data to match.
++ * @mask:	Mask of bits of scancode to compare.
++ */
++struct rc_scancode_filter {
++	u32 data;
++	u32 mask;
++};
++
++/**
++ * enum rc_filter_type - Filter type constants.
++ * @RC_FILTER_NORMAL:	Filter for normal operation.
++ * @RC_FILTER_WAKEUP:	Filter for waking from suspend.
++ * @RC_FILTER_MAX:	Number of filter types.
++ */
++enum rc_filter_type {
++	RC_FILTER_NORMAL = 0,
++	RC_FILTER_WAKEUP,
++
++	RC_FILTER_MAX
++};
++
++/**
+  * struct rc_dev - represents a remote control device
+  * @dev: driver model's view of this device
+  * @input_name: name of the input child device
+@@ -50,8 +73,10 @@ enum rc_driver_type {
+  * @input_dev: the input child device used to communicate events to userspace
+  * @driver_type: specifies if protocol decoding is done in hardware or software
+  * @idle: used to keep track of RX state
+- * @allowed_protos: bitmask with the supported RC_BIT_* protocols
+- * @enabled_protocols: bitmask with the enabled RC_BIT_* protocols
++ * @allowed_protocols: bitmask with the supported RC_BIT_* protocols for each
++ *	filter type
++ * @enabled_protocols: bitmask with the enabled RC_BIT_* protocols for each
++ *	filter type
+  * @scanmask: some hardware decoders are not capable of providing the full
+  *	scancode to the application. As this is a hardware limit, we can't do
+  *	anything with it. Yet, as the same keycode table can be used with other
+@@ -70,7 +95,10 @@ enum rc_driver_type {
+  * @max_timeout: maximum timeout supported by device
+  * @rx_resolution : resolution (in ns) of input sampler
+  * @tx_resolution: resolution (in ns) of output sampler
++ * @scancode_filters: scancode filters (indexed by enum rc_filter_type)
+  * @change_protocol: allow changing the protocol used on hardware decoders
++ * @change_wakeup_protocol: allow changing the protocol used for wakeup
++ *	filtering
+  * @open: callback to allow drivers to enable polling/irq when IR input device
+  *	is opened.
+  * @close: callback to allow drivers to disable polling/irq when IR input device
+@@ -84,6 +112,7 @@ enum rc_driver_type {
+  *	device doesn't interrupt host until it sees IR pulses
+  * @s_learning_mode: enable wide band receiver used for learning
+  * @s_carrier_report: enable carrier reports
++ * @s_filter: set the scancode filter of a given type
+  */
+ struct rc_dev {
+ 	struct device			dev;
+@@ -99,8 +128,8 @@ struct rc_dev {
+ 	struct input_dev		*input_dev;
+ 	enum rc_driver_type		driver_type;
+ 	bool				idle;
+-	u64				allowed_protos;
+-	u64				enabled_protocols;
++	u64				allowed_protocols[RC_FILTER_MAX];
++	u64				enabled_protocols[RC_FILTER_MAX];
+ 	u32				users;
+ 	u32				scanmask;
+ 	void				*priv;
+@@ -116,7 +145,9 @@ struct rc_dev {
+ 	u32				max_timeout;
+ 	u32				rx_resolution;
+ 	u32				tx_resolution;
++	struct rc_scancode_filter	scancode_filters[RC_FILTER_MAX];
+ 	int				(*change_protocol)(struct rc_dev *dev, u64 *rc_type);
++	int				(*change_wakeup_protocol)(struct rc_dev *dev, u64 *rc_type);
+ 	int				(*open)(struct rc_dev *dev);
+ 	void				(*close)(struct rc_dev *dev);
+ 	int				(*s_tx_mask)(struct rc_dev *dev, u32 mask);
+@@ -127,10 +158,49 @@ struct rc_dev {
+ 	void				(*s_idle)(struct rc_dev *dev, bool enable);
+ 	int				(*s_learning_mode)(struct rc_dev *dev, int enable);
+ 	int				(*s_carrier_report) (struct rc_dev *dev, int enable);
++	int				(*s_filter)(struct rc_dev *dev,
++						    enum rc_filter_type type,
++						    struct rc_scancode_filter *filter);
+ };
+ 
+ #define to_rc_dev(d) container_of(d, struct rc_dev, dev)
+ 
++static inline bool rc_protocols_allowed(struct rc_dev *rdev, u64 protos)
++{
++	return rdev->allowed_protocols[RC_FILTER_NORMAL] & protos;
++}
++
++/* should be called prior to registration or with mutex held */
++static inline void rc_set_allowed_protocols(struct rc_dev *rdev, u64 protos)
++{
++	rdev->allowed_protocols[RC_FILTER_NORMAL] = protos;
++}
++
++static inline bool rc_protocols_enabled(struct rc_dev *rdev, u64 protos)
++{
++	return rdev->enabled_protocols[RC_FILTER_NORMAL] & protos;
++}
++
++/* should be called prior to registration or with mutex held */
++static inline void rc_set_enabled_protocols(struct rc_dev *rdev, u64 protos)
++{
++	rdev->enabled_protocols[RC_FILTER_NORMAL] = protos;
++}
++
++/* should be called prior to registration or with mutex held */
++static inline void rc_set_allowed_wakeup_protocols(struct rc_dev *rdev,
++						   u64 protos)
++{
++	rdev->allowed_protocols[RC_FILTER_WAKEUP] = protos;
++}
++
++/* should be called prior to registration or with mutex held */
++static inline void rc_set_enabled_wakeup_protocols(struct rc_dev *rdev,
++						   u64 protos)
++{
++	rdev->enabled_protocols[RC_FILTER_WAKEUP] = protos;
++}
++
+ /*
+  * From rc-main.c
+  * Those functions can be used on any type of Remote Controller. They
diff --git a/trunk/target/linux/sunxi/patches-3.14/300-1-dt-sun7i-add-pcduino3.patch b/trunk/target/linux/sunxi/patches-3.14/300-1-dt-sun7i-add-pcduino3.patch
new file mode 100644
index 00000000..9b844262
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/300-1-dt-sun7i-add-pcduino3.patch
@@ -0,0 +1,39 @@
+From c6c022c42e6b9115cbc36dce3f9100b90c2d2b06 Mon Sep 17 00:00:00 2001
+From: Zoltan HERPAI <wigyori@uid0.hu>
+Date: Tue, 20 May 2014 22:28:49 +0200
+Subject: [PATCH] ARM: sun7i: dt: Add board support for LinkSprite pcDuino V3
+
+The LinkSprite pcDuino V3 is an A20-based revision of the
+earlier pcDuinos. This series will add support for the board,
+along with some of its devices where the driver is accepted or
+soon-to-be-accepted into mainline.
+
+Changes since v2:
+ - update MMC entry to comply with upstream
+ - unify the 4 patches into one
+
+Changes since v1:
+ - fix cosmetic issues
+ - fix i2c entry
+ - remove unnecessary input bindings include
+ - add MMC support
+
+Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
+---
+ arch/arm/boot/dts/Makefile               |   3 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 119 +++++++++++++++++++++++++++++++
+ 2 files changed, 121 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -292,7 +292,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
+ 	sun6i-a31-colombus.dtb \
+ 	sun7i-a20-cubieboard2.dtb \
+ 	sun7i-a20-cubietruck.dtb \
+-	sun7i-a20-olinuxino-micro.dtb
++	sun7i-a20-olinuxino-micro.dtb \
++	sun7i-a20-pcduino3.dtb
+ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
+ 	tegra20-iris-512.dtb \
+ 	tegra20-medcom-wide.dtb \
diff --git a/trunk/target/linux/sunxi/patches-3.14/300-2-dt-sun7i-add-pcduino3-dts.patch b/trunk/target/linux/sunxi/patches-3.14/300-2-dt-sun7i-add-pcduino3-dts.patch
new file mode 100644
index 00000000..bb2b923d
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/300-2-dt-sun7i-add-pcduino3-dts.patch
@@ -0,0 +1,156 @@
+--- /dev/null
++++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+@@ -0,0 +1,153 @@
++/*
++ * Copyright 2014 Zoltan HERPAI
++ * Zoltan HERPAI <wigyori@uid0.hu>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "sun7i-a20.dtsi"
++/include/ "sunxi-ahci-reg.dtsi"
++/include/ "sun4i-a10-usb-vbus-reg.dtsi"
++#include <dt-bindings/input/input.h>
++
++/ {
++	model = "LinkSprite pcDuino V3";
++	compatible = "linksprite,a20-pcduino", "allwinner,sun7i-a20";
++
++	aliases {
++		spi0 = &spi1;
++		spi1 = &spi2;
++	};
++
++	soc@01c00000 {
++		spi1: spi@01c06000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi1_pins_a>;
++			status = "okay";
++		};
++
++		spi2: spi@01c17000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi2_pins_a>;
++			status = "okay";
++		};
++
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			status = "okay";
++		};
++
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
++		pinctrl@01c20800 {
++			led_pins_pcduino3: led_pins@0 {
++				allwinner,pins = "PH2";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <1>;
++				allwinner,pull = <0>;
++			};
++		};
++
++		lradc: lradc@01c22800 {
++			allwinner,chan0-step = <200>;
++			linux,chan0-keycodes = <KEY_VOLUMEUP KEY_VOLUMEDOWN
++						KEY_MENU KEY_SEARCH KEY_HOME
++						KEY_ESC KEY_ENTER>;
++			status = "okay";
++		};
++
++		uart0: serial@01c28000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart0_pins_a>;
++			status = "okay";
++		};
++
++		uart6: serial@01c29800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart6_pins_a>;
++			status = "okay";
++		};
++
++		uart7: serial@01c29c00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart7_pins_a>;
++			status = "okay";
++		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++		};
++
++		i2c1: i2c@01c2b000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c1_pins_a>;
++			status = "okay";
++		};
++
++		i2c2: i2c@01c2b400 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c2_pins_a>;
++			status = "okay";
++		};
++
++		gmac: ethernet@01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_mii_a>;
++			phy = <&phy1>;
++			phy-mode = "mii";
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_pcduino3>;
++
++		green {
++			label = "a20-pcduino:green:usr";
++			gpios = <&pio 7 2 0>;
++			default-state = "on";
++		};
++	};
++};
diff --git a/trunk/target/linux/sunxi/patches-3.14/301-dt-sun7i-update-pcduino3.patch b/trunk/target/linux/sunxi/patches-3.14/301-dt-sun7i-update-pcduino3.patch
new file mode 100644
index 00000000..7dfc95a9
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/301-dt-sun7i-update-pcduino3.patch
@@ -0,0 +1,12 @@
+--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
++++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+@@ -12,8 +12,7 @@
+ 
+ /dts-v1/;
+ /include/ "sun7i-a20.dtsi"
+-/include/ "sunxi-ahci-reg.dtsi"
+-/include/ "sun4i-a10-usb-vbus-reg.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ #include <dt-bindings/input/input.h>
+ 
+ / {
diff --git a/trunk/target/linux/sunxi/patches-3.14/302-1-dt-sun7i-add-bananapi-Makefile.patch b/trunk/target/linux/sunxi/patches-3.14/302-1-dt-sun7i-add-bananapi-Makefile.patch
new file mode 100644
index 00000000..88fad315
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/302-1-dt-sun7i-add-bananapi-Makefile.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -290,6 +290,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
+ 	sun5i-a13-olinuxino.dtb \
+ 	sun5i-a13-olinuxino-micro.dtb \
+ 	sun6i-a31-colombus.dtb \
++	sun7i-a20-bananapi.dtb \
+ 	sun7i-a20-cubieboard2.dtb \
+ 	sun7i-a20-cubietruck.dtb \
+ 	sun7i-a20-olinuxino-micro.dtb \
diff --git a/trunk/target/linux/sunxi/patches-3.14/302-2-dt-sun7i-add-bananapi-dts.patch b/trunk/target/linux/sunxi/patches-3.14/302-2-dt-sun7i-add-bananapi-dts.patch
new file mode 100644
index 00000000..8e798ea1
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/302-2-dt-sun7i-add-bananapi-dts.patch
@@ -0,0 +1,163 @@
+--- /dev/null
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -0,0 +1,160 @@
++/*
++ * Copyright 2014 Zoltan HERPAI
++ * Zoltan HERPAI <wigyori@uid0.hu>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "sun7i-a20.dtsi"
++/include/ "sunxi-ahci-reg.dtsi"
++/include/ "sun4i-a10-usb-vbus-reg.dtsi"
++#include <dt-bindings/input/input.h>
++
++/ {
++	model = "Lemaker bananaPi";
++	compatible = "lemaker,bananapi", "allwinner,sun7i-a20";
++
++	aliases {
++		spi0 = &spi1;
++		spi1 = &spi2;
++	};
++
++	soc@01c00000 {
++		spi1: spi@01c06000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi1_pins_a>;
++			status = "okay";
++		};
++
++		spi2: spi@01c17000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi2_pins_a>;
++			status = "okay";
++		};
++
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_bananapi>;
++			cd-gpios = <&pio 7 10 0>; /* PH10 */
++			status = "okay";
++		};
++
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
++		pinctrl@01c20800 {
++			led_pins_bananapi: led_pins@0 {
++				allwinner,pins = "PH2";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <1>;
++				allwinner,pull = <0>;
++			};
++
++			mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
++				allwinner,pins = "PH10";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <1>;
++			};
++		};
++
++		lradc: lradc@01c22800 {
++			allwinner,chan0-step = <200>;
++			linux,chan0-keycodes = <KEY_VOLUMEUP KEY_VOLUMEDOWN
++						KEY_MENU KEY_SEARCH KEY_HOME
++						KEY_ESC KEY_ENTER>;
++			status = "okay";
++		};
++
++		uart0: serial@01c28000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart0_pins_a>;
++			status = "okay";
++		};
++
++		uart6: serial@01c29800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart6_pins_a>;
++			status = "okay";
++		};
++
++		uart7: serial@01c29c00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart7_pins_a>;
++			status = "okay";
++		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++		};
++
++		i2c1: i2c@01c2b000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c1_pins_a>;
++			status = "okay";
++		};
++
++		i2c2: i2c@01c2b400 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c2_pins_a>;
++			status = "okay";
++		};
++
++		gmac: ethernet@01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_mii_a>;
++			phy = <&phy1>;
++			phy-mode = "mii";
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_bananapi>;
++
++		green {
++			label = "bananapi:green:usr";
++			gpios = <&pio 7 2 0>;
++			default-state = "on";
++		};
++	};
++};
diff --git a/trunk/target/linux/sunxi/patches-3.14/303-dt-sun7i-update-bananapi.patch b/trunk/target/linux/sunxi/patches-3.14/303-dt-sun7i-update-bananapi.patch
new file mode 100644
index 00000000..60ea0ebe
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/303-dt-sun7i-update-bananapi.patch
@@ -0,0 +1,12 @@
+--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -12,8 +12,7 @@
+ 
+ /dts-v1/;
+ /include/ "sun7i-a20.dtsi"
+-/include/ "sunxi-ahci-reg.dtsi"
+-/include/ "sun4i-a10-usb-vbus-reg.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
+ #include <dt-bindings/input/input.h>
+ 
+ / {
diff --git a/trunk/target/linux/sunxi/patches-3.14/304-dt-sun7i-update-pcduino3-add-regulators.patch b/trunk/target/linux/sunxi/patches-3.14/304-dt-sun7i-update-pcduino3-add-regulators.patch
new file mode 100644
index 00000000..619deaa6
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/304-dt-sun7i-update-pcduino3-add-regulators.patch
@@ -0,0 +1,20 @@
+--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
++++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+@@ -149,4 +149,17 @@
+ 			default-state = "on";
+ 		};
+ 	};
++
++        reg_ahci_5v: ahci-5v {
++                status = "okay";
++        };
++
++        reg_usb1_vbus: usb1-vbus {
++                status = "okay";
++        };
++
++        reg_usb2_vbus: usb2-vbus {
++                status = "okay";
++        };
++
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/305-dt-sun7i-update-bananapi-add-regulators.patch b/trunk/target/linux/sunxi/patches-3.14/305-dt-sun7i-update-bananapi-add-regulators.patch
new file mode 100644
index 00000000..8eced493
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/305-dt-sun7i-update-bananapi-add-regulators.patch
@@ -0,0 +1,20 @@
+--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -156,4 +156,17 @@
+ 			default-state = "on";
+ 		};
+ 	};
++
++        reg_ahci_5v: ahci-5v {
++                status = "okay";
++        };
++
++        reg_usb1_vbus: usb1-vbus {
++                status = "okay";
++        };
++
++        reg_usb2_vbus: usb2-vbus {
++                status = "okay";
++        };
++
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/306-dt-sun7i-fix-gmac-on-bananapi.patch b/trunk/target/linux/sunxi/patches-3.14/306-dt-sun7i-fix-gmac-on-bananapi.patch
new file mode 100644
index 00000000..19934eac
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/306-dt-sun7i-fix-gmac-on-bananapi.patch
@@ -0,0 +1,46 @@
+--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -86,6 +86,13 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <1>;
+ 			};
++			
++			gmac_power_pin_bananapi: gmac_power_pin@0 {
++				allwinner,pins = "PH23";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		lradc: lradc@01c22800 {
+@@ -134,9 +141,10 @@
+ 
+ 		gmac: ethernet@01c50000 {
+ 			pinctrl-names = "default";
+-			pinctrl-0 = <&gmac_pins_mii_a>;
++			pinctrl-0 = <&gmac_pins_rgmii_a>;
+ 			phy = <&phy1>;
+-			phy-mode = "mii";
++			phy-mode = "rgmii";
++			phy-supply = <&reg_gmac_3v3>;
+ 			status = "okay";
+ 
+ 			phy1: ethernet-phy@1 {
+@@ -169,4 +177,16 @@
+                 status = "okay";
+         };
+ 
++	reg_gmac_3v3: gmac-3v3 {
++			compatible = "regulator-fixed";
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_power_pin_bananapi>;
++			regulator-name = "gmac-3v3";
++			regulator-min-microvolt = <3300000>;
++			regulator-max-microvolt = <3300000>;
++			startup-delay-us = <50000>;
++			enable-active-high;
++			gpio = <&pio 7 23 0>;
++			status = "okay";
++	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.14/307-dt-sun7i-add-axp209-to-bananapi.patch b/trunk/target/linux/sunxi/patches-3.14/307-dt-sun7i-add-axp209-to-bananapi.patch
new file mode 100644
index 00000000..fd8bfa54
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/307-dt-sun7i-add-axp209-to-bananapi.patch
@@ -0,0 +1,17 @@
+--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -125,6 +125,14 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupt-parent = <&nmi_intc>;
++				interrupts = <0 8>;
++				axp,system-power-controller;
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/308-dt-sun7i-add-axp209-to-pcduino3.patch b/trunk/target/linux/sunxi/patches-3.14/308-dt-sun7i-add-axp209-to-pcduino3.patch
new file mode 100644
index 00000000..e091bf07
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/308-dt-sun7i-add-axp209-to-pcduino3.patch
@@ -0,0 +1,17 @@
+--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
++++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+@@ -111,6 +111,14 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+ 			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupt-parent = <&nmi_intc>;
++				interrupts = <0 8>;
++				axp,system-power-controller;
++				/include/ "x-powers-axp209.dtsi"
++			};
+ 		};
+ 
+ 		i2c1: i2c@01c2b000 {
diff --git a/trunk/target/linux/sunxi/patches-3.14/309-dt-sun7i-add-ir-to-bananapi.patch b/trunk/target/linux/sunxi/patches-3.14/309-dt-sun7i-add-ir-to-bananapi.patch
new file mode 100644
index 00000000..209b5ea5
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/309-dt-sun7i-add-ir-to-bananapi.patch
@@ -0,0 +1,32 @@
+From 05cffcda932b0914d78a08891c13e61593a6ce02 Mon Sep 17 00:00:00 2001
+From: Alexander Bersenev <bay@hackerdom.ru>
+Date: Mon, 9 Jun 2014 00:08:13 +0600
+Subject: [PATCH] ARM: sunxi: Enable IR controller on cubieboard 2 and
+ cubietruck in dts
+
+This patch enables two IR devices in dts:
+- One IR device physically found on Cubieboard 2
+- One IR device physically found on Cubietruck
+
+Signed-off-by: Alexander Bersenev <bay@hackerdom.ru>
+Signed-off-by: Alexsey Shestacov <wingrime@linux-sunxi.org>
+---
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 6 ++++++
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts  | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -103,6 +103,12 @@
+ 			status = "okay";
+ 		};
+ 
++		ir0: ir@01c21800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&ir0_pins_a>;
++			status = "okay";
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
diff --git a/trunk/target/linux/sunxi/patches-3.14/310-dt-sun7i-add-a20-olinuxino-lime.patch b/trunk/target/linux/sunxi/patches-3.14/310-dt-sun7i-add-a20-olinuxino-lime.patch
new file mode 100644
index 00000000..24067105
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.14/310-dt-sun7i-add-a20-olinuxino-lime.patch
@@ -0,0 +1,159 @@
+From a71b4438af8242f383906071205db95a8b8e7b6d Mon Sep 17 00:00:00 2001
+From: FUKAUMI Naoki <naobsd@gmail.com>
+Date: Wed, 20 Aug 2014 14:25:03 +0900
+Subject: ARM: sun7i: Add support for Olimex A20-OLinuXino-LIME
+
+This patch adds support for Olimex A20-OLinuXino-LIME board.
+
+Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -293,6 +293,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
+ 	sun7i-a20-bananapi.dtb \
+ 	sun7i-a20-cubieboard2.dtb \
+ 	sun7i-a20-cubietruck.dtb \
++	sun7i-a20-olinuxino-lime.dtb \
+ 	sun7i-a20-olinuxino-micro.dtb \
+ 	sun7i-a20-pcduino3.dtb
+ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+@@ -0,0 +1,136 @@
++/*
++ * This is based on sun4i-a10-olinuxino-lime.dts
++ *
++ * Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
++ * Copyright (c) 2014 FUKAUMI Naoki <naobsd@gmail.com>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "sun7i-a20.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
++
++/ {
++	model = "Olimex A20-OLinuXino-LIME";
++	compatible = "olimex,a20-olinuxino-lime", "allwinner,sun7i-a20";
++
++	soc@01c00000 {
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default", "default";
++			pinctrl-0 = <&mmc0_pins_a>;
++			pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++			cd-gpios = <&pio 7 1 0>; /* PH1 */
++			cd-mode = <1>;
++			status = "okay";
++		};
++
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ahci: sata@01c18000 {
++			target-supply = <&reg_ahci_5v>;
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
++		pinctrl@01c20800 {
++			ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
++				allwinner,pins = "PC3";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			led_pins_olinuxinolime: led_pins@0 {
++				allwinner,pins = "PH2";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <1>;
++				allwinner,pull = <0>;
++			};
++		};
++
++		uart0: serial@01c28000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart0_pins_a>;
++			status = "okay";
++		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++
++			axp: axp20x@34 {
++				reg = <0x34>;
++				interrupt-parent = <&nmi_intc>;
++				interrupts = <0 8>;
++
++				axp,system-power-controller;
++
++				/include/ "x-powers-axp209.dtsi"
++			};
++		};
++
++		gmac: ethernet@01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_mii_a>;
++			phy = <&phy1>;
++			phy-mode = "mii";
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_olinuxinolime>;
++
++		green {
++			label = "a20-olinuxino-lime:green:usr";
++			gpios = <&pio 7 2 0>;
++			default-state = "on";
++		};
++	};
++
++	reg_ahci_5v: ahci-5v {
++		pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
++		gpio = <&pio 2 3 0>;
++		status = "okay";
++	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
++};
diff --git a/trunk/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch b/trunk/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch
new file mode 100644
index 00000000..f0e3eea1
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/100-dt-sun7i-add_spi0_pins_a.patch
@@ -0,0 +1,28 @@
+From 0253d14782f80cfd1741d4ddd82b83dd7d44a91e Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 28 Jul 2014 22:44:59 +0200
+Subject: [PATCH] ARM: dts: sun7i: Add spi0_pins_a pinctrl setting
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
+index 82097c9..4fb8930 100644
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -784,6 +784,13 @@
+ 				allwinner,pull = <0>;
+ 			};
+ 
++			spi0_pins_a: spi0@0 {
++				allwinner,pins = "PI10", "PI11", "PI12", "PI13", "PI14";
++				allwinner,function = "spi0";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
+ 			spi1_pins_a: spi1@0 {
+ 				allwinner,pins = "PI16", "PI17", "PI18", "PI19";
+ 				allwinner,function = "spi1";
diff --git a/trunk/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch b/trunk/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch
new file mode 100644
index 00000000..8f9c0e88
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/101-dt-sun7i-add-uart3_pins.patch
@@ -0,0 +1,31 @@
+From e37ccbcd4587b7a2b943e23a9943b8917010b336 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Oct 2014 08:39:58 +0200
+Subject: [PATCH] ARM: dts: sun7i: Add uart3_pins_b pinctrl setting
+
+The uart3_pins_a multiplexes the uart3 pins to port G, add a pinctrl entry
+for mapping them to port H (as used on the Bananapi).
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
+index 4fb8930..cecf32c 100644
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -677,6 +677,13 @@
+ 				allwinner,pull = <0>;
+ 			};
+ 
++			uart3_pins_b: uart3@1 {
++				allwinner,pins = "PH0", "PH1";
++				allwinner,function = "uart3";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
+ 			uart4_pins_a: uart4@0 {
+ 				allwinner,pins = "PG10", "PG11";
+ 				allwinner,function = "uart4";
diff --git a/trunk/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch b/trunk/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch
new file mode 100644
index 00000000..6a5878e5
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/102-dt-sun7i-add_mmc2_pins.patch
@@ -0,0 +1,28 @@
+From f65624ca1b67c5683317b75da2c09ffadc22fa2e Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Oct 2014 00:40:57 +0200
+Subject: [PATCH] ARM: dts: sun7i: Add mmc2_pins_a pinctrl definition
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
+index cecf32c..f0a75c6 100644
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -833,6 +833,13 @@
+ 				allwinner,pull = <1>;
+ 			};
+ 
++			mmc2_pins_a: mmc2@0 {
++				allwinner,pins = "PC6","PC7","PC8","PC9","PC10","PC11";
++				allwinner,function = "mmc2";
++				allwinner,drive = <2>;
++				allwinner,pull = <1>;
++			};
++
+ 			mmc3_pins_a: mmc3@0 {
+ 				allwinner,pins = "PI4","PI5","PI6","PI7","PI8","PI9";
+ 				allwinner,function = "mmc3";
diff --git a/trunk/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch b/trunk/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
new file mode 100644
index 00000000..0772f157
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
@@ -0,0 +1,412 @@
+From 2c1fab89e83245a520871e807e233e66cbdb7c57 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 19:44:49 +0100
+Subject: [PATCH] input: Add new sun4i-lradc-keys driver
+
+Allwinnner sunxi SoCs have a low resolution adc (called lradc) which is
+specifically designed to have various (tablet) keys (ie home, back, search,
+etc). attached to it using a resistor network. This adds a driver for this.
+
+There are 2 channels, currently this driver only supports chan0 since there
+are no boards known to use chan1.
+
+This has been tested on an olimex a10s-olinuxino-micro, a13-olinuxino, and
+a20-olinuxino-micro.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+--
+Changes in v2:
+-Change devicetree bindings to use a per key subnode, like gpio-keys does
+---
+ .../devicetree/bindings/input/sun4i-lradc-keys.txt |  62 +++++
+ MAINTAINERS                                        |   7 +
+ drivers/input/keyboard/Kconfig                     |  10 +
+ drivers/input/keyboard/Makefile                    |   1 +
+ drivers/input/keyboard/sun4i-lradc-keys.c          | 258 +++++++++++++++++++++
+ 5 files changed, 338 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+ create mode 100644 drivers/input/keyboard/sun4i-lradc-keys.c
+
+diff --git a/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+new file mode 100644
+index 0000000..b9c32f6
+--- /dev/null
++++ b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+@@ -0,0 +1,62 @@
++Allwinner sun4i low res adc attached tablet keys
++------------------------------------------------
++
++Required properties:
++ - compatible: "allwinner,sun4i-a10-lradc-keys"
++ - reg: mmio address range of the chip
++ - interrupts: interrupt to which the chip is connected
++ - vref-supply: powersupply for the lradc reference voltage
++
++Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys":
++
++Required subnode-properties:
++	- label: Descriptive name of the key.
++	- linux,code: Keycode to emit.
++	- channel: Channel this key is attached to, mut be 0 or 1.
++	- voltage: Voltage in µV at lradc input when this key is pressed.
++
++Example:
++
++#include <dt-bindings/input/input.h>
++
++	lradc: lradc@01c22800 {
++		compatible = "allwinner,sun4i-a10-lradc-keys";
++		reg = <0x01c22800 0x100>;
++		interrupts = <31>;
++		vref-supply = <&reg_vcc3v0>;
++
++		button@191 {
++			label = "Volume Up";
++			linux,code = <KEY_VOLUMEUP>;
++			channel = <0>;
++			voltage = <191274>;
++		};
++
++		button@392 {
++			label = "Volume Down";
++			linux,code = <KEY_VOLUMEDOWN>;
++			channel = <0>;
++			voltage = <392644>;
++		};
++
++		button@601 {
++			label = "Menu";
++			linux,code = <KEY_MENU>;
++			channel = <0>;
++			voltage = <601151>;
++		};
++
++		button@795 {
++			label = "Enter";
++			linux,code = <KEY_ENTER>;
++			channel = <0>;
++			voltage = <795090>;
++		};
++
++		button@987 {
++			label = "Home";
++			linux,code = <KEY_HOMEPAGE>;
++			channel = <0>;
++			voltage = <987387>;
++		};
++	};
+diff --git a/MAINTAINERS b/MAINTAINERS
+index a20df9b..73d1aef 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -8932,6 +8932,13 @@ F:	arch/m68k/sun3*/
+ F:	arch/m68k/include/asm/sun3*
+ F:	drivers/net/ethernet/i825xx/sun3*
+ 
++SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER
++M:	Hans de Goede <hdegoede@redhat.com>
++L:	linux-input@vger.kernel.org
++S:	Maintained
++F:	Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
++F:	drivers/input/keyboard/sun4i-lradc-keys.c
++
+ SUNDANCE NETWORK DRIVER
+ M:	Denis Kirjanov <kda@linux-powerpc.org>
+ L:	netdev@vger.kernel.org
+diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
+index a3958c6..2d11b44 100644
+--- a/drivers/input/keyboard/Kconfig
++++ b/drivers/input/keyboard/Kconfig
+@@ -567,6 +567,16 @@ config KEYBOARD_STMPE
+ 	  To compile this driver as a module, choose M here: the module will be
+ 	  called stmpe-keypad.
+ 
++config KEYBOARD_SUN4I_LRADC
++	tristate "Allwinner sun4i low res adc attached tablet keys support"
++	depends on ARCH_SUNXI
++	help
++	  This selects support for the Allwinner low res adc attached tablet
++	  keys found on Allwinner sunxi SoCs.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called sun4i-lradc-keys.
++
+ config KEYBOARD_DAVINCI
+ 	tristate "TI DaVinci Key Scan"
+ 	depends on ARCH_DAVINCI_DM365
+diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
+index 0a33456..a35269a 100644
+--- a/drivers/input/keyboard/Makefile
++++ b/drivers/input/keyboard/Makefile
+@@ -53,6 +53,7 @@ obj-$(CONFIG_KEYBOARD_SPEAR)		+= spear-keyboard.o
+ obj-$(CONFIG_KEYBOARD_STMPE)		+= stmpe-keypad.o
+ obj-$(CONFIG_KEYBOARD_STOWAWAY)		+= stowaway.o
+ obj-$(CONFIG_KEYBOARD_ST_KEYSCAN)	+= st-keyscan.o
++obj-$(CONFIG_KEYBOARD_SUN4I_LRADC)	+= sun4i-lradc-keys.o
+ obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
+ obj-$(CONFIG_KEYBOARD_TC3589X)		+= tc3589x-keypad.o
+ obj-$(CONFIG_KEYBOARD_TEGRA)		+= tegra-kbc.o
+diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c
+new file mode 100644
+index 0000000..f11f002
+--- /dev/null
++++ b/drivers/input/keyboard/sun4i-lradc-keys.c
+@@ -0,0 +1,258 @@
++/*
++ * Allwinner sun4i low res adc attached tablet keys driver
++ *
++ * Copyright (C) 2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++/*
++ * Allwinnner sunxi SoCs have a lradc which is specifically designed to have
++ * various (tablet) keys (ie home, back, search, etc). attached to it using
++ * a resistor network. This driver is for the keys on such boards.
++ *
++ * There are 2 channels, currently this driver only supports channel 0 since
++ * there are no boards known to use channel 1.
++ */
++
++#include <linux/err.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of_platform.h>
++#include <linux/platform_device.h>
++#include <linux/regulator/consumer.h>
++#include <linux/slab.h>
++
++#define LRADC_CTRL		0x00
++#define LRADC_INTC		0x04
++#define LRADC_INTS		0x08
++#define LRADC_DATA0		0x0c
++#define LRADC_DATA1		0x10
++
++/* LRADC_CTRL bits */
++#define FIRST_CONVERT_DLY(x)	((x) << 24) /* 8 bits */
++#define CHAN_SELECT(x)		((x) << 22) /* 2 bits */
++#define CONTINUE_TIME_SEL(x)	((x) << 16) /* 4 bits */
++#define KEY_MODE_SEL(x)		((x) << 12) /* 2 bits */
++#define LEVELA_B_CNT(x)		((x) << 8)  /* 4 bits */
++#define HOLD_EN(x)		((x) << 6)
++#define LEVELB_VOL(x)		((x) << 4)  /* 2 bits */
++#define SAMPLE_RATE(x)		((x) << 2)  /* 2 bits */
++#define ENABLE(x)		((x) << 0)
++
++/* LRADC_INTC and LRADC_INTS bits */
++#define CHAN1_KEYUP_IRQ		BIT(12)
++#define CHAN1_ALRDY_HOLD_IRQ	BIT(11)
++#define CHAN1_HOLD_IRQ		BIT(10)
++#define	CHAN1_KEYDOWN_IRQ	BIT(9)
++#define CHAN1_DATA_IRQ		BIT(8)
++#define CHAN0_KEYUP_IRQ		BIT(4)
++#define CHAN0_ALRDY_HOLD_IRQ	BIT(3)
++#define CHAN0_HOLD_IRQ		BIT(2)
++#define	CHAN0_KEYDOWN_IRQ	BIT(1)
++#define CHAN0_DATA_IRQ		BIT(0)
++
++struct sun4i_lradc_keymap {
++	u32 voltage;
++	u32 keycode;
++};
++
++struct sun4i_lradc_data {
++	struct device *dev;
++	struct input_dev *input;
++	void __iomem *base;
++	struct regulator *vref_supply;
++	struct sun4i_lradc_keymap *chan0_map;
++	u32 chan0_map_count;
++	u32 chan0_keycode;
++	u32 vref;
++};
++
++static irqreturn_t sun4i_lradc_irq(int irq, void *dev_id)
++{
++	struct sun4i_lradc_data *lradc = dev_id;
++	u32 i, ints, val, voltage, diff, keycode = 0, closest = 0xffffffff;
++
++	ints  = readl(lradc->base + LRADC_INTS);
++
++	/*
++	 * lradc supports only one keypress at a time, release does not give
++	 * any info as to which key was released, so we cache the keycode.
++	 */
++	if ((ints & CHAN0_KEYDOWN_IRQ) && lradc->chan0_keycode == 0) {
++		val = readl(lradc->base + LRADC_DATA0) & 0x3f;
++		voltage = val * lradc->vref / 63;
++
++		for (i = 0; i < lradc->chan0_map_count; i++) {
++			diff = abs(lradc->chan0_map[i].voltage - voltage);
++			if (diff < closest) {
++				closest = diff;
++				keycode = lradc->chan0_map[i].keycode;
++			}
++		}
++
++		lradc->chan0_keycode = keycode;
++		input_report_key(lradc->input, lradc->chan0_keycode, 1);
++	}
++
++	if (ints & CHAN0_KEYUP_IRQ) {
++		input_report_key(lradc->input, lradc->chan0_keycode, 0);
++		lradc->chan0_keycode = 0;
++	}
++
++	input_sync(lradc->input);
++
++	writel(ints, lradc->base + LRADC_INTS);
++
++	return IRQ_HANDLED;
++}
++
++static int sun4i_lradc_open(struct input_dev *dev)
++{
++	struct sun4i_lradc_data *lradc = input_get_drvdata(dev);
++	int ret;
++
++	ret = regulator_enable(lradc->vref_supply);
++	if (ret)
++		return ret;
++
++	/* lradc Vref internally is divided by 2/3 */
++	lradc->vref = regulator_get_voltage(lradc->vref_supply) * 2 / 3;
++
++	/*
++	 * Set sample time to 4 ms / 250 Hz. Wait 2 * 4 ms for key to
++	 * stabilize on press, wait (1 + 1) * 4 ms for key release
++	 */
++	writel(FIRST_CONVERT_DLY(2) | LEVELA_B_CNT(1) | HOLD_EN(1) |
++		SAMPLE_RATE(0) | ENABLE(1), lradc->base + LRADC_CTRL);
++
++	writel(CHAN0_KEYUP_IRQ | CHAN0_KEYDOWN_IRQ, lradc->base + LRADC_INTC);
++
++	return 0;
++}
++
++static void sun4i_lradc_close(struct input_dev *dev)
++{
++	struct sun4i_lradc_data *lradc = input_get_drvdata(dev);
++
++	/* Disable lradc, leave other settings unchanged */
++	writel(FIRST_CONVERT_DLY(2) | LEVELA_B_CNT(1) | HOLD_EN(1) |
++		SAMPLE_RATE(2), lradc->base + LRADC_CTRL);
++	writel(0, lradc->base + LRADC_INTC);
++
++	regulator_disable(lradc->vref_supply);
++}
++
++static int sun4i_lradc_probe(struct platform_device *pdev)
++{
++	struct sun4i_lradc_data *lradc;
++	struct device *dev = &pdev->dev;
++	struct device_node *pp, *np = dev->of_node;
++	u32 channel;
++	int i, ret;
++
++	lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data), GFP_KERNEL);
++	if (!lradc)
++		return -ENOMEM;
++
++	lradc->chan0_map_count = of_get_child_count(np);
++	lradc->chan0_map = devm_kmalloc(dev, lradc->chan0_map_count *
++				sizeof(struct sun4i_lradc_keymap), GFP_KERNEL);
++	if (!lradc->chan0_map)
++		return -ENOMEM;
++
++	i = 0;
++	for_each_child_of_node(np, pp) {
++		struct sun4i_lradc_keymap *map = &lradc->chan0_map[i];
++
++		ret = of_property_read_u32(pp, "channel", &channel);
++		if (ret || channel != 0) {
++			dev_err(dev, "%s: Inval channel prop\n", pp->name);
++			return -EINVAL;
++		}
++
++		ret = of_property_read_u32(pp, "voltage", &map->voltage);
++		if (ret) {
++			dev_err(dev, "%s: Inval voltage prop\n", pp->name);
++			return -EINVAL;
++		}
++
++		ret = of_property_read_u32(pp, "linux,code", &map->keycode);
++		if (ret) {
++			dev_err(dev, "%s: Inval linux,code prop\n", pp->name);
++			return -EINVAL;
++		}
++
++		i++;
++	}
++
++	lradc->vref_supply = devm_regulator_get(dev, "vref");
++	if (IS_ERR(lradc->vref_supply))
++		return PTR_ERR(lradc->vref_supply);
++
++	lradc->dev = dev;
++	lradc->input = devm_input_allocate_device(dev);
++	if (!lradc->input)
++		return -ENOMEM;
++
++	lradc->input->name = pdev->name;
++	lradc->input->phys = "sun4i_lradc/input0";
++	lradc->input->open = sun4i_lradc_open;
++	lradc->input->close = sun4i_lradc_close;
++	lradc->input->id.bustype = BUS_HOST;
++	lradc->input->id.vendor = 0x0001;
++	lradc->input->id.product = 0x0001;
++	lradc->input->id.version = 0x0100;
++	lradc->input->evbit[0] =  BIT(EV_SYN) | BIT(EV_KEY);
++	for (i = 0; i < lradc->chan0_map_count; i++)
++		set_bit(lradc->chan0_map[i].keycode, lradc->input->keybit);
++	input_set_drvdata(lradc->input, lradc);
++
++	lradc->base = devm_ioremap_resource(dev,
++			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
++	if (IS_ERR(lradc->base))
++		return PTR_ERR(lradc->base);
++
++	ret = devm_request_irq(dev, platform_get_irq(pdev, 0), sun4i_lradc_irq,
++			       0, "sun4i-a10-lradc-keys", lradc);
++	if (ret)
++		return ret;
++
++	ret = input_register_device(lradc->input);
++	if (ret)
++		return ret;
++
++	platform_set_drvdata(pdev, lradc);
++	return 0;
++}
++
++static const struct of_device_id sun4i_lradc_of_match[] = {
++	{ .compatible = "allwinner,sun4i-a10-lradc-keys", },
++	{ /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, sun4i_lradc_of_match);
++
++static struct platform_driver sun4i_lradc_driver = {
++	.driver = {
++		.name	= "sun4i-a10-lradc-keys",
++		.of_match_table = of_match_ptr(sun4i_lradc_of_match),
++	},
++	.probe	= sun4i_lradc_probe,
++};
++
++module_platform_driver(sun4i_lradc_driver);
++
++MODULE_DESCRIPTION("Allwinner sun4i low res adc attached tablet keys driver");
++MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch b/trunk/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch
new file mode 100644
index 00000000..0ffe4e80
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/111-dt-sun4i-add-lradc.patch
@@ -0,0 +1,28 @@
+From f39ea4358d2e4b939b8ca55ee344d3c8fdfc0a6a Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 19:51:36 +0100
+Subject: [PATCH] ARM: dts: sun4i: Add lradc node
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun4i-a10.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
+index 380f914..1ef7d57 100644
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
++++ b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -669,6 +669,13 @@
+ 			status = "disabled";
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			compatible = "allwinner,sun4i-a10-lradc-keys";
++			reg = <0x01c22800 0x100>;
++			interrupts = <31>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun4i-a10-sid";
+ 			reg = <0x01c23800 0x10>;
diff --git a/trunk/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch b/trunk/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch
new file mode 100644
index 00000000..22dfe51b
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/112-dt-sun5i-add-lradc.patch
@@ -0,0 +1,175 @@
+From 3bf1194692f3a275e0776d3c0b6f17826cc01baa Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 19:50:33 +0100
+Subject: [PATCH] ARM: dts: sun5i: Add lradc node
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 45 ++++++++++++++++++++++--
+ arch/arm/boot/dts/sun5i-a10s.dtsi                |  7 ++++
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts        | 45 ++++++++++++++++++++++--
+ arch/arm/boot/dts/sun5i-a13.dtsi                 |  7 ++++
+ 4 files changed, 100 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+index ea9519d..0b82d20 100644
+--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+@@ -12,8 +12,9 @@
+  */
+ 
+ /dts-v1/;
+-/include/ "sun5i-a10s.dtsi"
+-/include/ "sunxi-common-regulators.dtsi"
++#include "sun5i-a10s.dtsi"
++#include "sunxi-common-regulators.dtsi"
++#include <dt-bindings/input/input.h>
+ 
+ / {
+ 	model = "Olimex A10s-Olinuxino Micro";
+@@ -98,6 +99,46 @@
+ 			};
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			vref-supply = <&reg_vcc3v0>;
++			status = "okay";
++
++			button@191 {
++				label = "Volume Up";
++				linux,code = <KEY_VOLUMEUP>;
++				channel = <0>;
++				voltage = <191274>;
++			};
++
++			button@392 {
++				label = "Volume Down";
++				linux,code = <KEY_VOLUMEDOWN>;
++				channel = <0>;
++				voltage = <392644>;
++			};
++
++			button@601 {
++				label = "Menu";
++				linux,code = <KEY_MENU>;
++				channel = <0>;
++				voltage = <601151>;
++			};
++
++			button@795 {
++				label = "Enter";
++				linux,code = <KEY_ENTER>;
++				channel = <0>;
++				voltage = <795090>;
++			};
++
++			button@987 {
++				label = "Home";
++				linux,code = <KEY_HOMEPAGE>;
++				channel = <0>;
++				voltage = <987387>;
++			};
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
+diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
+index 531272c..7c6c883 100644
+--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
+@@ -520,6 +520,13 @@
+ 			reg = <0x01c20c90 0x10>;
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			compatible = "allwinner,sun4i-a10-lradc-keys";
++			reg = <0x01c22800 0x100>;
++			interrupts = <31>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun4i-a10-sid";
+ 			reg = <0x01c23800 0x10>;
+diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+index 429994e..b4ec8eb 100644
+--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
++++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+@@ -12,8 +12,9 @@
+  */
+ 
+ /dts-v1/;
+-/include/ "sun5i-a13.dtsi"
+-/include/ "sunxi-common-regulators.dtsi"
++#include "sun5i-a13.dtsi"
++#include "sunxi-common-regulators.dtsi"
++#include <dt-bindings/input/input.h>
+ 
+ / {
+ 	model = "Olimex A13-Olinuxino";
+@@ -66,6 +67,46 @@
+ 			};
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			vref-supply = <&reg_vcc3v0>;
++			status = "okay";
++
++			button@191 {
++				label = "Volume Up";
++				linux,code = <KEY_VOLUMEUP>;
++				channel = <0>;
++				voltage = <191274>;
++			};
++
++			button@392 {
++				label = "Volume Down";
++				linux,code = <KEY_VOLUMEDOWN>;
++				channel = <0>;
++				voltage = <392644>;
++			};
++
++			button@601 {
++				label = "Menu";
++				linux,code = <KEY_MENU>;
++				channel = <0>;
++				voltage = <601151>;
++			};
++
++			button@795 {
++				label = "Enter";
++				linux,code = <KEY_ENTER>;
++				channel = <0>;
++				voltage = <795090>;
++			};
++
++			button@987 {
++				label = "Home";
++				linux,code = <KEY_HOMEPAGE>;
++				channel = <0>;
++				voltage = <987387>;
++			};
++		};
++
+ 		uart1: serial@01c28400 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart1_pins_b>;
+diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
+index b131068..aa0482c 100644
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -468,6 +468,13 @@
+ 			reg = <0x01c20c90 0x10>;
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			compatible = "allwinner,sun4i-a10-lradc-keys";
++			reg = <0x01c22800 0x100>;
++			interrupts = <31>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun4i-a10-sid";
+ 			reg = <0x01c23800 0x10>;
diff --git a/trunk/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch b/trunk/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch
new file mode 100644
index 00000000..50a66b6a
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/113-dt-sun7i-add-lradc.patch
@@ -0,0 +1,106 @@
+From a735a9b354ebc1a17b648ef8c3482c71fdbf40da Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 1 Jan 2014 20:26:21 +0100
+Subject: [PATCH] ARM: dts: sun7i: Add lradc node
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 59 ++++++++++++++++++++++++-
+ arch/arm/boot/dts/sun7i-a20.dtsi                |  7 +++
+ 2 files changed, 64 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+index 9d669cdf..c00badd 100644
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -12,8 +12,9 @@
+  */
+ 
+ /dts-v1/;
+-/include/ "sun7i-a20.dtsi"
+-/include/ "sunxi-common-regulators.dtsi"
++#include "sun7i-a20.dtsi"
++#include "sunxi-common-regulators.dtsi"
++#include <dt-bindings/input/input.h>
+ 
+ / {
+ 	model = "Olimex A20-Olinuxino Micro";
+@@ -100,6 +101,60 @@
+ 			};
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			vref-supply = <&reg_vcc3v0>;
++			status = "okay";
++
++			button@191 {
++				label = "Volume Up";
++				linux,code = <KEY_VOLUMEUP>;
++				channel = <0>;
++				voltage = <191274>;
++			};
++
++			button@392 {
++				label = "Volume Down";
++				linux,code = <KEY_VOLUMEDOWN>;
++				channel = <0>;
++				voltage = <392644>;
++			};
++
++			button@601 {
++				label = "Menu";
++				linux,code = <KEY_MENU>;
++				channel = <0>;
++				voltage = <601151>;
++			};
++
++			button@795 {
++				label = "Search";
++				linux,code = <KEY_SEARCH>;
++				channel = <0>;
++				voltage = <795090>;
++			};
++
++			button@987 {
++				label = "Home";
++				linux,code = <KEY_HOMEPAGE>;
++				channel = <0>;
++				voltage = <987387>;
++			};
++
++			button@1184 {
++				label = "Esc";
++				linux,code = <KEY_ESC>;
++				channel = <0>;
++				voltage = <1184678>;
++			};
++
++			button@1398 {
++				label = "Enter";
++				linux,code = <KEY_ENTER>;
++				channel = <0>;
++				voltage = <1398804>;
++			};
++		};
++
+ 		uart0: serial@01c28000 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&uart0_pins_a>;
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
+index f0a75c6..9174423 100644
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -911,6 +911,13 @@
+ 			status = "disabled";
+ 		};
+ 
++		lradc: lradc@01c22800 {
++			compatible = "allwinner,sun4i-a10-lradc-keys";
++			reg = <0x01c22800 0x100>;
++			interrupts = <0 31 4>;
++			status = "disabled";
++		};
++
+ 		sid: eeprom@01c23800 {
+ 			compatible = "allwinner,sun7i-a20-sid";
+ 			reg = <0x01c23800 0x200>;
diff --git a/trunk/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch b/trunk/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch
new file mode 100644
index 00000000..bff74e46
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/115-input-sun4i-ts-update-temp-curve.patch
@@ -0,0 +1,83 @@
+From 2e2493cd07405dfa88e53199b47bdbbb5336fdce Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 16 Jun 2014 20:01:12 +0200
+Subject: [PATCH] touchscreen: sun4i-ts: A10 (sun4i) has a different
+ temperature curve
+
+Testing has revealed that the temperature in the rtp controller of the A10
+(sun4i) SoC has a different curve then on the A13 (sun5i) and later models.
+
+Add a new sun5i-a13-ts compatible to differentiate the newer models and
+set the curve based on the compatible string.
+
+This fixes the temperature reported on the A10 being much higher then
+expected.
+
+Note the new curve is still not ideal on all A10-s, that seems to have to
+do with there being a large spread between different A10-s out there.
+
+Reported-by: Tong Zhang <lovewilliam@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ .../devicetree/bindings/input/touchscreen/sun4i.txt         |  2 +-
+ drivers/input/touchscreen/sun4i-ts.c                        | 13 ++++++++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+index aef5779..5106709 100644
+--- a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
++++ b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+@@ -2,7 +2,7 @@ sun4i resistive touchscreen controller
+ --------------------------------------
+ 
+ Required properties:
+- - compatible: "allwinner,sun4i-a10-ts"
++ - compatible: "allwinner,sun4i-a10-ts" or "allwinner,sun5i-a13-ts"
+  - reg: mmio address range of the chip
+  - interrupts: interrupt to which the chip is connected
+ 
+diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c
+index 2ba8260..52b7114 100644
+--- a/drivers/input/touchscreen/sun4i-ts.c
++++ b/drivers/input/touchscreen/sun4i-ts.c
+@@ -111,6 +111,8 @@ struct sun4i_ts_data {
+ 	unsigned int irq;
+ 	bool ignore_fifo_data;
+ 	int temp_data;
++	int temp_offset;
++	int temp_step;
+ };
+ 
+ static void sun4i_ts_irq_handle_input(struct sun4i_ts_data *ts, u32 reg_val)
+@@ -189,7 +191,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
+ 	if (ts->temp_data == -1)
+ 		return -EAGAIN;
+ 
+-	return sprintf(buf, "%d\n", (ts->temp_data - 1447) * 100);
++	return sprintf(buf, "%d\n",
++		       (ts->temp_data - ts->temp_offset) * ts->temp_step);
+ }
+ 
+ static ssize_t show_temp_label(struct device *dev,
+@@ -224,6 +227,13 @@ static int sun4i_ts_probe(struct platform_device *pdev)
+ 	ts->dev = dev;
+ 	ts->ignore_fifo_data = true;
+ 	ts->temp_data = -1;
++	if (of_device_is_compatible(np, "allwinner,sun4i-a10-ts")) {
++		ts->temp_offset = 1900;
++		ts->temp_step = 100;
++	} else {
++		ts->temp_offset = 1447;
++		ts->temp_step = 100;
++	}
+ 
+ 	ts_attached = of_property_read_bool(np, "allwinner,ts-attached");
+ 	if (ts_attached) {
+@@ -318,6 +328,7 @@ static int sun4i_ts_remove(struct platform_device *pdev)
+ 
+ static const struct of_device_id sun4i_ts_of_match[] = {
+ 	{ .compatible = "allwinner,sun4i-a10-ts", },
++	{ .compatible = "allwinner,sun5i-a13-ts", },
+ 	{ /* sentinel */ }
+ };
+ MODULE_DEVICE_TABLE(of, sun4i_ts_of_match);
diff --git a/trunk/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch b/trunk/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch
new file mode 100644
index 00000000..861538fe
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch
@@ -0,0 +1,57 @@
+From ff774d842a2bf9136b9c7ddd7f5085a9062705ac Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 16 Jun 2014 20:06:43 +0200
+Subject: [PATCH] ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and
+ later
+
+The touchscreen controller in the A13 and later has a different temperature
+curve than the one in the original A10, change the compatible for the A13 and
+later so that the kernel will use the correct curve.
+
+Reported-by: Tong Zhang <lovewilliam@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi  | 2 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
+index 7c6c883..7089284 100644
+--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
+@@ -533,7 +533,7 @@
+ 		};
+ 
+ 		rtp: rtp@01c25000 {
+-			compatible = "allwinner,sun4i-a10-ts";
++			compatible = "allwinner,sun5i-a13-ts";
+ 			reg = <0x01c25000 0x100>;
+ 			interrupts = <29>;
+ 		};
+diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
+index aa0482c..b05ab04 100644
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -481,7 +481,7 @@
+ 		};
+ 
+ 		rtp: rtp@01c25000 {
+-			compatible = "allwinner,sun4i-a10-ts";
++			compatible = "allwinner,sun5i-a13-ts";
+ 			reg = <0x01c25000 0x100>;
+ 			interrupts = <29>;
+ 		};
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
+index 9174423..81d4e55 100644
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -924,7 +924,7 @@
+ 		};
+ 
+ 		rtp: rtp@01c25000 {
+-			compatible = "allwinner,sun4i-a10-ts";
++			compatible = "allwinner,sun5i-a13-ts";
+ 			reg = <0x01c25000 0x100>;
+ 			interrupts = <0 29 4>;
+ 		};
diff --git a/trunk/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch b/trunk/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch
new file mode 100644
index 00000000..537ba365
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/130-input-add-axp20x-pek.patch
@@ -0,0 +1,339 @@
+From 63d559304a15ffead2fa1014b93dbcabf516c257 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@caione.org>
+Date: Mon, 19 May 2014 21:47:45 +0200
+Subject: [PATCH] input: misc: Add driver for AXP20x Power Enable Key
+
+This patch add support for the Power Enable Key found on MFD AXP202 and
+AXP209. Besides the basic support for the button, the driver adds two
+entries in sysfs to configure the time delay for power on/off.
+
+Signed-off-by: Carlo Caione <carlo@caione.org>
+Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/misc/Kconfig      |  11 ++
+ drivers/input/misc/Makefile     |   1 +
+ drivers/input/misc/axp20x-pek.c | 281 ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 293 insertions(+)
+ create mode 100644 drivers/input/misc/axp20x-pek.c
+
+diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
+index 23297ab..a49bcd3 100644
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -404,6 +404,17 @@ config INPUT_RETU_PWRBUTTON
+ 	  To compile this driver as a module, choose M here. The module will
+ 	  be called retu-pwrbutton.
+ 
++config INPUT_AXP20X_PEK
++	tristate "X-Powers AXP20X power button driver"
++	depends on MFD_AXP20X
++	help
++	  Say Y here if you want to enable power key reporting via the
++	  AXP20X PMIC.
++
++	  To compile this driver as a module, choose M here. The module will
++	  be called axp20x-pek.
++
++
+ config INPUT_TWL4030_PWRBUTTON
+ 	tristate "TWL4030 Power button Driver"
+ 	depends on TWL4030_CORE
+diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
+index 19c7603..04ea87f 100644
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -54,6 +54,7 @@ obj-$(CONFIG_INPUT_POWERMATE)		+= powermate.o
+ obj-$(CONFIG_INPUT_PWM_BEEPER)		+= pwm-beeper.o
+ obj-$(CONFIG_INPUT_RB532_BUTTON)	+= rb532_button.o
+ obj-$(CONFIG_INPUT_RETU_PWRBUTTON)	+= retu-pwrbutton.o
++obj-$(CONFIG_INPUT_AXP20X_PEK)		+= axp20x-pek.o
+ obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER)	+= rotary_encoder.o
+ obj-$(CONFIG_INPUT_SGI_BTNS)		+= sgi_btns.o
+ obj-$(CONFIG_INPUT_SIRFSOC_ONKEY)	+= sirfsoc-onkey.o
+diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
+new file mode 100644
+index 0000000..0fba252
+--- /dev/null
++++ b/drivers/input/misc/axp20x-pek.c
+@@ -0,0 +1,281 @@
++/*
++ * axp20x power button driver.
++ *
++ * Copyright (C) 2013 Carlo Caione <carlo@caione.org>
++ *
++ * This file is subject to the terms and conditions of the GNU General
++ * Public License. See the file "COPYING" in the main directory of this
++ * archive for more details.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++#include <linux/errno.h>
++#include <linux/irq.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/kernel.h>
++#include <linux/mfd/axp20x.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/regmap.h>
++#include <linux/slab.h>
++
++#define AXP20X_PEK_STARTUP_MASK		(0xc0)
++#define AXP20X_PEK_SHUTDOWN_MASK	(0x03)
++
++struct axp20x_pek {
++	struct axp20x_dev *axp20x;
++	struct input_dev *input;
++	int irq_dbr;
++	int irq_dbf;
++};
++
++struct axp20x_time {
++	unsigned int time;
++	unsigned int idx;
++};
++
++static const struct axp20x_time startup_time[] = {
++	{ .time = 128,  .idx = 0 },
++	{ .time = 1000, .idx = 2 },
++	{ .time = 3000, .idx = 1 },
++	{ .time = 2000, .idx = 3 },
++};
++
++static const struct axp20x_time shutdown_time[] = {
++	{ .time = 4000,  .idx = 0 },
++	{ .time = 6000,  .idx = 1 },
++	{ .time = 8000,  .idx = 2 },
++	{ .time = 10000, .idx = 3 },
++};
++
++struct axp20x_pek_ext_attr {
++	const struct axp20x_time *p_time;
++	unsigned int mask;
++};
++
++static struct axp20x_pek_ext_attr axp20x_pek_startup_ext_attr = {
++	.p_time	= startup_time,
++	.mask	= AXP20X_PEK_STARTUP_MASK,
++};
++
++static struct axp20x_pek_ext_attr axp20x_pek_shutdown_ext_attr = {
++	.p_time	= shutdown_time,
++	.mask	= AXP20X_PEK_SHUTDOWN_MASK,
++};
++
++static struct axp20x_pek_ext_attr *get_axp_ext_attr(struct device_attribute *attr)
++{
++	return container_of(attr, struct dev_ext_attribute, attr)->var;
++}
++
++static ssize_t axp20x_show_ext_attr(struct device *dev, struct device_attribute *attr,
++				    char *buf)
++{
++	struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
++	struct axp20x_pek_ext_attr *axp20x_ea = get_axp_ext_attr(attr);
++	unsigned int val;
++	int ret, i;
++
++	ret = regmap_read(axp20x_pek->axp20x->regmap, AXP20X_PEK_KEY, &val);
++	if (ret != 0)
++		return ret;
++
++	val &= axp20x_ea->mask;
++	val >>= ffs(axp20x_ea->mask) - 1;
++
++	for (i = 0; i < 4; i++)
++		if (val == axp20x_ea->p_time[i].idx)
++			val = axp20x_ea->p_time[i].time;
++
++	return sprintf(buf, "%u\n", val);
++}
++
++static ssize_t axp20x_store_ext_attr(struct device *dev, struct device_attribute *attr,
++				     const char *buf, size_t count)
++{
++	struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
++	struct axp20x_pek_ext_attr *axp20x_ea = get_axp_ext_attr(attr);
++	char val_str[20];
++	size_t len;
++	int ret, i;
++	unsigned int val, idx = 0;
++	unsigned int best_err = UINT_MAX;
++
++	val_str[sizeof(val_str) - 1] = '\0';
++	strncpy(val_str, buf, sizeof(val_str) - 1);
++	len = strlen(val_str);
++
++	if (len && val_str[len - 1] == '\n')
++		val_str[len - 1] = '\0';
++
++	ret = kstrtouint(val_str, 10, &val);
++	if (ret)
++		return ret;
++
++	for (i = 3; i >= 0; i--) {
++		unsigned int err;
++
++		err = abs(axp20x_ea->p_time[i].time - val);
++		if (err < best_err) {
++			best_err = err;
++			idx = axp20x_ea->p_time[i].idx;
++		}
++
++		if (!err)
++			break;
++	}
++
++	idx <<= ffs(axp20x_ea->mask) - 1;
++	ret = regmap_update_bits(axp20x_pek->axp20x->regmap,
++				 AXP20X_PEK_KEY,
++				 axp20x_ea->mask, idx);
++	if (ret != 0)
++		return -EINVAL;
++	return count;
++}
++
++static struct dev_ext_attribute axp20x_dev_attr_startup = {
++	.attr	= __ATTR(startup, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr),
++	.var	= &axp20x_pek_startup_ext_attr
++};
++
++static struct dev_ext_attribute axp20x_dev_attr_shutdown = {
++	.attr	= __ATTR(shutdown, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr),
++	.var	= &axp20x_pek_shutdown_ext_attr
++};
++
++static irqreturn_t axp20x_pek_irq(int irq, void *pwr)
++{
++	struct input_dev *idev = pwr;
++	struct axp20x_pek *axp20x_pek = input_get_drvdata(idev);
++
++	if (irq == axp20x_pek->irq_dbr)
++		input_report_key(idev, KEY_POWER, true);
++	else if (irq == axp20x_pek->irq_dbf)
++		input_report_key(idev, KEY_POWER, false);
++
++	input_sync(idev);
++
++	return IRQ_HANDLED;
++}
++
++static int axp20x_pek_probe(struct platform_device *pdev)
++{
++	struct axp20x_pek *axp20x_pek;
++	struct axp20x_dev *axp20x;
++	struct input_dev *idev;
++	int error;
++
++	axp20x_pek = devm_kzalloc(&pdev->dev, sizeof(struct axp20x_pek),
++				  GFP_KERNEL);
++	if (!axp20x_pek)
++		return -ENOMEM;
++
++	axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
++	axp20x = axp20x_pek->axp20x;
++
++	axp20x_pek->irq_dbr = platform_get_irq_byname(pdev, "PEK_DBR");
++	if (axp20x_pek->irq_dbr < 0) {
++		dev_err(&pdev->dev, "No IRQ for PEK_DBR, error=%d\n",
++				axp20x_pek->irq_dbr);
++		return axp20x_pek->irq_dbr;
++	}
++	axp20x_pek->irq_dbr = regmap_irq_get_virq(axp20x->regmap_irqc,
++						  axp20x_pek->irq_dbr);
++
++	axp20x_pek->irq_dbf = platform_get_irq_byname(pdev, "PEK_DBF");
++	if (axp20x_pek->irq_dbf < 0) {
++		dev_err(&pdev->dev, "No IRQ for PEK_DBF, error=%d\n",
++				axp20x_pek->irq_dbf);
++		return axp20x_pek->irq_dbf;
++	}
++	axp20x_pek->irq_dbf = regmap_irq_get_virq(axp20x->regmap_irqc,
++						  axp20x_pek->irq_dbf);
++
++	axp20x_pek->input = devm_input_allocate_device(&pdev->dev);
++	if (!axp20x_pek->input)
++		return -ENOMEM;
++
++	idev = axp20x_pek->input;
++
++	idev->name = "axp20x-pek";
++	idev->phys = "m1kbd/input2";
++	idev->dev.parent = &pdev->dev;
++
++	input_set_capability(idev, EV_KEY, KEY_POWER);
++
++	input_set_drvdata(idev, axp20x_pek);
++
++	error = devm_request_any_context_irq(&pdev->dev, axp20x_pek->irq_dbr,
++					  axp20x_pek_irq, 0,
++					  "axp20x-pek-dbr", idev);
++	if (error < 0) {
++		dev_err(axp20x->dev, "Failed to request dbr IRQ#%d: %d\n",
++			axp20x_pek->irq_dbr, error);
++
++		return error;
++	}
++
++	error = devm_request_any_context_irq(&pdev->dev, axp20x_pek->irq_dbf,
++					  axp20x_pek_irq, 0,
++					  "axp20x-pek-dbf", idev);
++	if (error < 0) {
++		dev_err(axp20x->dev, "Failed to request dbf IRQ#%d: %d\n",
++			axp20x_pek->irq_dbf, error);
++		return error;
++	}
++
++	error = device_create_file(&pdev->dev, &axp20x_dev_attr_startup.attr);
++	if (error)
++		return error;
++
++	error = device_create_file(&pdev->dev, &axp20x_dev_attr_shutdown.attr);
++	if (error)
++		goto clear_startup_attr;
++
++	error = input_register_device(idev);
++	if (error) {
++		dev_err(axp20x->dev, "Can't register input device: %d\n", error);
++		goto clear_attr;
++	}
++
++	platform_set_drvdata(pdev, axp20x_pek);
++
++	return 0;
++
++clear_attr:
++	device_remove_file(&pdev->dev, &axp20x_dev_attr_shutdown.attr);
++
++clear_startup_attr:
++	device_remove_file(&pdev->dev, &axp20x_dev_attr_startup.attr);
++
++	return error;
++}
++
++int axp20x_pek_remove(struct platform_device *pdev)
++{
++	device_remove_file(&pdev->dev, &axp20x_dev_attr_shutdown.attr);
++	device_remove_file(&pdev->dev, &axp20x_dev_attr_startup.attr);
++
++	return 0;
++}
++
++static struct platform_driver axp20x_pek_driver = {
++	.probe		= axp20x_pek_probe,
++	.remove		= axp20x_pek_remove,
++	.driver		= {
++		.name		= "axp20x-pek",
++		.owner		= THIS_MODULE,
++	},
++};
++module_platform_driver(axp20x_pek_driver);
++
++MODULE_DESCRIPTION("axp20x Power Button");
++MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch b/trunk/target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch
new file mode 100644
index 00000000..6d316c20
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch
@@ -0,0 +1,97 @@
+From 4bfd40ed0046299e4a5ffba31bfbbcc39cf74e03 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <marc.zyngier@arm.com>
+Date: Thu, 23 Oct 2014 17:49:30 +0100
+Subject: [PATCH] AHCI: Fix threaded interrupt setup
+
+Commit 18dcf433f3de (AHCI: Optimize single IRQ interrupt processing)
+switched the single IRQ case of the AHCI driver to use threaded
+threaded interrupts.
+
+During this conversion, only the IRQF_SHARED flag was provided. The net
+effect of this in the presence of level interrupts is that the
+interrupt will not be masked during the execution of the treaded
+handler, leading to a screaming interrupt if the thread is not
+scheduled quickly enough, specially in error conditions:
+
+[    2.728051] ahci-sunxi 1c18000.sata: controller can't do PMP, turning off CAP_PMP
+[    2.735578] ahci-sunxi 1c18000.sata: SSS flag set, parallel bus scan disabled
+[    2.742792] ahci-sunxi 1c18000.sata: AHCI 0001.0100 32 slots 1 ports 3 Gbps 0x1 impl platform mode
+[    2.751789] ahci-sunxi 1c18000.sata: flags: ncq sntf stag pm led clo only pio slum part ccc
+[    2.761539] scsi host0: ahci_platform
+[    2.765754] ata1: SATA max UDMA/133 mmio [mem 0x01c18000-0x01c18fff] port 0x100 irq 88
+[...]
+[    3.127977] ata1: SATA link down (SStatus 0 SControl 300)
+[...]
+[    3.162035] Waiting for root device /dev/sda1...
+[    3.163700] random: nonblocking pool is initialized
+[    3.326593] irq 88: nobody cared (try booting with the "irqpoll" option)
+[    3.333296] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.18.0-rc1+ #3077
+[    3.339936] [<c002b318>] (unwind_backtrace) from [<c0026980>] (show_stack+0x20/0x24)
+[    3.347681] [<c0026980>] (show_stack) from [<c067dd18>] (dump_stack+0x9c/0xd4)
+[    3.354904] [<c067dd18>] (dump_stack) from [<c007ac08>] (__report_bad_irq+0x38/0xd4)
+[    3.362643] [<c007ac08>] (__report_bad_irq) from [<c007b1dc>] (note_interrupt+0x280/0x2d0)
+[    3.370903] [<c007b1dc>] (note_interrupt) from [<c0078a70>] (handle_irq_event_percpu+0x210/0x27c)
+[    3.379771] [<c0078a70>] (handle_irq_event_percpu) from [<c0078b28>] (handle_irq_event+0x4c/0x6c)
+[    3.388636] [<c0078b28>] (handle_irq_event) from [<c007b860>] (handle_fasteoi_irq+0xbc/0x1a0)
+[    3.397156] [<c007b860>] (handle_fasteoi_irq) from [<c0077f5c>] (generic_handle_irq+0x3c/0x4c)
+[    3.405764] [<c0077f5c>] (generic_handle_irq) from [<c0078220>] (__handle_domain_irq+0x6c/0xb4)
+[    3.414456] [<c0078220>] (__handle_domain_irq) from [<c0008754>] (gic_handle_irq+0x34/0x6c)
+[    3.422802] [<c0008754>] (gic_handle_irq) from [<c0027540>] (__irq_svc+0x40/0x74)
+[    3.430274] Exception stack(0xc09c1df8 to 0xc09c1e40)
+[    3.435321] 1de0:                                                       00000001 c0a27ec0
+[    3.443491] 1e00: 00000000 00000000 c09c0028 0000001e 00000282 00000000 ee00c400 c0a239f8
+[    3.451660] 1e20: c09c0000 c09c1ea4 c0a27ec0 c09c1e40 00200000 c003c7cc 20000113 ffffffff
+[    3.459835] [<c0027540>] (__irq_svc) from [<c003c7cc>] (__do_softirq+0xbc/0x34c)
+[    3.467229] [<c003c7cc>] (__do_softirq) from [<c003cd44>] (irq_exit+0xbc/0x104)
+[    3.474536] [<c003cd44>] (irq_exit) from [<c0078224>] (__handle_domain_irq+0x70/0xb4)
+[    3.482362] [<c0078224>] (__handle_domain_irq) from [<c0008754>] (gic_handle_x74)
+[    3.498169] Exception stack(0xc09c1f10 to 0xc09c1f58)
+[    3.503216] 1f00:                                     ee7ca310 00000000 00000ab4 c0035560
+[    3.511386] 1f20: c09c0000 00000000 c0a23f84 c09c8474 c09c84bc c09c0000 c0688bf8 c09c1f64
+[    3.519554] 1f40: c09c1f68 c09c1f58 c00235d8 c00235dc 60000113 ffffffff
+[    3.526165] [<c0027540>] (__irq_svc) from [<c00235dc>] (arch_cpu_idle+0x48/0x4c)
+[    3.533557] [<c00235dc>] (arch_cpu_idle) from [<c00701fc>] (cpu_startup_entry+0x13c/0x27c)
+[    3.541816] [<c00701fc>] (cpu_startup_entry) from [<c067af1c>] (rest_init+0x94/0x98)
+[    3.549557] [<c067af1c>] (rest_init) from [<c093dd38>] (start_kernel+0x3f0/0x3fc)
+[    3.557036] [<c093dd38>] (start_kernel) from [<40008084>] (0x40008084)
+[    3.563555] handlers:
+[    3.565830] [<c03a1a80>] ahci_single_irq_intr threaded [<c03a223c>] ahci_thread_fn
+[    3.573415] Disabling IRQ #88
+[    3.576532] ata1: exception Emask 0x10 SAct 0x0 SErr 0x4050002 action 0xe frozen
+[    3.583977] ata1: irq_stat 0x00400040, connection status changed
+[    3.590006] ata1: SError: { RecovComm PHYRdyChg CommWake DevExch }
+[    3.596209] ata1: hard resetting link
+[...]
+
+Not good. The culprit is a missing IRQF_ONESHOT flag, which addition
+solves the problem entierly. The number of interrupts drops radically:
+
+[Booting Debian Jessie to a prompt]
+Before fix:
+ 88:       3562          0       GIC  88  ahci-sunxi
+After fix:
+ 88:       1992          0       GIC  88  ahci-sunxi
+
+Tested on a A20 board (ahci-sunxi).
+
+Cc: Alexander Gordeev <agordeev@redhat.com>
+Cc: Tejun Heo <tj@kernel.org>
+Cc: linux-ide@vger.kernel.org
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ drivers/ata/libahci.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
+index 5eb61c9..49c649f 100644
+--- a/drivers/ata/libahci.c
++++ b/drivers/ata/libahci.c
+@@ -2492,7 +2492,7 @@ static int ahci_host_activate_single_irq(struct ata_host *host, int irq,
+ 		return rc;
+ 
+ 	rc = devm_request_threaded_irq(host->dev, irq, ahci_single_irq_intr,
+-				       ahci_thread_fn, IRQF_SHARED,
++				       ahci_thread_fn, IRQF_SHARED | IRQF_ONESHOT,
+ 				       dev_driver_string(host->dev), host);
+ 	if (rc)
+ 		return rc;
diff --git a/trunk/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch b/trunk/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch
new file mode 100644
index 00000000..2d467c08
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/150-pwm-add-sunxi-driver.patch
@@ -0,0 +1,409 @@
+diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
+index 3865dfb9ed08..424359d3cbb1 100644
+--- a/drivers/pwm/Kconfig
++++ b/drivers/pwm/Kconfig
+@@ -262,6 +262,15 @@ config PWM_STI
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called pwm-sti.
+ 
++config PWM_SUN4I
++	tristate "Allwinner sun4i PWM support"
++	depends on ARCH_SUNXI || COMPILE_TEST
++	help
++	  Generic PWM framework driver for Allwinner sun4i and sun7i SoCs.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called pwm-sun4i.
++
+ config PWM_TEGRA
+ 	tristate "NVIDIA Tegra PWM support"
+ 	depends on ARCH_TEGRA
+diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
+index c458606c3755..d607804deea1 100644
+--- a/drivers/pwm/Makefile
++++ b/drivers/pwm/Makefile
+@@ -24,6 +24,7 @@ obj-$(CONFIG_PWM_ROCKCHIP)	+= pwm-rockchip.o
+ obj-$(CONFIG_PWM_SAMSUNG)	+= pwm-samsung.o
+ obj-$(CONFIG_PWM_SPEAR)		+= pwm-spear.o
+ obj-$(CONFIG_PWM_STI)		+= pwm-sti.o
++obj-$(CONFIG_PWM_SUN4I)		+= pwm-sun4i.o
+ obj-$(CONFIG_PWM_TEGRA)		+= pwm-tegra.o
+ obj-$(CONFIG_PWM_TIECAP)	+= pwm-tiecap.o
+ obj-$(CONFIG_PWM_TIEHRPWM)	+= pwm-tiehrpwm.o
+diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c
+new file mode 100644
+index 000000000000..918f8ee79b51
+--- /dev/null
++++ b/drivers/pwm/pwm-sun4i.c
+@@ -0,0 +1,371 @@
++/*
++ * Driver for Allwinner sun4i Pulse Width Modulation Controller
++ *
++ * Copyright (C) 2014 Alexandre Belloni <alexandre.belloni@free-electrons.com>
++ *
++ * Licensed under GPLv2.
++ */
++
++#include <linux/bitops.h>
++#include <linux/clk.h>
++#include <linux/err.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/platform_device.h>
++#include <linux/pwm.h>
++#include <linux/slab.h>
++#include <linux/time.h>
++
++#define PWM_CTRL_REG		0x0
++
++#define PWM_CH_PRD_BASE		0x4
++#define PWM_CH_PRD_OFFSET	0x4
++#define PWM_CH_PRD(ch)		(PWM_CH_PRD_BASE + PWM_CH_PRD_OFFSET * (ch))
++
++#define PWMCH_OFFSET		15
++#define PWM_PRESCAL_MASK	GENMASK(3, 0)
++#define PWM_PRESCAL_OFF		0
++#define PWM_EN			BIT(4)
++#define PWM_ACT_STATE		BIT(5)
++#define PWM_CLK_GATING		BIT(6)
++#define PWM_MODE		BIT(7)
++#define PWM_PULSE		BIT(8)
++#define PWM_BYPASS		BIT(9)
++
++#define PWM_RDY_BASE		28
++#define PWM_RDY_OFFSET		1
++#define PWM_RDY(ch)		BIT(PWM_RDY_BASE + PWM_RDY_OFFSET * (ch))
++
++#define PWM_PRD(prd)		(((prd) - 1) << 16)
++#define PWM_PRD_MASK		GENMASK(15, 0)
++
++#define PWM_DTY_MASK		GENMASK(15, 0)
++
++#define BIT_CH(bit, chan)	((bit) << ((chan) * PWMCH_OFFSET))
++
++static const u32 prescaler_table[] = {
++	120,
++	180,
++	240,
++	360,
++	480,
++	0,
++	0,
++	0,
++	12000,
++	24000,
++	36000,
++	48000,
++	72000,
++	0,
++	0,
++	0, /* Actually 1 but tested separately */
++};
++
++struct sun4i_pwm_data {
++	bool has_prescaler_bypass;
++	bool has_rdy;
++};
++
++struct sun4i_pwm_chip {
++	struct pwm_chip chip;
++	struct clk *clk;
++	void __iomem *base;
++	struct mutex ctrl_lock;
++	const struct sun4i_pwm_data *data;
++};
++
++static inline struct sun4i_pwm_chip *to_sun4i_pwm_chip(struct pwm_chip *chip)
++{
++	return container_of(chip, struct sun4i_pwm_chip, chip);
++}
++
++static inline u32 sun4i_pwm_readl(struct sun4i_pwm_chip *chip,
++				  unsigned long offset)
++{
++	return readl(chip->base + offset);
++}
++
++static inline void sun4i_pwm_writel(struct sun4i_pwm_chip *chip,
++				    u32 val, unsigned long offset)
++{
++	writel(val, chip->base + offset);
++}
++
++static int sun4i_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
++			    int duty_ns, int period_ns)
++{
++	struct sun4i_pwm_chip *sun4i_pwm = to_sun4i_pwm_chip(chip);
++	u32 clk_rate, prd, dty, val, clk_gate;
++	u64 div = 0;
++	unsigned int prescaler = 0;
++	int err;
++
++	clk_rate = clk_get_rate(sun4i_pwm->clk);
++
++	if (sun4i_pwm->data->has_prescaler_bypass) {
++		/* First, test without any prescaler when available */
++		prescaler = PWM_PRESCAL_MASK;
++		/*
++		 * When not using any prescaler, the clock period in nanoseconds
++		 * is not an integer so round it half up instead of
++		 * truncating to get less surprising values.
++		 */
++		div = clk_rate * (u64)period_ns + NSEC_PER_SEC/2;
++		do_div(div, NSEC_PER_SEC);
++		if (div - 1 > PWM_PRD_MASK)
++			prescaler = 0;
++	}
++
++	if (prescaler == 0) {
++		/* Go up from the first divider */
++		for (prescaler = 0; prescaler < PWM_PRESCAL_MASK; prescaler++) {
++			if (!prescaler_table[prescaler])
++				continue;
++			div = clk_rate / prescaler_table[prescaler];
++			div = div * (u64)period_ns;
++			do_div(div, NSEC_PER_SEC);
++			if (div - 1 <= PWM_PRD_MASK)
++				break;
++		}
++
++		if (div - 1 > PWM_PRD_MASK) {
++			dev_err(chip->dev, "period exceeds the maximum value\n");
++			return -EINVAL;
++		}
++	}
++
++	prd = div;
++	div *= duty_ns;
++	do_div(div, period_ns);
++	dty = div;
++
++	err = clk_prepare_enable(sun4i_pwm->clk);
++	if (err) {
++		dev_err(chip->dev, "failed to enable PWM clock\n");
++		return err;
++	}
++
++	mutex_lock(&sun4i_pwm->ctrl_lock);
++	val = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
++
++	if (sun4i_pwm->data->has_rdy && (val & PWM_RDY(pwm->hwpwm))) {
++		mutex_unlock(&sun4i_pwm->ctrl_lock);
++		clk_disable_unprepare(sun4i_pwm->clk);
++		return -EBUSY;
++	}
++
++	clk_gate = val & BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++	if (clk_gate) {
++		val &= ~BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++		sun4i_pwm_writel(sun4i_pwm, val, PWM_CTRL_REG);
++	}
++
++	val = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
++	val &= ~BIT_CH(PWM_PRESCAL_MASK, pwm->hwpwm);
++	val |= BIT_CH(prescaler, pwm->hwpwm);
++	sun4i_pwm_writel(sun4i_pwm, val, PWM_CTRL_REG);
++
++	val = (dty & PWM_DTY_MASK) | PWM_PRD(prd);
++	sun4i_pwm_writel(sun4i_pwm, val, PWM_CH_PRD(pwm->hwpwm));
++
++	if (clk_gate) {
++		val = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
++		val |= clk_gate;
++		sun4i_pwm_writel(sun4i_pwm, val, PWM_CTRL_REG);
++	}
++
++	mutex_unlock(&sun4i_pwm->ctrl_lock);
++	clk_disable_unprepare(sun4i_pwm->clk);
++
++	return 0;
++}
++
++static int sun4i_pwm_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm,
++				  enum pwm_polarity polarity)
++{
++	struct sun4i_pwm_chip *sun4i_pwm = to_sun4i_pwm_chip(chip);
++	u32 val;
++	int ret;
++
++	ret = clk_prepare_enable(sun4i_pwm->clk);
++	if (ret) {
++		dev_err(chip->dev, "failed to enable PWM clock\n");
++		return ret;
++	}
++
++	mutex_lock(&sun4i_pwm->ctrl_lock);
++	val = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
++
++	if (polarity != PWM_POLARITY_NORMAL)
++		val &= ~BIT_CH(PWM_ACT_STATE, pwm->hwpwm);
++	else
++		val |= BIT_CH(PWM_ACT_STATE, pwm->hwpwm);
++
++	sun4i_pwm_writel(sun4i_pwm, val, PWM_CTRL_REG);
++
++	mutex_unlock(&sun4i_pwm->ctrl_lock);
++	clk_disable_unprepare(sun4i_pwm->clk);
++
++	return 0;
++}
++
++static int sun4i_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
++{
++	struct sun4i_pwm_chip *sun4i_pwm = to_sun4i_pwm_chip(chip);
++	u32 val;
++	int ret;
++
++	ret = clk_prepare_enable(sun4i_pwm->clk);
++	if (ret) {
++		dev_err(chip->dev, "failed to enable PWM clock\n");
++		return ret;
++	}
++
++	mutex_lock(&sun4i_pwm->ctrl_lock);
++	val = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
++	val |= BIT_CH(PWM_EN, pwm->hwpwm);
++	val |= BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++	sun4i_pwm_writel(sun4i_pwm, val, PWM_CTRL_REG);
++	mutex_unlock(&sun4i_pwm->ctrl_lock);
++
++	return 0;
++}
++
++static void sun4i_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
++{
++	struct sun4i_pwm_chip *sun4i_pwm = to_sun4i_pwm_chip(chip);
++	u32 val;
++
++	mutex_lock(&sun4i_pwm->ctrl_lock);
++	val = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
++	val &= ~BIT_CH(PWM_EN, pwm->hwpwm);
++	val &= ~BIT_CH(PWM_CLK_GATING, pwm->hwpwm);
++	sun4i_pwm_writel(sun4i_pwm, val, PWM_CTRL_REG);
++	mutex_unlock(&sun4i_pwm->ctrl_lock);
++
++	clk_disable_unprepare(sun4i_pwm->clk);
++}
++
++static const struct pwm_ops sun4i_pwm_ops = {
++	.config = sun4i_pwm_config,
++	.set_polarity = sun4i_pwm_set_polarity,
++	.enable = sun4i_pwm_enable,
++	.disable = sun4i_pwm_disable,
++	.owner = THIS_MODULE,
++};
++
++static const struct sun4i_pwm_data sun4i_pwm_data_a10 = {
++	.has_prescaler_bypass = false,
++	.has_rdy = false,
++};
++
++static const struct sun4i_pwm_data sun4i_pwm_data_a20 = {
++	.has_prescaler_bypass = true,
++	.has_rdy = true,
++};
++
++static const struct of_device_id sun4i_pwm_dt_ids[] = {
++	{
++		.compatible = "allwinner,sun4i-a10-pwm",
++		.data = &sun4i_pwm_data_a10,
++	}, {
++		.compatible = "allwinner,sun7i-a20-pwm",
++		.data = &sun4i_pwm_data_a20,
++	}, {
++		/* sentinel */
++	},
++};
++MODULE_DEVICE_TABLE(of, sun4i_pwm_dt_ids);
++
++static int sun4i_pwm_probe(struct platform_device *pdev)
++{
++	struct sun4i_pwm_chip *pwm;
++	struct resource *res;
++	u32 val;
++	int i, ret;
++	const struct of_device_id *match;
++
++	match = of_match_device(sun4i_pwm_dt_ids, &pdev->dev);
++
++	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);
++	if (!pwm)
++		return -ENOMEM;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	pwm->base = devm_ioremap_resource(&pdev->dev, res);
++	if (IS_ERR(pwm->base))
++		return PTR_ERR(pwm->base);
++
++	pwm->clk = devm_clk_get(&pdev->dev, NULL);
++	if (IS_ERR(pwm->clk))
++		return PTR_ERR(pwm->clk);
++
++	pwm->chip.dev = &pdev->dev;
++	pwm->chip.ops = &sun4i_pwm_ops;
++	pwm->chip.base = -1;
++	pwm->chip.npwm = 2;
++	pwm->chip.can_sleep = true;
++	pwm->chip.of_xlate = of_pwm_xlate_with_flags;
++	pwm->chip.of_pwm_n_cells = 3;
++	pwm->data = match->data;
++
++	mutex_init(&pwm->ctrl_lock);
++
++	ret = pwmchip_add(&pwm->chip);
++	if (ret < 0) {
++		dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
++		goto error;
++	}
++
++	platform_set_drvdata(pdev, pwm);
++
++	ret = clk_prepare_enable(pwm->clk);
++	if (ret) {
++		dev_err(&pdev->dev, "failed to enable PWM clock\n");
++		goto clk_error;
++	}
++
++	val = sun4i_pwm_readl(pwm, PWM_CTRL_REG);
++	for (i = 0; i < pwm->chip.npwm; i++) {
++		if (!(val & BIT_CH(PWM_ACT_STATE, i)))
++			pwm->chip.pwms[i].polarity = PWM_POLARITY_INVERSED;
++	}
++	clk_disable_unprepare(pwm->clk);
++
++	return 0;
++
++clk_error:
++	pwmchip_remove(&pwm->chip);
++
++error:
++	mutex_destroy(&pwm->ctrl_lock);
++	return ret;
++}
++
++static int sun4i_pwm_remove(struct platform_device *pdev)
++{
++	struct sun4i_pwm_chip *pwm = platform_get_drvdata(pdev);
++
++	mutex_destroy(&pwm->ctrl_lock);
++
++	return pwmchip_remove(&pwm->chip);
++}
++
++static struct platform_driver sun4i_pwm_driver = {
++	.driver = {
++		.name = "sun4i-pwm",
++		.of_match_table = sun4i_pwm_dt_ids,
++	},
++	.probe = sun4i_pwm_probe,
++	.remove = sun4i_pwm_remove,
++};
++module_platform_driver(sun4i_pwm_driver);
++
++MODULE_ALIAS("platform:sun4i-pwm");
++MODULE_AUTHOR("Alexandre Belloni <alexandre.belloni@free-electrons.com>");
++MODULE_DESCRIPTION("Allwinner sun4i PWM driver");
++MODULE_LICENSE("GPL v2");
diff --git a/trunk/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch b/trunk/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch
new file mode 100644
index 00000000..6427df5c
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/200-mmc-add-sdio-function-subnode.patch
@@ -0,0 +1,148 @@
+From 8c2057afe84c074ef7cd3ee2ec8e9bed835b9e93 Mon Sep 17 00:00:00 2001
+From: Sascha Hauer <s.hauer@pengutronix.de>
+Date: Wed, 21 May 2014 19:50:04 +0200
+Subject: [PATCH] mmc: Add SDIO function devicetree subnode parsing
+
+This adds SDIO devicetree subnode parsing to the mmc core. While
+SDIO devices are runtime probable they sometimes need nonprobable
+additional information on embedded systems, like an additional gpio
+interrupt or a clock. This patch makes it possible to supply this
+information from the devicetree. SDIO drivers will find a pointer
+to the devicenode in their devices of_node pointer.
+
+Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
+[hdegoede@redhat.com: Misc. cleanups]
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/mmc/core/bus.c      |  4 ++++
+ drivers/mmc/core/core.c     | 28 ++++++++++++++++++++++++++++
+ drivers/mmc/core/core.h     |  3 +++
+ drivers/mmc/core/sdio_bus.c | 11 +++++++++++
+ 4 files changed, 46 insertions(+)
+
+diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
+index 8a1f124..7868565 100644
+--- a/drivers/mmc/core/bus.c
++++ b/drivers/mmc/core/bus.c
+@@ -16,6 +16,7 @@
+ #include <linux/err.h>
+ #include <linux/slab.h>
+ #include <linux/stat.h>
++#include <linux/of.h>
+ #include <linux/pm_runtime.h>
+ 
+ #include <linux/mmc/card.h>
+@@ -352,6 +353,8 @@ int mmc_add_card(struct mmc_card *card)
+ #endif
+ 	mmc_init_context_info(card->host);
+ 
++	card->dev.of_node = mmc_of_find_child_device(card->host, 0);
++
+ 	ret = device_add(&card->dev);
+ 	if (ret)
+ 		return ret;
+@@ -380,6 +383,7 @@ void mmc_remove_card(struct mmc_card *card)
+ 				mmc_hostname(card->host), card->rca);
+ 		}
+ 		device_del(&card->dev);
++		of_node_put(card->dev.of_node);
+ 	}
+ 
+ 	put_device(&card->dev);
+diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
+index f26a5f1..7f7f66c 100644
+--- a/drivers/mmc/core/core.c
++++ b/drivers/mmc/core/core.c
+@@ -1205,6 +1205,34 @@ EXPORT_SYMBOL(mmc_of_parse_voltage);
+ 
+ #endif /* CONFIG_OF */
+ 
++static int mmc_of_get_func_num(struct device_node *node)
++{
++	u32 reg;
++	int ret;
++
++	ret = of_property_read_u32(node, "reg", &reg);
++	if (ret < 0)
++		return ret;
++
++	return reg;
++}
++
++struct device_node *mmc_of_find_child_device(struct mmc_host *host,
++		unsigned func_num)
++{
++	struct device_node *node;
++
++	if (!host->parent || !host->parent->of_node)
++		return NULL;
++
++	for_each_child_of_node(host->parent->of_node, node) {
++		if (mmc_of_get_func_num(node) == func_num)
++			return node;
++	}
++
++	return NULL;
++}
++
+ #ifdef CONFIG_REGULATOR
+ 
+ /**
+diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
+index 443a5846..f712f6e 100644
+--- a/drivers/mmc/core/core.h
++++ b/drivers/mmc/core/core.h
+@@ -32,6 +32,9 @@ struct mmc_bus_ops {
+ void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
+ void mmc_detach_bus(struct mmc_host *host);
+ 
++struct device_node *mmc_of_find_child_device(struct mmc_host *host,
++		unsigned func_num);
++
+ void mmc_init_erase(struct mmc_card *card);
+ 
+ void mmc_set_chip_select(struct mmc_host *host, int mode);
+diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
+index 6da97b1..f63223a 100644
+--- a/drivers/mmc/core/sdio_bus.c
++++ b/drivers/mmc/core/sdio_bus.c
+@@ -22,7 +22,9 @@
+ #include <linux/mmc/card.h>
+ #include <linux/mmc/host.h>
+ #include <linux/mmc/sdio_func.h>
++#include <linux/of.h>
+ 
++#include "core.h"
+ #include "sdio_cis.h"
+ #include "sdio_bus.h"
+ 
+@@ -303,6 +305,13 @@ static void sdio_acpi_set_handle(struct sdio_func *func)
+ static inline void sdio_acpi_set_handle(struct sdio_func *func) {}
+ #endif
+ 
++static void sdio_set_of_node(struct sdio_func *func)
++{
++	struct mmc_host *host = func->card->host;
++
++	func->dev.of_node = mmc_of_find_child_device(host, func->num);
++}
++
+ /*
+  * Register a new SDIO function with the driver model.
+  */
+@@ -312,6 +321,7 @@ int sdio_add_func(struct sdio_func *func)
+ 
+ 	dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num);
+ 
++	sdio_set_of_node(func);
+ 	sdio_acpi_set_handle(func);
+ 	ret = device_add(&func->dev);
+ 	if (ret == 0) {
+@@ -335,6 +345,7 @@ void sdio_remove_func(struct sdio_func *func)
+ 
+ 	dev_pm_domain_detach(&func->dev, false);
+ 	device_del(&func->dev);
++	of_node_put(func->dev.of_node);
+ 	put_device(&func->dev);
+ }
+ 
diff --git a/trunk/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch b/trunk/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch
new file mode 100644
index 00000000..c6790b74
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/201-dt-sun7i-add-oob-irq-to-bcm-sdio-wifi.patch
@@ -0,0 +1,68 @@
+From e4127db9b980a5684c537d9010ed2aaa05a1e79a Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sat, 24 May 2014 20:53:49 +0200
+Subject: [PATCH] ARM: dts: sun7i: Add OOB irq support to boards with broadcom
+ sdio wifi
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 11 +++++++++++
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts  | 11 +++++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+index a6c1a3c..f9ab5d4 100644
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -31,12 +31,23 @@
+ 		};
+ 
+ 		mmc3: mmc@01c12000 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&mmc3_pins_a>;
+ 			vmmc-supply = <&reg_vmmc3>;
+ 			bus-width = <4>;
+ 			non-removable;
+ 			status = "okay";
++
++			brcmf: bcrmf@1 {
++				reg = <1>;
++				compatible = "brcm,bcm4329-fmac";
++				interrupt-parent = <&pio>;
++				interrupts = <10 8>; /* PH10 / EINT10 */
++				interrupt-names = "host-wake";
++			};
+ 		};
+ 
+ 		usbphy: phy@01c13400 {
+diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+index 6a67712d..f620aea 100644
+--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
++++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+@@ -29,12 +29,23 @@
+ 		};
+ 
+ 		mmc3: mmc@01c12000 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&mmc3_pins_a>;
+ 			vmmc-supply = <&reg_vmmc3>;
+ 			bus-width = <4>;
+ 			non-removable;
+ 			status = "okay";
++
++			brcmf: bcrmf@1 {
++				reg = <1>;
++				compatible = "brcm,bcm4329-fmac";
++				interrupt-parent = <&pio>;
++				interrupts = <10 8>; /* PH10 / EINT10 */
++				interrupt-names = "host-wake";
++			};
+ 		};
+ 
+ 		usbphy: phy@01c13400 {
diff --git a/trunk/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch b/trunk/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch
new file mode 100644
index 00000000..f8198494
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/202-dt-sun7i-add-bluetooth-to-cubietruck.patch
@@ -0,0 +1,75 @@
+From c6e2b7dad39a7887f935458d1c8de84db06243e1 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Thu, 26 Dec 2013 17:15:47 +0800
+Subject: [PATCH] ARM: dts: sun7i: add bluetooth module to CubieTruck DTS
+
+The CubieTruck has an AMPAK AP6210 WiFi+Bluetooth module. The
+Bluetooth part is a BCM20710 IC connected to UART2 in the A20
+SoC. The IC also takes a 32.768 KHz low power clock input, a power
+enable signal and a wake signal via GPIO.
+
+The Bluetooth module supports out-of-band interrupt signaling via
+GPIO, but this is not supported in this patch.
+---
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 36 ++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+index f9ab5d4..69d8c4c 100644
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -103,6 +103,20 @@
+ 				allwinner,drive = <0>;
+ 				allwinner,pull = <0>;
+ 			};
++
++			bt_pwr_pin: bt_pwr_pin@0 {
++				allwinner,pins = "PH18";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			bt_wake_pin: bt_wake_pin@0 {
++				allwinner,pins = "PH24";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
+ 		};
+ 
+ 		pwm: pwm@01c20e00 {
+@@ -123,6 +137,12 @@
+ 			status = "okay";
+ 		};
+ 
++		uart2: serial@01c28800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart2_pins_a>;
++			status = "okay";
++		};
++
+ 		i2c0: i2c@01c2ac00 {
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&i2c0_pins_a>;
+@@ -214,4 +234,20 @@
+ 		enable-active-high;
+ 		gpio = <&pio 7 9 0>;
+ 	};
++
++	rfkill-switches {
++		compatible = "simple-bus";
++		pinctrl-names = "default";
++
++		rfkill_bt {
++			compatible = "rfkill-gpio";
++			pinctrl-0 = <&bt_pwr_pin>, <&clk_out_a_pins_a>;
++			rfkill-name = "bt";
++			rfkill-type = <2>;
++			bt_shutdown-gpios = <0>, <&pio 7 18 0>; /* PH18 */
++			bt_reset-gpios = <&pio 7 24 0>; /* PH24 */
++			clocks = <&clk_out_a>;
++			clock-frequency = <32768>;
++		};
++	};
+ };
diff --git a/trunk/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch b/trunk/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch
new file mode 100644
index 00000000..11a6ed03
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/270-dt-sun7i-add-ss-to-a20.patch
@@ -0,0 +1,17 @@
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -529,6 +529,14 @@
+ 			status = "disabled";
+ 		};
+ 
++		crypto: crypto-engine@01c15000 {
++			compatible = "allwinner,sun7i-a20-crypto";
++			reg = <0x01c15000 0x1000>;
++			interrupts = <0 86 4>;
++			clocks = <&ahb_gates 5>, <&ss_clk>;
++			clock-names = "ahb", "mod";
++		};
++
+ 		spi2: spi@01c17000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c17000 0x1000>;
diff --git a/trunk/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch b/trunk/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch
new file mode 100644
index 00000000..090624de
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/271-crypto-add-ss.patch
@@ -0,0 +1,1512 @@
+diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
+index 2fb0fdf..9ba9759 100644
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
+@@ -436,4 +436,21 @@ config CRYPTO_DEV_QCE
+ 	  hardware. To compile this driver as a module, choose M here. The
+ 	  module will be called qcrypto.
+ 
++config CRYPTO_DEV_SUNXI_SS
++	tristate "Support for Allwinner Security System cryptographic accelerator"
++	depends on ARCH_SUNXI
++	select CRYPTO_MD5
++	select CRYPTO_SHA1
++	select CRYPTO_AES
++	select CRYPTO_DES
++	select CRYPTO_BLKCIPHER
++	help
++	  Some Allwinner SoC have a crypto accelerator named
++	  Security System. Select this if you want to use it.
++	  The Security System handle AES/DES/3DES ciphers in CBC mode
++	  and SHA1 and MD5 hash algorithms.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called sunxi-ss.
++
+ endif # CRYPTO_HW
+diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
+index 3924f93..856545c 100644
+--- a/drivers/crypto/Makefile
++++ b/drivers/crypto/Makefile
+@@ -25,3 +25,4 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
+ obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
+ obj-$(CONFIG_CRYPTO_DEV_QAT) += qat/
+ obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/
++obj-$(CONFIG_CRYPTO_DEV_SUNXI_SS) += sunxi-ss/
+diff --git a/drivers/crypto/sunxi-ss/Makefile b/drivers/crypto/sunxi-ss/Makefile
+new file mode 100644
+index 0000000..8bb287d
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/Makefile
+@@ -0,0 +1,2 @@
++obj-$(CONFIG_CRYPTO_DEV_SUNXI_SS) += sunxi-ss.o
++sunxi-ss-y += sunxi-ss-core.o sunxi-ss-hash.o sunxi-ss-cipher.o
+diff --git a/drivers/crypto/sunxi-ss/sunxi-ss-cipher.c b/drivers/crypto/sunxi-ss/sunxi-ss-cipher.c
+new file mode 100644
+index 0000000..8d0416e
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss-cipher.c
+@@ -0,0 +1,489 @@
++/*
++ * sunxi-ss-cipher.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * This file add support for AES cipher with 128,192,256 bits
++ * keysize in CBC mode.
++ * Add support also for DES and 3DES in CBC mode.
++ *
++ * You could find the datasheet in Documentation/arm/sunxi/README
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++#include "sunxi-ss.h"
++
++extern struct sunxi_ss_ctx *ss;
++
++static int sunxi_ss_cipher(struct ablkcipher_request *areq, u32 mode)
++{
++	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(areq);
++	struct sunxi_tfm_ctx *op = crypto_ablkcipher_ctx(tfm);
++	const char *cipher_type;
++
++	if (areq->nbytes == 0)
++		return 0;
++
++	if (areq->info == NULL) {
++		dev_err(ss->dev, "ERROR: Empty IV\n");
++		return -EINVAL;
++	}
++
++	if (areq->src == NULL || areq->dst == NULL) {
++		dev_err(ss->dev, "ERROR: Some SGs are NULL\n");
++		return -EINVAL;
++	}
++
++	cipher_type = crypto_tfm_alg_name(crypto_ablkcipher_tfm(tfm));
++
++	if (strcmp("cbc(aes)", cipher_type) == 0) {
++		mode |= SS_OP_AES | SS_CBC | SS_ENABLED | op->keymode;
++		return sunxi_ss_aes_poll(areq, mode);
++	}
++
++	if (strcmp("cbc(des)", cipher_type) == 0) {
++		mode |= SS_OP_DES | SS_CBC | SS_ENABLED | op->keymode;
++		return sunxi_ss_des_poll(areq, mode);
++	}
++
++	if (strcmp("cbc(des3_ede)", cipher_type) == 0) {
++		mode |= SS_OP_3DES | SS_CBC | SS_ENABLED | op->keymode;
++		return sunxi_ss_des_poll(areq, mode);
++	}
++
++	dev_err(ss->dev, "ERROR: Cipher %s not handled\n", cipher_type);
++	return -EINVAL;
++}
++
++int sunxi_ss_cipher_encrypt(struct ablkcipher_request *areq)
++{
++	return sunxi_ss_cipher(areq, SS_ENCRYPTION);
++}
++
++int sunxi_ss_cipher_decrypt(struct ablkcipher_request *areq)
++{
++	return sunxi_ss_cipher(areq, SS_DECRYPTION);
++}
++
++int sunxi_ss_cipher_init(struct crypto_tfm *tfm)
++{
++	struct sunxi_tfm_ctx *op = crypto_tfm_ctx(tfm);
++
++	memset(op, 0, sizeof(struct sunxi_tfm_ctx));
++	return 0;
++}
++
++/*
++ * Optimized function for the case where we have only one SG,
++ * so we can use kmap_atomic
++ */
++static int sunxi_ss_aes_poll_atomic(struct ablkcipher_request *areq)
++{
++	u32 spaces;
++	struct scatterlist *in_sg = areq->src;
++	struct scatterlist *out_sg = areq->dst;
++	void *src_addr;
++	void *dst_addr;
++	unsigned int ileft = areq->nbytes;
++	unsigned int oleft = areq->nbytes;
++	unsigned int todo;
++	u32 *src32;
++	u32 *dst32;
++	u32 rx_cnt = 32;
++	u32 tx_cnt = 0;
++	int i;
++
++	src_addr = kmap_atomic(sg_page(in_sg)) + in_sg->offset;
++	if (src_addr == NULL) {
++		dev_err(ss->dev, "kmap_atomic error for src SG\n");
++		writel(0, ss->base + SS_CTL);
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++
++	dst_addr = kmap_atomic(sg_page(out_sg)) + out_sg->offset;
++	if (dst_addr == NULL) {
++		dev_err(ss->dev, "kmap_atomic error for dst SG\n");
++		writel(0, ss->base + SS_CTL);
++		kunmap_atomic(src_addr);
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++
++	src32 = (u32 *)src_addr;
++	dst32 = (u32 *)dst_addr;
++	ileft = areq->nbytes / 4;
++	oleft = areq->nbytes / 4;
++	i = 0;
++	do {
++		if (ileft > 0 && rx_cnt > 0) {
++			todo = min(rx_cnt, ileft);
++			ileft -= todo;
++			do {
++				writel_relaxed(*src32++,
++						ss->base +
++						SS_RXFIFO);
++				todo--;
++			} while (todo > 0);
++		}
++		if (tx_cnt > 0) {
++			todo = min(tx_cnt, oleft);
++			oleft -= todo;
++			do {
++				*dst32++ = readl_relaxed(ss->base +
++						SS_TXFIFO);
++				todo--;
++			} while (todo > 0);
++		}
++		spaces = readl_relaxed(ss->base + SS_FCSR);
++		rx_cnt = SS_RXFIFO_SPACES(spaces);
++		tx_cnt = SS_TXFIFO_SPACES(spaces);
++	} while (oleft > 0);
++	writel(0, ss->base + SS_CTL);
++	kunmap_atomic(src_addr);
++	kunmap_atomic(dst_addr);
++	mutex_unlock(&ss->lock);
++	return 0;
++}
++
++int sunxi_ss_aes_poll(struct ablkcipher_request *areq, u32 mode)
++{
++	u32 spaces;
++	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(areq);
++	struct sunxi_tfm_ctx *op = crypto_ablkcipher_ctx(tfm);
++	unsigned int ivsize = crypto_ablkcipher_ivsize(tfm);
++	/* when activating SS, the default FIFO space is 32 */
++	u32 rx_cnt = 32;
++	u32 tx_cnt = 0;
++	u32 v;
++	int i;
++	struct scatterlist *in_sg = areq->src;
++	struct scatterlist *out_sg = areq->dst;
++	void *src_addr;
++	void *dst_addr;
++	unsigned int ileft = areq->nbytes;
++	unsigned int oleft = areq->nbytes;
++	unsigned int sgileft = areq->src->length;
++	unsigned int sgoleft = areq->dst->length;
++	unsigned int todo;
++	u32 *src32;
++	u32 *dst32;
++
++	mutex_lock(&ss->lock);
++
++	for (i = 0; i < op->keylen; i += 4)
++		writel(*(op->key + i/4), ss->base + SS_KEY0 + i);
++
++	if (areq->info != NULL) {
++		for (i = 0; i < 4 && i < ivsize / 4; i++) {
++			v = *(u32 *)(areq->info + i * 4);
++			writel(v, ss->base + SS_IV0 + i * 4);
++		}
++	}
++	writel(mode, ss->base + SS_CTL);
++
++	/* If we have only one SG, we can use kmap_atomic */
++	if (sg_next(in_sg) == NULL && sg_next(out_sg) == NULL)
++		return sunxi_ss_aes_poll_atomic(areq);
++
++	/*
++	 * If we have more than one SG, we cannot use kmap_atomic since
++	 * we hold the mapping too long
++	 */
++	src_addr = kmap(sg_page(in_sg)) + in_sg->offset;
++	if (src_addr == NULL) {
++		dev_err(ss->dev, "KMAP error for src SG\n");
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++	dst_addr = kmap(sg_page(out_sg)) + out_sg->offset;
++	if (dst_addr == NULL) {
++		kunmap(sg_page(in_sg));
++		dev_err(ss->dev, "KMAP error for dst SG\n");
++		mutex_unlock(&ss->lock);
++		return -EINVAL;
++	}
++	src32 = (u32 *)src_addr;
++	dst32 = (u32 *)dst_addr;
++	ileft = areq->nbytes / 4;
++	oleft = areq->nbytes / 4;
++	sgileft = in_sg->length / 4;
++	sgoleft = out_sg->length / 4;
++	do {
++		spaces = readl_relaxed(ss->base + SS_FCSR);
++		rx_cnt = SS_RXFIFO_SPACES(spaces);
++		tx_cnt = SS_TXFIFO_SPACES(spaces);
++		todo = min3(rx_cnt, ileft, sgileft);
++		if (todo > 0) {
++			ileft -= todo;
++			sgileft -= todo;
++		}
++		while (todo > 0) {
++			writel_relaxed(*src32++, ss->base + SS_RXFIFO);
++			todo--;
++		}
++		if (in_sg != NULL && sgileft == 0 && ileft > 0) {
++			kunmap(sg_page(in_sg));
++			in_sg = sg_next(in_sg);
++			while (in_sg != NULL && in_sg->length == 0)
++				in_sg = sg_next(in_sg);
++			if (in_sg != NULL && ileft > 0) {
++				src_addr = kmap(sg_page(in_sg)) + in_sg->offset;
++				if (src_addr == NULL) {
++					dev_err(ss->dev, "ERROR: KMAP for src SG\n");
++					mutex_unlock(&ss->lock);
++					return -EINVAL;
++				}
++				src32 = src_addr;
++				sgileft = in_sg->length / 4;
++			}
++		}
++		/* do not test oleft since when oleft == 0 we have finished */
++		todo = min3(tx_cnt, oleft, sgoleft);
++		if (todo > 0) {
++			oleft -= todo;
++			sgoleft -= todo;
++		}
++		while (todo > 0) {
++			*dst32++ = readl_relaxed(ss->base + SS_TXFIFO);
++			todo--;
++		}
++		if (out_sg != NULL && sgoleft == 0 && oleft >= 0) {
++			kunmap(sg_page(out_sg));
++			out_sg = sg_next(out_sg);
++			while (out_sg != NULL && out_sg->length == 0)
++				out_sg = sg_next(out_sg);
++			if (out_sg != NULL && oleft > 0) {
++				dst_addr = kmap(sg_page(out_sg)) +
++					out_sg->offset;
++				if (dst_addr == NULL) {
++					dev_err(ss->dev, "KMAP error\n");
++					mutex_unlock(&ss->lock);
++					return -EINVAL;
++				}
++				dst32 = dst_addr;
++				sgoleft = out_sg->length / 4;
++			}
++		}
++	} while (oleft > 0);
++
++	writel_relaxed(0, ss->base + SS_CTL);
++	mutex_unlock(&ss->lock);
++	return 0;
++}
++
++/*
++ * Pure CPU way of doing DES/3DES with SS
++ * Since DES and 3DES SGs could be smaller than 4 bytes, I use sg_copy_to_buffer
++ * for "linearize" them.
++ * The problem with that is that I alloc (2 x areq->nbytes) for buf_in/buf_out
++ * TODO: change this system, I need to support other mode than CBC where len
++ * is not a multiple of 4 and the hack of linearize use too much memory
++ * SGsrc -> buf_in -> SS -> buf_out -> SGdst
++ */
++int sunxi_ss_des_poll(struct ablkcipher_request *areq, u32 mode)
++{
++	u32 value, spaces;
++	size_t nb_in_sg_tx, nb_in_sg_rx;
++	size_t ir, it;
++	struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(areq);
++	struct sunxi_tfm_ctx *op = crypto_ablkcipher_ctx(tfm);
++	unsigned int ivsize = crypto_ablkcipher_ivsize(tfm);
++	u32 tx_cnt = 0;
++	u32 rx_cnt = 0;
++	u32 v;
++	int i;
++	int no_chunk = 1;
++	struct scatterlist *in_sg = areq->src;
++	struct scatterlist *out_sg = areq->dst;
++
++	/*
++	 * if we have only SGs with size multiple of 4,
++	 * we can use the SS AES function
++	 */
++	while (in_sg != NULL && no_chunk == 1) {
++		if ((in_sg->length % 4) != 0)
++			no_chunk = 0;
++		in_sg = sg_next(in_sg);
++	}
++	while (out_sg != NULL && no_chunk == 1) {
++		if ((out_sg->length % 4) != 0)
++			no_chunk = 0;
++		out_sg = sg_next(out_sg);
++	}
++
++	if (no_chunk == 1)
++		return sunxi_ss_aes_poll(areq, mode);
++
++	in_sg = areq->src;
++	out_sg = areq->dst;
++
++	nb_in_sg_rx = sg_nents(in_sg);
++	nb_in_sg_tx = sg_nents(out_sg);
++
++	/*
++	 * buf_in and buf_out are allocated only one time
++	 * then we keep the buffer until driver end
++	 * the allocation can only grow more
++	 * we do not reduce it for simplification
++	 */
++	mutex_lock(&ss->bufin_lock);
++	if (ss->buf_in == NULL) {
++		ss->buf_in = kmalloc(areq->nbytes, GFP_KERNEL);
++		ss->buf_in_size = areq->nbytes;
++	} else {
++		if (areq->nbytes > ss->buf_in_size) {
++			kfree(ss->buf_in);
++			ss->buf_in = kmalloc(areq->nbytes, GFP_KERNEL);
++			ss->buf_in_size = areq->nbytes;
++		}
++	}
++	if (ss->buf_in == NULL) {
++		ss->buf_in_size = 0;
++		mutex_unlock(&ss->bufin_lock);
++		dev_err(ss->dev, "Unable to allocate pages.\n");
++		return -ENOMEM;
++	}
++	mutex_lock(&ss->bufout_lock);
++	if (ss->buf_out == NULL) {
++		ss->buf_out = kmalloc(areq->nbytes, GFP_KERNEL);
++		if (ss->buf_out == NULL) {
++			ss->buf_out_size = 0;
++			mutex_unlock(&ss->bufin_lock);
++			mutex_unlock(&ss->bufout_lock);
++			dev_err(ss->dev, "Unable to allocate pages.\n");
++			return -ENOMEM;
++		}
++		ss->buf_out_size = areq->nbytes;
++	} else {
++		if (areq->nbytes > ss->buf_out_size) {
++			kfree(ss->buf_out);
++			ss->buf_out = kmalloc(areq->nbytes, GFP_KERNEL);
++			if (ss->buf_out == NULL) {
++				ss->buf_out_size = 0;
++				mutex_unlock(&ss->bufin_lock);
++				mutex_unlock(&ss->bufout_lock);
++				dev_err(ss->dev, "Unable to allocate pages.\n");
++				return -ENOMEM;
++			}
++			ss->buf_out_size = areq->nbytes;
++		}
++	}
++
++	sg_copy_to_buffer(areq->src, nb_in_sg_rx, ss->buf_in, areq->nbytes);
++
++	ir = 0;
++	it = 0;
++	mutex_lock(&ss->lock);
++
++	for (i = 0; i < op->keylen; i += 4)
++		writel(*(op->key + i/4), ss->base + SS_KEY0 + i);
++	if (areq->info != NULL) {
++		for (i = 0; i < 4 && i < ivsize / 4; i++) {
++			v = *(u32 *)(areq->info + i * 4);
++			writel(v, ss->base + SS_IV0 + i * 4);
++		}
++	}
++	writel(mode, ss->base + SS_CTL);
++
++	do {
++		if (rx_cnt == 0 || tx_cnt == 0) {
++			spaces = readl(ss->base + SS_FCSR);
++			rx_cnt = SS_RXFIFO_SPACES(spaces);
++			tx_cnt = SS_TXFIFO_SPACES(spaces);
++		}
++		if (rx_cnt > 0 && ir < areq->nbytes) {
++			do {
++				value = *(u32 *)(ss->buf_in + ir);
++				writel(value, ss->base + SS_RXFIFO);
++				ir += 4;
++				rx_cnt--;
++			} while (rx_cnt > 0 && ir < areq->nbytes);
++		}
++		if (tx_cnt > 0 && it < areq->nbytes) {
++			do {
++				value = readl(ss->base + SS_TXFIFO);
++				*(u32 *)(ss->buf_out + it) = value;
++				it += 4;
++				tx_cnt--;
++			} while (tx_cnt > 0 && it < areq->nbytes);
++		}
++		if (ir == areq->nbytes) {
++			mutex_unlock(&ss->bufin_lock);
++			ir++;
++		}
++	} while (it < areq->nbytes);
++
++	writel(0, ss->base + SS_CTL);
++	mutex_unlock(&ss->lock);
++
++	/*
++	 * a simple optimization, since we dont need the hardware for this copy
++	 * we release the lock and do the copy. With that we gain 5/10% perf
++	 */
++	sg_copy_from_buffer(areq->dst, nb_in_sg_tx, ss->buf_out, areq->nbytes);
++
++	mutex_unlock(&ss->bufout_lock);
++	return 0;
++}
++
++/* check and set the AES key, prepare the mode to be used */
++int sunxi_ss_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen)
++{
++	struct sunxi_tfm_ctx *op = crypto_ablkcipher_ctx(tfm);
++
++	switch (keylen) {
++	case 128 / 8:
++		op->keymode = SS_AES_128BITS;
++		break;
++	case 192 / 8:
++		op->keymode = SS_AES_192BITS;
++		break;
++	case 256 / 8:
++		op->keymode = SS_AES_256BITS;
++		break;
++	default:
++		dev_err(ss->dev, "ERROR: Invalid keylen %u\n", keylen);
++		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
++		return -EINVAL;
++	}
++	op->keylen = keylen;
++	memcpy(op->key, key, keylen);
++	return 0;
++}
++
++/* check and set the DES key, prepare the mode to be used */
++int sunxi_ss_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen)
++{
++	struct sunxi_tfm_ctx *op = crypto_ablkcipher_ctx(tfm);
++
++	if (keylen != DES_KEY_SIZE) {
++		dev_err(ss->dev, "Invalid keylen %u\n", keylen);
++		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
++		return -EINVAL;
++	}
++	op->keylen = keylen;
++	memcpy(op->key, key, keylen);
++	return 0;
++}
++
++/* check and set the 3DES key, prepare the mode to be used */
++int sunxi_ss_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen)
++{
++	struct sunxi_tfm_ctx *op = crypto_ablkcipher_ctx(tfm);
++
++	if (keylen != 3 * DES_KEY_SIZE) {
++		dev_err(ss->dev, "Invalid keylen %u\n", keylen);
++		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
++		return -EINVAL;
++	}
++	op->keylen = keylen;
++	memcpy(op->key, key, keylen);
++	return 0;
++}
+diff --git a/drivers/crypto/sunxi-ss/sunxi-ss-core.c b/drivers/crypto/sunxi-ss/sunxi-ss-core.c
+new file mode 100644
+index 0000000..e66d7e2
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss-core.c
+@@ -0,0 +1,318 @@
++/*
++ * sunxi-ss-core.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * Core file which registers crypto algorithms supported by the SS.
++ *
++ * You could find a link for the datasheet in Documentation/arm/sunxi/README
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++#include <linux/clk.h>
++#include <linux/crypto.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <crypto/scatterwalk.h>
++#include <linux/scatterlist.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++
++#include "sunxi-ss.h"
++
++struct sunxi_ss_ctx *ss;
++
++/*
++ * General notes for whole driver:
++ *
++ * After each request the device must be disabled with a write of 0 in SS_CTL
++ *
++ * For performance reason, we use writel_relaxed/read_relaxed for all
++ * operations on RX and TX FIFO and also SS_FCSR.
++ * Excepts for the last write on TX FIFO.
++ * For all other registers, we use writel/readl.
++ * See http://permalink.gmane.org/gmane.linux.ports.arm.kernel/117644
++ * and http://permalink.gmane.org/gmane.linux.ports.arm.kernel/117640
++ */
++
++static struct ahash_alg sunxi_md5_alg = {
++	.init = sunxi_hash_init,
++	.update = sunxi_hash_update,
++	.final = sunxi_hash_final,
++	.finup = sunxi_hash_finup,
++	.digest = sunxi_hash_digest,
++	.halg = {
++		.digestsize = MD5_DIGEST_SIZE,
++		.base = {
++			.cra_name = "md5",
++			.cra_driver_name = "md5-sunxi-ss",
++			.cra_priority = 300,
++			.cra_alignmask = 3,
++			.cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC,
++			.cra_blocksize = MD5_HMAC_BLOCK_SIZE,
++			.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++			.cra_module = THIS_MODULE,
++			.cra_type = &crypto_ahash_type,
++			.cra_init = sunxi_hash_crainit
++		}
++	}
++};
++
++static struct ahash_alg sunxi_sha1_alg = {
++	.init = sunxi_hash_init,
++	.update = sunxi_hash_update,
++	.final = sunxi_hash_final,
++	.finup = sunxi_hash_finup,
++	.digest = sunxi_hash_digest,
++	.halg = {
++		.digestsize = SHA1_DIGEST_SIZE,
++		.base = {
++			.cra_name = "sha1",
++			.cra_driver_name = "sha1-sunxi-ss",
++			.cra_priority = 300,
++			.cra_alignmask = 3,
++			.cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC,
++			.cra_blocksize = SHA1_BLOCK_SIZE,
++			.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++			.cra_module = THIS_MODULE,
++			.cra_type = &crypto_ahash_type,
++			.cra_init = sunxi_hash_crainit
++		}
++	}
++};
++
++static struct crypto_alg sunxi_cipher_algs[] = {
++{
++	.cra_name = "cbc(aes)",
++	.cra_driver_name = "cbc-aes-sunxi-ss",
++	.cra_priority = 300,
++	.cra_blocksize = AES_BLOCK_SIZE,
++	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
++	.cra_ctxsize = sizeof(struct sunxi_tfm_ctx),
++	.cra_module = THIS_MODULE,
++	.cra_alignmask = 3,
++	.cra_type = &crypto_ablkcipher_type,
++	.cra_init = sunxi_ss_cipher_init,
++	.cra_u = {
++		.ablkcipher = {
++			.min_keysize    = AES_MIN_KEY_SIZE,
++			.max_keysize    = AES_MAX_KEY_SIZE,
++			.ivsize         = AES_BLOCK_SIZE,
++			.setkey         = sunxi_ss_aes_setkey,
++			.encrypt        = sunxi_ss_cipher_encrypt,
++			.decrypt        = sunxi_ss_cipher_decrypt,
++		}
++	}
++}, {
++	.cra_name = "cbc(des)",
++	.cra_driver_name = "cbc-des-sunxi-ss",
++	.cra_priority = 300,
++	.cra_blocksize = DES_BLOCK_SIZE,
++	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
++	.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++	.cra_module = THIS_MODULE,
++	.cra_alignmask = 3,
++	.cra_type = &crypto_ablkcipher_type,
++	.cra_init = sunxi_ss_cipher_init,
++	.cra_u.ablkcipher = {
++		.min_keysize    = DES_KEY_SIZE,
++		.max_keysize    = DES_KEY_SIZE,
++		.ivsize         = DES_BLOCK_SIZE,
++		.setkey         = sunxi_ss_des_setkey,
++		.encrypt        = sunxi_ss_cipher_encrypt,
++		.decrypt        = sunxi_ss_cipher_decrypt,
++	}
++}, {
++	.cra_name = "cbc(des3_ede)",
++	.cra_driver_name = "cbc-des3-sunxi-ss",
++	.cra_priority = 300,
++	.cra_blocksize = DES3_EDE_BLOCK_SIZE,
++	.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
++	.cra_ctxsize = sizeof(struct sunxi_req_ctx),
++	.cra_module = THIS_MODULE,
++	.cra_alignmask = 3,
++	.cra_type = &crypto_ablkcipher_type,
++	.cra_init = sunxi_ss_cipher_init,
++	.cra_u.ablkcipher = {
++		.min_keysize    = DES3_EDE_KEY_SIZE,
++		.max_keysize    = DES3_EDE_KEY_SIZE,
++		.ivsize         = DES3_EDE_BLOCK_SIZE,
++		.setkey         = sunxi_ss_des3_setkey,
++		.encrypt        = sunxi_ss_cipher_encrypt,
++		.decrypt        = sunxi_ss_cipher_decrypt,
++	}
++}
++};
++
++static int sunxi_ss_probe(struct platform_device *pdev)
++{
++	struct resource *res;
++	u32 v;
++	int err;
++	unsigned long cr;
++	const unsigned long cr_ahb = 24 * 1000 * 1000;
++	const unsigned long cr_mod = 150 * 1000 * 1000;
++
++	if (!pdev->dev.of_node)
++		return -ENODEV;
++
++	ss = devm_kzalloc(&pdev->dev, sizeof(*ss), GFP_KERNEL);
++	if (ss == NULL)
++		return -ENOMEM;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	ss->base = devm_ioremap_resource(&pdev->dev, res);
++	if (IS_ERR(ss->base)) {
++		dev_err(&pdev->dev, "Cannot request MMIO\n");
++		return PTR_ERR(ss->base);
++	}
++
++	ss->ssclk = devm_clk_get(&pdev->dev, "mod");
++	if (IS_ERR(ss->ssclk)) {
++		err = PTR_ERR(ss->ssclk);
++		dev_err(&pdev->dev, "Cannot get SS clock err=%d\n", err);
++		return err;
++	}
++	dev_dbg(&pdev->dev, "clock ss acquired\n");
++
++	ss->busclk = devm_clk_get(&pdev->dev, "ahb");
++	if (IS_ERR(ss->busclk)) {
++		err = PTR_ERR(ss->busclk);
++		dev_err(&pdev->dev, "Cannot get AHB SS clock err=%d\n", err);
++		return err;
++	}
++	dev_dbg(&pdev->dev, "clock ahb_ss acquired\n");
++
++	/* Enable both clocks */
++	err = clk_prepare_enable(ss->busclk);
++	if (err != 0) {
++		dev_err(&pdev->dev, "Cannot prepare_enable busclk\n");
++		return err;
++	}
++	err = clk_prepare_enable(ss->ssclk);
++	if (err != 0) {
++		dev_err(&pdev->dev, "Cannot prepare_enable ssclk\n");
++		clk_disable_unprepare(ss->busclk);
++		return err;
++	}
++
++	/*
++	 * Check that clock have the correct rates gived in the datasheet
++	 * Try to set the clock to the maximum allowed
++	 */
++	err = clk_set_rate(ss->ssclk, cr_mod);
++	if (err != 0) {
++		dev_err(&pdev->dev, "Cannot set clock rate to ssclk\n");
++		clk_disable_unprepare(ss->ssclk);
++		clk_disable_unprepare(ss->busclk);
++		return err;
++	}
++
++	cr = clk_get_rate(ss->busclk);
++	if (cr >= cr_ahb)
++		dev_dbg(&pdev->dev, "Clock bus %lu (%lu MHz) (must be >= %lu)\n",
++				cr, cr / 1000000, cr_ahb);
++	else
++		dev_warn(&pdev->dev, "Clock bus %lu (%lu MHz) (must be >= %lu)\n",
++				cr, cr / 1000000, cr_ahb);
++
++	cr = clk_get_rate(ss->ssclk);
++	if (cr <= cr_mod)
++		if (cr < cr_mod)
++			dev_info(&pdev->dev, "Clock ss %lu (%lu MHz) (must be <= %lu)\n",
++					cr, cr / 1000000, cr_mod);
++		else
++			dev_dbg(&pdev->dev, "Clock ss %lu (%lu MHz) (must be <= %lu)\n",
++					cr, cr / 1000000, cr_mod);
++	else
++		dev_warn(&pdev->dev, "Clock ss is at %lu (%lu MHz) (must be <= %lu)\n",
++				cr, cr / 1000000, cr_mod);
++
++	/*
++	 * Datasheet named it "Die Bonding ID"
++	 * I expect to be a sort of Security System Revision number.
++	 * Since the A80 seems to have an other version of SS
++	 * this info could be useful
++	 */
++	writel(SS_ENABLED, ss->base + SS_CTL);
++	v = readl(ss->base + SS_CTL);
++	v >>= 16;
++	v &= 0x07;
++	dev_info(&pdev->dev, "Die ID %d\n", v);
++	writel(0, ss->base + SS_CTL);
++
++	ss->dev = &pdev->dev;
++
++	mutex_init(&ss->lock);
++	mutex_init(&ss->bufin_lock);
++	mutex_init(&ss->bufout_lock);
++
++	err = crypto_register_ahash(&sunxi_md5_alg);
++	if (err)
++		goto error_md5;
++	err = crypto_register_ahash(&sunxi_sha1_alg);
++	if (err)
++		goto error_sha1;
++	err = crypto_register_algs(sunxi_cipher_algs,
++			ARRAY_SIZE(sunxi_cipher_algs));
++	if (err)
++		goto error_ciphers;
++
++	return 0;
++error_ciphers:
++	crypto_unregister_ahash(&sunxi_sha1_alg);
++error_sha1:
++	crypto_unregister_ahash(&sunxi_md5_alg);
++error_md5:
++	clk_disable_unprepare(ss->ssclk);
++	clk_disable_unprepare(ss->busclk);
++	return err;
++}
++
++static int __exit sunxi_ss_remove(struct platform_device *pdev)
++{
++	if (!pdev->dev.of_node)
++		return 0;
++
++	crypto_unregister_ahash(&sunxi_md5_alg);
++	crypto_unregister_ahash(&sunxi_sha1_alg);
++	crypto_unregister_algs(sunxi_cipher_algs,
++			ARRAY_SIZE(sunxi_cipher_algs));
++
++	if (ss->buf_in != NULL)
++		kfree(ss->buf_in);
++	if (ss->buf_out != NULL)
++		kfree(ss->buf_out);
++
++	writel(0, ss->base + SS_CTL);
++	clk_disable_unprepare(ss->busclk);
++	clk_disable_unprepare(ss->ssclk);
++	return 0;
++}
++
++static const struct of_device_id a20ss_crypto_of_match_table[] = {
++	{ .compatible = "allwinner,sun7i-a20-crypto" },
++	{}
++};
++MODULE_DEVICE_TABLE(of, a20ss_crypto_of_match_table);
++
++static struct platform_driver sunxi_ss_driver = {
++	.probe          = sunxi_ss_probe,
++	.remove         = __exit_p(sunxi_ss_remove),
++	.driver         = {
++		.owner          = THIS_MODULE,
++		.name           = "sunxi-ss",
++		.of_match_table	= a20ss_crypto_of_match_table,
++	},
++};
++
++module_platform_driver(sunxi_ss_driver);
++
++MODULE_DESCRIPTION("Allwinner Security System cryptographic accelerator");
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Corentin LABBE <clabbe.montjoie@gmail.com>");
+diff --git a/drivers/crypto/sunxi-ss/sunxi-ss-hash.c b/drivers/crypto/sunxi-ss/sunxi-ss-hash.c
+new file mode 100644
+index 0000000..ec8758f
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss-hash.c
+@@ -0,0 +1,445 @@
++/*
++ * sunxi-ss-hash.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * This file add support for MD5 and SHA1.
++ *
++ * You could find the datasheet in Documentation/arm/sunxi/README
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++#include "sunxi-ss.h"
++
++/* This is a totaly arbitrary value */
++#define SS_TIMEOUT 100
++
++extern struct sunxi_ss_ctx *ss;
++
++int sunxi_hash_crainit(struct crypto_tfm *tfm)
++{
++	crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),
++			sizeof(struct sunxi_req_ctx));
++	return 0;
++}
++
++/* sunxi_hash_init: initialize request context */
++int sunxi_hash_init(struct ahash_request *areq)
++{
++	const char *hash_type;
++	struct sunxi_req_ctx *op = ahash_request_ctx(areq);
++
++	memset(op, 0, sizeof(struct sunxi_req_ctx));
++
++	hash_type = crypto_tfm_alg_name(areq->base.tfm);
++
++	if (strcmp(hash_type, "sha1") == 0)
++		op->mode = SS_OP_SHA1;
++	if (strcmp(hash_type, "md5") == 0)
++		op->mode = SS_OP_MD5;
++	if (op->mode == 0)
++		return -EINVAL;
++
++	return 0;
++}
++
++static u32 rx_cnt;
++
++inline void ss_writer(const u32 v)
++{
++	u32 spaces;
++
++	writel(v, ss->base + SS_RXFIFO);
++	rx_cnt--;
++	while (rx_cnt == 0) {
++		spaces = readl_relaxed(ss->base + SS_FCSR);
++		rx_cnt = SS_RXFIFO_SPACES(spaces);
++	}
++}
++
++inline void ss_writer_relaxed(const u32 v)
++{
++	u32 spaces;
++
++	writel_relaxed(v, ss->base + SS_RXFIFO);
++	rx_cnt--;
++	while (rx_cnt == 0) {
++		spaces = readl_relaxed(ss->base + SS_FCSR);
++		rx_cnt = SS_RXFIFO_SPACES(spaces);
++	}
++}
++
++/*
++ * sunxi_hash_update: update hash engine
++ *
++ * Could be used for both SHA1 and MD5
++ * Write data by step of 32bits and put then in the SS.
++ *
++ * Since we cannot leave partial data and hash state in the engine,
++ * we need to get the hash state at the end of this function.
++ * After some work, I have found that we can get the hash state every 64o
++ *
++ * So the first work is to get the number of bytes to write to SS modulo 64
++ * The extra bytes will go to two different destination:
++ * op->wait for full 32bits word
++ * op->wb (waiting bytes) for partial 32 bits word
++ * So we can have up to (64/4)-1 op->wait words and 0/1/2/3 bytes in wb
++ *
++ * So at the begin of update()
++ * if op->nwait * 4 + areq->nbytes < 64
++ * => all data writed to wait buffers and end=0
++ * if not write all nwait to the device and position end to complete to 64o
++ *
++ * example 1:
++ * update1 60o => nwait=15
++ * update2 60o => need one more word to have 64o
++ * end=4
++ * so write all data in op->wait and one word of SGs
++ * write remaining data in op->wait
++ * final state op->nwait=14
++ */
++int sunxi_hash_update(struct ahash_request *areq)
++{
++	u32 v, ivmode = 0;
++	unsigned int i = 0;
++	/*
++	 * i is the total bytes read from SGs, to be compared to areq->nbytes
++	 * i is important because we cannot rely on SG length since the sum of
++	 * SG->length could be greater than areq->nbytes
++	 */
++
++	struct sunxi_req_ctx *op = ahash_request_ctx(areq);
++	struct scatterlist *in_sg;
++	unsigned int in_i = 0; /* advancement in the current SG */
++	u64 end;
++	/*
++	 * end is the position when we need to stop writing to the device,
++	 * to be compared to i
++	 */
++	int in_r;
++	void *src_addr;
++
++	dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x bw=%u ww=%u",
++			__func__, crypto_tfm_alg_name(areq->base.tfm),
++			op->byte_count, areq->nbytes, op->mode,
++			op->nbw, op->nwait);
++
++	if (areq->nbytes == 0)
++		return 0;
++
++	end = ((areq->nbytes + op->nwait * 4 + op->nbw) / 64) * 64
++		- op->nbw - op->nwait * 4;
++
++	if (end > areq->nbytes || areq->nbytes - end > 63) {
++		dev_err(ss->dev, "ERROR: Bound error %llu %u\n",
++				end, areq->nbytes);
++		return -EINVAL;
++	}
++
++	if (op->nwait > 0 && end > 0) {
++		/* a precedent update was done */
++		for (i = 0; i < op->nwait; i++) {
++			ss_writer(op->wait[i]);
++			op->byte_count += 4;
++		}
++		op->nwait = 0;
++	}
++
++	mutex_lock(&ss->lock);
++	/*
++	 * if some data have been processed before,
++	 * we need to restore the partial hash state
++	 */
++	if (op->byte_count > 0) {
++		ivmode = SS_IV_ARBITRARY;
++		for (i = 0; i < 5; i++)
++			writel(op->hash[i], ss->base + SS_IV0 + i * 4);
++	}
++	/* Enable the device */
++	writel(op->mode | SS_ENABLED | ivmode, ss->base + SS_CTL);
++
++	rx_cnt = 0;
++	i = 0;
++
++	in_sg = areq->src;
++	src_addr = kmap(sg_page(in_sg)) + in_sg->offset;
++	if (src_addr == NULL) {
++		mutex_unlock(&ss->lock);
++		dev_err(ss->dev, "ERROR: Cannot kmap source buffer\n");
++		return -EFAULT;
++	}
++	do {
++		/*
++		 * step 1, if some bytes remains from last SG,
++		 * try to complete them to 4 and send that word
++		 */
++		if (op->nbw > 0) {
++			while (op->nbw < 4 && i < areq->nbytes &&
++					in_i < in_sg->length) {
++				op->wb |= (*(u8 *)(src_addr + in_i))
++					<< (8 * op->nbw);
++				dev_dbg(ss->dev, "%s Complete w=%d wb=%x\n",
++						__func__, op->nbw, op->wb);
++				i++;
++				in_i++;
++				op->nbw++;
++			}
++			if (op->nbw == 4) {
++				if (i <= end) {
++					ss_writer(op->wb);
++					op->byte_count += 4;
++				} else {
++					op->wait[op->nwait] = op->wb;
++					op->nwait++;
++					dev_dbg(ss->dev, "%s Keep %u bytes after %llu\n",
++						__func__, op->nwait, end);
++				}
++				op->nbw = 0;
++				op->wb = 0;
++			}
++		}
++		/* step 2, main loop, read data 4bytes at a time */
++		while (i < areq->nbytes && in_i < in_sg->length) {
++			/* how many bytes we can read, (we need 4) */
++			in_r = min(in_sg->length - in_i, areq->nbytes - i);
++			if (in_r < 4) {
++				/* Not enough data to write to the device */
++				op->wb = 0;
++				while (in_r > 0) {
++					op->wb |= (*(u8 *)(src_addr + in_i))
++						<< (8 * op->nbw);
++					dev_dbg(ss->dev, "%s ending bw=%d wb=%x\n",
++						__func__, op->nbw, op->wb);
++					in_r--;
++					i++;
++					in_i++;
++					op->nbw++;
++				}
++				goto nextsg;
++			}
++			v = *(u32 *)(src_addr + in_i);
++			if (i < end) {
++				/* last write must be done without relaxed */
++				if (i + 4 >= end)
++					ss_writer(v);
++				else
++					ss_writer_relaxed(v);
++				i += 4;
++				op->byte_count += 4;
++				in_i += 4;
++			} else {
++				op->wait[op->nwait] = v;
++				i += 4;
++				in_i += 4;
++				op->nwait++;
++				dev_dbg(ss->dev, "%s Keep word ww=%u after %llu\n",
++						__func__, op->nwait, end);
++				if (op->nwait > 15) {
++					dev_err(ss->dev, "FATAL: Cannot enqueue more, bug?\n");
++					writel(0, ss->base + SS_CTL);
++					mutex_unlock(&ss->lock);
++					return -EIO;
++				}
++			}
++		}
++nextsg:
++		/* Nothing more to read in this SG */
++		if (in_i == in_sg->length) {
++			kunmap(sg_page(in_sg));
++			do {
++				in_sg = sg_next(in_sg);
++			} while (in_sg != NULL && in_sg->length == 0);
++			in_i = 0;
++			if (in_sg != NULL) {
++				src_addr = kmap(sg_page(in_sg)) + in_sg->offset;
++				if (src_addr == NULL) {
++					mutex_unlock(&ss->lock);
++					dev_err(ss->dev, "ERROR: Cannot kmap source buffer\n");
++					return -EFAULT;
++				}
++			}
++		}
++	} while (in_sg != NULL && i < areq->nbytes);
++
++	/* ask the device to finish the hashing */
++	writel(op->mode | SS_ENABLED | SS_DATA_END, ss->base + SS_CTL);
++	i = 0;
++	do {
++		v = readl(ss->base + SS_CTL);
++		i++;
++	} while (i < SS_TIMEOUT && (v & SS_DATA_END) > 0);
++	if (i >= SS_TIMEOUT) {
++		dev_err(ss->dev, "ERROR: %s hash end timeout after %d loop, CTL=%x\n",
++				__func__, i, v);
++		writel(0, ss->base + SS_CTL);
++		mutex_unlock(&ss->lock);
++		return -EIO;
++	}
++
++	/* get the partial hash */
++	if (op->mode == SS_OP_SHA1) {
++		for (i = 0; i < 5; i++)
++			op->hash[i] = readl(ss->base + SS_MD0 + i * 4);
++	} else {
++		for (i = 0; i < 4; i++)
++			op->hash[i] = readl(ss->base + SS_MD0 + i * 4);
++	}
++
++	writel(0, ss->base + SS_CTL);
++	mutex_unlock(&ss->lock);
++	return 0;
++}
++
++/*
++ * sunxi_hash_final: finalize hashing operation
++ *
++ * If we have some remaining bytes, we write them.
++ * Then ask the SS for finalizing the hashing operation
++ */
++int sunxi_hash_final(struct ahash_request *areq)
++{
++	u32 v, ivmode = 0;
++	unsigned int i;
++	int zeros;
++	unsigned int index, padlen;
++	__be64 bits;
++	struct sunxi_req_ctx *op = ahash_request_ctx(areq);
++
++	dev_dbg(ss->dev, "%s byte=%llu len=%u mode=%x bw=%u %x h=%x ww=%u",
++			__func__, op->byte_count, areq->nbytes, op->mode,
++			op->nbw, op->wb, op->hash[0], op->nwait);
++
++	mutex_lock(&ss->lock);
++	rx_cnt = 0;
++
++	/*
++	 * if we have already writed something,
++	 * restore the partial hash state
++	 */
++	if (op->byte_count > 0) {
++		ivmode = SS_IV_ARBITRARY;
++		for (i = 0; i < 5; i++)
++			writel(op->hash[i], ss->base + SS_IV0 + i * 4);
++	}
++	writel(op->mode | SS_ENABLED | ivmode, ss->base + SS_CTL);
++
++	/* write the remaining words of the wait buffer */
++	if (op->nwait > 0) {
++		for (i = 0; i < op->nwait; i++) {
++			v = op->wait[i];
++			ss_writer(v);
++			op->byte_count += 4;
++			dev_dbg(ss->dev, "%s write %llu i=%u %x\n",
++					__func__, op->byte_count, i, v);
++		}
++		op->nwait = 0;
++	}
++
++	/* write the remaining bytes of the nbw buffer */
++	if (op->nbw > 0) {
++		op->wb |= ((1 << 7) << (op->nbw * 8));
++		ss_writer(op->wb);
++	} else {
++		ss_writer((1 << 7));
++	}
++
++	/*
++	 * number of space to pad to obtain 64o minus 8(size) minus 4 (final 1)
++	 * I take the operations from other md5/sha1 implementations
++	 */
++
++	/* we have already send 4 more byte of which nbw data */
++	if (op->mode == SS_OP_MD5) {
++		index = (op->byte_count + 4) & 0x3f;
++		op->byte_count += op->nbw;
++		if (index > 56)
++			zeros = (120 - index) / 4;
++		else
++			zeros = (56 - index) / 4;
++	} else {
++		op->byte_count += op->nbw;
++		index = op->byte_count & 0x3f;
++		padlen = (index < 56) ? (56 - index) : ((64+56) - index);
++		zeros = (padlen - 1) / 4;
++	}
++	for (i = 0; i < zeros; i++)
++		ss_writer(0);
++
++	/* write the length of data */
++	if (op->mode == SS_OP_SHA1) {
++		bits = cpu_to_be64(op->byte_count << 3);
++		ss_writer(bits & 0xffffffff);
++		ss_writer((bits >> 32) & 0xffffffff);
++	} else {
++		ss_writer((op->byte_count << 3) & 0xffffffff);
++		ss_writer((op->byte_count >> 29) & 0xffffffff);
++	}
++
++	/* Tell the SS to stop the hashing */
++	writel(op->mode | SS_ENABLED | SS_DATA_END, ss->base + SS_CTL);
++
++	/*
++	 * Wait for SS to finish the hash.
++	 * The timeout could happend only in case of bad overcloking
++	 * or driver bug.
++	 */
++	i = 0;
++	do {
++		v = readl(ss->base + SS_CTL);
++		i++;
++	} while (i < SS_TIMEOUT && (v & SS_DATA_END) > 0);
++	if (i >= SS_TIMEOUT) {
++		dev_err(ss->dev, "ERROR: hash end timeout %d>%d ctl=%x len=%u\n",
++				i, SS_TIMEOUT, v, areq->nbytes);
++		writel(0, ss->base + SS_CTL);
++		mutex_unlock(&ss->lock);
++		return -EIO;
++	}
++
++	/* Get the hash from the device */
++	if (op->mode == SS_OP_SHA1) {
++		for (i = 0; i < 5; i++) {
++			v = cpu_to_be32(readl(ss->base + SS_MD0 + i * 4));
++			memcpy(areq->result + i * 4, &v, 4);
++		}
++	} else {
++		for (i = 0; i < 4; i++) {
++			v = readl(ss->base + SS_MD0 + i * 4);
++			memcpy(areq->result + i * 4, &v, 4);
++		}
++	}
++	writel(0, ss->base + SS_CTL);
++	mutex_unlock(&ss->lock);
++	return 0;
++}
++
++/* sunxi_hash_finup: finalize hashing operation after an update */
++int sunxi_hash_finup(struct ahash_request *areq)
++{
++	int err;
++
++	err = sunxi_hash_update(areq);
++	if (err != 0)
++		return err;
++
++	return sunxi_hash_final(areq);
++}
++
++/* combo of init/update/final functions */
++int sunxi_hash_digest(struct ahash_request *areq)
++{
++	int err;
++
++	err = sunxi_hash_init(areq);
++	if (err != 0)
++		return err;
++
++	err = sunxi_hash_update(areq);
++	if (err != 0)
++		return err;
++
++	return sunxi_hash_final(areq);
++}
+diff --git a/drivers/crypto/sunxi-ss/sunxi-ss.h b/drivers/crypto/sunxi-ss/sunxi-ss.h
+new file mode 100644
+index 0000000..331e75b
+--- /dev/null
++++ b/drivers/crypto/sunxi-ss/sunxi-ss.h
+@@ -0,0 +1,193 @@
++/*
++ * sunxi-ss.c - hardware cryptographic accelerator for Allwinner A20 SoC
++ *
++ * Copyright (C) 2013-2014 Corentin LABBE <clabbe.montjoie@gmail.com>
++ *
++ * Support AES cipher with 128,192,256 bits keysize.
++ * Support MD5 and SHA1 hash algorithms.
++ * Support DES and 3DES
++ *
++ * You could find the datasheet in Documentation/arm/sunxi/README
++ *
++ * Licensed under the GPL-2.
++ */
++
++#include <linux/clk.h>
++#include <linux/crypto.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <crypto/scatterwalk.h>
++#include <linux/scatterlist.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <crypto/md5.h>
++#include <crypto/sha.h>
++#include <crypto/hash.h>
++#include <crypto/internal/hash.h>
++#include <crypto/aes.h>
++#include <crypto/des.h>
++#include <crypto/internal/rng.h>
++
++#define SS_CTL            0x00
++#define SS_KEY0           0x04
++#define SS_KEY1           0x08
++#define SS_KEY2           0x0C
++#define SS_KEY3           0x10
++#define SS_KEY4           0x14
++#define SS_KEY5           0x18
++#define SS_KEY6           0x1C
++#define SS_KEY7           0x20
++
++#define SS_IV0            0x24
++#define SS_IV1            0x28
++#define SS_IV2            0x2C
++#define SS_IV3            0x30
++
++#define SS_CNT0           0x34
++#define SS_CNT1           0x38
++#define SS_CNT2           0x3C
++#define SS_CNT3           0x40
++
++#define SS_FCSR           0x44
++#define SS_ICSR           0x48
++
++#define SS_MD0            0x4C
++#define SS_MD1            0x50
++#define SS_MD2            0x54
++#define SS_MD3            0x58
++#define SS_MD4            0x5C
++
++#define SS_RXFIFO         0x200
++#define SS_TXFIFO         0x204
++
++/* SS_CTL configuration values */
++
++/* PRNG generator mode - bit 15 */
++#define SS_PRNG_ONESHOT		(0 << 15)
++#define SS_PRNG_CONTINUE	(1 << 15)
++
++/* IV mode for hash */
++#define SS_IV_ARBITRARY		(1 << 14)
++
++/* SS operation mode - bits 12-13 */
++#define SS_ECB			(0 << 12)
++#define SS_CBC			(1 << 12)
++#define SS_CNT			(2 << 12)
++
++/* Counter width for CNT mode - bits 10-11 */
++#define SS_CNT_16BITS		(0 << 10)
++#define SS_CNT_32BITS		(1 << 10)
++#define SS_CNT_64BITS		(2 << 10)
++
++/* Key size for AES - bits 8-9 */
++#define SS_AES_128BITS		(0 << 8)
++#define SS_AES_192BITS		(1 << 8)
++#define SS_AES_256BITS		(2 << 8)
++
++/* Operation direction - bit 7 */
++#define SS_ENCRYPTION		(0 << 7)
++#define SS_DECRYPTION		(1 << 7)
++
++/* SS Method - bits 4-6 */
++#define SS_OP_AES		(0 << 4)
++#define SS_OP_DES		(1 << 4)
++#define SS_OP_3DES		(2 << 4)
++#define SS_OP_SHA1		(3 << 4)
++#define SS_OP_MD5		(4 << 4)
++#define SS_OP_PRNG		(5 << 4)
++
++/* Data end bit - bit 2 */
++#define SS_DATA_END		(1 << 2)
++
++/* PRNG start bit - bit 1 */
++#define SS_PRNG_START		(1 << 1)
++
++/* SS Enable bit - bit 0 */
++#define SS_DISABLED		(0 << 0)
++#define SS_ENABLED		(1 << 0)
++
++/* SS_FCSR configuration values */
++/* RX FIFO status - bit 30 */
++#define SS_RXFIFO_FREE		(1 << 30)
++
++/* RX FIFO empty spaces - bits 24-29 */
++#define SS_RXFIFO_SPACES(val)	(((val) >> 24) & 0x3f)
++
++/* TX FIFO status - bit 22 */
++#define SS_TXFIFO_AVAILABLE	(1 << 22)
++
++/* TX FIFO available spaces - bits 16-21 */
++#define SS_TXFIFO_SPACES(val)	(((val) >> 16) & 0x3f)
++
++#define SS_RXFIFO_EMP_INT_PENDING	(1 << 10)
++#define SS_TXFIFO_AVA_INT_PENDING	(1 << 8)
++#define SS_RXFIFO_EMP_INT_ENABLE	(1 << 2)
++#define SS_TXFIFO_AVA_INT_ENABLE	(1 << 0)
++
++/* SS_ICSR configuration values */
++#define SS_ICS_DRQ_ENABLE		(1 << 4)
++
++struct sunxi_ss_ctx {
++	void __iomem *base;
++	int irq;
++	struct clk *busclk;
++	struct clk *ssclk;
++	struct device *dev;
++	struct resource *res;
++	void *buf_in; /* pointer to data to be uploaded to the device */
++	size_t buf_in_size; /* size of buf_in */
++	void *buf_out;
++	size_t buf_out_size;
++	struct mutex lock; /* control the use of the device */
++	struct mutex bufout_lock; /* control the use of buf_out*/
++	struct mutex bufin_lock; /* control the sue of buf_in*/
++};
++
++struct sunxi_tfm_ctx {
++	u32 key[AES_MAX_KEY_SIZE / 4];/* divided by sizeof(u32) */
++	u32 keylen;
++	u32 keymode;
++};
++
++struct sunxi_req_ctx {
++	u32 mode;
++	u64 byte_count; /* number of bytes "uploaded" to the device */
++	u32 wb; /* a partial word waiting to be completed and
++			uploaded to the device */
++	/* number of bytes to be uploaded in the wb word */
++	unsigned int nbw;
++	u32 hash[5];
++	u32 wait[64];
++	unsigned int nwait;
++};
++
++#define SS_SEED_LEN (192/8)
++#define SS_DATA_LEN (160/8)
++
++struct prng_context {
++	u32 seed[SS_SEED_LEN/4];
++	unsigned int slen;
++};
++
++int sunxi_hash_crainit(struct crypto_tfm *tfm);
++int sunxi_hash_init(struct ahash_request *areq);
++int sunxi_hash_update(struct ahash_request *areq);
++int sunxi_hash_final(struct ahash_request *areq);
++int sunxi_hash_finup(struct ahash_request *areq);
++int sunxi_hash_digest(struct ahash_request *areq);
++int sunxi_hash_export(struct ahash_request *areq, void *out);
++int sunxi_hash_import(struct ahash_request *areq, const void *in);
++
++int sunxi_ss_aes_poll(struct ablkcipher_request *areq, u32 mode);
++int sunxi_ss_des_poll(struct ablkcipher_request *areq, u32 mode);
++int sunxi_ss_cipher_init(struct crypto_tfm *tfm);
++int sunxi_ss_cipher_encrypt(struct ablkcipher_request *areq);
++int sunxi_ss_cipher_decrypt(struct ablkcipher_request *areq);
++int sunxi_ss_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen);
++int sunxi_ss_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen);
++int sunxi_ss_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
++		unsigned int keylen);
diff --git a/trunk/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch b/trunk/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch
new file mode 100644
index 00000000..0ee3195d
--- /dev/null
+++ b/trunk/target/linux/sunxi/patches-3.18/300-dt-sun7i-add-bananapi.patch
@@ -0,0 +1,250 @@
+From 29b4146ec174f0f598d6b454caa335e8f57e392b Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 28 Jul 2014 23:05:14 +0200
+Subject: [PATCH] ARM: dts: sun7i: Add Banana Pi board
+
+The Banana Pi is an A20 based development board using Raspberry Pi compatible
+IO headers. It comes with 1 GB RAM, 1 Gb ethernet, 2x USB host, sata, hdmi
+and stereo audio out + various expenansion headers:
+
+http://www.lemaker.org/
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/Makefile               |   1 +
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 214 +++++++++++++++++++++++++++++++
+ 2 files changed, 215 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 38c89ca..63422bd 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -435,6 +435,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+ 	sun6i-a31-hummingbird.dtb \
+ 	sun6i-a31-m9.dtb
+ dtb-$(CONFIG_MACH_SUN7I) += \
++	sun7i-a20-bananapi.dtb \
+ 	sun7i-a20-cubieboard2.dtb \
+ 	sun7i-a20-cubietruck.dtb \
+ 	sun7i-a20-hummingbird.dtb \
+diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+new file mode 100644
+index 0000000..0e7c9f5
+--- /dev/null
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+@@ -0,0 +1,214 @@
++/*
++ * Copyright 2014 Hans de Goede <hdegoede@redhat.com>
++ *
++ * Hans de Goede <hdegoede@redhat.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This library is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This library is distributed in the hope that 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 library; if not, write to the Free
++ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ *     MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++/include/ "sun7i-a20.dtsi"
++/include/ "sunxi-common-regulators.dtsi"
++
++/ {
++	model = "LeMaker Banana Pi";
++	compatible = "lemaker,bananapi", "allwinner,sun7i-a20";
++
++	soc@01c00000 {
++		spi0: spi@01c05000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi0_pins_a>;
++			status = "okay";
++		};
++
++		mmc0: mmc@01c0f000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
++			vmmc-supply = <&reg_vcc3v3>;
++			bus-width = <4>;
++			cd-gpios = <&pio 7 10 0>; /* PH10 */
++			cd-inverted;
++			status = "okay";
++		};
++
++		usbphy: phy@01c13400 {
++			usb1_vbus-supply = <&reg_usb1_vbus>;
++			usb2_vbus-supply = <&reg_usb2_vbus>;
++			status = "okay";
++		};
++
++		ehci0: usb@01c14000 {
++			status = "okay";
++		};
++
++		ohci0: usb@01c14400 {
++			status = "okay";
++		};
++
++		ahci: sata@01c18000 {
++			status = "okay";
++		};
++
++		ehci1: usb@01c1c000 {
++			status = "okay";
++		};
++
++		ohci1: usb@01c1c400 {
++			status = "okay";
++		};
++
++		pinctrl@01c20800 {
++			mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
++				allwinner,pins = "PH10";
++				allwinner,function = "gpio_in";
++				allwinner,drive = <0>;
++				allwinner,pull = <1>;
++			};
++
++			gmac_power_pin_bananapi: gmac_power_pin@0 {
++				allwinner,pins = "PH23";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++
++			led_pins_bananapi: led_pins@0 {
++				allwinner,pins = "PH24";
++				allwinner,function = "gpio_out";
++				allwinner,drive = <0>;
++				allwinner,pull = <0>;
++			};
++		};
++
++		ir0: ir@01c21800 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&ir0_pins_a>;
++			status = "okay";
++		};
++
++		uart0: serial@01c28000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart0_pins_a>;
++			status = "okay";
++		};
++
++		uart3: serial@01c28c00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart3_pins_b>;
++			status = "okay";
++		};
++
++		uart7: serial@01c29c00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&uart7_pins_a>;
++			status = "okay";
++		};
++
++		i2c0: i2c@01c2ac00 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c0_pins_a>;
++			status = "okay";
++
++			axp209: pmic@34 {
++				compatible = "x-powers,axp209";
++				reg = <0x34>;
++				interrupt-parent = <&nmi_intc>;
++				interrupts = <0 8>;
++
++				interrupt-controller;
++				#interrupt-cells = <1>;
++			};
++		};
++
++		i2c2: i2c@01c2b400 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&i2c2_pins_a>;
++			status = "okay";
++		};
++
++		gmac: ethernet@01c50000 {
++			pinctrl-names = "default";
++			pinctrl-0 = <&gmac_pins_rgmii_a>;
++			phy = <&phy1>;
++			phy-mode = "rgmii";
++			phy-supply = <&reg_gmac_3v3>;
++			status = "okay";
++
++			phy1: ethernet-phy@1 {
++				reg = <1>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_bananapi>;
++
++		green {
++			label = "bananapi:green:usr";
++			gpios = <&pio 7 24 0>;
++		};
++	};
++
++	reg_usb1_vbus: usb1-vbus {
++		status = "okay";
++	};
++
++	reg_usb2_vbus: usb2-vbus {
++		status = "okay";
++	};
++
++	reg_gmac_3v3: gmac-3v3 {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		pinctrl-0 = <&gmac_power_pin_bananapi>;
++		regulator-name = "gmac-3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		startup-delay-us = <50000>;
++		enable-active-high;
++		gpio = <&pio 7 23 0>;
++	};
++};
diff --git a/trunk/target/linux/sunxi/profiles/01-default.mk b/trunk/target/linux/sunxi/profiles/01-default.mk
new file mode 100644
index 00000000..7d834402
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/01-default.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Default
+  NAME:=Default package set
+  PACKAGES += uboot-sunxi-A13-OLinuXino
+endef
+
+define Profile/Default/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,Default))
+
diff --git a/trunk/target/linux/sunxi/profiles/a10-olinuxino.mk b/trunk/target/linux/sunxi/profiles/a10-olinuxino.mk
new file mode 100644
index 00000000..0c2e0eef
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/a10-olinuxino.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/A10-OLinuXino-Lime
+	NAME:=A10 OLinuXino LIME
+	PACKAGES:=\
+		uboot-sunxi-A10-OLinuXino-Lime kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
+endef
+
+define Profile/A10-OLinuXino-Lime/Description
+	Package set optimized for the Olimex A10 OLinuXino LIME
+endef
+
+$(eval $(call Profile,A10-OLinuXino-Lime))
diff --git a/trunk/target/linux/sunxi/profiles/a13-olimex-som.mk b/trunk/target/linux/sunxi/profiles/a13-olimex-som.mk
new file mode 100644
index 00000000..655cacc0
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/a13-olimex-som.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/OLIMEX-A13-SOM
+	NAME:=Olimex A13 SOM
+	PACKAGES:=\
+		uboot-sunxi-OLIMEX-A13-SOM kmod-rtl8192cu
+endef
+
+define Profile/OLIMEX-A13-SOM/Description
+	Package set optimized for the Olimex A13 SOM
+endef
+
+$(eval $(call Profile,OLIMEX-A13-SOM))
diff --git a/trunk/target/linux/sunxi/profiles/a13-olinuxino.mk b/trunk/target/linux/sunxi/profiles/a13-olinuxino.mk
new file mode 100644
index 00000000..0757098c
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/a13-olinuxino.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/A13-OLinuXino
+	NAME:=A13 OLinuXino
+	PACKAGES:=\
+		uboot-sunxi-A13-OLinuXino kmod-rtl8192cu
+endef
+
+define Profile/A13-OLinuXino/Description
+	Package set optimized for the Olimex A13 OLinuXino
+endef
+
+$(eval $(call Profile,A13-OLinuXino))
diff --git a/trunk/target/linux/sunxi/profiles/a20-olinuxino.mk b/trunk/target/linux/sunxi/profiles/a20-olinuxino.mk
new file mode 100644
index 00000000..89e8050e
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/a20-olinuxino.mk
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/A20-OLinuXino_Lime
+	NAME:=A20 OLinuXino Lime
+	PACKAGES:=\
+		uboot-sunxi-A20-OLinuXino_Lime kmod-ata-sunxi kmod-rtc-sunxi
+endef
+
+define Profile/A20-OLinuXino_Lime/Description
+	Package set optimized for the Olimex A20 OLinuXino Lime
+endef
+
+$(eval $(call Profile,A20-OLinuXino_Lime))
+
+
+define Profile/A20-OLinuXino_MICRO
+	NAME:=A20 OLinuXino Micro
+	PACKAGES:=\
+		uboot-sunxi-A20-OLinuXino_MICRO kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
+endef
+
+define Profile/A20-OLinuXino_MICRO/Description
+	Package set optimized for the Olimex A20 OLinuXino micro
+endef
+
+$(eval $(call Profile,A20-OLinuXino_MICRO))
diff --git a/trunk/target/linux/sunxi/profiles/bananapi.mk b/trunk/target/linux/sunxi/profiles/bananapi.mk
new file mode 100644
index 00000000..59fdd4f0
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/bananapi.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Bananapi
+	NAME:=Bananapi
+	PACKAGES:=\
+		uboot-sunxi-Bananapi kmod-rtc-sunxi
+endef
+
+define Profile/Bananapi/Description
+	Package set optimized for the Bananapi
+endef
+
+$(eval $(call Profile,Bananapi))
diff --git a/trunk/target/linux/sunxi/profiles/cubieboard.mk b/trunk/target/linux/sunxi/profiles/cubieboard.mk
new file mode 100644
index 00000000..6ae2e37e
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/cubieboard.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Cubieboard
+	NAME:=Cubieboard
+	PACKAGES:=\
+		uboot-sunxi-Cubieboard kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
+endef
+
+define Profile/Cubieboard/Description
+	Package set optimized for the Cubieboard
+endef
+
+$(eval $(call Profile,Cubieboard))
diff --git a/trunk/target/linux/sunxi/profiles/cubieboard2.mk b/trunk/target/linux/sunxi/profiles/cubieboard2.mk
new file mode 100644
index 00000000..0843e9e2
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/cubieboard2.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Cubieboard2
+	NAME:=Cubieboard2
+	PACKAGES:=\
+		uboot-sunxi-Cubieboard2 kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi
+endef
+
+define Profile/Cubieboard2/Description
+	Package set optimized for the Cubieboard2
+endef
+
+$(eval $(call Profile,Cubieboard2))
diff --git a/trunk/target/linux/sunxi/profiles/pcduino.mk b/trunk/target/linux/sunxi/profiles/pcduino.mk
new file mode 100644
index 00000000..b3e3b1a0
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/pcduino.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/pcDuino
+	NAME:=pcDuino
+	PACKAGES:=\
+		uboot-sunxi-pcDuino kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu
+endef
+
+define Profile/pcDuino/Description
+	Package set optimized for the pcDuino
+endef
+
+$(eval $(call Profile,pcDuino))
diff --git a/trunk/target/linux/sunxi/profiles/pcduino3.mk b/trunk/target/linux/sunxi/profiles/pcduino3.mk
new file mode 100644
index 00000000..c0ab994c
--- /dev/null
+++ b/trunk/target/linux/sunxi/profiles/pcduino3.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Linksprite_pcDuino3
+	NAME:=pcDuino3
+	PACKAGES:=\
+		uboot-sunxi-Linksprite_pcDuino3 kmod-sun4i-emac kmod-rtc-sunxi kmod-net-rtl8188eu
+endef
+
+define Profile/Linksprite_pcDuino3/Description
+	Package set optimized for the pcDuino3
+endef
+
+$(eval $(call Profile,Linksprite_pcDuino3))
diff --git a/trunk/target/linux/uml/Makefile b/trunk/target/linux/uml/Makefile
new file mode 100644
index 00000000..eb4fed11
--- /dev/null
+++ b/trunk/target/linux/uml/Makefile
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/host.mk
+
+# UML only makes sense on linux
+ifeq ($(HOST_OS),Linux)
+
+ARCH:=$(shell uname -m | sed \
+	-e 's/i[3-9]86/i386/' \
+	-e 's/mipsel/mips/' \
+	-e 's/mipseb/mips/' \
+	-e 's/powerpc/ppc/' \
+	-e 's/sh[234]/sh/' \
+	-e 's/armeb/arm/' \
+)
+BOARD:=uml
+BOARDNAME:=User Mode Linux
+FEATURES:=ext4 audio
+MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+
+KERNEL_PATCHVER:=3.14
+
+include $(INCLUDE_DIR)/target.mk
+
+LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH)
+
+DEFAULT_PACKAGES += wpad-mini kmod-mac80211-hwsim
+
+endif
+
+$(eval $(call BuildTarget))
diff --git a/trunk/target/linux/uml/README b/trunk/target/linux/uml/README
new file mode 100644
index 00000000..34d876e5
--- /dev/null
+++ b/trunk/target/linux/uml/README
@@ -0,0 +1,45 @@
+Openwrt inside a user mode linux.  Why would we even want this many ask?
+
+There are potentially a lot of reasons, one obvious one to me, it allows
+folks to 'kick the tires' without actually flashing up any hardware.  It's
+also a great environment for porting over packages, you can get a package
+fully functional in the uclibc root environment inside a uml without actually
+disturbing your 'real router', and then rebuild for a specific target once
+it's fully tested.
+
+This is a first stab at a build that 'just works' and there will be more
+cleanup to come.  The simple directions are:-
+
+Configure for uml target
+Configure with an ext4 root file system
+build it all
+
+In your bin directory you will find a kernel and an ext4 root file system
+when it's finished.  Just run it like this:-
+
+bin/uml/librecmc-uml-vmlinux ubd0=bin/uml/librecmc-uml-ext4.img
+
+The uml will start, and eventually the serial console of the uml will be at your
+console prompt.  If you would like it in xterms, substitute con=xterm and con0=xterm.
+No networking is configured, but, it's a starting point.  The resulting file system
+has just enough free space to start kicking the tires and playing in the world of
+'embedded routers' along with all the resource restrictions that come with that
+world.  
+
+To configure networking and more, refer to the user mode linux documentation online.
+A quick start goes along this line.  install the uml-utilities packages so you have
+the uml switch in and running, then add a command param to your uml start like this
+
+eth0=daemon,00:01:01:01:01:01,unix,/<your uml switch control socket here>
+
+With that in, and uml networking actually functional (can be a challenge at times),
+you should be able to ifconfig the interface and talk to the host side, or, if you
+bridged the uml switch to your host network, you should be able to run udhcp and be
+away with networking off to the world.  Again, if you are unfamiliar with uml and
+uml networking, please read the docs and how-to stuff available on the net.  It does
+take some fiddling to get it started and working right the first time, but after that,
+it opens up a whole new world of virtual machines.
+
+
+
+http://user-mode-linux.sourceforge.net/
diff --git a/trunk/target/linux/uml/config/i386 b/trunk/target/linux/uml/config/i386
new file mode 100644
index 00000000..e5c1ce42
--- /dev/null
+++ b/trunk/target/linux/uml/config/i386
@@ -0,0 +1,168 @@
+# CONFIG_3_LEVEL_PGTABLES is not set
+# CONFIG_64BIT is not set
+CONFIG_ARCH_HAS_SC_SIGNALS=y
+CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
+CONFIG_BKL=y
+CONFIG_BLK_DEV_COW_COMMON=y
+CONFIG_BLK_DEV_UBD=y
+CONFIG_BLK_DEV_UBD_SYNC=y
+CONFIG_CON_CHAN="xterm"
+CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CRAMFS=y
+# CONFIG_CRASHLOG is not set
+CONFIG_CRC16=y
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
+CONFIG_DNOTIFY=y
+CONFIG_ELF_CORE=y
+# CONFIG_EMBEDDED is not set
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+# CONFIG_HAMRADIO is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+# CONFIG_HAVE_GENERIC_HARDIRQS is not set
+CONFIG_HOSTAUDIO=m
+CONFIG_HOSTFS=y
+# CONFIG_HPPFS is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INIT_ENV_ARG_LIMIT=128
+CONFIG_IOSCHED_CFQ=y
+CONFIG_IRQ_RELEASE_METHOD=y
+CONFIG_ISO9660_FS=y
+CONFIG_JBD=y
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_KERNEL_STACK_ORDER=2
+CONFIG_LD_SCRIPT_STATIC=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M686 is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MATOM is not set
+CONFIG_MCONSOLE=y
+# CONFIG_MCORE2 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MINI_FO is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MMAPPER is not set
+# CONFIG_MPENTIUM4 is not set
+CONFIG_MPENTIUMII=y
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MWINCHIPC6 is not set
+CONFIG_NAMESPACES=y
+CONFIG_NEED_PER_CPU_KM=y
+# CONFIG_NET_NS is not set
+CONFIG_NLS=y
+# CONFIG_NOCONFIG_CHAN is not set
+CONFIG_NO_DMA=y
+CONFIG_NO_IOMEM=y
+CONFIG_NULL_CHAN=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PORT_CHAN=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PTY_CHAN=y
+CONFIG_QFMT_V1=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+CONFIG_RELAY=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SMP_BROKEN is not set
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SSL=y
+CONFIG_SSL_CHAN="pty"
+# CONFIG_STACKTRACE_SUPPORT is not set
+CONFIG_STATIC_LINK=y
+CONFIG_STDERR_CONSOLE=y
+CONFIG_STDIO_CONSOLE=y
+# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
+CONFIG_TTY_CHAN=y
+CONFIG_UID16=y
+CONFIG_UML=y
+CONFIG_UML_NET=y
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_MCAST=y
+# CONFIG_UML_NET_PCAP is not set
+CONFIG_UML_NET_SLIP=y
+CONFIG_UML_NET_SLIRP=y
+CONFIG_UML_NET_TUNTAP=y
+# CONFIG_UML_NET_VDE is not set
+CONFIG_UML_RANDOM=y
+CONFIG_UML_SOUND=m
+CONFIG_UML_WATCHDOG=m
+CONFIG_UML_X86=y
+# CONFIG_USER_NS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_X86_32=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CPU=y
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_INVLPG=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_XADD=y
+CONFIG_XTERM_CHAN=y
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/trunk/target/linux/uml/config/x86_64 b/trunk/target/linux/uml/config/x86_64
new file mode 100644
index 00000000..93f44722
--- /dev/null
+++ b/trunk/target/linux/uml/config/x86_64
@@ -0,0 +1,156 @@
+CONFIG_3_LEVEL_PGTABLES=y
+CONFIG_64BIT=y
+# CONFIG_ARCH_HAS_SC_SIGNALS is not set
+# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_BLK_DEV_COW_COMMON=y
+CONFIG_BLK_DEV_UBD=y
+CONFIG_BLK_DEV_UBD_SYNC=y
+CONFIG_CON_CHAN="xterm"
+CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CRAMFS=y
+# CONFIG_CRASHLOG is not set
+CONFIG_CRC16=y
+# CONFIG_CRYPTO_AES_X86_64 is not set
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_SALSA20_X86_64 is not set
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
+CONFIG_DNOTIFY=y
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_FS_MBCACHE=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_GENERIC_CPU is not set
+CONFIG_GENERIC_CPU_DEVICES=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IRQ_SHOW=y
+# CONFIG_HAMRADIO is not set
+CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_UID16=y
+CONFIG_HOSTAUDIO=m
+CONFIG_HOSTFS=y
+# CONFIG_HPPFS is not set
+CONFIG_HZ_PERIODIC=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INIT_ENV_ARG_LIMIT=128
+CONFIG_IOSCHED_CFQ=y
+CONFIG_IRQ_WORK=y
+CONFIG_ISO9660_FS=y
+CONFIG_JBD=y
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KERNEL_STACK_ORDER=2
+CONFIG_LD_SCRIPT_STATIC=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_MATOM is not set
+CONFIG_MCONSOLE=y
+# CONFIG_MCORE2 is not set
+CONFIG_MK8=y
+# CONFIG_MMAPPER is not set
+CONFIG_MODULES_USE_ELF_RELA=y
+# CONFIG_MPSC is not set
+CONFIG_NAMESPACES=y
+CONFIG_NEED_PER_CPU_KM=y
+# CONFIG_NET_NS is not set
+CONFIG_NLS=y
+# CONFIG_NOCONFIG_CHAN is not set
+CONFIG_NO_DMA=y
+CONFIG_NO_IOMEM=y
+CONFIG_NULL_CHAN=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PORT_CHAN=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PTY_CHAN=y
+CONFIG_QFMT_V1=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_QUOTA_TREE=y
+# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+CONFIG_RELAY=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SCSI_DMA is not set
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SSL=y
+CONFIG_SSL_CHAN="pty"
+# CONFIG_STACKTRACE_SUPPORT is not set
+CONFIG_STATIC_LINK=y
+CONFIG_STDERR_CONSOLE=y
+CONFIG_STDIO_CONSOLE=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
+CONFIG_TTY_CHAN=y
+CONFIG_UID16=y
+CONFIG_UIDGID_CONVERTED=y
+CONFIG_UML=y
+CONFIG_UML_NET=y
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_MCAST=y
+# CONFIG_UML_NET_PCAP is not set
+# CONFIG_UML_NET_RANDOM_MAC is not set
+CONFIG_UML_NET_SLIP=y
+CONFIG_UML_NET_SLIRP=y
+CONFIG_UML_NET_TUNTAP=y
+# CONFIG_UML_NET_VDE is not set
+CONFIG_UML_RANDOM=y
+CONFIG_UML_SOUND=m
+CONFIG_UML_WATCHDOG=m
+CONFIG_UML_X86=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_XHCI is not set
+# CONFIG_USER_NS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_X86_32 is not set
+CONFIG_X86_64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_XTERM_CHAN=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/trunk/target/linux/uml/image/Makefile b/trunk/target/linux/uml/image/Makefile
new file mode 100644
index 00000000..5e7247ec
--- /dev/null
+++ b/trunk/target/linux/uml/image/Makefile
@@ -0,0 +1,19 @@
+# 
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+
+define Image/Prepare
+	cp $(LINUX_DIR)/linux $(KDIR)/vmlinux.elf
+endef
+
+define Image/Build
+	cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
+	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux
+endef
+
+$(eval $(call BuildImage))
diff --git a/trunk/target/linux/uml/patches-3.14/001-fix_make_headers_install.patch b/trunk/target/linux/uml/patches-3.14/001-fix_make_headers_install.patch
new file mode 100644
index 00000000..9f3e5212
--- /dev/null
+++ b/trunk/target/linux/uml/patches-3.14/001-fix_make_headers_install.patch
@@ -0,0 +1,3814 @@
+From faec6b6c2cc0219e74569c13f581fc11d8f3fc57 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Sun, 17 Mar 2013 20:12:10 +0100
+Subject: [PATCH] UM: fix make headers_install after UAPI header installation
+
+Commit 10b63956 (UAPI: Plumb the UAPI Kbuilds into the user
+header installation and checking) breaks UML make headers_install with
+the following:
+
+$ ARCH=um make headers_install
+  CHK     include/generated/uapi/linux/version.h
+  UPD     include/generated/uapi/linux/version.h
+  HOSTCC  scripts/basic/fixdep
+  WRAP    arch/um/include/generated/asm/bug.h
+[snip]
+  WRAP    arch/um/include/generated/asm/trace_clock.h
+  SYSHDR  arch/x86/syscalls/../include/generated/uapi/asm/unistd_32.h
+  SYSHDR  arch/x86/syscalls/../include/generated/uapi/asm/unistd_64.h
+  SYSHDR  arch/x86/syscalls/../include/generated/uapi/asm/unistd_x32.h
+  SYSTBL  arch/x86/syscalls/../include/generated/asm/syscalls_32.h
+  HOSTCC  scripts/unifdef
+Makefile:912: *** Headers not exportable for the um architecture.  Stop.
+zsh: exit 2     ARCH=um make headers_install
+
+The reason for that is because the top-level Makefile does the
+following:
+        $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
+          $(error Headers not exportable for the $(SRCARCH) architecture))
+
+we end-up in the else part of the $(if) statement because UML still uses
+the old path in arch/um/include/asm/Kbuild. This patch fixes the issue
+by moving the header files to be in arch/um/include/uapi/asm/ thus
+making headers_install (and other make targets checking for uapi) to
+succeed.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+Richard, this has been broken for 3.7+ onwards, if you want me to send
+you separate patches for 3.7 and 3.8 let me know. Thanks!
+
+ arch/um/include/{ => uapi}/asm/Kbuild              |    0
+ arch/um/include/{ => uapi}/asm/a.out-core.h        |    0
+ arch/um/include/{ => uapi}/asm/bugs.h              |    0
+ arch/um/include/{ => uapi}/asm/cache.h             |    0
+ arch/um/include/{ => uapi}/asm/common.lds.S        |    0
+ arch/um/include/{ => uapi}/asm/dma.h               |    0
+ arch/um/include/{ => uapi}/asm/fixmap.h            |    0
+ arch/um/include/{ => uapi}/asm/irq.h               |    0
+ arch/um/include/{ => uapi}/asm/irqflags.h          |    0
+ arch/um/include/{ => uapi}/asm/kmap_types.h        |    0
+ arch/um/include/{ => uapi}/asm/kvm_para.h          |    0
+ arch/um/include/{ => uapi}/asm/mmu.h               |    0
+ arch/um/include/{ => uapi}/asm/mmu_context.h       |    0
+ arch/um/include/{ => uapi}/asm/page.h              |    0
+ arch/um/include/{ => uapi}/asm/pgalloc.h           |    0
+ arch/um/include/{ => uapi}/asm/pgtable-2level.h    |    0
+ arch/um/include/{ => uapi}/asm/pgtable-3level.h    |    0
+ arch/um/include/{ => uapi}/asm/pgtable.h           |    0
+ arch/um/include/{ => uapi}/asm/processor-generic.h |    0
+ arch/um/include/{ => uapi}/asm/ptrace-generic.h    |    0
+ arch/um/include/{ => uapi}/asm/setup.h             |    0
+ arch/um/include/{ => uapi}/asm/smp.h               |    0
+ arch/um/include/{ => uapi}/asm/sysrq.h             |    0
+ arch/um/include/{ => uapi}/asm/thread_info.h       |    0
+ arch/um/include/{ => uapi}/asm/timex.h             |    0
+ arch/um/include/{ => uapi}/asm/tlb.h               |    0
+ arch/um/include/{ => uapi}/asm/tlbflush.h          |    0
+ arch/um/include/{ => uapi}/asm/uaccess.h           |    0
+ 28 files changed, 0 insertions(+), 0 deletions(-)
+ rename arch/um/include/{ => uapi}/asm/Kbuild (100%)
+ rename arch/um/include/{ => uapi}/asm/a.out-core.h (100%)
+ rename arch/um/include/{ => uapi}/asm/bugs.h (100%)
+ rename arch/um/include/{ => uapi}/asm/cache.h (100%)
+ rename arch/um/include/{ => uapi}/asm/common.lds.S (100%)
+ rename arch/um/include/{ => uapi}/asm/dma.h (100%)
+ rename arch/um/include/{ => uapi}/asm/fixmap.h (100%)
+ rename arch/um/include/{ => uapi}/asm/irq.h (100%)
+ rename arch/um/include/{ => uapi}/asm/irqflags.h (100%)
+ rename arch/um/include/{ => uapi}/asm/kmap_types.h (100%)
+ rename arch/um/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/um/include/{ => uapi}/asm/mmu.h (100%)
+ rename arch/um/include/{ => uapi}/asm/mmu_context.h (100%)
+ rename arch/um/include/{ => uapi}/asm/page.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgalloc.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgtable-2level.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgtable-3level.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgtable.h (100%)
+ rename arch/um/include/{ => uapi}/asm/processor-generic.h (100%)
+ rename arch/um/include/{ => uapi}/asm/ptrace-generic.h (100%)
+ rename arch/um/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/um/include/{ => uapi}/asm/smp.h (100%)
+ rename arch/um/include/{ => uapi}/asm/sysrq.h (100%)
+ rename arch/um/include/{ => uapi}/asm/thread_info.h (100%)
+ rename arch/um/include/{ => uapi}/asm/timex.h (100%)
+ rename arch/um/include/{ => uapi}/asm/tlb.h (100%)
+ rename arch/um/include/{ => uapi}/asm/tlbflush.h (100%)
+ rename arch/um/include/{ => uapi}/asm/uaccess.h (100%)
+
+--- a/arch/um/include/asm/Kbuild
++++ /dev/null
+@@ -1,8 +0,0 @@
+-generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
+-generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
+-generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
+-generic-y += switch_to.h clkdev.h
+-generic-y += trace_clock.h
+-generic-y += preempt.h
+-generic-y += hash.h
+-generic-y += barrier.h
+--- a/arch/um/include/asm/a.out-core.h
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/* a.out coredump register dumper
+- *
+- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+- * Written by David Howells (dhowells@redhat.com)
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public Licence
+- * as published by the Free Software Foundation; either version
+- * 2 of the Licence, or (at your option) any later version.
+- */
+-
+-#ifndef __UM_A_OUT_CORE_H
+-#define __UM_A_OUT_CORE_H
+-
+-#ifdef __KERNEL__
+-
+-#include <linux/user.h>
+-
+-/*
+- * fill in the user structure for an a.out core dump
+- */
+-static inline void aout_dump_thread(struct pt_regs *regs, struct user *u)
+-{
+-}
+-
+-#endif /* __KERNEL__ */
+-#endif /* __UM_A_OUT_CORE_H */
+--- a/arch/um/include/asm/bugs.h
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#ifndef __UM_BUGS_H
+-#define __UM_BUGS_H
+-
+-void check_bugs(void);
+-
+-#endif
+--- a/arch/um/include/asm/cache.h
++++ /dev/null
+@@ -1,17 +0,0 @@
+-#ifndef __UM_CACHE_H
+-#define __UM_CACHE_H
+-
+-
+-#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
+-# define L1_CACHE_SHIFT		(CONFIG_X86_L1_CACHE_SHIFT)
+-#elif defined(CONFIG_UML_X86) /* 64-bit */
+-# define L1_CACHE_SHIFT		6 /* Should be 7 on Intel */
+-#else
+-/* XXX: this was taken from x86, now it's completely random. Luckily only
+- * affects SMP padding. */
+-# define L1_CACHE_SHIFT		5
+-#endif
+-
+-#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
+-
+-#endif
+--- a/arch/um/include/asm/common.lds.S
++++ /dev/null
+@@ -1,107 +0,0 @@
+-#include <asm-generic/vmlinux.lds.h>
+-
+-  .fini      : { *(.fini)    } =0x9090
+-  _etext = .;
+-  PROVIDE (etext = .);
+-
+-  . = ALIGN(4096);
+-  _sdata = .;
+-  PROVIDE (sdata = .);
+-
+-  RODATA
+-
+-  .unprotected : { *(.unprotected) }
+-  . = ALIGN(4096);
+-  PROVIDE (_unprotected_end = .);
+-
+-  . = ALIGN(4096);
+-  .note : { *(.note.*) }
+-  EXCEPTION_TABLE(0)
+-
+-  BUG_TABLE
+-
+-  .uml.setup.init : {
+-	__uml_setup_start = .;
+-	*(.uml.setup.init)
+-	__uml_setup_end = .;
+-  }
+-	
+-  .uml.help.init : {
+-	__uml_help_start = .;
+-	*(.uml.help.init)
+-	__uml_help_end = .;
+-  }
+-	
+-  .uml.postsetup.init : {
+-	__uml_postsetup_start = .;
+-	*(.uml.postsetup.init)
+-	__uml_postsetup_end = .;
+-  }
+-	
+-  .init.setup : {
+-	INIT_SETUP(0)
+-  }
+-
+-  PERCPU_SECTION(32)
+-	
+-  .initcall.init : {
+-	INIT_CALLS
+-  }
+-
+-  .con_initcall.init : {
+-	CON_INITCALL
+-  }
+-
+-  .uml.initcall.init : {
+-	__uml_initcall_start = .;
+-	*(.uml.initcall.init)
+-	__uml_initcall_end = .;
+-  }
+-
+-  SECURITY_INIT
+-
+-  .exitcall : {
+-	__exitcall_begin = .;
+-	*(.exitcall.exit)
+-	__exitcall_end = .;
+-  }
+-
+-  .uml.exitcall : {
+-	__uml_exitcall_begin = .;
+-	*(.uml.exitcall.exit)
+-	__uml_exitcall_end = .;
+-  }
+-
+-  . = ALIGN(4);
+-  .altinstructions : {
+-	__alt_instructions = .;
+-	*(.altinstructions)
+-	__alt_instructions_end = .;
+-  }
+-  .altinstr_replacement : { *(.altinstr_replacement) }
+-  /* .exit.text is discard at runtime, not link time, to deal with references
+-     from .altinstructions and .eh_frame */
+-  .exit.text : { *(.exit.text) }
+-  .exit.data : { *(.exit.data) }
+-
+-  .preinit_array : {
+-	__preinit_array_start = .;
+-	*(.preinit_array)
+-	__preinit_array_end = .;
+-  }
+-  .init_array : {
+-	__init_array_start = .;
+-	*(.init_array)
+-	__init_array_end = .;
+-  }
+-  .fini_array : {
+-	__fini_array_start = .;
+-	*(.fini_array)
+-	__fini_array_end = .;
+-  }
+-
+-   . = ALIGN(4096);
+-  .init.ramfs : {
+-	INIT_RAM_FS
+-  }
+-
+--- a/arch/um/include/asm/dma.h
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#ifndef __UM_DMA_H
+-#define __UM_DMA_H
+-
+-#include <asm/io.h>
+-
+-extern unsigned long uml_physmem;
+-
+-#define MAX_DMA_ADDRESS (uml_physmem)
+-
+-#endif
+--- a/arch/um/include/asm/fixmap.h
++++ /dev/null
+@@ -1,60 +0,0 @@
+-#ifndef __UM_FIXMAP_H
+-#define __UM_FIXMAP_H
+-
+-#include <asm/processor.h>
+-#include <asm/kmap_types.h>
+-#include <asm/archparam.h>
+-#include <asm/page.h>
+-#include <linux/threads.h>
+-
+-/*
+- * Here we define all the compile-time 'special' virtual
+- * addresses. The point is to have a constant address at
+- * compile time, but to set the physical address only
+- * in the boot process. We allocate these special  addresses
+- * from the end of virtual memory (0xfffff000) backwards.
+- * Also this lets us do fail-safe vmalloc(), we
+- * can guarantee that these special addresses and
+- * vmalloc()-ed addresses never overlap.
+- *
+- * these 'compile-time allocated' memory buffers are
+- * fixed-size 4k pages. (or larger if used with an increment
+- * highger than 1) use fixmap_set(idx,phys) to associate
+- * physical memory with fixmap indices.
+- *
+- * TLB entries of such buffers will not be flushed across
+- * task switches.
+- */
+-
+-/*
+- * on UP currently we will have no trace of the fixmap mechanizm,
+- * no page table allocations, etc. This might change in the
+- * future, say framebuffers for the console driver(s) could be
+- * fix-mapped?
+- */
+-enum fixed_addresses {
+-#ifdef CONFIG_HIGHMEM
+-	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+-	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+-#endif
+-	__end_of_fixed_addresses
+-};
+-
+-extern void __set_fixmap (enum fixed_addresses idx,
+-			  unsigned long phys, pgprot_t flags);
+-
+-/*
+- * used by vmalloc.c.
+- *
+- * Leave one empty page between vmalloc'ed areas and
+- * the start of the fixmap, and leave one page empty
+- * at the top of mem..
+- */
+-
+-#define FIXADDR_TOP	(TASK_SIZE - 2 * PAGE_SIZE)
+-#define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)
+-#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)
+-
+-#include <asm-generic/fixmap.h>
+-
+-#endif
+--- a/arch/um/include/asm/irq.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#ifndef __UM_IRQ_H
+-#define __UM_IRQ_H
+-
+-#define TIMER_IRQ		0
+-#define UMN_IRQ			1
+-#define CONSOLE_IRQ		2
+-#define CONSOLE_WRITE_IRQ	3
+-#define UBD_IRQ			4
+-#define UM_ETH_IRQ		5
+-#define SSL_IRQ			6
+-#define SSL_WRITE_IRQ		7
+-#define ACCEPT_IRQ		8
+-#define MCONSOLE_IRQ		9
+-#define WINCH_IRQ		10
+-#define SIGIO_WRITE_IRQ 	11
+-#define TELNETD_IRQ 		12
+-#define XTERM_IRQ 		13
+-#define RANDOM_IRQ 		14
+-
+-#define LAST_IRQ RANDOM_IRQ
+-#define NR_IRQS (LAST_IRQ + 1)
+-
+-#endif
+--- a/arch/um/include/asm/irqflags.h
++++ /dev/null
+@@ -1,42 +0,0 @@
+-#ifndef __UM_IRQFLAGS_H
+-#define __UM_IRQFLAGS_H
+-
+-extern int get_signals(void);
+-extern int set_signals(int enable);
+-extern void block_signals(void);
+-extern void unblock_signals(void);
+-
+-static inline unsigned long arch_local_save_flags(void)
+-{
+-	return get_signals();
+-}
+-
+-static inline void arch_local_irq_restore(unsigned long flags)
+-{
+-	set_signals(flags);
+-}
+-
+-static inline void arch_local_irq_enable(void)
+-{
+-	unblock_signals();
+-}
+-
+-static inline void arch_local_irq_disable(void)
+-{
+-	block_signals();
+-}
+-
+-static inline unsigned long arch_local_irq_save(void)
+-{
+-	unsigned long flags;
+-	flags = arch_local_save_flags();
+-	arch_local_irq_disable();
+-	return flags;
+-}
+-
+-static inline bool arch_irqs_disabled(void)
+-{
+-	return arch_local_save_flags() == 0;
+-}
+-
+-#endif
+--- a/arch/um/include/asm/kmap_types.h
++++ /dev/null
+@@ -1,13 +0,0 @@
+-/* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_KMAP_TYPES_H
+-#define __UM_KMAP_TYPES_H
+-
+-/* No more #include "asm/arch/kmap_types.h" ! */
+-
+-#define KM_TYPE_NR 14
+-
+-#endif
+--- a/arch/um/include/asm/kvm_para.h
++++ /dev/null
+@@ -1 +0,0 @@
+-#include <asm-generic/kvm_para.h>
+--- a/arch/um/include/asm/mmu.h
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/* 
+- * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __ARCH_UM_MMU_H
+-#define __ARCH_UM_MMU_H
+-
+-#include <mm_id.h>
+-#include <asm/mm_context.h>
+-
+-typedef struct mm_context {
+-	struct mm_id id;
+-	struct uml_arch_mm_context arch;
+-	struct page *stub_pages[2];
+-} mm_context_t;
+-
+-extern void __switch_mm(struct mm_id * mm_idp);
+-
+-/* Avoid tangled inclusion with asm/ldt.h */
+-extern long init_new_ldt(struct mm_context *to_mm, struct mm_context *from_mm);
+-extern void free_ldt(struct mm_context *mm);
+-
+-#endif
+--- a/arch/um/include/asm/mmu_context.h
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/* 
+- * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_MMU_CONTEXT_H
+-#define __UM_MMU_CONTEXT_H
+-
+-#include <linux/sched.h>
+-#include <asm/mmu.h>
+-
+-extern void uml_setup_stubs(struct mm_struct *mm);
+-extern void arch_exit_mmap(struct mm_struct *mm);
+-
+-#define deactivate_mm(tsk,mm)	do { } while (0)
+-
+-extern void force_flush_all(void);
+-
+-static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)
+-{
+-	/*
+-	 * This is called by fs/exec.c and sys_unshare()
+-	 * when the new ->mm is used for the first time.
+-	 */
+-	__switch_mm(&new->context.id);
+-	down_write(&new->mmap_sem);
+-	uml_setup_stubs(new);
+-	up_write(&new->mmap_sem);
+-}
+-
+-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
+-			     struct task_struct *tsk)
+-{
+-	unsigned cpu = smp_processor_id();
+-
+-	if(prev != next){
+-		cpumask_clear_cpu(cpu, mm_cpumask(prev));
+-		cpumask_set_cpu(cpu, mm_cpumask(next));
+-		if(next != &init_mm)
+-			__switch_mm(&next->context.id);
+-	}
+-}
+-
+-static inline void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
+-{
+-	uml_setup_stubs(mm);
+-}
+-
+-static inline void enter_lazy_tlb(struct mm_struct *mm, 
+-				  struct task_struct *tsk)
+-{
+-}
+-
+-extern int init_new_context(struct task_struct *task, struct mm_struct *mm);
+-
+-extern void destroy_context(struct mm_struct *mm);
+-
+-#endif
+--- a/arch/um/include/asm/page.h
++++ /dev/null
+@@ -1,122 +0,0 @@
+-/*
+- * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+- * Copyright 2003 PathScale, Inc.
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_PAGE_H
+-#define __UM_PAGE_H
+-
+-#include <linux/const.h>
+-
+-/* PAGE_SHIFT determines the page size */
+-#define PAGE_SHIFT	12
+-#define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
+-#define PAGE_MASK	(~(PAGE_SIZE-1))
+-
+-#ifndef __ASSEMBLY__
+-
+-struct page;
+-
+-#include <linux/types.h>
+-#include <asm/vm-flags.h>
+-
+-/*
+- * These are used to make use of C type-checking..
+- */
+-
+-#define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)
+-#define copy_page(to,from)	memcpy((void *)(to), (void *)(from), PAGE_SIZE)
+-
+-#define clear_user_page(page, vaddr, pg)	clear_page(page)
+-#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)
+-
+-#if defined(CONFIG_3_LEVEL_PGTABLES) && !defined(CONFIG_64BIT)
+-
+-typedef struct { unsigned long pte_low, pte_high; } pte_t;
+-typedef struct { unsigned long pmd; } pmd_t;
+-typedef struct { unsigned long pgd; } pgd_t;
+-#define pte_val(x) ((x).pte_low | ((unsigned long long) (x).pte_high << 32))
+-
+-#define pte_get_bits(pte, bits) ((pte).pte_low & (bits))
+-#define pte_set_bits(pte, bits) ((pte).pte_low |= (bits))
+-#define pte_clear_bits(pte, bits) ((pte).pte_low &= ~(bits))
+-#define pte_copy(to, from) ({ (to).pte_high = (from).pte_high; \
+-			      smp_wmb(); \
+-			      (to).pte_low = (from).pte_low; })
+-#define pte_is_zero(pte) (!((pte).pte_low & ~_PAGE_NEWPAGE) && !(pte).pte_high)
+-#define pte_set_val(pte, phys, prot) \
+-	({ (pte).pte_high = (phys) >> 32; \
+-	   (pte).pte_low = (phys) | pgprot_val(prot); })
+-
+-#define pmd_val(x)	((x).pmd)
+-#define __pmd(x) ((pmd_t) { (x) } )
+-
+-typedef unsigned long long pfn_t;
+-typedef unsigned long long phys_t;
+-
+-#else
+-
+-typedef struct { unsigned long pte; } pte_t;
+-typedef struct { unsigned long pgd; } pgd_t;
+-
+-#ifdef CONFIG_3_LEVEL_PGTABLES
+-typedef struct { unsigned long pmd; } pmd_t;
+-#define pmd_val(x)	((x).pmd)
+-#define __pmd(x) ((pmd_t) { (x) } )
+-#endif
+-
+-#define pte_val(x)	((x).pte)
+-
+-
+-#define pte_get_bits(p, bits) ((p).pte & (bits))
+-#define pte_set_bits(p, bits) ((p).pte |= (bits))
+-#define pte_clear_bits(p, bits) ((p).pte &= ~(bits))
+-#define pte_copy(to, from) ((to).pte = (from).pte)
+-#define pte_is_zero(p) (!((p).pte & ~_PAGE_NEWPAGE))
+-#define pte_set_val(p, phys, prot) (p).pte = (phys | pgprot_val(prot))
+-
+-typedef unsigned long pfn_t;
+-typedef unsigned long phys_t;
+-
+-#endif
+-
+-typedef struct { unsigned long pgprot; } pgprot_t;
+-
+-typedef struct page *pgtable_t;
+-
+-#define pgd_val(x)	((x).pgd)
+-#define pgprot_val(x)	((x).pgprot)
+-
+-#define __pte(x) ((pte_t) { (x) } )
+-#define __pgd(x) ((pgd_t) { (x) } )
+-#define __pgprot(x)	((pgprot_t) { (x) } )
+-
+-extern unsigned long uml_physmem;
+-
+-#define PAGE_OFFSET (uml_physmem)
+-#define KERNELBASE PAGE_OFFSET
+-
+-#define __va_space (8*1024*1024)
+-
+-#include <mem.h>
+-
+-/* Cast to unsigned long before casting to void * to avoid a warning from
+- * mmap_kmem about cutting a long long down to a void *.  Not sure that
+- * casting is the right thing, but 32-bit UML can't have 64-bit virtual
+- * addresses
+- */
+-#define __pa(virt) to_phys((void *) (unsigned long) (virt))
+-#define __va(phys) to_virt((unsigned long) (phys))
+-
+-#define phys_to_pfn(p) ((pfn_t) ((p) >> PAGE_SHIFT))
+-#define pfn_to_phys(pfn) ((phys_t) ((pfn) << PAGE_SHIFT))
+-
+-#define pfn_valid(pfn) ((pfn) < max_mapnr)
+-#define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v)))
+-
+-#include <asm-generic/memory_model.h>
+-#include <asm-generic/getorder.h>
+-
+-#endif	/* __ASSEMBLY__ */
+-#endif	/* __UM_PAGE_H */
+--- a/arch/um/include/asm/pgalloc.h
++++ /dev/null
+@@ -1,61 +0,0 @@
+-/* 
+- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+- * Copyright 2003 PathScale, Inc.
+- * Derived from include/asm-i386/pgalloc.h and include/asm-i386/pgtable.h
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_PGALLOC_H
+-#define __UM_PGALLOC_H
+-
+-#include <linux/mm.h>
+-
+-#define pmd_populate_kernel(mm, pmd, pte) \
+-	set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) __pa(pte)))
+-
+-#define pmd_populate(mm, pmd, pte) 				\
+-	set_pmd(pmd, __pmd(_PAGE_TABLE +			\
+-		((unsigned long long)page_to_pfn(pte) <<	\
+-			(unsigned long long) PAGE_SHIFT)))
+-#define pmd_pgtable(pmd) pmd_page(pmd)
+-
+-/*
+- * Allocate and free page tables.
+- */
+-extern pgd_t *pgd_alloc(struct mm_struct *);
+-extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
+-
+-extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
+-extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long);
+-
+-static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
+-{
+-	free_page((unsigned long) pte);
+-}
+-
+-static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
+-{
+-	pgtable_page_dtor(pte);
+-	__free_page(pte);
+-}
+-
+-#define __pte_free_tlb(tlb,pte, address)		\
+-do {							\
+-	pgtable_page_dtor(pte);				\
+-	tlb_remove_page((tlb),(pte));			\
+-} while (0)
+-
+-#ifdef CONFIG_3_LEVEL_PGTABLES
+-
+-static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
+-{
+-	free_page((unsigned long)pmd);
+-}
+-
+-#define __pmd_free_tlb(tlb,x, address)   tlb_remove_page((tlb),virt_to_page(x))
+-#endif
+-
+-#define check_pgt_cache()	do { } while (0)
+-
+-#endif
+-
+--- a/arch/um/include/asm/pgtable-2level.h
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/*
+- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+- * Copyright 2003 PathScale, Inc.
+- * Derived from include/asm-i386/pgtable.h
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_PGTABLE_2LEVEL_H
+-#define __UM_PGTABLE_2LEVEL_H
+-
+-#include <asm-generic/pgtable-nopmd.h>
+-
+-/* PGDIR_SHIFT determines what a third-level page table entry can map */
+-
+-#define PGDIR_SHIFT	22
+-#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
+-#define PGDIR_MASK	(~(PGDIR_SIZE-1))
+-
+-/*
+- * entries per page directory level: the i386 is two-level, so
+- * we don't really have any PMD directory physically.
+- */
+-#define PTRS_PER_PTE	1024
+-#define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE)
+-#define PTRS_PER_PGD	1024
+-#define FIRST_USER_ADDRESS	0
+-
+-#define pte_ERROR(e) \
+-        printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), \
+-	       pte_val(e))
+-#define pgd_ERROR(e) \
+-        printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), \
+-	       pgd_val(e))
+-
+-static inline int pgd_newpage(pgd_t pgd)	{ return 0; }
+-static inline void pgd_mkuptodate(pgd_t pgd)	{ }
+-
+-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
+-
+-#define pte_pfn(x) phys_to_pfn(pte_val(x))
+-#define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
+-#define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
+-
+-/*
+- * Bits 0 through 4 are taken
+- */
+-#define PTE_FILE_MAX_BITS	27
+-
+-#define pte_to_pgoff(pte) (pte_val(pte) >> 5)
+-
+-#define pgoff_to_pte(off) ((pte_t) { ((off) << 5) + _PAGE_FILE })
+-
+-#endif
+--- a/arch/um/include/asm/pgtable-3level.h
++++ /dev/null
+@@ -1,136 +0,0 @@
+-/*
+- * Copyright 2003 PathScale Inc
+- * Derived from include/asm-i386/pgtable.h
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_PGTABLE_3LEVEL_H
+-#define __UM_PGTABLE_3LEVEL_H
+-
+-#include <asm-generic/pgtable-nopud.h>
+-
+-/* PGDIR_SHIFT determines what a third-level page table entry can map */
+-
+-#ifdef CONFIG_64BIT
+-#define PGDIR_SHIFT	30
+-#else
+-#define PGDIR_SHIFT	31
+-#endif
+-#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
+-#define PGDIR_MASK	(~(PGDIR_SIZE-1))
+-
+-/* PMD_SHIFT determines the size of the area a second-level page table can
+- * map
+- */
+-
+-#define PMD_SHIFT	21
+-#define PMD_SIZE	(1UL << PMD_SHIFT)
+-#define PMD_MASK	(~(PMD_SIZE-1))
+-
+-/*
+- * entries per page directory level
+- */
+-
+-#define PTRS_PER_PTE 512
+-#ifdef CONFIG_64BIT
+-#define PTRS_PER_PMD 512
+-#define PTRS_PER_PGD 512
+-#else
+-#define PTRS_PER_PMD 1024
+-#define PTRS_PER_PGD 1024
+-#endif
+-
+-#define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE)
+-#define FIRST_USER_ADDRESS	0
+-
+-#define pte_ERROR(e) \
+-        printk("%s:%d: bad pte %p(%016lx).\n", __FILE__, __LINE__, &(e), \
+-	       pte_val(e))
+-#define pmd_ERROR(e) \
+-        printk("%s:%d: bad pmd %p(%016lx).\n", __FILE__, __LINE__, &(e), \
+-	       pmd_val(e))
+-#define pgd_ERROR(e) \
+-        printk("%s:%d: bad pgd %p(%016lx).\n", __FILE__, __LINE__, &(e), \
+-	       pgd_val(e))
+-
+-#define pud_none(x)	(!(pud_val(x) & ~_PAGE_NEWPAGE))
+-#define	pud_bad(x)	((pud_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
+-#define pud_present(x)	(pud_val(x) & _PAGE_PRESENT)
+-#define pud_populate(mm, pud, pmd) \
+-	set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
+-
+-#ifdef CONFIG_64BIT
+-#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
+-#else
+-#define set_pud(pudptr, pudval) (*(pudptr) = (pudval))
+-#endif
+-
+-static inline int pgd_newpage(pgd_t pgd)
+-{
+-	return(pgd_val(pgd) & _PAGE_NEWPAGE);
+-}
+-
+-static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }
+-
+-#ifdef CONFIG_64BIT
+-#define set_pmd(pmdptr, pmdval) set_64bit((u64 *) (pmdptr), pmd_val(pmdval))
+-#else
+-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
+-#endif
+-
+-struct mm_struct;
+-extern pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address);
+-
+-static inline void pud_clear (pud_t *pud)
+-{
+-	set_pud(pud, __pud(_PAGE_NEWPAGE));
+-}
+-
+-#define pud_page(pud) phys_to_page(pud_val(pud) & PAGE_MASK)
+-#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
+-
+-/* Find an entry in the second-level page table.. */
+-#define pmd_offset(pud, address) ((pmd_t *) pud_page_vaddr(*(pud)) + \
+-			pmd_index(address))
+-
+-static inline unsigned long pte_pfn(pte_t pte)
+-{
+-	return phys_to_pfn(pte_val(pte));
+-}
+-
+-static inline pte_t pfn_pte(pfn_t page_nr, pgprot_t pgprot)
+-{
+-	pte_t pte;
+-	phys_t phys = pfn_to_phys(page_nr);
+-
+-	pte_set_val(pte, phys, pgprot);
+-	return pte;
+-}
+-
+-static inline pmd_t pfn_pmd(pfn_t page_nr, pgprot_t pgprot)
+-{
+-	return __pmd((page_nr << PAGE_SHIFT) | pgprot_val(pgprot));
+-}
+-
+-/*
+- * Bits 0 through 3 are taken in the low part of the pte,
+- * put the 32 bits of offset into the high part.
+- */
+-#define PTE_FILE_MAX_BITS	32
+-
+-#ifdef CONFIG_64BIT
+-
+-#define pte_to_pgoff(p) ((p).pte >> 32)
+-
+-#define pgoff_to_pte(off) ((pte_t) { ((off) << 32) | _PAGE_FILE })
+-
+-#else
+-
+-#define pte_to_pgoff(pte) ((pte).pte_high)
+-
+-#define pgoff_to_pte(off) ((pte_t) { _PAGE_FILE, (off) })
+-
+-#endif
+-
+-#endif
+-
+--- a/arch/um/include/asm/pgtable.h
++++ /dev/null
+@@ -1,375 +0,0 @@
+-/* 
+- * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+- * Copyright 2003 PathScale, Inc.
+- * Derived from include/asm-i386/pgtable.h
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_PGTABLE_H
+-#define __UM_PGTABLE_H
+-
+-#include <asm/fixmap.h>
+-
+-#define _PAGE_PRESENT	0x001
+-#define _PAGE_NEWPAGE	0x002
+-#define _PAGE_NEWPROT	0x004
+-#define _PAGE_RW	0x020
+-#define _PAGE_USER	0x040
+-#define _PAGE_ACCESSED	0x080
+-#define _PAGE_DIRTY	0x100
+-/* If _PAGE_PRESENT is clear, we use these: */
+-#define _PAGE_FILE	0x008	/* nonlinear file mapping, saved PTE; unset:swap */
+-#define _PAGE_PROTNONE	0x010	/* if the user mapped it with PROT_NONE;
+-				   pte_present gives true */
+-
+-#ifdef CONFIG_3_LEVEL_PGTABLES
+-#include <asm/pgtable-3level.h>
+-#else
+-#include <asm/pgtable-2level.h>
+-#endif
+-
+-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
+-
+-/* zero page used for uninitialized stuff */
+-extern unsigned long *empty_zero_page;
+-
+-#define pgtable_cache_init() do ; while (0)
+-
+-/* Just any arbitrary offset to the start of the vmalloc VM area: the
+- * current 8MB value just means that there will be a 8MB "hole" after the
+- * physical memory until the kernel virtual memory starts.  That means that
+- * any out-of-bounds memory accesses will hopefully be caught.
+- * The vmalloc() routines leaves a hole of 4kB between each vmalloced
+- * area for the same reason. ;)
+- */
+-
+-extern unsigned long end_iomem;
+-
+-#define VMALLOC_OFFSET	(__va_space)
+-#define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)
+-#ifdef CONFIG_HIGHMEM
+-# define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
+-#else
+-# define VMALLOC_END	(FIXADDR_START-2*PAGE_SIZE)
+-#endif
+-#define MODULES_VADDR	VMALLOC_START
+-#define MODULES_END	VMALLOC_END
+-#define MODULES_LEN	(MODULES_VADDR - MODULES_END)
+-
+-#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
+-#define _KERNPG_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
+-#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
+-#define __PAGE_KERNEL_EXEC                                              \
+-	 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)
+-#define PAGE_NONE	__pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)
+-#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)
+-#define PAGE_COPY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)
+-#define PAGE_READONLY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)
+-#define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)
+-#define PAGE_KERNEL_EXEC	__pgprot(__PAGE_KERNEL_EXEC)
+-
+-/*
+- * The i386 can't do page protection for execute, and considers that the same
+- * are read.
+- * Also, write permissions imply read permissions. This is the closest we can
+- * get..
+- */
+-#define __P000	PAGE_NONE
+-#define __P001	PAGE_READONLY
+-#define __P010	PAGE_COPY
+-#define __P011	PAGE_COPY
+-#define __P100	PAGE_READONLY
+-#define __P101	PAGE_READONLY
+-#define __P110	PAGE_COPY
+-#define __P111	PAGE_COPY
+-
+-#define __S000	PAGE_NONE
+-#define __S001	PAGE_READONLY
+-#define __S010	PAGE_SHARED
+-#define __S011	PAGE_SHARED
+-#define __S100	PAGE_READONLY
+-#define __S101	PAGE_READONLY
+-#define __S110	PAGE_SHARED
+-#define __S111	PAGE_SHARED
+-
+-/*
+- * ZERO_PAGE is a global shared page that is always zero: used
+- * for zero-mapped memory areas etc..
+- */
+-#define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page)
+-
+-#define pte_clear(mm,addr,xp) pte_set_val(*(xp), (phys_t) 0, __pgprot(_PAGE_NEWPAGE))
+-
+-#define pmd_none(x)	(!((unsigned long)pmd_val(x) & ~_PAGE_NEWPAGE))
+-#define	pmd_bad(x)	((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
+-
+-#define pmd_present(x)	(pmd_val(x) & _PAGE_PRESENT)
+-#define pmd_clear(xp)	do { pmd_val(*(xp)) = _PAGE_NEWPAGE; } while (0)
+-
+-#define pmd_newpage(x)  (pmd_val(x) & _PAGE_NEWPAGE)
+-#define pmd_mkuptodate(x) (pmd_val(x) &= ~_PAGE_NEWPAGE)
+-
+-#define pud_newpage(x)  (pud_val(x) & _PAGE_NEWPAGE)
+-#define pud_mkuptodate(x) (pud_val(x) &= ~_PAGE_NEWPAGE)
+-
+-#define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)
+-
+-#define pte_page(x) pfn_to_page(pte_pfn(x))
+-
+-#define pte_present(x)	pte_get_bits(x, (_PAGE_PRESENT | _PAGE_PROTNONE))
+-
+-/*
+- * =================================
+- * Flags checking section.
+- * =================================
+- */
+-
+-static inline int pte_none(pte_t pte)
+-{
+-	return pte_is_zero(pte);
+-}
+-
+-/*
+- * The following only work if pte_present() is true.
+- * Undefined behaviour if not..
+- */
+-static inline int pte_read(pte_t pte)
+-{ 
+-	return((pte_get_bits(pte, _PAGE_USER)) &&
+-	       !(pte_get_bits(pte, _PAGE_PROTNONE)));
+-}
+-
+-static inline int pte_exec(pte_t pte){
+-	return((pte_get_bits(pte, _PAGE_USER)) &&
+-	       !(pte_get_bits(pte, _PAGE_PROTNONE)));
+-}
+-
+-static inline int pte_write(pte_t pte)
+-{
+-	return((pte_get_bits(pte, _PAGE_RW)) &&
+-	       !(pte_get_bits(pte, _PAGE_PROTNONE)));
+-}
+-
+-/*
+- * The following only works if pte_present() is not true.
+- */
+-static inline int pte_file(pte_t pte)
+-{
+-	return pte_get_bits(pte, _PAGE_FILE);
+-}
+-
+-static inline int pte_dirty(pte_t pte)
+-{
+-	return pte_get_bits(pte, _PAGE_DIRTY);
+-}
+-
+-static inline int pte_young(pte_t pte)
+-{
+-	return pte_get_bits(pte, _PAGE_ACCESSED);
+-}
+-
+-static inline int pte_newpage(pte_t pte)
+-{
+-	return pte_get_bits(pte, _PAGE_NEWPAGE);
+-}
+-
+-static inline int pte_newprot(pte_t pte)
+-{ 
+-	return(pte_present(pte) && (pte_get_bits(pte, _PAGE_NEWPROT)));
+-}
+-
+-static inline int pte_special(pte_t pte)
+-{
+-	return 0;
+-}
+-
+-/*
+- * =================================
+- * Flags setting section.
+- * =================================
+- */
+-
+-static inline pte_t pte_mknewprot(pte_t pte)
+-{
+-	pte_set_bits(pte, _PAGE_NEWPROT);
+-	return(pte);
+-}
+-
+-static inline pte_t pte_mkclean(pte_t pte)
+-{
+-	pte_clear_bits(pte, _PAGE_DIRTY);
+-	return(pte);
+-}
+-
+-static inline pte_t pte_mkold(pte_t pte)	
+-{ 
+-	pte_clear_bits(pte, _PAGE_ACCESSED);
+-	return(pte);
+-}
+-
+-static inline pte_t pte_wrprotect(pte_t pte)
+-{ 
+-	pte_clear_bits(pte, _PAGE_RW);
+-	return(pte_mknewprot(pte)); 
+-}
+-
+-static inline pte_t pte_mkread(pte_t pte)
+-{ 
+-	pte_set_bits(pte, _PAGE_USER);
+-	return(pte_mknewprot(pte)); 
+-}
+-
+-static inline pte_t pte_mkdirty(pte_t pte)
+-{ 
+-	pte_set_bits(pte, _PAGE_DIRTY);
+-	return(pte);
+-}
+-
+-static inline pte_t pte_mkyoung(pte_t pte)
+-{
+-	pte_set_bits(pte, _PAGE_ACCESSED);
+-	return(pte);
+-}
+-
+-static inline pte_t pte_mkwrite(pte_t pte)	
+-{
+-	pte_set_bits(pte, _PAGE_RW);
+-	return(pte_mknewprot(pte)); 
+-}
+-
+-static inline pte_t pte_mkuptodate(pte_t pte)	
+-{
+-	pte_clear_bits(pte, _PAGE_NEWPAGE);
+-	if(pte_present(pte))
+-		pte_clear_bits(pte, _PAGE_NEWPROT);
+-	return(pte); 
+-}
+-
+-static inline pte_t pte_mknewpage(pte_t pte)
+-{
+-	pte_set_bits(pte, _PAGE_NEWPAGE);
+-	return(pte);
+-}
+-
+-static inline pte_t pte_mkspecial(pte_t pte)
+-{
+-	return(pte);
+-}
+-
+-static inline void set_pte(pte_t *pteptr, pte_t pteval)
+-{
+-	pte_copy(*pteptr, pteval);
+-
+-	/* If it's a swap entry, it needs to be marked _PAGE_NEWPAGE so
+-	 * fix_range knows to unmap it.  _PAGE_NEWPROT is specific to
+-	 * mapped pages.
+-	 */
+-
+-	*pteptr = pte_mknewpage(*pteptr);
+-	if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr);
+-}
+-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
+-
+-#define __HAVE_ARCH_PTE_SAME
+-static inline int pte_same(pte_t pte_a, pte_t pte_b)
+-{
+-	return !((pte_val(pte_a) ^ pte_val(pte_b)) & ~_PAGE_NEWPAGE);
+-}
+-
+-/*
+- * Conversion functions: convert a page and protection to a page entry,
+- * and a page entry and page directory to the page they refer to.
+- */
+-
+-#define phys_to_page(phys) pfn_to_page(phys_to_pfn(phys))
+-#define __virt_to_page(virt) phys_to_page(__pa(virt))
+-#define page_to_phys(page) pfn_to_phys((pfn_t) page_to_pfn(page))
+-#define virt_to_page(addr) __virt_to_page((const unsigned long) addr)
+-
+-#define mk_pte(page, pgprot) \
+-	({ pte_t pte;					\
+-							\
+-	pte_set_val(pte, page_to_phys(page), (pgprot));	\
+-	if (pte_present(pte))				\
+-		pte_mknewprot(pte_mknewpage(pte));	\
+-	pte;})
+-
+-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+-{
+-	pte_set_val(pte, (pte_val(pte) & _PAGE_CHG_MASK), newprot);
+-	return pte; 
+-}
+-
+-/*
+- * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
+- *
+- * this macro returns the index of the entry in the pgd page which would
+- * control the given virtual address
+- */
+-#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+-
+-/*
+- * pgd_offset() returns a (pgd_t *)
+- * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
+- */
+-#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
+-
+-/*
+- * a shortcut which implies the use of the kernel's pgd, instead
+- * of a process's
+- */
+-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
+-
+-/*
+- * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
+- *
+- * this macro returns the index of the entry in the pmd page which would
+- * control the given virtual address
+- */
+-#define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+-#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
+-
+-#define pmd_page_vaddr(pmd) \
+-	((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+-
+-/*
+- * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
+- *
+- * this macro returns the index of the entry in the pte page which would
+- * control the given virtual address
+- */
+-#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+-#define pte_offset_kernel(dir, address) \
+-	((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))
+-#define pte_offset_map(dir, address) \
+-	((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
+-#define pte_unmap(pte) do { } while (0)
+-
+-struct mm_struct;
+-extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
+-
+-#define update_mmu_cache(vma,address,ptep) do ; while (0)
+-
+-/* Encode and de-code a swap entry */
+-#define __swp_type(x)			(((x).val >> 5) & 0x1f)
+-#define __swp_offset(x)			((x).val >> 11)
+-
+-#define __swp_entry(type, offset) \
+-	((swp_entry_t) { ((type) << 5) | ((offset) << 11) })
+-#define __pte_to_swp_entry(pte) \
+-	((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })
+-#define __swp_entry_to_pte(x)		((pte_t) { (x).val })
+-
+-#define kern_addr_valid(addr) (1)
+-
+-#include <asm-generic/pgtable.h>
+-
+-/* Clear a kernel PTE and flush it from the TLB */
+-#define kpte_clear_flush(ptep, vaddr)		\
+-do {						\
+-	pte_clear(&init_mm, (vaddr), (ptep));	\
+-	__flush_tlb_one((vaddr));		\
+-} while (0)
+-
+-#endif
+--- a/arch/um/include/asm/processor-generic.h
++++ /dev/null
+@@ -1,115 +0,0 @@
+-/* 
+- * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_PROCESSOR_GENERIC_H
+-#define __UM_PROCESSOR_GENERIC_H
+-
+-struct pt_regs;
+-
+-struct task_struct;
+-
+-#include <asm/ptrace.h>
+-#include <registers.h>
+-#include <sysdep/archsetjmp.h>
+-
+-#include <linux/prefetch.h>
+-
+-struct mm_struct;
+-
+-struct thread_struct {
+-	struct pt_regs regs;
+-	struct pt_regs *segv_regs;
+-	int singlestep_syscall;
+-	void *fault_addr;
+-	jmp_buf *fault_catcher;
+-	struct task_struct *prev_sched;
+-	struct arch_thread arch;
+-	jmp_buf switch_buf;
+-	struct {
+-		int op;
+-		union {
+-			struct {
+-				int pid;
+-			} fork, exec;
+-			struct {
+-				int (*proc)(void *);
+-				void *arg;
+-			} thread;
+-			struct {
+-				void (*proc)(void *);
+-				void *arg;
+-			} cb;
+-		} u;
+-	} request;
+-};
+-
+-#define INIT_THREAD \
+-{ \
+-	.regs		   	= EMPTY_REGS,	\
+-	.fault_addr		= NULL, \
+-	.prev_sched		= NULL, \
+-	.arch			= INIT_ARCH_THREAD, \
+-	.request		= { 0 } \
+-}
+-
+-static inline void release_thread(struct task_struct *task)
+-{
+-}
+-
+-extern unsigned long thread_saved_pc(struct task_struct *t);
+-
+-static inline void mm_copy_segments(struct mm_struct *from_mm,
+-				    struct mm_struct *new_mm)
+-{
+-}
+-
+-#define init_stack	(init_thread_union.stack)
+-
+-/*
+- * User space process size: 3GB (default).
+- */
+-extern unsigned long task_size;
+-
+-#define TASK_SIZE (task_size)
+-
+-#undef STACK_TOP
+-#undef STACK_TOP_MAX
+-
+-extern unsigned long stacksizelim;
+-
+-#define STACK_ROOM	(stacksizelim)
+-#define STACK_TOP	(TASK_SIZE - 2 * PAGE_SIZE)
+-#define STACK_TOP_MAX	STACK_TOP
+-
+-/* This decides where the kernel will search for a free chunk of vm
+- * space during mmap's.
+- */
+-#define TASK_UNMAPPED_BASE	(0x40000000)
+-
+-extern void start_thread(struct pt_regs *regs, unsigned long entry, 
+-			 unsigned long stack);
+-
+-struct cpuinfo_um {
+-	unsigned long loops_per_jiffy;
+-	int ipi_pipe[2];
+-};
+-
+-extern struct cpuinfo_um boot_cpu_data;
+-
+-#define my_cpu_data		cpu_data[smp_processor_id()]
+-
+-#ifdef CONFIG_SMP
+-extern struct cpuinfo_um cpu_data[];
+-#define current_cpu_data cpu_data[smp_processor_id()]
+-#else
+-#define cpu_data (&boot_cpu_data)
+-#define current_cpu_data boot_cpu_data
+-#endif
+-
+-
+-#define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf)
+-extern unsigned long get_wchan(struct task_struct *p);
+-
+-#endif
+--- a/arch/um/include/asm/ptrace-generic.h
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/* 
+- * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_PTRACE_GENERIC_H
+-#define __UM_PTRACE_GENERIC_H
+-
+-#ifndef __ASSEMBLY__
+-
+-#include <asm/ptrace-abi.h>
+-#include <sysdep/ptrace.h>
+-
+-struct pt_regs {
+-	struct uml_pt_regs regs;
+-};
+-
+-#define arch_has_single_step()	(1)
+-
+-#define EMPTY_REGS { .regs = EMPTY_UML_PT_REGS }
+-
+-#define PT_REGS_IP(r) UPT_IP(&(r)->regs)
+-#define PT_REGS_SP(r) UPT_SP(&(r)->regs)
+-
+-#define PT_REGS_RESTART_SYSCALL(r) UPT_RESTART_SYSCALL(&(r)->regs)
+-
+-#define PT_REGS_SYSCALL_NR(r) UPT_SYSCALL_NR(&(r)->regs)
+-
+-#define instruction_pointer(regs) PT_REGS_IP(regs)
+-
+-struct task_struct;
+-
+-extern long subarch_ptrace(struct task_struct *child, long request,
+-	unsigned long addr, unsigned long data);
+-extern unsigned long getreg(struct task_struct *child, int regno);
+-extern int putreg(struct task_struct *child, int regno, unsigned long value);
+-
+-extern int arch_copy_tls(struct task_struct *new);
+-extern void clear_flushed_tls(struct task_struct *task);
+-extern void syscall_trace_enter(struct pt_regs *regs);
+-extern void syscall_trace_leave(struct pt_regs *regs);
+-
+-#endif
+-
+-#endif
+--- a/arch/um/include/asm/setup.h
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#ifndef SETUP_H_INCLUDED
+-#define SETUP_H_INCLUDED
+-
+-/* POSIX mandated with _POSIX_ARG_MAX that we can rely on 4096 chars in the
+- * command line, so this choice is ok.
+- */
+-
+-#define COMMAND_LINE_SIZE 4096
+-
+-#endif		/* SETUP_H_INCLUDED */
+--- a/arch/um/include/asm/smp.h
++++ /dev/null
+@@ -1,32 +0,0 @@
+-#ifndef __UM_SMP_H
+-#define __UM_SMP_H
+-
+-#ifdef CONFIG_SMP
+-
+-#include <linux/bitops.h>
+-#include <asm/current.h>
+-#include <linux/cpumask.h>
+-
+-#define raw_smp_processor_id() (current_thread->cpu)
+-
+-#define cpu_logical_map(n) (n)
+-#define cpu_number_map(n) (n)
+-extern int hard_smp_processor_id(void);
+-#define NO_PROC_ID -1
+-
+-extern int ncpus;
+-
+-
+-static inline void smp_cpus_done(unsigned int maxcpus)
+-{
+-}
+-
+-extern struct task_struct *idle_threads[NR_CPUS];
+-
+-#else
+-
+-#define hard_smp_processor_id()		0
+-
+-#endif
+-
+-#endif
+--- a/arch/um/include/asm/sysrq.h
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#ifndef __UM_SYSRQ_H
+-#define __UM_SYSRQ_H
+-
+-struct task_struct;
+-extern void show_trace(struct task_struct* task, unsigned long *stack);
+-
+-#endif
+--- a/arch/um/include/asm/thread_info.h
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/*
+- * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_THREAD_INFO_H
+-#define __UM_THREAD_INFO_H
+-
+-#ifndef __ASSEMBLY__
+-
+-#include <asm/types.h>
+-#include <asm/page.h>
+-#include <asm/uaccess.h>
+-
+-struct thread_info {
+-	struct task_struct	*task;		/* main task structure */
+-	struct exec_domain	*exec_domain;	/* execution domain */
+-	unsigned long		flags;		/* low level flags */
+-	__u32			cpu;		/* current CPU */
+-	int			preempt_count;  /* 0 => preemptable,
+-						   <0 => BUG */
+-	mm_segment_t		addr_limit;	/* thread address space:
+-					 	   0-0xBFFFFFFF for user
+-						   0-0xFFFFFFFF for kernel */
+-	struct restart_block    restart_block;
+-	struct thread_info	*real_thread;    /* Points to non-IRQ stack */
+-};
+-
+-#define INIT_THREAD_INFO(tsk)			\
+-{						\
+-	.task =		&tsk,			\
+-	.exec_domain =	&default_exec_domain,	\
+-	.flags =		0,		\
+-	.cpu =		0,			\
+-	.preempt_count = INIT_PREEMPT_COUNT,	\
+-	.addr_limit =	KERNEL_DS,		\
+-	.restart_block =  {			\
+-		.fn =  do_no_restart_syscall,	\
+-	},					\
+-	.real_thread = NULL,			\
+-}
+-
+-#define init_thread_info	(init_thread_union.thread_info)
+-#define init_stack		(init_thread_union.stack)
+-
+-#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
+-/* how to get the thread information struct from C */
+-static inline struct thread_info *current_thread_info(void)
+-{
+-	struct thread_info *ti;
+-	unsigned long mask = THREAD_SIZE - 1;
+-	void *p;
+-
+-	asm volatile ("" : "=r" (p) : "0" (&ti));
+-	ti = (struct thread_info *) (((unsigned long)p) & ~mask);
+-	return ti;
+-}
+-
+-#define THREAD_SIZE_ORDER CONFIG_KERNEL_STACK_ORDER
+-
+-#endif
+-
+-#define TIF_SYSCALL_TRACE	0	/* syscall trace active */
+-#define TIF_SIGPENDING		1	/* signal pending */
+-#define TIF_NEED_RESCHED	2	/* rescheduling necessary */
+-#define TIF_RESTART_BLOCK	4
+-#define TIF_MEMDIE		5	/* is terminating due to OOM killer */
+-#define TIF_SYSCALL_AUDIT	6
+-#define TIF_RESTORE_SIGMASK	7
+-#define TIF_NOTIFY_RESUME	8
+-
+-#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
+-#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
+-#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
+-#define _TIF_MEMDIE		(1 << TIF_MEMDIE)
+-#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
+-
+-#endif
+--- a/arch/um/include/asm/timex.h
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#ifndef __UM_TIMEX_H
+-#define __UM_TIMEX_H
+-
+-typedef unsigned long cycles_t;
+-
+-static inline cycles_t get_cycles (void)
+-{
+-	return 0;
+-}
+-
+-#define CLOCK_TICK_RATE (HZ)
+-
+-#endif
+--- a/arch/um/include/asm/tlb.h
++++ /dev/null
+@@ -1,122 +0,0 @@
+-#ifndef __UM_TLB_H
+-#define __UM_TLB_H
+-
+-#include <linux/pagemap.h>
+-#include <linux/swap.h>
+-#include <asm/percpu.h>
+-#include <asm/pgalloc.h>
+-#include <asm/tlbflush.h>
+-
+-#define tlb_start_vma(tlb, vma) do { } while (0)
+-#define tlb_end_vma(tlb, vma) do { } while (0)
+-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
+-
+-/* struct mmu_gather is an opaque type used by the mm code for passing around
+- * any data needed by arch specific code for tlb_remove_page.
+- */
+-struct mmu_gather {
+-	struct mm_struct	*mm;
+-	unsigned int		need_flush; /* Really unmapped some ptes? */
+-	unsigned long		start;
+-	unsigned long		end;
+-	unsigned int		fullmm; /* non-zero means full mm flush */
+-};
+-
+-static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,
+-					  unsigned long address)
+-{
+-	if (tlb->start > address)
+-		tlb->start = address;
+-	if (tlb->end < address + PAGE_SIZE)
+-		tlb->end = address + PAGE_SIZE;
+-}
+-
+-static inline void init_tlb_gather(struct mmu_gather *tlb)
+-{
+-	tlb->need_flush = 0;
+-
+-	tlb->start = TASK_SIZE;
+-	tlb->end = 0;
+-
+-	if (tlb->fullmm) {
+-		tlb->start = 0;
+-		tlb->end = TASK_SIZE;
+-	}
+-}
+-
+-static inline void
+-tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)
+-{
+-	tlb->mm = mm;
+-	tlb->start = start;
+-	tlb->end = end;
+-	tlb->fullmm = !(start | (end+1));
+-
+-	init_tlb_gather(tlb);
+-}
+-
+-extern void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
+-			       unsigned long end);
+-
+-static inline void
+-tlb_flush_mmu(struct mmu_gather *tlb)
+-{
+-	if (!tlb->need_flush)
+-		return;
+-
+-	flush_tlb_mm_range(tlb->mm, tlb->start, tlb->end);
+-	init_tlb_gather(tlb);
+-}
+-
+-/* tlb_finish_mmu
+- *	Called at the end of the shootdown operation to free up any resources
+- *	that were required.
+- */
+-static inline void
+-tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
+-{
+-	tlb_flush_mmu(tlb);
+-
+-	/* keep the page table cache within bounds */
+-	check_pgt_cache();
+-}
+-
+-/* tlb_remove_page
+- *	Must perform the equivalent to __free_pte(pte_get_and_clear(ptep)),
+- *	while handling the additional races in SMP caused by other CPUs
+- *	caching valid mappings in their TLBs.
+- */
+-static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+-{
+-	tlb->need_flush = 1;
+-	free_page_and_swap_cache(page);
+-	return 1; /* avoid calling tlb_flush_mmu */
+-}
+-
+-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+-{
+-	__tlb_remove_page(tlb, page);
+-}
+-
+-/**
+- * tlb_remove_tlb_entry - remember a pte unmapping for later tlb invalidation.
+- *
+- * Record the fact that pte's were really umapped in ->need_flush, so we can
+- * later optimise away the tlb invalidate.   This helps when userspace is
+- * unmapping already-unmapped pages, which happens quite a lot.
+- */
+-#define tlb_remove_tlb_entry(tlb, ptep, address)		\
+-	do {							\
+-		tlb->need_flush = 1;				\
+-		__tlb_remove_tlb_entry(tlb, ptep, address);	\
+-	} while (0)
+-
+-#define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr)
+-
+-#define pud_free_tlb(tlb, pudp, addr) __pud_free_tlb(tlb, pudp, addr)
+-
+-#define pmd_free_tlb(tlb, pmdp, addr) __pmd_free_tlb(tlb, pmdp, addr)
+-
+-#define tlb_migrate_finish(mm) do {} while (0)
+-
+-#endif
+--- a/arch/um/include/asm/tlbflush.h
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/*
+- * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_TLBFLUSH_H
+-#define __UM_TLBFLUSH_H
+-
+-#include <linux/mm.h>
+-
+-/*
+- * TLB flushing:
+- *
+- *  - flush_tlb() flushes the current mm struct TLBs
+- *  - flush_tlb_all() flushes all processes TLBs
+- *  - flush_tlb_mm(mm) flushes the specified mm context TLB's
+- *  - flush_tlb_page(vma, vmaddr) flushes one page
+- *  - flush_tlb_kernel_vm() flushes the kernel vm area
+- *  - flush_tlb_range(vma, start, end) flushes a range of pages
+- */
+-
+-extern void flush_tlb_all(void);
+-extern void flush_tlb_mm(struct mm_struct *mm);
+-extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, 
+-			    unsigned long end);
+-extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long address);
+-extern void flush_tlb_kernel_vm(void);
+-extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
+-extern void __flush_tlb_one(unsigned long addr);
+-
+-#endif
+--- a/arch/um/include/asm/uaccess.h
++++ /dev/null
+@@ -1,178 +0,0 @@
+-/* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+- * Licensed under the GPL
+- */
+-
+-#ifndef __UM_UACCESS_H
+-#define __UM_UACCESS_H
+-
+-/* thread_info has a mm_segment_t in it, so put the definition up here */
+-typedef struct {
+-	unsigned long seg;
+-} mm_segment_t;
+-
+-#include <linux/thread_info.h>
+-#include <linux/errno.h>
+-#include <asm/processor.h>
+-#include <asm/elf.h>
+-
+-#define VERIFY_READ 0
+-#define VERIFY_WRITE 1
+-
+-/*
+- * The fs value determines whether argument validity checking should be
+- * performed or not.  If get_fs() == USER_DS, checking is performed, with
+- * get_fs() == KERNEL_DS, checking is bypassed.
+- *
+- * For historical reasons, these macros are grossly misnamed.
+- */
+-
+-#define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })
+-
+-#define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFF)
+-#define USER_DS		MAKE_MM_SEG(TASK_SIZE)
+-
+-#define get_ds()	(KERNEL_DS)
+-#define get_fs()	(current_thread_info()->addr_limit)
+-#define set_fs(x)	(current_thread_info()->addr_limit = (x))
+-
+-#define segment_eq(a, b) ((a).seg == (b).seg)
+-
+-#define __under_task_size(addr, size) \
+-	(((unsigned long) (addr) < TASK_SIZE) && \
+-	 (((unsigned long) (addr) + (size)) < TASK_SIZE))
+-
+-#define __access_ok_vsyscall(type, addr, size) \
+-	 ((type == VERIFY_READ) && \
+-	  ((unsigned long) (addr) >= FIXADDR_USER_START) && \
+-	  ((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \
+-	  ((unsigned long) (addr) + (size) >= (unsigned long)(addr)))
+-
+-#define __addr_range_nowrap(addr, size) \
+-	((unsigned long) (addr) <= ((unsigned long) (addr) + (size)))
+-
+-#define access_ok(type, addr, size) \
+-	(__addr_range_nowrap(addr, size) && \
+-	 (__under_task_size(addr, size) || \
+-	  __access_ok_vsyscall(type, addr, size) || \
+-	  segment_eq(get_fs(), KERNEL_DS)))
+-
+-extern int copy_from_user(void *to, const void __user *from, int n);
+-extern int copy_to_user(void __user *to, const void *from, int n);
+-
+-/*
+- * strncpy_from_user: - Copy a NUL terminated string from userspace.
+- * @dst:   Destination address, in kernel space.  This buffer must be at
+- *         least @count bytes long.
+- * @src:   Source address, in user space.
+- * @count: Maximum number of bytes to copy, including the trailing NUL.
+- *
+- * Copies a NUL-terminated string from userspace to kernel space.
+- *
+- * On success, returns the length of the string (not including the trailing
+- * NUL).
+- *
+- * If access to userspace fails, returns -EFAULT (some data may have been
+- * copied).
+- *
+- * If @count is smaller than the length of the string, copies @count bytes
+- * and returns @count.
+- */
+-
+-extern int strncpy_from_user(char *dst, const char __user *src, int count);
+-
+-/*
+- * __clear_user: - Zero a block of memory in user space, with less checking.
+- * @to:   Destination address, in user space.
+- * @n:    Number of bytes to zero.
+- *
+- * Zero a block of memory in user space.  Caller must check
+- * the specified block with access_ok() before calling this function.
+- *
+- * Returns number of bytes that could not be cleared.
+- * On success, this will be zero.
+- */
+-extern int __clear_user(void __user *mem, int len);
+-
+-/*
+- * clear_user: - Zero a block of memory in user space.
+- * @to:   Destination address, in user space.
+- * @n:    Number of bytes to zero.
+- *
+- * Zero a block of memory in user space.
+- *
+- * Returns number of bytes that could not be cleared.
+- * On success, this will be zero.
+- */
+-extern int clear_user(void __user *mem, int len);
+-
+-/*
+- * strlen_user: - Get the size of a string in user space.
+- * @str: The string to measure.
+- * @n:   The maximum valid length
+- *
+- * Get the size of a NUL-terminated string in user space.
+- *
+- * Returns the size of the string INCLUDING the terminating NUL.
+- * On exception, returns 0.
+- * If the string is too long, returns a value greater than @n.
+- */
+-extern int strnlen_user(const void __user *str, int len);
+-
+-#define __copy_from_user(to, from, n) copy_from_user(to, from, n)
+-
+-#define __copy_to_user(to, from, n) copy_to_user(to, from, n)
+-
+-#define __copy_to_user_inatomic __copy_to_user
+-#define __copy_from_user_inatomic __copy_from_user
+-
+-#define __get_user(x, ptr) \
+-({ \
+-	const __typeof__(*(ptr)) __user *__private_ptr = (ptr);	\
+-	__typeof__(x) __private_val;			\
+-	int __private_ret = -EFAULT;			\
+-	(x) = (__typeof__(*(__private_ptr)))0;				\
+-	if (__copy_from_user((__force void *)&__private_val, (__private_ptr),\
+-			     sizeof(*(__private_ptr))) == 0) {		\
+-		(x) = (__typeof__(*(__private_ptr))) __private_val;	\
+-		__private_ret = 0;					\
+-	}								\
+-	__private_ret;							\
+-}) 
+-
+-#define get_user(x, ptr) \
+-({ \
+-        const __typeof__((*(ptr))) __user *private_ptr = (ptr); \
+-        (access_ok(VERIFY_READ, private_ptr, sizeof(*private_ptr)) ? \
+-	 __get_user(x, private_ptr) : ((x) = (__typeof__(*ptr))0, -EFAULT)); \
+-})
+-
+-#define __put_user(x, ptr) \
+-({ \
+-        __typeof__(*(ptr)) __user *__private_ptr = ptr; \
+-        __typeof__(*(__private_ptr)) __private_val; \
+-        int __private_ret = -EFAULT; \
+-        __private_val = (__typeof__(*(__private_ptr))) (x); \
+-        if (__copy_to_user((__private_ptr), &__private_val, \
+-			   sizeof(*(__private_ptr))) == 0) { \
+-		__private_ret = 0; \
+-	} \
+-        __private_ret; \
+-})
+-
+-#define put_user(x, ptr) \
+-({ \
+-        __typeof__(*(ptr)) __user *private_ptr = (ptr); \
+-        (access_ok(VERIFY_WRITE, private_ptr, sizeof(*private_ptr)) ? \
+-	 __put_user(x, private_ptr) : -EFAULT); \
+-})
+-
+-#define strlen_user(str) strnlen_user(str, ~0U >> 1)
+-
+-struct exception_table_entry
+-{
+-        unsigned long insn;
+-	unsigned long fixup;
+-};
+-
+-#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/Kbuild
+@@ -0,0 +1,8 @@
++generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
++generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
++generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
++generic-y += switch_to.h clkdev.h
++generic-y += trace_clock.h
++generic-y += preempt.h
++generic-y += hash.h
++generic-y += barrier.h
+--- /dev/null
++++ b/arch/um/include/uapi/asm/a.out-core.h
+@@ -0,0 +1,27 @@
++/* a.out coredump register dumper
++ *
++ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
++ * Written by David Howells (dhowells@redhat.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public Licence
++ * as published by the Free Software Foundation; either version
++ * 2 of the Licence, or (at your option) any later version.
++ */
++
++#ifndef __UM_A_OUT_CORE_H
++#define __UM_A_OUT_CORE_H
++
++#ifdef __KERNEL__
++
++#include <linux/user.h>
++
++/*
++ * fill in the user structure for an a.out core dump
++ */
++static inline void aout_dump_thread(struct pt_regs *regs, struct user *u)
++{
++}
++
++#endif /* __KERNEL__ */
++#endif /* __UM_A_OUT_CORE_H */
+--- /dev/null
++++ b/arch/um/include/uapi/asm/bugs.h
+@@ -0,0 +1,6 @@
++#ifndef __UM_BUGS_H
++#define __UM_BUGS_H
++
++void check_bugs(void);
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/cache.h
+@@ -0,0 +1,17 @@
++#ifndef __UM_CACHE_H
++#define __UM_CACHE_H
++
++
++#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
++# define L1_CACHE_SHIFT		(CONFIG_X86_L1_CACHE_SHIFT)
++#elif defined(CONFIG_UML_X86) /* 64-bit */
++# define L1_CACHE_SHIFT		6 /* Should be 7 on Intel */
++#else
++/* XXX: this was taken from x86, now it's completely random. Luckily only
++ * affects SMP padding. */
++# define L1_CACHE_SHIFT		5
++#endif
++
++#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/common.lds.S
+@@ -0,0 +1,107 @@
++#include <asm-generic/vmlinux.lds.h>
++
++  .fini      : { *(.fini)    } =0x9090
++  _etext = .;
++  PROVIDE (etext = .);
++
++  . = ALIGN(4096);
++  _sdata = .;
++  PROVIDE (sdata = .);
++
++  RODATA
++
++  .unprotected : { *(.unprotected) }
++  . = ALIGN(4096);
++  PROVIDE (_unprotected_end = .);
++
++  . = ALIGN(4096);
++  .note : { *(.note.*) }
++  EXCEPTION_TABLE(0)
++
++  BUG_TABLE
++
++  .uml.setup.init : {
++	__uml_setup_start = .;
++	*(.uml.setup.init)
++	__uml_setup_end = .;
++  }
++	
++  .uml.help.init : {
++	__uml_help_start = .;
++	*(.uml.help.init)
++	__uml_help_end = .;
++  }
++	
++  .uml.postsetup.init : {
++	__uml_postsetup_start = .;
++	*(.uml.postsetup.init)
++	__uml_postsetup_end = .;
++  }
++	
++  .init.setup : {
++	INIT_SETUP(0)
++  }
++
++  PERCPU_SECTION(32)
++	
++  .initcall.init : {
++	INIT_CALLS
++  }
++
++  .con_initcall.init : {
++	CON_INITCALL
++  }
++
++  .uml.initcall.init : {
++	__uml_initcall_start = .;
++	*(.uml.initcall.init)
++	__uml_initcall_end = .;
++  }
++
++  SECURITY_INIT
++
++  .exitcall : {
++	__exitcall_begin = .;
++	*(.exitcall.exit)
++	__exitcall_end = .;
++  }
++
++  .uml.exitcall : {
++	__uml_exitcall_begin = .;
++	*(.uml.exitcall.exit)
++	__uml_exitcall_end = .;
++  }
++
++  . = ALIGN(4);
++  .altinstructions : {
++	__alt_instructions = .;
++	*(.altinstructions)
++	__alt_instructions_end = .;
++  }
++  .altinstr_replacement : { *(.altinstr_replacement) }
++  /* .exit.text is discard at runtime, not link time, to deal with references
++     from .altinstructions and .eh_frame */
++  .exit.text : { *(.exit.text) }
++  .exit.data : { *(.exit.data) }
++
++  .preinit_array : {
++	__preinit_array_start = .;
++	*(.preinit_array)
++	__preinit_array_end = .;
++  }
++  .init_array : {
++	__init_array_start = .;
++	*(.init_array)
++	__init_array_end = .;
++  }
++  .fini_array : {
++	__fini_array_start = .;
++	*(.fini_array)
++	__fini_array_end = .;
++  }
++
++   . = ALIGN(4096);
++  .init.ramfs : {
++	INIT_RAM_FS
++  }
++
+--- /dev/null
++++ b/arch/um/include/uapi/asm/dma.h
+@@ -0,0 +1,10 @@
++#ifndef __UM_DMA_H
++#define __UM_DMA_H
++
++#include <asm/io.h>
++
++extern unsigned long uml_physmem;
++
++#define MAX_DMA_ADDRESS (uml_physmem)
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/fixmap.h
+@@ -0,0 +1,60 @@
++#ifndef __UM_FIXMAP_H
++#define __UM_FIXMAP_H
++
++#include <asm/processor.h>
++#include <asm/kmap_types.h>
++#include <asm/archparam.h>
++#include <asm/page.h>
++#include <linux/threads.h>
++
++/*
++ * Here we define all the compile-time 'special' virtual
++ * addresses. The point is to have a constant address at
++ * compile time, but to set the physical address only
++ * in the boot process. We allocate these special  addresses
++ * from the end of virtual memory (0xfffff000) backwards.
++ * Also this lets us do fail-safe vmalloc(), we
++ * can guarantee that these special addresses and
++ * vmalloc()-ed addresses never overlap.
++ *
++ * these 'compile-time allocated' memory buffers are
++ * fixed-size 4k pages. (or larger if used with an increment
++ * highger than 1) use fixmap_set(idx,phys) to associate
++ * physical memory with fixmap indices.
++ *
++ * TLB entries of such buffers will not be flushed across
++ * task switches.
++ */
++
++/*
++ * on UP currently we will have no trace of the fixmap mechanizm,
++ * no page table allocations, etc. This might change in the
++ * future, say framebuffers for the console driver(s) could be
++ * fix-mapped?
++ */
++enum fixed_addresses {
++#ifdef CONFIG_HIGHMEM
++	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
++	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
++#endif
++	__end_of_fixed_addresses
++};
++
++extern void __set_fixmap (enum fixed_addresses idx,
++			  unsigned long phys, pgprot_t flags);
++
++/*
++ * used by vmalloc.c.
++ *
++ * Leave one empty page between vmalloc'ed areas and
++ * the start of the fixmap, and leave one page empty
++ * at the top of mem..
++ */
++
++#define FIXADDR_TOP	(TASK_SIZE - 2 * PAGE_SIZE)
++#define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)
++#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)
++
++#include <asm-generic/fixmap.h>
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/irq.h
+@@ -0,0 +1,23 @@
++#ifndef __UM_IRQ_H
++#define __UM_IRQ_H
++
++#define TIMER_IRQ		0
++#define UMN_IRQ			1
++#define CONSOLE_IRQ		2
++#define CONSOLE_WRITE_IRQ	3
++#define UBD_IRQ			4
++#define UM_ETH_IRQ		5
++#define SSL_IRQ			6
++#define SSL_WRITE_IRQ		7
++#define ACCEPT_IRQ		8
++#define MCONSOLE_IRQ		9
++#define WINCH_IRQ		10
++#define SIGIO_WRITE_IRQ 	11
++#define TELNETD_IRQ 		12
++#define XTERM_IRQ 		13
++#define RANDOM_IRQ 		14
++
++#define LAST_IRQ RANDOM_IRQ
++#define NR_IRQS (LAST_IRQ + 1)
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/irqflags.h
+@@ -0,0 +1,42 @@
++#ifndef __UM_IRQFLAGS_H
++#define __UM_IRQFLAGS_H
++
++extern int get_signals(void);
++extern int set_signals(int enable);
++extern void block_signals(void);
++extern void unblock_signals(void);
++
++static inline unsigned long arch_local_save_flags(void)
++{
++	return get_signals();
++}
++
++static inline void arch_local_irq_restore(unsigned long flags)
++{
++	set_signals(flags);
++}
++
++static inline void arch_local_irq_enable(void)
++{
++	unblock_signals();
++}
++
++static inline void arch_local_irq_disable(void)
++{
++	block_signals();
++}
++
++static inline unsigned long arch_local_irq_save(void)
++{
++	unsigned long flags;
++	flags = arch_local_save_flags();
++	arch_local_irq_disable();
++	return flags;
++}
++
++static inline bool arch_irqs_disabled(void)
++{
++	return arch_local_save_flags() == 0;
++}
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/kmap_types.h
+@@ -0,0 +1,13 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_KMAP_TYPES_H
++#define __UM_KMAP_TYPES_H
++
++/* No more #include "asm/arch/kmap_types.h" ! */
++
++#define KM_TYPE_NR 14
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/kvm_para.h
+@@ -0,0 +1 @@
++#include <asm-generic/kvm_para.h>
+--- /dev/null
++++ b/arch/um/include/uapi/asm/mmu.h
+@@ -0,0 +1,24 @@
++/* 
++ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __ARCH_UM_MMU_H
++#define __ARCH_UM_MMU_H
++
++#include <mm_id.h>
++#include <asm/mm_context.h>
++
++typedef struct mm_context {
++	struct mm_id id;
++	struct uml_arch_mm_context arch;
++	struct page *stub_pages[2];
++} mm_context_t;
++
++extern void __switch_mm(struct mm_id * mm_idp);
++
++/* Avoid tangled inclusion with asm/ldt.h */
++extern long init_new_ldt(struct mm_context *to_mm, struct mm_context *from_mm);
++extern void free_ldt(struct mm_context *mm);
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/mmu_context.h
+@@ -0,0 +1,58 @@
++/* 
++ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_MMU_CONTEXT_H
++#define __UM_MMU_CONTEXT_H
++
++#include <linux/sched.h>
++#include <asm/mmu.h>
++
++extern void uml_setup_stubs(struct mm_struct *mm);
++extern void arch_exit_mmap(struct mm_struct *mm);
++
++#define deactivate_mm(tsk,mm)	do { } while (0)
++
++extern void force_flush_all(void);
++
++static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)
++{
++	/*
++	 * This is called by fs/exec.c and sys_unshare()
++	 * when the new ->mm is used for the first time.
++	 */
++	__switch_mm(&new->context.id);
++	down_write(&new->mmap_sem);
++	uml_setup_stubs(new);
++	up_write(&new->mmap_sem);
++}
++
++static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
++			     struct task_struct *tsk)
++{
++	unsigned cpu = smp_processor_id();
++
++	if(prev != next){
++		cpumask_clear_cpu(cpu, mm_cpumask(prev));
++		cpumask_set_cpu(cpu, mm_cpumask(next));
++		if(next != &init_mm)
++			__switch_mm(&next->context.id);
++	}
++}
++
++static inline void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
++{
++	uml_setup_stubs(mm);
++}
++
++static inline void enter_lazy_tlb(struct mm_struct *mm, 
++				  struct task_struct *tsk)
++{
++}
++
++extern int init_new_context(struct task_struct *task, struct mm_struct *mm);
++
++extern void destroy_context(struct mm_struct *mm);
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/page.h
+@@ -0,0 +1,122 @@
++/*
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Copyright 2003 PathScale, Inc.
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_PAGE_H
++#define __UM_PAGE_H
++
++#include <linux/const.h>
++
++/* PAGE_SHIFT determines the page size */
++#define PAGE_SHIFT	12
++#define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
++#define PAGE_MASK	(~(PAGE_SIZE-1))
++
++#ifndef __ASSEMBLY__
++
++struct page;
++
++#include <linux/types.h>
++#include <asm/vm-flags.h>
++
++/*
++ * These are used to make use of C type-checking..
++ */
++
++#define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)
++#define copy_page(to,from)	memcpy((void *)(to), (void *)(from), PAGE_SIZE)
++
++#define clear_user_page(page, vaddr, pg)	clear_page(page)
++#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)
++
++#if defined(CONFIG_3_LEVEL_PGTABLES) && !defined(CONFIG_64BIT)
++
++typedef struct { unsigned long pte_low, pte_high; } pte_t;
++typedef struct { unsigned long pmd; } pmd_t;
++typedef struct { unsigned long pgd; } pgd_t;
++#define pte_val(x) ((x).pte_low | ((unsigned long long) (x).pte_high << 32))
++
++#define pte_get_bits(pte, bits) ((pte).pte_low & (bits))
++#define pte_set_bits(pte, bits) ((pte).pte_low |= (bits))
++#define pte_clear_bits(pte, bits) ((pte).pte_low &= ~(bits))
++#define pte_copy(to, from) ({ (to).pte_high = (from).pte_high; \
++			      smp_wmb(); \
++			      (to).pte_low = (from).pte_low; })
++#define pte_is_zero(pte) (!((pte).pte_low & ~_PAGE_NEWPAGE) && !(pte).pte_high)
++#define pte_set_val(pte, phys, prot) \
++	({ (pte).pte_high = (phys) >> 32; \
++	   (pte).pte_low = (phys) | pgprot_val(prot); })
++
++#define pmd_val(x)	((x).pmd)
++#define __pmd(x) ((pmd_t) { (x) } )
++
++typedef unsigned long long pfn_t;
++typedef unsigned long long phys_t;
++
++#else
++
++typedef struct { unsigned long pte; } pte_t;
++typedef struct { unsigned long pgd; } pgd_t;
++
++#ifdef CONFIG_3_LEVEL_PGTABLES
++typedef struct { unsigned long pmd; } pmd_t;
++#define pmd_val(x)	((x).pmd)
++#define __pmd(x) ((pmd_t) { (x) } )
++#endif
++
++#define pte_val(x)	((x).pte)
++
++
++#define pte_get_bits(p, bits) ((p).pte & (bits))
++#define pte_set_bits(p, bits) ((p).pte |= (bits))
++#define pte_clear_bits(p, bits) ((p).pte &= ~(bits))
++#define pte_copy(to, from) ((to).pte = (from).pte)
++#define pte_is_zero(p) (!((p).pte & ~_PAGE_NEWPAGE))
++#define pte_set_val(p, phys, prot) (p).pte = (phys | pgprot_val(prot))
++
++typedef unsigned long pfn_t;
++typedef unsigned long phys_t;
++
++#endif
++
++typedef struct { unsigned long pgprot; } pgprot_t;
++
++typedef struct page *pgtable_t;
++
++#define pgd_val(x)	((x).pgd)
++#define pgprot_val(x)	((x).pgprot)
++
++#define __pte(x) ((pte_t) { (x) } )
++#define __pgd(x) ((pgd_t) { (x) } )
++#define __pgprot(x)	((pgprot_t) { (x) } )
++
++extern unsigned long uml_physmem;
++
++#define PAGE_OFFSET (uml_physmem)
++#define KERNELBASE PAGE_OFFSET
++
++#define __va_space (8*1024*1024)
++
++#include <mem.h>
++
++/* Cast to unsigned long before casting to void * to avoid a warning from
++ * mmap_kmem about cutting a long long down to a void *.  Not sure that
++ * casting is the right thing, but 32-bit UML can't have 64-bit virtual
++ * addresses
++ */
++#define __pa(virt) to_phys((void *) (unsigned long) (virt))
++#define __va(phys) to_virt((unsigned long) (phys))
++
++#define phys_to_pfn(p) ((pfn_t) ((p) >> PAGE_SHIFT))
++#define pfn_to_phys(pfn) ((phys_t) ((pfn) << PAGE_SHIFT))
++
++#define pfn_valid(pfn) ((pfn) < max_mapnr)
++#define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v)))
++
++#include <asm-generic/memory_model.h>
++#include <asm-generic/getorder.h>
++
++#endif	/* __ASSEMBLY__ */
++#endif	/* __UM_PAGE_H */
+--- /dev/null
++++ b/arch/um/include/uapi/asm/pgalloc.h
+@@ -0,0 +1,61 @@
++/* 
++ * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright 2003 PathScale, Inc.
++ * Derived from include/asm-i386/pgalloc.h and include/asm-i386/pgtable.h
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_PGALLOC_H
++#define __UM_PGALLOC_H
++
++#include <linux/mm.h>
++
++#define pmd_populate_kernel(mm, pmd, pte) \
++	set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) __pa(pte)))
++
++#define pmd_populate(mm, pmd, pte) 				\
++	set_pmd(pmd, __pmd(_PAGE_TABLE +			\
++		((unsigned long long)page_to_pfn(pte) <<	\
++			(unsigned long long) PAGE_SHIFT)))
++#define pmd_pgtable(pmd) pmd_page(pmd)
++
++/*
++ * Allocate and free page tables.
++ */
++extern pgd_t *pgd_alloc(struct mm_struct *);
++extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
++
++extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
++extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long);
++
++static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
++{
++	free_page((unsigned long) pte);
++}
++
++static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
++{
++	pgtable_page_dtor(pte);
++	__free_page(pte);
++}
++
++#define __pte_free_tlb(tlb,pte, address)		\
++do {							\
++	pgtable_page_dtor(pte);				\
++	tlb_remove_page((tlb),(pte));			\
++} while (0)
++
++#ifdef CONFIG_3_LEVEL_PGTABLES
++
++static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
++{
++	free_page((unsigned long)pmd);
++}
++
++#define __pmd_free_tlb(tlb,x, address)   tlb_remove_page((tlb),virt_to_page(x))
++#endif
++
++#define check_pgt_cache()	do { } while (0)
++
++#endif
++
+--- /dev/null
++++ b/arch/um/include/uapi/asm/pgtable-2level.h
+@@ -0,0 +1,53 @@
++/*
++ * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright 2003 PathScale, Inc.
++ * Derived from include/asm-i386/pgtable.h
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_PGTABLE_2LEVEL_H
++#define __UM_PGTABLE_2LEVEL_H
++
++#include <asm-generic/pgtable-nopmd.h>
++
++/* PGDIR_SHIFT determines what a third-level page table entry can map */
++
++#define PGDIR_SHIFT	22
++#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
++#define PGDIR_MASK	(~(PGDIR_SIZE-1))
++
++/*
++ * entries per page directory level: the i386 is two-level, so
++ * we don't really have any PMD directory physically.
++ */
++#define PTRS_PER_PTE	1024
++#define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE)
++#define PTRS_PER_PGD	1024
++#define FIRST_USER_ADDRESS	0
++
++#define pte_ERROR(e) \
++        printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), \
++	       pte_val(e))
++#define pgd_ERROR(e) \
++        printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), \
++	       pgd_val(e))
++
++static inline int pgd_newpage(pgd_t pgd)	{ return 0; }
++static inline void pgd_mkuptodate(pgd_t pgd)	{ }
++
++#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
++
++#define pte_pfn(x) phys_to_pfn(pte_val(x))
++#define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
++#define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
++
++/*
++ * Bits 0 through 4 are taken
++ */
++#define PTE_FILE_MAX_BITS	27
++
++#define pte_to_pgoff(pte) (pte_val(pte) >> 5)
++
++#define pgoff_to_pte(off) ((pte_t) { ((off) << 5) + _PAGE_FILE })
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/pgtable-3level.h
+@@ -0,0 +1,136 @@
++/*
++ * Copyright 2003 PathScale Inc
++ * Derived from include/asm-i386/pgtable.h
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_PGTABLE_3LEVEL_H
++#define __UM_PGTABLE_3LEVEL_H
++
++#include <asm-generic/pgtable-nopud.h>
++
++/* PGDIR_SHIFT determines what a third-level page table entry can map */
++
++#ifdef CONFIG_64BIT
++#define PGDIR_SHIFT	30
++#else
++#define PGDIR_SHIFT	31
++#endif
++#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
++#define PGDIR_MASK	(~(PGDIR_SIZE-1))
++
++/* PMD_SHIFT determines the size of the area a second-level page table can
++ * map
++ */
++
++#define PMD_SHIFT	21
++#define PMD_SIZE	(1UL << PMD_SHIFT)
++#define PMD_MASK	(~(PMD_SIZE-1))
++
++/*
++ * entries per page directory level
++ */
++
++#define PTRS_PER_PTE 512
++#ifdef CONFIG_64BIT
++#define PTRS_PER_PMD 512
++#define PTRS_PER_PGD 512
++#else
++#define PTRS_PER_PMD 1024
++#define PTRS_PER_PGD 1024
++#endif
++
++#define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE)
++#define FIRST_USER_ADDRESS	0
++
++#define pte_ERROR(e) \
++        printk("%s:%d: bad pte %p(%016lx).\n", __FILE__, __LINE__, &(e), \
++	       pte_val(e))
++#define pmd_ERROR(e) \
++        printk("%s:%d: bad pmd %p(%016lx).\n", __FILE__, __LINE__, &(e), \
++	       pmd_val(e))
++#define pgd_ERROR(e) \
++        printk("%s:%d: bad pgd %p(%016lx).\n", __FILE__, __LINE__, &(e), \
++	       pgd_val(e))
++
++#define pud_none(x)	(!(pud_val(x) & ~_PAGE_NEWPAGE))
++#define	pud_bad(x)	((pud_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
++#define pud_present(x)	(pud_val(x) & _PAGE_PRESENT)
++#define pud_populate(mm, pud, pmd) \
++	set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
++
++#ifdef CONFIG_64BIT
++#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
++#else
++#define set_pud(pudptr, pudval) (*(pudptr) = (pudval))
++#endif
++
++static inline int pgd_newpage(pgd_t pgd)
++{
++	return(pgd_val(pgd) & _PAGE_NEWPAGE);
++}
++
++static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }
++
++#ifdef CONFIG_64BIT
++#define set_pmd(pmdptr, pmdval) set_64bit((u64 *) (pmdptr), pmd_val(pmdval))
++#else
++#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
++#endif
++
++struct mm_struct;
++extern pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address);
++
++static inline void pud_clear (pud_t *pud)
++{
++	set_pud(pud, __pud(_PAGE_NEWPAGE));
++}
++
++#define pud_page(pud) phys_to_page(pud_val(pud) & PAGE_MASK)
++#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
++
++/* Find an entry in the second-level page table.. */
++#define pmd_offset(pud, address) ((pmd_t *) pud_page_vaddr(*(pud)) + \
++			pmd_index(address))
++
++static inline unsigned long pte_pfn(pte_t pte)
++{
++	return phys_to_pfn(pte_val(pte));
++}
++
++static inline pte_t pfn_pte(pfn_t page_nr, pgprot_t pgprot)
++{
++	pte_t pte;
++	phys_t phys = pfn_to_phys(page_nr);
++
++	pte_set_val(pte, phys, pgprot);
++	return pte;
++}
++
++static inline pmd_t pfn_pmd(pfn_t page_nr, pgprot_t pgprot)
++{
++	return __pmd((page_nr << PAGE_SHIFT) | pgprot_val(pgprot));
++}
++
++/*
++ * Bits 0 through 3 are taken in the low part of the pte,
++ * put the 32 bits of offset into the high part.
++ */
++#define PTE_FILE_MAX_BITS	32
++
++#ifdef CONFIG_64BIT
++
++#define pte_to_pgoff(p) ((p).pte >> 32)
++
++#define pgoff_to_pte(off) ((pte_t) { ((off) << 32) | _PAGE_FILE })
++
++#else
++
++#define pte_to_pgoff(pte) ((pte).pte_high)
++
++#define pgoff_to_pte(off) ((pte_t) { _PAGE_FILE, (off) })
++
++#endif
++
++#endif
++
+--- /dev/null
++++ b/arch/um/include/uapi/asm/pgtable.h
+@@ -0,0 +1,375 @@
++/* 
++ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
++ * Copyright 2003 PathScale, Inc.
++ * Derived from include/asm-i386/pgtable.h
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_PGTABLE_H
++#define __UM_PGTABLE_H
++
++#include <asm/fixmap.h>
++
++#define _PAGE_PRESENT	0x001
++#define _PAGE_NEWPAGE	0x002
++#define _PAGE_NEWPROT	0x004
++#define _PAGE_RW	0x020
++#define _PAGE_USER	0x040
++#define _PAGE_ACCESSED	0x080
++#define _PAGE_DIRTY	0x100
++/* If _PAGE_PRESENT is clear, we use these: */
++#define _PAGE_FILE	0x008	/* nonlinear file mapping, saved PTE; unset:swap */
++#define _PAGE_PROTNONE	0x010	/* if the user mapped it with PROT_NONE;
++				   pte_present gives true */
++
++#ifdef CONFIG_3_LEVEL_PGTABLES
++#include <asm/pgtable-3level.h>
++#else
++#include <asm/pgtable-2level.h>
++#endif
++
++extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++
++/* zero page used for uninitialized stuff */
++extern unsigned long *empty_zero_page;
++
++#define pgtable_cache_init() do ; while (0)
++
++/* Just any arbitrary offset to the start of the vmalloc VM area: the
++ * current 8MB value just means that there will be a 8MB "hole" after the
++ * physical memory until the kernel virtual memory starts.  That means that
++ * any out-of-bounds memory accesses will hopefully be caught.
++ * The vmalloc() routines leaves a hole of 4kB between each vmalloced
++ * area for the same reason. ;)
++ */
++
++extern unsigned long end_iomem;
++
++#define VMALLOC_OFFSET	(__va_space)
++#define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
++#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)
++#ifdef CONFIG_HIGHMEM
++# define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
++#else
++# define VMALLOC_END	(FIXADDR_START-2*PAGE_SIZE)
++#endif
++#define MODULES_VADDR	VMALLOC_START
++#define MODULES_END	VMALLOC_END
++#define MODULES_LEN	(MODULES_VADDR - MODULES_END)
++
++#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
++#define _KERNPG_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
++#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
++#define __PAGE_KERNEL_EXEC                                              \
++	 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)
++#define PAGE_NONE	__pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)
++#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)
++#define PAGE_COPY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)
++#define PAGE_READONLY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)
++#define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)
++#define PAGE_KERNEL_EXEC	__pgprot(__PAGE_KERNEL_EXEC)
++
++/*
++ * The i386 can't do page protection for execute, and considers that the same
++ * are read.
++ * Also, write permissions imply read permissions. This is the closest we can
++ * get..
++ */
++#define __P000	PAGE_NONE
++#define __P001	PAGE_READONLY
++#define __P010	PAGE_COPY
++#define __P011	PAGE_COPY
++#define __P100	PAGE_READONLY
++#define __P101	PAGE_READONLY
++#define __P110	PAGE_COPY
++#define __P111	PAGE_COPY
++
++#define __S000	PAGE_NONE
++#define __S001	PAGE_READONLY
++#define __S010	PAGE_SHARED
++#define __S011	PAGE_SHARED
++#define __S100	PAGE_READONLY
++#define __S101	PAGE_READONLY
++#define __S110	PAGE_SHARED
++#define __S111	PAGE_SHARED
++
++/*
++ * ZERO_PAGE is a global shared page that is always zero: used
++ * for zero-mapped memory areas etc..
++ */
++#define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page)
++
++#define pte_clear(mm,addr,xp) pte_set_val(*(xp), (phys_t) 0, __pgprot(_PAGE_NEWPAGE))
++
++#define pmd_none(x)	(!((unsigned long)pmd_val(x) & ~_PAGE_NEWPAGE))
++#define	pmd_bad(x)	((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
++
++#define pmd_present(x)	(pmd_val(x) & _PAGE_PRESENT)
++#define pmd_clear(xp)	do { pmd_val(*(xp)) = _PAGE_NEWPAGE; } while (0)
++
++#define pmd_newpage(x)  (pmd_val(x) & _PAGE_NEWPAGE)
++#define pmd_mkuptodate(x) (pmd_val(x) &= ~_PAGE_NEWPAGE)
++
++#define pud_newpage(x)  (pud_val(x) & _PAGE_NEWPAGE)
++#define pud_mkuptodate(x) (pud_val(x) &= ~_PAGE_NEWPAGE)
++
++#define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)
++
++#define pte_page(x) pfn_to_page(pte_pfn(x))
++
++#define pte_present(x)	pte_get_bits(x, (_PAGE_PRESENT | _PAGE_PROTNONE))
++
++/*
++ * =================================
++ * Flags checking section.
++ * =================================
++ */
++
++static inline int pte_none(pte_t pte)
++{
++	return pte_is_zero(pte);
++}
++
++/*
++ * The following only work if pte_present() is true.
++ * Undefined behaviour if not..
++ */
++static inline int pte_read(pte_t pte)
++{ 
++	return((pte_get_bits(pte, _PAGE_USER)) &&
++	       !(pte_get_bits(pte, _PAGE_PROTNONE)));
++}
++
++static inline int pte_exec(pte_t pte){
++	return((pte_get_bits(pte, _PAGE_USER)) &&
++	       !(pte_get_bits(pte, _PAGE_PROTNONE)));
++}
++
++static inline int pte_write(pte_t pte)
++{
++	return((pte_get_bits(pte, _PAGE_RW)) &&
++	       !(pte_get_bits(pte, _PAGE_PROTNONE)));
++}
++
++/*
++ * The following only works if pte_present() is not true.
++ */
++static inline int pte_file(pte_t pte)
++{
++	return pte_get_bits(pte, _PAGE_FILE);
++}
++
++static inline int pte_dirty(pte_t pte)
++{
++	return pte_get_bits(pte, _PAGE_DIRTY);
++}
++
++static inline int pte_young(pte_t pte)
++{
++	return pte_get_bits(pte, _PAGE_ACCESSED);
++}
++
++static inline int pte_newpage(pte_t pte)
++{
++	return pte_get_bits(pte, _PAGE_NEWPAGE);
++}
++
++static inline int pte_newprot(pte_t pte)
++{ 
++	return(pte_present(pte) && (pte_get_bits(pte, _PAGE_NEWPROT)));
++}
++
++static inline int pte_special(pte_t pte)
++{
++	return 0;
++}
++
++/*
++ * =================================
++ * Flags setting section.
++ * =================================
++ */
++
++static inline pte_t pte_mknewprot(pte_t pte)
++{
++	pte_set_bits(pte, _PAGE_NEWPROT);
++	return(pte);
++}
++
++static inline pte_t pte_mkclean(pte_t pte)
++{
++	pte_clear_bits(pte, _PAGE_DIRTY);
++	return(pte);
++}
++
++static inline pte_t pte_mkold(pte_t pte)	
++{ 
++	pte_clear_bits(pte, _PAGE_ACCESSED);
++	return(pte);
++}
++
++static inline pte_t pte_wrprotect(pte_t pte)
++{ 
++	pte_clear_bits(pte, _PAGE_RW);
++	return(pte_mknewprot(pte)); 
++}
++
++static inline pte_t pte_mkread(pte_t pte)
++{ 
++	pte_set_bits(pte, _PAGE_USER);
++	return(pte_mknewprot(pte)); 
++}
++
++static inline pte_t pte_mkdirty(pte_t pte)
++{ 
++	pte_set_bits(pte, _PAGE_DIRTY);
++	return(pte);
++}
++
++static inline pte_t pte_mkyoung(pte_t pte)
++{
++	pte_set_bits(pte, _PAGE_ACCESSED);
++	return(pte);
++}
++
++static inline pte_t pte_mkwrite(pte_t pte)	
++{
++	pte_set_bits(pte, _PAGE_RW);
++	return(pte_mknewprot(pte)); 
++}
++
++static inline pte_t pte_mkuptodate(pte_t pte)	
++{
++	pte_clear_bits(pte, _PAGE_NEWPAGE);
++	if(pte_present(pte))
++		pte_clear_bits(pte, _PAGE_NEWPROT);
++	return(pte); 
++}
++
++static inline pte_t pte_mknewpage(pte_t pte)
++{
++	pte_set_bits(pte, _PAGE_NEWPAGE);
++	return(pte);
++}
++
++static inline pte_t pte_mkspecial(pte_t pte)
++{
++	return(pte);
++}
++
++static inline void set_pte(pte_t *pteptr, pte_t pteval)
++{
++	pte_copy(*pteptr, pteval);
++
++	/* If it's a swap entry, it needs to be marked _PAGE_NEWPAGE so
++	 * fix_range knows to unmap it.  _PAGE_NEWPROT is specific to
++	 * mapped pages.
++	 */
++
++	*pteptr = pte_mknewpage(*pteptr);
++	if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr);
++}
++#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
++
++#define __HAVE_ARCH_PTE_SAME
++static inline int pte_same(pte_t pte_a, pte_t pte_b)
++{
++	return !((pte_val(pte_a) ^ pte_val(pte_b)) & ~_PAGE_NEWPAGE);
++}
++
++/*
++ * Conversion functions: convert a page and protection to a page entry,
++ * and a page entry and page directory to the page they refer to.
++ */
++
++#define phys_to_page(phys) pfn_to_page(phys_to_pfn(phys))
++#define __virt_to_page(virt) phys_to_page(__pa(virt))
++#define page_to_phys(page) pfn_to_phys((pfn_t) page_to_pfn(page))
++#define virt_to_page(addr) __virt_to_page((const unsigned long) addr)
++
++#define mk_pte(page, pgprot) \
++	({ pte_t pte;					\
++							\
++	pte_set_val(pte, page_to_phys(page), (pgprot));	\
++	if (pte_present(pte))				\
++		pte_mknewprot(pte_mknewpage(pte));	\
++	pte;})
++
++static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
++{
++	pte_set_val(pte, (pte_val(pte) & _PAGE_CHG_MASK), newprot);
++	return pte; 
++}
++
++/*
++ * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
++ *
++ * this macro returns the index of the entry in the pgd page which would
++ * control the given virtual address
++ */
++#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
++
++/*
++ * pgd_offset() returns a (pgd_t *)
++ * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
++ */
++#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
++
++/*
++ * a shortcut which implies the use of the kernel's pgd, instead
++ * of a process's
++ */
++#define pgd_offset_k(address) pgd_offset(&init_mm, address)
++
++/*
++ * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
++ *
++ * this macro returns the index of the entry in the pmd page which would
++ * control the given virtual address
++ */
++#define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
++#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
++
++#define pmd_page_vaddr(pmd) \
++	((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
++
++/*
++ * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
++ *
++ * this macro returns the index of the entry in the pte page which would
++ * control the given virtual address
++ */
++#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
++#define pte_offset_kernel(dir, address) \
++	((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))
++#define pte_offset_map(dir, address) \
++	((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
++#define pte_unmap(pte) do { } while (0)
++
++struct mm_struct;
++extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
++
++#define update_mmu_cache(vma,address,ptep) do ; while (0)
++
++/* Encode and de-code a swap entry */
++#define __swp_type(x)			(((x).val >> 5) & 0x1f)
++#define __swp_offset(x)			((x).val >> 11)
++
++#define __swp_entry(type, offset) \
++	((swp_entry_t) { ((type) << 5) | ((offset) << 11) })
++#define __pte_to_swp_entry(pte) \
++	((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })
++#define __swp_entry_to_pte(x)		((pte_t) { (x).val })
++
++#define kern_addr_valid(addr) (1)
++
++#include <asm-generic/pgtable.h>
++
++/* Clear a kernel PTE and flush it from the TLB */
++#define kpte_clear_flush(ptep, vaddr)		\
++do {						\
++	pte_clear(&init_mm, (vaddr), (ptep));	\
++	__flush_tlb_one((vaddr));		\
++} while (0)
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/processor-generic.h
+@@ -0,0 +1,115 @@
++/* 
++ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_PROCESSOR_GENERIC_H
++#define __UM_PROCESSOR_GENERIC_H
++
++struct pt_regs;
++
++struct task_struct;
++
++#include <asm/ptrace.h>
++#include <registers.h>
++#include <sysdep/archsetjmp.h>
++
++#include <linux/prefetch.h>
++
++struct mm_struct;
++
++struct thread_struct {
++	struct pt_regs regs;
++	struct pt_regs *segv_regs;
++	int singlestep_syscall;
++	void *fault_addr;
++	jmp_buf *fault_catcher;
++	struct task_struct *prev_sched;
++	struct arch_thread arch;
++	jmp_buf switch_buf;
++	struct {
++		int op;
++		union {
++			struct {
++				int pid;
++			} fork, exec;
++			struct {
++				int (*proc)(void *);
++				void *arg;
++			} thread;
++			struct {
++				void (*proc)(void *);
++				void *arg;
++			} cb;
++		} u;
++	} request;
++};
++
++#define INIT_THREAD \
++{ \
++	.regs		   	= EMPTY_REGS,	\
++	.fault_addr		= NULL, \
++	.prev_sched		= NULL, \
++	.arch			= INIT_ARCH_THREAD, \
++	.request		= { 0 } \
++}
++
++static inline void release_thread(struct task_struct *task)
++{
++}
++
++extern unsigned long thread_saved_pc(struct task_struct *t);
++
++static inline void mm_copy_segments(struct mm_struct *from_mm,
++				    struct mm_struct *new_mm)
++{
++}
++
++#define init_stack	(init_thread_union.stack)
++
++/*
++ * User space process size: 3GB (default).
++ */
++extern unsigned long task_size;
++
++#define TASK_SIZE (task_size)
++
++#undef STACK_TOP
++#undef STACK_TOP_MAX
++
++extern unsigned long stacksizelim;
++
++#define STACK_ROOM	(stacksizelim)
++#define STACK_TOP	(TASK_SIZE - 2 * PAGE_SIZE)
++#define STACK_TOP_MAX	STACK_TOP
++
++/* This decides where the kernel will search for a free chunk of vm
++ * space during mmap's.
++ */
++#define TASK_UNMAPPED_BASE	(0x40000000)
++
++extern void start_thread(struct pt_regs *regs, unsigned long entry, 
++			 unsigned long stack);
++
++struct cpuinfo_um {
++	unsigned long loops_per_jiffy;
++	int ipi_pipe[2];
++};
++
++extern struct cpuinfo_um boot_cpu_data;
++
++#define my_cpu_data		cpu_data[smp_processor_id()]
++
++#ifdef CONFIG_SMP
++extern struct cpuinfo_um cpu_data[];
++#define current_cpu_data cpu_data[smp_processor_id()]
++#else
++#define cpu_data (&boot_cpu_data)
++#define current_cpu_data boot_cpu_data
++#endif
++
++
++#define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf)
++extern unsigned long get_wchan(struct task_struct *p);
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/ptrace-generic.h
+@@ -0,0 +1,45 @@
++/* 
++ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_PTRACE_GENERIC_H
++#define __UM_PTRACE_GENERIC_H
++
++#ifndef __ASSEMBLY__
++
++#include <asm/ptrace-abi.h>
++#include <sysdep/ptrace.h>
++
++struct pt_regs {
++	struct uml_pt_regs regs;
++};
++
++#define arch_has_single_step()	(1)
++
++#define EMPTY_REGS { .regs = EMPTY_UML_PT_REGS }
++
++#define PT_REGS_IP(r) UPT_IP(&(r)->regs)
++#define PT_REGS_SP(r) UPT_SP(&(r)->regs)
++
++#define PT_REGS_RESTART_SYSCALL(r) UPT_RESTART_SYSCALL(&(r)->regs)
++
++#define PT_REGS_SYSCALL_NR(r) UPT_SYSCALL_NR(&(r)->regs)
++
++#define instruction_pointer(regs) PT_REGS_IP(regs)
++
++struct task_struct;
++
++extern long subarch_ptrace(struct task_struct *child, long request,
++	unsigned long addr, unsigned long data);
++extern unsigned long getreg(struct task_struct *child, int regno);
++extern int putreg(struct task_struct *child, int regno, unsigned long value);
++
++extern int arch_copy_tls(struct task_struct *new);
++extern void clear_flushed_tls(struct task_struct *task);
++extern void syscall_trace_enter(struct pt_regs *regs);
++extern void syscall_trace_leave(struct pt_regs *regs);
++
++#endif
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/setup.h
+@@ -0,0 +1,10 @@
++#ifndef SETUP_H_INCLUDED
++#define SETUP_H_INCLUDED
++
++/* POSIX mandated with _POSIX_ARG_MAX that we can rely on 4096 chars in the
++ * command line, so this choice is ok.
++ */
++
++#define COMMAND_LINE_SIZE 4096
++
++#endif		/* SETUP_H_INCLUDED */
+--- /dev/null
++++ b/arch/um/include/uapi/asm/smp.h
+@@ -0,0 +1,32 @@
++#ifndef __UM_SMP_H
++#define __UM_SMP_H
++
++#ifdef CONFIG_SMP
++
++#include <linux/bitops.h>
++#include <asm/current.h>
++#include <linux/cpumask.h>
++
++#define raw_smp_processor_id() (current_thread->cpu)
++
++#define cpu_logical_map(n) (n)
++#define cpu_number_map(n) (n)
++extern int hard_smp_processor_id(void);
++#define NO_PROC_ID -1
++
++extern int ncpus;
++
++
++static inline void smp_cpus_done(unsigned int maxcpus)
++{
++}
++
++extern struct task_struct *idle_threads[NR_CPUS];
++
++#else
++
++#define hard_smp_processor_id()		0
++
++#endif
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/sysrq.h
+@@ -0,0 +1,7 @@
++#ifndef __UM_SYSRQ_H
++#define __UM_SYSRQ_H
++
++struct task_struct;
++extern void show_trace(struct task_struct* task, unsigned long *stack);
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/thread_info.h
+@@ -0,0 +1,78 @@
++/*
++ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_THREAD_INFO_H
++#define __UM_THREAD_INFO_H
++
++#ifndef __ASSEMBLY__
++
++#include <asm/types.h>
++#include <asm/page.h>
++#include <asm/uaccess.h>
++
++struct thread_info {
++	struct task_struct	*task;		/* main task structure */
++	struct exec_domain	*exec_domain;	/* execution domain */
++	unsigned long		flags;		/* low level flags */
++	__u32			cpu;		/* current CPU */
++	int			preempt_count;  /* 0 => preemptable,
++						   <0 => BUG */
++	mm_segment_t		addr_limit;	/* thread address space:
++					 	   0-0xBFFFFFFF for user
++						   0-0xFFFFFFFF for kernel */
++	struct restart_block    restart_block;
++	struct thread_info	*real_thread;    /* Points to non-IRQ stack */
++};
++
++#define INIT_THREAD_INFO(tsk)			\
++{						\
++	.task =		&tsk,			\
++	.exec_domain =	&default_exec_domain,	\
++	.flags =		0,		\
++	.cpu =		0,			\
++	.preempt_count = INIT_PREEMPT_COUNT,	\
++	.addr_limit =	KERNEL_DS,		\
++	.restart_block =  {			\
++		.fn =  do_no_restart_syscall,	\
++	},					\
++	.real_thread = NULL,			\
++}
++
++#define init_thread_info	(init_thread_union.thread_info)
++#define init_stack		(init_thread_union.stack)
++
++#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
++/* how to get the thread information struct from C */
++static inline struct thread_info *current_thread_info(void)
++{
++	struct thread_info *ti;
++	unsigned long mask = THREAD_SIZE - 1;
++	void *p;
++
++	asm volatile ("" : "=r" (p) : "0" (&ti));
++	ti = (struct thread_info *) (((unsigned long)p) & ~mask);
++	return ti;
++}
++
++#define THREAD_SIZE_ORDER CONFIG_KERNEL_STACK_ORDER
++
++#endif
++
++#define TIF_SYSCALL_TRACE	0	/* syscall trace active */
++#define TIF_SIGPENDING		1	/* signal pending */
++#define TIF_NEED_RESCHED	2	/* rescheduling necessary */
++#define TIF_RESTART_BLOCK	4
++#define TIF_MEMDIE		5	/* is terminating due to OOM killer */
++#define TIF_SYSCALL_AUDIT	6
++#define TIF_RESTORE_SIGMASK	7
++#define TIF_NOTIFY_RESUME	8
++
++#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
++#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
++#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
++#define _TIF_MEMDIE		(1 << TIF_MEMDIE)
++#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/timex.h
+@@ -0,0 +1,13 @@
++#ifndef __UM_TIMEX_H
++#define __UM_TIMEX_H
++
++typedef unsigned long cycles_t;
++
++static inline cycles_t get_cycles (void)
++{
++	return 0;
++}
++
++#define CLOCK_TICK_RATE (HZ)
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/tlb.h
+@@ -0,0 +1,122 @@
++#ifndef __UM_TLB_H
++#define __UM_TLB_H
++
++#include <linux/pagemap.h>
++#include <linux/swap.h>
++#include <asm/percpu.h>
++#include <asm/pgalloc.h>
++#include <asm/tlbflush.h>
++
++#define tlb_start_vma(tlb, vma) do { } while (0)
++#define tlb_end_vma(tlb, vma) do { } while (0)
++#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
++
++/* struct mmu_gather is an opaque type used by the mm code for passing around
++ * any data needed by arch specific code for tlb_remove_page.
++ */
++struct mmu_gather {
++	struct mm_struct	*mm;
++	unsigned int		need_flush; /* Really unmapped some ptes? */
++	unsigned long		start;
++	unsigned long		end;
++	unsigned int		fullmm; /* non-zero means full mm flush */
++};
++
++static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,
++					  unsigned long address)
++{
++	if (tlb->start > address)
++		tlb->start = address;
++	if (tlb->end < address + PAGE_SIZE)
++		tlb->end = address + PAGE_SIZE;
++}
++
++static inline void init_tlb_gather(struct mmu_gather *tlb)
++{
++	tlb->need_flush = 0;
++
++	tlb->start = TASK_SIZE;
++	tlb->end = 0;
++
++	if (tlb->fullmm) {
++		tlb->start = 0;
++		tlb->end = TASK_SIZE;
++	}
++}
++
++static inline void
++tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)
++{
++	tlb->mm = mm;
++	tlb->start = start;
++	tlb->end = end;
++	tlb->fullmm = !(start | (end+1));
++
++	init_tlb_gather(tlb);
++}
++
++extern void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
++			       unsigned long end);
++
++static inline void
++tlb_flush_mmu(struct mmu_gather *tlb)
++{
++	if (!tlb->need_flush)
++		return;
++
++	flush_tlb_mm_range(tlb->mm, tlb->start, tlb->end);
++	init_tlb_gather(tlb);
++}
++
++/* tlb_finish_mmu
++ *	Called at the end of the shootdown operation to free up any resources
++ *	that were required.
++ */
++static inline void
++tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
++{
++	tlb_flush_mmu(tlb);
++
++	/* keep the page table cache within bounds */
++	check_pgt_cache();
++}
++
++/* tlb_remove_page
++ *	Must perform the equivalent to __free_pte(pte_get_and_clear(ptep)),
++ *	while handling the additional races in SMP caused by other CPUs
++ *	caching valid mappings in their TLBs.
++ */
++static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
++{
++	tlb->need_flush = 1;
++	free_page_and_swap_cache(page);
++	return 1; /* avoid calling tlb_flush_mmu */
++}
++
++static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
++{
++	__tlb_remove_page(tlb, page);
++}
++
++/**
++ * tlb_remove_tlb_entry - remember a pte unmapping for later tlb invalidation.
++ *
++ * Record the fact that pte's were really umapped in ->need_flush, so we can
++ * later optimise away the tlb invalidate.   This helps when userspace is
++ * unmapping already-unmapped pages, which happens quite a lot.
++ */
++#define tlb_remove_tlb_entry(tlb, ptep, address)		\
++	do {							\
++		tlb->need_flush = 1;				\
++		__tlb_remove_tlb_entry(tlb, ptep, address);	\
++	} while (0)
++
++#define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr)
++
++#define pud_free_tlb(tlb, pudp, addr) __pud_free_tlb(tlb, pudp, addr)
++
++#define pmd_free_tlb(tlb, pmdp, addr) __pmd_free_tlb(tlb, pmdp, addr)
++
++#define tlb_migrate_finish(mm) do {} while (0)
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/tlbflush.h
+@@ -0,0 +1,31 @@
++/*
++ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_TLBFLUSH_H
++#define __UM_TLBFLUSH_H
++
++#include <linux/mm.h>
++
++/*
++ * TLB flushing:
++ *
++ *  - flush_tlb() flushes the current mm struct TLBs
++ *  - flush_tlb_all() flushes all processes TLBs
++ *  - flush_tlb_mm(mm) flushes the specified mm context TLB's
++ *  - flush_tlb_page(vma, vmaddr) flushes one page
++ *  - flush_tlb_kernel_vm() flushes the kernel vm area
++ *  - flush_tlb_range(vma, start, end) flushes a range of pages
++ */
++
++extern void flush_tlb_all(void);
++extern void flush_tlb_mm(struct mm_struct *mm);
++extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, 
++			    unsigned long end);
++extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long address);
++extern void flush_tlb_kernel_vm(void);
++extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
++extern void __flush_tlb_one(unsigned long addr);
++
++#endif
+--- /dev/null
++++ b/arch/um/include/uapi/asm/uaccess.h
+@@ -0,0 +1,178 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __UM_UACCESS_H
++#define __UM_UACCESS_H
++
++/* thread_info has a mm_segment_t in it, so put the definition up here */
++typedef struct {
++	unsigned long seg;
++} mm_segment_t;
++
++#include <linux/thread_info.h>
++#include <linux/errno.h>
++#include <asm/processor.h>
++#include <asm/elf.h>
++
++#define VERIFY_READ 0
++#define VERIFY_WRITE 1
++
++/*
++ * The fs value determines whether argument validity checking should be
++ * performed or not.  If get_fs() == USER_DS, checking is performed, with
++ * get_fs() == KERNEL_DS, checking is bypassed.
++ *
++ * For historical reasons, these macros are grossly misnamed.
++ */
++
++#define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })
++
++#define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFF)
++#define USER_DS		MAKE_MM_SEG(TASK_SIZE)
++
++#define get_ds()	(KERNEL_DS)
++#define get_fs()	(current_thread_info()->addr_limit)
++#define set_fs(x)	(current_thread_info()->addr_limit = (x))
++
++#define segment_eq(a, b) ((a).seg == (b).seg)
++
++#define __under_task_size(addr, size) \
++	(((unsigned long) (addr) < TASK_SIZE) && \
++	 (((unsigned long) (addr) + (size)) < TASK_SIZE))
++
++#define __access_ok_vsyscall(type, addr, size) \
++	 ((type == VERIFY_READ) && \
++	  ((unsigned long) (addr) >= FIXADDR_USER_START) && \
++	  ((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \
++	  ((unsigned long) (addr) + (size) >= (unsigned long)(addr)))
++
++#define __addr_range_nowrap(addr, size) \
++	((unsigned long) (addr) <= ((unsigned long) (addr) + (size)))
++
++#define access_ok(type, addr, size) \
++	(__addr_range_nowrap(addr, size) && \
++	 (__under_task_size(addr, size) || \
++	  __access_ok_vsyscall(type, addr, size) || \
++	  segment_eq(get_fs(), KERNEL_DS)))
++
++extern int copy_from_user(void *to, const void __user *from, int n);
++extern int copy_to_user(void __user *to, const void *from, int n);
++
++/*
++ * strncpy_from_user: - Copy a NUL terminated string from userspace.
++ * @dst:   Destination address, in kernel space.  This buffer must be at
++ *         least @count bytes long.
++ * @src:   Source address, in user space.
++ * @count: Maximum number of bytes to copy, including the trailing NUL.
++ *
++ * Copies a NUL-terminated string from userspace to kernel space.
++ *
++ * On success, returns the length of the string (not including the trailing
++ * NUL).
++ *
++ * If access to userspace fails, returns -EFAULT (some data may have been
++ * copied).
++ *
++ * If @count is smaller than the length of the string, copies @count bytes
++ * and returns @count.
++ */
++
++extern int strncpy_from_user(char *dst, const char __user *src, int count);
++
++/*
++ * __clear_user: - Zero a block of memory in user space, with less checking.
++ * @to:   Destination address, in user space.
++ * @n:    Number of bytes to zero.
++ *
++ * Zero a block of memory in user space.  Caller must check
++ * the specified block with access_ok() before calling this function.
++ *
++ * Returns number of bytes that could not be cleared.
++ * On success, this will be zero.
++ */
++extern int __clear_user(void __user *mem, int len);
++
++/*
++ * clear_user: - Zero a block of memory in user space.
++ * @to:   Destination address, in user space.
++ * @n:    Number of bytes to zero.
++ *
++ * Zero a block of memory in user space.
++ *
++ * Returns number of bytes that could not be cleared.
++ * On success, this will be zero.
++ */
++extern int clear_user(void __user *mem, int len);
++
++/*
++ * strlen_user: - Get the size of a string in user space.
++ * @str: The string to measure.
++ * @n:   The maximum valid length
++ *
++ * Get the size of a NUL-terminated string in user space.
++ *
++ * Returns the size of the string INCLUDING the terminating NUL.
++ * On exception, returns 0.
++ * If the string is too long, returns a value greater than @n.
++ */
++extern int strnlen_user(const void __user *str, int len);
++
++#define __copy_from_user(to, from, n) copy_from_user(to, from, n)
++
++#define __copy_to_user(to, from, n) copy_to_user(to, from, n)
++
++#define __copy_to_user_inatomic __copy_to_user
++#define __copy_from_user_inatomic __copy_from_user
++
++#define __get_user(x, ptr) \
++({ \
++	const __typeof__(*(ptr)) __user *__private_ptr = (ptr);	\
++	__typeof__(x) __private_val;			\
++	int __private_ret = -EFAULT;			\
++	(x) = (__typeof__(*(__private_ptr)))0;				\
++	if (__copy_from_user((__force void *)&__private_val, (__private_ptr),\
++			     sizeof(*(__private_ptr))) == 0) {		\
++		(x) = (__typeof__(*(__private_ptr))) __private_val;	\
++		__private_ret = 0;					\
++	}								\
++	__private_ret;							\
++}) 
++
++#define get_user(x, ptr) \
++({ \
++        const __typeof__((*(ptr))) __user *private_ptr = (ptr); \
++        (access_ok(VERIFY_READ, private_ptr, sizeof(*private_ptr)) ? \
++	 __get_user(x, private_ptr) : ((x) = (__typeof__(*ptr))0, -EFAULT)); \
++})
++
++#define __put_user(x, ptr) \
++({ \
++        __typeof__(*(ptr)) __user *__private_ptr = ptr; \
++        __typeof__(*(__private_ptr)) __private_val; \
++        int __private_ret = -EFAULT; \
++        __private_val = (__typeof__(*(__private_ptr))) (x); \
++        if (__copy_to_user((__private_ptr), &__private_val, \
++			   sizeof(*(__private_ptr))) == 0) { \
++		__private_ret = 0; \
++	} \
++        __private_ret; \
++})
++
++#define put_user(x, ptr) \
++({ \
++        __typeof__(*(ptr)) __user *private_ptr = (ptr); \
++        (access_ok(VERIFY_WRITE, private_ptr, sizeof(*private_ptr)) ? \
++	 __put_user(x, private_ptr) : -EFAULT); \
++})
++
++#define strlen_user(str) strnlen_user(str, ~0U >> 1)
++
++struct exception_table_entry
++{
++        unsigned long insn;
++	unsigned long fixup;
++};
++
++#endif
diff --git a/trunk/target/linux/uml/patches-3.14/101-mconsole-exec.patch b/trunk/target/linux/uml/patches-3.14/101-mconsole-exec.patch
new file mode 100644
index 00000000..e94b2ca0
--- /dev/null
+++ b/trunk/target/linux/uml/patches-3.14/101-mconsole-exec.patch
@@ -0,0 +1,211 @@
+#
+# Minimalist mconsole exec patch 
+#
+# 3.10 version (with bit more synchronous behavior) by fingon at iki dot fi
+# Adaptation to kernel 3.3.8 made by David Fernández (david at dit.upm.es) for 
+# Starting point: mconsole-exec-2.6.30.patch for kernel 2.6.30
+# Author of original patch: Paolo Giarrusso, aka Blaisorblade 
+#                           (http://www.user-mode-linux.org/~blaisorblade)
+#
+# Known misfeatures:
+#
+# - If output is too long, blocks (and breaks horribly) 
+# (this misfeature from 3.10 patches, when minimalizing the patch;
+#  workaround: redirect to a shared filesystem if long output is expected)
+#
+# - Nothing useful is done with stdin
+#
+--- a/arch/um/drivers/mconsole.h
++++ b/arch/um/drivers/mconsole.h
+@@ -85,6 +85,7 @@ extern void mconsole_cad(struct mc_reque
+ extern void mconsole_stop(struct mc_request *req);
+ extern void mconsole_go(struct mc_request *req);
+ extern void mconsole_log(struct mc_request *req);
++extern void mconsole_exec(struct mc_request *req);
+ extern void mconsole_proc(struct mc_request *req);
+ extern void mconsole_stack(struct mc_request *req);
+ 
+--- a/arch/um/drivers/mconsole_kern.c
++++ b/arch/um/drivers/mconsole_kern.c
+@@ -4,6 +4,7 @@
+  * Licensed under the GPL
+  */
+ 
++#include "linux/kmod.h"
+ #include <linux/console.h>
+ #include <linux/ctype.h>
+ #include <linux/string.h>
+@@ -24,6 +25,7 @@
+ #include <linux/fs.h>
+ #include <linux/mount.h>
+ #include <linux/file.h>
++#include <linux/completion.h>
+ #include <asm/uaccess.h>
+ #include <asm/switch_to.h>
+ 
+@@ -121,6 +123,59 @@ void mconsole_log(struct mc_request *req
+ 	mconsole_reply(req, "", 0, 0);
+ }
+ 
++void mconsole_exec(struct mc_request *req)
++{
++  struct subprocess_info *sub_info;
++  int res, len;
++  struct file *out;
++  char buf[MCONSOLE_MAX_DATA];
++
++  char *envp[] = {
++    "HOME=/", "TERM=linux",
++    "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin",
++    NULL
++  };
++  char *argv[] = {
++    "/bin/sh", "-c",
++    req->request.data + strlen("exec "),
++    NULL
++  };
++
++  sub_info = call_usermodehelper_setup("/bin/sh", argv, envp, GFP_ATOMIC, NULL, NULL, NULL);
++  if (sub_info == NULL) {
++    mconsole_reply(req, "call_usermodehelper_setup failed", 1, 0);
++    return;
++  }
++  res = call_usermodehelper_stdoutpipe(sub_info, &out);
++  if (res < 0) {
++    kfree(sub_info);
++    mconsole_reply(req, "call_usermodehelper_stdoutpipe failed", 1, 0);
++    return;
++  }
++
++  res = call_usermodehelper_exec(sub_info, UMH_WAIT_PROC);
++  if (res < 0) {
++    kfree(sub_info);
++    mconsole_reply(req, "call_usermodehelper_exec failed", 1, 0);
++    return;
++  }
++
++  for (;;) {
++    len = out->f_op->read(out, buf, sizeof(buf), &out->f_pos);
++    if (len < 0) {
++      mconsole_reply(req, "reading output failed", 1, 0);
++      break;
++    }
++    if (len == 0)
++      break;
++    mconsole_reply_len(req, buf, len, 0, 1);
++  }
++  fput(out);
++
++  mconsole_reply_len(req, NULL, 0, 0, 0);
++}
++
++
+ void mconsole_proc(struct mc_request *req)
+ {
+ 	struct vfsmount *mnt = task_active_pid_ns(current)->proc_mnt;
+@@ -187,6 +242,7 @@ void mconsole_proc(struct mc_request *re
+     stop - pause the UML; it will do nothing until it receives a 'go' \n\
+     go - continue the UML after a 'stop' \n\
+     log <string> - make UML enter <string> into the kernel log\n\
++    exec <string> - pass <string> to /bin/sh -c synchronously\n\
+     proc <file> - returns the contents of the UML's /proc/<file>\n\
+     stack <pid> - returns the stack of the specified pid\n\
+ "
+--- a/arch/um/drivers/mconsole_user.c
++++ b/arch/um/drivers/mconsole_user.c
+@@ -30,6 +30,7 @@ static struct mconsole_command commands[
+ 	{ "stop", mconsole_stop, MCONSOLE_PROC },
+ 	{ "go", mconsole_go, MCONSOLE_INTR },
+ 	{ "log", mconsole_log, MCONSOLE_INTR },
++	{ "exec", mconsole_exec, MCONSOLE_PROC },
+ 	{ "proc", mconsole_proc, MCONSOLE_PROC },
+ 	{ "stack", mconsole_stack, MCONSOLE_INTR },
+ };
+--- a/arch/um/os-Linux/file.c
++++ b/arch/um/os-Linux/file.c
+@@ -528,6 +528,8 @@ int os_create_unix_socket(const char *fi
+ 
+ 	addr.sun_family = AF_UNIX;
+ 
++	if (len > sizeof(addr.sun_path))
++		len = sizeof(addr.sun_path);
+ 	snprintf(addr.sun_path, len, "%s", file);
+ 
+ 	err = bind(sock, (struct sockaddr *) &addr, sizeof(addr));
+--- a/include/linux/kmod.h
++++ b/include/linux/kmod.h
+@@ -62,6 +62,7 @@ struct subprocess_info {
+ 	int wait;
+ 	int retval;
+ 	int (*init)(struct subprocess_info *info, struct cred *new);
++	struct file *stdout;
+ 	void (*cleanup)(struct subprocess_info *info);
+ 	void *data;
+ };
+@@ -104,4 +105,6 @@ extern int usermodehelper_read_trylock(v
+ extern long usermodehelper_read_lock_wait(long timeout);
+ extern void usermodehelper_read_unlock(void);
+ 
++int call_usermodehelper_stdoutpipe(struct subprocess_info *sub_info, struct file **filp);
++
+ #endif /* __LINUX_KMOD_H__ */
+--- a/kernel/kmod.c
++++ b/kernel/kmod.c
+@@ -39,6 +39,7 @@
+ #include <linux/rwsem.h>
+ #include <linux/ptrace.h>
+ #include <linux/async.h>
++#include <linux/pipe_fs_i.h>
+ #include <asm/uaccess.h>
+ 
+ #include <trace/events/module.h>
+@@ -209,6 +210,28 @@ static int ____call_usermodehelper(void
+ 	flush_signal_handlers(current, 1);
+ 	spin_unlock_irq(&current->sighand->siglock);
+ 
++        /* Install output when needed */
++        if (sub_info->stdout) {
++                struct files_struct *f = current->files;
++                struct fdtable *fdt;
++
++                sys_close(1);
++                sys_close(2);
++                get_file(sub_info->stdout);
++                fd_install(1, sub_info->stdout);
++                fd_install(2, sub_info->stdout);
++                spin_lock(&f->file_lock);
++                fdt = files_fdtable(f);
++                __set_bit(1, fdt->open_fds);
++                __clear_bit(1, fdt->close_on_exec);
++                __set_bit(2, fdt->open_fds);
++                __clear_bit(2, fdt->close_on_exec);
++                spin_unlock(&f->file_lock);
++
++                /* disallow core files */
++                current->signal->rlim[RLIMIT_CORE] = (struct rlimit){0, 0};
++        }
++
+ 	/* We can run anywhere, unlike our parent keventd(). */
+ 	set_cpus_allowed_ptr(current, cpu_all_mask);
+ 
+@@ -554,6 +577,20 @@ struct subprocess_info *call_usermodehel
+ }
+ EXPORT_SYMBOL(call_usermodehelper_setup);
+ 
++int call_usermodehelper_stdoutpipe(struct subprocess_info *sub_info,
++                                 struct file **filp)
++{
++  struct file *f[2];
++
++  if (create_pipe_files(f, 0)<0)
++    return PTR_ERR(f);
++  sub_info->stdout = f[1];
++  *filp = f[0];
++  return 0;
++}
++EXPORT_SYMBOL(call_usermodehelper_stdoutpipe);
++
++
+ /**
+  * call_usermodehelper_exec - start a usermode application
+  * @sub_info: information about the subprocessa
diff --git a/trunk/target/linux/uml/patches-3.14/102-pseudo-random-mac.patch b/trunk/target/linux/uml/patches-3.14/102-pseudo-random-mac.patch
new file mode 100644
index 00000000..fc54f603
--- /dev/null
+++ b/trunk/target/linux/uml/patches-3.14/102-pseudo-random-mac.patch
@@ -0,0 +1,124 @@
+===============================================================================
+
+This patch makes MAC addresses of network interfaces predictable. In
+particular, it adds a small routine that computes MAC addresses of based on
+a SHA1 hash of the virtual machine name and interface ID.
+
+TECHNICAL INFORMATION:
+
+Applies to vanilla kernel 3.9.4.
+
+===============================================================================
+--- a/arch/um/Kconfig.net
++++ b/arch/um/Kconfig.net
+@@ -21,6 +21,19 @@ config UML_NET
+         enable at least one of the following transport options to actually
+         make use of UML networking.
+ 
++config UML_NET_RANDOM_MAC
++	bool "Use random MAC addresses for network interfaces"
++	default n
++	depends on UML_NET
++	help
++        Virtual network devices inside a User-Mode Linux instance must be
++        assigned a MAC (Ethernet) address. If none is specified on the UML
++        command line, one must be automatically computed. If this option is
++        enabled, a randomly generated address is used. Otherwise, if this
++        option is disabled, the address is generated from a SHA1 hash of
++        the umid of the UML instance and the interface name. The latter choice
++        is useful to make MAC addresses predictable.
++
+ config UML_NET_ETHERTAP
+ 	bool "Ethertap transport"
+ 	depends on UML_NET
+--- a/arch/um/drivers/net_kern.c
++++ b/arch/um/drivers/net_kern.c
+@@ -25,6 +25,13 @@
+ #include <net_kern.h>
+ #include <net_user.h>
+ 
++#include <crypto/sha.h>
++#include <linux/string.h>
++#include <linux/crypto.h>
++#include <linux/err.h>
++#include <linux/scatterlist.h>
++#include "os.h"
++
+ #define DRIVER_NAME "uml-netdev"
+ 
+ static DEFINE_SPINLOCK(opened_lock);
+@@ -295,11 +302,47 @@ static void uml_net_user_timer_expire(un
+ #endif
+ }
+ 
++#ifndef CONFIG_UML_NET_RANDOM_MAC
++
++/* Compute a SHA1 hash of the UML instance's id and
++ *  * an interface name. */
++static int compute_hash(const char *umid, const char *ifname, char *hash) {
++	char vmif[1024];
++	struct scatterlist sg;
++	struct crypto_hash *tfm;
++	struct hash_desc desc;
++
++	strcpy (vmif, umid);
++	strcat (vmif, ifname);
++
++	tfm = crypto_alloc_hash("sha1", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(tfm))
++		return 1;
++
++	desc.tfm = tfm;
++	desc.flags = 0;
++
++	sg_init_table(&sg, 1);
++	sg_set_buf(&sg, vmif, strlen(vmif));
++
++	if (crypto_hash_digest(&desc, &sg, strlen(vmif), hash)) {
++		crypto_free_hash(tfm);
++		return 1;
++	}
++
++	crypto_free_hash(tfm);
++
++	return 0;
++}
++
++#endif
++
+ static void setup_etheraddr(struct net_device *dev, char *str)
+ {
+ 	unsigned char *addr = dev->dev_addr;
+ 	char *end;
+ 	int i;
++	u8 hash[SHA1_DIGEST_SIZE];
+ 
+ 	if (str == NULL)
+ 		goto random;
+@@ -340,9 +383,26 @@ static void setup_etheraddr(struct net_d
+ 	return;
+ 
+ random:
++#ifdef CONFIG_UML_NET_RANDOM_MAC
+ 	printk(KERN_INFO
+ 	       "Choosing a random ethernet address for device %s\n", dev->name);
+ 	eth_hw_addr_random(dev);
++#else
++	printk(KERN_INFO
++	       "Computing a digest to use as ethernet address for device %s\n", dev->name);
++	if (compute_hash(get_umid(), dev->name, hash)) {
++		printk(KERN_WARNING
++		       "Could not compute digest to use as ethernet address for device %s. "
++		       "Using random address instead.\n", dev->name);
++		random_ether_addr(addr);
++	}
++	else {
++		for (i=0; i < 6; i++)
++			addr[i] = (hash[i] + hash[i+6]) % 0x100;
++	}
++	addr [0] &= 0xfe; /* clear multicast bit */
++	addr [0] |= 0x02; /* set local assignment bit (IEEE802) */
++#endif
+ }
+ 
+ static DEFINE_SPINLOCK(devices_lock);
diff --git a/trunk/target/linux/x86/Makefile b/trunk/target/linux/x86/Makefile
new file mode 100644
index 00000000..52d9885e
--- /dev/null
+++ b/trunk/target/linux/x86/Makefile
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+ARCH:=i386
+BOARD:=x86
+BOARDNAME:=x86
+FEATURES:=squashfs ext4 vdi vmdk pcmcia targz
+SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \
+	   rdc
+
+KERNEL_PATCHVER:=3.14
+
+KERNELNAME:=bzImage
+
+include $(INCLUDE_DIR)/target.mk
+
+$(eval $(call BuildTarget))
+
+$(eval $(call $(if $(CONFIG_TARGET_ROOTFS_ISO),RequireCommand,Ignore),mkisofs, \
+   	Please install mkisofs. \
+))
diff --git a/trunk/target/linux/x86/alix2/base-files/etc/config/network b/trunk/target/linux/x86/alix2/base-files/etc/config/network
new file mode 100644
index 00000000..46834028
--- /dev/null
+++ b/trunk/target/linux/x86/alix2/base-files/etc/config/network
@@ -0,0 +1,28 @@
+# Copyright (C) 2011 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+# N.B. the labels on the Netgate boxes actually reverse the LAN and WAN
+# port markings.
+config interface lan
+	option ifname	eth1
+	option type 	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+	option ip6assign 60
+
+config interface wan
+	option ifname	eth0
+	option proto	dhcp
+
+config interface wan6
+	option ifname   eth0
+	option proto    dhcpv6
+
+config globals globals
+	option ula_prefix auto
diff --git a/trunk/target/linux/x86/alix2/base-files/etc/config/system b/trunk/target/linux/x86/alix2/base-files/etc/config/system
new file mode 100644
index 00000000..a26d5df4
--- /dev/null
+++ b/trunk/target/linux/x86/alix2/base-files/etc/config/system
@@ -0,0 +1,29 @@
+config system
+	option hostname	libreCMC
+	option timezone	UTC
+
+config timeserver ntp
+	list server	0.librecmc.pool.ntp.org
+	list server	1.librecmc.pool.ntp.org
+	list server	2.librecmc.pool.ntp.org
+	list server	3.librecmc.pool.ntp.org
+
+config led
+	option default	1
+	option name	LAN
+	option sysfs	'alix:1'
+	option trigger	netdev
+	option mode	'tx rx'
+	option dev	'br-lan'
+
+config led
+	option default	1
+	option name	WiFi
+	option sysfs	'alix:2'
+	option trigger	'phy0tpt'
+
+config led
+	option default	0
+	option name	Heartbeat
+	option sysfs	'alix:3'
+	option trigger	'heartbeat'
diff --git a/trunk/target/linux/x86/alix2/base-files/etc/hotplug.d/button/50-reboot b/trunk/target/linux/x86/alix2/base-files/etc/hotplug.d/button/50-reboot
new file mode 100644
index 00000000..bf893c15
--- /dev/null
+++ b/trunk/target/linux/x86/alix2/base-files/etc/hotplug.d/button/50-reboot
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+logger -t button -p daemon.info "$BUTTON/$ACTION"
+
+case "$BUTTON/$ACTION" in
+
+reset/released)
+  reboot -f
+  ;;
+
+esac
+
+exit 0
diff --git a/trunk/target/linux/x86/alix2/config-default b/trunk/target/linux/x86/alix2/config-default
new file mode 100644
index 00000000..e7b4f264
--- /dev/null
+++ b/trunk/target/linux/x86/alix2/config-default
@@ -0,0 +1,29 @@
+CONFIG_ALIX=y
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DMI=y
+CONFIG_DMIID=y
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+# CONFIG_DMI_SYSFS is not set
+# CONFIG_GEOS is not set
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_INTEL_MID is not set
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_HWMON=y
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
+# CONFIG_M486 is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MGEODE_LX=y
+CONFIG_NLS=y
+CONFIG_PATA_CS5536=y
+CONFIG_PCI_LABEL=y
+# CONFIG_SCx200 is not set
+CONFIG_THERMAL_HWMON=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_3DNOW=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/trunk/target/linux/x86/alix2/target.mk b/trunk/target/linux/x86/alix2/target.mk
new file mode 100644
index 00000000..b5d01175
--- /dev/null
+++ b/trunk/target/linux/x86/alix2/target.mk
@@ -0,0 +1,32 @@
+BOARDNAME:=PCEngines alix2
+FEATURES:=squashfs ext4 pci usb gpio
+DEFAULT_PACKAGES += \
+			kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-aes kmod-crypto-cbc \
+			kmod-gpio-cs5535-new kmod-gpio-nsc \
+			kmod-wdt-geode kmod-cs5535-clockevt kmod-cs5535-mfgpt \
+			kmod-cs5536 \
+			kmod-hwmon-core kmod-hwmon-lm90 \
+			kmod-via-rhine \
+			kmod-i2c-core kmod-i2c-gpio \
+			kmod-i2c-algo-bit kmod-i2c-algo-pca kmod-i2c-algo-pcf \
+			kmod-i2c-scx200-acb \
+			kmod-usb-core kmod-usb2 kmod-usb2-pci kmod-usb-ohci \
+			kmod-cfg80211 kmod-mac80211 \
+			kmod-mppe kmod-pppoe kmod-pppol2tp \
+			kmod-ath5k kmod-ath9k \
+			kmod-leds-gpio kmod-input-gpio-keys-polled \
+			kmod-button-hotplug \
+			kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
+			kmod-ledtrig-netdev \
+			kmod-cpu-msr hwclock wpad
+CS5535_MASK:=0x0b000042
+
+CPU_TYPE := geode
+
+define Target/Description
+	Build firmware images for PCEngines alix2 board
+endef
+
+define KernelPackage/gpio-cs5535-new/install
+     sed -i -r -e 's/$$$$$$$$/ mask=$(CS5535_MASK)/' $(1)/etc/modules.d/??-gpio-cs5535-new
+endef
diff --git a/trunk/target/linux/x86/base-files.mk b/trunk/target/linux/x86/base-files.mk
new file mode 100644
index 00000000..6c6e6f16
--- /dev/null
+++ b/trunk/target/linux/x86/base-files.mk
@@ -0,0 +1,6 @@
+ifneq ($(CONFIG_TARGET_x86_generic_Soekris48xx)$(CONFIG_TARGET_x86_generic_Soekris45xx),)
+define Package/base-files/install-target
+	rm -f $(1)/etc/config/network
+endef
+endif
+
diff --git a/trunk/target/linux/x86/base-files/etc/config/network b/trunk/target/linux/x86/base-files/etc/config/network
new file mode 100644
index 00000000..c9953a02
--- /dev/null
+++ b/trunk/target/linux/x86/base-files/etc/config/network
@@ -0,0 +1,26 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface lan
+	option ifname	eth0
+	option type 	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+	option ip6assign 60
+
+config interface wan
+	option ifname	eth1
+	option proto	dhcp
+
+config interface wan6
+	option ifname	eth1
+	option proto	dhcpv6
+
+config globals globals
+	option ula_prefix auto
diff --git a/trunk/target/linux/x86/base-files/etc/inittab b/trunk/target/linux/x86/base-files/etc/inittab
new file mode 100644
index 00000000..ca90fd8a
--- /dev/null
+++ b/trunk/target/linux/x86/base-files/etc/inittab
@@ -0,0 +1,4 @@
+::sysinit:/etc/init.d/rcS S boot
+::shutdown:/etc/init.d/rcS K shutdown
+ttyS0::askfirst:/bin/ash --login
+tty1::askfirst:/bin/ash --login
diff --git a/trunk/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 b/trunk/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86
new file mode 100644
index 00000000..5d545309
--- /dev/null
+++ b/trunk/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+do_mount_procfs() {
+	mount -o noatime -t proc none /proc
+}
+
diff --git a/trunk/target/linux/x86/base-files/lib/preinit/20_check_iso b/trunk/target/linux/x86/base-files/lib/preinit/20_check_iso
new file mode 100644
index 00000000..beff6eba
--- /dev/null
+++ b/trunk/target/linux/x86/base-files/lib/preinit/20_check_iso
@@ -0,0 +1,5 @@
+check_for_iso() {
+	grep -qE '/dev/root.*iso9660' /proc/mounts && ramoverlay
+}
+
+boot_hook_add preinit_mount_root check_for_iso
diff --git a/trunk/target/linux/x86/base-files/lib/preinit/79_move_config b/trunk/target/linux/x86/base-files/lib/preinit/79_move_config
new file mode 100644
index 00000000..0bffbab9
--- /dev/null
+++ b/trunk/target/linux/x86/base-files/lib/preinit/79_move_config
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Copyright (C) 2012 OpenWrt.org
+
+move_config() {
+	local rootfsdev
+	local rootfstype
+	
+	rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)"
+	case "$rootfstype" in
+		squashfs|jffs2)
+			rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";;
+		ext4)
+			rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";;
+	esac
+
+	mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
+	mv -f /mnt/sysupgrade.tgz /
+	umount /mnt
+}
+
+boot_hook_add preinit_mount_root move_config
+
diff --git a/trunk/target/linux/x86/base-files/lib/upgrade/platform.sh b/trunk/target/linux/x86/base-files/lib/upgrade/platform.sh
new file mode 100644
index 00000000..a2dd20a8
--- /dev/null
+++ b/trunk/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,44 @@
+x86_get_rootfs() {
+	local rootfsdev
+	local rootfstype
+	
+	rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)"
+	case "$rootfstype" in
+		squashfs|jffs2)
+			rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";;
+		ext4)
+			rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";;
+	esac
+		
+	echo "$rootfstype:$rootfsdev"
+}
+
+platform_check_image() {
+	[ "$#" -gt 1 ] && return 1
+
+	case "$(get_magic_word "$1")" in
+		eb48|eb63) return 0;;
+		*)
+			echo "Invalid image type"
+			return 1
+		;;
+	esac
+}
+
+platform_copy_config() {
+	local rootfs="$(x86_get_rootfs)"
+	local rootfsdev="${rootfs##*:}"
+	
+	mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
+	cp -af "$CONF_TAR" /mnt/
+	umount /mnt
+}
+
+platform_do_upgrade() {
+	local rootfs="$(x86_get_rootfs)"
+	local rootfsdev="${rootfs##*:}"
+
+	sync
+	[ -b ${rootfsdev%[0-9]} ] && get_image "$@" | dd of=${rootfsdev%[0-9]} bs=4096 conv=fsync
+	sleep 1
+}
diff --git a/trunk/target/linux/x86/config-3.10 b/trunk/target/linux/x86/config-3.10
new file mode 100644
index 00000000..69f2f087
--- /dev/null
+++ b/trunk/target/linux/x86/config-3.10
@@ -0,0 +1,414 @@
+# CONFIG_60XX_WDT is not set
+# CONFIG_64BIT is not set
+# CONFIG_ACPI is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIX is not set
+CONFIG_AMD_NB=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+# CONFIG_ARCH_RANDOM is not set
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ATA=y
+CONFIG_ATA_GENERIC=y
+CONFIG_ATA_PIIX=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BOUNCE=y
+# CONFIG_CHROMEOS_LAPTOP is not set
+CONFIG_CLKBLD_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CPU5_WDT is not set
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CPU_THERMAL=y
+CONFIG_CRC16=y
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32_PCLMUL is not set
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_DCDBAS is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DELL_RBU is not set
+# CONFIG_DMI is not set
+CONFIG_DNOTIFY=y
+CONFIG_DOUBLEFAULT=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_EDD is not set
+# CONFIG_EUROTECH_WDT is not set
+CONFIG_EXT4_FS=y
+# CONFIG_F71808E_WDT is not set
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FS_MBCACHE=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+CONFIG_GPIO_DEVRES=y
+# CONFIG_HANGCHECK_TIMER is not set
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_AOUT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_HAVE_UID16=y
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_HPET_TIMER=y
+# CONFIG_HP_WATCHDOG is not set
+CONFIG_HT_IRQ=y
+# CONFIG_HUGETLBFS is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_GEODE=y
+CONFIG_HW_RANDOM_VIA=y
+# CONFIG_HYPERVISOR_GUEST is not set
+CONFIG_HZ_PERIODIC=y
+CONFIG_I8253_LOCK=y
+# CONFIG_I8K is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_IBM_RTL is not set
+# CONFIG_IE6XX_WDT is not set
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INSTRUCTION_DECODER=y
+# CONFIG_INTEL_POWERCLAMP is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+# CONFIG_IO_DELAY_UDELAY is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+# CONFIG_ISA is not set
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_ITCO_WDT is not set
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KEXEC=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_M486=y
+# CONFIG_M586 is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M686 is not set
+# CONFIG_MACHZ_WDT is not set
+CONFIG_MATH_EMULATION=y
+# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MELAN is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+CONFIG_MODULES_USE_ELF_REL=y
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+CONFIG_MTD_BLOCK2MTD=y
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_TS5500 is not set
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MWINCHIPC6 is not set
+CONFIG_NAMESPACES=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_NET5501 is not set
+# CONFIG_NET_NS is not set
+CONFIG_NOHIGHMEM=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_NR_CPUS=1
+# CONFIG_NSC_GPIO is not set
+CONFIG_NVRAM=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
+# CONFIG_OLPC is not set
+CONFIG_OPROFILE_NMI_TIMER=y
+# CONFIG_OPTIMIZE_INLINING is not set
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_GOANY=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_PERF_EVENTS=y
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_POWER_SUPPLY=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+# CONFIG_RELOCATABLE is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SAMSUNG_Q10 is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCSI=y
+CONFIG_SCx200=y
+CONFIG_SCx200HR_TIMER=y
+# CONFIG_SCx200_GPIO is not set
+# CONFIG_SCx200_WDT is not set
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_CT82C710 is not set
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+# CONFIG_TELCLOCK is not set
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_TOSHIBA is not set
+CONFIG_UID16=y
+CONFIG_UIDGID_CONVERTED=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+# CONFIG_USER_NS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+# CONFIG_VIA_WDT is not set
+CONFIG_VM86=y
+# CONFIG_VMWARE_VMCI is not set
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_WAFER_WDT is not set
+CONFIG_X86=y
+CONFIG_X86_32=y
+# CONFIG_X86_32_IRIS is not set
+CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_ALIGNMENT_16=y
+# CONFIG_X86_ANCIENT_MCE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# CONFIG_X86_CPUID is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_F00F_BUG=y
+CONFIG_X86_GENERIC=y
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_GX_SUSPMOD is not set
+# CONFIG_X86_INTEL_PSTATE is not set
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_INVD_BUG=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_LOCAL_APIC=y
+# CONFIG_X86_LONGRUN is not set
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+# CONFIG_X86_PAE is not set
+CONFIG_X86_PAT=y
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_X86_POWERNOW_K6 is not set
+# CONFIG_X86_POWERNOW_K7 is not set
+CONFIG_X86_PPRO_FENCE=y
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_X86_SMAP is not set
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_ZLIB_INFLATE=y
+# CONFIG_ZONE_DMA32 is not set
diff --git a/trunk/target/linux/x86/config-3.14 b/trunk/target/linux/x86/config-3.14
new file mode 100644
index 00000000..f668e429
--- /dev/null
+++ b/trunk/target/linux/x86/config-3.14
@@ -0,0 +1,424 @@
+# CONFIG_60XX_WDT is not set
+# CONFIG_64BIT is not set
+# CONFIG_ACPI is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIX is not set
+CONFIG_AMD_NB=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+# CONFIG_ARCH_RANDOM is not set
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ATA=y
+CONFIG_ATA_GENERIC=y
+CONFIG_ATA_PIIX=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BOUNCE=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_COMPAT_VDSO=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+# CONFIG_CPU5_WDT is not set
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CRC16=y
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32_PCLMUL is not set
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_DCDBAS is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DELL_RBU is not set
+# CONFIG_DMI is not set
+CONFIG_DNOTIFY=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_EDD is not set
+# CONFIG_EUROTECH_WDT is not set
+CONFIG_EXT4_FS=y
+# CONFIG_F71808E_WDT is not set
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FS_MBCACHE=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_HANGCHECK_TIMER is not set
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_AOUT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_UID16=y
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_HPET_TIMER=y
+# CONFIG_HP_WATCHDOG is not set
+CONFIG_HT_IRQ=y
+# CONFIG_HUGETLBFS is not set
+CONFIG_HW_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_GEODE=y
+CONFIG_HW_RANDOM_VIA=y
+# CONFIG_HYPERVISOR_GUEST is not set
+CONFIG_HZ_PERIODIC=y
+CONFIG_I8253_LOCK=y
+# CONFIG_I8K is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_IBM_RTL is not set
+# CONFIG_IE6XX_WDT is not set
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_INSTRUCTION_DECODER=y
+# CONFIG_INTEL_POWERCLAMP is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_IOSF_MBI=m
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+# CONFIG_IO_DELAY_UDELAY is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+# CONFIG_ISA is not set
+CONFIG_ISA_DMA_API=y
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_ITCO_WDT is not set
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KEXEC=y
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_M486=y
+# CONFIG_M586 is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M686 is not set
+# CONFIG_MACHZ_WDT is not set
+CONFIG_MATH_EMULATION=y
+# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MELAN is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+CONFIG_MODULES_USE_ELF_REL=y
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+CONFIG_MTD_BLOCK2MTD=y
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_TS5500 is not set
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MWINCHIPC6 is not set
+CONFIG_NAMESPACES=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_NET5501 is not set
+# CONFIG_NET_NS is not set
+CONFIG_NOHIGHMEM=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_NR_CPUS=1
+# CONFIG_NSC_GPIO is not set
+# CONFIG_NTB is not set
+CONFIG_NVRAM=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
+# CONFIG_OLPC is not set
+CONFIG_OPROFILE_NMI_TIMER=y
+# CONFIG_OPTIMIZE_INLINING is not set
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_GOANY=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_PERF_EVENTS=y
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_POWER_SUPPLY=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+# CONFIG_RELOCATABLE is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_SC520_WDT is not set
+CONFIG_SCHED_HRTICK=y
+CONFIG_SCSI=y
+CONFIG_SCx200=y
+CONFIG_SCx200HR_TIMER=y
+# CONFIG_SCx200_GPIO is not set
+# CONFIG_SCx200_WDT is not set
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_CT82C710 is not set
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+# CONFIG_TELCLOCK is not set
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_TOSHIBA is not set
+CONFIG_UID16=y
+CONFIG_USB_SUPPORT=y
+# CONFIG_USER_NS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VIA_WDT is not set
+CONFIG_VM86=y
+# CONFIG_VMWARE_VMCI is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_WAFER_WDT is not set
+CONFIG_X86=y
+# CONFIG_X86_16BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_32_IRIS is not set
+CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_ALIGNMENT_16=y
+# CONFIG_X86_ANCIENT_MCE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# CONFIG_X86_CPUID is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_F00F_BUG=y
+CONFIG_X86_GENERIC=y
+# CONFIG_X86_GX_SUSPMOD is not set
+# CONFIG_X86_INTEL_PSTATE is not set
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_INVD_BUG=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_LOCAL_APIC=y
+# CONFIG_X86_LONGRUN is not set
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+# CONFIG_X86_PAE is not set
+CONFIG_X86_PAT=y
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_X86_POWERNOW_K6 is not set
+# CONFIG_X86_POWERNOW_K7 is not set
+CONFIG_X86_PPRO_FENCE=y
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_X86_SMAP is not set
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_ZLIB_INFLATE=y
+# CONFIG_ZONE_DMA32 is not set
diff --git a/trunk/target/linux/x86/config-3.3 b/trunk/target/linux/x86/config-3.3
new file mode 100644
index 00000000..0798b1ce
--- /dev/null
+++ b/trunk/target/linux/x86/config-3.3
@@ -0,0 +1,381 @@
+# CONFIG_60XX_WDT is not set
+# CONFIG_64BIT is not set
+# CONFIG_ACPI is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIX is not set
+CONFIG_AMD_NB=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_RANDOM is not set
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ATA=y
+CONFIG_ATA_GENERIC=y
+CONFIG_ATA_PIIX=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BOUNCE=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CPU5_WDT is not set
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CRC16=y
+# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
+# CONFIG_DCDBAS is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DELL_RBU is not set
+# CONFIG_DMI is not set
+CONFIG_DNOTIFY=y
+CONFIG_DOUBLEFAULT=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_EDD is not set
+CONFIG_ELF_CORE=y
+# CONFIG_EUROTECH_WDT is not set
+CONFIG_EXT4_FS=y
+# CONFIG_F71808E_WDT is not set
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FS_MBCACHE=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_PCI_IOMAP=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_HANGCHECK_TIMER is not set
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_AOUT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_HPET_TIMER=y
+# CONFIG_HP_WATCHDOG is not set
+CONFIG_HT_IRQ=y
+# CONFIG_HUGETLBFS is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_GEODE=y
+CONFIG_HW_RANDOM_VIA=y
+# CONFIG_I6300ESB_WDT is not set
+CONFIG_I8253_LOCK=y
+# CONFIG_I8K is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_IBM_RTL is not set
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INSTRUCTION_DECODER=y
+# CONFIG_IOMMU_HELPER is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+# CONFIG_IO_DELAY_UDELAY is not set
+CONFIG_IRQ_FORCED_THREADING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_IRQ_WORK=y
+# CONFIG_ISA is not set
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_ITCO_WDT is not set
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KEXEC=y
+CONFIG_KTIME_SCALAR=y
+# CONFIG_M386 is not set
+CONFIG_M486=y
+# CONFIG_M586 is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M686 is not set
+# CONFIG_MACHZ_WDT is not set
+CONFIG_MATH_EMULATION=y
+# CONFIG_MATOM is not set
+# CONFIG_MCA is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MELAN is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+CONFIG_MTD_BLOCK2MTD=y
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_TS5500 is not set
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MWINCHIPC6 is not set
+CONFIG_NAMESPACES=y
+# CONFIG_NEED_DMA_MAP_STATE is not set
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_NET_NS is not set
+CONFIG_NOHIGHMEM=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_NR_CPUS=1
+# CONFIG_NSC_GPIO is not set
+CONFIG_NVRAM=y
+# CONFIG_OLPC is not set
+CONFIG_OPROFILE_NMI_TIMER=y
+# CONFIG_OPTIMIZE_INLINING is not set
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PARAVIRT_GUEST is not set
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_GOANY=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCSPKR_PLATFORM=y
+# CONFIG_PDA_POWER is not set
+CONFIG_PERF_EVENTS=y
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_POWER_SUPPLY=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+# CONFIG_RELOCATABLE is not set
+CONFIG_RTC_CLASS=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SAMSUNG_Q10 is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCSI=y
+CONFIG_SCx200=y
+CONFIG_SCx200HR_TIMER=y
+# CONFIG_SCx200_GPIO is not set
+# CONFIG_SCx200_WDT is not set
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_CT82C710 is not set
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_TELCLOCK is not set
+CONFIG_THERMAL=y
+# CONFIG_TOSHIBA is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_UID16=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+# CONFIG_USER_NS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+# CONFIG_VIA_WDT is not set
+CONFIG_VM86=y
+# CONFIG_VMWARE_BALLOON is not set
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_WAFER_WDT is not set
+CONFIG_X86=y
+CONFIG_X86_32=y
+# CONFIG_X86_32_IRIS is not set
+CONFIG_X86_32_LAZY_GS=y
+# CONFIG_X86_64 is not set
+CONFIG_X86_ALIGNMENT_16=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_BSWAP=y
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CMPXCHG=y
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# CONFIG_X86_CPUID is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_F00F_BUG=y
+CONFIG_X86_GENERIC=y
+# CONFIG_X86_GX_SUSPMOD is not set
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_INVD_BUG=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_LOCAL_APIC=y
+# CONFIG_X86_LONGRUN is not set
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+# CONFIG_X86_PAE is not set
+CONFIG_X86_PAT=y
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_X86_POPAD_OK=y
+# CONFIG_X86_POWERNOW_K6 is not set
+# CONFIG_X86_POWERNOW_K7 is not set
+CONFIG_X86_PPRO_FENCE=y
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_XADD=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_X86=y
+# CONFIG_ZONE_DMA32 is not set
diff --git a/trunk/target/linux/x86/ep80579/config-3.3 b/trunk/target/linux/x86/ep80579/config-3.3
new file mode 100644
index 00000000..78ee0ce7
--- /dev/null
+++ b/trunk/target/linux/x86/ep80579/config-3.3
@@ -0,0 +1,11 @@
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_HIGHMEM=y
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHPTE is not set
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_ITCO_WDT=y
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_MTD is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_SATA_AHCI=y
+# CONFIG_SQUASHFS is not set
diff --git a/trunk/target/linux/x86/ep80579/target.mk b/trunk/target/linux/x86/ep80579/target.mk
new file mode 100644
index 00000000..f4bd20a0
--- /dev/null
+++ b/trunk/target/linux/x86/ep80579/target.mk
@@ -0,0 +1,10 @@
+BOARDNAME:=Intel EP80579
+KERNEL_PATCHVER:=3.3
+DEFAULT_PACKAGES += kmod-ep80579-can kmod-ep80579-eth kmod-ep80579-misc \
+			kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-uhci
+
+define Target/Description
+	Build firmware images for Intel EP80579 based boards
+	(e.g : ADI Engineering Ocracoke Island)
+endef
+
diff --git a/trunk/target/linux/x86/generic/config-default b/trunk/target/linux/x86/generic/config-default
new file mode 100644
index 00000000..70a099e8
--- /dev/null
+++ b/trunk/target/linux/x86/generic/config-default
@@ -0,0 +1,190 @@
+# CONFIG_3C515 is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+# CONFIG_ACPI_CMPC is not set
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DOCK is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_PROCESSOR=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_SBS is not set
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_VIDEO=y
+# CONFIG_ACPI_WMI is not set
+CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_AMD64 is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_EFFICEON is not set
+CONFIG_AGP_INTEL=y
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+# CONFIG_APPLE_GMUX is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_APPLE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_DMI=y
+# CONFIG_DMIID is not set
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+# CONFIG_DMI_SYSFS is not set
+CONFIG_DRM=y
+# CONFIG_DRM_AST is not set
+CONFIG_DRM_BOCHS=y
+# CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_GMA500 is not set
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I810 is not set
+CONFIG_DRM_I915=y
+CONFIG_DRM_I915_FBDEV=y
+CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+# CONFIG_DRM_I915_UMS is not set
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_SAVAGE is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_TDFX is not set
+CONFIG_DRM_TTM=y
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_VIA is not set
+# CONFIG_DRM_VMWGFX is not set
+# CONFIG_EFI is not set
+# CONFIG_EISA is not set
+# CONFIG_EL3 is not set
+CONFIG_FB=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_I810 is not set
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_VESA is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x16=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FUJITSU_LAPTOP is not set
+# CONFIG_GEOS is not set
+CONFIG_HDMI=y
+CONFIG_HID=y
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+# CONFIG_HP_ACCEL is not set
+CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INTEL_GTT=y
+CONFIG_INTEL_IDLE=y
+# CONFIG_INTEL_IPS is not set
+# CONFIG_INTEL_MENLOW is not set
+CONFIG_ISA=y
+CONFIG_ISAPNP=y
+# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISO9660_FS=y
+# CONFIG_JOLIET is not set
+# CONFIG_LANCE is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
+# CONFIG_MDA_CONSOLE is not set
+# CONFIG_MIXCOMWD is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+CONFIG_NLS=y
+CONFIG_NO_HZ=y
+# CONFIG_PANASONIC_LAPTOP is not set
+CONFIG_PATA_AMD=y
+CONFIG_PATA_LEGACY=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_PLATFORM=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_VIA=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCWATCHDOG is not set
+CONFIG_PNP=y
+CONFIG_PNPACPI=y
+# CONFIG_PNPBIOS is not set
+CONFIG_PNP_DEBUG_MESSAGES=y
+# CONFIG_PVPANIC is not set
+# CONFIG_SAMSUNG_Q10 is not set
+CONFIG_SATA_AHCI=y
+# CONFIG_SCx200_ACB is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+CONFIG_USB_STORAGE=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_WDT is not set
+# CONFIG_X86_ACPI_CPUFREQ is not set
+# CONFIG_X86_E_POWERSAVER is not set
+# CONFIG_X86_INTEL_LPSS is not set
+# CONFIG_X86_LONGHAUL is not set
+# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_PM_TIMER=y
+# CONFIG_XO15_EBOOK is not set
diff --git a/trunk/target/linux/x86/generic/profiles/000-Generic.mk b/trunk/target/linux/x86/generic/profiles/000-Generic.mk
new file mode 100644
index 00000000..3e8aa504
--- /dev/null
+++ b/trunk/target/linux/x86/generic/profiles/000-Generic.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Generic
+  NAME:=Generic
+  PACKAGES:=kmod-3c59x kmod-natsemi kmod-ne2k-pci \
+	kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 \
+	kmod-via-rhine kmod-via-velocity
+endef
+
+define Profile/Generic/Description
+	Generic Profile
+endef
+$(eval $(call Profile,Generic))
diff --git a/trunk/target/linux/x86/generic/profiles/Soekris45xx.mk b/trunk/target/linux/x86/generic/profiles/Soekris45xx.mk
new file mode 100644
index 00000000..d1d88c6f
--- /dev/null
+++ b/trunk/target/linux/x86/generic/profiles/Soekris45xx.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Soekris45xx
+  NAME:=Soekris Net45xx
+  PACKAGES:=kmod-natsemi kmod-leds-net48xx kmod-wdt-sc520
+endef
+
+define Profile/Soekris45xx/Description
+        Package set compatible with the Soekris Net45xx. Net4511 and 4521 need PCMCIA Cardbus support. Please add manually.
+endef
+$(eval $(call Profile,Soekris45xx))
diff --git a/trunk/target/linux/x86/generic/profiles/Soekris48xx.mk b/trunk/target/linux/x86/generic/profiles/Soekris48xx.mk
new file mode 100644
index 00000000..66bafbfe
--- /dev/null
+++ b/trunk/target/linux/x86/generic/profiles/Soekris48xx.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Soekris48xx
+  NAME:=Soekris Net48xx
+  PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-net48xx kmod-gpio-scx200 kmod-wdt-scx200 kmod-hwmon-pc87360
+endef
+
+define Profile/Soekris48xx/Description
+        Package set compatible with the Soekris Net4801. Contains I2C/LEDS/GPIO/Sensors support
+endef
+$(eval $(call Profile,Soekris48xx))
diff --git a/trunk/target/linux/x86/generic/profiles/Wrap.mk b/trunk/target/linux/x86/generic/profiles/Wrap.mk
new file mode 100644
index 00000000..62532ac8
--- /dev/null
+++ b/trunk/target/linux/x86/generic/profiles/Wrap.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2006,2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Wrap
+  NAME:=PCEngines WRAP
+  PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-wrap kmod-gpio-scx200 kmod-wdt-scx200 kmod-hwmon-pc87360
+endef
+
+define Profile/Wrap/Description
+	Package set compatible with the PCEngines WRAP. Contains I2C/LEDS/GPIO/Sensors support
+endef
+$(eval $(call Profile,Wrap))
diff --git a/trunk/target/linux/x86/generic/target.mk b/trunk/target/linux/x86/generic/target.mk
new file mode 100644
index 00000000..7191292e
--- /dev/null
+++ b/trunk/target/linux/x86/generic/target.mk
@@ -0,0 +1,7 @@
+BOARDNAME:=Generic
+
+define Target/Description
+	Build firmware images for x86 based boards
+	(e.g : Soekris, ...)
+endef
+
diff --git a/trunk/target/linux/x86/geos/base-files/etc/config/network b/trunk/target/linux/x86/geos/base-files/etc/config/network
new file mode 100644
index 00000000..d12d5280
--- /dev/null
+++ b/trunk/target/linux/x86/geos/base-files/etc/config/network
@@ -0,0 +1,53 @@
+# Copyright (C) 2011 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface lan
+	option ifname	"eth0 eth1"
+	option type 	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+	option ip6assign 60
+
+config atm-bridge
+	option unit	0
+	option atmdev	0
+	option vpi	0
+	option vci	35
+	option encaps	llc
+	option payload	bridged
+	option sendsize	2040
+
+config interface wan
+	option proto	dhcp
+	option ifname	nas0
+	# clone your eth0 address here
+	# option macaddr '00:0A:FA:22:00:80'
+
+config interface wan6
+	option ifname   nas0
+	option proto    dhcpv6
+
+config globals globals
+	option ula_prefix auto
+
+
+# 2nd interface on Geos2
+#config interface wan
+#	option proto	pppoa
+#	option atmdev	1
+#	option vpi	8
+#	option vci	32
+#	option encaps	vc
+#	option username	'username@myisp.net'
+#	option password 'password'
+#	option keepalive	3
+#	option defaultroute	1
+#	option peerdns	1
+#	option pppd_options	'kdebug 1 debug noccp'
+
diff --git a/trunk/target/linux/x86/geos/base-files/etc/config/system b/trunk/target/linux/x86/geos/base-files/etc/config/system
new file mode 100644
index 00000000..f24cedb8
--- /dev/null
+++ b/trunk/target/linux/x86/geos/base-files/etc/config/system
@@ -0,0 +1,30 @@
+
+config system
+	option hostname	libreCMC
+	option timezone	UTC
+
+config timeserver ntp
+	list server	0.librecmc.pool.ntp.org
+	list server	1.librecmc.pool.ntp.org
+	list server	2.librecmc.pool.ntp.org
+	list server	3.librecmc.pool.ntp.org
+
+config led
+	option default	0
+	option name	LAN
+	option sysfs	'geos:1'
+	option trigger	netdev
+	option mode	'tx rx'
+	option dev	'br-lan'
+
+config led
+	option default	0
+	option name	WiFi
+	option sysfs	'geos:2'
+	option trigger	'phy0tpt'
+
+config led
+	option default	0
+	option name	Health
+	option sysfs	'geos:3'
+	option trigger	'heartbeat'
diff --git a/trunk/target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot b/trunk/target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot
new file mode 100644
index 00000000..bf893c15
--- /dev/null
+++ b/trunk/target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+logger -t button -p daemon.info "$BUTTON/$ACTION"
+
+case "$BUTTON/$ACTION" in
+
+reset/released)
+  reboot -f
+  ;;
+
+esac
+
+exit 0
diff --git a/trunk/target/linux/x86/geos/config-default b/trunk/target/linux/x86/geos/config-default
new file mode 100644
index 00000000..66ae2c7a
--- /dev/null
+++ b/trunk/target/linux/x86/geos/config-default
@@ -0,0 +1,24 @@
+# CONFIG_ATA_PIIX is not set
+CONFIG_DMI=y
+CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
+CONFIG_GEOS=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_HWMON=y
+# CONFIG_ISDN is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
+# CONFIG_M486 is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MGEODE_LX=y
+CONFIG_NLS=y
+CONFIG_PATA_CS5536=y
+CONFIG_PCI_LABEL=y
+# CONFIG_SCx200 is not set
+CONFIG_THERMAL_HWMON=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_3DNOW=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/trunk/target/linux/x86/geos/target.mk b/trunk/target/linux/x86/geos/target.mk
new file mode 100644
index 00000000..d036ef68
--- /dev/null
+++ b/trunk/target/linux/x86/geos/target.mk
@@ -0,0 +1,34 @@
+BOARDNAME:=Traverse Geos
+FEATURES:=squashfs ext4 pci usb gpio broken
+DEFAULT_PACKAGES += \
+            kmod-crypto-hw-geode kmod-crypto-ocf \
+            kmod-gpio-cs5535-new kmod-gpio-nsc \
+            kmod-wdt-geode kmod-cs5535-clockevt kmod-cs5535-mfgpt \
+            kmod-cs5536 \
+            kmod-hwmon-core kmod-hwmon-lm90 \
+            kmod-8139cp kmod-solos-pci kmod-sched \
+            kmod-i2c-core kmod-i2c-gpio \
+            kmod-i2c-algo-bit kmod-i2c-algo-pca kmod-i2c-algo-pcf \
+            kmod-i2c-scx200-acb \
+            kmod-usb-core kmod-usb2 kmod-usb-ohci \
+            kmod-cfg80211 kmod-mac80211 \
+            kmod-mppe kmod-pppoa kmod-pppol2tp \
+            kmod-ath5k kmod-ath9k \
+            kmod-leds-gpio kmod-input-gpio-keys-polled \
+            kmod-button-hotplug \
+            kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
+            kmod-ledtrig-netdev \
+            kmod-cpu-msr \
+            soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \
+            hwclock wpad flashrom tc
+CS5535_MASK:=0x0E000048
+
+CPU_TYPE := geode
+
+define Target/Description
+    Build firmware images for Traverse Geos board
+endef
+
+define KernelPackage/gpio-cs5535-new/install
+     sed -i -r -e 's/$$$$$$$$/ mask=$(CS5535_MASK)/' $(1)/etc/modules.d/??-gpio-cs5535-new
+endef
diff --git a/trunk/target/linux/x86/image/Config.in b/trunk/target/linux/x86/image/Config.in
new file mode 100644
index 00000000..d2ef9fb7
--- /dev/null
+++ b/trunk/target/linux/x86/image/Config.in
@@ -0,0 +1,20 @@
+config X86_ETHERBOOT_IMAGES
+	bool "Build Etherboot image"
+	depends on TARGET_x86_thincan_DBE61
+	default y
+	help
+	  Builds network bootable image for ThinCan DBE61 (Etherboot BIOS)
+
+config X86_ETHERBOOT_BOOTOPTS
+	string "Extra kernel boot options"
+	depends on X86_ETHERBOOT_IMAGES
+	default "ip=dhcp nbdport=2000 " if TARGET_ROOTFS_SQUASHFS
+	default "ip=dhcp root=/dev/nfs nfsroot=192.168.0.1:/srv/dbe61"
+	help
+	  Kernel arguments to pass to the kernel eg. NFS root location etc.
+
+config OLPC_BOOTSCRIPT_IMAGES
+	bool "Build images with bootscript"
+	depends on TARGET_x86_olpc
+	depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+	default TARGET_x86_olpc
diff --git a/trunk/target/linux/x86/image/Makefile b/trunk/target/linux/x86/image/Makefile
new file mode 100644
index 00000000..59837180
--- /dev/null
+++ b/trunk/target/linux/x86/image/Makefile
@@ -0,0 +1,267 @@
+# 
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+
+export PATH=$(TARGET_PATH):/sbin
+
+GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
+GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga
+GRUB_TERMINALS =
+GRUB_SERIAL_CONFIG =
+GRUB_TERMINAL_CONFIG =
+GRUB_CONSOLE_CMDLINE =
+
+USE_ATKBD = generic kvm_guest
+
+ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget)))),)
+  GRUB2_MODULES += at_keyboard
+  GRUB2_MODULES_ISO += at_keyboard
+endif
+
+ifneq ($(CONFIG_GRUB_CONSOLE),)
+  GRUB_CONSOLE_CMDLINE += console=tty0
+  GRUB_TERMINALS += console
+endif
+
+GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL))
+
+ifneq ($(GRUB_SERIAL),)
+  GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8
+  GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_GRUB_BAUDRATE) --word=8 --parity=no --stop=1
+  GRUB_TERMINALS += serial
+endif
+
+ifneq ($(GRUB_TERMINALS),)
+  GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS)
+endif
+
+ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
+
+GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT))
+
+ifneq ($(CONFIG_GRUB_IMAGES),)
+
+  BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS))
+
+  define Image/cmdline/ext4
+    root=$(ROOTPART) rootfstype=ext4 rootwait
+  endef
+
+  define Image/cmdline/jffs2-64k
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait
+  endef
+
+  define Image/cmdline/jffs2-128k
+    block2mtd.block2mtd=$(ROOTPART),131072,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait
+  endef
+
+  define Image/cmdline/squashfs
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=squashfs rootwait
+  endef
+
+  define Image/Build/grub2
+	# left here because the image builder doesnt need these
+	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	grub-mkimage \
+		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
+		-o $(KDIR)/grub2/core.img \
+		-O i386-pc \
+		-c ./grub-early.cfg \
+		$(GRUB2_MODULES)
+	$(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/
+	echo '(hd0) $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img' > $(KDIR)/grub2/device.map
+	sed \
+		-e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
+		-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
+		-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
+		-e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
+		./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
+	PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_generic.sh \
+		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+		$(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \
+		$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
+		256
+	grub-bios-setup \
+		--device-map="$(KDIR)/grub2/device.map" \
+		-d "$(KDIR)/grub2" \
+		-r "hd0,msdos1" \
+		"$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img"
+	$(call Image/Build/grub/$(1))
+  endef
+endif
+
+ROOTDELAY=10
+
+ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
+
+  define Image/cmdline/ext4
+    root=$(ROOTPART) rootfstype=ext4 rootwait
+  endef
+
+  define Image/cmdline/jffs2-64k
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootdelay=$(ROOTDELAY)
+  endef
+
+  define Image/cmdline/jffs2-128k
+    block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootdelay=$(ROOTDELAY)
+  endef
+
+  define Image/cmdline/squashfs
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootdelay=$(ROOTDELAY)
+  endef
+
+  define Image/Build/bootscript
+	# left here because the image builder doesnt need these
+	$(INSTALL_DIR) $(KDIR)/root.bootscript/boot
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz
+	sed -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
+		./olpc.fth > $(KDIR)/root.bootscript/boot/olpc.fth
+	PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \
+		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+		$(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.bootscript \
+		$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
+  endef
+
+endif
+
+define Image/Build/squashfs
+	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+endef
+
+define Image/Build/iso
+	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	grub-mkimage \
+		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
+		-o $(KDIR)/grub2/eltorito.img \
+		-O i386-pc \
+		-c ./grub-early.cfg \
+		$(GRUB2_MODULES_ISO)
+	cat \
+		$(STAGING_DIR_HOST)/lib/grub/i386-pc/cdboot.img \
+		$(KDIR)/grub2/eltorito.img \
+		> $(KDIR)/root.grub/boot/grub/eltorito.img
+	sed \
+		-e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
+		-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
+		-e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
+		-e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
+		./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \
+		-o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR)
+endef
+
+ifneq ($(CONFIG_VDI_IMAGES),)
+  define Image/Build/vdi
+	rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
+	qemu-img convert -f raw -O vdi \
+		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
+	# XXX: VBoxManage insists on setting perms to 0600
+	chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
+  endef
+endif
+
+ifneq ($(CONFIG_VMDK_IMAGES),)
+  define Image/Build/vmdk
+	rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
+	qemu-img convert -f raw -O vmdk \
+		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
+  endef
+endif
+
+define Image/Build/gzip
+	gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
+	gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+endef
+
+ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
+  define Image/Build/gzip/ext4
+	$(call Image/Build/gzip,ext4)
+  endef
+  ifneq ($(CONFIG_TARGET_IMAGES_PAD),)
+    define Image/Build/gzip/squashfs
+	$(call Image/Build/gzip,squashfs)
+    endef
+    define Image/Build/gzip/jffs2-64k
+	$(call Image/Build/gzip,jffs2-64k)
+    endef
+    define Image/Build/gzip/jffs2-128k
+	$(call Image/Build/gzip,jffs2-128k)
+    endef
+  endif
+endif
+
+define Image/BuildKernel
+	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
+  ifneq ($(CONFIG_X86_ETHERBOOT_IMAGES),)
+	rm -f $(BIN_DIR)/$(IMG_PREFIX)-etherboot
+	$(STAGING_DIR_HOST)/bin/mkelfImage \
+		--append=$(CONFIG_X86_ETHERBOOT_BOOTOPTS) \
+		$(KDIR)/bzImage \
+		$(BIN_DIR)/$(IMG_PREFIX)-etherboot
+  endif
+endef
+
+define Image/Build/Profile/ar525w
+	cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+	$(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32
+	$(STAGING_DIR_HOST)/bin/airlink -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w.img
+	$(STAGING_DIR_HOST)/bin/airlink -e -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w-web.img
+endef
+
+define Image/Build/Profile/sitecom
+	cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+	#32k config data + 20 bytes header + 2 bytes checksum after kernel image
+	$(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32790
+	$(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage.tmp > $(KDIR)/tmp.img
+	cat $(KDIR)/root.$(1) >> $(KDIR)/tmp.img
+	cp $(KDIR)/tmp.img $(BIN_DIR)/$(IMG_PREFIX)-$(1)-sitecom.img
+	rm $(KDIR)/tmp.img $(KDIR)/bzImage.tmp
+endef
+
+define Image/Build/Profile/bifferboard
+	$(TOPDIR)/target/linux/rdc/image/mkimg_bifferboard.py $(KDIR)/bzImage $(KDIR)/root.$(1) \
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1)-bifferboard.img
+endef
+
+define Image/Prepare
+	$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
+	$(call Image/Prepare/bootscript)
+	$(call Image/Prepare/grub2)
+endef
+
+define Image/Build/Initramfs
+	$(CP) $(KDIR)/bzImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-ramfs.bzImage
+endef
+
+define Image/Build
+	$(call Image/Build/$(1))
+	$(call Image/Build/bootscript,$(1))
+  ifneq ($(1),iso)
+	$(call Image/Build/grub2,$(1))
+	$(call Image/Build/vdi,$(1))
+	$(call Image/Build/vmdk,$(1))
+	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+  else
+	$(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso
+  endif
+	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
+	$(call Image/Build/gzip/$(1))
+	$(call Image/Build/Profile/$(PROFILE),$(1))
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+	$(call Image/Build/Initramfs)
+endif
+endef
+
+$(eval $(call BuildImage))
diff --git a/trunk/target/linux/x86/image/gen_image_generic.sh b/trunk/target/linux/x86/image/gen_image_generic.sh
new file mode 100755
index 00000000..9d11efbb
--- /dev/null
+++ b/trunk/target/linux/x86/image/gen_image_generic.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (C) 2006-2012 OpenWrt.org
+set -x
+[ $# == 5 -o $# == 6 ] || {
+    echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]"
+    exit 1
+}
+
+OUTPUT="$1"
+KERNELSIZE="$2"
+KERNELDIR="$3"
+ROOTFSSIZE="$4"
+ROOTFSIMAGE="$5"
+ALIGN="$6"
+
+rm -f "$OUTPUT"
+
+head=16
+sect=63
+cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
+
+# create partition table
+set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN}`
+
+KERNELOFFSET="$(($1 / 512))"
+KERNELSIZE="$(($2 / 512))"
+ROOTFSOFFSET="$(($3 / 512))"
+ROOTFSSIZE="$(($4 / 512))"
+
+BLOCKS="$((($KERNELSIZE / 2) - 1))"
+
+[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
+dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
+
+[ -n "$NOGRUB" ] && exit 0
+
+genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel"
+dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
+rm -f "$OUTPUT.kernel"
diff --git a/trunk/target/linux/x86/image/gen_image_olpc.sh b/trunk/target/linux/x86/image/gen_image_olpc.sh
new file mode 100755
index 00000000..82bc4ed9
--- /dev/null
+++ b/trunk/target/linux/x86/image/gen_image_olpc.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Copyright (C) 2006-2010 OpenWrt.org
+set -x 
+[ $# == 5 ] || {
+    echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image>"
+    exit 1
+}
+
+OUTPUT="$1"
+KERNELSIZE="$2"
+KERNELDIR="$3"
+ROOTFSSIZE="$4"
+ROOTFSIMAGE="$5"
+
+rm -f "$OUTPUT"
+
+head=16
+sect=63
+cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
+
+# create partition table
+set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m`
+
+KERNELOFFSET="$(($1 / 512))"
+KERNELSIZE="$(($2 / 512))"
+ROOTFSOFFSET="$(($3 / 512))"
+ROOTFSSIZE="$(($4 / 512))"
+
+BLOCKS="$((($KERNELSIZE / 2) - 1))"
+
+genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel"
+dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
+[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
+dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
+rm -f "$OUTPUT.kernel"
diff --git a/trunk/target/linux/x86/image/grub-early.cfg b/trunk/target/linux/x86/image/grub-early.cfg
new file mode 100644
index 00000000..4a5b5a60
--- /dev/null
+++ b/trunk/target/linux/x86/image/grub-early.cfg
@@ -0,0 +1 @@
+configfile (hd0,msdos1)/boot/grub/grub.cfg
diff --git a/trunk/target/linux/x86/image/grub-iso.cfg b/trunk/target/linux/x86/image/grub-iso.cfg
new file mode 100644
index 00000000..6a494377
--- /dev/null
+++ b/trunk/target/linux/x86/image/grub-iso.cfg
@@ -0,0 +1,10 @@
+@SERIAL_CONFIG@
+@TERMINAL_CONFIG@
+
+set default="0"
+set timeout="@TIMEOUT@"
+set root='(cd)'
+
+menuentry "libreCMC" {
+	linux /boot/vmlinuz @CMDLINE@ noinitrd
+}
diff --git a/trunk/target/linux/x86/image/grub.cfg b/trunk/target/linux/x86/image/grub.cfg
new file mode 100644
index 00000000..e1c1c74f
--- /dev/null
+++ b/trunk/target/linux/x86/image/grub.cfg
@@ -0,0 +1,13 @@
+@SERIAL_CONFIG@
+@TERMINAL_CONFIG@
+
+set default="0"
+set timeout="@TIMEOUT@"
+set root='(hd0,msdos1)'
+
+menuentry "libreCMC" {
+	linux /boot/vmlinuz @CMDLINE@ noinitrd
+}
+menuentry "libreCMC (failsafe)" {
+	linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
+}
diff --git a/trunk/target/linux/x86/image/mkimg_bifferboard.py b/trunk/target/linux/x86/image/mkimg_bifferboard.py
new file mode 100755
index 00000000..5444abeb
--- /dev/null
+++ b/trunk/target/linux/x86/image/mkimg_bifferboard.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+"""
+   Create firmware for 4/8MB Bifferboards, suitable for uploading using
+   either bb_upload8.py or bb_eth_upload8.py
+"""
+
+import struct, sys
+
+# Increase the kmax value if the script gives errors about the kernel being 
+# too large.  You need to set the Biffboot kmax value to the same value you
+# use here.
+kmax = 0x10
+
+# No need to change this for 4MB devices, it's only used to tell you if 
+# the firmware is too large!
+flash_size = 0x800000
+
+# This is always the same, for 1MB, 4MB and 8MB devices
+config_extent = 0x6000
+
+kernel_extent = kmax * 0x10000
+
+if __name__ == "__main__":
+
+  if len(sys.argv) != 4:
+    print  "usage: mkimg_bifferboard.py <kernel> <rootfs> <output file>"
+    sys.exit(-1)
+    
+  bzimage = sys.argv[1]
+  rootfs = sys.argv[2]
+  target = sys.argv[3]
+
+  # Kernel first
+  fw = file(bzimage).read()
+  if len(fw) > (kernel_extent - config_extent):
+    raise IOError("Kernel too large")
+
+  # Pad up to end of kernel partition
+  while len(fw) < (kernel_extent - config_extent):
+    fw += "\xff"
+
+  fw += file(rootfs).read()
+
+  # Check length of total
+  if len(fw) > (flash_size - 0x10000 - config_extent):
+    raise IOError("Rootfs too large")
+
+  file(target,"wb").write(fw)
+  print "Firmware written to '%s'" % target
diff --git a/trunk/target/linux/x86/image/mkimg_sitecom.pl b/trunk/target/linux/x86/image/mkimg_sitecom.pl
new file mode 100755
index 00000000..cfd5e652
--- /dev/null
+++ b/trunk/target/linux/x86/image/mkimg_sitecom.pl
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+open (bzimg, @ARGV[0]);
+while (<bzimg>) { $i .= $_; }
+$i .= pack "v", -(unpack "%v*", $i); 
+print "CSYS";
+print pack("V", length($i));
+print pack("V", 0);
+print "WRRM";
+print pack("V", length($i));
+print $i;
diff --git a/trunk/target/linux/x86/image/olpc.fth b/trunk/target/linux/x86/image/olpc.fth
new file mode 100644
index 00000000..5914be66
--- /dev/null
+++ b/trunk/target/linux/x86/image/olpc.fth
@@ -0,0 +1,5 @@
+\ Boot script
+" u:\boot\vmlinuz" to boot-device
+" @CMDLINE@ noinitrd console=ttyS0,115200 console=tty0" to boot-file
+unfreeze
+boot
diff --git a/trunk/target/linux/x86/kvm_guest/config-default b/trunk/target/linux/x86/kvm_guest/config-default
new file mode 100644
index 00000000..792e62af
--- /dev/null
+++ b/trunk/target/linux/x86/kvm_guest/config-default
@@ -0,0 +1,87 @@
+CONFIG_ACPI=y
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+# CONFIG_ACPI_CMPC is not set
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DOCK is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_PROCESSOR=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_SBS is not set
+# CONFIG_ACPI_THERMAL is not set
+# CONFIG_ACPI_WMI is not set
+# CONFIG_ASUS_LAPTOP is not set
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_EEEPC_LAPTOP is not set
+# CONFIG_EFI is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
+# CONFIG_HOTPLUG_PCI_COMPAQ is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_IBM is not set
+CONFIG_HOTPLUG_PCI_PCIE=y
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+# CONFIG_HPET is not set
+# CONFIG_HP_ACCEL is not set
+CONFIG_HVC_DRIVER=y
+# CONFIG_HW_RANDOM_VIRTIO is not set
+CONFIG_HYPERVISOR_GUEST=y
+# CONFIG_INTEL_IPS is not set
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_KVM is not set
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_KVM_GUEST=y
+# CONFIG_LGUEST is not set
+# CONFIG_LGUEST_GUEST is not set
+CONFIG_NLS=y
+CONFIG_NO_HZ=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PNP=y
+CONFIG_PNPACPI=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+# CONFIG_PVPANIC is not set
+# CONFIG_SAMSUNG_Q10 is not set
+# CONFIG_SCSI_VIRTIO is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_VHOST_NET is not set
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_CONSOLE=y
+# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_VMWARE_BALLOON is not set
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_X86_ACPI_CPUFREQ is not set
+# CONFIG_X86_E_POWERSAVER is not set
+# CONFIG_X86_GENERIC is not set
+# CONFIG_X86_INTEL_LPSS is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=4
+CONFIG_X86_L1_CACHE_SHIFT=4
+# CONFIG_X86_LONGHAUL is not set
+# CONFIG_X86_PAT is not set
+# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_PM_TIMER=y
+# CONFIG_X86_PPRO_FENCE is not set
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+# CONFIG_XO15_EBOOK is not set
diff --git a/trunk/target/linux/x86/kvm_guest/target.mk b/trunk/target/linux/x86/kvm_guest/target.mk
new file mode 100644
index 00000000..d3f950fe
--- /dev/null
+++ b/trunk/target/linux/x86/kvm_guest/target.mk
@@ -0,0 +1,3 @@
+BOARDNAME:=KVM Guest
+FEATURES:=ext4 pci usb
+DEFAULT_PACKAGES += kmod-virtio-balloon kmod-virtio-net kmod-virtio-random
diff --git a/trunk/target/linux/x86/modules.mk b/trunk/target/linux/x86/modules.mk
new file mode 100644
index 00000000..f8cb3a7c
--- /dev/null
+++ b/trunk/target/linux/x86/modules.mk
@@ -0,0 +1,330 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define KernelPackage/cs5535
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=NSC/AMD CS5535 chipset support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_BLK_DEV_CS5535
+  FILES=$(LINUX_DIR)/drivers/ide/cs5535.ko
+  AUTOLOAD:=$(call AutoLoad,30,cs5535,1)
+  $(call AddDepends/ide)
+endef
+
+define KernelPackage/cs5535/description
+  Kernel module for the NSC/AMD CS5535 companion chip
+endef
+
+$(eval $(call KernelPackage,cs5535))
+
+
+define KernelPackage/cs5536
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=AMD CS5536 chipset support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_BLK_DEV_CS5536
+  FILES=$(LINUX_DIR)/drivers/ide/cs5536.ko
+  AUTOLOAD:=$(call AutoLoad,30,cs5536,1)
+  $(call AddDepends/ide)
+endef
+
+define KernelPackage/cs5536/description
+  Kernel module for the AMD CS5536 Geode LX companion chip
+endef
+
+$(eval $(call KernelPackage,cs5536))
+
+
+define KernelPackage/pata-cs5535
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=CS5535 PATA support
+  DEPENDS:=@TARGET_x86 @PCI_SUPPORT
+  KCONFIG:=CONFIG_PATA_CS5535
+  FILES=$(LINUX_DIR)/drivers/ata/pata_cs5535.ko
+  AUTOLOAD:=$(call AutoLoad,30,pata_cs5535,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/pata-cs5535/description
+  Kernel module for the NSC/AMD CS5535 companion chip
+endef
+
+$(eval $(call KernelPackage,pata-cs5535))
+
+
+define KernelPackage/pata-cs5536
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=CS5536 PATA support
+  DEPENDS:=@TARGET_x86 @PCI_SUPPORT
+  KCONFIG:=CONFIG_PATA_CS5536
+  FILES=$(LINUX_DIR)/drivers/ata/pata_cs5536.ko
+  AUTOLOAD:=$(call AutoLoad,30,pata_cs5536,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/pata-cs5536/description
+  Kernel module for the AMD CS5536 Geode LX companion chip
+endef
+
+$(eval $(call KernelPackage,pata-cs5536))
+
+
+define KernelPackage/cpu-msr
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=x86 CPU MSR support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_X86_MSR
+  FILES:=$(LINUX_DIR)/arch/x86/kernel/msr.ko
+  AUTOLOAD:=$(call AutoLoad,20,msr)
+endef
+
+define KernelPackage/cpu-msr/description
+ Kernel module for Model Specific Registers support in x86 CPUs
+endef
+
+$(eval $(call KernelPackage,cpu-msr))
+
+define KernelPackage/gpio-cs5535-new
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=AMD CS5535/CS5536 GPIO driver with improved sysfs support
+  DEPENDS:=@TARGET_x86 +kmod-cs5535-mfd
+  KCONFIG:=CONFIG_GPIO_CS5535
+  FILES:=$(LINUX_DIR)/drivers/gpio/gpio-cs5535.ko
+  AUTOLOAD:=$(call AutoLoad,50,gpio-cs5535)
+endef
+
+define KernelPackage/gpio-cs5535-new/description
+ This package contains the new AMD CS5535/CS5536 GPIO driver
+endef
+
+$(eval $(call KernelPackage,gpio-cs5535-new))
+
+define KernelPackage/gpio-nsc
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Natsemi GPIO support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_NSC_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
+endef
+
+define KernelPackage/gpio-nsc/description
+ Kernel module for Natsemi GPIO
+endef
+
+$(eval $(call KernelPackage,gpio-nsc))
+
+
+define KernelPackage/gpio-pc8736x
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PC8736x GPIO support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-nsc
+  KCONFIG:=CONFIG_PC8736x_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/pc8736x_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,40,pc8736x_gpio)
+endef
+
+define KernelPackage/gpio-pc8736x/description
+ Kernel module for PC8736x GPIO
+endef
+
+$(eval $(call KernelPackage,gpio-pc8736x))
+
+
+define KernelPackage/gpio-scx200
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Natsemi SCX200 GPIO support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-nsc
+  KCONFIG:=CONFIG_SCx200_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
+endef
+
+define KernelPackage/gpio-scx200/description
+ Kernel module for SCX200 GPIO
+endef
+
+$(eval $(call KernelPackage,gpio-scx200))
+
+define KernelPackage/wdt-geode
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Geode/LX Watchdog timer
+  DEPENDS:=@TARGET_x86 +kmod-cs5535-mfgpt
+  KCONFIG:=CONFIG_GEODE_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,geodewdt)
+endef
+
+define KernelPackage/wdt-geode/description
+  Kernel module for Geode watchdog timer.
+endef
+
+$(eval $(call KernelPackage,wdt-geode))
+
+
+define KernelPackage/cs5535-clockevt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CS5535/CS5536 high-res timer (MFGPT) events
+  DEPENDS:=@TARGET_x86 +kmod-cs5535-mfgpt
+  KCONFIG:=CONFIG_CS5535_CLOCK_EVENT_SRC
+  FILES:=$(LINUX_DIR)/drivers/clocksource/cs5535-clockevt.ko
+  AUTOLOAD:=$(call AutoLoad,50,cs5535-clockevt)
+endef
+
+define KernelPackage/cs5535-clockevt/description
+  Kernel module for CS5535/6 high-res clock event source
+endef
+
+$(eval $(call KernelPackage,cs5535-clockevt))
+
+
+define KernelPackage/cs5535-mfgpt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CS5535/6 Multifunction General Purpose Timer
+  DEPENDS:=@TARGET_x86 +kmod-cs5535-mfd
+  KCONFIG:=CONFIG_CS5535_MFGPT
+  FILES:=$(LINUX_DIR)/drivers/misc/cs5535-mfgpt.ko
+  AUTOLOAD:=$(call AutoLoad,45,cs5535-mfgpt)
+endef
+
+define KernelPackage/cs5535-mfgpt/description
+  Kernel module for CS5535/6 multifunction general purpose timer.
+endef
+
+$(eval $(call KernelPackage,cs5535-mfgpt))
+
+
+define KernelPackage/cs5535-mfd
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CS5535/6 Multifunction General Purpose Driver
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_MFD_CS5535
+  FILES:= \
+  	$(LINUX_DIR)/drivers/mfd/mfd-core.ko \
+  	$(LINUX_DIR)/drivers/mfd/cs5535-mfd.ko
+  AUTOLOAD:=$(call AutoLoad,44,mfd-core cs5535-mfd)
+endef
+
+define KernelPackage/cs5535-mfd/description
+  Core driver for CS5535/CS5536 MFD functions.
+endef
+
+$(eval $(call KernelPackage,cs5535-mfd))
+
+define KernelPackage/wdt-sc520
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Natsemi SC520 Watchdog support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SC520_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sc520_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,sc520_wdt)
+endef
+
+define KernelPackage/wdt-sc520/description
+  Kernel module for SC520 Watchdog
+endef
+
+$(eval $(call KernelPackage,wdt-sc520))
+
+
+define KernelPackage/wdt-scx200
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Natsemi SCX200 Watchdog support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SCx200_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
+endef
+
+define KernelPackage/wdt-scx200/description
+ Kernel module for SCX200 Watchdog
+endef
+
+$(eval $(call KernelPackage,wdt-scx200))
+
+I2C_SCX200_MODULES:=\
+  CONFIG_SCx200_I2C:drivers/i2c/busses/scx200_i2c
+
+define KernelPackage/i2c-scx200
+  $(call i2c_defaults,$(I2C_SCX200_MODULES),59)
+  TITLE:=Geode SCx200 I2C using GPIO pins
+  DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-algo-bit
+  KCONFIG+= \
+	CONFIG_SCx200_I2C_SCL=12 \
+	CONFIG_SCx200_I2C_SDA=13
+endef
+
+define KernelPackage/i2c-scx200/description
+ Kernel module for I2C using GPIO pins on the Geode SCx200 processors.
+endef
+
+$(eval $(call KernelPackage,i2c-scx200))
+
+
+I2C_SCX200_ACB_MODULES:=\
+  CONFIG_SCx200_ACB:drivers/i2c/busses/scx200_acb
+
+define KernelPackage/i2c-scx200-acb
+  $(call i2c_defaults,$(I2C_SCX200_ACB_MODULES),59)
+  TITLE:=Geode SCx200 ACCESS.bus support
+  DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-algo-bit
+endef
+
+define KernelPackage/i2c-scx200-acb/description
+ Kernel module for I2C using the ACCESS.bus controllers on the Geode SCx200
+ and SC1100 processors and the CS5535 and CS5536 Geode companion devices.
+endef
+
+$(eval $(call KernelPackage,i2c-scx200-acb))
+
+
+define KernelPackage/leds-wrap
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=PCengines WRAP LED support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-scx200
+  KCONFIG:=CONFIG_LEDS_WRAP
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.ko
+  AUTOLOAD:=$(call AutoLoad,50,leds-wrap)
+endef
+
+define KernelPackage/leds-wrap/description
+ Kernel module for PCengines WRAP LEDs
+endef
+
+$(eval $(call KernelPackage,leds-wrap))
+
+
+define KernelPackage/leds-net48xx
+  SUBMENU:=$(LEDS_MENU)
+  TITLE:=Soekris Net48xx LED support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-scx200
+  KCONFIG:=CONFIG_LEDS_NET48XX
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.ko
+  AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
+endef
+
+define KernelPackage/leds-net48xx/description
+ Kernel module for Soekris Net48xx LEDs
+endef
+
+$(eval $(call KernelPackage,leds-net48xx))
+
+define KernelPackage/rdc321x-wdt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RDC321x watchdog
+  DEPENDS:=@TARGET_x86_rdc
+  KCONFIG:=CONFIG_RDC321X_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,rdc321x_wdt)
+endef
+
+define KernelPackage/rdc321x-wdt/description
+  RDC-321x watchdog driver
+endef
+
+$(eval $(call KernelPackage,rdc321x-wdt))
+
diff --git a/trunk/target/linux/x86/net5501/base-files/etc/config/network b/trunk/target/linux/x86/net5501/base-files/etc/config/network
new file mode 100644
index 00000000..4aa80965
--- /dev/null
+++ b/trunk/target/linux/x86/net5501/base-files/etc/config/network
@@ -0,0 +1,26 @@
+# Copyright (C) 2011 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface lan
+	option ifname	"eth1 eth2 eth3"
+	option type 	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+	option ip6assign 60
+
+config interface wan
+	option ifname	eth0
+	option proto	dhcp
+
+config interface wan6
+	option ifname   eth0
+	option proto    dhcpv6
+
+config globals globals
+	option ula_prefix auto
diff --git a/trunk/target/linux/x86/net5501/base-files/etc/config/system b/trunk/target/linux/x86/net5501/base-files/etc/config/system
new file mode 100644
index 00000000..556ca420
--- /dev/null
+++ b/trunk/target/linux/x86/net5501/base-files/etc/config/system
@@ -0,0 +1,16 @@
+config system
+	option hostname	libreCMC
+	option timezone	UTC
+
+config timeserver ntp
+	list server	0.librecmc.pool.ntp.org
+	list server	1.librecmc.pool.ntp.org
+	list server	2.librecmc.pool.ntp.org
+	list server	3.librecmc.pool.ntp.org
+
+config led
+	option default	1
+	option name	Heartbeat
+	option sysfs	'net5501:1'
+	option trigger	heartbeat
+
diff --git a/trunk/target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot b/trunk/target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot
new file mode 100644
index 00000000..bf893c15
--- /dev/null
+++ b/trunk/target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+logger -t button -p daemon.info "$BUTTON/$ACTION"
+
+case "$BUTTON/$ACTION" in
+
+reset/released)
+  reboot -f
+  ;;
+
+esac
+
+exit 0
diff --git a/trunk/target/linux/x86/net5501/config-default b/trunk/target/linux/x86/net5501/config-default
new file mode 100644
index 00000000..8b3b28b0
--- /dev/null
+++ b/trunk/target/linux/x86/net5501/config-default
@@ -0,0 +1,22 @@
+# CONFIG_ATA_PIIX is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_INTEL_MID is not set
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_HWMON=y
+# CONFIG_ISDN is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_M486 is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MGEODE_LX=y
+CONFIG_PATA_CS5536=y
+# CONFIG_SCx200 is not set
+CONFIG_THERMAL_HWMON=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_3DNOW=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
diff --git a/trunk/target/linux/x86/net5501/target.mk b/trunk/target/linux/x86/net5501/target.mk
new file mode 100644
index 00000000..e8a2bd81
--- /dev/null
+++ b/trunk/target/linux/x86/net5501/target.mk
@@ -0,0 +1,33 @@
+BOARDNAME:=Soekris net5501
+FEATURES:=squashfs ext4 pci usb gpio
+DEFAULT_PACKAGES += kmod-crypto-hw-geode kmod-crypto-ocf \
+			kmod-gpio-cs5535-new kmod-gpio-nsc \
+			kmod-wdt-geode kmod-cs5535-clockevt kmod-cs5535-mfgpt \
+			kmod-cs5536 \
+			kmod-hwmon-core kmod-hwmon-pc87360 kmod-gpio-pc8736x \
+			kmod-via-rhine kmod-solos-pci \
+			kmod-i2c-core kmod-i2c-gpio \
+			kmod-i2c-algo-bit kmod-i2c-algo-pca kmod-i2c-algo-pcf \
+			kmod-i2c-scx200-acb \
+			kmod-usb-core kmod-usb2 kmod-usb-ohci \
+			kmod-cfg80211 kmod-mac80211 \
+			kmod-mppe kmod-pppoe kmod-pppoa kmod-pppol2tp \
+			kmod-ath kmod-ath5k kmod-ath9k \
+			kmod-leds-gpio kmod-input-gpio-keys-polled \
+			kmod-button-hotplug \
+			kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
+			kmod-ledtrig-netdev \
+			kmod-cpu-msr \
+			hwclock wpad
+
+CS5535_MASK:=0x01000040
+
+CPU_TYPE := geode
+
+define Target/Description
+	Build firmware images for Soekris net5501 board
+endef
+
+define KernelPackage/gpio-cs5535-new/install
+	sed -i -r -e 's/$$$$$$$$/ mask=$(CS5535_MASK)/' $(1)/etc/modules.d/??-gpio-cs5535-new
+endef
diff --git a/trunk/target/linux/x86/olpc/base-files/etc/X11/xorg.conf b/trunk/target/linux/x86/olpc/base-files/etc/X11/xorg.conf
new file mode 100644
index 00000000..d98a8f87
--- /dev/null
+++ b/trunk/target/linux/x86/olpc/base-files/etc/X11/xorg.conf
@@ -0,0 +1,71 @@
+# xorg configuration
+
+Section "ServerLayout"
+	Identifier     "Default Layout"
+	Screen      0  "Screen0" 0 0
+	InputDevice    "Mouse0" "CorePointer"
+	InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+	FontPath     "/usr/lib/X11/fonts/misc"
+EndSection
+
+Section "Module"
+	Load  "dbe"
+	Load  "extmod"
+	Load  "fbdevhw"
+#	Load  "glx"
+	Load  "record"
+	Load  "freetype"
+	Load  "type1"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Keyboard0"
+	Driver      "keyboard"
+	Option	    "XkbModel" "pc105"
+	Option	    "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Mouse0"
+	Driver      "mouse"
+	Option	    "Protocol" "PS/2"
+	Option	    "Device" "/dev/psaux"
+	Option	    "ZAxisMapping" "4 5"
+	Option	    "Emulate3Buttons" "yes"
+EndSection
+
+Section "Monitor"
+	Identifier   "Monitor0"
+	VendorName   "Monitor Vendor"
+	ModelName    "OWRT"
+	Option	     "dpms"
+EndSection
+
+Section "Device"
+	Identifier  "FBDev"
+	Driver      "fbdev"
+	#Option     "shadowfb" "off"
+	VideoRam    4096
+EndSection
+
+Section "Screen"
+    Identifier	"Screen0"
+    Device	"FBDev"
+    Monitor	"Monitor0"
+    DefaultDepth 16
+
+    SubSection "Display"
+        Depth		16
+        Modes		"1200x900-75"
+    EndSubsection
+
+EndSection
+
+Section "DRI"
+	Group        0
+	Mode         0666
+EndSection
+
diff --git a/trunk/target/linux/x86/olpc/base-files/etc/config/network b/trunk/target/linux/x86/olpc/base-files/etc/config/network
new file mode 100644
index 00000000..dc0bee1e
--- /dev/null
+++ b/trunk/target/linux/x86/olpc/base-files/etc/config/network
@@ -0,0 +1,16 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config interface loopback
+        option ifname   lo
+        option proto    static
+        option ipaddr   127.0.0.1
+        option netmask  255.0.0.0
+
+config interface wlan
+        option ifname   eth0
+        option proto    dhcp
+
+config interface wlan6
+        option ifname   @wlan
+        option proto    dhcpv6
+        option reqprefix no
diff --git a/trunk/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86 b/trunk/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
new file mode 100644
index 00000000..e4a380fd
--- /dev/null
+++ b/trunk/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+do_mount_procfs() {
+	mount -o noatime -t proc none /proc
+}
diff --git a/trunk/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh b/trunk/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh
new file mode 100644
index 00000000..c90a4ce1
--- /dev/null
+++ b/trunk/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,27 @@
+platform_check_image() {
+	[ "$#" -gt 1 ] && return 1
+
+	case "$(get_magic_word "$1")" in
+		48eb) return 0;;
+		*)
+			echo "Invalid image type"
+			return 1
+		;;
+	esac
+}
+
+platform_do_upgrade() {
+	get_image "$1" > /dev/hda
+	sync
+}
+
+x86_prepare_ext2() {
+	# if we're running from ext2, we need to make sure that we have a mtd 
+	# partition that points to the active rootfs partition.
+	# however this only matters if we actually need to preserve the config files
+	[ "$SAVE_CONFIG" -eq 1 ] && return 0
+	grep rootfs /proc/mtd >/dev/null || {
+		echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd
+	}
+}
+append sysupgrade_pre_upgrade x86_prepare_ext2
diff --git a/trunk/target/linux/x86/olpc/config-default b/trunk/target/linux/x86/olpc/config-default
new file mode 100644
index 00000000..7ad86c00
--- /dev/null
+++ b/trunk/target/linux/x86/olpc/config-default
@@ -0,0 +1,121 @@
+# CONFIG_APM is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BATTERY_OLPC=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_EMBEDDED is not set
+CONFIG_FB=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_GEODE=y
+# CONFIG_FB_GEODE_GX is not set
+# CONFIG_FB_GEODE_GX1 is not set
+CONFIG_FB_GEODE_LX=y
+# CONFIG_FB_OLPC_DCON is not set
+# CONFIG_FB_VESA is not set
+CONFIG_FREEZER=y
+CONFIG_GPIOLIB=y
+# CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_IRQCHIP=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_KEXEC_JUMP is not set
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_PLATFORM is not set
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+# CONFIG_M486 is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MGEODE_LX=y
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_SDHCI=y
+# CONFIG_MMC_SDHCI_PCI is not set
+# CONFIG_MMC_SDHCI_PLTFM is not set
+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_WBSD is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTRR is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS=y
+CONFIG_NO_HZ=y
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_MTD=y
+CONFIG_OF_NET=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_PROMTREE=y
+CONFIG_OLPC=y
+CONFIG_OPROFILE=y
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+# CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_PCI_GOANY is not set
+CONFIG_PCI_GOOLPC=y
+CONFIG_PCI_OLPC=y
+CONFIG_PM=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_STD_PARTITION=""
+# CONFIG_PM_TEST_SUSPEND is not set
+# CONFIG_PM_TRACE_RTC is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PROFILING=y
+CONFIG_RD_LZO=y
+CONFIG_RELAY=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCx200 is not set
+# CONFIG_SERIO_APBPS2 is not set
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_TIMER_STATS=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+CONFIG_USB_STORAGE=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_WATCHDOG is not set
+CONFIG_X86_CMOV=y
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_MCE is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_3DNOW=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+# CONFIG_X86_WANT_INTEL_MID is not set
diff --git a/trunk/target/linux/x86/olpc/target.mk b/trunk/target/linux/x86/olpc/target.mk
new file mode 100644
index 00000000..7a56b7cc
--- /dev/null
+++ b/trunk/target/linux/x86/olpc/target.mk
@@ -0,0 +1,3 @@
+BOARDNAME:=OLPC XO-1
+DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci kmod-libertas
+FEATURES += broken
diff --git a/trunk/target/linux/x86/patches-3.10/006-yenta_mistery.patch b/trunk/target/linux/x86/patches-3.10/006-yenta_mistery.patch
new file mode 100644
index 00000000..72144cb0
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/006-yenta_mistery.patch
@@ -0,0 +1,20 @@
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -1233,6 +1233,17 @@ static int yenta_probe(struct pci_dev *d
+ 
+ 	/* We must finish initialization here */
+ 
++#ifdef CONFIG_X86_RDC321X
++/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */
++#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060
++/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */
++
++	config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK);
++	config_writel(socket, 35*4, 0x00000022);
++	config_writel(socket, 36*4, 0x60200000);
++	config_writel(socket, 40*4, 0x7e020000);
++#endif
++
+ 	if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
+ 		/* No IRQ or request_irq failed. Poll */
+ 		socket->cb_irq = 0; /* But zero is a valid IRQ number. */
diff --git a/trunk/target/linux/x86/patches-3.10/009-rdc321x_select_embedded.patch b/trunk/target/linux/x86/patches-3.10/009-rdc321x_select_embedded.patch
new file mode 100644
index 00000000..ab375e2c
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/009-rdc321x_select_embedded.patch
@@ -0,0 +1,11 @@
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -483,6 +483,8 @@ config X86_RDC321X
+ 	depends on X86_EXTENDED_PLATFORM
+ 	select M486
+ 	select X86_REBOOTFIXUPS
++	select EMBEDDED
++	select ARCH_REQUIRE_GPIOLIB
+ 	---help---
+ 	  This option is needed for RDC R-321x system-on-chip, also known
+ 	  as R-8610-(G).
diff --git a/trunk/target/linux/x86/patches-3.10/010-rdc_cpu_ident.patch b/trunk/target/linux/x86/patches-3.10/010-rdc_cpu_ident.patch
new file mode 100644
index 00000000..f2eca596
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/010-rdc_cpu_ident.patch
@@ -0,0 +1,176 @@
+--- /dev/null
++++ b/Documentation/x86/rdc.txt
+@@ -0,0 +1,69 @@
++
++Introduction
++============
++
++RDC (http://www.rdc.com.tw) have been manufacturing x86-compatible SoC
++(system-on-chips) for a number of years.  They are not the fastest of
++CPUs (clock speeds ranging from 133-150MHz) but 486SX compatibility
++coupled with very low power consumption[1] and low cost make them ideal
++for embedded applications.
++
++
++Where to find
++=============
++
++RDC chips show up in numerous embedded devices, but be careful since
++many of them will not run Linux 2.6 without significant expertise.
++
++There are several variants of what the linux kernel refers to generically
++as RDC321X:  R8610, R321x, S3282 and AMRISC20000.
++
++R321x: Found in various routers, see the libreCMC project for details,
++   http://wiki.openwrt.org/oldwiki/rdcport
++
++R8610: Found on the RDC evaluation board
++   http://www.ivankuten.com/system-on-chip-soc/rdc-r8610/
++
++AMRISC20000: Found in the MGB-100 wireless hard disk
++   http://tintuc.no-ip.com/linux/tipps/mgb100/
++
++S3282: Found in various NAS devices, including the Bifferboard
++   http://www.bifferos.com
++
++
++Kernel Configuration
++====================
++
++Add support for this CPU with CONFIG_X86_RDC321X.  Ensure that maths
++emulation is included (CONFIG_MATH_EMULATION selected) and avoid MCE
++(CONFIG_X86_MCE not selected).
++
++
++CPU detection
++=============
++
++None of these chips support the cpuid instruction, so as with some
++other x86 compatible SoCs, we must check the north bridge and look
++for specific 'signature' PCI device config.
++
++The current detection code has been tested only on the Bifferboard
++(S3282 CPU), please send bug reports or success stories with
++other devices to bifferos@yahoo.co.uk.
++
++
++Credits
++=======
++
++Many thanks to RDC for providing the customer codes to allow
++detection of all known variants, without which this detection code
++would have been very hard to ascertain.
++
++
++References
++==========
++
++[1] S3282 in certain NAS solutions consumes less than 1W
++
++
++mark@bifferos.com 2009
++
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -481,6 +481,7 @@ config X86_RDC321X
+ 	bool "RDC R-321x SoC"
+ 	depends on X86_32
+ 	depends on X86_EXTENDED_PLATFORM
++	select PCI
+ 	select M486
+ 	select X86_REBOOTFIXUPS
+ 	select EMBEDDED
+--- a/arch/x86/include/asm/processor.h
++++ b/arch/x86/include/asm/processor.h
+@@ -137,7 +137,8 @@ struct cpuinfo_x86 {
+ #define X86_VENDOR_CENTAUR	5
+ #define X86_VENDOR_TRANSMETA	7
+ #define X86_VENDOR_NSC		8
+-#define X86_VENDOR_NUM		9
++#define X86_VENDOR_RDC		9
++#define X86_VENDOR_NUM		10
+ 
+ #define X86_VENDOR_UNKNOWN	0xff
+ 
+--- a/arch/x86/kernel/cpu/Makefile
++++ b/arch/x86/kernel/cpu/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix
+ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centaur.o
+ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
+ obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
++obj-$(CONFIG_X86_RDC321X)		+= rdc.o
+ 
+ obj-$(CONFIG_PERF_EVENTS)		+= perf_event.o
+ 
+--- /dev/null
++++ b/arch/x86/kernel/cpu/rdc.c
+@@ -0,0 +1,69 @@
++/*
++ * See Documentation/x86/rdc.txt
++ *
++ * mark@bifferos.com
++ */
++
++#include <linux/pci.h>
++#include <asm/pci-direct.h>
++#include "cpu.h"
++
++
++static void __cpuinit rdc_identify(struct cpuinfo_x86 *c)
++{
++	u16 vendor, device;
++	u32 customer_id;
++
++	if (!early_pci_allowed())
++		return;
++
++	/* RDC CPU is SoC (system-on-chip), Northbridge is always present */
++	vendor = read_pci_config_16(0, 0, 0, PCI_VENDOR_ID);
++	device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID);
++
++	if (vendor != PCI_VENDOR_ID_RDC || device != PCI_DEVICE_ID_RDC_R6020)
++		return;  /* not RDC */
++	/*
++	 * NB: We could go on and check other devices, e.g. r6040 NIC, but
++	 * that's probably overkill
++	 */
++
++	customer_id = read_pci_config(0, 0, 0, 0x90);
++
++	switch (customer_id) {
++		/* id names are from RDC */
++	case 0x00321000:
++		strcpy(c->x86_model_id, "R3210/R3211");
++		break;
++	case 0x00321001:
++		strcpy(c->x86_model_id, "AMITRISC20000/20010");
++		break;
++	case 0x00321002:
++		strcpy(c->x86_model_id, "R3210X/Edimax");
++		break;
++	case 0x00321003:
++		strcpy(c->x86_model_id, "R3210/Kcodes");
++		break;
++	case 0x00321004:  /* tested */
++		strcpy(c->x86_model_id, "S3282/CodeTek");
++		break;
++	case 0x00321007:
++		strcpy(c->x86_model_id, "R8610");
++		break;
++	default:
++		pr_info("RDC CPU: Unrecognised Customer ID (0x%x) please report to linux-kernel@vger.kernel.org\n", customer_id);
++		break;
++	}
++
++	strcpy(c->x86_vendor_id, "RDC");
++	c->x86_vendor = X86_VENDOR_RDC;
++}
++
++static const struct cpu_dev __cpuinitconst rdc_cpu_dev = {
++	.c_vendor	= "RDC",
++	.c_ident	= { "RDC" },
++	.c_identify	= rdc_identify,
++	.c_x86_vendor	= X86_VENDOR_RDC,
++};
++
++cpu_dev_register(rdc_cpu_dev);
diff --git a/trunk/target/linux/x86/patches-3.10/011-tune_lzma_options.patch b/trunk/target/linux/x86/patches-3.10/011-tune_lzma_options.patch
new file mode 100644
index 00000000..1421f7c8
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/011-tune_lzma_options.patch
@@ -0,0 +1,22 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/arch/x86/include/asm/boot.h
++++ b/arch/x86/include/asm/boot.h
+@@ -23,7 +23,7 @@
+ #error "Invalid value for CONFIG_PHYSICAL_ALIGN"
+ #endif
+ 
+-#ifdef CONFIG_KERNEL_BZIP2
++#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA)
+ #define BOOT_HEAP_SIZE             0x400000
+ #else /* !CONFIG_KERNEL_BZIP2 */
+ 
diff --git a/trunk/target/linux/x86/patches-3.10/012-export_erase_write.patch b/trunk/target/linux/x86/patches-3.10/012-export_erase_write.patch
new file mode 100644
index 00000000..d3ec5caf
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/012-export_erase_write.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
+@@ -62,7 +62,7 @@ static void erase_callback(struct erase_
+ 	wake_up(wait_q);
+ }
+ 
+-static int erase_write (struct mtd_info *mtd, unsigned long pos,
++int erase_write (struct mtd_info *mtd, unsigned long pos,
+ 			int len, const char *buf)
+ {
+ 	struct erase_info erase;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -409,6 +409,9 @@ extern void register_mtd_user (struct mt
+ extern int unregister_mtd_user (struct mtd_notifier *old);
+ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
+ 
++int erase_write (struct mtd_info *mtd, unsigned long pos,
++		 int len, const char *buf);
++
+ void mtd_erase_callback(struct erase_info *instr);
+ 
+ static inline int mtd_is_bitflip(int err) {
diff --git a/trunk/target/linux/x86/patches-3.10/100-rdc_boards.patch b/trunk/target/linux/x86/patches-3.10/100-rdc_boards.patch
new file mode 100644
index 00000000..3712cb8d
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/100-rdc_boards.patch
@@ -0,0 +1,745 @@
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -174,6 +174,9 @@ libs-y  += arch/x86/lib/
+ # See arch/x86/Kbuild for content of core part of the kernel
+ core-y += arch/x86/
+ 
++# RDC R-321X support
++core-$(CONFIG_X86_RDC321X)   += arch/x86/mach-rdc321x/
++
+ # drivers-y are linked after core-y
+ drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
+ drivers-$(CONFIG_PCI)            += arch/x86/pci/
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/Makefile
+@@ -0,0 +1,5 @@
++#
++# Makefile for the RDC321x specific parts of the kernel
++#
++obj-$(CONFIG_X86_RDC321X)	:= platform.o reboot.o boards/sitecom.o boards/ar525w.o boards/bifferboard.o boards/r8610.o
++
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/platform.c
+@@ -0,0 +1,115 @@
++/*
++ *  Generic RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/map.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/physmap.h>
++#include <linux/root_dev.h>
++
++#include <asm/rdc_boards.h>
++
++static struct rdc_platform_data rdcplat_data;
++
++/* LEDS */
++static struct platform_device rdc321x_leds = {
++	.name = "leds-gpio",
++	.id = -1,
++	.dev = {
++		.platform_data = &rdcplat_data.led_data,
++	}
++};
++
++/* Button */
++static struct platform_device rdc321x_buttons = {
++	.name = "gpio-keys-polled",
++	.id = -1,
++	.dev = {
++		.platform_data = &rdcplat_data.button_data,
++	}
++};
++
++static __initdata struct platform_device *rdc321x_devs[] = {
++	&rdc321x_leds,
++	&rdc321x_buttons,
++};
++
++const char *__initdata boards[] = {
++	"Sitecom",
++	"AR525W",
++	"Bifferboard",
++	"R8610",
++	0
++};
++
++static struct map_info rdc_map_info = {
++	.name		= "rdc_flash",
++	.size		= 0x800000,	/* 8MB */
++	.phys		= 0xFF800000,	/* (u32) -rdc_map_info.size */
++	.bankwidth	= 2,
++};
++
++static int __init rdc_board_setup(void)
++{
++	struct mtd_info *mtdinfo;
++	struct mtd_part_parser_data *ppdata;
++	int res;
++
++	simple_map_init(&rdc_map_info);
++
++	while (1) {
++		rdc_map_info.virt = ioremap(rdc_map_info.phys,
++					    rdc_map_info.size);
++		if (rdc_map_info.virt == NULL)
++			continue;
++
++		mtdinfo = do_map_probe("cfi_probe", &rdc_map_info);
++		if (mtdinfo == NULL)
++			mtdinfo = do_map_probe("jedec_probe", &rdc_map_info);
++		if (mtdinfo != NULL)
++			break;
++
++		iounmap(rdc_map_info.virt);
++		if ((rdc_map_info.size >>= 1) < 0x100000)	/* 1MB */
++			panic("RDC321x: Could not find start of flash!");
++		rdc_map_info.phys = (u32) -rdc_map_info.size;
++	}
++
++	/*
++	 * TODO: add a new field to mtd_part_parser_data, and use that
++	 * instead of this ugly casting
++	 */
++	ppdata = (struct mtd_part_parser_data *) &rdcplat_data;
++	res = mtd_device_parse_register(mtdinfo, boards, ppdata, NULL, 0);
++	if (res) {
++		panic("RDC321x: can't identify board type");
++		return -ENOSYS;
++	}
++
++	ROOT_DEV = 0;
++
++	return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs));
++}
++late_initcall(rdc_board_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/ar525w.c
+@@ -0,0 +1,251 @@
++/*
++ * ar525w RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/vmalloc.h>
++#include <linux/mtd/mtd.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++struct image_header {
++	char magic[4];              /* ASICII: GMTK */
++	u32 checksum;               /* CRC32 */
++	u32 version;                /* x.x.x.x */
++	u32 kernelsz;               /* The size of the kernel image */
++	u32 imagesz;                /* The length of this image file ( kernel + romfs + this header) */
++	u32 pid;                    /* Product ID */
++	u32 fastcksum;              /* Partial CRC32 on (First(256), medium(256), last(512)) */
++	u32 reserved;
++};
++
++static struct gpio_led ar525w_leds[] = {
++	{ .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
++};
++static struct gpio_keys_button ar525w_btns[] = {
++	{
++		.gpio = 6,
++		.code = BTN_0,
++		.desc = "Reset",
++		.active_low = 1,
++	}
++};
++
++static u32 __initdata crctab[257] = {
++	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,
++	0
++};
++
++static u32 __init crc32(u8 * buf, u32 len)
++{
++	register int i;
++	u32 sum;
++	register u32 s0;
++	s0 = ~0;
++	for (i = 0; i < len; i++) {
++		s0 = (s0 >> 8) ^ crctab[(u8) (s0 & 0xFF) ^ buf[i]];
++	}
++	sum = ~s0;
++	return sum;
++}
++
++static int __init fixup_ar525w_header(struct mtd_info *master, struct image_header *header)
++{
++	char *buffer;
++	int res;
++	u32 bufferlength = header->kernelsz + sizeof(struct image_header);
++	u32 len;
++	static char crcbuf[0x400];
++
++	printk(KERN_INFO "Fixing up AR525W header, old image size: %u, new image size: %u\n",
++		   header->imagesz, bufferlength);
++
++	buffer = vmalloc(bufferlength);
++	if (!buffer) {
++		printk(KERN_ERR "Can't allocate %u bytes\n", bufferlength);
++		return -ENOMEM;
++	}
++
++	res =  mtd_read(master, 0x0, bufferlength, &len, buffer);
++	if (res || len != bufferlength)
++		goto out;
++
++	header = (struct image_header *) buffer;
++	header->imagesz = bufferlength;
++	header->checksum = 0;
++	header->fastcksum = 0;
++
++	memcpy(crcbuf, buffer, 0x100);
++	memcpy(crcbuf + 0x100, buffer + (bufferlength >> 1) - ((bufferlength & 0x6) >> 1), 0x100);
++	memcpy(crcbuf + 0x200, buffer + bufferlength - 0x200, 0x200);
++
++	header->fastcksum = crc32(crcbuf, sizeof(crcbuf));
++	header->checksum = crc32(buffer, bufferlength);
++
++	res = mtd_unlock(master, 0, master->erasesize);
++	if (res != 0 && res != -EOPNOTSUPP) {
++		printk(KERN_ERR "Can't unlock image header\n");
++		goto out;
++	}
++
++	res = erase_write (master, 0, master->erasesize, buffer);
++	if (res)
++		printk(KERN_ERR "Can't rewrite image header\n");
++
++out:
++	vfree(buffer);
++	return res;
++}
++
++static int __init
++parse_ar525w_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++			struct mtd_part_parser_data *plat_data)
++{
++	struct image_header header;
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
++
++	if (master->size != 0x400000) //4MB
++		return -ENOSYS;
++
++	res =  mtd_read(master, 0x0, sizeof(header), &len, (char *)&header);
++	if (res)
++		return res;
++
++	if (strncmp(header.magic, "GMTK", 4))
++		return -ENOSYS;
++
++	if (header.kernelsz > 0x400000 || header.kernelsz < master->erasesize) {
++		printk(KERN_ERR "AR525W image header found, but seems corrupt, kernel size %u\n", header.kernelsz);
++		return -EINVAL;
++	}
++
++	if (header.kernelsz + sizeof(header) != header.imagesz) {
++		res = fixup_ar525w_header(master, &header);
++		if (res)
++			return res;
++	}
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL);
++
++	rdc_flash_parts[0].name = "firmware";
++	rdc_flash_parts[0].offset = 0x0;
++	rdc_flash_parts[0].size = 0x3E0000;
++	rdc_flash_parts[1].name = "rootfs";
++	rdc_flash_parts[1].offset = header.kernelsz + sizeof(header);
++	rdc_flash_parts[1].size = rdc_flash_parts[0].size - rdc_flash_parts[1].offset;
++	rdc_flash_parts[2].name = "bootloader";
++	rdc_flash_parts[2].offset = 0x3E0000;
++	rdc_flash_parts[2].size = 0x20000;
++
++	*pparts = rdc_flash_parts;
++
++	pdata->led_data.num_leds = ARRAY_SIZE(ar525w_leds);
++	pdata->led_data.leds = ar525w_leds;
++	pdata->button_data.nbuttons = ARRAY_SIZE(ar525w_btns);
++	pdata->button_data.buttons = ar525w_btns;
++
++	return 3;
++}
++
++static struct mtd_part_parser __initdata ar525w_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_ar525w_partitions,
++	.name = "AR525W",
++};
++
++static int __init ar525w_setup(void)
++{
++	return register_mtd_parser(&ar525w_parser);
++}
++
++arch_initcall(ar525w_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/bifferboard.c
+@@ -0,0 +1,74 @@
++/*
++ *  Bifferboard RDC321x platform devices
++ *
++ *  Copyright (C) 2010 bifferos@yahoo.co.uk
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++static int __init
++parse_bifferboard_partitions(struct mtd_info *master,
++			     struct mtd_partition **pparts,
++			     struct mtd_part_parser_data *plat_data)
++{
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	u32 kernel_len;
++	u16 tmp;
++
++	res =  mtd_read(master, 0x4000 + 1036, 2, &len, (char *) &tmp);
++	if (res)
++		return res;
++	kernel_len = tmp * master->erasesize;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL);
++
++	*pparts = rdc_flash_parts;
++
++	rdc_flash_parts[0].name = "kernel";
++	rdc_flash_parts[0].offset = 0;
++	rdc_flash_parts[0].size = kernel_len;
++	rdc_flash_parts[1].name = "rootfs";
++	rdc_flash_parts[1].offset = kernel_len;
++	rdc_flash_parts[1].size = master->size - kernel_len - 0x10000;
++	rdc_flash_parts[2].name = "biffboot";
++	rdc_flash_parts[2].offset = master->size - 0x10000;
++	rdc_flash_parts[2].size = 0x10000;
++
++	return 3;
++}
++
++struct mtd_part_parser __initdata bifferboard_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_bifferboard_partitions,
++	.name = "Bifferboard",
++};
++
++static int __init bifferboard_setup(void)
++{
++	return register_mtd_parser(&bifferboard_parser);
++}
++arch_initcall(bifferboard_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/r8610.c
+@@ -0,0 +1,69 @@
++/*
++ *  R8610 RDC321x platform devices
++ *
++ *  Copyright (C) 2009, Florian Fainelli <florian@openwrt.org>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++static int __init
++parse_r8610_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++		       struct mtd_part_parser_data *plat_data)
++{
++	struct mtd_partition *rdc_flash_parts;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 4, GFP_KERNEL);
++
++	*pparts = rdc_flash_parts;
++
++	rdc_flash_parts[0].name = "kernel";
++	rdc_flash_parts[0].size = 0x001f0000;
++	rdc_flash_parts[0].offset = 0;
++	rdc_flash_parts[1].name = "config";
++	rdc_flash_parts[1].size = 0x10000;
++	rdc_flash_parts[1].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[2].name = "rootfs";
++	rdc_flash_parts[2].size = 0x1E0000;
++	rdc_flash_parts[2].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[3].name = "redboot";
++	rdc_flash_parts[3].size = 0x20000;
++	rdc_flash_parts[3].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[3].mask_flags = MTD_WRITEABLE;
++
++	return 4;
++}
++
++struct mtd_part_parser __initdata r8610_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_r8610_partitions,
++	.name = "R8610",
++};
++
++static int __init r8610_setup(void)
++{
++	return register_mtd_parser(&r8610_parser);
++}
++
++arch_initcall(r8610_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/sitecom.c
+@@ -0,0 +1,115 @@
++/*
++ *  Sitecom RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++struct image_header {
++	char	magic[4];
++	u32	kernel_length;
++	u32	ramdisk_length;
++	char	magic2[4];
++	u32	kernel_length2;
++};
++
++static struct gpio_led sitecom_leds[] = {
++	{ .name = "rdc321x:power", .gpio = 15, .active_low = 1},
++	{ .name = "rdc321x:usb0", .gpio = 0, .active_low = 1},
++	{ .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
++};
++
++static struct gpio_keys_button sitecom_btns[] = {
++	{
++		.gpio = 6,
++		.code = BTN_0,
++		.desc = "Reset",
++		.active_low = 1,
++	}
++};
++
++static int __init
++parse_sitecom_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++			 struct mtd_part_parser_data *plat_data)
++{
++	struct image_header header;
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
++
++	if (master->size != 0x400000) /* 4MB */
++		return -ENOSYS;
++
++	res =  mtd_read(master, 0x8000, sizeof(header), &len, (char *)&header);
++	if (res)
++		return res;
++
++	if (strncmp(header.magic, "CSYS", 4) || strncmp(header.magic2, "WRRM", 4))
++		return -ENOSYS;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 5, GFP_KERNEL);
++
++	rdc_flash_parts[0].name = "firmware";
++	rdc_flash_parts[0].offset = 0x8000;
++	rdc_flash_parts[0].size = 0x3F0000 - 0x8000;
++	rdc_flash_parts[1].name = "config";
++	rdc_flash_parts[1].offset = 0;
++	rdc_flash_parts[1].size = 0x8000;
++	rdc_flash_parts[2].name = "kernel";
++	rdc_flash_parts[2].offset = 0x8014;
++	rdc_flash_parts[2].size = header.kernel_length;
++	rdc_flash_parts[3].name = "rootfs";
++	rdc_flash_parts[3].offset = 0x8014 + header.kernel_length;
++	rdc_flash_parts[3].size = 0x3F0000 - rdc_flash_parts[3].offset;
++	rdc_flash_parts[4].name = "bootloader";
++	rdc_flash_parts[4].offset = 0x3F0000;
++	rdc_flash_parts[4].size = 0x10000;
++
++	*pparts = rdc_flash_parts;
++
++	pdata->led_data.num_leds = ARRAY_SIZE(sitecom_leds);
++	pdata->led_data.leds = sitecom_leds;
++	pdata->button_data.nbuttons = ARRAY_SIZE(sitecom_btns);
++	pdata->button_data.buttons = sitecom_btns;
++
++	return 5;
++}
++
++struct mtd_part_parser __initdata sitecom_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_sitecom_partitions,
++	.name = "Sitecom",
++};
++
++static int __init sitecom_setup(void)
++{
++	return register_mtd_parser(&sitecom_parser);
++}
++
++arch_initcall(sitecom_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/reboot.c
+@@ -0,0 +1,44 @@
++/*
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <asm/reboot.h>
++#include <asm/io.h>
++
++static void rdc321x_reset(void)
++{
++	unsigned i;
++
++	/* write to southbridge config register 0x41
++	   enable pci reset on cpu reset, make internal port 0x92 writeable
++	   and switch port 0x92 to internal */
++	outl(0x80003840, 0xCF8);
++	i = inl(0xCFC);
++	i |= 0x1600;
++	outl(i, 0xCFC);
++
++	/* soft reset */
++	outb(1, 0x92);
++}
++
++static int __init rdc_setup_reset(void)
++{
++	machine_ops.emergency_restart = rdc321x_reset;
++	return 0;
++}
++
++arch_initcall(rdc_setup_reset);
+--- /dev/null
++++ b/arch/x86/include/asm/rdc_boards.h
+@@ -0,0 +1,36 @@
++/*
++ *  RDC321x boards
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#ifndef _RDC_BOARDS_H__
++#define _RDC_BOARDS_H__
++
++#include <linux/leds.h>
++#include <linux/gpio_keys.h>
++
++struct rdc_platform_data {
++	struct gpio_led_platform_data led_data;
++	struct gpio_keys_platform_data button_data;
++};
++
++#endif
diff --git a/trunk/target/linux/x86/patches-3.10/120-panic_on_unrecovered_nmi.patch b/trunk/target/linux/x86/patches-3.10/120-panic_on_unrecovered_nmi.patch
new file mode 100644
index 00000000..641bb387
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/120-panic_on_unrecovered_nmi.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mfd/rdc321x-southbridge.c
++++ b/drivers/mfd/rdc321x-southbridge.c
+@@ -86,6 +86,8 @@ static int rdc321x_sb_probe(struct pci_d
+ 	rdc321x_gpio_pdata.sb_pdev = pdev;
+ 	rdc321x_wdt_pdata.sb_pdev = pdev;
+ 
++	panic_on_unrecovered_nmi = 1;
++
+ 	return mfd_add_devices(&pdev->dev, -1,
+ 			       rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells),
+ 			       NULL, 0, NULL);
diff --git a/trunk/target/linux/x86/patches-3.10/150-pit-tick-rate.patch b/trunk/target/linux/x86/patches-3.10/150-pit-tick-rate.patch
new file mode 100644
index 00000000..7bf9bbdc
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/150-pit-tick-rate.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/timex.h
++++ b/include/linux/timex.h
+@@ -144,6 +144,10 @@ int read_current_timer(unsigned long *ti
+ void ntp_notify_cmos_timer(void);
+ 
+ /* The clock frequency of the i8253/i8254 PIT */
++#ifdef CONFIG_X86_RDC321X
++#define PIT_TICK_RATE 1041816ul
++#else
+ #define PIT_TICK_RATE 1193182ul
++#endif
+ 
+ #endif /* LINUX_TIMEX_H */
diff --git a/trunk/target/linux/x86/patches-3.10/160-kexec-fix.patch b/trunk/target/linux/x86/patches-3.10/160-kexec-fix.patch
new file mode 100644
index 00000000..ea32494a
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.10/160-kexec-fix.patch
@@ -0,0 +1,43 @@
+From 357954613bdbab0c1f3986589ff30cc4855a2efd Mon Sep 17 00:00:00 2001
+From: root <root@cent.localnet>
+Date: Sun, 6 Dec 2009 18:26:43 +0000
+Subject: [PATCH 03/14] kexec fix
+
+---
+ arch/x86/kernel/relocate_kernel_32.S |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+--- a/arch/x86/kernel/relocate_kernel_32.S
++++ b/arch/x86/kernel/relocate_kernel_32.S
+@@ -54,8 +54,10 @@ relocate_kernel:
+ 	movl	%eax, CR0(%edi)
+ 	movl	%cr3, %eax
+ 	movl	%eax, CR3(%edi)
++#ifndef CONFIG_X86_RDC321X
+ 	movl	%cr4, %eax
+ 	movl	%eax, CR4(%edi)
++#endif
+ 
+ 	/* read the arguments and say goodbye to the stack */
+ 	movl  20+4(%esp), %ebx /* page_list */
+@@ -124,7 +126,9 @@ identity_mapped:
+ 	 * Setting everything to zero seems safe.
+ 	 */
+ 	xorl	%eax, %eax
++#ifndef CONFIG_X86_RDC321X
+ 	movl	%eax, %cr4
++#endif
+ 
+ 	jmp 1f
+ 1:
+@@ -195,8 +199,10 @@ identity_mapped:
+ 	ret
+ 
+ virtual_mapped:
++#ifndef CONFIG_X86_RDC321X
+ 	movl	CR4(%edi), %eax
+ 	movl	%eax, %cr4
++#endif
+ 	movl	CR3(%edi), %eax
+ 	movl	%eax, %cr3
+ 	movl	CR0(%edi), %eax
diff --git a/trunk/target/linux/x86/patches-3.14/006-yenta_mistery.patch b/trunk/target/linux/x86/patches-3.14/006-yenta_mistery.patch
new file mode 100644
index 00000000..72144cb0
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/006-yenta_mistery.patch
@@ -0,0 +1,20 @@
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -1233,6 +1233,17 @@ static int yenta_probe(struct pci_dev *d
+ 
+ 	/* We must finish initialization here */
+ 
++#ifdef CONFIG_X86_RDC321X
++/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */
++#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060
++/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */
++
++	config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK);
++	config_writel(socket, 35*4, 0x00000022);
++	config_writel(socket, 36*4, 0x60200000);
++	config_writel(socket, 40*4, 0x7e020000);
++#endif
++
+ 	if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
+ 		/* No IRQ or request_irq failed. Poll */
+ 		socket->cb_irq = 0; /* But zero is a valid IRQ number. */
diff --git a/trunk/target/linux/x86/patches-3.14/009-rdc321x_select_embedded.patch b/trunk/target/linux/x86/patches-3.14/009-rdc321x_select_embedded.patch
new file mode 100644
index 00000000..50f817cb
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/009-rdc321x_select_embedded.patch
@@ -0,0 +1,11 @@
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -480,6 +480,8 @@ config X86_RDC321X
+ 	depends on X86_EXTENDED_PLATFORM
+ 	select M486
+ 	select X86_REBOOTFIXUPS
++	select EMBEDDED
++	select ARCH_REQUIRE_GPIOLIB
+ 	---help---
+ 	  This option is needed for RDC R-321x system-on-chip, also known
+ 	  as R-8610-(G).
diff --git a/trunk/target/linux/x86/patches-3.14/010-rdc_cpu_ident.patch b/trunk/target/linux/x86/patches-3.14/010-rdc_cpu_ident.patch
new file mode 100644
index 00000000..35f2594b
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/010-rdc_cpu_ident.patch
@@ -0,0 +1,176 @@
+--- /dev/null
++++ b/Documentation/x86/rdc.txt
+@@ -0,0 +1,69 @@
++
++Introduction
++============
++
++RDC (http://www.rdc.com.tw) have been manufacturing x86-compatible SoC
++(system-on-chips) for a number of years.  They are not the fastest of
++CPUs (clock speeds ranging from 133-150MHz) but 486SX compatibility
++coupled with very low power consumption[1] and low cost make them ideal
++for embedded applications.
++
++
++Where to find
++=============
++
++RDC chips show up in numerous embedded devices, but be careful since
++many of them will not run Linux 2.6 without significant expertise.
++
++There are several variants of what the linux kernel refers to generically
++as RDC321X:  R8610, R321x, S3282 and AMRISC20000.
++
++R321x: Found in various routers, see the libreCMC project for details,
++   http://wiki.openwrt.org/oldwiki/rdcport
++
++R8610: Found on the RDC evaluation board
++   http://www.ivankuten.com/system-on-chip-soc/rdc-r8610/
++
++AMRISC20000: Found in the MGB-100 wireless hard disk
++   http://tintuc.no-ip.com/linux/tipps/mgb100/
++
++S3282: Found in various NAS devices, including the Bifferboard
++   http://www.bifferos.com
++
++
++Kernel Configuration
++====================
++
++Add support for this CPU with CONFIG_X86_RDC321X.  Ensure that maths
++emulation is included (CONFIG_MATH_EMULATION selected) and avoid MCE
++(CONFIG_X86_MCE not selected).
++
++
++CPU detection
++=============
++
++None of these chips support the cpuid instruction, so as with some
++other x86 compatible SoCs, we must check the north bridge and look
++for specific 'signature' PCI device config.
++
++The current detection code has been tested only on the Bifferboard
++(S3282 CPU), please send bug reports or success stories with
++other devices to bifferos@yahoo.co.uk.
++
++
++Credits
++=======
++
++Many thanks to RDC for providing the customer codes to allow
++detection of all known variants, without which this detection code
++would have been very hard to ascertain.
++
++
++References
++==========
++
++[1] S3282 in certain NAS solutions consumes less than 1W
++
++
++mark@bifferos.com 2009
++
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -478,6 +478,7 @@ config X86_RDC321X
+ 	bool "RDC R-321x SoC"
+ 	depends on X86_32
+ 	depends on X86_EXTENDED_PLATFORM
++	select PCI
+ 	select M486
+ 	select X86_REBOOTFIXUPS
+ 	select EMBEDDED
+--- a/arch/x86/include/asm/processor.h
++++ b/arch/x86/include/asm/processor.h
+@@ -137,7 +137,8 @@ struct cpuinfo_x86 {
+ #define X86_VENDOR_CENTAUR	5
+ #define X86_VENDOR_TRANSMETA	7
+ #define X86_VENDOR_NSC		8
+-#define X86_VENDOR_NUM		9
++#define X86_VENDOR_RDC		9
++#define X86_VENDOR_NUM		10
+ 
+ #define X86_VENDOR_UNKNOWN	0xff
+ 
+--- a/arch/x86/kernel/cpu/Makefile
++++ b/arch/x86/kernel/cpu/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix
+ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centaur.o
+ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
+ obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
++obj-$(CONFIG_X86_RDC321X)		+= rdc.o
+ 
+ obj-$(CONFIG_PERF_EVENTS)		+= perf_event.o
+ 
+--- /dev/null
++++ b/arch/x86/kernel/cpu/rdc.c
+@@ -0,0 +1,69 @@
++/*
++ * See Documentation/x86/rdc.txt
++ *
++ * mark@bifferos.com
++ */
++
++#include <linux/pci.h>
++#include <asm/pci-direct.h>
++#include "cpu.h"
++
++
++static void __cpuinit rdc_identify(struct cpuinfo_x86 *c)
++{
++	u16 vendor, device;
++	u32 customer_id;
++
++	if (!early_pci_allowed())
++		return;
++
++	/* RDC CPU is SoC (system-on-chip), Northbridge is always present */
++	vendor = read_pci_config_16(0, 0, 0, PCI_VENDOR_ID);
++	device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID);
++
++	if (vendor != PCI_VENDOR_ID_RDC || device != PCI_DEVICE_ID_RDC_R6020)
++		return;  /* not RDC */
++	/*
++	 * NB: We could go on and check other devices, e.g. r6040 NIC, but
++	 * that's probably overkill
++	 */
++
++	customer_id = read_pci_config(0, 0, 0, 0x90);
++
++	switch (customer_id) {
++		/* id names are from RDC */
++	case 0x00321000:
++		strcpy(c->x86_model_id, "R3210/R3211");
++		break;
++	case 0x00321001:
++		strcpy(c->x86_model_id, "AMITRISC20000/20010");
++		break;
++	case 0x00321002:
++		strcpy(c->x86_model_id, "R3210X/Edimax");
++		break;
++	case 0x00321003:
++		strcpy(c->x86_model_id, "R3210/Kcodes");
++		break;
++	case 0x00321004:  /* tested */
++		strcpy(c->x86_model_id, "S3282/CodeTek");
++		break;
++	case 0x00321007:
++		strcpy(c->x86_model_id, "R8610");
++		break;
++	default:
++		pr_info("RDC CPU: Unrecognised Customer ID (0x%x) please report to linux-kernel@vger.kernel.org\n", customer_id);
++		break;
++	}
++
++	strcpy(c->x86_vendor_id, "RDC");
++	c->x86_vendor = X86_VENDOR_RDC;
++}
++
++static const struct cpu_dev __cpuinitconst rdc_cpu_dev = {
++	.c_vendor	= "RDC",
++	.c_ident	= { "RDC" },
++	.c_identify	= rdc_identify,
++	.c_x86_vendor	= X86_VENDOR_RDC,
++};
++
++cpu_dev_register(rdc_cpu_dev);
diff --git a/trunk/target/linux/x86/patches-3.14/011-tune_lzma_options.patch b/trunk/target/linux/x86/patches-3.14/011-tune_lzma_options.patch
new file mode 100644
index 00000000..168c3dd7
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/011-tune_lzma_options.patch
@@ -0,0 +1,22 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -304,7 +304,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/arch/x86/include/asm/boot.h
++++ b/arch/x86/include/asm/boot.h
+@@ -23,7 +23,7 @@
+ #error "Invalid value for CONFIG_PHYSICAL_ALIGN"
+ #endif
+ 
+-#ifdef CONFIG_KERNEL_BZIP2
++#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA)
+ #define BOOT_HEAP_SIZE             0x400000
+ #else /* !CONFIG_KERNEL_BZIP2 */
+ 
diff --git a/trunk/target/linux/x86/patches-3.14/012-export_erase_write.patch b/trunk/target/linux/x86/patches-3.14/012-export_erase_write.patch
new file mode 100644
index 00000000..9927384c
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/012-export_erase_write.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
+@@ -63,7 +63,7 @@ static void erase_callback(struct erase_
+ 	wake_up(wait_q);
+ }
+ 
+-static int erase_write (struct mtd_info *mtd, unsigned long pos,
++int erase_write (struct mtd_info *mtd, unsigned long pos,
+ 			int len, const char *buf)
+ {
+ 	struct erase_info erase;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -414,6 +414,9 @@ extern void register_mtd_user (struct mt
+ extern int unregister_mtd_user (struct mtd_notifier *old);
+ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
+ 
++int erase_write (struct mtd_info *mtd, unsigned long pos,
++		 int len, const char *buf);
++
+ void mtd_erase_callback(struct erase_info *instr);
+ 
+ static inline int mtd_is_bitflip(int err) {
diff --git a/trunk/target/linux/x86/patches-3.14/100-rdc_boards.patch b/trunk/target/linux/x86/patches-3.14/100-rdc_boards.patch
new file mode 100644
index 00000000..1f3b161a
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/100-rdc_boards.patch
@@ -0,0 +1,745 @@
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -196,6 +196,9 @@ libs-y  += arch/x86/lib/
+ # See arch/x86/Kbuild for content of core part of the kernel
+ core-y += arch/x86/
+ 
++# RDC R-321X support
++core-$(CONFIG_X86_RDC321X)   += arch/x86/mach-rdc321x/
++
+ # drivers-y are linked after core-y
+ drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
+ drivers-$(CONFIG_PCI)            += arch/x86/pci/
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/Makefile
+@@ -0,0 +1,5 @@
++#
++# Makefile for the RDC321x specific parts of the kernel
++#
++obj-$(CONFIG_X86_RDC321X)	:= platform.o reboot.o boards/sitecom.o boards/ar525w.o boards/bifferboard.o boards/r8610.o
++
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/platform.c
+@@ -0,0 +1,115 @@
++/*
++ *  Generic RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/map.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/physmap.h>
++#include <linux/root_dev.h>
++
++#include <asm/rdc_boards.h>
++
++static struct rdc_platform_data rdcplat_data;
++
++/* LEDS */
++static struct platform_device rdc321x_leds = {
++	.name = "leds-gpio",
++	.id = -1,
++	.dev = {
++		.platform_data = &rdcplat_data.led_data,
++	}
++};
++
++/* Button */
++static struct platform_device rdc321x_buttons = {
++	.name = "gpio-keys-polled",
++	.id = -1,
++	.dev = {
++		.platform_data = &rdcplat_data.button_data,
++	}
++};
++
++static __initdata struct platform_device *rdc321x_devs[] = {
++	&rdc321x_leds,
++	&rdc321x_buttons,
++};
++
++const char *__initdata boards[] = {
++	"Sitecom",
++	"AR525W",
++	"Bifferboard",
++	"R8610",
++	0
++};
++
++static struct map_info rdc_map_info = {
++	.name		= "rdc_flash",
++	.size		= 0x800000,	/* 8MB */
++	.phys		= 0xFF800000,	/* (u32) -rdc_map_info.size */
++	.bankwidth	= 2,
++};
++
++static int __init rdc_board_setup(void)
++{
++	struct mtd_info *mtdinfo;
++	struct mtd_part_parser_data *ppdata;
++	int res;
++
++	simple_map_init(&rdc_map_info);
++
++	while (1) {
++		rdc_map_info.virt = ioremap(rdc_map_info.phys,
++					    rdc_map_info.size);
++		if (rdc_map_info.virt == NULL)
++			continue;
++
++		mtdinfo = do_map_probe("cfi_probe", &rdc_map_info);
++		if (mtdinfo == NULL)
++			mtdinfo = do_map_probe("jedec_probe", &rdc_map_info);
++		if (mtdinfo != NULL)
++			break;
++
++		iounmap(rdc_map_info.virt);
++		if ((rdc_map_info.size >>= 1) < 0x100000)	/* 1MB */
++			panic("RDC321x: Could not find start of flash!");
++		rdc_map_info.phys = (u32) -rdc_map_info.size;
++	}
++
++	/*
++	 * TODO: add a new field to mtd_part_parser_data, and use that
++	 * instead of this ugly casting
++	 */
++	ppdata = (struct mtd_part_parser_data *) &rdcplat_data;
++	res = mtd_device_parse_register(mtdinfo, boards, ppdata, NULL, 0);
++	if (res) {
++		panic("RDC321x: can't identify board type");
++		return -ENOSYS;
++	}
++
++	ROOT_DEV = 0;
++
++	return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs));
++}
++late_initcall(rdc_board_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/ar525w.c
+@@ -0,0 +1,251 @@
++/*
++ * ar525w RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/vmalloc.h>
++#include <linux/mtd/mtd.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++struct image_header {
++	char magic[4];              /* ASICII: GMTK */
++	u32 checksum;               /* CRC32 */
++	u32 version;                /* x.x.x.x */
++	u32 kernelsz;               /* The size of the kernel image */
++	u32 imagesz;                /* The length of this image file ( kernel + romfs + this header) */
++	u32 pid;                    /* Product ID */
++	u32 fastcksum;              /* Partial CRC32 on (First(256), medium(256), last(512)) */
++	u32 reserved;
++};
++
++static struct gpio_led ar525w_leds[] = {
++	{ .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
++};
++static struct gpio_keys_button ar525w_btns[] = {
++	{
++		.gpio = 6,
++		.code = BTN_0,
++		.desc = "Reset",
++		.active_low = 1,
++	}
++};
++
++static u32 __initdata crctab[257] = {
++	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,
++	0
++};
++
++static u32 __init crc32(u8 * buf, u32 len)
++{
++	register int i;
++	u32 sum;
++	register u32 s0;
++	s0 = ~0;
++	for (i = 0; i < len; i++) {
++		s0 = (s0 >> 8) ^ crctab[(u8) (s0 & 0xFF) ^ buf[i]];
++	}
++	sum = ~s0;
++	return sum;
++}
++
++static int __init fixup_ar525w_header(struct mtd_info *master, struct image_header *header)
++{
++	char *buffer;
++	int res;
++	u32 bufferlength = header->kernelsz + sizeof(struct image_header);
++	u32 len;
++	static char crcbuf[0x400];
++
++	printk(KERN_INFO "Fixing up AR525W header, old image size: %u, new image size: %u\n",
++		   header->imagesz, bufferlength);
++
++	buffer = vmalloc(bufferlength);
++	if (!buffer) {
++		printk(KERN_ERR "Can't allocate %u bytes\n", bufferlength);
++		return -ENOMEM;
++	}
++
++	res =  mtd_read(master, 0x0, bufferlength, &len, buffer);
++	if (res || len != bufferlength)
++		goto out;
++
++	header = (struct image_header *) buffer;
++	header->imagesz = bufferlength;
++	header->checksum = 0;
++	header->fastcksum = 0;
++
++	memcpy(crcbuf, buffer, 0x100);
++	memcpy(crcbuf + 0x100, buffer + (bufferlength >> 1) - ((bufferlength & 0x6) >> 1), 0x100);
++	memcpy(crcbuf + 0x200, buffer + bufferlength - 0x200, 0x200);
++
++	header->fastcksum = crc32(crcbuf, sizeof(crcbuf));
++	header->checksum = crc32(buffer, bufferlength);
++
++	res = mtd_unlock(master, 0, master->erasesize);
++	if (res != 0 && res != -EOPNOTSUPP) {
++		printk(KERN_ERR "Can't unlock image header\n");
++		goto out;
++	}
++
++	res = erase_write (master, 0, master->erasesize, buffer);
++	if (res)
++		printk(KERN_ERR "Can't rewrite image header\n");
++
++out:
++	vfree(buffer);
++	return res;
++}
++
++static int __init
++parse_ar525w_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++			struct mtd_part_parser_data *plat_data)
++{
++	struct image_header header;
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
++
++	if (master->size != 0x400000) //4MB
++		return -ENOSYS;
++
++	res =  mtd_read(master, 0x0, sizeof(header), &len, (char *)&header);
++	if (res)
++		return res;
++
++	if (strncmp(header.magic, "GMTK", 4))
++		return -ENOSYS;
++
++	if (header.kernelsz > 0x400000 || header.kernelsz < master->erasesize) {
++		printk(KERN_ERR "AR525W image header found, but seems corrupt, kernel size %u\n", header.kernelsz);
++		return -EINVAL;
++	}
++
++	if (header.kernelsz + sizeof(header) != header.imagesz) {
++		res = fixup_ar525w_header(master, &header);
++		if (res)
++			return res;
++	}
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL);
++
++	rdc_flash_parts[0].name = "firmware";
++	rdc_flash_parts[0].offset = 0x0;
++	rdc_flash_parts[0].size = 0x3E0000;
++	rdc_flash_parts[1].name = "rootfs";
++	rdc_flash_parts[1].offset = header.kernelsz + sizeof(header);
++	rdc_flash_parts[1].size = rdc_flash_parts[0].size - rdc_flash_parts[1].offset;
++	rdc_flash_parts[2].name = "bootloader";
++	rdc_flash_parts[2].offset = 0x3E0000;
++	rdc_flash_parts[2].size = 0x20000;
++
++	*pparts = rdc_flash_parts;
++
++	pdata->led_data.num_leds = ARRAY_SIZE(ar525w_leds);
++	pdata->led_data.leds = ar525w_leds;
++	pdata->button_data.nbuttons = ARRAY_SIZE(ar525w_btns);
++	pdata->button_data.buttons = ar525w_btns;
++
++	return 3;
++}
++
++static struct mtd_part_parser __initdata ar525w_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_ar525w_partitions,
++	.name = "AR525W",
++};
++
++static int __init ar525w_setup(void)
++{
++	return register_mtd_parser(&ar525w_parser);
++}
++
++arch_initcall(ar525w_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/bifferboard.c
+@@ -0,0 +1,74 @@
++/*
++ *  Bifferboard RDC321x platform devices
++ *
++ *  Copyright (C) 2010 bifferos@yahoo.co.uk
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++static int __init
++parse_bifferboard_partitions(struct mtd_info *master,
++			     struct mtd_partition **pparts,
++			     struct mtd_part_parser_data *plat_data)
++{
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	u32 kernel_len;
++	u16 tmp;
++
++	res =  mtd_read(master, 0x4000 + 1036, 2, &len, (char *) &tmp);
++	if (res)
++		return res;
++	kernel_len = tmp * master->erasesize;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL);
++
++	*pparts = rdc_flash_parts;
++
++	rdc_flash_parts[0].name = "kernel";
++	rdc_flash_parts[0].offset = 0;
++	rdc_flash_parts[0].size = kernel_len;
++	rdc_flash_parts[1].name = "rootfs";
++	rdc_flash_parts[1].offset = kernel_len;
++	rdc_flash_parts[1].size = master->size - kernel_len - 0x10000;
++	rdc_flash_parts[2].name = "biffboot";
++	rdc_flash_parts[2].offset = master->size - 0x10000;
++	rdc_flash_parts[2].size = 0x10000;
++
++	return 3;
++}
++
++struct mtd_part_parser __initdata bifferboard_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_bifferboard_partitions,
++	.name = "Bifferboard",
++};
++
++static int __init bifferboard_setup(void)
++{
++	return register_mtd_parser(&bifferboard_parser);
++}
++arch_initcall(bifferboard_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/r8610.c
+@@ -0,0 +1,69 @@
++/*
++ *  R8610 RDC321x platform devices
++ *
++ *  Copyright (C) 2009, Florian Fainelli <florian@openwrt.org>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++static int __init
++parse_r8610_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++		       struct mtd_part_parser_data *plat_data)
++{
++	struct mtd_partition *rdc_flash_parts;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 4, GFP_KERNEL);
++
++	*pparts = rdc_flash_parts;
++
++	rdc_flash_parts[0].name = "kernel";
++	rdc_flash_parts[0].size = 0x001f0000;
++	rdc_flash_parts[0].offset = 0;
++	rdc_flash_parts[1].name = "config";
++	rdc_flash_parts[1].size = 0x10000;
++	rdc_flash_parts[1].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[2].name = "rootfs";
++	rdc_flash_parts[2].size = 0x1E0000;
++	rdc_flash_parts[2].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[3].name = "redboot";
++	rdc_flash_parts[3].size = 0x20000;
++	rdc_flash_parts[3].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[3].mask_flags = MTD_WRITEABLE;
++
++	return 4;
++}
++
++struct mtd_part_parser __initdata r8610_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_r8610_partitions,
++	.name = "R8610",
++};
++
++static int __init r8610_setup(void)
++{
++	return register_mtd_parser(&r8610_parser);
++}
++
++arch_initcall(r8610_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/sitecom.c
+@@ -0,0 +1,115 @@
++/*
++ *  Sitecom RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++struct image_header {
++	char	magic[4];
++	u32	kernel_length;
++	u32	ramdisk_length;
++	char	magic2[4];
++	u32	kernel_length2;
++};
++
++static struct gpio_led sitecom_leds[] = {
++	{ .name = "rdc321x:power", .gpio = 15, .active_low = 1},
++	{ .name = "rdc321x:usb0", .gpio = 0, .active_low = 1},
++	{ .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
++};
++
++static struct gpio_keys_button sitecom_btns[] = {
++	{
++		.gpio = 6,
++		.code = BTN_0,
++		.desc = "Reset",
++		.active_low = 1,
++	}
++};
++
++static int __init
++parse_sitecom_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++			 struct mtd_part_parser_data *plat_data)
++{
++	struct image_header header;
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
++
++	if (master->size != 0x400000) /* 4MB */
++		return -ENOSYS;
++
++	res =  mtd_read(master, 0x8000, sizeof(header), &len, (char *)&header);
++	if (res)
++		return res;
++
++	if (strncmp(header.magic, "CSYS", 4) || strncmp(header.magic2, "WRRM", 4))
++		return -ENOSYS;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 5, GFP_KERNEL);
++
++	rdc_flash_parts[0].name = "firmware";
++	rdc_flash_parts[0].offset = 0x8000;
++	rdc_flash_parts[0].size = 0x3F0000 - 0x8000;
++	rdc_flash_parts[1].name = "config";
++	rdc_flash_parts[1].offset = 0;
++	rdc_flash_parts[1].size = 0x8000;
++	rdc_flash_parts[2].name = "kernel";
++	rdc_flash_parts[2].offset = 0x8014;
++	rdc_flash_parts[2].size = header.kernel_length;
++	rdc_flash_parts[3].name = "rootfs";
++	rdc_flash_parts[3].offset = 0x8014 + header.kernel_length;
++	rdc_flash_parts[3].size = 0x3F0000 - rdc_flash_parts[3].offset;
++	rdc_flash_parts[4].name = "bootloader";
++	rdc_flash_parts[4].offset = 0x3F0000;
++	rdc_flash_parts[4].size = 0x10000;
++
++	*pparts = rdc_flash_parts;
++
++	pdata->led_data.num_leds = ARRAY_SIZE(sitecom_leds);
++	pdata->led_data.leds = sitecom_leds;
++	pdata->button_data.nbuttons = ARRAY_SIZE(sitecom_btns);
++	pdata->button_data.buttons = sitecom_btns;
++
++	return 5;
++}
++
++struct mtd_part_parser __initdata sitecom_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_sitecom_partitions,
++	.name = "Sitecom",
++};
++
++static int __init sitecom_setup(void)
++{
++	return register_mtd_parser(&sitecom_parser);
++}
++
++arch_initcall(sitecom_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/reboot.c
+@@ -0,0 +1,44 @@
++/*
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <asm/reboot.h>
++#include <asm/io.h>
++
++static void rdc321x_reset(void)
++{
++	unsigned i;
++
++	/* write to southbridge config register 0x41
++	   enable pci reset on cpu reset, make internal port 0x92 writeable
++	   and switch port 0x92 to internal */
++	outl(0x80003840, 0xCF8);
++	i = inl(0xCFC);
++	i |= 0x1600;
++	outl(i, 0xCFC);
++
++	/* soft reset */
++	outb(1, 0x92);
++}
++
++static int __init rdc_setup_reset(void)
++{
++	machine_ops.emergency_restart = rdc321x_reset;
++	return 0;
++}
++
++arch_initcall(rdc_setup_reset);
+--- /dev/null
++++ b/arch/x86/include/asm/rdc_boards.h
+@@ -0,0 +1,36 @@
++/*
++ *  RDC321x boards
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#ifndef _RDC_BOARDS_H__
++#define _RDC_BOARDS_H__
++
++#include <linux/leds.h>
++#include <linux/gpio_keys.h>
++
++struct rdc_platform_data {
++	struct gpio_led_platform_data led_data;
++	struct gpio_keys_platform_data button_data;
++};
++
++#endif
diff --git a/trunk/target/linux/x86/patches-3.14/120-panic_on_unrecovered_nmi.patch b/trunk/target/linux/x86/patches-3.14/120-panic_on_unrecovered_nmi.patch
new file mode 100644
index 00000000..641bb387
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/120-panic_on_unrecovered_nmi.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mfd/rdc321x-southbridge.c
++++ b/drivers/mfd/rdc321x-southbridge.c
+@@ -86,6 +86,8 @@ static int rdc321x_sb_probe(struct pci_d
+ 	rdc321x_gpio_pdata.sb_pdev = pdev;
+ 	rdc321x_wdt_pdata.sb_pdev = pdev;
+ 
++	panic_on_unrecovered_nmi = 1;
++
+ 	return mfd_add_devices(&pdev->dev, -1,
+ 			       rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells),
+ 			       NULL, 0, NULL);
diff --git a/trunk/target/linux/x86/patches-3.14/150-pit-tick-rate.patch b/trunk/target/linux/x86/patches-3.14/150-pit-tick-rate.patch
new file mode 100644
index 00000000..ea2da0ce
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/150-pit-tick-rate.patch
@@ -0,0 +1,13 @@
+--- a/include/linux/timex.h
++++ b/include/linux/timex.h
+@@ -158,6 +158,10 @@ int read_current_timer(unsigned long *ti
+ void ntp_notify_cmos_timer(void);
+ 
+ /* The clock frequency of the i8253/i8254 PIT */
++#ifdef CONFIG_X86_RDC321X
++#define PIT_TICK_RATE 1041816ul
++#else
+ #define PIT_TICK_RATE 1193182ul
++#endif
+ 
+ #endif /* LINUX_TIMEX_H */
diff --git a/trunk/target/linux/x86/patches-3.14/160-kexec-fix.patch b/trunk/target/linux/x86/patches-3.14/160-kexec-fix.patch
new file mode 100644
index 00000000..ea32494a
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.14/160-kexec-fix.patch
@@ -0,0 +1,43 @@
+From 357954613bdbab0c1f3986589ff30cc4855a2efd Mon Sep 17 00:00:00 2001
+From: root <root@cent.localnet>
+Date: Sun, 6 Dec 2009 18:26:43 +0000
+Subject: [PATCH 03/14] kexec fix
+
+---
+ arch/x86/kernel/relocate_kernel_32.S |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+--- a/arch/x86/kernel/relocate_kernel_32.S
++++ b/arch/x86/kernel/relocate_kernel_32.S
+@@ -54,8 +54,10 @@ relocate_kernel:
+ 	movl	%eax, CR0(%edi)
+ 	movl	%cr3, %eax
+ 	movl	%eax, CR3(%edi)
++#ifndef CONFIG_X86_RDC321X
+ 	movl	%cr4, %eax
+ 	movl	%eax, CR4(%edi)
++#endif
+ 
+ 	/* read the arguments and say goodbye to the stack */
+ 	movl  20+4(%esp), %ebx /* page_list */
+@@ -124,7 +126,9 @@ identity_mapped:
+ 	 * Setting everything to zero seems safe.
+ 	 */
+ 	xorl	%eax, %eax
++#ifndef CONFIG_X86_RDC321X
+ 	movl	%eax, %cr4
++#endif
+ 
+ 	jmp 1f
+ 1:
+@@ -195,8 +199,10 @@ identity_mapped:
+ 	ret
+ 
+ virtual_mapped:
++#ifndef CONFIG_X86_RDC321X
+ 	movl	CR4(%edi), %eax
+ 	movl	%eax, %cr4
++#endif
+ 	movl	CR3(%edi), %eax
+ 	movl	%eax, %cr3
+ 	movl	CR0(%edi), %eax
diff --git a/trunk/target/linux/x86/patches-3.3/001-alix_platform.patch b/trunk/target/linux/x86/patches-3.3/001-alix_platform.patch
new file mode 100644
index 00000000..4a5f4f4c
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/001-alix_platform.patch
@@ -0,0 +1,131 @@
+index dc5f1d3..a24bf8c 100644
+--- a/arch/x86/platform/geode/alix.c
++++ b/arch/x86/platform/geode/alix.c
+@@ -6,6 +6,7 @@
+  *
+  * Copyright (C) 2008 Constantin Baranov <const@mimas.ru>
+  * Copyright (C) 2011 Ed Wildgoose <kernel@wildgooses.com>
++ *                and Philip Prindeville <philipp@redfish-solutions.com>
+  *
+  * TODO: There are large similarities with leds-net5501.c
+  * by Alessandro Zummo <a.zummo@towertech.it>
+@@ -24,14 +25,47 @@
+ #include <linux/leds.h>
+ #include <linux/platform_device.h>
+ #include <linux/gpio.h>
++#include <linux/input.h>
++#include <linux/gpio_keys.h>
++#include <linux/dmi.h>
+ 
+ #include <asm/geode.h>
+ 
++#define BIOS_SIGNATURE_TINYBIOS		0xf0000
++#define BIOS_SIGNATURE_COREBOOT		0x500
++#define BIOS_REGION_SIZE		0x10000
++
+ static bool force = 0;
+ module_param(force, bool, 0444);
+ /* FIXME: Award bios is not automatically detected as Alix platform */
+ MODULE_PARM_DESC(force, "Force detection as ALIX.2/ALIX.3 platform");
+ 
++static struct gpio_keys_button alix_gpio_buttons[] = {
++	{
++		.code = KEY_RESTART,
++		.gpio = 24,
++		.active_low = 1,
++		.desc = "Reset button",
++		.type = EV_KEY,
++		.wakeup = 0,
++		.debounce_interval = 100,
++		.can_disable = 0,
++	}
++};
++static struct gpio_keys_platform_data alix_buttons_data = {
++	.buttons = alix_gpio_buttons,
++	.nbuttons = ARRAY_SIZE(alix_gpio_buttons),
++	.poll_interval = 20,
++};
++
++static struct platform_device alix_buttons_dev = {
++	.name = "gpio-keys-polled",
++	.id = 1,
++	.dev = {
++		.platform_data = &alix_buttons_data,
++	}
++};
++
+ static struct gpio_led alix_leds[] = {
+ 	{
+ 		.name = "alix:1",
+@@ -64,17 +98,22 @@ static struct platform_device alix_leds_
+ 	.dev.platform_data = &alix_leds_data,
+ };
+ 
++static struct __initdata platform_device *alix_devs[] = {
++	&alix_buttons_dev,
++	&alix_leds_dev,
++};
++
+ static void __init register_alix(void)
+ {
+ 	/* Setup LED control through leds-gpio driver */
+-	platform_device_register(&alix_leds_dev);
++	platform_add_devices(alix_devs, ARRAY_SIZE(alix_devs));
+ }
+ 
+ static int __init alix_present(unsigned long bios_phys,
+ 				const char *alix_sig,
+ 				size_t alix_sig_len)
+ {
+-	const size_t bios_len = 0x00010000;
++	const size_t bios_len = BIOS_REGION_SIZE;
+ 	const char *bios_virt;
+ 	const char *scan_end;
+ 	const char *p;
+@@ -109,7 +148,8 @@ static int __init alix_present(unsigned
+ 			*a = '\0';
+ 
+ 		tail = p + alix_sig_len;
+-		if ((tail[0] == '2' || tail[0] == '3')) {
++		if ((tail[0] == '2' || tail[0] == '3' || tail[0] == '6')) {
++
+ 			printk(KERN_INFO
+ 			       "%s: system is recognized as \"%s\"\n",
+ 			       KBUILD_MODNAME, name);
+@@ -120,6 +160,24 @@ static int __init alix_present(unsigned
+ 	return 0;
+ }
+ 
++static bool __init alix_present_dmi(void)
++{
++	const char *vendor, *product;
++
++	vendor = dmi_get_system_info(DMI_SYS_VENDOR);
++	if (!vendor || strcmp(vendor, "PC Engines"))
++		return false;
++
++	product = dmi_get_system_info(DMI_PRODUCT_NAME);
++	if (!product || (strcmp(product, "ALIX.2D") && strcmp(product, "ALIX.6")))
++		return false;
++
++	printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
++	       KBUILD_MODNAME, vendor, product);
++
++	return true;
++}
++
+ static int __init alix_init(void)
+ {
+ 	const char tinybios_sig[] = "PC Engines ALIX.";
+@@ -128,8 +186,9 @@ static int __init alix_init(void)
+ 	if (!is_geode())
+ 		return 0;
+ 
+-	if (alix_present(0xf0000, tinybios_sig, sizeof(tinybios_sig) - 1) ||
+-	    alix_present(0x500, coreboot_sig, sizeof(coreboot_sig) - 1))
++	if (alix_present(BIOS_SIGNATURE_TINYBIOS, tinybios_sig, sizeof(tinybios_sig) - 1) ||
++	    alix_present(BIOS_SIGNATURE_COREBOOT, coreboot_sig, sizeof(coreboot_sig) - 1) ||
++	    alix_present_dmi())
+ 		register_alix();
+ 
+ 	return 0;
diff --git a/trunk/target/linux/x86/patches-3.3/002-geos_platform.patch b/trunk/target/linux/x86/patches-3.3/002-geos_platform.patch
new file mode 100644
index 00000000..50d8bb28
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/002-geos_platform.patch
@@ -0,0 +1,178 @@
+From 31bc84d45320dad2392384381ad4d818ab21087a Mon Sep 17 00:00:00 2001
+From: "Philip A. Prindeville" <philipp@redfish-solutions.com>
+Date: Wed, 18 Jan 2012 11:15:33 -0700
+Subject: [PATCH 1/1] geos: Platform driver for Geos and Geos2 single-board
+ computers.
+
+Trivial platform driver for Traverse Technologies Geos and Geos2
+single-board computers. Uses SMBIOS to identify platform.
+Based on progressive revisions of the leds-net5501 driver that
+was rewritten by Ed Wildgoose as a platform driver.
+
+Supports GPIO-based LEDs (3) and 1 polled button which is
+typically used for a soft reset.
+
+Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
+Reviewed-by: Ed Wildgoose <ed@wildgooses.com>
+Acked-by: Andres Salomon <dilinger@queued.net>
+Cc: Richard Purdie <rpurdie@rpsys.net>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+---
+ arch/x86/Kconfig                 |    7 ++
+ arch/x86/platform/geode/Makefile |    1 +
+ arch/x86/platform/geode/geos.c   |  128 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 136 insertions(+), 0 deletions(-)
+ create mode 100644 arch/x86/platform/geode/geos.c
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2133,6 +2133,13 @@ config ALIX
+ 
+ 	  Note: You have to set alix.force=1 for boards with Award BIOS.
+ 
++config GEOS
++	bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
++	select GPIOLIB
++	depends on DMI
++	---help---
++	  This option enables system support for the Traverse Technologies GEOS.
++
+ endif # X86_32
+ 
+ config AMD_NB
+--- a/arch/x86/platform/geode/Makefile
++++ b/arch/x86/platform/geode/Makefile
+@@ -1 +1,2 @@
+ obj-$(CONFIG_ALIX)		+= alix.o
++obj-$(CONFIG_GEOS)		+= geos.o
+--- /dev/null
++++ b/arch/x86/platform/geode/geos.c
+@@ -0,0 +1,128 @@
++/*
++ * System Specific setup for Traverse Technologies GEOS.
++ * At the moment this means setup of GPIO control of LEDs.
++ *
++ * Copyright (C) 2008 Constantin Baranov <const@mimas.ru>
++ * Copyright (C) 2011 Ed Wildgoose <kernel@wildgooses.com>
++ *                and Philip Prindeville <philipp@redfish-solutions.com>
++ *
++ * TODO: There are large similarities with leds-net5501.c
++ * by Alessandro Zummo <a.zummo@towertech.it>
++ * In the future leds-net5501.c should be migrated over to platform
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2
++ * as published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/io.h>
++#include <linux/string.h>
++#include <linux/module.h>
++#include <linux/leds.h>
++#include <linux/platform_device.h>
++#include <linux/gpio.h>
++#include <linux/input.h>
++#include <linux/gpio_keys.h>
++#include <linux/dmi.h>
++
++#include <asm/geode.h>
++
++static struct gpio_keys_button geos_gpio_buttons[] = {
++	{
++		.code = KEY_RESTART,
++		.gpio = 3,
++		.active_low = 1,
++		.desc = "Reset button",
++		.type = EV_KEY,
++		.wakeup = 0,
++		.debounce_interval = 100,
++		.can_disable = 0,
++	}
++};
++static struct gpio_keys_platform_data geos_buttons_data = {
++	.buttons = geos_gpio_buttons,
++	.nbuttons = ARRAY_SIZE(geos_gpio_buttons),
++	.poll_interval = 20,
++};
++
++static struct platform_device geos_buttons_dev = {
++	.name = "gpio-keys-polled",
++	.id = 1,
++	.dev = {
++		.platform_data = &geos_buttons_data,
++	}
++};
++
++static struct gpio_led geos_leds[] = {
++	{
++		.name = "geos:1",
++		.gpio = 6,
++		.default_trigger = "default-on",
++		.active_low = 1,
++	},
++	{
++		.name = "geos:2",
++		.gpio = 25,
++		.default_trigger = "default-off",
++		.active_low = 1,
++	},
++	{
++		.name = "geos:3",
++		.gpio = 27,
++		.default_trigger = "default-off",
++		.active_low = 1,
++	},
++};
++
++static struct gpio_led_platform_data geos_leds_data = {
++	.num_leds = ARRAY_SIZE(geos_leds),
++	.leds = geos_leds,
++};
++
++static struct platform_device geos_leds_dev = {
++	.name = "leds-gpio",
++	.id = -1,
++	.dev.platform_data = &geos_leds_data,
++};
++
++static struct __initdata platform_device *geos_devs[] = {
++	&geos_buttons_dev,
++	&geos_leds_dev,
++};
++
++static void __init register_geos(void)
++{
++	/* Setup LED control through leds-gpio driver */
++	platform_add_devices(geos_devs, ARRAY_SIZE(geos_devs));
++}
++
++static int __init geos_init(void)
++{
++	const char *vendor, *product;
++
++	if (!is_geode())
++		return 0;
++
++	vendor = dmi_get_system_info(DMI_SYS_VENDOR);
++	if (!vendor || strcmp(vendor, "Traverse Technologies"))
++		return 0;
++
++	product = dmi_get_system_info(DMI_PRODUCT_NAME);
++	if (!product || strcmp(product, "Geos"))
++		return 0;
++
++	printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
++	       KBUILD_MODNAME, vendor, product);
++
++	register_geos();
++
++	return 0;
++}
++
++module_init(geos_init);
++
++MODULE_AUTHOR("Philip Prindeville <philipp@redfish-solutions.com>");
++MODULE_DESCRIPTION("Traverse Technologies Geos System Setup");
++MODULE_LICENSE("GPL");
diff --git a/trunk/target/linux/x86/patches-3.3/003-via-rhine-crash-fix.patch b/trunk/target/linux/x86/patches-3.3/003-via-rhine-crash-fix.patch
new file mode 100644
index 00000000..26bc380d
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/003-via-rhine-crash-fix.patch
@@ -0,0 +1,60 @@
+--- a/drivers/net/ethernet/via/via-rhine.c
++++ b/drivers/net/ethernet/via/via-rhine.c
+@@ -689,9 +689,12 @@ static void __devinit rhine_reload_eepro
+ #ifdef CONFIG_NET_POLL_CONTROLLER
+ static void rhine_poll(struct net_device *dev)
+ {
+-	disable_irq(dev->irq);
+-	rhine_interrupt(dev->irq, (void *)dev);
+-	enable_irq(dev->irq);
++	struct rhine_private *rp = netdev_priv(dev);
++	const int irq = rp->pdev->irq;
++
++	disable_irq(irq);
++	rhine_interrupt(irq, dev);
++	enable_irq(irq);
+ }
+ #endif
+
+@@ -929,7 +932,6 @@ static int __devinit rhine_init_one(stru
+ 	dev = alloc_etherdev(sizeof(struct rhine_private));
+ 	if (!dev) {
+ 		rc = -ENOMEM;
+-		dev_err(&pdev->dev, "alloc_etherdev failed\n");
+ 		goto err_out;
+ 	}
+ 	SET_NETDEV_DEV(dev, &pdev->dev);
+@@ -973,7 +975,6 @@ static int __devinit rhine_init_one(stru
+ 	}
+ #endif /* USE_MMIO */
+
+-	dev->base_addr = (unsigned long)ioaddr;
+ 	rp->base = ioaddr;
+
+ 	/* Get chip registers into a sane state */
+@@ -996,8 +997,6 @@ static int __devinit rhine_init_one(stru
+ 	if (!phy_id)
+ 		phy_id = ioread8(ioaddr + 0x6C);
+
+-	dev->irq = pdev->irq;
+-
+ 	spin_lock_init(&rp->lock);
+ 	mutex_init(&rp->task_lock);
+ 	INIT_WORK(&rp->reset_task, rhine_reset_task);
+@@ -1158,7 +1157,6 @@ static void alloc_rbufs(struct net_devic
+ 		rp->rx_skbuff[i] = skb;
+ 		if (skb == NULL)
+ 			break;
+-		skb->dev = dev;                 /* Mark as being used by this device. */
+
+ 		rp->rx_skbuff_dma[i] =
+ 			pci_map_single(rp->pdev, skb->data, rp->rx_buf_sz,
+@@ -1943,7 +1941,6 @@ static int rhine_rx(struct net_device *d
+ 			rp->rx_skbuff[entry] = skb;
+ 			if (skb == NULL)
+ 				break;	/* Better luck next round. */
+-			skb->dev = dev;	/* Mark as being used by this device. */
+ 			rp->rx_skbuff_dma[entry] =
+ 				pci_map_single(rp->pdev, skb->data,
+ 					       rp->rx_buf_sz,
+
diff --git a/trunk/target/linux/x86/patches-3.3/006-yenta_mistery.patch b/trunk/target/linux/x86/patches-3.3/006-yenta_mistery.patch
new file mode 100644
index 00000000..65893ea2
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/006-yenta_mistery.patch
@@ -0,0 +1,20 @@
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -1233,6 +1233,17 @@ static int __devinit yenta_probe(struct
+ 
+ 	/* We must finish initialization here */
+ 
++#ifdef CONFIG_X86_RDC321X
++/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */
++#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060
++/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */
++
++	config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK);
++	config_writel(socket, 35*4, 0x00000022);
++	config_writel(socket, 36*4, 0x60200000);
++	config_writel(socket, 40*4, 0x7e020000);
++#endif
++
+ 	if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
+ 		/* No IRQ or request_irq failed. Poll */
+ 		socket->cb_irq = 0; /* But zero is a valid IRQ number. */
diff --git a/trunk/target/linux/x86/patches-3.3/009-rdc321x_select_embedded.patch b/trunk/target/linux/x86/patches-3.3/009-rdc321x_select_embedded.patch
new file mode 100644
index 00000000..2d094fc7
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/009-rdc321x_select_embedded.patch
@@ -0,0 +1,11 @@
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -466,6 +466,8 @@ config X86_RDC321X
+ 	depends on X86_EXTENDED_PLATFORM
+ 	select M486
+ 	select X86_REBOOTFIXUPS
++	select EMBEDDED
++	select ARCH_REQUIRE_GPIOLIB
+ 	---help---
+ 	  This option is needed for RDC R-321x system-on-chip, also known
+ 	  as R-8610-(G).
diff --git a/trunk/target/linux/x86/patches-3.3/010-rdc_cpu_ident.patch b/trunk/target/linux/x86/patches-3.3/010-rdc_cpu_ident.patch
new file mode 100644
index 00000000..a770be2e
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/010-rdc_cpu_ident.patch
@@ -0,0 +1,176 @@
+--- /dev/null
++++ b/Documentation/x86/rdc.txt
+@@ -0,0 +1,69 @@
++
++Introduction
++============
++
++RDC (http://www.rdc.com.tw) have been manufacturing x86-compatible SoC
++(system-on-chips) for a number of years.  They are not the fastest of
++CPUs (clock speeds ranging from 133-150MHz) but 486SX compatibility
++coupled with very low power consumption[1] and low cost make them ideal
++for embedded applications.
++
++
++Where to find
++=============
++
++RDC chips show up in numerous embedded devices, but be careful since
++many of them will not run Linux 2.6 without significant expertise.
++
++There are several variants of what the linux kernel refers to generically
++as RDC321X:  R8610, R321x, S3282 and AMRISC20000.
++
++R321x: Found in various routers, see the libreCMC project for details,
++   http://wiki.openwrt.org/oldwiki/rdcport
++
++R8610: Found on the RDC evaluation board
++   http://www.ivankuten.com/system-on-chip-soc/rdc-r8610/
++
++AMRISC20000: Found in the MGB-100 wireless hard disk
++   http://tintuc.no-ip.com/linux/tipps/mgb100/
++
++S3282: Found in various NAS devices, including the Bifferboard
++   http://www.bifferos.com
++
++
++Kernel Configuration
++====================
++
++Add support for this CPU with CONFIG_X86_RDC321X.  Ensure that maths
++emulation is included (CONFIG_MATH_EMULATION selected) and avoid MCE
++(CONFIG_X86_MCE not selected).
++
++
++CPU detection
++=============
++
++None of these chips support the cpuid instruction, so as with some
++other x86 compatible SoCs, we must check the north bridge and look
++for specific 'signature' PCI device config.
++
++The current detection code has been tested only on the Bifferboard
++(S3282 CPU), please send bug reports or success stories with
++other devices to bifferos@yahoo.co.uk.
++
++
++Credits
++=======
++
++Many thanks to RDC for providing the customer codes to allow
++detection of all known variants, without which this detection code
++would have been very hard to ascertain.
++
++
++References
++==========
++
++[1] S3282 in certain NAS solutions consumes less than 1W
++
++
++mark@bifferos.com 2009
++
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -464,6 +464,7 @@ config X86_RDC321X
+ 	bool "RDC R-321x SoC"
+ 	depends on X86_32
+ 	depends on X86_EXTENDED_PLATFORM
++	select PCI
+ 	select M486
+ 	select X86_REBOOTFIXUPS
+ 	select EMBEDDED
+--- a/arch/x86/include/asm/processor.h
++++ b/arch/x86/include/asm/processor.h
+@@ -119,7 +119,8 @@ struct cpuinfo_x86 {
+ #define X86_VENDOR_CENTAUR	5
+ #define X86_VENDOR_TRANSMETA	7
+ #define X86_VENDOR_NSC		8
+-#define X86_VENDOR_NUM		9
++#define X86_VENDOR_RDC		9
++#define X86_VENDOR_NUM		10
+ 
+ #define X86_VENDOR_UNKNOWN	0xff
+ 
+--- a/arch/x86/kernel/cpu/Makefile
++++ b/arch/x86/kernel/cpu/Makefile
+@@ -26,6 +26,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix
+ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centaur.o
+ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
+ obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
++obj-$(CONFIG_X86_RDC321X)		+= rdc.o
+ 
+ obj-$(CONFIG_PERF_EVENTS)		+= perf_event.o
+ 
+--- /dev/null
++++ b/arch/x86/kernel/cpu/rdc.c
+@@ -0,0 +1,69 @@
++/*
++ * See Documentation/x86/rdc.txt
++ *
++ * mark@bifferos.com
++ */
++
++#include <linux/pci.h>
++#include <asm/pci-direct.h>
++#include "cpu.h"
++
++
++static void __cpuinit rdc_identify(struct cpuinfo_x86 *c)
++{
++	u16 vendor, device;
++	u32 customer_id;
++
++	if (!early_pci_allowed())
++		return;
++
++	/* RDC CPU is SoC (system-on-chip), Northbridge is always present */
++	vendor = read_pci_config_16(0, 0, 0, PCI_VENDOR_ID);
++	device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID);
++
++	if (vendor != PCI_VENDOR_ID_RDC || device != PCI_DEVICE_ID_RDC_R6020)
++		return;  /* not RDC */
++	/*
++	 * NB: We could go on and check other devices, e.g. r6040 NIC, but
++	 * that's probably overkill
++	 */
++
++	customer_id = read_pci_config(0, 0, 0, 0x90);
++
++	switch (customer_id) {
++		/* id names are from RDC */
++	case 0x00321000:
++		strcpy(c->x86_model_id, "R3210/R3211");
++		break;
++	case 0x00321001:
++		strcpy(c->x86_model_id, "AMITRISC20000/20010");
++		break;
++	case 0x00321002:
++		strcpy(c->x86_model_id, "R3210X/Edimax");
++		break;
++	case 0x00321003:
++		strcpy(c->x86_model_id, "R3210/Kcodes");
++		break;
++	case 0x00321004:  /* tested */
++		strcpy(c->x86_model_id, "S3282/CodeTek");
++		break;
++	case 0x00321007:
++		strcpy(c->x86_model_id, "R8610");
++		break;
++	default:
++		pr_info("RDC CPU: Unrecognised Customer ID (0x%x) please report to linux-kernel@vger.kernel.org\n", customer_id);
++		break;
++	}
++
++	strcpy(c->x86_vendor_id, "RDC");
++	c->x86_vendor = X86_VENDOR_RDC;
++}
++
++static const struct cpu_dev __cpuinitconst rdc_cpu_dev = {
++	.c_vendor	= "RDC",
++	.c_ident	= { "RDC" },
++	.c_identify	= rdc_identify,
++	.c_x86_vendor	= X86_VENDOR_RDC,
++};
++
++cpu_dev_register(rdc_cpu_dev);
diff --git a/trunk/target/linux/x86/patches-3.3/011-tune_lzma_options.patch b/trunk/target/linux/x86/patches-3.3/011-tune_lzma_options.patch
new file mode 100644
index 00000000..e6fd44d4
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/011-tune_lzma_options.patch
@@ -0,0 +1,22 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -296,7 +296,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/arch/x86/include/asm/boot.h
++++ b/arch/x86/include/asm/boot.h
+@@ -28,7 +28,7 @@
+ #error "Invalid value for CONFIG_PHYSICAL_ALIGN"
+ #endif
+ 
+-#ifdef CONFIG_KERNEL_BZIP2
++#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA)
+ #define BOOT_HEAP_SIZE             0x400000
+ #else /* !CONFIG_KERNEL_BZIP2 */
+ 
diff --git a/trunk/target/linux/x86/patches-3.3/012-export_erase_write.patch b/trunk/target/linux/x86/patches-3.3/012-export_erase_write.patch
new file mode 100644
index 00000000..893d4d82
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/012-export_erase_write.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
+@@ -62,7 +62,7 @@ static void erase_callback(struct erase_
+ 	wake_up(wait_q);
+ }
+ 
+-static int erase_write (struct mtd_info *mtd, unsigned long pos,
++int erase_write (struct mtd_info *mtd, unsigned long pos,
+ 			int len, const char *buf)
+ {
+ 	struct erase_info erase;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -530,6 +530,9 @@ extern void register_mtd_user (struct mt
+ extern int unregister_mtd_user (struct mtd_notifier *old);
+ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
+ 
++int erase_write (struct mtd_info *mtd, unsigned long pos,
++		 int len, const char *buf);
++
+ void mtd_erase_callback(struct erase_info *instr);
+ 
+ static inline int mtd_is_bitflip(int err) {
diff --git a/trunk/target/linux/x86/patches-3.3/100-rdc_boards.patch b/trunk/target/linux/x86/patches-3.3/100-rdc_boards.patch
new file mode 100644
index 00000000..b3cbda22
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/100-rdc_boards.patch
@@ -0,0 +1,741 @@
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -136,6 +136,9 @@ libs-y  += arch/x86/lib/
+ # See arch/x86/Kbuild for content of core part of the kernel
+ core-y += arch/x86/
+ 
++# RDC R-321X support
++core-$(CONFIG_X86_RDC321X)   += arch/x86/mach-rdc321x/
++
+ # drivers-y are linked after core-y
+ drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
+ drivers-$(CONFIG_PCI)            += arch/x86/pci/
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/Makefile
+@@ -0,0 +1,5 @@
++#
++# Makefile for the RDC321x specific parts of the kernel
++#
++obj-$(CONFIG_X86_RDC321X)	:= platform.o reboot.o boards/sitecom.o boards/ar525w.o boards/bifferboard.o boards/r8610.o
++
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/platform.c
+@@ -0,0 +1,115 @@
++/*
++ *  Generic RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/map.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/physmap.h>
++#include <linux/root_dev.h>
++
++#include <asm/rdc_boards.h>
++
++static struct rdc_platform_data rdcplat_data;
++
++/* LEDS */
++static struct platform_device rdc321x_leds = {
++	.name = "leds-gpio",
++	.id = -1,
++	.dev = {
++		.platform_data = &rdcplat_data.led_data,
++	}
++};
++
++/* Button */
++static struct platform_device rdc321x_buttons = {
++	.name = "gpio-keys-polled",
++	.id = -1,
++	.dev = {
++		.platform_data = &rdcplat_data.button_data,
++	}
++};
++
++static __initdata struct platform_device *rdc321x_devs[] = {
++	&rdc321x_leds,
++	&rdc321x_buttons,
++};
++
++const char *__initdata boards[] = {
++	"Sitecom",
++	"AR525W",
++	"Bifferboard",
++	"R8610",
++	0
++};
++
++static struct map_info rdc_map_info = {
++	.name		= "rdc_flash",
++	.size		= 0x800000,	/* 8MB */
++	.phys		= 0xFF800000,	/* (u32) -rdc_map_info.size */
++	.bankwidth	= 2,
++};
++
++static int __init rdc_board_setup(void)
++{
++	struct mtd_info *mtdinfo;
++	struct mtd_part_parser_data *ppdata;
++	int res;
++
++	simple_map_init(&rdc_map_info);
++
++	while (1) {
++		rdc_map_info.virt = ioremap(rdc_map_info.phys,
++					    rdc_map_info.size);
++		if (rdc_map_info.virt == NULL)
++			continue;
++
++		mtdinfo = do_map_probe("cfi_probe", &rdc_map_info);
++		if (mtdinfo == NULL)
++			mtdinfo = do_map_probe("jedec_probe", &rdc_map_info);
++		if (mtdinfo != NULL)
++			break;
++
++		iounmap(rdc_map_info.virt);
++		if ((rdc_map_info.size >>= 1) < 0x100000)	/* 1MB */
++			panic("RDC321x: Could not find start of flash!");
++		rdc_map_info.phys = (u32) -rdc_map_info.size;
++	}
++
++	/*
++	 * TODO: add a new field to mtd_part_parser_data, and use that
++	 * instead of this ugly casting
++	 */
++	ppdata = (struct mtd_part_parser_data *) &rdcplat_data;
++	res = mtd_device_parse_register(mtdinfo, boards, ppdata, NULL, 0);
++	if (res) {
++		panic("RDC321x: can't identify board type");
++		return -ENOSYS;
++	}
++
++	ROOT_DEV = 0;
++
++	return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs));
++}
++late_initcall(rdc_board_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/ar525w.c
+@@ -0,0 +1,247 @@
++/*
++ * ar525w RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/vmalloc.h>
++#include <linux/mtd/mtd.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++struct image_header {
++	char magic[4];              /* ASICII: GMTK */
++	u32 checksum;               /* CRC32 */
++	u32 version;                /* x.x.x.x */
++	u32 kernelsz;               /* The size of the kernel image */
++	u32 imagesz;                /* The length of this image file ( kernel + romfs + this header) */
++	u32 pid;                    /* Product ID */
++	u32 fastcksum;              /* Partial CRC32 on (First(256), medium(256), last(512)) */
++	u32 reserved;
++};
++
++static struct gpio_led ar525w_leds[] = {
++	{ .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
++};
++static struct gpio_keys_button ar525w_btns[] = {
++	{
++		.gpio = 6,
++		.code = BTN_0,
++		.desc = "Reset",
++		.active_low = 1,
++	}
++};
++
++static u32 __initdata crctab[257] = {
++	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,
++	0
++};
++
++static u32 __init crc32(u8 * buf, u32 len)
++{
++	register int i;
++	u32 sum;
++	register u32 s0;
++	s0 = ~0;
++	for (i = 0; i < len; i++) {
++		s0 = (s0 >> 8) ^ crctab[(u8) (s0 & 0xFF) ^ buf[i]];
++	}
++	sum = ~s0;
++	return sum;
++}
++
++static int __init fixup_ar525w_header(struct mtd_info *master, struct image_header *header)
++{
++	char *buffer;
++	int res;
++	u32 bufferlength = header->kernelsz + sizeof(struct image_header);
++	u32 len;
++	static char crcbuf[0x400];
++
++	printk(KERN_INFO "Fixing up AR525W header, old image size: %u, new image size: %u\n",
++		   header->imagesz, bufferlength);
++
++	buffer = vmalloc(bufferlength);
++	if (!buffer) {
++		printk(KERN_ERR "Can't allocate %u bytes\n", bufferlength);
++		return -ENOMEM;
++	}
++
++	res =  master->read(master, 0x0, bufferlength, &len, buffer);
++	if (res || len != bufferlength)
++		goto out;
++
++	header = (struct image_header *) buffer;
++	header->imagesz = bufferlength;
++	header->checksum = 0;
++	header->fastcksum = 0;
++
++	memcpy(crcbuf, buffer, 0x100);
++	memcpy(crcbuf + 0x100, buffer + (bufferlength >> 1) - ((bufferlength & 0x6) >> 1), 0x100);
++	memcpy(crcbuf + 0x200, buffer + bufferlength - 0x200, 0x200);
++
++	header->fastcksum = crc32(crcbuf, sizeof(crcbuf));
++	header->checksum = crc32(buffer, bufferlength);
++
++	if (master->unlock)
++		master->unlock(master, 0, master->erasesize);
++	res = erase_write (master, 0, master->erasesize, buffer);
++	if (res)
++		printk(KERN_ERR "Can't rewrite image header\n");
++
++out:
++	vfree(buffer);
++	return res;
++}
++
++static int __init
++parse_ar525w_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++			struct mtd_part_parser_data *plat_data)
++{
++	struct image_header header;
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
++
++	if (master->size != 0x400000) //4MB
++		return -ENOSYS;
++
++	res =  master->read(master, 0x0, sizeof(header), &len, (char *)&header);
++	if (res)
++		return res;
++
++	if (strncmp(header.magic, "GMTK", 4))
++		return -ENOSYS;
++
++	if (header.kernelsz > 0x400000 || header.kernelsz < master->erasesize) {
++		printk(KERN_ERR "AR525W image header found, but seems corrupt, kernel size %u\n", header.kernelsz);
++		return -EINVAL;
++	}
++
++	if (header.kernelsz + sizeof(header) != header.imagesz) {
++		res = fixup_ar525w_header(master, &header);
++		if (res)
++			return res;
++	}
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL);
++
++	rdc_flash_parts[0].name = "firmware";
++	rdc_flash_parts[0].offset = 0x0;
++	rdc_flash_parts[0].size = 0x3E0000;
++	rdc_flash_parts[1].name = "rootfs";
++	rdc_flash_parts[1].offset = header.kernelsz + sizeof(header);
++	rdc_flash_parts[1].size = rdc_flash_parts[0].size - rdc_flash_parts[1].offset;
++	rdc_flash_parts[2].name = "bootloader";
++	rdc_flash_parts[2].offset = 0x3E0000;
++	rdc_flash_parts[2].size = 0x20000;
++
++	*pparts = rdc_flash_parts;
++
++	pdata->led_data.num_leds = ARRAY_SIZE(ar525w_leds);
++	pdata->led_data.leds = ar525w_leds;
++	pdata->button_data.nbuttons = ARRAY_SIZE(ar525w_btns);
++	pdata->button_data.buttons = ar525w_btns;
++
++	return 3;
++}
++
++static struct mtd_part_parser __initdata ar525w_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_ar525w_partitions,
++	.name = "AR525W",
++};
++
++static int __init ar525w_setup(void)
++{
++	return register_mtd_parser(&ar525w_parser);
++}
++
++arch_initcall(ar525w_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/bifferboard.c
+@@ -0,0 +1,74 @@
++/*
++ *  Bifferboard RDC321x platform devices
++ *
++ *  Copyright (C) 2010 bifferos@yahoo.co.uk
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++static int __init
++parse_bifferboard_partitions(struct mtd_info *master,
++			     struct mtd_partition **pparts,
++			     struct mtd_part_parser_data *plat_data)
++{
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	u32 kernel_len;
++	u16 tmp;
++
++	res =  master->read(master, 0x4000 + 1036, 2, &len, (char *) &tmp);
++	if (res)
++		return res;
++	kernel_len = tmp * master->erasesize;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL);
++
++	*pparts = rdc_flash_parts;
++
++	rdc_flash_parts[0].name = "kernel";
++	rdc_flash_parts[0].offset = 0;
++	rdc_flash_parts[0].size = kernel_len;
++	rdc_flash_parts[1].name = "rootfs";
++	rdc_flash_parts[1].offset = kernel_len;
++	rdc_flash_parts[1].size = master->size - kernel_len - 0x10000;
++	rdc_flash_parts[2].name = "biffboot";
++	rdc_flash_parts[2].offset = master->size - 0x10000;
++	rdc_flash_parts[2].size = 0x10000;
++
++	return 3;
++}
++
++struct mtd_part_parser __initdata bifferboard_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_bifferboard_partitions,
++	.name = "Bifferboard",
++};
++
++static int __init bifferboard_setup(void)
++{
++	return register_mtd_parser(&bifferboard_parser);
++}
++arch_initcall(bifferboard_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/r8610.c
+@@ -0,0 +1,69 @@
++/*
++ *  R8610 RDC321x platform devices
++ *
++ *  Copyright (C) 2009, Florian Fainelli <florian@openwrt.org>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++static int __init
++parse_r8610_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++		       struct mtd_part_parser_data *plat_data)
++{
++	struct mtd_partition *rdc_flash_parts;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 4, GFP_KERNEL);
++
++	*pparts = rdc_flash_parts;
++
++	rdc_flash_parts[0].name = "kernel";
++	rdc_flash_parts[0].size = 0x001f0000;
++	rdc_flash_parts[0].offset = 0;
++	rdc_flash_parts[1].name = "config";
++	rdc_flash_parts[1].size = 0x10000;
++	rdc_flash_parts[1].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[2].name = "rootfs";
++	rdc_flash_parts[2].size = 0x1E0000;
++	rdc_flash_parts[2].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[3].name = "redboot";
++	rdc_flash_parts[3].size = 0x20000;
++	rdc_flash_parts[3].offset = MTDPART_OFS_APPEND;
++	rdc_flash_parts[3].mask_flags = MTD_WRITEABLE;
++
++	return 4;
++}
++
++struct mtd_part_parser __initdata r8610_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_r8610_partitions,
++	.name = "R8610",
++};
++
++static int __init r8610_setup(void)
++{
++	return register_mtd_parser(&r8610_parser);
++}
++
++arch_initcall(r8610_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/boards/sitecom.c
+@@ -0,0 +1,115 @@
++/*
++ *  Sitecom RDC321x platform devices
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/input.h>
++#include <linux/slab.h>
++
++#include <asm/rdc_boards.h>
++
++struct image_header {
++	char	magic[4];
++	u32	kernel_length;
++	u32	ramdisk_length;
++	char	magic2[4];
++	u32	kernel_length2;
++};
++
++static struct gpio_led sitecom_leds[] = {
++	{ .name = "rdc321x:power", .gpio = 15, .active_low = 1},
++	{ .name = "rdc321x:usb0", .gpio = 0, .active_low = 1},
++	{ .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
++};
++
++static struct gpio_keys_button sitecom_btns[] = {
++	{
++		.gpio = 6,
++		.code = BTN_0,
++		.desc = "Reset",
++		.active_low = 1,
++	}
++};
++
++static int __init
++parse_sitecom_partitions(struct mtd_info *master, struct mtd_partition **pparts,
++			 struct mtd_part_parser_data *plat_data)
++{
++	struct image_header header;
++	int res;
++	size_t len;
++	struct mtd_partition *rdc_flash_parts;
++	struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
++
++	if (master->size != 0x400000) /* 4MB */
++		return -ENOSYS;
++
++	res =  master->read(master, 0x8000, sizeof(header), &len, (char *)&header);
++	if (res)
++		return res;
++
++	if (strncmp(header.magic, "CSYS", 4) || strncmp(header.magic2, "WRRM", 4))
++		return -ENOSYS;
++
++	rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 5, GFP_KERNEL);
++
++	rdc_flash_parts[0].name = "firmware";
++	rdc_flash_parts[0].offset = 0x8000;
++	rdc_flash_parts[0].size = 0x3F0000 - 0x8000;
++	rdc_flash_parts[1].name = "config";
++	rdc_flash_parts[1].offset = 0;
++	rdc_flash_parts[1].size = 0x8000;
++	rdc_flash_parts[2].name = "kernel";
++	rdc_flash_parts[2].offset = 0x8014;
++	rdc_flash_parts[2].size = header.kernel_length;
++	rdc_flash_parts[3].name = "rootfs";
++	rdc_flash_parts[3].offset = 0x8014 + header.kernel_length;
++	rdc_flash_parts[3].size = 0x3F0000 - rdc_flash_parts[3].offset;
++	rdc_flash_parts[4].name = "bootloader";
++	rdc_flash_parts[4].offset = 0x3F0000;
++	rdc_flash_parts[4].size = 0x10000;
++
++	*pparts = rdc_flash_parts;
++
++	pdata->led_data.num_leds = ARRAY_SIZE(sitecom_leds);
++	pdata->led_data.leds = sitecom_leds;
++	pdata->button_data.nbuttons = ARRAY_SIZE(sitecom_btns);
++	pdata->button_data.buttons = sitecom_btns;
++
++	return 5;
++}
++
++struct mtd_part_parser __initdata sitecom_parser = {
++	.owner = THIS_MODULE,
++	.parse_fn = parse_sitecom_partitions,
++	.name = "Sitecom",
++};
++
++static int __init sitecom_setup(void)
++{
++	return register_mtd_parser(&sitecom_parser);
++}
++
++arch_initcall(sitecom_setup);
+--- /dev/null
++++ b/arch/x86/mach-rdc321x/reboot.c
+@@ -0,0 +1,44 @@
++/*
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#include <asm/reboot.h>
++#include <asm/io.h>
++
++static void rdc321x_reset(void)
++{
++	unsigned i;
++
++	/* write to southbridge config register 0x41
++	   enable pci reset on cpu reset, make internal port 0x92 writeable
++	   and switch port 0x92 to internal */
++	outl(0x80003840, 0xCF8);
++	i = inl(0xCFC);
++	i |= 0x1600;
++	outl(i, 0xCFC);
++
++	/* soft reset */
++	outb(1, 0x92);
++}
++
++static int __init rdc_setup_reset(void)
++{
++	machine_ops.emergency_restart = rdc321x_reset;
++	return 0;
++}
++
++arch_initcall(rdc_setup_reset);
+--- /dev/null
++++ b/arch/x86/include/asm/rdc_boards.h
+@@ -0,0 +1,36 @@
++/*
++ *  RDC321x boards
++ *
++ *  Copyright (C) 2007-2009 OpenWrt.org
++ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
++ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
++ *
++ *  This program is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public License
++ *  as published by the Free Software Foundation; either version 2
++ *  of the License, or (at your option) any later version.
++ *
++ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
++ *  Boston, MA  02110-1301, USA.
++ *
++ */
++
++#ifndef _RDC_BOARDS_H__
++#define _RDC_BOARDS_H__
++
++#include <linux/leds.h>
++#include <linux/gpio_keys.h>
++
++struct rdc_platform_data {
++	struct gpio_led_platform_data led_data;
++	struct gpio_keys_platform_data button_data;
++};
++
++#endif
diff --git a/trunk/target/linux/x86/patches-3.3/120-panic_on_unrecovered_nmi.patch b/trunk/target/linux/x86/patches-3.3/120-panic_on_unrecovered_nmi.patch
new file mode 100644
index 00000000..6a1279ce
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/120-panic_on_unrecovered_nmi.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mfd/rdc321x-southbridge.c
++++ b/drivers/mfd/rdc321x-southbridge.c
+@@ -86,6 +86,8 @@ static int __devinit rdc321x_sb_probe(st
+ 	rdc321x_gpio_pdata.sb_pdev = pdev;
+ 	rdc321x_wdt_pdata.sb_pdev = pdev;
+ 
++	panic_on_unrecovered_nmi = 1;
++
+ 	return mfd_add_devices(&pdev->dev, -1,
+ 		rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), NULL, 0);
+ }
diff --git a/trunk/target/linux/x86/patches-3.3/150-pit-tick-rate.patch b/trunk/target/linux/x86/patches-3.3/150-pit-tick-rate.patch
new file mode 100644
index 00000000..5af3cef2
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/150-pit-tick-rate.patch
@@ -0,0 +1,14 @@
+--- a/include/linux/timex.h
++++ b/include/linux/timex.h
+@@ -274,7 +274,11 @@ extern void hardpps(const struct timespe
+ int read_current_timer(unsigned long *timer_val);
+ 
+ /* The clock frequency of the i8253/i8254 PIT */
++#ifdef CONFIG_X86_RDC321X
++#define PIT_TICK_RATE 1041816ul
++#else
+ #define PIT_TICK_RATE 1193182ul
++#endif
+ 
+ #endif /* KERNEL */
+ 
diff --git a/trunk/target/linux/x86/patches-3.3/160-kexec-fix.patch b/trunk/target/linux/x86/patches-3.3/160-kexec-fix.patch
new file mode 100644
index 00000000..ea32494a
--- /dev/null
+++ b/trunk/target/linux/x86/patches-3.3/160-kexec-fix.patch
@@ -0,0 +1,43 @@
+From 357954613bdbab0c1f3986589ff30cc4855a2efd Mon Sep 17 00:00:00 2001
+From: root <root@cent.localnet>
+Date: Sun, 6 Dec 2009 18:26:43 +0000
+Subject: [PATCH 03/14] kexec fix
+
+---
+ arch/x86/kernel/relocate_kernel_32.S |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+--- a/arch/x86/kernel/relocate_kernel_32.S
++++ b/arch/x86/kernel/relocate_kernel_32.S
+@@ -54,8 +54,10 @@ relocate_kernel:
+ 	movl	%eax, CR0(%edi)
+ 	movl	%cr3, %eax
+ 	movl	%eax, CR3(%edi)
++#ifndef CONFIG_X86_RDC321X
+ 	movl	%cr4, %eax
+ 	movl	%eax, CR4(%edi)
++#endif
+ 
+ 	/* read the arguments and say goodbye to the stack */
+ 	movl  20+4(%esp), %ebx /* page_list */
+@@ -124,7 +126,9 @@ identity_mapped:
+ 	 * Setting everything to zero seems safe.
+ 	 */
+ 	xorl	%eax, %eax
++#ifndef CONFIG_X86_RDC321X
+ 	movl	%eax, %cr4
++#endif
+ 
+ 	jmp 1f
+ 1:
+@@ -195,8 +199,10 @@ identity_mapped:
+ 	ret
+ 
+ virtual_mapped:
++#ifndef CONFIG_X86_RDC321X
+ 	movl	CR4(%edi), %eax
+ 	movl	%eax, %cr4
++#endif
+ 	movl	CR3(%edi), %eax
+ 	movl	%eax, %cr3
+ 	movl	CR0(%edi), %eax
diff --git a/trunk/target/linux/x86/rdc/base-files/etc/config/network b/trunk/target/linux/x86/rdc/base-files/etc/config/network
new file mode 100644
index 00000000..69627f7c
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/base-files/etc/config/network
@@ -0,0 +1,26 @@
+# Copyright (C) 2009 OpenWrt.org
+
+config interface loopback
+        option ifname   lo
+        option proto    static
+        option ipaddr   127.0.0.1
+        option netmask  255.0.0.0
+
+config interface lan
+        option ifname   eth1
+        option type     bridge
+        option proto    static
+        option ipaddr   192.168.1.1
+        option netmask  255.255.255.0
+        option ip6assign 60
+
+config interface wan
+	option ifname	eth0
+	option proto	dhcp
+
+config interface wan6
+        option ifname   eth0
+        option proto    dhcpv6
+
+config globals globals
+        option ula_prefix auto
diff --git a/trunk/target/linux/x86/rdc/base-files/etc/diag.sh b/trunk/target/linux/x86/rdc/base-files/etc/diag.sh
new file mode 100644
index 00000000..03796d77
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/base-files/etc/diag.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Copyright (C) 2007-2013 OpenWrt.org
+
+. /lib/functions/leds.sh
+
+status_led="rdc321x:dmz"
+
+set_state() {
+	case "$1" in
+	preinit)
+		status_led_on
+		;;
+	done)
+		status_led_off
+		;;
+	esac
+}
diff --git a/trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc b/trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
new file mode 100644
index 00000000..0518766a
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Copyright (C) 2009-2012 OpenWrt.org
+
+. /lib/functions.sh
+
+r6040_module() {
+	insmod libphy
+	insmod swconfig
+	insmod ip17xx
+	sleep 1
+	insmod r6040
+}
+
+set_ether_mac() {
+	kernel=$(grep firmware /proc/mtd | awk -F: '{print $1}')
+	[ -n "$kernel" ] && hdr=$(dd if=/dev/$kernel count=4 bs=1 2> /dev/null)
+	[ "$hdr" = "CSYS" ] && config=$(find_mtd_part config)
+	if [ -n "$config" ]; then
+		mac0=$(hexdump -n 6 -e '6/1 ":%X"' -s 24583 $config | cut -c2-)
+		[ "$mac0" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac0
+		mac1=$(hexdump -n 6 -e '6/1 ":%X"' -s 24589 $config | cut -c2-)
+		[ "$mac1" = "FF:FF:FF:FF:FF:FF" -o "$mac1" = "0:0:0:0:0:0" ] && unset mac1
+	fi
+	if [ -n "$mac0" ]; then
+		logger -t kernel -p user.info "r6040: Setting MAC for eth0 to $mac0"
+		ifconfig eth0 hw ether "$mac0"
+	fi
+	if [ -n "$mac1" ]; then
+		logger -t kernel -p user.info "r6040: Setting MAC for eth1 to $mac1"
+		ifconfig eth1 hw ether "$mac1"
+	fi
+}
+
+boot_hook_add preinit_main r6040_module
+boot_hook_add preinit_main set_ether_mac
+
diff --git a/trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh b/trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh
new file mode 100644
index 00000000..6348a699
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,10 @@
+PART_NAME=firmware
+
+platform_check_image() {
+	[ "$(get_magic_word $(find_mtd_part firmware))" -eq "$(get_magic_word "$1")" ] && return 0
+
+	echo "Invalid image type. Please use an appropriate .bin file"
+	return 1
+}
+
+# use default for platform_do_upgrade()
diff --git a/trunk/target/linux/x86/rdc/config-default b/trunk/target/linux/x86/rdc/config-default
new file mode 100644
index 00000000..4d2b9532
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/config-default
@@ -0,0 +1,66 @@
+CONFIG_ARCH_RANDOM=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+# CONFIG_ARPD is not set
+# CONFIG_BASE_FULL is not set
+CONFIG_BASE_SMALL=1
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BRIDGE=m
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CMDLINE="console=uart,io,0x3f8 rootfstype=squashfs,jffs2"
+CONFIG_CMDLINE_BOOL=y
+# CONFIG_CMDLINE_OVERRIDE is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CPU_SUP_AMD is not set
+# CONFIG_CPU_SUP_CENTAUR is not set
+# CONFIG_CPU_SUP_CYRIX_32 is not set
+# CONFIG_CPU_SUP_INTEL is not set
+# CONFIG_CPU_SUP_TRANSMETA_32 is not set
+# CONFIG_CPU_SUP_UMC_32 is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_RDC321X=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HAMRADIO is not set
+# CONFIG_HPET_TIMER is not set
+CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_IP_MROUTE is not set
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+CONFIG_LLC=m
+CONFIG_MFD_CORE=y
+CONFIG_MFD_RDC321X=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MTRR is not set
+CONFIG_NLS=y
+CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
+# CONFIG_PCI_QUIRKS is not set
+CONFIG_PHYSICAL_START=0x100000
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_RDC321X_WDT=m
+# CONFIG_SCx200 is not set
+# CONFIG_SHMEM is not set
+CONFIG_STP=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_VM86 is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=4
+CONFIG_X86_L1_CACHE_SHIFT=4
+# CONFIG_X86_MCE is not set
+# CONFIG_X86_PLATFORM_DEVICES is not set
+# CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_RDC321X=y
+CONFIG_X86_REBOOTFIXUPS=y
+# CONFIG_X86_UP_APIC is not set
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_X86_WANT_INTEL_MID is not set
diff --git a/trunk/target/linux/x86/rdc/profiles/ar525w.mk b/trunk/target/linux/x86/rdc/profiles/ar525w.mk
new file mode 100644
index 00000000..d38cb1f2
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/profiles/ar525w.mk
@@ -0,0 +1,12 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/ar525w
+  NAME:=Airlink AR525W
+  PACKAGES:=kmod-rt61-pci kmod-switch-ip17xx swconfig
+endef
+$(eval $(call Profile,ar525w))
diff --git a/trunk/target/linux/x86/rdc/profiles/bifferboard.mk b/trunk/target/linux/x86/rdc/profiles/bifferboard.mk
new file mode 100644
index 00000000..35fea452
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/profiles/bifferboard.mk
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/bifferboard
+	NAME:=Bifferboard
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 \
+		kmod-usb-storage kmod-scsi-core kmod-fs-ext4
+endef
+$(eval $(call Profile,bifferboard))
diff --git a/trunk/target/linux/x86/rdc/profiles/r8610.mk b/trunk/target/linux/x86/rdc/profiles/r8610.mk
new file mode 100644
index 00000000..d5f8c0a8
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/profiles/r8610.mk
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/r8610
+	NAME:=RDC R8610 Evaluation Board
+	PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 \
+			kmod-hwmon-core kmod-hwmon-w83627hf kmod-ide-core kmod-ide-it821x \
+			kmod-rtc-core kmod-rtc-m48t86 kmod-fs-ext4
+endef
+$(eval $(call Profile,r8610))
diff --git a/trunk/target/linux/x86/rdc/profiles/sitecom.mk b/trunk/target/linux/x86/rdc/profiles/sitecom.mk
new file mode 100644
index 00000000..e3b2981e
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/profiles/sitecom.mk
@@ -0,0 +1,12 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/sitecom
+	NAME:=Devices from Sitecom (WL-153, DC-230)
+	PACKAGES:=kmod-rt61-pci kmod-usb-core kmod-usb-ohci kmod-usb2
+endef
+$(eval $(call Profile,sitecom))
diff --git a/trunk/target/linux/x86/rdc/target.mk b/trunk/target/linux/x86/rdc/target.mk
new file mode 100644
index 00000000..9b03b15b
--- /dev/null
+++ b/trunk/target/linux/x86/rdc/target.mk
@@ -0,0 +1,13 @@
+BOARDNAME:=RDC R-321x
+FEATURES:=squashfs pci usb gpio pcmcia
+MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+FEATURES += broken
+
+DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \
+		    wpad-mini kmod-libphy kmod-r6040 kmod-input-core \
+		    kmod-input-polldev kmod-button-hotplug kmod-rdc321x-wdt
+
+define Target/Description
+        Build firmware images for RDC321x based routers
+        (e.g. Airlink101 AR525W, Linksys WRT54GR, Sitecom WL-153)
+endef
diff --git a/trunk/target/linux/x86/thincan/base-files/etc/init.d/alsa b/trunk/target/linux/x86/thincan/base-files/etc/init.d/alsa
new file mode 100644
index 00000000..94c6965e
--- /dev/null
+++ b/trunk/target/linux/x86/thincan/base-files/etc/init.d/alsa
@@ -0,0 +1,9 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+START=50
+
+start() {
+	amixer set PCM 50% unmute
+	amixer set Headphone 100% unmute
+}
+
diff --git a/trunk/target/linux/x86/thincan/config-default b/trunk/target/linux/x86/thincan/config-default
new file mode 100644
index 00000000..405c65b5
--- /dev/null
+++ b/trunk/target/linux/x86/thincan/config-default
@@ -0,0 +1,15 @@
+CONFIG_8139TOO=y
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_BLK_DEV_NBD=y
+# CONFIG_EMBEDDED is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_BOOTP is not set
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_LOCKD=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
+CONFIG_SUNRPC=y
diff --git a/trunk/target/linux/x86/thincan/profiles/dbe61.mk b/trunk/target/linux/x86/thincan/profiles/dbe61.mk
new file mode 100644
index 00000000..bb6706a9
--- /dev/null
+++ b/trunk/target/linux/x86/thincan/profiles/dbe61.mk
@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/DBE61
+  NAME:=DBE61
+endef
+
+define Profile/DBE61/Description
+	Compile libreCMC for Artec ThinCan DBE61
+
+	ThinCan DBE61 is a thin-client featuring:
+	  * AMD Geode LX700
+	  * AMD CS5535 companion device
+	  * 64MB or 256MB NAND Flash or none
+	  * 128MB or 256MB DDR SDRAM
+	  * Realtek RTL8139
+
+	http://wiki.thincan.org/DBE61
+endef
+
+$(eval $(call Profile,DBE61))
diff --git a/trunk/target/linux/x86/thincan/target.mk b/trunk/target/linux/x86/thincan/target.mk
new file mode 100644
index 00000000..c32baf95
--- /dev/null
+++ b/trunk/target/linux/x86/thincan/target.mk
@@ -0,0 +1,35 @@
+DEVICE_TYPE:=terminal
+BOARDNAME:=Artec ThinCan
+CPU_TYPE := geode
+FEATURES += broken
+
+DEFAULT_PACKAGES:=\
+	base-files \
+	busybox \
+	hotplug2 \
+	libc \
+	libgcc \
+	opkg \
+	uci \
+	udevtrigger \
+	kmod-fs-msdos \
+	kmod-fs-vfat \
+	kmod-fs-ext4 \
+	kmod-usb-core \
+	kmod-usb-ohci \
+	kmod-usb-hid \
+	kmod-usb-storage \
+	kmod-usb2 \
+	kmod-sound-core \
+	kmod-sound-cs5535audio \
+	kmod-crypto-core \
+	kmod-crypto-hw-geode \
+	kmod-crypto-ocf \
+	kmod-crypto-aes
+
+define Target/Description
+	Build firmware images for Artec ThinCan
+
+	Note that NBD, NFS, DHCP and ethernet module are built into kernel
+endef
+
diff --git a/trunk/target/linux/x86/xen_domu/base-files/etc/inittab b/trunk/target/linux/x86/xen_domu/base-files/etc/inittab
new file mode 100644
index 00000000..469b8a9a
--- /dev/null
+++ b/trunk/target/linux/x86/xen_domu/base-files/etc/inittab
@@ -0,0 +1,5 @@
+::sysinit:/etc/init.d/rcS S boot
+::shutdown:/etc/init.d/rcS K stop
+tts/0::askfirst:/bin/ash --login
+hvc0::askfirst:/bin/ash --login
+tty1::askfirst:/bin/ash --login
diff --git a/trunk/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs b/trunk/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs
new file mode 100644
index 00000000..7b076051
--- /dev/null
+++ b/trunk/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Copyright (C) 2010 OpenWrt.org
+
+do_mount_xenfs() {
+	[ -f /etc/modules.d/??-xenfs ] && {
+		insmod $(cat /etc/modules.d/??-xenfs)
+		mount -o noatime none /proc/xen -t xenfs
+	}
+}
+
+boot_hook_add preinit_mount_root do_mount_xenfs
diff --git a/trunk/target/linux/x86/xen_domu/config-default b/trunk/target/linux/x86/xen_domu/config-default
new file mode 100644
index 00000000..11ffdab4
--- /dev/null
+++ b/trunk/target/linux/x86/xen_domu/config-default
@@ -0,0 +1,85 @@
+# CONFIG_APM is not set
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+CONFIG_CPU_RMAP=y
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+CONFIG_FREEZER=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_HIBERNATE_CALLBACKS=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_HOTPLUG_CPU=y
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_LGUEST_GUEST is not set
+# CONFIG_M486 is not set
+CONFIG_MMU_NOTIFIER=y
+CONFIG_MPENTIUM4=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NET_FLOW_LIMIT=y
+CONFIG_NR_CPUS=4
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PCI_XEN=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
+CONFIG_SCHED_MC=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SMP=y
+CONFIG_STOP_MACHINE=y
+CONFIG_SWIOTLB=y
+CONFIG_SWIOTLB_XEN=y
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_TREE_RCU=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+# CONFIG_VMWARE_BALLOON is not set
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_X86_32_SMP=y
+# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_CMOV=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_X86_HT=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=7
+CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_PAE=y
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_XEN=y
+# CONFIG_XENFS is not set
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_DEBUG_FS=y
+# CONFIG_XEN_DEV_EVTCHN is not set
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=64
+# CONFIG_XEN_NETDEV_FRONTEND is not set
+# CONFIG_XEN_PCIDEV_FRONTEND is not set
+CONFIG_XEN_PRIVCMD=m
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_SAVE_RESTORE=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+# CONFIG_XEN_WDT is not set
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XPS=y
diff --git a/trunk/target/linux/x86/xen_domu/target.mk b/trunk/target/linux/x86/xen_domu/target.mk
new file mode 100644
index 00000000..80bac3b8
--- /dev/null
+++ b/trunk/target/linux/x86/xen_domu/target.mk
@@ -0,0 +1,3 @@
+BOARDNAME:=Xen Paravirt Guest
+DEFAULT_PACKAGES += kmod-xen-fs kmod-xen-evtchn kmod-xen-netdev kmod-xen-kbddev
+FEATURES:=display
diff --git a/trunk/target/linux/x86_64/Makefile b/trunk/target/linux/x86_64/Makefile
new file mode 100644
index 00000000..ca0a05a3
--- /dev/null
+++ b/trunk/target/linux/x86_64/Makefile
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+ARCH:=x86_64
+BOARD:=x86_64
+BOARDNAME:=x86_64
+FEATURES:=ext4 vdi vmdk targz
+MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
+
+KERNEL_PATCHVER:=3.14
+
+KERNELNAME:=bzImage
+
+include $(INCLUDE_DIR)/target.mk
+
+DEFAULT_PACKAGES += kmod-e1000 kmod-r8169
+
+$(eval $(call BuildTarget))
diff --git a/trunk/target/linux/x86_64/base-files/etc/inittab b/trunk/target/linux/x86_64/base-files/etc/inittab
new file mode 100644
index 00000000..ca90fd8a
--- /dev/null
+++ b/trunk/target/linux/x86_64/base-files/etc/inittab
@@ -0,0 +1,4 @@
+::sysinit:/etc/init.d/rcS S boot
+::shutdown:/etc/init.d/rcS K shutdown
+ttyS0::askfirst:/bin/ash --login
+tty1::askfirst:/bin/ash --login
diff --git a/trunk/target/linux/x86_64/base-files/lib/preinit/15_essential_fs_x86 b/trunk/target/linux/x86_64/base-files/lib/preinit/15_essential_fs_x86
new file mode 100644
index 00000000..5d545309
--- /dev/null
+++ b/trunk/target/linux/x86_64/base-files/lib/preinit/15_essential_fs_x86
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+do_mount_procfs() {
+	mount -o noatime -t proc none /proc
+}
+
diff --git a/trunk/target/linux/x86_64/base-files/lib/preinit/79_move_config b/trunk/target/linux/x86_64/base-files/lib/preinit/79_move_config
new file mode 100644
index 00000000..cdcf683a
--- /dev/null
+++ b/trunk/target/linux/x86_64/base-files/lib/preinit/79_move_config
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Copyright (C) 2012-2014 OpenWrt.org
+
+move_config() {
+	. /lib/upgrade/platform.sh
+
+	if platform_export_bootpart; then
+		mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
+		mv -f /mnt/sysupgrade.tgz /
+		umount /mnt
+	fi
+}
+
+boot_hook_add preinit_mount_root move_config
+
diff --git a/trunk/target/linux/x86_64/base-files/lib/upgrade/platform.sh b/trunk/target/linux/x86_64/base-files/lib/upgrade/platform.sh
new file mode 100644
index 00000000..73ab5ef0
--- /dev/null
+++ b/trunk/target/linux/x86_64/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,66 @@
+platform_export_bootpart() {
+	local cmdline uuid disk
+
+	if read cmdline < /proc/cmdline; then
+		case "$cmdline" in
+			*block2mtd=*)
+				disk="${cmdline##*block2mtd=}"
+				disk="${disk%%,*}"
+			;;
+			*root=*)
+				disk="${cmdline##*root=}"
+				disk="${disk%% *}"
+			;;
+		esac
+
+		case "$disk" in
+			PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
+				uuid="${disk#PARTUUID=}"
+				uuid="${uuid%-02}"
+				for disk in /dev/[hsv]d[a-z]; do
+					set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
+					if [ "$4$3$2$1" = "$uuid" ]; then
+						export BOOTPART="${disk}1"
+						return 0
+					fi
+				done
+			;;
+			/dev/*)
+				export BOOTPART="${disk%[0-9]}1"
+				return 0
+			;;
+		esac
+	fi
+
+	return 1
+}
+
+platform_check_image() {
+	[ "$#" -gt 1 ] && return 1
+
+	case "$(get_magic_word "$1")" in
+		eb48|eb63) return 0;;
+		*)
+			echo "Invalid image type"
+			return 1
+		;;
+	esac
+}
+
+platform_copy_config() {
+	if [ -b "$BOOTPART" ]; then
+		mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
+		cp -af "$CONF_TAR" /mnt/
+		umount /mnt
+	fi
+}
+
+platform_do_upgrade() {
+	platform_export_bootpart
+
+	if [ -b "${BOOTPART%[0-9]}" ]; then
+		sync
+		get_image "$@" | dd of="${BOOTPART%[0-9]}" bs=4096 conv=fsync
+		sleep 1
+	fi
+}
diff --git a/trunk/target/linux/x86_64/config-default b/trunk/target/linux/x86_64/config-default
new file mode 100644
index 00000000..dde8b254
--- /dev/null
+++ b/trunk/target/linux/x86_64/config-default
@@ -0,0 +1,506 @@
+# CONFIG_60XX_WDT is not set
+CONFIG_64BIT=y
+CONFIG_ACPI=y
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+# CONFIG_ACPI_CMPC is not set
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DOCK is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_PROCESSOR=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_SBS is not set
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_WMI is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+CONFIG_AMD_NB=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+# CONFIG_ARCH_RANDOM is not set
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_ASUS_LAPTOP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_SFF is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_AVERAGE=y
+CONFIG_BINFMT_MISC=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BOUNCE=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+# CONFIG_CPU5_WDT is not set
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CRC16=y
+# CONFIG_CRYPTO_AES_X86_64 is not set
+# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set
+# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set
+# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32_PCLMUL is not set
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_SALSA20_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
+# CONFIG_CRYPTO_SHA1_SSSE3 is not set
+# CONFIG_CRYPTO_SHA256_SSSE3 is not set
+# CONFIG_CRYPTO_SHA512_SSSE3 is not set
+# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_DCDBAS is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DELL_RBU is not set
+CONFIG_DIRECT_GBPAGES=y
+# CONFIG_DMI is not set
+CONFIG_DNOTIFY=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_EDD is not set
+# CONFIG_EFI is not set
+# CONFIG_EUROTECH_WDT is not set
+CONFIG_EXT4_FS=y
+# CONFIG_F71808E_WDT is not set
+CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_VESA is not set
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_FIX_EARLYCON_MEM=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x16=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_GART_IOMMU=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_CPU=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_HANGCHECK_TIMER is not set
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HID=y
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HPET=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_TIMER=y
+# CONFIG_HP_ACCEL is not set
+# CONFIG_HP_WATCHDOG is not set
+CONFIG_HT_IRQ=y
+# CONFIG_HUGETLBFS is not set
+CONFIG_HW_CONSOLE=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_INTEL=y
+# CONFIG_HW_RANDOM_VIRTIO is not set
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_HZ_PERIODIC=y
+# CONFIG_I7300_IDLE is not set
+CONFIG_I8253_LOCK=y
+# CONFIG_I8K is not set
+# CONFIG_IA32_EMULATION is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_IBM_RTL is not set
+# CONFIG_IE6XX_WDT is not set
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_INSTRUCTION_DECODER=y
+# CONFIG_INTEL_IPS is not set
+# CONFIG_INTEL_MENLOW is not set
+# CONFIG_INTEL_POWERCLAMP is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+# CONFIG_IO_DELAY_UDELAY is not set
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_ITCO_WDT=y
+CONFIG_JBD2=y
+CONFIG_KALLSYMS=y
+CONFIG_KEXEC=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_KVM_GUEST=y
+CONFIG_LPC_ICH=y
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MEMORY_HOTPLUG is not set
+# CONFIG_MEMTEST is not set
+CONFIG_MFD_CORE=y
+# CONFIG_MICROCODE is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MK8 is not set
+# CONFIG_MLX5_CORE is not set
+CONFIG_MODULES_USE_ELF_RELA=y
+# CONFIG_MPSC is not set
+CONFIG_MTD_BLOCK2MTD=y
+# CONFIG_MTD_NETSC520 is not set
+# CONFIG_MTD_SBC_GXX is not set
+# CONFIG_MTD_SC520CDP is not set
+# CONFIG_MTD_TS5500 is not set
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+CONFIG_NAMESPACES=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_NET_NS is not set
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_NLS=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_NR_CPUS=1
+# CONFIG_NTB is not set
+CONFIG_NVRAM=y
+CONFIG_OPROFILE_NMI_TIMER=y
+# CONFIG_OPTIMIZE_INLINING is not set
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+# CONFIG_PC87413_WDT is not set
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_IOAPIC is not set
+CONFIG_PCI_LABEL=y
+# CONFIG_PCI_MMCONFIG is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_PERF_EVENTS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PNP=y
+CONFIG_PNPACPI=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_PVPANIC is not set
+# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_GZIP=y
+# CONFIG_RELOCATABLE is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SAMSUNG_Q10 is not set
+CONFIG_SATA_AHCI=y
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_CT82C710 is not set
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_MANUAL=y
+# CONFIG_SPARSEMEM_VMEMMAP is not set
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_SWIOTLB=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+# CONFIG_TELCLOCK is not set
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THINKPAD_ACPI is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+CONFIG_USB_STORAGE=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USER_NS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VIA_WDT is not set
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BALLOON=y
+# CONFIG_VIRTIO_BLK is not set
+# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VMWARE_BALLOON=y
+CONFIG_VMWARE_PVSCSI=y
+CONFIG_VMWARE_VMCI=y
+CONFIG_VMWARE_VMCI_VSOCKETS=y
+CONFIG_VMXNET3=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_VSOCKETS=y
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_WAFER_WDT is not set
+CONFIG_WATCHDOG_CORE=y
+CONFIG_X86=y
+CONFIG_X86_64=y
+# CONFIG_X86_ACPI_CPUFREQ is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CMOV=y
+CONFIG_X86_CMPXCHG64=y
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_X86_DEV_DMA_OPS=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
+# CONFIG_X86_INTEL_PSTATE is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_INJECT is not set
+# CONFIG_X86_16BIT is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_X86_PAT=y
+# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_X86_PM_TIMER=y
+# CONFIG_X86_PTDUMP is not set
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_X86_SMAP is not set
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_TSC=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+# CONFIG_XEN is not set
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+# CONFIG_XO15_EBOOK is not set
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_X86=y
+# CONFIG_ZBUD is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZONE_DMA32=y
diff --git a/trunk/target/linux/x86_64/image/Makefile b/trunk/target/linux/x86_64/image/Makefile
new file mode 100644
index 00000000..e8d9ac11
--- /dev/null
+++ b/trunk/target/linux/x86_64/image/Makefile
@@ -0,0 +1,220 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+
+export PATH=$(TARGET_PATH):/sbin
+
+GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
+GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga
+GRUB_TERMINALS =
+GRUB_SERIAL_CONFIG =
+GRUB_TERMINAL_CONFIG =
+GRUB_CONSOLE_CMDLINE =
+
+USE_ATKBD = generic kvm_guest
+
+ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_64_$(subtarget)))),)
+  GRUB2_MODULES += at_keyboard
+  GRUB2_MODULES_ISO += at_keyboard
+endif
+
+ifneq ($(CONFIG_GRUB_CONSOLE),)
+  GRUB_CONSOLE_CMDLINE += console=tty0
+  GRUB_TERMINALS += console
+endif
+
+GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL))
+
+ifneq ($(GRUB_SERIAL),)
+  GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8
+  GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_GRUB_BAUDRATE) --word=8 --parity=no --stop=1
+  GRUB_TERMINALS += serial
+endif
+
+ifneq ($(GRUB_TERMINALS),)
+  GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS)
+endif
+
+SIGNATURE:=$(shell dd if=/dev/urandom bs=4 count=1 2>/dev/null | hexdump -v -e '"%02x"')
+ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
+ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02)
+
+GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT))
+
+ifneq ($(CONFIG_GRUB_IMAGES),)
+
+  BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS))
+
+  define Image/cmdline/ext4
+    root=$(ROOTPART) rootfstype=ext4 rootwait
+  endef
+
+  define Image/cmdline/jffs2-64k
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait
+  endef
+
+  define Image/cmdline/jffs2-128k
+    block2mtd.block2mtd=$(ROOTPART),131072,rootfs,5 root=/dev/mtdblock0 rootfstype=jffs2 rootwait
+  endef
+
+  define Image/cmdline/squashfs
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs,5 root=/dev/mtdblock0 rootfstype=squashfs rootwait
+  endef
+
+  define Image/Build/grub2
+	# left here because the image builder doesnt need these
+	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	grub-mkimage \
+		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
+		-o $(KDIR)/grub2/core.img \
+		-O i386-pc \
+		-c ./grub-early.cfg \
+		$(GRUB2_MODULES)
+	$(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/
+	echo '(hd0) $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img' > $(KDIR)/grub2/device.map
+	sed \
+		-e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
+		-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
+		-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
+		-e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
+		./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
+	PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" ./gen_image_generic.sh \
+		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+		$(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \
+		$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
+		256
+	grub-bios-setup \
+		--device-map="$(KDIR)/grub2/device.map" \
+		-d "$(KDIR)/grub2" \
+		-r "hd0,msdos1" \
+		"$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img"
+	$(call Image/Build/grub/$(1))
+  endef
+endif
+
+ROOTDELAY=10
+
+define Image/Build/squashfs
+	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+endef
+
+define Image/Build/iso
+	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	grub-mkimage \
+		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
+		-o $(KDIR)/grub2/eltorito.img \
+		-O i386-pc \
+		-c ./grub-early.cfg \
+		$(GRUB2_MODULES_ISO)
+	cat \
+		$(STAGING_DIR_HOST)/lib/grub/i386-pc/cdboot.img \
+		$(KDIR)/grub2/eltorito.img \
+		> $(KDIR)/root.grub/boot/grub/eltorito.img
+	sed \
+		-e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
+		-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
+		-e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
+		-e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
+		./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+	mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \
+		-o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR)
+endef
+
+ifneq ($(CONFIG_VDI_IMAGES),)
+  define Image/Build/vdi
+    # left here because the image builder doesnt need these
+    ifeq ($(1),ext4)
+		rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
+		qemu-img convert -f raw -O vdi \
+			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
+		# XXX: VBoxManage insists on setting perms to 0600
+		chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
+    endif
+  endef
+endif
+
+ifneq ($(CONFIG_VMDK_IMAGES),)
+  define Image/Build/vmdk
+    # left here because the image builder doesnt need these
+    ifeq ($(1),ext4)
+		rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
+		qemu-img convert -f raw -O vmdk -o adapter_type=lsilogic \
+			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
+		rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1)-esxi.vmdk || true
+		qemu-img convert -f raw -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat \
+			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1)-esxi.vmdk
+    endif
+  endef
+endif
+
+define Image/Build/gzip
+	gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
+	gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+endef
+
+ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
+  define Image/Build/gzip/ext4
+	$(call Image/Build/gzip,ext4)
+  endef
+  ifneq ($(CONFIG_TARGET_IMAGES_PAD),)
+    define Image/Build/gzip/squashfs
+	$(call Image/Build/gzip,squashfs)
+    endef
+    define Image/Build/gzip/jffs2-64k
+	$(call Image/Build/gzip,jffs2-64k)
+    endef
+    define Image/Build/gzip/jffs2-128k
+	$(call Image/Build/gzip,jffs2-128k)
+    endef
+  endif
+endif
+
+define Image/BuildKernel
+	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
+endef
+
+define Image/Prepare
+	$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
+	$(call Image/Prepare/bootscript)
+	$(call Image/Prepare/grub2)
+endef
+
+define Image/Build/Initramfs
+	$(CP) $(KDIR)/bzImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-ramfs.bzImage
+endef
+
+define Image/Build
+	$(call Image/Build/$(1))
+	$(call Image/Build/bootscript,$(1))
+  ifneq ($(1),iso)
+	$(call Image/Build/grub2,$(1))
+	$(call Image/Build/vdi,$(1))
+	$(call Image/Build/vmdk,$(1))
+	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+  else
+	$(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso
+  endif
+	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
+	$(call Image/Build/gzip/$(1))
+	$(call Image/Build/Profile/$(PROFILE),$(1))
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+	$(call Image/Build/Initramfs)
+endif
+endef
+
+$(eval $(call BuildImage))
+
+$(eval $(call RequireCommand,qemu-img, \
+	Please install qemu-img (package qemu-utils in Ubuntu/Debian). \
+))
diff --git a/trunk/target/linux/x86_64/image/gen_image_generic.sh b/trunk/target/linux/x86_64/image/gen_image_generic.sh
new file mode 100755
index 00000000..711c755c
--- /dev/null
+++ b/trunk/target/linux/x86_64/image/gen_image_generic.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (C) 2006-2012 OpenWrt.org
+set -x
+[ $# -eq 5 -o $# -eq 6 ] || {
+    echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]"
+    exit 1
+}
+
+OUTPUT="$1"
+KERNELSIZE="$2"
+KERNELDIR="$3"
+ROOTFSSIZE="$4"
+ROOTFSIMAGE="$5"
+ALIGN="$6"
+
+rm -f "$OUTPUT"
+
+head=16
+sect=63
+cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
+
+# create partition table
+set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}`
+
+KERNELOFFSET="$(($1 / 512))"
+KERNELSIZE="$(($2 / 512))"
+ROOTFSOFFSET="$(($3 / 512))"
+ROOTFSSIZE="$(($4 / 512))"
+
+BLOCKS="$((($KERNELSIZE / 2) - 1))"
+
+[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
+dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
+
+[ -n "$NOGRUB" ] && exit 0
+
+genext2fs -d "$KERNELDIR" -b "$BLOCKS" "$OUTPUT.kernel"
+dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
+rm -f "$OUTPUT.kernel"
diff --git a/trunk/target/linux/x86_64/image/grub-early.cfg b/trunk/target/linux/x86_64/image/grub-early.cfg
new file mode 100644
index 00000000..4a5b5a60
--- /dev/null
+++ b/trunk/target/linux/x86_64/image/grub-early.cfg
@@ -0,0 +1 @@
+configfile (hd0,msdos1)/boot/grub/grub.cfg
diff --git a/trunk/target/linux/x86_64/image/grub-iso.cfg b/trunk/target/linux/x86_64/image/grub-iso.cfg
new file mode 100644
index 00000000..6a494377
--- /dev/null
+++ b/trunk/target/linux/x86_64/image/grub-iso.cfg
@@ -0,0 +1,10 @@
+@SERIAL_CONFIG@
+@TERMINAL_CONFIG@
+
+set default="0"
+set timeout="@TIMEOUT@"
+set root='(cd)'
+
+menuentry "libreCMC" {
+	linux /boot/vmlinuz @CMDLINE@ noinitrd
+}
diff --git a/trunk/target/linux/x86_64/image/grub.cfg b/trunk/target/linux/x86_64/image/grub.cfg
new file mode 100644
index 00000000..e1c1c74f
--- /dev/null
+++ b/trunk/target/linux/x86_64/image/grub.cfg
@@ -0,0 +1,13 @@
+@SERIAL_CONFIG@
+@TERMINAL_CONFIG@
+
+set default="0"
+set timeout="@TIMEOUT@"
+set root='(hd0,msdos1)'
+
+menuentry "libreCMC" {
+	linux /boot/vmlinuz @CMDLINE@ noinitrd
+}
+menuentry "libreCMC (failsafe)" {
+	linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
+}
diff --git a/trunk/target/linux/x86_64/patches/011-tune_lzma_options.patch b/trunk/target/linux/x86_64/patches/011-tune_lzma_options.patch
new file mode 100644
index 00000000..168c3dd7
--- /dev/null
+++ b/trunk/target/linux/x86_64/patches/011-tune_lzma_options.patch
@@ -0,0 +1,22 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -304,7 +304,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+ 
+ quiet_cmd_lzma = LZMA    $@
+ cmd_lzma = (cat $(filter-out FORCE,$^) | \
+-	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+ 	(rm -f $@ ; false)
+ 
+ quiet_cmd_lzo = LZO     $@
+--- a/arch/x86/include/asm/boot.h
++++ b/arch/x86/include/asm/boot.h
+@@ -23,7 +23,7 @@
+ #error "Invalid value for CONFIG_PHYSICAL_ALIGN"
+ #endif
+ 
+-#ifdef CONFIG_KERNEL_BZIP2
++#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA)
+ #define BOOT_HEAP_SIZE             0x400000
+ #else /* !CONFIG_KERNEL_BZIP2 */
+ 
diff --git a/trunk/target/linux/x86_64/patches/012-export_erase_write.patch b/trunk/target/linux/x86_64/patches/012-export_erase_write.patch
new file mode 100644
index 00000000..9927384c
--- /dev/null
+++ b/trunk/target/linux/x86_64/patches/012-export_erase_write.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
+@@ -63,7 +63,7 @@ static void erase_callback(struct erase_
+ 	wake_up(wait_q);
+ }
+ 
+-static int erase_write (struct mtd_info *mtd, unsigned long pos,
++int erase_write (struct mtd_info *mtd, unsigned long pos,
+ 			int len, const char *buf)
+ {
+ 	struct erase_info erase;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -414,6 +414,9 @@ extern void register_mtd_user (struct mt
+ extern int unregister_mtd_user (struct mtd_notifier *old);
+ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
+ 
++int erase_write (struct mtd_info *mtd, unsigned long pos,
++		 int len, const char *buf);
++
+ void mtd_erase_callback(struct erase_info *instr);
+ 
+ static inline int mtd_is_bitflip(int err) {
diff --git a/trunk/target/sdk/Config.in b/trunk/target/sdk/Config.in
new file mode 100644
index 00000000..37d2ca0e
--- /dev/null
+++ b/trunk/target/sdk/Config.in
@@ -0,0 +1,9 @@
+config SDK
+	bool "Build the libreCMC SDK"
+	depends on !EXTERNAL_TOOLCHAIN
+	help
+	  This is essentially a stripped-down version of the buildroot
+	  with a precompiled toolchain. It can be used to develop and
+	  test packages for libreCMC before including them in the buildroot
+
+
diff --git a/trunk/target/sdk/Makefile b/trunk/target/sdk/Makefile
new file mode 100644
index 00000000..360e6545
--- /dev/null
+++ b/trunk/target/sdk/Makefile
@@ -0,0 +1,130 @@
+# 
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/host.mk
+
+override MAKEFLAGS=
+
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+
+SDK_NAME:=libreCMC-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
+SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
+
+STAGING_SUBDIR_HOST := staging_dir/host
+STAGING_SUBDIR_TARGET := staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+
+EXCLUDE_DIRS:=*/ccache \
+	*/stamp \
+	*/stampfiles \
+	*/man \
+	*/info \
+	*/root-* \
+	initial \
+	*.install.clean \
+	*.install.flags \
+	*.install \
+	*/doc
+
+SDK_DIRS = \
+		$(STAGING_SUBDIR_HOST) \
+		$(STAGING_SUBDIR_TARGET) \
+		$(STAGING_SUBDIR_TOOLCHAIN)
+
+BASE_FEED:=$(shell git config --get remote.origin.url 2>/dev/null | sed -ne 's/^/src-git base /p')
+BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C git svn info 2>/dev/null | sed -ne 's/^URL: /src-gitsvn base /p'))
+BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn info 2>/dev/null | sed -ne 's/^URL: /src-svn base /p'))
+
+KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
+
+KERNEL_FILES_ARCH = \
+	Makefile* \
+	module.lds \
+	Kbuild.platforms \
+	*/Platform \
+	include \
+	scripts \
+	kernel/asm-offsets.s
+
+KERNEL_FILES_BASE := \
+	.config \
+	Makefile \
+	scripts \
+	include \
+	Module.symvers \
+	$(addprefix arch/$(LINUX_KARCH)/,$(KERNEL_FILES_ARCH))
+
+KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(KERNEL_FILES_BASE))))
+
+all: compile
+
+$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
+	mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
+	$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
+	$(TAR) -cf - -C $(TOPDIR) \
+		$(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
+		$(SDK_DIRS) $(KERNEL_FILES) | \
+		$(TAR) -xf - -C $(SDK_BUILD_DIR)
+
+	@-( \
+		find \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/*/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/libexec \
+			-type f; \
+		find \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \
+			-type f -name \*.so\* -or -name \*.a; \
+	) | xargs strip 2>/dev/null >/dev/null
+
+	mkdir -p $(SDK_BUILD_DIR)/target/linux
+	$(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/
+	rm -rf \
+		$(SDK_BUILD_DIR)/target/linux/*/files* \
+		$(SDK_BUILD_DIR)/target/linux/*/patches*
+	./convert-config.pl $(TOPDIR)/.config > $(SDK_BUILD_DIR)/Config-build.in
+	$(CP) -L \
+		$(TOPDIR)/LICENSE \
+		$(TOPDIR)/rules.mk \
+		$(TOPDIR)/.config \
+		./files/Config.in \
+		./files/Makefile \
+		./files/README.SDK \
+		$(SDK_BUILD_DIR)/
+	$(CP) \
+		$(TOPDIR)/package/Makefile \
+		$(SDK_BUILD_DIR)/package/
+
+	-rm -f $(SDK_BUILD_DIR)/feeds.conf.default
+	$(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default)
+	if [ -f $(TOPDIR)/feeds.conf ]; then \
+		cat $(TOPDIR)/feeds.conf >> $(SDK_BUILD_DIR)/feeds.conf.default; \
+	else \
+		cat $(TOPDIR)/feeds.conf.default >> $(SDK_BUILD_DIR)/feeds.conf.default; \
+	fi
+	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk
+	$(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk
+	find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
+	find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
+	find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
+	(cd $(BUILD_DIR); \
+		tar cfj $@ $(SDK_NAME); \
+	)
+
+download:
+prepare:
+compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
+install: compile
+
+clean:
+	rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2
diff --git a/trunk/target/sdk/convert-config.pl b/trunk/target/sdk/convert-config.pl
new file mode 100755
index 00000000..243de0b8
--- /dev/null
+++ b/trunk/target/sdk/convert-config.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/env perl
+use strict;
+
+print <<EOF;
+config ALL
+	bool
+	default y
+
+EOF
+
+while (<>) {
+	chomp;
+	next unless /^CONFIG_([^=]+)=(.*)$/;
+
+	my $var = $1;
+	my $val = $2;
+	my $type;
+
+	next if $var eq 'ALL';
+
+	if ($val eq 'y') {
+		$type = "bool";
+	} elsif ($val eq 'm') {
+		$type = "tristate";
+	} elsif ($val =~ /^".*"$/) {
+		$type = "string";
+	} elsif ($val =~ /^\d+$/) {
+		$type = "int";
+	} else {
+		warn "WARNING: no type found for symbol CONFIG_$var=$val\n";
+		next;
+	}
+
+	print <<EOF;
+config $var
+	$type
+	default $val
+
+EOF
+}
diff --git a/trunk/target/sdk/files/Config.in b/trunk/target/sdk/files/Config.in
new file mode 100644
index 00000000..4a2f12e7
--- /dev/null
+++ b/trunk/target/sdk/files/Config.in
@@ -0,0 +1,2 @@
+source "Config-build.in"
+source "tmp/.config-package.in"
diff --git a/trunk/target/sdk/files/Makefile b/trunk/target/sdk/files/Makefile
new file mode 100644
index 00000000..e03d5d0c
--- /dev/null
+++ b/trunk/target/sdk/files/Makefile
@@ -0,0 +1,56 @@
+# Makefile for libreCMC
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+SDK:=1
+export TOPDIR LC_ALL LANG SDK
+
+world:
+
+include $(TOPDIR)/include/host.mk
+
+ifneq ($(LIBRECMC_BUILD),1)
+  override LIBRECMC_BUILD=1
+  export LIBRECMC_BUILD
+
+  empty:=
+  space:= $(empty) $(empty)
+  _SINGLE=export MAKEFLAGS=$(space);
+
+  include $(TOPDIR)/include/debug.mk
+  include $(TOPDIR)/include/depends.mk
+  include $(TOPDIR)/include/toplevel.mk
+else
+  include rules.mk
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include package/Makefile
+
+$(package/stamp-compile): $(BUILD_DIR)/.prepared
+$(BUILD_DIR)/.prepared: Makefile
+	@mkdir -p $$(dirname $@)
+	@mkdir -p bin/packages
+	@touch $@
+
+clean: FORCE
+	rm -rf $(BUILD_DIR) $(BIN_DIR)
+
+dirclean: clean
+	rm -rf $(TMP_DIR)
+
+# check prerequisites before starting to build
+prereq: $(package/stamp-prereq) ;
+
+world: prepare $(package/stamp-compile) FORCE
+	@$(MAKE) package/index
+
+.PHONY: clean dirclean prereq prepare world
+
+endif
diff --git a/trunk/target/sdk/files/README.SDK b/trunk/target/sdk/files/README.SDK
new file mode 100644
index 00000000..3ade3f56
--- /dev/null
+++ b/trunk/target/sdk/files/README.SDK
@@ -0,0 +1,7 @@
+This is the libreCMC SDK. It contains a stripped-down version of
+the buildroot. You can use it to test/develop packages without
+having to compile your own toolchain or any of the libraries
+included with libreCMC.
+
+To use it, just put your buildroot-compatible package directory
+in the subdir 'package/' and run 'make' from this directory.
diff --git a/trunk/target/toolchain/Config.in b/trunk/target/toolchain/Config.in
new file mode 100644
index 00000000..c7548d4f
--- /dev/null
+++ b/trunk/target/toolchain/Config.in
@@ -0,0 +1,8 @@
+config MAKE_TOOLCHAIN
+	bool "Package the libreCMC-based Toolchain"
+	depends on !EXTERNAL_TOOLCHAIN
+	help
+	  Package the created toolchain as a tarball under the bin/ directory as
+	  libreCMC-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX).
+	  For example, a toolchain for the MIPS architecture might be named
+	  libreCMC-Toolchain-malta-for-mipsel_mips32-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2.
diff --git a/trunk/target/toolchain/Makefile b/trunk/target/toolchain/Makefile
new file mode 100644
index 00000000..53252b41
--- /dev/null
+++ b/trunk/target/toolchain/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2008-2009 Industrie Dial Face S.p.A.
+#               Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/host.mk
+
+override MAKEFLAGS=
+
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+
+TOOLCHAIN_NAME:=libreCMC-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
+TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
+EXCLUDE_DIRS:=*/ccache \
+	*/initial \
+	*/stamp \
+	*/stampfiles \
+	*/man \
+	*/info
+
+all: compile
+
+TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
+
+$(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
+	mkdir -p $(TOOLCHAIN_BUILD_DIR)
+	$(TAR) -cf - -C $(TOPDIR)/staging_dir/  \
+	       $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
+	       toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) | \
+	       $(TAR) -xf - -C $(TOOLCHAIN_BUILD_DIR)
+
+	$(CP)  $(TOPDIR)/LICENSE ./files/README.TOOLCHAIN \
+		$(TOOLCHAIN_BUILD_DIR)/
+
+	$(CP) ./files/wrapper.sh $(TOOLCHAIN_PREFIX)/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
+	chmod +x $(TOOLCHAIN_PREFIX)/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
+	(cd $(TOOLCHAIN_PREFIX)/bin; \
+		for app in cc gcc g++ c++ cpp ld as ; do \
+			[ -f $(REAL_GNU_TARGET_NAME)-$${app} ] && mv $(REAL_GNU_TARGET_NAME)-$${app} $(REAL_GNU_TARGET_NAME)-$${app}.bin ; \
+			ln -sf $(REAL_GNU_TARGET_NAME)-wrapper.sh $(REAL_GNU_TARGET_NAME)-$${app} ; \
+		done; \
+	)
+
+	@-( \
+		find \
+			$(TOOLCHAIN_BUILD_DIR)/*/bin \
+			$(TOOLCHAIN_BUILD_DIR)/*/*/bin \
+			$(TOOLCHAIN_BUILD_DIR)/*/libexec \
+			-type f; \
+	) | xargs strip 2>/dev/null >/dev/null
+
+	echo REVISION:="$(REVISION)" > $(TOOLCHAIN_BUILD_DIR)/version.mk
+	find $(TOOLCHAIN_BUILD_DIR) -name .git | $(XARGS) rm -rf
+	find $(TOOLCHAIN_BUILD_DIR) -name .svn | $(XARGS) rm -rf
+	find $(TOOLCHAIN_BUILD_DIR) -name CVS | $(XARGS) rm -rf
+	(cd $(BUILD_DIR); \
+		tar cfj $@ $(TOOLCHAIN_NAME); \
+	)
+
+download:
+prepare:
+compile: $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2
+install: compile
+
+clean:
+	rm -rf $(TOOLCHAIN_BUILD_DIR) $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2
diff --git a/trunk/target/toolchain/files/README.TOOLCHAIN b/trunk/target/toolchain/files/README.TOOLCHAIN
new file mode 100644
index 00000000..3f6fcc8b
--- /dev/null
+++ b/trunk/target/toolchain/files/README.TOOLCHAIN
@@ -0,0 +1,2 @@
+This is the libreCMC SDK. It contains just the toolchain created 
+by buildroot.
diff --git a/trunk/target/toolchain/files/wrapper.sh b/trunk/target/toolchain/files/wrapper.sh
new file mode 100755
index 00000000..2b760840
--- /dev/null
+++ b/trunk/target/toolchain/files/wrapper.sh
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# 2009 (C) Copyright Industrie Dial Face S.p.A.
+#          Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
+#
+# Based on original idea from WindRiver
+#
+# Toolchain wrapper script.
+#
+# This script allows us to use a small number of GCC / binutils cross-tools
+# (one toolchain per instruction set architecture) to implement a larger
+# number of processor- or board-specific tools.  The wrapper script is
+# configured at install time with information covering basic CFLAGS,
+# LD options and the toolchain triplet name.
+#
+
+PROGNAME=$0
+REALNAME=`readlink -f $0`
+
+REALNAME_BASE=`basename $REALNAME`
+REALNAME_DIR=`dirname $REALNAME`
+
+TARGET_FUNDAMENTAL_ASFLAGS=''
+TARGET_FUNDAMENTAL_CFLAGS=''
+TARGET_ROOTFS_CFLAGS=''
+TARGET_FUNDAMENTAL_LDFLAGS=''
+TARGET_TOOLCHAIN_TRIPLET=${REALNAME_BASE%-*}
+
+# Parse our tool name, splitting it at '-' characters.
+BINARY=${PROGNAME##*-}
+
+# Parse our tool name, splitting it at '-' characters.
+IFS=- read TOOLCHAIN_ARCH TOOLCHAIN_BUILDROOT TOOLCHAIN_OS TOOLCHAIN_PLATFORM PROGNAME << EOF
+$REALNAME_BASE
+EOF
+
+#
+# We add the directory this was executed from to the PATH
+# The toolchains (links) should be in this directory or in the users
+# PATH.
+#
+TOOLCHAIN_BIN_DIR="$REALNAME_DIR/"
+
+# Set the PATH so that our run-time location is first
+# (get_feature is run from the path, so this has to be set)
+export PATH="$TOOLCHAIN_BIN_DIR":$PATH
+export GCC_HONOUR_COPTS
+
+TOOLCHAIN_SYSROOT="$TOOLCHAIN_BIN_DIR/../.."
+if [ ! -d "$TOOLCHAIN_SYSROOT" ]; then
+  echo "Error: Unable to determine sysroot (looking for $TOOLCHAIN_SYSROOT)!" >&2
+  exit 1
+fi
+
+# -Wl,--dynamic-linker=$TOOLCHAIN_SYSROOT/lib/ld-uClibc.so.0 
+# --dynamic-linker=$TOOLCHAIN_SYSROOT/lib/ld-uClibc.so.0 
+
+case $TOOLCHAIN_PLATFORM in
+   gnu|glibc|eglibc)
+	GCC_SYSROOT_FLAGS="--sysroot=$TOOLCHAIN_SYSROOT -Wl,-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+	LD_SYSROOT_FLAGS="-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+       ;;
+   uclibc)
+	GCC_SYSROOT_FLAGS="--sysroot=$TOOLCHAIN_SYSROOT -Wl,-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+	LD_SYSROOT_FLAGS="-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+       ;;
+   musl)
+	GCC_SYSROOT_FLAGS="--sysroot=$TOOLCHAIN_SYSROOT -Wl,-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+	LD_SYSROOT_FLAGS="-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+       ;;
+   *)
+	GCC_SYSROOT_FLAGS=""
+	LD_SYSROOT_FLAGS=""
+       ;;
+esac
+
+#
+# Run the cross-tool.
+#
+case $BINARY in
+	cc|gcc|g++|c++|cpp)
+		exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin $GCC_SYSROOT_FLAGS $TARGET_FUNDAMENTAL_CFLAGS $TARGET_ROOTFS_CFLAGS "$@"
+		;;
+	ld)
+		exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin $LD_SYSROOT_FLAGS $TARGET_FUNDAMENTAL_LDFLAGS "$@"
+		;;
+	as)
+		exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin $TARGET_FUNDAMENTAL_ASFLAGS "$@"
+		;;
+	*)
+		exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin "$@"
+		;;
+esac
+
+exit 0
diff --git a/trunk/toolchain/Config.in b/trunk/toolchain/Config.in
new file mode 100644
index 00000000..7e5a4c67
--- /dev/null
+++ b/trunk/toolchain/Config.in
@@ -0,0 +1,307 @@
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menuconfig TARGET_OPTIONS
+	bool "Target Options"  if DEVEL
+
+	config TARGET_OPTIMIZATION
+		string "Target Optimizations" if TARGET_OPTIONS
+		default DEFAULT_TARGET_OPTIMIZATION
+		help
+		  Optimizations to use when building for the target host.
+
+	config SOFT_FLOAT
+		bool "Use software floating point by default" if TARGET_OPTIONS
+		default y if !HAS_FPU
+		depends on arm || armeb || powerpc || mipsel || mips || mips64el || mips64
+		help
+		  If your target CPU does not have a Floating Point Unit (FPU) or a
+		  kernel FPU emulator, but you still wish to support floating point
+		  functions, then everything will need to be compiled with soft floating
+		  point support (-msoft-float).
+
+		  Most people will answer N.
+
+	config USE_MIPS16
+		bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
+		depends on HAS_MIPS16
+		depends on !GCC_VERSION_4_6
+		default y
+		help
+		  If your target CPU does support the MIPS16 instruction set
+		  and you want to use it for packages, enable this option.
+		  MIPS16 produces smaller binaries thus reducing pressure on
+		  caches and TLB.
+
+		  Most people will answer N.
+
+
+menuconfig EXTERNAL_TOOLCHAIN
+	bool
+	prompt "Use external toolchain"  if DEVEL
+	help
+	  If enabled, libreCMC will compile using an existing toolchain instead of
+	  compiling one.
+
+	config NATIVE_TOOLCHAIN
+		bool
+		prompt "Use host's toolchain"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN
+		select NO_STRIP
+		help
+		  If enabled, libreCMC will compile using the native toolchain for your
+		  host instead of compiling one.
+
+	config TARGET_NAME
+		string
+		prompt "Target name"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "aarch64-unknown-linux-gnu"  if aarch64
+		default "aarch64_be-unknown-linux-gnu"  if aarch64_be
+		default "arm-unknown-linux-gnu"      if arm
+		default "armeb-unknown-linux-gnu"    if armeb
+		default "i486-unknown-linux-gnu"     if i386
+		default "mips-unknown-linux-gnu"     if mips
+		default "mipsel-unknown-linux-gnu"   if mipsel
+		default "powerpc-unknown-linux-gnu"  if powerpc
+		default "x86_64-unknown-linux-gnu"   if x86_64
+
+	config TOOLCHAIN_PREFIX
+		string
+		prompt "Toolchain prefix"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "aarch64-unknown-linux-gnu"  if aarch64
+		default "aarch64_be-unknown-linux-gnu"  if aarch64_be
+		default "arm-unknown-linux-gnu-"      if arm
+		default "armeb-unknown-linux-gnu-"    if armeb
+		default "i486-unknown-linux-gnu-"     if i386
+		default "mips-unknown-linux-gnu-"     if mips
+		default "mipsel-unknown-linux-gnu-"   if mipsel
+		default "powerpc-unknown-linux-gnu-"  if powerpc
+		default "x86_64-unknown-linux-gnu-"   if x86_64
+
+	config TOOLCHAIN_ROOT
+		string
+		prompt "Toolchain root"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "/opt/cross/aarch64-unknown-linux-gnu"  if aarch64
+		default "/opt/cross/aarch64_be-unknown-linux-gnu"  if aarch64_be
+		default "/opt/cross/arm-unknown-linux-gnu"      if arm
+		default "/opt/cross/armeb-unknown-linux-gnu"    if armeb
+		default "/opt/cross/i486-unknown-linux-gnu"     if i386
+		default "/opt/cross/mips-unknown-linux-gnu"     if mips
+		default "/opt/cross/mipsel-unknown-linux-gnu"   if mipsel
+		default "/opt/cross/powerpc-unknown-linux-gnu"  if powerpc
+		default "/opt/cross/x86_64-unknown-linux-gnu"   if x86_64
+
+	config TOOLCHAIN_LIBC
+		string
+		prompt "Toolchain libc"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "uclibc"
+		help
+		  Specify the libc type used by the external toolchain. The given value
+		  is passed as -m flag to all gcc and g++ invocations. This is mainly
+		  intended for multilib toolchains which support glibc and uclibc at
+		  the same time. If no value is specified, no -m flag is passed.
+
+	config TOOLCHAIN_BIN_PATH
+		string
+		prompt "Toolchain program path"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "./usr/bin ./bin"
+		help
+		  Specify additional directories searched for toolchain binaries
+		  (override PATH). Use ./DIR for directories relative to the root above.
+
+	config TOOLCHAIN_INC_PATH
+		string
+		prompt "Toolchain include path"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "./usr/include ./include"
+		help
+		  Specify additional directories searched for header files (override
+		  CPPFLAGS). Use ./DIR for directories relative to the root above.
+
+	config TOOLCHAIN_LIB_PATH
+		string
+		prompt "Toolchain library path"  if DEVEL
+		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "./usr/lib ./lib"
+		help
+		  Specify additional directories searched for libraries (override LDFLAGS).
+		  Use ./DIR for directories relative to the root above.
+
+config NEED_TOOLCHAIN
+	bool
+	depends on DEVEL
+	default y if !EXTERNAL_TOOLCHAIN
+
+menuconfig TOOLCHAINOPTS
+	bool "Toolchain Options"  if DEVEL
+	depends on NEED_TOOLCHAIN
+
+menuconfig EXTRA_TARGET_ARCH
+	bool
+	prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
+	depends on !sparc
+	default y	if powerpc64
+	default n
+	help
+	  Some builds may require a 'biarch' toolchain. This option
+	  allows you to specify an additional target arch.
+
+	  Most people will answer N here.
+
+	config EXTRA_TARGET_ARCH_NAME
+		string
+		default "powerpc64"	if powerpc64
+		prompt "Extra architecture name" if EXTRA_TARGET_ARCH
+		help
+		  Specify the cpu name (eg powerpc64 or x86_64) of the
+		  additional target architecture.
+
+	config EXTRA_TARGET_ARCH_OPTS
+		string
+		default "-m64"		if powerpc64
+		prompt "Extra architecture compiler options" if EXTRA_TARGET_ARCH
+		help
+		  If you're specifying an addition target architecture,
+		  you'll probably need to also provide options to make
+		  the compiler use this alternate arch.
+
+		  For example, if you're building a compiler that can build
+		  both powerpc and powerpc64 binaries, you'll need to
+		  specify -m64 here.
+
+
+	choice
+		prompt "MIPS64 user-land ABI" if TOOLCHAINOPTS && (mips64 || mips64el)
+		default MIPS64_ABI_N64
+		help
+		   MIPS64 supports 3 different user-land ABIs: o32 (legacy),
+		   n32 and n64.
+
+		config MIPS64_ABI_N64
+			bool "n64"
+
+		config MIPS64_ABI_N32
+			bool "n32"
+
+		config MIPS64_ABI_O32
+			bool "o32"
+
+	endchoice
+
+comment "Binary tools"
+	depends on TOOLCHAINOPTS
+
+source "toolchain/binutils/Config.in"
+
+comment "Compiler"
+	depends on TOOLCHAINOPTS
+
+source "toolchain/gcc/Config.in"
+
+comment "C Library"
+	depends on TOOLCHAINOPTS
+
+choice
+	prompt "C Library implementation" if TOOLCHAINOPTS
+	default LIBC_USE_EGLIBC if (aarch64 || aarch64_be)
+	default LIBC_USE_UCLIBC
+	help
+	  Select the C library implementation.
+
+	config LIBC_USE_EGLIBC
+		bool "Use eglibc"
+		select USE_EGLIBC
+		depends on !avr32
+
+	config LIBC_USE_UCLIBC
+		select USE_UCLIBC
+		bool "Use uClibc"
+		depends on !(aarch64 || aarch64_be)
+
+	config LIBC_USE_MUSL
+		select USE_MUSL
+		bool "Use musl"
+		depends on !(mips64 || mips64el || aarch64 || aarch64_be)
+
+endchoice
+
+source "toolchain/eglibc/Config.in"
+source "toolchain/uClibc/Config.in"
+source "toolchain/musl/Config.in"
+
+comment "Debuggers"
+	depends on TOOLCHAINOPTS
+
+config GDB
+	bool
+	depends on !(avr32 || aarch64 || aarch64_be)
+	prompt "Build gdb" if TOOLCHAINOPTS
+	default y if !EXTERNAL_TOOLCHAIN
+	help
+	  Enable if you want to build the gdb.
+
+config INSIGHT
+	bool
+	prompt "Build insight-gdb" if TOOLCHAINOPTS
+	select GDB
+	default n
+	help
+	  Enable if you want to build insight-gdb.
+
+config USE_EGLIBC
+	bool
+	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (aarch64 || aarch64_be || octeon)
+
+config USE_UCLIBC
+	bool
+	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(aarch64 || aarch64_be || octeon)
+
+config USE_MUSL
+	bool
+
+config USE_EXTERNAL_LIBC
+	bool
+	default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN
+
+source "toolchain/gcc/Config.version"
+
+source "toolchain/eglibc/Config.version"
+source "toolchain/uClibc/Config.version"
+source "toolchain/musl/Config.version"
+
+config LIBC
+	string
+	default "eglibc"  if USE_EGLIBC
+	default "uClibc"  if USE_UCLIBC
+	default "musl"	  if USE_MUSL
+
+config LIBC_VERSION
+	string
+	default EGLIBC_VERSION  if USE_EGLIBC
+	default UCLIBC_VERSION  if USE_UCLIBC
+	default MUSL_VERSION	if USE_MUSL
+
+config TARGET_SUFFIX
+	string
+	default "gnueabi"         if USE_EGLIBC && (arm || armeb)
+	default "gnu"             if USE_EGLIBC && !(arm || armeb)
+	default "uclibcgnueabi"   if USE_UCLIBC && (arm || armeb)
+	default "uclibc"          if USE_UCLIBC && !(arm || armeb)
+	default "muslgnueabi"     if USE_MUSL && (arm || armeb)
+	default "musl"            if USE_MUSL && !(arm || armeb)
+
+config MIPS64_ABI
+	depends on mips64 || mips64el
+	string
+	default "64" if MIPS64_ABI_N64
+	default "n32" if MIPS64_ABI_N32
+	default "32" if MIPS64_ABI_O32
+	default "64"
diff --git a/trunk/toolchain/Makefile b/trunk/toolchain/Makefile
new file mode 100644
index 00000000..36c6ed32
--- /dev/null
+++ b/trunk/toolchain/Makefile
@@ -0,0 +1,87 @@
+# 
+# Copyright (C) 2007-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# Main makefile for the toolchain
+#
+# Steps:
+# 1) toolchain/binutils/install
+#    build & install binutils
+# 2) toolchain/gcc/minimal/install
+#    build & install a minimal gcc, needed for steps 3 & 4
+# 3) toolchain/kernel-headers/install
+#    install kernel headers, needed for step 4
+# 4) toolchain/libc/headers/install
+#    build & install libc headers & support files, needed for step 5
+# 5) toolchain/gcc/initial/install
+#    build & install an initial gcc, needed for step 6
+# 6) toolchain/libc/install
+#    build & install the final libc
+# 7) toolchain/gcc/final/install
+#    build & install the final gcc
+# 8) toolchain/libc/utils/install
+#    build & install libc utilities
+#
+
+curdir:=toolchain
+
+# subdirectories to descend into
+$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/minimal gcc/initial gcc/final $(LIBC)/headers $(LIBC))
+ifdef CONFIG_USE_UCLIBC
+  $(curdir)/builddirs += $(LIBC)/utils
+endif
+$(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare)
+$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)
+
+# builddir dependencies
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  $(curdir)/gcc/minimal/compile:=$(curdir)/binutils/install
+  $(curdir)/kernel-headers/install:=$(curdir)/gcc/minimal/install
+  $(curdir)/gcc/initial/prepare:=$(curdir)/gcc/minimal/prepare
+  $(curdir)/gcc/final/prepare:=$(curdir)/gcc/initial/prepare
+
+  $(curdir)/$(LIBC)/headers/compile:=$(curdir)/kernel-headers/install
+  $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/install
+  $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
+  $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/install
+  $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/install
+  $(curdir)/$(LIBC)/prepare:=$(curdir)/$(LIBC)/headers/prepare
+  $(curdir)/$(LIBC)/utils/prepare:=$(curdir)/$(LIBC)/headers/prepare
+endif
+
+ifdef CONFIG_GCC_VERSION_LLVM
+  $(curdir)/builddirs += llvm
+  $(curdir)/gcc/minimal/compile += $(curdir)/llvm/install
+endif
+
+ifndef DUMP_TARGET_DB
+ifneq ($(ARCH),)
+  $(TOOLCHAIN_DIR)/info.mk: .config
+	@for dir in $(TOOLCHAIN_DIR); do ( \
+		$(if $(QUIET),,set -x;) \
+		mkdir -p "$$dir"; \
+		cd "$$dir"; \
+		ln -nsf lib lib64; \
+		ln -nsf lib lib32; \
+		mkdir -p stamp lib usr/include usr/lib ; \
+	); done
+	@grep GCC_VERSION $@ >/dev/null 2>&1 || $(INSTALL_DATA) $(TOPDIR)/toolchain/info.mk $@
+	@touch $@
+endif
+endif
+
+# prerequisites for the individual targets
+$(curdir)/ := .config prereq
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk
+$(curdir)//compile = $(1)/prepare
+$(curdir)//install = $(1)/compile
+
+ifndef DUMP_TARGET_DB
+$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:
+endif
+
+$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR)))
+$(eval $(call subdir,$(curdir)))
+
diff --git a/trunk/toolchain/binutils/Config.in b/trunk/toolchain/binutils/Config.in
new file mode 100644
index 00000000..ade0b226
--- /dev/null
+++ b/trunk/toolchain/binutils/Config.in
@@ -0,0 +1,33 @@
+# Choose binutils version.
+
+choice
+	prompt "Binutils Version" if TOOLCHAINOPTS
+	default BINUTILS_VERSION_2_23_1 if (aarch64 || aarch64_be)
+	default BINUTILS_VERSION_2_20_1 if avr32
+	default BINUTILS_VERSION_LINARO if !avr32
+	help
+	  Select the version of binutils you wish to use.
+
+	config BINUTILS_VERSION_2_20_1
+		depends on avr32
+		bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_LINARO
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "Linaro binutils 2.24"
+
+endchoice
+
+config EXTRA_BINUTILS_CONFIG_OPTIONS
+	string
+	prompt "Additional binutils configure options" if TOOLCHAINOPTS
+	default ""
+	help
+	    Any additional binutils options you may want to include....
+
+config BINUTILS_VERSION
+	string
+	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
+	default "2.20.1"          if BINUTILS_VERSION_2_20_1 || avr32
+	default "linaro"          if BINUTILS_VERSION_LINARO
+	default "linaro"
diff --git a/trunk/toolchain/binutils/Makefile b/trunk/toolchain/binutils/Makefile
new file mode 100644
index 00000000..820b5f8e
--- /dev/null
+++ b/trunk/toolchain/binutils/Makefile
@@ -0,0 +1,98 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=binutils
+PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION))
+BIN_VERSION:=$(PKG_VERSION)
+
+ifeq ($(findstring linaro, $(CONFIG_BINUTILS_VERSION)),linaro)
+  PKG_SOURCE_URL:=https://releases.linaro.org/14.09/components/toolchain/binutils-linaro/
+  PKG_REV:=2.24.0-2014.09
+  PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz
+  PKG_MD5SUM:=8f9b2b2e049d59b1b86ce9657802a353
+  BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV)
+  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR)
+else
+  PKG_SOURCE_URL:=@GNU/binutils/
+  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+  ifeq ($(PKG_VERSION),2.20.1)
+    PKG_MD5SUM:=9cdfb9d6ec0578c166d3beae5e15c4e5
+  endif
+endif
+
+HOST_BUILD_PARALLEL:=1
+
+PATCH_DIR:=./patches/$(PKG_VERSION)
+
+REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+BINUTILS_CONFIGURE:= \
+	./configure \
+		--prefix=$(TOOLCHAIN_DIR) \
+		--build=$(GNU_HOST_NAME) \
+		--host=$(GNU_HOST_NAME) \
+		--target=$(REAL_GNU_TARGET_NAME) \
+		--with-sysroot=$(TOOLCHAIN_DIR) \
+		--disable-multilib \
+		--disable-werror \
+		--disable-nls \
+		$(GRAPHITE_CONFIGURE) \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) 
+
+ifneq ($(CONFIG_SSP_SUPPORT),)
+  BINUTILS_CONFIGURE+= \
+		--enable-libssp
+else
+  BINUTILS_CONFIGURE+= \
+		--disable-libssp
+endif
+
+ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
+  BINUTILS_CONFIGURE+= \
+		--enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX)
+endif
+
+define Host/Prepare
+	$(call Host/Prepare/Default)
+	ln -snf $(notdir $(HOST_BUILD_DIR)) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
+	$(SED) 's, " Linaro.*,,' $(HOST_BUILD_DIR)/bfd/version.h
+endef
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
+		$(BINUTILS_CONFIGURE) \
+	);
+endef
+
+define Host/Compile
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all
+endef
+
+define Host/Install
+	mkdir -p $(TOOLCHAIN_DIR)/initial
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		prefix=$(TOOLCHAIN_DIR)/initial \
+		install
+	$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
+	$(RM) $(TOOLCHAIN_DIR)/initial/lib/libiberty.a
+	$(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
+	$(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/binutils/patches/2.20.1/110-arm-eabi-conf.patch b/trunk/toolchain/binutils/patches/2.20.1/110-arm-eabi-conf.patch
new file mode 100644
index 00000000..74c9653e
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/110-arm-eabi-conf.patch
@@ -0,0 +1,22 @@
+--- a/configure
++++ b/configure
+@@ -3086,7 +3086,7 @@ case "${target}" in
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     libgloss_dir=arm
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-*gnueabi)
+     noconfigdirs="$noconfigdirs target-qthreads"
+     case ${with_newlib} in
+       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+--- a/configure.ac
++++ b/configure.ac
+@@ -573,7 +573,7 @@ case "${target}" in
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     libgloss_dir=arm
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-*gnueabi)
+     noconfigdirs="$noconfigdirs target-qthreads"
+     case ${with_newlib} in
+       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
diff --git a/trunk/toolchain/binutils/patches/2.20.1/111-pr7093.elf32-arm.c.patch b/trunk/toolchain/binutils/patches/2.20.1/111-pr7093.elf32-arm.c.patch
new file mode 100644
index 00000000..76aa3437
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/111-pr7093.elf32-arm.c.patch
@@ -0,0 +1,13 @@
+--- a/bfd/elf32-arm.c
++++ b/bfd/elf32-arm.c
+@@ -5511,6 +5511,10 @@ bfd_elf32_arm_init_maps (bfd *abfd)
+   if (! is_arm_elf (abfd))
+     return;
+ 
++  /* PR 7093: Make sure that we are dealing with an arm elf binary.  */
++  if (! is_arm_elf (abfd))
++    return;
++
+   if ((abfd->flags & DYNAMIC) != 0)
+     return;
+ 
diff --git a/trunk/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch b/trunk/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch
new file mode 100644
index 00000000..fd14fa1b
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch
@@ -0,0 +1,209 @@
+--- a/bfd/elf32-mips.c
++++ b/bfd/elf32-mips.c
+@@ -1663,6 +1663,15 @@ static const struct ecoff_debug_swap mip
+ #define elf_backend_plt_readonly	1
+ #define elf_backend_plt_sym_val		_bfd_mips_elf_plt_sym_val
+ 
++/* Most MIPS ELF files do not contain a traditional PLT; only VxWorks
++   and non-PIC dynamic executables do.  These settings only affect
++   _bfd_elf_create_dynamic_sections, which is only called when we
++   do want a traditional PLT.  */
++#undef elf_backend_want_plt_sym
++#define elf_backend_want_plt_sym		1
++#undef elf_backend_plt_readonly
++#define elf_backend_plt_readonly		1
++
+ #define elf_backend_discard_info	_bfd_mips_elf_discard_info
+ #define elf_backend_ignore_discarded_relocs \
+ 					_bfd_mips_elf_ignore_discarded_relocs
+@@ -1687,6 +1696,8 @@ static const struct ecoff_debug_swap mip
+ #define bfd_elf32_bfd_print_private_bfd_data \
+ 					_bfd_mips_elf_print_private_bfd_data
+ 
++#define elf_backend_plt_sym_val		_bfd_mips_elf_plt_sym_val
++
+ /* Support for SGI-ish mips targets.  */
+ #define TARGET_LITTLE_SYM		bfd_elf32_littlemips_vec
+ #define TARGET_LITTLE_NAME		"elf32-littlemips"
+@@ -1790,6 +1801,7 @@ mips_vxworks_final_write_processing (bfd
+ #undef elf_backend_additional_program_headers
+ #undef elf_backend_modify_segment_map
+ #undef elf_backend_symbol_processing
++#undef elf_backend_plt_sym_val
+ /* NOTE: elf_backend_rela_normal is not defined for MIPS.  */
+ 
+ #include "elf32-target.h"
+--- a/bfd/elfxx-mips.c
++++ b/bfd/elfxx-mips.c
+@@ -694,6 +694,11 @@ static bfd *reldyn_sorting_bfd;
+ /* Nonzero if ABFD is using NewABI conventions.  */
+ #define NEWABI_P(abfd) (ABI_N32_P (abfd) || ABI_64_P (abfd))
+ 
++/* Nonzero if ABFD is a non-PIC object.  */
++#define NON_PIC_P(abfd) \
++  (((elf_elfheader (abfd)->e_flags & EF_MIPS_PIC) == 0) \
++   && ((elf_elfheader (abfd)->e_flags & EF_MIPS_CPIC) == EF_MIPS_CPIC))
++
+ /* The IRIX compatibility level we are striving for.  */
+ #define IRIX_COMPAT(abfd) \
+   (get_elf_backend_data (abfd)->elf_backend_mips_irix_compat (abfd))
+@@ -706,6 +711,9 @@ static bfd *reldyn_sorting_bfd;
+ #define MIPS_ELF_OPTIONS_SECTION_NAME(abfd) \
+   (NEWABI_P (abfd) ? ".MIPS.options" : ".options")
+ 
++/* The name of the section holding non-PIC to PIC call stubs.  */
++#define NON_PIC_TO_PIC_STUB_SECTION_NAME ".MIPS.pic_stubs"
++
+ /* True if NAME is the recognized name of any SHT_MIPS_OPTIONS section.
+    Some IRIX system files do not use MIPS_ELF_OPTIONS_SECTION_NAME.  */
+ #define MIPS_ELF_OPTIONS_SECTION_NAME_P(NAME) \
+@@ -7619,7 +7627,9 @@ _bfd_mips_elf_check_relocs (bfd *abfd, s
+ 
+ 	      /* We need a stub, not a plt entry for the undefined
+ 		 function.  But we record it as if it needs plt.  See
+-		 _bfd_elf_adjust_dynamic_symbol.  */
++		 _bfd_elf_adjust_dynamic_symbol.  Note that these relocations
++		 are always used for PIC calls, even when using the new
++		 non-PIC ABI.  */
+ 	      h->needs_plt = 1;
+ 	      h->type = STT_FUNC;
+ 	    }
+@@ -7725,6 +7735,8 @@ _bfd_mips_elf_check_relocs (bfd *abfd, s
+ 	case R_MIPS_32:
+ 	case R_MIPS_REL32:
+ 	case R_MIPS_64:
++	  if (h != NULL)
++	    h->non_got_ref = TRUE;
+ 	  /* In VxWorks executables, references to external symbols
+ 	     are handled using copy relocs or PLT stubs, so there's
+ 	     no need to add a .rela.dyn entry for this relocation.  */
+@@ -7780,11 +7792,21 @@ _bfd_mips_elf_check_relocs (bfd *abfd, s
+ 	case R_MIPS_GPREL16:
+ 	case R_MIPS_LITERAL:
+ 	case R_MIPS_GPREL32:
++	  if (h != NULL
++	      && (r_type == R_MIPS_GPREL16 || r_type == R_MIPS_GPREL32))
++	    h->non_got_ref = TRUE;
++
+ 	  if (SGI_COMPAT (abfd))
+ 	    mips_elf_hash_table (info)->compact_rel_size +=
+ 	      sizeof (Elf32_External_crinfo);
+ 	  break;
+ 
++	case R_MIPS_HI16:
++	case R_MIPS_LO16:
++	  if (h != NULL && strcmp (h->root.root.string, "_gp_disp") != 0)
++	    h->non_got_ref = TRUE;
++	  break;
++
+ 	  /* This relocation describes the C++ object vtable hierarchy.
+ 	     Reconstruct it for later use during GC.  */
+ 	case R_MIPS_GNU_VTINHERIT:
+@@ -7807,20 +7829,20 @@ _bfd_mips_elf_check_relocs (bfd *abfd, s
+ 
+       /* We must not create a stub for a symbol that has relocations
+ 	 related to taking the function's address.  This doesn't apply to
+-	 VxWorks, where CALL relocs refer to a .got.plt entry instead of
+-	 a normal .got entry.  */
++	 VxWorks or the non-PIC ABI, where CALL relocs refer to a
++	 .got.plt entry instead of a normal .got entry.  */
+       if (!htab->is_vxworks && h != NULL)
+ 	switch (r_type)
+ 	  {
+-	  default:
+-	    ((struct mips_elf_link_hash_entry *) h)->no_fn_stub = TRUE;
+-	    break;
+ 	  case R_MIPS16_CALL16:
+ 	  case R_MIPS_CALL16:
+ 	  case R_MIPS_CALL_HI16:
+ 	  case R_MIPS_CALL_LO16:
+ 	  case R_MIPS_JALR:
+ 	    break;
++	  default:
++	    ((struct mips_elf_link_hash_entry *) h)->no_fn_stub = TRUE;
++	    break;
+ 	  }
+ 
+       /* See if this reloc would need to refer to a MIPS16 hard-float stub,
+@@ -12514,7 +12536,9 @@ _bfd_mips_elf_merge_private_bfd_data (bf
+ 	  break;
+ 	}
+     }
+-  if (null_input_bfd)
++  /* Dynamic objects normally have no sections, and do not reach
++     here - but they might if used as DYNOBJ.  */
++  if (null_input_bfd || (ibfd->flags & DYNAMIC) != 0)
+     return TRUE;
+ 
+   ok = TRUE;
+--- a/bfd/elfxx-mips.h
++++ b/bfd/elfxx-mips.h
+@@ -63,6 +63,9 @@ extern bfd_boolean _bfd_mips_elf_finish_
+ extern bfd_boolean _bfd_mips_vxworks_finish_dynamic_symbol
+   (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+    Elf_Internal_Sym *);
++extern bfd_boolean _bfd_mips_nonpic_finish_dynamic_symbol
++  (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
++   Elf_Internal_Sym *);
+ extern bfd_boolean _bfd_mips_elf_finish_dynamic_sections
+   (bfd *, struct bfd_link_info *);
+ extern void _bfd_mips_elf_final_write_processing
+@@ -153,6 +156,15 @@ extern const struct bfd_elf_special_sect
+ 
+ extern bfd_boolean _bfd_mips_elf_common_definition (Elf_Internal_Sym *);
+ 
++extern bfd_vma _bfd_mips_elf_plt_sym_val
++  (bfd_vma, const asection *, const arelent *);
++extern void _bfd_mips_elf_begin_write_processing
++  (bfd *abfd, struct bfd_link_info *link_info);
++extern bfd_boolean bfd_mips_elf_maybe_create_non_pic_to_pic_stubs_section
++  (struct bfd_link_info *);
++extern void _bfd_mips_post_process_headers
++  (bfd *abfd, struct bfd_link_info *link_info);
++
+ #define elf_backend_common_definition   _bfd_mips_elf_common_definition
+ #define elf_backend_name_local_section_symbols \
+   _bfd_mips_elf_name_local_section_symbols
+--- a/gas/config/tc-mips.c
++++ b/gas/config/tc-mips.c
+@@ -1891,6 +1891,12 @@ md_begin (void)
+ 	as_bad (_("-G may not be used in position-independent code"));
+       g_switch_value = 0;
+     }
++  else if (mips_abicalls)
++    {
++      if (g_switch_seen && g_switch_value != 0)
++	as_bad (_("-G may not be used with abicalls"));
++      g_switch_value = 0;
++    }
+ 
+   if (! bfd_set_arch_mach (stdoutput, bfd_arch_mips, file_mips_arch))
+     as_warn (_("Could not set architecture and machine"));
+@@ -11258,6 +11264,7 @@ enum options
+     OPTION_PDR,
+     OPTION_NO_PDR,
+     OPTION_MVXWORKS_PIC,
++    OPTION_NON_PIC_ABICALLS,
+ #endif /* OBJ_ELF */
+     OPTION_END_OF_ENUM    
+   };
+@@ -11359,6 +11366,7 @@ struct option md_longopts[] =
+   {"mpdr", no_argument, NULL, OPTION_PDR},
+   {"mno-pdr", no_argument, NULL, OPTION_NO_PDR},
+   {"mvxworks-pic", no_argument, NULL, OPTION_MVXWORKS_PIC},
++  {"mnon-pic-abicalls", no_argument, NULL, OPTION_NON_PIC_ABICALLS},
+ #endif /* OBJ_ELF */
+ 
+   {NULL, no_argument, NULL, 0}
+@@ -11783,6 +11791,11 @@ md_parse_option (int c, char *arg)
+     case OPTION_MVXWORKS_PIC:
+       mips_pic = VXWORKS_PIC;
+       break;
++
++    case OPTION_NON_PIC_ABICALLS:
++      mips_pic = NO_PIC;
++      mips_abicalls = TRUE;
++      break;
+ #endif /* OBJ_ELF */
+ 
+     default:
diff --git a/trunk/toolchain/binutils/patches/2.20.1/300-001_ld_makefile_patch.patch b/trunk/toolchain/binutils/patches/2.20.1/300-001_ld_makefile_patch.patch
new file mode 100644
index 00000000..3ca4a586
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/300-001_ld_makefile_patch.patch
@@ -0,0 +1,22 @@
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -24,7 +24,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -333,7 +333,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/trunk/toolchain/binutils/patches/2.20.1/300-012_check_ldrunpath_length.patch b/trunk/toolchain/binutils/patches/2.20.1/300-012_check_ldrunpath_length.patch
new file mode 100644
index 00000000..08072a42
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,20 @@
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1233,6 +1233,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++		  lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1418,6 +1420,8 @@ gld${EMULATION_NAME}_before_allocation (
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++      rpath = NULL;
+   if (! (bfd_elf_size_dynamic_sections
+ 	 (link_info.output_bfd, command_line.soname, rpath,
+ 	  command_line.filter_shlib,
diff --git a/trunk/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch b/trunk/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
new file mode 100644
index 00000000..9a93728b
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
@@ -0,0 +1,15 @@
+--- a/bfd/elfxx-mips.c
++++ b/bfd/elfxx-mips.c
+@@ -5696,9 +5696,9 @@ mips_elf_create_dynamic_relocation (bfd
+ 
+   /* We must now calculate the dynamic symbol table index to use
+      in the relocation.  */
+-  if (h != NULL
+-      && (!h->root.def_regular
+-	  || (info->shared && !info->symbolic && !h->root.forced_local)))
++  if (!(h == NULL
++	|| (h->root.def_regular
++	    && (info->executable || info->symbolic || h->root.forced_local))))
+     {
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
diff --git a/trunk/toolchain/binutils/patches/2.20.1/400-autoreconf-compat.patch b/trunk/toolchain/binutils/patches/2.20.1/400-autoreconf-compat.patch
new file mode 100644
index 00000000..d5451e81
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/400-autoreconf-compat.patch
@@ -0,0 +1,84 @@
+--- a/config/override.m4
++++ b/config/override.m4
+@@ -32,31 +32,6 @@ dnl Redefine AC_CONFIG_SUBDIRS so acloca
+ dnl when needed.
+ 
+ ifdef([m4_PACKAGE_VERSION],
+-[dnl AC_DEFUN a commonly used macro so this file is picked up.
+-m4_copy([AC_PREREQ], [_AC_PREREQ])
+-AC_DEFUN([AC_PREREQ], [frob])
+-m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+-
+-
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+ 
+ 
+ dnl Turn AC_DISABLE_OPTION_CHECKING into a no-op if not defined.
+--- a/gas/aclocal.m4
++++ b/gas/aclocal.m4
+@@ -998,7 +998,6 @@ m4_include([../config/nls.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/bfd/aclocal.m4
++++ b/bfd/aclocal.m4
+@@ -978,7 +978,6 @@ m4_include([../config/plugins.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+ m4_include([../config/stdint.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/binutils/aclocal.m4
++++ b/binutils/aclocal.m4
+@@ -1003,7 +1003,6 @@ m4_include([../config/override.m4])
+ m4_include([../config/plugins.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/ld/aclocal.m4
++++ b/ld/aclocal.m4
+@@ -999,7 +999,6 @@ m4_include([../config/nls.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
+--- a/opcodes/aclocal.m4
++++ b/opcodes/aclocal.m4
+@@ -978,7 +978,6 @@ m4_include([../config/nls.m4])
+ m4_include([../config/override.m4])
+ m4_include([../config/po.m4])
+ m4_include([../config/progtest.m4])
+-m4_include([../libtool.m4])
+ m4_include([../ltoptions.m4])
+ m4_include([../ltsugar.m4])
+ m4_include([../ltversion.m4])
diff --git a/trunk/toolchain/binutils/patches/2.20.1/700-avr32.patch b/trunk/toolchain/binutils/patches/2.20.1/700-avr32.patch
new file mode 100644
index 00000000..646049cc
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/2.20.1/700-avr32.patch
@@ -0,0 +1,30797 @@
+--- a/bfd/archures.c
++++ b/bfd/archures.c
+@@ -368,6 +368,12 @@ DESCRIPTION
+ .#define bfd_mach_avr5		5
+ .#define bfd_mach_avr51		51
+ .#define bfd_mach_avr6		6
++.  bfd_arch_avr32,     {* Atmel AVR32 *}
++.#define bfd_mach_avr32_ap	7000
++.#define bfd_mach_avr32_uc	3000
++.#define bfd_mach_avr32_ucr1    3001
++.#define bfd_mach_avr32_ucr2    3002
++.#define bfd_mach_avr32_ucr3    3003
+ .  bfd_arch_bfin,        {* ADI Blackfin *}
+ .#define bfd_mach_bfin          1
+ .  bfd_arch_cr16,       {* National Semiconductor CompactRISC (ie CR16). *}
+@@ -465,6 +471,7 @@ extern const bfd_arch_info_type bfd_alph
+ extern const bfd_arch_info_type bfd_arc_arch;
+ extern const bfd_arch_info_type bfd_arm_arch;
+ extern const bfd_arch_info_type bfd_avr_arch;
++extern const bfd_arch_info_type bfd_avr32_arch;
+ extern const bfd_arch_info_type bfd_bfin_arch;
+ extern const bfd_arch_info_type bfd_cr16_arch;
+ extern const bfd_arch_info_type bfd_cr16c_arch;
+@@ -541,6 +548,7 @@ static const bfd_arch_info_type * const
+     &bfd_arc_arch,
+     &bfd_arm_arch,
+     &bfd_avr_arch,
++    &bfd_avr32_arch,
+     &bfd_bfin_arch,
+     &bfd_cr16_arch,
+     &bfd_cr16c_arch,
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -347,6 +347,10 @@ case "${targ}" in
+     targ_underscore=yes
+     ;;
+ 
++  avr32-*-*)
++    targ_defvec=bfd_elf32_avr32_vec
++    ;;
++
+   c30-*-*aout* | tic30-*-*aout*)
+     targ_defvec=tic30_aout_vec
+     ;;
+--- a/bfd/configure.in
++++ b/bfd/configure.in
+@@ -675,6 +675,7 @@ do
+     bfd_pei_ia64_vec)		tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
+     bfd_elf32_am33lin_vec)	tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
+     bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
++    bfd_elf32_avr32_vec)	tb="$tb elf32-avr32.lo elf32.lo $elf" ;;
+     bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+     bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+     bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+--- /dev/null
++++ b/bfd/cpu-avr32.c
+@@ -0,0 +1,52 @@
++/* BFD library support routines for AVR32.
++   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This is part of BFD, the Binary File Descriptor library.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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 "bfd.h"
++#include "sysdep.h"
++#include "libbfd.h"
++
++#define N(machine, print, default, next)			\
++  {								\
++    32,				/* 32 bits in a word */		\
++    32,				/* 32 bits in an address */	\
++    8,				/* 8 bits in a byte */		\
++    bfd_arch_avr32,		/* architecture */		\
++    machine,			/* machine */			\
++    "avr32",			/* arch name */			\
++    print,			/* printable name */		\
++    1,				/* section align power */	\
++    default,			/* the default machine? */	\
++    bfd_default_compatible,					\
++    bfd_default_scan,						\
++    next,							\
++  }
++
++static const bfd_arch_info_type cpu_info[] =
++{
++  N(bfd_mach_avr32_ap, "avr32:ap", FALSE, &cpu_info[1]),
++  N(bfd_mach_avr32_uc, "avr32:uc", FALSE, &cpu_info[2]),
++  N(bfd_mach_avr32_ucr1, "avr32:ucr1", FALSE, &cpu_info[3]),
++  N(bfd_mach_avr32_ucr2, "avr32:ucr2", FALSE, &cpu_info[4]),
++  N(bfd_mach_avr32_ucr3, "avr32:ucr3", FALSE, NULL),
++};
++
++const bfd_arch_info_type bfd_avr32_arch =
++  N(bfd_mach_avr32_ap, "avr32", TRUE, &cpu_info[0]);
+--- /dev/null
++++ b/bfd/elf32-avr32.c
+@@ -0,0 +1,3915 @@
++/* AVR32-specific support for 32-bit ELF.
++   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of BFD, the Binary File Descriptor library.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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 "bfd.h"
++#include "sysdep.h"
++#include "bfdlink.h"
++#include "libbfd.h"
++#include "elf-bfd.h"
++#include "elf/avr32.h"
++#include "elf32-avr32.h"
++
++#define xDEBUG
++#define xRELAX_DEBUG
++
++#ifdef DEBUG
++# define pr_debug(fmt, args...) fprintf(stderr, fmt, ##args)
++#else
++# define pr_debug(fmt, args...) do { } while (0)
++#endif
++
++#ifdef RELAX_DEBUG
++# define RDBG(fmt, args...) fprintf(stderr, fmt, ##args)
++#else
++# define RDBG(fmt, args...) do { } while (0)
++#endif
++
++/* When things go wrong, we want it to blow up, damnit! */
++#undef BFD_ASSERT
++#undef abort
++#define BFD_ASSERT(expr)					\
++  do								\
++    {								\
++      if (!(expr))						\
++	{							\
++	  bfd_assert(__FILE__, __LINE__);			\
++	  abort();						\
++	}							\
++    }								\
++  while (0)
++
++/* The name of the dynamic interpreter. This is put in the .interp section. */
++#define ELF_DYNAMIC_INTERPRETER		"/lib/ld.so.1"
++
++#define AVR32_GOT_HEADER_SIZE		8
++#define AVR32_FUNCTION_STUB_SIZE	8
++
++#define ELF_R_INFO(x, y) ELF32_R_INFO(x, y)
++#define ELF_R_TYPE(x) ELF32_R_TYPE(x)
++#define ELF_R_SYM(x) ELF32_R_SYM(x)
++
++#define NOP_OPCODE 0xd703
++
++
++/* Mapping between BFD relocations and ELF relocations */
++
++static reloc_howto_type *
++bfd_elf32_bfd_reloc_type_lookup(bfd *abfd, bfd_reloc_code_real_type code);
++
++static reloc_howto_type *
++bfd_elf32_bfd_reloc_name_lookup(bfd *abfd, const char *r_name);
++
++static void
++avr32_info_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst);
++
++/* Generic HOWTO */
++#define GENH(name, align, size, bitsize, pcrel, bitpos, complain, mask)	\
++  HOWTO(name, align, size, bitsize, pcrel, bitpos,			\
++	complain_overflow_##complain, bfd_elf_generic_reloc, #name,	\
++	FALSE, 0, mask, pcrel)
++
++static reloc_howto_type elf_avr32_howto_table[] = {
++  /*   NAME		 ALN SZ BSZ PCREL  BP COMPLAIN  MASK	    */
++  GENH(R_AVR32_NONE,	  0, 0, 0,  FALSE, 0, dont,	0x00000000),
++
++  GENH(R_AVR32_32,	  0, 2, 32, FALSE, 0, dont,	0xffffffff),
++  GENH(R_AVR32_16,	  0, 1, 16, FALSE, 0, bitfield,	0x0000ffff),
++  GENH(R_AVR32_8,	  0, 0,  8, FALSE, 0, bitfield,	0x000000ff),
++  GENH(R_AVR32_32_PCREL,  0, 2, 32, TRUE,  0, signed,   0xffffffff),
++  GENH(R_AVR32_16_PCREL,  0, 1, 16, TRUE,  0, signed,   0x0000ffff),
++  GENH(R_AVR32_8_PCREL,	  0, 0,  8, TRUE,  0, signed,   0x000000ff),
++
++  /* Difference between two symbol (sym2 - sym1).  The reloc encodes
++     the value of sym1.  The field contains the difference before any
++     relaxing is done.  */
++  GENH(R_AVR32_DIFF32,	  0, 2, 32, FALSE, 0, dont,	0xffffffff),
++  GENH(R_AVR32_DIFF16,	  0, 1, 16, FALSE, 0, signed,	0x0000ffff),
++  GENH(R_AVR32_DIFF8,	  0, 0,  8, FALSE, 0, signed,	0x000000ff),
++
++  GENH(R_AVR32_GOT32,	  0, 2, 32, FALSE, 0, signed,	0xffffffff),
++  GENH(R_AVR32_GOT16,	  0, 1, 16, FALSE, 0, signed,	0x0000ffff),
++  GENH(R_AVR32_GOT8,	  0, 0,  8, FALSE, 0, signed,	0x000000ff),
++
++  GENH(R_AVR32_21S,	  0, 2, 21, FALSE, 0, signed,	0x1e10ffff),
++  GENH(R_AVR32_16U,	  0, 2, 16, FALSE, 0, unsigned,	0x0000ffff),
++  GENH(R_AVR32_16S,	  0, 2, 16, FALSE, 0, signed,	0x0000ffff),
++  GENH(R_AVR32_8S,	  0, 1,  8, FALSE, 4, signed,	0x00000ff0),
++  GENH(R_AVR32_8S_EXT,	  0, 2,  8, FALSE, 0, signed,	0x000000ff),
++
++  GENH(R_AVR32_22H_PCREL, 1, 2, 21, TRUE,  0, signed,	0x1e10ffff),
++  GENH(R_AVR32_18W_PCREL, 2, 2, 16, TRUE,  0, signed,	0x0000ffff),
++  GENH(R_AVR32_16B_PCREL, 0, 2, 16, TRUE,  0, signed,	0x0000ffff),
++  GENH(R_AVR32_16N_PCREL, 0, 2, 16, TRUE,  0, signed,	0x0000ffff),
++  GENH(R_AVR32_14UW_PCREL, 2, 2, 12, TRUE, 0, unsigned, 0x0000f0ff),
++  GENH(R_AVR32_11H_PCREL, 1, 1, 10, TRUE,  4, signed,	0x00000ff3),
++  GENH(R_AVR32_10UW_PCREL, 2, 2, 8, TRUE,  0, unsigned, 0x000000ff),
++  GENH(R_AVR32_9H_PCREL,  1, 1,  8, TRUE,  4, signed,	0x00000ff0),
++  GENH(R_AVR32_9UW_PCREL, 2, 1,  7, TRUE,  4, unsigned,	0x000007f0),
++
++  GENH(R_AVR32_HI16,	 16, 2, 16, FALSE, 0, dont,	0x0000ffff),
++  GENH(R_AVR32_LO16,	  0, 2, 16, FALSE, 0, dont,	0x0000ffff),
++
++  GENH(R_AVR32_GOTPC,	  0, 2, 32, FALSE, 0, dont,	0xffffffff),
++  GENH(R_AVR32_GOTCALL,   2, 2, 21, FALSE, 0, signed,	0x1e10ffff),
++  GENH(R_AVR32_LDA_GOT,	  2, 2, 21, FALSE, 0, signed,	0x1e10ffff),
++  GENH(R_AVR32_GOT21S,	  0, 2, 21, FALSE, 0, signed,	0x1e10ffff),
++  GENH(R_AVR32_GOT18SW,	  2, 2, 16, FALSE, 0, signed,	0x0000ffff),
++  GENH(R_AVR32_GOT16S,	  0, 2, 16, FALSE, 0, signed,	0x0000ffff),
++  GENH(R_AVR32_GOT7UW,	  2, 1,  5, FALSE, 4, unsigned, 0x000001f0),
++
++  GENH(R_AVR32_32_CPENT,  0, 2, 32, FALSE, 0, dont,	0xffffffff),
++  GENH(R_AVR32_CPCALL,	  2, 2, 16, TRUE,  0, signed,	0x0000ffff),
++  GENH(R_AVR32_16_CP,	  0, 2, 16, TRUE,  0, signed,	0x0000ffff),
++  GENH(R_AVR32_9W_CP,	  2, 1,  7, TRUE,  4, unsigned, 0x000007f0),
++
++  GENH(R_AVR32_RELATIVE,  0, 2, 32, FALSE, 0, signed,	0xffffffff),
++  GENH(R_AVR32_GLOB_DAT,  0, 2, 32, FALSE, 0, dont,	0xffffffff),
++  GENH(R_AVR32_JMP_SLOT,  0, 2, 32, FALSE, 0, dont,	0xffffffff),
++
++  GENH(R_AVR32_ALIGN,	  0, 1, 0,  FALSE, 0, unsigned, 0x00000000),
++
++  GENH(R_AVR32_15S,	  2, 2, 15, FALSE, 0, signed,	0x00007fff),
++};
++
++struct elf_reloc_map
++{
++  bfd_reloc_code_real_type bfd_reloc_val;
++  unsigned char elf_reloc_val;
++};
++
++static const struct elf_reloc_map avr32_reloc_map[] =
++{
++  { BFD_RELOC_NONE,			R_AVR32_NONE },
++
++  { BFD_RELOC_32,			R_AVR32_32 },
++  { BFD_RELOC_16,			R_AVR32_16 },
++  { BFD_RELOC_8,			R_AVR32_8 },
++  { BFD_RELOC_32_PCREL,			R_AVR32_32_PCREL },
++  { BFD_RELOC_16_PCREL,			R_AVR32_16_PCREL },
++  { BFD_RELOC_8_PCREL,			R_AVR32_8_PCREL },
++  { BFD_RELOC_AVR32_DIFF32,		R_AVR32_DIFF32 },
++  { BFD_RELOC_AVR32_DIFF16,		R_AVR32_DIFF16 },
++  { BFD_RELOC_AVR32_DIFF8,		R_AVR32_DIFF8 },
++  { BFD_RELOC_AVR32_GOT32,		R_AVR32_GOT32 },
++  { BFD_RELOC_AVR32_GOT16,		R_AVR32_GOT16 },
++  { BFD_RELOC_AVR32_GOT8,		R_AVR32_GOT8 },
++
++  { BFD_RELOC_AVR32_21S,		R_AVR32_21S },
++  { BFD_RELOC_AVR32_16U,		R_AVR32_16U },
++  { BFD_RELOC_AVR32_16S,		R_AVR32_16S },
++  { BFD_RELOC_AVR32_SUB5,		R_AVR32_16S },
++  { BFD_RELOC_AVR32_8S_EXT,		R_AVR32_8S_EXT },
++  { BFD_RELOC_AVR32_8S,			R_AVR32_8S },
++
++  { BFD_RELOC_AVR32_22H_PCREL,		R_AVR32_22H_PCREL },
++  { BFD_RELOC_AVR32_18W_PCREL,		R_AVR32_18W_PCREL },
++  { BFD_RELOC_AVR32_16B_PCREL,		R_AVR32_16B_PCREL },
++  { BFD_RELOC_AVR32_16N_PCREL,		R_AVR32_16N_PCREL },
++  { BFD_RELOC_AVR32_11H_PCREL,		R_AVR32_11H_PCREL },
++  { BFD_RELOC_AVR32_10UW_PCREL,		R_AVR32_10UW_PCREL },
++  { BFD_RELOC_AVR32_9H_PCREL,		R_AVR32_9H_PCREL },
++  { BFD_RELOC_AVR32_9UW_PCREL,		R_AVR32_9UW_PCREL },
++
++  { BFD_RELOC_HI16,			R_AVR32_HI16 },
++  { BFD_RELOC_LO16,			R_AVR32_LO16 },
++
++  { BFD_RELOC_AVR32_GOTPC,		R_AVR32_GOTPC },
++  { BFD_RELOC_AVR32_GOTCALL,		R_AVR32_GOTCALL },
++  { BFD_RELOC_AVR32_LDA_GOT,		R_AVR32_LDA_GOT },
++  { BFD_RELOC_AVR32_GOT21S,		R_AVR32_GOT21S },
++  { BFD_RELOC_AVR32_GOT18SW,		R_AVR32_GOT18SW },
++  { BFD_RELOC_AVR32_GOT16S,		R_AVR32_GOT16S },
++  /* GOT7UW should never be generated by the assembler */
++
++  { BFD_RELOC_AVR32_32_CPENT,		R_AVR32_32_CPENT },
++  { BFD_RELOC_AVR32_CPCALL,		R_AVR32_CPCALL },
++  { BFD_RELOC_AVR32_16_CP,		R_AVR32_16_CP },
++  { BFD_RELOC_AVR32_9W_CP,		R_AVR32_9W_CP },
++
++  { BFD_RELOC_AVR32_ALIGN,		R_AVR32_ALIGN },
++
++  { BFD_RELOC_AVR32_15S,		R_AVR32_15S },
++};
++
++static reloc_howto_type *
++bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
++				 bfd_reloc_code_real_type code)
++{
++  unsigned int i;
++
++  for (i = 0; i < sizeof(avr32_reloc_map) / sizeof(struct elf_reloc_map); i++)
++    {
++      if (avr32_reloc_map[i].bfd_reloc_val == code)
++	return &elf_avr32_howto_table[avr32_reloc_map[i].elf_reloc_val];
++    }
++
++  return NULL;
++}
++
++static reloc_howto_type *
++bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
++                 const char *r_name)
++{
++  unsigned int i;
++
++  for (i = 0;
++       i < sizeof (elf_avr32_howto_table) / sizeof (elf_avr32_howto_table[0]);
++       i++)
++    if (elf_avr32_howto_table[i].name != NULL
++    && strcasecmp (elf_avr32_howto_table[i].name, r_name) == 0)
++      return &elf_avr32_howto_table[i];
++
++  return NULL;
++}
++
++/* Set the howto pointer for an AVR32 ELF reloc.  */
++static void
++avr32_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
++		     arelent *cache_ptr,
++		     Elf_Internal_Rela *dst)
++{
++  unsigned int r_type;
++
++  r_type = ELF32_R_TYPE (dst->r_info);
++  BFD_ASSERT (r_type < (unsigned int) R_AVR32_max);
++  cache_ptr->howto = &elf_avr32_howto_table[r_type];
++}
++
++
++/* AVR32 ELF linker hash table and associated hash entries. */
++
++static struct bfd_hash_entry *
++avr32_elf_link_hash_newfunc(struct bfd_hash_entry *entry,
++			    struct bfd_hash_table *table,
++			    const char *string);
++static void
++avr32_elf_copy_indirect_symbol(struct bfd_link_info *info,
++			       struct elf_link_hash_entry *dir,
++			       struct elf_link_hash_entry *ind);
++static struct bfd_link_hash_table *
++avr32_elf_link_hash_table_create(bfd *abfd);
++
++/*
++  Try to limit memory usage to something reasonable when sorting the
++  GOT.  If just a couple of entries end up getting more references
++  than this, it won't affect performance at all, but if there are many
++  of them, we could end up with the wrong symbols being assigned the
++  first GOT entries.
++*/
++#define MAX_NR_GOT_HOLES	2048
++
++/*
++  AVR32 GOT entry.  We need to keep track of refcounts and offsets
++  simultaneously, since we need the offsets during relaxation, and we
++  also want to be able to drop GOT entries during relaxation. In
++  addition to this, we want to keep the list of GOT entries sorted so
++  that we can keep the most-used entries at the lowest offsets.
++*/
++struct got_entry
++{
++  struct got_entry *next;
++  struct got_entry **pprev;
++  int refcount;
++  bfd_signed_vma offset;
++};
++
++struct elf_avr32_link_hash_entry
++{
++  struct elf_link_hash_entry root;
++
++  /* Number of runtime relocations against this symbol.  */
++  unsigned int possibly_dynamic_relocs;
++
++  /* If there are anything but R_AVR32_GOT18 relocations against this
++     symbol, it means that someone may be taking the address of the
++     function, and we should therefore not create a stub.  */
++  bfd_boolean no_fn_stub;
++
++  /* If there is a R_AVR32_32 relocation in a read-only section
++     against this symbol, we could be in trouble. If we're linking a
++     shared library or this symbol is defined in one, it means we must
++     emit a run-time reloc for it and that's not allowed in read-only
++     sections.  */
++  asection *readonly_reloc_sec;
++  bfd_vma readonly_reloc_offset;
++
++  /* Record which frag (if any) contains the symbol.  This is used
++     during relaxation in order to avoid having to update all symbols
++     whenever we move something.  For local symbols, this information
++     is in the local_sym_frag member of struct elf_obj_tdata.  */
++  struct fragment *sym_frag;
++};
++#define avr32_elf_hash_entry(ent) ((struct elf_avr32_link_hash_entry *)(ent))
++
++struct elf_avr32_link_hash_table
++{
++  struct elf_link_hash_table root;
++
++  /* Shortcuts to get to dynamic linker sections.  */
++  asection *sgot;
++  asection *srelgot;
++  asection *sstub;
++
++  /* We use a variation of Pigeonhole Sort to sort the GOT.  After the
++     initial refcounts have been determined, we initialize
++     nr_got_holes to the highest refcount ever seen and allocate an
++     array of nr_got_holes entries for got_hole.  Each GOT entry is
++     then stored in this array at the index given by its refcount.
++
++     When a GOT entry has its refcount decremented during relaxation,
++     it is moved to a lower index in the got_hole array.
++   */
++  struct got_entry **got_hole;
++  int nr_got_holes;
++
++  /* Dynamic relocations to local symbols.  Only used when linking a
++     shared library and -Bsymbolic is not given.  */
++  unsigned int local_dynamic_relocs;
++
++  bfd_boolean relocations_analyzed;
++  bfd_boolean symbols_adjusted;
++  bfd_boolean repeat_pass;
++  bfd_boolean direct_data_refs;
++  unsigned int relax_iteration;
++  unsigned int relax_pass;
++};
++#define avr32_elf_hash_table(p)				\
++  ((struct elf_avr32_link_hash_table *)((p)->hash))
++
++static struct bfd_hash_entry *
++avr32_elf_link_hash_newfunc(struct bfd_hash_entry *entry,
++			    struct bfd_hash_table *table,
++			    const char *string)
++{
++  struct elf_avr32_link_hash_entry *ret = avr32_elf_hash_entry(entry);
++
++  /* Allocate the structure if it hasn't already been allocated by a
++     subclass */
++  if (ret == NULL)
++    ret = (struct elf_avr32_link_hash_entry *)
++      bfd_hash_allocate(table, sizeof(struct elf_avr32_link_hash_entry));
++
++  if (ret == NULL)
++    return NULL;
++
++  memset(ret, 0, sizeof(struct elf_avr32_link_hash_entry));
++
++  /* Give the superclass a chance */
++  ret = (struct elf_avr32_link_hash_entry *)
++    _bfd_elf_link_hash_newfunc((struct bfd_hash_entry *)ret, table, string);
++
++  return (struct bfd_hash_entry *)ret;
++}
++
++/* Copy data from an indirect symbol to its direct symbol, hiding the
++   old indirect symbol.  Process additional relocation information.
++   Also called for weakdefs, in which case we just let
++   _bfd_elf_link_hash_copy_indirect copy the flags for us.  */
++
++static void
++avr32_elf_copy_indirect_symbol(struct bfd_link_info *info,
++			       struct elf_link_hash_entry *dir,
++			       struct elf_link_hash_entry *ind)
++{
++  struct elf_avr32_link_hash_entry *edir, *eind;
++
++  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
++
++  if (ind->root.type != bfd_link_hash_indirect)
++    return;
++
++  edir = (struct elf_avr32_link_hash_entry *)dir;
++  eind = (struct elf_avr32_link_hash_entry *)ind;
++
++  edir->possibly_dynamic_relocs += eind->possibly_dynamic_relocs;
++  edir->no_fn_stub = edir->no_fn_stub || eind->no_fn_stub;
++}
++
++static struct bfd_link_hash_table *
++avr32_elf_link_hash_table_create(bfd *abfd)
++{
++  struct elf_avr32_link_hash_table *ret;
++
++  ret = bfd_zmalloc(sizeof(*ret));
++  if (ret == NULL)
++    return NULL;
++
++  if (! _bfd_elf_link_hash_table_init(&ret->root, abfd,
++				      avr32_elf_link_hash_newfunc,
++                      sizeof (struct elf_avr32_link_hash_entry)))
++    {
++      free(ret);
++      return NULL;
++    }
++
++  /* Prevent the BFD core from creating bogus got_entry pointers */
++  ret->root.init_got_refcount.glist = NULL;
++  ret->root.init_plt_refcount.glist = NULL;
++  ret->root.init_got_offset.glist = NULL;
++  ret->root.init_plt_offset.glist = NULL;
++
++  return &ret->root.root;
++}
++
++
++/* Initial analysis and creation of dynamic sections and symbols */
++
++static asection *
++create_dynamic_section(bfd *dynobj, const char *name, flagword flags,
++		       unsigned int align_power);
++static struct elf_link_hash_entry *
++create_dynamic_symbol(bfd *dynobj, struct bfd_link_info *info,
++		      const char *name, asection *sec,
++		      bfd_vma offset);
++static bfd_boolean
++avr32_elf_create_got_section (bfd *dynobj, struct bfd_link_info *info);
++static bfd_boolean
++avr32_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info);
++static bfd_boolean
++avr32_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
++		    const Elf_Internal_Rela *relocs);
++static bfd_boolean
++avr32_elf_adjust_dynamic_symbol(struct bfd_link_info *info,
++				struct elf_link_hash_entry *h);
++
++static asection *
++create_dynamic_section(bfd *dynobj, const char *name, flagword flags,
++		       unsigned int align_power)
++{
++  asection *sec;
++
++  sec = bfd_make_section(dynobj, name);
++  if (!sec
++      || !bfd_set_section_flags(dynobj, sec, flags)
++      || !bfd_set_section_alignment(dynobj, sec, align_power))
++    return NULL;
++
++  return sec;
++}
++
++static struct elf_link_hash_entry *
++create_dynamic_symbol(bfd *dynobj, struct bfd_link_info *info,
++		      const char *name, asection *sec,
++		      bfd_vma offset)
++{
++  struct bfd_link_hash_entry *bh = NULL;
++  struct elf_link_hash_entry *h;
++  const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
++
++  if (!(_bfd_generic_link_add_one_symbol
++	(info, dynobj, name, BSF_GLOBAL, sec, offset, NULL, FALSE,
++	 bed->collect, &bh)))
++    return NULL;
++
++  h = (struct elf_link_hash_entry *)bh;
++  h->def_regular = 1;
++  h->type = STT_OBJECT;
++  h->other = STV_HIDDEN;
++
++  return h;
++}
++
++static bfd_boolean
++avr32_elf_create_got_section (bfd *dynobj, struct bfd_link_info *info)
++{
++  struct elf_avr32_link_hash_table *htab;
++  flagword flags;
++  const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
++
++  htab = avr32_elf_hash_table(info);
++  flags = bed->dynamic_sec_flags;
++
++  if (htab->sgot)
++    return TRUE;
++
++  htab->sgot = create_dynamic_section(dynobj, ".got", flags, 2);
++  if (!htab->srelgot)
++    htab->srelgot = create_dynamic_section(dynobj, ".rela.got",
++					   flags | SEC_READONLY, 2);
++
++  if (!htab->sgot || !htab->srelgot)
++    return FALSE;
++
++  htab->root.hgot = create_dynamic_symbol(dynobj, info, "_GLOBAL_OFFSET_TABLE_",
++					  htab->sgot, 0);
++  if (!htab->root.hgot)
++    return FALSE;
++
++  /* Make room for the GOT header */
++  htab->sgot->size += bed->got_header_size;
++
++  return TRUE;
++}
++
++/* (1) Create all dynamic (i.e. linker generated) sections that we may
++   need during the link */
++
++static bfd_boolean
++avr32_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
++{
++  struct elf_avr32_link_hash_table *htab;
++  flagword flags;
++  const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
++
++  pr_debug("(1) create dynamic sections\n");
++
++  htab = avr32_elf_hash_table(info);
++  flags = bed->dynamic_sec_flags;
++
++  if (!avr32_elf_create_got_section (dynobj, info))
++    return FALSE;
++
++  if (!htab->sstub)
++    htab->sstub = create_dynamic_section(dynobj, ".stub",
++					 flags | SEC_READONLY | SEC_CODE, 2);
++
++  if (!htab->sstub)
++    return FALSE;
++
++  return TRUE;
++}
++
++/* (2) Go through all the relocs and count any potential GOT- or
++   PLT-references to each symbol */
++
++static bfd_boolean
++avr32_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
++		    const Elf_Internal_Rela *relocs)
++{
++  Elf_Internal_Shdr *symtab_hdr;
++  struct elf_avr32_link_hash_table *htab;
++  struct elf_link_hash_entry **sym_hashes;
++  const Elf_Internal_Rela *rel, *rel_end;
++  struct got_entry **local_got_ents;
++  struct got_entry *got;
++  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
++  asection *sgot;
++  bfd *dynobj;
++
++  pr_debug("(2) check relocs for %s:<%s> (size 0x%lx)\n",
++	   abfd->filename, sec->name, sec->size);
++
++  if (info->relocatable)
++    return TRUE;
++
++  dynobj = elf_hash_table(info)->dynobj;
++  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
++  sym_hashes = elf_sym_hashes(abfd);
++  htab = avr32_elf_hash_table(info);
++  local_got_ents = elf_local_got_ents(abfd);
++  sgot = htab->sgot;
++
++  rel_end = relocs + sec->reloc_count;
++  for (rel = relocs; rel < rel_end; rel++)
++    {
++      unsigned long r_symndx, r_type;
++      struct elf_avr32_link_hash_entry *h;
++
++      r_symndx = ELF32_R_SYM(rel->r_info);
++      r_type = ELF32_R_TYPE(rel->r_info);
++
++      /* Local symbols use local_got_ents, while others store the same
++	 information in the hash entry */
++      if (r_symndx < symtab_hdr->sh_info)
++	{
++	  pr_debug("  (2a) processing local symbol %lu\n", r_symndx);
++	  h = NULL;
++	}
++      else
++	{
++	  h = (struct elf_avr32_link_hash_entry *)
++	    sym_hashes[r_symndx - symtab_hdr->sh_info];
++	  while (h->root.type == bfd_link_hash_indirect
++		 || h->root.type == bfd_link_hash_warning)
++	    h = (struct elf_avr32_link_hash_entry *)h->root.root.u.i.link;
++	  pr_debug("  (2a) processing symbol %s\n", h->root.root.root.string);
++	}
++
++      /* Some relocs require special sections to be created.  */
++      switch (r_type)
++	{
++	case R_AVR32_GOT32:
++	case R_AVR32_GOT16:
++	case R_AVR32_GOT8:
++	case R_AVR32_GOT21S:
++	case R_AVR32_GOT18SW:
++	case R_AVR32_GOT16S:
++	case R_AVR32_GOT7UW:
++	case R_AVR32_LDA_GOT:
++	case R_AVR32_GOTCALL:
++	  if (rel->r_addend)
++	    {
++	      if (info->callbacks->reloc_dangerous
++		  (info, _("Non-zero addend on GOT-relative relocation"),
++		   abfd, sec, rel->r_offset) == FALSE)
++		return FALSE;
++	    }
++	  /* fall through */
++	case R_AVR32_GOTPC:
++	  if (dynobj == NULL)
++	    elf_hash_table(info)->dynobj = dynobj = abfd;
++	  if (sgot == NULL && !avr32_elf_create_got_section(dynobj, info))
++	    return FALSE;
++	  break;
++	case R_AVR32_32:
++	  /* We may need to create .rela.dyn later on.  */
++	  if (dynobj == NULL
++	      && (info->shared || h != NULL)
++	      && (sec->flags & SEC_ALLOC))
++	    elf_hash_table(info)->dynobj = dynobj = abfd;
++	  break;
++	}
++
++      if (h != NULL && r_type != R_AVR32_GOT18SW)
++	h->no_fn_stub = TRUE;
++
++      switch (r_type)
++	{
++	case R_AVR32_GOT32:
++	case R_AVR32_GOT16:
++	case R_AVR32_GOT8:
++	case R_AVR32_GOT21S:
++	case R_AVR32_GOT18SW:
++	case R_AVR32_GOT16S:
++	case R_AVR32_GOT7UW:
++	case R_AVR32_LDA_GOT:
++	case R_AVR32_GOTCALL:
++	  if (h != NULL)
++	    {
++	      got = h->root.got.glist;
++	      if (!got)
++		{
++		  got = bfd_zalloc(abfd, sizeof(struct got_entry));
++		  if (!got)
++		    return FALSE;
++		  h->root.got.glist = got;
++		}
++	    }
++	  else
++	    {
++	      if (!local_got_ents)
++		{
++		  bfd_size_type size;
++		  bfd_size_type i;
++		  struct got_entry *tmp_entry;
++
++		  size = symtab_hdr->sh_info;
++		  size *= sizeof(struct got_entry *) + sizeof(struct got_entry);
++		  local_got_ents = bfd_zalloc(abfd, size);
++		  if (!local_got_ents)
++		    return FALSE;
++
++		  elf_local_got_ents(abfd) = local_got_ents;
++
++		  tmp_entry = (struct got_entry *)(local_got_ents
++						   + symtab_hdr->sh_info);
++		  for (i = 0; i < symtab_hdr->sh_info; i++)
++		    local_got_ents[i] = &tmp_entry[i];
++		}
++
++	      got = local_got_ents[r_symndx];
++	    }
++
++	  got->refcount++;
++	  if (got->refcount > htab->nr_got_holes)
++	    htab->nr_got_holes = got->refcount;
++	  break;
++
++	case R_AVR32_32:
++	  if ((info->shared || h != NULL)
++	      && (sec->flags & SEC_ALLOC))
++	    {
++	      if (htab->srelgot == NULL)
++		{
++		  htab->srelgot = create_dynamic_section(dynobj, ".rela.got",
++							 bed->dynamic_sec_flags
++							 | SEC_READONLY, 2);
++		  if (htab->srelgot == NULL)
++		    return FALSE;
++		}
++
++	      if (sec->flags & SEC_READONLY
++		  && !h->readonly_reloc_sec)
++		{
++		  h->readonly_reloc_sec = sec;
++		  h->readonly_reloc_offset = rel->r_offset;
++		}
++
++	      if (h != NULL)
++		{
++		  pr_debug("Non-GOT reference to symbol %s\n",
++			   h->root.root.root.string);
++		  h->possibly_dynamic_relocs++;
++		}
++	      else
++		{
++		  pr_debug("Non-GOT reference to local symbol %lu\n",
++			   r_symndx);
++		  htab->local_dynamic_relocs++;
++		}
++	    }
++
++	  break;
++
++	  /* TODO: GNU_VTINHERIT and GNU_VTENTRY */
++	}
++    }
++
++  return TRUE;
++}
++
++/* (3) Adjust a symbol defined by a dynamic object and referenced by a
++   regular object.  The current definition is in some section of the
++   dynamic object, but we're not including those sections.  We have to
++   change the definition to something the rest of the link can
++   understand.  */
++
++static bfd_boolean
++avr32_elf_adjust_dynamic_symbol(struct bfd_link_info *info,
++				struct elf_link_hash_entry *h)
++{
++  struct elf_avr32_link_hash_table *htab;
++  struct elf_avr32_link_hash_entry *havr;
++  bfd *dynobj;
++
++  pr_debug("(3) adjust dynamic symbol %s\n", h->root.root.string);
++
++  htab = avr32_elf_hash_table(info);
++  havr = (struct elf_avr32_link_hash_entry *)h;
++  dynobj = elf_hash_table(info)->dynobj;
++
++  /* Make sure we know what is going on here.  */
++  BFD_ASSERT (dynobj != NULL
++	      && (h->u.weakdef != NULL
++		  || (h->def_dynamic
++		      && h->ref_regular
++		      && !h->def_regular)));
++
++  /* We don't want dynamic relocations in read-only sections. */
++  if (havr->readonly_reloc_sec)
++    {
++      if (info->callbacks->reloc_dangerous
++	  (info, _("dynamic relocation in read-only section"),
++	   havr->readonly_reloc_sec->owner, havr->readonly_reloc_sec,
++	   havr->readonly_reloc_offset) == FALSE)
++	return FALSE;
++    }
++
++  /* If this is a function, create a stub if possible and set the
++     symbol to the stub location.  */
++  if (0 && !havr->no_fn_stub)
++    {
++      if (!h->def_regular)
++	{
++	  asection *s = htab->sstub;
++
++	  BFD_ASSERT(s != NULL);
++
++	  h->root.u.def.section = s;
++	  h->root.u.def.value = s->size;
++	  h->plt.offset = s->size;
++	  s->size += AVR32_FUNCTION_STUB_SIZE;
++
++	  return TRUE;
++	}
++    }
++  else if (h->type == STT_FUNC)
++    {
++      /* This will set the entry for this symbol in the GOT to 0, and
++	 the dynamic linker will take care of this. */
++      h->root.u.def.value = 0;
++      return TRUE;
++    }
++
++  /* If this is a weak symbol, and there is a real definition, the
++     processor independent code will have arranged for us to see the
++     real definition first, and we can just use the same value.  */
++  if (h->u.weakdef != NULL)
++    {
++      BFD_ASSERT(h->u.weakdef->root.type == bfd_link_hash_defined
++		 || h->u.weakdef->root.type == bfd_link_hash_defweak);
++      h->root.u.def.section = h->u.weakdef->root.u.def.section;
++      h->root.u.def.value = h->u.weakdef->root.u.def.value;
++      return TRUE;
++    }
++
++  /* This is a reference to a symbol defined by a dynamic object which
++     is not a function.  */
++
++  return TRUE;
++}
++
++
++/* Garbage-collection of unused sections */
++
++static asection *
++avr32_elf_gc_mark_hook(asection *sec,
++		       struct bfd_link_info *info ATTRIBUTE_UNUSED,
++		       Elf_Internal_Rela *rel,
++		       struct elf_link_hash_entry *h,
++		       Elf_Internal_Sym *sym)
++{
++  if (h)
++    {
++      switch (ELF32_R_TYPE(rel->r_info))
++	{
++	  /* TODO: VTINHERIT/VTENTRY */
++	default:
++	  switch (h->root.type)
++	    {
++	    case bfd_link_hash_defined:
++	    case bfd_link_hash_defweak:
++	      return h->root.u.def.section;
++
++	    case bfd_link_hash_common:
++	      return h->root.u.c.p->section;
++
++	    default:
++	      break;
++	    }
++	}
++    }
++  else
++    return bfd_section_from_elf_index(sec->owner, sym->st_shndx);
++
++  return NULL;
++}
++
++/* Update the GOT entry reference counts for the section being removed. */
++static bfd_boolean
++avr32_elf_gc_sweep_hook(bfd *abfd,
++			struct bfd_link_info *info ATTRIBUTE_UNUSED,
++			asection *sec,
++			const Elf_Internal_Rela *relocs)
++{
++  Elf_Internal_Shdr *symtab_hdr;
++  struct elf_avr32_link_hash_entry **sym_hashes;
++  struct got_entry **local_got_ents;
++  const Elf_Internal_Rela *rel, *relend;
++
++  if (!(sec->flags & SEC_ALLOC))
++    return TRUE;
++
++  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
++  sym_hashes = (struct elf_avr32_link_hash_entry **)elf_sym_hashes(abfd);
++  local_got_ents = elf_local_got_ents(abfd);
++
++  relend = relocs + sec->reloc_count;
++  for (rel = relocs; rel < relend; rel++)
++    {
++      unsigned long r_symndx;
++      unsigned int r_type;
++      struct elf_avr32_link_hash_entry *h = NULL;
++
++      r_symndx = ELF32_R_SYM(rel->r_info);
++      if (r_symndx >= symtab_hdr->sh_info)
++	{
++	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
++	  while (h->root.root.type == bfd_link_hash_indirect
++		 || h->root.root.type == bfd_link_hash_warning)
++	    h = (struct elf_avr32_link_hash_entry *)h->root.root.u.i.link;
++	}
++
++      r_type = ELF32_R_TYPE(rel->r_info);
++
++      switch (r_type)
++	{
++	case R_AVR32_GOT32:
++	case R_AVR32_GOT16:
++	case R_AVR32_GOT8:
++	case R_AVR32_GOT21S:
++	case R_AVR32_GOT18SW:
++	case R_AVR32_GOT16S:
++	case R_AVR32_GOT7UW:
++	case R_AVR32_LDA_GOT:
++	case R_AVR32_GOTCALL:
++	  if (h)
++	    h->root.got.glist->refcount--;
++	  else
++	    local_got_ents[r_symndx]->refcount--;
++	  break;
++
++	case R_AVR32_32:
++	  if (info->shared || h)
++	    {
++	      if (h)
++		h->possibly_dynamic_relocs--;
++	      else
++		avr32_elf_hash_table(info)->local_dynamic_relocs--;
++	    }
++
++	default:
++	  break;
++	}
++    }
++
++  return TRUE;
++}
++
++/* Sizing and refcounting of dynamic sections */
++
++static void
++insert_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got);
++static void
++unref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got);
++static void
++ref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got);
++static bfd_boolean
++assign_got_offsets(struct elf_avr32_link_hash_table *htab);
++static bfd_boolean
++allocate_dynrelocs(struct elf_link_hash_entry *h, void *_info);
++static bfd_boolean
++avr32_elf_size_dynamic_sections (bfd *output_bfd,
++				 struct bfd_link_info *info);
++
++static void
++insert_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got)
++{
++  /* Any entries with got_refcount > htab->nr_got_holes end up in the
++   * last pigeonhole without any sorting. We expect the number of such
++   * entries to be small, so it is very unlikely to affect
++   * performance.  */
++  int entry = got->refcount;
++
++  if (entry > htab->nr_got_holes)
++    entry = htab->nr_got_holes;
++
++  got->pprev = &htab->got_hole[entry];
++  got->next = htab->got_hole[entry];
++
++  if (got->next)
++    got->next->pprev = &got->next;
++
++  htab->got_hole[entry] = got;
++}
++
++/* Decrement the refcount of a GOT entry and update its position in
++   the pigeonhole array.  */
++static void
++unref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got)
++{
++  BFD_ASSERT(got->refcount > 0);
++
++  if (got->next)
++    got->next->pprev = got->pprev;
++
++  *(got->pprev) = got->next;
++  got->refcount--;
++  insert_got_entry(htab, got);
++}
++
++static void
++ref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got)
++{
++  if (got->next)
++    got->next->pprev = got->pprev;
++
++  *(got->pprev) = got->next;
++  got->refcount++;
++  insert_got_entry(htab, got);
++
++  BFD_ASSERT(got->refcount > 0);
++}
++
++/* Assign offsets to all GOT entries we intend to keep.  The entries
++   that are referenced most often are placed at low offsets so that we
++   can use compact instructions as much as possible.
++
++   Returns TRUE if any offsets or the total size of the GOT changed.  */
++
++static bfd_boolean
++assign_got_offsets(struct elf_avr32_link_hash_table *htab)
++{
++  struct got_entry *got;
++  bfd_size_type got_size = 0;
++  bfd_boolean changed = FALSE;
++  bfd_signed_vma offset;
++  int i;
++
++  /* The GOT header provides the address of the DYNAMIC segment, so
++     we need that even if the GOT is otherwise empty.  */
++  if (htab->root.dynamic_sections_created)
++    got_size = AVR32_GOT_HEADER_SIZE;
++
++  for (i = htab->nr_got_holes; i > 0; i--)
++    {
++      got = htab->got_hole[i];
++      while (got)
++	{
++	  if (got->refcount > 0)
++	    {
++	      offset = got_size;
++	      if (got->offset != offset)
++		{
++		  RDBG("GOT offset changed: %ld -> %ld\n",
++		       got->offset, offset);
++		  changed = TRUE;
++		}
++	      got->offset = offset;
++	      got_size += 4;
++	    }
++	  got = got->next;
++	}
++    }
++
++  if (htab->sgot->size != got_size)
++    {
++      RDBG("GOT size changed: %lu -> %lu\n", htab->sgot->size,
++	   got_size);
++      changed = TRUE;
++    }
++  htab->sgot->size = got_size;
++
++  RDBG("assign_got_offsets: total size %lu (%s)\n",
++       got_size, changed ? "changed" : "no change");
++
++  return changed;
++}
++
++static bfd_boolean
++allocate_dynrelocs(struct elf_link_hash_entry *h, void *_info)
++{
++  struct bfd_link_info *info = _info;
++  struct elf_avr32_link_hash_table *htab;
++  struct elf_avr32_link_hash_entry *havr;
++  struct got_entry *got;
++
++  pr_debug("  (4b) allocate_dynrelocs: %s\n", h->root.root.string);
++
++  if (h->root.type == bfd_link_hash_indirect)
++    return TRUE;
++
++  if (h->root.type == bfd_link_hash_warning)
++    /* When warning symbols are created, they **replace** the "real"
++       entry in the hash table, thus we never get to see the real
++       symbol in a hash traversal.  So look at it now.  */
++    h = (struct elf_link_hash_entry *) h->root.u.i.link;
++
++  htab = avr32_elf_hash_table(info);
++  havr = (struct elf_avr32_link_hash_entry *)h;
++
++  got = h->got.glist;
++
++  /* If got is NULL, the symbol is never referenced through the GOT */
++  if (got && got->refcount > 0)
++    {
++      insert_got_entry(htab, got);
++
++      /* Shared libraries need relocs for all GOT entries unless the
++	 symbol is forced local or -Bsymbolic is used.  Others need
++	 relocs for everything that is not guaranteed to be defined in
++	 a regular object.  */
++      if ((info->shared
++	   && !info->symbolic
++	   && h->dynindx != -1)
++	  || (htab->root.dynamic_sections_created
++	      && h->def_dynamic
++	      && !h->def_regular))
++	htab->srelgot->size += sizeof(Elf32_External_Rela);
++    }
++
++  if (havr->possibly_dynamic_relocs
++      && (info->shared
++	  || (elf_hash_table(info)->dynamic_sections_created
++	      && h->def_dynamic
++	      && !h->def_regular)))
++    {
++      pr_debug("Allocating %d dynamic reloc against symbol %s...\n",
++	       havr->possibly_dynamic_relocs, h->root.root.string);
++      htab->srelgot->size += (havr->possibly_dynamic_relocs
++			      * sizeof(Elf32_External_Rela));
++    }
++
++  return TRUE;
++}
++
++/* (4) Calculate the sizes of the linker-generated sections and
++   allocate memory for them.  */
++
++static bfd_boolean
++avr32_elf_size_dynamic_sections (bfd *output_bfd,
++				 struct bfd_link_info *info)
++{
++  struct elf_avr32_link_hash_table *htab;
++  bfd *dynobj;
++  asection *s;
++  bfd *ibfd;
++  bfd_boolean relocs;
++
++  pr_debug("(4) size dynamic sections\n");
++
++  htab = avr32_elf_hash_table(info);
++  dynobj = htab->root.dynobj;
++  BFD_ASSERT(dynobj != NULL);
++
++  if (htab->root.dynamic_sections_created)
++    {
++      /* Initialize the contents of the .interp section to the name of
++	 the dynamic loader */
++      if (info->executable)
++	{
++	  s = bfd_get_section_by_name(dynobj, ".interp");
++	  BFD_ASSERT(s != NULL);
++	  s->size = sizeof(ELF_DYNAMIC_INTERPRETER);
++	  s->contents = (unsigned char *)ELF_DYNAMIC_INTERPRETER;
++	}
++    }
++
++  if (htab->nr_got_holes > 0)
++    {
++      /* Allocate holes for the pigeonhole sort algorithm */
++      pr_debug("Highest GOT refcount: %d\n", htab->nr_got_holes);
++
++      /* Limit the memory usage by clipping the number of pigeonholes
++       * at a predefined maximum. All entries with a higher refcount
++       * will end up in the last pigeonhole.  */
++    if (htab->nr_got_holes >= MAX_NR_GOT_HOLES)
++    {
++        htab->nr_got_holes = MAX_NR_GOT_HOLES - 1;
++
++        pr_debug("Limiting maximum number of GOT pigeonholes to %u\n",
++                    htab->nr_got_holes);
++    }
++      htab->got_hole = bfd_zalloc(output_bfd,
++				  sizeof(struct got_entry *)
++				  * (htab->nr_got_holes + 1));
++      if (!htab->got_hole)
++	return FALSE;
++
++      /* Set up .got offsets for local syms.  */
++      for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
++	{
++	  struct got_entry **local_got;
++	  struct got_entry **end_local_got;
++	  Elf_Internal_Shdr *symtab_hdr;
++	  bfd_size_type locsymcount;
++
++	  pr_debug("  (4a) processing file %s...\n", ibfd->filename);
++
++	  BFD_ASSERT(bfd_get_flavour(ibfd) == bfd_target_elf_flavour);
++
++	  local_got = elf_local_got_ents(ibfd);
++	  if (!local_got)
++	    continue;
++
++	  symtab_hdr = &elf_tdata(ibfd)->symtab_hdr;
++	  locsymcount = symtab_hdr->sh_info;
++	  end_local_got = local_got + locsymcount;
++
++	  for (; local_got < end_local_got; ++local_got)
++	    insert_got_entry(htab, *local_got);
++	}
++    }
++
++  /* Allocate global sym .got entries and space for global sym
++     dynamic relocs */
++  elf_link_hash_traverse(&htab->root, allocate_dynrelocs, info);
++
++  /* Now that we have sorted the GOT entries, we are ready to
++     assign offsets and determine the initial size of the GOT. */
++  if (htab->sgot)
++    assign_got_offsets(htab);
++
++  /* Allocate space for local sym dynamic relocs */
++  BFD_ASSERT(htab->local_dynamic_relocs == 0 || info->shared);
++  if (htab->local_dynamic_relocs)
++    htab->srelgot->size += (htab->local_dynamic_relocs
++			    * sizeof(Elf32_External_Rela));
++
++  /* We now have determined the sizes of the various dynamic
++     sections. Allocate memory for them. */
++  relocs = FALSE;
++  for (s = dynobj->sections; s; s = s->next)
++    {
++      if ((s->flags & SEC_LINKER_CREATED) == 0)
++	continue;
++
++      if (s == htab->sgot
++	  || s == htab->sstub)
++	{
++	  /* Strip this section if we don't need it */
++	}
++      else if (strncmp (bfd_get_section_name(dynobj, s), ".rela", 5) == 0)
++	{
++	  if (s->size != 0)
++	    relocs = TRUE;
++
++	  s->reloc_count = 0;
++	}
++      else
++	{
++	  /* It's not one of our sections */
++	  continue;
++	}
++
++      if (s->size == 0)
++	{
++	  /* Strip unneeded sections */
++	  pr_debug("Stripping section %s from output...\n", s->name);
++	  /* deleted function in 2.17
++      _bfd_strip_section_from_output(info, s);
++      */
++	  continue;
++	}
++
++      s->contents = bfd_zalloc(dynobj, s->size);
++      if (s->contents == NULL)
++	return FALSE;
++    }
++
++  if (htab->root.dynamic_sections_created)
++    {
++      /* Add some entries to the .dynamic section.  We fill in the
++	 values later, in sh_elf_finish_dynamic_sections, but we
++	 must add the entries now so that we get the correct size for
++	 the .dynamic section.  The DT_DEBUG entry is filled in by the
++	 dynamic linker and used by the debugger.  */
++#define add_dynamic_entry(TAG, VAL) _bfd_elf_add_dynamic_entry(info, TAG, VAL)
++
++      if (!add_dynamic_entry(DT_PLTGOT, 0))
++	return FALSE;
++      if (!add_dynamic_entry(DT_AVR32_GOTSZ, 0))
++	return FALSE;
++
++      if (info->executable)
++	{
++	  if (!add_dynamic_entry(DT_DEBUG, 0))
++	    return FALSE;
++	}
++      if (relocs)
++	{
++	  if (!add_dynamic_entry(DT_RELA, 0)
++	      || !add_dynamic_entry(DT_RELASZ, 0)
++	      || !add_dynamic_entry(DT_RELAENT,
++				    sizeof(Elf32_External_Rela)))
++	    return FALSE;
++	}
++    }
++#undef add_dynamic_entry
++
++  return TRUE;
++}
++
++
++/* Access to internal relocations, section contents and symbols.
++   (stolen from the xtensa port)  */
++
++static Elf_Internal_Rela *
++retrieve_internal_relocs (bfd *abfd, asection *sec, bfd_boolean keep_memory);
++static void
++pin_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs);
++static void
++release_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs);
++static bfd_byte *
++retrieve_contents (bfd *abfd, asection *sec, bfd_boolean keep_memory);
++/*
++static void
++pin_contents (asection *sec, bfd_byte *contents);
++*/
++static void
++release_contents (asection *sec, bfd_byte *contents);
++static Elf_Internal_Sym *
++retrieve_local_syms (bfd *input_bfd, bfd_boolean keep_memory);
++/*
++static void
++pin_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf);
++*/
++static void
++release_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf);
++
++/* During relaxation, we need to modify relocations, section contents,
++   and symbol definitions, and we need to keep the original values from
++   being reloaded from the input files, i.e., we need to "pin" the
++   modified values in memory.  We also want to continue to observe the
++   setting of the "keep-memory" flag.  The following functions wrap the
++   standard BFD functions to take care of this for us.  */
++
++static Elf_Internal_Rela *
++retrieve_internal_relocs (bfd *abfd, asection *sec, bfd_boolean keep_memory)
++{
++  /* _bfd_elf_link_read_relocs knows about caching, so no need for us
++     to be clever here.  */
++  return _bfd_elf_link_read_relocs(abfd, sec, NULL, NULL, keep_memory);
++}
++
++static void
++pin_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs)
++{
++  elf_section_data (sec)->relocs = internal_relocs;
++}
++
++static void
++release_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs)
++{
++  if (internal_relocs
++      && elf_section_data (sec)->relocs != internal_relocs)
++    free (internal_relocs);
++}
++
++static bfd_byte *
++retrieve_contents (bfd *abfd, asection *sec, bfd_boolean keep_memory)
++{
++  bfd_byte *contents;
++  bfd_size_type sec_size;
++
++  sec_size = bfd_get_section_limit (abfd, sec);
++  contents = elf_section_data (sec)->this_hdr.contents;
++
++  if (contents == NULL && sec_size != 0)
++    {
++      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
++	{
++	  if (contents)
++	    free (contents);
++	  return NULL;
++	}
++      if (keep_memory)
++	elf_section_data (sec)->this_hdr.contents = contents;
++    }
++  return contents;
++}
++
++/*
++static void
++pin_contents (asection *sec, bfd_byte *contents)
++{
++  elf_section_data (sec)->this_hdr.contents = contents;
++}
++*/
++static void
++release_contents (asection *sec, bfd_byte *contents)
++{
++  if (contents && elf_section_data (sec)->this_hdr.contents != contents)
++    free (contents);
++}
++
++static Elf_Internal_Sym *
++retrieve_local_syms (bfd *input_bfd, bfd_boolean keep_memory)
++{
++  Elf_Internal_Shdr *symtab_hdr;
++  Elf_Internal_Sym *isymbuf;
++  size_t locsymcount;
++
++  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
++  locsymcount = symtab_hdr->sh_info;
++
++  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
++  if (isymbuf == NULL && locsymcount != 0)
++    {
++      isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr, locsymcount, 0,
++				      NULL, NULL, NULL);
++      if (isymbuf && keep_memory)
++	symtab_hdr->contents = (unsigned char *) isymbuf;
++    }
++
++  return isymbuf;
++}
++
++/*
++static void
++pin_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf)
++{
++  elf_tdata (input_bfd)->symtab_hdr.contents = (unsigned char *)isymbuf;
++}
++
++*/
++static void
++release_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf)
++{
++  if (isymbuf && (elf_tdata (input_bfd)->symtab_hdr.contents
++		  != (unsigned char *)isymbuf))
++    free (isymbuf);
++}
++
++/* Data structures used during relaxation. */
++
++enum relax_state_id {
++  RS_ERROR = -1,
++  RS_NONE = 0,
++  RS_ALIGN,
++  RS_CPENT,
++  RS_PIC_CALL,
++  RS_PIC_MCALL,
++  RS_PIC_RCALL2,
++  RS_PIC_RCALL1,
++  RS_PIC_LDA,
++  RS_PIC_LDW4,
++  RS_PIC_LDW3,
++  RS_PIC_SUB5,
++  RS_NOPIC_MCALL,
++  RS_NOPIC_RCALL2,
++  RS_NOPIC_RCALL1,
++  RS_NOPIC_LDW4,
++  RS_NOPIC_LDDPC,
++  RS_NOPIC_SUB5,
++  RS_NOPIC_MOV2,
++  RS_NOPIC_MOV1,
++  RS_RCALL2,
++  RS_RCALL1,
++  RS_BRC2,
++  RS_BRC1,
++  RS_BRAL,
++  RS_RJMP,
++  RS_MAX,
++};
++
++enum reference_type {
++  REF_ABSOLUTE,
++  REF_PCREL,
++  REF_CPOOL,
++  REF_GOT,
++};
++
++struct relax_state
++{
++  const char *name;
++  enum relax_state_id id;
++  enum relax_state_id direct;
++  enum relax_state_id next;
++  enum relax_state_id prev;
++
++  enum reference_type reftype;
++
++  unsigned int r_type;
++
++  bfd_vma opcode;
++  bfd_vma opcode_mask;
++
++  bfd_signed_vma range_min;
++  bfd_signed_vma range_max;
++
++  bfd_size_type size;
++};
++
++/*
++ * This is for relocs that
++ *   a) has an addend or is of type R_AVR32_DIFF32, and
++ *   b) references a different section than it's in, and
++ *   c) references a section that is relaxable
++ *
++ * as well as relocs that references the constant pool, in which case
++ * the add_frag member points to the frag containing the constant pool
++ * entry.
++ *
++ * Such relocs must be fixed up whenever we delete any code. Sections
++ * that don't have any relocs with all of the above properties don't
++ * have any additional reloc data, but sections that do will have
++ * additional data for all its relocs.
++ */
++struct avr32_reloc_data
++{
++  struct fragment *add_frag;
++  struct fragment *sub_frag;
++};
++
++/*
++ * A 'fragment' is a relaxable entity, that is, code may be added or
++ * deleted at the end of a fragment. When this happens, all subsequent
++ * fragments in the list will have their offsets updated.
++ */
++struct fragment
++{
++  enum relax_state_id state;
++  enum relax_state_id initial_state;
++
++  Elf_Internal_Rela *rela;
++  bfd_size_type size;
++  bfd_vma offset;
++  int size_adjust;
++  int offset_adjust;
++  bfd_boolean has_grown;
++
++  /* Only used by constant pool entries.  When this drops to zero, the
++     frag is discarded (i.e. size_adjust is set to -4.)  */
++  int refcount;
++};
++
++struct avr32_relax_data
++{
++  unsigned int frag_count;
++  struct fragment *frag;
++  struct avr32_reloc_data *reloc_data;
++
++  /* TRUE if this section has one or more relaxable relocations */
++  bfd_boolean is_relaxable;
++  unsigned int iteration;
++};
++
++struct avr32_section_data
++{
++  struct bfd_elf_section_data elf;
++  struct avr32_relax_data relax_data;
++};
++
++/* Relax state definitions */
++
++#define PIC_MOV2_OPCODE		0xe0600000
++#define PIC_MOV2_MASK		0xe1e00000
++#define PIC_MOV2_RANGE_MIN	(-1048576 * 4)
++#define PIC_MOV2_RANGE_MAX	(1048575 * 4)
++#define PIC_MCALL_OPCODE	0xf0160000
++#define PIC_MCALL_MASK		0xffff0000
++#define PIC_MCALL_RANGE_MIN	(-131072)
++#define PIC_MCALL_RANGE_MAX	(131068)
++#define RCALL2_OPCODE		0xe0a00000
++#define RCALL2_MASK		0xe1ef0000
++#define RCALL2_RANGE_MIN	(-2097152)
++#define RCALL2_RANGE_MAX	(2097150)
++#define RCALL1_OPCODE		0xc00c0000
++#define RCALL1_MASK		0xf00c0000
++#define RCALL1_RANGE_MIN	(-1024)
++#define RCALL1_RANGE_MAX	(1022)
++#define PIC_LDW4_OPCODE		0xecf00000
++#define PIC_LDW4_MASK		0xfff00000
++#define PIC_LDW4_RANGE_MIN	(-32768)
++#define PIC_LDW4_RANGE_MAX	(32767)
++#define PIC_LDW3_OPCODE		0x6c000000
++#define PIC_LDW3_MASK		0xfe000000
++#define PIC_LDW3_RANGE_MIN	(0)
++#define PIC_LDW3_RANGE_MAX	(124)
++#define SUB5_PC_OPCODE		0xfec00000
++#define SUB5_PC_MASK		0xfff00000
++#define SUB5_PC_RANGE_MIN	(-32768)
++#define SUB5_PC_RANGE_MAX	(32767)
++#define NOPIC_MCALL_OPCODE	0xf01f0000
++#define NOPIC_MCALL_MASK	0xffff0000
++#define NOPIC_MCALL_RANGE_MIN	PIC_MCALL_RANGE_MIN
++#define NOPIC_MCALL_RANGE_MAX	PIC_MCALL_RANGE_MAX
++#define NOPIC_LDW4_OPCODE	0xfef00000
++#define NOPIC_LDW4_MASK		0xfff00000
++#define NOPIC_LDW4_RANGE_MIN	PIC_LDW4_RANGE_MIN
++#define NOPIC_LDW4_RANGE_MAX	PIC_LDW4_RANGE_MAX
++#define LDDPC_OPCODE		0x48000000
++#define LDDPC_MASK		0xf8000000
++#define LDDPC_RANGE_MIN		0
++#define LDDPC_RANGE_MAX		508
++
++#define NOPIC_MOV2_OPCODE  0xe0600000
++#define NOPIC_MOV2_MASK        0xe1e00000
++#define NOPIC_MOV2_RANGE_MIN   (-1048576)
++#define NOPIC_MOV2_RANGE_MAX   (1048575)
++#define NOPIC_MOV1_OPCODE  0x30000000
++#define NOPIC_MOV1_MASK        0xf0000000
++#define NOPIC_MOV1_RANGE_MIN   (-128)
++#define NOPIC_MOV1_RANGE_MAX   (127)
++
++/* Only brc2 variants with cond[3] == 0 is considered, since the
++   others are not relaxable.  bral is a special case and is handled
++   separately.  */
++#define BRC2_OPCODE		0xe0800000
++#define BRC2_MASK		0xe1e80000
++#define BRC2_RANGE_MIN		(-2097152)
++#define BRC2_RANGE_MAX		(2097150)
++#define BRC1_OPCODE		0xc0000000
++#define BRC1_MASK		0xf0080000
++#define BRC1_RANGE_MIN		(-256)
++#define BRC1_RANGE_MAX		(254)
++#define BRAL_OPCODE		0xe08f0000
++#define BRAL_MASK		0xe1ef0000
++#define BRAL_RANGE_MIN		BRC2_RANGE_MIN
++#define BRAL_RANGE_MAX		BRC2_RANGE_MAX
++#define RJMP_OPCODE		0xc0080000
++#define RJMP_MASK		0xf00c0000
++#define RJMP_RANGE_MIN		(-1024)
++#define RJMP_RANGE_MAX		(1022)
++
++/* Define a relax state using the GOT  */
++#define RG(id, dir, next, prev, r_type, opc, size)			\
++  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_GOT,		\
++      R_AVR32_##r_type,	opc##_OPCODE, opc##_MASK,			\
++      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
++/* Define a relax state using the Constant Pool  */
++#define RC(id, dir, next, prev, r_type, opc, size)			\
++  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_CPOOL,	\
++      R_AVR32_##r_type,	opc##_OPCODE, opc##_MASK,			\
++      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
++
++/* Define a relax state using pc-relative direct reference  */
++#define RP(id, dir, next, prev, r_type, opc, size)			\
++  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_PCREL,	\
++      R_AVR32_##r_type,	opc##_OPCODE, opc##_MASK,			\
++      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
++
++/* Define a relax state using non-pc-relative direct reference */
++#define RD(id, dir, next, prev, r_type, opc, size)         \
++  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_ABSOLUTE,   \
++      R_AVR32_##r_type,    opc##_OPCODE, opc##_MASK,           \
++      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
++
++/* Define a relax state that will be handled specially  */
++#define RS(id, r_type, size)						\
++  { "RS_"#id, RS_##id, RS_NONE, RS_NONE, RS_NONE, REF_ABSOLUTE,		\
++      R_AVR32_##r_type, 0, 0, 0, 0, size }
++
++const struct relax_state relax_state[RS_MAX] = {
++  RS(NONE, NONE, 0),
++  RS(ALIGN, ALIGN, 0),
++  RS(CPENT, 32_CPENT, 4),
++
++  RG(PIC_CALL, PIC_RCALL1, PIC_MCALL, NONE, GOTCALL, PIC_MOV2, 10),
++  RG(PIC_MCALL, PIC_RCALL1, NONE, PIC_CALL, GOT18SW, PIC_MCALL, 4),
++  RP(PIC_RCALL2, NONE, PIC_RCALL1, PIC_MCALL, 22H_PCREL, RCALL2, 4),
++  RP(PIC_RCALL1, NONE, NONE, PIC_RCALL2, 11H_PCREL, RCALL1, 2),
++
++  RG(PIC_LDA, PIC_SUB5, PIC_LDW4, NONE, LDA_GOT, PIC_MOV2, 8),
++  RG(PIC_LDW4, PIC_SUB5, PIC_LDW3, PIC_LDA, GOT16S, PIC_LDW4, 4),
++  RG(PIC_LDW3, PIC_SUB5, NONE, PIC_LDW4, GOT7UW, PIC_LDW3, 2),
++  RP(PIC_SUB5, NONE, NONE, PIC_LDW3, 16N_PCREL, SUB5_PC, 4),
++
++  RC(NOPIC_MCALL, NOPIC_RCALL1, NONE, NONE, CPCALL, NOPIC_MCALL, 4),
++  RP(NOPIC_RCALL2, NONE, NOPIC_RCALL1, NOPIC_MCALL, 22H_PCREL, RCALL2, 4),
++  RP(NOPIC_RCALL1, NONE, NONE, NOPIC_RCALL2, 11H_PCREL, RCALL1, 2),
++
++  RC(NOPIC_LDW4, NOPIC_MOV1, NOPIC_LDDPC, NONE, 16_CP, NOPIC_LDW4, 4),
++  RC(NOPIC_LDDPC, NOPIC_MOV1, NONE, NOPIC_LDW4, 9W_CP, LDDPC, 2),
++  RP(NOPIC_SUB5, NOPIC_MOV1, NONE, NOPIC_LDDPC, 16N_PCREL, SUB5_PC, 4),
++  RD(NOPIC_MOV2, NONE, NOPIC_MOV1, NOPIC_SUB5, 21S, NOPIC_MOV2, 4),
++  RD(NOPIC_MOV1, NONE, NONE, NOPIC_MOV2, 8S, NOPIC_MOV1, 2),
++
++  RP(RCALL2, NONE, RCALL1, NONE, 22H_PCREL, RCALL2, 4),
++  RP(RCALL1, NONE, NONE, RCALL2, 11H_PCREL, RCALL1, 2),
++  RP(BRC2, NONE, BRC1, NONE, 22H_PCREL, BRC2, 4),
++  RP(BRC1, NONE, NONE, BRC2, 9H_PCREL, BRC1, 2),
++  RP(BRAL, NONE, RJMP, NONE, 22H_PCREL, BRAL, 4),
++  RP(RJMP, NONE, NONE, BRAL, 11H_PCREL, RJMP, 2),
++};
++
++static bfd_boolean
++avr32_elf_new_section_hook(bfd *abfd, asection *sec)
++{
++  struct avr32_section_data *sdata;
++
++  sdata = bfd_zalloc(abfd, sizeof(struct avr32_section_data));
++  if (!sdata)
++    return FALSE;
++
++  sec->used_by_bfd = sdata;
++  return _bfd_elf_new_section_hook(abfd, sec);
++}
++
++static struct avr32_relax_data *
++avr32_relax_data(asection *sec)
++{
++  struct avr32_section_data *sdata;
++
++  BFD_ASSERT(sec->used_by_bfd);
++
++  sdata = (struct avr32_section_data *)elf_section_data(sec);
++  return &sdata->relax_data;
++}
++
++/* Link-time relaxation */
++
++static bfd_boolean
++avr32_elf_relax_section(bfd *abfd, asection *sec,
++			struct bfd_link_info *info, bfd_boolean *again);
++
++enum relax_pass_id {
++  RELAX_PASS_SIZE_FRAGS,
++  RELAX_PASS_MOVE_DATA,
++};
++
++/* Stolen from the xtensa port */
++static int
++internal_reloc_compare (const void *ap, const void *bp)
++{
++  const Elf_Internal_Rela *a = (const Elf_Internal_Rela *) ap;
++  const Elf_Internal_Rela *b = (const Elf_Internal_Rela *) bp;
++
++  if (a->r_offset != b->r_offset)
++    return (a->r_offset - b->r_offset);
++
++  /* We don't need to sort on these criteria for correctness,
++     but enforcing a more strict ordering prevents unstable qsort
++     from behaving differently with different implementations.
++     Without the code below we get correct but different results
++     on Solaris 2.7 and 2.8.  We would like to always produce the
++     same results no matter the host.  */
++
++  if (a->r_info != b->r_info)
++    return (a->r_info - b->r_info);
++
++  return (a->r_addend - b->r_addend);
++}
++
++static enum relax_state_id
++get_pcrel22_relax_state(bfd *abfd, asection *sec, struct bfd_link_info *info,
++			const Elf_Internal_Rela *rela)
++{
++  bfd_byte *contents;
++  bfd_vma insn;
++  enum relax_state_id rs = RS_NONE;
++
++  contents = retrieve_contents(abfd, sec, info->keep_memory);
++  if (!contents)
++    return RS_ERROR;
++
++  insn = bfd_get_32(abfd, contents + rela->r_offset);
++  if ((insn & RCALL2_MASK) == RCALL2_OPCODE)
++    rs = RS_RCALL2;
++  else if ((insn & BRAL_MASK) == BRAL_OPCODE)
++    /* Optimizing bral -> rjmp gets us into all kinds of
++       trouble with jump tables. Better not do it.  */
++    rs = RS_NONE;
++  else if ((insn & BRC2_MASK) == BRC2_OPCODE)
++    rs = RS_BRC2;
++
++  release_contents(sec, contents);
++
++  return rs;
++}
++
++static enum relax_state_id
++get_initial_relax_state(bfd *abfd, asection *sec, struct bfd_link_info *info,
++			const Elf_Internal_Rela *rela)
++{
++  switch (ELF_R_TYPE(rela->r_info))
++    {
++    case R_AVR32_GOTCALL:
++      return RS_PIC_CALL;
++    case R_AVR32_GOT18SW:
++      return RS_PIC_MCALL;
++    case R_AVR32_LDA_GOT:
++      return RS_PIC_LDA;
++    case R_AVR32_GOT16S:
++      return RS_PIC_LDW4;
++    case R_AVR32_CPCALL:
++      return RS_NOPIC_MCALL;
++    case R_AVR32_16_CP:
++      return RS_NOPIC_LDW4;
++    case R_AVR32_9W_CP:
++      return RS_NOPIC_LDDPC;
++    case R_AVR32_ALIGN:
++      return RS_ALIGN;
++    case R_AVR32_32_CPENT:
++      return RS_CPENT;
++    case R_AVR32_22H_PCREL:
++      return get_pcrel22_relax_state(abfd, sec, info, rela);
++    case R_AVR32_9H_PCREL:
++      return RS_BRC1;
++    default:
++      return RS_NONE;
++    }
++}
++
++static bfd_boolean
++reloc_is_cpool_ref(const Elf_Internal_Rela *rela)
++{
++  switch (ELF_R_TYPE(rela->r_info))
++    {
++    case R_AVR32_CPCALL:
++    case R_AVR32_16_CP:
++    case R_AVR32_9W_CP:
++      return TRUE;
++    default:
++      return FALSE;
++    }
++}
++
++static struct fragment *
++new_frag(bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
++	 struct avr32_relax_data *rd, enum relax_state_id state,
++	 Elf_Internal_Rela *rela)
++{
++  struct fragment *frag;
++  bfd_size_type r_size;
++  bfd_vma r_offset;
++  unsigned int i = rd->frag_count;
++
++  BFD_ASSERT(state >= RS_NONE && state < RS_MAX);
++
++  rd->frag_count++;
++  frag = bfd_realloc(rd->frag, sizeof(struct fragment) * rd->frag_count);
++  if (!frag)
++    return NULL;
++  rd->frag = frag;
++
++  frag += i;
++  memset(frag, 0, sizeof(struct fragment));
++
++  if (state == RS_ALIGN)
++    r_size = (((rela->r_offset + (1 << rela->r_addend) - 1)
++	       & ~((1 << rela->r_addend) - 1)) - rela->r_offset);
++  else
++    r_size = relax_state[state].size;
++
++  if (rela)
++    r_offset = rela->r_offset;
++  else
++    r_offset = sec->size;
++
++  if (i == 0)
++    {
++      frag->offset = 0;
++      frag->size = r_offset + r_size;
++    }
++  else
++    {
++      frag->offset = rd->frag[i - 1].offset + rd->frag[i - 1].size;
++      frag->size = r_offset + r_size - frag->offset;
++    }
++
++  if (state != RS_CPENT)
++    /* Make sure we don't discard this frag */
++    frag->refcount = 1;
++
++  frag->initial_state = frag->state = state;
++  frag->rela = rela;
++
++  return frag;
++}
++
++static struct fragment *
++find_frag(asection *sec, bfd_vma offset)
++{
++  struct fragment *first, *last;
++  struct avr32_relax_data *rd = avr32_relax_data(sec);
++
++  if (rd->frag_count == 0)
++    return NULL;
++
++  first = &rd->frag[0];
++  last = &rd->frag[rd->frag_count - 1];
++
++  /* This may be a reloc referencing the end of a section.  The last
++     frag will never have a reloc associated with it, so its size will
++     never change, thus the offset adjustment of the last frag will
++     always be the same as the offset adjustment of the end of the
++     section.  */
++  if (offset == sec->size)
++    {
++      BFD_ASSERT(last->offset + last->size == sec->size);
++      BFD_ASSERT(!last->rela);
++      return last;
++    }
++
++  while (first <= last)
++    {
++      struct fragment *mid;
++
++      mid = (last - first) / 2 + first;
++      if ((mid->offset + mid->size) <= offset)
++	first = mid + 1;
++      else if (mid->offset > offset)
++	last = mid - 1;
++      else
++	return mid;
++    }
++
++  return NULL;
++}
++
++/* Look through all relocs in a section and determine if any relocs
++   may be affected by relaxation in other sections.  If so, allocate
++   an array of additional relocation data which links the affected
++   relocations to the frag(s) where the relaxation may occur.
++
++   This function also links cpool references to cpool entries and
++   increments the refcount of the latter when this happens.  */
++
++static bfd_boolean
++allocate_reloc_data(bfd *abfd, asection *sec, Elf_Internal_Rela *relocs,
++		    struct bfd_link_info *info)
++{
++  Elf_Internal_Shdr *symtab_hdr;
++  Elf_Internal_Sym *isymbuf = NULL;
++  struct avr32_relax_data *rd;
++  unsigned int i;
++  bfd_boolean ret = FALSE;
++
++  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
++  rd = avr32_relax_data(sec);
++
++  RDBG("%s<%s>: allocate_reloc_data\n", abfd->filename, sec->name);
++
++  for (i = 0; i < sec->reloc_count; i++)
++    {
++      Elf_Internal_Rela *rel = &relocs[i];
++      asection *sym_sec;
++      unsigned long r_symndx;
++      bfd_vma sym_value;
++
++      if (!rel->r_addend && ELF_R_TYPE(rel->r_info) != R_AVR32_DIFF32
++	  && !reloc_is_cpool_ref(rel))
++	continue;
++
++      r_symndx = ELF_R_SYM(rel->r_info);
++
++      if (r_symndx < symtab_hdr->sh_info)
++	{
++	  Elf_Internal_Sym *isym;
++
++	  if (!isymbuf)
++	    isymbuf = retrieve_local_syms(abfd, info->keep_memory);
++	  if (!isymbuf)
++	    return FALSE;
++
++	  isym = &isymbuf[r_symndx];
++	  sym_sec = bfd_section_from_elf_index(abfd, isym->st_shndx);
++	  sym_value = isym->st_value;
++	}
++      else
++	{
++	  struct elf_link_hash_entry *h;
++
++	  h = elf_sym_hashes(abfd)[r_symndx - symtab_hdr->sh_info];
++
++	  while (h->root.type == bfd_link_hash_indirect
++		 || h->root.type == bfd_link_hash_warning)
++	    h = (struct elf_link_hash_entry *)h->root.u.i.link;
++
++	  if (h->root.type != bfd_link_hash_defined
++	      && h->root.type != bfd_link_hash_defweak)
++	    continue;
++
++	  sym_sec = h->root.u.def.section;
++	  sym_value = h->root.u.def.value;
++	}
++
++      if (sym_sec && avr32_relax_data(sym_sec)->is_relaxable)
++	{
++	  bfd_size_type size;
++	  struct fragment *frag;
++
++	  if (!rd->reloc_data)
++	    {
++	      size = sizeof(struct avr32_reloc_data) * sec->reloc_count;
++	      rd->reloc_data = bfd_zalloc(abfd, size);
++	      if (!rd->reloc_data)
++		goto out;
++	    }
++
++	  RDBG("[%3d] 0x%04lx: target: 0x%lx + 0x%lx",
++	       i, rel->r_offset, sym_value, rel->r_addend);
++
++	  frag = find_frag(sym_sec, sym_value + rel->r_addend);
++	  BFD_ASSERT(frag);
++	  rd->reloc_data[i].add_frag = frag;
++
++	  RDBG(" -> %s<%s>:%04lx\n", sym_sec->owner->filename, sym_sec->name,
++	       frag->rela ? frag->rela->r_offset : sym_sec->size);
++
++	  if (reloc_is_cpool_ref(rel))
++	    {
++	      BFD_ASSERT(ELF_R_TYPE(frag->rela->r_info) == R_AVR32_32_CPENT);
++	      frag->refcount++;
++	    }
++
++	  if (ELF_R_TYPE(rel->r_info) == R_AVR32_DIFF32)
++	    {
++	      bfd_byte *contents;
++	      bfd_signed_vma diff;
++
++	      contents = retrieve_contents(abfd, sec, info->keep_memory);
++	      if (!contents)
++		goto out;
++
++	      diff = bfd_get_signed_32(abfd, contents + rel->r_offset);
++	      frag = find_frag(sym_sec, sym_value + rel->r_addend + diff);
++	      BFD_ASSERT(frag);
++	      rd->reloc_data[i].sub_frag = frag;
++
++	      release_contents(sec, contents);
++	    }
++	}
++    }
++
++  ret = TRUE;
++
++ out:
++  release_local_syms(abfd, isymbuf);
++  return ret;
++}
++
++static bfd_boolean
++global_sym_set_frag(struct elf_avr32_link_hash_entry *havr,
++		    struct bfd_link_info *info ATTRIBUTE_UNUSED)
++{
++  struct fragment *frag;
++  asection *sec;
++
++  if (havr->root.root.type != bfd_link_hash_defined
++      && havr->root.root.type != bfd_link_hash_defweak)
++    return TRUE;
++
++  sec = havr->root.root.u.def.section;
++  if (bfd_is_const_section(sec)
++      || !avr32_relax_data(sec)->is_relaxable)
++    return TRUE;
++
++  frag = find_frag(sec, havr->root.root.u.def.value);
++  if (!frag)
++    {
++      unsigned int i;
++      struct avr32_relax_data *rd = avr32_relax_data(sec);
++
++      RDBG("In %s: No frag for %s <%s+%lu> (limit %lu)\n",
++	   sec->owner->filename, havr->root.root.root.string,
++	   sec->name, havr->root.root.u.def.value, sec->size);
++      for (i = 0; i < rd->frag_count; i++)
++	RDBG("    %8lu - %8lu\n", rd->frag[i].offset,
++	     rd->frag[i].offset + rd->frag[i].size);
++    }
++  BFD_ASSERT(frag);
++
++  havr->sym_frag = frag;
++  return TRUE;
++}
++
++static bfd_boolean
++analyze_relocations(struct bfd_link_info *info)
++{
++  bfd *abfd;
++  asection *sec;
++
++  /* Divide all relaxable sections into fragments */
++  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
++    {
++      if (!(elf_elfheader(abfd)->e_flags & EF_AVR32_LINKRELAX))
++	{
++	  if (!(*info->callbacks->warning)
++	      (info, _("input is not relaxable"), NULL, abfd, NULL, 0))
++	    return FALSE;
++	  continue;
++	}
++
++      for (sec = abfd->sections; sec; sec = sec->next)
++	{
++	  struct avr32_relax_data *rd;
++	  struct fragment *frag;
++	  Elf_Internal_Rela *relocs;
++	  unsigned int i;
++	  bfd_boolean ret = TRUE;
++
++	  if (!(sec->flags & SEC_RELOC) || sec->reloc_count == 0)
++	    continue;
++
++	  rd = avr32_relax_data(sec);
++
++	  relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
++	  if (!relocs)
++	    return FALSE;
++
++	  qsort(relocs, sec->reloc_count, sizeof(Elf_Internal_Rela),
++		internal_reloc_compare);
++
++	  for (i = 0; i < sec->reloc_count; i++)
++	    {
++	      enum relax_state_id state;
++
++	      ret = FALSE;
++	      state = get_initial_relax_state(abfd, sec, info, &relocs[i]);
++	      if (state == RS_ERROR)
++		break;
++
++	      if (state)
++		{
++		  frag = new_frag(abfd, sec, rd, state, &relocs[i]);
++		  if (!frag)
++		    break;
++
++		  pin_internal_relocs(sec, relocs);
++		  rd->is_relaxable = TRUE;
++		}
++
++	      ret = TRUE;
++	    }
++
++	  release_internal_relocs(sec, relocs);
++	  if (!ret)
++	    return ret;
++
++	  if (rd->is_relaxable)
++	    {
++	      frag = new_frag(abfd, sec, rd, RS_NONE, NULL);
++	      if (!frag)
++		return FALSE;
++	    }
++	}
++    }
++
++  /* Link each global symbol to the fragment where it's defined.  */
++  elf_link_hash_traverse(elf_hash_table(info), global_sym_set_frag, info);
++
++  /* Do the same for local symbols. */
++  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
++    {
++      Elf_Internal_Sym *isymbuf, *isym;
++      struct fragment **local_sym_frag;
++      unsigned int i, sym_count;
++
++      sym_count = elf_tdata(abfd)->symtab_hdr.sh_info;
++      if (sym_count == 0)
++	continue;
++
++      local_sym_frag = bfd_zalloc(abfd, sym_count * sizeof(struct fragment *));
++      if (!local_sym_frag)
++	return FALSE;
++      elf_tdata(abfd)->local_sym_frag = local_sym_frag;
++
++      isymbuf = retrieve_local_syms(abfd, info->keep_memory);
++      if (!isymbuf)
++	return FALSE;
++
++      for (i = 0; i < sym_count; i++)
++	{
++	  struct avr32_relax_data *rd;
++	  struct fragment *frag;
++	  asection *sec;
++
++	  isym = &isymbuf[i];
++
++	  sec = bfd_section_from_elf_index(abfd, isym->st_shndx);
++	  if (!sec)
++	    continue;
++
++	  rd = avr32_relax_data(sec);
++	  if (!rd->is_relaxable)
++	    continue;
++
++	  frag = find_frag(sec, isym->st_value);
++	  BFD_ASSERT(frag);
++
++	  local_sym_frag[i] = frag;
++	}
++
++      release_local_syms(abfd, isymbuf);
++    }
++
++  /* And again for relocs with addends and constant pool references */
++  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
++    for (sec = abfd->sections; sec; sec = sec->next)
++      {
++	Elf_Internal_Rela *relocs;
++	bfd_boolean ret;
++
++	if (!(sec->flags & SEC_RELOC) || sec->reloc_count == 0)
++	  continue;
++
++	relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
++	if (!relocs)
++	  return FALSE;
++
++	ret = allocate_reloc_data(abfd, sec, relocs, info);
++
++	release_internal_relocs(sec, relocs);
++	if (ret == FALSE)
++	  return ret;
++      }
++
++  return TRUE;
++}
++
++static bfd_boolean
++rs_is_good_enough(const struct relax_state *rs, struct fragment *frag,
++		  bfd_vma symval, bfd_vma addr, struct got_entry *got,
++		  struct avr32_reloc_data *ind_data,
++		  bfd_signed_vma offset_adjust)
++{
++  bfd_signed_vma target = 0;
++
++  switch (rs->reftype)
++    {
++    case REF_ABSOLUTE:
++      target = symval;
++      break;
++    case REF_PCREL:
++      target = symval - addr;
++      break;
++    case REF_CPOOL:
++      /* cpool frags are always in the same section and always after
++	 all frags referring to it.  So it's always correct to add in
++	 offset_adjust here.  */
++      target = (ind_data->add_frag->offset + ind_data->add_frag->offset_adjust
++		+ offset_adjust - frag->offset - frag->offset_adjust);
++      break;
++    case REF_GOT:
++      target = got->offset;
++      break;
++    default:
++      abort();
++    }
++
++  if (target >= rs->range_min && target <= rs->range_max)
++    return TRUE;
++  else
++    return FALSE;
++}
++
++static bfd_boolean
++avr32_size_frags(bfd *abfd, asection *sec, struct bfd_link_info *info)
++{
++  struct elf_avr32_link_hash_table *htab;
++  struct avr32_relax_data *rd;
++  Elf_Internal_Shdr *symtab_hdr;
++  Elf_Internal_Rela *relocs = NULL;
++  Elf_Internal_Sym *isymbuf = NULL;
++  struct got_entry **local_got_ents;
++  struct fragment **local_sym_frag;
++  bfd_boolean ret = FALSE;
++  bfd_signed_vma delta = 0;
++  unsigned int i;
++
++  htab = avr32_elf_hash_table(info);
++  rd = avr32_relax_data(sec);
++
++  if (sec == htab->sgot)
++    {
++      RDBG("Relaxing GOT section (vma: 0x%lx)\n",
++	   sec->output_section->vma + sec->output_offset);
++      if (assign_got_offsets(htab))
++	htab->repeat_pass = TRUE;
++      return TRUE;
++    }
++
++  if (!rd->is_relaxable)
++    return TRUE;
++
++  if (!sec->rawsize)
++    sec->rawsize = sec->size;
++
++  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
++  relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
++  if (!relocs)
++    goto out;
++
++  isymbuf = retrieve_local_syms(abfd, info->keep_memory);
++  if (!isymbuf)
++    goto out;
++
++  local_got_ents = elf_local_got_ents(abfd);
++  local_sym_frag = elf_tdata(abfd)->local_sym_frag;
++
++  RDBG("size_frags: %s<%s>\n  vma: 0x%08lx, size: 0x%08lx\n",
++       abfd->filename, sec->name,
++       sec->output_section->vma + sec->output_offset, sec->size);
++
++  for (i = 0; i < rd->frag_count; i++)
++    {
++      struct fragment *frag = &rd->frag[i];
++      struct avr32_reloc_data *r_data = NULL, *ind_data = NULL;
++      const struct relax_state *state, *next_state;
++      struct fragment *target_frag = NULL;
++      asection *sym_sec = NULL;
++      Elf_Internal_Rela *rela;
++      struct got_entry *got;
++      bfd_vma symval, r_offset, addend, addr;
++      bfd_signed_vma size_adjust = 0, distance;
++      unsigned long r_symndx;
++      bfd_boolean defined = TRUE, dynamic = FALSE;
++      unsigned char sym_type;
++
++      frag->offset_adjust += delta;
++      state = next_state = &relax_state[frag->state];
++      rela = frag->rela;
++
++      BFD_ASSERT(state->id == frag->state);
++
++      RDBG("  0x%04lx%c%d: %s [size %ld]", rela ? rela->r_offset : sec->rawsize,
++	   (frag->offset_adjust < 0)?'-':'+',
++	   abs(frag->offset_adjust), state->name, state->size);
++
++      if (!rela)
++	{
++	  RDBG(": no reloc, ignoring\n");
++	  continue;
++	}
++
++      BFD_ASSERT((unsigned int)(rela - relocs) < sec->reloc_count);
++      BFD_ASSERT(state != RS_NONE);
++
++      r_offset = rela->r_offset + frag->offset_adjust;
++      addr = sec->output_section->vma + sec->output_offset + r_offset;
++
++      switch (frag->state)
++	{
++	case RS_ALIGN:
++	  size_adjust = ((addr + (1 << rela->r_addend) - 1)
++			 & ~((1 << rela->r_addend) - 1));
++	  size_adjust -= (sec->output_section->vma + sec->output_offset
++			  + frag->offset + frag->offset_adjust
++			  + frag->size + frag->size_adjust);
++
++	  RDBG(": adjusting size %lu -> %lu\n", frag->size + frag->size_adjust,
++	       frag->size + frag->size_adjust + size_adjust);
++	  break;
++
++	case RS_CPENT:
++	  if (frag->refcount == 0 && frag->size_adjust == 0)
++	    {
++	      RDBG(": discarding frag\n");
++	      size_adjust = -4;
++	    }
++	  else if (frag->refcount > 0 && frag->size_adjust < 0)
++	    {
++	      RDBG(": un-discarding frag\n");
++	      size_adjust = 4;
++	    }
++	  break;
++
++	default:
++	  if (rd->reloc_data)
++	    r_data = &rd->reloc_data[frag->rela - relocs];
++
++	  /* If this is a cpool reference, we want the symbol that the
++	     cpool entry refers to, not the symbol for the cpool entry
++	     itself, as we already know what frag it's in.  */
++	  if (relax_state[frag->initial_state].reftype == REF_CPOOL)
++	    {
++	      Elf_Internal_Rela *irela = r_data->add_frag->rela;
++
++	      r_symndx = ELF_R_SYM(irela->r_info);
++	      addend = irela->r_addend;
++
++	      /* The constant pool must be in the same section as the
++		 reloc referring to it.  */
++	      BFD_ASSERT((unsigned long)(irela - relocs) < sec->reloc_count);
++
++	      ind_data = r_data;
++	      r_data = &rd->reloc_data[irela - relocs];
++	    }
++	  else
++	    {
++	      r_symndx = ELF_R_SYM(rela->r_info);
++	      addend = rela->r_addend;
++	    }
++
++	  /* Get the value of the symbol referred to by the reloc.  */
++	  if (r_symndx < symtab_hdr->sh_info)
++	    {
++	      Elf_Internal_Sym *isym;
++
++	      isym = isymbuf + r_symndx;
++	      symval = 0;
++
++	      RDBG(" local sym %lu: ", r_symndx);
++
++	      if (isym->st_shndx == SHN_UNDEF)
++		defined = FALSE;
++	      else if (isym->st_shndx == SHN_ABS)
++		sym_sec = bfd_abs_section_ptr;
++	      else if (isym->st_shndx == SHN_COMMON)
++		sym_sec = bfd_com_section_ptr;
++	      else
++		sym_sec = bfd_section_from_elf_index(abfd, isym->st_shndx);
++
++	      symval = isym->st_value;
++	      sym_type = ELF_ST_TYPE(isym->st_info);
++	      target_frag = local_sym_frag[r_symndx];
++
++	      if (local_got_ents)
++		got = local_got_ents[r_symndx];
++	      else
++		got = NULL;
++	    }
++	  else
++	    {
++	      /* Global symbol */
++	      unsigned long index;
++	      struct elf_link_hash_entry *h;
++	      struct elf_avr32_link_hash_entry *havr;
++
++	      index = r_symndx - symtab_hdr->sh_info;
++	      h = elf_sym_hashes(abfd)[index];
++	      BFD_ASSERT(h != NULL);
++
++	      while (h->root.type == bfd_link_hash_indirect
++		     || h->root.type == bfd_link_hash_warning)
++		h = (struct elf_link_hash_entry *)h->root.u.i.link;
++
++	      havr = (struct elf_avr32_link_hash_entry *)h;
++	      got = h->got.glist;
++
++	      symval = 0;
++
++	      RDBG(" %s: ", h->root.root.string);
++
++	      if (h->root.type != bfd_link_hash_defined
++		  && h->root.type != bfd_link_hash_defweak)
++		{
++		  RDBG("(undef)");
++		  defined = FALSE;
++		}
++	      else if ((info->shared && !info->symbolic && h->dynindx != -1)
++		       || (htab->root.dynamic_sections_created
++			   && h->def_dynamic && !h->def_regular))
++		{
++		  RDBG("(dynamic)");
++		  dynamic = TRUE;
++		  sym_sec = h->root.u.def.section;
++		}
++	      else
++		{
++		  sym_sec = h->root.u.def.section;
++		  symval = h->root.u.def.value;
++		  target_frag = havr->sym_frag;
++		}
++
++	      sym_type = h->type;
++	    }
++
++	  /* Thanks to elf32-ppc for this one.  */
++	  if (sym_sec && sym_sec->sec_info_type == ELF_INFO_TYPE_MERGE)
++	    {
++	      /* At this stage in linking, no SEC_MERGE symbol has been
++		 adjusted, so all references to such symbols need to be
++		 passed through _bfd_merged_section_offset.  (Later, in
++		 relocate_section, all SEC_MERGE symbols *except* for
++		 section symbols have been adjusted.)
++
++	         SEC_MERGE sections are not relaxed by us, as they
++	         shouldn't contain any code.  */
++
++	      BFD_ASSERT(!target_frag && !(r_data && r_data->add_frag));
++
++	      /* gas may reduce relocations against symbols in SEC_MERGE
++		 sections to a relocation against the section symbol when
++		 the original addend was zero.  When the reloc is against
++		 a section symbol we should include the addend in the
++		 offset passed to _bfd_merged_section_offset, since the
++		 location of interest is the original symbol.  On the
++		 other hand, an access to "sym+addend" where "sym" is not
++		 a section symbol should not include the addend;  Such an
++		 access is presumed to be an offset from "sym";  The
++		 location of interest is just "sym".  */
++	      RDBG("\n    MERGE: %s: 0x%lx+0x%lx+0x%lx -> ",
++		   (sym_type == STT_SECTION)?"section":"not section",
++		   sym_sec->output_section->vma + sym_sec->output_offset,
++		   symval, addend);
++
++	      if (sym_type == STT_SECTION)
++		symval += addend;
++
++	      symval = (_bfd_merged_section_offset
++			(abfd, &sym_sec,
++			 elf_section_data(sym_sec)->sec_info, symval));
++
++	      if (sym_type != STT_SECTION)
++		symval += addend;
++	    }
++	  else
++	    symval += addend;
++
++	  if (defined && !dynamic)
++	    {
++	      RDBG("0x%lx+0x%lx",
++		   sym_sec->output_section->vma + sym_sec->output_offset,
++		   symval);
++	      symval += sym_sec->output_section->vma + sym_sec->output_offset;
++	    }
++
++	  if (r_data && r_data->add_frag)
++	    /* If the add_frag pointer is set, it means that this reloc
++	       has an addend that may be affected by relaxation.  */
++	    target_frag = r_data->add_frag;
++
++	  if (target_frag)
++	    {
++	      symval += target_frag->offset_adjust;
++
++	      /* If target_frag comes after this frag in the same
++		 section, we should assume that it will be moved by
++		 the same amount we are.  */
++	      if ((target_frag - rd->frag) < (int)rd->frag_count
++		  && target_frag > frag)
++		symval += delta;
++	    }
++
++	  distance = symval - addr;
++
++	  /* First, try to make a direct reference.  If the symbol is
++	     dynamic or undefined, we must take care not to change its
++	     reference type, that is, we can't make it direct.
++
++	     Also, it seems like some sections may actually be resized
++	     after the relaxation code is done, so we can't really
++	     trust that our "distance" is correct.  There's really no
++	     easy solution to this problem, so we'll just disallow
++	     direct references to SEC_DATA sections.
++
++	     Oh, and .bss isn't actually SEC_DATA, so we disallow
++	     !SEC_HAS_CONTENTS as well. */
++	  if (!dynamic && defined
++	      && (htab->direct_data_refs
++		  || (!(sym_sec->flags & SEC_DATA)
++		      && (sym_sec->flags & SEC_HAS_CONTENTS)))
++	      && next_state->direct)
++	    {
++	      next_state = &relax_state[next_state->direct];
++	      RDBG(" D-> %s", next_state->name);
++	    }
++
++	  /* Iterate backwards until we find a state that fits.  */
++	  while (next_state->prev
++		 && !rs_is_good_enough(next_state, frag, symval, addr,
++				       got, ind_data, delta))
++	    {
++	      next_state = &relax_state[next_state->prev];
++	      RDBG(" P-> %s", next_state->name);
++	    }
++
++	  /* Then try to find the best possible state.  */
++	  while (next_state->next)
++	    {
++	      const struct relax_state *candidate;
++
++	      candidate = &relax_state[next_state->next];
++	      if (!rs_is_good_enough(candidate, frag, symval, addr, got,
++				     ind_data, delta))
++		break;
++
++	      next_state = candidate;
++	      RDBG(" N-> %s", next_state->name);
++	    }
++
++	  RDBG(" [size %ld]\n", next_state->size);
++
++	  BFD_ASSERT(next_state->id);
++	  BFD_ASSERT(!dynamic || next_state->reftype == REF_GOT);
++
++	  size_adjust = next_state->size - state->size;
++
++	  /* There's a theoretical possibility that shrinking one frag
++	     may cause another to grow, which may cause the first one to
++	     grow as well, and we're back where we started.  Avoid this
++	     scenario by disallowing a frag that has grown to ever
++	     shrink again.  */
++	  if (state->reftype == REF_GOT && next_state->reftype != REF_GOT)
++	    {
++	      if (frag->has_grown)
++		next_state = state;
++	      else
++		unref_got_entry(htab, got);
++	    }
++	  else if (state->reftype != REF_GOT && next_state->reftype == REF_GOT)
++	    {
++	      ref_got_entry(htab, got);
++	      frag->has_grown = TRUE;
++	    }
++	  else if (state->reftype == REF_CPOOL
++		   && next_state->reftype != REF_CPOOL)
++	    {
++	      if (frag->has_grown)
++		next_state = state;
++	      else
++		ind_data->add_frag->refcount--;
++	    }
++	  else if (state->reftype != REF_CPOOL
++		   && next_state->reftype == REF_CPOOL)
++	    {
++	      ind_data->add_frag->refcount++;
++	      frag->has_grown = TRUE;
++	    }
++	  else
++	    {
++	      if (frag->has_grown && size_adjust < 0)
++		next_state = state;
++	      else if (size_adjust > 0)
++		frag->has_grown = TRUE;
++	    }
++
++	  size_adjust = next_state->size - state->size;
++	  frag->state = next_state->id;
++
++	  break;
++	}
++
++      if (size_adjust)
++	htab->repeat_pass = TRUE;
++
++      frag->size_adjust += size_adjust;
++      sec->size += size_adjust;
++      delta += size_adjust;
++
++      BFD_ASSERT((frag->offset + frag->offset_adjust
++		  + frag->size + frag->size_adjust)
++		 == (frag[1].offset + frag[1].offset_adjust + delta));
++    }
++
++  ret = TRUE;
++
++ out:
++  release_local_syms(abfd, isymbuf);
++  release_internal_relocs(sec, relocs);
++  return ret;
++}
++
++static bfd_boolean
++adjust_global_symbol(struct elf_avr32_link_hash_entry *havr,
++		     struct bfd_link_info *info ATTRIBUTE_UNUSED)
++{
++  struct elf_link_hash_entry *h = &havr->root;
++
++  if (havr->sym_frag && (h->root.type == bfd_link_hash_defined
++			 || h->root.type == bfd_link_hash_defweak))
++    {
++      RDBG("adjust_global_symbol: %s 0x%08lx -> 0x%08lx\n",
++	   h->root.root.string, h->root.u.def.value,
++	   h->root.u.def.value + havr->sym_frag->offset_adjust);
++      h->root.u.def.value += havr->sym_frag->offset_adjust;
++    }
++  return TRUE;
++}
++
++static bfd_boolean
++adjust_syms(struct bfd_link_info *info)
++{
++  struct elf_avr32_link_hash_table *htab;
++  bfd *abfd;
++
++  htab = avr32_elf_hash_table(info);
++  elf_link_hash_traverse(&htab->root, adjust_global_symbol, info);
++
++  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
++    {
++      Elf_Internal_Sym *isymbuf;
++      struct fragment **local_sym_frag, *frag;
++      unsigned int i, sym_count;
++
++      sym_count = elf_tdata(abfd)->symtab_hdr.sh_info;
++      if (sym_count == 0)
++	continue;
++
++      isymbuf = retrieve_local_syms(abfd, info->keep_memory);
++      if (!isymbuf)
++	return FALSE;
++
++      local_sym_frag = elf_tdata(abfd)->local_sym_frag;
++
++      for (i = 0; i < sym_count; i++)
++	{
++	  frag = local_sym_frag[i];
++	  if (frag)
++	    {
++	      RDBG("adjust_local_symbol: %s[%u] 0x%08lx -> 0x%08lx\n",
++		   abfd->filename, i, isymbuf[i].st_value,
++		   isymbuf[i].st_value + frag->offset_adjust);
++	      isymbuf[i].st_value += frag->offset_adjust;
++	    }
++	}
++
++      release_local_syms(abfd, isymbuf);
++    }
++
++  htab->symbols_adjusted = TRUE;
++  return TRUE;
++}
++
++static bfd_boolean
++adjust_relocs(bfd *abfd, asection *sec, struct bfd_link_info *info)
++{
++  struct avr32_relax_data *rd;
++  Elf_Internal_Rela *relocs;
++  Elf_Internal_Shdr *symtab_hdr;
++  unsigned int i;
++  bfd_boolean ret = FALSE;
++
++  rd = avr32_relax_data(sec);
++  if (!rd->reloc_data)
++    return TRUE;
++
++  RDBG("adjust_relocs: %s<%s> (count: %u)\n", abfd->filename, sec->name,
++       sec->reloc_count);
++
++  relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
++  if (!relocs)
++    return FALSE;
++
++  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
++
++  for (i = 0; i < sec->reloc_count; i++)
++    {
++      Elf_Internal_Rela *rela = &relocs[i];
++      struct avr32_reloc_data *r_data = &rd->reloc_data[i];
++      struct fragment *sym_frag;
++      unsigned long r_symndx;
++
++      if (r_data->add_frag)
++	{
++	  r_symndx = ELF_R_SYM(rela->r_info);
++
++	  if (r_symndx < symtab_hdr->sh_info)
++	    sym_frag = elf_tdata(abfd)->local_sym_frag[r_symndx];
++	  else
++	    {
++	      struct elf_link_hash_entry *h;
++
++	      h = elf_sym_hashes(abfd)[r_symndx - symtab_hdr->sh_info];
++
++	      while (h->root.type == bfd_link_hash_indirect
++		     || h->root.type == bfd_link_hash_warning)
++		h = (struct elf_link_hash_entry *)h->root.u.i.link;
++
++	      BFD_ASSERT(h->root.type == bfd_link_hash_defined
++			 || h->root.type == bfd_link_hash_defweak);
++
++	      sym_frag = ((struct elf_avr32_link_hash_entry *)h)->sym_frag;
++	    }
++
++	  RDBG("    addend: 0x%08lx -> 0x%08lx\n",
++	       rela->r_addend,
++	       rela->r_addend + r_data->add_frag->offset_adjust
++	       - (sym_frag ? sym_frag->offset_adjust : 0));
++
++	  /* If this is against a section symbol, we won't find any
++	     sym_frag, so we'll just adjust the addend.  */
++	  rela->r_addend += r_data->add_frag->offset_adjust;
++	  if (sym_frag)
++	    rela->r_addend -= sym_frag->offset_adjust;
++
++	  if (r_data->sub_frag)
++	    {
++	      bfd_byte *contents;
++	      bfd_signed_vma diff;
++
++	      contents = retrieve_contents(abfd, sec, info->keep_memory);
++	      if (!contents)
++		goto out;
++
++	      /* I realize now that sub_frag is misnamed.  It's
++		 actually add_frag which is subtracted in this
++		 case...  */
++	      diff = bfd_get_signed_32(abfd, contents + rela->r_offset);
++	      diff += (r_data->sub_frag->offset_adjust
++		       - r_data->add_frag->offset_adjust);
++	      bfd_put_32(abfd, diff, contents + rela->r_offset);
++
++	      RDBG("   0x%lx: DIFF32 updated: 0x%lx\n", rela->r_offset, diff);
++
++	      release_contents(sec, contents);
++	    }
++	}
++      else
++	BFD_ASSERT(!r_data->sub_frag);
++    }
++
++  ret = TRUE;
++
++ out:
++  release_internal_relocs(sec, relocs);
++  return ret;
++}
++
++static bfd_boolean
++avr32_move_data(bfd *abfd, asection *sec, struct bfd_link_info *info)
++{
++  struct elf_avr32_link_hash_table *htab;
++  struct avr32_relax_data *rd;
++  struct fragment *frag, *fragend;
++  Elf_Internal_Rela *relocs = NULL;
++  bfd_byte *contents = NULL;
++  unsigned int i;
++  bfd_boolean ret = FALSE;
++
++  htab = avr32_elf_hash_table(info);
++  rd = avr32_relax_data(sec);
++
++  if (!htab->symbols_adjusted)
++    if (!adjust_syms(info))
++      return FALSE;
++
++  if (rd->is_relaxable)
++    {
++      /* Resize the section first, so that we can be sure that enough
++	 memory is allocated in case the section has grown.  */
++      if (sec->size > sec->rawsize
++	  && elf_section_data(sec)->this_hdr.contents)
++	{
++	  /* We must not use cached data if the section has grown.  */
++	  free(elf_section_data(sec)->this_hdr.contents);
++	  elf_section_data(sec)->this_hdr.contents = NULL;
++	}
++
++      relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
++      if (!relocs)
++	goto out;
++      contents = retrieve_contents(abfd, sec, info->keep_memory);
++      if (!contents)
++	goto out;
++
++      fragend = rd->frag + rd->frag_count;
++
++      RDBG("move_data: %s<%s>: relocs=%p, contents=%p\n",
++	   abfd->filename, sec->name, relocs, contents);
++
++      /* First, move the data into place. We must take care to move
++	 frags in the right order so that we don't accidentally
++	 overwrite parts of the next frag.  */
++      for (frag = rd->frag; frag < fragend; frag++)
++	{
++	  RDBG("    0x%08lx%c0x%x: size 0x%lx%c0x%x\n",
++	       frag->offset, frag->offset_adjust >= 0 ? '+' : '-',
++	       abs(frag->offset_adjust),
++	       frag->size, frag->size_adjust >= 0 ? '+' : '-',
++	       abs(frag->size_adjust));
++	  if (frag->offset_adjust > 0)
++	    {
++	      struct fragment *prev = frag - 1;
++	      struct fragment *last;
++
++	      for (last = frag; last < fragend && last->offset_adjust > 0;
++		   last++) ;
++
++	      if (last == fragend)
++		last--;
++
++	      for (frag = last; frag != prev; frag--)
++		{
++		  if (frag->offset_adjust
++		      && frag->size + frag->size_adjust > 0)
++		    {
++		      RDBG("memmove 0x%lx -> 0x%lx (size %lu)\n",
++			   frag->offset, frag->offset + frag->offset_adjust,
++			   frag->size + frag->size_adjust);
++		      memmove(contents + frag->offset + frag->offset_adjust,
++			      contents + frag->offset,
++			      frag->size + frag->size_adjust);
++		    }
++		}
++	      frag = last;
++	    }
++	  else if (frag->offset_adjust && frag->size + frag->size_adjust > 0)
++	    {
++	      RDBG("memmove 0x%lx -> 0x%lx (size %lu)\n",
++		   frag->offset, frag->offset + frag->offset_adjust,
++		   frag->size + frag->size_adjust);
++	      memmove(contents + frag->offset + frag->offset_adjust,
++		      contents + frag->offset,
++		      frag->size + frag->size_adjust);
++	    }
++	}
++
++      i = 0;
++
++      for (frag = rd->frag; frag < fragend; frag++)
++	{
++	  const struct relax_state *state, *istate;
++	  struct avr32_reloc_data *r_data = NULL;
++
++	  istate = &relax_state[frag->initial_state];
++	  state = &relax_state[frag->state];
++
++	  if (rd->reloc_data)
++	    r_data = &rd->reloc_data[frag->rela - relocs];
++
++	  BFD_ASSERT((long)(frag->size + frag->size_adjust) >= 0);
++	  BFD_ASSERT(state->reftype != REF_CPOOL
++		     || r_data->add_frag->refcount > 0);
++
++	  if (istate->reftype == REF_CPOOL && state->reftype != REF_CPOOL)
++	    {
++	      struct fragment *ifrag;
++
++	      /* An indirect reference through the cpool has been
++		 converted to a direct reference.  We must update the
++		 reloc to point to the symbol itself instead of the
++		 constant pool entry.  The reloc type will be updated
++		 later.  */
++	      ifrag = r_data->add_frag;
++	      frag->rela->r_info = ifrag->rela->r_info;
++	      frag->rela->r_addend = ifrag->rela->r_addend;
++
++	      /* Copy the reloc data so the addend will be adjusted
++		 correctly later.  */
++	      *r_data = rd->reloc_data[ifrag->rela - relocs];
++	    }
++
++	  /* Move all relocs covered by this frag.  */
++	  if (frag->rela)
++	    BFD_ASSERT(&relocs[i] <= frag->rela);
++	  else
++	    BFD_ASSERT((frag + 1) == fragend && frag->state == RS_NONE);
++
++	  if (frag == rd->frag)
++	    BFD_ASSERT(i == 0);
++	  else
++	    BFD_ASSERT(&relocs[i] > frag[-1].rela);
++
++	  /* If non-null, frag->rela is the last relocation in the
++	     fragment.  frag->rela can only be null in the last
++	     fragment, so in that case, we'll just do the rest.  */
++	  for (; (i < sec->reloc_count
++		  && (!frag->rela || &relocs[i] <= frag->rela)); i++)
++	    {
++	      RDBG("[%4u] r_offset 0x%08lx -> 0x%08lx\n", i, relocs[i].r_offset,
++		   relocs[i].r_offset + frag->offset_adjust);
++	      relocs[i].r_offset += frag->offset_adjust;
++	    }
++
++	  if (frag->refcount == 0)
++	    {
++	      /* If this frag is to be discarded, make sure we won't
++		 relocate it later on.  */
++	      BFD_ASSERT(frag->state == RS_CPENT);
++	      frag->rela->r_info = ELF_R_INFO(ELF_R_SYM(frag->rela->r_info),
++					    R_AVR32_NONE);
++	    }
++	  else if (frag->state == RS_ALIGN)
++	    {
++	      bfd_vma addr, addr_end;
++
++	      addr = frag->rela->r_offset;
++	      addr_end = (frag->offset + frag->offset_adjust
++			  + frag->size + frag->size_adjust);
++
++	      /* If the section is executable, insert NOPs.
++		 Otherwise, insert zeroes.  */
++	      if (sec->flags & SEC_CODE)
++		{
++		  if (addr & 1)
++		    {
++		      bfd_put_8(abfd, 0, contents + addr);
++		      addr++;
++		    }
++
++		  BFD_ASSERT(!((addr_end - addr) & 1));
++
++		  while (addr < addr_end)
++		    {
++		      bfd_put_16(abfd, NOP_OPCODE, contents + addr);
++		      addr += 2;
++		    }
++		}
++	      else
++		memset(contents + addr, 0, addr_end - addr);
++	    }
++	  else if (state->opcode_mask)
++	    {
++	      bfd_vma insn;
++
++	      /* Update the opcode and the relocation type unless it's a
++		 "special" relax state (i.e. RS_NONE, RS_ALIGN or
++		 RS_CPENT.), in which case the opcode mask is zero.  */
++	      insn = bfd_get_32(abfd, contents + frag->rela->r_offset);
++	      insn &= ~state->opcode_mask;
++	      insn |= state->opcode;
++	      RDBG("    0x%lx: inserting insn %08lx\n",
++		   frag->rela->r_offset, insn);
++	      bfd_put_32(abfd, insn, contents + frag->rela->r_offset);
++
++	      frag->rela->r_info = ELF_R_INFO(ELF_R_SYM(frag->rela->r_info),
++					      state->r_type);
++	    }
++
++	  if ((frag + 1) == fragend)
++	    BFD_ASSERT((frag->offset + frag->size + frag->offset_adjust
++			+ frag->size_adjust) == sec->size);
++	  else
++	    BFD_ASSERT((frag->offset + frag->size + frag->offset_adjust
++			+ frag->size_adjust)
++		       == (frag[1].offset + frag[1].offset_adjust));
++	}
++    }
++
++  /* Adjust reloc addends and DIFF32 differences */
++  if (!adjust_relocs(abfd, sec, info))
++    return FALSE;
++
++  ret = TRUE;
++
++ out:
++  release_contents(sec, contents);
++  release_internal_relocs(sec, relocs);
++  return ret;
++}
++
++static bfd_boolean
++avr32_elf_relax_section(bfd *abfd, asection *sec,
++			struct bfd_link_info *info, bfd_boolean *again)
++{
++  struct elf_avr32_link_hash_table *htab;
++  struct avr32_relax_data *rd;
++
++  *again = FALSE;
++  if (info->relocatable)
++    return TRUE;
++
++  htab = avr32_elf_hash_table(info);
++  if ((!(sec->flags & SEC_RELOC) || sec->reloc_count == 0)
++      && sec != htab->sgot)
++    return TRUE;
++
++  if (!htab->relocations_analyzed)
++    {
++      if (!analyze_relocations(info))
++	return FALSE;
++      htab->relocations_analyzed = TRUE;
++    }
++
++  rd = avr32_relax_data(sec);
++
++  if (rd->iteration != htab->relax_iteration)
++    {
++      if (!htab->repeat_pass)
++	htab->relax_pass++;
++      htab->relax_iteration++;
++      htab->repeat_pass = FALSE;
++    }
++
++  rd->iteration++;
++
++  switch (htab->relax_pass)
++    {
++    case RELAX_PASS_SIZE_FRAGS:
++      if (!avr32_size_frags(abfd, sec, info))
++	return FALSE;
++      *again = TRUE;
++      break;
++    case RELAX_PASS_MOVE_DATA:
++      if (!avr32_move_data(abfd, sec, info))
++	return FALSE;
++      break;
++  }
++
++  return TRUE;
++}
++
++
++/* Relocation */
++
++static bfd_reloc_status_type
++avr32_check_reloc_value(asection *sec, Elf_Internal_Rela *rela,
++			bfd_signed_vma relocation, reloc_howto_type *howto);
++static bfd_reloc_status_type
++avr32_final_link_relocate(reloc_howto_type *howto, bfd *input_bfd,
++			  asection *input_section, bfd_byte *contents,
++			  Elf_Internal_Rela *rel, bfd_vma value);
++static bfd_boolean
++avr32_elf_relocate_section(bfd *output_bfd, struct bfd_link_info *info,
++			   bfd *input_bfd, asection *input_section,
++			   bfd_byte *contents, Elf_Internal_Rela *relocs,
++			   Elf_Internal_Sym *local_syms,
++			   asection **local_sections);
++
++
++#define symbol_address(symbol) \
++  symbol->value + symbol->section->output_section->vma \
++  + symbol->section->output_offset
++
++#define avr32_elf_insert_field(size, field, abfd, reloc_entry, data)	\
++  do									\
++    {									\
++      unsigned long x;							\
++      x = bfd_get_##size (abfd, data + reloc_entry->address);		\
++      x &= ~reloc_entry->howto->dst_mask;				\
++      x |= field & reloc_entry->howto->dst_mask;			\
++      bfd_put_##size (abfd, (bfd_vma) x, data + reloc_entry->address);	\
++    }									\
++  while(0)
++
++static bfd_reloc_status_type
++avr32_check_reloc_value(asection *sec ATTRIBUTE_UNUSED,
++			Elf_Internal_Rela *rela ATTRIBUTE_UNUSED,
++			bfd_signed_vma relocation,
++			reloc_howto_type *howto)
++{
++  bfd_vma reloc_u;
++
++  /* We take "complain_overflow_dont" to mean "don't complain on
++     alignment either". This way, we don't have to special-case
++     R_AVR32_HI16 */
++  if (howto->complain_on_overflow == complain_overflow_dont)
++    return bfd_reloc_ok;
++
++  /* Check if the value is correctly aligned */
++  if (relocation & ((1 << howto->rightshift) - 1))
++    {
++      RDBG("misaligned: %s<%s+%lx>: %s: 0x%lx (align %u)\n",
++	   sec->owner->filename, sec->name, rela->r_offset,
++	   howto->name, relocation, howto->rightshift);
++      return bfd_reloc_overflow;
++    }
++
++  /* Now, get rid of the unnecessary bits */
++  relocation >>= howto->rightshift;
++  reloc_u = (bfd_vma)relocation;
++
++  switch (howto->complain_on_overflow)
++    {
++    case complain_overflow_unsigned:
++    case complain_overflow_bitfield:
++      if (reloc_u > (unsigned long)((1 << howto->bitsize) - 1))
++	{
++	  RDBG("unsigned overflow: %s<%s+%lx>: %s: 0x%lx (size %u)\n",
++	       sec->owner->filename, sec->name, rela->r_offset,
++	       howto->name, reloc_u, howto->bitsize);
++	  RDBG("reloc vma: 0x%lx\n",
++	       sec->output_section->vma + sec->output_offset + rela->r_offset);
++
++	  return bfd_reloc_overflow;
++	}
++      break;
++    case complain_overflow_signed:
++      if (relocation > (1 << (howto->bitsize - 1)) - 1)
++	{
++	  RDBG("signed overflow: %s<%s+%lx>: %s: 0x%lx (size %u)\n",
++	       sec->owner->filename, sec->name, rela->r_offset,
++	       howto->name, reloc_u, howto->bitsize);
++	  RDBG("reloc vma: 0x%lx\n",
++	       sec->output_section->vma + sec->output_offset + rela->r_offset);
++
++	  return bfd_reloc_overflow;
++	}
++      if (relocation < -(1 << (howto->bitsize - 1)))
++	{
++	  RDBG("signed overflow: %s<%s+%lx>: %s: -0x%lx (size %u)\n",
++	       sec->owner->filename, sec->name, rela->r_offset,
++	       howto->name, -relocation, howto->bitsize);
++	  RDBG("reloc vma: 0x%lx\n",
++	       sec->output_section->vma + sec->output_offset + rela->r_offset);
++
++	  return bfd_reloc_overflow;
++	}
++      break;
++    default:
++      abort();
++    }
++
++  return bfd_reloc_ok;
++}
++
++
++static bfd_reloc_status_type
++avr32_final_link_relocate(reloc_howto_type *howto,
++			  bfd *input_bfd,
++			  asection *input_section,
++			  bfd_byte *contents,
++			  Elf_Internal_Rela *rel,
++			  bfd_vma value)
++{
++  bfd_vma field;
++  bfd_vma relocation;
++  bfd_reloc_status_type status;
++  bfd_byte *p = contents + rel->r_offset;
++  unsigned long x;
++
++  pr_debug("  (6b) final link relocate\n");
++
++  /* Sanity check the address */
++  if (rel->r_offset > input_section->size)
++    {
++      (*_bfd_error_handler)
++	("%B: %A+0x%lx: offset out of range (section size: 0x%lx)",
++	 input_bfd, input_section, rel->r_offset, input_section->size);
++      return bfd_reloc_outofrange;
++    }
++
++  relocation = value + rel->r_addend;
++
++  if (howto->pc_relative)
++    {
++      bfd_vma addr;
++
++      addr = input_section->output_section->vma
++	+ input_section->output_offset + rel->r_offset;
++      addr &= ~0UL << howto->rightshift;
++      relocation -= addr;
++    }
++
++  switch (ELF32_R_TYPE(rel->r_info))
++    {
++    case R_AVR32_16N_PCREL:
++      /* sub reg, pc, . - (sym + addend) */
++      relocation = -relocation;
++      break;
++    }
++
++  status = avr32_check_reloc_value(input_section, rel, relocation, howto);
++
++  relocation >>= howto->rightshift;
++  if (howto->bitsize == 21)
++    field = (relocation & 0xffff)
++      | ((relocation & 0x10000) << 4)
++      | ((relocation & 0x1e0000) << 8);
++  else if (howto->bitsize == 12)
++    field = (relocation & 0xff) | ((relocation & 0xf00) << 4);
++  else if (howto->bitsize == 10)
++    field = ((relocation & 0xff) << 4)
++      | ((relocation & 0x300) >> 8);
++  else
++    field = relocation << howto->bitpos;
++
++  switch (howto->size)
++    {
++    case 0:
++      x = bfd_get_8 (input_bfd, p);
++      x &= ~howto->dst_mask;
++      x |= field & howto->dst_mask;
++      bfd_put_8 (input_bfd, (bfd_vma) x, p);
++      break;
++    case 1:
++      x = bfd_get_16 (input_bfd, p);
++      x &= ~howto->dst_mask;
++      x |= field & howto->dst_mask;
++      bfd_put_16 (input_bfd, (bfd_vma) x, p);
++      break;
++    case 2:
++      x = bfd_get_32 (input_bfd, p);
++      x &= ~howto->dst_mask;
++      x |= field & howto->dst_mask;
++      bfd_put_32 (input_bfd, (bfd_vma) x, p);
++      break;
++    default:
++      abort();
++    }
++
++  return status;
++}
++
++/* (6) Apply relocations to the normal (non-dynamic) sections */
++
++static bfd_boolean
++avr32_elf_relocate_section(bfd *output_bfd, struct bfd_link_info *info,
++			   bfd *input_bfd, asection *input_section,
++			   bfd_byte *contents, Elf_Internal_Rela *relocs,
++			   Elf_Internal_Sym *local_syms,
++			   asection **local_sections)
++{
++  struct elf_avr32_link_hash_table *htab;
++  Elf_Internal_Shdr *symtab_hdr;
++  Elf_Internal_Rela *rel, *relend;
++  struct elf_link_hash_entry **sym_hashes;
++  struct got_entry **local_got_ents;
++  asection *sgot;
++  asection *srelgot;
++
++  pr_debug("(6) relocate section %s:<%s> (size 0x%lx)\n",
++	   input_bfd->filename, input_section->name, input_section->size);
++
++  /* If we're doing a partial link, we don't have to do anything since
++     we're using RELA relocations */
++  if (info->relocatable)
++    return TRUE;
++
++  htab = avr32_elf_hash_table(info);
++  symtab_hdr = &elf_tdata(input_bfd)->symtab_hdr;
++  sym_hashes = elf_sym_hashes(input_bfd);
++  local_got_ents = elf_local_got_ents(input_bfd);
++  sgot = htab->sgot;
++  srelgot = htab->srelgot;
++
++  relend = relocs + input_section->reloc_count;
++  for (rel = relocs; rel < relend; rel++)
++    {
++      unsigned long r_type, r_symndx;
++      reloc_howto_type *howto;
++      Elf_Internal_Sym *sym = NULL;
++      struct elf_link_hash_entry *h = NULL;
++      asection *sec = NULL;
++      bfd_vma value;
++      bfd_vma offset;
++      bfd_reloc_status_type status;
++
++      r_type = ELF32_R_TYPE(rel->r_info);
++      r_symndx = ELF32_R_SYM(rel->r_info);
++
++      if (r_type == R_AVR32_NONE
++	  || r_type == R_AVR32_ALIGN
++	  || r_type == R_AVR32_DIFF32
++	  || r_type == R_AVR32_DIFF16
++	  || r_type == R_AVR32_DIFF8)
++	continue;
++
++      /* Sanity check */
++      if (r_type > R_AVR32_max)
++	{
++	  bfd_set_error(bfd_error_bad_value);
++	  return FALSE;
++	}
++
++      howto = &elf_avr32_howto_table[r_type];
++
++      if (r_symndx < symtab_hdr->sh_info)
++	{
++	  sym = local_syms + r_symndx;
++	  sec = local_sections[r_symndx];
++
++	  pr_debug("  (6a) processing %s against local symbol %lu\n",
++		   howto->name, r_symndx);
++
++	  /* The following function changes rel->r_addend behind our back. */
++	  value = _bfd_elf_rela_local_sym(output_bfd, sym, &sec, rel);
++	  pr_debug("    => value: %lx, addend: %lx\n", value, rel->r_addend);
++	}
++      else
++	{
++	  if (sym_hashes == NULL)
++	    return FALSE;
++
++	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
++	  while (h->root.type == bfd_link_hash_indirect
++		 || h->root.type == bfd_link_hash_warning)
++	    h = (struct elf_link_hash_entry *)h->root.u.i.link;
++
++	  pr_debug("  (6a) processing %s against symbol %s\n",
++		   howto->name, h->root.root.string);
++
++	  if (h->root.type == bfd_link_hash_defined
++	      || h->root.type == bfd_link_hash_defweak)
++	    {
++	      bfd_boolean dyn;
++
++	      dyn = htab->root.dynamic_sections_created;
++	      sec = h->root.u.def.section;
++
++	      if (sec->output_section)
++		value = (h->root.u.def.value
++			 + sec->output_section->vma
++			 + sec->output_offset);
++	      else
++		value = h->root.u.def.value;
++	    }
++	  else if (h->root.type == bfd_link_hash_undefweak)
++	    value = 0;
++	  else if (info->unresolved_syms_in_objects == RM_IGNORE
++		   && ELF_ST_VISIBILITY(h->other) == STV_DEFAULT)
++	    value = 0;
++	  else
++	    {
++	      bfd_boolean err;
++	      err = (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
++		     || ELF_ST_VISIBILITY(h->other) != STV_DEFAULT);
++	      if (!info->callbacks->undefined_symbol
++		  (info, h->root.root.string, input_bfd,
++		   input_section, rel->r_offset, err))
++		return FALSE;
++	      value = 0;
++	    }
++
++	  pr_debug("    => value: %lx, addend: %lx\n", value, rel->r_addend);
++	}
++
++      switch (r_type)
++	{
++	case R_AVR32_GOT32:
++	case R_AVR32_GOT16:
++	case R_AVR32_GOT8:
++	case R_AVR32_GOT21S:
++	case R_AVR32_GOT18SW:
++	case R_AVR32_GOT16S:
++	case R_AVR32_GOT7UW:
++	case R_AVR32_LDA_GOT:
++	case R_AVR32_GOTCALL:
++	  BFD_ASSERT(sgot != NULL);
++
++	  if (h != NULL)
++	    {
++	      BFD_ASSERT(h->got.glist->refcount > 0);
++	      offset = h->got.glist->offset;
++
++	      BFD_ASSERT(offset < sgot->size);
++	      if (!elf_hash_table(info)->dynamic_sections_created
++		  || (h->def_regular
++		      && (!info->shared
++			  || info->symbolic
++			  || h->dynindx == -1)))
++		{
++		  /* This is actually a static link, or it is a
++		     -Bsymbolic link and the symbol is defined
++		     locally, or the symbol was forced to be local.  */
++		  bfd_put_32(output_bfd, value, sgot->contents + offset);
++		}
++	    }
++	  else
++	    {
++	      BFD_ASSERT(local_got_ents &&
++			 local_got_ents[r_symndx]->refcount > 0);
++	      offset = local_got_ents[r_symndx]->offset;
++
++	      /* Local GOT entries don't have relocs.  If this is a
++		 shared library, the dynamic linker will add the load
++		 address to the initial value at startup.  */
++	      BFD_ASSERT(offset < sgot->size);
++	      pr_debug("Initializing GOT entry at offset %lu: 0x%lx\n",
++		       offset, value);
++	      bfd_put_32 (output_bfd, value, sgot->contents + offset);
++	    }
++
++	  value = sgot->output_offset + offset;
++	  pr_debug("GOT reference: New value %lx\n", value);
++	  break;
++
++	case R_AVR32_GOTPC:
++	  /* This relocation type is for constant pool entries used in
++	     the calculation "Rd = PC - (PC - GOT)", where the
++	     constant pool supplies the constant (PC - GOT)
++	     offset. The symbol value + addend indicates where the
++	     value of PC is taken. */
++	  value -= sgot->output_section->vma;
++	  break;
++
++	case R_AVR32_32_PCREL:
++	  /* We must adjust r_offset to account for discarded data in
++	     the .eh_frame section.  This is probably not the right
++	     way to do this, since AFAICS all other architectures do
++	     it some other way.  I just can't figure out how...  */
++	  {
++	    bfd_vma r_offset;
++
++	    r_offset = _bfd_elf_section_offset(output_bfd, info,
++					       input_section,
++					       rel->r_offset);
++	    if (r_offset == (bfd_vma)-1
++		|| r_offset == (bfd_vma)-2)
++	      continue;
++	    rel->r_offset = r_offset;
++	  }
++	  break;
++
++	case R_AVR32_32:
++	  /* We need to emit a run-time relocation in the following cases:
++	       - we're creating a shared library
++	       - the symbol is not defined in any regular objects
++
++	     Of course, sections that aren't going to be part of the
++	     run-time image will not get any relocs, and undefined
++	     symbols won't have any either (only weak undefined
++	     symbols should get this far).  */
++	  if ((info->shared
++	       || (elf_hash_table(info)->dynamic_sections_created
++		   && h != NULL
++		   && h->def_dynamic
++		   && !h->def_regular))
++	      && r_symndx != 0
++	      && (input_section->flags & SEC_ALLOC))
++	    {
++	      Elf_Internal_Rela outrel;
++	      bfd_byte *loc;
++	      bfd_boolean skip, relocate;
++	      struct elf_avr32_link_hash_entry *avrh;
++
++	      pr_debug("Going to generate dynamic reloc...\n");
++
++	      skip = FALSE;
++	      relocate = FALSE;
++
++	      outrel.r_offset = _bfd_elf_section_offset(output_bfd, info,
++							input_section,
++							rel->r_offset);
++	      if (outrel.r_offset == (bfd_vma)-1)
++		skip = TRUE;
++	      else if (outrel.r_offset == (bfd_vma)-2)
++		skip = TRUE, relocate = TRUE;
++
++	      outrel.r_offset += (input_section->output_section->vma
++				  + input_section->output_offset);
++
++	      pr_debug("    ... offset %lx, dynindx %ld\n",
++		       outrel.r_offset, h ? h->dynindx : -1);
++
++	      if (skip)
++		memset(&outrel, 0, sizeof(outrel));
++	      else
++		{
++		  avrh = (struct elf_avr32_link_hash_entry *)h;
++		  /* h->dynindx may be -1 if this symbol was marked to
++		     become local.  */
++		  if (h == NULL
++		      || ((info->symbolic || h->dynindx == -1)
++			  && h->def_regular))
++		    {
++		      relocate = TRUE;
++		      outrel.r_info = ELF32_R_INFO(0, R_AVR32_RELATIVE);
++		      outrel.r_addend = value + rel->r_addend;
++		      pr_debug("    ... R_AVR32_RELATIVE\n");
++		    }
++		  else
++		    {
++		      BFD_ASSERT(h->dynindx != -1);
++		      relocate = TRUE;
++		      outrel.r_info = ELF32_R_INFO(h->dynindx, R_AVR32_GLOB_DAT);
++		      outrel.r_addend = rel->r_addend;
++		      pr_debug("    ... R_AVR32_GLOB_DAT\n");
++		    }
++		}
++
++	      pr_debug("srelgot reloc_count: %d, size %lu\n",
++		       srelgot->reloc_count, srelgot->size);
++
++	      loc = srelgot->contents;
++	      loc += srelgot->reloc_count++ * sizeof(Elf32_External_Rela);
++	      bfd_elf32_swap_reloca_out(output_bfd, &outrel, loc);
++
++	      BFD_ASSERT(srelgot->reloc_count * sizeof(Elf32_External_Rela)
++			 <= srelgot->size);
++
++	      if (!relocate)
++		continue;
++	    }
++	  break;
++	}
++
++      status = avr32_final_link_relocate(howto, input_bfd, input_section,
++					 contents, rel, value);
++
++      switch (status)
++	{
++	case bfd_reloc_ok:
++	  break;
++
++	case bfd_reloc_overflow:
++	  {
++	    const char *name;
++
++	    if (h != NULL)
++	      name = h->root.root.string;
++	    else
++	      {
++		name = bfd_elf_string_from_elf_section(input_bfd,
++						       symtab_hdr->sh_link,
++						       sym->st_name);
++		if (name == NULL)
++		  return FALSE;
++		if (*name == '\0')
++		  name = bfd_section_name(input_bfd, sec);
++	      }
++	    if (!((*info->callbacks->reloc_overflow)
++		  (info, (h ? &h->root : NULL), name, howto->name,
++		   rel->r_addend, input_bfd, input_section, rel->r_offset)))
++	      return FALSE;
++	  }
++	  break;
++
++	case bfd_reloc_outofrange:
++	default:
++	  abort();
++	}
++    }
++
++  return TRUE;
++}
++
++
++/* Additional processing of dynamic sections after relocation */
++
++static bfd_boolean
++avr32_elf_finish_dynamic_symbol(bfd *output_bfd, struct bfd_link_info *info,
++				struct elf_link_hash_entry *h,
++				Elf_Internal_Sym *sym);
++static bfd_boolean
++avr32_elf_finish_dynamic_sections(bfd *output_bfd, struct bfd_link_info *info);
++
++
++/* (7) Initialize the contents of a dynamic symbol and/or emit
++   relocations for it */
++
++static bfd_boolean
++avr32_elf_finish_dynamic_symbol(bfd *output_bfd, struct bfd_link_info *info,
++				struct elf_link_hash_entry *h,
++				Elf_Internal_Sym *sym)
++{
++  struct elf_avr32_link_hash_table *htab;
++  struct got_entry *got;
++
++  pr_debug("(7) finish dynamic symbol: %s\n", h->root.root.string);
++
++  htab = avr32_elf_hash_table(info);
++  got = h->got.glist;
++
++  if (got && got->refcount > 0)
++    {
++      asection *sgot;
++      asection *srelgot;
++      Elf_Internal_Rela rel;
++      bfd_byte *loc;
++
++      /* This symbol has an entry in the GOT. Set it up. */
++      sgot = htab->sgot;
++      srelgot = htab->srelgot;
++      BFD_ASSERT(sgot && srelgot);
++
++      rel.r_offset = (sgot->output_section->vma
++		      + sgot->output_offset
++		      + got->offset);
++
++      /* If this is a static link, or it is a -Bsymbolic link and the
++	 symbol is defined locally or was forced to be local because
++	 of a version file, we just want to emit a RELATIVE reloc. The
++	 entry in the global offset table will already have been
++	 initialized in the relocate_section function. */
++      if ((info->shared
++	   && !info->symbolic
++	   && h->dynindx != -1)
++	  || (htab->root.dynamic_sections_created
++	      && h->def_dynamic
++	      && !h->def_regular))
++	{
++	  bfd_put_32(output_bfd, 0, sgot->contents + got->offset);
++	  rel.r_info = ELF32_R_INFO(h->dynindx, R_AVR32_GLOB_DAT);
++	  rel.r_addend = 0;
++
++	  pr_debug("GOT reloc R_AVR32_GLOB_DAT, dynindx: %ld\n", h->dynindx);
++	  pr_debug("    srelgot reloc_count: %d, size: %lu\n",
++		   srelgot->reloc_count, srelgot->size);
++
++	  loc = (srelgot->contents
++		 + srelgot->reloc_count++ * sizeof(Elf32_External_Rela));
++	  bfd_elf32_swap_reloca_out(output_bfd, &rel, loc);
++
++	  BFD_ASSERT(srelgot->reloc_count * sizeof(Elf32_External_Rela)
++		     <= srelgot->size);
++	}
++    }
++
++  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute */
++  if (strcmp(h->root.root.string, "_DYNAMIC") == 0
++      || strcmp(h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
++    sym->st_shndx = SHN_ABS;
++
++  return TRUE;
++}
++
++/* (8) Do any remaining initialization of the dynamic sections */
++
++static bfd_boolean
++avr32_elf_finish_dynamic_sections(bfd *output_bfd, struct bfd_link_info *info)
++{
++  struct elf_avr32_link_hash_table *htab;
++  asection *sgot, *sdyn;
++
++  pr_debug("(8) finish dynamic sections\n");
++
++  htab = avr32_elf_hash_table(info);
++  sgot = htab->sgot;
++  sdyn = bfd_get_section_by_name(htab->root.dynobj, ".dynamic");
++
++  if (htab->root.dynamic_sections_created)
++    {
++      Elf32_External_Dyn *dyncon, *dynconend;
++
++      BFD_ASSERT(sdyn && sgot && sgot->size >= AVR32_GOT_HEADER_SIZE);
++
++      dyncon = (Elf32_External_Dyn *)sdyn->contents;
++      dynconend = (Elf32_External_Dyn *)(sdyn->contents + sdyn->size);
++      for (; dyncon < dynconend; dyncon++)
++	{
++	  Elf_Internal_Dyn dyn;
++	  asection *s;
++
++	  bfd_elf32_swap_dyn_in(htab->root.dynobj, dyncon, &dyn);
++
++	  switch (dyn.d_tag)
++	    {
++	    default:
++	      break;
++
++	    case DT_PLTGOT:
++	      s = sgot->output_section;
++	      BFD_ASSERT(s != NULL);
++	      dyn.d_un.d_ptr = s->vma;
++	      bfd_elf32_swap_dyn_out(output_bfd, &dyn, dyncon);
++	      break;
++
++	    case DT_AVR32_GOTSZ:
++	      s = sgot->output_section;
++	      BFD_ASSERT(s != NULL);
++	      dyn.d_un.d_val = s->size;
++	      bfd_elf32_swap_dyn_out(output_bfd, &dyn, dyncon);
++	      break;
++	    }
++	}
++
++      /* Fill in the first two entries in the global offset table */
++      bfd_put_32(output_bfd,
++		 sdyn->output_section->vma + sdyn->output_offset,
++		 sgot->contents);
++
++      /* The runtime linker will fill this one in with the address of
++	 the run-time link map */
++      bfd_put_32(output_bfd, 0, sgot->contents + 4);
++    }
++
++  if (sgot)
++    elf_section_data(sgot->output_section)->this_hdr.sh_entsize = 4;
++
++  return TRUE;
++}
++
++
++/* AVR32-specific private ELF data */
++
++static bfd_boolean
++avr32_elf_set_private_flags(bfd *abfd, flagword flags);
++static bfd_boolean
++avr32_elf_copy_private_bfd_data(bfd *ibfd, bfd *obfd);
++static bfd_boolean
++avr32_elf_merge_private_bfd_data(bfd *ibfd, bfd *obfd);
++static bfd_boolean
++avr32_elf_print_private_bfd_data(bfd *abfd, void *ptr);
++
++static bfd_boolean
++avr32_elf_set_private_flags(bfd *abfd, flagword flags)
++{
++  elf_elfheader(abfd)->e_flags = flags;
++  elf_flags_init(abfd) = TRUE;
++
++  return TRUE;
++}
++
++/* Copy backend specific data from one object module to another.  */
++
++static bfd_boolean
++avr32_elf_copy_private_bfd_data(bfd *ibfd, bfd *obfd)
++{
++  elf_elfheader(obfd)->e_flags = elf_elfheader(ibfd)->e_flags;
++  return TRUE;
++}
++
++/* Merge backend specific data from an object file to the output
++   object file when linking.  */
++
++static bfd_boolean
++avr32_elf_merge_private_bfd_data(bfd *ibfd, bfd *obfd)
++{
++  flagword out_flags, in_flags;
++
++  pr_debug("(0) merge_private_bfd_data: %s -> %s\n",
++	   ibfd->filename, obfd->filename);
++
++  in_flags = elf_elfheader(ibfd)->e_flags;
++  out_flags = elf_elfheader(obfd)->e_flags;
++
++  if (elf_flags_init(obfd))
++    {
++      /* If one of the inputs are non-PIC, the output must be
++	 considered non-PIC.  The same applies to linkrelax.  */
++      if (!(in_flags & EF_AVR32_PIC))
++	out_flags &= ~EF_AVR32_PIC;
++      if (!(in_flags & EF_AVR32_LINKRELAX))
++	out_flags &= ~EF_AVR32_LINKRELAX;
++    }
++  else
++    {
++      elf_flags_init(obfd) = TRUE;
++      out_flags = in_flags;
++    }
++
++  elf_elfheader(obfd)->e_flags = out_flags;
++
++  return TRUE;
++}
++
++static bfd_boolean
++avr32_elf_print_private_bfd_data(bfd *abfd, void *ptr)
++{
++  FILE *file = (FILE *)ptr;
++  unsigned long flags;
++
++  BFD_ASSERT(abfd != NULL && ptr != NULL);
++
++  _bfd_elf_print_private_bfd_data(abfd, ptr);
++
++  flags = elf_elfheader(abfd)->e_flags;
++
++  fprintf(file, _("private flags = %lx:"), elf_elfheader(abfd)->e_flags);
++
++  if (flags & EF_AVR32_PIC)
++    fprintf(file, " [PIC]");
++  if (flags & EF_AVR32_LINKRELAX)
++    fprintf(file, " [linker relaxable]");
++
++  flags &= ~(EF_AVR32_PIC | EF_AVR32_LINKRELAX);
++
++  if (flags)
++    fprintf(file, _("<Unrecognized flag bits set>"));
++
++  fputc('\n', file);
++
++  return TRUE;
++}
++
++/* Set avr32-specific linker options.  */
++void bfd_elf32_avr32_set_options(struct bfd_link_info *info,
++				 int direct_data_refs)
++{
++  struct elf_avr32_link_hash_table *htab;
++
++  htab = avr32_elf_hash_table (info);
++  htab->direct_data_refs = !!direct_data_refs;
++}
++
++
++
++/* Understanding core dumps */
++
++static bfd_boolean
++avr32_elf_grok_prstatus(bfd *abfd, Elf_Internal_Note *note);
++static bfd_boolean
++avr32_elf_grok_psinfo(bfd *abfd, Elf_Internal_Note *note);
++
++static bfd_boolean
++avr32_elf_grok_prstatus(bfd *abfd, Elf_Internal_Note *note)
++{
++  /* Linux/AVR32B elf_prstatus */
++  if (note->descsz != 148)
++    return FALSE;
++
++  /* pr_cursig */
++  elf_tdata(abfd)->core_signal = bfd_get_16(abfd, note->descdata + 12);
++
++  /* pr_pid */
++  elf_tdata(abfd)->core_pid = bfd_get_32(abfd, note->descdata + 24);
++
++  /* Make a ".reg/999" section for pr_reg. The size is for 16
++     general-purpose registers, SR and r12_orig (18 * 4 = 72).  */
++  return _bfd_elfcore_make_pseudosection(abfd, ".reg", 72,
++					 note->descpos + 72);
++}
++
++static bfd_boolean
++avr32_elf_grok_psinfo(bfd *abfd, Elf_Internal_Note *note)
++{
++  /* Linux/AVR32B elf_prpsinfo */
++  if (note->descsz != 128)
++    return FALSE;
++
++  elf_tdata(abfd)->core_program
++    = _bfd_elfcore_strndup(abfd, note->descdata + 32, 16);
++  elf_tdata(abfd)->core_command
++    = _bfd_elfcore_strndup(abfd, note->descdata + 48, 80);
++
++  /* Note that for some reason, a spurious space is tacked
++     onto the end of the args in some (at least one anyway)
++     implementations, so strip it off if it exists.  */
++
++  {
++    char *command = elf_tdata (abfd)->core_command;
++    int n = strlen (command);
++
++    if (0 < n && command[n - 1] == ' ')
++      command[n - 1] = '\0';
++  }
++
++  return TRUE;
++}
++
++
++#define ELF_ARCH			bfd_arch_avr32
++#define ELF_MACHINE_CODE		EM_AVR32
++#define ELF_MAXPAGESIZE			1024
++
++#define TARGET_BIG_SYM			bfd_elf32_avr32_vec
++#define TARGET_BIG_NAME			"elf32-avr32"
++
++#define elf_backend_grok_prstatus	avr32_elf_grok_prstatus
++#define elf_backend_grok_psinfo		avr32_elf_grok_psinfo
++
++/* Only RELA relocations are used */
++#define elf_backend_may_use_rel_p	0
++#define elf_backend_may_use_rela_p	1
++#define elf_backend_default_use_rela_p	1
++#define elf_backend_rela_normal		1
++#define elf_info_to_howto_rel		NULL
++#define elf_info_to_howto		avr32_info_to_howto
++
++#define bfd_elf32_bfd_copy_private_bfd_data	avr32_elf_copy_private_bfd_data
++#define bfd_elf32_bfd_merge_private_bfd_data	avr32_elf_merge_private_bfd_data
++#define bfd_elf32_bfd_set_private_flags		avr32_elf_set_private_flags
++#define bfd_elf32_bfd_print_private_bfd_data	avr32_elf_print_private_bfd_data
++#define bfd_elf32_new_section_hook		avr32_elf_new_section_hook
++
++#define elf_backend_gc_mark_hook		avr32_elf_gc_mark_hook
++#define elf_backend_gc_sweep_hook		avr32_elf_gc_sweep_hook
++#define elf_backend_relocate_section	avr32_elf_relocate_section
++#define elf_backend_copy_indirect_symbol avr32_elf_copy_indirect_symbol
++#define elf_backend_create_dynamic_sections avr32_elf_create_dynamic_sections
++#define bfd_elf32_bfd_link_hash_table_create avr32_elf_link_hash_table_create
++#define elf_backend_adjust_dynamic_symbol avr32_elf_adjust_dynamic_symbol
++#define elf_backend_size_dynamic_sections avr32_elf_size_dynamic_sections
++#define elf_backend_finish_dynamic_symbol avr32_elf_finish_dynamic_symbol
++#define elf_backend_finish_dynamic_sections avr32_elf_finish_dynamic_sections
++
++#define bfd_elf32_bfd_relax_section	avr32_elf_relax_section
++
++/* Find out which symbols need an entry in .got. */
++#define elf_backend_check_relocs	avr32_check_relocs
++#define elf_backend_can_refcount	1
++#define elf_backend_can_gc_sections	1
++#define elf_backend_plt_readonly	1
++#define elf_backend_plt_not_loaded	1
++#define elf_backend_want_plt_sym	0
++#define elf_backend_plt_alignment	2
++#define elf_backend_want_dynbss		0
++#define elf_backend_want_got_plt	0
++#define elf_backend_want_got_sym	1
++#define elf_backend_got_header_size	AVR32_GOT_HEADER_SIZE
++
++#include "elf32-target.h"
+--- /dev/null
++++ b/bfd/elf32-avr32.h
+@@ -0,0 +1,23 @@
++/* AVR32-specific support for 32-bit ELF.
++   Copyright 2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of BFD, the Binary File Descriptor library.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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. */
++
++void bfd_elf32_avr32_set_options(struct bfd_link_info *info,
++				 int direct_data_refs);
+--- a/bfd/elf-bfd.h
++++ b/bfd/elf-bfd.h
+@@ -1503,6 +1503,10 @@ struct elf_obj_tdata
+      find_nearest_line.  */
+   struct mips_elf_find_line *find_line_info;
+ 
++  /* Used by AVR32 ELF relaxation code.  Contains an array of pointers
++     for each local symbol to the fragment where it is defined.  */
++  struct fragment **local_sym_frag;
++
+   /* A place to stash dwarf1 info for this bfd.  */
+   struct dwarf1_debug *dwarf1_find_line_info;
+ 
+--- a/bfd/Makefile.am
++++ b/bfd/Makefile.am
+@@ -73,6 +73,7 @@ ALL_MACHINES = \
+ 	cpu-arc.lo \
+ 	cpu-arm.lo \
+ 	cpu-avr.lo \
++	cpu-avr32.lo \
+ 	cpu-bfin.lo \
+ 	cpu-cr16.lo \
+ 	cpu-cr16c.lo \
+@@ -269,6 +270,7 @@ BFD32_BACKENDS = \
+ 	elf32-arc.lo \
+ 	elf32-arm.lo \
+ 	elf32-avr.lo \
++	elf32-avr32.lo \
+ 	elf32-bfin.lo \
+ 	elf32-cr16.lo \
+ 	elf32-cr16c.lo \
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -4052,6 +4052,131 @@ ENUMDOC
+   instructions
+ 
+ ENUM
++  BFD_RELOC_AVR32_DIFF32
++ENUMX
++  BFD_RELOC_AVR32_DIFF16
++ENUMX
++  BFD_RELOC_AVR32_DIFF8
++ENUMDOC
++  Difference between two labels: L2 - L1. The value of L1 is encoded
++  as sym + addend, while the initial difference after assembly is
++  inserted into the object file by the assembler.
++ENUM
++  BFD_RELOC_AVR32_GOT32
++ENUMX
++  BFD_RELOC_AVR32_GOT16
++ENUMX
++  BFD_RELOC_AVR32_GOT8
++ENUMDOC
++  Reference to a symbol through the Global Offset Table. The linker
++  will allocate an entry for symbol in the GOT and insert the offset
++  of this entry as the relocation value.
++ENUM
++  BFD_RELOC_AVR32_21S
++ENUMX
++  BFD_RELOC_AVR32_16U
++ENUMX
++  BFD_RELOC_AVR32_16S
++ENUMX
++  BFD_RELOC_AVR32_SUB5
++ENUMX
++  BFD_RELOC_AVR32_8S_EXT
++ENUMX
++  BFD_RELOC_AVR32_8S
++ENUMX
++  BFD_RELOC_AVR32_15S
++ENUMDOC
++  Normal (non-pc-relative) code relocations. Alignment and signedness
++  is indicated by the suffixes. S means signed, U means unsigned. W
++  means word-aligned, H means halfword-aligned, neither means
++  byte-aligned (no alignment.) SUB5 is the same relocation as 16S.
++ENUM
++  BFD_RELOC_AVR32_22H_PCREL
++ENUMX
++  BFD_RELOC_AVR32_18W_PCREL
++ENUMX
++  BFD_RELOC_AVR32_16B_PCREL
++ENUMX
++  BFD_RELOC_AVR32_16N_PCREL
++ENUMX
++  BFD_RELOC_AVR32_14UW_PCREL
++ENUMX
++  BFD_RELOC_AVR32_11H_PCREL
++ENUMX
++  BFD_RELOC_AVR32_10UW_PCREL
++ENUMX
++  BFD_RELOC_AVR32_9H_PCREL
++ENUMX
++  BFD_RELOC_AVR32_9UW_PCREL
++ENUMDOC
++  PC-relative relocations are signed if neither 'U' nor 'S' is
++  specified. However, we explicitly tack on a 'B' to indicate no
++  alignment, to avoid confusion with data relocs. All of these resolve
++  to sym + addend - offset, except the one with 'N' (negated) suffix.
++  This particular one resolves to offset - sym - addend.
++ENUM
++  BFD_RELOC_AVR32_GOTPC
++ENUMDOC
++  Subtract the link-time address of the GOT from (symbol + addend)
++  and insert the result.
++ENUM
++  BFD_RELOC_AVR32_GOTCALL
++ENUMX
++  BFD_RELOC_AVR32_LDA_GOT
++ENUMX
++  BFD_RELOC_AVR32_GOT21S
++ENUMX
++  BFD_RELOC_AVR32_GOT18SW
++ENUMX
++  BFD_RELOC_AVR32_GOT16S
++ENUMDOC
++  Reference to a symbol through the GOT. The linker will allocate an
++  entry for symbol in the GOT and insert the offset of this entry as
++  the relocation value. addend must be zero. As usual, 'S' means
++  signed, 'W' means word-aligned, etc.
++ENUM
++  BFD_RELOC_AVR32_32_CPENT
++ENUMDOC
++  32-bit constant pool entry. I don't think 8- and 16-bit entries make
++  a whole lot of sense.
++ENUM
++  BFD_RELOC_AVR32_CPCALL
++ENUMX
++  BFD_RELOC_AVR32_16_CP
++ENUMX
++  BFD_RELOC_AVR32_9W_CP
++ENUMDOC
++  Constant pool references. Some of these relocations are signed,
++  others are unsigned. It doesn't really matter, since the constant
++  pool always comes after the code that references it.
++ENUM
++  BFD_RELOC_AVR32_ALIGN
++ENUMDOC
++  sym must be the absolute symbol. The addend specifies the alignment
++  order, e.g. if addend is 2, the linker must add padding so that the
++  next address is aligned to a 4-byte boundary.
++ENUM
++  BFD_RELOC_AVR32_14UW
++ENUMX
++  BFD_RELOC_AVR32_10UW
++ENUMX
++  BFD_RELOC_AVR32_10SW
++ENUMX
++  BFD_RELOC_AVR32_STHH_W
++ENUMX
++  BFD_RELOC_AVR32_7UW
++ENUMX
++  BFD_RELOC_AVR32_6S
++ENUMX
++  BFD_RELOC_AVR32_6UW
++ENUMX
++  BFD_RELOC_AVR32_4UH
++ENUMX
++  BFD_RELOC_AVR32_3U
++ENUMDOC
++  Code relocations that will never make it to the output file.
++
++ENUM
+   BFD_RELOC_390_12
+ ENUMDOC
+    Direct 12 bit.
+--- a/bfd/targets.c
++++ b/bfd/targets.c
+@@ -568,6 +568,7 @@ extern const bfd_target b_out_vec_big_ho
+ extern const bfd_target b_out_vec_little_host;
+ extern const bfd_target bfd_pei_ia64_vec;
+ extern const bfd_target bfd_elf32_avr_vec;
++extern const bfd_target bfd_elf32_avr32_vec;
+ extern const bfd_target bfd_elf32_bfin_vec;
+ extern const bfd_target bfd_elf32_bfinfdpic_vec;
+ extern const bfd_target bfd_elf32_big_generic_vec;
+@@ -896,6 +897,7 @@ static const bfd_target * const _bfd_tar
+ 	&bfd_pei_ia64_vec,
+ #endif
+ 	&bfd_elf32_avr_vec,
++	&bfd_elf32_avr32_vec,
+ 	&bfd_elf32_bfin_vec,
+ 	&bfd_elf32_bfinfdpic_vec,
+ 
+--- a/binutils/doc/binutils.info
++++ b/binutils/doc/binutils.info
+@@ -1665,6 +1665,10 @@ equivalent.  At least one option from th
+      useful when attempting to disassemble thumb code produced by other
+      compilers.
+ 
++     For the AVR32 architectures that support Floating point unit (FPU),
++     specifying '-M decode-fpu' will enable disassembler to print the 
++     floating point instruction instead of 'cop' instructions.
++
+      For the x86, some of the options duplicate functions of the `-m'
+      switch, but allow finer grained control.  Multiple selections from
+      the following may be specified as a comma separated string.
+--- a/binutils/doc/binutils.texi
++++ b/binutils/doc/binutils.texi
+@@ -1935,6 +1935,10 @@ using the switch @option{--disassembler-
+ useful when attempting to disassemble thumb code produced by other
+ compilers.
+ 
++For the AVR32 architectures that support Floating point unit (FPU), 
++specifying @option{-M decode-fpu} will enable disassembler to print the
++floating point instructions instead of 'cop' instructions. 
++
+ For the x86, some of the options duplicate functions of the @option{-m}
+ switch, but allow finer grained control.  Multiple selections from the
+ following may be specified as a comma separated string.
+--- a/binutils/doc/objdump.1
++++ b/binutils/doc/objdump.1
+@@ -425,6 +425,10 @@ using the switch \fB\-\-disassembler\-op
+ useful when attempting to disassemble thumb code produced by other
+ compilers.
+ .Sp
++For the \s-1AVR32\s0 architectures that support Floating point unit (FPU),
++specifying \fB\-M decode\-fpu\fR will enable disassembler to print the
++floating point instructions instead of 'cop' instructions.
++.Sp
+ For the x86, some of the options duplicate functions of the \fB\-m\fR
+ switch, but allow finer grained control.  Multiple selections from the
+ following may be specified as a comma separated string.
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -94,6 +94,7 @@
+ #include "elf/arc.h"
+ #include "elf/arm.h"
+ #include "elf/avr.h"
++#include "elf/avr32.h"
+ #include "elf/bfin.h"
+ #include "elf/cr16.h"
+ #include "elf/cris.h"
+@@ -570,6 +571,7 @@ guess_is_rela (unsigned int e_machine)
+     case EM_ALPHA:
+     case EM_ALTERA_NIOS2:
+     case EM_AVR:
++    case EM_AVR32:
+     case EM_AVR_OLD:
+     case EM_BLACKFIN:
+     case EM_CR16:
+@@ -1020,6 +1022,10 @@ dump_relocations (FILE * file,
+ 	  rtype = elf_avr_reloc_type (type);
+ 	  break;
+ 
++	case EM_AVR32:
++	  rtype = elf_avr32_reloc_type (type);
++	  break;
++
+ 	case EM_OLD_SPARCV9:
+ 	case EM_SPARC32PLUS:
+ 	case EM_SPARCV9:
+@@ -1853,6 +1859,7 @@ get_machine_name (unsigned e_machine)
+     case EM_VAX:		return "Digital VAX";
+     case EM_AVR_OLD:
+     case EM_AVR:		return "Atmel AVR 8-bit microcontroller";
++    case EM_AVR32:		return "Atmel AVR32 32-bit microprocessor";
+     case EM_CRIS:		return "Axis Communications 32-bit embedded processor";
+     case EM_JAVELIN:		return "Infineon Technologies 32-bit embedded cpu";
+     case EM_FIREPATH:		return "Element 14 64-bit DSP processor";
+--- a/gas/as.c
++++ b/gas/as.c
+@@ -445,10 +445,10 @@ parse_args (int * pargc, char *** pargv)
+        the end of the preceeding line so that it is simpler to
+        selectively add and remove lines from this list.  */
+     {"alternate", no_argument, NULL, OPTION_ALTERNATE}
+-    /* The entry for "a" is here to prevent getopt_long_only() from
+-       considering that -a is an abbreviation for --alternate.  This is
+-       necessary because -a=<FILE> is a valid switch but getopt would
+-       normally reject it since --alternate does not take an argument.  */
++    /* The next two entries are here to prevent getopt_long_only() from
++       considering that -a or -al is an abbreviation for --alternate.
++       This is necessary because -a=<FILE> is a valid switch but getopt
++       would normally reject it since --alternate does not take an argument.  */
+     ,{"a", optional_argument, NULL, 'a'}
+     /* Handle -al=<FILE>.  */
+     ,{"al", optional_argument, NULL, OPTION_AL}
+@@ -811,8 +811,15 @@ This program has absolutely no warranty.
+ 	case 'a':
+ 	  if (optarg)
+ 	    {
+-	      if (optarg != old_argv[optind] && optarg[-1] == '=')
++	      /* If optarg is part of the -a switch and not a separate argument
++		 in its own right, then scan backwards to the just after the -a.
++		 This means skipping over both '=' and 'l' which might have been
++		 taken to be part of the -a switch itself.  */
++	      if (optarg != old_argv[optind])
++		{
++		  while (optarg[-1] == '=' || optarg[-1] == 'l')
+ 		--optarg;
++		}
+ 
+ 	      if (md_parse_option (optc, optarg) != 0)
+ 		break;
+@@ -1245,7 +1252,7 @@ main (int argc, char ** argv)
+     keep_it = 0;
+ 
+   if (!keep_it)
+-    unlink_if_ordinary (out_file_name);
++    unlink (out_file_name);
+ 
+   input_scrub_end ();
+ 
+--- a/gas/as.h
++++ b/gas/as.h
+@@ -110,6 +110,7 @@ typedef int * va_list;
+ #endif
+ #define gas_assert(P) \
+   ((void) ((P) ? 0 : (as_assert (__FILE__, __LINE__, __PRETTY_FUNCTION__), 0)))
++#define assert(P)   gas_assert(P)
+ #undef abort
+ #define abort()		as_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
+ 
+--- a/gas/atof-generic.c
++++ b/gas/atof-generic.c
+@@ -121,6 +121,21 @@ atof_generic (/* return pointer to just
+ 
+   switch (first_digit[0])
+     {
++    case 's':
++    case 'S':
++    case 'q':
++    case 'Q':
++      if (!strncasecmp ("nan", first_digit+1, 3))
++	{
++	  address_of_generic_floating_point_number->sign = 0;
++	  address_of_generic_floating_point_number->exponent = 0;
++	  address_of_generic_floating_point_number->leader =
++	    address_of_generic_floating_point_number->low;
++	  *address_of_string_pointer = first_digit + 4;
++	  return 0;
++	}
++      break;
++
+     case 'n':
+     case 'N':
+       if (!strncasecmp ("nan", first_digit, 3))
+--- a/gas/config/atof-vax.c
++++ b/gas/config/atof-vax.c
+@@ -268,9 +268,27 @@ flonum_gen2vax (int format_letter,	/* On
+ 	  int exponent_skippage;
+ 	  LITTLENUM_TYPE word1;
+ 
+-	  /* JF: Deal with new Nan, +Inf and -Inf codes.  */
++    	  /* JF: Deal with new +/-(q/Q/s/S)Nan, +Inf and -Inf codes.  */
+ 	  if (f->sign != '-' && f->sign != '+')
+ 	    {
++          if (f->sign == 0)
++            {
++              /* All NaNs are 0.  */
++              memset (words, 0x00, sizeof (LITTLENUM_TYPE) * precision);
++            }
++          else if (f->sign == 'P')
++            {
++              /* Positive Infinity.  */
++              memset (words, 0xff, sizeof (LITTLENUM_TYPE) * precision);
++              words[0] &= 0x7fff;
++            }
++          else if (f->sign == 'N')
++            {
++              /* Negative Infinity.  */
++              memset (words, 0x00, sizeof (LITTLENUM_TYPE) * precision);
++              words[0] = 0x0080;
++            }
++          else
+ 	      make_invalid_floating_point_number (words);
+ 	      return return_value;
+ 	    }
+--- /dev/null
++++ b/gas/config/tc-avr32.c
+@@ -0,0 +1,4839 @@
++/* Assembler implementation for AVR32.
++   Copyright 2003,2004,2005,2006,2007,2008,2009,2010 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of GAS, the GNU Assembler.
++
++   GAS is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   GAS is distributed in the hope that 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 GAS; see the file COPYING.  If not, write to the Free
++   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
++   02111-1307, USA.  */
++
++#include <stdio.h>
++#include "as.h"
++#include "safe-ctype.h"
++#include "subsegs.h"
++#include "symcat.h"
++#include "opcodes/avr32-opc.h"
++#include "opcodes/avr32-asm.h"
++#include "elf/avr32.h"
++#include "dwarf2dbg.h"
++
++#define xDEBUG
++#define xOPC_CONSISTENCY_CHECK
++
++#ifdef DEBUG
++# define pr_debug(fmt, args...) fprintf(stderr, fmt, ##args)
++#else
++# define pr_debug(fmt, args...)
++#endif
++
++/* 3 MSB of instruction word indicate group. Group 7 -> extended */
++#define AVR32_COMPACT_P(opcode) ((opcode[0] & 0xe0) != 0xe0)
++
++#define streq(a, b)		(strcmp(a, b) == 0)
++#define skip_whitespace(str)	do { while(*(str) == ' ') ++(str); } while(0)
++
++/* Flags given on the command line */
++static int avr32_pic	= FALSE;
++int linkrelax	= FALSE;
++int avr32_iarcompat	= FALSE;
++
++/* This array holds the chars that always start a comment. */
++const char comment_chars[]		= "#";
++
++/* This array holds the chars that only start a comment at the
++   beginning of a line.  We must include '#' here because the compiler
++   may produce #APP and #NO_APP in its output.  */
++const char line_comment_chars[]		= "#";
++
++/* These may be used instead of newline (same as ';' in C).  */
++const char line_separator_chars[]	= ";";
++
++/* Chars that can be used to separate mantissa from exponent in
++   floating point numbers.  */
++const char EXP_CHARS[]			= "eE";
++
++/* Chars that mean this number is a floating point constant.  */
++const char FLT_CHARS[]			= "dD";
++
++/* Pre-defined "_GLOBAL_OFFSET_TABLE_"  */
++symbolS *GOT_symbol;
++
++static struct hash_control *avr32_mnemonic_htab;
++
++struct avr32_ifield_data
++{
++  bfd_vma value;
++  /* FIXME: Get rid of align_order and complain. complain is never
++     used, align_order is used in one place.  Try to use the relax
++     table instead.  */
++  unsigned int align_order;
++};
++
++struct avr32_insn
++{
++  const struct avr32_syntax *syntax;
++  expressionS immediate;
++  int pcrel;
++  int force_extended;
++  unsigned int next_slot;
++  bfd_reloc_code_real_type r_type;
++  struct avr32_ifield_data field_value[AVR32_MAX_FIELDS];
++};
++
++static struct avr32_insn current_insn;
++
++/* The target specific pseudo-ops we support. */
++static void s_rseg (int);
++static void s_cpool(int);
++
++const pseudo_typeS md_pseudo_table[] =
++{
++  /* Make sure that .word is 32 bits */
++  { "word", cons, 4 },
++  { "file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
++  { "loc", dwarf2_directive_loc, 0 },
++
++  /* .lcomm requires an explicit alignment parameter */
++  { "lcomm", s_lcomm, 1 },
++
++  /* AVR32-specific pseudo-ops */
++  { "cpool", s_cpool, 0},
++
++  /* IAR compatible pseudo-ops */
++  { "program", s_ignore, 0 },
++  { "public", s_globl, 0 },
++  { "extern", s_ignore, 0 },
++  { "module", s_ignore, 0 },
++  { "rseg", s_rseg, 0 },
++  { "dc8", cons, 1 },
++  { "dc16", cons, 2 },
++  { "dc32", cons, 4 },
++
++  { NULL, NULL, 0 }
++};
++
++/* Questionable stuff starts here */
++
++enum avr32_opinfo {
++  AVR32_OPINFO_NONE = BFD_RELOC_NONE,
++  AVR32_OPINFO_GOT,
++  AVR32_OPINFO_TLSGD,
++  AVR32_OPINFO_HI,
++  AVR32_OPINFO_LO,
++};
++
++enum avr32_arch {
++  ARCH_TYPE_AP,
++  ARCH_TYPE_UCR1,
++  ARCH_TYPE_UCR2,
++  ARCH_TYPE_UCR3,
++  ARCH_TYPE_UCR3FP
++};
++
++struct arch_type_s
++{
++  /* Architecture name */
++  char *name;
++  /* Instruction Set Architecture Flags */
++  unsigned long isa_flags;
++};
++
++struct part_type_s
++{
++  /* Part name */
++  char *name;
++  /* Architecture type */
++  unsigned int arch;
++};
++
++static struct arch_type_s arch_types[] =
++{
++    {"ap", AVR32_V1 | AVR32_SIMD | AVR32_DSP | AVR32_PICO},
++    {"ucr1", AVR32_V1 | AVR32_DSP | AVR32_RMW},
++    {"ucr2", AVR32_V1 | AVR32_V2 | AVR32_DSP | AVR32_RMW},
++    {"ucr3", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_DSP | AVR32_RMW},
++    {"ucr3fp", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_DSP | AVR32_RMW | AVR32_V3FP},
++    {"all-insn", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_SIMD | AVR32_DSP | AVR32_RMW | AVR32_V3FP | AVR32_PICO},
++    {NULL, 0}
++};
++
++static struct part_type_s part_types[] =
++{
++    {"ap7000",        ARCH_TYPE_AP},
++    {"ap7001",        ARCH_TYPE_AP},
++    {"ap7002",        ARCH_TYPE_AP},
++    {"ap7200",        ARCH_TYPE_AP},
++    {"uc3a0128",      ARCH_TYPE_UCR2},
++    {"uc3a0256",      ARCH_TYPE_UCR2},
++    {"uc3a0512es",    ARCH_TYPE_UCR1},
++    {"uc3a0512",      ARCH_TYPE_UCR2},
++    {"uc3a1128",      ARCH_TYPE_UCR2},
++    {"uc3a1256es",    ARCH_TYPE_UCR1},
++    {"uc3a1256",      ARCH_TYPE_UCR2},
++    {"uc3a1512es",    ARCH_TYPE_UCR1},
++    {"uc3a1512",      ARCH_TYPE_UCR2},
++    {"uc3a364",       ARCH_TYPE_UCR2},
++    {"uc3a364s",      ARCH_TYPE_UCR2},
++    {"uc3a3128",      ARCH_TYPE_UCR2},
++    {"uc3a3128s",     ARCH_TYPE_UCR2},
++    {"uc3a3256",      ARCH_TYPE_UCR2},
++    {"uc3a3256s",     ARCH_TYPE_UCR2},
++    {"uc3b064",       ARCH_TYPE_UCR1},
++    {"uc3b0128",      ARCH_TYPE_UCR1},
++    {"uc3b0256es",    ARCH_TYPE_UCR1},
++    {"uc3b0256",      ARCH_TYPE_UCR1},
++    {"uc3b0512",      ARCH_TYPE_UCR2},
++    {"uc3b0512revc",  ARCH_TYPE_UCR2},
++    {"uc3b164",       ARCH_TYPE_UCR1},
++    {"uc3b1128",      ARCH_TYPE_UCR1},
++    {"uc3b1256",      ARCH_TYPE_UCR1},
++    {"uc3b1256es",    ARCH_TYPE_UCR1},
++    {"uc3b1512",      ARCH_TYPE_UCR2},
++    {"uc3b1512revc",  ARCH_TYPE_UCR2},
++    {"uc3c0512crevc", ARCH_TYPE_UCR3},
++    {"uc3c1512crevc", ARCH_TYPE_UCR3},
++    {"uc3c2512crevc", ARCH_TYPE_UCR3},
++    {"atuc3l0256",    ARCH_TYPE_UCR3},
++    {"mxt768e",       ARCH_TYPE_UCR3},
++    {"uc3l064",       ARCH_TYPE_UCR3},
++    {"uc3l032",       ARCH_TYPE_UCR3},
++    {"uc3l016",       ARCH_TYPE_UCR3},
++    {"uc3l064revb",   ARCH_TYPE_UCR3},
++    {"uc3c064c",  ARCH_TYPE_UCR3FP},
++    {"uc3c0128c",   ARCH_TYPE_UCR3FP},
++    {"uc3c0256c",   ARCH_TYPE_UCR3FP},
++    {"uc3c0512c",   ARCH_TYPE_UCR3FP},
++    {"uc3c164c",  ARCH_TYPE_UCR3FP},
++    {"uc3c1128c",   ARCH_TYPE_UCR3FP},
++    {"uc3c1256c",   ARCH_TYPE_UCR3FP},
++    {"uc3c1512c",   ARCH_TYPE_UCR3FP},
++    {"uc3c264c",  ARCH_TYPE_UCR3FP},
++    {"uc3c2128c",   ARCH_TYPE_UCR3FP},
++    {"uc3c2256c",   ARCH_TYPE_UCR3FP},
++    {"uc3c2512c",   ARCH_TYPE_UCR3FP},
++    {NULL, 0}
++};
++
++/* Current architecture type.  */
++static struct arch_type_s default_arch = {"all-insn", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_SIMD | AVR32_DSP | AVR32_RMW | AVR32_V3FP | AVR32_PICO };
++static struct arch_type_s *avr32_arch = &default_arch;
++
++/* Display nicely formatted list of known part- and architecture names.  */
++
++static void
++show_arch_list (FILE *stream)
++{
++  int i, x;
++
++  fprintf (stream, _("Architectures supported by the assembler:"));
++  x = 1000;
++
++  for (i = 0; arch_types[i].name; i++)
++    {
++      int len = strlen (arch_types[i].name);
++
++      x += len + 1;
++
++      if (x < 75)
++	fprintf (stream, " %s", arch_types[i].name);
++      else
++	{
++	  fprintf (stream, "\n  %s", arch_types[i].name);
++	  x = len + 2;
++	}
++    }
++
++  fprintf (stream, "\n");
++}
++
++static void
++show_part_list (FILE *stream)
++{
++  int i, x;
++
++  fprintf (stream, _("Known part names:"));
++  x = 1000;
++
++  for (i = 0; part_types[i].name; i++)
++    {
++      int len = strlen(part_types[i].name);
++
++      x += len + 1;
++
++      if (x < 75)
++	fprintf (stream, " %s", part_types[i].name);
++      else
++	{
++	  fprintf(stream, "\n  %s", part_types[i].name);
++	  x = len + 2;
++	}
++    }
++
++  fprintf (stream, "\n");
++}
++
++const char *md_shortopts = "";
++struct option md_longopts[] =
++{
++#define OPTION_ARCH		(OPTION_MD_BASE)
++#define OPTION_PART		(OPTION_ARCH + 1)
++#define OPTION_IAR		(OPTION_PART + 1)
++#define OPTION_PIC		(OPTION_IAR + 1)
++#define OPTION_NOPIC		(OPTION_PIC + 1)
++#define OPTION_LINKRELAX	(OPTION_NOPIC + 1)
++#define OPTION_NOLINKRELAX	(OPTION_LINKRELAX + 1)
++#define OPTION_DIRECT_DATA_REFS (OPTION_NOLINKRELAX + 1)
++  {"march",		required_argument, NULL, OPTION_ARCH},
++  {"mpart",		required_argument, NULL, OPTION_PART},
++  {"iar",		no_argument, NULL, OPTION_IAR},
++  {"pic",		no_argument, NULL, OPTION_PIC},
++  {"no-pic",		no_argument, NULL, OPTION_NOPIC},
++  {"linkrelax",		no_argument, NULL, OPTION_LINKRELAX},
++  {"no-linkrelax",	no_argument, NULL, OPTION_NOLINKRELAX},
++  /* deprecated alias for -mpart=xxx */
++  {"mcpu",		required_argument, NULL, OPTION_PART},
++  {NULL,		no_argument, NULL, 0}
++};
++
++size_t md_longopts_size = sizeof (md_longopts);
++
++void
++md_show_usage (FILE *stream)
++{
++  fprintf (stream, _("\
++AVR32 options:\n\
++  -march=[arch-name]      Select cpu architecture. [Default `all-insn']\n\
++  -mpart=[part-name]      Select specific part. [Default `none']\n\
++  --pic                   Produce Position-Independent Code\n\
++  --no-pic                Don't produce Position-Independent Code\n\
++  --linkrelax             Produce output suitable for linker relaxing\n\
++  --no-linkrelax          Don't produce output suitable for linker relaxing\n"));
++  show_arch_list(stream);
++}
++
++int
++md_parse_option (int c, char *arg ATTRIBUTE_UNUSED)
++{
++  switch (c)
++    {
++    case OPTION_ARCH:
++      {
++	int i;
++	char *s = alloca (strlen (arg) + 1);
++
++	{
++	  char *t = s;
++	  char *arg1 = arg;
++
++	  do
++	    *t = TOLOWER (*arg1++);
++	  while (*t++);
++	}
++
++        /* Add backward compability */
++        if (strcmp ("uc", s)== 0)
++          {
++            as_warn("Deprecated arch `%s' specified. "
++                    "Please use '-march=ucr1' instead. "
++                    "Using to arch 'ucr1'\n",
++                     s);
++            s="ucr1";
++          }
++
++	for (i = 0; arch_types[i].name; ++i)
++	  if (strcmp (arch_types[i].name, s) == 0)
++	    break;
++
++	if (!arch_types[i].name)
++	  {
++	    show_arch_list (stderr);
++	    as_fatal (_("unknown architecture: %s\n"), arg);
++	  }
++
++        avr32_arch = &arch_types[i];
++	break;
++      }
++    case OPTION_PART:
++      {
++	int i;
++	char *s = alloca (strlen (arg) + 1);
++	char *t = s;
++	char *p = arg;
++
++	/* If arch type has already been set, don't bother.
++	   -march= always overrides -mpart=  */
++	if (avr32_arch != &default_arch)
++	  break;
++
++	do
++	  *t = TOLOWER (*p++);
++	while (*t++);
++
++	for (i = 0; part_types[i].name; ++i)
++	  if (strcmp (part_types[i].name, s) == 0)
++	    break;
++
++	if (!part_types[i].name)
++	  {
++	    show_part_list (stderr);
++	    as_fatal (_("unknown part: %s\n"), arg);
++	  }
++
++	avr32_arch = &arch_types[part_types[i].arch];
++	break;
++      }
++    case OPTION_IAR:
++      avr32_iarcompat = 1;
++      break;
++    case OPTION_PIC:
++      avr32_pic = 1;
++      break;
++    case OPTION_NOPIC:
++      avr32_pic = 0;
++      break;
++    case OPTION_LINKRELAX:
++      linkrelax = 1;
++      break;
++    case OPTION_NOLINKRELAX:
++      linkrelax = 0;
++      break;
++    default:
++      return 0;
++    }
++  return 1;
++}
++
++/* Can't use symbol_new here, so have to create a symbol and then at
++   a later date assign it a value. Thats what these functions do.
++
++   Shamelessly stolen from ARM.  */
++
++static void
++symbol_locate (symbolS *    symbolP,
++	       const char * name,	/* It is copied, the caller can modify.  */
++	       segT         segment,	/* Segment identifier (SEG_<something>).  */
++	       valueT       valu,	/* Symbol value.  */
++	       fragS *      frag)	/* Associated fragment.  */
++{
++  unsigned int name_length;
++  char * preserved_copy_of_name;
++
++  name_length = strlen (name) + 1;   /* +1 for \0.  */
++  obstack_grow (&notes, name, name_length);
++  preserved_copy_of_name = obstack_finish (&notes);
++#ifdef STRIP_UNDERSCORE
++  if (preserved_copy_of_name[0] == '_')
++    preserved_copy_of_name++;
++#endif
++
++#ifdef tc_canonicalize_symbol_name
++  preserved_copy_of_name =
++    tc_canonicalize_symbol_name (preserved_copy_of_name);
++#endif
++
++  S_SET_NAME (symbolP, preserved_copy_of_name);
++
++  S_SET_SEGMENT (symbolP, segment);
++  S_SET_VALUE (symbolP, valu);
++  symbol_clear_list_pointers (symbolP);
++
++  symbol_set_frag (symbolP, frag);
++
++  /* Link to end of symbol chain.  */
++  {
++    extern int symbol_table_frozen;
++
++    if (symbol_table_frozen)
++      abort ();
++  }
++
++  symbol_append (symbolP, symbol_lastP, & symbol_rootP, & symbol_lastP);
++
++  obj_symbol_new_hook (symbolP);
++
++#ifdef tc_symbol_new_hook
++  tc_symbol_new_hook (symbolP);
++#endif
++
++#ifdef DEBUG_SYMS
++  verify_symbol_chain (symbol_rootP, symbol_lastP);
++#endif /* DEBUG_SYMS  */
++}
++
++struct cpool_entry
++{
++  int			refcount;
++  offsetT		offset;
++  expressionS		exp;
++};
++
++struct cpool
++{
++  struct cpool		*next;
++  int			used;
++  struct cpool_entry	*literals;
++  unsigned int		padding;
++  unsigned int		next_free_entry;
++  unsigned int		id;
++  symbolS		*symbol;
++  segT			section;
++  subsegT		sub_section;
++};
++
++struct cpool *cpool_list = NULL;
++
++static struct cpool *
++find_cpool(segT section, subsegT sub_section)
++{
++  struct cpool *pool;
++
++  for (pool = cpool_list; pool != NULL; pool = pool->next)
++    {
++      if (!pool->used
++	  && pool->section == section
++	  && pool->sub_section == sub_section)
++	break;
++    }
++
++  return pool;
++}
++
++static struct cpool *
++find_or_make_cpool(segT section, subsegT sub_section)
++{
++  static unsigned int next_cpool_id = 0;
++  struct cpool *pool;
++
++  pool = find_cpool(section, sub_section);
++
++  if (!pool)
++    {
++      pool = xmalloc(sizeof(*pool));
++      if (!pool)
++	return NULL;
++
++      pool->used = 0;
++      pool->literals = NULL;
++      pool->padding = 0;
++      pool->next_free_entry = 0;
++      pool->section = section;
++      pool->sub_section = sub_section;
++      pool->next = cpool_list;
++      pool->symbol = NULL;
++
++      cpool_list = pool;
++    }
++
++  /* NULL symbol means that the pool is new or has just been emptied.  */
++  if (!pool->symbol)
++    {
++      pool->symbol = symbol_create(FAKE_LABEL_NAME, undefined_section,
++				   0, &zero_address_frag);
++      pool->id = next_cpool_id++;
++    }
++
++  return pool;
++}
++
++static struct cpool *
++add_to_cpool(expressionS *exp, unsigned int *index, int ref)
++{
++  struct cpool *pool;
++  unsigned int entry;
++
++  pool = find_or_make_cpool(now_seg, now_subseg);
++
++  /* Check if this constant is already in the pool.  */
++  for (entry = 0; entry < pool->next_free_entry; entry++)
++    {
++      if ((pool->literals[entry].exp.X_op == exp->X_op)
++	  && (exp->X_op == O_constant)
++	  && (pool->literals[entry].exp.X_add_number
++	      == exp->X_add_number)
++	  && (pool->literals[entry].exp.X_unsigned
++	      == exp->X_unsigned))
++	break;
++
++      if ((pool->literals[entry].exp.X_op == exp->X_op)
++	  && (exp->X_op == O_symbol)
++	  && (pool->literals[entry].exp.X_add_number
++	      == exp->X_add_number)
++	  && (pool->literals[entry].exp.X_add_symbol
++	      == exp->X_add_symbol)
++	  && (pool->literals[entry].exp.X_op_symbol
++	      == exp->X_op_symbol))
++	break;
++    }
++
++  /* Create an entry if we didn't find a match */
++  if (entry == pool->next_free_entry)
++    {
++      pool->literals = xrealloc(pool->literals,
++				sizeof(struct cpool_entry) * (entry + 1));
++      pool->literals[entry].exp = *exp;
++      pool->literals[entry].refcount = 0;
++      pool->next_free_entry++;
++    }
++
++  if (index)
++    *index = entry;
++  if (ref)
++    pool->literals[entry].refcount++;
++
++  return pool;
++}
++
++struct avr32_operand
++{
++  int id;
++  int is_signed;
++  int is_pcrel;
++  int align_order;
++  int (*match)(char *str);
++  void (*parse)(const struct avr32_operand *op, char *str, int opindex);
++};
++
++static int
++match_anything(char *str ATTRIBUTE_UNUSED)
++{
++  return 1;
++}
++
++static int
++match_intreg(char *str)
++{
++  int regid, ret = 1;
++
++  regid = avr32_parse_intreg(str);
++  if (regid < 0)
++    ret = 0;
++
++  pr_debug("match_intreg: `%s': %d\n", str, ret);
++
++  return ret;
++}
++
++static int
++match_intreg_predec(char *str)
++{
++  int regid;
++
++  if (str[0] != '-' || str[1] != '-')
++    return 0;
++
++  regid = avr32_parse_intreg(str + 2);
++  if (regid < 0)
++    return 0;
++
++  return 1;
++}
++
++static int
++match_intreg_postinc(char *str)
++{
++  int regid, ret = 1;
++  char *p, c;
++
++  for (p = str; *p; p++)
++    if (*p == '+')
++      break;
++
++  if (p[0] != '+' || p[1] != '+')
++    return 0;
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  if (regid < 0)
++    ret = 0;
++
++  *p = c;
++  return ret;
++}
++
++static int
++match_intreg_lsl(char *str)
++{
++  int regid, ret = 1;
++  char *p, c;
++
++  for (p = str; *p; p++)
++    if (*p == '<')
++      break;
++
++  if (p[0] && p[1] != '<')
++    return 0;
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  if (regid < 0)
++    ret = 0;
++
++  *p = c;
++  return ret;
++}
++
++static int
++match_intreg_lsr(char *str)
++{
++  int regid, ret = 1;
++  char *p, c;
++
++  for (p = str; *p; p++)
++    if (*p == '>')
++      break;
++
++  if (p[0] && p[1] != '>')
++    return 0;
++
++  c = *p, *p = 0;
++
++  regid = avr32_parse_intreg(str);
++  if (regid < 0)
++    ret = 0;
++
++  *p = c;
++  return ret;
++}
++
++static int
++match_intreg_part(char *str)
++{
++  int regid, ret = 1;
++  char *p, c;
++
++  for (p = str; *p; p++)
++    if (*p == ':')
++      break;
++
++  if (p[0] != ':' || !ISPRINT(p[1]) || p[2] != '\0')
++    return 0;
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  if (regid < 0)
++    ret = 0;
++
++  *p = c;
++
++  return ret;
++}
++
++#define match_intreg_disp match_anything
++
++static int
++match_intreg_index(char *str)
++{
++  int regid, ret = 1;
++  char *p, *end, c;
++
++  for (p = str; *p; p++)
++    if (*p == '[')
++      break;
++
++  /* don't allow empty displacement here (it makes no sense) */
++  if (p[0] != '[')
++    return 0;
++
++  for (end = p + 1; *end; end++) ;
++  if (*(--end) != ']')
++    return 0;
++
++  c = *end, *end = 0;
++  if (!match_intreg_lsl(p + 1))
++    ret = 0;
++  *end = c;
++
++  if (ret)
++    {
++      c = *p, *p = 0;
++      regid = avr32_parse_intreg(str);
++      if (regid < 0)
++	ret = 0;
++      *p = c;
++    }
++
++  return ret;
++}
++
++static int
++match_intreg_xindex(char *str)
++{
++  int regid, ret = 1;
++  char *p, *end, c;
++
++  for (p = str; *p; p++)
++    if (*p == '[')
++      break;
++
++  /* empty displacement makes no sense here either */
++  if (p[0] != '[')
++    return 0;
++
++  for (end = p + 1; *end; end++)
++    if (*end == '<')
++      break;
++
++  if (!streq(end, "<<2]"))
++    return 0;
++
++  c = *end, *end = 0;
++  if (!match_intreg_part(p + 1))
++    ret = 0;
++  *end = c;
++
++  if (ret)
++    {
++      c = *p, *p = 0;
++      regid = avr32_parse_intreg(str);
++      if (regid < 0)
++	ret = 0;
++      *p = c;
++    }
++
++  return ret;
++}
++
++/* The PC_UDISP_W operator may show up as a label or as a pc[disp]
++   expression.  So there's no point in attempting to match this...  */
++#define match_pc_disp	match_anything
++
++static int
++match_sp(char *str)
++{
++  /* SP in any form will do */
++  return avr32_parse_intreg(str) == AVR32_REG_SP;
++}
++
++static int
++match_sp_disp(char *str)
++{
++  int regid, ret = 1;
++  char *p, c;
++
++  for (p = str; *p; p++)
++    if (*p == '[')
++      break;
++
++  /* allow empty displacement, meaning zero */
++  if (p[0] == '[')
++    {
++      char *end;
++      for (end = p + 1; *end; end++) ;
++      if (end[-1] != ']')
++	return 0;
++    }
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  if (regid != AVR32_REG_SP)
++    ret = 0;
++
++  *p = c;
++  return ret;
++}
++
++static int
++match_cpno(char *str)
++{
++  if (strncasecmp(str, "cp", 2) != 0)
++    return 0;
++  return 1;
++}
++
++static int
++match_cpreg(char *str)
++{
++  if (strncasecmp(str, "cr", 2) != 0)
++    return 0;
++  return 1;
++}
++
++/* We allow complex expressions, and register names may show up as
++   symbols.  Just make sure immediate expressions are always matched
++   last.  */
++#define match_const		match_anything
++#define match_jmplabel		match_anything
++#define match_number		match_anything
++
++/* Mnemonics that take reglists never accept anything else */
++#define match_reglist8		match_anything
++#define match_reglist9		match_anything
++#define match_reglist16		match_anything
++#define match_reglist_ldm	match_anything
++#define match_reglist_cp8	match_anything
++#define match_reglist_cpd8	match_anything
++
++/* Ditto for retval, jospinc and mcall */
++#define match_retval		match_anything
++#define match_jospinc		match_anything
++#define match_mcall		match_anything
++
++/* COH is used to select between two different syntaxes */
++static int
++match_coh(char *str)
++{
++  return strcasecmp(str, "coh") == 0;
++}
++#if 0
++static int
++match_fpreg(char *str)
++{
++  unsigned long regid;
++  char *endptr;
++
++  if ((str[0] != 'f' && str[0] != 'F')
++      || (str[1] != 'r' && str[1] != 'R'))
++    return 0;
++
++  str += 2;
++  regid = strtoul(str, &endptr, 10);
++  if (!*str || *endptr)
++    return 0;
++
++  return 1;
++}
++#endif
++
++static int
++match_picoreg(char *str)
++{
++  int regid;
++
++  regid = avr32_parse_picoreg(str);
++  if (regid < 0)
++    return 0;
++  return 1;
++}
++
++#define match_pico_reglist_w	match_anything
++#define match_pico_reglist_d	match_anything
++
++static int
++match_pico_in(char *str)
++{
++  unsigned long regid;
++  char *end;
++
++  if (strncasecmp(str, "in", 2) != 0)
++    return 0;
++
++  str += 2;
++  regid = strtoul(str, &end, 10);
++  if (!*str || *end)
++    return 0;
++
++  return 1;
++}
++
++static int
++match_pico_out0(char *str)
++{
++  if (strcasecmp(str, "out0") != 0)
++    return 0;
++  return 1;
++}
++
++static int
++match_pico_out1(char *str)
++{
++  if (strcasecmp(str, "out1") != 0)
++    return 0;
++  return 1;
++}
++
++static int
++match_pico_out2(char *str)
++{
++  if (strcasecmp(str, "out2") != 0)
++    return 0;
++  return 1;
++}
++
++static int
++match_pico_out3(char *str)
++{
++  if (strcasecmp(str, "out3") != 0)
++    return 0;
++  return 1;
++}
++
++static void parse_nothing(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++			  char *str ATTRIBUTE_UNUSED,
++			  int opindex ATTRIBUTE_UNUSED)
++{
++  /* Do nothing (this is used for "match-only" operands like COH) */
++}
++
++static void
++parse_const(const struct avr32_operand *op, char *str,
++	    int opindex ATTRIBUTE_UNUSED)
++{
++  expressionS *exp = &current_insn.immediate;
++  expressionS *sym_exp;
++  int slot;
++  char *save;
++
++  pr_debug("parse_const: `%s' (signed: %d, pcrel: %d, align: %d)\n",
++	   str, op->is_signed, op->is_pcrel, op->align_order);
++
++  save = input_line_pointer;
++  input_line_pointer = str;
++
++  expression(exp);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].align_order = op->align_order;
++  current_insn.pcrel = op->is_pcrel;
++
++  switch (exp->X_op)
++    {
++    case O_illegal:
++      as_bad(_("illegal operand"));
++      break;
++    case O_absent:
++      as_bad(_("missing operand"));
++      break;
++    case O_constant:
++      pr_debug("  -> constant: %ld\n", (long)exp->X_add_number);
++      current_insn.field_value[slot].value = exp->X_add_number;
++      break;
++    case O_uminus:
++      pr_debug("  -> uminus\n");
++      sym_exp = symbol_get_value_expression(exp->X_add_symbol);
++      switch (sym_exp->X_op) {
++      case O_subtract:
++	pr_debug("     -> subtract: switching operands\n");
++	exp->X_op_symbol = sym_exp->X_add_symbol;
++	exp->X_add_symbol = sym_exp->X_op_symbol;
++	exp->X_op = O_subtract;
++	/* TODO: Remove the old X_add_symbol */
++	break;
++      default:
++	as_bad(_("Expression too complex\n"));
++	break;
++      }
++      break;
++#if 0
++    case O_subtract:
++      /* Any expression subtracting a symbol from the current section
++	 can be made PC-relative by adding the right offset.  */
++      if (S_GET_SEGMENT(exp->X_op_symbol) == now_seg)
++	current_insn.pcrel = TRUE;
++      pr_debug("  -> subtract: pcrel? %s\n",
++	       current_insn.pcrel ? "yes" : "no");
++      /* fall through */
++#endif
++    default:
++      pr_debug("  -> (%p <%d> %p + %d)\n",
++	       exp->X_add_symbol, exp->X_op, exp->X_op_symbol,
++	       exp->X_add_number);
++      current_insn.field_value[slot].value = 0;
++      break;
++    }
++
++  input_line_pointer = save;
++}
++
++static void
++parse_jmplabel(const struct avr32_operand *op, char *str,
++	       int opindex ATTRIBUTE_UNUSED)
++{
++  expressionS *exp = &current_insn.immediate;
++  int slot;
++  char *save;
++
++  pr_debug("parse_jmplabel: `%s' (signed: %d, pcrel: %d, align: %d)\n",
++	   str, op->is_signed, op->is_pcrel, op->align_order);
++
++  save = input_line_pointer;
++  input_line_pointer = str;
++
++  expression(exp);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].align_order = op->align_order;
++  current_insn.pcrel = TRUE;
++
++  switch (exp->X_op)
++    {
++    case O_illegal:
++      as_bad(_("illegal operand"));
++      break;
++    case O_absent:
++      as_bad(_("missing operand"));
++      break;
++    case O_constant:
++      pr_debug("  -> constant: %ld\n", (long)exp->X_add_number);
++      current_insn.field_value[slot].value = exp->X_add_number;
++      current_insn.pcrel = 0;
++      break;
++    default:
++      pr_debug("  -> (%p <%d> %p + %d)\n",
++	       exp->X_add_symbol, exp->X_op, exp->X_op_symbol,
++	       exp->X_add_number);
++      current_insn.field_value[slot].value = 0;
++      break;
++    }
++
++  input_line_pointer = save;
++}
++
++static void
++parse_intreg(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++	     char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  int regid, slot;
++
++  pr_debug("parse_intreg: `%s'\n", str);
++
++  regid = avr32_parse_intreg(str);
++  assert(regid >= 0);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++  current_insn.field_value[slot].align_order = op->align_order;
++}
++
++static void
++parse_intreg_predec(const struct avr32_operand *op, char *str, int opindex)
++{
++  parse_intreg(op, str + 2, opindex);
++}
++
++static void
++parse_intreg_postinc(const struct avr32_operand *op, char *str, int opindex)
++{
++  char *p, c;
++
++  pr_debug("parse_intreg_postinc: `%s'\n", str);
++
++  for (p = str; *p != '+'; p++) ;
++
++  c = *p, *p = 0;
++  parse_intreg(op, str, opindex);
++  *p = c;
++}
++
++static void
++parse_intreg_shift(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		   char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  int regid, slot, shift = 0;
++  char *p, c;
++  char shiftop;
++
++  pr_debug("parse Ry<<sa: `%s'\n", str);
++
++  for (p = str; *p; p++)
++    if (*p == '<' || *p == '>')
++      break;
++
++  shiftop = *p;
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  assert(regid >= 0);
++  *p = c;
++
++  if (c)
++    {
++      if (p[0] != shiftop || p[1] != shiftop)
++	as_bad(_("expected shift operator in `%s'"), p);
++      else
++	{
++	  expressionS exp;
++	  char *saved;
++
++	  saved = input_line_pointer;
++	  input_line_pointer = p + 2;
++	  expression(&exp);
++	  input_line_pointer = saved;
++
++	  if (exp.X_op != O_constant)
++	    as_bad(_("shift amount must be a numeric constant"));
++	  else
++	    shift = exp.X_add_number;
++	}
++    }
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = shift;
++}
++
++/* The match() function selected the right opcode, so it doesn't
++   matter which way we shift any more.  */
++#define parse_intreg_lsl	parse_intreg_shift
++#define parse_intreg_lsr	parse_intreg_shift
++
++static void
++parse_intreg_part(const struct avr32_operand *op, char *str,
++		  int opindex ATTRIBUTE_UNUSED)
++{
++  static const char bparts[] = { 'b', 'l', 'u', 't' };
++  static const char hparts[] = { 'b', 't' };
++  unsigned int slot, sel;
++  int regid;
++  char *p, c;
++
++  pr_debug("parse reg:part `%s'\n", str);
++
++  for (p = str; *p; p++)
++    if (*p == ':')
++      break;
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  assert(regid >= 0);
++  *p = c;
++
++  assert(c == ':');
++
++  if (op->align_order)
++    {
++      for (sel = 0; sel < sizeof(hparts); sel++)
++	if (TOLOWER(p[1]) == hparts[sel])
++	  break;
++
++      if (sel >= sizeof(hparts))
++	{
++	  as_bad(_("invalid halfword selector `%c' (must be either b or t)"),
++		 p[1]);
++	  sel = 0;
++	}
++    }
++  else
++    {
++      for (sel = 0; sel < sizeof(bparts); sel++)
++	if (TOLOWER(p[1]) == bparts[sel])
++	  break;
++
++      if (sel >= sizeof(bparts))
++	{
++	  as_bad(_("invalid byte selector `%c' (must be one of b,l,u,t)"),
++		 p[1]);
++	  sel = 0;
++	}
++    }
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = sel;
++}
++
++/* This is the parser for "Rp[displacement]" expressions.  In addition
++   to the "official" syntax, we accept a label as a replacement for
++   the register expression.  This syntax implies Rp=PC and the
++   displacement is the pc-relative distance to the label.  */
++static void
++parse_intreg_disp(const struct avr32_operand *op, char *str, int opindex)
++{
++  expressionS *exp = &current_insn.immediate;
++  int slot, regid;
++  char *save, *p, c;
++
++  pr_debug("parse_intreg_disp: `%s' (signed: %d, pcrel: %d, align: %d)\n",
++	   str, op->is_signed, op->is_pcrel, op->align_order);
++
++  for (p = str; *p; p++)
++    if (*p == '[')
++      break;
++
++  slot = current_insn.next_slot++;
++
++  /* First, check if we have a valid register either before '[' or as
++     the sole expression.  If so, we use the Rp[disp] syntax.  */
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  *p = c;
++
++  if (regid >= 0)
++    {
++      current_insn.field_value[slot].value = regid;
++
++      slot = current_insn.next_slot++;
++      current_insn.field_value[slot].align_order = op->align_order;
++
++      if (c == '[')
++	{
++	  save = input_line_pointer;
++	  input_line_pointer = p + 1;
++
++	  expression(exp);
++
++	  if (*input_line_pointer != ']')
++	    as_bad(_("junk after displacement expression"));
++
++	  input_line_pointer = save;
++
++	  switch (exp->X_op)
++	    {
++	    case O_illegal:
++	      as_bad(_("illegal displacement expression"));
++	      break;
++	    case O_absent:
++	      as_bad(_("missing displacement expression"));
++	      break;
++	    case O_constant:
++	      pr_debug("  -> constant: %ld\n", exp->X_add_number);
++	      current_insn.field_value[slot].value = exp->X_add_number;
++	      break;
++#if 0
++	    case O_subtract:
++	      if (S_GET_SEGMENT(exp->X_op_symbol) == now_seg)
++		current_insn.pcrel = TRUE;
++	      pr_debug("  -> subtract: pcrel? %s\n",
++		       current_insn.pcrel ? "yes" : "no");
++	      /* fall through */
++#endif
++	    default:
++	      pr_debug("  -> (%p <%d> %p + %d)\n",
++		       exp->X_add_symbol, exp->X_op, exp->X_op_symbol,
++		       exp->X_add_number);
++	      current_insn.field_value[slot].value = 0;
++	    }
++	}
++      else
++	{
++	  exp->X_op = O_constant;
++	  exp->X_add_number = 0;
++	  current_insn.field_value[slot].value = 0;
++	}
++    }
++  else
++    {
++      /* Didn't find a valid register.  Try parsing it as a label.  */
++      current_insn.field_value[slot].value = AVR32_REG_PC;
++      parse_jmplabel(op, str, opindex);
++    }
++}
++
++static void
++parse_intreg_index(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		   char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  int slot, regid;
++  char *p, *end, c;
++
++  for (p = str; *p; p++)
++    if (*p == '[')
++      break;
++
++  assert(*p);
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  assert(regid >= 0);
++  *p = c;
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++
++  p++;
++  for (end = p; *end; end++)
++    if (*end == ']' || *end == '<')
++      break;
++
++  assert(*end);
++
++  c = *end, *end = 0;
++  regid = avr32_parse_intreg(p);
++  assert(regid >= 0);
++  *end = c;
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = 0;
++
++  if (*end == '<')
++    {
++      expressionS exp;
++      char *save;
++
++      p = end + 2;
++      for (end = p; *end; end++)
++	if (*end == ']')
++	  break;
++
++      assert(*end == ']');
++
++      c = *end, *end = 0;
++      save = input_line_pointer;
++      input_line_pointer = p;
++      expression(&exp);
++
++      if (*input_line_pointer)
++	as_bad(_("junk after shift expression"));
++
++      *end = c;
++      input_line_pointer = save;
++
++      if (exp.X_op == O_constant)
++	current_insn.field_value[slot].value = exp.X_add_number;
++      else
++	as_bad(_("shift expression too complex"));
++    }
++}
++
++static void
++parse_intreg_xindex(const struct avr32_operand *op, char *str, int opindex)
++{
++  int slot, regid;
++  char *p, *end, c;
++
++  for (p = str; *p; p++)
++    if (*p == '[')
++      break;
++
++  assert(*p);
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  assert(regid >= 0);
++  *p = c;
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++
++  p++;
++  for (end = p; *end; end++)
++    if (*end == '<')
++      break;
++
++  assert(*end);
++
++  c = *end, *end = 0;
++  parse_intreg_part(op, p, opindex);
++  *end = c;
++}
++
++static void
++parse_pc_disp(const struct avr32_operand *op, char *str, int opindex)
++{
++  char *p, c;
++
++  for (p = str; *p; p++)
++    if (*p == '[')
++      break;
++
++  /* The lddpc instruction comes in two different syntax variants:
++       lddpc reg, expression
++       lddpc reg, pc[disp]
++     If the operand contains a '[', we use the second form.  */
++  if (*p)
++    {
++      int regid;
++
++      c = *p, *p = 0;
++      regid = avr32_parse_intreg(str);
++      *p = c;
++      if (regid == AVR32_REG_PC)
++	{
++	  char *end;
++
++	  for (end = ++p; *end; end++) ;
++	  if (*(--end) != ']')
++	    as_bad(_("unrecognized form of instruction: `%s'"), str);
++	  else
++	    {
++	      c = *end, *end = 0;
++	      parse_const(op, p, opindex);
++	      *end = c;
++	      current_insn.pcrel = 0;
++	    }
++	}
++      else
++	as_bad(_("unrecognized form of instruction: `%s'"), str);
++    }
++  else
++    {
++      parse_jmplabel(op, str, opindex);
++    }
++}
++
++static void parse_sp(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		     char *str ATTRIBUTE_UNUSED,
++		     int opindex ATTRIBUTE_UNUSED)
++{
++  int slot;
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = AVR32_REG_SP;
++}
++
++static void
++parse_sp_disp(const struct avr32_operand *op, char *str, int opindex)
++{
++  char *p, c;
++
++  for (; *str; str++)
++    if (*str == '[')
++      break;
++
++  assert(*str);
++
++  for (p = ++str; *p; p++)
++    if (*p == ']')
++      break;
++
++  c = *p, *p = 0;
++  parse_const(op, str, opindex);
++  *p = c;
++}
++
++static void
++parse_cpno(const struct avr32_operand *op ATTRIBUTE_UNUSED, char *str,
++	   int opindex ATTRIBUTE_UNUSED)
++{
++  int slot;
++
++  str += 2;
++  if (*str == '#')
++    str++;
++  if (*str < '0' || *str > '7' || str[1])
++    as_bad(_("invalid coprocessor `%s'"), str);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = *str - '0';
++}
++
++static void
++parse_cpreg(const struct avr32_operand *op, char *str,
++	    int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned int crid;
++  int slot;
++  char *endptr;
++
++  str += 2;
++  crid = strtoul(str, &endptr, 10);
++  if (*endptr || crid > 15 || crid & ((1 << op->align_order) - 1))
++    as_bad(_("invalid coprocessor register `%s'"), str);
++
++  crid >>= op->align_order;
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = crid;
++}
++
++static void
++parse_number(const struct avr32_operand *op, char *str,
++	     int opindex ATTRIBUTE_UNUSED)
++{
++  expressionS exp;
++  int slot;
++  char *save;
++
++  save = input_line_pointer;
++  input_line_pointer = str;
++  expression(&exp);
++  input_line_pointer = save;
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].align_order = op->align_order;
++
++  if (exp.X_op == O_constant)
++      current_insn.field_value[slot].value = exp.X_add_number;
++  else
++      as_bad(_("invalid numeric expression `%s'"), str);
++}
++
++static void
++parse_reglist8(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++	       char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask;
++  unsigned long value = 0;
++  int slot;
++  char *tail;
++
++  regmask = avr32_parse_reglist(str, &tail);
++  if (*tail)
++    as_bad(_("invalid register list `%s'"), str);
++  else
++    {
++      if (avr32_make_regmask8(regmask, &value))
++	as_bad(_("register list `%s' doesn't fit"), str);
++    }
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = value;
++}
++
++static int
++parse_reglist_tail(char *str, unsigned long regmask)
++{
++  expressionS exp;
++  char *save, *p, c;
++  int regid;
++
++  for (p = str + 1; *p; p++)
++    if (*p == '=')
++      break;
++
++  if (!*p)
++    {
++      as_bad(_("invalid register list `%s'"), str);
++      return -2;
++    }
++
++  c = *p, *p = 0;
++  regid = avr32_parse_intreg(str);
++  *p = c;
++
++  if (regid != 12)
++    {
++      as_bad(_("invalid register list `%s'"), str);
++      return -2;
++    }
++
++  /* If we have an assignment, we must pop PC and we must _not_
++     pop LR or R12 */
++  if (!(regmask & (1 << AVR32_REG_PC)))
++    {
++      as_bad(_("return value specified for non-return instruction"));
++      return -2;
++    }
++  else if (regmask & ((1 << AVR32_REG_R12) | (1 << AVR32_REG_LR)))
++    {
++      as_bad(_("can't pop LR or R12 when specifying return value"));
++      return -2;
++    }
++
++  save = input_line_pointer;
++  input_line_pointer = p + 1;
++  expression(&exp);
++  input_line_pointer = save;
++
++  if (exp.X_op != O_constant
++      || exp.X_add_number < -1
++      || exp.X_add_number > 1)
++    {
++      as_bad(_("invalid return value `%s'"), str);
++      return -2;
++    }
++
++  return exp.X_add_number;
++}
++
++static void
++parse_reglist9(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++	       char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask;
++  unsigned long value = 0, kbit = 0;
++  int slot;
++  char *tail;
++
++  regmask = avr32_parse_reglist(str, &tail);
++  /* printf("parsed reglist16: %04lx, tail: `%s'\n", regmask, tail); */
++  if (*tail)
++    {
++      int retval;
++
++      retval = parse_reglist_tail(tail, regmask);
++
++      switch (retval)
++	{
++	case -1:
++	  regmask |= 1 << AVR32_REG_LR;
++	  break;
++	case 0:
++	  break;
++	case 1:
++	  regmask |= 1 << AVR32_REG_R12;
++	  break;
++	default:
++	  break;
++	}
++
++      kbit = 1;
++    }
++
++  if (avr32_make_regmask8(regmask, &value))
++    as_bad(_("register list `%s' doesn't fit"), str);
++
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = (value << 1) | kbit;
++}
++
++static void
++parse_reglist16(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask;
++  int slot;
++  char *tail;
++
++  regmask = avr32_parse_reglist(str, &tail);
++  if (*tail)
++    as_bad(_("invalid register list `%s'"), str);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regmask;
++}
++
++static void
++parse_reglist_ldm(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		  char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask;
++  int slot, rp, w_bit = 0;
++  char *tail, *p, c;
++
++  for (p = str; *p && *p != ','; p++)
++    if (*p == '+')
++      break;
++
++  c = *p, *p = 0;
++  rp = avr32_parse_intreg(str);
++  *p = c;
++  if (rp < 0)
++    {
++      as_bad(_("invalid destination register in `%s'"), str);
++      return;
++    }
++
++  if (p[0] == '+' && p[1] == '+')
++    {
++      w_bit = 1;
++      p += 2;
++    }
++
++  if (*p != ',')
++    {
++      as_bad(_("expected `,' after destination register in `%s'"), str);
++      return;
++    }
++
++  str = p + 1;
++  regmask = avr32_parse_reglist(str, &tail);
++  if (*tail)
++    {
++      int retval;
++
++      if (rp != AVR32_REG_SP)
++	{
++	  as_bad(_("junk at end of line: `%s'"), tail);
++	  return;
++	}
++
++      rp = AVR32_REG_PC;
++
++      retval = parse_reglist_tail(tail, regmask);
++
++      switch (retval)
++	{
++	case -1:
++	  regmask |= 1 << AVR32_REG_LR;
++	  break;
++	case 0:
++	  break;
++	case 1:
++	  regmask |= 1 << AVR32_REG_R12;
++	  break;
++	default:
++	  return;
++	}
++    }
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = rp;
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = w_bit;
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regmask;
++}
++
++static void
++parse_reglist_cp8(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		  char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask;
++  int slot, h_bit = 0;
++  char *tail;
++
++  regmask = avr32_parse_cpreglist(str, &tail);
++  if (*tail)
++    as_bad(_("junk at end of line: `%s'"), tail);
++  else if (regmask & 0xffUL)
++    {
++      if (regmask & 0xff00UL)
++	as_bad(_("register list `%s' doesn't fit"), str);
++      regmask &= 0xff;
++    }
++  else if (regmask & 0xff00UL)
++    {
++      regmask >>= 8;
++      h_bit = 1;
++    }
++  else
++    as_warn(_("register list is empty"));
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regmask;
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = h_bit;
++}
++
++static void
++parse_reglist_cpd8(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		   char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask, regmask_d = 0;
++  int slot, i;
++  char *tail;
++
++  regmask = avr32_parse_cpreglist(str, &tail);
++  if (*tail)
++    as_bad(_("junk at end of line: `%s'"), tail);
++
++  for (i = 0; i < 8; i++)
++    {
++      if (regmask & 1)
++	{
++	  if (!(regmask & 2))
++	    {
++	      as_bad(_("register list `%s' doesn't fit"), str);
++	      break;
++	    }
++	  regmask_d |= 1 << i;
++	}
++      else if (regmask & 2)
++	{
++	  as_bad(_("register list `%s' doesn't fit"), str);
++	  break;
++	}
++
++      regmask >>= 2;
++    }
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regmask_d;
++}
++
++static void
++parse_retval(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++	     char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  int regid, slot;
++
++  regid = avr32_parse_intreg(str);
++  if (regid < 0)
++    {
++      expressionS exp;
++      char *save;
++
++      regid = 0;
++
++      save = input_line_pointer;
++      input_line_pointer = str;
++      expression(&exp);
++      input_line_pointer = save;
++
++      if (exp.X_op != O_constant)
++	as_bad(_("invalid return value `%s'"), str);
++      else
++	switch (exp.X_add_number)
++	  {
++	  case -1:
++	    regid = AVR32_REG_LR;
++	    break;
++	  case 0:
++	    regid = AVR32_REG_SP;
++	    break;
++	  case 1:
++	    regid = AVR32_REG_PC;
++	    break;
++	  default:
++	    as_bad(_("invalid return value `%s'"), str);
++	    break;
++	  }
++    }
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++}
++
++#define parse_mcall parse_intreg_disp
++
++static void
++parse_jospinc(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++	      char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  expressionS exp;
++  int slot;
++  char *save;
++
++  save = input_line_pointer;
++  input_line_pointer = str;
++  expression(&exp);
++  input_line_pointer = save;
++
++  slot = current_insn.next_slot++;
++
++  if (exp.X_op == O_constant)
++    {
++      if (exp.X_add_number > 0)
++	exp.X_add_number--;
++      current_insn.field_value[slot].value = exp.X_add_number;
++    }
++  else
++    as_bad(_("invalid numeric expression `%s'"), str);
++}
++
++#define parse_coh		parse_nothing
++#if 0
++static void
++parse_fpreg(const struct avr32_operand *op,
++	    char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regid;
++  int slot;
++
++  regid = strtoul(str + 2, NULL, 10);
++
++  if ((regid >= 16) || (regid & ((1 << op->align_order) - 1)))
++    as_bad(_("invalid floating-point register `%s'"), str);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++  current_insn.field_value[slot].align_order = op->align_order;
++}
++#endif
++
++static void
++parse_picoreg(const struct avr32_operand *op,
++	      char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regid;
++  int slot;
++
++  regid = avr32_parse_picoreg(str);
++  if (regid & ((1 << op->align_order) - 1))
++    as_bad(_("invalid double-word PiCo register `%s'"), str);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++  current_insn.field_value[slot].align_order = op->align_order;
++}
++
++static void
++parse_pico_reglist_w(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		     char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask;
++  int slot, h_bit = 0;
++  char *tail;
++
++  regmask = avr32_parse_pico_reglist(str, &tail);
++  if (*tail)
++    as_bad(_("junk at end of line: `%s'"), tail);
++
++  if (regmask & 0x00ffUL)
++    {
++      if (regmask & 0xff00UL)
++	as_bad(_("register list `%s' doesn't fit"), str);
++      regmask &= 0x00ffUL;
++    }
++  else if (regmask & 0xff00UL)
++    {
++      regmask >>= 8;
++      h_bit = 1;
++    }
++  else
++    as_warn(_("register list is empty"));
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regmask;
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = h_bit;
++}
++
++static void
++parse_pico_reglist_d(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++		     char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regmask, regmask_d = 0;
++  int slot, i;
++  char *tail;
++
++  regmask = avr32_parse_pico_reglist(str, &tail);
++  if (*tail)
++    as_bad(_("junk at end of line: `%s'"), tail);
++
++  for (i = 0; i < 8; i++)
++    {
++      if (regmask & 1)
++	{
++	  if (!(regmask & 2))
++	    {
++	      as_bad(_("register list `%s' doesn't fit"), str);
++	      break;
++	    }
++	  regmask_d |= 1 << i;
++	}
++      else if (regmask & 2)
++	{
++	  as_bad(_("register list `%s' doesn't fit"), str);
++	  break;
++	}
++
++      regmask >>= 2;
++    }
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regmask_d;
++}
++
++static void
++parse_pico_in(const struct avr32_operand *op ATTRIBUTE_UNUSED,
++	      char *str, int opindex ATTRIBUTE_UNUSED)
++{
++  unsigned long regid;
++  int slot;
++
++  regid = strtoul(str + 2, NULL, 10);
++
++  if (regid >= 12)
++    as_bad(_("invalid PiCo IN register `%s'"), str);
++
++  slot = current_insn.next_slot++;
++  current_insn.field_value[slot].value = regid;
++  current_insn.field_value[slot].align_order = 0;
++}
++
++#define parse_pico_out0		parse_nothing
++#define parse_pico_out1		parse_nothing
++#define parse_pico_out2		parse_nothing
++#define parse_pico_out3		parse_nothing
++
++#define OP(name, sgn, pcrel, align, func) \
++  { AVR32_OPERAND_##name, sgn, pcrel, align, match_##func, parse_##func }
++
++struct avr32_operand avr32_operand_table[] = {
++  OP(INTREG, 0, 0, 0, intreg),
++  OP(INTREG_PREDEC, 0, 0, 0, intreg_predec),
++  OP(INTREG_POSTINC, 0, 0, 0, intreg_postinc),
++  OP(INTREG_LSL, 0, 0, 0, intreg_lsl),
++  OP(INTREG_LSR, 0, 0, 0, intreg_lsr),
++  OP(INTREG_BSEL, 0, 0, 0, intreg_part),
++  OP(INTREG_HSEL, 0, 0, 1, intreg_part),
++  OP(INTREG_SDISP, 1, 0, 0, intreg_disp),
++  OP(INTREG_SDISP_H, 1, 0, 1, intreg_disp),
++  OP(INTREG_SDISP_W, 1, 0, 2, intreg_disp),
++  OP(INTREG_UDISP, 0, 0, 0, intreg_disp),
++  OP(INTREG_UDISP_H, 0, 0, 1, intreg_disp),
++  OP(INTREG_UDISP_W, 0, 0, 2, intreg_disp),
++  OP(INTREG_INDEX, 0, 0, 0, intreg_index),
++  OP(INTREG_XINDEX, 0, 0, 0, intreg_xindex),
++  OP(DWREG, 0, 0, 1, intreg),
++  OP(PC_UDISP_W, 0, 1, 2, pc_disp),
++  OP(SP, 0, 0, 0, sp),
++  OP(SP_UDISP_W, 0, 0, 2, sp_disp),
++  OP(CPNO, 0, 0, 0, cpno),
++  OP(CPREG, 0, 0, 0, cpreg),
++  OP(CPREG_D, 0, 0, 1, cpreg),
++  OP(UNSIGNED_CONST, 0, 0, 0, const),
++  OP(UNSIGNED_CONST_W, 0, 0, 2, const),
++  OP(SIGNED_CONST, 1, 0, 0, const),
++  OP(SIGNED_CONST_W, 1, 0, 2, const),
++  OP(JMPLABEL, 1, 1, 1, jmplabel),
++  OP(UNSIGNED_NUMBER, 0, 0, 0, number),
++  OP(UNSIGNED_NUMBER_W, 0, 0, 2, number),
++  OP(REGLIST8, 0, 0, 0, reglist8),
++  OP(REGLIST9, 0, 0, 0, reglist9),
++  OP(REGLIST16, 0, 0, 0, reglist16),
++  OP(REGLIST_LDM, 0, 0, 0, reglist_ldm),
++  OP(REGLIST_CP8, 0, 0, 0, reglist_cp8),
++  OP(REGLIST_CPD8, 0, 0, 0, reglist_cpd8),
++  OP(RETVAL, 0, 0, 0, retval),
++  OP(MCALL, 1, 0, 2, mcall),
++  OP(JOSPINC, 0, 0, 0, jospinc),
++  OP(COH, 0, 0, 0, coh),
++  OP(PICO_REG_W, 0, 0, 0, picoreg),
++  OP(PICO_REG_D, 0, 0, 1, picoreg),
++  OP(PICO_REGLIST_W, 0, 0, 0, pico_reglist_w),
++  OP(PICO_REGLIST_D, 0, 0, 0, pico_reglist_d),
++  OP(PICO_IN, 0, 0, 0, pico_in),
++  OP(PICO_OUT0, 0, 0, 0, pico_out0),
++  OP(PICO_OUT1, 0, 0, 0, pico_out1),
++  OP(PICO_OUT2, 0, 0, 0, pico_out2),
++  OP(PICO_OUT3, 0, 0, 0, pico_out3),
++};
++
++symbolS *
++md_undefined_symbol (char *name ATTRIBUTE_UNUSED)
++{
++  pr_debug("md_undefined_symbol: %s\n", name);
++  return 0;
++}
++
++struct avr32_relax_type
++{
++  long lower_bound;
++  long upper_bound;
++  unsigned char align;
++  unsigned char length;
++  signed short next;
++};
++
++#define EMPTY { 0, 0, 0, 0, -1 }
++#define C(lower, upper, align, next)			\
++  { (lower), (upper), (align), 2, AVR32_OPC_##next }
++#define E(lower, upper, align)				\
++  { (lower), (upper), (align), 4, -1 }
++
++static const struct avr32_relax_type avr32_relax_table[] =
++  {
++    /* 0 */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY,
++    E(0, 65535, 0), E(0, 65535, 0), E(0, 65535, 0), E(0, 65535, 0),
++    EMPTY,
++    /* 16 */
++    EMPTY, EMPTY, EMPTY, EMPTY,
++
++    C(-256, 254, 1, BREQ2), C(-256, 254, 1, BRNE2),
++    C(-256, 254, 1, BRCC2), C(-256, 254, 1, BRCS2),
++    C(-256, 254, 1, BRGE2), C(-256, 254, 1, BRLT2),
++    C(-256, 254, 1, BRMI2), C(-256, 254, 1, BRPL2),
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++    /* 32 */
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
++
++    EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 48 */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY,
++
++    C(-32, 31, 0, CP_W3), E(-1048576, 1048575, 0),
++
++    EMPTY, EMPTY, EMPTY,
++    /* 64: csrfcz */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    E(0, 65535, 0), E(0, 65535, 0),
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    E(-32768, 32767, 0),
++    /* 80: LD_SB2 */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++
++    C(0, 7, 0, LD_UB4), E(-32768, 32767, 0),
++
++    EMPTY,
++    EMPTY, EMPTY,
++
++    C(0, 14, 1, LD_SH4), E(-32768, 32767, 0),
++
++    EMPTY, EMPTY, EMPTY,
++
++    C(0, 14, 1, LD_UH4),
++
++    /* 96: LD_UH4 */
++    E(-32768, 32767, 0),
++
++    EMPTY, EMPTY, EMPTY, EMPTY,
++
++    C(0, 124, 2, LD_W4), E(-32768, 32767, 0),
++
++    E(0, 1020, 2),	/* LDC_D1 */
++    EMPTY, EMPTY,
++    E(0, 1020, 2),	/* LDC_W1 */
++    EMPTY, EMPTY,
++    E(0, 16380, 2),	/* LDC0_D */
++    E(0, 16380, 2),	/* LDC0_W */
++    EMPTY,
++
++    /* 112: LDCM_D_PU */
++    EMPTY, EMPTY, EMPTY,
++
++    C(0, 508, 2, LDDPC_EXT), E(-32768, 32767, 0),
++
++    EMPTY,EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 134: MACHH_W */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    E(-131072, 131068, 2),	/* MCALL */
++    E(0, 1020, 2),		/* MFDR */
++    E(0, 1020, 2),		/* MFSR */
++    EMPTY, EMPTY,
++
++    C(-128, 127, 0, MOV2), E(-1048576, 1048575, 0),
++
++    EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++
++    E(-128, 127, 0),		/* MOVEQ2 */
++    E(-128, 127, 0),		/* MOVNE2 */
++    E(-128, 127, 0),		/* MOVCC2 */
++    E(-128, 127, 0),		/* 166: MOVCS2 */
++    E(-128, 127, 0),		/* MOVGE2 */
++    E(-128, 127, 0),		/* MOVLT2 */
++    E(-128, 127, 0),		/* MOVMI2 */
++    E(-128, 127, 0),		/* MOVPL2 */
++    E(-128, 127, 0),		/* MOVLS2 */
++    E(-128, 127, 0),		/* MOVGT2 */
++    E(-128, 127, 0),		/* MOVLE2 */
++    E(-128, 127, 0),		/* MOVHI2 */
++    E(-128, 127, 0),		/* MOVVS2 */
++    E(-128, 127, 0),		/* MOVVC2 */
++    E(-128, 127, 0),		/* MOVQS2 */
++    E(-128, 127, 0),		/* MOVAL2 */
++
++    E(0, 1020, 2),		/* MTDR */
++    E(0, 1020, 2),		/* MTSR */
++    EMPTY,
++    EMPTY,
++    E(-128, 127, 0),		/* MUL3 */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 198: MVCR_W */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    E(0, 65535, 0), E(0, 65535, 0),
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 230: PASR_H */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 262: PUNPCKSB_H */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++
++    C(-1024, 1022, 1, RCALL2), E(-2097152, 2097150, 1),
++
++    EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY,
++
++    C(-1024, 1022, 1, BRAL),
++
++    EMPTY, EMPTY, EMPTY,
++    E(-128, 127, 0),		/* RSUB2 */
++    /* 294: SATADD_H */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    E(0, 255, 0),		/* SLEEP */
++    EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 326: ST_B2 */
++    EMPTY, EMPTY,
++    C(0, 7, 0, ST_B4), E(-32768, 32767, 0),
++    EMPTY, EMPTY, EMPTY, EMPTY,
++    E(-32768, 32767, 0),
++    EMPTY, EMPTY, EMPTY,
++    C(0, 14, 1, ST_H4), E(-32768, 32767, 0),
++    EMPTY, EMPTY,
++    EMPTY,
++    C(0, 60, 2, ST_W4), E(-32768, 32767, 0),
++    E(0, 1020, 2),	/* STC_D1 */
++    EMPTY, EMPTY,
++    E(0, 1020, 2),	/* STC_W1 */
++    EMPTY, EMPTY,
++    E(0, 16380, 2),	/* STC0_D */
++    E(0, 16380, 2),	/* STC0_W */
++
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 358: STDSP */
++    EMPTY, EMPTY,
++    E(0, 1020, 2),	/* STHH_W1 */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY,
++    E(-32768, 32767, 0),
++    C(-512, 508, 2, SUB4),
++    C(-128, 127, 0, SUB4), E(-1048576, 1048576, 0),
++    /* SUB{cond} */
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    /* SUBF{cond} */
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    EMPTY,
++
++    /* 406: SWAP_B */
++    EMPTY, EMPTY, EMPTY,
++    E(0, 255, 0),	/* SYNC */
++    EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 414: TST */
++    EMPTY, EMPTY, E(-65536, 65535, 2), E(-65536, 65535, 2), E(-65536, 65535, 2), EMPTY, EMPTY, EMPTY,
++    /* 422: RSUB{cond} */
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
++    /* 436: ADD{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 454: SUB{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 472: AND{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 486: OR{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 502: EOR{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 518: LD.w{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 534: LD.sh{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 550: LD.uh{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 566: LD.sb{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 582: LD.ub{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 596: ST.w{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 614: ST.h{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 630: ST.b{cond} */
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++    /* 646: movh */
++    E(0, 65535, 0), EMPTY, EMPTY,
++  /* 649: fmac.s */
++  EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++  EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
++  };
++
++#undef E
++#undef C
++#undef EMPTY
++
++#define AVR32_RS_NONE (-1)
++
++#define avr32_rs_size(state) (avr32_relax_table[(state)].length)
++#define avr32_rs_align(state) (avr32_relax_table[(state)].align)
++#define relax_more(state) (avr32_relax_table[(state)].next)
++
++#define opc_initial_substate(opc) ((opc)->id)
++
++static int need_relax(int subtype, offsetT distance)
++{
++  offsetT upper_bound, lower_bound;
++
++  upper_bound = avr32_relax_table[subtype].upper_bound;
++  lower_bound = avr32_relax_table[subtype].lower_bound;
++
++  if (distance & ((1 << avr32_rs_align(subtype)) - 1))
++    return 1;
++  if ((distance > upper_bound) || (distance < lower_bound))
++    return 1;
++
++  return 0;
++}
++
++enum {
++  LDA_SUBTYPE_MOV1,
++  LDA_SUBTYPE_MOV2,
++  LDA_SUBTYPE_SUB,
++  LDA_SUBTYPE_LDDPC,
++  LDA_SUBTYPE_LDW,
++  LDA_SUBTYPE_GOTLOAD,
++  LDA_SUBTYPE_GOTLOAD_LARGE,
++};
++
++enum {
++  CALL_SUBTYPE_RCALL1,
++  CALL_SUBTYPE_RCALL2,
++  CALL_SUBTYPE_MCALL_CP,
++  CALL_SUBTYPE_MCALL_GOT,
++  CALL_SUBTYPE_MCALL_LARGE,
++};
++
++#define LDA_INITIAL_SIZE	(avr32_pic ? 4 : 2)
++#define CALL_INITIAL_SIZE	2
++
++#define need_reloc(sym, seg, pcrel)					\
++  (!(S_IS_DEFINED(sym)							\
++     && ((pcrel && S_GET_SEGMENT(sym) == seg)				\
++	 || (!pcrel && S_GET_SEGMENT(sym) == absolute_section)))	\
++   || S_FORCE_RELOC(sym, 1))
++
++/* Return an initial guess of the length by which a fragment must grow to
++   hold a branch to reach its destination.
++   Also updates fr_type/fr_subtype as necessary.
++
++   Called just before doing relaxation.
++   Any symbol that is now undefined will not become defined.
++   The guess for fr_var is ACTUALLY the growth beyond fr_fix.
++   Whatever we do to grow fr_fix or fr_var contributes to our returned value.
++   Although it may not be explicit in the frag, pretend fr_var starts with a
++   0 value.  */
++
++static int
++avr32_default_estimate_size_before_relax (fragS *fragP, segT segment)
++{
++  int growth = 0;
++
++  assert(fragP);
++  assert(fragP->fr_symbol);
++
++  if (fragP->tc_frag_data.force_extended
++      || need_reloc(fragP->fr_symbol, segment, fragP->tc_frag_data.pcrel))
++    {
++      int largest_state = fragP->fr_subtype;
++      while (relax_more(largest_state) != AVR32_RS_NONE)
++	largest_state = relax_more(largest_state);
++      growth = avr32_rs_size(largest_state) - fragP->fr_var;
++    }
++  else
++    {
++      growth = avr32_rs_size(fragP->fr_subtype) - fragP->fr_var;
++    }
++
++  pr_debug("%s:%d: md_estimate_size_before_relax: %d\n",
++	   fragP->fr_file, fragP->fr_line, growth);
++
++  return growth;
++}
++
++static int
++avr32_lda_estimate_size_before_relax(fragS *fragP, segT segment ATTRIBUTE_UNUSED)
++{
++  return fragP->fr_var - LDA_INITIAL_SIZE;
++}
++
++static int
++avr32_call_estimate_size_before_relax(fragS *fragP, segT segment ATTRIBUTE_UNUSED)
++{
++  return fragP->fr_var - CALL_INITIAL_SIZE;
++}
++
++static int
++avr32_cpool_estimate_size_before_relax(fragS *fragP,
++				       segT segment ATTRIBUTE_UNUSED)
++{
++  return fragP->fr_var;
++}
++
++/* This macro may be defined to relax a frag. GAS will call this with the
++ * segment, the frag, and the change in size of all previous frags;
++ * md_relax_frag should return the change in size of the frag. */
++static long
++avr32_default_relax_frag (segT segment, fragS *fragP, long stretch)
++{
++  int state, next_state;
++  symbolS *symbolP;	/* The target symbol */
++  long growth = 0;
++
++  state = next_state = fragP->fr_subtype;
++
++  symbolP = fragP->fr_symbol;
++
++  if (fragP->tc_frag_data.force_extended
++      || need_reloc(symbolP, segment, fragP->tc_frag_data.pcrel))
++    {
++      /* Symbol must be resolved by the linker. Emit the largest
++	 possible opcode. */
++      while (relax_more(next_state) != AVR32_RS_NONE)
++	next_state = relax_more(next_state);
++    }
++  else
++    {
++      addressT address;	/* The address of fragP */
++      addressT target;	/* The address of the target symbol */
++      offsetT distance;	/* The distance between the insn and the symbol */
++      fragS *sym_frag;
++
++      address = fragP->fr_address;
++      target = fragP->fr_offset;
++      symbolP = fragP->fr_symbol;
++      sym_frag = symbol_get_frag(symbolP);
++
++      address += fragP->fr_fix - fragP->fr_var;
++      target += S_GET_VALUE(symbolP);
++
++      if (stretch != 0
++	  && sym_frag->relax_marker != fragP->relax_marker
++	  && S_GET_SEGMENT(symbolP) == segment)
++	/* if it was correctly aligned before, make sure it stays aligned */
++	target += stretch & (~0UL << avr32_rs_align(state));
++
++      if (fragP->tc_frag_data.pcrel)
++	distance = target - (address & (~0UL << avr32_rs_align(state)));
++      else
++	distance = target;
++
++      pr_debug("%s:%d: relax more? 0x%x - 0x%x = 0x%x (%d), align %d\n",
++	       fragP->fr_file, fragP->fr_line, target, address,
++	       distance, distance, avr32_rs_align(state));
++
++      if (need_relax(state, distance))
++	{
++	  if (relax_more(state) != AVR32_RS_NONE)
++	    next_state = relax_more(state);
++	  pr_debug("%s:%d: relax more %d -> %d (%d - %d, align %d)\n",
++		   fragP->fr_file, fragP->fr_line, state, next_state,
++		   target, address, avr32_rs_align(state));
++	}
++    }
++
++  growth = avr32_rs_size(next_state) - avr32_rs_size(state);
++  fragP->fr_subtype = next_state;
++
++  pr_debug("%s:%d: md_relax_frag: growth=%d, subtype=%d, opc=0x%08lx\n",
++	   fragP->fr_file, fragP->fr_line, growth, fragP->fr_subtype,
++	   avr32_opc_table[next_state].value);
++
++  return growth;
++}
++
++static long
++avr32_lda_relax_frag(segT segment, fragS *fragP, long stretch)
++{
++  struct cpool *pool= NULL;
++  unsigned int entry = 0;
++  addressT address, target;
++  offsetT distance;
++  symbolS *symbolP;
++  fragS *sym_frag;
++  long old_size, new_size;
++
++  symbolP = fragP->fr_symbol;
++  old_size = fragP->fr_var;
++  if (!avr32_pic)
++    {
++      pool = fragP->tc_frag_data.pool;
++      entry = fragP->tc_frag_data.pool_entry;
++    }
++
++  address = fragP->fr_address;
++  address += fragP->fr_fix - LDA_INITIAL_SIZE;
++
++  if (!S_IS_DEFINED(symbolP) || S_FORCE_RELOC(symbolP, 1))
++    goto relax_max;
++
++  target = fragP->fr_offset;
++  sym_frag = symbol_get_frag(symbolP);
++  target += S_GET_VALUE(symbolP);
++
++  if (sym_frag->relax_marker != fragP->relax_marker
++      && S_GET_SEGMENT(symbolP) == segment)
++    target += stretch;
++
++  distance = target - address;
++
++  pr_debug("lda_relax_frag: target: %d, address: %d, var: %d\n",
++	   target, address, fragP->fr_var);
++
++  if (!avr32_pic && S_GET_SEGMENT(symbolP) == absolute_section
++      && target <= 127 && (offsetT)target >= -128)
++    {
++      if (fragP->fr_subtype == LDA_SUBTYPE_LDDPC
++	  || fragP->fr_subtype == LDA_SUBTYPE_LDW)
++	pool->literals[entry].refcount--;
++      new_size = 2;
++      fragP->fr_subtype = LDA_SUBTYPE_MOV1;
++    }
++  else if (!avr32_pic && S_GET_SEGMENT(symbolP) == absolute_section
++	   && target <= 1048575 && (offsetT)target >= -1048576)
++    {
++      if (fragP->fr_subtype == LDA_SUBTYPE_LDDPC
++	  || fragP->fr_subtype == LDA_SUBTYPE_LDW)
++	pool->literals[entry].refcount--;
++      new_size = 4;
++      fragP->fr_subtype = LDA_SUBTYPE_MOV2;
++    }
++  else if (!linkrelax && S_GET_SEGMENT(symbolP) == segment
++	   /* the field will be negated, so this is really -(-32768)
++	      and -(32767) */
++	   && distance <= 32768 && distance >= -32767)
++    {
++      if (!avr32_pic
++	  && (fragP->fr_subtype == LDA_SUBTYPE_LDDPC
++	      || fragP->fr_subtype == LDA_SUBTYPE_LDW))
++	pool->literals[entry].refcount--;
++      new_size = 4;
++      fragP->fr_subtype = LDA_SUBTYPE_SUB;
++    }
++  else
++    {
++    relax_max:
++      if (avr32_pic)
++	{
++	  if (linkrelax)
++	    {
++	      new_size = 8;
++	      fragP->fr_subtype = LDA_SUBTYPE_GOTLOAD_LARGE;
++	    }
++	  else
++	    {
++	      new_size = 4;
++	      fragP->fr_subtype = LDA_SUBTYPE_GOTLOAD;
++	    }
++	}
++      else
++	{
++	  if (fragP->fr_subtype != LDA_SUBTYPE_LDDPC
++	      && fragP->fr_subtype != LDA_SUBTYPE_LDW)
++	    pool->literals[entry].refcount++;
++
++	  sym_frag = symbol_get_frag(pool->symbol);
++	  target = (sym_frag->fr_address + sym_frag->fr_fix
++		    + pool->padding + pool->literals[entry].offset);
++
++	  pr_debug("cpool sym address: 0x%lx\n",
++		   sym_frag->fr_address + sym_frag->fr_fix);
++
++	  know(pool->section == segment);
++
++	  if (sym_frag->relax_marker != fragP->relax_marker)
++	    target += stretch;
++
++	  distance = target - address;
++	  if (distance <= 508 && distance >= 0)
++	    {
++	      new_size = 2;
++	      fragP->fr_subtype = LDA_SUBTYPE_LDDPC;
++	    }
++	  else
++	    {
++	      new_size = 4;
++	      fragP->fr_subtype = LDA_SUBTYPE_LDW;
++	    }
++
++	  pr_debug("lda_relax_frag (cpool): target=0x%lx, address=0x%lx, refcount=%d\n",
++		   target, address, pool->literals[entry].refcount);
++	}
++    }
++
++  fragP->fr_var = new_size;
++
++  pr_debug("%s:%d: lda: relax pass done. subtype: %d, growth: %ld\n",
++	   fragP->fr_file, fragP->fr_line,
++	   fragP->fr_subtype, new_size - old_size);
++
++  return new_size - old_size;
++}
++
++static long
++avr32_call_relax_frag(segT segment, fragS *fragP, long stretch)
++{
++  struct cpool *pool = NULL;
++  unsigned int entry = 0;
++  addressT address, target;
++  offsetT distance;
++  symbolS *symbolP;
++  fragS *sym_frag;
++  long old_size, new_size;
++
++  symbolP = fragP->fr_symbol;
++  old_size = fragP->fr_var;
++  if (!avr32_pic)
++    {
++      pool = fragP->tc_frag_data.pool;
++      entry = fragP->tc_frag_data.pool_entry;
++    }
++
++  address = fragP->fr_address;
++  address += fragP->fr_fix - CALL_INITIAL_SIZE;
++
++  if (need_reloc(symbolP, segment, 1))
++    {
++      pr_debug("call: must emit reloc\n");
++      goto relax_max;
++    }
++
++  target = fragP->fr_offset;
++  sym_frag = symbol_get_frag(symbolP);
++  target += S_GET_VALUE(symbolP);
++
++  if (sym_frag->relax_marker != fragP->relax_marker
++      && S_GET_SEGMENT(symbolP) == segment)
++    target += stretch;
++
++  distance = target - address;
++
++  if (distance <= 1022 && distance >= -1024)
++    {
++      pr_debug("call: distance is %d, emitting short rcall\n", distance);
++      if (!avr32_pic && fragP->fr_subtype == CALL_SUBTYPE_MCALL_CP)
++	pool->literals[entry].refcount--;
++      new_size = 2;
++      fragP->fr_subtype = CALL_SUBTYPE_RCALL1;
++    }
++  else if (distance <= 2097150 && distance >= -2097152)
++    {
++      pr_debug("call: distance is %d, emitting long rcall\n", distance);
++      if (!avr32_pic && fragP->fr_subtype == CALL_SUBTYPE_MCALL_CP)
++	pool->literals[entry].refcount--;
++      new_size = 4;
++      fragP->fr_subtype = CALL_SUBTYPE_RCALL2;
++    }
++  else
++    {
++      pr_debug("call: distance %d too far, emitting something big\n", distance);
++
++    relax_max:
++      if (avr32_pic)
++	{
++	  if (linkrelax)
++	    {
++	      new_size = 10;
++	      fragP->fr_subtype = CALL_SUBTYPE_MCALL_LARGE;
++	    }
++	  else
++	    {
++	      new_size = 4;
++	      fragP->fr_subtype = CALL_SUBTYPE_MCALL_GOT;
++	    }
++	}
++      else
++	{
++	  if (fragP->fr_subtype != CALL_SUBTYPE_MCALL_CP)
++	    pool->literals[entry].refcount++;
++
++	  new_size = 4;
++	  fragP->fr_subtype = CALL_SUBTYPE_MCALL_CP;
++	}
++    }
++
++  fragP->fr_var = new_size;
++
++  pr_debug("%s:%d: call: relax pass done, growth: %d, fr_var: %d\n",
++	   fragP->fr_file, fragP->fr_line,
++	   new_size - old_size, fragP->fr_var);
++
++  return new_size - old_size;
++}
++
++static long
++avr32_cpool_relax_frag(segT segment ATTRIBUTE_UNUSED,
++		       fragS *fragP,
++		       long stretch ATTRIBUTE_UNUSED)
++{
++  struct cpool *pool;
++  addressT address;
++  long old_size, new_size;
++  unsigned int entry;
++
++  pool = fragP->tc_frag_data.pool;
++  address = fragP->fr_address + fragP->fr_fix;
++  old_size = fragP->fr_var;
++  new_size = 0;
++
++  for (entry = 0; entry < pool->next_free_entry; entry++)
++    {
++      if (pool->literals[entry].refcount > 0)
++	{
++	  pool->literals[entry].offset = new_size;
++	  new_size += 4;
++	}
++    }
++
++  fragP->fr_var = new_size;
++
++  return new_size - old_size;
++}
++
++/* *fragP has been relaxed to its final size, and now needs to have
++   the bytes inside it modified to conform to the new size.
++
++   Called after relaxation is finished.
++   fragP->fr_type == rs_machine_dependent.
++   fragP->fr_subtype is the subtype of what the address relaxed to.  */
++
++static void
++avr32_default_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
++			    segT segment ATTRIBUTE_UNUSED,
++			    fragS *fragP)
++{
++  const struct avr32_opcode *opc;
++  const struct avr32_ifield *ifield;
++  bfd_reloc_code_real_type r_type;
++  symbolS *symbolP;
++  fixS *fixP;
++  bfd_vma value;
++  int subtype;
++
++  opc = &avr32_opc_table[fragP->fr_subtype];
++  ifield = opc->fields[opc->var_field];
++  symbolP = fragP->fr_symbol;
++  subtype = fragP->fr_subtype;
++  r_type = opc->reloc_type;
++
++  /* Clear the opcode bits and the bits belonging to the relaxed
++     field.  We assume all other fields stay the same.  */
++  value = bfd_getb32(fragP->fr_opcode);
++  value &= ~(opc->mask | ifield->mask);
++
++  /* Insert the new opcode */
++  value |= opc->value;
++  bfd_putb32(value, fragP->fr_opcode);
++
++  fragP->fr_fix += opc->size - fragP->fr_var;
++
++  if (fragP->tc_frag_data.reloc_info != AVR32_OPINFO_NONE)
++    {
++      switch (fragP->tc_frag_data.reloc_info)
++	{
++	case AVR32_OPINFO_HI:
++	  r_type = BFD_RELOC_HI16;
++	  break;
++	case AVR32_OPINFO_LO:
++	  r_type = BFD_RELOC_LO16;
++	  break;
++	case AVR32_OPINFO_GOT:
++	  switch (r_type)
++	    {
++	    case BFD_RELOC_AVR32_18W_PCREL:
++	      r_type = BFD_RELOC_AVR32_GOT18SW;
++	      break;
++	    case BFD_RELOC_AVR32_16S:
++	      r_type = BFD_RELOC_AVR32_GOT16S;
++	      break;
++	    default:
++	      BAD_CASE(r_type);
++	      break;
++	    }
++	  break;
++	default:
++	  BAD_CASE(fragP->tc_frag_data.reloc_info);
++	  break;
++	}
++    }
++
++  pr_debug("%s:%d: convert_frag: new %s fixup\n",
++	   fragP->fr_file, fragP->fr_line,
++	   bfd_get_reloc_code_name(r_type));
++
++#if 1
++  fixP = fix_new_exp(fragP, fragP->fr_fix - opc->size, opc->size,
++		     &fragP->tc_frag_data.exp,
++		     fragP->tc_frag_data.pcrel, r_type);
++#else
++  fixP = fix_new(fragP, fragP->fr_fix - opc->size, opc->size, symbolP,
++		 fragP->fr_offset, fragP->tc_frag_data.pcrel, r_type);
++#endif
++
++  /* Revert fix_new brain damage. "dot_value" is the value of PC at
++     the point of the fixup, relative to the frag address.  fix_new()
++     and friends think they are only being called during the assembly
++     pass, not during relaxation or similar, so fx_dot_value, fx_file
++     and fx_line are all initialized to the wrong value.  But we don't
++     know the size of the fixup until now, so we really can't live up
++     to the assumptions these functions make about the target.  What
++     do these functions think the "where" and "frag" argument mean
++     anyway?  */
++  fixP->fx_dot_value = fragP->fr_fix - opc->size;
++  fixP->fx_file = fragP->fr_file;
++  fixP->fx_line = fragP->fr_line;
++
++  fixP->tc_fix_data.ifield = ifield;
++  fixP->tc_fix_data.align = avr32_rs_align(subtype);
++  fixP->tc_fix_data.min = avr32_relax_table[subtype].lower_bound;
++  fixP->tc_fix_data.max = avr32_relax_table[subtype].upper_bound;
++}
++
++static void
++avr32_lda_convert_frag(bfd *abfd ATTRIBUTE_UNUSED,
++		       segT segment ATTRIBUTE_UNUSED,
++		       fragS *fragP)
++{
++  const struct avr32_opcode *opc;
++  const struct avr32_ifield *ifield;
++  bfd_reloc_code_real_type r_type;
++  expressionS exp;
++  struct cpool *pool;
++  fixS *fixP;
++  bfd_vma value;
++  int regid, pcrel = 0, align = 0;
++  char *p;
++
++  r_type = BFD_RELOC_NONE;
++  regid = fragP->tc_frag_data.reloc_info;
++  p = fragP->fr_opcode;
++  exp.X_add_symbol = fragP->fr_symbol;
++  exp.X_add_number = fragP->fr_offset;
++  exp.X_op = O_symbol;
++
++  pr_debug("%s:%d: lda_convert_frag, subtype: %d, fix: %d, var: %d, regid: %d\n",
++	   fragP->fr_file, fragP->fr_line,
++	   fragP->fr_subtype, fragP->fr_fix, fragP->fr_var, regid);
++
++  switch (fragP->fr_subtype)
++    {
++    case LDA_SUBTYPE_MOV1:
++      opc = &avr32_opc_table[AVR32_OPC_MOV1];
++      opc->fields[0]->insert(opc->fields[0], p, regid);
++      ifield = opc->fields[1];
++      r_type = opc->reloc_type;
++      break;
++    case LDA_SUBTYPE_MOV2:
++      opc = &avr32_opc_table[AVR32_OPC_MOV2];
++      opc->fields[0]->insert(opc->fields[0], p, regid);
++      ifield = opc->fields[1];
++      r_type = opc->reloc_type;
++      break;
++    case LDA_SUBTYPE_SUB:
++      opc = &avr32_opc_table[AVR32_OPC_SUB5];
++      opc->fields[0]->insert(opc->fields[0], p, regid);
++      opc->fields[1]->insert(opc->fields[1], p, AVR32_REG_PC);
++      ifield = opc->fields[2];
++      r_type = BFD_RELOC_AVR32_16N_PCREL;
++
++      /* Pretend that SUB5 isn't a "negated" pcrel expression for now.
++	 We'll have to fix it up later when we know whether to
++	 generate a reloc for it (in which case the linker will negate
++	 it, so we shouldn't). */
++      pcrel = 1;
++      break;
++    case LDA_SUBTYPE_LDDPC:
++      opc = &avr32_opc_table[AVR32_OPC_LDDPC];
++      align = 2;
++      r_type = BFD_RELOC_AVR32_9W_CP;
++      goto cpool_common;
++    case LDA_SUBTYPE_LDW:
++      opc = &avr32_opc_table[AVR32_OPC_LDDPC_EXT];
++      r_type = BFD_RELOC_AVR32_16_CP;
++    cpool_common:
++      opc->fields[0]->insert(opc->fields[0], p, regid);
++      ifield = opc->fields[1];
++      pool = fragP->tc_frag_data.pool;
++      exp.X_add_symbol = pool->symbol;
++      exp.X_add_number = pool->literals[fragP->tc_frag_data.pool_entry].offset;
++      pcrel = 1;
++      break;
++    case LDA_SUBTYPE_GOTLOAD_LARGE:
++      /* ld.w Rd, r6[Rd << 2] (last) */
++      opc = &avr32_opc_table[AVR32_OPC_LD_W5];
++      bfd_putb32(opc->value, p + 4);
++      opc->fields[0]->insert(opc->fields[0], p + 4, regid);
++      opc->fields[1]->insert(opc->fields[1], p + 4, 6);
++      opc->fields[2]->insert(opc->fields[2], p + 4, regid);
++      opc->fields[3]->insert(opc->fields[3], p + 4, 2);
++
++      /* mov Rd, (got_offset / 4) */
++      opc = &avr32_opc_table[AVR32_OPC_MOV2];
++      opc->fields[0]->insert(opc->fields[0], p, regid);
++      ifield = opc->fields[1];
++      r_type = BFD_RELOC_AVR32_LDA_GOT;
++      break;
++    case LDA_SUBTYPE_GOTLOAD:
++      opc = &avr32_opc_table[AVR32_OPC_LD_W4];
++      opc->fields[0]->insert(opc->fields[0], p, regid);
++      opc->fields[1]->insert(opc->fields[1], p, 6);
++      ifield = opc->fields[2];
++      if (r_type == BFD_RELOC_NONE)
++	r_type = BFD_RELOC_AVR32_GOT16S;
++      break;
++    default:
++      BAD_CASE(fragP->fr_subtype);
++    }
++
++  value = bfd_getb32(p);
++  value &= ~(opc->mask | ifield->mask);
++  value |= opc->value;
++  bfd_putb32(value, p);
++
++  fragP->fr_fix += fragP->fr_var - LDA_INITIAL_SIZE;
++
++  if (fragP->fr_next
++      && ((offsetT)(fragP->fr_next->fr_address - fragP->fr_address)
++	  != fragP->fr_fix))
++    {
++      fprintf(stderr, "LDA frag: fr_fix is wrong! fragP->fr_var = %ld, r_type = %s\n",
++	      fragP->fr_var, bfd_get_reloc_code_name(r_type));
++      abort();
++    }
++
++  fixP = fix_new_exp(fragP, fragP->fr_fix - fragP->fr_var, fragP->fr_var,
++		     &exp, pcrel, r_type);
++
++  /* Revert fix_new brain damage. "dot_value" is the value of PC at
++     the point of the fixup, relative to the frag address.  fix_new()
++     and friends think they are only being called during the assembly
++     pass, not during relaxation or similar, so fx_dot_value, fx_file
++     and fx_line are all initialized to the wrong value.  But we don't
++     know the size of the fixup until now, so we really can't live up
++     to the assumptions these functions make about the target.  What
++     do these functions think the "where" and "frag" argument mean
++     anyway?  */
++  fixP->fx_dot_value = fragP->fr_fix - opc->size;
++  fixP->fx_file = fragP->fr_file;
++  fixP->fx_line = fragP->fr_line;
++
++  fixP->tc_fix_data.ifield = ifield;
++  fixP->tc_fix_data.align = align;
++  /* these are only used if the fixup can actually be resolved */
++  fixP->tc_fix_data.min = -32768;
++  fixP->tc_fix_data.max = 32767;
++}
++
++static void
++avr32_call_convert_frag(bfd *abfd ATTRIBUTE_UNUSED,
++		       segT segment ATTRIBUTE_UNUSED,
++		       fragS *fragP)
++{
++  const struct avr32_opcode *opc = NULL;
++  const struct avr32_ifield *ifield;
++  bfd_reloc_code_real_type r_type;
++  symbolS *symbol;
++  offsetT offset;
++  fixS *fixP;
++  bfd_vma value;
++  int pcrel = 0, align = 0;
++  char *p;
++
++  symbol = fragP->fr_symbol;
++  offset = fragP->fr_offset;
++  r_type = BFD_RELOC_NONE;
++  p = fragP->fr_opcode;
++
++  pr_debug("%s:%d: call_convert_frag, subtype: %d, fix: %d, var: %d\n",
++	   fragP->fr_file, fragP->fr_line,
++	   fragP->fr_subtype, fragP->fr_fix, fragP->fr_var);
++
++  switch (fragP->fr_subtype)
++    {
++    case CALL_SUBTYPE_RCALL1:
++      opc = &avr32_opc_table[AVR32_OPC_RCALL1];
++      /* fall through */
++    case CALL_SUBTYPE_RCALL2:
++      if (!opc)
++	opc = &avr32_opc_table[AVR32_OPC_RCALL2];
++      ifield = opc->fields[0];
++      r_type = opc->reloc_type;
++      pcrel = 1;
++      align = 1;
++      break;
++    case CALL_SUBTYPE_MCALL_CP:
++      opc = &avr32_opc_table[AVR32_OPC_MCALL];
++      opc->fields[0]->insert(opc->fields[0], p, AVR32_REG_PC);
++      ifield = opc->fields[1];
++      r_type = BFD_RELOC_AVR32_CPCALL;
++      symbol = fragP->tc_frag_data.pool->symbol;
++      offset = fragP->tc_frag_data.pool->literals[fragP->tc_frag_data.pool_entry].offset;
++      assert(fragP->tc_frag_data.pool->literals[fragP->tc_frag_data.pool_entry].refcount > 0);
++      pcrel = 1;
++      align = 2;
++      break;
++    case CALL_SUBTYPE_MCALL_GOT:
++      opc = &avr32_opc_table[AVR32_OPC_MCALL];
++      opc->fields[0]->insert(opc->fields[0], p, 6);
++      ifield = opc->fields[1];
++      r_type = BFD_RELOC_AVR32_GOT18SW;
++      break;
++    case CALL_SUBTYPE_MCALL_LARGE:
++      assert(fragP->fr_var == 10);
++      /* ld.w lr, r6[lr << 2] */
++      opc = &avr32_opc_table[AVR32_OPC_LD_W5];
++      bfd_putb32(opc->value, p + 4);
++      opc->fields[0]->insert(opc->fields[0], p + 4, AVR32_REG_LR);
++      opc->fields[1]->insert(opc->fields[1], p + 4, 6);
++      opc->fields[2]->insert(opc->fields[2], p + 4, AVR32_REG_LR);
++      opc->fields[3]->insert(opc->fields[3], p + 4, 2);
++
++      /* icall lr */
++      opc = &avr32_opc_table[AVR32_OPC_ICALL];
++      bfd_putb16(opc->value >> 16, p + 8);
++      opc->fields[0]->insert(opc->fields[0], p + 8, AVR32_REG_LR);
++
++      /* mov lr, (got_offset / 4) */
++      opc = &avr32_opc_table[AVR32_OPC_MOV2];
++      opc->fields[0]->insert(opc->fields[0], p, AVR32_REG_LR);
++      ifield = opc->fields[1];
++      r_type = BFD_RELOC_AVR32_GOTCALL;
++      break;
++    default:
++      BAD_CASE(fragP->fr_subtype);
++    }
++
++  /* Insert the opcode and clear the variable ifield */
++  value = bfd_getb32(p);
++  value &= ~(opc->mask | ifield->mask);
++  value |= opc->value;
++  bfd_putb32(value, p);
++
++  fragP->fr_fix += fragP->fr_var - CALL_INITIAL_SIZE;
++
++  if (fragP->fr_next
++      && ((offsetT)(fragP->fr_next->fr_address - fragP->fr_address)
++	  != fragP->fr_fix))
++    {
++      fprintf(stderr, "%s:%d: fr_fix %lu is wrong! fr_var=%lu, r_type=%s\n",
++	      fragP->fr_file, fragP->fr_line,
++	      fragP->fr_fix, fragP->fr_var, bfd_get_reloc_code_name(r_type));
++      fprintf(stderr, "fr_fix should be %ld. next frag is %s:%d\n",
++	      (offsetT)(fragP->fr_next->fr_address - fragP->fr_address),
++	      fragP->fr_next->fr_file, fragP->fr_next->fr_line);
++    }
++
++  fixP = fix_new(fragP, fragP->fr_fix - fragP->fr_var, fragP->fr_var,
++		 symbol, offset, pcrel, r_type);
++
++  /* Revert fix_new brain damage. "dot_value" is the value of PC at
++     the point of the fixup, relative to the frag address.  fix_new()
++     and friends think they are only being called during the assembly
++     pass, not during relaxation or similar, so fx_dot_value, fx_file
++     and fx_line are all initialized to the wrong value.  But we don't
++     know the size of the fixup until now, so we really can't live up
++     to the assumptions these functions make about the target.  What
++     do these functions think the "where" and "frag" argument mean
++     anyway?  */
++  fixP->fx_dot_value = fragP->fr_fix - opc->size;
++  fixP->fx_file = fragP->fr_file;
++  fixP->fx_line = fragP->fr_line;
++
++  fixP->tc_fix_data.ifield = ifield;
++  fixP->tc_fix_data.align = align;
++  /* these are only used if the fixup can actually be resolved */
++  fixP->tc_fix_data.min = -2097152;
++  fixP->tc_fix_data.max = 2097150;
++}
++
++static void
++avr32_cpool_convert_frag(bfd *abfd ATTRIBUTE_UNUSED,
++			 segT segment ATTRIBUTE_UNUSED,
++			 fragS *fragP)
++{
++  struct cpool *pool;
++  addressT address;
++  unsigned int entry;
++  char *p;
++  char sym_name[20];
++
++  /* Did we get rid of the frag altogether? */
++  if (!fragP->fr_var)
++    return;
++
++  pool = fragP->tc_frag_data.pool;
++  address = fragP->fr_address + fragP->fr_fix;
++  p = fragP->fr_literal + fragP->fr_fix;
++
++  sprintf(sym_name, "$$cp_\002%x", pool->id);
++  symbol_locate(pool->symbol, sym_name, pool->section, fragP->fr_fix, fragP);
++  symbol_table_insert(pool->symbol);
++
++  for (entry = 0; entry < pool->next_free_entry; entry++)
++    {
++      if (pool->literals[entry].refcount > 0)
++	{
++	  fix_new_exp(fragP, fragP->fr_fix, 4, &pool->literals[entry].exp,
++		      FALSE, BFD_RELOC_AVR32_32_CPENT);
++	  fragP->fr_fix += 4;
++	}
++    }
++}
++
++static struct avr32_relaxer avr32_default_relaxer = {
++  .estimate_size	= avr32_default_estimate_size_before_relax,
++  .relax_frag		= avr32_default_relax_frag,
++  .convert_frag		= avr32_default_convert_frag,
++};
++static struct avr32_relaxer avr32_lda_relaxer = {
++  .estimate_size	= avr32_lda_estimate_size_before_relax,
++  .relax_frag		= avr32_lda_relax_frag,
++  .convert_frag		= avr32_lda_convert_frag,
++};
++static struct avr32_relaxer avr32_call_relaxer = {
++  .estimate_size	= avr32_call_estimate_size_before_relax,
++  .relax_frag		= avr32_call_relax_frag,
++  .convert_frag		= avr32_call_convert_frag,
++};
++static struct avr32_relaxer avr32_cpool_relaxer = {
++  .estimate_size	= avr32_cpool_estimate_size_before_relax,
++  .relax_frag		= avr32_cpool_relax_frag,
++  .convert_frag		= avr32_cpool_convert_frag,
++};
++
++static void s_cpool(int arg ATTRIBUTE_UNUSED)
++{
++  struct cpool *pool;
++  unsigned int max_size;
++  char *buf;
++
++  pool = find_cpool(now_seg, now_subseg);
++  if (!pool || !pool->symbol || pool->next_free_entry == 0)
++    return;
++
++  /* Make sure the constant pool is properly aligned */
++  frag_align_code(2, 0);
++  if (bfd_get_section_alignment(stdoutput, pool->section) < 2)
++    bfd_set_section_alignment(stdoutput, pool->section, 2);
++
++  /* Assume none of the entries are discarded, and that we need the
++     maximum amount of alignment.  But we're not going to allocate
++     anything up front. */
++  max_size = pool->next_free_entry * 4 + 2;
++  frag_grow(max_size);
++  buf = frag_more(0);
++
++  frag_now->tc_frag_data.relaxer = &avr32_cpool_relaxer;
++  frag_now->tc_frag_data.pool = pool;
++
++  symbol_set_frag(pool->symbol, frag_now);
++
++  /* Assume zero initial size, allowing other relaxers to be
++     optimistic about things.  */
++  frag_var(rs_machine_dependent, max_size, 0,
++	   0, pool->symbol, 0, NULL);
++
++  /* Mark the pool as empty.  */
++  pool->used = 1;
++}
++
++/* The location from which a PC relative jump should be calculated,
++   given a PC relative reloc.  */
++
++long
++md_pcrel_from_section (fixS *fixP, segT sec)
++{
++  pr_debug("pcrel_from_section, fx_offset = %d\n", fixP->fx_offset);
++
++  if (fixP->fx_addsy != NULL
++      && (! S_IS_DEFINED (fixP->fx_addsy)
++          || S_GET_SEGMENT (fixP->fx_addsy) != sec
++	  || S_FORCE_RELOC(fixP->fx_addsy, 1)))
++    {
++      pr_debug("Unknown pcrel symbol: %s\n", S_GET_NAME(fixP->fx_addsy));
++
++      /* The symbol is undefined (or is defined but not in this section).
++	 Let the linker figure it out.  */
++      return 0;
++    }
++
++  pr_debug("pcrel from %x + %x, symbol: %s (%x)\n",
++	   fixP->fx_frag->fr_address, fixP->fx_where,
++	   fixP->fx_addsy?S_GET_NAME(fixP->fx_addsy):"(null)",
++	   fixP->fx_addsy?S_GET_VALUE(fixP->fx_addsy):0);
++
++  return ((fixP->fx_frag->fr_address + fixP->fx_where)
++	  & (~0UL << fixP->tc_fix_data.align));
++}
++
++valueT
++md_section_align (segT segment, valueT size)
++{
++  int align = bfd_get_section_alignment (stdoutput, segment);
++  return ((size + (1 << align) - 1) & (-1 << align));
++}
++
++static int syntax_matches(const struct avr32_syntax *syntax,
++			  char *str)
++{
++  int i;
++
++  pr_debug("syntax %d matches `%s'?\n", syntax->id, str);
++
++  if (syntax->nr_operands < 0)
++    {
++      struct avr32_operand *op;
++      int optype;
++
++      for (i = 0; i < (-syntax->nr_operands - 1); i++)
++	{
++	  char *p;
++	  char c;
++
++	  optype = syntax->operand[i];
++	  assert(optype < AVR32_NR_OPERANDS);
++	  op = &avr32_operand_table[optype];
++
++	  for (p = str; *p; p++)
++	    if (*p == ',')
++	      break;
++
++	  if (p == str)
++	    return 0;
++
++	  c = *p;
++	  *p = 0;
++
++	  if (!op->match(str))
++	    {
++	      *p = c;
++	      return 0;
++	    }
++
++	  str = p;
++	  *p = c;
++	  if (c)
++	    str++;
++	}
++
++      optype = syntax->operand[i];
++      assert(optype < AVR32_NR_OPERANDS);
++      op = &avr32_operand_table[optype];
++
++      if (!op->match(str))
++	return 0;
++      return 1;
++    }
++
++  for (i = 0; i < syntax->nr_operands; i++)
++    {
++      struct avr32_operand *op;
++      int optype = syntax->operand[i];
++      char *p;
++      char c;
++
++      assert(optype < AVR32_NR_OPERANDS);
++      op = &avr32_operand_table[optype];
++
++      for (p = str; *p; p++)
++	if (*p == ',')
++	  break;
++
++      if (p == str)
++	return 0;
++
++      c = *p;
++      *p = 0;
++
++      if (!op->match(str))
++	{
++	  *p = c;
++	  return 0;
++	}
++
++      str = p;
++      *p = c;
++      if (c)
++	str++;
++    }
++
++  if (*str == '\0')
++    return 1;
++
++  if ((*str == 'e' || *str == 'E') && !str[1])
++    return 1;
++
++  return 0;
++}
++
++static int parse_operands(char *str)
++{
++  int i;
++
++  if (current_insn.syntax->nr_operands < 0)
++    {
++      int optype;
++      struct avr32_operand *op;
++
++      for (i = 0; i < (-current_insn.syntax->nr_operands - 1); i++)
++	{
++	  char *p;
++	  char c;
++
++	  optype = current_insn.syntax->operand[i];
++	  op = &avr32_operand_table[optype];
++
++	  for (p = str; *p; p++)
++	    if (*p == ',')
++	      break;
++
++	  assert(p != str);
++
++	  c = *p, *p = 0;
++	  op->parse(op, str, i);
++	  *p = c;
++
++	  str = p;
++	  if (c) str++;
++	}
++
++      /* give the rest of the line to the last operand */
++      optype = current_insn.syntax->operand[i];
++      op = &avr32_operand_table[optype];
++      op->parse(op, str, i);
++    }
++  else
++    {
++      for (i = 0; i < current_insn.syntax->nr_operands; i++)
++	{
++	  int optype = current_insn.syntax->operand[i];
++	  struct avr32_operand *op = &avr32_operand_table[optype];
++	  char *p;
++	  char c;
++
++	  skip_whitespace(str);
++
++	  for (p = str; *p; p++)
++	    if (*p == ',')
++	      break;
++
++	  assert(p != str);
++
++	  c = *p, *p = 0;
++	  op->parse(op, str, i);
++	  *p = c;
++
++	  str = p;
++	  if (c) str++;
++	}
++
++      if (*str == 'E' || *str == 'e')
++	current_insn.force_extended = 1;
++    }
++
++  return 0;
++}
++
++static const char *
++finish_insn(const struct avr32_opcode *opc)
++{
++  expressionS *exp = &current_insn.immediate;
++  unsigned int i;
++  int will_relax = 0;
++  char *buf;
++
++  assert(current_insn.next_slot == opc->nr_fields);
++
++  pr_debug("%s:%d: finish_insn: trying opcode %d\n",
++	   frag_now->fr_file, frag_now->fr_line, opc->id);
++
++  /* Go through the relaxation stage for all instructions that can
++     possibly take a symbolic immediate.  The relax code will take
++     care of range checking and alignment.  */
++  if (opc->var_field != -1)
++    {
++      int substate, largest_substate;
++      symbolS *sym;
++      offsetT off;
++
++      will_relax = 1;
++      substate = largest_substate = opc_initial_substate(opc);
++
++      while (relax_more(largest_substate) != AVR32_RS_NONE)
++	largest_substate = relax_more(largest_substate);
++
++      pr_debug("will relax. initial substate: %d (size %d), largest substate: %d (size %d)\n",
++	       substate, avr32_rs_size(substate),
++	       largest_substate, avr32_rs_size(largest_substate));
++
++      /* make sure we have enough room for the largest possible opcode */
++      frag_grow(avr32_rs_size(largest_substate));
++      buf = frag_more(opc->size);
++
++      dwarf2_emit_insn(opc->size);
++
++      frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_NONE;
++      frag_now->tc_frag_data.pcrel = current_insn.pcrel;
++      frag_now->tc_frag_data.force_extended = current_insn.force_extended;
++      frag_now->tc_frag_data.relaxer = &avr32_default_relaxer;
++
++      if (exp->X_op == O_hi)
++	{
++	  frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_HI;
++	  exp->X_op = exp->X_md;
++	}
++      else if (exp->X_op == O_lo)
++	{
++	  frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_LO;
++	  exp->X_op = exp->X_md;
++	}
++      else if (exp->X_op == O_got)
++	{
++	  frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_GOT;
++	  exp->X_op = O_symbol;
++	}
++
++#if 0
++      if ((opc->reloc_type == BFD_RELOC_AVR32_SUB5)
++	  && exp->X_op == O_subtract)
++	{
++	  symbolS *tmp;
++	  tmp = exp->X_add_symbol;
++	  exp->X_add_symbol = exp->X_op_symbol;
++	  exp->X_op_symbol = tmp;
++	}
++#endif
++
++      frag_now->tc_frag_data.exp = current_insn.immediate;
++
++      sym = exp->X_add_symbol;
++      off = exp->X_add_number;
++      if (exp->X_op != O_symbol)
++	{
++	  sym = make_expr_symbol(exp);
++	  off = 0;
++	}
++
++      frag_var(rs_machine_dependent,
++	       avr32_rs_size(largest_substate) - opc->size,
++	       opc->size,
++	       substate, sym, off, buf);
++    }
++  else
++    {
++      assert(avr32_rs_size(opc_initial_substate(opc)) == 0);
++
++      /* Make sure we always have room for another whole word, as the ifield
++	 inserters can only write words. */
++      frag_grow(4);
++      buf = frag_more(opc->size);
++      dwarf2_emit_insn(opc->size);
++    }
++
++  assert(!(opc->value & ~opc->mask));
++
++  pr_debug("inserting opcode: 0x%lx\n", opc->value);
++  bfd_putb32(opc->value, buf);
++
++  for (i = 0; i < opc->nr_fields; i++)
++    {
++      const struct avr32_ifield *f = opc->fields[i];
++      const struct avr32_ifield_data *fd = &current_insn.field_value[i];
++
++      pr_debug("inserting field: 0x%lx & 0x%lx\n",
++	       fd->value >> fd->align_order, f->mask);
++
++      f->insert(f, buf, fd->value >> fd->align_order);
++    }
++
++  assert(will_relax || !current_insn.immediate.X_add_symbol);
++  return NULL;
++}
++
++static const char *
++finish_alias(const struct avr32_alias *alias)
++{
++  const struct avr32_opcode *opc;
++  struct {
++    unsigned long value;
++    unsigned long align;
++  } mapped_operand[AVR32_MAX_OPERANDS];
++  unsigned int i;
++
++  opc = alias->opc;
++
++  /* Remap the operands from the alias to the real opcode */
++  for (i = 0; i < opc->nr_fields; i++)
++    {
++      if (alias->operand_map[i].is_opindex)
++	{
++	  struct avr32_ifield_data *fd;
++	  fd = &current_insn.field_value[alias->operand_map[i].value];
++	  mapped_operand[i].value = fd->value;
++	  mapped_operand[i].align = fd->align_order;
++	}
++      else
++	{
++	  mapped_operand[i].value = alias->operand_map[i].value;
++	  mapped_operand[i].align = 0;
++	}
++    }
++
++  for (i = 0; i < opc->nr_fields; i++)
++    {
++      current_insn.field_value[i].value = mapped_operand[i].value;
++      if (opc->id == AVR32_OPC_COP)
++	current_insn.field_value[i].align_order = 0;
++      else
++	current_insn.field_value[i].align_order
++	  = mapped_operand[i].align;
++    }
++
++  current_insn.next_slot = opc->nr_fields;
++
++  return finish_insn(opc);
++}
++
++static const char *
++finish_lda(const struct avr32_syntax *syntax ATTRIBUTE_UNUSED)
++{
++  expressionS *exp = &current_insn.immediate;
++  relax_substateT initial_subtype;
++  symbolS *sym;
++  offsetT off;
++  int initial_size, max_size;
++  char *buf;
++
++  initial_size = LDA_INITIAL_SIZE;
++
++  if (avr32_pic)
++    {
++      initial_subtype = LDA_SUBTYPE_SUB;
++      if (linkrelax)
++	max_size = 8;
++      else
++	max_size = 4;
++    }
++  else
++    {
++      initial_subtype = LDA_SUBTYPE_MOV1;
++      max_size = 4;
++    }
++
++  frag_grow(max_size);
++  buf = frag_more(initial_size);
++  dwarf2_emit_insn(initial_size);
++
++  if (exp->X_op == O_symbol)
++    {
++      sym = exp->X_add_symbol;
++      off = exp->X_add_number;
++    }
++  else
++    {
++      sym = make_expr_symbol(exp);
++      off = 0;
++    }
++
++  frag_now->tc_frag_data.reloc_info = current_insn.field_value[0].value;
++  frag_now->tc_frag_data.relaxer = &avr32_lda_relaxer;
++
++  if (!avr32_pic)
++    {
++      /* The relaxer will bump the refcount if necessary */
++      frag_now->tc_frag_data.pool
++	= add_to_cpool(exp, &frag_now->tc_frag_data.pool_entry, 0);
++    }
++
++  frag_var(rs_machine_dependent, max_size - initial_size,
++	   initial_size, initial_subtype, sym, off, buf);
++
++  return NULL;
++}
++
++static const char *
++finish_call(const struct avr32_syntax *syntax ATTRIBUTE_UNUSED)
++{
++  expressionS *exp = &current_insn.immediate;
++  symbolS *sym;
++  offsetT off;
++  int initial_size, max_size;
++  char *buf;
++
++  initial_size = CALL_INITIAL_SIZE;
++
++  if (avr32_pic)
++    {
++      if (linkrelax)
++	max_size = 10;
++      else
++	max_size = 4;
++    }
++  else
++    max_size = 4;
++
++  frag_grow(max_size);
++  buf = frag_more(initial_size);
++  dwarf2_emit_insn(initial_size);
++
++  frag_now->tc_frag_data.relaxer = &avr32_call_relaxer;
++
++  if (exp->X_op == O_symbol)
++    {
++      sym = exp->X_add_symbol;
++      off = exp->X_add_number;
++    }
++  else
++    {
++      sym = make_expr_symbol(exp);
++      off = 0;
++    }
++
++  if (!avr32_pic)
++    {
++      /* The relaxer will bump the refcount if necessary */
++      frag_now->tc_frag_data.pool
++	= add_to_cpool(exp, &frag_now->tc_frag_data.pool_entry, 0);
++    }
++
++  frag_var(rs_machine_dependent, max_size - initial_size,
++	   initial_size, CALL_SUBTYPE_RCALL1, sym, off, buf);
++
++  return NULL;
++}
++
++void
++md_begin (void)
++{
++  unsigned long flags = 0;
++  int i;
++
++  avr32_mnemonic_htab = hash_new();
++
++  if (!avr32_mnemonic_htab)
++    as_fatal(_("virtual memory exhausted"));
++
++  for (i = 0; i < AVR32_NR_MNEMONICS; i++)
++    {
++      hash_insert(avr32_mnemonic_htab, avr32_mnemonic_table[i].name,
++		  (void *)&avr32_mnemonic_table[i]);
++    }
++
++  if (linkrelax)
++    flags |= EF_AVR32_LINKRELAX;
++  if (avr32_pic)
++    flags |= EF_AVR32_PIC;
++
++  bfd_set_private_flags(stdoutput, flags);
++
++#ifdef OPC_CONSISTENCY_CHECK
++  if (sizeof(avr32_operand_table)/sizeof(avr32_operand_table[0])
++      < AVR32_NR_OPERANDS)
++    as_fatal(_("operand table is incomplete"));
++
++  for (i = 0; i < AVR32_NR_OPERANDS; i++)
++    if (avr32_operand_table[i].id != i)
++      as_fatal(_("operand table inconsistency found at index %d\n"), i);
++  pr_debug("%d operands verified\n", AVR32_NR_OPERANDS);
++
++  for (i = 0; i < AVR32_NR_IFIELDS; i++)
++    if (avr32_ifield_table[i].id != i)
++      as_fatal(_("ifield table inconsistency found at index %d\n"), i);
++  pr_debug("%d instruction fields verified\n", AVR32_NR_IFIELDS);
++
++  for (i = 0; i < AVR32_NR_OPCODES; i++)
++    {
++      if (avr32_opc_table[i].id != i)
++	as_fatal(_("opcode table inconsistency found at index %d\n"), i);
++      if ((avr32_opc_table[i].var_field == -1
++	   && avr32_relax_table[i].length != 0)
++	  || (avr32_opc_table[i].var_field != -1
++	      && avr32_relax_table[i].length == 0))
++	as_fatal(_("relax table inconsistency found at index %d\n"), i);
++    }
++  pr_debug("%d opcodes verified\n", AVR32_NR_OPCODES);
++
++  for (i = 0; i < AVR32_NR_SYNTAX; i++)
++    if (avr32_syntax_table[i].id != i)
++      as_fatal(_("syntax table inconsistency found at index %d\n"), i);
++  pr_debug("%d syntax variants verified\n", AVR32_NR_SYNTAX);
++
++  for (i = 0; i < AVR32_NR_ALIAS; i++)
++    if (avr32_alias_table[i].id != i)
++      as_fatal(_("alias table inconsistency found at index %d\n"), i);
++  pr_debug("%d aliases verified\n", AVR32_NR_ALIAS);
++
++  for (i = 0; i < AVR32_NR_MNEMONICS; i++)
++    if (avr32_mnemonic_table[i].id != i)
++      as_fatal(_("mnemonic table inconsistency found at index %d\n"), i);
++  pr_debug("%d mnemonics verified\n", AVR32_NR_MNEMONICS);
++#endif
++}
++
++void
++md_assemble (char *str)
++{
++  struct avr32_mnemonic *mnemonic;
++  char *p, c;
++
++  memset(&current_insn, 0, sizeof(current_insn));
++  current_insn.immediate.X_op = O_constant;
++
++  skip_whitespace(str);
++  for (p = str; *p; p++)
++    if (*p == ' ')
++      break;
++  c = *p;
++  *p = 0;
++
++  mnemonic = hash_find(avr32_mnemonic_htab, str);
++  *p = c;
++  if (c) p++;
++
++  if (mnemonic)
++    {
++      const struct avr32_syntax *syntax;
++
++      for (syntax = mnemonic->syntax; syntax; syntax = syntax->next)
++	{
++	  const char *errmsg = NULL;
++
++	  if (syntax_matches(syntax, p))
++	    {
++	      if (!(syntax->isa_flags & avr32_arch->isa_flags))
++		{
++		  as_bad(_("Selected architecture `%s'  does not support `%s'"),
++			 avr32_arch->name, str);
++		  return;
++		}
++
++	      current_insn.syntax = syntax;
++	      parse_operands(p);
++
++	      switch (syntax->type)
++		{
++		case AVR32_PARSER_NORMAL:
++		  errmsg = finish_insn(syntax->u.opc);
++		  break;
++		case AVR32_PARSER_ALIAS:
++		  errmsg = finish_alias(syntax->u.alias);
++		  break;
++		case AVR32_PARSER_LDA:
++		  errmsg = finish_lda(syntax);
++		  break;
++		case AVR32_PARSER_CALL:
++		  errmsg = finish_call(syntax);
++		  break;
++		default:
++		  BAD_CASE(syntax->type);
++		  break;
++		}
++
++	      if (errmsg)
++		as_bad("%s in `%s'", errmsg, str);
++
++	      return;
++	    }
++	}
++
++      as_bad(_("unrecognized form of instruction: `%s'"), str);
++    }
++  else
++    as_bad(_("unrecognized instruction `%s'"), str);
++}
++
++void avr32_cleanup(void)
++{
++  struct cpool *pool;
++
++  /* Emit any constant pools that haven't been explicitly flushed with
++     a .cpool directive. */
++  for (pool = cpool_list; pool; pool = pool->next)
++    {
++      subseg_set(pool->section, pool->sub_section);
++      s_cpool(0);
++    }
++}
++
++/* Handle any PIC-related operands in data allocation pseudo-ops */
++void
++avr32_cons_fix_new (fragS *frag, int off, int size, expressionS *exp)
++{
++  bfd_reloc_code_real_type r_type = BFD_RELOC_UNUSED;
++  int pcrel = 0;
++
++  pr_debug("%s:%u: cons_fix_new, add_sym: %s, op_sym: %s, op: %d, add_num: %d\n",
++	   frag->fr_file, frag->fr_line,
++	   exp->X_add_symbol?S_GET_NAME(exp->X_add_symbol):"(none)",
++	   exp->X_op_symbol?S_GET_NAME(exp->X_op_symbol):"(none)",
++	   exp->X_op, exp->X_add_number);
++
++  if (exp->X_op == O_subtract && exp->X_op_symbol)
++    {
++      if (exp->X_op_symbol == GOT_symbol)
++	{
++	  if (size != 4)
++	    goto bad_size;
++	  r_type = BFD_RELOC_AVR32_GOTPC;
++	  exp->X_op = O_symbol;
++	  exp->X_op_symbol = NULL;
++	}
++    }
++  else if (exp->X_op == O_got)
++    {
++      switch (size)
++	{
++	case 1:
++	  r_type = BFD_RELOC_AVR32_GOT8;
++	  break;
++	case 2:
++	  r_type = BFD_RELOC_AVR32_GOT16;
++	  break;
++	case 4:
++	  r_type = BFD_RELOC_AVR32_GOT32;
++	  break;
++	default:
++	  goto bad_size;
++	}
++
++      exp->X_op = O_symbol;
++    }
++
++  if (r_type == BFD_RELOC_UNUSED)
++    switch (size)
++      {
++      case 1:
++	r_type = BFD_RELOC_8;
++	break;
++      case 2:
++	r_type = BFD_RELOC_16;
++	break;
++      case 4:
++	r_type = BFD_RELOC_32;
++	break;
++      default:
++	goto bad_size;
++      }
++  else if (size != 4)
++    {
++    bad_size:
++      as_bad(_("unsupported BFD relocation size %u"), size);
++      r_type = BFD_RELOC_UNUSED;
++    }
++
++  fix_new_exp (frag, off, size, exp, pcrel, r_type);
++}
++
++static void
++avr32_frob_section(bfd *abfd ATTRIBUTE_UNUSED, segT sec,
++		   void *ignore ATTRIBUTE_UNUSED)
++{
++  segment_info_type *seginfo;
++  fixS *fix;
++
++  seginfo = seg_info(sec);
++  if (!seginfo)
++    return;
++
++  for (fix = seginfo->fix_root; fix; fix = fix->fx_next)
++    {
++      if (fix->fx_done)
++	continue;
++
++      if (fix->fx_r_type == BFD_RELOC_AVR32_SUB5
++	  && fix->fx_addsy && fix->fx_subsy)
++	{
++	  if (S_GET_SEGMENT(fix->fx_addsy) != S_GET_SEGMENT(fix->fx_subsy)
++	      || linkrelax)
++	    {
++	      symbolS *tmp;
++#ifdef DEBUG
++	      fprintf(stderr, "Swapping symbols in fixup:\n");
++	      print_fixup(fix);
++#endif
++	      tmp = fix->fx_addsy;
++	      fix->fx_addsy = fix->fx_subsy;
++	      fix->fx_subsy = tmp;
++	      fix->fx_offset = -fix->fx_offset;
++	    }
++	}
++    }
++}
++
++/* We need to look for SUB5 instructions with expressions that will be
++   made PC-relative and switch fx_addsy with fx_subsy.  This has to be
++   done before adjustment or the wrong symbol might be adjusted.
++
++   This applies to fixups that are a result of expressions like -(sym
++   - .) and that will make it all the way to md_apply_fix3().  LDA
++   does the right thing in convert_frag, so we must not convert
++   those. */
++void
++avr32_frob_file(void)
++{
++  /* if (1 || !linkrelax)
++     return; */
++
++  bfd_map_over_sections(stdoutput, avr32_frob_section, NULL);
++}
++
++static bfd_boolean
++convert_to_diff_reloc(fixS *fixP)
++{
++  switch (fixP->fx_r_type)
++    {
++    case BFD_RELOC_32:
++      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF32;
++      break;
++    case BFD_RELOC_16:
++      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF16;
++      break;
++    case BFD_RELOC_8:
++      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF8;
++      break;
++    default:
++      return FALSE;
++    }
++
++  return TRUE;
++}
++
++/* Simplify a fixup.  If possible, the fixup is reduced to a single
++   constant which is written to the output file.  Otherwise, a
++   relocation is generated so that the linker can take care of the
++   rest.
++
++   ELF relocations have certain constraints: They can only take a
++   single symbol and a single addend.  This means that for difference
++   expressions, we _must_ get rid of the fx_subsy symbol somehow.
++
++   The difference between two labels in the same section can be
++   calculated directly unless 'linkrelax' is set, or a relocation is
++   forced.  If so, we must emit a R_AVR32_DIFFxx relocation.  If there
++   are addends involved at this point, we must be especially careful
++   as the relocation must point exactly to the symbol being
++   subtracted.
++
++   When subtracting a symbol defined in the same section as the fixup,
++   we might be able to convert it to a PC-relative expression, unless
++   linkrelax is set. If this is the case, there's no way we can make
++   sure that the difference between the fixup and fx_subsy stays
++   constant.  So for now, we're just going to disallow that.
++   */
++void
++avr32_process_fixup(fixS *fixP, segT this_segment)
++{
++  segT add_symbol_segment = absolute_section;
++  segT sub_symbol_segment = absolute_section;
++  symbolS *fx_addsy, *fx_subsy;
++  offsetT value = 0, fx_offset;
++  bfd_boolean apply = FALSE;
++
++  assert(this_segment != absolute_section);
++
++  if (fixP->fx_r_type >= BFD_RELOC_UNUSED)
++    {
++      as_bad_where(fixP->fx_file, fixP->fx_line,
++		   _("Bad relocation type %d\n"), fixP->fx_r_type);
++      return;
++    }
++
++  /* BFD_RELOC_AVR32_SUB5 fixups have been swapped by avr32_frob_section() */
++  fx_addsy = fixP->fx_addsy;
++  fx_subsy = fixP->fx_subsy;
++  fx_offset = fixP->fx_offset;
++
++  if (fx_addsy)
++    add_symbol_segment = S_GET_SEGMENT(fx_addsy);
++
++  if (fx_subsy)
++    {
++      resolve_symbol_value(fx_subsy);
++      sub_symbol_segment = S_GET_SEGMENT(fx_subsy);
++
++      if (sub_symbol_segment == this_segment
++	  && (!linkrelax
++	      || S_GET_VALUE(fx_subsy) == (fixP->fx_frag->fr_address
++					   + fixP->fx_where)))
++	{
++	  fixP->fx_pcrel = TRUE;
++	  fx_offset += (fixP->fx_frag->fr_address + fixP->fx_where
++			- S_GET_VALUE(fx_subsy));
++	  fx_subsy = NULL;
++	}
++      else if (sub_symbol_segment == absolute_section)
++	{
++	  /* The symbol is really a constant.  */
++	  fx_offset -= S_GET_VALUE(fx_subsy);
++	  fx_subsy = NULL;
++	}
++      else if (SEG_NORMAL(add_symbol_segment)
++	       && sub_symbol_segment == add_symbol_segment
++	       && (!linkrelax || convert_to_diff_reloc(fixP)))
++	{
++	  /* Difference between two labels in the same section.  */
++	  if (linkrelax)
++	    {
++	      /* convert_to_diff() has ensured that the reloc type is
++		 either DIFF32, DIFF16 or DIFF8.  */
++	      value = (S_GET_VALUE(fx_addsy) + fixP->fx_offset
++		       - S_GET_VALUE(fx_subsy));
++
++	      /* Try to convert it to a section symbol if possible  */
++	      if (!S_FORCE_RELOC(fx_addsy, 1)
++		  && !(sub_symbol_segment->flags & SEC_THREAD_LOCAL))
++		{
++		  fx_offset = S_GET_VALUE(fx_subsy);
++		  fx_addsy = section_symbol(sub_symbol_segment);
++		}
++	      else
++		{
++		  fx_addsy = fx_subsy;
++		  fx_offset = 0;
++		}
++
++	      fx_subsy = NULL;
++	      apply = TRUE;
++	    }
++	  else
++	    {
++	      fx_offset += S_GET_VALUE(fx_addsy);
++	      fx_offset -= S_GET_VALUE(fx_subsy);
++	      fx_addsy = NULL;
++	      fx_subsy = NULL;
++	    }
++	}
++      else
++	{
++	  as_bad_where(fixP->fx_file, fixP->fx_line,
++		       _("can't resolve `%s' {%s section} - `%s' {%s section}"),
++		       fx_addsy ? S_GET_NAME (fx_addsy) : "0",
++		       segment_name (add_symbol_segment),
++		       S_GET_NAME (fx_subsy),
++		       segment_name (sub_symbol_segment));
++	  return;
++	}
++    }
++
++  if (fx_addsy && !TC_FORCE_RELOCATION(fixP))
++    {
++      if (add_symbol_segment == this_segment
++	  && fixP->fx_pcrel)
++	{
++	  value += S_GET_VALUE(fx_addsy);
++	  value -= md_pcrel_from_section(fixP, this_segment);
++	  fx_addsy = NULL;
++	  fixP->fx_pcrel = FALSE;
++	}
++      else if (add_symbol_segment == absolute_section)
++	{
++	  fx_offset += S_GET_VALUE(fixP->fx_addsy);
++	  fx_addsy = NULL;
++	}
++    }
++
++  if (!fx_addsy)
++    fixP->fx_done = TRUE;
++
++  if (fixP->fx_pcrel)
++    {
++      if (fx_addsy != NULL
++	  && S_IS_DEFINED(fx_addsy)
++	  && S_GET_SEGMENT(fx_addsy) != this_segment)
++	value += md_pcrel_from_section(fixP, this_segment);
++
++      switch (fixP->fx_r_type)
++	{
++	case BFD_RELOC_32:
++	  fixP->fx_r_type = BFD_RELOC_32_PCREL;
++	  break;
++	case BFD_RELOC_16:
++	  fixP->fx_r_type = BFD_RELOC_16_PCREL;
++	  break;
++	case BFD_RELOC_8:
++	  fixP->fx_r_type = BFD_RELOC_8_PCREL;
++	  break;
++	case BFD_RELOC_AVR32_SUB5:
++	  fixP->fx_r_type = BFD_RELOC_AVR32_16N_PCREL;
++	  break;
++	case BFD_RELOC_AVR32_16S:
++	  fixP->fx_r_type = BFD_RELOC_AVR32_16B_PCREL;
++	  break;
++	case BFD_RELOC_AVR32_14UW:
++	  fixP->fx_r_type = BFD_RELOC_AVR32_14UW_PCREL;
++	  break;
++	case BFD_RELOC_AVR32_10UW:
++	  fixP->fx_r_type = BFD_RELOC_AVR32_10UW_PCREL;
++	  break;
++	default:
++	  /* Should have been taken care of already */
++	  break;
++	}
++    }
++
++  if (fixP->fx_done || apply)
++    {
++      const struct avr32_ifield *ifield;
++      char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
++
++      if (fixP->fx_done)
++	value += fx_offset;
++
++      /* For hosts with longs bigger than 32-bits make sure that the top
++         bits of a 32-bit negative value read in by the parser are set,
++         so that the correct comparisons are made.  */
++      if (value & 0x80000000)
++        value |= (-1L << 31);
++
++      switch (fixP->fx_r_type)
++	{
++	case BFD_RELOC_32:
++	case BFD_RELOC_16:
++	case BFD_RELOC_8:
++	case BFD_RELOC_AVR32_DIFF32:
++	case BFD_RELOC_AVR32_DIFF16:
++	case BFD_RELOC_AVR32_DIFF8:
++	  md_number_to_chars(buf, value, fixP->fx_size);
++	  break;
++	case BFD_RELOC_HI16:
++	  value >>= 16;
++	case BFD_RELOC_LO16:
++	  value &= 0xffff;
++	  md_number_to_chars(buf + 2, value, 2);
++	  break;
++	case BFD_RELOC_AVR32_16N_PCREL:
++	  value = -value;
++	  /* fall through */
++	case BFD_RELOC_AVR32_22H_PCREL:
++	case BFD_RELOC_AVR32_18W_PCREL:
++	case BFD_RELOC_AVR32_16B_PCREL:
++	case BFD_RELOC_AVR32_11H_PCREL:
++	case BFD_RELOC_AVR32_9H_PCREL:
++	case BFD_RELOC_AVR32_9UW_PCREL:
++	case BFD_RELOC_AVR32_3U:
++	case BFD_RELOC_AVR32_4UH:
++	case BFD_RELOC_AVR32_6UW:
++	case BFD_RELOC_AVR32_6S:
++	case BFD_RELOC_AVR32_7UW:
++	case BFD_RELOC_AVR32_8S_EXT:
++	case BFD_RELOC_AVR32_8S:
++	case BFD_RELOC_AVR32_10UW:
++	case BFD_RELOC_AVR32_10SW:
++	case BFD_RELOC_AVR32_STHH_W:
++	case BFD_RELOC_AVR32_14UW:
++	case BFD_RELOC_AVR32_16S:
++	case BFD_RELOC_AVR32_16U:
++	case BFD_RELOC_AVR32_21S:
++	case BFD_RELOC_AVR32_SUB5:
++	case BFD_RELOC_AVR32_CPCALL:
++	case BFD_RELOC_AVR32_16_CP:
++	case BFD_RELOC_AVR32_9W_CP:
++	case BFD_RELOC_AVR32_15S:
++	  ifield = fixP->tc_fix_data.ifield;
++	  pr_debug("insert field: %ld <= %ld <= %ld (align %u)\n",
++		   fixP->tc_fix_data.min, value, fixP->tc_fix_data.max,
++		   fixP->tc_fix_data.align);
++	  if (value < fixP->tc_fix_data.min || value > fixP->tc_fix_data.max)
++	    as_bad_where(fixP->fx_file, fixP->fx_line,
++			 _("operand out of range (%ld not between %ld and %ld)"),
++			 value, fixP->tc_fix_data.min, fixP->tc_fix_data.max);
++	  if (value & ((1 << fixP->tc_fix_data.align) - 1))
++	    as_bad_where(fixP->fx_file, fixP->fx_line,
++			 _("misaligned operand (required alignment: %d)"),
++			 1 << fixP->tc_fix_data.align);
++	  ifield->insert(ifield, buf, value >> fixP->tc_fix_data.align);
++	  break;
++	case BFD_RELOC_AVR32_ALIGN:
++	  /* Nothing to do */
++	  fixP->fx_done = FALSE;
++	  break;
++	default:
++	  as_fatal("reloc type %s not handled\n",
++		   bfd_get_reloc_code_name(fixP->fx_r_type));
++	}
++    }
++
++  fixP->fx_addsy = fx_addsy;
++  fixP->fx_subsy = fx_subsy;
++  fixP->fx_offset = fx_offset;
++
++  if (!fixP->fx_done)
++    {
++      if (!fixP->fx_addsy)
++	fixP->fx_addsy = abs_section_sym;
++
++      symbol_mark_used_in_reloc(fixP->fx_addsy);
++      if (fixP->fx_subsy)
++	abort();
++    }
++}
++
++#if 0
++void
++md_apply_fix3 (fixS *fixP, valueT *valP, segT seg)
++{
++  const struct avr32_ifield *ifield;
++  offsetT	value = *valP;
++  char		*buf = fixP->fx_where + fixP->fx_frag->fr_literal;
++  bfd_boolean	apply;
++
++  pr_debug("%s:%u: apply_fix3: r_type=%d value=%lx offset=%lx\n",
++	   fixP->fx_file, fixP->fx_line, fixP->fx_r_type, *valP,
++	   fixP->fx_offset);
++
++  if (fixP->fx_r_type >= BFD_RELOC_UNUSED)
++    {
++      as_bad_where(fixP->fx_file, fixP->fx_line,
++		   _("Bad relocation type %d\n"), fixP->fx_r_type);
++      return;
++    }
++
++  if (!fixP->fx_addsy && !fixP->fx_subsy)
++    fixP->fx_done = 1;
++
++  if (fixP->fx_pcrel)
++    {
++      if (fixP->fx_addsy != NULL
++	  && S_IS_DEFINED(fixP->fx_addsy)
++	  && S_GET_SEGMENT(fixP->fx_addsy) != seg)
++	value += md_pcrel_from_section(fixP, seg);
++
++      switch (fixP->fx_r_type)
++	{
++	case BFD_RELOC_32:
++	  fixP->fx_r_type = BFD_RELOC_32_PCREL;
++	  break;
++	case BFD_RELOC_16:
++	case BFD_RELOC_8:
++	  as_bad_where (fixP->fx_file, fixP->fx_line,
++			_("8- and 16-bit PC-relative relocations not supported"));
++	  break;
++	case BFD_RELOC_AVR32_SUB5:
++	  fixP->fx_r_type = BFD_RELOC_AVR32_PCREL_SUB5;
++	  break;
++	case BFD_RELOC_AVR32_16S:
++	  fixP->fx_r_type = BFD_RELOC_AVR32_16_PCREL;
++	  break;
++	default:
++	  /* Should have been taken care of already */
++	  break;
++	}
++    }
++
++  if (fixP->fx_r_type == BFD_RELOC_32
++      && fixP->fx_subsy)
++    {
++      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF32;
++
++      /* Offsets are only allowed if it's a result of adjusting a
++	 local symbol into a section-relative offset.
++	 tc_fix_adjustable() should prevent any adjustment if there
++	 was an offset involved before.  */
++      if (fixP->fx_offset && !symbol_section_p(fixP->fx_addsy))
++	as_bad_where(fixP->fx_file, fixP->fx_line,
++		     _("cannot represent symbol difference with an offset"));
++
++      value = (S_GET_VALUE(fixP->fx_addsy) + fixP->fx_offset
++	       - S_GET_VALUE(fixP->fx_subsy));
++
++      /* The difference before any relaxing takes place is written
++	 out, and the DIFF32 reloc identifies the address of the first
++	 symbol (i.e. the on that's subtracted.)  */
++      *valP = value;
++      fixP->fx_offset -= value;
++      fixP->fx_subsy = NULL;
++
++      md_number_to_chars(buf, value, fixP->fx_size);
++    }
++
++  if (fixP->fx_done)
++    {
++      switch (fixP->fx_r_type)
++	{
++	case BFD_RELOC_8:
++	case BFD_RELOC_16:
++	case BFD_RELOC_32:
++	  md_number_to_chars(buf, value, fixP->fx_size);
++	  break;
++	case BFD_RELOC_HI16:
++	  value >>= 16;
++	case BFD_RELOC_LO16:
++	  value &= 0xffff;
++	  *valP = value;
++	  md_number_to_chars(buf + 2, value, 2);
++	  break;
++	case BFD_RELOC_AVR32_PCREL_SUB5:
++	  value = -value;
++	  /* fall through */
++	case BFD_RELOC_AVR32_9_PCREL:
++	case BFD_RELOC_AVR32_11_PCREL:
++	case BFD_RELOC_AVR32_16_PCREL:
++	case BFD_RELOC_AVR32_18_PCREL:
++	case BFD_RELOC_AVR32_22_PCREL:
++	case BFD_RELOC_AVR32_3U:
++	case BFD_RELOC_AVR32_4UH:
++	case BFD_RELOC_AVR32_6UW:
++	case BFD_RELOC_AVR32_6S:
++	case BFD_RELOC_AVR32_7UW:
++	case BFD_RELOC_AVR32_8S:
++	case BFD_RELOC_AVR32_10UW:
++	case BFD_RELOC_AVR32_10SW:
++	case BFD_RELOC_AVR32_14UW:
++	case BFD_RELOC_AVR32_16S:
++	case BFD_RELOC_AVR32_16U:
++	case BFD_RELOC_AVR32_21S:
++	case BFD_RELOC_AVR32_BRC1:
++	case BFD_RELOC_AVR32_SUB5:
++	case BFD_RELOC_AVR32_CPCALL:
++	case BFD_RELOC_AVR32_16_CP:
++	case BFD_RELOC_AVR32_9_CP:
++	case BFD_RELOC_AVR32_15S:
++	  ifield = fixP->tc_fix_data.ifield;
++	  pr_debug("insert field: %ld <= %ld <= %ld (align %u)\n",
++		   fixP->tc_fix_data.min, value, fixP->tc_fix_data.max,
++		   fixP->tc_fix_data.align);
++	  if (value < fixP->tc_fix_data.min || value > fixP->tc_fix_data.max)
++	    as_bad_where(fixP->fx_file, fixP->fx_line,
++			 _("operand out of range (%ld not between %ld and %ld)"),
++			 value, fixP->tc_fix_data.min, fixP->tc_fix_data.max);
++	  if (value & ((1 << fixP->tc_fix_data.align) - 1))
++	    as_bad_where(fixP->fx_file, fixP->fx_line,
++			 _("misaligned operand (required alignment: %d)"),
++			 1 << fixP->tc_fix_data.align);
++	  ifield->insert(ifield, buf, value >> fixP->tc_fix_data.align);
++	  break;
++	case BFD_RELOC_AVR32_ALIGN:
++	  /* Nothing to do */
++	  fixP->fx_done = FALSE;
++	  break;
++	default:
++	  as_fatal("reloc type %s not handled\n",
++		   bfd_get_reloc_code_name(fixP->fx_r_type));
++	}
++    }
++}
++#endif
++
++arelent *
++tc_gen_reloc (asection *section ATTRIBUTE_UNUSED,
++	      fixS *fixp)
++{
++  arelent *reloc;
++  bfd_reloc_code_real_type code;
++
++  reloc = xmalloc (sizeof (arelent));
++
++  reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *));
++  *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
++  reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
++  reloc->addend = fixp->fx_offset;
++  code = fixp->fx_r_type;
++
++  reloc->howto = bfd_reloc_type_lookup (stdoutput, code);
++
++  if (reloc->howto == NULL)
++    {
++      as_bad_where (fixp->fx_file, fixp->fx_line,
++		    _("cannot represent relocation %s in this object file format"),
++		    bfd_get_reloc_code_name (code));
++      return NULL;
++    }
++
++  return reloc;
++}
++
++bfd_boolean
++avr32_force_reloc(fixS *fixP)
++{
++  if (linkrelax && fixP->fx_addsy
++      && !(S_GET_SEGMENT(fixP->fx_addsy)->flags & SEC_DEBUGGING)
++      && S_GET_SEGMENT(fixP->fx_addsy) != absolute_section)
++    {
++      pr_debug(stderr, "force reloc: addsy=%p, r_type=%d, sec=%s\n",
++	       fixP->fx_addsy, fixP->fx_r_type, S_GET_SEGMENT(fixP->fx_addsy)->name);
++      return 1;
++    }
++
++  return generic_force_reloc(fixP);
++}
++
++bfd_boolean
++avr32_fix_adjustable(fixS *fixP)
++{
++  switch (fixP->fx_r_type)
++    {
++      /* GOT relocations can't have addends since BFD treats all
++	 references to a given symbol the same. This means that we
++	 must avoid section-relative references to local symbols when
++	 dealing with these kinds of relocs */
++    case BFD_RELOC_AVR32_GOT32:
++    case BFD_RELOC_AVR32_GOT16:
++    case BFD_RELOC_AVR32_GOT8:
++    case BFD_RELOC_AVR32_GOT21S:
++    case BFD_RELOC_AVR32_GOT18SW:
++    case BFD_RELOC_AVR32_GOT16S:
++    case BFD_RELOC_AVR32_LDA_GOT:
++    case BFD_RELOC_AVR32_GOTCALL:
++      pr_debug("fix not adjustable\n");
++      return 0;
++
++    default:
++      break;
++    }
++
++  return 1;
++}
++
++/* When we want the linker to be able to relax the code, we need to
++   output a reloc for every .align directive requesting an alignment
++   to a four byte boundary or larger.  If we don't do this, the linker
++   can't guarantee that the alignment is actually maintained in the
++   linker output.
++
++   TODO: Might as well insert proper NOPs while we're at it... */
++void
++avr32_handle_align(fragS *frag)
++{
++  if (linkrelax
++      && frag->fr_type == rs_align_code
++      && frag->fr_address + frag->fr_fix > 0
++      && frag->fr_offset > 0)
++    {
++      /* The alignment order (fr_offset) is stored in the addend. */
++      fix_new(frag, frag->fr_fix, 2, &abs_symbol, frag->fr_offset,
++	      FALSE, BFD_RELOC_AVR32_ALIGN);
++    }
++}
++
++/* Relax_align. Advance location counter to next address that has 'alignment'
++   lowest order bits all 0s, return size of adjustment made.  */
++relax_addressT
++avr32_relax_align(segT segment ATTRIBUTE_UNUSED,
++		  fragS *fragP,
++		  relax_addressT address)
++{
++  relax_addressT mask;
++  relax_addressT new_address;
++  int alignment;
++
++  alignment = fragP->fr_offset;
++  mask = ~((~0) << alignment);
++  new_address = (address + mask) & (~mask);
++
++  return new_address - address;
++}
++
++/* Turn a string in input_line_pointer into a floating point constant
++   of type type, and store the appropriate bytes in *litP.  The number
++   of LITTLENUMS emitted is stored in *sizeP .  An error message is
++   returned, or NULL on OK. */
++
++/* Equal to MAX_PRECISION in atof-ieee.c */
++#define MAX_LITTLENUMS 6
++
++char *
++md_atof (type, litP, sizeP)
++char   type;
++char * litP;
++int *  sizeP;
++{
++  int              i;
++  int              prec;
++  LITTLENUM_TYPE   words [MAX_LITTLENUMS];
++  char *           t;
++
++  switch (type)
++  {
++    case 'f':
++    case 'F':
++    case 's':
++    case 'S':
++      prec = 2;
++      break;
++
++    case 'd':
++    case 'D':
++    case 'r':
++    case 'R':
++      prec = 4;
++      break;
++
++      /* FIXME: Some targets allow other format chars for bigger sizes here.  */
++
++    default:
++      * sizeP = 0;
++      return _("Bad call to md_atof()");
++  }
++
++  t = atof_ieee (input_line_pointer, type, words);
++  if (t)
++    input_line_pointer = t;
++  * sizeP = prec * sizeof (LITTLENUM_TYPE);
++
++  for (i = 0; i < prec; i++)
++  {
++    md_number_to_chars (litP, (valueT) words[i],
++                        sizeof (LITTLENUM_TYPE));
++    litP += sizeof (LITTLENUM_TYPE);
++  }
++
++  return 0;
++}
++
++static char *avr32_end_of_match(char *cont, char *what)
++{
++  int len = strlen (what);
++
++  if (! is_part_of_name (cont[len])
++      && strncasecmp (cont, what, len) == 0)
++    return cont + len;
++
++  return NULL;
++}
++
++int
++avr32_parse_name (char const *name, expressionS *exp, char *nextchar)
++{
++  char *next = input_line_pointer;
++  char *next_end;
++
++  pr_debug("parse_name: %s, nextchar=%c (%02x)\n", name, *nextchar, *nextchar);
++
++  if (*nextchar == '(')
++    {
++      if (strcasecmp(name, "hi") == 0)
++	{
++	  *next = *nextchar;
++
++	  expression(exp);
++
++	  if (exp->X_op == O_constant)
++	    {
++	      pr_debug("  -> constant hi(0x%08lx) -> 0x%04lx\n",
++		       exp->X_add_number, exp->X_add_number >> 16);
++	      exp->X_add_number = (exp->X_add_number >> 16) & 0xffff;
++	    }
++	  else
++	    {
++	      exp->X_md = exp->X_op;
++	      exp->X_op = O_hi;
++	    }
++
++	  return 1;
++	}
++      else if (strcasecmp(name, "lo") == 0)
++	{
++	  *next = *nextchar;
++
++	  expression(exp);
++
++	  if (exp->X_op == O_constant)
++	    exp->X_add_number &= 0xffff;
++	  else
++	    {
++	      exp->X_md = exp->X_op;
++	      exp->X_op = O_lo;
++	    }
++
++	  return 1;
++	}
++    }
++  else if (*nextchar == '@')
++    {
++      exp->X_md = exp->X_op;
++
++      if ((next_end = avr32_end_of_match (next + 1, "got")))
++	exp->X_op = O_got;
++      else if ((next_end = avr32_end_of_match (next + 1, "tlsgd")))
++	exp->X_op = O_tlsgd;
++      /* Add more as needed */
++      else
++	{
++	  char c;
++	  input_line_pointer++;
++	  c = get_symbol_end();
++	  as_bad (_("unknown relocation override `%s'"), next + 1);
++	  *input_line_pointer = c;
++	  input_line_pointer = next;
++	  return 0;
++	}
++
++      exp->X_op_symbol = NULL;
++      exp->X_add_symbol = symbol_find_or_make (name);
++      exp->X_add_number = 0;
++
++      *input_line_pointer = *nextchar;
++      input_line_pointer = next_end;
++      *nextchar = *input_line_pointer;
++      *input_line_pointer = '\0';
++      return 1;
++    }
++  else if (strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0)
++    {
++      if (!GOT_symbol)
++	GOT_symbol = symbol_find_or_make(name);
++
++      exp->X_add_symbol = GOT_symbol;
++      exp->X_op = O_symbol;
++      exp->X_add_number = 0;
++      return 1;
++    }
++
++  return 0;
++}
++
++static void
++s_rseg (int value ATTRIBUTE_UNUSED)
++{
++  /* Syntax: RSEG segment_name [:type] [NOROOT|ROOT] [(align)]
++   * Defaults:
++   *  - type: undocumented ("typically CODE or DATA")
++   *  - ROOT
++   *  - align: 1 for code, 0 for others
++   *
++   * TODO: NOROOT is ignored. If gas supports discardable segments, it should
++   * be implemented.
++   */
++  char *name, *end;
++  int length, type, attr;
++  int align = 0;
++
++  SKIP_WHITESPACE();
++
++  end = input_line_pointer;
++  while (0 == strchr ("\n\t;:( ", *end))
++    end++;
++  if (end == input_line_pointer)
++    {
++      as_warn (_("missing name"));
++      ignore_rest_of_line();
++      return;
++    }
++
++  name = xmalloc (end - input_line_pointer + 1);
++  memcpy (name, input_line_pointer, end - input_line_pointer);
++  name[end - input_line_pointer] = '\0';
++  input_line_pointer = end;
++
++  SKIP_WHITESPACE();
++
++  type = SHT_NULL;
++  attr = 0;
++
++  if (*input_line_pointer == ':')
++    {
++      /* Skip the colon */
++      ++input_line_pointer;
++      SKIP_WHITESPACE();
++
++      /* Possible options at this point:
++       *   - flag (ROOT or NOROOT)
++       *   - a segment type
++       */
++      end = input_line_pointer;
++      while (0 == strchr ("\n\t;:( ", *end))
++	end++;
++      length = end - input_line_pointer;
++      if (((length == 4) && (0 == strncasecmp( input_line_pointer, "ROOT", 4))) ||
++	  ((length == 6) && (0 == strncasecmp( input_line_pointer, "NOROOT", 6))))
++	{
++	  /* Ignore ROOT/NOROOT */
++	  input_line_pointer = end;
++	}
++      else
++	{
++	  /* Must be a segment type */
++	  switch (*input_line_pointer)
++	    {
++	    case 'C':
++	    case 'c':
++	      if ((length == 4) &&
++		  (0 == strncasecmp (input_line_pointer, "CODE", 4)))
++		{
++		  attr |= SHF_ALLOC | SHF_EXECINSTR;
++		  type = SHT_PROGBITS;
++		  align = 1;
++		  break;
++		}
++	      if ((length == 5) &&
++		  (0 == strncasecmp (input_line_pointer, "CONST", 5)))
++		{
++		  attr |= SHF_ALLOC;
++		  type = SHT_PROGBITS;
++		  break;
++		}
++	      goto de_fault;
++
++	    case 'D':
++	    case 'd':
++	      if ((length == 4) &&
++		  (0 == strncasecmp (input_line_pointer, "DATA", 4)))
++		{
++		  attr |= SHF_ALLOC | SHF_WRITE;
++		  type = SHT_PROGBITS;
++		  break;
++		}
++	      goto de_fault;
++
++	      /* TODO: Add FAR*, HUGE*, IDATA and NEAR* if necessary */
++
++	    case 'U':
++	    case 'u':
++	      if ((length == 7) &&
++		  (0 == strncasecmp (input_line_pointer, "UNTYPED", 7)))
++		break;
++	      goto de_fault;
++
++	      /* TODO: Add XDATA and ZPAGE if necessary */
++
++	    de_fault:
++	    default:
++	      as_warn (_("unrecognized segment type"));
++	    }
++
++	  input_line_pointer = end;
++	  SKIP_WHITESPACE();
++
++	  if (*input_line_pointer == ':')
++	    {
++	      /*  ROOT/NOROOT */
++	      ++input_line_pointer;
++	      SKIP_WHITESPACE();
++
++	      end = input_line_pointer;
++	      while (0 == strchr ("\n\t;:( ", *end))
++		end++;
++	      length = end - input_line_pointer;
++	      if (! ((length == 4) &&
++		     (0 == strncasecmp( input_line_pointer, "ROOT", 4))) &&
++		  ! ((length == 6) &&
++		     (0 == strncasecmp( input_line_pointer, "NOROOT", 6))))
++		{
++		  as_warn (_("unrecognized segment flag"));
++		}
++
++	      input_line_pointer = end;
++	      SKIP_WHITESPACE();
++	    }
++	}
++    }
++
++  if (*input_line_pointer == '(')
++    {
++      align = get_absolute_expression ();
++    }
++
++  demand_empty_rest_of_line();
++
++  obj_elf_change_section (name, type, attr, 0, NULL, 0, 0);
++#ifdef AVR32_DEBUG
++  fprintf( stderr, "RSEG: Changed section to %s, type: 0x%x, attr: 0x%x\n",
++      name, type, attr );
++  fprintf( stderr, "RSEG: Aligning to 2**%d\n", align );
++#endif
++
++  if (align > 15)
++    {
++      align = 15;
++      as_warn (_("alignment too large: %u assumed"), align);
++    }
++
++  /* Hope not, that is */
++  assert (now_seg != absolute_section);
++
++  /* Only make a frag if we HAVE to... */
++  if (align != 0 && !need_pass_2)
++    {
++      if (subseg_text_p (now_seg))
++	frag_align_code (align, 0);
++      else
++	frag_align (align, 0, 0);
++    }
++
++  record_alignment (now_seg, align - OCTETS_PER_BYTE_POWER);
++}
++
++/* vim: syntax=c sw=2
++ */
+--- /dev/null
++++ b/gas/config/tc-avr32.h
+@@ -0,0 +1,325 @@
++/* Assembler definitions for AVR32.
++   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of GAS, the GNU Assembler.
++
++   GAS is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   GAS is distributed in the hope that 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 GAS; see the file COPYING.  If not, write to the Free
++   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
++   02111-1307, USA.  */
++
++#if 0
++#define DEBUG
++#define DEBUG1
++#define DEBUG2
++#define DEBUG3
++#define DEBUG4
++#define DEBUG5
++#endif
++
++/* Are we trying to be compatible with the IAR assembler? (--iar) */
++extern int avr32_iarcompat;
++
++/* By convention, you should define this macro in the `.h' file.  For
++   example, `tc-m68k.h' defines `TC_M68K'.  You might have to use this
++   if it is necessary to add CPU specific code to the object format
++   file.  */
++#define TC_AVR32
++
++/* This macro is the BFD target name to use when creating the output
++   file.  This will normally depend upon the `OBJ_FMT' macro.  */
++#define TARGET_FORMAT "elf32-avr32"
++
++/* This macro is the BFD architecture to pass to `bfd_set_arch_mach'.  */
++#define TARGET_ARCH bfd_arch_avr32
++
++/* This macro is the BFD machine number to pass to
++   `bfd_set_arch_mach'.  If it is not defined, GAS will use 0.  */
++#define TARGET_MACH 0
++
++/* UNDOCUMENTED: Allow //-style comments */
++#define DOUBLESLASH_LINE_COMMENTS
++
++/* You should define this macro to be non-zero if the target is big
++   endian, and zero if the target is little endian.  */
++#define TARGET_BYTES_BIG_ENDIAN 1
++
++/* FIXME: It seems that GAS only expects a one-byte opcode...
++   #define NOP_OPCODE 0xd703 */
++
++/* If you define this macro, GAS will warn about the use of
++   nonstandard escape sequences in a string.  */
++#undef ONLY_STANDARD_ESCAPES
++
++#define DWARF2_FORMAT(SEC) dwarf2_format_32bit
++
++/* Instructions are either 2 or 4 bytes long */
++/* #define DWARF2_LINE_MIN_INSN_LENGTH 2 */
++
++/* GAS will call this function for any expression that can not be
++   recognized.  When the function is called, `input_line_pointer'
++   will point to the start of the expression.  */
++#define md_operand(x)
++
++#define md_parse_name(name, expr, mode, c) avr32_parse_name(name, expr, c)
++extern int avr32_parse_name(const char *, struct expressionS *, char *);
++
++/* You may define this macro to generate a fixup for a data
++   allocation pseudo-op.  */
++#define TC_CONS_FIX_NEW(FRAG, OFF, LEN, EXP)	\
++  avr32_cons_fix_new(FRAG, OFF, LEN, EXP)
++void avr32_cons_fix_new (fragS *, int, int, expressionS *);
++
++/* `extsym - .' expressions can be emitted using PC-relative relocs */
++#define DIFF_EXPR_OK
++
++/* This is used to construct expressions out of @gotoff, etc. The
++   relocation type is stored in X_md */
++#define O_got		O_md1
++#define O_hi		O_md2
++#define O_lo		O_md3
++#define O_tlsgd		O_md4
++
++/* You may define this macro to parse an expression used in a data
++   allocation pseudo-op such as `.word'.  You can use this to
++   recognize relocation directives that may appear in such directives.  */
++/* #define TC_PARSE_CONS_EXPRESSION(EXPR,N) avr_parse_cons_expression (EXPR,N)
++   void avr_parse_cons_expression (expressionS *exp, int nbytes); */
++
++/* This should just call either `number_to_chars_bigendian' or
++   `number_to_chars_littleendian', whichever is appropriate.  On
++   targets like the MIPS which support options to change the
++   endianness, which function to call is a runtime decision.  On
++   other targets, `md_number_to_chars' can be a simple macro.  */
++#define md_number_to_chars number_to_chars_bigendian
++
++/* `md_short_jump_size'
++   `md_long_jump_size'
++   `md_create_short_jump'
++   `md_create_long_jump'
++   If `WORKING_DOT_WORD' is defined, GAS will not do broken word
++   processing (*note Broken words::.).  Otherwise, you should set
++   `md_short_jump_size' to the size of a short jump (a jump that is
++   just long enough to jump around a long jmp) and
++   `md_long_jump_size' to the size of a long jump (a jump that can go
++   anywhere in the function), You should define
++   `md_create_short_jump' to create a short jump around a long jump,
++   and define `md_create_long_jump' to create a long jump.  */
++#define WORKING_DOT_WORD
++
++/* If you define this macro, it means that `tc_gen_reloc' may return
++   multiple relocation entries for a single fixup.  In this case, the
++   return value of `tc_gen_reloc' is a pointer to a null terminated
++   array.  */
++#undef RELOC_EXPANSION_POSSIBLE
++
++/* If you define this macro, GAS will not require pseudo-ops to start with a .
++   character. */
++#define NO_PSEUDO_DOT (avr32_iarcompat)
++
++/* The IAR assembler uses $ as the location counter. Unfortunately, we
++   can't make this dependent on avr32_iarcompat... */
++#define DOLLAR_DOT
++
++/* Values passed to md_apply_fix3 don't include the symbol value.  */
++#define MD_APPLY_SYM_VALUE(FIX) 0
++
++/* The number of bytes to put into a word in a listing.  This affects
++   the way the bytes are clumped together in the listing.  For
++   example, a value of 2 might print `1234 5678' where a value of 1
++   would print `12 34 56 78'.  The default value is 4.  */
++#define LISTING_WORD_SIZE 4
++
++/* extern const struct relax_type md_relax_table[];
++#define TC_GENERIC_RELAX_TABLE md_relax_table */
++
++/*
++  An `.lcomm' directive with no explicit alignment parameter will use
++  this macro to set P2VAR to the alignment that a request for SIZE
++  bytes will have.  The alignment is expressed as a power of two.  If
++  no alignment should take place, the macro definition should do
++  nothing.  Some targets define a `.bss' directive that is also
++  affected by this macro.  The default definition will set P2VAR to
++  the truncated power of two of sizes up to eight bytes.
++
++  We want doublewords to be word-aligned, so we're going to modify the
++  default definition a tiny bit.
++*/
++#define TC_IMPLICIT_LCOMM_ALIGNMENT(SIZE, P2VAR)	\
++  do							\
++    {							\
++      if ((SIZE) >= 4)					\
++	(P2VAR) = 2;					\
++      else if ((SIZE) >= 2)				\
++	(P2VAR) = 1;					\
++      else						\
++	(P2VAR) = 0;					\
++    }							\
++  while (0)
++
++/* When relaxing, we need to generate relocations for alignment
++   directives.  */
++#define HANDLE_ALIGN(frag) avr32_handle_align(frag)
++extern void avr32_handle_align(fragS *);
++
++/* See internals doc for explanation. Oh wait...
++   Now, can you guess where "alignment" comes from? ;-) */
++#define MAX_MEM_FOR_RS_ALIGN_CODE ((1 << alignment) - 1)
++
++/* We need to stop gas from reducing certain expressions (e.g. GOT
++   references) */
++#define tc_fix_adjustable(fix) avr32_fix_adjustable(fix)
++extern bfd_boolean avr32_fix_adjustable(struct fix *);
++
++/* The linker needs to be passed a little more information when relaxing. */
++#define TC_FORCE_RELOCATION(fix) avr32_force_reloc(fix)
++extern bfd_boolean avr32_force_reloc(struct fix *);
++
++/* I'm tired of working around all the madness in fixup_segment().
++   This hook will do basically the same things as the generic code,
++   and then it will "goto" right past it.  */
++#define TC_VALIDATE_FIX(FIX, SEG, SKIP)		\
++  do						\
++    {						\
++      avr32_process_fixup(FIX, SEG);		\
++      if (!(FIX)->fx_done)			\
++	++seg_reloc_count;			\
++      goto SKIP;				\
++    }						\
++  while (0)
++extern void avr32_process_fixup(struct fix *fixP, segT this_segment);
++
++/* Positive values of TC_FX_SIZE_SLACK allow a target to define
++   fixups that far past the end of a frag.  Having such fixups
++   is of course most most likely a bug in setting fx_size correctly.
++   A negative value disables the fixup check entirely, which is
++   appropriate for something like the Renesas / SuperH SH_COUNT
++   reloc.  */
++/* This target is buggy, and sets fix size too large.  */
++#define TC_FX_SIZE_SLACK(FIX) -1
++
++/* We don't want the gas core to make any assumptions about our way of
++   doing linkrelaxing.  */
++#define TC_LINKRELAX_FIXUP(SEG)			0
++
++/* ... but we do want it to insert lots of padding. */
++#define LINKER_RELAXING_SHRINKS_ONLY
++
++/* Better do it ourselves, really... */
++#define TC_RELAX_ALIGN(SEG, FRAG, ADDR)	avr32_relax_align(SEG, FRAG, ADDR)
++extern relax_addressT
++avr32_relax_align(segT segment, fragS *fragP, relax_addressT address);
++
++/* Use line number format that is amenable to linker relaxation.  */
++#define DWARF2_USE_FIXED_ADVANCE_PC (linkrelax != 0)
++
++/* This is called by write_object_file() just before symbols are
++   attempted converted into section symbols.  */
++#define tc_frob_file_before_adjust()	avr32_frob_file()
++extern void avr32_frob_file(void);
++
++/* If you define this macro, GAS will call it at the end of each input
++   file.  */
++#define md_cleanup() avr32_cleanup()
++extern void avr32_cleanup(void);
++
++/* There's an AVR32-specific hack in operand() which creates O_md
++   expressions when encountering HWRD or LWRD. We need to generate
++   proper relocs for them */
++/* #define md_cgen_record_fixup_exp avr32_cgen_record_fixup_exp */
++
++/* I needed to add an extra hook in gas_cgen_finish_insn() for
++   conversion of O_md* operands because md_cgen_record_fixup_exp()
++   isn't called for relaxable insns */
++/* #define md_cgen_convert_expr(exp, opinfo) avr32_cgen_convert_expr(exp, opinfo)
++   int avr32_cgen_convert_expr(expressionS *, int); */
++
++/* #define tc_gen_reloc gas_cgen_tc_gen_reloc */
++
++/* If you define this macro, it should return the position from which
++   the PC relative adjustment for a PC relative fixup should be
++   made. On many processors, the base of a PC relative instruction is
++   the next instruction, so this macro would return the length of an
++   instruction, plus the address of the PC relative fixup. The latter
++   can be calculated as fixp->fx_where + fixp->fx_frag->fr_address. */
++extern long md_pcrel_from_section (struct fix *, segT);
++#define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from_section (FIX, SEC)
++
++#define LOCAL_LABEL(name) (name[0] == '.' && (name[1] == 'L'))
++#define LOCAL_LABELS_FB		1
++
++struct avr32_relaxer
++{
++  int (*estimate_size)(fragS *, segT);
++  long (*relax_frag)(segT, fragS *, long);
++  void (*convert_frag)(bfd *, segT, fragS *);
++};
++
++/* AVR32 has quite complex instruction coding, which means we need
++ * lots of information in order to do the right thing during relaxing
++ * (basically, we need to be able to reconstruct a whole new opcode if
++ * necessary) */
++#define TC_FRAG_TYPE struct avr32_frag_data
++
++struct cpool;
++
++struct avr32_frag_data
++{
++  /* TODO: Maybe add an expression object here so that we can use
++     fix_new_exp() in md_convert_frag?  We may have to decide
++     pcrel-ness in md_estimate_size_before_relax() as well...or we
++     might do it when parsing.  Doing it while parsing may fail
++     because the sub_symbol is undefined then... */
++  int pcrel;
++  int force_extended;
++  int reloc_info;
++  struct avr32_relaxer *relaxer;
++  expressionS exp;
++
++  /* Points to associated constant pool, for use by LDA and CALL in
++     non-pic mode, and when relaxing the .cpool directive */
++  struct cpool *pool;
++  unsigned int pool_entry;
++};
++
++/* We will have to initialize the fields explicitly when needed */
++#define TC_FRAG_INIT(fragP)
++
++#define md_estimate_size_before_relax(fragP, segT)			\
++  ((fragP)->tc_frag_data.relaxer->estimate_size(fragP, segT))
++#define md_relax_frag(segment, fragP, stretch)				\
++  ((fragP)->tc_frag_data.relaxer->relax_frag(segment, fragP, stretch))
++#define md_convert_frag(abfd, segment, fragP)				\
++  ((fragP)->tc_frag_data.relaxer->convert_frag(abfd, segment, fragP))
++
++#define TC_FIX_TYPE struct avr32_fix_data
++
++struct avr32_fix_data
++{
++  const struct avr32_ifield *ifield;
++  unsigned int align;
++  long min;
++  long max;
++};
++
++#define TC_INIT_FIX_DATA(fixP)			\
++  do						\
++    {						\
++      (fixP)->tc_fix_data.ifield = NULL;	\
++      (fixP)->tc_fix_data.align = 0;		\
++      (fixP)->tc_fix_data.min = 0;		\
++      (fixP)->tc_fix_data.max = 0;		\
++    }						\
++  while (0)
+--- a/gas/configure.tgt
++++ b/gas/configure.tgt
+@@ -33,6 +33,7 @@ case ${cpu} in
+   am33_2.0)		cpu_type=mn10300 endian=little ;;
+   arm*be|arm*b)		cpu_type=arm endian=big ;;
+   arm*)			cpu_type=arm endian=little ;;
++  avr32*)		cpu_type=avr32 endian=big ;;
+   bfin*)		cpu_type=bfin endian=little ;;
+   c4x*)			cpu_type=tic4x ;;
+   cr16*)		cpu_type=cr16 endian=little ;;
+@@ -136,6 +137,9 @@ case ${generic_target} in
+ 
+   cr16-*-elf*)	    			fmt=elf ;;
+ 
++  avr32-*-linux*)			fmt=elf  em=linux bfd_gas=yes ;;
++  avr32*)				fmt=elf  bfd_gas=yes ;;
++
+   cris-*-linux-* | crisv32-*-linux-*)
+ 					fmt=multi em=linux ;;
+   cris-*-* | crisv32-*-*)		fmt=multi ;;
+--- a/gas/doc/all.texi
++++ b/gas/doc/all.texi
+@@ -30,6 +30,7 @@
+ @set ARC
+ @set ARM
+ @set AVR
++@set AVR32
+ @set Blackfin
+ @set CR16
+ @set CRIS
+--- a/gas/doc/asconfig.texi
++++ b/gas/doc/asconfig.texi
+@@ -30,6 +30,7 @@
+ @set ARC
+ @set ARM
+ @set AVR
++@set AVR32
+ @set Blackfin
+ @set CR16
+ @set CRIS
+--- a/gas/doc/as.texinfo
++++ b/gas/doc/as.texinfo
+@@ -6731,6 +6731,9 @@ subject, see the hardware manufacturer's
+ @ifset AVR
+ * AVR-Dependent::               AVR Dependent Features
+ @end ifset
++@ifset AVR32
++* AVR32-Dependent::               AVR32 Dependent Features
++@end ifset
+ @ifset Blackfin
+ * Blackfin-Dependent::		Blackfin Dependent Features
+ @end ifset
+@@ -6866,6 +6869,10 @@ subject, see the hardware manufacturer's
+ @include c-avr.texi
+ @end ifset
+ 
++@ifset AVR32
++@include c-avr32.texi
++@end ifset
++
+ @ifset Blackfin
+ @include c-bfin.texi
+ @end ifset
+--- /dev/null
++++ b/gas/doc/c-avr32.texi
+@@ -0,0 +1,244 @@
++@c Copyright 2005, 2006, 2007, 2008, 2009
++@c Atmel Corporation
++@c This is part of the GAS manual.
++@c For copying conditions, see the file as.texinfo.
++
++@ifset GENERIC
++@page
++@node AVR32-Dependent
++@chapter AVR32 Dependent Features
++@end ifset
++
++@ifclear GENERIC
++@node Machine Dependencies
++@chapter AVR32 Dependent Features
++@end ifclear
++
++@cindex AVR32 support
++@menu
++* AVR32 Options::               Options
++* AVR32 Syntax::                Syntax
++* AVR32 Directives::            Directives
++* AVR32 Opcodes::               Opcodes
++@end menu
++
++@node AVR32 Options
++@section Options
++@cindex AVR32 options
++@cindex options for AVR32
++
++@table @code
++
++@cindex @code{--pic} command line option, AVR32
++@cindex PIC code generation for AVR32
++@item --pic
++This option specifies that the output of the assembler should be marked
++as position-independent code (PIC).  It will also ensure that
++pseudo-instructions that deal with address calculation are output as
++PIC, and that all absolute address references in the code are marked as
++such.
++
++@cindex @code{--linkrelax} command line option, AVR32
++@item --linkrelax
++This option specifies that the output of the assembler should be marked
++as linker-relaxable.  It will also ensure that all PC-relative operands
++that may change during linker relaxation get appropriate relocations.
++
++@end table
++
++
++@node AVR32 Syntax
++@section Syntax
++@menu
++* AVR32-Chars::              Special Characters
++* AVR32-Symrefs::            Symbol references
++@end menu
++
++@node AVR32-Chars
++@subsection Special Characters
++
++@cindex line comment character, AVR32
++@cindex AVR32 line comment character
++The presence of a @samp{//} on a line indicates the start of a comment
++that extends to the end of the current line.  If a @samp{#} appears as
++the first character of a line, the whole line is treated as a comment.
++
++@cindex line separator, AVR32
++@cindex statement separator, AVR32
++@cindex AVR32 line separator
++The @samp{;} character can be used instead of a newline to separate
++statements.
++
++@node AVR32-Symrefs
++@subsection Symbol references
++
++The absolute value of a symbol can be obtained by simply naming the
++symbol.  However, as AVR32 symbols have 32-bit values, most symbols have
++values that are outside the range of any instructions.
++
++Instructions that take a PC-relative offset, e.g. @code{lddpc} or
++@code{rcall}, can also reference a symbol by simply naming the symbol
++(no explicit calculations necessary).  In this case, the assembler or
++linker subtracts the address of the instruction from the symbol's value
++and inserts the result into the instruction.  Note that even though an
++overflow is less likely to happen for a relative reference than for an
++absolute reference, the assembler or linker will generate an error if
++the referenced symbol is too far away from the current location.
++
++Relative references can be used for data as well.  For example:
++
++@smallexample
++        lddpc   r0, 2f
++1:      add     r0, pc
++        ...
++        .align  2
++2:      .int    @var{some_symbol} - 1b
++@end smallexample
++
++Here, r0 will end up with the run-time address of @var{some_symbol} even
++if the program was loaded at a different address than it was linked
++(position-independent code).
++
++@subsubsection Symbol modifiers
++
++@table @code
++
++@item @code{hi(@var{symbol})}
++Evaluates to the value of the symbol shifted right 16 bits.  This will
++work even if @var{symbol} is defined in a different module.
++
++@item @code{lo(@var{symbol})}
++Evaluates to the low 16 bits of the symbol's value.  This will work even
++if @var{symbol} is defined in a different module.
++
++@item @code{@var{symbol}@@got}
++Create a GOT entry for @var{symbol} and return the offset of that entry
++relative to the GOT base.
++
++@end table
++
++
++@node AVR32 Directives
++@section Directives
++@cindex machine directives, AVR32
++@cindex AVR32 directives
++
++@table @code
++
++@cindex @code{.cpool} directive, AVR32
++@item .cpool
++This directive causes the current contents of the constant pool to be
++dumped into the current section at the current location (aligned to a
++word boundary).  @code{GAS} maintains a separate constant pool for each
++section and each sub-section.  The @code{.cpool} directive will only
++affect the constant pool of the current section and sub-section.  At the
++end of assembly, all remaining, non-empty constant pools will
++automatically be dumped.
++
++@end table
++
++
++@node AVR32 Opcodes
++@section Opcodes
++@cindex AVR32 opcodes
++@cindex opcodes for AVR32
++
++@code{@value{AS}} implements all the standard AVR32 opcodes.  It also
++implements several pseudo-opcodes, which are recommended to use wherever
++possible because they give the tool chain better freedom to generate
++optimal code.
++
++@table @code
++
++@cindex @code{LDA.W reg, symbol} pseudo op, AVR32
++@item LDA.W
++@smallexample
++        lda.w   @var{reg}, @var{symbol}
++@end smallexample
++
++This instruction will load the address of @var{symbol} into
++@var{reg}. The instruction will evaluate to one of the following,
++depending on the relative distance to the symbol, the relative distance
++to the constant pool and whether the @code{--pic} option has been
++specified. If the @code{--pic} option has not been specified, the
++alternatives are as follows:
++@smallexample
++        /* @var{symbol} evaluates to a small enough value */
++        mov     @var{reg}, @var{symbol}
++
++        /* (. - @var{symbol}) evaluates to a small enough value */
++        sub     @var{reg}, pc, . - @var{symbol}
++
++        /* Constant pool is close enough */
++        lddpc   @var{reg}, @var{cpent}
++        ...
++@var{cpent}:
++        .long   @var{symbol}
++
++        /* Otherwise (not implemented yet, probably not necessary) */
++        mov     @var{reg}, lo(@var{symbol})
++        orh     @var{reg}, hi(@var{symbol})
++@end smallexample
++
++If the @code{--pic} option has been specified, the alternatives are as
++follows:
++@smallexample
++        /* (. - @var{symbol}) evaluates to a small enough value */
++        sub     @var{reg}, pc, . - @var{symbol}
++
++        /* If @code{--linkrelax} not specified */
++        ld.w    @var{reg}, r6[@var{symbol}@@got]
++
++        /* Otherwise */
++        mov     @var{reg}, @var{symbol}@@got / 4
++        ld.w    @var{reg}, r6[@var{reg} << 2]
++@end smallexample
++
++If @var{symbol} is not defined in the same file and section as the
++@code{LDA.W} instruction, the most pessimistic alternative of the
++above is selected. The linker may convert it back into the most
++optimal alternative when the final value of all symbols is known.
++
++@cindex @code{CALL symbol} pseudo op, AVR32
++@item CALL
++@smallexample
++        call    @var{symbol}
++@end smallexample
++
++This instruction will insert code to call the subroutine identified by
++@var{symbol}. It will evaluate to one of the following, depending on
++the relative distance to the symbol as well as the @code{--linkrelax}
++and @code{--pic} command-line options.
++
++If @var{symbol} is defined in the same section and input file, and the
++distance is small enough, an @code{rcall} instruction is inserted:
++@smallexample
++        rcall   @var{symbol}
++@end smallexample
++
++Otherwise, if the @code{--pic} option has not been specified:
++@smallexample
++        mcall   @var{cpent}
++        ...
++@var{cpent}:
++        .long   @var{symbol}
++@end smallexample
++
++Finally, if nothing else fits and the @code{--pic} option has been
++specified, the assembler will indirect the call through the Global
++Offset Table:
++@smallexample
++        /* If @code{--linkrelax} not specified */
++        mcall   r6[@var{symbol}@@got]
++
++        /* If @code{--linkrelax} specified */
++        mov     lr, @var{symbol}@@got / 4
++        ld.w    lr, r6[lr << 2]
++        icall   lr
++@end smallexample
++
++The linker, after determining the final value of @var{symbol}, may
++convert any of these into more optimal alternatives. This includes
++deleting any superfluous constant pool- and GOT-entries.
++
++@end table
+--- a/gas/doc/Makefile.am
++++ b/gas/doc/Makefile.am
+@@ -33,6 +33,7 @@ CPU_DOCS = \
+ 	c-arc.texi \
+ 	c-arm.texi \
+ 	c-avr.texi \
++	c-avr32.texi \
+ 	c-bfin.texi \
+ 	c-cr16.texi \
+ 	c-d10v.texi \
+--- a/gas/Makefile.am
++++ b/gas/Makefile.am
+@@ -43,6 +43,7 @@ CPU_TYPES = \
+ 	arc \
+ 	arm \
+ 	avr \
++	avr32 \
+ 	bfin \
+ 	cr16 \
+ 	cris \
+@@ -244,6 +245,7 @@ TARGET_CPU_CFILES = \
+ 	config/tc-arc.c \
+ 	config/tc-arm.c \
+ 	config/tc-avr.c \
++	config/tc-avr32.c \
+ 	config/tc-bfin.c \
+ 	config/tc-cr16.c \
+ 	config/tc-cris.c \
+@@ -307,6 +309,7 @@ TARGET_CPU_HFILES = \
+ 	config/tc-arc.h \
+ 	config/tc-arm.h \
+ 	config/tc-avr.h \
++	config/tc-avr32.h \
+ 	config/tc-bfin.h \
+ 	config/tc-cr16.h \
+ 	config/tc-cris.h \
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/aliases.d
+@@ -0,0 +1,19 @@
++#as:
++#objdump: -dr
++#name: aliases
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <ld_nodisp>:
++   0:	19 80      [ \t]+ld\.ub r0,r12\[0x0\]
++   2:	f9 20 00 00[ \t]+ld\.sb r0,r12\[0\]
++   6:	98 80      [ \t]+ld\.uh r0,r12\[0x0\]
++   8:	98 00      [ \t]+ld\.sh r0,r12\[0x0\]
++   a:	78 00      [ \t]+ld\.w r0,r12\[0x0\]
++
++0000000c <st_nodisp>:
++   c:	b8 80      [ \t]+st\.b r12\[0x0\],r0
++   e:	b8 00      [ \t]+st\.h r12\[0x0\],r0
++  10:	99 00      [ \t]+st\.w r12\[0x0\],r0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/aliases.s
+@@ -0,0 +1,14 @@
++	.text
++	.global	ld_nodisp
++ld_nodisp:
++	ld.ub	r0, r12
++	ld.sb	r0, r12
++	ld.uh	r0, r12
++	ld.sh	r0, r12
++	ld.w	r0, r12
++
++	.global st_nodisp
++st_nodisp:
++	st.b	r12, r0
++	st.h	r12, r0
++	st.w	r12, r0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/allinsn.d
+@@ -0,0 +1,2987 @@
++#as:
++#objdump: -dr
++#name: allinsn
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++[0-9a-f]* <ld_d5>:
++ *[0-9a-f]*:	fe 0f 02 3e 	ld\.d lr,pc\[pc<<0x3\]
++ *[0-9a-f]*:	e0 00 02 00 	ld\.d r0,r0\[r0\]
++ *[0-9a-f]*:	ea 05 02 26 	ld\.d r6,r5\[r5<<0x2\]
++ *[0-9a-f]*:	e8 04 02 14 	ld\.d r4,r4\[r4<<0x1\]
++ *[0-9a-f]*:	fc 0e 02 1e 	ld\.d lr,lr\[lr<<0x1\]
++ *[0-9a-f]*:	e6 0d 02 2a 	ld\.d r10,r3\[sp<<0x2\]
++ *[0-9a-f]*:	f4 06 02 28 	ld\.d r8,r10\[r6<<0x2\]
++ *[0-9a-f]*:	ee 09 02 02 	ld\.d r2,r7\[r9\]
++
++[0-9a-f]* <ld_w5>:
++ *[0-9a-f]*:	fe 0f 03 0f 	ld\.w pc,pc\[pc\]
++ *[0-9a-f]*:	f8 0c 03 3c 	ld\.w r12,r12\[r12<<0x3\]
++ *[0-9a-f]*:	ea 05 03 25 	ld\.w r5,r5\[r5<<0x2\]
++ *[0-9a-f]*:	e8 04 03 14 	ld\.w r4,r4\[r4<<0x1\]
++ *[0-9a-f]*:	fc 0e 03 1e 	ld\.w lr,lr\[lr<<0x1\]
++ *[0-9a-f]*:	f2 09 03 02 	ld\.w r2,r9\[r9\]
++ *[0-9a-f]*:	e4 06 03 0b 	ld\.w r11,r2\[r6\]
++ *[0-9a-f]*:	e4 0d 03 30 	ld\.w r0,r2\[sp<<0x3\]
++
++[0-9a-f]* <ld_sh5>:
++ *[0-9a-f]*:	fe 0f 04 0f 	ld\.sh pc,pc\[pc\]
++ *[0-9a-f]*:	f8 0c 04 3c 	ld\.sh r12,r12\[r12<<0x3\]
++ *[0-9a-f]*:	ea 05 04 25 	ld\.sh r5,r5\[r5<<0x2\]
++ *[0-9a-f]*:	e8 04 04 14 	ld\.sh r4,r4\[r4<<0x1\]
++ *[0-9a-f]*:	fc 0e 04 1e 	ld\.sh lr,lr\[lr<<0x1\]
++ *[0-9a-f]*:	e0 0f 04 2b 	ld\.sh r11,r0\[pc<<0x2\]
++ *[0-9a-f]*:	fa 06 04 2a 	ld\.sh r10,sp\[r6<<0x2\]
++ *[0-9a-f]*:	e4 02 04 0c 	ld\.sh r12,r2\[r2\]
++
++[0-9a-f]* <ld_uh5>:
++ *[0-9a-f]*:	fe 0f 05 0f 	ld\.uh pc,pc\[pc\]
++ *[0-9a-f]*:	f8 0c 05 3c 	ld\.uh r12,r12\[r12<<0x3\]
++ *[0-9a-f]*:	ea 05 05 25 	ld\.uh r5,r5\[r5<<0x2\]
++ *[0-9a-f]*:	e8 04 05 14 	ld\.uh r4,r4\[r4<<0x1\]
++ *[0-9a-f]*:	fc 0e 05 1e 	ld\.uh lr,lr\[lr<<0x1\]
++ *[0-9a-f]*:	fe 0e 05 38 	ld\.uh r8,pc\[lr<<0x3\]
++ *[0-9a-f]*:	e2 0f 05 16 	ld\.uh r6,r1\[pc<<0x1\]
++ *[0-9a-f]*:	fc 0d 05 16 	ld\.uh r6,lr\[sp<<0x1\]
++
++[0-9a-f]* <ld_sb2>:
++ *[0-9a-f]*:	fe 0f 06 0f 	ld\.sb pc,pc\[pc\]
++ *[0-9a-f]*:	f8 0c 06 3c 	ld\.sb r12,r12\[r12<<0x3\]
++ *[0-9a-f]*:	ea 05 06 25 	ld\.sb r5,r5\[r5<<0x2\]
++ *[0-9a-f]*:	e8 04 06 14 	ld\.sb r4,r4\[r4<<0x1\]
++ *[0-9a-f]*:	fc 0e 06 1e 	ld\.sb lr,lr\[lr<<0x1\]
++ *[0-9a-f]*:	e2 0f 06 39 	ld\.sb r9,r1\[pc<<0x3\]
++ *[0-9a-f]*:	e6 0b 06 10 	ld\.sb r0,r3\[r11<<0x1\]
++ *[0-9a-f]*:	ea 05 06 1a 	ld\.sb r10,r5\[r5<<0x1\]
++
++[0-9a-f]* <ld_ub5>:
++ *[0-9a-f]*:	fe 0f 07 0f 	ld\.ub pc,pc\[pc\]
++ *[0-9a-f]*:	f8 0c 07 3c 	ld\.ub r12,r12\[r12<<0x3\]
++ *[0-9a-f]*:	ea 05 07 25 	ld\.ub r5,r5\[r5<<0x2\]
++ *[0-9a-f]*:	e8 04 07 14 	ld\.ub r4,r4\[r4<<0x1\]
++ *[0-9a-f]*:	fc 0e 07 1e 	ld\.ub lr,lr\[lr<<0x1\]
++ *[0-9a-f]*:	f8 07 07 36 	ld\.ub r6,r12\[r7<<0x3\]
++ *[0-9a-f]*:	ec 0c 07 02 	ld\.ub r2,r6\[r12\]
++ *[0-9a-f]*:	ee 0b 07 10 	ld\.ub r0,r7\[r11<<0x1\]
++
++[0-9a-f]* <st_d5>:
++ *[0-9a-f]*:	fe 0f 08 0e 	st\.d pc\[pc\],lr
++ *[0-9a-f]*:	f8 0c 08 3c 	st\.d r12\[r12<<0x3\],r12
++ *[0-9a-f]*:	ea 05 08 26 	st\.d r5\[r5<<0x2\],r6
++ *[0-9a-f]*:	e8 04 08 14 	st\.d r4\[r4<<0x1\],r4
++ *[0-9a-f]*:	fc 0e 08 1e 	st\.d lr\[lr<<0x1\],lr
++ *[0-9a-f]*:	e2 09 08 14 	st\.d r1\[r9<<0x1\],r4
++ *[0-9a-f]*:	f4 02 08 14 	st\.d r10\[r2<<0x1\],r4
++ *[0-9a-f]*:	f8 06 08 0e 	st\.d r12\[r6\],lr
++
++[0-9a-f]* <st_w5>:
++ *[0-9a-f]*:	fe 0f 09 0f 	st\.w pc\[pc\],pc
++ *[0-9a-f]*:	f8 0c 09 3c 	st\.w r12\[r12<<0x3\],r12
++ *[0-9a-f]*:	ea 05 09 25 	st\.w r5\[r5<<0x2\],r5
++ *[0-9a-f]*:	e8 04 09 14 	st\.w r4\[r4<<0x1\],r4
++ *[0-9a-f]*:	fc 0e 09 1e 	st\.w lr\[lr<<0x1\],lr
++ *[0-9a-f]*:	e2 0a 09 03 	st\.w r1\[r10\],r3
++ *[0-9a-f]*:	e0 0a 09 19 	st\.w r0\[r10<<0x1\],r9
++ *[0-9a-f]*:	e8 05 09 3f 	st\.w r4\[r5<<0x3\],pc
++
++[0-9a-f]* <st_h5>:
++ *[0-9a-f]*:	fe 0f 0a 0f 	st\.h pc\[pc\],pc
++ *[0-9a-f]*:	f8 0c 0a 3c 	st\.h r12\[r12<<0x3\],r12
++ *[0-9a-f]*:	ea 05 0a 25 	st\.h r5\[r5<<0x2\],r5
++ *[0-9a-f]*:	e8 04 0a 14 	st\.h r4\[r4<<0x1\],r4
++ *[0-9a-f]*:	fc 0e 0a 1e 	st\.h lr\[lr<<0x1\],lr
++ *[0-9a-f]*:	e4 09 0a 0b 	st\.h r2\[r9\],r11
++ *[0-9a-f]*:	ea 01 0a 2c 	st\.h r5\[r1<<0x2\],r12
++ *[0-9a-f]*:	fe 08 0a 23 	st\.h pc\[r8<<0x2\],r3
++
++[0-9a-f]* <st_b5>:
++ *[0-9a-f]*:	fe 0f 0b 0f 	st\.b pc\[pc\],pc
++ *[0-9a-f]*:	f8 0c 0b 3c 	st\.b r12\[r12<<0x3\],r12
++ *[0-9a-f]*:	ea 05 0b 25 	st\.b r5\[r5<<0x2\],r5
++ *[0-9a-f]*:	e8 04 0b 14 	st\.b r4\[r4<<0x1\],r4
++ *[0-9a-f]*:	fc 0e 0b 1e 	st\.b lr\[lr<<0x1\],lr
++ *[0-9a-f]*:	e2 08 0b 16 	st\.b r1\[r8<<0x1\],r6
++ *[0-9a-f]*:	fc 0e 0b 31 	st\.b lr\[lr<<0x3\],r1
++ *[0-9a-f]*:	ea 00 0b 2f 	st\.b r5\[r0<<0x2\],pc
++
++[0-9a-f]* <divs>:
++ *[0-9a-f]*:	fe 0f 0c 0f 	divs pc,pc,pc
++ *[0-9a-f]*:	f8 0c 0c 0c 	divs r12,r12,r12
++ *[0-9a-f]*:	ea 05 0c 05 	divs r5,r5,r5
++ *[0-9a-f]*:	e8 04 0c 04 	divs r4,r4,r4
++ *[0-9a-f]*:	fc 0e 0c 0e 	divs lr,lr,lr
++ *[0-9a-f]*:	fe 0f 0c 03 	divs r3,pc,pc
++ *[0-9a-f]*:	f8 02 0c 09 	divs r9,r12,r2
++ *[0-9a-f]*:	e8 01 0c 07 	divs r7,r4,r1
++
++[0-9a-f]* <add1>:
++ *[0-9a-f]*:	1e 0f       	add pc,pc
++ *[0-9a-f]*:	18 0c       	add r12,r12
++ *[0-9a-f]*:	0a 05       	add r5,r5
++ *[0-9a-f]*:	08 04       	add r4,r4
++ *[0-9a-f]*:	1c 0e       	add lr,lr
++ *[0-9a-f]*:	12 0c       	add r12,r9
++ *[0-9a-f]*:	06 06       	add r6,r3
++ *[0-9a-f]*:	18 0a       	add r10,r12
++
++[0-9a-f]* <sub1>:
++ *[0-9a-f]*:	1e 1f       	sub pc,pc
++ *[0-9a-f]*:	18 1c       	sub r12,r12
++ *[0-9a-f]*:	0a 15       	sub r5,r5
++ *[0-9a-f]*:	08 14       	sub r4,r4
++ *[0-9a-f]*:	1c 1e       	sub lr,lr
++ *[0-9a-f]*:	0c 1e       	sub lr,r6
++ *[0-9a-f]*:	1a 10       	sub r0,sp
++ *[0-9a-f]*:	18 16       	sub r6,r12
++
++[0-9a-f]* <rsub1>:
++ *[0-9a-f]*:	1e 2f       	rsub pc,pc
++ *[0-9a-f]*:	18 2c       	rsub r12,r12
++ *[0-9a-f]*:	0a 25       	rsub r5,r5
++ *[0-9a-f]*:	08 24       	rsub r4,r4
++ *[0-9a-f]*:	1c 2e       	rsub lr,lr
++ *[0-9a-f]*:	1a 2b       	rsub r11,sp
++ *[0-9a-f]*:	08 27       	rsub r7,r4
++ *[0-9a-f]*:	02 29       	rsub r9,r1
++
++[0-9a-f]* <cp1>:
++ *[0-9a-f]*:	1e 3f       	cp\.w pc,pc
++ *[0-9a-f]*:	18 3c       	cp\.w r12,r12
++ *[0-9a-f]*:	0a 35       	cp\.w r5,r5
++ *[0-9a-f]*:	08 34       	cp\.w r4,r4
++ *[0-9a-f]*:	1c 3e       	cp\.w lr,lr
++ *[0-9a-f]*:	04 36       	cp\.w r6,r2
++ *[0-9a-f]*:	12 30       	cp\.w r0,r9
++ *[0-9a-f]*:	1a 33       	cp\.w r3,sp
++
++[0-9a-f]* <or1>:
++ *[0-9a-f]*:	1e 4f       	or pc,pc
++ *[0-9a-f]*:	18 4c       	or r12,r12
++ *[0-9a-f]*:	0a 45       	or r5,r5
++ *[0-9a-f]*:	08 44       	or r4,r4
++ *[0-9a-f]*:	1c 4e       	or lr,lr
++ *[0-9a-f]*:	12 44       	or r4,r9
++ *[0-9a-f]*:	08 4b       	or r11,r4
++ *[0-9a-f]*:	00 44       	or r4,r0
++
++[0-9a-f]* <eor1>:
++ *[0-9a-f]*:	1e 5f       	eor pc,pc
++ *[0-9a-f]*:	18 5c       	eor r12,r12
++ *[0-9a-f]*:	0a 55       	eor r5,r5
++ *[0-9a-f]*:	08 54       	eor r4,r4
++ *[0-9a-f]*:	1c 5e       	eor lr,lr
++ *[0-9a-f]*:	16 5c       	eor r12,r11
++ *[0-9a-f]*:	02 50       	eor r0,r1
++ *[0-9a-f]*:	1e 55       	eor r5,pc
++
++[0-9a-f]* <and1>:
++ *[0-9a-f]*:	1e 6f       	and pc,pc
++ *[0-9a-f]*:	18 6c       	and r12,r12
++ *[0-9a-f]*:	0a 65       	and r5,r5
++ *[0-9a-f]*:	08 64       	and r4,r4
++ *[0-9a-f]*:	1c 6e       	and lr,lr
++ *[0-9a-f]*:	02 68       	and r8,r1
++ *[0-9a-f]*:	1a 60       	and r0,sp
++ *[0-9a-f]*:	0a 6a       	and r10,r5
++
++[0-9a-f]* <tst>:
++ *[0-9a-f]*:	1e 7f       	tst pc,pc
++ *[0-9a-f]*:	18 7c       	tst r12,r12
++ *[0-9a-f]*:	0a 75       	tst r5,r5
++ *[0-9a-f]*:	08 74       	tst r4,r4
++ *[0-9a-f]*:	1c 7e       	tst lr,lr
++ *[0-9a-f]*:	18 70       	tst r0,r12
++ *[0-9a-f]*:	0c 7a       	tst r10,r6
++ *[0-9a-f]*:	08 7d       	tst sp,r4
++
++[0-9a-f]* <andn>:
++ *[0-9a-f]*:	1e 8f       	andn pc,pc
++ *[0-9a-f]*:	18 8c       	andn r12,r12
++ *[0-9a-f]*:	0a 85       	andn r5,r5
++ *[0-9a-f]*:	08 84       	andn r4,r4
++ *[0-9a-f]*:	1c 8e       	andn lr,lr
++ *[0-9a-f]*:	18 89       	andn r9,r12
++ *[0-9a-f]*:	1a 8b       	andn r11,sp
++ *[0-9a-f]*:	0a 8c       	andn r12,r5
++
++[0-9a-f]* <mov3>:
++ *[0-9a-f]*:	1e 9f       	mov pc,pc
++ *[0-9a-f]*:	18 9c       	mov r12,r12
++ *[0-9a-f]*:	0a 95       	mov r5,r5
++ *[0-9a-f]*:	08 94       	mov r4,r4
++ *[0-9a-f]*:	1c 9e       	mov lr,lr
++ *[0-9a-f]*:	12 95       	mov r5,r9
++ *[0-9a-f]*:	16 9b       	mov r11,r11
++ *[0-9a-f]*:	1c 92       	mov r2,lr
++
++[0-9a-f]* <st_w1>:
++ *[0-9a-f]*:	1e af       	st\.w pc\+\+,pc
++ *[0-9a-f]*:	18 ac       	st\.w r12\+\+,r12
++ *[0-9a-f]*:	0a a5       	st\.w r5\+\+,r5
++ *[0-9a-f]*:	08 a4       	st\.w r4\+\+,r4
++ *[0-9a-f]*:	1c ae       	st\.w lr\+\+,lr
++ *[0-9a-f]*:	02 ab       	st\.w r1\+\+,r11
++ *[0-9a-f]*:	1a a0       	st\.w sp\+\+,r0
++ *[0-9a-f]*:	1a a1       	st\.w sp\+\+,r1
++
++[0-9a-f]* <st_h1>:
++ *[0-9a-f]*:	1e bf       	st\.h pc\+\+,pc
++ *[0-9a-f]*:	18 bc       	st\.h r12\+\+,r12
++ *[0-9a-f]*:	0a b5       	st\.h r5\+\+,r5
++ *[0-9a-f]*:	08 b4       	st\.h r4\+\+,r4
++ *[0-9a-f]*:	1c be       	st\.h lr\+\+,lr
++ *[0-9a-f]*:	18 bd       	st\.h r12\+\+,sp
++ *[0-9a-f]*:	0e be       	st\.h r7\+\+,lr
++ *[0-9a-f]*:	0e b4       	st\.h r7\+\+,r4
++
++[0-9a-f]* <st_b1>:
++ *[0-9a-f]*:	1e cf       	st\.b pc\+\+,pc
++ *[0-9a-f]*:	18 cc       	st\.b r12\+\+,r12
++ *[0-9a-f]*:	0a c5       	st\.b r5\+\+,r5
++ *[0-9a-f]*:	08 c4       	st\.b r4\+\+,r4
++ *[0-9a-f]*:	1c ce       	st\.b lr\+\+,lr
++ *[0-9a-f]*:	12 cd       	st\.b r9\+\+,sp
++ *[0-9a-f]*:	02 cd       	st\.b r1\+\+,sp
++ *[0-9a-f]*:	00 c4       	st\.b r0\+\+,r4
++
++[0-9a-f]* <st_w2>:
++ *[0-9a-f]*:	1e df       	st\.w --pc,pc
++ *[0-9a-f]*:	18 dc       	st\.w --r12,r12
++ *[0-9a-f]*:	0a d5       	st\.w --r5,r5
++ *[0-9a-f]*:	08 d4       	st\.w --r4,r4
++ *[0-9a-f]*:	1c de       	st\.w --lr,lr
++ *[0-9a-f]*:	02 d7       	st\.w --r1,r7
++ *[0-9a-f]*:	06 d9       	st\.w --r3,r9
++ *[0-9a-f]*:	0a d5       	st\.w --r5,r5
++
++[0-9a-f]* <st_h2>:
++ *[0-9a-f]*:	1e ef       	st\.h --pc,pc
++ *[0-9a-f]*:	18 ec       	st\.h --r12,r12
++ *[0-9a-f]*:	0a e5       	st\.h --r5,r5
++ *[0-9a-f]*:	08 e4       	st\.h --r4,r4
++ *[0-9a-f]*:	1c ee       	st\.h --lr,lr
++ *[0-9a-f]*:	0a e7       	st\.h --r5,r7
++ *[0-9a-f]*:	10 e8       	st\.h --r8,r8
++ *[0-9a-f]*:	0e e2       	st\.h --r7,r2
++
++[0-9a-f]* <st_b2>:
++ *[0-9a-f]*:	1e ff       	st\.b --pc,pc
++ *[0-9a-f]*:	18 fc       	st\.b --r12,r12
++ *[0-9a-f]*:	0a f5       	st\.b --r5,r5
++ *[0-9a-f]*:	08 f4       	st\.b --r4,r4
++ *[0-9a-f]*:	1c fe       	st\.b --lr,lr
++ *[0-9a-f]*:	1a fd       	st\.b --sp,sp
++ *[0-9a-f]*:	1a fb       	st\.b --sp,r11
++ *[0-9a-f]*:	08 f5       	st\.b --r4,r5
++
++[0-9a-f]* <ld_w1>:
++ *[0-9a-f]*:	1f 0f       	ld\.w pc,pc\+\+
++ *[0-9a-f]*:	19 0c       	ld\.w r12,r12\+\+
++ *[0-9a-f]*:	0b 05       	ld\.w r5,r5\+\+
++ *[0-9a-f]*:	09 04       	ld\.w r4,r4\+\+
++ *[0-9a-f]*:	1d 0e       	ld\.w lr,lr\+\+
++ *[0-9a-f]*:	0f 03       	ld\.w r3,r7\+\+
++ *[0-9a-f]*:	1d 03       	ld\.w r3,lr\+\+
++ *[0-9a-f]*:	0b 0c       	ld\.w r12,r5\+\+
++
++[0-9a-f]* <ld_sh1>:
++ *[0-9a-f]*:	1f 1f       	ld\.sh pc,pc\+\+
++ *[0-9a-f]*:	19 1c       	ld\.sh r12,r12\+\+
++ *[0-9a-f]*:	0b 15       	ld\.sh r5,r5\+\+
++ *[0-9a-f]*:	09 14       	ld\.sh r4,r4\+\+
++ *[0-9a-f]*:	1d 1e       	ld\.sh lr,lr\+\+
++ *[0-9a-f]*:	05 1b       	ld\.sh r11,r2\+\+
++ *[0-9a-f]*:	11 12       	ld\.sh r2,r8\+\+
++ *[0-9a-f]*:	0d 17       	ld\.sh r7,r6\+\+
++
++[0-9a-f]* <ld_uh1>:
++ *[0-9a-f]*:	1f 2f       	ld\.uh pc,pc\+\+
++ *[0-9a-f]*:	19 2c       	ld\.uh r12,r12\+\+
++ *[0-9a-f]*:	0b 25       	ld\.uh r5,r5\+\+
++ *[0-9a-f]*:	09 24       	ld\.uh r4,r4\+\+
++ *[0-9a-f]*:	1d 2e       	ld\.uh lr,lr\+\+
++ *[0-9a-f]*:	0f 26       	ld\.uh r6,r7\+\+
++ *[0-9a-f]*:	17 2a       	ld\.uh r10,r11\+\+
++ *[0-9a-f]*:	09 2e       	ld\.uh lr,r4\+\+
++
++[0-9a-f]* <ld_ub1>:
++ *[0-9a-f]*:	1f 3f       	ld\.ub pc,pc\+\+
++ *[0-9a-f]*:	19 3c       	ld\.ub r12,r12\+\+
++ *[0-9a-f]*:	0b 35       	ld\.ub r5,r5\+\+
++ *[0-9a-f]*:	09 34       	ld\.ub r4,r4\+\+
++ *[0-9a-f]*:	1d 3e       	ld\.ub lr,lr\+\+
++ *[0-9a-f]*:	1d 38       	ld\.ub r8,lr\+\+
++ *[0-9a-f]*:	19 3c       	ld\.ub r12,r12\+\+
++ *[0-9a-f]*:	15 3b       	ld\.ub r11,r10\+\+
++
++[0-9a-f]* <ld_w2>:
++ *[0-9a-f]*:	1f 4f       	ld\.w pc,--pc
++ *[0-9a-f]*:	19 4c       	ld\.w r12,--r12
++ *[0-9a-f]*:	0b 45       	ld\.w r5,--r5
++ *[0-9a-f]*:	09 44       	ld\.w r4,--r4
++ *[0-9a-f]*:	1d 4e       	ld\.w lr,--lr
++ *[0-9a-f]*:	1d 4a       	ld\.w r10,--lr
++ *[0-9a-f]*:	13 4c       	ld\.w r12,--r9
++ *[0-9a-f]*:	0b 46       	ld\.w r6,--r5
++
++[0-9a-f]* <ld_sh2>:
++ *[0-9a-f]*:	1f 5f       	ld\.sh pc,--pc
++ *[0-9a-f]*:	19 5c       	ld\.sh r12,--r12
++ *[0-9a-f]*:	0b 55       	ld\.sh r5,--r5
++ *[0-9a-f]*:	09 54       	ld\.sh r4,--r4
++ *[0-9a-f]*:	1d 5e       	ld\.sh lr,--lr
++ *[0-9a-f]*:	15 5f       	ld\.sh pc,--r10
++ *[0-9a-f]*:	07 56       	ld\.sh r6,--r3
++ *[0-9a-f]*:	0d 54       	ld\.sh r4,--r6
++
++[0-9a-f]* <ld_uh2>:
++ *[0-9a-f]*:	1f 6f       	ld\.uh pc,--pc
++ *[0-9a-f]*:	19 6c       	ld\.uh r12,--r12
++ *[0-9a-f]*:	0b 65       	ld\.uh r5,--r5
++ *[0-9a-f]*:	09 64       	ld\.uh r4,--r4
++ *[0-9a-f]*:	1d 6e       	ld\.uh lr,--lr
++ *[0-9a-f]*:	05 63       	ld\.uh r3,--r2
++ *[0-9a-f]*:	01 61       	ld\.uh r1,--r0
++ *[0-9a-f]*:	13 62       	ld\.uh r2,--r9
++
++[0-9a-f]* <ld_ub2>:
++ *[0-9a-f]*:	1f 7f       	ld\.ub pc,--pc
++ *[0-9a-f]*:	19 7c       	ld\.ub r12,--r12
++ *[0-9a-f]*:	0b 75       	ld\.ub r5,--r5
++ *[0-9a-f]*:	09 74       	ld\.ub r4,--r4
++ *[0-9a-f]*:	1d 7e       	ld\.ub lr,--lr
++ *[0-9a-f]*:	03 71       	ld\.ub r1,--r1
++ *[0-9a-f]*:	0d 70       	ld\.ub r0,--r6
++ *[0-9a-f]*:	0f 72       	ld\.ub r2,--r7
++
++[0-9a-f]* <ld_ub3>:
++ *[0-9a-f]*:	1f 8f       	ld\.ub pc,pc\[0x0\]
++ *[0-9a-f]*:	19 fc       	ld\.ub r12,r12\[0x7\]
++ *[0-9a-f]*:	0b c5       	ld\.ub r5,r5\[0x4\]
++ *[0-9a-f]*:	09 b4       	ld\.ub r4,r4\[0x3\]
++ *[0-9a-f]*:	1d 9e       	ld\.ub lr,lr\[0x1\]
++ *[0-9a-f]*:	13 e6       	ld\.ub r6,r9\[0x6\]
++ *[0-9a-f]*:	1d c2       	ld\.ub r2,lr\[0x4\]
++ *[0-9a-f]*:	11 81       	ld\.ub r1,r8\[0x0\]
++
++[0-9a-f]* <sub3_sp>:
++ *[0-9a-f]*:	20 0d       	sub sp,0
++ *[0-9a-f]*:	2f fd       	sub sp,-4
++ *[0-9a-f]*:	28 0d       	sub sp,-512
++ *[0-9a-f]*:	27 fd       	sub sp,508
++ *[0-9a-f]*:	20 1d       	sub sp,4
++ *[0-9a-f]*:	20 bd       	sub sp,44
++ *[0-9a-f]*:	20 2d       	sub sp,8
++ *[0-9a-f]*:	25 7d       	sub sp,348
++
++[0-9a-f]* <sub3>:
++ *[0-9a-f]*:	20 0f       	sub pc,0
++ *[0-9a-f]*:	2f fc       	sub r12,-1
++ *[0-9a-f]*:	28 05       	sub r5,-128
++ *[0-9a-f]*:	27 f4       	sub r4,127
++ *[0-9a-f]*:	20 1e       	sub lr,1
++ *[0-9a-f]*:	2d 76       	sub r6,-41
++ *[0-9a-f]*:	22 54       	sub r4,37
++ *[0-9a-f]*:	23 8c       	sub r12,56
++
++[0-9a-f]* <mov1>:
++ *[0-9a-f]*:	30 0f       	mov pc,0
++ *[0-9a-f]*:	3f fc       	mov r12,-1
++ *[0-9a-f]*:	38 05       	mov r5,-128
++ *[0-9a-f]*:	37 f4       	mov r4,127
++ *[0-9a-f]*:	30 1e       	mov lr,1
++ *[0-9a-f]*:	30 ef       	mov pc,14
++ *[0-9a-f]*:	39 c6       	mov r6,-100
++ *[0-9a-f]*:	38 6e       	mov lr,-122
++
++[0-9a-f]* <lddsp>:
++ *[0-9a-f]*:	40 0f       	lddsp pc,sp\[0x0\]
++ *[0-9a-f]*:	47 fc       	lddsp r12,sp\[0x1fc\]
++ *[0-9a-f]*:	44 05       	lddsp r5,sp\[0x100\]
++ *[0-9a-f]*:	43 f4       	lddsp r4,sp\[0xfc\]
++ *[0-9a-f]*:	40 1e       	lddsp lr,sp\[0x4\]
++ *[0-9a-f]*:	44 0e       	lddsp lr,sp\[0x100\]
++ *[0-9a-f]*:	40 5c       	lddsp r12,sp\[0x14\]
++ *[0-9a-f]*:	47 69       	lddsp r9,sp\[0x1d8\]
++
++[0-9a-f]* <lddpc>:
++ *[0-9a-f]*:	48 0f       	lddpc pc,[0-9a-f]* <.*>
++ *[0-9a-f]*:	4f f0       	lddpc r0,[0-9a-f]* <.*>
++ *[0-9a-f]*:	4c 08       	lddpc r8,[0-9a-f]* <.*>
++ *[0-9a-f]*:	4b f7       	lddpc r7,[0-9a-f]* <.*>
++ *[0-9a-f]*:	48 1e       	lddpc lr,[0-9a-f]* <.*>
++ *[0-9a-f]*:	4f 6d       	lddpc sp,[0-9a-f]* <.*>
++ *[0-9a-f]*:	49 e6       	lddpc r6,[0-9a-f]* <.*>
++ *[0-9a-f]*:	48 7b       	lddpc r11,[0-9a-f]* <.*>
++
++[0-9a-f]* <stdsp>:
++ *[0-9a-f]*:	50 0f       	stdsp sp\[0x0\],pc
++ *[0-9a-f]*:	57 fc       	stdsp sp\[0x1fc\],r12
++ *[0-9a-f]*:	54 05       	stdsp sp\[0x100\],r5
++ *[0-9a-f]*:	53 f4       	stdsp sp\[0xfc\],r4
++ *[0-9a-f]*:	50 1e       	stdsp sp\[0x4\],lr
++ *[0-9a-f]*:	54 cf       	stdsp sp\[0x130\],pc
++ *[0-9a-f]*:	54 00       	stdsp sp\[0x100\],r0
++ *[0-9a-f]*:	55 45       	stdsp sp\[0x150\],r5
++
++[0-9a-f]* <cp2>:
++ *[0-9a-f]*:	58 0f       	cp.w pc,0
++ *[0-9a-f]*:	5b fc       	cp.w r12,-1
++ *[0-9a-f]*:	5a 05       	cp.w r5,-32
++ *[0-9a-f]*:	59 f4       	cp.w r4,31
++ *[0-9a-f]*:	58 1e       	cp.w lr,1
++ *[0-9a-f]*:	58 38       	cp.w r8,3
++ *[0-9a-f]*:	59 0e       	cp.w lr,16
++ *[0-9a-f]*:	5a 67       	cp.w r7,-26
++
++[0-9a-f]* <acr>:
++ *[0-9a-f]*:	5c 0f       	acr pc
++ *[0-9a-f]*:	5c 0c       	acr r12
++ *[0-9a-f]*:	5c 05       	acr r5
++ *[0-9a-f]*:	5c 04       	acr r4
++ *[0-9a-f]*:	5c 0e       	acr lr
++ *[0-9a-f]*:	5c 02       	acr r2
++ *[0-9a-f]*:	5c 0c       	acr r12
++ *[0-9a-f]*:	5c 0f       	acr pc
++
++[0-9a-f]* <scr>:
++ *[0-9a-f]*:	5c 1f       	scr pc
++ *[0-9a-f]*:	5c 1c       	scr r12
++ *[0-9a-f]*:	5c 15       	scr r5
++ *[0-9a-f]*:	5c 14       	scr r4
++ *[0-9a-f]*:	5c 1e       	scr lr
++ *[0-9a-f]*:	5c 1f       	scr pc
++ *[0-9a-f]*:	5c 16       	scr r6
++ *[0-9a-f]*:	5c 11       	scr r1
++
++[0-9a-f]* <cpc0>:
++ *[0-9a-f]*:	5c 2f       	cpc pc
++ *[0-9a-f]*:	5c 2c       	cpc r12
++ *[0-9a-f]*:	5c 25       	cpc r5
++ *[0-9a-f]*:	5c 24       	cpc r4
++ *[0-9a-f]*:	5c 2e       	cpc lr
++ *[0-9a-f]*:	5c 2f       	cpc pc
++ *[0-9a-f]*:	5c 24       	cpc r4
++ *[0-9a-f]*:	5c 29       	cpc r9
++
++[0-9a-f]* <neg>:
++ *[0-9a-f]*:	5c 3f       	neg pc
++ *[0-9a-f]*:	5c 3c       	neg r12
++ *[0-9a-f]*:	5c 35       	neg r5
++ *[0-9a-f]*:	5c 34       	neg r4
++ *[0-9a-f]*:	5c 3e       	neg lr
++ *[0-9a-f]*:	5c 37       	neg r7
++ *[0-9a-f]*:	5c 31       	neg r1
++ *[0-9a-f]*:	5c 39       	neg r9
++
++[0-9a-f]* <abs>:
++ *[0-9a-f]*:	5c 4f       	abs pc
++ *[0-9a-f]*:	5c 4c       	abs r12
++ *[0-9a-f]*:	5c 45       	abs r5
++ *[0-9a-f]*:	5c 44       	abs r4
++ *[0-9a-f]*:	5c 4e       	abs lr
++ *[0-9a-f]*:	5c 46       	abs r6
++ *[0-9a-f]*:	5c 46       	abs r6
++ *[0-9a-f]*:	5c 44       	abs r4
++
++[0-9a-f]* <castu_b>:
++ *[0-9a-f]*:	5c 5f       	castu\.b pc
++ *[0-9a-f]*:	5c 5c       	castu\.b r12
++ *[0-9a-f]*:	5c 55       	castu\.b r5
++ *[0-9a-f]*:	5c 54       	castu\.b r4
++ *[0-9a-f]*:	5c 5e       	castu\.b lr
++ *[0-9a-f]*:	5c 57       	castu\.b r7
++ *[0-9a-f]*:	5c 5d       	castu\.b sp
++ *[0-9a-f]*:	5c 59       	castu\.b r9
++
++[0-9a-f]* <casts_b>:
++ *[0-9a-f]*:	5c 6f       	casts\.b pc
++ *[0-9a-f]*:	5c 6c       	casts\.b r12
++ *[0-9a-f]*:	5c 65       	casts\.b r5
++ *[0-9a-f]*:	5c 64       	casts\.b r4
++ *[0-9a-f]*:	5c 6e       	casts\.b lr
++ *[0-9a-f]*:	5c 6b       	casts\.b r11
++ *[0-9a-f]*:	5c 61       	casts\.b r1
++ *[0-9a-f]*:	5c 6a       	casts\.b r10
++
++[0-9a-f]* <castu_h>:
++ *[0-9a-f]*:	5c 7f       	castu\.h pc
++ *[0-9a-f]*:	5c 7c       	castu\.h r12
++ *[0-9a-f]*:	5c 75       	castu\.h r5
++ *[0-9a-f]*:	5c 74       	castu\.h r4
++ *[0-9a-f]*:	5c 7e       	castu\.h lr
++ *[0-9a-f]*:	5c 7a       	castu\.h r10
++ *[0-9a-f]*:	5c 7b       	castu\.h r11
++ *[0-9a-f]*:	5c 71       	castu\.h r1
++
++[0-9a-f]* <casts_h>:
++ *[0-9a-f]*:	5c 8f       	casts\.h pc
++ *[0-9a-f]*:	5c 8c       	casts\.h r12
++ *[0-9a-f]*:	5c 85       	casts\.h r5
++ *[0-9a-f]*:	5c 84       	casts\.h r4
++ *[0-9a-f]*:	5c 8e       	casts\.h lr
++ *[0-9a-f]*:	5c 80       	casts\.h r0
++ *[0-9a-f]*:	5c 85       	casts\.h r5
++ *[0-9a-f]*:	5c 89       	casts\.h r9
++
++[0-9a-f]* <brev>:
++ *[0-9a-f]*:	5c 9f       	brev pc
++ *[0-9a-f]*:	5c 9c       	brev r12
++ *[0-9a-f]*:	5c 95       	brev r5
++ *[0-9a-f]*:	5c 94       	brev r4
++ *[0-9a-f]*:	5c 9e       	brev lr
++ *[0-9a-f]*:	5c 95       	brev r5
++ *[0-9a-f]*:	5c 9a       	brev r10
++ *[0-9a-f]*:	5c 98       	brev r8
++
++[0-9a-f]* <swap_h>:
++ *[0-9a-f]*:	5c af       	swap\.h pc
++ *[0-9a-f]*:	5c ac       	swap\.h r12
++ *[0-9a-f]*:	5c a5       	swap\.h r5
++ *[0-9a-f]*:	5c a4       	swap\.h r4
++ *[0-9a-f]*:	5c ae       	swap\.h lr
++ *[0-9a-f]*:	5c a7       	swap\.h r7
++ *[0-9a-f]*:	5c a0       	swap\.h r0
++ *[0-9a-f]*:	5c a8       	swap\.h r8
++
++[0-9a-f]* <swap_b>:
++ *[0-9a-f]*:	5c bf       	swap\.b pc
++ *[0-9a-f]*:	5c bc       	swap\.b r12
++ *[0-9a-f]*:	5c b5       	swap\.b r5
++ *[0-9a-f]*:	5c b4       	swap\.b r4
++ *[0-9a-f]*:	5c be       	swap\.b lr
++ *[0-9a-f]*:	5c ba       	swap\.b r10
++ *[0-9a-f]*:	5c bc       	swap\.b r12
++ *[0-9a-f]*:	5c b1       	swap\.b r1
++
++[0-9a-f]* <swap_bh>:
++ *[0-9a-f]*:	5c cf       	swap\.bh pc
++ *[0-9a-f]*:	5c cc       	swap\.bh r12
++ *[0-9a-f]*:	5c c5       	swap\.bh r5
++ *[0-9a-f]*:	5c c4       	swap\.bh r4
++ *[0-9a-f]*:	5c ce       	swap\.bh lr
++ *[0-9a-f]*:	5c c9       	swap\.bh r9
++ *[0-9a-f]*:	5c c4       	swap\.bh r4
++ *[0-9a-f]*:	5c c1       	swap\.bh r1
++
++[0-9a-f]* <One_s_compliment>:
++ *[0-9a-f]*:	5c df       	com pc
++ *[0-9a-f]*:	5c dc       	com r12
++ *[0-9a-f]*:	5c d5       	com r5
++ *[0-9a-f]*:	5c d4       	com r4
++ *[0-9a-f]*:	5c de       	com lr
++ *[0-9a-f]*:	5c d2       	com r2
++ *[0-9a-f]*:	5c d2       	com r2
++ *[0-9a-f]*:	5c d7       	com r7
++
++[0-9a-f]* <tnbz>:
++ *[0-9a-f]*:	5c ef       	tnbz pc
++ *[0-9a-f]*:	5c ec       	tnbz r12
++ *[0-9a-f]*:	5c e5       	tnbz r5
++ *[0-9a-f]*:	5c e4       	tnbz r4
++ *[0-9a-f]*:	5c ee       	tnbz lr
++ *[0-9a-f]*:	5c e8       	tnbz r8
++ *[0-9a-f]*:	5c ec       	tnbz r12
++ *[0-9a-f]*:	5c ef       	tnbz pc
++
++[0-9a-f]* <rol>:
++ *[0-9a-f]*:	5c ff       	rol pc
++ *[0-9a-f]*:	5c fc       	rol r12
++ *[0-9a-f]*:	5c f5       	rol r5
++ *[0-9a-f]*:	5c f4       	rol r4
++ *[0-9a-f]*:	5c fe       	rol lr
++ *[0-9a-f]*:	5c fa       	rol r10
++ *[0-9a-f]*:	5c f9       	rol r9
++ *[0-9a-f]*:	5c f5       	rol r5
++
++[0-9a-f]* <ror>:
++ *[0-9a-f]*:	5d 0f       	ror pc
++ *[0-9a-f]*:	5d 0c       	ror r12
++ *[0-9a-f]*:	5d 05       	ror r5
++ *[0-9a-f]*:	5d 04       	ror r4
++ *[0-9a-f]*:	5d 0e       	ror lr
++ *[0-9a-f]*:	5d 08       	ror r8
++ *[0-9a-f]*:	5d 04       	ror r4
++ *[0-9a-f]*:	5d 07       	ror r7
++
++[0-9a-f]* <icall>:
++ *[0-9a-f]*:	5d 1f       	icall pc
++ *[0-9a-f]*:	5d 1c       	icall r12
++ *[0-9a-f]*:	5d 15       	icall r5
++ *[0-9a-f]*:	5d 14       	icall r4
++ *[0-9a-f]*:	5d 1e       	icall lr
++ *[0-9a-f]*:	5d 13       	icall r3
++ *[0-9a-f]*:	5d 11       	icall r1
++ *[0-9a-f]*:	5d 13       	icall r3
++
++[0-9a-f]* <mustr>:
++ *[0-9a-f]*:	5d 2f       	mustr pc
++ *[0-9a-f]*:	5d 2c       	mustr r12
++ *[0-9a-f]*:	5d 25       	mustr r5
++ *[0-9a-f]*:	5d 24       	mustr r4
++ *[0-9a-f]*:	5d 2e       	mustr lr
++ *[0-9a-f]*:	5d 21       	mustr r1
++ *[0-9a-f]*:	5d 24       	mustr r4
++ *[0-9a-f]*:	5d 2c       	mustr r12
++
++[0-9a-f]* <musfr>:
++ *[0-9a-f]*:	5d 3f       	musfr pc
++ *[0-9a-f]*:	5d 3c       	musfr r12
++ *[0-9a-f]*:	5d 35       	musfr r5
++ *[0-9a-f]*:	5d 34       	musfr r4
++ *[0-9a-f]*:	5d 3e       	musfr lr
++ *[0-9a-f]*:	5d 3b       	musfr r11
++ *[0-9a-f]*:	5d 3c       	musfr r12
++ *[0-9a-f]*:	5d 32       	musfr r2
++
++[0-9a-f]* <ret_cond>:
++ *[0-9a-f]*:	5e 0f       	reteq 1
++ *[0-9a-f]*:	5e fc       	retal r12
++ *[0-9a-f]*:	5e 85       	retls r5
++ *[0-9a-f]*:	5e 74       	retpl r4
++ *[0-9a-f]*:	5e 1e       	retne -1
++ *[0-9a-f]*:	5e 90       	retgt r0
++ *[0-9a-f]*:	5e 9c       	retgt r12
++ *[0-9a-f]*:	5e 4a       	retge r10
++
++[0-9a-f]* <sr_cond>:
++ *[0-9a-f]*:	5f 0f       	sreq pc
++ *[0-9a-f]*:	5f fc       	sral r12
++ *[0-9a-f]*:	5f 85       	srls r5
++ *[0-9a-f]*:	5f 74       	srpl r4
++ *[0-9a-f]*:	5f 1e       	srne lr
++ *[0-9a-f]*:	5f 50       	srlt r0
++ *[0-9a-f]*:	5f fd       	sral sp
++ *[0-9a-f]*:	5f 49       	srge r9
++
++[0-9a-f]* <ld_w3>:
++ *[0-9a-f]*:	7e 0f       	ld\.w pc,pc\[0x0\]
++ *[0-9a-f]*:	79 fc       	ld\.w r12,r12\[0x7c\]
++ *[0-9a-f]*:	6b 05       	ld\.w r5,r5\[0x40\]
++ *[0-9a-f]*:	68 f4       	ld\.w r4,r4\[0x3c\]
++ *[0-9a-f]*:	7c 1e       	ld\.w lr,lr\[0x4\]
++ *[0-9a-f]*:	64 dd       	ld\.w sp,r2\[0x34\]
++ *[0-9a-f]*:	62 29       	ld\.w r9,r1\[0x8\]
++ *[0-9a-f]*:	7a f5       	ld\.w r5,sp\[0x3c\]
++
++[0-9a-f]* <ld_sh3>:
++ *[0-9a-f]*:	9e 0f       	ld\.sh pc,pc\[0x0\]
++ *[0-9a-f]*:	98 7c       	ld\.sh r12,r12\[0xe\]
++ *[0-9a-f]*:	8a 45       	ld\.sh r5,r5\[0x8\]
++ *[0-9a-f]*:	88 34       	ld\.sh r4,r4\[0x6\]
++ *[0-9a-f]*:	9c 1e       	ld\.sh lr,lr\[0x2\]
++ *[0-9a-f]*:	84 44       	ld\.sh r4,r2\[0x8\]
++ *[0-9a-f]*:	9c 5d       	ld\.sh sp,lr\[0xa\]
++ *[0-9a-f]*:	96 12       	ld\.sh r2,r11\[0x2\]
++
++[0-9a-f]* <ld_uh3>:
++ *[0-9a-f]*:	9e 8f       	ld\.uh pc,pc\[0x0\]
++ *[0-9a-f]*:	98 fc       	ld\.uh r12,r12\[0xe\]
++ *[0-9a-f]*:	8a c5       	ld\.uh r5,r5\[0x8\]
++ *[0-9a-f]*:	88 b4       	ld\.uh r4,r4\[0x6\]
++ *[0-9a-f]*:	9c 9e       	ld\.uh lr,lr\[0x2\]
++ *[0-9a-f]*:	80 da       	ld\.uh r10,r0\[0xa\]
++ *[0-9a-f]*:	96 c8       	ld\.uh r8,r11\[0x8\]
++ *[0-9a-f]*:	84 ea       	ld\.uh r10,r2\[0xc\]
++
++[0-9a-f]* <st_w3>:
++ *[0-9a-f]*:	9f 0f       	st\.w pc\[0x0\],pc
++ *[0-9a-f]*:	99 fc       	st\.w r12\[0x3c\],r12
++ *[0-9a-f]*:	8b 85       	st\.w r5\[0x20\],r5
++ *[0-9a-f]*:	89 74       	st\.w r4\[0x1c\],r4
++ *[0-9a-f]*:	9d 1e       	st\.w lr\[0x4\],lr
++ *[0-9a-f]*:	8f bb       	st\.w r7\[0x2c\],r11
++ *[0-9a-f]*:	85 66       	st\.w r2\[0x18\],r6
++ *[0-9a-f]*:	89 39       	st\.w r4\[0xc\],r9
++
++[0-9a-f]* <st_h3>:
++ *[0-9a-f]*:	be 0f       	st\.h pc\[0x0\],pc
++ *[0-9a-f]*:	b8 7c       	st\.h r12\[0xe\],r12
++ *[0-9a-f]*:	aa 45       	st\.h r5\[0x8\],r5
++ *[0-9a-f]*:	a8 34       	st\.h r4\[0x6\],r4
++ *[0-9a-f]*:	bc 1e       	st\.h lr\[0x2\],lr
++ *[0-9a-f]*:	bc 5c       	st\.h lr\[0xa\],r12
++ *[0-9a-f]*:	ac 20       	st\.h r6\[0x4\],r0
++ *[0-9a-f]*:	aa 6d       	st\.h r5\[0xc\],sp
++
++[0-9a-f]* <st_b3>:
++ *[0-9a-f]*:	be 8f       	st\.b pc\[0x0\],pc
++ *[0-9a-f]*:	b8 fc       	st\.b r12\[0x7\],r12
++ *[0-9a-f]*:	aa c5       	st\.b r5\[0x4\],r5
++ *[0-9a-f]*:	a8 b4       	st\.b r4\[0x3\],r4
++ *[0-9a-f]*:	bc 9e       	st\.b lr\[0x1\],lr
++ *[0-9a-f]*:	b8 e9       	st\.b r12\[0x6\],r9
++ *[0-9a-f]*:	a4 be       	st\.b r2\[0x3\],lr
++ *[0-9a-f]*:	a2 bb       	st\.b r1\[0x3\],r11
++
++[0-9a-f]* <ldd>:
++ *[0-9a-f]*:	bf 00       	ld\.d r0,pc
++ *[0-9a-f]*:	b9 0e       	ld\.d lr,r12
++ *[0-9a-f]*:	ab 08       	ld\.d r8,r5
++ *[0-9a-f]*:	a9 06       	ld\.d r6,r4
++ *[0-9a-f]*:	bd 02       	ld\.d r2,lr
++ *[0-9a-f]*:	af 0e       	ld\.d lr,r7
++ *[0-9a-f]*:	a9 04       	ld\.d r4,r4
++ *[0-9a-f]*:	bf 0e       	ld\.d lr,pc
++
++[0-9a-f]* <ldd_postinc>:
++ *[0-9a-f]*:	bf 01       	ld\.d r0,pc\+\+
++ *[0-9a-f]*:	b9 0f       	ld\.d lr,r12\+\+
++ *[0-9a-f]*:	ab 09       	ld\.d r8,r5\+\+
++ *[0-9a-f]*:	a9 07       	ld\.d r6,r4\+\+
++ *[0-9a-f]*:	bd 03       	ld\.d r2,lr\+\+
++ *[0-9a-f]*:	ab 0f       	ld\.d lr,r5\+\+
++ *[0-9a-f]*:	b7 0d       	ld\.d r12,r11\+\+
++ *[0-9a-f]*:	b9 03       	ld\.d r2,r12\+\+
++
++[0-9a-f]* <ldd_predec>:
++ *[0-9a-f]*:	bf 10       	ld\.d r0,--pc
++ *[0-9a-f]*:	b9 1e       	ld\.d lr,--r12
++ *[0-9a-f]*:	ab 18       	ld\.d r8,--r5
++ *[0-9a-f]*:	a9 16       	ld\.d r6,--r4
++ *[0-9a-f]*:	bd 12       	ld\.d r2,--lr
++ *[0-9a-f]*:	a1 18       	ld\.d r8,--r0
++ *[0-9a-f]*:	bf 1a       	ld\.d r10,--pc
++ *[0-9a-f]*:	a9 12       	ld\.d r2,--r4
++
++[0-9a-f]* <std>:
++ *[0-9a-f]*:	bf 11       	st\.d pc,r0
++ *[0-9a-f]*:	b9 1f       	st\.d r12,lr
++ *[0-9a-f]*:	ab 19       	st\.d r5,r8
++ *[0-9a-f]*:	a9 17       	st\.d r4,r6
++ *[0-9a-f]*:	bd 13       	st\.d lr,r2
++ *[0-9a-f]*:	a1 1d       	st\.d r0,r12
++ *[0-9a-f]*:	bb 15       	st\.d sp,r4
++ *[0-9a-f]*:	b9 1d       	st\.d r12,r12
++
++[0-9a-f]* <std_postinc>:
++ *[0-9a-f]*:	bf 20       	st\.d pc\+\+,r0
++ *[0-9a-f]*:	b9 2e       	st\.d r12\+\+,lr
++ *[0-9a-f]*:	ab 28       	st\.d r5\+\+,r8
++ *[0-9a-f]*:	a9 26       	st\.d r4\+\+,r6
++ *[0-9a-f]*:	bd 22       	st\.d lr\+\+,r2
++ *[0-9a-f]*:	bb 26       	st\.d sp\+\+,r6
++ *[0-9a-f]*:	b5 26       	st\.d r10\+\+,r6
++ *[0-9a-f]*:	af 22       	st\.d r7\+\+,r2
++
++[0-9a-f]* <std_predec>:
++ *[0-9a-f]*:	bf 21       	st\.d --pc,r0
++ *[0-9a-f]*:	b9 2f       	st\.d --r12,lr
++ *[0-9a-f]*:	ab 29       	st\.d --r5,r8
++ *[0-9a-f]*:	a9 27       	st\.d --r4,r6
++ *[0-9a-f]*:	bd 23       	st\.d --lr,r2
++ *[0-9a-f]*:	a7 27       	st\.d --r3,r6
++ *[0-9a-f]*:	bd 23       	st\.d --lr,r2
++ *[0-9a-f]*:	a1 25       	st\.d --r0,r4
++
++[0-9a-f]* <mul>:
++ *[0-9a-f]*:	bf 3f       	mul pc,pc
++ *[0-9a-f]*:	b9 3c       	mul r12,r12
++ *[0-9a-f]*:	ab 35       	mul r5,r5
++ *[0-9a-f]*:	a9 34       	mul r4,r4
++ *[0-9a-f]*:	bd 3e       	mul lr,lr
++ *[0-9a-f]*:	bd 3a       	mul r10,lr
++ *[0-9a-f]*:	b1 30       	mul r0,r8
++ *[0-9a-f]*:	ab 38       	mul r8,r5
++
++[0-9a-f]* <asr_imm5>:
++ *[0-9a-f]*:	a1 4f       	asr pc,0x0
++ *[0-9a-f]*:	bf 5c       	asr r12,0x1f
++ *[0-9a-f]*:	b1 45       	asr r5,0x10
++ *[0-9a-f]*:	af 54       	asr r4,0xf
++ *[0-9a-f]*:	a1 5e       	asr lr,0x1
++ *[0-9a-f]*:	b7 56       	asr r6,0x17
++ *[0-9a-f]*:	b3 46       	asr r6,0x12
++ *[0-9a-f]*:	a9 45       	asr r5,0x8
++
++[0-9a-f]* <lsl_imm5>:
++ *[0-9a-f]*:	a1 6f       	lsl pc,0x0
++ *[0-9a-f]*:	bf 7c       	lsl r12,0x1f
++ *[0-9a-f]*:	b1 65       	lsl r5,0x10
++ *[0-9a-f]*:	af 74       	lsl r4,0xf
++ *[0-9a-f]*:	a1 7e       	lsl lr,0x1
++ *[0-9a-f]*:	ad 7c       	lsl r12,0xd
++ *[0-9a-f]*:	b1 66       	lsl r6,0x10
++ *[0-9a-f]*:	b9 71       	lsl r1,0x19
++
++[0-9a-f]* <lsr_imm5>:
++ *[0-9a-f]*:	a1 8f       	lsr pc,0x0
++ *[0-9a-f]*:	bf 9c       	lsr r12,0x1f
++ *[0-9a-f]*:	b1 85       	lsr r5,0x10
++ *[0-9a-f]*:	af 94       	lsr r4,0xf
++ *[0-9a-f]*:	a1 9e       	lsr lr,0x1
++ *[0-9a-f]*:	a1 90       	lsr r0,0x1
++ *[0-9a-f]*:	ab 88       	lsr r8,0xa
++ *[0-9a-f]*:	bb 87       	lsr r7,0x1a
++
++[0-9a-f]* <sbr>:
++ *[0-9a-f]*:	a1 af       	sbr pc,0x0
++ *[0-9a-f]*:	bf bc       	sbr r12,0x1f
++ *[0-9a-f]*:	b1 a5       	sbr r5,0x10
++ *[0-9a-f]*:	af b4       	sbr r4,0xf
++ *[0-9a-f]*:	a1 be       	sbr lr,0x1
++ *[0-9a-f]*:	bf b8       	sbr r8,0x1f
++ *[0-9a-f]*:	b7 a6       	sbr r6,0x16
++ *[0-9a-f]*:	b7 b1       	sbr r1,0x17
++
++[0-9a-f]* <cbr>:
++ *[0-9a-f]*:	a1 cf       	cbr pc,0x0
++ *[0-9a-f]*:	bf dc       	cbr r12,0x1f
++ *[0-9a-f]*:	b1 c5       	cbr r5,0x10
++ *[0-9a-f]*:	af d4       	cbr r4,0xf
++ *[0-9a-f]*:	a1 de       	cbr lr,0x1
++ *[0-9a-f]*:	ab cc       	cbr r12,0xa
++ *[0-9a-f]*:	b7 c7       	cbr r7,0x16
++ *[0-9a-f]*:	a9 d8       	cbr r8,0x9
++
++[0-9a-f]* <brc1>:
++ *[0-9a-f]*:	c0 00       	breq [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf f7       	brpl [0-9a-f]* <.*>
++ *[0-9a-f]*:	c8 04       	brge [0-9a-f]* <.*>
++ *[0-9a-f]*:	c7 f3       	brcs [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 11       	brne [0-9a-f]* <.*>
++ *[0-9a-f]*:	c7 33       	brcs [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf 70       	breq [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 60       	breq [0-9a-f]* <.*>
++
++[0-9a-f]* <rjmp>:
++ *[0-9a-f]*:	c0 08       	rjmp [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf fb       	rjmp [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 0a       	rjmp [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf f9       	rjmp [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 18       	rjmp [0-9a-f]* <.*>
++ *[0-9a-f]*:	c1 fa       	rjmp [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 78       	rjmp [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf ea       	rjmp [0-9a-f]* <.*>
++
++[0-9a-f]* <rcall1>:
++ *[0-9a-f]*:	c0 0c       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf ff       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 0e       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf fd       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 1c       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	c6 cc       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf 7e       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	c1 ae       	rcall [0-9a-f]* <.*>
++
++[0-9a-f]* <acall>:
++ *[0-9a-f]*:	d0 00       	acall 0x0
++ *[0-9a-f]*:	df f0       	acall 0x3fc
++ *[0-9a-f]*:	d8 00       	acall 0x200
++ *[0-9a-f]*:	d7 f0       	acall 0x1fc
++ *[0-9a-f]*:	d0 10       	acall 0x4
++ *[0-9a-f]*:	d5 90       	acall 0x164
++ *[0-9a-f]*:	d4 c0       	acall 0x130
++ *[0-9a-f]*:	d2 b0       	acall 0xac
++
++[0-9a-f]* <scall>:
++ *[0-9a-f]*:	d7 33       	scall
++ *[0-9a-f]*:	d7 33       	scall
++ *[0-9a-f]*:	d7 33       	scall
++ *[0-9a-f]*:	d7 33       	scall
++ *[0-9a-f]*:	d7 33       	scall
++ *[0-9a-f]*:	d7 33       	scall
++ *[0-9a-f]*:	d7 33       	scall
++ *[0-9a-f]*:	d7 33       	scall
++
++[0-9a-f]* <popm>:
++ *[0-9a-f]*:	d8 02       	popm pc
++ *[0-9a-f]*:	dd fa       	popm r0-r11,pc,r12=-1
++ *[0-9a-f]*:	d4 02       	popm lr
++ *[0-9a-f]*:	db fa       	popm r0-r11,pc,r12=1
++ *[0-9a-f]*:	d0 12       	popm r0-r3
++ *[0-9a-f]*:	d8 e2       	popm r4-r10,pc
++ *[0-9a-f]*:	d9 1a       	popm r0-r3,r11,pc,r12=0
++ *[0-9a-f]*:	d7 b2       	popm r0-r7,r10-r12,lr
++
++[0-9a-f]* <pushm>:
++ *[0-9a-f]*:	d8 01       	pushm pc
++ *[0-9a-f]*:	df f1       	pushm r0-r12,lr-pc
++ *[0-9a-f]*:	d8 01       	pushm pc
++ *[0-9a-f]*:	d7 f1       	pushm r0-r12,lr
++ *[0-9a-f]*:	d0 11       	pushm r0-r3
++ *[0-9a-f]*:	dc c1       	pushm r8-r10,lr-pc
++ *[0-9a-f]*:	d0 91       	pushm r0-r3,r10
++ *[0-9a-f]*:	d2 41       	pushm r8-r9,r12
++
++[0-9a-f]* <popm_n>:
++.*
++.*
++.*
++.*
++.*
++.*
++.*
++.*
++
++[0-9a-f]* <pushm_n>:
++.*
++.*
++.*
++.*
++.*
++.*
++.*
++.*
++
++[0-9a-f]* <csrfcz>:
++ *[0-9a-f]*:	d0 03       	csrfcz 0x0
++ *[0-9a-f]*:	d1 f3       	csrfcz 0x1f
++ *[0-9a-f]*:	d1 03       	csrfcz 0x10
++ *[0-9a-f]*:	d0 f3       	csrfcz 0xf
++ *[0-9a-f]*:	d0 13       	csrfcz 0x1
++ *[0-9a-f]*:	d0 53       	csrfcz 0x5
++ *[0-9a-f]*:	d0 d3       	csrfcz 0xd
++ *[0-9a-f]*:	d1 73       	csrfcz 0x17
++
++[0-9a-f]* <ssrf>:
++ *[0-9a-f]*:	d2 03       	ssrf 0x0
++ *[0-9a-f]*:	d3 f3       	ssrf 0x1f
++ *[0-9a-f]*:	d3 03       	ssrf 0x10
++ *[0-9a-f]*:	d2 f3       	ssrf 0xf
++ *[0-9a-f]*:	d2 13       	ssrf 0x1
++ *[0-9a-f]*:	d3 d3       	ssrf 0x1d
++ *[0-9a-f]*:	d2 d3       	ssrf 0xd
++ *[0-9a-f]*:	d2 d3       	ssrf 0xd
++
++[0-9a-f]* <csrf>:
++ *[0-9a-f]*:	d4 03       	csrf 0x0
++ *[0-9a-f]*:	d5 f3       	csrf 0x1f
++ *[0-9a-f]*:	d5 03       	csrf 0x10
++ *[0-9a-f]*:	d4 f3       	csrf 0xf
++ *[0-9a-f]*:	d4 13       	csrf 0x1
++ *[0-9a-f]*:	d4 a3       	csrf 0xa
++ *[0-9a-f]*:	d4 f3       	csrf 0xf
++ *[0-9a-f]*:	d4 b3       	csrf 0xb
++
++[0-9a-f]* <rete>:
++ *[0-9a-f]*:	d6 03       	rete
++
++[0-9a-f]* <rets>:
++ *[0-9a-f]*:	d6 13       	rets
++
++[0-9a-f]* <retd>:
++ *[0-9a-f]*:	d6 23       	retd
++
++[0-9a-f]* <retj>:
++ *[0-9a-f]*:	d6 33       	retj
++
++[0-9a-f]* <tlbr>:
++ *[0-9a-f]*:	d6 43       	tlbr
++
++[0-9a-f]* <tlbs>:
++ *[0-9a-f]*:	d6 53       	tlbs
++
++[0-9a-f]* <tlbw>:
++ *[0-9a-f]*:	d6 63       	tlbw
++
++[0-9a-f]* <breakpoint>:
++ *[0-9a-f]*:	d6 73       	breakpoint
++
++[0-9a-f]* <incjosp>:
++ *[0-9a-f]*:	d6 83       	incjosp 1
++ *[0-9a-f]*:	d6 93       	incjosp 2
++ *[0-9a-f]*:	d6 a3       	incjosp 3
++ *[0-9a-f]*:	d6 b3       	incjosp 4
++ *[0-9a-f]*:	d6 c3       	incjosp -4
++ *[0-9a-f]*:	d6 d3       	incjosp -3
++ *[0-9a-f]*:	d6 e3       	incjosp -2
++ *[0-9a-f]*:	d6 f3       	incjosp -1
++
++[0-9a-f]* <nop>:
++ *[0-9a-f]*:	d7 03       	nop
++
++[0-9a-f]* <popjc>:
++ *[0-9a-f]*:	d7 13       	popjc
++
++[0-9a-f]* <pushjc>:
++ *[0-9a-f]*:	d7 23       	pushjc
++
++[0-9a-f]* <add2>:
++ *[0-9a-f]*:	fe 0f 00 0f 	add pc,pc,pc
++ *[0-9a-f]*:	f8 0c 00 3c 	add r12,r12,r12<<0x3
++ *[0-9a-f]*:	ea 05 00 25 	add r5,r5,r5<<0x2
++ *[0-9a-f]*:	e8 04 00 14 	add r4,r4,r4<<0x1
++ *[0-9a-f]*:	fc 0e 00 1e 	add lr,lr,lr<<0x1
++ *[0-9a-f]*:	f8 00 00 10 	add r0,r12,r0<<0x1
++ *[0-9a-f]*:	f8 04 00 09 	add r9,r12,r4
++ *[0-9a-f]*:	f8 07 00 2c 	add r12,r12,r7<<0x2
++
++[0-9a-f]* <sub2>:
++ *[0-9a-f]*:	fe 0f 01 0f 	sub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 01 3c 	sub r12,r12,r12<<0x3
++ *[0-9a-f]*:	ea 05 01 25 	sub r5,r5,r5<<0x2
++ *[0-9a-f]*:	e8 04 01 14 	sub r4,r4,r4<<0x1
++ *[0-9a-f]*:	fc 0e 01 1e 	sub lr,lr,lr<<0x1
++ *[0-9a-f]*:	e6 04 01 0d 	sub sp,r3,r4
++ *[0-9a-f]*:	ee 03 01 03 	sub r3,r7,r3
++ *[0-9a-f]*:	f4 0d 01 1d 	sub sp,r10,sp<<0x1
++
++[0-9a-f]* <divu>:
++ *[0-9a-f]*:	fe 0f 0d 0f 	divu pc,pc,pc
++ *[0-9a-f]*:	f8 0c 0d 0c 	divu r12,r12,r12
++ *[0-9a-f]*:	ea 05 0d 05 	divu r5,r5,r5
++ *[0-9a-f]*:	e8 04 0d 04 	divu r4,r4,r4
++ *[0-9a-f]*:	fc 0e 0d 0e 	divu lr,lr,lr
++ *[0-9a-f]*:	e8 0f 0d 0d 	divu sp,r4,pc
++ *[0-9a-f]*:	ea 0d 0d 05 	divu r5,r5,sp
++ *[0-9a-f]*:	fa 00 0d 0a 	divu r10,sp,r0
++
++[0-9a-f]* <addhh_w>:
++ *[0-9a-f]*:	fe 0f 0e 0f 	addhh\.w pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 0e 3c 	addhh\.w r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 0e 35 	addhh\.w r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 0e 04 	addhh\.w r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 0e 3e 	addhh\.w lr,lr:t,lr:t
++ *[0-9a-f]*:	e0 03 0e 00 	addhh\.w r0,r0:b,r3:b
++ *[0-9a-f]*:	f8 07 0e 2e 	addhh\.w lr,r12:t,r7:b
++ *[0-9a-f]*:	f4 02 0e 23 	addhh\.w r3,r10:t,r2:b
++
++[0-9a-f]* <subhh_w>:
++ *[0-9a-f]*:	fe 0f 0f 0f 	subhh\.w pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 0f 3c 	subhh\.w r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 0f 35 	subhh\.w r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 0f 04 	subhh\.w r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 0f 3e 	subhh\.w lr,lr:t,lr:t
++ *[0-9a-f]*:	e2 07 0f 2a 	subhh\.w r10,r1:t,r7:b
++ *[0-9a-f]*:	f4 0e 0f 3f 	subhh\.w pc,r10:t,lr:t
++ *[0-9a-f]*:	e0 0c 0f 23 	subhh\.w r3,r0:t,r12:b
++
++[0-9a-f]* <adc>:
++ *[0-9a-f]*:	fe 0f 00 4f 	adc pc,pc,pc
++ *[0-9a-f]*:	f8 0c 00 4c 	adc r12,r12,r12
++ *[0-9a-f]*:	ea 05 00 45 	adc r5,r5,r5
++ *[0-9a-f]*:	e8 04 00 44 	adc r4,r4,r4
++ *[0-9a-f]*:	fc 0e 00 4e 	adc lr,lr,lr
++ *[0-9a-f]*:	e0 07 00 44 	adc r4,r0,r7
++ *[0-9a-f]*:	e8 03 00 4d 	adc sp,r4,r3
++ *[0-9a-f]*:	f8 00 00 42 	adc r2,r12,r0
++
++[0-9a-f]* <sbc>:
++ *[0-9a-f]*:	fe 0f 01 4f 	sbc pc,pc,pc
++ *[0-9a-f]*:	f8 0c 01 4c 	sbc r12,r12,r12
++ *[0-9a-f]*:	ea 05 01 45 	sbc r5,r5,r5
++ *[0-9a-f]*:	e8 04 01 44 	sbc r4,r4,r4
++ *[0-9a-f]*:	fc 0e 01 4e 	sbc lr,lr,lr
++ *[0-9a-f]*:	ee 09 01 46 	sbc r6,r7,r9
++ *[0-9a-f]*:	f0 05 01 40 	sbc r0,r8,r5
++ *[0-9a-f]*:	e0 04 01 41 	sbc r1,r0,r4
++
++[0-9a-f]* <mul_2>:
++ *[0-9a-f]*:	fe 0f 02 4f 	mul pc,pc,pc
++ *[0-9a-f]*:	f8 0c 02 4c 	mul r12,r12,r12
++ *[0-9a-f]*:	ea 05 02 45 	mul r5,r5,r5
++ *[0-9a-f]*:	e8 04 02 44 	mul r4,r4,r4
++ *[0-9a-f]*:	fc 0e 02 4e 	mul lr,lr,lr
++ *[0-9a-f]*:	e0 00 02 4f 	mul pc,r0,r0
++ *[0-9a-f]*:	fe 0e 02 48 	mul r8,pc,lr
++ *[0-9a-f]*:	f8 0f 02 44 	mul r4,r12,pc
++
++[0-9a-f]* <mac>:
++ *[0-9a-f]*:	fe 0f 03 4f 	mac pc,pc,pc
++ *[0-9a-f]*:	f8 0c 03 4c 	mac r12,r12,r12
++ *[0-9a-f]*:	ea 05 03 45 	mac r5,r5,r5
++ *[0-9a-f]*:	e8 04 03 44 	mac r4,r4,r4
++ *[0-9a-f]*:	fc 0e 03 4e 	mac lr,lr,lr
++ *[0-9a-f]*:	e8 00 03 4a 	mac r10,r4,r0
++ *[0-9a-f]*:	fc 00 03 47 	mac r7,lr,r0
++ *[0-9a-f]*:	f2 0c 03 42 	mac r2,r9,r12
++
++[0-9a-f]* <mulsd>:
++ *[0-9a-f]*:	fe 0f 04 4f 	muls\.d pc,pc,pc
++ *[0-9a-f]*:	f8 0c 04 4c 	muls\.d r12,r12,r12
++ *[0-9a-f]*:	ea 05 04 45 	muls\.d r5,r5,r5
++ *[0-9a-f]*:	e8 04 04 44 	muls\.d r4,r4,r4
++ *[0-9a-f]*:	fc 0e 04 4e 	muls\.d lr,lr,lr
++ *[0-9a-f]*:	f0 0e 04 42 	muls\.d r2,r8,lr
++ *[0-9a-f]*:	e0 0b 04 44 	muls\.d r4,r0,r11
++ *[0-9a-f]*:	fc 06 04 45 	muls\.d r5,lr,r6
++
++[0-9a-f]* <macsd>:
++ *[0-9a-f]*:	fe 0f 05 40 	macs\.d r0,pc,pc
++ *[0-9a-f]*:	f8 0c 05 4e 	macs\.d lr,r12,r12
++ *[0-9a-f]*:	ea 05 05 48 	macs\.d r8,r5,r5
++ *[0-9a-f]*:	e8 04 05 46 	macs\.d r6,r4,r4
++ *[0-9a-f]*:	fc 0e 05 42 	macs\.d r2,lr,lr
++ *[0-9a-f]*:	e2 09 05 48 	macs\.d r8,r1,r9
++ *[0-9a-f]*:	f0 08 05 4e 	macs\.d lr,r8,r8
++ *[0-9a-f]*:	e6 0c 05 44 	macs\.d r4,r3,r12
++
++[0-9a-f]* <mulud>:
++ *[0-9a-f]*:	fe 0f 06 40 	mulu\.d r0,pc,pc
++ *[0-9a-f]*:	f8 0c 06 4e 	mulu\.d lr,r12,r12
++ *[0-9a-f]*:	ea 05 06 48 	mulu\.d r8,r5,r5
++ *[0-9a-f]*:	e8 04 06 46 	mulu\.d r6,r4,r4
++ *[0-9a-f]*:	fc 0e 06 42 	mulu\.d r2,lr,lr
++ *[0-9a-f]*:	ea 00 06 46 	mulu\.d r6,r5,r0
++ *[0-9a-f]*:	ec 01 06 44 	mulu\.d r4,r6,r1
++ *[0-9a-f]*:	f0 02 06 48 	mulu\.d r8,r8,r2
++
++[0-9a-f]* <macud>:
++ *[0-9a-f]*:	fe 0f 07 40 	macu\.d r0,pc,pc
++ *[0-9a-f]*:	f8 0c 07 4e 	macu\.d lr,r12,r12
++ *[0-9a-f]*:	ea 05 07 48 	macu\.d r8,r5,r5
++ *[0-9a-f]*:	e8 04 07 46 	macu\.d r6,r4,r4
++ *[0-9a-f]*:	fc 0e 07 42 	macu\.d r2,lr,lr
++ *[0-9a-f]*:	fa 0b 07 46 	macu\.d r6,sp,r11
++ *[0-9a-f]*:	e8 08 07 42 	macu\.d r2,r4,r8
++ *[0-9a-f]*:	f4 09 07 46 	macu\.d r6,r10,r9
++
++[0-9a-f]* <asr_1>:
++ *[0-9a-f]*:	fe 0f 08 4f 	asr pc,pc,pc
++ *[0-9a-f]*:	f8 0c 08 4c 	asr r12,r12,r12
++ *[0-9a-f]*:	ea 05 08 45 	asr r5,r5,r5
++ *[0-9a-f]*:	e8 04 08 44 	asr r4,r4,r4
++ *[0-9a-f]*:	fc 0e 08 4e 	asr lr,lr,lr
++ *[0-9a-f]*:	ec 0f 08 4f 	asr pc,r6,pc
++ *[0-9a-f]*:	ec 0c 08 40 	asr r0,r6,r12
++ *[0-9a-f]*:	fa 00 08 44 	asr r4,sp,r0
++
++[0-9a-f]* <lsl_1>:
++ *[0-9a-f]*:	fe 0f 09 4f 	lsl pc,pc,pc
++ *[0-9a-f]*:	f8 0c 09 4c 	lsl r12,r12,r12
++ *[0-9a-f]*:	ea 05 09 45 	lsl r5,r5,r5
++ *[0-9a-f]*:	e8 04 09 44 	lsl r4,r4,r4
++ *[0-9a-f]*:	fc 0e 09 4e 	lsl lr,lr,lr
++ *[0-9a-f]*:	ea 0e 09 4e 	lsl lr,r5,lr
++ *[0-9a-f]*:	fe 03 09 45 	lsl r5,pc,r3
++ *[0-9a-f]*:	fe 09 09 41 	lsl r1,pc,r9
++
++[0-9a-f]* <lsr_1>:
++ *[0-9a-f]*:	fe 0f 0a 4f 	lsr pc,pc,pc
++ *[0-9a-f]*:	f8 0c 0a 4c 	lsr r12,r12,r12
++ *[0-9a-f]*:	ea 05 0a 45 	lsr r5,r5,r5
++ *[0-9a-f]*:	e8 04 0a 44 	lsr r4,r4,r4
++ *[0-9a-f]*:	fc 0e 0a 4e 	lsr lr,lr,lr
++ *[0-9a-f]*:	e8 01 0a 42 	lsr r2,r4,r1
++ *[0-9a-f]*:	e2 06 0a 45 	lsr r5,r1,r6
++ *[0-9a-f]*:	ec 07 0a 4d 	lsr sp,r6,r7
++
++[0-9a-f]* <xchg>:
++ *[0-9a-f]*:	fe 0f 0b 4f 	xchg pc,pc,pc
++ *[0-9a-f]*:	f8 0c 0b 4c 	xchg r12,r12,r12
++ *[0-9a-f]*:	ea 05 0b 45 	xchg r5,r5,r5
++ *[0-9a-f]*:	e8 04 0b 44 	xchg r4,r4,r4
++ *[0-9a-f]*:	fc 0e 0b 4e 	xchg lr,lr,lr
++ *[0-9a-f]*:	e8 0d 0b 4e 	xchg lr,r4,sp
++ *[0-9a-f]*:	ea 0c 0b 41 	xchg r1,r5,r12
++ *[0-9a-f]*:	f8 00 0b 4e 	xchg lr,r12,r0
++
++[0-9a-f]* <max>:
++ *[0-9a-f]*:	fe 0f 0c 4f 	max pc,pc,pc
++ *[0-9a-f]*:	f8 0c 0c 4c 	max r12,r12,r12
++ *[0-9a-f]*:	ea 05 0c 45 	max r5,r5,r5
++ *[0-9a-f]*:	e8 04 0c 44 	max r4,r4,r4
++ *[0-9a-f]*:	fc 0e 0c 4e 	max lr,lr,lr
++ *[0-9a-f]*:	e4 0d 0c 4e 	max lr,r2,sp
++ *[0-9a-f]*:	f4 09 0c 44 	max r4,r10,r9
++ *[0-9a-f]*:	f2 0e 0c 4e 	max lr,r9,lr
++
++[0-9a-f]* <min>:
++ *[0-9a-f]*:	fe 0f 0d 4f 	min pc,pc,pc
++ *[0-9a-f]*:	f8 0c 0d 4c 	min r12,r12,r12
++ *[0-9a-f]*:	ea 05 0d 45 	min r5,r5,r5
++ *[0-9a-f]*:	e8 04 0d 44 	min r4,r4,r4
++ *[0-9a-f]*:	fc 0e 0d 4e 	min lr,lr,lr
++ *[0-9a-f]*:	ee 08 0d 49 	min r9,r7,r8
++ *[0-9a-f]*:	ea 05 0d 4d 	min sp,r5,r5
++ *[0-9a-f]*:	e2 04 0d 44 	min r4,r1,r4
++
++[0-9a-f]* <addabs>:
++ *[0-9a-f]*:	fe 0f 0e 4f 	addabs pc,pc,pc
++ *[0-9a-f]*:	f8 0c 0e 4c 	addabs r12,r12,r12
++ *[0-9a-f]*:	ea 05 0e 45 	addabs r5,r5,r5
++ *[0-9a-f]*:	e8 04 0e 44 	addabs r4,r4,r4
++ *[0-9a-f]*:	fc 0e 0e 4e 	addabs lr,lr,lr
++ *[0-9a-f]*:	f4 00 0e 47 	addabs r7,r10,r0
++ *[0-9a-f]*:	f2 07 0e 49 	addabs r9,r9,r7
++ *[0-9a-f]*:	f0 0c 0e 42 	addabs r2,r8,r12
++
++[0-9a-f]* <mulnhh_w>:
++ *[0-9a-f]*:	fe 0f 01 8f 	mulnhh\.w pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 01 bc 	mulnhh\.w r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 01 b5 	mulnhh\.w r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 01 84 	mulnhh\.w r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 01 be 	mulnhh\.w lr,lr:t,lr:t
++ *[0-9a-f]*:	fa 09 01 ab 	mulnhh\.w r11,sp:t,r9:b
++ *[0-9a-f]*:	e8 0e 01 9d 	mulnhh\.w sp,r4:b,lr:t
++ *[0-9a-f]*:	e4 0b 01 ac 	mulnhh\.w r12,r2:t,r11:b
++
++[0-9a-f]* <mulnwh_d>:
++ *[0-9a-f]*:	fe 0f 02 80 	mulnwh\.d r0,pc,pc:b
++ *[0-9a-f]*:	f8 0c 02 9e 	mulnwh\.d lr,r12,r12:t
++ *[0-9a-f]*:	ea 05 02 98 	mulnwh\.d r8,r5,r5:t
++ *[0-9a-f]*:	e8 04 02 86 	mulnwh\.d r6,r4,r4:b
++ *[0-9a-f]*:	fc 0e 02 92 	mulnwh\.d r2,lr,lr:t
++ *[0-9a-f]*:	e6 02 02 9e 	mulnwh\.d lr,r3,r2:t
++ *[0-9a-f]*:	ea 09 02 84 	mulnwh\.d r4,r5,r9:b
++ *[0-9a-f]*:	e8 04 02 9c 	mulnwh\.d r12,r4,r4:t
++
++[0-9a-f]* <machh_w>:
++ *[0-9a-f]*:	fe 0f 04 8f 	machh\.w pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 04 bc 	machh\.w r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 04 b5 	machh\.w r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 04 84 	machh\.w r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 04 be 	machh\.w lr,lr:t,lr:t
++ *[0-9a-f]*:	ea 01 04 9e 	machh\.w lr,r5:b,r1:t
++ *[0-9a-f]*:	ec 07 04 89 	machh\.w r9,r6:b,r7:b
++ *[0-9a-f]*:	fc 0c 04 a5 	machh\.w r5,lr:t,r12:b
++
++[0-9a-f]* <machh_d>:
++ *[0-9a-f]*:	fe 0f 05 80 	machh\.d r0,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 05 be 	machh\.d lr,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 05 b8 	machh\.d r8,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 05 86 	machh\.d r6,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 05 b2 	machh\.d r2,lr:t,lr:t
++ *[0-9a-f]*:	e0 08 05 8a 	machh\.d r10,r0:b,r8:b
++ *[0-9a-f]*:	e8 05 05 9e 	machh\.d lr,r4:b,r5:t
++ *[0-9a-f]*:	e0 04 05 98 	machh\.d r8,r0:b,r4:t
++
++[0-9a-f]* <macsathh_w>:
++ *[0-9a-f]*:	fe 0f 06 8f 	macsathh\.w pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 06 bc 	macsathh\.w r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 06 b5 	macsathh\.w r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 06 84 	macsathh\.w r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 06 be 	macsathh\.w lr,lr:t,lr:t
++ *[0-9a-f]*:	ee 0f 06 b7 	macsathh\.w r7,r7:t,pc:t
++ *[0-9a-f]*:	e4 04 06 a4 	macsathh\.w r4,r2:t,r4:b
++ *[0-9a-f]*:	f0 03 06 b4 	macsathh\.w r4,r8:t,r3:t
++
++[0-9a-f]* <mulhh_w>:
++ *[0-9a-f]*:	fe 0f 07 8f 	mulhh\.w pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 07 bc 	mulhh\.w r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 07 b5 	mulhh\.w r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 07 84 	mulhh\.w r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 07 be 	mulhh\.w lr,lr:t,lr:t
++ *[0-9a-f]*:	e8 09 07 a7 	mulhh\.w r7,r4:t,r9:b
++ *[0-9a-f]*:	e6 07 07 bf 	mulhh\.w pc,r3:t,r7:t
++ *[0-9a-f]*:	e8 09 07 9f 	mulhh\.w pc,r4:b,r9:t
++
++[0-9a-f]* <mulsathh_h>:
++ *[0-9a-f]*:	fe 0f 08 8f 	mulsathh\.h pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 08 bc 	mulsathh\.h r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 08 b5 	mulsathh\.h r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 08 84 	mulsathh\.h r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 08 be 	mulsathh\.h lr,lr:t,lr:t
++ *[0-9a-f]*:	e2 0d 08 83 	mulsathh\.h r3,r1:b,sp:b
++ *[0-9a-f]*:	fc 0b 08 ab 	mulsathh\.h r11,lr:t,r11:b
++ *[0-9a-f]*:	f0 0b 08 98 	mulsathh\.h r8,r8:b,r11:t
++
++[0-9a-f]* <mulsathh_w>:
++ *[0-9a-f]*:	fe 0f 09 8f 	mulsathh\.w pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 09 bc 	mulsathh\.w r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 09 b5 	mulsathh\.w r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 09 84 	mulsathh\.w r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 09 be 	mulsathh\.w lr,lr:t,lr:t
++ *[0-9a-f]*:	f6 06 09 ae 	mulsathh\.w lr,r11:t,r6:b
++ *[0-9a-f]*:	ec 07 09 96 	mulsathh\.w r6,r6:b,r7:t
++ *[0-9a-f]*:	e4 03 09 8a 	mulsathh\.w r10,r2:b,r3:b
++
++[0-9a-f]* <mulsatrndhh_h>:
++ *[0-9a-f]*:	fe 0f 0a 8f 	mulsatrndhh\.h pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 0a bc 	mulsatrndhh\.h r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 0a b5 	mulsatrndhh\.h r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 0a 84 	mulsatrndhh\.h r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 0a be 	mulsatrndhh\.h lr,lr:t,lr:t
++ *[0-9a-f]*:	ec 09 0a 8b 	mulsatrndhh\.h r11,r6:b,r9:b
++ *[0-9a-f]*:	e6 08 0a 9b 	mulsatrndhh\.h r11,r3:b,r8:t
++ *[0-9a-f]*:	fa 07 0a b5 	mulsatrndhh\.h r5,sp:t,r7:t
++
++[0-9a-f]* <mulsatrndwh_w>:
++ *[0-9a-f]*:	fe 0f 0b 8f 	mulsatrndwh\.w pc,pc,pc:b
++ *[0-9a-f]*:	f8 0c 0b 9c 	mulsatrndwh\.w r12,r12,r12:t
++ *[0-9a-f]*:	ea 05 0b 95 	mulsatrndwh\.w r5,r5,r5:t
++ *[0-9a-f]*:	e8 04 0b 84 	mulsatrndwh\.w r4,r4,r4:b
++ *[0-9a-f]*:	fc 0e 0b 9e 	mulsatrndwh\.w lr,lr,lr:t
++ *[0-9a-f]*:	f8 00 0b 85 	mulsatrndwh\.w r5,r12,r0:b
++ *[0-9a-f]*:	f4 0f 0b 87 	mulsatrndwh\.w r7,r10,pc:b
++ *[0-9a-f]*:	f0 05 0b 9a 	mulsatrndwh\.w r10,r8,r5:t
++
++[0-9a-f]* <macwh_d>:
++ *[0-9a-f]*:	fe 0f 0c 80 	macwh\.d r0,pc,pc:b
++ *[0-9a-f]*:	f8 0c 0c 9e 	macwh\.d lr,r12,r12:t
++ *[0-9a-f]*:	ea 05 0c 98 	macwh\.d r8,r5,r5:t
++ *[0-9a-f]*:	e8 04 0c 86 	macwh\.d r6,r4,r4:b
++ *[0-9a-f]*:	fc 0e 0c 92 	macwh\.d r2,lr,lr:t
++ *[0-9a-f]*:	f4 0c 0c 94 	macwh\.d r4,r10,r12:t
++ *[0-9a-f]*:	ee 0d 0c 84 	macwh\.d r4,r7,sp:b
++ *[0-9a-f]*:	f2 0b 0c 8e 	macwh\.d lr,r9,r11:b
++
++[0-9a-f]* <mulwh_d>:
++ *[0-9a-f]*:	fe 0f 0d 80 	mulwh\.d r0,pc,pc:b
++ *[0-9a-f]*:	f8 0c 0d 9e 	mulwh\.d lr,r12,r12:t
++ *[0-9a-f]*:	ea 05 0d 98 	mulwh\.d r8,r5,r5:t
++ *[0-9a-f]*:	e8 04 0d 86 	mulwh\.d r6,r4,r4:b
++ *[0-9a-f]*:	fc 0e 0d 92 	mulwh\.d r2,lr,lr:t
++ *[0-9a-f]*:	ea 01 0d 8c 	mulwh\.d r12,r5,r1:b
++ *[0-9a-f]*:	e2 03 0d 90 	mulwh\.d r0,r1,r3:t
++ *[0-9a-f]*:	f2 02 0d 80 	mulwh\.d r0,r9,r2:b
++
++[0-9a-f]* <mulsatwh_w>:
++ *[0-9a-f]*:	fe 0f 0e 8f 	mulsatwh\.w pc,pc,pc:b
++ *[0-9a-f]*:	f8 0c 0e 9c 	mulsatwh\.w r12,r12,r12:t
++ *[0-9a-f]*:	ea 05 0e 95 	mulsatwh\.w r5,r5,r5:t
++ *[0-9a-f]*:	e8 04 0e 84 	mulsatwh\.w r4,r4,r4:b
++ *[0-9a-f]*:	fc 0e 0e 9e 	mulsatwh\.w lr,lr,lr:t
++ *[0-9a-f]*:	fe 0a 0e 9b 	mulsatwh\.w r11,pc,r10:t
++ *[0-9a-f]*:	f8 09 0e 9d 	mulsatwh\.w sp,r12,r9:t
++ *[0-9a-f]*:	e6 02 0e 90 	mulsatwh\.w r0,r3,r2:t
++
++[0-9a-f]* <ldw7>:
++ *[0-9a-f]*:	fe 0f 0f 8f 	ld\.w pc,pc\[pc:b<<2\]
++ *[0-9a-f]*:	f8 0c 0f bc 	ld\.w r12,r12\[r12:t<<2\]
++ *[0-9a-f]*:	ea 05 0f a5 	ld\.w r5,r5\[r5:u<<2\]
++ *[0-9a-f]*:	e8 04 0f 94 	ld\.w r4,r4\[r4:l<<2\]
++ *[0-9a-f]*:	fc 0e 0f 9e 	ld\.w lr,lr\[lr:l<<2\]
++ *[0-9a-f]*:	f4 06 0f 99 	ld\.w r9,r10\[r6:l<<2\]
++ *[0-9a-f]*:	f4 0a 0f 82 	ld\.w r2,r10\[r10:b<<2\]
++ *[0-9a-f]*:	ea 0f 0f 8b 	ld\.w r11,r5\[pc:b<<2\]
++
++[0-9a-f]* <satadd_w>:
++ *[0-9a-f]*:	fe 0f 00 cf 	satadd\.w pc,pc,pc
++ *[0-9a-f]*:	f8 0c 00 cc 	satadd\.w r12,r12,r12
++ *[0-9a-f]*:	ea 05 00 c5 	satadd\.w r5,r5,r5
++ *[0-9a-f]*:	e8 04 00 c4 	satadd\.w r4,r4,r4
++ *[0-9a-f]*:	fc 0e 00 ce 	satadd\.w lr,lr,lr
++ *[0-9a-f]*:	f0 0b 00 c4 	satadd\.w r4,r8,r11
++ *[0-9a-f]*:	f8 06 00 c3 	satadd\.w r3,r12,r6
++ *[0-9a-f]*:	fc 09 00 c3 	satadd\.w r3,lr,r9
++
++[0-9a-f]* <satsub_w1>:
++ *[0-9a-f]*:	fe 0f 01 cf 	satsub\.w pc,pc,pc
++ *[0-9a-f]*:	f8 0c 01 cc 	satsub\.w r12,r12,r12
++ *[0-9a-f]*:	ea 05 01 c5 	satsub\.w r5,r5,r5
++ *[0-9a-f]*:	e8 04 01 c4 	satsub\.w r4,r4,r4
++ *[0-9a-f]*:	fc 0e 01 ce 	satsub\.w lr,lr,lr
++ *[0-9a-f]*:	fa 00 01 c8 	satsub\.w r8,sp,r0
++ *[0-9a-f]*:	f0 04 01 c9 	satsub\.w r9,r8,r4
++ *[0-9a-f]*:	fc 02 01 cf 	satsub\.w pc,lr,r2
++
++[0-9a-f]* <satadd_h>:
++ *[0-9a-f]*:	fe 0f 02 cf 	satadd\.h pc,pc,pc
++ *[0-9a-f]*:	f8 0c 02 cc 	satadd\.h r12,r12,r12
++ *[0-9a-f]*:	ea 05 02 c5 	satadd\.h r5,r5,r5
++ *[0-9a-f]*:	e8 04 02 c4 	satadd\.h r4,r4,r4
++ *[0-9a-f]*:	fc 0e 02 ce 	satadd\.h lr,lr,lr
++ *[0-9a-f]*:	e6 09 02 c7 	satadd\.h r7,r3,r9
++ *[0-9a-f]*:	e0 02 02 c1 	satadd\.h r1,r0,r2
++ *[0-9a-f]*:	e8 0e 02 c1 	satadd\.h r1,r4,lr
++
++[0-9a-f]* <satsub_h>:
++ *[0-9a-f]*:	fe 0f 03 cf 	satsub\.h pc,pc,pc
++ *[0-9a-f]*:	f8 0c 03 cc 	satsub\.h r12,r12,r12
++ *[0-9a-f]*:	ea 05 03 c5 	satsub\.h r5,r5,r5
++ *[0-9a-f]*:	e8 04 03 c4 	satsub\.h r4,r4,r4
++ *[0-9a-f]*:	fc 0e 03 ce 	satsub\.h lr,lr,lr
++ *[0-9a-f]*:	fc 03 03 ce 	satsub\.h lr,lr,r3
++ *[0-9a-f]*:	ec 05 03 cb 	satsub\.h r11,r6,r5
++ *[0-9a-f]*:	fa 00 03 c3 	satsub\.h r3,sp,r0
++
++[0-9a-f]* <mul3>:
++ *[0-9a-f]*:	fe 0f 10 00 	mul pc,pc,0
++ *[0-9a-f]*:	f8 0c 10 ff 	mul r12,r12,-1
++ *[0-9a-f]*:	ea 05 10 80 	mul r5,r5,-128
++ *[0-9a-f]*:	e8 04 10 7f 	mul r4,r4,127
++ *[0-9a-f]*:	fc 0e 10 01 	mul lr,lr,1
++ *[0-9a-f]*:	e4 0c 10 f9 	mul r12,r2,-7
++ *[0-9a-f]*:	fe 01 10 5f 	mul r1,pc,95
++ *[0-9a-f]*:	ec 04 10 13 	mul r4,r6,19
++
++[0-9a-f]* <rsub2>:
++ *[0-9a-f]*:	fe 0f 11 00 	rsub pc,pc,0
++ *[0-9a-f]*:	f8 0c 11 ff 	rsub r12,r12,-1
++ *[0-9a-f]*:	ea 05 11 80 	rsub r5,r5,-128
++ *[0-9a-f]*:	e8 04 11 7f 	rsub r4,r4,127
++ *[0-9a-f]*:	fc 0e 11 01 	rsub lr,lr,1
++ *[0-9a-f]*:	fc 09 11 60 	rsub r9,lr,96
++ *[0-9a-f]*:	e2 0b 11 38 	rsub r11,r1,56
++ *[0-9a-f]*:	ee 00 11 a9 	rsub r0,r7,-87
++
++[0-9a-f]* <clz>:
++ *[0-9a-f]*:	fe 0f 12 00 	clz pc,pc
++ *[0-9a-f]*:	f8 0c 12 00 	clz r12,r12
++ *[0-9a-f]*:	ea 05 12 00 	clz r5,r5
++ *[0-9a-f]*:	e8 04 12 00 	clz r4,r4
++ *[0-9a-f]*:	fc 0e 12 00 	clz lr,lr
++ *[0-9a-f]*:	e6 02 12 00 	clz r2,r3
++ *[0-9a-f]*:	f6 05 12 00 	clz r5,r11
++ *[0-9a-f]*:	e6 0f 12 00 	clz pc,r3
++
++[0-9a-f]* <cpc1>:
++ *[0-9a-f]*:	fe 0f 13 00 	cpc pc,pc
++ *[0-9a-f]*:	f8 0c 13 00 	cpc r12,r12
++ *[0-9a-f]*:	ea 05 13 00 	cpc r5,r5
++ *[0-9a-f]*:	e8 04 13 00 	cpc r4,r4
++ *[0-9a-f]*:	fc 0e 13 00 	cpc lr,lr
++ *[0-9a-f]*:	e8 0f 13 00 	cpc pc,r4
++ *[0-9a-f]*:	f2 05 13 00 	cpc r5,r9
++ *[0-9a-f]*:	ee 06 13 00 	cpc r6,r7
++
++[0-9a-f]* <asr3>:
++ *[0-9a-f]*:	fe 0f 14 00 	asr pc,pc,0x0
++ *[0-9a-f]*:	f8 0c 14 1f 	asr r12,r12,0x1f
++ *[0-9a-f]*:	ea 05 14 10 	asr r5,r5,0x10
++ *[0-9a-f]*:	e8 04 14 0f 	asr r4,r4,0xf
++ *[0-9a-f]*:	fc 0e 14 01 	asr lr,lr,0x1
++ *[0-9a-f]*:	f6 04 14 13 	asr r4,r11,0x13
++ *[0-9a-f]*:	fe 0d 14 1a 	asr sp,pc,0x1a
++ *[0-9a-f]*:	fa 0b 14 08 	asr r11,sp,0x8
++
++[0-9a-f]* <lsl3>:
++ *[0-9a-f]*:	fe 0f 15 00 	lsl pc,pc,0x0
++ *[0-9a-f]*:	f8 0c 15 1f 	lsl r12,r12,0x1f
++ *[0-9a-f]*:	ea 05 15 10 	lsl r5,r5,0x10
++ *[0-9a-f]*:	e8 04 15 0f 	lsl r4,r4,0xf
++ *[0-9a-f]*:	fc 0e 15 01 	lsl lr,lr,0x1
++ *[0-9a-f]*:	f4 08 15 11 	lsl r8,r10,0x11
++ *[0-9a-f]*:	fc 02 15 03 	lsl r2,lr,0x3
++ *[0-9a-f]*:	f6 0e 15 0e 	lsl lr,r11,0xe
++
++[0-9a-f]* <lsr3>:
++ *[0-9a-f]*:	fe 0f 16 00 	lsr pc,pc,0x0
++ *[0-9a-f]*:	f8 0c 16 1f 	lsr r12,r12,0x1f
++ *[0-9a-f]*:	ea 05 16 10 	lsr r5,r5,0x10
++ *[0-9a-f]*:	e8 04 16 0f 	lsr r4,r4,0xf
++ *[0-9a-f]*:	fc 0e 16 01 	lsr lr,lr,0x1
++ *[0-9a-f]*:	e6 04 16 1f 	lsr r4,r3,0x1f
++ *[0-9a-f]*:	f2 0f 16 0e 	lsr pc,r9,0xe
++ *[0-9a-f]*:	e0 03 16 06 	lsr r3,r0,0x6
++
++[0-9a-f]* <movc1>:
++ *[0-9a-f]*:	fe 0f 17 00 	moveq pc,pc
++ *[0-9a-f]*:	f8 0c 17 f0 	moval r12,r12
++ *[0-9a-f]*:	ea 05 17 80 	movls r5,r5
++ *[0-9a-f]*:	e8 04 17 70 	movpl r4,r4
++ *[0-9a-f]*:	fc 0e 17 10 	movne lr,lr
++ *[0-9a-f]*:	f6 0f 17 10 	movne pc,r11
++ *[0-9a-f]*:	e4 0a 17 60 	movmi r10,r2
++ *[0-9a-f]*:	f8 08 17 80 	movls r8,r12
++
++[0-9a-f]* <padd_h>:
++ *[0-9a-f]*:	fe 0f 20 0f 	padd\.h pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 0c 	padd\.h r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 05 	padd\.h r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 04 	padd\.h r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 0e 	padd\.h lr,lr,lr
++ *[0-9a-f]*:	e4 07 20 08 	padd\.h r8,r2,r7
++ *[0-9a-f]*:	e0 03 20 00 	padd\.h r0,r0,r3
++ *[0-9a-f]*:	f6 06 20 0d 	padd\.h sp,r11,r6
++
++[0-9a-f]* <psub_h>:
++ *[0-9a-f]*:	fe 0f 20 1f 	psub\.h pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 1c 	psub\.h r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 15 	psub\.h r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 14 	psub\.h r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 1e 	psub\.h lr,lr,lr
++ *[0-9a-f]*:	ec 08 20 1e 	psub\.h lr,r6,r8
++ *[0-9a-f]*:	e2 0d 20 10 	psub\.h r0,r1,sp
++ *[0-9a-f]*:	fe 0d 20 1f 	psub\.h pc,pc,sp
++
++[0-9a-f]* <paddx_h>:
++ *[0-9a-f]*:	fe 0f 20 2f 	paddx\.h pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 2c 	paddx\.h r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 25 	paddx\.h r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 24 	paddx\.h r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 2e 	paddx\.h lr,lr,lr
++ *[0-9a-f]*:	fe 01 20 2f 	paddx\.h pc,pc,r1
++ *[0-9a-f]*:	e8 05 20 2a 	paddx\.h r10,r4,r5
++ *[0-9a-f]*:	fe 02 20 25 	paddx\.h r5,pc,r2
++
++[0-9a-f]* <psubx_h>:
++ *[0-9a-f]*:	fe 0f 20 3f 	psubx\.h pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 3c 	psubx\.h r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 35 	psubx\.h r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 34 	psubx\.h r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 3e 	psubx\.h lr,lr,lr
++ *[0-9a-f]*:	f8 05 20 35 	psubx\.h r5,r12,r5
++ *[0-9a-f]*:	f0 03 20 33 	psubx\.h r3,r8,r3
++ *[0-9a-f]*:	e4 03 20 35 	psubx\.h r5,r2,r3
++
++[0-9a-f]* <padds_sh>:
++ *[0-9a-f]*:	fe 0f 20 4f 	padds\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 4c 	padds\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 45 	padds\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 44 	padds\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 4e 	padds\.sh lr,lr,lr
++ *[0-9a-f]*:	fc 02 20 49 	padds\.sh r9,lr,r2
++ *[0-9a-f]*:	f0 01 20 46 	padds\.sh r6,r8,r1
++ *[0-9a-f]*:	e8 0a 20 46 	padds\.sh r6,r4,r10
++
++[0-9a-f]* <psubs_sh>:
++ *[0-9a-f]*:	fe 0f 20 5f 	psubs\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 5c 	psubs\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 55 	psubs\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 54 	psubs\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 5e 	psubs\.sh lr,lr,lr
++ *[0-9a-f]*:	fc 0b 20 56 	psubs\.sh r6,lr,r11
++ *[0-9a-f]*:	f8 04 20 52 	psubs\.sh r2,r12,r4
++ *[0-9a-f]*:	f2 00 20 50 	psubs\.sh r0,r9,r0
++
++[0-9a-f]* <paddxs_sh>:
++ *[0-9a-f]*:	fe 0f 20 6f 	paddxs\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 6c 	paddxs\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 65 	paddxs\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 64 	paddxs\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 6e 	paddxs\.sh lr,lr,lr
++ *[0-9a-f]*:	e6 09 20 60 	paddxs\.sh r0,r3,r9
++ *[0-9a-f]*:	f4 0b 20 6f 	paddxs\.sh pc,r10,r11
++ *[0-9a-f]*:	f4 0f 20 6f 	paddxs\.sh pc,r10,pc
++
++[0-9a-f]* <psubxs_sh>:
++ *[0-9a-f]*:	fe 0f 20 7f 	psubxs\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 7c 	psubxs\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 75 	psubxs\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 74 	psubxs\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 7e 	psubxs\.sh lr,lr,lr
++ *[0-9a-f]*:	e8 04 20 77 	psubxs\.sh r7,r4,r4
++ *[0-9a-f]*:	f0 03 20 77 	psubxs\.sh r7,r8,r3
++ *[0-9a-f]*:	ec 05 20 7f 	psubxs\.sh pc,r6,r5
++
++[0-9a-f]* <padds_uh>:
++ *[0-9a-f]*:	fe 0f 20 8f 	padds\.uh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 8c 	padds\.uh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 85 	padds\.uh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 84 	padds\.uh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 8e 	padds\.uh lr,lr,lr
++ *[0-9a-f]*:	f6 07 20 8c 	padds\.uh r12,r11,r7
++ *[0-9a-f]*:	f0 0e 20 87 	padds\.uh r7,r8,lr
++ *[0-9a-f]*:	f2 07 20 86 	padds\.uh r6,r9,r7
++
++[0-9a-f]* <psubs_uh>:
++ *[0-9a-f]*:	fe 0f 20 9f 	psubs\.uh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 9c 	psubs\.uh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 95 	psubs\.uh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 94 	psubs\.uh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 9e 	psubs\.uh lr,lr,lr
++ *[0-9a-f]*:	f4 06 20 9e 	psubs\.uh lr,r10,r6
++ *[0-9a-f]*:	e4 0f 20 9d 	psubs\.uh sp,r2,pc
++ *[0-9a-f]*:	f2 02 20 92 	psubs\.uh r2,r9,r2
++
++[0-9a-f]* <paddxs_uh>:
++ *[0-9a-f]*:	fe 0f 20 af 	paddxs\.uh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 ac 	paddxs\.uh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 a5 	paddxs\.uh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 a4 	paddxs\.uh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 ae 	paddxs\.uh lr,lr,lr
++ *[0-9a-f]*:	f2 05 20 a7 	paddxs\.uh r7,r9,r5
++ *[0-9a-f]*:	e2 04 20 a9 	paddxs\.uh r9,r1,r4
++ *[0-9a-f]*:	e4 03 20 a5 	paddxs\.uh r5,r2,r3
++
++[0-9a-f]* <psubxs_uh>:
++ *[0-9a-f]*:	fe 0f 20 bf 	psubxs\.uh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 bc 	psubxs\.uh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 b5 	psubxs\.uh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 b4 	psubxs\.uh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 be 	psubxs\.uh lr,lr,lr
++ *[0-9a-f]*:	ea 0d 20 bd 	psubxs\.uh sp,r5,sp
++ *[0-9a-f]*:	ec 06 20 bd 	psubxs\.uh sp,r6,r6
++ *[0-9a-f]*:	f6 08 20 b3 	psubxs\.uh r3,r11,r8
++
++[0-9a-f]* <paddh_sh>:
++ *[0-9a-f]*:	fe 0f 20 cf 	paddh\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 cc 	paddh\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 c5 	paddh\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 c4 	paddh\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 ce 	paddh\.sh lr,lr,lr
++ *[0-9a-f]*:	fa 03 20 cc 	paddh\.sh r12,sp,r3
++ *[0-9a-f]*:	ea 03 20 cf 	paddh\.sh pc,r5,r3
++ *[0-9a-f]*:	f0 0d 20 c8 	paddh\.sh r8,r8,sp
++
++[0-9a-f]* <psubh_sh>:
++ *[0-9a-f]*:	fe 0f 20 df 	psubh\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 dc 	psubh\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 d5 	psubh\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 d4 	psubh\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 de 	psubh\.sh lr,lr,lr
++ *[0-9a-f]*:	ea 08 20 d1 	psubh\.sh r1,r5,r8
++ *[0-9a-f]*:	e6 06 20 d7 	psubh\.sh r7,r3,r6
++ *[0-9a-f]*:	e6 03 20 d4 	psubh\.sh r4,r3,r3
++
++[0-9a-f]* <paddxh_sh>:
++ *[0-9a-f]*:	fe 0f 20 ef 	paddxh\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 ec 	paddxh\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 e5 	paddxh\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 e4 	paddxh\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 ee 	paddxh\.sh lr,lr,lr
++ *[0-9a-f]*:	e0 04 20 e6 	paddxh\.sh r6,r0,r4
++ *[0-9a-f]*:	f0 09 20 e9 	paddxh\.sh r9,r8,r9
++ *[0-9a-f]*:	e0 0d 20 e3 	paddxh\.sh r3,r0,sp
++
++[0-9a-f]* <psubxh_sh>:
++ *[0-9a-f]*:	fe 0f 20 ff 	psubxh\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 20 fc 	psubxh\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 20 f5 	psubxh\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 20 f4 	psubxh\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 20 fe 	psubxh\.sh lr,lr,lr
++ *[0-9a-f]*:	fe 0c 20 f4 	psubxh\.sh r4,pc,r12
++ *[0-9a-f]*:	e8 06 20 f8 	psubxh\.sh r8,r4,r6
++ *[0-9a-f]*:	f2 04 20 fc 	psubxh\.sh r12,r9,r4
++
++[0-9a-f]* <paddsub_h>:
++ *[0-9a-f]*:	fe 0f 21 0f 	paddsub\.h pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 21 3c 	paddsub\.h r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 21 35 	paddsub\.h r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 21 04 	paddsub\.h r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 21 3e 	paddsub\.h lr,lr:t,lr:t
++ *[0-9a-f]*:	e4 0e 21 25 	paddsub\.h r5,r2:t,lr:b
++ *[0-9a-f]*:	e2 08 21 07 	paddsub\.h r7,r1:b,r8:b
++ *[0-9a-f]*:	f4 05 21 36 	paddsub\.h r6,r10:t,r5:t
++
++[0-9a-f]* <psubadd_h>:
++ *[0-9a-f]*:	fe 0f 21 4f 	psubadd\.h pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 21 7c 	psubadd\.h r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 21 75 	psubadd\.h r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 21 44 	psubadd\.h r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 21 7e 	psubadd\.h lr,lr:t,lr:t
++ *[0-9a-f]*:	f6 08 21 79 	psubadd\.h r9,r11:t,r8:t
++ *[0-9a-f]*:	ee 0e 21 7a 	psubadd\.h r10,r7:t,lr:t
++ *[0-9a-f]*:	fe 0f 21 66 	psubadd\.h r6,pc:t,pc:b
++
++[0-9a-f]* <paddsubs_sh>:
++ *[0-9a-f]*:	fe 0f 21 8f 	paddsubs\.sh pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 21 bc 	paddsubs\.sh r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 21 b5 	paddsubs\.sh r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 21 84 	paddsubs\.sh r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 21 be 	paddsubs\.sh lr,lr:t,lr:t
++ *[0-9a-f]*:	fc 00 21 a0 	paddsubs\.sh r0,lr:t,r0:b
++ *[0-9a-f]*:	e4 04 21 b9 	paddsubs\.sh r9,r2:t,r4:t
++ *[0-9a-f]*:	f2 0d 21 bc 	paddsubs\.sh r12,r9:t,sp:t
++
++[0-9a-f]* <psubadds_sh>:
++ *[0-9a-f]*:	fe 0f 21 cf 	psubadds\.sh pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 21 fc 	psubadds\.sh r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 21 f5 	psubadds\.sh r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 21 c4 	psubadds\.sh r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 21 fe 	psubadds\.sh lr,lr:t,lr:t
++ *[0-9a-f]*:	fc 01 21 df 	psubadds\.sh pc,lr:b,r1:t
++ *[0-9a-f]*:	e6 0c 21 cb 	psubadds\.sh r11,r3:b,r12:b
++ *[0-9a-f]*:	e4 08 21 fa 	psubadds\.sh r10,r2:t,r8:t
++
++[0-9a-f]* <paddsubs_uh>:
++ *[0-9a-f]*:	fe 0f 22 0f 	paddsubs\.uh pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 22 3c 	paddsubs\.uh r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 22 35 	paddsubs\.uh r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 22 04 	paddsubs\.uh r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 22 3e 	paddsubs\.uh lr,lr:t,lr:t
++ *[0-9a-f]*:	e4 03 22 09 	paddsubs\.uh r9,r2:b,r3:b
++ *[0-9a-f]*:	fa 07 22 1d 	paddsubs\.uh sp,sp:b,r7:t
++ *[0-9a-f]*:	e0 0a 22 1e 	paddsubs\.uh lr,r0:b,r10:t
++
++[0-9a-f]* <psubadds_uh>:
++ *[0-9a-f]*:	fe 0f 22 4f 	psubadds\.uh pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 22 7c 	psubadds\.uh r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 22 75 	psubadds\.uh r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 22 44 	psubadds\.uh r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 22 7e 	psubadds\.uh lr,lr:t,lr:t
++ *[0-9a-f]*:	f2 0f 22 7c 	psubadds\.uh r12,r9:t,pc:t
++ *[0-9a-f]*:	ec 08 22 48 	psubadds\.uh r8,r6:b,r8:b
++ *[0-9a-f]*:	f0 04 22 48 	psubadds\.uh r8,r8:b,r4:b
++
++[0-9a-f]* <paddsubh_sh>:
++ *[0-9a-f]*:	fe 0f 22 8f 	paddsubh\.sh pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 22 bc 	paddsubh\.sh r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 22 b5 	paddsubh\.sh r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 22 84 	paddsubh\.sh r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 22 be 	paddsubh\.sh lr,lr:t,lr:t
++ *[0-9a-f]*:	f2 09 22 a8 	paddsubh\.sh r8,r9:t,r9:b
++ *[0-9a-f]*:	fa 01 22 b0 	paddsubh\.sh r0,sp:t,r1:t
++ *[0-9a-f]*:	e2 00 22 93 	paddsubh\.sh r3,r1:b,r0:t
++
++[0-9a-f]* <psubaddh_sh>:
++ *[0-9a-f]*:	fe 0f 22 cf 	psubaddh\.sh pc,pc:b,pc:b
++ *[0-9a-f]*:	f8 0c 22 fc 	psubaddh\.sh r12,r12:t,r12:t
++ *[0-9a-f]*:	ea 05 22 f5 	psubaddh\.sh r5,r5:t,r5:t
++ *[0-9a-f]*:	e8 04 22 c4 	psubaddh\.sh r4,r4:b,r4:b
++ *[0-9a-f]*:	fc 0e 22 fe 	psubaddh\.sh lr,lr:t,lr:t
++ *[0-9a-f]*:	e6 0a 22 e7 	psubaddh\.sh r7,r3:t,r10:b
++ *[0-9a-f]*:	e4 01 22 f7 	psubaddh\.sh r7,r2:t,r1:t
++ *[0-9a-f]*:	e6 06 22 cb 	psubaddh\.sh r11,r3:b,r6:b
++
++[0-9a-f]* <padd_b>:
++ *[0-9a-f]*:	fe 0f 23 0f 	padd\.b pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 0c 	padd\.b r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 05 	padd\.b r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 04 	padd\.b r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 0e 	padd\.b lr,lr,lr
++ *[0-9a-f]*:	ec 0f 23 02 	padd\.b r2,r6,pc
++ *[0-9a-f]*:	f2 0c 23 08 	padd\.b r8,r9,r12
++ *[0-9a-f]*:	f8 03 23 05 	padd\.b r5,r12,r3
++
++[0-9a-f]* <psub_b>:
++ *[0-9a-f]*:	fe 0f 23 1f 	psub\.b pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 1c 	psub\.b r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 15 	psub\.b r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 14 	psub\.b r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 1e 	psub\.b lr,lr,lr
++ *[0-9a-f]*:	f8 0f 23 10 	psub\.b r0,r12,pc
++ *[0-9a-f]*:	fa 0a 23 17 	psub\.b r7,sp,r10
++ *[0-9a-f]*:	fa 0c 23 15 	psub\.b r5,sp,r12
++
++[0-9a-f]* <padds_sb>:
++ *[0-9a-f]*:	fe 0f 23 2f 	padds\.sb pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 2c 	padds\.sb r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 25 	padds\.sb r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 24 	padds\.sb r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 2e 	padds\.sb lr,lr,lr
++ *[0-9a-f]*:	f6 04 23 2d 	padds\.sb sp,r11,r4
++ *[0-9a-f]*:	f4 0b 23 2b 	padds\.sb r11,r10,r11
++ *[0-9a-f]*:	f8 06 23 25 	padds\.sb r5,r12,r6
++
++[0-9a-f]* <psubs_sb>:
++ *[0-9a-f]*:	fe 0f 23 3f 	psubs\.sb pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 3c 	psubs\.sb r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 35 	psubs\.sb r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 34 	psubs\.sb r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 3e 	psubs\.sb lr,lr,lr
++ *[0-9a-f]*:	ec 08 23 37 	psubs\.sb r7,r6,r8
++ *[0-9a-f]*:	f4 09 23 3c 	psubs\.sb r12,r10,r9
++ *[0-9a-f]*:	f6 00 23 3f 	psubs\.sb pc,r11,r0
++
++[0-9a-f]* <padds_ub>:
++ *[0-9a-f]*:	fe 0f 23 4f 	padds\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 4c 	padds\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 45 	padds\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 44 	padds\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 4e 	padds\.ub lr,lr,lr
++ *[0-9a-f]*:	e4 0b 23 43 	padds\.ub r3,r2,r11
++ *[0-9a-f]*:	f0 01 23 4a 	padds\.ub r10,r8,r1
++ *[0-9a-f]*:	f0 0a 23 4b 	padds\.ub r11,r8,r10
++
++[0-9a-f]* <psubs_ub>:
++ *[0-9a-f]*:	fe 0f 23 5f 	psubs\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 5c 	psubs\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 55 	psubs\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 54 	psubs\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 5e 	psubs\.ub lr,lr,lr
++ *[0-9a-f]*:	e4 07 23 50 	psubs\.ub r0,r2,r7
++ *[0-9a-f]*:	ea 03 23 5e 	psubs\.ub lr,r5,r3
++ *[0-9a-f]*:	ee 09 23 56 	psubs\.ub r6,r7,r9
++
++[0-9a-f]* <paddh_ub>:
++ *[0-9a-f]*:	fe 0f 23 6f 	paddh\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 6c 	paddh\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 65 	paddh\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 64 	paddh\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 6e 	paddh\.ub lr,lr,lr
++ *[0-9a-f]*:	e2 00 23 6e 	paddh\.ub lr,r1,r0
++ *[0-9a-f]*:	ee 07 23 62 	paddh\.ub r2,r7,r7
++ *[0-9a-f]*:	e2 02 23 62 	paddh\.ub r2,r1,r2
++
++[0-9a-f]* <psubh_ub>:
++ *[0-9a-f]*:	fe 0f 23 7f 	psubh\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 7c 	psubh\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 75 	psubh\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 74 	psubh\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 7e 	psubh\.ub lr,lr,lr
++ *[0-9a-f]*:	e2 06 23 70 	psubh\.ub r0,r1,r6
++ *[0-9a-f]*:	fc 0a 23 74 	psubh\.ub r4,lr,r10
++ *[0-9a-f]*:	f0 01 23 79 	psubh\.ub r9,r8,r1
++
++[0-9a-f]* <pmax_ub>:
++ *[0-9a-f]*:	fe 0f 23 8f 	pmax\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 8c 	pmax\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 85 	pmax\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 84 	pmax\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 8e 	pmax\.ub lr,lr,lr
++ *[0-9a-f]*:	e4 0b 23 8f 	pmax\.ub pc,r2,r11
++ *[0-9a-f]*:	e2 01 23 8c 	pmax\.ub r12,r1,r1
++ *[0-9a-f]*:	e4 00 23 85 	pmax\.ub r5,r2,r0
++
++[0-9a-f]* <pmax_sh>:
++ *[0-9a-f]*:	fe 0f 23 9f 	pmax\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 9c 	pmax\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 95 	pmax\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 94 	pmax\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 9e 	pmax\.sh lr,lr,lr
++ *[0-9a-f]*:	ec 0c 23 9e 	pmax\.sh lr,r6,r12
++ *[0-9a-f]*:	fe 05 23 92 	pmax\.sh r2,pc,r5
++ *[0-9a-f]*:	e4 07 23 9f 	pmax\.sh pc,r2,r7
++
++[0-9a-f]* <pmin_ub>:
++ *[0-9a-f]*:	fe 0f 23 af 	pmin\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 ac 	pmin\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 a5 	pmin\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 a4 	pmin\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 ae 	pmin\.ub lr,lr,lr
++ *[0-9a-f]*:	e2 05 23 a8 	pmin\.ub r8,r1,r5
++ *[0-9a-f]*:	f0 03 23 a1 	pmin\.ub r1,r8,r3
++ *[0-9a-f]*:	e4 07 23 a0 	pmin\.ub r0,r2,r7
++
++[0-9a-f]* <pmin_sh>:
++ *[0-9a-f]*:	fe 0f 23 bf 	pmin\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 bc 	pmin\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 b5 	pmin\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 b4 	pmin\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 be 	pmin\.sh lr,lr,lr
++ *[0-9a-f]*:	e8 0a 23 b8 	pmin\.sh r8,r4,r10
++ *[0-9a-f]*:	f4 0c 23 be 	pmin\.sh lr,r10,r12
++ *[0-9a-f]*:	ec 02 23 b2 	pmin\.sh r2,r6,r2
++
++[0-9a-f]* <pavg_ub>:
++ *[0-9a-f]*:	fe 0f 23 cf 	pavg\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 cc 	pavg\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 c5 	pavg\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 c4 	pavg\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 ce 	pavg\.ub lr,lr,lr
++ *[0-9a-f]*:	e2 06 23 c0 	pavg\.ub r0,r1,r6
++ *[0-9a-f]*:	e6 06 23 c8 	pavg\.ub r8,r3,r6
++ *[0-9a-f]*:	f8 0a 23 cf 	pavg\.ub pc,r12,r10
++
++[0-9a-f]* <pavg_sh>:
++ *[0-9a-f]*:	fe 0f 23 df 	pavg\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 23 dc 	pavg\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 23 d5 	pavg\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 23 d4 	pavg\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 23 de 	pavg\.sh lr,lr,lr
++ *[0-9a-f]*:	fe 0d 23 d9 	pavg\.sh r9,pc,sp
++ *[0-9a-f]*:	fa 03 23 df 	pavg\.sh pc,sp,r3
++ *[0-9a-f]*:	e2 09 23 d6 	pavg\.sh r6,r1,r9
++
++[0-9a-f]* <pabs_sb>:
++ *[0-9a-f]*:	e0 0f 23 ef 	pabs\.sb pc,pc
++ *[0-9a-f]*:	e0 0c 23 ec 	pabs\.sb r12,r12
++ *[0-9a-f]*:	e0 05 23 e5 	pabs\.sb r5,r5
++ *[0-9a-f]*:	e0 04 23 e4 	pabs\.sb r4,r4
++ *[0-9a-f]*:	e0 0e 23 ee 	pabs\.sb lr,lr
++ *[0-9a-f]*:	e0 06 23 eb 	pabs\.sb r11,r6
++ *[0-9a-f]*:	e0 09 23 ee 	pabs\.sb lr,r9
++ *[0-9a-f]*:	e0 07 23 ed 	pabs\.sb sp,r7
++
++[0-9a-f]* <pabs_sh>:
++ *[0-9a-f]*:	e0 0f 23 ff 	pabs\.sh pc,pc
++ *[0-9a-f]*:	e0 0c 23 fc 	pabs\.sh r12,r12
++ *[0-9a-f]*:	e0 05 23 f5 	pabs\.sh r5,r5
++ *[0-9a-f]*:	e0 04 23 f4 	pabs\.sh r4,r4
++ *[0-9a-f]*:	e0 0e 23 fe 	pabs\.sh lr,lr
++ *[0-9a-f]*:	e0 03 23 ff 	pabs\.sh pc,r3
++ *[0-9a-f]*:	e0 07 23 f5 	pabs\.sh r5,r7
++ *[0-9a-f]*:	e0 00 23 f4 	pabs\.sh r4,r0
++
++[0-9a-f]* <psad>:
++ *[0-9a-f]*:	fe 0f 24 0f 	psad pc,pc,pc
++ *[0-9a-f]*:	f8 0c 24 0c 	psad r12,r12,r12
++ *[0-9a-f]*:	ea 05 24 05 	psad r5,r5,r5
++ *[0-9a-f]*:	e8 04 24 04 	psad r4,r4,r4
++ *[0-9a-f]*:	fc 0e 24 0e 	psad lr,lr,lr
++ *[0-9a-f]*:	f6 0b 24 09 	psad r9,r11,r11
++ *[0-9a-f]*:	e8 0d 24 0e 	psad lr,r4,sp
++ *[0-9a-f]*:	e8 05 24 0e 	psad lr,r4,r5
++
++[0-9a-f]* <pasr_b>:
++ *[0-9a-f]*:	fe 00 24 1f 	pasr\.b pc,pc,0x0
++ *[0-9a-f]*:	f8 07 24 1c 	pasr\.b r12,r12,0x7
++ *[0-9a-f]*:	ea 04 24 15 	pasr\.b r5,r5,0x4
++ *[0-9a-f]*:	e8 03 24 14 	pasr\.b r4,r4,0x3
++ *[0-9a-f]*:	fc 01 24 1e 	pasr\.b lr,lr,0x1
++ *[0-9a-f]*:	ee 01 24 1f 	pasr\.b pc,r7,0x1
++ *[0-9a-f]*:	fc 06 24 1d 	pasr\.b sp,lr,0x6
++ *[0-9a-f]*:	e6 02 24 1d 	pasr\.b sp,r3,0x2
++
++[0-9a-f]* <plsl_b>:
++ *[0-9a-f]*:	fe 00 24 2f 	plsl\.b pc,pc,0x0
++ *[0-9a-f]*:	f8 07 24 2c 	plsl\.b r12,r12,0x7
++ *[0-9a-f]*:	ea 04 24 25 	plsl\.b r5,r5,0x4
++ *[0-9a-f]*:	e8 03 24 24 	plsl\.b r4,r4,0x3
++ *[0-9a-f]*:	fc 01 24 2e 	plsl\.b lr,lr,0x1
++ *[0-9a-f]*:	f6 04 24 22 	plsl\.b r2,r11,0x4
++ *[0-9a-f]*:	ea 07 24 28 	plsl\.b r8,r5,0x7
++ *[0-9a-f]*:	e0 02 24 2f 	plsl\.b pc,r0,0x2
++
++[0-9a-f]* <plsr_b>:
++ *[0-9a-f]*:	fe 00 24 3f 	plsr\.b pc,pc,0x0
++ *[0-9a-f]*:	f8 07 24 3c 	plsr\.b r12,r12,0x7
++ *[0-9a-f]*:	ea 04 24 35 	plsr\.b r5,r5,0x4
++ *[0-9a-f]*:	e8 03 24 34 	plsr\.b r4,r4,0x3
++ *[0-9a-f]*:	fc 01 24 3e 	plsr\.b lr,lr,0x1
++ *[0-9a-f]*:	e2 02 24 3c 	plsr\.b r12,r1,0x2
++ *[0-9a-f]*:	fe 07 24 36 	plsr\.b r6,pc,0x7
++ *[0-9a-f]*:	f6 02 24 3c 	plsr\.b r12,r11,0x2
++
++[0-9a-f]* <pasr_h>:
++ *[0-9a-f]*:	fe 00 24 4f 	pasr\.h pc,pc,0x0
++ *[0-9a-f]*:	f8 0f 24 4c 	pasr\.h r12,r12,0xf
++ *[0-9a-f]*:	ea 08 24 45 	pasr\.h r5,r5,0x8
++ *[0-9a-f]*:	e8 07 24 44 	pasr\.h r4,r4,0x7
++ *[0-9a-f]*:	fc 01 24 4e 	pasr\.h lr,lr,0x1
++ *[0-9a-f]*:	f6 0a 24 40 	pasr\.h r0,r11,0xa
++ *[0-9a-f]*:	ec 08 24 44 	pasr\.h r4,r6,0x8
++ *[0-9a-f]*:	e4 04 24 46 	pasr\.h r6,r2,0x4
++
++[0-9a-f]* <plsl_h>:
++ *[0-9a-f]*:	fe 00 24 5f 	plsl\.h pc,pc,0x0
++ *[0-9a-f]*:	f8 0f 24 5c 	plsl\.h r12,r12,0xf
++ *[0-9a-f]*:	ea 08 24 55 	plsl\.h r5,r5,0x8
++ *[0-9a-f]*:	e8 07 24 54 	plsl\.h r4,r4,0x7
++ *[0-9a-f]*:	fc 01 24 5e 	plsl\.h lr,lr,0x1
++ *[0-9a-f]*:	f4 09 24 55 	plsl\.h r5,r10,0x9
++ *[0-9a-f]*:	fc 08 24 5d 	plsl\.h sp,lr,0x8
++ *[0-9a-f]*:	fc 07 24 50 	plsl\.h r0,lr,0x7
++
++[0-9a-f]* <plsr_h>:
++ *[0-9a-f]*:	fe 00 24 6f 	plsr\.h pc,pc,0x0
++ *[0-9a-f]*:	f8 0f 24 6c 	plsr\.h r12,r12,0xf
++ *[0-9a-f]*:	ea 08 24 65 	plsr\.h r5,r5,0x8
++ *[0-9a-f]*:	e8 07 24 64 	plsr\.h r4,r4,0x7
++ *[0-9a-f]*:	fc 01 24 6e 	plsr\.h lr,lr,0x1
++ *[0-9a-f]*:	e0 0f 24 6b 	plsr\.h r11,r0,0xf
++ *[0-9a-f]*:	e6 03 24 6e 	plsr\.h lr,r3,0x3
++ *[0-9a-f]*:	fc 0a 24 68 	plsr\.h r8,lr,0xa
++
++[0-9a-f]* <packw_sh>:
++ *[0-9a-f]*:	fe 0f 24 7f 	packw\.sh pc,pc,pc
++ *[0-9a-f]*:	f8 0c 24 7c 	packw\.sh r12,r12,r12
++ *[0-9a-f]*:	ea 05 24 75 	packw\.sh r5,r5,r5
++ *[0-9a-f]*:	e8 04 24 74 	packw\.sh r4,r4,r4
++ *[0-9a-f]*:	fc 0e 24 7e 	packw\.sh lr,lr,lr
++ *[0-9a-f]*:	f6 0a 24 7d 	packw\.sh sp,r11,r10
++ *[0-9a-f]*:	e4 0c 24 78 	packw\.sh r8,r2,r12
++ *[0-9a-f]*:	e2 05 24 78 	packw\.sh r8,r1,r5
++
++[0-9a-f]* <punpckub_h>:
++ *[0-9a-f]*:	fe 00 24 8f 	punpckub\.h pc,pc:b
++ *[0-9a-f]*:	f8 00 24 9c 	punpckub\.h r12,r12:t
++ *[0-9a-f]*:	ea 00 24 95 	punpckub\.h r5,r5:t
++ *[0-9a-f]*:	e8 00 24 84 	punpckub\.h r4,r4:b
++ *[0-9a-f]*:	fc 00 24 9e 	punpckub\.h lr,lr:t
++ *[0-9a-f]*:	e2 00 24 96 	punpckub\.h r6,r1:t
++ *[0-9a-f]*:	ea 00 24 8e 	punpckub\.h lr,r5:b
++ *[0-9a-f]*:	e4 00 24 9e 	punpckub\.h lr,r2:t
++
++[0-9a-f]* <punpcksb_h>:
++ *[0-9a-f]*:	fe 00 24 af 	punpcksb\.h pc,pc:b
++ *[0-9a-f]*:	f8 00 24 bc 	punpcksb\.h r12,r12:t
++ *[0-9a-f]*:	ea 00 24 b5 	punpcksb\.h r5,r5:t
++ *[0-9a-f]*:	e8 00 24 a4 	punpcksb\.h r4,r4:b
++ *[0-9a-f]*:	fc 00 24 be 	punpcksb\.h lr,lr:t
++ *[0-9a-f]*:	ee 00 24 b4 	punpcksb\.h r4,r7:t
++ *[0-9a-f]*:	fc 00 24 a6 	punpcksb\.h r6,lr:b
++ *[0-9a-f]*:	f8 00 24 bc 	punpcksb\.h r12,r12:t
++
++[0-9a-f]* <packsh_ub>:
++ *[0-9a-f]*:	fe 0f 24 cf 	packsh\.ub pc,pc,pc
++ *[0-9a-f]*:	f8 0c 24 cc 	packsh\.ub r12,r12,r12
++ *[0-9a-f]*:	ea 05 24 c5 	packsh\.ub r5,r5,r5
++ *[0-9a-f]*:	e8 04 24 c4 	packsh\.ub r4,r4,r4
++ *[0-9a-f]*:	fc 0e 24 ce 	packsh\.ub lr,lr,lr
++ *[0-9a-f]*:	ec 03 24 c3 	packsh\.ub r3,r6,r3
++ *[0-9a-f]*:	e0 03 24 c8 	packsh\.ub r8,r0,r3
++ *[0-9a-f]*:	e6 0e 24 c9 	packsh\.ub r9,r3,lr
++
++[0-9a-f]* <packsh_sb>:
++ *[0-9a-f]*:	fe 0f 24 df 	packsh\.sb pc,pc,pc
++ *[0-9a-f]*:	f8 0c 24 dc 	packsh\.sb r12,r12,r12
++ *[0-9a-f]*:	ea 05 24 d5 	packsh\.sb r5,r5,r5
++ *[0-9a-f]*:	e8 04 24 d4 	packsh\.sb r4,r4,r4
++ *[0-9a-f]*:	fc 0e 24 de 	packsh\.sb lr,lr,lr
++ *[0-9a-f]*:	f0 01 24 d6 	packsh\.sb r6,r8,r1
++ *[0-9a-f]*:	f2 08 24 de 	packsh\.sb lr,r9,r8
++ *[0-9a-f]*:	ec 06 24 dd 	packsh\.sb sp,r6,r6
++
++[0-9a-f]* <andl>:
++ *[0-9a-f]*:	e0 1f 00 00 	andl pc,0x0
++ *[0-9a-f]*:	e0 1c ff ff 	andl r12,0xffff
++ *[0-9a-f]*:	e0 15 80 00 	andl r5,0x8000
++ *[0-9a-f]*:	e0 14 7f ff 	andl r4,0x7fff
++ *[0-9a-f]*:	e0 1e 00 01 	andl lr,0x1
++ *[0-9a-f]*:	e0 1f 5a 58 	andl pc,0x5a58
++ *[0-9a-f]*:	e0 18 b8 9e 	andl r8,0xb89e
++ *[0-9a-f]*:	e0 17 35 97 	andl r7,0x3597
++
++[0-9a-f]* <andl_coh>:
++ *[0-9a-f]*:	e2 1f 00 00 	andl pc,0x0,COH
++ *[0-9a-f]*:	e2 1c ff ff 	andl r12,0xffff,COH
++ *[0-9a-f]*:	e2 15 80 00 	andl r5,0x8000,COH
++ *[0-9a-f]*:	e2 14 7f ff 	andl r4,0x7fff,COH
++ *[0-9a-f]*:	e2 1e 00 01 	andl lr,0x1,COH
++ *[0-9a-f]*:	e2 16 58 e1 	andl r6,0x58e1,COH
++ *[0-9a-f]*:	e2 10 9e cd 	andl r0,0x9ecd,COH
++ *[0-9a-f]*:	e2 14 bd c4 	andl r4,0xbdc4,COH
++
++[0-9a-f]* <andh>:
++ *[0-9a-f]*:	e4 1f 00 00 	andh pc,0x0
++ *[0-9a-f]*:	e4 1c ff ff 	andh r12,0xffff
++ *[0-9a-f]*:	e4 15 80 00 	andh r5,0x8000
++ *[0-9a-f]*:	e4 14 7f ff 	andh r4,0x7fff
++ *[0-9a-f]*:	e4 1e 00 01 	andh lr,0x1
++ *[0-9a-f]*:	e4 1c cc 58 	andh r12,0xcc58
++ *[0-9a-f]*:	e4 13 21 e3 	andh r3,0x21e3
++ *[0-9a-f]*:	e4 12 a7 eb 	andh r2,0xa7eb
++
++[0-9a-f]* <andh_coh>:
++ *[0-9a-f]*:	e6 1f 00 00 	andh pc,0x0,COH
++ *[0-9a-f]*:	e6 1c ff ff 	andh r12,0xffff,COH
++ *[0-9a-f]*:	e6 15 80 00 	andh r5,0x8000,COH
++ *[0-9a-f]*:	e6 14 7f ff 	andh r4,0x7fff,COH
++ *[0-9a-f]*:	e6 1e 00 01 	andh lr,0x1,COH
++ *[0-9a-f]*:	e6 1b 86 0d 	andh r11,0x860d,COH
++ *[0-9a-f]*:	e6 18 ce f6 	andh r8,0xcef6,COH
++ *[0-9a-f]*:	e6 1a 5c 83 	andh r10,0x5c83,COH
++
++[0-9a-f]* <orl>:
++ *[0-9a-f]*:	e8 1f 00 00 	orl pc,0x0
++ *[0-9a-f]*:	e8 1c ff ff 	orl r12,0xffff
++ *[0-9a-f]*:	e8 15 80 00 	orl r5,0x8000
++ *[0-9a-f]*:	e8 14 7f ff 	orl r4,0x7fff
++ *[0-9a-f]*:	e8 1e 00 01 	orl lr,0x1
++ *[0-9a-f]*:	e8 1d 41 7e 	orl sp,0x417e
++ *[0-9a-f]*:	e8 10 52 bd 	orl r0,0x52bd
++ *[0-9a-f]*:	e8 1f ac 47 	orl pc,0xac47
++
++[0-9a-f]* <orh>:
++ *[0-9a-f]*:	ea 1f 00 00 	orh pc,0x0
++ *[0-9a-f]*:	ea 1c ff ff 	orh r12,0xffff
++ *[0-9a-f]*:	ea 15 80 00 	orh r5,0x8000
++ *[0-9a-f]*:	ea 14 7f ff 	orh r4,0x7fff
++ *[0-9a-f]*:	ea 1e 00 01 	orh lr,0x1
++ *[0-9a-f]*:	ea 18 6e 7d 	orh r8,0x6e7d
++ *[0-9a-f]*:	ea 1c 77 1c 	orh r12,0x771c
++ *[0-9a-f]*:	ea 11 ea 1a 	orh r1,0xea1a
++
++[0-9a-f]* <eorl>:
++ *[0-9a-f]*:	ec 1f 00 00 	eorl pc,0x0
++ *[0-9a-f]*:	ec 1c ff ff 	eorl r12,0xffff
++ *[0-9a-f]*:	ec 15 80 00 	eorl r5,0x8000
++ *[0-9a-f]*:	ec 14 7f ff 	eorl r4,0x7fff
++ *[0-9a-f]*:	ec 1e 00 01 	eorl lr,0x1
++ *[0-9a-f]*:	ec 14 c7 b9 	eorl r4,0xc7b9
++ *[0-9a-f]*:	ec 16 fb dd 	eorl r6,0xfbdd
++ *[0-9a-f]*:	ec 11 51 b1 	eorl r1,0x51b1
++
++[0-9a-f]* <eorh>:
++ *[0-9a-f]*:	ee 1f 00 00 	eorh pc,0x0
++ *[0-9a-f]*:	ee 1c ff ff 	eorh r12,0xffff
++ *[0-9a-f]*:	ee 15 80 00 	eorh r5,0x8000
++ *[0-9a-f]*:	ee 14 7f ff 	eorh r4,0x7fff
++ *[0-9a-f]*:	ee 1e 00 01 	eorh lr,0x1
++ *[0-9a-f]*:	ee 10 2d d4 	eorh r0,0x2dd4
++ *[0-9a-f]*:	ee 1a 94 b5 	eorh r10,0x94b5
++ *[0-9a-f]*:	ee 19 df 2a 	eorh r9,0xdf2a
++
++[0-9a-f]* <mcall>:
++ *[0-9a-f]*:	f0 1f 00 00 	mcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	f0 1c ff ff 	mcall r12\[-4\]
++ *[0-9a-f]*:	f0 15 80 00 	mcall r5\[-131072\]
++ *[0-9a-f]*:	f0 14 7f ff 	mcall r4\[131068\]
++ *[0-9a-f]*:	f0 1e 00 01 	mcall lr\[4\]
++ *[0-9a-f]*:	f0 1d 3b bf 	mcall sp\[61180\]
++ *[0-9a-f]*:	f0 14 dd d2 	mcall r4\[-35000\]
++ *[0-9a-f]*:	f0 10 09 b1 	mcall r0\[9924\]
++
++[0-9a-f]* <pref>:
++ *[0-9a-f]*:	f2 1f 00 00 	pref pc\[0\]
++ *[0-9a-f]*:	f2 1c ff ff 	pref r12\[-1\]
++ *[0-9a-f]*:	f2 15 80 00 	pref r5\[-32768\]
++ *[0-9a-f]*:	f2 14 7f ff 	pref r4\[32767\]
++ *[0-9a-f]*:	f2 1e 00 01 	pref lr\[1\]
++ *[0-9a-f]*:	f2 17 1e 44 	pref r7\[7748\]
++ *[0-9a-f]*:	f2 17 e1 ed 	pref r7\[-7699\]
++ *[0-9a-f]*:	f2 12 9a dc 	pref r2\[-25892\]
++
++[0-9a-f]* <cache>:
++ *[0-9a-f]*:	f4 1f 00 00 	cache pc\[0\],0x0
++ *[0-9a-f]*:	f4 1c ff ff 	cache r12\[-1\],0x1f
++ *[0-9a-f]*:	f4 15 84 00 	cache r5\[-1024\],0x10
++ *[0-9a-f]*:	f4 14 7b ff 	cache r4\[1023\],0xf
++ *[0-9a-f]*:	f4 1e 08 01 	cache lr\[1\],0x1
++ *[0-9a-f]*:	f4 13 8c 3c 	cache r3\[-964\],0x11
++ *[0-9a-f]*:	f4 14 b6 89 	cache r4\[-375\],0x16
++ *[0-9a-f]*:	f4 13 8c 88 	cache r3\[-888\],0x11
++
++[0-9a-f]* <sub4>:
++ *[0-9a-f]*:	20 0f       	sub pc,0
++ *[0-9a-f]*:	2f fc       	sub r12,-1
++ *[0-9a-f]*:	f0 25 00 00 	sub r5,-1048576
++ *[0-9a-f]*:	ee 34 ff ff 	sub r4,1048575
++ *[0-9a-f]*:	20 1e       	sub lr,1
++ *[0-9a-f]*:	f6 22 8d 6c 	sub r2,-619156
++ *[0-9a-f]*:	e6 3e 0a cd 	sub lr,461517
++ *[0-9a-f]*:	fc 38 2d 25 	sub r8,-185051
++
++[0-9a-f]* <cp3>:
++ *[0-9a-f]*:	58 0f       	cp.w pc,0
++ *[0-9a-f]*:	5b fc       	cp.w r12,-1
++ *[0-9a-f]*:	f0 45 00 00 	cp.w r5,-1048576
++ *[0-9a-f]*:	ee 54 ff ff 	cp.w r4,1048575
++ *[0-9a-f]*:	58 1e       	cp.w lr,1
++ *[0-9a-f]*:	e0 51 e4 ae 	cp.w r1,124078
++ *[0-9a-f]*:	fa 40 37 e3 	cp.w r0,-378909
++ *[0-9a-f]*:	fc 44 4a 14 	cp.w r4,-243180
++
++[0-9a-f]* <mov2>:
++ *[0-9a-f]*:	30 0f       	mov pc,0
++ *[0-9a-f]*:	3f fc       	mov r12,-1
++ *[0-9a-f]*:	f0 65 00 00 	mov r5,-1048576
++ *[0-9a-f]*:	ee 74 ff ff 	mov r4,1048575
++ *[0-9a-f]*:	30 1e       	mov lr,1
++ *[0-9a-f]*:	fa 75 29 a3 	mov r5,-317021
++ *[0-9a-f]*:	f4 6d 91 94 	mov sp,-749164
++ *[0-9a-f]*:	ee 65 58 93 	mov r5,940179
++
++[0-9a-f]* <brc2>:
++ *[0-9a-f]*:	c0 00       	breq [0-9a-f]* <.*>
++ *[0-9a-f]*:	fe 9f ff ff 	bral [0-9a-f]* <.*>
++ *[0-9a-f]*:	f0 88 00 00 	brls [0-9a-f]* <.*>
++ *[0-9a-f]*:	ee 97 ff ff 	brpl [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 11       	brne [0-9a-f]* <.*>
++ *[0-9a-f]*:	f2 8b 4a 4d 	brhi [0-9a-f]* <.*>
++ *[0-9a-f]*:	ea 8e 14 cc 	brqs [0-9a-f]* <.*>
++ *[0-9a-f]*:	fa 98 98 33 	brls [0-9a-f]* <.*>
++
++[0-9a-f]* <rcall2>:
++ *[0-9a-f]*:	c0 0c       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	cf ff       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	f0 a0 00 00 	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	ee b0 ff ff 	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	c0 1c       	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	e2 b0 ca 5a 	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	e8 a0 47 52 	rcall [0-9a-f]* <.*>
++ *[0-9a-f]*:	fe b0 fd ef 	rcall [0-9a-f]* <.*>
++
++[0-9a-f]* <sub5>:
++ *[0-9a-f]*:	fe cf 00 00 	sub pc,pc,0
++ *[0-9a-f]*:	f8 cc ff ff 	sub r12,r12,-1
++ *[0-9a-f]*:	ea c5 80 00 	sub r5,r5,-32768
++ *[0-9a-f]*:	e8 c4 7f ff 	sub r4,r4,32767
++ *[0-9a-f]*:	fc ce 00 01 	sub lr,lr,1
++ *[0-9a-f]*:	fe cf ce 38 	sub pc,pc,-12744
++ *[0-9a-f]*:	ee c7 95 1b 	sub r7,r7,-27365
++ *[0-9a-f]*:	f2 c2 bc 32 	sub r2,r9,-17358
++
++[0-9a-f]* <satsub_w2>:
++ *[0-9a-f]*:	fe df 00 00 	satsub\.w pc,pc,0
++ *[0-9a-f]*:	f8 dc ff ff 	satsub\.w r12,r12,-1
++ *[0-9a-f]*:	ea d5 80 00 	satsub\.w r5,r5,-32768
++ *[0-9a-f]*:	e8 d4 7f ff 	satsub\.w r4,r4,32767
++ *[0-9a-f]*:	fc de 00 01 	satsub\.w lr,lr,1
++ *[0-9a-f]*:	fc d2 f8 29 	satsub\.w r2,lr,-2007
++ *[0-9a-f]*:	f8 d7 fc f0 	satsub\.w r7,r12,-784
++ *[0-9a-f]*:	ee d4 5a 8c 	satsub\.w r4,r7,23180
++
++[0-9a-f]* <ld_d4>:
++ *[0-9a-f]*:	fe e0 00 00 	ld\.d r0,pc\[0\]
++ *[0-9a-f]*:	f8 ee ff ff 	ld\.d lr,r12\[-1\]
++ *[0-9a-f]*:	ea e8 80 00 	ld\.d r8,r5\[-32768\]
++ *[0-9a-f]*:	e8 e6 7f ff 	ld\.d r6,r4\[32767\]
++ *[0-9a-f]*:	fc e2 00 01 	ld\.d r2,lr\[1\]
++ *[0-9a-f]*:	f6 ee 39 c0 	ld\.d lr,r11\[14784\]
++ *[0-9a-f]*:	f2 e6 b6 27 	ld\.d r6,r9\[-18905\]
++ *[0-9a-f]*:	e6 e2 e7 2d 	ld\.d r2,r3\[-6355\]
++
++[0-9a-f]* <ld_w4>:
++ *[0-9a-f]*:	7e 0f       	ld\.w pc,pc\[0x0\]
++ *[0-9a-f]*:	f8 fc ff ff 	ld\.w r12,r12\[-1\]
++ *[0-9a-f]*:	ea f5 80 00 	ld\.w r5,r5\[-32768\]
++ *[0-9a-f]*:	e8 f4 7f ff 	ld\.w r4,r4\[32767\]
++ *[0-9a-f]*:	fc fe 00 01 	ld\.w lr,lr\[1\]
++ *[0-9a-f]*:	f8 f0 a9 8b 	ld\.w r0,r12\[-22133\]
++ *[0-9a-f]*:	fe fd af d7 	ld\.w sp,pc\[-20521\]
++ *[0-9a-f]*:	d7 03       	nop
++
++[0-9a-f]* <ld_sh4>:
++ *[0-9a-f]*:	9e 0f       	ld\.sh pc,pc\[0x0\]
++ *[0-9a-f]*:	f9 0c ff ff 	ld\.sh r12,r12\[-1\]
++ *[0-9a-f]*:	eb 05 80 00 	ld\.sh r5,r5\[-32768\]
++ *[0-9a-f]*:	e9 04 7f ff 	ld\.sh r4,r4\[32767\]
++ *[0-9a-f]*:	fd 0e 00 01 	ld\.sh lr,lr\[1\]
++ *[0-9a-f]*:	f5 06 78 d2 	ld\.sh r6,r10\[30930\]
++ *[0-9a-f]*:	f5 06 55 d5 	ld\.sh r6,r10\[21973\]
++ *[0-9a-f]*:	d7 03       	nop
++
++[0-9a-f]* <ld_uh4>:
++ *[0-9a-f]*:	9e 8f       	ld\.uh pc,pc\[0x0\]
++ *[0-9a-f]*:	f9 1c ff ff 	ld\.uh r12,r12\[-1\]
++ *[0-9a-f]*:	eb 15 80 00 	ld\.uh r5,r5\[-32768\]
++ *[0-9a-f]*:	e9 14 7f ff 	ld\.uh r4,r4\[32767\]
++ *[0-9a-f]*:	fd 1e 00 01 	ld\.uh lr,lr\[1\]
++ *[0-9a-f]*:	f3 11 cb d6 	ld\.uh r1,r9\[-13354\]
++ *[0-9a-f]*:	f7 1e 53 59 	ld\.uh lr,r11\[21337\]
++ *[0-9a-f]*:	d7 03       	nop
++
++[0-9a-f]* <ld_sb1>:
++ *[0-9a-f]*:	ff 2f 00 00 	ld\.sb pc,pc\[0\]
++ *[0-9a-f]*:	f9 2c ff ff 	ld\.sb r12,r12\[-1\]
++ *[0-9a-f]*:	eb 25 80 00 	ld\.sb r5,r5\[-32768\]
++ *[0-9a-f]*:	e9 24 7f ff 	ld\.sb r4,r4\[32767\]
++ *[0-9a-f]*:	fd 2e 00 01 	ld\.sb lr,lr\[1\]
++ *[0-9a-f]*:	fb 27 90 09 	ld\.sb r7,sp\[-28663\]
++ *[0-9a-f]*:	e3 22 e9 09 	ld\.sb r2,r1\[-5879\]
++ *[0-9a-f]*:	e7 2c 49 2e 	ld\.sb r12,r3\[18734\]
++
++[0-9a-f]* <ld_ub4>:
++ *[0-9a-f]*:	1f 8f       	ld\.ub pc,pc\[0x0\]
++ *[0-9a-f]*:	f9 3c ff ff 	ld\.ub r12,r12\[-1\]
++ *[0-9a-f]*:	eb 35 80 00 	ld\.ub r5,r5\[-32768\]
++ *[0-9a-f]*:	e9 34 7f ff 	ld\.ub r4,r4\[32767\]
++ *[0-9a-f]*:	1d 9e       	ld\.ub lr,lr\[0x1\]
++ *[0-9a-f]*:	e9 3f 20 55 	ld\.ub pc,r4\[8277\]
++ *[0-9a-f]*:	f9 35 4a e4 	ld\.ub r5,r12\[19172\]
++ *[0-9a-f]*:	fd 3a 66 eb 	ld\.ub r10,lr\[26347\]
++
++[0-9a-f]* <st_d4>:
++ *[0-9a-f]*:	fe e1 00 00 	st\.d pc\[0\],r0
++ *[0-9a-f]*:	f8 ef ff ff 	st\.d r12\[-1\],lr
++ *[0-9a-f]*:	ea e9 80 00 	st\.d r5\[-32768\],r8
++ *[0-9a-f]*:	e8 e7 7f ff 	st\.d r4\[32767\],r6
++ *[0-9a-f]*:	fc e3 00 01 	st\.d lr\[1\],r2
++ *[0-9a-f]*:	ea eb 33 90 	st\.d r5\[13200\],r10
++ *[0-9a-f]*:	ea eb 24 88 	st\.d r5\[9352\],r10
++ *[0-9a-f]*:	ea e5 7e 75 	st\.d r5\[32373\],r4
++
++[0-9a-f]* <st_w4>:
++ *[0-9a-f]*:	9f 0f       	st\.w pc\[0x0\],pc
++ *[0-9a-f]*:	f9 4c ff ff 	st\.w r12\[-1\],r12
++ *[0-9a-f]*:	eb 45 80 00 	st\.w r5\[-32768\],r5
++ *[0-9a-f]*:	e9 44 7f ff 	st\.w r4\[32767\],r4
++ *[0-9a-f]*:	fd 4e 00 01 	st\.w lr\[1\],lr
++ *[0-9a-f]*:	fb 47 17 f8 	st\.w sp\[6136\],r7
++ *[0-9a-f]*:	ed 4c 69 cf 	st\.w r6\[27087\],r12
++ *[0-9a-f]*:	d7 03       	nop
++
++[0-9a-f]* <st_h4>:
++ *[0-9a-f]*:	be 0f       	st\.h pc\[0x0\],pc
++ *[0-9a-f]*:	f9 5c ff ff 	st\.h r12\[-1\],r12
++ *[0-9a-f]*:	eb 55 80 00 	st\.h r5\[-32768\],r5
++ *[0-9a-f]*:	e9 54 7f ff 	st\.h r4\[32767\],r4
++ *[0-9a-f]*:	fd 5e 00 01 	st\.h lr\[1\],lr
++ *[0-9a-f]*:	e9 57 d9 16 	st\.h r4\[-9962\],r7
++ *[0-9a-f]*:	f3 53 c0 86 	st\.h r9\[-16250\],r3
++ *[0-9a-f]*:	d7 03       	nop
++
++[0-9a-f]* <st_b4>:
++ *[0-9a-f]*:	be 8f       	st\.b pc\[0x0\],pc
++ *[0-9a-f]*:	f9 6c ff ff 	st\.b r12\[-1\],r12
++ *[0-9a-f]*:	eb 65 80 00 	st\.b r5\[-32768\],r5
++ *[0-9a-f]*:	e9 64 7f ff 	st\.b r4\[32767\],r4
++ *[0-9a-f]*:	bc 9e       	st\.b lr\[0x1\],lr
++ *[0-9a-f]*:	f9 66 75 96 	st\.b r12\[30102\],r6
++ *[0-9a-f]*:	eb 61 71 31 	st\.b r5\[28977\],r1
++ *[0-9a-f]*:	e1 61 15 5e 	st\.b r0\[5470\],r1
++
++[0-9a-f]* <mfsr>:
++ *[0-9a-f]*:	e1 bf 00 00 	mfsr pc,0x0
++ *[0-9a-f]*:	e1 bc 00 ff 	mfsr r12,0x3fc
++ *[0-9a-f]*:	e1 b5 00 80 	mfsr r5,0x200
++ *[0-9a-f]*:	e1 b4 00 7f 	mfsr r4,0x1fc
++ *[0-9a-f]*:	e1 be 00 01 	mfsr lr,0x4
++ *[0-9a-f]*:	e1 b2 00 ae 	mfsr r2,0x2b8
++ *[0-9a-f]*:	e1 b4 00 41 	mfsr r4,0x104
++ *[0-9a-f]*:	e1 ba 00 fe 	mfsr r10,0x3f8
++
++[0-9a-f]* <mtsr>:
++ *[0-9a-f]*:	e3 bf 00 00 	mtsr 0x0,pc
++ *[0-9a-f]*:	e3 bc 00 ff 	mtsr 0x3fc,r12
++ *[0-9a-f]*:	e3 b5 00 80 	mtsr 0x200,r5
++ *[0-9a-f]*:	e3 b4 00 7f 	mtsr 0x1fc,r4
++ *[0-9a-f]*:	e3 be 00 01 	mtsr 0x4,lr
++ *[0-9a-f]*:	e3 ba 00 38 	mtsr 0xe0,r10
++ *[0-9a-f]*:	e3 bc 00 d1 	mtsr 0x344,r12
++ *[0-9a-f]*:	e3 b9 00 4c 	mtsr 0x130,r9
++
++[0-9a-f]* <mfdr>:
++ *[0-9a-f]*:	e5 bf 00 00 	mfdr pc,0x0
++ *[0-9a-f]*:	e5 bc 00 ff 	mfdr r12,0x3fc
++ *[0-9a-f]*:	e5 b5 00 80 	mfdr r5,0x200
++ *[0-9a-f]*:	e5 b4 00 7f 	mfdr r4,0x1fc
++ *[0-9a-f]*:	e5 be 00 01 	mfdr lr,0x4
++ *[0-9a-f]*:	e5 b6 00 e9 	mfdr r6,0x3a4
++ *[0-9a-f]*:	e5 b5 00 09 	mfdr r5,0x24
++ *[0-9a-f]*:	e5 b9 00 4b 	mfdr r9,0x12c
++
++[0-9a-f]* <mtdr>:
++ *[0-9a-f]*:	e7 bf 00 00 	mtdr 0x0,pc
++ *[0-9a-f]*:	e7 bc 00 ff 	mtdr 0x3fc,r12
++ *[0-9a-f]*:	e7 b5 00 80 	mtdr 0x200,r5
++ *[0-9a-f]*:	e7 b4 00 7f 	mtdr 0x1fc,r4
++ *[0-9a-f]*:	e7 be 00 01 	mtdr 0x4,lr
++ *[0-9a-f]*:	e7 b8 00 2d 	mtdr 0xb4,r8
++ *[0-9a-f]*:	e7 ba 00 b4 	mtdr 0x2d0,r10
++ *[0-9a-f]*:	e7 be 00 66 	mtdr 0x198,lr
++
++[0-9a-f]* <sleep>:
++ *[0-9a-f]*:	e9 b0 00 00 	sleep 0x0
++ *[0-9a-f]*:	e9 b0 00 ff 	sleep 0xff
++ *[0-9a-f]*:	e9 b0 00 80 	sleep 0x80
++ *[0-9a-f]*:	e9 b0 00 7f 	sleep 0x7f
++ *[0-9a-f]*:	e9 b0 00 01 	sleep 0x1
++ *[0-9a-f]*:	e9 b0 00 fe 	sleep 0xfe
++ *[0-9a-f]*:	e9 b0 00 0f 	sleep 0xf
++ *[0-9a-f]*:	e9 b0 00 2b 	sleep 0x2b
++
++[0-9a-f]* <sync>:
++ *[0-9a-f]*:	eb b0 00 00 	sync 0x0
++ *[0-9a-f]*:	eb b0 00 ff 	sync 0xff
++ *[0-9a-f]*:	eb b0 00 80 	sync 0x80
++ *[0-9a-f]*:	eb b0 00 7f 	sync 0x7f
++ *[0-9a-f]*:	eb b0 00 01 	sync 0x1
++ *[0-9a-f]*:	eb b0 00 a6 	sync 0xa6
++ *[0-9a-f]*:	eb b0 00 e6 	sync 0xe6
++ *[0-9a-f]*:	eb b0 00 b4 	sync 0xb4
++
++[0-9a-f]* <bld>:
++ *[0-9a-f]*:	ed bf 00 00 	bld pc,0x0
++ *[0-9a-f]*:	ed bc 00 1f 	bld r12,0x1f
++ *[0-9a-f]*:	ed b5 00 10 	bld r5,0x10
++ *[0-9a-f]*:	ed b4 00 0f 	bld r4,0xf
++ *[0-9a-f]*:	ed be 00 01 	bld lr,0x1
++ *[0-9a-f]*:	ed b9 00 0f 	bld r9,0xf
++ *[0-9a-f]*:	ed b0 00 04 	bld r0,0x4
++ *[0-9a-f]*:	ed be 00 1a 	bld lr,0x1a
++
++[0-9a-f]* <bst>:
++ *[0-9a-f]*:	ef bf 00 00 	bst pc,0x0
++ *[0-9a-f]*:	ef bc 00 1f 	bst r12,0x1f
++ *[0-9a-f]*:	ef b5 00 10 	bst r5,0x10
++ *[0-9a-f]*:	ef b4 00 0f 	bst r4,0xf
++ *[0-9a-f]*:	ef be 00 01 	bst lr,0x1
++ *[0-9a-f]*:	ef ba 00 1c 	bst r10,0x1c
++ *[0-9a-f]*:	ef b0 00 03 	bst r0,0x3
++ *[0-9a-f]*:	ef bd 00 02 	bst sp,0x2
++
++[0-9a-f]* <sats>:
++ *[0-9a-f]*:	f1 bf 00 00 	sats pc,0x0
++ *[0-9a-f]*:	f1 bc 03 ff 	sats r12>>0x1f,0x1f
++ *[0-9a-f]*:	f1 b5 02 10 	sats r5>>0x10,0x10
++ *[0-9a-f]*:	f1 b4 01 ef 	sats r4>>0xf,0xf
++ *[0-9a-f]*:	f1 be 00 21 	sats lr>>0x1,0x1
++ *[0-9a-f]*:	f1 ba 02 63 	sats r10>>0x3,0x13
++ *[0-9a-f]*:	f1 ba 03 42 	sats r10>>0x2,0x1a
++ *[0-9a-f]*:	f1 b1 00 34 	sats r1>>0x14,0x1
++
++[0-9a-f]* <satu>:
++ *[0-9a-f]*:	f1 bf 04 00 	satu pc,0x0
++ *[0-9a-f]*:	f1 bc 07 ff 	satu r12>>0x1f,0x1f
++ *[0-9a-f]*:	f1 b5 06 10 	satu r5>>0x10,0x10
++ *[0-9a-f]*:	f1 b4 05 ef 	satu r4>>0xf,0xf
++ *[0-9a-f]*:	f1 be 04 21 	satu lr>>0x1,0x1
++ *[0-9a-f]*:	f1 bf 04 e5 	satu pc>>0x5,0x7
++ *[0-9a-f]*:	f1 b7 04 a5 	satu r7>>0x5,0x5
++ *[0-9a-f]*:	f1 b2 06 7a 	satu r2>>0x1a,0x13
++
++[0-9a-f]* <satrnds>:
++ *[0-9a-f]*:	f3 bf 00 00 	satrnds pc,0x0
++ *[0-9a-f]*:	f3 bc 03 ff 	satrnds r12>>0x1f,0x1f
++ *[0-9a-f]*:	f3 b5 02 10 	satrnds r5>>0x10,0x10
++ *[0-9a-f]*:	f3 b4 01 ef 	satrnds r4>>0xf,0xf
++ *[0-9a-f]*:	f3 be 00 21 	satrnds lr>>0x1,0x1
++ *[0-9a-f]*:	f3 b0 02 75 	satrnds r0>>0x15,0x13
++ *[0-9a-f]*:	f3 bd 00 40 	satrnds sp,0x2
++ *[0-9a-f]*:	f3 b7 03 a6 	satrnds r7>>0x6,0x1d
++
++[0-9a-f]* <satrndu>:
++ *[0-9a-f]*:	f3 bf 04 00 	satrndu pc,0x0
++ *[0-9a-f]*:	f3 bc 07 ff 	satrndu r12>>0x1f,0x1f
++ *[0-9a-f]*:	f3 b5 06 10 	satrndu r5>>0x10,0x10
++ *[0-9a-f]*:	f3 b4 05 ef 	satrndu r4>>0xf,0xf
++ *[0-9a-f]*:	f3 be 04 21 	satrndu lr>>0x1,0x1
++ *[0-9a-f]*:	f3 bc 07 40 	satrndu r12,0x1a
++ *[0-9a-f]*:	f3 b4 04 75 	satrndu r4>>0x15,0x3
++ *[0-9a-f]*:	f3 ba 06 03 	satrndu r10>>0x3,0x10
++
++[0-9a-f]* <subfc>:
++ *[0-9a-f]*:	f5 bf 00 00 	subfeq pc,0
++ *[0-9a-f]*:	f5 bc 0f ff 	subfal r12,-1
++ *[0-9a-f]*:	f5 b5 08 80 	subfls r5,-128
++ *[0-9a-f]*:	f5 b4 07 7f 	subfpl r4,127
++ *[0-9a-f]*:	f5 be 01 01 	subfne lr,1
++ *[0-9a-f]*:	f5 ba 08 08 	subfls r10,8
++ *[0-9a-f]*:	f5 bb 0d 63 	subfvc r11,99
++ *[0-9a-f]*:	f5 b2 0c 49 	subfvs r2,73
++
++[0-9a-f]* <subc>:
++ *[0-9a-f]*:	f7 bf 00 00 	subeq pc,0
++ *[0-9a-f]*:	f7 bc 0f ff 	subal r12,-1
++ *[0-9a-f]*:	f7 b5 08 80 	subls r5,-128
++ *[0-9a-f]*:	f7 b4 07 7f 	subpl r4,127
++ *[0-9a-f]*:	f7 be 01 01 	subne lr,1
++ *[0-9a-f]*:	f7 bc 08 76 	subls r12,118
++ *[0-9a-f]*:	f7 be 0d f4 	subvc lr,-12
++ *[0-9a-f]*:	f7 b4 06 f3 	submi r4,-13
++
++[0-9a-f]* <movc2>:
++ *[0-9a-f]*:	f9 bf 00 00 	moveq pc,0
++ *[0-9a-f]*:	f9 bc 0f ff 	moval r12,-1
++ *[0-9a-f]*:	f9 b5 08 80 	movls r5,-128
++ *[0-9a-f]*:	f9 b4 07 7f 	movpl r4,127
++ *[0-9a-f]*:	f9 be 01 01 	movne lr,1
++ *[0-9a-f]*:	f9 b3 05 86 	movlt r3,-122
++ *[0-9a-f]*:	f9 b8 0d 02 	movvc r8,2
++ *[0-9a-f]*:	f9 b7 01 91 	movne r7,-111
++
++[0-9a-f]* <cp_b>:
++ *[0-9a-f]*:	e0 0f 18 00 	cp\.b pc,r0
++ *[0-9a-f]*:	fe 00 18 00 	cp\.b r0,pc
++ *[0-9a-f]*:	f0 07 18 00 	cp\.b r7,r8
++ *[0-9a-f]*:	ee 08 18 00 	cp\.b r8,r7
++
++[0-9a-f]* <cp_h>:
++ *[0-9a-f]*:	e0 0f 19 00 	cp\.h pc,r0
++ *[0-9a-f]*:	fe 00 19 00 	cp\.h r0,pc
++ *[0-9a-f]*:	f0 07 19 00 	cp\.h r7,r8
++ *[0-9a-f]*:	ee 08 19 00 	cp\.h r8,r7
++
++[0-9a-f]* <ldm>:
++ *[0-9a-f]*:	e1 cf 00 7e 	ldm pc,r1-r6
++ *[0-9a-f]*:	e1 cc ff ff 	ldm r12,r0-pc
++ *[0-9a-f]*:	e1 c5 80 00 	ldm r5,pc
++ *[0-9a-f]*:	e1 c4 7f ff 	ldm r4,r0-lr
++ *[0-9a-f]*:	e1 ce 00 01 	ldm lr,r0
++ *[0-9a-f]*:	e1 c9 40 22 	ldm r9,r1,r5,lr
++ *[0-9a-f]*:	e1 cb 81 ec 	ldm r11,r2-r3,r5-r8,pc
++ *[0-9a-f]*:	e1 c6 a2 09 	ldm r6,r0,r3,r9,sp,pc
++
++[0-9a-f]* <ldm_pu>:
++ *[0-9a-f]*:	e3 cf 03 c0 	ldm pc\+\+,r6-r9
++ *[0-9a-f]*:	e3 cc ff ff 	ldm r12\+\+,r0-pc
++ *[0-9a-f]*:	e3 c5 80 00 	ldm r5\+\+,pc
++ *[0-9a-f]*:	e3 c4 7f ff 	ldm r4\+\+,r0-lr
++ *[0-9a-f]*:	e3 ce 00 01 	ldm lr\+\+,r0
++ *[0-9a-f]*:	e3 cc d5 38 	ldm r12\+\+,r3-r5,r8,r10,r12,lr-pc
++ *[0-9a-f]*:	e3 ca c0 74 	ldm r10\+\+,r2,r4-r6,lr-pc
++ *[0-9a-f]*:	e3 c6 7e 1a 	ldm r6\+\+,r1,r3-r4,r9-lr
++
++[0-9a-f]* <ldmts>:
++ *[0-9a-f]*:	e5 cf 01 80 	ldmts pc,r7-r8
++ *[0-9a-f]*:	e5 cc ff ff 	ldmts r12,r0-pc
++ *[0-9a-f]*:	e5 c5 80 00 	ldmts r5,pc
++ *[0-9a-f]*:	e5 c4 7f ff 	ldmts r4,r0-lr
++ *[0-9a-f]*:	e5 ce 00 01 	ldmts lr,r0
++ *[0-9a-f]*:	e5 c0 18 06 	ldmts r0,r1-r2,r11-r12
++ *[0-9a-f]*:	e5 ce 61 97 	ldmts lr,r0-r2,r4,r7-r8,sp-lr
++ *[0-9a-f]*:	e5 cc c2 3b 	ldmts r12,r0-r1,r3-r5,r9,lr-pc
++
++[0-9a-f]* <ldmts_pu>:
++ *[0-9a-f]*:	e7 cf 02 00 	ldmts pc\+\+,r9
++ *[0-9a-f]*:	e7 cc ff ff 	ldmts r12\+\+,r0-pc
++ *[0-9a-f]*:	e7 c5 80 00 	ldmts r5\+\+,pc
++ *[0-9a-f]*:	e7 c4 7f ff 	ldmts r4\+\+,r0-lr
++ *[0-9a-f]*:	e7 ce 00 01 	ldmts lr\+\+,r0
++ *[0-9a-f]*:	e7 cd 0a bd 	ldmts sp\+\+,r0,r2-r5,r7,r9,r11
++ *[0-9a-f]*:	e7 c5 0c 8e 	ldmts r5\+\+,r1-r3,r7,r10-r11
++ *[0-9a-f]*:	e7 c8 a1 9c 	ldmts r8\+\+,r2-r4,r7-r8,sp,pc
++
++[0-9a-f]* <stm>:
++ *[0-9a-f]*:	e9 cf 00 80 	stm pc,r7
++ *[0-9a-f]*:	e9 cc ff ff 	stm r12,r0-pc
++ *[0-9a-f]*:	e9 c5 80 00 	stm r5,pc
++ *[0-9a-f]*:	e9 c4 7f ff 	stm r4,r0-lr
++ *[0-9a-f]*:	e9 ce 00 01 	stm lr,r0
++ *[0-9a-f]*:	e9 cd 49 2c 	stm sp,r2-r3,r5,r8,r11,lr
++ *[0-9a-f]*:	e9 c4 4c 5f 	stm r4,r0-r4,r6,r10-r11,lr
++ *[0-9a-f]*:	e9 c9 f2 22 	stm r9,r1,r5,r9,r12-pc
++
++[0-9a-f]* <stm_pu>:
++ *[0-9a-f]*:	eb cf 00 70 	stm --pc,r4-r6
++ *[0-9a-f]*:	eb cc ff ff 	stm --r12,r0-pc
++ *[0-9a-f]*:	eb c5 80 00 	stm --r5,pc
++ *[0-9a-f]*:	eb c4 7f ff 	stm --r4,r0-lr
++ *[0-9a-f]*:	eb ce 00 01 	stm --lr,r0
++ *[0-9a-f]*:	eb cb fb f1 	stm --r11,r0,r4-r9,r11-pc
++ *[0-9a-f]*:	eb cb 56 09 	stm --r11,r0,r3,r9-r10,r12,lr
++ *[0-9a-f]*:	eb c6 63 04 	stm --r6,r2,r8-r9,sp-lr
++
++[0-9a-f]* <stmts>:
++ *[0-9a-f]*:	ed cf 01 00 	stmts pc,r8
++ *[0-9a-f]*:	ed cc ff ff 	stmts r12,r0-pc
++ *[0-9a-f]*:	ed c5 80 00 	stmts r5,pc
++ *[0-9a-f]*:	ed c4 7f ff 	stmts r4,r0-lr
++ *[0-9a-f]*:	ed ce 00 01 	stmts lr,r0
++ *[0-9a-f]*:	ed c1 c6 5b 	stmts r1,r0-r1,r3-r4,r6,r9-r10,lr-pc
++ *[0-9a-f]*:	ed c3 1d c1 	stmts r3,r0,r6-r8,r10-r12
++ *[0-9a-f]*:	ed cb d6 d1 	stmts r11,r0,r4,r6-r7,r9-r10,r12,lr-pc
++
++[0-9a-f]* <stmts_pu>:
++ *[0-9a-f]*:	ef cf 01 c0 	stmts --pc,r6-r8
++ *[0-9a-f]*:	ef cc ff ff 	stmts --r12,r0-pc
++ *[0-9a-f]*:	ef c5 80 00 	stmts --r5,pc
++ *[0-9a-f]*:	ef c4 7f ff 	stmts --r4,r0-lr
++ *[0-9a-f]*:	ef ce 00 01 	stmts --lr,r0
++ *[0-9a-f]*:	ef c2 36 19 	stmts --r2,r0,r3-r4,r9-r10,r12-sp
++ *[0-9a-f]*:	ef c3 c0 03 	stmts --r3,r0-r1,lr-pc
++ *[0-9a-f]*:	ef c0 44 7d 	stmts --r0,r0,r2-r6,r10,lr
++
++[0-9a-f]* <ldins_h>:
++ *[0-9a-f]*:	ff df 00 00 	ldins\.h pc:b,pc\[0\]
++ *[0-9a-f]*:	f9 dc 1f ff 	ldins\.h r12:t,r12\[-2\]
++ *[0-9a-f]*:	eb d5 18 00 	ldins\.h r5:t,r5\[-4096\]
++ *[0-9a-f]*:	e9 d4 07 ff 	ldins\.h r4:b,r4\[4094\]
++ *[0-9a-f]*:	fd de 10 01 	ldins\.h lr:t,lr\[2\]
++ *[0-9a-f]*:	fd d0 13 c5 	ldins\.h r0:t,lr\[1930\]
++ *[0-9a-f]*:	ef d3 0e f5 	ldins\.h r3:b,r7\[-534\]
++ *[0-9a-f]*:	f9 d2 0b 9a 	ldins\.h r2:b,r12\[-2252\]
++
++[0-9a-f]* <ldins_b>:
++ *[0-9a-f]*:	ff df 40 00 	ldins\.b pc:b,pc\[0\]
++ *[0-9a-f]*:	f9 dc 7f ff 	ldins\.b r12:t,r12\[-1\]
++ *[0-9a-f]*:	eb d5 68 00 	ldins\.b r5:u,r5\[-2048\]
++ *[0-9a-f]*:	e9 d4 57 ff 	ldins\.b r4:l,r4\[2047\]
++ *[0-9a-f]*:	fd de 50 01 	ldins\.b lr:l,lr\[1\]
++ *[0-9a-f]*:	e9 d6 7d 6a 	ldins\.b r6:t,r4\[-662\]
++ *[0-9a-f]*:	e3 d5 4f 69 	ldins\.b r5:b,r1\[-151\]
++ *[0-9a-f]*:	f7 da 78 7d 	ldins\.b r10:t,r11\[-1923\]
++
++[0-9a-f]* <ldswp_sh>:
++ *[0-9a-f]*:	ff df 20 00 	ldswp\.sh pc,pc\[0\]
++ *[0-9a-f]*:	f9 dc 2f ff 	ldswp\.sh r12,r12\[-2\]
++ *[0-9a-f]*:	eb d5 28 00 	ldswp\.sh r5,r5\[-4096\]
++ *[0-9a-f]*:	e9 d4 27 ff 	ldswp\.sh r4,r4\[4094\]
++ *[0-9a-f]*:	fd de 20 01 	ldswp\.sh lr,lr\[2\]
++ *[0-9a-f]*:	f5 d9 27 84 	ldswp\.sh r9,r10\[3848\]
++ *[0-9a-f]*:	f9 d4 2c 04 	ldswp\.sh r4,r12\[-2040\]
++ *[0-9a-f]*:	e5 da 26 08 	ldswp\.sh r10,r2\[3088\]
++
++[0-9a-f]* <ldswp_uh>:
++ *[0-9a-f]*:	ff df 30 00 	ldswp\.uh pc,pc\[0\]
++ *[0-9a-f]*:	f9 dc 3f ff 	ldswp\.uh r12,r12\[-2\]
++ *[0-9a-f]*:	eb d5 38 00 	ldswp\.uh r5,r5\[-4096\]
++ *[0-9a-f]*:	e9 d4 37 ff 	ldswp\.uh r4,r4\[4094\]
++ *[0-9a-f]*:	fd de 30 01 	ldswp\.uh lr,lr\[2\]
++ *[0-9a-f]*:	f3 d4 37 46 	ldswp\.uh r4,r9\[3724\]
++ *[0-9a-f]*:	fb de 3c bc 	ldswp\.uh lr,sp\[-1672\]
++ *[0-9a-f]*:	f9 d8 38 7d 	ldswp\.uh r8,r12\[-3846\]
++
++[0-9a-f]* <ldswp_w>:
++ *[0-9a-f]*:	ff df 80 00 	ldswp\.w pc,pc\[0\]
++ *[0-9a-f]*:	f9 dc 8f ff 	ldswp\.w r12,r12\[-4\]
++ *[0-9a-f]*:	eb d5 88 00 	ldswp\.w r5,r5\[-8192\]
++ *[0-9a-f]*:	e9 d4 87 ff 	ldswp\.w r4,r4\[8188\]
++ *[0-9a-f]*:	fd de 80 01 	ldswp\.w lr,lr\[4\]
++ *[0-9a-f]*:	ef dd 81 d1 	ldswp\.w sp,r7\[1860\]
++ *[0-9a-f]*:	eb df 8c c1 	ldswp\.w pc,r5\[-3324\]
++ *[0-9a-f]*:	f5 dc 8c c8 	ldswp\.w r12,r10\[-3296\]
++
++[0-9a-f]* <stswp_h>:
++ *[0-9a-f]*:	ff df 90 00 	stswp\.h pc\[0\],pc
++ *[0-9a-f]*:	f9 dc 9f ff 	stswp\.h r12\[-2\],r12
++ *[0-9a-f]*:	eb d5 98 00 	stswp\.h r5\[-4096\],r5
++ *[0-9a-f]*:	e9 d4 97 ff 	stswp\.h r4\[4094\],r4
++ *[0-9a-f]*:	fd de 90 01 	stswp\.h lr\[2\],lr
++ *[0-9a-f]*:	ef da 90 20 	stswp\.h r7\[64\],r10
++ *[0-9a-f]*:	f5 d2 95 e8 	stswp\.h r10\[3024\],r2
++ *[0-9a-f]*:	e1 da 9b 74 	stswp\.h r0\[-2328\],r10
++
++[0-9a-f]* <stswp_w>:
++ *[0-9a-f]*:	ff df a0 00 	stswp\.w pc\[0\],pc
++ *[0-9a-f]*:	f9 dc af ff 	stswp\.w r12\[-4\],r12
++ *[0-9a-f]*:	eb d5 a8 00 	stswp\.w r5\[-8192\],r5
++ *[0-9a-f]*:	e9 d4 a7 ff 	stswp\.w r4\[8188\],r4
++ *[0-9a-f]*:	fd de a0 01 	stswp\.w lr\[4\],lr
++ *[0-9a-f]*:	ff d8 a1 21 	stswp\.w pc\[1156\],r8
++ *[0-9a-f]*:	fb da a7 ce 	stswp\.w sp\[7992\],r10
++ *[0-9a-f]*:	f1 d5 ae db 	stswp\.w r8\[-1172\],r5
++
++[0-9a-f]* <and2>:
++ *[0-9a-f]*:	ff ef 00 0f 	and pc,pc,pc
++ *[0-9a-f]*:	f9 ec 01 fc 	and r12,r12,r12<<0x1f
++ *[0-9a-f]*:	eb e5 01 05 	and r5,r5,r5<<0x10
++ *[0-9a-f]*:	e9 e4 00 f4 	and r4,r4,r4<<0xf
++ *[0-9a-f]*:	fd ee 00 1e 	and lr,lr,lr<<0x1
++ *[0-9a-f]*:	e5 e1 00 1a 	and r10,r2,r1<<0x1
++ *[0-9a-f]*:	f1 eb 01 bc 	and r12,r8,r11<<0x1b
++ *[0-9a-f]*:	ef e0 00 3a 	and r10,r7,r0<<0x3
++
++[0-9a-f]* <and3>:
++ *[0-9a-f]*:	ff ef 02 0f 	and pc,pc,pc
++ *[0-9a-f]*:	f9 ec 03 fc 	and r12,r12,r12>>0x1f
++ *[0-9a-f]*:	eb e5 03 05 	and r5,r5,r5>>0x10
++ *[0-9a-f]*:	e9 e4 02 f4 	and r4,r4,r4>>0xf
++ *[0-9a-f]*:	fd ee 02 1e 	and lr,lr,lr>>0x1
++ *[0-9a-f]*:	f1 e7 03 1c 	and r12,r8,r7>>0x11
++ *[0-9a-f]*:	e9 e9 03 4f 	and pc,r4,r9>>0x14
++ *[0-9a-f]*:	f3 ea 02 ca 	and r10,r9,r10>>0xc
++
++[0-9a-f]* <or2>:
++ *[0-9a-f]*:	ff ef 10 0f 	or pc,pc,pc
++ *[0-9a-f]*:	f9 ec 11 fc 	or r12,r12,r12<<0x1f
++ *[0-9a-f]*:	eb e5 11 05 	or r5,r5,r5<<0x10
++ *[0-9a-f]*:	e9 e4 10 f4 	or r4,r4,r4<<0xf
++ *[0-9a-f]*:	fd ee 10 1e 	or lr,lr,lr<<0x1
++ *[0-9a-f]*:	fb eb 11 d8 	or r8,sp,r11<<0x1d
++ *[0-9a-f]*:	f3 e2 11 cf 	or pc,r9,r2<<0x1c
++ *[0-9a-f]*:	e3 e2 10 35 	or r5,r1,r2<<0x3
++
++[0-9a-f]* <or3>:
++ *[0-9a-f]*:	ff ef 12 0f 	or pc,pc,pc
++ *[0-9a-f]*:	f9 ec 13 fc 	or r12,r12,r12>>0x1f
++ *[0-9a-f]*:	eb e5 13 05 	or r5,r5,r5>>0x10
++ *[0-9a-f]*:	e9 e4 12 f4 	or r4,r4,r4>>0xf
++ *[0-9a-f]*:	fd ee 12 1e 	or lr,lr,lr>>0x1
++ *[0-9a-f]*:	fb ed 12 21 	or r1,sp,sp>>0x2
++ *[0-9a-f]*:	e3 e1 13 d0 	or r0,r1,r1>>0x1d
++ *[0-9a-f]*:	f9 e8 12 84 	or r4,r12,r8>>0x8
++
++[0-9a-f]* <eor2>:
++ *[0-9a-f]*:	ff ef 20 0f 	eor pc,pc,pc
++ *[0-9a-f]*:	f9 ec 21 fc 	eor r12,r12,r12<<0x1f
++ *[0-9a-f]*:	eb e5 21 05 	eor r5,r5,r5<<0x10
++ *[0-9a-f]*:	e9 e4 20 f4 	eor r4,r4,r4<<0xf
++ *[0-9a-f]*:	fd ee 20 1e 	eor lr,lr,lr<<0x1
++ *[0-9a-f]*:	f3 e4 20 ba 	eor r10,r9,r4<<0xb
++ *[0-9a-f]*:	e1 e1 21 f4 	eor r4,r0,r1<<0x1f
++ *[0-9a-f]*:	e5 ec 20 d6 	eor r6,r2,r12<<0xd
++
++[0-9a-f]* <eor3>:
++ *[0-9a-f]*:	ff ef 22 0f 	eor pc,pc,pc
++ *[0-9a-f]*:	f9 ec 23 fc 	eor r12,r12,r12>>0x1f
++ *[0-9a-f]*:	eb e5 23 05 	eor r5,r5,r5>>0x10
++ *[0-9a-f]*:	e9 e4 22 f4 	eor r4,r4,r4>>0xf
++ *[0-9a-f]*:	fd ee 22 1e 	eor lr,lr,lr>>0x1
++ *[0-9a-f]*:	eb e5 23 65 	eor r5,r5,r5>>0x16
++ *[0-9a-f]*:	e3 ee 22 3a 	eor r10,r1,lr>>0x3
++ *[0-9a-f]*:	fd ed 23 a7 	eor r7,lr,sp>>0x1a
++
++[0-9a-f]* <sthh_w2>:
++ *[0-9a-f]*:	ff ef 8f 0f 	sthh\.w pc\[pc\],pc:b,pc:b
++ *[0-9a-f]*:	f9 ec bc 3c 	sthh\.w r12\[r12<<0x3\],r12:t,r12:t
++ *[0-9a-f]*:	eb e5 b5 25 	sthh\.w r5\[r5<<0x2\],r5:t,r5:t
++ *[0-9a-f]*:	e9 e4 84 14 	sthh\.w r4\[r4<<0x1\],r4:b,r4:b
++ *[0-9a-f]*:	fd ee be 1e 	sthh\.w lr\[lr<<0x1\],lr:t,lr:t
++ *[0-9a-f]*:	e3 ec b6 3d 	sthh\.w sp\[r6<<0x3\],r1:t,r12:t
++ *[0-9a-f]*:	f3 e9 b6 06 	sthh\.w r6\[r6\],r9:t,r9:t
++ *[0-9a-f]*:	e1 eb 93 0a 	sthh\.w r10\[r3\],r0:b,r11:t
++
++[0-9a-f]* <sthh_w1>:
++ *[0-9a-f]*:	ff ef c0 0f 	sthh\.w pc\[0x0\],pc:b,pc:b
++ *[0-9a-f]*:	f9 ec ff fc 	sthh\.w r12\[0x3fc\],r12:t,r12:t
++ *[0-9a-f]*:	eb e5 f8 05 	sthh\.w r5\[0x200\],r5:t,r5:t
++ *[0-9a-f]*:	e9 e4 c7 f4 	sthh\.w r4\[0x1fc\],r4:b,r4:b
++ *[0-9a-f]*:	fd ee f0 1e 	sthh\.w lr\[0x4\],lr:t,lr:t
++ *[0-9a-f]*:	f3 e0 e6 54 	sthh\.w r4\[0x194\],r9:t,r0:b
++ *[0-9a-f]*:	e5 ea e5 78 	sthh\.w r8\[0x15c\],r2:t,r10:b
++ *[0-9a-f]*:	f3 e2 c2 bd 	sthh\.w sp\[0xac\],r9:b,r2:b
++
++[0-9a-f]* <cop>:
++ *[0-9a-f]*:	e1 a0 00 00 	cop cp0,cr0,cr0,cr0,0x0
++ *[0-9a-f]*:	e7 af ff ff 	cop cp7,cr15,cr15,cr15,0x7f
++ *[0-9a-f]*:	e3 a8 75 55 	cop cp3,cr5,cr5,cr5,0x31
++ *[0-9a-f]*:	e3 a8 44 44 	cop cp2,cr4,cr4,cr4,0x30
++ *[0-9a-f]*:	e5 ad a8 37 	cop cp5,cr8,cr3,cr7,0x5a
++
++[0-9a-f]* <ldc_w1>:
++ *[0-9a-f]*:	e9 a0 00 00 	ldc\.w cp0,cr0,r0\[0x0\]
++ *[0-9a-f]*:	e9 af ef ff 	ldc\.w cp7,cr15,pc\[0x3fc\]
++ *[0-9a-f]*:	e9 a5 65 80 	ldc\.w cp3,cr5,r5\[0x200\]
++ *[0-9a-f]*:	e9 a4 44 7f 	ldc\.w cp2,cr4,r4\[0x1fc\]
++ *[0-9a-f]*:	e9 ad 89 24 	ldc\.w cp4,cr9,sp\[0x90\]
++
++[0-9a-f]* <ldc_w2>:
++ *[0-9a-f]*:	ef a0 00 40 	ldc\.w cp0,cr0,--r0
++ *[0-9a-f]*:	ef af ef 40 	ldc\.w cp7,cr15,--pc
++ *[0-9a-f]*:	ef a5 65 40 	ldc\.w cp3,cr5,--r5
++ *[0-9a-f]*:	ef a4 44 40 	ldc\.w cp2,cr4,--r4
++ *[0-9a-f]*:	ef ad 89 40 	ldc\.w cp4,cr9,--sp
++
++[0-9a-f]* <ldc_w3>:
++ *[0-9a-f]*:	ef a0 10 00 	ldc\.w cp0,cr0,r0\[r0\]
++ *[0-9a-f]*:	ef af ff 3f 	ldc\.w cp7,cr15,pc\[pc<<0x3\]
++ *[0-9a-f]*:	ef a5 75 24 	ldc\.w cp3,cr5,r5\[r4<<0x2\]
++ *[0-9a-f]*:	ef a4 54 13 	ldc\.w cp2,cr4,r4\[r3<<0x1\]
++ *[0-9a-f]*:	ef ad 99 0c 	ldc\.w cp4,cr9,sp\[r12\]
++
++[0-9a-f]* <ldc_d1>:
++ *[0-9a-f]*:	e9 a0 10 00 	ldc\.d cp0,cr0,r0\[0x0\]
++ *[0-9a-f]*:	e9 af fe ff 	ldc\.d cp7,cr14,pc\[0x3fc\]
++ *[0-9a-f]*:	e9 a5 76 80 	ldc\.d cp3,cr6,r5\[0x200\]
++ *[0-9a-f]*:	e9 a4 54 7f 	ldc\.d cp2,cr4,r4\[0x1fc\]
++ *[0-9a-f]*:	e9 ad 98 24 	ldc\.d cp4,cr8,sp\[0x90\]
++
++[0-9a-f]* <ldc_d2>:
++ *[0-9a-f]*:	ef a0 00 50 	ldc\.d cp0,cr0,--r0
++ *[0-9a-f]*:	ef af ee 50 	ldc\.d cp7,cr14,--pc
++ *[0-9a-f]*:	ef a5 66 50 	ldc\.d cp3,cr6,--r5
++ *[0-9a-f]*:	ef a4 44 50 	ldc\.d cp2,cr4,--r4
++ *[0-9a-f]*:	ef ad 88 50 	ldc\.d cp4,cr8,--sp
++
++[0-9a-f]* <ldc_d3>:
++ *[0-9a-f]*:	ef a0 10 40 	ldc\.d cp0,cr0,r0\[r0\]
++ *[0-9a-f]*:	ef af fe 7f 	ldc\.d cp7,cr14,pc\[pc<<0x3\]
++ *[0-9a-f]*:	ef a5 76 64 	ldc\.d cp3,cr6,r5\[r4<<0x2\]
++ *[0-9a-f]*:	ef a4 54 53 	ldc\.d cp2,cr4,r4\[r3<<0x1\]
++ *[0-9a-f]*:	ef ad 98 4c 	ldc\.d cp4,cr8,sp\[r12\]
++
++[0-9a-f]* <stc_w1>:
++ *[0-9a-f]*:	eb a0 00 00 	stc\.w cp0,r0\[0x0\],cr0
++ *[0-9a-f]*:	eb af ef ff 	stc\.w cp7,pc\[0x3fc\],cr15
++ *[0-9a-f]*:	eb a5 65 80 	stc\.w cp3,r5\[0x200\],cr5
++ *[0-9a-f]*:	eb a4 44 7f 	stc\.w cp2,r4\[0x1fc\],cr4
++ *[0-9a-f]*:	eb ad 89 24 	stc\.w cp4,sp\[0x90\],cr9
++
++[0-9a-f]* <stc_w2>:
++ *[0-9a-f]*:	ef a0 00 60 	stc\.w cp0,r0\+\+,cr0
++ *[0-9a-f]*:	ef af ef 60 	stc\.w cp7,pc\+\+,cr15
++ *[0-9a-f]*:	ef a5 65 60 	stc\.w cp3,r5\+\+,cr5
++ *[0-9a-f]*:	ef a4 44 60 	stc\.w cp2,r4\+\+,cr4
++ *[0-9a-f]*:	ef ad 89 60 	stc\.w cp4,sp\+\+,cr9
++
++[0-9a-f]* <stc_w3>:
++ *[0-9a-f]*:	ef a0 10 80 	stc\.w cp0,r0\[r0\],cr0
++ *[0-9a-f]*:	ef af ff bf 	stc\.w cp7,pc\[pc<<0x3\],cr15
++ *[0-9a-f]*:	ef a5 75 a4 	stc\.w cp3,r5\[r4<<0x2\],cr5
++ *[0-9a-f]*:	ef a4 54 93 	stc\.w cp2,r4\[r3<<0x1\],cr4
++ *[0-9a-f]*:	ef ad 99 8c 	stc\.w cp4,sp\[r12\],cr9
++
++[0-9a-f]* <stc_d1>:
++ *[0-9a-f]*:	eb a0 10 00 	stc\.d cp0,r0\[0x0\],cr0
++ *[0-9a-f]*:	eb af fe ff 	stc\.d cp7,pc\[0x3fc\],cr14
++ *[0-9a-f]*:	eb a5 76 80 	stc\.d cp3,r5\[0x200\],cr6
++ *[0-9a-f]*:	eb a4 54 7f 	stc\.d cp2,r4\[0x1fc\],cr4
++ *[0-9a-f]*:	eb ad 98 24 	stc\.d cp4,sp\[0x90\],cr8
++
++[0-9a-f]* <stc_d2>:
++ *[0-9a-f]*:	ef a0 00 70 	stc\.d cp0,r0\+\+,cr0
++ *[0-9a-f]*:	ef af ee 70 	stc\.d cp7,pc\+\+,cr14
++ *[0-9a-f]*:	ef a5 66 70 	stc\.d cp3,r5\+\+,cr6
++ *[0-9a-f]*:	ef a4 44 70 	stc\.d cp2,r4\+\+,cr4
++ *[0-9a-f]*:	ef ad 88 70 	stc\.d cp4,sp\+\+,cr8
++
++[0-9a-f]* <stc_d3>:
++ *[0-9a-f]*:	ef a0 10 c0 	stc\.d cp0,r0\[r0\],cr0
++ *[0-9a-f]*:	ef af fe ff 	stc\.d cp7,pc\[pc<<0x3\],cr14
++ *[0-9a-f]*:	ef a5 76 e4 	stc\.d cp3,r5\[r4<<0x2\],cr6
++ *[0-9a-f]*:	ef a4 54 d3 	stc\.d cp2,r4\[r3<<0x1\],cr4
++ *[0-9a-f]*:	ef ad 98 cc 	stc\.d cp4,sp\[r12\],cr8
++
++[0-9a-f]* <ldc0_w>:
++ *[0-9a-f]*:	f1 a0 00 00 	ldc0\.w cr0,r0\[0x0\]
++ *[0-9a-f]*:	f1 af ff ff 	ldc0\.w cr15,pc\[0x3ffc\]
++ *[0-9a-f]*:	f1 a5 85 00 	ldc0\.w cr5,r5\[0x2000\]
++ *[0-9a-f]*:	f1 a4 74 ff 	ldc0\.w cr4,r4\[0x1ffc\]
++ *[0-9a-f]*:	f1 ad 09 93 	ldc0\.w cr9,sp\[0x24c\]
++
++[0-9a-f]* <ldc0_d>:
++ *[0-9a-f]*:	f3 a0 00 00 	ldc0\.d cr0,r0\[0x0\]
++ *[0-9a-f]*:	f3 af fe ff 	ldc0\.d cr14,pc\[0x3ffc\]
++ *[0-9a-f]*:	f3 a5 86 00 	ldc0\.d cr6,r5\[0x2000\]
++ *[0-9a-f]*:	f3 a4 74 ff 	ldc0\.d cr4,r4\[0x1ffc\]
++ *[0-9a-f]*:	f3 ad 08 93 	ldc0\.d cr8,sp\[0x24c\]
++
++[0-9a-f]* <stc0_w>:
++ *[0-9a-f]*:	f5 a0 00 00 	stc0\.w r0\[0x0\],cr0
++ *[0-9a-f]*:	f5 af ff ff 	stc0\.w pc\[0x3ffc\],cr15
++ *[0-9a-f]*:	f5 a5 85 00 	stc0\.w r5\[0x2000\],cr5
++ *[0-9a-f]*:	f5 a4 74 ff 	stc0\.w r4\[0x1ffc\],cr4
++ *[0-9a-f]*:	f5 ad 09 93 	stc0\.w sp\[0x24c\],cr9
++
++[0-9a-f]* <stc0_d>:
++ *[0-9a-f]*:	f7 a0 00 00 	stc0\.d r0\[0x0\],cr0
++ *[0-9a-f]*:	f7 af fe ff 	stc0\.d pc\[0x3ffc\],cr14
++ *[0-9a-f]*:	f7 a5 86 00 	stc0\.d r5\[0x2000\],cr6
++ *[0-9a-f]*:	f7 a4 74 ff 	stc0\.d r4\[0x1ffc\],cr4
++ *[0-9a-f]*:	f7 ad 08 93 	stc0\.d sp\[0x24c\],cr8
++
++[0-9a-f]* <memc>:
++ *[0-9a-f]*:	f6 10 00 00 	memc 0,0x0
++ *[0-9a-f]*:	f6 1f ff ff 	memc -4,0x1f
++ *[0-9a-f]*:	f6 18 40 00 	memc -65536,0x10
++ *[0-9a-f]*:	f6 17 bf ff 	memc 65532,0xf
++
++[0-9a-f]* <mems>:
++ *[0-9a-f]*:	f8 10 00 00 	mems 0,0x0
++ *[0-9a-f]*:	f8 1f ff ff 	mems -4,0x1f
++ *[0-9a-f]*:	f8 18 40 00 	mems -65536,0x10
++ *[0-9a-f]*:	f8 17 bf ff 	mems 65532,0xf
++
++[0-9a-f]* <memt>:
++ *[0-9a-f]*:	fa 10 00 00 	memt 0,0x0
++ *[0-9a-f]*:	fa 1f ff ff 	memt -4,0x1f
++ *[0-9a-f]*:	fa 18 40 00 	memt -65536,0x10
++ *[0-9a-f]*:	fa 17 bf ff 	memt 65532,0xf
++
++[0-9a-f]* <stcond>:
++ *[0-9a-f]*:	e1 70 00 00 	stcond r0\[0\],r0
++ *[0-9a-f]*:	ff 7f ff ff 	stcond pc\[-1\],pc
++ *[0-9a-f]*:	f1 77 80 00 	stcond r8\[-32768\],r7
++ *[0-9a-f]*:	ef 78 7f ff 	stcond r7\[32767\],r8
++ *[0-9a-f]*:	eb 7a 12 34 	stcond r5\[4660\],r10
++
++[0-9a-f]* <ldcm_w>:
++ *[0-9a-f]*:	ed af 00 ff 	ldcm\.w cp0,pc,cr0-cr7
++ *[0-9a-f]*:	ed a0 e0 01 	ldcm\.w cp7,r0,cr0
++ *[0-9a-f]*:	ed a4 90 7f 	ldcm\.w cp4,r4\+\+,cr0-cr6
++ *[0-9a-f]*:	ed a7 60 80 	ldcm\.w cp3,r7,cr7
++ *[0-9a-f]*:	ed ac 30 72 	ldcm\.w cp1,r12\+\+,cr1,cr4-cr6
++ *[0-9a-f]*:	ed af 01 ff 	ldcm\.w cp0,pc,cr8-cr15
++ *[0-9a-f]*:	ed a0 e1 01 	ldcm\.w cp7,r0,cr8
++ *[0-9a-f]*:	ed a4 91 7f 	ldcm\.w cp4,r4\+\+,cr8-cr14
++ *[0-9a-f]*:	ed a7 61 80 	ldcm\.w cp3,r7,cr15
++ *[0-9a-f]*:	ed ac 31 72 	ldcm\.w cp1,r12\+\+,cr9,cr12-cr14
++
++[0-9a-f]* <ldcm_d>:
++ *[0-9a-f]*:	ed af 04 ff 	ldcm\.d cp0,pc,cr0-cr15
++ *[0-9a-f]*:	ed a0 e4 01 	ldcm\.d cp7,r0,cr0-cr1
++ *[0-9a-f]*:	ed a4 94 7f 	ldcm\.d cp4,r4\+\+,cr0-cr13
++ *[0-9a-f]*:	ed a7 64 80 	ldcm\.d cp3,r7,cr14-cr15
++ *[0-9a-f]*:	ed ac 54 93 	ldcm\.d cp2,r12\+\+,cr0-cr3,cr8-cr9,cr14-cr15
++
++[0-9a-f]* <stcm_w>:
++ *[0-9a-f]*:	ed af 02 ff 	stcm\.w cp0,pc,cr0-cr7
++ *[0-9a-f]*:	ed a0 e2 01 	stcm\.w cp7,r0,cr0
++ *[0-9a-f]*:	ed a4 92 7f 	stcm\.w cp4,--r4,cr0-cr6
++ *[0-9a-f]*:	ed a7 62 80 	stcm\.w cp3,r7,cr7
++ *[0-9a-f]*:	ed ac 32 72 	stcm\.w cp1,--r12,cr1,cr4-cr6
++ *[0-9a-f]*:	ed af 03 ff 	stcm\.w cp0,pc,cr8-cr15
++ *[0-9a-f]*:	ed a0 e3 01 	stcm\.w cp7,r0,cr8
++ *[0-9a-f]*:	ed a4 93 7f 	stcm\.w cp4,--r4,cr8-cr14
++ *[0-9a-f]*:	ed a7 63 80 	stcm\.w cp3,r7,cr15
++ *[0-9a-f]*:	ed ac 33 72 	stcm\.w cp1,--r12,cr9,cr12-cr14
++
++[0-9a-f]* <stcm_d>:
++ *[0-9a-f]*:	ed af 05 ff 	stcm\.d cp0,pc,cr0-cr15
++ *[0-9a-f]*:	ed a0 e5 01 	stcm\.d cp7,r0,cr0-cr1
++ *[0-9a-f]*:	ed a4 95 7f 	stcm\.d cp4,--r4,cr0-cr13
++ *[0-9a-f]*:	ed a7 65 80 	stcm\.d cp3,r7,cr14-cr15
++ *[0-9a-f]*:	ed ac 55 93 	stcm\.d cp2,--r12,cr0-cr3,cr8-cr9,cr14-cr15
++
++[0-9a-f]* <mvcr_w>:
++ *[0-9a-f]*:	ef af ef 00 	mvcr\.w cp7,pc,cr15
++ *[0-9a-f]*:	ef a0 00 00 	mvcr\.w cp0,r0,cr0
++ *[0-9a-f]*:	ef af 0f 00 	mvcr\.w cp0,pc,cr15
++ *[0-9a-f]*:	ef a0 ef 00 	mvcr\.w cp7,r0,cr15
++ *[0-9a-f]*:	ef af e0 00 	mvcr\.w cp7,pc,cr0
++ *[0-9a-f]*:	ef a7 88 00 	mvcr\.w cp4,r7,cr8
++ *[0-9a-f]*:	ef a8 67 00 	mvcr\.w cp3,r8,cr7
++
++[0-9a-f]* <mvcr_d>:
++ *[0-9a-f]*:	ef ae ee 10 	mvcr\.d cp7,lr,cr14
++ *[0-9a-f]*:	ef a0 00 10 	mvcr\.d cp0,r0,cr0
++ *[0-9a-f]*:	ef ae 0e 10 	mvcr\.d cp0,lr,cr14
++ *[0-9a-f]*:	ef a0 ee 10 	mvcr\.d cp7,r0,cr14
++ *[0-9a-f]*:	ef ae e0 10 	mvcr\.d cp7,lr,cr0
++ *[0-9a-f]*:	ef a6 88 10 	mvcr\.d cp4,r6,cr8
++ *[0-9a-f]*:	ef a8 66 10 	mvcr\.d cp3,r8,cr6
++
++[0-9a-f]* <mvrc_w>:
++ *[0-9a-f]*:	ef af ef 20 	mvrc\.w cp7,cr15,pc
++ *[0-9a-f]*:	ef a0 00 20 	mvrc\.w cp0,cr0,r0
++ *[0-9a-f]*:	ef af 0f 20 	mvrc\.w cp0,cr15,pc
++ *[0-9a-f]*:	ef a0 ef 20 	mvrc\.w cp7,cr15,r0
++ *[0-9a-f]*:	ef af e0 20 	mvrc\.w cp7,cr0,pc
++ *[0-9a-f]*:	ef a7 88 20 	mvrc\.w cp4,cr8,r7
++ *[0-9a-f]*:	ef a8 67 20 	mvrc\.w cp3,cr7,r8
++
++[0-9a-f]* <mvrc_d>:
++ *[0-9a-f]*:	ef ae ee 30 	mvrc\.d cp7,cr14,lr
++ *[0-9a-f]*:	ef a0 00 30 	mvrc\.d cp0,cr0,r0
++ *[0-9a-f]*:	ef ae 0e 30 	mvrc\.d cp0,cr14,lr
++ *[0-9a-f]*:	ef a0 ee 30 	mvrc\.d cp7,cr14,r0
++ *[0-9a-f]*:	ef ae e0 30 	mvrc\.d cp7,cr0,lr
++ *[0-9a-f]*:	ef a6 88 30 	mvrc\.d cp4,cr8,r6
++ *[0-9a-f]*:	ef a8 66 30 	mvrc\.d cp3,cr6,r8
++
++[0-9a-f]* <bfexts>:
++ *[0-9a-f]*:	ff df b3 ff 	bfexts pc,pc,0x1f,0x1f
++ *[0-9a-f]*:	e1 d0 b0 00 	bfexts r0,r0,0x0,0x0
++ *[0-9a-f]*:	e1 df b3 ff 	bfexts r0,pc,0x1f,0x1f
++ *[0-9a-f]*:	ff d0 b3 ff 	bfexts pc,r0,0x1f,0x1f
++ *[0-9a-f]*:	ff df b0 1f 	bfexts pc,pc,0x0,0x1f
++ *[0-9a-f]*:	ff df b3 e0 	bfexts pc,pc,0x1f,0x0
++ *[0-9a-f]*:	ef d8 b1 f0 	bfexts r7,r8,0xf,0x10
++ *[0-9a-f]*:	f1 d7 b2 0f 	bfexts r8,r7,0x10,0xf
++
++[0-9a-f]* <bfextu>:
++ *[0-9a-f]*:	ff df c3 ff 	bfextu pc,pc,0x1f,0x1f
++ *[0-9a-f]*:	e1 d0 c0 00 	bfextu r0,r0,0x0,0x0
++ *[0-9a-f]*:	e1 df c3 ff 	bfextu r0,pc,0x1f,0x1f
++ *[0-9a-f]*:	ff d0 c3 ff 	bfextu pc,r0,0x1f,0x1f
++ *[0-9a-f]*:	ff df c0 1f 	bfextu pc,pc,0x0,0x1f
++ *[0-9a-f]*:	ff df c3 e0 	bfextu pc,pc,0x1f,0x0
++ *[0-9a-f]*:	ef d8 c1 f0 	bfextu r7,r8,0xf,0x10
++ *[0-9a-f]*:	f1 d7 c2 0f 	bfextu r8,r7,0x10,0xf
++
++[0-9a-f]* <bfins>:
++ *[0-9a-f]*:	ff df d3 ff 	bfins pc,pc,0x1f,0x1f
++ *[0-9a-f]*:	e1 d0 d0 00 	bfins r0,r0,0x0,0x0
++ *[0-9a-f]*:	e1 df d3 ff 	bfins r0,pc,0x1f,0x1f
++ *[0-9a-f]*:	ff d0 d3 ff 	bfins pc,r0,0x1f,0x1f
++ *[0-9a-f]*:	ff df d0 1f 	bfins pc,pc,0x0,0x1f
++ *[0-9a-f]*:	ff df d3 e0 	bfins pc,pc,0x1f,0x0
++ *[0-9a-f]*:	ef d8 d1 f0 	bfins r7,r8,0xf,0x10
++ *[0-9a-f]*:	f1 d7 d2 0f 	bfins r8,r7,0x10,0xf
++
++[0-9a-f]* <rsubc>:
++ *[0-9a-f]*:	fb bf 00 00 	rsubeq pc,0
++ *[0-9a-f]*:	fb bc 0f ff 	rsubal r12,-1
++ *[0-9a-f]*:	fb b5 08 80 	rsubls r5,-128
++ *[0-9a-f]*:	fb b4 07 7f 	rsubpl r4,127
++ *[0-9a-f]*:	fb be 01 01 	rsubne lr,1
++ *[0-9a-f]*:	fb bc 08 76 	rsubls r12,118
++ *[0-9a-f]*:	fb be 0d f4 	rsubvc lr,-12
++ *[0-9a-f]*:	fb b4 06 f3 	rsubmi r4,-13
++
++[0-9a-f]* <addc>:
++ *[0-9a-f]*:	ff df e0 0f 	addeq pc,pc,pc
++ *[0-9a-f]*:	f9 dc ef 0c 	addal r12,r12,r12
++ *[0-9a-f]*:	eb d5 e8 05 	addls r5,r5,r5
++ *[0-9a-f]*:	e9 d4 e7 04 	addpl r4,r4,r4   
++ *[0-9a-f]*:	fd de e1 0e 	addne lr,lr,lr
++ *[0-9a-f]*:	e5 d1 e8 0a 	addls r10,r2,r1
++ *[0-9a-f]*:	f1 db ed 0c 	addvc r12,r8,r11
++ *[0-9a-f]*:	ef d0 e6 0a 	addmi r10,r7,r0
++
++[0-9a-f]* <subc2>:
++ *[0-9a-f]*:	ff df e0 1f 	subeq pc,pc,pc
++ *[0-9a-f]*:	f9 dc ef 1c 	subal r12,r12,r12
++ *[0-9a-f]*:	eb d5 e8 15 	subls r5,r5,r5
++ *[0-9a-f]*:	e9 d4 e7 14 	subpl r4,r4,r4   
++ *[0-9a-f]*:	fd de e1 1e 	subne lr,lr,lr
++ *[0-9a-f]*:	e5 d1 e8 1a 	subls r10,r2,r1
++ *[0-9a-f]*:	f1 db ed 1c 	subvc r12,r8,r11
++ *[0-9a-f]*:	ef d0 e6 1a 	submi r10,r7,r0
++
++[0-9a-f]* <andc>:
++ *[0-9a-f]*:	ff df e0 2f 	andeq pc,pc,pc
++ *[0-9a-f]*:	f9 dc ef 2c 	andal r12,r12,r12
++ *[0-9a-f]*:	eb d5 e8 25 	andls r5,r5,r5
++ *[0-9a-f]*:	e9 d4 e7 24 	andpl r4,r4,r4   
++ *[0-9a-f]*:	fd de e1 2e 	andne lr,lr,lr
++ *[0-9a-f]*:	e5 d1 e8 2a 	andls r10,r2,r1
++ *[0-9a-f]*:	f1 db ed 2c 	andvc r12,r8,r11
++ *[0-9a-f]*:	ef d0 e6 2a 	andmi r10,r7,r0
++
++[0-9a-f]* <orc>:
++ *[0-9a-f]*:	ff df e0 3f 	oreq pc,pc,pc
++ *[0-9a-f]*:	f9 dc ef 3c 	oral r12,r12,r12
++ *[0-9a-f]*:	eb d5 e8 35 	orls r5,r5,r5
++ *[0-9a-f]*:	e9 d4 e7 34 	orpl r4,r4,r4   
++ *[0-9a-f]*:	fd de e1 3e 	orne lr,lr,lr
++ *[0-9a-f]*:	e5 d1 e8 3a 	orls r10,r2,r1
++ *[0-9a-f]*:	f1 db ed 3c 	orvc r12,r8,r11
++ *[0-9a-f]*:	ef d0 e6 3a 	ormi r10,r7,r0
++
++[0-9a-f]* <eorc>:
++ *[0-9a-f]*:	ff df e0 4f 	eoreq pc,pc,pc
++ *[0-9a-f]*:	f9 dc ef 4c 	eoral r12,r12,r12
++ *[0-9a-f]*:	eb d5 e8 45 	eorls r5,r5,r5
++ *[0-9a-f]*:	e9 d4 e7 44 	eorpl r4,r4,r4   
++ *[0-9a-f]*:	fd de e1 4e 	eorne lr,lr,lr
++ *[0-9a-f]*:	e5 d1 e8 4a 	eorls r10,r2,r1
++ *[0-9a-f]*:	f1 db ed 4c 	eorvc r12,r8,r11
++ *[0-9a-f]*:	ef d0 e6 4a 	eormi r10,r7,r0
++
++[0-9a-f]* <ldcond>:
++ *[0-9a-f]*:	ff ff 01 ff     ld.weq  pc,pc[0x7fc]
++ *[0-9a-f]*:	f9 fc f3 ff     ld.shal r12,r12[0x3fe]
++ *[0-9a-f]*:	eb f5 84 00     ld.shls r5,r5[0x0]
++ *[0-9a-f]*:	e9 f4 79 ff     ld.ubpl r4,r4[0x1ff]
++ *[0-9a-f]*:	fd fe 16 00     ld.sbne lr,lr[0x0]
++ *[0-9a-f]*:	e5 fa 80 00     ld.wls  r10,r2[0x0]
++ *[0-9a-f]*:	f1 fc d3 ff     ld.shvc r12,r8[0x3fe]
++ *[0-9a-f]*:	ef fa 68 01     ld.ubmi r10,r7[0x1]
++
++[0-9a-f]* <stcond2>:
++ *[0-9a-f]*:	ff ff 0b ff     st.weq pc[0x7fc],pc
++ *[0-9a-f]*:	f9 fc fd ff     st.hal r12[0x3fe],r12
++ *[0-9a-f]*:	eb f5 8c 00     st.hls r5[0x0],r5
++ *[0-9a-f]*:	e9 f4 7f ff     st.bpl r4[0x1ff],r4
++ *[0-9a-f]*:	fd fe 1e 00     st.bne lr[0x0],lr
++ *[0-9a-f]*:	e5 fa 8a 00     st.wls r2[0x0],r10
++ *[0-9a-f]*:	f1 fc dd ff     st.hvc r8[0x3fe],r12
++ *[0-9a-f]*:	ef fa 6e 01     st.bmi r7[0x1],r10
++
++[0-9a-f]* <movh>:
++ *[0-9a-f]*:	fc 1f ff ff     movh pc,0xffff
++ *[0-9a-f]*:	fc 10 00 00     movh r0,0x0
++ *[0-9a-f]*:	fc 15 00 01     movh r5,0x1
++ *[0-9a-f]*:	fc 1c 7f ff     movh r12,0x7fff
++
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/allinsn.exp
+@@ -0,0 +1,5 @@
++# AVR32 assembler testsuite. -*- Tcl -*-
++
++if [istarget avr32-*-*] {
++    run_dump_test "allinsn"
++}
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/allinsn.s
+@@ -0,0 +1,3330 @@
++ .data
++foodata: .word 42
++ .text
++footext:
++	.text
++	.global ld_d5
++ld_d5:
++	ld.d lr,pc[pc<<3]
++	ld.d r0,r0[r0<<0]
++	ld.d r6,r5[r5<<2]
++	ld.d r4,r4[r4<<1]
++	ld.d lr,lr[lr<<1]
++	ld.d r10,r3[sp<<2]
++	ld.d r8,r10[r6<<2]
++	ld.d r2,r7[r9<<0]
++	.text
++	.global ld_w5
++ld_w5:
++	ld.w pc,pc[pc<<0]
++	ld.w r12,r12[r12<<3]
++	ld.w r5,r5[r5<<2]
++	ld.w r4,r4[r4<<1]
++	ld.w lr,lr[lr<<1]
++	ld.w r2,r9[r9<<0]
++	ld.w r11,r2[r6<<0]
++	ld.w r0,r2[sp<<3]
++	.text
++	.global ld_sh5
++ld_sh5:
++	ld.sh pc,pc[pc<<0]
++	ld.sh r12,r12[r12<<3]
++	ld.sh r5,r5[r5<<2]
++	ld.sh r4,r4[r4<<1]
++	ld.sh lr,lr[lr<<1]
++	ld.sh r11,r0[pc<<2]
++	ld.sh r10,sp[r6<<2]
++	ld.sh r12,r2[r2<<0]
++	.text
++	.global ld_uh5
++ld_uh5:
++	ld.uh pc,pc[pc<<0]
++	ld.uh r12,r12[r12<<3]
++	ld.uh r5,r5[r5<<2]
++	ld.uh r4,r4[r4<<1]
++	ld.uh lr,lr[lr<<1]
++	ld.uh r8,pc[lr<<3]
++	ld.uh r6,r1[pc<<1]
++	ld.uh r6,lr[sp<<1]
++	.text
++	.global ld_sb2
++ld_sb2:
++	ld.sb pc,pc[pc<<0]
++	ld.sb r12,r12[r12<<3]
++	ld.sb r5,r5[r5<<2]
++	ld.sb r4,r4[r4<<1]
++	ld.sb lr,lr[lr<<1]
++	ld.sb r9,r1[pc<<3]
++	ld.sb r0,r3[r11<<1]
++	ld.sb r10,r5[r5<<1]
++	.text
++	.global ld_ub5
++ld_ub5:
++	ld.ub pc,pc[pc<<0]
++	ld.ub r12,r12[r12<<3]
++	ld.ub r5,r5[r5<<2]
++	ld.ub r4,r4[r4<<1]
++	ld.ub lr,lr[lr<<1]
++	ld.ub r6,r12[r7<<3]
++	ld.ub r2,r6[r12<<0]
++	ld.ub r0,r7[r11<<1]
++	.text
++	.global st_d5
++st_d5:
++	st.d pc[pc<<0],r14
++	st.d r12[r12<<3],r12
++	st.d r5[r5<<2],r6
++	st.d r4[r4<<1],r4
++	st.d lr[lr<<1],lr
++	st.d r1[r9<<1],r4
++	st.d r10[r2<<1],r4
++	st.d r12[r6<<0],lr
++	.text
++	.global st_w5
++st_w5:
++	st.w pc[pc<<0],pc
++	st.w r12[r12<<3],r12
++	st.w r5[r5<<2],r5
++	st.w r4[r4<<1],r4
++	st.w lr[lr<<1],lr
++	st.w r1[r10<<0],r3
++	st.w r0[r10<<1],r9
++	st.w r4[r5<<3],pc
++	.text
++	.global st_h5
++st_h5:
++	st.h pc[pc<<0],pc
++	st.h r12[r12<<3],r12
++	st.h r5[r5<<2],r5
++	st.h r4[r4<<1],r4
++	st.h lr[lr<<1],lr
++	st.h r2[r9<<0],r11
++	st.h r5[r1<<2],r12
++	st.h pc[r8<<2],r3
++	.text
++	.global st_b5
++st_b5:
++	st.b pc[pc<<0],pc
++	st.b r12[r12<<3],r12
++	st.b r5[r5<<2],r5
++	st.b r4[r4<<1],r4
++	st.b lr[lr<<1],lr
++	st.b r1[r8<<1],r6
++	st.b lr[lr<<3],r1
++	st.b r5[r0<<2],pc
++	.text
++	.global divs
++divs:
++	divs pc,pc,pc
++	divs r12,r12,r12
++	divs r5,r5,r5
++	divs r4,r4,r4
++	divs lr,lr,lr
++	divs r3,pc,pc
++	divs r9,r12,r2
++	divs r7,r4,r1
++	.text
++	.global add1
++add1:
++	add pc,pc
++	add r12,r12
++	add r5,r5
++	add r4,r4
++	add lr,lr
++	add r12,r9
++	add r6,r3
++	add r10,r12
++	.text
++	.global sub1
++sub1:
++	sub pc,pc
++	sub r12,r12
++	sub r5,r5
++	sub r4,r4
++	sub lr,lr
++	sub lr,r6
++	sub r0,sp
++	sub r6,r12
++	.text
++	.global rsub1
++rsub1:
++	rsub pc,pc
++	rsub r12,r12
++	rsub r5,r5
++	rsub r4,r4
++	rsub lr,lr
++	rsub r11,sp
++	rsub r7,r4
++	rsub r9,r1
++	.text
++	.global cp1
++cp1:
++	cp pc,pc
++	cp r12,r12
++	cp r5,r5
++	cp r4,r4
++	cp lr,lr
++	cp r6,r2
++	cp r0,r9
++	cp r3,sp
++	.text
++	.global or1
++or1:
++	or pc,pc
++	or r12,r12
++	or r5,r5
++	or r4,r4
++	or lr,lr
++	or r4,r9
++	or r11,r4
++	or r4,r0
++	.text
++	.global eor1
++eor1:
++	eor pc,pc
++	eor r12,r12
++	eor r5,r5
++	eor r4,r4
++	eor lr,lr
++	eor r12,r11
++	eor r0,r1
++	eor r5,pc
++	.text
++	.global and1
++and1:
++	and pc,pc
++	and r12,r12
++	and r5,r5
++	and r4,r4
++	and lr,lr
++	and r8,r1
++	and r0,sp
++	and r10,r5
++	.text
++	.global tst
++tst:
++	tst pc,pc
++	tst r12,r12
++	tst r5,r5
++	tst r4,r4
++	tst lr,lr
++	tst r0,r12
++	tst r10,r6
++	tst sp,r4
++	.text
++	.global andn
++andn:
++	andn pc,pc
++	andn r12,r12
++	andn r5,r5
++	andn r4,r4
++	andn lr,lr
++	andn r9,r12
++	andn r11,sp
++	andn r12,r5
++	.text
++	.global mov3
++mov3:
++	mov pc,pc
++	mov r12,r12
++	mov r5,r5
++	mov r4,r4
++	mov lr,lr
++	mov r5,r9
++	mov r11,r11
++	mov r2,lr
++	.text
++	.global st_w1
++st_w1:
++	st.w pc++,pc
++	st.w r12++,r12
++	st.w r5++,r5
++	st.w r4++,r4
++	st.w lr++,lr
++	st.w r1++,r11
++	st.w sp++,r0
++	st.w sp++,r1
++	.text
++	.global st_h1
++st_h1:
++	st.h pc++,pc
++	st.h r12++,r12
++	st.h r5++,r5
++	st.h r4++,r4
++	st.h lr++,lr
++	st.h r12++,sp
++	st.h r7++,lr
++	st.h r7++,r4
++	.text
++	.global st_b1
++st_b1:
++	st.b pc++,pc
++	st.b r12++,r12
++	st.b r5++,r5
++	st.b r4++,r4
++	st.b lr++,lr
++	st.b r9++,sp
++	st.b r1++,sp
++	st.b r0++,r4
++	.text
++	.global st_w2
++st_w2:
++	st.w --pc,pc
++	st.w --r12,r12
++	st.w --r5,r5
++	st.w --r4,r4
++	st.w --lr,lr
++	st.w --r1,r7
++	st.w --r3,r9
++	st.w --r5,r5
++	.text
++	.global st_h2
++st_h2:
++	st.h --pc,pc
++	st.h --r12,r12
++	st.h --r5,r5
++	st.h --r4,r4
++	st.h --lr,lr
++	st.h --r5,r7
++	st.h --r8,r8
++	st.h --r7,r2
++	.text
++	.global st_b2
++st_b2:
++	st.b --pc,pc
++	st.b --r12,r12
++	st.b --r5,r5
++	st.b --r4,r4
++	st.b --lr,lr
++	st.b --sp,sp
++	st.b --sp,r11
++	st.b --r4,r5
++	.text
++	.global ld_w1
++ld_w1:
++	ld.w pc,pc++
++	ld.w r12,r12++
++	ld.w r5,r5++
++	ld.w r4,r4++
++	ld.w lr,lr++
++	ld.w r3,r7++
++	ld.w r3,lr++
++	ld.w r12,r5++
++	.text
++	.global ld_sh1
++ld_sh1:
++	ld.sh pc,pc++
++	ld.sh r12,r12++
++	ld.sh r5,r5++
++	ld.sh r4,r4++
++	ld.sh lr,lr++
++	ld.sh r11,r2++
++	ld.sh r2,r8++
++	ld.sh r7,r6++
++	.text
++	.global ld_uh1
++ld_uh1:
++	ld.uh pc,pc++
++	ld.uh r12,r12++
++	ld.uh r5,r5++
++	ld.uh r4,r4++
++	ld.uh lr,lr++
++	ld.uh r6,r7++
++	ld.uh r10,r11++
++	ld.uh lr,r4++
++	.text
++	.global ld_ub1
++ld_ub1:
++	ld.ub pc,pc++
++	ld.ub r12,r12++
++	ld.ub r5,r5++
++	ld.ub r4,r4++
++	ld.ub lr,lr++
++	ld.ub r8,lr++
++	ld.ub r12,r12++
++	ld.ub r11,r10++
++	.text
++	.global ld_w2
++ld_w2:
++	ld.w pc,--pc
++	ld.w r12,--r12
++	ld.w r5,--r5
++	ld.w r4,--r4
++	ld.w lr,--lr
++	ld.w r10,--lr
++	ld.w r12,--r9
++	ld.w r6,--r5
++	.text
++	.global ld_sh2
++ld_sh2:
++	ld.sh pc,--pc
++	ld.sh r12,--r12
++	ld.sh r5,--r5
++	ld.sh r4,--r4
++	ld.sh lr,--lr
++	ld.sh pc,--r10
++	ld.sh r6,--r3
++	ld.sh r4,--r6
++	.text
++	.global ld_uh2
++ld_uh2:
++	ld.uh pc,--pc
++	ld.uh r12,--r12
++	ld.uh r5,--r5
++	ld.uh r4,--r4
++	ld.uh lr,--lr
++	ld.uh r3,--r2
++	ld.uh r1,--r0
++	ld.uh r2,--r9
++	.text
++	.global ld_ub2
++ld_ub2:
++	ld.ub pc,--pc
++	ld.ub r12,--r12
++	ld.ub r5,--r5
++	ld.ub r4,--r4
++	ld.ub lr,--lr
++	ld.ub r1,--r1
++	ld.ub r0,--r6
++	ld.ub r2,--r7
++	.text
++	.global ld_ub3
++ld_ub3:
++	ld.ub pc,pc[0]
++	ld.ub r12,r12[7]
++	ld.ub r5,r5[4]
++	ld.ub r4,r4[3]
++	ld.ub lr,lr[1]
++	ld.ub r6,r9[6]
++	ld.ub r2,lr[4]
++	ld.ub r1,r8[0]
++	.text
++	.global sub3_sp
++sub3_sp:
++	sub sp,0
++	sub sp,-4
++	sub sp,-512
++	sub sp,508
++	sub sp,4
++	sub sp,44
++	sub sp,8
++	sub sp,348
++	.text
++	.global sub3
++sub3:
++	sub pc,0
++	sub r12,-1
++	sub r5,-128
++	sub r4,127
++	sub lr,1
++	sub r6,-41
++	sub r4,37
++	sub r12,56
++	.text
++	.global mov1
++mov1:
++	mov pc,0
++	mov r12,-1
++	mov r5,-128
++	mov r4,127
++	mov lr,1
++	mov pc,14
++	mov r6,-100
++	mov lr,-122
++	.text
++	.global lddsp
++lddsp:
++	lddsp pc,sp[0]
++	lddsp r12,sp[508]
++	lddsp r5,sp[256]
++	lddsp r4,sp[252]
++	lddsp lr,sp[4]
++	lddsp lr,sp[256]
++	lddsp r12,sp[20]
++	lddsp r9,sp[472]
++	.text
++	.global lddpc
++lddpc:
++	lddpc pc,pc[0]
++	lddpc r0,pc[508]
++	lddpc r8,pc[256]
++	lddpc r7,pc[252]
++	lddpc lr,pc[4]
++	lddpc sp,pc[472]
++	lddpc r6,pc[120]
++	lddpc r11,pc[28]
++	.text
++	.global stdsp
++stdsp:
++	stdsp sp[0],pc
++	stdsp sp[508],r12
++	stdsp sp[256],r5
++	stdsp sp[252],r4
++	stdsp sp[4],lr
++	stdsp sp[304],pc
++	stdsp sp[256],r0
++	stdsp sp[336],r5
++	.text
++	.global cp2
++cp2:
++	cp pc,0
++	cp r12,-1
++	cp r5,-32
++	cp r4,31
++	cp lr,1
++	cp r8,3
++	cp lr,16
++	cp r7,-26
++	.text
++	.global acr
++acr:
++	acr pc
++	acr r12
++	acr r5
++	acr r4
++	acr lr
++	acr r2
++	acr r12
++	acr pc
++	.text
++	.global scr
++scr:
++	scr pc
++	scr r12
++	scr r5
++	scr r4
++	scr lr
++	scr pc
++	scr r6
++	scr r1
++	.text
++	.global cpc0
++cpc0:
++	cpc pc
++	cpc r12
++	cpc r5
++	cpc r4
++	cpc lr
++	cpc pc
++	cpc r4
++	cpc r9
++	.text
++	.global neg
++neg:
++	neg pc
++	neg r12
++	neg r5
++	neg r4
++	neg lr
++	neg r7
++	neg r1
++	neg r9
++	.text
++	.global abs
++abs:
++	abs pc
++	abs r12
++	abs r5
++	abs r4
++	abs lr
++	abs r6
++	abs r6
++	abs r4
++	.text
++	.global castu_b
++castu_b:
++	castu.b pc
++	castu.b r12
++	castu.b r5
++	castu.b r4
++	castu.b lr
++	castu.b r7
++	castu.b sp
++	castu.b r9
++	.text
++	.global casts_b
++casts_b:
++	casts.b pc
++	casts.b r12
++	casts.b r5
++	casts.b r4
++	casts.b lr
++	casts.b r11
++	casts.b r1
++	casts.b r10
++	.text
++	.global castu_h
++castu_h:
++	castu.h pc
++	castu.h r12
++	castu.h r5
++	castu.h r4
++	castu.h lr
++	castu.h r10
++	castu.h r11
++	castu.h r1
++	.text
++	.global casts_h
++casts_h:
++	casts.h pc
++	casts.h r12
++	casts.h r5
++	casts.h r4
++	casts.h lr
++	casts.h r0
++	casts.h r5
++	casts.h r9
++	.text
++	.global brev
++brev:
++	brev pc
++	brev r12
++	brev r5
++	brev r4
++	brev lr
++	brev r5
++	brev r10
++	brev r8
++	.text
++	.global swap_h
++swap_h:
++	swap.h pc
++	swap.h r12
++	swap.h r5
++	swap.h r4
++	swap.h lr
++	swap.h r7
++	swap.h r0
++	swap.h r8
++	.text
++	.global swap_b
++swap_b:
++	swap.b pc
++	swap.b r12
++	swap.b r5
++	swap.b r4
++	swap.b lr
++	swap.b r10
++	swap.b r12
++	swap.b r1
++	.text
++	.global swap_bh
++swap_bh:
++	swap.bh pc
++	swap.bh r12
++	swap.bh r5
++	swap.bh r4
++	swap.bh lr
++	swap.bh r9
++	swap.bh r4
++	swap.bh r1
++	.text
++	.global One_s_compliment
++One_s_compliment:
++	com pc
++	com r12
++	com r5
++	com r4
++	com lr
++	com r2
++	com r2
++	com r7
++	.text
++	.global tnbz
++tnbz:
++	tnbz pc
++	tnbz r12
++	tnbz r5
++	tnbz r4
++	tnbz lr
++	tnbz r8
++	tnbz r12
++	tnbz pc
++	.text
++	.global rol
++rol:
++	rol pc
++	rol r12
++	rol r5
++	rol r4
++	rol lr
++	rol r10
++	rol r9
++	rol r5
++	.text
++	.global ror
++ror:
++	ror pc
++	ror r12
++	ror r5
++	ror r4
++	ror lr
++	ror r8
++	ror r4
++	ror r7
++	.text
++	.global icall
++icall:
++	icall pc
++	icall r12
++	icall r5
++	icall r4
++	icall lr
++	icall r3
++	icall r1
++	icall r3
++	.text
++	.global mustr
++mustr:
++	mustr pc
++	mustr r12
++	mustr r5
++	mustr r4
++	mustr lr
++	mustr r1
++	mustr r4
++	mustr r12
++	.text
++	.global musfr
++musfr:
++	musfr pc
++	musfr r12
++	musfr r5
++	musfr r4
++	musfr lr
++	musfr r11
++	musfr r12
++	musfr r2
++	.text
++	.global ret_cond
++ret_cond:
++	reteq pc
++	retal r12
++	retls r5
++	retpl r4
++	retne lr
++	retgt r0
++	retgt r12
++	retge r10
++	.text
++	.global sr_cond
++sr_cond:
++	sreq pc
++	sral r12
++	srls r5
++	srpl r4
++	srne lr
++	srlt r0
++	sral sp
++	srge r9
++	.text
++	.global ld_w3
++ld_w3:
++	ld.w pc,pc[0]
++	ld.w r12,r12[124]
++	ld.w r5,r5[64]
++	ld.w r4,r4[60]
++	ld.w lr,lr[4]
++	ld.w sp,r2[52]
++	ld.w r9,r1[8]
++	ld.w r5,sp[60]
++	.text
++	.global ld_sh3
++ld_sh3:
++	ld.sh pc,pc[0]
++	ld.sh r12,r12[14]
++	ld.sh r5,r5[8]
++	ld.sh r4,r4[6]
++	ld.sh lr,lr[2]
++	ld.sh r4,r2[8]
++	ld.sh sp,lr[10]
++	ld.sh r2,r11[2]
++	.text
++	.global ld_uh3
++ld_uh3:
++	ld.uh pc,pc[0]
++	ld.uh r12,r12[14]
++	ld.uh r5,r5[8]
++	ld.uh r4,r4[6]
++	ld.uh lr,lr[2]
++	ld.uh r10,r0[10]
++	ld.uh r8,r11[8]
++	ld.uh r10,r2[12]
++	.text
++	.global st_w3
++st_w3:
++	st.w pc[0],pc
++	st.w r12[60],r12
++	st.w r5[32],r5
++	st.w r4[28],r4
++	st.w lr[4],lr
++	st.w r7[44],r11
++	st.w r2[24],r6
++	st.w r4[12],r9
++	.text
++	.global st_h3
++st_h3:
++	st.h pc[0],pc
++	st.h r12[14],r12
++	st.h r5[8],r5
++	st.h r4[6],r4
++	st.h lr[2],lr
++	st.h lr[10],r12
++	st.h r6[4],r0
++	st.h r5[12],sp
++	.text
++	.global st_b3
++st_b3:
++	st.b pc[0],pc
++	st.b r12[7],r12
++	st.b r5[4],r5
++	st.b r4[3],r4
++	st.b lr[1],lr
++	st.b r12[6],r9
++	st.b r2[3],lr
++	st.b r1[3],r11
++	.text
++	.global ldd
++ldd:
++	ld.d r0,pc
++	ld.d r14,r12
++	ld.d r8,r5
++	ld.d r6,r4
++	ld.d r2,lr
++	ld.d r14,r7
++	ld.d r4,r4
++	ld.d r14,pc
++	.text
++	.global ldd_postinc
++ldd_postinc:
++	ld.d r0,pc++
++	ld.d r14,r12++
++	ld.d r8,r5++
++	ld.d r6,r4++
++	ld.d r2,lr++
++	ld.d r14,r5++
++	ld.d r12,r11++
++	ld.d r2,r12++
++	.text
++	.global ldd_predec
++ldd_predec:
++	ld.d r0,--pc
++	ld.d r14,--r12
++	ld.d r8,--r5
++	ld.d r6,--r4
++	ld.d r2,--lr
++	ld.d r8,--r0
++	ld.d r10,--pc
++	ld.d r2,--r4
++	.text
++	.global std
++std:
++	st.d pc,r0
++	st.d r12,r14
++	st.d r5,r8
++	st.d r4,r6
++	st.d lr,r2
++	st.d r0,r12
++	st.d sp,r4
++	st.d r12,r12
++	.text
++	.global std_postinc
++std_postinc:
++	st.d pc++,r0
++	st.d r12++,r14
++	st.d r5++,r8
++	st.d r4++,r6
++	st.d lr++,r2
++	st.d sp++,r6
++	st.d r10++,r6
++	st.d r7++,r2
++	.text
++	.global std_predec
++std_predec:
++	st.d --pc,r0
++	st.d --r12,r14
++	st.d --r5,r8
++	st.d --r4,r6
++	st.d --lr,r2
++	st.d --r3,r6
++	st.d --lr,r2
++	st.d --r0,r4
++	.text
++	.global mul
++mul:
++	mul pc,pc
++	mul r12,r12
++	mul r5,r5
++	mul r4,r4
++	mul lr,lr
++	mul r10,lr
++	mul r0,r8
++	mul r8,r5
++	.text
++	.global asr_imm5
++asr_imm5:
++	asr pc,0
++	asr r12,31
++	asr r5,16
++	asr r4,15
++	asr lr,1
++	asr r6,23
++	asr r6,18
++	asr r5,8
++	.text
++	.global lsl_imm5
++lsl_imm5:
++	lsl pc,0
++	lsl r12,31
++	lsl r5,16
++	lsl r4,15
++	lsl lr,1
++	lsl r12,13
++	lsl r6,16
++	lsl r1,25
++	.text
++	.global lsr_imm5
++lsr_imm5:
++	lsr pc,0
++	lsr r12,31
++	lsr r5,16
++	lsr r4,15
++	lsr lr,1
++	lsr r0,1
++	lsr r8,10
++	lsr r7,26
++	.text
++	.global sbr
++sbr:
++	sbr pc,0
++	sbr r12,31
++	sbr r5,16
++	sbr r4,15
++	sbr lr,1
++	sbr r8,31
++	sbr r6,22
++	sbr r1,23
++	.text
++	.global cbr
++cbr:
++	cbr pc,0
++	cbr r12,31
++	cbr r5,16
++	cbr r4,15
++	cbr lr,1
++	cbr r12,10
++	cbr r7,22
++	cbr r8,9
++	.text
++	.global brc1
++brc1:
++	breq 0
++	brpl -2
++	brge -256
++	brcs 254
++	brne 2
++	brcs 230
++	breq -18
++	breq 12
++	.text
++	.global rjmp
++rjmp:
++	rjmp 0
++	rjmp -2
++	rjmp -1024
++	rjmp 1022
++	rjmp 2
++	rjmp -962
++	rjmp 14
++	rjmp -516
++	.text
++	.global rcall1
++rcall1:
++	rcall 0
++	rcall -2
++	rcall -1024
++	rcall 1022
++	rcall 2
++	rcall 216
++	rcall -530
++	rcall -972
++	.text
++	.global acall
++acall:
++	acall 0
++	acall 1020
++	acall 512
++	acall 508
++	acall 4
++	acall 356
++	acall 304
++	acall 172
++	.text
++	.global scall
++scall:
++	scall
++	scall
++	scall
++	scall
++	scall
++	scall
++	scall
++	scall
++	.text
++	.global popm
++popm:
++	/* popm with no argument fails currently */
++	popm pc
++	popm r0-r11,pc,r12=-1
++	popm lr
++	popm r0-r11,pc,r12=1
++	popm r0-r3
++	popm r4-r10,pc
++	popm r0-r3,r11,pc,r12=0
++	popm r0-r7,r10-r12,lr
++	.text
++	.global pushm
++pushm:
++	pushm pc
++	pushm r0-r12,lr,pc
++	pushm pc
++	pushm r0-r12,lr
++	pushm r0-r3
++	pushm r8-r10,lr,pc
++	pushm r0-r3,r10
++	pushm r8-r9,r12
++	.text
++	.global popm_n
++popm_n:
++	popm pc
++	popm r0-r11,pc,r12=-1
++	popm lr
++	popm r0-r11,pc,r12=1
++	popm r0-r3
++	popm r4-r10,pc
++	popm r0-r3,r11,pc,r12=0
++	popm r0-r7,r10-r12,lr
++	.text
++	.global pushm_n
++pushm_n:
++	pushm pc
++	pushm r0-r12,lr,pc
++	pushm pc
++	pushm r0-r12,lr
++	pushm r0-r3
++	pushm r8-r10,lr,pc
++	pushm r0-r3,r10
++	pushm r8-r9,r12
++	.text
++	.global csrfcz
++csrfcz:
++	csrfcz 0
++	csrfcz 31
++	csrfcz 16
++	csrfcz 15
++	csrfcz 1
++	csrfcz 5
++	csrfcz 13
++	csrfcz 23
++	.text
++	.global ssrf
++ssrf:
++	ssrf 0
++	ssrf 31
++	ssrf 16
++	ssrf 15
++	ssrf 1
++	ssrf 29
++	ssrf 13
++	ssrf 13
++	.text
++	.global csrf
++csrf:
++	csrf 0
++	csrf 31
++	csrf 16
++	csrf 15
++	csrf 1
++	csrf 10
++	csrf 15
++	csrf 11
++	.text
++	.global rete
++rete:
++	rete
++	.text
++	.global rets
++rets:
++	rets
++	.text
++	.global retd
++retd:
++	retd
++	.text
++	.global retj
++retj:
++	retj
++	.text
++	.global tlbr
++tlbr:
++	tlbr
++	.text
++	.global tlbs
++tlbs:
++	tlbs
++	.text
++	.global tlbw
++tlbw:
++	tlbw
++	.text
++	.global breakpoint
++breakpoint:
++	breakpoint
++	.text
++	.global incjosp
++incjosp:
++	incjosp 1
++	incjosp 2
++	incjosp 3
++	incjosp 4
++	incjosp -4
++	incjosp -3
++	incjosp -2
++	incjosp -1
++	.text
++	.global nop
++nop:
++	nop
++	.text
++	.global popjc
++popjc:
++	popjc
++	.text
++	.global pushjc
++pushjc:
++	pushjc
++	.text
++	.global add2
++add2:
++	add pc,pc,pc<<0
++	add r12,r12,r12<<3
++	add r5,r5,r5<<2
++	add r4,r4,r4<<1
++	add lr,lr,lr<<1
++	add r0,r12,r0<<1
++	add r9,r12,r4<<0
++	add r12,r12,r7<<2
++	.text
++	.global sub2
++sub2:
++	sub pc,pc,pc<<0
++	sub r12,r12,r12<<3
++	sub r5,r5,r5<<2
++	sub r4,r4,r4<<1
++	sub lr,lr,lr<<1
++	sub sp,r3,r4<<0
++	sub r3,r7,r3<<0
++	sub sp,r10,sp<<1
++	.text
++	.global divu
++divu:
++	divu pc,pc,pc
++	divu r12,r12,r12
++	divu r5,r5,r5
++	divu r4,r4,r4
++	divu lr,lr,lr
++	divu sp,r4,pc
++	divu r5,r5,sp
++	divu r10,sp,r0
++	.text
++	.global addhh_w
++addhh_w:
++	addhh.w pc,pc:b,pc:b
++	addhh.w r12,r12:t,r12:t
++	addhh.w r5,r5:t,r5:t
++	addhh.w r4,r4:b,r4:b
++	addhh.w lr,lr:t,lr:t
++	addhh.w r0,r0:b,r3:b
++	addhh.w lr,r12:t,r7:b
++	addhh.w r3,r10:t,r2:b
++	.text
++	.global subhh_w
++subhh_w:
++	subhh.w pc,pc:b,pc:b
++	subhh.w r12,r12:t,r12:t
++	subhh.w r5,r5:t,r5:t
++	subhh.w r4,r4:b,r4:b
++	subhh.w lr,lr:t,lr:t
++	subhh.w r10,r1:t,r7:b
++	subhh.w pc,r10:t,lr:t
++	subhh.w r3,r0:t,r12:b
++	.text
++	.global adc
++adc:
++	adc pc,pc,pc
++	adc r12,r12,r12
++	adc r5,r5,r5
++	adc r4,r4,r4
++	adc lr,lr,lr
++	adc r4,r0,r7
++	adc sp,r4,r3
++	adc r2,r12,r0
++	.text
++	.global sbc
++sbc:
++	sbc pc,pc,pc
++	sbc r12,r12,r12
++	sbc r5,r5,r5
++	sbc r4,r4,r4
++	sbc lr,lr,lr
++	sbc r6,r7,r9
++	sbc r0,r8,r5
++	sbc r1,r0,r4
++	.text
++	.global mul_2
++mul_2:
++	mul pc,pc,pc
++	mul r12,r12,r12
++	mul r5,r5,r5
++	mul r4,r4,r4
++	mul lr,lr,lr
++	mul pc,r0,r0
++	mul r8,pc,lr
++	mul r4,r12,pc
++	.text
++	.global mac
++mac:
++	mac pc,pc,pc
++	mac r12,r12,r12
++	mac r5,r5,r5
++	mac r4,r4,r4
++	mac lr,lr,lr
++	mac r10,r4,r0
++	mac r7,lr,r0
++	mac r2,r9,r12
++	.text
++	.global mulsd
++mulsd:
++	muls.d pc,pc,pc
++	muls.d r12,r12,r12
++	muls.d r5,r5,r5
++	muls.d r4,r4,r4
++	muls.d lr,lr,lr
++	muls.d r2,r8,lr
++	muls.d r4,r0,r11
++	muls.d r5,lr,r6
++	.text
++	.global macsd
++macsd:
++	macs.d r0,pc,pc
++	macs.d r14,r12,r12
++	macs.d r8,r5,r5
++	macs.d r6,r4,r4
++	macs.d r2,lr,lr
++	macs.d r8,r1,r9
++	macs.d r14,r8,r8
++	macs.d r4,r3,r12
++	.text
++	.global mulud
++mulud:
++	mulu.d r0,pc,pc
++	mulu.d r14,r12,r12
++	mulu.d r8,r5,r5
++	mulu.d r6,r4,r4
++	mulu.d r2,lr,lr
++	mulu.d r6,r5,r0
++	mulu.d r4,r6,r1
++	mulu.d r8,r8,r2
++	.text
++	.global macud
++macud:
++	macu.d r0,pc,pc
++	macu.d r14,r12,r12
++	macu.d r8,r5,r5
++	macu.d r6,r4,r4
++	macu.d r2,lr,lr
++	macu.d r6,sp,r11
++	macu.d r2,r4,r8
++	macu.d r6,r10,r9
++	.text
++	.global asr_1
++asr_1:
++	asr pc,pc,pc
++	asr r12,r12,r12
++	asr r5,r5,r5
++	asr r4,r4,r4
++	asr lr,lr,lr
++	asr pc,r6,pc
++	asr r0,r6,r12
++	asr r4,sp,r0
++	.text
++	.global lsl_1
++lsl_1:
++	lsl pc,pc,pc
++	lsl r12,r12,r12
++	lsl r5,r5,r5
++	lsl r4,r4,r4
++	lsl lr,lr,lr
++	lsl lr,r5,lr
++	lsl r5,pc,r3
++	lsl r1,pc,r9
++	.text
++	.global lsr_1
++lsr_1:
++	lsr pc,pc,pc
++	lsr r12,r12,r12
++	lsr r5,r5,r5
++	lsr r4,r4,r4
++	lsr lr,lr,lr
++	lsr r2,r4,r1
++	lsr r5,r1,r6
++	lsr sp,r6,r7
++	.text
++	.global xchg
++xchg:
++	xchg pc,pc,pc
++	xchg r12,r12,r12
++	xchg r5,r5,r5
++	xchg r4,r4,r4
++	xchg lr,lr,lr
++	xchg lr,r4,sp
++	xchg r1,r5,r12
++	xchg lr,r12,r0
++	.text
++	.global max
++max:
++	max pc,pc,pc
++	max r12,r12,r12
++	max r5,r5,r5
++	max r4,r4,r4
++	max lr,lr,lr
++	max lr,r2,sp
++	max r4,r10,r9
++	max lr,r9,lr
++	.text
++	.global min
++min:
++	min pc,pc,pc
++	min r12,r12,r12
++	min r5,r5,r5
++	min r4,r4,r4
++	min lr,lr,lr
++	min r9,r7,r8
++	min sp,r5,r5
++	min r4,r1,r4
++	.text
++	.global addabs
++addabs:
++	addabs pc,pc,pc
++	addabs r12,r12,r12
++	addabs r5,r5,r5
++	addabs r4,r4,r4
++	addabs lr,lr,lr
++	addabs r7,r10,r0
++	addabs r9,r9,r7
++	addabs r2,r8,r12
++	.text
++	.global mulnhh_w
++mulnhh_w:
++	mulnhh.w pc,pc:b,pc:b
++	mulnhh.w r12,r12:t,r12:t
++	mulnhh.w r5,r5:t,r5:t
++	mulnhh.w r4,r4:b,r4:b
++	mulnhh.w lr,lr:t,lr:t
++	mulnhh.w r11,sp:t,r9:b
++	mulnhh.w sp,r4:b,lr:t
++	mulnhh.w r12,r2:t,r11:b
++	.text
++	.global mulnwh_d
++mulnwh_d:
++	mulnwh.d r0,pc,pc:b
++	mulnwh.d r14,r12,r12:t
++	mulnwh.d r8,r5,r5:t
++	mulnwh.d r6,r4,r4:b
++	mulnwh.d r2,lr,lr:t
++	mulnwh.d r14,r3,r2:t
++	mulnwh.d r4,r5,r9:b
++	mulnwh.d r12,r4,r4:t
++	.text
++	.global machh_w
++machh_w:
++	machh.w pc,pc:b,pc:b
++	machh.w r12,r12:t,r12:t
++	machh.w r5,r5:t,r5:t
++	machh.w r4,r4:b,r4:b
++	machh.w lr,lr:t,lr:t
++	machh.w lr,r5:b,r1:t
++	machh.w r9,r6:b,r7:b
++	machh.w r5,lr:t,r12:b
++	.text
++	.global machh_d
++machh_d:
++	machh.d r0,pc:b,pc:b
++	machh.d r14,r12:t,r12:t
++	machh.d r8,r5:t,r5:t
++	machh.d r6,r4:b,r4:b
++	machh.d r2,lr:t,lr:t
++	machh.d r10,r0:b,r8:b
++	machh.d r14,r4:b,r5:t
++	machh.d r8,r0:b,r4:t
++	.text
++	.global macsathh_w
++macsathh_w:
++	macsathh.w pc,pc:b,pc:b
++	macsathh.w r12,r12:t,r12:t
++	macsathh.w r5,r5:t,r5:t
++	macsathh.w r4,r4:b,r4:b
++	macsathh.w lr,lr:t,lr:t
++	macsathh.w r7,r7:t,pc:t
++	macsathh.w r4,r2:t,r4:b
++	macsathh.w r4,r8:t,r3:t
++	.text
++	.global mulhh_w
++mulhh_w:
++	mulhh.w pc,pc:b,pc:b
++	mulhh.w r12,r12:t,r12:t
++	mulhh.w r5,r5:t,r5:t
++	mulhh.w r4,r4:b,r4:b
++	mulhh.w lr,lr:t,lr:t
++	mulhh.w r7,r4:t,r9:b
++	mulhh.w pc,r3:t,r7:t
++	mulhh.w pc,r4:b,r9:t
++	.text
++	.global mulsathh_h
++mulsathh_h:
++	mulsathh.h pc,pc:b,pc:b
++	mulsathh.h r12,r12:t,r12:t
++	mulsathh.h r5,r5:t,r5:t
++	mulsathh.h r4,r4:b,r4:b
++	mulsathh.h lr,lr:t,lr:t
++	mulsathh.h r3,r1:b,sp:b
++	mulsathh.h r11,lr:t,r11:b
++	mulsathh.h r8,r8:b,r11:t
++	.text
++	.global mulsathh_w
++mulsathh_w:
++	mulsathh.w pc,pc:b,pc:b
++	mulsathh.w r12,r12:t,r12:t
++	mulsathh.w r5,r5:t,r5:t
++	mulsathh.w r4,r4:b,r4:b
++	mulsathh.w lr,lr:t,lr:t
++	mulsathh.w lr,r11:t,r6:b
++	mulsathh.w r6,r6:b,r7:t
++	mulsathh.w r10,r2:b,r3:b
++	.text
++	.global mulsatrndhh_h
++mulsatrndhh_h:
++	mulsatrndhh.h pc,pc:b,pc:b
++	mulsatrndhh.h r12,r12:t,r12:t
++	mulsatrndhh.h r5,r5:t,r5:t
++	mulsatrndhh.h r4,r4:b,r4:b
++	mulsatrndhh.h lr,lr:t,lr:t
++	mulsatrndhh.h r11,r6:b,r9:b
++	mulsatrndhh.h r11,r3:b,r8:t
++	mulsatrndhh.h r5,sp:t,r7:t
++	.text
++	.global mulsatrndwh_w
++mulsatrndwh_w:
++	mulsatrndwh.w pc,pc,pc:b
++	mulsatrndwh.w r12,r12,r12:t
++	mulsatrndwh.w r5,r5,r5:t
++	mulsatrndwh.w r4,r4,r4:b
++	mulsatrndwh.w lr,lr,lr:t
++	mulsatrndwh.w r5,r12,r0:b
++	mulsatrndwh.w r7,r10,pc:b
++	mulsatrndwh.w r10,r8,r5:t
++	.text
++	.global macwh_d
++macwh_d:
++	macwh.d r0,pc,pc:b
++	macwh.d r14,r12,r12:t
++	macwh.d r8,r5,r5:t
++	macwh.d r6,r4,r4:b
++	macwh.d r2,lr,lr:t
++	macwh.d r4,r10,r12:t
++	macwh.d r4,r7,sp:b
++	macwh.d r14,r9,r11:b
++	.text
++	.global mulwh_d
++mulwh_d:
++	mulwh.d r0,pc,pc:b
++	mulwh.d r14,r12,r12:t
++	mulwh.d r8,r5,r5:t
++	mulwh.d r6,r4,r4:b
++	mulwh.d r2,lr,lr:t
++	mulwh.d r12,r5,r1:b
++	mulwh.d r0,r1,r3:t
++	mulwh.d r0,r9,r2:b
++	.text
++	.global mulsatwh_w
++mulsatwh_w:
++	mulsatwh.w pc,pc,pc:b
++	mulsatwh.w r12,r12,r12:t
++	mulsatwh.w r5,r5,r5:t
++	mulsatwh.w r4,r4,r4:b
++	mulsatwh.w lr,lr,lr:t
++	mulsatwh.w r11,pc,r10:t
++	mulsatwh.w sp,r12,r9:t
++	mulsatwh.w r0,r3,r2:t
++	.text
++	.global ldw7
++ldw7:
++	ld.w pc,pc[pc:b<<2]
++	ld.w r12,r12[r12:t<<2]
++	ld.w r5,r5[r5:u<<2]
++	ld.w r4,r4[r4:l<<2]
++	ld.w lr,lr[lr:l<<2]
++	ld.w r9,r10[r6:l<<2]
++	ld.w r2,r10[r10:b<<2]
++	ld.w r11,r5[pc:b<<2]
++	.text
++	.global satadd_w
++satadd_w:
++	satadd.w pc,pc,pc
++	satadd.w r12,r12,r12
++	satadd.w r5,r5,r5
++	satadd.w r4,r4,r4
++	satadd.w lr,lr,lr
++	satadd.w r4,r8,r11
++	satadd.w r3,r12,r6
++	satadd.w r3,lr,r9
++	.text
++	.global satsub_w1
++satsub_w1:
++	satsub.w pc,pc,pc
++	satsub.w r12,r12,r12
++	satsub.w r5,r5,r5
++	satsub.w r4,r4,r4
++	satsub.w lr,lr,lr
++	satsub.w r8,sp,r0
++	satsub.w r9,r8,r4
++	satsub.w pc,lr,r2
++	.text
++	.global satadd_h
++satadd_h:
++	satadd.h pc,pc,pc
++	satadd.h r12,r12,r12
++	satadd.h r5,r5,r5
++	satadd.h r4,r4,r4
++	satadd.h lr,lr,lr
++	satadd.h r7,r3,r9
++	satadd.h r1,r0,r2
++	satadd.h r1,r4,lr
++	.text
++	.global satsub_h
++satsub_h:
++	satsub.h pc,pc,pc
++	satsub.h r12,r12,r12
++	satsub.h r5,r5,r5
++	satsub.h r4,r4,r4
++	satsub.h lr,lr,lr
++	satsub.h lr,lr,r3
++	satsub.h r11,r6,r5
++	satsub.h r3,sp,r0
++	.text
++	.global mul3
++mul3:
++	mul pc,pc,0
++	mul r12,r12,-1
++	mul r5,r5,-128
++	mul r4,r4,127
++	mul lr,lr,1
++	mul r12,r2,-7
++	mul r1,pc,95
++	mul r4,r6,19
++	.text
++	.global rsub2
++rsub2:
++	rsub pc,pc,0
++	rsub r12,r12,-1
++	rsub r5,r5,-128
++	rsub r4,r4,127
++	rsub lr,lr,1
++	rsub r9,lr,96
++	rsub r11,r1,56
++	rsub r0,r7,-87
++	.text
++	.global clz
++clz:
++	clz pc,pc
++	clz r12,r12
++	clz r5,r5
++	clz r4,r4
++	clz lr,lr
++	clz r2,r3
++	clz r5,r11
++	clz pc,r3
++	.text
++	.global cpc1
++cpc1:
++	cpc pc,pc
++	cpc r12,r12
++	cpc r5,r5
++	cpc r4,r4
++	cpc lr,lr
++	cpc pc,r4
++	cpc r5,r9
++	cpc r6,r7
++	.text
++	.global asr3
++asr3:
++	asr pc,pc,0
++	asr r12,r12,31
++	asr r5,r5,16
++	asr r4,r4,15
++	asr lr,lr,1
++	asr r4,r11,19
++	asr sp,pc,26
++	asr r11,sp,8
++	.text
++	.global lsl3
++lsl3:
++	lsl pc,pc,0
++	lsl r12,r12,31
++	lsl r5,r5,16
++	lsl r4,r4,15
++	lsl lr,lr,1
++	lsl r8,r10,17
++	lsl r2,lr,3
++	lsl lr,r11,14
++	.text
++	.global lsr3
++lsr3:
++	lsr pc,pc,0
++	lsr r12,r12,31
++	lsr r5,r5,16
++	lsr r4,r4,15
++	lsr lr,lr,1
++	lsr r4,r3,31
++	lsr pc,r9,14
++	lsr r3,r0,6
++/*	.text
++	.global extract_b
++extract_b:
++	extract.b pc,pc:b
++	extract.b r12,r12:t
++	extract.b r5,r5:u
++	extract.b r4,r4:l
++	extract.b lr,lr:l
++	extract.b r2,r5:l
++	extract.b r12,r3:l
++	extract.b sp,r3:l
++	.text
++	.global insert_b
++insert_b:
++	insert.b pc:b,pc
++	insert.b r12:t,r12
++	insert.b r5:u,r5
++	insert.b r4:l,r4
++	insert.b lr:l,lr
++	insert.b r12:u,r3
++	insert.b r10:l,lr
++	insert.b r11:l,r12
++	.text
++	.global extract_h
++extract_h:
++	extract.h pc,pc:b
++	extract.h r12,r12:t
++	extract.h r5,r5:t
++	extract.h r4,r4:b
++	extract.h lr,lr:t
++	extract.h r11,lr:b
++	extract.h r10,r0:b
++	extract.h r11,r12:b
++	.text
++	.global insert_h
++insert_h:
++	insert.h pc:b,pc
++	insert.h r12:t,r12
++	insert.h r5:t,r5
++	insert.h r4:b,r4
++	insert.h lr:t,lr
++	insert.h r12:t,r11
++	insert.h r7:b,r6
++	insert.h r1:t,r11 */
++	.text
++	.global movc1
++movc1:
++	moveq pc,pc
++	moval r12,r12
++	movls r5,r5
++	movpl r4,r4
++	movne lr,lr
++	movne pc,r11
++	movmi r10,r2
++	movls r8,r12
++	.text
++	.global padd_h
++padd_h:
++	padd.h pc,pc,pc
++	padd.h r12,r12,r12
++	padd.h r5,r5,r5
++	padd.h r4,r4,r4
++	padd.h lr,lr,lr
++	padd.h r8,r2,r7
++	padd.h r0,r0,r3
++	padd.h sp,r11,r6
++	.text
++	.global psub_h
++psub_h:
++	psub.h pc,pc,pc
++	psub.h r12,r12,r12
++	psub.h r5,r5,r5
++	psub.h r4,r4,r4
++	psub.h lr,lr,lr
++	psub.h lr,r6,r8
++	psub.h r0,r1,sp
++	psub.h pc,pc,sp
++	.text
++	.global paddx_h
++paddx_h:
++	paddx.h pc,pc,pc
++	paddx.h r12,r12,r12
++	paddx.h r5,r5,r5
++	paddx.h r4,r4,r4
++	paddx.h lr,lr,lr
++	paddx.h pc,pc,r1
++	paddx.h r10,r4,r5
++	paddx.h r5,pc,r2
++	.text
++	.global psubx_h
++psubx_h:
++	psubx.h pc,pc,pc
++	psubx.h r12,r12,r12
++	psubx.h r5,r5,r5
++	psubx.h r4,r4,r4
++	psubx.h lr,lr,lr
++	psubx.h r5,r12,r5
++	psubx.h r3,r8,r3
++	psubx.h r5,r2,r3
++	.text
++	.global padds_sh
++padds_sh:
++	padds.sh pc,pc,pc
++	padds.sh r12,r12,r12
++	padds.sh r5,r5,r5
++	padds.sh r4,r4,r4
++	padds.sh lr,lr,lr
++	padds.sh r9,lr,r2
++	padds.sh r6,r8,r1
++	padds.sh r6,r4,r10
++	.text
++	.global psubs_sh
++psubs_sh:
++	psubs.sh pc,pc,pc
++	psubs.sh r12,r12,r12
++	psubs.sh r5,r5,r5
++	psubs.sh r4,r4,r4
++	psubs.sh lr,lr,lr
++	psubs.sh r6,lr,r11
++	psubs.sh r2,r12,r4
++	psubs.sh r0,r9,r0
++	.text
++	.global paddxs_sh
++paddxs_sh:
++	paddxs.sh pc,pc,pc
++	paddxs.sh r12,r12,r12
++	paddxs.sh r5,r5,r5
++	paddxs.sh r4,r4,r4
++	paddxs.sh lr,lr,lr
++	paddxs.sh r0,r3,r9
++	paddxs.sh pc,r10,r11
++	paddxs.sh pc,r10,pc
++	.text
++	.global psubxs_sh
++psubxs_sh:
++	psubxs.sh pc,pc,pc
++	psubxs.sh r12,r12,r12
++	psubxs.sh r5,r5,r5
++	psubxs.sh r4,r4,r4
++	psubxs.sh lr,lr,lr
++	psubxs.sh r7,r4,r4
++	psubxs.sh r7,r8,r3
++	psubxs.sh pc,r6,r5
++	.text
++	.global padds_uh
++padds_uh:
++	padds.uh pc,pc,pc
++	padds.uh r12,r12,r12
++	padds.uh r5,r5,r5
++	padds.uh r4,r4,r4
++	padds.uh lr,lr,lr
++	padds.uh r12,r11,r7
++	padds.uh r7,r8,lr
++	padds.uh r6,r9,r7
++	.text
++	.global psubs_uh
++psubs_uh:
++	psubs.uh pc,pc,pc
++	psubs.uh r12,r12,r12
++	psubs.uh r5,r5,r5
++	psubs.uh r4,r4,r4
++	psubs.uh lr,lr,lr
++	psubs.uh lr,r10,r6
++	psubs.uh sp,r2,pc
++	psubs.uh r2,r9,r2
++	.text
++	.global paddxs_uh
++paddxs_uh:
++	paddxs.uh pc,pc,pc
++	paddxs.uh r12,r12,r12
++	paddxs.uh r5,r5,r5
++	paddxs.uh r4,r4,r4
++	paddxs.uh lr,lr,lr
++	paddxs.uh r7,r9,r5
++	paddxs.uh r9,r1,r4
++	paddxs.uh r5,r2,r3
++	.text
++	.global psubxs_uh
++psubxs_uh:
++	psubxs.uh pc,pc,pc
++	psubxs.uh r12,r12,r12
++	psubxs.uh r5,r5,r5
++	psubxs.uh r4,r4,r4
++	psubxs.uh lr,lr,lr
++	psubxs.uh sp,r5,sp
++	psubxs.uh sp,r6,r6
++	psubxs.uh r3,r11,r8
++	.text
++	.global paddh_sh
++paddh_sh:
++	paddh.sh pc,pc,pc
++	paddh.sh r12,r12,r12
++	paddh.sh r5,r5,r5
++	paddh.sh r4,r4,r4
++	paddh.sh lr,lr,lr
++	paddh.sh r12,sp,r3
++	paddh.sh pc,r5,r3
++	paddh.sh r8,r8,sp
++	.text
++	.global psubh_sh
++psubh_sh:
++	psubh.sh pc,pc,pc
++	psubh.sh r12,r12,r12
++	psubh.sh r5,r5,r5
++	psubh.sh r4,r4,r4
++	psubh.sh lr,lr,lr
++	psubh.sh r1,r5,r8
++	psubh.sh r7,r3,r6
++	psubh.sh r4,r3,r3
++	.text
++	.global paddxh_sh
++paddxh_sh:
++	paddxh.sh pc,pc,pc
++	paddxh.sh r12,r12,r12
++	paddxh.sh r5,r5,r5
++	paddxh.sh r4,r4,r4
++	paddxh.sh lr,lr,lr
++	paddxh.sh r6,r0,r4
++	paddxh.sh r9,r8,r9
++	paddxh.sh r3,r0,sp
++	.text
++	.global psubxh_sh
++psubxh_sh:
++	psubxh.sh pc,pc,pc
++	psubxh.sh r12,r12,r12
++	psubxh.sh r5,r5,r5
++	psubxh.sh r4,r4,r4
++	psubxh.sh lr,lr,lr
++	psubxh.sh r4,pc,r12
++	psubxh.sh r8,r4,r6
++	psubxh.sh r12,r9,r4
++	.text
++	.global paddsub_h
++paddsub_h:
++	paddsub.h pc,pc:b,pc:b
++	paddsub.h r12,r12:t,r12:t
++	paddsub.h r5,r5:t,r5:t
++	paddsub.h r4,r4:b,r4:b
++	paddsub.h lr,lr:t,lr:t
++	paddsub.h r5,r2:t,lr:b
++	paddsub.h r7,r1:b,r8:b
++	paddsub.h r6,r10:t,r5:t
++	.text
++	.global psubadd_h
++psubadd_h:
++	psubadd.h pc,pc:b,pc:b
++	psubadd.h r12,r12:t,r12:t
++	psubadd.h r5,r5:t,r5:t
++	psubadd.h r4,r4:b,r4:b
++	psubadd.h lr,lr:t,lr:t
++	psubadd.h r9,r11:t,r8:t
++	psubadd.h r10,r7:t,lr:t
++	psubadd.h r6,pc:t,pc:b
++	.text
++	.global paddsubs_sh
++paddsubs_sh:
++	paddsubs.sh pc,pc:b,pc:b
++	paddsubs.sh r12,r12:t,r12:t
++	paddsubs.sh r5,r5:t,r5:t
++	paddsubs.sh r4,r4:b,r4:b
++	paddsubs.sh lr,lr:t,lr:t
++	paddsubs.sh r0,lr:t,r0:b
++	paddsubs.sh r9,r2:t,r4:t
++	paddsubs.sh r12,r9:t,sp:t
++	.text
++	.global psubadds_sh
++psubadds_sh:
++	psubadds.sh pc,pc:b,pc:b
++	psubadds.sh r12,r12:t,r12:t
++	psubadds.sh r5,r5:t,r5:t
++	psubadds.sh r4,r4:b,r4:b
++	psubadds.sh lr,lr:t,lr:t
++	psubadds.sh pc,lr:b,r1:t
++	psubadds.sh r11,r3:b,r12:b
++	psubadds.sh r10,r2:t,r8:t
++	.text
++	.global paddsubs_uh
++paddsubs_uh:
++	paddsubs.uh pc,pc:b,pc:b
++	paddsubs.uh r12,r12:t,r12:t
++	paddsubs.uh r5,r5:t,r5:t
++	paddsubs.uh r4,r4:b,r4:b
++	paddsubs.uh lr,lr:t,lr:t
++	paddsubs.uh r9,r2:b,r3:b
++	paddsubs.uh sp,sp:b,r7:t
++	paddsubs.uh lr,r0:b,r10:t
++	.text
++	.global psubadds_uh
++psubadds_uh:
++	psubadds.uh pc,pc:b,pc:b
++	psubadds.uh r12,r12:t,r12:t
++	psubadds.uh r5,r5:t,r5:t
++	psubadds.uh r4,r4:b,r4:b
++	psubadds.uh lr,lr:t,lr:t
++	psubadds.uh r12,r9:t,pc:t
++	psubadds.uh r8,r6:b,r8:b
++	psubadds.uh r8,r8:b,r4:b
++	.text
++	.global paddsubh_sh
++paddsubh_sh:
++	paddsubh.sh pc,pc:b,pc:b
++	paddsubh.sh r12,r12:t,r12:t
++	paddsubh.sh r5,r5:t,r5:t
++	paddsubh.sh r4,r4:b,r4:b
++	paddsubh.sh lr,lr:t,lr:t
++	paddsubh.sh r8,r9:t,r9:b
++	paddsubh.sh r0,sp:t,r1:t
++	paddsubh.sh r3,r1:b,r0:t
++	.text
++	.global psubaddh_sh
++psubaddh_sh:
++	psubaddh.sh pc,pc:b,pc:b
++	psubaddh.sh r12,r12:t,r12:t
++	psubaddh.sh r5,r5:t,r5:t
++	psubaddh.sh r4,r4:b,r4:b
++	psubaddh.sh lr,lr:t,lr:t
++	psubaddh.sh r7,r3:t,r10:b
++	psubaddh.sh r7,r2:t,r1:t
++	psubaddh.sh r11,r3:b,r6:b
++	.text
++	.global padd_b
++padd_b:
++	padd.b pc,pc,pc
++	padd.b r12,r12,r12
++	padd.b r5,r5,r5
++	padd.b r4,r4,r4
++	padd.b lr,lr,lr
++	padd.b r2,r6,pc
++	padd.b r8,r9,r12
++	padd.b r5,r12,r3
++	.text
++	.global psub_b
++psub_b:
++	psub.b pc,pc,pc
++	psub.b r12,r12,r12
++	psub.b r5,r5,r5
++	psub.b r4,r4,r4
++	psub.b lr,lr,lr
++	psub.b r0,r12,pc
++	psub.b r7,sp,r10
++	psub.b r5,sp,r12
++	.text
++	.global padds_sb
++padds_sb:
++	padds.sb pc,pc,pc
++	padds.sb r12,r12,r12
++	padds.sb r5,r5,r5
++	padds.sb r4,r4,r4
++	padds.sb lr,lr,lr
++	padds.sb sp,r11,r4
++	padds.sb r11,r10,r11
++	padds.sb r5,r12,r6
++	.text
++	.global psubs_sb
++psubs_sb:
++	psubs.sb pc,pc,pc
++	psubs.sb r12,r12,r12
++	psubs.sb r5,r5,r5
++	psubs.sb r4,r4,r4
++	psubs.sb lr,lr,lr
++	psubs.sb r7,r6,r8
++	psubs.sb r12,r10,r9
++	psubs.sb pc,r11,r0
++	.text
++	.global padds_ub
++padds_ub:
++	padds.ub pc,pc,pc
++	padds.ub r12,r12,r12
++	padds.ub r5,r5,r5
++	padds.ub r4,r4,r4
++	padds.ub lr,lr,lr
++	padds.ub r3,r2,r11
++	padds.ub r10,r8,r1
++	padds.ub r11,r8,r10
++	.text
++	.global psubs_ub
++psubs_ub:
++	psubs.ub pc,pc,pc
++	psubs.ub r12,r12,r12
++	psubs.ub r5,r5,r5
++	psubs.ub r4,r4,r4
++	psubs.ub lr,lr,lr
++	psubs.ub r0,r2,r7
++	psubs.ub lr,r5,r3
++	psubs.ub r6,r7,r9
++	.text
++	.global paddh_ub
++paddh_ub:
++	paddh.ub pc,pc,pc
++	paddh.ub r12,r12,r12
++	paddh.ub r5,r5,r5
++	paddh.ub r4,r4,r4
++	paddh.ub lr,lr,lr
++	paddh.ub lr,r1,r0
++	paddh.ub r2,r7,r7
++	paddh.ub r2,r1,r2
++	.text
++	.global psubh_ub
++psubh_ub:
++	psubh.ub pc,pc,pc
++	psubh.ub r12,r12,r12
++	psubh.ub r5,r5,r5
++	psubh.ub r4,r4,r4
++	psubh.ub lr,lr,lr
++	psubh.ub r0,r1,r6
++	psubh.ub r4,lr,r10
++	psubh.ub r9,r8,r1
++	.text
++	.global pmax_ub
++pmax_ub:
++	pmax.ub pc,pc,pc
++	pmax.ub r12,r12,r12
++	pmax.ub r5,r5,r5
++	pmax.ub r4,r4,r4
++	pmax.ub lr,lr,lr
++	pmax.ub pc,r2,r11
++	pmax.ub r12,r1,r1
++	pmax.ub r5,r2,r0
++	.text
++	.global pmax_sh
++pmax_sh:
++	pmax.sh pc,pc,pc
++	pmax.sh r12,r12,r12
++	pmax.sh r5,r5,r5
++	pmax.sh r4,r4,r4
++	pmax.sh lr,lr,lr
++	pmax.sh lr,r6,r12
++	pmax.sh r2,pc,r5
++	pmax.sh pc,r2,r7
++	.text
++	.global pmin_ub
++pmin_ub:
++	pmin.ub pc,pc,pc
++	pmin.ub r12,r12,r12
++	pmin.ub r5,r5,r5
++	pmin.ub r4,r4,r4
++	pmin.ub lr,lr,lr
++	pmin.ub r8,r1,r5
++	pmin.ub r1,r8,r3
++	pmin.ub r0,r2,r7
++	.text
++	.global pmin_sh
++pmin_sh:
++	pmin.sh pc,pc,pc
++	pmin.sh r12,r12,r12
++	pmin.sh r5,r5,r5
++	pmin.sh r4,r4,r4
++	pmin.sh lr,lr,lr
++	pmin.sh r8,r4,r10
++	pmin.sh lr,r10,r12
++	pmin.sh r2,r6,r2
++	.text
++	.global pavg_ub
++pavg_ub:
++	pavg.ub pc,pc,pc
++	pavg.ub r12,r12,r12
++	pavg.ub r5,r5,r5
++	pavg.ub r4,r4,r4
++	pavg.ub lr,lr,lr
++	pavg.ub r0,r1,r6
++	pavg.ub r8,r3,r6
++	pavg.ub pc,r12,r10
++	.text
++	.global pavg_sh
++pavg_sh:
++	pavg.sh pc,pc,pc
++	pavg.sh r12,r12,r12
++	pavg.sh r5,r5,r5
++	pavg.sh r4,r4,r4
++	pavg.sh lr,lr,lr
++	pavg.sh r9,pc,sp
++	pavg.sh pc,sp,r3
++	pavg.sh r6,r1,r9
++	.text
++	.global pabs_sb
++pabs_sb:
++	pabs.sb pc,pc
++	pabs.sb r12,r12
++	pabs.sb r5,r5
++	pabs.sb r4,r4
++	pabs.sb lr,lr
++	pabs.sb r11,r6
++	pabs.sb lr,r9
++	pabs.sb sp,r7
++	.text
++	.global pabs_sh
++pabs_sh:
++	pabs.sh pc,pc
++	pabs.sh r12,r12
++	pabs.sh r5,r5
++	pabs.sh r4,r4
++	pabs.sh lr,lr
++	pabs.sh pc,r3
++	pabs.sh r5,r7
++	pabs.sh r4,r0
++	.text
++	.global psad
++psad:
++	psad pc,pc,pc
++	psad r12,r12,r12
++	psad r5,r5,r5
++	psad r4,r4,r4
++	psad lr,lr,lr
++	psad r9,r11,r11
++	psad lr,r4,sp
++	psad lr,r4,r5
++	.text
++	.global pasr_b
++pasr_b:
++	pasr.b pc,pc,0
++	pasr.b r12,r12,7
++	pasr.b r5,r5,4
++	pasr.b r4,r4,3
++	pasr.b lr,lr,1
++	pasr.b pc,r7,1
++	pasr.b sp,lr,6
++	pasr.b sp,r3,2
++	.text
++	.global plsl_b
++plsl_b:
++	plsl.b pc,pc,0
++	plsl.b r12,r12,7
++	plsl.b r5,r5,4
++	plsl.b r4,r4,3
++	plsl.b lr,lr,1
++	plsl.b r2,r11,4
++	plsl.b r8,r5,7
++	plsl.b pc,r0,2
++	.text
++	.global plsr_b
++plsr_b:
++	plsr.b pc,pc,0
++	plsr.b r12,r12,7
++	plsr.b r5,r5,4
++	plsr.b r4,r4,3
++	plsr.b lr,lr,1
++	plsr.b r12,r1,2
++	plsr.b r6,pc,7
++	plsr.b r12,r11,2
++	.text
++	.global pasr_h
++pasr_h:
++	pasr.h pc,pc,0
++	pasr.h r12,r12,15
++	pasr.h r5,r5,8
++	pasr.h r4,r4,7
++	pasr.h lr,lr,1
++	pasr.h r0,r11,10
++	pasr.h r4,r6,8
++	pasr.h r6,r2,4
++	.text
++	.global plsl_h
++plsl_h:
++	plsl.h pc,pc,0
++	plsl.h r12,r12,15
++	plsl.h r5,r5,8
++	plsl.h r4,r4,7
++	plsl.h lr,lr,1
++	plsl.h r5,r10,9
++	plsl.h sp,lr,8
++	plsl.h r0,lr,7
++	.text
++	.global plsr_h
++plsr_h:
++	plsr.h pc,pc,0
++	plsr.h r12,r12,15
++	plsr.h r5,r5,8
++	plsr.h r4,r4,7
++	plsr.h lr,lr,1
++	plsr.h r11,r0,15
++	plsr.h lr,r3,3
++	plsr.h r8,lr,10
++	.text
++	.global packw_sh
++packw_sh:
++	packw.sh pc,pc,pc
++	packw.sh r12,r12,r12
++	packw.sh r5,r5,r5
++	packw.sh r4,r4,r4
++	packw.sh lr,lr,lr
++	packw.sh sp,r11,r10
++	packw.sh r8,r2,r12
++	packw.sh r8,r1,r5
++	.text
++	.global punpckub_h
++punpckub_h:
++	punpckub.h pc,pc:b
++	punpckub.h r12,r12:t
++	punpckub.h r5,r5:t
++	punpckub.h r4,r4:b
++	punpckub.h lr,lr:t
++	punpckub.h r6,r1:t
++	punpckub.h lr,r5:b
++	punpckub.h lr,r2:t
++	.text
++	.global punpcksb_h
++punpcksb_h:
++	punpcksb.h pc,pc:b
++	punpcksb.h r12,r12:t
++	punpcksb.h r5,r5:t
++	punpcksb.h r4,r4:b
++	punpcksb.h lr,lr:t
++	punpcksb.h r4,r7:t
++	punpcksb.h r6,lr:b
++	punpcksb.h r12,r12:t
++	.text
++	.global packsh_ub
++packsh_ub:
++	packsh.ub pc,pc,pc
++	packsh.ub r12,r12,r12
++	packsh.ub r5,r5,r5
++	packsh.ub r4,r4,r4
++	packsh.ub lr,lr,lr
++	packsh.ub r3,r6,r3
++	packsh.ub r8,r0,r3
++	packsh.ub r9,r3,lr
++	.text
++	.global packsh_sb
++packsh_sb:
++	packsh.sb pc,pc,pc
++	packsh.sb r12,r12,r12
++	packsh.sb r5,r5,r5
++	packsh.sb r4,r4,r4
++	packsh.sb lr,lr,lr
++	packsh.sb r6,r8,r1
++	packsh.sb lr,r9,r8
++	packsh.sb sp,r6,r6
++	.text
++	.global andl
++andl:
++	andl pc,0
++	andl r12,65535
++	andl r5,32768
++	andl r4,32767
++	andl lr,1
++	andl pc,23128
++	andl r8,47262
++	andl r7,13719
++	.text
++	.global andl_coh
++andl_coh:
++	andl pc,0,COH
++	andl r12,65535,COH
++	andl r5,32768,COH
++	andl r4,32767,COH
++	andl lr,1,COH
++	andl r6,22753,COH
++	andl r0,40653,COH
++	andl r4,48580,COH
++	.text
++	.global andh
++andh:
++	andh pc,0
++	andh r12,65535
++	andh r5,32768
++	andh r4,32767
++	andh lr,1
++	andh r12,52312
++	andh r3,8675
++	andh r2,42987
++	.text
++	.global andh_coh
++andh_coh:
++	andh pc,0,COH
++	andh r12,65535,COH
++	andh r5,32768,COH
++	andh r4,32767,COH
++	andh lr,1,COH
++	andh r11,34317,COH
++	andh r8,52982,COH
++	andh r10,23683,COH
++	.text
++	.global orl
++orl:
++	orl pc,0
++	orl r12,65535
++	orl r5,32768
++	orl r4,32767
++	orl lr,1
++	orl sp,16766
++	orl r0,21181
++	orl pc,44103
++	.text
++	.global orh
++orh:
++	orh pc,0
++	orh r12,65535
++	orh r5,32768
++	orh r4,32767
++	orh lr,1
++	orh r8,28285
++	orh r12,30492
++	orh r1,59930
++	.text
++	.global eorl
++eorl:
++	eorl pc,0
++	eorl r12,65535
++	eorl r5,32768
++	eorl r4,32767
++	eorl lr,1
++	eorl r4,51129
++	eorl r6,64477
++	eorl r1,20913
++	.text
++	.global eorh
++eorh:
++	eorh pc,0
++	eorh r12,65535
++	eorh r5,32768
++	eorh r4,32767
++	eorh lr,1
++	eorh r0,11732
++	eorh r10,38069
++	eorh r9,57130
++	.text
++	.global mcall
++mcall:
++	mcall pc[0]
++	mcall r12[-4]
++	mcall r5[-131072]
++	mcall r4[131068]
++	mcall lr[4]
++	mcall sp[61180]
++	mcall r4[-35000]
++	mcall r0[9924]
++	.text
++	.global pref
++pref:
++	pref pc[0]
++	pref r12[-1]
++	pref r5[-32768]
++	pref r4[32767]
++	pref lr[1]
++	pref r7[7748]
++	pref r7[-7699]
++	pref r2[-25892]
++	.text
++	.global cache
++cache:
++	cache pc[0],0
++	cache r12[-1],31
++	cache r5[-1024],16
++	cache r4[1023],15
++	cache lr[1],1
++	cache r3[-964],17
++	cache r4[-375],22
++	cache r3[-888],17
++	.text
++	.global sub4
++sub4:
++	sub pc,0
++	sub r12,-1
++	sub r5,-1048576
++	sub r4,1048575
++	sub lr,1
++	sub r2,-619156
++	sub lr,461517
++	sub r8,-185051
++	.text
++	.global cp3
++cp3:
++	cp pc,0
++	cp r12,-1
++	cp r5,-1048576
++	cp r4,1048575
++	cp lr,1
++	cp r1,124078
++	cp r0,-378909
++	cp r4,-243180
++	.text
++	.global mov2
++mov2:
++	mov pc,0
++	mov r12,-1
++	mov r5,-1048576
++	mov r4,1048575
++	mov lr,1
++	mov r5,-317021
++	mov sp,-749164
++	mov r5,940179
++	.text
++	.global brc2
++brc2:
++	breq 0
++	bral -2
++	brls -2097152
++	brpl 2097150
++	brne 2
++	brhi -1796966
++	brqs 1321368
++	brls -577434
++	.text
++	.global rcall2
++rcall2:
++	rcall 0
++	rcall -2
++	rcall -2097152
++	rcall 2097150
++	rcall 2
++	rcall 496820
++	rcall 1085092
++	rcall -1058
++	.text
++	.global sub5
++sub5:
++	sub pc,pc,0
++	sub r12,r12,-1
++	sub r5,r5,-32768
++	sub r4,r4,32767
++	sub lr,lr,1
++	sub pc,pc,-12744
++	sub r7,r7,-27365
++	sub r2,r9,-17358
++	.text
++	.global satsub_w2
++satsub_w2:
++	satsub.w pc,pc,0
++	satsub.w r12,r12,-1
++	satsub.w r5,r5,-32768
++	satsub.w r4,r4,32767
++	satsub.w lr,lr,1
++	satsub.w r2,lr,-2007
++	satsub.w r7,r12,-784
++	satsub.w r4,r7,23180
++	.text
++	.global ld_d4
++ld_d4:
++	ld.d r0,pc[0]
++	ld.d r14,r12[-1]
++	ld.d r8,r5[-32768]
++	ld.d r6,r4[32767]
++	ld.d r2,lr[1]
++	ld.d r14,r11[14784]
++	ld.d r6,r9[-18905]
++	ld.d r2,r3[-6355]
++	.text
++	.global ld_w4
++ld_w4:
++	ld.w pc,pc[0]
++	ld.w r12,r12[-1]
++	ld.w r5,r5[-32768]
++	ld.w r4,r4[32767]
++	ld.w lr,lr[1]
++	ld.w r0,r12[-22133]
++	ld.w sp,pc[-20521]
++	/* ld.w r3,r5[29035] */
++	nop
++	.text
++	.global ld_sh4
++ld_sh4:
++	ld.sh pc,pc[0]
++	ld.sh r12,r12[-1]
++	ld.sh r5,r5[-32768]
++	ld.sh r4,r4[32767]
++	ld.sh lr,lr[1]
++	ld.sh r6,r10[30930]
++	ld.sh r6,r10[21973]
++	/* ld.sh r11,r10[-2058] */
++	nop
++	.text
++	.global ld_uh4
++ld_uh4:
++	ld.uh pc,pc[0]
++	ld.uh r12,r12[-1]
++	ld.uh r5,r5[-32768]
++	ld.uh r4,r4[32767]
++	ld.uh lr,lr[1]
++	ld.uh r1,r9[-13354]
++	ld.uh lr,r11[21337]
++	/* ld.uh r2,lr[-25370] */
++	nop
++	.text
++	.global ld_sb1
++ld_sb1:
++	ld.sb pc,pc[0]
++	ld.sb r12,r12[-1]
++	ld.sb r5,r5[-32768]
++	ld.sb r4,r4[32767]
++	ld.sb lr,lr[1]
++	ld.sb r7,sp[-28663]
++	ld.sb r2,r1[-5879]
++	ld.sb r12,r3[18734]
++	.text
++	.global ld_ub4
++ld_ub4:
++	ld.ub pc,pc[0]
++	ld.ub r12,r12[-1]
++	ld.ub r5,r5[-32768]
++	ld.ub r4,r4[32767]
++	ld.ub lr,lr[1]
++	ld.ub pc,r4[8277]
++	ld.ub r5,r12[19172]
++	ld.ub r10,lr[26347]
++	.text
++	.global st_d4
++st_d4:
++	st.d pc[0],r0
++	st.d r12[-1],r14
++	st.d r5[-32768],r8
++	st.d r4[32767],r6
++	st.d lr[1],r2
++	st.d r5[13200],r10
++	st.d r5[9352],r10
++	st.d r5[32373],r4
++	.text
++	.global st_w4
++st_w4:
++	st.w pc[0],pc
++	st.w r12[-1],r12
++	st.w r5[-32768],r5
++	st.w r4[32767],r4
++	st.w lr[1],lr
++	st.w sp[6136],r7
++	st.w r6[27087],r12
++	/* st.w r3[20143],r7 */
++	nop
++	.text
++	.global st_h4
++st_h4:
++	st.h pc[0],pc
++	st.h r12[-1],r12
++	st.h r5[-32768],r5
++	st.h r4[32767],r4
++	st.h lr[1],lr
++	st.h r4[-9962],r7
++	st.h r9[-16250],r3
++	/* st.h r8[-28810],r7 */
++	nop
++	.text
++	.global st_b4
++st_b4:
++	st.b pc[0],pc
++	st.b r12[-1],r12
++	st.b r5[-32768],r5
++	st.b r4[32767],r4
++	st.b lr[1],lr
++	st.b r12[30102],r6
++	st.b r5[28977],r1
++	st.b r0[5470],r1
++	.text
++	.global mfsr
++mfsr:
++	mfsr pc,0
++	mfsr r12,1020
++	mfsr r5,512
++	mfsr r4,508
++	mfsr lr,4
++	mfsr r2,696
++	mfsr r4,260
++	mfsr r10,1016
++	.text
++	.global mtsr
++mtsr:
++	mtsr 0,pc
++	mtsr 1020,r12
++	mtsr 512,r5
++	mtsr 508,r4
++	mtsr 4,lr
++	mtsr 224,r10
++	mtsr 836,r12
++	mtsr 304,r9
++	.text
++	.global mfdr
++mfdr:
++	mfdr pc,0
++	mfdr r12,1020
++	mfdr r5,512
++	mfdr r4,508
++	mfdr lr,4
++	mfdr r6,932
++	mfdr r5,36
++	mfdr r9,300
++	.text
++	.global mtdr
++mtdr:
++	mtdr 0,pc
++	mtdr 1020,r12
++	mtdr 512,r5
++	mtdr 508,r4
++	mtdr 4,lr
++	mtdr 180,r8
++	mtdr 720,r10
++	mtdr 408,lr
++	.text
++	.global sleep
++sleep:
++	sleep 0
++	sleep 255
++	sleep 128
++	sleep 127
++	sleep 1
++	sleep 254
++	sleep 15
++	sleep 43
++	.text
++	.global sync
++sync:
++	sync 0
++	sync 255
++	sync 128
++	sync 127
++	sync 1
++	sync 166
++	sync 230
++	sync 180
++	.text
++	.global bld
++bld:
++	bld pc,0
++	bld r12,31
++	bld r5,16
++	bld r4,15
++	bld lr,1
++	bld r9,15
++	bld r0,4
++	bld lr,26
++	.text
++	.global bst
++bst:
++	bst pc,0
++	bst r12,31
++	bst r5,16
++	bst r4,15
++	bst lr,1
++	bst r10,28
++	bst r0,3
++	bst sp,2
++	.text
++	.global sats
++sats:
++	sats pc>>0,0
++	sats r12>>31,31
++	sats r5>>16,16
++	sats r4>>15,15
++	sats lr>>1,1
++	sats r10>>3,19
++	sats r10>>2,26
++	sats r1>>20,1
++	.text
++	.global satu
++satu:
++	satu pc>>0,0
++	satu r12>>31,31
++	satu r5>>16,16
++	satu r4>>15,15
++	satu lr>>1,1
++	satu pc>>5,7
++	satu r7>>5,5
++	satu r2>>26,19
++	.text
++	.global satrnds
++satrnds:
++	satrnds pc>>0,0
++	satrnds r12>>31,31
++	satrnds r5>>16,16
++	satrnds r4>>15,15
++	satrnds lr>>1,1
++	satrnds r0>>21,19
++	satrnds sp>>0,2
++	satrnds r7>>6,29
++	.text
++	.global satrndu
++satrndu:
++	satrndu pc>>0,0
++	satrndu r12>>31,31
++	satrndu r5>>16,16
++	satrndu r4>>15,15
++	satrndu lr>>1,1
++	satrndu r12>>0,26
++	satrndu r4>>21,3
++	satrndu r10>>3,16
++	.text
++	.global subfc
++subfc:
++	subfeq pc,0
++	subfal r12,-1
++	subfls r5,-128
++	subfpl r4,127
++	subfne lr,1
++	subfls r10,8
++	subfvc r11,99
++	subfvs r2,73
++	.text
++	.global subc
++subc:
++	subeq pc,0
++	subal r12,-1
++	subls r5,-128
++	subpl r4,127
++	subne lr,1
++	subls r12,118
++	subvc lr,-12
++	submi r4,-13
++	.text
++	.global movc2
++movc2:
++	moveq pc,0
++	moval r12,-1
++	movls r5,-128
++	movpl r4,127
++	movne lr,1
++	movlt r3,-122
++	movvc r8,2
++	movne r7,-111
++	.text
++	.global cp_b
++cp_b:
++	cp.b pc,r0
++	cp.b r0,pc
++	cp.b r7,r8
++	cp.b r8,r7
++	.text
++	.global cp_h
++cp_h:
++	cp.h pc,r0
++	cp.h r0,pc
++	cp.h r7,r8
++	cp.h r8,r7
++	.text
++	.global ldm
++ldm:
++	ldm pc,r1-r6
++	ldm r12,r0-r15
++	ldm r5,r15
++	ldm r4,r0-r14
++	ldm lr,r0
++	ldm r9,r1,r5,r14
++	ldm r11,r2-r3,r5-r8,r15
++	ldm r6,r0,r3,r9,r13,r15
++	.text
++	.global ldm_pu
++ldm_pu:
++	ldm pc++,r6-r9
++	ldm r12++,r0-r15
++	ldm r5++,r15
++	ldm r4++,r0-r14
++	ldm lr++,r0
++	ldm r12++,r3-r5,r8,r10,r12,r14-r15
++	ldm r10++,r2,r4-r6,r14-r15
++	ldm r6++,r1,r3-r4,r9-r14
++	.text
++	.global ldmts
++ldmts:
++	ldmts pc,r7-r8
++	ldmts r12,r0-r15
++	ldmts r5,r15
++	ldmts r4,r0-r14
++	ldmts lr,r0
++	ldmts r0,r1-r2,r11-r12
++	ldmts lr,r0-r2,r4,r7-r8,r13-r14
++	ldmts r12,r0-r1,r3-r5,r9,r14-r15
++	.text
++	.global ldmts_pu
++ldmts_pu:
++	ldmts pc++,r9
++	ldmts r12++,r0-r15
++	ldmts r5++,r15
++	ldmts r4++,r0-r14
++	ldmts lr++,r0
++	ldmts sp++,r0,r2-r5,r7,r9,r11
++	ldmts r5++,r1-r3,r7,r10-r11
++	ldmts r8++,r2-r4,r7-r8,r13,r15
++	.text
++	.global stm
++stm:
++	stm pc,r7
++	stm r12,r0-r15
++	stm r5,r15
++	stm r4,r0-r14
++	stm lr,r0
++	stm sp,r2-r3,r5,r8,r11,r14
++	stm r4,r0-r4,r6,r10-r11,r14
++	stm r9,r1,r5,r9,r12-r15
++	.text
++	.global stm_pu
++stm_pu:
++	stm --pc,r4-r6
++	stm --r12,r0-r15
++	stm --r5,r15
++	stm --r4,r0-r14
++	stm --lr,r0
++	stm --r11,r0,r4-r9,r11-r15
++	stm --r11,r0,r3,r9-r10,r12,r14
++	stm --r6,r2,r8-r9,r13-r14
++	.text
++	.global stmts
++stmts:
++	stmts pc,r8
++	stmts r12,r0-r15
++	stmts r5,r15
++	stmts r4,r0-r14
++	stmts lr,r0
++	stmts r1,r0-r1,r3-r4,r6,r9-r10,r14-r15
++	stmts r3,r0,r6-r8,r10-r12
++	stmts r11,r0,r4,r6-r7,r9-r10,r12,r14-r15
++	.text
++	.global stmts_pu
++stmts_pu:
++	stmts --pc,r6-r8
++	stmts --r12,r0-r15
++	stmts --r5,r15
++	stmts --r4,r0-r14
++	stmts --lr,r0
++	stmts --r2,r0,r3-r4,r9-r10,r12-r13
++	stmts --r3,r0-r1,r14-r15
++	stmts --r0,r0,r2-r6,r10,r14
++	.text
++	.global ldins_h
++ldins_h:
++	ldins.h pc:b,pc[0]
++	ldins.h r12:t,r12[-2]
++	ldins.h r5:t,r5[-4096]
++	ldins.h r4:b,r4[4094]
++	ldins.h lr:t,lr[2]
++	ldins.h r0:t,lr[1930]
++	ldins.h r3:b,r7[-534]
++	ldins.h r2:b,r12[-2252]
++	.text
++	.global ldins_b
++ldins_b:
++	ldins.b pc:b,pc[0]
++	ldins.b r12:t,r12[-1]
++	ldins.b r5:u,r5[-2048]
++	ldins.b r4:l,r4[2047]
++	ldins.b lr:l,lr[1]
++	ldins.b r6:t,r4[-662]
++	ldins.b r5:b,r1[-151]
++	ldins.b r10:t,r11[-1923]
++	.text
++	.global ldswp_sh
++ldswp_sh:
++	ldswp.sh pc,pc[0]
++	ldswp.sh r12,r12[-2]
++	ldswp.sh r5,r5[-4096]
++	ldswp.sh r4,r4[4094]
++	ldswp.sh lr,lr[2]
++	ldswp.sh r9,r10[3848]
++	ldswp.sh r4,r12[-2040]
++	ldswp.sh r10,r2[3088]
++	.text
++	.global ldswp_uh
++ldswp_uh:
++	ldswp.uh pc,pc[0]
++	ldswp.uh r12,r12[-2]
++	ldswp.uh r5,r5[-4096]
++	ldswp.uh r4,r4[4094]
++	ldswp.uh lr,lr[2]
++	ldswp.uh r4,r9[3724]
++	ldswp.uh lr,sp[-1672]
++	ldswp.uh r8,r12[-3846]
++	.text
++	.global ldswp_w
++ldswp_w:
++	ldswp.w pc,pc[0]
++	ldswp.w r12,r12[-4]
++	ldswp.w r5,r5[-8192]
++	ldswp.w r4,r4[8188]
++	ldswp.w lr,lr[4]
++	ldswp.w sp,r7[1860]
++	ldswp.w pc,r5[-3324]
++	ldswp.w r12,r10[-3296]
++	.text
++	.global stswp_h
++stswp_h:
++	stswp.h pc[0],pc
++	stswp.h r12[-2],r12
++	stswp.h r5[-4096],r5
++	stswp.h r4[4094],r4
++	stswp.h lr[2],lr
++	stswp.h r7[64],r10
++	stswp.h r10[3024],r2
++	stswp.h r0[-2328],r10
++	.text
++	.global stswp_w
++stswp_w:
++	stswp.w pc[0],pc
++	stswp.w r12[-4],r12
++	stswp.w r5[-8192],r5
++	stswp.w r4[8188],r4
++	stswp.w lr[4],lr
++	stswp.w pc[1156],r8
++	stswp.w sp[7992],r10
++	stswp.w r8[-1172],r5
++	.text
++	.global and2
++and2:
++	and pc,pc,pc<<0
++	and r12,r12,r12<<31
++	and r5,r5,r5<<16
++	and r4,r4,r4<<15
++	and lr,lr,lr<<1
++	and r10,r2,r1<<1
++	and r12,r8,r11<<27
++	and r10,r7,r0<<3
++	.text
++	.global and3
++and3:
++	and pc,pc,pc>>0
++	and r12,r12,r12>>31
++	and r5,r5,r5>>16
++	and r4,r4,r4>>15
++	and lr,lr,lr>>1
++	and r12,r8,r7>>17
++	and pc,r4,r9>>20
++	and r10,r9,r10>>12
++	.text
++	.global or2
++or2:
++	or pc,pc,pc<<0
++	or r12,r12,r12<<31
++	or r5,r5,r5<<16
++	or r4,r4,r4<<15
++	or lr,lr,lr<<1
++	or r8,sp,r11<<29
++	or pc,r9,r2<<28
++	or r5,r1,r2<<3
++	.text
++	.global or3
++or3:
++	or pc,pc,pc>>0
++	or r12,r12,r12>>31
++	or r5,r5,r5>>16
++	or r4,r4,r4>>15
++	or lr,lr,lr>>1
++	or r1,sp,sp>>2
++	or r0,r1,r1>>29
++	or r4,r12,r8>>8
++	.text
++	.global eor2
++eor2:
++	eor pc,pc,pc<<0
++	eor r12,r12,r12<<31
++	eor r5,r5,r5<<16
++	eor r4,r4,r4<<15
++	eor lr,lr,lr<<1
++	eor r10,r9,r4<<11
++	eor r4,r0,r1<<31
++	eor r6,r2,r12<<13
++	.text
++	.global eor3
++eor3:
++	eor pc,pc,pc>>0
++	eor r12,r12,r12>>31
++	eor r5,r5,r5>>16
++	eor r4,r4,r4>>15
++	eor lr,lr,lr>>1
++	eor r5,r5,r5>>22
++	eor r10,r1,lr>>3
++	eor r7,lr,sp>>26
++	.text
++	.global sthh_w2
++sthh_w2:
++	sthh.w pc[pc<<0],pc:b,pc:b
++	sthh.w r12[r12<<3],r12:t,r12:t
++	sthh.w r5[r5<<2],r5:t,r5:t
++	sthh.w r4[r4<<1],r4:b,r4:b
++	sthh.w lr[lr<<1],lr:t,lr:t
++	sthh.w sp[r6<<3],r1:t,r12:t
++	sthh.w r6[r6<<0],r9:t,r9:t
++	sthh.w r10[r3<<0],r0:b,r11:t
++	.text
++	.global sthh_w1
++sthh_w1:
++	sthh.w pc[0],pc:b,pc:b
++	sthh.w r12[1020],r12:t,r12:t
++	sthh.w r5[512],r5:t,r5:t
++	sthh.w r4[508],r4:b,r4:b
++	sthh.w lr[4],lr:t,lr:t
++	sthh.w r4[404],r9:t,r0:b
++	sthh.w r8[348],r2:t,r10:b
++	sthh.w sp[172],r9:b,r2:b
++	.text
++	.global cop
++cop:
++	cop cp0,cr0,cr0,cr0,0
++	cop cp7,cr15,cr15,cr15,0x7f
++	cop cp3,cr5,cr5,cr5,0x31
++	cop cp2,cr4,cr4,cr4,0x30
++	cop cp5,cr8,cr3,cr7,0x5a
++	.text
++	.global ldc_w1
++ldc_w1:
++	ldc.w cp0,cr0,r0[0]
++	ldc.w cp7,cr15,pc[255<<2]
++	ldc.w cp3,cr5,r5[128<<2]
++	ldc.w cp2,cr4,r4[127<<2]
++	ldc.w cp4,cr9,r13[36<<2]
++	.text
++	.global ldc_w2
++ldc_w2:
++	ldc.w cp0,cr0,--r0
++	ldc.w cp7,cr15,--pc
++	ldc.w cp3,cr5,--r5
++	ldc.w cp2,cr4,--r4
++	ldc.w cp4,cr9,--r13
++	.text
++	.global ldc_w3
++ldc_w3:
++	ldc.w cp0,cr0,r0[r0]
++	ldc.w cp7,cr15,pc[pc<<3]
++	ldc.w cp3,cr5,r5[r4<<2]
++	ldc.w cp2,cr4,r4[r3<<1]
++	ldc.w cp4,cr9,r13[r12<<0]
++	.text
++	.global ldc_d1
++ldc_d1:
++	ldc.d cp0,cr0,r0[0]
++	ldc.d cp7,cr14,pc[255<<2]
++	ldc.d cp3,cr6,r5[128<<2]
++	ldc.d cp2,cr4,r4[127<<2]
++	ldc.d cp4,cr8,r13[36<<2]
++	.text
++	.global ldc_d2
++ldc_d2:
++	ldc.d cp0,cr0,--r0
++	ldc.d cp7,cr14,--pc
++	ldc.d cp3,cr6,--r5
++	ldc.d cp2,cr4,--r4
++	ldc.d cp4,cr8,--r13
++	.text
++	.global ldc_d3
++ldc_d3:
++	ldc.d cp0,cr0,r0[r0]
++	ldc.d cp7,cr14,pc[pc<<3]
++	ldc.d cp3,cr6,r5[r4<<2]
++	ldc.d cp2,cr4,r4[r3<<1]
++	ldc.d cp4,cr8,r13[r12<<0]
++	.text
++	.global stc_w1
++stc_w1:
++	stc.w cp0,r0[0],cr0
++	stc.w cp7,pc[255<<2],cr15
++	stc.w cp3,r5[128<<2],cr5
++	stc.w cp2,r4[127<<2],cr4
++	stc.w cp4,r13[36<<2],cr9
++	.text
++	.global stc_w2
++stc_w2:
++	stc.w cp0,r0++,cr0
++	stc.w cp7,pc++,cr15
++	stc.w cp3,r5++,cr5
++	stc.w cp2,r4++,cr4
++	stc.w cp4,r13++,cr9
++	.text
++	.global stc_w3
++stc_w3:
++	stc.w cp0,r0[r0],cr0
++	stc.w cp7,pc[pc<<3],cr15
++	stc.w cp3,r5[r4<<2],cr5
++	stc.w cp2,r4[r3<<1],cr4
++	stc.w cp4,r13[r12<<0],cr9
++	.text
++	.global stc_d1
++stc_d1:
++	stc.d cp0,r0[0],cr0
++	stc.d cp7,pc[255<<2],cr14
++	stc.d cp3,r5[128<<2],cr6
++	stc.d cp2,r4[127<<2],cr4
++	stc.d cp4,r13[36<<2],cr8
++	.text
++	.global stc_d2
++stc_d2:
++	stc.d cp0,r0++,cr0
++	stc.d cp7,pc++,cr14
++	stc.d cp3,r5++,cr6
++	stc.d cp2,r4++,cr4
++	stc.d cp4,r13++,cr8
++	.text
++	.global stc_d3
++stc_d3:
++	stc.d cp0,r0[r0],cr0
++	stc.d cp7,pc[pc<<3],cr14
++	stc.d cp3,r5[r4<<2],cr6
++	stc.d cp2,r4[r3<<1],cr4
++	stc.d cp4,r13[r12<<0],cr8
++	.text
++	.global ldc0_w
++ldc0_w:
++	ldc0.w cr0,r0[0]
++	ldc0.w cr15,pc[4095<<2]
++	ldc0.w cr5,r5[2048<<2]
++	ldc0.w cr4,r4[2047<<2]
++	ldc0.w cr9,r13[147<<2]
++	.text
++	.global ldc0_d
++ldc0_d:
++	ldc0.d cr0,r0[0]
++	ldc0.d cr14,pc[4095<<2]
++	ldc0.d cr6,r5[2048<<2]
++	ldc0.d cr4,r4[2047<<2]
++	ldc0.d cr8,r13[147<<2]
++	.text
++	.global stc0_w
++stc0_w:
++	stc0.w r0[0],cr0
++	stc0.w pc[4095<<2],cr15
++	stc0.w r5[2048<<2],cr5
++	stc0.w r4[2047<<2],cr4
++	stc0.w r13[147<<2],cr9
++	.text
++	.global stc0_d
++stc0_d:
++	stc0.d r0[0],cr0
++	stc0.d pc[4095<<2],cr14
++	stc0.d r5[2048<<2],cr6
++	stc0.d r4[2047<<2],cr4
++	stc0.d r13[147<<2],cr8
++	.text
++	.global memc
++memc:
++	memc 0, 0
++	memc -4, 31
++	memc -65536, 16
++	memc 65532, 15
++	.text
++	.global mems
++mems:
++	mems 0, 0
++	mems -4, 31
++	mems -65536, 16
++	mems 65532, 15
++	.text
++	.global memt
++memt:
++	memt 0, 0
++	memt -4, 31
++	memt -65536, 16
++	memt 65532, 15
++
++	.text
++	.global stcond
++stcond:
++	stcond r0[0], r0
++	stcond pc[-1], pc
++	stcond r8[-32768], r7
++	stcond r7[32767], r8
++	stcond r5[0x1234], r10
++
++ldcm_w:
++	ldcm.w cp0,pc,cr0-cr7
++	ldcm.w cp7,r0,cr0
++	ldcm.w cp4,r4++,cr0-cr6
++	ldcm.w cp3,r7,cr7
++	ldcm.w cp1,r12++,cr1,cr4-cr6
++	ldcm.w cp0,pc,cr8-cr15
++	ldcm.w cp7,r0,cr8
++	ldcm.w cp4,r4++,cr8-cr14
++	ldcm.w cp3,r7,cr15
++	ldcm.w cp1,r12++,cr9,cr12-cr14
++
++ldcm_d:
++	ldcm.d cp0,pc,cr0-cr15
++	ldcm.d cp7,r0,cr0,cr1
++	ldcm.d cp4,r4++,cr0-cr13
++	ldcm.d cp3,r7,cr14-cr15
++	ldcm.d cp2,r12++,cr0-cr3,cr8-cr9,cr14-cr15
++
++stcm_w:
++	stcm.w cp0,pc,cr0-cr7
++	stcm.w cp7,r0,cr0
++	stcm.w cp4,--r4,cr0-cr6
++	stcm.w cp3,r7,cr7
++	stcm.w cp1,--r12,cr1,cr4-cr6
++	stcm.w cp0,pc,cr8-cr15
++	stcm.w cp7,r0,cr8
++	stcm.w cp4,--r4,cr8-cr14
++	stcm.w cp3,r7,cr15
++	stcm.w cp1,--r12,cr9,cr12-cr14
++
++stcm_d:
++	stcm.d cp0,pc,cr0-cr15
++	stcm.d cp7,r0,cr0,cr1
++	stcm.d cp4,--r4,cr0-cr13
++	stcm.d cp3,r7,cr14-cr15
++	stcm.d cp2,--r12,cr0-cr3,cr8-cr9,cr14-cr15
++
++mvcr_w:
++	mvcr.w cp7,pc,cr15
++	mvcr.w cp0,r0,cr0
++	mvcr.w cp0,pc,cr15
++	mvcr.w cp7,r0,cr15
++	mvcr.w cp7,pc,cr0
++	mvcr.w cp4,r7,cr8
++	mvcr.w cp3,r8,cr7
++
++mvcr_d:
++	mvcr.d cp7,lr,cr14
++	mvcr.d cp0,r0,cr0
++	mvcr.d cp0,lr,cr14
++	mvcr.d cp7,r0,cr14
++	mvcr.d cp7,lr,cr0
++	mvcr.d cp4,r6,cr8
++	mvcr.d cp3,r8,cr6
++
++mvrc_w:
++	mvrc.w cp7,cr15,pc
++	mvrc.w cp0,cr0,r0
++	mvrc.w cp0,cr15,pc
++	mvrc.w cp7,cr15,r0
++	mvrc.w cp7,cr0,pc
++	mvrc.w cp4,cr8,r7
++	mvrc.w cp3,cr7,r8
++
++mvrc_d:
++	mvrc.d cp7,cr14,lr
++	mvrc.d cp0,cr0,r0
++	mvrc.d cp0,cr14,lr
++	mvrc.d cp7,cr14,r0
++	mvrc.d cp7,cr0,lr
++	mvrc.d cp4,cr8,r6
++	mvrc.d cp3,cr6,r8
++
++bfexts:
++	bfexts pc,pc,31,31
++	bfexts r0,r0,0,0
++	bfexts r0,pc,31,31
++	bfexts pc,r0,31,31
++	bfexts pc,pc,0,31
++	bfexts pc,pc,31,0
++	bfexts r7,r8,15,16
++	bfexts r8,r7,16,15
++
++bfextu:
++	bfextu pc,pc,31,31
++	bfextu r0,r0,0,0
++	bfextu r0,pc,31,31
++	bfextu pc,r0,31,31
++	bfextu pc,pc,0,31
++	bfextu pc,pc,31,0
++	bfextu r7,r8,15,16
++	bfextu r8,r7,16,15
++
++bfins:
++	bfins pc,pc,31,31
++	bfins r0,r0,0,0
++	bfins r0,pc,31,31
++	bfins pc,r0,31,31
++	bfins pc,pc,0,31
++	bfins pc,pc,31,0
++	bfins r7,r8,15,16
++	bfins r8,r7,16,15
++
++rsubc:
++	rsubeq pc,0
++	rsubal r12,-1
++	rsubls r5,-128
++	rsubpl r4,127
++	rsubne lr,1
++	rsubls r12,118
++	rsubvc lr,-12
++	rsubmi r4,-13
++
++addc:
++	addeq pc,pc,pc
++	addal r12,r12,r12
++	addls r5,r5,r5
++	addpl r4,r4,r4
++	addne lr,lr,lr
++	addls r10,r2,r1
++	addvc r12,r8,r11
++	addmi r10,r7,r0   
++
++subc2:
++	subeq pc,pc,pc
++	subal r12,r12,r12
++	subls r5,r5,r5
++	subpl r4,r4,r4
++	subne lr,lr,lr
++	subls r10,r2,r1
++	subvc r12,r8,r11
++	submi r10,r7,r0   
++
++andc:
++	andeq pc,pc,pc
++	andal r12,r12,r12
++	andls r5,r5,r5
++	andpl r4,r4,r4
++	andne lr,lr,lr
++	andls r10,r2,r1
++	andvc r12,r8,r11
++	andmi r10,r7,r0   
++
++orc:
++	oreq pc,pc,pc
++	oral r12,r12,r12
++	orls r5,r5,r5
++	orpl r4,r4,r4
++	orne lr,lr,lr
++	orls r10,r2,r1
++	orvc r12,r8,r11
++	ormi r10,r7,r0   
++
++eorc:
++	eoreq pc,pc,pc
++	eoral r12,r12,r12
++	eorls r5,r5,r5
++	eorpl r4,r4,r4
++	eorne lr,lr,lr
++	eorls r10,r2,r1
++	eorvc r12,r8,r11
++	eormi r10,r7,r0   
++
++ldcond:
++	ld.weq  pc,pc[2044]
++	ld.shal r12,r12[1022]
++	ld.uhls r5,r5[0]
++	ld.ubpl r4,r4[511]
++	ld.sbne lr,lr[0]
++	ld.wls  r10,r2[0]
++	ld.shvc r12,r8[0x3fe]
++	ld.ubmi r10,r7[1]
++  
++stcond2:
++	st.weq pc[2044],pc
++	st.hal r12[1022],r12
++	st.hls r5[0],r5
++	st.bpl r4[511],r4
++	st.bne lr[0],lr
++	st.wls r2[0],r10
++	st.hvc r8[0x3fe],r12
++	st.bmi r7[1],r10
++	
++movh:	
++	movh	pc, 65535
++	movh	r0, 0
++	movh	r5, 1
++	movh	r12, 32767
++	
++		
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/avr32.exp
+@@ -0,0 +1,23 @@
++# AVR32 assembler testsuite. -*- Tcl -*-
++
++if [istarget avr32-*-*] {
++    run_dump_test "hwrd-lwrd"
++    run_dump_test "pcrel"
++    run_dump_test "aliases"
++    run_dump_test "dwarf2"
++    run_dump_test "pic_reloc"
++    run_dump_test "fpinsn"
++    run_dump_test "pico"
++    run_dump_test "lda_pic"
++    run_dump_test "lda_pic_linkrelax"
++    run_dump_test "lda_nopic"
++    run_dump_test "lda_nopic_linkrelax"
++    run_dump_test "call_pic"
++    run_dump_test "call_pic_linkrelax"
++    run_dump_test "call_nopic"
++    run_dump_test "call_nopic_linkrelax"
++    run_dump_test "jmptable"
++    run_dump_test "jmptable_linkrelax"
++    run_dump_test "symdiff"
++    run_dump_test "symdiff_linkrelax"
++}
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_nopic.d
+@@ -0,0 +1,36 @@
++#source: call.s
++#as:
++#objdump: -dr
++#name: call_nopic
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <call_test>:
++       0:	d7 03       	nop
++
++00000002 <toofar_negative>:
++	\.\.\.
++  1ffffe:	00 00       	add r0,r0
++  200000:	f0 a0 00 00 	rcall 0 <call_test>
++  200004:	f0 1f 00 0c 	mcall 200034 <toofar_negative\+0x200032>
++  200008:	f0 1f 00 0c 	mcall 200038 <toofar_negative\+0x200036>
++  20000c:	f0 1f 00 0c 	mcall 20003c <toofar_negative\+0x20003a>
++  200010:	f0 1f 00 0c 	mcall 200040 <toofar_negative\+0x20003e>
++	\.\.\.
++  200030:	ee b0 ff ff 	rcall 40002e <far_positive>
++	\.\.\.
++			200034: R_AVR32_32_CPENT	\.text\+0x2
++			200038: R_AVR32_32_CPENT	\.text\.init
++			20003c: R_AVR32_32_CPENT	undefined
++			200040: R_AVR32_32_CPENT	\.text\+0x40002c
++
++0040002c <toofar_positive>:
++  40002c:	d7 03       	nop
++0040002e <far_positive>:
++  40002e:	d7 03       	nop
++Disassembly of section \.text\.init:
++
++00000000 <different_section>:
++   0:	e2 c0 00 00 	sub r0,r1,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_nopic_linkrelax.d
+@@ -0,0 +1,43 @@
++#source: call.s
++#as: --linkrelax
++#objdump: -dr
++#name: call_nopic_linkrelax
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <call_test>:
++       0:	d7 03       	nop
++
++00000002 <toofar_negative>:
++	\.\.\.
++  1ffffe:	00 00       	add r0,r0
++  200000:	e0 a0 00 00 	rcall 200000 <toofar_negative\+0x1ffffe>
++			200000: R_AVR32_22H_PCREL	\.text
++  200004:	f0 1f 00 00 	mcall 200004 <toofar_negative\+0x200002>
++			200004: R_AVR32_CPCALL	\.text\+0x200034
++  200008:	f0 1f 00 00 	mcall 200008 <toofar_negative\+0x200006>
++			200008: R_AVR32_CPCALL	\.text\+0x200038
++  20000c:	f0 1f 00 00 	mcall 20000c <toofar_negative\+0x20000a>
++			20000c: R_AVR32_CPCALL	\.text\+0x20003c
++  200010:	f0 1f 00 00 	mcall 200010 <toofar_negative\+0x20000e>
++			200010: R_AVR32_CPCALL	\.text\+0x200040
++	\.\.\.
++  200030:	e0 a0 00 00 	rcall 200030 <toofar_negative\+0x20002e>
++			200030: R_AVR32_22H_PCREL	\.text\+0x40002e
++	\.\.\.
++			200034: R_AVR32_ALIGN	\*ABS\*\+0x2
++			200034: R_AVR32_32_CPENT	\.text\+0x2
++			200038: R_AVR32_32_CPENT	\.text\.init
++			20003c: R_AVR32_32_CPENT	undefined
++			200040: R_AVR32_32_CPENT	\.text\+0x40002c
++
++0040002c <toofar_positive>:
++  40002c:	d7 03       	nop
++0040002e <far_positive>:
++  40002e:	d7 03       	nop
++Disassembly of section \.text\.init:
++
++00000000 <different_section>:
++   0:	e2 c0 00 00 	sub r0,r1,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_pic.d
+@@ -0,0 +1,36 @@
++#source: call.s
++#as: --pic
++#objdump: -dr
++#name: call_pic
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <call_test>:
++       0:	d7 03       	nop
++
++00000002 <toofar_negative>:
++	\.\.\.
++  1ffffe:	00 00       	add r0,r0
++  200000:	f0 a0 00 00 	rcall 0 <call_test>
++  200004:	f0 16 00 00 	mcall r6\[0\]
++			200004: R_AVR32_GOT18SW	toofar_negative
++  200008:	f0 16 00 00 	mcall r6\[0\]
++			200008: R_AVR32_GOT18SW	different_section
++  20000c:	f0 16 00 00 	mcall r6\[0\]
++			20000c: R_AVR32_GOT18SW	undefined
++  200010:	f0 16 00 00 	mcall r6\[0\]
++			200010: R_AVR32_GOT18SW	toofar_positive
++	\.\.\.
++  200030:	ee b0 ff ff 	rcall 40002e <far_positive>
++	\.\.\.
++
++0040002c <toofar_positive>:
++  40002c:	d7 03       	nop
++0040002e <far_positive>:
++  40002e:	d7 03       	nop
++Disassembly of section \.text\.init:
++
++00000000 <different_section>:
++   0:	e2 c0 00 00 	sub r0,r1,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_pic_linkrelax.d
+@@ -0,0 +1,47 @@
++#source: call.s
++#as: --pic --linkrelax
++#objdump: -dr
++#name: call_pic_linkrelax
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <call_test>:
++       0:	d7 03       	nop
++
++00000002 <toofar_negative>:
++	\.\.\.
++  1ffffe:	00 00       	add r0,r0
++  200000:	e0 a0 00 00 	rcall 200000 <toofar_negative\+0x1ffffe>
++			200000: R_AVR32_22H_PCREL	\.text
++  200004:	e0 6e 00 00 	mov lr,0
++			200004: R_AVR32_GOTCALL	toofar_negative
++  200008:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
++  20000c:	5d 1e       	icall lr
++  20000e:	e0 6e 00 00 	mov lr,0
++			20000e: R_AVR32_GOTCALL	different_section
++  200012:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
++  200016:	5d 1e       	icall lr
++  200018:	e0 6e 00 00 	mov lr,0
++			200018: R_AVR32_GOTCALL	undefined
++  20001c:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
++  200020:	5d 1e       	icall lr
++  200022:	e0 6e 00 00 	mov lr,0
++			200022: R_AVR32_GOTCALL	toofar_positive
++  200026:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
++  20002a:	5d 1e       	icall lr
++  20002c:	00 00       	add r0,r0
++  20002e:	00 00       	add r0,r0
++  200030:	e0 a0 00 00 	rcall 200030 <toofar_negative\+0x20002e>
++			200030: R_AVR32_22H_PCREL	\.text\+0x40002e
++	\.\.\.
++
++0040002c <toofar_positive>:
++  40002c:	d7 03       	nop
++0040002e <far_positive>:
++  40002e:	d7 03       	nop
++Disassembly of section \.text\.init:
++
++00000000 <different_section>:
++   0:	e2 c0 00 00 	sub r0,r1,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call.s
+@@ -0,0 +1,30 @@
++
++	.text
++	.global call_test
++call_test:
++far_negative:
++	nop
++toofar_negative:
++
++	.org	0x200000
++
++	call	far_negative
++	call	toofar_negative
++	call	different_section
++	call	undefined
++	call	toofar_positive
++	.org	0x200030
++	call	far_positive
++
++	.cpool
++
++	.org	0x40002c
++
++toofar_positive:
++	nop
++far_positive:
++	nop
++
++	.section .text.init,"ax",@progbits
++different_section:
++	sub	r0, r1, 0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/dwarf2.d
+@@ -0,0 +1,42 @@
++#readelf: -wl
++#name: dwarf2
++#source: dwarf2.s
++
++Dump of debug contents of section \.debug_line:
++
++  Length:                      53
++  DWARF Version:               2
++  Prologue Length:             26
++  Minimum Instruction Length:  1
++  Initial value of 'is_stmt':  1
++  Line Base:                   -5
++  Line Range:                  14
++  Opcode Base:                 10
++  \(Pointer size:               4\)
++
++ Opcodes:
++  Opcode 1 has 0 args
++  Opcode 2 has 1 args
++  Opcode 3 has 1 args
++  Opcode 4 has 1 args
++  Opcode 5 has 1 args
++  Opcode 6 has 0 args
++  Opcode 7 has 0 args
++  Opcode 8 has 0 args
++  Opcode 9 has 1 args
++
++ The Directory Table is empty\.
++
++ The File Name Table:
++  Entry	Dir	Time	Size	Name
++  1	0	0	0	main\.c
++
++ Line Number Statements:
++  Extended opcode 2: set Address to 0x0
++  Advance Line by 87 to 88
++  Copy
++  Advance Line by 23 to 111
++  Special opcode .*: advance Address by 4 to 0x4 and Line by 0 to 111
++  Special opcode .*: advance Address by 10 to 0xe and Line by 1 to 112
++  Advance PC by 530 to 220
++  Extended opcode 1: End of Sequence
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/dwarf2.s
+@@ -0,0 +1,67 @@
++# Source file used to test DWARF2 information for AVR32.
++
++	.file	"main.c"
++
++	.section .debug_abbrev,"",@progbits
++.Ldebug_abbrev0:
++	.section .debug_info,"",@progbits
++.Ldebug_info0:
++	.section .debug_line,"",@progbits
++.Ldebug_line0:
++
++	.text
++	.align	1
++	.globl	main
++	.type	main, @function
++.Ltext0:
++main:
++	.file 1 "main.c"
++	.loc 1 88 0
++	pushm	r0-r7,lr
++	sub	sp, 4
++	.loc 1 111 0
++	lddpc	r12, .LC1
++	lddpc	r7, .LC1
++	icall	r7
++	.loc 1 112 0
++	lddpc	r6, .LC4
++
++	.align	2
++.LC4:	.int	0
++
++	.fill	256, 2, 0
++
++	.align	2
++.LC1:
++	.int	0
++.LC2:
++	.int	0
++.LC3:
++	.int	0
++	.size	main, . - main
++
++.Letext0:
++
++	.section .debug_info
++	.int	.Ledebug_info0 - .Ldebug_info0	// size
++	.short	2				// version
++	.int	.Ldebug_abbrev0			// abbrev offset
++	.byte	4				// bytes per addr
++
++	.uleb128 1				// abbrev 1
++	.int	.Ldebug_line0			// DW_AT_stmt_list
++	.int	.Letext0			// DW_AT_high_pc
++	.int	.Ltext0				// DW_AT_low_pc
++
++.Ledebug_info0:
++
++	.section .debug_abbrev
++	.uleb128 0x01
++	.uleb128 0x11		// DW_TAG_compile_unit
++	.byte	0		// DW_CHILDREN_no
++	.uleb128 0x10, 0x6	// DW_AT_stmt_list
++	.uleb128 0x12, 0x1	// DW_AT_high_pc
++	.uleb128 0x11, 0x1	// DW_AT_low_pc
++	.uleb128 0, 0
++
++	.byte	0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/fpinsn.d
+@@ -0,0 +1,271 @@
++#as:
++#objdump: -dr
++#name: fpinsn
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++[0-9a-f]* <fadd_s>:
++ *[0-9a-f]*:	e1 a2 0f ff 	cop cp0,cr15,cr15,cr15,0x4
++ *[0-9a-f]*:	e1 a2 00 00 	cop cp0,cr0,cr0,cr0,0x4
++ *[0-9a-f]*:	e1 a2 00 ff 	cop cp0,cr0,cr15,cr15,0x4
++ *[0-9a-f]*:	e1 a2 0f 0f 	cop cp0,cr15,cr0,cr15,0x4
++ *[0-9a-f]*:	e1 a2 0f f0 	cop cp0,cr15,cr15,cr0,0x4
++ *[0-9a-f]*:	e1 a2 07 88 	cop cp0,cr7,cr8,cr8,0x4
++ *[0-9a-f]*:	e1 a2 08 78 	cop cp0,cr8,cr7,cr8,0x4
++ *[0-9a-f]*:	e1 a2 08 87 	cop cp0,cr8,cr8,cr7,0x4
++
++[0-9a-f]* <fsub_s>:
++ *[0-9a-f]*:	e1 a2 1f ff 	cop cp0,cr15,cr15,cr15,0x5
++ *[0-9a-f]*:	e1 a2 10 00 	cop cp0,cr0,cr0,cr0,0x5
++ *[0-9a-f]*:	e1 a2 10 ff 	cop cp0,cr0,cr15,cr15,0x5
++ *[0-9a-f]*:	e1 a2 1f 0f 	cop cp0,cr15,cr0,cr15,0x5
++ *[0-9a-f]*:	e1 a2 1f f0 	cop cp0,cr15,cr15,cr0,0x5
++ *[0-9a-f]*:	e1 a2 17 88 	cop cp0,cr7,cr8,cr8,0x5
++ *[0-9a-f]*:	e1 a2 18 78 	cop cp0,cr8,cr7,cr8,0x5
++ *[0-9a-f]*:	e1 a2 18 87 	cop cp0,cr8,cr8,cr7,0x5
++
++[0-9a-f]* <fmac_s>:
++ *[0-9a-f]*:	e1 a0 0f ff 	cop cp0,cr15,cr15,cr15,0x0
++ *[0-9a-f]*:	e1 a0 00 00 	cop cp0,cr0,cr0,cr0,0x0
++ *[0-9a-f]*:	e1 a0 00 ff 	cop cp0,cr0,cr15,cr15,0x0
++ *[0-9a-f]*:	e1 a0 0f 0f 	cop cp0,cr15,cr0,cr15,0x0
++ *[0-9a-f]*:	e1 a0 0f f0 	cop cp0,cr15,cr15,cr0,0x0
++ *[0-9a-f]*:	e1 a0 07 88 	cop cp0,cr7,cr8,cr8,0x0
++ *[0-9a-f]*:	e1 a0 08 78 	cop cp0,cr8,cr7,cr8,0x0
++ *[0-9a-f]*:	e1 a0 08 87 	cop cp0,cr8,cr8,cr7,0x0
++
++[0-9a-f]* <fnmac_s>:
++ *[0-9a-f]*:	e1 a0 1f ff 	cop cp0,cr15,cr15,cr15,0x1
++ *[0-9a-f]*:	e1 a0 10 00 	cop cp0,cr0,cr0,cr0,0x1
++ *[0-9a-f]*:	e1 a0 10 ff 	cop cp0,cr0,cr15,cr15,0x1
++ *[0-9a-f]*:	e1 a0 1f 0f 	cop cp0,cr15,cr0,cr15,0x1
++ *[0-9a-f]*:	e1 a0 1f f0 	cop cp0,cr15,cr15,cr0,0x1
++ *[0-9a-f]*:	e1 a0 17 88 	cop cp0,cr7,cr8,cr8,0x1
++ *[0-9a-f]*:	e1 a0 18 78 	cop cp0,cr8,cr7,cr8,0x1
++ *[0-9a-f]*:	e1 a0 18 87 	cop cp0,cr8,cr8,cr7,0x1
++
++[0-9a-f]* <fmsc_s>:
++ *[0-9a-f]*:	e1 a1 0f ff 	cop cp0,cr15,cr15,cr15,0x2
++ *[0-9a-f]*:	e1 a1 00 00 	cop cp0,cr0,cr0,cr0,0x2
++ *[0-9a-f]*:	e1 a1 00 ff 	cop cp0,cr0,cr15,cr15,0x2
++ *[0-9a-f]*:	e1 a1 0f 0f 	cop cp0,cr15,cr0,cr15,0x2
++ *[0-9a-f]*:	e1 a1 0f f0 	cop cp0,cr15,cr15,cr0,0x2
++ *[0-9a-f]*:	e1 a1 07 88 	cop cp0,cr7,cr8,cr8,0x2
++ *[0-9a-f]*:	e1 a1 08 78 	cop cp0,cr8,cr7,cr8,0x2
++ *[0-9a-f]*:	e1 a1 08 87 	cop cp0,cr8,cr8,cr7,0x2
++
++[0-9a-f]* <fnmsc_s>:
++ *[0-9a-f]*:	e1 a1 1f ff 	cop cp0,cr15,cr15,cr15,0x3
++ *[0-9a-f]*:	e1 a1 10 00 	cop cp0,cr0,cr0,cr0,0x3
++ *[0-9a-f]*:	e1 a1 10 ff 	cop cp0,cr0,cr15,cr15,0x3
++ *[0-9a-f]*:	e1 a1 1f 0f 	cop cp0,cr15,cr0,cr15,0x3
++ *[0-9a-f]*:	e1 a1 1f f0 	cop cp0,cr15,cr15,cr0,0x3
++ *[0-9a-f]*:	e1 a1 17 88 	cop cp0,cr7,cr8,cr8,0x3
++ *[0-9a-f]*:	e1 a1 18 78 	cop cp0,cr8,cr7,cr8,0x3
++ *[0-9a-f]*:	e1 a1 18 87 	cop cp0,cr8,cr8,cr7,0x3
++
++[0-9a-f]* <fmul_s>:
++ *[0-9a-f]*:	e1 a3 0f ff 	cop cp0,cr15,cr15,cr15,0x6
++ *[0-9a-f]*:	e1 a3 00 00 	cop cp0,cr0,cr0,cr0,0x6
++ *[0-9a-f]*:	e1 a3 00 ff 	cop cp0,cr0,cr15,cr15,0x6
++ *[0-9a-f]*:	e1 a3 0f 0f 	cop cp0,cr15,cr0,cr15,0x6
++ *[0-9a-f]*:	e1 a3 0f f0 	cop cp0,cr15,cr15,cr0,0x6
++ *[0-9a-f]*:	e1 a3 07 88 	cop cp0,cr7,cr8,cr8,0x6
++ *[0-9a-f]*:	e1 a3 08 78 	cop cp0,cr8,cr7,cr8,0x6
++ *[0-9a-f]*:	e1 a3 08 87 	cop cp0,cr8,cr8,cr7,0x6
++
++[0-9a-f]* <fnmul_s>:
++ *[0-9a-f]*:	e1 a3 1f ff 	cop cp0,cr15,cr15,cr15,0x7
++ *[0-9a-f]*:	e1 a3 10 00 	cop cp0,cr0,cr0,cr0,0x7
++ *[0-9a-f]*:	e1 a3 10 ff 	cop cp0,cr0,cr15,cr15,0x7
++ *[0-9a-f]*:	e1 a3 1f 0f 	cop cp0,cr15,cr0,cr15,0x7
++ *[0-9a-f]*:	e1 a3 1f f0 	cop cp0,cr15,cr15,cr0,0x7
++ *[0-9a-f]*:	e1 a3 17 88 	cop cp0,cr7,cr8,cr8,0x7
++ *[0-9a-f]*:	e1 a3 18 78 	cop cp0,cr8,cr7,cr8,0x7
++ *[0-9a-f]*:	e1 a3 18 87 	cop cp0,cr8,cr8,cr7,0x7
++
++[0-9a-f]* <fneg_s>:
++ *[0-9a-f]*:	e1 a4 0f f0 	cop cp0,cr15,cr15,cr0,0x8
++ *[0-9a-f]*:	e1 a4 00 00 	cop cp0,cr0,cr0,cr0,0x8
++ *[0-9a-f]*:	e1 a4 00 f0 	cop cp0,cr0,cr15,cr0,0x8
++ *[0-9a-f]*:	e1 a4 0f 00 	cop cp0,cr15,cr0,cr0,0x8
++ *[0-9a-f]*:	e1 a4 07 80 	cop cp0,cr7,cr8,cr0,0x8
++ *[0-9a-f]*:	e1 a4 08 70 	cop cp0,cr8,cr7,cr0,0x8
++
++[0-9a-f]* <fabs_s>:
++ *[0-9a-f]*:	e1 a4 1f f0 	cop cp0,cr15,cr15,cr0,0x9
++ *[0-9a-f]*:	e1 a4 10 00 	cop cp0,cr0,cr0,cr0,0x9
++ *[0-9a-f]*:	e1 a4 10 f0 	cop cp0,cr0,cr15,cr0,0x9
++ *[0-9a-f]*:	e1 a4 1f 00 	cop cp0,cr15,cr0,cr0,0x9
++ *[0-9a-f]*:	e1 a4 17 80 	cop cp0,cr7,cr8,cr0,0x9
++ *[0-9a-f]*:	e1 a4 18 70 	cop cp0,cr8,cr7,cr0,0x9
++
++[0-9a-f]* <fcmp_s>:
++ *[0-9a-f]*:	e1 a6 10 ff 	cop cp0,cr0,cr15,cr15,0xd
++ *[0-9a-f]*:	e1 a6 10 00 	cop cp0,cr0,cr0,cr0,0xd
++ *[0-9a-f]*:	e1 a6 10 0f 	cop cp0,cr0,cr0,cr15,0xd
++ *[0-9a-f]*:	e1 a6 10 f0 	cop cp0,cr0,cr15,cr0,0xd
++ *[0-9a-f]*:	e1 a6 10 78 	cop cp0,cr0,cr7,cr8,0xd
++ *[0-9a-f]*:	e1 a6 10 87 	cop cp0,cr0,cr8,cr7,0xd
++
++[0-9a-f]* <fadd_d>:
++ *[0-9a-f]*:	e5 a2 0e ee 	cop cp0,cr14,cr14,cr14,0x44
++ *[0-9a-f]*:	e5 a2 00 00 	cop cp0,cr0,cr0,cr0,0x44
++ *[0-9a-f]*:	e5 a2 00 ee 	cop cp0,cr0,cr14,cr14,0x44
++ *[0-9a-f]*:	e5 a2 0e 0e 	cop cp0,cr14,cr0,cr14,0x44
++ *[0-9a-f]*:	e5 a2 0e e0 	cop cp0,cr14,cr14,cr0,0x44
++ *[0-9a-f]*:	e5 a2 06 88 	cop cp0,cr6,cr8,cr8,0x44
++ *[0-9a-f]*:	e5 a2 08 68 	cop cp0,cr8,cr6,cr8,0x44
++ *[0-9a-f]*:	e5 a2 08 86 	cop cp0,cr8,cr8,cr6,0x44
++
++[0-9a-f]* <fsub_d>:
++ *[0-9a-f]*:	e5 a2 1e ee 	cop cp0,cr14,cr14,cr14,0x45
++ *[0-9a-f]*:	e5 a2 10 00 	cop cp0,cr0,cr0,cr0,0x45
++ *[0-9a-f]*:	e5 a2 10 ee 	cop cp0,cr0,cr14,cr14,0x45
++ *[0-9a-f]*:	e5 a2 1e 0e 	cop cp0,cr14,cr0,cr14,0x45
++ *[0-9a-f]*:	e5 a2 1e e0 	cop cp0,cr14,cr14,cr0,0x45
++ *[0-9a-f]*:	e5 a2 16 88 	cop cp0,cr6,cr8,cr8,0x45
++ *[0-9a-f]*:	e5 a2 18 68 	cop cp0,cr8,cr6,cr8,0x45
++ *[0-9a-f]*:	e5 a2 18 86 	cop cp0,cr8,cr8,cr6,0x45
++
++[0-9a-f]* <fmac_d>:
++ *[0-9a-f]*:	e5 a0 0e ee 	cop cp0,cr14,cr14,cr14,0x40
++ *[0-9a-f]*:	e5 a0 00 00 	cop cp0,cr0,cr0,cr0,0x40
++ *[0-9a-f]*:	e5 a0 00 ee 	cop cp0,cr0,cr14,cr14,0x40
++ *[0-9a-f]*:	e5 a0 0e 0e 	cop cp0,cr14,cr0,cr14,0x40
++ *[0-9a-f]*:	e5 a0 0e e0 	cop cp0,cr14,cr14,cr0,0x40
++ *[0-9a-f]*:	e5 a0 06 88 	cop cp0,cr6,cr8,cr8,0x40
++ *[0-9a-f]*:	e5 a0 08 68 	cop cp0,cr8,cr6,cr8,0x40
++ *[0-9a-f]*:	e5 a0 08 86 	cop cp0,cr8,cr8,cr6,0x40
++
++[0-9a-f]* <fnmac_d>:
++ *[0-9a-f]*:	e5 a0 1e ee 	cop cp0,cr14,cr14,cr14,0x41
++ *[0-9a-f]*:	e5 a0 10 00 	cop cp0,cr0,cr0,cr0,0x41
++ *[0-9a-f]*:	e5 a0 10 ee 	cop cp0,cr0,cr14,cr14,0x41
++ *[0-9a-f]*:	e5 a0 1e 0e 	cop cp0,cr14,cr0,cr14,0x41
++ *[0-9a-f]*:	e5 a0 1e e0 	cop cp0,cr14,cr14,cr0,0x41
++ *[0-9a-f]*:	e5 a0 16 88 	cop cp0,cr6,cr8,cr8,0x41
++ *[0-9a-f]*:	e5 a0 18 68 	cop cp0,cr8,cr6,cr8,0x41
++ *[0-9a-f]*:	e5 a0 18 86 	cop cp0,cr8,cr8,cr6,0x41
++
++[0-9a-f]* <fmsc_d>:
++ *[0-9a-f]*:	e5 a1 0e ee 	cop cp0,cr14,cr14,cr14,0x42
++ *[0-9a-f]*:	e5 a1 00 00 	cop cp0,cr0,cr0,cr0,0x42
++ *[0-9a-f]*:	e5 a1 00 ee 	cop cp0,cr0,cr14,cr14,0x42
++ *[0-9a-f]*:	e5 a1 0e 0e 	cop cp0,cr14,cr0,cr14,0x42
++ *[0-9a-f]*:	e5 a1 0e e0 	cop cp0,cr14,cr14,cr0,0x42
++ *[0-9a-f]*:	e5 a1 06 88 	cop cp0,cr6,cr8,cr8,0x42
++ *[0-9a-f]*:	e5 a1 08 68 	cop cp0,cr8,cr6,cr8,0x42
++ *[0-9a-f]*:	e5 a1 08 86 	cop cp0,cr8,cr8,cr6,0x42
++
++[0-9a-f]* <fnmsc_d>:
++ *[0-9a-f]*:	e5 a1 1e ee 	cop cp0,cr14,cr14,cr14,0x43
++ *[0-9a-f]*:	e5 a1 10 00 	cop cp0,cr0,cr0,cr0,0x43
++ *[0-9a-f]*:	e5 a1 10 ee 	cop cp0,cr0,cr14,cr14,0x43
++ *[0-9a-f]*:	e5 a1 1e 0e 	cop cp0,cr14,cr0,cr14,0x43
++ *[0-9a-f]*:	e5 a1 1e e0 	cop cp0,cr14,cr14,cr0,0x43
++ *[0-9a-f]*:	e5 a1 16 88 	cop cp0,cr6,cr8,cr8,0x43
++ *[0-9a-f]*:	e5 a1 18 68 	cop cp0,cr8,cr6,cr8,0x43
++ *[0-9a-f]*:	e5 a1 18 86 	cop cp0,cr8,cr8,cr6,0x43
++
++[0-9a-f]* <fmul_d>:
++ *[0-9a-f]*:	e5 a3 0e ee 	cop cp0,cr14,cr14,cr14,0x46
++ *[0-9a-f]*:	e5 a3 00 00 	cop cp0,cr0,cr0,cr0,0x46
++ *[0-9a-f]*:	e5 a3 00 ee 	cop cp0,cr0,cr14,cr14,0x46
++ *[0-9a-f]*:	e5 a3 0e 0e 	cop cp0,cr14,cr0,cr14,0x46
++ *[0-9a-f]*:	e5 a3 0e e0 	cop cp0,cr14,cr14,cr0,0x46
++ *[0-9a-f]*:	e5 a3 06 88 	cop cp0,cr6,cr8,cr8,0x46
++ *[0-9a-f]*:	e5 a3 08 68 	cop cp0,cr8,cr6,cr8,0x46
++ *[0-9a-f]*:	e5 a3 08 86 	cop cp0,cr8,cr8,cr6,0x46
++
++[0-9a-f]* <fnmul_d>:
++ *[0-9a-f]*:	e5 a3 1e ee 	cop cp0,cr14,cr14,cr14,0x47
++ *[0-9a-f]*:	e5 a3 10 00 	cop cp0,cr0,cr0,cr0,0x47
++ *[0-9a-f]*:	e5 a3 10 ee 	cop cp0,cr0,cr14,cr14,0x47
++ *[0-9a-f]*:	e5 a3 1e 0e 	cop cp0,cr14,cr0,cr14,0x47
++ *[0-9a-f]*:	e5 a3 1e e0 	cop cp0,cr14,cr14,cr0,0x47
++ *[0-9a-f]*:	e5 a3 16 88 	cop cp0,cr6,cr8,cr8,0x47
++ *[0-9a-f]*:	e5 a3 18 68 	cop cp0,cr8,cr6,cr8,0x47
++ *[0-9a-f]*:	e5 a3 18 86 	cop cp0,cr8,cr8,cr6,0x47
++
++[0-9a-f]* <fneg_d>:
++ *[0-9a-f]*:	e5 a4 0e e0 	cop cp0,cr14,cr14,cr0,0x48
++ *[0-9a-f]*:	e5 a4 00 00 	cop cp0,cr0,cr0,cr0,0x48
++ *[0-9a-f]*:	e5 a4 00 e0 	cop cp0,cr0,cr14,cr0,0x48
++ *[0-9a-f]*:	e5 a4 0e 00 	cop cp0,cr14,cr0,cr0,0x48
++ *[0-9a-f]*:	e5 a4 06 80 	cop cp0,cr6,cr8,cr0,0x48
++ *[0-9a-f]*:	e5 a4 08 60 	cop cp0,cr8,cr6,cr0,0x48
++
++[0-9a-f]* <fabs_d>:
++ *[0-9a-f]*:	e5 a4 1e e0 	cop cp0,cr14,cr14,cr0,0x49
++ *[0-9a-f]*:	e5 a4 10 00 	cop cp0,cr0,cr0,cr0,0x49
++ *[0-9a-f]*:	e5 a4 10 e0 	cop cp0,cr0,cr14,cr0,0x49
++ *[0-9a-f]*:	e5 a4 1e 00 	cop cp0,cr14,cr0,cr0,0x49
++ *[0-9a-f]*:	e5 a4 16 80 	cop cp0,cr6,cr8,cr0,0x49
++ *[0-9a-f]*:	e5 a4 18 60 	cop cp0,cr8,cr6,cr0,0x49
++
++[0-9a-f]* <fcmp_d>:
++ *[0-9a-f]*:	e5 a6 10 ee 	cop cp0,cr0,cr14,cr14,0x4d
++ *[0-9a-f]*:	e5 a6 10 00 	cop cp0,cr0,cr0,cr0,0x4d
++ *[0-9a-f]*:	e5 a6 10 0e 	cop cp0,cr0,cr0,cr14,0x4d
++ *[0-9a-f]*:	e5 a6 10 e0 	cop cp0,cr0,cr14,cr0,0x4d
++ *[0-9a-f]*:	e5 a6 10 68 	cop cp0,cr0,cr6,cr8,0x4d
++ *[0-9a-f]*:	e5 a6 10 86 	cop cp0,cr0,cr8,cr6,0x4d
++
++[0-9a-f]* <fmov_s>:
++ *[0-9a-f]*:	e1 a5 0f f0 	cop cp0,cr15,cr15,cr0,0xa
++ *[0-9a-f]*:	e1 a5 00 00 	cop cp0,cr0,cr0,cr0,0xa
++ *[0-9a-f]*:	e1 a5 0f 00 	cop cp0,cr15,cr0,cr0,0xa
++ *[0-9a-f]*:	e1 a5 00 f0 	cop cp0,cr0,cr15,cr0,0xa
++ *[0-9a-f]*:	e1 a5 08 70 	cop cp0,cr8,cr7,cr0,0xa
++ *[0-9a-f]*:	e1 a5 07 80 	cop cp0,cr7,cr8,cr0,0xa
++ *[0-9a-f]*:	ef af 0f 00 	mvcr.w cp0,pc,cr15
++ *[0-9a-f]*:	ef a0 00 00 	mvcr.w cp0,r0,cr0
++ *[0-9a-f]*:	ef af 00 00 	mvcr.w cp0,pc,cr0
++ *[0-9a-f]*:	ef a0 0f 00 	mvcr.w cp0,r0,cr15
++ *[0-9a-f]*:	ef a8 07 00 	mvcr.w cp0,r8,cr7
++ *[0-9a-f]*:	ef a7 08 00 	mvcr.w cp0,r7,cr8
++ *[0-9a-f]*:	ef af 0f 20 	mvrc.w cp0,cr15,pc
++ *[0-9a-f]*:	ef a0 00 20 	mvrc.w cp0,cr0,r0
++ *[0-9a-f]*:	ef a0 0f 20 	mvrc.w cp0,cr15,r0
++ *[0-9a-f]*:	ef af 00 20 	mvrc.w cp0,cr0,pc
++ *[0-9a-f]*:	ef a7 08 20 	mvrc.w cp0,cr8,r7
++ *[0-9a-f]*:	ef a8 07 20 	mvrc.w cp0,cr7,r8
++
++[0-9a-f]* <fmov_d>:
++ *[0-9a-f]*:	e5 a5 0e e0 	cop cp0,cr14,cr14,cr0,0x4a
++ *[0-9a-f]*:	e5 a5 00 00 	cop cp0,cr0,cr0,cr0,0x4a
++ *[0-9a-f]*:	e5 a5 0e 00 	cop cp0,cr14,cr0,cr0,0x4a
++ *[0-9a-f]*:	e5 a5 00 e0 	cop cp0,cr0,cr14,cr0,0x4a
++ *[0-9a-f]*:	e5 a5 08 60 	cop cp0,cr8,cr6,cr0,0x4a
++ *[0-9a-f]*:	e5 a5 06 80 	cop cp0,cr6,cr8,cr0,0x4a
++ *[0-9a-f]*:	ef ae 0e 10 	mvcr.d cp0,lr,cr14
++ *[0-9a-f]*:	ef a0 00 10 	mvcr.d cp0,r0,cr0
++ *[0-9a-f]*:	ef ae 00 10 	mvcr.d cp0,lr,cr0
++ *[0-9a-f]*:	ef a0 0e 10 	mvcr.d cp0,r0,cr14
++ *[0-9a-f]*:	ef a8 06 10 	mvcr.d cp0,r8,cr6
++ *[0-9a-f]*:	ef a6 08 10 	mvcr.d cp0,r6,cr8
++ *[0-9a-f]*:	ef ae 0e 30 	mvrc.d cp0,cr14,lr
++ *[0-9a-f]*:	ef a0 00 30 	mvrc.d cp0,cr0,r0
++ *[0-9a-f]*:	ef a0 0e 30 	mvrc.d cp0,cr14,r0
++ *[0-9a-f]*:	ef ae 00 30 	mvrc.d cp0,cr0,lr
++ *[0-9a-f]*:	ef a6 08 30 	mvrc.d cp0,cr8,r6
++ *[0-9a-f]*:	ef a8 06 30 	mvrc.d cp0,cr6,r8
++
++[0-9a-f]* <fcasts_d>:
++ *[0-9a-f]*:	e1 a7 1f e0 	cop cp0,cr15,cr14,cr0,0xf
++ *[0-9a-f]*:	e1 a7 10 00 	cop cp0,cr0,cr0,cr0,0xf
++ *[0-9a-f]*:	e1 a7 1f 00 	cop cp0,cr15,cr0,cr0,0xf
++ *[0-9a-f]*:	e1 a7 10 e0 	cop cp0,cr0,cr14,cr0,0xf
++ *[0-9a-f]*:	e1 a7 18 60 	cop cp0,cr8,cr6,cr0,0xf
++ *[0-9a-f]*:	e1 a7 17 80 	cop cp0,cr7,cr8,cr0,0xf
++
++[0-9a-f]* <fcastd_s>:
++ *[0-9a-f]*:	e1 a8 0e f0 	cop cp0,cr14,cr15,cr0,0x10
++ *[0-9a-f]*:	e1 a8 00 00 	cop cp0,cr0,cr0,cr0,0x10
++ *[0-9a-f]*:	e1 a8 0e 00 	cop cp0,cr14,cr0,cr0,0x10
++ *[0-9a-f]*:	e1 a8 00 f0 	cop cp0,cr0,cr15,cr0,0x10
++ *[0-9a-f]*:	e1 a8 08 70 	cop cp0,cr8,cr7,cr0,0x10
++ *[0-9a-f]*:	e1 a8 06 80 	cop cp0,cr6,cr8,cr0,0x10
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/fpinsn.s
+@@ -0,0 +1,266 @@
++
++	.text
++	.global	fadd_s
++fadd_s:
++	fadd.s fr15, fr15, fr15
++	fadd.s fr0, fr0, fr0
++	fadd.s fr0, fr15, fr15
++	fadd.s fr15, fr0, fr15
++	fadd.s fr15, fr15, fr0
++	fadd.s fr7, fr8, fr8
++	fadd.s fr8, fr7, fr8
++	fadd.s fr8, fr8, fr7
++	.global	fsub_s
++fsub_s:
++	fsub.s fr15, fr15, fr15
++	fsub.s fr0, fr0, fr0
++	fsub.s fr0, fr15, fr15
++	fsub.s fr15, fr0, fr15
++	fsub.s fr15, fr15, fr0
++	fsub.s fr7, fr8, fr8
++	fsub.s fr8, fr7, fr8
++	fsub.s fr8, fr8, fr7
++	.global	fmac_s
++fmac_s:
++	fmac.s fr15, fr15, fr15
++	fmac.s fr0, fr0, fr0
++	fmac.s fr0, fr15, fr15
++	fmac.s fr15, fr0, fr15
++	fmac.s fr15, fr15, fr0
++	fmac.s fr7, fr8, fr8
++	fmac.s fr8, fr7, fr8
++	fmac.s fr8, fr8, fr7
++	.global	fnmac_s
++fnmac_s:
++	fnmac.s fr15, fr15, fr15
++	fnmac.s fr0, fr0, fr0
++	fnmac.s fr0, fr15, fr15
++	fnmac.s fr15, fr0, fr15
++	fnmac.s fr15, fr15, fr0
++	fnmac.s fr7, fr8, fr8
++	fnmac.s fr8, fr7, fr8
++	fnmac.s fr8, fr8, fr7
++	.global	fmsc_s
++fmsc_s:
++	fmsc.s fr15, fr15, fr15
++	fmsc.s fr0, fr0, fr0
++	fmsc.s fr0, fr15, fr15
++	fmsc.s fr15, fr0, fr15
++	fmsc.s fr15, fr15, fr0
++	fmsc.s fr7, fr8, fr8
++	fmsc.s fr8, fr7, fr8
++	fmsc.s fr8, fr8, fr7
++	.global	fnmsc_s
++fnmsc_s:
++	fnmsc.s fr15, fr15, fr15
++	fnmsc.s fr0, fr0, fr0
++	fnmsc.s fr0, fr15, fr15
++	fnmsc.s fr15, fr0, fr15
++	fnmsc.s fr15, fr15, fr0
++	fnmsc.s fr7, fr8, fr8
++	fnmsc.s fr8, fr7, fr8
++	fnmsc.s fr8, fr8, fr7
++	.global	fmul_s
++fmul_s:
++	fmul.s fr15, fr15, fr15
++	fmul.s fr0, fr0, fr0
++	fmul.s fr0, fr15, fr15
++	fmul.s fr15, fr0, fr15
++	fmul.s fr15, fr15, fr0
++	fmul.s fr7, fr8, fr8
++	fmul.s fr8, fr7, fr8
++	fmul.s fr8, fr8, fr7
++	.global	fnmul_s
++fnmul_s:
++	fnmul.s fr15, fr15, fr15
++	fnmul.s fr0, fr0, fr0
++	fnmul.s fr0, fr15, fr15
++	fnmul.s fr15, fr0, fr15
++	fnmul.s fr15, fr15, fr0
++	fnmul.s fr7, fr8, fr8
++	fnmul.s fr8, fr7, fr8
++	fnmul.s fr8, fr8, fr7
++	.global	fneg_s
++fneg_s:
++	fneg.s fr15, fr15
++	fneg.s fr0, fr0
++	fneg.s fr0, fr15
++	fneg.s fr15, fr0
++	fneg.s fr7, fr8
++	fneg.s fr8, fr7
++	.global	fabs_s
++fabs_s:
++	fabs.s fr15, fr15
++	fabs.s fr0, fr0
++	fabs.s fr0, fr15
++	fabs.s fr15, fr0
++	fabs.s fr7, fr8
++	fabs.s fr8, fr7
++	.global	fcmp_s
++fcmp_s:
++	fcmp.s fr15, fr15
++	fcmp.s fr0, fr0
++	fcmp.s fr0, fr15
++	fcmp.s fr15, fr0
++	fcmp.s fr7, fr8
++	fcmp.s fr8, fr7
++	.global	fadd_d
++fadd_d:
++	fadd.d fr14, fr14, fr14
++	fadd.d fr0, fr0, fr0
++	fadd.d fr0, fr14, fr14
++	fadd.d fr14, fr0, fr14
++	fadd.d fr14, fr14, fr0
++	fadd.d fr6, fr8, fr8
++	fadd.d fr8, fr6, fr8
++	fadd.d fr8, fr8, fr6
++	.global	fsub_d
++fsub_d:
++	fsub.d fr14, fr14, fr14
++	fsub.d fr0, fr0, fr0
++	fsub.d fr0, fr14, fr14
++	fsub.d fr14, fr0, fr14
++	fsub.d fr14, fr14, fr0
++	fsub.d fr6, fr8, fr8
++	fsub.d fr8, fr6, fr8
++	fsub.d fr8, fr8, fr6
++	.global	fmac_d
++fmac_d:
++	fmac.d fr14, fr14, fr14
++	fmac.d fr0, fr0, fr0
++	fmac.d fr0, fr14, fr14
++	fmac.d fr14, fr0, fr14
++	fmac.d fr14, fr14, fr0
++	fmac.d fr6, fr8, fr8
++	fmac.d fr8, fr6, fr8
++	fmac.d fr8, fr8, fr6
++	.global	fnmac_d
++fnmac_d:
++	fnmac.d fr14, fr14, fr14
++	fnmac.d fr0, fr0, fr0
++	fnmac.d fr0, fr14, fr14
++	fnmac.d fr14, fr0, fr14
++	fnmac.d fr14, fr14, fr0
++	fnmac.d fr6, fr8, fr8
++	fnmac.d fr8, fr6, fr8
++	fnmac.d fr8, fr8, fr6
++	.global	fmsc_d
++fmsc_d:
++	fmsc.d fr14, fr14, fr14
++	fmsc.d fr0, fr0, fr0
++	fmsc.d fr0, fr14, fr14
++	fmsc.d fr14, fr0, fr14
++	fmsc.d fr14, fr14, fr0
++	fmsc.d fr6, fr8, fr8
++	fmsc.d fr8, fr6, fr8
++	fmsc.d fr8, fr8, fr6
++	.global	fnmsc_d
++fnmsc_d:
++	fnmsc.d fr14, fr14, fr14
++	fnmsc.d fr0, fr0, fr0
++	fnmsc.d fr0, fr14, fr14
++	fnmsc.d fr14, fr0, fr14
++	fnmsc.d fr14, fr14, fr0
++	fnmsc.d fr6, fr8, fr8
++	fnmsc.d fr8, fr6, fr8
++	fnmsc.d fr8, fr8, fr6
++	.global	fmul_d
++fmul_d:
++	fmul.d fr14, fr14, fr14
++	fmul.d fr0, fr0, fr0
++	fmul.d fr0, fr14, fr14
++	fmul.d fr14, fr0, fr14
++	fmul.d fr14, fr14, fr0
++	fmul.d fr6, fr8, fr8
++	fmul.d fr8, fr6, fr8
++	fmul.d fr8, fr8, fr6
++	.global	fnmul_d
++fnmul_d:
++	fnmul.d fr14, fr14, fr14
++	fnmul.d fr0, fr0, fr0
++	fnmul.d fr0, fr14, fr14
++	fnmul.d fr14, fr0, fr14
++	fnmul.d fr14, fr14, fr0
++	fnmul.d fr6, fr8, fr8
++	fnmul.d fr8, fr6, fr8
++	fnmul.d fr8, fr8, fr6
++	.global	fneg_d
++fneg_d:
++	fneg.d fr14, fr14
++	fneg.d fr0, fr0
++	fneg.d fr0, fr14
++	fneg.d fr14, fr0
++	fneg.d fr6, fr8
++	fneg.d fr8, fr6
++	.global	fabs_d
++fabs_d:
++	fabs.d fr14, fr14
++	fabs.d fr0, fr0
++	fabs.d fr0, fr14
++	fabs.d fr14, fr0
++	fabs.d fr6, fr8
++	fabs.d fr8, fr6
++	.global	fcmp_d
++fcmp_d:
++	fcmp.d fr14, fr14
++	fcmp.d fr0, fr0
++	fcmp.d fr0, fr14
++	fcmp.d fr14, fr0
++	fcmp.d fr6, fr8
++	fcmp.d fr8, fr6
++	.global fmov_s
++fmov_s:
++	fmov.s fr15, fr15
++	fmov.s fr0, fr0
++	fmov.s fr15, fr0
++	fmov.s fr0, fr15
++	fmov.s fr8, fr7
++	fmov.s fr7, fr8
++	fmov.s pc, fr15
++	fmov.s r0, fr0
++	fmov.s pc, fr0
++	fmov.s r0, fr15
++	fmov.s r8, fr7
++	fmov.s r7, fr8
++	fmov.s fr15, pc
++	fmov.s fr0, r0
++	fmov.s fr15, r0
++	fmov.s fr0, pc
++	fmov.s fr8, r7
++	fmov.s fr7, r8
++	.global fmov_d
++fmov_d:
++	fmov.d fr14, fr14
++	fmov.d fr0, fr0
++	fmov.d fr14, fr0
++	fmov.d fr0, fr14
++	fmov.d fr8, fr6
++	fmov.d fr6, fr8
++	fmov.d lr, fr14
++	fmov.d r0, fr0
++	fmov.d lr, fr0
++	fmov.d r0, fr14
++	fmov.d r8, fr6
++	fmov.d r6, fr8
++	fmov.d fr14, lr
++	fmov.d fr0, r0
++	fmov.d fr14, r0
++	fmov.d fr0, lr
++	fmov.d fr8, r6
++	fmov.d fr6, r8
++	.global fcasts_d
++fcasts_d:
++	fcasts.d fr15, fr14
++	fcasts.d fr0, fr0
++	fcasts.d fr15, fr0
++	fcasts.d fr0, fr14
++	fcasts.d fr8, fr6
++	fcasts.d fr7, fr8
++	.global fcastd_s
++fcastd_s:
++	fcastd.s fr14, fr15
++	fcastd.s fr0, fr0
++	fcastd.s fr14, fr0
++	fcastd.s fr0, fr15
++	fcastd.s fr8, fr7
++	fcastd.s fr6, fr8
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/hwrd-lwrd.d
+@@ -0,0 +1,47 @@
++#as:
++#objdump: -dr
++#name: hwrd-lwrd
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <test_hwrd>:
++   0:	e0 60 87 65 	mov r0,34661
++   4:	e0 60 12 34 	mov r0,4660
++   8:	e0 60 00 00 	mov r0,0
++			8: R_AVR32_HI16	\.text\+0x60
++   c:	e0 60 00 00 	mov r0,0
++			c: R_AVR32_HI16	extsym1
++  10:	ea 10 87 65 	orh r0,0x8765
++  14:	ea 10 12 34 	orh r0,0x1234
++  18:	ea 10 00 00 	orh r0,0x0
++			18: R_AVR32_HI16	\.text\+0x60
++  1c:	ea 10 00 00 	orh r0,0x0
++			1c: R_AVR32_HI16	extsym1
++  20:	e4 10 87 65 	andh r0,0x8765
++  24:	e4 10 12 34 	andh r0,0x1234
++  28:	e4 10 00 00 	andh r0,0x0
++			28: R_AVR32_HI16	\.text\+0x60
++  2c:	e4 10 00 00 	andh r0,0x0
++			2c: R_AVR32_HI16	extsym1
++
++00000030 <test_lwrd>:
++  30:	e0 60 43 21 	mov r0,17185
++  34:	e0 60 56 78 	mov r0,22136
++  38:	e0 60 00 00 	mov r0,0
++			38: R_AVR32_LO16	\.text\+0x60
++  3c:	e0 60 00 00 	mov r0,0
++			3c: R_AVR32_LO16	extsym1
++  40:	e8 10 43 21 	orl r0,0x4321
++  44:	e8 10 56 78 	orl r0,0x5678
++  48:	e8 10 00 00 	orl r0,0x0
++			48: R_AVR32_LO16	\.text\+0x60
++  4c:	e8 10 00 00 	orl r0,0x0
++			4c: R_AVR32_LO16	extsym1
++  50:	e0 10 43 21 	andl r0,0x4321
++  54:	e0 10 56 78 	andl r0,0x5678
++  58:	e0 10 00 00 	andl r0,0x0
++			58: R_AVR32_LO16	\.text\+0x60
++  5c:	e0 10 00 00 	andl r0,0x0
++			5c: R_AVR32_LO16	extsym1
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/hwrd-lwrd.s
+@@ -0,0 +1,39 @@
++
++        .equ    sym1, 0x12345678
++
++        .text
++        .global test_hwrd
++test_hwrd:
++        mov     r0, hi(0x87654321)
++        mov     r0, hi(sym1)
++        mov     r0, hi(sym2)
++        mov     r0, hi(extsym1)
++
++        orh	r0, hi(0x87654321)
++        orh	r0, hi(sym1)
++        orh	r0, hi(sym2)
++        orh	r0, hi(extsym1)
++
++        andh	r0, hi(0x87654321)
++        andh	r0, hi(sym1)
++        andh	r0, hi(sym2)
++        andh	r0, hi(extsym1)
++
++        .global test_lwrd
++test_lwrd:
++        mov     r0, lo(0x87654321)
++        mov     r0, lo(sym1)
++        mov     r0, lo(sym2)
++        mov     r0, lo(extsym1)
++
++        orl	r0, lo(0x87654321)
++        orl	r0, lo(sym1)
++        orl	r0, lo(sym2)
++        orl	r0, lo(extsym1)
++
++        andl	r0, lo(0x87654321)
++        andl	r0, lo(sym1)
++        andl	r0, lo(sym2)
++        andl	r0, lo(extsym1)
++
++sym2:
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/jmptable.d
+@@ -0,0 +1,20 @@
++#source: jmptable.s
++#as:
++#objdump: -dr
++#name: jmptable
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <jmptable_test>:
++   0:	fe c8 ff f4 	sub r8,pc,-12
++   4:	f0 00 00 2f 	add pc,r8,r0<<0x2
++   8:	d7 03       	nop
++   a:	00 00       	add r0,r0
++   c:	c0 38       	rjmp 12 <jmptable_test\+0x12>
++   e:	c0 38       	rjmp 14 <jmptable_test\+0x14>
++  10:	c0 38       	rjmp 16 <jmptable_test\+0x16>
++  12:	d7 03       	nop
++  14:	d7 03       	nop
++  16:	d7 03       	nop
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/jmptable_linkrelax.d
+@@ -0,0 +1,25 @@
++#source: jmptable.s
++#as: --linkrelax
++#objdump: -dr
++#name: jmptable_linkrelax
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <jmptable_test>:
++   0:	fe c8 00 00 	sub r8,pc,0
++			0: R_AVR32_16N_PCREL	\.text\+0xc
++   4:	f0 00 00 2f 	add pc,r8,r0<<0x2
++   8:	d7 03       	nop
++   a:	00 00       	add r0,r0
++			a: R_AVR32_ALIGN	\*ABS\*\+0x2
++   c:	c0 08       	rjmp c <jmptable_test\+0xc>
++			c: R_AVR32_11H_PCREL	\.text\+0x12
++   e:	c0 08       	rjmp e <jmptable_test\+0xe>
++			e: R_AVR32_11H_PCREL	\.text\+0x14
++  10:	c0 08       	rjmp 10 <jmptable_test\+0x10>
++			10: R_AVR32_11H_PCREL	\.text\+0x16
++  12:	d7 03       	nop
++  14:	d7 03       	nop
++  16:	d7 03       	nop
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/jmptable.s
+@@ -0,0 +1,14 @@
++
++	.text
++	.global	jmptable_test
++jmptable_test:
++	sub	r8, pc, -(.L1 - .)
++	add	pc, r8, r0 << 2
++	nop
++	.align	2
++.L1:	rjmp	1f
++	rjmp	2f
++	rjmp	3f
++1:	nop
++2:	nop
++3:	nop
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_nopic.d
+@@ -0,0 +1,32 @@
++#source: lda.s
++#as:
++#objdump: -dr
++#name: lda_nopic
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <lda_test>:
++       0:	f2 c8 00 00 	sub r8,r9,0
++
++00000004 <far_negative>:
++       4:	f6 ca 00 00 	sub r10,r11,0
++	...
++    8000:	fe c0 7f fc 	sub r0,pc,32764
++    8004:	48 31       	lddpc r1,8010 <far_negative\+0x800c>
++    8006:	48 42       	lddpc r2,8014 <far_negative\+0x8010>
++    8008:	48 43       	lddpc r3,8018 <far_negative\+0x8014>
++    800a:	48 54       	lddpc r4,801c <far_negative\+0x8018>
++    800c:	fe c5 80 04 	sub r5,pc,-32764
++	...
++			8010: R_AVR32_32_CPENT	\.text
++			8014: R_AVR32_32_CPENT	\.data
++			8018: R_AVR32_32_CPENT	undefined
++			801c: R_AVR32_32_CPENT	\.text\+0x1001c
++
++00010008 <far_positive>:
++   10008:	fa cc 00 00 	sub r12,sp,0
++	...
++0001001c <toofar_positive>:
++   1001c:	fe ce 00 00 	sub lr,pc,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d
+@@ -0,0 +1,41 @@
++#source: lda.s
++#as: --linkrelax
++#objdump: -dr
++#name: lda_nopic_linkrelax
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <lda_test>:
++       0:	f2 c8 00 00 	sub r8,r9,0
++
++00000004 <far_negative>:
++       4:	f6 ca 00 00 	sub r10,r11,0
++	\.\.\.
++    8000:	48 00       	lddpc r0,8000 <far_negative\+0x7ffc>
++			8000: R_AVR32_9W_CP	\.text\+0x800c
++    8002:	48 01       	lddpc r1,8000 <far_negative\+0x7ffc>
++			8002: R_AVR32_9W_CP	\.text\+0x8010
++    8004:	48 02       	lddpc r2,8004 <far_negative\+0x8000>
++			8004: R_AVR32_9W_CP	\.text\+0x8014
++    8006:	48 03       	lddpc r3,8004 <far_negative\+0x8000>
++			8006: R_AVR32_9W_CP	\.text\+0x8018
++    8008:	48 04       	lddpc r4,8008 <far_negative\+0x8004>
++			8008: R_AVR32_9W_CP	\.text\+0x801c
++    800a:	48 05       	lddpc r5,8008 <far_negative\+0x8004>
++			800a: R_AVR32_9W_CP	\.text\+0x8020
++	\.\.\.
++			800c: R_AVR32_ALIGN	\*ABS\*\+0x2
++			800c: R_AVR32_32_CPENT	\.text\+0x4
++			8010: R_AVR32_32_CPENT	\.text
++			8014: R_AVR32_32_CPENT	\.data
++			8018: R_AVR32_32_CPENT	undefined
++			801c: R_AVR32_32_CPENT	\.text\+0x10020
++			8020: R_AVR32_32_CPENT	\.text\+0x1000c
++
++0001000c <far_positive>:
++   1000c:	fa cc 00 00 	sub r12,sp,0
++	\.\.\.
++00010020 <toofar_positive>:
++   10020:	fe ce 00 00 	sub lr,pc,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_pic.d
+@@ -0,0 +1,32 @@
++#source: lda.s
++#as: --pic
++#objdump: -dr
++#name: lda_pic
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <lda_test>:
++       0:	f2 c8 00 00 	sub r8,r9,0
++
++00000004 <far_negative>:
++       4:	f6 ca 00 00 	sub r10,r11,0
++	...
++    8000:	fe c0 7f fc 	sub r0,pc,32764
++    8004:	ec f1 00 00 	ld.w r1,r6\[0\]
++			8004: R_AVR32_GOT16S	toofar_negative
++    8008:	ec f2 00 00 	ld.w r2,r6\[0\]
++			8008: R_AVR32_GOT16S	different_section
++    800c:	ec f3 00 00 	ld.w r3,r6\[0\]
++			800c: R_AVR32_GOT16S	undefined
++    8010:	ec f4 00 00 	ld.w r4,r6\[0\]
++			8010: R_AVR32_GOT16S	toofar_positive
++    8014:	fe c5 80 14 	sub r5,pc,-32748
++	...
++
++00010000 <far_positive>:
++   10000:	fa cc 00 00 	sub r12,sp,0
++	...
++00010014 <toofar_positive>:
++   10014:	fe ce 00 00 	sub lr,pc,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_pic_linkrelax.d
+@@ -0,0 +1,40 @@
++#source: lda.s
++#as: --pic --linkrelax
++#objdump: -dr
++#name: lda_pic_linkrelax
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <lda_test>:
++       0:	f2 c8 00 00 	sub r8,r9,0
++
++00000004 <far_negative>:
++       4:	f6 ca 00 00 	sub r10,r11,0
++	...
++    8000:	e0 60 00 00 	mov r0,0
++			8000: R_AVR32_LDA_GOT	far_negative
++    8004:	ec 00 03 20 	ld\.w r0,r6\[r0<<0x2\]
++    8008:	e0 61 00 00 	mov r1,0
++			8008: R_AVR32_LDA_GOT	toofar_negative
++    800c:	ec 01 03 21 	ld\.w r1,r6\[r1<<0x2\]
++    8010:	e0 62 00 00 	mov r2,0
++			8010: R_AVR32_LDA_GOT	different_section
++    8014:	ec 02 03 22 	ld\.w r2,r6\[r2<<0x2\]
++    8018:	e0 63 00 00 	mov r3,0
++			8018: R_AVR32_LDA_GOT	undefined
++    801c:	ec 03 03 23 	ld\.w r3,r6\[r3<<0x2\]
++    8020:	e0 64 00 00 	mov r4,0
++			8020: R_AVR32_LDA_GOT	toofar_positive
++    8024:	ec 04 03 24 	ld\.w r4,r6\[r4<<0x2\]
++    8028:	e0 65 00 00 	mov r5,0
++			8028: R_AVR32_LDA_GOT	far_positive
++    802c:	ec 05 03 25 	ld\.w r5,r6\[r5<<0x2\]
++	...
++
++00010018 <far_positive>:
++   10018:	fa cc 00 00 	sub r12,sp,0
++	...
++0001002c <toofar_positive>:
++   1002c:	fe ce 00 00 	sub lr,pc,0
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda.s
+@@ -0,0 +1,30 @@
++
++	.text
++	.global lda_test
++lda_test:
++toofar_negative:
++	sub	r8, r9, 0
++far_negative:
++	sub	r10, r11, 0
++
++	.fill	32760, 1, 0x00
++
++	lda.w	r0, far_negative
++	lda.w	r1, toofar_negative
++	lda.w	r2, different_section
++	lda.w	r3, undefined
++	lda.w	r4, toofar_positive
++	lda.w	r5, far_positive
++
++	.cpool
++
++	.fill	32744, 1, 0x00
++far_positive:
++	sub	r12, sp, 0
++	.fill	16, 1, 0x00
++toofar_positive:
++	sub	lr, pc, 0
++
++	.data
++different_section:
++	.long	0x12345678
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pcrel.d
+@@ -0,0 +1,64 @@
++#as:
++#objdump: -dr
++#name: pcrel
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <test_rjmp>:
++   0:	d7 03       	nop
++   2:	c0 28       	rjmp 6 <test_rjmp\+0x6>
++   4:	d7 03       	nop
++   6:	e0 8f 00 00 	bral 6 <test_rjmp\+0x6>
++			6: R_AVR32_22H_PCREL	extsym10
++
++0000000a <test_rcall>:
++   a:	d7 03       	nop
++0000000c <test_rcall2>:
++   c:	c0 2c       	rcall 10 <test_rcall2\+0x4>
++   e:	d7 03       	nop
++  10:	e0 a0 00 00 	rcall 10 <test_rcall2\+0x4>
++			10: R_AVR32_22H_PCREL	extsym21
++
++00000014 <test_branch>:
++  14:	c0 31       	brne 1a <test_branch\+0x6>
++  16:	e0 8f 00 00 	bral 16 <test_branch\+0x2>
++			16: R_AVR32_22H_PCREL	test_branch
++  1a:	e0 80 00 00 	breq 1a <test_branch\+0x6>
++			1a: R_AVR32_22H_PCREL	extsym21
++
++0000001e <test_lddpc>:
++  1e:	48 30       	lddpc r0,28 <sym1>
++  20:	48 20       	lddpc r0,28 <sym1>
++  22:	fe f0 00 00 	ld.w r0,pc\[0\]
++			22: R_AVR32_16B_PCREL	extsym16
++	\.\.\.
++
++00000028 <sym1>:
++  28:	d7 03       	nop
++  2a:	d7 03       	nop
++
++0000002c <test_local>:
++  2c:	48 20       	lddpc r0,34 <test_local\+0x8>
++  2e:	48 30       	lddpc r0,38 <test_local\+0xc>
++  30:	48 20       	lddpc r0,38 <test_local\+0xc>
++  32:	00 00       	add r0,r0
++  34:	d7 03       	nop
++  36:	d7 03       	nop
++  38:	d7 03       	nop
++  3a:	d7 03       	nop
++
++Disassembly of section \.text\.init:
++
++00000000 <test_inter_section>:
++   0:	e0 a0 .. .. 	rcall [0-9a-f]+ <.*>
++			0: R_AVR32_22H_PCREL	test_rcall
++   4:	d7 03       	nop
++   6:	e0 a0 .. .. 	rcall [0-9a-f]+ <.*>
++			6: R_AVR32_22H_PCREL	test_rcall
++   a:	e0 a0 .. .. 	rcall [0-9a-z]+ <.*>
++			a: R_AVR32_22H_PCREL	\.text\+0xc
++   e:	d7 03       	nop
++  10:	e0 a0 .. .. 	rcall [0-9a-f]+ <.*>
++			10: R_AVR32_22H_PCREL	\.text\+0xc
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pcrel.s
+@@ -0,0 +1,57 @@
++
++        .text
++        .global test_rjmp
++test_rjmp:
++        nop
++        rjmp    0f
++        nop
++0:      rjmp    extsym10
++
++        .global test_rcall
++test_rcall:
++        nop
++test_rcall2:
++        rcall   0f
++        nop
++0:      rcall   extsym21
++
++        .global test_branch
++test_branch:
++        brne    0f
++	/* This will generate a reloc since test_branch is global */
++        bral    test_branch
++0:	breq    extsym21
++
++        .global test_lddpc
++test_lddpc:
++        lddpc   r0,sym1
++        lddpc   r0,sym1
++        lddpc   r0,extsym16
++
++        .align	2
++sym1:   nop
++        nop
++
++	.global	test_local
++test_local:
++	lddpc	r0, .LC1
++	lddpc	r0, .LC2
++	lddpc	r0, .LC1 + 0x4
++
++	.align	2
++.LC1:
++	nop
++	nop
++.LC2:
++	nop
++	nop
++
++	.section .text.init,"ax"
++	.global test_inter_section
++test_inter_section:
++	rcall	test_rcall
++	nop
++	rcall	test_rcall
++	rcall	test_rcall2
++	nop
++	rcall	test_rcall2
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pico.d
+@@ -0,0 +1,149 @@
++#as:
++#objdump: -dr
++#name: pico
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++[0-9a-f]* <picosvmac>:
++ *[0-9a-f]*:	e1 a6 20 00 	cop cp1,cr0,cr0,cr0,0xc
++ *[0-9a-f]*:	e1 a7 2b bb 	cop cp1,cr11,cr11,cr11,0xe
++ *[0-9a-f]*:	e1 a6 3a 05 	cop cp1,cr10,cr0,cr5,0xd
++ *[0-9a-f]*:	e1 a7 36 90 	cop cp1,cr6,cr9,cr0,0xf
++
++[0-9a-f]* <picosvmul>:
++ *[0-9a-f]*:	e1 a4 20 00 	cop cp1,cr0,cr0,cr0,0x8
++ *[0-9a-f]*:	e1 a5 2b bb 	cop cp1,cr11,cr11,cr11,0xa
++ *[0-9a-f]*:	e1 a4 3a 05 	cop cp1,cr10,cr0,cr5,0x9
++ *[0-9a-f]*:	e1 a5 36 90 	cop cp1,cr6,cr9,cr0,0xb
++
++[0-9a-f]* <picovmac>:
++ *[0-9a-f]*:	e1 a2 20 00 	cop cp1,cr0,cr0,cr0,0x4
++ *[0-9a-f]*:	e1 a3 2b bb 	cop cp1,cr11,cr11,cr11,0x6
++ *[0-9a-f]*:	e1 a2 3a 05 	cop cp1,cr10,cr0,cr5,0x5
++ *[0-9a-f]*:	e1 a3 36 90 	cop cp1,cr6,cr9,cr0,0x7
++
++[0-9a-f]* <picovmul>:
++ *[0-9a-f]*:	e1 a0 20 00 	cop cp1,cr0,cr0,cr0,0x0
++ *[0-9a-f]*:	e1 a1 2b bb 	cop cp1,cr11,cr11,cr11,0x2
++ *[0-9a-f]*:	e1 a0 3a 05 	cop cp1,cr10,cr0,cr5,0x1
++ *[0-9a-f]*:	e1 a1 36 90 	cop cp1,cr6,cr9,cr0,0x3
++
++[0-9a-f]* <picold_d>:
++ *[0-9a-f]*:	e9 af 3e ff 	ldc\.d cp1,cr14,pc\[0x3fc\]
++ *[0-9a-f]*:	e9 a0 30 ff 	ldc\.d cp1,cr0,r0\[0x3fc\]
++ *[0-9a-f]*:	e9 a0 30 00 	ldc\.d cp1,cr0,r0\[0x0\]
++ *[0-9a-f]*:	ef a8 26 50 	ldc\.d cp1,cr6,--r8
++ *[0-9a-f]*:	ef a7 28 50 	ldc\.d cp1,cr8,--r7
++ *[0-9a-f]*:	ef aa 32 65 	ldc\.d cp1,cr2,r10\[r5<<0x2\]
++ *[0-9a-f]*:	ef a3 3c 46 	ldc\.d cp1,cr12,r3\[r6\]
++
++[0-9a-f]* <picold_w>:
++ *[0-9a-f]*:	e9 af 2f ff 	ldc\.w cp1,cr15,pc\[0x3fc\]
++ *[0-9a-f]*:	e9 a0 20 ff 	ldc\.w cp1,cr0,r0\[0x3fc\]
++ *[0-9a-f]*:	e9 a0 20 00 	ldc\.w cp1,cr0,r0\[0x0\]
++ *[0-9a-f]*:	ef a8 27 40 	ldc\.w cp1,cr7,--r8
++ *[0-9a-f]*:	ef a7 28 40 	ldc\.w cp1,cr8,--r7
++ *[0-9a-f]*:	ef aa 31 25 	ldc\.w cp1,cr1,r10\[r5<<0x2\]
++ *[0-9a-f]*:	ef a3 3d 06 	ldc\.w cp1,cr13,r3\[r6\]
++
++[0-9a-f]* <picoldm_d>:
++ *[0-9a-f]*:	ed af 24 ff 	ldcm\.d cp1,pc,cr0-cr15
++ *[0-9a-f]*:	ed a0 24 01 	ldcm\.d cp1,r0,cr0-cr1
++ *[0-9a-f]*:	ed a7 24 80 	ldcm\.d cp1,r7,cr14-cr15
++ *[0-9a-f]*:	ed a8 24 7f 	ldcm\.d cp1,r8,cr0-cr13
++
++[0-9a-f]* <picoldm_d_pu>:
++ *[0-9a-f]*:	ed af 34 ff 	ldcm\.d cp1,pc\+\+,cr0-cr15
++ *[0-9a-f]*:	ed a0 34 01 	ldcm\.d cp1,r0\+\+,cr0-cr1
++ *[0-9a-f]*:	ed a7 34 80 	ldcm\.d cp1,r7\+\+,cr14-cr15
++ *[0-9a-f]*:	ed a8 34 7f 	ldcm\.d cp1,r8\+\+,cr0-cr13
++
++[0-9a-f]* <picoldm_w>:
++ *[0-9a-f]*:	ed af 20 ff 	ldcm\.w cp1,pc,cr0-cr7
++ *[0-9a-f]*:	ed a0 20 01 	ldcm\.w cp1,r0,cr0
++ *[0-9a-f]*:	ed a7 20 80 	ldcm\.w cp1,r7,cr7
++ *[0-9a-f]*:	ed a8 20 7f 	ldcm\.w cp1,r8,cr0-cr6
++ *[0-9a-f]*:	ed af 21 ff 	ldcm\.w cp1,pc,cr8-cr15
++ *[0-9a-f]*:	ed a0 21 01 	ldcm\.w cp1,r0,cr8
++ *[0-9a-f]*:	ed a7 21 80 	ldcm\.w cp1,r7,cr15
++ *[0-9a-f]*:	ed a8 21 7f 	ldcm\.w cp1,r8,cr8-cr14
++
++[0-9a-f]* <picoldm_w_pu>:
++ *[0-9a-f]*:	ed af 30 ff 	ldcm\.w cp1,pc\+\+,cr0-cr7
++ *[0-9a-f]*:	ed a0 30 01 	ldcm\.w cp1,r0\+\+,cr0
++ *[0-9a-f]*:	ed a7 30 80 	ldcm\.w cp1,r7\+\+,cr7
++ *[0-9a-f]*:	ed a8 30 7f 	ldcm\.w cp1,r8\+\+,cr0-cr6
++ *[0-9a-f]*:	ed af 31 ff 	ldcm\.w cp1,pc\+\+,cr8-cr15
++ *[0-9a-f]*:	ed a0 31 01 	ldcm\.w cp1,r0\+\+,cr8
++ *[0-9a-f]*:	ed a7 31 80 	ldcm\.w cp1,r7\+\+,cr15
++ *[0-9a-f]*:	ed a8 31 7f 	ldcm\.w cp1,r8\+\+,cr8-cr14
++
++[0-9a-f]* <picomv_d>:
++ *[0-9a-f]*:	ef ae 2e 30 	mvrc\.d cp1,cr14,lr
++ *[0-9a-f]*:	ef a0 20 30 	mvrc\.d cp1,cr0,r0
++ *[0-9a-f]*:	ef a8 26 30 	mvrc\.d cp1,cr6,r8
++ *[0-9a-f]*:	ef a6 28 30 	mvrc\.d cp1,cr8,r6
++ *[0-9a-f]*:	ef ae 2e 10 	mvcr\.d cp1,lr,cr14
++ *[0-9a-f]*:	ef a0 20 10 	mvcr\.d cp1,r0,cr0
++ *[0-9a-f]*:	ef a8 26 10 	mvcr\.d cp1,r8,cr6
++ *[0-9a-f]*:	ef a6 28 10 	mvcr\.d cp1,r6,cr8
++
++[0-9a-f]* <picomv_w>:
++ *[0-9a-f]*:	ef af 2f 20 	mvrc\.w cp1,cr15,pc
++ *[0-9a-f]*:	ef a0 20 20 	mvrc\.w cp1,cr0,r0
++ *[0-9a-f]*:	ef a8 27 20 	mvrc\.w cp1,cr7,r8
++ *[0-9a-f]*:	ef a7 28 20 	mvrc\.w cp1,cr8,r7
++ *[0-9a-f]*:	ef af 2f 00 	mvcr\.w cp1,pc,cr15
++ *[0-9a-f]*:	ef a0 20 00 	mvcr\.w cp1,r0,cr0
++ *[0-9a-f]*:	ef a8 27 00 	mvcr\.w cp1,r8,cr7
++ *[0-9a-f]*:	ef a7 28 00 	mvcr\.w cp1,r7,cr8
++
++[0-9a-f]* <picost_d>:
++ *[0-9a-f]*:	eb af 3e ff 	stc\.d cp1,pc\[0x3fc\],cr14
++ *[0-9a-f]*:	eb a0 30 00 	stc\.d cp1,r0\[0x0\],cr0
++ *[0-9a-f]*:	ef a8 26 70 	stc\.d cp1,r8\+\+,cr6
++ *[0-9a-f]*:	ef a7 28 70 	stc\.d cp1,r7\+\+,cr8
++ *[0-9a-f]*:	ef aa 32 e5 	stc\.d cp1,r10\[r5<<0x2\],cr2
++ *[0-9a-f]*:	ef a3 3c c6 	stc\.d cp1,r3\[r6\],cr12
++
++[0-9a-f]* <picost_w>:
++ *[0-9a-f]*:	eb af 2f ff 	stc\.w cp1,pc\[0x3fc\],cr15
++ *[0-9a-f]*:	eb a0 20 00 	stc\.w cp1,r0\[0x0\],cr0
++ *[0-9a-f]*:	ef a8 27 60 	stc\.w cp1,r8\+\+,cr7
++ *[0-9a-f]*:	ef a7 28 60 	stc\.w cp1,r7\+\+,cr8
++ *[0-9a-f]*:	ef aa 31 a5 	stc\.w cp1,r10\[r5<<0x2\],cr1
++ *[0-9a-f]*:	ef a3 3d 86 	stc\.w cp1,r3\[r6\],cr13
++
++[0-9a-f]* <picostm_d>:
++ *[0-9a-f]*:	ed af 25 ff 	stcm\.d cp1,pc,cr0-cr15
++ *[0-9a-f]*:	ed a0 25 01 	stcm\.d cp1,r0,cr0-cr1
++ *[0-9a-f]*:	ed a7 25 80 	stcm\.d cp1,r7,cr14-cr15
++ *[0-9a-f]*:	ed a8 25 7f 	stcm\.d cp1,r8,cr0-cr13
++
++[0-9a-f]* <picostm_d_pu>:
++ *[0-9a-f]*:	ed af 35 ff 	stcm\.d cp1,--pc,cr0-cr15
++ *[0-9a-f]*:	ed a0 35 01 	stcm\.d cp1,--r0,cr0-cr1
++ *[0-9a-f]*:	ed a7 35 80 	stcm\.d cp1,--r7,cr14-cr15
++ *[0-9a-f]*:	ed a8 35 7f 	stcm\.d cp1,--r8,cr0-cr13
++
++[0-9a-f]* <picostm_w>:
++ *[0-9a-f]*:	ed af 22 ff 	stcm\.w cp1,pc,cr0-cr7
++ *[0-9a-f]*:	ed a0 22 01 	stcm\.w cp1,r0,cr0
++ *[0-9a-f]*:	ed a7 22 80 	stcm\.w cp1,r7,cr7
++ *[0-9a-f]*:	ed a8 22 7f 	stcm\.w cp1,r8,cr0-cr6
++ *[0-9a-f]*:	ed af 23 ff 	stcm\.w cp1,pc,cr8-cr15
++ *[0-9a-f]*:	ed a0 23 01 	stcm\.w cp1,r0,cr8
++ *[0-9a-f]*:	ed a7 23 80 	stcm\.w cp1,r7,cr15
++ *[0-9a-f]*:	ed a8 23 7f 	stcm\.w cp1,r8,cr8-cr14
++
++[0-9a-f]* <picostm_w_pu>:
++ *[0-9a-f]*:	ed af 32 ff 	stcm\.w cp1,--pc,cr0-cr7
++ *[0-9a-f]*:	ed a0 32 01 	stcm\.w cp1,--r0,cr0
++ *[0-9a-f]*:	ed a7 32 80 	stcm\.w cp1,--r7,cr7
++ *[0-9a-f]*:	ed a8 32 7f 	stcm\.w cp1,--r8,cr0-cr6
++ *[0-9a-f]*:	ed af 33 ff 	stcm\.w cp1,--pc,cr8-cr15
++ *[0-9a-f]*:	ed a0 33 01 	stcm\.w cp1,--r0,cr8
++ *[0-9a-f]*:	ed a7 33 80 	stcm\.w cp1,--r7,cr15
++ *[0-9a-f]*:	ed a8 33 7f 	stcm\.w cp1,--r8,cr8-cr14
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pico.s
+@@ -0,0 +1,144 @@
++
++	.text
++	.global	picosvmac
++picosvmac:
++	picosvmac	out0, in0, in0, in0
++	picosvmac	out2, in11, in11, in11
++	picosvmac	out1, in10, in0, in5
++	picosvmac	out3, in6, in9, in0
++	.global picosvmul
++picosvmul:
++	picosvmul	out0, in0, in0, in0
++	picosvmul	out2, in11, in11, in11
++	picosvmul	out1, in10, in0, in5
++	picosvmul	out3, in6, in9, in0
++	.global picovmac
++picovmac:
++	picovmac	out0, in0, in0, in0
++	picovmac	out2, in11, in11, in11
++	picovmac	out1, in10, in0, in5
++	picovmac	out3, in6, in9, in0
++	.global picovmul
++picovmul:
++	picovmul	out0, in0, in0, in0
++	picovmul	out2, in11, in11, in11
++	picovmul	out1, in10, in0, in5
++	picovmul	out3, in6, in9, in0
++	.global	picold_d
++picold_d:
++	picold.d	vmu2_out, pc[1020]
++	picold.d	inpix2, r0[1020]
++	picold.d	inpix2, r0[0]
++	picold.d	coeff0_a, --r8
++	picold.d	coeff1_a, --r7
++	picold.d	inpix0, r10[r5 << 2]
++	picold.d	vmu0_out, r3[r6 << 0]
++	.global	picold_w
++picold_w:	
++	picold.w	config, pc[1020]
++	picold.w	inpix2, r0[1020]
++	picold.w	inpix2, r0[0]
++	picold.w	coeff0_b, --r8
++	picold.w	coeff1_a, --r7
++	picold.w	inpix1, r10[r5 << 2]
++	picold.w	vmu1_out, r3[r6 << 0]
++	.global	picoldm_d
++picoldm_d:
++	picoldm.d	pc, inpix2-config
++	picoldm.d	r0, inpix2, inpix1
++	picoldm.d	r7, vmu2_out, config
++	picoldm.d	r8, inpix2-vmu1_out
++	.global	picoldm_d_pu
++picoldm_d_pu:
++	picoldm.d	pc++, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out, vmu2_out, config
++	picoldm.d	r0++, inpix2, inpix1
++	picoldm.d	r7++, vmu2_out, config
++	picoldm.d	r8++, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out
++	.global	picoldm_w
++picoldm_w:
++	picoldm.w	pc, inpix2-coeff0_b
++	picoldm.w	r0, inpix2
++	picoldm.w	r7, coeff0_b
++	picoldm.w	r8, inpix2-coeff0_a
++	picoldm.w	pc, coeff1_a-config
++	picoldm.w	r0, coeff1_a
++	picoldm.w	r7, config
++	picoldm.w	r8, coeff1_a-vmu2_out
++	.global	picoldm_w_pu
++picoldm_w_pu:
++	picoldm.w	pc++, inpix2-coeff0_b
++	picoldm.w	r0++, inpix2
++	picoldm.w	r7++, coeff0_b
++	picoldm.w	r8++, inpix2-coeff0_a
++	picoldm.w	pc++, coeff1_a-config
++	picoldm.w	r0++, coeff1_a
++	picoldm.w	r7++, config
++	picoldm.w	r8++, coeff1_a-vmu2_out
++	.global	picomv_d
++picomv_d:
++	picomv.d	vmu2_out, lr
++	picomv.d	inpix2, r0
++	picomv.d	coeff0_a, r8
++	picomv.d	coeff1_a, r6
++	picomv.d	pc, vmu2_out
++	picomv.d	r0, inpix2
++	picomv.d	r8, coeff0_a
++	picomv.d	r6, coeff1_a
++	.global	picomv_w
++picomv_w:
++	picomv.w	config, pc
++	picomv.w	inpix2, r0
++	picomv.w	coeff0_b, r8
++	picomv.w	coeff1_a, r7
++	picomv.w	pc, config
++	picomv.w	r0, inpix2
++	picomv.w	r8, coeff0_b
++	picomv.w	r7, coeff1_a
++	.global	picost_d
++picost_d:
++	picost.d	pc[1020], vmu2_out
++	picost.d	r0[0], inpix2
++	picost.d	r8++, coeff0_a
++	picost.d	r7++, coeff1_a
++	picost.d	r10[r5 << 2], inpix0
++	picost.d	r3[r6 << 0], vmu0_out
++	.global	picost_w
++picost_w:	
++	picost.w	pc[1020], config
++	picost.w	r0[0], inpix2
++	picost.w	r8++, coeff0_b
++	picost.w	r7++, coeff1_a
++	picost.w	r10[r5 << 2], inpix1
++	picost.w	r3[r6 << 0], vmu1_out
++	.global	picostm_d
++picostm_d:
++	picostm.d	pc, inpix2-config
++	picostm.d	r0, inpix2, inpix1
++	picostm.d	r7, vmu2_out, config
++	picostm.d	r8, inpix2-vmu1_out
++	.global	picostm_d_pu
++picostm_d_pu:
++	picostm.d	--pc, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out, vmu2_out, config
++	picostm.d	--r0, inpix2, inpix1
++	picostm.d	--r7, vmu2_out, config
++	picostm.d	--r8, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out
++	.global	picostm_w
++picostm_w:
++	picostm.w	pc, inpix2-coeff0_b
++	picostm.w	r0, inpix2
++	picostm.w	r7, coeff0_b
++	picostm.w	r8, inpix2-coeff0_a
++	picostm.w	pc, coeff1_a-config
++	picostm.w	r0, coeff1_a
++	picostm.w	r7, config
++	picostm.w	r8, coeff1_a-vmu2_out
++	.global	picostm_w_pu
++picostm_w_pu:
++	picostm.w	--pc, inpix2-coeff0_b
++	picostm.w	--r0, inpix2
++	picostm.w	--r7, coeff0_b
++	picostm.w	--r8, inpix2-coeff0_a
++	picostm.w	--pc, coeff1_a-config
++	picostm.w	--r0, coeff1_a
++	picostm.w	--r7, config
++	picostm.w	--r8, coeff1_a-vmu2_out
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pic_reloc.d
+@@ -0,0 +1,27 @@
++#as:
++#objdump: -dr
++#name: pic_reloc
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <mcall_got>:
++   0:	f0 16 00 00 	mcall r6\[0\]
++			0: R_AVR32_GOT18SW	extfunc
++   4:	f0 16 00 00 	mcall r6\[0\]
++			4: R_AVR32_GOT18SW	\.L1
++   8:	f0 16 00 00 	mcall r6\[0\]
++			8: R_AVR32_GOT18SW	\.L2
++   c:	f0 16 00 00 	mcall r6\[0\]
++			c: R_AVR32_GOT18SW	mcall_got
++
++00000010 <ldw_got>:
++  10:	ec f0 00 00 	ld.w r0,r6\[0\]
++			10: R_AVR32_GOT16S	extvar
++  14:	ec f0 00 00 	ld.w r0,r6\[0\]
++			14: R_AVR32_GOT16S	\.L3
++  18:	ec f0 00 00 	ld.w r0,r6\[0\]
++			18: R_AVR32_GOT16S	\.L4
++  1c:	ec f0 00 00 	ld.w r0,r6\[0\]
++			1c: R_AVR32_GOT16S	ldw_got
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pic_reloc.s
+@@ -0,0 +1,18 @@
++
++	.text
++	.global	mcall_got
++mcall_got:
++.L1:
++	mcall	r6[extfunc@got]
++	mcall	r6[.L1@got]
++	mcall	r6[.L2@got]
++	mcall	r6[mcall_got@got]
++.L2:
++
++	.global	ldw_got
++ldw_got:
++.L3:	ld.w	r0,r6[extvar@got]
++	ld.w	r0,r6[.L3@got]
++	ld.w	r0,r6[.L4@got]
++	ld.w	r0,r6[ldw_got@got]
++.L4:
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/symdiff.d
+@@ -0,0 +1,24 @@
++#source: symdiff.s
++#as:
++#objdump: -dr
++#name: symdiff
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <diff32>:
++   0:	00 00       	add r0,r0
++   2:	00 04       	add r4,r0
++
++00000004 <diff16>:
++   4:	00 04       	add r4,r0
++
++00000006 <diff8>:
++   6:	04 00       	add r0,r2
++
++00000008 <symdiff_test>:
++   8:	d7 03       	nop
++   a:	d7 03       	nop
++   c:	d7 03       	nop
++   e:	d7 03       	nop
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/symdiff_linkrelax.d
+@@ -0,0 +1,28 @@
++#source: symdiff.s
++#as: --linkrelax
++#objdump: -dr
++#name: symdiff_linkrelax
++
++.*: +file format .*
++
++Disassembly of section \.text:
++
++00000000 <diff32>:
++   0:	00 00       	add r0,r0
++			0: R_AVR32_DIFF32	\.text\+0xa
++   2:	00 04       	add r4,r0
++
++00000004 <diff16>:
++   4:	00 04       	add r4,r0
++			4: R_AVR32_DIFF16	\.text\+0xa
++
++00000006 <diff8>:
++   6:	04 00       	add r0,r2
++			6: R_AVR32_DIFF8	\.text\+0xa
++			7: R_AVR32_ALIGN	\*ABS\*\+0x1
++
++00000008 <symdiff_test>:
++   8:	d7 03       	nop
++   a:	d7 03       	nop
++   c:	d7 03       	nop
++   e:	d7 03       	nop
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/symdiff.s
+@@ -0,0 +1,19 @@
++
++	.text
++	.global	diff32
++diff32:
++	.long	.L2 - .L1
++	.global	diff16
++diff16:
++	.short	.L2 - .L1
++	.global	diff8
++diff8:
++	.byte	.L2 - .L1
++
++	.global	symdiff_test
++	.align	1
++symdiff_test:
++	nop
++.L1:	nop
++	nop
++.L2:	nop
+--- a/gas/write.c
++++ b/gas/write.c
+@@ -2011,6 +2011,10 @@ relax_frag (segT segment, fragS *fragP,
+ 
+ #endif /* defined (TC_GENERIC_RELAX_TABLE)  */
+ 
++#ifdef TC_RELAX_ALIGN
++#define RELAX_ALIGN(SEG, FRAG, ADDR) TC_RELAX_ALIGN(SEG, FRAG, ADDR)
++#else
++#define RELAX_ALIGN(SEG, FRAG, ADDR) relax_align(ADDR, (FRAG)->fr_offset)
+ /* Relax_align. Advance location counter to next address that has 'alignment'
+    lowest order bits all 0s, return size of adjustment made.  */
+ static relax_addressT
+@@ -2030,6 +2034,7 @@ relax_align (register relax_addressT add
+ #endif
+   return (new_address - address);
+ }
++#endif
+ 
+ /* Now we have a segment, not a crowd of sub-segments, we can make
+    fr_address values.
+@@ -2073,7 +2078,7 @@ relax_segment (struct frag *segment_frag
+ 	case rs_align_code:
+ 	case rs_align_test:
+ 	  {
+-	    addressT offset = relax_align (address, (int) fragP->fr_offset);
++	    addressT offset = RELAX_ALIGN(segment, fragP, address);
+ 
+ 	    if (fragP->fr_subtype != 0 && offset > fragP->fr_subtype)
+ 	      offset = 0;
+@@ -2280,10 +2285,10 @@ relax_segment (struct frag *segment_frag
+ 		{
+ 		  addressT oldoff, newoff;
+ 
+-		  oldoff = relax_align (was_address + fragP->fr_fix,
+-					(int) offset);
+-		  newoff = relax_align (address + fragP->fr_fix,
+-					(int) offset);
++		  oldoff = RELAX_ALIGN (segment, fragP,
++					was_address + fragP->fr_fix);
++		  newoff = RELAX_ALIGN (segment, fragP,
++					address + fragP->fr_fix);
+ 
+ 		  if (fragP->fr_subtype != 0)
+ 		    {
+--- a/include/dis-asm.h
++++ b/include/dis-asm.h
+@@ -222,6 +222,7 @@ typedef int (*disassembler_ftype) (bfd_v
+ 
+ extern int print_insn_alpha		(bfd_vma, disassemble_info *);
+ extern int print_insn_avr		(bfd_vma, disassemble_info *);
++extern int print_insn_avr32		(bfd_vma, disassemble_info *);
+ extern int print_insn_bfin		(bfd_vma, disassemble_info *);
+ extern int print_insn_big_arm		(bfd_vma, disassemble_info *);
+ extern int print_insn_big_mips		(bfd_vma, disassemble_info *);
+@@ -304,7 +305,9 @@ extern void print_i386_disassembler_opti
+ extern void print_mips_disassembler_options (FILE *);
+ extern void print_ppc_disassembler_options (FILE *);
+ extern void print_arm_disassembler_options (FILE *);
++extern void print_avr32_disassembler_options (FILE *);
+ extern void parse_arm_disassembler_option (char *);
++extern void parse_avr32_disassembler_option (char *);
+ extern void print_s390_disassembler_options (FILE *);
+ extern int  get_arm_regname_num_options (void);
+ extern int  set_arm_regname_option (int);
+--- /dev/null
++++ b/include/elf/avr32.h
+@@ -0,0 +1,98 @@
++/* AVR32 ELF support for BFD.
++   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of BFD, the Binary File Descriptor library.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   This program is distributed in the hope that 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 "elf/reloc-macros.h"
++
++/* CPU-specific flags for the ELF header e_flags field */
++#define EF_AVR32_LINKRELAX		0x01
++#define EF_AVR32_PIC			0x02
++
++START_RELOC_NUMBERS (elf_avr32_reloc_type)
++    RELOC_NUMBER (R_AVR32_NONE,			0)
++
++    /* Data Relocations */
++    RELOC_NUMBER (R_AVR32_32,			1)
++    RELOC_NUMBER (R_AVR32_16,			2)
++    RELOC_NUMBER (R_AVR32_8,			3)
++    RELOC_NUMBER (R_AVR32_32_PCREL,		4)
++    RELOC_NUMBER (R_AVR32_16_PCREL,		5)
++    RELOC_NUMBER (R_AVR32_8_PCREL,		6)
++    RELOC_NUMBER (R_AVR32_DIFF32,		7)
++    RELOC_NUMBER (R_AVR32_DIFF16,		8)
++    RELOC_NUMBER (R_AVR32_DIFF8,		9)
++    RELOC_NUMBER (R_AVR32_GOT32,		10)
++    RELOC_NUMBER (R_AVR32_GOT16,		11)
++    RELOC_NUMBER (R_AVR32_GOT8,			12)
++
++    /* Normal Code Relocations */
++    RELOC_NUMBER (R_AVR32_21S,			13)
++    RELOC_NUMBER (R_AVR32_16U,			14)
++    RELOC_NUMBER (R_AVR32_16S,			15)
++    RELOC_NUMBER (R_AVR32_8S,			16)
++    RELOC_NUMBER (R_AVR32_8S_EXT,		17)
++
++    /* PC-Relative Code Relocations */
++    RELOC_NUMBER (R_AVR32_22H_PCREL,		18)
++    RELOC_NUMBER (R_AVR32_18W_PCREL,		19)
++    RELOC_NUMBER (R_AVR32_16B_PCREL,		20)
++    RELOC_NUMBER (R_AVR32_16N_PCREL,		21)
++    RELOC_NUMBER (R_AVR32_14UW_PCREL,		22)
++    RELOC_NUMBER (R_AVR32_11H_PCREL,		23)
++    RELOC_NUMBER (R_AVR32_10UW_PCREL,		24)
++    RELOC_NUMBER (R_AVR32_9H_PCREL,		25)
++    RELOC_NUMBER (R_AVR32_9UW_PCREL,		26)
++
++    /* Special Code Relocations */
++    RELOC_NUMBER (R_AVR32_HI16,			27)
++    RELOC_NUMBER (R_AVR32_LO16,			28)
++
++    /* PIC Relocations */
++    RELOC_NUMBER (R_AVR32_GOTPC,		29)
++    RELOC_NUMBER (R_AVR32_GOTCALL,		30)
++    RELOC_NUMBER (R_AVR32_LDA_GOT,		31)
++    RELOC_NUMBER (R_AVR32_GOT21S,		32)
++    RELOC_NUMBER (R_AVR32_GOT18SW,		33)
++    RELOC_NUMBER (R_AVR32_GOT16S,		34)
++    RELOC_NUMBER (R_AVR32_GOT7UW,		35)
++
++    /* Constant Pool Relocations */
++    RELOC_NUMBER (R_AVR32_32_CPENT,		36)
++    RELOC_NUMBER (R_AVR32_CPCALL,		37)
++    RELOC_NUMBER (R_AVR32_16_CP,		38)
++    RELOC_NUMBER (R_AVR32_9W_CP,		39)
++
++    /* Dynamic Relocations */
++    RELOC_NUMBER (R_AVR32_RELATIVE,		40)
++    RELOC_NUMBER (R_AVR32_GLOB_DAT,		41)
++    RELOC_NUMBER (R_AVR32_JMP_SLOT,		42)
++
++    /* Linkrelax Information */
++    RELOC_NUMBER (R_AVR32_ALIGN,		43)
++
++    RELOC_NUMBER (R_AVR32_15S,		        44)
++
++END_RELOC_NUMBERS (R_AVR32_max)
++
++/* Processor specific dynamic array tags.  */
++
++/* The total size in bytes of the Global Offset Table */
++#define DT_AVR32_GOTSZ			0x70000001
+--- a/include/elf/common.h
++++ b/include/elf/common.h
+@@ -286,7 +286,7 @@
+ #define EM_INTEL182	182	/* Reserved by Intel */
+ #define EM_res183	183	/* Reserved by ARM */
+ #define EM_res184	184	/* Reserved by ARM */
+-#define EM_AVR32	185	/* Atmel Corporation 32-bit microprocessor family */
++#define EM_AVR32_OLD	185	/* Atmel Corporation 32-bit microprocessor family */
+ #define EM_STM8	186	/* STMicroeletronics STM8 8-bit microcontroller */
+ #define EM_TILE64	187	/* Tilera TILE64 multicore architecture family */
+ #define EM_TILEPRO	188	/* Tilera TILEPro multicore architecture family */
+@@ -365,6 +365,9 @@
+ /* V850 backend magic number.  Written in the absense of an ABI.  */
+ #define EM_CYGNUS_V850		0x9080
+ 
++/* AVR32 magic number, picked by IAR Systems. */
++#define EM_AVR32		0x18ad
++
+ /* old S/390 backend magic number. Written in the absence of an ABI.  */
+ #define EM_S390_OLD		0xa390
+ 
+--- a/ld/configdoc.texi
++++ b/ld/configdoc.texi
+@@ -7,6 +7,7 @@
+ @set H8300
+ @set HPPA
+ @set I960
++@set AVR32
+ @set M68HC11
+ @set M68K
+ @set MMIX
+--- a/ld/configure.tgt
++++ b/ld/configure.tgt
+@@ -112,6 +112,9 @@ xscale-*-elf)		targ_emul=armelf
+ avr-*-*)		targ_emul=avr2
+ 			targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6"
+ 			;;
++avr32-*-none)           targ_emul=avr32elf_ap7000
++                        targ_extra_emuls="avr32elf_ap7001 avr32elf_ap7002 avr32elf_ap7200 avr32elf_uc3a0128 avr32elf_uc3a0256 avr32elf_uc3a0512 avr32elf_uc3a0512es avr32elf_uc3a1128 avr32elf_uc3a1256 avr32elf_uc3a1512es avr32elf_uc3a1512 avr32elf_uc3a364 avr32elf_uc3a364s avr32elf_uc3a3128 avr32elf_uc3a3128s avr32elf_uc3a3256 avr32elf_uc3a3256s avr32elf_uc3b064 avr32elf_uc3b0128 avr32elf_uc3b0256es avr32elf_uc3b0256 avr32elf_uc3b0512 avr32elf_uc3b0512revc avr32elf_uc3b164 avr32elf_uc3b1128 avr32elf_uc3b1256es avr32elf_uc3b1256 avr32elf_uc3b1512 avr32elf_uc3b1512revc avr32elf_uc3c0512crevc avr32elf_uc3c1512crevc avr32elf_uc3c2512crevc avr32elf_atuc3l0256 avr32elf_mxt768e avr32elf_uc3l064 avr32elf_uc3l032 avr32elf_uc3l016 avr32elf_uc3l064revb avr32elf_uc3c064c avr32elf_uc3c0128c avr32elf_uc3c0256c avr32elf_uc3c0512c avr32elf_uc3c164c avr32elf_uc3c1128c avr32elf_uc3c1256c avr32elf_uc3c1512c avr32elf_uc3c264c avr32elf_uc3c2128c avr32elf_uc3c2256c avr32elf_uc3c2512c" ;;
++avr32-*-linux*)         targ_emul=avr32linux ;;
+ bfin-*-elf)		targ_emul=elf32bfin;
+ 			targ_extra_emuls="elf32bfinfd"
+ 			targ_extra_libpath=$targ_extra_emuls
+--- /dev/null
++++ b/ld/emulparams/avr32elf.sh
+@@ -0,0 +1,402 @@
++# This script is called from ld/genscript.sh 
++# There is a difference on how 'bash' and POSIX handles 
++# the  '.' (source) command in a script.
++# genscript.sh calls this script with argument ${EMULATION_NAME}
++# but that will fail on POSIX compilant shells like 'sh' or 'dash'
++# therefor I use the variable directly instead of $1 
++EMULATION=${EMULATION_NAME}
++SCRIPT_NAME=avr32
++TEMPLATE_NAME=elf32
++EXTRA_EM_FILE=avr32elf
++OUTPUT_FORMAT="elf32-avr32"
++ARCH=avr32
++MAXPAGESIZE=4096
++ENTRY=_start
++EMBEDDED=yes
++NO_SMALL_DATA=yes
++NOP=0xd703d703
++
++DATA_SEGMENT_ALIGN=8
++BSS_ALIGNMENT=8
++
++RO_LMA_REGION="FLASH"
++RO_VMA_REGION="FLASH"
++RW_LMA_REGION="FLASH"
++RW_VMA_REGION="CPUSRAM"
++
++STACK_SIZE=_stack_size
++STACK_ADDR="ORIGIN(CPUSRAM) + LENGTH(CPUSRAM) - ${STACK_SIZE}"
++
++DATA_SEGMENT_END="
++  __heap_start__ = ALIGN(8);
++  . = ${STACK_ADDR};
++  __heap_end__ = .;
++"
++
++case "$EMULATION" in
++avr32elf_ap*)
++    MACHINE=ap
++    INITIAL_READONLY_SECTIONS="
++    .reset : {  *(.reset) } >FLASH AT>FLASH
++    . = . & 0x9fffffff;
++"
++    TEXT_START_ADDR=0xa0000000
++    case "$EMULATION" in
++	    avr32elf_ap700[0-2])
++	       MEMORY="
++MEMORY
++{
++    FLASH (rxai) : ORIGIN = 0x00000000, LENGTH = 64M
++    CPUSRAM (rwxa) : ORIGIN = 0x24000000, LENGTH = 32K
++}
++"
++        ;;
++    avr32elf_ap7200)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai) : ORIGIN = 0x00000000, LENGTH = 64M
++    CPUSRAM (rwxa) : ORIGIN = 0x08000000, LENGTH = 64K
++}
++"
++        ;;
++    esac
++    ;;
++
++avr32elf_mxt768e)
++    MACHINE=uc
++    INITIAL_READONLY_SECTIONS=".reset : {  *(.reset) } >FLASH AT>FLASH"
++    TEXT_START_ADDR=0x80000000
++    OTHER_SECTIONS="
++  .userpage :  { *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
++  .factorypage :  { *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE
++"
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++      ;;
++
++avr32elf_atuc3*)
++    MACHINE=uc
++    INITIAL_READONLY_SECTIONS=".reset : {  *(.reset) } >FLASH AT>FLASH"
++    TEXT_START_ADDR=0x80000000
++    OTHER_SECTIONS="
++  .userpage :  { *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
++  .factorypage :  { *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE
++"
++    case "$EMULATION" in
++    avr32elf_atuc3l0256)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++    esac
++    ;;
++
++avr32elf_uc3*)
++    MACHINE=uc
++    INITIAL_READONLY_SECTIONS=".reset : {  *(.reset) } >FLASH AT>FLASH"
++    TEXT_START_ADDR=0x80000000
++    OTHER_SECTIONS="
++  .userpage :  { *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
++  .factorypage :  { *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE
++"
++
++    case "$EMULATION" in
++    avr32elf_uc3c[012]512c)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++
++    avr32elf_uc3c[012]256c)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++
++    avr32elf_uc3c[012]128c)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x7FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++
++    avr32elf_uc3c[012]64c)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++
++   avr32elf_uc3[ac][012]512*)
++       MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        ;;
++
++    avr32elf_uc3a[012]256*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        ;;
++
++    avr32elf_uc3b[01]512revc)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x17FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++         PADDING="
++  .padding : {
++  QUAD(0)
++  QUAD(0)
++  QUAD(0)
++  QUAD(0)
++  } >FLASH AT>FLASH
++"
++        ;;
++
++    avr32elf_uc3b[01]512)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x17FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        ;;
++
++    avr32elf_uc3b[01]256*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x7FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        ;;
++
++    avr32elf_uc3[ab][012]128*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x7FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        ;;
++
++    avr32elf_uc3b[0123]64*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        ;;
++
++    avr32elf_uc3a3256*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
++    HSBSRAM (wxa!ri) : ORIGIN = 0xFF000000, LENGTH = 64K
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .hsbsram       : { *(.hsbsram .hsbsram.*) } >HSBSRAM AT>FLASH :FLASH
++"
++  		
++        ;;
++
++    avr32elf_uc3a3128*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
++    HSBSRAM (wxa!ri) : ORIGIN = 0xFF000000, LENGTH = 64K
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .hsbsram       : { *(.hsbsram .hsbsram.*) } >HSBSRAM AT>FLASH :FLASH
++"
++        ;;
++
++    avr32elf_uc3a364*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
++    HSBSRAM (wxa!ri) : ORIGIN = 0xFF000000, LENGTH = 64K
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .hsbsram       : { *(.hsbsram .hsbsram.*) } >HSBSRAM AT>FLASH :FLASH
++"
++        ;;
++
++
++    avr32elf_uc3l[0123]64*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++
++    avr32elf_uc3l[0123]32*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 32K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++
++    avr32elf_uc3l[0123]16*)
++        MEMORY="
++MEMORY
++{
++    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 16K
++    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x1FFC
++    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
++    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
++    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
++    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
++}
++"
++        OTHER_SECTIONS="${OTHER_SECTIONS}
++  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
++  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
++"
++        ;;
++
++
++    esac
++    ;;
++
++esac
+--- /dev/null
++++ b/ld/emulparams/avr32linux.sh
+@@ -0,0 +1,14 @@
++ARCH=avr32
++SCRIPT_NAME=elf
++TEMPLATE_NAME=elf32
++EXTRA_EM_FILE=avr32elf
++OUTPUT_FORMAT="elf32-avr32"
++GENERATE_SHLIB_SCRIPT=yes
++MAXPAGESIZE=0x1000
++TEXT_START_ADDR=0x00001000
++NOP=0xd703d703
++
++# This appears to place the GOT before the data section, which is
++# essential for uClinux.  We don't use those .s* sections on AVR32
++# anyway, so it shouldn't hurt for regular Linux either...
++NO_SMALL_DATA=yes
+--- /dev/null
++++ b/ld/emultempl/avr32elf.em
+@@ -0,0 +1,162 @@
++# This shell script emits a C file. -*- C -*-
++#   Copyright (C) 2007,2008,2009 Atmel Corporation
++#
++# This file is part of GLD, the Gnu Linker.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
++#
++
++# This file is sourced from elf32.em, and defines extra avr32-elf
++# specific routines.
++#
++
++# Generate linker script for writable rodata
++LD_FLAG=rodata-writable
++DATA_ALIGNMENT=${DATA_ALIGNMENT_}
++RELOCATING=" "
++WRITABLE_RODATA=" "
++( echo "/* Linker script for writable rodata */"
++  . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}
++  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++) | sed -e '/^ *$/d;s/[ 	]*$//' > ldscripts/${EMULATION_NAME}.xwr
++
++
++cat >> e${EMULATION_NAME}.c <<EOF
++
++#include "libbfd.h"
++#include "elf32-avr32.h"
++
++/* Whether to allow direct references (sub or mov) to SEC_DATA and
++   !SEC_CONTENTS sections when optimizing.  Not enabled by default
++   since it might cause link errors.  */
++static int direct_data_refs = 0;
++
++static void avr32_elf_after_open (void)
++{
++  bfd_elf32_avr32_set_options (&link_info, direct_data_refs);
++  gld${EMULATION_NAME}_after_open ();
++}
++
++static int rodata_writable = 0;
++
++static int stack_size = 0x1000;
++
++static void avr32_elf_set_symbols (void)
++{
++  /* Glue the assignments into the abs section.  */
++  lang_statement_list_type *save = stat_ptr;
++
++
++  stat_ptr = &(abs_output_section->children);
++
++  lang_add_assignment (exp_assop ('=', "_stack_size",
++                                  exp_intop (stack_size)));
++  
++  stat_ptr = save;
++}
++
++static char * gld${EMULATION_NAME}_get_script (int *isfile);
++
++static char * avr32_elf_get_script (int *isfile)
++{
++  if ( rodata_writable )
++    {
++EOF
++if test -n "$COMPILE_IN"
++then
++# Scripts compiled in.
++
++# sed commands to quote an ld script as a C string.
++sc="-f stringify.sed"
++
++cat >>e${EMULATION_NAME}.c <<EOF
++      *isfile = 0;
++      return
++EOF
++sed $sc ldscripts/${EMULATION_NAME}.xwr			>> e${EMULATION_NAME}.c
++echo  ';'	                                        >> e${EMULATION_NAME}.c
++else
++# Scripts read from the filesystem.
++
++cat >>e${EMULATION_NAME}.c <<EOF
++      *isfile = 1;
++      return "ldscripts/${EMULATION_NAME}.xwr";
++EOF
++fi
++
++cat >>e${EMULATION_NAME}.c <<EOF
++    }
++  return gld${EMULATION_NAME}_get_script (isfile);
++}
++
++
++EOF
++
++# Define some shell vars to insert bits of code into the standard elf
++# parse_args and list_options functions.
++#
++PARSE_AND_LIST_PROLOGUE='
++#define OPTION_DIRECT_DATA		300
++#define OPTION_NO_DIRECT_DATA		301
++#define OPTION_RODATA_WRITABLE		302
++#define OPTION_NO_RODATA_WRITABLE	303
++#define OPTION_STACK 	                304
++'
++
++PARSE_AND_LIST_LONGOPTS='
++  { "direct-data", no_argument, NULL, OPTION_DIRECT_DATA },
++  { "no-direct-data", no_argument, NULL, OPTION_NO_DIRECT_DATA },
++  { "rodata-writable", no_argument, NULL, OPTION_RODATA_WRITABLE },
++  { "no-rodata-writable", no_argument, NULL, OPTION_NO_RODATA_WRITABLE },
++  { "stack", required_argument, NULL, OPTION_STACK },
++'
++
++PARSE_AND_LIST_OPTIONS='
++  fprintf (file, _("  --direct-data\t\tAllow direct data references when optimizing\n"));
++  fprintf (file, _("  --no-direct-data\tDo not allow direct data references when optimizing\n"));
++  fprintf (file, _("  --rodata-writable\tPut read-only data in writable data section\n"));
++  fprintf (file, _("  --no-rodata-writable\tDo not put read-only data in writable data section\n"));
++  fprintf (file, _("  --stack <size>\tSet the initial size of the stack\n"));
++'
++
++PARSE_AND_LIST_ARGS_CASES='
++    case OPTION_DIRECT_DATA:
++      direct_data_refs = 1;
++      break;
++    case OPTION_NO_DIRECT_DATA:
++      direct_data_refs = 0;
++      break;
++    case OPTION_RODATA_WRITABLE:
++      rodata_writable = 1;
++      break;
++    case OPTION_NO_RODATA_WRITABLE:
++      rodata_writable = 0;
++      break;
++    case OPTION_STACK: 
++     {
++      char *end;
++      stack_size = strtoul (optarg, &end, 0);
++      if (end == optarg)
++        einfo (_("%P%F: invalid hex number for parameter '%s'\n"), optarg);
++      optarg = end;
++      break;
++     }
++'
++
++# Replace some of the standard ELF functions with our own versions.
++#
++LDEMUL_AFTER_OPEN=avr32_elf_after_open
++LDEMUL_GET_SCRIPT=avr32_elf_get_script
++LDEMUL_SET_SYMBOLS=avr32_elf_set_symbols
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -148,6 +148,58 @@ ALL_EMULATIONS = \
+ 	eavr5.o \
+ 	eavr51.o \
+ 	eavr6.o \
++	eavr32elf_ap7000.o \
++	eavr32elf_ap7001.o \
++	eavr32elf_ap7002.o \
++	eavr32elf_ap7200.o \
++	eavr32elf_uc3a0128.o \
++	eavr32elf_uc3a0256.o \
++	eavr32elf_uc3a0512.o \
++	eavr32elf_uc3a0512es.o \
++	eavr32elf_uc3a1128.o \
++	eavr32elf_uc3a1256.o \
++	eavr32elf_uc3a1512es.o \
++	eavr32elf_uc3a1512.o \
++	eavr32elf_uc3a364.o \
++	eavr32elf_uc3a364s.o \
++	eavr32elf_uc3a3128.o \
++	eavr32elf_uc3a3128s.o \
++	eavr32elf_uc3a3256.o \
++	eavr32elf_uc3a3256s.o \
++	eavr32elf_uc3b064.o \
++	eavr32elf_uc3b0128.o \
++	eavr32elf_uc3b0256es.o \
++	eavr32elf_uc3b0256.o \
++	eavr32elf_uc3b0512.o \
++	eavr32elf_uc3b0512revc.o \
++	eavr32elf_uc3b164.o \
++	eavr32elf_uc3b1128.o \
++	eavr32elf_uc3b1256es.o \
++	eavr32elf_uc3b1256.o \
++	eavr32elf_uc3b1512.o \
++	eavr32elf_uc3b1512revc.o \
++	eavr32elf_uc3c0512crevc.o \
++	eavr32elf_uc3c1512crevc.o \
++	eavr32elf_uc3c2512crevc.o \
++	eavr32elf_atuc3l0256.o \
++        eavr32elf_mxt768e.o \
++	eavr32elf_uc3l064.o \
++	eavr32elf_uc3l032.o \
++	eavr32elf_uc3l016.o \
++	eavr32elf_uc3l064revb.o \
++	eavr32elf_uc3c064c.o \
++	eavr32elf_uc3c0128c.o \
++	eavr32elf_uc3c0256c.o \
++	eavr32elf_uc3c0512c.o \
++	eavr32elf_uc3c164c.o \
++	eavr32elf_uc3c1128c.o \
++	eavr32elf_uc3c1256c.o \
++	eavr32elf_uc3c1512c.o \
++	eavr32elf_uc3c264c.o \
++	eavr32elf_uc3c2128c.o \
++	eavr32elf_uc3c2256c.o \
++	eavr32elf_uc3c2512c.o \
++	eavr32linux.o \
+ 	ecoff_i860.o \
+ 	ecoff_sparc.o \
+ 	eelf32_spu.o \
+@@ -727,6 +779,214 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
+   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
+   ${GEN_DEPENDS}
+ 	${GENSCRIPTS} avr6 "$(tdir_avr2)"
++eavr32elf_ap7000.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7000 "$(tdir_avr32)" avr32elf
++eavr32elf_ap7001.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7001 "$(tdir_avr32)" avr32elf
++eavr32elf_ap7002.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7002 "$(tdir_avr32)" avr32elf
++eavr32elf_ap7200.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7200 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0512es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0512es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1512es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1512es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a364.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a364 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a364s.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a364s "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3128s.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3128s "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3256s.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3256s "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b064.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b064 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0256es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0256es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0512revc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0512revc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b164.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b164 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1256es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1256es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1512revc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1512revc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c0512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c0512crevc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c1512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c1512crevc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c2512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c2512crevc "$(tdir_avr32)" avr32elf
++eavr32elf_atuc3l0256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_atuc3l0256 "$(tdir_avr32)" avr32elf
++eavr32elf_mxt768e.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_mxt768e "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l064.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l064 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l032.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l032 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l016.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l016 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l064revb.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l064revb "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c064c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c064c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c0128c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c0128c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c0256c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c0256c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c0512c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c0512c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c164c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c164c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c1128c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c1128c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c1256c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c1256c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c1512c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c1512c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c264c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c264c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c2128c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c2128c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c2256c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c2256c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c2512c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c2512c "$(tdir_avr32)" avr32elf
++eavr32linux.c: $(srcdir)/emulparams/avr32linux.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32linux "$(tdir_avr32)"
+ ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
+   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
+@@ -1964,7 +2224,9 @@ install-exec-local: ld-new$(EXEEXT)
+ 	  || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
+ 	fi
+ 
+-install-data-local:
++# We want install to imply install-info as per GNU standards, despite the
++# cygnus option.
++install-data-local: install-info
+ 	$(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
+ 	for f in ldscripts/*; do \
+ 	  $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
+--- /dev/null
++++ b/ld/scripttempl/avr32.sc
+@@ -0,0 +1,459 @@
++#
++# Unusual variables checked by this code:
++#	NOP - four byte opcode for no-op (defaults to 0)
++#	NO_SMALL_DATA - no .sbss/.sbss2/.sdata/.sdata2 sections if not
++#		empty.
++#	SMALL_DATA_CTOR - .ctors contains small data.
++#	SMALL_DATA_DTOR - .dtors contains small data.
++#	DATA_ADDR - if end-of-text-plus-one-page isn't right for data start
++#	INITIAL_READONLY_SECTIONS - at start of text segment
++#	OTHER_READONLY_SECTIONS - other than .text .init .rodata ...
++#		(e.g., .PARISC.milli)
++#	OTHER_TEXT_SECTIONS - these get put in .text when relocating
++#	OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ...
++#		(e.g., .PARISC.global)
++#	OTHER_RELRO_SECTIONS - other than .data.rel.ro ...
++#		(e.g. PPC32 .fixup, .got[12])
++#	OTHER_BSS_SECTIONS - other than .bss .sbss ...
++#	OTHER_SECTIONS - at the end
++#	EXECUTABLE_SYMBOLS - symbols that must be defined for an
++#		executable (e.g., _DYNAMIC_LINK)
++#       TEXT_START_ADDR - the first byte of the text segment, after any
++#               headers.
++#       TEXT_BASE_ADDRESS - the first byte of the text segment.
++#	TEXT_START_SYMBOLS - symbols that appear at the start of the
++#		.text section.
++#	DATA_START_SYMBOLS - symbols that appear at the start of the
++#		.data section.
++#	OTHER_GOT_SYMBOLS - symbols defined just before .got.
++#	OTHER_GOT_SECTIONS - sections just after .got.
++#	OTHER_SDATA_SECTIONS - sections just after .sdata.
++#	OTHER_BSS_SYMBOLS - symbols that appear at the start of the
++#		.bss section besides __bss_start.
++#	DATA_PLT - .plt should be in data segment, not text segment.
++#	PLT_BEFORE_GOT - .plt just before .got when .plt is in data segement.
++#	BSS_PLT - .plt should be in bss segment
++#	TEXT_DYNAMIC - .dynamic in text segment, not data segment.
++#	EMBEDDED - whether this is for an embedded system.
++#	SHLIB_TEXT_START_ADDR - if set, add to SIZEOF_HEADERS to set
++#		start address of shared library.
++#	INPUT_FILES - INPUT command of files to always include
++#	WRITABLE_RODATA - if set, the .rodata section should be writable
++#	INIT_START, INIT_END -  statements just before and just after
++# 	combination of .init sections.
++#	FINI_START, FINI_END - statements just before and just after
++# 	combination of .fini sections.
++#	STACK_ADDR - start of a .stack section.
++#	OTHER_END_SYMBOLS - symbols to place right at the end of the script.
++#	SEPARATE_GOTPLT - if set, .got.plt should be separate output section,
++#		so that .got can be in the RELRO area.  It should be set to
++#		the number of bytes in the beginning of .got.plt which can be
++#		in the RELRO area as well.
++#
++# When adding sections, do note that the names of some sections are used
++# when specifying the start address of the next.
++#
++
++#  Many sections come in three flavours.  There is the 'real' section,
++#  like ".data".  Then there are the per-procedure or per-variable
++#  sections, generated by -ffunction-sections and -fdata-sections in GCC,
++#  and useful for --gc-sections, which for a variable "foo" might be
++#  ".data.foo".  Then there are the linkonce sections, for which the linker
++#  eliminates duplicates, which are named like ".gnu.linkonce.d.foo".
++#  The exact correspondences are:
++#
++#  Section	Linkonce section
++#  .text	.gnu.linkonce.t.foo
++#  .rodata	.gnu.linkonce.r.foo
++#  .data	.gnu.linkonce.d.foo
++#  .bss		.gnu.linkonce.b.foo
++#  .sdata	.gnu.linkonce.s.foo
++#  .sbss	.gnu.linkonce.sb.foo
++#  .sdata2	.gnu.linkonce.s2.foo
++#  .sbss2	.gnu.linkonce.sb2.foo
++#  .debug_info	.gnu.linkonce.wi.foo
++#  .tdata	.gnu.linkonce.td.foo
++#  .tbss	.gnu.linkonce.tb.foo
++#
++#  Each of these can also have corresponding .rel.* and .rela.* sections.
++
++test -z "$ENTRY" && ENTRY=_start
++test -z "${BIG_OUTPUT_FORMAT}" && BIG_OUTPUT_FORMAT=${OUTPUT_FORMAT}
++test -z "${LITTLE_OUTPUT_FORMAT}" && LITTLE_OUTPUT_FORMAT=${OUTPUT_FORMAT}
++if [ -z "$MACHINE" ]; then OUTPUT_ARCH=${ARCH}; else OUTPUT_ARCH=${ARCH}:${MACHINE}; fi
++test -z "${ELFSIZE}" && ELFSIZE=32
++test -z "${ALIGNMENT}" && ALIGNMENT="${ELFSIZE} / 8"
++test "$LD_FLAG" = "N" && DATA_ADDR=.
++test -n "$CREATE_SHLIB$CREATE_PIE" && test -n "$SHLIB_DATA_ADDR" && COMMONPAGESIZE=""
++test -z "$CREATE_SHLIB$CREATE_PIE" && test -n "$DATA_ADDR" && COMMONPAGESIZE=""
++test -n "$RELRO_NOW" && unset SEPARATE_GOTPLT
++if test -n "$RELOCATING"; then
++  RO_REGION="${RO_VMA_REGION+ >}${RO_VMA_REGION}${RO_LMA_REGION+ AT>}${RO_LMA_REGION}"
++  RW_REGION="${RW_VMA_REGION+ >}${RW_VMA_REGION}${RW_LMA_REGION+ AT>}${RW_LMA_REGION}"
++  RW_BSS_REGION="${RW_VMA_REGION+ >}${RW_VMA_REGION}"
++else
++  RO_REGION=""
++  RW_REGION=""
++  RW_BSS_REGION=""
++fi
++INTERP=".interp       ${RELOCATING-0} : { *(.interp) }${RO_REGION}"
++PLT=".plt          ${RELOCATING-0} : { *(.plt) }"
++if test -z "$GOT"; then
++  if test -z "$SEPARATE_GOTPLT"; then
++    GOT=".got          ${RELOCATING-0} : { *(.got.plt) *(.got) }"
++  else
++    GOT=".got          ${RELOCATING-0} : { *(.got) }"
++    GOTPLT="${RELOCATING+${DATA_SEGMENT_RELRO_GOTPLT_END}}
++  .got.plt      ${RELOCATING-0} : { *(.got.plt) }"
++  fi
++fi
++DALIGN=".dalign	: { . = ALIGN(${DATA_SEGMENT_ALIGN}); PROVIDE(_data_lma = .); }${RO_REGION}"
++BALIGN=".balign	: { . = ALIGN(${BSS_ALIGNMENT}); _edata = .; }${RW_REGION}"
++DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
++RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
++DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) }${RW_REGION}"
++STACKNOTE="/DISCARD/ : { *(.note.GNU-stack) }"
++if test -z "${NO_SMALL_DATA}"; then
++  SBSS=".sbss         ${RELOCATING-0} :
++  {
++    ${RELOCATING+PROVIDE (__sbss_start = .);}
++    ${RELOCATING+PROVIDE (___sbss_start = .);}
++    ${CREATE_SHLIB+*(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)}
++    *(.dynsbss)
++    *(.sbss${RELOCATING+ .sbss.* .gnu.linkonce.sb.*})
++    *(.scommon)
++    ${RELOCATING+PROVIDE (__sbss_end = .);}
++    ${RELOCATING+PROVIDE (___sbss_end = .);}
++  }${RW_BSS_REGION}"
++  SBSS2=".sbss2        ${RELOCATING-0} : { *(.sbss2${RELOCATING+ .sbss2.* .gnu.linkonce.sb2.*}) }${RW_REGION}"
++  SDATA="/* We want the small data sections together, so single-instruction offsets
++     can access them all, and initialized data all before uninitialized, so
++     we can shorten the on-disk segment size.  */
++  .sdata        ${RELOCATING-0} :
++  {
++    ${RELOCATING+${SDATA_START_SYMBOLS}}
++    ${CREATE_SHLIB+*(.sdata2 .sdata2.* .gnu.linkonce.s2.*)}
++    *(.sdata${RELOCATING+ .sdata.* .gnu.linkonce.s.*})
++  }${RW_REGION}"
++  SDATA2=".sdata2       ${RELOCATING-0} : { *(.sdata2${RELOCATING+ .sdata2.* .gnu.linkonce.s2.*}) }${RW_REGION}"
++  REL_SDATA=".rel.sdata    ${RELOCATING-0} : { *(.rel.sdata${RELOCATING+ .rel.sdata.* .rel.gnu.linkonce.s.*}) }${RO_REGION}
++  .rela.sdata   ${RELOCATING-0} : { *(.rela.sdata${RELOCATING+ .rela.sdata.* .rela.gnu.linkonce.s.*}) }"
++  REL_SBSS=".rel.sbss     ${RELOCATING-0} : { *(.rel.sbss${RELOCATING+ .rel.sbss.* .rel.gnu.linkonce.sb.*}) }${RO_REGION}
++  .rela.sbss    ${RELOCATING-0} : { *(.rela.sbss${RELOCATING+ .rela.sbss.* .rela.gnu.linkonce.sb.*}) }${RO_REGION}"
++  REL_SDATA2=".rel.sdata2   ${RELOCATING-0} : { *(.rel.sdata2${RELOCATING+ .rel.sdata2.* .rel.gnu.linkonce.s2.*}) }${RO_REGION}
++  .rela.sdata2  ${RELOCATING-0} : { *(.rela.sdata2${RELOCATING+ .rela.sdata2.* .rela.gnu.linkonce.s2.*}) }${RO_REGION}"
++  REL_SBSS2=".rel.sbss2    ${RELOCATING-0} : { *(.rel.sbss2${RELOCATING+ .rel.sbss2.* .rel.gnu.linkonce.sb2.*}) }${RO_REGION}
++  .rela.sbss2   ${RELOCATING-0} : { *(.rela.sbss2${RELOCATING+ .rela.sbss2.* .rela.gnu.linkonce.sb2.*}) }${RO_REGION}"
++else
++  NO_SMALL_DATA=" "
++fi
++test -n "$SEPARATE_GOTPLT" && SEPARATE_GOTPLT=" "
++CTOR=".ctors        ${CONSTRUCTING-0} :
++  {
++    ${CONSTRUCTING+${CTOR_START}}
++    /* gcc uses crtbegin.o to find the start of
++       the constructors, so we make sure it is
++       first.  Because this is a wildcard, it
++       doesn't matter if the user does not
++       actually link against crtbegin.o; the
++       linker won't look for a file to match a
++       wildcard.  The wildcard also means that it
++       doesn't matter which directory crtbegin.o
++       is in.  */
++
++    KEEP (*crtbegin*.o(.ctors))
++
++    /* We don't want to include the .ctor section from
++       from the crtend.o file until after the sorted ctors.
++       The .ctor section from the crtend file contains the
++       end of ctors marker and it must be last */
++
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
++    KEEP (*(SORT(.ctors.*)))
++    KEEP (*(.ctors))
++    ${CONSTRUCTING+${CTOR_END}}
++  }"
++DTOR=".dtors        ${CONSTRUCTING-0} :
++  {
++    ${CONSTRUCTING+${DTOR_START}}
++    KEEP (*crtbegin*.o(.dtors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
++    KEEP (*(SORT(.dtors.*)))
++    KEEP (*(.dtors))
++    ${CONSTRUCTING+${DTOR_END}}
++  }"
++STACK=".stack        ${RELOCATING-0}${RELOCATING+${STACK_ADDR}} :
++  {
++    ${RELOCATING+_stack = .;}
++    *(.stack)
++    ${RELOCATING+${STACK_SIZE+. = ${STACK_SIZE};}}
++    ${RELOCATING+_estack = .;}
++  }${RW_BSS_REGION}"
++
++# if this is for an embedded system, don't add SIZEOF_HEADERS.
++if [ -z "$EMBEDDED" ]; then
++   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR} + SIZEOF_HEADERS"
++else
++   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR}"
++fi
++
++cat <<EOF
++OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
++	      "${LITTLE_OUTPUT_FORMAT}")
++OUTPUT_ARCH(${OUTPUT_ARCH})
++ENTRY(${ENTRY})
++
++${RELOCATING+${LIB_SEARCH_DIRS}}
++${RELOCATING+/* Do we need any of these for elf?
++   __DYNAMIC = 0; ${STACKZERO+${STACKZERO}} ${SHLIB_PATH+${SHLIB_PATH}}  */}
++${RELOCATING+${EXECUTABLE_SYMBOLS}}
++${RELOCATING+${INPUT_FILES}}
++${RELOCATING- /* For some reason, the Solaris linker makes bad executables
++  if gld -r is used and the intermediate file has sections starting
++  at non-zero addresses.  Could be a Solaris ld bug, could be a GNU ld
++  bug.  But for now assigning the zero vmas works.  */}
++
++${RELOCATING+${MEMORY}}
++
++SECTIONS
++{
++  /* Read-only sections, merged into text segment: */
++  ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+PROVIDE (__executable_start = ${TEXT_START_ADDR}); . = ${TEXT_BASE_ADDRESS};}}}
++  ${PADDING}
++  ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
++  ${CREATE_PIE+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
++  ${CREATE_SHLIB-${INTERP}}
++  ${INITIAL_READONLY_SECTIONS}
++  ${TEXT_DYNAMIC+${DYNAMIC}${RO_REGION}}
++  .hash         ${RELOCATING-0} : { *(.hash) }${RO_REGION}
++  .dynsym       ${RELOCATING-0} : { *(.dynsym) }${RO_REGION}
++  .dynstr       ${RELOCATING-0} : { *(.dynstr) }${RO_REGION}
++  .gnu.version  ${RELOCATING-0} : { *(.gnu.version) }${RO_REGION}
++  .gnu.version_d ${RELOCATING-0}: { *(.gnu.version_d) }${RO_REGION}
++  .gnu.version_r ${RELOCATING-0}: { *(.gnu.version_r) }${RO_REGION}
++
++EOF
++if [ "x$COMBRELOC" = x ]; then
++  COMBRELOCCAT=cat
++else
++  COMBRELOCCAT="cat > $COMBRELOC"
++fi
++eval $COMBRELOCCAT <<EOF
++  .rel.init     ${RELOCATING-0} : { *(.rel.init) }${RO_REGION}
++  .rela.init    ${RELOCATING-0} : { *(.rela.init) }${RO_REGION}
++  .rel.text     ${RELOCATING-0} : { *(.rel.text${RELOCATING+ .rel.text.* .rel.gnu.linkonce.t.*}) }${RO_REGION}
++  .rela.text    ${RELOCATING-0} : { *(.rela.text${RELOCATING+ .rela.text.* .rela.gnu.linkonce.t.*}) }${RO_REGION}
++  .rel.fini     ${RELOCATING-0} : { *(.rel.fini) }${RO_REGION}
++  .rela.fini    ${RELOCATING-0} : { *(.rela.fini) }${RO_REGION}
++  .rel.rodata   ${RELOCATING-0} : { *(.rel.rodata${RELOCATING+ .rel.rodata.* .rel.gnu.linkonce.r.*}) }${RO_REGION}
++  .rela.rodata  ${RELOCATING-0} : { *(.rela.rodata${RELOCATING+ .rela.rodata.* .rela.gnu.linkonce.r.*}) }${RO_REGION}
++  ${OTHER_READONLY_RELOC_SECTIONS}
++  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+*}) }${RO_REGION}
++  .rela.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+*}) }${RO_REGION}
++  .rel.data     ${RELOCATING-0} : { *(.rel.data${RELOCATING+ .rel.data.* .rel.gnu.linkonce.d.*}) }${RO_REGION}
++  .rela.data    ${RELOCATING-0} : { *(.rela.data${RELOCATING+ .rela.data.* .rela.gnu.linkonce.d.*}) }${RO_REGION}
++  .rel.tdata	${RELOCATING-0} : { *(.rel.tdata${RELOCATING+ .rel.tdata.* .rel.gnu.linkonce.td.*}) }${RO_REGION}
++  .rela.tdata	${RELOCATING-0} : { *(.rela.tdata${RELOCATING+ .rela.tdata.* .rela.gnu.linkonce.td.*}) }${RO_REGION}
++  .rel.tbss	${RELOCATING-0} : { *(.rel.tbss${RELOCATING+ .rel.tbss.* .rel.gnu.linkonce.tb.*}) }${RO_REGION}
++  .rela.tbss	${RELOCATING-0} : { *(.rela.tbss${RELOCATING+ .rela.tbss.* .rela.gnu.linkonce.tb.*}) }${RO_REGION}
++  .rel.ctors    ${RELOCATING-0} : { *(.rel.ctors) }${RO_REGION}
++  .rela.ctors   ${RELOCATING-0} : { *(.rela.ctors) }${RO_REGION}
++  .rel.dtors    ${RELOCATING-0} : { *(.rel.dtors) }${RO_REGION}
++  .rela.dtors   ${RELOCATING-0} : { *(.rela.dtors) }${RO_REGION}
++  .rel.got      ${RELOCATING-0} : { *(.rel.got) }${RO_REGION}
++  .rela.got     ${RELOCATING-0} : { *(.rela.got) }${RO_REGION}
++  ${OTHER_GOT_RELOC_SECTIONS}
++  ${REL_SDATA}
++  ${REL_SBSS}
++  ${REL_SDATA2}
++  ${REL_SBSS2}
++  .rel.bss      ${RELOCATING-0} : { *(.rel.bss${RELOCATING+ .rel.bss.* .rel.gnu.linkonce.b.*}) }${RO_REGION}
++  .rela.bss     ${RELOCATING-0} : { *(.rela.bss${RELOCATING+ .rela.bss.* .rela.gnu.linkonce.b.*}) }${RO_REGION}
++EOF
++if [ -n "$COMBRELOC" ]; then
++cat <<EOF
++  .rel.dyn      ${RELOCATING-0} :
++    {
++EOF
++sed -e '/^[ 	]*[{}][ 	]*$/d;/:[ 	]*$/d;/\.rela\./d;s/^.*: { *\(.*\)}$/      \1/' $COMBRELOC
++cat <<EOF
++    }${RO_REGION}
++  .rela.dyn     ${RELOCATING-0} :
++    {
++EOF
++sed -e '/^[ 	]*[{}][ 	]*$/d;/:[ 	]*$/d;/\.rel\./d;s/^.*: { *\(.*\)}/      \1/' $COMBRELOC
++cat <<EOF
++    }${RO_REGION}
++EOF
++fi
++cat <<EOF
++  .rel.plt      ${RELOCATING-0} : { *(.rel.plt) }${RO_REGION}
++  .rela.plt     ${RELOCATING-0} : { *(.rela.plt) }${RO_REGION}
++  ${OTHER_PLT_RELOC_SECTIONS}
++
++  .init         ${RELOCATING-0} :
++  {
++    ${RELOCATING+${INIT_START}}
++    KEEP (*(.init))
++    ${RELOCATING+${INIT_END}}
++  }${RO_REGION} =${NOP-0}
++
++  ${DATA_PLT-${BSS_PLT-${PLT}${RO_REGION}}}
++  .text         ${RELOCATING-0} :
++  {
++    ${RELOCATING+${TEXT_START_SYMBOLS}}
++    *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*})
++    KEEP (*(.text.*personality*))
++    /* .gnu.warning sections are handled specially by elf32.em.  */
++    *(.gnu.warning)
++    ${RELOCATING+${OTHER_TEXT_SECTIONS}}
++  }${RO_REGION} =${NOP-0}
++  .fini         ${RELOCATING-0} :
++  {
++    ${RELOCATING+${FINI_START}}
++    KEEP (*(.fini))
++    ${RELOCATING+${FINI_END}}
++  }${RO_REGION} =${NOP-0}
++  ${RELOCATING+PROVIDE (__etext = .);}
++  ${RELOCATING+PROVIDE (_etext = .);}
++  ${RELOCATING+PROVIDE (etext = .);}
++  ${WRITABLE_RODATA-${RODATA}${RO_REGION}}
++  .rodata1      ${RELOCATING-0} : { *(.rodata1) }${RO_REGION}
++  ${CREATE_SHLIB-${SDATA2}}
++  ${CREATE_SHLIB-${SBSS2}}
++  ${OTHER_READONLY_SECTIONS}
++  .eh_frame_hdr : { *(.eh_frame_hdr) }${RO_REGION}
++  .eh_frame     ${RELOCATING-0} : ONLY_IF_RO { KEEP (*(.eh_frame)) }${RO_REGION}
++  .gcc_except_table ${RELOCATING-0} : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }${RO_REGION}
++
++  ${RELOCATING+${DALIGN}}
++  ${RELOCATING+PROVIDE (_data = ORIGIN(${RW_VMA_REGION}));}
++  . = ORIGIN(${RW_VMA_REGION});
++  /* Exception handling  */
++  .eh_frame     ${RELOCATING-0} : ONLY_IF_RW { KEEP (*(.eh_frame)) }${RW_REGION}
++  .gcc_except_table ${RELOCATING-0} : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }${RW_REGION}
++
++  /* Thread Local Storage sections  */
++  .tdata	${RELOCATING-0} : { *(.tdata${RELOCATING+ .tdata.* .gnu.linkonce.td.*}) }${RW_REGION}
++  .tbss		${RELOCATING-0} : { *(.tbss${RELOCATING+ .tbss.* .gnu.linkonce.tb.*})${RELOCATING+ *(.tcommon)} }${RW_BSS_REGION}
++
++  /* Ensure the __preinit_array_start label is properly aligned.  We
++     could instead move the label definition inside the section, but
++     the linker would then create the section even if it turns out to
++     be empty, which isn't pretty.  */
++  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__preinit_array_start = ALIGN(${ALIGNMENT}));}}
++  .preinit_array   ${RELOCATING-0} : { KEEP (*(.preinit_array)) }${RW_REGION}
++  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__preinit_array_end = .);}}
++
++  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__init_array_start = .);}}
++  .init_array   ${RELOCATING-0} : { KEEP (*(.init_array)) }${RW_REGION}
++  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__init_array_end = .);}}
++
++  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__fini_array_start = .);}}
++  .fini_array   ${RELOCATING-0} : { KEEP (*(.fini_array)) }${RW_REGION}
++  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__fini_array_end = .);}}
++
++  ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}${RW_REGION}}}
++  ${SMALL_DATA_DTOR-${RELOCATING+${DTOR}${RW_REGION}}}
++  .jcr          ${RELOCATING-0} : { KEEP (*(.jcr)) }${RW_REGION}
++
++  ${RELOCATING+${DATARELRO}}
++  ${OTHER_RELRO_SECTIONS}
++  ${TEXT_DYNAMIC-${DYNAMIC}${RW_REGION}}
++  ${NO_SMALL_DATA+${RELRO_NOW+${GOT}${RW_REGION}}}
++  ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT+${GOT}${RW_REGION}}}}
++  ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT+${GOTPLT}${RW_REGION}}}}
++  ${RELOCATING+${DATA_SEGMENT_RELRO_END}}
++  ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT-${GOT}${RW_REGION}}}}
++
++  ${DATA_PLT+${PLT_BEFORE_GOT-${PLT}${RW_REGION}}}
++
++  .data         ${RELOCATING-0} :
++  {
++    ${RELOCATING+${DATA_START_SYMBOLS}}
++    *(.data${RELOCATING+ .data.* .gnu.linkonce.d.*})
++    KEEP (*(.gnu.linkonce.d.*personality*))
++    ${CONSTRUCTING+SORT(CONSTRUCTORS)}
++  }${RW_REGION}
++  .data1        ${RELOCATING-0} : { *(.data1) }${RW_REGION}
++  ${WRITABLE_RODATA+${RODATA}${RW_REGION}}
++  ${OTHER_READWRITE_SECTIONS}
++  ${SMALL_DATA_CTOR+${RELOCATING+${CTOR}${RW_REGION}}}
++  ${SMALL_DATA_DTOR+${RELOCATING+${DTOR}${RW_REGION}}}
++  ${DATA_PLT+${PLT_BEFORE_GOT+${PLT}${RW_REGION}}}
++  ${RELOCATING+${OTHER_GOT_SYMBOLS}}
++  ${NO_SMALL_DATA-${GOT}${RW_REGION}}
++  ${OTHER_GOT_SECTIONS}
++  ${SDATA}
++  ${OTHER_SDATA_SECTIONS}
++  ${RELOCATING+${BALIGN}}
++  ${RELOCATING+_edata = .;}
++  ${RELOCATING+PROVIDE (edata = .);}
++  ${RELOCATING+__bss_start = .;}
++  ${RELOCATING+${OTHER_BSS_SYMBOLS}}
++  ${SBSS}
++  ${BSS_PLT+${PLT}${RW_REGION}}
++  .bss          ${RELOCATING-0} :
++  {
++   *(.dynbss)
++   *(.bss${RELOCATING+ .bss.* .gnu.linkonce.b.*})
++   *(COMMON)
++   /* Align here to ensure that the .bss section occupies space up to
++      _end.  Align after .bss to ensure correct alignment even if the
++      .bss section disappears because there are no input sections.  */
++   ${RELOCATING+. = ALIGN(${BSS_ALIGNMENT});}
++  }${RW_BSS_REGION}
++  ${OTHER_BSS_SECTIONS}
++  ${RELOCATING+. = ALIGN(${BSS_ALIGNMENT});}
++  ${RELOCATING+_end = .;}
++  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
++  ${RELOCATING+PROVIDE (end = .);}
++  ${RELOCATING+${DATA_SEGMENT_END}}
++
++  /* Stabs debugging sections.  */
++  .stab          0 : { *(.stab) }
++  .stabstr       0 : { *(.stabstr) }
++  .stab.excl     0 : { *(.stab.excl) }
++  .stab.exclstr  0 : { *(.stab.exclstr) }
++  .stab.index    0 : { *(.stab.index) }
++  .stab.indexstr 0 : { *(.stab.indexstr) }
++
++  .comment       0 : { *(.comment) }
++
++  /* DWARF debug sections.
++     Symbols in the DWARF debugging sections are relative to the beginning
++     of the section so we begin them at 0.  */
++
++  /* DWARF 1 */
++  .debug          0 : { *(.debug) }
++  .line           0 : { *(.line) }
++
++  /* GNU DWARF 1 extensions */
++  .debug_srcinfo  0 : { *(.debug_srcinfo) }
++  .debug_sfnames  0 : { *(.debug_sfnames) }
++
++  /* DWARF 1.1 and DWARF 2 */
++  .debug_aranges  0 : { *(.debug_aranges) }
++  .debug_pubnames 0 : { *(.debug_pubnames) }
++
++  /* DWARF 2 */
++  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
++  .debug_abbrev   0 : { *(.debug_abbrev) }
++  .debug_line     0 : { *(.debug_line) }
++  .debug_frame    0 : { *(.debug_frame) }
++  .debug_str      0 : { *(.debug_str) }
++  .debug_loc      0 : { *(.debug_loc) }
++  .debug_macinfo  0 : { *(.debug_macinfo) }
++
++  /* SGI/MIPS DWARF 2 extensions */
++  .debug_weaknames 0 : { *(.debug_weaknames) }
++  .debug_funcnames 0 : { *(.debug_funcnames) }
++  .debug_typenames 0 : { *(.debug_typenames) }
++  .debug_varnames  0 : { *(.debug_varnames) }
++
++  ${STACK_ADDR+${STACK}}
++  ${OTHER_SECTIONS}
++  ${RELOCATING+${OTHER_END_SYMBOLS}}
++  ${RELOCATING+${STACKNOTE}}
++}
++EOF
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/avr32.exp
+@@ -0,0 +1,25 @@
++# Expect script for AVR32 ELF linker tests.
++#   Copyright 2004-2006 Atmel Corporation.
++#
++# This file is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that 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.
++#
++# Written by Haavard Skinnemoen (hskinnemoen@atmel.com)
++#
++
++if ![istarget avr32-*-*] {
++    return
++}
++
++run_dump_test "pcrel"
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/pcrel.d
+@@ -0,0 +1,74 @@
++#name: AVR32 ELF PC-relative external relocs
++#source: symbols.s
++#source: ../../../gas/testsuite/gas/avr32/pcrel.s
++#ld: -T $srcdir/$subdir/pcrel.ld
++#objdump: -d
++
++.*:     file format elf.*avr32.*
++
++Disassembly of section .text:
++
++a0000000 <_start>:
++a0000000:	d7 03       	nop
++a0000002:	d7 03       	nop
++
++a0000004 <test_rjmp>:
++a0000004:	d7 03       	nop
++a0000006:	c0 28       	rjmp a000000a <test_rjmp\+0x6>
++a0000008:	d7 03       	nop
++a000000a:	e0 8f 01 fb 	bral a0000400 <extsym10>
++
++a000000e <test_rcall>:
++a000000e:	d7 03       	nop
++a0000010 <test_rcall2>:
++a0000010:	c0 2c       	rcall a0000014 <test_rcall2\+0x4>
++a0000012:	d7 03       	nop
++a0000014:	ee b0 ff f6 	rcall a0200000 <extsym21>
++
++a0000018 <test_branch>:
++a0000018:	c0 31       	brne a000001e <test_branch\+0x6>
++a000001a:	fe 9f ff ff 	bral a0000018 <test_branch>
++a000001e:	ee 90 ff f1 	breq a0200000 <extsym21>
++
++a0000022 <test_lddpc>:
++a0000022:	48 30       	lddpc r0,a000002c <sym1>
++a0000024:	48 20       	lddpc r0,a000002c <sym1>
++a0000026:	fe f0 7f da 	ld.w r0,pc\[32730\]
++	...
++
++a000002c <sym1>:
++a000002c:	d7 03       	nop
++a000002e:	d7 03       	nop
++
++a0000030 <test_local>:
++a0000030:	48 20       	lddpc r0,a0000038 <test_local\+0x8>
++a0000032:	48 30       	lddpc r0,a000003c <test_local\+0xc>
++a0000034:	48 20       	lddpc r0,a000003c <test_local\+0xc>
++a0000036:	00 00       	add r0,r0
++a0000038:	d7 03       	nop
++a000003a:	d7 03       	nop
++a000003c:	d7 03       	nop
++a000003e:	d7 03       	nop
++
++Disassembly of section \.text\.init:
++a0000040 <test_inter_section>:
++a0000040:	fe b0 ff e7 	rcall a000000e <test_rcall>
++a0000044:	d7 03       	nop
++a0000046:	fe b0 ff e4 	rcall a000000e <test_rcall>
++a000004a:	fe b0 ff e3 	rcall a0000010 <test_rcall2>
++a000004e:	d7 03       	nop
++a0000050:	fe b0 ff e0 	rcall a0000010 <test_rcall2>
++
++Disassembly of section \.text\.pcrel10:
++
++a0000400 <extsym10>:
++a0000400:	d7 03       	nop
++
++Disassembly of section \.text\.pcrel16:
++
++a0008000 <extsym16>:
++a0008000:	d7 03       	nop
++
++Disassembly of section \.text\.pcrel21:
++a0200000 <extsym21>:
++a0200000:	d7 03       	nop
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/pcrel.ld
+@@ -0,0 +1,23 @@
++ENTRY(_start)
++SECTIONS
++{
++	.text 0xa0000000:
++	{
++		*(.text)
++	}
++
++	.text.pcrel10 0xa0000400:
++	{
++		*(.text.pcrel10)
++	}
++
++	.text.pcrel16 0xa0008000:
++	{
++		*(.text.pcrel16)
++	}
++
++	.text.pcrel21 0xa0200000:
++	{
++		*(.text.pcrel21)
++	}
++}
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/symbols.s
+@@ -0,0 +1,20 @@
++	.text
++	.global _start
++_start:
++	nop
++	nop
++
++	.section .text.pcrel10,"ax"
++	.global extsym10
++extsym10:
++	nop
++
++	.section .text.pcrel16,"ax"
++	.global extsym16
++extsym16:
++	nop
++
++	.section .text.pcrel21,"ax"
++	.global extsym21
++extsym21:
++	nop
+--- /dev/null
++++ b/opcodes/avr32-asm.c
+@@ -0,0 +1,244 @@
++/* Assembler interface for AVR32.
++   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of libopcodes.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   This program is distributed in the hope that 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 <string.h>
++
++#include "avr32-opc.h"
++#include "avr32-asm.h"
++
++/* Structure for a register hash table entry.  */
++struct reg_entry
++{
++  const char	*name;
++  int		number;
++};
++
++/* Integer Registers.  */
++static const struct reg_entry reg_table[] =
++  {
++    /* Primary names (used by the disassembler) */
++    { "r0",   0 }, { "r1",   1 }, { "r2",   2 }, { "r3",   3 },
++    { "r4",   4 }, { "r5",   5 }, { "r6",   6 }, { "r7",   7 },
++    { "r8",   8 }, { "r9",   9 }, { "r10", 10 }, { "r11", 11 },
++    { "r12", 12 }, { "sp",  13 }, { "lr",  14 }, { "pc",  15 },
++    /* Alternatives to sp, lr and pc.  */
++    { "r13", 13 }, { "r14", 14 }, { "r15", 15 },
++  };
++#define AVR32_NR_INTREGS (sizeof(reg_table)/sizeof(reg_table[0]))
++
++/* Coprocessor Registers.  */
++static const struct reg_entry cr_table[] =
++  {
++    { "cr0",   0 }, { "cr1",   1 }, { "cr2",   2 }, { "cr3",   3 },
++    { "cr4",   4 }, { "cr5",   5 }, { "cr6",   6 }, { "cr7",   7 },
++    { "cr8",   8 }, { "cr9",   9 }, { "cr10", 10 }, { "cr11", 11 },
++    { "cr12", 12 }, { "cr13", 13 }, { "cr14", 14 }, { "cr15", 15 },
++  };
++#define AVR32_NR_CPREGS (sizeof(cr_table)/sizeof(cr_table[0]))
++
++#define AVR32_NR_FPREGS (sizeof(fr_table)/sizeof(fr_table[0]))
++
++/* PiCo Registers.  */
++static const struct reg_entry pico_table[] =
++  {
++    { "inpix2",    0 }, { "inpix1",    1 }, { "inpix0",    2 },
++    { "outpix2",   3 }, { "outpix1",   4 }, { "outpix0",   5 },
++    { "coeff0_a",  6 }, { "coeff0_b",  7 }, { "coeff1_a",  8 },
++    { "coeff1_b",  9 }, { "coeff2_a", 10 }, { "coeff2_b", 11 },
++    { "vmu0_out", 12 }, { "vmu1_out", 13 }, { "vmu2_out", 14 },
++    { "config",   15 },
++  };
++#define AVR32_NR_PICOREGS (sizeof(pico_table)/sizeof(pico_table[0]))
++
++int
++avr32_parse_intreg(const char *str)
++{
++  unsigned int i;
++
++  for (i = 0; i < AVR32_NR_INTREGS; i++)
++    {
++      if (strcasecmp(reg_table[i].name, str) == 0)
++	return reg_table[i].number;
++    }
++
++  return -1;
++}
++
++int
++avr32_parse_cpreg(const char *str)
++{
++  unsigned int i;
++
++  for (i = 0; i < AVR32_NR_CPREGS; i++)
++    {
++      if (strcasecmp(cr_table[i].name, str) == 0)
++	return cr_table[i].number;
++    }
++
++  return -1;
++}
++
++
++int avr32_parse_picoreg(const char *str)
++{
++  unsigned int i;
++
++  for (i = 0; i < AVR32_NR_PICOREGS; i++)
++    {
++      if (strcasecmp(pico_table[i].name, str) == 0)
++	return pico_table[i].number;
++    }
++
++  return -1;
++}
++
++static unsigned long
++parse_reglist(char *str, char **endptr, int (*parse_reg)(const char *))
++{
++  int reg_from, reg_to;
++  unsigned long result = 0;
++  char *p1, *p2, c;
++
++  while (*str)
++    {
++      for (p1 = str; *p1; p1++)
++	if (*p1 == ',' || *p1 == '-')
++	  break;
++
++      c = *p1, *p1 = 0;
++      reg_from = parse_reg(str);
++      *p1 = c;
++
++      if (reg_from < 0)
++	break;
++
++      if (*p1 == '-')
++	{
++	  for (p2 = ++p1; *p2; p2++)
++	    if (*p2 == ',')
++	      break;
++
++	  c = *p2, *p2 = 0;
++	  /* printf("going to parse reg_to from `%s'\n", p1); */
++	  reg_to = parse_reg(p1);
++	  *p2 = c;
++
++	  if (reg_to < 0)
++	    break;
++
++	  while (reg_from <= reg_to)
++	    result |= (1 << reg_from++);
++	  p1 = p2;
++	}
++      else
++	result |= (1 << reg_from);
++
++      str = p1;
++      if (*str) ++str;
++    }
++
++  if (endptr)
++    *endptr = str;
++
++  return result;
++}
++
++unsigned long
++avr32_parse_reglist(char *str, char **endptr)
++{
++  return parse_reglist(str, endptr, avr32_parse_intreg);
++}
++
++unsigned long
++avr32_parse_cpreglist(char *str, char **endptr)
++{
++  return parse_reglist(str, endptr, avr32_parse_cpreg);
++}
++
++unsigned long
++avr32_parse_pico_reglist(char *str, char **endptr)
++{
++  return parse_reglist(str, endptr, avr32_parse_picoreg);
++}
++
++int
++avr32_make_regmask8(unsigned long regmask16, unsigned long *regmask8)
++{
++  unsigned long result = 0;
++
++  /* printf("convert regmask16 0x%04lx\n", regmask16); */
++
++  if (regmask16 & 0xf)
++    {
++      if ((regmask16 & 0xf) == 0xf)
++	result |= 1 << 0;
++      else
++	return -1;
++    }
++  if (regmask16 & 0xf0)
++    {
++      if ((regmask16 & 0xf0) == 0xf0)
++	result |= 1 << 1;
++      else
++	return -1;
++    }
++  if (regmask16 & 0x300)
++    {
++      if ((regmask16 & 0x300) == 0x300)
++	result |= 1 << 2;
++      else
++	return -1;
++    }
++  if (regmask16 & (1 << 13))
++    return -1;
++
++  if (regmask16 & (1 << 10))
++    result |= 1 << 3;
++  if (regmask16 & (1 << 11))
++    result |= 1 << 4;
++  if (regmask16 & (1 << 12))
++    result |= 1 << 5;
++  if (regmask16 & (1 << 14))
++    result |= 1 << 6;
++  if (regmask16 & (1 << 15))
++    result |= 1 << 7;
++
++  *regmask8 = result;
++
++  return 0;
++}
++
++#if 0
++struct reg_map
++{
++  const struct reg_entry	*names;
++  int				nr_regs;
++  struct hash_control		*htab;
++  const char			*errmsg;
++};
++
++struct reg_map all_reg_maps[] =
++  {
++    { reg_table, AVR32_NR_INTREGS, NULL, N_("integral register expected") },
++    { cr_table,  AVR32_NR_CPREGS,  NULL, N_("coprocessor register expected") },
++  };
++#endif
+--- /dev/null
++++ b/opcodes/avr32-asm.h
+@@ -0,0 +1,40 @@
++/* Assembler interface for AVR32.
++   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of libopcodes.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   This program is distributed in the hope that 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 __OPCODES_AVR32_ASM_H
++#define __OPCODES_AVR32_ASM_H
++
++extern int
++avr32_parse_intreg(const char *str);
++extern int
++avr32_parse_cpreg(const char *str);
++extern int
++avr32_parse_picoreg(const char *str);
++extern unsigned long
++avr32_parse_reglist(char *str, char **endptr);
++extern unsigned long
++avr32_parse_cpreglist(char *str, char **endptr);
++extern unsigned long
++avr32_parse_pico_reglist(char *str, char **endptr);
++extern int
++avr32_make_regmask8(unsigned long regmask16, unsigned long *regmask8);
++
++#endif /* __OPCODES_AVR32_ASM_H */
+--- /dev/null
++++ b/opcodes/avr32-dis.c
+@@ -0,0 +1,916 @@
++/* Print AVR32 instructions for GDB and objdump.
++   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of libopcodes.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   This program is distributed in the hope that 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 "sysdep.h"
++#include "dis-asm.h"
++#include "avr32-opc.h"
++#include "opintl.h"
++#include "safe-ctype.h"
++
++/* TODO: Share this with -asm */
++
++/* Structure for a register hash table entry.  */
++struct reg_entry
++{
++  const char	*name;
++  int		number;
++};
++
++#ifndef strneq
++#define strneq(a,b,n)	(strncmp ((a), (b), (n)) == 0)
++#endif
++
++static char avr32_opt_decode_fpu = 0;
++
++static const struct reg_entry reg_table[] =
++  {
++    /* Primary names (used by the disassembler) */
++    { "r0",   0 }, { "r1",   1 }, { "r2",   2 }, { "r3",   3 },
++    { "r4",   4 }, { "r5",   5 }, { "r6",   6 }, { "r7",   7 },
++    { "r8",   8 }, { "r9",   9 }, { "r10", 10 }, { "r11", 11 },
++    { "r12", 12 }, { "sp",  13 }, { "lr",  14 }, { "pc",  15 },
++    /* Alternatives to sp, lr and pc.  */
++    { "r13", 13 }, { "r14", 14 }, { "r15", 15 },
++  };
++#define AVR32_NR_INTREGS (sizeof(reg_table)/sizeof(reg_table[0]))
++
++/* Coprocessor Registers.  */
++static const struct reg_entry cr_table[] =
++  {
++    { "cr0",   0 }, { "cr1",   1 }, { "cr2",   2 }, { "cr3",   3 },
++    { "cr4",   4 }, { "cr5",   5 }, { "cr6",   6 }, { "cr7",   7 },
++    { "cr8",   8 }, { "cr9",   9 }, { "cr10", 10 }, { "cr11", 11 },
++    { "cr12", 12 }, { "cr13", 13 }, { "cr14", 14 }, { "cr15", 15 },
++  };
++#define AVR32_NR_CPREGS (sizeof(cr_table)/sizeof(cr_table[0]))
++
++static const char bparts[4] = { 'b', 'l', 'u', 't' };
++static bfd_vma current_pc;
++
++struct avr32_field_value
++{
++  const struct avr32_ifield *ifield;
++  unsigned long value;
++};
++
++struct avr32_operand
++{
++  int id;
++  int is_pcrel;
++  int align_order;
++  int (*print)(struct avr32_operand *op, struct disassemble_info *info,
++	       struct avr32_field_value *ifields);
++};
++
++static signed long
++get_signed_value(const struct avr32_field_value *fv)
++{
++  signed long value = fv->value;
++
++  if (fv->value & (1 << (fv->ifield->bitsize - 1)))
++    value |= (~0UL << fv->ifield->bitsize);
++
++  return value;
++}
++
++static void
++print_reglist_range(unsigned int first, unsigned int last,
++		    const struct reg_entry *reg_names,
++		    int need_comma,
++		    struct disassemble_info *info)
++{
++  if (need_comma)
++    info->fprintf_func(info->stream, ",");
++
++  if (first == last)
++    info->fprintf_func(info->stream, "%s",
++		       reg_names[first].name);
++  else
++    info->fprintf_func(info->stream, "%s-%s",
++		       reg_names[first].name, reg_names[last].name);
++}
++
++static int
++print_intreg(struct avr32_operand *op,
++	     struct disassemble_info *info,
++	     struct avr32_field_value *ifields)
++{
++  unsigned long regid = ifields[0].value << op->align_order;
++
++  info->fprintf_func(info->stream, "%s",
++		     reg_table[regid].name);
++  return 1;
++}
++
++static int
++print_intreg_predec(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		    struct disassemble_info *info,
++		    struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "--%s",
++		     reg_table[ifields[0].value].name);
++  return 1;
++}
++
++static int
++print_intreg_postinc(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		     struct disassemble_info *info,
++		     struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "%s++",
++		     reg_table[ifields[0].value].name);
++  return 1;
++}
++
++static int
++print_intreg_lsl(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		 struct disassemble_info *info,
++		 struct avr32_field_value *ifields)
++{
++  const char *rp = reg_table[ifields[0].value].name;
++  unsigned long sa = ifields[1].value;
++
++  if (sa)
++    info->fprintf_func(info->stream, "%s<<0x%lx", rp, sa);
++  else
++    info->fprintf_func(info->stream, "%s", rp);
++
++  return 2;
++}
++
++static int
++print_intreg_lsr(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		 struct disassemble_info *info,
++		 struct avr32_field_value *ifields)
++{
++  const char *rp = reg_table[ifields[0].value].name;
++  unsigned long sa = ifields[1].value;
++
++  if (sa)
++    info->fprintf_func(info->stream, "%s>>0x%lx", rp, sa);
++  else
++    info->fprintf_func(info->stream, "%s", rp);
++
++  return 2;
++}
++
++static int
++print_intreg_bpart(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		   struct disassemble_info *info,
++		   struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "%s:%c",
++		     reg_table[ifields[0].value].name,
++		     bparts[ifields[1].value]);
++  return 2;
++}
++
++static int
++print_intreg_hpart(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		   struct disassemble_info *info,
++		   struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "%s:%c",
++		     reg_table[ifields[0].value].name,
++		     ifields[1].value ? 't' : 'b');
++  return 2;
++}
++
++static int
++print_intreg_sdisp(struct avr32_operand *op,
++		  struct disassemble_info *info,
++		  struct avr32_field_value *ifields)
++{
++  signed long disp;
++
++  disp = get_signed_value(&ifields[1]) << op->align_order;
++
++  info->fprintf_func(info->stream, "%s[%ld]",
++		     reg_table[ifields[0].value].name, disp);
++  return 2;
++}
++
++static int
++print_intreg_udisp(struct avr32_operand *op,
++		   struct disassemble_info *info,
++		   struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "%s[0x%lx]",
++		     reg_table[ifields[0].value].name,
++		     ifields[1].value << op->align_order);
++  return 2;
++}
++
++static int
++print_intreg_index(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		   struct disassemble_info *info,
++		   struct avr32_field_value *ifields)
++{
++  const char *rb, *ri;
++  unsigned long sa = ifields[2].value;
++
++  rb = reg_table[ifields[0].value].name;
++  ri = reg_table[ifields[1].value].name;
++
++  if (sa)
++    info->fprintf_func(info->stream, "%s[%s<<0x%lx]", rb, ri, sa);
++  else
++    info->fprintf_func(info->stream, "%s[%s]", rb, ri);
++
++  return 3;
++}
++
++static int
++print_intreg_xindex(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		    struct disassemble_info *info,
++		    struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "%s[%s:%c<<2]",
++		     reg_table[ifields[0].value].name,
++		     reg_table[ifields[1].value].name,
++		     bparts[ifields[2].value]);
++  return 3;
++}
++
++static int
++print_jmplabel(struct avr32_operand *op,
++	       struct disassemble_info *info,
++	       struct avr32_field_value *ifields)
++{
++  bfd_vma address, offset;
++
++  offset = get_signed_value(ifields) << op->align_order;
++  address = (current_pc & (~0UL << op->align_order)) + offset;
++
++  info->print_address_func(address, info);
++
++  return 1;
++}
++
++static int
++print_pc_disp(struct avr32_operand *op,
++	      struct disassemble_info *info,
++	      struct avr32_field_value *ifields)
++{
++  bfd_vma address, offset;
++
++  offset = ifields[0].value << op->align_order;
++  address = (current_pc & (~0UL << op->align_order)) + offset;
++
++  info->print_address_func(address, info);
++
++  return 1;
++}
++
++static int
++print_sp(struct avr32_operand *op ATTRIBUTE_UNUSED,
++	 struct disassemble_info *info,
++	 struct avr32_field_value *ifields ATTRIBUTE_UNUSED)
++{
++  info->fprintf_func(info->stream, "sp");
++  return 1;
++}
++
++static int
++print_sp_disp(struct avr32_operand *op,
++	      struct disassemble_info *info,
++	      struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "sp[0x%lx]",
++		     ifields[0].value << op->align_order);
++  return 1;
++}
++
++static int
++print_cpno(struct avr32_operand *op ATTRIBUTE_UNUSED,
++	   struct disassemble_info *info,
++	   struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "cp%lu", ifields[0].value);
++  return 1;
++}
++
++static int
++print_cpreg(struct avr32_operand *op,
++	    struct disassemble_info *info,
++	    struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "cr%lu",
++		     ifields[0].value << op->align_order);
++  return 1;
++}
++
++static int
++print_uconst(struct avr32_operand *op,
++	     struct disassemble_info *info,
++	     struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "0x%lx",
++		     ifields[0].value << op->align_order);
++  return 1;
++}
++
++static int
++print_sconst(struct avr32_operand *op,
++	     struct disassemble_info *info,
++	     struct avr32_field_value *ifields)
++{
++  info->fprintf_func(info->stream, "%ld",
++		     get_signed_value(ifields) << op->align_order);
++  return 1;
++}
++
++static int
++print_reglist8_head(unsigned long regmask, int *commap,
++		    struct disassemble_info *info)
++{
++  int first = -1, last, i = 0;
++  int need_comma = 0;
++
++  while (i < 12)
++    {
++      if (first == -1 && (regmask & 1))
++	{
++	  first = i;
++	}
++      else if (first != -1 && !(regmask & 1))
++	{
++	  last = i - 1;
++
++	  print_reglist_range(first, last, reg_table, need_comma, info);
++	  need_comma = 1;
++	  first = -1;
++	}
++
++      if (i < 8)
++	i += 4;
++      else if (i < 10)
++	i += 2;
++      else
++	i++;
++      regmask >>= 1;
++    }
++
++  *commap = need_comma;
++  return first;
++}
++
++static void
++print_reglist8_tail(unsigned long regmask, int first, int need_comma,
++		    struct disassemble_info *info)
++{
++  int last = 11;
++
++  if (regmask & 0x20)
++    {
++      if (first == -1)
++	first = 12;
++      last = 12;
++    }
++
++  if (first != -1)
++    {
++      print_reglist_range(first, last, reg_table, need_comma, info);
++      need_comma = 1;
++      first = -1;
++    }
++
++  if (regmask & 0x40)
++    {
++      if (first == -1)
++	first = 14;
++      last = 14;
++    }
++
++  if (regmask & 0x80)
++    {
++      if (first == -1)
++	first = 15;
++      last = 15;
++    }
++
++  if (first != -1)
++    print_reglist_range(first, last, reg_table, need_comma, info);
++}
++
++static int
++print_reglist8(struct avr32_operand *op ATTRIBUTE_UNUSED,
++	       struct disassemble_info *info,
++	       struct avr32_field_value *ifields)
++{
++  unsigned long regmask = ifields[0].value;
++  int first, need_comma;
++
++  first = print_reglist8_head(regmask, &need_comma, info);
++  print_reglist8_tail(regmask, first, need_comma, info);
++
++  return 1;
++}
++
++static int
++print_reglist9(struct avr32_operand *op ATTRIBUTE_UNUSED,
++	       struct disassemble_info *info,
++	       struct avr32_field_value *ifields)
++{
++  unsigned long regmask = ifields[0].value >> 1;
++  int first, last, need_comma;
++
++  first = print_reglist8_head(regmask, &need_comma, info);
++
++  if ((ifields[0].value & 0x101) == 0x101)
++    {
++      if (first != -1)
++	{
++	  last = 11;
++
++	  print_reglist_range(first, last, reg_table, need_comma, info);
++	  need_comma = 1;
++	  first = -1;
++	}
++
++      print_reglist_range(15, 15, reg_table, need_comma, info);
++
++      regmask >>= 5;
++
++      if ((regmask & 3) == 0)
++	info->fprintf_func(info->stream, ",r12=0");
++      else if ((regmask & 3) == 1)
++	info->fprintf_func(info->stream, ",r12=1");
++      else
++	info->fprintf_func(info->stream, ",r12=-1");
++    }
++  else
++      print_reglist8_tail(regmask, first, need_comma, info);
++
++  return 1;
++}
++
++static int
++print_reglist16(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		struct disassemble_info *info,
++		struct avr32_field_value *ifields)
++{
++  unsigned long regmask = ifields[0].value;
++  unsigned int i = 0, first, last;
++  int need_comma = 0;
++
++  while (i < 16)
++    {
++      if (regmask & 1)
++	{
++	  first = i;
++	  while (i < 16)
++	    {
++	      i++;
++	      regmask >>= 1;
++	      if (!(regmask & 1))
++		break;
++	    }
++	  last = i - 1;
++	  print_reglist_range(first, last, reg_table, need_comma, info);
++	  need_comma = 1;
++	}
++      else
++	{
++	  i++;
++	  regmask >>= 1;
++	}
++    }
++
++  return 1;
++}
++
++static int
++print_reglist_ldm(struct avr32_operand *op,
++		  struct disassemble_info *info,
++		  struct avr32_field_value *ifields)
++{
++  int rp, w_bit;
++  int i, first, last;
++  unsigned long regmask;
++
++  rp = ifields[0].value;
++  w_bit = ifields[1].value;
++  regmask = ifields[2].value;
++
++  if (regmask & (1 << AVR32_REG_PC) && rp == AVR32_REG_PC)
++    {
++      if (w_bit)
++	info->fprintf_func(info->stream, "sp++");
++      else
++	info->fprintf_func(info->stream, "sp");
++
++      for (i = 0; i < 12; )
++	{
++	  if (regmask & (1 << i))
++	    {
++	      first = i;
++	      while (i < 12)
++		{
++		  i++;
++		  if (!(regmask & (1 << i)))
++		    break;
++		}
++	      last = i - 1;
++	      print_reglist_range(first, last, reg_table, 1, info);
++	    }
++	  else
++	    i++;
++	}
++
++      info->fprintf_func(info->stream, ",pc");
++      if (regmask & (1 << AVR32_REG_LR))
++	info->fprintf_func(info->stream, ",r12=-1");
++      else if (regmask & (1 << AVR32_REG_R12))
++	info->fprintf_func(info->stream, ",r12=1");
++      else
++	info->fprintf_func(info->stream, ",r12=0");
++    }
++  else
++    {
++      if (w_bit)
++	info->fprintf_func(info->stream, "%s++,", reg_table[rp].name);
++      else
++	info->fprintf_func(info->stream, "%s,", reg_table[rp].name);
++
++      print_reglist16(op, info, ifields + 2);
++    }
++
++  return 3;
++}
++
++static int
++print_reglist_cp8(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		  struct disassemble_info *info,
++		  struct avr32_field_value *ifields)
++{
++  unsigned long regmask = ifields[0].value;
++  unsigned int i = 0, first, last, offset = 0;
++  int need_comma = 0;
++
++  if (ifields[1].value)
++    offset = 8;
++
++  while (i < 8)
++    {
++      if (regmask & 1)
++	{
++	  first = i;
++	  while (i < 8)
++	    {
++	      i++;
++	      regmask >>= 1;
++	      if (!(regmask & 1))
++		break;
++	    }
++	  last = i - 1;
++	  print_reglist_range(offset + first, offset + last,
++			      cr_table, need_comma, info);
++	  need_comma = 1;
++	}
++      else
++	{
++	  i++;
++	  regmask >>= 1;
++	}
++    }
++
++  return 2;
++}
++
++static int
++print_reglist_cpd8(struct avr32_operand *op ATTRIBUTE_UNUSED,
++		   struct disassemble_info *info,
++		   struct avr32_field_value *ifields)
++{
++  unsigned long regmask = ifields[0].value;
++  unsigned int i = 0, first, last;
++  int need_comma = 0;
++
++  while (i < 8)
++    {
++      if (regmask & 1)
++	{
++	  first = 2 * i;
++	  while (i < 8)
++	    {
++	      i++;
++	      regmask >>= 1;
++	      if (!(regmask & 1))
++		break;
++	    }
++	  last = 2 * (i - 1) + 1;
++	  print_reglist_range(first, last, cr_table, need_comma, info);
++	  need_comma = 1;
++	}
++      else
++	{
++	  i++;
++	  regmask >>= 1;
++	}
++    }
++
++  return 1;
++}
++
++static int
++print_retval(struct avr32_operand *op ATTRIBUTE_UNUSED,
++	     struct disassemble_info *info,
++	     struct avr32_field_value *ifields)
++{
++  unsigned long regid = ifields[0].value;
++  const char *retval;
++
++  if (regid < AVR32_REG_SP)
++    retval = reg_table[regid].name;
++  else if (regid == AVR32_REG_SP)
++    retval = "0";
++  else if (regid == AVR32_REG_LR)
++    retval = "-1";
++  else
++    retval = "1";
++
++  info->fprintf_func(info->stream, "%s", retval);
++
++  return 1;
++}
++
++static int
++print_mcall(struct avr32_operand *op,
++	    struct disassemble_info *info,
++	    struct avr32_field_value *ifields)
++{
++  unsigned long regid = ifields[0].value;
++
++  if (regid == AVR32_REG_PC)
++    print_jmplabel(op, info, ifields + 1);
++  else
++    print_intreg_sdisp(op, info, ifields);
++
++  return 2;
++}
++
++static int
++print_jospinc(struct avr32_operand *op ATTRIBUTE_UNUSED,
++	      struct disassemble_info *info,
++	      struct avr32_field_value *ifields)
++{
++  signed long value = ifields[0].value;
++
++  if (value >= 4)
++    value -= 8;
++  else
++    value += 1;
++
++  info->fprintf_func(info->stream, "%ld", value);
++
++  return 1;
++}
++
++static int
++print_coh(struct avr32_operand *op ATTRIBUTE_UNUSED,
++	  struct disassemble_info *info,
++	  struct avr32_field_value *ifields ATTRIBUTE_UNUSED)
++{
++  info->fprintf_func(info->stream, "COH");
++  return 0;
++}
++
++#define OP(name, sgn, pcrel, align, func) \
++  { AVR32_OPERAND_##name, pcrel, align, print_##func }
++
++struct avr32_operand operand[AVR32_NR_OPERANDS] =
++  {
++    OP(INTREG, 0, 0, 0, intreg),
++    OP(INTREG_PREDEC, 0, 0, 0, intreg_predec),
++    OP(INTREG_POSTINC, 0, 0, 0, intreg_postinc),
++    OP(INTREG_LSL, 0, 0, 0, intreg_lsl),
++    OP(INTREG_LSR, 0, 0, 0, intreg_lsr),
++    OP(INTREG_BSEL, 0, 0, 0, intreg_bpart),
++    OP(INTREG_HSEL, 0, 0, 1, intreg_hpart),
++    OP(INTREG_SDISP, 1, 0, 0, intreg_sdisp),
++    OP(INTREG_SDISP_H, 1, 0, 1, intreg_sdisp),
++    OP(INTREG_SDISP_W, 1, 0, 2, intreg_sdisp),
++    OP(INTREG_UDISP, 0, 0, 0, intreg_udisp),
++    OP(INTREG_UDISP_H, 0, 0, 1, intreg_udisp),
++    OP(INTREG_UDISP_W, 0, 0, 2, intreg_udisp),
++    OP(INTREG_INDEX, 0, 0, 0, intreg_index),
++    OP(INTREG_XINDEX, 0, 0, 0, intreg_xindex),
++    OP(DWREG, 0, 0, 1, intreg),
++    OP(PC_UDISP_W, 0, 1, 2, pc_disp),
++    OP(SP, 0, 0, 0, sp),
++    OP(SP_UDISP_W, 0, 0, 2, sp_disp),
++    OP(CPNO, 0, 0, 0, cpno),
++    OP(CPREG, 0, 0, 0, cpreg),
++    OP(CPREG_D, 0, 0, 1, cpreg),
++    OP(UNSIGNED_CONST, 0, 0, 0, uconst),
++    OP(UNSIGNED_CONST_W, 0, 0, 2, uconst),
++    OP(SIGNED_CONST, 1, 0, 0, sconst),
++    OP(SIGNED_CONST_W, 1, 0, 2, sconst),
++    OP(JMPLABEL, 1, 1, 1, jmplabel),
++    OP(UNSIGNED_NUMBER, 0, 0, 0, uconst),
++    OP(UNSIGNED_NUMBER_W, 0, 0, 2, uconst),
++    OP(REGLIST8, 0, 0, 0, reglist8),
++    OP(REGLIST9, 0, 0, 0, reglist9),
++    OP(REGLIST16, 0, 0, 0, reglist16),
++    OP(REGLIST_LDM, 0, 0, 0, reglist_ldm),
++    OP(REGLIST_CP8, 0, 0, 0, reglist_cp8),
++    OP(REGLIST_CPD8, 0, 0, 0, reglist_cpd8),
++    OP(RETVAL, 0, 0, 0, retval),
++    OP(MCALL, 1, 0, 2, mcall),
++    OP(JOSPINC, 0, 0, 0, jospinc),
++    OP(COH, 0, 0, 0, coh),
++  };
++
++static void
++print_opcode(bfd_vma insn_word, const struct avr32_opcode *opc,
++	     bfd_vma pc, struct disassemble_info *info)
++{
++  const struct avr32_syntax *syntax = opc->syntax;
++  struct avr32_field_value fields[AVR32_MAX_FIELDS];
++  unsigned int i, next_field = 0, nr_operands;
++
++  for (i = 0; i < opc->nr_fields; i++)
++    {
++      opc->fields[i]->extract(opc->fields[i], &insn_word, &fields[i].value);
++      fields[i].ifield = opc->fields[i];
++    }
++
++  current_pc = pc;
++  info->fprintf_func(info->stream, "%s", syntax->mnemonic->name);
++
++  if (syntax->nr_operands < 0)
++    nr_operands = (unsigned int) -syntax->nr_operands;
++  else
++    nr_operands = (unsigned int) syntax->nr_operands;
++
++  for (i = 0; i < nr_operands; i++)
++    {
++      struct avr32_operand *op = &operand[syntax->operand[i]];
++
++      if (i)
++	info->fprintf_func(info->stream, ",");
++      else
++	info->fprintf_func(info->stream, "\t");
++      next_field += op->print(op, info, &fields[next_field]);
++    }
++}
++
++#define is_fpu_insn(iw) ((iw&0xf9f0e000)==0xe1a00000) 
++
++static const struct avr32_opcode *
++find_opcode(bfd_vma insn_word)
++{
++  int i;
++
++  for (i = 0; i < AVR32_NR_OPCODES; i++)
++    {
++      const struct avr32_opcode *opc = &avr32_opc_table[i];
++
++      if ((insn_word & opc->mask) == opc->value)
++      {
++        if (avr32_opt_decode_fpu)
++        {
++          if (is_fpu_insn(insn_word))
++          {
++            if (opc->id != AVR32_OPC_COP)
++	       return opc;
++          }
++          else
++            return opc;
++        }
++        else
++	return opc;
++    }
++   }
++
++  return NULL;
++}
++
++static int
++read_insn_word(bfd_vma pc, bfd_vma *valuep,
++	       struct disassemble_info *info)
++{
++  bfd_byte b[4];
++  int status;
++
++  status = info->read_memory_func(pc, b, 4, info);
++  if (status)
++    {
++      status = info->read_memory_func(pc, b, 2, info);
++      if (status)
++	{
++	  info->memory_error_func(status, pc, info);
++	  return -1;
++	}
++      b[3] = b[2] = 0;
++    }
++
++  *valuep =  (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3];
++  return 0;
++}
++
++/* Parse an individual disassembler option.  */
++
++void
++parse_avr32_disassembler_option (option)
++     char * option;
++{
++  if (option == NULL)
++    return;
++
++  if (!strcmp(option,"decode-fpu"))
++  {
++    avr32_opt_decode_fpu = 1;
++    return;
++  }
++
++  printf("\n%s--",option);
++  /* XXX - should break 'option' at following delimiter.  */
++  fprintf (stderr, _("Unrecognised disassembler option: %s\n"), option);
++
++  return;
++}
++
++/* Parse the string of disassembler options, spliting it at whitespaces
++   or commas.  (Whitespace separators supported for backwards compatibility).  */
++
++static void
++parse_disassembler_options (char *options)
++{
++  if (options == NULL)
++    return;
++
++  while (*options)
++    {
++      parse_avr32_disassembler_option (options);
++
++      /* Skip forward to next seperator.  */
++      while ((*options) && (! ISSPACE (*options)) && (*options != ','))
++	++ options;
++      /* Skip forward past seperators.  */
++      while (ISSPACE (*options) || (*options == ','))
++	++ options;
++    }
++}
++
++int
++print_insn_avr32(bfd_vma pc, struct disassemble_info *info)
++{
++  bfd_vma insn_word;
++  const struct avr32_opcode *opc;
++
++  if (info->disassembler_options)
++    {
++      parse_disassembler_options (info->disassembler_options);
++
++      /* To avoid repeated parsing of these options, we remove them here.  */
++      info->disassembler_options = NULL;
++    }
++
++  info->bytes_per_chunk = 1;
++  info->display_endian = BFD_ENDIAN_BIG;
++
++  if (read_insn_word(pc, &insn_word, info))
++    return -1;
++
++  opc = find_opcode(insn_word);
++  if (opc)
++    {
++      print_opcode(insn_word, opc, pc, info);
++      return opc->size;
++    }
++  else
++    {
++      info->fprintf_func(info->stream, _("*unknown*"));
++      return 2;
++    }
++
++}
++
++void
++print_avr32_disassembler_options (FILE *stream ATTRIBUTE_UNUSED)
++{
++  fprintf(stream, "\n AVR32 Specific Disassembler Options:\n");
++  fprintf(stream, "  -M decode-fpu                  Print FPU instructions instead of 'cop' \n");
++}
++
+--- /dev/null
++++ b/opcodes/avr32-opc.c
+@@ -0,0 +1,6906 @@
++/* Opcode tables for AVR32.
++   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of libopcodes.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   This program is distributed in the hope that 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 <stdlib.h>
++#include <assert.h>
++
++#include "avr32-opc.h"
++
++#define PICO_CPNO	1
++
++void
++avr32_insert_simple(const struct avr32_ifield *field,
++		    void *buf, unsigned long value)
++{
++  bfd_vma word;
++
++  word = bfd_getb32(buf);
++  word &= ~field->mask;
++  word |= (value << field->shift) & field->mask;
++  bfd_putb32(word, buf);
++}
++
++void
++avr32_insert_bit5c(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
++		   void *buf, unsigned long value)
++{
++  char *opcode = buf;
++
++  opcode[0] = (opcode[0] & 0xe1) | (value & 0x1e);
++  opcode[1] = (opcode[1] & 0xef) | ((value & 1) << 4);
++}
++
++void
++avr32_insert_k10(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
++		 void *buf, unsigned long value)
++{
++  char *opcode = buf;
++
++  opcode[0] = (opcode[0] & 0xf0) | ((value & 0xf0) >> 4);
++  opcode[1] = ((opcode[1] & 0x0c) | ((value & 0x0f) << 4)
++	       | ((value & 0x300) >> 8));
++}
++
++
++void
++avr32_insert_k21(const struct avr32_ifield *field,
++		 void *buf, unsigned long value)
++{
++  bfd_vma word;
++  bfd_vma k21;
++
++  word = bfd_getb32(buf);
++  word &= ~field->mask;
++  k21 = ((value & 0xffff) | ((value & 0x10000) << 4)
++	 | ((value & 0x1e0000) << 8));
++  assert(!(k21 & ~field->mask));
++  word |= k21;
++  bfd_putb32(word, buf);
++}
++
++void
++avr32_insert_cpop(const struct avr32_ifield *field,
++		  void *buf, unsigned long value)
++{
++  bfd_vma word;
++
++  word = bfd_getb32(buf);
++  word &= ~field->mask;
++  word |= (((value & 0x1e) << 15) | ((value & 0x60) << 20)
++	   | ((value & 0x01) << 12));
++  bfd_putb32(word, buf);
++}
++
++void
++avr32_insert_k12cp(const struct avr32_ifield *field,
++		   void *buf, unsigned long value)
++{
++  bfd_vma word;
++
++  word = bfd_getb32(buf);
++  word &= ~field->mask;
++  word |= ((value & 0xf00) << 4) | (value & 0xff);
++  bfd_putb32(word, buf);
++}
++
++void avr32_extract_simple(const struct avr32_ifield *field,
++			  void *buf, unsigned long *value)
++{
++  /* XXX: The disassembler has done any necessary byteswapping already */
++  bfd_vma word = *(bfd_vma *)buf;
++
++  *value = (word & field->mask) >> field->shift;
++}
++
++void avr32_extract_bit5c(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
++			 void *buf, unsigned long *value)
++{
++  bfd_vma word = *(bfd_vma *)buf;
++
++  *value = ((word >> 20) & 1) | ((word >> 24) & 0x1e);
++}
++
++void avr32_extract_k10(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
++		       void *buf, unsigned long *value)
++{
++  bfd_vma word = *(bfd_vma *)buf;
++
++  *value = ((word >> 8) & 0x300) | ((word >> 20) & 0xff);
++}
++
++void avr32_extract_k21(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
++		       void *buf, unsigned long *value)
++{
++  bfd_vma word = *(bfd_vma *)buf;
++
++  *value = ((word & 0xffff) | ((word >> 4) & 0x10000)
++	    | ((word >> 8) & 0x1e0000));
++}
++
++void avr32_extract_cpop(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
++			void *buf, unsigned long *value)
++{
++  bfd_vma word = *(bfd_vma *)buf;
++
++  *value = (((word >> 12) & 1) | ((word >> 15) & 0x1e)
++	    | ((word >> 20) & 0x60));
++}
++
++void avr32_extract_k12cp(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
++			 void *buf, unsigned long *value)
++{
++  bfd_vma word = *(bfd_vma *)buf;
++
++  *value = ((word >> 4) & 0xf00) | (word & 0xff);
++}
++
++
++#define IFLD(id, bitsz, shift, mask, func) \
++  { AVR32_IFIELD_##id, bitsz, shift, mask, \
++    avr32_insert_##func, avr32_extract_##func }
++
++const struct avr32_ifield avr32_ifield_table[] =
++  {
++    IFLD(RX, 4, 25, 0x1e000000, simple),
++    IFLD(RY, 4, 16, 0x000f0000, simple),
++    IFLD(COND4C, 4, 20, 0x00f00000, simple),
++    IFLD(K8C, 8, 20, 0x0ff00000, simple),
++    IFLD(K7C, 7, 20, 0x07f00000, simple),
++    IFLD(K5C, 5, 20, 0x01f00000, simple),
++    IFLD(K3, 3, 20, 0x00700000, simple),
++    IFLD(RY_DW, 3, 17, 0x000e0000, simple),
++    IFLD(COND4E, 4, 8, 0x00000f00, simple),
++    IFLD(K8E, 8, 0, 0x000000ff, simple),
++    IFLD(BIT5C, 5, 20, 0x1e100000, bit5c),
++    IFLD(COND3, 3, 16, 0x00070000, simple),
++    IFLD(K10, 10, 16, 0x0ff30000, k10),
++    IFLD(POPM, 9, 19, 0x0ff80000, simple),
++    IFLD(K2, 2, 4, 0x00000030, simple),
++    IFLD(RD_E, 4, 0, 0x0000000f, simple),
++    IFLD(RD_DW, 3, 1, 0x0000000e, simple),
++    IFLD(X, 1, 5, 0x00000020, simple),
++    IFLD(Y, 1, 4, 0x00000010, simple),
++    IFLD(X2, 1, 13, 0x00002000, simple),
++    IFLD(Y2, 1, 12, 0x00001000, simple),
++    IFLD(K5E, 5, 0, 0x0000001f, simple),
++    IFLD(PART2, 2, 0, 0x00000003, simple),
++    IFLD(PART1, 1, 0, 0x00000001, simple),
++    IFLD(K16, 16, 0, 0x0000ffff, simple),
++    IFLD(CACHEOP, 5, 11, 0x0000f800, simple),
++    IFLD(K11, 11, 0, 0x000007ff, simple),
++    IFLD(K21, 21, 0, 0x1e10ffff, k21),
++    IFLD(CPOP, 7, 12, 0x060f1000, cpop),
++    IFLD(CPNO, 3, 13, 0x0000e000, simple),
++    IFLD(CRD_RI, 4, 8, 0x00000f00, simple),
++    IFLD(CRX, 4, 4, 0x000000f0, simple),
++    IFLD(CRY, 4, 0, 0x0000000f, simple),
++    IFLD(K7E, 7, 0, 0x0000007f, simple),
++    IFLD(CRD_DW, 3, 9, 0x00000e00, simple),
++    IFLD(PART1_K12, 1, 12, 0x00001000, simple),
++    IFLD(PART2_K12, 2, 12, 0x00003000, simple),
++    IFLD(K12, 12, 0, 0x00000fff, simple),
++    IFLD(S5, 5, 5, 0x000003e0, simple),
++    IFLD(K5E2, 5, 4, 0x000001f0, simple),
++    IFLD(K4, 4, 20, 0x00f00000, simple),
++    IFLD(COND4E2, 4, 4, 0x000000f0, simple),
++    IFLD(K8E2, 8, 4, 0x00000ff0, simple),
++    IFLD(K6, 6, 20, 0x03f00000, simple),
++    IFLD(MEM15, 15, 0, 0x00007fff, simple),
++    IFLD(MEMB5, 5, 15, 0x000f8000, simple),
++    IFLD(W, 1, 25, 0x02000000, simple),
++    /* Coprocessor Multiple High/Low */
++    IFLD(CM_HL, 1, 8, 0x00000100, simple),
++    IFLD(K12CP, 12 ,0, 0x0000f0ff, k12cp),
++    IFLD(K9E, 9 ,0, 0x000001ff, simple),
++    IFLD (FP_RX, 4,  4, 0x000000F0, simple),
++    IFLD (FP_RY, 4,  0, 0x0000000F, simple),
++    IFLD (FP_RD, 4,  8, 0x00000F00, simple),
++    IFLD (FP_RA, 4, 16, 0x000F0000, simple) 
++  };
++#undef IFLD
++
++
++struct avr32_opcode avr32_opc_table[] =
++  {
++    {
++      AVR32_OPC_ABS, 2, 0x5c400000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ABS],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_ACALL, 2, 0xd0000000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_ACALL],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_ACR, 2, 0x5c000000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ACR],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ADC, 4, 0xe0000040, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_ADC],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ADD1, 2, 0x00000000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ADD1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_ADD2, 4, 0xe0000000, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_ADD2],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_ADDABS, 4, 0xe0000e40, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_ADDABS],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ADDHH_W, 4, 0xe0000e00, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_ADDHH_W],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_AND1, 2, 0x00600000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_AND1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_AND2, 4, 0xe1e00000, 0xe1f0fe00,
++      &avr32_syntax_table[AVR32_SYNTAX_AND2],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E2],
++      },
++    },
++    {
++      AVR32_OPC_AND3, 4, 0xe1e00200, 0xe1f0fe00,
++      &avr32_syntax_table[AVR32_SYNTAX_AND3],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E2],
++      },
++    },
++    {
++      AVR32_OPC_ANDH, 4, 0xe4100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ANDH],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_ANDH_COH, 4, 0xe6100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ANDH_COH],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_ANDL, 4, 0xe0100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ANDL],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_ANDL_COH, 4, 0xe2100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ANDL_COH],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_ANDN, 2, 0x00800000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ANDN],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_ASR1, 4, 0xe0000840, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_ASR1],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ASR3, 4, 0xe0001400, 0xe1f0ffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_ASR3],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++    {
++      AVR32_OPC_ASR2, 2, 0xa1400000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ASR2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
++      },
++    },
++    {
++      AVR32_OPC_BLD, 4, 0xedb00000, 0xfff0ffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_BLD],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++    {
++      AVR32_OPC_BREQ1, 2, 0xc0000000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BREQ1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BRNE1, 2, 0xc0010000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRNE1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BRCC1, 2, 0xc0020000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRCC1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BRCS1, 2, 0xc0030000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRCS1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BRGE1, 2, 0xc0040000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRGE1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BRLT1, 2, 0xc0050000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRLT1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BRMI1, 2, 0xc0060000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRMI1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BRPL1, 2, 0xc0070000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRPL1],
++      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_BREQ2, 4, 0xe0800000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BREQ2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRNE2, 4, 0xe0810000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRNE2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRCC2, 4, 0xe0820000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRHS2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRCS2, 4, 0xe0830000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRLO2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRGE2, 4, 0xe0840000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRGE2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRLT2, 4, 0xe0850000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRLT2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRMI2, 4, 0xe0860000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRMI2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRPL2, 4, 0xe0870000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRPL2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRLS, 4, 0xe0880000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRLS],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRGT, 4, 0xe0890000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRGT],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRLE, 4, 0xe08a0000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRLE],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRHI, 4, 0xe08b0000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRHI],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRVS, 4, 0xe08c0000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRVS],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRVC, 4, 0xe08d0000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRVC],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRQS, 4, 0xe08e0000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRQS],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BRAL, 4, 0xe08f0000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BRAL],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_BREAKPOINT, 2, 0xd6730000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_BREAKPOINT],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_BREV, 2, 0x5c900000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_BREV],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_BST, 4, 0xefb00000, 0xfff0ffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_BST],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++    {
++      AVR32_OPC_CACHE, 4, 0xf4100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CACHE],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K11],
++	&avr32_ifield_table[AVR32_IFIELD_CACHEOP],
++      },
++    },
++    {
++      AVR32_OPC_CASTS_B, 2, 0x5c600000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CASTS_B],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_CASTS_H, 2, 0x5c800000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CASTS_H],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_CASTU_B, 2, 0x5c500000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CASTU_B],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_CASTU_H, 2, 0x5c700000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CASTU_H],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_CBR, 2, 0xa1c00000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CBR],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
++      },
++    },
++    {
++      AVR32_OPC_CLZ, 4, 0xe0001200, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_CLZ],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_COM, 2, 0x5cd00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_COM],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_COP, 4, 0xe1a00000, 0xf9f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_COP],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++	&avr32_ifield_table[AVR32_IFIELD_CRX],
++	&avr32_ifield_table[AVR32_IFIELD_CRY],
++	&avr32_ifield_table[AVR32_IFIELD_CPOP],
++      },
++    },
++    {
++      AVR32_OPC_CP_B, 4, 0xe0001800, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_CP_B],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_CP_H, 4, 0xe0001900, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_CP_H],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_CP_W1, 2, 0x00300000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CP_W1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_CP_W2, 2, 0x58000000, 0xfc000000,
++      &avr32_syntax_table[AVR32_SYNTAX_CP_W2],
++      BFD_RELOC_AVR32_6S, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K6],
++      },
++    },
++    {
++      AVR32_OPC_CP_W3, 4, 0xe0400000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CP_W3],
++      BFD_RELOC_AVR32_21S, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_CPC1, 4, 0xe0001300, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_CPC1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_CPC2, 2, 0x5c200000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_CPC2],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_CSRF, 2, 0xd4030000, 0xfe0f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_CSRF],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K5C],
++      },
++    },
++    {
++      AVR32_OPC_CSRFCZ, 2, 0xd0030000, 0xfe0f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_CSRFCZ],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K5C],
++      },
++    },
++    {
++      AVR32_OPC_DIVS, 4, 0xe0000c00, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_DIVS],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_DIVU, 4, 0xe0000d00, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_DIVU],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_EOR1, 2, 0x00500000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_EOR1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_EOR2, 4, 0xe1e02000, 0xe1f0fe00,
++      &avr32_syntax_table[AVR32_SYNTAX_EOR2],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E2],
++      }
++    },
++    {
++      AVR32_OPC_EOR3, 4, 0xe1e02200, 0xe1f0fe00,
++      &avr32_syntax_table[AVR32_SYNTAX_EOR3],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E2],
++      }
++    },
++    {
++      AVR32_OPC_EORL, 4, 0xec100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_EORL],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_EORH, 4, 0xee100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_EORH],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_FRS, 2, 0xd7430000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_FRS],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_ICALL, 2, 0x5d100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ICALL],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_INCJOSP, 2, 0xd6830000, 0xff8f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_INCJOSP],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K3],
++      },
++    },
++    {
++      AVR32_OPC_LD_D1, 2, 0xa1010000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_D1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_D2, 2, 0xa1100000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_D2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_D3, 2, 0xa1000000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_D3],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_D5, 4, 0xe0000200, 0xe1f0ffc1,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_D5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LD_D4, 4, 0xe0e00000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_D4],
++      BFD_RELOC_AVR32_16S, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LD_SB2, 4, 0xe0000600, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_SB2],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LD_SB1, 4, 0xe1200000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_SB1],
++      BFD_RELOC_AVR32_16S, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LD_UB1, 2, 0x01300000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UB1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_UB2, 2, 0x01700000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UB2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_UB5, 4, 0xe0000700, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UB5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LD_UB3, 2, 0x01800000, 0xe1800000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UB3],
++      BFD_RELOC_AVR32_3U, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K3],
++      },
++    },
++    {
++      AVR32_OPC_LD_UB4, 4, 0xe1300000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UB4],
++      BFD_RELOC_AVR32_16S, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LD_SH1, 2, 0x01100000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_SH1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_SH2, 2, 0x01500000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_SH2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_SH5, 4, 0xe0000400, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_SH5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LD_SH3, 2, 0x80000000, 0xe1800000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_SH3],
++      BFD_RELOC_AVR32_4UH, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K3],
++      },
++    },
++    {
++      AVR32_OPC_LD_SH4, 4, 0xe1000000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_SH4],
++      BFD_RELOC_AVR32_16S, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LD_UH1, 2, 0x01200000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UH1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_UH2, 2, 0x01600000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UH2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_UH5, 4, 0xe0000500, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UH5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LD_UH3, 2, 0x80800000, 0xe1800000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UH3],
++      BFD_RELOC_AVR32_4UH, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K3],
++      },
++    },
++    {
++      AVR32_OPC_LD_UH4, 4, 0xe1100000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_UH4],
++      BFD_RELOC_AVR32_16S, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LD_W1, 2, 0x01000000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_W1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_W2, 2, 0x01400000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_W2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_LD_W5, 4, 0xe0000300, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_W5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LD_W6, 4, 0xe0000f80, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_W6],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LD_W3, 2, 0x60000000, 0xe0000000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_W3],
++      BFD_RELOC_AVR32_7UW, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K5C],
++      },
++    },
++    {
++      AVR32_OPC_LD_W4, 4, 0xe0f00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LD_W4],
++      BFD_RELOC_AVR32_16S, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LDC_D1, 4, 0xe9a01000, 0xfff01100,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC_D1],
++      BFD_RELOC_AVR32_10UW, 4, 3,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_LDC_D2, 4, 0xefa00050, 0xfff011ff,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC_D2],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_LDC_D3, 4, 0xefa01040, 0xfff011c0,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC_D3],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LDC_W1, 4, 0xe9a00000, 0xfff01000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC_W1],
++      BFD_RELOC_AVR32_10UW, 4, 3,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_LDC_W2, 4, 0xefa00040, 0xfff010ff,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC_W2],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_LDC_W3, 4, 0xefa01000, 0xfff010c0,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC_W3],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_LDC0_D, 4, 0xf3a00000, 0xfff00100,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC0_D],
++      BFD_RELOC_AVR32_14UW, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K12CP],
++      },
++    },
++    {
++      AVR32_OPC_LDC0_W, 4, 0xf1a00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDC0_W],
++      BFD_RELOC_AVR32_14UW, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K12CP],
++      },
++    },
++    {
++      AVR32_OPC_LDCM_D, 4, 0xeda00400, 0xfff01f00,
++      &avr32_syntax_table[AVR32_SYNTAX_LDCM_D],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_LDCM_D_PU, 4, 0xeda01400, 0xfff01f00,
++      &avr32_syntax_table[AVR32_SYNTAX_LDCM_D_PU],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_LDCM_W, 4, 0xeda00000, 0xfff01e00,
++      &avr32_syntax_table[AVR32_SYNTAX_LDCM_W],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
++      },
++    },
++    {
++      AVR32_OPC_LDCM_W_PU, 4, 0xeda01000, 0xfff01e00,
++      &avr32_syntax_table[AVR32_SYNTAX_LDCM_W_PU],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
++      },
++    },
++    {
++      AVR32_OPC_LDDPC, 2, 0x48000000, 0xf8000000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDDPC],
++      BFD_RELOC_AVR32_9UW_PCREL, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K7C],
++      },
++    },
++    {
++      AVR32_OPC_LDDPC_EXT, 4, 0xfef00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDDPC_EXT],
++      BFD_RELOC_AVR32_16B_PCREL, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LDDSP, 2, 0x40000000, 0xf8000000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDDSP],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K7C],
++      },
++    },
++    {
++      AVR32_OPC_LDINS_B, 4, 0xe1d04000, 0xe1f0c000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDINS_B],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_PART2_K12],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K12],
++      },
++    },
++    {
++      AVR32_OPC_LDINS_H, 4, 0xe1d00000, 0xe1f0e000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDINS_H],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_PART1_K12],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K12],
++      },
++    },
++    {
++      AVR32_OPC_LDM, 4, 0xe1c00000, 0xfdf00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDM],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_W],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LDMTS, 4, 0xe5c00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDMTS],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LDMTS_PU, 4, 0xe7c00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDMTS_PU],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_LDSWP_SH, 4, 0xe1d02000, 0xe1f0f000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDSWP_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K12],
++      },
++    },
++    {
++      AVR32_OPC_LDSWP_UH, 4, 0xe1d03000, 0xe1f0f000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDSWP_UH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K12],
++      },
++    },
++    {
++      AVR32_OPC_LDSWP_W, 4, 0xe1d08000, 0xe1f0f000,
++      &avr32_syntax_table[AVR32_SYNTAX_LDSWP_W],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K12],
++      },
++    },
++    {
++      AVR32_OPC_LSL1, 4, 0xe0000940, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_LSL1],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_LSL3, 4, 0xe0001500, 0xe1f0ffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_LSL3],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++    {
++      AVR32_OPC_LSL2, 2, 0xa1600000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LSL2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
++      },
++    },
++    {
++      AVR32_OPC_LSR1, 4, 0xe0000a40, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_LSR1],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_LSR3, 4, 0xe0001600, 0xe1f0ffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_LSR3],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++    {
++      AVR32_OPC_LSR2, 2, 0xa1800000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_LSR2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
++      },
++    },
++    {
++      AVR32_OPC_MAC, 4, 0xe0000340, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_MAC],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MACHH_D, 4, 0xe0000580, 0xe1f0ffc1,
++      &avr32_syntax_table[AVR32_SYNTAX_MACHH_D],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MACHH_W, 4, 0xe0000480, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_MACHH_W],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MACS_D, 4, 0xe0000540, 0xe1f0fff1,
++      &avr32_syntax_table[AVR32_SYNTAX_MACS_D],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MACSATHH_W, 4, 0xe0000680, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_MACSATHH_W],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MACUD, 4, 0xe0000740, 0xe1f0fff1,
++      &avr32_syntax_table[AVR32_SYNTAX_MACUD],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MACWH_D, 4, 0xe0000c80, 0xe1f0ffe1,
++      &avr32_syntax_table[AVR32_SYNTAX_MACWH_D],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MAX, 4, 0xe0000c40, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_MAX],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MCALL, 4, 0xf0100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MCALL],
++      BFD_RELOC_AVR32_18W_PCREL, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_MFDR, 4, 0xe5b00000, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MFDR],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MFSR, 4, 0xe1b00000, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MFSR],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MIN, 4, 0xe0000d40, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_MIN],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MOV3, 2, 0x00900000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MOV3],
++      BFD_RELOC_NONE, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOV1, 2, 0x30000000, 0xf0000000,
++      &avr32_syntax_table[AVR32_SYNTAX_MOV1],
++      BFD_RELOC_AVR32_8S, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_MOV2, 4, 0xe0600000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MOV2],
++      BFD_RELOC_AVR32_21S, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_MOVEQ1, 4, 0xe0001700, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVEQ1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVNE1, 4, 0xe0001710, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVNE1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVCC1, 4, 0xe0001720, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVHS1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVCS1, 4, 0xe0001730, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLO1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVGE1, 4, 0xe0001740, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVGE1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVLT1, 4, 0xe0001750, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLT1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVMI1, 4, 0xe0001760, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVMI1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVPL1, 4, 0xe0001770, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVPL1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVLS1, 4, 0xe0001780, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLS1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVGT1, 4, 0xe0001790, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVGT1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVLE1, 4, 0xe00017a0, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLE1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVHI1, 4, 0xe00017b0, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVHI1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVVS1, 4, 0xe00017c0, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVVS1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVVC1, 4, 0xe00017d0, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVVC1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVQS1, 4, 0xe00017e0, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVQS1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVAL1, 4, 0xe00017f0, 0xe1f0ffff,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVAL1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MOVEQ2, 4, 0xf9b00000, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVEQ2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVNE2, 4, 0xf9b00100, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVNE2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVCC2, 4, 0xf9b00200, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVHS2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVCS2, 4, 0xf9b00300, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLO2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVGE2, 4, 0xf9b00400, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVGE2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVLT2, 4, 0xf9b00500, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLT2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVMI2, 4, 0xf9b00600, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVMI2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVPL2, 4, 0xf9b00700, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVPL2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVLS2, 4, 0xf9b00800, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLS2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVGT2, 4, 0xf9b00900, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVGT2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVLE2, 4, 0xf9b00a00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVLE2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVHI2, 4, 0xf9b00b00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVHI2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVVS2, 4, 0xf9b00c00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVVS2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVVC2, 4, 0xf9b00d00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVVC2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVQS2, 4, 0xf9b00e00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVQS2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MOVAL2, 4, 0xf9b00f00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVAL2],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MTDR, 4, 0xe7b00000, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MTDR],
++      BFD_RELOC_AVR32_8S_EXT, 2, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MTSR, 4, 0xe3b00000, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MTSR],
++      BFD_RELOC_AVR32_8S_EXT, 2, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MUL1, 2, 0xa1300000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MUL1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_MUL2, 4, 0xe0000240, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_MUL2],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MUL3, 4, 0xe0001000, 0xe1f0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_MUL3],
++      BFD_RELOC_AVR32_8S_EXT, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_MULHH_W, 4, 0xe0000780, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULHH_W],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULNHH_W, 4, 0xe0000180, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULNHH_W],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULNWH_D, 4, 0xe0000280, 0xe1f0ffe1,
++      &avr32_syntax_table[AVR32_SYNTAX_MULNWH_D],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULSD, 4, 0xe0000440, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULSD],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MULSATHH_H, 4, 0xe0000880, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULSATHH_H],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULSATHH_W, 4, 0xe0000980, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULSATHH_W],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULSATRNDHH_H, 4, 0xe0000a80, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULSATRNDHH_H],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULSATRNDWH_W, 4, 0xe0000b80, 0xe1f0ffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULSATRNDWH_W],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULSATWH_W, 4, 0xe0000e80, 0xe1f0ffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_MULSATWH_W],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MULU_D, 4, 0xe0000640, 0xe1f0fff1,
++      &avr32_syntax_table[AVR32_SYNTAX_MULU_D],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MULWH_D, 4, 0xe0000d80, 0xe1f0ffe1,
++      &avr32_syntax_table[AVR32_SYNTAX_MULWH_D],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_MUSFR, 2, 0x5d300000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MUSFR],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_MUSTR, 2, 0x5d200000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MUSTR],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_MVCR_D, 4, 0xefa00010, 0xfff111ff,
++      &avr32_syntax_table[AVR32_SYNTAX_MVCR_D],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++      },
++    },
++    {
++      AVR32_OPC_MVCR_W, 4, 0xefa00000, 0xfff010ff,
++      &avr32_syntax_table[AVR32_SYNTAX_MVCR_W],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++      },
++    },
++    {
++      AVR32_OPC_MVRC_D, 4, 0xefa00030, 0xfff111ff,
++      &avr32_syntax_table[AVR32_SYNTAX_MVRC_D],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++      },
++    },
++    {
++      AVR32_OPC_MVRC_W, 4, 0xefa00020, 0xfff010ff,
++      &avr32_syntax_table[AVR32_SYNTAX_MVRC_W],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_NEG, 2, 0x5c300000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_NEG],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_NOP, 2, 0xd7030000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_NOP],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_OR1, 2, 0x00400000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_OR1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_OR2, 4, 0xe1e01000, 0xe1f0fe00,
++      &avr32_syntax_table[AVR32_SYNTAX_OR2],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E2],
++      },
++    },
++    {
++      AVR32_OPC_OR3, 4, 0xe1e01200, 0xe1f0fe00,
++      &avr32_syntax_table[AVR32_SYNTAX_OR3],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E2],
++      },
++    },
++    {
++      AVR32_OPC_ORH, 4, 0xea100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ORH],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_ORL, 4, 0xe8100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ORL],
++      BFD_RELOC_AVR32_16U, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_PABS_SB, 4, 0xe00023e0, 0xfff0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PABS_SB],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PABS_SH, 4, 0xe00023f0, 0xfff0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PABS_SH],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PACKSH_SB, 4, 0xe00024d0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PACKSH_SB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PACKSH_UB, 4, 0xe00024c0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PACKSH_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PACKW_SH, 4, 0xe0002470, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PACKW_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADD_B, 4, 0xe0002300, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADD_B],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADD_H, 4, 0xe0002000, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADD_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDH_SH, 4, 0xe00020c0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDH_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDH_UB, 4, 0xe0002360, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDH_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDS_SB, 4, 0xe0002320, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDS_SB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDS_SH, 4, 0xe0002040, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDS_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDS_UB, 4, 0xe0002340, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDS_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDS_UH, 4, 0xe0002080, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDS_UH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDSUB_H, 4, 0xe0002100, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDSUB_H],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PADDSUBH_SH, 4, 0xe0002280, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDSUBH_SH],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PADDSUBS_SH, 4, 0xe0002180, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDSUBS_SH],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PADDSUBS_UH, 4, 0xe0002200, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDSUBS_UH],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PADDX_H, 4, 0xe0002020, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDX_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDXH_SH, 4, 0xe00020e0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDXH_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDXS_SH, 4, 0xe0002060, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDXS_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PADDXS_UH, 4, 0xe00020a0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PADDXS_UH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PASR_B, 4, 0xe0002410, 0xe1f8fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PASR_B],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_COND3],
++      },
++    },
++    {
++      AVR32_OPC_PASR_H, 4, 0xe0002440, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PASR_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PAVG_SH, 4, 0xe00023d0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PAVG_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PAVG_UB, 4, 0xe00023c0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PAVG_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PLSL_B, 4, 0xe0002420, 0xe1f8fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PLSL_B],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_COND3],
++      },
++    },
++    {
++      AVR32_OPC_PLSL_H, 4, 0xe0002450, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PLSL_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PLSR_B, 4, 0xe0002430, 0xe1f8fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PLSR_B],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_COND3],
++      },
++    },
++    {
++      AVR32_OPC_PLSR_H, 4, 0xe0002460, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PLSR_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PMAX_SH, 4, 0xe0002390, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PMAX_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PMAX_UB, 4, 0xe0002380, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PMAX_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PMIN_SH, 4, 0xe00023b0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PMIN_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PMIN_UB, 4, 0xe00023a0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PMIN_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_POPJC, 2, 0xd7130000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_POPJC],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_POPM, 2, 0xd0020000, 0xf0070000,
++      &avr32_syntax_table[AVR32_SYNTAX_POPM],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_POPM],
++      },
++    },
++    {
++      AVR32_OPC_POPM_E, 4, 0xe3cd0000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_POPM_E],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_PREF, 4, 0xf2100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_PREF],
++      BFD_RELOC_AVR32_16S, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_PSAD, 4, 0xe0002400, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSAD],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUB_B, 4, 0xe0002310, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUB_B],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUB_H, 4, 0xe0002010, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUB_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBADD_H, 4, 0xe0002140, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBADD_H],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PSUBADDH_SH, 4, 0xe00022c0, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBADDH_SH],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PSUBADDS_SH, 4, 0xe00021c0, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBADDS_SH],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PSUBADDS_UH, 4, 0xe0002240, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBADDS_UH],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PSUBH_SH, 4, 0xe00020d0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBH_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBH_UB, 4, 0xe0002370, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBH_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBS_SB, 4, 0xe0002330, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_SB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBS_SH, 4, 0xe0002050, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBS_UB, 4, 0xe0002350, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_UB],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBS_UH, 4, 0xe0002090, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_UH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBX_H, 4, 0xe0002030, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBX_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBXH_SH, 4, 0xe00020f0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBXH_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBXS_SH, 4, 0xe0002070, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBXS_SH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PSUBXS_UH, 4, 0xe00020b0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_PSUBXS_UH],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_PUNPCKSB_H, 4, 0xe00024a0, 0xe1ffffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_PUNPCKSB_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PUNPCKUB_H, 4, 0xe0002480, 0xe1ffffe0,
++      &avr32_syntax_table[AVR32_SYNTAX_PUNPCKUB_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_PUSHJC, 2, 0xd7230000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_PUSHJC],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_PUSHM, 2, 0xd0010000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_PUSHM],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_PUSHM_E, 4, 0xebcd0000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_PUSHM_E],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_RCALL1, 2, 0xc00c0000, 0xf00c0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RCALL1],
++      BFD_RELOC_AVR32_11H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K10],
++      },
++    },
++    {
++      AVR32_OPC_RCALL2, 4, 0xe0a00000, 0xe1ef0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RCALL2],
++      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_RETEQ, 2, 0x5e000000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETEQ],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETNE, 2, 0x5e100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETNE],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETCC, 2, 0x5e200000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETHS],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETCS, 2, 0x5e300000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETLO],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETGE, 2, 0x5e400000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETGE],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETLT, 2, 0x5e500000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETLT],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETMI, 2, 0x5e600000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETMI],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETPL, 2, 0x5e700000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETPL],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETLS, 2, 0x5e800000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETLS],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETGT, 2, 0x5e900000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETGT],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETLE, 2, 0x5ea00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETLE],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETHI, 2, 0x5eb00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETHI],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETVS, 2, 0x5ec00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETVS],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETVC, 2, 0x5ed00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETVC],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETQS, 2, 0x5ee00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETQS],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETAL, 2, 0x5ef00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETAL],
++      BFD_RELOC_NONE, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_RETD, 2, 0xd6230000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETD],
++      BFD_RELOC_NONE, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_RETE, 2, 0xd6030000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETE],
++      BFD_RELOC_NONE, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_RETJ, 2, 0xd6330000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETJ],
++      BFD_RELOC_NONE, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_RETS, 2, 0xd6130000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETS],
++      BFD_RELOC_NONE, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_RJMP, 2, 0xc0080000, 0xf00c0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RJMP],
++      BFD_RELOC_AVR32_11H_PCREL, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K10],
++      },
++    },
++    {
++      AVR32_OPC_ROL, 2, 0x5cf00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ROL],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_ROR, 2, 0x5d000000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ROR],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_RSUB1, 2, 0x00200000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_RSUB1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_RSUB2, 4, 0xe0001100, 0xe1f0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_RSUB2],
++      BFD_RELOC_AVR32_8S_EXT, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SATADD_H, 4, 0xe00002c0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_SATADD_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SATADD_W, 4, 0xe00000c0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_SATADD_W],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SATRNDS, 4, 0xf3b00000, 0xfff0fc00,
++      &avr32_syntax_table[AVR32_SYNTAX_SATRNDS],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++	&avr32_ifield_table[AVR32_IFIELD_S5],
++      },
++    },
++    {
++      AVR32_OPC_SATRNDU, 4, 0xf3b00400, 0xfff0fc00,
++      &avr32_syntax_table[AVR32_SYNTAX_SATRNDU],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++	&avr32_ifield_table[AVR32_IFIELD_S5],
++      },
++    },
++    {
++      AVR32_OPC_SATS, 4, 0xf1b00000, 0xfff0fc00,
++      &avr32_syntax_table[AVR32_SYNTAX_SATS],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++	&avr32_ifield_table[AVR32_IFIELD_S5],
++      },
++    },
++    {
++      AVR32_OPC_SATSUB_H, 4, 0xe00003c0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_SATSUB_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SATSUB_W1, 4, 0xe00001c0, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_SATSUB_W1],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SATSUB_W2, 4, 0xe0d00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SATSUB_W2],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_SATU, 4, 0xf1b00400, 0xfff0fc00,
++      &avr32_syntax_table[AVR32_SYNTAX_SATU],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++	&avr32_ifield_table[AVR32_IFIELD_S5],
++      },
++    },
++    {
++      AVR32_OPC_SBC, 4, 0xe0000140, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_SBC],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SBR, 2, 0xa1a00000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SBR],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
++      },
++    },
++    {
++      AVR32_OPC_SCALL, 2, 0xd7330000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_SCALL],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_SCR, 2, 0x5c100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SCR],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SLEEP, 4, 0xe9b00000, 0xffffff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SLEEP],
++      BFD_RELOC_AVR32_8S_EXT, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SREQ, 2, 0x5f000000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SREQ],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRNE, 2, 0x5f100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRNE],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRCC, 2, 0x5f200000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRHS],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRCS, 2, 0x5f300000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRLO],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRGE, 2, 0x5f400000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRGE],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRLT, 2, 0x5f500000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRLT],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRMI, 2, 0x5f600000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRMI],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRPL, 2, 0x5f700000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRPL],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRLS, 2, 0x5f800000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRLS],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRGT, 2, 0x5f900000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRGT],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRLE, 2, 0x5fa00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRLE],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRHI, 2, 0x5fb00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRHI],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRVS, 2, 0x5fc00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRVS],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRVC, 2, 0x5fd00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRVC],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRQS, 2, 0x5fe00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRQS],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SRAL, 2, 0x5ff00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SRAL],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SSRF, 2, 0xd2030000, 0xfe0f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_SSRF],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K5C],
++      },
++    },
++    {
++      AVR32_OPC_ST_B1, 2, 0x00c00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_B1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_B2, 2, 0x00f00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_B2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_B5, 4, 0xe0000b00, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_B5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++      },
++    },
++    {
++      AVR32_OPC_ST_B3, 2, 0xa0800000, 0xe1800000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_B3],
++      BFD_RELOC_AVR32_3U, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K3],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_B4, 4, 0xe1600000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_B4],
++      BFD_RELOC_AVR32_16S, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_D1, 2, 0xa1200000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_D1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++      },
++    },
++    {
++      AVR32_OPC_ST_D2, 2, 0xa1210000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_D2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++      },
++    },
++    {
++      AVR32_OPC_ST_D3, 2, 0xa1110000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_D3],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++      },
++    },
++    {
++      AVR32_OPC_ST_D5, 4, 0xe0000800, 0xe1f0ffc1,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_D5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++	&avr32_ifield_table[AVR32_IFIELD_RD_DW],
++      },
++    },
++    {
++      AVR32_OPC_ST_D4, 4, 0xe0e10000, 0xe1f10000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_D4],
++      BFD_RELOC_AVR32_16S, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
++      },
++    },
++    {
++      AVR32_OPC_ST_H1, 2, 0x00b00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_H1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_H2, 2, 0x00e00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_H2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_H5, 4, 0xe0000a00, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_H5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++      },
++    },
++    {
++      AVR32_OPC_ST_H3, 2, 0xa0000000, 0xe1800000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_H3],
++      BFD_RELOC_AVR32_4UH, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K3],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_H4, 4, 0xe1500000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_H4],
++      BFD_RELOC_AVR32_16S, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_W1, 2, 0x00a00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_W1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_W2, 2, 0x00d00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_W2],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_W5, 4, 0xe0000900, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_W5],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++      },
++    },
++    {
++      AVR32_OPC_ST_W3, 2, 0x81000000, 0xe1000000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_W3],
++      BFD_RELOC_AVR32_6UW, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K4],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_ST_W4, 4, 0xe1400000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_ST_W4],
++      BFD_RELOC_AVR32_16S, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_STC_D1, 4, 0xeba01000, 0xfff01100,
++      &avr32_syntax_table[AVR32_SYNTAX_STC_D1],
++      BFD_RELOC_AVR32_10UW, 4, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++      },
++    },
++    {
++      AVR32_OPC_STC_D2, 4, 0xefa00070, 0xfff011f0,
++      &avr32_syntax_table[AVR32_SYNTAX_STC_D2],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++      },
++    },
++    {
++      AVR32_OPC_STC_D3, 4, 0xefa010c0, 0xfff011c0,
++      &avr32_syntax_table[AVR32_SYNTAX_STC_D3],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++      },
++    },
++    {
++      AVR32_OPC_STC_W1, 4, 0xeba00000, 0xfff01000,
++      &avr32_syntax_table[AVR32_SYNTAX_STC_W1],
++      BFD_RELOC_AVR32_10UW, 4, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++      },
++    },
++    {
++      AVR32_OPC_STC_W2, 4, 0xefa00060, 0xfff010ff,
++      &avr32_syntax_table[AVR32_SYNTAX_STC_W2],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++      },
++    },
++    {
++      AVR32_OPC_STC_W3, 4, 0xefa01080, 0xfff010c0,
++      &avr32_syntax_table[AVR32_SYNTAX_STC_W3],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++      },
++    },
++    {
++      AVR32_OPC_STC0_D, 4, 0xf7a00000, 0xfff00100,
++      &avr32_syntax_table[AVR32_SYNTAX_STC0_D],
++      BFD_RELOC_AVR32_14UW, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K12CP],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
++      },
++    },
++    {
++      AVR32_OPC_STC0_W, 4, 0xf5a00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_STC0_W],
++      BFD_RELOC_AVR32_14UW, 3, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K12CP],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++      },
++    },
++    {
++      AVR32_OPC_STCM_D, 4, 0xeda00500, 0xfff01f00,
++      &avr32_syntax_table[AVR32_SYNTAX_STCM_D],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_STCM_D_PU, 4, 0xeda01500, 0xfff01f00,
++      &avr32_syntax_table[AVR32_SYNTAX_STCM_D_PU],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_STCM_W, 4, 0xeda00200, 0xfff01e00,
++      &avr32_syntax_table[AVR32_SYNTAX_STCM_W],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
++      },
++    },
++    {
++      AVR32_OPC_STCM_W_PU, 4, 0xeda01200, 0xfff01e00,
++      &avr32_syntax_table[AVR32_SYNTAX_STCM_W_PU],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_CPNO],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
++      },
++    },
++    {
++      AVR32_OPC_STCOND, 4, 0xe1700000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_STCOND],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_STDSP, 2, 0x50000000, 0xf8000000,
++      &avr32_syntax_table[AVR32_SYNTAX_STDSP],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K7C],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_STHH_W2, 4, 0xe1e08000, 0xe1f0c0c0,
++      &avr32_syntax_table[AVR32_SYNTAX_STHH_W2],
++      BFD_RELOC_UNUSED, 7, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X2],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y2],
++      },
++    },
++    {
++      AVR32_OPC_STHH_W1, 4, 0xe1e0c000, 0xe1f0c000,
++      &avr32_syntax_table[AVR32_SYNTAX_STHH_W1],
++      BFD_RELOC_AVR32_STHH_W, 6, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_K8E2],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X2],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y2],
++      },
++    },
++    {
++      AVR32_OPC_STM, 4, 0xe9c00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_STM],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_STM_PU, 4, 0xebc00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_STM_PU],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_STMTS, 4, 0xedc00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_STMTS],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_STMTS_PU, 4, 0xefc00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_STMTS_PU],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_STSWP_H, 4, 0xe1d09000, 0xe1f0f000,
++      &avr32_syntax_table[AVR32_SYNTAX_STSWP_H],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K12],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_STSWP_W, 4, 0xe1d0a000, 0xe1f0f000,
++      &avr32_syntax_table[AVR32_SYNTAX_STSWP_W],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K12],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_SUB1, 2, 0x00100000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SUB1],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_SUB2, 4, 0xe0000100, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_SUB2],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K2],
++      },
++    },
++    {
++      AVR32_OPC_SUB5, 4, 0xe0c00000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SUB5],
++      BFD_RELOC_AVR32_SUB5, 3, 2,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_SUB3_SP, 2, 0x200d0000, 0xf00f0000,
++      &avr32_syntax_table[AVR32_SYNTAX_SUB3_SP],
++      BFD_RELOC_AVR32_10SW, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_SUB3, 2, 0x20000000, 0xf0000000,
++      &avr32_syntax_table[AVR32_SYNTAX_SUB3],
++      BFD_RELOC_AVR32_8S, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8C],
++      },
++    },
++    {
++      AVR32_OPC_SUB4, 4, 0xe0200000, 0xe1e00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SUB4],
++      BFD_RELOC_AVR32_21S, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K21],
++      },
++    },
++    {
++      AVR32_OPC_SUBEQ, 4, 0xf7b00000, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBEQ],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBNE, 4, 0xf7b00100, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBNE],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBCC, 4, 0xf7b00200, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBHS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBCS, 4, 0xf7b00300, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBLO],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBGE, 4, 0xf7b00400, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBGE],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBLT, 4, 0xf7b00500, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBLT],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBMI, 4, 0xf7b00600, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBMI],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBPL, 4, 0xf7b00700, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBPL],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBLS, 4, 0xf7b00800, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBLS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBGT, 4, 0xf7b00900, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBGT],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBLE, 4, 0xf7b00a00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBLE],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBHI, 4, 0xf7b00b00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBHI],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBVS, 4, 0xf7b00c00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBVS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBVC, 4, 0xf7b00d00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBVC],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBQS, 4, 0xf7b00e00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBQS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBAL, 4, 0xf7b00f00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBAL],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFEQ, 4, 0xf5b00000, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFEQ],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFNE, 4, 0xf5b00100, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFNE],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFCC, 4, 0xf5b00200, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFHS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFCS, 4, 0xf5b00300, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFLO],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFGE, 4, 0xf5b00400, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFGE],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFLT, 4, 0xf5b00500, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFLT],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFMI, 4, 0xf5b00600, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFMI],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFPL, 4, 0xf5b00700, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFPL],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFLS, 4, 0xf5b00800, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFLS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFGT, 4, 0xf5b00900, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFGT],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFLE, 4, 0xf5b00a00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFLE],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFHI, 4, 0xf5b00b00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFHI],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFVS, 4, 0xf5b00c00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFVS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFVC, 4, 0xf5b00d00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFVC],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFQS, 4, 0xf5b00e00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFQS],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBFAL, 4, 0xf5b00f00, 0xfff0ff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBFAL],
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      },
++    },
++    {
++      AVR32_OPC_SUBHH_W, 4, 0xe0000f00, 0xe1f0ffc0,
++      &avr32_syntax_table[AVR32_SYNTAX_SUBHH_W],
++      BFD_RELOC_UNUSED, 5, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_X],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_Y],
++      },
++    },
++    {
++      AVR32_OPC_SWAP_B, 2, 0x5cb00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SWAP_B],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_SWAP_BH, 2, 0x5cc00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SWAP_BH],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_SWAP_H, 2, 0x5ca00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_SWAP_H],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_SYNC, 4, 0xebb00000, 0xffffff00,
++      &avr32_syntax_table[AVR32_SYNTAX_SYNC],
++      BFD_RELOC_AVR32_8S_EXT, 1, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_K8E],
++      }
++    },
++    {
++      AVR32_OPC_TLBR, 2, 0xd6430000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_TLBR],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_TLBS, 2, 0xd6530000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_TLBS],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_TLBW, 2, 0xd6630000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_TLBW],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_TNBZ, 2, 0x5ce00000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_TNBZ],
++      BFD_RELOC_UNUSED, 1, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      }
++    },
++    {
++      AVR32_OPC_TST, 2, 0x00700000, 0xe1f00000,
++      &avr32_syntax_table[AVR32_SYNTAX_TST],
++      BFD_RELOC_UNUSED, 2, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++      },
++    },
++    {
++      AVR32_OPC_XCHG, 4, 0xe0000b40, 0xe1f0fff0,
++      &avr32_syntax_table[AVR32_SYNTAX_XCHG],
++      BFD_RELOC_UNUSED, 3, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++      },
++    },
++    {
++      AVR32_OPC_MEMC, 4, 0xf6100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MEMC],
++      BFD_RELOC_AVR32_15S, 2, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_MEM15],
++	&avr32_ifield_table[AVR32_IFIELD_MEMB5],
++      },
++    },
++    {
++      AVR32_OPC_MEMS, 4, 0xf8100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MEMS],
++      BFD_RELOC_AVR32_15S, 2, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_MEM15],
++	&avr32_ifield_table[AVR32_IFIELD_MEMB5],
++      },
++    },
++    {
++      AVR32_OPC_MEMT, 4, 0xfa100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MEMT],
++      BFD_RELOC_AVR32_15S, 2, 0,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_MEM15],
++	&avr32_ifield_table[AVR32_IFIELD_MEMB5],
++      },
++    },
++    {
++      AVR32_OPC_BFEXTS, 4, 0xe1d0b000, 0xe1f0fc00,
++      &avr32_syntax_table[AVR32_SYNTAX_BFEXTS],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_S5],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++    {
++      AVR32_OPC_BFEXTU, 4, 0xe1d0c000, 0xe1f0fc00,
++      &avr32_syntax_table[AVR32_SYNTAX_BFEXTU],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_S5],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++    {
++      AVR32_OPC_BFINS, 4, 0xe1d0d000, 0xe1f0fc00,
++      &avr32_syntax_table[AVR32_SYNTAX_BFINS],
++      BFD_RELOC_UNUSED, 4, -1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RX],
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_S5],
++	&avr32_ifield_table[AVR32_IFIELD_K5E],
++      },
++    },
++#define AVR32_OPCODE_RSUBCOND(cond_name, cond_field)                    \
++    {                                                                   \
++      AVR32_OPC_RSUB ## cond_name , 4,                                  \
++      0xfbb00000 | (cond_field << 8), 0xfff0ff00,                       \
++      &avr32_syntax_table[AVR32_SYNTAX_RSUB ## cond_name ],             \
++      BFD_RELOC_AVR32_8S_EXT, 2, 1,                                     \
++      {                                                                 \
++	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
++	&avr32_ifield_table[AVR32_IFIELD_K8E],                          \
++      },                                                                \
++    },
++
++    AVR32_OPCODE_RSUBCOND (EQ, 0) 
++    AVR32_OPCODE_RSUBCOND (NE, 1) 
++    AVR32_OPCODE_RSUBCOND (CC, 2) 
++    AVR32_OPCODE_RSUBCOND (CS, 3) 
++    AVR32_OPCODE_RSUBCOND (GE, 4) 
++    AVR32_OPCODE_RSUBCOND (LT, 5) 
++    AVR32_OPCODE_RSUBCOND (MI, 6) 
++    AVR32_OPCODE_RSUBCOND (PL, 7) 
++    AVR32_OPCODE_RSUBCOND (LS, 8) 
++    AVR32_OPCODE_RSUBCOND (GT, 9) 
++    AVR32_OPCODE_RSUBCOND (LE, 10) 
++    AVR32_OPCODE_RSUBCOND (HI, 11) 
++    AVR32_OPCODE_RSUBCOND (VS, 12) 
++    AVR32_OPCODE_RSUBCOND (VC, 13) 
++    AVR32_OPCODE_RSUBCOND (QS, 14) 
++    AVR32_OPCODE_RSUBCOND (AL, 15) 
++
++#define AVR32_OPCODE_OP3_COND(op_name, op_field, cond_name, cond_field) \
++    {                                                                   \
++      AVR32_OPC_ ## op_name ## cond_name , 4,                           \
++      0xe1d0e000 | (cond_field << 8) | (op_field << 4), 0xe1f0fff0,     \
++      &avr32_syntax_table[AVR32_SYNTAX_ ## op_name ## cond_name ],      \
++      BFD_RELOC_UNUSED, 3, -1,                                          \
++      {                                                                 \
++	&avr32_ifield_table[AVR32_IFIELD_RD_E],                         \
++	&avr32_ifield_table[AVR32_IFIELD_RX],                           \
++	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
++      },                                                                \
++    },
++
++    AVR32_OPCODE_OP3_COND (ADD, 0, EQ, 0)
++    AVR32_OPCODE_OP3_COND (ADD, 0, NE, 1)
++    AVR32_OPCODE_OP3_COND (ADD, 0, CC, 2)
++    AVR32_OPCODE_OP3_COND (ADD, 0, CS, 3)
++    AVR32_OPCODE_OP3_COND (ADD, 0, GE, 4)
++    AVR32_OPCODE_OP3_COND (ADD, 0, LT, 5)
++    AVR32_OPCODE_OP3_COND (ADD, 0, MI, 6)
++    AVR32_OPCODE_OP3_COND (ADD, 0, PL, 7)
++    AVR32_OPCODE_OP3_COND (ADD, 0, LS, 8)
++    AVR32_OPCODE_OP3_COND (ADD, 0, GT, 9)
++    AVR32_OPCODE_OP3_COND (ADD, 0, LE, 10)
++    AVR32_OPCODE_OP3_COND (ADD, 0, HI, 11)
++    AVR32_OPCODE_OP3_COND (ADD, 0, VS, 12)
++    AVR32_OPCODE_OP3_COND (ADD, 0, VC, 13)
++    AVR32_OPCODE_OP3_COND (ADD, 0, QS, 14)
++    AVR32_OPCODE_OP3_COND (ADD, 0, AL, 15)
++
++    AVR32_OPCODE_OP3_COND (SUB2, 1, EQ, 0)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, NE, 1)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, CC, 2)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, CS, 3)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, GE, 4)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, LT, 5)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, MI, 6)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, PL, 7)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, LS, 8)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, GT, 9)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, LE, 10)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, HI, 11)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, VS, 12)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, VC, 13)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, QS, 14)
++    AVR32_OPCODE_OP3_COND (SUB2, 1, AL, 15)
++
++    AVR32_OPCODE_OP3_COND (AND, 2, EQ, 0)
++    AVR32_OPCODE_OP3_COND (AND, 2, NE, 1)
++    AVR32_OPCODE_OP3_COND (AND, 2, CC, 2)
++    AVR32_OPCODE_OP3_COND (AND, 2, CS, 3)
++    AVR32_OPCODE_OP3_COND (AND, 2, GE, 4)
++    AVR32_OPCODE_OP3_COND (AND, 2, LT, 5)
++    AVR32_OPCODE_OP3_COND (AND, 2, MI, 6)
++    AVR32_OPCODE_OP3_COND (AND, 2, PL, 7)
++    AVR32_OPCODE_OP3_COND (AND, 2, LS, 8)
++    AVR32_OPCODE_OP3_COND (AND, 2, GT, 9)
++    AVR32_OPCODE_OP3_COND (AND, 2, LE, 10)
++    AVR32_OPCODE_OP3_COND (AND, 2, HI, 11)
++    AVR32_OPCODE_OP3_COND (AND, 2, VS, 12)
++    AVR32_OPCODE_OP3_COND (AND, 2, VC, 13)
++    AVR32_OPCODE_OP3_COND (AND, 2, QS, 14)
++    AVR32_OPCODE_OP3_COND (AND, 2, AL, 15)
++
++    AVR32_OPCODE_OP3_COND (OR, 3, EQ, 0)
++    AVR32_OPCODE_OP3_COND (OR, 3, NE, 1)
++    AVR32_OPCODE_OP3_COND (OR, 3, CC, 2)
++    AVR32_OPCODE_OP3_COND (OR, 3, CS, 3)
++    AVR32_OPCODE_OP3_COND (OR, 3, GE, 4)
++    AVR32_OPCODE_OP3_COND (OR, 3, LT, 5)
++    AVR32_OPCODE_OP3_COND (OR, 3, MI, 6)
++    AVR32_OPCODE_OP3_COND (OR, 3, PL, 7)
++    AVR32_OPCODE_OP3_COND (OR, 3, LS, 8)
++    AVR32_OPCODE_OP3_COND (OR, 3, GT, 9)
++    AVR32_OPCODE_OP3_COND (OR, 3, LE, 10)
++    AVR32_OPCODE_OP3_COND (OR, 3, HI, 11)
++    AVR32_OPCODE_OP3_COND (OR, 3, VS, 12)
++    AVR32_OPCODE_OP3_COND (OR, 3, VC, 13)
++    AVR32_OPCODE_OP3_COND (OR, 3, QS, 14)
++    AVR32_OPCODE_OP3_COND (OR, 3, AL, 15)
++
++    AVR32_OPCODE_OP3_COND (EOR, 4, EQ, 0)
++    AVR32_OPCODE_OP3_COND (EOR, 4, NE, 1)
++    AVR32_OPCODE_OP3_COND (EOR, 4, CC, 2)
++    AVR32_OPCODE_OP3_COND (EOR, 4, CS, 3)
++    AVR32_OPCODE_OP3_COND (EOR, 4, GE, 4)
++    AVR32_OPCODE_OP3_COND (EOR, 4, LT, 5)
++    AVR32_OPCODE_OP3_COND (EOR, 4, MI, 6)
++    AVR32_OPCODE_OP3_COND (EOR, 4, PL, 7)
++    AVR32_OPCODE_OP3_COND (EOR, 4, LS, 8)
++    AVR32_OPCODE_OP3_COND (EOR, 4, GT, 9)
++    AVR32_OPCODE_OP3_COND (EOR, 4, LE, 10)
++    AVR32_OPCODE_OP3_COND (EOR, 4, HI, 11)
++    AVR32_OPCODE_OP3_COND (EOR, 4, VS, 12)
++    AVR32_OPCODE_OP3_COND (EOR, 4, VC, 13)
++    AVR32_OPCODE_OP3_COND (EOR, 4, QS, 14)
++    AVR32_OPCODE_OP3_COND (EOR, 4, AL, 15) 
++
++#define AVR32_OPCODE_LD_COND(op_name, op_field, cond_name, cond_field)  \
++    {                                                                   \
++      AVR32_OPC_ ## op_name ## cond_name , 4,                           \
++      0xe1f00000 | (cond_field << 12) | (op_field  << 9), 0xe1f0fe00,   \
++      &avr32_syntax_table[AVR32_SYNTAX_ ## op_name ## cond_name ],      \
++      BFD_RELOC_UNUSED, 3, -1,                                          \
++      {                                                                 \
++	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
++	&avr32_ifield_table[AVR32_IFIELD_RX],                           \
++	&avr32_ifield_table[AVR32_IFIELD_K9E],                          \
++      },                                                                \
++    },
++    
++#define AVR32_OPCODE_ST_COND(op_name, op_field, cond_name, cond_field)  \
++    {                                                                   \
++      AVR32_OPC_ ## op_name ## cond_name , 4,                           \
++      0xe1f00000 | (cond_field << 12) | (op_field  << 9), 0xe1f0fe00,   \
++      &avr32_syntax_table[AVR32_SYNTAX_ ## op_name ## cond_name ],      \
++      BFD_RELOC_UNUSED, 3, -1,                                          \
++      {                                                                 \
++	&avr32_ifield_table[AVR32_IFIELD_RX],                           \
++	&avr32_ifield_table[AVR32_IFIELD_K9E],                          \
++	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
++      },                                                                \
++    },
++
++    AVR32_OPCODE_LD_COND (LD_W, 0, EQ, 0) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, NE, 1) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, CC, 2) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, CS, 3) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, GE, 4) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, LT, 5) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, MI, 6) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, PL, 7) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, LS, 8) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, GT, 9) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, LE, 10) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, HI, 11) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, VS, 12) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, VC, 13) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, QS, 14) 
++    AVR32_OPCODE_LD_COND (LD_W, 0, AL, 15) 
++
++    AVR32_OPCODE_LD_COND (LD_SH, 1, EQ, 0) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, NE, 1) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, CC, 2) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, CS, 3) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, GE, 4) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, LT, 5) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, MI, 6) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, PL, 7) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, LS, 8) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, GT, 9) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, LE, 10) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, HI, 11) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, VS, 12) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, VC, 13) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, QS, 14) 
++    AVR32_OPCODE_LD_COND (LD_SH, 1, AL, 15) 
++
++    AVR32_OPCODE_LD_COND (LD_UH, 2, EQ, 0) 
++    AVR32_OPCODE_LD_COND (LD_UH, 2, NE, 1) 
++    AVR32_OPCODE_LD_COND (LD_UH, 2, CC, 2) 
++    AVR32_OPCODE_LD_COND (LD_UH, 2, CS, 3) 
++    AVR32_OPCODE_LD_COND (LD_UH, 2, GE, 4) 
++    AVR32_OPCODE_LD_COND (LD_UH, 2, LT, 5) 
++    AVR32_OPCODE_LD_COND (LD_UH, 2, MI, 6) 
++    AVR32_OPCODE_LD_COND (LD_UH, 2, PL, 7) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, LS, 8) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, GT, 9) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, LE, 10) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, HI, 11) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, VS, 12) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, VC, 13) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, QS, 14) 
++    AVR32_OPCODE_LD_COND (LD_SH, 2, AL, 15) 
++
++    AVR32_OPCODE_LD_COND (LD_SB, 3, EQ, 0) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, NE, 1) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, CC, 2) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, CS, 3) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, GE, 4) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, LT, 5) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, MI, 6) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, PL, 7) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, LS, 8) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, GT, 9) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, LE, 10) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, HI, 11) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, VS, 12) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, VC, 13) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, QS, 14) 
++    AVR32_OPCODE_LD_COND (LD_SB, 3, AL, 15) 
++
++    AVR32_OPCODE_LD_COND (LD_UB, 4, EQ, 0) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, NE, 1) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, CC, 2) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, CS, 3) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, GE, 4) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, LT, 5) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, MI, 6) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, PL, 7) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, LS, 8) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, GT, 9) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, LE, 10) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, HI, 11) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, VS, 12) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, VC, 13) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, QS, 14) 
++    AVR32_OPCODE_LD_COND (LD_UB, 4, AL, 15) 
++
++    AVR32_OPCODE_ST_COND (ST_W, 5, EQ, 0) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, NE, 1) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, CC, 2) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, CS, 3) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, GE, 4) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, LT, 5) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, MI, 6) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, PL, 7) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, LS, 8) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, GT, 9) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, LE, 10) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, HI, 11) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, VS, 12) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, VC, 13) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, QS, 14) 
++    AVR32_OPCODE_ST_COND (ST_W, 5, AL, 15) 
++
++    AVR32_OPCODE_ST_COND (ST_H, 6, EQ, 0) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, NE, 1) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, CC, 2) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, CS, 3) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, GE, 4) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, LT, 5) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, MI, 6) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, PL, 7) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, LS, 8) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, GT, 9) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, LE, 10) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, HI, 11) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, VS, 12) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, VC, 13) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, QS, 14) 
++    AVR32_OPCODE_ST_COND (ST_H, 6, AL, 15) 
++
++    AVR32_OPCODE_ST_COND (ST_B, 7, EQ, 0) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, NE, 1) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, CC, 2) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, CS, 3) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, GE, 4) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, LT, 5) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, MI, 6) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, PL, 7) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, LS, 8) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, GT, 9) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, LE, 10) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, HI, 11) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, VS, 12) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, VC, 13) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, QS, 14) 
++    AVR32_OPCODE_ST_COND (ST_B, 7, AL, 15) 
++
++    {
++      AVR32_OPC_MOVH, 4, 0xfc100000, 0xfff00000,
++      &avr32_syntax_table[AVR32_SYNTAX_MOVH],
++      BFD_RELOC_AVR32_16U,  2, 1,
++      {
++	&avr32_ifield_table[AVR32_IFIELD_RY],
++	&avr32_ifield_table[AVR32_IFIELD_K16],
++      },
++    },
++    {
++      AVR32_OPC_SSCALL, 2, 0xd7530000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_SSCALL],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++    {
++      AVR32_OPC_RETSS, 2, 0xd7630000, 0xffff0000,
++      &avr32_syntax_table[AVR32_SYNTAX_RETSS],
++      BFD_RELOC_UNUSED, 0, -1, { NULL },
++    },
++
++  {
++    AVR32_OPC_FMAC_S, 4, 0xE1A00000, 0xFFF0F000,
++    &avr32_syntax_table[AVR32_SYNTAX_FMAC_S],
++    BFD_RELOC_UNUSED, 4, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FNMAC_S, 4, 0xE1A01000, 0xFFF0F000,
++    &avr32_syntax_table[AVR32_SYNTAX_FNMAC_S],
++    BFD_RELOC_UNUSED, 4, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FMSC_S, 4, 0xE3A00000, 0xFFF0F000,
++    &avr32_syntax_table[AVR32_SYNTAX_FMSC_S],
++    BFD_RELOC_UNUSED, 4, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FNMSC_S, 4, 0xE3A01000, 0xFFF0F000,
++    &avr32_syntax_table[AVR32_SYNTAX_FNMSC_S],
++    BFD_RELOC_UNUSED, 4, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FMUL_S, 4, 0xE5A20000, 0xFFFFF000,
++    &avr32_syntax_table[AVR32_SYNTAX_FMUL_S],
++    BFD_RELOC_UNUSED, 3, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FNMUL_S, 4, 0xE5A30000, 0xFFFFF000,
++    &avr32_syntax_table[AVR32_SYNTAX_FNMUL_S],
++    BFD_RELOC_UNUSED, 3, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FADD_S, 4, 0xE5A00000, 0xFFFFF000,
++    &avr32_syntax_table[AVR32_SYNTAX_FADD_S],
++    BFD_RELOC_UNUSED, 3, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FSUB_S, 4, 0xE5A10000, 0xFFFFF000,
++    &avr32_syntax_table[AVR32_SYNTAX_FSUB_S],
++    BFD_RELOC_UNUSED, 3, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FCASTRS_SW, 4, 0xE5AB0000, 0xFFFFF0F0,
++    &avr32_syntax_table[AVR32_SYNTAX_FCASTRS_SW],
++    BFD_RELOC_UNUSED, 2, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FCASTRS_UW, 4, 0xE5A90000, 0xFFFFF0F0,
++    &avr32_syntax_table[AVR32_SYNTAX_FCASTRS_UW],
++    BFD_RELOC_UNUSED, 2, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FCASTSW_S, 4, 0xE5A60000, 0xFFFFF0F0,
++    &avr32_syntax_table[AVR32_SYNTAX_FCASTSW_S],
++    BFD_RELOC_UNUSED, 2, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FCASTUW_S, 4, 0xE5A40000, 0xFFFFF0F0,
++    &avr32_syntax_table[AVR32_SYNTAX_FCASTUW_S],
++    BFD_RELOC_UNUSED, 2, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FCMP_S, 4, 0xE5AC0000, 0xFFFFFF00,
++    &avr32_syntax_table[AVR32_SYNTAX_FCMP_S],
++    BFD_RELOC_UNUSED, 2, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FCHK_S, 4, 0xE5AD0000, 0xFFFFFFF0,
++    &avr32_syntax_table[AVR32_SYNTAX_FCHK_S],
++    BFD_RELOC_UNUSED, 1, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FRCPA_S, 4, 0xE5AE0000, 0xFFFFF0F0,
++    &avr32_syntax_table[AVR32_SYNTAX_FRCPA_S],
++    BFD_RELOC_UNUSED, 2, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  },
++  {
++    AVR32_OPC_FRSQRTA_S, 4, 0xE5AF0000, 0xFFFFF0F0,
++    &avr32_syntax_table[AVR32_SYNTAX_FRSQRTA_S],
++    BFD_RELOC_UNUSED, 2, -1,
++    {
++      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
++      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
++    }
++  }
++
++};
++
++
++const struct avr32_alias avr32_alias_table[] =
++  {
++    {
++      AVR32_ALIAS_PICOSVMAC0,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x0c },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSVMAC1,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x0d },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSVMAC2,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x0e },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSVMAC3,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x0f },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSVMUL0,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x08 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSVMUL1,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x09 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSVMUL2,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x0a },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSVMUL3,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x0b },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMAC0,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x04 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMAC1,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x05 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMAC2,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x06 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMAC3,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x07 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMUL0,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x00 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMUL1,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x01 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMUL2,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x02 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOVMUL3,
++      &avr32_opc_table[AVR32_OPC_COP],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++	{ 0, 0x03 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLD_D1,
++      &avr32_opc_table[AVR32_OPC_LDC_D1],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLD_D2,
++      &avr32_opc_table[AVR32_OPC_LDC_D2],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLD_D3,
++      &avr32_opc_table[AVR32_OPC_LDC_D3],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLD_W1,
++      &avr32_opc_table[AVR32_OPC_LDC_W1],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLD_W2,
++      &avr32_opc_table[AVR32_OPC_LDC_W2],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLD_W3,
++      &avr32_opc_table[AVR32_OPC_LDC_W3],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLDM_D,
++      &avr32_opc_table[AVR32_OPC_LDCM_D],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLDM_D_PU,
++      &avr32_opc_table[AVR32_OPC_LDCM_D_PU],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLDM_W,
++      &avr32_opc_table[AVR32_OPC_LDCM_W],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOLDM_W_PU,
++      &avr32_opc_table[AVR32_OPC_LDCM_W_PU],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOMV_D1,
++      &avr32_opc_table[AVR32_OPC_MVCR_D],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOMV_D2,
++      &avr32_opc_table[AVR32_OPC_MVRC_D],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOMV_W1,
++      &avr32_opc_table[AVR32_OPC_MVCR_W],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOMV_W2,
++      &avr32_opc_table[AVR32_OPC_MVRC_W],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOST_D1,
++      &avr32_opc_table[AVR32_OPC_STC_D1],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOST_D2,
++      &avr32_opc_table[AVR32_OPC_STC_D2],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOST_D3,
++      &avr32_opc_table[AVR32_OPC_STC_D3],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOST_W1,
++      &avr32_opc_table[AVR32_OPC_STC_W1],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOST_W2,
++      &avr32_opc_table[AVR32_OPC_STC_W2],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOST_W3,
++      &avr32_opc_table[AVR32_OPC_STC_W3],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSTM_D,
++      &avr32_opc_table[AVR32_OPC_STCM_D],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSTM_D_PU,
++      &avr32_opc_table[AVR32_OPC_STCM_D_PU],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSTM_W,
++      &avr32_opc_table[AVR32_OPC_STCM_W],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++      },
++    },
++    {
++      AVR32_ALIAS_PICOSTM_W_PU,
++      &avr32_opc_table[AVR32_OPC_STCM_W_PU],
++      {
++	{ 0, PICO_CPNO },
++	{ 1, 0 }, { 1, 1 }, { 1, 2 },
++      },
++    },
++  };
++
++
++#define SYNTAX_NORMAL0(id, mne, opc, arch)			\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },		\
++    NULL, 0, { }					\
++  }
++#define SYNTAX_NORMAL1(id, mne, opc, op0, arch)		\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },		\
++    NULL, 1,						\
++    {							\
++      AVR32_OPERAND_##op0,				\
++    }							\
++  }
++#define SYNTAX_NORMALM1(id, mne, opc, op0, arch)		\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    NULL, -1,						\
++    {							\
++      AVR32_OPERAND_##op0,				\
++    }							\
++  }
++#define SYNTAX_NORMAL2(id, mne, opc, op0, op1, arch)		\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    NULL, 2,						\
++    {							\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
++    }							\
++  }
++#define SYNTAX_NORMALM2(id, mne, opc, op0, op1, arch)		\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    NULL, -2,						\
++    {							\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
++    }							\
++  }
++#define SYNTAX_NORMAL3(id, mne, opc, op0, op1, op2, arch)	\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    NULL, 3,						\
++    {							\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
++      AVR32_OPERAND_##op2,				\
++    }							\
++  }
++#define SYNTAX_NORMALM3(id, mne, opc, op0, op1, op2, arch)	\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    NULL, -3,						\
++    {							\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
++      AVR32_OPERAND_##op2,				\
++    }							\
++  }
++#define SYNTAX_NORMAL4(id, mne, opc, op0, op1, op2, op3, arch)\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    NULL, 4,						\
++    {							\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
++      AVR32_OPERAND_##op2, AVR32_OPERAND_##op3,		\
++    }							\
++  }
++#define SYNTAX_NORMAL5(id, mne, opc, op0, op1, op2, op3, op4, arch)	\
++  {								\
++    AVR32_SYNTAX_##id, arch,				\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],		\
++    AVR32_PARSER_NORMAL,						\
++    { &avr32_opc_table[AVR32_OPC_##opc], },				\
++    NULL, 5,							\
++    {								\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,			\
++      AVR32_OPERAND_##op2, AVR32_OPERAND_##op3,			\
++      AVR32_OPERAND_##op4,					\
++    }								\
++  }
++
++#define SYNTAX_NORMAL_C1(id, mne, opc, nxt, op0, arch)	\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    &avr32_syntax_table[AVR32_SYNTAX_##nxt], 1,		\
++    {							\
++      AVR32_OPERAND_##op0,				\
++    }							\
++  }
++#define SYNTAX_NORMAL_CM1(id, mne, opc, nxt, op0, arch)	\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    &avr32_syntax_table[AVR32_SYNTAX_##nxt], -1,	\
++    {							\
++      AVR32_OPERAND_##op0,				\
++    }							\
++  }
++#define SYNTAX_NORMAL_C2(id, mne, opc, nxt, op0, op1, arch)	\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    &avr32_syntax_table[AVR32_SYNTAX_##nxt], 2,		\
++    {							\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
++    }							\
++  }
++#define SYNTAX_NORMAL_CM2(id, mne, opc, nxt, op0, op1, arch)	\
++  {							\
++    AVR32_SYNTAX_##id, arch,			\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
++    AVR32_PARSER_NORMAL,					\
++    { &avr32_opc_table[AVR32_OPC_##opc], },			\
++    &avr32_syntax_table[AVR32_SYNTAX_##nxt], -2,	\
++    {							\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
++    }							\
++  }
++#define SYNTAX_NORMAL_C3(id, mne, opc, nxt, op0, op1, op2, arch)	\
++  {								\
++    AVR32_SYNTAX_##id, arch,				\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],		\
++    AVR32_PARSER_NORMAL,						\
++    { &avr32_opc_table[AVR32_OPC_##opc], },				\
++    &avr32_syntax_table[AVR32_SYNTAX_##nxt], 3,			\
++    {								\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,			\
++      AVR32_OPERAND_##op2,					\
++    }								\
++  }
++#define SYNTAX_NORMAL_CM3(id, mne, opc, nxt, op0, op1, op2, arch)	\
++  {								\
++    AVR32_SYNTAX_##id, arch,				\
++    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],		\
++    AVR32_PARSER_NORMAL,						\
++    { &avr32_opc_table[AVR32_OPC_##opc], },				\
++    &avr32_syntax_table[AVR32_SYNTAX_##nxt], -3,		\
++    {								\
++      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,			\
++      AVR32_OPERAND_##op2,					\
++    }								\
++  }
++
++
++const struct avr32_syntax avr32_syntax_table[] =
++  {
++    SYNTAX_NORMAL1(ABS, ABS, ABS, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(ACALL, ACALL, ACALL, UNSIGNED_CONST_W, AVR32_V1),
++    SYNTAX_NORMAL1(ACR, ACR, ACR, INTREG,AVR32_V1),
++    SYNTAX_NORMAL3(ADC, ADC, ADC, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ADD1, ADD, ADD1, ADD2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(ADD2, ADD, ADD2, INTREG, INTREG, INTREG_LSL, AVR32_V1),
++    SYNTAX_NORMAL3(ADDABS, ADDABS, ADDABS, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(ADDHH_W, ADDHH_W, ADDHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL_C2(AND1, AND, AND1, AND2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(AND2, AND, AND2, AND3, INTREG, INTREG, INTREG_LSL, AVR32_V1),
++    SYNTAX_NORMAL3(AND3, AND, AND3, INTREG, INTREG, INTREG_LSR, AVR32_V1),
++    SYNTAX_NORMAL_C2(ANDH, ANDH, ANDH, ANDH_COH, INTREG, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL3(ANDH_COH, ANDH, ANDH_COH, INTREG, UNSIGNED_CONST, COH, AVR32_V1),
++    SYNTAX_NORMAL_C2(ANDL, ANDL, ANDL, ANDL_COH, INTREG, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL3(ANDL_COH, ANDL, ANDL_COH, INTREG, UNSIGNED_CONST, COH, AVR32_V1),
++    SYNTAX_NORMAL2(ANDN, ANDN, ANDN, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(ASR1, ASR, ASR1, ASR3, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(ASR3, ASR, ASR3, ASR2, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL2(ASR2, ASR, ASR2, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL4(BFEXTS, BFEXTS, BFEXTS, INTREG, INTREG, UNSIGNED_NUMBER, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL4(BFEXTU, BFEXTU, BFEXTU, INTREG, INTREG, UNSIGNED_NUMBER, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL4(BFINS, BFINS, BFINS, INTREG, INTREG, UNSIGNED_NUMBER, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL2(BLD, BLD, BLD, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL_C1(BREQ1, BREQ, BREQ1, BREQ2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRNE1, BRNE, BRNE1, BRNE2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRCC1, BRCC, BRCC1, BRCC2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRCS1, BRCS, BRCS1, BRCS2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRGE1, BRGE, BRGE1, BRGE2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRLT1, BRLT, BRLT1, BRLT2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRMI1, BRMI, BRMI1, BRMI2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRPL1, BRPL, BRPL1, BRPL2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRHS1, BRHS, BRCC1, BRHS2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL_C1(BRLO1, BRLO, BRCS1, BRLO2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BREQ2, BREQ, BREQ2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRNE2, BRNE, BRNE2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRCC2, BRCC, BRCC2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRCS2, BRCS, BRCS2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRGE2, BRGE, BRGE2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRLT2, BRLT, BRLT2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRMI2, BRMI, BRMI2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRPL2, BRPL, BRPL2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRLS, BRLS, BRLS, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRGT, BRGT, BRGT, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRLE, BRLE, BRLE, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRHI, BRHI, BRHI, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRVS, BRVS, BRVS, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRVC, BRVC, BRVC, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRQS, BRQS, BRQS, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRAL, BRAL, BRAL, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRHS2, BRHS, BRCC2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(BRLO2, BRLO, BRCS2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL0(BREAKPOINT, BREAKPOINT, BREAKPOINT, AVR32_V1),
++    SYNTAX_NORMAL1(BREV, BREV, BREV, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(BST, BST, BST, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL2(CACHE, CACHE, CACHE, INTREG_SDISP, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL1(CASTS_B, CASTS_B, CASTS_B, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(CASTS_H, CASTS_H, CASTS_H, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(CASTU_B, CASTU_B, CASTU_B, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(CASTU_H, CASTU_H, CASTU_H, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(CBR, CBR, CBR, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL2(CLZ, CLZ, CLZ, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(COM, COM, COM, INTREG, AVR32_V1),
++    SYNTAX_NORMAL5(COP, COP, COP, CPNO, CPREG, CPREG, CPREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL2(CP_B, CP_B, CP_B, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(CP_H, CP_H, CP_H, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(CP_W1, CP_W, CP_W1, CP_W2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(CP_W2, CP_W, CP_W2, CP_W3, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(CP_W3, CP_W, CP_W3, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(CPC1, CPC, CPC1, CPC2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(CPC2, CPC, CPC2, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(CSRF, CSRF, CSRF, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL1(CSRFCZ, CSRFCZ, CSRFCZ, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL3(DIVS, DIVS, DIVS, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(DIVU, DIVU, DIVU, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(EOR1, EOR, EOR1, EOR2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(EOR2, EOR, EOR2, EOR3, INTREG, INTREG, INTREG_LSL, AVR32_V1),
++    SYNTAX_NORMAL3(EOR3, EOR, EOR3, INTREG, INTREG, INTREG_LSR, AVR32_V1),
++    SYNTAX_NORMAL2(EORL, EORL, EORL, INTREG, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(EORH, EORH, EORH, INTREG, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL0(FRS, FRS, FRS, AVR32_V1),
++    SYNTAX_NORMAL0(SSCALL, SSCALL, SSCALL, AVR32_V3),
++    SYNTAX_NORMAL0(RETSS, RETSS, RETSS, AVR32_V3),
++    SYNTAX_NORMAL1(ICALL, ICALL, ICALL, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(INCJOSP, INCJOSP, INCJOSP, JOSPINC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_D1, LD_D, LD_D1, LD_D2, DWREG, INTREG_POSTINC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_D2, LD_D, LD_D2, LD_D3, DWREG, INTREG_PREDEC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_D3, LD_D, LD_D3, LD_D5, DWREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_D5, LD_D, LD_D5, LD_D4, DWREG, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL2(LD_D4, LD_D, LD_D4, DWREG, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_SB2, LD_SB, LD_SB2, LD_SB1, INTREG, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL2(LD_SB1, LD_SB, LD_SB1, INTREG, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UB1, LD_UB, LD_UB1, LD_UB2, INTREG, INTREG_POSTINC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UB2, LD_UB, LD_UB2, LD_UB5, INTREG, INTREG_PREDEC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UB5, LD_UB, LD_UB5, LD_UB3, INTREG, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UB3, LD_UB, LD_UB3, LD_UB4, INTREG, INTREG_UDISP, AVR32_V1),
++    SYNTAX_NORMAL2(LD_UB4, LD_UB, LD_UB4, INTREG, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_SH1, LD_SH, LD_SH1, LD_SH2, INTREG, INTREG_POSTINC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_SH2, LD_SH, LD_SH2, LD_SH5, INTREG, INTREG_PREDEC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_SH5, LD_SH, LD_SH5, LD_SH3, INTREG, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_SH3, LD_SH, LD_SH3, LD_SH4, INTREG, INTREG_UDISP_H, AVR32_V1),
++    SYNTAX_NORMAL2(LD_SH4, LD_SH, LD_SH4, INTREG, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UH1, LD_UH, LD_UH1, LD_UH2, INTREG, INTREG_POSTINC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UH2, LD_UH, LD_UH2, LD_UH5, INTREG, INTREG_PREDEC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UH5, LD_UH, LD_UH5, LD_UH3, INTREG, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_UH3, LD_UH, LD_UH3, LD_UH4, INTREG, INTREG_UDISP_H, AVR32_V1),
++    SYNTAX_NORMAL2(LD_UH4, LD_UH, LD_UH4, INTREG, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_W1, LD_W, LD_W1, LD_W2, INTREG, INTREG_POSTINC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_W2, LD_W, LD_W2, LD_W5, INTREG, INTREG_PREDEC, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_W5, LD_W, LD_W5, LD_W6, INTREG, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_W6, LD_W, LD_W6, LD_W3, INTREG, INTREG_XINDEX, AVR32_V1),
++    SYNTAX_NORMAL_C2(LD_W3, LD_W, LD_W3, LD_W4, INTREG, INTREG_UDISP_W, AVR32_V1),
++    SYNTAX_NORMAL2(LD_W4, LD_W, LD_W4, INTREG, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL3(LDC_D1, LDC_D, LDC_D1, CPNO, CPREG_D, INTREG_UDISP_W, AVR32_V1),
++    SYNTAX_NORMAL_C3(LDC_D2, LDC_D, LDC_D2, LDC_D1, CPNO, CPREG_D, INTREG_PREDEC, AVR32_V1),
++    SYNTAX_NORMAL_C3(LDC_D3, LDC_D, LDC_D3, LDC_D2, CPNO, CPREG_D, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL3(LDC_W1, LDC_W, LDC_W1, CPNO, CPREG, INTREG_UDISP_W, AVR32_V1),
++    SYNTAX_NORMAL_C3(LDC_W2, LDC_W, LDC_W2, LDC_W1, CPNO, CPREG, INTREG_PREDEC, AVR32_V1),
++    SYNTAX_NORMAL_C3(LDC_W3, LDC_W, LDC_W3, LDC_W2, CPNO, CPREG, INTREG_INDEX, AVR32_V1),
++    SYNTAX_NORMAL2(LDC0_D, LDC0_D, LDC0_D, CPREG_D, INTREG_UDISP_W, AVR32_V1),
++    SYNTAX_NORMAL2(LDC0_W, LDC0_W, LDC0_W, CPREG, INTREG_UDISP_W, AVR32_V1),
++    SYNTAX_NORMAL_CM3(LDCM_D, LDCM_D, LDCM_D, LDCM_D_PU, CPNO, INTREG, REGLIST_CPD8, AVR32_V1),
++    SYNTAX_NORMALM3(LDCM_D_PU, LDCM_D, LDCM_D_PU, CPNO, INTREG_POSTINC, REGLIST_CPD8, AVR32_V1),
++    SYNTAX_NORMAL_CM3(LDCM_W, LDCM_W, LDCM_W, LDCM_W_PU, CPNO, INTREG, REGLIST_CP8, AVR32_V1),
++    SYNTAX_NORMALM3(LDCM_W_PU, LDCM_W, LDCM_W_PU, CPNO, INTREG_POSTINC, REGLIST_CP8, AVR32_V1),
++    SYNTAX_NORMAL2(LDDPC, LDDPC, LDDPC, INTREG, PC_UDISP_W, AVR32_V1),
++    SYNTAX_NORMAL2(LDDPC_EXT, LDDPC, LDDPC_EXT, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(LDDSP, LDDSP, LDDSP, INTREG, SP_UDISP_W, AVR32_V1),
++    SYNTAX_NORMAL2(LDINS_B, LDINS_B, LDINS_B, INTREG_BSEL, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL2(LDINS_H, LDINS_H, LDINS_H, INTREG_HSEL, INTREG_SDISP_H, AVR32_V1),
++    SYNTAX_NORMALM1(LDM, LDM, LDM, REGLIST_LDM, AVR32_V1),
++    SYNTAX_NORMAL_CM2(LDMTS, LDMTS, LDMTS, LDMTS_PU, INTREG, REGLIST16, AVR32_V1),
++    SYNTAX_NORMALM2(LDMTS_PU, LDMTS, LDMTS_PU, INTREG_POSTINC, REGLIST16, AVR32_V1),
++    SYNTAX_NORMAL2(LDSWP_SH, LDSWP_SH, LDSWP_SH, INTREG, INTREG_SDISP_H, AVR32_V1),
++    SYNTAX_NORMAL2(LDSWP_UH, LDSWP_UH, LDSWP_UH, INTREG, INTREG_SDISP_H, AVR32_V1),
++    SYNTAX_NORMAL2(LDSWP_W, LDSWP_W, LDSWP_W, INTREG, INTREG_SDISP_W, AVR32_V1),
++    SYNTAX_NORMAL_C3(LSL1, LSL, LSL1, LSL3, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(LSL3, LSL, LSL3, LSL2, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL2(LSL2, LSL, LSL2, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL_C3(LSR1, LSR, LSR1, LSR3, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(LSR3, LSR, LSR3, LSR2, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL2(LSR2, LSR, LSR2, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL3(MAC, MAC, MAC, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(MACHH_D, MACHH_D, MACHH_D, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MACHH_W, MACHH_W, MACHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MACS_D, MACS_D, MACS_D, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(MACSATHH_W, MACSATHH_W, MACSATHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MACUD, MACU_D, MACUD, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(MACWH_D, MACWH_D, MACWH_D, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MAX, MAX, MAX, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(MCALL, MCALL, MCALL, MCALL, AVR32_V1),
++    SYNTAX_NORMAL2(MFDR, MFDR, MFDR, INTREG, UNSIGNED_CONST_W, AVR32_V1),
++    SYNTAX_NORMAL2(MFSR, MFSR, MFSR, INTREG, UNSIGNED_CONST_W, AVR32_V1),
++    SYNTAX_NORMAL3(MIN, MIN, MIN, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOV3, MOV, MOV3, MOV1, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOV1, MOV, MOV1, MOV2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOV2, MOV, MOV2,INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVEQ1, MOVEQ, MOVEQ1, MOVEQ2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVNE1, MOVNE, MOVNE1, MOVNE2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVCC1, MOVCC, MOVCC1, MOVCC2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVCS1, MOVCS, MOVCS1, MOVCS2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVGE1, MOVGE, MOVGE1, MOVGE2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVLT1, MOVLT, MOVLT1, MOVLT2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVMI1, MOVMI, MOVMI1, MOVMI2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVPL1, MOVPL, MOVPL1, MOVPL2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVLS1, MOVLS, MOVLS1, MOVLS2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVGT1, MOVGT, MOVGT1, MOVGT2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVLE1, MOVLE, MOVLE1, MOVLE2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVHI1, MOVHI, MOVHI1, MOVHI2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVVS1, MOVVS, MOVVS1, MOVVS2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVVC1, MOVVC, MOVVC1, MOVVC2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVQS1, MOVQS, MOVQS1, MOVQS2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVAL1, MOVAL, MOVAL1, MOVAL2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVHS1, MOVHS, MOVCC1, MOVHS2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MOVLO1, MOVLO, MOVCS1, MOVLO2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(MOVEQ2, MOVEQ, MOVEQ2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVNE2, MOVNE, MOVNE2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVCC2, MOVCC, MOVCC2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVCS2, MOVCS, MOVCS2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVGE2, MOVGE, MOVGE2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVLT2, MOVLT, MOVLT2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVMI2, MOVMI, MOVMI2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVPL2, MOVPL, MOVPL2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVLS2, MOVLS, MOVLS2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVGT2, MOVGT, MOVGT2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVLE2, MOVLE, MOVLE2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVHI2, MOVHI, MOVHI2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVVS2, MOVVS, MOVVS2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVVC2, MOVVC, MOVVC2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVQS2, MOVQS, MOVQS2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVAL2, MOVAL, MOVAL2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVHS2, MOVHS, MOVCC2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MOVLO2, MOVLO, MOVCS2, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(MTDR, MTDR, MTDR, UNSIGNED_CONST_W, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(MTSR, MTSR, MTSR, UNSIGNED_CONST_W, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(MUL1, MUL, MUL1, MUL2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(MUL2, MUL, MUL2, MUL3, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(MUL3, MUL, MUL3, INTREG, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL3(MULHH_W, MULHH_W, MULHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULNHH_W, MULNHH_W, MULNHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULNWH_D, MULNWH_D, MULNWH_D, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULSD, MULS_D, MULSD, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(MULSATHH_H, MULSATHH_H, MULSATHH_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULSATHH_W, MULSATHH_W, MULSATHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULSATRNDHH_H, MULSATRNDHH_H, MULSATRNDHH_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULSATRNDWH_W, MULSATRNDWH_W, MULSATRNDWH_W, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULSATWH_W, MULSATWH_W, MULSATWH_W, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL3(MULU_D, MULU_D, MULU_D, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(MULWH_D, MULWH_D, MULWH_D, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL1(MUSFR, MUSFR, MUSFR, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(MUSTR, MUSTR, MUSTR, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(MVCR_D, MVCR_D, MVCR_D, CPNO, DWREG, CPREG_D, AVR32_V1),
++    SYNTAX_NORMAL3(MVCR_W, MVCR_W, MVCR_W, CPNO, INTREG, CPREG, AVR32_V1),
++    SYNTAX_NORMAL3(MVRC_D, MVRC_D, MVRC_D, CPNO, CPREG_D, DWREG, AVR32_V1),
++    SYNTAX_NORMAL3(MVRC_W, MVRC_W, MVRC_W, CPNO, CPREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(NEG, NEG, NEG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL0(NOP, NOP, NOP, AVR32_V1),
++    SYNTAX_NORMAL_C2(OR1, OR, OR1, OR2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(OR2, OR, OR2, OR3, INTREG, INTREG, INTREG_LSL, AVR32_V1),
++    SYNTAX_NORMAL3(OR3, OR, OR3, INTREG, INTREG, INTREG_LSR, AVR32_V1),
++    SYNTAX_NORMAL2(ORH, ORH, ORH, INTREG, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(ORL, ORL, ORL, INTREG, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(PABS_SB, PABS_SB, PABS_SB, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL2(PABS_SH, PABS_SH, PABS_SH, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PACKSH_SB, PACKSH_SB, PACKSH_SB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PACKSH_UB, PACKSH_UB, PACKSH_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PACKW_SH, PACKW_SH, PACKW_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADD_B, PADD_B, PADD_B, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADD_H, PADD_H, PADD_H, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDH_SH, PADDH_SH, PADDH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDH_UB, PADDH_UB, PADDH_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDS_SB, PADDS_SB, PADDS_SB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDS_SH, PADDS_SH, PADDS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDS_UB, PADDS_UB, PADDS_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDS_UH, PADDS_UH, PADDS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDSUB_H, PADDSUB_H, PADDSUB_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDSUBH_SH, PADDSUBH_SH, PADDSUBH_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDSUBS_SH, PADDSUBS_SH, PADDSUBS_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDSUBS_UH, PADDSUBS_UH, PADDSUBS_UH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDX_H, PADDX_H, PADDX_H, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDXH_SH, PADDXH_SH, PADDXH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDXS_SH, PADDXS_SH, PADDXS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PADDXS_UH, PADDXS_UH, PADDXS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PASR_B, PASR_B, PASR_B, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
++    SYNTAX_NORMAL3(PASR_H, PASR_H, PASR_H, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
++    SYNTAX_NORMAL3(PAVG_SH, PAVG_SH, PAVG_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PAVG_UB, PAVG_UB, PAVG_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PLSL_B, PLSL_B, PLSL_B, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
++    SYNTAX_NORMAL3(PLSL_H, PLSL_H, PLSL_H, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
++    SYNTAX_NORMAL3(PLSR_B, PLSR_B, PLSR_B, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
++    SYNTAX_NORMAL3(PLSR_H, PLSR_H, PLSR_H, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
++    SYNTAX_NORMAL3(PMAX_SH, PMAX_SH, PMAX_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PMAX_UB, PMAX_UB, PMAX_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PMIN_SH, PMIN_SH, PMIN_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PMIN_UB, PMIN_UB, PMIN_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL0(POPJC, POPJC, POPJC, AVR32_V1),
++    SYNTAX_NORMAL_CM1(POPM, POPM, POPM, POPM_E, REGLIST9, AVR32_V1),
++    SYNTAX_NORMALM1(POPM_E, POPM, POPM_E, REGLIST16, AVR32_V1),
++    SYNTAX_NORMAL1(PREF, PREF, PREF, INTREG_SDISP, AVR32_V1),
++    SYNTAX_NORMAL3(PSAD, PSAD, PSAD, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUB_B, PSUB_B, PSUB_B, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUB_H, PSUB_H, PSUB_H, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBADD_H, PSUBADD_H, PSUBADD_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBADDH_SH, PSUBADDH_SH, PSUBADDH_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBADDS_SH, PSUBADDS_SH, PSUBADDS_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBADDS_UH, PSUBADDS_UH, PSUBADDS_UH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBH_SH, PSUBH_SH, PSUBH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBH_UB, PSUBH_UB, PSUBH_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBS_SB, PSUBS_SB, PSUBS_SB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBS_SH, PSUBS_SH, PSUBS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBS_UB, PSUBS_UB, PSUBS_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBS_UH, PSUBS_UH, PSUBS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBX_H, PSUBX_H, PSUBX_H, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBXH_SH, PSUBXH_SH, PSUBXH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBXS_SH, PSUBXS_SH, PSUBXS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL3(PSUBXS_UH, PSUBXS_UH, PSUBXS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
++    SYNTAX_NORMAL2(PUNPCKSB_H, PUNPCKSB_H, PUNPCKSB_H, INTREG, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL2(PUNPCKUB_H, PUNPCKUB_H, PUNPCKUB_H, INTREG, INTREG_HSEL, AVR32_SIMD),
++    SYNTAX_NORMAL0(PUSHJC, PUSHJC, PUSHJC, AVR32_V1),
++    SYNTAX_NORMAL_CM1(PUSHM, PUSHM, PUSHM, PUSHM_E, REGLIST8, AVR32_V1),
++    SYNTAX_NORMALM1(PUSHM_E, PUSHM, PUSHM_E, REGLIST16, AVR32_V1),
++    SYNTAX_NORMAL_C1(RCALL1, RCALL, RCALL1, RCALL2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(RCALL2, RCALL, RCALL2, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(RETEQ, RETEQ, RETEQ, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETNE, RETNE, RETNE, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETCC, RETCC, RETCC, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETCS, RETCS, RETCS, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETGE, RETGE, RETGE, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETLT, RETLT, RETLT, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETMI, RETMI, RETMI, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETPL, RETPL, RETPL, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETLS, RETLS, RETLS, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETGT, RETGT, RETGT, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETLE, RETLE, RETLE, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETHI, RETHI, RETHI, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETVS, RETVS, RETVS, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETVC, RETVC, RETVC, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETQS, RETQS, RETQS, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETAL, RETAL, RETAL, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETHS, RETHS, RETCC, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL1(RETLO, RETLO, RETCS, RETVAL, AVR32_V1),
++    SYNTAX_NORMAL0(RETD, RETD, RETD, AVR32_V1),
++    SYNTAX_NORMAL0(RETE, RETE, RETE, AVR32_V1),
++    SYNTAX_NORMAL0(RETJ, RETJ, RETJ, AVR32_V1),
++    SYNTAX_NORMAL0(RETS, RETS, RETS, AVR32_V1),
++    SYNTAX_NORMAL1(RJMP, RJMP, RJMP, JMPLABEL, AVR32_V1),
++    SYNTAX_NORMAL1(ROL, ROL, ROL, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(ROR, ROR, ROR, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(RSUB1, RSUB, RSUB1, RSUB2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(RSUB2, RSUB, RSUB2, INTREG, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL3(SATADD_H, SATADD_H, SATADD_H, INTREG, INTREG, INTREG,  AVR32_DSP),
++    SYNTAX_NORMAL3(SATADD_W, SATADD_W, SATADD_W, INTREG, INTREG, INTREG, AVR32_DSP),
++    SYNTAX_NORMAL2(SATRNDS, SATRNDS, SATRNDS, INTREG_LSR, UNSIGNED_NUMBER, AVR32_DSP),
++    SYNTAX_NORMAL2(SATRNDU, SATRNDU, SATRNDU, INTREG_LSR, UNSIGNED_NUMBER, AVR32_DSP),
++    SYNTAX_NORMAL2(SATS, SATS, SATS, INTREG_LSR, UNSIGNED_NUMBER, AVR32_DSP),
++    SYNTAX_NORMAL3(SATSUB_H, SATSUB_H, SATSUB_H, INTREG, INTREG, INTREG, AVR32_DSP),
++    SYNTAX_NORMAL_C3(SATSUB_W1, SATSUB_W, SATSUB_W1, SATSUB_W2, INTREG, INTREG, INTREG, AVR32_DSP),
++    SYNTAX_NORMAL3(SATSUB_W2, SATSUB_W, SATSUB_W2, INTREG, INTREG, SIGNED_CONST, AVR32_DSP),
++    SYNTAX_NORMAL2(SATU, SATU, SATU, INTREG_LSR, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL3(SBC, SBC, SBC, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(SBR, SBR, SBR, INTREG, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL0(SCALL, SCALL, SCALL, AVR32_V1),
++    SYNTAX_NORMAL1(SCR, SCR, SCR, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SLEEP, SLEEP, SLEEP, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL1(SREQ, SREQ, SREQ, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRNE, SRNE, SRNE, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRCC, SRCC, SRCC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRCS, SRCS, SRCS, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRGE, SRGE, SRGE, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRLT, SRLT, SRLT, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRMI, SRMI, SRMI, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRPL, SRPL, SRPL, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRLS, SRLS, SRLS, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRGT, SRGT, SRGT, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRLE, SRLE, SRLE, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRHI, SRHI, SRHI, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRVS, SRVS, SRVS, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRVC, SRVC, SRVC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRQS, SRQS, SRQS, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRAL, SRAL, SRAL, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRHS, SRHS, SRCC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SRLO, SRLO, SRCS, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SSRF, SSRF, SSRF, UNSIGNED_NUMBER, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_B1, ST_B, ST_B1, ST_B2, INTREG_POSTINC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_B2, ST_B, ST_B2, ST_B5, INTREG_PREDEC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_B5, ST_B, ST_B5, ST_B3, INTREG_INDEX, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_B3, ST_B, ST_B3, ST_B4, INTREG_UDISP, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(ST_B4, ST_B, ST_B4, INTREG_SDISP, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_D1, ST_D, ST_D1, ST_D2, INTREG_POSTINC, DWREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_D2, ST_D, ST_D2, ST_D3, INTREG_PREDEC, DWREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_D3, ST_D, ST_D3, ST_D5, INTREG, DWREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_D5, ST_D, ST_D5, ST_D4, INTREG_INDEX, DWREG, AVR32_V1),
++    SYNTAX_NORMAL2(ST_D4, ST_D, ST_D4, INTREG_SDISP, DWREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_H1, ST_H, ST_H1, ST_H2, INTREG_POSTINC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_H2, ST_H, ST_H2, ST_H5, INTREG_PREDEC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_H5, ST_H, ST_H5, ST_H3, INTREG_INDEX, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_H3, ST_H, ST_H3, ST_H4, INTREG_UDISP_H, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(ST_H4, ST_H, ST_H4, INTREG_SDISP, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_W1, ST_W, ST_W1, ST_W2, INTREG_POSTINC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_W2, ST_W, ST_W2, ST_W5, INTREG_PREDEC, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_W5, ST_W, ST_W5, ST_W3, INTREG_INDEX, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(ST_W3, ST_W, ST_W3, ST_W4, INTREG_UDISP_W, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(ST_W4, ST_W, ST_W4, INTREG_SDISP, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(STC_D1, STC_D, STC_D1, CPNO, INTREG_UDISP_W, CPREG_D, AVR32_V1),
++    SYNTAX_NORMAL_C3(STC_D2, STC_D, STC_D2, STC_D1, CPNO, INTREG_POSTINC, CPREG_D, AVR32_V1),
++    SYNTAX_NORMAL_C3(STC_D3, STC_D, STC_D3, STC_D2, CPNO, INTREG_INDEX, CPREG_D, AVR32_V1),
++    SYNTAX_NORMAL3(STC_W1, STC_W, STC_W1, CPNO, INTREG_UDISP_W, CPREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(STC_W2, STC_W, STC_W2, STC_W1, CPNO, INTREG_POSTINC, CPREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(STC_W3, STC_W, STC_W3, STC_W2, CPNO, INTREG_INDEX, CPREG, AVR32_V1),
++    SYNTAX_NORMAL2(STC0_D, STC0_D, STC0_D, INTREG_UDISP_W, CPREG_D, AVR32_V1),
++    SYNTAX_NORMAL2(STC0_W, STC0_W, STC0_W, INTREG_UDISP_W, CPREG, AVR32_V1),
++    SYNTAX_NORMAL_CM3(STCM_D, STCM_D, STCM_D, STCM_D_PU, CPNO, INTREG, REGLIST_CPD8, AVR32_V1),
++    SYNTAX_NORMALM3(STCM_D_PU, STCM_D, STCM_D_PU, CPNO, INTREG_PREDEC, REGLIST_CPD8, AVR32_V1),
++    SYNTAX_NORMAL_CM3(STCM_W, STCM_W, STCM_W, STCM_W_PU, CPNO, INTREG, REGLIST_CP8, AVR32_V1),
++    SYNTAX_NORMALM3(STCM_W_PU, STCM_W, STCM_W_PU, CPNO, INTREG_PREDEC, REGLIST_CP8, AVR32_V1),
++    SYNTAX_NORMAL2(STCOND, STCOND, STCOND, INTREG_SDISP, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(STDSP, STDSP, STDSP, SP_UDISP_W, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(STHH_W2, STHH_W, STHH_W2, STHH_W1, INTREG_INDEX, INTREG_HSEL, INTREG_HSEL, AVR32_V1),
++    SYNTAX_NORMAL3(STHH_W1, STHH_W, STHH_W1, INTREG_UDISP_W, INTREG_HSEL, INTREG_HSEL, AVR32_V1),
++    SYNTAX_NORMAL_CM2(STM, STM, STM, STM_PU, INTREG, REGLIST16, AVR32_V1),
++    SYNTAX_NORMALM2(STM_PU, STM, STM_PU, INTREG_PREDEC, REGLIST16, AVR32_V1),
++    SYNTAX_NORMAL_CM2(STMTS, STMTS, STMTS, STMTS_PU, INTREG, REGLIST16, AVR32_V1),
++    SYNTAX_NORMALM2(STMTS_PU, STMTS, STMTS_PU, INTREG_PREDEC, REGLIST16, AVR32_V1),
++    SYNTAX_NORMAL2(STSWP_H, STSWP_H, STSWP_H, INTREG_SDISP_H, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(STSWP_W, STSWP_W, STSWP_W, INTREG_SDISP_W, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUB1, SUB, SUB1, SUB2, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL_C3(SUB2, SUB, SUB2, SUB5, INTREG, INTREG, INTREG_LSL, AVR32_V1),
++    SYNTAX_NORMAL_C3(SUB5, SUB, SUB5, SUB3_SP, INTREG, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUB3_SP, SUB, SUB3_SP, SUB3, SP, SIGNED_CONST_W, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUB3, SUB, SUB3, SUB4, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUB4, SUB, SUB4, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBEQ, SUBEQ, SUBEQ, SUB2EQ, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBNE, SUBNE, SUBNE, SUB2NE, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBCC, SUBCC, SUBCC, SUB2CC, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBCS, SUBCS, SUBCS, SUB2CS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBGE, SUBGE, SUBGE, SUB2GE, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBLT, SUBLT, SUBLT, SUB2LT, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBMI, SUBMI, SUBMI, SUB2MI, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBPL, SUBPL, SUBPL, SUB2PL, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBLS, SUBLS, SUBLS, SUB2LS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBGT, SUBGT, SUBGT, SUB2GT, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBLE, SUBLE, SUBLE, SUB2LE, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBHI, SUBHI, SUBHI, SUB2HI, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBVS, SUBVS, SUBVS, SUB2VS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBVC, SUBVC, SUBVC, SUB2VC, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBQS, SUBQS, SUBQS, SUB2QS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBAL, SUBAL, SUBAL, SUB2AL, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBHS, SUBHS, SUBCC, SUB2CC, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL_C2(SUBLO, SUBLO, SUBCS, SUB2CS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFEQ, SUBFEQ, SUBFEQ, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFNE, SUBFNE, SUBFNE, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFCC, SUBFCC, SUBFCC, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFCS, SUBFCS, SUBFCS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFGE, SUBFGE, SUBFGE, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFLT, SUBFLT, SUBFLT, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFMI, SUBFMI, SUBFMI, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFPL, SUBFPL, SUBFPL, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFLS, SUBFLS, SUBFLS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFGT, SUBFGT, SUBFGT, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFLE, SUBFLE, SUBFLE, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFHI, SUBFHI, SUBFHI, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFVS, SUBFVS, SUBFVS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFVC, SUBFVC, SUBFVC, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFQS, SUBFQS, SUBFQS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFAL, SUBFAL, SUBFAL, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFHS, SUBFHS, SUBFCC, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(SUBFLO, SUBFLO, SUBFCS, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL3(SUBHH_W, SUBHH_W, SUBHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
++    SYNTAX_NORMAL1(SWAP_B, SWAP_B, SWAP_B, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SWAP_BH, SWAP_BH, SWAP_BH, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SWAP_H, SWAP_H, SWAP_H, INTREG, AVR32_V1),
++    SYNTAX_NORMAL1(SYNC, SYNC, SYNC, UNSIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL0(TLBR, TLBR, TLBR, AVR32_V1),
++    SYNTAX_NORMAL0(TLBS, TLBS, TLBS, AVR32_V1),
++    SYNTAX_NORMAL0(TLBW, TLBW, TLBW, AVR32_V1),
++    SYNTAX_NORMAL1(TNBZ, TNBZ, TNBZ, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(TST, TST, TST, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL3(XCHG, XCHG, XCHG, INTREG, INTREG, INTREG, AVR32_V1),
++    SYNTAX_NORMAL2(MEMC, MEMC, MEMC, SIGNED_CONST_W, UNSIGNED_NUMBER, AVR32_RMW),
++    SYNTAX_NORMAL2(MEMS, MEMS, MEMS, SIGNED_CONST_W, UNSIGNED_NUMBER, AVR32_RMW),
++    SYNTAX_NORMAL2(MEMT, MEMT, MEMT, SIGNED_CONST_W, UNSIGNED_NUMBER, AVR32_RMW),
++  SYNTAX_NORMAL4 (FMAC_S,  FMAC_S,  FMAC_S,  INTREG, INTREG, INTREG, INTREG,
++                  AVR32_V3FP),
++  SYNTAX_NORMAL4 (FNMAC_S, FNMAC_S, FNMAC_S, INTREG, INTREG, INTREG, INTREG, 
++                  AVR32_V3FP),
++  SYNTAX_NORMAL4 (FMSC_S,  FMSC_S,  FMSC_S,  INTREG, INTREG, INTREG, INTREG, 
++                  AVR32_V3FP),
++  SYNTAX_NORMAL4 (FNMSC_S, FNMSC_S, FNMSC_S, INTREG, INTREG, INTREG, INTREG, 
++                  AVR32_V3FP),
++  SYNTAX_NORMAL3 (FMUL_S,  FMUL_S,  FMUL_S,  INTREG, INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL3 (FNMUL_S, FNMUL_S, FNMUL_S, INTREG, INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL3 (FADD_S,  FADD_S,  FADD_S,  INTREG, INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL3 (FSUB_S,  FSUB_S,  FSUB_S,  INTREG, INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL2 (FCASTRS_SW, FCASTRS_SW, FCASTRS_SW, INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL2 (FCASTRS_UW, FCASTRS_UW, FCASTRS_UW, INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL2 (FCASTSW_S,  FCASTSW_S,  FCASTSW_S,  INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL2 (FCASTUW_S,  FCASTUW_S,  FCASTUW_S,  INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL2 (FCMP_S, FCMP_S, FCMP_S, INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL1 (FCHK_S, FCHK_S, FCHK_S, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL2 (FRCPA_S,   FRCPA_S,   FRCPA_S,   INTREG, INTREG, AVR32_V3FP),
++  SYNTAX_NORMAL2 (FRSQRTA_S, FRSQRTA_S, FRSQRTA_S, INTREG, INTREG, AVR32_V3FP),
++    {
++      AVR32_SYNTAX_LDA_W,
++      AVR32_V1, NULL, AVR32_PARSER_LDA,
++      { NULL }, NULL,
++      2,
++      {
++	AVR32_OPERAND_INTREG,
++	AVR32_OPERAND_SIGNED_CONST,
++      },
++    },
++    {
++      AVR32_SYNTAX_CALL,
++      AVR32_V1, NULL, AVR32_PARSER_CALL,
++      { NULL }, NULL,
++      1,
++      {
++	AVR32_OPERAND_JMPLABEL,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMAC0,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC0] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMAC1], 4,
++      {
++	AVR32_OPERAND_PICO_OUT0,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMAC1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC1] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMAC2], 4,
++      {
++	AVR32_OPERAND_PICO_OUT1,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMAC2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMAC3], 4,
++      {
++	AVR32_OPERAND_PICO_OUT2,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMAC3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC3] },
++      NULL, 4,
++      {
++	AVR32_OPERAND_PICO_OUT3,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMUL0,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL0] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMUL1], 4,
++      {
++	AVR32_OPERAND_PICO_OUT0,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMUL1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL1] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMUL2], 4,
++      {
++	AVR32_OPERAND_PICO_OUT1,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMUL2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMUL3], 4,
++      {
++	AVR32_OPERAND_PICO_OUT2,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSVMUL3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL3] },
++      NULL, 4,
++      {
++	AVR32_OPERAND_PICO_OUT3,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMAC0,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC0] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOVMAC1], 4,
++      {
++	AVR32_OPERAND_PICO_OUT0,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMAC1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC1] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOVMAC2], 4,
++      {
++	AVR32_OPERAND_PICO_OUT1,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMAC2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOVMAC3], 4,
++      {
++	AVR32_OPERAND_PICO_OUT2,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMAC3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC3] },
++      NULL, 4,
++      {
++	AVR32_OPERAND_PICO_OUT3,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMUL0,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL0] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOVMUL1], 4,
++      {
++	AVR32_OPERAND_PICO_OUT0,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMUL1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL1] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOVMUL2], 4,
++      {
++	AVR32_OPERAND_PICO_OUT1,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMUL2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOVMUL3], 4,
++      {
++	AVR32_OPERAND_PICO_OUT2,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOVMUL3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL3] },
++      NULL, 4,
++      {
++	AVR32_OPERAND_PICO_OUT3,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++	AVR32_OPERAND_PICO_IN,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLD_D2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_D2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_D3], 2,
++      {
++	AVR32_OPERAND_PICO_REG_D,
++	AVR32_OPERAND_INTREG_PREDEC,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLD_D3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_D3] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_D1], 2,
++      {
++	AVR32_OPERAND_PICO_REG_D,
++	AVR32_OPERAND_INTREG_INDEX,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLD_D1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_D1] },
++      NULL, 2,
++      {
++	AVR32_OPERAND_PICO_REG_D,
++	AVR32_OPERAND_INTREG_UDISP_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLD_W2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_W2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_W3], 2,
++      {
++	AVR32_OPERAND_PICO_REG_W,
++	AVR32_OPERAND_INTREG_PREDEC,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLD_W3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_W3] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_W1], 2,
++      {
++	AVR32_OPERAND_PICO_REG_W,
++	AVR32_OPERAND_INTREG_INDEX,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLD_W1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_W1] },
++      NULL, 2,
++      {
++	AVR32_OPERAND_PICO_REG_W,
++	AVR32_OPERAND_INTREG_UDISP_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLDM_D,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_D] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOLDM_D_PU], -2,
++      {
++	AVR32_OPERAND_INTREG,
++	AVR32_OPERAND_PICO_REGLIST_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLDM_D_PU,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_D_PU] },
++      NULL, -2,
++      {
++	AVR32_OPERAND_INTREG_POSTINC,
++	AVR32_OPERAND_PICO_REGLIST_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLDM_W,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_W] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOLDM_W_PU], -2,
++      {
++	AVR32_OPERAND_INTREG,
++	AVR32_OPERAND_PICO_REGLIST_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOLDM_W_PU,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_W_PU] },
++      NULL, -2,
++      {
++	AVR32_OPERAND_INTREG_POSTINC,
++	AVR32_OPERAND_PICO_REGLIST_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOMV_D1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_D1] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOMV_D2], 2,
++      {
++	AVR32_OPERAND_DWREG,
++	AVR32_OPERAND_PICO_REG_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOMV_D2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_D2] },
++      NULL, 2,
++      {
++	AVR32_OPERAND_PICO_REG_D,
++	AVR32_OPERAND_DWREG,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOMV_W1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_W1] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOMV_W2], 2,
++      {
++	AVR32_OPERAND_INTREG,
++	AVR32_OPERAND_PICO_REG_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOMV_W2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_W2] },
++      NULL, 2,
++      {
++	AVR32_OPERAND_PICO_REG_W,
++	AVR32_OPERAND_INTREG,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOST_D2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_D2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOST_D3], 2,
++      {
++	AVR32_OPERAND_INTREG_POSTINC,
++	AVR32_OPERAND_PICO_REG_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOST_D3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_D3] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOST_D1], 2,
++      {
++	AVR32_OPERAND_INTREG_INDEX,
++	AVR32_OPERAND_PICO_REG_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOST_D1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_D1] },
++      NULL, 2,
++      {
++	AVR32_OPERAND_INTREG_UDISP_W,
++	AVR32_OPERAND_PICO_REG_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOST_W2,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_W2] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOST_W3], 2,
++      {
++	AVR32_OPERAND_INTREG_POSTINC,
++	AVR32_OPERAND_PICO_REG_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOST_W3,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_W3] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOST_W1], 2,
++      {
++	AVR32_OPERAND_INTREG_INDEX,
++	AVR32_OPERAND_PICO_REG_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOST_W1,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_W1] },
++      NULL, 2,
++      {
++	AVR32_OPERAND_INTREG_UDISP_W,
++	AVR32_OPERAND_PICO_REG_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSTM_D,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_D] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSTM_D_PU], -2,
++      {
++	AVR32_OPERAND_INTREG,
++	AVR32_OPERAND_PICO_REGLIST_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSTM_D_PU,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_D], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_D_PU] },
++      NULL, -2,
++      {
++	AVR32_OPERAND_INTREG_PREDEC,
++	AVR32_OPERAND_PICO_REGLIST_D,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSTM_W,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_W] },
++      &avr32_syntax_table[AVR32_SYNTAX_PICOSTM_W_PU], -2,
++      {
++	AVR32_OPERAND_INTREG,
++	AVR32_OPERAND_PICO_REGLIST_W,
++      },
++    },
++    {
++      AVR32_SYNTAX_PICOSTM_W_PU,
++      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_W], AVR32_PARSER_ALIAS,
++      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_W_PU] },
++      NULL, -2,
++      {
++	AVR32_OPERAND_INTREG_PREDEC,
++	AVR32_OPERAND_PICO_REGLIST_W,
++      },
++    },
++    SYNTAX_NORMAL2(RSUBEQ, RSUBEQ, RSUBEQ, INTREG, SIGNED_CONST, AVR32_V1),
++    SYNTAX_NORMAL2(RSUBNE, RSUBNE, RSUBNE, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBCC, RSUBCC, RSUBCC, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBCS, RSUBCS, RSUBCS, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBGE, RSUBGE, RSUBGE, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBLT, RSUBLT, RSUBLT, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBMI, RSUBMI, RSUBMI, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBPL, RSUBPL, RSUBPL, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBLS, RSUBLS, RSUBLS, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBGT, RSUBGT, RSUBGT, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBLE, RSUBLE, RSUBLE, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBHI, RSUBHI, RSUBHI, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBVS, RSUBVS, RSUBVS, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBVC, RSUBVC, RSUBVC, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBQS, RSUBQS, RSUBQS, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBAL, RSUBAL, RSUBAL, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBHS, RSUBHS, RSUBCC, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL2(RSUBLO, RSUBLO, RSUBCS, INTREG, SIGNED_CONST, AVR32_V2),
++    SYNTAX_NORMAL3(ADDEQ, ADDEQ, ADDEQ, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDNE, ADDNE, ADDNE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDCC, ADDCC, ADDCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDCS, ADDCS, ADDCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDGE, ADDGE, ADDGE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDLT, ADDLT, ADDLT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDMI, ADDMI, ADDMI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDPL, ADDPL, ADDPL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDLS, ADDLS, ADDLS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDGT, ADDGT, ADDGT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDLE, ADDLE, ADDLE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDHI, ADDHI, ADDHI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDVS, ADDVS, ADDVS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDVC, ADDVC, ADDVC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDQS, ADDQS, ADDQS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDAL, ADDAL, ADDAL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDHS, ADDHS, ADDCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ADDLO, ADDLO, ADDCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2EQ, SUBEQ, SUB2EQ, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2NE, SUBNE, SUB2NE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2CC, SUBCC, SUB2CC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2CS, SUBCS, SUB2CS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2GE, SUBGE, SUB2GE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2LT, SUBLT, SUB2LT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2MI, SUBMI, SUB2MI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2PL, SUBPL, SUB2PL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2LS, SUBLS, SUB2LS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2GT, SUBGT, SUB2GT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2LE, SUBLE, SUB2LE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2HI, SUBHI, SUB2HI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2VS, SUBVS, SUB2VS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2VC, SUBVC, SUB2VC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2QS, SUBQS, SUB2QS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2AL, SUBAL, SUB2AL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2HS, SUBHS, SUB2CC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(SUB2LO, SUBLO, SUB2CS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDEQ, ANDEQ, ANDEQ, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDNE, ANDNE, ANDNE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDCC, ANDCC, ANDCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDCS, ANDCS, ANDCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDGE, ANDGE, ANDGE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDLT, ANDLT, ANDLT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDMI, ANDMI, ANDMI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDPL, ANDPL, ANDPL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDLS, ANDLS, ANDLS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDGT, ANDGT, ANDGT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDLE, ANDLE, ANDLE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDHI, ANDHI, ANDHI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDVS, ANDVS, ANDVS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDVC, ANDVC, ANDVC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDQS, ANDQS, ANDQS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDAL, ANDAL, ANDAL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDHS, ANDHS, ANDCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ANDLO, ANDLO, ANDCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(OREQ, OREQ, OREQ, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORNE, ORNE, ORNE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORCC, ORCC, ORCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORCS, ORCS, ORCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORGE, ORGE, ORGE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORLT, ORLT, ORLT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORMI, ORMI, ORMI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORPL, ORPL, ORPL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORLS, ORLS, ORLS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORGT, ORGT, ORGT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORLE, ORLE, ORLE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORHI, ORHI, ORHI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORVS, ORVS, ORVS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORVC, ORVC, ORVC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORQS, ORQS, ORQS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORAL, ORAL, ORAL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORHS, ORHS, ORCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(ORLO, ORLO, ORCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EOREQ, EOREQ, EOREQ, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORNE, EORNE, EORNE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORCC, EORCC, EORCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORCS, EORCS, EORCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORGE, EORGE, EORGE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORLT, EORLT, EORLT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORMI, EORMI, EORMI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORPL, EORPL, EORPL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORLS, EORLS, EORLS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORGT, EORGT, EORGT, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORLE, EORLE, EORLE, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORHI, EORHI, EORHI, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORVS, EORVS, EORVS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORVC, EORVC, EORVC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORQS, EORQS, EORQS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORAL, EORAL, EORAL, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORHS, EORHS, EORCC, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL3(EORLO, EORLO, EORCS, INTREG, INTREG, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WEQ, LD_WEQ, LD_WEQ, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WNE, LD_WNE, LD_WNE, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WCC, LD_WCC, LD_WCC, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WCS, LD_WCS, LD_WCS, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WGE, LD_WGE, LD_WGE, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WLT, LD_WLT, LD_WLT, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WMI, LD_WMI, LD_WMI, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WPL, LD_WPL, LD_WPL, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WLS, LD_WLS, LD_WLS, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WGT, LD_WGT, LD_WGT, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WLE, LD_WLE, LD_WLE, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WHI, LD_WHI, LD_WHI, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WVS, LD_WVS, LD_WVS, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WVC, LD_WVC, LD_WVC, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WQS, LD_WQS, LD_WQS, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WAL, LD_WAL, LD_WAL, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WHS, LD_WHS, LD_WCC, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_WLO, LD_WLO, LD_WCS, INTREG, INTREG_UDISP_W, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHEQ, LD_SHEQ, LD_SHEQ, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHNE, LD_SHNE, LD_SHNE, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHCC, LD_SHCC, LD_SHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHCS, LD_SHCS, LD_SHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHGE, LD_SHGE, LD_SHGE, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHLT, LD_SHLT, LD_SHLT, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHMI, LD_SHMI, LD_SHMI, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHPL, LD_SHPL, LD_SHPL, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHLS, LD_SHLS, LD_SHLS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHGT, LD_SHGT, LD_SHGT, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHLE, LD_SHLE, LD_SHLE, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHHI, LD_SHHI, LD_SHHI, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHVS, LD_SHVS, LD_SHVS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHVC, LD_SHVC, LD_SHVC, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHQS, LD_SHQS, LD_SHQS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHAL, LD_SHAL, LD_SHAL, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHHS, LD_SHHS, LD_SHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SHLO, LD_SHLO, LD_SHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHEQ, LD_UHEQ, LD_UHEQ, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHNE, LD_UHNE, LD_UHNE, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHCC, LD_UHCC, LD_UHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHCS, LD_UHCS, LD_UHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHGE, LD_UHGE, LD_UHGE, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHLT, LD_UHLT, LD_UHLT, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHMI, LD_UHMI, LD_UHMI, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHPL, LD_UHPL, LD_UHPL, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHLS, LD_UHLS, LD_UHLS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHGT, LD_UHGT, LD_UHGT, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHLE, LD_UHLE, LD_UHLE, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHHI, LD_UHHI, LD_UHHI, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHVS, LD_UHVS, LD_UHVS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHVC, LD_UHVC, LD_UHVC, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHQS, LD_UHQS, LD_UHQS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHAL, LD_UHAL, LD_UHAL, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHHS, LD_UHHS, LD_UHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UHLO, LD_UHLO, LD_UHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBEQ, LD_SBEQ, LD_SBEQ, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBNE, LD_SBNE, LD_SBNE, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBCC, LD_SBCC, LD_SBCC, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBCS, LD_SBCS, LD_SBCS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBGE, LD_SBGE, LD_SBGE, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBLT, LD_SBLT, LD_SBLT, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBMI, LD_SBMI, LD_SBMI, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBPL, LD_SBPL, LD_SBPL, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBLS, LD_SBLS, LD_SBLS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBGT, LD_SBGT, LD_SBGT, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBLE, LD_SBLE, LD_SBLE, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBHI, LD_SBHI, LD_SBHI, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBVS, LD_SBVS, LD_SBVS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBVC, LD_SBVC, LD_SBVC, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBQS, LD_SBQS, LD_SBQS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBAL, LD_SBAL, LD_SBAL, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBHS, LD_SBHS, LD_SBCC, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_SBLO, LD_SBLO, LD_SBCS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBEQ, LD_UBEQ, LD_UBEQ, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBNE, LD_UBNE, LD_UBNE, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBCC, LD_UBCC, LD_UBCC, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBCS, LD_UBCS, LD_UBCS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBGE, LD_UBGE, LD_UBGE, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBLT, LD_UBLT, LD_UBLT, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBMI, LD_UBMI, LD_UBMI, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBPL, LD_UBPL, LD_UBPL, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBLS, LD_UBLS, LD_UBLS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBGT, LD_UBGT, LD_UBGT, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBLE, LD_UBLE, LD_UBLE, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBHI, LD_UBHI, LD_UBHI, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBVS, LD_UBVS, LD_UBVS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBVC, LD_UBVC, LD_UBVC, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBQS, LD_UBQS, LD_UBQS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBAL, LD_UBAL, LD_UBAL, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBHS, LD_UBHS, LD_UBCC, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(LD_UBLO, LD_UBLO, LD_UBCS, INTREG, INTREG_UDISP, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WEQ, ST_WEQ, ST_WEQ, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WNE, ST_WNE, ST_WNE, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WCC, ST_WCC, ST_WCC, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WCS, ST_WCS, ST_WCS, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WGE, ST_WGE, ST_WGE, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WLT, ST_WLT, ST_WLT, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WMI, ST_WMI, ST_WMI, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WPL, ST_WPL, ST_WPL, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WLS, ST_WLS, ST_WLS, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WGT, ST_WGT, ST_WGT, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WLE, ST_WLE, ST_WLE, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WHI, ST_WHI, ST_WHI, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WVS, ST_WVS, ST_WVS, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WVC, ST_WVC, ST_WVC, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WQS, ST_WQS, ST_WQS, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WAL, ST_WAL, ST_WAL, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WHS, ST_WHS, ST_WCC, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_WLO, ST_WLO, ST_WCS, INTREG_UDISP_W, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HEQ, ST_HEQ, ST_HEQ, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HNE, ST_HNE, ST_HNE, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HCC, ST_HCC, ST_HCC, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HCS, ST_HCS, ST_HCS, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HGE, ST_HGE, ST_HGE, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HLT, ST_HLT, ST_HLT, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HMI, ST_HMI, ST_HMI, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HPL, ST_HPL, ST_HPL, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HLS, ST_HLS, ST_HLS, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HGT, ST_HGT, ST_HGT, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HLE, ST_HLE, ST_HLE, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HHI, ST_HHI, ST_HHI, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HVS, ST_HVS, ST_HVS, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HVC, ST_HVC, ST_HVC, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HQS, ST_HQS, ST_HQS, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HAL, ST_HAL, ST_HAL, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HHS, ST_HHS, ST_HCC, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_HLO, ST_HLO, ST_HCS, INTREG_UDISP_H, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BEQ, ST_BEQ, ST_BEQ, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BNE, ST_BNE, ST_BNE, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BCC, ST_BCC, ST_BCC, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BCS, ST_BCS, ST_BCS, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BGE, ST_BGE, ST_BGE, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BLT, ST_BLT, ST_BLT, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BMI, ST_BMI, ST_BMI, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BPL, ST_BPL, ST_BPL, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BLS, ST_BLS, ST_BLS, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BGT, ST_BGT, ST_BGT, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BLE, ST_BLE, ST_BLE, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BHI, ST_BHI, ST_BHI, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BVS, ST_BVS, ST_BVS, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BVC, ST_BVC, ST_BVC, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BQS, ST_BQS, ST_BQS, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BAL, ST_BAL, ST_BAL, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BHS, ST_BHS, ST_BCC, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(ST_BLO, ST_BLO, ST_BCS, INTREG_UDISP, INTREG, AVR32_V2),
++    SYNTAX_NORMAL2(MOVH, MOVH, MOVH, INTREG, UNSIGNED_CONST, AVR32_V2),
++
++  };
++
++#define NORMAL_MNEMONIC(name, syntax, str)		\
++  {							\
++    AVR32_MNEMONIC_##name, str,				\
++    &avr32_syntax_table[AVR32_SYNTAX_##syntax],		\
++  }
++#define FP_MNEMONIC(name, syntax, str)			\
++  NORMAL_MNEMONIC(name##_S, syntax##_S, str ".s"),	\
++  NORMAL_MNEMONIC(name##_D, syntax##_D, str ".d")
++
++const struct avr32_mnemonic avr32_mnemonic_table[] =
++  {
++    NORMAL_MNEMONIC(ABS, ABS, "abs"),
++    NORMAL_MNEMONIC(ACALL, ACALL, "acall"),
++    NORMAL_MNEMONIC(ACR, ACR, "acr"),
++    NORMAL_MNEMONIC(ADC, ADC, "adc"),
++    NORMAL_MNEMONIC(ADD, ADD1, "add"),
++    NORMAL_MNEMONIC(ADDABS, ADDABS, "addabs"),
++    NORMAL_MNEMONIC(ADDHH_W, ADDHH_W, "addhh.w"),
++    NORMAL_MNEMONIC(AND, AND1, "and"),
++    NORMAL_MNEMONIC(ANDH, ANDH, "andh"),
++    NORMAL_MNEMONIC(ANDL, ANDL, "andl"),
++    NORMAL_MNEMONIC(ANDN, ANDN, "andn"),
++    NORMAL_MNEMONIC(ASR, ASR1, "asr"),
++    NORMAL_MNEMONIC(BFEXTS, BFEXTS, "bfexts"),
++    NORMAL_MNEMONIC(BFEXTU, BFEXTU, "bfextu"),
++    NORMAL_MNEMONIC(BFINS, BFINS, "bfins"),
++    NORMAL_MNEMONIC(BLD, BLD, "bld"),
++    NORMAL_MNEMONIC(BREQ, BREQ1, "breq"),
++    NORMAL_MNEMONIC(BRNE, BRNE1, "brne"),
++    NORMAL_MNEMONIC(BRCC, BRCC1, "brcc"),
++    NORMAL_MNEMONIC(BRCS, BRCS1, "brcs"),
++    NORMAL_MNEMONIC(BRGE, BRGE1, "brge"),
++    NORMAL_MNEMONIC(BRLT, BRLT1, "brlt"),
++    NORMAL_MNEMONIC(BRMI, BRMI1, "brmi"),
++    NORMAL_MNEMONIC(BRPL, BRPL1, "brpl"),
++    NORMAL_MNEMONIC(BRHS, BRHS1, "brhs"),
++    NORMAL_MNEMONIC(BRLO, BRLO1, "brlo"),
++    NORMAL_MNEMONIC(BRLS, BRLS, "brls"),
++    NORMAL_MNEMONIC(BRGT, BRGT, "brgt"),
++    NORMAL_MNEMONIC(BRLE, BRLE, "brle"),
++    NORMAL_MNEMONIC(BRHI, BRHI, "brhi"),
++    NORMAL_MNEMONIC(BRVS, BRVS, "brvs"),
++    NORMAL_MNEMONIC(BRVC, BRVC, "brvc"),
++    NORMAL_MNEMONIC(BRQS, BRQS, "brqs"),
++    NORMAL_MNEMONIC(BRAL, BRAL, "bral"),
++    NORMAL_MNEMONIC(BREAKPOINT, BREAKPOINT, "breakpoint"),
++    NORMAL_MNEMONIC(BREV, BREV, "brev"),
++    NORMAL_MNEMONIC(BST, BST, "bst"),
++    NORMAL_MNEMONIC(CACHE, CACHE, "cache"),
++    NORMAL_MNEMONIC(CASTS_B, CASTS_B, "casts.b"),
++    NORMAL_MNEMONIC(CASTS_H, CASTS_H, "casts.h"),
++    NORMAL_MNEMONIC(CASTU_B, CASTU_B, "castu.b"),
++    NORMAL_MNEMONIC(CASTU_H, CASTU_H, "castu.h"),
++    NORMAL_MNEMONIC(CBR, CBR, "cbr"),
++    NORMAL_MNEMONIC(CLZ, CLZ, "clz"),
++    NORMAL_MNEMONIC(COM, COM, "com"),
++    NORMAL_MNEMONIC(COP, COP, "cop"),
++    NORMAL_MNEMONIC(CP_B, CP_B, "cp.b"),
++    NORMAL_MNEMONIC(CP_H, CP_H, "cp.h"),
++    NORMAL_MNEMONIC(CP_W, CP_W1, "cp.w"),
++    NORMAL_MNEMONIC(CP, CP_W1, "cp"),
++    NORMAL_MNEMONIC(CPC, CPC1, "cpc"),
++    NORMAL_MNEMONIC(CSRF, CSRF, "csrf"),
++    NORMAL_MNEMONIC(CSRFCZ, CSRFCZ, "csrfcz"),
++    NORMAL_MNEMONIC(DIVS, DIVS, "divs"),
++    NORMAL_MNEMONIC(DIVU, DIVU, "divu"),
++    NORMAL_MNEMONIC(EOR, EOR1, "eor"),
++    NORMAL_MNEMONIC(EORL, EORL, "eorl"),
++    NORMAL_MNEMONIC(EORH, EORH, "eorh"),
++    NORMAL_MNEMONIC(FRS, FRS, "frs"),
++    NORMAL_MNEMONIC(SSCALL, SSCALL, "sscall"),
++    NORMAL_MNEMONIC(RETSS, RETSS, "retss"),
++    NORMAL_MNEMONIC(ICALL, ICALL, "icall"),
++    NORMAL_MNEMONIC(INCJOSP, INCJOSP, "incjosp"),
++    NORMAL_MNEMONIC(LD_D, LD_D1, "ld.d"),
++    NORMAL_MNEMONIC(LD_SB, LD_SB2, "ld.sb"),
++    NORMAL_MNEMONIC(LD_UB, LD_UB1, "ld.ub"),
++    NORMAL_MNEMONIC(LD_SH, LD_SH1, "ld.sh"),
++    NORMAL_MNEMONIC(LD_UH, LD_UH1, "ld.uh"),
++    NORMAL_MNEMONIC(LD_W, LD_W1, "ld.w"),
++    NORMAL_MNEMONIC(LDC_D, LDC_D3, "ldc.d"),
++    NORMAL_MNEMONIC(LDC_W, LDC_W3, "ldc.w"),
++    NORMAL_MNEMONIC(LDC0_D, LDC0_D, "ldc0.d"),
++    NORMAL_MNEMONIC(LDC0_W, LDC0_W, "ldc0.w"),
++    NORMAL_MNEMONIC(LDCM_D, LDCM_D, "ldcm.d"),
++    NORMAL_MNEMONIC(LDCM_W, LDCM_W, "ldcm.w"),
++    NORMAL_MNEMONIC(LDDPC, LDDPC, "lddpc"),
++    NORMAL_MNEMONIC(LDDSP, LDDSP, "lddsp"),
++    NORMAL_MNEMONIC(LDINS_B, LDINS_B, "ldins.b"),
++    NORMAL_MNEMONIC(LDINS_H, LDINS_H, "ldins.h"),
++    NORMAL_MNEMONIC(LDM, LDM, "ldm"),
++    NORMAL_MNEMONIC(LDMTS, LDMTS, "ldmts"),
++    NORMAL_MNEMONIC(LDSWP_SH, LDSWP_SH, "ldswp.sh"),
++    NORMAL_MNEMONIC(LDSWP_UH, LDSWP_UH, "ldswp.uh"),
++    NORMAL_MNEMONIC(LDSWP_W, LDSWP_W, "ldswp.w"),
++    NORMAL_MNEMONIC(LSL, LSL1, "lsl"),
++    NORMAL_MNEMONIC(LSR, LSR1, "lsr"),
++    NORMAL_MNEMONIC(MAC, MAC, "mac"),
++    NORMAL_MNEMONIC(MACHH_D, MACHH_D, "machh.d"),
++    NORMAL_MNEMONIC(MACHH_W, MACHH_W, "machh.w"),
++    NORMAL_MNEMONIC(MACS_D, MACS_D, "macs.d"),
++    NORMAL_MNEMONIC(MACSATHH_W, MACSATHH_W, "macsathh.w"),
++    NORMAL_MNEMONIC(MACU_D, MACUD, "macu.d"),
++    NORMAL_MNEMONIC(MACWH_D, MACWH_D, "macwh.d"),
++    NORMAL_MNEMONIC(MAX, MAX, "max"),
++    NORMAL_MNEMONIC(MCALL, MCALL, "mcall"),
++    NORMAL_MNEMONIC(MFDR, MFDR, "mfdr"),
++    NORMAL_MNEMONIC(MFSR, MFSR, "mfsr"),
++    NORMAL_MNEMONIC(MIN, MIN, "min"),
++    NORMAL_MNEMONIC(MOV, MOV3, "mov"),
++    NORMAL_MNEMONIC(MOVEQ, MOVEQ1, "moveq"),
++    NORMAL_MNEMONIC(MOVNE, MOVNE1, "movne"),
++    NORMAL_MNEMONIC(MOVCC, MOVCC1, "movcc"),
++    NORMAL_MNEMONIC(MOVCS, MOVCS1, "movcs"),
++    NORMAL_MNEMONIC(MOVGE, MOVGE1, "movge"),
++    NORMAL_MNEMONIC(MOVLT, MOVLT1, "movlt"),
++    NORMAL_MNEMONIC(MOVMI, MOVMI1, "movmi"),
++    NORMAL_MNEMONIC(MOVPL, MOVPL1, "movpl"),
++    NORMAL_MNEMONIC(MOVLS, MOVLS1, "movls"),
++    NORMAL_MNEMONIC(MOVGT, MOVGT1, "movgt"),
++    NORMAL_MNEMONIC(MOVLE, MOVLE1, "movle"),
++    NORMAL_MNEMONIC(MOVHI, MOVHI1, "movhi"),
++    NORMAL_MNEMONIC(MOVVS, MOVVS1, "movvs"),
++    NORMAL_MNEMONIC(MOVVC, MOVVC1, "movvc"),
++    NORMAL_MNEMONIC(MOVQS, MOVQS1, "movqs"),
++    NORMAL_MNEMONIC(MOVAL, MOVAL1, "moval"),
++    NORMAL_MNEMONIC(MOVHS, MOVHS1, "movhs"),
++    NORMAL_MNEMONIC(MOVLO, MOVLO1, "movlo"),
++    NORMAL_MNEMONIC(MTDR, MTDR, "mtdr"),
++    NORMAL_MNEMONIC(MTSR, MTSR, "mtsr"),
++    NORMAL_MNEMONIC(MUL, MUL1, "mul"),
++    NORMAL_MNEMONIC(MULHH_W, MULHH_W, "mulhh.w"),
++    NORMAL_MNEMONIC(MULNHH_W, MULNHH_W, "mulnhh.w"),
++    NORMAL_MNEMONIC(MULNWH_D, MULNWH_D, "mulnwh.d"),
++    NORMAL_MNEMONIC(MULS_D, MULSD, "muls.d"),
++    NORMAL_MNEMONIC(MULSATHH_H, MULSATHH_H, "mulsathh.h"),
++    NORMAL_MNEMONIC(MULSATHH_W, MULSATHH_W, "mulsathh.w"),
++    NORMAL_MNEMONIC(MULSATRNDHH_H, MULSATRNDHH_H, "mulsatrndhh.h"),
++    NORMAL_MNEMONIC(MULSATRNDWH_W, MULSATRNDWH_W, "mulsatrndwh.w"),
++    NORMAL_MNEMONIC(MULSATWH_W, MULSATWH_W, "mulsatwh.w"),
++    NORMAL_MNEMONIC(MULU_D, MULU_D, "mulu.d"),
++    NORMAL_MNEMONIC(MULWH_D, MULWH_D, "mulwh.d"),
++    NORMAL_MNEMONIC(MUSFR, MUSFR, "musfr"),
++    NORMAL_MNEMONIC(MUSTR, MUSTR, "mustr"),
++    NORMAL_MNEMONIC(MVCR_D, MVCR_D, "mvcr.d"),
++    NORMAL_MNEMONIC(MVCR_W, MVCR_W, "mvcr.w"),
++    NORMAL_MNEMONIC(MVRC_D, MVRC_D, "mvrc.d"),
++    NORMAL_MNEMONIC(MVRC_W, MVRC_W, "mvrc.w"),
++    NORMAL_MNEMONIC(NEG, NEG, "neg"),
++    NORMAL_MNEMONIC(NOP, NOP, "nop"),
++    NORMAL_MNEMONIC(OR, OR1, "or"),
++    NORMAL_MNEMONIC(ORH, ORH, "orh"),
++    NORMAL_MNEMONIC(ORL, ORL, "orl"),
++    NORMAL_MNEMONIC(PABS_SB, PABS_SB, "pabs.sb"),
++    NORMAL_MNEMONIC(PABS_SH, PABS_SH, "pabs.sh"),
++    NORMAL_MNEMONIC(PACKSH_SB, PACKSH_SB, "packsh.sb"),
++    NORMAL_MNEMONIC(PACKSH_UB, PACKSH_UB, "packsh.ub"),
++    NORMAL_MNEMONIC(PACKW_SH, PACKW_SH, "packw.sh"),
++    NORMAL_MNEMONIC(PADD_B, PADD_B, "padd.b"),
++    NORMAL_MNEMONIC(PADD_H, PADD_H, "padd.h"),
++    NORMAL_MNEMONIC(PADDH_SH, PADDH_SH, "paddh.sh"),
++    NORMAL_MNEMONIC(PADDH_UB, PADDH_UB, "paddh.ub"),
++    NORMAL_MNEMONIC(PADDS_SB, PADDS_SB, "padds.sb"),
++    NORMAL_MNEMONIC(PADDS_SH, PADDS_SH, "padds.sh"),
++    NORMAL_MNEMONIC(PADDS_UB, PADDS_UB, "padds.ub"),
++    NORMAL_MNEMONIC(PADDS_UH, PADDS_UH, "padds.uh"),
++    NORMAL_MNEMONIC(PADDSUB_H, PADDSUB_H, "paddsub.h"),
++    NORMAL_MNEMONIC(PADDSUBH_SH, PADDSUBH_SH, "paddsubh.sh"),
++    NORMAL_MNEMONIC(PADDSUBS_SH, PADDSUBS_SH, "paddsubs.sh"),
++    NORMAL_MNEMONIC(PADDSUBS_UH, PADDSUBS_UH, "paddsubs.uh"),
++    NORMAL_MNEMONIC(PADDX_H, PADDX_H, "paddx.h"),
++    NORMAL_MNEMONIC(PADDXH_SH, PADDXH_SH, "paddxh.sh"),
++    NORMAL_MNEMONIC(PADDXS_SH, PADDXS_SH, "paddxs.sh"),
++    NORMAL_MNEMONIC(PADDXS_UH, PADDXS_UH, "paddxs.uh"),
++    NORMAL_MNEMONIC(PASR_B, PASR_B, "pasr.b"),
++    NORMAL_MNEMONIC(PASR_H, PASR_H, "pasr.h"),
++    NORMAL_MNEMONIC(PAVG_SH, PAVG_SH, "pavg.sh"),
++    NORMAL_MNEMONIC(PAVG_UB, PAVG_UB, "pavg.ub"),
++    NORMAL_MNEMONIC(PLSL_B, PLSL_B, "plsl.b"),
++    NORMAL_MNEMONIC(PLSL_H, PLSL_H, "plsl.h"),
++    NORMAL_MNEMONIC(PLSR_B, PLSR_B, "plsr.b"),
++    NORMAL_MNEMONIC(PLSR_H, PLSR_H, "plsr.h"),
++    NORMAL_MNEMONIC(PMAX_SH, PMAX_SH, "pmax.sh"),
++    NORMAL_MNEMONIC(PMAX_UB, PMAX_UB, "pmax.ub"),
++    NORMAL_MNEMONIC(PMIN_SH, PMIN_SH, "pmin.sh"),
++    NORMAL_MNEMONIC(PMIN_UB, PMIN_UB, "pmin.ub"),
++    NORMAL_MNEMONIC(POPJC, POPJC, "popjc"),
++    NORMAL_MNEMONIC(POPM, POPM, "popm"),
++    NORMAL_MNEMONIC(PREF, PREF, "pref"),
++    NORMAL_MNEMONIC(PSAD, PSAD, "psad"),
++    NORMAL_MNEMONIC(PSUB_B, PSUB_B, "psub.b"),
++    NORMAL_MNEMONIC(PSUB_H, PSUB_H, "psub.h"),
++    NORMAL_MNEMONIC(PSUBADD_H, PSUBADD_H, "psubadd.h"),
++    NORMAL_MNEMONIC(PSUBADDH_SH, PSUBADDH_SH, "psubaddh.sh"),
++    NORMAL_MNEMONIC(PSUBADDS_SH, PSUBADDS_SH, "psubadds.sh"),
++    NORMAL_MNEMONIC(PSUBADDS_UH, PSUBADDS_UH, "psubadds.uh"),
++    NORMAL_MNEMONIC(PSUBH_SH, PSUBH_SH, "psubh.sh"),
++    NORMAL_MNEMONIC(PSUBH_UB, PSUBH_UB, "psubh.ub"),
++    NORMAL_MNEMONIC(PSUBS_SB, PSUBS_SB, "psubs.sb"),
++    NORMAL_MNEMONIC(PSUBS_SH, PSUBS_SH, "psubs.sh"),
++    NORMAL_MNEMONIC(PSUBS_UB, PSUBS_UB, "psubs.ub"),
++    NORMAL_MNEMONIC(PSUBS_UH, PSUBS_UH, "psubs.uh"),
++    NORMAL_MNEMONIC(PSUBX_H, PSUBX_H, "psubx.h"),
++    NORMAL_MNEMONIC(PSUBXH_SH, PSUBXH_SH, "psubxh.sh"),
++    NORMAL_MNEMONIC(PSUBXS_SH, PSUBXS_SH, "psubxs.sh"),
++    NORMAL_MNEMONIC(PSUBXS_UH, PSUBXS_UH, "psubxs.uh"),
++    NORMAL_MNEMONIC(PUNPCKSB_H, PUNPCKSB_H, "punpcksb.h"),
++    NORMAL_MNEMONIC(PUNPCKUB_H, PUNPCKUB_H, "punpckub.h"),
++    NORMAL_MNEMONIC(PUSHJC, PUSHJC, "pushjc"),
++    NORMAL_MNEMONIC(PUSHM, PUSHM, "pushm"),
++    NORMAL_MNEMONIC(RCALL, RCALL1, "rcall"),
++    NORMAL_MNEMONIC(RETEQ, RETEQ, "reteq"),
++    NORMAL_MNEMONIC(RETNE, RETNE, "retne"),
++    NORMAL_MNEMONIC(RETCC, RETCC, "retcc"),
++    NORMAL_MNEMONIC(RETCS, RETCS, "retcs"),
++    NORMAL_MNEMONIC(RETGE, RETGE, "retge"),
++    NORMAL_MNEMONIC(RETLT, RETLT, "retlt"),
++    NORMAL_MNEMONIC(RETMI, RETMI, "retmi"),
++    NORMAL_MNEMONIC(RETPL, RETPL, "retpl"),
++    NORMAL_MNEMONIC(RETLS, RETLS, "retls"),
++    NORMAL_MNEMONIC(RETGT, RETGT, "retgt"),
++    NORMAL_MNEMONIC(RETLE, RETLE, "retle"),
++    NORMAL_MNEMONIC(RETHI, RETHI, "rethi"),
++    NORMAL_MNEMONIC(RETVS, RETVS, "retvs"),
++    NORMAL_MNEMONIC(RETVC, RETVC, "retvc"),
++    NORMAL_MNEMONIC(RETQS, RETQS, "retqs"),
++    NORMAL_MNEMONIC(RETAL, RETAL, "retal"),
++    NORMAL_MNEMONIC(RETHS, RETHS, "reths"),
++    NORMAL_MNEMONIC(RETLO, RETLO, "retlo"),
++    NORMAL_MNEMONIC(RET, RETAL, "ret"),
++    NORMAL_MNEMONIC(RETD, RETD, "retd"),
++    NORMAL_MNEMONIC(RETE, RETE, "rete"),
++    NORMAL_MNEMONIC(RETJ, RETJ, "retj"),
++    NORMAL_MNEMONIC(RETS, RETS, "rets"),
++    NORMAL_MNEMONIC(RJMP, RJMP, "rjmp"),
++    NORMAL_MNEMONIC(ROL, ROL, "rol"),
++    NORMAL_MNEMONIC(ROR, ROR, "ror"),
++    NORMAL_MNEMONIC(RSUB, RSUB1, "rsub"),
++    NORMAL_MNEMONIC(SATADD_H, SATADD_H, "satadd.h"),
++    NORMAL_MNEMONIC(SATADD_W, SATADD_W, "satadd.w"),
++    NORMAL_MNEMONIC(SATRNDS, SATRNDS, "satrnds"),
++    NORMAL_MNEMONIC(SATRNDU, SATRNDU, "satrndu"),
++    NORMAL_MNEMONIC(SATS, SATS, "sats"),
++    NORMAL_MNEMONIC(SATSUB_H, SATSUB_H, "satsub.h"),
++    NORMAL_MNEMONIC(SATSUB_W, SATSUB_W1, "satsub.w"),
++    NORMAL_MNEMONIC(SATU, SATU, "satu"),
++    NORMAL_MNEMONIC(SBC, SBC, "sbc"),
++    NORMAL_MNEMONIC(SBR, SBR, "sbr"),
++    NORMAL_MNEMONIC(SCALL, SCALL, "scall"),
++    NORMAL_MNEMONIC(SCR, SCR, "scr"),
++    NORMAL_MNEMONIC(SLEEP, SLEEP, "sleep"),
++    NORMAL_MNEMONIC(SREQ, SREQ, "sreq"),
++    NORMAL_MNEMONIC(SRNE, SRNE, "srne"),
++    NORMAL_MNEMONIC(SRCC, SRCC, "srcc"),
++    NORMAL_MNEMONIC(SRCS, SRCS, "srcs"),
++    NORMAL_MNEMONIC(SRGE, SRGE, "srge"),
++    NORMAL_MNEMONIC(SRLT, SRLT, "srlt"),
++    NORMAL_MNEMONIC(SRMI, SRMI, "srmi"),
++    NORMAL_MNEMONIC(SRPL, SRPL, "srpl"),
++    NORMAL_MNEMONIC(SRLS, SRLS, "srls"),
++    NORMAL_MNEMONIC(SRGT, SRGT, "srgt"),
++    NORMAL_MNEMONIC(SRLE, SRLE, "srle"),
++    NORMAL_MNEMONIC(SRHI, SRHI, "srhi"),
++    NORMAL_MNEMONIC(SRVS, SRVS, "srvs"),
++    NORMAL_MNEMONIC(SRVC, SRVC, "srvc"),
++    NORMAL_MNEMONIC(SRQS, SRQS, "srqs"),
++    NORMAL_MNEMONIC(SRAL, SRAL, "sral"),
++    NORMAL_MNEMONIC(SRHS, SRHS, "srhs"),
++    NORMAL_MNEMONIC(SRLO, SRLO, "srlo"),
++    NORMAL_MNEMONIC(SSRF, SSRF, "ssrf"),
++    NORMAL_MNEMONIC(ST_B, ST_B1, "st.b"),
++    NORMAL_MNEMONIC(ST_D, ST_D1, "st.d"),
++    NORMAL_MNEMONIC(ST_H, ST_H1, "st.h"),
++    NORMAL_MNEMONIC(ST_W, ST_W1, "st.w"),
++    NORMAL_MNEMONIC(STC_D, STC_D3, "stc.d"),
++    NORMAL_MNEMONIC(STC_W, STC_W3, "stc.w"),
++    NORMAL_MNEMONIC(STC0_D, STC0_D, "stc0.d"),
++    NORMAL_MNEMONIC(STC0_W, STC0_W, "stc0.w"),
++    NORMAL_MNEMONIC(STCM_D, STCM_D, "stcm.d"),
++    NORMAL_MNEMONIC(STCM_W, STCM_W, "stcm.w"),
++    NORMAL_MNEMONIC(STCOND, STCOND, "stcond"),
++    NORMAL_MNEMONIC(STDSP, STDSP, "stdsp"),
++    NORMAL_MNEMONIC(STHH_W, STHH_W2, "sthh.w"),
++    NORMAL_MNEMONIC(STM, STM, "stm"),
++    NORMAL_MNEMONIC(STMTS, STMTS, "stmts"),
++    NORMAL_MNEMONIC(STSWP_H, STSWP_H, "stswp.h"),
++    NORMAL_MNEMONIC(STSWP_W, STSWP_W, "stswp.w"),
++    NORMAL_MNEMONIC(SUB, SUB1, "sub"),
++    NORMAL_MNEMONIC(SUBEQ, SUBEQ, "subeq"),
++    NORMAL_MNEMONIC(SUBNE, SUBNE, "subne"),
++    NORMAL_MNEMONIC(SUBCC, SUBCC, "subcc"),
++    NORMAL_MNEMONIC(SUBCS, SUBCS, "subcs"),
++    NORMAL_MNEMONIC(SUBGE, SUBGE, "subge"),
++    NORMAL_MNEMONIC(SUBLT, SUBLT, "sublt"),
++    NORMAL_MNEMONIC(SUBMI, SUBMI, "submi"),
++    NORMAL_MNEMONIC(SUBPL, SUBPL, "subpl"),
++    NORMAL_MNEMONIC(SUBLS, SUBLS, "subls"),
++    NORMAL_MNEMONIC(SUBGT, SUBGT, "subgt"),
++    NORMAL_MNEMONIC(SUBLE, SUBLE, "suble"),
++    NORMAL_MNEMONIC(SUBHI, SUBHI, "subhi"),
++    NORMAL_MNEMONIC(SUBVS, SUBVS, "subvs"),
++    NORMAL_MNEMONIC(SUBVC, SUBVC, "subvc"),
++    NORMAL_MNEMONIC(SUBQS, SUBQS, "subqs"),
++    NORMAL_MNEMONIC(SUBAL, SUBAL, "subal"),
++    NORMAL_MNEMONIC(SUBHS, SUBHS, "subhs"),
++    NORMAL_MNEMONIC(SUBLO, SUBLO, "sublo"),
++    NORMAL_MNEMONIC(SUBFEQ, SUBFEQ, "subfeq"),
++    NORMAL_MNEMONIC(SUBFNE, SUBFNE, "subfne"),
++    NORMAL_MNEMONIC(SUBFCC, SUBFCC, "subfcc"),
++    NORMAL_MNEMONIC(SUBFCS, SUBFCS, "subfcs"),
++    NORMAL_MNEMONIC(SUBFGE, SUBFGE, "subfge"),
++    NORMAL_MNEMONIC(SUBFLT, SUBFLT, "subflt"),
++    NORMAL_MNEMONIC(SUBFMI, SUBFMI, "subfmi"),
++    NORMAL_MNEMONIC(SUBFPL, SUBFPL, "subfpl"),
++    NORMAL_MNEMONIC(SUBFLS, SUBFLS, "subfls"),
++    NORMAL_MNEMONIC(SUBFGT, SUBFGT, "subfgt"),
++    NORMAL_MNEMONIC(SUBFLE, SUBFLE, "subfle"),
++    NORMAL_MNEMONIC(SUBFHI, SUBFHI, "subfhi"),
++    NORMAL_MNEMONIC(SUBFVS, SUBFVS, "subfvs"),
++    NORMAL_MNEMONIC(SUBFVC, SUBFVC, "subfvc"),
++    NORMAL_MNEMONIC(SUBFQS, SUBFQS, "subfqs"),
++    NORMAL_MNEMONIC(SUBFAL, SUBFAL, "subfal"),
++    NORMAL_MNEMONIC(SUBFHS, SUBFHS, "subfhs"),
++    NORMAL_MNEMONIC(SUBFLO, SUBFLO, "subflo"),
++    NORMAL_MNEMONIC(SUBHH_W, SUBHH_W, "subhh.w"),
++    NORMAL_MNEMONIC(SWAP_B, SWAP_B, "swap.b"),
++    NORMAL_MNEMONIC(SWAP_BH, SWAP_BH, "swap.bh"),
++    NORMAL_MNEMONIC(SWAP_H, SWAP_H, "swap.h"),
++    NORMAL_MNEMONIC(SYNC, SYNC, "sync"),
++    NORMAL_MNEMONIC(TLBR, TLBR, "tlbr"),
++    NORMAL_MNEMONIC(TLBS, TLBS, "tlbs"),
++    NORMAL_MNEMONIC(TLBW, TLBW, "tlbw"),
++    NORMAL_MNEMONIC(TNBZ, TNBZ, "tnbz"),
++    NORMAL_MNEMONIC(TST, TST, "tst"),
++    NORMAL_MNEMONIC(XCHG, XCHG, "xchg"),
++    NORMAL_MNEMONIC(MEMC, MEMC, "memc"),
++    NORMAL_MNEMONIC(MEMS, MEMS, "mems"),
++    NORMAL_MNEMONIC(MEMT, MEMT, "memt"),
++  NORMAL_MNEMONIC (FMAC_S,     FMAC_S,     "fmac.s"),
++  NORMAL_MNEMONIC (FNMAC_S,    FNMAC_S,    "fnmac.s"),
++  NORMAL_MNEMONIC (FMSC_S,     FMSC_S,     "fmsc.s"), 
++  NORMAL_MNEMONIC (FNMSC_S,    FNMSC_S,    "fnmsc.s"), 
++  NORMAL_MNEMONIC (FMUL_S,     FMUL_S,     "fmul.s"),
++  NORMAL_MNEMONIC (FNMUL_S,    FNMUL_S,    "fnmul.s"),
++  NORMAL_MNEMONIC (FADD_S,     FADD_S,     "fadd.s"),
++  NORMAL_MNEMONIC (FSUB_S,     FSUB_S,     "fsub.s"),
++  NORMAL_MNEMONIC (FCASTRS_SW, FCASTRS_SW, "fcastrs.sw"),
++  NORMAL_MNEMONIC (FCASTRS_UW, FCASTRS_UW, "fcastrs.uw"),
++  NORMAL_MNEMONIC (FCASTSW_S,  FCASTSW_S,  "fcastsw.s"),
++  NORMAL_MNEMONIC (FCASTUW_S,  FCASTUW_S,  "fcastuw.s"),
++  NORMAL_MNEMONIC (FCMP_S,     FCMP_S,     "fcmp.s"),
++  NORMAL_MNEMONIC (FCHK_S,     FCHK_S,     "fchk.s"),
++  NORMAL_MNEMONIC (FRCPA_S,    FRCPA_S,    "frcpa.s"),
++  NORMAL_MNEMONIC (FRSQRTA_S,  FRSQRTA_S,  "frsqrta.s"),
++    NORMAL_MNEMONIC(LDA_W, LDA_W, "lda.w"),
++    NORMAL_MNEMONIC(CALL, CALL, "call"),
++    NORMAL_MNEMONIC(PICOSVMAC, PICOSVMAC0, "picosvmac"),
++    NORMAL_MNEMONIC(PICOSVMUL, PICOSVMUL0, "picosvmul"),
++    NORMAL_MNEMONIC(PICOVMAC, PICOVMAC0, "picovmac"),
++    NORMAL_MNEMONIC(PICOVMUL, PICOVMUL0, "picovmul"),
++    NORMAL_MNEMONIC(PICOLD_D, PICOLD_D2, "picold.d"),
++    NORMAL_MNEMONIC(PICOLD_W, PICOLD_W2, "picold.w"),
++    NORMAL_MNEMONIC(PICOLDM_D, PICOLDM_D, "picoldm.d"),
++    NORMAL_MNEMONIC(PICOLDM_W, PICOLDM_W, "picoldm.w"),
++    NORMAL_MNEMONIC(PICOMV_D, PICOMV_D1, "picomv.d"),
++    NORMAL_MNEMONIC(PICOMV_W, PICOMV_W1, "picomv.w"),
++    NORMAL_MNEMONIC(PICOST_D, PICOST_D2, "picost.d"),
++    NORMAL_MNEMONIC(PICOST_W, PICOST_W2, "picost.w"),
++    NORMAL_MNEMONIC(PICOSTM_D, PICOSTM_D, "picostm.d"),
++    NORMAL_MNEMONIC(PICOSTM_W, PICOSTM_W, "picostm.w"),
++    NORMAL_MNEMONIC(RSUBEQ, RSUBEQ, "rsubeq"),
++    NORMAL_MNEMONIC(RSUBNE, RSUBNE, "rsubne"),
++    NORMAL_MNEMONIC(RSUBCC, RSUBCC, "rsubcc"),
++    NORMAL_MNEMONIC(RSUBCS, RSUBCS, "rsubcs"),
++    NORMAL_MNEMONIC(RSUBGE, RSUBGE, "rsubge"),
++    NORMAL_MNEMONIC(RSUBLT, RSUBLT, "rsublt"),
++    NORMAL_MNEMONIC(RSUBMI, RSUBMI, "rsubmi"),
++    NORMAL_MNEMONIC(RSUBPL, RSUBPL, "rsubpl"),
++    NORMAL_MNEMONIC(RSUBLS, RSUBLS, "rsubls"),
++    NORMAL_MNEMONIC(RSUBGT, RSUBGT, "rsubgt"),
++    NORMAL_MNEMONIC(RSUBLE, RSUBLE, "rsuble"),
++    NORMAL_MNEMONIC(RSUBHI, RSUBHI, "rsubhi"),
++    NORMAL_MNEMONIC(RSUBVS, RSUBVS, "rsubvs"),
++    NORMAL_MNEMONIC(RSUBVC, RSUBVC, "rsubvc"),
++    NORMAL_MNEMONIC(RSUBQS, RSUBQS, "rsubqs"),
++    NORMAL_MNEMONIC(RSUBAL, RSUBAL, "rsubal"),
++    NORMAL_MNEMONIC(RSUBHS, RSUBHS, "rsubhs"),
++    NORMAL_MNEMONIC(RSUBLO, RSUBLO, "rsublo"),
++    NORMAL_MNEMONIC(ADDEQ, ADDEQ, "addeq"),
++    NORMAL_MNEMONIC(ADDNE, ADDNE, "addne"),
++    NORMAL_MNEMONIC(ADDCC, ADDCC, "addcc"),
++    NORMAL_MNEMONIC(ADDCS, ADDCS, "addcs"),
++    NORMAL_MNEMONIC(ADDGE, ADDGE, "addge"),
++    NORMAL_MNEMONIC(ADDLT, ADDLT, "addlt"),
++    NORMAL_MNEMONIC(ADDMI, ADDMI, "addmi"),
++    NORMAL_MNEMONIC(ADDPL, ADDPL, "addpl"),
++    NORMAL_MNEMONIC(ADDLS, ADDLS, "addls"),
++    NORMAL_MNEMONIC(ADDGT, ADDGT, "addgt"),
++    NORMAL_MNEMONIC(ADDLE, ADDLE, "addle"),
++    NORMAL_MNEMONIC(ADDHI, ADDHI, "addhi"),
++    NORMAL_MNEMONIC(ADDVS, ADDVS, "addvs"),
++    NORMAL_MNEMONIC(ADDVC, ADDVC, "addvc"),
++    NORMAL_MNEMONIC(ADDQS, ADDQS, "addqs"),
++    NORMAL_MNEMONIC(ADDAL, ADDAL, "addal"),
++    NORMAL_MNEMONIC(ADDHS, ADDHS, "addhs"),
++    NORMAL_MNEMONIC(ADDLO, ADDLO, "addlo"),
++    NORMAL_MNEMONIC(ANDEQ, ANDEQ, "andeq"),
++    NORMAL_MNEMONIC(ANDNE, ANDNE, "andne"),
++    NORMAL_MNEMONIC(ANDCC, ANDCC, "andcc"),
++    NORMAL_MNEMONIC(ANDCS, ANDCS, "andcs"),
++    NORMAL_MNEMONIC(ANDGE, ANDGE, "andge"),
++    NORMAL_MNEMONIC(ANDLT, ANDLT, "andlt"),
++    NORMAL_MNEMONIC(ANDMI, ANDMI, "andmi"),
++    NORMAL_MNEMONIC(ANDPL, ANDPL, "andpl"),
++    NORMAL_MNEMONIC(ANDLS, ANDLS, "andls"),
++    NORMAL_MNEMONIC(ANDGT, ANDGT, "andgt"),
++    NORMAL_MNEMONIC(ANDLE, ANDLE, "andle"),
++    NORMAL_MNEMONIC(ANDHI, ANDHI, "andhi"),
++    NORMAL_MNEMONIC(ANDVS, ANDVS, "andvs"),
++    NORMAL_MNEMONIC(ANDVC, ANDVC, "andvc"),
++    NORMAL_MNEMONIC(ANDQS, ANDQS, "andqs"),
++    NORMAL_MNEMONIC(ANDAL, ANDAL, "andal"),
++    NORMAL_MNEMONIC(ANDHS, ANDHS, "andhs"),
++    NORMAL_MNEMONIC(ANDLO, ANDLO, "andlo"),
++    NORMAL_MNEMONIC(OREQ, OREQ, "oreq"),
++    NORMAL_MNEMONIC(ORNE, ORNE, "orne"),
++    NORMAL_MNEMONIC(ORCC, ORCC, "orcc"),
++    NORMAL_MNEMONIC(ORCS, ORCS, "orcs"),
++    NORMAL_MNEMONIC(ORGE, ORGE, "orge"),
++    NORMAL_MNEMONIC(ORLT, ORLT, "orlt"),
++    NORMAL_MNEMONIC(ORMI, ORMI, "ormi"),
++    NORMAL_MNEMONIC(ORPL, ORPL, "orpl"),
++    NORMAL_MNEMONIC(ORLS, ORLS, "orls"),
++    NORMAL_MNEMONIC(ORGT, ORGT, "orgt"),
++    NORMAL_MNEMONIC(ORLE, ORLE, "orle"),
++    NORMAL_MNEMONIC(ORHI, ORHI, "orhi"),
++    NORMAL_MNEMONIC(ORVS, ORVS, "orvs"),
++    NORMAL_MNEMONIC(ORVC, ORVC, "orvc"),
++    NORMAL_MNEMONIC(ORQS, ORQS, "orqs"),
++    NORMAL_MNEMONIC(ORAL, ORAL, "oral"),
++    NORMAL_MNEMONIC(ORHS, ORHS, "orhs"),
++    NORMAL_MNEMONIC(ORLO, ORLO, "orlo"),
++    NORMAL_MNEMONIC(EOREQ, EOREQ, "eoreq"),
++    NORMAL_MNEMONIC(EORNE, EORNE, "eorne"),
++    NORMAL_MNEMONIC(EORCC, EORCC, "eorcc"),
++    NORMAL_MNEMONIC(EORCS, EORCS, "eorcs"),
++    NORMAL_MNEMONIC(EORGE, EORGE, "eorge"),
++    NORMAL_MNEMONIC(EORLT, EORLT, "eorlt"),
++    NORMAL_MNEMONIC(EORMI, EORMI, "eormi"),
++    NORMAL_MNEMONIC(EORPL, EORPL, "eorpl"),
++    NORMAL_MNEMONIC(EORLS, EORLS, "eorls"),
++    NORMAL_MNEMONIC(EORGT, EORGT, "eorgt"),
++    NORMAL_MNEMONIC(EORLE, EORLE, "eorle"),
++    NORMAL_MNEMONIC(EORHI, EORHI, "eorhi"),
++    NORMAL_MNEMONIC(EORVS, EORVS, "eorvs"),
++    NORMAL_MNEMONIC(EORVC, EORVC, "eorvc"),
++    NORMAL_MNEMONIC(EORQS, EORQS, "eorqs"),
++    NORMAL_MNEMONIC(EORAL, EORAL, "eoral"),
++    NORMAL_MNEMONIC(EORHS, EORHS, "eorhs"),
++    NORMAL_MNEMONIC(EORLO, EORLO, "eorlo"),
++    NORMAL_MNEMONIC(LD_WEQ, LD_WEQ, "ld.weq"),
++    NORMAL_MNEMONIC(LD_WNE, LD_WNE, "ld.wne"),
++    NORMAL_MNEMONIC(LD_WCC, LD_WCC, "ld.wcc"),
++    NORMAL_MNEMONIC(LD_WCS, LD_WCS, "ld.wcs"),
++    NORMAL_MNEMONIC(LD_WGE, LD_WGE, "ld.wge"),
++    NORMAL_MNEMONIC(LD_WLT, LD_WLT, "ld.wlt"),
++    NORMAL_MNEMONIC(LD_WMI, LD_WMI, "ld.wmi"),
++    NORMAL_MNEMONIC(LD_WPL, LD_WPL, "ld.wpl"),
++    NORMAL_MNEMONIC(LD_WLS, LD_WLS, "ld.wls"),
++    NORMAL_MNEMONIC(LD_WGT, LD_WGT, "ld.wgt"),
++    NORMAL_MNEMONIC(LD_WLE, LD_WLE, "ld.wle"),
++    NORMAL_MNEMONIC(LD_WHI, LD_WHI, "ld.whi"),
++    NORMAL_MNEMONIC(LD_WVS, LD_WVS, "ld.wvs"),
++    NORMAL_MNEMONIC(LD_WVC, LD_WVC, "ld.wvc"),
++    NORMAL_MNEMONIC(LD_WQS, LD_WQS, "ld.wqs"),
++    NORMAL_MNEMONIC(LD_WAL, LD_WAL, "ld.wal"),
++    NORMAL_MNEMONIC(LD_WHS, LD_WHS, "ld.whs"),
++    NORMAL_MNEMONIC(LD_WLO, LD_WLO, "ld.wlo"),
++    NORMAL_MNEMONIC(LD_SHEQ, LD_SHEQ, "ld.sheq"),
++    NORMAL_MNEMONIC(LD_SHNE, LD_SHNE, "ld.shne"),
++    NORMAL_MNEMONIC(LD_SHCC, LD_SHCC, "ld.shcc"),
++    NORMAL_MNEMONIC(LD_SHCS, LD_SHCS, "ld.shcs"),
++    NORMAL_MNEMONIC(LD_SHGE, LD_SHGE, "ld.shge"),
++    NORMAL_MNEMONIC(LD_SHLT, LD_SHLT, "ld.shlt"),
++    NORMAL_MNEMONIC(LD_SHMI, LD_SHMI, "ld.shmi"),
++    NORMAL_MNEMONIC(LD_SHPL, LD_SHPL, "ld.shpl"),
++    NORMAL_MNEMONIC(LD_SHLS, LD_SHLS, "ld.shls"),
++    NORMAL_MNEMONIC(LD_SHGT, LD_SHGT, "ld.shgt"),
++    NORMAL_MNEMONIC(LD_SHLE, LD_SHLE, "ld.shle"),
++    NORMAL_MNEMONIC(LD_SHHI, LD_SHHI, "ld.shhi"),
++    NORMAL_MNEMONIC(LD_SHVS, LD_SHVS, "ld.shvs"),
++    NORMAL_MNEMONIC(LD_SHVC, LD_SHVC, "ld.shvc"),
++    NORMAL_MNEMONIC(LD_SHQS, LD_SHQS, "ld.shqs"),
++    NORMAL_MNEMONIC(LD_SHAL, LD_SHAL, "ld.shal"),
++    NORMAL_MNEMONIC(LD_SHHS, LD_SHHS, "ld.shhs"),
++    NORMAL_MNEMONIC(LD_SHLO, LD_SHLO, "ld.shlo"),
++    NORMAL_MNEMONIC(LD_UHEQ, LD_UHEQ, "ld.uheq"),
++    NORMAL_MNEMONIC(LD_UHNE, LD_UHNE, "ld.uhne"),
++    NORMAL_MNEMONIC(LD_UHCC, LD_UHCC, "ld.uhcc"),
++    NORMAL_MNEMONIC(LD_UHCS, LD_UHCS, "ld.uhcs"),
++    NORMAL_MNEMONIC(LD_UHGE, LD_UHGE, "ld.uhge"),
++    NORMAL_MNEMONIC(LD_UHLT, LD_UHLT, "ld.uhlt"),
++    NORMAL_MNEMONIC(LD_UHMI, LD_UHMI, "ld.uhmi"),
++    NORMAL_MNEMONIC(LD_UHPL, LD_UHPL, "ld.uhpl"),
++    NORMAL_MNEMONIC(LD_UHLS, LD_UHLS, "ld.uhls"),
++    NORMAL_MNEMONIC(LD_UHGT, LD_UHGT, "ld.uhgt"),
++    NORMAL_MNEMONIC(LD_UHLE, LD_UHLE, "ld.uhle"),
++    NORMAL_MNEMONIC(LD_UHHI, LD_UHHI, "ld.uhhi"),
++    NORMAL_MNEMONIC(LD_UHVS, LD_UHVS, "ld.uhvs"),
++    NORMAL_MNEMONIC(LD_UHVC, LD_UHVC, "ld.uhvc"),
++    NORMAL_MNEMONIC(LD_UHQS, LD_UHQS, "ld.uhqs"),
++    NORMAL_MNEMONIC(LD_UHAL, LD_UHAL, "ld.uhal"),
++    NORMAL_MNEMONIC(LD_UHHS, LD_UHHS, "ld.uhhs"),
++    NORMAL_MNEMONIC(LD_UHLO, LD_UHLO, "ld.uhlo"),
++    NORMAL_MNEMONIC(LD_SBEQ, LD_SBEQ, "ld.sbeq"),
++    NORMAL_MNEMONIC(LD_SBNE, LD_SBNE, "ld.sbne"),
++    NORMAL_MNEMONIC(LD_SBCC, LD_SBCC, "ld.sbcc"),
++    NORMAL_MNEMONIC(LD_SBCS, LD_SBCS, "ld.sbcs"),
++    NORMAL_MNEMONIC(LD_SBGE, LD_SBGE, "ld.sbge"),
++    NORMAL_MNEMONIC(LD_SBLT, LD_SBLT, "ld.sblt"),
++    NORMAL_MNEMONIC(LD_SBMI, LD_SBMI, "ld.sbmi"),
++    NORMAL_MNEMONIC(LD_SBPL, LD_SBPL, "ld.sbpl"),
++    NORMAL_MNEMONIC(LD_SBLS, LD_SBLS, "ld.sbls"),
++    NORMAL_MNEMONIC(LD_SBGT, LD_SBGT, "ld.sbgt"),
++    NORMAL_MNEMONIC(LD_SBLE, LD_SBLE, "ld.sble"),
++    NORMAL_MNEMONIC(LD_SBHI, LD_SBHI, "ld.sbhi"),
++    NORMAL_MNEMONIC(LD_SBVS, LD_SBVS, "ld.sbvs"),
++    NORMAL_MNEMONIC(LD_SBVC, LD_SBVC, "ld.sbvc"),
++    NORMAL_MNEMONIC(LD_SBQS, LD_SBQS, "ld.sbqs"),
++    NORMAL_MNEMONIC(LD_SBAL, LD_SBAL, "ld.sbal"),
++    NORMAL_MNEMONIC(LD_SBHS, LD_SBHS, "ld.sbhs"),
++    NORMAL_MNEMONIC(LD_SBLO, LD_SBLO, "ld.sblo"),
++    NORMAL_MNEMONIC(LD_UBEQ, LD_UBEQ, "ld.ubeq"),
++    NORMAL_MNEMONIC(LD_UBNE, LD_UBNE, "ld.ubne"),
++    NORMAL_MNEMONIC(LD_UBCC, LD_UBCC, "ld.ubcc"),
++    NORMAL_MNEMONIC(LD_UBCS, LD_UBCS, "ld.ubcs"),
++    NORMAL_MNEMONIC(LD_UBGE, LD_UBGE, "ld.ubge"),
++    NORMAL_MNEMONIC(LD_UBLT, LD_UBLT, "ld.ublt"),
++    NORMAL_MNEMONIC(LD_UBMI, LD_UBMI, "ld.ubmi"),
++    NORMAL_MNEMONIC(LD_UBPL, LD_UBPL, "ld.ubpl"),
++    NORMAL_MNEMONIC(LD_UBLS, LD_UBLS, "ld.ubls"),
++    NORMAL_MNEMONIC(LD_UBGT, LD_UBGT, "ld.ubgt"),
++    NORMAL_MNEMONIC(LD_UBLE, LD_UBLE, "ld.uble"),
++    NORMAL_MNEMONIC(LD_UBHI, LD_UBHI, "ld.ubhi"),
++    NORMAL_MNEMONIC(LD_UBVS, LD_UBVS, "ld.ubvs"),
++    NORMAL_MNEMONIC(LD_UBVC, LD_UBVC, "ld.ubvc"),
++    NORMAL_MNEMONIC(LD_UBQS, LD_UBQS, "ld.ubqs"),
++    NORMAL_MNEMONIC(LD_UBAL, LD_UBAL, "ld.ubal"),
++    NORMAL_MNEMONIC(LD_UBHS, LD_UBHS, "ld.ubhs"),
++    NORMAL_MNEMONIC(LD_UBLO, LD_UBLO, "ld.ublo"),
++    NORMAL_MNEMONIC(ST_WEQ, ST_WEQ, "st.weq"),
++    NORMAL_MNEMONIC(ST_WNE, ST_WNE, "st.wne"),
++    NORMAL_MNEMONIC(ST_WCC, ST_WCC, "st.wcc"),
++    NORMAL_MNEMONIC(ST_WCS, ST_WCS, "st.wcs"),
++    NORMAL_MNEMONIC(ST_WGE, ST_WGE, "st.wge"),
++    NORMAL_MNEMONIC(ST_WLT, ST_WLT, "st.wlt"),
++    NORMAL_MNEMONIC(ST_WMI, ST_WMI, "st.wmi"),
++    NORMAL_MNEMONIC(ST_WPL, ST_WPL, "st.wpl"),
++    NORMAL_MNEMONIC(ST_WLS, ST_WLS, "st.wls"),
++    NORMAL_MNEMONIC(ST_WGT, ST_WGT, "st.wgt"),
++    NORMAL_MNEMONIC(ST_WLE, ST_WLE, "st.wle"),
++    NORMAL_MNEMONIC(ST_WHI, ST_WHI, "st.whi"),
++    NORMAL_MNEMONIC(ST_WVS, ST_WVS, "st.wvs"),
++    NORMAL_MNEMONIC(ST_WVC, ST_WVC, "st.wvc"),
++    NORMAL_MNEMONIC(ST_WQS, ST_WQS, "st.wqs"),
++    NORMAL_MNEMONIC(ST_WAL, ST_WAL, "st.wal"),
++    NORMAL_MNEMONIC(ST_WHS, ST_WHS, "st.whs"),
++    NORMAL_MNEMONIC(ST_WLO, ST_WLO, "st.wlo"),
++    NORMAL_MNEMONIC(ST_HEQ, ST_HEQ, "st.heq"),
++    NORMAL_MNEMONIC(ST_HNE, ST_HNE, "st.hne"),
++    NORMAL_MNEMONIC(ST_HCC, ST_HCC, "st.hcc"),
++    NORMAL_MNEMONIC(ST_HCS, ST_HCS, "st.hcs"),
++    NORMAL_MNEMONIC(ST_HGE, ST_HGE, "st.hge"),
++    NORMAL_MNEMONIC(ST_HLT, ST_HLT, "st.hlt"),
++    NORMAL_MNEMONIC(ST_HMI, ST_HMI, "st.hmi"),
++    NORMAL_MNEMONIC(ST_HPL, ST_HPL, "st.hpl"),
++    NORMAL_MNEMONIC(ST_HLS, ST_HLS, "st.hls"),
++    NORMAL_MNEMONIC(ST_HGT, ST_HGT, "st.hgt"),
++    NORMAL_MNEMONIC(ST_HLE, ST_HLE, "st.hle"),
++    NORMAL_MNEMONIC(ST_HHI, ST_HHI, "st.hhi"),
++    NORMAL_MNEMONIC(ST_HVS, ST_HVS, "st.hvs"),
++    NORMAL_MNEMONIC(ST_HVC, ST_HVC, "st.hvc"),
++    NORMAL_MNEMONIC(ST_HQS, ST_HQS, "st.hqs"),
++    NORMAL_MNEMONIC(ST_HAL, ST_HAL, "st.hal"),
++    NORMAL_MNEMONIC(ST_HHS, ST_HHS, "st.hhs"),
++    NORMAL_MNEMONIC(ST_HLO, ST_HLO, "st.hlo"),
++    NORMAL_MNEMONIC(ST_BEQ, ST_BEQ, "st.beq"),
++    NORMAL_MNEMONIC(ST_BNE, ST_BNE, "st.bne"),
++    NORMAL_MNEMONIC(ST_BCC, ST_BCC, "st.bcc"),
++    NORMAL_MNEMONIC(ST_BCS, ST_BCS, "st.bcs"),
++    NORMAL_MNEMONIC(ST_BGE, ST_BGE, "st.bge"),
++    NORMAL_MNEMONIC(ST_BLT, ST_BLT, "st.blt"),
++    NORMAL_MNEMONIC(ST_BMI, ST_BMI, "st.bmi"),
++    NORMAL_MNEMONIC(ST_BPL, ST_BPL, "st.bpl"),
++    NORMAL_MNEMONIC(ST_BLS, ST_BLS, "st.bls"),
++    NORMAL_MNEMONIC(ST_BGT, ST_BGT, "st.bgt"),
++    NORMAL_MNEMONIC(ST_BLE, ST_BLE, "st.ble"),
++    NORMAL_MNEMONIC(ST_BHI, ST_BHI, "st.bhi"),
++    NORMAL_MNEMONIC(ST_BVS, ST_BVS, "st.bvs"),
++    NORMAL_MNEMONIC(ST_BVC, ST_BVC, "st.bvc"),
++    NORMAL_MNEMONIC(ST_BQS, ST_BQS, "st.bqs"),
++    NORMAL_MNEMONIC(ST_BAL, ST_BAL, "st.bal"),
++    NORMAL_MNEMONIC(ST_BHS, ST_BHS, "st.bhs"),
++    NORMAL_MNEMONIC(ST_BLO, ST_BLO, "st.blo"),
++    NORMAL_MNEMONIC(MOVH, MOVH, "movh"),
++
++  };
++#undef NORMAL_MNEMONIC
++#undef ALIAS_MNEMONIC
++#undef FP_MNEMONIC
+--- /dev/null
++++ b/opcodes/avr32-opc.h
+@@ -0,0 +1,2341 @@
++/* Opcode tables for AVR32.
++   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
++
++   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of libopcodes.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   This program is distributed in the hope that 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 "bfd.h"
++
++#define AVR32_MAX_OPERANDS	8
++#define AVR32_MAX_FIELDS	8
++
++#define AVR32_V1	        (1 << 1)
++#define AVR32_SIMD		(1 << 2)
++#define AVR32_DSP		(1 << 3)
++#define AVR32_RMW		(1 << 4)
++#define AVR32_V2	        (1 << 5)
++#define AVR32_V3	        (1 << 6)
++#define AVR32_V3FP	        (1 << 7)
++#define AVR32_PICO		(1 << 17)
++
++/* Registers we commonly refer to */
++#define AVR32_REG_R12		12
++#define AVR32_REG_SP		13
++#define AVR32_REG_LR		14
++#define AVR32_REG_PC		15
++
++struct avr32_ifield
++{
++  int id;
++  unsigned short bitsize;
++  unsigned short shift;
++  unsigned long mask;
++
++  /* If the value doesn't fit, it will be truncated with no warning */
++  void (*insert)(const struct avr32_ifield *, void *, unsigned long);
++  void (*extract)(const struct avr32_ifield *, void *, unsigned long *);
++};
++
++struct avr32_opcode
++{
++  int id;
++  int size;
++  unsigned long value;
++  unsigned long mask;
++  const struct avr32_syntax *syntax;
++  bfd_reloc_code_real_type reloc_type;
++  unsigned int nr_fields;
++  /* if relaxable, which field is variable, otherwise -1 */
++  int var_field;
++  const struct avr32_ifield *fields[AVR32_MAX_FIELDS];
++};
++
++struct avr32_alias
++{
++  int id;
++  const struct avr32_opcode *opc;
++  struct {
++    int is_opindex;
++    unsigned long value;
++  } operand_map[AVR32_MAX_OPERANDS];
++};
++
++struct avr32_syntax
++{
++  int id;
++  unsigned long isa_flags;
++  const struct avr32_mnemonic *mnemonic;
++  int type;
++  union {
++    const struct avr32_opcode *opc;
++    const struct avr32_alias *alias;
++  } u;
++  const struct avr32_syntax *next;
++  /* negative means "vararg" */
++  int nr_operands;
++  int operand[AVR32_MAX_OPERANDS];
++};
++
++#if 0
++#define AVR32_ALIAS_MAKE_CONST(val) ((val) | 0x80000000UL)
++#define AVR32_ALIAS_IS_CONST(mapval) (((mapval) & 0x80000000UL) != 0)
++#define AVR32_ALIAS_GET_CONST(mapval) ((mapval) & ~0x80000000UL)
++#endif
++
++struct avr32_mnemonic
++{
++  int id;
++  const char *name;
++  const struct avr32_syntax *syntax;
++};
++
++extern const struct avr32_ifield avr32_ifield_table[];
++extern struct avr32_opcode avr32_opc_table[];
++extern const struct avr32_syntax avr32_syntax_table[];
++extern const struct avr32_alias avr32_alias_table[];
++extern const struct avr32_mnemonic avr32_mnemonic_table[];
++
++extern void avr32_insert_simple(const struct avr32_ifield *field,
++				void *buf, unsigned long value);
++extern void avr32_insert_bit5c(const struct avr32_ifield *field,
++			       void *buf, unsigned long value);
++extern void avr32_insert_k10(const struct avr32_ifield *field,
++			     void *buf, unsigned long value);
++extern void avr32_insert_k21(const struct avr32_ifield *field,
++			     void *buf, unsigned long value);
++extern void avr32_insert_cpop(const struct avr32_ifield *field,
++			      void *buf, unsigned long value);
++extern void avr32_insert_k12cp(const struct avr32_ifield *field,
++			       void *buf, unsigned long value);
++
++extern void avr32_extract_simple(const struct avr32_ifield *field,
++				 void *buf, unsigned long *value);
++extern void avr32_extract_bit5c(const struct avr32_ifield *field,
++				void *buf, unsigned long *value);
++extern void avr32_extract_k10(const struct avr32_ifield *field,
++			      void *buf, unsigned long *value);
++extern void avr32_extract_k21(const struct avr32_ifield *field,
++			      void *buf, unsigned long *value);
++extern void avr32_extract_cpop(const struct avr32_ifield *field,
++			       void *buf, unsigned long *value);
++extern void avr32_extract_k12cp(const struct avr32_ifield *field,
++				void *buf, unsigned long *value);
++
++enum avr32_operand_type
++{
++  AVR32_OPERAND_INTREG,		/* just a register */
++  AVR32_OPERAND_INTREG_PREDEC,	/* register with pre-decrement */
++  AVR32_OPERAND_INTREG_POSTINC,	/* register with post-increment */
++  AVR32_OPERAND_INTREG_LSL,	/* register with left shift */
++  AVR32_OPERAND_INTREG_LSR,	/* register with right shift */
++  AVR32_OPERAND_INTREG_BSEL,	/* register with byte selector */
++  AVR32_OPERAND_INTREG_HSEL,	/* register with halfword selector */
++  AVR32_OPERAND_INTREG_SDISP,	/* Rp[signed disp] */
++  AVR32_OPERAND_INTREG_SDISP_H,	/* Rp[signed hword-aligned disp] */
++  AVR32_OPERAND_INTREG_SDISP_W,	/* Rp[signed word-aligned disp] */
++  AVR32_OPERAND_INTREG_UDISP,	/* Rp[unsigned disp] */
++  AVR32_OPERAND_INTREG_UDISP_H,	/* Rp[unsigned hword-aligned disp] */
++  AVR32_OPERAND_INTREG_UDISP_W, /* Rp[unsigned word-aligned disp] */
++  AVR32_OPERAND_INTREG_INDEX,	/* Rp[Ri << sa] */
++  AVR32_OPERAND_INTREG_XINDEX,	/* Rp[Ri:bytesel << 2] */
++  AVR32_OPERAND_DWREG,		/* Even-numbered register */
++  AVR32_OPERAND_PC_UDISP_W,	/* PC[unsigned word-aligned disp] or label */
++  AVR32_OPERAND_SP,		/* Just SP */
++  AVR32_OPERAND_SP_UDISP_W,	/* SP[unsigned word-aligned disp] */
++  AVR32_OPERAND_CPNO,
++  AVR32_OPERAND_CPREG,
++  AVR32_OPERAND_CPREG_D,
++  AVR32_OPERAND_UNSIGNED_CONST,
++  AVR32_OPERAND_UNSIGNED_CONST_W,
++  AVR32_OPERAND_SIGNED_CONST,
++  AVR32_OPERAND_SIGNED_CONST_W,
++  AVR32_OPERAND_JMPLABEL,
++  AVR32_OPERAND_UNSIGNED_NUMBER,
++  AVR32_OPERAND_UNSIGNED_NUMBER_W,
++  AVR32_OPERAND_REGLIST8,
++  AVR32_OPERAND_REGLIST9,
++  AVR32_OPERAND_REGLIST16,
++  AVR32_OPERAND_REGLIST_LDM,
++  AVR32_OPERAND_REGLIST_CP8,
++  AVR32_OPERAND_REGLIST_CPD8,
++  AVR32_OPERAND_RETVAL,
++  AVR32_OPERAND_MCALL,
++  AVR32_OPERAND_JOSPINC,
++  AVR32_OPERAND_COH,
++  AVR32_OPERAND_PICO_REG_W,
++  AVR32_OPERAND_PICO_REG_D,
++  AVR32_OPERAND_PICO_REGLIST_W,
++  AVR32_OPERAND_PICO_REGLIST_D,
++  AVR32_OPERAND_PICO_IN,
++  AVR32_OPERAND_PICO_OUT0,
++  AVR32_OPERAND_PICO_OUT1,
++  AVR32_OPERAND_PICO_OUT2,
++  AVR32_OPERAND_PICO_OUT3,
++  AVR32_OPERAND__END_
++};
++#define AVR32_OPERAND_UNKNOWN AVR32_OPERAND__END_
++#define AVR32_NR_OPERANDS AVR32_OPERAND__END_
++
++enum avr32_ifield_type
++{
++  AVR32_IFIELD_RX,
++  AVR32_IFIELD_RY,
++  AVR32_IFIELD_COND4C,
++  AVR32_IFIELD_K8C,
++  AVR32_IFIELD_K7C,
++  AVR32_IFIELD_K5C,
++  AVR32_IFIELD_K3,
++  AVR32_IFIELD_RY_DW,
++  AVR32_IFIELD_COND4E,
++  AVR32_IFIELD_K8E,
++  AVR32_IFIELD_BIT5C,
++  AVR32_IFIELD_COND3,
++  AVR32_IFIELD_K10,
++  AVR32_IFIELD_POPM,
++  AVR32_IFIELD_K2,
++  AVR32_IFIELD_RD_E,
++  AVR32_IFIELD_RD_DW,
++  AVR32_IFIELD_X,
++  AVR32_IFIELD_Y,
++  AVR32_IFIELD_X2,
++  AVR32_IFIELD_Y2,
++  AVR32_IFIELD_K5E,
++  AVR32_IFIELD_PART2,
++  AVR32_IFIELD_PART1,
++  AVR32_IFIELD_K16,
++  AVR32_IFIELD_CACHEOP,
++  AVR32_IFIELD_K11,
++  AVR32_IFIELD_K21,
++  AVR32_IFIELD_CPOP,
++  AVR32_IFIELD_CPNO,
++  AVR32_IFIELD_CRD_RI,
++  AVR32_IFIELD_CRX,
++  AVR32_IFIELD_CRY,
++  AVR32_IFIELD_K7E,
++  AVR32_IFIELD_CRD_DW,
++  AVR32_IFIELD_PART1_K12,
++  AVR32_IFIELD_PART2_K12,
++  AVR32_IFIELD_K12,
++  AVR32_IFIELD_S5,
++  AVR32_IFIELD_K5E2,
++  AVR32_IFIELD_K4,
++  AVR32_IFIELD_COND4E2,
++  AVR32_IFIELD_K8E2,
++  AVR32_IFIELD_K6,
++  AVR32_IFIELD_MEM15,
++  AVR32_IFIELD_MEMB5,
++  AVR32_IFIELD_W,
++  AVR32_IFIELD_CM_HL,
++  AVR32_IFIELD_K12CP,
++  AVR32_IFIELD_K9E,
++  AVR32_IFIELD_FP_RX,
++  AVR32_IFIELD_FP_RY,
++  AVR32_IFIELD_FP_RD,
++  AVR32_IFIELD_FP_RA,
++  AVR32_IFIELD__END_,
++};
++#define AVR32_NR_IFIELDS AVR32_IFIELD__END_
++
++enum avr32_opc_type
++{
++  AVR32_OPC_ABS,
++  AVR32_OPC_ACALL,
++  AVR32_OPC_ACR,
++  AVR32_OPC_ADC,
++  AVR32_OPC_ADD1,
++  AVR32_OPC_ADD2,
++  AVR32_OPC_ADDABS,
++  AVR32_OPC_ADDHH_W,
++  AVR32_OPC_AND1,
++  AVR32_OPC_AND2,
++  AVR32_OPC_AND3,
++  AVR32_OPC_ANDH,
++  AVR32_OPC_ANDH_COH,
++  AVR32_OPC_ANDL,
++  AVR32_OPC_ANDL_COH,
++  AVR32_OPC_ANDN,
++  AVR32_OPC_ASR1,
++  AVR32_OPC_ASR3,
++  AVR32_OPC_ASR2,
++  AVR32_OPC_BLD,
++  AVR32_OPC_BREQ1,
++  AVR32_OPC_BRNE1,
++  AVR32_OPC_BRCC1,
++  AVR32_OPC_BRCS1,
++  AVR32_OPC_BRGE1,
++  AVR32_OPC_BRLT1,
++  AVR32_OPC_BRMI1,
++  AVR32_OPC_BRPL1,
++  AVR32_OPC_BREQ2,
++  AVR32_OPC_BRNE2,
++  AVR32_OPC_BRCC2,
++  AVR32_OPC_BRCS2,
++  AVR32_OPC_BRGE2,
++  AVR32_OPC_BRLT2,
++  AVR32_OPC_BRMI2,
++  AVR32_OPC_BRPL2,
++  AVR32_OPC_BRLS,
++  AVR32_OPC_BRGT,
++  AVR32_OPC_BRLE,
++  AVR32_OPC_BRHI,
++  AVR32_OPC_BRVS,
++  AVR32_OPC_BRVC,
++  AVR32_OPC_BRQS,
++  AVR32_OPC_BRAL,
++  AVR32_OPC_BREAKPOINT,
++  AVR32_OPC_BREV,
++  AVR32_OPC_BST,
++  AVR32_OPC_CACHE,
++  AVR32_OPC_CASTS_B,
++  AVR32_OPC_CASTS_H,
++  AVR32_OPC_CASTU_B,
++  AVR32_OPC_CASTU_H,
++  AVR32_OPC_CBR,
++  AVR32_OPC_CLZ,
++  AVR32_OPC_COM,
++  AVR32_OPC_COP,
++  AVR32_OPC_CP_B,
++  AVR32_OPC_CP_H,
++  AVR32_OPC_CP_W1,
++  AVR32_OPC_CP_W2,
++  AVR32_OPC_CP_W3,
++  AVR32_OPC_CPC1,
++  AVR32_OPC_CPC2,
++  AVR32_OPC_CSRF,
++  AVR32_OPC_CSRFCZ,
++  AVR32_OPC_DIVS,
++  AVR32_OPC_DIVU,
++  AVR32_OPC_EOR1,
++  AVR32_OPC_EOR2,
++  AVR32_OPC_EOR3,
++  AVR32_OPC_EORL,
++  AVR32_OPC_EORH,
++  AVR32_OPC_FRS,
++  AVR32_OPC_ICALL,
++  AVR32_OPC_INCJOSP,
++  AVR32_OPC_LD_D1,
++  AVR32_OPC_LD_D2,
++  AVR32_OPC_LD_D3,
++  AVR32_OPC_LD_D5,
++  AVR32_OPC_LD_D4,
++  AVR32_OPC_LD_SB2,
++  AVR32_OPC_LD_SB1,
++  AVR32_OPC_LD_UB1,
++  AVR32_OPC_LD_UB2,
++  AVR32_OPC_LD_UB5,
++  AVR32_OPC_LD_UB3,
++  AVR32_OPC_LD_UB4,
++  AVR32_OPC_LD_SH1,
++  AVR32_OPC_LD_SH2,
++  AVR32_OPC_LD_SH5,
++  AVR32_OPC_LD_SH3,
++  AVR32_OPC_LD_SH4,
++  AVR32_OPC_LD_UH1,
++  AVR32_OPC_LD_UH2,
++  AVR32_OPC_LD_UH5,
++  AVR32_OPC_LD_UH3,
++  AVR32_OPC_LD_UH4,
++  AVR32_OPC_LD_W1,
++  AVR32_OPC_LD_W2,
++  AVR32_OPC_LD_W5,
++  AVR32_OPC_LD_W6,
++  AVR32_OPC_LD_W3,
++  AVR32_OPC_LD_W4,
++  AVR32_OPC_LDC_D1,
++  AVR32_OPC_LDC_D2,
++  AVR32_OPC_LDC_D3,
++  AVR32_OPC_LDC_W1,
++  AVR32_OPC_LDC_W2,
++  AVR32_OPC_LDC_W3,
++  AVR32_OPC_LDC0_D,
++  AVR32_OPC_LDC0_W,
++  AVR32_OPC_LDCM_D,
++  AVR32_OPC_LDCM_D_PU,
++  AVR32_OPC_LDCM_W,
++  AVR32_OPC_LDCM_W_PU,
++  AVR32_OPC_LDDPC,
++  AVR32_OPC_LDDPC_EXT,
++  AVR32_OPC_LDDSP,
++  AVR32_OPC_LDINS_B,
++  AVR32_OPC_LDINS_H,
++  AVR32_OPC_LDM,
++  AVR32_OPC_LDMTS,
++  AVR32_OPC_LDMTS_PU,
++  AVR32_OPC_LDSWP_SH,
++  AVR32_OPC_LDSWP_UH,
++  AVR32_OPC_LDSWP_W,
++  AVR32_OPC_LSL1,
++  AVR32_OPC_LSL3,
++  AVR32_OPC_LSL2,
++  AVR32_OPC_LSR1,
++  AVR32_OPC_LSR3,
++  AVR32_OPC_LSR2,
++  AVR32_OPC_MAC,
++  AVR32_OPC_MACHH_D,
++  AVR32_OPC_MACHH_W,
++  AVR32_OPC_MACS_D,
++  AVR32_OPC_MACSATHH_W,
++  AVR32_OPC_MACUD,
++  AVR32_OPC_MACWH_D,
++  AVR32_OPC_MAX,
++  AVR32_OPC_MCALL,
++  AVR32_OPC_MFDR,
++  AVR32_OPC_MFSR,
++  AVR32_OPC_MIN,
++  AVR32_OPC_MOV3,
++  AVR32_OPC_MOV1,
++  AVR32_OPC_MOV2,
++  AVR32_OPC_MOVEQ1,
++  AVR32_OPC_MOVNE1,
++  AVR32_OPC_MOVCC1,
++  AVR32_OPC_MOVCS1,
++  AVR32_OPC_MOVGE1,
++  AVR32_OPC_MOVLT1,
++  AVR32_OPC_MOVMI1,
++  AVR32_OPC_MOVPL1,
++  AVR32_OPC_MOVLS1,
++  AVR32_OPC_MOVGT1,
++  AVR32_OPC_MOVLE1,
++  AVR32_OPC_MOVHI1,
++  AVR32_OPC_MOVVS1,
++  AVR32_OPC_MOVVC1,
++  AVR32_OPC_MOVQS1,
++  AVR32_OPC_MOVAL1,
++  AVR32_OPC_MOVEQ2,
++  AVR32_OPC_MOVNE2,
++  AVR32_OPC_MOVCC2,
++  AVR32_OPC_MOVCS2,
++  AVR32_OPC_MOVGE2,
++  AVR32_OPC_MOVLT2,
++  AVR32_OPC_MOVMI2,
++  AVR32_OPC_MOVPL2,
++  AVR32_OPC_MOVLS2,
++  AVR32_OPC_MOVGT2,
++  AVR32_OPC_MOVLE2,
++  AVR32_OPC_MOVHI2,
++  AVR32_OPC_MOVVS2,
++  AVR32_OPC_MOVVC2,
++  AVR32_OPC_MOVQS2,
++  AVR32_OPC_MOVAL2,
++  AVR32_OPC_MTDR,
++  AVR32_OPC_MTSR,
++  AVR32_OPC_MUL1,
++  AVR32_OPC_MUL2,
++  AVR32_OPC_MUL3,
++  AVR32_OPC_MULHH_W,
++  AVR32_OPC_MULNHH_W,
++  AVR32_OPC_MULNWH_D,
++  AVR32_OPC_MULSD,
++  AVR32_OPC_MULSATHH_H,
++  AVR32_OPC_MULSATHH_W,
++  AVR32_OPC_MULSATRNDHH_H,
++  AVR32_OPC_MULSATRNDWH_W,
++  AVR32_OPC_MULSATWH_W,
++  AVR32_OPC_MULU_D,
++  AVR32_OPC_MULWH_D,
++  AVR32_OPC_MUSFR,
++  AVR32_OPC_MUSTR,
++  AVR32_OPC_MVCR_D,
++  AVR32_OPC_MVCR_W,
++  AVR32_OPC_MVRC_D,
++  AVR32_OPC_MVRC_W,
++  AVR32_OPC_NEG,
++  AVR32_OPC_NOP,
++  AVR32_OPC_OR1,
++  AVR32_OPC_OR2,
++  AVR32_OPC_OR3,
++  AVR32_OPC_ORH,
++  AVR32_OPC_ORL,
++  AVR32_OPC_PABS_SB,
++  AVR32_OPC_PABS_SH,
++  AVR32_OPC_PACKSH_SB,
++  AVR32_OPC_PACKSH_UB,
++  AVR32_OPC_PACKW_SH,
++  AVR32_OPC_PADD_B,
++  AVR32_OPC_PADD_H,
++  AVR32_OPC_PADDH_SH,
++  AVR32_OPC_PADDH_UB,
++  AVR32_OPC_PADDS_SB,
++  AVR32_OPC_PADDS_SH,
++  AVR32_OPC_PADDS_UB,
++  AVR32_OPC_PADDS_UH,
++  AVR32_OPC_PADDSUB_H,
++  AVR32_OPC_PADDSUBH_SH,
++  AVR32_OPC_PADDSUBS_SH,
++  AVR32_OPC_PADDSUBS_UH,
++  AVR32_OPC_PADDX_H,
++  AVR32_OPC_PADDXH_SH,
++  AVR32_OPC_PADDXS_SH,
++  AVR32_OPC_PADDXS_UH,
++  AVR32_OPC_PASR_B,
++  AVR32_OPC_PASR_H,
++  AVR32_OPC_PAVG_SH,
++  AVR32_OPC_PAVG_UB,
++  AVR32_OPC_PLSL_B,
++  AVR32_OPC_PLSL_H,
++  AVR32_OPC_PLSR_B,
++  AVR32_OPC_PLSR_H,
++  AVR32_OPC_PMAX_SH,
++  AVR32_OPC_PMAX_UB,
++  AVR32_OPC_PMIN_SH,
++  AVR32_OPC_PMIN_UB,
++  AVR32_OPC_POPJC,
++  AVR32_OPC_POPM,
++  AVR32_OPC_POPM_E,
++  AVR32_OPC_PREF,
++  AVR32_OPC_PSAD,
++  AVR32_OPC_PSUB_B,
++  AVR32_OPC_PSUB_H,
++  AVR32_OPC_PSUBADD_H,
++  AVR32_OPC_PSUBADDH_SH,
++  AVR32_OPC_PSUBADDS_SH,
++  AVR32_OPC_PSUBADDS_UH,
++  AVR32_OPC_PSUBH_SH,
++  AVR32_OPC_PSUBH_UB,
++  AVR32_OPC_PSUBS_SB,
++  AVR32_OPC_PSUBS_SH,
++  AVR32_OPC_PSUBS_UB,
++  AVR32_OPC_PSUBS_UH,
++  AVR32_OPC_PSUBX_H,
++  AVR32_OPC_PSUBXH_SH,
++  AVR32_OPC_PSUBXS_SH,
++  AVR32_OPC_PSUBXS_UH,
++  AVR32_OPC_PUNPCKSB_H,
++  AVR32_OPC_PUNPCKUB_H,
++  AVR32_OPC_PUSHJC,
++  AVR32_OPC_PUSHM,
++  AVR32_OPC_PUSHM_E,
++  AVR32_OPC_RCALL1,
++  AVR32_OPC_RCALL2,
++  AVR32_OPC_RETEQ,
++  AVR32_OPC_RETNE,
++  AVR32_OPC_RETCC,
++  AVR32_OPC_RETCS,
++  AVR32_OPC_RETGE,
++  AVR32_OPC_RETLT,
++  AVR32_OPC_RETMI,
++  AVR32_OPC_RETPL,
++  AVR32_OPC_RETLS,
++  AVR32_OPC_RETGT,
++  AVR32_OPC_RETLE,
++  AVR32_OPC_RETHI,
++  AVR32_OPC_RETVS,
++  AVR32_OPC_RETVC,
++  AVR32_OPC_RETQS,
++  AVR32_OPC_RETAL,
++  AVR32_OPC_RETD,
++  AVR32_OPC_RETE,
++  AVR32_OPC_RETJ,
++  AVR32_OPC_RETS,
++  AVR32_OPC_RJMP,
++  AVR32_OPC_ROL,
++  AVR32_OPC_ROR,
++  AVR32_OPC_RSUB1,
++  AVR32_OPC_RSUB2,
++  AVR32_OPC_SATADD_H,
++  AVR32_OPC_SATADD_W,
++  AVR32_OPC_SATRNDS,
++  AVR32_OPC_SATRNDU,
++  AVR32_OPC_SATS,
++  AVR32_OPC_SATSUB_H,
++  AVR32_OPC_SATSUB_W1,
++  AVR32_OPC_SATSUB_W2,
++  AVR32_OPC_SATU,
++  AVR32_OPC_SBC,
++  AVR32_OPC_SBR,
++  AVR32_OPC_SCALL,
++  AVR32_OPC_SCR,
++  AVR32_OPC_SLEEP,
++  AVR32_OPC_SREQ,
++  AVR32_OPC_SRNE,
++  AVR32_OPC_SRCC,
++  AVR32_OPC_SRCS,
++  AVR32_OPC_SRGE,
++  AVR32_OPC_SRLT,
++  AVR32_OPC_SRMI,
++  AVR32_OPC_SRPL,
++  AVR32_OPC_SRLS,
++  AVR32_OPC_SRGT,
++  AVR32_OPC_SRLE,
++  AVR32_OPC_SRHI,
++  AVR32_OPC_SRVS,
++  AVR32_OPC_SRVC,
++  AVR32_OPC_SRQS,
++  AVR32_OPC_SRAL,
++  AVR32_OPC_SSRF,
++  AVR32_OPC_ST_B1,
++  AVR32_OPC_ST_B2,
++  AVR32_OPC_ST_B5,
++  AVR32_OPC_ST_B3,
++  AVR32_OPC_ST_B4,
++  AVR32_OPC_ST_D1,
++  AVR32_OPC_ST_D2,
++  AVR32_OPC_ST_D3,
++  AVR32_OPC_ST_D5,
++  AVR32_OPC_ST_D4,
++  AVR32_OPC_ST_H1,
++  AVR32_OPC_ST_H2,
++  AVR32_OPC_ST_H5,
++  AVR32_OPC_ST_H3,
++  AVR32_OPC_ST_H4,
++  AVR32_OPC_ST_W1,
++  AVR32_OPC_ST_W2,
++  AVR32_OPC_ST_W5,
++  AVR32_OPC_ST_W3,
++  AVR32_OPC_ST_W4,
++  AVR32_OPC_STC_D1,
++  AVR32_OPC_STC_D2,
++  AVR32_OPC_STC_D3,
++  AVR32_OPC_STC_W1,
++  AVR32_OPC_STC_W2,
++  AVR32_OPC_STC_W3,
++  AVR32_OPC_STC0_D,
++  AVR32_OPC_STC0_W,
++  AVR32_OPC_STCM_D,
++  AVR32_OPC_STCM_D_PU,
++  AVR32_OPC_STCM_W,
++  AVR32_OPC_STCM_W_PU,
++  AVR32_OPC_STCOND,
++  AVR32_OPC_STDSP,
++  AVR32_OPC_STHH_W2,
++  AVR32_OPC_STHH_W1,
++  AVR32_OPC_STM,
++  AVR32_OPC_STM_PU,
++  AVR32_OPC_STMTS,
++  AVR32_OPC_STMTS_PU,
++  AVR32_OPC_STSWP_H,
++  AVR32_OPC_STSWP_W,
++  AVR32_OPC_SUB1,
++  AVR32_OPC_SUB2,
++  AVR32_OPC_SUB5,
++  AVR32_OPC_SUB3_SP,
++  AVR32_OPC_SUB3,
++  AVR32_OPC_SUB4,
++  AVR32_OPC_SUBEQ,
++  AVR32_OPC_SUBNE,
++  AVR32_OPC_SUBCC,
++  AVR32_OPC_SUBCS,
++  AVR32_OPC_SUBGE,
++  AVR32_OPC_SUBLT,
++  AVR32_OPC_SUBMI,
++  AVR32_OPC_SUBPL,
++  AVR32_OPC_SUBLS,
++  AVR32_OPC_SUBGT,
++  AVR32_OPC_SUBLE,
++  AVR32_OPC_SUBHI,
++  AVR32_OPC_SUBVS,
++  AVR32_OPC_SUBVC,
++  AVR32_OPC_SUBQS,
++  AVR32_OPC_SUBAL,
++  AVR32_OPC_SUBFEQ,
++  AVR32_OPC_SUBFNE,
++  AVR32_OPC_SUBFCC,
++  AVR32_OPC_SUBFCS,
++  AVR32_OPC_SUBFGE,
++  AVR32_OPC_SUBFLT,
++  AVR32_OPC_SUBFMI,
++  AVR32_OPC_SUBFPL,
++  AVR32_OPC_SUBFLS,
++  AVR32_OPC_SUBFGT,
++  AVR32_OPC_SUBFLE,
++  AVR32_OPC_SUBFHI,
++  AVR32_OPC_SUBFVS,
++  AVR32_OPC_SUBFVC,
++  AVR32_OPC_SUBFQS,
++  AVR32_OPC_SUBFAL,
++  AVR32_OPC_SUBHH_W,
++  AVR32_OPC_SWAP_B,
++  AVR32_OPC_SWAP_BH,
++  AVR32_OPC_SWAP_H,
++  AVR32_OPC_SYNC,
++  AVR32_OPC_TLBR,
++  AVR32_OPC_TLBS,
++  AVR32_OPC_TLBW,
++  AVR32_OPC_TNBZ,
++  AVR32_OPC_TST,
++  AVR32_OPC_XCHG,
++  AVR32_OPC_MEMC,
++  AVR32_OPC_MEMS,
++  AVR32_OPC_MEMT,
++  AVR32_OPC_BFEXTS,
++  AVR32_OPC_BFEXTU,
++  AVR32_OPC_BFINS,
++  AVR32_OPC_RSUBEQ,
++  AVR32_OPC_RSUBNE,
++  AVR32_OPC_RSUBCC,
++  AVR32_OPC_RSUBCS,
++  AVR32_OPC_RSUBGE,
++  AVR32_OPC_RSUBLT,
++  AVR32_OPC_RSUBMI,
++  AVR32_OPC_RSUBPL,
++  AVR32_OPC_RSUBLS,
++  AVR32_OPC_RSUBGT,
++  AVR32_OPC_RSUBLE,
++  AVR32_OPC_RSUBHI,
++  AVR32_OPC_RSUBVS,
++  AVR32_OPC_RSUBVC,
++  AVR32_OPC_RSUBQS,
++  AVR32_OPC_RSUBAL,
++  AVR32_OPC_ADDEQ,
++  AVR32_OPC_ADDNE,
++  AVR32_OPC_ADDCC,
++  AVR32_OPC_ADDCS,
++  AVR32_OPC_ADDGE,
++  AVR32_OPC_ADDLT,
++  AVR32_OPC_ADDMI,
++  AVR32_OPC_ADDPL,
++  AVR32_OPC_ADDLS,
++  AVR32_OPC_ADDGT,
++  AVR32_OPC_ADDLE,
++  AVR32_OPC_ADDHI,
++  AVR32_OPC_ADDVS,
++  AVR32_OPC_ADDVC,
++  AVR32_OPC_ADDQS,
++  AVR32_OPC_ADDAL,
++  AVR32_OPC_SUB2EQ,
++  AVR32_OPC_SUB2NE,
++  AVR32_OPC_SUB2CC,
++  AVR32_OPC_SUB2CS,
++  AVR32_OPC_SUB2GE,
++  AVR32_OPC_SUB2LT,
++  AVR32_OPC_SUB2MI,
++  AVR32_OPC_SUB2PL,
++  AVR32_OPC_SUB2LS,
++  AVR32_OPC_SUB2GT,
++  AVR32_OPC_SUB2LE,
++  AVR32_OPC_SUB2HI,
++  AVR32_OPC_SUB2VS,
++  AVR32_OPC_SUB2VC,
++  AVR32_OPC_SUB2QS,
++  AVR32_OPC_SUB2AL,
++  AVR32_OPC_ANDEQ,
++  AVR32_OPC_ANDNE,
++  AVR32_OPC_ANDCC,
++  AVR32_OPC_ANDCS,
++  AVR32_OPC_ANDGE,
++  AVR32_OPC_ANDLT,
++  AVR32_OPC_ANDMI,
++  AVR32_OPC_ANDPL,
++  AVR32_OPC_ANDLS,
++  AVR32_OPC_ANDGT,
++  AVR32_OPC_ANDLE,
++  AVR32_OPC_ANDHI,
++  AVR32_OPC_ANDVS,
++  AVR32_OPC_ANDVC,
++  AVR32_OPC_ANDQS,
++  AVR32_OPC_ANDAL,
++  AVR32_OPC_OREQ,
++  AVR32_OPC_ORNE,
++  AVR32_OPC_ORCC,
++  AVR32_OPC_ORCS,
++  AVR32_OPC_ORGE,
++  AVR32_OPC_ORLT,
++  AVR32_OPC_ORMI,
++  AVR32_OPC_ORPL,
++  AVR32_OPC_ORLS,
++  AVR32_OPC_ORGT,
++  AVR32_OPC_ORLE,
++  AVR32_OPC_ORHI,
++  AVR32_OPC_ORVS,
++  AVR32_OPC_ORVC,
++  AVR32_OPC_ORQS,
++  AVR32_OPC_ORAL,
++  AVR32_OPC_EOREQ,
++  AVR32_OPC_EORNE,
++  AVR32_OPC_EORCC,
++  AVR32_OPC_EORCS,
++  AVR32_OPC_EORGE,
++  AVR32_OPC_EORLT,
++  AVR32_OPC_EORMI,
++  AVR32_OPC_EORPL,
++  AVR32_OPC_EORLS,
++  AVR32_OPC_EORGT,
++  AVR32_OPC_EORLE,
++  AVR32_OPC_EORHI,
++  AVR32_OPC_EORVS,
++  AVR32_OPC_EORVC,
++  AVR32_OPC_EORQS,
++  AVR32_OPC_EORAL,
++  AVR32_OPC_LD_WEQ,
++  AVR32_OPC_LD_WNE,
++  AVR32_OPC_LD_WCC,
++  AVR32_OPC_LD_WCS,
++  AVR32_OPC_LD_WGE,
++  AVR32_OPC_LD_WLT,
++  AVR32_OPC_LD_WMI,
++  AVR32_OPC_LD_WPL,
++  AVR32_OPC_LD_WLS,
++  AVR32_OPC_LD_WGT,
++  AVR32_OPC_LD_WLE,
++  AVR32_OPC_LD_WHI,
++  AVR32_OPC_LD_WVS,
++  AVR32_OPC_LD_WVC,
++  AVR32_OPC_LD_WQS,
++  AVR32_OPC_LD_WAL,
++  AVR32_OPC_LD_SHEQ,
++  AVR32_OPC_LD_SHNE,
++  AVR32_OPC_LD_SHCC,
++  AVR32_OPC_LD_SHCS,
++  AVR32_OPC_LD_SHGE,
++  AVR32_OPC_LD_SHLT,
++  AVR32_OPC_LD_SHMI,
++  AVR32_OPC_LD_SHPL,
++  AVR32_OPC_LD_SHLS,
++  AVR32_OPC_LD_SHGT,
++  AVR32_OPC_LD_SHLE,
++  AVR32_OPC_LD_SHHI,
++  AVR32_OPC_LD_SHVS,
++  AVR32_OPC_LD_SHVC,
++  AVR32_OPC_LD_SHQS,
++  AVR32_OPC_LD_SHAL,
++  AVR32_OPC_LD_UHEQ,
++  AVR32_OPC_LD_UHNE,
++  AVR32_OPC_LD_UHCC,
++  AVR32_OPC_LD_UHCS,
++  AVR32_OPC_LD_UHGE,
++  AVR32_OPC_LD_UHLT,
++  AVR32_OPC_LD_UHMI,
++  AVR32_OPC_LD_UHPL,
++  AVR32_OPC_LD_UHLS,
++  AVR32_OPC_LD_UHGT,
++  AVR32_OPC_LD_UHLE,
++  AVR32_OPC_LD_UHHI,
++  AVR32_OPC_LD_UHVS,
++  AVR32_OPC_LD_UHVC,
++  AVR32_OPC_LD_UHQS,
++  AVR32_OPC_LD_UHAL,
++  AVR32_OPC_LD_SBEQ,
++  AVR32_OPC_LD_SBNE,
++  AVR32_OPC_LD_SBCC,
++  AVR32_OPC_LD_SBCS,
++  AVR32_OPC_LD_SBGE,
++  AVR32_OPC_LD_SBLT,
++  AVR32_OPC_LD_SBMI,
++  AVR32_OPC_LD_SBPL,
++  AVR32_OPC_LD_SBLS,
++  AVR32_OPC_LD_SBGT,
++  AVR32_OPC_LD_SBLE,
++  AVR32_OPC_LD_SBHI,
++  AVR32_OPC_LD_SBVS,
++  AVR32_OPC_LD_SBVC,
++  AVR32_OPC_LD_SBQS,
++  AVR32_OPC_LD_SBAL,
++  AVR32_OPC_LD_UBEQ,
++  AVR32_OPC_LD_UBNE,
++  AVR32_OPC_LD_UBCC,
++  AVR32_OPC_LD_UBCS,
++  AVR32_OPC_LD_UBGE,
++  AVR32_OPC_LD_UBLT,
++  AVR32_OPC_LD_UBMI,
++  AVR32_OPC_LD_UBPL,
++  AVR32_OPC_LD_UBLS,
++  AVR32_OPC_LD_UBGT,
++  AVR32_OPC_LD_UBLE,
++  AVR32_OPC_LD_UBHI,
++  AVR32_OPC_LD_UBVS,
++  AVR32_OPC_LD_UBVC,
++  AVR32_OPC_LD_UBQS,
++  AVR32_OPC_LD_UBAL,
++  AVR32_OPC_ST_WEQ,
++  AVR32_OPC_ST_WNE,
++  AVR32_OPC_ST_WCC,
++  AVR32_OPC_ST_WCS,
++  AVR32_OPC_ST_WGE,
++  AVR32_OPC_ST_WLT,
++  AVR32_OPC_ST_WMI,
++  AVR32_OPC_ST_WPL,
++  AVR32_OPC_ST_WLS,
++  AVR32_OPC_ST_WGT,
++  AVR32_OPC_ST_WLE,
++  AVR32_OPC_ST_WHI,
++  AVR32_OPC_ST_WVS,
++  AVR32_OPC_ST_WVC,
++  AVR32_OPC_ST_WQS,
++  AVR32_OPC_ST_WAL,
++  AVR32_OPC_ST_HEQ,
++  AVR32_OPC_ST_HNE,
++  AVR32_OPC_ST_HCC,
++  AVR32_OPC_ST_HCS,
++  AVR32_OPC_ST_HGE,
++  AVR32_OPC_ST_HLT,
++  AVR32_OPC_ST_HMI,
++  AVR32_OPC_ST_HPL,
++  AVR32_OPC_ST_HLS,
++  AVR32_OPC_ST_HGT,
++  AVR32_OPC_ST_HLE,
++  AVR32_OPC_ST_HHI,
++  AVR32_OPC_ST_HVS,
++  AVR32_OPC_ST_HVC,
++  AVR32_OPC_ST_HQS,
++  AVR32_OPC_ST_HAL,
++  AVR32_OPC_ST_BEQ,
++  AVR32_OPC_ST_BNE,
++  AVR32_OPC_ST_BCC,
++  AVR32_OPC_ST_BCS,
++  AVR32_OPC_ST_BGE,
++  AVR32_OPC_ST_BLT,
++  AVR32_OPC_ST_BMI,
++  AVR32_OPC_ST_BPL,
++  AVR32_OPC_ST_BLS,
++  AVR32_OPC_ST_BGT,
++  AVR32_OPC_ST_BLE,
++  AVR32_OPC_ST_BHI,
++  AVR32_OPC_ST_BVS,
++  AVR32_OPC_ST_BVC,
++  AVR32_OPC_ST_BQS,
++  AVR32_OPC_ST_BAL,
++  AVR32_OPC_MOVH,
++  AVR32_OPC_SSCALL,
++  AVR32_OPC_RETSS,
++  AVR32_OPC_FMAC_S,
++  AVR32_OPC_FNMAC_S,
++  AVR32_OPC_FMSC_S,
++  AVR32_OPC_FNMSC_S,
++  AVR32_OPC_FMUL_S,
++  AVR32_OPC_FNMUL_S,
++  AVR32_OPC_FADD_S,
++  AVR32_OPC_FSUB_S,
++  AVR32_OPC_FCASTRS_SW,
++  AVR32_OPC_FCASTRS_UW,
++  AVR32_OPC_FCASTSW_S,
++  AVR32_OPC_FCASTUW_S,
++  AVR32_OPC_FCMP_S,
++  AVR32_OPC_FCHK_S,
++  AVR32_OPC_FRCPA_S,
++  AVR32_OPC_FRSQRTA_S,
++  AVR32_OPC__END_
++};
++#define AVR32_NR_OPCODES AVR32_OPC__END_
++
++enum avr32_syntax_type
++{
++  AVR32_SYNTAX_ABS,
++  AVR32_SYNTAX_ACALL,
++  AVR32_SYNTAX_ACR,
++  AVR32_SYNTAX_ADC,
++  AVR32_SYNTAX_ADD1,
++  AVR32_SYNTAX_ADD2,
++  AVR32_SYNTAX_ADDABS,
++  AVR32_SYNTAX_ADDHH_W,
++  AVR32_SYNTAX_AND1,
++  AVR32_SYNTAX_AND2,
++  AVR32_SYNTAX_AND3,
++  AVR32_SYNTAX_ANDH,
++  AVR32_SYNTAX_ANDH_COH,
++  AVR32_SYNTAX_ANDL,
++  AVR32_SYNTAX_ANDL_COH,
++  AVR32_SYNTAX_ANDN,
++  AVR32_SYNTAX_ASR1,
++  AVR32_SYNTAX_ASR3,
++  AVR32_SYNTAX_ASR2,
++  AVR32_SYNTAX_BFEXTS,
++  AVR32_SYNTAX_BFEXTU,
++  AVR32_SYNTAX_BFINS,
++  AVR32_SYNTAX_BLD,
++  AVR32_SYNTAX_BREQ1,
++  AVR32_SYNTAX_BRNE1,
++  AVR32_SYNTAX_BRCC1,
++  AVR32_SYNTAX_BRCS1,
++  AVR32_SYNTAX_BRGE1,
++  AVR32_SYNTAX_BRLT1,
++  AVR32_SYNTAX_BRMI1,
++  AVR32_SYNTAX_BRPL1,
++  AVR32_SYNTAX_BRHS1,
++  AVR32_SYNTAX_BRLO1,
++  AVR32_SYNTAX_BREQ2,
++  AVR32_SYNTAX_BRNE2,
++  AVR32_SYNTAX_BRCC2,
++  AVR32_SYNTAX_BRCS2,
++  AVR32_SYNTAX_BRGE2,
++  AVR32_SYNTAX_BRLT2,
++  AVR32_SYNTAX_BRMI2,
++  AVR32_SYNTAX_BRPL2,
++  AVR32_SYNTAX_BRLS,
++  AVR32_SYNTAX_BRGT,
++  AVR32_SYNTAX_BRLE,
++  AVR32_SYNTAX_BRHI,
++  AVR32_SYNTAX_BRVS,
++  AVR32_SYNTAX_BRVC,
++  AVR32_SYNTAX_BRQS,
++  AVR32_SYNTAX_BRAL,
++  AVR32_SYNTAX_BRHS2,
++  AVR32_SYNTAX_BRLO2,
++  AVR32_SYNTAX_BREAKPOINT,
++  AVR32_SYNTAX_BREV,
++  AVR32_SYNTAX_BST,
++  AVR32_SYNTAX_CACHE,
++  AVR32_SYNTAX_CASTS_B,
++  AVR32_SYNTAX_CASTS_H,
++  AVR32_SYNTAX_CASTU_B,
++  AVR32_SYNTAX_CASTU_H,
++  AVR32_SYNTAX_CBR,
++  AVR32_SYNTAX_CLZ,
++  AVR32_SYNTAX_COM,
++  AVR32_SYNTAX_COP,
++  AVR32_SYNTAX_CP_B,
++  AVR32_SYNTAX_CP_H,
++  AVR32_SYNTAX_CP_W1,
++  AVR32_SYNTAX_CP_W2,
++  AVR32_SYNTAX_CP_W3,
++  AVR32_SYNTAX_CPC1,
++  AVR32_SYNTAX_CPC2,
++  AVR32_SYNTAX_CSRF,
++  AVR32_SYNTAX_CSRFCZ,
++  AVR32_SYNTAX_DIVS,
++  AVR32_SYNTAX_DIVU,
++  AVR32_SYNTAX_EOR1,
++  AVR32_SYNTAX_EOR2,
++  AVR32_SYNTAX_EOR3,
++  AVR32_SYNTAX_EORL,
++  AVR32_SYNTAX_EORH,
++  AVR32_SYNTAX_FRS,
++  AVR32_SYNTAX_SSCALL,
++  AVR32_SYNTAX_RETSS,
++  AVR32_SYNTAX_ICALL,
++  AVR32_SYNTAX_INCJOSP,
++  AVR32_SYNTAX_LD_D1,
++  AVR32_SYNTAX_LD_D2,
++  AVR32_SYNTAX_LD_D3,
++  AVR32_SYNTAX_LD_D5,
++  AVR32_SYNTAX_LD_D4,
++  AVR32_SYNTAX_LD_SB2,
++  AVR32_SYNTAX_LD_SB1,
++  AVR32_SYNTAX_LD_UB1,
++  AVR32_SYNTAX_LD_UB2,
++  AVR32_SYNTAX_LD_UB5,
++  AVR32_SYNTAX_LD_UB3,
++  AVR32_SYNTAX_LD_UB4,
++  AVR32_SYNTAX_LD_SH1,
++  AVR32_SYNTAX_LD_SH2,
++  AVR32_SYNTAX_LD_SH5,
++  AVR32_SYNTAX_LD_SH3,
++  AVR32_SYNTAX_LD_SH4,
++  AVR32_SYNTAX_LD_UH1,
++  AVR32_SYNTAX_LD_UH2,
++  AVR32_SYNTAX_LD_UH5,
++  AVR32_SYNTAX_LD_UH3,
++  AVR32_SYNTAX_LD_UH4,
++  AVR32_SYNTAX_LD_W1,
++  AVR32_SYNTAX_LD_W2,
++  AVR32_SYNTAX_LD_W5,
++  AVR32_SYNTAX_LD_W6,
++  AVR32_SYNTAX_LD_W3,
++  AVR32_SYNTAX_LD_W4,
++  AVR32_SYNTAX_LDC_D1,
++  AVR32_SYNTAX_LDC_D2,
++  AVR32_SYNTAX_LDC_D3,
++  AVR32_SYNTAX_LDC_W1,
++  AVR32_SYNTAX_LDC_W2,
++  AVR32_SYNTAX_LDC_W3,
++  AVR32_SYNTAX_LDC0_D,
++  AVR32_SYNTAX_LDC0_W,
++  AVR32_SYNTAX_LDCM_D,
++  AVR32_SYNTAX_LDCM_D_PU,
++  AVR32_SYNTAX_LDCM_W,
++  AVR32_SYNTAX_LDCM_W_PU,
++  AVR32_SYNTAX_LDDPC,
++  AVR32_SYNTAX_LDDPC_EXT,
++  AVR32_SYNTAX_LDDSP,
++  AVR32_SYNTAX_LDINS_B,
++  AVR32_SYNTAX_LDINS_H,
++  AVR32_SYNTAX_LDM,
++  AVR32_SYNTAX_LDMTS,
++  AVR32_SYNTAX_LDMTS_PU,
++  AVR32_SYNTAX_LDSWP_SH,
++  AVR32_SYNTAX_LDSWP_UH,
++  AVR32_SYNTAX_LDSWP_W,
++  AVR32_SYNTAX_LSL1,
++  AVR32_SYNTAX_LSL3,
++  AVR32_SYNTAX_LSL2,
++  AVR32_SYNTAX_LSR1,
++  AVR32_SYNTAX_LSR3,
++  AVR32_SYNTAX_LSR2,
++  AVR32_SYNTAX_MAC,
++  AVR32_SYNTAX_MACHH_D,
++  AVR32_SYNTAX_MACHH_W,
++  AVR32_SYNTAX_MACS_D,
++  AVR32_SYNTAX_MACSATHH_W,
++  AVR32_SYNTAX_MACUD,
++  AVR32_SYNTAX_MACWH_D,
++  AVR32_SYNTAX_MAX,
++  AVR32_SYNTAX_MCALL,
++  AVR32_SYNTAX_MFDR,
++  AVR32_SYNTAX_MFSR,
++  AVR32_SYNTAX_MIN,
++  AVR32_SYNTAX_MOV3,
++  AVR32_SYNTAX_MOV1,
++  AVR32_SYNTAX_MOV2,
++  AVR32_SYNTAX_MOVEQ1,
++  AVR32_SYNTAX_MOVNE1,
++  AVR32_SYNTAX_MOVCC1,
++  AVR32_SYNTAX_MOVCS1,
++  AVR32_SYNTAX_MOVGE1,
++  AVR32_SYNTAX_MOVLT1,
++  AVR32_SYNTAX_MOVMI1,
++  AVR32_SYNTAX_MOVPL1,
++  AVR32_SYNTAX_MOVLS1,
++  AVR32_SYNTAX_MOVGT1,
++  AVR32_SYNTAX_MOVLE1,
++  AVR32_SYNTAX_MOVHI1,
++  AVR32_SYNTAX_MOVVS1,
++  AVR32_SYNTAX_MOVVC1,
++  AVR32_SYNTAX_MOVQS1,
++  AVR32_SYNTAX_MOVAL1,
++  AVR32_SYNTAX_MOVHS1,
++  AVR32_SYNTAX_MOVLO1,
++  AVR32_SYNTAX_MOVEQ2,
++  AVR32_SYNTAX_MOVNE2,
++  AVR32_SYNTAX_MOVCC2,
++  AVR32_SYNTAX_MOVCS2,
++  AVR32_SYNTAX_MOVGE2,
++  AVR32_SYNTAX_MOVLT2,
++  AVR32_SYNTAX_MOVMI2,
++  AVR32_SYNTAX_MOVPL2,
++  AVR32_SYNTAX_MOVLS2,
++  AVR32_SYNTAX_MOVGT2,
++  AVR32_SYNTAX_MOVLE2,
++  AVR32_SYNTAX_MOVHI2,
++  AVR32_SYNTAX_MOVVS2,
++  AVR32_SYNTAX_MOVVC2,
++  AVR32_SYNTAX_MOVQS2,
++  AVR32_SYNTAX_MOVAL2,
++  AVR32_SYNTAX_MOVHS2,
++  AVR32_SYNTAX_MOVLO2,
++  AVR32_SYNTAX_MTDR,
++  AVR32_SYNTAX_MTSR,
++  AVR32_SYNTAX_MUL1,
++  AVR32_SYNTAX_MUL2,
++  AVR32_SYNTAX_MUL3,
++  AVR32_SYNTAX_MULHH_W,
++  AVR32_SYNTAX_MULNHH_W,
++  AVR32_SYNTAX_MULNWH_D,
++  AVR32_SYNTAX_MULSD,
++  AVR32_SYNTAX_MULSATHH_H,
++  AVR32_SYNTAX_MULSATHH_W,
++  AVR32_SYNTAX_MULSATRNDHH_H,
++  AVR32_SYNTAX_MULSATRNDWH_W,
++  AVR32_SYNTAX_MULSATWH_W,
++  AVR32_SYNTAX_MULU_D,
++  AVR32_SYNTAX_MULWH_D,
++  AVR32_SYNTAX_MUSFR,
++  AVR32_SYNTAX_MUSTR,
++  AVR32_SYNTAX_MVCR_D,
++  AVR32_SYNTAX_MVCR_W,
++  AVR32_SYNTAX_MVRC_D,
++  AVR32_SYNTAX_MVRC_W,
++  AVR32_SYNTAX_NEG,
++  AVR32_SYNTAX_NOP,
++  AVR32_SYNTAX_OR1,
++  AVR32_SYNTAX_OR2,
++  AVR32_SYNTAX_OR3,
++  AVR32_SYNTAX_ORH,
++  AVR32_SYNTAX_ORL,
++  AVR32_SYNTAX_PABS_SB,
++  AVR32_SYNTAX_PABS_SH,
++  AVR32_SYNTAX_PACKSH_SB,
++  AVR32_SYNTAX_PACKSH_UB,
++  AVR32_SYNTAX_PACKW_SH,
++  AVR32_SYNTAX_PADD_B,
++  AVR32_SYNTAX_PADD_H,
++  AVR32_SYNTAX_PADDH_SH,
++  AVR32_SYNTAX_PADDH_UB,
++  AVR32_SYNTAX_PADDS_SB,
++  AVR32_SYNTAX_PADDS_SH,
++  AVR32_SYNTAX_PADDS_UB,
++  AVR32_SYNTAX_PADDS_UH,
++  AVR32_SYNTAX_PADDSUB_H,
++  AVR32_SYNTAX_PADDSUBH_SH,
++  AVR32_SYNTAX_PADDSUBS_SH,
++  AVR32_SYNTAX_PADDSUBS_UH,
++  AVR32_SYNTAX_PADDX_H,
++  AVR32_SYNTAX_PADDXH_SH,
++  AVR32_SYNTAX_PADDXS_SH,
++  AVR32_SYNTAX_PADDXS_UH,
++  AVR32_SYNTAX_PASR_B,
++  AVR32_SYNTAX_PASR_H,
++  AVR32_SYNTAX_PAVG_SH,
++  AVR32_SYNTAX_PAVG_UB,
++  AVR32_SYNTAX_PLSL_B,
++  AVR32_SYNTAX_PLSL_H,
++  AVR32_SYNTAX_PLSR_B,
++  AVR32_SYNTAX_PLSR_H,
++  AVR32_SYNTAX_PMAX_SH,
++  AVR32_SYNTAX_PMAX_UB,
++  AVR32_SYNTAX_PMIN_SH,
++  AVR32_SYNTAX_PMIN_UB,
++  AVR32_SYNTAX_POPJC,
++  AVR32_SYNTAX_POPM,
++  AVR32_SYNTAX_POPM_E,
++  AVR32_SYNTAX_PREF,
++  AVR32_SYNTAX_PSAD,
++  AVR32_SYNTAX_PSUB_B,
++  AVR32_SYNTAX_PSUB_H,
++  AVR32_SYNTAX_PSUBADD_H,
++  AVR32_SYNTAX_PSUBADDH_SH,
++  AVR32_SYNTAX_PSUBADDS_SH,
++  AVR32_SYNTAX_PSUBADDS_UH,
++  AVR32_SYNTAX_PSUBH_SH,
++  AVR32_SYNTAX_PSUBH_UB,
++  AVR32_SYNTAX_PSUBS_SB,
++  AVR32_SYNTAX_PSUBS_SH,
++  AVR32_SYNTAX_PSUBS_UB,
++  AVR32_SYNTAX_PSUBS_UH,
++  AVR32_SYNTAX_PSUBX_H,
++  AVR32_SYNTAX_PSUBXH_SH,
++  AVR32_SYNTAX_PSUBXS_SH,
++  AVR32_SYNTAX_PSUBXS_UH,
++  AVR32_SYNTAX_PUNPCKSB_H,
++  AVR32_SYNTAX_PUNPCKUB_H,
++  AVR32_SYNTAX_PUSHJC,
++  AVR32_SYNTAX_PUSHM,
++  AVR32_SYNTAX_PUSHM_E,
++  AVR32_SYNTAX_RCALL1,
++  AVR32_SYNTAX_RCALL2,
++  AVR32_SYNTAX_RETEQ,
++  AVR32_SYNTAX_RETNE,
++  AVR32_SYNTAX_RETCC,
++  AVR32_SYNTAX_RETCS,
++  AVR32_SYNTAX_RETGE,
++  AVR32_SYNTAX_RETLT,
++  AVR32_SYNTAX_RETMI,
++  AVR32_SYNTAX_RETPL,
++  AVR32_SYNTAX_RETLS,
++  AVR32_SYNTAX_RETGT,
++  AVR32_SYNTAX_RETLE,
++  AVR32_SYNTAX_RETHI,
++  AVR32_SYNTAX_RETVS,
++  AVR32_SYNTAX_RETVC,
++  AVR32_SYNTAX_RETQS,
++  AVR32_SYNTAX_RETAL,
++  AVR32_SYNTAX_RETHS,
++  AVR32_SYNTAX_RETLO,
++  AVR32_SYNTAX_RETD,
++  AVR32_SYNTAX_RETE,
++  AVR32_SYNTAX_RETJ,
++  AVR32_SYNTAX_RETS,
++  AVR32_SYNTAX_RJMP,
++  AVR32_SYNTAX_ROL,
++  AVR32_SYNTAX_ROR,
++  AVR32_SYNTAX_RSUB1,
++  AVR32_SYNTAX_RSUB2,
++  AVR32_SYNTAX_SATADD_H,
++  AVR32_SYNTAX_SATADD_W,
++  AVR32_SYNTAX_SATRNDS,
++  AVR32_SYNTAX_SATRNDU,
++  AVR32_SYNTAX_SATS,
++  AVR32_SYNTAX_SATSUB_H,
++  AVR32_SYNTAX_SATSUB_W1,
++  AVR32_SYNTAX_SATSUB_W2,
++  AVR32_SYNTAX_SATU,
++  AVR32_SYNTAX_SBC,
++  AVR32_SYNTAX_SBR,
++  AVR32_SYNTAX_SCALL,
++  AVR32_SYNTAX_SCR,
++  AVR32_SYNTAX_SLEEP,
++  AVR32_SYNTAX_SREQ,
++  AVR32_SYNTAX_SRNE,
++  AVR32_SYNTAX_SRCC,
++  AVR32_SYNTAX_SRCS,
++  AVR32_SYNTAX_SRGE,
++  AVR32_SYNTAX_SRLT,
++  AVR32_SYNTAX_SRMI,
++  AVR32_SYNTAX_SRPL,
++  AVR32_SYNTAX_SRLS,
++  AVR32_SYNTAX_SRGT,
++  AVR32_SYNTAX_SRLE,
++  AVR32_SYNTAX_SRHI,
++  AVR32_SYNTAX_SRVS,
++  AVR32_SYNTAX_SRVC,
++  AVR32_SYNTAX_SRQS,
++  AVR32_SYNTAX_SRAL,
++  AVR32_SYNTAX_SRHS,
++  AVR32_SYNTAX_SRLO,
++  AVR32_SYNTAX_SSRF,
++  AVR32_SYNTAX_ST_B1,
++  AVR32_SYNTAX_ST_B2,
++  AVR32_SYNTAX_ST_B5,
++  AVR32_SYNTAX_ST_B3,
++  AVR32_SYNTAX_ST_B4,
++  AVR32_SYNTAX_ST_D1,
++  AVR32_SYNTAX_ST_D2,
++  AVR32_SYNTAX_ST_D3,
++  AVR32_SYNTAX_ST_D5,
++  AVR32_SYNTAX_ST_D4,
++  AVR32_SYNTAX_ST_H1,
++  AVR32_SYNTAX_ST_H2,
++  AVR32_SYNTAX_ST_H5,
++  AVR32_SYNTAX_ST_H3,
++  AVR32_SYNTAX_ST_H4,
++  AVR32_SYNTAX_ST_W1,
++  AVR32_SYNTAX_ST_W2,
++  AVR32_SYNTAX_ST_W5,
++  AVR32_SYNTAX_ST_W3,
++  AVR32_SYNTAX_ST_W4,
++  AVR32_SYNTAX_STC_D1,
++  AVR32_SYNTAX_STC_D2,
++  AVR32_SYNTAX_STC_D3,
++  AVR32_SYNTAX_STC_W1,
++  AVR32_SYNTAX_STC_W2,
++  AVR32_SYNTAX_STC_W3,
++  AVR32_SYNTAX_STC0_D,
++  AVR32_SYNTAX_STC0_W,
++  AVR32_SYNTAX_STCM_D,
++  AVR32_SYNTAX_STCM_D_PU,
++  AVR32_SYNTAX_STCM_W,
++  AVR32_SYNTAX_STCM_W_PU,
++  AVR32_SYNTAX_STCOND,
++  AVR32_SYNTAX_STDSP,
++  AVR32_SYNTAX_STHH_W2,
++  AVR32_SYNTAX_STHH_W1,
++  AVR32_SYNTAX_STM,
++  AVR32_SYNTAX_STM_PU,
++  AVR32_SYNTAX_STMTS,
++  AVR32_SYNTAX_STMTS_PU,
++  AVR32_SYNTAX_STSWP_H,
++  AVR32_SYNTAX_STSWP_W,
++  AVR32_SYNTAX_SUB1,
++  AVR32_SYNTAX_SUB2,
++  AVR32_SYNTAX_SUB5,
++  AVR32_SYNTAX_SUB3_SP,
++  AVR32_SYNTAX_SUB3,
++  AVR32_SYNTAX_SUB4,
++  AVR32_SYNTAX_SUBEQ,
++  AVR32_SYNTAX_SUBNE,
++  AVR32_SYNTAX_SUBCC,
++  AVR32_SYNTAX_SUBCS,
++  AVR32_SYNTAX_SUBGE,
++  AVR32_SYNTAX_SUBLT,
++  AVR32_SYNTAX_SUBMI,
++  AVR32_SYNTAX_SUBPL,
++  AVR32_SYNTAX_SUBLS,
++  AVR32_SYNTAX_SUBGT,
++  AVR32_SYNTAX_SUBLE,
++  AVR32_SYNTAX_SUBHI,
++  AVR32_SYNTAX_SUBVS,
++  AVR32_SYNTAX_SUBVC,
++  AVR32_SYNTAX_SUBQS,
++  AVR32_SYNTAX_SUBAL,
++  AVR32_SYNTAX_SUBHS,
++  AVR32_SYNTAX_SUBLO,
++  AVR32_SYNTAX_SUBFEQ,
++  AVR32_SYNTAX_SUBFNE,
++  AVR32_SYNTAX_SUBFCC,
++  AVR32_SYNTAX_SUBFCS,
++  AVR32_SYNTAX_SUBFGE,
++  AVR32_SYNTAX_SUBFLT,
++  AVR32_SYNTAX_SUBFMI,
++  AVR32_SYNTAX_SUBFPL,
++  AVR32_SYNTAX_SUBFLS,
++  AVR32_SYNTAX_SUBFGT,
++  AVR32_SYNTAX_SUBFLE,
++  AVR32_SYNTAX_SUBFHI,
++  AVR32_SYNTAX_SUBFVS,
++  AVR32_SYNTAX_SUBFVC,
++  AVR32_SYNTAX_SUBFQS,
++  AVR32_SYNTAX_SUBFAL,
++  AVR32_SYNTAX_SUBFHS,
++  AVR32_SYNTAX_SUBFLO,
++  AVR32_SYNTAX_SUBHH_W,
++  AVR32_SYNTAX_SWAP_B,
++  AVR32_SYNTAX_SWAP_BH,
++  AVR32_SYNTAX_SWAP_H,
++  AVR32_SYNTAX_SYNC,
++  AVR32_SYNTAX_TLBR,
++  AVR32_SYNTAX_TLBS,
++  AVR32_SYNTAX_TLBW,
++  AVR32_SYNTAX_TNBZ,
++  AVR32_SYNTAX_TST,
++  AVR32_SYNTAX_XCHG,
++  AVR32_SYNTAX_MEMC,
++  AVR32_SYNTAX_MEMS,
++  AVR32_SYNTAX_MEMT,
++  AVR32_SYNTAX_FMAC_S,
++  AVR32_SYNTAX_FNMAC_S,
++  AVR32_SYNTAX_FMSC_S,
++  AVR32_SYNTAX_FNMSC_S,
++  AVR32_SYNTAX_FMUL_S,
++  AVR32_SYNTAX_FNMUL_S,
++  AVR32_SYNTAX_FADD_S,
++  AVR32_SYNTAX_FSUB_S,
++  AVR32_SYNTAX_FCASTRS_SW,
++  AVR32_SYNTAX_FCASTRS_UW,
++  AVR32_SYNTAX_FCASTSW_S,
++  AVR32_SYNTAX_FCASTUW_S,
++  AVR32_SYNTAX_FCMP_S,
++  AVR32_SYNTAX_FCHK_S,
++  AVR32_SYNTAX_FRCPA_S,
++  AVR32_SYNTAX_FRSQRTA_S,
++  AVR32_SYNTAX_LDA_W,
++  AVR32_SYNTAX_CALL,
++  AVR32_SYNTAX_PICOSVMAC0,
++  AVR32_SYNTAX_PICOSVMAC1,
++  AVR32_SYNTAX_PICOSVMAC2,
++  AVR32_SYNTAX_PICOSVMAC3,
++  AVR32_SYNTAX_PICOSVMUL0,
++  AVR32_SYNTAX_PICOSVMUL1,
++  AVR32_SYNTAX_PICOSVMUL2,
++  AVR32_SYNTAX_PICOSVMUL3,
++  AVR32_SYNTAX_PICOVMAC0,
++  AVR32_SYNTAX_PICOVMAC1,
++  AVR32_SYNTAX_PICOVMAC2,
++  AVR32_SYNTAX_PICOVMAC3,
++  AVR32_SYNTAX_PICOVMUL0,
++  AVR32_SYNTAX_PICOVMUL1,
++  AVR32_SYNTAX_PICOVMUL2,
++  AVR32_SYNTAX_PICOVMUL3,
++  AVR32_SYNTAX_PICOLD_D2,
++  AVR32_SYNTAX_PICOLD_D3,
++  AVR32_SYNTAX_PICOLD_D1,
++  AVR32_SYNTAX_PICOLD_W2,
++  AVR32_SYNTAX_PICOLD_W3,
++  AVR32_SYNTAX_PICOLD_W1,
++  AVR32_SYNTAX_PICOLDM_D,
++  AVR32_SYNTAX_PICOLDM_D_PU,
++  AVR32_SYNTAX_PICOLDM_W,
++  AVR32_SYNTAX_PICOLDM_W_PU,
++  AVR32_SYNTAX_PICOMV_D1,
++  AVR32_SYNTAX_PICOMV_D2,
++  AVR32_SYNTAX_PICOMV_W1,
++  AVR32_SYNTAX_PICOMV_W2,
++  AVR32_SYNTAX_PICOST_D2,
++  AVR32_SYNTAX_PICOST_D3,
++  AVR32_SYNTAX_PICOST_D1,
++  AVR32_SYNTAX_PICOST_W2,
++  AVR32_SYNTAX_PICOST_W3,
++  AVR32_SYNTAX_PICOST_W1,
++  AVR32_SYNTAX_PICOSTM_D,
++  AVR32_SYNTAX_PICOSTM_D_PU,
++  AVR32_SYNTAX_PICOSTM_W,
++  AVR32_SYNTAX_PICOSTM_W_PU,
++  AVR32_SYNTAX_RSUBEQ,
++  AVR32_SYNTAX_RSUBNE,
++  AVR32_SYNTAX_RSUBCC,
++  AVR32_SYNTAX_RSUBCS,
++  AVR32_SYNTAX_RSUBGE,
++  AVR32_SYNTAX_RSUBLT,
++  AVR32_SYNTAX_RSUBMI,
++  AVR32_SYNTAX_RSUBPL,
++  AVR32_SYNTAX_RSUBLS,
++  AVR32_SYNTAX_RSUBGT,
++  AVR32_SYNTAX_RSUBLE,
++  AVR32_SYNTAX_RSUBHI,
++  AVR32_SYNTAX_RSUBVS,
++  AVR32_SYNTAX_RSUBVC,
++  AVR32_SYNTAX_RSUBQS,
++  AVR32_SYNTAX_RSUBAL,
++  AVR32_SYNTAX_RSUBHS,
++  AVR32_SYNTAX_RSUBLO,
++  AVR32_SYNTAX_ADDEQ,
++  AVR32_SYNTAX_ADDNE,
++  AVR32_SYNTAX_ADDCC,
++  AVR32_SYNTAX_ADDCS,
++  AVR32_SYNTAX_ADDGE,
++  AVR32_SYNTAX_ADDLT,
++  AVR32_SYNTAX_ADDMI,
++  AVR32_SYNTAX_ADDPL,
++  AVR32_SYNTAX_ADDLS,
++  AVR32_SYNTAX_ADDGT,
++  AVR32_SYNTAX_ADDLE,
++  AVR32_SYNTAX_ADDHI,
++  AVR32_SYNTAX_ADDVS,
++  AVR32_SYNTAX_ADDVC,
++  AVR32_SYNTAX_ADDQS,
++  AVR32_SYNTAX_ADDAL,
++  AVR32_SYNTAX_ADDHS,
++  AVR32_SYNTAX_ADDLO,
++  AVR32_SYNTAX_SUB2EQ,
++  AVR32_SYNTAX_SUB2NE,
++  AVR32_SYNTAX_SUB2CC,
++  AVR32_SYNTAX_SUB2CS,
++  AVR32_SYNTAX_SUB2GE,
++  AVR32_SYNTAX_SUB2LT,
++  AVR32_SYNTAX_SUB2MI,
++  AVR32_SYNTAX_SUB2PL,
++  AVR32_SYNTAX_SUB2LS,
++  AVR32_SYNTAX_SUB2GT,
++  AVR32_SYNTAX_SUB2LE,
++  AVR32_SYNTAX_SUB2HI,
++  AVR32_SYNTAX_SUB2VS,
++  AVR32_SYNTAX_SUB2VC,
++  AVR32_SYNTAX_SUB2QS,
++  AVR32_SYNTAX_SUB2AL,
++  AVR32_SYNTAX_SUB2HS,
++  AVR32_SYNTAX_SUB2LO,
++  AVR32_SYNTAX_ANDEQ,
++  AVR32_SYNTAX_ANDNE,
++  AVR32_SYNTAX_ANDCC,
++  AVR32_SYNTAX_ANDCS,
++  AVR32_SYNTAX_ANDGE,
++  AVR32_SYNTAX_ANDLT,
++  AVR32_SYNTAX_ANDMI,
++  AVR32_SYNTAX_ANDPL,
++  AVR32_SYNTAX_ANDLS,
++  AVR32_SYNTAX_ANDGT,
++  AVR32_SYNTAX_ANDLE,
++  AVR32_SYNTAX_ANDHI,
++  AVR32_SYNTAX_ANDVS,
++  AVR32_SYNTAX_ANDVC,
++  AVR32_SYNTAX_ANDQS,
++  AVR32_SYNTAX_ANDAL,
++  AVR32_SYNTAX_ANDHS,
++  AVR32_SYNTAX_ANDLO,
++  AVR32_SYNTAX_OREQ,
++  AVR32_SYNTAX_ORNE,
++  AVR32_SYNTAX_ORCC,
++  AVR32_SYNTAX_ORCS,
++  AVR32_SYNTAX_ORGE,
++  AVR32_SYNTAX_ORLT,
++  AVR32_SYNTAX_ORMI,
++  AVR32_SYNTAX_ORPL,
++  AVR32_SYNTAX_ORLS,
++  AVR32_SYNTAX_ORGT,
++  AVR32_SYNTAX_ORLE,
++  AVR32_SYNTAX_ORHI,
++  AVR32_SYNTAX_ORVS,
++  AVR32_SYNTAX_ORVC,
++  AVR32_SYNTAX_ORQS,
++  AVR32_SYNTAX_ORAL,
++  AVR32_SYNTAX_ORHS,
++  AVR32_SYNTAX_ORLO,
++  AVR32_SYNTAX_EOREQ,
++  AVR32_SYNTAX_EORNE,
++  AVR32_SYNTAX_EORCC,
++  AVR32_SYNTAX_EORCS,
++  AVR32_SYNTAX_EORGE,
++  AVR32_SYNTAX_EORLT,
++  AVR32_SYNTAX_EORMI,
++  AVR32_SYNTAX_EORPL,
++  AVR32_SYNTAX_EORLS,
++  AVR32_SYNTAX_EORGT,
++  AVR32_SYNTAX_EORLE,
++  AVR32_SYNTAX_EORHI,
++  AVR32_SYNTAX_EORVS,
++  AVR32_SYNTAX_EORVC,
++  AVR32_SYNTAX_EORQS,
++  AVR32_SYNTAX_EORAL,
++  AVR32_SYNTAX_EORHS,
++  AVR32_SYNTAX_EORLO,
++  AVR32_SYNTAX_LD_WEQ,
++  AVR32_SYNTAX_LD_WNE,
++  AVR32_SYNTAX_LD_WCC,
++  AVR32_SYNTAX_LD_WCS,
++  AVR32_SYNTAX_LD_WGE,
++  AVR32_SYNTAX_LD_WLT,
++  AVR32_SYNTAX_LD_WMI,
++  AVR32_SYNTAX_LD_WPL,
++  AVR32_SYNTAX_LD_WLS,
++  AVR32_SYNTAX_LD_WGT,
++  AVR32_SYNTAX_LD_WLE,
++  AVR32_SYNTAX_LD_WHI,
++  AVR32_SYNTAX_LD_WVS,
++  AVR32_SYNTAX_LD_WVC,
++  AVR32_SYNTAX_LD_WQS,
++  AVR32_SYNTAX_LD_WAL,
++  AVR32_SYNTAX_LD_WHS,
++  AVR32_SYNTAX_LD_WLO,
++  AVR32_SYNTAX_LD_SHEQ,
++  AVR32_SYNTAX_LD_SHNE,
++  AVR32_SYNTAX_LD_SHCC,
++  AVR32_SYNTAX_LD_SHCS,
++  AVR32_SYNTAX_LD_SHGE,
++  AVR32_SYNTAX_LD_SHLT,
++  AVR32_SYNTAX_LD_SHMI,
++  AVR32_SYNTAX_LD_SHPL,
++  AVR32_SYNTAX_LD_SHLS,
++  AVR32_SYNTAX_LD_SHGT,
++  AVR32_SYNTAX_LD_SHLE,
++  AVR32_SYNTAX_LD_SHHI,
++  AVR32_SYNTAX_LD_SHVS,
++  AVR32_SYNTAX_LD_SHVC,
++  AVR32_SYNTAX_LD_SHQS,
++  AVR32_SYNTAX_LD_SHAL,
++  AVR32_SYNTAX_LD_SHHS,
++  AVR32_SYNTAX_LD_SHLO,
++  AVR32_SYNTAX_LD_UHEQ,
++  AVR32_SYNTAX_LD_UHNE,
++  AVR32_SYNTAX_LD_UHCC,
++  AVR32_SYNTAX_LD_UHCS,
++  AVR32_SYNTAX_LD_UHGE,
++  AVR32_SYNTAX_LD_UHLT,
++  AVR32_SYNTAX_LD_UHMI,
++  AVR32_SYNTAX_LD_UHPL,
++  AVR32_SYNTAX_LD_UHLS,
++  AVR32_SYNTAX_LD_UHGT,
++  AVR32_SYNTAX_LD_UHLE,
++  AVR32_SYNTAX_LD_UHHI,
++  AVR32_SYNTAX_LD_UHVS,
++  AVR32_SYNTAX_LD_UHVC,
++  AVR32_SYNTAX_LD_UHQS,
++  AVR32_SYNTAX_LD_UHAL,
++  AVR32_SYNTAX_LD_UHHS,
++  AVR32_SYNTAX_LD_UHLO,
++  AVR32_SYNTAX_LD_SBEQ,
++  AVR32_SYNTAX_LD_SBNE,
++  AVR32_SYNTAX_LD_SBCC,
++  AVR32_SYNTAX_LD_SBCS,
++  AVR32_SYNTAX_LD_SBGE,
++  AVR32_SYNTAX_LD_SBLT,
++  AVR32_SYNTAX_LD_SBMI,
++  AVR32_SYNTAX_LD_SBPL,
++  AVR32_SYNTAX_LD_SBLS,
++  AVR32_SYNTAX_LD_SBGT,
++  AVR32_SYNTAX_LD_SBLE,
++  AVR32_SYNTAX_LD_SBHI,
++  AVR32_SYNTAX_LD_SBVS,
++  AVR32_SYNTAX_LD_SBVC,
++  AVR32_SYNTAX_LD_SBQS,
++  AVR32_SYNTAX_LD_SBAL,
++  AVR32_SYNTAX_LD_SBHS,
++  AVR32_SYNTAX_LD_SBLO,
++  AVR32_SYNTAX_LD_UBEQ,
++  AVR32_SYNTAX_LD_UBNE,
++  AVR32_SYNTAX_LD_UBCC,
++  AVR32_SYNTAX_LD_UBCS,
++  AVR32_SYNTAX_LD_UBGE,
++  AVR32_SYNTAX_LD_UBLT,
++  AVR32_SYNTAX_LD_UBMI,
++  AVR32_SYNTAX_LD_UBPL,
++  AVR32_SYNTAX_LD_UBLS,
++  AVR32_SYNTAX_LD_UBGT,
++  AVR32_SYNTAX_LD_UBLE,
++  AVR32_SYNTAX_LD_UBHI,
++  AVR32_SYNTAX_LD_UBVS,
++  AVR32_SYNTAX_LD_UBVC,
++  AVR32_SYNTAX_LD_UBQS,
++  AVR32_SYNTAX_LD_UBAL,
++  AVR32_SYNTAX_LD_UBHS,
++  AVR32_SYNTAX_LD_UBLO,
++  AVR32_SYNTAX_ST_WEQ,
++  AVR32_SYNTAX_ST_WNE,
++  AVR32_SYNTAX_ST_WCC,
++  AVR32_SYNTAX_ST_WCS,
++  AVR32_SYNTAX_ST_WGE,
++  AVR32_SYNTAX_ST_WLT,
++  AVR32_SYNTAX_ST_WMI,
++  AVR32_SYNTAX_ST_WPL,
++  AVR32_SYNTAX_ST_WLS,
++  AVR32_SYNTAX_ST_WGT,
++  AVR32_SYNTAX_ST_WLE,
++  AVR32_SYNTAX_ST_WHI,
++  AVR32_SYNTAX_ST_WVS,
++  AVR32_SYNTAX_ST_WVC,
++  AVR32_SYNTAX_ST_WQS,
++  AVR32_SYNTAX_ST_WAL,
++  AVR32_SYNTAX_ST_WHS,
++  AVR32_SYNTAX_ST_WLO,
++  AVR32_SYNTAX_ST_HEQ,
++  AVR32_SYNTAX_ST_HNE,
++  AVR32_SYNTAX_ST_HCC,
++  AVR32_SYNTAX_ST_HCS,
++  AVR32_SYNTAX_ST_HGE,
++  AVR32_SYNTAX_ST_HLT,
++  AVR32_SYNTAX_ST_HMI,
++  AVR32_SYNTAX_ST_HPL,
++  AVR32_SYNTAX_ST_HLS,
++  AVR32_SYNTAX_ST_HGT,
++  AVR32_SYNTAX_ST_HLE,
++  AVR32_SYNTAX_ST_HHI,
++  AVR32_SYNTAX_ST_HVS,
++  AVR32_SYNTAX_ST_HVC,
++  AVR32_SYNTAX_ST_HQS,
++  AVR32_SYNTAX_ST_HAL,
++  AVR32_SYNTAX_ST_HHS,
++  AVR32_SYNTAX_ST_HLO,
++  AVR32_SYNTAX_ST_BEQ,
++  AVR32_SYNTAX_ST_BNE,
++  AVR32_SYNTAX_ST_BCC,
++  AVR32_SYNTAX_ST_BCS,
++  AVR32_SYNTAX_ST_BGE,
++  AVR32_SYNTAX_ST_BLT,
++  AVR32_SYNTAX_ST_BMI,
++  AVR32_SYNTAX_ST_BPL,
++  AVR32_SYNTAX_ST_BLS,
++  AVR32_SYNTAX_ST_BGT,
++  AVR32_SYNTAX_ST_BLE,
++  AVR32_SYNTAX_ST_BHI,
++  AVR32_SYNTAX_ST_BVS,
++  AVR32_SYNTAX_ST_BVC,
++  AVR32_SYNTAX_ST_BQS,
++  AVR32_SYNTAX_ST_BAL,
++  AVR32_SYNTAX_ST_BHS,
++  AVR32_SYNTAX_ST_BLO,
++  AVR32_SYNTAX_MOVH,
++  AVR32_SYNTAX__END_
++};
++#define AVR32_NR_SYNTAX AVR32_SYNTAX__END_
++
++enum avr32_alias_type
++  {
++    AVR32_ALIAS_PICOSVMAC0,
++    AVR32_ALIAS_PICOSVMAC1,
++    AVR32_ALIAS_PICOSVMAC2,
++    AVR32_ALIAS_PICOSVMAC3,
++    AVR32_ALIAS_PICOSVMUL0,
++    AVR32_ALIAS_PICOSVMUL1,
++    AVR32_ALIAS_PICOSVMUL2,
++    AVR32_ALIAS_PICOSVMUL3,
++    AVR32_ALIAS_PICOVMAC0,
++    AVR32_ALIAS_PICOVMAC1,
++    AVR32_ALIAS_PICOVMAC2,
++    AVR32_ALIAS_PICOVMAC3,
++    AVR32_ALIAS_PICOVMUL0,
++    AVR32_ALIAS_PICOVMUL1,
++    AVR32_ALIAS_PICOVMUL2,
++    AVR32_ALIAS_PICOVMUL3,
++    AVR32_ALIAS_PICOLD_D1,
++    AVR32_ALIAS_PICOLD_D2,
++    AVR32_ALIAS_PICOLD_D3,
++    AVR32_ALIAS_PICOLD_W1,
++    AVR32_ALIAS_PICOLD_W2,
++    AVR32_ALIAS_PICOLD_W3,
++    AVR32_ALIAS_PICOLDM_D,
++    AVR32_ALIAS_PICOLDM_D_PU,
++    AVR32_ALIAS_PICOLDM_W,
++    AVR32_ALIAS_PICOLDM_W_PU,
++    AVR32_ALIAS_PICOMV_D1,
++    AVR32_ALIAS_PICOMV_D2,
++    AVR32_ALIAS_PICOMV_W1,
++    AVR32_ALIAS_PICOMV_W2,
++    AVR32_ALIAS_PICOST_D1,
++    AVR32_ALIAS_PICOST_D2,
++    AVR32_ALIAS_PICOST_D3,
++    AVR32_ALIAS_PICOST_W1,
++    AVR32_ALIAS_PICOST_W2,
++    AVR32_ALIAS_PICOST_W3,
++    AVR32_ALIAS_PICOSTM_D,
++    AVR32_ALIAS_PICOSTM_D_PU,
++    AVR32_ALIAS_PICOSTM_W,
++    AVR32_ALIAS_PICOSTM_W_PU,
++    AVR32_ALIAS__END_
++  };
++#define AVR32_NR_ALIAS AVR32_ALIAS__END_
++
++enum avr32_mnemonic_type
++{
++  AVR32_MNEMONIC_ABS,
++  AVR32_MNEMONIC_ACALL,
++  AVR32_MNEMONIC_ACR,
++  AVR32_MNEMONIC_ADC,
++  AVR32_MNEMONIC_ADD,
++  AVR32_MNEMONIC_ADDABS,
++  AVR32_MNEMONIC_ADDHH_W,
++  AVR32_MNEMONIC_AND,
++  AVR32_MNEMONIC_ANDH,
++  AVR32_MNEMONIC_ANDL,
++  AVR32_MNEMONIC_ANDN,
++  AVR32_MNEMONIC_ASR,
++  AVR32_MNEMONIC_BFEXTS,
++  AVR32_MNEMONIC_BFEXTU,
++  AVR32_MNEMONIC_BFINS,
++  AVR32_MNEMONIC_BLD,
++  AVR32_MNEMONIC_BREQ,
++  AVR32_MNEMONIC_BRNE,
++  AVR32_MNEMONIC_BRCC,
++  AVR32_MNEMONIC_BRCS,
++  AVR32_MNEMONIC_BRGE,
++  AVR32_MNEMONIC_BRLT,
++  AVR32_MNEMONIC_BRMI,
++  AVR32_MNEMONIC_BRPL,
++  AVR32_MNEMONIC_BRHS,
++  AVR32_MNEMONIC_BRLO,
++  AVR32_MNEMONIC_BRLS,
++  AVR32_MNEMONIC_BRGT,
++  AVR32_MNEMONIC_BRLE,
++  AVR32_MNEMONIC_BRHI,
++  AVR32_MNEMONIC_BRVS,
++  AVR32_MNEMONIC_BRVC,
++  AVR32_MNEMONIC_BRQS,
++  AVR32_MNEMONIC_BRAL,
++  AVR32_MNEMONIC_BREAKPOINT,
++  AVR32_MNEMONIC_BREV,
++  AVR32_MNEMONIC_BST,
++  AVR32_MNEMONIC_CACHE,
++  AVR32_MNEMONIC_CASTS_B,
++  AVR32_MNEMONIC_CASTS_H,
++  AVR32_MNEMONIC_CASTU_B,
++  AVR32_MNEMONIC_CASTU_H,
++  AVR32_MNEMONIC_CBR,
++  AVR32_MNEMONIC_CLZ,
++  AVR32_MNEMONIC_COM,
++  AVR32_MNEMONIC_COP,
++  AVR32_MNEMONIC_CP_B,
++  AVR32_MNEMONIC_CP_H,
++  AVR32_MNEMONIC_CP_W,
++  AVR32_MNEMONIC_CP,
++  AVR32_MNEMONIC_CPC,
++  AVR32_MNEMONIC_CSRF,
++  AVR32_MNEMONIC_CSRFCZ,
++  AVR32_MNEMONIC_DIVS,
++  AVR32_MNEMONIC_DIVU,
++  AVR32_MNEMONIC_EOR,
++  AVR32_MNEMONIC_EORL,
++  AVR32_MNEMONIC_EORH,
++  AVR32_MNEMONIC_FRS,
++  AVR32_MNEMONIC_SSCALL,
++  AVR32_MNEMONIC_RETSS,
++  AVR32_MNEMONIC_ICALL,
++  AVR32_MNEMONIC_INCJOSP,
++  AVR32_MNEMONIC_LD_D,
++  AVR32_MNEMONIC_LD_SB,
++  AVR32_MNEMONIC_LD_UB,
++  AVR32_MNEMONIC_LD_SH,
++  AVR32_MNEMONIC_LD_UH,
++  AVR32_MNEMONIC_LD_W,
++  AVR32_MNEMONIC_LDC_D,
++  AVR32_MNEMONIC_LDC_W,
++  AVR32_MNEMONIC_LDC0_D,
++  AVR32_MNEMONIC_LDC0_W,
++  AVR32_MNEMONIC_LDCM_D,
++  AVR32_MNEMONIC_LDCM_W,
++  AVR32_MNEMONIC_LDDPC,
++  AVR32_MNEMONIC_LDDSP,
++  AVR32_MNEMONIC_LDINS_B,
++  AVR32_MNEMONIC_LDINS_H,
++  AVR32_MNEMONIC_LDM,
++  AVR32_MNEMONIC_LDMTS,
++  AVR32_MNEMONIC_LDSWP_SH,
++  AVR32_MNEMONIC_LDSWP_UH,
++  AVR32_MNEMONIC_LDSWP_W,
++  AVR32_MNEMONIC_LSL,
++  AVR32_MNEMONIC_LSR,
++  AVR32_MNEMONIC_MAC,
++  AVR32_MNEMONIC_MACHH_D,
++  AVR32_MNEMONIC_MACHH_W,
++  AVR32_MNEMONIC_MACS_D,
++  AVR32_MNEMONIC_MACSATHH_W,
++  AVR32_MNEMONIC_MACU_D,
++  AVR32_MNEMONIC_MACWH_D,
++  AVR32_MNEMONIC_MAX,
++  AVR32_MNEMONIC_MCALL,
++  AVR32_MNEMONIC_MFDR,
++  AVR32_MNEMONIC_MFSR,
++  AVR32_MNEMONIC_MIN,
++  AVR32_MNEMONIC_MOV,
++  AVR32_MNEMONIC_MOVEQ,
++  AVR32_MNEMONIC_MOVNE,
++  AVR32_MNEMONIC_MOVCC,
++  AVR32_MNEMONIC_MOVCS,
++  AVR32_MNEMONIC_MOVGE,
++  AVR32_MNEMONIC_MOVLT,
++  AVR32_MNEMONIC_MOVMI,
++  AVR32_MNEMONIC_MOVPL,
++  AVR32_MNEMONIC_MOVLS,
++  AVR32_MNEMONIC_MOVGT,
++  AVR32_MNEMONIC_MOVLE,
++  AVR32_MNEMONIC_MOVHI,
++  AVR32_MNEMONIC_MOVVS,
++  AVR32_MNEMONIC_MOVVC,
++  AVR32_MNEMONIC_MOVQS,
++  AVR32_MNEMONIC_MOVAL,
++  AVR32_MNEMONIC_MOVHS,
++  AVR32_MNEMONIC_MOVLO,
++  AVR32_MNEMONIC_MTDR,
++  AVR32_MNEMONIC_MTSR,
++  AVR32_MNEMONIC_MUL,
++  AVR32_MNEMONIC_MULHH_W,
++  AVR32_MNEMONIC_MULNHH_W,
++  AVR32_MNEMONIC_MULNWH_D,
++  AVR32_MNEMONIC_MULS_D,
++  AVR32_MNEMONIC_MULSATHH_H,
++  AVR32_MNEMONIC_MULSATHH_W,
++  AVR32_MNEMONIC_MULSATRNDHH_H,
++  AVR32_MNEMONIC_MULSATRNDWH_W,
++  AVR32_MNEMONIC_MULSATWH_W,
++  AVR32_MNEMONIC_MULU_D,
++  AVR32_MNEMONIC_MULWH_D,
++  AVR32_MNEMONIC_MUSFR,
++  AVR32_MNEMONIC_MUSTR,
++  AVR32_MNEMONIC_MVCR_D,
++  AVR32_MNEMONIC_MVCR_W,
++  AVR32_MNEMONIC_MVRC_D,
++  AVR32_MNEMONIC_MVRC_W,
++  AVR32_MNEMONIC_NEG,
++  AVR32_MNEMONIC_NOP,
++  AVR32_MNEMONIC_OR,
++  AVR32_MNEMONIC_ORH,
++  AVR32_MNEMONIC_ORL,
++  AVR32_MNEMONIC_PABS_SB,
++  AVR32_MNEMONIC_PABS_SH,
++  AVR32_MNEMONIC_PACKSH_SB,
++  AVR32_MNEMONIC_PACKSH_UB,
++  AVR32_MNEMONIC_PACKW_SH,
++  AVR32_MNEMONIC_PADD_B,
++  AVR32_MNEMONIC_PADD_H,
++  AVR32_MNEMONIC_PADDH_SH,
++  AVR32_MNEMONIC_PADDH_UB,
++  AVR32_MNEMONIC_PADDS_SB,
++  AVR32_MNEMONIC_PADDS_SH,
++  AVR32_MNEMONIC_PADDS_UB,
++  AVR32_MNEMONIC_PADDS_UH,
++  AVR32_MNEMONIC_PADDSUB_H,
++  AVR32_MNEMONIC_PADDSUBH_SH,
++  AVR32_MNEMONIC_PADDSUBS_SH,
++  AVR32_MNEMONIC_PADDSUBS_UH,
++  AVR32_MNEMONIC_PADDX_H,
++  AVR32_MNEMONIC_PADDXH_SH,
++  AVR32_MNEMONIC_PADDXS_SH,
++  AVR32_MNEMONIC_PADDXS_UH,
++  AVR32_MNEMONIC_PASR_B,
++  AVR32_MNEMONIC_PASR_H,
++  AVR32_MNEMONIC_PAVG_SH,
++  AVR32_MNEMONIC_PAVG_UB,
++  AVR32_MNEMONIC_PLSL_B,
++  AVR32_MNEMONIC_PLSL_H,
++  AVR32_MNEMONIC_PLSR_B,
++  AVR32_MNEMONIC_PLSR_H,
++  AVR32_MNEMONIC_PMAX_SH,
++  AVR32_MNEMONIC_PMAX_UB,
++  AVR32_MNEMONIC_PMIN_SH,
++  AVR32_MNEMONIC_PMIN_UB,
++  AVR32_MNEMONIC_POPJC,
++  AVR32_MNEMONIC_POPM,
++  AVR32_MNEMONIC_PREF,
++  AVR32_MNEMONIC_PSAD,
++  AVR32_MNEMONIC_PSUB_B,
++  AVR32_MNEMONIC_PSUB_H,
++  AVR32_MNEMONIC_PSUBADD_H,
++  AVR32_MNEMONIC_PSUBADDH_SH,
++  AVR32_MNEMONIC_PSUBADDS_SH,
++  AVR32_MNEMONIC_PSUBADDS_UH,
++  AVR32_MNEMONIC_PSUBH_SH,
++  AVR32_MNEMONIC_PSUBH_UB,
++  AVR32_MNEMONIC_PSUBS_SB,
++  AVR32_MNEMONIC_PSUBS_SH,
++  AVR32_MNEMONIC_PSUBS_UB,
++  AVR32_MNEMONIC_PSUBS_UH,
++  AVR32_MNEMONIC_PSUBX_H,
++  AVR32_MNEMONIC_PSUBXH_SH,
++  AVR32_MNEMONIC_PSUBXS_SH,
++  AVR32_MNEMONIC_PSUBXS_UH,
++  AVR32_MNEMONIC_PUNPCKSB_H,
++  AVR32_MNEMONIC_PUNPCKUB_H,
++  AVR32_MNEMONIC_PUSHJC,
++  AVR32_MNEMONIC_PUSHM,
++  AVR32_MNEMONIC_RCALL,
++  AVR32_MNEMONIC_RETEQ,
++  AVR32_MNEMONIC_RETNE,
++  AVR32_MNEMONIC_RETCC,
++  AVR32_MNEMONIC_RETCS,
++  AVR32_MNEMONIC_RETGE,
++  AVR32_MNEMONIC_RETLT,
++  AVR32_MNEMONIC_RETMI,
++  AVR32_MNEMONIC_RETPL,
++  AVR32_MNEMONIC_RETLS,
++  AVR32_MNEMONIC_RETGT,
++  AVR32_MNEMONIC_RETLE,
++  AVR32_MNEMONIC_RETHI,
++  AVR32_MNEMONIC_RETVS,
++  AVR32_MNEMONIC_RETVC,
++  AVR32_MNEMONIC_RETQS,
++  AVR32_MNEMONIC_RETAL,
++  AVR32_MNEMONIC_RETHS,
++  AVR32_MNEMONIC_RETLO,
++  AVR32_MNEMONIC_RET,
++  AVR32_MNEMONIC_RETD,
++  AVR32_MNEMONIC_RETE,
++  AVR32_MNEMONIC_RETJ,
++  AVR32_MNEMONIC_RETS,
++  AVR32_MNEMONIC_RJMP,
++  AVR32_MNEMONIC_ROL,
++  AVR32_MNEMONIC_ROR,
++  AVR32_MNEMONIC_RSUB,
++  AVR32_MNEMONIC_SATADD_H,
++  AVR32_MNEMONIC_SATADD_W,
++  AVR32_MNEMONIC_SATRNDS,
++  AVR32_MNEMONIC_SATRNDU,
++  AVR32_MNEMONIC_SATS,
++  AVR32_MNEMONIC_SATSUB_H,
++  AVR32_MNEMONIC_SATSUB_W,
++  AVR32_MNEMONIC_SATU,
++  AVR32_MNEMONIC_SBC,
++  AVR32_MNEMONIC_SBR,
++  AVR32_MNEMONIC_SCALL,
++  AVR32_MNEMONIC_SCR,
++  AVR32_MNEMONIC_SLEEP,
++  AVR32_MNEMONIC_SREQ,
++  AVR32_MNEMONIC_SRNE,
++  AVR32_MNEMONIC_SRCC,
++  AVR32_MNEMONIC_SRCS,
++  AVR32_MNEMONIC_SRGE,
++  AVR32_MNEMONIC_SRLT,
++  AVR32_MNEMONIC_SRMI,
++  AVR32_MNEMONIC_SRPL,
++  AVR32_MNEMONIC_SRLS,
++  AVR32_MNEMONIC_SRGT,
++  AVR32_MNEMONIC_SRLE,
++  AVR32_MNEMONIC_SRHI,
++  AVR32_MNEMONIC_SRVS,
++  AVR32_MNEMONIC_SRVC,
++  AVR32_MNEMONIC_SRQS,
++  AVR32_MNEMONIC_SRAL,
++  AVR32_MNEMONIC_SRHS,
++  AVR32_MNEMONIC_SRLO,
++  AVR32_MNEMONIC_SSRF,
++  AVR32_MNEMONIC_ST_B,
++  AVR32_MNEMONIC_ST_D,
++  AVR32_MNEMONIC_ST_H,
++  AVR32_MNEMONIC_ST_W,
++  AVR32_MNEMONIC_STC_D,
++  AVR32_MNEMONIC_STC_W,
++  AVR32_MNEMONIC_STC0_D,
++  AVR32_MNEMONIC_STC0_W,
++  AVR32_MNEMONIC_STCM_D,
++  AVR32_MNEMONIC_STCM_W,
++  AVR32_MNEMONIC_STCOND,
++  AVR32_MNEMONIC_STDSP,
++  AVR32_MNEMONIC_STHH_W,
++  AVR32_MNEMONIC_STM,
++  AVR32_MNEMONIC_STMTS,
++  AVR32_MNEMONIC_STSWP_H,
++  AVR32_MNEMONIC_STSWP_W,
++  AVR32_MNEMONIC_SUB,
++  AVR32_MNEMONIC_SUBEQ,
++  AVR32_MNEMONIC_SUBNE,
++  AVR32_MNEMONIC_SUBCC,
++  AVR32_MNEMONIC_SUBCS,
++  AVR32_MNEMONIC_SUBGE,
++  AVR32_MNEMONIC_SUBLT,
++  AVR32_MNEMONIC_SUBMI,
++  AVR32_MNEMONIC_SUBPL,
++  AVR32_MNEMONIC_SUBLS,
++  AVR32_MNEMONIC_SUBGT,
++  AVR32_MNEMONIC_SUBLE,
++  AVR32_MNEMONIC_SUBHI,
++  AVR32_MNEMONIC_SUBVS,
++  AVR32_MNEMONIC_SUBVC,
++  AVR32_MNEMONIC_SUBQS,
++  AVR32_MNEMONIC_SUBAL,
++  AVR32_MNEMONIC_SUBHS,
++  AVR32_MNEMONIC_SUBLO,
++  AVR32_MNEMONIC_SUBFEQ,
++  AVR32_MNEMONIC_SUBFNE,
++  AVR32_MNEMONIC_SUBFCC,
++  AVR32_MNEMONIC_SUBFCS,
++  AVR32_MNEMONIC_SUBFGE,
++  AVR32_MNEMONIC_SUBFLT,
++  AVR32_MNEMONIC_SUBFMI,
++  AVR32_MNEMONIC_SUBFPL,
++  AVR32_MNEMONIC_SUBFLS,
++  AVR32_MNEMONIC_SUBFGT,
++  AVR32_MNEMONIC_SUBFLE,
++  AVR32_MNEMONIC_SUBFHI,
++  AVR32_MNEMONIC_SUBFVS,
++  AVR32_MNEMONIC_SUBFVC,
++  AVR32_MNEMONIC_SUBFQS,
++  AVR32_MNEMONIC_SUBFAL,
++  AVR32_MNEMONIC_SUBFHS,
++  AVR32_MNEMONIC_SUBFLO,
++  AVR32_MNEMONIC_SUBHH_W,
++  AVR32_MNEMONIC_SWAP_B,
++  AVR32_MNEMONIC_SWAP_BH,
++  AVR32_MNEMONIC_SWAP_H,
++  AVR32_MNEMONIC_SYNC,
++  AVR32_MNEMONIC_TLBR,
++  AVR32_MNEMONIC_TLBS,
++  AVR32_MNEMONIC_TLBW,
++  AVR32_MNEMONIC_TNBZ,
++  AVR32_MNEMONIC_TST,
++  AVR32_MNEMONIC_XCHG,
++  AVR32_MNEMONIC_MEMC,
++  AVR32_MNEMONIC_MEMS,
++  AVR32_MNEMONIC_MEMT,
++  AVR32_MNEMONIC_FMAC_S,
++  AVR32_MNEMONIC_FNMAC_S,
++  AVR32_MNEMONIC_FMSC_S,
++  AVR32_MNEMONIC_FNMSC_S,
++  AVR32_MNEMONIC_FMUL_S,
++  AVR32_MNEMONIC_FNMUL_S,
++  AVR32_MNEMONIC_FADD_S,
++  AVR32_MNEMONIC_FSUB_S,
++  AVR32_MNEMONIC_FCASTRS_SW,
++  AVR32_MNEMONIC_FCASTRS_UW,
++  AVR32_MNEMONIC_FCASTSW_S,
++  AVR32_MNEMONIC_FCASTUW_S,
++  AVR32_MNEMONIC_FCMP_S,
++  AVR32_MNEMONIC_FCHK_S,
++  AVR32_MNEMONIC_FRCPA_S,
++  AVR32_MNEMONIC_FRSQRTA_S,
++  /* AVR32_MNEMONIC_FLD_S,
++     AVR32_MNEMONIC_FLD_D,
++     AVR32_MNEMONIC_FST_S,
++     AVR32_MNEMONIC_FST_D, */
++  AVR32_MNEMONIC_LDA_W,
++  AVR32_MNEMONIC_CALL,
++  AVR32_MNEMONIC_PICOSVMAC,
++  AVR32_MNEMONIC_PICOSVMUL,
++  AVR32_MNEMONIC_PICOVMAC,
++  AVR32_MNEMONIC_PICOVMUL,
++  AVR32_MNEMONIC_PICOLD_D,
++  AVR32_MNEMONIC_PICOLD_W,
++  AVR32_MNEMONIC_PICOLDM_D,
++  AVR32_MNEMONIC_PICOLDM_W,
++  AVR32_MNEMONIC_PICOMV_D,
++  AVR32_MNEMONIC_PICOMV_W,
++  AVR32_MNEMONIC_PICOST_D,
++  AVR32_MNEMONIC_PICOST_W,
++  AVR32_MNEMONIC_PICOSTM_D,
++  AVR32_MNEMONIC_PICOSTM_W,
++  AVR32_MNEMONIC_RSUBEQ,
++  AVR32_MNEMONIC_RSUBNE,
++  AVR32_MNEMONIC_RSUBCC,
++  AVR32_MNEMONIC_RSUBCS,
++  AVR32_MNEMONIC_RSUBGE,
++  AVR32_MNEMONIC_RSUBLT,
++  AVR32_MNEMONIC_RSUBMI,
++  AVR32_MNEMONIC_RSUBPL,
++  AVR32_MNEMONIC_RSUBLS,
++  AVR32_MNEMONIC_RSUBGT,
++  AVR32_MNEMONIC_RSUBLE,
++  AVR32_MNEMONIC_RSUBHI,
++  AVR32_MNEMONIC_RSUBVS,
++  AVR32_MNEMONIC_RSUBVC,
++  AVR32_MNEMONIC_RSUBQS,
++  AVR32_MNEMONIC_RSUBAL,
++  AVR32_MNEMONIC_RSUBHS,
++  AVR32_MNEMONIC_RSUBLO,
++  AVR32_MNEMONIC_ADDEQ,
++  AVR32_MNEMONIC_ADDNE,
++  AVR32_MNEMONIC_ADDCC,
++  AVR32_MNEMONIC_ADDCS,
++  AVR32_MNEMONIC_ADDGE,
++  AVR32_MNEMONIC_ADDLT,
++  AVR32_MNEMONIC_ADDMI,
++  AVR32_MNEMONIC_ADDPL,
++  AVR32_MNEMONIC_ADDLS,
++  AVR32_MNEMONIC_ADDGT,
++  AVR32_MNEMONIC_ADDLE,
++  AVR32_MNEMONIC_ADDHI,
++  AVR32_MNEMONIC_ADDVS,
++  AVR32_MNEMONIC_ADDVC,
++  AVR32_MNEMONIC_ADDQS,
++  AVR32_MNEMONIC_ADDAL,
++  AVR32_MNEMONIC_ADDHS,
++  AVR32_MNEMONIC_ADDLO,
++  AVR32_MNEMONIC_ANDEQ,
++  AVR32_MNEMONIC_ANDNE,
++  AVR32_MNEMONIC_ANDCC,
++  AVR32_MNEMONIC_ANDCS,
++  AVR32_MNEMONIC_ANDGE,
++  AVR32_MNEMONIC_ANDLT,
++  AVR32_MNEMONIC_ANDMI,
++  AVR32_MNEMONIC_ANDPL,
++  AVR32_MNEMONIC_ANDLS,
++  AVR32_MNEMONIC_ANDGT,
++  AVR32_MNEMONIC_ANDLE,
++  AVR32_MNEMONIC_ANDHI,
++  AVR32_MNEMONIC_ANDVS,
++  AVR32_MNEMONIC_ANDVC,
++  AVR32_MNEMONIC_ANDQS,
++  AVR32_MNEMONIC_ANDAL,
++  AVR32_MNEMONIC_ANDHS,
++  AVR32_MNEMONIC_ANDLO,
++  AVR32_MNEMONIC_OREQ,
++  AVR32_MNEMONIC_ORNE,
++  AVR32_MNEMONIC_ORCC,
++  AVR32_MNEMONIC_ORCS,
++  AVR32_MNEMONIC_ORGE,
++  AVR32_MNEMONIC_ORLT,
++  AVR32_MNEMONIC_ORMI,
++  AVR32_MNEMONIC_ORPL,
++  AVR32_MNEMONIC_ORLS,
++  AVR32_MNEMONIC_ORGT,
++  AVR32_MNEMONIC_ORLE,
++  AVR32_MNEMONIC_ORHI,
++  AVR32_MNEMONIC_ORVS,
++  AVR32_MNEMONIC_ORVC,
++  AVR32_MNEMONIC_ORQS,
++  AVR32_MNEMONIC_ORAL,
++  AVR32_MNEMONIC_ORHS,
++  AVR32_MNEMONIC_ORLO,
++  AVR32_MNEMONIC_EOREQ,
++  AVR32_MNEMONIC_EORNE,
++  AVR32_MNEMONIC_EORCC,
++  AVR32_MNEMONIC_EORCS,
++  AVR32_MNEMONIC_EORGE,
++  AVR32_MNEMONIC_EORLT,
++  AVR32_MNEMONIC_EORMI,
++  AVR32_MNEMONIC_EORPL,
++  AVR32_MNEMONIC_EORLS,
++  AVR32_MNEMONIC_EORGT,
++  AVR32_MNEMONIC_EORLE,
++  AVR32_MNEMONIC_EORHI,
++  AVR32_MNEMONIC_EORVS,
++  AVR32_MNEMONIC_EORVC,
++  AVR32_MNEMONIC_EORQS,
++  AVR32_MNEMONIC_EORAL,
++  AVR32_MNEMONIC_EORHS,
++  AVR32_MNEMONIC_EORLO,
++  AVR32_MNEMONIC_LD_WEQ,
++  AVR32_MNEMONIC_LD_WNE,
++  AVR32_MNEMONIC_LD_WCC,
++  AVR32_MNEMONIC_LD_WCS,
++  AVR32_MNEMONIC_LD_WGE,
++  AVR32_MNEMONIC_LD_WLT,
++  AVR32_MNEMONIC_LD_WMI,
++  AVR32_MNEMONIC_LD_WPL,
++  AVR32_MNEMONIC_LD_WLS,
++  AVR32_MNEMONIC_LD_WGT,
++  AVR32_MNEMONIC_LD_WLE,
++  AVR32_MNEMONIC_LD_WHI,
++  AVR32_MNEMONIC_LD_WVS,
++  AVR32_MNEMONIC_LD_WVC,
++  AVR32_MNEMONIC_LD_WQS,
++  AVR32_MNEMONIC_LD_WAL,
++  AVR32_MNEMONIC_LD_WHS,
++  AVR32_MNEMONIC_LD_WLO,
++  AVR32_MNEMONIC_LD_SHEQ,
++  AVR32_MNEMONIC_LD_SHNE,
++  AVR32_MNEMONIC_LD_SHCC,
++  AVR32_MNEMONIC_LD_SHCS,
++  AVR32_MNEMONIC_LD_SHGE,
++  AVR32_MNEMONIC_LD_SHLT,
++  AVR32_MNEMONIC_LD_SHMI,
++  AVR32_MNEMONIC_LD_SHPL,
++  AVR32_MNEMONIC_LD_SHLS,
++  AVR32_MNEMONIC_LD_SHGT,
++  AVR32_MNEMONIC_LD_SHLE,
++  AVR32_MNEMONIC_LD_SHHI,
++  AVR32_MNEMONIC_LD_SHVS,
++  AVR32_MNEMONIC_LD_SHVC,
++  AVR32_MNEMONIC_LD_SHQS,
++  AVR32_MNEMONIC_LD_SHAL,
++  AVR32_MNEMONIC_LD_SHHS,
++  AVR32_MNEMONIC_LD_SHLO,
++  AVR32_MNEMONIC_LD_UHEQ,
++  AVR32_MNEMONIC_LD_UHNE,
++  AVR32_MNEMONIC_LD_UHCC,
++  AVR32_MNEMONIC_LD_UHCS,
++  AVR32_MNEMONIC_LD_UHGE,
++  AVR32_MNEMONIC_LD_UHLT,
++  AVR32_MNEMONIC_LD_UHMI,
++  AVR32_MNEMONIC_LD_UHPL,
++  AVR32_MNEMONIC_LD_UHLS,
++  AVR32_MNEMONIC_LD_UHGT,
++  AVR32_MNEMONIC_LD_UHLE,
++  AVR32_MNEMONIC_LD_UHHI,
++  AVR32_MNEMONIC_LD_UHVS,
++  AVR32_MNEMONIC_LD_UHVC,
++  AVR32_MNEMONIC_LD_UHQS,
++  AVR32_MNEMONIC_LD_UHAL,
++  AVR32_MNEMONIC_LD_UHHS,
++  AVR32_MNEMONIC_LD_UHLO,
++  AVR32_MNEMONIC_LD_SBEQ,
++  AVR32_MNEMONIC_LD_SBNE,
++  AVR32_MNEMONIC_LD_SBCC,
++  AVR32_MNEMONIC_LD_SBCS,
++  AVR32_MNEMONIC_LD_SBGE,
++  AVR32_MNEMONIC_LD_SBLT,
++  AVR32_MNEMONIC_LD_SBMI,
++  AVR32_MNEMONIC_LD_SBPL,
++  AVR32_MNEMONIC_LD_SBLS,
++  AVR32_MNEMONIC_LD_SBGT,
++  AVR32_MNEMONIC_LD_SBLE,
++  AVR32_MNEMONIC_LD_SBHI,
++  AVR32_MNEMONIC_LD_SBVS,
++  AVR32_MNEMONIC_LD_SBVC,
++  AVR32_MNEMONIC_LD_SBQS,
++  AVR32_MNEMONIC_LD_SBAL,
++  AVR32_MNEMONIC_LD_SBHS,
++  AVR32_MNEMONIC_LD_SBLO,
++  AVR32_MNEMONIC_LD_UBEQ,
++  AVR32_MNEMONIC_LD_UBNE,
++  AVR32_MNEMONIC_LD_UBCC,
++  AVR32_MNEMONIC_LD_UBCS,
++  AVR32_MNEMONIC_LD_UBGE,
++  AVR32_MNEMONIC_LD_UBLT,
++  AVR32_MNEMONIC_LD_UBMI,
++  AVR32_MNEMONIC_LD_UBPL,
++  AVR32_MNEMONIC_LD_UBLS,
++  AVR32_MNEMONIC_LD_UBGT,
++  AVR32_MNEMONIC_LD_UBLE,
++  AVR32_MNEMONIC_LD_UBHI,
++  AVR32_MNEMONIC_LD_UBVS,
++  AVR32_MNEMONIC_LD_UBVC,
++  AVR32_MNEMONIC_LD_UBQS,
++  AVR32_MNEMONIC_LD_UBAL,
++  AVR32_MNEMONIC_LD_UBHS,
++  AVR32_MNEMONIC_LD_UBLO,
++  AVR32_MNEMONIC_ST_WEQ,
++  AVR32_MNEMONIC_ST_WNE,
++  AVR32_MNEMONIC_ST_WCC,
++  AVR32_MNEMONIC_ST_WCS,
++  AVR32_MNEMONIC_ST_WGE,
++  AVR32_MNEMONIC_ST_WLT,
++  AVR32_MNEMONIC_ST_WMI,
++  AVR32_MNEMONIC_ST_WPL,
++  AVR32_MNEMONIC_ST_WLS,
++  AVR32_MNEMONIC_ST_WGT,
++  AVR32_MNEMONIC_ST_WLE,
++  AVR32_MNEMONIC_ST_WHI,
++  AVR32_MNEMONIC_ST_WVS,
++  AVR32_MNEMONIC_ST_WVC,
++  AVR32_MNEMONIC_ST_WQS,
++  AVR32_MNEMONIC_ST_WAL,
++  AVR32_MNEMONIC_ST_WHS,
++  AVR32_MNEMONIC_ST_WLO,
++  AVR32_MNEMONIC_ST_HEQ,
++  AVR32_MNEMONIC_ST_HNE,
++  AVR32_MNEMONIC_ST_HCC,
++  AVR32_MNEMONIC_ST_HCS,
++  AVR32_MNEMONIC_ST_HGE,
++  AVR32_MNEMONIC_ST_HLT,
++  AVR32_MNEMONIC_ST_HMI,
++  AVR32_MNEMONIC_ST_HPL,
++  AVR32_MNEMONIC_ST_HLS,
++  AVR32_MNEMONIC_ST_HGT,
++  AVR32_MNEMONIC_ST_HLE,
++  AVR32_MNEMONIC_ST_HHI,
++  AVR32_MNEMONIC_ST_HVS,
++  AVR32_MNEMONIC_ST_HVC,
++  AVR32_MNEMONIC_ST_HQS,
++  AVR32_MNEMONIC_ST_HAL,
++  AVR32_MNEMONIC_ST_HHS,
++  AVR32_MNEMONIC_ST_HLO,
++  AVR32_MNEMONIC_ST_BEQ,
++  AVR32_MNEMONIC_ST_BNE,
++  AVR32_MNEMONIC_ST_BCC,
++  AVR32_MNEMONIC_ST_BCS,
++  AVR32_MNEMONIC_ST_BGE,
++  AVR32_MNEMONIC_ST_BLT,
++  AVR32_MNEMONIC_ST_BMI,
++  AVR32_MNEMONIC_ST_BPL,
++  AVR32_MNEMONIC_ST_BLS,
++  AVR32_MNEMONIC_ST_BGT,
++  AVR32_MNEMONIC_ST_BLE,
++  AVR32_MNEMONIC_ST_BHI,
++  AVR32_MNEMONIC_ST_BVS,
++  AVR32_MNEMONIC_ST_BVC,
++  AVR32_MNEMONIC_ST_BQS,
++  AVR32_MNEMONIC_ST_BAL,
++  AVR32_MNEMONIC_ST_BHS,
++  AVR32_MNEMONIC_ST_BLO,
++  AVR32_MNEMONIC_MOVH,
++  AVR32_MNEMONIC__END_
++};
++#define AVR32_NR_MNEMONICS AVR32_MNEMONIC__END_
++
++enum avr32_syntax_parser
++  {
++    AVR32_PARSER_NORMAL,
++    AVR32_PARSER_ALIAS,
++    AVR32_PARSER_LDA,
++    AVR32_PARSER_CALL,
++    AVR32_PARSER__END_
++  };
++#define AVR32_NR_PARSERS AVR32_PARSER__END_
+--- a/opcodes/configure.in
++++ b/opcodes/configure.in
+@@ -223,6 +223,7 @@ if test x${all_targets} = xfalse ; then
+ 	bfd_arc_arch)		ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
+ 	bfd_arm_arch)		ta="$ta arm-dis.lo" ;;
+ 	bfd_avr_arch)		ta="$ta avr-dis.lo" ;;
++	bfd_avr32_arch)		ta="$ta avr32-asm.lo avr32-dis.lo avr32-opc.lo" ;;
+ 	bfd_bfin_arch)		ta="$ta bfin-dis.lo" ;;
+ 	bfd_cr16_arch)    	ta="$ta cr16-dis.lo cr16-opc.lo" ;;
+ 	bfd_cris_arch)		ta="$ta cris-dis.lo cris-opc.lo cgen-bitset.lo" ;;
+@@ -285,7 +286,7 @@ if test x${all_targets} = xfalse ; then
+ 				ta="$ta sh64-dis.lo sh64-opc.lo"
+ 				archdefs="$archdefs -DINCLUDE_SHMEDIA"
+ 				break;;
+-	    esac;
++	    esac
+ 	  done
+ 				ta="$ta sh-dis.lo cgen-bitset.lo" ;;
+ 	bfd_sparc_arch)		ta="$ta sparc-dis.lo sparc-opc.lo" ;;
+--- a/opcodes/disassemble.c
++++ b/opcodes/disassemble.c
+@@ -27,6 +27,7 @@
+ #define ARCH_arc
+ #define ARCH_arm
+ #define ARCH_avr
++#define ARCH_avr32
+ #define ARCH_bfin
+ #define ARCH_cr16
+ #define ARCH_cris
+@@ -131,6 +132,11 @@ disassembler (abfd)
+       disassemble = print_insn_avr;
+       break;
+ #endif
++#ifdef ARCH_avr32
++    case bfd_arch_avr32:
++      disassemble = print_insn_avr32;
++      break;
++#endif
+ #ifdef ARCH_bfin
+     case bfd_arch_bfin:
+       disassemble = print_insn_bfin;
+@@ -485,6 +491,9 @@ disassembler_usage (stream)
+ #ifdef ARCH_i386
+   print_i386_disassembler_options (stream);
+ #endif
++#ifdef ARCH_avr32
++  print_avr32_disassembler_options (stream);
++#endif
+ #ifdef ARCH_s390
+   print_s390_disassembler_options (stream);
+ #endif
+--- a/bfd/configure
++++ b/bfd/configure
+@@ -14787,6 +14787,7 @@ do
+     bfd_pei_ia64_vec)		tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
+     bfd_elf32_am33lin_vec)	tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
+     bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
++    bfd_elf32_avr32_vec)	tb="$tb elf32-avr32.lo elf32.lo $elf" ;;
+     bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+     bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+     bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+--- a/opcodes/configure
++++ b/opcodes/configure
+@@ -12284,6 +12284,7 @@ if test x${all_targets} = xfalse ; then
+ 	bfd_arc_arch)		ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
+ 	bfd_arm_arch)		ta="$ta arm-dis.lo" ;;
+ 	bfd_avr_arch)		ta="$ta avr-dis.lo" ;;
++	bfd_avr32_arch)		ta="$ta avr32-asm.lo avr32-dis.lo avr32-opc.lo" ;;
+ 	bfd_bfin_arch)		ta="$ta bfin-dis.lo" ;;
+ 	bfd_cr16_arch)    	ta="$ta cr16-dis.lo cr16-opc.lo" ;;
+ 	bfd_cris_arch)		ta="$ta cris-dis.lo cris-opc.lo cgen-bitset.lo" ;;
+--- a/bfd/libbfd.h
++++ b/bfd/libbfd.h
+@@ -1646,6 +1646,48 @@ static const char *const bfd_reloc_code_
+   "BFD_RELOC_AVR_LDI",
+   "BFD_RELOC_AVR_6",
+   "BFD_RELOC_AVR_6_ADIW",
++  "BFD_RELOC_AVR32_DIFF32",
++  "BFD_RELOC_AVR32_DIFF16",
++  "BFD_RELOC_AVR32_DIFF8",
++  "BFD_RELOC_AVR32_GOT32",
++  "BFD_RELOC_AVR32_GOT16",
++  "BFD_RELOC_AVR32_GOT8",
++  "BFD_RELOC_AVR32_21S",
++  "BFD_RELOC_AVR32_16U",
++  "BFD_RELOC_AVR32_16S",
++  "BFD_RELOC_AVR32_SUB5",
++  "BFD_RELOC_AVR32_8S_EXT",
++  "BFD_RELOC_AVR32_8S",
++  "BFD_RELOC_AVR32_15S",
++  "BFD_RELOC_AVR32_22H_PCREL",
++  "BFD_RELOC_AVR32_18W_PCREL",
++  "BFD_RELOC_AVR32_16B_PCREL",
++  "BFD_RELOC_AVR32_16N_PCREL",
++  "BFD_RELOC_AVR32_14UW_PCREL",
++  "BFD_RELOC_AVR32_11H_PCREL",
++  "BFD_RELOC_AVR32_10UW_PCREL",
++  "BFD_RELOC_AVR32_9H_PCREL",
++  "BFD_RELOC_AVR32_9UW_PCREL",
++  "BFD_RELOC_AVR32_GOTPC",
++  "BFD_RELOC_AVR32_GOTCALL",
++  "BFD_RELOC_AVR32_LDA_GOT",
++  "BFD_RELOC_AVR32_GOT21S",
++  "BFD_RELOC_AVR32_GOT18SW",
++  "BFD_RELOC_AVR32_GOT16S",
++  "BFD_RELOC_AVR32_32_CPENT",
++  "BFD_RELOC_AVR32_CPCALL",
++  "BFD_RELOC_AVR32_16_CP",
++  "BFD_RELOC_AVR32_9W_CP",
++  "BFD_RELOC_AVR32_ALIGN",
++  "BFD_RELOC_AVR32_14UW",
++  "BFD_RELOC_AVR32_10UW",
++  "BFD_RELOC_AVR32_10SW",
++  "BFD_RELOC_AVR32_STHH_W",
++  "BFD_RELOC_AVR32_7UW",
++  "BFD_RELOC_AVR32_6S",
++  "BFD_RELOC_AVR32_6UW",
++  "BFD_RELOC_AVR32_4UH",
++  "BFD_RELOC_AVR32_3U",
+   "BFD_RELOC_390_12",
+   "BFD_RELOC_390_GOT12",
+   "BFD_RELOC_390_PLT32",
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -434,6 +434,53 @@ ALL_EMULATIONS = \
+ 	eavr5.o \
+ 	eavr51.o \
+ 	eavr6.o \
++	eavr32elf_ap7000.o \
++	eavr32elf_ap7001.o \
++	eavr32elf_ap7002.o \
++	eavr32elf_ap7200.o \
++	eavr32elf_uc3a0128.o \
++	eavr32elf_uc3a0256.o \
++	eavr32elf_uc3a0512.o \
++	eavr32elf_uc3a0512es.o \
++	eavr32elf_uc3a1128.o \
++	eavr32elf_uc3a1256.o \
++	eavr32elf_uc3a1512es.o \
++	eavr32elf_uc3a1512.o \
++	eavr32elf_uc3a364.o \
++	eavr32elf_uc3a364s.o \
++	eavr32elf_uc3a3128.o \
++	eavr32elf_uc3a3128s.o \
++	eavr32elf_uc3a3256.o \
++	eavr32elf_uc3a3256s.o \
++	eavr32elf_uc3b064.o \
++	eavr32elf_uc3b0128.o \
++	eavr32elf_uc3b0256es.o \
++	eavr32elf_uc3b0256.o \
++	eavr32elf_uc3b0512.o \
++	eavr32elf_uc3b0512revc.o \
++	eavr32elf_uc3b164.o \
++	eavr32elf_uc3b1128.o \
++	eavr32elf_uc3b1256es.o \
++	eavr32elf_uc3b1256.o \
++	eavr32elf_uc3b1512.o \
++	eavr32elf_uc3b1512revc.o \
++	eavr32elf_uc3c064c.o \
++	eavr32elf_uc3c0128c.o \
++	eavr32elf_uc3c0256c.o \
++	eavr32elf_uc3c0512crevc.o \
++	eavr32elf_uc3c164c.o \
++	eavr32elf_uc3c1128c.o \
++	eavr32elf_uc3c1256c.o \
++	eavr32elf_uc3c1512crevc.o \
++	eavr32elf_uc3c264c.o \
++	eavr32elf_uc3c2128c.o \
++	eavr32elf_uc3c2256c.o \
++	eavr32elf_uc3c2512crevc.o \
++	eavr32elf_uc3l064.o \
++	eavr32elf_uc3l032.o \
++	eavr32elf_uc3l016.o \
++	eavr32elf_uc3l064revb.o \
++	eavr32linux.o \
+ 	ecoff_i860.o \
+ 	ecoff_sparc.o \
+ 	eelf32_spu.o \
+@@ -2069,6 +2116,194 @@ eavr6.c: $(srcdir)/emulparams/avr6.sh $(
+   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
+   ${GEN_DEPENDS}
+ 	${GENSCRIPTS} avr6 "$(tdir_avr2)"
++eavr32elf_ap7000.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7000 "$(tdir_avr32)" avr32elf
++eavr32elf_ap7001.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7001 "$(tdir_avr32)" avr32elf
++eavr32elf_ap7002.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7002 "$(tdir_avr32)" avr32elf
++eavr32elf_ap7200.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_ap7200 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a0512es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a0512es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a1512es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a1512es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a364.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a364 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a364s.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a364s "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3128s.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3128s "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3a3256s.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3a3256s "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b064.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b064 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0256es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0256es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b0512revc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b0512revc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b164.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b164 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1128.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1128 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1256.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1256 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1256es.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1256es "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1512.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1512 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3b1512revc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3b1512revc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c064c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c064c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c0128c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c0128c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c0256c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c0256c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c0512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c0512crevc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c164c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c164c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c1128c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c1128c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c1256c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c1256c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c1512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c1512crevc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c264c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c264c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c2128c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c2128c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c2256c.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c2256c "$(tdir_avr32)" avr32elf
++eavr32elf_uc3c2512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3c2512crevc "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l064.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l064 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l032.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l032 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l016.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l016 "$(tdir_avr32)" avr32elf
++eavr32elf_uc3l064revb.c: $(srcdir)/emulparams/avr32elf.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32elf_uc3l064revb "$(tdir_avr32)" avr32elf
++eavr32linux.c: $(srcdir)/emulparams/avr32linux.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
++  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} avr32linux "$(tdir_avr32)"
+ ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
+   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
+--- a/gas/Makefile.in
++++ b/gas/Makefile.in
+@@ -309,6 +309,7 @@ CPU_TYPES = \
+ 	arc \
+ 	arm \
+ 	avr \
++	avr32 \
+ 	bfin \
+ 	cr16 \
+ 	cris \
+@@ -508,6 +509,7 @@ TARGET_CPU_CFILES = \
+ 	config/tc-arc.c \
+ 	config/tc-arm.c \
+ 	config/tc-avr.c \
++	config/tc-avr32.c \
+ 	config/tc-bfin.c \
+ 	config/tc-cr16.c \
+ 	config/tc-cris.c \
+@@ -571,6 +573,7 @@ TARGET_CPU_HFILES = \
+ 	config/tc-arc.h \
+ 	config/tc-arm.h \
+ 	config/tc-avr.h \
++	config/tc-avr32.h \
+ 	config/tc-bfin.h \
+ 	config/tc-cr16.h \
+ 	config/tc-cris.h \
+@@ -949,6 +952,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-arc.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-arm.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-avr.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-avr32.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-bfin.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-cr16.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-cris.Po@am__quote@
+@@ -1086,6 +1090,20 @@ tc-avr.obj: config/tc-avr.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-avr.obj `if test -f 'config/tc-avr.c'; then $(CYGPATH_W) 'config/tc-avr.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-avr.c'; fi`
+ 
++tc-avr32.o: config/tc-avr32.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-avr32.o -MD -MP -MF $(DEPDIR)/tc-avr32.Tpo -c -o tc-avr32.o `test -f 'config/tc-avr32.c' || echo '$(srcdir)/'`config/tc-avr32.c
++@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-avr32.Tpo $(DEPDIR)/tc-avr32.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-avr32.c' object='tc-avr32.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-avr32.o `test -f 'config/tc-avr32.c' || echo '$(srcdir)/'`config/tc-avr32.c
++
++tc-avr32.obj: config/tc-avr32.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-avr32.obj -MD -MP -MF $(DEPDIR)/tc-avr32.Tpo -c -o tc-avr32.obj `if test -f 'config/tc-avr32.c'; then $(CYGPATH_W) 'config/tc-avr32.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-avr32.c'; fi`
++@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-avr32.Tpo $(DEPDIR)/tc-avr32.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-avr32.c' object='tc-avr32.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-avr32.obj `if test -f 'config/tc-avr32.c'; then $(CYGPATH_W) 'config/tc-avr32.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-avr32.c'; fi`
++
+ tc-bfin.o: config/tc-bfin.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-bfin.o -MD -MP -MF $(DEPDIR)/tc-bfin.Tpo -c -o tc-bfin.o `test -f 'config/tc-bfin.c' || echo '$(srcdir)/'`config/tc-bfin.c
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-bfin.Tpo $(DEPDIR)/tc-bfin.Po
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -2042,6 +2042,12 @@ enum bfd_architecture
+ #define bfd_mach_avr5          5
+ #define bfd_mach_avr51         51
+ #define bfd_mach_avr6          6
++  bfd_arch_avr32,     /* Atmel AVR32 */
++#define bfd_mach_avr32_ap      7000
++#define bfd_mach_avr32_uc      3000
++#define bfd_mach_avr32_ucr1    3001
++#define bfd_mach_avr32_ucr2    3002
++#define bfd_mach_avr32_ucr3    3003
+   bfd_arch_bfin,        /* ADI Blackfin */
+ #define bfd_mach_bfin          1
+   bfd_arch_cr16,       /* National Semiconductor CompactRISC (ie CR16). */
+@@ -3851,6 +3857,88 @@ instructions  */
+ instructions  */
+   BFD_RELOC_AVR_6_ADIW,
+ 
++/* Difference between two labels: L2 - L1. The value of L1 is encoded
++as sym + addend, while the initial difference after assembly is
++inserted into the object file by the assembler.  */
++  BFD_RELOC_AVR32_DIFF32,
++  BFD_RELOC_AVR32_DIFF16,
++  BFD_RELOC_AVR32_DIFF8,
++
++/* Reference to a symbol through the Global Offset Table. The linker
++will allocate an entry for symbol in the GOT and insert the offset
++of this entry as the relocation value.  */
++  BFD_RELOC_AVR32_GOT32,
++  BFD_RELOC_AVR32_GOT16,
++  BFD_RELOC_AVR32_GOT8,
++
++/* Normal (non-pc-relative) code relocations. Alignment and signedness
++is indicated by the suffixes. S means signed, U means unsigned. W
++means word-aligned, H means halfword-aligned, neither means
++byte-aligned (no alignment.) SUB5 is the same relocation as 16S.  */
++  BFD_RELOC_AVR32_21S,
++  BFD_RELOC_AVR32_16U,
++  BFD_RELOC_AVR32_16S,
++  BFD_RELOC_AVR32_SUB5,
++  BFD_RELOC_AVR32_8S_EXT,
++  BFD_RELOC_AVR32_8S,
++  BFD_RELOC_AVR32_15S,
++
++/* PC-relative relocations are signed if neither 'U' nor 'S' is
++specified. However, we explicitly tack on a 'B' to indicate no
++alignment, to avoid confusion with data relocs. All of these resolve
++to sym + addend - offset, except the one with 'N' (negated) suffix.
++This particular one resolves to offset - sym - addend.  */
++  BFD_RELOC_AVR32_22H_PCREL,
++  BFD_RELOC_AVR32_18W_PCREL,
++  BFD_RELOC_AVR32_16B_PCREL,
++  BFD_RELOC_AVR32_16N_PCREL,
++  BFD_RELOC_AVR32_14UW_PCREL,
++  BFD_RELOC_AVR32_11H_PCREL,
++  BFD_RELOC_AVR32_10UW_PCREL,
++  BFD_RELOC_AVR32_9H_PCREL,
++  BFD_RELOC_AVR32_9UW_PCREL,
++
++/* Subtract the link-time address of the GOT from (symbol + addend)
++and insert the result.  */
++  BFD_RELOC_AVR32_GOTPC,
++
++/* Reference to a symbol through the GOT. The linker will allocate an
++entry for symbol in the GOT and insert the offset of this entry as
++the relocation value. addend must be zero. As usual, 'S' means
++signed, 'W' means word-aligned, etc.  */
++  BFD_RELOC_AVR32_GOTCALL,
++  BFD_RELOC_AVR32_LDA_GOT,
++  BFD_RELOC_AVR32_GOT21S,
++  BFD_RELOC_AVR32_GOT18SW,
++  BFD_RELOC_AVR32_GOT16S,
++
++/* 32-bit constant pool entry. I don't think 8- and 16-bit entries make
++a whole lot of sense.  */
++  BFD_RELOC_AVR32_32_CPENT,
++
++/* Constant pool references. Some of these relocations are signed,
++others are unsigned. It doesn't really matter, since the constant
++pool always comes after the code that references it.  */
++  BFD_RELOC_AVR32_CPCALL,
++  BFD_RELOC_AVR32_16_CP,
++  BFD_RELOC_AVR32_9W_CP,
++
++/* sym must be the absolute symbol. The addend specifies the alignment
++order, e.g. if addend is 2, the linker must add padding so that the
++next address is aligned to a 4-byte boundary.  */
++  BFD_RELOC_AVR32_ALIGN,
++
++/* Code relocations that will never make it to the output file.  */
++  BFD_RELOC_AVR32_14UW,
++  BFD_RELOC_AVR32_10UW,
++  BFD_RELOC_AVR32_10SW,
++  BFD_RELOC_AVR32_STHH_W,
++  BFD_RELOC_AVR32_7UW,
++  BFD_RELOC_AVR32_6S,
++  BFD_RELOC_AVR32_6UW,
++  BFD_RELOC_AVR32_4UH,
++  BFD_RELOC_AVR32_3U,
++
+ /* Direct 12 bit.  */
+   BFD_RELOC_390_12,
+ 
diff --git a/trunk/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch b/trunk/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch
new file mode 100644
index 00000000..0efcd183
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch
@@ -0,0 +1,22 @@
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -54,7 +54,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -386,7 +386,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/trunk/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch b/trunk/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch
new file mode 100644
index 00000000..37752b75
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,20 @@
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1267,6 +1267,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1518,6 +1520,8 @@ gld${EMULATION_NAME}_before_allocation (
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/trunk/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch b/trunk/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch
new file mode 100644
index 00000000..251134fb
--- /dev/null
+++ b/trunk/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch
@@ -0,0 +1,18 @@
+--- a/bfd/elfxx-mips.c
++++ b/bfd/elfxx-mips.c
+@@ -7450,6 +7450,7 @@ _bfd_mips_elf_create_dynamic_sections (b
+ 
+       name = SGI_COMPAT (abfd) ? "_DYNAMIC_LINK" : "_DYNAMIC_LINKING";
+       bh = NULL;
++      if (0) {
+       if (!(_bfd_generic_link_add_one_symbol
+ 	    (info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr, 0,
+ 	     NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+@@ -7462,6 +7463,7 @@ _bfd_mips_elf_create_dynamic_sections (b
+ 
+       if (! bfd_elf_link_record_dynamic_symbol (info, h))
+ 	return FALSE;
++      }
+ 
+       if (! mips_elf_hash_table (info)->use_rld_obj_head)
+ 	{
diff --git a/trunk/toolchain/eglibc/Config.in b/trunk/toolchain/eglibc/Config.in
new file mode 100644
index 00000000..dd6bb435
--- /dev/null
+++ b/trunk/toolchain/eglibc/Config.in
@@ -0,0 +1,21 @@
+choice
+	prompt "eglibc version"
+	depends on TOOLCHAINOPTS && USE_EGLIBC
+	default EGLIBC_USE_VERSION_2_19
+	help
+	  Select the version of eglibc you wish to use.
+
+	config EGLIBC_USE_VERSION_2_15
+		bool "eglibc 2.15"
+		select EGLIBC_VERSION_2_15
+
+	config EGLIBC_USE_VERSION_2_19
+		bool "eglibc 2.19"
+		select EGLIBC_VERSION_2_19
+
+endchoice
+
+menu "eglibc configuration"
+	depends on TOOLCHAINOPTS && USE_EGLIBC
+	source toolchain/eglibc/config/Config.in
+endmenu
diff --git a/trunk/toolchain/eglibc/Config.version b/trunk/toolchain/eglibc/Config.version
new file mode 100644
index 00000000..3c0f0efe
--- /dev/null
+++ b/trunk/toolchain/eglibc/Config.version
@@ -0,0 +1,26 @@
+if USE_EGLIBC
+
+config EGLIBC_VERSION
+	string
+	default "2.15" if EGLIBC_VERSION_2_15
+	default "2.19" if EGLIBC_VERSION_2_19
+
+config EGLIBC_VERSION_2_15
+	bool
+
+config EGLIBC_VERSION_2_19
+	default y if !TOOLCHAINOPTS
+	bool
+
+config EGLIBC_REVISION
+	string
+	default "18909" if EGLIBC_VERSION_2_15
+	default "25243" if EGLIBC_VERSION_2_19
+	default ""
+
+endif
+
+menu "eglibc configuration"
+	depends on !TOOLCHAINOPTS && USE_EGLIBC
+	source toolchain/eglibc/config/Config.in
+endmenu
diff --git a/trunk/toolchain/eglibc/Makefile b/trunk/toolchain/eglibc/Makefile
new file mode 100644
index 00000000..f880db81
--- /dev/null
+++ b/trunk/toolchain/eglibc/Makefile
@@ -0,0 +1,31 @@
+PATH_PREFIX := .
+VARIANT:=final
+HOST_BUILD_PARALLEL:=0
+
+include ./common.mk
+
+define Host/Compile
+	$(MAKE) -C $(CUR_BUILD_DIR) \
+		PARALLELMFLAGS="$(HOST_JOBS)" \
+		BUILD_CFLAGS="$(HOST_CFLAGS)" \
+		all
+endef
+
+define Host/Install
+	$(call Host/SetToolchainInfo)
+	$(MAKE) -C $(CUR_BUILD_DIR) \
+		BUILD_CFLAGS="$(HOST_CFLAGS)" \
+		install_root="$(TOOLCHAIN_DIR)" \
+		install
+	( cd $(TOOLCHAIN_DIR) ; \
+		for d in lib usr/lib ; do \
+		  for f in libc.so libpthread.so libgcc_s.so ; do \
+		    if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \
+		      $(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \
+		    fi \
+		  done \
+		done \
+	)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/eglibc/common.mk b/trunk/toolchain/eglibc/common.mk
new file mode 100644
index 00000000..9ef92c66
--- /dev/null
+++ b/trunk/toolchain/eglibc/common.mk
@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=eglibc
+PKG_VERSION:=$(call qstrip,$(CONFIG_EGLIBC_VERSION))
+PKG_REVISION:=$(call qstrip,$(CONFIG_EGLIBC_REVISION))
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REVISION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
+
+ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
+  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_15
+endif
+ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)
+  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_19
+endif
+
+PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION)
+
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
+CUR_BUILD_DIR:=$(HOST_BUILD_DIR)-$(VARIANT)
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared
+HOST_STAMP_CONFIGURED:=$(CUR_BUILD_DIR)/.configured
+HOST_STAMP_BUILT:=$(CUR_BUILD_DIR)/.built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_$(VARIANT)_installed
+
+ifeq ($(ARCH),mips64)
+  ifdef CONFIG_MIPS64_ABI_N64
+    TARGET_CFLAGS += -mabi=64
+  endif
+  ifdef CONFIG_MIPS64_ABI_N32
+    TARGET_CFLAGS += -mabi=n32
+  endif
+  ifdef CONFIG_MIPS64_ABI_O32
+    TARGET_CFLAGS += -mabi=32
+  endif
+endif
+
+EGLIBC_CONFIGURE:= \
+	BUILD_CC="$(HOSTCC)" \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	libc_cv_slibdir="/lib" \
+	use_ldconfig=no \
+	$(HOST_BUILD_DIR)/libc/configure \
+		--prefix= \
+		--build=$(GNU_HOST_NAME) \
+		--host=$(REAL_GNU_TARGET_NAME) \
+		--with-headers=$(TOOLCHAIN_DIR)/include \
+		--disable-profile \
+		--without-gd \
+		--without-cvs \
+		--enable-add-ons \
+		--$(if $(CONFIG_SOFT_FLOAT),without,with)-fp
+
+export libc_cv_ssp=no
+export ac_cv_header_cpuid_h=yes
+export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include
+
+define Host/SetToolchainInfo
+	$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.org/,' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+endef
+
+define Host/Configure
+	[ -f $(HOST_BUILD_DIR)/.autoconf ] || { \
+		cd $(HOST_BUILD_DIR)/libc; \
+		autoconf --force && \
+		touch $(HOST_BUILD_DIR)/.autoconf; \
+	}
+	mkdir -p $(CUR_BUILD_DIR)
+	grep 'CONFIG_EGLIBC_OPTION_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_EGLIBC_\\(.*\\),\\1\\2,g" > $(CUR_BUILD_DIR)/option-groups.config
+	( cd $(CUR_BUILD_DIR); rm -f config.cache; \
+		$(EGLIBC_CONFIGURE) \
+	);
+endef
+
+define Host/Prepare
+	$(call Host/Prepare/Default)
+	ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+	$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
+ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
+	ln -sf ../ports $(HOST_BUILD_DIR)/libc/
+endif
+endef
+
+define Host/Clean
+	rm -rf $(CUR_BUILD_DIR)* \
+		$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \
+		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+endef
diff --git a/trunk/toolchain/eglibc/config/Config.in b/trunk/toolchain/eglibc/config/Config.in
new file mode 100644
index 00000000..6f022234
--- /dev/null
+++ b/trunk/toolchain/eglibc/config/Config.in
@@ -0,0 +1,903 @@
+config EGLIBC_OPTION_EGLIBC_ADVANCED_INET6
+	bool "IPv6 Advanced Sockets API support (RFC3542)"
+	default y
+	select EGLIBC_OPTION_EGLIBC_INET
+	help
+	  This option group includes the functions specified by RFC 3542,
+	  "Advanced Sockets Application Program Interface (API) for
+	  IPv6".
+
+	  This option group includes the following functions:
+
+		inet6_opt_append
+		inet6_opt_find
+		inet6_opt_finish
+		inet6_opt_get_val
+		inet6_opt_init
+		inet6_option_alloc
+		inet6_option_append
+		inet6_option_find
+		inet6_option_init
+		inet6_option_next
+		inet6_option_space
+		inet6_opt_next
+		inet6_opt_set_val
+		inet6_rth_add
+		inet6_rth_getaddr
+		inet6_rth_init
+		inet6_rth_reverse
+		inet6_rth_segments
+		inet6_rth_space
+
+
+config EGLIBC_OPTION_EGLIBC_BACKTRACE
+	bool "Functions for producing backtraces"
+	default y
+	help
+	  This option group includes functions for producing a list of
+	  the function calls that are currently active in a thread, from
+	  within the thread itself.  These functions are often used
+	  within signal handlers, to produce diagnostic output.
+
+	  This option group includes the following functions:
+
+		backtrace
+		backtrace_symbols
+		backtrace_symbols_fd
+
+
+config EGLIBC_OPTION_EGLIBC_BIG_MACROS
+	bool "Use extensive inline code"
+	default y
+	help
+	  This option group specifies whether certain pieces of code
+	  should be inlined to achieve maximum speed.  If this option
+	  group is not selected, function calls will be used instead,
+	  hence reducing the library footprint.
+
+
+config EGLIBC_OPTION_EGLIBC_BSD
+	bool "BSD-specific functions, and their compatibility stubs"
+	default y
+	help
+	  This option group includes functions specific to BSD kernels.
+	  A number of these functions have stub versions that are also
+	  included in libraries built for non-BSD systems for
+	  compatibility.
+
+	  This option group includes the following functions:
+
+		chflags
+		fchflags
+		lchmod
+		revoke
+		setlogin
+
+
+config EGLIBC_OPTION_EGLIBC_CXX_TESTS
+	bool "Tests that link against the standard C++ library."
+	default y
+	select EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+	select EGLIBC_OPTION_EGLIBC_LIBM
+	help
+	  This option group does not include any C library functions;
+	  instead, it controls which EGLIBC tests an ordinary 'make
+	  tests' runs.  With this group disabled, tests that would
+	  normally link against the standard C++ library are not
+	  run.
+
+	  The standard C++ library depends on the math library 'libm' and
+	  the wide character I/O functions included in EGLIBC.  If those
+	  option groups are disabled, this test must also be disabled.
+
+
+config EGLIBC_OPTION_EGLIBC_CATGETS
+	bool "Functions for accessing message catalogs"
+	default y
+	select EGLIBC_OPTION_EGLIBC_LOCALE_CODE
+	help
+	  This option group includes functions for accessing message
+	  catalogs: catopen, catclose, and catgets.
+
+	  This option group depends on the EGLIBC_OPTION_EGLIBC_LOCALE_CODE
+	  option group; if you disable that, you must also disable this.
+
+
+config EGLIBC_OPTION_EGLIBC_CHARSETS
+	bool "iconv/gconv character set conversion libraries"
+	default y
+	help
+
+	  This option group includes support for character sets other
+	  than ASCII (ANSI_X3.4-1968) and Unicode and ISO-10646 in their
+	  various encodings.  This affects both the character sets
+	  supported by the wide and multibyte character functions, and
+	  those supported by the 'iconv' functions.
+
+	  With this option group disabled, EGLIBC supports only the
+	  following character sets:
+
+		ANSI_X3.4         - ASCII
+		ANSI_X3.4-1968
+		ANSI_X3.4-1986
+		ASCII
+		CP367
+		CSASCII
+		IBM367
+		ISO-IR-6
+		ISO646-US
+		ISO_646.IRV:1991
+		OSF00010020
+		US
+		US-ASCII
+
+		10646-1:1993      - ISO 10646, in big-endian UCS4 form
+		10646-1:1993/UCS4
+		CSUCS4
+		ISO-10646
+		ISO-10646/UCS4
+		OSF00010104
+		OSF00010105
+		OSF00010106
+		UCS-4
+		UCS-4BE
+		UCS4
+
+		UCS-4LE           - ISO 10646, in little-endian UCS4 form
+
+		ISO-10646/UTF-8   - ISO 10646, in UTF-8 form
+		ISO-10646/UTF8
+		ISO-IR-193
+		OSF05010001
+		UTF-8
+		UTF8
+
+		ISO-10646/UCS2    - ISO 10646, in target-endian UCS2 form
+		OSF00010100
+		OSF00010101
+		OSF00010102
+		UCS-2
+		UCS2
+
+		UCS-2BE           - ISO 10646, in big-endian UCS2 form
+		UNICODEBIG
+
+		UCS-2LE           - ISO 10646, in little-endian UCS2 form
+		UNICODELITTLE
+
+		WCHAR_T           - EGLIBC's internal form (target-endian,
+							32-bit ISO 10646)
+
+
+config EGLIBC_OPTION_EGLIBC_CRYPT
+	bool "Encryption library"
+	default y
+	help
+	  This option group includes the `libcrypt' library which
+	  provides functions for one-way encryption.  Supported
+	  encryption algorithms include MD5, SHA-256, SHA-512 and DES.
+
+
+config EGLIBC_OPTION_EGLIBC_CRYPT_UFC
+	bool "Ultra fast `crypt' implementation"
+	default y
+	select EGLIBC_OPTION_EGLIBC_CRYPT
+	help
+	  This option group provides ultra fast DES-based implementation of
+	  the `crypt' function.  When this option group is disabled,
+	  (a) the library will not provide the setkey[_r] and encrypt[_r]
+	  functions and (b) the crypt[_r] function will return NULL and set the
+	  errno to ENOSYS if /salt/ passed does not correspond to either MD5,
+	  SHA-256 or SHA-512 algorithm.
+
+
+config EGLIBC_OPTION_EGLIBC_DB_ALIASES
+	bool "Functions for accessing the mail aliases database"
+	default y
+	help
+	  This option group includes functions for looking up mail
+	  aliases in '/etc/aliases' or using nsswitch.  It includes the
+	  following functions:
+
+		endaliasent
+		getaliasbyname
+		getaliasbyname_r
+		getaliasent
+		getaliasent_r
+		setaliasent
+
+	  When this option group is disabled, the NSS service libraries
+	  also lack support for querying their mail alias tables.
+
+
+config EGLIBC_OPTION_EGLIBC_ENVZ
+	bool "Functions for handling envz-style environment vectors."
+	default y
+	help
+	  This option group contains functions for creating and operating
+	  on envz vectors.  An "envz vector" is a vector of strings in a
+	  contiguous block of memory, where each element is a name-value
+	  pair, and elements are separated from their neighbors by null
+	  characters.
+
+	  This option group includes the following functions:
+
+		envz_add        envz_merge 
+		envz_entry      envz_remove
+		envz_get        envz_strip 
+
+
+config EGLIBC_OPTION_EGLIBC_FCVT
+	bool "Functions for converting floating-point numbers to strings"
+	default y
+	help
+	  This option group includes functions for converting
+	  floating-point numbers to strings.
+
+	  This option group includes the following functions:
+
+		ecvt           qecvt
+		ecvt_r         qecvt_r
+		fcvt           qfcvt
+		fcvt_r         qfcvt_r
+		gcvt           qgcvt
+
+
+config EGLIBC_OPTION_EGLIBC_FMTMSG
+	bool "Functions for formatting messages"
+	default y
+	help
+	  This option group includes the following functions:
+
+		addseverity    fmtmsg
+
+
+config EGLIBC_OPTION_EGLIBC_FSTAB
+	bool "Access functions for 'fstab'"
+	default y
+	help
+	  This option group includes functions for reading the mount
+	  point specification table, '/etc/fstab'.  These functions are
+	  not included in the POSIX standard, which provides the
+	  'getmntent' family of functions instead.
+
+	  This option group includes the following functions:
+
+		endfsent       getfsspec
+		getfsent       setfsent
+		getfsfile
+
+
+config EGLIBC_OPTION_EGLIBC_FTRAVERSE
+	bool "Functions for traversing file hierarchies"
+	default y
+	help
+	  This option group includes functions for traversing file
+	  UNIX file hierachies.
+
+	  This option group includes the following functions:
+
+		fts_open       ftw
+		fts_read       nftw
+		fts_children   ftw64
+		fts_set        nftw64
+		fts_close
+
+
+config EGLIBC_OPTION_EGLIBC_GETLOGIN
+	bool "The getlogin function"
+	default y
+	select EGLIBC_OPTION_EGLIBC_UTMP
+	help
+	  This function group includes the 'getlogin' and 'getlogin_r'
+	  functions, which return the user name associated by the login
+	  activity with the current process's controlling terminal.
+
+	  With this option group disabled, the 'glob' function will not
+	  fall back on 'getlogin' to find the user's login name for tilde
+	  expansion when the 'HOME' environment variable is not set.
+
+
+config EGLIBC_OPTION_EGLIBC_IDN
+	bool "International domain names support"
+	default y
+	help
+	  This option group includes the `libcidn' library which
+	  provides support for international domain names.
+
+
+config EGLIBC_OPTION_EGLIBC_INET
+	bool "Networking support"
+	default y
+	help
+	  This option group includes networking-specific functions and
+	  data.  With EGLIBC_OPTION_EGLIBC_INET disabled, the EGLIBC
+	  installation and API changes as follows:
+
+	  - The following libraries are not installed:
+
+		libanl
+		libnsl
+		libnss_compat
+		libnss_dns
+		libnss_hesiod
+		libnss_nis
+		libnss_nisplus
+		libresolv
+		 
+	  - The following functions and variables are omitted from libc:
+
+		authdes_create           hstrerror              svc_fdset
+		authdes_getucred         htonl                  svc_getreq
+		authdes_pk_create        htons                  svc_getreq_common
+		authnone_create          if_freenameindex       svc_getreq_poll
+		authunix_create          if_indextoname         svc_getreqset
+		authunix_create_default  if_nameindex           svc_max_pollfd
+		bindresvport             if_nametoindex         svc_pollfd
+		callrpc                  in6addr_any            svcraw_create
+		cbc_crypt                in6addr_loopback       svc_register
+		clnt_broadcast           inet6_opt_append       svc_run
+		clnt_create              inet6_opt_find         svc_sendreply
+		clnt_pcreateerror        inet6_opt_finish       svctcp_create
+		clnt_perrno              inet6_opt_get_val      svcudp_bufcreate
+		clnt_perror              inet6_opt_init         svcudp_create
+		clntraw_create           inet6_option_alloc     svcudp_enablecache
+		clnt_spcreateerror       inet6_option_append    svcunix_create
+		clnt_sperrno             inet6_option_find      svcunixfd_create
+		clnt_sperror             inet6_option_init      svc_unregister
+		clnttcp_create           inet6_option_next      user2netname
+		clntudp_bufcreate        inet6_option_space     xdecrypt
+		clntudp_create           inet6_opt_next         xdr_accepted_reply
+		clntunix_create          inet6_opt_set_val      xdr_array
+		des_setparity            inet6_rth_add          xdr_authdes_cred
+		ecb_crypt                inet6_rth_getaddr      xdr_authdes_verf
+		endaliasent              inet6_rth_init         xdr_authunix_parms
+		endhostent               inet6_rth_reverse      xdr_bool
+		endnetent                inet6_rth_segments     xdr_bytes
+		endnetgrent              inet6_rth_space        xdr_callhdr
+		endprotoent              inet_addr              xdr_callmsg
+		endrpcent                inet_aton              xdr_char
+		endservent               inet_lnaof             xdr_cryptkeyarg
+		ether_aton               inet_makeaddr          xdr_cryptkeyarg2
+		ether_aton_r             inet_netof             xdr_cryptkeyres
+		ether_hostton            inet_network           xdr_des_block
+		ether_line               inet_nsap_addr         xdr_double
+		ether_ntoa               inet_nsap_ntoa         xdr_enum
+		ether_ntoa_r             inet_ntoa              xdr_float
+		ether_ntohost            inet_ntop              xdr_free
+		freeaddrinfo             inet_pton              xdr_getcredres
+		freeifaddrs              innetgr                xdr_hyper
+		gai_strerror             iruserok               xdr_int
+		getaddrinfo              iruserok_af            xdr_int16_t
+		getaliasbyname           key_decryptsession     xdr_int32_t
+		getaliasbyname_r         key_decryptsession_pk  xdr_int64_t
+		getaliasent              key_encryptsession     xdr_int8_t
+		getaliasent_r            key_encryptsession_pk  xdr_keybuf
+		gethostbyaddr            key_gendes             xdr_key_netstarg
+		gethostbyaddr_r          key_get_conv           xdr_key_netstres
+		gethostbyname            key_secretkey_is_set   xdr_keystatus
+		gethostbyname2           key_setnet             xdr_long
+		gethostbyname2_r         key_setsecret          xdr_longlong_t
+		gethostbyname_r          netname2host           xdrmem_create
+		gethostent               netname2user           xdr_netnamestr
+		gethostent_r             ntohl                  xdr_netobj
+		getifaddrs               ntohs                  xdr_opaque
+		getipv4sourcefilter      passwd2des             xdr_opaque_auth
+		get_myaddress            pmap_getmaps           xdr_pmap
+		getnameinfo              pmap_getport           xdr_pmaplist
+		getnetbyaddr             pmap_rmtcall           xdr_pointer
+		getnetbyaddr_r           pmap_set               xdr_quad_t
+		getnetbyname             pmap_unset             xdrrec_create
+		getnetbyname_r           rcmd                   xdrrec_endofrecord
+		getnetent                rcmd_af                xdrrec_eof
+		getnetent_r              registerrpc            xdrrec_skiprecord
+		getnetgrent              res_init               xdr_reference
+		getnetgrent_r            rexec                  xdr_rejected_reply
+		getnetname               rexec_af               xdr_replymsg
+		getprotobyname           rexecoptions           xdr_rmtcall_args
+		getprotobyname_r         rpc_createerr          xdr_rmtcallres
+		getprotobynumber         rresvport              xdr_short
+		getprotobynumber_r       rresvport_af           xdr_sizeof
+		getprotoent              rtime                  xdrstdio_create
+		getprotoent_r            ruserok                xdr_string
+		getpublickey             ruserok_af             xdr_u_char
+		getrpcbyname             ruserpass              xdr_u_hyper
+		getrpcbyname_r           setaliasent            xdr_u_int
+		getrpcbynumber           sethostent             xdr_uint16_t
+		getrpcbynumber_r         setipv4sourcefilter    xdr_uint32_t
+		getrpcent                setnetent              xdr_uint64_t
+		getrpcent_r              setnetgrent            xdr_uint8_t
+		getrpcport               setprotoent            xdr_u_long
+		getsecretkey             setrpcent              xdr_u_longlong_t
+		getservbyname            setservent             xdr_union
+		getservbyname_r          setsourcefilter        xdr_unixcred
+		getservbyport            svcauthdes_stats       xdr_u_quad_t
+		getservbyport_r          svcerr_auth            xdr_u_short
+		getservent               svcerr_decode          xdr_vector
+		getservent_r             svcerr_noproc          xdr_void
+		getsourcefilter          svcerr_noprog          xdr_wrapstring
+		h_errlist                svcerr_progvers        xencrypt
+		h_errno                  svcerr_systemerr       xprt_register
+		herror                   svcerr_weakauth        xprt_unregister
+		h_nerr                   svc_exit
+		host2netname             svcfd_create
+
+	  - The rpcgen, nscd, and rpcinfo commands are not installed.
+
+	  - The 'rpc' file (a text file listing RPC services) is not installed.
+
+	  Socket-related system calls do not fall in this option group,
+	  because many are also used for other inter-process
+	  communication mechanisms.  For example, the 'syslog' routines
+	  use Unix-domain sockets to communicate with the syslog daemon;
+	  syslog is valuable in non-networked contexts.
+
+
+config EGLIBC_OPTION_EGLIBC_INET_ANL
+	bool "Asynchronous name lookup"
+	default y
+	select EGLIBC_OPTION_EGLIBC_INET
+	help
+	  This option group includes the `libanl' library which
+	  provides support for asynchronous name lookup.
+
+
+config EGLIBC_OPTION_EGLIBC_LIBM
+	bool "libm (math library)"
+	default y
+	help
+	  This option group includes the 'libm' library, containing
+	  mathematical functions.  If this option group is omitted, then
+	  an EGLIBC installation does not include shared or unshared versions
+	  of the math library.
+
+	  Note that this does not remove all floating-point related
+	  functionality from EGLIBC; for example, 'printf' and 'scanf'
+	  can still print and read floating-point values with this option
+	  group disabled.
+
+	  Note that the ISO Standard C++ library 'libstdc++' depends on
+	  EGLIBC's math library 'libm'.  If you disable this option
+	  group, you will not be able to build 'libstdc++' against the
+	  resulting EGLIBC installation.
+
+
+config EGLIBC_OPTION_EGLIBC_LIBM_BIG
+	bool "Math library size"
+	default y
+	help
+	  This option group enables default configuration of the math library.
+	  Not selecting this option group removes most of the extended and
+	  double precision math functions and replaces them with wrappers
+	  to the single precision couterparts.
+	  Doing so greatly degrades quality of calculations carried
+	  out by the functions of the math library, but also significantly
+	  reduces the size of the libm.
+	  This option group is useful for systems that do not rely on precise
+	  floating point math.
+
+
+config EGLIBC_OPTION_EGLIBC_LOCALES
+	bool "Locale definitions"
+	default y
+	help
+	  This option group includes all locale definitions other than
+	  that for the "C" locale.  If this option group is omitted, then
+	  only the "C" locale is supported.
+
+
+config EGLIBC_OPTION_EGLIBC_LOCALE_CODE
+	bool "Locale functions"
+	default y
+	select EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
+	help
+	  This option group includes locale support functions, programs,
+	  and libraries.  With EGLIBC_OPTION_EGLIBC_LOCALE_CODE disabled,
+	  EGLIBC supports only the 'C' locale (also known as 'POSIX'),
+	  and ignores the settings of the 'LANG' and 'LC_*' environment
+	  variables.
+
+	  With EGLIBC_OPTION_EGLIBC_LOCALE_CODE disabled, the following
+	  functions are omitted from libc:
+
+		duplocale   localeconv  nl_langinfo    rpmatch  strfmon_l
+		freelocale  newlocale   nl_langinfo_l  strfmon  uselocale
+
+	  Furthermore, only the LC_CTYPE and LC_TIME categories of the
+	  standard "C" locale are available.
+
+	  The EGLIBC_OPTION_EGLIBC_CATGETS option group depends on this option
+	  group; if you disable EGLIBC_OPTION_EGLIBC_LOCALE_CODE, you must also
+	  disable EGLIBC_OPTION_EGLIBC_CATGETS.
+
+
+config EGLIBC_OPTION_EGLIBC_MEMUSAGE
+	bool "Memory profiling library"
+	default y
+	help
+	  This option group includes the `libmemusage' library and
+	  the `memusage' and `memusagestat' utilities.
+	  These components provide memory profiling functions.
+
+	  EGLIBC_OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+
+	  Libmemusage library buffers the profiling data in memory
+	  before writing it out to disk.  By default, the library
+	  allocates 1.5M buffer, which can be substantial for some
+	  systems.  EGLIBC_OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE option
+	  allows to change the default buffer size.  It specifies
+	  the number of entries the buffer should have.
+	  On most architectures one buffer entry amounts to 48 bytes,
+	  so setting this option to the value of 512 will reduce the size of
+	  the memory buffer to 24K.
+
+
+config EGLIBC_OPTION_EGLIBC_NIS
+	bool "Support for NIS, NIS+, and the special 'compat' services."
+	default n
+	select EGLIBC_OPTION_EGLIBC_INET
+	select EGLIBC_OPTION_EGLIBC_SUNRPC
+	help
+	  This option group includes the NIS, NIS+, and 'compat' Name
+	  Service Switch service libraries.  When it is disabled, those
+	  services libraries are not installed; you should remove any
+	  references to them from your 'nsswitch.conf' file.
+
+	  This option group depends on the EGLIBC_OPTION_EGLIBC_INET option
+	  group; you must enable that to enable this option group.
+
+
+config EGLIBC_OPTION_EGLIBC_NSSWITCH
+	bool "Name service switch (nsswitch) support"
+	default y
+	select EGLIBC_OPTION_EGLIBC_INET
+	help
+
+	  This option group includes support for the 'nsswitch' facility.
+	  With this option group enabled, all EGLIBC functions for
+	  accessing various system databases (passwords and groups;
+	  networking; aliases; public keys; and so on) consult the
+	  '/etc/nsswitch.conf' configuration file to decide how to handle
+	  queries.
+
+	  With this option group disabled, EGLIBC uses a fixed list of
+	  services to satisfy queries on each database, as requested by
+	  configuration files specified when EGLIBC is built.  Your
+	  'option-groups.config' file must set the following two
+	  variables:
+
+	  EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
+
+		Set this to the name of a file whose contents observe the
+		same syntax as an ordinary '/etc/nsswitch.conf' file.  The
+		EGLIBC build process parses this file just as EGLIBC would
+		at run time if EGLIBC_NSSWITCH were enabled, and
+		produces a C library that uses the nsswitch service
+		libraries to search for database entries as this file
+		specifies, instead of consulting '/etc/nsswitch.conf' at run
+		time.
+
+		This should be an absolute filename.  The EGLIBC build
+		process may use it from several different working
+		directories.  It may include references to Makefile
+		variables like 'common-objpfx' (the top of the build tree,
+		with a trailing slash), or '..' (the top of the source tree,
+		with a trailing slash).
+
+		The EGLIBC source tree includes a sample configuration file
+		named 'nss/fixed-nsswitch.conf'; for simple configurations,
+		you will probably want to delete references to databases not
+		needed on your system.
+
+	  EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+
+		The EGLIBC build process uses this file to decide which
+		functions to make available from which service libraries.
+		The file 'nss/fixed-nsswitch.functions' serves as a sample
+		configuration file for this setting, and explains its syntax
+		and meaning in more detail.
+
+		This should be an absolute file name.  The EGLIBC build
+		process may use it from several different working
+		directories.  It may include references to Makefile
+		variables like 'common-objpfx' (the top of the build tree,
+		with a trailing slash), or '..' (the top of the source tree,
+		with a trailing slash).
+
+		Be sure to mention each function in each service you wish to
+		use.  If you do not mention a service's function here, the
+		EGLIBC database access functions will not find it, even if
+		it is listed in the EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
+		file.
+
+	  In this arrangement, EGLIBC will not use the 'dlopen' and
+	  'dlsym' functions to find database access functions.  Instead,
+	  libc hard-codes references to the service libraries' database
+	  access functions.  You must explicitly link your program
+	  against the name service libraries (those whose names start
+	  with 'libnss_', in the sysroot's '/lib' directory) whose
+	  functions you intend to use.  This arrangement helps
+	  system-wide static analysis tools decide which functions a
+	  system actually uses.
+
+	  Note that some nsswitch service libraries require other option
+	  groups to be enabled; for example, the EGLIBC_OPTION_EGLIBC_INET
+	  option group must be enabled to use the 'libnss_dns.so.2'
+	  service library, which uses the Domain Name System network
+	  protocol to answer queries.
+
+
+config EGLIBC_OPTION_EGLIBC_RCMD
+	bool "Support for 'rcmd' and related library functions"
+	default y
+	select EGLIBC_OPTION_EGLIBC_INET
+	help
+	  This option group includes functions for running commands on
+	  remote machines via the 'rsh' protocol, and doing authentication
+	  related to those functions.  This also includes functions that
+	  use the 'rexec' protocol.
+
+	  This option group includes the following functions:
+
+		rcmd            ruserok
+		rcmd_af         ruserok_af
+		rexec           iruserok
+		rexec_af        iruserok_af
+		rresvport       ruserpass
+		rresvport_af
+
+
+config EGLIBC_OPTION_EGLIBC_RTLD_DEBUG
+	bool "Runtime linker debug print outs"
+	default y
+	help
+	  This option group enables debug output of the runtime linker
+	  which is activated via LD_DEBUG and LD_TRACE_PRELINKING
+	  environment variables.  Disabling this option group yields
+	  a smaller runtime linker binary.
+	  BEWARE: Disabling this option group is likely to break
+	  the `ldd' utility which may also be used by the prelinker.
+	  In particular, the `--unused' ldd option will not work correctly.
+
+
+config EGLIBC_OPTION_EGLIBC_SPAWN
+	bool "Support for POSIX posix_spawn functions"
+	default y
+	help
+	  This option group includes the POSIX functions for executing
+	  programs in child processes without using 'fork' or 'vfork'.
+
+	  This option group includes the following functions:
+
+		posix_spawn
+		posix_spawnattr_destroy
+		posix_spawnattr_getflags
+		posix_spawnattr_getpgroup
+		posix_spawnattr_getschedparam
+		posix_spawnattr_getschedpolicy
+		posix_spawnattr_getsigdefault
+		posix_spawnattr_getsigmask
+		posix_spawnattr_init
+		posix_spawnattr_setflags
+		posix_spawnattr_setpgroup
+		posix_spawnattr_setschedparam
+		posix_spawnattr_setschedpolicy
+		posix_spawnattr_setsigdefault
+		posix_spawnattr_setsigmask
+		posix_spawn_file_actions_addclose
+		posix_spawn_file_actions_adddup2
+		posix_spawn_file_actions_addopen
+		posix_spawn_file_actions_destroy
+		posix_spawn_file_actions_init
+		posix_spawnp
+
+	  This option group also provides the ability for the iconv,
+	  localedef, and locale programs to operate transparently on
+	  compressed charset definitions.  When this option group is
+	  disabled, those programs will only operate on uncompressed
+	  charmap files.
+
+
+config EGLIBC_OPTION_EGLIBC_STREAMS
+	bool "Support for accessing STREAMS."
+	default y
+	help
+	  This option group includes functions for reading and writing
+	  messages to and from STREAMS.  The STREAMS interface provides a
+	  uniform mechanism for implementing networking services and other
+	  character-based I/O.  (STREAMS are not to be confused with
+	  <stdio.h> FILE objects, also called 'streams'.)
+
+	  This option group includes the following functions:
+
+		getmsg          putpmsg
+		getpmsg         fattach
+		isastream       fdetach
+		putmsg
+
+
+config EGLIBC_OPTION_EGLIBC_SUNRPC
+	bool "Support for the Sun 'RPC' protocol."
+	default n
+	select EGLIBC_OPTION_EGLIBC_INET
+	help
+	  This option group includes support for the Sun RPC protocols,
+	  including the 'rpcgen' and 'rpcinfo' programs.
+
+
+config EGLIBC_OPTION_EGLIBC_UTMP
+	bool "Older access functions for 'utmp' login records"
+	default y
+	help
+	  This option group includes the older 'utent' family of
+	  functions for accessing user login records in the 'utmp' file.
+	  POSIX omits these functions in favor of the 'utxent' family,
+	  and they are obsolete on systems other than Linux.
+
+	  This option group includes the following functions:
+
+		endutent
+		getutent
+		getutent_r
+		getutid
+		getutid_r
+		getutline
+		getutline_r
+		logwtmp
+		pututline
+		setutent
+		updwtmp
+		utmpname
+
+	  This option group includes the following libraries:
+
+		libutil.so (and libutil.a)
+
+
+config EGLIBC_OPTION_EGLIBC_UTMPX
+	bool "POSIX access functions for 'utmp' login records"
+	default y
+	select EGLIBC_OPTION_EGLIBC_UTMP    
+	help
+	  This option group includes the POSIX functions for reading and
+	  writing user login records in the 'utmp' file (usually
+	  '/var/run/utmp').  The POSIX functions operate on 'struct
+	  utmpx' structures, as opposed to the family of older 'utent'
+	  functions, which operate on 'struct utmp' structures.
+
+	  This option group includes the following functions:
+
+		endutxent
+		getutmp
+		getutmpx
+		getutxent
+		getutxid
+		getutxline
+		pututxline
+		setutxent
+		updwtmpx
+		utmpxname
+
+
+config EGLIBC_OPTION_EGLIBC_WORDEXP
+	bool "Shell-style word expansion"
+	default y
+	help
+	  This option group includes the 'wordexp' function for
+	  performing word expansion in the manner of the shell, and the
+	  accompanying 'wordfree' function.
+
+
+config EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
+	bool "ISO C library wide character functions, excluding I/O"
+	default y
+	help
+	  This option group includes the functions defined by the ISO C
+	  standard for working with wide and multibyte characters in
+	  memory.  Functions for reading and writing wide and multibyte
+	  characters from and to files call in the
+	  EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO option group.
+
+	  This option group includes the following functions:
+
+		btowc         mbsinit       wcscspn       wcstoll
+		iswalnum      mbsrtowcs     wcsftime      wcstombs
+		iswalpha      mbstowcs      wcslen        wcstoul
+		iswblank      mbtowc        wcsncat       wcstoull
+		iswcntrl      swprintf      wcsncmp       wcstoumax
+		iswctype      swscanf       wcsncpy       wcsxfrm
+		iswdigit      towctrans     wcspbrk       wctob
+		iswgraph      towlower      wcsrchr       wctomb
+		iswlower      towupper      wcsrtombs     wctrans
+		iswprint      vswprintf     wcsspn        wctype
+		iswpunct      vswscanf      wcsstr        wmemchr
+		iswspace      wcrtomb       wcstod        wmemcmp
+		iswupper      wcscat        wcstof        wmemcpy
+		iswxdigit     wcschr        wcstoimax     wmemmove
+		mblen         wcscmp        wcstok        wmemset
+		mbrlen        wcscoll       wcstol
+		mbrtowc       wcscpy        wcstold
+
+
+config EGLIBC_OPTION_POSIX_REGEXP
+	bool "Regular expressions"
+	default y
+	help
+	  This option group includes the POSIX regular expression
+	  functions, and the associated non-POSIX extensions and
+	  compatibility functions.
+
+	  With EGLIBC_OPTION_POSIX_REGEXP disabled, the following functions are
+	  omitted from libc:
+
+		re_comp                 re_max_failures         regcomp
+		re_compile_fastmap      re_search               regerror
+		re_compile_pattern      re_search_2             regexec
+		re_exec                 re_set_registers        regfree
+		re_match                re_set_syntax           rpmatch
+		re_match_2              re_syntax_options
+
+	  Furthermore, the compatibility regexp interface defined in the
+	  <regexp.h> header file, 'compile', 'step', and 'advance', is
+	  omitted.
+
+
+config EGLIBC_OPTION_POSIX_REGEXP_GLIBC
+	bool "Regular expressions from GLIBC"
+	default y
+	select EGLIBC_OPTION_POSIX_REGEXP
+	help
+	  This option group specifies which regular expression
+	  library to use.  The choice is between regex
+	  implementation from GLIBC and regex implementation from
+	  libiberty.  The GLIBC variant is fully POSIX conformant and
+	  optimized for speed; regex from libiberty is more than twice
+	  as small while still is enough for most practical purposes.
+
+
+config EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+	bool "Input and output functions for wide characters"
+	default y
+	select EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
+	help
+	  This option group includes functions for reading and writing
+	  wide characters to and from <stdio.h> streams.
+
+	  This option group includes the following functions:
+
+		fgetwc        fwprintf      putwchar      vwscanf
+		fgetws        fwscanf       ungetwc       wprintf
+		fputwc        getwc         vfwprintf     wscanf
+		fputws        getwchar      vfwscanf
+		fwide         putwc         vwprintf
+
+	  This option group further includes the following unlocked
+	  variants of the above functions:
+
+		fgetwc_unlocked           getwc_unlocked
+		fgetws_unlocked           getwchar_unlocked
+		fputwc_unlocked           putwc_unlocked
+		fputws_unlocked           putwchar_unlocked
+					
+	  Note that the GNU standard C++ library, 'libstdc++.so', uses
+	  some of these functions; you will not be able to link or run
+	  C++ programs if you disable this option group.
+
+	  This option group also affects the behavior of the following
+	  functions:
+
+		fdopen
+		fopen
+		fopen64
+		freopen
+		freopen64
+
+	  These functions all take an OPENTYPE parameter which may
+	  contain a string of the form ",ccs=CHARSET", indicating that
+	  the underlying file uses the character set named CHARSET.
+	  This produces a wide-oriented stream, which is only useful
+	  when the functions included in this option group are present.
+	  If the user attempts to open a file specifying a character set
+	  in the OPENTYPE parameter, and EGLIBC was built with this
+	  option group disabled, the function returns NULL, and sets
+	  errno to EINVAL.
diff --git a/trunk/toolchain/eglibc/headers/Makefile b/trunk/toolchain/eglibc/headers/Makefile
new file mode 100644
index 00000000..f9f411b1
--- /dev/null
+++ b/trunk/toolchain/eglibc/headers/Makefile
@@ -0,0 +1,27 @@
+PATH_PREFIX:=..
+VARIANT:=headers
+
+include ../common.mk
+
+define Host/Compile
+
+endef
+
+define Host/Install
+	$(call Host/SetToolchainInfo)
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/{include,lib}
+	$(MAKE) -C $(CUR_BUILD_DIR) \
+		BUILD_CFLAGS="$(HOST_CFLAGS)" \
+		install_root="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev" \
+		install-bootstrap-headers=yes \
+		install-headers
+	$(MAKE) -C $(CUR_BUILD_DIR) \
+		csu/subdir_lib
+	( cd $(CUR_BUILD_DIR); \
+		$(CP) csu/crt1.o csu/crti.o csu/crtn.o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/lib/ \
+	)
+	$(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/lib/libc.so
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/eglibc/include/libintl.h b/trunk/toolchain/eglibc/include/libintl.h
new file mode 100644
index 00000000..69cb887a
--- /dev/null
+++ b/trunk/toolchain/eglibc/include/libintl.h
@@ -0,0 +1,6 @@
+#ifndef __FAKE_LIBINTL_H
+#define __FAKE_LIBINTL_H
+
+#define _(X) (X)
+
+#endif
diff --git a/trunk/toolchain/eglibc/patches/2.15/001-fix_autoconf_macro.patch b/trunk/toolchain/eglibc/patches/2.15/001-fix_autoconf_macro.patch
new file mode 100644
index 00000000..55b26c7d
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.15/001-fix_autoconf_macro.patch
@@ -0,0 +1,48 @@
+--- a/libc/aclocal.m4
++++ b/libc/aclocal.m4
+@@ -88,6 +88,12 @@
+ fi
+ rm -fr contest*])
+ 
++dnl Test a compiler option or options with an empty input file.
++dnl LIBC_TRY_CC_OPTION([options], [action-if-true], [action-if-false])
++AC_DEFUN([LIBC_TRY_CC_OPTION],
++[AS_IF([AC_TRY_COMMAND([${CC-cc} $1 -xc /dev/null -S -o /dev/null])],
++ [$2], [$3])])
++
+ AC_DEFUN([LIBC_PROG_BINUTILS],
+ [# Was a --with-binutils option given?
+ if test -n "$path_binutils"; then
+--- a/libc/configure
++++ b/libc/configure
+@@ -7404,7 +7404,14 @@
+ else
+   libc_cv_cc_nofma=
+ for opt in -ffp-contract=off -mno-fused-madd; do
+-  LIBC_TRY_CC_OPTION($opt, libc_cv_cc_nofma=$opt; break)
++  if { ac_try='${CC-cc} $opt -xc /dev/null -S -o /dev/null'
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then :
++  libc_cv_cc_nofma=$opt; break
++fi
+ done
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cc_nofma" >&5
+--- a/libc/configure.in
++++ b/libc/configure.in
+@@ -2238,10 +2238,9 @@
+ 		 libc_cv_cc_submachine, [dnl
+   libc_cv_cc_submachine=no
+   for opt in "-march=$submachine" "-mcpu=$submachine"; do
+-    if AC_TRY_COMMAND([${CC-cc} $opt -xc /dev/null -S -o /dev/null]); then
++    LIBC_TRY_CC_OPTION([$opt], [
+       libc_cv_cc_submachine="$opt"
+-      break
+-    fi
++      break], [])
+   done])
+   if test "x$libc_cv_cc_submachine" = xno; then
+     AC_MSG_ERROR([${CC-cc} does not support $submachine])
diff --git a/trunk/toolchain/eglibc/patches/2.15/005-versions.patch b/trunk/toolchain/eglibc/patches/2.15/005-versions.patch
new file mode 100644
index 00000000..da9d2bac
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.15/005-versions.patch
@@ -0,0 +1,11 @@
+--- a/libc/configure.in
++++ b/libc/configure.in
+@@ -1037,7 +1037,7 @@
+   critic_missing="$critic_missing gcc")
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+-  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
++  [3.79* | 3.[89]* | 4.* ], critic_missing="$critic_missing make")
+ 
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
diff --git a/trunk/toolchain/eglibc/patches/2.15/050-all_glibc-2.14-leak-revert-crash.patch b/trunk/toolchain/eglibc/patches/2.15/050-all_glibc-2.14-leak-revert-crash.patch
new file mode 100644
index 00000000..d1e19aa4
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.15/050-all_glibc-2.14-leak-revert-crash.patch
@@ -0,0 +1,110 @@
+partially revert commit 4bff6e0175ed195871f4e01cc4c4c33274b8f6e3 - caused segmentation faults in dlopen
+
+References:
+http://comments.gmane.org/gmane.comp.lib.glibc.user/1227
+http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
+
+diff --git a/libc/elf/dl-close.c b/libc/elf/dl-close.c
+index 4b17bf8..733cc1b 100644
+--- a/libc/elf/dl-close.c
++++ b/libc/elf/dl-close.c
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
+       || dl_close_state != not_pending)
+     {
+-      if (map->l_direct_opencount == 0)
+-	{
+-	  if (map->l_type == lt_loaded)
+-	    dl_close_state = rerun;
+-	  else if (map->l_type == lt_library)
+-	    {
+-	      struct link_map **oldp = map->l_initfini;
+-	      map->l_initfini = map->l_orig_initfini;
+-	      _dl_scope_free (oldp);
+-	    }
+-	}
++      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
++	dl_close_state = rerun;
+ 
+       /* There are still references to this object.  Do nothing more.  */
+       if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
+diff --git a/libc/elf/dl-deps.c b/libc/elf/dl-deps.c
+index 51cb2fa..eddcbf0 100644
+--- a/libc/elf/dl-deps.c
++++ b/libc/elf/dl-deps.c
+@@ -489,6 +489,7 @@ _dl_map_object_deps (struct link_map *map,
+ 		  nneeded * sizeof needed[0]);
+ 	  atomic_write_barrier ();
+ 	  l->l_initfini = l_initfini;
++	  l->l_free_initfini = 1;
+ 	}
+ 
+       /* If we have no auxiliary objects just go on to the next map.  */
+@@ -689,6 +690,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+   l_initfini[nlist] = NULL;
+   atomic_write_barrier ();
+   map->l_initfini = l_initfini;
++  map->l_free_initfini = 1;
+   if (l_reldeps != NULL)
+     {
+       atomic_write_barrier ();
+@@ -697,7 +699,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+       _dl_scope_free (old_l_reldeps);
+     }
+   if (old_l_initfini != NULL)
+-      map->l_orig_initfini = old_l_initfini;
++    _dl_scope_free (old_l_initfini);
+ 
+   if (errno_reason)
+     _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+diff --git a/libc/elf/dl-libc.c b/libc/elf/dl-libc.c
+index f44fa10..7563093 100644
+--- a/libc/elf/dl-libc.c
++++ b/libc/elf/dl-libc.c
+@@ -284,6 +284,10 @@ libc_freeres_fn (free_mem)
+ 	      if (! old->dont_free)
+ 		free (old);
+ 	    }
++
++	  /* Free the initfini dependency list.  */
++	  if (l->l_free_initfini)
++	    free (l->l_initfini);
+ 	}
+ 
+       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/libc/elf/rtld.c b/libc/elf/rtld.c
+index b93a01f..2fc83ce 100644
+--- a/libc/elf/rtld.c
++++ b/libc/elf/rtld.c
+@@ -2277,6 +2277,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ 	      lnp->dont_free = 1;
+ 	      lnp = lnp->next;
+ 	    }
++	  l->l_free_initfini = 0;
+ 
+ 	  if (l != &GL(dl_rtld_map))
+ 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/libc/include/link.h b/libc/include/link.h
+index e877104..b1b4065 100644
+--- a/libc/include/link.h
++++ b/libc/include/link.h
+@@ -192,6 +192,9 @@ struct link_map
+ 						 during LD_TRACE_PRELINKING=1
+ 						 contains any DT_SYMBOLIC
+ 						 libraries.  */
++    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++				       freed, ie. not allocated with
++				       the dummy malloc in ld.so.  */
+ 
+     /* Collected information about own RPATH directories.  */
+     struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@ struct link_map
+ 
+     /* List of object in order of the init and fini calls.  */
+     struct link_map **l_initfini;
+-    /* The init and fini list generated at startup, saved when the
+-       object is also loaded dynamically.  */
+-    struct link_map **l_orig_initfini;
+ 
+     /* List of the dependencies introduced through symbol binding.  */
+     struct link_map_reldeps
diff --git a/trunk/toolchain/eglibc/patches/2.15/100-fix_cross_rpcgen.patch b/trunk/toolchain/eglibc/patches/2.15/100-fix_cross_rpcgen.patch
new file mode 100644
index 00000000..8fe5cf3f
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.15/100-fix_cross_rpcgen.patch
@@ -0,0 +1,71 @@
+--- a/libc/sunrpc/proto.h
++++ b/libc/sunrpc/proto.h
+@@ -56,12 +56,14 @@ void add_type(int len, const char *type)
+    $build's C library and $host's GLIBC.  */
+ #ifdef _CROSS_RPCGEN_
+ 
++#undef stpcpy
++
+ /* Rather then defining _GNU_SOURCE before including $build's <string.h>
+    we just declare stpcpy here.  */
+ extern char *stpcpy (char *, const char *);
+ 
+-/* Use $build's i18n support as we can't use $host's.  */
+-#define _(X) (gettext (X))
++/* Do not use i18n support  */
++#define _(X) (X)
+ 
+ /* rpcgen sources check for __GNU_LIBRARY__ to tweak for GLIBC code
+    that rpcgen generates.  The proper fix would be to rename all those checks
+--- a/libc/sunrpc/rpc/types.h
++++ b/libc/sunrpc/rpc/types.h
+@@ -70,18 +70,23 @@ typedef unsigned long rpcport_t;
+ #endif
+ 
+ #ifndef __u_char_defined
+-typedef __u_char u_char;
+-typedef __u_short u_short;
+-typedef __u_int u_int;
+-typedef __u_long u_long;
+-typedef __quad_t quad_t;
+-typedef __u_quad_t u_quad_t;
+-typedef __fsid_t fsid_t;
++typedef unsigned char u_char;
++typedef unsigned short u_short;
++typedef unsigned int u_int;
++typedef unsigned long u_long;
++#if __WORDSIZE == 64
++typedef long int quad_t;
++typedef unsigned long int u_quad_t;
++#elif defined __GLIBC_HAVE_LONG_LONG
++typedef long long int quad_t;
++typedef unsigned long long int u_quad_t;
++#endif
++typedef u_quad_t fsid_t;
+ # define __u_char_defined
+ #endif
+-#ifndef __daddr_t_defined
+-typedef __daddr_t daddr_t;
+-typedef __caddr_t caddr_t;
++#if !defined(__daddr_t_defined) && defined(linux)
++typedef long int daddr_t;
++typedef char *caddr_t;
+ # define __daddr_t_defined
+ #endif
+ 
+--- a/libc/sunrpc/rpc_main.c
++++ b/libc/sunrpc/rpc_main.c
+@@ -997,9 +997,10 @@ mkfile_output (struct commandline *cmd)
+ 	abort ();
+       temp = rindex (cmd->infile, '.');
+       cp = stpcpy (mkfilename, "Makefile.");
+-      if (temp != NULL)
+-	*((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';
+-      else
++      if (temp != NULL) {
++        strncpy(cp, cmd->infile, temp - cmd->infile);
++        cp[temp - cmd->infile - 1] = 0;
++      } else
+ 	stpcpy (cp, cmd->infile);
+ 
+     }
diff --git a/trunk/toolchain/eglibc/patches/2.15/110-fix_cross_zic.patch b/trunk/toolchain/eglibc/patches/2.15/110-fix_cross_zic.patch
new file mode 100644
index 00000000..221eb287
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.15/110-fix_cross_zic.patch
@@ -0,0 +1,27 @@
+--- a/libc/timezone/zic.c
++++ b/libc/timezone/zic.c
+@@ -8,6 +8,8 @@ static char	elsieid[] = "@(#)zic.c	8.19"
+ #ifdef CROSS_ZIC
+ #define REPORT_BUGS_TO ""
+ #define PKGVERSION ""
++#undef _
++#define _(X) (X)
+ #else
+ #include "config.h"
+ #endif
+@@ -490,6 +492,7 @@ char *	argv[];
+ #ifdef unix
+ 	(void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
+ #endif /* defined unix */
++#ifndef CROSS_ZIC
+ #if HAVE_GETTEXT
+ 	(void) setlocale(LC_ALL, "");
+ #ifdef TZ_DOMAINDIR
+@@ -497,6 +500,7 @@ char *	argv[];
+ #endif /* defined TEXTDOMAINDIR */
+ 	(void) textdomain(TZ_DOMAIN);
+ #endif /* HAVE_GETTEXT */
++#endif
+ 	progname = argv[0];
+ 	if (TYPE_BIT(zic_t) < 64) {
+ 		(void) fprintf(stderr, "%s: %s\n", progname,
diff --git a/trunk/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch b/trunk/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch
new file mode 100644
index 00000000..4c58fb4f
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch
@@ -0,0 +1,22 @@
+--- a/libc/sunrpc/Makefile
++++ b/libc/sunrpc/Makefile
+@@ -175,7 +175,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$
+ 	$(+link)
+ 
+ $(addprefix $(objpfx)cross-,$(rpcgen-objs)): $(objpfx)cross-%.o: %.c
+-	gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ \
++	gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ $(HOST_CFLAGS) \
+ 		$(OUTPUT_OPTION) $(compile-mkdep-flags)
+ 
+ $(objpfx)cross-rpcgen: $(addprefix $(objpfx)cross-,$(rpcgen-objs))
+--- a/libc/timezone/Makefile
++++ b/libc/timezone/Makefile
+@@ -182,7 +182,7 @@ $(objpfx)zic: $(addprefix $(objpfx), $(z
+ 
+ $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c
+ 	gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \
+-		-DCROSS_ZIC $(compile-mkdep-flags)
++		-DCROSS_ZIC $(HOST_CFLAGS) $(compile-mkdep-flags)
+ 
+ $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs))
+ 	gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@
diff --git a/trunk/toolchain/eglibc/patches/2.15/200-add-dl-search-paths.patch b/trunk/toolchain/eglibc/patches/2.15/200-add-dl-search-paths.patch
new file mode 100644
index 00000000..70e7e604
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.15/200-add-dl-search-paths.patch
@@ -0,0 +1,14 @@
+add /usr/lib to default search path for the dynamic linker
+
+--- a/libc/Makeconfig
++++ b/libc/Makeconfig
+@@ -539,6 +539,9 @@
+ default-rpath = $(libdir)
+ endif
+ 
++# Add /usr/lib to default search path for the dynamic linker
++user-defined-trusted-dirs := /usr/lib
++
+ ifndef link-extra-libs
+ link-extra-libs = $(LDLIBS-$(@F))
+ link-extra-libs-static = $(link-extra-libs)
diff --git a/trunk/toolchain/eglibc/patches/2.19/100-fix_cross_rpcgen.patch b/trunk/toolchain/eglibc/patches/2.19/100-fix_cross_rpcgen.patch
new file mode 100644
index 00000000..5c0d45b5
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.19/100-fix_cross_rpcgen.patch
@@ -0,0 +1,52 @@
+--- a/libc/sunrpc/rpc/types.h
++++ b/libc/sunrpc/rpc/types.h
+@@ -75,18 +75,23 @@ typedef unsigned long rpcport_t;
+ #endif
+ 
+ #ifndef __u_char_defined
+-typedef __u_char u_char;
+-typedef __u_short u_short;
+-typedef __u_int u_int;
+-typedef __u_long u_long;
+-typedef __quad_t quad_t;
+-typedef __u_quad_t u_quad_t;
+-typedef __fsid_t fsid_t;
++typedef unsigned char u_char;
++typedef unsigned short u_short;
++typedef unsigned int u_int;
++typedef unsigned long u_long;
++#if __WORDSIZE == 64
++typedef long int quad_t;
++typedef unsigned long int u_quad_t;
++#elif defined __GLIBC_HAVE_LONG_LONG
++typedef long long int quad_t;
++typedef unsigned long long int u_quad_t;
++#endif
++typedef u_quad_t fsid_t;
+ # define __u_char_defined
+ #endif
+-#ifndef __daddr_t_defined
+-typedef __daddr_t daddr_t;
+-typedef __caddr_t caddr_t;
++#if !defined(__daddr_t_defined) && defined(linux)
++typedef long int daddr_t;
++typedef char *caddr_t;
+ # define __daddr_t_defined
+ #endif
+ 
+--- a/libc/sunrpc/rpc_main.c
++++ b/libc/sunrpc/rpc_main.c
+@@ -958,9 +958,10 @@ mkfile_output (struct commandline *cmd)
+ 	abort ();
+       temp = rindex (cmd->infile, '.');
+       cp = stpcpy (mkfilename, "Makefile.");
+-      if (temp != NULL)
+-	*((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';
+-      else
++      if (temp != NULL) {
++        strncpy(cp, cmd->infile, temp - cmd->infile);
++        cp[temp - cmd->infile - 1] = 0;
++      } else
+ 	stpcpy (cp, cmd->infile);
+ 
+     }
diff --git a/trunk/toolchain/eglibc/patches/2.19/200-add-dl-search-paths.patch b/trunk/toolchain/eglibc/patches/2.19/200-add-dl-search-paths.patch
new file mode 100644
index 00000000..fa192ca1
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.19/200-add-dl-search-paths.patch
@@ -0,0 +1,14 @@
+add /usr/lib to default search path for the dynamic linker
+
+--- a/libc/Makeconfig
++++ b/libc/Makeconfig
+@@ -501,6 +501,9 @@ else
+ default-rpath = $(libdir)
+ endif
+ 
++# Add /usr/lib to default search path for the dynamic linker
++user-defined-trusted-dirs := /usr/lib
++
+ ifndef link-extra-libs
+ link-extra-libs = $(LDLIBS-$(@F))
+ link-extra-libs-static = $(link-extra-libs)
diff --git a/trunk/toolchain/eglibc/patches/2.19/300-require-autoconf-2.69.patch b/trunk/toolchain/eglibc/patches/2.19/300-require-autoconf-2.69.patch
new file mode 100644
index 00000000..623885ca
--- /dev/null
+++ b/trunk/toolchain/eglibc/patches/2.19/300-require-autoconf-2.69.patch
@@ -0,0 +1,13 @@
+Index: eglibc-2.19-r25243/libc/aclocal.m4
+===================================================================
+--- eglibc-2.19-r25243.orig/libc/aclocal.m4	2013-11-06 15:03:08.000000000 -0800
++++ eglibc-2.19-r25243/libc/aclocal.m4	2014-11-22 15:43:05.343256863 -0800
+@@ -1,7 +1,7 @@
+ dnl We require that everyone use exactly the same Autoconf version so that
+ dnl the internal functions defined and used by the main configure script
+ dnl match those expected by the fragments.
+-m4_define([GLIBC_AUTOCONF_VERSION], [2.68])
++m4_define([GLIBC_AUTOCONF_VERSION], [2.69])
+ m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
+       [m4_fatal(m4_flatten(
+ Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have
diff --git a/trunk/toolchain/gcc/Config.in b/trunk/toolchain/gcc/Config.in
new file mode 100644
index 00000000..ecd7c260
--- /dev/null
+++ b/trunk/toolchain/gcc/Config.in
@@ -0,0 +1,76 @@
+# Choose gcc version.
+
+choice
+	prompt "GCC compiler Version" if TOOLCHAINOPTS
+	default GCC_USE_VERSION_4_4_7 if avr32
+	default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
+	default GCC_USE_VERSION_4_8_LINARO
+	help
+	  Select the version of gcc you wish to use.
+
+	config GCC_USE_VERSION_4_4_7
+		select GCC_VERSION_4_4_7
+		bool "gcc 4.4.7"
+		depends on avr32
+
+	config GCC_USE_VERSION_4_6_LINARO
+		select GCC_VERSION_4_6_LINARO
+		bool "gcc 4.6.x with Linaro enhancements"
+
+	config GCC_USE_VERSION_4_8_LINARO
+		select GCC_VERSION_4_8_LINARO
+		bool "gcc 4.8.x with Linaro enhancements"
+
+	config GCC_USE_VERSION_4_9_LINARO
+		select GCC_VERSION_4_9_LINARO
+		bool "gcc 4.9.x with Linaro enhancements"
+
+endchoice
+
+config GCC_USE_GRAPHITE
+	bool
+	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+
+config GCC_USE_SYSTEM_PPL_CLOOG
+	bool
+	prompt "Use the system versions of PPL and CLooG"
+	depends on GCC_USE_GRAPHITE
+	default n
+
+config EXTRA_GCC_CONFIG_OPTIONS
+	string
+	prompt "Additional gcc configure options" if TOOLCHAINOPTS
+	default ""
+	help
+	    Any additional gcc options you may want to include....
+
+config SSP_SUPPORT
+	bool
+	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+	default n
+	help
+	    Enable Stack-Smashing Protection support
+
+config SJLJ_EXCEPTIONS
+	bool
+	prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
+	default n
+	help
+	    Use old setjump()/longjump() exceptions instead of the newer
+	    frame unwinding exceptions handling routines.  Warning: increases
+	    code size and runtime memory usage.
+
+config INSTALL_LIBGCJ
+	bool
+	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
+	default n
+	help
+	    Build/install java compiler and GNU classpath ?
+
+
+config INSTALL_GFORTRAN
+	bool
+	prompt "Build/install fortran compiler?" if TOOLCHAINOPTS
+	default n
+	help
+	    Build/install GNU fortran compiler ?
diff --git a/trunk/toolchain/gcc/Config.version b/trunk/toolchain/gcc/Config.version
new file mode 100644
index 00000000..d640c04d
--- /dev/null
+++ b/trunk/toolchain/gcc/Config.version
@@ -0,0 +1,39 @@
+config GCC_VERSION_4_4_7
+	default y if (!TOOLCHAINOPTS && avr32)
+	bool
+
+config GCC_VERSION_4_6_LINARO
+	default y if (!TOOLCHAINOPTS && TARGET_octeon)
+	bool
+
+config GCC_VERSION_4_8_LINARO
+	default y if (!TOOLCHAINOPTS && !avr32 && !TARGET_octeon)
+	bool
+
+config GCC_VERSION_4_9_LINARO
+	bool
+
+config GCC_VERSION
+	string
+	default "4.4.7"	    if GCC_VERSION_4_4_7
+	default "4.6.3"	    if GCC_VERSION_4_6_3
+	default "4.6-linaro"    if GCC_VERSION_4_6_LINARO
+	default "4.8-linaro"    if GCC_VERSION_4_8_LINARO
+	default "4.9-linaro"    if GCC_VERSION_4_9_LINARO
+	default "4.6-linaro"
+
+config GCC_VERSION_4_4
+	bool
+	default y	if GCC_VERSION_4_4_7
+
+config GCC_VERSION_4_6
+	bool
+	default y       if GCC_VERSION_4_6_LINARO
+
+config GCC_VERSION_4_8
+	bool
+	default y	if GCC_VERSION_4_8_LINARO
+
+config GCC_VERSION_4_9
+	bool
+	default y	if GCC_VERSION_4_9_LINARO
diff --git a/trunk/toolchain/gcc/common.mk b/trunk/toolchain/gcc/common.mk
new file mode 100644
index 00000000..63126a08
--- /dev/null
+++ b/trunk/toolchain/gcc/common.mk
@@ -0,0 +1,211 @@
+#
+# Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org>
+# Copyright (C) 2005-2006 Felix Fietkau <nbd@openwrt.org>
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that 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 $(TOPDIR)/rules.mk
+
+PKG_NAME:=gcc
+GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION))
+PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION)))
+GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
+    LINARO_RELEASE:=
+    ifeq ($(CONFIG_GCC_VERSION),"4.6-linaro")
+      PKG_REV:=4.6-2013.05
+      PKG_VERSION:=4.6.4
+      PKG_VERSION_MAJOR:=4.6
+      PKG_MD5SUM:=26b48802ae1203cd99415026fbf56ed7
+      PKG_COMP:=bz2
+    endif
+    ifeq ($(CONFIG_GCC_VERSION),"4.8-linaro")
+      PKG_REV:=4.8-2014.04
+      PKG_VERSION:=4.8.3
+      PKG_VERSION_MAJOR:=4.8
+      PKG_MD5SUM:=5ba2f3a449b1658ccc09d27cc7ab3c03
+      PKG_COMP:=xz
+    endif
+    ifeq ($(CONFIG_GCC_VERSION),"4.9-linaro")
+      LINARO_RELEASE:=14.10
+      PKG_REV:=4.9-2014.10
+      PKG_VERSION:=4.9.2
+      PKG_VERSION_MAJOR:=4.9
+      PKG_MD5SUM:=230da25b1e7661a8659eb770c5c88442
+      PKG_COMP:=xz
+    endif
+    ifneq ($(LINARO_RELEASE),)
+      PKG_SOURCE_URL:=http://releases.linaro.org/$(LINARO_RELEASE)/components/toolchain/gcc-linaro/$(PKG_VERSION_MAJOR)
+    else
+      PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/
+    endif
+    PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.$(PKG_COMP)
+    GCC_DIR:=gcc-linaro-$(PKG_REV)
+    HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR)
+else
+  PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
+  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+  ifeq ($(PKG_VERSION),4.4.7)
+    PKG_MD5SUM:=295709feb4441b04e87dea3f1bab4281
+  endif
+  ifeq ($(PKG_VERSION),4.6.3)
+    PKG_MD5SUM:=773092fe5194353b02bb0110052a972e
+  endif
+  ifeq ($(PKG_VERSION),4.8.0)
+    PKG_MD5SUM:=e6040024eb9e761c3bea348d1fa5abb0
+  endif
+endif
+
+PATCH_DIR=../patches/$(GCC_VERSION)
+
+BUGURL=https://dev.openwrt.org/
+ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
+  PKGVERSION=libreCMC/Linaro GCC $(PKG_REV) $(REVISION)
+else
+  PKGVERSION=libreCMC GCC $(PKG_VERSION) $(REVISION)
+endif
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+HOST_SOURCE_DIR:=$(HOST_BUILD_DIR)
+ifeq ($(GCC_VARIANT),minimal)
+  GCC_BUILD_DIR:=$(HOST_BUILD_DIR)-$(GCC_VARIANT)
+else
+  HOST_BUILD_DIR:=$(HOST_BUILD_DIR)-$(GCC_VARIANT)
+  GCC_BUILD_DIR:=$(HOST_BUILD_DIR)
+endif
+
+HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared
+HOST_STAMP_BUILT:=$(GCC_BUILD_DIR)/.built
+HOST_STAMP_CONFIGURED:=$(GCC_BUILD_DIR)/.configured
+HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.gcc_$(GCC_VARIANT)_installed
+
+SEP:=,
+TARGET_LANGUAGES:="c,c++$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)$(if $(CONFIG_INSTALL_GFORTRAN),$(SEP)fortran)"
+
+export libgcc_cv_fixed_point=no
+ifdef CONFIG_USE_UCLIBC
+  export glibcxx_cv_c99_math_tr1=no
+endif
+
+GCC_CONFIGURE:= \
+	SHELL="$(BASH)" \
+	$(if $(shell gcc --version 2>&1 | grep LLVM), \
+		CFLAGS="-O2 -fbracket-depth=512 -pipe" \
+		CXXFLAGS="-O2 -fbracket-depth=512 -pipe" \
+	) \
+	$(HOST_SOURCE_DIR)/configure \
+		--with-bugurl=$(BUGURL) \
+		--with-pkgversion="$(PKGVERSION)" \
+		--prefix=$(TOOLCHAIN_DIR) \
+		--build=$(GNU_HOST_NAME) \
+		--host=$(GNU_HOST_NAME) \
+		--target=$(REAL_GNU_TARGET_NAME) \
+		--with-gnu-ld \
+		--enable-target-optspace \
+		--disable-libgomp \
+		--disable-libmudflap \
+		--disable-multilib \
+		--disable-nls \
+		$(GRAPHITE_CONFIGURE) \
+		--with-host-libstdcxx=-lstdc++ \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
+		$(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 \
+			--with-abi=$(subst ",,$(CONFIG_MIPS64_ABI))) \
+		--with-gmp=$(TOPDIR)/staging_dir/host \
+		--with-mpfr=$(TOPDIR)/staging_dir/host \
+		--disable-decimal-float
+ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
+  GCC_CONFIGURE += --with-mips-plt
+endif
+
+ifeq ($(CONFIG_GCC_VERSION_4_4),)
+  GCC_CONFIGURE+= \
+		--with-mpc=$(TOPDIR)/staging_dir/host
+endif
+
+ifneq ($(CONFIG_SSP_SUPPORT),)
+  GCC_CONFIGURE+= \
+		--enable-libssp
+else
+  GCC_CONFIGURE+= \
+		--disable-libssp
+endif
+
+ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
+  GCC_CONFIGURE+= \
+		--enable-biarch \
+		--enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX)
+endif
+
+ifdef CONFIG_sparc
+  GCC_CONFIGURE+= \
+		--enable-targets=all \
+		--with-long-double-128
+endif
+
+ifeq ($(LIBC),uClibc)
+  GCC_CONFIGURE+= \
+		--disable-__cxa_atexit
+else
+  GCC_CONFIGURE+= \
+		--enable-__cxa_atexit
+endif
+
+ifneq ($(GCC_ARCH),)
+  GCC_CONFIGURE+= --with-arch=$(GCC_ARCH)
+endif
+
+ifneq ($(CONFIG_SOFT_FLOAT),y)
+  ifeq ($(CONFIG_arm),y)
+    GCC_CONFIGURE+= \
+		--with-float=hard
+  endif
+endif
+
+GCC_MAKE:= \
+	export SHELL="$(BASH)"; \
+	$(MAKE) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \
+		CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)"
+
+define Host/Prepare
+	mkdir -p $(GCC_BUILD_DIR)
+endef
+
+define Host/Configure
+	(cd $(GCC_BUILD_DIR) && rm -f config.cache; \
+		$(GCC_CONFIGURE) \
+	);
+endef
+
+define Host/Clean
+	rm -rf \
+		$(STAGING_DIR_HOST)/stamp/.gcc_* \
+		$(STAGING_DIR_HOST)/stamp/.binutils_* \
+		$(GCC_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \
+		$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME) \
+		$(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gc* \
+		$(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c*
+endef
diff --git a/trunk/toolchain/gcc/files/alternate-arch-cc.in b/trunk/toolchain/gcc/files/alternate-arch-cc.in
new file mode 100644
index 00000000..e169951e
--- /dev/null
+++ b/trunk/toolchain/gcc/files/alternate-arch-cc.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @CC_BASE@ @EXTRA_ARCH_OPTS@ "$@"
diff --git a/trunk/toolchain/gcc/final/Makefile b/trunk/toolchain/gcc/final/Makefile
new file mode 100644
index 00000000..3fb5ccf8
--- /dev/null
+++ b/trunk/toolchain/gcc/final/Makefile
@@ -0,0 +1,78 @@
+GCC_VARIANT:=final
+
+include ../common.mk
+
+GCC_CONFIGURE += \
+	--with-headers=$(TOOLCHAIN_DIR)/include \
+	--disable-libsanitizer \
+	--enable-languages=$(TARGET_LANGUAGES) \
+	--enable-shared \
+	--enable-threads \
+	--with-slibdir=$(TOOLCHAIN_DIR)/lib
+
+ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),)
+  GCC_CONFIGURE += \
+	--enable-lto \
+	--with-libelf=$(TOPDIR)/staging_dir/host
+endif
+
+ifneq ($(CONFIG_SJLJ_EXCEPTIONS),)
+  GCC_CONFIGURE += \
+	--enable-sjlj-exceptions
+endif
+
+define CleanupToolchain
+	$(INSTALL_DIR) $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)
+	# Important!  Required for limits.h to be fixed.
+	rm -rf $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
+	ln -sf ../include $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
+	rm -rf $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+	ln -sf ../lib $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+	$(if $(CONFIG_ARCH_64BIT),ln -sf ../lib64 $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)/lib64)
+endef
+
+define Host/Configure
+	$(CleanupToolchain)
+	mkdir -p $(GCC_BUILD_DIR)
+	(cd $(GCC_BUILD_DIR) && rm -f config.cache; \
+		$(GCC_CONFIGURE) \
+	);
+endef
+
+define Host/Compile
+	+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all
+endef
+
+define SetupExtraArch
+	for app in $(TOOLCHAIN_DIR)/bin/$(OPTIMIZE_FOR_CPU)*-{gcc,gcc-*,g++}; do \
+		[ -e $$$$app ] || continue; \
+		old_base=$$$$(basename $$$$app); \
+		new_base=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-$$$${old_base##$(OPTIMIZE_FOR_CPU)-}; \
+		sed -e "s/@CC_BASE@/$$$$old_base/" \
+			-e 's/@EXTRA_ARCH_OPTS@/$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_OPTS))/' \
+			 ../files/alternate-arch-cc.in > \
+			 $(TOOLCHAIN_DIR)/bin/$$$$new_base; \
+		chmod a+x $(TOOLCHAIN_DIR)/bin/$$$$new_base; \
+	done
+endef
+
+define Host/Install
+	$(CleanupToolchain)
+	$(_SINGLE)$(GCC_MAKE) -C $(GCC_BUILD_DIR) install
+	# Set up the symlinks to enable lying about target name.
+	set -e; \
+	(cd $(TOOLCHAIN_DIR); \
+		ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
+		cd bin; \
+		for app in $(REAL_GNU_TARGET_NAME)-* ; do \
+			ln -sf $$$${app} \
+		   	$(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \
+		done; \
+	);
+	$(if $(CONFIG_EXTRA_TARGET_ARCH),$(call SetupExtraArch))
+	$(RM) $(TOOLCHAIN_DIR)/lib/libiberty.a
+	$(SCRIPT_DIR)/patch-specs.sh "$(TOOLCHAIN_DIR)"
+endef
+
+$(eval $(call HostBuild))
+
diff --git a/trunk/toolchain/gcc/initial/Makefile b/trunk/toolchain/gcc/initial/Makefile
new file mode 100644
index 00000000..f0c65b52
--- /dev/null
+++ b/trunk/toolchain/gcc/initial/Makefile
@@ -0,0 +1,36 @@
+GCC_VARIANT:=initial
+
+include ../common.mk
+
+GCC_CONFIGURE += \
+	--with-newlib \
+	--with-sysroot=$(TOOLCHAIN_DIR) \
+	--enable-languages=c \
+	--disable-shared \
+	--disable-threads \
+
+define Host/Compile
+	$(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/
+	+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
+		all-build-libiberty \
+		all-gcc \
+		all-target-libgcc
+endef
+
+define Host/Install
+	$(GCC_MAKE) -C $(GCC_BUILD_DIR) \
+		prefix="$(TOOLCHAIN_DIR)/initial" \
+		install-gcc \
+		install-target-libgcc
+
+	# XXX: glibc insists on linking against libgcc_eh
+	( cd $(TOOLCHAIN_DIR)/initial/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \
+		[ -e libgcc_eh.a ] || ln -sf libgcc.a libgcc_eh.a ; \
+		cp libgcc.a libgcc_initial.a; \
+	)
+
+	$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
+	$$(call file_copy,$(TOOLCHAIN_DIR)/initial/.,$(TOOLCHAIN_DIR)/)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/gcc/minimal/Makefile b/trunk/toolchain/gcc/minimal/Makefile
new file mode 100644
index 00000000..0344e1a7
--- /dev/null
+++ b/trunk/toolchain/gcc/minimal/Makefile
@@ -0,0 +1,46 @@
+GCC_VARIANT:=minimal
+
+include ../common.mk
+
+GCC_CONFIGURE += \
+	--with-newlib \
+	--without-headers \
+	--enable-languages=c \
+	--disable-libsanitizer \
+	--disable-libssp \
+	--disable-shared \
+	--disable-threads
+
+define Host/SetToolchainInfo
+	$(SED) 's,TARGET_CROSS=.*,TARGET_CROSS=$(REAL_GNU_TARGET_NAME)-,' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(GCC_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+endef
+
+define Host/Prepare
+	$(call Host/SetToolchainInfo)
+	$(call Host/Prepare/Default)
+	ln -snf $(GCC_DIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
+	$(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_BUILD_DIR)/gcc/config/*/t-*
+	$(SED) 'd' $(HOST_BUILD_DIR)/gcc/DEV-PHASE
+	$(SED) 's, DATESTAMP,,' $(HOST_BUILD_DIR)/gcc/version.c
+	#(cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;);
+	$(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_BUILD_DIR)/libstdc++-v3/configure
+	mkdir -p $(GCC_BUILD_DIR)
+endef
+
+define Host/Compile
+	+$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) all-gcc all-target-libgcc
+endef
+
+define Host/Install
+	$(GCC_MAKE) -C $(GCC_BUILD_DIR) install-gcc install-target-libgcc
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(GCC_BUILD_DIR)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/gcc/patches/4.4.7/100-uclibc-conf.patch b/trunk/toolchain/gcc/patches/4.4.7/100-uclibc-conf.patch
new file mode 100644
index 00000000..5c77de9b
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- a/libjava/classpath/ltconfig
++++ b/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1251,7 +1251,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/trunk/toolchain/gcc/patches/4.4.7/301-missing-execinfo_h.patch b/trunk/toolchain/gcc/patches/4.4.7/301-missing-execinfo_h.patch
new file mode 100644
index 00000000..b3f1e68d
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/301-missing-execinfo_h.patch
@@ -0,0 +1,11 @@
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
+@@ -503,7 +503,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_of
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/trunk/toolchain/gcc/patches/4.4.7/302-c99-snprintf.patch b/trunk/toolchain/gcc/patches/4.4.7/302-c99-snprintf.patch
new file mode 100644
index 00000000..ddbe43d8
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/302-c99-snprintf.patch
@@ -0,0 +1,11 @@
+--- a/libstdc++-v3/include/c_global/cstdio
++++ b/libstdc++-v3/include/c_global/cstdio
+@@ -139,7 +139,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
+ 
+ _GLIBCXX_END_NAMESPACE
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
diff --git a/trunk/toolchain/gcc/patches/4.4.7/305-libmudflap-susv3-legacy.patch b/trunk/toolchain/gcc/patches/4.4.7/305-libmudflap-susv3-legacy.patch
new file mode 100644
index 00000000..8e2d15f8
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,47 @@
+--- a/libmudflap/mf-hooks2.c
++++ b/libmudflap/mf-hooks2.c
+@@ -421,7 +421,7 @@ WRAPPER2(void, bzero, void *s, size_t n)
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -431,7 +431,7 @@ WRAPPER2(void, bcopy, const void *src, v
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -441,7 +441,7 @@ WRAPPER2(int, bcmp, const void *s1, cons
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -450,7 +450,7 @@ WRAPPER2(char *, index, const char *s, i
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -459,7 +459,7 @@ WRAPPER2(char *, rindex, const char *s,
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/trunk/toolchain/gcc/patches/4.4.7/810-arm-softfloat-libgcc.patch b/trunk/toolchain/gcc/patches/4.4.7/810-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..7af72aad
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,25 @@
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/gcc/config/arm/t-linux
++++ b/gcc/config/arm/t-linux
+@@ -4,7 +4,10 @@ TARGET_LIBGCC2_CFLAGS = -fomit-frame-poi
+ 
+ LIB1ASMSRC = arm/lib1funcs.asm
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_arm_addsubdf3 _arm_addsubsf3
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
++	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
++	_fixsfsi _fixunssfsi _floatdidf _floatundidf _floatdisf _floatundisf
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/trunk/toolchain/gcc/patches/4.4.7/820-libgcc_pic.patch b/trunk/toolchain/gcc/patches/4.4.7/820-libgcc_pic.patch
new file mode 100644
index 00000000..18386dfd
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/820-libgcc_pic.patch
@@ -0,0 +1,36 @@
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -729,11 +729,12 @@ $(libgcov-objects): %$(objext): $(gcc_sr
+ 
+ # Static libraries.
+ libgcc.a: $(libgcc-objects)
++libgcc_pic.a: $(libgcc-s-objects)
+ libgcov.a: $(libgcov-objects)
+ libunwind.a: $(libunwind-objects)
+ libgcc_eh.a: $(libgcc-eh-objects)
+ 
+-libgcc.a libgcov.a libunwind.a libgcc_eh.a:
++libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
+ 	-rm -f $@
+ 
+ 	objects="$(objects)";					\
+@@ -755,7 +756,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E
+ endif
+ 
+ ifeq ($(enable_shared),yes)
+-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
++all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
+ ifneq ($(LIBUNWIND),)
+ all: libunwind$(SHLIB_EXT)
+ endif
+@@ -928,6 +929,10 @@ install-shared:
+ 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 
++	$(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
++	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++
+ 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
diff --git a/trunk/toolchain/gcc/patches/4.4.7/910-mbsd_multi.patch b/trunk/toolchain/gcc/patches/4.4.7/910-mbsd_multi.patch
new file mode 100644
index 00000000..1b17e983
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/910-mbsd_multi.patch
@@ -0,0 +1,269 @@
+
+	This patch brings over a few features from MirBSD:
+	* -fhonour-copts
+	  If this option is not given, it's warned (depending
+	  on environment variables). This is to catch errors
+	  of misbuilt packages which override CFLAGS themselves.
+	* -Werror-maybe-reset
+	  Has the effect of -Wno-error if GCC_NO_WERROR is
+	  set and not '0', a no-operation otherwise. This is
+	  to be able to use -Werror in "make" but prevent
+	  GNU autoconf generated configure scripts from
+	  freaking out.
+	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
+	  the default for -O2/-Os, because they trigger gcc bugs
+	  and can delete code with security implications.
+
+	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
+	with copyright assignment to the FSF in effect.
+
+--- a/gcc/c-opts.c
++++ b/gcc/c-opts.c
+@@ -105,6 +105,9 @@ static size_t deferred_count;
+ /* Number of deferred options scanned for -include.  */
+ static size_t include_cursor;
+ 
++/* Check if a port honours COPTS.  */
++static int honour_copts = 0;
++
+ static void set_Wimplicit (int);
+ static void handle_OPT_d (const char *);
+ static void set_std_cxx98 (int);
+@@ -454,6 +457,14 @@ c_common_handle_option (size_t scode, co
+       enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); 
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++	char *ev = getenv ("GCC_NO_WERROR");
++	if ((ev != NULL) && (*ev != '0'))
++	  cpp_opts->warnings_are_errors = 0;
++      }
++      break;
++
+     case OPT_Wformat:
+       set_Wformat (value);
+       break;
+@@ -690,6 +701,12 @@ c_common_handle_option (size_t scode, co
+       flag_exceptions = value;
+       break;
+ 
++    case OPT_fhonour_copts:
++      if (c_language == clk_c) {
++	honour_copts++;
++      }
++      break;
++
+     case OPT_fimplement_inlines:
+       flag_implement_inlines = value;
+       break;
+@@ -1209,6 +1226,47 @@ c_common_init (void)
+       return false;
+     }
+ 
++  if (c_language == clk_c) {
++    char *ev = getenv ("GCC_HONOUR_COPTS");
++    int evv;
++    if (ev == NULL)
++      evv = -1;
++    else if ((*ev == '0') || (*ev == '\0'))
++      evv = 0;
++    else if (*ev == '1')
++      evv = 1;
++    else if (*ev == '2')
++      evv = 2;
++    else if (*ev == 's')
++      evv = -1;
++    else {
++      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
++      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
++    }
++    if (evv == 1) {
++      if (honour_copts == 0) {
++	error ("someone does not honour COPTS at all in lenient mode");
++	return false;
++      } else if (honour_copts != 1) {
++	warning (0, "someone does not honour COPTS correctly, passed %d times",
++	 honour_copts);
++      }
++    } else if (evv == 2) {
++      if (honour_copts == 0) {
++	error ("someone does not honour COPTS at all in strict mode");
++	return false;
++      } else if (honour_copts != 1) {
++	error ("someone does not honour COPTS correctly, passed %d times",
++	 honour_copts);
++	return false;
++      }
++    } else if (evv == 0) {
++      if (honour_copts != 1)
++	inform (0, "someone does not honour COPTS correctly, passed %d times",
++	 honour_copts);
++    }
++  }
++
+   return true;
+ }
+ 
+--- a/gcc/c.opt
++++ b/gcc/c.opt
+@@ -215,6 +215,10 @@ Werror-implicit-function-declaration
+ C ObjC RejectNegative Warning
+ This switch is deprecated; use -Werror=implicit-function-declaration instead
+ 
++Werror-maybe-reset
++C ObjC C++ ObjC++
++; Documented in common.opt
++
+ Wfloat-equal
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
+ Warn if testing floating point numbers for equality
+@@ -613,6 +617,9 @@ C++ ObjC++ Optimization
+ fhonor-std
+ C++ ObjC++
+ 
++fhonour-copts
++C ObjC C++ ObjC++ RejectNegative
++
+ fhosted
+ C ObjC
+ Assume normal C execution environment
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -102,6 +102,10 @@ Werror=
+ Common Joined
+ Treat specified warning as error
+ 
++Werror-maybe-reset
++Common
++If environment variable GCC_NO_WERROR is set, act as -Wno-error
++
+ Wextra
+ Common Warning
+ Print extra (possibly unwanted) warnings
+@@ -573,6 +577,9 @@ fguess-branch-probability
+ Common Report Var(flag_guess_branch_prob) Optimization
+ Enable guessing of branch probabilities
+ 
++fhonour-copts
++Common RejectNegative
++
+ ; Nonzero means ignore `#ident' directives.  0 means handle them.
+ ; Generate position-independent code for executables if possible
+ ; On SVR4 targets, it also controls whether or not to emit a
+--- a/gcc/opts.c
++++ b/gcc/opts.c
+@@ -898,9 +898,6 @@ decode_options (unsigned int argc, const
+   flag_schedule_insns_after_reload = opt2;
+ #endif
+   flag_regmove = opt2;
+-  flag_strict_aliasing = opt2;
+-  flag_strict_overflow = opt2;
+-  flag_delete_null_pointer_checks = opt2;
+   flag_reorder_blocks = opt2;
+   flag_reorder_functions = opt2;
+   flag_tree_vrp = opt2;
+@@ -924,6 +921,9 @@ decode_options (unsigned int argc, const
+ 
+   /* -O3 optimizations.  */
+   opt3 = (optimize >= 3);
++  flag_strict_aliasing = opt3;
++  flag_strict_overflow = opt3;
++  flag_delete_null_pointer_checks = opt3;
+   flag_predictive_commoning = opt3;
+   flag_inline_functions = opt3;
+   flag_unswitch_loops = opt3;
+@@ -1603,6 +1603,17 @@ common_handle_option (size_t scode, cons
+       enable_warning_as_error (arg, value, lang_mask);
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++	char *ev = getenv ("GCC_NO_WERROR");
++	if ((ev != NULL) && (*ev != '0'))
++	  warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wextra:
+       set_Wextra (value);
+       break;
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -164,6 +164,11 @@ in older programs.  This warning is on b
+ Make all warnings into hard errors.  Source code which triggers warnings
+ will be rejected.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
+ @item -Wsystem-headers
+ @opindex Wsystem-headers
+ Issue warnings for code in system headers.  These are normally unhelpful
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -234,7 +234,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wconversion  -Wcoverage-mismatch  -Wno-deprecated  @gol
+ -Wno-deprecated-declarations -Wdisabled-optimization  @gol
+ -Wno-div-by-zero -Wempty-body  -Wenum-compare -Wno-endif-labels @gol
+--Werror  -Werror=* @gol
++-Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
+ -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
+ -Wformat-security  -Wformat-y2k @gol
+@@ -4182,6 +4182,22 @@ This option is only supported for C and
+ @option{-Wall} and by @option{-pedantic}, which can be disabled with
+ @option{-Wno-pointer-sign}.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
++ at item -fhonour-copts
++ at opindex fhonour-copts
++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
++given at least once, and warn if it is given more than once.
++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
++given exactly once.
++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
++is not given exactly once.
++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
++This flag and environment variable only affect the C language.
++
+ @item -Wstack-protector
+ @opindex Wstack-protector
+ @opindex Wno-stack-protector
+@@ -5721,7 +5737,7 @@ so, the first branch is redirected to ei
+ second branch or a point immediately following it, depending on whether
+ the condition is known to be true or false.
+ 
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+ 
+ @item -fsplit-wide-types
+ @opindex fsplit-wide-types
+@@ -5866,7 +5882,7 @@ safely dereference null pointers.  Use
+ @option{-fno-delete-null-pointer-checks} to disable this optimization
+ for programs which depend on that behavior.
+ 
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+ 
+ @item -fexpensive-optimizations
+ @opindex fexpensive-optimizations
+--- a/gcc/java/jvspec.c
++++ b/gcc/java/jvspec.c
+@@ -670,6 +670,7 @@ lang_specific_pre_link (void)
+      class name.  Append dummy `.c' that can be stripped by set_input so %b
+      is correct.  */ 
+   set_input (concat (main_class_name, "main.c", NULL));
++  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
+   err = do_spec (jvgenmain_spec);
+   if (err == 0)
+     {
diff --git a/trunk/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch b/trunk/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch
new file mode 100644
index 00000000..359c5773
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch
@@ -0,0 +1,14 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -7855,7 +7855,10 @@ getenv_spec_function (int argc, const ch
+ 
+   value = getenv (argv[0]);
+   if (!value)
+-    fatal ("environment variable \"%s\" not defined", argv[0]);
++  {
++    error ("warning: environment variable \"%s\" not defined", argv[0]);
++    value = "";
++  }
+ 
+   /* We have to escape every character of the environment variable so
+      they are not interpreted as active spec characters.  A
diff --git a/trunk/toolchain/gcc/patches/4.4.7/930-avr32_support.patch b/trunk/toolchain/gcc/patches/4.4.7/930-avr32_support.patch
new file mode 100644
index 00000000..334d2cd1
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/930-avr32_support.patch
@@ -0,0 +1,22706 @@
+--- a/gcc/builtins.c
++++ b/gcc/builtins.c
+@@ -11108,7 +11108,7 @@ validate_gimple_arglist (const_gimple ca
+ 
+   do
+     {
+-      code = va_arg (ap, enum tree_code);
++      code = va_arg (ap, int);
+       switch (code)
+ 	{
+ 	case 0:
+--- a/gcc/calls.c
++++ b/gcc/calls.c
+@@ -3447,7 +3447,7 @@ emit_library_call_value_1 (int retval, r
+   for (; count < nargs; count++)
+     {
+       rtx val = va_arg (p, rtx);
+-      enum machine_mode mode = va_arg (p, enum machine_mode);
++      enum machine_mode mode = va_arg (p, int);
+ 
+       /* We cannot convert the arg value to the mode the library wants here;
+ 	 must do it earlier where we know the signedness of the arg.  */
+--- /dev/null
++++ b/gcc/config/avr32/avr32.c
+@@ -0,0 +1,8060 @@
++/*
++   Target hooks and helper functions for AVR32.
++   Copyright 2003,2004,2005,2006,2007,2008,2009,2010 Atmel Corporation.
++
++   This file is part of GCC.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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 "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include "tm.h"
++#include "rtl.h"
++#include "tree.h"
++#include "obstack.h"
++#include "regs.h"
++#include "hard-reg-set.h"
++#include "real.h"
++#include "insn-config.h"
++#include "conditions.h"
++#include "output.h"
++#include "insn-attr.h"
++#include "flags.h"
++#include "reload.h"
++#include "function.h"
++#include "expr.h"
++#include "optabs.h"
++#include "toplev.h"
++#include "recog.h"
++#include "ggc.h"
++#include "except.h"
++#include "c-pragma.h"
++#include "integrate.h"
++#include "tm_p.h"
++#include "langhooks.h"
++#include "hooks.h"
++#include "df.h"
++
++#include "target.h"
++#include "target-def.h"
++
++#include <ctype.h>
++
++
++
++/* Global variables.  */
++typedef struct minipool_node Mnode;
++typedef struct minipool_fixup Mfix;
++
++/* Obstack for minipool constant handling.  */
++static struct obstack minipool_obstack;
++static char *minipool_startobj;
++static rtx minipool_vector_label;
++
++/* True if we are currently building a constant table.  */
++int making_const_table;
++
++tree fndecl_attribute_args = NULL_TREE;
++
++
++/* Function prototypes. */
++static unsigned long avr32_isr_value (tree);
++static unsigned long avr32_compute_func_type (void);
++static tree avr32_handle_isr_attribute (tree *, tree, tree, int, bool *);
++static tree avr32_handle_acall_attribute (tree *, tree, tree, int, bool *);
++static tree avr32_handle_fndecl_attribute (tree * node, tree name, tree args,
++					   int flags, bool * no_add_attrs);
++static void avr32_reorg (void);
++bool avr32_return_in_msb (tree type);
++bool avr32_vector_mode_supported (enum machine_mode mode);
++static void avr32_init_libfuncs (void);
++static void avr32_file_end (void);
++static void flashvault_decl_list_add (unsigned int vector_num, const char *name);
++
++
++
++static void
++avr32_add_gc_roots (void)
++{
++  gcc_obstack_init (&minipool_obstack);
++  minipool_startobj = (char *) obstack_alloc (&minipool_obstack, 0);
++}
++
++
++/* List of all known AVR32 parts  */
++static const struct part_type_s avr32_part_types[] = {
++  /* name, part_type, architecture type, macro */
++  {"none",            PART_TYPE_AVR32_NONE,            ARCH_TYPE_AVR32_AP,        "__AVR32__"},
++  {"ap7000",          PART_TYPE_AVR32_AP7000,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7000__"},
++  {"ap7001",          PART_TYPE_AVR32_AP7001,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7001__"},
++  {"ap7002",          PART_TYPE_AVR32_AP7002,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7002__"},
++  {"ap7200",          PART_TYPE_AVR32_AP7200,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7200__"},
++  {"uc3a0128",        PART_TYPE_AVR32_UC3A0128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A0128__"},
++  {"uc3a0256",        PART_TYPE_AVR32_UC3A0256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A0256__"},
++  {"uc3a0512",        PART_TYPE_AVR32_UC3A0512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A0512__"},
++  {"uc3a0512es",      PART_TYPE_AVR32_UC3A0512ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3A0512ES__"},
++  {"uc3a1128",        PART_TYPE_AVR32_UC3A1128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A1128__"},
++  {"uc3a1256",        PART_TYPE_AVR32_UC3A1256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A1256__"},
++  {"uc3a1512",        PART_TYPE_AVR32_UC3A1512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A1512__"},
++  {"uc3a1512es",      PART_TYPE_AVR32_UC3A1512ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3A1512ES__"},
++  {"uc3a3revd",       PART_TYPE_AVR32_UC3A3REVD,       ARCH_TYPE_AVR32_UCR2NOMUL, "__AVR32_UC3A3256S__"},
++  {"uc3a364",         PART_TYPE_AVR32_UC3A364,         ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A364__"},
++  {"uc3a364s",        PART_TYPE_AVR32_UC3A364S,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A364S__"},
++  {"uc3a3128",        PART_TYPE_AVR32_UC3A3128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3128__"},
++  {"uc3a3128s",       PART_TYPE_AVR32_UC3A3128S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3128S__"},
++  {"uc3a3256",        PART_TYPE_AVR32_UC3A3256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3256__"},
++  {"uc3a3256s",       PART_TYPE_AVR32_UC3A3256S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3256S__"},
++  {"uc3a464",         PART_TYPE_AVR32_UC3A464,         ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A464__"},
++  {"uc3a464s",        PART_TYPE_AVR32_UC3A464S,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A464S__"},
++  {"uc3a4128",        PART_TYPE_AVR32_UC3A4128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4128__"},
++  {"uc3a4128s",       PART_TYPE_AVR32_UC3A4128S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4128S__"},
++  {"uc3a4256",        PART_TYPE_AVR32_UC3A4256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4256__"},
++  {"uc3a4256s",       PART_TYPE_AVR32_UC3A4256S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4256S__"},
++  {"uc3b064",         PART_TYPE_AVR32_UC3B064,         ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B064__"},
++  {"uc3b0128",        PART_TYPE_AVR32_UC3B0128,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B0128__"},
++  {"uc3b0256",        PART_TYPE_AVR32_UC3B0256,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B0256__"},
++  {"uc3b0256es",      PART_TYPE_AVR32_UC3B0256ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B0256ES__"},
++  {"uc3b0512",        PART_TYPE_AVR32_UC3B0512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B0512__"},
++  {"uc3b0512revc",    PART_TYPE_AVR32_UC3B0512REVC,    ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B0512REVC__"},
++  {"uc3b164",         PART_TYPE_AVR32_UC3B164,         ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B164__"},
++  {"uc3b1128",        PART_TYPE_AVR32_UC3B1128,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B1128__"},
++  {"uc3b1256",        PART_TYPE_AVR32_UC3B1256,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B1256__"},
++  {"uc3b1256es",      PART_TYPE_AVR32_UC3B1256ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B1256ES__"},
++  {"uc3b1512",        PART_TYPE_AVR32_UC3B1512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B1512__"},
++  {"uc3b1512revc",    PART_TYPE_AVR32_UC3B1512REVC,    ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B1512REVC__"},
++  {"uc64d3",          PART_TYPE_AVR32_UC64D3,          ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64D3__"},
++  {"uc128d3",         PART_TYPE_AVR32_UC128D3,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128D3__"},
++  {"uc64d4",          PART_TYPE_AVR32_UC64D4,          ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64D4__"},
++  {"uc128d4",         PART_TYPE_AVR32_UC128D4,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128D4__"},
++  {"uc3c0512crevc",   PART_TYPE_AVR32_UC3C0512CREVC,   ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3C0512CREVC__"},
++  {"uc3c1512crevc",   PART_TYPE_AVR32_UC3C1512CREVC,   ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3C1512CREVC__"},
++  {"uc3c2512crevc",   PART_TYPE_AVR32_UC3C2512CREVC,   ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3C2512CREVC__"},
++  {"uc3l0256",        PART_TYPE_AVR32_UC3L0256,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L0256__"},
++  {"uc3l0128",        PART_TYPE_AVR32_UC3L0128,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L0128__"},
++  {"uc3l064",         PART_TYPE_AVR32_UC3L064,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L064__"},
++  {"uc3l032",         PART_TYPE_AVR32_UC3L032,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L032__"},
++  {"uc3l016",         PART_TYPE_AVR32_UC3L016,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L016__"},
++  {"uc3l064revb",     PART_TYPE_AVR32_UC3L064REVB,     ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L064REVB__"},
++  {"uc64l3u",         PART_TYPE_AVR32_UC64L3U,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64L3U__"},
++  {"uc128l3u",        PART_TYPE_AVR32_UC128L3U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128L3U__"},
++  {"uc256l3u",        PART_TYPE_AVR32_UC256L3U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC256L3U__"},
++  {"uc64l4u",         PART_TYPE_AVR32_UC64L4U,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64L4U__"},
++  {"uc128l4u",        PART_TYPE_AVR32_UC128L4U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128L4U__"},
++  {"uc256l4u",        PART_TYPE_AVR32_UC256L4U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC256L4U__"},
++  {"uc3c064c",        PART_TYPE_AVR32_UC3C064C,        ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C064C__"},
++  {"uc3c0128c",       PART_TYPE_AVR32_UC3C0128C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C0128C__"},
++  {"uc3c0256c",       PART_TYPE_AVR32_UC3C0256C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C0256C__"},
++  {"uc3c0512c",       PART_TYPE_AVR32_UC3C0512C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C0512C__"},
++  {"uc3c164c",        PART_TYPE_AVR32_UC3C164C,        ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C164C__"},
++  {"uc3c1128c",       PART_TYPE_AVR32_UC3C1128C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C1128C__"},
++  {"uc3c1256c",       PART_TYPE_AVR32_UC3C1256C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C1256C__"},
++  {"uc3c1512c",       PART_TYPE_AVR32_UC3C1512C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C1512C__"},
++  {"uc3c264c",        PART_TYPE_AVR32_UC3C264C,        ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C264C__"},
++  {"uc3c2128c",       PART_TYPE_AVR32_UC3C2128C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C2128C__"},
++  {"uc3c2256c",       PART_TYPE_AVR32_UC3C2256C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C2256C__"},
++  {"uc3c2512c",       PART_TYPE_AVR32_UC3C2512C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C2512C__"},
++  {"mxt768e",         PART_TYPE_AVR32_MXT768E,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_MXT768E__"},
++  {NULL, 0, 0, NULL}
++};
++
++/* List of all known AVR32 architectures  */
++static const struct arch_type_s avr32_arch_types[] = {
++  /* name, architecture type, microarchitecture type, feature flags, macro */
++  {"ap", ARCH_TYPE_AVR32_AP, UARCH_TYPE_AVR32B,
++   (FLAG_AVR32_HAS_DSP
++    | FLAG_AVR32_HAS_SIMD
++    | FLAG_AVR32_HAS_UNALIGNED_WORD
++    | FLAG_AVR32_HAS_BRANCH_PRED | FLAG_AVR32_HAS_RETURN_STACK
++    | FLAG_AVR32_HAS_CACHES),
++   "__AVR32_AP__"},
++  {"ucr1", ARCH_TYPE_AVR32_UCR1, UARCH_TYPE_AVR32A,
++   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW),
++   "__AVR32_UC__=1"},
++  {"ucr2", ARCH_TYPE_AVR32_UCR2, UARCH_TYPE_AVR32A,
++   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW
++    | FLAG_AVR32_HAS_V2_INSNS),
++   "__AVR32_UC__=2"},
++  {"ucr2nomul", ARCH_TYPE_AVR32_UCR2NOMUL, UARCH_TYPE_AVR32A,
++   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW
++    | FLAG_AVR32_HAS_V2_INSNS | FLAG_AVR32_HAS_NO_MUL_INSNS),
++   "__AVR32_UC__=2"},
++  {"ucr3", ARCH_TYPE_AVR32_UCR3, UARCH_TYPE_AVR32A,
++   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW
++    | FLAG_AVR32_HAS_V2_INSNS),
++   "__AVR32_UC__=3"},
++  {"ucr3fp", ARCH_TYPE_AVR32_UCR3FP, UARCH_TYPE_AVR32A,
++   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW | FLAG_AVR32_HAS_FPU
++    | FLAG_AVR32_HAS_V2_INSNS),
++   "__AVR32_UC__=3"},
++  {NULL, 0, 0, 0, NULL}
++};
++
++/* Default arch name */
++const char *avr32_arch_name = "none";
++const char *avr32_part_name = "none";
++
++const struct part_type_s *avr32_part;
++const struct arch_type_s *avr32_arch;
++
++
++/* FIXME: needs to use GC.  */
++struct flashvault_decl_list
++{
++  struct flashvault_decl_list *next;
++  unsigned int vector_num;
++  const char *name;
++};
++
++static struct flashvault_decl_list *flashvault_decl_list_head = NULL;
++
++
++/* Set default target_flags. */
++#undef TARGET_DEFAULT_TARGET_FLAGS
++#define TARGET_DEFAULT_TARGET_FLAGS \
++  (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION | MASK_COND_EXEC_BEFORE_RELOAD)
++
++void
++avr32_optimization_options (int level, int size)
++{
++  if (AVR32_ALWAYS_PIC)
++    flag_pic = 1;
++
++  /* Enable section anchors if optimization is enabled. */
++  if (level > 0 || size)
++    flag_section_anchors = 2;
++}
++
++
++/* Override command line options */
++void
++avr32_override_options (void)
++{
++  const struct part_type_s *part;
++  const struct arch_type_s *arch;
++
++  /*Add backward compability*/
++  if (strcmp ("uc", avr32_arch_name)== 0)
++    {
++      fprintf (stderr, "Warning: Deprecated arch `%s' specified. "
++                       "Please use '-march=ucr1' instead. "
++                       "Converting to arch 'ucr1'\n",
++               avr32_arch_name);
++      avr32_arch_name="ucr1";
++    }
++
++  /* Check if arch type is set. */
++  for (arch = avr32_arch_types; arch->name; arch++)
++    {
++      if (strcmp (arch->name, avr32_arch_name) == 0)
++        break;
++    }
++  avr32_arch = arch;
++
++  if (!arch->name && strcmp("none", avr32_arch_name) != 0)
++    {
++      fprintf (stderr, "Unknown arch `%s' specified\n"
++                       "Known arch names:\n"
++                       "\tuc (deprecated)\n",
++               avr32_arch_name);
++      for (arch = avr32_arch_types; arch->name; arch++)
++        fprintf (stderr, "\t%s\n", arch->name);
++      avr32_arch = &avr32_arch_types[ARCH_TYPE_AVR32_AP];
++    }
++
++  /* Check if part type is set. */
++  for (part = avr32_part_types; part->name; part++)
++    if (strcmp (part->name, avr32_part_name) == 0)
++      break;
++
++  avr32_part = part;
++  if (!part->name)
++    {
++      fprintf (stderr, "Unknown part `%s' specified\nKnown part names:\n",
++               avr32_part_name);
++      for (part = avr32_part_types; part->name; part++)
++        {
++          if (strcmp("none", part->name) != 0)
++            fprintf (stderr, "\t%s\n", part->name);
++        }
++      /* Set default to NONE*/
++      avr32_part = &avr32_part_types[PART_TYPE_AVR32_NONE];
++    }
++
++  /* NB! option -march= overrides option -mpart
++   * if both are used at the same time */
++  if (!arch->name)
++    avr32_arch = &avr32_arch_types[avr32_part->arch_type];
++
++  /* If optimization level is two or greater, then align start of loops to a
++     word boundary since this will allow folding the first insn of the loop.
++     Do this only for targets supporting branch prediction. */
++  if (optimize >= 2 && TARGET_BRANCH_PRED)
++    align_loops = 2;
++
++
++  /* Enable fast-float library if unsafe math optimizations
++     are used. */
++  if (flag_unsafe_math_optimizations)
++    target_flags |= MASK_FAST_FLOAT;
++
++  /* Check if we should set avr32_imm_in_const_pool
++     based on if caches are present or not. */
++  if ( avr32_imm_in_const_pool == -1 )
++    {
++      if ( TARGET_CACHES )
++        avr32_imm_in_const_pool = 1;
++      else
++        avr32_imm_in_const_pool = 0;
++    }
++
++  if (TARGET_NO_PIC)
++    flag_pic = 0;
++  avr32_add_gc_roots ();
++}
++
++
++/*
++If defined, a function that outputs the assembler code for entry to a
++function.  The prologue is responsible for setting up the stack frame,
++initializing the frame pointer register, saving registers that must be
++saved, and allocating size additional bytes of storage for the
++local variables.  size is an integer.  file is a stdio
++stream to which the assembler code should be output.
++
++The label for the beginning of the function need not be output by this
++macro.  That has already been done when the macro is run.
++
++To determine which registers to save, the macro can refer to the array
++regs_ever_live: element r is nonzero if hard register
++r is used anywhere within the function.  This implies the function
++prologue should save register r, provided it is not one of the
++call-used registers.  (TARGET_ASM_FUNCTION_EPILOGUE must likewise use
++regs_ever_live.)
++
++On machines that have ``register windows'', the function entry code does
++not save on the stack the registers that are in the windows, even if
++they are supposed to be preserved by function calls; instead it takes
++appropriate steps to ``push'' the register stack, if any non-call-used
++registers are used in the function.
++
++On machines where functions may or may not have frame-pointers, the
++function entry code must vary accordingly; it must set up the frame
++pointer if one is wanted, and not otherwise.  To determine whether a
++frame pointer is in wanted, the macro can refer to the variable
++frame_pointer_needed.  The variable's value will be 1 at run
++time in a function that needs a frame pointer.  (see Elimination).
++
++The function entry code is responsible for allocating any stack space
++required for the function.  This stack space consists of the regions
++listed below.  In most cases, these regions are allocated in the
++order listed, with the last listed region closest to the top of the
++stack (the lowest address if STACK_GROWS_DOWNWARD is defined, and
++the highest address if it is not defined).  You can use a different order
++for a machine if doing so is more convenient or required for
++compatibility reasons.  Except in cases where required by standard
++or by a debugger, there is no reason why the stack layout used by GCC
++need agree with that used by other compilers for a machine.
++*/
++
++#undef TARGET_ASM_FUNCTION_PROLOGUE
++#define TARGET_ASM_FUNCTION_PROLOGUE avr32_target_asm_function_prologue
++
++#undef TARGET_ASM_FILE_END
++#define TARGET_ASM_FILE_END avr32_file_end
++
++#undef TARGET_DEFAULT_SHORT_ENUMS
++#define TARGET_DEFAULT_SHORT_ENUMS hook_bool_void_false
++
++#undef TARGET_PROMOTE_FUNCTION_ARGS
++#define TARGET_PROMOTE_FUNCTION_ARGS hook_bool_tree_true
++
++#undef TARGET_PROMOTE_FUNCTION_RETURN
++#define TARGET_PROMOTE_FUNCTION_RETURN hook_bool_tree_true
++
++#undef TARGET_PROMOTE_PROTOTYPES
++#define TARGET_PROMOTE_PROTOTYPES hook_bool_tree_true
++
++#undef TARGET_MUST_PASS_IN_STACK
++#define TARGET_MUST_PASS_IN_STACK avr32_must_pass_in_stack
++
++#undef TARGET_PASS_BY_REFERENCE
++#define TARGET_PASS_BY_REFERENCE avr32_pass_by_reference
++
++#undef TARGET_STRICT_ARGUMENT_NAMING
++#define TARGET_STRICT_ARGUMENT_NAMING avr32_strict_argument_naming
++
++#undef TARGET_VECTOR_MODE_SUPPORTED_P
++#define TARGET_VECTOR_MODE_SUPPORTED_P avr32_vector_mode_supported
++
++#undef TARGET_RETURN_IN_MEMORY
++#define TARGET_RETURN_IN_MEMORY avr32_return_in_memory
++
++#undef TARGET_RETURN_IN_MSB
++#define TARGET_RETURN_IN_MSB avr32_return_in_msb
++
++#undef TARGET_ENCODE_SECTION_INFO
++#define TARGET_ENCODE_SECTION_INFO avr32_encode_section_info
++
++#undef TARGET_ARG_PARTIAL_BYTES
++#define TARGET_ARG_PARTIAL_BYTES avr32_arg_partial_bytes
++
++#undef TARGET_STRIP_NAME_ENCODING
++#define TARGET_STRIP_NAME_ENCODING avr32_strip_name_encoding
++
++#define streq(string1, string2) (strcmp (string1, string2) == 0)
++
++#undef  TARGET_NARROW_VOLATILE_BITFIELD
++#define TARGET_NARROW_VOLATILE_BITFIELD hook_bool_void_false
++
++#undef  TARGET_ATTRIBUTE_TABLE
++#define TARGET_ATTRIBUTE_TABLE avr32_attribute_table
++
++#undef  TARGET_COMP_TYPE_ATTRIBUTES
++#define TARGET_COMP_TYPE_ATTRIBUTES avr32_comp_type_attributes
++
++
++#undef  TARGET_RTX_COSTS
++#define TARGET_RTX_COSTS avr32_rtx_costs
++
++#undef  TARGET_CANNOT_FORCE_CONST_MEM
++#define  TARGET_CANNOT_FORCE_CONST_MEM avr32_cannot_force_const_mem
++
++#undef  TARGET_ASM_INTEGER
++#define TARGET_ASM_INTEGER avr32_assemble_integer
++
++#undef  TARGET_FUNCTION_VALUE
++#define TARGET_FUNCTION_VALUE avr32_function_value
++
++#undef  TARGET_MIN_ANCHOR_OFFSET
++#define TARGET_MIN_ANCHOR_OFFSET (0)
++
++#undef  TARGET_MAX_ANCHOR_OFFSET
++#define TARGET_MAX_ANCHOR_OFFSET ((1 << 15) - 1)
++#undef TARGET_SECONDARY_RELOAD
++#define TARGET_SECONDARY_RELOAD avr32_secondary_reload
++
++
++/*
++ * Defining the option, -mlist-devices to list the devices supported by gcc.
++ * This option should be used while printing target-help to list all the 
++ * supported devices.
++ */
++#undef TARGET_HELP
++#define TARGET_HELP avr32_target_help
++
++void avr32_target_help ()
++{
++  if (avr32_list_supported_parts)
++    {
++      const struct part_type_s *list;
++      fprintf (stdout, "List of parts supported by avr32-gcc:\n");
++      for (list = avr32_part_types; list->name; list++)
++        {
++          if (strcmp("none", list->name) != 0)
++            fprintf (stdout, "%-20s%s\n", list->name, list->macro);
++        }
++      fprintf (stdout, "\n\n");
++    }
++}
++
++enum reg_class
++avr32_secondary_reload (bool in_p, rtx x, enum reg_class class,
++                        enum machine_mode mode, secondary_reload_info *sri)
++{
++
++  if ( avr32_rmw_memory_operand (x, mode) )
++    {
++      if (!in_p)
++        sri->icode = CODE_FOR_reload_out_rmw_memory_operand;
++      else
++        sri->icode = CODE_FOR_reload_in_rmw_memory_operand;
++    }
++  return NO_REGS;
++
++}
++/*
++ * Switches to the appropriate section for output of constant pool
++ * entry x in mode. You can assume that x is some kind of constant in
++ * RTL. The argument mode is redundant except in the case of a
++ * const_int rtx. Select the section by calling readonly_data_ section
++ * or one of the alternatives for other sections. align is the
++ * constant alignment in bits.
++ *
++ * The default version of this function takes care of putting symbolic
++ * constants in flag_ pic mode in data_section and everything else in
++ * readonly_data_section.
++ */
++//#undef TARGET_ASM_SELECT_RTX_SECTION
++//#define TARGET_ASM_SELECT_RTX_SECTION avr32_select_rtx_section
++
++
++/*
++ * If non-null, this hook performs a target-specific pass over the
++ * instruction stream. The compiler will run it at all optimization
++ * levels, just before the point at which it normally does
++ * delayed-branch scheduling.
++ *
++ * The exact purpose of the hook varies from target to target. Some
++ * use it to do transformations that are necessary for correctness,
++ * such as laying out in-function constant pools or avoiding hardware
++ * hazards. Others use it as an opportunity to do some
++ * machine-dependent optimizations.
++ *
++ * You need not implement the hook if it has nothing to do. The
++ * default definition is null.
++ */
++#undef TARGET_MACHINE_DEPENDENT_REORG
++#define TARGET_MACHINE_DEPENDENT_REORG avr32_reorg
++
++/* Target hook for assembling integer objects.
++   Need to handle integer vectors */
++static bool
++avr32_assemble_integer (rtx x, unsigned int size, int aligned_p)
++{
++  if (avr32_vector_mode_supported (GET_MODE (x)))
++    {
++      int i, units;
++
++      if (GET_CODE (x) != CONST_VECTOR)
++	abort ();
++
++      units = CONST_VECTOR_NUNITS (x);
++
++      switch (GET_MODE (x))
++	{
++	case V2HImode:
++	  size = 2;
++	  break;
++	case V4QImode:
++	  size = 1;
++	  break;
++	default:
++	  abort ();
++	}
++
++      for (i = 0; i < units; i++)
++	{
++	  rtx elt;
++
++	  elt = CONST_VECTOR_ELT (x, i);
++	  assemble_integer (elt, size, i == 0 ? 32 : size * BITS_PER_UNIT, 1);
++	}
++
++      return true;
++    }
++
++  return default_assemble_integer (x, size, aligned_p);
++}
++
++
++/*
++ * This target hook describes the relative costs of RTL expressions.
++ *
++ * The cost may depend on the precise form of the expression, which is
++ * available for examination in x, and the rtx code of the expression
++ * in which it is contained, found in outer_code. code is the
++ * expression code--redundant, since it can be obtained with GET_CODE
++ * (x).
++ *
++ * In implementing this hook, you can use the construct COSTS_N_INSNS
++ * (n) to specify a cost equal to n fast instructions.
++ *
++ * On entry to the hook, *total contains a default estimate for the
++ * cost of the expression. The hook should modify this value as
++ * necessary. Traditionally, the default costs are COSTS_N_INSNS (5)
++ * for multiplications, COSTS_N_INSNS (7) for division and modulus
++ * operations, and COSTS_N_INSNS (1) for all other operations.
++ *
++ * When optimizing for code size, i.e. when optimize_size is non-zero,
++ * this target hook should be used to estimate the relative size cost
++ * of an expression, again relative to COSTS_N_INSNS.
++ *
++ * The hook returns true when all subexpressions of x have been
++ * processed, and false when rtx_cost should recurse.
++ */
++
++/* Worker routine for avr32_rtx_costs.  */
++static inline int
++avr32_rtx_costs_1 (rtx x, enum rtx_code code ATTRIBUTE_UNUSED,
++		   enum rtx_code outer ATTRIBUTE_UNUSED)
++{
++  enum machine_mode mode = GET_MODE (x);
++
++  switch (GET_CODE (x))
++    {
++    case MEM:
++      /* Using pre decrement / post increment memory operations on the
++         avr32_uc architecture means that two writebacks must be performed
++         and hence two cycles are needed. */
++      if (!optimize_size
++	  && GET_MODE_SIZE (mode) <= 2 * UNITS_PER_WORD
++	  && TARGET_ARCH_UC
++	  && (GET_CODE (XEXP (x, 0)) == PRE_DEC
++	      || GET_CODE (XEXP (x, 0)) == POST_INC))
++	return COSTS_N_INSNS (5);
++
++      /* Memory costs quite a lot for the first word, but subsequent words
++         load at the equivalent of a single insn each.  */
++      if (GET_MODE_SIZE (mode) > UNITS_PER_WORD)
++	return COSTS_N_INSNS (3 + (GET_MODE_SIZE (mode) / UNITS_PER_WORD));
++
++      return COSTS_N_INSNS (4);
++    case SYMBOL_REF:
++    case CONST:
++      /* These are valid for the pseudo insns: lda.w and call which operates
++         on direct addresses. We assume that the cost of a lda.w is the same
++         as the cost of a ld.w insn. */
++      return (outer == SET) ? COSTS_N_INSNS (4) : COSTS_N_INSNS (1);
++    case DIV:
++    case MOD:
++    case UDIV:
++    case UMOD:
++      return optimize_size ? COSTS_N_INSNS (1) : COSTS_N_INSNS (16);
++
++    case ROTATE:
++    case ROTATERT:
++      if (mode == TImode)
++	return COSTS_N_INSNS (100);
++
++      if (mode == DImode)
++	return COSTS_N_INSNS (10);
++      return COSTS_N_INSNS (4);
++    case ASHIFT:
++    case LSHIFTRT:
++    case ASHIFTRT:
++    case NOT:
++      if (mode == TImode)
++	return COSTS_N_INSNS (10);
++
++      if (mode == DImode)
++	return COSTS_N_INSNS (4);
++      return COSTS_N_INSNS (1);
++    case PLUS:
++    case MINUS:
++    case NEG:
++    case COMPARE:
++    case ABS:
++      if (GET_MODE_CLASS (mode) == MODE_FLOAT)
++	return COSTS_N_INSNS (100);
++
++      if (mode == TImode)
++	return COSTS_N_INSNS (50);
++
++      if (mode == DImode)
++	return COSTS_N_INSNS (2);
++      return COSTS_N_INSNS (1);
++
++    case MULT:
++      {
++	if (GET_MODE_CLASS (mode) == MODE_FLOAT)
++	  return COSTS_N_INSNS (300);
++
++	if (mode == TImode)
++	  return COSTS_N_INSNS (16);
++
++	if (mode == DImode)
++	  return COSTS_N_INSNS (4);
++
++	if (mode == HImode)
++	  return COSTS_N_INSNS (2);
++
++	return COSTS_N_INSNS (3);
++      }
++    case IF_THEN_ELSE:
++      if (GET_CODE (XEXP (x, 1)) == PC || GET_CODE (XEXP (x, 2)) == PC)
++	return COSTS_N_INSNS (4);
++      return COSTS_N_INSNS (1);
++    case SIGN_EXTEND:
++    case ZERO_EXTEND:
++      /* Sign/Zero extensions of registers cost quite much since these
++         instrcutions only take one register operand which means that gcc
++         often must insert some move instrcutions */
++      if (mode == QImode || mode == HImode)
++	return (COSTS_N_INSNS (GET_CODE (XEXP (x, 0)) == MEM ? 0 : 1));
++      return COSTS_N_INSNS (4);
++    case UNSPEC:
++      /* divmod operations */
++      if (XINT (x, 1) == UNSPEC_UDIVMODSI4_INTERNAL
++	  || XINT (x, 1) == UNSPEC_DIVMODSI4_INTERNAL)
++	{
++	  return optimize_size ? COSTS_N_INSNS (1) : COSTS_N_INSNS (16);
++	}
++      /* Fallthrough */
++    default:
++      return COSTS_N_INSNS (1);
++    }
++}
++
++
++static bool
++avr32_rtx_costs (rtx x, int code, int outer_code, int *total)
++{
++  *total = avr32_rtx_costs_1 (x, code, outer_code);
++  return true;
++}
++
++
++bool
++avr32_cannot_force_const_mem (rtx x ATTRIBUTE_UNUSED)
++{
++  /* Do not want symbols in the constant pool when compiling pic or if using
++     address pseudo instructions. */
++  return ((flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS)
++	  && avr32_find_symbol (x) != NULL_RTX);
++}
++
++
++/* Table of machine attributes.  */
++const struct attribute_spec avr32_attribute_table[] = {
++  /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler } */
++  /* Interrupt Service Routines have special prologue and epilogue
++     requirements.  */
++  {"isr", 0, 1, false, false, false, avr32_handle_isr_attribute},
++  {"interrupt", 0, 1, false, false, false, avr32_handle_isr_attribute},
++  {"acall", 0, 1, false, true, true, avr32_handle_acall_attribute},
++  {"naked", 0, 0, true, false, false, avr32_handle_fndecl_attribute},
++  {"rmw_addressable", 0, 0, true, false, false, NULL},
++  {"flashvault", 0, 1, true, false, false, avr32_handle_fndecl_attribute},
++  {"flashvault_impl", 0, 1, true, false, false, avr32_handle_fndecl_attribute},
++  {NULL, 0, 0, false, false, false, NULL}
++};
++
++
++typedef struct
++{
++  const char *const arg;
++  const unsigned long return_value;
++}
++isr_attribute_arg;
++
++
++static const isr_attribute_arg isr_attribute_args[] = {
++  {"FULL", AVR32_FT_ISR_FULL},
++  {"full", AVR32_FT_ISR_FULL},
++  {"HALF", AVR32_FT_ISR_HALF},
++  {"half", AVR32_FT_ISR_HALF},
++  {"NONE", AVR32_FT_ISR_NONE},
++  {"none", AVR32_FT_ISR_NONE},
++  {"UNDEF", AVR32_FT_ISR_NONE},
++  {"undef", AVR32_FT_ISR_NONE},
++  {"SWI", AVR32_FT_ISR_NONE},
++  {"swi", AVR32_FT_ISR_NONE},
++  {NULL, AVR32_FT_ISR_NONE}
++};
++
++
++/* Returns the (interrupt) function type of the current
++   function, or AVR32_FT_UNKNOWN if the type cannot be determined.  */
++static unsigned long
++avr32_isr_value (tree argument)
++{
++  const isr_attribute_arg *ptr;
++  const char *arg;
++
++  /* No argument - default to ISR_NONE.  */
++  if (argument == NULL_TREE)
++    return AVR32_FT_ISR_NONE;
++
++  /* Get the value of the argument.  */
++  if (TREE_VALUE (argument) == NULL_TREE
++      || TREE_CODE (TREE_VALUE (argument)) != STRING_CST)
++    return AVR32_FT_UNKNOWN;
++
++  arg = TREE_STRING_POINTER (TREE_VALUE (argument));
++
++  /* Check it against the list of known arguments.  */
++  for (ptr = isr_attribute_args; ptr->arg != NULL; ptr++)
++    if (streq (arg, ptr->arg))
++      return ptr->return_value;
++
++  /* An unrecognized interrupt type.  */
++  return AVR32_FT_UNKNOWN;
++}
++
++
++/*
++These hooks specify assembly directives for creating certain kinds
++of integer object.  The TARGET_ASM_BYTE_OP directive creates a
++byte-sized object, the TARGET_ASM_ALIGNED_HI_OP one creates an
++aligned two-byte object, and so on.  Any of the hooks may be
++NULL, indicating that no suitable directive is available.
++
++The compiler will print these strings at the start of a new line,
++followed immediately by the object's initial value.  In most cases,
++the string should contain a tab, a pseudo-op, and then another tab.
++*/
++#undef  TARGET_ASM_BYTE_OP
++#define TARGET_ASM_BYTE_OP "\t.byte\t"
++#undef  TARGET_ASM_ALIGNED_HI_OP
++#define TARGET_ASM_ALIGNED_HI_OP "\t.align 1\n\t.short\t"
++#undef  TARGET_ASM_ALIGNED_SI_OP
++#define TARGET_ASM_ALIGNED_SI_OP "\t.align 2\n\t.int\t"
++#undef  TARGET_ASM_ALIGNED_DI_OP
++#define TARGET_ASM_ALIGNED_DI_OP NULL
++#undef  TARGET_ASM_ALIGNED_TI_OP
++#define TARGET_ASM_ALIGNED_TI_OP NULL
++#undef  TARGET_ASM_UNALIGNED_HI_OP
++#define TARGET_ASM_UNALIGNED_HI_OP "\t.short\t"
++#undef  TARGET_ASM_UNALIGNED_SI_OP
++#define TARGET_ASM_UNALIGNED_SI_OP "\t.int\t"
++#undef  TARGET_ASM_UNALIGNED_DI_OP
++#define TARGET_ASM_UNALIGNED_DI_OP NULL
++#undef  TARGET_ASM_UNALIGNED_TI_OP
++#define TARGET_ASM_UNALIGNED_TI_OP NULL
++
++#undef TARGET_ASM_OUTPUT_MI_THUNK
++#define TARGET_ASM_OUTPUT_MI_THUNK avr32_output_mi_thunk
++
++#undef TARGET_ASM_CAN_OUTPUT_MI_THUNK
++#define TARGET_ASM_CAN_OUTPUT_MI_THUNK hook_bool_const_tree_hwi_hwi_const_tree_true
++
++
++static void
++avr32_output_mi_thunk (FILE * file,
++    tree thunk ATTRIBUTE_UNUSED,
++    HOST_WIDE_INT delta,
++    HOST_WIDE_INT vcall_offset, tree function)
++  {
++    int mi_delta = delta;
++    int this_regno =
++      (aggregate_value_p (TREE_TYPE (TREE_TYPE (function)), function) ?
++       INTERNAL_REGNUM (11) : INTERNAL_REGNUM (12));
++
++
++    if (!avr32_const_ok_for_constraint_p (mi_delta, 'I', "Is21")
++        || vcall_offset)
++      {
++        fputs ("\tpushm\tlr\n", file);
++      }
++
++
++    if (mi_delta != 0)
++      {
++        if (avr32_const_ok_for_constraint_p (mi_delta, 'I', "Is21"))
++          {
++            fprintf (file, "\tsub\t%s, %d\n", reg_names[this_regno], -mi_delta);
++          }
++        else
++          {
++            /* Immediate is larger than k21 we must make us a temp register by
++	     pushing a register to the stack. */
++            fprintf (file, "\tmov\tlr, lo(%d)\n", mi_delta);
++            fprintf (file, "\torh\tlr, hi(%d)\n", mi_delta);
++            fprintf (file, "\tadd\t%s, lr\n", reg_names[this_regno]);
++          }
++      }
++
++
++    if (vcall_offset != 0)
++      {
++        fprintf (file, "\tld.w\tlr, %s[0]\n", reg_names[this_regno]);
++        fprintf (file, "\tld.w\tlr, lr[%i]\n", (int) vcall_offset);
++        fprintf (file, "\tadd\t%s, lr\n", reg_names[this_regno]);
++      }
++
++
++    if (!avr32_const_ok_for_constraint_p (mi_delta, 'I', "Is21")
++        || vcall_offset)
++      {
++        fputs ("\tpopm\tlr\n", file);
++      }
++
++    /* Jump to the function. We assume that we can use an rjmp since the
++       function to jump to is local and probably not too far away from
++       the thunk. If this assumption proves to be wrong we could implement
++       this jump by calculating the offset between the jump source and destination
++       and put this in the constant pool and then perform an add to pc.
++       This would also be legitimate PIC code. But for now we hope that an rjmp
++       will be sufficient...
++    */
++    fputs ("\trjmp\t", file);
++    assemble_name (file, XSTR (XEXP (DECL_RTL (function), 0), 0));
++    fputc ('\n', file);
++  }
++
++
++/* Implements target hook vector_mode_supported.  */
++bool
++avr32_vector_mode_supported (enum machine_mode mode)
++{
++  if ((mode == V2HImode) || (mode == V4QImode))
++    return true;
++
++  return false;
++}
++
++
++#undef TARGET_INIT_LIBFUNCS
++#define TARGET_INIT_LIBFUNCS avr32_init_libfuncs
++
++#undef  TARGET_INIT_BUILTINS
++#define TARGET_INIT_BUILTINS avr32_init_builtins
++
++#undef  TARGET_EXPAND_BUILTIN
++#define TARGET_EXPAND_BUILTIN avr32_expand_builtin
++
++tree int_ftype_int, int_ftype_void, short_ftype_short, void_ftype_int_int,
++  void_ftype_ptr_int;
++tree void_ftype_int, void_ftype_ulong, void_ftype_void, int_ftype_ptr_int;
++tree short_ftype_short, int_ftype_int_short, int_ftype_short_short,
++  short_ftype_short_short;
++tree int_ftype_int_int, longlong_ftype_int_short, longlong_ftype_short_short;
++tree void_ftype_int_int_int_int_int, void_ftype_int_int_int;
++tree longlong_ftype_int_int, void_ftype_int_int_longlong;
++tree int_ftype_int_int_int, longlong_ftype_longlong_int_short;
++tree longlong_ftype_longlong_short_short, int_ftype_int_short_short;
++
++#define def_builtin(NAME, TYPE, CODE)					\
++  add_builtin_function ((NAME), (TYPE), (CODE),                          \
++                       BUILT_IN_MD, NULL, NULL_TREE)
++
++#define def_mbuiltin(MASK, NAME, TYPE, CODE)				\
++  do									\
++    {									\
++      if ((MASK))							\
++	add_builtin_function ((NAME), (TYPE), (CODE),                   \
++                              BUILT_IN_MD, NULL, NULL_TREE);            \
++    }									\
++  while (0)
++
++struct builtin_description
++{
++  const unsigned int mask;
++  const enum insn_code icode;
++  const char *const name;
++  const int code;
++  const enum rtx_code comparison;
++  const unsigned int flag;
++  const tree *ftype;
++};
++
++static const struct builtin_description bdesc_2arg[] = {
++
++#define DSP_BUILTIN(code, builtin, ftype) \
++  { 1, CODE_FOR_##code, "__builtin_" #code , \
++  AVR32_BUILTIN_##builtin, 0, 0, ftype }
++
++  DSP_BUILTIN (mulsathh_h,    MULSATHH_H,    &short_ftype_short_short),
++  DSP_BUILTIN (mulsathh_w,    MULSATHH_W,    &int_ftype_short_short),
++  DSP_BUILTIN (mulsatrndhh_h, MULSATRNDHH_H, &short_ftype_short_short),
++  DSP_BUILTIN (mulsatrndwh_w, MULSATRNDWH_W, &int_ftype_int_short),
++  DSP_BUILTIN (mulsatwh_w,    MULSATWH_W,    &int_ftype_int_short),
++  DSP_BUILTIN (satadd_h,      SATADD_H,      &short_ftype_short_short),
++  DSP_BUILTIN (satsub_h,      SATSUB_H,      &short_ftype_short_short),
++  DSP_BUILTIN (satadd_w,      SATADD_W,      &int_ftype_int_int),
++  DSP_BUILTIN (satsub_w,      SATSUB_W,      &int_ftype_int_int),
++  DSP_BUILTIN (mulwh_d,       MULWH_D,       &longlong_ftype_int_short),
++  DSP_BUILTIN (mulnwh_d,      MULNWH_D,      &longlong_ftype_int_short)
++};
++
++
++void
++avr32_init_builtins (void)
++{
++  unsigned int i;
++  const struct builtin_description *d;
++  tree endlink = void_list_node;
++  tree int_endlink = tree_cons (NULL_TREE, integer_type_node, endlink);
++  tree longlong_endlink =
++    tree_cons (NULL_TREE, long_long_integer_type_node, endlink);
++  tree short_endlink =
++    tree_cons (NULL_TREE, short_integer_type_node, endlink);
++  tree void_endlink = tree_cons (NULL_TREE, void_type_node, endlink);
++
++  /* int func (int) */
++  int_ftype_int = build_function_type (integer_type_node, int_endlink);
++
++  /* short func (short) */
++  short_ftype_short
++    = build_function_type (short_integer_type_node, short_endlink);
++
++  /* short func (short, short) */
++  short_ftype_short_short
++    = build_function_type (short_integer_type_node,
++			   tree_cons (NULL_TREE, short_integer_type_node,
++				      short_endlink));
++
++  /* long long func (long long, short, short) */
++  longlong_ftype_longlong_short_short
++    = build_function_type (long_long_integer_type_node,
++			   tree_cons (NULL_TREE, long_long_integer_type_node,
++				      tree_cons (NULL_TREE,
++						 short_integer_type_node,
++						 short_endlink)));
++
++  /* long long func (short, short) */
++  longlong_ftype_short_short
++    = build_function_type (long_long_integer_type_node,
++			   tree_cons (NULL_TREE, short_integer_type_node,
++				      short_endlink));
++
++  /* int func (int, int) */
++  int_ftype_int_int
++    = build_function_type (integer_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      int_endlink));
++
++  /* long long func (int, int) */
++  longlong_ftype_int_int
++    = build_function_type (long_long_integer_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      int_endlink));
++
++  /* long long int func (long long, int, short) */
++  longlong_ftype_longlong_int_short
++    = build_function_type (long_long_integer_type_node,
++			   tree_cons (NULL_TREE, long_long_integer_type_node,
++				      tree_cons (NULL_TREE, integer_type_node,
++						 short_endlink)));
++
++  /* long long int func (int, short) */
++  longlong_ftype_int_short
++    = build_function_type (long_long_integer_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      short_endlink));
++
++  /* int func (int, short, short) */
++  int_ftype_int_short_short
++    = build_function_type (integer_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      tree_cons (NULL_TREE,
++						 short_integer_type_node,
++						 short_endlink)));
++
++  /* int func (short, short) */
++  int_ftype_short_short
++    = build_function_type (integer_type_node,
++			   tree_cons (NULL_TREE, short_integer_type_node,
++				      short_endlink));
++
++  /* int func (int, short) */
++  int_ftype_int_short
++    = build_function_type (integer_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      short_endlink));
++
++  /* void func (int, int) */
++  void_ftype_int_int
++    = build_function_type (void_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      int_endlink));
++
++  /* void func (int, int, int) */
++  void_ftype_int_int_int
++    = build_function_type (void_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      tree_cons (NULL_TREE, integer_type_node,
++						 int_endlink)));
++
++  /* void func (int, int, long long) */
++  void_ftype_int_int_longlong
++    = build_function_type (void_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      tree_cons (NULL_TREE, integer_type_node,
++						 longlong_endlink)));
++
++  /* void func (int, int, int, int, int) */
++  void_ftype_int_int_int_int_int
++    = build_function_type (void_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      tree_cons (NULL_TREE, integer_type_node,
++						 tree_cons (NULL_TREE,
++							    integer_type_node,
++							    tree_cons
++							    (NULL_TREE,
++							     integer_type_node,
++							     int_endlink)))));
++
++  /* void func (void *, int) */
++  void_ftype_ptr_int
++    = build_function_type (void_type_node,
++			   tree_cons (NULL_TREE, ptr_type_node, int_endlink));
++
++  /* void func (int) */
++  void_ftype_int = build_function_type (void_type_node, int_endlink);
++
++  /* void func (ulong) */
++  void_ftype_ulong = build_function_type_list (void_type_node,
++                           long_unsigned_type_node, NULL_TREE);
++
++  /* void func (void) */
++  void_ftype_void = build_function_type (void_type_node, void_endlink);
++
++  /* int func (void) */
++  int_ftype_void = build_function_type (integer_type_node, void_endlink);
++
++  /* int func (void *, int) */
++  int_ftype_ptr_int
++    = build_function_type (integer_type_node,
++			   tree_cons (NULL_TREE, ptr_type_node, int_endlink));
++
++  /* int func (int, int, int) */
++  int_ftype_int_int_int
++    = build_function_type (integer_type_node,
++			   tree_cons (NULL_TREE, integer_type_node,
++				      tree_cons (NULL_TREE, integer_type_node,
++						 int_endlink)));
++
++  /* Initialize avr32 builtins.  */
++  def_builtin ("__builtin_mfsr", int_ftype_int, AVR32_BUILTIN_MFSR);
++  def_builtin ("__builtin_mtsr", void_ftype_int_int, AVR32_BUILTIN_MTSR);
++  def_builtin ("__builtin_mfdr", int_ftype_int, AVR32_BUILTIN_MFDR);
++  def_builtin ("__builtin_mtdr", void_ftype_int_int, AVR32_BUILTIN_MTDR);
++  def_builtin ("__builtin_cache", void_ftype_ptr_int, AVR32_BUILTIN_CACHE);
++  def_builtin ("__builtin_sync", void_ftype_int, AVR32_BUILTIN_SYNC);
++  def_builtin ("__builtin_ssrf", void_ftype_int, AVR32_BUILTIN_SSRF);
++  def_builtin ("__builtin_csrf", void_ftype_int, AVR32_BUILTIN_CSRF);
++  def_builtin ("__builtin_tlbr", void_ftype_void, AVR32_BUILTIN_TLBR);
++  def_builtin ("__builtin_tlbs", void_ftype_void, AVR32_BUILTIN_TLBS);
++  def_builtin ("__builtin_tlbw", void_ftype_void, AVR32_BUILTIN_TLBW);
++  def_builtin ("__builtin_breakpoint", void_ftype_void,
++	       AVR32_BUILTIN_BREAKPOINT);
++  def_builtin ("__builtin_xchg", int_ftype_ptr_int, AVR32_BUILTIN_XCHG);
++  def_builtin ("__builtin_ldxi", int_ftype_ptr_int, AVR32_BUILTIN_LDXI);
++  def_builtin ("__builtin_bswap_16", short_ftype_short,
++	       AVR32_BUILTIN_BSWAP16);
++  def_builtin ("__builtin_bswap_32", int_ftype_int, AVR32_BUILTIN_BSWAP32);
++  def_builtin ("__builtin_cop", void_ftype_int_int_int_int_int,
++	       AVR32_BUILTIN_COP);
++  def_builtin ("__builtin_mvcr_w", int_ftype_int_int, AVR32_BUILTIN_MVCR_W);
++  def_builtin ("__builtin_mvrc_w", void_ftype_int_int_int,
++	       AVR32_BUILTIN_MVRC_W);
++  def_builtin ("__builtin_mvcr_d", longlong_ftype_int_int,
++	       AVR32_BUILTIN_MVCR_D);
++  def_builtin ("__builtin_mvrc_d", void_ftype_int_int_longlong,
++	       AVR32_BUILTIN_MVRC_D);
++  def_builtin ("__builtin_sats", int_ftype_int_int_int, AVR32_BUILTIN_SATS);
++  def_builtin ("__builtin_satu", int_ftype_int_int_int, AVR32_BUILTIN_SATU);
++  def_builtin ("__builtin_satrnds", int_ftype_int_int_int,
++	       AVR32_BUILTIN_SATRNDS);
++  def_builtin ("__builtin_satrndu", int_ftype_int_int_int,
++	       AVR32_BUILTIN_SATRNDU);
++  def_builtin ("__builtin_musfr", void_ftype_int, AVR32_BUILTIN_MUSFR);
++  def_builtin ("__builtin_mustr", int_ftype_void, AVR32_BUILTIN_MUSTR);
++  def_builtin ("__builtin_macsathh_w", int_ftype_int_short_short,
++	       AVR32_BUILTIN_MACSATHH_W);
++  def_builtin ("__builtin_macwh_d", longlong_ftype_longlong_int_short,
++	       AVR32_BUILTIN_MACWH_D);
++  def_builtin ("__builtin_machh_d", longlong_ftype_longlong_short_short,
++	       AVR32_BUILTIN_MACHH_D);
++  def_builtin ("__builtin_mems", void_ftype_ptr_int, AVR32_BUILTIN_MEMS);
++  def_builtin ("__builtin_memt", void_ftype_ptr_int, AVR32_BUILTIN_MEMT);
++  def_builtin ("__builtin_memc", void_ftype_ptr_int, AVR32_BUILTIN_MEMC);
++  def_builtin ("__builtin_sleep", void_ftype_int, AVR32_BUILTIN_SLEEP);
++  def_builtin ("__builtin_avr32_delay_cycles", void_ftype_int, AVR32_BUILTIN_DELAY_CYCLES);
++
++  /* Add all builtins that are more or less simple operations on two
++     operands.  */
++  for (i = 0, d = bdesc_2arg; i < ARRAY_SIZE (bdesc_2arg); i++, d++)
++    {
++      /* Use one of the operands; the target can have a different mode for
++         mask-generating compares.  */
++
++      if (d->name == 0)
++	continue;
++
++      def_mbuiltin (d->mask, d->name, *(d->ftype), d->code);
++    }
++}
++
++
++/* Subroutine of avr32_expand_builtin to take care of binop insns. */
++static rtx
++avr32_expand_binop_builtin (enum insn_code icode, tree exp, rtx target)
++{
++  rtx pat;
++  tree arg0 = CALL_EXPR_ARG (exp,0);
++  tree arg1 = CALL_EXPR_ARG (exp,1);
++  rtx op0 = expand_normal (arg0);
++  rtx op1 = expand_normal (arg1);
++  enum machine_mode tmode = insn_data[icode].operand[0].mode;
++  enum machine_mode mode0 = insn_data[icode].operand[1].mode;
++  enum machine_mode mode1 = insn_data[icode].operand[2].mode;
++
++  if (!target
++      || GET_MODE (target) != tmode
++      || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++    target = gen_reg_rtx (tmode);
++
++  /* In case the insn wants input operands in modes different from the
++     result, abort.  */
++  if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++    {
++      /* If op0 is already a reg we must cast it to the correct mode. */
++      if (REG_P (op0))
++	op0 = convert_to_mode (mode0, op0, 1);
++      else
++	op0 = copy_to_mode_reg (mode0, op0);
++    }
++  if (!(*insn_data[icode].operand[2].predicate) (op1, mode1))
++    {
++      /* If op1 is already a reg we must cast it to the correct mode. */
++      if (REG_P (op1))
++	op1 = convert_to_mode (mode1, op1, 1);
++      else
++	op1 = copy_to_mode_reg (mode1, op1);
++    }
++  pat = GEN_FCN (icode) (target, op0, op1);
++  if (!pat)
++    return 0;
++  emit_insn (pat);
++  return target;
++}
++
++
++/* Expand an expression EXP that calls a built-in function,
++   with result going to TARGET if that's convenient
++   (and in mode MODE if that's convenient).
++   SUBTARGET may be used as the target for computing one of EXP's operands.
++   IGNORE is nonzero if the value is to be ignored.  */
++rtx
++avr32_expand_builtin (tree exp,
++		      rtx target,
++		      rtx subtarget ATTRIBUTE_UNUSED,
++		      enum machine_mode mode ATTRIBUTE_UNUSED,
++		      int ignore ATTRIBUTE_UNUSED)
++{
++  const struct builtin_description *d;
++  unsigned int i;
++  enum insn_code icode = 0;
++  tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0);
++  tree arg0, arg1, arg2;
++  rtx op0, op1, op2, pat;
++  enum machine_mode tmode, mode0, mode1;
++  enum machine_mode arg0_mode;
++  int fcode = DECL_FUNCTION_CODE (fndecl);
++
++  switch (fcode)
++    {
++    default:
++      break;
++
++    case AVR32_BUILTIN_SATS:
++    case AVR32_BUILTIN_SATU:
++    case AVR32_BUILTIN_SATRNDS:
++    case AVR32_BUILTIN_SATRNDU:
++      {
++	const char *fname;
++	switch (fcode)
++	  {
++	  default:
++	  case AVR32_BUILTIN_SATS:
++	    icode = CODE_FOR_sats;
++	    fname = "sats";
++	    break;
++	  case AVR32_BUILTIN_SATU:
++	    icode = CODE_FOR_satu;
++	    fname = "satu";
++	    break;
++	  case AVR32_BUILTIN_SATRNDS:
++	    icode = CODE_FOR_satrnds;
++	    fname = "satrnds";
++	    break;
++	  case AVR32_BUILTIN_SATRNDU:
++	    icode = CODE_FOR_satrndu;
++	    fname = "satrndu";
++	    break;
++	  }
++
++	arg0 = CALL_EXPR_ARG (exp,0);
++	arg1 = CALL_EXPR_ARG (exp,1);
++	arg2 = CALL_EXPR_ARG (exp,2);
++	op0 = expand_normal (arg0);
++	op1 = expand_normal (arg1);
++	op2 = expand_normal (arg2);
++
++	tmode = insn_data[icode].operand[0].mode;
++
++
++	if (target == 0
++	    || GET_MODE (target) != tmode
++	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	  target = gen_reg_rtx (tmode);
++
++
++	if (!(*insn_data[icode].operand[0].predicate) (op0, GET_MODE (op0)))
++	  {
++	    op0 = copy_to_mode_reg (insn_data[icode].operand[0].mode, op0);
++	  }
++
++	if (!(*insn_data[icode].operand[1].predicate) (op1, SImode))
++	  {
++	    error ("Parameter 2 to __builtin_%s should be a constant number.",
++		   fname);
++	    return NULL_RTX;
++	  }
++
++	if (!(*insn_data[icode].operand[1].predicate) (op2, SImode))
++	  {
++	    error ("Parameter 3 to __builtin_%s should be a constant number.",
++		   fname);
++	    return NULL_RTX;
++	  }
++
++	emit_move_insn (target, op0);
++	pat = GEN_FCN (icode) (target, op1, op2);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++
++	return target;
++      }
++    case AVR32_BUILTIN_MUSTR:
++      icode = CODE_FOR_mustr;
++      tmode = insn_data[icode].operand[0].mode;
++
++      if (target == 0
++	  || GET_MODE (target) != tmode
++	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	target = gen_reg_rtx (tmode);
++      pat = GEN_FCN (icode) (target);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return target;
++
++    case AVR32_BUILTIN_MFSR:
++      icode = CODE_FOR_mfsr;
++      arg0 = CALL_EXPR_ARG (exp,0);
++      op0 = expand_normal (arg0);
++      tmode = insn_data[icode].operand[0].mode;
++      mode0 = insn_data[icode].operand[1].mode;
++
++      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++	{
++	  error ("Parameter 1 to __builtin_mfsr must be a constant number");
++	}
++
++      if (target == 0
++	  || GET_MODE (target) != tmode
++	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	target = gen_reg_rtx (tmode);
++      pat = GEN_FCN (icode) (target, op0);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return target;
++    case AVR32_BUILTIN_MTSR:
++      icode = CODE_FOR_mtsr;
++      arg0 = CALL_EXPR_ARG (exp,0);
++      arg1 = CALL_EXPR_ARG (exp,1);
++      op0 = expand_normal (arg0);
++      op1 = expand_normal (arg1);
++      mode0 = insn_data[icode].operand[0].mode;
++      mode1 = insn_data[icode].operand[1].mode;
++
++      if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
++	{
++	  error ("Parameter 1 to __builtin_mtsr must be a constant number");
++	  return gen_reg_rtx (mode0);
++	}
++      if (!(*insn_data[icode].operand[1].predicate) (op1, mode1))
++	op1 = copy_to_mode_reg (mode1, op1);
++      pat = GEN_FCN (icode) (op0, op1);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return NULL_RTX;
++    case AVR32_BUILTIN_MFDR:
++      icode = CODE_FOR_mfdr;
++      arg0 = CALL_EXPR_ARG (exp,0);
++      op0 = expand_normal (arg0);
++      tmode = insn_data[icode].operand[0].mode;
++      mode0 = insn_data[icode].operand[1].mode;
++
++      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++	{
++	  error ("Parameter 1 to __builtin_mfdr must be a constant number");
++	}
++
++      if (target == 0
++	  || GET_MODE (target) != tmode
++	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	target = gen_reg_rtx (tmode);
++      pat = GEN_FCN (icode) (target, op0);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return target;
++    case AVR32_BUILTIN_MTDR:
++      icode = CODE_FOR_mtdr;
++      arg0 = CALL_EXPR_ARG (exp,0);
++      arg1 = CALL_EXPR_ARG (exp,1);
++      op0 = expand_normal (arg0);
++      op1 = expand_normal (arg1);
++      mode0 = insn_data[icode].operand[0].mode;
++      mode1 = insn_data[icode].operand[1].mode;
++
++      if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
++	{
++	  error ("Parameter 1 to __builtin_mtdr must be a constant number");
++	  return gen_reg_rtx (mode0);
++	}
++      if (!(*insn_data[icode].operand[1].predicate) (op1, mode1))
++	op1 = copy_to_mode_reg (mode1, op1);
++      pat = GEN_FCN (icode) (op0, op1);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return NULL_RTX;
++    case AVR32_BUILTIN_CACHE:
++      icode = CODE_FOR_cache;
++      arg0 = CALL_EXPR_ARG (exp,0);
++      arg1 = CALL_EXPR_ARG (exp,1);
++      op0 = expand_normal (arg0);
++      op1 = expand_normal (arg1);
++      mode0 = insn_data[icode].operand[0].mode;
++      mode1 = insn_data[icode].operand[1].mode;
++
++      if (!(*insn_data[icode].operand[1].predicate) (op1, mode1))
++	{
++	  error ("Parameter 2 to __builtin_cache must be a constant number");
++	  return gen_reg_rtx (mode1);
++	}
++
++      if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
++	op0 = copy_to_mode_reg (mode0, op0);
++
++      pat = GEN_FCN (icode) (op0, op1);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return NULL_RTX;
++    case AVR32_BUILTIN_SYNC:
++    case AVR32_BUILTIN_MUSFR:
++    case AVR32_BUILTIN_SSRF:
++    case AVR32_BUILTIN_CSRF:
++      {
++	const char *fname;
++	switch (fcode)
++	  {
++	  default:
++	  case AVR32_BUILTIN_SYNC:
++	    icode = CODE_FOR_sync;
++	    fname = "sync";
++	    break;
++	  case AVR32_BUILTIN_MUSFR:
++	    icode = CODE_FOR_musfr;
++	    fname = "musfr";
++	    break;
++	  case AVR32_BUILTIN_SSRF:
++	    icode = CODE_FOR_ssrf;
++	    fname = "ssrf";
++	    break;
++	  case AVR32_BUILTIN_CSRF:
++	    icode = CODE_FOR_csrf;
++	    fname = "csrf";
++	    break;
++	  }
++
++	arg0 = CALL_EXPR_ARG (exp,0);
++	op0 = expand_normal (arg0);
++	mode0 = insn_data[icode].operand[0].mode;
++
++	if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
++	  {
++	    if (icode == CODE_FOR_musfr)
++	      op0 = copy_to_mode_reg (mode0, op0);
++	    else
++	      {
++		error ("Parameter to __builtin_%s is illegal.", fname);
++		return gen_reg_rtx (mode0);
++	      }
++	  }
++	pat = GEN_FCN (icode) (op0);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++	return NULL_RTX;
++      }
++    case AVR32_BUILTIN_TLBR:
++      icode = CODE_FOR_tlbr;
++      pat = GEN_FCN (icode) (NULL_RTX);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return NULL_RTX;
++    case AVR32_BUILTIN_TLBS:
++      icode = CODE_FOR_tlbs;
++      pat = GEN_FCN (icode) (NULL_RTX);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return NULL_RTX;
++    case AVR32_BUILTIN_TLBW:
++      icode = CODE_FOR_tlbw;
++      pat = GEN_FCN (icode) (NULL_RTX);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return NULL_RTX;
++    case AVR32_BUILTIN_BREAKPOINT:
++      icode = CODE_FOR_breakpoint;
++      pat = GEN_FCN (icode) (NULL_RTX);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return NULL_RTX;
++    case AVR32_BUILTIN_XCHG:
++      icode = CODE_FOR_sync_lock_test_and_setsi;
++      arg0 = CALL_EXPR_ARG (exp,0);
++      arg1 = CALL_EXPR_ARG (exp,1);
++      op0 = expand_normal (arg0);
++      op1 = expand_normal (arg1);
++      tmode = insn_data[icode].operand[0].mode;
++      mode0 = insn_data[icode].operand[1].mode;
++      mode1 = insn_data[icode].operand[2].mode;
++
++      if (!(*insn_data[icode].operand[2].predicate) (op1, mode1))
++	{
++	  op1 = copy_to_mode_reg (mode1, op1);
++	}
++
++      op0 = force_reg (GET_MODE (op0), op0);
++      op0 = gen_rtx_MEM (GET_MODE (op0), op0);
++      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++	{
++	  error
++	    ("Parameter 1 to __builtin_xchg must be a pointer to an integer.");
++	}
++
++      if (target == 0
++	  || GET_MODE (target) != tmode
++	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	target = gen_reg_rtx (tmode);
++      pat = GEN_FCN (icode) (target, op0, op1);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return target;
++    case AVR32_BUILTIN_LDXI:
++      icode = CODE_FOR_ldxi;
++      arg0 = CALL_EXPR_ARG (exp,0);
++      arg1 = CALL_EXPR_ARG (exp,1);
++      arg2 = CALL_EXPR_ARG (exp,2);
++      op0 = expand_normal (arg0);
++      op1 = expand_normal (arg1);
++      op2 = expand_normal (arg2);
++      tmode = insn_data[icode].operand[0].mode;
++      mode0 = insn_data[icode].operand[1].mode;
++      mode1 = insn_data[icode].operand[2].mode;
++
++      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++	{
++	  op0 = copy_to_mode_reg (mode0, op0);
++	}
++
++      if (!(*insn_data[icode].operand[2].predicate) (op1, mode1))
++	{
++	  op1 = copy_to_mode_reg (mode1, op1);
++	}
++
++      if (!(*insn_data[icode].operand[3].predicate) (op2, SImode))
++	{
++	  error
++	    ("Parameter 3 to __builtin_ldxi must be a valid extract shift operand: (0|8|16|24)");
++	  return gen_reg_rtx (mode0);
++	}
++
++      if (target == 0
++	  || GET_MODE (target) != tmode
++	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	target = gen_reg_rtx (tmode);
++      pat = GEN_FCN (icode) (target, op0, op1, op2);
++      if (!pat)
++	return 0;
++      emit_insn (pat);
++      return target;
++    case AVR32_BUILTIN_BSWAP16:
++      {
++	icode = CODE_FOR_bswap_16;
++	arg0 = CALL_EXPR_ARG (exp,0);
++	arg0_mode = TYPE_MODE (TREE_TYPE (arg0));
++	mode0 = insn_data[icode].operand[1].mode;
++	if (arg0_mode != mode0)
++	  arg0 = build1 (NOP_EXPR,
++			 (*lang_hooks.types.type_for_mode) (mode0, 0), arg0);
++
++	op0 = expand_expr (arg0, NULL_RTX, HImode, 0);
++	tmode = insn_data[icode].operand[0].mode;
++
++
++	if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++	  {
++            if ( CONST_INT_P (op0) )
++              {
++                HOST_WIDE_INT val = ( ((INTVAL (op0)&0x00ff) << 8) |
++                                      ((INTVAL (op0)&0xff00) >> 8) );
++                /* Sign extend 16-bit value to host wide int */
++                val <<= (HOST_BITS_PER_WIDE_INT - 16);
++                val >>= (HOST_BITS_PER_WIDE_INT - 16);
++                op0 = GEN_INT(val);
++                if (target == 0
++                    || GET_MODE (target) != tmode
++                    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++                  target = gen_reg_rtx (tmode);
++                emit_move_insn(target, op0);
++                return target;
++              }
++            else
++              op0 = copy_to_mode_reg (mode0, op0);
++	  }
++
++	if (target == 0
++	    || GET_MODE (target) != tmode
++	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	  {
++	    target = gen_reg_rtx (tmode);
++	  }
++
++
++	pat = GEN_FCN (icode) (target, op0);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++
++	return target;
++      }
++    case AVR32_BUILTIN_BSWAP32:
++      {
++	icode = CODE_FOR_bswap_32;
++	arg0 = CALL_EXPR_ARG (exp,0);
++	op0 = expand_normal (arg0);
++	tmode = insn_data[icode].operand[0].mode;
++	mode0 = insn_data[icode].operand[1].mode;
++
++	if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++	  {
++            if ( CONST_INT_P (op0) )
++              {
++                HOST_WIDE_INT val = ( ((INTVAL (op0)&0x000000ff) << 24) |
++                                      ((INTVAL (op0)&0x0000ff00) << 8) |
++                                      ((INTVAL (op0)&0x00ff0000) >> 8) |
++                                      ((INTVAL (op0)&0xff000000) >> 24) );
++                /* Sign extend 32-bit value to host wide int */
++                val <<= (HOST_BITS_PER_WIDE_INT - 32);
++                val >>= (HOST_BITS_PER_WIDE_INT - 32);
++                op0 = GEN_INT(val);
++                if (target == 0
++                    || GET_MODE (target) != tmode
++                    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++                  target = gen_reg_rtx (tmode);
++                emit_move_insn(target, op0);
++                return target;
++              }
++            else
++              op0 = copy_to_mode_reg (mode0, op0);
++	  }
++
++	if (target == 0
++	    || GET_MODE (target) != tmode
++	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	  target = gen_reg_rtx (tmode);
++
++
++	pat = GEN_FCN (icode) (target, op0);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++
++	return target;
++      }
++    case AVR32_BUILTIN_MVCR_W:
++    case AVR32_BUILTIN_MVCR_D:
++      {
++	arg0 = CALL_EXPR_ARG (exp,0);
++	arg1 = CALL_EXPR_ARG (exp,1);
++	op0 = expand_normal (arg0);
++	op1 = expand_normal (arg1);
++
++	if (fcode == AVR32_BUILTIN_MVCR_W)
++	  icode = CODE_FOR_mvcrsi;
++	else
++	  icode = CODE_FOR_mvcrdi;
++
++	tmode = insn_data[icode].operand[0].mode;
++
++	if (target == 0
++	    || GET_MODE (target) != tmode
++	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	  target = gen_reg_rtx (tmode);
++
++	if (!(*insn_data[icode].operand[1].predicate) (op0, SImode))
++	  {
++	    error
++	      ("Parameter 1 to __builtin_cop is not a valid coprocessor number.");
++	    error ("Number should be between 0 and 7.");
++	    return NULL_RTX;
++	  }
++
++	if (!(*insn_data[icode].operand[2].predicate) (op1, SImode))
++	  {
++	    error
++	      ("Parameter 2 to __builtin_cop is not a valid coprocessor register number.");
++	    error ("Number should be between 0 and 15.");
++	    return NULL_RTX;
++	  }
++
++	pat = GEN_FCN (icode) (target, op0, op1);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++
++	return target;
++      }
++    case AVR32_BUILTIN_MACSATHH_W:
++    case AVR32_BUILTIN_MACWH_D:
++    case AVR32_BUILTIN_MACHH_D:
++      {
++	arg0 = CALL_EXPR_ARG (exp,0);
++	arg1 = CALL_EXPR_ARG (exp,1);
++	arg2 = CALL_EXPR_ARG (exp,2);
++	op0 = expand_normal (arg0);
++	op1 = expand_normal (arg1);
++	op2 = expand_normal (arg2);
++
++	icode = ((fcode == AVR32_BUILTIN_MACSATHH_W) ? CODE_FOR_macsathh_w :
++		 (fcode == AVR32_BUILTIN_MACWH_D) ? CODE_FOR_macwh_d :
++		 CODE_FOR_machh_d);
++
++	tmode = insn_data[icode].operand[0].mode;
++	mode0 = insn_data[icode].operand[1].mode;
++	mode1 = insn_data[icode].operand[2].mode;
++
++
++	if (!target
++	    || GET_MODE (target) != tmode
++	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
++	  target = gen_reg_rtx (tmode);
++
++	if (!(*insn_data[icode].operand[0].predicate) (op0, tmode))
++	  {
++	    /* If op0 is already a reg we must cast it to the correct mode. */
++	    if (REG_P (op0))
++	      op0 = convert_to_mode (tmode, op0, 1);
++	    else
++	      op0 = copy_to_mode_reg (tmode, op0);
++	  }
++
++	if (!(*insn_data[icode].operand[1].predicate) (op1, mode0))
++	  {
++	    /* If op1 is already a reg we must cast it to the correct mode. */
++	    if (REG_P (op1))
++	      op1 = convert_to_mode (mode0, op1, 1);
++	    else
++	      op1 = copy_to_mode_reg (mode0, op1);
++	  }
++
++	if (!(*insn_data[icode].operand[2].predicate) (op2, mode1))
++	  {
++	    /* If op1 is already a reg we must cast it to the correct mode. */
++	    if (REG_P (op2))
++	      op2 = convert_to_mode (mode1, op2, 1);
++	    else
++	      op2 = copy_to_mode_reg (mode1, op2);
++	  }
++
++	emit_move_insn (target, op0);
++
++	pat = GEN_FCN (icode) (target, op1, op2);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++	return target;
++      }
++    case AVR32_BUILTIN_MVRC_W:
++    case AVR32_BUILTIN_MVRC_D:
++      {
++	arg0 = CALL_EXPR_ARG (exp,0);
++	arg1 = CALL_EXPR_ARG (exp,1);
++	arg2 = CALL_EXPR_ARG (exp,2);
++	op0 = expand_normal (arg0);
++	op1 = expand_normal (arg1);
++	op2 = expand_normal (arg2);
++
++	if (fcode == AVR32_BUILTIN_MVRC_W)
++	  icode = CODE_FOR_mvrcsi;
++	else
++	  icode = CODE_FOR_mvrcdi;
++
++	if (!(*insn_data[icode].operand[0].predicate) (op0, SImode))
++	  {
++	    error ("Parameter 1 is not a valid coprocessor number.");
++	    error ("Number should be between 0 and 7.");
++	    return NULL_RTX;
++	  }
++
++	if (!(*insn_data[icode].operand[1].predicate) (op1, SImode))
++	  {
++	    error ("Parameter 2 is not a valid coprocessor register number.");
++	    error ("Number should be between 0 and 15.");
++	    return NULL_RTX;
++	  }
++
++	if (GET_CODE (op2) == CONST_INT
++	    || GET_CODE (op2) == CONST
++	    || GET_CODE (op2) == SYMBOL_REF || GET_CODE (op2) == LABEL_REF)
++	  {
++	    op2 = force_const_mem (insn_data[icode].operand[2].mode, op2);
++	  }
++
++	if (!(*insn_data[icode].operand[2].predicate) (op2, GET_MODE (op2)))
++	  op2 = copy_to_mode_reg (insn_data[icode].operand[2].mode, op2);
++
++
++	pat = GEN_FCN (icode) (op0, op1, op2);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++
++	return NULL_RTX;
++      }
++    case AVR32_BUILTIN_COP:
++      {
++	rtx op3, op4;
++	tree arg3, arg4;
++	icode = CODE_FOR_cop;
++	arg0 = CALL_EXPR_ARG (exp,0);
++	arg1 = CALL_EXPR_ARG (exp,1);
++	arg2 = CALL_EXPR_ARG (exp,2);
++	arg3 = CALL_EXPR_ARG (exp,3);
++	arg4 = CALL_EXPR_ARG (exp,4);
++	op0 = expand_normal (arg0);
++	op1 = expand_normal (arg1);
++	op2 = expand_normal (arg2);
++	op3 = expand_normal (arg3);
++	op4 = expand_normal (arg4);
++
++	if (!(*insn_data[icode].operand[0].predicate) (op0, SImode))
++	  {
++	    error
++	      ("Parameter 1 to __builtin_cop is not a valid coprocessor number.");
++	    error ("Number should be between 0 and 7.");
++	    return NULL_RTX;
++	  }
++
++	if (!(*insn_data[icode].operand[1].predicate) (op1, SImode))
++	  {
++	    error
++	      ("Parameter 2 to __builtin_cop is not a valid coprocessor register number.");
++	    error ("Number should be between 0 and 15.");
++	    return NULL_RTX;
++	  }
++
++	if (!(*insn_data[icode].operand[2].predicate) (op2, SImode))
++	  {
++	    error
++	      ("Parameter 3 to __builtin_cop is not a valid coprocessor register number.");
++	    error ("Number should be between 0 and 15.");
++	    return NULL_RTX;
++	  }
++
++	if (!(*insn_data[icode].operand[3].predicate) (op3, SImode))
++	  {
++	    error
++	      ("Parameter 4 to __builtin_cop is not a valid coprocessor register number.");
++	    error ("Number should be between 0 and 15.");
++	    return NULL_RTX;
++	  }
++
++	if (!(*insn_data[icode].operand[4].predicate) (op4, SImode))
++	  {
++	    error
++	      ("Parameter 5 to __builtin_cop is not a valid coprocessor operation.");
++	    error ("Number should be between 0 and 127.");
++	    return NULL_RTX;
++	  }
++
++	pat = GEN_FCN (icode) (op0, op1, op2, op3, op4);
++	if (!pat)
++	  return 0;
++	emit_insn (pat);
++
++	return target;
++      }
++
++     case AVR32_BUILTIN_MEMS:
++     case AVR32_BUILTIN_MEMC:
++     case AVR32_BUILTIN_MEMT:
++       {
++         if (!TARGET_RMW)
++           error ("Trying to use __builtin_mem(s/c/t) when target does not support RMW insns.");
++         
++         switch (fcode) {
++         case AVR32_BUILTIN_MEMS:
++           icode = CODE_FOR_iorsi3;
++           break;
++         case AVR32_BUILTIN_MEMC:
++           icode = CODE_FOR_andsi3;
++           break;
++         case AVR32_BUILTIN_MEMT:
++           icode = CODE_FOR_xorsi3;
++           break;
++         }
++			arg0 = CALL_EXPR_ARG (exp,0);
++			arg1 = CALL_EXPR_ARG (exp,1);
++         op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
++         if ( GET_CODE (op0) == SYMBOL_REF )
++           // This symbol must be RMW addressable
++           SYMBOL_REF_FLAGS (op0) |= (1 << SYMBOL_FLAG_RMW_ADDR_SHIFT);
++         op0 = gen_rtx_MEM(SImode, op0);
++         op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
++         mode0 = insn_data[icode].operand[1].mode;
++         
++         
++         if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
++           {
++             error ("Parameter 1 to __builtin_mem(s/c/t) must be a Ks15<<2 address or a rmw addressable symbol.");
++           }
++         
++         if ( !CONST_INT_P (op1)
++              || INTVAL (op1) > 31
++              || INTVAL (op1) < 0 )
++           error ("Parameter 2 to __builtin_mem(s/c/t) must be a constant between 0 and 31.");
++ 
++         if ( fcode == AVR32_BUILTIN_MEMC )
++           op1 = GEN_INT((~(1 << INTVAL(op1)))&0xffffffff);
++         else
++           op1 = GEN_INT((1 << INTVAL(op1))&0xffffffff);
++         pat = GEN_FCN (icode) (op0, op0, op1);
++         if (!pat)
++           return 0;
++         emit_insn (pat);
++         return op0;
++       }
++       
++     case AVR32_BUILTIN_SLEEP:
++       {
++ 	arg0 = CALL_EXPR_ARG (exp, 0);
++ 	op0  = expand_normal (arg0);
++ 	int intval = INTVAL(op0);
++ 
++ 	/* Check if the argument if integer and if the value of integer
++ 	   is greater than 0. */ 
++ 	 
++ 	if (!CONSTANT_P (op0))
++         error ("Parameter 1 to __builtin_sleep() is not a valid integer.");
++ 	if (intval < 0 )
++ 	     error ("Parameter 1 to __builtin_sleep() should be an integer greater than 0.");
++ 
++         int strncmpval = strncmp (avr32_part_name,"uc3l", 4);
++  
++ 	/* Check if op0 is less than 7 for uc3l* and less than 6 for other
++ 	   devices. By this check we are avoiding if operand is less than  
++ 	   256. For more devices, add more such checks. */
++ 	 
++ 	if ( strncmpval == 0 && intval >= 7)  
++        error ("Parameter 1 to __builtin_sleep() should be less than or equal to 7.");
++ 	else if ( strncmp != 0 && intval >= 6)
++ 	    error ("Parameter 1 to __builtin_sleep() should be less than or equal to 6.");
++ 
++ 	emit_insn (gen_sleep(op0));
++ 	return target;
++ 
++       }	
++     case AVR32_BUILTIN_DELAY_CYCLES: 
++       {
++       arg0 = CALL_EXPR_ARG (exp, 0);
++       op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
++ 
++       if (TARGET_ARCH_AP)
++         error (" __builtin_avr32_delay_cycles() not supported for \'%s\' architecture.", avr32_arch_name);
++       if (!CONSTANT_P (op0))
++        error ("Parameter 1 to __builtin_avr32_delay_cycles() should be an integer.");
++       emit_insn (gen_delay_cycles (op0));
++       return 0;
++ 
++       }       
++
++    }
++
++  for (i = 0, d = bdesc_2arg; i < ARRAY_SIZE (bdesc_2arg); i++, d++)
++    if (d->code == fcode)
++      return avr32_expand_binop_builtin (d->icode, exp, target);
++
++
++  /* @@@ Should really do something sensible here.  */
++  return NULL_RTX;
++}
++
++
++/* Handle an "interrupt" or "isr" attribute;
++   arguments as in struct attribute_spec.handler.  */
++static tree
++avr32_handle_isr_attribute (tree * node, tree name, tree args,
++			    int flags, bool * no_add_attrs)
++{
++  if (DECL_P (*node))
++    {
++      if (TREE_CODE (*node) != FUNCTION_DECL)
++	{
++	  warning (OPT_Wattributes,"`%s' attribute only applies to functions",
++		   IDENTIFIER_POINTER (name));
++	  *no_add_attrs = true;
++	}
++      /* FIXME: the argument if any is checked for type attributes; should it
++         be checked for decl ones? */
++    }
++  else
++    {
++      if (TREE_CODE (*node) == FUNCTION_TYPE
++	  || TREE_CODE (*node) == METHOD_TYPE)
++	{
++	  if (avr32_isr_value (args) == AVR32_FT_UNKNOWN)
++	    {
++	      warning (OPT_Wattributes,"`%s' attribute ignored", IDENTIFIER_POINTER (name));
++	      *no_add_attrs = true;
++	    }
++	}
++      else if (TREE_CODE (*node) == POINTER_TYPE
++	       && (TREE_CODE (TREE_TYPE (*node)) == FUNCTION_TYPE
++		   || TREE_CODE (TREE_TYPE (*node)) == METHOD_TYPE)
++	       && avr32_isr_value (args) != AVR32_FT_UNKNOWN)
++	{
++	  *node = build_variant_type_copy (*node);
++	  TREE_TYPE (*node) = build_type_attribute_variant
++	    (TREE_TYPE (*node),
++	     tree_cons (name, args, TYPE_ATTRIBUTES (TREE_TYPE (*node))));
++	  *no_add_attrs = true;
++	}
++      else
++	{
++	  /* Possibly pass this attribute on from the type to a decl.  */
++	  if (flags & ((int) ATTR_FLAG_DECL_NEXT
++		       | (int) ATTR_FLAG_FUNCTION_NEXT
++		       | (int) ATTR_FLAG_ARRAY_NEXT))
++	    {
++	      *no_add_attrs = true;
++	      return tree_cons (name, args, NULL_TREE);
++	    }
++	  else
++	    {
++	      warning (OPT_Wattributes,"`%s' attribute ignored", IDENTIFIER_POINTER (name));
++	    }
++	}
++    }
++
++  return NULL_TREE;
++}
++
++
++/* Handle an attribute requiring a FUNCTION_DECL;
++   arguments as in struct attribute_spec.handler.  */
++static tree
++avr32_handle_fndecl_attribute (tree * node, tree name,
++			       tree args,
++			       int flags ATTRIBUTE_UNUSED,
++			       bool * no_add_attrs)
++{
++  if (TREE_CODE (*node) != FUNCTION_DECL)
++    {
++      warning (OPT_Wattributes,"%qs attribute only applies to functions",
++	       IDENTIFIER_POINTER (name));
++      *no_add_attrs = true;
++      return NULL_TREE;
++    }
++
++  fndecl_attribute_args = args;
++  if (args == NULL_TREE)
++	  return NULL_TREE;
++
++  tree value = TREE_VALUE (args);
++  if (TREE_CODE (value) != INTEGER_CST)
++    {
++      warning (OPT_Wattributes,
++	       "argument of %qs attribute is not an integer constant",
++	       IDENTIFIER_POINTER (name));
++      *no_add_attrs = true;
++    }
++
++  return NULL_TREE;
++}
++
++
++/* Handle an acall attribute;
++   arguments as in struct attribute_spec.handler.  */
++
++static tree
++avr32_handle_acall_attribute (tree * node, tree name,
++			      tree args ATTRIBUTE_UNUSED,
++			      int flags ATTRIBUTE_UNUSED, bool * no_add_attrs)
++{
++  if (TREE_CODE (*node) == FUNCTION_TYPE || TREE_CODE (*node) == METHOD_TYPE)
++    {
++      warning (OPT_Wattributes,"`%s' attribute not yet supported...",
++	       IDENTIFIER_POINTER (name));
++      *no_add_attrs = true;
++      return NULL_TREE;
++    }
++
++  warning (OPT_Wattributes,"`%s' attribute only applies to functions",
++	   IDENTIFIER_POINTER (name));
++  *no_add_attrs = true;
++  return NULL_TREE;
++}
++
++
++bool
++avr32_flashvault_call(tree decl)
++{
++  tree attributes;
++  tree fv_attribute;
++  tree vector_tree;
++  unsigned int vector;
++
++  if (decl && TREE_CODE (decl) == FUNCTION_DECL) 
++    {
++      attributes = DECL_ATTRIBUTES(decl);
++      fv_attribute = lookup_attribute ("flashvault", attributes);
++      if (fv_attribute != NULL_TREE)
++        {
++          /* Get attribute parameter, for the function vector number. */
++          /* 
++          There is probably an easier, standard way to retrieve the
++          attribute parameter which needs to be done here.
++          */
++          vector_tree = TREE_VALUE(fv_attribute);
++          if (vector_tree != NULL_TREE)
++            {
++              vector = (unsigned int)TREE_INT_CST_LOW(TREE_VALUE(vector_tree));
++              fprintf (asm_out_file,
++                       "\tmov\tr8, lo(%i)\t# Load vector number for sscall.\n",
++                       vector);
++            }
++
++          fprintf (asm_out_file,
++                   "\tsscall\t# Secure system call.\n");
++
++          return true;
++        }
++    }
++  
++  return false;
++}
++
++
++static bool has_attribute_p (tree decl, const char *name)
++{
++  if (decl && TREE_CODE (decl) == FUNCTION_DECL) 
++    {
++      return (lookup_attribute (name, DECL_ATTRIBUTES(decl)) != NULL_TREE);
++    }
++  return NULL_TREE;    
++}
++
++
++/* Return 0 if the attributes for two types are incompatible, 1 if they
++   are compatible, and 2 if they are nearly compatible (which causes a
++   warning to be generated).  */
++static int
++avr32_comp_type_attributes (tree type1, tree type2)
++{
++  bool acall1, acall2, isr1, isr2, naked1, naked2, fv1, fv2, fvimpl1, fvimpl2;
++
++  /* Check for mismatch of non-default calling convention.  */
++  if (TREE_CODE (type1) != FUNCTION_TYPE)
++    return 1;
++
++  /* Check for mismatched call attributes.  */
++  acall1 = lookup_attribute ("acall", TYPE_ATTRIBUTES (type1)) != NULL;
++  acall2 = lookup_attribute ("acall", TYPE_ATTRIBUTES (type2)) != NULL;
++  naked1 = lookup_attribute ("naked", TYPE_ATTRIBUTES (type1)) != NULL;
++  naked2 = lookup_attribute ("naked", TYPE_ATTRIBUTES (type2)) != NULL;
++  fv1 = lookup_attribute ("flashvault", TYPE_ATTRIBUTES (type1)) != NULL;
++  fv2 = lookup_attribute ("flashvault", TYPE_ATTRIBUTES (type2)) != NULL;
++  fvimpl1 = lookup_attribute ("flashvault_impl", TYPE_ATTRIBUTES (type1)) != NULL;
++  fvimpl2 = lookup_attribute ("flashvault_impl", TYPE_ATTRIBUTES (type2)) != NULL;
++  isr1 = lookup_attribute ("isr", TYPE_ATTRIBUTES (type1)) != NULL;
++  if (!isr1)
++    isr1 = lookup_attribute ("interrupt", TYPE_ATTRIBUTES (type1)) != NULL;
++
++  isr2 = lookup_attribute ("isr", TYPE_ATTRIBUTES (type2)) != NULL;
++  if (!isr2)
++    isr2 = lookup_attribute ("interrupt", TYPE_ATTRIBUTES (type2)) != NULL;
++
++  if ((acall1 && isr2)
++      || (acall2 && isr1)
++      || (naked1 && isr2)
++      || (naked2 && isr1)
++      || (fv1 && isr2)
++      || (fv2 && isr1)
++      || (fvimpl1 && isr2)
++      || (fvimpl2 && isr1)
++      || (fv1 && fvimpl2)
++      || (fv2 && fvimpl1)
++      )
++    return 0;
++
++  return 1;
++}
++
++
++/* Computes the type of the current function.  */
++static unsigned long
++avr32_compute_func_type (void)
++{
++  unsigned long type = AVR32_FT_UNKNOWN;
++  tree a;
++  tree attr;
++
++  if (TREE_CODE (current_function_decl) != FUNCTION_DECL)
++    abort ();
++
++  /* Decide if the current function is volatile.  Such functions never
++     return, and many memory cycles can be saved by not storing register
++     values that will never be needed again.  This optimization was added to
++     speed up context switching in a kernel application.  */
++  if (optimize > 0
++      && TREE_NOTHROW (current_function_decl)
++      && TREE_THIS_VOLATILE (current_function_decl))
++    type |= AVR32_FT_VOLATILE;
++
++  if (cfun->static_chain_decl != NULL)
++    type |= AVR32_FT_NESTED;
++
++  attr = DECL_ATTRIBUTES (current_function_decl);
++
++  a = lookup_attribute ("isr", attr);
++  if (a == NULL_TREE)
++    a = lookup_attribute ("interrupt", attr);
++
++  if (a == NULL_TREE)
++    type |= AVR32_FT_NORMAL;
++  else
++    type |= avr32_isr_value (TREE_VALUE (a));
++
++
++  a = lookup_attribute ("acall", attr);
++  if (a != NULL_TREE)
++    type |= AVR32_FT_ACALL;
++
++  a = lookup_attribute ("naked", attr);
++  if (a != NULL_TREE)
++    type |= AVR32_FT_NAKED;
++
++  a = lookup_attribute ("flashvault", attr);
++  if (a != NULL_TREE)
++    type |= AVR32_FT_FLASHVAULT;
++
++  a = lookup_attribute ("flashvault_impl", attr);
++  if (a != NULL_TREE)
++    type |= AVR32_FT_FLASHVAULT_IMPL;
++
++  return type;
++}
++
++
++/* Returns the type of the current function.  */
++static unsigned long
++avr32_current_func_type (void)
++{
++  if (AVR32_FUNC_TYPE (cfun->machine->func_type) == AVR32_FT_UNKNOWN)
++    cfun->machine->func_type = avr32_compute_func_type ();
++
++  return cfun->machine->func_type;
++}
++
++
++/*
++This target hook should return true if we should not pass type solely
++in registers. The file expr.h defines a definition that is usually appropriate,
++refer to expr.h for additional documentation.
++*/
++bool
++avr32_must_pass_in_stack (enum machine_mode mode ATTRIBUTE_UNUSED, tree type)
++{
++  if (type && AGGREGATE_TYPE_P (type)
++      /* If the alignment is less than the size then pass in the struct on
++         the stack. */
++      && ((unsigned int) TYPE_ALIGN_UNIT (type) <
++	  (unsigned int) int_size_in_bytes (type))
++      /* If we support unaligned word accesses then structs of size 4 and 8
++         can have any alignment and still be passed in registers. */
++      && !(TARGET_UNALIGNED_WORD
++	   && (int_size_in_bytes (type) == 4
++	       || int_size_in_bytes (type) == 8))
++      /* Double word structs need only a word alignment. */
++      && !(int_size_in_bytes (type) == 8 && TYPE_ALIGN_UNIT (type) >= 4))
++    return true;
++
++  if (type && AGGREGATE_TYPE_P (type)
++      /* Structs of size 3,5,6,7 are always passed in registers. */
++      && (int_size_in_bytes (type) == 3
++	  || int_size_in_bytes (type) == 5
++	  || int_size_in_bytes (type) == 6 || int_size_in_bytes (type) == 7))
++    return true;
++
++
++  return (type && TREE_ADDRESSABLE (type));
++}
++
++
++bool
++avr32_strict_argument_naming (CUMULATIVE_ARGS * ca ATTRIBUTE_UNUSED)
++{
++  return true;
++}
++
++
++/*
++   This target hook should return true if an argument at the position indicated
++   by cum should be passed by reference. This predicate is queried after target
++   independent reasons for being passed by reference, such as TREE_ADDRESSABLE (type).
++
++   If the hook returns true, a copy of that argument is made in memory and a
++   pointer to the argument is passed instead of the argument itself. The pointer
++   is passed in whatever way is appropriate for passing a pointer to that type.
++*/
++bool
++avr32_pass_by_reference (CUMULATIVE_ARGS * cum ATTRIBUTE_UNUSED,
++			 enum machine_mode mode ATTRIBUTE_UNUSED,
++			 tree type, bool named ATTRIBUTE_UNUSED)
++{
++  return (type && (TREE_CODE (TYPE_SIZE (type)) != INTEGER_CST));
++}
++
++
++static int
++avr32_arg_partial_bytes (CUMULATIVE_ARGS * pcum ATTRIBUTE_UNUSED,
++			 enum machine_mode mode ATTRIBUTE_UNUSED,
++			 tree type ATTRIBUTE_UNUSED,
++			 bool named ATTRIBUTE_UNUSED)
++{
++  return 0;
++}
++
++
++struct gcc_target targetm = TARGET_INITIALIZER;
++
++/*
++  Table used to convert from register number in the assembler instructions and
++  the register numbers used in gcc.
++*/
++const int avr32_function_arg_reglist[] = {
++  INTERNAL_REGNUM (12),
++  INTERNAL_REGNUM (11),
++  INTERNAL_REGNUM (10),
++  INTERNAL_REGNUM (9),
++  INTERNAL_REGNUM (8)
++};
++
++
++rtx avr32_compare_op0 = NULL_RTX;
++rtx avr32_compare_op1 = NULL_RTX;
++rtx avr32_compare_operator = NULL_RTX;
++rtx avr32_acc_cache = NULL_RTX;
++/* type of branch to use */
++enum avr32_cmp_type avr32_branch_type;
++
++
++/*
++  Returns nonzero if it is allowed to store a value of mode mode in hard
++  register number regno.
++*/
++int
++avr32_hard_regno_mode_ok (int regnr, enum machine_mode mode)
++{
++  switch (mode)
++    {
++      case DImode:		/* long long */
++      case DFmode:		/* double */
++      case SCmode:		/* __complex__ float */
++      case CSImode:		/* __complex__ int */
++        if (regnr < 4)
++	  {		/* long long int not supported in r12, sp, lr or pc. */
++	    return 0;
++	  }
++        else
++	  {
++	    /* long long int has to be referred in even registers. */
++            if (regnr % 2)
++	      return 0;
++	    else
++	      return 1;
++	  }
++      case CDImode:		/* __complex__ long long */
++      case DCmode:		/* __complex__ double */
++      case TImode:		/* 16 bytes */
++        if (regnr < 7)
++	  return 0;
++        else if (regnr % 2)
++	  return 0;
++        else
++	  return 1;
++      default:
++        return 1;
++    }
++}
++
++
++int
++avr32_rnd_operands (rtx add, rtx shift)
++{
++  if (GET_CODE (shift) == CONST_INT &&
++      GET_CODE (add) == CONST_INT && INTVAL (shift) > 0)
++    {
++      if ((1 << (INTVAL (shift) - 1)) == INTVAL (add))
++	return TRUE;
++    }
++
++  return FALSE;
++}
++
++
++int
++avr32_const_ok_for_constraint_p (HOST_WIDE_INT value, char c, const char *str)
++{
++  switch (c)
++    {
++    case 'K':
++    case 'I':
++      {
++	HOST_WIDE_INT min_value = 0, max_value = 0;
++	char size_str[3];
++	int const_size;
++
++	size_str[0] = str[2];
++	size_str[1] = str[3];
++	size_str[2] = '\0';
++	const_size = atoi (size_str);
++
++	if (TOUPPER (str[1]) == 'U')
++	  {
++	    min_value = 0;
++	    max_value = (1 << const_size) - 1;
++	  }
++	else if (TOUPPER (str[1]) == 'S')
++	  {
++	    min_value = -(1 << (const_size - 1));
++	    max_value = (1 << (const_size - 1)) - 1;
++	  }
++
++	if (c == 'I')
++	  {
++	    value = -value;
++	  }
++
++	if (value >= min_value && value <= max_value)
++	  {
++	    return 1;
++	  }
++	break;
++      }
++    case 'M':
++      return avr32_mask_upper_bits_operand (GEN_INT (value), VOIDmode);
++    case 'J':
++      return avr32_hi16_immediate_operand (GEN_INT (value), VOIDmode);
++    case 'O':
++      return one_bit_set_operand (GEN_INT (value), VOIDmode);
++    case 'N':
++      return one_bit_cleared_operand (GEN_INT (value), VOIDmode);
++    case 'L':
++      /* The lower 16-bits are set. */
++      return ((value & 0xffff) == 0xffff) ;
++    }
++
++  return 0;
++}
++
++
++/* Compute mask of registers which needs saving upon function entry. */
++static unsigned long
++avr32_compute_save_reg_mask (int push)
++{
++  unsigned long func_type;
++  unsigned int save_reg_mask = 0;
++  unsigned int reg;
++
++  func_type = avr32_current_func_type ();
++
++  if (IS_INTERRUPT (func_type))
++    {
++      unsigned int max_reg = 12;
++
++      /* Get the banking scheme for the interrupt */
++      switch (func_type)
++	{
++	case AVR32_FT_ISR_FULL:
++	  max_reg = 0;
++	  break;
++	case AVR32_FT_ISR_HALF:
++	  max_reg = 7;
++	  break;
++	case AVR32_FT_ISR_NONE:
++	  max_reg = 12;
++	  break;
++	}
++
++      /* Interrupt functions must not corrupt any registers, even call
++         clobbered ones.  If this is a leaf function we can just examine the
++         registers used by the RTL, but otherwise we have to assume that
++         whatever function is called might clobber anything, and so we have
++         to save all the call-clobbered registers as well.  */
++
++      /* Need not push the registers r8-r12 for AVR32A architectures, as this
++         is automatially done in hardware. We also do not have any shadow
++         registers. */
++      if (TARGET_UARCH_AVR32A)
++	{
++	  max_reg = 7;
++	  func_type = AVR32_FT_ISR_NONE;
++	}
++
++      /* All registers which are used and are not shadowed must be saved. */
++      for (reg = 0; reg <= max_reg; reg++)
++	if (df_regs_ever_live_p (INTERNAL_REGNUM (reg))
++	    || (!current_function_is_leaf
++		&& call_used_regs[INTERNAL_REGNUM (reg)]))
++	  save_reg_mask |= (1 << reg);
++
++      /* Check LR */
++      if ((df_regs_ever_live_p (LR_REGNUM)
++	   || !current_function_is_leaf || frame_pointer_needed)
++	  /* Only non-shadowed register models */
++	  && (func_type == AVR32_FT_ISR_NONE))
++	save_reg_mask |= (1 << ASM_REGNUM (LR_REGNUM));
++
++      /* Make sure that the GOT register is pushed. */
++      if (max_reg >= ASM_REGNUM (PIC_OFFSET_TABLE_REGNUM)
++	  && crtl->uses_pic_offset_table)
++	save_reg_mask |= (1 << ASM_REGNUM (PIC_OFFSET_TABLE_REGNUM));
++
++    }
++  else
++    {
++      int use_pushm = optimize_size;
++
++      /* In the normal case we only need to save those registers which are
++         call saved and which are used by this function.  */
++      for (reg = 0; reg <= 7; reg++)
++	if (df_regs_ever_live_p (INTERNAL_REGNUM (reg))
++	    && !call_used_regs[INTERNAL_REGNUM (reg)])
++	  save_reg_mask |= (1 << reg);
++
++      /* Make sure that the GOT register is pushed. */
++      if (crtl->uses_pic_offset_table)
++	save_reg_mask |= (1 << ASM_REGNUM (PIC_OFFSET_TABLE_REGNUM));
++
++
++      /* If we optimize for size and do not have anonymous arguments: use
++         pushm/popm always. */
++      if (use_pushm)
++	{
++	  if ((save_reg_mask & (1 << 0))
++	      || (save_reg_mask & (1 << 1))
++	      || (save_reg_mask & (1 << 2)) || (save_reg_mask & (1 << 3)))
++	    save_reg_mask |= 0xf;
++
++	  if ((save_reg_mask & (1 << 4))
++	      || (save_reg_mask & (1 << 5))
++	      || (save_reg_mask & (1 << 6)) || (save_reg_mask & (1 << 7)))
++	    save_reg_mask |= 0xf0;
++
++	  if ((save_reg_mask & (1 << 8)) || (save_reg_mask & (1 << 9)))
++	    save_reg_mask |= 0x300;
++	}
++
++
++        /* Check LR */
++        if ((df_regs_ever_live_p (LR_REGNUM)
++        || !current_function_is_leaf
++        || (optimize_size
++        && save_reg_mask
++        && !crtl->calls_eh_return)
++          || frame_pointer_needed)
++          && !IS_FLASHVAULT (func_type))
++	{
++	  if (push
++	      /* Never pop LR into PC for functions which
++	         calls __builtin_eh_return, since we need to
++	         fix the SP after the restoring of the registers
++	         and before returning. */
++	      || crtl->calls_eh_return)
++	    {
++	      /* Push/Pop LR */
++	      save_reg_mask |= (1 << ASM_REGNUM (LR_REGNUM));
++	    }
++	  else
++	    {
++	      /* Pop PC */
++	      save_reg_mask |= (1 << ASM_REGNUM (PC_REGNUM));
++	    }
++	}
++    }
++
++
++  /* Save registers so the exception handler can modify them.  */
++  if (crtl->calls_eh_return)
++    {
++      unsigned int i;
++
++      for (i = 0;; i++)
++	{
++	  reg = EH_RETURN_DATA_REGNO (i);
++	  if (reg == INVALID_REGNUM)
++	    break;
++	  save_reg_mask |= 1 << ASM_REGNUM (reg);
++	}
++    }
++
++  return save_reg_mask;
++}
++
++
++/* Compute total size in bytes of all saved registers. */
++static int
++avr32_get_reg_mask_size (int reg_mask)
++{
++  int reg, size;
++  size = 0;
++
++  for (reg = 0; reg <= 15; reg++)
++    if (reg_mask & (1 << reg))
++      size += 4;
++
++  return size;
++}
++
++
++/* Get a register from one of the registers which are saved onto the stack
++  upon function entry. */
++static int
++avr32_get_saved_reg (int save_reg_mask)
++{
++  unsigned int reg;
++
++  /* Find the first register which is saved in the saved_reg_mask */
++  for (reg = 0; reg <= 15; reg++)
++    if (save_reg_mask & (1 << reg))
++      return reg;
++
++  return -1;
++}
++
++
++/* Return 1 if it is possible to return using a single instruction. */
++int
++avr32_use_return_insn (int iscond)
++{
++  unsigned int func_type = avr32_current_func_type ();
++  unsigned long saved_int_regs;
++
++  /* Never use a return instruction before reload has run. */
++  if (!reload_completed)
++    return 0;
++
++  /* Must adjust the stack for vararg functions. */
++  if (crtl->args.info.uses_anonymous_args)
++    return 0;
++
++  /* If there a stack adjstment.  */
++  if (get_frame_size ())
++    return 0;
++
++  saved_int_regs = avr32_compute_save_reg_mask (TRUE);
++
++  /* Conditional returns can not be performed in one instruction if we need
++     to restore registers from the stack */
++  if (iscond && saved_int_regs)
++    return 0;
++
++  /* Conditional return can not be used for interrupt handlers. */
++  if (iscond && IS_INTERRUPT (func_type))
++    return 0;
++
++  /* For interrupt handlers which needs to pop registers */
++  if (saved_int_regs && IS_INTERRUPT (func_type))
++    return 0;
++
++
++  /* If there are saved registers but the LR isn't saved, then we need two
++     instructions for the return.  */
++  if (saved_int_regs && !(saved_int_regs & (1 << ASM_REGNUM (LR_REGNUM))))
++    return 0;
++
++
++  return 1;
++}
++
++
++/* Generate some function prologue info in the assembly file. */
++void
++avr32_target_asm_function_prologue (FILE * f, HOST_WIDE_INT frame_size)
++{
++  unsigned long func_type = avr32_current_func_type ();
++
++  if (IS_NAKED (func_type))
++    fprintf (f,
++      "\t# Function is naked: Prologue and epilogue provided by programmer\n");
++
++  if (IS_FLASHVAULT (func_type))
++  {
++    fprintf(f, 
++      "\t.ident \"flashvault\"\n\t# Function is defined with flashvault attribute.\n");
++  }
++
++  if (IS_FLASHVAULT_IMPL (func_type))
++  {
++    fprintf(f, 
++      "\t.ident \"flashvault\"\n\t# Function is defined with flashvault_impl attribute.\n");
++
++    /* Save information on flashvault function declaration. */
++    tree fv_attribute = lookup_attribute ("flashvault_impl", DECL_ATTRIBUTES(current_function_decl));
++    if (fv_attribute != NULL_TREE)
++      {
++        tree vector_tree = TREE_VALUE(fv_attribute);
++        if (vector_tree != NULL_TREE)
++          {
++            unsigned int vector_num;
++            const char * name;
++
++            vector_num = (unsigned int) TREE_INT_CST_LOW (TREE_VALUE (vector_tree));
++
++            name = XSTR  (XEXP (DECL_RTL (current_function_decl), 0), 0);
++
++            flashvault_decl_list_add (vector_num, name);
++          }
++      }
++  }
++
++  if (IS_INTERRUPT (func_type))
++    {
++      switch (func_type)
++        {
++          case AVR32_FT_ISR_FULL:
++            fprintf (f,
++                     "\t# Interrupt Function: Fully shadowed register file\n");
++            break;
++          case AVR32_FT_ISR_HALF:
++            fprintf (f,
++                     "\t# Interrupt Function: Half shadowed register file\n");
++            break;
++          default:
++          case AVR32_FT_ISR_NONE:
++            fprintf (f, "\t# Interrupt Function: No shadowed register file\n");
++            break;
++        }
++    }
++
++
++  fprintf (f, "\t# args = %i, frame = %li, pretend = %i\n",
++           crtl->args.size, frame_size,
++           crtl->args.pretend_args_size);
++
++  fprintf (f, "\t# frame_needed = %i, leaf_function = %i\n",
++           frame_pointer_needed, current_function_is_leaf);
++
++  fprintf (f, "\t# uses_anonymous_args = %i\n",
++           crtl->args.info.uses_anonymous_args);
++
++  if (crtl->calls_eh_return)
++    fprintf (f, "\t# Calls __builtin_eh_return.\n");
++
++}
++
++
++/* Generate and emit an insn that we will recognize as a pushm or stm.
++   Unfortunately, since this insn does not reflect very well the actual
++   semantics of the operation, we need to annotate the insn for the benefit
++   of DWARF2 frame unwind information.  */
++
++int avr32_convert_to_reglist16 (int reglist8_vect);
++
++static rtx
++emit_multi_reg_push (int reglist, int usePUSHM)
++{
++  rtx insn;
++  rtx dwarf;
++  rtx tmp;
++  rtx reg;
++  int i;
++  int nr_regs;
++  int index = 0;
++
++  if (usePUSHM)
++    {
++      insn = emit_insn (gen_pushm (gen_rtx_CONST_INT (SImode, reglist)));
++      reglist = avr32_convert_to_reglist16 (reglist);
++    }
++  else
++    {
++      insn = emit_insn (gen_stm (stack_pointer_rtx,
++				 gen_rtx_CONST_INT (SImode, reglist),
++				 gen_rtx_CONST_INT (SImode, 1)));
++    }
++
++  nr_regs = avr32_get_reg_mask_size (reglist) / 4;
++  dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (nr_regs + 1));
++
++  for (i = 15; i >= 0; i--)
++    {
++      if (reglist & (1 << i))
++	{
++	  reg = gen_rtx_REG (SImode, INTERNAL_REGNUM (i));
++	  tmp = gen_rtx_SET (VOIDmode,
++			     gen_rtx_MEM (SImode,
++					  plus_constant (stack_pointer_rtx,
++							 4 * index)), reg);
++	  RTX_FRAME_RELATED_P (tmp) = 1;
++	  XVECEXP (dwarf, 0, 1 + index++) = tmp;
++	}
++    }
++
++  tmp = gen_rtx_SET (SImode,
++		     stack_pointer_rtx,
++		     gen_rtx_PLUS (SImode,
++				   stack_pointer_rtx,
++				   GEN_INT (-4 * nr_regs)));
++  RTX_FRAME_RELATED_P (tmp) = 1;
++  XVECEXP (dwarf, 0, 0) = tmp;
++  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR, dwarf,
++					REG_NOTES (insn));
++  return insn;
++}
++
++rtx
++avr32_gen_load_multiple (rtx * regs, int count, rtx from,
++			 int write_back, int in_struct_p, int scalar_p)
++{
++
++  rtx result;
++  int i = 0, j;
++
++  result =
++    gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count + (write_back ? 1 : 0)));
++
++  if (write_back)
++    {
++      XVECEXP (result, 0, 0)
++	= gen_rtx_SET (GET_MODE (from), from,
++		       plus_constant (from, count * 4));
++      i = 1;
++      count++;
++    }
++
++
++  for (j = 0; i < count; i++, j++)
++    {
++      rtx unspec;
++      rtx mem = gen_rtx_MEM (SImode, plus_constant (from, j * 4));
++      MEM_IN_STRUCT_P (mem) = in_struct_p;
++      MEM_SCALAR_P (mem) = scalar_p;
++      unspec = gen_rtx_UNSPEC (VOIDmode, gen_rtvec (1, mem), UNSPEC_LDM);
++      XVECEXP (result, 0, i) = gen_rtx_SET (VOIDmode, regs[j], unspec);
++    }
++
++  return result;
++}
++
++
++rtx
++avr32_gen_store_multiple (rtx * regs, int count, rtx to,
++			  int in_struct_p, int scalar_p)
++{
++  rtx result;
++  int i = 0, j;
++
++  result = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count));
++
++  for (j = 0; i < count; i++, j++)
++    {
++      rtx mem = gen_rtx_MEM (SImode, plus_constant (to, j * 4));
++      MEM_IN_STRUCT_P (mem) = in_struct_p;
++      MEM_SCALAR_P (mem) = scalar_p;
++      XVECEXP (result, 0, i)
++	= gen_rtx_SET (VOIDmode, mem,
++		       gen_rtx_UNSPEC (VOIDmode,
++				       gen_rtvec (1, regs[j]),
++				       UNSPEC_STORE_MULTIPLE));
++    }
++
++  return result;
++}
++
++
++/* Move a block of memory if it is word aligned or we support unaligned
++   word memory accesses. The size must be maximum 64 bytes. */
++int
++avr32_gen_movmemsi (rtx * operands)
++{
++  HOST_WIDE_INT bytes_to_go;
++  rtx src, dst;
++  rtx st_src, st_dst;
++  int src_offset = 0, dst_offset = 0;
++  int block_size;
++  int dst_in_struct_p, src_in_struct_p;
++  int dst_scalar_p, src_scalar_p;
++  int unaligned;
++
++  if (GET_CODE (operands[2]) != CONST_INT
++      || GET_CODE (operands[3]) != CONST_INT
++      || INTVAL (operands[2]) > 64
++      || ((INTVAL (operands[3]) & 3) && !TARGET_UNALIGNED_WORD))
++    return 0;
++
++  unaligned = (INTVAL (operands[3]) & 3) != 0;
++
++  block_size = 4;
++
++  st_dst = XEXP (operands[0], 0);
++  st_src = XEXP (operands[1], 0);
++
++  dst_in_struct_p = MEM_IN_STRUCT_P (operands[0]);
++  dst_scalar_p = MEM_SCALAR_P (operands[0]);
++  src_in_struct_p = MEM_IN_STRUCT_P (operands[1]);
++  src_scalar_p = MEM_SCALAR_P (operands[1]);
++
++  dst = copy_to_mode_reg (SImode, st_dst);
++  src = copy_to_mode_reg (SImode, st_src);
++
++  bytes_to_go = INTVAL (operands[2]);
++
++  while (bytes_to_go)
++    {
++      enum machine_mode move_mode;
++      /* (Seems to be a problem with reloads for the movti pattern so this is
++         disabled until that problem is resolved)
++         UPDATE: Problem seems to be solved now.... */
++      if (bytes_to_go >= GET_MODE_SIZE (TImode) && !unaligned
++	  /* Do not emit ldm/stm for UC3 as ld.d/st.d is more optimal. */
++	  && !TARGET_ARCH_UC)
++	move_mode = TImode;
++      else if ((bytes_to_go >= GET_MODE_SIZE (DImode)) && !unaligned)
++	move_mode = DImode;
++      else if (bytes_to_go >= GET_MODE_SIZE (SImode))
++	move_mode = SImode;
++      else
++	move_mode = QImode;
++
++      {
++        rtx src_mem;
++	rtx dst_mem = gen_rtx_MEM (move_mode,
++				   gen_rtx_PLUS (SImode, dst,
++						 GEN_INT (dst_offset)));
++        dst_offset += GET_MODE_SIZE (move_mode);
++        if ( 0 /* This causes an error in GCC. Think there is
++                  something wrong in the gcse pass which causes REQ_EQUIV notes
++                  to be wrong so disabling it for now. */
++             && move_mode == TImode
++             && INTVAL (operands[2]) > GET_MODE_SIZE (TImode) )
++          {
++            src_mem = gen_rtx_MEM (move_mode,
++				   gen_rtx_POST_INC (SImode, src));
++          }
++        else
++          {
++            src_mem = gen_rtx_MEM (move_mode,
++				   gen_rtx_PLUS (SImode, src,
++						 GEN_INT (src_offset)));
++            src_offset += GET_MODE_SIZE (move_mode);
++          }
++
++	bytes_to_go -= GET_MODE_SIZE (move_mode);
++
++	MEM_IN_STRUCT_P (dst_mem) = dst_in_struct_p;
++	MEM_SCALAR_P (dst_mem) = dst_scalar_p;
++
++	MEM_IN_STRUCT_P (src_mem) = src_in_struct_p;
++	MEM_SCALAR_P (src_mem) = src_scalar_p;
++	emit_move_insn (dst_mem, src_mem);
++
++      }
++    }
++
++  return 1;
++}
++
++
++/* Expand the prologue instruction. */
++void
++avr32_expand_prologue (void)
++{
++  rtx insn, dwarf;
++  unsigned long saved_reg_mask;
++  int reglist8 = 0;
++
++  /* Naked functions do not have a prologue. */
++  if (IS_NAKED (avr32_current_func_type ()))
++    return;
++
++  saved_reg_mask = avr32_compute_save_reg_mask (TRUE);
++
++  if (saved_reg_mask)
++    {
++      /* Must push used registers. */
++
++      /* Should we use POPM or LDM? */
++      int usePUSHM = TRUE;
++      reglist8 = 0;
++      if (((saved_reg_mask & (1 << 0)) ||
++	   (saved_reg_mask & (1 << 1)) ||
++	   (saved_reg_mask & (1 << 2)) || (saved_reg_mask & (1 << 3))))
++	{
++	  /* One of R0-R3 should at least be pushed. */
++	  if (((saved_reg_mask & (1 << 0)) &&
++	       (saved_reg_mask & (1 << 1)) &&
++	       (saved_reg_mask & (1 << 2)) && (saved_reg_mask & (1 << 3))))
++	    {
++	      /* All should be pushed. */
++	      reglist8 |= 0x01;
++	    }
++	  else
++	    {
++	      usePUSHM = FALSE;
++	    }
++	}
++
++      if (((saved_reg_mask & (1 << 4)) ||
++	   (saved_reg_mask & (1 << 5)) ||
++	   (saved_reg_mask & (1 << 6)) || (saved_reg_mask & (1 << 7))))
++	{
++	  /* One of R4-R7 should at least be pushed */
++	  if (((saved_reg_mask & (1 << 4)) &&
++	       (saved_reg_mask & (1 << 5)) &&
++	       (saved_reg_mask & (1 << 6)) && (saved_reg_mask & (1 << 7))))
++	    {
++	      if (usePUSHM)
++		/* All should be pushed */
++		reglist8 |= 0x02;
++	    }
++	  else
++	    {
++	      usePUSHM = FALSE;
++	    }
++	}
++
++      if (((saved_reg_mask & (1 << 8)) || (saved_reg_mask & (1 << 9))))
++	{
++	  /* One of R8-R9 should at least be pushed. */
++	  if (((saved_reg_mask & (1 << 8)) && (saved_reg_mask & (1 << 9))))
++	    {
++	      if (usePUSHM)
++		/* All should be pushed. */
++		reglist8 |= 0x04;
++	    }
++	  else
++	    {
++	      usePUSHM = FALSE;
++	    }
++	}
++
++      if (saved_reg_mask & (1 << 10))
++	reglist8 |= 0x08;
++
++      if (saved_reg_mask & (1 << 11))
++	reglist8 |= 0x10;
++
++      if (saved_reg_mask & (1 << 12))
++	reglist8 |= 0x20;
++
++      if ((saved_reg_mask & (1 << ASM_REGNUM (LR_REGNUM)))
++           && !IS_FLASHVAULT (avr32_current_func_type ()))
++	{
++	  /* Push LR */
++	  reglist8 |= 0x40;
++	}
++
++      if (usePUSHM)
++	{
++	  insn = emit_multi_reg_push (reglist8, TRUE);
++	}
++      else
++	{
++	  insn = emit_multi_reg_push (saved_reg_mask, FALSE);
++	}
++      RTX_FRAME_RELATED_P (insn) = 1;
++
++      /* Prevent this instruction from being scheduled after any other
++         instructions.  */
++      emit_insn (gen_blockage ());
++    }
++
++  /* Set frame pointer */
++  if (frame_pointer_needed)
++    {
++      insn = emit_move_insn (frame_pointer_rtx, stack_pointer_rtx);
++      RTX_FRAME_RELATED_P (insn) = 1;
++    }
++
++  if (get_frame_size () > 0)
++    {
++      if (avr32_const_ok_for_constraint_p (get_frame_size (), 'K', "Ks21"))
++	{
++	  insn = emit_insn (gen_rtx_SET (SImode,
++					 stack_pointer_rtx,
++					 gen_rtx_PLUS (SImode,
++						       stack_pointer_rtx,
++						       gen_rtx_CONST_INT
++						       (SImode,
++							-get_frame_size
++							()))));
++	  RTX_FRAME_RELATED_P (insn) = 1;
++	}
++      else
++	{
++	  /* Immediate is larger than k21 We must either check if we can use
++	     one of the pushed reegisters as temporary storage or we must
++	     make us a temp register by pushing a register to the stack. */
++	  rtx temp_reg, const_pool_entry, insn;
++	  if (saved_reg_mask)
++	    {
++	      temp_reg =
++		gen_rtx_REG (SImode,
++			     INTERNAL_REGNUM (avr32_get_saved_reg
++					      (saved_reg_mask)));
++	    }
++	  else
++	    {
++	      temp_reg = gen_rtx_REG (SImode, INTERNAL_REGNUM (7));
++	      emit_move_insn (gen_rtx_MEM
++			      (SImode,
++			       gen_rtx_PRE_DEC (SImode, stack_pointer_rtx)),
++			      temp_reg);
++	    }
++
++	  const_pool_entry =
++	    force_const_mem (SImode,
++			     gen_rtx_CONST_INT (SImode, get_frame_size ()));
++	  emit_move_insn (temp_reg, const_pool_entry);
++
++	  insn = emit_insn (gen_rtx_SET (SImode,
++					 stack_pointer_rtx,
++					 gen_rtx_MINUS (SImode,
++							stack_pointer_rtx,
++							temp_reg)));
++
++	  dwarf = gen_rtx_SET (VOIDmode, stack_pointer_rtx,
++			       gen_rtx_PLUS (SImode, stack_pointer_rtx,
++					     GEN_INT (-get_frame_size ())));
++	  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR,
++						dwarf, REG_NOTES (insn));
++	  RTX_FRAME_RELATED_P (insn) = 1;
++
++	  if (!saved_reg_mask)
++	    {
++	      insn =
++		emit_move_insn (temp_reg,
++				gen_rtx_MEM (SImode,
++					     gen_rtx_POST_INC (SImode,
++							       gen_rtx_REG
++							       (SImode,
++								13))));
++	    }
++
++	  /* Mark the temp register as dead */
++	  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, temp_reg,
++						REG_NOTES (insn));
++
++
++	}
++
++      /* Prevent the the stack adjustment to be scheduled after any
++         instructions using the frame pointer.  */
++      emit_insn (gen_blockage ());
++    }
++
++  /* Load GOT */
++  if (flag_pic)
++    {
++      avr32_load_pic_register ();
++
++      /* gcc does not know that load or call instructions might use the pic
++         register so it might schedule these instructions before the loading
++         of the pic register. To avoid this emit a barrier for now. TODO!
++         Find out a better way to let gcc know which instructions might use
++         the pic register. */
++      emit_insn (gen_blockage ());
++    }
++  return;
++}
++
++
++void
++avr32_set_return_address (rtx source, rtx scratch)
++{
++  rtx addr;
++  unsigned long saved_regs;
++
++  saved_regs = avr32_compute_save_reg_mask (TRUE);
++
++  if (!(saved_regs & (1 << ASM_REGNUM (LR_REGNUM))))
++    emit_move_insn (gen_rtx_REG (Pmode, LR_REGNUM), source);
++  else
++    {
++      if (frame_pointer_needed)
++	addr = gen_rtx_REG (Pmode, FRAME_POINTER_REGNUM);
++      else
++	if (avr32_const_ok_for_constraint_p (get_frame_size (), 'K', "Ks16"))
++	{
++	  addr = plus_constant (stack_pointer_rtx, get_frame_size ());
++	}
++      else
++	{
++	  emit_insn (gen_movsi (scratch, GEN_INT (get_frame_size ())));
++	  addr = scratch;
++	}
++      emit_move_insn (gen_rtx_MEM (Pmode, addr), source);
++    }
++}
++
++
++/* Return the length of INSN.  LENGTH is the initial length computed by
++   attributes in the machine-description file.  */
++int
++avr32_adjust_insn_length (rtx insn ATTRIBUTE_UNUSED,
++			  int length ATTRIBUTE_UNUSED)
++{
++  return length;
++}
++
++
++void
++avr32_output_return_instruction (int single_ret_inst ATTRIBUTE_UNUSED,
++				 int iscond ATTRIBUTE_UNUSED,
++				 rtx cond ATTRIBUTE_UNUSED, rtx r12_imm)
++{
++
++  unsigned long saved_reg_mask;
++  int insert_ret = TRUE;
++  int reglist8 = 0;
++  int stack_adjustment = get_frame_size ();
++  unsigned int func_type = avr32_current_func_type ();
++  FILE *f = asm_out_file;
++
++  /* Naked functions does not have an epilogue */
++  if (IS_NAKED (func_type))
++    return;
++
++  saved_reg_mask = avr32_compute_save_reg_mask (FALSE);
++
++  /* Reset frame pointer */
++  if (stack_adjustment > 0)
++    {
++      if (avr32_const_ok_for_constraint_p (stack_adjustment, 'I', "Is21"))
++	{
++	  fprintf (f, "\tsub\tsp, %i # Reset Frame Pointer\n",
++		   -stack_adjustment);
++	}
++      else
++	{
++	  /* TODO! Is it safe to use r8 as scratch?? */
++	  fprintf (f, "\tmov\tr8, lo(%i) # Reset Frame Pointer\n",
++		   -stack_adjustment);
++	  fprintf (f, "\torh\tr8, hi(%i) # Reset Frame Pointer\n",
++		   -stack_adjustment);
++	  fprintf (f, "\tadd\tsp, r8  # Reset Frame Pointer\n");
++	}
++    }
++
++  if (saved_reg_mask)
++    {
++      /* Must pop used registers */
++
++      /* Should we use POPM or LDM? */
++      int usePOPM = TRUE;
++      if (((saved_reg_mask & (1 << 0)) ||
++	   (saved_reg_mask & (1 << 1)) ||
++	   (saved_reg_mask & (1 << 2)) || (saved_reg_mask & (1 << 3))))
++	{
++	  /* One of R0-R3 should at least be popped */
++	  if (((saved_reg_mask & (1 << 0)) &&
++	       (saved_reg_mask & (1 << 1)) &&
++	       (saved_reg_mask & (1 << 2)) && (saved_reg_mask & (1 << 3))))
++	    {
++	      /* All should be popped */
++	      reglist8 |= 0x01;
++	    }
++	  else
++	    {
++	      usePOPM = FALSE;
++	    }
++	}
++
++      if (((saved_reg_mask & (1 << 4)) ||
++	   (saved_reg_mask & (1 << 5)) ||
++	   (saved_reg_mask & (1 << 6)) || (saved_reg_mask & (1 << 7))))
++	{
++	  /* One of R0-R3 should at least be popped */
++	  if (((saved_reg_mask & (1 << 4)) &&
++	       (saved_reg_mask & (1 << 5)) &&
++	       (saved_reg_mask & (1 << 6)) && (saved_reg_mask & (1 << 7))))
++	    {
++	      if (usePOPM)
++		/* All should be popped */
++		reglist8 |= 0x02;
++	    }
++	  else
++	    {
++	      usePOPM = FALSE;
++	    }
++	}
++
++      if (((saved_reg_mask & (1 << 8)) || (saved_reg_mask & (1 << 9))))
++	{
++	  /* One of R8-R9 should at least be pushed */
++	  if (((saved_reg_mask & (1 << 8)) && (saved_reg_mask & (1 << 9))))
++	    {
++	      if (usePOPM)
++		/* All should be pushed */
++		reglist8 |= 0x04;
++	    }
++	  else
++	    {
++	      usePOPM = FALSE;
++	    }
++	}
++
++      if (saved_reg_mask & (1 << 10))
++	reglist8 |= 0x08;
++
++      if (saved_reg_mask & (1 << 11))
++	reglist8 |= 0x10;
++
++      if (saved_reg_mask & (1 << 12))
++	reglist8 |= 0x20;
++
++      if (saved_reg_mask & (1 << ASM_REGNUM (LR_REGNUM)))
++	/* Pop LR */
++	reglist8 |= 0x40;
++
++      if ((saved_reg_mask & (1 << ASM_REGNUM (PC_REGNUM))) 
++           && !IS_FLASHVAULT_IMPL (func_type))
++	/* Pop LR into PC. */
++	reglist8 |= 0x80;
++
++      if (usePOPM)
++	{
++	  char reglist[64];	/* 64 bytes should be enough... */
++	  avr32_make_reglist8 (reglist8, (char *) reglist);
++
++	  if (reglist8 & 0x80)
++	    /* This instruction is also a return */
++	    insert_ret = FALSE;
++
++	  if (r12_imm && !insert_ret)
++	    fprintf (f, "\tpopm\t%s, r12=%li\n", reglist, INTVAL (r12_imm));
++	  else
++	    fprintf (f, "\tpopm\t%s\n", reglist);
++
++	}
++      else
++	{
++	  char reglist[64];	/* 64 bytes should be enough... */
++	  avr32_make_reglist16 (saved_reg_mask, (char *) reglist);
++	  if (saved_reg_mask & (1 << ASM_REGNUM (PC_REGNUM)))
++	    /* This instruction is also a return */
++	    insert_ret = FALSE;
++
++	  if (r12_imm && !insert_ret)
++	    fprintf (f, "\tldm\tsp++, %s, r12=%li\n", reglist,
++		     INTVAL (r12_imm));
++	  else
++	    fprintf (f, "\tldm\tsp++, %s\n", reglist);
++
++	}
++
++    }
++
++  /* Stack adjustment for exception handler.  */
++  if (crtl->calls_eh_return)
++    fprintf (f, "\tadd\tsp, r%d\n", ASM_REGNUM (EH_RETURN_STACKADJ_REGNO));
++
++
++  if (IS_INTERRUPT (func_type))
++    {
++      fprintf (f, "\trete\n");
++    }
++  else if (IS_FLASHVAULT (func_type))
++    {
++      /* Normal return from Secure System call, increment SS_RAR before
++      returning. Use R8 as scratch. */
++      fprintf (f,
++               "\t# Normal return from sscall.\n"
++               "\t# Increment SS_RAR before returning.\n"
++               "\t# Use R8 as scratch.\n"
++               "\tmfsr\tr8,  440\n"
++               "\tsub\tr8,  -2\n"
++               "\tmtsr\t440, r8\n"
++               "\tretss\n");
++    }
++  else if (insert_ret)
++    {
++      if (r12_imm)
++	fprintf (f, "\tretal\t%li\n", INTVAL (r12_imm));
++      else
++	fprintf (f, "\tretal\tr12\n");
++    }
++}
++
++void
++avr32_make_reglist16 (int reglist16_vect, char *reglist16_string)
++{
++  int i;
++  bool first_reg = true;
++  /* Make sure reglist16_string is empty. */
++  reglist16_string[0] = '\0';
++
++  for (i = 0; i < 16; ++i)
++    {
++      if (reglist16_vect & (1 << i))
++	{
++          first_reg == true ?  first_reg = false : strcat(reglist16_string,", ");
++	  strcat (reglist16_string, reg_names[INTERNAL_REGNUM (i)]);
++	}
++    }
++}
++
++int
++avr32_convert_to_reglist16 (int reglist8_vect)
++{
++  int reglist16_vect = 0;
++  if (reglist8_vect & 0x1)
++    reglist16_vect |= 0xF;
++  if (reglist8_vect & 0x2)
++    reglist16_vect |= 0xF0;
++  if (reglist8_vect & 0x4)
++    reglist16_vect |= 0x300;
++  if (reglist8_vect & 0x8)
++    reglist16_vect |= 0x400;
++  if (reglist8_vect & 0x10)
++    reglist16_vect |= 0x800;
++  if (reglist8_vect & 0x20)
++    reglist16_vect |= 0x1000;
++  if (reglist8_vect & 0x40)
++    reglist16_vect |= 0x4000;
++  if (reglist8_vect & 0x80)
++    reglist16_vect |= 0x8000;
++
++  return reglist16_vect;
++}
++
++void
++avr32_make_reglist8 (int reglist8_vect, char *reglist8_string)
++{
++  /* Make sure reglist8_string is empty. */
++  reglist8_string[0] = '\0';
++
++  if (reglist8_vect & 0x1)
++    strcpy (reglist8_string, "r0-r3");
++  if (reglist8_vect & 0x2)
++    strlen (reglist8_string) ? strcat (reglist8_string, ", r4-r7") :
++      strcpy (reglist8_string, "r4-r7");
++  if (reglist8_vect & 0x4)
++    strlen (reglist8_string) ? strcat (reglist8_string, ", r8-r9") :
++      strcpy (reglist8_string, "r8-r9");
++  if (reglist8_vect & 0x8)
++    strlen (reglist8_string) ? strcat (reglist8_string, ", r10") :
++      strcpy (reglist8_string, "r10");
++  if (reglist8_vect & 0x10)
++    strlen (reglist8_string) ? strcat (reglist8_string, ", r11") :
++      strcpy (reglist8_string, "r11");
++  if (reglist8_vect & 0x20)
++    strlen (reglist8_string) ? strcat (reglist8_string, ", r12") :
++      strcpy (reglist8_string, "r12");
++  if (reglist8_vect & 0x40)
++    strlen (reglist8_string) ? strcat (reglist8_string, ", lr") :
++      strcpy (reglist8_string, "lr");
++  if (reglist8_vect & 0x80)
++    strlen (reglist8_string) ? strcat (reglist8_string, ", pc") :
++      strcpy (reglist8_string, "pc");
++}
++
++
++int
++avr32_eh_return_data_regno (int n)
++{
++  if (n >= 0 && n <= 3)
++    return 8 + n;
++  else
++    return INVALID_REGNUM;
++}
++
++
++/* Compute the distance from register FROM to register TO.
++   These can be the arg pointer, the frame pointer or
++   the stack pointer.
++   Typical stack layout looks like this:
++
++       old stack pointer -> |    |
++			     ----
++			    |    | \
++			    |    |   saved arguments for
++			    |    |   vararg functions
++ arg_pointer	->	    |    | /
++			      --
++			    |    | \
++			    |    |   call saved
++			    |    |   registers
++			    |    | /
++  frame ptr	 ->	--
++			    |    | \
++			    |    |   local
++			    |    |   variables
++  stack ptr -->	     |    | /
++			      --
++			    |    | \
++			    |    |   outgoing
++			    |    |   arguments
++			    |    | /
++			      --
++
++  For a given funciton some or all of these stack compomnents
++  may not be needed, giving rise to the possibility of
++  eliminating some of the registers.
++
++  The values returned by this function must reflect the behaviour
++  of avr32_expand_prologue() and avr32_compute_save_reg_mask().
++
++  The sign of the number returned reflects the direction of stack
++  growth, so the values are positive for all eliminations except
++  from the soft frame pointer to the hard frame pointer.  */
++int
++avr32_initial_elimination_offset (int from, int to)
++{
++  int i;
++  int call_saved_regs = 0;
++  unsigned long saved_reg_mask;
++  unsigned int local_vars = get_frame_size ();
++
++  saved_reg_mask = avr32_compute_save_reg_mask (TRUE);
++
++  for (i = 0; i < 16; ++i)
++    {
++      if (saved_reg_mask & (1 << i))
++	call_saved_regs += 4;
++    }
++
++  switch (from)
++    {
++    case ARG_POINTER_REGNUM:
++      switch (to)
++	{
++	case STACK_POINTER_REGNUM:
++	  return call_saved_regs + local_vars;
++	case FRAME_POINTER_REGNUM:
++	  return call_saved_regs;
++	default:
++	  abort ();
++	}
++    case FRAME_POINTER_REGNUM:
++      switch (to)
++	{
++	case STACK_POINTER_REGNUM:
++	  return local_vars;
++	default:
++	  abort ();
++	}
++    default:
++      abort ();
++    }
++}
++
++
++/*
++  Returns a rtx used when passing the next argument to a function.
++  avr32_init_cumulative_args() and avr32_function_arg_advance() sets which
++  register to use.
++*/
++rtx
++avr32_function_arg (CUMULATIVE_ARGS * cum, enum machine_mode mode,
++		    tree type, int named)
++{
++  int index = -1;
++  //unsigned long func_type = avr32_current_func_type ();
++  //int last_reg_index = (IS_FLASHVAULT(func_type) || IS_FLASHVAULT_IMPL(func_type) || cum->flashvault_func ? LAST_CUM_REG_INDEX - 1 : LAST_CUM_REG_INDEX);
++  int last_reg_index = (cum->flashvault_func ? LAST_CUM_REG_INDEX - 1 : LAST_CUM_REG_INDEX);
++
++  HOST_WIDE_INT arg_size, arg_rsize;
++  if (type)
++    {
++      arg_size = int_size_in_bytes (type);
++    }
++  else
++    {
++      arg_size = GET_MODE_SIZE (mode);
++    }
++  arg_rsize = PUSH_ROUNDING (arg_size);
++
++  /*
++     The last time this macro is called, it is called with mode == VOIDmode,
++     and its result is passed to the call or call_value pattern as operands 2
++     and 3 respectively. */
++  if (mode == VOIDmode)
++    {
++      return gen_rtx_CONST_INT (SImode, 22);	/* ToDo: fixme. */
++    }
++
++  if ((*targetm.calls.must_pass_in_stack) (mode, type) || !named)
++    {
++      return NULL_RTX;
++    }
++
++  if (arg_rsize == 8)
++    {
++      /* use r11:r10 or r9:r8. */
++      if (!(GET_USED_INDEX (cum, 1) || GET_USED_INDEX (cum, 2)))
++	index = 1;
++      else if ((last_reg_index == 4) && 
++               !(GET_USED_INDEX (cum, 3) || GET_USED_INDEX (cum, 4)))
++	index = 3;
++      else
++	index = -1;
++    }
++  else if (arg_rsize == 4)
++    {				/* Use first available register */
++      index = 0;
++      while (index <= last_reg_index && GET_USED_INDEX (cum, index))
++	index++;
++      if (index > last_reg_index)
++	index = -1;
++    }
++
++  SET_REG_INDEX (cum, index);
++
++  if (GET_REG_INDEX (cum) >= 0)
++    return gen_rtx_REG (mode, avr32_function_arg_reglist[GET_REG_INDEX (cum)]);
++
++  return NULL_RTX;
++}
++
++
++/* Set the register used for passing the first argument to a function. */
++void
++avr32_init_cumulative_args (CUMULATIVE_ARGS * cum,
++                            tree fntype ATTRIBUTE_UNUSED,
++                            rtx libname ATTRIBUTE_UNUSED,
++                            tree fndecl)
++{
++  /* Set all registers as unused. */
++  SET_INDEXES_UNUSED (cum);
++
++  /* Reset uses_anonymous_args */
++  cum->uses_anonymous_args = 0;
++
++  /* Reset size of stack pushed arguments */
++  cum->stack_pushed_args_size = 0;
++  
++  cum->flashvault_func = (fndecl && (has_attribute_p (fndecl,"flashvault") || has_attribute_p (fndecl,"flashvault_impl")));
++}
++
++
++/*
++  Set register used for passing the next argument to a function. Only the
++  Scratch Registers are used.
++
++		number  name
++		   15   r15  PC
++		   14   r14  LR
++		   13   r13 _SP_________
++     FIRST_CUM_REG 12   r12 _||_
++		   10   r11  ||
++		   11   r10 _||_  Scratch Registers
++		    8   r9   ||
++  LAST_SCRATCH_REG  9   r8  _\/_________
++		    6   r7   /\
++		    7   r6   ||
++		    4   r5   ||
++		    5   r4   ||
++		    2   r3   ||
++		    3   r2   ||
++		    0   r1   ||
++		    1   r0  _||_________
++
++*/
++void
++avr32_function_arg_advance (CUMULATIVE_ARGS * cum, enum machine_mode mode,
++			    tree type, int named ATTRIBUTE_UNUSED)
++{
++  HOST_WIDE_INT arg_size, arg_rsize;
++
++  if (type)
++    {
++      arg_size = int_size_in_bytes (type);
++    }
++  else
++    {
++      arg_size = GET_MODE_SIZE (mode);
++    }
++  arg_rsize = PUSH_ROUNDING (arg_size);
++
++  /* If the argument had to be passed in stack, no register is used. */
++  if ((*targetm.calls.must_pass_in_stack) (mode, type))
++    {
++      cum->stack_pushed_args_size += PUSH_ROUNDING (int_size_in_bytes (type));
++      return;
++    }
++
++  /* Mark the used registers as "used". */
++  if (GET_REG_INDEX (cum) >= 0)
++    {
++      SET_USED_INDEX (cum, GET_REG_INDEX (cum));
++      if (arg_rsize == 8)
++	{
++	  SET_USED_INDEX (cum, (GET_REG_INDEX (cum) + 1));
++	}
++    }
++  else
++    {
++      /* Had to use stack */
++      cum->stack_pushed_args_size += arg_rsize;
++    }
++}
++
++
++/*
++  Defines witch direction to go to find the next register to use if the
++  argument is larger then one register or for arguments shorter than an
++  int which is not promoted, such as the last part of structures with
++  size not a multiple of 4. */
++enum direction
++avr32_function_arg_padding (enum machine_mode mode ATTRIBUTE_UNUSED,
++			    tree type)
++{
++  /* Pad upward for all aggregates except byte and halfword sized aggregates
++     which can be passed in registers. */
++  if (type
++      && AGGREGATE_TYPE_P (type)
++      && (int_size_in_bytes (type) != 1)
++      && !((int_size_in_bytes (type) == 2)
++	   && TYPE_ALIGN_UNIT (type) >= 2)
++      && (int_size_in_bytes (type) & 0x3))
++    {
++      return upward;
++    }
++
++  return downward;
++}
++
++
++/* Return a rtx used for the return value from a function call. */
++rtx
++avr32_function_value (tree type, tree func, bool outgoing ATTRIBUTE_UNUSED)
++{
++  if (avr32_return_in_memory (type, func))
++    return NULL_RTX;
++
++  if (int_size_in_bytes (type) <= 4)
++    {
++      enum machine_mode mode = TYPE_MODE (type);
++      int unsignedp = 0;
++      PROMOTE_FUNCTION_MODE (mode, unsignedp, type);
++      return gen_rtx_REG (mode, RET_REGISTER);
++    }
++  else if (int_size_in_bytes (type) <= 8)
++    return gen_rtx_REG (TYPE_MODE (type), INTERNAL_REGNUM (11));
++
++  return NULL_RTX;
++}
++
++
++/* Return a rtx used for the return value from a library function call. */
++rtx
++avr32_libcall_value (enum machine_mode mode)
++{
++
++  if (GET_MODE_SIZE (mode) <= 4)
++    return gen_rtx_REG (mode, RET_REGISTER);
++  else if (GET_MODE_SIZE (mode) <= 8)
++    return gen_rtx_REG (mode, INTERNAL_REGNUM (11));
++  else
++    return NULL_RTX;
++}
++
++
++/* Return TRUE if X references a SYMBOL_REF.  */
++int
++symbol_mentioned_p (rtx x)
++{
++  const char *fmt;
++  int i;
++
++  if (GET_CODE (x) == SYMBOL_REF)
++    return 1;
++
++  fmt = GET_RTX_FORMAT (GET_CODE (x));
++
++  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
++    {
++      if (fmt[i] == 'E')
++	{
++	  int j;
++
++	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
++	    if (symbol_mentioned_p (XVECEXP (x, i, j)))
++	      return 1;
++	}
++      else if (fmt[i] == 'e' && symbol_mentioned_p (XEXP (x, i)))
++	return 1;
++    }
++
++  return 0;
++}
++
++
++/* Return TRUE if X references a LABEL_REF.  */
++int
++label_mentioned_p (rtx x)
++{
++  const char *fmt;
++  int i;
++
++  if (GET_CODE (x) == LABEL_REF)
++    return 1;
++
++  fmt = GET_RTX_FORMAT (GET_CODE (x));
++  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
++    {
++      if (fmt[i] == 'E')
++	{
++	  int j;
++
++	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
++	    if (label_mentioned_p (XVECEXP (x, i, j)))
++	      return 1;
++	}
++      else if (fmt[i] == 'e' && label_mentioned_p (XEXP (x, i)))
++	return 1;
++    }
++
++  return 0;
++}
++
++
++/* Return TRUE if X contains a MEM expression.  */
++int
++mem_mentioned_p (rtx x)
++{
++  const char *fmt;
++  int i;
++
++  if (MEM_P (x))
++    return 1;
++
++  fmt = GET_RTX_FORMAT (GET_CODE (x));
++  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
++    {
++      if (fmt[i] == 'E')
++	{
++	  int j;
++
++	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
++	    if (mem_mentioned_p (XVECEXP (x, i, j)))
++	      return 1;
++	}
++      else if (fmt[i] == 'e' && mem_mentioned_p (XEXP (x, i)))
++	return 1;
++    }
++
++  return 0;
++}
++
++
++int
++avr32_legitimate_pic_operand_p (rtx x)
++{
++
++  /* We can't have const, this must be broken down to a symbol. */
++  if (GET_CODE (x) == CONST)
++    return FALSE;
++
++  /* Can't access symbols or labels via the constant pool either */
++  if ((GET_CODE (x) == SYMBOL_REF
++       && CONSTANT_POOL_ADDRESS_P (x)
++       && (symbol_mentioned_p (get_pool_constant (x))
++	   || label_mentioned_p (get_pool_constant (x)))))
++    return FALSE;
++
++  return TRUE;
++}
++
++
++rtx
++legitimize_pic_address (rtx orig, enum machine_mode mode ATTRIBUTE_UNUSED,
++			rtx reg)
++{
++
++  if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF)
++    {
++      int subregs = 0;
++
++      if (reg == 0)
++	{
++	  if (!can_create_pseudo_p ())
++	    abort ();
++	  else
++	    reg = gen_reg_rtx (Pmode);
++
++	  subregs = 1;
++	}
++
++      emit_move_insn (reg, orig);
++
++      /* Only set current function as using pic offset table if flag_pic is
++         set. This is because this function is also used if
++         TARGET_HAS_ASM_ADDR_PSEUDOS is set. */
++      if (flag_pic)
++	crtl->uses_pic_offset_table = 1;
++
++      /* Put a REG_EQUAL note on this insn, so that it can be optimized by
++         loop.  */
++      return reg;
++    }
++  else if (GET_CODE (orig) == CONST)
++    {
++      rtx base, offset;
++
++      if (flag_pic
++	  && GET_CODE (XEXP (orig, 0)) == PLUS
++	  && XEXP (XEXP (orig, 0), 0) == pic_offset_table_rtx)
++	return orig;
++
++      if (reg == 0)
++	{
++	  if (!can_create_pseudo_p ())
++	    abort ();
++	  else
++	    reg = gen_reg_rtx (Pmode);
++	}
++
++      if (GET_CODE (XEXP (orig, 0)) == PLUS)
++	{
++	  base =
++	    legitimize_pic_address (XEXP (XEXP (orig, 0), 0), Pmode, reg);
++	  offset =
++	    legitimize_pic_address (XEXP (XEXP (orig, 0), 1), Pmode,
++				    base == reg ? 0 : reg);
++	}
++      else
++	abort ();
++
++      if (GET_CODE (offset) == CONST_INT)
++	{
++	  /* The base register doesn't really matter, we only want to test
++	     the index for the appropriate mode.  */
++	  if (!avr32_const_ok_for_constraint_p (INTVAL (offset), 'I', "Is21"))
++	    {
++	      if (can_create_pseudo_p ())
++		offset = force_reg (Pmode, offset);
++	      else
++		abort ();
++	    }
++
++	  if (GET_CODE (offset) == CONST_INT)
++	    return plus_constant (base, INTVAL (offset));
++	}
++
++      return gen_rtx_PLUS (Pmode, base, offset);
++    }
++
++  return orig;
++}
++
++
++/* Generate code to load the PIC register.  */
++void
++avr32_load_pic_register (void)
++{
++  rtx l1, pic_tmp;
++  rtx global_offset_table;
++
++  if ((crtl->uses_pic_offset_table == 0) || TARGET_NO_INIT_GOT)
++    return;
++
++  if (!flag_pic)
++    abort ();
++
++  l1 = gen_label_rtx ();
++
++  global_offset_table = gen_rtx_SYMBOL_REF (Pmode, "_GLOBAL_OFFSET_TABLE_");
++  pic_tmp =
++    gen_rtx_CONST (Pmode,
++		   gen_rtx_MINUS (SImode, gen_rtx_LABEL_REF (Pmode, l1),
++				  global_offset_table));
++  emit_insn (gen_pic_load_addr
++	     (pic_offset_table_rtx, force_const_mem (SImode, pic_tmp)));
++  emit_insn (gen_pic_compute_got_from_pc (pic_offset_table_rtx, l1));
++
++  /* Need to emit this whether or not we obey regdecls, since setjmp/longjmp
++     can cause life info to screw up.  */
++  emit_insn (gen_rtx_USE (VOIDmode, pic_offset_table_rtx));
++}
++
++
++/* This hook should return true if values of type type are returned at the most
++   significant end of a register (in other words, if they are padded at the
++   least significant end). You can assume that type is returned in a register;
++   the caller is required to check this.  Note that the register provided by
++   FUNCTION_VALUE must be able to hold the complete return value. For example,
++   if a 1-, 2- or 3-byte structure is returned at the most significant end of a
++   4-byte register, FUNCTION_VALUE should provide an SImode rtx. */
++bool
++avr32_return_in_msb (tree type ATTRIBUTE_UNUSED)
++{
++  /* if ( AGGREGATE_TYPE_P (type) ) if ((int_size_in_bytes(type) == 1) ||
++     ((int_size_in_bytes(type) == 2) && TYPE_ALIGN_UNIT(type) >= 2)) return
++     false; else return true; */
++
++  return false;
++}
++
++
++/*
++  Returns one if a certain function value is going to be returned in memory
++  and zero if it is going to be returned in a register.
++
++  BLKmode and all other modes that is larger than 64 bits are returned in
++  memory.
++*/
++bool
++avr32_return_in_memory (tree type, tree fntype ATTRIBUTE_UNUSED)
++{
++  if (TYPE_MODE (type) == VOIDmode)
++    return false;
++
++  if (int_size_in_bytes (type) > (2 * UNITS_PER_WORD)
++      || int_size_in_bytes (type) == -1)
++    {
++      return true;
++    }
++
++  /* If we have an aggregate then use the same mechanism as when checking if
++     it should be passed on the stack. */
++  if (type
++      && AGGREGATE_TYPE_P (type)
++      && (*targetm.calls.must_pass_in_stack) (TYPE_MODE (type), type))
++    return true;
++
++  return false;
++}
++
++
++/* Output the constant part of the trampoline.
++   lddpc    r0, pc[0x8:e] ; load static chain register
++   lddpc    pc, pc[0x8:e] ; jump to subrutine
++   .long    0		 ; Address to static chain,
++			 ; filled in by avr32_initialize_trampoline()
++   .long    0		 ; Address to subrutine,
++			 ; filled in by avr32_initialize_trampoline()
++*/
++void
++avr32_trampoline_template (FILE * file)
++{
++  fprintf (file, "\tlddpc    r0, pc[8]\n");
++  fprintf (file, "\tlddpc    pc, pc[8]\n");
++  /* make room for the address of the static chain. */
++  fprintf (file, "\t.long\t0\n");
++  /* make room for the address to the subrutine. */
++  fprintf (file, "\t.long\t0\n");
++}
++
++
++/* Initialize the variable parts of a trampoline. */
++void
++avr32_initialize_trampoline (rtx addr, rtx fnaddr, rtx static_chain)
++{
++  /* Store the address to the static chain. */
++  emit_move_insn (gen_rtx_MEM
++		  (SImode, plus_constant (addr, TRAMPOLINE_SIZE - 4)),
++		  static_chain);
++
++  /* Store the address to the function. */
++  emit_move_insn (gen_rtx_MEM (SImode, plus_constant (addr, TRAMPOLINE_SIZE)),
++		  fnaddr);
++
++  emit_insn (gen_cache (gen_rtx_REG (SImode, 13),
++			gen_rtx_CONST_INT (SImode,
++					   AVR32_CACHE_INVALIDATE_ICACHE)));
++}
++
++
++/* Return nonzero if X is valid as an addressing register.  */
++int
++avr32_address_register_rtx_p (rtx x, int strict_p)
++{
++  int regno;
++
++  if (!register_operand(x, GET_MODE(x)))
++    return 0;
++
++  /* If strict we require the register to be a hard register. */
++  if (strict_p
++      && !REG_P(x))
++    return 0;
++
++  regno = REGNO (x);
++
++  if (strict_p)
++    return REGNO_OK_FOR_BASE_P (regno);
++
++  return (regno <= LAST_REGNUM || regno >= FIRST_PSEUDO_REGISTER);
++}
++
++
++/* Return nonzero if INDEX is valid for an address index operand.  */
++int
++avr32_legitimate_index_p (enum machine_mode mode, rtx index, int strict_p)
++{
++  enum rtx_code code = GET_CODE (index);
++
++  if (GET_MODE_SIZE (mode) > 8)
++    return 0;
++
++  /* Standard coprocessor addressing modes.  */
++  if (code == CONST_INT)
++    {
++	return CONST_OK_FOR_CONSTRAINT_P (INTVAL (index), 'K', "Ks16");
++    }
++
++  if (avr32_address_register_rtx_p (index, strict_p))
++    return 1;
++
++  if (code == MULT)
++    {
++      rtx xiop0 = XEXP (index, 0);
++      rtx xiop1 = XEXP (index, 1);
++      return ((avr32_address_register_rtx_p (xiop0, strict_p)
++	       && power_of_two_operand (xiop1, SImode)
++	       && (INTVAL (xiop1) <= 8))
++	      || (avr32_address_register_rtx_p (xiop1, strict_p)
++		  && power_of_two_operand (xiop0, SImode)
++		  && (INTVAL (xiop0) <= 8)));
++    }
++  else if (code == ASHIFT)
++    {
++      rtx op = XEXP (index, 1);
++
++      return (avr32_address_register_rtx_p (XEXP (index, 0), strict_p)
++	      && GET_CODE (op) == CONST_INT
++	      && INTVAL (op) > 0 && INTVAL (op) <= 3);
++    }
++
++  return 0;
++}
++
++
++/*
++  Used in the GO_IF_LEGITIMATE_ADDRESS macro. Returns a nonzero value if
++  the RTX x is a legitimate memory address.
++
++  Returns NO_REGS if the address is not legatime, GENERAL_REGS or ALL_REGS
++  if it is.
++*/
++
++
++/* Forward declaration */
++int is_minipool_label (rtx label);
++
++int
++avr32_legitimate_address (enum machine_mode mode, rtx x, int strict)
++{
++
++  switch (GET_CODE (x))
++    {
++    case REG:
++      return avr32_address_register_rtx_p (x, strict);
++    case CONST_INT:
++      return ((mode==SImode) && TARGET_RMW_ADDRESSABLE_DATA
++              && CONST_OK_FOR_CONSTRAINT_P(INTVAL(x), 'K', "Ks17"));
++    case CONST:
++      {
++	rtx label = avr32_find_symbol (x);
++	if (label
++	    &&
++	    (/*
++               If we enable (const (plus (symbol_ref ...))) type constant
++               pool entries we must add support for it in the predicates and
++               in the minipool generation in avr32_reorg().
++               (CONSTANT_POOL_ADDRESS_P (label)
++               && !(flag_pic
++               && (symbol_mentioned_p (get_pool_constant (label))
++               || label_mentioned_p (get_pool_constant (label)))))
++               ||*/
++             ((GET_CODE (label) == LABEL_REF)
++              && GET_CODE (XEXP (label, 0)) == CODE_LABEL
++    		  && is_minipool_label (XEXP (label, 0)))
++              /*|| ((GET_CODE (label) == SYMBOL_REF) 
++                  && mode == SImode
++                  && SYMBOL_REF_RMW_ADDR(label))*/))
++	  {
++	    return TRUE;
++	  }
++      }
++      break;
++    case LABEL_REF:
++      if (GET_CODE (XEXP (x, 0)) == CODE_LABEL
++	  && is_minipool_label (XEXP (x, 0)))
++	{
++	  return TRUE;
++	}
++      break;
++    case SYMBOL_REF:
++      {
++	if (CONSTANT_POOL_ADDRESS_P (x)
++	    && !(flag_pic
++		 && (symbol_mentioned_p (get_pool_constant (x))
++		     || label_mentioned_p (get_pool_constant (x)))))
++	  return TRUE;
++	else if (SYMBOL_REF_RCALL_FUNCTION_P (x)
++                 || (mode == SImode
++                     && SYMBOL_REF_RMW_ADDR (x)))
++	  return TRUE;
++	break;
++      }
++    case PRE_DEC:		/* (pre_dec (...)) */
++    case POST_INC:		/* (post_inc (...)) */
++      return avr32_address_register_rtx_p (XEXP (x, 0), strict);
++    case PLUS:			/* (plus (...) (...)) */
++      {
++	rtx xop0 = XEXP (x, 0);
++	rtx xop1 = XEXP (x, 1);
++
++	return ((avr32_address_register_rtx_p (xop0, strict)
++		 && avr32_legitimate_index_p (mode, xop1, strict))
++		|| (avr32_address_register_rtx_p (xop1, strict)
++		    && avr32_legitimate_index_p (mode, xop0, strict)));
++      }
++    default:
++      break;
++    }
++
++  return FALSE;
++}
++
++
++int
++avr32_const_ok_for_move (HOST_WIDE_INT c)
++{
++  if ( TARGET_V2_INSNS )
++    return ( avr32_const_ok_for_constraint_p (c, 'K', "Ks21")
++             /* movh instruction */
++             || avr32_hi16_immediate_operand (GEN_INT(c), VOIDmode) );
++  else
++    return avr32_const_ok_for_constraint_p (c, 'K', "Ks21");
++}
++
++
++int
++avr32_const_double_immediate (rtx value)
++{
++  HOST_WIDE_INT hi, lo;
++
++  if (GET_CODE (value) != CONST_DOUBLE)
++    return FALSE;
++
++  if (SCALAR_FLOAT_MODE_P (GET_MODE (value)))
++    {
++      HOST_WIDE_INT target_float[2];
++      hi = lo = 0;
++      real_to_target (target_float, CONST_DOUBLE_REAL_VALUE (value),
++		      GET_MODE (value));
++      lo = target_float[0];
++      hi = target_float[1];
++    }
++  else
++    {
++      hi = CONST_DOUBLE_HIGH (value);
++      lo = CONST_DOUBLE_LOW (value);
++    }
++
++  if (avr32_const_ok_for_constraint_p (lo, 'K', "Ks21")
++      && (GET_MODE (value) == SFmode
++	  || avr32_const_ok_for_constraint_p (hi, 'K', "Ks21")))
++    {
++      return TRUE;
++    }
++
++  return FALSE;
++}
++
++
++int
++avr32_legitimate_constant_p (rtx x)
++{
++  switch (GET_CODE (x))
++    {
++    case CONST_INT:
++      /* Check if we should put large immediate into constant pool
++       or load them directly with mov/orh.*/
++      if (!avr32_imm_in_const_pool)
++	return 1;
++
++      return avr32_const_ok_for_move (INTVAL (x));
++    case CONST_DOUBLE:
++      /* Check if we should put large immediate into constant pool
++         or load them directly with mov/orh.*/
++      if (!avr32_imm_in_const_pool)
++	return 1;
++
++      if (GET_MODE (x) == SFmode
++	  || GET_MODE (x) == DFmode || GET_MODE (x) == DImode)
++	return avr32_const_double_immediate (x);
++      else
++	return 0;
++    case LABEL_REF:
++    case SYMBOL_REF:
++      return avr32_find_symbol (x) && (flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS);
++    case CONST:
++    case HIGH:
++    case CONST_VECTOR:
++      return 0;
++    default:
++      printf ("%s():\n", __FUNCTION__);
++      debug_rtx (x);
++      return 1;
++    }
++}
++
++
++/* Strip any special encoding from labels */
++const char *
++avr32_strip_name_encoding (const char *name)
++{
++  const char *stripped = name;
++
++  while (1)
++    {
++      switch (stripped[0])
++	{
++	case '#':
++	  stripped = strchr (name + 1, '#') + 1;
++	  break;
++	case '*':
++	  stripped = &stripped[1];
++	  break;
++	default:
++	  return stripped;
++	}
++    }
++}
++
++
++
++/* Do anything needed before RTL is emitted for each function.  */
++static struct machine_function *
++avr32_init_machine_status (void)
++{
++  struct machine_function *machine;
++  machine =
++    (machine_function *) ggc_alloc_cleared (sizeof (machine_function));
++
++#if AVR32_FT_UNKNOWN != 0
++  machine->func_type = AVR32_FT_UNKNOWN;
++#endif
++
++  machine->minipool_label_head = 0;
++  machine->minipool_label_tail = 0;
++  machine->ifcvt_after_reload = 0;
++  return machine;
++}
++
++
++void
++avr32_init_expanders (void)
++{
++  /* Arrange to initialize and mark the machine per-function status.  */
++  init_machine_status = avr32_init_machine_status;
++}
++
++
++/* Return an RTX indicating where the return address to the
++   calling function can be found.  */
++rtx
++avr32_return_addr (int count, rtx frame ATTRIBUTE_UNUSED)
++{
++  if (count != 0)
++    return NULL_RTX;
++
++  return get_hard_reg_initial_val (Pmode, LR_REGNUM);
++}
++
++
++void
++avr32_encode_section_info (tree decl, rtx rtl, int first)
++{
++   default_encode_section_info(decl, rtl, first);
++
++   if ( TREE_CODE (decl) == VAR_DECL
++        && (GET_CODE (XEXP (rtl, 0)) == SYMBOL_REF)
++        && (lookup_attribute ("rmw_addressable", DECL_ATTRIBUTES (decl))
++            || TARGET_RMW_ADDRESSABLE_DATA) ){
++     if ( !TARGET_RMW || flag_pic )
++       return;
++     //  {
++     //    warning ("Using RMW addressable data with an arch that does not support RMW instructions.");
++     //    return;
++     //  } 
++     //
++     //if ( flag_pic )
++     //  {
++     //    warning ("Using RMW addressable data with together with -fpic switch. Can not use RMW instruction when compiling with -fpic.");
++     //    return;
++     //  } 
++     SYMBOL_REF_FLAGS (XEXP (rtl, 0)) |= (1 << SYMBOL_FLAG_RMW_ADDR_SHIFT);
++  }
++}
++
++
++void
++avr32_asm_output_label (FILE * stream, const char *name)
++{
++  name = avr32_strip_name_encoding (name);
++
++  /* Print the label. */
++  assemble_name (stream, name);
++  fprintf (stream, ":\n");
++}
++
++
++void
++avr32_asm_weaken_label (FILE * stream, const char *name)
++{
++  fprintf (stream, "\t.weak ");
++  assemble_name (stream, name);
++  fprintf (stream, "\n");
++}
++
++
++/*
++  Checks if a labelref is equal to a reserved word in the assembler. If it is,
++  insert a '_' before the label name.
++*/
++void
++avr32_asm_output_labelref (FILE * stream, const char *name)
++{
++  int verbatim = FALSE;
++  const char *stripped = name;
++  int strip_finished = FALSE;
++
++  while (!strip_finished)
++    {
++      switch (stripped[0])
++	{
++	case '#':
++	  stripped = strchr (name + 1, '#') + 1;
++	  break;
++	case '*':
++	  stripped = &stripped[1];
++	  verbatim = TRUE;
++	  break;
++	default:
++	  strip_finished = TRUE;
++	  break;
++	}
++    }
++
++  if (verbatim)
++    fputs (stripped, stream);
++  else
++    asm_fprintf (stream, "%U%s", stripped);
++}
++
++
++/*
++   Check if the comparison in compare_exp is redundant
++   for the condition given in next_cond given that the
++   needed flags are already set by an earlier instruction.
++   Uses cc_prev_status to check this.
++
++   Returns NULL_RTX if the compare is not redundant
++   or the new condition to use in the conditional
++   instruction if the compare is redundant.
++*/
++static rtx
++is_compare_redundant (rtx compare_exp, rtx next_cond)
++{
++  int z_flag_valid = FALSE;
++  int n_flag_valid = FALSE;
++  rtx new_cond;
++
++  if (GET_CODE (compare_exp) != COMPARE
++      && GET_CODE (compare_exp) != AND)
++    return NULL_RTX;
++
++
++  if (rtx_equal_p (cc_prev_status.mdep.value, compare_exp))
++    {
++      /* cc0 already contains the correct comparison -> delete cmp insn */
++      return next_cond;
++    }
++
++  if (GET_MODE (compare_exp) != SImode)
++    return NULL_RTX;
++
++  switch (cc_prev_status.mdep.flags)
++    {
++    case CC_SET_VNCZ:
++    case CC_SET_NCZ:
++      n_flag_valid = TRUE;
++    case CC_SET_CZ:
++    case CC_SET_Z:
++      z_flag_valid = TRUE;
++    }
++
++  if (cc_prev_status.mdep.value
++      && GET_CODE (compare_exp) == COMPARE
++      && REG_P (XEXP (compare_exp, 0))
++      && REGNO (XEXP (compare_exp, 0)) == REGNO (cc_prev_status.mdep.value)
++      && GET_CODE (XEXP (compare_exp, 1)) == CONST_INT
++      && next_cond != NULL_RTX)
++    {
++      if (INTVAL (XEXP (compare_exp, 1)) == 0
++	  && z_flag_valid
++	  && (GET_CODE (next_cond) == EQ || GET_CODE (next_cond) == NE))
++	/* We can skip comparison Z flag is already reflecting ops[0] */
++	return next_cond;
++      else if (n_flag_valid
++	       && ((INTVAL (XEXP (compare_exp, 1)) == 0
++		    && (GET_CODE (next_cond) == GE
++			|| GET_CODE (next_cond) == LT))
++		   || (INTVAL (XEXP (compare_exp, 1)) == -1
++		       && (GET_CODE (next_cond) == GT
++			   || GET_CODE (next_cond) == LE))))
++	{
++	  /* We can skip comparison N flag is already reflecting ops[0],
++	     which means that we can use the mi/pl conditions to check if
++	     ops[0] is GE or LT 0. */
++	  if ((GET_CODE (next_cond) == GE) || (GET_CODE (next_cond) == GT))
++	    new_cond =
++	      gen_rtx_UNSPEC (GET_MODE (next_cond), gen_rtvec (2, cc0_rtx, const0_rtx),
++			      UNSPEC_COND_PL);
++	  else
++	    new_cond =
++	      gen_rtx_UNSPEC (GET_MODE (next_cond), gen_rtvec (2, cc0_rtx, const0_rtx),
++			      UNSPEC_COND_MI);
++	  return new_cond;
++	}
++    }
++  return NULL_RTX;
++}
++
++
++/* Updates cc_status.  */
++void
++avr32_notice_update_cc (rtx exp, rtx insn)
++{
++  enum attr_cc attr_cc = get_attr_cc (insn);
++
++  if ( attr_cc == CC_SET_Z_IF_NOT_V2 )
++    {
++      if (TARGET_V2_INSNS)
++        attr_cc = CC_NONE;
++      else
++        attr_cc = CC_SET_Z;
++    }
++
++  switch (attr_cc)
++    {
++    case CC_CALL_SET:
++      CC_STATUS_INIT;
++      /* Check if the function call returns a value in r12 */
++      if (REG_P (recog_data.operand[0])
++	  && REGNO (recog_data.operand[0]) == RETVAL_REGNUM)
++	{
++	  cc_status.flags = 0;
++	  cc_status.mdep.value =
++	    gen_rtx_COMPARE (SImode, recog_data.operand[0], const0_rtx);
++	  cc_status.mdep.flags = CC_SET_VNCZ;
++          cc_status.mdep.cond_exec_cmp_clobbered = 0;
++
++	}
++      break;
++    case CC_COMPARE:
++      {
++        /* Check that compare will not be optimized away if so nothing should
++           be done */
++        rtx compare_exp = SET_SRC (exp);
++        /* Check if we have a tst expression. If so convert it to a
++           compare with 0. */
++        if ( REG_P (SET_SRC (exp)) )
++          compare_exp = gen_rtx_COMPARE (GET_MODE (SET_SRC (exp)),
++                                         SET_SRC (exp),
++                                         const0_rtx);
++
++        if (!next_insn_emits_cmp (insn)
++            && (is_compare_redundant (compare_exp, get_next_insn_cond (insn)) == NULL_RTX))
++          {
++
++            /* Reset the nonstandard flag */
++            CC_STATUS_INIT;
++            cc_status.flags = 0;
++            cc_status.mdep.value = compare_exp;
++            cc_status.mdep.flags = CC_SET_VNCZ;
++            cc_status.mdep.cond_exec_cmp_clobbered = 0;
++         }
++      }
++      break;
++    case CC_CMP_COND_INSN:
++      {
++	/* Conditional insn that emit the compare itself. */
++        rtx cmp;
++        rtx cmp_op0, cmp_op1;
++        rtx cond;
++        rtx dest;
++        rtx next_insn = next_nonnote_insn (insn);
++
++        if ( GET_CODE (exp) == COND_EXEC )
++          {
++            cmp_op0 = XEXP (COND_EXEC_TEST (exp), 0);
++            cmp_op1 = XEXP (COND_EXEC_TEST (exp), 1);
++            cond = COND_EXEC_TEST (exp);
++            dest = SET_DEST (COND_EXEC_CODE (exp));
++          }
++        else
++          {
++            /* If then else conditional. compare operands are in operands
++               4 and 5. */
++            cmp_op0 = recog_data.operand[4];
++            cmp_op1 = recog_data.operand[5];
++            cond = recog_data.operand[1];
++            dest = SET_DEST (exp);
++          }
++
++        if ( GET_CODE (cmp_op0) == AND )
++          cmp = cmp_op0;
++        else
++          cmp = gen_rtx_COMPARE (GET_MODE (cmp_op0),
++                                 cmp_op0,
++                                 cmp_op1);
++
++        /* Check if the conditional insns updates a register present
++           in the comparison, if so then we must reset the cc_status. */
++        if (REG_P (dest)
++            && (reg_mentioned_p (dest, cmp_op0)
++                || reg_mentioned_p (dest, cmp_op1))
++            && GET_CODE (exp) != COND_EXEC )
++          {
++            CC_STATUS_INIT;
++          }
++	else if (is_compare_redundant (cmp, cond) == NULL_RTX)
++	  {
++	    /* Reset the nonstandard flag */
++	    CC_STATUS_INIT;
++            if ( GET_CODE (cmp_op0) == AND )
++              {
++                cc_status.flags = CC_INVERTED;
++                cc_status.mdep.flags = CC_SET_Z;
++              }
++            else
++              {
++                cc_status.flags = 0;
++                cc_status.mdep.flags = CC_SET_VNCZ;
++              }
++	    cc_status.mdep.value = cmp;
++            cc_status.mdep.cond_exec_cmp_clobbered = 0;
++	  }
++
++
++        /* Check if we have a COND_EXEC insn which updates one
++           of the registers in the compare status. */
++        if (REG_P (dest)
++            && (reg_mentioned_p (dest, cmp_op0)
++                || reg_mentioned_p (dest, cmp_op1))
++            && GET_CODE (exp) == COND_EXEC )
++          cc_status.mdep.cond_exec_cmp_clobbered = 1;
++
++        if ( cc_status.mdep.cond_exec_cmp_clobbered
++             && GET_CODE (exp) == COND_EXEC
++             && next_insn != NULL
++             && INSN_P (next_insn)
++             && !(GET_CODE (PATTERN (next_insn)) == COND_EXEC
++                  && rtx_equal_p (XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 0), cmp_op0)
++                  && rtx_equal_p (XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 1), cmp_op1)
++                  && (GET_CODE (COND_EXEC_TEST (PATTERN (next_insn))) == GET_CODE (cond)
++                      || GET_CODE (COND_EXEC_TEST (PATTERN (next_insn))) == reverse_condition (GET_CODE (cond)))) )
++          {
++            /* We have a sequence of conditional insns where the compare status has been clobbered
++               since the compare no longer reflects the content of the values to compare. */
++            CC_STATUS_INIT;
++            cc_status.mdep.cond_exec_cmp_clobbered = 1;
++          }
++
++      }
++      break;
++    case CC_BLD:
++      /* Bit load is kind of like an inverted testsi, because the Z flag is
++         inverted */
++      CC_STATUS_INIT;
++      cc_status.flags = CC_INVERTED;
++      cc_status.mdep.value = SET_SRC (exp);
++      cc_status.mdep.flags = CC_SET_Z;
++      cc_status.mdep.cond_exec_cmp_clobbered = 0;
++      break;
++    case CC_NONE:
++      /* Insn does not affect CC at all. Check if the instruction updates
++         some of the register currently reflected in cc0 */
++
++      if ((GET_CODE (exp) == SET)
++	  && (cc_status.value1 || cc_status.value2 || cc_status.mdep.value)
++	  && (reg_mentioned_p (SET_DEST (exp), cc_status.value1)
++	      || reg_mentioned_p (SET_DEST (exp), cc_status.value2)
++	      || reg_mentioned_p (SET_DEST (exp), cc_status.mdep.value)))
++	{
++	  CC_STATUS_INIT;
++	}
++
++      /* If this is a parallel we must step through each of the parallel
++         expressions */
++      if (GET_CODE (exp) == PARALLEL)
++	{
++	  int i;
++	  for (i = 0; i < XVECLEN (exp, 0); ++i)
++	    {
++	      rtx vec_exp = XVECEXP (exp, 0, i);
++	      if ((GET_CODE (vec_exp) == SET)
++		  && (cc_status.value1 || cc_status.value2
++		      || cc_status.mdep.value)
++		  && (reg_mentioned_p (SET_DEST (vec_exp), cc_status.value1)
++		      || reg_mentioned_p (SET_DEST (vec_exp),
++					  cc_status.value2)
++		      || reg_mentioned_p (SET_DEST (vec_exp),
++					  cc_status.mdep.value)))
++		{
++		  CC_STATUS_INIT;
++		}
++	    }
++	}
++
++      /* Check if we have memory opartions with post_inc or pre_dec on the
++         register currently reflected in cc0 */
++      if (GET_CODE (exp) == SET
++	  && GET_CODE (SET_SRC (exp)) == MEM
++	  && (GET_CODE (XEXP (SET_SRC (exp), 0)) == POST_INC
++	      || GET_CODE (XEXP (SET_SRC (exp), 0)) == PRE_DEC)
++	  &&
++	  (reg_mentioned_p
++	   (XEXP (XEXP (SET_SRC (exp), 0), 0), cc_status.value1)
++	   || reg_mentioned_p (XEXP (XEXP (SET_SRC (exp), 0), 0),
++			       cc_status.value2)
++	   || reg_mentioned_p (XEXP (XEXP (SET_SRC (exp), 0), 0),
++			       cc_status.mdep.value)))
++	CC_STATUS_INIT;
++
++      if (GET_CODE (exp) == SET
++	  && GET_CODE (SET_DEST (exp)) == MEM
++	  && (GET_CODE (XEXP (SET_DEST (exp), 0)) == POST_INC
++	      || GET_CODE (XEXP (SET_DEST (exp), 0)) == PRE_DEC)
++	  &&
++	  (reg_mentioned_p
++	   (XEXP (XEXP (SET_DEST (exp), 0), 0), cc_status.value1)
++	   || reg_mentioned_p (XEXP (XEXP (SET_DEST (exp), 0), 0),
++			       cc_status.value2)
++	   || reg_mentioned_p (XEXP (XEXP (SET_DEST (exp), 0), 0),
++			       cc_status.mdep.value)))
++	CC_STATUS_INIT;
++      break;
++
++    case CC_SET_VNCZ:
++      CC_STATUS_INIT;
++      cc_status.mdep.value = recog_data.operand[0];
++      cc_status.mdep.flags = CC_SET_VNCZ;
++      cc_status.mdep.cond_exec_cmp_clobbered = 0;
++      break;
++
++    case CC_SET_NCZ:
++      CC_STATUS_INIT;
++      cc_status.mdep.value = recog_data.operand[0];
++      cc_status.mdep.flags = CC_SET_NCZ;
++      cc_status.mdep.cond_exec_cmp_clobbered = 0;
++      break;
++
++    case CC_SET_CZ:
++      CC_STATUS_INIT;
++      cc_status.mdep.value = recog_data.operand[0];
++      cc_status.mdep.flags = CC_SET_CZ;
++      cc_status.mdep.cond_exec_cmp_clobbered = 0;
++      break;
++
++    case CC_SET_Z:
++      CC_STATUS_INIT;
++      cc_status.mdep.value = recog_data.operand[0];
++      cc_status.mdep.flags = CC_SET_Z;
++      cc_status.mdep.cond_exec_cmp_clobbered = 0;
++      break;
++
++    case CC_CLOBBER:
++      CC_STATUS_INIT;
++      break;
++
++    default:
++      CC_STATUS_INIT;
++    }
++}
++
++
++/*
++  Outputs to stdio stream stream the assembler syntax for an instruction
++  operand x. x is an RTL expression.
++*/
++void
++avr32_print_operand (FILE * stream, rtx x, int code)
++{
++  int error = 0;
++
++  if ( code == '?' )
++    {
++      /* Predicable instruction, print condition code */
++
++      /* If the insn should not be conditional then do nothing. */
++      if ( current_insn_predicate == NULL_RTX )
++        return;
++
++      /* Set x to the predicate to force printing
++         the condition later on. */
++      x = current_insn_predicate;
++
++      /* Reverse condition if useing bld insn. */
++      if ( GET_CODE (XEXP(current_insn_predicate,0)) == AND )
++        x = reversed_condition (current_insn_predicate);
++    }
++  else if ( code == '!' )
++    {
++      /* Output compare for conditional insn if needed. */
++      rtx new_cond;
++      gcc_assert ( current_insn_predicate != NULL_RTX );
++      new_cond = avr32_output_cmp(current_insn_predicate,
++                                  GET_MODE(XEXP(current_insn_predicate,0)),
++                                  XEXP(current_insn_predicate,0),
++                                  XEXP(current_insn_predicate,1));
++
++      /* Check if the new condition is a special avr32 condition
++         specified using UNSPECs. If so we must handle it differently. */
++      if ( GET_CODE (new_cond) == UNSPEC )
++        {
++          current_insn_predicate =
++            gen_rtx_UNSPEC (CCmode,
++                            gen_rtvec (2,
++                                       XEXP(current_insn_predicate,0),
++                                       XEXP(current_insn_predicate,1)),
++                            XINT (new_cond, 1));
++        }
++      else
++        {
++          PUT_CODE(current_insn_predicate, GET_CODE(new_cond));
++        }
++      return;
++    }
++
++  switch (GET_CODE (x))
++    {
++    case UNSPEC:
++      switch (XINT (x, 1))
++	{
++	case UNSPEC_COND_PL:
++	  if (code == 'i')
++	    fputs ("mi", stream);
++	  else
++	    fputs ("pl", stream);
++	  break;
++	case UNSPEC_COND_MI:
++	  if (code == 'i')
++	    fputs ("pl", stream);
++	  else
++	    fputs ("mi", stream);
++	  break;
++	default:
++	  error = 1;
++	}
++      break;
++    case EQ:
++      if (code == 'i')
++	fputs ("ne", stream);
++      else
++	fputs ("eq", stream);
++      break;
++    case NE:
++      if (code == 'i')
++	fputs ("eq", stream);
++      else
++	fputs ("ne", stream);
++      break;
++    case GT:
++      if (code == 'i')
++	fputs ("le", stream);
++      else
++	fputs ("gt", stream);
++      break;
++    case GTU:
++      if (code == 'i')
++	fputs ("ls", stream);
++      else
++	fputs ("hi", stream);
++      break;
++    case LT:
++      if (code == 'i')
++	fputs ("ge", stream);
++      else
++	fputs ("lt", stream);
++      break;
++    case LTU:
++      if (code == 'i')
++	fputs ("hs", stream);
++      else
++	fputs ("lo", stream);
++      break;
++    case GE:
++      if (code == 'i')
++	fputs ("lt", stream);
++      else
++	fputs ("ge", stream);
++      break;
++    case GEU:
++      if (code == 'i')
++	fputs ("lo", stream);
++      else
++	fputs ("hs", stream);
++      break;
++    case LE:
++      if (code == 'i')
++	fputs ("gt", stream);
++      else
++	fputs ("le", stream);
++      break;
++    case LEU:
++      if (code == 'i')
++	fputs ("hi", stream);
++      else
++	fputs ("ls", stream);
++      break;
++    case CONST_INT:
++      {
++        HOST_WIDE_INT value = INTVAL (x);
++
++        switch (code)
++          {
++          case 'm':
++            if ( HOST_BITS_PER_WIDE_INT > BITS_PER_WORD )
++              {
++                /* A const_int can be used to represent DImode constants. */
++                value >>= BITS_PER_WORD;
++              }
++            /* We might get a const_int immediate for setting a DI register,
++               we then must then return the correct sign extended DI. The most
++               significant word is just a sign extension. */
++            else if (value < 0)
++              value = -1;
++            else
++              value = 0;
++            break;
++          case 'i':
++            value++;
++            break;
++          case 'p':
++            {
++              /* Set to bit position of first bit set in immediate */
++              int i, bitpos = 32;
++              for (i = 0; i < 32; i++)
++                if (value & (1 << i))
++                  {
++                    bitpos = i;
++                    break;
++                  }
++              value = bitpos;
++            }
++            break;
++          case 'z':
++            {
++              /* Set to bit position of first bit cleared in immediate */
++              int i, bitpos = 32;
++              for (i = 0; i < 32; i++)
++                if (!(value & (1 << i)))
++                  {
++                    bitpos = i;
++                    break;
++                  }
++              value = bitpos;
++            }
++            break;
++          case 'r':
++            {
++              /* Reglist 8 */
++              char op[50];
++              op[0] = '\0';
++
++              if (value & 0x01)
++                strcpy (op, "r0-r3");
++              if (value & 0x02)
++                strlen (op) ? strcat (op, ", r4-r7") : strcpy (op,"r4-r7");
++              if (value & 0x04)
++                strlen (op) ? strcat (op, ", r8-r9") : strcpy (op,"r8-r9");
++              if (value & 0x08)
++                strlen (op) ? strcat (op, ", r10") : strcpy (op,"r10");
++              if (value & 0x10)
++                strlen (op) ? strcat (op, ", r11") : strcpy (op,"r11");
++              if (value & 0x20)
++                strlen (op) ? strcat (op, ", r12") : strcpy (op,"r12");
++              if (value & 0x40)
++                strlen (op) ? strcat (op, ", lr") : strcpy (op, "lr");
++              if (value & 0x80)
++                strlen (op) ? strcat (op, ", pc") : strcpy (op, "pc");
++
++              fputs (op, stream);
++              return;
++            }
++          case 's':
++            {
++              /* Reglist 16 */
++              char reglist16_string[100];
++              int i;
++	      bool first_reg = true;
++              reglist16_string[0] = '\0';
++
++	      for (i = 0; i < 16; ++i)
++		{
++		  if (value & (1 << i))
++		    {
++			first_reg == true ?  first_reg = false : strcat(reglist16_string,", ");
++			strcat(reglist16_string,reg_names[INTERNAL_REGNUM(i)]);		      
++		    }
++		}
++	      fputs (reglist16_string, stream);
++	      return;
++	    }
++	  case 'h':
++	    /* Print halfword part of word */
++	    fputs (value ? "b" : "t", stream);
++	    return;
++	  }
++
++	/* Print Value */
++	fprintf (stream, "%d", value);
++	break;
++      }
++    case CONST_DOUBLE:
++      {
++	HOST_WIDE_INT hi, lo;
++	if (SCALAR_FLOAT_MODE_P (GET_MODE (x)))
++	  {
++	    HOST_WIDE_INT target_float[2];
++	    hi = lo = 0;
++	    real_to_target (target_float, CONST_DOUBLE_REAL_VALUE (x),
++			    GET_MODE (x));
++	    /* For doubles the most significant part starts at index 0. */
++	    if (GET_MODE_SIZE (GET_MODE (x)) > UNITS_PER_WORD)
++	      {
++		hi = target_float[0];
++		lo = target_float[1];
++	      }
++	    else
++	      {
++		lo = target_float[0];
++	      }
++	  }
++	else
++	  {
++	    hi = CONST_DOUBLE_HIGH (x);
++	    lo = CONST_DOUBLE_LOW (x);
++	  }
++
++	if (code == 'm')
++	  fprintf (stream, "%ld", hi);
++	else
++	  fprintf (stream, "%ld", lo);
++
++	break;
++      }
++    case CONST:
++      output_addr_const (stream, XEXP (XEXP (x, 0), 0));
++      fprintf (stream, "+%ld", INTVAL (XEXP (XEXP (x, 0), 1)));
++      break;
++    case REG:
++      /* Swap register name if the register is DImode or DFmode. */
++      if (GET_MODE (x) == DImode || GET_MODE (x) == DFmode)
++	{
++	  /* Double register must have an even numbered address */
++	  gcc_assert (!(REGNO (x) % 2));
++	  if (code == 'm')
++	    fputs (reg_names[true_regnum (x)], stream);
++	  else
++	    fputs (reg_names[true_regnum (x) + 1], stream);
++	}
++      else if (GET_MODE (x) == TImode)
++	{
++	  switch (code)
++	    {
++	    case 'T':
++	      fputs (reg_names[true_regnum (x)], stream);
++	      break;
++	    case 'U':
++	      fputs (reg_names[true_regnum (x) + 1], stream);
++	      break;
++	    case 'L':
++	      fputs (reg_names[true_regnum (x) + 2], stream);
++	      break;
++	    case 'B':
++	      fputs (reg_names[true_regnum (x) + 3], stream);
++	      break;
++	    default:
++	      fprintf (stream, "%s, %s, %s, %s",
++		       reg_names[true_regnum (x) + 3],
++		       reg_names[true_regnum (x) + 2],
++		       reg_names[true_regnum (x) + 1],
++		       reg_names[true_regnum (x)]);
++	      break;
++	    }
++	}
++      else
++	{
++	  fputs (reg_names[true_regnum (x)], stream);
++	}
++      break;
++    case CODE_LABEL:
++    case LABEL_REF:
++    case SYMBOL_REF:
++      output_addr_const (stream, x);
++      break;
++    case MEM:
++      switch (GET_CODE (XEXP (x, 0)))
++	{
++	case LABEL_REF:
++	case SYMBOL_REF:
++	  output_addr_const (stream, XEXP (x, 0));
++	  break;
++	case MEM:
++	  switch (GET_CODE (XEXP (XEXP (x, 0), 0)))
++	    {
++	    case SYMBOL_REF:
++	      output_addr_const (stream, XEXP (XEXP (x, 0), 0));
++	      break;
++	    default:
++	      error = 1;
++	      break;
++	    }
++	  break;
++	case REG:
++	  avr32_print_operand (stream, XEXP (x, 0), 0);
++	  if (code != 'p')
++	    fputs ("[0]", stream);
++	  break;
++	case PRE_DEC:
++	  fputs ("--", stream);
++	  avr32_print_operand (stream, XEXP (XEXP (x, 0), 0), 0);
++	  break;
++	case POST_INC:
++	  avr32_print_operand (stream, XEXP (XEXP (x, 0), 0), 0);
++	  fputs ("++", stream);
++	  break;
++	case PLUS:
++	  {
++	    rtx op0 = XEXP (XEXP (x, 0), 0);
++	    rtx op1 = XEXP (XEXP (x, 0), 1);
++	    rtx base = NULL_RTX, offset = NULL_RTX;
++
++	    if (avr32_address_register_rtx_p (op0, 1))
++	      {
++		base = op0;
++		offset = op1;
++	      }
++	    else if (avr32_address_register_rtx_p (op1, 1))
++	      {
++		/* Operands are switched. */
++		base = op1;
++		offset = op0;
++	      }
++
++	    gcc_assert (base && offset
++			&& avr32_address_register_rtx_p (base, 1)
++			&& avr32_legitimate_index_p (GET_MODE (x), offset,
++						     1));
++
++	    avr32_print_operand (stream, base, 0);
++	    fputs ("[", stream);
++	    avr32_print_operand (stream, offset, 0);
++	    fputs ("]", stream);
++	    break;
++	  }
++	case CONST:
++	  output_addr_const (stream, XEXP (XEXP (XEXP (x, 0), 0), 0));
++	  fprintf (stream, " + %ld",
++		   INTVAL (XEXP (XEXP (XEXP (x, 0), 0), 1)));
++	  break;
++        case CONST_INT:
++	  avr32_print_operand (stream, XEXP (x, 0), 0);
++          break;
++	default:
++	  error = 1;
++	}
++      break;
++    case MULT:
++      {
++	int value = INTVAL (XEXP (x, 1));
++
++	/* Convert immediate in multiplication into a shift immediate */
++	switch (value)
++	  {
++	  case 2:
++	    value = 1;
++	    break;
++	  case 4:
++	    value = 2;
++	    break;
++	  case 8:
++	    value = 3;
++	    break;
++	  default:
++	    value = 0;
++	  }
++	fprintf (stream, "%s << %i", reg_names[true_regnum (XEXP (x, 0))],
++		 value);
++	break;
++      }
++    case ASHIFT:
++      if (GET_CODE (XEXP (x, 1)) == CONST_INT)
++	fprintf (stream, "%s << %i", reg_names[true_regnum (XEXP (x, 0))],
++		 (int) INTVAL (XEXP (x, 1)));
++      else if (REG_P (XEXP (x, 1)))
++	fprintf (stream, "%s << %s", reg_names[true_regnum (XEXP (x, 0))],
++		 reg_names[true_regnum (XEXP (x, 1))]);
++      else
++	{
++	  error = 1;
++	}
++      break;
++    case LSHIFTRT:
++      if (GET_CODE (XEXP (x, 1)) == CONST_INT)
++	fprintf (stream, "%s >> %i", reg_names[true_regnum (XEXP (x, 0))],
++		 (int) INTVAL (XEXP (x, 1)));
++      else if (REG_P (XEXP (x, 1)))
++	fprintf (stream, "%s >> %s", reg_names[true_regnum (XEXP (x, 0))],
++		 reg_names[true_regnum (XEXP (x, 1))]);
++      else
++	{
++	  error = 1;
++	}
++      fprintf (stream, ">>");
++      break;
++    case PARALLEL:
++      {
++	/* Load store multiple */
++	int i;
++	int count = XVECLEN (x, 0);
++	int reglist16 = 0;
++	char reglist16_string[100];
++
++	for (i = 0; i < count; ++i)
++	  {
++	    rtx vec_elm = XVECEXP (x, 0, i);
++	    if (GET_MODE (vec_elm) != SET)
++	      {
++		debug_rtx (vec_elm);
++		internal_error ("Unknown element in parallel expression!");
++	      }
++	    if (GET_MODE (XEXP (vec_elm, 0)) == REG)
++	      {
++		/* Load multiple */
++		reglist16 |= 1 << ASM_REGNUM (REGNO (XEXP (vec_elm, 0)));
++	      }
++	    else
++	      {
++		/* Store multiple */
++		reglist16 |= 1 << ASM_REGNUM (REGNO (XEXP (vec_elm, 1)));
++	      }
++	  }
++
++	avr32_make_reglist16 (reglist16, reglist16_string);
++	fputs (reglist16_string, stream);
++
++	break;
++      }
++
++    case PLUS:
++      {
++        rtx op0 = XEXP (x, 0);
++        rtx op1 = XEXP (x, 1);
++        rtx base = NULL_RTX, offset = NULL_RTX;
++
++        if (avr32_address_register_rtx_p (op0, 1))
++          {
++            base = op0;
++            offset = op1;
++          }
++        else if (avr32_address_register_rtx_p (op1, 1))
++          {
++            /* Operands are switched. */
++            base = op1;
++            offset = op0;
++          }
++
++        gcc_assert (base && offset
++                    && avr32_address_register_rtx_p (base, 1)
++                    && avr32_legitimate_index_p (GET_MODE (x), offset, 1));
++
++        avr32_print_operand (stream, base, 0);
++        fputs ("[", stream);
++        avr32_print_operand (stream, offset, 0);
++        fputs ("]", stream);
++        break;
++      }
++
++    default:
++      error = 1;
++    }
++
++  if (error)
++    {
++      debug_rtx (x);
++      internal_error ("Illegal expression for avr32_print_operand");
++    }
++}
++
++rtx
++avr32_get_note_reg_equiv (rtx insn)
++{
++  rtx note;
++
++  note = find_reg_note (insn, REG_EQUIV, NULL_RTX);
++
++  if (note != NULL_RTX)
++    return XEXP (note, 0);
++  else
++    return NULL_RTX;
++}
++
++
++/*
++  Outputs to stdio stream stream the assembler syntax for an instruction
++  operand that is a memory reference whose address is x. x is an RTL
++  expression.
++
++  ToDo: fixme.
++*/
++void
++avr32_print_operand_address (FILE * stream, rtx x)
++{
++  fprintf (stream, "(%d) /* address */", REGNO (x));
++}
++
++
++/* Return true if _GLOBAL_OFFSET_TABLE_ symbol is mentioned.  */
++bool
++avr32_got_mentioned_p (rtx addr)
++{
++  if (GET_CODE (addr) == MEM)
++    addr = XEXP (addr, 0);
++  while (GET_CODE (addr) == CONST)
++    addr = XEXP (addr, 0);
++  if (GET_CODE (addr) == SYMBOL_REF)
++    {
++      return streq (XSTR (addr, 0), "_GLOBAL_OFFSET_TABLE_");
++    }
++  if (GET_CODE (addr) == PLUS || GET_CODE (addr) == MINUS)
++    {
++      bool l1, l2;
++
++      l1 = avr32_got_mentioned_p (XEXP (addr, 0));
++      l2 = avr32_got_mentioned_p (XEXP (addr, 1));
++      return l1 || l2;
++    }
++  return false;
++}
++
++
++/* Find the symbol in an address expression.  */
++rtx
++avr32_find_symbol (rtx addr)
++{
++  if (GET_CODE (addr) == MEM)
++    addr = XEXP (addr, 0);
++
++  while (GET_CODE (addr) == CONST)
++    addr = XEXP (addr, 0);
++
++  if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == LABEL_REF)
++    return addr;
++  if (GET_CODE (addr) == PLUS)
++    {
++      rtx l1, l2;
++
++      l1 = avr32_find_symbol (XEXP (addr, 0));
++      l2 = avr32_find_symbol (XEXP (addr, 1));
++      if (l1 != NULL_RTX && l2 == NULL_RTX)
++	return l1;
++      else if (l1 == NULL_RTX && l2 != NULL_RTX)
++	return l2;
++    }
++
++  return NULL_RTX;
++}
++
++
++/* Routines for manipulation of the constant pool.  */
++
++/* AVR32 instructions cannot load a large constant directly into a
++   register; they have to come from a pc relative load.  The constant
++   must therefore be placed in the addressable range of the pc
++   relative load.  Depending on the precise pc relative load
++   instruction the range is somewhere between 256 bytes and 4k.  This
++   means that we often have to dump a constant inside a function, and
++   generate code to branch around it.
++
++   It is important to minimize this, since the branches will slow
++   things down and make the code larger.
++
++   Normally we can hide the table after an existing unconditional
++   branch so that there is no interruption of the flow, but in the
++   worst case the code looks like this:
++
++	lddpc	rn, L1
++	...
++	rjmp	L2
++	align
++	L1:	.long value
++	L2:
++	...
++
++	lddpc	rn, L3
++	...
++	rjmp	L4
++	align
++	L3:	.long value
++	L4:
++	...
++
++   We fix this by performing a scan after scheduling, which notices
++   which instructions need to have their operands fetched from the
++   constant table and builds the table.
++
++   The algorithm starts by building a table of all the constants that
++   need fixing up and all the natural barriers in the function (places
++   where a constant table can be dropped without breaking the flow).
++   For each fixup we note how far the pc-relative replacement will be
++   able to reach and the offset of the instruction into the function.
++
++   Having built the table we then group the fixes together to form
++   tables that are as large as possible (subject to addressing
++   constraints) and emit each table of constants after the last
++   barrier that is within range of all the instructions in the group.
++   If a group does not contain a barrier, then we forcibly create one
++   by inserting a jump instruction into the flow.  Once the table has
++   been inserted, the insns are then modified to reference the
++   relevant entry in the pool.
++
++   Possible enhancements to the algorithm (not implemented) are:
++
++   1) For some processors and object formats, there may be benefit in
++   aligning the pools to the start of cache lines; this alignment
++   would need to be taken into account when calculating addressability
++   of a pool.  */
++
++/* These typedefs are located at the start of this file, so that
++   they can be used in the prototypes there.  This comment is to
++   remind readers of that fact so that the following structures
++   can be understood more easily.
++
++     typedef struct minipool_node    Mnode;
++     typedef struct minipool_fixup   Mfix;  */
++
++struct minipool_node
++{
++  /* Doubly linked chain of entries.  */
++  Mnode *next;
++  Mnode *prev;
++  /* The maximum offset into the code that this entry can be placed.  While
++     pushing fixes for forward references, all entries are sorted in order of
++     increasing max_address.  */
++  HOST_WIDE_INT max_address;
++  /* Similarly for an entry inserted for a backwards ref.  */
++  HOST_WIDE_INT min_address;
++  /* The number of fixes referencing this entry.  This can become zero if we
++     "unpush" an entry.  In this case we ignore the entry when we come to
++     emit the code.  */
++  int refcount;
++  /* The offset from the start of the minipool.  */
++  HOST_WIDE_INT offset;
++  /* The value in table.  */
++  rtx value;
++  /* The mode of value.  */
++  enum machine_mode mode;
++  /* The size of the value.  */
++  int fix_size;
++};
++
++
++struct minipool_fixup
++{
++  Mfix *next;
++  rtx insn;
++  HOST_WIDE_INT address;
++  rtx *loc;
++  enum machine_mode mode;
++  int fix_size;
++  rtx value;
++  Mnode *minipool;
++  HOST_WIDE_INT forwards;
++  HOST_WIDE_INT backwards;
++};
++
++
++/* Fixes less than a word need padding out to a word boundary.  */
++#define MINIPOOL_FIX_SIZE(mode, value)                          \
++  (IS_FORCE_MINIPOOL(value) ? 0 :                               \
++   (GET_MODE_SIZE ((mode)) >= 4 ? GET_MODE_SIZE ((mode)) : 4))
++
++#define IS_FORCE_MINIPOOL(x)                    \
++  (GET_CODE(x) == UNSPEC &&                     \
++   XINT(x, 1) == UNSPEC_FORCE_MINIPOOL)
++
++static Mnode *minipool_vector_head;
++static Mnode *minipool_vector_tail;
++
++/* The linked list of all minipool fixes required for this function.  */
++Mfix *minipool_fix_head;
++Mfix *minipool_fix_tail;
++/* The fix entry for the current minipool, once it has been placed.  */
++Mfix *minipool_barrier;
++
++
++/* Determines if INSN is the start of a jump table.  Returns the end
++   of the TABLE or NULL_RTX.  */
++static rtx
++is_jump_table (rtx insn)
++{
++  rtx table;
++
++  if (GET_CODE (insn) == JUMP_INSN
++      && JUMP_LABEL (insn) != NULL
++      && ((table = next_real_insn (JUMP_LABEL (insn)))
++	  == next_real_insn (insn))
++      && table != NULL
++      && GET_CODE (table) == JUMP_INSN
++      && (GET_CODE (PATTERN (table)) == ADDR_VEC
++	  || GET_CODE (PATTERN (table)) == ADDR_DIFF_VEC))
++    return table;
++
++  return NULL_RTX;
++}
++
++
++static HOST_WIDE_INT
++get_jump_table_size (rtx insn)
++{
++  /* ADDR_VECs only take room if read-only data does into the text section.  */
++  if (JUMP_TABLES_IN_TEXT_SECTION
++#if !defined(READONLY_DATA_SECTION_ASM_OP)
++      || 1
++#endif
++    )
++    {
++      rtx body = PATTERN (insn);
++      int elt = GET_CODE (body) == ADDR_DIFF_VEC ? 1 : 0;
++
++      return GET_MODE_SIZE (GET_MODE (body)) * XVECLEN (body, elt);
++    }
++
++  return 0;
++}
++
++
++/* Move a minipool fix MP from its current location to before MAX_MP.
++   If MAX_MP is NULL, then MP doesn't need moving, but the addressing
++   constraints may need updating.  */
++static Mnode *
++move_minipool_fix_forward_ref (Mnode * mp, Mnode * max_mp,
++			       HOST_WIDE_INT max_address)
++{
++  /* This should never be true and the code below assumes these are
++     different.  */
++  if (mp == max_mp)
++    abort ();
++
++  if (max_mp == NULL)
++    {
++      if (max_address < mp->max_address)
++	mp->max_address = max_address;
++    }
++  else
++    {
++      if (max_address > max_mp->max_address - mp->fix_size)
++	mp->max_address = max_mp->max_address - mp->fix_size;
++      else
++	mp->max_address = max_address;
++
++      /* Unlink MP from its current position.  Since max_mp is non-null,
++         mp->prev must be non-null.  */
++      mp->prev->next = mp->next;
++      if (mp->next != NULL)
++	mp->next->prev = mp->prev;
++      else
++	minipool_vector_tail = mp->prev;
++
++      /* Re-insert it before MAX_MP.  */
++      mp->next = max_mp;
++      mp->prev = max_mp->prev;
++      max_mp->prev = mp;
++
++      if (mp->prev != NULL)
++	mp->prev->next = mp;
++      else
++	minipool_vector_head = mp;
++    }
++
++  /* Save the new entry.  */
++  max_mp = mp;
++
++  /* Scan over the preceding entries and adjust their addresses as required.
++   */
++  while (mp->prev != NULL
++	 && mp->prev->max_address > mp->max_address - mp->prev->fix_size)
++    {
++      mp->prev->max_address = mp->max_address - mp->prev->fix_size;
++      mp = mp->prev;
++    }
++
++  return max_mp;
++}
++
++
++/* Add a constant to the minipool for a forward reference.  Returns the
++   node added or NULL if the constant will not fit in this pool.  */
++static Mnode *
++add_minipool_forward_ref (Mfix * fix)
++{
++  /* If set, max_mp is the first pool_entry that has a lower constraint than
++     the one we are trying to add.  */
++  Mnode *max_mp = NULL;
++  HOST_WIDE_INT max_address = fix->address + fix->forwards;
++  Mnode *mp;
++
++  /* If this fix's address is greater than the address of the first entry,
++     then we can't put the fix in this pool.  We subtract the size of the
++     current fix to ensure that if the table is fully packed we still have
++     enough room to insert this value by suffling the other fixes forwards.  */
++  if (minipool_vector_head &&
++      fix->address >= minipool_vector_head->max_address - fix->fix_size)
++    return NULL;
++
++  /* Scan the pool to see if a constant with the same value has already been
++     added.  While we are doing this, also note the location where we must
++     insert the constant if it doesn't already exist.  */
++  for (mp = minipool_vector_head; mp != NULL; mp = mp->next)
++    {
++      if (GET_CODE (fix->value) == GET_CODE (mp->value)
++	  && fix->mode == mp->mode
++	  && (GET_CODE (fix->value) != CODE_LABEL
++	      || (CODE_LABEL_NUMBER (fix->value)
++		  == CODE_LABEL_NUMBER (mp->value)))
++	  && rtx_equal_p (fix->value, mp->value))
++	{
++	  /* More than one fix references this entry.  */
++	  mp->refcount++;
++	  return move_minipool_fix_forward_ref (mp, max_mp, max_address);
++	}
++
++      /* Note the insertion point if necessary.  */
++      if (max_mp == NULL && mp->max_address > max_address)
++	max_mp = mp;
++
++    }
++
++  /* The value is not currently in the minipool, so we need to create a new
++     entry for it.  If MAX_MP is NULL, the entry will be put on the end of
++     the list since the placement is less constrained than any existing
++     entry.  Otherwise, we insert the new fix before MAX_MP and, if
++     necessary, adjust the constraints on the other entries.  */
++  mp = xmalloc (sizeof (*mp));
++  mp->fix_size = fix->fix_size;
++  mp->mode = fix->mode;
++  mp->value = fix->value;
++  mp->refcount = 1;
++  /* Not yet required for a backwards ref.  */
++  mp->min_address = -65536;
++
++  if (max_mp == NULL)
++    {
++      mp->max_address = max_address;
++      mp->next = NULL;
++      mp->prev = minipool_vector_tail;
++
++      if (mp->prev == NULL)
++	{
++	  minipool_vector_head = mp;
++	  minipool_vector_label = gen_label_rtx ();
++	}
++      else
++	mp->prev->next = mp;
++
++      minipool_vector_tail = mp;
++    }
++  else
++    {
++      if (max_address > max_mp->max_address - mp->fix_size)
++	mp->max_address = max_mp->max_address - mp->fix_size;
++      else
++	mp->max_address = max_address;
++
++      mp->next = max_mp;
++      mp->prev = max_mp->prev;
++      max_mp->prev = mp;
++      if (mp->prev != NULL)
++	mp->prev->next = mp;
++      else
++	minipool_vector_head = mp;
++    }
++
++  /* Save the new entry.  */
++  max_mp = mp;
++
++  /* Scan over the preceding entries and adjust their addresses as required.
++   */
++  while (mp->prev != NULL
++	 && mp->prev->max_address > mp->max_address - mp->prev->fix_size)
++    {
++      mp->prev->max_address = mp->max_address - mp->prev->fix_size;
++      mp = mp->prev;
++    }
++
++  return max_mp;
++}
++
++
++static Mnode *
++move_minipool_fix_backward_ref (Mnode * mp, Mnode * min_mp,
++				HOST_WIDE_INT min_address)
++{
++  HOST_WIDE_INT offset;
++
++  /* This should never be true, and the code below assumes these are
++     different.  */
++  if (mp == min_mp)
++    abort ();
++
++  if (min_mp == NULL)
++    {
++      if (min_address > mp->min_address)
++	mp->min_address = min_address;
++    }
++  else
++    {
++      /* We will adjust this below if it is too loose.  */
++      mp->min_address = min_address;
++
++      /* Unlink MP from its current position.  Since min_mp is non-null,
++         mp->next must be non-null.  */
++      mp->next->prev = mp->prev;
++      if (mp->prev != NULL)
++	mp->prev->next = mp->next;
++      else
++	minipool_vector_head = mp->next;
++
++      /* Reinsert it after MIN_MP.  */
++      mp->prev = min_mp;
++      mp->next = min_mp->next;
++      min_mp->next = mp;
++      if (mp->next != NULL)
++	mp->next->prev = mp;
++      else
++	minipool_vector_tail = mp;
++    }
++
++  min_mp = mp;
++
++  offset = 0;
++  for (mp = minipool_vector_head; mp != NULL; mp = mp->next)
++    {
++      mp->offset = offset;
++      if (mp->refcount > 0)
++	offset += mp->fix_size;
++
++      if (mp->next && mp->next->min_address < mp->min_address + mp->fix_size)
++	mp->next->min_address = mp->min_address + mp->fix_size;
++    }
++
++  return min_mp;
++}
++
++
++/* Add a constant to the minipool for a backward reference.  Returns the
++   node added or NULL if the constant will not fit in this pool.
++
++   Note that the code for insertion for a backwards reference can be
++   somewhat confusing because the calculated offsets for each fix do
++   not take into account the size of the pool (which is still under
++   construction.  */
++static Mnode *
++add_minipool_backward_ref (Mfix * fix)
++{
++  /* If set, min_mp is the last pool_entry that has a lower constraint than
++     the one we are trying to add.  */
++  Mnode *min_mp = NULL;
++  /* This can be negative, since it is only a constraint.  */
++  HOST_WIDE_INT min_address = fix->address - fix->backwards;
++  Mnode *mp;
++
++  /* If we can't reach the current pool from this insn, or if we can't insert
++     this entry at the end of the pool without pushing other fixes out of
++     range, then we don't try.  This ensures that we can't fail later on.  */
++  if (min_address >= minipool_barrier->address
++      || (minipool_vector_tail->min_address + fix->fix_size
++	  >= minipool_barrier->address))
++    return NULL;
++
++  /* Scan the pool to see if a constant with the same value has already been
++     added.  While we are doing this, also note the location where we must
++     insert the constant if it doesn't already exist.  */
++  for (mp = minipool_vector_tail; mp != NULL; mp = mp->prev)
++    {
++      if (GET_CODE (fix->value) == GET_CODE (mp->value)
++	  && fix->mode == mp->mode
++	  && (GET_CODE (fix->value) != CODE_LABEL
++	      || (CODE_LABEL_NUMBER (fix->value)
++		  == CODE_LABEL_NUMBER (mp->value)))
++	  && rtx_equal_p (fix->value, mp->value)
++	  /* Check that there is enough slack to move this entry to the end
++	     of the table (this is conservative).  */
++	  && (mp->max_address
++	      > (minipool_barrier->address
++		 + minipool_vector_tail->offset
++		 + minipool_vector_tail->fix_size)))
++	{
++	  mp->refcount++;
++	  return move_minipool_fix_backward_ref (mp, min_mp, min_address);
++	}
++
++      if (min_mp != NULL)
++	mp->min_address += fix->fix_size;
++      else
++	{
++	  /* Note the insertion point if necessary.  */
++	  if (mp->min_address < min_address)
++	    {
++	      min_mp = mp;
++	    }
++	  else if (mp->max_address
++		   < minipool_barrier->address + mp->offset + fix->fix_size)
++	    {
++	      /* Inserting before this entry would push the fix beyond its
++	         maximum address (which can happen if we have re-located a
++	         forwards fix); force the new fix to come after it.  */
++	      min_mp = mp;
++	      min_address = mp->min_address + fix->fix_size;
++	    }
++	}
++    }
++
++  /* We need to create a new entry.  */
++  mp = xmalloc (sizeof (*mp));
++  mp->fix_size = fix->fix_size;
++  mp->mode = fix->mode;
++  mp->value = fix->value;
++  mp->refcount = 1;
++  mp->max_address = minipool_barrier->address + 65536;
++
++  mp->min_address = min_address;
++
++  if (min_mp == NULL)
++    {
++      mp->prev = NULL;
++      mp->next = minipool_vector_head;
++
++      if (mp->next == NULL)
++	{
++	  minipool_vector_tail = mp;
++	  minipool_vector_label = gen_label_rtx ();
++	}
++      else
++	mp->next->prev = mp;
++
++      minipool_vector_head = mp;
++    }
++  else
++    {
++      mp->next = min_mp->next;
++      mp->prev = min_mp;
++      min_mp->next = mp;
++
++      if (mp->next != NULL)
++	mp->next->prev = mp;
++      else
++	minipool_vector_tail = mp;
++    }
++
++  /* Save the new entry.  */
++  min_mp = mp;
++
++  if (mp->prev)
++    mp = mp->prev;
++  else
++    mp->offset = 0;
++
++  /* Scan over the following entries and adjust their offsets.  */
++  while (mp->next != NULL)
++    {
++      if (mp->next->min_address < mp->min_address + mp->fix_size)
++	mp->next->min_address = mp->min_address + mp->fix_size;
++
++      if (mp->refcount)
++	mp->next->offset = mp->offset + mp->fix_size;
++      else
++	mp->next->offset = mp->offset;
++
++      mp = mp->next;
++    }
++
++  return min_mp;
++}
++
++
++static void
++assign_minipool_offsets (Mfix * barrier)
++{
++  HOST_WIDE_INT offset = 0;
++  Mnode *mp;
++
++  minipool_barrier = barrier;
++
++  for (mp = minipool_vector_head; mp != NULL; mp = mp->next)
++    {
++      mp->offset = offset;
++
++      if (mp->refcount > 0)
++	offset += mp->fix_size;
++    }
++}
++
++
++/* Print a symbolic form of X to the debug file, F.  */
++static void
++avr32_print_value (FILE * f, rtx x)
++{
++  switch (GET_CODE (x))
++    {
++    case CONST_INT:
++      fprintf (f, "0x%x", (int) INTVAL (x));
++      return;
++
++    case CONST_DOUBLE:
++      fprintf (f, "<0x%lx,0x%lx>", (long) XWINT (x, 2), (long) XWINT (x, 3));
++      return;
++
++    case CONST_VECTOR:
++      {
++	int i;
++
++	fprintf (f, "<");
++	for (i = 0; i < CONST_VECTOR_NUNITS (x); i++)
++	  {
++	    fprintf (f, "0x%x", (int) INTVAL (CONST_VECTOR_ELT (x, i)));
++	    if (i < (CONST_VECTOR_NUNITS (x) - 1))
++	      fputc (',', f);
++	  }
++	fprintf (f, ">");
++      }
++      return;
++
++    case CONST_STRING:
++      fprintf (f, "\"%s\"", XSTR (x, 0));
++      return;
++
++    case SYMBOL_REF:
++      fprintf (f, "`%s'", XSTR (x, 0));
++      return;
++
++    case LABEL_REF:
++      fprintf (f, "L%d", INSN_UID (XEXP (x, 0)));
++      return;
++
++    case CONST:
++      avr32_print_value (f, XEXP (x, 0));
++      return;
++
++    case PLUS:
++      avr32_print_value (f, XEXP (x, 0));
++      fprintf (f, "+");
++      avr32_print_value (f, XEXP (x, 1));
++      return;
++
++    case PC:
++      fprintf (f, "pc");
++      return;
++
++    default:
++      fprintf (f, "????");
++      return;
++    }
++}
++
++
++int
++is_minipool_label (rtx label)
++{
++  minipool_labels *cur_mp_label = cfun->machine->minipool_label_head;
++
++  if (GET_CODE (label) != CODE_LABEL)
++    return FALSE;
++
++  while (cur_mp_label)
++    {
++      if (CODE_LABEL_NUMBER (label)
++	  == CODE_LABEL_NUMBER (cur_mp_label->label))
++	return TRUE;
++      cur_mp_label = cur_mp_label->next;
++    }
++  return FALSE;
++}
++
++
++static void
++new_minipool_label (rtx label)
++{
++  if (!cfun->machine->minipool_label_head)
++    {
++      cfun->machine->minipool_label_head =
++	ggc_alloc (sizeof (minipool_labels));
++      cfun->machine->minipool_label_tail = cfun->machine->minipool_label_head;
++      cfun->machine->minipool_label_head->label = label;
++      cfun->machine->minipool_label_head->next = 0;
++      cfun->machine->minipool_label_head->prev = 0;
++    }
++  else
++    {
++      cfun->machine->minipool_label_tail->next =
++	ggc_alloc (sizeof (minipool_labels));
++      cfun->machine->minipool_label_tail->next->label = label;
++      cfun->machine->minipool_label_tail->next->next = 0;
++      cfun->machine->minipool_label_tail->next->prev =
++	cfun->machine->minipool_label_tail;
++      cfun->machine->minipool_label_tail =
++	cfun->machine->minipool_label_tail->next;
++    }
++}
++
++
++/* Output the literal table */
++static void
++dump_minipool (rtx scan)
++{
++  Mnode *mp;
++  Mnode *nmp;
++
++  if (dump_file)
++    fprintf (dump_file,
++	     ";; Emitting minipool after insn %u; address %ld; align %d (bytes)\n",
++	     INSN_UID (scan), (unsigned long) minipool_barrier->address, 4);
++
++  scan = emit_insn_after (gen_consttable_start (), scan);
++  scan = emit_insn_after (gen_align_4 (), scan);
++  scan = emit_label_after (minipool_vector_label, scan);
++  new_minipool_label (minipool_vector_label);
++
++  for (mp = minipool_vector_head; mp != NULL; mp = nmp)
++    {
++      if (mp->refcount > 0)
++	{
++	  if (dump_file)
++	    {
++	      fprintf (dump_file,
++		       ";;  Offset %u, min %ld, max %ld ",
++		       (unsigned) mp->offset, (unsigned long) mp->min_address,
++		       (unsigned long) mp->max_address);
++	      avr32_print_value (dump_file, mp->value);
++	      fputc ('\n', dump_file);
++	    }
++
++	  switch (mp->fix_size)
++	    {
++#ifdef HAVE_consttable_4
++	    case 4:
++	      scan = emit_insn_after (gen_consttable_4 (mp->value), scan);
++	      break;
++
++#endif
++#ifdef HAVE_consttable_8
++	    case 8:
++	      scan = emit_insn_after (gen_consttable_8 (mp->value), scan);
++	      break;
++
++#endif
++#ifdef HAVE_consttable_16
++            case 16:
++              scan = emit_insn_after (gen_consttable_16 (mp->value), scan);
++              break;
++
++#endif
++            case 0:
++              /* This can happen for force-minipool entries which just are
++	         there to force the minipool to be generate. */
++	      break;
++	    default:
++	      abort ();
++	      break;
++	    }
++	}
++
++      nmp = mp->next;
++      free (mp);
++    }
++
++  minipool_vector_head = minipool_vector_tail = NULL;
++  scan = emit_insn_after (gen_consttable_end (), scan);
++  scan = emit_barrier_after (scan);
++}
++
++
++/* Return the cost of forcibly inserting a barrier after INSN.  */
++static int
++avr32_barrier_cost (rtx insn)
++{
++  /* Basing the location of the pool on the loop depth is preferable, but at
++     the moment, the basic block information seems to be corrupt by this
++     stage of the compilation.  */
++  int base_cost = 50;
++  rtx next = next_nonnote_insn (insn);
++
++  if (next != NULL && GET_CODE (next) == CODE_LABEL)
++    base_cost -= 20;
++
++  switch (GET_CODE (insn))
++    {
++    case CODE_LABEL:
++      /* It will always be better to place the table before the label, rather
++         than after it.  */
++      return 50;
++
++    case INSN:
++    case CALL_INSN:
++      return base_cost;
++
++    case JUMP_INSN:
++      return base_cost - 10;
++
++    default:
++      return base_cost + 10;
++    }
++}
++
++
++/* Find the best place in the insn stream in the range
++   (FIX->address,MAX_ADDRESS) to forcibly insert a minipool barrier.
++   Create the barrier by inserting a jump and add a new fix entry for
++   it.  */
++static Mfix *
++create_fix_barrier (Mfix * fix, HOST_WIDE_INT max_address)
++{
++  HOST_WIDE_INT count = 0;
++  rtx barrier;
++  rtx from = fix->insn;
++  rtx selected = from;
++  int selected_cost;
++  HOST_WIDE_INT selected_address;
++  Mfix *new_fix;
++  HOST_WIDE_INT max_count = max_address - fix->address;
++  rtx label = gen_label_rtx ();
++
++  selected_cost = avr32_barrier_cost (from);
++  selected_address = fix->address;
++
++  while (from && count < max_count)
++    {
++      rtx tmp;
++      int new_cost;
++
++      /* This code shouldn't have been called if there was a natural barrier
++         within range.  */
++      if (GET_CODE (from) == BARRIER)
++	abort ();
++
++      /* Count the length of this insn.  */
++      count += get_attr_length (from);
++
++      /* If there is a jump table, add its length.  */
++      tmp = is_jump_table (from);
++      if (tmp != NULL)
++	{
++	  count += get_jump_table_size (tmp);
++
++	  /* Jump tables aren't in a basic block, so base the cost on the
++	     dispatch insn.  If we select this location, we will still put
++	     the pool after the table.  */
++	  new_cost = avr32_barrier_cost (from);
++
++	  if (count < max_count && new_cost <= selected_cost)
++	    {
++	      selected = tmp;
++	      selected_cost = new_cost;
++	      selected_address = fix->address + count;
++	    }
++
++	  /* Continue after the dispatch table.  */
++	  from = NEXT_INSN (tmp);
++	  continue;
++	}
++
++      new_cost = avr32_barrier_cost (from);
++
++      if (count < max_count && new_cost <= selected_cost)
++	{
++	  selected = from;
++	  selected_cost = new_cost;
++	  selected_address = fix->address + count;
++	}
++
++      from = NEXT_INSN (from);
++    }
++
++  /* Create a new JUMP_INSN that branches around a barrier.  */
++  from = emit_jump_insn_after (gen_jump (label), selected);
++  JUMP_LABEL (from) = label;
++  barrier = emit_barrier_after (from);
++  emit_label_after (label, barrier);
++
++  /* Create a minipool barrier entry for the new barrier.  */
++  new_fix = (Mfix *) obstack_alloc (&minipool_obstack, sizeof (*new_fix));
++  new_fix->insn = barrier;
++  new_fix->address = selected_address;
++  new_fix->next = fix->next;
++  fix->next = new_fix;
++
++  return new_fix;
++}
++
++
++/* Record that there is a natural barrier in the insn stream at
++   ADDRESS.  */
++static void
++push_minipool_barrier (rtx insn, HOST_WIDE_INT address)
++{
++  Mfix *fix = (Mfix *) obstack_alloc (&minipool_obstack, sizeof (*fix));
++
++  fix->insn = insn;
++  fix->address = address;
++
++  fix->next = NULL;
++  if (minipool_fix_head != NULL)
++    minipool_fix_tail->next = fix;
++  else
++    minipool_fix_head = fix;
++
++  minipool_fix_tail = fix;
++}
++
++
++/* Record INSN, which will need fixing up to load a value from the
++   minipool.  ADDRESS is the offset of the insn since the start of the
++   function; LOC is a pointer to the part of the insn which requires
++   fixing; VALUE is the constant that must be loaded, which is of type
++   MODE.  */
++static void
++push_minipool_fix (rtx insn, HOST_WIDE_INT address, rtx * loc,
++		   enum machine_mode mode, rtx value)
++{
++  Mfix *fix = (Mfix *) obstack_alloc (&minipool_obstack, sizeof (*fix));
++  rtx body = PATTERN (insn);
++
++  fix->insn = insn;
++  fix->address = address;
++  fix->loc = loc;
++  fix->mode = mode;
++  fix->fix_size = MINIPOOL_FIX_SIZE (mode, value);
++  fix->value = value;
++
++  if (GET_CODE (body) == PARALLEL)
++    {
++      /* Mcall : Ks16 << 2 */
++      fix->forwards = ((1 << 15) - 1) << 2;
++      fix->backwards = (1 << 15) << 2;
++    }
++  else if (GET_CODE (body) == SET
++           && GET_MODE_SIZE (GET_MODE (SET_DEST (body))) == 4)
++    {
++          if (optimize_size)
++            {
++              /* Lddpc : Ku7 << 2 */
++              fix->forwards = ((1 << 7) - 1) << 2;
++              fix->backwards = 0;
++            }
++          else
++            {
++              /* Ld.w : Ks16 */
++              fix->forwards = ((1 << 15) - 4);
++              fix->backwards = (1 << 15);
++            }
++        }
++  else if (GET_CODE (body) == SET
++           && GET_MODE_SIZE (GET_MODE (SET_DEST (body))) == 8)
++    {
++          /* Ld.d : Ks16 */
++          fix->forwards = ((1 << 15) - 4);
++          fix->backwards = (1 << 15);
++        }
++  else if (GET_CODE (body) == UNSPEC_VOLATILE
++           && XINT (body, 1) == VUNSPEC_MVRC)
++    {
++      /* Coprocessor load */
++      /* Ldc : Ku8 << 2 */
++      fix->forwards = ((1 << 8) - 1) << 2;
++      fix->backwards = 0;
++    }
++  else
++    {
++      /* Assume worst case which is lddpc insn. */
++      fix->forwards = ((1 << 7) - 1) << 2;
++      fix->backwards = 0;
++    }
++
++  fix->minipool = NULL;
++
++  /* If an insn doesn't have a range defined for it, then it isn't expecting
++     to be reworked by this code.  Better to abort now than to generate duff
++     assembly code.  */
++  if (fix->forwards == 0 && fix->backwards == 0)
++    abort ();
++
++  if (dump_file)
++    {
++      fprintf (dump_file,
++	       ";; %smode fixup for i%d; addr %lu, range (%ld,%ld): ",
++	       GET_MODE_NAME (mode),
++	       INSN_UID (insn), (unsigned long) address,
++	       -1 * (long) fix->backwards, (long) fix->forwards);
++      avr32_print_value (dump_file, fix->value);
++      fprintf (dump_file, "\n");
++    }
++
++  /* Add it to the chain of fixes.  */
++  fix->next = NULL;
++
++  if (minipool_fix_head != NULL)
++    minipool_fix_tail->next = fix;
++  else
++    minipool_fix_head = fix;
++
++  minipool_fix_tail = fix;
++}
++
++
++/* Scan INSN and note any of its operands that need fixing.
++   If DO_PUSHES is false we do not actually push any of the fixups
++   needed.  The function returns TRUE is any fixups were needed/pushed.
++   This is used by avr32_memory_load_p() which needs to know about loads
++   of constants that will be converted into minipool loads.  */
++static bool
++note_invalid_constants (rtx insn, HOST_WIDE_INT address, int do_pushes)
++{
++  bool result = false;
++  int opno;
++
++  extract_insn (insn);
++
++  if (!constrain_operands (1))
++    fatal_insn_not_found (insn);
++
++  if (recog_data.n_alternatives == 0)
++    return false;
++
++  /* Fill in recog_op_alt with information about the constraints of this
++     insn.  */
++  preprocess_constraints ();
++
++  for (opno = 0; opno < recog_data.n_operands; opno++)
++    {
++      rtx op;
++
++      /* Things we need to fix can only occur in inputs.  */
++      if (recog_data.operand_type[opno] != OP_IN)
++	continue;
++
++      op = recog_data.operand[opno];
++
++      if (avr32_const_pool_ref_operand (op, GET_MODE (op)))
++	{
++	  if (do_pushes)
++	    {
++	      rtx cop = avoid_constant_pool_reference (op);
++
++	      /* Casting the address of something to a mode narrower than a
++	         word can cause avoid_constant_pool_reference() to return the
++	         pool reference itself.  That's no good to us here.  Lets
++	         just hope that we can use the constant pool value directly.
++	       */
++	      if (op == cop)
++		cop = get_pool_constant (XEXP (op, 0));
++
++	      push_minipool_fix (insn, address,
++				 recog_data.operand_loc[opno],
++				 recog_data.operand_mode[opno], cop);
++	    }
++
++	  result = true;
++	}
++      else if (TARGET_HAS_ASM_ADDR_PSEUDOS
++	       && avr32_address_operand (op, GET_MODE (op)))
++	{
++	  /* Handle pseudo instructions using a direct address. These pseudo
++	     instructions might need entries in the constant pool and we must
++	     therefor create a constant pool for them, in case the
++	     assembler/linker needs to insert entries. */
++	  if (do_pushes)
++	    {
++	      /* Push a dummy constant pool entry so that the .cpool
++	         directive should be inserted on the appropriate place in the
++	         code even if there are no real constant pool entries. This
++	         is used by the assembler and linker to know where to put
++	         generated constant pool entries. */
++	      push_minipool_fix (insn, address,
++				 recog_data.operand_loc[opno],
++				 recog_data.operand_mode[opno],
++				 gen_rtx_UNSPEC (VOIDmode,
++						 gen_rtvec (1, const0_rtx),
++						 UNSPEC_FORCE_MINIPOOL));
++	      result = true;
++	    }
++	}
++    }
++  return result;
++}
++
++
++static int
++avr32_insn_is_cast (rtx insn)
++{
++
++  if (NONJUMP_INSN_P (insn)
++      && GET_CODE (PATTERN (insn)) == SET
++      && (GET_CODE (SET_SRC (PATTERN (insn))) == ZERO_EXTEND
++	  || GET_CODE (SET_SRC (PATTERN (insn))) == SIGN_EXTEND)
++      && REG_P (XEXP (SET_SRC (PATTERN (insn)), 0))
++      && REG_P (SET_DEST (PATTERN (insn))))
++    return true;
++  return false;
++}
++
++
++/* Replace all occurances of reg FROM with reg TO in X. */
++rtx
++avr32_replace_reg (rtx x, rtx from, rtx to)
++{
++  int i, j;
++  const char *fmt;
++
++  gcc_assert ( REG_P (from) && REG_P (to) );
++
++  /* Allow this function to make replacements in EXPR_LISTs.  */
++  if (x == 0)
++    return 0;
++
++  if (rtx_equal_p (x, from))
++    return to;
++
++  if (GET_CODE (x) == SUBREG)
++    {
++      rtx new = avr32_replace_reg (SUBREG_REG (x), from, to);
++
++      if (GET_CODE (new) == CONST_INT)
++	{
++	  x = simplify_subreg (GET_MODE (x), new,
++			       GET_MODE (SUBREG_REG (x)),
++			       SUBREG_BYTE (x));
++	  gcc_assert (x);
++	}
++      else
++	SUBREG_REG (x) = new;
++
++      return x;
++    }
++  else if (GET_CODE (x) == ZERO_EXTEND)
++    {
++      rtx new = avr32_replace_reg (XEXP (x, 0), from, to);
++
++      if (GET_CODE (new) == CONST_INT)
++	{
++	  x = simplify_unary_operation (ZERO_EXTEND, GET_MODE (x),
++					new, GET_MODE (XEXP (x, 0)));
++	  gcc_assert (x);
++	}
++      else
++	XEXP (x, 0) = new;
++
++      return x;
++    }
++
++  fmt = GET_RTX_FORMAT (GET_CODE (x));
++  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
++    {
++      if (fmt[i] == 'e')
++	XEXP (x, i) = avr32_replace_reg (XEXP (x, i), from, to);
++      else if (fmt[i] == 'E')
++	for (j = XVECLEN (x, i) - 1; j >= 0; j--)
++	  XVECEXP (x, i, j) = avr32_replace_reg (XVECEXP (x, i, j), from, to);
++    }
++
++  return x;
++}
++
++
++/* FIXME: The level of nesting in this function is way too deep. It needs to be
++   torn apart.  */
++static void
++avr32_reorg_optimization (void)
++{
++  rtx first = get_first_nonnote_insn ();
++  rtx insn;
++
++  if (TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
++    {
++
++      /* Scan through all insns looking for cast operations. */
++      if (dump_file)
++	{
++	  fprintf (dump_file, ";; Deleting redundant cast operations:\n");
++	}
++      for (insn = first; insn; insn = NEXT_INSN (insn))
++	{
++	  rtx reg, src_reg, scan;
++	  enum machine_mode mode;
++	  int unused_cast;
++	  rtx label_ref;
++
++	  if (avr32_insn_is_cast (insn)
++	      && (GET_MODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == QImode
++		  || GET_MODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == HImode))
++	    {
++	      mode = GET_MODE (XEXP (SET_SRC (PATTERN (insn)), 0));
++	      reg = SET_DEST (PATTERN (insn));
++	      src_reg = XEXP (SET_SRC (PATTERN (insn)), 0);
++	    }
++	  else
++	    {
++	      continue;
++	    }
++
++	  unused_cast = false;
++	  label_ref = NULL_RTX;
++	  for (scan = NEXT_INSN (insn); scan; scan = NEXT_INSN (scan))
++	    {
++	      /* Check if we have reached the destination of a simple
++	         conditional jump which we have already scanned past. If so,
++	         we can safely continue scanning. */
++	      if (LABEL_P (scan) && label_ref != NULL_RTX)
++		{
++		  if (CODE_LABEL_NUMBER (scan) ==
++		      CODE_LABEL_NUMBER (XEXP (label_ref, 0)))
++		    label_ref = NULL_RTX;
++		  else
++		    break;
++		}
++
++	      if (!INSN_P (scan))
++		continue;
++
++	      /* For conditional jumps we can manage to keep on scanning if
++	         we meet the destination label later on before any new jump
++	         insns occure. */
++	      if (GET_CODE (scan) == JUMP_INSN)
++		{
++		  if (any_condjump_p (scan) && label_ref == NULL_RTX)
++		    label_ref = condjump_label (scan);
++		  else
++		    break;
++		}
++
++              /* Check if we have a call and the register is used as an argument. */
++              if (CALL_P (scan)
++                  && find_reg_fusage (scan, USE, reg) )
++                break;
++
++	      if (!reg_mentioned_p (reg, PATTERN (scan)))
++		continue;
++
++	      /* Check if casted register is used in this insn */
++	      if ((regno_use_in (REGNO (reg), PATTERN (scan)) != NULL_RTX)
++		  && (GET_MODE (regno_use_in (REGNO (reg), PATTERN (scan))) ==
++		      GET_MODE (reg)))
++		{
++		  /* If not used in the source to the set or in a memory
++		     expression in the destiantion then the register is used
++		     as a destination and is really dead. */
++		  if (single_set (scan)
++		      && GET_CODE (PATTERN (scan)) == SET
++		      && REG_P (SET_DEST (PATTERN (scan)))
++		      && !regno_use_in (REGNO (reg), SET_SRC (PATTERN (scan)))
++		      && label_ref == NULL_RTX)
++		    {
++		      unused_cast = true;
++		    }
++		  break;
++		}
++
++	      /* Check if register is dead or set in this insn */
++	      if (dead_or_set_p (scan, reg))
++		{
++		  unused_cast = true;
++		  break;
++		}
++	    }
++
++	  /* Check if we have unresolved conditional jumps */
++	  if (label_ref != NULL_RTX)
++	    continue;
++
++	  if (unused_cast)
++	    {
++	      if (REGNO (reg) == REGNO (XEXP (SET_SRC (PATTERN (insn)), 0)))
++		{
++		  /* One operand cast, safe to delete */
++		  if (dump_file)
++		    {
++		      fprintf (dump_file,
++			       ";;  INSN %i removed, casted register %i value not used.\n",
++			       INSN_UID (insn), REGNO (reg));
++		    }
++		  SET_INSN_DELETED (insn);
++		  /* Force the instruction to be recognized again */
++		  INSN_CODE (insn) = -1;
++		}
++	      else
++		{
++		  /* Two operand cast, which really could be substituted with
++		     a move, if the source register is dead after the cast
++		     insn and then the insn which sets the source register
++		     could instead directly set the destination register for
++		     the cast. As long as there are no insns in between which
++		     uses the register. */
++		  rtx link = NULL_RTX;
++		  rtx set;
++		  rtx src_reg = XEXP (SET_SRC (PATTERN (insn)), 0);
++		  unused_cast = false;
++
++		  if (!find_reg_note (insn, REG_DEAD, src_reg))
++		    continue;
++
++		  /* Search for the insn which sets the source register */
++                  for (scan = PREV_INSN (insn);
++                       scan && GET_CODE (scan) != CODE_LABEL;
++                       scan = PREV_INSN (scan))
++                    {
++                      if (! INSN_P (scan))
++                        continue;
++
++		      set = single_set (scan);
++                      // Fix for bug #11763 : the following if condition
++                      // has been modified and else part is included to 
++                      // set the link to NULL_RTX. 
++                      // if (set && rtx_equal_p (src_reg, SET_DEST (set)))
++                      if (set && (REGNO(src_reg) == REGNO(SET_DEST(set))))
++                       {
++                         if (rtx_equal_p (src_reg, SET_DEST (set)))
++			  {
++			    link = scan;
++			    break;
++                          }
++                         else
++                          {
++                            link = NULL_RTX;
++                            break;
++                          }
++                       }
++                    }
++
++
++		  /* Found no link or link is a call insn where we can not
++		     change the destination register */
++		  if (link == NULL_RTX || CALL_P (link))
++		    continue;
++
++		  /* Scan through all insn between link and insn */
++		  for (scan = NEXT_INSN (link); scan; scan = NEXT_INSN (scan))
++		    {
++		      /* Don't try to trace forward past a CODE_LABEL if we
++		         haven't seen INSN yet.  Ordinarily, we will only
++		         find the setting insn in LOG_LINKS if it is in the
++		         same basic block.  However, cross-jumping can insert
++		         code labels in between the load and the call, and
++		         can result in situations where a single call insn
++		         may have two targets depending on where we came
++		         from.  */
++
++		      if (GET_CODE (scan) == CODE_LABEL)
++			break;
++
++		      if (!INSN_P (scan))
++			continue;
++
++		      /* Don't try to trace forward past a JUMP.  To optimize
++		         safely, we would have to check that all the
++		         instructions at the jump destination did not use REG.
++		       */
++
++		      if (GET_CODE (scan) == JUMP_INSN)
++			{
++			  break;
++			}
++
++		      if (!reg_mentioned_p (src_reg, PATTERN (scan)))
++			continue;
++
++		      /* We have reached the cast insn */
++		      if (scan == insn)
++			{
++			  /* We can remove cast and replace the destination
++			     register of the link insn with the destination
++			     of the cast */
++			  if (dump_file)
++			    {
++			      fprintf (dump_file,
++				       ";;  INSN %i removed, casted value unused. "
++				       "Destination of removed cast operation: register %i,  folded into INSN %i.\n",
++				       INSN_UID (insn), REGNO (reg),
++				       INSN_UID (link));
++			    }
++			  /* Update link insn */
++			  SET_DEST (PATTERN (link)) =
++			    gen_rtx_REG (mode, REGNO (reg));
++			  /* Force the instruction to be recognized again */
++			  INSN_CODE (link) = -1;
++
++			  /* Delete insn */
++			  SET_INSN_DELETED (insn);
++			  /* Force the instruction to be recognized again */
++			  INSN_CODE (insn) = -1;
++			  break;
++			}
++		    }
++		}
++	    }
++	}
++    }
++
++  if (TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
++    {
++
++      /* Scan through all insns looking for shifted add operations */
++      if (dump_file)
++	{
++	  fprintf (dump_file,
++		   ";; Deleting redundant shifted add operations:\n");
++	}
++      for (insn = first; insn; insn = NEXT_INSN (insn))
++	{
++	  rtx reg, mem_expr, scan, op0, op1;
++	  int add_only_used_as_pointer;
++
++	  if (INSN_P (insn)
++	      && GET_CODE (PATTERN (insn)) == SET
++	      && GET_CODE (SET_SRC (PATTERN (insn))) == PLUS
++	      && (GET_CODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == MULT
++		  || GET_CODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == ASHIFT)
++	      && GET_CODE (XEXP (XEXP (SET_SRC (PATTERN (insn)), 0), 1)) ==
++	      CONST_INT && REG_P (SET_DEST (PATTERN (insn)))
++	      && REG_P (XEXP (SET_SRC (PATTERN (insn)), 1))
++	      && REG_P (XEXP (XEXP (SET_SRC (PATTERN (insn)), 0), 0)))
++	    {
++	      reg = SET_DEST (PATTERN (insn));
++	      mem_expr = SET_SRC (PATTERN (insn));
++	      op0 = XEXP (XEXP (mem_expr, 0), 0);
++	      op1 = XEXP (mem_expr, 1);
++	    }
++	  else
++	    {
++	      continue;
++	    }
++
++	  /* Scan forward the check if the result of the shifted add
++	     operation is only used as an address in memory operations and
++	     that the operands to the shifted add are not clobbered. */
++	  add_only_used_as_pointer = false;
++	  for (scan = NEXT_INSN (insn); scan; scan = NEXT_INSN (scan))
++	    {
++	      if (!INSN_P (scan))
++		continue;
++
++	      /* Don't try to trace forward past a JUMP or CALL.  To optimize
++	         safely, we would have to check that all the instructions at
++	         the jump destination did not use REG.  */
++
++	      if (GET_CODE (scan) == JUMP_INSN)
++		{
++		  break;
++		}
++
++	      /* If used in a call insn then we cannot optimize it away */
++	      if (CALL_P (scan) && find_regno_fusage (scan, USE, REGNO (reg)))
++		break;
++
++	      /* If any of the operands of the shifted add are clobbered we
++	         cannot optimize the shifted adda away */
++	      if ((reg_set_p (op0, scan) && (REGNO (op0) != REGNO (reg)))
++		  || (reg_set_p (op1, scan) && (REGNO (op1) != REGNO (reg))))
++		break;
++
++	      if (!reg_mentioned_p (reg, PATTERN (scan)))
++		continue;
++
++	      /* If used any other place than as a pointer or as the
++	         destination register we failed */
++              if (!(single_set (scan)
++                    && GET_CODE (PATTERN (scan)) == SET
++                    && ((MEM_P (SET_DEST (PATTERN (scan)))
++                         && REG_P (XEXP (SET_DEST (PATTERN (scan)), 0))
++                         && REGNO (XEXP (SET_DEST (PATTERN (scan)), 0)) == REGNO (reg))
++                        || (MEM_P (SET_SRC (PATTERN (scan)))
++                            && REG_P (XEXP (SET_SRC (PATTERN (scan)), 0))
++                            && REGNO (XEXP
++                                      (SET_SRC (PATTERN (scan)), 0)) == REGNO (reg))))
++                  && !(GET_CODE (PATTERN (scan)) == SET
++                       && REG_P (SET_DEST (PATTERN (scan)))
++                       && !regno_use_in (REGNO (reg),
++                                         SET_SRC (PATTERN (scan)))))
++                break;
++
++              /* We cannot replace the pointer in TImode insns
++                 as these has a differene addressing mode than the other
++                 memory insns. */
++              if ( GET_MODE (SET_DEST (PATTERN (scan))) == TImode )
++                break;
++
++	      /* Check if register is dead or set in this insn */
++	      if (dead_or_set_p (scan, reg))
++		{
++		  add_only_used_as_pointer = true;
++		  break;
++		}
++	    }
++
++	  if (add_only_used_as_pointer)
++	    {
++	      /* Lets delete the add insn and replace all memory references
++	         which uses the pointer with the full expression. */
++	      if (dump_file)
++		{
++		  fprintf (dump_file,
++			   ";; Deleting INSN %i since address expression can be folded into all "
++			   "memory references using this expression\n",
++			   INSN_UID (insn));
++		}
++	      SET_INSN_DELETED (insn);
++	      /* Force the instruction to be recognized again */
++	      INSN_CODE (insn) = -1;
++
++	      for (scan = NEXT_INSN (insn); scan; scan = NEXT_INSN (scan))
++		{
++		  if (!INSN_P (scan))
++		    continue;
++
++		  if (!reg_mentioned_p (reg, PATTERN (scan)))
++		    continue;
++
++		  /* If used any other place than as a pointer or as the
++		     destination register we failed */
++		  if ((single_set (scan)
++		       && GET_CODE (PATTERN (scan)) == SET
++		       && ((MEM_P (SET_DEST (PATTERN (scan)))
++			    && REG_P (XEXP (SET_DEST (PATTERN (scan)), 0))
++			    && REGNO (XEXP (SET_DEST (PATTERN (scan)), 0)) ==
++			    REGNO (reg)) || (MEM_P (SET_SRC (PATTERN (scan)))
++					     &&
++					     REG_P (XEXP
++						    (SET_SRC (PATTERN (scan)),
++						     0))
++					     &&
++					     REGNO (XEXP
++						    (SET_SRC (PATTERN (scan)),
++						     0)) == REGNO (reg)))))
++		    {
++		      if (dump_file)
++			{
++			  fprintf (dump_file,
++				   ";; Register %i replaced by indexed address in INSN %i\n",
++				   REGNO (reg), INSN_UID (scan));
++			}
++		      if (MEM_P (SET_DEST (PATTERN (scan))))
++			XEXP (SET_DEST (PATTERN (scan)), 0) = mem_expr;
++		      else
++			XEXP (SET_SRC (PATTERN (scan)), 0) = mem_expr;
++		    }
++
++		  /* Check if register is dead or set in this insn */
++		  if (dead_or_set_p (scan, reg))
++		    {
++		      break;
++		    }
++
++		}
++	    }
++	}
++    }
++
++
++  if (TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
++    {
++
++      /* Scan through all insns looking for conditional register to
++         register move operations */
++      if (dump_file)
++	{
++	  fprintf (dump_file,
++		   ";; Folding redundant conditional move operations:\n");
++	}
++      for (insn = first; insn; insn = next_nonnote_insn (insn))
++	{
++	  rtx src_reg, dst_reg, scan, test;
++
++	  if (INSN_P (insn)
++              && GET_CODE (PATTERN (insn)) == COND_EXEC
++	      && GET_CODE (COND_EXEC_CODE (PATTERN (insn))) == SET
++	      && REG_P (SET_SRC (COND_EXEC_CODE (PATTERN (insn))))
++	      && REG_P (SET_DEST (COND_EXEC_CODE (PATTERN (insn))))
++              && find_reg_note (insn, REG_DEAD, SET_SRC (COND_EXEC_CODE (PATTERN (insn)))))
++	    {
++	      src_reg = SET_SRC (COND_EXEC_CODE (PATTERN (insn)));
++	      dst_reg = SET_DEST (COND_EXEC_CODE (PATTERN (insn)));
++              test = COND_EXEC_TEST (PATTERN (insn));
++	    }
++	  else
++	    {
++	      continue;
++	    }
++
++          /* Scan backward through the rest of insns in this if-then or if-else
++             block and check if we can fold the move into another of the conditional
++             insns in the same block. */
++          scan = prev_nonnote_insn (insn);
++          while (INSN_P (scan)
++                 && GET_CODE (PATTERN (scan)) == COND_EXEC
++                 && rtx_equal_p (COND_EXEC_TEST (PATTERN (scan)), test))
++            {
++              rtx pattern = COND_EXEC_CODE (PATTERN (scan));
++              if ( GET_CODE (pattern) == PARALLEL )
++                pattern = XVECEXP (pattern, 0, 0);
++
++              if ( reg_set_p (src_reg, pattern) )
++                {
++                  /* Fold in the destination register for the cond. move
++                     into this insn. */
++                  SET_DEST (pattern) = dst_reg;
++                  if (dump_file)
++                    {
++                      fprintf (dump_file,
++                               ";; Deleting INSN %i since this operation can be folded into INSN %i\n",
++                               INSN_UID (insn), INSN_UID (scan));
++                    }
++
++                  /* Scan and check if any of the insns in between uses the src_reg. We
++                     must then replace it with the dst_reg. */
++                  while ( (scan = next_nonnote_insn (scan)) != insn ){
++                    avr32_replace_reg (scan, src_reg, dst_reg);
++                  }
++                  /* Delete the insn. */
++                  SET_INSN_DELETED (insn);
++
++                  /* Force the instruction to be recognized again */
++                  INSN_CODE (insn) = -1;
++                  break;
++                }
++
++              /* If the destination register is used but not set in this insn
++                 we cannot fold. */
++              if ( reg_mentioned_p (dst_reg, pattern) )
++                break;
++
++              scan = prev_nonnote_insn (scan);
++            }
++        }
++    }
++
++}
++
++
++/* Exported to toplev.c.
++
++   Do a final pass over the function, just before delayed branch
++   scheduling.  */
++static void
++avr32_reorg (void)
++{
++  rtx insn;
++  HOST_WIDE_INT address = 0;
++  Mfix *fix;
++
++  minipool_fix_head = minipool_fix_tail = NULL;
++
++  /* The first insn must always be a note, or the code below won't scan it
++     properly.  */
++  insn = get_insns ();
++  if (GET_CODE (insn) != NOTE)
++    abort ();
++
++  /* Scan all the insns and record the operands that will need fixing.  */
++  for (insn = next_nonnote_insn (insn); insn; insn = next_nonnote_insn (insn))
++    {
++      if (GET_CODE (insn) == BARRIER)
++	push_minipool_barrier (insn, address);
++      else if (INSN_P (insn))
++	{
++	  rtx table;
++
++	  note_invalid_constants (insn, address, true);
++	  address += get_attr_length (insn);
++
++	  /* If the insn is a vector jump, add the size of the table and skip
++	     the table.  */
++	  if ((table = is_jump_table (insn)) != NULL)
++	    {
++	      address += get_jump_table_size (table);
++	      insn = table;
++	    }
++	}
++    }
++
++  fix = minipool_fix_head;
++
++  /* Now scan the fixups and perform the required changes.  */
++  while (fix)
++    {
++      Mfix *ftmp;
++      Mfix *fdel;
++      Mfix *last_added_fix;
++      Mfix *last_barrier = NULL;
++      Mfix *this_fix;
++
++      /* Skip any further barriers before the next fix.  */
++      while (fix && GET_CODE (fix->insn) == BARRIER)
++	fix = fix->next;
++
++      /* No more fixes.  */
++      if (fix == NULL)
++	break;
++
++      last_added_fix = NULL;
++
++      for (ftmp = fix; ftmp; ftmp = ftmp->next)
++	{
++	  if (GET_CODE (ftmp->insn) == BARRIER)
++	    {
++	      if (ftmp->address >= minipool_vector_head->max_address)
++		break;
++
++	      last_barrier = ftmp;
++	    }
++	  else if ((ftmp->minipool = add_minipool_forward_ref (ftmp)) == NULL)
++	    break;
++
++	  last_added_fix = ftmp;	/* Keep track of the last fix added.
++					 */
++	}
++
++      /* If we found a barrier, drop back to that; any fixes that we could
++         have reached but come after the barrier will now go in the next
++         mini-pool.  */
++      if (last_barrier != NULL)
++	{
++	  /* Reduce the refcount for those fixes that won't go into this pool
++	     after all.  */
++	  for (fdel = last_barrier->next;
++	       fdel && fdel != ftmp; fdel = fdel->next)
++	    {
++	      fdel->minipool->refcount--;
++	      fdel->minipool = NULL;
++	    }
++
++	  ftmp = last_barrier;
++	}
++      else
++	{
++	  /* ftmp is first fix that we can't fit into this pool and there no
++	     natural barriers that we could use.  Insert a new barrier in the
++	     code somewhere between the previous fix and this one, and
++	     arrange to jump around it.  */
++	  HOST_WIDE_INT max_address;
++
++	  /* The last item on the list of fixes must be a barrier, so we can
++	     never run off the end of the list of fixes without last_barrier
++	     being set.  */
++	  if (ftmp == NULL)
++	    abort ();
++
++	  max_address = minipool_vector_head->max_address;
++	  /* Check that there isn't another fix that is in range that we
++	     couldn't fit into this pool because the pool was already too
++	     large: we need to put the pool before such an instruction.  */
++	  if (ftmp->address < max_address)
++	    max_address = ftmp->address;
++
++	  last_barrier = create_fix_barrier (last_added_fix, max_address);
++	}
++
++      assign_minipool_offsets (last_barrier);
++
++      while (ftmp)
++	{
++	  if (GET_CODE (ftmp->insn) != BARRIER
++	      && ((ftmp->minipool = add_minipool_backward_ref (ftmp))
++		  == NULL))
++	    break;
++
++	  ftmp = ftmp->next;
++	}
++
++      /* Scan over the fixes we have identified for this pool, fixing them up
++         and adding the constants to the pool itself.  */
++        for (this_fix = fix; this_fix && ftmp != this_fix;
++             this_fix = this_fix->next)
++          if (GET_CODE (this_fix->insn) != BARRIER
++              /* Do nothing for entries present just to force the insertion of
++	       a minipool. */
++	    && !IS_FORCE_MINIPOOL (this_fix->value))
++	  {
++	    rtx addr = plus_constant (gen_rtx_LABEL_REF (VOIDmode,
++							 minipool_vector_label),
++				      this_fix->minipool->offset);
++	    *this_fix->loc = gen_rtx_MEM (this_fix->mode, addr);
++	  }
++
++      dump_minipool (last_barrier->insn);
++      fix = ftmp;
++    }
++
++  /* Free the minipool memory.  */
++  obstack_free (&minipool_obstack, minipool_startobj);
++
++  avr32_reorg_optimization ();
++}
++
++
++/* Hook for doing some final scanning of instructions. Does nothing yet...*/
++void
++avr32_final_prescan_insn (rtx insn ATTRIBUTE_UNUSED,
++			  rtx * opvec ATTRIBUTE_UNUSED,
++			  int noperands ATTRIBUTE_UNUSED)
++{
++  return;
++}
++
++
++/* Function for changing the condition on the next instruction,
++   should be used when emmiting compare instructions and
++   the condition of the next instruction needs to change.
++*/
++int
++set_next_insn_cond (rtx cur_insn, rtx new_cond)
++{
++  rtx next_insn = next_nonnote_insn (cur_insn);
++   if ((next_insn != NULL_RTX)
++       && (INSN_P (next_insn)))
++     {
++       if ((GET_CODE (PATTERN (next_insn)) == SET)
++           && (GET_CODE (SET_SRC (PATTERN (next_insn))) == IF_THEN_ELSE))
++         {
++           /* Branch instructions */
++           XEXP (SET_SRC (PATTERN (next_insn)), 0) = new_cond;
++           /* Force the instruction to be recognized again */
++           INSN_CODE (next_insn) = -1;
++           return TRUE;
++         }
++       else if ((GET_CODE (PATTERN (next_insn)) == SET)
++                && avr32_comparison_operator (SET_SRC (PATTERN (next_insn)),
++                                              GET_MODE (SET_SRC (PATTERN (next_insn)))))
++         {
++           /* scc with no compare */
++           SET_SRC (PATTERN (next_insn)) = new_cond;
++           /* Force the instruction to be recognized again */
++           INSN_CODE (next_insn) = -1;
++           return TRUE;
++         }
++       else if (GET_CODE (PATTERN (next_insn)) == COND_EXEC)
++         {
++           if ( GET_CODE (new_cond) == UNSPEC )
++             {
++               COND_EXEC_TEST (PATTERN (next_insn)) =
++                 gen_rtx_UNSPEC (CCmode,
++                                 gen_rtvec (2,
++                                            XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 0),
++                                            XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 1)),
++                                 XINT (new_cond, 1));
++             }
++           else
++             {
++               PUT_CODE(COND_EXEC_TEST (PATTERN (next_insn)), GET_CODE(new_cond));
++             }
++         }
++     }
++
++  return FALSE;
++}
++
++
++/* Function for obtaining the condition for the next instruction after cur_insn.
++*/
++rtx
++get_next_insn_cond (rtx cur_insn)
++{
++  rtx next_insn = next_nonnote_insn (cur_insn);
++  rtx cond = NULL_RTX;
++  if (next_insn != NULL_RTX
++      && INSN_P (next_insn))
++    {
++      if ((GET_CODE (PATTERN (next_insn)) == SET)
++          && (GET_CODE (SET_SRC (PATTERN (next_insn))) == IF_THEN_ELSE))
++        {
++          /* Branch and cond if then else instructions */
++          cond = XEXP (SET_SRC (PATTERN (next_insn)), 0);
++        }
++      else if ((GET_CODE (PATTERN (next_insn)) == SET)
++               && avr32_comparison_operator (SET_SRC (PATTERN (next_insn)),
++                                             GET_MODE (SET_SRC (PATTERN (next_insn)))))
++        {
++          /* scc with no compare */
++          cond = SET_SRC (PATTERN (next_insn));
++        }
++      else if (GET_CODE (PATTERN (next_insn)) == COND_EXEC)
++        {
++          cond = COND_EXEC_TEST (PATTERN (next_insn));
++        }
++    }
++  return cond;
++}
++
++
++/* Check if the next insn is a conditional insn that will emit a compare
++   for itself.
++*/
++rtx
++next_insn_emits_cmp (rtx cur_insn)
++{
++  rtx next_insn = next_nonnote_insn (cur_insn);
++  rtx cond = NULL_RTX;
++  if (next_insn != NULL_RTX
++      && INSN_P (next_insn))
++    {
++      if ( ((GET_CODE (PATTERN (next_insn)) == SET)
++            && (GET_CODE (SET_SRC (PATTERN (next_insn))) == IF_THEN_ELSE)
++            && (XEXP (XEXP (SET_SRC (PATTERN (next_insn)), 0),0) != cc0_rtx))
++           || GET_CODE (PATTERN (next_insn)) == COND_EXEC )
++        return TRUE;
++    }
++  return FALSE;
++}
++
++
++rtx
++avr32_output_cmp (rtx cond, enum machine_mode mode, rtx op0, rtx op1)
++{
++
++  rtx new_cond = NULL_RTX;
++  rtx ops[2];
++  rtx compare_pattern;
++  ops[0] = op0;
++  ops[1] = op1;
++
++  if ( GET_CODE (op0) == AND )
++    compare_pattern = op0;
++  else
++    compare_pattern = gen_rtx_COMPARE (mode, op0, op1);
++
++  new_cond = is_compare_redundant (compare_pattern, cond);
++
++  if (new_cond != NULL_RTX)
++    return new_cond;
++
++  /* Check if we are inserting a bit-load instead of a compare. */
++  if ( GET_CODE (op0) == AND )
++    {
++      ops[0] = XEXP (op0, 0);
++      ops[1] = XEXP (op0, 1);
++      output_asm_insn ("bld\t%0, %p1", ops);
++      return cond;
++    }
++
++  /* Insert compare */
++  switch (mode)
++    {
++    case QImode:
++      output_asm_insn ("cp.b\t%0, %1", ops);
++      break;
++    case HImode:
++      output_asm_insn ("cp.h\t%0, %1", ops);
++      break;
++    case SImode:
++      output_asm_insn ("cp.w\t%0, %1", ops);
++      break;
++    case DImode:
++      if (GET_CODE (op1) != REG)
++	output_asm_insn ("cp.w\t%0, %1\ncpc\t%m0", ops);
++      else
++	output_asm_insn ("cp.w\t%0, %1\ncpc\t%m0, %m1", ops);
++      break;
++    default:
++      internal_error ("Unknown comparison mode");
++      break;
++    }
++
++  return cond;
++}
++
++
++int
++avr32_load_multiple_operation (rtx op,
++			       enum machine_mode mode ATTRIBUTE_UNUSED)
++{
++  int count = XVECLEN (op, 0);
++  unsigned int dest_regno;
++  rtx src_addr;
++  rtx elt;
++  int i = 1, base = 0;
++
++  if (count <= 1 || GET_CODE (XVECEXP (op, 0, 0)) != SET)
++    return 0;
++
++  /* Check to see if this might be a write-back.  */
++  if (GET_CODE (SET_SRC (elt = XVECEXP (op, 0, 0))) == PLUS)
++    {
++      i++;
++      base = 1;
++
++      /* Now check it more carefully.  */
++      if (GET_CODE (SET_DEST (elt)) != REG
++	  || GET_CODE (XEXP (SET_SRC (elt), 0)) != REG
++	  || GET_CODE (XEXP (SET_SRC (elt), 1)) != CONST_INT
++	  || INTVAL (XEXP (SET_SRC (elt), 1)) != (count - 1) * 4)
++	return 0;
++    }
++
++  /* Perform a quick check so we don't blow up below.  */
++  if (count <= 1
++      || GET_CODE (XVECEXP (op, 0, i - 1)) != SET
++      || GET_CODE (SET_DEST (XVECEXP (op, 0, i - 1))) != REG
++      || GET_CODE (SET_SRC (XVECEXP (op, 0, i - 1))) != UNSPEC)
++    return 0;
++
++  dest_regno = REGNO (SET_DEST (XVECEXP (op, 0, i - 1)));
++  src_addr = XEXP (SET_SRC (XVECEXP (op, 0, i - 1)), 0);
++
++  for (; i < count; i++)
++    {
++      elt = XVECEXP (op, 0, i);
++
++      if (GET_CODE (elt) != SET
++	  || GET_CODE (SET_DEST (elt)) != REG
++	  || GET_MODE (SET_DEST (elt)) != SImode
++	  || GET_CODE (SET_SRC (elt)) != UNSPEC)
++	return 0;
++    }
++
++  return 1;
++}
++
++
++int
++avr32_store_multiple_operation (rtx op,
++				enum machine_mode mode ATTRIBUTE_UNUSED)
++{
++  int count = XVECLEN (op, 0);
++  int src_regno;
++  rtx dest_addr;
++  rtx elt;
++  int i = 1;
++
++  if (count <= 1 || GET_CODE (XVECEXP (op, 0, 0)) != SET)
++    return 0;
++
++  /* Perform a quick check so we don't blow up below.  */
++  if (count <= i
++      || GET_CODE (XVECEXP (op, 0, i - 1)) != SET
++      || GET_CODE (SET_DEST (XVECEXP (op, 0, i - 1))) != MEM
++      || GET_CODE (SET_SRC (XVECEXP (op, 0, i - 1))) != UNSPEC)
++    return 0;
++
++  src_regno = REGNO (SET_SRC (XVECEXP (op, 0, i - 1)));
++  dest_addr = XEXP (SET_DEST (XVECEXP (op, 0, i - 1)), 0);
++
++  for (; i < count; i++)
++    {
++      elt = XVECEXP (op, 0, i);
++
++      if (GET_CODE (elt) != SET
++	  || GET_CODE (SET_DEST (elt)) != MEM
++	  || GET_MODE (SET_DEST (elt)) != SImode
++	  || GET_CODE (SET_SRC (elt)) != UNSPEC)
++	return 0;
++    }
++
++  return 1;
++}
++
++
++int
++avr32_valid_macmac_bypass (rtx insn_out, rtx insn_in)
++{
++  /* Check if they use the same accumulator */
++  if (rtx_equal_p
++      (SET_DEST (PATTERN (insn_out)), SET_DEST (PATTERN (insn_in))))
++    {
++      return TRUE;
++    }
++
++  return FALSE;
++}
++
++
++int
++avr32_valid_mulmac_bypass (rtx insn_out, rtx insn_in)
++{
++  /*
++     Check if the mul instruction produces the accumulator for the mac
++     instruction. */
++  if (rtx_equal_p
++      (SET_DEST (PATTERN (insn_out)), SET_DEST (PATTERN (insn_in))))
++    {
++      return TRUE;
++    }
++  return FALSE;
++}
++
++
++int
++avr32_store_bypass (rtx insn_out, rtx insn_in)
++{
++  /* Only valid bypass if the output result is used as an src in the store
++     instruction, NOT if used as a pointer or base. */
++  if (rtx_equal_p
++      (SET_DEST (PATTERN (insn_out)), SET_SRC (PATTERN (insn_in))))
++    {
++      return TRUE;
++    }
++
++  return FALSE;
++}
++
++
++int
++avr32_mul_waw_bypass (rtx insn_out, rtx insn_in)
++{
++  /* Check if the register holding the result from the mul instruction is
++     used as a result register in the input instruction. */
++  if (rtx_equal_p
++      (SET_DEST (PATTERN (insn_out)), SET_DEST (PATTERN (insn_in))))
++    {
++      return TRUE;
++    }
++
++  return FALSE;
++}
++
++
++int
++avr32_valid_load_double_bypass (rtx insn_out, rtx insn_in)
++{
++  /* Check if the first loaded word in insn_out is used in insn_in. */
++  rtx dst_reg;
++  rtx second_loaded_reg;
++
++  /* If this is a double alu operation then the bypass is not valid */
++  if ((get_attr_type (insn_in) == TYPE_ALU
++       || get_attr_type (insn_in) == TYPE_ALU2)
++      && (GET_MODE_SIZE (GET_MODE (SET_DEST (PATTERN (insn_out)))) > 4))
++    return FALSE;
++
++  /* Get the destination register in the load */
++  if (!REG_P (SET_DEST (PATTERN (insn_out))))
++    return FALSE;
++
++  dst_reg = SET_DEST (PATTERN (insn_out));
++  second_loaded_reg = gen_rtx_REG (SImode, REGNO (dst_reg) + 1);
++
++  if (!reg_mentioned_p (second_loaded_reg, PATTERN (insn_in)))
++    return TRUE;
++
++  return FALSE;
++}
++
++
++int
++avr32_valid_load_quad_bypass (rtx insn_out, rtx insn_in)
++{
++  /*
++     Check if the two first loaded word in insn_out are used in insn_in. */
++  rtx dst_reg;
++  rtx third_loaded_reg, fourth_loaded_reg;
++
++  /* Get the destination register in the load */
++  if (!REG_P (SET_DEST (PATTERN (insn_out))))
++    return FALSE;
++
++  dst_reg = SET_DEST (PATTERN (insn_out));
++  third_loaded_reg = gen_rtx_REG (SImode, REGNO (dst_reg) + 2);
++  fourth_loaded_reg = gen_rtx_REG (SImode, REGNO (dst_reg) + 3);
++
++  if (!reg_mentioned_p (third_loaded_reg, PATTERN (insn_in))
++      && !reg_mentioned_p (fourth_loaded_reg, PATTERN (insn_in)))
++    {
++      return TRUE;
++    }
++
++  return FALSE;
++}
++
++
++rtx
++avr32_ifcvt_modify_test (ce_if_block_t *ce_info, rtx test )
++{
++  rtx branch_insn;
++  rtx cmp_test;
++  rtx compare_op0;
++  rtx compare_op1;
++
++
++  if ( !ce_info
++       || test == NULL_RTX
++       || !reg_mentioned_p (cc0_rtx, test))
++    return test;
++
++  branch_insn = BB_END (ce_info->test_bb);
++  cmp_test = PATTERN(prev_nonnote_insn (branch_insn));
++
++  if (GET_CODE(cmp_test) != SET
++      || !CC0_P(XEXP(cmp_test, 0)) )
++    return cmp_test;
++
++  if ( GET_CODE(SET_SRC(cmp_test)) == COMPARE ){
++    compare_op0 = XEXP(SET_SRC(cmp_test), 0);
++    compare_op1 = XEXP(SET_SRC(cmp_test), 1);
++  } else {
++    compare_op0 = SET_SRC(cmp_test);
++    compare_op1 = const0_rtx;
++  }
++
++  return gen_rtx_fmt_ee (GET_CODE(test), GET_MODE (compare_op0),
++                         compare_op0, compare_op1);
++}
++
++
++rtx
++avr32_ifcvt_modify_insn (ce_if_block_t *ce_info, rtx pattern, rtx insn,
++                         int *num_true_changes)
++{
++  rtx test = COND_EXEC_TEST(pattern);
++  rtx op = COND_EXEC_CODE(pattern);
++  rtx cmp_insn;
++  rtx cond_exec_insn;
++  int inputs_set_outside_ifblock = 1;
++  basic_block current_bb = BLOCK_FOR_INSN (insn);
++  rtx bb_insn ;
++  enum machine_mode mode = GET_MODE (XEXP (op, 0));
++
++  if (CC0_P(XEXP(test, 0)))
++    test = avr32_ifcvt_modify_test (ce_info,
++                                    test );
++
++  /* We do not support multiple tests. */
++  if ( ce_info
++       && ce_info->num_multiple_test_blocks > 0 )
++    return NULL_RTX;
++
++  pattern = gen_rtx_COND_EXEC (VOIDmode, test, op);
++
++  if ( !reload_completed )
++    {
++      rtx start;
++      int num_insns;
++      int max_insns = MAX_CONDITIONAL_EXECUTE;
++
++      if ( !ce_info )
++        return op;
++
++      /* Check if the insn is not suitable for conditional
++         execution. */
++      start_sequence ();
++      cond_exec_insn = emit_insn (pattern);
++      if ( recog_memoized (cond_exec_insn) < 0
++           && can_create_pseudo_p () )
++        {
++          /* Insn is not suitable for conditional execution, try
++             to fix it up by using an extra scratch register or
++             by pulling the operation outside the if-then-else
++             and then emiting a conditional move inside the if-then-else. */
++          end_sequence ();
++          if ( GET_CODE (op) != SET
++               || !REG_P (SET_DEST (op))
++               || GET_CODE (SET_SRC (op)) == IF_THEN_ELSE
++               || GET_MODE_SIZE (mode) > UNITS_PER_WORD )
++            return NULL_RTX;
++
++          /* Check if any of the input operands to the insn is set inside the
++             current block. */
++          if ( current_bb->index == ce_info->then_bb->index )
++            start = PREV_INSN (BB_HEAD (ce_info->then_bb));
++          else
++            start = PREV_INSN (BB_HEAD (ce_info->else_bb));
++
++
++          for ( bb_insn = next_nonnote_insn (start); bb_insn != insn; bb_insn = next_nonnote_insn (bb_insn) )
++            {
++              rtx set = single_set (bb_insn);
++
++              if ( set && reg_mentioned_p (SET_DEST (set), SET_SRC (op)))
++                {
++                  inputs_set_outside_ifblock = 0;
++                  break;
++                }
++            }
++
++          cmp_insn = prev_nonnote_insn (BB_END (ce_info->test_bb));
++
++
++          /* Check if we can insert more insns. */
++          num_insns = ( ce_info->num_then_insns +
++                        ce_info->num_else_insns +
++                        ce_info->num_cond_clobber_insns +
++                        ce_info->num_extra_move_insns );
++
++          if ( ce_info->num_else_insns != 0 )
++            max_insns *=2;
++
++          if ( num_insns >= max_insns )
++            return NULL_RTX;
++
++          /* Check if we have an instruction which might be converted to
++             conditional form if we give it a scratch register to clobber. */
++          {
++            rtx clobber_insn;
++            rtx scratch_reg = gen_reg_rtx (mode);
++            rtx new_pattern = copy_rtx (pattern);
++            rtx set_src = SET_SRC (COND_EXEC_CODE (new_pattern));
++
++            rtx clobber = gen_rtx_CLOBBER (mode, scratch_reg);
++            rtx vec[2] = { COND_EXEC_CODE (new_pattern), clobber };
++            COND_EXEC_CODE (new_pattern) = gen_rtx_PARALLEL (mode, gen_rtvec_v (2, vec));
++
++            start_sequence ();
++            clobber_insn = emit_insn (new_pattern);
++
++            if ( recog_memoized (clobber_insn) >= 0
++                 && ( ( GET_RTX_LENGTH (GET_CODE (set_src)) == 2
++                        && CONST_INT_P (XEXP (set_src, 1))
++                        && avr32_const_ok_for_constraint_p (INTVAL (XEXP (set_src, 1)), 'K', "Ks08") )
++                      || !ce_info->else_bb
++                      || current_bb->index == ce_info->else_bb->index ))
++              {
++                end_sequence ();
++                /* Force the insn to be recognized again. */
++                INSN_CODE (insn) = -1;
++
++                /* If this is the first change in this IF-block then
++                   signal that we have made a change. */
++                if ( ce_info->num_cond_clobber_insns == 0
++                     && ce_info->num_extra_move_insns == 0 )
++                  *num_true_changes += 1;
++
++                ce_info->num_cond_clobber_insns++;
++
++                if (dump_file)
++                  fprintf (dump_file,
++                           "\nReplacing INSN %d with an insn using a scratch register for later ifcvt passes...\n",
++                           INSN_UID (insn));
++
++                return COND_EXEC_CODE (new_pattern);
++              }
++            end_sequence ();
++          }
++
++          if ( inputs_set_outside_ifblock )
++            {
++              /* Check if the insn before the cmp is an and which used
++                 together with the cmp can be optimized into a bld. If
++                 so then we should try to put the insn before the and
++                 so that we can catch the bld peephole. */
++              rtx set;
++              rtx insn_before_cmp_insn = prev_nonnote_insn (cmp_insn);
++              if (insn_before_cmp_insn
++                  && (set = single_set (insn_before_cmp_insn))
++                  && GET_CODE (SET_SRC (set)) == AND
++                  && one_bit_set_operand (XEXP (SET_SRC (set), 1), SImode)
++                  /* Also make sure that the insn does not set any
++                     of the input operands to the insn we are pulling out. */
++                  && !reg_mentioned_p (SET_DEST (set), SET_SRC (op)) )
++                cmp_insn = prev_nonnote_insn (cmp_insn);
++
++              /* We can try to put the operation outside the if-then-else
++                 blocks and insert a move. */
++              if ( !insn_invalid_p (insn)
++                   /* Do not allow conditional insns to be moved outside the
++                      if-then-else. */
++                   && !reg_mentioned_p (cc0_rtx, insn)
++                   /* We cannot move memory loads outside of the if-then-else
++                      since the memory access should not be perfomed if the
++                      condition is not met. */
++                   && !mem_mentioned_p (SET_SRC (op)) )
++                {
++                  rtx scratch_reg = gen_reg_rtx (mode);
++                  rtx op_pattern = copy_rtx (op);
++                  rtx new_insn, seq;
++                  rtx link, prev_link;
++                  op = copy_rtx (op);
++                  /* Emit the operation to a temp reg before the compare,
++                     and emit a move inside the if-then-else, hoping that the
++                     whole if-then-else can be converted to conditional
++                     execution. */
++                  SET_DEST (op_pattern) = scratch_reg;
++                  start_sequence ();
++                  new_insn = emit_insn (op_pattern);
++                  seq = get_insns();
++                  end_sequence ();
++
++                  /* Check again that the insn is valid. For some insns the insn might
++                     become invalid if the destination register is changed. Ie. for mulacc
++                     operations. */
++                  if ( insn_invalid_p (new_insn) )
++                    return NULL_RTX;
++
++                  emit_insn_before_setloc (seq, cmp_insn, INSN_LOCATOR (insn));
++
++                  if (dump_file)
++                    fprintf (dump_file,
++                             "\nMoving INSN %d out of IF-block by adding INSN %d...\n",
++                             INSN_UID (insn), INSN_UID (new_insn));
++
++                  ce_info->extra_move_insns[ce_info->num_extra_move_insns] = insn;
++                  ce_info->moved_insns[ce_info->num_extra_move_insns] = new_insn;
++                  XEXP (op, 1) = scratch_reg;
++                  /* Force the insn to be recognized again. */
++                  INSN_CODE (insn) = -1;
++
++                  /* Move REG_DEAD notes to the moved insn. */
++                  prev_link = NULL_RTX;
++                  for (link = REG_NOTES (insn); link; link = XEXP (link, 1))
++                    {
++                      if (REG_NOTE_KIND (link) == REG_DEAD)
++                        {
++                          /* Add the REG_DEAD note to the new insn. */
++                          rtx dead_reg = XEXP (link, 0);
++                          REG_NOTES (new_insn) = gen_rtx_EXPR_LIST (REG_DEAD, dead_reg, REG_NOTES (new_insn));
++                          /* Remove the REG_DEAD note from the insn we convert to a move. */
++                          if ( prev_link )
++                            XEXP (prev_link, 1) = XEXP (link, 1);
++                          else
++                            REG_NOTES (insn) = XEXP (link, 1);
++                        }
++                      else
++                        {
++                          prev_link = link;
++                        }
++                    }
++                  /* Add a REG_DEAD note to signal that the scratch register is dead. */
++                  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, scratch_reg, REG_NOTES (insn));
++
++                  /* If this is the first change in this IF-block then
++                     signal that we have made a change. */
++                  if ( ce_info->num_cond_clobber_insns == 0
++                       && ce_info->num_extra_move_insns == 0 )
++                    *num_true_changes += 1;
++
++                  ce_info->num_extra_move_insns++;
++                  return op;
++                }
++            }
++
++          /* We failed to fixup the insns, so this if-then-else can not be made
++             conditional. Just return NULL_RTX so that the if-then-else conversion
++             for this if-then-else will be cancelled. */
++          return NULL_RTX;
++        }
++      end_sequence ();
++      return op;
++    }
++
++  /* Signal that we have started if conversion after reload, which means
++     that it should be safe to split all the predicable clobber insns which
++     did not become cond_exec back into a simpler form if possible. */
++  cfun->machine->ifcvt_after_reload = 1;
++
++  return pattern;
++}
++
++
++void
++avr32_ifcvt_modify_cancel ( ce_if_block_t *ce_info, int *num_true_changes)
++{
++  int n;
++
++  if ( ce_info->num_extra_move_insns > 0
++       && ce_info->num_cond_clobber_insns == 0)
++    /* Signal that we did not do any changes after all. */
++    *num_true_changes -= 1;
++
++  /* Remove any inserted move insns. */
++  for ( n = 0; n < ce_info->num_extra_move_insns; n++ )
++    {
++      rtx link, prev_link;
++
++      /* Remove REG_DEAD note since we are not needing the scratch register anyway. */
++      prev_link = NULL_RTX;
++      for (link = REG_NOTES (ce_info->extra_move_insns[n]); link; link = XEXP (link, 1))
++        {
++          if (REG_NOTE_KIND (link) == REG_DEAD)
++            {
++              if ( prev_link )
++                XEXP (prev_link, 1) = XEXP (link, 1);
++              else
++                REG_NOTES (ce_info->extra_move_insns[n]) = XEXP (link, 1);
++            }
++          else
++            {
++              prev_link = link;
++            }
++        }
++
++      /* Revert all reg_notes for the moved insn. */
++      for (link = REG_NOTES (ce_info->moved_insns[n]); link; link = XEXP (link, 1))
++        {
++          REG_NOTES (ce_info->extra_move_insns[n]) = gen_rtx_EXPR_LIST (REG_NOTE_KIND (link),
++                                                                        XEXP (link, 0),
++                                                                        REG_NOTES (ce_info->extra_move_insns[n]));
++        }
++
++      /* Remove the moved insn. */
++      remove_insn ( ce_info->moved_insns[n] );
++    }
++}
++
++
++/* Function returning TRUE if INSN with OPERANDS is a splittable
++   conditional immediate clobber insn. We assume that the insn is
++   already a conditional immediate clobber insns and do not check
++   for that. */
++int
++avr32_cond_imm_clobber_splittable (rtx insn, rtx operands[])
++{
++  if ( REGNO (operands[0]) == REGNO (operands[1]) )
++    {
++      if ( (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == PLUS
++            && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'I', "Is21"))
++           || (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == MINUS
++               && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks21")))
++        return FALSE;
++    }
++  else if ( (logical_binary_operator (SET_SRC (XVECEXP (PATTERN (insn),0,0)), VOIDmode)
++             || (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == PLUS
++                 && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'I', "Is16"))
++             || (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == MINUS
++                 && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks16"))) )
++    return FALSE;
++
++  return TRUE;
++}
++
++
++/* Function for getting an integer value from a const_int or const_double
++   expression regardless of the HOST_WIDE_INT size. Each target cpu word
++   will be put into the val array where the LSW will be stored at the lowest
++   address and so forth. Assumes that const_expr is either a const_int or
++   const_double. Only valid for modes which have sizes that are a multiple
++   of the word size.
++*/
++void
++avr32_get_intval (enum machine_mode mode, rtx const_expr, HOST_WIDE_INT *val)
++{
++  int words_in_mode = GET_MODE_SIZE (mode)/UNITS_PER_WORD;
++  const int words_in_const_int = HOST_BITS_PER_WIDE_INT / BITS_PER_WORD;
++
++  if ( GET_CODE(const_expr) == CONST_DOUBLE ){
++    HOST_WIDE_INT hi = CONST_DOUBLE_HIGH(const_expr);
++    HOST_WIDE_INT lo = CONST_DOUBLE_LOW(const_expr);
++    /* Evaluate hi and lo values of const_double. */
++    avr32_get_intval (mode_for_size (HOST_BITS_PER_WIDE_INT, MODE_INT, 0),
++                      GEN_INT (lo),
++                      &val[0]);
++    avr32_get_intval (mode_for_size (HOST_BITS_PER_WIDE_INT, MODE_INT, 0),
++                      GEN_INT (hi),
++                      &val[words_in_const_int]);
++  } else if ( GET_CODE(const_expr) == CONST_INT ){
++    HOST_WIDE_INT value = INTVAL(const_expr);
++    int word;
++    for ( word = 0; (word < words_in_mode) && (word < words_in_const_int); word++ ){
++      /* Shift word up to the MSW and shift down again to extract the
++         word and sign-extend. */
++      int lshift = (words_in_const_int - word - 1) * BITS_PER_WORD;
++      int rshift = (words_in_const_int-1) * BITS_PER_WORD;
++      val[word] = (value << lshift) >> rshift;
++    }
++
++    for ( ; word < words_in_mode; word++ ){
++      /* Just put the sign bits in the remaining words. */
++      val[word] = value < 0 ? -1 : 0;
++    }
++  }
++}
++
++
++void
++avr32_split_const_expr (enum machine_mode mode, enum machine_mode new_mode,
++                        rtx expr, rtx *split_expr)
++{
++  int i, word;
++  int words_in_intval = GET_MODE_SIZE (mode)/UNITS_PER_WORD;
++  int words_in_split_values = GET_MODE_SIZE (new_mode)/UNITS_PER_WORD;
++  const int words_in_const_int = HOST_BITS_PER_WIDE_INT / BITS_PER_WORD;
++  HOST_WIDE_INT *val = alloca (words_in_intval * UNITS_PER_WORD);
++
++  avr32_get_intval (mode, expr, val);
++
++  for ( i=0; i < (words_in_intval/words_in_split_values); i++ )
++    {
++      HOST_WIDE_INT value_lo = 0, value_hi = 0;
++      for ( word = 0; word < words_in_split_values; word++ )
++        {
++          if ( word >= words_in_const_int )
++            value_hi |= ((val[i * words_in_split_values + word] &
++                          (((HOST_WIDE_INT)1 << BITS_PER_WORD)-1))
++                         << (BITS_PER_WORD * (word - words_in_const_int)));
++          else
++            value_lo |= ((val[i * words_in_split_values + word] &
++                          (((HOST_WIDE_INT)1 << BITS_PER_WORD)-1))
++                         << (BITS_PER_WORD * word));
++        }
++      split_expr[i] = immed_double_const(value_lo, value_hi, new_mode);
++    }
++}
++
++
++/* Set up library functions to comply to AVR32 ABI  */
++static void
++avr32_init_libfuncs (void)
++{
++  /* Convert gcc run-time function names to AVR32 ABI names */
++
++  /* Double-precision floating-point arithmetic. */
++  set_optab_libfunc (neg_optab, DFmode, NULL);
++
++  /* Double-precision comparisons.  */
++  set_optab_libfunc (eq_optab, DFmode, "__avr32_f64_cmp_eq");
++  set_optab_libfunc (ne_optab, DFmode, NULL);
++  set_optab_libfunc (lt_optab, DFmode, "__avr32_f64_cmp_lt");
++  set_optab_libfunc (le_optab, DFmode, NULL);
++  set_optab_libfunc (ge_optab, DFmode, "__avr32_f64_cmp_ge");
++  set_optab_libfunc (gt_optab, DFmode, NULL);
++
++  /* Single-precision floating-point arithmetic. */
++  set_optab_libfunc (smul_optab, SFmode, "__avr32_f32_mul");
++  set_optab_libfunc (neg_optab, SFmode, NULL);
++
++  /* Single-precision comparisons.  */
++  set_optab_libfunc (eq_optab, SFmode, "__avr32_f32_cmp_eq");
++  set_optab_libfunc (ne_optab, SFmode, NULL);
++  set_optab_libfunc (lt_optab, SFmode, "__avr32_f32_cmp_lt");
++  set_optab_libfunc (le_optab, SFmode, NULL);
++  set_optab_libfunc (ge_optab, SFmode, "__avr32_f32_cmp_ge");
++  set_optab_libfunc (gt_optab, SFmode, NULL);
++
++  /* Floating-point to integer conversions. */
++  set_conv_libfunc (sfix_optab, SImode, DFmode, "__avr32_f64_to_s32");
++  set_conv_libfunc (ufix_optab, SImode, DFmode, "__avr32_f64_to_u32");
++  set_conv_libfunc (sfix_optab, DImode, DFmode, "__avr32_f64_to_s64");
++  set_conv_libfunc (ufix_optab, DImode, DFmode, "__avr32_f64_to_u64");
++  set_conv_libfunc (sfix_optab, SImode, SFmode, "__avr32_f32_to_s32");
++  set_conv_libfunc (ufix_optab, SImode, SFmode, "__avr32_f32_to_u32");
++  set_conv_libfunc (sfix_optab, DImode, SFmode, "__avr32_f32_to_s64");
++  set_conv_libfunc (ufix_optab, DImode, SFmode, "__avr32_f32_to_u64");
++
++  /* Conversions between floating types.  */
++  set_conv_libfunc (trunc_optab, SFmode, DFmode, "__avr32_f64_to_f32");
++  set_conv_libfunc (sext_optab, DFmode, SFmode, "__avr32_f32_to_f64");
++
++  /* Integer to floating-point conversions.  Table 8.  */
++  set_conv_libfunc (sfloat_optab, DFmode, SImode, "__avr32_s32_to_f64");
++  set_conv_libfunc (sfloat_optab, DFmode, DImode, "__avr32_s64_to_f64");
++  set_conv_libfunc (sfloat_optab, SFmode, SImode, "__avr32_s32_to_f32");
++  set_conv_libfunc (sfloat_optab, SFmode, DImode, "__avr32_s64_to_f32");
++  set_conv_libfunc (ufloat_optab, DFmode, SImode, "__avr32_u32_to_f64");
++  set_conv_libfunc (ufloat_optab, SFmode, SImode, "__avr32_u32_to_f32");
++  /* TODO: Add these to gcc library functions */
++  //set_conv_libfunc (ufloat_optab, DFmode, DImode, NULL);
++  //set_conv_libfunc (ufloat_optab, SFmode, DImode, NULL);
++
++  /* Long long.  Table 9.  */
++  set_optab_libfunc (smul_optab, DImode, "__avr32_mul64");
++  set_optab_libfunc (sdiv_optab, DImode, "__avr32_sdiv64");
++  set_optab_libfunc (udiv_optab, DImode, "__avr32_udiv64");
++  set_optab_libfunc (smod_optab, DImode, "__avr32_smod64");
++  set_optab_libfunc (umod_optab, DImode, "__avr32_umod64");
++  set_optab_libfunc (ashl_optab, DImode, "__avr32_lsl64");
++  set_optab_libfunc (lshr_optab, DImode, "__avr32_lsr64");
++  set_optab_libfunc (ashr_optab, DImode, "__avr32_asr64");
++
++  /* Floating point library functions which have fast versions. */
++  if ( TARGET_FAST_FLOAT )
++    {
++      set_optab_libfunc (sdiv_optab, DFmode, "__avr32_f64_div_fast");
++      set_optab_libfunc (smul_optab, DFmode, "__avr32_f64_mul_fast");
++      set_optab_libfunc (add_optab, DFmode, "__avr32_f64_add_fast");
++      set_optab_libfunc (sub_optab, DFmode, "__avr32_f64_sub_fast");
++      set_optab_libfunc (add_optab, SFmode, "__avr32_f32_add_fast");
++      set_optab_libfunc (sub_optab, SFmode, "__avr32_f32_sub_fast");
++      set_optab_libfunc (sdiv_optab, SFmode, "__avr32_f32_div_fast");
++    }
++  else
++    {
++      set_optab_libfunc (sdiv_optab, DFmode, "__avr32_f64_div");
++      set_optab_libfunc (smul_optab, DFmode, "__avr32_f64_mul");
++      set_optab_libfunc (add_optab, DFmode, "__avr32_f64_add");
++      set_optab_libfunc (sub_optab, DFmode, "__avr32_f64_sub");
++      set_optab_libfunc (add_optab, SFmode, "__avr32_f32_add");
++      set_optab_libfunc (sub_optab, SFmode, "__avr32_f32_sub");
++      set_optab_libfunc (sdiv_optab, SFmode, "__avr32_f32_div");
++    }
++}
++
++
++/* Record a flashvault declaration.  */
++static void
++flashvault_decl_list_add (unsigned int vector_num, const char *name)
++{
++  struct flashvault_decl_list *p;
++
++  p = (struct flashvault_decl_list *)
++       xmalloc (sizeof (struct flashvault_decl_list));
++  p->next = flashvault_decl_list_head;
++  p->name = name;
++  p->vector_num = vector_num;
++  flashvault_decl_list_head = p;
++}
++
++
++static void
++avr32_file_end (void)
++{
++  struct flashvault_decl_list *p;
++  unsigned int num_entries = 0;
++
++  /* Check if a list of flashvault declarations exists. */
++  if (flashvault_decl_list_head != NULL)
++    {
++      /* Calculate the number of entries in the table. */
++      for (p = flashvault_decl_list_head; p != NULL; p = p->next)
++        {
++           num_entries++;
++        }
++
++      /* Generate the beginning of the flashvault data table. */
++      fputs ("\t.global     __fv_table\n"
++             "\t.data\n"
++             "\t.align 2\n"
++             "\t.set .LFVTABLE, . + 0\n"
++             "\t.type __fv_table, @object\n", asm_out_file);
++      /* Each table entry is 8 bytes. */
++      fprintf (asm_out_file, "\t.size __fv_table, %u\n", (num_entries * 8));
++
++      fputs("__fv_table:\n", asm_out_file);
++
++      for (p = flashvault_decl_list_head; p != NULL; p = p->next)
++        {
++          /* Output table entry. */
++          fprintf (asm_out_file, 
++                   "\t.align 2\n"
++                   "\t.int %u\n", p->vector_num);
++          fprintf (asm_out_file, 
++                   "\t.align 2\n"
++                   "\t.int %s\n", p->name);
++        }
++    }
++}
+--- /dev/null
++++ b/gcc/config/avr32/avr32-elf.h
+@@ -0,0 +1,91 @@
++/*
++   Elf specific definitions.
++   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
++
++   This file is part of GCC.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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. */
++
++
++/*****************************************************************************
++ * Controlling the Compiler Driver, 'gcc'
++ *****************************************************************************/
++
++/* Run-time Target Specification.  */
++#undef  TARGET_VERSION
++#define TARGET_VERSION  fputs (" (AVR32 GNU with ELF)", stderr);
++
++/*
++Another C string constant used much like LINK_SPEC.  The
++difference between the two is that STARTFILE_SPEC is used at
++the very beginning of the command given to the linker.
++
++If this macro is not defined, a default is provided that loads the
++standard C startup file from the usual place.  See gcc.c.
++*/
++#if 0
++#undef  STARTFILE_SPEC
++#define STARTFILE_SPEC "crt0%O%s crti%O%s crtbegin%O%s"
++#endif
++#undef  STARTFILE_SPEC 
++#define STARTFILE_SPEC "%{mflashvault: crtfv.o%s} %{!mflashvault: crt0.o%s} \
++			crti.o%s crtbegin.o%s"
++
++#undef LINK_SPEC
++#define LINK_SPEC "%{muse-oscall:--defsym __do_not_use_oscall_coproc__=0} %{mrelax|O*:%{mno-relax|O0|O1: ;:--relax}} %{mpart=uc3a3revd:-mavr32elf_uc3a3256s;:%{mpart=*:-mavr32elf_%*}} %{mcpu=*:-mavr32elf_%*}"
++
++
++/*
++Another C string constant used much like LINK_SPEC.  The
++difference between the two is that ENDFILE_SPEC is used at
++the very end of the command given to the linker.
++
++Do not define this macro if it does not need to do anything.
++*/
++#undef  ENDFILE_SPEC
++#define ENDFILE_SPEC "crtend%O%s crtn%O%s"
++
++
++/* Target CPU builtins.  */
++#define TARGET_CPU_CPP_BUILTINS()								\
++  do															\
++    {															\
++      builtin_define ("__avr32__");								\
++      builtin_define ("__AVR32__");								\
++      builtin_define ("__AVR32_ELF__");							\
++      builtin_define (avr32_part->macro);						\
++      builtin_define (avr32_arch->macro);						\
++      if (avr32_arch->uarch_type == UARCH_TYPE_AVR32A)			\
++        builtin_define ("__AVR32_AVR32A__");					\
++      else														\
++        builtin_define ("__AVR32_AVR32B__");					\
++      if (TARGET_UNALIGNED_WORD)								\
++        builtin_define ("__AVR32_HAS_UNALIGNED_WORD__");		\
++      if (TARGET_SIMD)											\
++        builtin_define ("__AVR32_HAS_SIMD__");					\
++      if (TARGET_DSP)											\
++        builtin_define ("__AVR32_HAS_DSP__");					\
++      if (TARGET_RMW)											\
++        builtin_define ("__AVR32_HAS_RMW__");					\
++      if (TARGET_BRANCH_PRED)									\
++        builtin_define ("__AVR32_HAS_BRANCH_PRED__");			\
++      if (TARGET_FAST_FLOAT)                                    \
++        builtin_define ("__AVR32_FAST_FLOAT__");                \
++      if (TARGET_FLASHVAULT)                                    \
++        builtin_define ("__AVR32_FLASHVAULT__");                \
++      if (TARGET_NO_MUL_INSNS)                                  \
++        builtin_define ("__AVR32_NO_MUL__");                    \
++    }															\
++  while (0)
+--- /dev/null
++++ b/gcc/config/avr32/avr32.h
+@@ -0,0 +1,3316 @@
++/*
++   Definitions of target machine for AVR32.
++   Copyright 2003,2004,2005,2006,2007,2008,2009,2010 Atmel Corporation.
++
++   This file is part of GCC.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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 GCC_AVR32_H
++#define GCC_AVR32_H
++
++
++#ifndef OBJECT_FORMAT_ELF
++#error avr32.h included before elfos.h
++#endif
++
++#ifndef LOCAL_LABEL_PREFIX
++#define LOCAL_LABEL_PREFIX "."
++#endif
++
++#ifndef SUBTARGET_CPP_SPEC
++#define SUBTARGET_CPP_SPEC  "-D__ELF__"
++#endif
++
++
++extern struct rtx_def *avr32_compare_op0;
++extern struct rtx_def *avr32_compare_op1;
++
++/* comparison type */
++enum avr32_cmp_type {
++  CMP_QI,				/* 1 byte ->char */
++  CMP_HI,				/* 2 byte->half word */
++  CMP_SI,				/* four byte->word*/
++  CMP_DI,				/* eight byte->double word */
++  CMP_SF,				/* single precision floats */
++  CMP_MAX				/* max comparison type */
++};
++
++extern enum avr32_cmp_type avr32_branch_type;	/* type of branch to use */
++
++
++extern struct rtx_def *avr32_acc_cache;
++
++/* cache instruction op5 codes */
++#define AVR32_CACHE_INVALIDATE_ICACHE 1
++
++/* 
++These bits describe the different types of function supported by the AVR32
++backend. They are exclusive, e.g. a function cannot be both a normal function
++and an interworked function.  Knowing the type of a function is important for
++determining its prologue and epilogue sequences. Note value 7 is currently 
++unassigned.  Also note that the interrupt function types all have bit 2 set, 
++so that they can be tested for easily. Note that 0 is deliberately chosen for
++AVR32_FT_UNKNOWN so that when the machine_function structure is initialized
++(to zero) func_type will default to unknown. This will force the first use of
++avr32_current_func_type to call avr32_compute_func_type. 
++*/
++#define AVR32_FT_UNKNOWN           0  /* Type has not yet been determined. */
++#define AVR32_FT_NORMAL            1  /* Normal function. */
++#define AVR32_FT_ACALL             2  /* An acall function. */
++#define AVR32_FT_EXCEPTION_HANDLER 3  /* A C++ exception handler. */
++#define AVR32_FT_ISR_FULL          4  /* A fully shadowed interrupt mode. */
++#define AVR32_FT_ISR_HALF          5  /* A half shadowed interrupt mode. */
++#define AVR32_FT_ISR_NONE          6  /* No shadow registers. */
++
++#define AVR32_FT_TYPE_MASK	((1 << 3) - 1)
++
++/* In addition functions can have several type modifiers, outlined by these bit masks: */
++#define AVR32_FT_INTERRUPT       (1 << 2)  /* Note overlap with FT_ISR and above. */
++#define AVR32_FT_NAKED           (1 << 3)  /* No prologue or epilogue. */
++#define AVR32_FT_VOLATILE        (1 << 4)  /* Does not return. */
++#define AVR32_FT_NESTED          (1 << 5)  /* Embedded inside another func. */
++#define AVR32_FT_FLASHVAULT      (1 << 6)  /* Flashvault function call. */
++#define AVR32_FT_FLASHVAULT_IMPL (1 << 7)  /* Function definition in FlashVault. */
++
++
++/* Some macros to test these flags.  */
++#define AVR32_FUNC_TYPE(t)     (t & AVR32_FT_TYPE_MASK)
++#define IS_INTERRUPT(t)        (t & AVR32_FT_INTERRUPT)
++#define IS_NAKED(t)            (t & AVR32_FT_NAKED)
++#define IS_VOLATILE(t)         (t & AVR32_FT_VOLATILE)
++#define IS_NESTED(t)           (t & AVR32_FT_NESTED)
++#define IS_FLASHVAULT(t)       (t & AVR32_FT_FLASHVAULT)
++#define IS_FLASHVAULT_IMPL(t)  (t & AVR32_FT_FLASHVAULT_IMPL)
++
++#define SYMBOL_FLAG_RMW_ADDR_SHIFT    SYMBOL_FLAG_MACH_DEP_SHIFT
++#define SYMBOL_REF_RMW_ADDR(RTX)                                        \
++  ((SYMBOL_REF_FLAGS (RTX) & (1 << SYMBOL_FLAG_RMW_ADDR_SHIFT)) != 0)
++
++
++typedef struct minipool_labels
++GTY ((chain_next ("%h.next"), chain_prev ("%h.prev")))
++{
++  rtx label;
++  struct minipool_labels *prev;
++  struct minipool_labels *next;
++} minipool_labels;
++
++/* A C structure for machine-specific, per-function data.
++   This is added to the cfun structure.  */
++
++typedef struct machine_function
++GTY (())
++{
++  /* Records the type of the current function.  */
++  unsigned long func_type;
++  /* List of minipool labels, use for checking if code label is valid in a
++     memory expression */
++  minipool_labels *minipool_label_head;
++  minipool_labels *minipool_label_tail;
++  int ifcvt_after_reload;
++} machine_function;
++
++/* Initialize data used by insn expanders.  This is called from insn_emit,
++   once for every function before code is generated.  */
++#define INIT_EXPANDERS avr32_init_expanders ()
++
++/******************************************************************************
++ * SPECS
++ *****************************************************************************/
++
++#ifndef ASM_SPEC
++#define ASM_SPEC "%{fpic:--pic} %{mrelax|O*:%{mno-relax|O0|O1: ;:--linkrelax}} %{march=ucr2nomul:-march=ucr2;:%{march=*:-march=%*}} %{mpart=uc3a3revd:-mpart=uc3a3256s;:%{mpart=*:-mpart=%*}}"
++#endif
++
++#ifndef MULTILIB_DEFAULTS
++#define MULTILIB_DEFAULTS { "march=ap", "" }
++#endif
++
++/******************************************************************************
++ * Run-time Target Specification
++ *****************************************************************************/
++#ifndef TARGET_VERSION
++#define TARGET_VERSION fprintf(stderr, " (AVR32, GNU assembler syntax)");
++#endif
++
++
++/* Part types. Keep this in sync with the order of avr32_part_types in avr32.c*/
++enum part_type
++{
++  PART_TYPE_AVR32_NONE,
++  PART_TYPE_AVR32_AP7000,
++  PART_TYPE_AVR32_AP7001,
++  PART_TYPE_AVR32_AP7002,
++  PART_TYPE_AVR32_AP7200,
++  PART_TYPE_AVR32_UC3A0128,
++  PART_TYPE_AVR32_UC3A0256,
++  PART_TYPE_AVR32_UC3A0512,
++  PART_TYPE_AVR32_UC3A0512ES,
++  PART_TYPE_AVR32_UC3A1128,
++  PART_TYPE_AVR32_UC3A1256,
++  PART_TYPE_AVR32_UC3A1512,
++  PART_TYPE_AVR32_UC3A1512ES,
++  PART_TYPE_AVR32_UC3A3REVD,
++  PART_TYPE_AVR32_UC3A364,
++  PART_TYPE_AVR32_UC3A364S,
++  PART_TYPE_AVR32_UC3A3128,
++  PART_TYPE_AVR32_UC3A3128S,
++  PART_TYPE_AVR32_UC3A3256,
++  PART_TYPE_AVR32_UC3A3256S,
++  PART_TYPE_AVR32_UC3A464,
++  PART_TYPE_AVR32_UC3A464S,
++  PART_TYPE_AVR32_UC3A4128,
++  PART_TYPE_AVR32_UC3A4128S,
++  PART_TYPE_AVR32_UC3A4256,
++  PART_TYPE_AVR32_UC3A4256S,
++  PART_TYPE_AVR32_UC3B064,
++  PART_TYPE_AVR32_UC3B0128,
++  PART_TYPE_AVR32_UC3B0256,
++  PART_TYPE_AVR32_UC3B0256ES,
++  PART_TYPE_AVR32_UC3B0512,
++  PART_TYPE_AVR32_UC3B0512REVC,
++  PART_TYPE_AVR32_UC3B164,
++  PART_TYPE_AVR32_UC3B1128,
++  PART_TYPE_AVR32_UC3B1256,
++  PART_TYPE_AVR32_UC3B1256ES,
++  PART_TYPE_AVR32_UC3B1512,
++  PART_TYPE_AVR32_UC3B1512REVC,
++  PART_TYPE_AVR32_UC64D3,
++  PART_TYPE_AVR32_UC128D3,
++  PART_TYPE_AVR32_UC64D4,
++  PART_TYPE_AVR32_UC128D4,
++  PART_TYPE_AVR32_UC3C0512CREVC,
++  PART_TYPE_AVR32_UC3C1512CREVC,
++  PART_TYPE_AVR32_UC3C2512CREVC,
++  PART_TYPE_AVR32_UC3L0256,
++  PART_TYPE_AVR32_UC3L0128,
++  PART_TYPE_AVR32_UC3L064,
++  PART_TYPE_AVR32_UC3L032,
++  PART_TYPE_AVR32_UC3L016,
++  PART_TYPE_AVR32_UC3L064REVB,
++  PART_TYPE_AVR32_UC64L3U,
++  PART_TYPE_AVR32_UC128L3U,
++  PART_TYPE_AVR32_UC256L3U,
++  PART_TYPE_AVR32_UC64L4U,
++  PART_TYPE_AVR32_UC128L4U,
++  PART_TYPE_AVR32_UC256L4U,
++  PART_TYPE_AVR32_UC3C064C,
++  PART_TYPE_AVR32_UC3C0128C,
++  PART_TYPE_AVR32_UC3C0256C,
++  PART_TYPE_AVR32_UC3C0512C,
++  PART_TYPE_AVR32_UC3C164C,
++  PART_TYPE_AVR32_UC3C1128C,
++  PART_TYPE_AVR32_UC3C1256C,
++  PART_TYPE_AVR32_UC3C1512C,
++  PART_TYPE_AVR32_UC3C264C,
++  PART_TYPE_AVR32_UC3C2128C,
++  PART_TYPE_AVR32_UC3C2256C,
++  PART_TYPE_AVR32_UC3C2512C,
++  PART_TYPE_AVR32_MXT768E
++};
++
++/* Microarchitectures. */
++enum microarchitecture_type
++{
++  UARCH_TYPE_AVR32A,
++  UARCH_TYPE_AVR32B,
++  UARCH_TYPE_NONE
++};
++
++/* Architectures types which specifies the pipeline.
++ Keep this in sync with avr32_arch_types in avr32.c
++ and the pipeline attribute in avr32.md */
++enum architecture_type
++{
++  ARCH_TYPE_AVR32_AP,
++  ARCH_TYPE_AVR32_UCR1,
++  ARCH_TYPE_AVR32_UCR2,
++  ARCH_TYPE_AVR32_UCR2NOMUL,
++  ARCH_TYPE_AVR32_UCR3,
++  ARCH_TYPE_AVR32_UCR3FP,
++  ARCH_TYPE_AVR32_NONE
++};
++
++/* Flag specifying if the cpu has support for DSP instructions.*/
++#define FLAG_AVR32_HAS_DSP (1 << 0)
++/* Flag specifying if the cpu has support for Read-Modify-Write
++   instructions.*/
++#define FLAG_AVR32_HAS_RMW (1 << 1)
++/* Flag specifying if the cpu has support for SIMD instructions. */
++#define FLAG_AVR32_HAS_SIMD (1 << 2)
++/* Flag specifying if the cpu has support for unaligned memory word access. */
++#define FLAG_AVR32_HAS_UNALIGNED_WORD (1 << 3)
++/* Flag specifying if the cpu has support for branch prediction. */
++#define FLAG_AVR32_HAS_BRANCH_PRED (1 << 4)
++/* Flag specifying if the cpu has support for a return stack. */
++#define FLAG_AVR32_HAS_RETURN_STACK (1 << 5)
++/* Flag specifying if the cpu has caches. */
++#define FLAG_AVR32_HAS_CACHES (1 << 6)
++/* Flag specifying if the cpu has support for v2 insns. */
++#define FLAG_AVR32_HAS_V2_INSNS (1 << 7)
++/* Flag specifying that the cpu has buggy mul insns. */
++#define FLAG_AVR32_HAS_NO_MUL_INSNS (1 << 8)
++/* Flag specifying that the device has FPU instructions according 
++   to AVR32002 specifications*/
++#define FLAG_AVR32_HAS_FPU (1 << 9)
++
++/* Structure for holding information about different avr32 CPUs/parts */
++struct part_type_s
++{
++  const char *const name;
++  enum part_type part_type;
++  enum architecture_type arch_type;
++  /* Must lie outside user's namespace.  NULL == no macro.  */
++  const char *const macro;
++};
++
++/* Structure for holding information about different avr32 pipeline
++ architectures. */
++struct arch_type_s
++{
++  const char *const name;
++  enum architecture_type arch_type;
++  enum microarchitecture_type uarch_type;
++  const unsigned long feature_flags;
++  /* Must lie outside user's namespace.  NULL == no macro.  */
++  const char *const macro;
++};
++
++extern const struct part_type_s *avr32_part;
++extern const struct arch_type_s *avr32_arch;
++
++#define TARGET_SIMD  (avr32_arch->feature_flags & FLAG_AVR32_HAS_SIMD)
++#define TARGET_DSP  (avr32_arch->feature_flags & FLAG_AVR32_HAS_DSP)
++#define TARGET_RMW  (avr32_arch->feature_flags & FLAG_AVR32_HAS_RMW)
++#define TARGET_UNALIGNED_WORD  (avr32_arch->feature_flags & FLAG_AVR32_HAS_UNALIGNED_WORD)
++#define TARGET_BRANCH_PRED  (avr32_arch->feature_flags & FLAG_AVR32_HAS_BRANCH_PRED)
++#define TARGET_RETURN_STACK  (avr32_arch->feature_flags & FLAG_AVR32_HAS_RETURN_STACK)
++#define TARGET_V2_INSNS  (avr32_arch->feature_flags & FLAG_AVR32_HAS_V2_INSNS)
++#define TARGET_CACHES  (avr32_arch->feature_flags & FLAG_AVR32_HAS_CACHES)
++#define TARGET_NO_MUL_INSNS  (avr32_arch->feature_flags & FLAG_AVR32_HAS_NO_MUL_INSNS)
++#define TARGET_ARCH_AP (avr32_arch->arch_type == ARCH_TYPE_AVR32_AP)
++#define TARGET_ARCH_UCR1 (avr32_arch->arch_type == ARCH_TYPE_AVR32_UCR1)
++#define TARGET_ARCH_UCR2 (avr32_arch->arch_type == ARCH_TYPE_AVR32_UCR2)
++#define TARGET_ARCH_UC (TARGET_ARCH_UCR1 || TARGET_ARCH_UCR2)
++#define TARGET_UARCH_AVR32A (avr32_arch->uarch_type == UARCH_TYPE_AVR32A)
++#define TARGET_UARCH_AVR32B (avr32_arch->uarch_type == UARCH_TYPE_AVR32B)
++#define TARGET_ARCH_FPU (avr32_arch->feature_flags & FLAG_AVR32_HAS_FPU)
++
++#define CAN_DEBUG_WITHOUT_FP
++
++
++
++
++/******************************************************************************
++ * Storage Layout
++ *****************************************************************************/
++
++/*
++Define this macro to have the value 1 if the most significant bit in a
++byte has the lowest number; otherwise define it to have the value zero.
++This means that bit-field instructions count from the most significant
++bit.  If the machine has no bit-field instructions, then this must still
++be defined, but it doesn't matter which value it is defined to.  This
++macro need not be a constant.
++
++This macro does not affect the way structure fields are packed into
++bytes or words; that is controlled by BYTES_BIG_ENDIAN.
++*/
++#define BITS_BIG_ENDIAN 0
++
++/*
++Define this macro to have the value 1 if the most significant byte in a
++word has the lowest number. This macro need not be a constant.
++*/
++/*
++  Data is stored in an big-endian way.
++*/
++#define BYTES_BIG_ENDIAN 1
++
++/*
++Define this macro to have the value 1 if, in a multiword object, the
++most significant word has the lowest number.  This applies to both
++memory locations and registers; GCC fundamentally assumes that the
++order of words in memory is the same as the order in registers.  This
++macro need not be a constant.
++*/
++/*
++  Data is stored in an bin-endian way.
++*/
++#define WORDS_BIG_ENDIAN 1
++
++/*
++Define this macro if WORDS_BIG_ENDIAN is not constant.  This must be a
++constant value with the same meaning as WORDS_BIG_ENDIAN, which will be
++used only when compiling libgcc2.c.  Typically the value will be set
++based on preprocessor defines.
++*/
++#define LIBGCC2_WORDS_BIG_ENDIAN WORDS_BIG_ENDIAN
++
++/*
++Define this macro to have the value 1 if DFmode, XFmode or
++TFmode floating point numbers are stored in memory with the word
++containing the sign bit at the lowest address; otherwise define it to
++have the value 0.  This macro need not be a constant.
++
++You need not define this macro if the ordering is the same as for
++multi-word integers.
++*/
++/* #define FLOAT_WORDS_BIG_ENDIAN 1 */
++
++/*
++Define this macro to be the number of bits in an addressable storage
++unit (byte); normally 8.
++*/
++#define BITS_PER_UNIT 8
++
++/*
++Number of bits in a word; normally 32.
++*/
++#define BITS_PER_WORD 32
++
++/*
++Maximum number of bits in a word.  If this is undefined, the default is
++BITS_PER_WORD.  Otherwise, it is the constant value that is the
++largest value that BITS_PER_WORD can have at run-time.
++*/
++/* MAX_BITS_PER_WORD not defined*/
++
++/*
++Number of storage units in a word; normally 4.
++*/
++#define UNITS_PER_WORD 4
++
++/*
++Minimum number of units in a word.  If this is undefined, the default is
++UNITS_PER_WORD.  Otherwise, it is the constant value that is the
++smallest value that UNITS_PER_WORD can have at run-time.
++*/
++/* MIN_UNITS_PER_WORD not defined */
++
++/*
++Width of a pointer, in bits.  You must specify a value no wider than the
++width of Pmode.  If it is not equal to the width of Pmode,
++you must define POINTERS_EXTEND_UNSIGNED.
++*/
++#define POINTER_SIZE 32
++
++/*
++A C expression whose value is greater than zero if pointers that need to be
++extended from being POINTER_SIZE bits wide to Pmode are to
++be zero-extended and zero if they are to be sign-extended.  If the value
++is less then zero then there must be an "ptr_extend" instruction that
++extends a pointer from POINTER_SIZE to Pmode.
++
++You need not define this macro if the POINTER_SIZE is equal
++to the width of Pmode.
++*/
++/* #define POINTERS_EXTEND_UNSIGNED */
++
++/*
++A Macro to update M and UNSIGNEDP when an object whose type
++is TYPE and which has the specified mode and signedness is to be
++stored in a register.  This macro is only called when TYPE is a
++scalar type.
++
++On most RISC machines, which only have operations that operate on a full
++register, define this macro to set M to word_mode if
++M is an integer mode narrower than BITS_PER_WORD.  In most
++cases, only integer modes should be widened because wider-precision
++floating-point operations are usually more expensive than their narrower
++counterparts.
++
++For most machines, the macro definition does not change UNSIGNEDP.
++However, some machines, have instructions that preferentially handle
++either signed or unsigned quantities of certain modes.  For example, on
++the DEC Alpha, 32-bit loads from memory and 32-bit add instructions
++sign-extend the result to 64 bits.  On such machines, set
++UNSIGNEDP according to which kind of extension is more efficient.
++
++Do not define this macro if it would never modify M.
++*/
++#define PROMOTE_MODE(M, UNSIGNEDP, TYPE)                                \
++  {                                                                     \
++    if (!AGGREGATE_TYPE_P (TYPE)                                        \
++        && GET_MODE_CLASS (mode) == MODE_INT                            \
++        && GET_MODE_SIZE (mode) < 4)                                    \
++      {                                                                 \
++        if (M == QImode)                                                \
++          (UNSIGNEDP) = 1;                                              \
++        else if (M == HImode)                                           \
++          (UNSIGNEDP) = 0;                                              \
++        (M) = SImode;                                                   \
++      }                                                                 \
++  }
++
++#define PROMOTE_FUNCTION_MODE(M, UNSIGNEDP, TYPE)  \
++        PROMOTE_MODE(M, UNSIGNEDP, TYPE)
++
++/* Define if operations between registers always perform the operation
++   on the full register even if a narrower mode is specified.  */
++#define WORD_REGISTER_OPERATIONS
++
++/* Define if loading in MODE, an integral mode narrower than BITS_PER_WORD
++   will either zero-extend or sign-extend.  The value of this macro should
++   be the code that says which one of the two operations is implicitly
++   done, UNKNOWN if not known.  */
++#define LOAD_EXTEND_OP(MODE)				\
++   (((MODE) == QImode) ? ZERO_EXTEND			\
++   : ((MODE) == HImode) ? SIGN_EXTEND : UNKNOWN)
++
++
++/*
++Normal alignment required for function parameters on the stack, in
++bits.  All stack parameters receive at least this much alignment
++regardless of data type.  On most machines, this is the same as the
++size of an integer.
++*/
++#define PARM_BOUNDARY 32
++
++/*
++Define this macro to the minimum alignment enforced by hardware for the
++stack pointer on this machine.  The definition is a C expression for the
++desired alignment (measured in bits).  This value is used as a default
++if PREFERRED_STACK_BOUNDARY is not defined.  On most machines,
++this should be the same as PARM_BOUNDARY.
++*/
++#define STACK_BOUNDARY 32
++
++/*
++Define this macro if you wish to preserve a certain alignment for the
++stack pointer, greater than what the hardware enforces.  The definition
++is a C expression for the desired alignment (measured in bits).  This
++macro must evaluate to a value equal to or larger than
++STACK_BOUNDARY.
++*/
++#define PREFERRED_STACK_BOUNDARY (TARGET_FORCE_DOUBLE_ALIGN ? 64 : 32 )
++
++/*
++Alignment required for a function entry point, in bits.
++*/
++#define FUNCTION_BOUNDARY 16
++
++/*
++Biggest alignment that any data type can require on this machine, in bits.
++*/
++#define BIGGEST_ALIGNMENT  (TARGET_FORCE_DOUBLE_ALIGN ? 64 : 32 )
++
++/*
++If defined, the smallest alignment, in bits, that can be given to an
++object that can be referenced in one operation, without disturbing any
++nearby object.  Normally, this is BITS_PER_UNIT, but may be larger
++on machines that don't have byte or half-word store operations.
++*/
++#define MINIMUM_ATOMIC_ALIGNMENT BITS_PER_UNIT
++
++
++/*
++An integer expression for the size in bits of the largest integer machine mode that
++should actually be used. All integer machine modes of this size or smaller can be
++used for structures and unions with the appropriate sizes. If this macro is undefined,
++GET_MODE_BITSIZE (DImode) is assumed.*/
++#define MAX_FIXED_MODE_SIZE  GET_MODE_BITSIZE (DImode)
++
++
++/*
++If defined, a C expression to compute the alignment given to a constant
++that is being placed in memory.  CONSTANT is the constant and
++BASIC_ALIGN is the alignment that the object would ordinarily
++have.  The value of this macro is used instead of that alignment to
++align the object.
++
++If this macro is not defined, then BASIC_ALIGN is used.
++
++The typical use of this macro is to increase alignment for string
++constants to be word aligned so that strcpy calls that copy
++constants can be done inline.
++*/
++#define CONSTANT_ALIGNMENT(CONSTANT, BASIC_ALIGN) \
++ ((TREE_CODE(CONSTANT) == STRING_CST) ? BITS_PER_WORD : BASIC_ALIGN)
++
++/* Try to align string to a word. */
++#define DATA_ALIGNMENT(TYPE, ALIGN)                                     \
++  ({(TREE_CODE (TYPE) == ARRAY_TYPE                                     \
++     && TYPE_MODE (TREE_TYPE (TYPE)) == QImode                          \
++     && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN));})
++
++/* Try to align local store strings to a word. */
++#define LOCAL_ALIGNMENT(TYPE, ALIGN)                                    \
++  ({(TREE_CODE (TYPE) == ARRAY_TYPE                                     \
++     && TYPE_MODE (TREE_TYPE (TYPE)) == QImode                          \
++     && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN));})
++
++/*
++Define this macro to be the value 1 if instructions will fail to work
++if given data not on the nominal alignment.  If instructions will merely
++go slower in that case, define this macro as 0.
++*/
++#define STRICT_ALIGNMENT 1
++
++/*
++Define this if you wish to imitate the way many other C compilers handle
++alignment of bit-fields and the structures that contain them.
++
++The behavior is that the type written for a bit-field (int,
++short, or other integer type) imposes an alignment for the
++entire structure, as if the structure really did contain an ordinary
++field of that type.  In addition, the bit-field is placed within the
++structure so that it would fit within such a field, not crossing a
++boundary for it.
++
++Thus, on most machines, a bit-field whose type is written as int
++would not cross a four-byte boundary, and would force four-byte
++alignment for the whole structure.  (The alignment used may not be four
++bytes; it is controlled by the other alignment parameters.)
++
++If the macro is defined, its definition should be a C expression;
++a nonzero value for the expression enables this behavior.
++
++Note that if this macro is not defined, or its value is zero, some
++bit-fields may cross more than one alignment boundary.  The compiler can
++support such references if there are insv, extv, and
++extzv insns that can directly reference memory.
++
++The other known way of making bit-fields work is to define
++STRUCTURE_SIZE_BOUNDARY as large as BIGGEST_ALIGNMENT.
++Then every structure can be accessed with fullwords.
++
++Unless the machine has bit-field instructions or you define
++STRUCTURE_SIZE_BOUNDARY that way, you must define
++PCC_BITFIELD_TYPE_MATTERS to have a nonzero value.
++
++If your aim is to make GCC use the same conventions for laying out
++bit-fields as are used by another compiler, here is how to investigate
++what the other compiler does.  Compile and run this program:
++
++struct foo1
++{
++  char x;
++  char :0;
++  char y;
++};
++
++struct foo2
++{
++  char x;
++  int :0;
++  char y;
++};
++
++main ()
++{
++  printf ("Size of foo1 is %d\n",
++          sizeof (struct foo1));
++  printf ("Size of foo2 is %d\n",
++          sizeof (struct foo2));
++  exit (0);
++}
++
++If this prints 2 and 5, then the compiler's behavior is what you would
++get from PCC_BITFIELD_TYPE_MATTERS.
++*/
++#define PCC_BITFIELD_TYPE_MATTERS 1
++
++
++/******************************************************************************
++ * Layout of Source Language Data Types
++ *****************************************************************************/
++
++/*
++A C expression for the size in bits of the type int on the
++target machine.  If you don't define this, the default is one word.
++*/
++#define INT_TYPE_SIZE 32
++
++/*
++A C expression for the size in bits of the type short on the
++target machine.  If you don't define this, the default is half a word. (If
++this would be less than one storage unit, it is rounded up to one unit.)
++*/
++#define SHORT_TYPE_SIZE 16
++
++/*
++A C expression for the size in bits of the type long on the
++target machine.  If you don't define this, the default is one word.
++*/
++#define LONG_TYPE_SIZE 32
++
++
++/*
++A C expression for the size in bits of the type long long on the
++target machine.  If you don't define this, the default is two
++words.  If you want to support GNU Ada on your machine, the value of this
++macro must be at least 64.
++*/
++#define LONG_LONG_TYPE_SIZE 64
++
++/*
++A C expression for the size in bits of the type char on the
++target machine.  If you don't define this, the default is
++BITS_PER_UNIT.
++*/
++#define CHAR_TYPE_SIZE 8
++
++
++/*
++A C expression for the size in bits of the C++ type bool and
++C99 type _Bool on the target machine.  If you don't define
++this, and you probably shouldn't, the default is CHAR_TYPE_SIZE.
++*/
++#define BOOL_TYPE_SIZE 8
++
++
++/*
++An expression whose value is 1 or 0, according to whether the type
++char should be signed or unsigned by default.  The user can
++always override this default with the options -fsigned-char
++and -funsigned-char.
++*/
++/* We are using unsigned char */
++#define DEFAULT_SIGNED_CHAR 0
++
++
++/*
++A C expression for a string describing the name of the data type to use
++for size values.  The typedef name size_t is defined using the
++contents of the string.
++
++The string can contain more than one keyword.  If so, separate them with
++spaces, and write first any length keyword, then unsigned if
++appropriate, and finally int.  The string must exactly match one
++of the data type names defined in the function
++init_decl_processing in the file c-decl.c.  You may not
++omit int or change the order - that would cause the compiler to
++crash on startup.
++
++If you don't define this macro, the default is "long unsigned int".
++*/
++#define SIZE_TYPE "long unsigned int"
++
++/*
++A C expression for a string describing the name of the data type to use
++for the result of subtracting two pointers.  The typedef name
++ptrdiff_t is defined using the contents of the string.  See
++SIZE_TYPE above for more information.
++
++If you don't define this macro, the default is "long int".
++*/
++#define PTRDIFF_TYPE "long int"
++
++
++/*
++A C expression for the size in bits of the data type for wide
++characters.  This is used in cpp, which cannot make use of
++WCHAR_TYPE.
++*/
++#define WCHAR_TYPE_SIZE 32
++
++
++/*
++A C expression for a string describing the name of the data type to
++use for wide characters passed to printf and returned from
++getwc.  The typedef name wint_t is defined using the
++contents of the string.  See SIZE_TYPE above for more
++information.
++
++If you don't define this macro, the default is "unsigned int".
++*/
++#define WINT_TYPE "unsigned int"
++
++/*
++A C expression for a string describing the name of the data type that
++can represent any value of any standard or extended signed integer type.
++The typedef name intmax_t is defined using the contents of the
++string.  See SIZE_TYPE above for more information.
++
++If you don't define this macro, the default is the first of
++"int", "long int", or "long long int" that has as
++much precision as long long int.
++*/
++#define INTMAX_TYPE "long long int"
++
++/*
++A C expression for a string describing the name of the data type that
++can represent any value of any standard or extended unsigned integer
++type.  The typedef name uintmax_t is defined using the contents
++of the string.  See SIZE_TYPE above for more information.
++
++If you don't define this macro, the default is the first of
++"unsigned int", "long unsigned int", or "long long unsigned int"
++that has as much precision as long long unsigned int.
++*/
++#define UINTMAX_TYPE "long long unsigned int"
++
++
++/******************************************************************************
++ * Register Usage
++ *****************************************************************************/
++
++/* Convert from gcc internal register number to register number
++   used in assembly code */
++#define ASM_REGNUM(reg) (LAST_REGNUM - (reg))
++
++/* Convert between register number used in assembly to gcc
++   internal register number  */
++#define INTERNAL_REGNUM(reg) (LAST_REGNUM - (reg))
++
++/** Basic Characteristics of Registers **/
++
++/*
++Number of hardware registers known to the compiler.  They receive
++numbers 0 through FIRST_PSEUDO_REGISTER-1; thus, the first
++pseudo register's number really is assigned the number
++FIRST_PSEUDO_REGISTER.
++*/
++#define FIRST_PSEUDO_REGISTER (LAST_REGNUM + 1)
++
++#define FIRST_REGNUM 0
++#define LAST_REGNUM 15
++
++/*
++An initializer that says which registers are used for fixed purposes
++all throughout the compiled code and are therefore not available for
++general allocation.  These would include the stack pointer, the frame
++pointer (except on machines where that can be used as a general
++register when no frame pointer is needed), the program counter on
++machines where that is considered one of the addressable registers,
++and any other numbered register with a standard use.
++
++This information is expressed as a sequence of numbers, separated by
++commas and surrounded by braces.  The nth number is 1 if
++register n is fixed, 0 otherwise.
++
++The table initialized from this macro, and the table initialized by
++the following one, may be overridden at run time either automatically,
++by the actions of the macro CONDITIONAL_REGISTER_USAGE, or by
++the user with the command options -ffixed-[reg],
++-fcall-used-[reg] and -fcall-saved-[reg].
++*/
++
++/* The internal gcc register numbers are reversed
++   compared to the real register numbers since
++   gcc expects data types stored over multiple
++   registers in the register file to be big endian
++   if the memory layout is big endian. But this
++   is not the case for avr32 so we fake a big
++   endian register file. */
++
++#define FIXED_REGISTERS {	\
++  1, /* Program Counter */	\
++  0, /* Link Register */	\
++  1, /* Stack Pointer */	\
++  0, /* r12 */			\
++  0, /* r11 */			\
++  0, /* r10 */			\
++  0, /* r9 */			\
++  0, /* r8 */			\
++  0, /* r7 */			\
++  0, /* r6 */			\
++  0, /* r5 */			\
++  0, /* r4 */			\
++  0, /* r3 */			\
++  0, /* r2 */			\
++  0, /* r1 */			\
++  0, /* r0 */			\
++}
++
++/*
++Like FIXED_REGISTERS but has 1 for each register that is
++clobbered (in general) by function calls as well as for fixed
++registers.  This macro therefore identifies the registers that are not
++available for general allocation of values that must live across
++function calls.
++
++If a register has 0 in CALL_USED_REGISTERS, the compiler
++automatically saves it on function entry and restores it on function
++exit, if the register is used within the function.
++*/
++#define CALL_USED_REGISTERS {	\
++  1, /* Program Counter */	\
++  0, /* Link Register */	\
++  1, /* Stack Pointer */	\
++  1, /* r12 */			\
++  1, /* r11 */			\
++  1, /* r10 */			\
++  1, /* r9 */			\
++  1, /* r8 */			\
++  0, /* r7 */			\
++  0, /* r6 */			\
++  0, /* r5 */			\
++  0, /* r4 */			\
++  0, /* r3 */			\
++  0, /* r2 */			\
++  0, /* r1 */			\
++  0, /* r0 */			\
++}
++
++/* Interrupt functions can only use registers that have already been
++   saved by the prologue, even if they would normally be
++   call-clobbered.  */
++#define HARD_REGNO_RENAME_OK(SRC, DST)					\
++	(! IS_INTERRUPT (cfun->machine->func_type) ||			\
++         df_regs_ever_live_p (DST))
++
++
++/*
++Zero or more C statements that may conditionally modify five variables
++fixed_regs, call_used_regs, global_regs,
++reg_names, and reg_class_contents, to take into account
++any dependence of these register sets on target flags.  The first three
++of these are of type char [] (interpreted as Boolean vectors).
++global_regs is a const char *[], and
++reg_class_contents is a HARD_REG_SET.  Before the macro is
++called, fixed_regs, call_used_regs,
++reg_class_contents, and reg_names have been initialized
++from FIXED_REGISTERS, CALL_USED_REGISTERS,
++REG_CLASS_CONTENTS, and REGISTER_NAMES, respectively.
++global_regs has been cleared, and any -ffixed-[reg],
++-fcall-used-[reg] and -fcall-saved-[reg]
++command options have been applied.
++
++You need not define this macro if it has no work to do.
++
++If the usage of an entire class of registers depends on the target
++flags, you may indicate this to GCC by using this macro to modify
++fixed_regs and call_used_regs to 1 for each of the
++registers in the classes which should not be used by GCC.  Also define
++the macro REG_CLASS_FROM_LETTER to return NO_REGS if it
++is called with a letter for a class that shouldn't be used.
++
++ (However, if this class is not included in GENERAL_REGS and all
++of the insn patterns whose constraints permit this class are
++controlled by target switches, then GCC will automatically avoid using
++these registers when the target switches are opposed to them.)
++*/
++#define CONDITIONAL_REGISTER_USAGE                              \
++  do								\
++    {								\
++      if (flag_pic)						\
++	{							\
++	  fixed_regs[PIC_OFFSET_TABLE_REGNUM] = 1;		\
++	  call_used_regs[PIC_OFFSET_TABLE_REGNUM] = 1;		\
++	}							\
++    }								\
++  while (0)
++
++
++/*
++If the program counter has a register number, define this as that
++register number.  Otherwise, do not define it.
++*/
++
++#define LAST_AVR32_REGNUM 16
++
++
++/** Order of Allocation of Registers **/
++
++/*
++If defined, an initializer for a vector of integers, containing the
++numbers of hard registers in the order in which GCC should prefer
++to use them (from most preferred to least).
++
++If this macro is not defined, registers are used lowest numbered first
++(all else being equal).
++
++One use of this macro is on machines where the highest numbered
++registers must always be saved and the save-multiple-registers
++instruction supports only sequences of consecutive registers.  On such
++machines, define REG_ALLOC_ORDER to be an initializer that lists
++the highest numbered allocable register first.
++*/
++#define REG_ALLOC_ORDER 	\
++{				\
++  INTERNAL_REGNUM(8),		\
++  INTERNAL_REGNUM(9),		\
++  INTERNAL_REGNUM(10),		\
++  INTERNAL_REGNUM(11),		\
++  INTERNAL_REGNUM(12),		\
++  LR_REGNUM,			\
++  INTERNAL_REGNUM(7),		\
++  INTERNAL_REGNUM(6),		\
++  INTERNAL_REGNUM(5),		\
++  INTERNAL_REGNUM(4),		\
++  INTERNAL_REGNUM(3),		\
++  INTERNAL_REGNUM(2),		\
++  INTERNAL_REGNUM(1),		\
++  INTERNAL_REGNUM(0),		\
++  SP_REGNUM,           		\
++  PC_REGNUM			\
++}
++
++
++/** How Values Fit in Registers **/
++
++/*
++A C expression for the number of consecutive hard registers, starting
++at register number REGNO, required to hold a value of mode
++MODE.
++
++On a machine where all registers are exactly one word, a suitable
++definition of this macro is
++
++#define HARD_REGNO_NREGS(REGNO, MODE)            \
++   ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1)  \
++    / UNITS_PER_WORD)
++*/
++#define HARD_REGNO_NREGS(REGNO, MODE) \
++  ((unsigned int)((GET_MODE_SIZE(MODE) + UNITS_PER_WORD -1 ) / UNITS_PER_WORD))
++
++/*
++A C expression that is nonzero if it is permissible to store a value
++of mode MODE in hard register number REGNO (or in several
++registers starting with that one).  For a machine where all registers
++are equivalent, a suitable definition is
++
++  #define HARD_REGNO_MODE_OK(REGNO, MODE) 1
++
++You need not include code to check for the numbers of fixed registers,
++because the allocation mechanism considers them to be always occupied.
++
++On some machines, double-precision values must be kept in even/odd
++register pairs.  You can implement that by defining this macro to reject
++odd register numbers for such modes.
++
++The minimum requirement for a mode to be OK in a register is that the
++mov[mode] instruction pattern support moves between the
++register and other hard register in the same class and that moving a
++value into the register and back out not alter it.
++
++Since the same instruction used to move word_mode will work for
++all narrower integer modes, it is not necessary on any machine for
++HARD_REGNO_MODE_OK to distinguish between these modes, provided
++you define patterns movhi, etc., to take advantage of this.  This
++is useful because of the interaction between HARD_REGNO_MODE_OK
++and MODES_TIEABLE_P; it is very desirable for all integer modes
++to be tieable.
++
++Many machines have special registers for floating point arithmetic.
++Often people assume that floating point machine modes are allowed only
++in floating point registers.  This is not true.  Any registers that
++can hold integers can safely hold a floating point machine
++mode, whether or not floating arithmetic can be done on it in those
++registers.  Integer move instructions can be used to move the values.
++
++On some machines, though, the converse is true: fixed-point machine
++modes may not go in floating registers.  This is true if the floating
++registers normalize any value stored in them, because storing a
++non-floating value there would garble it.  In this case,
++HARD_REGNO_MODE_OK should reject fixed-point machine modes in
++floating registers.  But if the floating registers do not automatically
++normalize, if you can store any bit pattern in one and retrieve it
++unchanged without a trap, then any machine mode may go in a floating
++register, so you can define this macro to say so.
++
++The primary significance of special floating registers is rather that
++they are the registers acceptable in floating point arithmetic
++instructions.  However, this is of no concern to
++HARD_REGNO_MODE_OK.  You handle it by writing the proper
++constraints for those instructions.
++
++On some machines, the floating registers are especially slow to access,
++so that it is better to store a value in a stack frame than in such a
++register if floating point arithmetic is not being done.  As long as the
++floating registers are not in class GENERAL_REGS, they will not
++be used unless some pattern's constraint asks for one.
++*/
++#define HARD_REGNO_MODE_OK(REGNO, MODE) avr32_hard_regno_mode_ok(REGNO, MODE)
++
++/*
++A C expression that is nonzero if a value of mode
++MODE1 is accessible in mode MODE2 without copying.
++
++If HARD_REGNO_MODE_OK(R, MODE1) and
++HARD_REGNO_MODE_OK(R, MODE2) are always the same for
++any R, then MODES_TIEABLE_P(MODE1, MODE2)
++should be nonzero.  If they differ for any R, you should define
++this macro to return zero unless some other mechanism ensures the
++accessibility of the value in a narrower mode.
++
++You should define this macro to return nonzero in as many cases as
++possible since doing so will allow GCC to perform better register
++allocation.
++*/
++#define MODES_TIEABLE_P(MODE1, MODE2)  \
++  (GET_MODE_CLASS (MODE1) == GET_MODE_CLASS (MODE2))
++
++
++
++/******************************************************************************
++ * Register Classes
++ *****************************************************************************/
++
++/*
++An enumeral type that must be defined with all the register class names
++as enumeral values.  NO_REGS must be first.  ALL_REGS
++must be the last register class, followed by one more enumeral value,
++LIM_REG_CLASSES, which is not a register class but rather
++tells how many classes there are.
++
++Each register class has a number, which is the value of casting
++the class name to type int.  The number serves as an index
++in many of the tables described below.
++*/
++enum reg_class
++{
++  NO_REGS,
++  GENERAL_REGS,
++  ALL_REGS,
++  LIM_REG_CLASSES
++};
++
++/*
++The number of distinct register classes, defined as follows:
++  #define N_REG_CLASSES (int) LIM_REG_CLASSES
++*/
++#define N_REG_CLASSES (int)LIM_REG_CLASSES
++
++/*
++An initializer containing the names of the register classes as C string
++constants.  These names are used in writing some of the debugging dumps.
++*/
++#define REG_CLASS_NAMES		\
++{				\
++  "NO_REGS",			\
++  "GENERAL_REGS",		\
++  "ALL_REGS"			\
++}
++
++/*
++An initializer containing the contents of the register classes, as integers
++which are bit masks.  The nth integer specifies the contents of class
++n.  The way the integer mask is interpreted is that
++register r is in the class if mask & (1 << r) is 1.
++
++When the machine has more than 32 registers, an integer does not suffice.
++Then the integers are replaced by sub-initializers, braced groupings containing
++several integers.  Each sub-initializer must be suitable as an initializer
++for the type HARD_REG_SET which is defined in hard-reg-set.h.
++In this situation, the first integer in each sub-initializer corresponds to
++registers 0 through 31, the second integer to registers 32 through 63, and
++so on.
++*/
++#define REG_CLASS_CONTENTS {		\
++  {0x00000000}, /* NO_REGS */		\
++  {0x0000FFFF}, /* GENERAL_REGS */	\
++  {0x7FFFFFFF}, /* ALL_REGS */		\
++}
++
++
++/*
++A C expression whose value is a register class containing hard register
++REGNO.  In general there is more than one such class; choose a class
++which is minimal, meaning that no smaller class also contains the
++register.
++*/
++#define REGNO_REG_CLASS(REGNO) (GENERAL_REGS)
++
++/*
++A macro whose definition is the name of the class to which a valid
++base register must belong.  A base register is one used in an address
++which is the register value plus a displacement.
++*/
++#define BASE_REG_CLASS GENERAL_REGS
++
++/*
++This is a variation of the BASE_REG_CLASS macro which allows
++the selection of a base register in a mode depenedent manner.  If
++mode is VOIDmode then it should return the same value as
++BASE_REG_CLASS.
++*/
++#define MODE_BASE_REG_CLASS(MODE) BASE_REG_CLASS
++
++/*
++A macro whose definition is the name of the class to which a valid
++index register must belong.  An index register is one used in an
++address where its value is either multiplied by a scale factor or
++added to another register (as well as added to a displacement).
++*/
++#define INDEX_REG_CLASS BASE_REG_CLASS
++
++/*
++A C expression which defines the machine-dependent operand constraint
++letters for register classes.  If CHAR is such a letter, the
++value should be the register class corresponding to it.  Otherwise,
++the value should be NO_REGS.  The register letter r,
++corresponding to class GENERAL_REGS, will not be passed
++to this macro; you do not need to handle it.
++*/
++#define REG_CLASS_FROM_LETTER(CHAR) NO_REGS
++
++/* These assume that REGNO is a hard or pseudo reg number.
++   They give nonzero only if REGNO is a hard reg of the suitable class
++   or a pseudo reg currently allocated to a suitable hard reg.
++   Since they use reg_renumber, they are safe only once reg_renumber
++   has been allocated, which happens in local-alloc.c.  */
++#define TEST_REGNO(R, TEST, VALUE) \
++  ((R TEST VALUE) || ((unsigned) reg_renumber[R] TEST VALUE))
++
++/*
++A C expression which is nonzero if register number num is suitable for use as a base
++register in operand addresses. It may be either a suitable hard register or a pseudo
++register that has been allocated such a hard register.
++*/
++#define REGNO_OK_FOR_BASE_P(NUM)  TEST_REGNO(NUM, <=, LAST_REGNUM)
++
++/* The following macro defines cover classes for Integrated Register
++   Allocator.  Cover classes is a set of non-intersected register
++   classes covering all hard registers used for register allocation
++   purpose.  Any move between two registers of a cover class should be
++   cheaper than load or store of the registers.  The macro value is
++   array of register classes with LIM_REG_CLASSES used as the end
++   marker.  */
++
++#define IRA_COVER_CLASSES               \
++{                                       \
++  GENERAL_REGS, LIM_REG_CLASSES         \
++}
++
++/*
++A C expression which is nonzero if register number NUM is
++suitable for use as an index register in operand addresses.  It may be
++either a suitable hard register or a pseudo register that has been
++allocated such a hard register.
++
++The difference between an index register and a base register is that
++the index register may be scaled.  If an address involves the sum of
++two registers, neither one of them scaled, then either one may be
++labeled the ``base'' and the other the ``index''; but whichever
++labeling is used must fit the machine's constraints of which registers
++may serve in each capacity.  The compiler will try both labelings,
++looking for one that is valid, and will reload one or both registers
++only if neither labeling works.
++*/
++#define REGNO_OK_FOR_INDEX_P(NUM) TEST_REGNO(NUM, <=, LAST_REGNUM)
++
++/*
++A C expression that places additional restrictions on the register class
++to use when it is necessary to copy value X into a register in class
++CLASS.  The value is a register class; perhaps CLASS, or perhaps
++another, smaller class.  On many machines, the following definition is
++safe: #define PREFERRED_RELOAD_CLASS(X,CLASS) CLASS
++
++Sometimes returning a more restrictive class makes better code.  For
++example, on the 68000, when X is an integer constant that is in range
++for a 'moveq' instruction, the value of this macro is always
++DATA_REGS as long as CLASS includes the data registers.
++Requiring a data register guarantees that a 'moveq' will be used.
++
++If X is a const_double, by returning NO_REGS
++you can force X into a memory constant.  This is useful on
++certain machines where immediate floating values cannot be loaded into
++certain kinds of registers.
++*/
++#define PREFERRED_RELOAD_CLASS(X, CLASS)  CLASS
++
++
++
++/*
++A C expression for the maximum number of consecutive registers
++of class CLASS needed to hold a value of mode MODE.
++
++This is closely related to the macro HARD_REGNO_NREGS.  In fact,
++the value of the macro CLASS_MAX_NREGS(CLASS, MODE)
++should be the maximum value of HARD_REGNO_NREGS(REGNO, MODE)
++for all REGNO values in the class CLASS.
++
++This macro helps control the handling of multiple-word values
++in the reload pass.
++*/
++#define CLASS_MAX_NREGS(CLASS, MODE) /* ToDo:fixme */ \
++  (unsigned int)((GET_MODE_SIZE(MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
++
++
++/*
++  Using CONST_OK_FOR_CONSTRAINT_P instead of CONS_OK_FOR_LETTER_P
++  in order to support constraints with more than one letter.
++  Only two letters are then used for constant constraints,
++  the letter 'K' and the letter 'I'. The constraint starting with
++  these letters must consist of four characters. The character following
++  'K' or 'I' must be either 'u' (unsigned) or 's' (signed) to specify
++  if the constant is zero or sign extended. The last two characters specify
++  the length in bits of the constant. The base constraint letter 'I' means
++  that this is an negated constant, meaning that actually -VAL should be
++  checked to lie withing the valid range instead of VAL which is used when
++  'K' is the base constraint letter.
++
++*/
++
++#define CONSTRAINT_LEN(C, STR)				\
++  ( ((C) == 'K' || (C) == 'I') ?  4 :			\
++    ((C) == 'R') ?  5 :					\
++    ((C) == 'P') ? -1 :                                 \
++    DEFAULT_CONSTRAINT_LEN((C), (STR)) )
++
++#define CONST_OK_FOR_CONSTRAINT_P(VALUE, C, STR)	\
++  avr32_const_ok_for_constraint_p(VALUE, C, STR)
++
++/*
++A C expression that defines the machine-dependent operand constraint
++letters that specify particular ranges of const_double values ('G' or 'H').
++
++If C is one of those letters, the expression should check that
++VALUE, an RTX of code const_double, is in the appropriate
++range and return 1 if so, 0 otherwise.  If C is not one of those
++letters, the value should be 0 regardless of VALUE.
++
++const_double is used for all floating-point constants and for
++DImode fixed-point constants.  A given letter can accept either
++or both kinds of values.  It can use GET_MODE to distinguish
++between these kinds.
++*/
++#define CONST_DOUBLE_OK_FOR_LETTER_P(OP, C) \
++  ((C) == 'G' ? avr32_const_double_immediate(OP) : 0)
++
++/*
++A C expression that defines the optional machine-dependent constraint
++letters that can be used to segregate specific types of operands, usually
++memory references, for the target machine.  Any letter that is not
++elsewhere defined and not matched by REG_CLASS_FROM_LETTER
++may be used.  Normally this macro will not be defined.
++
++If it is required for a particular target machine, it should return 1
++if VALUE corresponds to the operand type represented by the
++constraint letter C.  If C is not defined as an extra
++constraint, the value returned should be 0 regardless of VALUE.
++
++For example, on the ROMP, load instructions cannot have their output
++in r0 if the memory reference contains a symbolic address.  Constraint
++letter 'Q' is defined as representing a memory address that does
++not contain a symbolic address.  An alternative is specified with
++a 'Q' constraint on the input and 'r' on the output.  The next
++alternative specifies 'm' on the input and a register class that
++does not include r0 on the output.
++*/
++#define EXTRA_CONSTRAINT_STR(OP, C, STR)				\
++  ((C) == 'W' ? avr32_address_operand(OP, GET_MODE(OP)) :		\
++   (C) == 'R' ? (avr32_indirect_register_operand(OP, GET_MODE(OP)) ||	\
++                 (avr32_imm_disp_memory_operand(OP, GET_MODE(OP))	\
++                  && avr32_const_ok_for_constraint_p(			\
++				INTVAL(XEXP(XEXP(OP, 0), 1)),		\
++				(STR)[1], &(STR)[1]))) :		\
++   (C) == 'S' ? avr32_indexed_memory_operand(OP, GET_MODE(OP)) :	\
++   (C) == 'T' ? avr32_const_pool_ref_operand(OP, GET_MODE(OP)) :	\
++   (C) == 'U' ? SYMBOL_REF_RCALL_FUNCTION_P(OP) :			\
++   (C) == 'Z' ? avr32_cop_memory_operand(OP, GET_MODE(OP)) :		\
++   (C) == 'Q' ? avr32_non_rmw_memory_operand(OP, GET_MODE(OP)) :		\
++   (C) == 'Y' ? avr32_rmw_memory_operand(OP, GET_MODE(OP)) :            \
++   0)
++
++
++#define EXTRA_MEMORY_CONSTRAINT(C, STR) ( ((C) == 'R') ||               \
++                                          ((C) == 'Q') ||               \
++                                          ((C) == 'S') ||               \
++                                          ((C) == 'Y') ||               \
++                                          ((C) == 'Z') )
++
++
++/* Returns nonzero if op is a function SYMBOL_REF which
++   can be called using an rcall instruction */
++#define SYMBOL_REF_RCALL_FUNCTION_P(op)  \
++  ( GET_CODE(op) == SYMBOL_REF           \
++    && SYMBOL_REF_FUNCTION_P(op)         \
++    && SYMBOL_REF_LOCAL_P(op)            \
++    && !SYMBOL_REF_EXTERNAL_P(op)        \
++    && !TARGET_HAS_ASM_ADDR_PSEUDOS )
++
++/******************************************************************************
++ * Stack Layout and Calling Conventions
++ *****************************************************************************/
++
++/** Basic Stack Layout **/
++
++/*
++Define this macro if pushing a word onto the stack moves the stack
++pointer to a smaller address.
++
++When we say, ``define this macro if ...,'' it means that the
++compiler checks this macro only with #ifdef so the precise
++definition used does not matter.
++*/
++/* pushm decrece SP: *(--SP) <-- Rx */
++#define STACK_GROWS_DOWNWARD
++
++/*
++This macro defines the operation used when something is pushed
++on the stack.  In RTL, a push operation will be
++(set (mem (STACK_PUSH_CODE (reg sp))) ...)
++
++The choices are PRE_DEC, POST_DEC, PRE_INC,
++and POST_INC.  Which of these is correct depends on
++the stack direction and on whether the stack pointer points
++to the last item on the stack or whether it points to the
++space for the next item on the stack.
++
++The default is PRE_DEC when STACK_GROWS_DOWNWARD is
++defined, which is almost always right, and PRE_INC otherwise,
++which is often wrong.
++*/
++/* pushm: *(--SP) <-- Rx */
++#define STACK_PUSH_CODE PRE_DEC
++
++/* Define this to nonzero if the nominal address of the stack frame
++   is at the high-address end of the local variables;
++   that is, each additional local variable allocated
++   goes at a more negative offset in the frame.  */
++#define FRAME_GROWS_DOWNWARD 1
++
++
++/*
++Offset from the frame pointer to the first local variable slot to be allocated.
++
++If FRAME_GROWS_DOWNWARD, find the next slot's offset by
++subtracting the first slot's length from STARTING_FRAME_OFFSET.
++Otherwise, it is found by adding the length of the first slot to the
++value STARTING_FRAME_OFFSET.
++  (i'm not sure if the above is still correct.. had to change it to get
++   rid of an overfull.  --mew 2feb93 )
++*/
++#define STARTING_FRAME_OFFSET 0
++
++/*
++Offset from the stack pointer register to the first location at which
++outgoing arguments are placed.  If not specified, the default value of
++zero is used.  This is the proper value for most machines.
++
++If ARGS_GROW_DOWNWARD, this is the offset to the location above
++the first location at which outgoing arguments are placed.
++*/
++#define STACK_POINTER_OFFSET 0
++
++/*
++Offset from the argument pointer register to the first argument's
++address.  On some machines it may depend on the data type of the
++function.
++
++If ARGS_GROW_DOWNWARD, this is the offset to the location above
++the first argument's address.
++*/
++#define FIRST_PARM_OFFSET(FUNDECL) 0
++
++
++/*
++A C expression whose value is RTL representing the address in a stack
++frame where the pointer to the caller's frame is stored.  Assume that
++FRAMEADDR is an RTL expression for the address of the stack frame
++itself.
++
++If you don't define this macro, the default is to return the value
++of FRAMEADDR - that is, the stack frame address is also the
++address of the stack word that points to the previous frame.
++*/
++#define DYNAMIC_CHAIN_ADDRESS(FRAMEADDR) plus_constant ((FRAMEADDR), 4)
++
++
++/*
++A C expression whose value is RTL representing the value of the return
++address for the frame COUNT steps up from the current frame, after
++the prologue.  FRAMEADDR is the frame pointer of the COUNT
++frame, or the frame pointer of the COUNT - 1 frame if
++RETURN_ADDR_IN_PREVIOUS_FRAME is defined.
++
++The value of the expression must always be the correct address when
++COUNT is zero, but may be NULL_RTX if there is not way to
++determine the return address of other frames.
++*/
++#define RETURN_ADDR_RTX(COUNT, FRAMEADDR) avr32_return_addr(COUNT, FRAMEADDR)
++
++
++/*
++A C expression whose value is RTL representing the location of the
++incoming return address at the beginning of any function, before the
++prologue.  This RTL is either a REG, indicating that the return
++value is saved in 'REG', or a MEM representing a location in
++the stack.
++
++You only need to define this macro if you want to support call frame
++debugging information like that provided by DWARF 2.
++
++If this RTL is a REG, you should also define
++DWARF_FRAME_RETURN_COLUMN to DWARF_FRAME_REGNUM (REGNO).
++*/
++#define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, LR_REGNUM)
++
++/*
++A C expression whose value is an integer giving the offset, in bytes,
++from the value of the stack pointer register to the top of the stack
++frame at the beginning of any function, before the prologue.  The top of
++the frame is defined to be the value of the stack pointer in the
++previous frame, just before the call instruction.
++
++You only need to define this macro if you want to support call frame
++debugging information like that provided by DWARF 2.
++*/
++#define INCOMING_FRAME_SP_OFFSET 0
++
++
++/** Exception Handling Support **/
++
++/* Use setjump/longjump for exception handling. */
++#define DWARF2_UNWIND_INFO 0
++#define MUST_USE_SJLJ_EXCEPTIONS 1
++
++/*
++A C expression whose value is the Nth register number used for
++data by exception handlers, or INVALID_REGNUM if fewer than
++N registers are usable.
++
++The exception handling library routines communicate with the exception
++handlers via a set of agreed upon registers.  Ideally these registers
++should be call-clobbered; it is possible to use call-saved registers,
++but may negatively impact code size.  The target must support at least
++2 data registers, but should define 4 if there are enough free registers.
++
++You must define this macro if you want to support call frame exception
++handling like that provided by DWARF 2.
++*/
++/*
++  Use r9-r11
++*/
++#define EH_RETURN_DATA_REGNO(N)                                         \
++  ((N<3) ? INTERNAL_REGNUM(N+9) : INVALID_REGNUM)
++
++/*
++A C expression whose value is RTL representing a location in which
++to store a stack adjustment to be applied before function return.
++This is used to unwind the stack to an exception handler's call frame.
++It will be assigned zero on code paths that return normally.
++
++Typically this is a call-clobbered hard register that is otherwise
++untouched by the epilogue, but could also be a stack slot.
++
++You must define this macro if you want to support call frame exception
++handling like that provided by DWARF 2.
++*/
++/*
++  Use r8
++*/
++#define EH_RETURN_STACKADJ_REGNO INTERNAL_REGNUM(8)
++#define EH_RETURN_STACKADJ_RTX gen_rtx_REG(SImode, EH_RETURN_STACKADJ_REGNO)
++
++/*
++A C expression whose value is RTL representing a location in which
++to store the address of an exception handler to which we should
++return.  It will not be assigned on code paths that return normally.
++
++Typically this is the location in the call frame at which the normal
++return address is stored.  For targets that return by popping an
++address off the stack, this might be a memory address just below
++the target call frame rather than inside the current call
++frame.  EH_RETURN_STACKADJ_RTX will have already been assigned,
++so it may be used to calculate the location of the target call frame.
++
++Some targets have more complex requirements than storing to an
++address calculable during initial code generation.  In that case
++the eh_return instruction pattern should be used instead.
++
++If you want to support call frame exception handling, you must
++define either this macro or the eh_return instruction pattern.
++*/
++/*
++  We define the eh_return instruction pattern, so this isn't needed.
++*/
++/* #define EH_RETURN_HANDLER_RTX gen_rtx_REG(Pmode, RET_REGISTER) */
++
++/*
++  This macro chooses the encoding of pointers embedded in the
++  exception handling sections. If at all possible, this should be
++  defined such that the exception handling section will not require
++  dynamic relocations, and so may be read-only.
++
++  code is 0 for data, 1 for code labels, 2 for function
++  pointers. global is true if the symbol may be affected by dynamic
++  relocations. The macro should return a combination of the DW_EH_PE_*
++  defines as found in dwarf2.h.
++
++  If this macro is not defined, pointers will not be encoded but
++  represented directly.
++*/
++#define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL)	\
++  ((flag_pic && (GLOBAL) ? DW_EH_PE_indirect : 0)	\
++   | (flag_pic ? DW_EH_PE_pcrel : DW_EH_PE_absptr)	\
++   | DW_EH_PE_sdata4)
++
++/* ToDo: The rest of this subsection */
++
++/** Specifying How Stack Checking is Done **/
++/* ToDo: All in this subsection */
++
++/** Registers That Address the Stack Frame **/
++
++/*
++The register number of the stack pointer register, which must also be a
++fixed register according to FIXED_REGISTERS.  On most machines,
++the hardware determines which register this is.
++*/
++/* Using r13 as stack pointer. */
++#define STACK_POINTER_REGNUM INTERNAL_REGNUM(13)
++
++/*
++The register number of the frame pointer register, which is used to
++access automatic variables in the stack frame.  On some machines, the
++hardware determines which register this is.  On other machines, you can
++choose any register you wish for this purpose.
++*/
++/* Use r7 */
++#define FRAME_POINTER_REGNUM INTERNAL_REGNUM(7)
++
++/*
++The register number of the arg pointer register, which is used to access
++the function's argument list.  On some machines, this is the same as the
++frame pointer register.  On some machines, the hardware determines which
++register this is.  On other machines, you can choose any register you
++wish for this purpose.  If this is not the same register as the frame
++pointer register, then you must mark it as a fixed register according to
++FIXED_REGISTERS, or arrange to be able to eliminate it (see Section
++10.10.5 [Elimination], page 224).
++*/
++/* Using r5 */
++#define ARG_POINTER_REGNUM INTERNAL_REGNUM(4)
++
++
++/*
++Register numbers used for passing a function's static chain pointer.  If
++register windows are used, the register number as seen by the called
++function is STATIC_CHAIN_INCOMING_REGNUM, while the register
++number as seen by the calling function is STATIC_CHAIN_REGNUM.  If
++these registers are the same, STATIC_CHAIN_INCOMING_REGNUM need
++not be defined.
++
++The static chain register need not be a fixed register.
++
++If the static chain is passed in memory, these macros should not be
++defined; instead, the next two macros should be defined.
++*/
++/* Using r0 */
++#define STATIC_CHAIN_REGNUM INTERNAL_REGNUM(0)
++
++/** Eliminating Frame Pointer and Arg Pointer **/
++
++/*
++A C expression which is nonzero if a function must have and use a frame
++pointer.  This expression is evaluated  in the reload pass.  If its value is
++nonzero the function will have a frame pointer.
++
++The expression can in principle examine the current function and decide
++according to the facts, but on most machines the constant 0 or the
++constant 1 suffices.  Use 0 when the machine allows code to be generated
++with no frame pointer, and doing so saves some time or space.  Use 1
++when there is no possible advantage to avoiding a frame pointer.
++
++In certain cases, the compiler does not know how to produce valid code
++without a frame pointer.  The compiler recognizes those cases and
++automatically gives the function a frame pointer regardless of what
++FRAME_POINTER_REQUIRED says.  You don't need to worry about
++them.
++
++In a function that does not require a frame pointer, the frame pointer
++register can be allocated for ordinary usage, unless you mark it as a
++fixed register.  See FIXED_REGISTERS for more information.
++*/
++/* We need the frame pointer when compiling for profiling */
++#define FRAME_POINTER_REQUIRED (crtl->profile)
++
++/*
++A C statement to store in the variable DEPTH_VAR the difference
++between the frame pointer and the stack pointer values immediately after
++the function prologue.  The value would be computed from information
++such as the result of get_frame_size () and the tables of
++registers regs_ever_live and call_used_regs.
++
++If ELIMINABLE_REGS is defined, this macro will be not be used and
++need not be defined.  Otherwise, it must be defined even if
++FRAME_POINTER_REQUIRED is defined to always be true; in that
++case, you may set DEPTH_VAR to anything.
++*/
++#define INITIAL_FRAME_POINTER_OFFSET(DEPTH_VAR) ((DEPTH_VAR) = get_frame_size())
++
++/*
++If defined, this macro specifies a table of register pairs used to
++eliminate unneeded registers that point into the stack frame.  If it is not
++defined, the only elimination attempted by the compiler is to replace
++references to the frame pointer with references to the stack pointer.
++
++The definition of this macro is a list of structure initializations, each
++of which specifies an original and replacement register.
++
++On some machines, the position of the argument pointer is not known until
++the compilation is completed.  In such a case, a separate hard register
++must be used for the argument pointer.  This register can be eliminated by
++replacing it with either the frame pointer or the argument pointer,
++depending on whether or not the frame pointer has been eliminated.
++
++In this case, you might specify:
++  #define ELIMINABLE_REGS  \
++  {{ARG_POINTER_REGNUM, STACK_POINTER_REGNUM}, \
++   {ARG_POINTER_REGNUM, FRAME_POINTER_REGNUM}, \
++   {FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM}}
++
++Note that the elimination of the argument pointer with the stack pointer is
++specified first since that is the preferred elimination.
++*/
++#define ELIMINABLE_REGS					\
++{							\
++  { FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM },	\
++  { ARG_POINTER_REGNUM, STACK_POINTER_REGNUM },		\
++  { ARG_POINTER_REGNUM, FRAME_POINTER_REGNUM }		\
++}
++
++/*
++A C expression that returns nonzero if the compiler is allowed to try
++to replace register number FROM with register number
++TO.  This macro need only be defined if ELIMINABLE_REGS
++is defined, and will usually be the constant 1, since most of the cases
++preventing register elimination are things that the compiler already
++knows about.
++*/
++#define CAN_ELIMINATE(FROM, TO) 1
++
++/*
++This macro is similar to INITIAL_FRAME_POINTER_OFFSET.  It
++specifies the initial difference between the specified pair of
++registers.  This macro must be defined if ELIMINABLE_REGS is
++defined.
++*/
++#define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET)		\
++  ((OFFSET) = avr32_initial_elimination_offset(FROM, TO))
++
++/** Passing Function Arguments on the Stack **/
++
++
++/*
++A C expression.  If nonzero, push insns will be used to pass
++outgoing arguments.
++If the target machine does not have a push instruction, set it to zero.
++That directs GCC to use an alternate strategy: to
++allocate the entire argument block and then store the arguments into
++it.  When PUSH_ARGS is nonzero, PUSH_ROUNDING must be defined too.
++*/
++#define PUSH_ARGS 1
++
++/*
++A C expression that is the number of bytes actually pushed onto the
++stack when an instruction attempts to push NPUSHED bytes.
++
++On some machines, the definition
++
++  #define PUSH_ROUNDING(BYTES) (BYTES)
++
++will suffice.  But on other machines, instructions that appear
++to push one byte actually push two bytes in an attempt to maintain
++alignment.  Then the definition should be
++
++  #define PUSH_ROUNDING(BYTES) (((BYTES) + 1) & ~1)
++*/
++/* Push 4 bytes at the time. */
++#define PUSH_ROUNDING(NPUSHED) (((NPUSHED) + 3) & ~3)
++
++/*
++A C expression.  If nonzero, the maximum amount of space required for
++outgoing arguments will be computed and placed into the variable
++current_function_outgoing_args_size.  No space will be pushed
++onto the stack for each call; instead, the function prologue should
++increase the stack frame size by this amount.
++
++Setting both PUSH_ARGS and ACCUMULATE_OUTGOING_ARGS is not proper.
++*/
++#define ACCUMULATE_OUTGOING_ARGS 0
++
++/*
++A C expression that should indicate the number of bytes of its own
++arguments that a function pops on returning, or 0 if the
++function pops no arguments and the caller must therefore pop them all
++after the function returns.
++
++FUNDECL is a C variable whose value is a tree node that describes
++the function in question.  Normally it is a node of type
++FUNCTION_DECL that describes the declaration of the function.
++From this you can obtain the DECL_ATTRIBUTES of the function.
++
++FUNTYPE is a C variable whose value is a tree node that
++describes the function in question.  Normally it is a node of type
++FUNCTION_TYPE that describes the data type of the function.
++From this it is possible to obtain the data types of the value and
++arguments (if known).
++
++When a call to a library function is being considered, FUNDECL
++will contain an identifier node for the library function.  Thus, if
++you need to distinguish among various library functions, you can do so
++by their names.  Note that ``library function'' in this context means
++a function used to perform arithmetic, whose name is known specially
++in the compiler and was not mentioned in the C code being compiled.
++
++STACK_SIZE is the number of bytes of arguments passed on the
++stack.  If a variable number of bytes is passed, it is zero, and
++argument popping will always be the responsibility of the calling function.
++
++On the VAX, all functions always pop their arguments, so the definition
++of this macro is STACK_SIZE.  On the 68000, using the standard
++calling convention, no functions pop their arguments, so the value of
++the macro is always 0 in this case.  But an alternative calling
++convention is available in which functions that take a fixed number of
++arguments pop them but other functions (such as printf) pop
++nothing (the caller pops all).  When this convention is in use,
++FUNTYPE is examined to determine whether a function takes a fixed
++number of arguments.
++*/
++#define RETURN_POPS_ARGS(FUNDECL, FUNTYPE, STACK_SIZE) 0
++
++
++/*Return true if this function can we use a single return instruction*/
++#define USE_RETURN_INSN(ISCOND) avr32_use_return_insn(ISCOND)
++
++/*
++A C expression that should indicate the number of bytes a call sequence
++pops off the stack.  It is added to the value of RETURN_POPS_ARGS
++when compiling a function call.
++
++CUM is the variable in which all arguments to the called function
++have been accumulated.
++
++On certain architectures, such as the SH5, a call trampoline is used
++that pops certain registers off the stack, depending on the arguments
++that have been passed to the function.  Since this is a property of the
++call site, not of the called function, RETURN_POPS_ARGS is not
++appropriate.
++*/
++#define CALL_POPS_ARGS(CUM) 0
++
++/* Passing Arguments in Registers */
++
++/*
++A C expression that controls whether a function argument is passed
++in a register, and which register.
++
++The arguments are CUM, which summarizes all the previous
++arguments; MODE, the machine mode of the argument; TYPE,
++the data type of the argument as a tree node or 0 if that is not known
++(which happens for C support library functions); and NAMED,
++which is 1 for an ordinary argument and 0 for nameless arguments that
++correspond to '...' in the called function's prototype.
++TYPE can be an incomplete type if a syntax error has previously
++occurred.
++
++The value of the expression is usually either a reg RTX for the
++hard register in which to pass the argument, or zero to pass the
++argument on the stack.
++
++For machines like the VAX and 68000, where normally all arguments are
++pushed, zero suffices as a definition.
++
++The value of the expression can also be a parallel RTX.  This is
++used when an argument is passed in multiple locations.  The mode of the
++of the parallel should be the mode of the entire argument.  The
++parallel holds any number of expr_list pairs; each one
++describes where part of the argument is passed.  In each
++expr_list the first operand must be a reg RTX for the hard
++register in which to pass this part of the argument, and the mode of the
++register RTX indicates how large this part of the argument is.  The
++second operand of the expr_list is a const_int which gives
++the offset in bytes into the entire argument of where this part starts.
++As a special exception the first expr_list in the parallel
++RTX may have a first operand of zero.  This indicates that the entire
++argument is also stored on the stack.
++
++The last time this macro is called, it is called with MODE == VOIDmode,
++and its result is passed to the call or call_value
++pattern as operands 2 and 3 respectively.
++
++The usual way to make the ISO library 'stdarg.h' work on a machine
++where some arguments are usually passed in registers, is to cause
++nameless arguments to be passed on the stack instead.  This is done
++by making FUNCTION_ARG return 0 whenever NAMED is 0.
++
++You may use the macro MUST_PASS_IN_STACK (MODE, TYPE)
++in the definition of this macro to determine if this argument is of a
++type that must be passed in the stack.  If REG_PARM_STACK_SPACE
++is not defined and FUNCTION_ARG returns nonzero for such an
++argument, the compiler will abort.  If REG_PARM_STACK_SPACE is
++defined, the argument will be computed in the stack and then loaded into
++a register.  */
++
++#define FUNCTION_ARG(CUM, MODE, TYPE, NAMED) \
++  avr32_function_arg(&(CUM), MODE, TYPE, NAMED)
++
++/*
++A C type for declaring a variable that is used as the first argument of
++FUNCTION_ARG and other related values.  For some target machines,
++the type int suffices and can hold the number of bytes of
++argument so far.
++
++There is no need to record in CUMULATIVE_ARGS anything about the
++arguments that have been passed on the stack.  The compiler has other
++variables to keep track of that.  For target machines on which all
++arguments are passed on the stack, there is no need to store anything in
++CUMULATIVE_ARGS; however, the data structure must exist and
++should not be empty, so use int.
++*/
++typedef struct avr32_args
++{
++  /* Index representing the argument register the current function argument
++     will occupy */
++  int index;
++  /* A mask with bits representing the argument registers: if a bit is set
++     then this register is used for an argument */
++  int used_index;
++  /* TRUE if this function has anonymous arguments */
++  int uses_anonymous_args;
++  /* The size in bytes of the named arguments pushed on the stack */
++  int stack_pushed_args_size;
++  /* Set to true if this function needs a Return Value Pointer */
++  int use_rvp;
++  /* Set to true if function is a flashvault function. */
++  int flashvault_func;
++
++} CUMULATIVE_ARGS;
++
++
++#define FIRST_CUM_REG_INDEX 0
++#define LAST_CUM_REG_INDEX 4
++#define GET_REG_INDEX(CUM) ((CUM)->index)
++#define SET_REG_INDEX(CUM, INDEX) ((CUM)->index = (INDEX));
++#define GET_USED_INDEX(CUM, INDEX) ((CUM)->used_index & (1 << (INDEX)))
++#define SET_USED_INDEX(CUM, INDEX)		\
++  do						\
++    {						\
++      if (INDEX >= 0)				\
++        (CUM)->used_index |= (1 << (INDEX));	\
++    }						\
++  while (0)
++#define SET_INDEXES_UNUSED(CUM) ((CUM)->used_index = 0)
++
++/*
++   A C statement (sans semicolon) for initializing the variable cum for the
++   state at the beginning of the argument list. The variable has type
++   CUMULATIVE_ARGS. The value of FNTYPE is the tree node for the data type of
++   the function which will receive the args, or 0 if the args are to a compiler
++   support library function. For direct calls that are not libcalls, FNDECL
++   contain the declaration node of the function. FNDECL is also set when
++   INIT_CUMULATIVE_ARGS is used to find arguments for the function being
++   compiled.  N_NAMED_ARGS is set to the number of named arguments, including a
++   structure return address if it is passed as a parameter, when making a call.
++   When processing incoming arguments, N_NAMED_ARGS is set to -1.
++
++   When processing a call to a compiler support library function, LIBNAME
++   identifies which one.  It is a symbol_ref rtx which contains the name of the
++   function, as a string. LIBNAME is 0 when an ordinary C function call is
++   being processed. Thus, each time this macro is called, either LIBNAME or
++   FNTYPE is nonzero, but never both of them at once.
++*/
++#define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, FNDECL, N_NAMED_ARGS) \
++  avr32_init_cumulative_args(&(CUM), FNTYPE, LIBNAME, FNDECL)
++
++/*
++A C statement (sans semicolon) to update the summarizer variable
++CUM to advance past an argument in the argument list.  The
++values MODE, TYPE and NAMED describe that argument.
++Once this is done, the variable CUM is suitable for analyzing
++the following argument with FUNCTION_ARG, etc.
++
++This macro need not do anything if the argument in question was passed
++on the stack.  The compiler knows how to track the amount of stack space
++used for arguments without any special help.
++*/
++#define FUNCTION_ARG_ADVANCE(CUM, MODE, TYPE, NAMED) \
++  avr32_function_arg_advance(&(CUM), MODE, TYPE, NAMED)
++
++/*
++If defined, a C expression which determines whether, and in which direction,
++to pad out an argument with extra space.  The value should be of type
++enum direction: either 'upward' to pad above the argument,
++'downward' to pad below, or 'none' to inhibit padding.
++
++The amount of padding is always just enough to reach the next
++multiple of FUNCTION_ARG_BOUNDARY; this macro does not control
++it.
++
++This macro has a default definition which is right for most systems.
++For little-endian machines, the default is to pad upward.  For
++big-endian machines, the default is to pad downward for an argument of
++constant size shorter than an int, and upward otherwise.
++*/
++#define FUNCTION_ARG_PADDING(MODE, TYPE) \
++  avr32_function_arg_padding(MODE, TYPE)
++
++/*
++  Specify padding for the last element of a block move between registers
++  and memory. First is nonzero if this is the only element. Defining
++  this macro allows better control of register function parameters on
++  big-endian machines, without using PARALLEL rtl. In particular,
++  MUST_PASS_IN_STACK need not test padding and mode of types in registers,
++  as there is no longer a "wrong" part of a register; For example, a three
++  byte aggregate may be passed in the high part of a register if so required.
++*/
++#define BLOCK_REG_PADDING(MODE, TYPE, FIRST) \
++  avr32_function_arg_padding(MODE, TYPE)
++
++/*
++If defined, a C expression which determines whether the default
++implementation of va_arg will attempt to pad down before reading the
++next argument, if that argument is smaller than its aligned space as
++controlled by PARM_BOUNDARY.  If this macro is not defined, all such
++arguments are padded down if BYTES_BIG_ENDIAN is true.
++*/
++#define PAD_VARARGS_DOWN \
++  (FUNCTION_ARG_PADDING (TYPE_MODE (type), type) == downward)
++
++/*
++A C expression that is nonzero if REGNO is the number of a hard
++register in which function arguments are sometimes passed.  This does
++not include implicit arguments such as the static chain and
++the structure-value address.  On many machines, no registers can be
++used for this purpose since all function arguments are pushed on the
++stack.
++*/
++/*
++  Use r8 - r12 for function arguments.
++*/
++#define FUNCTION_ARG_REGNO_P(REGNO) \
++  (REGNO >= 3 && REGNO <= 7)
++
++/* Number of registers used for passing function arguments */
++#define NUM_ARG_REGS 5
++
++/*
++If defined, the order in which arguments are loaded into their
++respective argument registers is reversed so that the last
++argument is loaded first.  This macro only affects arguments
++passed in registers.
++*/
++/* #define LOAD_ARGS_REVERSED */
++
++/** How Scalar Function Values Are Returned **/
++
++/* AVR32 is using r12 as return register. */
++#define RET_REGISTER (15 - 12)
++
++/*
++A C expression to create an RTX representing the place where a library
++function returns a value of mode MODE.  If the precise function
++being called is known, FUNC is a tree node
++(FUNCTION_DECL) for it; otherwise, func is a null
++pointer.  This makes it possible to use a different value-returning
++convention for specific functions when all their calls are
++known.
++
++Note that "library function" in this context means a compiler
++support routine, used to perform arithmetic, whose name is known
++specially by the compiler and was not mentioned in the C code being
++compiled.
++
++The definition of LIBRARY_VALUE need not be concerned aggregate
++data types, because none of the library functions returns such types.
++*/
++#define LIBCALL_VALUE(MODE) avr32_libcall_value(MODE)
++
++/*
++A C expression that is nonzero if REGNO is the number of a hard
++register in which the values of called function may come back.
++
++A register whose use for returning values is limited to serving as the
++second of a pair (for a value of type double, say) need not be
++recognized by this macro.  So for most machines, this definition
++suffices:
++  #define FUNCTION_VALUE_REGNO_P(N) ((N) == 0)
++
++If the machine has register windows, so that the caller and the called
++function use different registers for the return value, this macro
++should recognize only the caller's register numbers.
++*/
++/*
++  When returning a value of mode DImode, r11:r10 is used, else r12 is used.
++*/
++#define FUNCTION_VALUE_REGNO_P(REGNO) ((REGNO) == RET_REGISTER \
++                                       || (REGNO) == INTERNAL_REGNUM(11))
++
++
++/** How Large Values Are Returned **/
++
++
++/*
++Define this macro to be 1 if all structure and union return values must be
++in memory.  Since this results in slower code, this should be defined
++only if needed for compatibility with other compilers or with an ABI.
++If you define this macro to be 0, then the conventions used for structure
++and union return values are decided by the RETURN_IN_MEMORY macro.
++
++If not defined, this defaults to the value 1.
++*/
++#define DEFAULT_PCC_STRUCT_RETURN 0
++
++
++
++
++/** Generating Code for Profiling **/
++
++/*
++A C statement or compound statement to output to FILE some
++assembler code to call the profiling subroutine mcount.
++
++The details of how mcount expects to be called are determined by
++your operating system environment, not by GCC.  To figure them out,
++compile a small program for profiling using the system's installed C
++compiler and look at the assembler code that results.
++
++Older implementations of mcount expect the address of a counter
++variable to be loaded into some register.  The name of this variable is
++'LP' followed by the number LABELNO, so you would generate
++the name using 'LP%d' in a fprintf.
++*/
++/* ToDo: fixme */
++#ifndef FUNCTION_PROFILER
++#define FUNCTION_PROFILER(FILE, LABELNO) \
++  fprintf((FILE), "/* profiler %d */", (LABELNO))
++#endif
++
++
++/*****************************************************************************
++ * Trampolines for Nested Functions                                          *
++ *****************************************************************************/
++
++/*
++A C statement to output, on the stream FILE, assembler code for a
++block of data that contains the constant parts of a trampoline.  This
++code should not include a label - the label is taken care of
++automatically.
++
++If you do not define this macro, it means no template is needed
++for the target.  Do not define this macro on systems where the block move
++code to copy the trampoline into place would be larger than the code
++to generate it on the spot.
++*/
++/* ToDo: correct? */
++#define TRAMPOLINE_TEMPLATE(FILE) avr32_trampoline_template(FILE);
++
++
++/*
++A C expression for the size in bytes of the trampoline, as an integer.
++*/
++/* ToDo: fixme */
++#define TRAMPOLINE_SIZE 0x0C
++
++/*
++Alignment required for trampolines, in bits.
++
++If you don't define this macro, the value of BIGGEST_ALIGNMENT
++is used for aligning trampolines.
++*/
++#define TRAMPOLINE_ALIGNMENT 16
++
++/*
++A C statement to initialize the variable parts of a trampoline.
++ADDR is an RTX for the address of the trampoline; FNADDR is
++an RTX for the address of the nested function; STATIC_CHAIN is an
++RTX for the static chain value that should be passed to the function
++when it is called.
++*/
++#define INITIALIZE_TRAMPOLINE(ADDR, FNADDR, STATIC_CHAIN) \
++  avr32_initialize_trampoline(ADDR, FNADDR, STATIC_CHAIN)
++
++
++/******************************************************************************
++ * Implicit Calls to Library Routines
++ *****************************************************************************/
++
++/* Tail calling.  */
++
++/* A C expression that evaluates to true if it is ok to perform a sibling
++   call to DECL.  */
++#define FUNCTION_OK_FOR_SIBCALL(DECL) 0
++
++#define OVERRIDE_OPTIONS  avr32_override_options ()
++
++#define OPTIMIZATION_OPTIONS(LEVEL, SIZE) avr32_optimization_options (LEVEL, SIZE)
++
++/******************************************************************************
++ * Addressing Modes
++ *****************************************************************************/
++
++/*
++A C expression that is nonzero if the machine supports pre-increment,
++pre-decrement, post-increment, or post-decrement addressing respectively.
++*/
++/*
++  AVR32 supports Rp++ and --Rp
++*/
++#define HAVE_PRE_INCREMENT 0
++#define HAVE_PRE_DECREMENT 1
++#define HAVE_POST_INCREMENT 1
++#define HAVE_POST_DECREMENT 0
++
++/*
++A C expression that is nonzero if the machine supports pre- or
++post-address side-effect generation involving constants other than
++the size of the memory operand.
++*/
++#define HAVE_PRE_MODIFY_DISP 0
++#define HAVE_POST_MODIFY_DISP 0
++
++/*
++A C expression that is nonzero if the machine supports pre- or
++post-address side-effect generation involving a register displacement.
++*/
++#define HAVE_PRE_MODIFY_REG 0
++#define HAVE_POST_MODIFY_REG 0
++
++/*
++A C expression that is 1 if the RTX X is a constant which
++is a valid address.  On most machines, this can be defined as
++CONSTANT_P (X), but a few machines are more restrictive
++in which constant addresses are supported.
++
++CONSTANT_P accepts integer-values expressions whose values are
++not explicitly known, such as symbol_ref, label_ref, and
++high expressions and const arithmetic expressions, in
++addition to const_int and const_double expressions.
++*/
++#define CONSTANT_ADDRESS_P(X) CONSTANT_P(X)
++
++/*
++A number, the maximum number of registers that can appear in a valid
++memory address.  Note that it is up to you to specify a value equal to
++the maximum number that GO_IF_LEGITIMATE_ADDRESS would ever
++accept.
++*/
++#define MAX_REGS_PER_ADDRESS 2
++
++/*
++A C compound statement with a conditional goto LABEL;
++executed if X (an RTX) is a legitimate memory address on the
++target machine for a memory operand of mode MODE.
++
++It usually pays to define several simpler macros to serve as
++subroutines for this one.  Otherwise it may be too complicated to
++understand.
++
++This macro must exist in two variants: a strict variant and a
++non-strict one.  The strict variant is used in the reload pass.  It
++must be defined so that any pseudo-register that has not been
++allocated a hard register is considered a memory reference.  In
++contexts where some kind of register is required, a pseudo-register
++with no hard register must be rejected.
++
++The non-strict variant is used in other passes.  It must be defined to
++accept all pseudo-registers in every context where some kind of
++register is required.
++
++Compiler source files that want to use the strict variant of this
++macro define the macro REG_OK_STRICT.  You should use an
++#ifdef REG_OK_STRICT conditional to define the strict variant
++in that case and the non-strict variant otherwise.
++
++Subroutines to check for acceptable registers for various purposes (one
++for base registers, one for index registers, and so on) are typically
++among the subroutines used to define GO_IF_LEGITIMATE_ADDRESS.
++Then only these subroutine macros need have two variants; the higher
++levels of macros may be the same whether strict or not.
++
++Normally, constant addresses which are the sum of a symbol_ref
++and an integer are stored inside a const RTX to mark them as
++constant.  Therefore, there is no need to recognize such sums
++specifically as legitimate addresses.  Normally you would simply
++recognize any const as legitimate.
++
++Usually PRINT_OPERAND_ADDRESS is not prepared to handle constant
++sums that are not marked with  const.  It assumes that a naked
++plus indicates indexing.  If so, then you must reject such
++naked constant sums as illegitimate addresses, so that none of them will
++be given to PRINT_OPERAND_ADDRESS.
++
++On some machines, whether a symbolic address is legitimate depends on
++the section that the address refers to.  On these machines, define the
++macro ENCODE_SECTION_INFO to store the information into the
++symbol_ref, and then check for it here.  When you see a
++const, you will have to look inside it to find the
++symbol_ref in order to determine the section.
++
++The best way to modify the name string is by adding text to the
++beginning, with suitable punctuation to prevent any ambiguity.  Allocate
++the new name in saveable_obstack.  You will have to modify
++ASM_OUTPUT_LABELREF to remove and decode the added text and
++output the name accordingly, and define STRIP_NAME_ENCODING to
++access the original name string.
++
++You can check the information stored here into the symbol_ref in
++the definitions of the macros GO_IF_LEGITIMATE_ADDRESS and
++PRINT_OPERAND_ADDRESS.
++*/
++#ifdef REG_OK_STRICT
++#  define GO_IF_LEGITIMATE_ADDRESS(MODE, X, LABEL)	\
++  do							\
++    {							\
++      if (avr32_legitimate_address(MODE, X, 1))		\
++	goto LABEL;					\
++    }							\
++  while (0)
++#else
++#  define GO_IF_LEGITIMATE_ADDRESS(MODE, X, LABEL)	\
++  do							\
++    {							\
++      if (avr32_legitimate_address(MODE, X, 0))		\
++	goto LABEL;					\
++    }							\
++  while (0)
++#endif
++
++
++
++/*
++A C compound statement that attempts to replace X with a valid
++memory address for an operand of mode MODE.  win will be a
++C statement label elsewhere in the code; the macro definition may use
++
++  GO_IF_LEGITIMATE_ADDRESS (MODE, X, WIN);
++
++to avoid further processing if the address has become legitimate.
++
++X will always be the result of a call to break_out_memory_refs,
++and OLDX will be the operand that was given to that function to produce
++X.
++
++The code generated by this macro should not alter the substructure of
++X.  If it transforms X into a more legitimate form, it
++should assign X (which will always be a C variable) a new value.
++
++It is not necessary for this macro to come up with a legitimate
++address.  The compiler has standard ways of doing so in all cases.  In
++fact, it is safe for this macro to do nothing.  But often a
++machine-dependent strategy can generate better code.
++*/
++#define LEGITIMIZE_ADDRESS(X, OLDX, MODE, WIN)			\
++  do								\
++    {								\
++      if (GET_CODE(X) == PLUS					\
++	  && GET_CODE(XEXP(X, 0)) == REG			\
++	  && GET_CODE(XEXP(X, 1)) == CONST_INT			\
++	  && !CONST_OK_FOR_CONSTRAINT_P(INTVAL(XEXP(X, 1)),	\
++					'K', "Ks16"))		\
++	{							\
++	  rtx index = force_reg(SImode, XEXP(X, 1));		\
++	  X = gen_rtx_PLUS( SImode, XEXP(X, 0), index);		\
++	}							\
++      GO_IF_LEGITIMATE_ADDRESS(MODE, X, WIN);			\
++    }								\
++  while(0)
++
++
++/*
++A C statement or compound statement with a conditional
++goto LABEL; executed if memory address X (an RTX) can have
++different meanings depending on the machine mode of the memory
++reference it is used for or if the address is valid for some modes
++but not others.
++
++Autoincrement and autodecrement addresses typically have mode-dependent
++effects because the amount of the increment or decrement is the size
++of the operand being addressed.  Some machines have other mode-dependent
++addresses.  Many RISC machines have no mode-dependent addresses.
++
++You may assume that ADDR is a valid address for the machine.
++*/
++#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)	\
++  do							\
++    {							\
++      if (GET_CODE (ADDR) == POST_INC			\
++	  || GET_CODE (ADDR) == PRE_DEC)		\
++	goto LABEL;					\
++    }							\
++  while (0)
++
++/*
++A C expression that is nonzero if X is a legitimate constant for
++an immediate operand on the target machine.  You can assume that
++X satisfies CONSTANT_P, so you need not check this.  In fact,
++'1' is a suitable definition for this macro on machines where
++anything CONSTANT_P is valid.
++*/
++#define LEGITIMATE_CONSTANT_P(X) avr32_legitimate_constant_p(X)
++
++
++/******************************************************************************
++ * Condition Code Status
++ *****************************************************************************/
++
++/*
++C code for a data type which is used for declaring the mdep
++component of cc_status.  It defaults to int.
++
++This macro is not used on machines that do not use cc0.
++*/
++
++typedef struct
++{
++  int flags;
++  rtx value;
++  int cond_exec_cmp_clobbered;
++} avr32_status_reg;
++
++
++#define CC_STATUS_MDEP avr32_status_reg
++
++/*
++A C expression to initialize the mdep field to "empty".
++The default definition does nothing, since most machines don't use
++the field anyway.  If you want to use the field, you should probably
++define this macro to initialize it.
++
++This macro is not used on machines that do not use cc0.
++*/
++
++#define CC_STATUS_MDEP_INIT  \
++   (cc_status.mdep.flags = CC_NONE , cc_status.mdep.cond_exec_cmp_clobbered = 0, cc_status.mdep.value = 0)
++
++/*
++A C compound statement to set the components of cc_status
++appropriately for an insn INSN whose body is EXP.  It is
++this macro's responsibility to recognize insns that set the condition
++code as a byproduct of other activity as well as those that explicitly
++set (cc0).
++
++This macro is not used on machines that do not use cc0.
++
++If there are insns that do not set the condition code but do alter
++other machine registers, this macro must check to see whether they
++invalidate the expressions that the condition code is recorded as
++reflecting.  For example, on the 68000, insns that store in address
++registers do not set the condition code, which means that usually
++NOTICE_UPDATE_CC can leave cc_status unaltered for such
++insns.  But suppose that the previous insn set the condition code
++based on location 'a4@@(102)' and the current insn stores a new
++value in 'a4'.  Although the condition code is not changed by
++this, it will no longer be true that it reflects the contents of
++'a4@@(102)'.  Therefore, NOTICE_UPDATE_CC must alter
++cc_status in this case to say that nothing is known about the
++condition code value.
++
++The definition of NOTICE_UPDATE_CC must be prepared to deal
++with the results of peephole optimization: insns whose patterns are
++parallel RTXs containing various reg, mem or
++constants which are just the operands.  The RTL structure of these
++insns is not sufficient to indicate what the insns actually do.  What
++NOTICE_UPDATE_CC should do when it sees one is just to run
++CC_STATUS_INIT.
++
++A possible definition of NOTICE_UPDATE_CC is to call a function
++that looks at an attribute (see Insn Attributes) named, for example,
++'cc'.  This avoids having detailed information about patterns in
++two places, the 'md' file and in NOTICE_UPDATE_CC.
++*/
++
++#define NOTICE_UPDATE_CC(EXP, INSN) avr32_notice_update_cc(EXP, INSN)
++
++
++
++
++/******************************************************************************
++ * Describing Relative Costs of Operations
++ *****************************************************************************/
++
++
++
++/*
++A C expression for the cost of moving data of mode MODE from a
++register in class FROM to one in class TO.  The classes are
++expressed using the enumeration values such as GENERAL_REGS.  A
++value of 2 is the default; other values are interpreted relative to
++that.
++
++It is not required that the cost always equal 2 when FROM is the
++same as TO; on some machines it is expensive to move between
++registers if they are not general registers.
++
++If reload sees an insn consisting of a single set between two
++hard registers, and if REGISTER_MOVE_COST applied to their
++classes returns a value of 2, reload does not check to ensure that the
++constraints of the insn are met.  Setting a cost of other than 2 will
++allow reload to verify that the constraints are met.  You should do this
++if the movm pattern's constraints do not allow such copying.
++*/
++#define REGISTER_MOVE_COST(MODE, FROM, TO) \
++  ((GET_MODE_SIZE(MODE) <= 4) ? 2:         \
++   (GET_MODE_SIZE(MODE) <= 8) ? 3:         \
++   4)
++
++/*
++A C expression for the cost of moving data of mode MODE between a
++register of class CLASS and memory; IN is zero if the value
++is to be written to memory, nonzero if it is to be read in.  This cost
++is relative to those in REGISTER_MOVE_COST.  If moving between
++registers and memory is more expensive than between two registers, you
++should define this macro to express the relative cost.
++
++If you do not define this macro, GCC uses a default cost of 4 plus
++the cost of copying via a secondary reload register, if one is
++needed.  If your machine requires a secondary reload register to copy
++between memory and a register of CLASS but the reload mechanism is
++more complex than copying via an intermediate, define this macro to
++reflect the actual cost of the move.
++
++GCC defines the function memory_move_secondary_cost if
++secondary reloads are needed.  It computes the costs due to copying via
++a secondary register.  If your machine copies from memory using a
++secondary register in the conventional way but the default base value of
++4 is not correct for your machine, define this macro to add some other
++value to the result of that function.  The arguments to that function
++are the same as to this macro.
++*/
++/*
++  Memory moves are costly
++*/
++#define MEMORY_MOVE_COST(MODE, CLASS, IN)            \
++  (((IN) ? ((GET_MODE_SIZE(MODE) < 4) ? 4 :          \
++            (GET_MODE_SIZE(MODE) > 8) ? 6 :          \
++            3)                                       \
++    : ((GET_MODE_SIZE(MODE) > 8) ? 6 : 3)))
++
++/*
++A C expression for the cost of a branch instruction.  A value of 1 is
++the default; other values are interpreted relative to that.
++*/
++  /* Try to use conditionals as much as possible */
++#define BRANCH_COST(speed_p, predictable_p) (TARGET_BRANCH_PRED ? 3 : 4)
++
++/*A C expression for the maximum number of instructions to execute via conditional
++  execution instructions instead of a branch. A value of BRANCH_COST+1 is the default
++  if the machine does not use cc0, and 1 if it does use cc0.*/
++#define MAX_CONDITIONAL_EXECUTE 4
++
++/*
++Define this macro as a C expression which is nonzero if accessing less
++than a word of memory (i.e.: a char or a short) is no
++faster than accessing a word of memory, i.e., if such access
++require more than one instruction or if there is no difference in cost
++between byte and (aligned) word loads.
++
++When this macro is not defined, the compiler will access a field by
++finding the smallest containing object; when it is defined, a fullword
++load will be used if alignment permits.  Unless bytes accesses are
++faster than word accesses, using word accesses is preferable since it
++may eliminate subsequent memory access if subsequent accesses occur to
++other fields in the same word of the structure, but to different bytes.
++*/
++#define SLOW_BYTE_ACCESS 1
++
++
++/*
++Define this macro if it is as good or better to call a constant
++function address than to call an address kept in a register.
++*/
++#define NO_FUNCTION_CSE
++
++
++/******************************************************************************
++ * Adjusting the Instruction Scheduler
++ *****************************************************************************/
++
++/*****************************************************************************
++ * Dividing the Output into Sections (Texts, Data, ...)                      *
++ *****************************************************************************/
++
++/*
++A C expression whose value is a string, including spacing, containing the
++assembler operation that should precede instructions and read-only data.
++Normally "\t.text" is right.
++*/
++#define TEXT_SECTION_ASM_OP "\t.text"
++/*
++A C statement that switches to the default section containing instructions.
++Normally this is not needed, as simply defining TEXT_SECTION_ASM_OP
++is enough.  The MIPS port uses this to sort all functions after all data
++declarations.
++*/
++/* #define TEXT_SECTION */
++
++/*
++A C expression whose value is a string, including spacing, containing the
++assembler operation to identify the following data as writable initialized
++data.  Normally "\t.data" is right.
++*/
++#define DATA_SECTION_ASM_OP "\t.data"
++
++/*
++If defined, a C expression whose value is a string, including spacing,
++containing the assembler operation to identify the following data as
++shared data.  If not defined, DATA_SECTION_ASM_OP will be used.
++*/
++
++/*
++A C expression whose value is a string, including spacing, containing
++the assembler operation to identify the following data as read-only
++initialized data.
++*/
++#undef READONLY_DATA_SECTION_ASM_OP
++#define READONLY_DATA_SECTION_ASM_OP \
++  ((TARGET_USE_RODATA_SECTION) ?  \
++   "\t.section\t.rodata" :                \
++   TEXT_SECTION_ASM_OP )
++
++
++/*
++If defined, a C expression whose value is a string, including spacing,
++containing the assembler operation to identify the following data as
++uninitialized global data.  If not defined, and neither
++ASM_OUTPUT_BSS nor ASM_OUTPUT_ALIGNED_BSS are defined,
++uninitialized global data will be output in the data section if
++-fno-common is passed, otherwise ASM_OUTPUT_COMMON will be
++used.
++*/
++#define BSS_SECTION_ASM_OP	"\t.section\t.bss"
++
++/*
++If defined, a C expression whose value is a string, including spacing,
++containing the assembler operation to identify the following data as
++uninitialized global shared data.  If not defined, and
++BSS_SECTION_ASM_OP is, the latter will be used.
++*/
++/*#define SHARED_BSS_SECTION_ASM_OP "\trseg\tshared_bbs_section:data:noroot(0)\n"*/
++/*
++If defined, a C expression whose value is a string, including spacing,
++containing the assembler operation to identify the following data as
++initialization code.  If not defined, GCC will assume such a section does
++not exist.
++*/
++#undef  INIT_SECTION_ASM_OP
++#define INIT_SECTION_ASM_OP "\t.section\t.init"
++
++/*
++If defined, a C expression whose value is a string, including spacing,
++containing the assembler operation to identify the following data as
++finalization code.  If not defined, GCC will assume such a section does
++not exist.
++*/
++#undef  FINI_SECTION_ASM_OP
++#define FINI_SECTION_ASM_OP "\t.section\t.fini"
++
++/*
++If defined, an ASM statement that switches to a different section
++via SECTION_OP, calls FUNCTION, and switches back to
++the text section.  This is used in crtstuff.c if
++INIT_SECTION_ASM_OP or FINI_SECTION_ASM_OP to calls
++to initialization and finalization functions from the init and fini
++sections.  By default, this macro uses a simple function call.  Some
++ports need hand-crafted assembly code to avoid dependencies on
++registers initialized in the function prologue or to ensure that
++constant pools don't end up too far way in the text section.
++*/
++#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC)      \
++   asm ( SECTION_OP "\n" \
++         "mcall   r6[" USER_LABEL_PREFIX #FUNC "@got]\n" \
++         TEXT_SECTION_ASM_OP);
++
++
++/*
++Define this macro to be an expression with a nonzero value if jump
++tables (for tablejump insns) should be output in the text
++section, along with the assembler instructions.  Otherwise, the
++readonly data section is used.
++
++This macro is irrelevant if there is no separate readonly data section.
++*/
++/* Put jump tables in text section if we have caches. Otherwise assume that
++   loading data from code memory is slow. */
++#define JUMP_TABLES_IN_TEXT_SECTION    \
++    (TARGET_CACHES ? 1 : 0)
++
++
++/******************************************************************************
++ * Position Independent Code (PIC)
++ *****************************************************************************/
++
++#ifndef AVR32_ALWAYS_PIC
++#define AVR32_ALWAYS_PIC 0
++#endif
++
++/* GOT is set to r6 */
++#define PIC_OFFSET_TABLE_REGNUM INTERNAL_REGNUM(6)
++
++/*
++A C expression that is nonzero if X is a legitimate immediate
++operand on the target machine when generating position independent code.
++You can assume that X satisfies CONSTANT_P, so you need not
++check this.  You can also assume flag_pic is true, so you need not
++check it either.  You need not define this macro if all constants
++(including SYMBOL_REF) can be immediate operands when generating
++position independent code.
++*/
++/* We can't directly access anything that contains a symbol,
++   nor can we indirect via the constant pool.  */
++#define LEGITIMATE_PIC_OPERAND_P(X) avr32_legitimate_pic_operand_p(X)
++
++
++/* We need to know when we are making a constant pool; this determines
++   whether data needs to be in the GOT or can be referenced via a GOT
++   offset.  */
++extern int making_const_table;
++
++/******************************************************************************
++ * Defining the Output Assembler Language
++ *****************************************************************************/
++
++
++/*
++A C string constant describing how to begin a comment in the target
++assembler language.  The compiler assumes that the comment will end at
++the end of the line.
++*/
++#define ASM_COMMENT_START "# "
++
++/*
++A C string constant for text to be output before each asm
++statement or group of consecutive ones.  Normally this is
++"#APP", which is a comment that has no effect on most
++assemblers but tells the GNU assembler that it must check the lines
++that follow for all valid assembler constructs.
++*/
++#undef ASM_APP_ON
++#define ASM_APP_ON "#APP\n"
++
++/*
++A C string constant for text to be output after each asm
++statement or group of consecutive ones.  Normally this is
++"#NO_APP", which tells the GNU assembler to resume making the
++time-saving assumptions that are valid for ordinary compiler output.
++*/
++#undef ASM_APP_OFF
++#define ASM_APP_OFF "#NO_APP\n"
++
++
++
++#define FILE_ASM_OP 		"\t.file\n"
++#define IDENT_ASM_OP 		"\t.ident\t"
++#define SET_ASM_OP		"\t.set\t"
++
++
++/*
++ * Output assembly directives to switch to section name. The section
++ * should have attributes as specified by flags, which is a bit mask
++ * of the SECTION_* flags defined in 'output.h'. If align is nonzero,
++ * it contains an alignment in bytes to be used for the section,
++ * otherwise some target default should be used. Only targets that
++ * must specify an alignment within the section directive need pay
++ * attention to align -- we will still use ASM_OUTPUT_ALIGN.
++ *
++ * NOTE: This one must not be moved to avr32.c
++ */
++#undef TARGET_ASM_NAMED_SECTION
++#define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section
++
++
++/*
++You may define this macro as a C expression.  You should define the
++expression to have a nonzero value if GCC should output the constant
++pool for a function before the code for the function, or a zero value if
++GCC should output the constant pool after the function.  If you do
++not define this macro, the usual case, GCC will output the constant
++pool before the function.
++*/
++#define CONSTANT_POOL_BEFORE_FUNCTION 0
++
++
++/*
++Define this macro as a C expression which is nonzero if the constant
++EXP, of type tree, should be output after the code for a
++function.  The compiler will normally output all constants before the
++function; you need not define this macro if this is OK.
++*/
++#define CONSTANT_AFTER_FUNCTION_P(EXP) 1
++
++
++/*
++Define this macro as a C expression which is nonzero if C is
++as a logical line separator by the assembler.  STR points to the
++position in the string where C was found; this can be used if a
++line separator uses multiple characters.
++
++If you do not define this macro, the default is that only
++the character ';' is treated as a logical line separator.
++*/
++#define IS_ASM_LOGICAL_LINE_SEPARATOR(C,STR) (((C) == '\n') || ((C) == ';'))
++
++
++/** Output of Uninitialized Variables **/
++
++/*
++A C statement (sans semicolon) to output to the stdio stream
++STREAM the assembler definition of a common-label named
++NAME whose size is SIZE bytes.  The variable ROUNDED
++is the size rounded up to whatever alignment the caller wants.
++
++Use the expression assemble_name(STREAM, NAME) to
++output the name itself; before and after that, output the additional
++assembler syntax for defining the name, and a newline.
++
++This macro controls how the assembler definitions of uninitialized
++common global variables are output.
++*/
++/*
++#define ASM_OUTPUT_COMMON(STREAM, NAME, SIZE, ROUNDED) \
++  avr32_asm_output_common(STREAM, NAME, SIZE, ROUNDED)
++*/
++
++#define ASM_OUTPUT_COMMON(FILE, NAME, SIZE, ROUNDED)	\
++  do							\
++    {							\
++      fputs ("\t.comm ", (FILE));			\
++      assemble_name ((FILE), (NAME));			\
++      fprintf ((FILE), ",%d\n", (SIZE));		\
++    }							\
++  while (0)
++
++/*
++ * Like ASM_OUTPUT_BSS except takes the required alignment as a
++ * separate, explicit argument.  If you define this macro, it is used
++ * in place of ASM_OUTPUT_BSS, and gives you more flexibility in
++ * handling the required alignment of the variable.  The alignment is
++ * specified as the number of bits.
++ *
++ * Try to use function asm_output_aligned_bss defined in file varasm.c
++ * when defining this macro.
++ */
++#define ASM_OUTPUT_ALIGNED_BSS(STREAM, DECL, NAME, SIZE, ALIGNMENT) \
++  asm_output_aligned_bss (STREAM, DECL, NAME, SIZE, ALIGNMENT)
++
++/*
++A C statement (sans semicolon) to output to the stdio stream
++STREAM the assembler definition of a local-common-label named
++NAME whose size is SIZE bytes.  The variable ROUNDED
++is the size rounded up to whatever alignment the caller wants.
++
++Use the expression assemble_name(STREAM, NAME) to
++output the name itself; before and after that, output the additional
++assembler syntax for defining the name, and a newline.
++
++This macro controls how the assembler definitions of uninitialized
++static variables are output.
++*/
++#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE, ROUNDED)	\
++  do							\
++    {							\
++      fputs ("\t.lcomm ", (FILE));			\
++      assemble_name ((FILE), (NAME));			\
++      fprintf ((FILE), ",%d, %d\n", (SIZE), 2);		\
++    }							\
++  while (0)
++
++
++/*
++A C statement (sans semicolon) to output to the stdio stream
++STREAM the assembler definition of a label named NAME.
++Use the expression assemble_name(STREAM, NAME) to
++output the name itself; before and after that, output the additional
++assembler syntax for defining the name, and a newline.
++*/
++#define ASM_OUTPUT_LABEL(STREAM, NAME) avr32_asm_output_label(STREAM, NAME)
++
++/* A C string containing the appropriate assembler directive to
++ * specify the size of a symbol, without any arguments. On systems
++ * that use ELF, the default (in 'config/elfos.h') is '"\t.size\t"';
++ * on other systems, the default is not to define this macro.
++ *
++ * Define this macro only if it is correct to use the default
++ * definitions of ASM_ OUTPUT_SIZE_DIRECTIVE and
++ * ASM_OUTPUT_MEASURED_SIZE for your system. If you need your own
++ * custom definitions of those macros, or if you do not need explicit
++ * symbol sizes at all, do not define this macro.
++ */
++#define SIZE_ASM_OP "\t.size\t"
++
++
++/*
++A C statement (sans semicolon) to output to the stdio stream
++STREAM some commands that will make the label NAME global;
++that is, available for reference from other files.  Use the expression
++assemble_name(STREAM, NAME) to output the name
++itself; before and after that, output the additional assembler syntax
++for making that name global, and a newline.
++*/
++#define GLOBAL_ASM_OP "\t.global\t"
++
++
++
++/*
++A C expression which evaluates to true if the target supports weak symbols.
++
++If you don't define this macro, defaults.h provides a default
++definition.  If either ASM_WEAKEN_LABEL or ASM_WEAKEN_DECL
++is defined, the default definition is '1'; otherwise, it is
++'0'.  Define this macro if you want to control weak symbol support
++with a compiler flag such as -melf.
++*/
++#define SUPPORTS_WEAK 1
++
++/*
++A C statement (sans semicolon) to output to the stdio stream
++STREAM a reference in assembler syntax to a label named
++NAME.  This should add '_' to the front of the name, if that
++is customary on your operating system, as it is in most Berkeley Unix
++systems.  This macro is used in assemble_name.
++*/
++#define ASM_OUTPUT_LABELREF(STREAM, NAME) \
++  avr32_asm_output_labelref(STREAM, NAME)
++
++
++
++/*
++A C expression to assign to OUTVAR (which is a variable of type
++char *) a newly allocated string made from the string
++NAME and the number NUMBER, with some suitable punctuation
++added.  Use alloca to get space for the string.
++
++The string will be used as an argument to ASM_OUTPUT_LABELREF to
++produce an assembler label for an internal static variable whose name is
++NAME.  Therefore, the string must be such as to result in valid
++assembler code.  The argument NUMBER is different each time this
++macro is executed; it prevents conflicts between similarly-named
++internal static variables in different scopes.
++
++Ideally this string should not be a valid C identifier, to prevent any
++conflict with the user's own symbols.  Most assemblers allow periods
++or percent signs in assembler symbols; putting at least one of these
++between the name and the number will suffice.
++*/
++#define ASM_FORMAT_PRIVATE_NAME(OUTVAR, NAME, NUMBER)		\
++  do								\
++    {								\
++      (OUTVAR) = (char *) alloca (strlen ((NAME)) + 10);	\
++      sprintf ((OUTVAR), "%s.%d", (NAME), (NUMBER));		\
++    }								\
++  while (0)
++
++
++/** Macros Controlling Initialization Routines **/
++
++
++/*
++If defined, main will not call __main as described above.
++This macro should be defined for systems that control start-up code
++on a symbol-by-symbol basis, such as OSF/1, and should not
++be defined explicitly for systems that support INIT_SECTION_ASM_OP.
++*/
++/*
++  __main is not defined when debugging.
++*/
++#define HAS_INIT_SECTION
++
++
++/** Output of Assembler Instructions **/
++
++/*
++A C initializer containing the assembler's names for the machine
++registers, each one as a C string constant.  This is what translates
++register numbers in the compiler into assembler language.
++*/
++
++#define REGISTER_NAMES	\
++{			\
++  "pc",  "lr",		\
++  "sp",  "r12",		\
++  "r11", "r10",		\
++  "r9",  "r8",		\
++  "r7",  "r6",		\
++  "r5",  "r4",		\
++  "r3",  "r2",		\
++  "r1",  "r0",		\
++}
++
++/*
++A C compound statement to output to stdio stream STREAM the
++assembler syntax for an instruction operand X.  X is an
++RTL expression.
++
++CODE is a value that can be used to specify one of several ways
++of printing the operand.  It is used when identical operands must be
++printed differently depending on the context.  CODE comes from
++the '%' specification that was used to request printing of the
++operand.  If the specification was just '%digit' then
++CODE is 0; if the specification was '%ltr digit'
++then CODE is the ASCII code for ltr.
++
++If X is a register, this macro should print the register's name.
++The names can be found in an array reg_names whose type is
++char *[].  reg_names is initialized from REGISTER_NAMES.
++
++When the machine description has a specification '%punct'
++(a '%' followed by a punctuation character), this macro is called
++with a null pointer for X and the punctuation character for
++CODE.
++*/
++#define PRINT_OPERAND(STREAM, X, CODE) avr32_print_operand(STREAM, X, CODE)
++
++/* A C statement to be executed just prior to the output of
++   assembler code for INSN, to modify the extracted operands so
++   they will be output differently.
++
++   Here the argument OPVEC is the vector containing the operands
++   extracted from INSN, and NOPERANDS is the number of elements of
++   the vector which contain meaningful data for this insn.
++   The contents of this vector are what will be used to convert the insn
++   template into assembler code, so you can change the assembler output
++   by changing the contents of the vector.  */
++#define FINAL_PRESCAN_INSN(INSN, OPVEC, NOPERANDS) \
++  avr32_final_prescan_insn ((INSN), (OPVEC), (NOPERANDS))
++
++/*
++A C expression which evaluates to true if CODE is a valid
++punctuation character for use in the PRINT_OPERAND macro.  If
++PRINT_OPERAND_PUNCT_VALID_P is not defined, it means that no
++punctuation characters (except for the standard one, '%') are used
++in this way.
++*/
++#define PRINT_OPERAND_PUNCT_VALID_P(CODE)                          \
++  (((CODE) == '?')                                                 \
++   || ((CODE) == '!'))
++
++/*
++A C compound statement to output to stdio stream STREAM the
++assembler syntax for an instruction operand that is a memory reference
++whose address is X.  X is an RTL expression.
++
++On some machines, the syntax for a symbolic address depends on the
++section that the address refers to.  On these machines, define the macro
++ENCODE_SECTION_INFO to store the information into the
++symbol_ref, and then check for it here.  (see Assembler Format.)
++*/
++#define PRINT_OPERAND_ADDRESS(STREAM, X) avr32_print_operand_address(STREAM, X)
++
++
++/** Output of Dispatch Tables **/
++
++/*
++ * A C statement to output to the stdio stream stream an assembler
++ * pseudo-instruction to generate a difference between two
++ * labels. value and rel are the numbers of two internal labels. The
++ * definitions of these labels are output using
++ * (*targetm.asm_out.internal_label), and they must be printed in the
++ * same way here. For example,
++ *
++ *         fprintf (stream, "\t.word L%d-L%d\n",
++ *                  value, rel)
++ *
++ * You must provide this macro on machines where the addresses in a
++ * dispatch table are relative to the table's own address. If defined,
++ * GCC will also use this macro on all machines when producing
++ * PIC. body is the body of the ADDR_DIFF_VEC; it is provided so that
++ * the mode and flags can be read.
++ */
++#define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)	    \
++    fprintf(STREAM, "\tbral\t%sL%d\n", LOCAL_LABEL_PREFIX, VALUE)
++
++/*
++This macro should be provided on machines where the addresses
++in a dispatch table are absolute.
++
++The definition should be a C statement to output to the stdio stream
++STREAM an assembler pseudo-instruction to generate a reference to
++a label.  VALUE is the number of an internal label whose
++definition is output using ASM_OUTPUT_INTERNAL_LABEL.
++For example,
++
++fprintf(STREAM, "\t.word L%d\n", VALUE)
++*/
++
++#define ASM_OUTPUT_ADDR_VEC_ELT(STREAM, VALUE)  \
++  fprintf(STREAM, "\t.long %sL%d\n", LOCAL_LABEL_PREFIX, VALUE)
++
++/** Assembler Commands for Exception Regions */
++
++/* ToDo: All of this subsection */
++
++/** Assembler Commands for Alignment */
++
++
++/*
++A C statement to output to the stdio stream STREAM an assembler
++command to advance the location counter to a multiple of 2 to the
++POWER bytes.  POWER will be a C expression of type int.
++*/
++#define ASM_OUTPUT_ALIGN(STREAM, POWER)			\
++  do							\
++    {							\
++      if ((POWER) != 0)					\
++	fprintf(STREAM, "\t.align\t%d\n", POWER);	\
++    }							\
++  while (0)
++
++/*
++Like ASM_OUTPUT_ALIGN, except that the \nop" instruction is used for padding, if
++necessary.
++*/
++#define ASM_OUTPUT_ALIGN_WITH_NOP(STREAM, POWER) \
++ fprintf(STREAM, "\t.balignw\t%d, 0xd703\n", (1 << POWER))
++
++
++
++/******************************************************************************
++ * Controlling Debugging Information Format
++ *****************************************************************************/
++
++/* How to renumber registers for dbx and gdb.  */
++#define DBX_REGISTER_NUMBER(REGNO) ASM_REGNUM (REGNO)
++
++/* The DWARF 2 CFA column which tracks the return address.  */
++#define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM(LR_REGNUM)
++
++/*
++Define this macro if GCC should produce dwarf version 2 format
++debugging output in response to the -g option.
++
++To support optional call frame debugging information, you must also
++define INCOMING_RETURN_ADDR_RTX and either set
++RTX_FRAME_RELATED_P on the prologue insns if you use RTL for the
++prologue, or call dwarf2out_def_cfa and dwarf2out_reg_save
++as appropriate from TARGET_ASM_FUNCTION_PROLOGUE if you don't.
++*/
++#define DWARF2_DEBUGGING_INFO 1
++
++
++#define DWARF2_ASM_LINE_DEBUG_INFO 1
++#define DWARF2_FRAME_INFO 1
++
++
++/******************************************************************************
++ * Miscellaneous Parameters
++ *****************************************************************************/
++
++/* ToDo: a lot */
++
++/*
++An alias for a machine mode name.  This is the machine mode that
++elements of a jump-table should have.
++*/
++#define CASE_VECTOR_MODE SImode
++
++/*
++Define this macro to be a C expression to indicate when jump-tables
++should contain relative addresses.  If jump-tables never contain
++relative addresses, then you need not define this macro.
++*/
++#define CASE_VECTOR_PC_RELATIVE 0
++
++/* Increase the threshold for using table jumps on the UC arch. */
++#define CASE_VALUES_THRESHOLD  (TARGET_BRANCH_PRED ? 4 : 7)
++
++/*
++The maximum number of bytes that a single instruction can move quickly
++between memory and registers or between two memory locations.
++*/
++#define MOVE_MAX (2*UNITS_PER_WORD)
++
++
++/* A C expression that is nonzero if on this machine the number of bits actually used
++   for the count of a shift operation is equal to the number of bits needed to represent
++   the size of the object being shifted. When this macro is nonzero, the compiler will
++   assume that it is safe to omit a sign-extend, zero-extend, and certain bitwise 'and'
++   instructions that truncates the count of a shift operation. On machines that have
++   instructions that act on bit-fields at variable positions, which may include 'bit test'
++   378 GNU Compiler Collection (GCC) Internals
++   instructions, a nonzero SHIFT_COUNT_TRUNCATED also enables deletion of truncations
++   of the values that serve as arguments to bit-field instructions.
++   If both types of instructions truncate the count (for shifts) and position (for bit-field
++   operations), or if no variable-position bit-field instructions exist, you should define
++   this macro.
++   However, on some machines, such as the 80386 and the 680x0, truncation only applies
++   to shift operations and not the (real or pretended) bit-field operations. Define SHIFT_
++   COUNT_TRUNCATED to be zero on such machines. Instead, add patterns to the 'md' file
++   that include the implied truncation of the shift instructions.
++   You need not dene this macro if it would always have the value of zero. */
++#define SHIFT_COUNT_TRUNCATED 1
++
++/*
++A C expression which is nonzero if on this machine it is safe to
++convert an integer of INPREC bits to one of OUTPREC
++bits (where OUTPREC is smaller than INPREC) by merely
++operating on it as if it had only OUTPREC bits.
++
++On many machines, this expression can be 1.
++
++When TRULY_NOOP_TRUNCATION returns 1 for a pair of sizes for
++modes for which MODES_TIEABLE_P is 0, suboptimal code can result.
++If this is the case, making TRULY_NOOP_TRUNCATION return 0 in
++such cases may improve things.
++*/
++#define TRULY_NOOP_TRUNCATION(OUTPREC, INPREC) 1
++
++/*
++An alias for the machine mode for pointers.  On most machines, define
++this to be the integer mode corresponding to the width of a hardware
++pointer; SImode on 32-bit machine or DImode on 64-bit machines.
++On some machines you must define this to be one of the partial integer
++modes, such as PSImode.
++
++The width of Pmode must be at least as large as the value of
++POINTER_SIZE.  If it is not equal, you must define the macro
++POINTERS_EXTEND_UNSIGNED to specify how pointers are extended
++to Pmode.
++*/
++#define Pmode SImode
++
++/*
++An alias for the machine mode used for memory references to functions
++being called, in call RTL expressions.  On most machines this
++should be QImode.
++*/
++#define FUNCTION_MODE SImode
++
++
++#define REG_S_P(x) \
++ (REG_P (x) || (GET_CODE (x) == SUBREG && REG_P (XEXP (x, 0))))
++
++
++/* If defined, modifies the length assigned to instruction INSN as a
++   function of the context in which it is used.  LENGTH is an lvalue
++   that contains the initially computed length of the insn and should
++   be updated with the correct length of the insn.  */
++#define ADJUST_INSN_LENGTH(INSN, LENGTH) \
++  ((LENGTH) = avr32_adjust_insn_length ((INSN), (LENGTH)))
++
++
++#define CLZ_DEFINED_VALUE_AT_ZERO(mode, value) \
++  (value = 32, (mode == SImode))
++
++#define CTZ_DEFINED_VALUE_AT_ZERO(mode, value) \
++  (value = 32, (mode == SImode))
++
++#define UNITS_PER_SIMD_WORD(mode) UNITS_PER_WORD
++
++#define STORE_FLAG_VALUE 1
++
++
++/* IF-conversion macros. */
++#define IFCVT_MODIFY_INSN( CE_INFO, PATTERN, INSN )                     \
++  {                                                                     \
++    (PATTERN) = avr32_ifcvt_modify_insn (CE_INFO, PATTERN, INSN, &num_true_changes); \
++  }
++
++#define IFCVT_EXTRA_FIELDS                              \
++  int num_cond_clobber_insns;                           \
++  int num_extra_move_insns;                             \
++  rtx extra_move_insns[MAX_CONDITIONAL_EXECUTE];        \
++  rtx moved_insns[MAX_CONDITIONAL_EXECUTE];
++
++#define IFCVT_INIT_EXTRA_FIELDS( CE_INFO )       \
++  {                                              \
++    (CE_INFO)->num_cond_clobber_insns = 0;       \
++    (CE_INFO)->num_extra_move_insns = 0;         \
++  }
++
++
++#define IFCVT_MODIFY_CANCEL( CE_INFO )  avr32_ifcvt_modify_cancel (CE_INFO, &num_true_changes)
++
++#define IFCVT_ALLOW_MODIFY_TEST_IN_INSN 1
++#define IFCVT_COND_EXEC_BEFORE_RELOAD (TARGET_COND_EXEC_BEFORE_RELOAD)
++
++enum avr32_builtins
++{
++  AVR32_BUILTIN_MTSR,
++  AVR32_BUILTIN_MFSR,
++  AVR32_BUILTIN_MTDR,
++  AVR32_BUILTIN_MFDR,
++  AVR32_BUILTIN_CACHE,
++  AVR32_BUILTIN_SYNC,
++  AVR32_BUILTIN_SSRF,
++  AVR32_BUILTIN_CSRF,
++  AVR32_BUILTIN_TLBR,
++  AVR32_BUILTIN_TLBS,
++  AVR32_BUILTIN_TLBW,
++  AVR32_BUILTIN_BREAKPOINT,
++  AVR32_BUILTIN_XCHG,
++  AVR32_BUILTIN_LDXI,
++  AVR32_BUILTIN_BSWAP16,
++  AVR32_BUILTIN_BSWAP32,
++  AVR32_BUILTIN_COP,
++  AVR32_BUILTIN_MVCR_W,
++  AVR32_BUILTIN_MVRC_W,
++  AVR32_BUILTIN_MVCR_D,
++  AVR32_BUILTIN_MVRC_D,
++  AVR32_BUILTIN_MULSATHH_H,
++  AVR32_BUILTIN_MULSATHH_W,
++  AVR32_BUILTIN_MULSATRNDHH_H,
++  AVR32_BUILTIN_MULSATRNDWH_W,
++  AVR32_BUILTIN_MULSATWH_W,
++  AVR32_BUILTIN_MACSATHH_W,
++  AVR32_BUILTIN_SATADD_H,
++  AVR32_BUILTIN_SATSUB_H,
++  AVR32_BUILTIN_SATADD_W,
++  AVR32_BUILTIN_SATSUB_W,
++  AVR32_BUILTIN_MULWH_D,
++  AVR32_BUILTIN_MULNWH_D,
++  AVR32_BUILTIN_MACWH_D,
++  AVR32_BUILTIN_MACHH_D,
++  AVR32_BUILTIN_MUSFR,
++  AVR32_BUILTIN_MUSTR,
++  AVR32_BUILTIN_SATS,
++  AVR32_BUILTIN_SATU,
++  AVR32_BUILTIN_SATRNDS,
++  AVR32_BUILTIN_SATRNDU,
++  AVR32_BUILTIN_MEMS,
++  AVR32_BUILTIN_MEMC,
++  AVR32_BUILTIN_MEMT,
++  AVR32_BUILTIN_SLEEP,
++  AVR32_BUILTIN_DELAY_CYCLES
++};
++
++
++#define FLOAT_LIB_COMPARE_RETURNS_BOOL(MODE, COMPARISON) \
++  ((MODE == SFmode) || (MODE == DFmode))
++
++#define RENAME_LIBRARY_SET ".set"
++
++/* Make ABI_NAME an alias for __GCC_NAME.  */
++#define RENAME_LIBRARY(GCC_NAME, ABI_NAME)		\
++  __asm__ (".globl\t__avr32_" #ABI_NAME "\n"		\
++	   ".set\t__avr32_" #ABI_NAME 	\
++	     ", __" #GCC_NAME "\n");
++
++/* Give libgcc functions avr32 ABI name.  */
++#ifdef L_muldi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (muldi3, mul64)
++#endif
++#ifdef L_divdi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (divdi3, sdiv64)
++#endif
++#ifdef L_udivdi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (udivdi3, udiv64)
++#endif
++#ifdef L_moddi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (moddi3, smod64)
++#endif
++#ifdef L_umoddi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (umoddi3, umod64)
++#endif
++#ifdef L_ashldi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (ashldi3, lsl64)
++#endif
++#ifdef L_lshrdi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (lshrdi3, lsr64)
++#endif
++#ifdef L_ashrdi3
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (ashrdi3, asr64)
++#endif
++
++#ifdef L_fixsfdi
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixsfdi, f32_to_s64)
++#endif
++#ifdef L_fixunssfdi
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixunssfdi, f32_to_u64)
++#endif
++#ifdef L_floatdidf
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdidf, s64_to_f64)
++#endif
++#ifdef L_floatdisf
++#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdisf, s64_to_f32)
++#endif
++
++#endif
+--- /dev/null
++++ b/gcc/config/avr32/avr32.md
+@@ -0,0 +1,5198 @@
++;;   AVR32 machine description file.
++;;   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
++;;
++;;   This file is part of GCC.
++;;
++;;   This program is free software; you can redistribute it and/or modify
++;;   it under the terms of the GNU General Public License as published by
++;;   the Free Software Foundation; either version 2 of the License, or
++;;   (at your option) any later version.
++;;
++;;   This program is distributed in the hope that 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.
++
++;; -*- Mode: Scheme -*-
++
++(define_attr "type" "alu,alu2,alu_sat,mulhh,mulwh,mulww_w,mulww_d,div,machh_w,macww_w,macww_d,branch,call,load,load_rm,store,load2,load4,store2,store4,fmul,fcmps,fcmpd,fcast,fmv,fmvcpu,fldd,fstd,flds,fsts,fstm"
++  (const_string "alu"))
++
++
++(define_attr "cc" "none,set_vncz,set_ncz,set_cz,set_z,set_z_if_not_v2,bld,compare,cmp_cond_insn,clobber,call_set,fpcompare,from_fpcc"
++  (const_string "none"))
++
++
++; NB! Keep this in sync with enum architecture_type in avr32.h
++(define_attr "pipeline" "ap,ucr1,ucr2,ucr2nomul,ucr3,ucr3fp"
++  (const (symbol_ref "avr32_arch->arch_type")))
++
++; Insn length in bytes
++(define_attr "length" ""
++  (const_int 4))
++
++; Signal if an insn is predicable and hence can be conditionally executed.
++(define_attr "predicable" "no,yes" (const_string "no"))
++
++;; Uses of UNSPEC in this file:
++(define_constants
++  [(UNSPEC_PUSHM                0)
++   (UNSPEC_POPM                 1)
++   (UNSPEC_UDIVMODSI4_INTERNAL	2)
++   (UNSPEC_DIVMODSI4_INTERNAL   3)
++   (UNSPEC_STM                  4)
++   (UNSPEC_LDM                  5)
++   (UNSPEC_MOVSICC              6)
++   (UNSPEC_ADDSICC              7)
++   (UNSPEC_COND_MI              8)
++   (UNSPEC_COND_PL              9)
++   (UNSPEC_PIC_SYM              10)
++   (UNSPEC_PIC_BASE             11)
++   (UNSPEC_STORE_MULTIPLE       12)
++   (UNSPEC_STMFP                13)
++   (UNSPEC_FRCPA                14)
++   (UNSPEC_REG_TO_CC            15)
++   (UNSPEC_FORCE_MINIPOOL       16)
++   (UNSPEC_SATS                 17)
++   (UNSPEC_SATU                 18)
++   (UNSPEC_SATRNDS              19)
++   (UNSPEC_SATRNDU              20)
++  ])
++
++(define_constants
++  [(VUNSPEC_EPILOGUE                  0)
++   (VUNSPEC_CACHE                     1)
++   (VUNSPEC_MTSR                      2)
++   (VUNSPEC_MFSR                      3)
++   (VUNSPEC_BLOCKAGE                  4)
++   (VUNSPEC_SYNC                      5)
++   (VUNSPEC_TLBR                      6)
++   (VUNSPEC_TLBW                      7)
++   (VUNSPEC_TLBS                      8)
++   (VUNSPEC_BREAKPOINT                9)
++   (VUNSPEC_MTDR                      10)
++   (VUNSPEC_MFDR                      11)
++   (VUNSPEC_MVCR                      12)
++   (VUNSPEC_MVRC                      13)
++   (VUNSPEC_COP                       14)
++   (VUNSPEC_ALIGN                     15)
++   (VUNSPEC_POOL_START                16)
++   (VUNSPEC_POOL_END                  17)
++   (VUNSPEC_POOL_4                    18)
++   (VUNSPEC_POOL_8                    19)
++   (VUNSPEC_POOL_16                   20)
++   (VUNSPEC_MUSFR                     21)
++   (VUNSPEC_MUSTR                     22)
++   (VUNSPEC_SYNC_CMPXCHG              23)
++   (VUNSPEC_SYNC_SET_LOCK_AND_LOAD    24)
++   (VUNSPEC_SYNC_STORE_IF_LOCK        25)
++   (VUNSPEC_EH_RETURN                 26)
++   (VUNSPEC_FRS                       27)
++   (VUNSPEC_CSRF                      28)
++   (VUNSPEC_SSRF                      29)
++   (VUNSPEC_SLEEP                     30)
++   (VUNSPEC_DELAY_CYCLES              31)
++   (VUNSPEC_DELAY_CYCLES_1            32)
++   (VUNSPEC_DELAY_CYCLES_2            33)
++   (VUNSPEC_NOP		       34)
++   (VUNSPEC_NOP3		       35)
++   ])
++
++(define_constants
++  [
++   ;; R7 = 15-7 = 8
++   (FP_REGNUM   8)
++   ;; Return Register = R12 = 15 - 12 = 3
++   (RETVAL_REGNUM   3)
++   ;; SP = R13 = 15 - 13 = 2
++   (SP_REGNUM   2)
++   ;; LR = R14 = 15 - 14 = 1
++   (LR_REGNUM   1)
++   ;; PC = R15 = 15 - 15 = 0
++   (PC_REGNUM   0)
++   ;; FPSR = GENERAL_REGS + 1 = 17
++   (FPCC_REGNUM 17)
++   ])
++
++
++
++
++;;******************************************************************************
++;; Macros
++;;******************************************************************************
++
++;; Integer Modes for basic alu insns
++(define_mode_iterator INTM [SI HI QI])
++(define_mode_attr  alu_cc_attr [(SI "set_vncz") (HI "clobber") (QI "clobber")])
++
++;; Move word modes
++(define_mode_iterator MOVM [SI V2HI V4QI])
++
++;; For mov/addcc insns
++(define_mode_iterator ADDCC [SI HI QI])
++(define_mode_iterator MOVCC [SF SI HI QI])
++(define_mode_iterator CMP [DI SI HI QI])
++(define_mode_attr  store_postfix [(SF ".w") (SI ".w") (HI ".h") (QI ".b")])
++(define_mode_attr  load_postfix [(SF ".w") (SI ".w") (HI ".sh") (QI ".ub")])
++(define_mode_attr  load_postfix_s [(SI ".w") (HI ".sh") (QI ".sb")])
++(define_mode_attr  load_postfix_u [(SI ".w") (HI ".uh") (QI ".ub")])
++(define_mode_attr  pred_mem_constraint [(SF "RKu11") (SI "RKu11") (HI "RKu10") (QI "RKu09")])
++(define_mode_attr  cmp_constraint [(DI "rKu20") (SI "rKs21") (HI "r") (QI "r")])
++(define_mode_attr  cmp_predicate [(DI "register_immediate_operand")
++                                  (SI "register_const_int_operand")
++                                  (HI "register_operand")
++                                  (QI "register_operand")])
++(define_mode_attr  cmp_length [(DI "6")
++                               (SI "4")
++                               (HI "4")
++                               (QI "4")])
++
++;; For all conditional insns
++(define_code_iterator any_cond_b [ge lt geu ltu])
++(define_code_iterator any_cond [gt ge lt le gtu geu ltu leu])
++(define_code_iterator any_cond4 [gt le gtu leu])
++(define_code_attr cond [(eq "eq") (ne "ne") (gt "gt") (ge "ge") (lt "lt") (le "le")
++                        (gtu "hi") (geu "hs") (ltu "lo") (leu "ls")])
++(define_code_attr invcond [(eq "ne") (ne "eq") (gt "le") (ge "lt") (lt "ge") (le "gt")
++                           (gtu "ls") (geu "lo") (ltu "hs") (leu "hi")])
++
++;; For logical operations
++(define_code_iterator logical [and ior xor])
++(define_code_attr logical_insn [(and "and") (ior "or") (xor "eor")])
++
++;; Predicable operations with three register operands 
++(define_code_iterator predicable_op3 [and ior xor plus minus])
++(define_code_attr predicable_insn3 [(and "and") (ior "or") (xor "eor") (plus "add") (minus "sub")])
++(define_code_attr predicable_commutative3 [(and "%") (ior "%") (xor "%") (plus "%") (minus "")])
++
++;; Load the predicates
++(include "predicates.md")
++
++
++;;******************************************************************************
++;; Automaton pipeline description for avr32
++;;******************************************************************************
++
++(define_automaton "avr32_ap")
++
++
++(define_cpu_unit "is" "avr32_ap")
++(define_cpu_unit "a1,m1,da" "avr32_ap")
++(define_cpu_unit "a2,m2,d" "avr32_ap")
++
++;;Alu instructions
++(define_insn_reservation "alu_op" 1
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "alu"))
++  "is,a1,a2")
++
++(define_insn_reservation "alu2_op" 2
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "alu2"))
++  "is,is+a1,a1+a2,a2")
++
++(define_insn_reservation "alu_sat_op" 2
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "alu_sat"))
++  "is,a1,a2")
++
++
++;;Mul instructions
++(define_insn_reservation "mulhh_op" 2
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "mulhh,mulwh"))
++  "is,m1,m2")
++
++(define_insn_reservation "mulww_w_op" 3
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "mulww_w"))
++  "is,m1,m1+m2,m2")
++
++(define_insn_reservation "mulww_d_op" 5
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "mulww_d"))
++  "is,m1,m1+m2,m1+m2,m2,m2")
++
++(define_insn_reservation "div_op" 33
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "div"))
++  "is,m1,m1*31 + m2*31,m2")
++
++(define_insn_reservation "machh_w_op" 3
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "machh_w"))
++  "is*2,m1,m2")
++
++
++(define_insn_reservation "macww_w_op" 4
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "macww_w"))
++  "is*2,m1,m1,m2")
++
++
++(define_insn_reservation "macww_d_op" 6
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "macww_d"))
++  "is*2,m1,m1+m2,m1+m2,m2")
++
++;;Bypasses for Mac instructions, because of accumulator cache.
++;;Set latency as low as possible in order to let the compiler let
++;;mul -> mac and mac -> mac combinations which use the same
++;;accumulator cache be placed close together to avoid any
++;;instructions which can ruin the accumulator cache come inbetween.
++(define_bypass 4 "machh_w_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
++(define_bypass 5 "macww_w_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
++(define_bypass 7 "macww_d_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
++
++(define_bypass 3 "mulhh_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
++(define_bypass 4 "mulww_w_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
++(define_bypass 6 "mulww_d_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
++
++
++;;Bypasses for all mul/mac instructions followed by an instruction
++;;which reads the output AND writes the result to the same register.
++;;This will generate an Write After Write hazard which gives an
++;;extra cycle before the result is ready.
++(define_bypass 0 "machh_w_op" "machh_w_op" "avr32_valid_macmac_bypass")
++(define_bypass 0 "macww_w_op" "macww_w_op" "avr32_valid_macmac_bypass")
++(define_bypass 0 "macww_d_op" "macww_d_op" "avr32_valid_macmac_bypass")
++
++(define_bypass 0 "mulhh_op" "machh_w_op" "avr32_valid_mulmac_bypass")
++(define_bypass 0 "mulww_w_op" "macww_w_op" "avr32_valid_mulmac_bypass")
++(define_bypass 0 "mulww_d_op" "macww_d_op" "avr32_valid_mulmac_bypass")
++
++;;Branch and call instructions
++;;We assume that all branches and rcalls are predicted correctly :-)
++;;while calls use a lot of cycles.
++(define_insn_reservation "branch_op" 0
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "branch"))
++  "nothing")
++
++(define_insn_reservation "call_op" 10
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "call"))
++  "nothing")
++
++
++;;Load store instructions
++(define_insn_reservation "load_op" 2
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "load"))
++  "is,da,d")
++
++(define_insn_reservation "load_rm_op" 3
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "load_rm"))
++  "is,da,d")
++
++
++(define_insn_reservation "store_op" 0
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "store"))
++  "is,da,d")
++
++
++(define_insn_reservation "load_double_op" 3
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "load2"))
++  "is,da,da+d,d")
++
++(define_insn_reservation "load_quad_op" 4
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "load4"))
++  "is,da,da+d,da+d,d")
++
++(define_insn_reservation "store_double_op" 0
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "store2"))
++  "is,da,da+d,d")
++
++
++(define_insn_reservation "store_quad_op" 0
++  (and (eq_attr "pipeline" "ap")
++       (eq_attr "type" "store4"))
++  "is,da,da+d,da+d,d")
++
++;;For store the operand to write to memory is read in d and
++;;the real latency between any instruction and a store is therefore
++;;one less than for the instructions which reads the operands in the first
++;;excecution stage
++(define_bypass 2 "load_double_op" "store_double_op" "avr32_store_bypass")
++(define_bypass 3 "load_quad_op" "store_quad_op" "avr32_store_bypass")
++(define_bypass 1 "load_op" "store_op" "avr32_store_bypass")
++(define_bypass 2 "load_rm_op" "store_op" "avr32_store_bypass")
++(define_bypass 1 "alu_sat_op" "store_op" "avr32_store_bypass")
++(define_bypass 1 "alu2_op" "store_op" "avr32_store_bypass")
++(define_bypass 1 "mulhh_op" "store_op" "avr32_store_bypass")
++(define_bypass 2 "mulww_w_op" "store_op" "avr32_store_bypass")
++(define_bypass 4 "mulww_d_op" "store_op" "avr32_store_bypass" )
++(define_bypass 2 "machh_w_op" "store_op" "avr32_store_bypass")
++(define_bypass 3 "macww_w_op" "store_op" "avr32_store_bypass")
++(define_bypass 5 "macww_d_op" "store_op" "avr32_store_bypass")
++
++
++; Bypass for load double operation. If only the first loaded word is needed
++; then the latency is 2
++(define_bypass 2 "load_double_op"
++                 "load_op,load_rm_op,alu_sat_op, alu2_op, alu_op, mulhh_op, mulww_w_op,
++                  mulww_d_op, machh_w_op, macww_w_op, macww_d_op"
++                 "avr32_valid_load_double_bypass")
++
++; Bypass for load quad operation. If only the first or second loaded word is needed
++; we set the latency to 2
++(define_bypass 2 "load_quad_op"
++                 "load_op,load_rm_op,alu_sat_op, alu2_op, alu_op, mulhh_op, mulww_w_op,
++                  mulww_d_op, machh_w_op, macww_w_op, macww_d_op"
++                 "avr32_valid_load_quad_bypass")
++
++
++;;******************************************************************************
++;; End of Automaton pipeline description for avr32
++;;******************************************************************************
++
++(define_cond_exec
++  [(match_operator 0 "avr32_comparison_operator"
++    [(match_operand:CMP 1 "register_operand" "r")         
++     (match_operand:CMP 2 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")])]
++  "TARGET_V2_INSNS" 
++  "%!"
++)
++
++(define_cond_exec
++  [(match_operator 0 "avr32_comparison_operator"
++     [(and:SI (match_operand:SI 1 "register_operand" "r")         
++              (match_operand:SI 2 "one_bit_set_operand" "i"))
++      (const_int 0)])]
++  "TARGET_V2_INSNS" 
++  "%!"
++  )
++
++;;=============================================================================
++;; move
++;;-----------------------------------------------------------------------------
++
++
++;;== char - 8 bits ============================================================
++(define_expand "movqi"
++  [(set (match_operand:QI 0 "nonimmediate_operand" "")
++	(match_operand:QI 1 "general_operand" ""))]
++  ""
++  {
++   if ( can_create_pseudo_p () ){
++     if (GET_CODE (operands[1]) == MEM && optimize){
++         rtx reg = gen_reg_rtx (SImode);
++
++         emit_insn (gen_zero_extendqisi2 (reg, operands[1]));
++         operands[1] = gen_lowpart (QImode, reg);
++     }
++
++     /* One of the ops has to be in a register.  */
++     if (GET_CODE (operands[0]) == MEM)
++       operands[1] = force_reg (QImode, operands[1]);
++   }
++
++  })
++
++(define_insn "*movqi_internal"
++  [(set (match_operand:QI 0 "nonimmediate_operand" "=r,r,m,r")
++	(match_operand:QI 1 "general_operand"  "rKs08,m,r,i"))]
++  "register_operand (operands[0], QImode)
++   || register_operand (operands[1], QImode)"
++  "@
++   mov\t%0, %1
++   ld.ub\t%0, %1
++   st.b\t%0, %1
++   mov\t%0, %1"
++  [(set_attr "length" "2,4,4,4")
++   (set_attr "type" "alu,load_rm,store,alu")])
++
++
++
++;;== short - 16 bits ==========================================================
++(define_expand "movhi"
++  [(set (match_operand:HI 0 "nonimmediate_operand" "")
++	(match_operand:HI 1 "general_operand" ""))]
++  ""
++  {
++   if ( can_create_pseudo_p () ){
++     if (GET_CODE (operands[1]) == MEM && optimize){
++         rtx reg = gen_reg_rtx (SImode);
++
++         emit_insn (gen_extendhisi2 (reg, operands[1]));
++         operands[1] = gen_lowpart (HImode, reg);
++     }
++
++     /* One of the ops has to be in a register.  */
++     if (GET_CODE (operands[0]) == MEM)
++       operands[1] = force_reg (HImode, operands[1]);
++   }
++
++  })
++
++
++(define_insn "*movhi_internal"
++  [(set (match_operand:HI 0 "nonimmediate_operand" "=r,r,m,r")
++	(match_operand:HI 1 "general_operand"  "rKs08,m,r,i"))]
++  "register_operand (operands[0], HImode)
++   || register_operand (operands[1], HImode)"
++  "@
++   mov\t%0, %1
++   ld.sh\t%0, %1
++   st.h\t%0, %1
++   mov\t%0, %1"
++  [(set_attr "length" "2,4,4,4")
++   (set_attr "type" "alu,load_rm,store,alu")])
++
++
++;;== int - 32 bits ============================================================
++
++(define_expand "movmisalignsi"
++  [(set (match_operand:SI 0 "nonimmediate_operand" "")
++	(match_operand:SI 1 "nonimmediate_operand" ""))]
++  "TARGET_UNALIGNED_WORD"
++  {
++  }
++)
++
++(define_expand "mov<mode>"
++  [(set (match_operand:MOVM 0 "avr32_non_rmw_nonimmediate_operand" "")
++	(match_operand:MOVM 1 "avr32_non_rmw_general_operand" ""))]
++  ""
++  {
++
++    /* One of the ops has to be in a register.  */
++    if (GET_CODE (operands[0]) == MEM)
++      operands[1] = force_reg (<MODE>mode, operands[1]);
++
++    /* Check for out of range immediate constants as these may
++       occur during reloading, since it seems like reload does
++       not check if the immediate is legitimate. Don't know if
++       this is a bug? */
++    if ( reload_in_progress
++         && avr32_imm_in_const_pool
++         && GET_CODE(operands[1]) == CONST_INT
++         && !avr32_const_ok_for_constraint_p(INTVAL(operands[1]), 'K', "Ks21") ){
++        operands[1] = force_const_mem(SImode, operands[1]);
++    }
++    /* Check for RMW memory operands. They are not allowed for mov operations
++       only the atomic memc/s/t operations */
++    if ( !reload_in_progress
++         && avr32_rmw_memory_operand (operands[0], <MODE>mode) ){
++       operands[0] = copy_rtx (operands[0]);                                                              
++       XEXP(operands[0], 0) = force_reg (<MODE>mode, XEXP(operands[0], 0));
++    }
++
++    if ( !reload_in_progress
++         && avr32_rmw_memory_operand (operands[1], <MODE>mode) ){
++       operands[1] = copy_rtx (operands[1]);                                                              
++      XEXP(operands[1], 0) = force_reg (<MODE>mode, XEXP(operands[1], 0));
++    }
++    if ( (flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS)
++         && !avr32_legitimate_pic_operand_p(operands[1]) )
++      operands[1] = legitimize_pic_address (operands[1], <MODE>mode,
++                                            (can_create_pseudo_p () ? 0: operands[0]));
++    else if ( flag_pic && avr32_address_operand(operands[1], GET_MODE(operands[1])) )
++      /* If we have an address operand then this function uses the pic register. */
++      crtl->uses_pic_offset_table = 1;
++  })
++
++
++(define_insn "mov<mode>_internal"
++  [(set (match_operand:MOVM 0 "avr32_non_rmw_nonimmediate_operand" "=r,   r,   r,r,r,Q,r")
++	(match_operand:MOVM 1 "avr32_non_rmw_general_operand"      "rKs08,Ks21,J,n,Q,r,W"))]
++  "(register_operand (operands[0], <MODE>mode)
++    || register_operand (operands[1], <MODE>mode))
++    && !avr32_rmw_memory_operand (operands[0], <MODE>mode) 
++    && !avr32_rmw_memory_operand (operands[1], <MODE>mode)"
++  {
++    switch (which_alternative) {
++      case 0:
++      case 1: return "mov\t%0, %1";
++      case 2:
++        if ( TARGET_V2_INSNS )
++           return "movh\t%0, hi(%1)";
++        /* Fallthrough */
++      case 3: return "mov\t%0, lo(%1)\;orh\t%0,hi(%1)";
++      case 4:
++        if ( (REG_P(XEXP(operands[1], 0))
++              && REGNO(XEXP(operands[1], 0)) == SP_REGNUM)
++             || (GET_CODE(XEXP(operands[1], 0)) == PLUS
++                 && REGNO(XEXP(XEXP(operands[1], 0), 0)) == SP_REGNUM
++	         && GET_CODE(XEXP(XEXP(operands[1], 0), 1)) == CONST_INT
++	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) % 4 == 0
++	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) <= 0x1FC) )
++          return "lddsp\t%0, %1";
++	else if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])) )
++          return "lddpc\t%0, %1";
++        else
++          return "ld.w\t%0, %1";
++      case 5:
++        if ( (REG_P(XEXP(operands[0], 0))
++              && REGNO(XEXP(operands[0], 0)) == SP_REGNUM)
++             || (GET_CODE(XEXP(operands[0], 0)) == PLUS
++                 && REGNO(XEXP(XEXP(operands[0], 0), 0)) == SP_REGNUM
++	         && GET_CODE(XEXP(XEXP(operands[0], 0), 1)) == CONST_INT
++	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) % 4 == 0
++	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) <= 0x1FC) )
++          return "stdsp\t%0, %1";
++	else
++          return "st.w\t%0, %1";
++      case 6:
++        if ( TARGET_HAS_ASM_ADDR_PSEUDOS )
++          return "lda.w\t%0, %1";
++        else
++          return "ld.w\t%0, r6[%1@got]";
++      default:
++	abort();
++    }
++  }
++  
++  [(set_attr "length" "2,4,4,8,4,4,8")
++   (set_attr "type" "alu,alu,alu,alu2,load,store,load")
++   (set_attr "cc" "none,none,set_z_if_not_v2,set_z,none,none,clobber")])
++
++
++(define_expand "reload_out_rmw_memory_operand"
++  [(set (match_operand:SI 2 "register_operand" "=r")
++        (match_operand:SI 0 "address_operand" ""))
++   (set (mem:SI (match_dup 2))
++        (match_operand:SI 1 "register_operand" ""))]
++  ""
++  {
++   operands[0] = XEXP(operands[0], 0);
++  }
++)
++
++(define_expand "reload_in_rmw_memory_operand"
++  [(set (match_operand:SI 2 "register_operand" "=r")
++        (match_operand:SI 1 "address_operand" ""))
++   (set (match_operand:SI 0 "register_operand" "")
++        (mem:SI (match_dup 2)))]
++  ""
++  {
++   operands[1] = XEXP(operands[1], 0);
++  }
++)
++
++
++;; These instructions are for loading constants which cannot be loaded
++;; directly from the constant pool because the offset is too large
++;; high and lo_sum are used even tough for our case it should be
++;; low and high sum :-)
++(define_insn "mov_symbol_lo"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(high:SI (match_operand:SI 1 "immediate_operand" "i" )))]
++  ""
++  "mov\t%0, lo(%1)"
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")]
++)
++
++(define_insn "add_symbol_hi"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(lo_sum:SI (match_dup 0)
++                   (match_operand:SI 1 "immediate_operand" "i" )))]
++  ""
++  "orh\t%0, hi(%1)"
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")]
++)
++
++
++
++;; When generating pic, we need to load the symbol offset into a register.
++;; So that the optimizer does not confuse this with a normal symbol load
++;; we use an unspec.  The offset will be loaded from a constant pool entry,
++;; since that is the only type of relocation we can use.
++(define_insn "pic_load_addr"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(unspec:SI [(match_operand:SI 1 "" "")] UNSPEC_PIC_SYM))]
++  "flag_pic && CONSTANT_POOL_ADDRESS_P(XEXP(operands[1], 0))"
++  "lddpc\t%0, %1"
++  [(set_attr "type" "load")
++   (set_attr "length" "4")]
++)
++
++(define_insn "pic_compute_got_from_pc"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++	(unspec:SI [(minus:SI (pc)
++                              (match_dup 0))] UNSPEC_PIC_BASE))
++   (use (label_ref (match_operand 1 "" "")))]
++  "flag_pic"
++  {
++   (*targetm.asm_out.internal_label) (asm_out_file, "L",
++	 		     CODE_LABEL_NUMBER (operands[1]));
++   return \"rsub\t%0, pc\";
++  }
++  [(set_attr "cc" "clobber")
++   (set_attr "length" "2")]
++)
++
++;;== long long int - 64 bits ==================================================
++
++(define_expand "movdi"
++  [(set (match_operand:DI 0 "nonimmediate_operand" "")
++	(match_operand:DI 1 "general_operand" ""))]
++  ""
++  {
++
++    /* One of the ops has to be in a register.  */
++    if (GET_CODE (operands[0]) != REG)
++      operands[1] = force_reg (DImode, operands[1]);
++
++  })
++
++
++(define_insn_and_split "*movdi_internal"
++  [(set (match_operand:DI 0 "nonimmediate_operand"     "=r,r,   r,   r,r,r,m")
++	(match_operand:DI 1 "general_operand"          "r, Ks08,Ks21,G,n,m,r"))]
++  "register_operand (operands[0], DImode)
++   || register_operand (operands[1], DImode)"
++  {
++    switch (which_alternative ){
++    case 0:
++    case 1:
++    case 2:
++    case 3:
++    case 4:
++        return "#";
++    case 5:
++      if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])))
++        return "ld.d\t%0, pc[%1 - .]";
++      else
++        return "ld.d\t%0, %1";
++    case 6:
++      return "st.d\t%0, %1";
++    default:
++      abort();
++    }
++  }
++;; Lets split all reg->reg or imm->reg transfers into two SImode transfers 
++  "reload_completed &&
++   (REG_P (operands[0]) &&
++   (REG_P (operands[1]) 
++    || GET_CODE (operands[1]) == CONST_INT
++    || GET_CODE (operands[1]) == CONST_DOUBLE))"
++  [(set (match_dup 0) (match_dup 1))
++   (set (match_dup 2) (match_dup 3))]
++  {
++    operands[2] = gen_highpart (SImode, operands[0]);
++    operands[0] = gen_lowpart (SImode, operands[0]);
++    if ( REG_P(operands[1]) ){
++      operands[3] = gen_highpart(SImode, operands[1]);
++      operands[1] = gen_lowpart(SImode, operands[1]);
++    } else if ( GET_CODE(operands[1]) == CONST_DOUBLE 
++                || GET_CODE(operands[1]) == CONST_INT ){
++      rtx split_const[2];
++      avr32_split_const_expr (DImode, SImode, operands[1], split_const);
++      operands[3] = split_const[1];
++      operands[1] = split_const[0];
++    } else {
++      internal_error("Illegal operand[1] for movdi split!");
++    }
++  }
++
++  [(set_attr "length" "*,*,*,*,*,4,4")
++   (set_attr "type" "*,*,*,*,*,load2,store2")
++   (set_attr "cc" "*,*,*,*,*,none,none")])
++
++
++;;== 128 bits ==================================================
++(define_expand "movti"
++  [(set (match_operand:TI 0 "nonimmediate_operand" "")
++	(match_operand:TI 1 "nonimmediate_operand" ""))]
++  "TARGET_ARCH_AP"    
++  {     
++        
++    /* One of the ops has to be in a register.  */
++    if (GET_CODE (operands[0]) != REG)
++      operands[1] = force_reg (TImode, operands[1]);
++
++    /* We must fix any pre_dec for loads and post_inc stores */
++    if ( GET_CODE (operands[0]) == MEM
++         && GET_CODE (XEXP(operands[0],0)) == POST_INC ){
++       emit_move_insn(gen_rtx_MEM(TImode, XEXP(XEXP(operands[0],0),0)), operands[1]);
++       emit_insn(gen_addsi3(XEXP(XEXP(operands[0],0),0), XEXP(XEXP(operands[0],0),0), GEN_INT(GET_MODE_SIZE(TImode))));
++       DONE;
++    }
++
++    if ( GET_CODE (operands[1]) == MEM
++         && GET_CODE (XEXP(operands[1],0)) == PRE_DEC ){
++       emit_insn(gen_addsi3(XEXP(XEXP(operands[1],0),0), XEXP(XEXP(operands[1],0),0), GEN_INT(-GET_MODE_SIZE(TImode))));
++       emit_move_insn(operands[0], gen_rtx_MEM(TImode, XEXP(XEXP(operands[1],0),0)));
++       DONE;
++    }
++  })
++
++
++(define_insn_and_split "*movti_internal"
++  [(set (match_operand:TI 0 "avr32_movti_dst_operand"  "=r,&r,    r,    <RKu00,r,r")
++	(match_operand:TI 1 "avr32_movti_src_operand"  " r,RKu00>,RKu00,r,     n,T"))]
++  "(register_operand (operands[0], TImode)
++    || register_operand (operands[1], TImode))"
++  {
++    switch (which_alternative ){
++    case 0:
++    case 2:
++    case 4:
++        return "#";
++    case 1:
++        return "ldm\t%p1, %0";
++    case 3:
++        return "stm\t%p0, %1";
++    case 5:
++        return "ld.d\t%U0, pc[%1 - .]\;ld.d\t%B0, pc[%1 - . + 8]";
++    }
++  }
++
++  "reload_completed &&
++   (REG_P (operands[0]) &&
++   (REG_P (operands[1]) 
++    /* If this is a load from the constant pool we split it into
++       two double loads. */
++    || (GET_CODE (operands[1]) == MEM
++        && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF
++        && CONSTANT_POOL_ADDRESS_P (XEXP (operands[1], 0)))               
++    /* If this is a load where the pointer register is a part
++       of the register list, we must split it into two double
++       loads in order for it to be exception safe. */
++    || (GET_CODE (operands[1]) == MEM
++        && register_operand (XEXP (operands[1], 0), SImode)
++        && reg_overlap_mentioned_p (operands[0], XEXP (operands[1], 0)))               
++    || GET_CODE (operands[1]) == CONST_INT
++    || GET_CODE (operands[1]) == CONST_DOUBLE))"
++  [(set (match_dup 0) (match_dup 1))
++   (set (match_dup 2) (match_dup 3))]
++  {
++    operands[2] = simplify_gen_subreg ( DImode, operands[0], 
++                                        TImode, 0 );
++    operands[0] = simplify_gen_subreg ( DImode, operands[0], 
++                                        TImode, 8 );
++    if ( REG_P(operands[1]) ){
++      operands[3] = simplify_gen_subreg ( DImode, operands[1], 
++                                          TImode, 0 );
++      operands[1] = simplify_gen_subreg ( DImode, operands[1], 
++                                          TImode, 8 );
++    } else if ( GET_CODE(operands[1]) == CONST_DOUBLE 
++                || GET_CODE(operands[1]) == CONST_INT ){
++      rtx split_const[2];
++      avr32_split_const_expr (TImode, DImode, operands[1], split_const);
++      operands[3] = split_const[1];
++      operands[1] = split_const[0];
++    } else if (avr32_const_pool_ref_operand (operands[1], GET_MODE(operands[1]))){
++      rtx split_const[2];
++      rtx cop = avoid_constant_pool_reference (operands[1]);
++      if (operands[1] == cop)
++        cop = get_pool_constant (XEXP (operands[1], 0));
++      avr32_split_const_expr (TImode, DImode, cop, split_const);
++      operands[3] = force_const_mem (DImode, split_const[1]); 
++      operands[1] = force_const_mem (DImode, split_const[0]); 
++   } else {
++      rtx ptr_reg = XEXP (operands[1], 0);
++      operands[1] = gen_rtx_MEM (DImode, 
++                                 gen_rtx_PLUS ( SImode,
++                                                ptr_reg,
++                                                GEN_INT (8) ));
++      operands[3] = gen_rtx_MEM (DImode,
++                                 ptr_reg);
++              
++      /* Check if the first load will clobber the pointer.
++         If so, we must switch the order of the operations. */
++      if ( reg_overlap_mentioned_p (operands[0], ptr_reg) )
++        {
++          /* We need to switch the order of the operations
++             so that the pointer register does not get clobbered
++             after the first double word load. */
++          rtx tmp;
++          tmp = operands[0];
++          operands[0] = operands[2];
++          operands[2] = tmp;
++          tmp = operands[1];
++          operands[1] = operands[3];
++          operands[3] = tmp;
++        }
++
++
++   }
++  }
++  [(set_attr "length" "*,*,4,4,*,8")
++   (set_attr "type" "*,*,load4,store4,*,load4")])
++
++
++;;== float - 32 bits ==========================================================
++(define_expand "movsf"
++  [(set (match_operand:SF 0 "nonimmediate_operand" "")
++	(match_operand:SF 1 "general_operand" ""))]
++  ""
++  {
++
++
++    /* One of the ops has to be in a register.  */
++    if (GET_CODE (operands[0]) != REG)
++      operands[1] = force_reg (SFmode, operands[1]);
++
++  })
++
++(define_insn "*movsf_internal"
++  [(set (match_operand:SF 0 "nonimmediate_operand"     "=r,r,r,r,m")
++	(match_operand:SF 1 "general_operand"          "r, G,F,m,r"))]
++  "(register_operand (operands[0], SFmode)
++    || register_operand (operands[1], SFmode))"
++  {
++    switch (which_alternative) {
++      case 0:
++      case 1: return "mov\t%0, %1";
++      case 2: 
++       {
++        HOST_WIDE_INT target_float[2];
++        real_to_target (target_float, CONST_DOUBLE_REAL_VALUE (operands[1]), SFmode);
++        if ( TARGET_V2_INSNS 
++             && avr32_hi16_immediate_operand (GEN_INT (target_float[0]), VOIDmode) )
++           return "movh\t%0, hi(%1)";
++        else
++           return "mov\t%0, lo(%1)\;orh\t%0, hi(%1)";
++       }
++      case 3:
++        if ( (REG_P(XEXP(operands[1], 0))
++              && REGNO(XEXP(operands[1], 0)) == SP_REGNUM)
++             || (GET_CODE(XEXP(operands[1], 0)) == PLUS
++                 && REGNO(XEXP(XEXP(operands[1], 0), 0)) == SP_REGNUM
++	         && GET_CODE(XEXP(XEXP(operands[1], 0), 1)) == CONST_INT
++	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) % 4 == 0
++	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) <= 0x1FC) )
++          return "lddsp\t%0, %1";
++          else if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])) )
++          return "lddpc\t%0, %1";
++        else
++          return "ld.w\t%0, %1";
++      case 4:
++        if ( (REG_P(XEXP(operands[0], 0))
++              && REGNO(XEXP(operands[0], 0)) == SP_REGNUM)
++             || (GET_CODE(XEXP(operands[0], 0)) == PLUS
++                 && REGNO(XEXP(XEXP(operands[0], 0), 0)) == SP_REGNUM
++	         && GET_CODE(XEXP(XEXP(operands[0], 0), 1)) == CONST_INT
++	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) % 4 == 0
++	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) <= 0x1FC) )
++          return "stdsp\t%0, %1";
++	else
++          return "st.w\t%0, %1";
++      default:
++	abort();
++    }
++  }
++
++  [(set_attr "length" "2,4,8,4,4")
++   (set_attr "type" "alu,alu,alu2,load,store")
++   (set_attr "cc" "none,none,clobber,none,none")])
++
++
++
++;;== double - 64 bits =========================================================
++(define_expand "movdf"
++  [(set (match_operand:DF 0 "nonimmediate_operand" "")
++	(match_operand:DF 1 "general_operand" ""))]
++  ""
++  {
++    /* One of the ops has to be in a register.  */
++    if (GET_CODE (operands[0]) != REG){
++      operands[1] = force_reg (DFmode, operands[1]);
++    }
++  })
++
++
++(define_insn_and_split "*movdf_internal"
++  [(set (match_operand:DF 0 "nonimmediate_operand"     "=r,r,r,r,m")
++	(match_operand:DF 1 "general_operand"          " r,G,F,m,r"))]
++  "(register_operand (operands[0], DFmode)
++       || register_operand (operands[1], DFmode))"
++  {
++    switch (which_alternative ){
++    case 0:
++    case 1:
++    case 2: 
++        return "#";
++    case 3:
++      if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])))
++        return "ld.d\t%0, pc[%1 - .]";
++      else
++        return "ld.d\t%0, %1";
++    case 4:
++      return "st.d\t%0, %1";
++    default:
++      abort();
++    }
++  }
++  "reload_completed
++   && (REG_P (operands[0]) 
++        && (REG_P (operands[1])
++            || GET_CODE (operands[1]) == CONST_DOUBLE))"
++  [(set (match_dup 0) (match_dup 1))
++   (set (match_dup 2) (match_dup 3))]
++  "
++   {
++    operands[2] = gen_highpart (SImode, operands[0]);
++    operands[0] = gen_lowpart (SImode, operands[0]);
++    operands[3] = gen_highpart(SImode, operands[1]);
++    operands[1] = gen_lowpart(SImode, operands[1]);
++   }
++  "
++
++  [(set_attr "length" "*,*,*,4,4")
++   (set_attr "type" "*,*,*,load2,store2")
++   (set_attr "cc" "*,*,*,none,none")])
++
++
++;;=============================================================================
++;; Conditional Moves
++;;=============================================================================
++(define_insn "ld<mode>_predicable"
++  [(set (match_operand:MOVCC 0 "register_operand" "=r")
++	(match_operand:MOVCC 1 "avr32_non_rmw_memory_operand" "<MOVCC:pred_mem_constraint>"))]
++  "TARGET_V2_INSNS"
++  "ld<MOVCC:load_postfix>%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "type" "load")
++   (set_attr "predicable" "yes")]
++)
++
++
++(define_insn "st<mode>_predicable"
++  [(set (match_operand:MOVCC 0 "avr32_non_rmw_memory_operand" "=<MOVCC:pred_mem_constraint>")
++	(match_operand:MOVCC 1 "register_operand" "r"))]
++  "TARGET_V2_INSNS"
++  "st<MOVCC:store_postfix>%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "type" "store")
++   (set_attr "predicable" "yes")]
++)
++
++(define_insn "mov<mode>_predicable"
++  [(set (match_operand:MOVCC 0 "register_operand" "=r")
++	(match_operand:MOVCC 1 "avr32_cond_register_immediate_operand" "rKs08"))]
++  ""
++  "mov%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "type" "alu")
++   (set_attr "predicable" "yes")]
++)
++
++
++;;=============================================================================
++;; Move chunks of memory
++;;=============================================================================
++
++(define_expand "movmemsi"
++  [(match_operand:BLK 0 "general_operand" "")
++   (match_operand:BLK 1 "general_operand" "")
++   (match_operand:SI 2 "const_int_operand" "")
++   (match_operand:SI 3 "const_int_operand" "")]
++  ""
++  "
++   if (avr32_gen_movmemsi (operands))
++     DONE;
++   FAIL;
++  "
++  )
++
++
++
++
++;;=============================================================================
++;; Bit field instructions
++;;-----------------------------------------------------------------------------
++;; Instructions to insert or extract bit-fields
++;;=============================================================================
++
++(define_insn "insv"
++  [ (set (zero_extract:SI (match_operand:SI 0 "register_operand" "+r")
++                          (match_operand:SI 1 "immediate_operand" "Ku05")
++                          (match_operand:SI 2 "immediate_operand" "Ku05"))
++         (match_operand 3 "register_operand" "r"))]
++  ""
++  "bfins\t%0, %3, %2, %1"
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")
++   (set_attr "cc" "set_ncz")])
++
++
++
++(define_expand "extv"
++  [ (set (match_operand:SI 0 "register_operand" "")
++         (sign_extract:SI (match_operand:SI 1 "register_operand" "")
++                          (match_operand:SI 2 "immediate_operand" "")
++                          (match_operand:SI 3 "immediate_operand" "")))]
++  ""
++  {
++   if ( INTVAL(operands[2]) >= 32 )
++      FAIL;
++  }
++)
++
++(define_expand "extzv"
++  [ (set (match_operand:SI 0 "register_operand" "")
++         (zero_extract:SI (match_operand:SI 1 "register_operand" "")
++                          (match_operand:SI 2 "immediate_operand" "")
++                          (match_operand:SI 3 "immediate_operand" "")))]
++  ""
++  {
++   if ( INTVAL(operands[2]) >= 32 )
++      FAIL;
++  }
++)
++
++(define_insn "extv_internal"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (sign_extract:SI (match_operand:SI 1 "register_operand" "r")
++                          (match_operand:SI 2 "immediate_operand" "Ku05")
++                          (match_operand:SI 3 "immediate_operand" "Ku05")))]
++  "INTVAL(operands[2]) < 32"
++  "bfexts\t%0, %1, %3, %2"
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")
++   (set_attr "cc" "set_ncz")])
++
++
++(define_insn "extzv_internal"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (zero_extract:SI (match_operand:SI 1 "register_operand" "r")
++                          (match_operand:SI 2 "immediate_operand" "Ku05")
++                          (match_operand:SI 3 "immediate_operand" "Ku05")))]
++  "INTVAL(operands[2]) < 32"
++  "bfextu\t%0, %1, %3, %2"
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")
++   (set_attr "cc" "set_ncz")])
++
++
++
++;;=============================================================================
++;; Some peepholes for avoiding unnecessary cast instructions
++;; followed by bfins.
++;;-----------------------------------------------------------------------------
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (zero_extend:SI (match_operand:QI 1 "register_operand" "")))
++   (set (zero_extract:SI (match_operand 2 "register_operand" "")
++                         (match_operand:SI 3 "immediate_operand" "")
++                         (match_operand:SI 4 "immediate_operand" ""))
++        (match_dup 0))]
++  "((peep2_reg_dead_p(2, operands[0]) &&
++    (INTVAL(operands[3]) <= 8)))"
++  [(set (zero_extract:SI (match_dup 2)
++                         (match_dup 3)
++                         (match_dup 4))
++        (match_dup 1))]
++  )
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (zero_extend:SI (match_operand:HI 1 "register_operand" "")))
++   (set (zero_extract:SI (match_operand 2 "register_operand" "")
++                         (match_operand:SI 3 "immediate_operand" "")
++                         (match_operand:SI 4 "immediate_operand" ""))
++        (match_dup 0))]
++  "((peep2_reg_dead_p(2, operands[0]) &&
++    (INTVAL(operands[3]) <= 16)))"
++  [(set (zero_extract:SI (match_dup 2)
++                         (match_dup 3)
++                         (match_dup 4))
++        (match_dup 1))]
++  )
++
++;;=============================================================================
++;; push bytes
++;;-----------------------------------------------------------------------------
++;; Implements the push instruction
++;;=============================================================================
++(define_insn "pushm"
++  [(set (mem:BLK (pre_dec:BLK (reg:SI SP_REGNUM)))
++        (unspec:BLK [(match_operand 0 "const_int_operand" "")]
++                    UNSPEC_PUSHM))]
++  ""
++  {
++    if (INTVAL(operands[0])) {
++      return "pushm\t%r0";
++    } else {
++      return "";
++    }
++  }
++  [(set_attr "type" "store")
++   (set_attr "length" "2")
++   (set_attr "cc" "none")])
++
++(define_insn "stm"
++  [(unspec [(match_operand 0 "register_operand" "r")
++            (match_operand 1 "const_int_operand" "")
++            (match_operand 2 "const_int_operand" "")]
++	   UNSPEC_STM)]
++  ""
++  {
++    if (INTVAL(operands[1])) {
++      if (INTVAL(operands[2]) != 0)
++         return "stm\t--%0, %s1";
++      else
++         return "stm\t%0, %s1";
++    } else {
++      return "";
++    }
++  }
++  [(set_attr "type" "store")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++
++
++(define_insn "popm"
++  [(unspec [(match_operand 0 "const_int_operand" "")]
++	   UNSPEC_POPM)]
++  ""
++  {
++    if (INTVAL(operands[0])) {
++      return "popm   %r0";
++    } else {
++      return "";
++    }
++  }
++  [(set_attr "type" "load")
++   (set_attr "length" "2")])
++
++
++
++;;=============================================================================
++;; add
++;;-----------------------------------------------------------------------------
++;; Adds reg1 with reg2 and puts the result in reg0.
++;;=============================================================================
++(define_insn "add<mode>3"
++  [(set (match_operand:INTM 0 "register_operand" "=r,r,r,r,r")
++	(plus:INTM (match_operand:INTM 1 "register_operand" "%0,r,0,r,0")
++                   (match_operand:INTM 2 "avr32_add_operand" "r,r,Is08,Is16,Is21")))]
++  ""
++  "@
++   add     %0, %2
++   add     %0, %1, %2
++   sub     %0, %n2
++   sub     %0, %1, %n2
++   sub     %0, %n2"
++
++  [(set_attr "length" "2,4,2,4,4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++(define_insn "add<mode>3_lsl"
++  [(set (match_operand:INTM 0 "register_operand" "=r")
++	(plus:INTM (ashift:INTM (match_operand:INTM 1 "register_operand" "r")
++                                (match_operand:INTM 3 "avr32_add_shift_immediate_operand" "Ku02"))
++                   (match_operand:INTM 2 "register_operand" "r")))]
++  ""
++  "add     %0, %2, %1 << %3"
++  [(set_attr "length" "4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++(define_insn "add<mode>3_lsl2"
++  [(set (match_operand:INTM 0 "register_operand" "=r")
++	(plus:INTM (match_operand:INTM 1 "register_operand" "r")
++                   (ashift:INTM (match_operand:INTM 2 "register_operand" "r")
++                                (match_operand:INTM 3 "avr32_add_shift_immediate_operand" "Ku02"))))]
++  ""
++  "add     %0, %1, %2 << %3"
++  [(set_attr "length" "4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++
++(define_insn "add<mode>3_mul"
++  [(set (match_operand:INTM 0 "register_operand" "=r")
++	(plus:INTM (mult:INTM (match_operand:INTM 1 "register_operand" "r")
++                              (match_operand:INTM 3 "immediate_operand" "Ku04" ))
++                   (match_operand:INTM 2 "register_operand" "r")))]
++  "(INTVAL(operands[3]) == 0) || (INTVAL(operands[3]) == 2) ||
++   (INTVAL(operands[3]) == 4) || (INTVAL(operands[3]) == 8)"
++  "add     %0, %2, %1 << %p3"
++  [(set_attr "length" "4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++(define_insn "add<mode>3_mul2"
++  [(set (match_operand:INTM 0 "register_operand" "=r")
++	(plus:INTM (match_operand:INTM 1 "register_operand" "r")
++                   (mult:INTM (match_operand:INTM 2 "register_operand" "r")
++                              (match_operand:INTM 3 "immediate_operand" "Ku04" ))))]
++  "(INTVAL(operands[3]) == 0) || (INTVAL(operands[3]) == 2) ||
++   (INTVAL(operands[3]) == 4) || (INTVAL(operands[3]) == 8)"
++  "add     %0, %1, %2 << %p3"
++  [(set_attr "length" "4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (ashift:SI (match_operand:SI 1 "register_operand" "")
++                   (match_operand:SI 2 "immediate_operand" "")))
++   (set (match_operand:SI 3 "register_operand" "")
++	(plus:SI (match_dup 0)
++                 (match_operand:SI 4 "register_operand" "")))]
++  "(peep2_reg_dead_p(2, operands[0]) &&
++    (INTVAL(operands[2]) < 4 && INTVAL(operands[2]) > 0))"
++  [(set (match_dup 3)
++	(plus:SI (ashift:SI (match_dup 1)
++                            (match_dup 2))
++                 (match_dup 4)))]
++  )
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (ashift:SI (match_operand:SI 1 "register_operand" "")
++                   (match_operand:SI 2 "immediate_operand" "")))
++   (set (match_operand:SI 3 "register_operand" "")
++	(plus:SI (match_operand:SI 4 "register_operand" "")
++                 (match_dup 0)))]
++  "(peep2_reg_dead_p(2, operands[0]) &&
++    (INTVAL(operands[2]) < 4 && INTVAL(operands[2]) > 0))"
++  [(set (match_dup 3)
++	(plus:SI (ashift:SI (match_dup 1)
++                            (match_dup 2))
++                 (match_dup 4)))]
++  )
++
++(define_insn "adddi3"
++  [(set (match_operand:DI 0 "register_operand" "=r,r")
++	(plus:DI (match_operand:DI 1 "register_operand" "%0,r")
++		 (match_operand:DI 2 "register_operand" "r,r")))]
++  ""
++  "@
++   add     %0, %2\;adc    %m0, %m0, %m2
++   add     %0, %1, %2\;adc    %m0, %m1, %m2"
++  [(set_attr "length" "6,8")
++   (set_attr "type" "alu2")
++   (set_attr "cc" "set_vncz")])
++
++
++(define_insn "add<mode>_imm_predicable"
++  [(set (match_operand:INTM 0 "register_operand" "+r")
++	(plus:INTM (match_dup 0)
++                   (match_operand:INTM 1 "avr32_cond_immediate_operand" "%Is08")))]
++  ""
++  "sub%?\t%0, -%1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")]
++)
++
++;;=============================================================================
++;; subtract
++;;-----------------------------------------------------------------------------
++;; Subtract reg2 or immediate value from reg0 and puts the result in reg0.
++;;=============================================================================
++
++(define_insn "sub<mode>3"
++  [(set (match_operand:INTM 0 "general_operand" "=r,r,r,r,r,r,r")
++	(minus:INTM (match_operand:INTM 1 "register_const_int_operand" "0,r,0,r,0,r,Ks08")
++		  (match_operand:INTM 2 "register_const_int_operand" "r,r,Ks08,Ks16,Ks21,0,r")))]
++  ""
++  "@
++   sub     %0, %2
++   sub     %0, %1, %2
++   sub     %0, %2
++   sub     %0, %1, %2
++   sub     %0, %2
++   rsub    %0, %1
++   rsub    %0, %2, %1"
++  [(set_attr "length" "2,4,2,4,4,2,4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++(define_insn "*sub<mode>3_mul"
++  [(set (match_operand:INTM 0 "register_operand" "=r")
++	(minus:INTM (match_operand:INTM 1 "register_operand" "r")
++                    (mult:INTM (match_operand:INTM 2 "register_operand" "r")
++                               (match_operand:SI 3 "immediate_operand" "Ku04" ))))]
++  "(INTVAL(operands[3]) == 0) || (INTVAL(operands[3]) == 2) ||
++   (INTVAL(operands[3]) == 4) || (INTVAL(operands[3]) == 8)"
++  "sub     %0, %1, %2 << %p3"
++  [(set_attr "length" "4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++(define_insn "*sub<mode>3_lsl"
++  [(set (match_operand:INTM 0 "register_operand" "=r")
++	(minus:INTM  (match_operand:INTM 1 "register_operand" "r")
++                     (ashift:INTM (match_operand:INTM 2 "register_operand" "r")
++                                  (match_operand:SI 3 "avr32_add_shift_immediate_operand" "Ku02"))))]
++  ""
++  "sub     %0, %1, %2 << %3"
++  [(set_attr "length" "4")
++   (set_attr "cc" "<INTM:alu_cc_attr>")])
++
++
++(define_insn "subdi3"
++  [(set (match_operand:DI 0 "register_operand" "=r,r")
++	(minus:DI (match_operand:DI 1 "register_operand" "%0,r")
++		 (match_operand:DI 2 "register_operand" "r,r")))]
++  ""
++  "@
++   sub     %0, %2\;sbc    %m0, %m0, %m2
++   sub     %0, %1, %2\;sbc    %m0, %m1, %m2"
++  [(set_attr "length" "6,8")
++   (set_attr "type" "alu2")
++   (set_attr "cc" "set_vncz")])
++
++
++(define_insn "sub<mode>_imm_predicable"
++  [(set (match_operand:INTM 0 "register_operand" "+r")
++	(minus:INTM (match_dup 0)
++                    (match_operand:INTM 1 "avr32_cond_immediate_operand" "Ks08")))]
++  ""
++  "sub%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")])
++
++(define_insn "rsub<mode>_imm_predicable"
++  [(set (match_operand:INTM 0 "register_operand" "+r")
++	(minus:INTM (match_operand:INTM 1 "avr32_cond_immediate_operand"  "Ks08")
++                    (match_dup 0)))]
++  ""
++  "rsub%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")])
++
++;;=============================================================================
++;; multiply
++;;-----------------------------------------------------------------------------
++;; Multiply op1 and op2 and put the value in op0.
++;;=============================================================================
++
++
++(define_insn "mulqi3"
++  [(set (match_operand:QI 0 "register_operand"         "=r,r,r")
++	(mult:QI (match_operand:QI 1 "register_operand" "%0,r,r")
++		 (match_operand:QI 2 "avr32_mul_operand" "r,r,Ks08")))]
++  "!TARGET_NO_MUL_INSNS"
++  {
++   switch (which_alternative){
++    case 0:
++      return "mul     %0, %2";
++    case 1:
++      return "mul     %0, %1, %2";
++    case 2:
++      return "mul     %0, %1, %2";
++    default:
++      gcc_unreachable();
++   }
++  }
++  [(set_attr "type" "mulww_w,mulww_w,mulwh")
++   (set_attr "length" "2,4,4")
++   (set_attr "cc" "none")])
++
++(define_insn "mulsi3"
++  [(set (match_operand:SI 0 "register_operand"         "=r,r,r")
++	(mult:SI (match_operand:SI 1 "register_operand" "%0,r,r")
++		 (match_operand:SI 2 "avr32_mul_operand" "r,r,Ks08")))]
++  "!TARGET_NO_MUL_INSNS"
++  {
++   switch (which_alternative){
++    case 0:
++      return "mul     %0, %2";
++    case 1:
++      return "mul     %0, %1, %2";
++    case 2:
++      return "mul     %0, %1, %2";
++    default:
++      gcc_unreachable();
++   }
++  }
++  [(set_attr "type" "mulww_w,mulww_w,mulwh")
++   (set_attr "length" "2,4,4")
++   (set_attr "cc" "none")])
++
++
++(define_insn "mulhisi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(mult:SI
++	 (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
++	 (sign_extend:SI (match_operand:HI 2 "register_operand" "r"))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulhh.w %0, %1:b, %2:b"
++  [(set_attr "type" "mulhh")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++(define_peephole2
++  [(match_scratch:DI 6 "r")
++   (set (match_operand:SI 0 "register_operand" "")
++	(mult:SI
++	 (sign_extend:SI (match_operand:HI 1 "register_operand" ""))
++         (sign_extend:SI (match_operand:HI 2 "register_operand" ""))))
++   (set (match_operand:SI 3 "register_operand" "")
++        (ashiftrt:SI (match_dup 0)
++                     (const_int 16)))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP
++   && (peep2_reg_dead_p(1, operands[0]) || (REGNO(operands[0]) == REGNO(operands[3])))"
++  [(set (match_dup 4) (sign_extend:SI (match_dup 1)))
++   (set (match_dup 6)
++        (ashift:DI (mult:DI (sign_extend:DI (match_dup 4))
++                            (sign_extend:DI (match_dup 2)))
++                   (const_int 16)))
++   (set (match_dup 3) (match_dup 5))]
++
++  "{
++     operands[4] = gen_rtx_REG(SImode, REGNO(operands[1]));
++     operands[5] = gen_highpart (SImode, operands[4]);
++   }"
++  )
++
++(define_insn "mulnhisi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (mult:SI
++         (sign_extend:SI (neg:HI (match_operand:HI 1 "register_operand" "r")))
++         (sign_extend:SI (match_operand:HI 2 "register_operand" "r"))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulnhh.w %0, %1:b, %2:b"
++  [(set_attr "type" "mulhh")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++(define_insn "machisi3"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++	(plus:SI (mult:SI
++                  (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
++                  (sign_extend:SI (match_operand:HI 2 "register_operand" "r")))
++                 (match_dup 0)))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "machh.w %0, %1:b, %2:b"
++  [(set_attr "type" "machh_w")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++
++
++(define_insn "mulsidi3"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(mult:DI
++	 (sign_extend:DI (match_operand:SI 1 "register_operand" "%r"))
++	 (sign_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
++  "!TARGET_NO_MUL_INSNS"
++  "muls.d  %0, %1, %2"
++  [(set_attr "type" "mulww_d")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++(define_insn "umulsidi3"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(mult:DI
++	 (zero_extend:DI (match_operand:SI 1 "register_operand" "%r"))
++	 (zero_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
++  "!TARGET_NO_MUL_INSNS"
++  "mulu.d  %0, %1, %2"
++  [(set_attr "type" "mulww_d")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++(define_insn "*mulaccsi3"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++	(plus:SI (mult:SI (match_operand:SI 1 "register_operand" "%r")
++			  (match_operand:SI 2 "register_operand" "r"))
++		 (match_dup 0)))]
++  "!TARGET_NO_MUL_INSNS"
++  "mac     %0, %1, %2"
++  [(set_attr "type" "macww_w")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++(define_insn "*mulaccsidi3"
++  [(set (match_operand:DI 0 "register_operand" "+r")
++	(plus:DI (mult:DI
++		  (sign_extend:DI (match_operand:SI 1 "register_operand" "%r"))
++		  (sign_extend:DI (match_operand:SI 2 "register_operand" "r")))
++		 (match_dup 0)))]
++  "!TARGET_NO_MUL_INSNS"
++  "macs.d  %0, %1, %2"
++  [(set_attr "type" "macww_d")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++(define_insn "*umulaccsidi3"
++  [(set (match_operand:DI 0 "register_operand" "+r")
++	(plus:DI (mult:DI
++		  (zero_extend:DI (match_operand:SI 1 "register_operand" "%r"))
++		  (zero_extend:DI (match_operand:SI 2 "register_operand" "r")))
++		 (match_dup 0)))]
++  "!TARGET_NO_MUL_INSNS"
++  "macu.d  %0, %1, %2"
++  [(set_attr "type" "macww_d")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++
++
++;; Try to avoid Write-After-Write hazards for mul operations
++;; if it can be done
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++	(mult:SI
++	 (sign_extend:SI (match_operand 1 "general_operand" ""))
++         (sign_extend:SI (match_operand 2 "general_operand" ""))))
++   (set (match_dup 0)
++	(match_operator:SI 3 "alu_operator" [(match_dup 0)
++                                             (match_operand 4 "general_operand" "")]))]
++  "peep2_reg_dead_p(1, operands[2])"
++  [(set (match_dup 5)
++        (mult:SI
++         (sign_extend:SI (match_dup 1))
++         (sign_extend:SI (match_dup 2))))
++   (set (match_dup 0)
++	(match_op_dup 3 [(match_dup 5)
++                         (match_dup 4)]))]
++  "{operands[5] = gen_rtx_REG(SImode, REGNO(operands[2]));}"
++  )
++
++
++
++;;=============================================================================
++;; DSP instructions
++;;=============================================================================
++(define_insn "mulsathh_h"
++  [(set (match_operand:HI 0 "register_operand" "=r")
++        (ss_truncate:HI (ashiftrt:SI (mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
++                                              (sign_extend:SI (match_operand:HI 2 "register_operand" "r")))
++                                     (const_int 15))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulsathh.h\t%0, %1:b, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulhh")])
++
++(define_insn "mulsatrndhh_h"
++  [(set (match_operand:HI 0 "register_operand" "=r")
++        (ss_truncate:HI (ashiftrt:SI
++                         (plus:SI (mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
++                                           (sign_extend:SI (match_operand:HI 2 "register_operand" "r")))
++                                  (const_int 1073741824))
++                         (const_int 15))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulsatrndhh.h\t%0, %1:b, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulhh")])
++
++(define_insn "mulsathh_w"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (ss_truncate:SI (ashift:DI (mult:DI (sign_extend:DI (match_operand:HI 1 "register_operand" "%r"))
++                                            (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
++                                   (const_int 1))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulsathh.w\t%0, %1:b, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulhh")])
++
++(define_insn "mulsatwh_w"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (ss_truncate:SI (ashiftrt:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
++                                              (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
++                                     (const_int 15))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulsatwh.w\t%0, %1, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulwh")])
++
++(define_insn "mulsatrndwh_w"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (ss_truncate:SI (ashiftrt:DI (plus:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
++                                                       (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
++                                              (const_int 1073741824))
++                                     (const_int 15))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulsatrndwh.w\t%0, %1, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulwh")])
++
++(define_insn "macsathh_w"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++        (plus:SI (match_dup 0)
++                 (ss_truncate:SI (ashift:DI (mult:DI (sign_extend:DI (match_operand:HI 1 "register_operand" "%r"))
++                                                     (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
++                                            (const_int 1)))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "macsathh.w\t%0, %1:b, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulhh")])
++
++
++(define_insn "mulwh_d"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++        (ashift:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
++                            (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
++                   (const_int 16)))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulwh.d\t%0, %1, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulwh")])
++
++
++(define_insn "mulnwh_d"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++        (ashift:DI (mult:DI (not:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r")))
++                            (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
++                   (const_int 16)))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "mulnwh.d\t%0, %1, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulwh")])
++
++(define_insn "macwh_d"
++  [(set (match_operand:DI 0 "register_operand" "+r")
++        (plus:DI (match_dup 0)
++                 (ashift:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "%r"))
++                                     (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
++                            (const_int 16))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "macwh.d\t%0, %1, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulwh")])
++
++(define_insn "machh_d"
++  [(set (match_operand:DI 0 "register_operand" "+r")
++        (plus:DI (match_dup 0)
++                 (mult:DI (sign_extend:DI (match_operand:HI 1 "register_operand" "%r"))
++                          (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))))]
++  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
++  "machh.d\t%0, %1:b, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "mulwh")])
++
++(define_insn "satadd_w"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (ss_plus:SI (match_operand:SI 1 "register_operand" "r")
++                    (match_operand:SI 2 "register_operand" "r")))]
++  "TARGET_DSP"
++  "satadd.w\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "alu_sat")])
++
++(define_insn "satsub_w"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (ss_minus:SI (match_operand:SI 1 "register_operand" "r")
++                     (match_operand:SI 2 "register_operand" "r")))]
++  "TARGET_DSP"
++  "satsub.w\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "alu_sat")])
++
++(define_insn "satadd_h"
++  [(set (match_operand:HI 0 "register_operand" "=r")
++        (ss_plus:HI (match_operand:HI 1 "register_operand" "r")
++                    (match_operand:HI 2 "register_operand" "r")))]
++  "TARGET_DSP"
++  "satadd.h\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "alu_sat")])
++
++(define_insn "satsub_h"
++  [(set (match_operand:HI 0 "register_operand" "=r")
++        (ss_minus:HI (match_operand:HI 1 "register_operand" "r")
++                     (match_operand:HI 2 "register_operand" "r")))]
++  "TARGET_DSP"
++  "satsub.h\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")
++   (set_attr "type" "alu_sat")])
++
++
++;;=============================================================================
++;; smin
++;;-----------------------------------------------------------------------------
++;; Set reg0 to the smallest value of reg1 and reg2. It is used for signed
++;; values in the registers.
++;;=============================================================================
++(define_insn "sminsi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(smin:SI (match_operand:SI 1 "register_operand" "r")
++		 (match_operand:SI 2 "register_operand" "r")))]
++  ""
++  "min     %0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++;;=============================================================================
++;; smax
++;;-----------------------------------------------------------------------------
++;; Set reg0 to the largest value of reg1 and reg2. It is used for signed
++;; values in the registers.
++;;=============================================================================
++(define_insn "smaxsi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(smax:SI (match_operand:SI 1 "register_operand" "r")
++		 (match_operand:SI 2 "register_operand" "r")))]
++  ""
++  "max     %0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++
++
++;;=============================================================================
++;; Logical operations
++;;-----------------------------------------------------------------------------
++
++
++;; Split up simple DImode logical operations.  Simply perform the logical
++;; operation on the upper and lower halves of the registers.
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(match_operator:DI 6 "logical_binary_operator"
++	  [(match_operand:DI 1 "register_operand" "")
++	   (match_operand:DI 2 "register_operand" "")]))]
++  "reload_completed"
++  [(set (match_dup 0) (match_op_dup:SI 6 [(match_dup 1) (match_dup 2)]))
++   (set (match_dup 3) (match_op_dup:SI 6 [(match_dup 4) (match_dup 5)]))]
++  "
++  {
++    operands[3] = gen_highpart (SImode, operands[0]);
++    operands[0] = gen_lowpart (SImode, operands[0]);
++    operands[4] = gen_highpart (SImode, operands[1]);
++    operands[1] = gen_lowpart (SImode, operands[1]);
++    operands[5] = gen_highpart (SImode, operands[2]);
++    operands[2] = gen_lowpart (SImode, operands[2]);
++  }"
++)
++
++;;=============================================================================
++;; Logical operations with shifted operand
++;;=============================================================================
++(define_insn "<code>si_lshift"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (logical:SI (match_operator:SI 4 "logical_shift_operator"
++                                       [(match_operand:SI 2 "register_operand" "r")
++                                        (match_operand:SI 3 "immediate_operand" "Ku05")])
++                    (match_operand:SI 1 "register_operand" "r")))]
++  ""
++  {
++   if ( GET_CODE(operands[4]) == ASHIFT )
++      return "<logical_insn>\t%0, %1, %2 << %3";
++   else
++      return "<logical_insn>\t%0, %1, %2 >> %3";
++      }
++
++  [(set_attr "cc" "set_z")]
++)
++
++
++;;************************************************
++;; Peepholes for detecting logical operantions
++;; with shifted operands
++;;************************************************
++
++(define_peephole
++  [(set (match_operand:SI 3 "register_operand" "")
++        (match_operator:SI 5 "logical_shift_operator"
++                           [(match_operand:SI 1 "register_operand" "")
++                            (match_operand:SI 2 "immediate_operand" "")]))
++   (set (match_operand:SI 0 "register_operand" "")
++        (logical:SI (match_operand:SI 4 "register_operand" "")
++                    (match_dup 3)))]
++  "(dead_or_set_p(insn, operands[3])) || (REGNO(operands[3]) == REGNO(operands[0]))"
++  {
++   if ( GET_CODE(operands[5]) == ASHIFT )
++      return "<logical_insn>\t%0, %4, %1 << %2";
++   else
++      return "<logical_insn>\t%0, %4, %1 >> %2";
++  }
++  [(set_attr "cc" "set_z")]
++  )
++
++(define_peephole
++  [(set (match_operand:SI 3 "register_operand" "")
++        (match_operator:SI 5 "logical_shift_operator"
++                           [(match_operand:SI 1 "register_operand" "")
++                            (match_operand:SI 2 "immediate_operand" "")]))
++   (set (match_operand:SI 0 "register_operand" "")
++        (logical:SI (match_dup 3)
++                    (match_operand:SI 4 "register_operand" "")))]
++  "(dead_or_set_p(insn, operands[3])) || (REGNO(operands[3]) == REGNO(operands[0]))"
++  {
++   if ( GET_CODE(operands[5]) == ASHIFT )
++      return "<logical_insn>\t%0, %4, %1 << %2";
++   else
++      return "<logical_insn>\t%0, %4, %1 >> %2";
++  }
++  [(set_attr "cc" "set_z")]
++  )
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (match_operator:SI 5 "logical_shift_operator"
++                           [(match_operand:SI 1 "register_operand" "")
++                            (match_operand:SI 2 "immediate_operand" "")]))
++   (set (match_operand:SI 3 "register_operand" "")
++        (logical:SI (match_operand:SI 4 "register_operand" "")
++                    (match_dup 0)))]
++  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[3]) == REGNO(operands[0]))"
++
++  [(set (match_dup 3)
++        (logical:SI  (match_op_dup:SI 5 [(match_dup 1) (match_dup 2)])
++                     (match_dup 4)))]
++
++  ""
++)
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (match_operator:SI 5 "logical_shift_operator"
++                           [(match_operand:SI 1 "register_operand" "")
++                            (match_operand:SI 2 "immediate_operand" "")]))
++   (set (match_operand:SI 3 "register_operand" "")
++        (logical:SI (match_dup 0)
++                    (match_operand:SI 4 "register_operand" "")))]
++  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[3]) == REGNO(operands[0]))"
++
++  [(set (match_dup 3)
++        (logical:SI (match_op_dup:SI 5 [(match_dup 1) (match_dup 2)])
++                    (match_dup 4)))]
++
++  ""
++)
++
++
++;;=============================================================================
++;; and
++;;-----------------------------------------------------------------------------
++;; Store the result after a bitwise logical-and between reg0 and reg2 in reg0.
++;;=============================================================================
++
++(define_insn "andnsi"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++        (and:SI (match_dup 0)
++                (not:SI (match_operand:SI 1 "register_operand" "r"))))]
++  ""
++  "andn    %0, %1"
++  [(set_attr "cc" "set_z")
++   (set_attr "length" "2")]
++)
++
++
++(define_insn "andsi3"
++   [(set (match_operand:SI 0 "avr32_rmw_memory_or_register_operand"          "=Y,r,r,r,   r,   r,r,r,r,r")
++ 	(and:SI (match_operand:SI 1 "avr32_rmw_memory_or_register_operand"  "%0,r,0,0,   0,   0,0,0,0,r" )
++ 		(match_operand:SI 2 "nonmemory_operand"                     " N,M,N,Ku16,Ks17,J,L,r,i,r")))]
++  ""
++   "@
++    memc\t%0, %z2
++    bfextu\t%0, %1, 0, %z2
++    cbr\t%0, %z2
++    andl\t%0, %2, COH
++    andl\t%0, lo(%2)
++    andh\t%0, hi(%2), COH
++    andh\t%0, hi(%2)
++    and\t%0, %2
++    andh\t%0, hi(%2)\;andl\t%0, lo(%2)
++    and\t%0, %1, %2"
++
++   [(set_attr "length" "4,4,2,4,4,4,4,2,8,4")
++    (set_attr "cc" "none,set_z,set_z,set_z,set_z,set_z,set_z,set_z,set_z,set_z")])
++
++  
++
++(define_insn "anddi3"
++  [(set (match_operand:DI 0 "register_operand" "=&r,&r")
++	(and:DI (match_operand:DI 1 "register_operand" "%0,r")
++                (match_operand:DI 2 "register_operand" "r,r")))]
++  ""
++  "#"
++  [(set_attr "length" "8")
++   (set_attr "cc" "clobber")]
++)
++
++;;=============================================================================
++;; or
++;;-----------------------------------------------------------------------------
++;; Store the result after a bitwise inclusive-or between reg0 and reg2 in reg0.
++;;=============================================================================
++
++(define_insn "iorsi3"
++  [(set (match_operand:SI 0 "avr32_rmw_memory_or_register_operand"          "=Y,r,r,   r,r,r,r")
++	(ior:SI (match_operand:SI 1 "avr32_rmw_memory_or_register_operand"  "%0,0,0,   0,0,0,r" )
++		(match_operand:SI 2 "nonmemory_operand"                     " O,O,Ku16,J,r,i,r")))]
++  ""
++  "@
++   mems\t%0, %p2
++   sbr\t%0, %p2
++   orl\t%0, %2
++   orh\t%0, hi(%2)
++   or\t%0, %2
++   orh\t%0, hi(%2)\;orl\t%0, lo(%2)
++   or\t%0, %1, %2"
++
++  [(set_attr "length" "4,2,4,4,2,8,4")
++   (set_attr "cc" "none,set_z,set_z,set_z,set_z,set_z,set_z")])
++
++
++(define_insn "iordi3"
++  [(set (match_operand:DI 0 "register_operand" "=&r,&r")
++	(ior:DI (match_operand:DI 1 "register_operand" "%0,r")
++                (match_operand:DI 2 "register_operand" "r,r")))]
++  ""
++  "#"
++  [(set_attr "length" "8")
++   (set_attr "cc" "clobber")]
++)
++
++;;=============================================================================
++;; xor bytes
++;;-----------------------------------------------------------------------------
++;; Store the result after a bitwise exclusive-or between reg0 and reg2 in reg0.
++;;=============================================================================
++
++(define_insn "xorsi3"
++   [(set (match_operand:SI 0 "avr32_rmw_memory_or_register_operand"          "=Y,r,   r,r,r,r")
++ 	(xor:SI (match_operand:SI 1 "avr32_rmw_memory_or_register_operand"  "%0,0,   0,0,0,r" )
++ 		(match_operand:SI 2 "nonmemory_operand"                     " O,Ku16,J,r,i,r")))]
++  ""
++   "@
++    memt\t%0, %p2
++    eorl\t%0, %2
++    eorh\t%0, hi(%2)
++    eor\t%0, %2
++    eorh\t%0, hi(%2)\;eorl\t%0, lo(%2)
++    eor\t%0, %1, %2"
++
++   [(set_attr "length" "4,4,4,2,8,4")
++    (set_attr "cc" "none,set_z,set_z,set_z,set_z,set_z")])
++
++(define_insn "xordi3"
++  [(set (match_operand:DI 0 "register_operand" "=&r,&r")
++	(xor:DI (match_operand:DI 1 "register_operand" "%0,r")
++                (match_operand:DI 2 "register_operand" "r,r")))]
++  ""
++  "#"
++  [(set_attr "length" "8")
++   (set_attr "cc" "clobber")]
++)
++
++;;=============================================================================
++;; Three operand predicable insns
++;;=============================================================================
++
++(define_insn "<predicable_insn3><mode>_predicable"
++  [(set (match_operand:INTM 0 "register_operand" "=r")
++	(predicable_op3:INTM (match_operand:INTM 1 "register_operand" "<predicable_commutative3>r")
++                             (match_operand:INTM 2 "register_operand" "r")))]
++  "TARGET_V2_INSNS"
++  "<predicable_insn3>%?\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")]
++)
++
++(define_insn_and_split "<predicable_insn3><mode>_imm_clobber_predicable"
++  [(parallel 
++    [(set (match_operand:INTM 0 "register_operand" "=r")
++          (predicable_op3:INTM (match_operand:INTM 1 "register_operand" "<predicable_commutative3>r")
++                               (match_operand:INTM 2 "avr32_mov_immediate_operand" "JKs21")))
++     (clobber (match_operand:INTM 3 "register_operand" "=&r"))])]
++  "TARGET_V2_INSNS"
++  {
++   if ( current_insn_predicate != NULL_RTX ) 
++      {
++       if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks08") )
++          return "%! mov%?\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
++       else if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks21") )
++          return "%! mov\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
++       else
++          return "%! movh\t%3, hi(%2)\;<predicable_insn3>%?\t%0, %1, %3";
++       }
++   else
++      {
++       if ( !avr32_cond_imm_clobber_splittable (insn, operands) )
++          {
++                if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks08") )
++                   return "mov%?\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
++                else if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks21") )
++                   return "mov\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
++                else
++                   return "movh\t%3, hi(%2)\;<predicable_insn3>%?\t%0, %1, %3";
++          }
++       return "#";
++      }
++      
++  }
++  ;; If we find out that we could not actually do if-conversion on the block
++  ;; containing this insn we convert it back to normal immediate format
++  ;; to avoid outputing a redundant move insn
++  ;; Do not split until after we have checked if we can make the insn 
++  ;; conditional.
++  "(GET_CODE (PATTERN (insn)) != COND_EXEC
++    && cfun->machine->ifcvt_after_reload
++    && avr32_cond_imm_clobber_splittable (insn, operands))"
++  [(set (match_dup 0)
++        (predicable_op3:INTM (match_dup 1)
++                             (match_dup 2)))]
++  ""
++  [(set_attr "length" "8")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")]
++  )
++
++
++;;=============================================================================
++;; Zero extend predicable insns
++;;=============================================================================
++(define_insn_and_split "zero_extendhisi_clobber_predicable"
++  [(parallel 
++    [(set (match_operand:SI 0 "register_operand" "=r")
++          (zero_extend:SI (match_operand:HI 1 "register_operand" "r")))
++     (clobber (match_operand:SI 2 "register_operand" "=&r"))])]
++  "TARGET_V2_INSNS"
++  {
++   if ( current_insn_predicate != NULL_RTX ) 
++      {
++         return "%! mov\t%2, 0xffff\;and%?\t%0, %1, %2";
++       }
++   else
++      {
++       return "#";
++      }
++      
++  }
++  ;; If we find out that we could not actually do if-conversion on the block
++  ;; containing this insn we convert it back to normal immediate format
++  ;; to avoid outputing a redundant move insn
++  ;; Do not split until after we have checked if we can make the insn 
++  ;; conditional.
++  "(GET_CODE (PATTERN (insn)) != COND_EXEC
++    && cfun->machine->ifcvt_after_reload)"
++  [(set (match_dup 0)
++        (zero_extend:SI (match_dup 1)))]
++  ""
++  [(set_attr "length" "8")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")]
++  )
++
++(define_insn_and_split "zero_extendqisi_clobber_predicable"
++  [(parallel 
++    [(set (match_operand:SI 0 "register_operand" "=r")
++          (zero_extend:SI (match_operand:QI 1 "register_operand" "r")))
++     (clobber (match_operand:SI 2 "register_operand" "=&r"))])]
++  "TARGET_V2_INSNS"
++  {
++   if ( current_insn_predicate != NULL_RTX ) 
++      {
++         return "%! mov\t%2, 0xff\;and%?\t%0, %1, %2";
++       }
++   else
++      {
++       return "#";
++      }
++      
++  }
++  ;; If we find out that we could not actually do if-conversion on the block
++  ;; containing this insn we convert it back to normal immediate format
++  ;; to avoid outputing a redundant move insn
++  ;; Do not split until after we have checked if we can make the insn 
++  ;; conditional.
++  "(GET_CODE (PATTERN (insn)) != COND_EXEC
++    && cfun->machine->ifcvt_after_reload)"
++  [(set (match_dup 0)
++        (zero_extend:SI (match_dup 1)))]
++  ""
++  [(set_attr "length" "8")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")]
++  )
++
++(define_insn_and_split "zero_extendqihi_clobber_predicable"
++  [(parallel 
++    [(set (match_operand:HI 0 "register_operand" "=r")
++          (zero_extend:HI (match_operand:QI 1 "register_operand" "r")))
++     (clobber (match_operand:SI 2 "register_operand" "=&r"))])]
++  "TARGET_V2_INSNS"
++  {
++   if ( current_insn_predicate != NULL_RTX ) 
++      {
++         return "%! mov\t%2, 0xff\;and%?\t%0, %1, %2";
++       }
++   else
++      {
++       return "#";
++      }
++      
++  }
++  ;; If we find out that we could not actually do if-conversion on the block
++  ;; containing this insn we convert it back to normal immediate format
++  ;; to avoid outputing a redundant move insn
++  ;; Do not split until after we have checked if we can make the insn 
++  ;; conditional.
++  "(GET_CODE (PATTERN (insn)) != COND_EXEC
++    && cfun->machine->ifcvt_after_reload)"
++  [(set (match_dup 0)
++        (zero_extend:HI (match_dup 1)))]
++  ""
++  [(set_attr "length" "8")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")]
++  )
++;;=============================================================================
++;; divmod
++;;-----------------------------------------------------------------------------
++;; Signed division that produces both a quotient and a remainder.
++;;=============================================================================
++
++(define_expand "divmodsi4"
++  [(parallel [
++     (parallel [
++       (set (match_operand:SI 0 "register_operand" "=r")
++	    (div:SI (match_operand:SI 1 "register_operand" "r")
++		    (match_operand:SI 2 "register_operand" "r")))
++       (set (match_operand:SI 3 "register_operand" "=r")
++	    (mod:SI (match_dup 1)
++		    (match_dup 2)))])
++     (use (match_dup 4))])]
++  ""
++  {
++    if (can_create_pseudo_p ()) {
++      operands[4] = gen_reg_rtx (DImode);
++      emit_insn(gen_divmodsi4_internal(operands[4],operands[1],operands[2]));
++      emit_move_insn(operands[0], gen_rtx_SUBREG( SImode, operands[4], 4));
++      emit_move_insn(operands[3], gen_rtx_SUBREG( SImode, operands[4], 0));
++      DONE;
++    } else {
++      FAIL;
++    }
++  })
++
++
++(define_insn "divmodsi4_internal"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(unspec:DI [(match_operand:SI 1 "register_operand" "r")
++		    (match_operand:SI 2 "register_operand" "r")]
++		   UNSPEC_DIVMODSI4_INTERNAL))]
++  ""
++  "divs    %0, %1, %2"
++  [(set_attr "type" "div")
++   (set_attr "cc" "none")])
++
++
++;;=============================================================================
++;; udivmod
++;;-----------------------------------------------------------------------------
++;; Unsigned division that produces both a quotient and a remainder.
++;;=============================================================================
++(define_expand "udivmodsi4"
++ [(parallel [
++    (parallel [
++      (set (match_operand:SI 0 "register_operand" "=r")
++	   (udiv:SI (match_operand:SI 1 "register_operand" "r")
++		    (match_operand:SI 2 "register_operand" "r")))
++      (set (match_operand:SI 3 "register_operand" "=r")
++	   (umod:SI (match_dup 1)
++		    (match_dup 2)))])
++    (use (match_dup 4))])]
++  ""
++  {
++    if (can_create_pseudo_p ()) {
++      operands[4] = gen_reg_rtx (DImode);
++
++      emit_insn(gen_udivmodsi4_internal(operands[4],operands[1],operands[2]));
++      emit_move_insn(operands[0], gen_rtx_SUBREG( SImode, operands[4], 4));
++      emit_move_insn(operands[3], gen_rtx_SUBREG( SImode, operands[4], 0));
++
++      DONE;
++    } else {
++      FAIL;
++    }
++  })
++
++(define_insn "udivmodsi4_internal"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(unspec:DI [(match_operand:SI 1 "register_operand" "r")
++		    (match_operand:SI 2 "register_operand" "r")]
++		   UNSPEC_UDIVMODSI4_INTERNAL))]
++  ""
++  "divu    %0, %1, %2"
++  [(set_attr "type" "div")
++   (set_attr "cc" "none")])
++
++
++;;=============================================================================
++;; Arithmetic-shift left
++;;-----------------------------------------------------------------------------
++;; Arithmetic-shift reg0 left by reg2 or immediate value.
++;;=============================================================================
++
++(define_insn "ashlsi3"
++  [(set (match_operand:SI 0 "register_operand"                      "=r,r,r")
++	(ashift:SI (match_operand:SI 1 "register_operand"           "r,0,r")
++		   (match_operand:SI 2 "register_const_int_operand" "r,Ku05,Ku05")))]
++  ""
++  "@
++   lsl     %0, %1, %2
++   lsl     %0, %2
++   lsl     %0, %1, %2"
++  [(set_attr "length" "4,2,4")
++   (set_attr "cc" "set_ncz")])
++
++;;=============================================================================
++;; Arithmetic-shift right
++;;-----------------------------------------------------------------------------
++;; Arithmetic-shift reg0 right by an immediate value.
++;;=============================================================================
++
++(define_insn "ashrsi3"
++  [(set (match_operand:SI 0 "register_operand"                        "=r,r,r")
++	(ashiftrt:SI (match_operand:SI 1 "register_operand"           "r,0,r")
++		     (match_operand:SI 2 "register_const_int_operand" "r,Ku05,Ku05")))]
++  ""
++  "@
++   asr     %0, %1, %2
++   asr     %0, %2
++   asr     %0, %1, %2"
++  [(set_attr "length" "4,2,4")
++   (set_attr "cc" "set_ncz")])
++
++;;=============================================================================
++;; Logical shift right
++;;-----------------------------------------------------------------------------
++;; Logical shift reg0 right by an immediate value.
++;;=============================================================================
++
++(define_insn "lshrsi3"
++  [(set (match_operand:SI 0 "register_operand"                        "=r,r,r")
++	(lshiftrt:SI (match_operand:SI 1 "register_operand"           "r,0,r")
++		     (match_operand:SI 2 "register_const_int_operand" "r,Ku05,Ku05")))]
++  ""
++  "@
++   lsr     %0, %1, %2
++   lsr     %0, %2
++   lsr     %0, %1, %2"
++  [(set_attr "length" "4,2,4")
++   (set_attr "cc" "set_ncz")])
++
++
++;;=============================================================================
++;; neg
++;;-----------------------------------------------------------------------------
++;; Negate operand 1 and store the result in operand 0.
++;;=============================================================================
++(define_insn "negsi2"
++  [(set (match_operand:SI 0 "register_operand" "=r,r")
++	(neg:SI (match_operand:SI 1 "register_operand" "0,r")))]
++  ""
++  "@
++   neg\t%0
++   rsub\t%0, %1, 0"
++  [(set_attr "length" "2,4")
++   (set_attr "cc" "set_vncz")])
++
++(define_insn "negsi2_predicable"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++	(neg:SI (match_dup 0)))]
++  "TARGET_V2_INSNS"
++  "rsub%?\t%0, 0"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")])
++
++;;=============================================================================
++;; abs
++;;-----------------------------------------------------------------------------
++;; Store the absolute value of operand 1 into operand 0.
++;;=============================================================================
++(define_insn "abssi2"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(abs:SI (match_operand:SI 1 "register_operand" "0")))]
++  ""
++  "abs\t%0"
++  [(set_attr "length" "2")
++   (set_attr "cc" "set_z")])
++
++
++;;=============================================================================
++;; one_cmpl
++;;-----------------------------------------------------------------------------
++;; Store the bitwise-complement of operand 1 into operand 0.
++;;=============================================================================
++
++(define_insn "one_cmplsi2"
++  [(set (match_operand:SI 0 "register_operand" "=r,r")
++	(not:SI (match_operand:SI 1 "register_operand" "0,r")))]
++  ""
++  "@
++   com\t%0
++   rsub\t%0, %1, -1"
++  [(set_attr "length" "2,4")
++   (set_attr "cc" "set_z")])
++
++
++(define_insn "one_cmplsi2_predicable"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++	(not:SI (match_dup 0)))]
++  "TARGET_V2_INSNS"
++  "rsub%?\t%0, -1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "predicable" "yes")])
++
++
++;;=============================================================================
++;; Bit load
++;;-----------------------------------------------------------------------------
++;; Load a bit into Z and C flags
++;;=============================================================================
++(define_insn "bldsi"
++  [(set (cc0)
++        (and:SI (match_operand:SI 0 "register_operand" "r")
++                (match_operand:SI 1 "one_bit_set_operand" "i")))]
++  ""
++  "bld\t%0, %p1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "bld")]
++  )
++
++
++;;=============================================================================
++;; Compare
++;;-----------------------------------------------------------------------------
++;; Compare reg0 with reg1 or an immediate value.
++;;=============================================================================
++
++(define_expand "cmp<mode>"
++  [(set (cc0)
++	(compare:CMP
++	 (match_operand:CMP 0 "register_operand" "")
++	 (match_operand:CMP 1 "<CMP:cmp_predicate>"  "")))]
++  ""
++  "{
++   avr32_compare_op0 = operands[0];
++   avr32_compare_op1 = operands[1];
++  }"
++)
++
++(define_insn "cmp<mode>_internal"
++  [(set (cc0)
++        (compare:CMP
++         (match_operand:CMP 0 "register_operand" "r")
++         (match_operand:CMP 1 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")))]
++  ""
++  {
++switch(GET_MODE(operands[0]))
++  {
++  case QImode:
++	avr32_branch_type = CMP_QI;
++	break;
++  case HImode:
++	avr32_branch_type = CMP_HI;
++	break;
++  case SImode:
++	avr32_branch_type = CMP_SI;
++	break;
++  case DImode:
++	avr32_branch_type = CMP_DI;
++	break;
++  default:
++	abort();
++  }
++   /* Check if the next insn already will output a compare. */
++   if (!next_insn_emits_cmp (insn))  
++     set_next_insn_cond(insn,
++                        avr32_output_cmp(get_next_insn_cond(insn), GET_MODE (operands[0]), operands[0], operands[1]));
++   return "";
++  }
++  [(set_attr "length" "4")
++   (set_attr "cc" "compare")])
++
++(define_expand "cmpsf"
++  [(set (cc0)
++	(compare:SF
++	 (match_operand:SF 0 "general_operand" "")
++	 (match_operand:SF 1 "general_operand"  "")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "{
++   if ( !REG_P(operands[0]) )
++     operands[0] = force_reg(SFmode, operands[0]);
++
++   if ( !REG_P(operands[1]) )
++     operands[1] = force_reg(SFmode, operands[1]);
++
++   avr32_compare_op0 = operands[0];
++   avr32_compare_op1 = operands[1];
++   emit_insn(gen_cmpsf_internal_uc3fp(operands[0], operands[1]));
++   DONE;
++  }"
++)
++
++;;;=============================================================================
++;; Test if zero
++;;-----------------------------------------------------------------------------
++;; Compare reg against zero and set the condition codes.
++;;=============================================================================
++
++
++(define_expand "tstsi"
++  [(set (cc0)
++	(match_operand:SI 0 "register_operand" ""))]
++  ""
++  {
++   avr32_compare_op0 = operands[0];
++   avr32_compare_op1 = const0_rtx;
++  }
++)
++
++(define_insn "tstsi_internal"
++  [(set (cc0)
++	(match_operand:SI 0 "register_operand" "r"))]
++  ""
++  {
++   /* Check if the next insn already will output a compare. */
++   if (!next_insn_emits_cmp (insn))  
++     set_next_insn_cond(insn,
++                        avr32_output_cmp(get_next_insn_cond(insn), SImode, operands[0], const0_rtx));
++
++   return "";
++  }
++  [(set_attr "length" "2")
++   (set_attr "cc" "compare")])
++
++
++(define_expand "tstdi"
++  [(set (cc0)
++	(match_operand:DI 0 "register_operand" ""))]
++  ""
++  {
++   avr32_compare_op0 = operands[0];
++   avr32_compare_op1 = const0_rtx;
++  }
++)
++
++(define_insn "tstdi_internal"
++  [(set (cc0)
++	(match_operand:DI 0 "register_operand" "r"))]
++  ""
++  {
++   /* Check if the next insn already will output a compare. */
++   if (!next_insn_emits_cmp (insn))  
++     set_next_insn_cond(insn,
++                        avr32_output_cmp(get_next_insn_cond(insn), DImode, operands[0], const0_rtx));
++   return "";
++  }
++  [(set_attr "length" "4")
++   (set_attr "type" "alu2")
++   (set_attr "cc" "compare")])
++
++
++
++;;=============================================================================
++;; Convert operands
++;;-----------------------------------------------------------------------------
++;;
++;;=============================================================================
++(define_insn "truncdisi2"
++  [(set (match_operand:SI 0 "general_operand" "")
++	(truncate:SI (match_operand:DI 1 "general_operand" "")))]
++  ""
++  "truncdisi2")
++
++;;=============================================================================
++;; Extend
++;;-----------------------------------------------------------------------------
++;;
++;;=============================================================================
++
++
++(define_insn "extendhisi2"
++  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
++	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
++  ""
++  {
++   switch ( which_alternative ){
++     case 0:
++       return    "casts.h\t%0";
++     case 1:
++       return    "bfexts\t%0, %1, 0, 16";
++     case 2:
++     case 3:
++       return    "ld.sh\t%0, %1";
++     default:
++       abort();
++   }
++  }
++  [(set_attr "length" "2,4,2,4")
++   (set_attr "cc" "set_ncz,set_ncz,none,none")
++   (set_attr "type" "alu,alu,load_rm,load_rm")])
++
++(define_insn "extendqisi2"
++  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
++	(sign_extend:SI (match_operand:QI 1 "extendqi_operand" "0,r,RKu00,m")))]
++  ""
++  {
++   switch ( which_alternative ){
++     case 0:
++       return    "casts.b\t%0";
++     case 1:
++       return    "bfexts\t%0, %1, 0, 8";
++     case 2:
++     case 3:
++       return    "ld.sb\t%0, %1";
++     default:
++       abort();
++   }
++  }
++  [(set_attr "length" "2,4,2,4")
++   (set_attr "cc" "set_ncz,set_ncz,none,none")
++   (set_attr "type" "alu,alu,load_rm,load_rm")])
++
++(define_insn "extendqihi2"
++  [(set (match_operand:HI 0 "register_operand" "=r,r,r,r")
++	(sign_extend:HI (match_operand:QI 1 "extendqi_operand" "0,r,RKu00,m")))]
++  ""
++  {
++   switch ( which_alternative ){
++     case 0:
++       return    "casts.b\t%0";
++     case 1:
++       return    "bfexts\t%0, %1, 0, 8";
++     case 2:
++     case 3:
++       return    "ld.sb\t%0, %1";
++     default:
++       abort();
++   }
++  }
++  [(set_attr "length" "2,4,2,4")
++   (set_attr "cc" "set_ncz,set_ncz,none,none")
++   (set_attr "type" "alu,alu,load_rm,load_rm")])
++
++
++;;=============================================================================
++;; Zero-extend
++;;-----------------------------------------------------------------------------
++;;
++;;=============================================================================
++
++(define_insn "zero_extendhisi2"
++  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
++	(zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
++  ""
++  {
++   switch ( which_alternative ){
++     case 0:
++       return    "castu.h\t%0";
++     case 1:
++       return    "bfextu\t%0, %1, 0, 16";
++     case 2:
++     case 3:
++       return    "ld.uh\t%0, %1";
++     default:
++       abort();
++   }
++  }
++
++  [(set_attr "length" "2,4,2,4")
++   (set_attr "cc" "set_ncz,set_ncz,none,none")
++   (set_attr "type" "alu,alu,load_rm,load_rm")])
++
++(define_insn "zero_extendqisi2"
++  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
++	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
++  ""
++  {
++   switch ( which_alternative ){
++     case 0:
++       return    "castu.b\t%0";
++     case 1:
++       return    "bfextu\t%0, %1, 0, 8";
++     case 2:
++     case 3:
++       return    "ld.ub\t%0, %1";
++     default:
++       abort();
++   }
++  }
++  [(set_attr "length" "2,4,2,4")
++   (set_attr "cc" "set_ncz, set_ncz, none, none")
++   (set_attr "type" "alu, alu, load_rm, load_rm")])
++
++(define_insn "zero_extendqihi2"
++  [(set (match_operand:HI 0 "register_operand" "=r,r,r,r")
++	(zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
++  ""
++  {
++   switch ( which_alternative ){
++     case 0:
++       return    "castu.b\t%0";
++     case 1:
++       return    "bfextu\t%0, %1, 0, 8";
++     case 2:
++     case 3:
++       return    "ld.ub\t%0, %1";
++     default:
++       abort();
++   }
++  }
++  [(set_attr "length" "2,4,2,4")
++   (set_attr "cc" "set_ncz, set_ncz, none, none")
++   (set_attr "type" "alu, alu, load_rm, load_rm")])
++
++
++;;=============================================================================
++;; Conditional load and extend insns
++;;=============================================================================
++(define_insn "ldsi<mode>_predicable_se"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (sign_extend:SI 
++         (match_operand:INTM 1 "memory_operand" "<INTM:pred_mem_constraint>")))]
++  "TARGET_V2_INSNS"
++  "ld<INTM:load_postfix_s>%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "type" "load")
++   (set_attr "predicable" "yes")]
++)
++
++(define_insn "ldsi<mode>_predicable_ze"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (zero_extend:SI 
++         (match_operand:INTM 1 "memory_operand" "<INTM:pred_mem_constraint>")))]
++  "TARGET_V2_INSNS"
++  "ld<INTM:load_postfix_u>%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "type" "load")
++   (set_attr "predicable" "yes")]
++)
++
++(define_insn "ldhi_predicable_ze"
++  [(set (match_operand:HI 0 "register_operand" "=r")
++        (zero_extend:HI 
++         (match_operand:QI 1 "memory_operand" "RKs10")))]
++  "TARGET_V2_INSNS"
++  "ld.ub%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "type" "load")
++   (set_attr "predicable" "yes")]
++)
++
++(define_insn "ldhi_predicable_se"
++  [(set (match_operand:HI 0 "register_operand" "=r")
++        (sign_extend:HI 
++         (match_operand:QI 1 "memory_operand" "RKs10")))]
++  "TARGET_V2_INSNS"
++  "ld.sb%?\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "cmp_cond_insn")
++   (set_attr "type" "load")
++   (set_attr "predicable" "yes")]
++)
++
++;;=============================================================================
++;; Conditional set register
++;; sr{cond4}  rd
++;;-----------------------------------------------------------------------------
++
++;;Because of the same issue as with conditional moves and adds we must
++;;not separate the compare instrcution from the scc instruction as
++;;they might be sheduled "badly".
++
++(define_expand "s<code>"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(any_cond:SI (cc0)
++                     (const_int 0)))]
++""
++{
++  if(TARGET_HARD_FLOAT && TARGET_ARCH_FPU)
++    FAIL;
++})
++
++(define_insn "*s<code>"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(any_cond:SI (cc0)
++                     (const_int 0)))]
++  ""
++{
++    return "sr<cond>\t%0";
++}
++[(set_attr "length" "2")
++(set_attr "cc" "none")])
++
++(define_insn "seq"
++[(set (match_operand:SI 0 "register_operand" "=r")
++(eq:SI (cc0)
++				 (const_int 0)))]
++  ""
++"sreq\t%0"
++[(set_attr "length" "2")
++(set_attr "cc" "none")])
++
++(define_insn "sne"
++[(set (match_operand:SI 0 "register_operand" "=r")
++(ne:SI (cc0)
++				 (const_int 0)))]
++  ""
++"srne\t%0"
++  [(set_attr "length" "2")
++   (set_attr "cc" "none")])
++
++(define_insn "smi"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(unspec:SI [(cc0)
++                    (const_int 0)] UNSPEC_COND_MI))]
++  ""
++  "srmi\t%0"
++  [(set_attr "length" "2")
++   (set_attr "cc" "none")])
++
++(define_insn "spl"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(unspec:SI [(cc0)
++                    (const_int 0)] UNSPEC_COND_PL))]
++  ""
++  "srpl\t%0"
++  [(set_attr "length" "2")
++   (set_attr "cc" "none")])
++
++
++;;=============================================================================
++;; Conditional branch
++;;-----------------------------------------------------------------------------
++;; Branch to label if the specified condition codes are set.
++;;=============================================================================
++; branch if negative
++(define_insn "bmi"
++  [(set (pc)
++	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_MI)
++		      (label_ref (match_operand 0 "" ""))
++		      (pc)))]
++  ""
++  "brmi    %0"
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++(define_insn "*bmi-reverse"
++  [(set (pc)
++	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_MI)
++		      (pc)
++		      (label_ref (match_operand 0 "" ""))))]
++  ""
++  "brpl    %0"
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++; branch if positive
++(define_insn "bpl"
++  [(set (pc)
++	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_PL)
++		      (label_ref (match_operand 0 "" ""))
++		      (pc)))]
++  ""
++  "brpl    %0"
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++(define_insn "*bpl-reverse"
++  [(set (pc)
++	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_PL)
++		      (pc)
++		      (label_ref (match_operand 0 "" ""))))]
++  ""
++  "brmi    %0"
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++; branch if equal
++(define_insn "b<code>"
++  [(set (pc)
++	(if_then_else (any_cond_b:CC (cc0)
++			  (const_int 0))
++		      (label_ref (match_operand 0 "" ""))
++		      (pc)))]
++  ""
++  {
++    if (TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
++       return get_attr_length(insn) == 6 ? "brvs .+6\;br<cond> %0" : "brvs .+8\;br<cond> %0";
++    else
++       return "br<cond> %0";
++  }
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(if_then_else (eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
++		      (if_then_else 
++			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++		                 (const_int 6)
++		                 (const_int 8))
++		      (if_then_else 
++			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++				    (const_int 2)
++				    (const_int 4))))
++   (set_attr "cc" "none")])
++
++(define_insn "beq"
++  [(set (pc)
++	(if_then_else (eq:CC (cc0)
++			  (const_int 0))
++		      (label_ref (match_operand 0 "" ""))
++		      (pc)))]
++  ""
++  "breq %0";
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++(define_insn "bne"
++  [(set (pc)
++	(if_then_else (ne:CC (cc0)
++			  (const_int 0))
++		      (label_ref (match_operand 0 "" ""))
++		      (pc)))]
++  ""
++  "brne %0";
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++(define_insn "b<code>"
++  [(set (pc)
++	(if_then_else (any_cond4:CC (cc0)
++			  (const_int 0))
++		      (label_ref (match_operand 0 "" ""))
++		      (pc)))]
++  ""
++  {
++	if(TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
++		return "brvs .+8\;br<cond> %l0";
++	else
++		return "br<cond> %l0";
++  }
++  [(set_attr "type" "branch")
++   (set (attr "length") 
++    (cond [(eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
++		       (const_int 8)]
++               (const_int 4)))
++   (set_attr "cc" "none")])
++
++(define_insn "*b<code>-reverse"
++  [(set (pc)
++	(if_then_else (any_cond_b:CC (cc0)
++			  (const_int 0))
++		      (pc)
++		      (label_ref (match_operand 0 "" ""))))]
++  ""
++  {
++    if (TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
++       return "brvs %0\;br<invcond> %0";
++    else
++       return "br<invcond> %0";
++  }
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(if_then_else (eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
++		      (if_then_else 
++			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++		                 (const_int 6)
++		                 (const_int 8))
++		      (if_then_else 
++			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++				    (const_int 2)
++				    (const_int 4))))
++   (set_attr "cc" "none")])
++
++(define_insn "*beq-reverse"
++  [(set (pc)
++	(if_then_else (eq:CC (cc0)
++			  (const_int 0))
++		      (pc)
++		      (label_ref (match_operand 0 "" ""))))]
++  ""
++  "brne %0";
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++(define_insn "*bne-reverse"
++  [(set (pc)
++	(if_then_else (ne:CC (cc0)
++			  (const_int 0))
++		      (pc)
++		      (label_ref (match_operand 0 "" ""))))]
++  ""
++  "breq %0";
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
++		    (le (minus (pc) (match_dup 0)) (const_int 256)))
++	       (const_int 2)] ; use compact branch
++              (const_int 4))) ; use extended branch
++   (set_attr "cc" "none")])
++
++(define_insn "*b<code>-reverse"
++  [(set (pc)
++	(if_then_else (any_cond4:CC (cc0)
++			  (const_int 0))
++		      (pc)
++		      (label_ref (match_operand 0 "" ""))))]
++  ""
++  {
++    if (TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
++       return "brvs %l0\;br<invcond> %l0";
++    else
++       return "br<invcond> %0";
++  }
++  [(set_attr "type" "branch")
++   (set (attr "length") 
++    (cond [(eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
++		       (const_int 8)]
++               (const_int 4)))
++   (set_attr "cc" "none")])
++
++;=============================================================================
++; Conditional Add/Subtract
++;-----------------------------------------------------------------------------
++; sub{cond4}  Rd, imm
++;=============================================================================
++
++
++(define_expand "add<mode>cc"
++  [(set (match_operand:ADDCC 0 "register_operand" "")
++        (if_then_else:ADDCC (match_operator 1 "avr32_comparison_operator" 
++                                            [(match_dup 4)
++                                             (match_dup 5)])
++                            (match_operand:ADDCC 2 "register_operand" "")
++                            (plus:ADDCC 
++                             (match_dup 2)
++                             (match_operand:ADDCC 3 "" ""))))]
++  ""
++  {
++   if ( !(GET_CODE (operands[3]) == CONST_INT
++          || (TARGET_V2_INSNS && REG_P(operands[3]))) ){
++      FAIL;
++   }
++
++   /* Delete compare instruction as it is merged into this instruction */
++   remove_insn (get_last_insn_anywhere ());
++
++   operands[4] = avr32_compare_op0;
++   operands[5] = avr32_compare_op1;
++   
++   if ( TARGET_V2_INSNS 
++        && REG_P(operands[3]) 
++        && REGNO(operands[0]) != REGNO(operands[2]) ){
++       emit_move_insn (operands[0], operands[2]);
++       operands[2] = operands[0];
++   }
++  }
++  )
++
++(define_insn "add<ADDCC:mode>cc_cmp<CMP:mode>_reg"
++  [(set (match_operand:ADDCC 0 "register_operand" "=r")
++        (if_then_else:ADDCC (match_operator 1 "avr32_comparison_operator" 
++                                            [(match_operand:CMP 4 "register_operand" "r")
++                                             (match_operand:CMP 5 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")])
++                            (match_dup 0)
++                            (plus:ADDCC 
++                             (match_operand:ADDCC 2 "register_operand" "r")
++                             (match_operand:ADDCC 3 "register_operand" "r"))))]
++  "TARGET_V2_INSNS"
++  {
++   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
++   return "add%i1\t%0, %2, %3";
++  }
++  [(set_attr "length" "8")
++   (set_attr "cc" "cmp_cond_insn")])
++
++(define_insn "add<ADDCC:mode>cc_cmp<CMP:mode>"
++  [(set (match_operand:ADDCC 0 "register_operand" "=r")
++        (if_then_else:ADDCC (match_operator 1 "avr32_comparison_operator" 
++                                            [(match_operand:CMP 4 "register_operand" "r")
++                                             (match_operand:CMP 5 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")])
++                            (match_operand:ADDCC 2 "register_operand" "0")
++                            (plus:ADDCC 
++                             (match_dup 2)
++                             (match_operand:ADDCC 3 "avr32_cond_immediate_operand" "Is08"))))]
++  ""
++  {
++   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
++   return "sub%i1\t%0, -%3";
++  }
++  [(set_attr "length" "8")
++   (set_attr "cc" "cmp_cond_insn")])
++
++;=============================================================================
++; Conditional Move
++;-----------------------------------------------------------------------------
++; mov{cond4}  Rd, (Rs/imm)
++;=============================================================================
++(define_expand "mov<mode>cc"
++  [(set (match_operand:MOVCC 0 "register_operand" "")
++        (if_then_else:MOVCC (match_operator 1 "avr32_comparison_operator" 
++                                            [(match_dup 4)
++                                             (match_dup 5)])
++                            (match_operand:MOVCC 2 "avr32_cond_register_immediate_operand" "")
++                            (match_operand:MOVCC 3 "avr32_cond_register_immediate_operand" "")))]
++  ""
++  {
++   /* Delete compare instruction as it is merged into this instruction */
++   remove_insn (get_last_insn_anywhere ());
++
++   operands[4] = avr32_compare_op0;
++   operands[5] = avr32_compare_op1;
++  }
++  )
++
++
++(define_insn "mov<MOVCC:mode>cc_cmp<CMP:mode>"
++  [(set (match_operand:MOVCC 0 "register_operand" "=r,r,r")
++        (if_then_else:MOVCC (match_operator 1 "avr32_comparison_operator" 
++                                            [(match_operand:CMP 4 "register_operand" "r,r,r")
++                                             (match_operand:CMP 5 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>,<CMP:cmp_constraint>,<CMP:cmp_constraint>")])
++                            (match_operand:MOVCC 2 "avr32_cond_register_immediate_operand" "0, rKs08,rKs08")
++                            (match_operand:MOVCC 3 "avr32_cond_register_immediate_operand" "rKs08,0,rKs08")))]
++  ""
++  {
++   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
++           
++   switch( which_alternative ){
++    case 0:
++      return "mov%i1    %0, %3";
++    case 1:
++      return "mov%1    %0, %2";
++    case 2:
++      return "mov%1    %0, %2\;mov%i1    %0, %3";
++    default:
++      abort();
++    }
++
++  }
++  [(set_attr "length" "8,8,12")
++   (set_attr "cc" "cmp_cond_insn")])
++
++  
++
++
++;;=============================================================================
++;; jump
++;;-----------------------------------------------------------------------------
++;; Jump inside a function; an unconditional branch to a label.
++;;=============================================================================
++(define_insn "jump"
++  [(set (pc)
++	(label_ref (match_operand 0 "" "")))]
++  ""
++  {
++    if (get_attr_length(insn) > 4)
++      return "Can't jump this far";
++    return (get_attr_length(insn) == 2 ?
++	    "rjmp    %0" : "bral    %0");
++  }
++  [(set_attr "type" "branch")
++   (set (attr "length")
++	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 1022))
++		    (le (minus (pc) (match_dup 0)) (const_int 1024)))
++	       (const_int 2) ; use rjmp
++	       (le (match_dup 0) (const_int 1048575))
++	       (const_int 4)] ; use bral
++	      (const_int 8))) ; do something else
++   (set_attr "cc" "none")])
++
++;;=============================================================================
++;; call
++;;-----------------------------------------------------------------------------
++;; Subroutine call instruction returning no value.
++;;=============================================================================
++(define_insn "call_internal"
++  [(parallel [(call (mem:SI (match_operand:SI 0 "avr32_call_operand" "r,U,T,W"))
++                    (match_operand 1 "" ""))
++              (clobber (reg:SI LR_REGNUM))])]
++  ""
++  {
++
++    /* Check for a flashvault call. */
++    if (avr32_flashvault_call (SYMBOL_REF_DECL (operands[0])))
++      {
++        /* Assembly is already emitted. */
++        return "";
++      }
++
++    switch (which_alternative) {
++      case 0:
++        return "icall\t%0";
++      case 1:
++        return "rcall\t%0";
++      case 2:
++        return "mcall\t%0";
++      case 3:
++        if (TARGET_HAS_ASM_ADDR_PSEUDOS)
++          return "call\t%0";
++        else
++          return "mcall\tr6[%0@got]";
++      default:
++        abort();
++    }
++  }
++  [(set_attr "type" "call")
++   (set_attr "length" "2,4,4,10")
++   (set_attr "cc" "clobber")])
++
++
++(define_expand "call"
++  [(parallel [(call (match_operand:SI 0 "" "")
++                    (match_operand 1 "" ""))
++              (clobber (reg:SI LR_REGNUM))])]
++  ""
++  {
++    rtx call_address;
++    if ( GET_CODE(operands[0]) != MEM )
++      FAIL;
++
++    call_address = XEXP(operands[0], 0);
++
++   /* If assembler supports call pseudo insn and the call address is a symbol then nothing special needs to be done. */
++    if (TARGET_HAS_ASM_ADDR_PSEUDOS && (GET_CODE(call_address) == SYMBOL_REF) )
++    {
++       /* We must however mark the function as using the GOT if flag_pic is set, since the call insn might turn into a mcall using the GOT ptr register. */
++       if (flag_pic)
++       {
++          crtl->uses_pic_offset_table = 1;
++          emit_call_insn(gen_call_internal(call_address, operands[1]));
++          DONE;
++       }
++    } 
++    else 
++    {
++      if (flag_pic && GET_CODE(call_address) == SYMBOL_REF )
++      {
++        crtl->uses_pic_offset_table = 1;
++        emit_call_insn(gen_call_internal(call_address, operands[1]));
++        DONE;
++      }
++
++      if (!SYMBOL_REF_RCALL_FUNCTION_P(operands[0]) )
++      {
++        if (optimize_size && GET_CODE(call_address) == SYMBOL_REF )
++        {
++          call_address = force_const_mem(SImode, call_address);
++        } 
++        else 
++        {
++          call_address = force_reg(SImode, call_address);
++        }
++      }
++    }
++    emit_call_insn(gen_call_internal(call_address, operands[1]));
++    DONE;
++
++  }
++)
++
++;;=============================================================================
++;; call_value
++;;-----------------------------------------------------------------------------
++;; Subroutine call instruction returning a value.
++;;=============================================================================
++(define_expand "call_value"
++   [(parallel [(set (match_operand:SI 0 "" "")
++                    (call (match_operand:SI 1 "" "")
++                          (match_operand 2 "" "")))
++               (clobber (reg:SI LR_REGNUM))])]
++   ""
++   {
++    rtx call_address;
++    if ( GET_CODE(operands[1]) != MEM )
++      FAIL;
++
++    call_address = XEXP(operands[1], 0);
++
++   /* Check for a flashvault call. 
++   if (GET_CODE (call_address) == SYMBOL_REF 
++       && avr32_flashvault_call (SYMBOL_REF_DECL (call_address)))
++     DONE;  
++     
++    */ 
++
++    /* If assembler supports call pseudo insn and the call
++       address is a symbol then nothing special needs to be done. */
++    if ( TARGET_HAS_ASM_ADDR_PSEUDOS
++         && (GET_CODE(call_address) == SYMBOL_REF) ){
++       /* We must however mark the function as using the GOT if
++          flag_pic is set, since the call insn might turn into
++          a mcall using the GOT ptr register. */
++       if ( flag_pic ) {
++          crtl->uses_pic_offset_table = 1;
++          emit_call_insn(gen_call_value_internal(operands[0], call_address, operands[2]));
++          DONE;
++       }
++    } else {
++      if ( flag_pic &&
++           GET_CODE(call_address) == SYMBOL_REF ){
++        crtl->uses_pic_offset_table = 1;
++        emit_call_insn(gen_call_value_internal(operands[0], call_address, operands[2]));
++        DONE;
++      }
++
++      if ( !SYMBOL_REF_RCALL_FUNCTION_P(operands[1]) ){
++        if ( optimize_size &&
++             GET_CODE(call_address) == SYMBOL_REF){
++          call_address = force_const_mem(SImode, call_address);
++        } else {
++          call_address = force_reg(SImode, call_address);
++        }
++      }
++    }
++    emit_call_insn(gen_call_value_internal(operands[0], call_address,
++                                           operands[2]));
++    DONE;
++
++   })
++
++(define_insn "call_value_internal"
++  [(parallel [(set (match_operand 0 "register_operand" "=r,r,r,r")
++                   (call (mem:SI (match_operand:SI 1 "avr32_call_operand" "r,U,T,W"))
++                         (match_operand 2 "" "")))
++              (clobber (reg:SI LR_REGNUM))])]
++  ;; Operand 2 not used on the AVR32.
++  ""
++  {
++    /* Check for a flashvault call. */
++    if (avr32_flashvault_call (SYMBOL_REF_DECL (operands[1])))
++      {
++        /* Assembly is already emitted. */
++        return "";
++      }
++
++
++    switch (which_alternative) {
++      case 0:
++        return "icall\t%1";
++      case 1:
++        return "rcall\t%1";
++      case 2:
++        return "mcall\t%1";
++      case 3:
++        if ( TARGET_HAS_ASM_ADDR_PSEUDOS )
++          return "call\t%1";
++        else
++          return "mcall\tr6[%1@got]";
++      default:
++        abort();
++    }
++  }
++  [(set_attr "type" "call")
++   (set_attr "length" "2,4,4,10")
++   (set_attr "cc" "call_set")])
++
++
++;;=============================================================================
++;; untyped_call
++;;-----------------------------------------------------------------------------
++;; Subrutine call instruction returning a value of any type.
++;; The code is copied from m68k.md (except gen_blockage is removed)
++;; Fixme!
++;;=============================================================================
++(define_expand "untyped_call"
++  [(parallel [(call (match_operand 0 "avr32_call_operand" "")
++		    (const_int 0))
++	      (match_operand 1 "" "")
++	      (match_operand 2 "" "")])]
++  ""
++  {
++    int i;
++
++    emit_call_insn (GEN_CALL (operands[0], const0_rtx, NULL, const0_rtx));
++
++    for (i = 0; i < XVECLEN (operands[2], 0); i++) {
++      rtx set = XVECEXP (operands[2], 0, i);
++      emit_move_insn (SET_DEST (set), SET_SRC (set));
++    }
++
++    /* The optimizer does not know that the call sets the function value
++       registers we stored in the result block.  We avoid problems by
++       claiming that all hard registers are used and clobbered at this
++       point.  */
++    emit_insn (gen_blockage ());
++
++    DONE;
++  })
++
++
++;;=============================================================================
++;; return
++;;=============================================================================
++
++(define_insn "return"
++  [(return)]
++  "USE_RETURN_INSN (FALSE)"
++  {
++   avr32_output_return_instruction(TRUE, FALSE, NULL, NULL);
++   return "";
++  }
++  [(set_attr "length" "4")
++   (set_attr "type" "call")]
++  )
++
++
++(define_insn "return_cond"
++  [(set (pc) 
++        (if_then_else (match_operand 0 "avr32_comparison_operand" "")
++                      (return)
++                      (pc)))]
++  "USE_RETURN_INSN (TRUE)"
++  "ret%0\tr12";
++  [(set_attr "type" "call")])
++  
++(define_insn "return_cond_predicable"
++  [(return)]
++  "USE_RETURN_INSN (TRUE)"
++  "ret%?\tr12";
++  [(set_attr "type" "call")
++   (set_attr "predicable" "yes")])
++
++
++(define_insn "return_imm"
++  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
++              (use (reg RETVAL_REGNUM))
++              (return)])]
++  "USE_RETURN_INSN (FALSE) &&
++   ((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
++  {
++   avr32_output_return_instruction(TRUE, FALSE, NULL, operands[0]);
++   return "";
++  }
++  [(set_attr "length" "4")
++   (set_attr "type" "call")]
++  )
++
++(define_insn "return_imm_cond"
++  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
++              (use (reg RETVAL_REGNUM))
++              (set (pc) 
++                   (if_then_else (match_operand 1 "avr32_comparison_operand" "")
++                                 (return)
++                                 (pc)))])]
++  "USE_RETURN_INSN (TRUE) &&
++   ((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
++  "ret%1\t%0";
++  [(set_attr "type" "call")]
++  )
++
++(define_insn "return_imm_predicable"
++  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
++              (use (reg RETVAL_REGNUM))
++              (return)])]
++  "USE_RETURN_INSN (TRUE) &&
++   ((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
++  "ret%?\t%0";
++  [(set_attr "type" "call")
++   (set_attr "predicable" "yes")])
++
++(define_insn "return_<mode>reg"
++  [(set (reg RETVAL_REGNUM) (match_operand:MOVM 0 "register_operand" "r"))
++   (use (reg RETVAL_REGNUM))
++   (return)]
++  "USE_RETURN_INSN (TRUE)"
++  "ret%?\t%0";
++  [(set_attr "type" "call")
++   (set_attr "predicable" "yes")])
++
++(define_insn "return_<mode>reg_cond"
++  [(set (reg RETVAL_REGNUM) (match_operand:MOVM 0 "register_operand" "r"))
++   (use (reg RETVAL_REGNUM))
++   (set (pc) 
++        (if_then_else (match_operator 1 "avr32_comparison_operator"
++                                      [(cc0) (const_int 0)])
++                      (return)
++                      (pc)))]
++  "USE_RETURN_INSN (TRUE)"
++  "ret%1\t%0";
++  [(set_attr "type" "call")])
++  
++;;=============================================================================
++;; nonlocal_goto_receiver
++;;-----------------------------------------------------------------------------
++;; For targets with a return stack we must make sure to flush the return stack
++;; since it will be corrupt after a nonlocal goto.
++;;=============================================================================
++(define_expand "nonlocal_goto_receiver"
++  [(const_int 0)]
++  "TARGET_RETURN_STACK"
++  "
++   {
++    emit_insn ( gen_frs() );
++    DONE;
++   }
++  "
++  )
++
++
++;;=============================================================================
++;; builtin_setjmp_receiver
++;;-----------------------------------------------------------------------------
++;; For pic code we need to reload the pic register.
++;; For targets with a return stack we must make sure to flush the return stack
++;; since it will probably be corrupted.
++;;=============================================================================
++(define_expand "builtin_setjmp_receiver"
++  [(label_ref (match_operand 0 "" ""))]
++  "flag_pic"
++  "
++   {
++    if ( TARGET_RETURN_STACK ) 
++     emit_insn ( gen_frs() );
++
++    avr32_load_pic_register ();
++    DONE;
++   }
++  "
++)
++
++
++;;=============================================================================
++;; indirect_jump
++;;-----------------------------------------------------------------------------
++;; Jump to an address in reg or memory.
++;;=============================================================================
++(define_expand "indirect_jump"
++  [(set (pc)
++	(match_operand:SI 0 "general_operand" ""))]
++  ""
++  {
++    /* One of the ops has to be in a register.  */
++    if ( (flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS )
++         && !avr32_legitimate_pic_operand_p(operands[0]) )
++      operands[0] = legitimize_pic_address (operands[0], SImode, 0);
++    else if ( flag_pic && avr32_address_operand(operands[0], GET_MODE(operands[0])) )
++      /* If we have an address operand then this function uses the pic register. */
++      crtl->uses_pic_offset_table = 1;
++  })
++
++
++(define_insn "indirect_jump_internal"
++  [(set (pc)
++	(match_operand:SI 0 "avr32_non_rmw_general_operand" "r,m,W"))]
++  ""
++  {
++    switch( which_alternative ){
++      case 0:
++        return "mov\tpc, %0";
++      case 1:
++        if ( avr32_const_pool_ref_operand(operands[0], GET_MODE(operands[0])) )
++          return "lddpc\tpc, %0";
++        else
++          return "ld.w\tpc, %0";
++      case 2:
++        if ( flag_pic )
++          return "ld.w\tpc, r6[%0@got]";
++        else
++          return "lda.w\tpc, %0";
++      default:
++	abort();
++    }
++   }
++  [(set_attr "length" "2,4,8")
++   (set_attr "type" "call,call,call")
++   (set_attr "cc" "none,none,clobber")])
++
++
++
++;;=============================================================================
++;; casesi and tablejump
++;;=============================================================================
++(define_insn "tablejump_add"
++  [(set (pc)
++	(plus:SI (match_operand:SI 0 "register_operand" "r")
++                 (mult:SI (match_operand:SI 1 "register_operand" "r")
++                          (match_operand:SI 2 "immediate_operand" "Ku04" ))))
++   (use (label_ref (match_operand 3 "" "")))]
++  "flag_pic &&
++   ((INTVAL(operands[2]) == 0) || (INTVAL(operands[2]) == 2) ||
++    (INTVAL(operands[2]) == 4) || (INTVAL(operands[2]) == 8))"
++  "add\tpc, %0, %1 << %p2"
++  [(set_attr "length" "4")
++   (set_attr "cc" "clobber")])
++
++(define_insn "tablejump_insn"
++  [(set (pc) (match_operand:SI 0 "memory_operand" "m"))
++   (use (label_ref (match_operand 1 "" "")))]
++  "!flag_pic"
++  "ld.w\tpc, %0"
++  [(set_attr "length" "4")
++   (set_attr "type" "call")
++   (set_attr "cc" "none")])
++
++(define_expand "casesi"
++  [(match_operand:SI 0 "register_operand" "")	; index to jump on
++   (match_operand:SI 1 "const_int_operand" "")	; lower bound
++   (match_operand:SI 2 "const_int_operand" "")	; total range
++   (match_operand:SI 3 "" "")			; table label
++   (match_operand:SI 4 "" "")]			; Out of range label
++  ""
++  "
++  {
++    rtx reg;
++    rtx index = operands[0];
++    rtx low_bound = operands[1];
++    rtx range = operands[2];
++    rtx table_label = operands[3];
++    rtx oor_label = operands[4];
++
++    index = force_reg ( SImode, index );
++    if (low_bound != const0_rtx)
++      {
++        if (!avr32_const_ok_for_constraint_p(INTVAL (low_bound), 'I', \"Is21\")){
++          reg = force_reg(SImode, GEN_INT (INTVAL (low_bound)));
++	  emit_insn (gen_subsi3 (reg, index,
++			         reg));
++        } else {
++          reg = gen_reg_rtx (SImode);
++          emit_insn (gen_addsi3 (reg, index,
++		         	 GEN_INT (-INTVAL (low_bound))));
++        }
++	index = reg;
++      }
++
++    if (!avr32_const_ok_for_constraint_p (INTVAL (range), 'K', \"Ks21\"))
++      range = force_reg (SImode, range);
++
++    emit_cmp_and_jump_insns ( index, range, GTU, NULL_RTX, SImode, 1, oor_label );
++    reg = gen_reg_rtx (SImode);
++    emit_move_insn ( reg, gen_rtx_LABEL_REF (VOIDmode, table_label));
++
++    if ( flag_pic ) 
++       emit_jump_insn ( gen_tablejump_add ( reg, index, GEN_INT(4), table_label));
++    else
++       emit_jump_insn ( 
++           gen_tablejump_insn ( gen_rtx_MEM ( SImode, 
++                                              gen_rtx_PLUS ( SImode, 
++                                                             reg, 
++                                                             gen_rtx_MULT ( SImode, 
++                                                                            index, 
++                                                                            GEN_INT(4)))),
++                                table_label));
++    DONE;
++  }"
++)
++
++
++
++(define_insn "prefetch"
++  [(prefetch (match_operand:SI 0 "avr32_ks16_address_operand" "p")
++	     (match_operand 1 "const_int_operand" "")
++	     (match_operand 2 "const_int_operand" ""))]
++  ""
++  {
++     return "pref\t%0";
++  }
++
++  [(set_attr "length" "4")
++   (set_attr "type" "load")
++   (set_attr "cc" "none")])
++
++
++
++;;=============================================================================
++;; prologue
++;;-----------------------------------------------------------------------------
++;; This pattern, if defined, emits RTL for entry to a function. The function
++;; entry i responsible for setting up the stack frame, initializing the frame
++;; pointer register, saving callee saved registers, etc.
++;;=============================================================================
++(define_expand "prologue"
++  [(clobber (const_int 0))]
++  ""
++  "
++  avr32_expand_prologue();
++  DONE;
++  "
++  )
++
++;;=============================================================================
++;; eh_return
++;;-----------------------------------------------------------------------------
++;; This pattern, if defined, affects the way __builtin_eh_return, and
++;; thence the call frame exception handling library routines, are
++;; built. It is intended to handle non-trivial actions needed along
++;; the abnormal return path.
++;;
++;; The address of the exception handler to which the function should
++;; return is passed as operand to this pattern. It will normally need
++;; to copied by the pattern to some special register or memory
++;; location. If the pattern needs to determine the location of the
++;; target call frame in order to do so, it may use
++;; EH_RETURN_STACKADJ_RTX, if defined; it will have already been
++;; assigned.
++;;
++;; If this pattern is not defined, the default action will be to
++;; simply copy the return address to EH_RETURN_HANDLER_RTX. Either
++;; that macro or this pattern needs to be defined if call frame
++;; exception handling is to be used.
++
++;; We can't expand this before we know where the link register is stored.
++(define_insn_and_split "eh_return"
++  [(unspec_volatile [(match_operand:SI 0 "register_operand" "r")]
++		    VUNSPEC_EH_RETURN)
++   (clobber (match_scratch:SI 1 "=&r"))]
++  ""
++  "#"
++  "reload_completed"
++  [(const_int 0)]
++  "
++  {
++    avr32_set_return_address (operands[0], operands[1]);
++    DONE;
++  }"
++  )
++
++
++;;=============================================================================
++;; ffssi2
++;;-----------------------------------------------------------------------------
++(define_insn "ffssi2"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (ffs:SI (match_operand:SI 1 "register_operand" "r"))) ]
++  ""
++  "mov    %0, %1
++   brev   %0
++   clz    %0, %0
++   sub    %0, -1
++   cp     %0, 33
++   moveq  %0, 0"
++  [(set_attr "length" "18")
++   (set_attr "cc" "clobber")]
++  )
++
++
++
++;;=============================================================================
++;; swap_h
++;;-----------------------------------------------------------------------------
++(define_insn "*swap_h"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (ior:SI (ashift:SI (match_dup 0) (const_int 16))
++                 (lshiftrt:SI (match_dup 0) (const_int 16))))]
++  ""
++  "swap.h    %0"
++  [(set_attr "length" "2")]
++  )
++
++(define_insn_and_split "bswap_16"
++  [ (set (match_operand:HI 0 "avr32_bswap_operand" "=r,RKs13,r")
++         (ior:HI (and:HI (lshiftrt:HI (match_operand:HI 1 "avr32_bswap_operand" "r,r,RKs13")
++                                      (const_int 8))
++                         (const_int 255))
++                 (ashift:HI (and:HI (match_dup 1)
++                                    (const_int 255))
++                            (const_int 8))))]
++  ""
++  {
++   switch ( which_alternative ){
++     case 0:
++       if ( REGNO(operands[0]) == REGNO(operands[1]))
++         return "swap.bh\t%0";
++       else
++         return "mov\t%0, %1\;swap.bh\t%0";
++     case 1:
++       return "stswp.h\t%0, %1";
++     case 2:
++       return "ldswp.sh\t%0, %1";
++     default:
++       abort();
++     }
++  }
++
++  "(reload_completed &&
++     REG_P(operands[0]) && REG_P(operands[1])
++     && (REGNO(operands[0]) != REGNO(operands[1])))"
++  [(set (match_dup 0) (match_dup 1))
++   (set (match_dup 0)
++        (ior:HI (and:HI (lshiftrt:HI (match_dup 0)
++                                     (const_int 8))
++                        (const_int 255))
++                (ashift:HI (and:HI (match_dup 0)
++                                   (const_int 255))
++                           (const_int 8))))]
++  ""
++
++  [(set_attr "length" "4,4,4")
++   (set_attr "type" "alu,store,load_rm")]
++  )
++
++(define_insn_and_split "bswap_32"
++  [ (set (match_operand:SI 0 "avr32_bswap_operand" "=r,RKs14,r")
++         (ior:SI (ior:SI (lshiftrt:SI (and:SI (match_operand:SI 1 "avr32_bswap_operand" "r,r,RKs14")
++                                              (const_int -16777216))
++                                      (const_int 24))
++                         (lshiftrt:SI (and:SI (match_dup 1)
++                                              (const_int 16711680))
++                                      (const_int 8)))
++                 (ior:SI (ashift:SI (and:SI (match_dup 1)
++                                            (const_int 65280))
++                                    (const_int 8))
++                         (ashift:SI (and:SI (match_dup 1)
++                                            (const_int 255))
++                                    (const_int 24)))))]
++  ""
++  {
++    switch ( which_alternative ){
++     case 0:
++       if ( REGNO(operands[0]) == REGNO(operands[1]))
++         return "swap.b\t%0";
++       else
++         return "#";
++     case 1:
++       return "stswp.w\t%0, %1";
++     case 2:
++       return "ldswp.w\t%0, %1";
++     default:
++       abort();
++    }
++  }
++  "(reload_completed &&
++    REG_P(operands[0]) && REG_P(operands[1])
++    && (REGNO(operands[0]) != REGNO(operands[1])))"
++  [(set (match_dup 0) (match_dup 1))
++   (set (match_dup 0)
++        (ior:SI (ior:SI (lshiftrt:SI (and:SI (match_dup 0)
++                                             (const_int -16777216))
++                                     (const_int 24))
++                        (lshiftrt:SI (and:SI (match_dup 0)
++                                             (const_int 16711680))
++                                     (const_int 8)))
++                (ior:SI (ashift:SI (and:SI (match_dup 0)
++                                           (const_int 65280))
++                                   (const_int 8))
++                        (ashift:SI (and:SI (match_dup 0)
++                                           (const_int 255))
++                                   (const_int 24)))))]
++  ""
++
++  [(set_attr "length" "4,4,4")
++   (set_attr "type" "alu,store,load_rm")]
++  )
++
++
++;;=============================================================================
++;; blockage
++;;-----------------------------------------------------------------------------
++;; UNSPEC_VOLATILE is considered to use and clobber all hard registers and
++;; all of memory.  This blocks insns from being moved across this point.
++
++(define_insn "blockage"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_BLOCKAGE)]
++  ""
++  ""
++  [(set_attr "length" "0")]
++)
++
++;;=============================================================================
++;; clzsi2
++;;-----------------------------------------------------------------------------
++(define_insn "clzsi2"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (clz:SI (match_operand:SI 1 "register_operand" "r"))) ]
++  ""
++  "clz    %0, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "set_z")]
++  )
++
++;;=============================================================================
++;; ctzsi2
++;;-----------------------------------------------------------------------------
++(define_insn "ctzsi2"
++  [ (set (match_operand:SI 0 "register_operand" "=r,r")
++         (ctz:SI (match_operand:SI 1 "register_operand" "0,r"))) ]
++  ""
++  "@
++   brev\t%0\;clz\t%0, %0
++   mov\t%0, %1\;brev\t%0\;clz\t%0, %0"
++  [(set_attr "length" "8")
++   (set_attr "cc" "set_z")]
++  )
++
++;;=============================================================================
++;; cache instructions
++;;-----------------------------------------------------------------------------
++(define_insn "cache"
++  [ (unspec_volatile [(match_operand:SI 0 "avr32_ks11_address_operand" "p")
++                      (match_operand:SI 1 "immediate_operand" "Ku05")] VUNSPEC_CACHE)]
++  ""
++  "cache    %0, %1"
++  [(set_attr "length" "4")]
++  )
++
++(define_insn "sync"
++  [ (unspec_volatile [(match_operand:SI 0 "immediate_operand" "Ku08")] VUNSPEC_SYNC)]
++  ""
++  "sync    %0"
++  [(set_attr "length" "4")]
++  )
++
++;;=============================================================================
++;; TLB instructions
++;;-----------------------------------------------------------------------------
++(define_insn "tlbr"
++  [ (unspec_volatile [(const_int 0)] VUNSPEC_TLBR)]
++  ""
++  "tlbr"
++  [(set_attr "length" "2")]
++  )
++
++(define_insn "tlbw"
++  [ (unspec_volatile [(const_int 0)] VUNSPEC_TLBW)]
++  ""
++  "tlbw"
++  [(set_attr "length" "2")]
++  )
++
++(define_insn "tlbs"
++  [ (unspec_volatile [(const_int 0)] VUNSPEC_TLBS)]
++  ""
++  "tlbs"
++  [(set_attr "length" "2")]
++  )
++
++;;=============================================================================
++;; Breakpoint instruction
++;;-----------------------------------------------------------------------------
++(define_insn "breakpoint"
++  [ (unspec_volatile [(const_int 0)] VUNSPEC_BREAKPOINT)]
++  ""
++  "breakpoint"
++  [(set_attr "length" "2")]
++  )
++
++
++;;=============================================================================
++;; mtsr/mfsr instruction
++;;-----------------------------------------------------------------------------
++(define_insn "mtsr"
++  [ (unspec_volatile [(match_operand 0 "immediate_operand" "i")
++                      (match_operand:SI 1 "register_operand" "r")] VUNSPEC_MTSR)]
++  ""
++  "mtsr\t%0, %1"
++  [(set_attr "length" "4")]
++  )
++
++(define_insn "mfsr"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (unspec_volatile:SI [(match_operand 1 "immediate_operand" "i")] VUNSPEC_MFSR)) ]
++  ""
++  "mfsr\t%0, %1"
++  [(set_attr "length" "4")]
++  )
++
++;;=============================================================================
++;; mtdr/mfdr instruction
++;;-----------------------------------------------------------------------------
++(define_insn "mtdr"
++  [ (unspec_volatile [(match_operand 0 "immediate_operand" "i")
++                      (match_operand:SI 1 "register_operand" "r")] VUNSPEC_MTDR)]
++  ""
++  "mtdr\t%0, %1"
++  [(set_attr "length" "4")]
++  )
++
++(define_insn "mfdr"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (unspec_volatile:SI [(match_operand 1 "immediate_operand" "i")] VUNSPEC_MFDR)) ]
++  ""
++  "mfdr\t%0, %1"
++  [(set_attr "length" "4")]
++  )
++
++;;=============================================================================
++;; musfr
++;;-----------------------------------------------------------------------------
++(define_insn "musfr"
++  [ (unspec_volatile [(match_operand:SI 0 "register_operand" "r")] VUNSPEC_MUSFR)]
++  ""
++  "musfr\t%0"
++  [(set_attr "length" "2")
++   (set_attr "cc" "clobber")]
++  )
++
++(define_insn "mustr"
++  [ (set (match_operand:SI 0 "register_operand" "=r")
++         (unspec_volatile:SI [(const_int 0)] VUNSPEC_MUSTR)) ]
++  ""
++  "mustr\t%0"
++  [(set_attr "length" "2")]
++  )
++
++(define_insn "ssrf"
++  [ (unspec_volatile [(match_operand:SI 0 "immediate_operand" "Ku05")] VUNSPEC_SSRF)]
++  ""
++  "ssrf    %0"
++  [(set_attr "length" "2")
++   (set_attr "cc" "clobber")]
++  )
++
++(define_insn "csrf"
++  [ (unspec_volatile [(match_operand:SI 0 "immediate_operand" "Ku05")] VUNSPEC_CSRF)]
++  ""
++  "csrf    %0"
++  [(set_attr "length" "2")
++   (set_attr "cc" "clobber")]
++  )
++
++;;=============================================================================
++;; Flush Return Stack instruction
++;;-----------------------------------------------------------------------------
++(define_insn "frs"
++  [ (unspec_volatile [(const_int 0)] VUNSPEC_FRS)]
++  ""
++  "frs"
++  [(set_attr "length" "2")
++   (set_attr "cc" "none")]
++  )
++
++
++;;=============================================================================
++;; Saturation Round Scale instruction
++;;-----------------------------------------------------------------------------
++(define_insn "sats"
++  [ (set (match_operand:SI 0 "register_operand" "+r")
++         (unspec:SI [(match_dup 0)
++                     (match_operand 1 "immediate_operand" "Ku05")
++                     (match_operand 2 "immediate_operand" "Ku05")]
++                    UNSPEC_SATS)) ]
++  "TARGET_DSP"
++  "sats\t%0 >> %1, %2"
++  [(set_attr "type" "alu_sat")
++   (set_attr "length" "4")]
++  )
++
++(define_insn "satu"
++  [ (set (match_operand:SI 0 "register_operand" "+r")
++         (unspec:SI [(match_dup 0)
++                     (match_operand 1 "immediate_operand" "Ku05")
++                     (match_operand 2 "immediate_operand" "Ku05")]
++                    UNSPEC_SATU)) ]
++  "TARGET_DSP"
++  "satu\t%0 >> %1, %2"
++  [(set_attr "type" "alu_sat")
++   (set_attr "length" "4")]
++  )
++
++(define_insn "satrnds"
++  [ (set (match_operand:SI 0 "register_operand" "+r")
++         (unspec:SI [(match_dup 0)
++                     (match_operand 1 "immediate_operand" "Ku05")
++                     (match_operand 2 "immediate_operand" "Ku05")]
++                    UNSPEC_SATRNDS)) ]
++  "TARGET_DSP"
++  "satrnds\t%0 >> %1, %2"
++  [(set_attr "type" "alu_sat")
++   (set_attr "length" "4")]
++  )
++
++(define_insn "satrndu"
++  [ (set (match_operand:SI 0 "register_operand" "+r")
++         (unspec:SI [(match_dup 0)
++                     (match_operand 1 "immediate_operand" "Ku05")
++                     (match_operand 2 "immediate_operand" "Ku05")]
++                    UNSPEC_SATRNDU)) ]
++  "TARGET_DSP"
++  "sats\t%0 >> %1, %2"
++  [(set_attr "type" "alu_sat")
++   (set_attr "length" "4")]
++  )
++
++(define_insn "sleep"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_SLEEP)
++  (match_operand:SI 0 "const_int_operand" "")]
++  ""
++  "sleep	%0"
++  [(set_attr "length" "1")
++   (set_attr "cc"  "none")
++  ])
++
++(define_expand "delay_cycles"
++  [(unspec_volatile [(match_operand:SI 0 "const_int_operand" "i")]
++                    VUNSPEC_DELAY_CYCLES)]
++  ""
++  "
++  unsigned int cycles = UINTVAL (operands[0]);
++  if (IN_RANGE(cycles,0x10000 ,0xFFFFFFFF))
++   {
++     unsigned int msb = (cycles & 0xFFFF0000);
++     unsigned int shift = 16;
++     msb = (msb >> shift);
++     unsigned int cycles_used = (msb*0x10000);
++     emit_insn (gen_delay_cycles_2 (gen_int_mode (msb, SImode)));
++     cycles -= cycles_used;
++   }
++  if (IN_RANGE(cycles, 4, 0xFFFF))
++   {
++     unsigned int loop_count = (cycles/ 4);
++     unsigned int cycles_used = (loop_count*4);
++     emit_insn (gen_delay_cycles_1 (gen_int_mode (loop_count, SImode)));
++     cycles -= cycles_used;
++   }
++  while (cycles >= 3)
++    {
++      emit_insn (gen_nop3 ());
++      cycles -= 3;
++    }
++  if (cycles == 1 || cycles == 2)
++    {
++      while (cycles--)
++        emit_insn (gen_nop ());
++    }
++  DONE;
++  ")
++
++(define_insn "delay_cycles_1"
++[(unspec_volatile [(const_int 0)] VUNSPEC_DELAY_CYCLES_1)
++  (match_operand:SI 0 "immediate_operand" "")
++  (clobber (match_scratch:SI 1 "=&r"))]
++  ""
++  "mov\t%1, %0
++    1:  sub\t%1, 1
++        brne\t1b
++        nop"
++)
++
++(define_insn "delay_cycles_2"
++[(unspec_volatile [(const_int 0)] VUNSPEC_DELAY_CYCLES_2)
++  (match_operand:SI 0 "immediate_operand" "")
++  (clobber (match_scratch:SI 1 "=&r"))
++  (clobber (match_scratch:SI 2 "=&r"))]
++  ""
++  "mov\t%1, %0
++    1:  mov\t%2, 16383 
++    2:  sub\t%2, 1	
++        brne\t2b
++        nop
++        sub\t%1, 1
++        brne\t1b
++        nop"
++)
++
++;; CPU instructions
++
++;;=============================================================================
++;; nop
++;;-----------------------------------------------------------------------------
++;; No-op instruction.
++;;=============================================================================
++(define_insn "nop"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_NOP)]
++  ""
++  "nop"
++  [(set_attr "length" "1")
++   (set_attr "type" "alu")
++  (set_attr "cc" "none")])
++
++;; NOP3
++(define_insn "nop3"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_NOP3)]
++  ""
++  "rjmp\t2"
++  [(set_attr "length" "3")
++   (set_attr "type" "alu")
++  (set_attr "cc" "none")])
++
++;; Special patterns for dealing with the constant pool
++
++(define_insn "align_4"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_ALIGN)]
++  ""
++  {
++   assemble_align (32);
++   return "";
++  }
++  [(set_attr "length" "2")]
++)
++
++
++(define_insn "consttable_start"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_POOL_START)]
++  ""
++  {
++   return ".cpool";
++  }
++  [(set_attr "length" "0")]
++  )
++
++(define_insn "consttable_end"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_POOL_END)]
++  ""
++  {
++   making_const_table = FALSE;
++   return "";
++  }
++  [(set_attr "length" "0")]
++)
++
++
++(define_insn "consttable_4"
++  [(unspec_volatile [(match_operand 0 "" "")] VUNSPEC_POOL_4)]
++  ""
++  {
++    making_const_table = TRUE;
++    switch (GET_MODE_CLASS (GET_MODE (operands[0])))
++      {
++      case MODE_FLOAT:
++      {
++        REAL_VALUE_TYPE r;
++        char real_string[1024];
++        REAL_VALUE_FROM_CONST_DOUBLE (r, operands[0]);
++        real_to_decimal(real_string, &r, 1024, 0, 1);
++        asm_fprintf (asm_out_file, "\t.float\t%s\n", real_string);
++        break;
++      }
++      default:
++        assemble_integer (operands[0], 4, 0, 1);
++        break;
++      }
++    return "";
++  }
++  [(set_attr "length" "4")]
++)
++
++(define_insn "consttable_8"
++  [(unspec_volatile [(match_operand 0 "" "")] VUNSPEC_POOL_8)]
++  ""
++  {
++    making_const_table = TRUE;
++    switch (GET_MODE_CLASS (GET_MODE (operands[0])))
++      {
++       case MODE_FLOAT:
++        {
++         REAL_VALUE_TYPE r; 
++         char real_string[1024];
++         REAL_VALUE_FROM_CONST_DOUBLE (r, operands[0]);
++         real_to_decimal(real_string, &r, 1024, 0, 1);
++         asm_fprintf (asm_out_file, "\t.double\t%s\n", real_string);
++         break;
++        }
++       default:
++         assemble_integer(operands[0], 8, 0, 1);
++        break;
++     }
++    return "";
++  }
++  [(set_attr "length" "8")]
++)
++
++(define_insn "consttable_16"
++  [(unspec_volatile [(match_operand 0 "" "")] VUNSPEC_POOL_16)]
++  ""
++  {
++    making_const_table = TRUE;
++    assemble_integer(operands[0], 16, 0, 1);
++    return "";
++  }
++  [(set_attr "length" "16")]
++)
++
++;;=============================================================================
++;; coprocessor instructions
++;;-----------------------------------------------------------------------------
++(define_insn "cop"
++  [ (unspec_volatile [(match_operand 0 "immediate_operand" "Ku03")
++                      (match_operand 1 "immediate_operand" "Ku04")
++                      (match_operand 2 "immediate_operand" "Ku04")
++                      (match_operand 3 "immediate_operand" "Ku04")
++                      (match_operand 4 "immediate_operand" "Ku07")] VUNSPEC_COP)]
++  ""
++  "cop\tcp%0, cr%1, cr%2, cr%3, %4"
++  [(set_attr "length" "4")]
++  )
++
++(define_insn "mvcrsi"
++  [ (set (match_operand:SI 0 "avr32_cop_move_operand" "=r,<,Z")
++         (unspec_volatile:SI [(match_operand 1 "immediate_operand" "Ku03,Ku03,Ku03")
++                              (match_operand 2 "immediate_operand" "Ku04,Ku04,Ku04")]
++                             VUNSPEC_MVCR)) ]
++  ""
++  "@
++   mvcr.w\tcp%1, %0, cr%2
++   stcm.w\tcp%1, %0, cr%2
++   stc.w\tcp%1, %0, cr%2"
++  [(set_attr "length" "4")]
++  )
++
++(define_insn "mvcrdi"
++  [ (set (match_operand:DI 0 "avr32_cop_move_operand" "=r,<,Z")
++         (unspec_volatile:DI [(match_operand 1 "immediate_operand" "Ku03,Ku03,Ku03")
++                              (match_operand 2 "immediate_operand" "Ku04,Ku04,Ku04")]
++                             VUNSPEC_MVCR)) ]
++  ""
++  "@
++   mvcr.d\tcp%1, %0, cr%2
++   stcm.d\tcp%1, %0, cr%2-cr%i2
++   stc.d\tcp%1, %0, cr%2"
++  [(set_attr "length" "4")]
++  )
++
++(define_insn "mvrcsi"
++  [ (unspec_volatile:SI [(match_operand 0 "immediate_operand" "Ku03,Ku03,Ku03")
++                         (match_operand 1 "immediate_operand" "Ku04,Ku04,Ku04")
++                         (match_operand:SI 2 "avr32_cop_move_operand" "r,>,Z")]
++                        VUNSPEC_MVRC)]
++  ""
++  {
++   switch (which_alternative){
++    case 0:
++      return "mvrc.w\tcp%0, cr%1, %2";
++    case 1:
++      return "ldcm.w\tcp%0, %2, cr%1";
++    case 2:
++      return "ldc.w\tcp%0, cr%1, %2";
++    default:
++      abort();
++   }
++  }
++  [(set_attr "length" "4")]
++  )
++
++(define_insn "mvrcdi"
++  [ (unspec_volatile:DI [(match_operand 0 "immediate_operand" "Ku03,Ku03,Ku03")
++                         (match_operand 1 "immediate_operand" "Ku04,Ku04,Ku04")
++                         (match_operand:DI 2 "avr32_cop_move_operand" "r,>,Z")]
++                        VUNSPEC_MVRC)]
++  ""
++  {
++   switch (which_alternative){
++    case 0:
++      return "mvrc.d\tcp%0, cr%1, %2";
++    case 1:
++      return "ldcm.d\tcp%0, %2, cr%1-cr%i1";
++    case 2:
++      return "ldc.d\tcp%0, cr%1, %2";
++    default:
++      abort();
++   }
++  }
++  [(set_attr "length" "4")]
++  )
++
++;;=============================================================================
++;; epilogue
++;;-----------------------------------------------------------------------------
++;; This pattern emits RTL for exit from a function. The function exit is
++;; responsible for deallocating the stack frame, restoring callee saved
++;; registers and emitting the return instruction.
++;; ToDo: using TARGET_ASM_FUNCTION_PROLOGUE instead.
++;;=============================================================================
++(define_expand "epilogue"
++  [(unspec_volatile [(return)] VUNSPEC_EPILOGUE)]
++  ""
++  "
++  if (USE_RETURN_INSN (FALSE)){
++      emit_jump_insn (gen_return ());
++      DONE;
++  }
++  emit_jump_insn (gen_rtx_UNSPEC_VOLATILE (VOIDmode,
++	gen_rtvec (1,
++		gen_rtx_RETURN (VOIDmode)),
++	VUNSPEC_EPILOGUE));
++  DONE;
++  "
++  )
++
++(define_insn "*epilogue_insns"
++  [(unspec_volatile [(return)] VUNSPEC_EPILOGUE)]
++  ""
++  {
++    avr32_output_return_instruction (FALSE, FALSE, NULL, NULL);
++    return "";
++  }
++  ; Length is absolute worst case
++  [(set_attr "type" "branch")
++   (set_attr "length" "12")]
++  )
++
++(define_insn "*epilogue_insns_ret_imm"
++  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
++              (use (reg RETVAL_REGNUM))
++              (unspec_volatile [(return)] VUNSPEC_EPILOGUE)])]
++  "((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
++  {
++    avr32_output_return_instruction (FALSE, FALSE, NULL, operands[0]);
++    return "";
++  }
++  ; Length is absolute worst case
++  [(set_attr "type" "branch")
++   (set_attr "length" "12")]
++  )
++
++(define_insn "sibcall_epilogue"
++  [(unspec_volatile [(const_int 0)] VUNSPEC_EPILOGUE)]
++  ""
++  {
++   avr32_output_return_instruction (FALSE, FALSE,  NULL, NULL);
++   return "";
++  }
++;; Length is absolute worst case
++  [(set_attr "type" "branch")
++   (set_attr "length" "12")]
++  )
++
++(define_insn "*sibcall_epilogue_insns_ret_imm"
++  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
++              (use (reg RETVAL_REGNUM))
++              (unspec_volatile [(const_int 0)] VUNSPEC_EPILOGUE)])]
++  "((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
++  {
++    avr32_output_return_instruction (FALSE, FALSE, NULL, operands[0]);
++    return "";
++  }
++  ; Length is absolute worst case
++  [(set_attr "type" "branch")
++   (set_attr "length" "12")]
++  )
++
++(define_insn "ldxi"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(mem:SI (plus:SI
++                 (match_operand:SI 1 "register_operand" "r")
++                 (mult:SI (zero_extract:SI (match_operand:SI 2 "register_operand" "r")
++                                           (const_int 8)
++                                           (match_operand:SI 3 "immediate_operand" "Ku05"))
++                          (const_int 4)))))]
++  "(INTVAL(operands[3]) == 24 || INTVAL(operands[3]) == 16 || INTVAL(operands[3]) == 8
++   || INTVAL(operands[3]) == 0)"
++  {
++   switch ( INTVAL(operands[3]) ){
++    case 0:
++         return "ld.w    %0, %1[%2:b << 2]";
++    case 8:
++         return "ld.w    %0, %1[%2:l << 2]";
++    case 16:
++         return "ld.w    %0, %1[%2:u << 2]";
++    case 24:
++         return "ld.w    %0, %1[%2:t << 2]";
++    default:
++         internal_error("illegal operand for ldxi");
++   }
++  }
++  [(set_attr "type" "load")
++   (set_attr "length" "4")
++   (set_attr "cc" "none")])
++
++
++
++
++
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   sub     r8, r7, 8
++;;   st.w    r8[0x0], r12
++;; to
++;;   sub     r8, r7, 8
++;;   st.w    r7[-0x8], r12
++;;=============================================================================
++; (set (reg:SI 9 r8)
++;      (plus:SI (reg/f:SI 6 r7)
++;               (const_int ...)))
++; (set (mem:SI (reg:SI 9 r8))
++;      (reg:SI 12 r12))
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++	(plus:SI (match_operand:SI 1 "register_operand" "")
++		 (match_operand:SI 2 "immediate_operand" "")))
++   (set (mem:SI (match_dup 0))
++	(match_operand:SI 3 "register_operand" ""))]
++  "REGNO(operands[0]) != REGNO(operands[1]) && avr32_const_ok_for_constraint_p(INTVAL(operands[2]), 'K', \"Ks16\")"
++  [(set (match_dup 0)
++	(plus:SI (match_dup 1)
++		 (match_dup 2)))
++   (set (mem:SI (plus:SI (match_dup 1)
++			 (match_dup 2)))
++	(match_dup 3))]
++  "")
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   sub     r6, r7, 4
++;;   ld.w    r6, r6[0x0]
++;; to
++;;   sub     r6, r7, 4
++;;   ld.w    r6, r7[-0x4]
++;;=============================================================================
++; (set (reg:SI 7 r6)
++;      (plus:SI (reg/f:SI 6 r7)
++;               (const_int -4 [0xfffffffc])))
++; (set (reg:SI 7 r6)
++;      (mem:SI (reg:SI 7 r6)))
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++	(plus:SI (match_operand:SI 1 "register_operand" "")
++		 (match_operand:SI 2 "immediate_operand" "")))
++   (set (match_operand:SI 3 "register_operand" "")
++	(mem:SI (match_dup 0)))]
++  "REGNO(operands[0]) != REGNO(operands[1]) && avr32_const_ok_for_constraint_p(INTVAL(operands[2]), 'K', \"Ks16\")"
++  [(set (match_dup 0)
++	(plus:SI (match_dup 1)
++		 (match_dup 2)))
++   (set (match_dup 3)
++	(mem:SI (plus:SI (match_dup 1)
++			 (match_dup 2))))]
++  "")
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   ld.sb   r0, r7[-0x6]
++;;   cashs.b r0
++;; to
++;;   ld.sb   r0, r7[-0x6]
++;;=============================================================================
++(define_peephole2
++  [(set (match_operand:QI 0 "register_operand" "")
++	(match_operand:QI 1 "load_sb_memory_operand" ""))
++   (set (match_operand:SI 2 "register_operand" "")
++	(sign_extend:SI (match_dup 0)))]
++  "(REGNO(operands[0]) == REGNO(operands[2]) || peep2_reg_dead_p(2, operands[0]))"
++  [(set (match_dup 2)
++	(sign_extend:SI (match_dup 1)))]
++  "")
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   ld.ub   r0, r7[-0x6]
++;;   cashu.b r0
++;; to
++;;   ld.ub   r0, r7[-0x6]
++;;=============================================================================
++(define_peephole2
++  [(set (match_operand:QI 0 "register_operand" "")
++	(match_operand:QI 1 "memory_operand" ""))
++   (set (match_operand:SI 2 "register_operand" "")
++	(zero_extend:SI (match_dup 0)))]
++  "(REGNO(operands[0]) == REGNO(operands[2])) || peep2_reg_dead_p(2, operands[0])"
++  [(set (match_dup 2)
++	(zero_extend:SI (match_dup 1)))]
++  "")
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   ld.sh   r0, r7[-0x6]
++;;   casts.h r0
++;; to
++;;   ld.sh   r0, r7[-0x6]
++;;=============================================================================
++(define_peephole2
++  [(set (match_operand:HI 0 "register_operand" "")
++	(match_operand:HI 1 "memory_operand" ""))
++   (set (match_operand:SI 2 "register_operand" "")
++	(sign_extend:SI (match_dup 0)))]
++  "(REGNO(operands[0]) == REGNO(operands[2])) || peep2_reg_dead_p(2, operands[0])"
++  [(set (match_dup 2)
++	(sign_extend:SI (match_dup 1)))]
++  "")
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   ld.uh   r0, r7[-0x6]
++;;   castu.h r0
++;; to
++;;   ld.uh   r0, r7[-0x6]
++;;=============================================================================
++(define_peephole2
++  [(set (match_operand:HI 0 "register_operand" "")
++	(match_operand:HI 1 "memory_operand" ""))
++   (set (match_operand:SI 2 "register_operand" "")
++	(zero_extend:SI (match_dup 0)))]
++  "(REGNO(operands[0]) == REGNO(operands[2])) || peep2_reg_dead_p(2, operands[0])"
++  [(set (match_dup 2)
++	(zero_extend:SI (match_dup 1)))]
++  "")
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   mul     rd, rx, ry
++;;   add     rd2, rd  
++;; or
++;;   add     rd2, rd, rd2  
++;; to
++;;   mac     rd2, rx, ry
++;;=============================================================================
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (mult:SI (match_operand:SI 1 "register_operand" "")
++                (match_operand:SI 2 "register_operand" "")))
++   (set (match_operand:SI 3 "register_operand" "")
++        (plus:SI (match_dup 3)
++                 (match_dup 0)))]
++  "peep2_reg_dead_p(2, operands[0])"
++  [(set (match_dup 3)
++	(plus:SI (mult:SI (match_dup 1)
++			  (match_dup 2))
++		 (match_dup 3)))]
++  "")
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (mult:SI (match_operand:SI 1 "register_operand" "")
++                (match_operand:SI 2 "register_operand" "")))
++   (set (match_operand:SI 3 "register_operand" "")
++        (plus:SI (match_dup 0)
++                 (match_dup 3)))]
++  "peep2_reg_dead_p(2, operands[0])"
++  [(set (match_dup 3)
++	(plus:SI (mult:SI (match_dup 1)
++			  (match_dup 2))
++		 (match_dup 3)))]
++  "")
++
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Changing
++;;   bfextu  rd, rs, k5, 1 or and(h/l) rd, one_bit_set_mask
++;; to
++;;   bld     rs, k5
++;;
++;; If rd is dead after the operation.
++;;=============================================================================
++(define_peephole2
++  [ (set (match_operand:SI 0 "register_operand" "")
++         (zero_extract:SI (match_operand:SI 1 "register_operand" "")
++                          (const_int 1)
++                          (match_operand:SI 2 "immediate_operand" "")))
++    (set (cc0)
++         (match_dup 0))]
++  "peep2_reg_dead_p(2, operands[0])"
++  [(set (cc0)
++        (and:SI (match_dup 1)
++                (match_dup 2)))]
++  "operands[2] = GEN_INT(1 << INTVAL(operands[2]));")
++
++(define_peephole2
++  [ (set (match_operand:SI 0 "register_operand" "")
++         (and:SI (match_operand:SI 1 "register_operand" "")
++                 (match_operand:SI 2 "one_bit_set_operand" "")))
++    (set (cc0)
++         (match_dup 0))]
++  "peep2_reg_dead_p(2, operands[0])"
++  [(set (cc0)
++        (and:SI (match_dup 1)
++                (match_dup 2)))]
++  "")
++
++;;=============================================================================
++;; Peephole optimizing
++;;-----------------------------------------------------------------------------
++;; Load with extracted index: ld.w  Rd, Rb[Ri:{t/u/b/l} << 2]
++;;
++;;=============================================================================
++
++
++(define_peephole
++  [(set (match_operand:SI 0 "register_operand" "")
++        (zero_extract:SI (match_operand:SI 1 "register_operand" "")
++                         (const_int 8)
++                         (match_operand:SI 2 "avr32_extract_shift_operand" "")))
++   (set (match_operand:SI 3 "register_operand" "")
++        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
++                         (match_operand:SI 4 "register_operand" ""))))]
++
++  "(dead_or_set_p(insn, operands[0]))"
++  {
++   switch ( INTVAL(operands[2]) ){
++    case 0:
++         return "ld.w    %3, %4[%1:b << 2]";
++    case 8:
++         return "ld.w    %3, %4[%1:l << 2]";
++    case 16:
++         return "ld.w    %3, %4[%1:u << 2]";
++    case 24:
++         return "ld.w    %3, %4[%1:t << 2]";
++    default:
++         internal_error("illegal operand for ldxi");
++   }
++  }
++  [(set_attr "type" "load")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")]
++  )
++
++
++
++(define_peephole
++  [(set (match_operand:SI 0 "register_operand" "")
++        (and:SI (match_operand:SI 1 "register_operand" "") (const_int 255)))
++   (set (match_operand:SI 2 "register_operand" "")
++        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
++                         (match_operand:SI 3 "register_operand" ""))))]
++
++  "(dead_or_set_p(insn, operands[0]))"
++
++  "ld.w    %2, %3[%1:b << 2]"
++  [(set_attr "type" "load")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")]
++  )
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (zero_extract:SI (match_operand:SI 1 "register_operand" "")
++                         (const_int 8)
++                         (match_operand:SI 2 "avr32_extract_shift_operand" "")))
++   (set (match_operand:SI 3 "register_operand" "")
++        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
++                         (match_operand:SI 4 "register_operand" ""))))]
++
++  "(peep2_reg_dead_p(2, operands[0]))
++   || (REGNO(operands[0]) == REGNO(operands[3]))"
++  [(set (match_dup 3)
++	(mem:SI (plus:SI
++                 (match_dup 4)
++                 (mult:SI (zero_extract:SI (match_dup 1)
++                                           (const_int 8)
++                                           (match_dup 2))
++                          (const_int 4)))))]
++  )
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (zero_extend:SI (match_operand:QI 1 "register_operand" "")))
++   (set (match_operand:SI 2 "register_operand" "")
++        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
++                         (match_operand:SI 3 "register_operand" ""))))]
++
++  "(peep2_reg_dead_p(2, operands[0]))
++   || (REGNO(operands[0]) == REGNO(operands[2]))"
++  [(set (match_dup 2)
++	(mem:SI (plus:SI
++                 (match_dup 3)
++                 (mult:SI (zero_extract:SI (match_dup 1)
++                                           (const_int 8)
++                                           (const_int 0))
++                          (const_int 4)))))]
++  "operands[1] = gen_rtx_REG(SImode, REGNO(operands[1]));"
++  )
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (and:SI (match_operand:SI 1 "register_operand" "")
++                (const_int 255)))
++   (set (match_operand:SI 2 "register_operand" "")
++        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
++                         (match_operand:SI 3 "register_operand" ""))))]
++
++  "(peep2_reg_dead_p(2, operands[0]))
++   || (REGNO(operands[0]) == REGNO(operands[2]))"
++  [(set (match_dup 2)
++	(mem:SI (plus:SI
++                 (match_dup 3)
++                 (mult:SI (zero_extract:SI (match_dup 1)
++                                           (const_int 8)
++                                           (const_int 0))
++                          (const_int 4)))))]
++  ""
++  )
++
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (lshiftrt:SI (match_operand:SI 1 "register_operand" "")
++                     (const_int 24)))
++   (set (match_operand:SI 2 "register_operand" "")
++        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
++                         (match_operand:SI 3 "register_operand" ""))))]
++
++  "(peep2_reg_dead_p(2, operands[0]))
++   || (REGNO(operands[0]) == REGNO(operands[2]))"
++  [(set (match_dup 2)
++	(mem:SI (plus:SI
++                 (match_dup 3)
++                 (mult:SI (zero_extract:SI (match_dup 1)
++                                           (const_int 8)
++                                           (const_int 24))
++                          (const_int 4)))))]
++  ""
++  )
++
++
++;;************************************************
++;; ANDN
++;;
++;;************************************************
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (not:SI (match_operand:SI 1 "register_operand" "")))
++   (set (match_operand:SI 2 "register_operand" "")
++        (and:SI (match_dup 2)
++                (match_dup 0)))]
++  "peep2_reg_dead_p(2, operands[0])"
++
++  [(set (match_dup 2)
++        (and:SI  (match_dup 2)
++                 (not:SI (match_dup 1))
++                 ))]
++  ""
++)
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++        (not:SI (match_operand:SI 1 "register_operand" "")))
++   (set (match_operand:SI 2 "register_operand" "")
++        (and:SI (match_dup 0)
++                (match_dup 2)
++                ))]
++  "peep2_reg_dead_p(2, operands[0])"
++
++  [(set (match_dup 2)
++        (and:SI  (match_dup 2)
++                 (not:SI (match_dup 1))
++                 ))]
++
++  ""
++)
++
++
++;;=================================================================
++;; Addabs peephole
++;;=================================================================
++
++(define_peephole
++  [(set (match_operand:SI 2 "register_operand" "=r")
++ 	(abs:SI (match_operand:SI 1 "register_operand" "r")))
++   (set (match_operand:SI 0 "register_operand" "=r")
++ 	(plus:SI (match_operand:SI 3 "register_operand" "r")
++ 		 (match_dup 2)))]
++  "dead_or_set_p(insn, operands[2])"
++  "addabs  %0, %3, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "set_z")])
++
++(define_peephole
++  [(set (match_operand:SI 2 "register_operand" "=r")
++ 	(abs:SI (match_operand:SI 1 "register_operand" "r")))
++   (set (match_operand:SI 0 "register_operand" "=r")
++ 	(plus:SI (match_dup 2)
++                 (match_operand:SI 3 "register_operand" "r")))]
++  "dead_or_set_p(insn, operands[2])"
++  "addabs  %0, %3, %1"
++  [(set_attr "length" "4")
++   (set_attr "cc" "set_z")])
++
++
++;;=================================================================
++;; Detect roundings
++;;=================================================================
++
++(define_insn "*round"
++  [(set (match_operand:SI 0 "register_operand" "+r")
++        (ashiftrt:SI (plus:SI (match_dup 0)
++                              (match_operand:SI 1 "immediate_operand" "i"))
++                     (match_operand:SI 2 "immediate_operand" "i")))]
++  "avr32_rnd_operands(operands[1], operands[2])"
++
++  "satrnds    %0 >> %2, 31"
++
++  [(set_attr "type" "alu_sat")
++   (set_attr "length" "4")]
++
++  )
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand" "")
++	(plus:SI (match_dup 0)
++                 (match_operand:SI 1 "immediate_operand" "")))
++   (set (match_dup 0)
++	(ashiftrt:SI (match_dup 0)
++                     (match_operand:SI 2 "immediate_operand" "")))]
++  "avr32_rnd_operands(operands[1], operands[2])"
++
++  [(set (match_dup 0)
++        (ashiftrt:SI (plus:SI (match_dup 0)
++                              (match_dup 1))
++                     (match_dup 2)))]
++  )
++
++(define_peephole
++  [(set (match_operand:SI 0 "register_operand" "r")
++	(plus:SI (match_dup 0)
++                 (match_operand:SI 1 "immediate_operand" "i")))
++   (set (match_dup 0)
++	(ashiftrt:SI (match_dup 0)
++                     (match_operand:SI 2 "immediate_operand" "i")))]
++  "avr32_rnd_operands(operands[1], operands[2])"
++
++  "satrnds    %0 >> %2, 31"
++
++  [(set_attr "type" "alu_sat")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")]
++
++  )
++
++
++;;=================================================================
++;; mcall
++;;=================================================================
++(define_peephole
++  [(set (match_operand:SI 0 "register_operand"        "")
++	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
++   (parallel [(call (mem:SI (match_dup 0))
++                    (match_operand 2 "" ""))
++              (clobber (reg:SI LR_REGNUM))])]
++  "dead_or_set_p(insn, operands[0])"
++  "mcall    %1"
++  [(set_attr "type" "call")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")]
++)
++
++(define_peephole
++  [(set (match_operand:SI 2 "register_operand"        "")
++	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
++   (parallel [(set (match_operand 0 "register_operand" "")
++                   (call (mem:SI (match_dup 2))
++                         (match_operand 3 "" "")))
++              (clobber (reg:SI LR_REGNUM))])]
++  "dead_or_set_p(insn, operands[2])"
++  "mcall    %1"
++  [(set_attr "type" "call")
++   (set_attr "length" "4")
++   (set_attr "cc" "call_set")]
++)
++
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand"    "")
++	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
++   (parallel [(call (mem:SI (match_dup 0))
++                    (match_operand 2 "" ""))
++              (clobber (reg:SI LR_REGNUM))])]
++  "peep2_reg_dead_p(2, operands[0])"
++  [(parallel [(call (mem:SI (match_dup 1))
++                    (match_dup 2))
++              (clobber (reg:SI LR_REGNUM))])]
++  ""
++)
++
++(define_peephole2
++  [(set (match_operand:SI 0 "register_operand"        "")
++	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
++   (parallel [(set (match_operand 2 "register_operand" "")
++                   (call (mem:SI (match_dup 0))
++                         (match_operand 3 "" "")))
++              (clobber (reg:SI LR_REGNUM))])]
++  "(peep2_reg_dead_p(2, operands[0]) || (REGNO(operands[2]) == REGNO(operands[0])))"
++  [(parallel [(set (match_dup 2)
++                   (call (mem:SI (match_dup 1))
++                         (match_dup 3)))
++              (clobber (reg:SI LR_REGNUM))])]
++  ""
++)
++
++;;=================================================================
++;; Returning a value
++;;=================================================================
++
++
++(define_peephole
++  [(set (match_operand 0 "register_operand" "")
++        (match_operand 1 "register_operand" ""))
++   (return)]
++  "USE_RETURN_INSN (TRUE) && (REGNO(operands[0]) == RETVAL_REGNUM)
++   && (REGNO(operands[1]) != LR_REGNUM)
++   && (REGNO_REG_CLASS(REGNO(operands[1])) == GENERAL_REGS)"
++  "retal    %1"
++  [(set_attr "type" "call")
++   (set_attr "length" "2")]
++  )
++
++
++(define_peephole
++  [(set (match_operand 0 "register_operand" "r")
++        (match_operand 1 "immediate_operand" "i"))
++   (return)]
++  "(USE_RETURN_INSN (FALSE) && (REGNO(operands[0]) == RETVAL_REGNUM) &&
++   ((INTVAL(operands[1]) == -1) || (INTVAL(operands[1]) == 0) || (INTVAL(operands[1]) == 1)))"
++  {
++    avr32_output_return_instruction (TRUE, FALSE, NULL, operands[1]);
++    return "";
++  }
++  [(set_attr "type" "call")
++   (set_attr "length" "4")]
++  )
++
++(define_peephole
++  [(set (match_operand 0 "register_operand" "r")
++        (match_operand 1 "immediate_operand" "i"))
++   (unspec_volatile [(return)] VUNSPEC_EPILOGUE)]
++  "(REGNO(operands[0]) == RETVAL_REGNUM) &&
++   ((INTVAL(operands[1]) == -1) || (INTVAL(operands[1]) == 0) || (INTVAL(operands[1]) == 1))"
++  {
++    avr32_output_return_instruction (FALSE, FALSE, NULL, operands[1]);
++    return "";
++  }
++  ; Length is absolute worst case
++  [(set_attr "type" "branch")
++   (set_attr "length" "12")]
++  )
++
++(define_peephole
++  [(set (match_operand 0 "register_operand" "=r")
++        (if_then_else (match_operator 1 "avr32_comparison_operator"
++                                      [(match_operand 4 "register_operand" "r")
++                                       (match_operand 5 "register_immediate_operand" "rKs21")])
++                      (match_operand 2 "avr32_cond_register_immediate_operand" "rKs08")
++                      (match_operand 3 "avr32_cond_register_immediate_operand" "rKs08")))
++   (return)]
++  "USE_RETURN_INSN (TRUE) && (REGNO(operands[0]) == RETVAL_REGNUM)"
++  {
++   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
++
++   if ( GET_CODE(operands[2]) == REG
++        && GET_CODE(operands[3]) == REG
++        && REGNO(operands[2]) != LR_REGNUM
++        && REGNO(operands[3]) != LR_REGNUM ){
++      return "ret%1    %2\;ret%i1    %3";
++   } else if ( GET_CODE(operands[2]) == REG
++               && GET_CODE(operands[3]) == CONST_INT ){
++      if ( INTVAL(operands[3]) == -1
++           || INTVAL(operands[3]) == 0
++           || INTVAL(operands[3]) == 1 ){
++        return "ret%1    %2\;ret%i1    %d3";
++      } else {
++        return "mov%1    r12, %2\;mov%i1    r12, %3\;retal    r12";
++      }
++   } else if ( GET_CODE(operands[2]) == CONST_INT
++               && GET_CODE(operands[3]) == REG ){
++      if ( INTVAL(operands[2]) == -1
++           || INTVAL(operands[2]) == 0
++           || INTVAL(operands[2]) == 1 ){
++        return "ret%1    %d2\;ret%i1    %3";
++      } else {
++        return "mov%1    r12, %2\;mov%i1    r12, %3\;retal    r12";
++      }
++   } else {
++      if ( (INTVAL(operands[2]) == -1
++            || INTVAL(operands[2]) == 0
++            || INTVAL(operands[2]) == 1 )
++           && (INTVAL(operands[3]) == -1
++               || INTVAL(operands[3]) == 0
++               || INTVAL(operands[3]) == 1 )){
++        return "ret%1    %d2\;ret%i1    %d3";
++      } else {
++        return "mov%1    r12, %2\;mov%i1    r12, %3\;retal    r12";
++      }
++   }
++  }
++
++  [(set_attr "length" "10")
++   (set_attr "cc" "none")
++   (set_attr "type" "call")])
++  
++
++
++;;=================================================================
++;; mulnhh.w
++;;=================================================================
++
++(define_peephole2
++  [(set (match_operand:HI 0 "register_operand" "")
++        (neg:HI (match_operand:HI 1 "register_operand" "")))
++   (set (match_operand:SI 2 "register_operand" "")
++        (mult:SI
++         (sign_extend:SI (match_dup 0))
++         (sign_extend:SI (match_operand:HI 3 "register_operand" ""))))]
++  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[2]) == REGNO(operands[0]))"
++  [ (set (match_dup 2)
++         (mult:SI
++          (sign_extend:SI (neg:HI (match_dup 1)))
++          (sign_extend:SI (match_dup 3))))]
++  ""
++  )
++
++(define_peephole2
++  [(set (match_operand:HI 0 "register_operand" "")
++        (neg:HI (match_operand:HI 1 "register_operand" "")))
++   (set (match_operand:SI 2 "register_operand" "")
++        (mult:SI
++         (sign_extend:SI (match_operand:HI 3 "register_operand" ""))
++         (sign_extend:SI (match_dup 0))))]
++  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[2]) == REGNO(operands[0]))"
++  [ (set (match_dup 2)
++         (mult:SI
++          (sign_extend:SI (neg:HI (match_dup 1)))
++          (sign_extend:SI (match_dup 3))))]
++  ""
++  )
++
++
++
++;;=================================================================
++;; Vector set and extract operations
++;;=================================================================
++(define_insn "vec_setv2hi_hi"
++  [(set (match_operand:V2HI 0 "register_operand" "=r")
++        (vec_merge:V2HI
++         (match_dup 0)
++         (vec_duplicate:V2HI
++          (match_operand:HI 1 "register_operand" "r"))
++         (const_int 1)))]
++  ""
++  "bfins\t%0, %1, 16, 16"
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")])
++
++(define_insn "vec_setv2hi_lo"
++  [(set (match_operand:V2HI 0 "register_operand" "+r")
++        (vec_merge:V2HI
++         (match_dup 0)
++         (vec_duplicate:V2HI
++          (match_operand:HI 1 "register_operand" "r"))
++         (const_int 2)))]
++  ""
++  "bfins\t%0, %1, 0, 16"
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")])
++
++(define_expand "vec_setv2hi"
++  [(set (match_operand:V2HI 0 "register_operand" "")
++        (vec_merge:V2HI
++         (match_dup 0)
++         (vec_duplicate:V2HI
++          (match_operand:HI 1 "register_operand" ""))
++         (match_operand 2 "immediate_operand" "")))]
++  ""
++  { operands[2] = GEN_INT(INTVAL(operands[2]) + 1); }
++  )
++
++(define_insn "vec_extractv2hi"
++  [(set (match_operand:HI 0 "register_operand" "=r")
++        (vec_select:HI
++         (match_operand:V2HI 1 "register_operand" "r")
++         (parallel [(match_operand:SI 2 "immediate_operand" "i")])))]
++  ""
++  {
++   if ( INTVAL(operands[2]) == 0 )
++      return "bfextu\t%0, %1, 16, 16";
++   else
++      return "bfextu\t%0, %1, 0, 16";
++  }
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")])
++
++(define_insn "vec_extractv4qi"
++  [(set (match_operand:QI 0 "register_operand" "=r")
++        (vec_select:QI
++         (match_operand:V4QI 1 "register_operand" "r")
++         (parallel [(match_operand:SI 2 "immediate_operand" "i")])))]
++  ""
++  {
++   switch ( INTVAL(operands[2]) ){
++     case 0:
++       return "bfextu\t%0, %1, 24, 8";
++     case 1:
++       return "bfextu\t%0, %1, 16, 8";
++     case 2:
++       return "bfextu\t%0, %1, 8, 8";
++     case 3:
++       return "bfextu\t%0, %1, 0, 8";
++     default:
++       abort();
++   }
++  }
++  [(set_attr "type" "alu")
++   (set_attr "length" "4")
++   (set_attr "cc" "clobber")])
++
++
++(define_insn "concatv2hi"
++  [(set (match_operand:V2HI 0 "register_operand" "=r, r, r")
++        (vec_concat:V2HI
++         (match_operand:HI 1 "register_operand" "r, r, 0")
++         (match_operand:HI 2 "register_operand" "r, 0, r")))]
++  ""
++  "@
++   mov\t%0, %1\;bfins\t%0, %2, 0, 16
++   bfins\t%0, %2, 0, 16
++   bfins\t%0, %1, 16, 16"
++  [(set_attr "length" "6, 4, 4")
++   (set_attr "type" "alu")])
++
++
++;; Load the atomic operation description
++(include "sync.md")
++
++;; Load the SIMD description
++(include "simd.md")
++
++;; Include the FPU for uc3
++(include "uc3fpu.md")
+--- /dev/null
++++ b/gcc/config/avr32/avr32-modes.def
+@@ -0,0 +1 @@
++VECTOR_MODES (INT, 4);        /*            V4QI V2HI */
+--- /dev/null
++++ b/gcc/config/avr32/avr32.opt
+@@ -0,0 +1,93 @@
++; Options for the ATMEL AVR32 port of the compiler.
++
++; Copyright 2007 Atmel Corporation.
++;
++; This file is part of GCC.
++;
++; GCC is free software; you can redistribute it and/or modify it under
++; the terms of the GNU General Public License as published by the Free
++; Software Foundation; either version 2, or (at your option) any later
++; version.
++;
++; GCC is distributed in the hope that 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 GCC; see the file COPYING.  If not, write to the Free
++; Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
++; 02110-1301, USA.
++
++muse-rodata-section
++Target Report Mask(USE_RODATA_SECTION)
++Use section .rodata for read-only data instead of .text.
++
++mhard-float
++Target Report Mask(HARD_FLOAT)
++Use FPU instructions instead of floating point emulation.
++
++msoft-float
++Target Report InverseMask(HARD_FLOAT, SOFT_FLOAT)
++Use floating point emulation for floating point operations.
++
++mforce-double-align
++Target Report RejectNegative Mask(FORCE_DOUBLE_ALIGN)
++Force double-word alignment for double-word memory accesses.
++
++mno-init-got
++Target Report RejectNegative Mask(NO_INIT_GOT)
++Do not initialize GOT register before using it when compiling PIC code.
++
++mrelax
++Target Report Mask(RELAX)
++Let invoked assembler and linker do relaxing (Enabled by default when optimization level is >1).
++
++mmd-reorg-opt
++Target Report Undocumented Mask(MD_REORG_OPTIMIZATION)
++Perform machine dependent optimizations in reorg stage.
++
++masm-addr-pseudos
++Target Report Mask(HAS_ASM_ADDR_PSEUDOS) 
++Use assembler pseudo-instructions lda.w and call for handling direct addresses. (Enabled by default)
++
++mpart=
++Target Report RejectNegative Joined Var(avr32_part_name)
++Specify the AVR32 part name
++
++mcpu=
++Target Report RejectNegative Joined Undocumented Var(avr32_part_name)
++Specify the AVR32 part name (deprecated)
++
++march=
++Target Report RejectNegative Joined Var(avr32_arch_name)
++Specify the AVR32 architecture name
++
++mfast-float
++Target Report Mask(FAST_FLOAT)
++Enable fast floating-point library. Enabled by default if the -funsafe-math-optimizations switch is specified.
++
++mimm-in-const-pool
++Target Report Var(avr32_imm_in_const_pool) Init(-1)
++Put large immediates in constant pool. This is enabled by default for archs with insn-cache.
++
++mno-pic
++Target Report RejectNegative Mask(NO_PIC)
++Do not generate position-independent code. (deprecated, use -fno-pic instead)
++
++mcond-exec-before-reload
++Target Report Undocumented Mask(COND_EXEC_BEFORE_RELOAD) 
++Enable experimental conditional execution preparation before the reload stage. 
++
++mrmw-addressable-data
++Target Report Mask(RMW_ADDRESSABLE_DATA)
++Signal that all data is in range for the Atomic Read-Modify-Write memory instructions, and that
++gcc can safely generate these whenever possible. 
++
++mflashvault
++Target Var(TARGET_FLASHVAULT)
++Generate code for flashvault
++
++mlist-devices
++Target RejectNegative Var(avr32_list_supported_parts)
++Print the list of parts supported while printing --target-help.
+--- /dev/null
++++ b/gcc/config/avr32/avr32-protos.h
+@@ -0,0 +1,196 @@
++/*
++   Prototypes for exported functions defined in avr32.c
++   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
++
++   This file is part of GCC.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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 AVR32_PROTOS_H
++#define AVR32_PROTOS_H
++
++extern const int swap_reg[];
++
++extern int avr32_valid_macmac_bypass (rtx, rtx);
++extern int avr32_valid_mulmac_bypass (rtx, rtx);
++
++extern int avr32_decode_lcomm_symbol_offset (rtx, int *);
++extern void avr32_encode_lcomm_symbol_offset (tree, char *, int);
++
++extern const char *avr32_strip_name_encoding (const char *);
++
++extern rtx avr32_get_note_reg_equiv (rtx insn);
++
++extern int avr32_use_return_insn (int iscond);
++
++extern void avr32_make_reglist16 (int reglist16_vect, char *reglist16_string);
++
++extern void avr32_make_reglist8 (int reglist8_vect, char *reglist8_string);
++extern void avr32_make_fp_reglist_w (int reglist_mask, char *reglist_string);
++extern void avr32_make_fp_reglist_d (int reglist_mask, char *reglist_string);
++
++extern void avr32_output_return_instruction (int single_ret_inst,
++					     int iscond, rtx cond,
++					     rtx r12_imm);
++extern void avr32_expand_prologue (void);
++extern void avr32_set_return_address (rtx source, rtx scratch);
++
++extern int avr32_hard_regno_mode_ok (int regno, enum machine_mode mode);
++extern int avr32_extra_constraint_s (rtx value, const int strict);
++extern int avr32_eh_return_data_regno (const int n);
++extern int avr32_initial_elimination_offset (const int from, const int to);
++extern rtx avr32_function_arg (CUMULATIVE_ARGS * cum, enum machine_mode mode,
++			       tree type, int named);
++extern void avr32_init_cumulative_args (CUMULATIVE_ARGS * cum, tree fntype,
++					rtx libname, tree fndecl);
++extern void avr32_function_arg_advance (CUMULATIVE_ARGS * cum,
++					enum machine_mode mode,
++					tree type, int named);
++#ifdef ARGS_SIZE_RTX
++/* expr.h defines ARGS_SIZE_RTX and `enum direction'.  */
++extern enum direction avr32_function_arg_padding (enum machine_mode mode,
++						  tree type);
++#endif /* ARGS_SIZE_RTX */
++extern rtx avr32_function_value (tree valtype, tree func, bool outgoing);
++extern rtx avr32_libcall_value (enum machine_mode mode);
++extern int avr32_sched_use_dfa_pipeline_interface (void);
++extern bool avr32_return_in_memory (tree type, tree fntype);
++extern void avr32_regs_to_save (char *operand);
++extern void avr32_target_asm_function_prologue (FILE * file,
++						HOST_WIDE_INT size);
++extern void avr32_target_asm_function_epilogue (FILE * file,
++						HOST_WIDE_INT size);
++extern void avr32_trampoline_template (FILE * file);
++extern void avr32_initialize_trampoline (rtx addr, rtx fnaddr,
++					 rtx static_chain);
++extern int avr32_legitimate_address (enum machine_mode mode, rtx x,
++				     int strict);
++extern int avr32_legitimate_constant_p (rtx x);
++
++extern int avr32_legitimate_pic_operand_p (rtx x);
++
++extern rtx avr32_find_symbol (rtx x);
++extern void avr32_select_section (rtx exp, int reloc, int align);
++extern void avr32_encode_section_info (tree decl, rtx rtl, int first);
++extern void avr32_asm_file_end (FILE * stream);
++extern void avr32_asm_output_ascii (FILE * stream, char *ptr, int len);
++extern void avr32_asm_output_common (FILE * stream, const char *name,
++				     int size, int rounded);
++extern void avr32_asm_output_label (FILE * stream, const char *name);
++extern void avr32_asm_declare_object_name (FILE * stream, char *name,
++					   tree decl);
++extern void avr32_asm_globalize_label (FILE * stream, const char *name);
++extern void avr32_asm_weaken_label (FILE * stream, const char *name);
++extern void avr32_asm_output_external (FILE * stream, tree decl,
++				       const char *name);
++extern void avr32_asm_output_external_libcall (FILE * stream, rtx symref);
++extern void avr32_asm_output_labelref (FILE * stream, const char *name);
++extern void avr32_notice_update_cc (rtx exp, rtx insn);
++extern void avr32_print_operand (FILE * stream, rtx x, int code);
++extern void avr32_print_operand_address (FILE * stream, rtx x);
++
++extern int avr32_symbol (rtx x);
++
++extern void avr32_select_rtx_section (enum machine_mode mode, rtx x,
++				      unsigned HOST_WIDE_INT align);
++
++extern int avr32_load_multiple_operation (rtx op, enum machine_mode mode);
++extern int avr32_store_multiple_operation (rtx op, enum machine_mode mode);
++
++extern int avr32_const_ok_for_constraint_p (HOST_WIDE_INT value, char c,
++					    const char *str);
++
++extern bool avr32_cannot_force_const_mem (rtx x);
++
++extern void avr32_init_builtins (void);
++
++extern rtx avr32_expand_builtin (tree exp, rtx target, rtx subtarget,
++				 enum machine_mode mode, int ignore);
++
++extern bool avr32_must_pass_in_stack (enum machine_mode mode, tree type);
++
++extern bool avr32_strict_argument_naming (CUMULATIVE_ARGS * ca);
++
++extern bool avr32_pass_by_reference (CUMULATIVE_ARGS * cum,
++				     enum machine_mode mode,
++				     tree type, bool named);
++
++extern rtx avr32_gen_load_multiple (rtx * regs, int count, rtx from,
++				    int write_back, int in_struct_p,
++				    int scalar_p);
++extern rtx avr32_gen_store_multiple (rtx * regs, int count, rtx to,
++				     int in_struct_p, int scalar_p);
++extern int avr32_gen_movmemsi (rtx * operands);
++
++extern int avr32_rnd_operands (rtx add, rtx shift);
++extern int avr32_adjust_insn_length (rtx insn, int length);
++
++extern int symbol_mentioned_p (rtx x);
++extern int label_mentioned_p (rtx x);
++extern rtx legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg);
++extern int avr32_address_register_rtx_p (rtx x, int strict_p);
++extern int avr32_legitimate_index_p (enum machine_mode mode, rtx index,
++				     int strict_p);
++
++extern int avr32_const_double_immediate (rtx value);
++extern void avr32_init_expanders (void);
++extern rtx avr32_return_addr (int count, rtx frame);
++extern bool avr32_got_mentioned_p (rtx addr);
++
++extern void avr32_final_prescan_insn (rtx insn, rtx * opvec, int noperands);
++
++extern int avr32_expand_movcc (enum machine_mode mode, rtx operands[]);
++extern int avr32_expand_addcc (enum machine_mode mode, rtx operands[]);
++#ifdef RTX_CODE
++extern int avr32_expand_scc (RTX_CODE cond, rtx * operands);
++#endif
++
++extern int avr32_store_bypass (rtx insn_out, rtx insn_in);
++extern int avr32_mul_waw_bypass (rtx insn_out, rtx insn_in);
++extern int avr32_valid_load_double_bypass (rtx insn_out, rtx insn_in);
++extern int avr32_valid_load_quad_bypass (rtx insn_out, rtx insn_in);
++extern rtx avr32_output_cmp (rtx cond, enum machine_mode mode,
++			     rtx op0, rtx op1);
++
++rtx get_next_insn_cond (rtx cur_insn);
++int set_next_insn_cond (rtx cur_insn, rtx cond);
++rtx next_insn_emits_cmp (rtx cur_insn);
++void avr32_override_options (void);
++void avr32_load_pic_register (void);
++#ifdef GCC_BASIC_BLOCK_H
++rtx avr32_ifcvt_modify_insn (ce_if_block_t *ce_info, rtx pattern, rtx insn, 
++                             int *num_true_changes);
++rtx avr32_ifcvt_modify_test (ce_if_block_t *ce_info, rtx test );
++void avr32_ifcvt_modify_cancel ( ce_if_block_t *ce_info, int *num_true_changes);
++#endif
++void avr32_optimization_options (int level, int size);
++int avr32_const_ok_for_move (HOST_WIDE_INT c);
++
++void avr32_split_const_expr (enum machine_mode mode,
++                             enum machine_mode new_mode,
++                             rtx expr, 
++                             rtx *split_expr);
++void avr32_get_intval (enum machine_mode mode,
++                       rtx const_expr, 
++                       HOST_WIDE_INT *val);
++
++int avr32_cond_imm_clobber_splittable (rtx insn, 
++                                       rtx operands[]);
++
++bool avr32_flashvault_call(tree decl);
++extern void avr32_emit_swdivsf (rtx, rtx, rtx);
++
++#endif /* AVR32_PROTOS_H */
+--- /dev/null
++++ b/gcc/config/avr32/crti.asm
+@@ -0,0 +1,64 @@
++/*
++   Init/fini stuff for AVR32.
++   Copyright 2003-2006 Atmel Corporation.
++
++   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
++
++   This file is part of GCC.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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. */
++
++	
++/* The code in sections .init and .fini is supposed to be a single
++   regular function.  The function in .init is called directly from
++   start in crt1.asm.  The function in .fini is atexit()ed in crt1.asm
++   too.
++
++   crti.asm contributes the prologue of a function to these sections,
++   and crtn.asm comes up the epilogue.  STARTFILE_SPEC should list
++   crti.o before any other object files that might add code to .init
++   or .fini sections, and ENDFILE_SPEC should list crtn.o after any
++   such object files.  */
++		
++	.file		"crti.asm"
++
++	.section	".init"
++/* Just load the GOT */
++	.align 2
++	.global	_init
++_init:
++	stm	--sp, r6, lr
++	lddpc	r6, 1f		
++0:	
++	rsub	r6, pc
++	rjmp	2f
++	.align	2
++1:	.long	0b - _GLOBAL_OFFSET_TABLE_		
++2:	
++				
++	.section	".fini"
++/* Just load the GOT */
++	.align	2
++	.global	_fini
++_fini:
++	stm	--sp, r6, lr
++	lddpc	r6, 1f		
++0:	
++	rsub	r6, pc
++	rjmp	2f
++	.align	2
++1:	.long	0b - _GLOBAL_OFFSET_TABLE_		
++2:	
++
+--- /dev/null
++++ b/gcc/config/avr32/crtn.asm
+@@ -0,0 +1,44 @@
++/*   Copyright (C) 2001 Free Software Foundation, Inc.
++    Written By Nick Clifton
++
++  This file is free software; you can redistribute it and/or modify it
++  under the terms of the GNU General Public License as published by the
++  Free Software Foundation; either version 2, or (at your option) any
++  later version.
++
++  In addition to the permissions in the GNU General Public License, the
++  Free Software Foundation gives you unlimited permission to link the
++  compiled version of this file with other programs, and to distribute
++  those programs without any restriction coming from the use of this
++  file.  (The General Public License restrictions do apply in other
++  respects; for example, they cover modification of the file, and
++  distribution when not linked into another program.)
++
++  This file is distributed in the hope that 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; see the file COPYING.  If not, write to
++  the Free Software Foundation, 59 Temple Place - Suite 330,
++  Boston, MA 02111-1307, USA.
++
++     As a special exception, if you link this library with files
++     compiled with GCC to produce an executable, this does not cause
++     the resulting executable to be covered by the GNU General Public License.
++     This exception does not however invalidate any other reasons why
++     the executable file might be covered by the GNU General Public License.
++*/
++
++
++
++	
++	.file		"crtn.asm"
++
++	.section	".init"
++	ldm	sp++, r6, pc
++			
++	.section	".fini"
++	ldm	sp++, r6, pc
++		
+--- /dev/null
++++ b/gcc/config/avr32/lib1funcs.S
+@@ -0,0 +1,2903 @@
++/* Macro for moving immediate value to register. */	
++.macro mov_imm	reg, imm
++.if	(((\imm & 0xfffff) == \imm) || ((\imm | 0xfff00000) == \imm))
++	mov	\reg, \imm
++#if __AVR32_UC__ >= 2
++.elseif	((\imm & 0xffff) == 0)
++	movh	\reg, hi(\imm)
++
++#endif
++.else
++	mov	\reg, lo(\imm)
++	orh	\reg, hi(\imm)
++.endif
++.endm
++	
++	
++	 
++/* Adjust the unpacked double number if it is a subnormal number.
++   The exponent and mantissa pair are stored
++   in [mant_hi,mant_lo] and [exp]. A register with the correct sign bit in
++   the MSB is passed in [sign]. Needs two scratch
++   registers [scratch1] and [scratch2]. An adjusted and packed double float
++   is present in [mant_hi,mant_lo] after macro has executed */
++.macro  adjust_subnormal_df     exp, mant_lo, mant_hi, sign, scratch1, scratch2 
++        /* We have an exponent which is <=0 indicating a subnormal number
++           As it should be stored as if the exponent was 1 (although the
++           exponent field is all zeros to indicate a subnormal number)
++           we have to shift down the mantissa to its correct position. */
++        neg     \exp
++        sub     \exp,-1                   /* amount to shift down */
++        cp.w    \exp,54
++        brlo    50f                     /* if more than 53 shift steps, the
++                                           entire mantissa will disappear
++                                           without any rounding to occur */
++        mov     \mant_hi, 0
++        mov     \mant_lo, 0
++        rjmp    52f
++50:     
++        sub     \exp,-10                /* do the shift to position the
++                                           mantissa at the same time
++                                           note! this does not include the
++                                           final 1 step shift to add the sign */
++ 
++        /* when shifting, save all shifted out bits in [scratch2]. we may need to
++           look at them to make correct rounding. */
++ 
++        rsub    \scratch1,\exp,32       /* get inverted shift count */
++        cp.w    \exp,32                 /* handle shifts >= 32 separately */
++        brhs    51f
++ 
++        /* small (<32) shift amount, both words are part of the shift */
++        lsl     \scratch2,\mant_lo,\scratch1               /* save bits to shift out from lsw*/
++        lsl     \scratch1,\mant_hi,\scratch1               /* get bits from msw destined for lsw*/
++        lsr     \mant_lo,\mant_lo,\exp                     /* shift down lsw */
++        lsr     \mant_hi,\mant_hi,\exp                     /* shift down msw */
++        or      \mant_hi,\scratch1                         /* add bits from msw with prepared lsw */
++        rjmp    50f
++ 
++        /* large (>=32) shift amount, only lsw will have bits left after shift.
++           note that shift operations will use ((shift count) mod 32) so
++           we do not need to subtract 32 from shift count. */
++51:
++        lsl     \scratch2,\mant_hi,\scratch1               /* save bits to shift out from msw */
++        or      \scratch2,\mant_lo                         /* also save all bits from lsw */
++        mov     \mant_lo,\mant_hi                          /* msw -> lsw (i.e. "shift 32 first") */
++        mov     \mant_hi,0                                 /* clear msw */
++        lsr     \mant_lo,\mant_lo,\exp                     /* make rest of shift inside lsw */
++ 
++50:
++        /* result is almost ready to return, except that least significant bit
++           and the part we already shifted out may cause the result to be
++           rounded */
++        bld     \mant_lo,0                   /* get bit to be shifted out */
++        brcc    51f                          /* if bit was 0, no rounding */
++ 
++        /* msb of part to remove is 1, so rounding depends on rest of bits */
++        tst     \scratch2,\scratch2                   /* get shifted out tail */
++        brne    50f     /* if rest > 0, do round */
++        bld     \mant_lo,1                   /* we have to look at lsb in result */
++        brcc    51f   /* if lsb is 0, don't round */
++ 
++50:
++        /* subnormal result requires rounding
++           rounding may cause subnormal to become smallest normal number
++           luckily, smallest normal number has exactly the representation
++           we got by rippling a one bit up from mantissa into exponent field. */
++        sub     \mant_lo,-1
++        subcc   \mant_hi,-1
++ 
++51:
++        /* shift and return packed double with correct sign */
++        rol     \sign
++        ror     \mant_hi
++        ror     \mant_lo        
++52:     
++.endm
++ 
++ 
++/* Adjust subnormal single float number with exponent [exp]
++   and mantissa [mant] and round.    */
++.macro  adjust_subnormal_sf     sf, exp, mant, sign, scratch
++        /* subnormal number */
++        rsub    \exp,\exp, 1            /* shift amount */
++        cp.w    \exp, 25
++        movhs   \mant, 0                
++        brhs    90f                     /* Return zero */
++        rsub    \scratch, \exp, 32
++        lsl     \scratch, \mant,\scratch/* Check if there are any bits set
++                                           in the bits discarded in the mantissa */
++        srne    \scratch                /* If so set the lsb of the shifted mantissa */ 
++        lsr     \mant,\mant,\exp        /* Shift the mantissa */
++        or      \mant, \scratch         /* Round lsb if any bits were shifted out  */
++        /* Rounding :   For explaination, see round_sf. */
++        mov     \scratch, 0x7f          /* Set rounding constant */
++        bld     \mant, 8                
++        subeq   \scratch, -1            /* For odd numbers use rounding constant 0x80 */
++        add     \mant, \scratch         /* Add rounding constant to mantissa */
++        /* We can't overflow because mantissa is at least shifted one position
++           to the right so the implicit bit is zero. We can however get the implicit
++           bit set after rounding which means that we have the lowest normal number
++           but this is ok since this bit has the same position as the LSB of the
++           exponent */
++        lsr     \sf, \mant, 7
++        /* Rotate in sign */
++        lsl     \sign, 1
++        ror     \sf
++90:     
++.endm
++ 
++ 
++/* Round the unpacked df number with exponent [exp] and
++   mantissa [mant_hi, mant_lo]. Uses scratch register
++   [scratch] */
++.macro  round_df        exp, mant_lo, mant_hi, scratch
++        mov     \scratch, 0x3ff         /* Rounding constant */
++        bld     \mant_lo,11             /* Check if lsb in the final result is  
++                                           set */
++        subeq   \scratch, -1            /* Adjust rounding constant to 0x400
++                                           if rounding 0.5 upwards */   
++        add     \mant_lo, \scratch      /* Round */
++        acr     \mant_hi                /* If overflowing we know that
++                                           we have all zeros in the bits not
++                                           scaled out so we can leave them
++                                           but we must increase the exponent with
++                                           two since we had an implicit bit
++                                           which is lost + the extra overflow bit */
++        subcs   \exp, -2                /* Update exponent */
++.endm           
++ 
++/* Round single float number stored in [mant] and [exp] */
++.macro  round_sf        exp, mant, scratch
++        /* Round:       
++                For 0.5 we round to nearest even integer
++                for all other cases we round to nearest integer.
++                This means that if the digit left of the "point" (.)
++                is 1 we can add 0x80 to the mantissa since the
++                corner case 0x180 will round up to 0x200. If the
++                digit left of the "point" is 0 we will have to
++                add 0x7f since this will give 0xff and hence a
++                truncation/rounding downwards for the corner
++                case when the 9 lowest bits are 0x080 */
++        mov     \scratch, 0x7f  /* Set rounding constant */
++        /* Check if the mantissa is even or odd */
++        bld     \mant, 8
++        subeq   \scratch, -1    /* Rounding constant should be 0x80 */
++        add     \mant, \scratch
++        subcs   \exp, -2        /* Adjust exponent if we overflowed */          
++.endm
++ 
++                 
++ 
++/* Pack a single float number stored in [mant] and [exp]
++   into a single float number in [sf]  */
++.macro  pack_sf sf, exp, mant
++        bld     \mant,31                  /* implicit bit to z */
++        subne   \exp,1                   /* if subnormal (implicit bit 0)
++                                          adjust exponent to storage format */
++        
++        lsr     \sf, \mant, 7
++        bfins   \sf, \exp, 24, 8
++.endm   
++ 
++/* Pack exponent [exp] and mantissa [mant_hi, mant_lo]
++   into [df_hi, df_lo].  [df_hi] is shifted
++   one bit up so the sign bit can be shifted into it */
++        
++.macro  pack_df         exp, mant_lo, mant_hi, df_lo, df_hi
++        bld     \mant_hi,31                  /* implicit bit to z */
++        subne   \exp,1                   /* if subnormal (implicit bit 0)
++                                          adjust exponent to storage format */
++ 
++        lsr     \mant_lo,11                  /* shift back lsw */
++        or      \df_lo,\mant_lo,\mant_hi<<21          /* combine with low bits from msw */
++        lsl     \mant_hi,1                   /* get rid of implicit bit */
++        lsr     \mant_hi,11                  /* shift back msw except for one step*/
++        or      \df_hi,\mant_hi,\exp<<21          /* combine msw with exponent */
++.endm
++ 
++/* Normalize single float number stored in [mant] and [exp]
++   using scratch register [scratch] */
++.macro  normalize_sf    exp, mant, scratch
++        /* Adjust exponent and mantissa */
++        clz     \scratch, \mant
++        sub     \exp, \scratch
++        lsl     \mant, \mant, \scratch
++.endm
++ 
++/* Normalize the exponent and mantissa pair stored
++   in [mant_hi,mant_lo] and [exp]. Needs two scratch
++   registers [scratch1] and [scratch2]. */
++.macro  normalize_df            exp, mant_lo, mant_hi, scratch1, scratch2
++        clz     \scratch1,\mant_hi     /* Check if we have zeros in high bits */
++        breq    80f                     /* No need for scaling if no zeros in high bits */
++        brcs    81f                     /* Check for all zeros */           
++ 
++        /* shift amount is smaller than 32, and involves both msw and lsw*/
++        rsub    \scratch2,\scratch1,32  /* shift mantissa */
++        lsl     \mant_hi,\mant_hi,\scratch1
++        lsr     \scratch2,\mant_lo,\scratch2
++        or      \mant_hi,\scratch2
++        lsl     \mant_lo,\mant_lo,\scratch1
++        sub     \exp,\scratch1          /* adjust exponent */
++        rjmp    80f                     /* Finished */  
++81:
++        /* shift amount is greater than 32 */
++        clz     \scratch1,\mant_lo      /* shift mantissa */
++        movcs   \scratch1, 0
++        subcc   \scratch1,-32
++        lsl     \mant_hi,\mant_lo,\scratch1
++        mov     \mant_lo,0
++        sub     \exp,\scratch1          /* adjust exponent */
++80:     
++.endm
++        
++ 
++/* Fast but approximate multiply of two 64-bit numbers to give a 64 bit result.
++   The multiplication of [al]x[bl] is discarded.
++   Operands in [ah], [al], [bh], [bl].
++   Scratch registers in [sh], [sl].
++   Returns results in registers [rh], [rl].*/
++.macro  mul_approx_df   ah, al, bh, bl, rh, rl, sh, sl
++        mulu.d  \sl, \ah, \bl
++        macu.d  \sl, \al, \bh
++        mulu.d  \rl, \ah, \bh
++        add     \rl, \sh
++        acr     \rh
++.endm           
++ 
++ 
++        
++#if defined(L_avr32_f64_mul) || defined(L_avr32_f64_mul_fast)
++        .align  2
++#if defined(L_avr32_f64_mul)
++        .global __avr32_f64_mul
++        .type  __avr32_f64_mul,@function
++__avr32_f64_mul:
++#else 
++        .global __avr32_f64_mul_fast
++        .type  __avr32_f64_mul_fast,@function
++__avr32_f64_mul_fast:
++#endif                
++        or      r12, r10, r11 << 1 
++        breq   __avr32_f64_mul_op1_zero        
++
++#if defined(L_avr32_f64_mul)
++	pushm	r4-r7, lr
++#else
++        stm     --sp, r5,r6,r7,lr       
++#endif
++
++#define AVR32_F64_MUL_OP1_INT_BITS 1
++#define AVR32_F64_MUL_OP2_INT_BITS 10
++#define AVR32_F64_MUL_RES_INT_BITS 11
++	
++        /* op1 in {r11,r10}*/
++        /* op2 in {r9,r8}*/
++        eor     lr, r11, r9             /* MSB(lr) = Sign(op1) ^ Sign(op2) */
++ 
++        /* Unpack op1 to 1.63 format*/        
++        /* exp: r7 */
++        /* sf:  r11, r10 */
++	bfextu	r7, r11, 20, 11 /* Extract exponent */
++
++	mov	r5, 1
++
++        /* Check if normalization is needed */
++        breq    __avr32_f64_mul_op1_subnormal /*If number is subnormal, normalize it */ 
++
++        lsl     r11, (12-AVR32_F64_MUL_OP1_INT_BITS-1) /* Extract mantissa, leave room for implicit bit */ 
++        or      r11, r11, r10>>(32-(12-AVR32_F64_MUL_OP1_INT_BITS-1))
++        lsl     r10, (12-AVR32_F64_MUL_OP1_INT_BITS-1)
++	bfins	r11, r5, 32 - (1 + AVR32_F64_MUL_OP1_INT_BITS), 1 + AVR32_F64_MUL_OP1_INT_BITS /* Insert implicit bit */
++
++
++22:     
++        /* Unpack op2 to 10.54 format */
++        /* exp: r6 */
++        /* sf:  r9, r8 */
++	bfextu	r6, r9, 20, 11 /* Extract exponent */
++
++        /* Check if normalization is needed */
++        breq    __avr32_f64_mul_op2_subnormal /*If number is subnormal, normalize it */ 
++
++	lsl	r8, 1 /* Extract mantissa, leave room for implicit bit */
++	rol	r9	
++	bfins	r9, r5, 32 - (1 + AVR32_F64_MUL_OP2_INT_BITS), 1 + AVR32_F64_MUL_OP2_INT_BITS /* Insert implicit bit */
++
++23:     
++ 
++        /* Check if any operands are NaN or INF */
++        cp      r7, 0x7ff
++        breq    __avr32_f64_mul_op_nan_or_inf /* Check op1 for NaN or Inf */
++        cp      r6, 0x7ff
++        breq    __avr32_f64_mul_op_nan_or_inf  /* Check op2 for NaN or Inf */
++ 
++ 
++        /* Calculate new exponent in r12*/
++        add     r12, r7, r6
++        sub     r12, (1023-1)
++ 
++#if defined(L_avr32_f64_mul)
++	/* Do the multiplication.
++           Place result in [r11, r10, r7, r6]. The result is in 11.117 format.  */
++        mulu.d  r4, r11, r8
++        macu.d  r4, r10, r9
++        mulu.d  r6, r10, r8
++        mulu.d  r10, r11, r9
++	add	r7, r4
++	adc	r10, r10, r5	
++	acr	r11
++#else
++	/* Do the multiplication using approximate calculation. discard the al x bl
++	   calculation.
++           Place result in [r11, r10, r7]. The result is in 11.85 format.  */
++
++        /* Do the multiplication using approximate calculation.
++         Place result in r11, r10. Use r7, r6 as scratch registers */
++        mulu.d  r6, r11, r8
++        macu.d  r6, r10, r9
++        mulu.d  r10, r11, r9
++        add     r10, r7
++        acr     r11
++#endif 
++        /* Adjust exponent and mantissa */
++        /* [r12]:exp, [r11, r10]:mant [r7, r6]:sticky bits */
++        /* Mantissa may be of the format 00000000000.0xxx or 00000000000.1xxx. */
++        /* In the first case, shift one pos to left.*/
++        bld     r11, 32-AVR32_F64_MUL_RES_INT_BITS-1
++	breq	0f	
++	lsl	r7, 1
++	rol	r10
++	rol	r11
++	sub	r12, 1
++0:	
++        cp      r12, 0  
++        brle    __avr32_f64_mul_res_subnormal /*Result was subnormal.*/
++ 
++        /* Check for Inf. */
++        cp.w    r12, 0x7ff
++        brge    __avr32_f64_mul_res_inf
++
++	/* Insert exponent. */
++	bfins	r11, r12, 20, 11  
++
++        /* Result was not subnormal. Perform rounding. */
++        /* For the fast version we discard the sticky bits and always round
++	   the halfwaycase up. */
++24:	
++#if defined(L_avr32_f64_mul)
++	or	r6, r6, r10 << 31 /* Or in parity bit into stickybits */
++	or	r7, r7, r6 >> 1   /* Or together sticky and still make the msb 
++				     of r7 represent the halfway bit. */
++	eorh	r7, 0x8000	  /* Toggle halfway bit. */
++	/* We should now round up by adding one for the following cases:
++
++		halfway   sticky|parity  round-up
++		   0            x           no
++		   1            0           no
++	           1            1           yes
++
++	   Since we have inverted the halfway bit we can use the satu instruction
++           by saturating to 1 bit to implement this. 
++	*/ 
++	satu	r7 >> 0, 1
++#else
++	lsr	r7, 31
++#endif	
++	add	r10, r7
++	acr	r11	
++        
++        /* Insert sign bit*/
++        bld     lr, 31
++        bst     r11, 31
++        
++        /* Return result in [r11,r10] */
++#if defined(L_avr32_f64_mul)
++	popm	r4-r7, pc
++#else
++        ldm     sp++, r5, r6, r7,pc
++#endif
++ 
++ 
++__avr32_f64_mul_op1_subnormal:
++	andh	r11, 0x000f /* Remove sign bit and exponent */
++        clz     r12, r10    /* Count leading zeros in lsw */
++        clz     r6, r11     /* Count leading zeros in msw */
++        subcs	r12, -32 + AVR32_F64_MUL_OP1_INT_BITS 
++	movcs	r6, r12
++	subcc	r6, AVR32_F64_MUL_OP1_INT_BITS
++	cp.w	r6, 32
++	brge	0f
++		
++        /* shifting involves both msw and lsw*/
++        rsub    r12, r6, 32  /* shift mantissa */
++        lsl     r11, r11, r6
++        lsr     r12, r10, r12
++        or      r11, r12
++        lsl     r10, r10, r6
++	sub	r6, 12-AVR32_F64_MUL_OP1_INT_BITS
++        sub     r7, r6          /* adjust exponent */
++        rjmp    22b             /* Finished */  
++0:
++        /* msw is zero so only need to consider lsw */
++        lsl     r11, r10, r6
++	breq	__avr32_f64_mul_res_zero
++        mov     r10, 0
++	sub	r6, 12-AVR32_F64_MUL_OP1_INT_BITS
++        sub     r7, r6            /* adjust exponent */
++        rjmp    22b
++
++ 
++__avr32_f64_mul_op2_subnormal:
++	andh	r9, 0x000f  /* Remove sign bit and exponent */
++        clz     r12, r8    /* Count leading zeros in lsw */
++        clz     r5, r9     /* Count leading zeros in msw */
++        subcs	r12, -32 + AVR32_F64_MUL_OP2_INT_BITS 
++	movcs	r5, r12
++	subcc	r5, AVR32_F64_MUL_OP2_INT_BITS
++	cp.w	r5, 32
++	brge	0f
++		
++        /* shifting involves both msw and lsw*/
++        rsub    r12, r5, 32  /* shift mantissa */
++        lsl     r9, r9, r5
++        lsr     r12, r8, r12
++        or      r9, r12
++        lsl     r8, r8, r5
++	sub	r5, 12 - AVR32_F64_MUL_OP2_INT_BITS
++        sub     r6, r5          /* adjust exponent */
++        rjmp    23b             /* Finished */  
++0:
++        /* msw is zero so only need to consider lsw */
++        lsl     r9, r8, r5
++	breq	__avr32_f64_mul_res_zero
++        mov     r8, 0
++	sub	r5, 12 - AVR32_F64_MUL_OP2_INT_BITS
++        sub     r6, r5            /* adjust exponent */
++        rjmp    23b
++                
++ 
++__avr32_f64_mul_op_nan_or_inf:
++        /* Same code for OP1 and OP2*/
++        /* Since we are here, at least one of the OPs were NaN or INF*/
++	andh	r9, 0x000f  /* Remove sign bit and exponent */
++	andh	r11, 0x000f  /* Remove sign bit and exponent */
++        /* Merge the regs in each operand to check for zero*/
++        or      r11, r10 /* op1 */
++        or      r9, r8 /* op2 */
++        /* Check if op1 is NaN or INF */
++        cp      r7, 0x7ff
++        brne    __avr32_f64_mul_op1_not_naninf
++        /* op1 was NaN or INF.*/
++        cp      r11, 0
++        brne    __avr32_f64_mul_res_nan /* op1 was NaN. Result will be NaN*/
++        /*op1 was INF. check if op2 is NaN or INF*/
++        cp      r6, 0x7ff
++        brne    __avr32_f64_mul_res_inf /*op1 was INF, op2 was neither NaN nor INF*/
++        /* op1 is INF, op2 is either NaN or INF*/
++        cp      r9, 0
++        breq    __avr32_f64_mul_res_inf /*op2 was also INF*/
++        rjmp    __avr32_f64_mul_res_nan /*op2 was NaN*/
++ 
++__avr32_f64_mul_op1_not_naninf:
++        /* op1 was not NaN nor INF. Then op2 must be NaN or INF*/
++        cp      r9, 0
++        breq    __avr32_f64_mul_res_inf /*op2 was INF, return INF*/
++        rjmp   __avr32_f64_mul_res_nan /*else return NaN*/
++        
++__avr32_f64_mul_res_subnormal:/* Multiply result was subnormal. */
++#if defined(L_avr32_f64_mul)
++	/* Check how much we must scale down the mantissa. */
++	neg	r12
++	sub	r12, -1     /* We do no longer have an implicit bit. */
++	satu	r12 >> 0, 6 /* Saturate shift amount to max 63. */
++	cp.w	r12, 32
++	brge	0f
++	/* Shift amount <32 */
++	rsub	r8, r12, 32
++	or	r6, r7 
++	lsr	r7, r7, r12
++	lsl	r9, r10, r8
++	or	r7, r9
++	lsr	r10, r10, r12
++	lsl	r9, r11, r8
++	or	r10, r9
++	lsr	r11, r11, r12
++	rjmp	24b
++0:
++	/* Shift amount >=32 */
++	rsub	r8, r12, 32
++	moveq	r9, 0
++	breq	0f
++	lsl	r9, r11, r8
++0:	
++	or	r6, r7
++	or	r6, r6, r10 << 1 
++	lsr	r10, r10, r12
++	or	r7, r9, r10
++	lsr	r10, r11, r12
++	mov	r11, 0	
++	rjmp	24b				
++#else
++	/* Flush to zero for the fast version. */
++        mov     r11, lr /*Get correct sign*/
++        andh    r11, 0x8000, COH
++        mov     r10, 0
++        ldm     sp++, r5, r6, r7,pc
++#endif
++
++__avr32_f64_mul_res_zero:/* Multiply result is zero. */
++        mov     r11, lr /*Get correct sign*/
++        andh    r11, 0x8000, COH
++        mov     r10, 0
++#if defined(L_avr32_f64_mul)
++	popm	r4-r7, pc
++#else
++        ldm     sp++, r5, r6, r7,pc
++#endif
++ 
++__avr32_f64_mul_res_nan:        /* Return NaN. */
++        mov     r11, -1
++        mov     r10, -1
++#if defined(L_avr32_f64_mul)
++	popm	r4-r7, pc
++#else
++        ldm     sp++, r5, r6, r7,pc
++#endif
++        
++__avr32_f64_mul_res_inf:        /* Return INF. */
++	mov	r11, 0xfff00000
++        bld     lr, 31
++        bst     r11, 31
++        mov     r10, 0
++#if defined(L_avr32_f64_mul)
++	popm	r4-r7, pc
++#else
++        ldm     sp++, r5, r6, r7,pc
++#endif
++
++__avr32_f64_mul_op1_zero:
++        /* Get sign */
++        eor     r11, r11, r9
++        andh    r11, 0x8000, COH  
++        /* Check if op2 is Inf or NaN. */
++        bfextu  r12, r9, 20, 11
++        cp.w    r12, 0x7ff
++        retne   r12     /* Return 0.0 */
++        /* Return NaN */
++        mov     r10, -1
++        mov     r11, -1
++        ret     r12
++         
++
++ 
++#endif
++                
++ 
++#if  defined(L_avr32_f64_addsub) || defined(L_avr32_f64_addsub_fast)
++        .align  2
++
++__avr32_f64_sub_from_add:
++        /* Switch sign on op2 */
++        eorh    r9, 0x8000
++
++#if  defined(L_avr32_f64_addsub_fast)
++        .global __avr32_f64_sub_fast
++        .type  __avr32_f64_sub_fast,@function
++__avr32_f64_sub_fast:
++#else	
++        .global __avr32_f64_sub
++        .type  __avr32_f64_sub,@function
++__avr32_f64_sub:
++#endif
++        
++        /* op1 in {r11,r10}*/
++        /* op2 in {r9,r8}*/
++
++#if  defined(L_avr32_f64_addsub_fast)
++        /* If op2 is zero just return op1 */
++        or      r12, r8, r9 << 1
++        reteq   r12 
++#endif
++ 
++        /* Check signs */
++        eor     r12, r11, r9
++        /* Different signs, use addition. */
++        brmi    __avr32_f64_add_from_sub
++ 
++        stm     --sp, r5, r6, r7, lr
++ 
++        /* Get sign of op1 into r12 */
++        mov     r12, r11
++        andh    r12, 0x8000, COH                
++ 
++        /* Remove sign from operands */
++        cbr     r11, 31
++        cbr     r9, 31
++ 
++        /* Put the largest number in [r11, r10]
++           and the smallest number in [r9, r8] */
++        cp      r10, r8
++        cpc     r11, r9
++        brhs    1f /* Skip swap if operands already correctly ordered*/
++        /* Operands were not correctly ordered, swap them*/
++        mov     r7, r11
++        mov     r11, r9
++        mov     r9, r7
++        mov     r7, r10
++        mov     r10, r8
++        mov     r8, r7
++        eorh    r12, 0x8000 /* Invert sign in r12*/
++1:      
++        /* Unpack largest operand - opH */      
++        /* exp: r7 */
++        /* sf:  r11, r10 */
++        lsr     r7, r11, 20 /* Extract exponent */
++        lsl     r11, 11 /* Extract mantissa, leave room for implicit bit */ 
++        or      r11, r11, r10>>21
++        lsl     r10, 11
++        sbr     r11, 31 /* Insert implicit bit */
++ 
++        
++        /* Unpack smallest operand - opL */
++        /* exp: r6 */
++        /* sf:  r9, r8 */
++        lsr     r6, r9, 20 /* Extract exponent */
++        breq    __avr32_f64_sub_opL_subnormal /* If either zero or subnormal */
++        lsl     r9, 11 /* Extract mantissa, leave room for implicit bit */ 
++        or      r9, r9, r8>>21
++        lsl     r8, 11
++        sbr     r9, 31 /* Insert implicit bit */
++ 
++
++__avr32_f64_sub_opL_subnormal_done:     
++        /* opH is NaN or Inf. */
++        cp.w    r7, 0x7ff
++        breq    __avr32_f64_sub_opH_nan_or_inf
++
++        /* Get shift amount to scale mantissa of op2. */
++        rsub    r6, r7
++        breq    __avr32_f64_sub_shift_done /* No need to shift, exponents are equal*/
++ 
++        /* Scale mantissa [r9, r8] with amount [r6].
++        Uses scratch registers [r5] and [lr].
++        In IEEE mode:Must not forget the sticky bits we intend to shift out. */
++ 
++        rsub    r5,r6,32 /* get (32 - shift count)
++                            (if shift count > 32 we get a
++                            negative value, but that will
++                            work as well in the code below.) */
++ 
++        cp.w    r6,32       /* handle shifts >= 32 separately */
++        brhs    __avr32_f64_sub_longshift
++ 
++        /* small (<32) shift amount, both words are part of the shift
++           first remember whether part that is lost contains any 1 bits ... */
++        lsl     lr,r8,r5  /* shift away bits that are part of
++                             final mantissa. only part that goes
++                             to lr are bits that will be lost */
++ 
++        /* ... and now to the actual shift */
++        lsl     r5,r9,r5  /* get bits from msw destined for lsw*/
++        lsr     r8,r8,r6  /* shift down lsw of mantissa */
++        lsr     r9,r9,r6  /* shift down msw of mantissa */
++        or      r8,r5     /* combine these bits with prepared lsw*/
++#if  defined(L_avr32_f64_addsub)
++        cp.w    lr,0      /* if any '1' bit in part we lost ...*/
++        srne    lr
++        or      r8, lr     /* ... we need to set sticky bit*/
++#endif
++        
++__avr32_f64_sub_shift_done:     
++        /* Now subtract the mantissas. */
++        sub     r10, r8
++        sbc     r11, r11, r9
++ 
++        /* Normalize the exponent and mantissa pair stored in
++        [r11,r10] and exponent in [r7]. Needs two scratch registers [r6] and [lr]. */
++        clz     r6,r11     /* Check if we have zeros in high bits */
++        breq    __avr32_f64_sub_longnormalize_done  /* No need for scaling if no zeros in high bits */
++        brcs    __avr32_f64_sub_longnormalize
++ 
++	
++        /* shift amount is smaller than 32, and involves both msw and lsw*/
++        rsub    lr,r6,32  /* shift mantissa */
++        lsl     r11,r11,r6
++        lsr     lr,r10,lr
++        or      r11,lr
++        lsl     r10,r10,r6
++ 
++        sub     r7,r6    /* adjust exponent */
++        brle    __avr32_f64_sub_subnormal_result
++__avr32_f64_sub_longnormalize_done:     
++        
++#if defined(L_avr32_f64_addsub)
++        /* Insert the bits we will remove from the mantissa r9[31:21] */
++        lsl     r9, r10, (32 - 11)
++#else
++        /* Keep the last bit shifted out. */
++        bfextu  r9, r10, 10, 1
++#endif
++ 
++        /* Pack final result*/
++        /* Input: [r7]:exp, [r11, r10]:mant, [r12]:sign in MSB */
++        /* Result in [r11,r10] */
++        /* Insert mantissa */
++        lsr     r10, 11
++        or      r10, r10, r11<<21
++        lsr     r11, 11
++        /* Insert exponent and sign bit*/
++	bfins	r11, r7, 20, 11
++        or      r11, r12
++        
++        /* Round */     
++__avr32_f64_sub_round:
++#if defined(L_avr32_f64_addsub)
++	mov_imm	r7, 0x80000000
++        bld     r10, 0
++        subne   r7, -1  
++ 
++        cp.w    r9, r7
++        srhs    r9
++#endif
++        add     r10, r9
++        acr     r11
++        
++        /* Return result in [r11,r10] */
++        ldm     sp++, r5, r6, r7,pc
++ 
++ 
++ 
++__avr32_f64_sub_opL_subnormal:
++        /* Extract the of mantissa */
++        lsl     r9, 11 /* Extract mantissa, leave room for implicit bit */ 
++        or      r9, r9, r8>>21
++        lsl     r8, 11
++ 
++        /* Set exponent to 1 if we do not have a zero. */
++        or      lr, r9, r8
++        movne   r6,1
++	
++        /* Check if opH is also subnormal. If so, clear implicit bit in r11*/
++        rsub    lr, r7, 0
++        moveq   r7,1
++        bst     r11, 31
++	
++        /* Check if op1 is zero, if so set exponent to 0. */
++        or      lr, r11, r10
++        moveq   r7,0
++	                 
++        rjmp    __avr32_f64_sub_opL_subnormal_done
++ 
++__avr32_f64_sub_opH_nan_or_inf: 
++        /* Check if opH is NaN, if so return NaN */
++        cbr     r11, 31
++        or      lr, r11, r10
++        brne    __avr32_f64_sub_return_nan
++ 
++        /* opH is Inf. */
++        /* Check if opL is Inf. or NaN */
++        cp.w    r6, 0x7ff
++        breq    __avr32_f64_sub_return_nan
++	/* Return infinity with correct sign. */	
++	or      r11, r12, r7 << 20
++        ldm     sp++, r5, r6, r7, pc/* opL not Inf or NaN, return opH */
++__avr32_f64_sub_return_nan:     
++        mov     r10, -1 /* Generate NaN in r11, r10 */
++        mov     r11, -1
++        ldm     sp++, r5, r6, r7, pc/* opL Inf or NaN, return NaN */
++ 
++ 
++__avr32_f64_sub_subnormal_result:
++#if defined(L_avr32_f64_addsub)
++	/* Check how much we must scale down the mantissa. */
++	neg	r7
++	sub	r7, -1     /* We do no longer have an implicit bit. */
++	satu	r7 >> 0, 6 /* Saturate shift amount to max 63. */
++	cp.w	r7, 32
++	brge	0f
++	/* Shift amount <32 */
++	rsub	r8, r7, 32
++	lsl	r9, r10, r8
++	srne	r6
++	lsr	r10, r10, r7
++	or	r10, r6		/* Sticky bit from the
++				   part that was shifted out. */
++	lsl	r9, r11, r8
++	or	r10, r10, r9
++	lsr	r11, r10, r7
++	/* Set exponent */
++	mov	r7, 0
++	rjmp	__avr32_f64_sub_longnormalize_done
++0:
++	/* Shift amount >=32 */
++	rsub	r8, r7, 64
++	lsl	r9, r11, r8
++	or	r9, r10
++	srne	r6
++	lsr	r10, r11, r7
++	or	r10, r6		/* Sticky bit from the
++				   part that was shifted out. */
++	mov	r11, 0
++	/* Set exponent */
++	mov	r7, 0
++	rjmp	__avr32_f64_sub_longnormalize_done
++#else
++        /* Just flush subnormals to zero. */
++        mov     r10, 0
++        mov     r11, 0
++#endif
++        ldm     sp++, r5, r6, r7, pc
++ 
++__avr32_f64_sub_longshift:
++        /* large (>=32) shift amount, only lsw will have bits left after shift.
++           note that shift operations will use ((shift count=r6) mod 32) so
++           we do not need to subtract 32 from shift count. */
++        /* Saturate the shift amount to 63. If the amount
++           is any larger op2 is insignificant. */
++        satu    r6 >> 0, 6
++	
++#if defined(L_avr32_f64_addsub)
++        /* first remember whether part that is lost contains any 1 bits ... */
++	moveq	lr, r8	   /* If shift amount is 32, no bits from msw are lost. */
++	breq	0f
++        lsl     lr,r9,r5   /* save all lost bits from msw */
++        or      lr,r8      /* also save lost bits (all) from lsw
++                              now lr != 0 if we lose any bits */
++#endif  
++0:	
++        /* ... and now to the actual shift */
++        lsr     r8,r9,r6   /* Move msw to lsw and shift. */
++        mov     r9,0       /* clear msw */
++#if defined(L_avr32_f64_addsub)
++        cp.w    lr,0       /* if any '1' bit in part we lost ...*/
++        srne    lr
++        or      r8, lr      /* ... we need to set sticky bit*/
++#endif
++        rjmp    __avr32_f64_sub_shift_done
++ 
++__avr32_f64_sub_longnormalize:
++        /* shift amount is greater than 32 */
++        clz     r6,r10      /* shift mantissa */
++        /* If the resulting mantissa is zero the result is 
++           zero so force exponent to zero. */
++        movcs   r7, 0
++        movcs   r6, 0
++        movcs   r12, 0  /* Also clear sign bit. A zero result from subtraction
++			   always is +0.0 */
++        subcc   r6,-32
++        lsl     r11,r10,r6
++        mov     r10,0
++        sub     r7,r6          /* adjust exponent */
++        brle    __avr32_f64_sub_subnormal_result
++        rjmp    __avr32_f64_sub_longnormalize_done
++        
++ 
++        
++	 .align  2
++__avr32_f64_add_from_sub:
++        /* Switch sign on op2 */
++        eorh    r9, 0x8000
++
++#if defined(L_avr32_f64_addsub_fast)
++        .global __avr32_f64_add_fast
++        .type  __avr32_f64_add_fast,@function
++__avr32_f64_add_fast:
++#else	
++        .global __avr32_f64_add
++        .type  __avr32_f64_add,@function
++__avr32_f64_add:
++#endif
++        
++        /* op1 in {r11,r10}*/
++        /* op2 in {r9,r8}*/
++ 
++#if defined(L_avr32_f64_addsub_fast)
++        /* If op2 is zero just return op1 */
++        or      r12, r8, r9 << 1
++        reteq   r12 
++#endif
++
++        /* Check signs */
++        eor     r12, r11, r9
++        /* Different signs, use subtraction. */
++        brmi    __avr32_f64_sub_from_add
++ 
++        stm     --sp, r5, r6, r7, lr
++ 
++        /* Get sign of op1 into r12 */
++        mov     r12, r11
++        andh    r12, 0x8000, COH                
++ 
++        /* Remove sign from operands */
++        cbr     r11, 31
++        cbr     r9, 31
++ 
++        /* Put the number with the largest exponent in [r11, r10]
++           and the number with the smallest exponent in [r9, r8] */
++        cp      r11, r9
++        brhs    1f /* Skip swap if operands already correctly ordered */
++        /* Operands were not correctly ordered, swap them */
++        mov     r7, r11
++        mov     r11, r9
++        mov     r9, r7
++        mov     r7, r10
++        mov     r10, r8
++        mov     r8, r7
++1:      
++	mov	lr, 0 /* Set sticky bits to zero */
++        /* Unpack largest operand - opH */      
++        /* exp: r7 */
++        /* sf:  r11, r10 */
++	bfextu	R7, R11, 20, 11 /* Extract exponent */
++	bfextu	r11, r11, 0, 20 /* Extract mantissa */
++        sbr     r11, 20 /* Insert implicit bit */
++ 
++        /* Unpack smallest operand - opL */
++        /* exp: r6 */
++        /* sf:  r9, r8 */
++	bfextu	R6, R9, 20, 11	/* Extract exponent */
++	breq	__avr32_f64_add_op2_subnormal
++	bfextu	r9, r9, 0, 20   /* Extract mantissa */
++        sbr     r9, 20		/* Insert implicit bit */
++
++2:		 
++        /* opH is NaN or Inf. */
++        cp.w    r7, 0x7ff
++        breq    __avr32_f64_add_opH_nan_or_inf
++
++        /* Get shift amount to scale mantissa of op2. */
++        rsub    r6, r7
++        breq    __avr32_f64_add_shift_done /* No need to shift, exponents are equal*/
++ 
++        /* Scale mantissa [r9, r8] with amount [r6].
++        Uses scratch registers [r5] and [lr].
++        In IEEE mode:Must not forget the sticky bits we intend to shift out. */
++        rsub    r5,r6,32 /* get (32 - shift count)
++                            (if shift count > 32 we get a
++                            negative value, but that will
++                            work as well in the code below.) */
++ 
++        cp.w    r6,32       /* handle shifts >= 32 separately */
++        brhs    __avr32_f64_add_longshift
++ 
++        /* small (<32) shift amount, both words are part of the shift
++           first remember whether part that is lost contains any 1 bits ... */
++        lsl     lr,r8,r5  /* shift away bits that are part of
++                             final mantissa. only part that goes
++                             to lr are bits that will be lost */
++ 
++        /* ... and now to the actual shift */
++        lsl     r5,r9,r5  /* get bits from msw destined for lsw*/
++        lsr     r8,r8,r6  /* shift down lsw of mantissa */
++        lsr     r9,r9,r6  /* shift down msw of mantissa */
++        or      r8,r5     /* combine these bits with prepared lsw*/
++        
++__avr32_f64_add_shift_done:     
++        /* Now add the mantissas. */
++        add     r10, r8
++        adc     r11, r11, r9
++
++        /* Check if we overflowed. */
++	bld	r11, 21 
++        breq	__avr32_f64_add_res_of:
++
++__avr32_f64_add_res_of_done:    
++        
++        /* Pack final result*/
++        /* Input: [r7]:exp, [r11, r10]:mant, [r12]:sign in MSB */
++        /* Result in [r11,r10] */
++        /* Insert exponent and sign bit*/
++	bfins	r11, r7, 20, 11
++	or	r11, r12
++        
++        /* Round */     
++__avr32_f64_add_round:
++#if defined(L_avr32_f64_addsub)
++	bfextu	r12, r10, 0, 1 /* Extract parity bit.*/
++	or	lr, r12	       /* or it together with the sticky bits. */	
++	eorh	lr, 0x8000     /* Toggle round bit. */	
++	/* We should now round up by adding one for the following cases:
++
++		halfway   sticky|parity  round-up
++		   0            x           no
++		   1            0           no
++	           1            1           yes
++
++	   Since we have inverted the halfway bit we can use the satu instruction
++           by saturating to 1 bit to implement this. 
++	*/ 
++	satu	lr >> 0, 1
++#else
++	lsr	lr, 31
++#endif
++        add     r10, lr
++        acr     r11
++        
++        /* Return result in [r11,r10] */
++        ldm     sp++, r5, r6, r7,pc
++ 
++  
++__avr32_f64_add_opH_nan_or_inf: 
++        /* Check if opH is NaN, if so return NaN */
++        cbr     r11, 20
++        or      lr, r11, r10
++        brne    __avr32_f64_add_return_nan
++ 
++        /* opH is Inf. */
++        /* Check if opL is Inf. or NaN */
++        cp.w    r6, 0x7ff
++        breq    __avr32_f64_add_opL_nan_or_inf
++        ldm     sp++, r5, r6, r7, pc/* opL not Inf or NaN, return opH */
++__avr32_f64_add_opL_nan_or_inf:
++        cbr     r9, 20
++        or      lr, r9, r8
++        brne    __avr32_f64_add_return_nan
++        mov     r10, 0  /* Generate Inf in r11, r10 */
++	mov_imm r11, 0x7ff00000
++        or      r11, r12 /* Put sign bit back */
++        ldm     sp++, r5, r6, r7, pc/* opL Inf, return Inf */
++__avr32_f64_add_return_nan:     
++        mov     r10, -1 /* Generate NaN in r11, r10 */
++        mov     r11, -1
++        ldm     sp++, r5, r6, r7, pc/* opL Inf or NaN, return NaN */
++ 
++ 
++__avr32_f64_add_longshift:
++        /* large (>=32) shift amount, only lsw will have bits left after shift.
++           note that shift operations will use ((shift count=r6) mod 32) so
++           we do not need to subtract 32 from shift count. */
++        /* Saturate the shift amount to 63. If the amount
++           is any larger op2 is insignificant. */
++        satu    r6 >> 0, 6
++	/* If shift amount is 32 there are no bits from the msw that are lost. */
++	moveq	lr, r8
++	breq	0f	
++        /* first remember whether part that is lost contains any 1 bits ... */
++        lsl     lr,r9,r5   /* save all lost bits from msw */
++#if defined(L_avr32_f64_addsub)
++	cp.w	r8, 0
++	srne	r8	
++        or      lr,r8      /* also save lost bits (all) from lsw
++                              now lr != 0 if we lose any bits */
++#endif  
++0:	
++        /* ... and now to the actual shift */
++        lsr     r8,r9,r6   /* msw -> lsw and make rest of shift inside lsw*/
++        mov     r9,0       /* clear msw */
++        rjmp    __avr32_f64_add_shift_done
++ 
++__avr32_f64_add_res_of:
++	/* We overflowed. Scale down mantissa by shifting right one position. */
++	or	lr, lr, lr << 1 /* Remember stickybits*/
++	lsr	r11, 1
++	ror	r10
++	ror	lr
++	sub	r7, -1	/* Increment exponent */
++ 
++        /* Clear mantissa to set result to Inf if the exponent is 255. */
++        cp.w    r7, 0x7ff
++        moveq   r10, 0
++        moveq   r11, 0
++        moveq   lr, 0
++        rjmp    __avr32_f64_add_res_of_done
++        
++__avr32_f64_add_op2_subnormal:	
++	/* Set epxponent to 1 */
++	mov	r6, 1
++
++	/* Check if op2 is also subnormal. */
++	cp.w	r7, 0
++	brne	2b
++
++	cbr	r11, 20
++	/* Both operands are subnormal. Just addd the mantissas
++	   and the exponent will automatically be set to 1 if
++	   we overflow into a normal number. */
++	add	r10, r8
++	adc	r11, r11, r9
++
++	/* Add sign bit */
++	or	r11, r12
++	
++        /* Return result in [r11,r10] */
++        ldm     sp++, r5, r6, r7,pc
++	
++			
++	 
++#endif
++ 
++#ifdef L_avr32_f64_to_u32
++        /* This goes into L_fixdfsi */
++#endif
++        
++ 
++#ifdef L_avr32_f64_to_s32
++        .global __avr32_f64_to_u32
++        .type  __avr32_f64_to_u32,@function
++__avr32_f64_to_u32:
++        cp.w    r11, 0
++        retmi   0       /* Negative returns 0 */
++ 
++        /* Fallthrough to df to signed si conversion */ 
++        .global __avr32_f64_to_s32
++        .type  __avr32_f64_to_s32,@function
++__avr32_f64_to_s32:
++        lsl     r12,r11,1
++        lsr     r12,21                  /* extract exponent*/
++        sub     r12,1023                /* convert to unbiased exponent.*/
++        retlo   0                       /* too small exponent implies zero. */
++ 
++1:      
++        rsub    r12,r12,31              /* shift count = 31 - exponent */
++        mov     r9,r11                  /* save sign for later...*/
++        lsl     r11,11                  /* remove exponent and sign*/
++        sbr     r11,31                  /* add implicit bit*/
++        or      r11,r11,r10>>21         /* get rest of bits from lsw of double */
++        lsr     r11,r11,r12             /* shift down mantissa to final place */
++        lsl     r9,1                    /* sign -> carry */
++        retcc   r11                     /* if positive, we are done */
++        neg     r11                     /* if negative float, negate result */
++        ret     r11
++ 
++#endif  /* L_fixdfsi*/
++ 
++#ifdef L_avr32_f64_to_u64
++        /* Actual function is in L_fixdfdi */
++#endif
++        
++#ifdef L_avr32_f64_to_s64
++        .global __avr32_f64_to_u64
++        .type  __avr32_f64_to_u64,@function
++__avr32_f64_to_u64:
++        cp.w    r11,0
++        /* Negative numbers return zero */
++        movmi   r10, 0
++        movmi   r11, 0
++        retmi   r11
++ 
++        
++ 
++        /* Fallthrough */
++        .global __avr32_f64_to_s64
++        .type  __avr32_f64_to_s64,@function
++__avr32_f64_to_s64:
++        lsl     r9,r11,1
++        lsr     r9,21                   /* get exponent*/
++        sub     r9,1023                 /* convert to correct range*/
++        /* Return zero if exponent to small */
++        movlo   r10, 0
++        movlo   r11, 0
++        retlo   r11
++ 
++        mov     r8,r11                  /* save sign for later...*/
++1:      
++        lsl     r11,11                  /* remove exponent */
++        sbr     r11,31                  /* add implicit bit*/
++        or      r11,r11,r10>>21         /* get rest of bits from lsw of double*/
++        lsl     r10,11                  /* align lsw correctly as well */
++        rsub    r9,r9,63                /* shift count = 63 - exponent */
++        breq    1f
++ 
++        cp.w    r9,32                   /* is shift count more than one reg? */
++        brhs    0f
++ 
++        mov     r12,r11                 /* save msw */
++        lsr     r10,r10,r9              /* small shift count, shift down lsw */
++        lsr     r11,r11,r9              /* small shift count, shift down msw */
++        rsub    r9,r9,32                /* get 32-size of shifted out tail */
++        lsl     r12,r12,r9              /* align part to move from msw to lsw */
++        or      r10,r12                 /* combine to get new lsw */
++        rjmp    1f
++ 
++0:
++        lsr     r10,r11,r9              /* large shift count,only lsw get bits
++                                           note that shift count is modulo 32*/
++        mov     r11,0                   /* msw will be 0 */
++ 
++1:
++        lsl     r8,1                    /* sign -> carry */
++        retcc   r11                     /* if positive, we are done */
++ 
++        neg     r11                     /* if negative float, negate result */
++        neg     r10
++        scr     r11
++        ret     r11 
++ 
++#endif
++ 
++#ifdef L_avr32_u32_to_f64
++        /* Code located in L_floatsidf */
++#endif
++        
++#ifdef L_avr32_s32_to_f64
++        .global __avr32_u32_to_f64
++        .type  __avr32_u32_to_f64,@function
++__avr32_u32_to_f64:
++        sub     r11, r12, 0 /* Move to r11 and force Z flag to be updated */
++        mov     r12, 0      /* always positive */
++        rjmp    0f          /* Jump to common code for floatsidf */
++        
++        .global __avr32_s32_to_f64
++        .type  __avr32_s32_to_f64,@function
++__avr32_s32_to_f64:
++        mov     r11, r12        /* Keep original value in r12 for sign */
++        abs     r11             /* Absolute value if r12 */
++0:      
++        mov     r10,0           /* let remaining bits be zero */
++        reteq   r11             /* zero long will return zero float */
++ 
++        pushm   lr
++        mov     r9,31+1023              /* set exponent */
++                
++        normalize_df    r9 /*exp*/, r10, r11 /* mantissa */, r8, lr /* scratch */
++ 
++        /* Check if a subnormal result was created */
++        cp.w    r9, 0
++        brgt    0f
++        
++        adjust_subnormal_df     r9 /* exp */, r10, r11 /* Mantissa */, r12 /*sign*/, r8, lr /* scratch */
++        popm    pc
++0:
++        
++        /* Round result */
++        round_df        r9 /*exp*/, r10, r11 /* Mantissa */, r8 /*scratch*/
++        cp.w    r9,0x7ff
++        brlt    0f
++        /*Return infinity */
++        mov     r10, 0
++	mov_imm	r11, 0xffe00000
++        rjmp    __floatsidf_return_op1
++        
++0:
++ 
++        /* Pack */
++        pack_df r9 /*exp*/, r10, r11 /* mantissa */, r10, r11 /* Output df number*/
++__floatsidf_return_op1: 
++        lsl     r12,1                  /* shift in sign bit */
++        ror     r11
++ 
++        popm    pc
++#endif
++ 
++ 
++#ifdef L_avr32_f32_cmp_eq
++        .global __avr32_f32_cmp_eq
++        .type  __avr32_f32_cmp_eq,@function
++__avr32_f32_cmp_eq:     
++        cp.w    r12, r11
++        breq    0f      
++        /* If not equal check for +/-0 */
++        /* Or together the two values and shift out the sign bit.
++           If the result is zero, then the two values are both zero. */
++        or      r12, r11
++        lsl     r12, 1
++        reteq   1
++        ret     0
++0:                      
++        /* Numbers were equal. Check for NaN or Inf */
++	mov_imm	r11, 0xff000000
++        lsl     r12, 1
++        cp.w    r12, r11
++        retls   1     /* 0 if NaN, 1 otherwise */
++        ret     0     
++#endif
++        
++#if defined(L_avr32_f32_cmp_ge) || defined(L_avr32_f32_cmp_lt)
++#ifdef L_avr32_f32_cmp_ge
++        .global __avr32_f32_cmp_ge
++        .type  __avr32_f32_cmp_ge,@function
++__avr32_f32_cmp_ge:
++#endif  
++#ifdef L_avr32_f32_cmp_lt
++        .global __avr32_f32_cmp_lt
++        .type  __avr32_f32_cmp_lt,@function
++__avr32_f32_cmp_lt:
++#endif  
++        lsl     r10, r12, 1     /* Remove sign bits */
++        lsl     r9, r11, 1
++	subfeq	r10, 0
++#ifdef L_avr32_f32_cmp_ge
++	reteq	1		/* Both number are zero. Return true. */
++#endif	
++#ifdef L_avr32_f32_cmp_lt
++	reteq	0		/* Both number are zero. Return false. */
++#endif	
++	mov_imm	r8, 0xff000000
++        cp.w    r10, r8
++        rethi   0               /* Op0 is NaN */                
++        cp.w    r9, r8
++        rethi   0               /* Op1 is Nan */
++ 
++        eor     r8, r11, r12
++        bld     r12, 31
++#ifdef L_avr32_f32_cmp_ge
++        srcc    r8      /* Set result to true if op0 is positive*/
++#endif
++#ifdef L_avr32_f32_cmp_lt
++        srcs    r8      /* Set result to true if op0 is negative*/
++#endif
++        retmi   r8      /* Return if signs are different */
++        brcs    0f      /* Both signs negative? */
++ 
++        /* Both signs positive */
++        cp.w    r12, r11
++#ifdef L_avr32_f32_cmp_ge
++        reths    1
++        retlo    0
++#endif
++#ifdef L_avr32_f32_cmp_lt
++        reths    0
++        retlo    1
++#endif
++0:
++        /* Both signs negative */
++        cp.w    r11, r12
++#ifdef L_avr32_f32_cmp_ge
++        reths    1
++        retlo    0
++#endif
++#ifdef L_avr32_f32_cmp_lt
++        reths    0
++        retlo    1
++#endif
++#endif
++        
++ 
++#ifdef L_avr32_f64_cmp_eq
++        .global __avr32_f64_cmp_eq
++        .type  __avr32_f64_cmp_eq,@function
++__avr32_f64_cmp_eq:     
++        cp.w    r10,r8
++        cpc     r11,r9
++        breq    0f
++        
++        /* Args were not equal*/
++        /* Both args could be zero with different sign bits */
++        lsl     r11,1                   /* get rid of sign bits */
++        lsl     r9,1
++        or      r11,r10                 /* Check if all bits are zero */
++        or      r11,r9
++        or      r11,r8
++        reteq   1                       /* If all zeros the arguments are equal
++                                           so return 1 else return 0 */
++        ret     0
++0:      
++        /* check for NaN */
++        lsl     r11,1
++	mov_imm	r12, 0xffe00000
++        cp.w    r10,0
++        cpc     r11,r12                 /* check if nan or inf */
++        retls   1                       /* If Arg is NaN return 0 else 1*/
++        ret     0                       /* Return  */
++ 
++#endif
++ 
++ 
++#if   defined(L_avr32_f64_cmp_ge) || defined(L_avr32_f64_cmp_lt)
++ 
++#ifdef L_avr32_f64_cmp_ge
++        .global __avr32_f64_cmp_ge
++        .type  __avr32_f64_cmp_ge,@function
++__avr32_f64_cmp_ge:
++#endif  
++#ifdef L_avr32_f64_cmp_lt
++        .global __avr32_f64_cmp_lt
++        .type  __avr32_f64_cmp_lt,@function
++__avr32_f64_cmp_lt:
++#endif  
++ 
++        /* compare magnitude of op1 and op2 */
++        st.w    --sp, lr
++        st.w    --sp, r7
++        lsl     r11,1                   /* Remove sign bit of op1 */
++        srcs    r12                     /* Sign op1 to lsb of r12*/
++        lsl     r9,1                    /* Remove sign bit of op2 */
++        srcs    r7
++        rol     r12                     /* Sign op2 to lsb of lr, sign bit op1 bit 1 of r12*/
++	
++ 
++        /* Check for Nan */
++        mov_imm lr, 0xffe00000
++        cp.w    r10,0
++        cpc     r11,lr
++        brhi    0f      /* We have NaN */
++        cp.w    r8,0
++        cpc     r9,lr
++        brhi    0f      /* We have NaN */
++
++        cp.w    r11, 0
++        subfeq  r10, 0
++        breq    3f			/* op1 zero */
++        ld.w    r7, sp++
++        ld.w    lr, sp++
++
++        cp.w    r12,3                   /* both operands negative ?*/    
++        breq    1f
++ 
++        cp.w    r12,1                   /* both operands positive? */
++        brlo    2f
++ 
++        /* Different signs. If sign of op1 is negative the difference
++           between op1 and op2 will always be negative, and if op1 is
++           positive the difference will always be positive */           
++#ifdef L_avr32_f64_cmp_ge
++	reteq	1
++	retne	0
++#endif
++#ifdef L_avr32_f64_cmp_lt
++	reteq	0
++	retne	1
++#endif
++  
++2:
++        /* Both operands positive. Just compute the difference */
++        cp.w    r10,r8
++        cpc     r11,r9
++#ifdef L_avr32_f64_cmp_ge
++	reths	1
++	retlo	0
++#endif
++#ifdef L_avr32_f64_cmp_lt
++	reths	0
++	retlo	1
++#endif
++                
++1:
++        /* Both operands negative. Compute the difference with operands switched */
++        cp     r8,r10
++        cpc    r9,r11
++#ifdef L_avr32_f64_cmp_ge
++	reths	1
++	retlo	0
++#endif
++#ifdef L_avr32_f64_cmp_lt
++	reths	0
++	retlo	1
++#endif
++
++0:      
++        ld.w    r7, sp++
++        popm    pc, r12=0
++#endif
++ 
++3:
++        cp.w    r7, 1          /* Check sign bit from r9 */
++#ifdef L_avr32_f64_cmp_ge
++        sreq    r12		       /* If op2 is negative then op1 >= op2. */	
++#endif
++#ifdef L_avr32_f64_cmp_lt
++        srne    r12		       /* If op2 is positve then op1 <= op2. */
++#endif
++        cp.w    r9, 0
++        subfeq  r8, 0
++        ld.w    r7, sp++
++        ld.w    lr, sp++
++#ifdef L_avr32_f64_cmp_ge
++	reteq	1		       /* Both operands are zero. Return true. */
++#endif
++#ifdef L_avr32_f64_cmp_lt
++	reteq	0		       /* Both operands are zero. Return false. */
++#endif
++	ret	r12
++				        
++ 
++#if defined(L_avr32_f64_div) || defined(L_avr32_f64_div_fast)
++        .align  2
++
++#if defined(L_avr32_f64_div_fast)
++        .global __avr32_f64_div_fast
++        .type  __avr32_f64_div_fast,@function
++__avr32_f64_div_fast:
++#else
++        .global __avr32_f64_div
++        .type  __avr32_f64_div,@function
++__avr32_f64_div:
++#endif
++        stm     --sp, r0, r1, r2, r3, r4, r5, r6, r7,lr 
++        /* op1 in {r11,r10}*/
++        /* op2 in {r9,r8}*/
++        eor     lr, r11, r9             /* MSB(lr) = Sign(op1) ^ Sign(op2) */
++ 
++        
++        /* Unpack op1 to 2.62 format*/  
++        /* exp: r7 */
++        /* sf:  r11, r10 */
++        lsr     r7, r11, 20 /* Extract exponent */
++                
++        lsl     r11, 9 /* Extract mantissa, leave room for implicit bit */ 
++        or      r11, r11, r10>>23
++        lsl     r10, 9
++        sbr     r11, 29 /* Insert implicit bit */
++        andh    r11, 0x3fff /*Mask last part of exponent since we use 2.62 format*/
++ 
++        cbr     r7, 11       /* Clear sign bit */
++        /* Check if normalization is needed */
++        breq    11f /*If number is subnormal, normalize it */
++22:     
++        cp      r7, 0x7ff
++        brge    2f  /* Check op1 for NaN or Inf */
++
++        /* Unpack op2 to 2.62 format*/
++        /* exp: r6 */
++        /* sf:  r9, r8 */
++        lsr     r6, r9, 20 /* Extract exponent */
++                
++        lsl     r9, 9 /* Extract mantissa, leave room for implicit bit */ 
++        or      r9, r9, r8>>23
++        lsl     r8, 9
++        sbr     r9, 29 /* Insert implicit bit */
++        andh    r9, 0x3fff /*Mask last part of exponent since we use 2.62 format*/
++ 
++        cbr     r6, 11       /* Clear sign bit */
++        /* Check if normalization is needed */
++        breq    13f /*If number is subnormal, normalize it */
++23:             
++        cp      r6, 0x7ff
++        brge    3f  /* Check op2 for NaN or Inf */
++
++        /* Calculate new exponent */
++        sub     r7, r6
++        sub     r7,-1023
++ 
++        /* Divide */
++        /* Approximating 1/d with the following recurrence: */
++        /* R[j+1] = R[j]*(2-R[j]*d) */
++        /* Using 2.62 format */
++        /* TWO:  r12 */
++        /* d = op2 = divisor (2.62 format): r9,r8 */
++        /* Multiply result :     r5, r4 */
++        /* Initial guess :       r3, r2 */
++        /* New approximations :  r3, r2 */
++        /* op1 = Dividend (2.62 format) : r11, r10 */
++ 
++	mov_imm	r12, 0x80000000
++         
++        /* Load initial guess, using look-up table */
++        /* Initial guess is of format 01.XY, where XY is constructed as follows: */
++        /* Let d be of following format: 00.1xy....., then XY=~xy */
++        /* For d=00.100 = 0,5   -> initial guess=01.11 = 1,75 */
++        /* For d=00.101 = 0,625 -> initial guess=01.11 = 1,5  */
++        /* For d=00.110 = 0,75  -> initial guess=01.11 = 1,25 */
++        /* For d=00.111 = 0,875 -> initial guess=01.11 = 1,0  */
++        /* r2 is also part of the reg pair forming initial guess, but it*/
++        /* is kept uninitialized to save one cycle since it has so low significance*/
++ 
++        lsr     r3, r12, 1
++        bfextu  r4, r9, 27, 2
++        com     r4
++        bfins   r3, r4, 28, 2
++ 
++        /* First approximation */
++        /* Approximating to 32 bits */
++        /* r5 = R[j]*d */
++        mulu.d  r4, r3, r9
++        /* r5 = 2-R[j]*d */
++        sub    r5, r12, r5<<2
++        /* r3 = R[j]*(2-R[j]*d) */
++        mulu.d  r4, r3, r5
++        lsl     r3, r5, 2
++         
++        /* Second approximation */
++        /* Approximating to 32 bits */
++        /* r5 = R[j]*d */
++        mulu.d  r4, r3, r9
++        /* r5 = 2-R[j]*d */
++        sub    r5, r12, r5<<2
++        /* r3 = R[j]*(2-R[j]*d) */
++        mulu.d  r4, r3, r5
++        lsl     r3, r5, 2
++         
++        /* Third approximation */
++        /* Approximating to 32 bits */
++        /* r5 = R[j]*d */
++        mulu.d  r4, r3, r9
++        /* r5 = 2-R[j]*d */
++        sub    r5, r12, r5<<2
++        /* r3 = R[j]*(2-R[j]*d) */
++        mulu.d  r4, r3, r5
++        lsl     r3, r5, 2
++ 
++        /* Fourth approximation */
++        /* Approximating to 64 bits */
++        /* r5,r4 = R[j]*d */
++        mul_approx_df        r3 /*ah*/, r2 /*al*/, r9 /*bh*/, r8 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
++        lsl    r5, 2
++        or     r5, r5, r4>>30
++        lsl    r4, 2
++        /* r5,r4 = 2-R[j]*d */
++        neg    r4
++        sbc    r5, r12, r5
++        /* r3,r2 = R[j]*(2-R[j]*d) */
++        mul_approx_df        r3 /*ah*/, r2 /*al*/, r5 /*bh*/, r4 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
++        lsl    r3, r5, 2
++        or     r3, r3, r4>>30
++        lsl    r2, r4, 2
++ 
++ 
++        /* Fifth approximation */
++        /* Approximating to 64 bits */
++        /* r5,r4 = R[j]*d */
++        mul_approx_df        r3 /*ah*/, r2 /*al*/, r9 /*bh*/, r8 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
++        lsl    r5, 2
++        or     r5, r5, r4>>30
++        lsl    r4, 2
++        /* r5,r4 = 2-R[j]*d */
++        neg    r4
++        sbc    r5, r12, r5
++        /* r3,r2 = R[j]*(2-R[j]*d) */
++        mul_approx_df        r3 /*ah*/, r2 /*al*/, r5 /*bh*/, r4 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
++        lsl    r3, r5, 2
++        or     r3, r3, r4>>30
++        lsl    r2, r4, 2
++ 
++ 
++        /* Multiply with dividend to get quotient */
++        mul_approx_df        r3 /*ah*/, r2 /*al*/, r11 /*bh*/, r10 /*bl*/, r3 /*rh*/, r2 /*rl*/, r1 /*sh*/, r0 /*sl*/
++ 
++ 
++        /* To increase speed, this result is not corrected before final rounding.*/
++        /* This may give a difference to IEEE compliant code of 1 ULP.*/
++		
++ 
++        /* Adjust exponent and mantissa */
++        /* r7:exp, [r3, r2]:mant, [r5, r4]:scratch*/
++        /* Mantissa may be of the format 0.xxxx or 1.xxxx. */
++        /* In the first case, shift one pos to left.*/
++        bld     r3, 31-3
++	breq	0f
++	lsl	r2, 1
++	rol	r3
++	sub	r7, 1
++#if defined(L_avr32_f64_div)
++	/* We must scale down the dividend to 5.59 format. */
++	lsr	r10, 3
++	or	r10, r10, r11 << 29
++	lsr	r11, 3
++	rjmp    1f
++#endif	
++0:	
++#if defined(L_avr32_f64_div)
++	/* We must scale down the dividend to 6.58 format. */
++	lsr	r10, 4
++	or	r10, r10, r11 << 28
++	lsr	r11, 4
++1:	
++#endif
++        cp      r7, 0   
++        brle    __avr32_f64_div_res_subnormal /* Result was subnormal. */
++ 
++ 
++#if defined(L_avr32_f64_div)
++	/* In order to round correctly we calculate the remainder:	
++	   Remainder = dividend[11:r10] - divisor[r9:r8]*quotient[r3:r2] 
++	   for the case when the quotient is halfway between the round-up
++	   value and the round down value. If the remainder then is negative
++	   it means that the quotient was to big and that it should not be
++           rounded up, if the remainder is positive the quotient was to small
++	   and we need to round up. If the remainder is zero it means that the
++	   quotient is exact but since we need to remove the guard bit we should
++	   round to even. */
++
++	/* Truncate and add guard bit. */
++	andl	r2, 0xff00
++	orl	r2, 0x0080	
++	
++
++	/* Now do the multiplication. The quotient has the format 4.60
++	   while the divisor has the format 2.62 which gives a result
++	   of 6.58 */
++        mulu.d  r0, r3, r8
++        macu.d  r0, r2, r9
++        mulu.d  r4, r2, r8
++        mulu.d  r8, r3, r9
++	add	r5, r0
++	adc	r8, r8, r1	
++	acr	r9
++
++
++	/* Check if remainder is positive, negative or equal. */
++	bfextu	r12, r2, 8, 1  /* Get parity bit into bit 0 of r0 */ 
++	cp	r4, 0
++	cpc	r5
++__avr32_f64_div_round_subnormal:	
++	cpc	r8, r10
++	cpc	r9, r11
++	srlo	r6	/* Remainder positive:	 we need to round up.*/
++	moveq	r6, r12  /* Remainder zero:	 round up if mantissa odd. */
++#else
++	bfextu	r6, r2, 7, 1  /* Get guard bit */ 	
++#endif
++	/* Final packing, scale down mantissa. */
++	lsr	r10, r2, 8
++        or      r10, r10, r3<<24
++        lsr     r11, r3, 8
++	/* Insert exponent and sign bit*/
++	bfins	r11, r7, 20, 11
++        bld     lr, 31
++        bst     r11, 31
++
++	/* Final rounding */
++	add	r10, r6
++	acr	r11		
++	        
++        /* Return result in [r11,r10] */
++        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
++ 
++                
++2:
++        /* Op1 is NaN or inf */
++        andh    r11, 0x000f /* Extract mantissa */
++        or      r11, r10
++        brne    16f     /* Return NaN if op1 is NaN */
++        /* Op1 is inf check op2 */
++        lsr     r6, r9, 20 /* Extract exponent */
++        cbr     r6, 11      /* Clear sign bit */
++        cp      r6, 0x7ff
++        brne    17f     /* Inf/number gives inf, return inf */
++        rjmp    16f     /* The rest gives NaN*/
++        
++3:      
++        /* Op1 is a valid number. Op 2 is NaN or inf */
++        andh    r9, 0x000f /* Extract mantissa */
++        or      r9, r8
++        brne    16f     /* Return NaN if op2 is NaN */
++        rjmp    15f     /* Op2 was inf, return zero*/
++                
++11:     /* Op1 was denormal. Fix it. */
++        lsl     r11, 3
++        or      r11, r11, r10 >> 29
++        lsl     r10, 3
++        /* Check if op1 is zero. */
++        or      r4, r10, r11
++        breq    __avr32_f64_div_op1_zero
++        normalize_df    r7 /*exp*/, r10, r11 /*Mantissa*/, r4, r5 /*scratch*/
++        lsr     r10, 2
++        or      r10, r10, r11 << 30
++        lsr     r11, 2
++        rjmp    22b
++ 
++ 
++13:     /* Op2 was denormal. Fix it */
++        lsl     r9, 3
++        or      r9, r9, r8 >> 29
++        lsl     r8, 3
++        /* Check if op2 is zero. */
++        or      r4, r9, r8
++        breq    17f     /* Divisor is zero -> return Inf */
++        normalize_df    r6 /*exp*/, r8, r9 /*Mantissa*/, r4, r5 /*scratch*/     
++        lsr     r8, 2
++        or      r8, r8, r9 << 30
++        lsr     r9, 2
++        rjmp    23b
++        
++ 
++__avr32_f64_div_res_subnormal:/* Divide result was subnormal. */
++#if defined(L_avr32_f64_div)
++	/* Check how much we must scale down the mantissa. */
++	neg	r7
++	sub	r7, -1     /* We do no longer have an implicit bit. */
++	satu	r7 >> 0, 6 /* Saturate shift amount to max 63. */
++	cp.w	r7, 32
++	brge	0f
++	/* Shift amount <32 */
++	/* Scale down quotient */
++	rsub	r6, r7, 32
++	lsr	r2, r2, r7
++	lsl	r12, r3, r6
++	or	r2, r12
++	lsr	r3, r3, r7
++	/* Scale down the dividend to match the scaling of the quotient. */
++	lsl	r1, r10, r6
++	lsr	r10, r10, r7
++	lsl	r12, r11, r6
++	or	r10, r12
++	lsr	r11, r11, r7
++	mov	r0, 0
++	rjmp	1f
++0:
++	/* Shift amount >=32 */
++	rsub	r6, r7, 32
++	moveq	r0, 0
++	moveq	r12, 0
++	breq	0f
++	lsl	r0, r10, r6
++	lsl	r12, r11, r6
++0:	
++	lsr	r2, r3, r7
++	mov	r3, 0
++	/* Scale down the dividend to match the scaling of the quotient. */
++	lsr	r1, r10, r7
++	or	r1, r12
++	lsr	r10, r11, r7
++	mov	r11, 0
++1:	
++	/* Start performing the same rounding as done for normal numbers
++	   but this time we have scaled the quotient and dividend and hence
++	   need a little different comparison. */
++	/* Truncate and add guard bit. */
++	andl	r2, 0xff00
++	orl	r2, 0x0080	
++	
++	/* Now do the multiplication. */
++        mulu.d  r6, r3, r8
++        macu.d  r6, r2, r9
++        mulu.d  r4, r2, r8
++        mulu.d  r8, r3, r9
++	add	r5, r6
++	adc	r8, r8, r7	
++	acr	r9
++
++	/* Set exponent to 0 */
++	mov	r7, 0	
++
++	/* Check if remainder is positive, negative or equal. */
++	bfextu	r12, r2, 8, 1  /* Get parity bit into bit 0 of r0 */ 
++	cp	r4, r0
++	cpc	r5, r1
++	/* Now the rest of the rounding is the same as for normals. */
++	rjmp	__avr32_f64_div_round_subnormal
++	
++#endif
++15:	
++	/* Flush to zero for the fast version. */
++        mov     r11, lr /*Get correct sign*/
++        andh    r11, 0x8000, COH
++        mov     r10, 0
++        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
++	 
++16:     /* Return NaN. */
++        mov     r11, -1
++        mov     r10, 0
++        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
++        
++17:     
++        /* Check if op1 is zero. */
++        or      r4, r10, r11
++        breq    __avr32_f64_div_op1_zero
++        /* Return INF. */
++        mov     r11, lr /*Get correct sign*/
++        andh    r11, 0x8000, COH
++        orh     r11, 0x7ff0
++        mov     r10, 0
++        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
++
++__avr32_f64_div_op1_zero:
++        or      r5, r8, r9 << 1
++        breq    16b             /* 0.0/0.0 -> NaN */
++        bfextu  r4, r9, 20, 11
++        cp      r4, 0x7ff
++        brne    15b             /* Return zero */
++        /* Check if divisor is Inf or NaN */
++        or      r5, r8, r9 << 12
++        breq    15b             /* Divisor is inf -> return zero */
++        rjmp    16b             /* Return NaN */                
++        
++        
++        
++
++#endif  
++                
++#if defined(L_avr32_f32_addsub) || defined(L_avr32_f32_addsub_fast)
++
++        .align  2
++__avr32_f32_sub_from_add:
++        /* Switch sign on op2 */
++        eorh    r11, 0x8000
++
++#if defined(L_avr32_f32_addsub_fast)
++        .global __avr32_f32_sub_fast
++        .type  __avr32_f32_sub_fast,@function
++__avr32_f32_sub_fast:
++#else
++        .global __avr32_f32_sub
++        .type  __avr32_f32_sub,@function
++__avr32_f32_sub:
++#endif 
++ 
++        /* Check signs */
++        eor     r8, r11, r12
++        /* Different signs, use subtraction. */
++        brmi    __avr32_f32_add_from_sub
++ 
++        /* Get sign of op1 */
++        mov     r8, r12
++        andh    r12, 0x8000, COH                
++ 
++        /* Remove sign from operands */
++        cbr     r11, 31
++#if defined(L_avr32_f32_addsub_fast)
++        reteq   r8      /* If op2 is zero return op1 */
++#endif
++        cbr     r8, 31
++ 
++        /* Put the number with the largest exponent in r10
++           and the number with the smallest exponent in r9 */
++        max     r10, r8, r11
++        min     r9, r8, r11
++        cp      r10, r8 /*If largest operand (in R10) is not equal to op1*/
++        subne   r12, 1 /* Subtract 1 from sign, which will invert MSB of r12*/
++        andh    r12, 0x8000, COH /*Mask all but MSB*/
++ 
++        /* Unpack exponent and mantissa of op1 */
++        lsl     r8, r10, 8
++        sbr     r8, 31  /* Set implicit bit. */
++        lsr     r10, 23 
++                
++        /* op1 is NaN or Inf. */
++        cp.w    r10, 0xff
++        breq    __avr32_f32_sub_op1_nan_or_inf
++        
++        /* Unpack exponent and mantissa of op2 */
++        lsl     r11, r9, 8
++        sbr     r11, 31  /* Set implicit bit. */
++        lsr     r9, 23  
++ 
++#if defined(L_avr32_f32_addsub)
++        /* Keep sticky bit for correct IEEE rounding */
++        st.w    --sp, r12
++ 
++        /* op2 is either zero or subnormal. */
++        breq    __avr32_f32_sub_op2_subnormal
++0:      
++        /* Get shift amount to scale mantissa of op2. */
++        sub     r12, r10, r9                 
++
++	breq	__avr32_f32_sub_shift_done
++ 
++        /* Saturate the shift amount to 31. If the amount
++           is any larger op2 is insignificant. */
++        satu    r12 >> 0, 5      
++
++        /* Put the remaining bits into r9.*/
++        rsub    r9, r12, 32
++        lsl     r9, r11, r9
++	
++	/* If the remaining bits are non-zero then we must subtract one
++	   more from opL.  */
++	subne	r8, 1
++	srne	r9	/* LSB of r9 represents sticky bits. */
++
++        /* Shift mantissa of op2 to same decimal point as the mantissa
++           of op1. */
++        lsr     r11, r11, r12
++ 
++
++__avr32_f32_sub_shift_done:	
++        /* Now subtract the mantissas. */
++        sub     r8, r11
++ 
++        ld.w    r12, sp++
++ 
++        /* Normalize resulting mantissa. */
++        clz     r11, r8
++
++	retcs	0
++        lsl     r8, r8, r11
++        sub     r10, r11
++        brle    __avr32_f32_sub_subnormal_result
++
++        /* Insert the bits we will remove from the mantissa into r9[31:24] */
++	or	r9, r9, r8 << 24
++#else
++        /* Ignore sticky bit to simplify and speed up rounding */
++        /* op2 is either zero or subnormal. */
++        breq    __avr32_f32_sub_op2_subnormal
++0:      
++        /* Get shift amount to scale mantissa of op2. */
++        rsub    r9, r10                 
++ 
++        /* Saturate the shift amount to 31. If the amount
++           is any larger op2 is insignificant. */
++        satu    r9 >> 0, 5      
++ 
++        /* Shift mantissa of op2 to same decimal point as the mantissa
++           of op1. */
++        lsr     r11, r11, r9
++ 
++        /* Now subtract the mantissas. */
++        sub     r8, r11
++ 
++        /* Normalize resulting mantissa. */
++        clz     r9, r8
++	retcs	0
++        lsl     r8, r8, r9
++        sub     r10, r9
++        brle    __avr32_f32_sub_subnormal_result        
++#endif
++        
++        /* Pack result. */
++        or      r12, r12, r8 >> 8
++        bfins   r12, r10, 23, 8         
++ 
++        /* Round */     
++__avr32_f32_sub_round:
++#if defined(L_avr32_f32_addsub)
++	mov_imm	r10, 0x80000000
++        bld     r12, 0
++        subne   r10, -1 
++        cp.w    r9, r10
++        subhs   r12, -1
++#else
++        bld     r8, 7 
++        acr     r12
++#endif  
++        
++        ret     r12     
++ 
++ 
++__avr32_f32_sub_op2_subnormal:
++        /* Fix implicit bit and adjust exponent of subnormals. */
++        cbr     r11, 31
++        /* Set exponent to 1 if we do not have a zero. */
++        movne   r9,1
++ 
++        /* Check if op1 is also subnormal. */
++        cp.w    r10, 0
++        brne    0b
++ 
++        cbr     r8, 31
++         /* If op1 is not zero set exponent to 1. */
++        movne   r10,1
++                
++        rjmp    0b
++ 
++__avr32_f32_sub_op1_nan_or_inf: 
++        /* Check if op1 is NaN, if so return NaN */
++        lsl     r11, r8, 1
++        retne   -1
++ 
++        /* op1 is Inf. */
++        bfins   r12, r10, 23, 8 /* Generate Inf in r12 */
++ 
++        /* Check if op2 is Inf. or NaN */
++        lsr     r11, r9, 23
++        cp.w    r11, 0xff
++        retne   r12             /* op2 not Inf or NaN, return op1 */
++ 
++        ret     -1              /* op2 Inf or NaN, return NaN */
++ 
++__avr32_f32_sub_subnormal_result:
++        /* Check if the number is so small that
++           it will be represented with zero. */
++        rsub    r10, r10, 9
++        rsub    r11, r10, 32
++        retcs   0
++ 
++        /* Shift the mantissa into the correct position.*/
++        lsr     r10, r8, r10
++        /* Add sign bit. */
++        or      r12, r10
++
++        /* Put the shifted out bits in the most significant part
++           of r8. */
++        lsl     r8, r8, r11
++ 
++#if defined(L_avr32_f32_addsub)
++        /* Add all the remainder bits used for rounding into r9 */
++        or      r9, r8
++#else
++        lsr     r8, 24 
++#endif
++        rjmp    __avr32_f32_sub_round
++ 
++                                
++        .align  2
++
++__avr32_f32_add_from_sub:
++        /* Switch sign on op2 */
++        eorh    r11, 0x8000
++
++#if defined(L_avr32_f32_addsub_fast)
++        .global __avr32_f32_add_fast
++        .type  __avr32_f32_add_fast,@function
++__avr32_f32_add_fast:
++#else
++        .global __avr32_f32_add
++        .type  __avr32_f32_add,@function
++__avr32_f32_add:
++#endif 
++	
++        /* Check signs */
++        eor     r8, r11, r12
++        /* Different signs, use subtraction. */
++        brmi    __avr32_f32_sub_from_add
++ 
++        /* Get sign of op1 */
++        mov     r8, r12
++        andh    r12, 0x8000, COH                
++ 
++        /* Remove sign from operands */
++        cbr     r11, 31
++#if defined(L_avr32_f32_addsub_fast)
++        reteq   r8      /* If op2 is zero return op1 */
++#endif
++        cbr     r8, 31
++ 
++        /* Put the number with the largest exponent in r10
++           and the number with the smallest exponent in r9 */
++        max     r10, r8, r11
++        min     r9, r8, r11
++ 
++        /* Unpack exponent and mantissa of op1 */
++        lsl     r8, r10, 8
++        sbr     r8, 31  /* Set implicit bit. */
++        lsr     r10, 23 
++                
++        /* op1 is NaN or Inf. */
++        cp.w    r10, 0xff
++        breq    __avr32_f32_add_op1_nan_or_inf
++        
++        /* Unpack exponent and mantissa of op2 */
++        lsl     r11, r9, 8
++        sbr     r11, 31  /* Set implicit bit. */
++        lsr     r9, 23  
++ 
++#if defined(L_avr32_f32_addsub)
++        /* op2 is either zero or subnormal. */
++        breq    __avr32_f32_add_op2_subnormal
++0:      
++        /* Keep sticky bit for correct IEEE rounding */
++        st.w    --sp, r12
++ 
++        /* Get shift amount to scale mantissa of op2. */
++        rsub    r9, r10                 
++ 
++        /* Saturate the shift amount to 31. If the amount
++           is any larger op2 is insignificant. */
++        satu    r9 >> 0, 5      
++ 
++        /* Shift mantissa of op2 to same decimal point as the mantissa
++           of op1. */
++        lsr     r12, r11, r9
++ 
++        /* Put the remainding bits into r11[23:..].*/
++        rsub    r9, r9, (32-8)
++        lsl     r11, r11, r9
++        /* Insert the bits we will remove from the mantissa into r11[31:24] */
++        bfins   r11, r12, 24, 8
++ 
++        /* Now add the mantissas. */
++        add     r8, r12
++ 
++        ld.w    r12, sp++
++#else
++        /* Ignore sticky bit to simplify and speed up rounding */
++        /* op2 is either zero or subnormal. */
++        breq    __avr32_f32_add_op2_subnormal
++0:      
++        /* Get shift amount to scale mantissa of op2. */
++        rsub    r9, r10                 
++ 
++        /* Saturate the shift amount to 31. If the amount
++           is any larger op2 is insignificant. */
++        satu    r9 >> 0, 5      
++ 
++        /* Shift mantissa of op2 to same decimal point as the mantissa
++           of op1. */
++        lsr     r11, r11, r9
++ 
++        /* Now add the mantissas. */
++        add     r8, r11
++        
++#endif
++        /* Check if we overflowed. */
++        brcs    __avr32_f32_add_res_of
++1:      
++        /* Pack result. */
++        or      r12, r12, r8 >> 8
++        bfins   r12, r10, 23, 8         
++ 
++        /* Round */     
++#if defined(L_avr32_f32_addsub)
++	mov_imm	r10, 0x80000000
++        bld     r12, 0
++        subne   r10, -1 
++        cp.w    r11, r10
++        subhs   r12, -1
++#else
++        bld     r8, 7 
++        acr     r12
++#endif  
++
++        ret     r12     
++ 
++__avr32_f32_add_op2_subnormal:
++        /* Fix implicit bit and adjust exponent of subnormals. */
++        cbr     r11, 31
++        /* Set exponent to 1 if we do not have a zero. */
++        movne   r9,1
++ 
++        /* Check if op1 is also subnormal. */
++        cp.w    r10, 0
++        brne    0b
++	/* Both operands subnormal, just add the mantissas and 
++	   pack. If the addition of the subnormal numbers results
++	   in a normal number then the exponent will automatically
++	   be set to 1 by the addition. */
++        cbr     r8, 31
++	add	r11, r8
++	or	r12, r12, r11 >> 8
++	ret	r12
++ 
++__avr32_f32_add_op1_nan_or_inf: 
++        /* Check if op1 is NaN, if so return NaN */
++        lsl     r11, r8, 1
++        retne   -1
++ 
++        /* op1 is Inf. */
++        bfins   r12, r10, 23, 8 /* Generate Inf in r12 */
++ 
++        /* Check if op2 is Inf. or NaN */
++        lsr     r11, r9, 23
++        cp.w    r11, 0xff
++        retne   r12             /* op2 not Inf or NaN, return op1 */
++ 
++        lsl     r9, 9
++        reteq   r12             /* op2 Inf return op1 */
++        ret     -1              /* op2 is NaN, return NaN */ 
++ 
++__avr32_f32_add_res_of:
++        /* We overflowed. Increase exponent and shift mantissa.*/
++        lsr     r8, 1
++        sub     r10, -1
++ 
++        /* Clear mantissa to set result to Inf if the exponent is 255. */
++        cp.w    r10, 255
++        moveq   r8, 0
++        moveq   r11, 0
++        rjmp    1b      
++        
++        
++#endif
++
++	
++#if defined(L_avr32_f32_div) || defined(L_avr32_f32_div_fast)
++	.align	2
++
++#if defined(L_avr32_f32_div_fast)
++        .global __avr32_f32_div_fast
++        .type  __avr32_f32_div_fast,@function
++__avr32_f32_div_fast:
++#else
++        .global __avr32_f32_div
++        .type  __avr32_f32_div,@function
++__avr32_f32_div:
++#endif
++	 
++        eor     r8, r11, r12            /* MSB(r8) = Sign(op1) ^ Sign(op2) */
++ 
++        /* Unpack */
++        lsl     r12,1
++        lsl     r11,1
++        breq    4f                      /* Check op2 for zero */
++
++        tst     r12, r12
++        moveq   r9, 0
++        breq    12f
++
++        /* Unpack op1*/ 
++        /* exp: r9 */
++        /* sf:  r12 */
++        lsr     r9, r12, 24
++        breq    11f /*If number is subnormal*/
++        cp      r9, 0xff
++        brhs    2f  /* Check op1 for NaN or Inf */      
++        lsl     r12, 7
++        sbr     r12, 31 /*Implicit bit*/
++12:                     
++ 
++        /* Unpack op2*/
++        /* exp: r10 */
++        /* sf:  r11 */
++        lsr     r10, r11, 24
++        breq    13f /*If number is subnormal*/
++        cp      r10, 0xff
++        brhs    3f  /* Check op2 for NaN or Inf */      
++        lsl     r11,7
++        sbr     r11, 31 /*Implicit bit*/
++
++        cp.w    r9, 0
++        subfeq  r12, 0
++        reteq   0                       /* op1 is zero and op2 is not zero */
++                                        /* or NaN so return zero */
++
++14:     
++ 
++        /* For UC3, store with predecrement is faster than stm */
++        st.w    --sp, r5
++        st.d    --sp, r6
++ 
++        /* Calculate new exponent */
++        sub     r9, r10
++        sub     r9,-127
++ 
++        /* Divide */
++        /* Approximating 1/d with the following recurrence: */
++        /* R[j+1] = R[j]*(2-R[j]*d) */
++        /* Using 2.30 format */
++        /* TWO:  r10 */
++        /* d:    r5 */
++        /* Multiply result :     r6, r7 */
++        /* Initial guess :       r11 */
++        /* New approximations :  r11 */
++        /* Dividend :            r12 */
++
++	/* Load TWO */
++	mov_imm	r10, 0x80000000 
++         
++        lsr     r12, 2     /* Get significand of Op1 in 2.30 format */
++        lsr     r5, r11, 2 /* Get significand of Op2 (=d) in 2.30 format */
++ 
++        /* Load initial guess, using look-up table */
++        /* Initial guess is of format 01.XY, where XY is constructed as follows: */
++        /* Let d be of following format: 00.1xy....., then XY=~xy */
++        /* For d=00.100 = 0,5   -> initial guess=01.11 = 1,75 */
++        /* For d=00.101 = 0,625 -> initial guess=01.11 = 1,5  */
++        /* For d=00.110 = 0,75  -> initial guess=01.11 = 1,25 */
++        /* For d=00.111 = 0,875 -> initial guess=01.11 = 1,0  */
++ 
++        lsr     r11, r10, 1
++        bfextu  r6, r5, 27, 2
++        com     r6
++        bfins   r11, r6, 28, 2
++ 
++        /* First approximation */
++        /* r7 = R[j]*d */
++        mulu.d  r6, r11, r5
++        /* r7 = 2-R[j]*d */
++        sub    r7, r10, r7<<2
++        /* r11 = R[j]*(2-R[j]*d) */
++        mulu.d  r6, r11, r7
++        lsl     r11, r7, 2
++         
++        /* Second approximation */
++        /* r7 = R[j]*d */
++        mulu.d  r6, r11, r5
++        /* r7 = 2-R[j]*d */
++        sub    r7, r10, r7<<2
++        /* r11 = R[j]*(2-R[j]*d) */
++        mulu.d  r6, r11, r7
++        lsl     r11, r7, 2
++         
++        /* Third approximation */
++        /* r7 = R[j]*d */
++        mulu.d  r6, r11, r5
++        /* r7 = 2-R[j]*d */
++        sub    r7, r10, r7<<2
++        /* r11 = R[j]*(2-R[j]*d) */
++        mulu.d  r6, r11, r7
++        lsl     r11, r7, 2
++ 
++        /* Fourth approximation */
++        /* r7 = R[j]*d */
++        mulu.d  r6, r11, r5
++        /* r7 = 2-R[j]*d */
++        sub    r7, r10, r7<<2
++        /* r11 = R[j]*(2-R[j]*d) */
++        mulu.d  r6, r11, r7
++        lsl     r11, r7, 2
++ 
++ 
++        /* Multiply with dividend to get quotient, r7 = sf(op1)/sf(op2) */
++        mulu.d  r6, r11, r12
++ 
++        /* Shift by 3 to get result in 1.31 format, as required by the exponent. */
++        /* Note that 1.31 format is already used by the exponent in r9, since */
++        /* a bias of 127 was added to the result exponent, even though the implicit */
++        /* bit was inserted. This gives the exponent an additional bias of 1, which */
++        /* supports 1.31 format. */
++	//lsl     r10, r7, 3
++
++	/* Adjust exponent and mantissa in case the result is of format
++	   0000.1xxx to 0001.xxx*/	
++#if defined(L_avr32_f32_div)
++	lsr	r12, 4	/* Scale dividend to 6.26 format to match the
++			   result of the multiplication of the divisor and 
++			   quotient to get the remainder. */
++#endif
++	bld	r7, 31-3
++	breq	0f
++	lsl	r7, 1	
++	sub	r9, 1
++#if defined(L_avr32_f32_div)
++	lsl	r12, 1	/* Scale dividend to 5.27 format to match the
++			   result of the multiplication of the divisor and 
++			   quotient to get the remainder. */
++#endif
++0:		
++        cp      r9, 0   
++        brle    __avr32_f32_div_res_subnormal /* Result was subnormal. */
++
++		
++#if defined(L_avr32_f32_div)
++	/* In order to round correctly we calculate the remainder:	
++	   Remainder = dividend[r12] - divisor[r5]*quotient[r7] 
++	   for the case when the quotient is halfway between the round-up
++	   value and the round down value. If the remainder then is negative
++	   it means that the quotient was to big and that it should not be
++           rounded up, if the remainder is positive the quotient was to small
++	   and we need to round up. If the remainder is zero it means that the
++	   quotient is exact but since we need to remove the guard bit we should
++	   round to even. */
++	andl	r7, 0xffe0
++	orl	r7, 0x0010
++
++	/* Now do the multiplication. The quotient has the format 4.28
++	   while the divisor has the format 2.30 which gives a result
++	   of 6.26 */
++	mulu.d	r10, r5, r7
++
++	/* Check if remainder is positive, negative or equal. */
++	bfextu	r5, r7, 5, 1  /* Get parity bit into bit 0 of r5 */ 
++	cp	r10, 0
++__avr32_f32_div_round_subnormal:	
++	cpc	r11, r12
++	srlo	r11	/* Remainder positive:	 we need to round up.*/
++	moveq	r11, r5  /* Remainder zero:	 round up if mantissa odd. */
++#else
++	bfextu	r11, r7, 4, 1  /* Get guard bit */ 	
++#endif
++                               
++        /* Pack final result*/
++        lsr     r12, r7, 5
++        bfins   r12, r9, 23, 8
++        /* For UC3, load with postincrement is faster than ldm */
++        ld.d    r6, sp++
++        ld.w    r5, sp++
++        bld     r8, 31
++        bst     r12, 31
++	/* Rounding add. */
++	add	r12, r11
++        ret     r12
++
++__divsf_return_op1:     
++        lsl     r8, 1
++        ror     r12
++        ret     r12
++ 
++ 
++2:
++        /* Op1 is NaN or inf */
++        retne   -1      /* Return NaN if op1 is NaN */
++        /* Op1 is inf check op2 */
++	mov_imm	r9, 0xff000000
++        cp      r11, r9
++        brlo    __divsf_return_op1 /* inf/number gives inf */
++        ret     -1      /* The rest gives NaN*/
++3:      
++        /* Op2 is NaN or inf */
++        reteq   0       /* Return zero if number/inf*/
++        ret     -1      /* Return NaN*/
++4:
++        /* Op1 is zero ? */
++        tst     r12,r12
++        reteq   -1      /* 0.0/0.0 is NaN */
++        /* Op1 is Nan? */
++        lsr     r9, r12, 24
++        breq    11f /*If number is subnormal*/
++        cp      r9, 0xff
++        brhs    2b  /* Check op1 for NaN or Inf */
++        /* Nonzero/0.0 is Inf. Sign bit will be shifted in before returning*/
++	mov_imm	r12, 0xff000000
++        rjmp    __divsf_return_op1
++                
++11:     /* Op1 was denormal. Fix it. */
++        lsl     r12,7
++        clz     r9,r12
++        lsl     r12,r12,r9
++        rsub    r9,r9,1
++        rjmp    12b
++ 
++13:     /* Op2 was denormal. Fix it. */ 
++        lsl     r11,7
++        clz     r10,r11
++        lsl     r11,r11,r10
++        rsub    r10,r10,1
++        rjmp    14b
++        
++ 
++__avr32_f32_div_res_subnormal:     /* Divide result was subnormal */
++#if defined(L_avr32_f32_div)
++	/* Check how much we must scale down the mantissa. */
++	neg	r9
++	sub	r9, -1     /* We do no longer have an implicit bit. */
++	satu	r9 >> 0, 5 /* Saturate shift amount to max 32. */
++	/* Scale down quotient */
++	rsub	r10, r9, 32
++	lsr	r7, r7, r9
++	/* Scale down the dividend to match the scaling of the quotient. */
++	lsl	r6, r12, r10	/* Make the divident 64-bit and put the lsw in r6 */
++	lsr	r12, r12, r9
++
++	/* Start performing the same rounding as done for normal numbers
++	   but this time we have scaled the quotient and dividend and hence
++	   need a little different comparison. */
++	andl	r7, 0xffe0
++	orl	r7, 0x0010
++
++	/* Now do the multiplication. The quotient has the format 4.28
++	   while the divisor has the format 2.30 which gives a result
++	   of 6.26 */
++	mulu.d	r10, r5, r7
++
++	/* Set exponent to 0 */
++	mov	r9, 0	
++
++	/* Check if remainder is positive, negative or equal. */
++	bfextu	r5, r7, 5, 1  /* Get parity bit into bit 0 of r5 */ 
++	cp	r10, r6
++	rjmp	__avr32_f32_div_round_subnormal
++
++#else
++        ld.d    r6, sp++
++        ld.w    r5, sp++
++        /*Flush to zero*/
++	ret	0
++#endif
++#endif
++ 
++#ifdef L_avr32_f32_mul
++        .global __avr32_f32_mul
++        .type  __avr32_f32_mul,@function
++ 
++                
++__avr32_f32_mul:
++        mov     r8, r12
++        eor     r12, r11                /* MSB(r8) = Sign(op1) ^ Sign(op2) */
++        andh    r12, 0x8000, COH
++        
++        /* arrange operands so that that op1 >= op2 */
++        cbr     r8, 31
++        breq    __avr32_f32_mul_op1_zero
++        cbr     r11, 31
++ 
++        /* Put the number with the largest exponent in r10
++           and the number with the smallest exponent in r9 */
++        max     r10, r8, r11
++        min     r9, r8, r11
++ 
++        /* Unpack exponent and mantissa of op1 */
++        lsl     r8, r10, 8
++        sbr     r8, 31  /* Set implicit bit. */
++        lsr     r10, 23 
++                
++        /* op1 is NaN or Inf. */
++        cp.w    r10, 0xff
++        breq    __avr32_f32_mul_op1_nan_or_inf
++        
++        /* Unpack exponent and mantissa of op2 */
++        lsl     r11, r9, 8
++        sbr     r11, 31  /* Set implicit bit. */
++        lsr     r9, 23  
++ 
++        /* op2 is either zero or subnormal. */
++        breq    __avr32_f32_mul_op2_subnormal
++0:      
++        /* Calculate new exponent */
++        add     r9,r10
++ 
++        /* Do the multiplication */
++        mulu.d  r10,r8,r11
++ 
++        /* We might need to scale up by two if the MSB of the result is
++           zero. */
++        lsl     r8, r11, 1
++        movcc   r11, r8
++        subcc   r9, 1
++ 
++        /* Put the shifted out bits of the mantissa into r10 */
++        lsr     r10, 8
++        bfins   r10, r11, 24, 8
++                
++        sub     r9,(127-1)              /* remove extra exponent bias */
++        brle    __avr32_f32_mul_res_subnormal
++ 
++        /* Check for Inf. */
++        cp.w    r9, 0xff
++        brge    1f
++ 
++        /* Pack result. */
++        or      r12, r12, r11 >> 8
++        bfins   r12, r9, 23, 8          
++ 
++        /* Round */     
++__avr32_f32_mul_round:
++	mov_imm	r8, 0x80000000
++        bld     r12, 0
++        subne   r8, -1  
++ 
++        cp.w    r10, r8
++        subhs   r12, -1
++        
++        ret     r12     
++ 
++1:      
++        /* Return Inf */        
++        orh     r12, 0x7f80
++        ret     r12
++ 
++__avr32_f32_mul_op2_subnormal:
++        cbr     r11, 31
++        clz     r9, r11
++        retcs   0       /* op2 is zero. Return 0 */
++        sub     r9, 8
++        lsl     r11, r11, r9
++        rsub    r9, r9, 1
++                
++        /* Check if op2 is subnormal. */
++        tst     r10, r10
++        brne    0b
++ 
++        /* op2 is subnormal */  
++        cbr     r8, 31
++        clz     r10, r11
++        retcs   0       /* op1 is zero. Return 0 */
++        lsl     r8, r8, r10
++        rsub    r10, r10, 1
++                        
++        rjmp    0b
++                
++ 
++__avr32_f32_mul_op1_nan_or_inf:
++        /* Check if op1 is NaN, if so return NaN */
++        lsl     r11, r8, 1
++        retne   -1
++ 
++        /* op1 is Inf. */
++        tst     r9, r9
++        reteq   -1      /* Inf * 0 -> NaN */
++ 
++        bfins   r12, r10, 23, 8 /* Generate Inf in r12 */
++ 
++        /* Check if op2 is Inf. or NaN */
++        lsr     r11, r9, 23
++        cp.w    r11, 0xff
++        retne   r12             /* op2 not Inf or NaN, return Info */
++ 
++        lsl     r9, 9
++        reteq   r12             /* op2 Inf return Inf */
++        ret     -1              /* op2 is NaN, return NaN */ 
++        
++__avr32_f32_mul_res_subnormal:
++        /* Check if the number is so small that
++           it will be represented with zero. */
++        rsub    r9, r9, 9
++        rsub    r8, r9, 32
++        retcs   0
++ 
++        /* Shift the mantissa into the correct position.*/
++        lsr     r9, r11, r9
++        /* Add sign bit. */
++        or      r12, r9
++        /* Put the shifted out bits in the most significant part
++           of r8. */
++        lsl     r11, r11, r8
++ 
++        /* Add all the remainder bits used for rounding into r11 */
++        andh    r10, 0x00FF     
++        or      r10, r11
++        rjmp    __avr32_f32_mul_round
++
++__avr32_f32_mul_op1_zero:
++        bfextu  r10, r11, 23, 8
++        cp.w    r10, 0xff
++        retne   r12
++        reteq   -1        
++ 
++#endif  
++ 
++        
++#ifdef L_avr32_s32_to_f32
++        .global __avr32_s32_to_f32
++        .type  __avr32_s32_to_f32,@function
++__avr32_s32_to_f32:
++        cp      r12, 0
++        reteq   r12     /* If zero then return zero float */
++        mov     r11, r12 /* Keep the sign */
++        abs     r12     /* Compute the absolute value */
++        mov     r10, 31 + 127   /* Set the correct exponent */
++        
++        /* Normalize */
++        normalize_sf    r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
++ 
++        /* Check for subnormal result */
++        cp.w    r10, 0
++        brle    __avr32_s32_to_f32_subnormal
++ 
++        round_sf        r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
++        pack_sf         r12 /*sf*/, r10 /*exp*/, r12 /*mant*/
++        lsl     r11, 1
++        ror     r12
++        ret     r12             
++ 
++__avr32_s32_to_f32_subnormal:
++        /* Adjust a subnormal result */
++        adjust_subnormal_sf     r12/*sf*/, r10 /*exp*/, r12 /*mant*/, r11/*sign*/, r9 /*scratch*/
++        ret     r12
++        
++#endif
++ 
++#ifdef L_avr32_u32_to_f32
++        .global __avr32_u32_to_f32
++        .type  __avr32_u32_to_f32,@function
++__avr32_u32_to_f32:
++        cp      r12, 0
++        reteq   r12     /* If zero then return zero float */
++        mov     r10, 31 + 127   /* Set the correct exponent */
++        
++        /* Normalize */
++        normalize_sf    r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
++ 
++        /* Check for subnormal result */
++        cp.w    r10, 0
++        brle    __avr32_u32_to_f32_subnormal
++ 
++        round_sf        r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
++        pack_sf         r12 /*sf*/, r10 /*exp*/, r12 /*mant*/
++        lsr     r12,1   /* Sign bit is 0 for unsigned int */
++        ret     r12             
++ 
++__avr32_u32_to_f32_subnormal:
++        /* Adjust a subnormal result */
++        mov     r8, 0
++        adjust_subnormal_sf     r12/*sf*/,r10 /*exp*/, r12 /*mant*/,r8/*sign*/, r9 /*scratch*/
++        ret     r12
++        
++        
++#endif
++        
++ 
++#ifdef L_avr32_f32_to_s32
++        .global __avr32_f32_to_s32
++        .type  __avr32_f32_to_s32,@function
++__avr32_f32_to_s32:
++        bfextu  r11, r12, 23, 8
++        sub     r11,127                 /* Fix bias */
++        retlo   0                       /* Negative exponent yields zero integer */
++ 
++        /* Shift mantissa into correct position */
++        rsub    r11,r11,31      /* Shift amount */
++        lsl     r10,r12,8       /* Get mantissa */
++        sbr     r10,31          /* Add implicit bit */
++        lsr     r10,r10,r11     /* Perform shift */
++        lsl     r12,1           /* Check sign */
++        retcc   r10             /* if positive, we are done */
++        neg     r10             /* if negative float, negate result */
++        ret     r10
++ 
++#endif  
++        
++#ifdef L_avr32_f32_to_u32
++        .global __avr32_f32_to_u32
++        .type  __avr32_f32_to_u32,@function
++__avr32_f32_to_u32:
++        cp      r12,0
++        retmi   0                       /* Negative numbers gives 0 */
++        bfextu  r11, r12, 23, 8         /* Extract exponent */
++        sub     r11,127                 /* Fix bias */
++        retlo   0                       /* Negative exponent yields zero integer */
++ 
++        /* Shift mantissa into correct position */
++        rsub    r11,r11,31      /* Shift amount */
++        lsl     r12,8           /* Get mantissa */
++        sbr     r12,31          /* Add implicit bit */
++        lsr     r12,r12,r11     /* Perform shift */
++        ret     r12
++ 
++#endif  
++ 
++#ifdef L_avr32_f32_to_f64
++        .global __avr32_f32_to_f64
++        .type  __avr32_f32_to_f64,@function
++ 
++__avr32_f32_to_f64:
++        lsl     r11,r12,1               /* Remove sign bit, keep original value in r12*/
++        moveq   r10, 0
++        reteq   r11                     /* Return zero if input is zero */
++ 
++        bfextu  r9,r11,24,8              /* Get exponent */
++        cp.w    r9,0xff                 /* check for NaN or inf */
++        breq    0f
++ 
++        lsl     r11,7                   /* Convert sf mantissa to df format */
++        mov     r10,0
++ 
++        /* Check if implicit bit should be set */
++        cp.w    r9, 0
++        subeq   r9,-1                    /* Adjust exponent if it was 0 */
++        srne    r8
++        or      r11, r11, r8 << 31      /* Set implicit bit if needed */
++        sub     r9,(127-0x3ff)          /* Convert exponent to df format exponent */
++ 
++        /*We know that low register of mantissa is 0, and will be unaffected by normalization.*/
++        /*We can therefore use the faster normalize_sf function instead of normalize_df.*/
++        normalize_sf    r9 /*exp*/, r11 /*mantissa*/, r8 /*scratch*/
++        pack_df         r9 /*exp*/, r10, r11 /*mantissa*/, r10, r11 /*df*/
++ 
++__extendsfdf_return_op1:        
++        /* Rotate in sign bit */
++        lsl     r12, 1
++        ror     r11
++        ret     r11
++                        
++0:
++        /* Inf or NaN*/
++	mov_imm	r10, 0xffe00000
++        lsl     r11,8                   /* check mantissa */
++        movne   r11, -1                 /* Return NaN */
++        moveq   r11, r10                /* Return inf */
++        mov     r10, 0
++        rjmp    __extendsfdf_return_op1
++#endif                  
++ 
++ 
++#ifdef L_avr32_f64_to_f32
++        .global __avr32_f64_to_f32
++        .type  __avr32_f64_to_f32,@function
++ 
++__avr32_f64_to_f32:
++        /* Unpack */
++        lsl     r9,r11,1                /* Unpack exponent */
++        lsr     r9,21
++ 
++        reteq   0                       /* If exponent is 0 the number is so small
++                                           that the conversion to single float gives
++                                           zero */
++ 
++        lsl     r8,r11,10                  /* Adjust mantissa */
++        or      r12,r8,r10>>22
++ 
++        lsl     r10,10                  /* Check if there are any remaining bits
++                                           in the low part of the mantissa.*/
++        neg     r10
++        rol     r12                     /* If there were remaining bits then set lsb
++                                           of mantissa to 1 */
++ 
++        cp      r9,0x7ff
++        breq    2f                      /* Check for NaN or inf */
++ 
++        sub     r9,(0x3ff-127)          /* Adjust bias of exponent */
++        sbr     r12,31                  /* set the implicit bit.*/
++ 
++        cp.w    r9, 0                   /* Check for subnormal number */
++        brle    3f
++ 
++        round_sf        r9 /*exp*/, r12 /*mant*/, r10 /*scratch*/       
++        pack_sf         r12 /*sf*/, r9 /*exp*/, r12 /*mant*/
++__truncdfsf_return_op1: 
++        /* Rotate in sign bit */
++        lsl     r11, 1
++        ror     r12
++        ret     r12             
++        
++2:
++        /* NaN or inf */
++        cbr     r12,31                  /* clear implicit bit */
++        retne   -1                      /* Return NaN if mantissa not zero */
++	mov_imm	r12, 0x7f800000
++        ret     r12                     /* Return inf */
++ 
++3:      /* Result is subnormal. Adjust it.*/
++        adjust_subnormal_sf     r12/*sf*/,r9 /*exp*/, r12 /*mant*/, r11/*sign*/, r10 /*scratch*/
++        ret     r12
++        
++                
++#endif
++ 
++#if defined(L_mulsi3) && defined(__AVR32_NO_MUL__)
++	.global __mulsi3
++	.type __mulsi3,@function
++
++__mulsi3:
++	mov r9, 0
++0:
++	lsr r11, 1
++	addcs r9, r9, r12
++	breq 1f
++	lsl r12, 1
++	rjmp 0b
++1:
++	ret r9
++#endif
+--- /dev/null
++++ b/gcc/config/avr32/lib2funcs.S
+@@ -0,0 +1,21 @@
++	.align	4
++	.global __nonlocal_goto
++	.type  __nonlocal_goto,@function
++
++/* __nonlocal_goto:	This function handles nonlocal_goto's in gcc.
++
++	parameter 0 (r12) = New Frame Pointer
++	parameter 1 (r11) = Address to goto
++	parameter 2 (r10) = New Stack Pointer
++
++	This function invalidates the return stack, since it returns from a
++	function without using a return instruction.
++*/
++__nonlocal_goto:
++	mov	r7, r12
++	mov	sp, r10
++	frs			# Flush return stack
++	mov	pc, r11
++
++
++		
+--- /dev/null
++++ b/gcc/config/avr32/linux-elf.h
+@@ -0,0 +1,151 @@
++/*
++   Linux/Elf specific definitions.
++   Copyright 2003-2006 Atmel Corporation.
++
++   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
++   and H�vard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
++
++   This file is part of GCC.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that 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. */
++
++
++
++/* elfos.h should have already been included.  Now just override
++   any conflicting definitions and add any extras.  */
++
++/* Run-time Target Specification.  */
++#undef  TARGET_VERSION
++#define TARGET_VERSION  fputs (" (AVR32 GNU/Linux with ELF)", stderr);
++
++/* Do not assume anything about header files.  */
++#define NO_IMPLICIT_EXTERN_C
++
++/* The GNU C++ standard library requires that these macros be defined.  */
++#undef CPLUSPLUS_CPP_SPEC
++#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
++
++/* Now we define the strings used to build the spec file.  */
++#undef  LIB_SPEC
++#define LIB_SPEC \
++  "%{pthread:-lpthread} \
++   %{shared:-lc} \
++   %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
++
++/* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
++   the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
++   provides part of the support for getting C++ file-scope static
++   object constructed before entering `main'.  */
++
++#undef  STARTFILE_SPEC
++#define STARTFILE_SPEC \
++  "%{!shared: \
++     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
++		       %{!p:%{profile:gcrt1.o%s} \
++			 %{!profile:crt1.o%s}}}} \
++   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
++
++/* Provide a ENDFILE_SPEC appropriate for GNU/Linux.  Here we tack on
++   the GNU/Linux magical crtend.o file (see crtstuff.c) which
++   provides part of the support for getting C++ file-scope static
++   object constructed before entering `main', followed by a normal
++   GNU/Linux "finalizer" file, `crtn.o'.  */
++
++#undef  ENDFILE_SPEC
++#define ENDFILE_SPEC \
++  "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
++
++#undef ASM_SPEC
++#define ASM_SPEC "%{!mno-pic:%{!fno-pic:--pic}} %{mrelax|O*:%{mno-relax|O0|O1: ;:--linkrelax}} %{mcpu=*:-mcpu=%*}"
++ 
++#undef  LINK_SPEC
++#define LINK_SPEC "%{version:-v} \
++   %{static:-Bstatic} \
++   %{shared:-shared} \
++   %{symbolic:-Bsymbolic} \
++   %{rdynamic:-export-dynamic} \
++   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0} \
++   %{mrelax|O*:%{mno-relax|O0|O1: ;:--relax}}"
++
++#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
++
++/* This is how we tell the assembler that two symbols have the same value.  */
++#define ASM_OUTPUT_DEF(FILE, NAME1, NAME2) \
++  do					   \
++    {					   \
++      assemble_name (FILE, NAME1); 	   \
++      fputs (" = ", FILE);		   \
++      assemble_name (FILE, NAME2);	   \
++      fputc ('\n', FILE);		   \
++    }					   \
++  while (0)
++
++
++
++#undef  CC1_SPEC
++#define CC1_SPEC "%{profile:-p}"
++
++/* Target CPU builtins.  */
++#define TARGET_CPU_CPP_BUILTINS()				\
++  do								\
++    {								\
++      builtin_define ("__avr32__");				\
++      builtin_define ("__AVR32__");				\
++      builtin_define ("__AVR32_LINUX__");			\
++      builtin_define (avr32_part->macro);			\
++      builtin_define (avr32_arch->macro);			\
++      if (avr32_arch->uarch_type == UARCH_TYPE_AVR32A)		\
++	builtin_define ("__AVR32_AVR32A__");			\
++      else							\
++	builtin_define ("__AVR32_AVR32B__");			\
++      if (TARGET_UNALIGNED_WORD)				\
++	builtin_define ("__AVR32_HAS_UNALIGNED_WORD__");	\
++      if (TARGET_SIMD)						\
++	builtin_define ("__AVR32_HAS_SIMD__");			\
++      if (TARGET_DSP)						\
++	builtin_define ("__AVR32_HAS_DSP__");			\
++      if (TARGET_RMW)						\
++	builtin_define ("__AVR32_HAS_RMW__");			\
++      if (TARGET_BRANCH_PRED)					\
++	builtin_define ("__AVR32_HAS_BRANCH_PRED__");		\
++      if (TARGET_FAST_FLOAT)                                    \
++        builtin_define ("__AVR32_FAST_FLOAT__");                \
++    }								\
++  while (0)
++
++
++
++/* Call the function profiler with a given profile label.  */
++#undef  FUNCTION_PROFILER
++#define FUNCTION_PROFILER(STREAM, LABELNO)				\
++  do									\
++    {									\
++      fprintf (STREAM, "\tmov\tlr, lo(mcount)\n\torh\tlr, hi(mcount)\n"); \
++      fprintf (STREAM, "\ticall lr\n");					\
++    }									\
++  while (0)
++
++#define NO_PROFILE_COUNTERS 1
++
++/* For dynamic libraries to work */
++/* #define PLT_REG_CALL_CLOBBERED 1 */
++#define AVR32_ALWAYS_PIC 1
++
++/* uclibc does not implement sinf, cosf etc. */
++#undef TARGET_C99_FUNCTIONS
++#define TARGET_C99_FUNCTIONS 0
++
++#define LINK_GCC_C_SEQUENCE_SPEC \
++  "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
+--- /dev/null
++++ b/gcc/config/avr32/predicates.md
+@@ -0,0 +1,422 @@
++;;   AVR32 predicates file.
++;;   Copyright 2003-2006 Atmel Corporation.
++;;
++;;   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
++;;
++;;   This file is part of GCC.
++;;
++;;   This program is free software; you can redistribute it and/or modify
++;;   it under the terms of the GNU General Public License as published by
++;;   the Free Software Foundation; either version 2 of the License, or
++;;   (at your option) any later version.
++;;
++;;   This program is distributed in the hope that 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.
++
++
++;; True if the operand is a memory reference which contains an
++;; Address consisting of a single pointer register
++(define_predicate "avr32_indirect_register_operand"
++  (and (match_code "mem")
++       (match_test "register_operand(XEXP(op, 0), SImode)")))
++
++
++
++;; Address expression with a base pointer offset with
++;; a register displacement
++(define_predicate "avr32_indexed_memory_operand"
++  (and (match_code "mem")
++       (match_test "GET_CODE(XEXP(op, 0)) == PLUS"))
++  {
++
++   rtx op0 = XEXP(XEXP(op, 0), 0);
++   rtx op1 = XEXP(XEXP(op, 0), 1);
++
++   return ((avr32_address_register_rtx_p (op0, 0)
++            && avr32_legitimate_index_p (GET_MODE(op), op1, 0))
++	   || (avr32_address_register_rtx_p (op1, 0)
++            && avr32_legitimate_index_p (GET_MODE(op), op0, 0)));
++
++ })
++
++;; Operand suitable for the ld.sb instruction
++(define_predicate "load_sb_memory_operand"
++  (ior (match_operand 0 "avr32_indirect_register_operand")
++       (match_operand 0 "avr32_indexed_memory_operand")))
++
++
++;; Operand suitable as operand to insns sign extending QI values
++(define_predicate "extendqi_operand"
++  (ior (match_operand 0 "load_sb_memory_operand")
++       (match_operand 0 "register_operand")))
++
++(define_predicate "post_inc_memory_operand"
++  (and (match_code "mem")
++       (match_test "(GET_CODE(XEXP(op, 0)) == POST_INC)
++                     && REG_P(XEXP(XEXP(op, 0), 0))")))
++
++(define_predicate "pre_dec_memory_operand"
++  (and (match_code "mem")
++       (match_test "(GET_CODE(XEXP(op, 0)) == PRE_DEC)
++                     && REG_P(XEXP(XEXP(op, 0), 0))")))
++
++;; Operand suitable for add instructions
++(define_predicate "avr32_add_operand"
++  (ior (match_operand 0 "register_operand")
++       (and (match_operand 0 "immediate_operand")
++            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'I', \"Is21\")"))))
++
++;; Operand is a power of two immediate
++(define_predicate "power_of_two_operand"
++  (match_code "const_int")
++{
++  HOST_WIDE_INT value = INTVAL (op);
++
++  return value != 0 && (value & (value - 1)) == 0;
++})
++
++;; Operand is a multiple of 8 immediate
++(define_predicate "multiple_of_8_operand"
++  (match_code "const_int")
++{
++  HOST_WIDE_INT value = INTVAL (op);
++
++  return (value & 0x7) == 0 ;
++})
++
++;; Operand is a multiple of 16 immediate
++(define_predicate "multiple_of_16_operand"
++  (match_code "const_int")
++{
++  HOST_WIDE_INT value = INTVAL (op);
++
++  return (value & 0xf) == 0 ;
++})
++
++;; Operand is a mask used for masking away upper bits of a reg
++(define_predicate "avr32_mask_upper_bits_operand"
++  (match_code "const_int")
++{
++  HOST_WIDE_INT value = INTVAL (op) + 1;
++
++  return value != 1 && value != 0 && (value & (value - 1)) == 0;
++})
++
++
++;; Operand suitable for mul instructions
++(define_predicate "avr32_mul_operand"
++  (ior (match_operand 0 "register_operand")
++       (and (match_operand 0 "immediate_operand")
++            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks08\")"))))
++
++;; True for logical binary operators.
++(define_predicate "logical_binary_operator"
++  (match_code "ior,xor,and"))
++
++;; True for logical shift operators
++(define_predicate "logical_shift_operator"
++  (match_code "ashift,lshiftrt"))
++
++;; True for shift operand for logical and, or and eor insns
++(define_predicate "avr32_logical_shift_operand"
++  (and (match_code "ashift,lshiftrt")
++       (ior (and (match_test "GET_CODE(XEXP(op, 1)) == CONST_INT")
++                 (match_test "register_operand(XEXP(op, 0), GET_MODE(XEXP(op, 0)))"))
++            (and (match_test "GET_CODE(XEXP(op, 0)) == CONST_INT")
++                 (match_test "register_operand(XEXP(op, 1), GET_MODE(XEXP(op, 1)))"))))
++  )
++
++
++;; Predicate for second operand to and, ior and xor insn patterns
++(define_predicate "avr32_logical_insn_operand"
++  (ior (match_operand 0 "register_operand")
++       (match_operand 0 "avr32_logical_shift_operand"))
++)
++
++
++;; True for avr32 comparison operators
++(define_predicate "avr32_comparison_operator"
++  (ior (match_code "eq, ne, gt, ge, lt, le, gtu, geu, ltu, leu")
++       (and (match_code "unspec")
++            (match_test "(XINT(op, 1) == UNSPEC_COND_MI)
++                         || (XINT(op, 1) == UNSPEC_COND_PL)"))))
++
++(define_predicate "avr32_cond3_comparison_operator"
++  (ior (match_code "eq, ne, ge, lt, geu, ltu")
++       (and (match_code "unspec")
++            (match_test "(XINT(op, 1) == UNSPEC_COND_MI)
++                         || (XINT(op, 1) == UNSPEC_COND_PL)"))))
++
++;; True for avr32 comparison operand
++(define_predicate "avr32_comparison_operand"
++  (ior (and (match_code "eq, ne, gt, ge, lt, le, gtu, geu, ltu, leu")
++            (match_test "(CC0_P (XEXP(op,0)) && rtx_equal_p (XEXP(op,1), const0_rtx))"))
++       (and (match_code "unspec")
++            (match_test "(XINT(op, 1) == UNSPEC_COND_MI)
++                         || (XINT(op, 1) == UNSPEC_COND_PL)"))))
++
++;; True if this is a const_int with one bit set
++(define_predicate "one_bit_set_operand"
++  (match_code "const_int")
++  {
++   int i;
++   int value;
++   int ones = 0;
++
++   value = INTVAL(op);
++   for ( i = 0 ; i < 32; i++ ){
++     if ( value & ( 1 << i ) ){
++        ones++;
++      }
++   }
++
++   return ( ones == 1 );
++  })
++
++
++;; True if this is a const_int with one bit cleared
++(define_predicate "one_bit_cleared_operand"
++  (match_code "const_int")
++  {
++   int i;
++   int value;
++   int zeroes = 0;
++
++   value = INTVAL(op);
++   for ( i = 0 ; i < 32; i++ ){
++     if ( !(value & ( 1 << i )) ){
++        zeroes++;
++      }
++   }
++
++   return ( zeroes == 1 );
++  })
++
++
++;; Immediate all the low 16-bits cleared
++(define_predicate "avr32_hi16_immediate_operand"
++  (match_code "const_int")
++  {
++   /* If the low 16-bits are zero then this
++      is a hi16 immediate. */
++   return ((INTVAL(op) & 0xffff) == 0);
++   }
++)
++
++;; True if this is a register or immediate operand
++(define_predicate "register_immediate_operand"
++  (ior (match_operand 0 "register_operand")
++       (match_operand 0 "immediate_operand")))
++
++;; True if this is a register or const_int operand
++(define_predicate "register_const_int_operand"
++  (ior (match_operand 0 "register_operand")
++       (and (match_operand 0 "const_int_operand")
++            (match_operand 0 "immediate_operand"))))
++
++;; True if this is a register or const_double operand
++(define_predicate "register_const_double_operand"
++  (ior (match_operand 0 "register_operand")
++       (match_operand 0 "const_double_operand")))
++
++;; True if this is an operand containing a label_ref.
++(define_predicate "avr32_label_ref_operand"
++  (and (match_code "mem")
++       (match_test "avr32_find_symbol(op)
++                    && (GET_CODE(avr32_find_symbol(op)) == LABEL_REF)")))
++
++;; True if this is a valid symbol pointing to the constant pool.
++(define_predicate "avr32_const_pool_operand"
++  (and (match_code "symbol_ref")
++       (match_test "CONSTANT_POOL_ADDRESS_P(op)"))
++  {
++        return (flag_pic ? (!(symbol_mentioned_p (get_pool_constant (op))
++                        || label_mentioned_p (get_pool_constant (op)))
++                       || avr32_got_mentioned_p(get_pool_constant (op)))
++                    : true);
++  }
++)
++
++;; True if this is a memory reference to the constant or mini pool.
++(define_predicate "avr32_const_pool_ref_operand"
++  (ior (match_operand 0 "avr32_label_ref_operand")
++       (and (match_code "mem")
++            (match_test "avr32_const_pool_operand(XEXP(op,0), GET_MODE(XEXP(op,0)))"))))
++
++
++;; Legal source operand for movti insns
++(define_predicate "avr32_movti_src_operand"
++  (ior (match_operand 0 "avr32_const_pool_ref_operand")
++       (ior (ior (match_operand 0 "register_immediate_operand")
++                 (match_operand 0 "avr32_indirect_register_operand"))
++            (match_operand 0 "post_inc_memory_operand"))))
++  
++;; Legal destination operand for movti insns
++(define_predicate "avr32_movti_dst_operand"
++  (ior (ior (match_operand 0 "register_operand")
++            (match_operand 0 "avr32_indirect_register_operand"))
++       (match_operand 0 "pre_dec_memory_operand")))
++
++
++;; True if this is a k12 offseted memory operand.
++(define_predicate "avr32_k12_memory_operand"
++  (and (match_code "mem")
++       (ior (match_test "REG_P(XEXP(op, 0))")
++            (match_test "GET_CODE(XEXP(op, 0)) == PLUS
++                         && REG_P(XEXP(XEXP(op, 0), 0))
++                         && (GET_CODE(XEXP(XEXP(op, 0), 1)) == CONST_INT)
++                         && (CONST_OK_FOR_CONSTRAINT_P(INTVAL(XEXP(XEXP(op, 0), 0)),
++                                'K', (mode == SImode) ? \"Ks14\" : ((mode == HImode) ? \"Ks13\" : \"Ks12\")))"))))
++
++;; True if this is a memory operand with an immediate displacement.
++(define_predicate "avr32_imm_disp_memory_operand"
++  (and (match_code "mem")
++       (match_test "GET_CODE(XEXP(op, 0)) == PLUS
++                    && REG_P(XEXP(XEXP(op, 0), 0))
++                    && (GET_CODE(XEXP(XEXP(op, 0), 1)) == CONST_INT)")))
++
++;; True if this is a bswap operand.
++(define_predicate "avr32_bswap_operand"
++  (ior (match_operand 0 "avr32_k12_memory_operand")
++       (match_operand 0 "register_operand")))
++
++;; True if this is a valid coprocessor insn memory operand.
++(define_predicate "avr32_cop_memory_operand"
++  (and (match_operand 0 "memory_operand")
++       (not (match_test "GET_CODE(XEXP(op, 0)) == PLUS
++                         && REG_P(XEXP(XEXP(op, 0), 0))
++                         && (GET_CODE(XEXP(XEXP(op, 0), 1)) == CONST_INT)
++                         && !(CONST_OK_FOR_CONSTRAINT_P(INTVAL(XEXP(XEXP(op, 0), 0)), 'K', \"Ku10\"))"))))
++
++;; True if this is a valid source/destination operand.
++;; for moving values to/from a coprocessor
++(define_predicate "avr32_cop_move_operand"
++  (ior (match_operand 0 "register_operand")
++       (match_operand 0 "avr32_cop_memory_operand")))
++
++
++;; True if this is a valid extract byte offset for use in
++;; load extracted index insns.
++(define_predicate "avr32_extract_shift_operand"
++  (and (match_operand 0 "const_int_operand")
++       (match_test "(INTVAL(op) == 0) || (INTVAL(op) == 8)
++                    || (INTVAL(op) == 16) || (INTVAL(op) == 24)")))
++
++;; True if this is a valid avr32 symbol operand.
++(define_predicate "avr32_symbol_operand"
++   (and (match_code "label_ref, symbol_ref, const")
++        (match_test "avr32_find_symbol(op)")))
++
++;; True if this is a valid operand for the lda.w and call pseudo insns.
++(define_predicate "avr32_address_operand"
++   (and (and (match_code "label_ref, symbol_ref")
++             (match_test "avr32_find_symbol(op)"))
++       (ior (match_test "TARGET_HAS_ASM_ADDR_PSEUDOS")
++            (match_test "flag_pic")) ))
++
++;; An immediate k16 address operand
++(define_predicate "avr32_ks16_address_operand"
++  (and (match_operand 0 "address_operand")
++       (ior (match_test "REG_P(op)")
++            (match_test "GET_CODE(op) == PLUS
++                         && ((GET_CODE(XEXP(op,0)) == CONST_INT)
++                             || (GET_CODE(XEXP(op,1)) == CONST_INT))")) ))
++
++;; An offset k16 memory operand
++(define_predicate "avr32_ks16_memory_operand"
++  (and (match_code "mem")
++       (match_test "avr32_ks16_address_operand (XEXP (op, 0), GET_MODE (XEXP (op, 0)))")))
++
++;; An immediate k11 address operand
++(define_predicate "avr32_ks11_address_operand"
++  (and (match_operand 0 "address_operand")
++       (ior (match_test "REG_P(op)")
++            (match_test "GET_CODE(op) == PLUS
++                         && (((GET_CODE(XEXP(op,0)) == CONST_INT)
++                              && avr32_const_ok_for_constraint_p(INTVAL(XEXP(op,0)), 'K', \"Ks11\"))
++                             || ((GET_CODE(XEXP(op,1)) == CONST_INT)
++                                 && avr32_const_ok_for_constraint_p(INTVAL(XEXP(op,1)), 'K', \"Ks11\")))")) ))
++
++;; True if this is a avr32 call operand
++(define_predicate "avr32_call_operand"
++  (ior (ior (match_operand 0 "register_operand")
++            (ior (match_operand 0 "avr32_const_pool_ref_operand")
++                 (match_operand 0 "avr32_address_operand")))
++       (match_test "SYMBOL_REF_RCALL_FUNCTION_P(op)")))
++
++;; Return true for operators performing ALU operations
++
++(define_predicate "alu_operator"
++  (match_code "ior, xor, and, plus, minus, ashift, lshiftrt, ashiftrt"))
++
++(define_predicate "avr32_add_shift_immediate_operand"
++  (and (match_operand 0 "immediate_operand")
++       (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ku02\")")))
++
++(define_predicate "avr32_cond_register_immediate_operand"
++  (ior (match_operand 0 "register_operand")
++       (and (match_operand 0 "immediate_operand")
++            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks08\")"))))
++
++(define_predicate "avr32_cond_immediate_operand"
++  (and (match_operand 0 "immediate_operand")
++       (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'I', \"Is08\")")))
++
++
++(define_predicate "avr32_cond_move_operand"
++  (ior (ior (match_operand 0 "register_operand")
++            (and (match_operand 0 "immediate_operand")
++                 (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks08\")")))
++       (and (match_test "TARGET_V2_INSNS")
++            (match_operand 0 "memory_operand"))))
++
++(define_predicate "avr32_mov_immediate_operand"
++  (and (match_operand 0 "immediate_operand")
++       (match_test "avr32_const_ok_for_move(INTVAL(op))")))
++
++
++(define_predicate "avr32_rmw_address_operand"
++  (ior (and (match_code "symbol_ref") 
++            (match_test "({rtx symbol = avr32_find_symbol(op); \
++                               symbol && (GET_CODE (symbol) == SYMBOL_REF) && SYMBOL_REF_RMW_ADDR(symbol);})"))
++       (and (match_operand 0 "immediate_operand")
++            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks17\")")))
++  {
++     return TARGET_RMW && !flag_pic;
++  }
++)
++ 
++(define_predicate "avr32_rmw_memory_operand"
++  (and (match_code "mem") 
++       (match_test "!volatile_refs_p(op) && (GET_MODE(op) == SImode) && 
++                    avr32_rmw_address_operand(XEXP(op, 0), GET_MODE(XEXP(op, 0)))")))
++
++(define_predicate "avr32_rmw_memory_or_register_operand"
++  (ior (match_operand 0 "avr32_rmw_memory_operand")
++       (match_operand 0 "register_operand")))
++
++(define_predicate "avr32_non_rmw_memory_operand"
++  (and (not (match_operand 0 "avr32_rmw_memory_operand"))
++       (match_operand 0 "memory_operand")))
++
++(define_predicate "avr32_non_rmw_general_operand"
++  (and (not (match_operand 0 "avr32_rmw_memory_operand"))
++       (match_operand 0 "general_operand")))
++
++(define_predicate "avr32_non_rmw_nonimmediate_operand"
++  (and (not (match_operand 0 "avr32_rmw_memory_operand"))
++       (match_operand 0 "nonimmediate_operand")))
++
++;; Return true if the operand is the 1.0f constant.
++
++(define_predicate "const_1f_operand"
++  (match_code "const_int,const_double")
++{
++  return (op == CONST1_RTX (SFmode));
++})
+--- /dev/null
++++ b/gcc/config/avr32/simd.md
+@@ -0,0 +1,145 @@
++;;   AVR32 machine description file for SIMD instructions.
++;;   Copyright 2003-2006 Atmel Corporation.
++;;
++;;   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
++;;
++;;   This file is part of GCC.
++;;
++;;   This program is free software; you can redistribute it and/or modify
++;;   it under the terms of the GNU General Public License as published by
++;;   the Free Software Foundation; either version 2 of the License, or
++;;   (at your option) any later version.
++;;
++;;   This program is distributed in the hope that 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.
++
++;; -*- Mode: Scheme -*-
++
++
++;; Vector modes
++(define_mode_iterator VECM [V2HI V4QI])
++(define_mode_attr  size [(V2HI "h") (V4QI "b")])
++
++(define_insn "add<mode>3"
++  [(set (match_operand:VECM 0 "register_operand" "=r")
++	(plus:VECM (match_operand:VECM 1 "register_operand" "r")
++                   (match_operand:VECM 2 "register_operand" "r")))]
++  "TARGET_SIMD"
++  "padd.<size>\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++
++(define_insn "sub<mode>3"
++  [(set (match_operand:VECM 0 "register_operand" "=r")
++	(minus:VECM (match_operand:VECM 1 "register_operand" "r")
++                    (match_operand:VECM 2 "register_operand" "r")))]
++  "TARGET_SIMD"
++  "psub.<size>\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++
++(define_insn "abs<mode>2"
++  [(set (match_operand:VECM 0 "register_operand" "=r")
++	(abs:VECM (match_operand:VECM 1 "register_operand" "r")))]
++  "TARGET_SIMD"
++  "pabs.s<size>\t%0, %1"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "ashl<mode>3"
++  [(set (match_operand:VECM 0 "register_operand"           "=r")
++	(ashift:VECM (match_operand:VECM 1 "register_operand" "r")
++                     (match_operand:SI 2 "immediate_operand" "Ku04")))]
++  "TARGET_SIMD"
++  "plsl.<size>\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "ashr<mode>3"
++  [(set (match_operand:VECM 0 "register_operand"           "=r")
++	(ashiftrt:VECM (match_operand:VECM 1 "register_operand" "r")
++                       (match_operand:SI 2 "immediate_operand" "Ku04")))]
++  "TARGET_SIMD"
++  "pasr.<size>\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "lshr<mode>3"
++  [(set (match_operand:VECM 0 "register_operand"           "=r")
++	(lshiftrt:VECM (match_operand:VECM 1 "register_operand" "r")
++                       (match_operand:SI 2 "immediate_operand" "Ku04")))]
++  "TARGET_SIMD"
++  "plsr.<size>\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "smaxv2hi3"
++  [(set (match_operand:V2HI 0 "register_operand" "=r")
++	(smax:V2HI (match_operand:V2HI 1 "register_operand" "r")
++                        (match_operand:V2HI 2 "register_operand" "r")))]
++
++  "TARGET_SIMD"
++  "pmax.sh\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "sminv2hi3"
++  [(set (match_operand:V2HI 0 "register_operand" "=r")
++	(smin:V2HI (match_operand:V2HI 1 "register_operand" "r")
++                        (match_operand:V2HI 2 "register_operand" "r")))]
++
++  "TARGET_SIMD"
++  "pmin.sh\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "umaxv4qi3"
++  [(set (match_operand:V4QI 0 "register_operand" "=r")
++	(umax:V4QI (match_operand:V4QI 1 "register_operand" "r")
++                   (match_operand:V4QI 2 "register_operand" "r")))]
++
++  "TARGET_SIMD"
++  "pmax.ub\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "uminv4qi3"
++  [(set (match_operand:V4QI 0 "register_operand" "=r")
++	(umin:V4QI (match_operand:V4QI 1 "register_operand" "r")
++                   (match_operand:V4QI 2 "register_operand" "r")))]
++
++  "TARGET_SIMD"
++  "pmin.ub\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++
++(define_insn "addsubv2hi"
++  [(set (match_operand:V2HI 0 "register_operand" "=r")
++        (vec_concat:V2HI
++         (plus:HI (match_operand:HI 1 "register_operand" "r")
++                  (match_operand:HI 2 "register_operand" "r"))
++         (minus:HI (match_dup 1) (match_dup 2))))]
++  "TARGET_SIMD"
++  "paddsub.h\t%0, %1:b, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
++
++(define_insn "subaddv2hi"
++  [(set (match_operand:V2HI 0 "register_operand" "=r")
++        (vec_concat:V2HI
++         (minus:HI (match_operand:HI 1 "register_operand" "r")
++                  (match_operand:HI 2 "register_operand" "r"))
++         (plus:HI (match_dup 1) (match_dup 2))))]
++  "TARGET_SIMD"
++  "psubadd.h\t%0, %1:b, %2:b"
++  [(set_attr "length" "4")
++   (set_attr "type" "alu")])
+--- /dev/null
++++ b/gcc/config/avr32/sync.md
+@@ -0,0 +1,244 @@
++;;=================================================================
++;; Atomic operations
++;;=================================================================
++
++
++(define_insn "sync_compare_and_swapsi"
++  [(set (match_operand:SI 0 "register_operand" "=&r,&r")
++	(match_operand:SI 1 "memory_operand" "+RKs16,+RKs16"))
++   (set (match_dup 1)
++	(unspec_volatile:SI
++	  [(match_dup 1)
++	   (match_operand:SI 2 "register_immediate_operand" "r,Ks21")
++	   (match_operand:SI 3 "register_operand" "r,r")]
++	  VUNSPEC_SYNC_CMPXCHG))   ]
++  ""
++  "0:
++   ssrf\t5
++   ld.w\t%0,%1
++   cp.w\t%0,%2
++   brne\t0f
++   stcond\t%1, %3
++   brne\t0b
++   0:
++  "
++  [(set_attr "length" "16,18")
++   (set_attr "cc" "clobber")]
++  )
++ 
++
++(define_code_iterator atomic_op [plus minus and ior xor])
++(define_code_attr  atomic_asm_insn [(plus "add") (minus "sub") (and "and") (ior "or") (xor "eor")])
++(define_code_attr  atomic_insn [(plus "add") (minus "sub") (and "and") (ior "ior") (xor "xor")])
++
++(define_insn "sync_loadsi"
++  ; NB! Put an early clobber on the destination operand to 
++  ; avoid gcc using the same register in the source and 
++  ; destination. This is done in order to avoid gcc to 
++  ; clobber the source operand since these instructions
++  ; are actually inside a "loop".
++  [(set (match_operand:SI 0 "register_operand" "=&r")
++	(unspec_volatile:SI
++         [(match_operand:SI 1 "avr32_ks16_memory_operand" "RKs16")
++          (label_ref (match_operand 2 "" ""))]
++         VUNSPEC_SYNC_SET_LOCK_AND_LOAD) )]
++  ""
++  "%2:
++   ssrf\t5
++   ld.w\t%0,%1"
++  [(set_attr "length" "6")
++   (set_attr "cc" "clobber")]
++  )
++  
++(define_insn "sync_store_if_lock"
++  [(set (match_operand:SI 0 "avr32_ks16_memory_operand" "=RKs16")
++        (unspec_volatile:SI
++         [(match_operand:SI 1 "register_operand" "r")
++          (label_ref (match_operand 2 "" ""))]
++         VUNSPEC_SYNC_STORE_IF_LOCK) )]
++  ""
++  "stcond\t%0, %1
++   brne\t%2"
++  [(set_attr "length" "6")
++   (set_attr "cc" "clobber")]
++  )
++
++
++(define_expand "sync_<atomic_insn>si"
++  [(set (match_dup 2)
++	(unspec_volatile:SI
++         [(match_operand:SI 0 "avr32_ks16_memory_operand" "")
++          (match_dup 3)]
++         VUNSPEC_SYNC_SET_LOCK_AND_LOAD))
++   (set (match_dup 2) 
++        (atomic_op:SI (match_dup 2)
++                      (match_operand:SI 1 "register_immediate_operand" "")))
++   (set (match_dup 0)
++        (unspec_volatile:SI
++         [(match_dup 2)
++          (match_dup 3)]
++         VUNSPEC_SYNC_STORE_IF_LOCK) )
++   (use (match_dup 1))
++   (use (match_dup 4))]
++  ""
++  {
++   rtx *mem_expr = &operands[0];
++   rtx ptr_reg;
++   if ( !avr32_ks16_memory_operand (*mem_expr, GET_MODE (*mem_expr)) )
++    {
++      ptr_reg = force_reg (Pmode, XEXP (*mem_expr, 0));
++      XEXP (*mem_expr, 0) = ptr_reg;
++    } 
++   else 
++    {
++      rtx address = XEXP (*mem_expr, 0);
++      if ( REG_P (address) )
++         ptr_reg = address;
++      else if ( REG_P (XEXP (address, 0)) ) 
++         ptr_reg = XEXP (address, 0);
++      else 
++         ptr_reg = XEXP (address, 1);
++    }
++
++   operands[2] = gen_reg_rtx (SImode);
++   operands[3] = gen_rtx_LABEL_REF(Pmode, gen_label_rtx ());
++   operands[4] = ptr_reg;   
++
++  }
++  )
++
++
++
++(define_expand "sync_old_<atomic_insn>si"
++  [(set (match_operand:SI 0 "register_operand" "")
++	(unspec_volatile:SI
++         [(match_operand:SI 1 "avr32_ks16_memory_operand" "")
++          (match_dup 4)]
++         VUNSPEC_SYNC_SET_LOCK_AND_LOAD))
++   (set (match_dup 3) 
++        (atomic_op:SI (match_dup 0)
++                      (match_operand:SI 2 "register_immediate_operand" "")))
++   (set (match_dup 1)
++        (unspec_volatile:SI
++         [(match_dup 3)
++          (match_dup 4)]
++         VUNSPEC_SYNC_STORE_IF_LOCK) )
++   (use (match_dup 2))
++   (use (match_dup 5))]
++  ""
++  {
++   rtx *mem_expr = &operands[1];
++   rtx ptr_reg;
++   if ( !avr32_ks16_memory_operand (*mem_expr, GET_MODE (*mem_expr)) )
++    {
++      ptr_reg = force_reg (Pmode, XEXP (*mem_expr, 0));
++      XEXP (*mem_expr, 0) = ptr_reg;
++    } 
++   else 
++    {
++      rtx address = XEXP (*mem_expr, 0);
++      if ( REG_P (address) )
++         ptr_reg = address;
++      else if ( REG_P (XEXP (address, 0)) ) 
++         ptr_reg = XEXP (address, 0);
++      else 
++         ptr_reg = XEXP (address, 1);
++    }
++
++   operands[3] = gen_reg_rtx (SImode);
++   operands[4] = gen_rtx_LABEL_REF(Pmode, gen_label_rtx ());
++   operands[5] = ptr_reg;
++  }
++  )
++
++(define_expand "sync_new_<atomic_insn>si"
++  [(set (match_operand:SI 0 "register_operand" "")
++	(unspec_volatile:SI
++         [(match_operand:SI 1 "avr32_ks16_memory_operand" "")
++          (match_dup 3)]
++         VUNSPEC_SYNC_SET_LOCK_AND_LOAD))
++   (set (match_dup 0) 
++        (atomic_op:SI (match_dup 0)
++                      (match_operand:SI 2 "register_immediate_operand" "")))
++   (set (match_dup 1)
++        (unspec_volatile:SI
++         [(match_dup 0)
++          (match_dup 3)]
++         VUNSPEC_SYNC_STORE_IF_LOCK) )
++   (use (match_dup 2))
++   (use (match_dup 4))]
++  ""
++  {
++   rtx *mem_expr = &operands[1];
++   rtx ptr_reg;
++   if ( !avr32_ks16_memory_operand (*mem_expr, GET_MODE (*mem_expr)) )
++    {
++      ptr_reg = force_reg (Pmode, XEXP (*mem_expr, 0));
++      XEXP (*mem_expr, 0) = ptr_reg;
++    } 
++   else 
++    {
++      rtx address = XEXP (*mem_expr, 0);
++      if ( REG_P (address) )
++         ptr_reg = address;
++      else if ( REG_P (XEXP (address, 0)) ) 
++         ptr_reg = XEXP (address, 0);
++      else 
++         ptr_reg = XEXP (address, 1);
++    }
++
++   operands[3] = gen_rtx_LABEL_REF(Pmode, gen_label_rtx ());
++   operands[4] = ptr_reg;
++  }
++  )
++
++
++;(define_insn "sync_<atomic_insn>si"
++;  [(set (match_operand:SI 0 "memory_operand" "+RKs16")
++;	(unspec_volatile:SI
++;         [(atomic_op:SI (match_dup 0)
++;                        (match_operand:SI 1 "register_operand" "r"))]
++;         VUNSPEC_SYNC_CMPXCHG))
++;   (clobber (match_scratch:SI 2 "=&r"))]
++;  ""
++;  "0:
++;   ssrf\t5
++;   ld.w\t%2,%0
++;   <atomic_asm_insn>\t%2,%1
++;   stcond\t%0, %2
++;   brne\t0b
++;  "
++;  [(set_attr "length" "14")
++;   (set_attr "cc" "clobber")]
++;  )
++;
++;(define_insn "sync_new_<atomic_insn>si"
++;  [(set (match_operand:SI 1 "memory_operand" "+RKs16")
++;	(unspec_volatile:SI
++;         [(atomic_op:SI (match_dup 1)
++;                        (match_operand:SI 2 "register_operand" "r"))]
++;         VUNSPEC_SYNC_CMPXCHG))
++;   (set (match_operand:SI 0 "register_operand" "=&r")
++;	(atomic_op:SI (match_dup 1)
++;                      (match_dup 2)))]
++;  ""
++;  "0:
++;   ssrf\t5
++;   ld.w\t%0,%1
++;   <atomic_asm_insn>\t%0,%2
++;   stcond\t%1, %0
++;   brne\t0b
++;  "
++;  [(set_attr "length" "14")
++;   (set_attr "cc" "clobber")]
++;  )
++
++(define_insn "sync_lock_test_and_setsi"
++  [ (set (match_operand:SI 0 "register_operand" "=&r")
++         (match_operand:SI 1 "memory_operand" "+RKu00"))
++    (set (match_dup 1)
++         (match_operand:SI 2 "register_operand" "r")) ]
++  ""
++  "xchg\t%0, %p1, %2"
++  [(set_attr "length" "4")]
++  )
+--- /dev/null
++++ b/gcc/config/avr32/t-avr32
+@@ -0,0 +1,118 @@
++
++MD_INCLUDES= 	$(srcdir)/config/avr32/avr32.md \
++		$(srcdir)/config/avr32/sync.md \
++		$(srcdir)/config/avr32/simd.md \
++        $(srcdir)/config/avr32/predicates.md
++
++s-config s-conditions s-flags s-codes s-constants s-emit s-recog s-preds \
++	s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES)
++
++# We want fine grained libraries, so use the new code
++# to build the floating point emulation libraries.
++FPBIT = fp-bit.c
++DPBIT = dp-bit.c
++
++LIB1ASMSRC = avr32/lib1funcs.S
++LIB1ASMFUNCS =  _avr32_f64_mul _avr32_f64_mul_fast _avr32_f64_addsub _avr32_f64_addsub_fast  _avr32_f64_to_u32 \
++                _avr32_f64_to_s32 _avr32_f64_to_u64 _avr32_f64_to_s64 _avr32_u32_to_f64 \
++                _avr32_s32_to_f64 _avr32_f64_cmp_eq _avr32_f64_cmp_ge _avr32_f64_cmp_lt \
++                _avr32_f32_cmp_eq _avr32_f32_cmp_ge _avr32_f32_cmp_lt _avr32_f64_div _avr32_f64_div_fast \
++                _avr32_f32_div _avr32_f32_div_fast _avr32_f32_addsub _avr32_f32_addsub_fast \
++                _avr32_f32_mul _avr32_s32_to_f32 _avr32_u32_to_f32 _avr32_f32_to_s32 \
++                _avr32_f32_to_u32 _avr32_f32_to_f64 _avr32_f64_to_f32 _mulsi3
++
++#LIB2FUNCS_EXTRA += $(srcdir)/config/avr32/lib2funcs.S
++
++MULTILIB_OPTIONS     = march=ap/march=ucr1/march=ucr2/march=ucr2nomul/march=ucr3/march=ucr3fp
++MULTILIB_DIRNAMES    = ap ucr1 ucr2 ucr2nomul ucr3 ucr3fp
++MULTILIB_EXCEPTIONS  =
++MULTILIB_MATCHES     += march?ap=mpart?ap7000
++MULTILIB_MATCHES     += march?ap=mpart?ap7001
++MULTILIB_MATCHES     += march?ap=mpart?ap7002
++MULTILIB_MATCHES     += march?ap=mpart?ap7200
++MULTILIB_MATCHES     += march?ucr1=march?uc
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3a0512es
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0512
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1256
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3a1512es
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1512
++MULTILIB_MATCHES     += march?ucr2nomul=mpart?uc3a3revd
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256s
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b064
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0128
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256es
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512revc
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b164
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1128
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256es
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512revc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64d3
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128d3
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64d4
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128d4
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3c0512crevc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3c1512crevc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3c2512crevc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0256
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0128
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l032
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l016
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064revb
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64l3u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128l3u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc256l3u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64l4u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128l4u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc256l4u
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c064c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0128c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0256c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0512c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c164c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1128c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1256c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1512c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c264c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2128c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2256c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2512c
++MULTILIB_MATCHES     += march?ucr3=mpart?mxt768e
++
++
++EXTRA_MULTILIB_PARTS = crtbegin.o crtbeginS.o crtend.o crtendS.o crti.o crtn.o
++
++CRTSTUFF_T_CFLAGS = -mrelax
++CRTSTUFF_T_CFLAGS_S = -mrelax -fPIC
++TARGET_LIBGCC2_CFLAGS += -mrelax
++
++LIBGCC = stmp-multilib
++INSTALL_LIBGCC = install-multilib
++
++fp-bit.c: $(srcdir)/config/fp-bit.c
++	echo '#define FLOAT' > fp-bit.c
++	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
++
++dp-bit.c: $(srcdir)/config/fp-bit.c
++	cat $(srcdir)/config/fp-bit.c > dp-bit.c
++
++
++
+--- /dev/null
++++ b/gcc/config/avr32/t-avr32-linux
+@@ -0,0 +1,118 @@
++
++MD_INCLUDES= 	$(srcdir)/config/avr32/avr32.md \
++		$(srcdir)/config/avr32/sync.md \
++		$(srcdir)/config/avr32/simd.md \
++		$(srcdir)/config/avr32/predicates.md
++
++s-config s-conditions s-flags s-codes s-constants s-emit s-recog s-preds \
++	s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES)
++
++# We want fine grained libraries, so use the new code
++# to build the floating point emulation libraries.
++FPBIT = fp-bit.c
++DPBIT = dp-bit.c
++
++LIB1ASMSRC = avr32/lib1funcs.S
++LIB1ASMFUNCS =  _avr32_f64_mul _avr32_f64_mul_fast _avr32_f64_addsub _avr32_f64_addsub_fast  _avr32_f64_to_u32 \
++                _avr32_f64_to_s32 _avr32_f64_to_u64 _avr32_f64_to_s64 _avr32_u32_to_f64 \
++                _avr32_s32_to_f64 _avr32_f64_cmp_eq _avr32_f64_cmp_ge _avr32_f64_cmp_lt \
++                _avr32_f32_cmp_eq _avr32_f32_cmp_ge _avr32_f32_cmp_lt _avr32_f64_div _avr32_f64_div_fast \
++                _avr32_f32_div _avr32_f32_div_fast _avr32_f32_addsub _avr32_f32_addsub_fast \
++                _avr32_f32_mul _avr32_s32_to_f32 _avr32_u32_to_f32 _avr32_f32_to_s32 \
++                _avr32_f32_to_u32 _avr32_f32_to_f64 _avr32_f64_to_f32 _mulsi3
++
++#LIB2FUNCS_EXTRA += $(srcdir)/config/avr32/lib2funcs.S
++
++MULTILIB_OPTIONS     = march=ap/march=ucr1/march=ucr2/march=ucr2nomul/march=ucr3/march=ucr3fp
++MULTILIB_DIRNAMES    = ap ucr1 ucr2 ucr2nomul ucr3 ucr3fp
++MULTILIB_EXCEPTIONS  =
++MULTILIB_MATCHES     += march?ap=mpart?ap7000
++MULTILIB_MATCHES     += march?ap=mpart?ap7001
++MULTILIB_MATCHES     += march?ap=mpart?ap7002
++MULTILIB_MATCHES     += march?ap=mpart?ap7200
++MULTILIB_MATCHES     += march?ucr1=march?uc
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3a0512es
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0512
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1256
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3a1512es
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1512
++MULTILIB_MATCHES     += march?ucr2nomul=mpart?uc3a3revd
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128s
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256s
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b064
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0128
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256es
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512revc
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b164
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1128
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256es
++MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512
++MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512revc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64d3
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128d3
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64d4
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128d4
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3c0512crevc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3c1512crevc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3c2512crevc
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0256
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0128
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l032
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l016
++MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064revb
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64l3u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128l3u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc256l3u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc64l4u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc128l4u
++MULTILIB_MATCHES     += march?ucr3=mpart?uc256l4u
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c064c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0128c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0256c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0512c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c164c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1128c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1256c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1512c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c264c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2128c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2256c
++MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2512c
++MULTILIB_MATCHES     += march?ucr3=mpart?mxt768e
++
++
++EXTRA_MULTILIB_PARTS = crtbegin.o crtbeginS.o crtend.o crtendS.o
++
++CRTSTUFF_T_CFLAGS = -mrelax
++CRTSTUFF_T_CFLAGS_S = -mrelax -fPIC
++TARGET_LIBGCC2_CFLAGS += -mrelax
++
++LIBGCC = stmp-multilib
++INSTALL_LIBGCC = install-multilib
++
++fp-bit.c: $(srcdir)/config/fp-bit.c
++	echo '#define FLOAT' > fp-bit.c
++	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
++
++dp-bit.c: $(srcdir)/config/fp-bit.c
++	cat $(srcdir)/config/fp-bit.c > dp-bit.c
++
++
++
+--- /dev/null
++++ b/gcc/config/avr32/t-elf
+@@ -0,0 +1,16 @@
++
++# Assemble startup files.
++$(T)crti.o: $(srcdir)/config/avr32/crti.asm $(GCC_PASSES)
++	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) $(INCLUDES) \
++	-c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/avr32/crti.asm
++
++$(T)crtn.o: $(srcdir)/config/avr32/crtn.asm $(GCC_PASSES)
++	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) $(INCLUDES) \
++	-c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/avr32/crtn.asm
++
++
++# Build the libraries for both hard and soft floating point
++EXTRA_MULTILIB_PARTS = crtbegin.o crtbeginS.o crtend.o crtendS.o crti.o crtn.o
++
++LIBGCC = stmp-multilib
++INSTALL_LIBGCC = install-multilib
+--- /dev/null
++++ b/gcc/config/avr32/uc3fpu.md
+@@ -0,0 +1,199 @@
++;;   AVR32 machine description file for Floating-Point instructions.
++;;   Copyright 2003-2006 Atmel Corporation.
++;;
++;;
++;;   This file is part of GCC.
++;;
++;;   This program is free software; you can redistribute it and/or modify
++;;   it under the terms of the GNU General Public License as published by
++;;   the Free Software Foundation; either version 2 of the License, or
++;;   (at your option) any later version.
++;;
++;;   This program is distributed in the hope that 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.
++
++(define_insn "*movsf_uc3fp"
++  [(set (match_operand:SF 0 "nonimmediate_operand"     "=r,r,r,m")
++	(match_operand:SF 1 "general_operand"          "r,G,m,r"))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "@
++   mov\t%0, %1
++   mov\t%0, %1
++   ld.w\t%0, %1
++   st.w\t%0, %1"
++  [(set_attr "length" "2,4,4,4")
++   (set_attr "type" "alu,alu,load,store")])
++
++(define_insn "mulsf3"
++  [(set (match_operand:SF          0 "register_operand" "=r")
++	(mult:SF (match_operand:SF 1 "register_operand" "r")
++		 (match_operand:SF 2 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fmul.s\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++(define_insn "nmulsf3"
++  [(set (match_operand:SF          0 "register_operand" "=r")
++	(neg:SF (mult:SF (match_operand:SF 1 "register_operand" "%r")
++                         (match_operand:SF 2 "register_operand" "r"))))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fnmul.s\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++(define_insn "macsf3"
++  [(set (match_operand:SF          0 "register_operand" "=r")
++	(plus:SF (mult:SF (match_operand:SF 1 "register_operand" "r")
++                          (match_operand:SF 2 "register_operand" "r"))
++                 (match_operand:SF 3 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fmac.s\t%0, %3, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++;(define_insn "nmacsf3"
++;  [(set (match_operand:SF          0 "register_operand" "=r")
++;	(plus:SF  (neg:SF (match_operand:SF 1 "register_operand" "r"))
++;                            (mult:SF(match_operand:SF 2 "register_operand" "r")
++;                                    (match_operand:SF 3 "register_operand" "r"))))]
++;  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++;  "fnmac.s\t%0, %1, %2, %3"
++;  [(set_attr "length" "4")
++;   (set_attr "type" "fmul")])
++
++(define_insn "nmacsf3"
++  [(set (match_operand:SF          0 "register_operand" "=r")
++	(minus:SF  (mult:SF (match_operand:SF 2 "register_operand" "r")
++                        (match_operand:SF 3 "register_operand" "r"))
++	                    (match_operand:SF 1 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fnmac.s\t%0, %1, %2, %3"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++(define_insn "msubacsf3"
++  [(set (match_operand:SF          0 "register_operand" "=r")
++	(minus:SF (match_operand:SF 3 "register_operand" "r")
++	          (mult:SF (match_operand:SF 1 "register_operand" "r")
++                       (match_operand:SF 2 "register_operand" "r"))))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fmsc.s\t%0, %3, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++(define_insn "nmsubacsf3"
++  [(set (match_operand:SF          0 "register_operand" "=r")
++	(minus:SF  (neg:SF (mult:SF (match_operand:SF 1 "register_operand" "r")
++                                    (match_operand:SF 2 "register_operand" "r")))
++                   (match_operand:SF 3 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fnmsc.s\t%0, %3, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++(define_insn "addsf3"
++  [(set (match_operand:SF 0 "register_operand" "=r")
++	(plus:SF (match_operand:SF 1 "register_operand" "%r")
++                   (match_operand:SF 2 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fadd.s\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++(define_insn "subsf3"
++  [(set (match_operand:SF          0 "register_operand" "=r")
++	(minus:SF (match_operand:SF 1 "register_operand" "r")
++                  (match_operand:SF 2 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fsub.s\t%0, %1, %2"
++  [(set_attr "length" "4")
++   (set_attr "type" "fmul")])
++
++(define_insn "fixuns_truncsfsi2"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(unsigned_fix:SI (match_operand:SF 1 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fcastrs.uw\t%0, %1"
++  [(set_attr "length" "4")])
++
++(define_insn "fix_truncsfsi2"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(fix:SI (match_operand:SF 1 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fcastrs.sw\t%0, %1"
++  [(set_attr "length" "4")])
++
++(define_insn "floatunssisf2"
++  [(set (match_operand:SF 0 "register_operand" "=r")
++        (unsigned_float:SF (match_operand:SI 1 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fcastuw.s\t%0, %1"
++  [(set_attr "length" "4")])
++
++(define_insn "floatsisf2"
++  [(set (match_operand:SF 0 "register_operand" "=r")
++        (float:SF (match_operand:SI 1 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "fcastsw.s\t%0, %1"
++  [(set_attr "length" "4")])
++
++(define_insn "cmpsf_internal_uc3fp"
++  [(set (cc0)
++        (compare:CC
++         (match_operand:SF 0 "register_operand" "r")
++         (match_operand:SF 1 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  {
++        avr32_branch_type = CMP_SF;
++   if (!rtx_equal_p(cc_prev_status.mdep.value, SET_SRC(PATTERN (insn))) )
++      return "fcmp.s\t%0, %1";
++   return "";
++  }
++  [(set_attr "length" "4")
++   (set_attr "cc" "compare")])
++
++(define_expand "divsf3"
++  [(set (match_operand:SF 0 "register_operand" "=r")
++	(div:SF (match_operand:SF 1 "register_operand" "r")
++		 (match_operand:SF 2 "register_operand" "r")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT && flag_unsafe_math_optimizations"
++  "{
++    emit_insn(gen_frcpa_internal(operands[0],operands[2]));
++    emit_insn(gen_mulsf3(operands[0],operands[0],operands[1]));
++    DONE;
++  }"  
++)
++
++(define_insn "frcpa_internal"
++  [(set (match_operand:SF 0 "register_operand" "=r")
++	(unspec:SF [(match_operand:SF 1 "register_operand" "r")] UNSPEC_FRCPA))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "frcpa.s %0,%1"
++  [(set_attr "length" "4")])
++
++(define_expand "sqrtsf2"
++  [(set (match_operand:SF 0 "register_operand" "")
++	(sqrt:SF (match_operand:SF 1 "register_operand" "")))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT && flag_unsafe_math_optimizations"
++  "
++{
++  rtx scratch = gen_reg_rtx (SFmode);
++  emit_insn (gen_rsqrtsf2 (scratch, operands[1], CONST1_RTX (SFmode)));
++  emit_insn (gen_divsf3(operands[0], force_reg (SFmode, CONST1_RTX (SFmode)),
++			 scratch));
++  DONE;
++}")
++
++(define_insn "rsqrtsf2"
++  [(set (match_operand:SF 0 "register_operand" "=r")
++	(div:SF (match_operand:SF 2 "const_1f_operand" "F")
++		(sqrt:SF (match_operand:SF 1 "register_operand" "?r"))))]
++  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
++  "frsqrta.s %1, %0")
+--- /dev/null
++++ b/gcc/config/avr32/uclinux-elf.h
+@@ -0,0 +1,20 @@
++
++/* Run-time Target Specification.  */
++#undef  TARGET_VERSION
++#define TARGET_VERSION  fputs (" (AVR32 uClinux with ELF)", stderr)
++
++/* We don't want a .jcr section on uClinux. As if this makes a difference... */
++#define TARGET_USE_JCR_SECTION 0
++
++/* Here we go. Drop the crtbegin/crtend stuff completely. */
++#undef STARTFILE_SPEC
++#define STARTFILE_SPEC							\
++  "%{!shared: %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s}"			\
++  " %{!p:%{profile:gcrt1.o%s}"						\
++  " %{!profile:crt1.o%s}}}} crti.o%s"
++
++#undef ENDFILE_SPEC
++#define ENDFILE_SPEC "crtn.o%s"
++
++#undef TARGET_DEFAULT
++#define TARGET_DEFAULT (AVR32_FLAG_NO_INIT_GOT)
+--- a/gcc/config/host-linux.c
++++ b/gcc/config/host-linux.c
+@@ -25,6 +25,9 @@
+ #include "hosthooks.h"
+ #include "hosthooks-def.h"
+ 
++#ifndef SSIZE_MAX
++#define SSIZE_MAX LONG_MAX
++#endif
+ 
+ /* Linux has a feature called exec-shield-randomize that perturbs the
+    address of non-fixed mapped segments by a (relatively) small amount.
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -810,6 +810,24 @@ avr-*-rtems*)
+ avr-*-*)
+ 	tm_file="avr/avr.h dbxelf.h"
+ 	;;
++avr32*-*-linux*)
++	tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/avr32.h "
++	tmake_file="t-linux avr32/t-avr32-linux"
++	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
++	extra_modes=avr32/avr32-modes.def
++	gnu_ld=yes
++	;;
++avr32*-*-uclinux*)
++	tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/uclinux-elf.h avr32/avr32.h"
++	tmake_file="t-linux avr32/t-avr32-linux"
++	extra_modes=avr32/avr32-modes.def
++	gnu_ld=yes
++	;;
++avr32-*-*)
++	tm_file="dbxelf.h elfos.h avr32/avr32.h avr32/avr32-elf.h"
++	tmake_file="avr32/t-avr32 avr32/t-elf"
++	extra_modes=avr32/avr32-modes.def
++	;;
+ bfin*-elf*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
+ 	tmake_file=bfin/t-bfin-elf
+@@ -2764,6 +2782,32 @@ case "${target}" in
+ 		fi
+ 		;;
+ 
++	avr32*-*-*)
++		supported_defaults="part arch"
++
++		case "$with_part" in
++		"" \
++		| "ap7000" | "ap7010" | "ap7020" | "uc3a0256" | "uc3a0512" | "uc3a1128" | "uc3a1256" | "uc3a1512" )
++			# OK
++			;;
++		*)
++			echo "Unknown part used in --with-part=$with_part" 1>&2
++			exit 1
++			;;
++		esac
++
++		case "$with_arch" in
++		"" \
++		| "ap" | "uc")
++			# OK
++			;;
++		*)
++			echo "Unknown arch used in --with-arch=$with_arch" 1>&2
++			exit 1
++			;;
++		esac
++                ;;
++
+ 	fr*-*-*linux*)
+ 		supported_defaults=cpu
+ 		case "$with_cpu" in
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -2240,10 +2240,9 @@ L2:],
+   as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
+   if echo "$as_ver" | grep GNU > /dev/null; then
+ changequote(,)dnl
+-    as_vers=`echo $as_ver | sed -n \
+-	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'`
+-    as_major=`expr "$as_vers" : '\([0-9]*\)'`
+-    as_minor=`expr "$as_vers" : '[0-9]*\.\([0-9]*\)'`
++    as_ver=`echo $as_ver | sed -e 's/GNU assembler\( (GNU Binutils)\)\? \([0-9.][0-9.]*\).*/\2/'`
++    as_major=`echo $as_ver | sed 's/\..*//'`
++    as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
+ changequote([,])dnl
+     if test $as_major -eq 2 && test $as_minor -lt 11
+     then :
+@@ -3308,7 +3307,7 @@ case "$target" in
+   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
+   | x86_64*-*-* | hppa*-*-* | arm*-*-* \
+   | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
+-  | spu-*-* | fido*-*-* | m32c-*-*)
++  | spu-*-* | fido*-*-* | m32c-*-* | avr32-*-*)
+     insn="nop"
+     ;;
+   ia64*-*-* | s390*-*-*)
+--- a/gcc/doc/extend.texi
++++ b/gcc/doc/extend.texi
+@@ -2397,7 +2397,7 @@ This attribute is ignored for R8C target
+ 
+ @item interrupt
+ @cindex interrupt handler functions
+-Use this attribute on the ARM, AVR, CRX, M32C, M32R/D, m68k,
++Use this attribute on the ARM, AVR, AVR32, CRX, M32C, M32R/D, m68k,
+ and Xstormy16 ports to indicate that the specified function is an
+ interrupt handler.  The compiler will generate function entry and exit
+ sequences suitable for use in an interrupt handler when this attribute
+@@ -2417,6 +2417,15 @@ void f () __attribute__ ((interrupt ("IR
+ 
+ Permissible values for this parameter are: IRQ, FIQ, SWI, ABORT and UNDEF@.
+ 
++Note, for the AVR32, you can specify which banking scheme is used for
++the interrupt mode this interrupt handler is used in like this:
++
++@smallexample
++void f () __attribute__ ((interrupt ("FULL")));
++@end smallexample
++
++Permissible values for this parameter are: FULL, HALF, NONE and UNDEF.
++
+ On ARMv7-M the interrupt type is ignored, and the attribute means the function
+ may be called with a word aligned stack pointer.
+ 
+@@ -4188,6 +4197,23 @@ placed in either the @code{.bss_below100
+ 
+ @end table
+ 
++@subsection AVR32 Variable Attributes
++
++One attribute is currently defined for AVR32 configurations:
++@code{rmw_addressable}
++
++@table @code
++@item rmw_addressable
++@cindex @code{rmw_addressable} attribute
++
++This attribute can be used to signal that a variable can be accessed 
++with the addressing mode of the AVR32 Atomic Read-Modify-Write memory
++instructions and hence make it possible for gcc to generate these 
++instructions without using built-in functions or inline assembly statements. 
++Variables used within the AVR32 Atomic Read-Modify-Write built-in
++functions will automatically get the @code{rmw_addressable} attribute.
++@end table
++
+ @subsection AVR Variable Attributes
+ 
+ @table @code
+@@ -7042,6 +7068,7 @@ instructions, but allow the compiler to
+ * Alpha Built-in Functions::
+ * ARM iWMMXt Built-in Functions::
+ * ARM NEON Intrinsics::
++* AVR32 Built-in Functions::
+ * Blackfin Built-in Functions::
+ * FR-V Built-in Functions::
+ * X86 Built-in Functions::
+@@ -7284,6 +7311,7 @@ long long __builtin_arm_wxor (long long,
+ long long __builtin_arm_wzero ()
+ @end smallexample
+ 
++
+ @node ARM NEON Intrinsics
+ @subsection ARM NEON Intrinsics
+ 
+@@ -7292,6 +7320,74 @@ when the @option{-mfpu=neon} switch is u
+ 
+ @include arm-neon-intrinsics.texi
+ 
++@node AVR32 Built-in Functions
++@subsection AVR32 Built-in Functions
++
++Built-in functions for atomic memory (RMW) instructions. Note that these
++built-ins will fail for targets where the RMW instructions are not
++implemented. Also note that these instructions only that a Ks15 << 2
++memory address and will therefor not work with any runtime computed 
++memory addresses. The user is responsible for making sure that any
++pointers used within these functions points to a valid memory address.
++ 
++@smallexample
++void __builtin_mems(int */*ptr*/, int /*bit*/)
++void __builtin_memc(int */*ptr*/, int /*bit*/)
++void __builtin_memt(int */*ptr*/, int /*bit*/)
++@end smallexample
++
++Built-in functions for DSP instructions. Note that these built-ins will
++fail for targets where the DSP instructions are not implemented.
++
++@smallexample
++int __builtin_sats (int /*Rd*/,int /*sa*/, int /*bn*/)
++int __builtin_satu (int /*Rd*/,int /*sa*/, int /*bn*/)
++int __builtin_satrnds (int /*Rd*/,int /*sa*/, int /*bn*/)
++int __builtin_satrndu (int /*Rd*/,int /*sa*/, int /*bn*/)
++short __builtin_mulsathh_h (short, short)
++int __builtin_mulsathh_w (short, short)
++short __builtin_mulsatrndhh_h (short, short)
++int __builtin_mulsatrndwh_w (int, short)
++int __builtin_mulsatwh_w (int, short)
++int __builtin_macsathh_w (int, short, short)
++short __builtin_satadd_h (short, short)
++short __builtin_satsub_h (short, short)
++int __builtin_satadd_w (int, int)
++int __builtin_satsub_w (int, int)
++long long __builtin_mulwh_d(int, short)
++long long __builtin_mulnwh_d(int, short)
++long long __builtin_macwh_d(long long, int, short)
++long long __builtin_machh_d(long long, short, short)
++@end smallexample
++
++Other built-in functions for instructions that cannot easily be
++generated by the compiler. 
++
++@smallexample
++void __builtin_ssrf(int);
++void __builtin_csrf(int);
++void __builtin_musfr(int);
++int __builtin_mustr(void);
++int __builtin_mfsr(int /*Status Register Address*/)
++void __builtin_mtsr(int /*Status Register Address*/, int /*Value*/)
++int __builtin_mfdr(int /*Debug Register Address*/)
++void __builtin_mtdr(int /*Debug Register Address*/, int /*Value*/)
++void __builtin_cache(void * /*Address*/, int /*Cache Operation*/)
++void __builtin_sync(int /*Sync Operation*/)
++void __builtin_tlbr(void)
++void __builtin_tlbs(void)
++void __builtin_tlbw(void)
++void __builtin_breakpoint(void)
++int __builtin_xchg(void * /*Address*/, int /*Value*/ )
++short __builtin_bswap_16(short)
++int __builtin_bswap_32(int)
++void __builtin_cop(int/*cpnr*/, int/*crd*/, int/*crx*/, int/*cry*/, int/*op*/)
++int __builtin_mvcr_w(int/*cpnr*/, int/*crs*/)
++void __builtin_mvrc_w(int/*cpnr*/, int/*crd*/, int/*value*/)
++long long __builtin_mvcr_d(int/*cpnr*/, int/*crs*/)
++void __builtin_mvrc_d(int/*cpnr*/, int/*crd*/, long long/*value*/)
++@end smallexample
++
+ @node Blackfin Built-in Functions
+ @subsection Blackfin Built-in Functions
+ 
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -195,7 +195,7 @@ in the following sections.
+ -fvisibility-ms-compat @gol
+ -Wabi  -Wctor-dtor-privacy @gol
+ -Wnon-virtual-dtor  -Wreorder @gol
+--Weffc++  -Wstrict-null-sentinel @gol
++-Weffc++  -Wno-deprecated @gol
+ -Wno-non-template-friend  -Wold-style-cast @gol
+ -Woverloaded-virtual  -Wno-pmf-conversions @gol
+ -Wsign-promo}
+@@ -641,6 +641,12 @@ Objective-C and Objective-C++ Dialects}.
+ -mauto-incdec  -minmax  -mlong-calls  -mshort @gol
+ -msoft-reg-count=@var{count}}
+ 
++@emph{AVR32 Options}
++@gccoptlist{-muse-rodata-section -mhard-float -msoft-float -mrelax @gol
++-mforce-double-align -mno-init-got -mrelax -mmd-reorg-opt -masm-addr-pseudos @gol
++-mpart=@var{part} -mcpu=@var{cpu} -march=@var{arch} @gol  
++-mfast-float -mimm-in-const-pool}
++
+ @emph{MCore Options}
+ @gccoptlist{-mhardlit  -mno-hardlit  -mdiv  -mno-div  -mrelax-immediates @gol
+ -mno-relax-immediates  -mwide-bitfields  -mno-wide-bitfields @gol
+@@ -3256,13 +3262,11 @@ appears in a class without constructors.
+ If you want to warn about code which uses the uninitialized value of the
+ variable in its own initializer, use the @option{-Winit-self} option.
+ 
+-These warnings occur for individual uninitialized or clobbered
+-elements of structure, union or array variables as well as for
+-variables which are uninitialized or clobbered as a whole.  They do
+-not occur for variables or elements declared @code{volatile}.  Because
+-these warnings depend on optimization, the exact variables or elements
+-for which there are warnings will depend on the precise optimization
+-options and version of GCC used.
++These warnings occur only for variables that are candidates for
++register allocation.  Therefore, they do not occur for a variable that
++is declared @code{volatile}, or whose address is taken, or whose size
++is other than 1, 2, 4 or 8 bytes.  Also, they do not occur for
++structures, unions or arrays, even when they are in registers.
+ 
+ Note that there may be no warning about a variable that is used only
+ to compute a value that itself is never used, because such
+@@ -7461,10 +7465,6 @@ If number of candidates in the set is sm
+ we always try to remove unnecessary ivs from the set during its
+ optimization when a new iv is added to the set.
+ 
+-@item scev-max-expr-size
+-Bound on size of expressions used in the scalar evolutions analyzer.
+-Large expressions slow the analyzer.
+-
+ @item omega-max-vars
+ The maximum number of variables in an Omega constraint system.
+ The default value is 128.
+@@ -8860,6 +8860,7 @@ platform.
+ * ARC Options::
+ * ARM Options::
+ * AVR Options::
++* AVR32 Options::
+ * Blackfin Options::
+ * CRIS Options::
+ * CRX Options::
+@@ -9348,6 +9349,145 @@ comply to the C standards, but it will p
+ size.
+ @end table
+ 
++@node AVR32 Options
++@subsection AVR32 Options
++@cindex AVR32 Options
++
++These options are defined for AVR32 implementations:
++
++@table @gcctabopt
++@item -muse-rodata-section
++@opindex muse-rodata-section
++Use section @samp{.rodata} for read-only data instead of @samp{.text}.
++
++@item -mhard-float
++@opindex mhard-float
++Use floating point coprocessor instructions.
++
++@item -msoft-float
++@opindex msoft-float
++Use software floating-point library for floating-point operations.
++
++@item -mforce-double-align
++@opindex mforce-double-align
++Force double-word alignment for double-word memory accesses.
++
++@item -masm-addr-pseudos
++@opindex masm-addr-pseudos
++Use assembler pseudo-instructions lda.w and call for handling direct
++addresses. (Enabled by default)
++
++@item -mno-init-got
++@opindex mno-init-got
++Do not initialize the GOT register before using it when compiling PIC
++code.
++
++@item -mrelax
++@opindex mrelax
++Let invoked assembler and linker do relaxing 
++(Enabled by default when optimization level is >1).
++This means that when the address of symbols are known at link time,
++the linker can optimize @samp{icall} and @samp{mcall}
++instructions into a @samp{rcall} instruction if possible. 
++Loading the address of a symbol can also be optimized.  
++
++@item -mmd-reorg-opt
++@opindex mmd-reorg-opt
++Perform machine dependent optimizations in reorg stage.
++
++@item -mpart=@var{part}
++@opindex mpart
++Generate code for the specified part. Permissible parts are: 
++@samp{ap7000},
++@samp{ap7001},
++@samp{ap7002},
++@samp{ap7200},
++@samp{uc3a0128},
++@samp{uc3a0256},
++@samp{uc3a0512},
++@samp{uc3a0512es},
++@samp{uc3a1128},
++@samp{uc3a1256},
++@samp{uc3a1512},
++@samp{uc3a1512es},
++@samp{uc3a3revd},
++@samp{uc3a364},
++@samp{uc3a364s},
++@samp{uc3a3128},
++@samp{uc3a3128s},
++@samp{uc3a3256},
++@samp{uc3a3256s},
++@samp{uc3a464},
++@samp{uc3a464s},
++@samp{uc3a4128},
++@samp{uc3a4128s},
++@samp{uc3a4256},
++@samp{uc3a4256s},
++@samp{uc3b064},
++@samp{uc3b0128},
++@samp{uc3b0256},
++@samp{uc3b0256es},
++@samp{uc3b0512},
++@samp{uc3b0512revc},
++@samp{uc3b164},
++@samp{uc3b1128},
++@samp{uc3b1256},
++@samp{uc3b1256es},
++@samp{uc3b1512},
++@samp{uc3b1512revc}
++@samp{uc64d3},
++@samp{uc128d3},
++@samp{uc64d4},
++@samp{uc128d4},
++@samp{uc3c0512crevc},
++@samp{uc3c1512crevc},
++@samp{uc3c2512crevc},
++@samp{uc3l0256},
++@samp{uc3l0128},
++@samp{uc3l064},
++@samp{uc3l032},
++@samp{uc3l016},
++@samp{uc3l064revb},
++@samp{uc64l3u},
++@samp{uc128l3u},
++@samp{uc256l3u},
++@samp{uc64l4u},
++@samp{uc128l4u},
++@samp{uc256l4u},
++@samp{uc3c064c},
++@samp{uc3c0128c},
++@samp{uc3c0256c},
++@samp{uc3c0512c},
++@samp{uc3c164c},
++@samp{uc3c1128c},
++@samp{uc3c1256c},
++@samp{uc3c1512c},
++@samp{uc3c264c},
++@samp{uc3c2128c},
++@samp{uc3c2256c},
++@samp{uc3c2512c},
++@samp{mxt768e}.
++
++@item -mcpu=@var{cpu-type}
++@opindex mcpu
++Same as -mpart. Obsolete.
++
++@item -march=@var{arch}
++@opindex march
++Generate code for the specified architecture. Permissible architectures are:
++@samp{ap}, @samp{uc} and @samp{ucr2}. 
++
++@item -mfast-float
++@opindex mfast-float
++Enable fast floating-point library that does not conform to IEEE-754 but is still good enough
++for most applications. The fast floating-point library does not round to the nearest even
++but away from zero. Enabled by default if the -funsafe-math-optimizations switch is specified. 
++
++@item -mimm-in-const-pool
++@opindex mimm-in-const-pool
++Put large immediates in constant pool. This is enabled by default for archs with insn-cache.
++@end table
++
+ @node Blackfin Options
+ @subsection Blackfin Options
+ @cindex Blackfin Options
+@@ -9403,29 +9543,12 @@ When enabled, the compiler will ensure t
+ contain speculative loads after jump instructions. If this option is used,
+ @code{__WORKAROUND_SPECULATIVE_LOADS} is defined.
+ 
+-@item -mno-specld-anomaly
+-@opindex mno-specld-anomaly
+-Don't generate extra code to prevent speculative loads from occurring.
+-
+ @item -mcsync-anomaly
+ @opindex mcsync-anomaly
+ When enabled, the compiler will ensure that the generated code does not
+ contain CSYNC or SSYNC instructions too soon after conditional branches.
+ If this option is used, @code{__WORKAROUND_SPECULATIVE_SYNCS} is defined.
+ 
+-@item -mno-csync-anomaly
+-@opindex mno-csync-anomaly
+-Don't generate extra code to prevent CSYNC or SSYNC instructions from
+-occurring too soon after a conditional branch.
+-
+-@item -mlow-64k
+-@opindex mlow-64k
+-When enabled, the compiler is free to take advantage of the knowledge that
+-the entire program fits into the low 64k of memory.
+-
+-@item -mno-low-64k
+-@opindex mno-low-64k
+-Assume that the program is arbitrarily large.  This is the default.
+ 
+ @item -mstack-check-l1
+ @opindex mstack-check-l1
+@@ -9439,11 +9562,6 @@ This allows for execute in place and sha
+ without virtual memory management.  This option implies @option{-fPIC}.
+ With a @samp{bfin-elf} target, this option implies @option{-msim}.
+ 
+-@item -mno-id-shared-library
+-@opindex mno-id-shared-library
+-Generate code that doesn't assume ID based shared libraries are being used.
+-This is the default.
+-
+ @item -mleaf-id-shared-library
+ @opindex mleaf-id-shared-library
+ Generate code that supports shared libraries via the library ID method,
+@@ -9485,11 +9603,6 @@ call on this register.  This switch is n
+ will lie outside of the 24 bit addressing range of the offset based
+ version of subroutine call instruction.
+ 
+-This feature is not enabled by default.  Specifying
+-@option{-mno-long-calls} will restore the default behavior.  Note these
+-switches have no effect on how the compiler generates code to handle
+-function calls via function pointers.
+-
+ @item -mfast-fp
+ @opindex mfast-fp
+ Link with the fast floating-point library. This library relaxes some of
+--- a/gcc/doc/md.texi
++++ b/gcc/doc/md.texi
+@@ -4,6 +4,7 @@
+ @c This is part of the GCC manual.
+ @c For copying conditions, see the file gcc.texi.
+ 
++
+ @ifset INTERNALS
+ @node Machine Desc
+ @chapter Machine Descriptions
+@@ -1685,6 +1686,58 @@ A memory reference suitable for iWMMXt l
+ A memory reference suitable for the ARMv4 ldrsb instruction.
+ @end table
+ 
++@item AVR32 family---@file{avr32.h}
++@table @code
++@item f
++Floating-point registers (f0 to f15)
++
++@item Ku@var{bits}
++Unsigned constant representable with @var{bits} number of bits (Must be
++two digits). I.e: An unsigned 8-bit constant is written as @samp{Ku08}  
++ 
++@item Ks@var{bits}
++Signed constant representable with @var{bits} number of bits (Must be
++two digits). I.e: A signed 12-bit constant is written as @samp{Ks12}  
++
++@item Is@var{bits}
++The negated range of a signed constant representable with  @var{bits} 
++number of bits. The same as @samp{Ks@var{bits}} with a negated range. 
++This means that the constant must be in the range @math{-2^{bits-1}-1} to @math{2^{bits-1}}
++
++@item G
++A single/double precision floating-point immediate or 64-bit integer 
++immediate where the least and most significant words both can be
++loaded with a move instruction. That is the the integer form of the 
++values in the least and most significant words both are in the range 
++@math{-2^{20}} to @math{2^{20}-1}.
++         
++@item RKs@var{bits}
++A memory reference where the address consists of a base register
++plus a signed immediate displacement with range given by @samp{Ks@var{bits}}
++which has the same format as for the signed immediate integer constraint
++given above.  
++
++@item RKu@var{bits}
++A memory reference where the address consists of a base register
++plus an unsigned immediate displacement with range given by @samp{Ku@var{bits}}
++which has the same format as for the unsigned immediate integer constraint
++given above.  
++
++@item S
++A memory reference with an immediate or register offset
++
++@item T
++A memory reference to a constant pool entry
++
++@item W
++A valid operand for use in the @samp{lda.w} instruction macro when
++relaxing is enabled
++
++@item Z
++A memory reference valid for coprocessor memory instructions
++
++@end table
++
+ @item AVR family---@file{config/avr/constraints.md}
+ @table @code
+ @item l
+--- a/gcc/expmed.c
++++ b/gcc/expmed.c
+@@ -472,9 +472,9 @@ store_bit_field_1 (rtx str_rtx, unsigned
+ 	  ? ((GET_MODE_SIZE (fieldmode) >= UNITS_PER_WORD
+ 	     || GET_MODE_SIZE (GET_MODE (op0)) == GET_MODE_SIZE (fieldmode))
+ 	     && byte_offset % GET_MODE_SIZE (fieldmode) == 0)
+-	  : (! SLOW_UNALIGNED_ACCESS (fieldmode, MEM_ALIGN (op0))
++          : ( (! SLOW_UNALIGNED_ACCESS (fieldmode, MEM_ALIGN (op0))
+ 	     || (offset * BITS_PER_UNIT % bitsize == 0
+-		 && MEM_ALIGN (op0) % GET_MODE_BITSIZE (fieldmode) == 0))))
++                     && MEM_ALIGN (op0) % GET_MODE_BITSIZE (fieldmode) == 0)))))
+     {
+       if (MEM_P (op0))
+ 	op0 = adjust_address (op0, fieldmode, offset);
+--- a/gcc/expr.c
++++ b/gcc/expr.c
+@@ -52,6 +52,7 @@ along with GCC; see the file COPYING3.
+ #include "tree-flow.h"
+ #include "target.h"
+ #include "timevar.h"
++#include "c-common.h"
+ #include "df.h"
+ #include "diagnostic.h"
+ 
+@@ -3647,16 +3648,17 @@ emit_single_push_insn (enum machine_mode
+     }
+   else
+     {
++      emit_move_insn (stack_pointer_rtx,
++		      expand_binop (Pmode,
+ #ifdef STACK_GROWS_DOWNWARD
+-      /* ??? This seems wrong if STACK_PUSH_CODE == POST_DEC.  */
+-      dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+-				GEN_INT (-(HOST_WIDE_INT) rounded_size));
++				    sub_optab,
+ #else
+-      /* ??? This seems wrong if STACK_PUSH_CODE == POST_INC.  */
+-      dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+-				GEN_INT (rounded_size));
++				    add_optab,
+ #endif
+-      dest_addr = gen_rtx_PRE_MODIFY (Pmode, stack_pointer_rtx, dest_addr);
++				    stack_pointer_rtx,
++				    GEN_INT (rounded_size),
++				    NULL_RTX, 0, OPTAB_LIB_WIDEN));
++      dest_addr = stack_pointer_rtx;
+     }
+ 
+   dest = gen_rtx_MEM (mode, dest_addr);
+@@ -5775,7 +5777,8 @@ store_field (rtx target, HOST_WIDE_INT b
+      is a bit field, we cannot use addressing to access it.
+      Use bit-field techniques or SUBREG to store in it.  */
+ 
+-  if (mode == VOIDmode
++  if (
++      mode == VOIDmode
+       || (mode != BLKmode && ! direct_store[(int) mode]
+ 	  && GET_MODE_CLASS (mode) != MODE_COMPLEX_INT
+ 	  && GET_MODE_CLASS (mode) != MODE_COMPLEX_FLOAT)
+@@ -5932,7 +5935,18 @@ get_inner_reference (tree exp, HOST_WIDE
+     {
+       tree field = TREE_OPERAND (exp, 1);
+       size_tree = DECL_SIZE (field);
+-      if (!DECL_BIT_FIELD (field))
++      if (!DECL_BIT_FIELD (field)
++          /* Added for AVR32:
++             Bitfields with a size equal to a target storage
++             type might not cause DECL_BIT_FIELD to return
++             true since it can be optimized into a normal array
++             access operation. But for volatile bitfields we do
++             not allow this when targetm.narrow_volatile_bitfield ()
++             is false. We can use DECL_C_BIT_FIELD to check if this
++             really is a c-bitfield. */ 
++          && !(TREE_THIS_VOLATILE (exp)
++               && !targetm.narrow_volatile_bitfield ()
++               && DECL_C_BIT_FIELD (field)) )
+ 	mode = DECL_MODE (field);
+       else if (DECL_MODE (field) == BLKmode)
+ 	blkmode_bitfield = true;
+@@ -7915,7 +7929,8 @@ expand_expr_real_1 (tree exp, rtx target
+ 	   by doing the extract into an object as wide as the field
+ 	   (which we know to be the width of a basic mode), then
+ 	   storing into memory, and changing the mode to BLKmode.  */
+-	if (mode1 == VOIDmode
++       if (      
++            mode1 == VOIDmode
+ 	    || REG_P (op0) || GET_CODE (op0) == SUBREG
+ 	    || (mode1 != BLKmode && ! direct_load[(int) mode1]
+ 		&& GET_MODE_CLASS (mode) != MODE_COMPLEX_INT
+--- a/gcc/function.c
++++ b/gcc/function.c
+@@ -2810,7 +2810,11 @@ assign_parm_setup_reg (struct assign_par
+   assign_parm_remove_parallels (data);
+ 
+   /* Copy the value into the register.  */
+-  if (data->nominal_mode != data->passed_mode
++  if ( (data->nominal_mode != data->passed_mode
++        /* Added for AVR32: If passed_mode is equal
++           to promoted nominal mode why should be convert?
++           The conversion should make no difference. */
++        && data->passed_mode != promoted_nominal_mode)
+       || promoted_nominal_mode != data->promoted_mode)
+     {
+       int save_tree_used;
+--- a/gcc/genemit.c
++++ b/gcc/genemit.c
+@@ -121,6 +121,24 @@ max_operand_vec (rtx insn, int arg)
+ }
+ 
+ static void
++gen_vararg_prologue(int operands)
++{
++  int i;
++
++  if (operands > 1)
++    {
++      for (i = 1; i < operands; i++)
++	printf("  rtx operand%d ATTRIBUTE_UNUSED;\n", i);
++
++      printf("  va_list args;\n\n");
++      printf("  va_start(args, operand0);\n");
++      for (i = 1; i < operands; i++)
++	printf("  operand%d = va_arg(args, rtx);\n", i);
++      printf("  va_end(args);\n\n");
++    }
++}
++
++static void
+ print_code (RTX_CODE code)
+ {
+   const char *p1;
+@@ -406,18 +424,16 @@ gen_insn (rtx insn, int lineno)
+     fatal ("match_dup operand number has no match_operand");
+ 
+   /* Output the function name and argument declarations.  */
+-  printf ("rtx\ngen_%s (", XSTR (insn, 0));
++  printf ("rtx\ngen_%s ", XSTR (insn, 0));
++
+   if (operands)
+-    for (i = 0; i < operands; i++)
+-      if (i)
+-	printf (",\n\trtx operand%d ATTRIBUTE_UNUSED", i);
++    printf("(rtx operand0 ATTRIBUTE_UNUSED, ...)\n");
+       else
+-	printf ("rtx operand%d ATTRIBUTE_UNUSED", i);
+-  else
+-    printf ("void");
+-  printf (")\n");
++    printf("(void)\n");
+   printf ("{\n");
+ 
++  gen_vararg_prologue(operands);
++
+   /* Output code to construct and return the rtl for the instruction body.  */
+ 
+   if (XVECLEN (insn, 1) == 1)
+@@ -461,16 +477,12 @@ gen_expand (rtx expand)
+   operands = max_operand_vec (expand, 1);
+ 
+   /* Output the function name and argument declarations.  */
+-  printf ("rtx\ngen_%s (", XSTR (expand, 0));
++  printf ("rtx\ngen_%s ", XSTR (expand, 0));
+   if (operands)
+-    for (i = 0; i < operands; i++)
+-      if (i)
+-	printf (",\n\trtx operand%d", i);
+-      else
+-	printf ("rtx operand%d", i);
++    printf("(rtx operand0 ATTRIBUTE_UNUSED, ...)\n");
+   else
+-    printf ("void");
+-  printf (")\n");
++    printf("(void)\n");
++
+   printf ("{\n");
+ 
+   /* If we don't have any C code to write, only one insn is being written,
+@@ -480,6 +492,8 @@ gen_expand (rtx expand)
+       && operands > max_dup_opno
+       && XVECLEN (expand, 1) == 1)
+     {
++      gen_vararg_prologue(operands);
++
+       printf ("  return ");
+       gen_exp (XVECEXP (expand, 1, 0), DEFINE_EXPAND, NULL);
+       printf (";\n}\n\n");
+@@ -493,6 +507,7 @@ gen_expand (rtx expand)
+   for (; i <= max_scratch_opno; i++)
+     printf ("  rtx operand%d ATTRIBUTE_UNUSED;\n", i);
+   printf ("  rtx _val = 0;\n");
++  gen_vararg_prologue(operands);
+   printf ("  start_sequence ();\n");
+ 
+   /* The fourth operand of DEFINE_EXPAND is some code to be executed
+--- a/gcc/genflags.c
++++ b/gcc/genflags.c
+@@ -127,7 +127,6 @@ static void
+ gen_proto (rtx insn)
+ {
+   int num = num_operands (insn);
+-  int i;
+   const char *name = XSTR (insn, 0);
+   int truth = maybe_eval_c_test (XSTR (insn, 2));
+ 
+@@ -158,12 +157,7 @@ gen_proto (rtx insn)
+   if (num == 0)
+     fputs ("void", stdout);
+   else
+-    {
+-      for (i = 1; i < num; i++)
+-	fputs ("rtx, ", stdout);
+-
+-      fputs ("rtx", stdout);
+-    }
++    fputs("rtx, ...", stdout);
+ 
+   puts (");");
+ 
+@@ -173,12 +167,7 @@ gen_proto (rtx insn)
+     {
+       printf ("static inline rtx\ngen_%s", name);
+       if (num > 0)
+-	{
+-	  putchar ('(');
+-	  for (i = 0; i < num-1; i++)
+-	    printf ("rtx ARG_UNUSED (%c), ", 'a' + i);
+-	  printf ("rtx ARG_UNUSED (%c))\n", 'a' + i);
+-	}
++	puts("(rtx ARG_UNUSED(a), ...)");
+       else
+ 	puts ("(void)");
+       puts ("{\n  return 0;\n}");
+--- a/gcc/genoutput.c
++++ b/gcc/genoutput.c
+@@ -386,7 +386,7 @@ output_insn_data (void)
+ 	}
+ 
+       if (d->name && d->name[0] != '*')
+-	printf ("    (insn_gen_fn) gen_%s,\n", d->name);
++	printf ("    gen_%s,\n", d->name);
+       else
+ 	printf ("    0,\n");
+ 
+--- a/gcc/ifcvt.c
++++ b/gcc/ifcvt.c
+@@ -84,7 +84,7 @@ static int num_possible_if_blocks;
+ static int num_updated_if_blocks;
+ 
+ /* # of changes made.  */
+-static int num_true_changes;
++int num_true_changes;
+ 
+ /* Whether conditional execution changes were made.  */
+ static int cond_exec_changed_p;
+@@ -290,6 +290,9 @@ cond_exec_process_insns (ce_if_block_t *
+       if (must_be_last)
+ 	return FALSE;
+ 
++#ifdef IFCVT_ALLOW_MODIFY_TEST_IN_INSN       
++      if ( !IFCVT_ALLOW_MODIFY_TEST_IN_INSN )
++#endif
+       if (modified_in_p (test, insn))
+ 	{
+ 	  if (!mod_ok)
+@@ -570,15 +573,18 @@ cond_exec_process_if_block (ce_if_block_
+   IFCVT_MODIFY_FINAL (ce_info);
+ #endif
+ 
++  /* Merge the blocks!  */
++  if ( reload_completed ){
+   /* Conversion succeeded.  */
+   if (dump_file)
+     fprintf (dump_file, "%d insn%s converted to conditional execution.\n",
+ 	     n_insns, (n_insns == 1) ? " was" : "s were");
+ 
+-  /* Merge the blocks!  */
+   merge_if_block (ce_info);
+   cond_exec_changed_p = TRUE;
+   return TRUE;
++  }
++  return FALSE;
+ 
+  fail:
+ #ifdef IFCVT_MODIFY_CANCEL
+@@ -1087,7 +1093,11 @@ noce_try_addcc (struct noce_if_info *if_
+ 	  != UNKNOWN))
+     {
+       rtx cond = if_info->cond;
+-      enum rtx_code code = reversed_comparison_code (cond, if_info->jump);
++      /* This generates wrong code for AVR32. The cond code need not be reversed
++         since the addmodecc patterns add if the condition is NOT met. */
++      /*   enum rtx_code code = reversed_comparison_code (cond, if_info->jump);*/
++      enum rtx_code code = GET_CODE(cond);
++
+ 
+       /* First try to use addcc pattern.  */
+       if (general_operand (XEXP (cond, 0), VOIDmode)
+@@ -3039,7 +3049,12 @@ find_if_header (basic_block test_bb, int
+       && noce_find_if_block (test_bb, then_edge, else_edge, pass))
+     goto success;
+ 
+-  if (HAVE_conditional_execution && reload_completed
++  if (HAVE_conditional_execution && 
++#ifdef IFCVT_COND_EXEC_BEFORE_RELOAD
++      (reload_completed || IFCVT_COND_EXEC_BEFORE_RELOAD)
++#else
++      reload_completed
++#endif
+       && cond_exec_find_if_block (&ce_info))
+     goto success;
+ 
+@@ -3154,7 +3169,11 @@ cond_exec_find_if_block (struct ce_if_bl
+ 
+   /* We only ever should get here after reload,
+      and only if we have conditional execution.  */
++#ifdef IFCVT_COND_EXEC_BEFORE_RELOAD
++  gcc_assert (HAVE_conditional_execution && (reload_completed||IFCVT_COND_EXEC_BEFORE_RELOAD));
++#else
+   gcc_assert (HAVE_conditional_execution && reload_completed);
++#endif
+ 
+   /* Discover if any fall through predecessors of the current test basic block
+      were && tests (which jump to the else block) or || tests (which jump to
+@@ -4259,6 +4278,14 @@ gate_handle_if_after_reload (void)
+ static unsigned int
+ rest_of_handle_if_after_reload (void)
+ {
++  /* Hack for the AVR32 experimental ifcvt processing before reload.
++     The AVR32 specific ifcvt code needs to know when ifcvt after reload 
++     has begun. */
++#ifdef IFCVT_COND_EXEC_BEFORE_RELOAD
++  if ( IFCVT_COND_EXEC_BEFORE_RELOAD )
++    cfun->machine->ifcvt_after_reload = 1;
++#endif
++  
+   if_convert ();
+   return 0;
+ }
+--- a/gcc/longlong.h
++++ b/gcc/longlong.h
+@@ -250,6 +250,41 @@ UDItype __umulsidi3 (USItype, USItype);
+ #define COUNT_LEADING_ZEROS_0 32
+ #endif
+ 
++#if defined (__avr32__) && W_TYPE_SIZE == 32
++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
++  __asm__ ("add\t%1, %4, %5\n\tadc\t%0, %2, %3"		\
++	   : "=r" ((USItype) (sh)),					\
++	     "=&r" ((USItype) (sl))					\
++	   : "r" ((USItype) (ah)),					\
++	     "r" ((USItype) (bh)),					\
++	     "r" ((USItype) (al)),					\
++	     "r" ((USItype) (bl)) __CLOBBER_CC)
++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
++  __asm__ ("sub\t%1, %4, %5\n\tsbc\t%0, %2, %3"		\
++	   : "=r" ((USItype) (sh)),					\
++	     "=&r" ((USItype) (sl))					\
++	   : "r" ((USItype) (ah)),					\
++	     "r" ((USItype) (bh)),					\
++	     "r" ((USItype) (al)),					\
++	     "r" ((USItype) (bl)) __CLOBBER_CC)
++
++#if !defined (__AVR32_NO_MUL__)
++#define __umulsidi3(a,b) ((UDItype)(a) * (UDItype)(b))
++
++#define umul_ppmm(w1, w0, u, v) \
++{									\
++  DWunion __w;								\
++  __w.ll = __umulsidi3 (u, v);						\
++  w1 = __w.s.high;							\
++  w0 = __w.s.low;							\
++}
++#endif
++
++#define count_leading_zeros(COUNT,X)	((COUNT) = __builtin_clz (X))
++#define count_trailing_zeros(COUNT,X)	((COUNT) = __builtin_ctz (X))
++#define COUNT_LEADING_ZEROS_0 32
++#endif
++
+ #if defined (__CRIS__) && __CRIS_arch_version >= 3
+ #define count_leading_zeros(COUNT, X) ((COUNT) = __builtin_clz (X))
+ #if __CRIS_arch_version >= 8
+--- a/gcc/optabs.h
++++ b/gcc/optabs.h
+@@ -603,7 +603,7 @@ extern enum insn_code reload_out_optab[N
+ extern optab code_to_optab[NUM_RTX_CODE + 1];
+ 
+ 
+-typedef rtx (*rtxfun) (rtx);
++typedef rtx (*rtxfun) (rtx, ...);
+ 
+ /* Indexed by the rtx-code for a conditional (e.g. EQ, LT,...)
+    gives the gen_function to make a branch to test that condition.  */
+--- a/gcc/regrename.c
++++ b/gcc/regrename.c
+@@ -1582,6 +1582,9 @@ copyprop_hardreg_forward_1 (basic_block
+   bool changed = false;
+   rtx insn;
+ 
++  rtx prev_pred_test;
++  int prev_pred_insn_skipped = 0;
++
+   for (insn = BB_HEAD (bb); ; insn = NEXT_INSN (insn))
+     {
+       int n_ops, i, alt, predicated;
+@@ -1621,6 +1624,58 @@ copyprop_hardreg_forward_1 (basic_block
+ 	    recog_data.operand_type[i] = OP_INOUT;
+ 	}
+ 
++
++      /* Added for targets (AVR32) which supports test operands to be modified
++         in cond_exec instruction. For these targets we cannot make a change to
++         the test operands if one of the test operands is an output operand This beacuse
++         changing the test operands might cause the need for inserting a new test
++         insns in the middle of a sequence of cond_exec insns and if the test operands
++         are modified these tests will fail.
++      */
++      if ( IFCVT_ALLOW_MODIFY_TEST_IN_INSN
++           && predicated )
++        { 
++          int insn_skipped = 0;
++          rtx test = COND_EXEC_TEST (PATTERN (insn));
++
++          /* Check if the previous insn was a skipped predicated insn with the same
++             test as this predicated insns. If so we cannot do any modification to
++             this insn either since we cannot emit the test insn because the operands
++             are clobbered. */
++          if ( prev_pred_insn_skipped 
++               && (rtx_equal_p (test, prev_pred_test) 
++                   || rtx_equal_p (test, reversed_condition (prev_pred_test))) )
++            { 
++              insn_skipped = 1;
++            }
++          else
++            {
++              /* Check if the output operand is used in the test expression. */
++              for (i = 0; i < n_ops; ++i)
++                if ( recog_data.operand_type[i] == OP_INOUT 
++                     && reg_mentioned_p (recog_data.operand[i], test) )
++                  {
++                    insn_skipped = 1;
++                    break;
++                  }
++              
++            }
++          
++          prev_pred_test = test;
++          prev_pred_insn_skipped = insn_skipped;
++          if ( insn_skipped )
++            {
++              if (insn == BB_END (bb))
++                break;
++              else
++                continue;
++            }
++        } 
++      else 
++        {
++          prev_pred_insn_skipped = 0;
++        }
++      
+       /* For each earlyclobber operand, zap the value data.  */
+       for (i = 0; i < n_ops; i++)
+ 	if (recog_op_alt[i][alt].earlyclobber)
+--- a/gcc/sched-deps.c
++++ b/gcc/sched-deps.c
+@@ -1473,7 +1473,14 @@ fixup_sched_groups (rtx insn)
+ 
+   prev_nonnote = prev_nonnote_insn (insn);
+   if (BLOCK_FOR_INSN (insn) == BLOCK_FOR_INSN (prev_nonnote)
+-      && ! sched_insns_conditions_mutex_p (insn, prev_nonnote))
++      /* Modification for AVR32 by RP: Why is this here, this will
++         cause instruction to be without any dependencies which might
++         cause it to be moved anywhere. For the AVR32 we try to keep
++         a group of conditionals together even if they are mutual exclusive.
++      */
++      && (! sched_insns_conditions_mutex_p (insn, prev_nonnote)
++          || GET_CODE (PATTERN (insn)) == COND_EXEC )
++      )
+     add_dependence (insn, prev_nonnote, REG_DEP_ANTI);
+ }
+ 
+@@ -2230,8 +2237,29 @@ sched_analyze_insn (struct deps *deps, r
+ 
+   if (code == COND_EXEC)
+     {
++#ifdef IFCVT_ALLOW_MODIFY_TEST_IN_INSN
++      if (IFCVT_ALLOW_MODIFY_TEST_IN_INSN)
++        {
++          /* Check if we have a group og conditional instructions with the same test. 
++             If so we must make sure that they are not scheduled apart in order to
++             avoid unnecesarry tests and if one of the registers in the test is modified
++             in the instruction this is needed to ensure correct code. */
++          if ( prev_nonnote_insn (insn)
++               && INSN_P (prev_nonnote_insn (insn))
++               && GET_CODE (PATTERN (prev_nonnote_insn (insn))) == COND_EXEC 
++               && rtx_equal_p (XEXP(COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn))), 0), XEXP (COND_EXEC_TEST (x), 0))
++               && rtx_equal_p (XEXP(COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn))), 1), XEXP (COND_EXEC_TEST (x), 1))
++               && ( GET_CODE (COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn)))) == GET_CODE (COND_EXEC_TEST (x))
++                    || GET_CODE (COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn)))) == reversed_comparison_code (COND_EXEC_TEST (x), insn)))
++            {
++              SCHED_GROUP_P (insn) = 1;
++              //CANT_MOVE (prev_nonnote_insn (insn)) = 1;
++            }
++        }
++#endif      
+       sched_analyze_2 (deps, COND_EXEC_TEST (x), insn);
+ 
++
+       /* ??? Should be recording conditions so we reduce the number of
+ 	 false dependencies.  */
+       x = COND_EXEC_CODE (x);
+--- a/gcc/testsuite/gcc.dg/sibcall-3.c
++++ b/gcc/testsuite/gcc.dg/sibcall-3.c
+@@ -5,7 +5,7 @@
+    Copyright (C) 2002 Free Software Foundation Inc.
+    Contributed by Hans-Peter Nilsson  <hp@bitrange.com>  */
+ 
+-/* { dg-do run { xfail { { arc-*-* avr-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
++/* { dg-do run { xfail { { arc-*-* avr-*-* avr32-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
+ /* -mlongcall disables sibcall patterns.  */
+ /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */
+ /* { dg-options "-O2 -foptimize-sibling-calls" } */
+--- a/gcc/testsuite/gcc.dg/sibcall-4.c
++++ b/gcc/testsuite/gcc.dg/sibcall-4.c
+@@ -5,7 +5,7 @@
+    Copyright (C) 2002 Free Software Foundation Inc.
+    Contributed by Hans-Peter Nilsson  <hp@bitrange.com>  */
+ 
+-/* { dg-do run { xfail { { arc-*-* avr-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
++/* { dg-do run { xfail { { arc-*-* avr-*-* avr32-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
+ /* -mlongcall disables sibcall patterns.  */
+ /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */
+ /* { dg-options "-O2 -foptimize-sibling-calls" } */
+--- a/gcc/testsuite/gcc.dg/trampoline-1.c
++++ b/gcc/testsuite/gcc.dg/trampoline-1.c
+@@ -47,6 +47,8 @@ void foo (void)
+ 
+ int main (void)
+ {
++#ifndef NO_TRAMPOLINES
+   foo ();
++#endif
+   return 0;
+ }
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -218,6 +218,13 @@ arm*-wince-pe*)
+ 	;;
+ arm-*-pe*)
+ 	;;
++avr32-*-linux*)
++	# No need to build crtbeginT.o on uClibc systems. Should probably be
++	# moved to the OS specific section above.
++	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
++	;;
++avr32-*-*)
++	;;
+ avr-*-rtems*)
+ 	;;
+ avr-*-*)
+--- a/libstdc++-v3/config/os/gnu-linux/ctype_base.h
++++ b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
+@@ -26,6 +26,8 @@
+ //
+ // ISO C++ 14882: 22.1  Locales
+ //
++#include <features.h>
++#include <ctype.h>
+   
+ /** @file ctype_base.h
+  *  This is an internal header file, included by other library headers.
+@@ -40,7 +42,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
+   struct ctype_base
+   {
+     // Non-standard typedefs.
++#ifdef __UCLIBC__
++    typedef const __ctype_touplow_t*   __to_type;
++#else
+     typedef const int* 		__to_type;
++#endif
+ 
+     // NB: Offsets into ctype<char>::_M_table force a particular size
+     // on the mask type. Because of this, we don't use an enum.
+--- a/libstdc++-v3/include/Makefile.in
++++ b/libstdc++-v3/include/Makefile.in
+@@ -36,6 +36,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++LIBOBJDIR =
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/fragment.am
+ subdir = include
+--- a/libstdc++-v3/libsupc++/Makefile.in
++++ b/libstdc++-v3/libsupc++/Makefile.in
+@@ -38,6 +38,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++LIBOBJDIR =
+ DIST_COMMON = $(glibcxxinstall_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(top_srcdir)/fragment.am
+ subdir = libsupc++
+--- a/libstdc++-v3/Makefile.in
++++ b/libstdc++-v3/Makefile.in
+@@ -36,6 +36,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++LIBOBJDIR =
+ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/../config.guess \
+ 	$(srcdir)/../config.sub README ChangeLog $(srcdir)/Makefile.in \
+ 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+--- a/libstdc++-v3/po/Makefile.in
++++ b/libstdc++-v3/po/Makefile.in
+@@ -36,6 +36,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++LIBOBJDIR =
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/fragment.am
+ subdir = po
+--- a/libstdc++-v3/src/Makefile.in
++++ b/libstdc++-v3/src/Makefile.in
+@@ -37,6 +37,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++LIBOBJDIR =
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/fragment.am
+ subdir = src
diff --git a/trunk/toolchain/gcc/patches/4.4.7/931-avr32_disable_shifted_data_opt.patch b/trunk/toolchain/gcc/patches/4.4.7/931-avr32_disable_shifted_data_opt.patch
new file mode 100644
index 00000000..2003e97a
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/931-avr32_disable_shifted_data_opt.patch
@@ -0,0 +1,32 @@
+--- a/gcc/config/avr32/avr32.c
++++ b/gcc/config/avr32/avr32.c
+@@ -6726,7 +6726,28 @@ avr32_reorg_optimization (void)
+ 	}
+     }
+ 
+-  if (TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
++  /* Disabled this optimization since it has a bug */
++  /* In the case where the data instruction the shifted insn gets folded
++   * into is a branch destination, this breaks, i.e.
++   *
++   *    add r8, r10, r8 << 2
++   * 1:
++   *    ld.w r11, r8[0]
++   *    ...
++   *    mov r8, sp
++   *    rjmp 1b
++   *
++   * gets folded to:
++   *
++   * 1:
++   *    ld.w r11, r10[r8 << 2]
++   *    ...
++   *    mov r8, sp
++   *    rjmp 1b
++   *
++   * which is clearly wrong..
++   */
++  if (0 && TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
+     {
+ 
+       /* Scan through all insns looking for shifted add operations */
diff --git a/trunk/toolchain/gcc/patches/4.4.7/933-avr32_bug_7435.patch b/trunk/toolchain/gcc/patches/4.4.7/933-avr32_bug_7435.patch
new file mode 100644
index 00000000..78106619
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/933-avr32_bug_7435.patch
@@ -0,0 +1,32 @@
+--- a/gcc/config/avr32/avr32.c
++++ b/gcc/config/avr32/avr32.c
+@@ -243,14 +243,14 @@ void
+ avr32_override_options (void)
+ {
+   const struct part_type_s *part;
+-  const struct arch_type_s *arch;
++  const struct arch_type_s *arch, *part_arch;
+ 
+   /*Add backward compability*/
+   if (strcmp ("uc", avr32_arch_name)== 0)
+     {
+       fprintf (stderr, "Warning: Deprecated arch `%s' specified. "
+                        "Please use '-march=ucr1' instead. "
+-                       "Converting to arch 'ucr1'\n",
++                       "Using arch 'ucr1'\n",
+                avr32_arch_name);
+       avr32_arch_name="ucr1";
+     }
+@@ -298,6 +298,12 @@ avr32_override_options (void)
+   if (!arch->name)
+     avr32_arch = &avr32_arch_types[avr32_part->arch_type];
+ 
++   /* When architecture implied by -mpart and one passed in -march are 
++    * conflicting, issue an error message */
++   part_arch = &avr32_arch_types[avr32_part->arch_type];
++   if (strcmp("none",avr32_part_name) && strcmp("none", avr32_arch_name) && strcmp(avr32_arch_name,part_arch->name))
++     error ("Conflicting architectures implied by -mpart and -march\n");
++
+   /* If optimization level is two or greater, then align start of loops to a
+      word boundary since this will allow folding the first insn of the loop.
+      Do this only for targets supporting branch prediction. */
diff --git a/trunk/toolchain/gcc/patches/4.4.7/934-avr32_bug_9675.patch b/trunk/toolchain/gcc/patches/4.4.7/934-avr32_bug_9675.patch
new file mode 100644
index 00000000..3690e2d0
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/934-avr32_bug_9675.patch
@@ -0,0 +1,21 @@
+--- a/gcc/config/avr32/lib1funcs.S
++++ b/gcc/config/avr32/lib1funcs.S
+@@ -1460,7 +1460,6 @@ __avr32_f64_cmp_lt:
+ 0:      
+         ld.w    r7, sp++
+         popm    pc, r12=0
+-#endif
+  
+ 3:
+         cp.w    r7, 1          /* Check sign bit from r9 */
+@@ -1481,8 +1480,8 @@ __avr32_f64_cmp_lt:
+ 	reteq	0		       /* Both operands are zero. Return false. */
+ #endif
+ 	ret	r12
+-				        
+- 
++#endif
++			        
+ #if defined(L_avr32_f64_div) || defined(L_avr32_f64_div_fast)
+         .align  2
+ 
diff --git a/trunk/toolchain/gcc/patches/4.4.7/993-arm_insn-opinit-RTX_CODE-fixup.patch b/trunk/toolchain/gcc/patches/4.4.7/993-arm_insn-opinit-RTX_CODE-fixup.patch
new file mode 100644
index 00000000..b769f932
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/993-arm_insn-opinit-RTX_CODE-fixup.patch
@@ -0,0 +1,14 @@
+--- a/gcc/config/arm/arm-protos.h
++++ b/gcc/config/arm/arm-protos.h
+@@ -43,10 +43,10 @@ extern unsigned int arm_dbx_register_num
+ extern void arm_output_fn_unwind (FILE *, bool);
+   
+ 
+-#ifdef RTX_CODE
+ extern bool arm_vector_mode_supported_p (enum machine_mode);
+ extern int arm_hard_regno_mode_ok (unsigned int, enum machine_mode);
+ extern int const_ok_for_arm (HOST_WIDE_INT);
++#ifdef RTX_CODE
+ extern int arm_split_constant (RTX_CODE, enum machine_mode, rtx,
+ 			       HOST_WIDE_INT, rtx, rtx, int);
+ extern RTX_CODE arm_canonicalize_comparison (RTX_CODE, enum machine_mode,
diff --git a/trunk/toolchain/gcc/patches/4.4.7/999-coldfire.patch b/trunk/toolchain/gcc/patches/4.4.7/999-coldfire.patch
new file mode 100644
index 00000000..bce2177e
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.4.7/999-coldfire.patch
@@ -0,0 +1,10 @@
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -1537,6 +1537,7 @@ m68k-*-linux*)		# Motorola m68k's runnin
+ 	if test x$sjlj != x1; then
+ 	    tmake_file="$tmake_file m68k/t-slibgcc-elf-ver"
+ 	fi
++	tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
+ 	;;
+ m68k-*-rtems*)
+ 	default_m68k_cpu=68020
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/010-documentation.patch b/trunk/toolchain/gcc/patches/4.6-linaro/010-documentation.patch
new file mode 100644
index 00000000..25773a3d
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/010-documentation.patch
@@ -0,0 +1,23 @@
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -4251,18 +4251,10 @@
+ doc/gccint.info: $(TEXI_GCCINT_FILES)
+ doc/cppinternals.info: $(TEXI_CPPINT_FILES)
+ 
+-doc/%.info: %.texi
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/%.info:
+ 
+ # Duplicate entry to handle renaming of gccinstall.info
+-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/gccinstall.info:
+ 
+ doc/cpp.dvi: $(TEXI_CPP_FILES)
+ doc/gcc.dvi: $(TEXI_GCC_FILES)
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/020-gcc_bug_54295.patch b/trunk/toolchain/gcc/patches/4.6-linaro/020-gcc_bug_54295.patch
new file mode 100644
index 00000000..5bef9eab
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/020-gcc_bug_54295.patch
@@ -0,0 +1,70 @@
+diff -urN a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
+--- a/gcc/tree-ssa-math-opts.c	2012-12-12 18:05:23.000000000 +0100
++++ b/gcc/tree-ssa-math-opts.c	2013-04-29 15:54:00.051998936 +0200
+@@ -1280,6 +1280,47 @@
+   return result;
+ }
+ 
++/* Return true if stmt is a type conversion operation that can be stripped
++   when used in a widening multiply operation.  */
++static bool
++widening_mult_conversion_strippable_p (tree result_type, gimple stmt)
++{
++  enum tree_code rhs_code = gimple_assign_rhs_code (stmt);
++
++  if (TREE_CODE (result_type) == INTEGER_TYPE)
++    {
++      tree op_type;
++      tree inner_op_type;
++
++      if (!CONVERT_EXPR_CODE_P (rhs_code))
++	return false;
++
++      op_type = TREE_TYPE (gimple_assign_lhs (stmt));
++
++      /* If the type of OP has the same precision as the result, then
++	 we can strip this conversion.  The multiply operation will be
++	 selected to create the correct extension as a by-product.  */
++      if (TYPE_PRECISION (result_type) == TYPE_PRECISION (op_type))
++	return true;
++
++      /* We can also strip a conversion if it preserves the signed-ness of
++	 the operation and doesn't narrow the range.  */
++      inner_op_type = TREE_TYPE (gimple_assign_rhs1 (stmt));
++
++      /* If the inner-most type is unsigned, then we can strip any
++	 intermediate widening operation.  If it's signed, then the
++	 intermediate widening operation must also be signed.  */
++      if ((TYPE_UNSIGNED (inner_op_type)
++	   || TYPE_UNSIGNED (op_type) == TYPE_UNSIGNED (inner_op_type))
++	  && TYPE_PRECISION (op_type) > TYPE_PRECISION (inner_op_type))
++	return true;
++
++      return false;
++    }
++
++  return rhs_code == FIXED_CONVERT_EXPR;
++}
++
+ /* Return true if RHS is a suitable operand for a widening multiplication,
+    assuming a target type of TYPE.
+    There are two cases:
+@@ -1296,17 +1337,13 @@
+ {
+   gimple stmt;
+   tree type1, rhs1;
+-  enum tree_code rhs_code;
+ 
+   if (TREE_CODE (rhs) == SSA_NAME)
+     {
+       stmt = SSA_NAME_DEF_STMT (rhs);
+       if (is_gimple_assign (stmt))
+ 	{
+-	  rhs_code = gimple_assign_rhs_code (stmt);
+-	  if (TREE_CODE (type) == INTEGER_TYPE
+-	      ? !CONVERT_EXPR_CODE_P (rhs_code)
+-	      : rhs_code != FIXED_CONVERT_EXPR)
++	  if (! widening_mult_conversion_strippable_p (type, stmt))
+ 	    rhs1 = rhs;
+ 	  else
+ 	    {
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/030-gcc_bug_48403.patch b/trunk/toolchain/gcc/patches/4.6-linaro/030-gcc_bug_48403.patch
new file mode 100644
index 00000000..69569de7
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/030-gcc_bug_48403.patch
@@ -0,0 +1,16 @@
+--- a/gcc/haifa-sched.c
++++ b/gcc/haifa-sched.c
+@@ -4654,10 +4654,12 @@ schedule_block (basic_block *target_bb)
+ 
+ 	  if (recog_memoized (insn) >= 0)
+ 	    {
++	      memcpy (temp_state, curr_state, dfa_state_size);
+ 	      cost = state_transition (curr_state, insn);
+ 	      if (sched_pressure != SCHED_PRESSURE_WEIGHTED)
+ 		gcc_assert (cost < 0);
+-	      cycle_issued_insns++;
++	      if (memcmp (temp_state, curr_state, dfa_state_size) != 0)
++		cycle_issued_insns++;
+ 	      asm_p = false;
+ 	    }
+ 	  else
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/040-gcc_bug_49696.patch b/trunk/toolchain/gcc/patches/4.6-linaro/040-gcc_bug_49696.patch
new file mode 100644
index 00000000..74b9a86a
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/040-gcc_bug_49696.patch
@@ -0,0 +1,65 @@
+--- a/gcc/config/mips/sync.md
++++ b/gcc/config/mips/sync.md
+@@ -136,7 +136,7 @@
+           [(match_operand:SI 1 "register_operand" "d")
+ 	   (match_operand:SI 2 "register_operand" "d")
+ 	   (atomic_hiqi_op:SI (match_dup 0)
+-			      (match_operand:SI 3 "register_operand" "dJ"))]
++			      (match_operand:SI 3 "reg_or_0_operand" "dJ"))]
+ 	  UNSPEC_SYNC_OLD_OP_12))
+    (clobber (match_scratch:SI 4 "=&d"))]
+   "GENERATE_LL_SC"
+@@ -177,7 +177,7 @@
+           [(match_operand:SI 2 "register_operand" "d")
+ 	   (match_operand:SI 3 "register_operand" "d")
+ 	   (atomic_hiqi_op:SI (match_dup 0)
+-			      (match_operand:SI 4 "register_operand" "dJ"))]
++			      (match_operand:SI 4 "reg_or_0_operand" "dJ"))]
+ 	  UNSPEC_SYNC_OLD_OP_12))
+    (clobber (match_scratch:SI 5 "=&d"))]
+   "GENERATE_LL_SC"
+@@ -218,7 +218,7 @@
+ 	   (match_operand:SI 2 "register_operand" "d")
+ 	   (match_operand:SI 3 "register_operand" "d")
+ 	   (atomic_hiqi_op:SI (match_dup 0)
+-			      (match_operand:SI 4 "register_operand" "dJ"))]
++			      (match_operand:SI 4 "reg_or_0_operand" "dJ"))]
+ 	  UNSPEC_SYNC_NEW_OP_12))
+    (set (match_dup 1)
+ 	(unspec_volatile:SI
+@@ -259,7 +259,7 @@
+           [(match_operand:SI 1 "register_operand" "d")
+ 	   (match_operand:SI 2 "register_operand" "d")
+ 	   (match_dup 0)
+-	   (match_operand:SI 3 "register_operand" "dJ")]
++	   (match_operand:SI 3 "reg_or_0_operand" "dJ")]
+ 	  UNSPEC_SYNC_OLD_OP_12))
+    (clobber (match_scratch:SI 4 "=&d"))]
+   "GENERATE_LL_SC"
+@@ -298,7 +298,7 @@
+ 	(unspec_volatile:SI
+           [(match_operand:SI 2 "register_operand" "d")
+ 	   (match_operand:SI 3 "register_operand" "d")
+-	   (match_operand:SI 4 "register_operand" "dJ")]
++	   (match_operand:SI 4 "reg_or_0_operand" "dJ")]
+ 	  UNSPEC_SYNC_OLD_OP_12))
+    (clobber (match_scratch:SI 5 "=&d"))]
+   "GENERATE_LL_SC"
+@@ -337,7 +337,7 @@
+           [(match_operand:SI 1 "memory_operand" "+R")
+ 	   (match_operand:SI 2 "register_operand" "d")
+ 	   (match_operand:SI 3 "register_operand" "d")
+-	   (match_operand:SI 4 "register_operand" "dJ")]
++	   (match_operand:SI 4 "reg_or_0_operand" "dJ")]
+ 	  UNSPEC_SYNC_NEW_OP_12))
+    (set (match_dup 1)
+ 	(unspec_volatile:SI
+@@ -546,7 +546,7 @@
+    (set (match_dup 1)
+ 	(unspec_volatile:SI [(match_operand:SI 2 "register_operand" "d")
+ 			     (match_operand:SI 3 "register_operand" "d")
+-			     (match_operand:SI 4 "arith_operand" "dJ")]
++			     (match_operand:SI 4 "reg_or_0_operand" "dJ")]
+ 	  UNSPEC_SYNC_EXCHANGE_12))]
+   "GENERATE_LL_SC"
+   { return mips_output_sync_loop (insn, operands); }
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/100-uclibc-conf.patch b/trunk/toolchain/gcc/patches/4.6-linaro/100-uclibc-conf.patch
new file mode 100644
index 00000000..ff9ad94f
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- a/libjava/classpath/ltconfig
++++ b/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/200-musl.patch b/trunk/toolchain/gcc/patches/4.6-linaro/200-musl.patch
new file mode 100644
index 00000000..1cc5756d
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/200-musl.patch
@@ -0,0 +1,240 @@
+--- a/config.sub
++++ b/config.sub
+@@ -125,6 +125,7 @@ esac
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-musl* | \
+   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+   knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -485,7 +485,7 @@ case ${target} in
+ esac
+ 
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+ 
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -598,6 +598,9 @@ case ${target} in
+     *-*-*uclibc*)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+       ;;
++    *-*-*musl*)
++      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++      ;;
+     *)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+       ;;
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -78,6 +78,10 @@
+     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
+     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+ 
++/* musl has no "classic" (i.e. broken) mode */
++#undef  MUSL_DYNAMIC_LINKER
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+--- a/gcc/config/i386/linux.h
++++ b/gcc/config/i386/linux.h
+@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3.
+ /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
+ #define LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+ 
+ #undef  ASM_SPEC
+ #define ASM_SPEC \
+--- a/gcc/config/i386/linux64.h
++++ b/gcc/config/i386/linux64.h
+@@ -65,6 +65,9 @@ see the files COPYING3 and COPYING.RUNTI
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ 
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++
+ #if TARGET_64BIT_DEFAULT
+ #define SPEC_32 "m32"
+ #define SPEC_64 "!m32"
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTI
+ #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
+ #endif
+ 
+ #define LINUX_TARGET_OS_CPP_BUILTINS()				\
+@@ -54,18 +56,21 @@ see the files COPYING3 and COPYING.RUNTI
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+ 
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
+-  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
++  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+ 
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -83,13 +88,13 @@ see the files COPYING3 and COPYING.RUNTI
+ 
+ #define LINUX_DYNAMIC_LINKER						\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
+-			 BIONIC_DYNAMIC_LINKER)
++			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define LINUX_DYNAMIC_LINKER32						\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+-			 BIONIC_DYNAMIC_LINKER32)
++			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define LINUX_DYNAMIC_LINKER64						\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+-			 BIONIC_DYNAMIC_LINKER64)
++			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ 
+ /* Determine whether the entire c99 runtime
+    is present in the runtime library.  */
+--- a/gcc/config/linux.opt
++++ b/gcc/config/linux.opt
+@@ -30,3 +30,7 @@ Use GNU C library
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -63,6 +63,8 @@ along with GCC; see the file COPYING3.
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ 
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
++
+ /* Borrowed from sparc/linux.h */
+ #undef LINK_SPEC
+ #define LINK_SPEC \
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__	/* BeOS */
+ #define __SIZE_T__	/* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -200,6 +201,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
+ /* __size_t is a typedef on FreeBSD 5!, must not trash it. */
+ #else
+@@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t;
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+--- a/libgomp/config/posix/time.c
++++ b/libgomp/config/posix/time.c
+@@ -28,6 +28,8 @@
+    The following implementation uses the most simple POSIX routines.
+    If present, POSIX 4 clocks should be used instead.  */
+ 
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
+--- a/libstdc++-v3/configure.host
++++ b/libstdc++-v3/configure.host
+@@ -237,6 +237,13 @@ case "${host_os}" in
+     os_include_dir="os/bsd/freebsd"
+     ;;
+   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++    # check for musl by target
++    case "${host_os}" in
++      *-musl*)
++        os_include_dir="os/generic"
++        ;;
++      *)
++
+     if [ "$uclibc" = "yes" ]; then
+       os_include_dir="os/uclibc"
+     elif [ "$bionic" = "yes" ]; then
+@@ -245,6 +252,9 @@ case "${host_os}" in
+       os_include_dir="os/gnu-linux"
+     fi
+     ;;
++
++    esac
++    ;;
+   hpux*)
+     os_include_dir="os/hpux"
+     ;;
+--- a/gcc/config/mips/linux64.h
++++ b/gcc/config/mips/linux64.h
+@@ -40,9 +40,12 @@ along with GCC; see the file COPYING3.
+ #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
+ #define LINUX_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
+-			 BIONIC_DYNAMIC_LINKERN32)
++			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC "\
+--- a/gcc/config/sparc/linux64.h	2013-09-10 10:02:45.663973856 +0100
++++ b/gcc/config/sparc/linux64.h	2013-09-10 10:03:17.871972435 +0100
+@@ -104,6 +104,9 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+ 
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1"
++
+ #ifdef SPARC_BI_ARCH
+ 
+ #undef SUBTARGET_EXTRA_SPECS
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/301-missing-execinfo_h.patch b/trunk/toolchain/gcc/patches/4.6-linaro/301-missing-execinfo_h.patch
new file mode 100644
index 00000000..b3f1e68d
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/301-missing-execinfo_h.patch
@@ -0,0 +1,11 @@
+--- a/boehm-gc/include/gc.h
++++ b/boehm-gc/include/gc.h
+@@ -503,7 +503,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_of
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
++     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/302-c99-snprintf.patch b/trunk/toolchain/gcc/patches/4.6-linaro/302-c99-snprintf.patch
new file mode 100644
index 00000000..eda1854d
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/302-c99-snprintf.patch
@@ -0,0 +1,11 @@
+--- a/libstdc++-v3/include/c_global/cstdio
++++ b/libstdc++-v3/include/c_global/cstdio
+@@ -137,7 +137,7 @@ namespace std
+   using ::vsprintf;
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
++#if _GLIBCXX_USE_C99 || defined __UCLIBC__
+ 
+ #undef snprintf
+ #undef vfscanf
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/305-libmudflap-susv3-legacy.patch b/trunk/toolchain/gcc/patches/4.6-linaro/305-libmudflap-susv3-legacy.patch
new file mode 100644
index 00000000..8e2d15f8
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,47 @@
+--- a/libmudflap/mf-hooks2.c
++++ b/libmudflap/mf-hooks2.c
+@@ -421,7 +421,7 @@ WRAPPER2(void, bzero, void *s, size_t n)
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -431,7 +431,7 @@ WRAPPER2(void, bcopy, const void *src, v
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -441,7 +441,7 @@ WRAPPER2(int, bcmp, const void *s1, cons
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -450,7 +450,7 @@ WRAPPER2(char *, index, const char *s, i
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -459,7 +459,7 @@ WRAPPER2(char *, rindex, const char *s,
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/800-arm_v5te_no_ldrd_strd.patch b/trunk/toolchain/gcc/patches/4.6-linaro/800-arm_v5te_no_ldrd_strd.patch
new file mode 100644
index 00000000..4b7770d5
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/800-arm_v5te_no_ldrd_strd.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/arm/arm.h
++++ b/gcc/config/arm/arm.h
+@@ -232,7 +232,7 @@ extern void (*arm_lang_output_object_att
+ #define TARGET_BACKTRACE	        (leaf_function_p () \
+ 				         ? TARGET_TPCS_LEAF_FRAME \
+ 				         : TARGET_TPCS_FRAME)
+-#define TARGET_LDRD			(arm_arch5e && ARM_DOUBLEWORD_ALIGN)
++#define TARGET_LDRD			(arm_arch6 && ARM_DOUBLEWORD_ALIGN)
+ #define TARGET_AAPCS_BASED \
+     (arm_abi != ARM_ABI_APCS && arm_abi != ARM_ABI_ATPCS)
+ 
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/810-arm-softfloat-libgcc.patch b/trunk/toolchain/gcc/patches/4.6-linaro/810-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..60cfde40
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,26 @@
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+--- a/gcc/config/arm/t-linux
++++ b/gcc/config/arm/t-linux
+@@ -23,7 +23,11 @@ TARGET_LIBGCC2_CFLAGS = -fomit-frame-poi
+ 
+ LIB1ASMSRC = arm/lib1funcs.asm
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_arm_addsubdf3 _arm_addsubsf3
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/820-libgcc_pic.patch b/trunk/toolchain/gcc/patches/4.6-linaro/820-libgcc_pic.patch
new file mode 100644
index 00000000..3760ac2b
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/820-libgcc_pic.patch
@@ -0,0 +1,36 @@
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -747,11 +747,12 @@ $(libgcov-objects): %$(objext): $(gcc_sr
+ 
+ # Static libraries.
+ libgcc.a: $(libgcc-objects)
++libgcc_pic.a: $(libgcc-s-objects)
+ libgcov.a: $(libgcov-objects)
+ libunwind.a: $(libunwind-objects)
+ libgcc_eh.a: $(libgcc-eh-objects)
+ 
+-libgcc.a libgcov.a libunwind.a libgcc_eh.a:
++libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
+ 	-rm -f $@
+ 
+ 	objects="$(objects)";					\
+@@ -773,7 +774,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E
+ endif
+ 
+ ifeq ($(enable_shared),yes)
+-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
++all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
+ ifneq ($(LIBUNWIND),)
+ all: libunwind$(SHLIB_EXT)
+ endif
+@@ -954,6 +955,10 @@ install-shared:
+ 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 
++	$(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
++	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++
+ 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/830-arm_unbreak_armv4t.patch b/trunk/toolchain/gcc/patches/4.6-linaro/830-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..7e2ed698
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/830-arm_unbreak_armv4t.patch
@@ -0,0 +1,13 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -46,7 +46,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch b/trunk/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
new file mode 100644
index 00000000..3be371be
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
@@ -0,0 +1,19 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -82,10 +82,15 @@
+ #undef  MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
+ 
++/* For armv4 we pass --fix-v4bx to linker to support EABI */
++#undef TARGET_FIX_V4BX_SPEC
++#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
++  "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+-#define LINK_SPEC BE8_LINK_SPEC						\
++#define LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC			\
+   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
+ 		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
+ 
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/850-use_shared_libgcc.patch b/trunk/toolchain/gcc/patches/4.6-linaro/850-use_shared_libgcc.patch
new file mode 100644
index 00000000..61e1035d
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/850-use_shared_libgcc.patch
@@ -0,0 +1,86 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -115,10 +115,6 @@
+ #define ENDFILE_SPEC \
+   LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
+ 
+-/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
+-   do not use -lfloat.  */
+-#undef LIBGCC_SPEC
+-
+ /* Clear the instruction cache from `beg' to `end'.  This is
+    implemented in lib1funcs.asm, so ensure an error if this definition
+    is used.  */
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,8 +60,6 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "-lgcc"
+-
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} \
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -52,6 +52,10 @@ see the files COPYING3 and COPYING.RUNTI
+ 	builtin_assert ("system=posix");			\
+     } while (0)
+ 
++#ifndef LIBGCC_SPEC
++#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
++#endif
++
+ /* Determine which dynamic linker to use depending on whether GLIBC or
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+--- a/gcc/config/rs6000/linux.h
++++ b/gcc/config/rs6000/linux.h
+@@ -88,6 +88,8 @@
+ #define USE_LD_AS_NEEDED 1
+ #endif
+ 
++#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
++
+ #undef  TARGET_VERSION
+ #define TARGET_VERSION fprintf (stderr, " (PowerPC GNU/Linux)");
+ 
+--- a/gcc/mkmap-symver.awk
++++ b/gcc/mkmap-symver.awk
+@@ -132,5 +132,5 @@ function output(lib) {
+   else if (inherit[lib])
+     printf("} %s;\n", inherit[lib]);
+   else
+-    printf ("\n  local:\n\t*;\n};\n");
++    printf ("\n\t*;\n};\n");
+ }
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -269,6 +269,12 @@ ifeq ($(enable_shared),yes)
+     install-libunwind = install-libunwind
+   endif
+ 
++else
++# Not enable_shared.
++iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items))
++endif
++
++
+ # For -fvisibility=hidden.  We need both a -fvisibility=hidden on
+ # the command line, and a #define to prevent libgcc2.h etc from
+ # overriding that with #pragmas.
+@@ -291,13 +297,6 @@ else
+ gen-hide-list = echo > $@
+ endif
+ 
+-else
+-# Not enable_shared.
+-iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items))
+-vis_hide =
+-gen-hide-list = echo > \$@
+-endif
+-
+ ifneq ($(EXTRA_PARTS),)
+   extra-parts = libgcc-extra-parts
+   INSTALL_PARTS = $(EXTRA_PARTS)
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/860-uclibc_use_eh_frame.patch b/trunk/toolchain/gcc/patches/4.6-linaro/860-uclibc_use_eh_frame.patch
new file mode 100644
index 00000000..381a14bc
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/860-uclibc_use_eh_frame.patch
@@ -0,0 +1,29 @@
+--- a/gcc/crtstuff.c
++++ b/gcc/crtstuff.c
+@@ -100,15 +100,20 @@ call_ ## FUNC (void)					\
+ #if defined(OBJECT_FORMAT_ELF) \
+     && !defined(OBJECT_FORMAT_FLAT) \
+     && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
+-    && defined(__GLIBC__) && __GLIBC__ >= 2
++    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O)
+ #include <link.h>
+ /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
+    But it doesn't use PT_GNU_EH_FRAME ELF segment currently.  */
+-# if !defined(__UCLIBC__) \
+-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+-     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+-#  define USE_PT_GNU_EH_FRAME
++# if defined(__UCLIBC__)
++#  if (__UCLIBC_MAJOR__ > 0 || __UCLIBC_MINOR__ > 9 || \
++       (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 33))
++#   define USE_PT_GNU_EH_FRAME
++#  endif
++# elif defined(__GLIBC__)
++#  if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
++       || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
++#   define USE_PT_GNU_EH_FRAME
++#  endif
+ # endif
+ #endif
+ #if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME)
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/870-ppc_no_crtsavres.patch b/trunk/toolchain/gcc/patches/4.6-linaro/870-ppc_no_crtsavres.patch
new file mode 100644
index 00000000..0e15ffc3
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/870-ppc_no_crtsavres.patch
@@ -0,0 +1,20 @@
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -248,13 +248,13 @@ do {									\
+ 
+ /* Define cutoff for using external functions to save floating point.
+    When optimizing for size, use external functions when profitable.  */
+-#define FP_SAVE_INLINE(FIRST_REG) (optimize_size			\
++#define FP_SAVE_INLINE(FIRST_REG) (1 || (optimize_size			\
+ 				   ? ((FIRST_REG) == 62			\
+ 				      || (FIRST_REG) == 63)		\
+-				   : (FIRST_REG) < 64)
++				   : (FIRST_REG) < 64))
+ /* And similarly for general purpose registers.  */
+-#define GP_SAVE_INLINE(FIRST_REG) ((FIRST_REG) < 32	\
+-				   && !optimize_size)
++#define GP_SAVE_INLINE(FIRST_REG) (1 || ((FIRST_REG) < 32	\
++				   && !optimize_size))
+ 
+ /* Put jump tables in read-only memory, rather than in .text.  */
+ #define JUMP_TABLES_IN_TEXT_SECTION 0
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/880-no_java_section.patch b/trunk/toolchain/gcc/patches/4.6-linaro/880-no_java_section.patch
new file mode 100644
index 00000000..404b7d31
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/880-no_java_section.patch
@@ -0,0 +1,11 @@
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
+@@ -383,7 +383,7 @@ see the files COPYING3 and COPYING.RUNTI
+ /* If we have named section and we support weak symbols, then use the
+    .jcr section for recording java classes which need to be registered
+    at program start-up time.  */
+-#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
++#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
+ #ifndef JCR_SECTION_NAME
+ #define JCR_SECTION_NAME ".jcr"
+ #endif
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/900-bad-mips16-crt b/trunk/toolchain/gcc/patches/4.6-linaro/900-bad-mips16-crt
new file mode 100644
index 00000000..5bb2ffb4
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/900-bad-mips16-crt
@@ -0,0 +1,9 @@
+--- gcc/gcc/config/mips/t-libgcc-mips16~	2013-03-26 09:09:34.209077496 -0400
++++ gcc/gcc/config/mips/t-libgcc-mips16	2013-03-26 18:21:01.717303669 -0400
+@@ -43,3 +43,6 @@
+ 
+ # Version these symbols if building libgcc.so.
+ SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver
++
++CRTSTUFF_T_CFLAGS += -mno-mips16
++CRTSTUFF_T_CFLAGS_S += -mno-mips16
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/910-mbsd_multi.patch b/trunk/toolchain/gcc/patches/4.6-linaro/910-mbsd_multi.patch
new file mode 100644
index 00000000..51bbc7f2
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/910-mbsd_multi.patch
@@ -0,0 +1,253 @@
+
+	This patch brings over a few features from MirBSD:
+	* -fhonour-copts
+	  If this option is not given, it's warned (depending
+	  on environment variables). This is to catch errors
+	  of misbuilt packages which override CFLAGS themselves.
+	* -Werror-maybe-reset
+	  Has the effect of -Wno-error if GCC_NO_WERROR is
+	  set and not '0', a no-operation otherwise. This is
+	  to be able to use -Werror in "make" but prevent
+	  GNU autoconf generated configure scripts from
+	  freaking out.
+	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
+	  the default for -O2/-Os, because they trigger gcc bugs
+	  and can delete code with security implications.
+
+	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
+	with copyright assignment to the FSF in effect.
+
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -103,6 +103,9 @@ static size_t deferred_count;
+ /* Number of deferred options scanned for -include.  */
+ static size_t include_cursor;
+ 
++/* Check if a port honours COPTS.  */
++static int honour_copts = 0;
++
+ static void handle_OPT_d (const char *);
+ static void set_std_cxx98 (int);
+ static void set_std_cxx0x (int);
+@@ -441,6 +444,9 @@ c_common_handle_option (size_t scode, co
+       global_dc->warning_as_error_requested = value;
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      break;
++
+     case OPT_Wformat:
+       set_Wformat (value);
+       break;
+@@ -584,6 +590,12 @@ c_common_handle_option (size_t scode, co
+       flag_no_builtin = !value;
+       break;
+ 
++    case OPT_fhonour_copts:
++      if (c_language == clk_c) {
++        honour_copts++;
++      }
++      break;
++
+     case OPT_fconstant_string_class_:
+       constant_string_class_name = arg;
+       break;
+@@ -1058,6 +1070,47 @@ c_common_init (void)
+       return false;
+     }
+ 
++  if (c_language == clk_c) {
++    char *ev = getenv ("GCC_HONOUR_COPTS");
++    int evv;
++    if (ev == NULL)
++      evv = -1;
++    else if ((*ev == '0') || (*ev == '\0'))
++      evv = 0;
++    else if (*ev == '1')
++      evv = 1;
++    else if (*ev == '2')
++      evv = 2;
++    else if (*ev == 's')
++      evv = -1;
++    else {
++      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
++      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
++    }
++    if (evv == 1) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in lenient mode");
++        return false;
++      } else if (honour_copts != 1) {
++        warning (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++      }
++    } else if (evv == 2) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in strict mode");
++        return false;
++      } else if (honour_copts != 1) {
++        error ("someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++        return false;
++      }
++    } else if (evv == 0) {
++      if (honour_copts != 1)
++        inform (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++    }
++  }
++
+   return true;
+ }
+ 
+--- a/gcc/c-family/c.opt
++++ b/gcc/c-family/c.opt
+@@ -363,6 +363,10 @@ Werror-implicit-function-declaration
+ C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
+ This switch is deprecated; use -Werror=implicit-function-declaration instead
+ 
++Werror-maybe-reset
++C ObjC C++ ObjC++
++; Documented in common.opt
++
+ Wfloat-equal
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
+ Warn if testing floating point numbers for equality
+@@ -794,6 +798,9 @@ C++ ObjC++ Optimization Alias(fexception
+ fhonor-std
+ C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
+ 
++fhonour-copts
++C ObjC C++ ObjC++ RejectNegative
++
+ fhosted
+ C ObjC
+ Assume normal C execution environment
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -520,6 +520,10 @@ Werror=
+ Common Joined
+ Treat specified warning as error
+ 
++Werror-maybe-reset
++Common
++If environment variable GCC_NO_WERROR is set, act as -Wno-error
++
+ Wextra
+ Common Var(extra_warnings) Warning
+ Print extra (possibly unwanted) warnings
+@@ -1156,6 +1160,9 @@ fguess-branch-probability
+ Common Report Var(flag_guess_branch_prob) Optimization
+ Enable guessing of branch probabilities
+ 
++fhonour-copts
++Common RejectNegative
++
+ ; Nonzero means ignore `#ident' directives.  0 means handle them.
+ ; Generate position-independent code for executables if possible
+ ; On SVR4 targets, it also controls whether or not to emit a
+--- a/gcc/opts.c
++++ b/gcc/opts.c
+@@ -477,8 +477,6 @@ static const struct default_options defa
+     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
+ #endif
+     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
+@@ -494,6 +492,8 @@ static const struct default_options defa
+     { OPT_LEVELS_2_PLUS, OPT_falign_functions, NULL, 1 },
+ 
+     /* -O3 optimizations.  */
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
+     /* Inlining of functions reducing size is a good idea with -Os
+@@ -1405,6 +1405,17 @@ common_handle_option (struct gcc_options
+ 			       opts, opts_set, loc, dc);
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++        char *ev = getenv ("GCC_NO_WERROR");
++        if ((ev != NULL) && (*ev != '0'))
++          warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wlarger_than_:
+       opts->x_larger_than_size = value;
+       opts->x_warn_larger_than = value != -1;
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -164,6 +164,11 @@ in older programs.  This warning is on b
+ Make all warnings into hard errors.  Source code which triggers warnings
+ will be rejected.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
+ @item -Wsystem-headers
+ @opindex Wsystem-headers
+ Issue warnings for code in system headers.  These are normally unhelpful
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -240,7 +240,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
+ -Wno-deprecated-declarations -Wdisabled-optimization  @gol
+ -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
+--Wno-endif-labels -Werror  -Werror=* @gol
++-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
+ -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
+ -Wformat-security  -Wformat-y2k @gol
+@@ -4498,6 +4498,22 @@ This option is only supported for C and
+ @option{-Wall} and by @option{-pedantic}, which can be disabled with
+ @option{-Wno-pointer-sign}.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
++ at item -fhonour-copts
++ at opindex fhonour-copts
++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
++given at least once, and warn if it is given more than once.
++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
++given exactly once.
++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
++is not given exactly once.
++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
++This flag and environment variable only affect the C language.
++
+ @item -Wstack-protector
+ @opindex Wstack-protector
+ @opindex Wno-stack-protector
+@@ -6317,7 +6333,7 @@ so, the first branch is redirected to ei
+ second branch or a point immediately following it, depending on whether
+ the condition is known to be true or false.
+ 
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+ 
+ @item -fsplit-wide-types
+ @opindex fsplit-wide-types
+--- a/gcc/java/jvspec.c
++++ b/gcc/java/jvspec.c
+@@ -627,6 +627,7 @@ lang_specific_pre_link (void)
+      class name.  Append dummy `.c' that can be stripped by set_input so %b
+      is correct.  */ 
+   set_input (concat (main_class_name, "main.c", NULL));
++  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
+   err = do_spec (jvgenmain_spec);
+   if (err == 0)
+     {
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/920-specs_nonfatal_getenv.patch b/trunk/toolchain/gcc/patches/4.6-linaro/920-specs_nonfatal_getenv.patch
new file mode 100644
index 00000000..5055ae89
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/920-specs_nonfatal_getenv.patch
@@ -0,0 +1,14 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -7772,7 +7772,10 @@ getenv_spec_function (int argc, const ch
+ 
+   value = getenv (argv[0]);
+   if (!value)
+-    fatal_error ("environment variable %qs not defined", argv[0]);
++    {
++      warning (0, "environment variable %qs not defined", argv[0]);
++      value = "";
++    }
+ 
+   /* We have to escape every character of the environment variable so
+      they are not interpreted as active spec characters.  A
diff --git a/trunk/toolchain/gcc/patches/4.6-linaro/999-coldfire.patch b/trunk/toolchain/gcc/patches/4.6-linaro/999-coldfire.patch
new file mode 100644
index 00000000..0913f349
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.6-linaro/999-coldfire.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -1805,7 +1805,7 @@ m68k-*-linux*)		# Motorola m68k's runnin
+ 	default_m68k_cpu=68020
+ 	default_cf_cpu=5475
+ 	with_arch=${with_arch:-m68k}
+-	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h m68k/linux.h ./sysroot-suffix.h"
++	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h m68k/linux.h"
+ 	extra_options="${extra_options} m68k/ieee.opt"
+ 	tm_defines="${tm_defines} MOTOROLA=1"
+ 	tmake_file="${tmake_file} m68k/t-floatlib m68k/t-linux m68k/t-mlibs"
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/001-revert_register_mode_search.patch b/trunk/toolchain/gcc/patches/4.8-linaro/001-revert_register_mode_search.patch
new file mode 100644
index 00000000..162d6513
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/001-revert_register_mode_search.patch
@@ -0,0 +1,65 @@
+Revert of:
+
+commit 275035b56823b26d5fb7e90fad945b998648edf2
+Author: bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Thu Sep 5 14:09:07 2013 +0000
+
+        PR target/58139
+        * reginfo.c (choose_hard_reg_mode): Scan through all mode classes
+        looking for widest mode.
+
+
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202286 138bc75d-0d04-0410-961f-82ee72b054a4
+
+
+--- a/gcc/reginfo.c
++++ b/gcc/reginfo.c
+@@ -620,35 +620,40 @@ choose_hard_reg_mode (unsigned int regno
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
++  if (found_mode != VOIDmode)
++    return found_mode;
++
+   for (mode = GET_CLASS_NARROWEST_MODE (MODE_FLOAT);
+        mode != VOIDmode;
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
++  if (found_mode != VOIDmode)
++    return found_mode;
++
+   for (mode = GET_CLASS_NARROWEST_MODE (MODE_VECTOR_FLOAT);
+        mode != VOIDmode;
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
++  if (found_mode != VOIDmode)
++    return found_mode;
++
+   for (mode = GET_CLASS_NARROWEST_MODE (MODE_VECTOR_INT);
+        mode != VOIDmode;
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
+   if (found_mode != VOIDmode)
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/002-weak_data_fix.patch b/trunk/toolchain/gcc/patches/4.8-linaro/002-weak_data_fix.patch
new file mode 100644
index 00000000..a740b4ce
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/002-weak_data_fix.patch
@@ -0,0 +1,42 @@
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/visibility-21.c
+@@ -0,0 +1,14 @@
++/* PR target/32219 */
++/* { dg-do run } */
++/* { dg-require-visibility "" } */
++/* { dg-options "-fPIC" { target fpic } } */
++
++extern void f() __attribute__((weak,visibility("hidden")));
++extern int puts( char const* );
++int main()
++{
++	if (f)
++		f();
++	return 0;
++}
++
+--- a/gcc/varasm.c
++++ b/gcc/varasm.c
+@@ -6677,6 +6677,10 @@ default_binds_local_p_1 (const_tree exp,
+   /* Static variables are always local.  */
+   else if (! TREE_PUBLIC (exp))
+     local_p = true;
++  /* hidden weak can't be overridden by something non-local, all
++     that is possible is that it is not defined at all. */
++  else if (DECL_WEAK (exp))
++    local_p = false;
+   /* A variable is local if the user has said explicitly that it will
+      be.  */
+   else if ((DECL_VISIBILITY_SPECIFIED (exp)
+@@ -6690,11 +6694,6 @@ default_binds_local_p_1 (const_tree exp,
+      local.  */
+   else if (DECL_VISIBILITY (exp) != VISIBILITY_DEFAULT)
+     local_p = true;
+-  /* Default visibility weak data can be overridden by a strong symbol
+-     in another module and so are not local.  */
+-  else if (DECL_WEAK (exp)
+-	   && !resolved_locally)
+-    local_p = false;
+   /* If PIC, then assume that any global name can be overridden by
+      symbols resolved from other modules.  */
+   else if (shlib)
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/003-universal_initializer.patch b/trunk/toolchain/gcc/patches/4.8-linaro/003-universal_initializer.patch
new file mode 100644
index 00000000..1b9a5b30
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/003-universal_initializer.patch
@@ -0,0 +1,94 @@
+--- a/gcc/c/c-typeck.c
++++ b/gcc/c/c-typeck.c
+@@ -62,9 +62,9 @@ int in_typeof;
+    if expr.original_code == SIZEOF_EXPR.  */
+ tree c_last_sizeof_arg;
+ 
+-/* Nonzero if we've already printed a "missing braces around initializer"
+-   message within this initializer.  */
+-static int missing_braces_mentioned;
++/* Nonzero if we might need to print a "missing braces around
++   initializer" message within this initializer.  */
++static int found_missing_braces;
+ 
+ static int require_constant_value;
+ static int require_constant_elements;
+@@ -6363,6 +6363,9 @@ static int constructor_nonconst;
+ /* 1 if this constructor is erroneous so far.  */
+ static int constructor_erroneous;
+ 
++/* 1 if this constructor is the universal zero initializer { 0 }.  */
++static int constructor_zeroinit;
++
+ /* Structure for managing pending initializer elements, organized as an
+    AVL tree.  */
+ 
+@@ -6524,7 +6527,7 @@ start_init (tree decl, tree asmspec_tree
+   constructor_stack = 0;
+   constructor_range_stack = 0;
+ 
+-  missing_braces_mentioned = 0;
++  found_missing_braces = 0;
+ 
+   spelling_base = 0;
+   spelling_size = 0;
+@@ -6619,6 +6622,7 @@ really_start_incremental_init (tree type
+   constructor_type = type;
+   constructor_incremental = 1;
+   constructor_designated = 0;
++  constructor_zeroinit = 1;
+   designator_depth = 0;
+   designator_erroneous = 0;
+ 
+@@ -6816,11 +6820,8 @@ push_init_level (int implicit, struct ob
+ 	set_nonincremental_init (braced_init_obstack);
+     }
+ 
+-  if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned)
+-    {
+-      missing_braces_mentioned = 1;
+-      warning_init (OPT_Wmissing_braces, "missing braces around initializer");
+-    }
++  if (implicit == 1)
++    found_missing_braces = 1;
+ 
+   if (TREE_CODE (constructor_type) == RECORD_TYPE
+ 	   || TREE_CODE (constructor_type) == UNION_TYPE)
+@@ -6953,16 +6954,23 @@ pop_init_level (int implicit, struct obs
+ 	}
+     }
+ 
++  if (vec_safe_length (constructor_elements) != 1)
++    constructor_zeroinit = 0;
++
++  /* Warn when some structs are initialized with direct aggregation.  */
++  if (!implicit && found_missing_braces && warn_missing_braces
++      && !constructor_zeroinit)
++    {
++      warning_init (OPT_Wmissing_braces,
++		    "missing braces around initializer");
++    }
++
+   /* Warn when some struct elements are implicitly initialized to zero.  */
+   if (warn_missing_field_initializers
+       && constructor_type
+       && TREE_CODE (constructor_type) == RECORD_TYPE
+       && constructor_unfilled_fields)
+     {
+-	bool constructor_zeroinit =
+-	 (vec_safe_length (constructor_elements) == 1
+-	  && integer_zerop ((*constructor_elements)[0].value));
+-
+ 	/* Do not warn for flexible array members or zero-length arrays.  */
+ 	while (constructor_unfilled_fields
+ 	       && (!DECL_SIZE (constructor_unfilled_fields)
+@@ -8077,6 +8085,9 @@ process_init_element (struct c_expr valu
+   designator_depth = 0;
+   designator_erroneous = 0;
+ 
++  if (!implicit && value.value && !integer_zerop (value.value))
++    constructor_zeroinit = 0;
++
+   /* Handle superfluous braces around string cst as in
+      char x[] = {"foo"}; */
+   if (string_flag
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/004-case_insensitive.patch b/trunk/toolchain/gcc/patches/4.8-linaro/004-case_insensitive.patch
new file mode 100644
index 00000000..b3d2dbe2
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/004-case_insensitive.patch
@@ -0,0 +1,14 @@
+--- a/include/filenames.h
++++ b/include/filenames.h
+@@ -43,11 +43,6 @@ extern "C" {
+ #  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
+ #  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
+ #else /* not DOSish */
+-#  if defined(__APPLE__)
+-#    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
+-#      define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
+-#    endif
+-#  endif /* __APPLE__ */
+ #  define HAS_DRIVE_SPEC(f) (0)
+ #  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
+ #  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/010-documentation.patch b/trunk/toolchain/gcc/patches/4.8-linaro/010-documentation.patch
new file mode 100644
index 00000000..5548069d
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/010-documentation.patch
@@ -0,0 +1,23 @@
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -4327,18 +4327,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
+ doc/gccint.info: $(TEXI_GCCINT_FILES)
+ doc/cppinternals.info: $(TEXI_CPPINT_FILES)
+ 
+-doc/%.info: %.texi
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/%.info:
+ 
+ # Duplicate entry to handle renaming of gccinstall.info
+-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/gccinstall.info:
+ 
+ doc/cpp.dvi: $(TEXI_CPP_FILES)
+ doc/gcc.dvi: $(TEXI_GCC_FILES)
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch b/trunk/toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch
new file mode 100644
index 00000000..ff9ad94f
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- a/libjava/classpath/ltconfig
++++ b/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/200-musl_config.patch b/trunk/toolchain/gcc/patches/4.8-linaro/200-musl_config.patch
new file mode 100644
index 00000000..0142745c
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/200-musl_config.patch
@@ -0,0 +1,204 @@
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -559,7 +559,7 @@ case ${target} in
+ esac
+ 
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+ 
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -662,6 +662,9 @@ case ${target} in
+     *-*-*uclibc*)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+       ;;
++    *-*-*musl*)
++      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++      ;;
+     *)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+       ;;
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
+ #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
+ #endif
+ 
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
+@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+ 
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
+-  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
++  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+ 
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -84,21 +89,21 @@ see the files COPYING3 and COPYING.RUNTI
+ 
+ #define GNU_USER_DYNAMIC_LINKER						\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
+-			 BIONIC_DYNAMIC_LINKER)
++			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+-			 BIONIC_DYNAMIC_LINKER32)
++			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+-			 BIONIC_DYNAMIC_LINKER64)
++			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+-			 BIONIC_DYNAMIC_LINKERX32)
++			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+ 
+ /* Determine whether the entire c99 runtime
+    is present in the runtime library.  */
+ #undef TARGET_C99_FUNCTIONS
+-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
+ 
+ /* Whether we have sincos that follows the GNU extension.  */
+ #undef TARGET_HAS_SINCOS
+@@ -107,3 +112,74 @@ see the files COPYING3 and COPYING.RUNTI
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
++
++/* musl avoids problematic includes by rearranging the include directories.
++ * Unfortunately, this is mostly duplicated from cppdefault.c */
++#if DEFAULT_LIBC == LIBC_MUSL
++#define INCLUDE_DEFAULTS_MUSL_GPP			\
++    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
++    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
++    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
++
++#ifdef LOCAL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
++    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
++    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_LOCAL
++#endif
++
++#ifdef PREFIX_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
++    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_PREFIX
++#endif
++
++#ifdef CROSS_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_CROSS			\
++    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#ifdef TOOL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_TOOL			\
++    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_TOOL
++#endif
++
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
++    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_NATIVE
++#endif
++
++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
++# undef INCLUDE_DEFAULTS_MUSL_LOCAL
++# define INCLUDE_DEFAULTS_MUSL_LOCAL
++# undef INCLUDE_DEFAULTS_MUSL_NATIVE
++# define INCLUDE_DEFAULTS_MUSL_NATIVE
++#else
++# undef INCLUDE_DEFAULTS_MUSL_CROSS
++# define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#undef INCLUDE_DEFAULTS
++#define INCLUDE_DEFAULTS				\
++  {							\
++    INCLUDE_DEFAULTS_MUSL_GPP				\
++    INCLUDE_DEFAULTS_MUSL_PREFIX			\
++    INCLUDE_DEFAULTS_MUSL_CROSS				\
++    INCLUDE_DEFAULTS_MUSL_TOOL				\
++    INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
++    { 0, 0, 0, 0, 0, 0 }				\
++  }
++#endif
+--- a/gcc/config/linux.opt
++++ b/gcc/config/linux.opt
+@@ -30,3 +30,7 @@ Use GNU C library
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__	/* BeOS */
+ #define __SIZE_T__	/* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -197,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+   || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t;
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/201-musl_arm.patch b/trunk/toolchain/gcc/patches/4.8-linaro/201-musl_arm.patch
new file mode 100644
index 00000000..f39ff524
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/201-musl_arm.patch
@@ -0,0 +1,40 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -77,6 +77,23 @@
+     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
+     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+ 
++/* For ARM musl currently supports four dynamic linkers:
++   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
++   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
++   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
++   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
++   musl does not support the legacy OABI mode.
++   All the dynamic linkers live in /lib.
++   We default to soft-float, EL. */
++#undef  MUSL_DYNAMIC_LINKER
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
++#endif
++#define MUSL_DYNAMIC_LINKER \
++  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+--- a/libitm/config/arm/hwcap.cc
++++ b/libitm/config/arm/hwcap.cc
+@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
+ 
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+ 
+ static void __attribute__((constructor))
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/202-musl_mips.patch b/trunk/toolchain/gcc/patches/4.8-linaro/202-musl_mips.patch
new file mode 100644
index 00000000..42a2648f
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/202-musl_mips.patch
@@ -0,0 +1,13 @@
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -18,3 +18,10 @@ along with GCC; see the file COPYING3.  
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/203-musl_powerpc.patch b/trunk/toolchain/gcc/patches/4.8-linaro/203-musl_powerpc.patch
new file mode 100644
index 00000000..7a70148f
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/203-musl_powerpc.patch
@@ -0,0 +1,100 @@
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -2122,6 +2122,10 @@ powerpc*-*-linux*)
+ 	    powerpc*-*-linux*paired*)
+ 		tm_file="${tm_file} rs6000/750cl.h" ;;
+ 	esac
++        case ${target} in
++            *-linux*-musl*)
++                enable_secureplt=yes ;;
++        esac
+ 	if test x${enable_secureplt} = xyes; then
+ 		tm_file="rs6000/secureplt.h ${tm_file}"
+ 	fi
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -354,17 +354,21 @@ extern int dot_symbols;
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ 
+ #undef  DEFAULT_ASM_ENDIAN
+ #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
+--- a/gcc/config/rs6000/secureplt.h
++++ b/gcc/config/rs6000/secureplt.h
+@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3.  
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -550,6 +550,9 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
+ #define CC1_SECURE_PLT_DEFAULT_SPEC ""
+ #endif
++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
++#define LINK_SECURE_PLT_DEFAULT_SPEC ""
++#endif
+ 
+ /* Pass -G xxx to the compiler and set correct endian mode.  */
+ #define	CC1_SPEC "%{G*} %(cc1_cpu)" \
+@@ -600,7 +603,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ 
+ /* Override the default target of the linker.  */
+ #define	LINK_TARGET_SPEC \
+-  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
++  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
++  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
+ 
+ /* Any specific OS flags.  */
+ #define LINK_OS_SPEC "\
+@@ -778,15 +782,18 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ 
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+@@ -912,6 +919,7 @@ ncrtn.o%s"
+   { "cc1_endian_little",	CC1_ENDIAN_LITTLE_SPEC },		\
+   { "cc1_endian_default",	CC1_ENDIAN_DEFAULT_SPEC },		\
+   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
++  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
+   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
+   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
+   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/204-musl_sh.patch b/trunk/toolchain/gcc/patches/4.8-linaro/204-musl_sh.patch
new file mode 100644
index 00000000..9a50c227
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/204-musl_sh.patch
@@ -0,0 +1,17 @@
+--- a/gcc/config/sh/linux.h
++++ b/gcc/config/sh/linux.h
+@@ -43,7 +43,14 @@ along with GCC; see the file COPYING3.  
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+ 
++#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
++#define MUSL_DYNAMIC_LINKER_E "eb"
++#else
++#define MUSL_DYNAMIC_LINKER_E
++#endif
++
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
+ 
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/205-musl_x86.patch b/trunk/toolchain/gcc/patches/4.8-linaro/205-musl_x86.patch
new file mode 100644
index 00000000..9a251133
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/205-musl_x86.patch
@@ -0,0 +1,48 @@
+--- a/gcc/config/i386/linux.h
++++ b/gcc/config/i386/linux.h
+@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.  
+ 
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+--- a/gcc/config/i386/linux64.h
++++ b/gcc/config/i386/linux64.h
+@@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+--- a/libitm/config/linux/x86/tls.h
++++ b/libitm/config/linux/x86/tls.h
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+    GLIBC has reserved words 10 through 13 for TM.  */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+ 
+ #include "config/generic/tls.h"
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+ 
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a
+ 
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+ 
+ #endif // LIBITM_X86_TLS_H
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/206-musl_aarch64.patch b/trunk/toolchain/gcc/patches/4.8-linaro/206-musl_aarch64.patch
new file mode 100644
index 00000000..9d75dc94
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/206-musl_aarch64.patch
@@ -0,0 +1,14 @@
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -21,7 +21,11 @@
+ #ifndef GCC_AARCH64_LINUX_H
+ #define GCC_AARCH64_LINUX_H
+ 
++/* The AArch64 port currently supports two dynamic linkers:
++   - ld-linux-aarch64.so.1 - GLIBC dynamic linker
++   - ld-musl-aarch64.so.1 - musl libc dynamic linker  */
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
+ 
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
+ 
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/207-musl_fixincludes.patch b/trunk/toolchain/gcc/patches/4.8-linaro/207-musl_fixincludes.patch
new file mode 100644
index 00000000..e6fa47f7
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/207-musl_fixincludes.patch
@@ -0,0 +1,12 @@
+--- a/fixincludes/mkfixinc.sh
++++ b/fixincludes/mkfixinc.sh
+@@ -19,7 +19,8 @@ case $machine in
+     powerpc-*-eabi*    | \
+     powerpc-*-rtems*   | \
+     powerpcle-*-eabisim* | \
+-    powerpcle-*-eabi* )
++    powerpcle-*-eabi* | \
++    *-musl* )
+ 	#  IF there is no include fixing,
+ 	#  THEN create a no-op fixer and exit
+ 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/208-musl_gomp.patch b/trunk/toolchain/gcc/patches/4.8-linaro/208-musl_gomp.patch
new file mode 100644
index 00000000..84c781ee
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/208-musl_gomp.patch
@@ -0,0 +1,11 @@
+--- a/libgomp/config/posix/time.c
++++ b/libgomp/config/posix/time.c
+@@ -28,6 +28,8 @@
+    The following implementation uses the most simple POSIX routines.
+    If present, POSIX 4 clocks should be used instead.  */
+ 
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/209-musl_libstdc++.patch b/trunk/toolchain/gcc/patches/4.8-linaro/209-musl_libstdc++.patch
new file mode 100644
index 00000000..6643935b
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/209-musl_libstdc++.patch
@@ -0,0 +1,26 @@
+--- a/libstdc++-v3/configure.host
++++ b/libstdc++-v3/configure.host
+@@ -264,6 +264,13 @@ case "${host_os}" in
+     os_include_dir="os/bsd/freebsd"
+     ;;
+   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++    # check for musl by target
++    case "${host_os}" in
++      *-musl*)
++        os_include_dir="os/generic"
++        ;;
++      *)
++
+     if [ "$uclibc" = "yes" ]; then
+       os_include_dir="os/uclibc"
+     elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@ case "${host_os}" in
+       os_include_dir="os/gnu-linux"
+     fi
+     ;;
++
++    esac
++    ;;
+   hpux*)
+     os_include_dir="os/hpux"
+     ;;
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/210-disable_libsanitizer_off_t_check.patch b/trunk/toolchain/gcc/patches/4.8-linaro/210-disable_libsanitizer_off_t_check.patch
new file mode 100644
index 00000000..56084692
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/210-disable_libsanitizer_off_t_check.patch
@@ -0,0 +1,11 @@
+--- a/libsanitizer/interception/interception_type_test.cc
++++ b/libsanitizer/interception/interception_type_test.cc
+@@ -31,7 +31,7 @@ COMPILER_CHECK(sizeof(OFF64_T) == sizeof
+ // rest (they depend on _FILE_OFFSET_BITS setting when building an application).
+ # if defined(__ANDROID__) || !defined _FILE_OFFSET_BITS || \
+   _FILE_OFFSET_BITS != 64
+-COMPILER_CHECK(sizeof(OFF_T) == sizeof(off_t));
++// COMPILER_CHECK(sizeof(OFF_T) == sizeof(off_t));
+ # endif
+ 
+ #endif
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/220-musl_mips_softfloat.patch b/trunk/toolchain/gcc/patches/4.8-linaro/220-musl_mips_softfloat.patch
new file mode 100644
index 00000000..b86adf59
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/220-musl_mips_softfloat.patch
@@ -0,0 +1,8 @@
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -24,4 +24,4 @@ along with GCC; see the file COPYING3.  
+ #else
+ #define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
+ #endif
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch b/trunk/toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch
new file mode 100644
index 00000000..7447dbd3
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch
@@ -0,0 +1,22 @@
+Index: gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h
+===================================================================
+--- gcc-linaro-4.8-2014.04.orig/gcc/config/mips/linux64.h	2014-10-23 15:52:48.999134219 -0700
++++ gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h	2014-10-23 15:59:19.815116979 -0700
+@@ -27,6 +27,16 @@
+ #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++
++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
+ #define GNU_USER_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
+-			 BIONIC_DYNAMIC_LINKERN32)
++			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/800-arm_v5te_no_ldrd_strd.patch b/trunk/toolchain/gcc/patches/4.8-linaro/800-arm_v5te_no_ldrd_strd.patch
new file mode 100644
index 00000000..efa9789c
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/800-arm_v5te_no_ldrd_strd.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/arm/arm.h
++++ b/gcc/config/arm/arm.h
+@@ -277,7 +277,7 @@ extern void (*arm_lang_output_object_att
+ /* Thumb-1 only.  */
+ #define TARGET_THUMB1_ONLY		(TARGET_THUMB1 && !arm_arch_notm)
+ 
+-#define TARGET_LDRD			(arm_arch5e && ARM_DOUBLEWORD_ALIGN \
++#define TARGET_LDRD			(arm_arch6 && ARM_DOUBLEWORD_ALIGN \
+                                          && !TARGET_THUMB1)
+ 
+ #define TARGET_CRC32			(arm_arch_crc)
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/810-arm-softfloat-libgcc.patch b/trunk/toolchain/gcc/patches/4.8-linaro/810-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..33cf8add
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,25 @@
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,10 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -55,8 +55,6 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
+-
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} \
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/820-libgcc_pic.patch b/trunk/toolchain/gcc/patches/4.8-linaro/820-libgcc_pic.patch
new file mode 100644
index 00000000..7a0ac735
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/820-libgcc_pic.patch
@@ -0,0 +1,36 @@
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -865,11 +865,12 @@ $(libgcov-objects): %$(objext): $(srcdir
+ 
+ # Static libraries.
+ libgcc.a: $(libgcc-objects)
++libgcc_pic.a: $(libgcc-s-objects)
+ libgcov.a: $(libgcov-objects)
+ libunwind.a: $(libunwind-objects)
+ libgcc_eh.a: $(libgcc-eh-objects)
+ 
+-libgcc.a libgcov.a libunwind.a libgcc_eh.a:
++libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
+ 	-rm -f $@
+ 
+ 	objects="$(objects)";					\
+@@ -891,7 +892,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E
+ endif
+ 
+ ifeq ($(enable_shared),yes)
+-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
++all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
+ ifneq ($(LIBUNWIND),)
+ all: libunwind$(SHLIB_EXT)
+ endif
+@@ -1058,6 +1059,10 @@ install-shared:
+ 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 
++	$(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
++	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++
+ 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/830-arm_unbreak_armv4t.patch b/trunk/toolchain/gcc/patches/4.8-linaro/830-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..37f8f2a5
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/830-arm_unbreak_armv4t.patch
@@ -0,0 +1,13 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/840-armv4_pass_fix-v4bx_to_ld.patch b/trunk/toolchain/gcc/patches/4.8-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
new file mode 100644
index 00000000..2283b83c
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
@@ -0,0 +1,19 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -94,10 +94,15 @@
+ #define MUSL_DYNAMIC_LINKER \
+   "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
+ 
++/* For armv4 we pass --fix-v4bx to linker to support EABI */
++#undef TARGET_FIX_V4BX_SPEC
++#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
++  "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+-#define LINK_SPEC BE8_LINK_SPEC						\
++#define LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC			\
+   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
+ 		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
+ 
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch b/trunk/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch
new file mode 100644
index 00000000..6934bc97
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch
@@ -0,0 +1,47 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -131,10 +131,6 @@
+ #define ENDFILE_SPEC \
+   LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
+ 
+-/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
+-   do not use -lfloat.  */
+-#undef LIBGCC_SPEC
+-
+ /* Clear the instruction cache from `beg' to `end'.  This is
+    implemented in lib1funcs.S, so ensure an error if this definition
+    is used.  */
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -51,6 +51,10 @@ see the files COPYING3 and COPYING.RUNTI
+ 	builtin_assert ("system=posix");			\
+     } while (0)
+ 
++#ifndef LIBGCC_SPEC
++#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
++#endif
++
+ /* Determine which dynamic linker to use depending on whether GLIBC or
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+--- a/libgcc/mkmap-symver.awk
++++ b/libgcc/mkmap-symver.awk
+@@ -132,5 +132,5 @@ function output(lib) {
+   else if (inherit[lib])
+     printf("} %s;\n", inherit[lib]);
+   else
+-    printf ("\n  local:\n\t*;\n};\n");
++    printf ("\n\t*;\n};\n");
+ }
+--- a/gcc/config/rs6000/linux.h
++++ b/gcc/config/rs6000/linux.h
+@@ -61,6 +61,9 @@
+ #undef  CPLUSPLUS_CPP_SPEC
+ #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
+ 
++#undef LIBGCC_SPEC
++#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
++
+ #undef  LINK_SHLIB_SPEC
+ #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
+ 
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/860-use_eh_frame.patch b/trunk/toolchain/gcc/patches/4.8-linaro/860-use_eh_frame.patch
new file mode 100644
index 00000000..1ac83fe4
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/860-use_eh_frame.patch
@@ -0,0 +1,42 @@
+--- a/libgcc/unwind-dw2-fde-dip.c
++++ b/libgcc/unwind-dw2-fde-dip.c
+@@ -46,33 +46,13 @@
+ #include "unwind-compat.h"
+ #include "gthr.h"
+ 
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+-	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__BIONIC__)
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__FreeBSD__) && __FreeBSD__ >= 7
+-# define ElfW __ElfN
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__OpenBSD__)
+-# define ElfW(type) Elf_##type
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(TARGET_DL_ITERATE_PHDR) \
+-    && defined(__sun__) && defined(__svr4__)
++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR)
+ # define USE_PT_GNU_EH_FRAME
++# ifdef __OpenBSD__
++#  define ElfW(type) Elf_##type
++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++#  define ElfW __ElfN
++# endif
+ #endif
+ 
+ #if defined(USE_PT_GNU_EH_FRAME)
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch b/trunk/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch
new file mode 100644
index 00000000..4b7fcbd5
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -17662,7 +17662,7 @@ rs6000_savres_strategy (rs6000_stack_t *
+   /* Define cutoff for using out-of-line functions to save registers.  */
+   if (DEFAULT_ABI == ABI_V4 || TARGET_ELF)
+     {
+-      if (!optimize_size)
++      if (1)
+ 	{
+ 	  strategy |= SAVE_INLINE_FPRS | REST_INLINE_FPRS;
+ 	  strategy |= SAVE_INLINE_GPRS | REST_INLINE_GPRS;
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/880-no_java_section.patch b/trunk/toolchain/gcc/patches/4.8-linaro/880-no_java_section.patch
new file mode 100644
index 00000000..def6c9f4
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/880-no_java_section.patch
@@ -0,0 +1,11 @@
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
+@@ -380,7 +380,7 @@ see the files COPYING3 and COPYING.RUNTI
+ /* If we have named section and we support weak symbols, then use the
+    .jcr section for recording java classes which need to be registered
+    at program start-up time.  */
+-#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
++#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
+ #ifndef JCR_SECTION_NAME
+ #define JCR_SECTION_NAME ".jcr"
+ #endif
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/900-bad-mips16-crt.patch b/trunk/toolchain/gcc/patches/4.8-linaro/900-bad-mips16-crt.patch
new file mode 100644
index 00000000..dd6e9dc8
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/900-bad-mips16-crt.patch
@@ -0,0 +1,9 @@
+--- a/libgcc/config/mips/t-mips16
++++ b/libgcc/config/mips/t-mips16
+@@ -43,3 +43,6 @@ SYNC_CFLAGS = -mno-mips16
+ 
+ # Version these symbols if building libgcc.so.
+ SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver
++
++CRTSTUFF_T_CFLAGS += -mno-mips16
++CRTSTUFF_T_CFLAGS_S += -mno-mips16
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch b/trunk/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch
new file mode 100644
index 00000000..5387f8e8
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch
@@ -0,0 +1,253 @@
+
+	This patch brings over a few features from MirBSD:
+	* -fhonour-copts
+	  If this option is not given, it's warned (depending
+	  on environment variables). This is to catch errors
+	  of misbuilt packages which override CFLAGS themselves.
+	* -Werror-maybe-reset
+	  Has the effect of -Wno-error if GCC_NO_WERROR is
+	  set and not '0', a no-operation otherwise. This is
+	  to be able to use -Werror in "make" but prevent
+	  GNU autoconf generated configure scripts from
+	  freaking out.
+	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
+	  the default for -O2/-Os, because they trigger gcc bugs
+	  and can delete code with security implications.
+
+	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
+	with copyright assignment to the FSF in effect.
+
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -104,6 +104,9 @@ static size_t include_cursor;
+ /* Whether any standard preincluded header has been preincluded.  */
+ static bool done_preinclude;
+ 
++/* Check if a port honours COPTS.  */
++static int honour_copts = 0;
++
+ static void handle_OPT_d (const char *);
+ static void set_std_cxx98 (int);
+ static void set_std_cxx11 (int);
+@@ -383,6 +386,9 @@ c_common_handle_option (size_t scode, co
+       cpp_opts->warn_endif_labels = value;
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      break;
++
+     case OPT_Winvalid_pch:
+       cpp_opts->warn_invalid_pch = value;
+       break;
+@@ -491,6 +497,12 @@ c_common_handle_option (size_t scode, co
+       flag_no_builtin = !value;
+       break;
+ 
++    case OPT_fhonour_copts:
++      if (c_language == clk_c) {
++        honour_copts++;
++      }
++      break;
++
+     case OPT_fconstant_string_class_:
+       constant_string_class_name = arg;
+       break;
+@@ -1027,6 +1039,47 @@ c_common_init (void)
+       return false;
+     }
+ 
++  if (c_language == clk_c) {
++    char *ev = getenv ("GCC_HONOUR_COPTS");
++    int evv;
++    if (ev == NULL)
++      evv = -1;
++    else if ((*ev == '0') || (*ev == '\0'))
++      evv = 0;
++    else if (*ev == '1')
++      evv = 1;
++    else if (*ev == '2')
++      evv = 2;
++    else if (*ev == 's')
++      evv = -1;
++    else {
++      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
++      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
++    }
++    if (evv == 1) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in lenient mode");
++        return false;
++      } else if (honour_copts != 1) {
++        warning (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++      }
++    } else if (evv == 2) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in strict mode");
++        return false;
++      } else if (honour_copts != 1) {
++        error ("someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++        return false;
++      }
++    } else if (evv == 0) {
++      if (honour_copts != 1)
++        inform (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++    }
++  }
++
+   return true;
+ }
+ 
+--- a/gcc/c-family/c.opt
++++ b/gcc/c-family/c.opt
+@@ -379,6 +379,10 @@ Werror-implicit-function-declaration
+ C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
+ This switch is deprecated; use -Werror=implicit-function-declaration instead
+ 
++Werror-maybe-reset
++C ObjC C++ ObjC++
++; Documented in common.opt
++
+ Wfloat-equal
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
+ Warn if testing floating point numbers for equality
+@@ -949,6 +953,9 @@ C++ ObjC++ Optimization Alias(fexception
+ fhonor-std
+ C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
+ 
++fhonour-copts
++C ObjC C++ ObjC++ RejectNegative
++
+ fhosted
+ C ObjC
+ Assume normal C execution environment
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -541,6 +541,10 @@ Werror=
+ Common Joined
+ Treat specified warning as error
+ 
++Werror-maybe-reset
++Common
++If environment variable GCC_NO_WERROR is set, act as -Wno-error
++
+ Wextra
+ Common Var(extra_warnings) Warning
+ Print extra (possibly unwanted) warnings
+@@ -1242,6 +1246,9 @@ fguess-branch-probability
+ Common Report Var(flag_guess_branch_prob) Optimization
+ Enable guessing of branch probabilities
+ 
++fhonour-copts
++Common RejectNegative
++
+ ; Nonzero means ignore `#ident' directives.  0 means handle them.
+ ; Generate position-independent code for executables if possible
+ ; On SVR4 targets, it also controls whether or not to emit a
+--- a/gcc/opts.c
++++ b/gcc/opts.c
+@@ -468,8 +468,6 @@ static const struct default_options defa
+     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
+ #endif
+     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
+@@ -489,6 +487,8 @@ static const struct default_options defa
+     { OPT_LEVELS_2_PLUS, OPT_fhoist_adjacent_loads, NULL, 1 },
+ 
+     /* -O3 optimizations.  */
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
+     /* Inlining of functions reducing size is a good idea with -Os
+@@ -1435,6 +1435,17 @@ common_handle_option (struct gcc_options
+ 			       opts, opts_set, loc, dc);
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++        char *ev = getenv ("GCC_NO_WERROR");
++        if ((ev != NULL) && (*ev != '0'))
++          warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wlarger_than_:
+       opts->x_larger_than_size = value;
+       opts->x_warn_larger_than = value != -1;
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -163,6 +163,11 @@ in older programs.  This warning is on b
+ Make all warnings into hard errors.  Source code which triggers warnings
+ will be rejected.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
+ @item -Wsystem-headers
+ @opindex Wsystem-headers
+ Issue warnings for code in system headers.  These are normally unhelpful
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -240,7 +240,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
+ -Wno-deprecated-declarations -Wdisabled-optimization  @gol
+ -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
+--Wno-endif-labels -Werror  -Werror=* @gol
++-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
+ -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
+ -Wformat-security  -Wformat-y2k @gol
+@@ -4817,6 +4817,22 @@ This option is only supported for C and 
+ @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
+ @option{-Wno-pointer-sign}.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
++ at item -fhonour-copts
++ at opindex fhonour-copts
++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
++given at least once, and warn if it is given more than once.
++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
++given exactly once.
++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
++is not given exactly once.
++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
++This flag and environment variable only affect the C language.
++
+ @item -Wstack-protector
+ @opindex Wstack-protector
+ @opindex Wno-stack-protector
+@@ -6928,7 +6944,7 @@ so, the first branch is redirected to ei
+ second branch or a point immediately following it, depending on whether
+ the condition is known to be true or false.
+ 
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+ 
+ @item -fsplit-wide-types
+ @opindex fsplit-wide-types
+--- a/gcc/java/jvspec.c
++++ b/gcc/java/jvspec.c
+@@ -626,6 +626,7 @@ lang_specific_pre_link (void)
+      class name.  Append dummy `.c' that can be stripped by set_input so %b
+      is correct.  */ 
+   set_input (concat (main_class_name, "main.c", NULL));
++  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
+   err = do_spec (jvgenmain_spec);
+   if (err == 0)
+     {
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch b/trunk/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch
new file mode 100644
index 00000000..09768f52
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch
@@ -0,0 +1,14 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -8029,7 +8029,10 @@ getenv_spec_function (int argc, const ch
+ 
+   value = getenv (argv[0]);
+   if (!value)
+-    fatal_error ("environment variable %qs not defined", argv[0]);
++    {
++      warning (0, "environment variable %qs not defined", argv[0]);
++      value = "";
++    }
+ 
+   /* We have to escape every character of the environment variable so
+      they are not interpreted as active spec characters.  A
diff --git a/trunk/toolchain/gcc/patches/4.8-linaro/930-fix-mips-noexecstack.patch b/trunk/toolchain/gcc/patches/4.8-linaro/930-fix-mips-noexecstack.patch
new file mode 100644
index 00000000..e72ed3a4
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.8-linaro/930-fix-mips-noexecstack.patch
@@ -0,0 +1,111 @@
+From da45b3fde60095756f5f6030f6012c23a3d34429 Mon Sep 17 00:00:00 2001
+From: Andrew McDonnell <bugs@andrewmcdonnell.net>
+Date: Fri, 3 Oct 2014 19:09:00 +0930
+Subject: Add .note.GNU-stack section
+
+See http://lists.busybox.net/pipermail/uclibc/2014-October/048671.html
+Below copied from https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02430.html
+
+Re: [Patch, MIPS] Add .note.GNU-stack section
+
+    From: Steve Ellcey <sellcey at mips dot com>
+
+On Wed, 2014-09-10 at 10:15 -0700, Eric Christopher wrote:
+>
+>
+> On Wed, Sep 10, 2014 at 9:27 AM, <pinskia@gmail.com> wrote:
+
+>         This works except you did not update the assembly files in
+>         libgcc or glibc. We (Cavium) have the same patch in our tree
+>         for a few released versions.
+
+> Mind just checking yours in then Andrew?
+
+> Thanks!
+> -eric
+
+I talked to Andrew about what files he changed in GCC and created and
+tested this new patch.  Andrew also mentioned changing some assembly
+files in glibc but I don't see any use of '.section .note.GNU-stack' in
+any assembly files in glibc (for any platform) so I wasn't planning on
+creating a glibc to add them to mips glibc assembly language files.
+
+OK to check in this patch?
+
+Steve Ellcey
+sellcey@mips.com
+
+
+
+2014-09-26  Steve Ellcey  <sellcey@mips.com>
+---
+ gcc/config/mips/mips.c          | 3 +++
+ libgcc/config/mips/crti.S       | 4 ++++
+ libgcc/config/mips/crtn.S       | 3 +++
+ libgcc/config/mips/mips16.S     | 4 ++++
+ libgcc/config/mips/vr4120-div.S | 4 ++++
+ 5 files changed, 18 insertions(+)
+
+--- a/gcc/config/mips/mips.c
++++ b/gcc/config/mips/mips.c
+@@ -18223,6 +18223,9 @@ mips_expand_vec_minmax (rtx target, rtx 
+ #undef TARGET_VECTORIZE_VEC_PERM_CONST_OK
+ #define TARGET_VECTORIZE_VEC_PERM_CONST_OK mips_vectorize_vec_perm_const_ok
+ 
++#undef TARGET_ASM_FILE_END
++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
++
+ struct gcc_target targetm = TARGET_INITIALIZER;
+ 
+ #include "gt-mips.h"
+--- a/libgcc/config/mips/crti.S
++++ b/libgcc/config/mips/crti.S
+@@ -21,6 +21,10 @@ a copy of the GCC Runtime Library Except
+ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ <http://www.gnu.org/licenses/>.  */
+ 
++
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++
+ /* 4 slots for argument spill area.  1 for cpreturn, 1 for stack.
+    Return spill offset of 40 and 20.  Aligned to 16 bytes for n32.  */
+ 
+--- a/libgcc/config/mips/crtn.S
++++ b/libgcc/config/mips/crtn.S
+@@ -21,6 +21,9 @@ a copy of the GCC Runtime Library Except
+ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ <http://www.gnu.org/licenses/>.  */
+ 
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++
+ /* 4 slots for argument spill area.  1 for cpreturn, 1 for stack.
+    Return spill offset of 40 and 20.  Aligned to 16 bytes for n32.  */
+ 
+--- a/libgcc/config/mips/mips16.S
++++ b/libgcc/config/mips/mips16.S
+@@ -27,6 +27,10 @@ see the files COPYING3 and COPYING.RUNTI
+    values using the soft-float calling convention, but do the actual
+    operation using the hard floating point instructions.  */
+ 
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++	.previous
++
+ #if defined _MIPS_SIM && (_MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIO64)
+ 
+ /* This file contains 32-bit assembly code.  */
+--- a/libgcc/config/mips/vr4120-div.S
++++ b/libgcc/config/mips/vr4120-div.S
+@@ -26,6 +26,10 @@ see the files COPYING3 and COPYING.RUNTI
+    -mfix-vr4120.  div and ddiv do not give the correct result when one
+    of the operands is negative.  */
+ 
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++	.previous
++
+ 	.set	nomips16
+ 
+ #define DIV								\
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/001-revert_register_mode_search.patch b/trunk/toolchain/gcc/patches/4.9-linaro/001-revert_register_mode_search.patch
new file mode 100644
index 00000000..5adb22ad
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/001-revert_register_mode_search.patch
@@ -0,0 +1,65 @@
+Revert of:
+
+commit 275035b56823b26d5fb7e90fad945b998648edf2
+Author: bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Thu Sep 5 14:09:07 2013 +0000
+
+        PR target/58139
+        * reginfo.c (choose_hard_reg_mode): Scan through all mode classes
+        looking for widest mode.
+
+
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202286 138bc75d-0d04-0410-961f-82ee72b054a4
+
+
+--- a/gcc/reginfo.c
++++ b/gcc/reginfo.c
+@@ -621,35 +621,40 @@ choose_hard_reg_mode (unsigned int regno
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
++  if (found_mode != VOIDmode)
++    return found_mode;
++
+   for (mode = GET_CLASS_NARROWEST_MODE (MODE_FLOAT);
+        mode != VOIDmode;
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
++  if (found_mode != VOIDmode)
++    return found_mode;
++
+   for (mode = GET_CLASS_NARROWEST_MODE (MODE_VECTOR_FLOAT);
+        mode != VOIDmode;
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
++  if (found_mode != VOIDmode)
++    return found_mode;
++
+   for (mode = GET_CLASS_NARROWEST_MODE (MODE_VECTOR_INT);
+        mode != VOIDmode;
+        mode = GET_MODE_WIDER_MODE (mode))
+     if ((unsigned) hard_regno_nregs[regno][mode] == nregs
+ 	&& HARD_REGNO_MODE_OK (regno, mode)
+-	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode))
+-	&& GET_MODE_SIZE (mode) > GET_MODE_SIZE (found_mode))
++	&& (! call_saved || ! HARD_REGNO_CALL_PART_CLOBBERED (regno, mode)))
+       found_mode = mode;
+ 
+   if (found_mode != VOIDmode)
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/002-case_insensitive.patch b/trunk/toolchain/gcc/patches/4.9-linaro/002-case_insensitive.patch
new file mode 100644
index 00000000..b3d2dbe2
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/002-case_insensitive.patch
@@ -0,0 +1,14 @@
+--- a/include/filenames.h
++++ b/include/filenames.h
+@@ -43,11 +43,6 @@ extern "C" {
+ #  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
+ #  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
+ #else /* not DOSish */
+-#  if defined(__APPLE__)
+-#    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
+-#      define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
+-#    endif
+-#  endif /* __APPLE__ */
+ #  define HAS_DRIVE_SPEC(f) (0)
+ #  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
+ #  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/010-documentation.patch b/trunk/toolchain/gcc/patches/4.9-linaro/010-documentation.patch
new file mode 100644
index 00000000..b8adce83
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/010-documentation.patch
@@ -0,0 +1,23 @@
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -2842,18 +2842,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
+ doc/gccint.info: $(TEXI_GCCINT_FILES)
+ doc/cppinternals.info: $(TEXI_CPPINT_FILES)
+ 
+-doc/%.info: %.texi
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/%.info:
+ 
+ # Duplicate entry to handle renaming of gccinstall.info
+-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
+-	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
+-			-I $(gcc_docdir)/include -o $@ $<; \
+-	fi
++doc/gccinstall.info:
+ 
+ doc/cpp.dvi: $(TEXI_CPP_FILES)
+ doc/gcc.dvi: $(TEXI_GCC_FILES)
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/100-uclibc-conf.patch b/trunk/toolchain/gcc/patches/4.9-linaro/100-uclibc-conf.patch
new file mode 100644
index 00000000..ff9ad94f
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/100-uclibc-conf.patch
@@ -0,0 +1,33 @@
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+--- a/libjava/classpath/ltconfig
++++ b/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/200-musl_config.patch b/trunk/toolchain/gcc/patches/4.9-linaro/200-musl_config.patch
new file mode 100644
index 00000000..ce8865fa
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/200-musl_config.patch
@@ -0,0 +1,199 @@
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -594,7 +594,7 @@ case ${target} in
+ esac
+ 
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+ 
+ # 32-bit x86 processors supported by --with-arch=.  Each processor
+ # MUST be separated by exactly one space.
+@@ -719,6 +719,9 @@ case ${target} in
+     *-*-*uclibc*)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+       ;;
++    *-*-*musl*)
++      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++      ;;
+     *)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+       ;;
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
+ #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
+ #endif
+ 
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
+@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+ 
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
+-  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
++  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+ 
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -84,21 +89,92 @@ see the files COPYING3 and COPYING.RUNTI
+ 
+ #define GNU_USER_DYNAMIC_LINKER						\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
+-			 BIONIC_DYNAMIC_LINKER)
++			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+-			 BIONIC_DYNAMIC_LINKER32)
++			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+-			 BIONIC_DYNAMIC_LINKER64)
++			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+-			 BIONIC_DYNAMIC_LINKERX32)
++			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+ 
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
+ 
++/* musl avoids problematic includes by rearranging the include directories.
++ * Unfortunately, this is mostly duplicated from cppdefault.c */
++#if DEFAULT_LIBC == LIBC_MUSL
++#define INCLUDE_DEFAULTS_MUSL_GPP			\
++    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
++    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
++    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
++
++#ifdef LOCAL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
++    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
++    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_LOCAL
++#endif
++
++#ifdef PREFIX_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
++    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_PREFIX
++#endif
++
++#ifdef CROSS_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_CROSS			\
++    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#ifdef TOOL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_TOOL			\
++    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_TOOL
++#endif
++
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
++    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_NATIVE
++#endif
++
++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
++# undef INCLUDE_DEFAULTS_MUSL_LOCAL
++# define INCLUDE_DEFAULTS_MUSL_LOCAL
++# undef INCLUDE_DEFAULTS_MUSL_NATIVE
++# define INCLUDE_DEFAULTS_MUSL_NATIVE
++#else
++# undef INCLUDE_DEFAULTS_MUSL_CROSS
++# define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#undef INCLUDE_DEFAULTS
++#define INCLUDE_DEFAULTS				\
++  {							\
++    INCLUDE_DEFAULTS_MUSL_GPP				\
++    INCLUDE_DEFAULTS_MUSL_PREFIX			\
++    INCLUDE_DEFAULTS_MUSL_CROSS				\
++    INCLUDE_DEFAULTS_MUSL_TOOL				\
++    INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
++    { 0, 0, 0, 0, 0, 0 }				\
++  }
++#endif
++
+ #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
+ /* This is a *uclinux* target.  We don't define below macros to normal linux
+    versions, because doing so would require *uclinux* targets to include
+--- a/gcc/config/linux.opt
++++ b/gcc/config/linux.opt
+@@ -30,3 +30,7 @@ Use GNU C library
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__	/* BeOS */
+ #define __SIZE_T__	/* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -197,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+   || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t;
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/201-musl_arm.patch b/trunk/toolchain/gcc/patches/4.9-linaro/201-musl_arm.patch
new file mode 100644
index 00000000..f39ff524
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/201-musl_arm.patch
@@ -0,0 +1,40 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -77,6 +77,23 @@
+     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
+     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+ 
++/* For ARM musl currently supports four dynamic linkers:
++   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
++   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
++   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
++   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
++   musl does not support the legacy OABI mode.
++   All the dynamic linkers live in /lib.
++   We default to soft-float, EL. */
++#undef  MUSL_DYNAMIC_LINKER
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
++#endif
++#define MUSL_DYNAMIC_LINKER \
++  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+--- a/libitm/config/arm/hwcap.cc
++++ b/libitm/config/arm/hwcap.cc
+@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
+ 
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+ 
+ static void __attribute__((constructor))
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/202-musl_mips.patch b/trunk/toolchain/gcc/patches/4.9-linaro/202-musl_mips.patch
new file mode 100644
index 00000000..2a8836e8
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/202-musl_mips.patch
@@ -0,0 +1,13 @@
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -23,3 +23,10 @@ along with GCC; see the file COPYING3.  
+ #undef UCLIBC_DYNAMIC_LINKER
+ #define UCLIBC_DYNAMIC_LINKER \
+   "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/203-musl_powerpc.patch b/trunk/toolchain/gcc/patches/4.9-linaro/203-musl_powerpc.patch
new file mode 100644
index 00000000..93087bbe
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/203-musl_powerpc.patch
@@ -0,0 +1,100 @@
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -2334,6 +2334,10 @@ powerpc*-*-linux*)
+ 	    powerpc*-*-linux*paired*)
+ 		tm_file="${tm_file} rs6000/750cl.h" ;;
+ 	esac
++        case ${target} in
++            *-linux*-musl*)
++                enable_secureplt=yes ;;
++        esac
+ 	if test x${enable_secureplt} = xyes; then
+ 		tm_file="rs6000/secureplt.h ${tm_file}"
+ 	fi
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -375,17 +375,21 @@ extern int dot_symbols;
+ #endif
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ 
+ #undef  DEFAULT_ASM_ENDIAN
+ #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
+--- a/gcc/config/rs6000/secureplt.h
++++ b/gcc/config/rs6000/secureplt.h
+@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3.  
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -537,6 +537,9 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
+ #define CC1_SECURE_PLT_DEFAULT_SPEC ""
+ #endif
++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
++#define LINK_SECURE_PLT_DEFAULT_SPEC ""
++#endif
+ 
+ /* Pass -G xxx to the compiler.  */
+ #define	CC1_SPEC "%{G*} %(cc1_cpu)" \
+@@ -585,7 +588,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ 
+ /* Override the default target of the linker.  */
+ #define	LINK_TARGET_SPEC \
+-  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
++  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
++  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
+ 
+ /* Any specific OS flags.  */
+ #define LINK_OS_SPEC "\
+@@ -763,15 +767,18 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ 
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+@@ -894,6 +901,7 @@ ncrtn.o%s"
+   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
+   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
+   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
++  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
+   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
+   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
+   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/204-musl_sh.patch b/trunk/toolchain/gcc/patches/4.9-linaro/204-musl_sh.patch
new file mode 100644
index 00000000..9a50c227
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/204-musl_sh.patch
@@ -0,0 +1,17 @@
+--- a/gcc/config/sh/linux.h
++++ b/gcc/config/sh/linux.h
+@@ -43,7 +43,14 @@ along with GCC; see the file COPYING3.  
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+ 
++#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
++#define MUSL_DYNAMIC_LINKER_E "eb"
++#else
++#define MUSL_DYNAMIC_LINKER_E
++#endif
++
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
+ 
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch b/trunk/toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch
new file mode 100644
index 00000000..9a251133
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch
@@ -0,0 +1,48 @@
+--- a/gcc/config/i386/linux.h
++++ b/gcc/config/i386/linux.h
+@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.  
+ 
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+--- a/gcc/config/i386/linux64.h
++++ b/gcc/config/i386/linux64.h
+@@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+--- a/libitm/config/linux/x86/tls.h
++++ b/libitm/config/linux/x86/tls.h
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+    GLIBC has reserved words 10 through 13 for TM.  */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+ 
+ #include "config/generic/tls.h"
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+ 
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a
+ 
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+ 
+ #endif // LIBITM_X86_TLS_H
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/206-musl_aarch64.patch b/trunk/toolchain/gcc/patches/4.9-linaro/206-musl_aarch64.patch
new file mode 100644
index 00000000..caf42bf4
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/206-musl_aarch64.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -23,6 +23,8 @@
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+ 
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
++
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/207-musl_fixincludes.patch b/trunk/toolchain/gcc/patches/4.9-linaro/207-musl_fixincludes.patch
new file mode 100644
index 00000000..e6fa47f7
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/207-musl_fixincludes.patch
@@ -0,0 +1,12 @@
+--- a/fixincludes/mkfixinc.sh
++++ b/fixincludes/mkfixinc.sh
+@@ -19,7 +19,8 @@ case $machine in
+     powerpc-*-eabi*    | \
+     powerpc-*-rtems*   | \
+     powerpcle-*-eabisim* | \
+-    powerpcle-*-eabi* )
++    powerpcle-*-eabi* | \
++    *-musl* )
+ 	#  IF there is no include fixing,
+ 	#  THEN create a no-op fixer and exit
+ 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/208-musl_gomp.patch b/trunk/toolchain/gcc/patches/4.9-linaro/208-musl_gomp.patch
new file mode 100644
index 00000000..84c781ee
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/208-musl_gomp.patch
@@ -0,0 +1,11 @@
+--- a/libgomp/config/posix/time.c
++++ b/libgomp/config/posix/time.c
+@@ -28,6 +28,8 @@
+    The following implementation uses the most simple POSIX routines.
+    If present, POSIX 4 clocks should be used instead.  */
+ 
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/209-musl_libstdc++.patch b/trunk/toolchain/gcc/patches/4.9-linaro/209-musl_libstdc++.patch
new file mode 100644
index 00000000..6643935b
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/209-musl_libstdc++.patch
@@ -0,0 +1,26 @@
+--- a/libstdc++-v3/configure.host
++++ b/libstdc++-v3/configure.host
+@@ -264,6 +264,13 @@ case "${host_os}" in
+     os_include_dir="os/bsd/freebsd"
+     ;;
+   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++    # check for musl by target
++    case "${host_os}" in
++      *-musl*)
++        os_include_dir="os/generic"
++        ;;
++      *)
++
+     if [ "$uclibc" = "yes" ]; then
+       os_include_dir="os/uclibc"
+     elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@ case "${host_os}" in
+       os_include_dir="os/gnu-linux"
+     fi
+     ;;
++
++    esac
++    ;;
+   hpux*)
+     os_include_dir="os/hpux"
+     ;;
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/210-disable_libsanitizer_off_t_check.patch b/trunk/toolchain/gcc/patches/4.9-linaro/210-disable_libsanitizer_off_t_check.patch
new file mode 100644
index 00000000..56084692
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/210-disable_libsanitizer_off_t_check.patch
@@ -0,0 +1,11 @@
+--- a/libsanitizer/interception/interception_type_test.cc
++++ b/libsanitizer/interception/interception_type_test.cc
+@@ -31,7 +31,7 @@ COMPILER_CHECK(sizeof(OFF64_T) == sizeof
+ // rest (they depend on _FILE_OFFSET_BITS setting when building an application).
+ # if defined(__ANDROID__) || !defined _FILE_OFFSET_BITS || \
+   _FILE_OFFSET_BITS != 64
+-COMPILER_CHECK(sizeof(OFF_T) == sizeof(off_t));
++// COMPILER_CHECK(sizeof(OFF_T) == sizeof(off_t));
+ # endif
+ 
+ #endif
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/220-musl_mips_softfloat.patch b/trunk/toolchain/gcc/patches/4.9-linaro/220-musl_mips_softfloat.patch
new file mode 100644
index 00000000..8a63fd1c
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/220-musl_mips_softfloat.patch
@@ -0,0 +1,8 @@
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -29,4 +29,4 @@ along with GCC; see the file COPYING3.  
+ #else
+ #define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
+ #endif
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch b/trunk/toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch
new file mode 100644
index 00000000..7447dbd3
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch
@@ -0,0 +1,22 @@
+Index: gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h
+===================================================================
+--- gcc-linaro-4.8-2014.04.orig/gcc/config/mips/linux64.h	2014-10-23 15:52:48.999134219 -0700
++++ gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h	2014-10-23 15:59:19.815116979 -0700
+@@ -27,6 +27,16 @@
+ #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++
++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
+ #define GNU_USER_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
+-			 BIONIC_DYNAMIC_LINKERN32)
++			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/800-arm_v5te_no_ldrd_strd.patch b/trunk/toolchain/gcc/patches/4.9-linaro/800-arm_v5te_no_ldrd_strd.patch
new file mode 100644
index 00000000..59022e3b
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/800-arm_v5te_no_ldrd_strd.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/arm/arm.h
++++ b/gcc/config/arm/arm.h
+@@ -282,7 +282,7 @@ extern void (*arm_lang_output_object_att
+ /* Thumb-1 only.  */
+ #define TARGET_THUMB1_ONLY		(TARGET_THUMB1 && !arm_arch_notm)
+ 
+-#define TARGET_LDRD			(arm_arch5e && ARM_DOUBLEWORD_ALIGN \
++#define TARGET_LDRD			(arm_arch6 && ARM_DOUBLEWORD_ALIGN \
+                                          && !TARGET_THUMB1)
+ 
+ #define TARGET_CRC32			(arm_arch_crc)
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/810-arm-softfloat-libgcc.patch b/trunk/toolchain/gcc/patches/4.9-linaro/810-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..1d06f5b2
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,25 @@
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,10 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,8 +60,6 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
+-
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} \
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/820-libgcc_pic.patch b/trunk/toolchain/gcc/patches/4.9-linaro/820-libgcc_pic.patch
new file mode 100644
index 00000000..ebd87f58
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/820-libgcc_pic.patch
@@ -0,0 +1,36 @@
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -881,11 +881,12 @@ $(libgcov-driver-objects): %$(objext): $
+ 
+ # Static libraries.
+ libgcc.a: $(libgcc-objects)
++libgcc_pic.a: $(libgcc-s-objects)
+ libgcov.a: $(libgcov-objects)
+ libunwind.a: $(libunwind-objects)
+ libgcc_eh.a: $(libgcc-eh-objects)
+ 
+-libgcc.a libgcov.a libunwind.a libgcc_eh.a:
++libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
+ 	-rm -f $@
+ 
+ 	objects="$(objects)";					\
+@@ -907,7 +908,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E
+ endif
+ 
+ ifeq ($(enable_shared),yes)
+-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
++all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
+ ifneq ($(LIBUNWIND),)
+ all: libunwind$(SHLIB_EXT)
+ endif
+@@ -1090,6 +1091,10 @@ install-shared:
+ 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+ 
++	$(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
++	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
++
+ 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/830-arm_unbreak_armv4t.patch b/trunk/toolchain/gcc/patches/4.9-linaro/830-arm_unbreak_armv4t.patch
new file mode 100644
index 00000000..37f8f2a5
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/830-arm_unbreak_armv4t.patch
@@ -0,0 +1,13 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/840-armv4_pass_fix-v4bx_to_ld.patch b/trunk/toolchain/gcc/patches/4.9-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
new file mode 100644
index 00000000..cb1fb982
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/840-armv4_pass_fix-v4bx_to_ld.patch
@@ -0,0 +1,19 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -94,10 +94,15 @@
+ #define MUSL_DYNAMIC_LINKER \
+   "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
+ 
++/* For armv4 we pass --fix-v4bx to linker to support EABI */
++#undef TARGET_FIX_V4BX_SPEC
++#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
++  "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+-#define LINK_SPEC EABI_LINK_SPEC					\
++#define LINK_SPEC EABI_LINK_SPEC TARGET_FIX_V4BX_SPEC			\
+   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
+ 		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
+ 
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/850-use_shared_libgcc.patch b/trunk/toolchain/gcc/patches/4.9-linaro/850-use_shared_libgcc.patch
new file mode 100644
index 00000000..cef79d82
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/850-use_shared_libgcc.patch
@@ -0,0 +1,47 @@
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -131,10 +131,6 @@
+ #define ENDFILE_SPEC \
+   LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
+ 
+-/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
+-   do not use -lfloat.  */
+-#undef LIBGCC_SPEC
+-
+ /* Clear the instruction cache from `beg' to `end'.  This is
+    implemented in lib1funcs.S, so ensure an error if this definition
+    is used.  */
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -51,6 +51,10 @@ see the files COPYING3 and COPYING.RUNTI
+ 	builtin_assert ("system=posix");			\
+     } while (0)
+ 
++#ifndef LIBGCC_SPEC
++#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
++#endif
++
+ /* Determine which dynamic linker to use depending on whether GLIBC or
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+--- a/libgcc/mkmap-symver.awk
++++ b/libgcc/mkmap-symver.awk
+@@ -132,5 +132,5 @@ function output(lib) {
+   else if (inherit[lib])
+     printf("} %s;\n", inherit[lib]);
+   else
+-    printf ("\n  local:\n\t*;\n};\n");
++    printf ("\n\t*;\n};\n");
+ }
+--- a/gcc/config/rs6000/linux.h
++++ b/gcc/config/rs6000/linux.h
+@@ -62,6 +62,9 @@
+ #undef  CPLUSPLUS_CPP_SPEC
+ #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
+ 
++#undef LIBGCC_SPEC
++#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
++
+ #undef  LINK_SHLIB_SPEC
+ #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
+ 
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/860-use_eh_frame.patch b/trunk/toolchain/gcc/patches/4.9-linaro/860-use_eh_frame.patch
new file mode 100644
index 00000000..1ac83fe4
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/860-use_eh_frame.patch
@@ -0,0 +1,42 @@
+--- a/libgcc/unwind-dw2-fde-dip.c
++++ b/libgcc/unwind-dw2-fde-dip.c
+@@ -46,33 +46,13 @@
+ #include "unwind-compat.h"
+ #include "gthr.h"
+ 
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+-	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__BIONIC__)
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__FreeBSD__) && __FreeBSD__ >= 7
+-# define ElfW __ElfN
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__OpenBSD__)
+-# define ElfW(type) Elf_##type
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(TARGET_DL_ITERATE_PHDR) \
+-    && defined(__sun__) && defined(__svr4__)
++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR)
+ # define USE_PT_GNU_EH_FRAME
++# ifdef __OpenBSD__
++#  define ElfW(type) Elf_##type
++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++#  define ElfW __ElfN
++# endif
+ #endif
+ 
+ #if defined(USE_PT_GNU_EH_FRAME)
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/870-ppc_no_crtsavres.patch b/trunk/toolchain/gcc/patches/4.9-linaro/870-ppc_no_crtsavres.patch
new file mode 100644
index 00000000..93bb3e82
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/870-ppc_no_crtsavres.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -20853,7 +20853,7 @@ rs6000_savres_strategy (rs6000_stack_t *
+   /* Define cutoff for using out-of-line functions to save registers.  */
+   if (DEFAULT_ABI == ABI_V4 || TARGET_ELF)
+     {
+-      if (!optimize_size)
++      if (1)
+ 	{
+ 	  strategy |= SAVE_INLINE_FPRS | REST_INLINE_FPRS;
+ 	  strategy |= SAVE_INLINE_GPRS | REST_INLINE_GPRS;
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/880-no_java_section.patch b/trunk/toolchain/gcc/patches/4.9-linaro/880-no_java_section.patch
new file mode 100644
index 00000000..def6c9f4
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/880-no_java_section.patch
@@ -0,0 +1,11 @@
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
+@@ -380,7 +380,7 @@ see the files COPYING3 and COPYING.RUNTI
+ /* If we have named section and we support weak symbols, then use the
+    .jcr section for recording java classes which need to be registered
+    at program start-up time.  */
+-#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
++#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK
+ #ifndef JCR_SECTION_NAME
+ #define JCR_SECTION_NAME ".jcr"
+ #endif
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/900-bad-mips16-crt.patch b/trunk/toolchain/gcc/patches/4.9-linaro/900-bad-mips16-crt.patch
new file mode 100644
index 00000000..dd6e9dc8
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/900-bad-mips16-crt.patch
@@ -0,0 +1,9 @@
+--- a/libgcc/config/mips/t-mips16
++++ b/libgcc/config/mips/t-mips16
+@@ -43,3 +43,6 @@ SYNC_CFLAGS = -mno-mips16
+ 
+ # Version these symbols if building libgcc.so.
+ SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver
++
++CRTSTUFF_T_CFLAGS += -mno-mips16
++CRTSTUFF_T_CFLAGS_S += -mno-mips16
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/910-mbsd_multi.patch b/trunk/toolchain/gcc/patches/4.9-linaro/910-mbsd_multi.patch
new file mode 100644
index 00000000..f14f0858
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/910-mbsd_multi.patch
@@ -0,0 +1,232 @@
+
+	This patch brings over a few features from MirBSD:
+	* -fhonour-copts
+	  If this option is not given, it's warned (depending
+	  on environment variables). This is to catch errors
+	  of misbuilt packages which override CFLAGS themselves.
+	* -Werror-maybe-reset
+	  Has the effect of -Wno-error if GCC_NO_WERROR is
+	  set and not '0', a no-operation otherwise. This is
+	  to be able to use -Werror in "make" but prevent
+	  GNU autoconf generated configure scripts from
+	  freaking out.
+
+	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
+	with copyright assignment to the FSF in effect.
+
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -105,6 +105,9 @@ static size_t include_cursor;
+ /* Whether any standard preincluded header has been preincluded.  */
+ static bool done_preinclude;
+ 
++/* Check if a port honours COPTS.  */
++static int honour_copts = 0;
++
+ static void handle_OPT_d (const char *);
+ static void set_std_cxx98 (int);
+ static void set_std_cxx11 (int);
+@@ -384,6 +387,9 @@ c_common_handle_option (size_t scode, co
+       cpp_opts->warn_endif_labels = value;
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      break;
++
+     case OPT_Winvalid_pch:
+       cpp_opts->warn_invalid_pch = value;
+       break;
+@@ -492,6 +498,12 @@ c_common_handle_option (size_t scode, co
+       flag_no_builtin = !value;
+       break;
+ 
++    case OPT_fhonour_copts:
++      if (c_language == clk_c) {
++        honour_copts++;
++      }
++      break;
++
+     case OPT_fconstant_string_class_:
+       constant_string_class_name = arg;
+       break;
+@@ -1048,6 +1060,47 @@ c_common_init (void)
+       return false;
+     }
+ 
++  if (c_language == clk_c) {
++    char *ev = getenv ("GCC_HONOUR_COPTS");
++    int evv;
++    if (ev == NULL)
++      evv = -1;
++    else if ((*ev == '0') || (*ev == '\0'))
++      evv = 0;
++    else if (*ev == '1')
++      evv = 1;
++    else if (*ev == '2')
++      evv = 2;
++    else if (*ev == 's')
++      evv = -1;
++    else {
++      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
++      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
++    }
++    if (evv == 1) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in lenient mode");
++        return false;
++      } else if (honour_copts != 1) {
++        warning (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++      }
++    } else if (evv == 2) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in strict mode");
++        return false;
++      } else if (honour_copts != 1) {
++        error ("someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++        return false;
++      }
++    } else if (evv == 0) {
++      if (honour_copts != 1)
++        inform (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++    }
++  }
++
+   return true;
+ }
+ 
+--- a/gcc/c-family/c.opt
++++ b/gcc/c-family/c.opt
+@@ -391,6 +391,10 @@ Wfloat-conversion
+ C ObjC C++ ObjC++ Var(warn_float_conversion) LangEnabledBy(C ObjC C++ ObjC++,Wconversion)
+ Warn for implicit type conversions that cause loss of floating point precision
+ 
++Werror-maybe-reset
++C ObjC C++ ObjC++
++; Documented in common.opt
++
+ Wfloat-equal
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
+ Warn if testing floating point numbers for equality
+@@ -972,6 +976,9 @@ C++ ObjC++ Optimization Alias(fexception
+ fhonor-std
+ C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
+ 
++fhonour-copts
++C ObjC C++ ObjC++ RejectNegative
++
+ fhosted
+ C ObjC
+ Assume normal C execution environment
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -549,6 +549,10 @@ Werror=
+ Common Joined
+ Treat specified warning as error
+ 
++Werror-maybe-reset
++Common
++If environment variable GCC_NO_WERROR is set, act as -Wno-error
++
+ Wextra
+ Common Var(extra_warnings) Warning
+ Print extra (possibly unwanted) warnings
+@@ -1287,6 +1291,9 @@ fguess-branch-probability
+ Common Report Var(flag_guess_branch_prob) Optimization
+ Enable guessing of branch probabilities
+ 
++fhonour-copts
++Common RejectNegative
++
+ ; Nonzero means ignore `#ident' directives.  0 means handle them.
+ ; Generate position-independent code for executables if possible
+ ; On SVR4 targets, it also controls whether or not to emit a
+--- a/gcc/opts.c
++++ b/gcc/opts.c
+@@ -1536,6 +1536,17 @@ common_handle_option (struct gcc_options
+ 			       opts, opts_set, loc, dc);
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++        char *ev = getenv ("GCC_NO_WERROR");
++        if ((ev != NULL) && (*ev != '0'))
++          warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wlarger_than_:
+       opts->x_larger_than_size = value;
+       opts->x_warn_larger_than = value != -1;
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -163,6 +163,11 @@ in older programs.  This warning is on b
+ Make all warnings into hard errors.  Source code which triggers warnings
+ will be rejected.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
+ @item -Wsystem-headers
+ @opindex Wsystem-headers
+ Issue warnings for code in system headers.  These are normally unhelpful
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -243,7 +243,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wconversion -Wcoverage-mismatch -Wdate-time -Wdelete-incomplete -Wno-cpp  @gol
+ -Wno-deprecated -Wno-deprecated-declarations -Wdisabled-optimization  @gol
+ -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
+--Wno-endif-labels -Werror  -Werror=* @gol
++-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
+ -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
+ -Wformat-security  -Wformat-y2k @gol
+@@ -5042,6 +5042,22 @@ This option is only supported for C and 
+ @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
+ @option{-Wno-pointer-sign}.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
++ at item -fhonour-copts
++ at opindex fhonour-copts
++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
++given at least once, and warn if it is given more than once.
++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
++given exactly once.
++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
++is not given exactly once.
++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
++This flag and environment variable only affect the C language.
++
+ @item -Wstack-protector
+ @opindex Wstack-protector
+ @opindex Wno-stack-protector
+@@ -7189,7 +7205,7 @@ so, the first branch is redirected to ei
+ second branch or a point immediately following it, depending on whether
+ the condition is known to be true or false.
+ 
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+ 
+ @item -fsplit-wide-types
+ @opindex fsplit-wide-types
+--- a/gcc/java/jvspec.c
++++ b/gcc/java/jvspec.c
+@@ -626,6 +626,7 @@ lang_specific_pre_link (void)
+      class name.  Append dummy `.c' that can be stripped by set_input so %b
+      is correct.  */ 
+   set_input (concat (main_class_name, "main.c", NULL));
++  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
+   err = do_spec (jvgenmain_spec);
+   if (err == 0)
+     {
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/920-specs_nonfatal_getenv.patch b/trunk/toolchain/gcc/patches/4.9-linaro/920-specs_nonfatal_getenv.patch
new file mode 100644
index 00000000..1c0b34e6
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/920-specs_nonfatal_getenv.patch
@@ -0,0 +1,14 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -8106,7 +8106,10 @@ getenv_spec_function (int argc, const ch
+ 
+   value = getenv (argv[0]);
+   if (!value)
+-    fatal_error ("environment variable %qs not defined", argv[0]);
++    {
++      warning (0, "environment variable %qs not defined", argv[0]);
++      value = "";
++    }
+ 
+   /* We have to escape every character of the environment variable so
+      they are not interpreted as active spec characters.  A
diff --git a/trunk/toolchain/gcc/patches/4.9-linaro/930-fix-mips-noexecstack.patch b/trunk/toolchain/gcc/patches/4.9-linaro/930-fix-mips-noexecstack.patch
new file mode 100644
index 00000000..72bacc13
--- /dev/null
+++ b/trunk/toolchain/gcc/patches/4.9-linaro/930-fix-mips-noexecstack.patch
@@ -0,0 +1,111 @@
+From da45b3fde60095756f5f6030f6012c23a3d34429 Mon Sep 17 00:00:00 2001
+From: Andrew McDonnell <bugs@andrewmcdonnell.net>
+Date: Fri, 3 Oct 2014 19:09:00 +0930
+Subject: Add .note.GNU-stack section
+
+See http://lists.busybox.net/pipermail/uclibc/2014-October/048671.html
+Below copied from https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02430.html
+
+Re: [Patch, MIPS] Add .note.GNU-stack section
+
+    From: Steve Ellcey <sellcey at mips dot com>
+
+On Wed, 2014-09-10 at 10:15 -0700, Eric Christopher wrote:
+>
+>
+> On Wed, Sep 10, 2014 at 9:27 AM, <pinskia@gmail.com> wrote:
+
+>         This works except you did not update the assembly files in
+>         libgcc or glibc. We (Cavium) have the same patch in our tree
+>         for a few released versions.
+
+> Mind just checking yours in then Andrew?
+
+> Thanks!
+> -eric
+
+I talked to Andrew about what files he changed in GCC and created and
+tested this new patch.  Andrew also mentioned changing some assembly
+files in glibc but I don't see any use of '.section .note.GNU-stack' in
+any assembly files in glibc (for any platform) so I wasn't planning on
+creating a glibc to add them to mips glibc assembly language files.
+
+OK to check in this patch?
+
+Steve Ellcey
+sellcey@mips.com
+
+
+
+2014-09-26  Steve Ellcey  <sellcey@mips.com>
+---
+ gcc/config/mips/mips.c          | 3 +++
+ libgcc/config/mips/crti.S       | 4 ++++
+ libgcc/config/mips/crtn.S       | 3 +++
+ libgcc/config/mips/mips16.S     | 4 ++++
+ libgcc/config/mips/vr4120-div.S | 4 ++++
+ 5 files changed, 18 insertions(+)
+
+--- a/gcc/config/mips/mips.c
++++ b/gcc/config/mips/mips.c
+@@ -19134,6 +19134,9 @@ mips_atomic_assign_expand_fenv (tree *ho
+ #undef TARGET_ATOMIC_ASSIGN_EXPAND_FENV
+ #define TARGET_ATOMIC_ASSIGN_EXPAND_FENV mips_atomic_assign_expand_fenv
+ 
++#undef TARGET_ASM_FILE_END
++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
++
+ struct gcc_target targetm = TARGET_INITIALIZER;
+ 
+ #include "gt-mips.h"
+--- a/libgcc/config/mips/crti.S
++++ b/libgcc/config/mips/crti.S
+@@ -21,6 +21,10 @@ a copy of the GCC Runtime Library Except
+ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ <http://www.gnu.org/licenses/>.  */
+ 
++
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++
+ /* 4 slots for argument spill area.  1 for cpreturn, 1 for stack.
+    Return spill offset of 40 and 20.  Aligned to 16 bytes for n32.  */
+ 
+--- a/libgcc/config/mips/crtn.S
++++ b/libgcc/config/mips/crtn.S
+@@ -21,6 +21,9 @@ a copy of the GCC Runtime Library Except
+ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ <http://www.gnu.org/licenses/>.  */
+ 
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++
+ /* 4 slots for argument spill area.  1 for cpreturn, 1 for stack.
+    Return spill offset of 40 and 20.  Aligned to 16 bytes for n32.  */
+ 
+--- a/libgcc/config/mips/mips16.S
++++ b/libgcc/config/mips/mips16.S
+@@ -31,6 +31,10 @@ see the files COPYING3 and COPYING.RUNTI
+    values using the soft-float calling convention, but do the actual
+    operation using the hard floating point instructions.  */
+ 
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++	.previous
++
+ #if defined _MIPS_SIM && (_MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIO64)
+ 
+ /* This file contains 32-bit assembly code.  */
+--- a/libgcc/config/mips/vr4120-div.S
++++ b/libgcc/config/mips/vr4120-div.S
+@@ -26,6 +26,10 @@ see the files COPYING3 and COPYING.RUNTI
+    -mfix-vr4120.  div and ddiv do not give the correct result when one
+    of the operands is negative.  */
+ 
++/* An executable stack is *not* required for these functions.  */
++	.section .note.GNU-stack,"",%progbits
++	.previous
++
+ 	.set	nomips16
+ 
+ #define DIV								\
diff --git a/trunk/toolchain/gdb/Makefile b/trunk/toolchain/gdb/Makefile
new file mode 100644
index 00000000..10de1f88
--- /dev/null
+++ b/trunk/toolchain/gdb/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gdb
+PKG_REV:=7.6-2013.05
+PKG_VERSION_MAJOR:=7.6
+PKG_VERSION:=linaro-$(PKG_REV)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=816290b91cff03912320089d353e8a12
+PKG_SOURCE_URL:=https://releases.linaro.org/13.05/components/toolchain/gdb-linaro/
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
+		gdb_cv_func_sigsetjmp=yes \
+		CFLAGS="-O2" \
+		$(HOST_BUILD_DIR)/configure \
+		--prefix=$(TOOLCHAIN_DIR) \
+		--build=$(GNU_HOST_NAME) \
+		--host=$(GNU_HOST_NAME) \
+		--target=$(REAL_GNU_TARGET_NAME) \
+		--disable-werror \
+		--without-uiout \
+		--disable-tui --disable-gdbtk --without-x \
+		--without-included-gettext \
+		--enable-threads \
+	);
+endef
+
+define Host/Install
+	mkdir -p $(TOOLCHAIN_DIR)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/gdb/gdb $(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)gdb
+	ln -fs $(TARGET_CROSS)gdb $(TOOLCHAIN_DIR)/bin/$(GNU_TARGET_NAME)-gdb
+	strip $(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)gdb
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)gdb \
+		$(TOOLCHAIN_DIR)/bin/$(GNU_TARGET_NAME)-gdb
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/gdb/patches/100-ppc_compile_fix.patch b/trunk/toolchain/gdb/patches/100-ppc_compile_fix.patch
new file mode 100644
index 00000000..9ecaaed8
--- /dev/null
+++ b/trunk/toolchain/gdb/patches/100-ppc_compile_fix.patch
@@ -0,0 +1,11 @@
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
+@@ -550,7 +550,7 @@ PACKAGE_SRC = @sim_pk_src@
+ PACKAGE_OBJ = @sim_pk_obj@
+ 
+ 
+-psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP)
++psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP)
+ 	$(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
+ 
+ run: psim
diff --git a/trunk/toolchain/gdb/patches/110-no_extern_inline.patch b/trunk/toolchain/gdb/patches/110-no_extern_inline.patch
new file mode 100644
index 00000000..bbae1d77
--- /dev/null
+++ b/trunk/toolchain/gdb/patches/110-no_extern_inline.patch
@@ -0,0 +1,32 @@
+--- a/sim/common/sim-arange.c
++++ b/sim/common/sim-arange.c
+@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a
+   build_search_tree (ar);
+ }
+ 
+-#endif /* DEFINE_NON_INLINE_P */
+-
+-#if DEFINE_INLINE_P
+-
+-SIM_ARANGE_INLINE int
++int
+ sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr)
+ {
+   ADDR_RANGE_TREE *t = ar->range_tree;
+@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad
+   return 0;
+ }
+ 
+-#endif /* DEFINE_INLINE_P */
++#endif /* DEFINE_NON_INLINE_P */
+--- a/sim/common/sim-arange.h
++++ b/sim/common/sim-arange.h
+@@ -62,7 +62,7 @@ extern void sim_addr_range_delete (ADDR_
+ 
+ /* Return non-zero if ADDR is in range AR, traversing the entire tree.
+    If no range is specified, that is defined to mean "everything".  */
+-extern INLINE int
++extern int
+ sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
+ #define ADDR_RANGE_HIT_P(ar, addr) \
+   ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
diff --git a/trunk/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch b/trunk/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch
new file mode 100644
index 00000000..127bee46
--- /dev/null
+++ b/trunk/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch
@@ -0,0 +1,32 @@
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -834,8 +834,7 @@ MAKEINFOFLAGS
+ YACC
+ YFLAGS
+ XMKMF'
+-ac_subdirs_all='testsuite
+-gdbtk
++ac_subdirs_all='gdbtk
+ multi-ice
+ gdbserver'
+ 
+@@ -5033,7 +5032,7 @@ $as_echo "$with_auto_load_safe_path" >&6
+ 
+ 
+ 
+-subdirs="$subdirs testsuite"
++subdirs="$subdirs"
+ 
+ 
+ # Check whether to support alternative target configurations
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -2181,7 +2181,7 @@ $as_echo "$as_me: error: \`$ac_var' was
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+-      if test "x$ac_old_val" != "x$ac_new_val"; then
++      if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then
+ 	# differences in whitespace do not lead to failure.
+ 	ac_old_val_w=`echo x $ac_old_val`
+ 	ac_new_val_w=`echo x $ac_new_val`
diff --git a/trunk/toolchain/info.mk b/trunk/toolchain/info.mk
new file mode 100644
index 00000000..4f311c55
--- /dev/null
+++ b/trunk/toolchain/info.mk
@@ -0,0 +1,6 @@
+TARGET_CROSS=
+GCC_VERSION=unknown
+LIBC_TYPE=unknown
+LIBC_URL=unknown
+LIBC_VERSION=unknown
+LIBC_SO_VERSION=unknown
diff --git a/trunk/toolchain/insight/Makefile b/trunk/toolchain/insight/Makefile
new file mode 100644
index 00000000..3744f564
--- /dev/null
+++ b/trunk/toolchain/insight/Makefile
@@ -0,0 +1,54 @@
+# 
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=insight
+PKG_VERSION:=6.8-1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)a.tar.bz2
+PKG_MD5SUM:=f7dd764a102beb75c2bb6b8d83455f8e
+PKG_SOURCE_URL:=ftp://sourceware.org/pub/insight/releases
+PKG_CAT:=bzcat
+
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
+		gdb_cv_func_sigsetjmp=yes \
+		CFLAGS="-O2" \
+		$(HOST_BUILD_DIR)/configure \
+		--prefix=$(TOOLCHAIN_DIR) \
+		--build=$(GNU_HOST_NAME) \
+		--host=$(GNU_HOST_NAME) \
+		--target=$(REAL_GNU_TARGET_NAME) \
+		--enable-threads \
+		--enable-werror=no \
+	);
+endef
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)
+endef
+
+define Host/Install
+	mkdir -p $(TOOLCHAIN_DIR)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/gdb/insight $(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)insight
+	ln -fs $(TARGET_CROSS)insight $(TOOLCHAIN_DIR)/bin/$(GNU_TARGET_NAME)-insight
+	strip $(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)insight
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)insight \
+		$(TOOLCHAIN_DIR)/bin/$(GNU_TARGET_NAME)-insight
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/insight/patches/600-fix-compile-flag-mismatch.patch b/trunk/toolchain/insight/patches/600-fix-compile-flag-mismatch.patch
new file mode 100644
index 00000000..13b72bb9
--- /dev/null
+++ b/trunk/toolchain/insight/patches/600-fix-compile-flag-mismatch.patch
@@ -0,0 +1,31 @@
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -1239,7 +1239,7 @@
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+-      if test "x$ac_old_val" != "x$ac_new_val"; then
++      if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then
+ 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -272,7 +272,7 @@
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="main.c"
+-ac_subdirs_all="$ac_subdirs_all doc testsuite"
++ac_subdirs_all="$ac_subdirs_all doc"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -3077,7 +3077,7 @@
+ 
+ 
+ 
+-subdirs="$subdirs doc testsuite"
++subdirs="$subdirs doc"
+ 
+ 
+ # Provide defaults for some variables set by the per-host and per-target
diff --git a/trunk/toolchain/kernel-headers/Makefile b/trunk/toolchain/kernel-headers/Makefile
new file mode 100644
index 00000000..d93a1230
--- /dev/null
+++ b/trunk/toolchain/kernel-headers/Makefile
@@ -0,0 +1,109 @@
+# 
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN)
+BUILD_DIR := $(KERNEL_BUILD_DIR)
+
+override QUILT:=
+override HOST_QUILT:=
+
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=linux
+PKG_VERSION:=$(LINUX_VERSION)
+PKG_SOURCE:=$(LINUX_SOURCE)
+PKG_SOURCE_URL:=$(LINUX_SITE)
+HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+LINUX_DIR := $(HOST_BUILD_DIR)
+FILES_DIR := 
+PATCH_DIR := ./patches$(if $(wildcard ./patches-$(LINUX_VERSION)),-$(LINUX_VERSION))
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+ifeq ($(strip $(BOARD)),uml)
+  LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH)))
+endif
+
+HOST_EXTRACFLAGS=
+
+LINUX_HAS_HEADERS_INSTALL:=y
+
+KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
+	HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
+	ARCH=$(LINUX_KARCH) \
+	CC="$(KERNEL_CC)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	KBUILD_HAVE_NLS=no \
+	CONFIG_SHELL=$(BASH)
+
+define Host/Configure/all
+	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev
+	$(KMAKE) \
+		INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \
+		headers_install
+endef
+
+# XXX: the following is needed to build lzma-loader
+ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
+  define Host/Configure/lzma
+	$(CP) \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \
+		$(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \
+		$(if $(call kernel_patchver_ge,3.15.0),$(HOST_BUILD_DIR)/arch/mips/include/asm/asm-eva.h) \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
+  endef
+endif
+
+define Host/Configure/post/cris
+	$(CP) \
+		$(HOST_BUILD_DIR)/include/linux/user.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/linux/
+	ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch-v10/arch \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch
+	$(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h
+endef
+
+define Host/Configure/post/mips
+	$(call Host/Configure/lzma)
+endef
+
+define Host/Configure/post/mipsel
+	$(call Host/Configure/lzma)
+endef
+
+define Host/Prepare
+	$(call Kernel/Prepare/Default)
+	ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
+	$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
+endef
+
+define Host/Configure
+	env
+	yes '' | $(KMAKE) oldconfig
+	$(call Host/Configure/all)
+	$(call Host/Configure/post/$(ARCH))
+endef
+
+define Host/Compile
+endef
+
+define Host/Install
+	$(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(TOOLCHAIN_DIR)/
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/linux \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch b/trunk/toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch
new file mode 100644
index 00000000..1bd9c9d5
--- /dev/null
+++ b/trunk/toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch
@@ -0,0 +1,24 @@
+Index: linux-3.3.5/include/linux/ext2_fs.h
+===================================================================
+--- linux-3.3.5.orig/include/linux/ext2_fs.h	2012-05-12 05:49:43.555033434 -0400
++++ linux-3.3.5/include/linux/ext2_fs.h	2012-05-12 05:51:01.895033564 -0400
+@@ -209,7 +209,11 @@
+ #define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL)
+ 
+ /* Mask out flags that are inappropriate for the given type of inode. */
++#ifdef __KERNEL__
+ static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
++#else
++static inline __u32 ext2_mask_flags(unsigned short mode, __u32 flags)
++#endif
+ {
+ 	if (S_ISDIR(mode))
+ 		return flags;
+@@ -219,6 +223,7 @@
+ 		return flags & EXT2_OTHER_FLMASK;
+ }
+ 
++
+ /*
+  * ioctl commands
+  */
diff --git a/trunk/toolchain/llvm/Makefile b/trunk/toolchain/llvm/Makefile
new file mode 100644
index 00000000..fef29c01
--- /dev/null
+++ b/trunk/toolchain/llvm/Makefile
@@ -0,0 +1,44 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=llvm
+PKG_VERSION:=r83568
+PKG_SOURCE_VERSION:=5687d8a26c08d089c60df2c92d048ab85bcdb2b9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://repo.or.cz/llvm.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_HOST)
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+ifeq ($(HOST_OS),Darwin)
+  DARWIN_VERSION=$(shell sw_vers -productVersion)
+  DARWIN_MAJVERS=$(firstword $(subst ., ,$(DARWIN_VERSION)))
+
+  HOST_MAKE_FLAGS += \
+	DARWIN_VERSION=$(DARWIN_VERSION) \
+	DARWIN_MAJVERS=$(DARWIN_MAJVERS)
+
+endif
+
+HOST_CONFIGURE_ARGS += \
+	--enable-optimized --enable-assertions
+
+define Host/Compile
+	@-$(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) uninstall
+	$(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS)
+endef
+
+define Host/Install
+	rm -f $(BUILD_DIR_HOST)/llvm
+	ln -s llvm-$(PKG_VERSION) $(BUILD_DIR_HOST)/llvm
+	$(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) install
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/llvm/patches/100-darwin_arch_auto.patch b/trunk/toolchain/llvm/patches/100-darwin_arch_auto.patch
new file mode 100644
index 00000000..a48e1312
--- /dev/null
+++ b/trunk/toolchain/llvm/patches/100-darwin_arch_auto.patch
@@ -0,0 +1,19 @@
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -618,16 +618,6 @@ ifdef UNIVERSAL
+ 
+   # Building universal cannot compute dependencies automatically.
+   DISABLE_AUTO_DEPENDENCIES=1
+-else
+-  ifeq ($(TARGET_OS),Darwin)
+-    ifeq ($(ARCH),x86_64)
+-      TargetCommonOpts = -m64
+-    else
+-      ifeq ($(ARCH),x86)
+-        TargetCommonOpts = -m32
+-      endif
+-    endif
+-  endif
+ endif
+ 
+ ifeq ($(HOST_OS),SunOS)
diff --git a/trunk/toolchain/llvm/patches/110-darwin_version_detect.patch b/trunk/toolchain/llvm/patches/110-darwin_version_detect.patch
new file mode 100644
index 00000000..7fd62f93
--- /dev/null
+++ b/trunk/toolchain/llvm/patches/110-darwin_version_detect.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -506,11 +506,13 @@ endif
+ #--------------------------------------------------------------------
+ 
+ ifeq ($(HOST_OS),Darwin)
++  ifndef DARWIN_VERSION
+   DARWIN_VERSION := `sw_vers -productVersion`
+   # Strip a number like 10.4.7 to 10.4
+   DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/')
+   # Get "4" out of 10.4 for later pieces in the makefile.
+   DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
++  endif
+ 
+   SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress \
+                     -dynamiclib
diff --git a/trunk/toolchain/musl/Config.in b/trunk/toolchain/musl/Config.in
new file mode 100644
index 00000000..05caa6ab
--- /dev/null
+++ b/trunk/toolchain/musl/Config.in
@@ -0,0 +1,6 @@
+# Debug version.
+
+config MUSL_ENABLE_DEBUG
+	bool "Build with debug information"
+	depends on TOOLCHAINOPTS && USE_MUSL
+	default n
diff --git a/trunk/toolchain/musl/Config.version b/trunk/toolchain/musl/Config.version
new file mode 100644
index 00000000..fd7bce4a
--- /dev/null
+++ b/trunk/toolchain/musl/Config.version
@@ -0,0 +1,8 @@
+if USE_MUSL
+
+config MUSL_VERSION
+	string
+	depends on USE_MUSL
+	default "1.1.5"
+
+endif
diff --git a/trunk/toolchain/musl/Makefile b/trunk/toolchain/musl/Makefile
new file mode 100644
index 00000000..1533f51a
--- /dev/null
+++ b/trunk/toolchain/musl/Makefile
@@ -0,0 +1,31 @@
+PATH_PREFIX=.
+
+include ./common.mk
+
+HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.musl_installed
+
+HOST_BUILD_PARALLEL:=1
+
+MUSL_MAKEOPTS = -C $(HOST_BUILD_DIR) \
+	DESTDIR="$(TOOLCHAIN_DIR)/" \
+	LIBCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))"
+
+define Host/SetToolchainInfo
+	$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.musl-libc.org/,' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(LIBC_SO_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+endef
+
+define Host/Compile
+	+$(MAKE) $(HOST_JOBS) $(MUSL_MAKEOPTS) all
+endef
+
+define Host/Install
+	$(call Host/SetToolchainInfo)
+	$(MAKE) $(MUSL_MAKEOPTS) DESTDIR="$(TOOLCHAIN_DIR)/" install
+	$(CP) ./include $(TOOLCHAIN_DIR)/
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/musl/common.mk b/trunk/toolchain/musl/common.mk
new file mode 100644
index 00000000..66f9b8f2
--- /dev/null
+++ b/trunk/toolchain/musl/common.mk
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2012-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
+
+PKG_NAME:=musl
+PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION))
+PKG_RELEASE=1
+
+PKG_SOURCE_MD5SUM:=94f8aa9dab80229fed68991bb9984cc5
+
+PKG_SOURCE_URL:=http://www.musl-libc.org/releases
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+LIBC_SO_VERSION:=$(PKG_VERSION)
+PATCH_DIR:=$(PATH_PREFIX)/patches
+
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+MUSL_CONFIGURE:= \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	$(HOST_BUILD_DIR)/configure \
+		--prefix=/ \
+		--host=$(GNU_HOST_NAME) \
+		--target=$(REAL_GNU_TARGET_NAME) \
+		--disable-gcc-wrapper
+
+ifeq ($(CONFIG_MUSL_ENABLE_DEBUG),y)
+MUSL_CONFIGURE+= \
+	--enable-debug
+endif
+
+define Host/Prepare
+	$(call Host/Prepare/Default)
+	$(if $(strip $(QUILT)), \
+		cd $(HOST_BUILD_DIR); \
+		if $(QUILT_CMD) next >/dev/null 2>&1; then \
+			$(QUILT_CMD) push -a; \
+		fi
+	)
+	ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+endef
+
+define Host/Configure
+	( cd $(HOST_BUILD_DIR); rm -f config.cache; \
+		$(MUSL_CONFIGURE) \
+	);
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \
+		$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev
+endef
diff --git a/trunk/toolchain/musl/headers/Makefile b/trunk/toolchain/musl/headers/Makefile
new file mode 100644
index 00000000..21e6b3bd
--- /dev/null
+++ b/trunk/toolchain/musl/headers/Makefile
@@ -0,0 +1,16 @@
+PATH_PREFIX:=..
+
+include ../common.mk
+
+HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.headers_built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_headers_installed
+
+define Host/Compile
+
+endef
+
+define Host/Install
+endef
+
+$(eval $(call HostBuild))
+
diff --git a/trunk/toolchain/musl/include/bits/wordsize.h b/trunk/toolchain/musl/include/bits/wordsize.h
new file mode 100644
index 00000000..2d4cbe83
--- /dev/null
+++ b/trunk/toolchain/musl/include/bits/wordsize.h
@@ -0,0 +1 @@
+#include <sys/user.h>
diff --git a/trunk/toolchain/musl/include/features.h b/trunk/toolchain/musl/include/features.h
new file mode 100644
index 00000000..edb8cc72
--- /dev/null
+++ b/trunk/toolchain/musl/include/features.h
@@ -0,0 +1,48 @@
+#ifndef _FEATURES_H
+#define _FEATURES_H
+
+#ifdef _ALL_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
+#if !defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE) \
+ && !defined(_XOPEN_SOURCE) && !defined(_GNU_SOURCE) \
+ && !defined(_BSD_SOURCE) && !defined(__STRICT_ANSI__)
+#define _BSD_SOURCE 1
+#define _XOPEN_SOURCE 700
+#endif
+
+#if __STDC_VERSION__ >= 199901L
+#define __restrict restrict
+#elif !defined(__GNUC__)
+#define __restrict
+#endif
+
+#if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
+#define __inline inline
+#endif
+
+#if __STDC_VERSION__ >= 201112L
+#elif defined(__GNUC__)
+#define _Noreturn __attribute__((__noreturn__))
+#else
+#define _Noreturn
+#endif
+
+/* Convenience macros to test the versions of glibc and gcc.
+   Use them like this:
+   #if __GNUC_PREREQ (2,8)
+   ... code requiring gcc 2.8 or later ...
+   #endif
+   Note - they won't work for gcc1 or glibc1, since the _MINOR macros
+   were not defined then.  */
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) \
+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define __GNUC_PREREQ(maj, min) 0
+#endif
+
+#include <sys/glibc-types.h>
+
+#endif
diff --git a/trunk/toolchain/musl/include/sgidefs.h b/trunk/toolchain/musl/include/sgidefs.h
new file mode 100644
index 00000000..74509fdb
--- /dev/null
+++ b/trunk/toolchain/musl/include/sgidefs.h
@@ -0,0 +1,73 @@
+/* Copyright (C) 1996, 1997, 1998, 2003, 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ralf Baechle <ralf@gnu.org>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _SGIDEFS_H
+#define _SGIDEFS_H	1
+
+/*
+ * A crude hack to stop <asm/sgidefs.h>
+ */
+#undef __ASM_SGIDEFS_H
+#define __ASM_SGIDEFS_H
+
+/*
+ * And remove any damage it might have already done
+ */
+#undef _MIPS_ISA_MIPS1
+#undef _MIPS_ISA_MIPS2
+#undef _MIPS_ISA_MIPS3
+#undef _MIPS_ISA_MIPS4
+#undef _MIPS_ISA_MIPS5
+#undef _MIPS_ISA_MIPS32
+#undef _MIPS_ISA_MIPS64
+
+#undef _MIPS_SIM_ABI32
+#undef _MIPS_SIM_NABI32
+#undef _MIPS_SIM_ABI64
+
+/*
+ * Definitions for the ISA level
+ */
+#define _MIPS_ISA_MIPS1 1
+#define _MIPS_ISA_MIPS2 2
+#define _MIPS_ISA_MIPS3 3
+#define _MIPS_ISA_MIPS4 4
+#define _MIPS_ISA_MIPS5 5
+#define _MIPS_ISA_MIPS32 6
+#define _MIPS_ISA_MIPS64 7
+
+/*
+ * Subprogram calling convention
+ */
+#ifndef _ABIO32
+# define _ABIO32		1
+#endif
+#define _MIPS_SIM_ABI32		_ABIO32
+
+#ifndef _ABIN32
+# define _ABIN32		2
+#endif
+#define _MIPS_SIM_NABI32	_ABIN32
+
+#ifndef _ABI64
+# define _ABI64			3
+#endif
+#define _MIPS_SIM_ABI64		_ABI64
+
+#endif /* sgidefs.h */
diff --git a/trunk/toolchain/musl/include/sys/cdefs.h b/trunk/toolchain/musl/include/sys/cdefs.h
new file mode 100644
index 00000000..e9866700
--- /dev/null
+++ b/trunk/toolchain/musl/include/sys/cdefs.h
@@ -0,0 +1,378 @@
+/* Copyright (C) 1992-2002, 2004, 2005, 2006, 2007, 2009, 2011, 2012
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef	_SYS_CDEFS_H
+#define	_SYS_CDEFS_H	1
+
+/* We are almost always included from features.h. */
+#ifndef _FEATURES_H
+# include <features.h>
+#endif
+
+/* The GNU libc does not support any K&R compilers or the traditional mode
+   of ISO C compilers anymore.  Check for some of the combinations not
+   anymore supported.  */
+#if defined __GNUC__ && !defined __STDC__
+# error "You need a ISO C conforming compiler to use the glibc headers"
+#endif
+
+/* Some user header file might have defined this before.  */
+#undef	__P
+#undef	__PMT
+
+#ifdef __GNUC__
+
+/* All functions, except those with callbacks or those that
+   synchronize memory, are leaf functions.  */
+# if __GNUC_PREREQ (4, 6) && !defined _LIBC
+#  define __LEAF , __leaf__
+#  define __LEAF_ATTR __attribute__ ((__leaf__))
+# else
+#  define __LEAF
+#  define __LEAF_ATTR
+# endif
+
+/* GCC can always grok prototypes.  For C++ programs we add throw()
+   to help it optimize the function calls.  But this works only with
+   gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
+   as non-throwing using a function attribute since programs can use
+   the -fexceptions options for C code as well.  */
+# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
+#  define __THROW	__attribute__ ((__nothrow__ __LEAF))
+#  define __THROWNL	__attribute__ ((__nothrow__))
+#  define __NTH(fct)	__attribute__ ((__nothrow__ __LEAF)) fct
+# else
+#  if defined __cplusplus && __GNUC_PREREQ (2,8)
+#   define __THROW	throw ()
+#   define __THROWNL	throw ()
+#   define __NTH(fct)	__LEAF_ATTR fct throw ()
+#  else
+#   define __THROW
+#   define __THROWNL
+#   define __NTH(fct)	fct
+#  endif
+# endif
+
+#else	/* Not GCC.  */
+
+# define __inline		/* No inline functions.  */
+
+# define __THROW
+# define __THROWNL
+# define __NTH(fct)	fct
+
+#endif	/* GCC.  */
+
+/* These two macros are not used in glibc anymore.  They are kept here
+   only because some other projects expect the macros to be defined.  */
+#define __P(args)	args
+#define __PMT(args)	args
+
+/* For these things, GCC behaves the ANSI way normally,
+   and the non-ANSI way under -traditional.  */
+
+#define __CONCAT(x,y)	x ## y
+#define __STRING(x)	#x
+
+/* This is not a typedef so `const __ptr_t' does the right thing.  */
+#define __ptr_t void *
+#define __long_double_t  long double
+
+
+/* C++ needs to know that types and declarations are C, not C++.  */
+#ifdef	__cplusplus
+# define __BEGIN_DECLS	extern "C" {
+# define __END_DECLS	}
+#else
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
+
+/* The standard library needs the functions from the ISO C90 standard
+   in the std namespace.  At the same time we want to be safe for
+   future changes and we include the ISO C99 code in the non-standard
+   namespace __c99.  The C++ wrapper header take case of adding the
+   definitions to the global namespace.  */
+#if defined __cplusplus && defined _GLIBCPP_USE_NAMESPACES
+# define __BEGIN_NAMESPACE_STD	namespace std {
+# define __END_NAMESPACE_STD	}
+# define __USING_NAMESPACE_STD(name) using std::name;
+# define __BEGIN_NAMESPACE_C99	namespace __c99 {
+# define __END_NAMESPACE_C99	}
+# define __USING_NAMESPACE_C99(name) using __c99::name;
+#else
+/* For compatibility we do not add the declarations into any
+   namespace.  They will end up in the global namespace which is what
+   old code expects.  */
+# define __BEGIN_NAMESPACE_STD
+# define __END_NAMESPACE_STD
+# define __USING_NAMESPACE_STD(name)
+# define __BEGIN_NAMESPACE_C99
+# define __END_NAMESPACE_C99
+# define __USING_NAMESPACE_C99(name)
+#endif
+
+
+/* Support for bounded pointers.  */
+#ifndef __BOUNDED_POINTERS__
+# define __bounded	/* nothing */
+# define __unbounded	/* nothing */
+# define __ptrvalue	/* nothing */
+#endif
+
+
+/* Fortify support.  */
+#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
+#define __bos0(ptr) __builtin_object_size (ptr, 0)
+#define __fortify_function __extern_always_inline __attribute_artificial__
+
+#if __GNUC_PREREQ (4,3)
+# define __warndecl(name, msg) \
+  extern void name (void) __attribute__((__warning__ (msg)))
+# define __warnattr(msg) __attribute__((__warning__ (msg)))
+# define __errordecl(name, msg) \
+  extern void name (void) __attribute__((__error__ (msg)))
+#else
+# define __warndecl(name, msg) extern void name (void)
+# define __warnattr(msg)
+# define __errordecl(name, msg) extern void name (void)
+#endif
+
+/* Support for flexible arrays.  */
+#if __GNUC_PREREQ (2,97)
+/* GCC 2.97 supports C99 flexible array members.  */
+# define __flexarr	[]
+#else
+# ifdef __GNUC__
+#  define __flexarr	[0]
+# else
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#   define __flexarr	[]
+#  else
+/* Some other non-C99 compiler.  Approximate with [1].  */
+#   define __flexarr	[1]
+#  endif
+# endif
+#endif
+
+
+/* __asm__ ("xyz") is used throughout the headers to rename functions
+   at the assembly language level.  This is wrapped by the __REDIRECT
+   macro, in order to support compilers that can do this some other
+   way.  When compilers don't support asm-names at all, we have to do
+   preprocessor tricks instead (which don't have exactly the right
+   semantics, but it's the best we can do).
+
+   Example:
+   int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid); */
+
+#if defined __GNUC__ && __GNUC__ >= 2
+
+# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
+# ifdef __cplusplus
+#  define __REDIRECT_NTH(name, proto, alias) \
+     name proto __THROW __asm__ (__ASMNAME (#alias))
+#  define __REDIRECT_NTHNL(name, proto, alias) \
+     name proto __THROWNL __asm__ (__ASMNAME (#alias))
+# else
+#  define __REDIRECT_NTH(name, proto, alias) \
+     name proto __asm__ (__ASMNAME (#alias)) __THROW
+#  define __REDIRECT_NTHNL(name, proto, alias) \
+     name proto __asm__ (__ASMNAME (#alias)) __THROWNL
+# endif
+# define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
+# define __ASMNAME2(prefix, cname) __STRING (prefix) cname
+
+/*
+#elif __SOME_OTHER_COMPILER__
+
+# define __REDIRECT(name, proto, alias) name proto; \
+	_Pragma("let " #name " = " #alias)
+*/
+#endif
+
+/* GCC has various useful declarations that can be made with the
+   `__attribute__' syntax.  All of the ways we use this do fine if
+   they are omitted for compilers that don't understand it. */
+#if !defined __GNUC__ || __GNUC__ < 2
+# define __attribute__(xyz)	/* Ignore */
+#endif
+
+/* At some point during the gcc 2.96 development the `malloc' attribute
+   for functions was introduced.  We don't want to use it unconditionally
+   (although this would be possible) since it generates warnings.  */
+#if __GNUC_PREREQ (2,96)
+# define __attribute_malloc__ __attribute__ ((__malloc__))
+#else
+# define __attribute_malloc__ /* Ignore */
+#endif
+
+/* At some point during the gcc 2.96 development the `pure' attribute
+   for functions was introduced.  We don't want to use it unconditionally
+   (although this would be possible) since it generates warnings.  */
+#if __GNUC_PREREQ (2,96)
+# define __attribute_pure__ __attribute__ ((__pure__))
+#else
+# define __attribute_pure__ /* Ignore */
+#endif
+
+/* This declaration tells the compiler that the value is constant.  */
+#if __GNUC_PREREQ (2,5)
+# define __attribute_const__ __attribute__ ((__const__))
+#else
+# define __attribute_const__ /* Ignore */
+#endif
+
+/* At some point during the gcc 3.1 development the `used' attribute
+   for functions was introduced.  We don't want to use it unconditionally
+   (although this would be possible) since it generates warnings.  */
+#if __GNUC_PREREQ (3,1)
+# define __attribute_used__ __attribute__ ((__used__))
+# define __attribute_noinline__ __attribute__ ((__noinline__))
+#else
+# define __attribute_used__ __attribute__ ((__unused__))
+# define __attribute_noinline__ /* Ignore */
+#endif
+
+/* gcc allows marking deprecated functions.  */
+#if __GNUC_PREREQ (3,2)
+# define __attribute_deprecated__ __attribute__ ((__deprecated__))
+#else
+# define __attribute_deprecated__ /* Ignore */
+#endif
+
+/* At some point during the gcc 2.8 development the `format_arg' attribute
+   for functions was introduced.  We don't want to use it unconditionally
+   (although this would be possible) since it generates warnings.
+   If several `format_arg' attributes are given for the same function, in
+   gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+   all designated arguments are considered.  */
+#if __GNUC_PREREQ (2,8)
+# define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x)))
+#else
+# define __attribute_format_arg__(x) /* Ignore */
+#endif
+
+/* At some point during the gcc 2.97 development the `strfmon' format
+   attribute for functions was introduced.  We don't want to use it
+   unconditionally (although this would be possible) since it
+   generates warnings.  */
+#if __GNUC_PREREQ (2,97)
+# define __attribute_format_strfmon__(a,b) \
+  __attribute__ ((__format__ (__strfmon__, a, b)))
+#else
+# define __attribute_format_strfmon__(a,b) /* Ignore */
+#endif
+
+/* The nonull function attribute allows to mark pointer parameters which
+   must not be NULL.  */
+#if __GNUC_PREREQ (3,3)
+# define __nonnull(params) __attribute__ ((__nonnull__ params))
+#else
+# define __nonnull(params)
+#endif
+
+/* If fortification mode, we warn about unused results of certain
+   function calls which can lead to problems.  */
+#if __GNUC_PREREQ (3,4)
+# define __attribute_warn_unused_result__ \
+   __attribute__ ((__warn_unused_result__))
+# if __USE_FORTIFY_LEVEL > 0
+#  define __wur __attribute_warn_unused_result__
+# endif
+#else
+# define __attribute_warn_unused_result__ /* empty */
+#endif
+#ifndef __wur
+# define __wur /* Ignore */
+#endif
+
+/* Forces a function to be always inlined.  */
+#if __GNUC_PREREQ (3,2)
+# define __always_inline __inline __attribute__ ((__always_inline__))
+#else
+# define __always_inline __inline
+#endif
+
+/* Associate error messages with the source location of the call site rather
+   than with the source location inside the function.  */
+#if __GNUC_PREREQ (4,3)
+# define __attribute_artificial__ __attribute__ ((__artificial__))
+#else
+# define __attribute_artificial__ /* Ignore */
+#endif
+
+/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+   inline semantics, unless -fgnu89-inline is used.  */
+#if !defined __cplusplus || __GNUC_PREREQ (4,3)
+# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
+#  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
+#  define __extern_always_inline \
+  extern __always_inline __attribute__ ((__gnu_inline__))
+# else
+#  define __extern_inline extern __inline
+#  define __extern_always_inline extern __always_inline
+# endif
+#endif
+
+/* GCC 4.3 and above allow passing all anonymous arguments of an
+   __extern_always_inline function to some other vararg function.  */
+#if __GNUC_PREREQ (4,3)
+# define __va_arg_pack() __builtin_va_arg_pack ()
+# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
+#endif
+
+/* It is possible to compile containing GCC extensions even if GCC is
+   run in pedantic mode if the uses are carefully marked using the
+   `__extension__' keyword.  But this is not generally available before
+   version 2.8.  */
+#if !__GNUC_PREREQ (2,8)
+# define __extension__		/* Ignore */
+#endif
+
+/* __restrict is known in EGCS 1.2 and above. */
+#if !__GNUC_PREREQ (2,92)
+# define __restrict	/* Ignore */
+#endif
+
+/* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+     array_name[restrict]
+   GCC 3.1 supports this.  */
+#if __GNUC_PREREQ (3,1) && !defined __GNUG__
+# define __restrict_arr	__restrict
+#else
+# ifdef __GNUC__
+#  define __restrict_arr	/* Not supported in old GCC.  */
+# else
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#   define __restrict_arr	restrict
+#  else
+/* Some other non-C99 compiler.  */
+#   define __restrict_arr	/* Not supported.  */
+#  endif
+# endif
+#endif
+
+#if __GNUC__ >= 3
+# define __glibc_unlikely(cond) __builtin_expect((cond), 0)
+#else
+# define __glibc_unlikely(cond) (cond)
+#endif
+
+#endif	 /* sys/cdefs.h */
diff --git a/trunk/toolchain/musl/include/sys/glibc-types.h b/trunk/toolchain/musl/include/sys/glibc-types.h
new file mode 100644
index 00000000..fa0684ce
--- /dev/null
+++ b/trunk/toolchain/musl/include/sys/glibc-types.h
@@ -0,0 +1,35 @@
+#ifndef __MUSL_GLIBC_TYPES_H
+#define __MUSL_GLIBC_TYPES_H
+
+#include <sys/cdefs.h>
+
+/* Convenience types.  */
+typedef unsigned char __u_char;
+typedef unsigned short int __u_short;
+typedef unsigned int __u_int;
+typedef unsigned long int __u_long;
+
+/* Fixed-size types, underlying types depend on word size and compiler.  */
+typedef signed char __int8_t;
+typedef unsigned char __uint8_t;
+typedef signed short int __int16_t;
+typedef unsigned short int __uint16_t;
+typedef signed int __int32_t;
+typedef unsigned int __uint32_t;
+#if __WORDSIZE == 64
+typedef signed long int __int64_t;
+typedef unsigned long int __uint64_t;
+#else
+__extension__ typedef signed long long int __int64_t;
+__extension__ typedef unsigned long long int __uint64_t;
+#endif
+
+#define __off64_t off_t
+#define __loff_t off_t
+typedef char *__caddr_t;
+#define __locale_t locale_t
+
+#define __gid_t gid_t
+#define __uid_t uid_t
+
+#endif
diff --git a/trunk/toolchain/musl/include/sys/queue.h b/trunk/toolchain/musl/include/sys/queue.h
new file mode 100644
index 00000000..daf4553d
--- /dev/null
+++ b/trunk/toolchain/musl/include/sys/queue.h
@@ -0,0 +1,574 @@
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+ */
+
+#ifndef	_SYS_QUEUE_H_
+#define	_SYS_QUEUE_H_
+
+/*
+ * This file defines five types of data structures: singly-linked lists,
+ * lists, simple queues, tail queues, and circular queues.
+ *
+ * A singly-linked list is headed by a single forward pointer. The
+ * elements are singly linked for minimum space and pointer manipulation
+ * overhead at the expense of O(n) removal for arbitrary elements. New
+ * elements can be added to the list after an existing element or at the
+ * head of the list.  Elements being removed from the head of the list
+ * should use the explicit macro for this purpose for optimum
+ * efficiency. A singly-linked list may only be traversed in the forward
+ * direction.  Singly-linked lists are ideal for applications with large
+ * datasets and few or no removals or for implementing a LIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may only be traversed in the forward direction.
+ *
+ * A simple queue is headed by a pair of pointers, one the head of the
+ * list and the other to the tail of the list. The elements are singly
+ * linked to save space, so elements can only be removed from the
+ * head of the list. New elements can be added to the list after
+ * an existing element, at the head of the list, or at the end of the
+ * list. A simple queue may only be traversed in the forward direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * A circle queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the list.
+ * A circle queue may be traversed in either direction, but has a more
+ * complex end of list detection.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ */
+
+/*
+ * List definitions.
+ */
+#define	LIST_HEAD(name, type)						\
+struct name {								\
+	struct type *lh_first;	/* first element */			\
+}
+
+#define	LIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	LIST_ENTRY(type)						\
+struct {								\
+	struct type *le_next;	/* next element */			\
+	struct type **le_prev;	/* address of previous next element */	\
+}
+
+/*
+ * List functions.
+ */
+#define	LIST_INIT(head) do {						\
+	(head)->lh_first = NULL;					\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
+	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
+		(listelm)->field.le_next->field.le_prev =		\
+		    &(elm)->field.le_next;				\
+	(listelm)->field.le_next = (elm);				\
+	(elm)->field.le_prev = &(listelm)->field.le_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
+	(elm)->field.le_prev = (listelm)->field.le_prev;		\
+	(elm)->field.le_next = (listelm);				\
+	*(listelm)->field.le_prev = (elm);				\
+	(listelm)->field.le_prev = &(elm)->field.le_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_INSERT_HEAD(head, elm, field) do {				\
+	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
+		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
+	(head)->lh_first = (elm);					\
+	(elm)->field.le_prev = &(head)->lh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_REMOVE(elm, field) do {					\
+	if ((elm)->field.le_next != NULL)				\
+		(elm)->field.le_next->field.le_prev = 			\
+		    (elm)->field.le_prev;				\
+	*(elm)->field.le_prev = (elm)->field.le_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	LIST_FOREACH(var, head, field)					\
+	for ((var) = ((head)->lh_first);				\
+		(var);							\
+		(var) = ((var)->field.le_next))
+
+/*
+ * List access methods.
+ */
+#define	LIST_EMPTY(head)		((head)->lh_first == NULL)
+#define	LIST_FIRST(head)		((head)->lh_first)
+#define	LIST_NEXT(elm, field)		((elm)->field.le_next)
+
+
+/*
+ * Singly-linked List definitions.
+ */
+#define	SLIST_HEAD(name, type)						\
+struct name {								\
+	struct type *slh_first;	/* first element */			\
+}
+
+#define	SLIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	SLIST_ENTRY(type)						\
+struct {								\
+	struct type *sle_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked List functions.
+ */
+#define	SLIST_INIT(head) do {						\
+	(head)->slh_first = NULL;					\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
+	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
+	(slistelm)->field.sle_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
+	(elm)->field.sle_next = (head)->slh_first;			\
+	(head)->slh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_REMOVE_HEAD(head, field) do {				\
+	(head)->slh_first = (head)->slh_first->field.sle_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_REMOVE(head, elm, type, field) do {			\
+	if ((head)->slh_first == (elm)) {				\
+		SLIST_REMOVE_HEAD((head), field);			\
+	}								\
+	else {								\
+		struct type *curelm = (head)->slh_first;		\
+		while(curelm->field.sle_next != (elm))			\
+			curelm = curelm->field.sle_next;		\
+		curelm->field.sle_next =				\
+		    curelm->field.sle_next->field.sle_next;		\
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	SLIST_FOREACH(var, head, field)					\
+	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
+
+/*
+ * Singly-linked List access methods.
+ */
+#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
+#define	SLIST_FIRST(head)	((head)->slh_first)
+#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
+
+
+/*
+ * Singly-linked Tail queue declarations.
+ */
+#define	STAILQ_HEAD(name, type)					\
+struct name {								\
+	struct type *stqh_first;	/* first element */			\
+	struct type **stqh_last;	/* addr of last next element */		\
+}
+
+#define	STAILQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).stqh_first }
+
+#define	STAILQ_ENTRY(type)						\
+struct {								\
+	struct type *stqe_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked Tail queue functions.
+ */
+#define	STAILQ_INIT(head) do {						\
+	(head)->stqh_first = NULL;					\
+	(head)->stqh_last = &(head)->stqh_first;				\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
+		(head)->stqh_last = &(elm)->field.stqe_next;		\
+	(head)->stqh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.stqe_next = NULL;					\
+	*(head)->stqh_last = (elm);					\
+	(head)->stqh_last = &(elm)->field.stqe_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
+		(head)->stqh_last = &(elm)->field.stqe_next;		\
+	(listelm)->field.stqe_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_REMOVE_HEAD(head, field) do {				\
+	if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == NULL) \
+		(head)->stqh_last = &(head)->stqh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_REMOVE(head, elm, type, field) do {			\
+	if ((head)->stqh_first == (elm)) {				\
+		STAILQ_REMOVE_HEAD((head), field);			\
+	} else {							\
+		struct type *curelm = (head)->stqh_first;		\
+		while (curelm->field.stqe_next != (elm))			\
+			curelm = curelm->field.stqe_next;		\
+		if ((curelm->field.stqe_next =				\
+			curelm->field.stqe_next->field.stqe_next) == NULL) \
+			    (head)->stqh_last = &(curelm)->field.stqe_next; \
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	STAILQ_FOREACH(var, head, field)				\
+	for ((var) = ((head)->stqh_first);				\
+		(var);							\
+		(var) = ((var)->field.stqe_next))
+
+#define	STAILQ_CONCAT(head1, head2) do {				\
+	if (!STAILQ_EMPTY((head2))) {					\
+		*(head1)->stqh_last = (head2)->stqh_first;		\
+		(head1)->stqh_last = (head2)->stqh_last;		\
+		STAILQ_INIT((head2));					\
+	}								\
+} while (/*CONSTCOND*/0)
+
+/*
+ * Singly-linked Tail queue access methods.
+ */
+#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
+#define	STAILQ_FIRST(head)	((head)->stqh_first)
+#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
+
+
+/*
+ * Simple queue definitions.
+ */
+#define	SIMPLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *sqh_first;	/* first element */			\
+	struct type **sqh_last;	/* addr of last next element */		\
+}
+
+#define	SIMPLEQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).sqh_first }
+
+#define	SIMPLEQ_ENTRY(type)						\
+struct {								\
+	struct type *sqe_next;	/* next element */			\
+}
+
+/*
+ * Simple queue functions.
+ */
+#define	SIMPLEQ_INIT(head) do {						\
+	(head)->sqh_first = NULL;					\
+	(head)->sqh_last = &(head)->sqh_first;				\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(head)->sqh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.sqe_next = NULL;					\
+	*(head)->sqh_last = (elm);					\
+	(head)->sqh_last = &(elm)->field.sqe_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(listelm)->field.sqe_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_REMOVE_HEAD(head, field) do {				\
+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
+		(head)->sqh_last = &(head)->sqh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_REMOVE(head, elm, type, field) do {			\
+	if ((head)->sqh_first == (elm)) {				\
+		SIMPLEQ_REMOVE_HEAD((head), field);			\
+	} else {							\
+		struct type *curelm = (head)->sqh_first;		\
+		while (curelm->field.sqe_next != (elm))			\
+			curelm = curelm->field.sqe_next;		\
+		if ((curelm->field.sqe_next =				\
+			curelm->field.sqe_next->field.sqe_next) == NULL) \
+			    (head)->sqh_last = &(curelm)->field.sqe_next; \
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	SIMPLEQ_FOREACH(var, head, field)				\
+	for ((var) = ((head)->sqh_first);				\
+		(var);							\
+		(var) = ((var)->field.sqe_next))
+
+/*
+ * Simple queue access methods.
+ */
+#define	SIMPLEQ_EMPTY(head)		((head)->sqh_first == NULL)
+#define	SIMPLEQ_FIRST(head)		((head)->sqh_first)
+#define	SIMPLEQ_NEXT(elm, field)	((elm)->field.sqe_next)
+
+
+/*
+ * Tail queue definitions.
+ */
+#define	_TAILQ_HEAD(name, type, qual)					\
+struct name {								\
+	qual type *tqh_first;		/* first element */		\
+	qual type *qual *tqh_last;	/* addr of last next element */	\
+}
+#define TAILQ_HEAD(name, type)	_TAILQ_HEAD(name, struct type,)
+
+#define	TAILQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).tqh_first }
+
+#define	_TAILQ_ENTRY(type, qual)					\
+struct {								\
+	qual type *tqe_next;		/* next element */		\
+	qual type *qual *tqe_prev;	/* address of previous next element */\
+}
+#define TAILQ_ENTRY(type)	_TAILQ_ENTRY(struct type,)
+
+/*
+ * Tail queue functions.
+ */
+#define	TAILQ_INIT(head) do {						\
+	(head)->tqh_first = NULL;					\
+	(head)->tqh_last = &(head)->tqh_first;				\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
+		(head)->tqh_first->field.tqe_prev =			\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(head)->tqh_first = (elm);					\
+	(elm)->field.tqe_prev = &(head)->tqh_first;			\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.tqe_next = NULL;					\
+	(elm)->field.tqe_prev = (head)->tqh_last;			\
+	*(head)->tqh_last = (elm);					\
+	(head)->tqh_last = &(elm)->field.tqe_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
+		(elm)->field.tqe_next->field.tqe_prev = 		\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(listelm)->field.tqe_next = (elm);				\
+	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
+	(elm)->field.tqe_next = (listelm);				\
+	*(listelm)->field.tqe_prev = (elm);				\
+	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_REMOVE(head, elm, field) do {				\
+	if (((elm)->field.tqe_next) != NULL)				\
+		(elm)->field.tqe_next->field.tqe_prev = 		\
+		    (elm)->field.tqe_prev;				\
+	else								\
+		(head)->tqh_last = (elm)->field.tqe_prev;		\
+	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+} while (/*CONSTCOND*/0)
+
+#define	TAILQ_FOREACH(var, head, field)					\
+	for ((var) = ((head)->tqh_first);				\
+		(var);							\
+		(var) = ((var)->field.tqe_next))
+
+#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
+	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
+		(var);							\
+		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
+
+#define	TAILQ_CONCAT(head1, head2, field) do {				\
+	if (!TAILQ_EMPTY(head2)) {					\
+		*(head1)->tqh_last = (head2)->tqh_first;		\
+		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
+		(head1)->tqh_last = (head2)->tqh_last;			\
+		TAILQ_INIT((head2));					\
+	}								\
+} while (/*CONSTCOND*/0)
+
+/*
+ * Tail queue access methods.
+ */
+#define	TAILQ_EMPTY(head)		((head)->tqh_first == NULL)
+#define	TAILQ_FIRST(head)		((head)->tqh_first)
+#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
+
+#define	TAILQ_LAST(head, headname) \
+	(*(((struct headname *)((head)->tqh_last))->tqh_last))
+#define	TAILQ_PREV(elm, headname, field) \
+	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
+
+
+/*
+ * Circular queue definitions.
+ */
+#define	CIRCLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *cqh_first;		/* first element */		\
+	struct type *cqh_last;		/* last element */		\
+}
+
+#define	CIRCLEQ_HEAD_INITIALIZER(head)					\
+	{ (void *)&head, (void *)&head }
+
+#define	CIRCLEQ_ENTRY(type)						\
+struct {								\
+	struct type *cqe_next;		/* next element */		\
+	struct type *cqe_prev;		/* previous element */		\
+}
+
+/*
+ * Circular queue functions.
+ */
+#define	CIRCLEQ_INIT(head) do {						\
+	(head)->cqh_first = (void *)(head);				\
+	(head)->cqh_last = (void *)(head);				\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
+	(elm)->field.cqe_prev = (listelm);				\
+	if ((listelm)->field.cqe_next == (void *)(head))		\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
+	(listelm)->field.cqe_next = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
+	(elm)->field.cqe_next = (listelm);				\
+	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
+	if ((listelm)->field.cqe_prev == (void *)(head))		\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
+	(listelm)->field.cqe_prev = (elm);				\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
+	(elm)->field.cqe_next = (head)->cqh_first;			\
+	(elm)->field.cqe_prev = (void *)(head);				\
+	if ((head)->cqh_last == (void *)(head))				\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(head)->cqh_first->field.cqe_prev = (elm);		\
+	(head)->cqh_first = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.cqe_next = (void *)(head);				\
+	(elm)->field.cqe_prev = (head)->cqh_last;			\
+	if ((head)->cqh_first == (void *)(head))			\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(head)->cqh_last->field.cqe_next = (elm);		\
+	(head)->cqh_last = (elm);					\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
+	if ((elm)->field.cqe_next == (void *)(head))			\
+		(head)->cqh_last = (elm)->field.cqe_prev;		\
+	else								\
+		(elm)->field.cqe_next->field.cqe_prev =			\
+		    (elm)->field.cqe_prev;				\
+	if ((elm)->field.cqe_prev == (void *)(head))			\
+		(head)->cqh_first = (elm)->field.cqe_next;		\
+	else								\
+		(elm)->field.cqe_prev->field.cqe_next =			\
+		    (elm)->field.cqe_next;				\
+} while (/*CONSTCOND*/0)
+
+#define	CIRCLEQ_FOREACH(var, head, field)				\
+	for ((var) = ((head)->cqh_first);				\
+		(var) != (const void *)(head);				\
+		(var) = ((var)->field.cqe_next))
+
+#define	CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
+	for ((var) = ((head)->cqh_last);				\
+		(var) != (const void *)(head);				\
+		(var) = ((var)->field.cqe_prev))
+
+/*
+ * Circular queue access methods.
+ */
+#define	CIRCLEQ_EMPTY(head)		((head)->cqh_first == (void *)(head))
+#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
+#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
+#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
+#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
+
+#define CIRCLEQ_LOOP_NEXT(head, elm, field)				\
+	(((elm)->field.cqe_next == (void *)(head))			\
+	    ? ((head)->cqh_first)					\
+	    : (elm->field.cqe_next))
+#define CIRCLEQ_LOOP_PREV(head, elm, field)				\
+	(((elm)->field.cqe_prev == (void *)(head))			\
+	    ? ((head)->cqh_last)					\
+	    : (elm->field.cqe_prev))
+
+#endif	/* sys/queue.h */
diff --git a/trunk/toolchain/musl/patches/100-add_glob_onlydir.patch b/trunk/toolchain/musl/patches/100-add_glob_onlydir.patch
new file mode 100644
index 00000000..db0bc22a
--- /dev/null
+++ b/trunk/toolchain/musl/patches/100-add_glob_onlydir.patch
@@ -0,0 +1,11 @@
+--- a/include/glob.h
++++ b/include/glob.h
+@@ -31,6 +31,8 @@ void globfree(glob_t *);
+ #define GLOB_NOESCAPE 0x40
+ #define	GLOB_PERIOD   0x80
+ 
++#define GLOB_ONLYDIR	0x100
++
+ #define GLOB_NOSPACE 1
+ #define GLOB_ABORTED 2
+ #define GLOB_NOMATCH 3
diff --git a/trunk/toolchain/musl/patches/110-getopt_optional_argument_fix.patch b/trunk/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
new file mode 100644
index 00000000..7deebdc2
--- /dev/null
+++ b/trunk/toolchain/musl/patches/110-getopt_optional_argument_fix.patch
@@ -0,0 +1,20 @@
+--- a/src/misc/getopt.c
++++ b/src/misc/getopt.c
+@@ -55,7 +55,9 @@ int getopt(int argc, char * const argv[]
+ 		return '?';
+ 	}
+ 	if (optstring[i+1] == ':') {
++		if (optstring[i+2] == ':') optarg = 0;
+ 		if (optind >= argc) {
++			if (optstring[i+2] == ':') return c;
+ 			if (optstring[0] == ':') return ':';
+ 			if (opterr) {
+ 				write(2, argv[0], strlen(argv[0]));
+@@ -65,7 +67,6 @@ int getopt(int argc, char * const argv[]
+ 			}
+ 			return '?';
+ 		}
+-		if (optstring[i+2] == ':') optarg = 0;
+ 		if (optstring[i+2] != ':' || optpos) {
+ 			optarg = argv[optind++] + optpos;
+ 			optpos = 0;
diff --git a/trunk/toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch b/trunk/toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch
new file mode 100644
index 00000000..3cd909da
--- /dev/null
+++ b/trunk/toolchain/musl/patches/120-getopt_non-option-arguments_fix.patch
@@ -0,0 +1,43 @@
+--- a/src/misc/getopt.c
++++ b/src/misc/getopt.c
+@@ -24,8 +24,23 @@ int getopt(int argc, char * const argv[]
+ 		optind = 1;
+ 	}
+ 
+-	if (optind >= argc || !argv[optind] || argv[optind][0] != '-' || !argv[optind][1])
++	if (optind >= argc || !argv[optind])
+ 		return -1;
++
++	if (argv[optind][0] != '-') {
++		/* GNU extension */
++		if (optstring[0] == '-') {
++			optarg = argv[optind];
++			optind++;
++			return 1;
++		}
++
++		return -1;
++	}
++
++	if (!argv[optind][1])
++		return -1;
++
+ 	if (argv[optind][1] == '-' && !argv[optind][2])
+ 		return optind++, -1;
+ 
+--- a/src/misc/getopt_long.c
++++ b/src/misc/getopt_long.c
+@@ -12,7 +12,12 @@ static int __getopt_long(int argc, char
+ 		__optpos = 0;
+ 		optind = 1;
+ 	}
+-	if (optind >= argc || !argv[optind] || argv[optind][0] != '-') return -1;
++	if (optind >= argc || !argv[optind])
++		return -1;
++
++	if (argv[optind][0] != '-')
++		return getopt(argc, argv, optstring);
++
+ 	if ((longonly && argv[optind][1]) ||
+ 		(argv[optind][1] == '-' && argv[optind][2]))
+ 	{
diff --git a/trunk/toolchain/musl/patches/900-iconv_size_hack.patch b/trunk/toolchain/musl/patches/900-iconv_size_hack.patch
new file mode 100644
index 00000000..f5418db8
--- /dev/null
+++ b/trunk/toolchain/musl/patches/900-iconv_size_hack.patch
@@ -0,0 +1,68 @@
+--- a/src/locale/iconv.c
++++ b/src/locale/iconv.c
+@@ -44,6 +44,7 @@ static const unsigned char charmaps[] =
+ "ucs4\0ucs4be\0utf32\0utf32be\0\0\300"
+ "ucs4le\0utf32le\0\0\303"
+ "ascii\0usascii\0iso646\0iso646us\0\0\307"
++#ifdef FULL_ICONV
+ "eucjp\0\0\320"
+ "shiftjis\0sjis\0\0\321"
+ "gb18030\0\0\330"
+@@ -51,6 +52,7 @@ static const unsigned char charmaps[] =
+ "gb2312\0\0\332"
+ "big5\0bigfive\0cp950\0big5hkscs\0\0\340"
+ "euckr\0ksc5601\0ksx1001\0cp949\0\0\350"
++#endif
+ #include "codepages.h"
+ ;
+ 
+@@ -58,6 +60,7 @@ static const unsigned short legacy_chars
+ #include "legacychars.h"
+ };
+ 
++#ifdef FULL_ICONV
+ static const unsigned short jis0208[84][94] = {
+ #include "jis0208.h"
+ };
+@@ -77,6 +80,7 @@ static const unsigned short hkscs[] = {
+ static const unsigned short ksc[93][94] = {
+ #include "ksc.h"
+ };
++#endif
+ 
+ static int fuzzycmp(const unsigned char *a, const unsigned char *b)
+ {
+@@ -217,6 +221,7 @@ size_t iconv(iconv_t cd0, char **restric
+ 				c = ((c-0xd7c0)<<10) + (d-0xdc00);
+ 			}
+ 			break;
++#ifdef FULL_ICONV
+ 		case SHIFT_JIS:
+ 			if (c-0xa1 <= 0xdf-0xa1) {
+ 				c += 0xff61-0xa1;
+@@ -363,6 +368,7 @@ size_t iconv(iconv_t cd0, char **restric
+ 			c = ksc[c][d];
+ 			if (!c) goto ilseq;
+ 			break;
++#endif
+ 		default:
+ 			if (c < 128+type) break;
+ 			c -= 128+type;
+--- a/src/locale/codepages.h
++++ b/src/locale/codepages.h
+@@ -118,6 +118,7 @@
+ "\0\0\0\100\15\0\344\0\0\0\0\0\0\0\0\0\0\0\0\0\103\270\1\0\0\0\340\1\200\40"
+ "\230\0\0\0\0\0\44\341\12\0"
+ 
++#ifdef FULL_ICONV
+ "cp1250\0"
+ "windows1250\0"
+ "\0\0"
+@@ -214,6 +215,7 @@
+ "\0\0\0\0\0\0\0\0\0\15\0\0\0\0\0\0\0\0\0\0\266\0\0\0\0\102\0\220\13\0"
+ "\0\234\2\0\0\0\0\0\0\0\0\244\202\13\0\0\0\0\100\15\0\0\0\0\0\0\0\0\0\0"
+ "\267\0\0\0\0\103\0\240\13\0\0\240\2\0\0\0\0\0\0\0\0\250\62\45\0"
++#endif
+ 
+ "koi8r\0"
+ "\0\0"
diff --git a/trunk/toolchain/uClibc/Config.in b/trunk/toolchain/uClibc/Config.in
new file mode 100644
index 00000000..08ea00a3
--- /dev/null
+++ b/trunk/toolchain/uClibc/Config.in
@@ -0,0 +1,21 @@
+# Choose uclibc version.
+
+choice
+	prompt "uClibc Version"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	default UCLIBC_USE_VERSION_0_9_33
+	help
+	  Select the version of uClibc you wish to use.
+
+	config UCLIBC_USE_VERSION_0_9_33
+		select UCLIBC_VERSION_0_9_33
+		bool "uClibc 0.9.33.2"
+
+endchoice
+
+# Debug version.
+
+config UCLIBC_ENABLE_DEBUG
+	bool "Build with debug information"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	default n
diff --git a/trunk/toolchain/uClibc/Config.version b/trunk/toolchain/uClibc/Config.version
new file mode 100644
index 00000000..dd302f25
--- /dev/null
+++ b/trunk/toolchain/uClibc/Config.version
@@ -0,0 +1,9 @@
+config UCLIBC_VERSION
+	string
+	depends on USE_UCLIBC
+	default "0.9.33.2"       if UCLIBC_VERSION_0_9_33
+	default "0.9.33.2"
+
+config UCLIBC_VERSION_0_9_33
+	default y if !TOOLCHAINOPTS && USE_UCLIBC
+	bool
diff --git a/trunk/toolchain/uClibc/Makefile b/trunk/toolchain/uClibc/Makefile
new file mode 100644
index 00000000..a5fb54bd
--- /dev/null
+++ b/trunk/toolchain/uClibc/Makefile
@@ -0,0 +1,41 @@
+PATH_PREFIX=.
+
+include ./common.mk
+
+HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed
+
+HOST_BUILD_PARALLEL:=1
+
+define Host/SetToolchainInfo
+	$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.uclibc.org/,' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(LIBC_SO_VERSION),' $(TOOLCHAIN_DIR)/info.mk
+endef
+
+define Host/Compile
+	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(HOST_BUILD_DIR)/Rules.mak
+	$(UCLIBC_MAKE) PREFIX= all
+endef
+
+define Host/Install
+	$(call Host/SetToolchainInfo)
+	$(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
+	$(CP) $(HOST_BUILD_DIR)/libc/libc_so.a $(TOOLCHAIN_DIR)/lib/
+	$(CP) $(HOST_BUILD_DIR)/libpthread/*/libpthread_so.a $(TOOLCHAIN_DIR)/lib/
+	( cd $(TOOLCHAIN_DIR) ; \
+		for d in lib usr/lib ; do \
+		  for f in libc.so libpthread.so libgcc_s.so ; do \
+		    if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \
+		      $(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \
+		    fi \
+		  done \
+		done \
+	)
+	rm -f \
+		$(TOOLCHAIN_DIR)/lib/libresolv*.so* \
+		$(TOOLCHAIN_DIR)/lib/libnsl*.so*
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/uClibc/common.mk b/trunk/toolchain/uClibc/common.mk
new file mode 100644
index 00000000..e507dc6f
--- /dev/null
+++ b/trunk/toolchain/uClibc/common.mk
@@ -0,0 +1,97 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
+
+PKG_NAME:=uClibc
+PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
+PKG_SOURCE_URL:=http://www.uclibc.org/downloads
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+LIBC_SO_VERSION:=$(PKG_VERSION)
+PATCH_DIR:=$(PATH_PREFIX)/patches-$(PKG_VERSION)
+CONFIG_DIR:=$(PATH_PREFIX)/config-$(PKG_VERSION)
+
+PKG_MD5SUM_0.9.33.2 = a338aaffc56f0f5040e6d9fa8a12eda1
+PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION))
+
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
+		-e 's/i.86/i386/' \
+		-e 's/sparc.*/sparc/' \
+		-e 's/arm.*/arm/g' \
+		-e 's/avr32.*/avr32/g' \
+		-e 's/m68k.*/m68k/' \
+		-e 's/ppc/powerpc/g' \
+		-e 's/v850.*/v850/g' \
+		-e 's/sh64/sh/' \
+		-e 's/sh[234].*/sh/' \
+		-e 's/mips.*/mips/' \
+		-e 's/mipsel.*/mips/' \
+		-e 's/cris.*/cris/' \
+)
+
+GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \
+	$(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) \
+	$(if $(CONFIG_UCLIBC_ENABLE_DEBUG),$(if $(wildcard $(CONFIG_DIR)/debug),'+' $(CONFIG_DIR)/debug)) \
+	$(CONFIG_DIR)/$(ARCH)$(strip \
+		$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD), \
+			$(if $(CONFIG_MIPS64_ABI),.$(subst ",,$(CONFIG_MIPS64_ABI)), \
+			$(if $(CONFIG_HAS_SPE_FPU),$(if $(wildcard $(CONFIG_DIR)/$(ARCH).e500),.e500)))))
+
+CPU_CFLAGS = \
+	-funsigned-char -fno-builtin -fno-asm \
+	--std=gnu99 -ffunction-sections -fdata-sections \
+	-Wno-unused-but-set-variable \
+	$(TARGET_CFLAGS) -ggdb
+
+UCLIBC_MAKE = PATH='$(TOOLCHAIN_DIR)/initial/bin:$(TARGET_PATH)' $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+	$(TARGET_CONFIGURE_OPTS) \
+	DEVEL_PREFIX=/ \
+	RUNTIME_PREFIX=/ \
+	HOSTCC="$(HOSTCC)" \
+	CPU_CFLAGS="$(CPU_CFLAGS)" \
+	ARCH="$(CONFIG_ARCH)" \
+	LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \
+	DOSTRIP=""
+
+define Host/Prepare
+	$(call Host/Prepare/Default)
+	$(if $(strip $(QUILT)), \
+		cd $(HOST_BUILD_DIR); \
+		if $(QUILT_CMD) next >/dev/null 2>&1; then \
+			$(QUILT_CMD) push -a; \
+		fi
+	)
+	ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+endef
+
+define Host/Configure
+	$(GEN_CONFIG) > $(HOST_BUILD_DIR)/.config.new
+	$(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(BUILD_DIR_TOOLCHAIN)/linux-dev/include\",g' \
+		-e 's,^.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n,y),g' \
+		-e 's,^.*UCLIBC_HAS_SOFT_FLOAT.*,UCLIBC_HAS_SOFT_FLOAT=$(if $(CONFIG_SOFT_FLOAT),y,n),g' \
+		-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
+		-e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
+		-e 's,^.*UCLIBC_BUILD_ALL_LOCALE.*,UCLIBC_BUILD_ALL_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \
+		$(HOST_BUILD_DIR)/.config.new
+	cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \
+		cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \
+		$(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
+		$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
+		cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last; \
+	}
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) \
+		$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev
+endef
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/arm b/trunk/toolchain/uClibc/config-0.9.33.2/arm
new file mode 100644
index 00000000..b68617bb
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/arm
@@ -0,0 +1,7 @@
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+# COMPILE_IN_THUMB_MODE is not set
+TARGET_ARCH="arm"
+TARGET_arm=y
+# USE_BX is not set
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/armeb b/trunk/toolchain/uClibc/config-0.9.33.2/armeb
new file mode 100644
index 00000000..d4932e86
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/armeb
@@ -0,0 +1,7 @@
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_WANTS_BIG_ENDIAN=y
+# COMPILE_IN_THUMB_MODE is not set
+TARGET_ARCH="arm"
+TARGET_arm=y
+# USE_BX is not set
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/avr32 b/trunk/toolchain/uClibc/config-0.9.33.2/avr32
new file mode 100644
index 00000000..729fbc9a
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/avr32
@@ -0,0 +1,12 @@
+ARCH_BIG_ENDIAN=y
+CONFIG_AVR32_AP7=y
+FORCE_SHAREABLE_TEXT_SEGMENTS=y
+LINKRELAX=y
+LINUXTHREADS_OLD=y
+TARGET_ARCH="avr32"
+TARGET_avr32=y
+UCLIBC_HAS_FPU=y
+# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+# UCLIBC_HAS_STRING_ARCH_OPT is not set
+# UCLIBC_HAS_THREADS_NATIVE is not set
+UNIX98PTY_ONLY=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/common b/trunk/toolchain/uClibc/config-0.9.33.2/common
new file mode 100644
index 00000000..c587b9a9
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/common
@@ -0,0 +1,213 @@
+# ARCH_ANY_ENDIAN is not set
+ARCH_HAS_MMU=y
+# ARCH_HAS_NO_LDSO is not set
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_LITTLE_ENDIAN is not set
+ARCH_USE_MMU=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+ASSUME_DEVPTS=y
+# COMPAT_ATEXIT is not set
+CROSS_COMPILER_PREFIX=""
+DEVEL_PREFIX="/usr/"
+# DOASSERTS is not set
+# DODEBUG is not set
+# DODEBUG_PT is not set
+# DOMULTI is not set
+DOPIC=y
+DOSTRIP=y
+DO_C99_MATH=y
+# DO_XSI_MATH is not set
+# EXTRA_WARNINGS is not set
+FORCE_OPTIONS_FOR_ARCH=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+# HARDWIRED_ABSPATH is not set
+# HAS_NO_THREADS is not set
+HAVE_DOT_CONFIG=y
+# HAVE_NO_PIC is not set
+# HAVE_NO_SSP is not set
+HAVE_SHARED=y
+KERNEL_HEADERS="."
+LDSO_BASE_FILENAME="ld.so"
+LDSO_CACHE_SUPPORT=y
+# LDSO_GNU_HASH_SUPPORT is not set
+LDSO_LD_LIBRARY_PATH=y
+LDSO_LDD_SUPPORT=y
+# LDSO_NO_CLEANUP is not set
+# LDSO_PRELINK_SUPPORT is not set
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+# LDSO_PRELOAD_ENV_SUPPORT is not set
+LDSO_RUNPATH=y
+# LDSO_SEARCH_INTERP_PATH is not set
+# LDSO_STANDALONE_SUPPORT is not set
+# LINUXTHREADS_NEW is not set
+# LINUXTHREADS_OLD is not set
+# UCLIBC_HAS_BACKTRACE is not set
+UCLIBC_HAS_THREADS_NATIVE=y
+# MALLOC is not set
+MALLOC_GLIBC_COMPAT=y
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MULTILIB_DIR="lib"
+PTHREADS_DEBUG_SUPPORT=y
+RUNTIME_PREFIX="/"
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+TARGET_SUBARCH=""
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_c6x is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_BUILD_NOEXECSTACK=y
+# UCLIBC_BUILD_NOW is not set
+# UCLIBC_BUILD_PIE is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_CTOR_DTOR=y
+UCLIBC_DYNAMIC_ATEXIT=y
+UCLIBC_EXTRA_CFLAGS=""
+UCLIBC_GRP_BUFFER_SIZE=256
+UCLIBC_HAS_ADVANCED_REALTIME=y
+# UCLIBC_HAS_ARC4RANDOM is not set
+UCLIBC_HAS_BSD_ERR=y
+UCLIBC_HAS_BSD_RES_CLOSE=y
+# UCLIBC_HAS_COMPAT_RES_STATE is not set
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_CTYPE_SIGNED=y
+UCLIBC_HAS_CTYPE_TABLES=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+# UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_FTS=y
+UCLIBC_HAS_FTW=y
+# UCLIBC_HAS_FULL_RPC is not set
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+UCLIBC_HAS_GNU_GLOB=y
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_LFS=y
+UCLIBC_HAS_LIBNSL_STUB=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBUTIL=y
+# UCLIBC_HAS_LOCALE is not set
+# UCLIBC_BUILD_ALL_LOCALE is not set
+# UCLIBC_BUILD_MINIMAL_LOCALE is not set
+# UCLIBC_PREGENERATED_LOCALE_DATA is not set
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_NFTW=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+UCLIBC_HAS_PRINTF_M_SPEC=y
+# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS_PTY=y
+UCLIBC_HAS_REALTIME=y
+# UCLIBC_HAS_REENTRANT_RPC is not set
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+# UCLIBC_HAS_RPC is not set
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_SOFT_FLOAT=y
+# UCLIBC_HAS_SSP is not set
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SYSLOG=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+# UCLIBC_HAS_UTMPX is not set
+UCLIBC_HAS_WCHAR=y
+UCLIBC_HAS_WORDEXP=y
+# UCLIBC_HAS_XATTR is not set
+# UCLIBC_HAS_XLOCALE is not set
+UCLIBC_HAS___PROGNAME=y
+# UCLIBC_LINUX_MODULE_24 is not set
+UCLIBC_LINUX_MODULE_26=y
+UCLIBC_LINUX_SPECIFIC=y
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_MJN3_ONLY is not set
+# UCLIBC_NTP_LEGACY is not set
+# USE_OLD_VFPRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_PWD_BUFFER_SIZE=256
+# UCLIBC_STATIC_LDCONFIG is not set
+# UCLIBC_STRICT_HEADERS is not set
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+# UCLIBC_FALLBACK_TO_ETC_LOCALTIME is not set
+UCLIBC_USE_NETLINK=y
+# UNIX98PTY_ONLY is not set
+USE_BX=y
+WARNINGS="-Wall"
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/cris b/trunk/toolchain/uClibc/config-0.9.33.2/cris
new file mode 100644
index 00000000..4164484a
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/cris
@@ -0,0 +1,8 @@
+ARCH_LITTLE_ENDIAN=y
+CONFIG_CRIS=y
+# CONFIG_CRISV32 is not set
+LINUXTHREADS_OLD=y
+TARGET_ARCH="cris"
+TARGET_cris=y
+UCLIBC_HAS_FPU=y
+# UCLIBC_HAS_THREADS_NATIVE is not set
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/debug b/trunk/toolchain/uClibc/config-0.9.33.2/debug
new file mode 100644
index 00000000..b366e66e
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/debug
@@ -0,0 +1,6 @@
+DODEBUG=y
+DODEBUG_PT=y
+PTHREADS_DEBUG_SUPPORT=y
+SUPPORT_LD_DEBUG=y
+SUPPORT_LD_DEBUG_EARLY=y
+UCLIBC_MALLOC_DEBUGGING=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/i386 b/trunk/toolchain/uClibc/config-0.9.33.2/i386
new file mode 100644
index 00000000..5ef264c2
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/i386
@@ -0,0 +1,21 @@
+ARCH_LITTLE_ENDIAN=y
+# CONFIG_386 is not set
+CONFIG_486=y
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_ELAN is not set
+# CONFIG_GENERIC_386 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_NEHEMIAH is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_WINCHIPC6 is not set
+TARGET_ARCH="i386"
+TARGET_i386=y
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/i686 b/trunk/toolchain/uClibc/config-0.9.33.2/i686
new file mode 100644
index 00000000..ba615f6b
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/i686
@@ -0,0 +1,21 @@
+ARCH_LITTLE_ENDIAN=y
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+CONFIG_686=y
+# CONFIG_CRUSOE is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_ELAN is not set
+# CONFIG_GENERIC_386 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_NEHEMIAH is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_WINCHIPC6 is not set
+TARGET_ARCH="i386"
+TARGET_i386=y
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/m68k b/trunk/toolchain/uClibc/config-0.9.33.2/m68k
new file mode 100644
index 00000000..14ce5aef
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/m68k
@@ -0,0 +1,6 @@
+ARCH_BIG_ENDIAN=y
+LINUXTHREADS_OLD=y
+TARGET_ARCH="m68k"
+TARGET_SUBARCH=""
+TARGET_m68k=y
+# UCLIBC_HAS_THREADS_NATIVE is not set
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips b/trunk/toolchain/uClibc/config-0.9.33.2/mips
new file mode 100644
index 00000000..7398c669
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips
@@ -0,0 +1,17 @@
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_WANTS_BIG_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+CONFIG_MIPS_ISA_MIPS32=y
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+# CONFIG_MIPS_ISA_MIPS64 is not set
+# CONFIG_MIPS_N32_ABI is not set
+# CONFIG_MIPS_N64_ABI is not set
+CONFIG_MIPS_O32_ABI=y
+TARGET_ARCH="mips"
+TARGET_mips=y
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64 b/trunk/toolchain/uClibc/config-0.9.33.2/mips64
new file mode 100644
index 00000000..fa5bee3a
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64
@@ -0,0 +1,17 @@
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_WANTS_BIG_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+# CONFIG_MIPS_N32_ABI is not set
+CONFIG_MIPS_N64_ABI=y
+# CONFIG_MIPS_O32_ABI is not set
+TARGET_ARCH="mips"
+TARGET_mips=y
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64.32 b/trunk/toolchain/uClibc/config-0.9.33.2/mips64.32
new file mode 100644
index 00000000..03f7fbae
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64.32
@@ -0,0 +1,18 @@
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_WANTS_BIG_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+# CONFIG_MIPS_N32_ABI is not set
+# CONFIG_MIPS_N64_ABI is not set
+CONFIG_MIPS_O32_ABI=y
+TARGET_ARCH="mips"
+TARGET_mips=y
+TARGET_SUBARCH="mips64"
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64.64 b/trunk/toolchain/uClibc/config-0.9.33.2/mips64.64
new file mode 100644
index 00000000..7b66c2f7
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64.64
@@ -0,0 +1,18 @@
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_WANTS_BIG_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+# CONFIG_MIPS_N32_ABI is not set
+CONFIG_MIPS_N64_ABI=y
+# CONFIG_MIPS_O32_ABI is not set
+TARGET_ARCH="mips"
+TARGET_mips=y
+TARGET_SUBARCH="mips64"
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64.n32 b/trunk/toolchain/uClibc/config-0.9.33.2/mips64.n32
new file mode 100644
index 00000000..84a5de64
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64.n32
@@ -0,0 +1,18 @@
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_WANTS_BIG_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+CONFIG_MIPS_N32_ABI=y
+# CONFIG_MIPS_N64_ABI is not set
+# CONFIG_MIPS_O32_ABI is not set
+TARGET_ARCH="mips"
+TARGET_mips=y
+TARGET_SUBARCH="mips64"
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64el b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el
new file mode 100644
index 00000000..1ca764f6
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el
@@ -0,0 +1,17 @@
+ARCH_ANY_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_LITTLE_ENDIAN=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+# CONFIG_MIPS_N32_ABI is not set
+CONFIG_MIPS_N64_ABI=y
+# CONFIG_MIPS_O32_ABI is not set
+TARGET_ARCH="mips"
+TARGET_mips=y
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.32 b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.32
new file mode 100644
index 00000000..73b1f9f1
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.32
@@ -0,0 +1,18 @@
+ARCH_ANY_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_LITTLE_ENDIAN=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+# CONFIG_MIPS_N32_ABI is not set
+# CONFIG_MIPS_N64_ABI is not set
+CONFIG_MIPS_O32_ABI=y
+TARGET_ARCH="mips"
+TARGET_mips=y
+TARGET_SUBARCH="mips64"
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.64 b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.64
new file mode 100644
index 00000000..790f2104
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.64
@@ -0,0 +1,18 @@
+ARCH_ANY_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_LITTLE_ENDIAN=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+# CONFIG_MIPS_N32_ABI is not set
+CONFIG_MIPS_N64_ABI=y
+# CONFIG_MIPS_O32_ABI is not set
+TARGET_ARCH="mips"
+TARGET_mips=y
+TARGET_SUBARCH="mips64"
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.n32 b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.n32
new file mode 100644
index 00000000..c2929bf7
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mips64el.n32
@@ -0,0 +1,18 @@
+ARCH_ANY_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_LITTLE_ENDIAN=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+CONFIG_MIPS_ISA_MIPS64=y
+CONFIG_MIPS_N32_ABI=y
+# CONFIG_MIPS_N64_ABI is not set
+# CONFIG_MIPS_O32_ABI is not set
+TARGET_ARCH="mips"
+TARGET_mips=y
+TARGET_SUBARCH="mips64"
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mipsel b/trunk/toolchain/uClibc/config-0.9.33.2/mipsel
new file mode 100644
index 00000000..7648f396
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mipsel
@@ -0,0 +1,17 @@
+ARCH_ANY_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_LITTLE_ENDIAN=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+CONFIG_MIPS_ISA_MIPS32=y
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+# CONFIG_MIPS_ISA_MIPS64 is not set
+# CONFIG_MIPS_N32_ABI is not set
+# CONFIG_MIPS_N64_ABI is not set
+CONFIG_MIPS_O32_ABI=y
+TARGET_ARCH="mips"
+TARGET_mips=y
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/mipsel.cobalt b/trunk/toolchain/uClibc/config-0.9.33.2/mipsel.cobalt
new file mode 100644
index 00000000..323b0aa5
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/mipsel.cobalt
@@ -0,0 +1,17 @@
+ARCH_ANY_ENDIAN=y
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_LITTLE_ENDIAN=y
+ARCH_WANTS_LITTLE_ENDIAN=y
+# CONFIG_MIPS_ISA_1 is not set
+# CONFIG_MIPS_ISA_2 is not set
+CONFIG_MIPS_ISA_3=y
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS32R2 is not set
+# CONFIG_MIPS_ISA_MIPS64 is not set
+# CONFIG_MIPS_N32_ABI is not set
+# CONFIG_MIPS_N64_ABI is not set
+CONFIG_MIPS_O32_ABI=y
+TARGET_ARCH="mips"
+TARGET_mips=y
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/powerpc b/trunk/toolchain/uClibc/config-0.9.33.2/powerpc
new file mode 100644
index 00000000..5b1292d1
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/powerpc
@@ -0,0 +1,6 @@
+ARCH_BIG_ENDIAN=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_ARCH="powerpc"
+TARGET_SUBARCH="classic"
+TARGET_powerpc=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/powerpc.e500 b/trunk/toolchain/uClibc/config-0.9.33.2/powerpc.e500
new file mode 100644
index 00000000..a835c3d5
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/powerpc.e500
@@ -0,0 +1,6 @@
+ARCH_BIG_ENDIAN=y
+# CONFIG_CLASSIC is not set
+CONFIG_E500=y
+TARGET_ARCH="powerpc"
+TARGET_SUBARCH="classic"
+TARGET_powerpc=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/sparc b/trunk/toolchain/uClibc/config-0.9.33.2/sparc
new file mode 100644
index 00000000..e1596c41
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/sparc
@@ -0,0 +1,8 @@
+ARCH_BIG_ENDIAN=y
+# CONFIG_SPARC_V7 is not set
+# CONFIG_SPARC_V8 is not set
+CONFIG_SPARC_V9=y
+# CONFIG_SPARC_V9B is not set
+TARGET_ARCH="sparc"
+TARGET_sparc=y
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/sparc.leon b/trunk/toolchain/uClibc/config-0.9.33.2/sparc.leon
new file mode 100644
index 00000000..eb725ac0
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/sparc.leon
@@ -0,0 +1,8 @@
+ARCH_BIG_ENDIAN=y
+# CONFIG_SPARC_V7 is not set
+CONFIG_SPARC_V8=y
+# CONFIG_SPARC_V9 is not set
+# CONFIG_SPARC_V9B is not set
+TARGET_ARCH="sparc"
+TARGET_sparc=y
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
diff --git a/trunk/toolchain/uClibc/config-0.9.33.2/x86_64 b/trunk/toolchain/uClibc/config-0.9.33.2/x86_64
new file mode 100644
index 00000000..92f0e656
--- /dev/null
+++ b/trunk/toolchain/uClibc/config-0.9.33.2/x86_64
@@ -0,0 +1,6 @@
+ARCH_LITTLE_ENDIAN=y
+# LINUXTHREADS_NEW is not set
+TARGET_ARCH="x86_64"
+TARGET_x86_64=y
+UCLIBC_BSD_SPECIFIC=y 
+UCLIBC_HAS_FPU=y
diff --git a/trunk/toolchain/uClibc/headers/Makefile b/trunk/toolchain/uClibc/headers/Makefile
new file mode 100644
index 00000000..67a2d95c
--- /dev/null
+++ b/trunk/toolchain/uClibc/headers/Makefile
@@ -0,0 +1,26 @@
+PATH_PREFIX:=..
+
+include ../common.mk
+
+HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.headers_built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_headers_installed
+
+define Host/Compile
+
+endef
+
+define Host/Install
+	PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
+		PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
+		DEVEL_PREFIX=/ \
+		RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
+		HOSTCC="$(HOSTCC)" \
+		CC="$(TARGET_CC)" \
+		CPU_CFLAGS="$(TARGET_CFLAGS)" \
+		ARCH="$(CONFIG_ARCH)" \
+		pregen \
+		install_headers
+endef
+
+$(eval $(call HostBuild))
+
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/009_backport_mount.h-update.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/009_backport_mount.h-update.patch
new file mode 100644
index 00000000..47fb624e
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/009_backport_mount.h-update.patch
@@ -0,0 +1,91 @@
+From 76ff037059f6d387bde9d540f7e27a2b376d7cd7 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Date: Fri, 18 Jan 2013 11:12:49 +0100
+Subject: [PATCH] mount.h: update
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ include/sys/mount.h | 45 +++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 35 insertions(+), 10 deletions(-)
+
+diff --git a/include/sys/mount.h b/include/sys/mount.h
+index fbd61fd..c0e7b84 100644
+--- a/include/sys/mount.h
++++ b/include/sys/mount.h
+@@ -1,5 +1,5 @@
+ /* Header file for mounting/unmount Linux filesystems.
+-   Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
++   Copyright (C) 1996-2000, 2004, 2010, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -46,23 +46,46 @@ enum
+ #define MS_REMOUNT	MS_REMOUNT
+   MS_MANDLOCK = 64,		/* Allow mandatory locks on an FS.  */
+ #define MS_MANDLOCK	MS_MANDLOCK
+-  S_WRITE = 128,		/* Write on file/directory/symlink.  */
+-#define S_WRITE		S_WRITE
+-  S_APPEND = 256,		/* Append-only file.  */
+-#define S_APPEND	S_APPEND
+-  S_IMMUTABLE = 512,		/* Immutable file.  */
+-#define S_IMMUTABLE	S_IMMUTABLE
++  MS_DIRSYNC = 128,		/* Directory modifications are synchronous.  */
++#define MS_DIRSYNC	MS_DIRSYNC
+   MS_NOATIME = 1024,		/* Do not update access times.  */
+ #define MS_NOATIME	MS_NOATIME
+   MS_NODIRATIME = 2048,		/* Do not update directory access times.  */
+ #define MS_NODIRATIME	MS_NODIRATIME
+   MS_BIND = 4096,		/* Bind directory at different place.  */
+ #define MS_BIND		MS_BIND
++  MS_MOVE = 8192,
++#define MS_MOVE		MS_MOVE
++  MS_REC = 16384,
++#define MS_REC		MS_REC
++  MS_SILENT = 32768,
++#define MS_SILENT	MS_SILENT
++  MS_POSIXACL = 1 << 16,	/* VFS does not apply the umask.  */
++#define MS_POSIXACL	MS_POSIXACL
++  MS_UNBINDABLE = 1 << 17,	/* Change to unbindable.  */
++#define MS_UNBINDABLE	MS_UNBINDABLE
++  MS_PRIVATE = 1 << 18,		/* Change to private.  */
++#define MS_PRIVATE	MS_PRIVATE
++  MS_SLAVE = 1 << 19,		/* Change to slave.  */
++#define MS_SLAVE	MS_SLAVE
++  MS_SHARED = 1 << 20,		/* Change to shared.  */
++#define MS_SHARED	MS_SHARED
++  MS_RELATIME = 1 << 21,	/* Update atime relative to mtime/ctime.  */
++#define MS_RELATIME	MS_RELATIME
++  MS_KERNMOUNT = 1 << 22,	/* This is a kern_mount call.  */
++#define MS_KERNMOUNT	MS_KERNMOUNT
++  MS_I_VERSION =  1 << 23,	/* Update inode I_version field.  */
++#define MS_I_VERSION	MS_I_VERSION
++  MS_STRICTATIME = 1 << 24,	/* Always perform atime updates.  */
++#define MS_STRICTATIME	MS_STRICTATIME
++  MS_ACTIVE = 1 << 30,
++#define MS_ACTIVE	MS_ACTIVE
++  MS_NOUSER = 1 << 31
++#define MS_NOUSER	MS_NOUSER
+ };
+ 
+ /* Flags that can be altered by MS_REMOUNT  */
+-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
+-		     |MS_NODIRATIME)
++#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
+ 
+ 
+ /* Magic mount flag number. Has to be or-ed to the flag values.  */
+@@ -99,8 +122,10 @@ enum
+ #define MNT_FORCE MNT_FORCE
+   MNT_DETACH = 2,		/* Just detach from the tree.  */
+ #define MNT_DETACH MNT_DETACH
+-  MNT_EXPIRE = 4		/* Mark for expiry.  */
++  MNT_EXPIRE = 4,		/* Mark for expiry.  */
+ #define MNT_EXPIRE MNT_EXPIRE
++  UMOUNT_NOFOLLOW = 8		/* Don't follow symlink on umount.  */
++#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
+ };
+ 
+ 
+-- 
+1.9.1
+
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch
new file mode 100644
index 00000000..b5ce0912
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch
@@ -0,0 +1,184 @@
+From 8cfb43de636faa401634340d1a18404844f9ba5a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 6 May 2012 03:50:44 -0400
+Subject: [PATCH] stdio: implement assignment-allocation "m" character
+
+The latest POSIX spec introduces a "m" character to allocate buffers for
+the user when using scanf type functions.  This is like the old glibc "a"
+flag, but now standardized.  With packages starting to use these, we need
+to implement it.
+
+for example:
+	char *s;
+	sscanf("foo", "%ms", &s);
+	printf("%s\n", s);
+	free(s);
+This will automatically allocate storage for "s", read in "foo" to it,
+and then display it.
+
+I'm not terribly familiar with the stdio layer, so this could be wrong.
+But it seems to work for me.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ extra/Configs/Config.in | 13 ----------
+ libc/stdio/_scanf.c     | 68 ++++++++++++++++++++++++++++---------------------
+ 2 files changed, 39 insertions(+), 42 deletions(-)
+
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -1590,19 +1590,6 @@ config UCLIBC_PRINTF_SCANF_POSITIONAL_AR
+ 
+ 	  Most people will answer 9.
+ 
+-
+-config UCLIBC_HAS_SCANF_GLIBC_A_FLAG
+-	bool "Support glibc's 'a' flag for scanf string conversions (not implemented)"
+-	help
+-	  NOTE!!!  Currently Not Implemented!!! Just A Place Holder!!  NOTE!!!
+-	  NOTE!!!  Conflicts with an ANSI/ISO C99 scanf flag!!         NOTE!!!
+-
+-	  Answer Y to enable support for glibc's 'a' flag for the scanf string
+-	  conversions '%s', '%[', '%ls', '%l[', and '%S'.  This is used to
+-	  auto-allocate sufficient memory to hold the data retrieved.
+-
+-	  Most people will answer N.
+-
+ choice
+ 	prompt "Stdio buffer size"
+ 	default UCLIBC_HAS_STDIO_BUFSIZ_4096
+--- a/libc/stdio/_scanf.c
++++ b/libc/stdio/_scanf.c
+@@ -77,14 +77,6 @@
+ #include <bits/uClibc_fpmax.h>
+ #endif /* __UCLIBC_HAS_FLOATS__ */
+ 
+-#ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#ifdef L_vfscanf
+-/* only emit this once */
+-#warning Forcing undef of __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__ until implemented!
+-#endif
+-#undef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#endif
+-
+ #undef __STDIO_HAS_VSSCANF
+ #if defined(__STDIO_BUFFERS) || !defined(__UCLIBC_HAS_WCHAR__) || defined(__UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__)
+ #define __STDIO_HAS_VSSCANF 1
+@@ -433,8 +425,9 @@ libc_hidden_def(vswscanf)
+ 
+ 
+ /* float layout          0123456789012345678901  repeat n for "l[" */
+-#define SPEC_CHARS		"npxXoudifFeEgGaACSncs["
+-/*                       npxXoudif eEgG  CS cs[ */
++#define SPEC_CHARS		"npxXoudifFeEgGaACSnmcs["
++/*                       npxXoudif eEgG  CS  cs[ */
++/* NOTE: the 'm' flag must come before any convs that support it */
+ 
+ /* NOTE: Ordering is important!  In particular, CONV_LEFTBRACKET
+  * must immediately precede CONV_c. */
+@@ -444,7 +437,7 @@ enum {
+ 	CONV_p,
+ 	CONV_x, CONV_X,	CONV_o,	CONV_u,	CONV_d,	CONV_i,
+ 	CONV_f, CONV_F, CONV_e, CONV_E, CONV_g, CONV_G, CONV_a, CONV_A,
+-	CONV_C, CONV_S, CONV_LEFTBRACKET, CONV_c, CONV_s, CONV_leftbracket,
++	CONV_C, CONV_S, CONV_LEFTBRACKET, CONV_m, CONV_c, CONV_s, CONV_leftbracket,
+ 	CONV_percent, CONV_whitespace /* not in SPEC_* and no flags */
+ };
+ 
+@@ -474,7 +467,7 @@ enum {
+ 	FLAG_SURPRESS   =   0x10,	/* MUST BE 1ST!!  See DO_FLAGS. */
+ 	FLAG_THOUSANDS	=	0x20,
+ 	FLAG_I18N		=	0x40,	/* only works for d, i, u */
+-	FLAG_MALLOC     =   0x80,	/* only works for s, S, and [ (and l[)*/
++	FLAG_MALLOC     =   0x80,	/* only works for c, s, S, and [ (and l[)*/
+ };
+ 
+ 
+@@ -491,7 +484,7 @@ enum {
+ 	/* fFeEgGaA */	(0x0c|FLAG_SURPRESS|FLAG_THOUSANDS|FLAG_I18N), \
+ 	/* C */			(   0|FLAG_SURPRESS), \
+ 	/* S and l[ */	(   0|FLAG_SURPRESS|FLAG_MALLOC), \
+-	/* c */			(0x04|FLAG_SURPRESS), \
++	/* c */			(0x04|FLAG_SURPRESS|FLAG_MALLOC), \
+ 	/* s and [ */	(0x04|FLAG_SURPRESS|FLAG_MALLOC), \
+ }
+ 
+@@ -904,17 +897,17 @@ int attribute_hidden __psfs_parse_spec(r
+ 		if (*psfs->fmt == *p) {
+ 			int p_m_spec_chars = p - spec_chars;
+ 
+-#ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#error implement gnu a flag
+-			if ((*p == 'a')
+-				&& ((psfs->fmt[1] == '[') || ((psfs->fmt[1]|0x20) == 's'))
+-				) {		/* Assumes ascii for 's' and 'S' test. */
+-				psfs->flags |= FLAG_MALLOC;
++			if (*p == 'm' &&
++				(psfs->fmt[1] == '[' || psfs->fmt[1] == 'c' ||
++				 /* Assumes ascii for 's' and 'S' test. */
++				 (psfs->fmt[1] | 0x20) == 's'))
++			{
++				if (psfs->store)
++					psfs->flags |= FLAG_MALLOC;
+ 				++psfs->fmt;
+ 				++p;
+-				continue; /* The related conversions follow 'a'. */
++				continue; /* The related conversions follow 'm'. */
+ 			}
+-#endif /* __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__ */
+ 
+ 			for (p = spec_ranges; p_m_spec_chars > *p ; ++p) {}
+ 			if (((psfs->dataargtype >> 8) | psfs->flags)
+@@ -1265,12 +1258,6 @@ int VFSCANF (FILE *__restrict fp, const
+ 				while (*wf && __isascii(*wf) && (b < buf + sizeof(buf) - 1)) {
+ 					*b++ = *wf++;
+ 				}
+-#ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
+-#error this is wrong... we need to ched in __psfs_parse_spec instead since this checks last char in buffer and conversion my have stopped before it.
+-				if ((*b == 'a') && ((*wf == '[') || ((*wf|0x20) == 's'))) {
+-					goto DONE;	/* Spec was excessively long. */
+-				}
+-#endif /* __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__ */
+ 				*b = 0;
+ 				if (b == buf) { /* Bad conversion specifier! */
+ 					goto DONE;
+@@ -1390,13 +1377,36 @@ int VFSCANF (FILE *__restrict fp, const
+ 				}
+ 
+ 				if (psfs.conv_num == CONV_s) {
++					/* We might have to handle the allocation ourselves */
++					int len;
++					/* With 'm', we actually got a pointer to a pointer */
++					unsigned char **ptr = (void *)b;
++
++					i = 0;
++					if (psfs.flags & FLAG_MALLOC) {
++						len = 0;
++						b = NULL;
++					} else
++						len = -1;
++
+ 					/* Yes, believe it or not, a %s conversion can store nuls. */
+ 					while ((__scan_getc(&sc) >= 0) && !isspace(sc.cc)) {
+ 						zero_conversions = 0;
+-						*b = sc.cc;
+-						b += psfs.store;
++						if (i == len) {
++							/* Pick a size that won't trigger a lot of
++							 * mallocs early on ... */
++							len += 256;
++							b = realloc(b, len + 1);
++						}
++						b[i] = sc.cc;
++						i += psfs.store;
+ 						fail = 0;
+ 					}
++
++					if (psfs.flags & FLAG_MALLOC)
++						*ptr = b;
++					/* The code below takes care of terminating NUL */
++					b += i;
+ 				} else {
+ #ifdef __UCLIBC_HAS_WCHAR__
+ 					assert((psfs.conv_num == CONV_LEFTBRACKET) || \
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch
new file mode 100644
index 00000000..f1a8ff51
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch
@@ -0,0 +1,25 @@
+--- a/ldso/libdl/libdl.c
++++ b/ldso/libdl/libdl.c
+@@ -671,7 +671,7 @@ static void *do_dlsym(void *vhandle, con
+ {
+ 	struct elf_resolve *tpnt, *tfrom;
+ 	struct dyn_elf *handle;
+-	ElfW(Addr) from;
++	ElfW(Addr) from = 0;
+ 	struct dyn_elf *rpnt;
+ 	void *ret;
+ 	struct symbol_ref sym_ref = { NULL, NULL };
+@@ -729,7 +729,12 @@ static void *do_dlsym(void *vhandle, con
+ 	tpnt = NULL;
+ 	if (handle == _dl_symbol_tables)
+ 		tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
+-	ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++	do {
++		ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++		if (ret != NULL)
++			break;
++		handle = handle->next;
++	} while (from && handle);
+ 
+ #if defined(USE_TLS) && USE_TLS && defined SHARED
+ 	if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/100-fix_unifdef.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/100-fix_unifdef.patch
new file mode 100644
index 00000000..3d75b6e7
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/100-fix_unifdef.patch
@@ -0,0 +1,11 @@
+--- a/extra/scripts/unifdef.c
++++ b/extra/scripts/unifdef.c
+@@ -78,8 +78,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/
+ #define errx(exit_code, fmt, args...) ({ warnx(fmt, ## args); exit(exit_code); })
+ #define err(exit_code, fmt, args...)  errx(exit_code, fmt ": %s", ## args, strerror(errno))
+ 
+-size_t strlcpy(char *dst, const char *src, size_t siz);
+-
+ /* types of input lines: */
+ typedef enum {
+ 	LT_TRUEI,		/* a true #if with ignore flag */
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/110-compat_macros.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/110-compat_macros.patch
new file mode 100644
index 00000000..a7538b16
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/110-compat_macros.patch
@@ -0,0 +1,51 @@
+--- a/include/string.h
++++ b/include/string.h
+@@ -355,18 +355,40 @@ extern char *index (__const char *__s, i
+ /* Find the last occurrence of C in S (same as strrchr).  */
+ extern char *rindex (__const char *__s, int __c)
+      __THROW __attribute_pure__ __nonnull ((1));
+-# else
+-#  ifdef __UCLIBC_SUSV3_LEGACY_MACROS__
++# elif defined(__UCLIBC_SUSV3_LEGACY_MACROS__) && !defined(_STRINGS_H)
+ /* bcopy/bzero/bcmp/index/rindex are marked LEGACY in SuSv3.
+  * They are replaced as proposed by SuSv3. Don't sync this part
+  * with glibc and keep it in sync with strings.h.  */
+ 
+-#  define bcopy(src,dest,n) (memmove((dest), (src), (n)), (void) 0)
+-#  define bzero(s,n) (memset((s), '\0', (n)), (void) 0)
+-#  define bcmp(s1,s2,n) memcmp((s1), (s2), (size_t)(n))
+-#  define index(s,c) strchr((s), (c))
+-#  define rindex(s,c) strrchr((s), (c))
+-#  endif
++/* Copy N bytes of SRC to DEST (like memmove, but args reversed).  */
++static __inline__ void bcopy (__const void *__src, void *__dest, size_t __n)
++{
++	memmove(__dest, __src, __n);
++}
++
++/* Set N bytes of S to 0.  */
++static __inline__ void bzero (void *__s, size_t __n)
++{
++	memset(__s, 0, __n);
++}
++
++/* Compare N bytes of S1 and S2 (same as memcmp).  */
++static __inline__ int bcmp (__const void *__s1, __const void *__s2, size_t __n)
++{
++	return memcmp(__s1, __s2, __n);
++}
++
++/* Find the first occurrence of C in S (same as strchr).  */
++static __inline__ char *index (__const char *__s, int __c)
++{
++	return strchr(__s, __c);
++}
++
++/* Find the last occurrence of C in S (same as strrchr).  */
++static __inline__ char *rindex (__const char *__s, int __c)
++{
++	return strrchr(__s, __c);
++}
+ # endif
+ 
+ /* Return the position of the first bit set in I, or 0 if none are set.
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/120-adjtimex.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/120-adjtimex.patch
new file mode 100644
index 00000000..dcf9c9b5
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/120-adjtimex.patch
@@ -0,0 +1,14 @@
+--- a/include/sys/timex.h
++++ b/include/sys/timex.h
+@@ -116,9 +116,8 @@ struct timex
+ 
+ __BEGIN_DECLS
+ 
+-#if 0
+-extern int __adjtimex (struct timex *__ntx) __THROW;
+-#endif
++#undef __adjtimex
++#define __adjtimex adjtimex
+ extern int adjtimex (struct timex *__ntx) __THROW;
+ libc_hidden_proto(adjtimex)
+ 
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch
new file mode 100644
index 00000000..bd9ed380
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch
@@ -0,0 +1,10 @@
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -1631,6 +1631,7 @@ int attribute_hidden __read_etc_hosts_r(
+ 	 * struct in[6]_addr
+ 	 * char line_buffer[BUFSZ+];
+ 	 */
++	memset(buf, 0, buflen);
+ 	parser->data = buf;
+ 	parser->data_len = aliaslen;
+ 	parser->line_len = buflen - aliaslen;
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/132-inet_fix_res_init.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/132-inet_fix_res_init.patch
new file mode 100644
index 00000000..c935821b
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/132-inet_fix_res_init.patch
@@ -0,0 +1,15 @@
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -3654,11 +3654,11 @@ res_init(void)
+ 	 */
+ 	if (!_res.id)
+ 		_res.id = res_randomid();
+-	__res_sync = res_sync_func;
+ 
+ 	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
+ 
+ 	__res_vinit(&_res, 1);
++	__res_sync = res_sync_func;
+ 
+ 	return 0;
+ }
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch
new file mode 100644
index 00000000..0bf89e89
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/133-inet6-scoped-getnameinfo.patch
@@ -0,0 +1,26 @@
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -317,6 +317,7 @@
+ #include <sys/utsname.h>
+ #include <sys/un.h>
+ #include <sys/stat.h>
++#include <net/if.h>
+ #include <bits/uClibc_mutex.h>
+ #include "internal/parse_config.h"
+ 
+@@ -1861,7 +1862,6 @@
+ 					c = inet_ntop(AF_INET6,
+ 						(const void *) &sin6p->sin6_addr,
+ 						host, hostlen);
+-#if 0
+ 					/* Does scope id need to be supported? */
+ 					uint32_t scopeid;
+ 					scopeid = sin6p->sin6_scope_id;
+@@ -1898,7 +1898,6 @@
+ 							return EAI_SYSTEM;
+ 						memcpy(host + real_hostlen, scopebuf, scopelen + 1);
+ 					}
+-#endif
+ 				}
+ #endif /* __UCLIBC_HAS_IPV6__ */
+ #if defined __UCLIBC_HAS_IPV4__
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch
new file mode 100644
index 00000000..4c23141e
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/135-inet_fix_threaded_use_of_res_functions.patch
@@ -0,0 +1,126 @@
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -3536,6 +3536,61 @@
+ 	return 0;
+ }
+ 
++static unsigned int
++res_randomid(void)
++{
++	return 0xffff & getpid();
++}
++
++/* Our res_init never fails (always returns 0) */
++int
++res_init(void)
++{
++	/*
++	 * These three fields used to be statically initialized.  This made
++	 * it hard to use this code in a shared library.  It is necessary,
++	 * now that we're doing dynamic initialization here, that we preserve
++	 * the old semantics: if an application modifies one of these three
++	 * fields of _res before res_init() is called, res_init() will not
++	 * alter them.  Of course, if an application is setting them to
++	 * _zero_ before calling res_init(), hoping to override what used
++	 * to be the static default, we can't detect it and unexpected results
++	 * will follow.  Zero for any of these fields would make no sense,
++	 * so one can safely assume that the applications were already getting
++	 * unexpected results.
++	 *
++	 * _res.options is tricky since some apps were known to diddle the bits
++	 * before res_init() was first called. We can't replicate that semantic
++	 * with dynamic initialization (they may have turned bits off that are
++	 * set in RES_DEFAULT).  Our solution is to declare such applications
++	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
++	 */
++
++	__UCLIBC_MUTEX_LOCK(__resolv_lock);
++
++	if (!_res.retrans)
++		_res.retrans = RES_TIMEOUT;
++	if (!_res.retry)
++		_res.retry = 4;
++	if (!(_res.options & RES_INIT))
++		_res.options = RES_DEFAULT;
++
++	/*
++	 * This one used to initialize implicitly to zero, so unless the app
++	 * has set it to something in particular, we can randomize it now.
++	 */
++	if (!_res.id)
++		_res.id = res_randomid();
++
++	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
++
++	__res_vinit(&_res, 1);
++	__res_sync = res_sync_func;
++
++	return 0;
++}
++libc_hidden_def(res_init)
++
+ static void
+ __res_iclose(void)
+ {
+@@ -3608,61 +3663,6 @@
+ # endif
+ #endif /* !__UCLIBC_HAS_THREADS__ */
+ 
+-static unsigned int
+-res_randomid(void)
+-{
+-	return 0xffff & getpid();
+-}
+-
+-/* Our res_init never fails (always returns 0) */
+-int
+-res_init(void)
+-{
+-	/*
+-	 * These three fields used to be statically initialized.  This made
+-	 * it hard to use this code in a shared library.  It is necessary,
+-	 * now that we're doing dynamic initialization here, that we preserve
+-	 * the old semantics: if an application modifies one of these three
+-	 * fields of _res before res_init() is called, res_init() will not
+-	 * alter them.  Of course, if an application is setting them to
+-	 * _zero_ before calling res_init(), hoping to override what used
+-	 * to be the static default, we can't detect it and unexpected results
+-	 * will follow.  Zero for any of these fields would make no sense,
+-	 * so one can safely assume that the applications were already getting
+-	 * unexpected results.
+-	 *
+-	 * _res.options is tricky since some apps were known to diddle the bits
+-	 * before res_init() was first called. We can't replicate that semantic
+-	 * with dynamic initialization (they may have turned bits off that are
+-	 * set in RES_DEFAULT).  Our solution is to declare such applications
+-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
+-	 */
+-
+-	__UCLIBC_MUTEX_LOCK(__resolv_lock);
+-
+-	if (!_res.retrans)
+-		_res.retrans = RES_TIMEOUT;
+-	if (!_res.retry)
+-		_res.retry = 4;
+-	if (!(_res.options & RES_INIT))
+-		_res.options = RES_DEFAULT;
+-
+-	/*
+-	 * This one used to initialize implicitly to zero, so unless the app
+-	 * has set it to something in particular, we can randomize it now.
+-	 */
+-	if (!_res.id)
+-		_res.id = res_randomid();
+-
+-	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
+-
+-	__res_vinit(&_res, 1);
+-	__res_sync = res_sync_func;
+-
+-	return 0;
+-}
+-libc_hidden_def(res_init)
+-
+ /*
+  * Set up default settings.  If the configuration file exist, the values
+  * there will have precedence.  Otherwise, the server address is set to
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch
new file mode 100644
index 00000000..e23b0839
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/136-inet_make_res_init_thread_safe.patch
@@ -0,0 +1,55 @@
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -3432,6 +3432,7 @@ static void res_sync_func(void)
+ 	 */
+ }
+ 
++/* has to be called under __resolv_lock */
+ static int
+ __res_vinit(res_state rp, int preinit)
+ {
+@@ -3440,7 +3441,6 @@ __res_vinit(res_state rp, int preinit)
+ 	int m = 0;
+ #endif
+ 
+-	__UCLIBC_MUTEX_LOCK(__resolv_lock);
+ 	__close_nameservers();
+ 	__open_nameservers();
+ 
+@@ -3532,7 +3532,6 @@ __res_vinit(res_state rp, int preinit)
+ 
+ 	rp->options |= RES_INIT;
+ 
+-	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
+ 	return 0;
+ }
+ 
+@@ -3582,11 +3582,11 @@ res_init(void)
+ 	if (!_res.id)
+ 		_res.id = res_randomid();
+ 
+-	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
+-
+ 	__res_vinit(&_res, 1);
+ 	__res_sync = res_sync_func;
+ 
++	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
++
+ 	return 0;
+ }
+ libc_hidden_def(res_init)
+@@ -3687,7 +3687,11 @@ struct __res_state *__resp = &_res;
+ int
+ res_ninit(res_state statp)
+ {
+-	return __res_vinit(statp, 0);
++	int ret;
++	__UCLIBC_MUTEX_LOCK(__resolv_lock);
++	ret = __res_vinit(statp, 0);
++	__UCLIBC_MUTEX_UNLOCK(__resolv_lock);
++	return ret;
+ }
+ 
+ #endif /* L_res_init */
+--
+cgit v0.9.1
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch
new file mode 100644
index 00000000..d40f28df
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/137-inet_fix_threaded_res_init.patch
@@ -0,0 +1,12 @@
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -3581,6 +3581,7 @@ res_init(void)
+ 	if (!_res.id)
+ 		_res.id = res_randomid();
+ 
++	__res_sync = NULL;
+ 	__res_vinit(&_res, 1);
+ 	__res_sync = res_sync_func;
+ 
+--
+cgit v0.9.1
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch
new file mode 100644
index 00000000..5e5460a3
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/140-avr32_atomic_fix.patch
@@ -0,0 +1,10 @@
+--- a/libc/sysdeps/linux/avr32/bits/atomic.h
++++ b/libc/sysdeps/linux/avr32/bits/atomic.h
+@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
+ 
+ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)	\
+ 	({								\
++		__uint32_t __result;					\
+ 		__typeof__(*(mem)) __prev;				\
+ 		__asm__ __volatile__(					\
+ 			"/* __arch_compare_and_exchange_val_32_acq */\n" \
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/150-vasprintf_size_reduce.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/150-vasprintf_size_reduce.patch
new file mode 100644
index 00000000..7853c1af
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/150-vasprintf_size_reduce.patch
@@ -0,0 +1,37 @@
+Reduce the initial buffer size for open_memstream (used by vasprintf),
+as most strings are usually smaller than that.
+Realloc the buffer after finishing the string to further reduce size.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/libc/stdio/vasprintf.c
++++ b/libc/stdio/vasprintf.c
+@@ -39,6 +39,8 @@ int vasprintf(char **__restrict buf, con
+ 		if (rv < 0) {
+ 			free(*buf);
+ 			*buf = NULL;
++		} else {
++			*buf = realloc(*buf, rv + 1);
+ 		}
+ 	}
+ 
+--- a/libc/stdio/open_memstream.c
++++ b/libc/stdio/open_memstream.c
+@@ -17,6 +17,8 @@
+ 
+ #define COOKIE ((__oms_cookie *) cookie)
+ 
++#define MEMSTREAM_BUFSIZ	256
++
+ typedef struct {
+ 	char *buf;
+ 	size_t len;
+@@ -134,7 +136,7 @@ FILE *open_memstream(char **__restrict b
+ 	register FILE *fp;
+ 
+ 	if ((cookie = malloc(sizeof(__oms_cookie))) != NULL) {
+-		if ((cookie->buf = malloc(cookie->len = BUFSIZ)) == NULL) {
++		if ((cookie->buf = malloc(cookie->len = MEMSTREAM_BUFSIZ)) == NULL) {
+ 			goto EXIT_cookie;
+ 		}
+ 		*cookie->buf = 0;		/* Set nul terminator for buffer. */
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/170-math_finite.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/170-math_finite.patch
new file mode 100644
index 00000000..b0ae3337
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/170-math_finite.patch
@@ -0,0 +1,23 @@
+--- a/include/math.h
++++ b/include/math.h
+@@ -195,7 +195,7 @@ extern int signgam;
+ 
+ 
+ /* ISO C99 defines some generic macros which work on any data type.  */
+-#ifdef __USE_ISOC99
++#if defined(__USE_ISOC99) || defined(__USE_BSD)
+ 
+ /* Get the architecture specific values describing the floating-point
+    evaluation.  The following symbols will get defined:
+@@ -315,6 +315,11 @@ enum
+ 
+ #endif /* Use ISO C99.  */
+ 
++/* BSD compat */
++#define finite(x) __finite(x)
++#define finitef(x) __finitef(x)
++#define finitel(x) __finitel(x)
++
+ #ifdef	__USE_MISC
+ /* Support for various different standard error handling behaviors.  */
+ typedef enum
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/180-pthread_cleanup_fix.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/180-pthread_cleanup_fix.patch
new file mode 100644
index 00000000..ae360187
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/180-pthread_cleanup_fix.patch
@@ -0,0 +1,45 @@
+--- a/libpthread/nptl/cleanup_defer_compat.c
++++ b/libpthread/nptl/cleanup_defer_compat.c
+@@ -22,7 +22,7 @@
+ 
+ void
+ attribute_protected
+-_pthread_cleanup_push_defer (
++__pthread_cleanup_push_defer (
+      struct _pthread_cleanup_buffer *buffer,
+      void (*routine) (void *),
+      void *arg)
+@@ -57,12 +57,12 @@ _pthread_cleanup_push_defer (
+ 
+   THREAD_SETMEM (self, cleanup, buffer);
+ }
+-strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer)
++strong_alias (__pthread_cleanup_push_defer, _pthread_cleanup_push_defer)
+ 
+ 
+ void
+ attribute_protected
+-_pthread_cleanup_pop_restore (
++__pthread_cleanup_pop_restore (
+      struct _pthread_cleanup_buffer *buffer,
+      int execute)
+ {
+@@ -97,4 +97,4 @@ _pthread_cleanup_pop_restore (
+   if (execute)
+     buffer->__routine (buffer->__arg);
+ }
+-strong_alias (_pthread_cleanup_pop_restore, __pthread_cleanup_pop_restore)
++strong_alias (__pthread_cleanup_pop_restore, _pthread_cleanup_pop_restore)
+--- a/libpthread/nptl/init.c
++++ b/libpthread/nptl/init.c
+@@ -112,8 +112,8 @@ static const struct pthread_functions pt
+     .ptr___pthread_key_create = __pthread_key_create_internal,
+     .ptr___pthread_getspecific = __pthread_getspecific_internal,
+     .ptr___pthread_setspecific = __pthread_setspecific_internal,
+-    .ptr__pthread_cleanup_push_defer = _pthread_cleanup_push_defer,
+-    .ptr__pthread_cleanup_pop_restore = _pthread_cleanup_pop_restore,
++    .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer,
++    .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore,
+     .ptr_nthreads = &__nptl_nthreads,
+     .ptr___pthread_unwind = &__pthread_unwind,
+     .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/190-nptl_use_arch_default_stack_limit.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/190-nptl_use_arch_default_stack_limit.patch
new file mode 100644
index 00000000..b7f5c82e
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/190-nptl_use_arch_default_stack_limit.patch
@@ -0,0 +1,13 @@
+--- a/libpthread/nptl/init.c
++++ b/libpthread/nptl/init.c
+@@ -402,6 +402,10 @@ __pthread_initialize_minimal_internal (v
+        Use the minimal size acceptable.  */
+     limit.rlim_cur = PTHREAD_STACK_MIN;
+ 
++  /* Do not exceed architecture specific default */
++  if (limit.rlim_cur > ARCH_STACK_DEFAULT_SIZE)
++    limit.rlim_cur = ARCH_STACK_DEFAULT_SIZE;
++
+   /* Make sure it meets the minimum size that allocate_stack
+      (allocatestack.c) will demand, which depends on the page size.  */
+   const uintptr_t pagesz = sysconf (_SC_PAGESIZE);
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/200-no_forced_unwind.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/200-no_forced_unwind.patch
new file mode 100644
index 00000000..d6869e2d
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/200-no_forced_unwind.patch
@@ -0,0 +1,10 @@
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -707,7 +707,6 @@ endif
+ ifeq ($(UCLIBC_HAS_THREADS),y)
+ ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+ 	PTNAME := nptl
+-	CFLAGS += -DHAVE_FORCED_UNWIND
+ else
+ ifeq ($(LINUXTHREADS_OLD),y)
+ 	PTNAME := linuxthreads.old
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/210-mips_use_pic_crt1.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/210-mips_use_pic_crt1.patch
new file mode 100644
index 00000000..2ca10d47
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/210-mips_use_pic_crt1.patch
@@ -0,0 +1,11 @@
+--- a/libc/sysdeps/linux/mips/Makefile.arch
++++ b/libc/sysdeps/linux/mips/Makefile.arch
+@@ -20,6 +20,8 @@ ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+ SSRC += vfork.S clone.S
+ endif
+ 
++CFLAGS-crt1.S += $(PICFLAG)
++
+ ASFLAGS-syscall_error.S += -D_LIBC_REENTRANT
+ 
+ ARCH_HEADERS := sgidefs.h
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/350-use-fputs_unlocked.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/350-use-fputs_unlocked.patch
new file mode 100644
index 00000000..58b03ec7
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/350-use-fputs_unlocked.patch
@@ -0,0 +1,19 @@
+commit 3e3ae40f053b22fbb9bef50067d6edad4c358c4c
+Author: Mirko Vogt <dev@nanl.de>
+Date:   Tue May 24 14:36:42 2011 +0200
+
+    use 'fputws_unlocked(S,F)' instead of 'fputws(S,F)'
+    
+    this eliminates a source of reproduceable freezes
+
+--- a/libc/stdio/_vfprintf.c
++++ b/libc/stdio/_vfprintf.c
+@@ -1229,7 +1229,7 @@ static size_t _fp_out_narrow(FILE *fp, i
+ #define STRLEN  wcslen
+ #define _PPFS_init _ppwfs_init
+ /* Pulls in fseek: */
+-#define OUTPUT(F,S)			fputws(S,F)
++#define OUTPUT(F,S)			fputws_unlocked(S,F)
+ /* TODO: #define OUTPUT(F,S)		_wstdio_fwrite((S),wcslen(S),(F)) */
+ #define _outnwcs(stream, wstring, len)	_wstdio_fwrite((const wchar_t *)(wstring), len, stream)
+ #define FP_OUT _fp_out_wide
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/410-llvm_workaround.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/410-llvm_workaround.patch
new file mode 100644
index 00000000..7ae39432
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/410-llvm_workaround.patch
@@ -0,0 +1,11 @@
+--- a/libc/stdio/_stdio.c
++++ b/libc/stdio/_stdio.c
+@@ -124,7 +124,7 @@ static FILE _stdio_streams[] = {
+ 							 __FLAG_NBF|__FLAG_WRITEONLY, \
+ 							 2, \
+ 							 NULL, \
+-							 NULL, \
++							 0, \
+ 							 0 )
+ };
+ 
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/450-powerpc_copysignl.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/450-powerpc_copysignl.patch
new file mode 100644
index 00000000..ad8d6824
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/450-powerpc_copysignl.patch
@@ -0,0 +1,103 @@
+--- a/libc/sysdeps/linux/powerpc/Makefile.arch
++++ b/libc/sysdeps/linux/powerpc/Makefile.arch
+@@ -5,7 +5,7 @@
+ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ #
+ 
+-CSRC := __syscall_error.c pread_write.c ioctl.c
++CSRC := __syscall_error.c pread_write.c ioctl.c copysignl.c
+ 
+ ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y)
+ CSRC += posix_fadvise.c posix_fadvise64.c
+--- /dev/null
++++ b/libc/sysdeps/linux/powerpc/copysignl.c
+@@ -0,0 +1,89 @@
++/* s_copysignl.c -- long double version of s_copysign.c.
++ * Conversion to long double by Ulrich Drepper,
++ * Cygnus Support, drepper@cygnus.com.
++ */
++
++/*
++ * ====================================================
++ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
++ *
++ * Developed at SunPro, a Sun Microsystems, Inc. business.
++ * Permission to use, copy, modify, and distribute this
++ * software is freely granted, provided that this notice
++ * is preserved.
++ * ====================================================
++ */
++
++/*
++ * copysignl(long double x, long double y)
++ * copysignl(x,y) returns a value with the magnitude of x and
++ * with the sign bit of y.
++ */
++
++#include <endian.h>
++#include <stdint.h>
++
++#if __FLOAT_WORD_ORDER == BIG_ENDIAN
++
++typedef union
++{
++  long double value;
++  struct
++  {
++    int sign_exponent:16;
++    unsigned int empty:16;
++    uint32_t msw;
++    uint32_t lsw;
++  } parts;
++} ieee_long_double_shape_type;
++
++#endif
++
++#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN
++
++typedef union
++{
++  long double value;
++  struct
++  {
++    uint32_t lsw;
++    uint32_t msw;
++    int sign_exponent:16;
++    unsigned int empty:16;
++  } parts;
++} ieee_long_double_shape_type;
++
++#endif
++
++/* Get int from the exponent of a long double.  */
++
++#define GET_LDOUBLE_EXP(exp,d)					\
++do {								\
++  ieee_long_double_shape_type ge_u;				\
++  ge_u.value = (d);						\
++  (exp) = ge_u.parts.sign_exponent;				\
++} while (0)
++
++/* Set exponent of a long double from an int.  */
++
++#define SET_LDOUBLE_EXP(d,exp)					\
++do {								\
++  ieee_long_double_shape_type se_u;				\
++  se_u.value = (d);						\
++  se_u.parts.sign_exponent = (exp);				\
++  (d) = se_u.value;						\
++} while (0)
++
++long double copysignl(long double x, long double y);
++libc_hidden_proto(copysignl);
++
++long double copysignl(long double x, long double y)
++{
++	uint32_t es1,es2;
++	GET_LDOUBLE_EXP(es1,x);
++	GET_LDOUBLE_EXP(es2,y);
++	SET_LDOUBLE_EXP(x,(es1&0x7fff)|(es2&0x8000));
++        return x;
++}
++
++libc_hidden_def(copysignl);
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/480-powerpc_rel24_support.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/480-powerpc_rel24_support.patch
new file mode 100644
index 00000000..19c2b2c8
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/480-powerpc_rel24_support.patch
@@ -0,0 +1,26 @@
+--- a/ldso/ldso/powerpc/elfinterp.c
++++ b/ldso/ldso/powerpc/elfinterp.c
+@@ -297,22 +297,17 @@ _dl_do_reloc (struct elf_resolve *tpnt,s
+ 		break;
+ #endif
+ 	case R_PPC_REL24:
+-#if 0
+ 		{
+ 			Elf32_Sword delta = finaladdr - (Elf32_Word)reloc_addr;
+ 			if (unlikely(delta<<6>>6 != delta)) {
+ 				_dl_dprintf(2, "%s: symbol '%s' R_PPC_REL24 is out of range.\n\t"
+ 						"Compile shared libraries with -fPIC!\n",
+ 						_dl_progname, symname);
+-				_dl_exit(1);
++				return -1;
+ 			}
+ 			*reloc_addr = (*reloc_addr & 0xfc000003) | (delta & 0x3fffffc);
+ 			break;
+ 		}
+-#else
+-		_dl_dprintf(2,"R_PPC_REL24: Compile shared libraries with -fPIC!\n");
+-		return -1;
+-#endif
+ 	case R_PPC_NONE:
+ 		goto out_nocode; /* No code code modified */
+ 	default:
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch
new file mode 100644
index 00000000..374052c5
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch
@@ -0,0 +1,53 @@
+From 7810e4f8027b5c4c8ceec6fefec4eb779362ebb5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 10 Jun 2012 16:36:23 +0000
+Subject: eventfd: Implement eventfd2 and fix eventfd
+
+eventfd: evntfd assumes to take two arguments instead it
+should be one evntfd expects two therefore implement both syscalls with
+correct parameters
+
+Thanks Eugene Rudoy for reporting it and also providing the patch
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+--- a/libc/sysdeps/linux/common/eventfd.c
++++ b/libc/sysdeps/linux/common/eventfd.c
+@@ -7,12 +7,24 @@
+  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+  */
+ 
++#include <errno.h>
+ #include <sys/syscall.h>
+ #include <sys/eventfd.h>
+ 
+ /*
+  * eventfd()
+  */
+-#ifdef __NR_eventfd
+-_syscall2(int, eventfd, int, count, int, flags)
++#if defined __NR_eventfd || defined __NR_eventfd2
++int eventfd (int count, int flags)
++{
++#if defined __NR_eventfd2
++  return INLINE_SYSCALL (eventfd2, 2, count, flags);
++#elif defined __NR_eventfd
++  if (flags != 0) {
++     __set_errno (EINVAL);
++    return -1;
++  }
++  return INLINE_SYSCALL (eventfd, 1, count);
++#endif
++}
+ #endif
+--- a/libc/sysdeps/linux/common/stubs.c
++++ b/libc/sysdeps/linux/common/stubs.c
+@@ -93,7 +93,7 @@ make_stub(epoll_ctl)
+ make_stub(epoll_wait)
+ #endif
+ 
+-#if !defined __NR_eventfd && defined __UCLIBC_LINUX_SPECIFIC__
++#if !defined __NR_eventfd && !defined __NR_eventfd2 && defined __UCLIBC_LINUX_SPECIFIC__
+ make_stub(eventfd)
+ #endif
+ 
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/600-mips64_abi_selection.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/600-mips64_abi_selection.patch
new file mode 100644
index 00000000..beca17ca
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/600-mips64_abi_selection.patch
@@ -0,0 +1,48 @@
+From 603af30d6992e94ac30a66b953264076f4f2fd71 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Thu, 11 Jul 2013 16:59:16 +0000
+Subject: Rules.mak: MIPS64: Select correct interpreter
+
+gcc (eg 4.7.3) hardcodes the MIPS64 interpreters like this:
+(see gcc/config/linux.h and gcc/config/mips/linux64.h)
+
+o32: UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+n32: UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+n64: UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+
+The existing check for MIPS64 in uClibc is wrong because it does
+not respect the selected ABI
+
+We fix this by explicitely checking the selected ABI instead of the
+selected MIPS variant.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Cc: Anthony G. Basile <blueness@gentoo.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -118,13 +118,19 @@ export MAJOR_VERSION MINOR_VERSION SUBLE
+ LIBC := libc
+ SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
+ UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
+-ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
++
++UCLIBC_LDSO_NAME := ld-uClibc
++ARCH_NATIVE_BIT := 32
++ifneq ($(findstring $(TARGET_ARCH),hppa64 ia64 powerpc64 s390x sparc64 x86_64),)
+ UCLIBC_LDSO_NAME := ld64-uClibc
+ ARCH_NATIVE_BIT := 64
+ else
+-UCLIBC_LDSO_NAME := ld-uClibc
+-ARCH_NATIVE_BIT := 32
++ifeq ($(CONFIG_MIPS_N64_ABI),y)
++UCLIBC_LDSO_NAME := ld64-uClibc
++ARCH_NATIVE_BIT := 64
+ endif
++endif
++
+ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION)
+ NONSHARED_LIBNAME := uclibc_nonshared.a
+ libc := $(top_builddir)lib/$(SHARED_LIBNAME)
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/610-mips64_syscall_fix.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/610-mips64_syscall_fix.patch
new file mode 100644
index 00000000..46d1f5cd
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/610-mips64_syscall_fix.patch
@@ -0,0 +1,285 @@
+commit e5cde2eb0ed7df9416fdd6070af07c8448c72a30
+Author: Steve Ellcey <sellcey@mips.com>
+Date:   Wed Feb 12 11:01:35 2014 -0800
+
+    mips: Remove duplicate macro definitions
+    
+    The INLINE_SYSCALL, INTERNAL_SYSCALL*, and internal_syscall* macros
+    are defined for MIPS in both libc/sysdeps/linux/mips/sysdep.h and
+    libc/sysdeps/linux/mips/bits/syscalls.h.  The macros are the same
+    in both cases except that syscalls.h defines internal_syscalls[567]
+    the same for N32 and N64 ABIs and has a different definition for O32.
+    I believe that is correct.  The sysdep.h header uses the O32 versions
+    for N32 and has different definitions for N64.  I think that is wrong
+    and that N32 and N64 should share the same definition (modulo the
+    type 'long' vs. 'long long' for the arguments.  This setup (from
+    sysdep.h) now agrees with what glibc has.
+    
+    I am not positive about which header (sysdep.h vs syscalls.h) is
+    really the right one to have these definitions in but using sysdep.h
+    seems to work for all my builds.
+    
+    Signed-off-by: Steve Ellcey <sellcey@mips.com>
+    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+
+--- a/libc/sysdeps/linux/mips/sysdep.h
++++ b/libc/sysdeps/linux/mips/sysdep.h
+@@ -133,258 +133,6 @@ L(syse1):
+ 
+ #else   /* ! __ASSEMBLER__ */
+ 
+-/* Define a macro which expands into the inline wrapper code for a system
+-   call.  */
+-#undef INLINE_SYSCALL
+-#define INLINE_SYSCALL(name, nr, args...)				\
+-  ({ INTERNAL_SYSCALL_DECL(err);					\
+-     long result_var = INTERNAL_SYSCALL (name, err, nr, args);		\
+-     if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) )			\
+-       {								\
+-	 __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, err));	\
+-	 result_var = -1L;						\
+-       }								\
+-     result_var; })
+-
+-#undef INTERNAL_SYSCALL_DECL
+-#define INTERNAL_SYSCALL_DECL(err) long err
+-
+-#undef INTERNAL_SYSCALL_ERROR_P
+-#define INTERNAL_SYSCALL_ERROR_P(val, err)   ((long) (err))
+-
+-#undef INTERNAL_SYSCALL_ERRNO
+-#define INTERNAL_SYSCALL_ERRNO(val, err)     (val)
+-
+-#undef INTERNAL_SYSCALL
+-#define INTERNAL_SYSCALL(name, err, nr, args...) \
+-	internal_syscall##nr (, "li\t$2, %2\t\t\t# " #name "\n\t",	\
+-			      "i" (SYS_ify (name)), err, args)
+-
+-#undef INTERNAL_SYSCALL_NCS
+-#define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \
+-	internal_syscall##nr (= number, , "r" (__v0), err, args)
+-#undef internal_syscall0
+-#define internal_syscall0(ncs_init, cs_init, input, err, dummy...)	\
+-({									\
+-	long _sys_result;						\
+-									\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a3 __asm__("$7");				\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	".set reorder"							\
+-	: "=r" (__v0), "=r" (__a3)					\
+-	: input								\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-#undef internal_syscall1
+-#define internal_syscall1(ncs_init, cs_init, input, err, arg1)		\
+-({									\
+-	long _sys_result;						\
+-									\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a0 __asm__("$4") = (long) arg1;			\
+-	register long __a3 __asm__("$7");				\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	".set reorder"							\
+-	: "=r" (__v0), "=r" (__a3)					\
+-	: input, "r" (__a0)						\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-#undef internal_syscall2
+-#define internal_syscall2(ncs_init, cs_init, input, err, arg1, arg2)	\
+-({									\
+-	long _sys_result;						\
+-									\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a0 __asm__("$4") = (long) arg1;			\
+-	register long __a1 __asm__("$5") = (long) arg2;			\
+-	register long __a3 __asm__("$7");				\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	".set\treorder"							\
+-	: "=r" (__v0), "=r" (__a3)					\
+-	: input, "r" (__a0), "r" (__a1)					\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-#undef internal_syscall3
+-#define internal_syscall3(ncs_init, cs_init, input, err, arg1, arg2, arg3)\
+-({									\
+-	long _sys_result;						\
+-									\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a0 __asm__("$4") = (long) arg1;			\
+-	register long __a1 __asm__("$5") = (long) arg2;			\
+-	register long __a2 __asm__("$6") = (long) arg3;			\
+-	register long __a3 __asm__("$7");				\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	".set\treorder"							\
+-	: "=r" (__v0), "=r" (__a3)					\
+-	: input, "r" (__a0), "r" (__a1), "r" (__a2)			\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-#undef internal_syscall4
+-#define internal_syscall4(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4)\
+-({									\
+-	long _sys_result;						\
+-									\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a0 __asm__("$4") = (long) arg1;			\
+-	register long __a1 __asm__("$5") = (long) arg2;			\
+-	register long __a2 __asm__("$6") = (long) arg3;			\
+-	register long __a3 __asm__("$7") = (long) arg4;			\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	".set\treorder"							\
+-	: "=r" (__v0), "+r" (__a3)					\
+-	: input, "r" (__a0), "r" (__a1), "r" (__a2)			\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-/* We need to use a frame pointer for the functions in which we
+-   adjust $sp around the syscall, or debug information and unwind
+-   information will be $sp relative and thus wrong during the syscall.  As
+-   of GCC 3.4.3, this is sufficient.  */
+-#define FORCE_FRAME_POINTER alloca (4)
+-
+-#undef internal_syscall5
+-#define internal_syscall5(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5)\
+-({									\
+-	long _sys_result;						\
+-									\
+-	FORCE_FRAME_POINTER;						\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a0 __asm__("$4") = (long) arg1;			\
+-	register long __a1 __asm__("$5") = (long) arg2;			\
+-	register long __a2 __asm__("$6") = (long) arg3;			\
+-	register long __a3 __asm__("$7") = (long) arg4;			\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	"subu\t$29, 32\n\t"						\
+-	"sw\t%6, 16($29)\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	"addiu\t$29, 32\n\t"						\
+-	".set\treorder"							\
+-	: "=r" (__v0), "+r" (__a3)					\
+-	: input, "r" (__a0), "r" (__a1), "r" (__a2),			\
+-	  "r" ((long)arg5)						\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-#undef internal_syscall6
+-#define internal_syscall6(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6)\
+-({									\
+-	long _sys_result;						\
+-									\
+-	FORCE_FRAME_POINTER;						\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a0 __asm__("$4") = (long) arg1;			\
+-	register long __a1 __asm__("$5") = (long) arg2;			\
+-	register long __a2 __asm__("$6") = (long) arg3;			\
+-	register long __a3 __asm__("$7") = (long) arg4;			\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	"subu\t$29, 32\n\t"						\
+-	"sw\t%6, 16($29)\n\t"						\
+-	"sw\t%7, 20($29)\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	"addiu\t$29, 32\n\t"						\
+-	".set\treorder"							\
+-	: "=r" (__v0), "+r" (__a3)					\
+-	: input, "r" (__a0), "r" (__a1), "r" (__a2),			\
+-	  "r" ((long)arg5), "r" ((long)arg6)				\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-#undef internal_syscall7
+-#define internal_syscall7(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6, arg7)\
+-({									\
+-	long _sys_result;						\
+-									\
+-	FORCE_FRAME_POINTER;						\
+-	{								\
+-	register long __v0 __asm__("$2") ncs_init;			\
+-	register long __a0 __asm__("$4") = (long) arg1;			\
+-	register long __a1 __asm__("$5") = (long) arg2;			\
+-	register long __a2 __asm__("$6") = (long) arg3;			\
+-	register long __a3 __asm__("$7") = (long) arg4;			\
+-	__asm__ __volatile__ (						\
+-	".set\tnoreorder\n\t"						\
+-	"subu\t$29, 32\n\t"						\
+-	"sw\t%6, 16($29)\n\t"						\
+-	"sw\t%7, 20($29)\n\t"						\
+-	"sw\t%8, 24($29)\n\t"						\
+-	cs_init								\
+-	"syscall\n\t"							\
+-	"addiu\t$29, 32\n\t"						\
+-	".set\treorder"							\
+-	: "=r" (__v0), "+r" (__a3)					\
+-	: input, "r" (__a0), "r" (__a1), "r" (__a2),			\
+-	  "r" ((long)arg5), "r" ((long)arg6), "r" ((long)arg7)		\
+-	: __SYSCALL_CLOBBERS);						\
+-	err = __a3;							\
+-	_sys_result = __v0;						\
+-	}								\
+-	_sys_result;							\
+-})
+-
+-#undef __SYSCALL_CLOBBERS
+-#define __SYSCALL_CLOBBERS "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", \
+-	"$14", "$15", "$24", "$25", "memory"
+-
+ /* Pointer mangling is not yet supported for MIPS.  */
+ #define PTR_MANGLE(var) (void) (var)
+ #define PTR_DEMANGLE(var) (void) (var)
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/611-mips_syscall_error_argument.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/611-mips_syscall_error_argument.patch
new file mode 100644
index 00000000..87ef8bae
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/611-mips_syscall_error_argument.patch
@@ -0,0 +1,99 @@
+commit 2952c70804b48bb5c87eea21df5e401969dc4ec1
+Author: Kevin Cernekee <cernekee@gmail.com>
+Date:   Tue Jun 5 15:05:20 2012 -0700
+
+    MIPS: Use $a0 instead of $v0 for __syscall_error() argument
+    
+    $a0 is saved across _dl_runtime_resolve(); $v0 is not.  Unfortunately,
+    __syscall_error() uses $v0 for its argument, not $a0 as is the MIPS ABI
+    standard.  This means that if lazy binding was used for __syscall_error(),
+    the errno value in $v0 could get corrupted.
+    
+    The problem can be easily seen in testcases where syscalls in librt fail;
+    when librt tries to call __syscall_error() in libc, the argument gets
+    lost and errno gets set to a bogus value:
+    
+        # ./tst-mqueue1 ; echo $?
+        mq_receive on O_WRONLY mqd_t did not fail with EBADF: Unknown error 2004684208
+        1
+        # ./tst-mqueue2 ; echo $?
+        mq_timedreceive with too small msg_len did not fail with EMSGSIZE: Unknown error 1997360560
+        1
+        # ./tst-mqueue4 ; echo $?
+        mq_timedsend did not fail with ETIMEDOUT: Unknown error 2008747440
+        1
+    
+    When _dl_runtime_resolve() was taken out of the equation, the same test
+    cases passed:
+    
+        # LD_BIND_NOW=y ./tst-mqueue1 ; echo $?
+        0
+        # LD_BIND_NOW=y ./tst-mqueue2 ; echo $?
+        0
+        # LD_BIND_NOW=y ./tst-mqueue4 ; echo $?
+        0
+    
+    Changing __syscall_error() to look at $a0 instead of $v0 fixed the
+    problem.
+    
+    (Note that there is also a "__syscall_error.c" file which presumably
+    uses the standard C calling conventions, but I do not think it is used
+    on MIPS.)
+    
+    Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
+    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+
+commit 3c58d95d918c7e2fda374c37a52f81b34b81e4ca
+Author: Kevin Cernekee <cernekee@gmail.com>
+Date:   Tue Jun 5 15:05:19 2012 -0700
+
+    MIPS: Convert __syscall_error() callers to use $a0 for argument
+    
+    Some callers passed the first argument in $v0, while others used $a0.
+    Change the callers to use $a0 consistently.
+    
+    Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
+    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+
+--- a/libc/sysdeps/linux/mips/vfork.S
++++ b/libc/sysdeps/linux/mips/vfork.S
+@@ -84,6 +84,7 @@ NESTED(__vfork,FRAMESZ,sp)
+ 
+ 	/* Something bad happened -- no child created.  */
+ L(error):
++	move	a0, v0
+ #ifdef __PIC__
+ 	PTR_LA		t9, __syscall_error
+ 	RESTORE_GP64
+--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
++++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+@@ -31,7 +31,7 @@
+ # undef PSEUDO
+ # define PSEUDO(name, syscall_name, args)				      \
+   .align 2;								      \
+-  99:									      \
++  99: move a0, v0; 							      \
+   PTR_LA t9,__syscall_error;					 	      \
+   /* manual cpreturn.  */						      \
+   REG_L gp, STKOFF_GP(sp);						      \
+--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/vfork.S
++++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/vfork.S
+@@ -80,6 +80,7 @@ NESTED(__vfork,FRAMESZ,sp)
+ 
+ 	/* Something bad happened -- no child created.  */
+ L(error):
++	move		a0, v0
+ #ifdef __PIC__
+ 	PTR_LA		t9, __syscall_error
+ 	RESTORE_GP64
+--- a/libc/sysdeps/linux/mips/syscall_error.S
++++ b/libc/sysdeps/linux/mips/syscall_error.S
+@@ -43,7 +43,7 @@ ENTRY(__syscall_error)
+ #ifdef __PIC__
+ 	SAVE_GP(GPOFF)
+ #endif
+-	REG_S	v0, V0OFF(sp)
++	REG_S	a0, V0OFF(sp)
+ 	REG_S	ra, RAOFF(sp)
+ 
+ 	/* Find our per-thread errno address  */
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/612-mips64_relocation_fix.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/612-mips64_relocation_fix.patch
new file mode 100644
index 00000000..7edeee17
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/612-mips64_relocation_fix.patch
@@ -0,0 +1,29 @@
+commit 052bcf13afb067cafac5e7f4fc21fbad2b34b11f
+Author: Waldemar Brodkorb <wbx@openadk.org>
+Date:   Wed Nov 27 09:55:51 2013 +0100
+
+    Fix for SIGBUS error on MIPS64 with N64 ABI
+    
+    When accessing errno, a per thread variable, from _stdio_init
+    a SIGBUS error happens. This change fixes the wrong relocation
+    and debug output.
+    
+    Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+
+--- a/ldso/ldso/mips/elfinterp.c
++++ b/ldso/ldso/mips/elfinterp.c
+@@ -259,11 +259,11 @@ int _dl_parse_relocation_information(str
+ 					case R_MIPS_TLS_TPREL32:
+ 					case R_MIPS_TLS_TPREL64:
+ 						CHECK_STATIC_TLS((struct link_map *)tls_tpnt);
+-						*(ElfW(Word) *)reloc_addr +=
++						*(ElfW(Addr) *)reloc_addr +=
+ 							TLS_TPREL_VALUE (tls_tpnt, symbol_addr);
+ #ifdef __SUPPORT_LD_DEBUG__
+ 						_dl_dprintf(2, "TLS_TPREL  : %s, %x, %x\n",
+-							symname, old_val, *((unsigned int *)reloc_addr));
++							symname, old_val, *((unsigned long *)reloc_addr));
+ #endif
+ 						break;
+ 				}
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/613-mips64_more_relocation_fixes.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/613-mips64_more_relocation_fixes.patch
new file mode 100644
index 00000000..e2efa238
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/613-mips64_more_relocation_fixes.patch
@@ -0,0 +1,20 @@
+--- a/ldso/ldso/mips/elfinterp.c
++++ b/ldso/ldso/mips/elfinterp.c
+@@ -239,7 +239,7 @@ int _dl_parse_relocation_information(str
+ 					case R_MIPS_TLS_DTPMOD64:
+ 					case R_MIPS_TLS_DTPMOD32:
+ 						if (tls_tpnt)
+-							*(ElfW(Word) *)reloc_addr = tls_tpnt->l_tls_modid;
++							*(ElfW(Addr) *)reloc_addr = tls_tpnt->l_tls_modid;
+ #ifdef __SUPPORT_LD_DEBUG__
+ 						_dl_dprintf(2, "TLS_DTPMOD : %s, %d, %d\n",
+ 							symname, old_val, *((unsigned int *)reloc_addr));
+@@ -248,7 +248,7 @@ int _dl_parse_relocation_information(str
+ 
+ 					case R_MIPS_TLS_DTPREL64:
+ 					case R_MIPS_TLS_DTPREL32:
+-						*(ElfW(Word) *)reloc_addr +=
++						*(ElfW(Addr) *)reloc_addr +=
+ 							TLS_DTPREL_VALUE (symbol_addr);
+ #ifdef __SUPPORT_LD_DEBUG__
+ 						_dl_dprintf(2, "TLS_DTPREL : %s, %x, %x\n",
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/614-mips64_fix_setjmp_longjmp.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/614-mips64_fix_setjmp_longjmp.patch
new file mode 100644
index 00000000..17061309
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/614-mips64_fix_setjmp_longjmp.patch
@@ -0,0 +1,99 @@
+commit 70a04a287a2875c82e6822c36e071afba5b63a62
+Author: Waldemar Brodkorb <wbx@openadk.org>
+Date:   Wed Jan 29 18:58:56 2014 +0100
+
+    libc: mips: Fix setjmp/longjmp for MIPS64 N64 ABI
+    
+    When booting a Linux system with qemu-system-mips64 the execution
+    of $(pwd) in the ash shell triggers a segmentation fault. Ash uses
+    setjmp/longjmp for exception handling.
+    
+    After looking at the glibc implementation,
+    I found some differences, with this patch tries to resolve.
+    Now the system boots up fine and no segmentation faults occur.
+    
+    The global pointer should be restored and the types for the
+    register values should be wide enough.
+    
+    See:
+    http://www.cygwin.com/ml/libc-alpha/2003-03/msg00363.html
+    
+    Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+
+--- a/libc/sysdeps/linux/mips/bits/setjmp.h
++++ b/libc/sysdeps/linux/mips/bits/setjmp.h
+@@ -26,13 +26,19 @@
+ 
+ #include <sgidefs.h>
+ 
++#if _MIPS_SIM == _MIPS_SIM_ABI32
++#define ptrsize void *
++#else
++#define ptrsize long long
++#endif
++
+ typedef struct
+   {
+     /* Program counter.  */
+-    void * __pc;
++    ptrsize __pc;
+ 
+     /* Stack pointer.  */
+-    void * __sp;
++    ptrsize __sp;
+ 
+     /* Callee-saved registers s0 through s7.  */
+ #if _MIPS_SIM == _MIPS_SIM_ABI32
+@@ -42,10 +48,10 @@ typedef struct
+ #endif
+ 
+     /* The frame pointer.  */
+-    void * __fp;
++    ptrsize __fp;
+ 
+     /* The global pointer.  */
+-    void * __gp;
++    ptrsize __gp;
+ 
+     /* Floating point status register.  */
+     int __fpc_csr;
+--- a/libc/sysdeps/linux/mips/setjmp.S
++++ b/libc/sysdeps/linux/mips/setjmp.S
+@@ -53,6 +53,7 @@ __sigsetjmp:
+ 	PTR_LA	t9, __sigsetjmp_aux
+ #if _MIPS_SIM != _MIPS_SIM_ABI32
+ 	.cpreturn
++	move 	a4, gp
+ #endif
+ 	jr	t9
+ #else
+--- a/libc/sysdeps/linux/mips/setjmp_aux.c
++++ b/libc/sysdeps/linux/mips/setjmp_aux.c
+@@ -31,7 +31,7 @@ extern int __sigjmp_save (sigjmp_buf, in
+ 
+ int
+ #if _MIPS_SIM == _MIPS_SIM_ABI64
+-__sigsetjmp_aux (jmp_buf env, int savemask, long sp, long fp)
++__sigsetjmp_aux (jmp_buf env, int savemask, long long sp, long long fp, long long gp)
+ #else /* O32 || N32 */
+ __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
+ #endif /* O32 || N32 */
+@@ -65,14 +65,14 @@ __sigsetjmp_aux (jmp_buf env, int savema
+ #endif
+ 
+   /* .. and the stack pointer;  */
+-  env[0].__jmpbuf[0].__sp = (void *) sp;
++  env[0].__jmpbuf[0].__sp = (ptrsize) sp;
+ 
+   /* .. and the FP; it'll be in s8. */
+-  env[0].__jmpbuf[0].__fp = (void *) fp;
++  env[0].__jmpbuf[0].__fp = (ptrsize) fp;
+ 
+   /* .. and the GP; */
+ #if _MIPS_SIM == _MIPS_SIM_ABI64
+-  __asm__ __volatile__ ("sd $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
++  env[0].__jmpbuf[0].__gp = (ptrsize) gp;
+ #else
+   __asm__ __volatile__ ("sw $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
+ #endif
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/615-mips_fix_sigev_pad_size.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/615-mips_fix_sigev_pad_size.patch
new file mode 100644
index 00000000..f75092f3
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/615-mips_fix_sigev_pad_size.patch
@@ -0,0 +1,58 @@
+commit b97b4b698b023f75b54f987859c856ab4861ea00
+Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date:   Thu Jan 2 15:02:12 2014 +0000
+
+    siginfo.h: __SIGEV_PAD_SIZE takes __WORDSIZE into account
+    
+    Make __SIGEV_PAD_SIZE to take __WORDSIZE into account for alpha, mips
+    and ia64 arches.
+    
+    Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+
+--- a/libc/sysdeps/linux/alpha/bits/siginfo.h
++++ b/libc/sysdeps/linux/alpha/bits/siginfo.h
+@@ -258,7 +258,11 @@ enum
+ 
+ /* Structure to transport application-defined values with signals.  */
+ # define __SIGEV_MAX_SIZE	64
+-# define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
++# if __WORDSIZE == 64
++#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
++# else
++#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
++# endif
+ 
+ typedef struct sigevent
+   {
+--- a/libc/sysdeps/linux/ia64/bits/siginfo.h
++++ b/libc/sysdeps/linux/ia64/bits/siginfo.h
+@@ -298,7 +298,11 @@ enum
+ 
+ /* Structure to transport application-defined values with signals.  */
+ # define __SIGEV_MAX_SIZE	64
+-# define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
++# if __WORDSIZE == 64
++#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
++# else
++#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
++# endif
+ 
+ typedef struct sigevent
+   {
+--- a/libc/sysdeps/linux/mips/bits/siginfo.h
++++ b/libc/sysdeps/linux/mips/bits/siginfo.h
+@@ -265,8 +265,11 @@ enum
+ 
+ /* Structure to transport application-defined values with signals.  */
+ # define __SIGEV_MAX_SIZE	64
+-# define __SIGEV_HEAD_SIZE	(sizeof(long) + 2*sizeof(int))
+-# define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE - __SIGEV_HEAD_SIZE) / sizeof (int))
++# if __WORDSIZE == 64
++#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
++# else
++#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
++# endif
+ 
+ /* Forward declaration of the `pthread_attr_t' type.  */
+ struct __pthread_attr_s;
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/616-mips_fix_stat_time.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/616-mips_fix_stat_time.patch
new file mode 100644
index 00000000..1559857a
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/616-mips_fix_stat_time.patch
@@ -0,0 +1,123 @@
+--- a/libc/sysdeps/linux/common/xstatconv.c
++++ b/libc/sysdeps/linux/common/xstatconv.c
+@@ -39,9 +39,12 @@ void __xstat_conv(struct kernel_stat *kb
+ 	buf->st_size = kbuf->st_size;
+ 	buf->st_blksize = kbuf->st_blksize;
+ 	buf->st_blocks = kbuf->st_blocks;
+-	buf->st_atim = kbuf->st_atim;
+-	buf->st_mtim = kbuf->st_mtim;
+-	buf->st_ctim = kbuf->st_ctim;
++	buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
++	buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
++	buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
++	buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
++	buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
++	buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
+ }
+ 
+ void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf)
+@@ -58,9 +61,12 @@ void __xstat32_conv(struct kernel_stat64
+ 	buf->st_size = kbuf->st_size;
+ 	buf->st_blksize = kbuf->st_blksize;
+ 	buf->st_blocks = kbuf->st_blocks;
+-	buf->st_atim = kbuf->st_atim;
+-	buf->st_mtim = kbuf->st_mtim;
+-	buf->st_ctim = kbuf->st_ctim;
++	buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
++	buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
++	buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
++	buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
++	buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
++	buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
+ }
+ 
+ #ifdef __UCLIBC_HAS_LFS__
+@@ -82,9 +88,12 @@ void __xstat64_conv(struct kernel_stat64
+ 	buf->st_size = kbuf->st_size;
+ 	buf->st_blksize = kbuf->st_blksize;
+ 	buf->st_blocks = kbuf->st_blocks;
+-	buf->st_atim = kbuf->st_atim;
+-	buf->st_mtim = kbuf->st_mtim;
+-	buf->st_ctim = kbuf->st_ctim;
++	buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
++	buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
++	buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
++	buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
++	buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
++	buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
+ }
+ 
+ #endif /* __UCLIBC_HAS_LFS__ */
+--- a/libc/sysdeps/linux/mips/bits/kernel_stat.h
++++ b/libc/sysdeps/linux/mips/bits/kernel_stat.h
+@@ -8,6 +8,18 @@
+ #include <sgidefs.h>
+ 
+ #if _MIPS_SIM == _MIPS_SIM_ABI64
++typedef struct {
++	unsigned int tv_sec;
++	unsigned int tv_nsec;
++} __ktimespec_t;
++#else
++typedef struct {
++	time_t tv_sec;
++	unsigned long tv_nsec;
++} __ktimespec_t;
++#endif
++
++#if _MIPS_SIM == _MIPS_SIM_ABI64
+ /* The memory layout is the same as of struct stat64 of the 32-bit kernel.  */
+ struct kernel_stat {
+ 	__kernel_dev_t	st_dev;
+@@ -20,9 +32,9 @@ struct kernel_stat {
+ 	__kernel_dev_t	st_rdev;
+ 	unsigned int	st_pad2[3];
+ 	__kernel_off_t	st_size;
+-	struct timespec	st_atim;
+-	struct timespec	st_mtim;
+-	struct timespec	st_ctim;
++	__ktimespec_t	st_atim;
++	__ktimespec_t	st_mtim;
++	__ktimespec_t	st_ctim;
+ 	unsigned int	st_blksize;
+ 	unsigned int	reserved3;
+ 	unsigned long	st_blocks;
+@@ -41,9 +53,9 @@ struct kernel_stat {
+ 	unsigned int	st_rdev;
+ 	unsigned int	st_pad2[3];
+ 	unsigned long long	st_size;
+-	struct timespec	st_atim;
+-	struct timespec	st_mtim;
+-	struct timespec	st_ctim;
++	__ktimespec_t	st_atim;
++	__ktimespec_t	st_mtim;
++	__ktimespec_t	st_ctim;
+ 	unsigned int	st_blksize;
+ 	unsigned int	reserved3;
+ 	unsigned long long	st_blocks;
+@@ -62,9 +74,9 @@ struct kernel_stat {
+ 	long		st_pad2[2];
+ 	__kernel_off_t	st_size;
+ 	long		st_pad3;
+-	struct timespec	st_atim;
+-	struct timespec	st_mtim;
+-	struct timespec	st_ctim;
++	__ktimespec_t	st_atim;
++	__ktimespec_t	st_mtim;
++	__ktimespec_t	st_ctim;
+ 	long		st_blksize;
+ 	long		st_blocks;
+ 	long		st_pad4[14];
+@@ -81,9 +93,9 @@ struct kernel_stat64 {
+ 	unsigned long	st_rdev;
+ 	unsigned long	st_pad1[3];	/* Reserved for st_rdev expansion  */
+ 	long long	st_size;
+-	struct timespec	st_atim;
+-	struct timespec	st_mtim;
+-	struct timespec	st_ctim;
++	__ktimespec_t	st_atim;
++	__ktimespec_t	st_mtim;
++	__ktimespec_t	st_ctim;
+ 	unsigned long	st_blksize;
+ 	unsigned long	st_pad2;
+ 	long long	st_blocks;
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch
new file mode 100644
index 00000000..628d4b02
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch
@@ -0,0 +1,58 @@
+--- a/libc/sysdeps/linux/mips/bits/setjmp.h
++++ b/libc/sysdeps/linux/mips/bits/setjmp.h
+@@ -27,18 +27,18 @@
+ #include <sgidefs.h>
+ 
+ #if _MIPS_SIM == _MIPS_SIM_ABI32
+-#define ptrsize void *
++#define __setjmp_ptr void *
+ #else
+-#define ptrsize long long
++#define __setjmp_ptr long long
+ #endif
+ 
+ typedef struct
+   {
+     /* Program counter.  */
+-    ptrsize __pc;
++    __setjmp_ptr __pc;
+ 
+     /* Stack pointer.  */
+-    ptrsize __sp;
++    __setjmp_ptr __sp;
+ 
+     /* Callee-saved registers s0 through s7.  */
+ #if _MIPS_SIM == _MIPS_SIM_ABI32
+@@ -48,10 +48,10 @@ typedef struct
+ #endif
+ 
+     /* The frame pointer.  */
+-    ptrsize __fp;
++    __setjmp_ptr __fp;
+ 
+     /* The global pointer.  */
+-    ptrsize __gp;
++    __setjmp_ptr __gp;
+ 
+     /* Floating point status register.  */
+     int __fpc_csr;
+--- a/libc/sysdeps/linux/mips/setjmp_aux.c
++++ b/libc/sysdeps/linux/mips/setjmp_aux.c
+@@ -65,14 +65,14 @@ __sigsetjmp_aux (jmp_buf env, int savema
+ #endif
+ 
+   /* .. and the stack pointer;  */
+-  env[0].__jmpbuf[0].__sp = (ptrsize) sp;
++  env[0].__jmpbuf[0].__sp = (__setjmp_ptr) sp;
+ 
+   /* .. and the FP; it'll be in s8. */
+-  env[0].__jmpbuf[0].__fp = (ptrsize) fp;
++  env[0].__jmpbuf[0].__fp = (__setjmp_ptr) fp;
+ 
+   /* .. and the GP; */
+ #if _MIPS_SIM == _MIPS_SIM_ABI64
+-  env[0].__jmpbuf[0].__gp = (ptrsize) gp;
++  env[0].__jmpbuf[0].__gp = (__setjmp_ptr) gp;
+ #else
+   __asm__ __volatile__ ("sw $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
+ #endif
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/618-mips64_fix_syscall_error.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/618-mips64_fix_syscall_error.patch
new file mode 100644
index 00000000..67611fde
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/618-mips64_fix_syscall_error.patch
@@ -0,0 +1,36 @@
+--- a/libc/sysdeps/linux/mips/sysdep.h
++++ b/libc/sysdeps/linux/mips/sysdep.h
+@@ -96,7 +96,8 @@
+    backwards into the previous fn.  */
+ 
+ #ifdef __PIC__
+-#define PSEUDO(name, syscall_name, args) 		\
++# if _MIPS_SIM == _ABIO32
++#  define PSEUDO(name, syscall_name, args) 		\
+   .align 2;						\
+   99: move a0, v0;					\
+   la t9,__syscall_error;				\
+@@ -109,6 +110,23 @@
+   .set reorder;						\
+   bne a3, zero, 99b;					\
+ L(syse1):
++# else
++#  define PSEUDO(name, syscall_name, args) 		\
++  .align 2;						\
++  99:							\
++  .set noat;						\
++  .cpsetup t9, $1, name;				\
++  .set at;						\
++  move a0, v0;						\
++  dla t9,__syscall_error;				\
++  .cpreturn;						\
++  jr t9;						\
++  ENTRY(name)						\
++  li v0, SYS_ify(syscall_name);				\
++  syscall;						\
++  bne a3, zero, 99b;					\
++L(syse1):
++# endif
+ #else
+ #define PSEUDO(name, syscall_name, args) 		\
+   .set noreorder;					\
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/619-mips64_fix_sysdep_cancel.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/619-mips64_fix_sysdep_cancel.patch
new file mode 100644
index 00000000..d590359a
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/619-mips64_fix_sysdep_cancel.patch
@@ -0,0 +1,195 @@
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -235,6 +235,7 @@ config TARGET_SUBARCH
+ 	default "i486" if CONFIG_486
+ 	default "i586" if CONFIG_586 || CONFIG_586MMX
+ 	default "i686" if TARGET_ARCH = "i386"
++	default "mips64" if CONFIG_MIPS_N64_ABI
+ 	default ""
+ 
+ source "extra/Configs/Config.in.arch"
+--- /dev/null
++++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+@@ -0,0 +1,182 @@
++/* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library.  If not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <sysdep.h>
++#include <tls.h>
++#ifndef __ASSEMBLER__
++# include <pthreadP.h>
++#endif
++#include <sys/asm.h>
++
++/* Gas will put the initial save of $gp into the CIE, because it appears to
++   happen before any instructions.  So we use cfi_same_value instead of
++   cfi_restore.  */
++
++#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
++
++#ifdef __PIC__
++# undef PSEUDO
++# define PSEUDO(name, syscall_name, args)				      \
++      .align 2;								      \
++  L(pseudo_start):							      \
++      cfi_startproc;							      \
++      cfi_adjust_cfa_offset (STKSPACE);					      \
++      cfi_rel_offset (gp, STKOFF_GP);					      \
++  99: move a0, v0;							      \
++      PTR_LA t9,__syscall_error;					      \
++      /* manual cpreturn */						      \
++      REG_L gp, STKOFF_GP(sp);						      \
++      cfi_same_value (gp);						      \
++      RESTORESTK;							      \
++      jr t9;								      \
++  .type __##syscall_name##_nocancel, @function;				      \
++  .globl __##syscall_name##_nocancel;					      \
++  __##syscall_name##_nocancel:						      \
++    SAVESTK;								      \
++    .cpsetup t9, STKOFF_GP, name;					      \
++    cfi_rel_offset (gp, STKOFF_GP);					      \
++    li v0, SYS_ify(syscall_name);					      \
++    syscall;								      \
++    bne a3, zero, SYSCALL_ERROR_LABEL;			       		      \
++    /* manual cpreturn */						      \
++    REG_L gp, STKOFF_GP(sp);						      \
++    cfi_same_value (gp);						      \
++    RESTORESTK;								      \
++    ret;								      \
++  .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel;	      \
++  ENTRY (name)								      \
++    SAVESTK;								      \
++    .cpsetup t9, STKOFF_GP, name;					      \
++    cfi_rel_offset (gp, STKOFF_GP);					      \
++    SINGLE_THREAD_P(v1);						      \
++    bne zero, v1, L(pseudo_cancel);					      \
++    .set noreorder;							      \
++    li v0, SYS_ify(syscall_name);					      \
++    syscall;								      \
++    .set reorder;							      \
++    bne a3, zero, SYSCALL_ERROR_LABEL;			       		      \
++    /* manual cpreturn */						      \
++    REG_L gp, STKOFF_GP(sp);						      \
++    cfi_same_value (gp);						      \
++    RESTORESTK;								      \
++    ret;								      \
++  L(pseudo_cancel):							      \
++    cfi_adjust_cfa_offset (STKSPACE);					      \
++    cfi_rel_offset (gp, STKOFF_GP);					      \
++    REG_S ra, STKOFF_RA(sp);						      \
++    cfi_rel_offset (ra, STKOFF_RA);					      \
++    PUSHARGS_##args;			/* save syscall args */	      	      \
++    CENABLE;								      \
++    REG_S v0, STKOFF_SVMSK(sp);		/* save mask */			      \
++    POPARGS_##args;			/* restore syscall args */	      \
++    .set noreorder;							      \
++    li v0, SYS_ify (syscall_name);				      	      \
++    syscall;								      \
++    .set reorder;							      \
++    REG_S v0, STKOFF_SC_V0(sp);		/* save syscall result */             \
++    REG_S a3, STKOFF_SC_ERR(sp);	/* save syscall error flag */	      \
++    REG_L a0, STKOFF_SVMSK(sp);		/* pass mask as arg1 */		      \
++    CDISABLE;								      \
++    REG_L a3, STKOFF_SC_ERR(sp);	/* restore syscall error flag */      \
++    REG_L ra, STKOFF_RA(sp);		/* restore return address */	      \
++    REG_L v0, STKOFF_SC_V0(sp);		/* restore syscall result */          \
++    bne a3, zero, SYSCALL_ERROR_LABEL;					      \
++    /* manual cpreturn */						      \
++    REG_L gp, STKOFF_GP(sp);						      \
++    cfi_same_value (gp);						      \
++    RESTORESTK;								      \
++  L(pseudo_end):
++
++
++# undef PSEUDO_END
++# define PSEUDO_END(sym) cfi_endproc; .end sym; .size sym,.-sym
++
++#endif
++
++# define PUSHARGS_0	/* nothing to do */
++# define PUSHARGS_1	PUSHARGS_0 REG_S a0, STKOFF_A0(sp); cfi_rel_offset (a0, STKOFF_A0);
++# define PUSHARGS_2	PUSHARGS_1 REG_S a1, STKOFF_A1(sp); cfi_rel_offset (a1, STKOFF_A1);
++# define PUSHARGS_3	PUSHARGS_2 REG_S a2, STKOFF_A2(sp); cfi_rel_offset (a2, STKOFF_A2);
++# define PUSHARGS_4	PUSHARGS_3 REG_S a3, STKOFF_A3(sp); cfi_rel_offset (a3, STKOFF_A3);
++# define PUSHARGS_5	PUSHARGS_4 REG_S a4, STKOFF_A4(sp); cfi_rel_offset (a3, STKOFF_A4);
++# define PUSHARGS_6	PUSHARGS_5 REG_S a5, STKOFF_A5(sp); cfi_rel_offset (a3, STKOFF_A5);
++
++# define POPARGS_0	/* nothing to do */
++# define POPARGS_1	POPARGS_0 REG_L a0, STKOFF_A0(sp);
++# define POPARGS_2	POPARGS_1 REG_L a1, STKOFF_A1(sp);
++# define POPARGS_3	POPARGS_2 REG_L a2, STKOFF_A2(sp);
++# define POPARGS_4	POPARGS_3 REG_L a3, STKOFF_A3(sp);
++# define POPARGS_5	POPARGS_4 REG_L a4, STKOFF_A4(sp);
++# define POPARGS_6	POPARGS_5 REG_L a5, STKOFF_A5(sp);
++
++/* Save an even number of slots.  Should be 0 if an even number of slots
++   are used below, or SZREG if an odd number are used.  */
++# define STK_PAD	SZREG
++
++/* Place values that we are more likely to use later in this sequence, i.e.
++   closer to the SP at function entry.  If you do that, the are more
++   likely to already be in your d-cache.  */
++# define STKOFF_A5	(STK_PAD)
++# define STKOFF_A4	(STKOFF_A5 + SZREG)
++# define STKOFF_A3	(STKOFF_A4 + SZREG)
++# define STKOFF_A2	(STKOFF_A3 + SZREG)	/* MT and more args.  */
++# define STKOFF_A1	(STKOFF_A2 + SZREG)	/* MT and 2 args.  */
++# define STKOFF_A0	(STKOFF_A1 + SZREG)	/* MT and 1 arg.  */
++# define STKOFF_RA	(STKOFF_A0 + SZREG)	/* Used if MT.  */
++# define STKOFF_SC_V0	(STKOFF_RA + SZREG)	/* Used if MT.  */
++# define STKOFF_SC_ERR	(STKOFF_SC_V0 + SZREG)	/* Used if MT.  */
++# define STKOFF_SVMSK	(STKOFF_SC_ERR + SZREG)	/* Used if MT.  */
++# define STKOFF_GP	(STKOFF_SVMSK + SZREG)	/* Always used.  */
++
++# define STKSPACE	(STKOFF_GP + SZREG)
++# define SAVESTK 	PTR_SUBU sp, STKSPACE; cfi_adjust_cfa_offset(STKSPACE)
++# define RESTORESTK 	PTR_ADDU sp, STKSPACE; cfi_adjust_cfa_offset(-STKSPACE)
++
++# ifdef IS_IN_libpthread
++#  define CENABLE	PTR_LA t9, __pthread_enable_asynccancel; jalr t9
++#  define CDISABLE	PTR_LA t9, __pthread_disable_asynccancel; jalr t9
++# elif defined IS_IN_librt
++#  define CENABLE	PTR_LA t9, __librt_enable_asynccancel; jalr t9
++#  define CDISABLE	PTR_LA t9, __librt_disable_asynccancel; jalr t9
++# else
++#  define CENABLE	PTR_LA t9, __libc_enable_asynccancel; jalr t9
++#  define CDISABLE	PTR_LA t9, __libc_disable_asynccancel; jalr t9
++# endif
++
++# ifndef __ASSEMBLER__
++#  define SINGLE_THREAD_P						\
++	__builtin_expect (THREAD_GETMEM (THREAD_SELF,			\
++					 header.multiple_threads)	\
++			  == 0, 1)
++# else
++#  define SINGLE_THREAD_P(reg)						\
++	READ_THREAD_POINTER(reg);					\
++	lw reg, MULTIPLE_THREADS_OFFSET(reg)
++#endif
++
++#elif !defined __ASSEMBLER__
++
++# define SINGLE_THREAD_P 1
++# define NO_CANCELLATION 1
++
++#endif
++
++#ifndef __ASSEMBLER__
++# define RTLD_SINGLE_THREAD_P \
++  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
++				   header.multiple_threads) == 0, 1)
++#endif
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/960-remove_eabi_oabi_selection.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/960-remove_eabi_oabi_selection.patch
new file mode 100644
index 00000000..19ac2469
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/960-remove_eabi_oabi_selection.patch
@@ -0,0 +1,32 @@
+Rely on the compiler to be properly setup for the default ABI.
+
+When installing-headers, there are two cases:
+- NPTL: no issue, a cross-compiler is already expected
+- LinuxThreads: no issue, EABI/OABI has no impact on installed headers.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+Cc: Khem Raj <raj.khem@gmail.com>
+Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
+---
+
+--- a/extra/Configs/Config.arm
++++ b/extra/Configs/Config.arm
+@@ -12,17 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
+ 	default y
+ 	select ARCH_ANY_ENDIAN
+ 
+-config CONFIG_ARM_EABI
+-	bool "Build for EABI"
+-	help
+-	  If you say 'y' here, functions and constants required by the
+-	  ARM EABI will be built into the library.  You should say 'y'
+-	  if your compiler uses the ARM EABI, in which case you will also
+-	  need a kernel supporting the EABI system call interface.
+-
+-	  If you say 'n' here, then the library will be built for the
+-	  old Linux ABI.
+-
+ config COMPILE_IN_THUMB_MODE
+ 	bool "Build using Thumb mode"
+ 	select USE_BX
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch
new file mode 100644
index 00000000..d790664b
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch
@@ -0,0 +1,320 @@
+From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Mon, 01 Oct 2012 05:12:54 +0000
+Subject: libc/sysdeps: add __kernel_long and __kernel_ulong
+
+Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
+exported header files were updated to use these new types. Add the
+definitions for __kernel_long_t and __kernel_ulong_t to the relevant
+kernel_types.h headers.
+
+This change was automated with the following scriptlet
+
+  git grep --name-only 'typedef.*__kernel_old_dev_t' \
+    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
+  typedef long\t\t__kernel_long_t;\
+  typedef unsigned long\t__kernel_ulong_t;'
+
+Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
+
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+--
+Here's a cleaned up patch which should get the whitespace right. I'm a
+bit iffy about the sparc changes they make sense to me but it's not a
+platform I have access to.
+
+I can break this up per arch or per maintainer if requested.
+
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
+ 22 files changed, 50 insertions(+)
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+--- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
++++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_
+ typedef __kernel_uid_t __kernel_uid32_t;
+ typedef __kernel_gid_t __kernel_gid32_t;
+ typedef __kernel_dev_t __kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ 	int val[2];
+--- a/libc/sysdeps/linux/arm/bits/kernel_types.h
++++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short		__kernel_old_uid
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef long long		__kernel_loff_t;
+ typedef __kernel_dev_t		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
+ typedef unsigned short		__kernel_old_uid_t;
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef unsigned short		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long		__kernel_loff_t;
+--- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
++++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+--- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
++++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
+@@ -22,6 +22,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef unsigned int	__kernel_size_t;
+ typedef int		__kernel_ssize_t;
+ typedef int		__kernel_ptrdiff_t;
+--- a/libc/sysdeps/linux/cris/bits/kernel_types.h
++++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
+@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long	__kernel_loff_t;
+--- a/libc/sysdeps/linux/e1/bits/kernel_types.h
++++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ /*
+--- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
++++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+--- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
+@@ -45,6 +45,8 @@ typedef long long		__kernel_off64_t;
+ typedef unsigned long long	__kernel_ino64_t;
+ 
+ typedef unsigned int		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
++++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+--- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
+@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
+ 
+ typedef unsigned int	__kernel_dev_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #endif /* _ASM_IA64_POSIX_TYPES_H */
+--- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
++++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef long long	__kernel_loff_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+--- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
++++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+@@ -44,6 +44,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef unsigned int	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long	__kernel_loff_t;
+--- a/libc/sysdeps/linux/mips/bits/kernel_types.h
++++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef int		__kernel_gid32_t;
+ typedef __kernel_uid_t	__kernel_old_uid_t;
+ typedef __kernel_gid_t	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #else
+ typedef unsigned int	__kernel_dev_t;
+@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
+ typedef __kernel_uid_t	__kernel_old_uid_t;
+ typedef __kernel_gid_t	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #endif
+ 
+--- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
++++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef unsigned short	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+--- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+@@ -36,6 +36,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ #else
+ typedef unsigned int	__kernel_dev_t;
+ typedef unsigned int	__kernel_ino_t;
+@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned int	__kernel_old_uid_t;
+ typedef unsigned int	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ #endif
+ 
+--- a/libc/sysdeps/linux/sh/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+--- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
+@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long       __kernel_loff_t;
+ 
+ typedef struct {
+--- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short	       __kernel_g
+ typedef __kernel_uid_t 	       __kernel_old_uid_t;
+ typedef __kernel_gid_t         __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef __kernel_uid_t	       __kernel_uid32_t;
+ typedef __kernel_gid_t	       __kernel_gid32_t;
+ typedef int		       __kernel_suseconds_t;
+@@ -62,6 +64,8 @@ typedef unsigned int	       __kernel_gid
+ typedef unsigned short	       __kernel_old_uid_t;
+ typedef unsigned short	       __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef long long              __kernel_loff_t;
+ #endif
+ 
+--- a/libc/sysdeps/linux/v850/bits/kernel_types.h
++++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
+@@ -41,6 +41,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ 
+ typedef struct {
+ #ifdef __USE_ALL
+--- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef __kernel_dev_t	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ typedef struct {
+--- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef unsigned int	__kernel_gid32_t;
+ typedef unsigned short	__kernel_old_uid_t;
+ typedef unsigned short	__kernel_old_gid_t;
+ typedef unsigned short	__kernel_old_dev_t;
++typedef long		__kernel_long_t;
++typedef unsigned long	__kernel_ulong_t;
+ typedef long long	__kernel_loff_t;
+ 
+ /* Beginning in 2.6 kernels, which is the first version that includes the
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/981-fix_setting_arch_native_bit.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/981-fix_setting_arch_native_bit.patch
new file mode 100644
index 00000000..4c7dd468
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/981-fix_setting_arch_native_bit.patch
@@ -0,0 +1,28 @@
+From 7e509aae23665b9a79f6c9b4c24d1d8a55bd3582 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 24 Jul 2013 15:30:35 +0000
+Subject: Rules.mak: Fix setting arch native bit
+
+fix breakage from 603af30d
+
+Removing the whitespace from findstring for 64 bit architectures has
+bad consequences since powerpc would be a match in powerpc64 and sparc
+would also be a match in sparc64.
+That doesn't make them 64 bits in reality causing general breakage.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+
+--- a/Rules.mak
++++ b/Rules.mak
+@@ -121,7 +121,7 @@ UBACKTRACE_DSO := libubacktrace.so.$(ABI
+ 
+ UCLIBC_LDSO_NAME := ld-uClibc
+ ARCH_NATIVE_BIT := 32
+-ifneq ($(findstring $(TARGET_ARCH),hppa64 ia64 powerpc64 s390x sparc64 x86_64),)
++ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),)
+ UCLIBC_LDSO_NAME := ld64-uClibc
+ ARCH_NATIVE_BIT := 64
+ else
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/990-no-stack-cache.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/990-no-stack-cache.patch
new file mode 100644
index 00000000..8f0b511e
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/990-no-stack-cache.patch
@@ -0,0 +1,11 @@
+--- a/libpthread/nptl/allocatestack.c
++++ b/libpthread/nptl/allocatestack.c
+@@ -100,7 +100,7 @@
+ /* Cache handling for not-yet free stacks.  */
+ 
+ /* Maximum size in kB of cache.  */
+-static size_t stack_cache_maxsize = 40 * 1024 * 1024; /* 40MiBi by default.  */
++static size_t stack_cache_maxsize = 0; /* embedded systems don't have enough ram for dirty stack caches */
+ static size_t stack_cache_actsize;
+ 
+ /* Mutex protecting this variable.  */
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch
new file mode 100644
index 00000000..b3db8cf5
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/991-gen_wctype.patch
@@ -0,0 +1,183 @@
+--- a/extra/locale/gen_wctype.c
++++ b/extra/locale/gen_wctype.c
+@@ -227,11 +227,12 @@
+ 			++verbose;
+ 			continue;
+ 		}
+-		if (!setlocale(LC_CTYPE, *argv)) {
++	/* setlocale might be just a stub */
++	/*	if (!setlocale(LC_CTYPE, *argv)) {
+ 			verbose_msg("setlocale(LC_CTYPE,%s) failed!  Skipping this locale...\n", *argv);
+ 			continue;
+ 		}
+-
++	*/
+ 		if (!(totitle = wctrans("totitle"))) {
+ 			verbose_msg("no totitle transformation.\n");
+ 		}
+@@ -306,43 +307,43 @@
+ #endif
+ #if 0
+ 				if (c < 256) {
+-					unsigned int glibc;
++					unsigned int curr_stdclib;
+ 
+-					glibc = 0;
+-					if (isalnum(c)) ++glibc; glibc <<= 1;
+-					if (isalpha(c)) ++glibc; glibc <<= 1;
+-					if (isblank(c)) ++glibc; glibc <<= 1;
+-					if (iscntrl(c)) ++glibc; glibc <<= 1;
+-					if (isdigit(c)) ++glibc; glibc <<= 1;
+-					if (isgraph(c)) ++glibc; glibc <<= 1;
+-					if (islower(c)) ++glibc; glibc <<= 1;
+-					if (isprint(c)) ++glibc; glibc <<= 1;
+-					if (ispunct(c)) ++glibc; glibc <<= 1;
+-					if (isspace(c)) ++glibc; glibc <<= 1;
+-					if (isupper(c)) ++glibc; glibc <<= 1;
+-					if (isxdigit(c)) ++glibc;
+-					verbose_msg("%#8x : ctype %#4x\n", c, glibc);
++					curr_stdclib = 0;
++					if (isalnum(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isalpha(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isblank(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iscntrl(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isdigit(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isgraph(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (islower(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isprint(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (ispunct(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isspace(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isupper(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (isxdigit(c)) ++curr_stdclib;
++					verbose_msg("%#8x : ctype %#4x\n", c, curr_stdclib);
+ 				}
+ #endif
+ #if 1
+ 				/* Paranoid checking... */
+ 				{
+-					unsigned int glibc;
++					unsigned int curr_stdclib;
+ 					unsigned int mine;
+ 
+-					glibc = 0;
+-					if (iswalnum(c)) ++glibc; glibc <<= 1;
+-					if (iswalpha(c)) ++glibc; glibc <<= 1;
+-					if (iswblank(c)) ++glibc; glibc <<= 1;
+-					if (iswcntrl(c)) ++glibc; glibc <<= 1;
+-					if (iswdigit(c)) ++glibc; glibc <<= 1;
+-					if (iswgraph(c)) ++glibc; glibc <<= 1;
+-					if (iswlower(c)) ++glibc; glibc <<= 1;
+-					if (iswprint(c)) ++glibc; glibc <<= 1;
+-					if (iswpunct(c)) ++glibc; glibc <<= 1;
+-					if (iswspace(c)) ++glibc; glibc <<= 1;
+-					if (iswupper(c)) ++glibc; glibc <<= 1;
+-					if (iswxdigit(c)) ++glibc;
++					curr_stdclib = 0;
++					if (iswalnum(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswalpha(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswblank(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswcntrl(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswdigit(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswgraph(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswlower(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswprint(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswpunct(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswspace(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswupper(c)) ++curr_stdclib; curr_stdclib <<= 1;
++					if (iswxdigit(c)) ++curr_stdclib;
+ 
+ 					mine = 0;
+ 					if (mywalnum(d,c)) ++mine; mine <<= 1;
+@@ -358,15 +359,15 @@
+ 					if (mywupper(d,c)) ++mine; mine <<= 1;
+ 					if (mywxdigit(d,c)) ++mine;
+ 
+-					if (glibc != mine) {
+-						verbose_msg("%#8x : glibc %#4x != %#4x mine  %u\n", c, glibc, mine, d);
++					if (curr_stdclib != mine) {
++						verbose_msg("%#8x : curr_stdclib %#4x != %#4x mine  %u\n", c, curr_stdclib, mine, d);
+ 						return EXIT_FAILURE;
+ 					}
+ #if 0
+ 					if (iswctype(c,is_comb) || iswctype(c,is_comb3)) {
+ /*						if (!iswpunct(c)) { */
+ 							verbose_msg("%#8x : %d %d %#4x\n",
+-								   c, iswctype(c,is_comb),iswctype(c,is_comb3), glibc);
++								   c, iswctype(c,is_comb),iswctype(c,is_comb3), curr_stdclib);
+ /*						} */
+ 					}
+ #endif
+@@ -553,7 +554,7 @@
+ 		for (c = 0; c <= 0x10ffffUL; c++)
+ #endif
+ 		{
+-			unsigned int glibc;
++			unsigned int curr_stdclib;
+ 			unsigned int mine;
+ 			unsigned int upper, lower;
+ 
+@@ -568,19 +569,19 @@
+ 			}
+ #endif
+ #endif
+-			glibc = 0;
+-			if (iswalnum(c)) ++glibc; glibc <<= 1;
+-			if (iswalpha(c)) ++glibc; glibc <<= 1;
+-			if (iswblank(c)) ++glibc; glibc <<= 1;
+-			if (iswcntrl(c)) ++glibc; glibc <<= 1;
+-			if (iswdigit(c)) ++glibc; glibc <<= 1;
+-			if (iswgraph(c)) ++glibc; glibc <<= 1;
+-			if (iswlower(c)) ++glibc; glibc <<= 1;
+-			if (iswprint(c)) ++glibc; glibc <<= 1;
+-			if (iswpunct(c)) ++glibc; glibc <<= 1;
+-			if (iswspace(c)) ++glibc; glibc <<= 1;
+-			if (iswupper(c)) ++glibc; glibc <<= 1;
+-			if (iswxdigit(c)) ++glibc;
++			curr_stdclib = 0;
++			if (iswalnum(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswalpha(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswblank(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswcntrl(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswdigit(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswgraph(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswlower(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswprint(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswpunct(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswspace(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswupper(c)) ++curr_stdclib; curr_stdclib <<= 1;
++			if (iswxdigit(c)) ++curr_stdclib;
+ 
+ 			{
+ 				unsigned int u;
+@@ -630,8 +631,8 @@
+ 				if (mywupper(d,c)) ++mine; mine <<= 1;
+ 				if (mywxdigit(d,c)) ++mine;
+ 
+-				if (glibc != mine) {
+-					verbose_msg("%#8x : glibc %#4x != %#4x mine %d\n", c, glibc, mine, d);
++				if (curr_stdclib != mine) {
++					verbose_msg("%#8x : curr_stdclib %#4x != %#4x mine %d\n", c, curr_stdclib, mine, d);
+ 					if (c < 0x30000UL) {
+ 						verbose_msg("sc=%#x u=%#x n=%#x i0=%#x i1=%#x\n", sc, u, n, i0, i1);
+ 					}
+@@ -655,17 +656,17 @@
+ 				}
+ 
+ 				if (towupper(c) != upper) {
+-					verbose_msg("%#8x : towupper glibc %#4x != %#4x mine\n",
++					verbose_msg("%#8x : towupper curr_stdclib %#4x != %#4x mine\n",
+ 						   c, towupper(c), upper);
+ 				}
+ 
+ 				if (towlower(c) != lower) {
+-					verbose_msg("%#8x : towlower glibc %#4x != %#4x mine   i0 = %d\n",
++					verbose_msg("%#8x : towlower curr_stdclib %#4x != %#4x mine   i0 = %d\n",
+ 						   c, towlower(c), lower, i0);
+ 				}
+ 
+ 				if (totitle && ((tt = towctrans(c, totitle)) != upper)) {
+-					verbose_msg("%#8x : totitle glibc %#4lx != %#4x mine   i0 = %d\n",
++					verbose_msg("%#8x : totitle curr_stdclib %#4lx != %#4x mine   i0 = %d\n",
+ 						   c, tt, upper, i0);
+ 				}
+ 			}
diff --git a/trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch b/trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch
new file mode 100644
index 00000000..f57b8af5
--- /dev/null
+++ b/trunk/toolchain/uClibc/patches-0.9.33.2/999-eventfd_use_bits_scheme.patch
@@ -0,0 +1,269 @@
+From fd355bc1dbcb794ae1abf0fad1459e28d8567ba0 Mon Sep 17 00:00:00 2001
+From: Hiroaki KAWAI <kawai@stratosphere.co.jp>
+Date: Fri, 19 Apr 2013 01:09:35 +0000
+Subject: eventfd.h: Use new "bits/" scheme for arch-specific flags
+
+As in timerfd.h, eventfd.h needs arch-specific definition files.
+alpha, mips and sparc needs separate file, all the other arch
+will use common definition.
+
+This problem is already fixed in glibc.
+
+Also sanitize and provide bits for hppa.
+Make sure not to install the new bits/eventfd unless eventfd support is
+enabled.
+
+Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+diff --git a/Makefile.in b/Makefile.in
+index 3d3ba3d..da865db 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -272,6 +272,7 @@ HEADERS_RM-$(UCLIBC_HAS_XATTR)               += sys/xattr.h
+ HEADERS_RM-$(UCLIBC_HAS_XLOCALE)             += xlocale.h
+ HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC)          += sys/eventfd.h sys/fsuid.h \
+ 	bits/inotify.h \
++	bits/eventfd.h \
+ 	sys/inotify.h \
+ 	sys/kdaemon.h \
+ 	sys/perm.h \
+diff --git a/libc/sysdeps/linux/alpha/bits/eventfd.h b/libc/sysdeps/linux/alpha/bits/eventfd.h
+new file mode 100644
+index 0000000..b5a7e41
+--- /dev/null
++++ b/libc/sysdeps/linux/alpha/bits/eventfd.h
+@@ -0,0 +1,31 @@
++/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef	_SYS_EVENTFD_H
++# error "Never use <bits/eventfd.h> directly; include <sys/eventfd.h> instead."
++#endif
++
++/* Flags for eventfd.  */
++enum
++  {
++    EFD_SEMAPHORE = 000000001,
++#define EFD_SEMAPHORE EFD_SEMAPHORE
++    EFD_CLOEXEC   = 010000000,
++#define EFD_CLOEXEC EFD_CLOEXEC
++    EFD_NONBLOCK  = 000000004
++#define EFD_NONBLOCK EFD_NONBLOCK
++  };
+diff --git a/libc/sysdeps/linux/common/bits/eventfd.h b/libc/sysdeps/linux/common/bits/eventfd.h
+new file mode 100644
+index 0000000..ef49c61
+--- /dev/null
++++ b/libc/sysdeps/linux/common/bits/eventfd.h
+@@ -0,0 +1,31 @@
++/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef	_SYS_EVENTFD_H
++# error "Never use <bits/eventfd.h> directly; include <sys/eventfd.h> instead."
++#endif
++
++/* Flags for eventfd.  */
++enum
++  {
++    EFD_SEMAPHORE = 00000001,
++#define EFD_SEMAPHORE EFD_SEMAPHORE
++    EFD_CLOEXEC = 02000000,
++#define EFD_CLOEXEC EFD_CLOEXEC
++    EFD_NONBLOCK = 00004000
++#define EFD_NONBLOCK EFD_NONBLOCK
++  };
+diff --git a/libc/sysdeps/linux/common/sys/eventfd.h b/libc/sysdeps/linux/common/sys/eventfd.h
+index c46c2a5..1bf785f 100644
+--- a/libc/sysdeps/linux/common/sys/eventfd.h
++++ b/libc/sysdeps/linux/common/sys/eventfd.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -21,21 +21,12 @@
+ 
+ #include <stdint.h>
+ 
++/* Get the platform-dependent flags.  */
++#include <bits/eventfd.h>
+ 
+ /* Type for event counter.  */
+ typedef uint64_t eventfd_t;
+ 
+-/* Flags for signalfd.  */
+-enum
+-  {
+-    EFD_SEMAPHORE = 1,
+-#define EFD_SEMAPHORE EFD_SEMAPHORE
+-    EFD_CLOEXEC = 02000000,
+-#define EFD_CLOEXEC EFD_CLOEXEC
+-    EFD_NONBLOCK = 04000
+-#define EFD_NONBLOCK EFD_NONBLOCK
+-  };
+-
+ 
+ __BEGIN_DECLS
+ 
+@@ -43,6 +34,16 @@ __BEGIN_DECLS
+    value to COUNT.  */
+ extern int eventfd (int __count, int __flags) __THROW;
+ 
++#if 0 /* not (yet) implemented in uClibc */
++
++/* Read event counter and possibly wait for events.  */
++extern int eventfd_read (int __fd, eventfd_t *__value);
++
++/* Increment event counter.  */
++extern int eventfd_write (int __fd, eventfd_t __value);
++
++#endif
++
+ __END_DECLS
+ 
+ #endif /* sys/eventfd.h */
+diff --git a/libc/sysdeps/linux/hppa/bits/eventfd.h b/libc/sysdeps/linux/hppa/bits/eventfd.h
+new file mode 100644
+index 0000000..6182c07
+--- /dev/null
++++ b/libc/sysdeps/linux/hppa/bits/eventfd.h
+@@ -0,0 +1,32 @@
++/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library.  If not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef	_SYS_EVENTFD_H
++# error "Never use <bits/eventfd.h> directly; include <sys/eventfd.h> instead."
++#endif
++
++/* Flags for signalfd.  */
++enum
++  {
++    EFD_SEMAPHORE = 000000001,
++#define EFD_SEMAPHORE EFD_SEMAPHORE
++    EFD_CLOEXEC   = 010000000,
++#define EFD_CLOEXEC EFD_CLOEXEC
++/* the below value looks suspicious, should be 000200004 for consistency */
++    EFD_NONBLOCK  = 00200004 /* HPUX has separate NDELAY & NONBLOCK */
++#define EFD_NONBLOCK EFD_NONBLOCK
++  };
+diff --git a/libc/sysdeps/linux/mips/bits/eventfd.h b/libc/sysdeps/linux/mips/bits/eventfd.h
+new file mode 100644
+index 0000000..17b2f46
+--- /dev/null
++++ b/libc/sysdeps/linux/mips/bits/eventfd.h
+@@ -0,0 +1,31 @@
++/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef	_SYS_EVENTFD_H
++# error "Never use <bits/eventfd.h> directly; include <sys/eventfd.h> instead."
++#endif
++
++/* Flags for eventfd.  */
++enum
++  {
++    EFD_SEMAPHORE = 00000001,
++#define EFD_SEMAPHORE EFD_SEMAPHORE
++    EFD_CLOEXEC = 02000000,
++#define EFD_CLOEXEC EFD_CLOEXEC
++    EFD_NONBLOCK = 00000200
++#define EFD_NONBLOCK EFD_NONBLOCK
++  };
+diff --git a/libc/sysdeps/linux/sparc/bits/eventfd.h b/libc/sysdeps/linux/sparc/bits/eventfd.h
+new file mode 100644
+index 0000000..bed9f09
+--- /dev/null
++++ b/libc/sysdeps/linux/sparc/bits/eventfd.h
+@@ -0,0 +1,31 @@
++/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef	_SYS_EVENTFD_H
++# error "Never use <bits/eventfd.h> directly; include <sys/eventfd.h> instead."
++#endif
++
++/* Flags for eventfd.  */
++enum
++  {
++    EFD_SEMAPHORE = 1,
++#define EFD_SEMAPHORE EFD_SEMAPHORE
++    EFD_CLOEXEC = 0x400000,
++#define EFD_CLOEXEC EFD_CLOEXEC
++    EFD_NONBLOCK = 0x004000
++#define EFD_NONBLOCK EFD_NONBLOCK
++  };
+--
+cgit v0.9.1
diff --git a/trunk/toolchain/uClibc/utils/Makefile b/trunk/toolchain/uClibc/utils/Makefile
new file mode 100644
index 00000000..83100d70
--- /dev/null
+++ b/trunk/toolchain/uClibc/utils/Makefile
@@ -0,0 +1,24 @@
+PATH_PREFIX=..
+
+include ../common.mk
+
+HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.utils_built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc_utils_installed
+
+define Host/Compile
+	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(HOST_BUILD_DIR)/Rules.mak
+	$(UCLIBC_MAKE) PREFIX= utils
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(TOOLCHAIN_DIR)/bin
+	$(INSTALL_BIN) \
+		$(HOST_BUILD_DIR)/utils/ldd \
+		$(TOOLCHAIN_DIR)/bin/
+	$(INSTALL_DIR) $(TOOLCHAIN_DIR)/sbin
+	$(INSTALL_BIN) \
+		$(HOST_BUILD_DIR)/utils/ldconfig \
+		$(TOOLCHAIN_DIR)/sbin/
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/toolchain/wrapper/Makefile b/trunk/toolchain/wrapper/Makefile
new file mode 100644
index 00000000..3398e407
--- /dev/null
+++ b/trunk/toolchain/wrapper/Makefile
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wrapper
+PKG_VERSION:=1
+
+include $(INCLUDE_DIR)/toolchain-build.mk
+
+
+# 1: args
+define toolchain_util
+$(strip $(SCRIPT_DIR)/ext-toolchain.sh --toolchain $(CONFIG_TOOLCHAIN_ROOT) \
+	--cflags $(CONFIG_TARGET_OPTIMIZATION) \
+	--cflags "$(if $(call qstrip,$(CONFIG_TOOLCHAIN_LIBC)),-m$(call qstrip,$(CONFIG_TOOLCHAIN_LIBC))) $(if $(CONFIG_SOFT_FLOAT),-msoft-float)" \
+	--cflags "$(patsubst ./%,-I$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_INC_PATH)))" \
+	--cflags "$(patsubst ./%,-L$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_LIB_PATH)))" \
+	$(1))
+endef
+
+# 1: config symbol
+# 2: feature
+define toolchain_test
+$$(if $$($(1)), \
+	@echo -n "Testing external toolchain for $(2) support ... "; \
+	if $(call toolchain_util,--test "$(2)"); then \
+		echo "ok"; exit 0; \
+	else \
+		echo "failed"; \
+		echo "ERROR: $(1) is enabled but the external toolchain does not support it"; \
+		exit 1; \
+	fi)
+endef
+
+
+define Host/Prepare
+	$(call toolchain_test,CONFIG_SOFT_FLOAT,softfloat)
+	$(call toolchain_test,CONFIG_IPV6,ipv6)
+	$(call toolchain_test,CONFIG_NLS,wchar)
+	$(call toolchain_test,CONFIG_PACKAGE_libpthread,threads)
+endef
+
+define Host/Configure
+endef
+
+define Host/Compile
+endef
+
+define Host/Install
+	$(call toolchain_util,--wrap "$(TOOLCHAIN_DIR)/bin")
+endef
+
+define Host/Clean
+	rm -rf $(TOOLCHAIN_DIR)/bin
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/Makefile b/trunk/tools/Makefile
new file mode 100644
index 00000000..b9fc47e2
--- /dev/null
+++ b/trunk/tools/Makefile
@@ -0,0 +1,162 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# Main makefile for the host tools
+#
+curdir:=tools
+
+# subdirectories to descend into
+tools-y :=
+
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN)$(CONFIG_GCC_LLVM),)
+  BUILD_TOOLCHAIN := y
+endif
+ifdef CONFIG_GCC_USE_GRAPHITE
+  ifeq ($(CONFIG_GCC_USE_SYSTEM_PPL_CLOOG),)
+    BUILD_PPL_CLOOG = y
+  endif
+endif
+ifneq ($(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_kmod-b43legacy)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),)
+  BUILD_B43_TOOLS = y
+endif
+
+tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf
+tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs
+tools-y += sstrip ipkg-utils genext2fs e2fsprogs mtd-utils mkimage
+tools-y += firmware-utils patch-image patch quilt yaffs2 flock padjffs2
+tools-y += mm-macros xorg-macros xfce-macros missing-macros xz cmake scons bc
+tools-y += findutils gengetopt
+tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2
+tools-$(CONFIG_powerpc) += upx
+tools-$(CONFIG_TARGET_x86) += qemu
+tools-$(CONFIG_TARGET_mxs) += elftosb
+tools-$(CONFIG_TARGET_brcm2708)$(CONFIG_TARGET_sunxi) += mtools dosfstools
+tools-$(CONFIG_TARGET_ar71xx) += lzma-old squashfs
+tools-y += lzma squashfs4
+tools-$(BUILD_B43_TOOLS) += b43-tools
+tools-$(BUILD_PPL_CLOOG) += ppl cloog
+tools-$(CONFIG_USE_SPARSE) += sparse
+
+# builddir dependencies
+$(curdir)/bison/compile := $(curdir)/flex/install
+$(curdir)/flex/compile := $(curdir)/automake/install
+$(curdir)/pkg-config/compile := $(curdir)/sed/install
+$(curdir)/libtool/compile := $(curdir)/sed/install $(curdir)/m4/install
+$(curdir)/squashfs/compile := $(curdir)/lzma-old/install
+$(curdir)/squashfs4/compile := $(curdir)/xz/install
+$(curdir)/quilt/compile := $(curdir)/sed/install $(curdir)/autoconf/install $(curdir)/findutils/install
+$(curdir)/dtc/compile := $(curdir)/bison/install
+$(curdir)/autoconf/compile := $(curdir)/m4/install $(curdir)/libtool/install
+$(curdir)/automake/compile := $(curdir)/m4/install $(curdir)/autoconf/install $(curdir)/pkg-config/install $(curdir)/xz/install
+$(curdir)/gmp/compile := $(curdir)/automake/install
+$(curdir)/mpc/compile := $(curdir)/mpfr/install $(curdir)/gmp/install
+$(curdir)/mpfr/compile := $(curdir)/gmp/install
+$(curdir)/ppl/compile := $(curdir)/gmp/install
+$(curdir)/cloog/compile := $(curdir)/ppl/install
+$(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/install $(curdir)/xz/install
+$(curdir)/mkimage/compile := $(curdir)/sed/install
+$(curdir)/mklibs/compile := $(curdir)/automake/install
+$(curdir)/qemu/compile := $(curdir)/e2fsprogs/install
+$(curdir)/upslug2/compile := $(curdir)/automake/install
+$(curdir)/mm-macros/compile := $(curdir)/automake/install
+$(curdir)/xorg-macros/compile := $(curdir)/automake/install
+$(curdir)/xfce-macros/compile := $(curdir)/automake/install
+$(curdir)/missing-macros/compile := $(curdir)/automake/install
+$(curdir)/e2fsprogs/compile := $(curdir)/automake/install
+$(curdir)/libelf/compile := $(curdir)/automake/install
+$(curdir)/sdcc/compile := $(curdir)/bison/install
+$(curdir)/b43-tools/compile := $(curdir)/bison/install
+$(curdir)/padjffs2/compile := $(curdir)/findutils/install
+$(curdir)/cloog/compile := $(curdir)/ppl/install
+$(curdir)/bc/compile := $(curdir)/bison/install
+$(curdir)/findutils/compile := $(curdir)/bison/install
+$(curdir)/gengetopt/compile := $(curdir)/automake/install
+
+ifneq ($(CONFIG_CCACHE),)
+$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install))
+tools-y += ccache
+endif
+
+# in case there is no patch tool on the host we need to make patch tool a
+# dependency for tools which have patches directory
+$(foreach tool, $(tools-y), $(if $(wildcard $(curdir)/$(tool)/patches),$(eval $(curdir)/$(tool)/compile += $(curdir)/patch/install)))
+
+$(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
+$(curdir)/builddirs-default := $(tools-y)
+
+ifndef DUMP_TARGET_DB
+define PrepareStaging
+	@for dir in $(1); do ( \
+		$(if $(QUIET),,set -x;) \
+		mkdir -p "$$dir"; \
+		cd "$$dir"; \
+		mkdir -p bin lib include stamp; \
+	); done
+endef
+
+# preparatory work
+$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
+	$(call PrepareStaging,$(STAGING_DIR))
+	mkdir -p $(BUILD_DIR)/stamp
+	touch $@
+
+$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
+	$(call PrepareStaging,$(STAGING_DIR_HOST))
+	mkdir -p $(BUILD_DIR_HOST)/stamp $(STAGING_DIR_HOST)/include/sys
+	$(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/
+	$(INSTALL_DATA) $(TOPDIR)/tools/include/sys/*.h $(STAGING_DIR_HOST)/include/sys/
+	ln -sf lib $(STAGING_DIR_HOST)/lib64
+	touch $@
+
+
+define PrepareCommand
+$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
+	@mkdir -p "$$(dir $$@)"; rm -f "$$@"
+	@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
+		echo "Command $(1) not found."; false; \
+	}; ln -s "$$$$FILE" "$$@"
+
+endef
+endif
+
+$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR)/.prepared
+	@rm -f $@
+	@if stat --version > /dev/null 2>&1; then \
+		ln -s `which stat` $@; \
+	elif gstat --version > /dev/null 2>&1; then \
+		ln -s `which gstat` $@; \
+	elif gnustat --version > /dev/null 2>&1; then \
+		ln -s `which gnustat` $@; \
+	else \
+		echo "GNU stat not found"; \
+		false; \
+	fi
+
+$(STAGING_DIR_HOST)/bin/ldconfig: $(STAGING_DIR)/.prepared
+	touch $@
+	chmod +x $@
+
+$(eval $(call PrepareCommand,md5sum,gmd5sum md5sum $(SCRIPT_DIR)/md5sum))
+$(eval $(call PrepareCommand,cp,gcp cp))
+$(eval $(call PrepareCommand,seq,gseq seq))
+$(eval $(call PrepareCommand,python,python2 python2.7 python))
+$(eval $(call PrepareCommand,awk,gawk awk))
+$(eval $(call PrepareCommand,getopt,gnugetopt /usr/local/bin/getopt getopt))
+$(eval $(call PrepareCommand,grep,ggrep grep))
+$(eval $(call PrepareCommand,tar,gtar tar))
+$(eval $(call PrepareCommand,diff,gdiff diff))
+
+$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,md5sum cp stat seq python awk getopt grep tar diff ldconfig)
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
+$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
+
+# prerequisites for the individual targets
+$(curdir)/ := .config prereq
+$(curdir)//install = $(1)/compile
+
+tools_enabled = $(foreach tool,$(sort $(tools-y) $(tools-)),$(if $(filter $(tool),$(tools-y)),y,n))
+$(eval $(call stampfile,$(curdir),tools,install,,_$(subst $(space),,$(tools_enabled))))
+$(eval $(call subdir,$(curdir)))
diff --git a/trunk/tools/autoconf/Makefile b/trunk/tools/autoconf/Makefile
new file mode 100644
index 00000000..ec154e46
--- /dev/null
+++ b/trunk/tools/autoconf/Makefile
@@ -0,0 +1,37 @@
+# 
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=autoconf
+PKG_VERSION:=2.69
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/autoconf
+PKG_MD5SUM:=50f97f4159805e374639a73e2636f22e
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Configure
+	$(call Host/Configure/Default,\
+		--datarootdir=$(STAGING_DIR_HOST)/share \
+	)
+endef
+
+define Host/Compile
+	export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR)
+endef
+
+define Host/Install
+	export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) install
+endef
+
+define Host/Clean
+	-export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/autoconf/patches/000-relocatable.patch b/trunk/tools/autoconf/patches/000-relocatable.patch
new file mode 100644
index 00000000..0b83a2b4
--- /dev/null
+++ b/trunk/tools/autoconf/patches/000-relocatable.patch
@@ -0,0 +1,167 @@
+--- a/bin/autoheader.in
++++ b/bin/autoheader.in
+@@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ 
+ BEGIN
+ {
+-  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
++  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+   unshift @INC, "$pkgdatadir";
+ 
+   # Override SHELL.  On DJGPP SHELL may not be set to a shell
+@@ -51,7 +52,7 @@ use strict;
+ use vars qw ($config_h %verbatim %symbol);
+ 
+ # Lib files.
+-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
++my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
+ local $config_h;
+ my $config_h_in;
+ my @prepend_include;
+--- a/bin/autom4te.in
++++ b/bin/autom4te.in
+@@ -25,7 +25,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ 
+ BEGIN
+ {
+-  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
++  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+   unshift @INC, $pkgdatadir;
+ 
+   # Override SHELL.  On DJGPP SHELL may not be set to a shell
+@@ -45,7 +46,8 @@ use File::Basename;
+ use strict;
+ 
+ # Data directory.
+-my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@';
++my $pkgdatadir = $ENV{'AC_MACRODIR'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+ 
+ # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE.
+ my %language;
+@@ -88,7 +90,7 @@ my @include;
+ my $freeze = 0;
+ 
+ # $M4.
+-my $m4 = $ENV{"M4"} || '@M4@';
++my $m4 = $ENV{"M4"} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/m4' : '@M4@');
+ # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
+ fatal "need GNU m4 1.4 or later: $m4"
+   if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
+@@ -270,6 +272,12 @@ sub load_configuration ($)
+ 
+       my @words = shellwords ($_);
+       my $type = shift @words;
++
++      if ($ENV{'STAGING_DIR'})
++      {
++        @words = map { s!^@pkgdatadir@!$ENV{'STAGING_DIR'}/../host/share/autoconf!; $_ } @words;
++      }
++
+       if ($type eq 'begin-language:')
+ 	{
+ 	  fatal "$file:$.: end-language missing for: $lang"
+--- a/bin/autoreconf.in
++++ b/bin/autoreconf.in
+@@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ 
+ BEGIN
+ {
+-  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
++  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+   unshift @INC, $pkgdatadir;
+ 
+   # Override SHELL.  On DJGPP SHELL may not be set to a shell
+@@ -107,9 +108,9 @@ Written by David J. MacKenzie and Akim D
+ ";
+ 
+ # Lib files.
+-my $autoconf   = $ENV{'AUTOCONF'}   || '@bindir@/@autoconf-name@';
+-my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
+-my $autom4te   = $ENV{'AUTOM4TE'}   || '@bindir@/@autom4te-name@';
++my $autoconf   = $ENV{'AUTOCONF'}   || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoconf-name@' : '@bindir@/@autoconf-name@');
++my $autoheader = $ENV{'AUTOHEADER'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoheader-name@' : '@bindir@/@autoheader-name@');
++my $autom4te   = $ENV{'AUTOM4TE'}   || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
+ my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
+ my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
+ my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
+--- a/bin/autoscan.in
++++ b/bin/autoscan.in
+@@ -26,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ 
+ BEGIN
+ {
+-  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
++  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+   unshift @INC, $pkgdatadir;
+ 
+   # Override SHELL.  On DJGPP SHELL may not be set to a shell
+@@ -92,10 +93,10 @@ my $configure_scan = 'configure.scan';
+ my $log;
+ 
+ # Autoconf and lib files.
+-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
++my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
+ my $autoconf = "$autom4te --language=autoconf";
+ my @prepend_include;
+-my @include = ('@pkgdatadir@');
++my @include = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+ 
+ # $help
+ # -----
+--- a/bin/autoupdate.in
++++ b/bin/autoupdate.in
+@@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ 
+ BEGIN
+ {
+-  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
++  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+   unshift @INC, $pkgdatadir;
+ 
+   # Override SHELL.  On DJGPP SHELL may not be set to a shell
+@@ -51,10 +52,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin
+ my $autoconf = "$autom4te --language=autoconf";
+ # We need to find m4sugar.
+ my @prepend_include;
+-my @include = ('@pkgdatadir@');
++my @include = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+ my $force = 0;
+ # m4.
+-my $m4 = $ENV{"M4"} || '@M4@';
++my $m4 = $ENV{"M4"} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/m4' : '@M4@');
+ 
+ 
+ # $HELP
+--- a/bin/ifnames.in
++++ b/bin/ifnames.in
+@@ -31,7 +31,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+ 
+ BEGIN
+ {
+-  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
++  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
+   unshift @INC, $pkgdatadir;
+ 
+   # Override SHELL.  On DJGPP SHELL may not be set to a shell
+--- a/bin/autoconf.as
++++ b/bin/autoconf.as
+@@ -85,7 +85,11 @@ exit_missing_arg='
+ # restore font-lock: '
+ 
+ # Variables.
+-: ${AUTOM4TE='@bindir@/@autom4te-name@'}
++if test -n "$STAGING_DIR"; then
++	: ${AUTOM4TE="$STAGING_DIR/../host/bin/@autom4te-name@"}
++else
++	: ${AUTOM4TE='@bindir@/@autom4te-name@'}
++fi
+ autom4te_options=
+ outfile=
+ verbose=false
diff --git a/trunk/tools/autoconf/patches/001-no_emacs_lib.patch b/trunk/tools/autoconf/patches/001-no_emacs_lib.patch
new file mode 100644
index 00000000..02e115d4
--- /dev/null
+++ b/trunk/tools/autoconf/patches/001-no_emacs_lib.patch
@@ -0,0 +1,22 @@
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -16,7 +16,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
++SUBDIRS = Autom4te m4sugar autoconf autotest autoscan
+ nodist_pkgdata_DATA = autom4te.cfg
+ EXTRA_DIST = autom4te.in freeze.mk
+ 
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -226,7 +226,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
++SUBDIRS = Autom4te m4sugar autoconf autotest autoscan
+ nodist_pkgdata_DATA = autom4te.cfg
+ EXTRA_DIST = autom4te.in freeze.mk
+ edit = sed \
diff --git a/trunk/tools/automake/Makefile b/trunk/tools/automake/Makefile
new file mode 100644
index 00000000..546f9b26
--- /dev/null
+++ b/trunk/tools/automake/Makefile
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=automake
+PKG_VERSION:=1.11.6
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/automake
+PKG_MD5SUM:=cf4752287ad708f83bd3689da57a32c9
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_ARGS += --datarootdir=$(STAGING_DIR_HOST)/share
+HOST_CONFIGURE_VARS += am_cv_prog_PERL_ithreads=no
+
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) install
+	mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
+	$(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.6
+endef
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/automake/files/aclocal b/trunk/tools/automake/files/aclocal
new file mode 100755
index 00000000..a60df10c
--- /dev/null
+++ b/trunk/tools/automake/files/aclocal
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+aclocal.real $ACLOCAL_INCLUDE $@
diff --git a/trunk/tools/automake/patches/000-relocatable.patch b/trunk/tools/automake/patches/000-relocatable.patch
new file mode 100644
index 00000000..1206fdc1
--- /dev/null
+++ b/trunk/tools/automake/patches/000-relocatable.patch
@@ -0,0 +1,46 @@
+--- a/aclocal.in
++++ b/aclocal.in
+@@ -27,7 +27,8 @@
+ 
+ BEGIN
+ {
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} ||
++	($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@');
+   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
+ }
+ 
+@@ -58,8 +59,8 @@
+ # ACLOCAL_PATH environment variable, and reset with the `--system-acdir'
+ # option.
+ my @user_includes = ();
+-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
+-my @system_includes = ('@datadir@/aclocal');
++my @automake_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . "/../host/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
++my @system_includes = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/aclocal' : '@datadir@/aclocal');
+ 
+ # Whether we should copy M4 file in $user_includes[0].
+ my $install = 0;
+--- a/automake.in
++++ b/automake.in
+@@ -31,7 +31,8 @@
+ 
+ BEGIN
+ {
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} || 
++		($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@');
+   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
+ 
+   # Override SHELL.  This is required on DJGPP so that system() uses
+--- a/lib/Automake/Config.in
++++ b/lib/Automake/Config.in
+@@ -31,7 +31,7 @@
+ our $PACKAGE = '@PACKAGE@';
+ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
+ our $VERSION = '@VERSION@';
+-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
++our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
+ our $perl_threads = @PERL_THREADS@;
+ 
+ 1;
diff --git a/trunk/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/trunk/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
new file mode 100644
index 00000000..e6c3d7f3
--- /dev/null
+++ b/trunk/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -0,0 +1,15 @@
+--- a/aclocal.in
++++ b/aclocal.in
+@@ -327,6 +327,12 @@
+ 
+   foreach my $m4dir (@dirlist)
+     {
++      if (! -d $m4dir)
++      {
++        msg ('override', "warning: skipping not existing directory `$m4dir'");
++        next;
++      }
++
+       if (! opendir (DIR, $m4dir))
+ 	{
+ 	  if ($install && $type == FT_USER && $first_user_m4dir)
diff --git a/trunk/tools/bc/Makefile b/trunk/tools/bc/Makefile
new file mode 100644
index 00000000..87c7e580
--- /dev/null
+++ b/trunk/tools/bc/Makefile
@@ -0,0 +1,18 @@
+# 
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bc
+PKG_VERSION:=1.06.95
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://alpha.gnu.org/gnu/bc
+PKG_MD5SUM:=5126a721b73f97d715bb72c13c889035
+
+include $(INCLUDE_DIR)/host-build.mk
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/bc/patches/001-no_doc.patch b/trunk/tools/bc/patches/001-no_doc.patch
new file mode 100644
index 00000000..50deee8c
--- /dev/null
+++ b/trunk/tools/bc/patches/001-no_doc.patch
@@ -0,0 +1,23 @@
+diff -urN bc-1.06.95/Makefile.am bc-1.06.95.new/Makefile.am
+--- bc-1.06.95/Makefile.am	2005-05-27 01:05:41.000000000 +0100
++++ bc-1.06.95.new/Makefile.am	2013-07-09 09:33:31.521490710 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = lib bc dc doc
++SUBDIRS = lib bc dc
+ 
+ MAINTAINERCLEANFILES =  aclocal.m4 config.h.in configure Makefile.in \
+ 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
+diff -urN bc-1.06.95/Makefile.in bc-1.06.95.new/Makefile.in
+--- bc-1.06.95/Makefile.in	2006-09-05 03:39:30.000000000 +0100
++++ bc-1.06.95.new/Makefile.in	2013-07-09 09:33:28.565490767 +0100
+@@ -149,7 +149,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = lib bc dc doc
++SUBDIRS = lib bc dc
+ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
+ 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
+ 
diff --git a/trunk/tools/bison/Makefile b/trunk/tools/bison/Makefile
new file mode 100644
index 00000000..bf7b92b2
--- /dev/null
+++ b/trunk/tools/bison/Makefile
@@ -0,0 +1,28 @@
+# 
+# Copyright (C) 2008-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bison
+PKG_VERSION:=3.0.2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_MD5SUM:=146be9ff9fbd27497f0bf2286a5a2082
+PKG_CAT:=xzcat
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/bison/patches/010-intl-stub-compat.patch b/trunk/tools/bison/patches/010-intl-stub-compat.patch
new file mode 100644
index 00000000..98234209
--- /dev/null
+++ b/trunk/tools/bison/patches/010-intl-stub-compat.patch
@@ -0,0 +1,15 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -60,9 +60,9 @@
+ {
+   set_program_name (argv[0]);
+   setlocale (LC_ALL, "");
+-  (void) bindtextdomain (PACKAGE, LOCALEDIR);
+-  (void) bindtextdomain ("bison-runtime", LOCALEDIR);
+-  (void) textdomain (PACKAGE);
++  bindtextdomain (PACKAGE, LOCALEDIR);
++  bindtextdomain ("bison-runtime", LOCALEDIR);
++  textdomain (PACKAGE);
+ 
+   {
+     char const *cp = getenv ("LC_CTYPE");
diff --git a/trunk/tools/bison/patches/100-fix-gets-removal.patch b/trunk/tools/bison/patches/100-fix-gets-removal.patch
new file mode 100644
index 00000000..b9c878a2
--- /dev/null
+++ b/trunk/tools/bison/patches/100-fix-gets-removal.patch
@@ -0,0 +1,16 @@
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -714,13 +714,6 @@
+ # endif
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning; besides, C11
+-   removed it.  */
+-#undef gets
+-#if HAVE_RAW_DECL_GETS
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-#endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/trunk/tools/ccache/Makefile b/trunk/tools/ccache/Makefile
new file mode 100644
index 00000000..aeac3930
--- /dev/null
+++ b/trunk/tools/ccache/Makefile
@@ -0,0 +1,52 @@
+# 
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
+
+PKG_NAME:=ccache
+PKG_VERSION:=3.1.9
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=http://samba.org/ftp/ccache/
+PKG_MD5SUM:=522a6016bda56892653612bbdefff3e0
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)"
+
+define Host/Install/ccache
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
+	$(CP) ./files/* $(STAGING_DIR_HOST)/bin/
+endef
+
+ifneq ($(strip $(shell which ccache >/dev/null && echo found)),found)
+  define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+  endef
+  define Host/Install
+	$(call Host/Install/Default)
+	$(call Host/Install/ccache)
+  endef
+else
+  define Host/Prepare
+  endef
+  define Host/Configure
+  endef
+  define Host/Compile
+  endef
+  define Host/Install
+	$(call Host/Install/ccache)
+  endef
+  define Host/Clean
+  endef
+  define Download
+  endef
+endif
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/ccache/files/ccache_cc b/trunk/tools/ccache/files/ccache_cc
new file mode 100755
index 00000000..01c4ad42
--- /dev/null
+++ b/trunk/tools/ccache/files/ccache_cc
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ccache "${TARGET_CC_NOCACHE}" "$@"
diff --git a/trunk/tools/ccache/files/ccache_cxx b/trunk/tools/ccache/files/ccache_cxx
new file mode 100755
index 00000000..cc60eb3a
--- /dev/null
+++ b/trunk/tools/ccache/files/ccache_cxx
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ccache "${TARGET_CXX_NOCACHE}" "$@"
diff --git a/trunk/tools/cloog/Makefile b/trunk/tools/cloog/Makefile
new file mode 100644
index 00000000..b1e6aa43
--- /dev/null
+++ b/trunk/tools/cloog/Makefile
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cloog
+PKG_VERSION:=0.18.1
+
+PKG_SOURCE_URL:=http://www.bastoul.net/cloog/pages/download/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=e34fca0540d840e5d0f6427e98c92252
+
+HOST_FIXUP:=autoreconf
+
+HOST_BUILD_PARALLEL:=1
+HOST_CONFIGURE_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+unexport CFLAGS
+
+HOST_CONFIGURE_VARS += \
+	LIBS=-lstdc++
+
+HOST_CONFIGURE_ARGS += \
+	--enable-static \
+	--disable-shared \
+	--with-ppl=$(BUILD_DIR_HOST)
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR)/$(3); \
+		$(HOST_CONFIGURE_CMD) \
+		$(HOST_CONFIGURE_VARS) \
+		$(HOST_CONFIGURE_ARGS); \
+	)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/cmake/Makefile b/trunk/tools/cmake/Makefile
new file mode 100644
index 00000000..08e2b028
--- /dev/null
+++ b/trunk/tools/cmake/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cmake
+PKG_VERSION:=2.8.12.2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.cmake.org/files/v2.8/
+PKG_MD5SUM:=17c6513483d23590cbce6957ec6d1e66
+
+HOST_BUILD_PARALLEL:=1
+HOST_CONFIGURE_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_VARS :=
+
+HOST_CONFIGURE_ARGS := \
+	--prefix=$(STAGING_DIR_HOST) \
+	$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/cmake/patches/100-disable_qt_tests.patch b/trunk/tools/cmake/patches/100-disable_qt_tests.patch
new file mode 100644
index 00000000..3d44dac5
--- /dev/null
+++ b/trunk/tools/cmake/patches/100-disable_qt_tests.patch
@@ -0,0 +1,32 @@
+--- a/Tests/RunCMake/CMakeLists.txt
++++ b/Tests/RunCMake/CMakeLists.txt
+@@ -101,16 +101,6 @@
+ add_RunCMake_test(TargetPolicies)
+ add_RunCMake_test(alias_targets)
+ 
+-find_package(Qt4 QUIET)
+-find_package(Qt5Core QUIET)
+-if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
+-  add_RunCMake_test(IncompatibleQt)
+-endif()
+-if (QT4_FOUND)
+-  set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
+-  add_RunCMake_test(ObsoleteQtMacros)
+-endif()
+-
+ if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
+   add_RunCMake_test(include_external_msproject)
+   add_RunCMake_test(SolutionGlobalSections)
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -262,10 +262,6 @@
+ 
+   list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
+ 
+-  if(NOT QT4_FOUND)
+-    find_package(Qt4)
+-  endif()
+-
+   if(QT4_FOUND)
+     # test whether the Qt4 which has been found works, on some machines
+     # which run nightly builds there were errors like "wrong file format"
diff --git a/trunk/tools/dosfstools/Makefile b/trunk/tools/dosfstools/Makefile
new file mode 100644
index 00000000..c5824891
--- /dev/null
+++ b/trunk/tools/dosfstools/Makefile
@@ -0,0 +1,30 @@
+# 
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dosfstools
+PKG_VERSION:=3.0.7
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+PKG_SOURCE_URL:=http://dosfstools.sourcearchive.com/downloads/3.0.7/
+PKG_MD5SUM:=5d4d97c79e8dae60bb08c2fba36c94d6
+PKG_CAT:=zcat
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)"
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/mkdosfs $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/mkdosfs
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/e2fsprogs/Makefile b/trunk/tools/e2fsprogs/Makefile
new file mode 100644
index 00000000..60047c76
--- /dev/null
+++ b/trunk/tools/e2fsprogs/Makefile
@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2010-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=e2fsprogs
+PKG_VERSION:=1.42.8
+PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/e2fsprogs
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CFLAGS += $(FPIC)
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+HOST_CONFIGURE_ARGS += \
+	--disable-shared \
+	--disable-elf-shlibs \
+	--enable-static \
+	--enable-dynamic-e2fsck \
+	--disable-tls \
+	--disable-nls
+
+define Host/Prepare
+	$(call Host/Prepare/Default)
+	rm -rf $(HOST_BUILD_DIR)/doc
+endef
+
+define Host/Install
+	$(Host/Install/Default)
+	$(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
+	mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
+	$(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
+	rm -rf $(STAGING_DIR_HOST)/include/uuid
+	$(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/e2fsck
+	rm -f $(STAGING_DIR_HOST)/bin/tune2fs
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch b/trunk/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
new file mode 100644
index 00000000..67a30f61
--- /dev/null
+++ b/trunk/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch
@@ -0,0 +1,11 @@
+--- a/e2fsck/e2fsck.h
++++ b/e2fsck/e2fsck.h
+@@ -73,7 +73,7 @@
+  * Exit codes used by fsck-type programs
+  */
+ #define FSCK_OK          0	/* No errors */
+-#define FSCK_NONDESTRUCT 1	/* File system errors corrected */
++#define FSCK_NONDESTRUCT 0	/* File system errors corrected */
+ #define FSCK_REBOOT      2	/* System should be rebooted */
+ #define FSCK_UNCORRECTED 4	/* File system errors left uncorrected */
+ #define FSCK_ERROR       8	/* Operational error */
diff --git a/trunk/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch b/trunk/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
new file mode 100644
index 00000000..9f6e7b1c
--- /dev/null
+++ b/trunk/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch
@@ -0,0 +1,11 @@
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -11,7 +11,7 @@ INSTALL = @INSTALL@
+ 
+ @MCONFIG@
+ 
+-@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= e4defrag
++@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG=
+ @DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8
+ 
+ @IMAGER_CMT@E2IMAGE_PROG= e2image
diff --git a/trunk/tools/e2fsprogs/patches/003-openbsd-compat.patch b/trunk/tools/e2fsprogs/patches/003-openbsd-compat.patch
new file mode 100644
index 00000000..1f7cdca0
--- /dev/null
+++ b/trunk/tools/e2fsprogs/patches/003-openbsd-compat.patch
@@ -0,0 +1,24 @@
+diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/getsize.c
+--- e2fsprogs-1.42.7.orig/lib/blkid/getsize.c	Fri Nov 30 03:40:18 2012
++++ e2fsprogs-1.42.7/lib/blkid/getsize.c	Thu Mar  7 14:21:59 2013
+@@ -26,6 +26,9 @@
+ #include <fcntl.h>
+ #ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
++#ifdef __OpenBSD__
++#include <sys/dkio.h>
++#endif
+ #endif
+ #ifdef HAVE_LINUX_FD_H
+ #include <linux/fd.h>
+diff -Nur e2fsprogs-1.42.7.orig/lib/quota/mkquota.c e2fsprogs-1.42.7/lib/quota/mkquota.c
+--- e2fsprogs-1.42.7.orig/lib/quota/mkquota.c	Wed Jan  2 01:47:20 2013
++++ e2fsprogs-1.42.7/lib/quota/mkquota.c	Thu Mar  7 14:21:59 2013
+@@ -8,6 +8,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <fcntl.h>
+ 
diff --git a/trunk/tools/e2fsprogs/patches/004-freebsd-compat.patch b/trunk/tools/e2fsprogs/patches/004-freebsd-compat.patch
new file mode 100644
index 00000000..5eff4999
--- /dev/null
+++ b/trunk/tools/e2fsprogs/patches/004-freebsd-compat.patch
@@ -0,0 +1,13 @@
+diff -Nur e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c e2fsprogs-1.42.7/lib/ext2fs/tdb.c
+--- e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c	2012-07-06 15:37:27.000000000 +0200
++++ e2fsprogs-1.42.7/lib/ext2fs/tdb.c	2013-03-07 14:54:59.000000000 +0100
+@@ -56,7 +56,9 @@
+ #include <utime.h>
+ #endif
+ #include <sys/stat.h>
++#ifndef __FreeBSD__
+ #include <sys/file.h>
++#endif
+ #include <fcntl.h>
+ 
+ #ifdef HAVE_SYS_MMAN_H
diff --git a/trunk/tools/elftosb/Makefile b/trunk/tools/elftosb/Makefile
new file mode 100644
index 00000000..6f9b9639
--- /dev/null
+++ b/trunk/tools/elftosb/Makefile
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=elftosb
+PKG_VERSION:=10.12.01
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://repository.timesys.com/buildsources/e/elftosb/elftosb-10.12.01/
+PKG_MD5SUM:=e8005d606c1e0bb3507c82f6eceb3056
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)"
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/bld/linux/elftosb $(STAGING_DIR_HOST)/bin/elftosb
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/elftosb/patches/001-libm.patch b/trunk/tools/elftosb/patches/001-libm.patch
new file mode 100644
index 00000000..02705d24
--- /dev/null
+++ b/trunk/tools/elftosb/patches/001-libm.patch
@@ -0,0 +1,11 @@
+--- elftosb-10.12.01/makefile.rules	2012-03-15 11:01:44.979020178 -0400
++++ elftosb-10.12.01/makefile.rules	2012-03-15 11:01:16.332761989 -0400
+@@ -101,7 +101,7 @@
+ 	keygen.o
+ 
+ 
+-LIBS =     -lstdc++
++LIBS =     -lstdc++ -lm
+ 
+ 
+ ifeq ("${UNAMES}", "Linux")
diff --git a/trunk/tools/elftosb/patches/002-fix-header-path.patch b/trunk/tools/elftosb/patches/002-fix-header-path.patch
new file mode 100644
index 00000000..5e3b5091
--- /dev/null
+++ b/trunk/tools/elftosb/patches/002-fix-header-path.patch
@@ -0,0 +1,19 @@
+This package had an absolute path for sys/types.h, which doesn't
+make much sense. It breaks on newer Ubuntu systems, and probably many
+others once multiarch becomes more common.
+
+This patch makes the types a relative path, and allows the system
+to use whatever include paths it feels are correct.
+
+diff -Naurp elftosb-10.12.01-orig/common/stdafx.h elftosb-10.12.01/common/stdafx.h
+--- elftosb-10.12.01-orig/common/stdafx.h	2012-07-12 13:30:10.990249396 -0400
++++ elftosb-10.12.01/common/stdafx.h	2012-07-12 13:30:06.858249391 -0400
+@@ -27,7 +27,7 @@
+ // For Linux systems only, types.h only defines the signed
+ // integer types.  This is not professional code.
+ // Update: They are defined in the header files in the more recent version of redhat enterprise gcc.
+-#include "/usr/include/sys/types.h"
++#include <sys/types.h>
+ #include <stdint.h>
+ //typedef unsigned long uint32_t;
+ //typedef unsigned short uint16_t;
diff --git a/trunk/tools/elftosb/patches/003-use-ldflags.patch b/trunk/tools/elftosb/patches/003-use-ldflags.patch
new file mode 100644
index 00000000..82fd1e8d
--- /dev/null
+++ b/trunk/tools/elftosb/patches/003-use-ldflags.patch
@@ -0,0 +1,26 @@
+--- a/makefile.rules
++++ b/makefile.rules
+@@ -131,19 +131,20 @@ exec_always:
+ 	@echo "LIBS = ${LIBS}"
+ 	@echo "EXEC_FILE = ${EXEC_FILE}"
+ 	@echo "BUILD_DIR = ${BUILD_DIR}"
++	@echo "LDFLAGS = ${LDFLAGS}"
+ 
+ clean:
+ 	rm -f ${OBJ_FILES_ELFTOSB2} ${OBJ_FILES_SBTOOL} ${OBJ_FILES_KEYGEN} \
+ 		${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN}
+ 
+ elftosb: ${OBJ_FILES_ELFTOSB2}
+-	gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2}
++	gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_ELFTOSB2}
+ 
+ sbtool: ${OBJ_FILES_SBTOOL}
+-	gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL}
++	gcc ${OBJ_FILES_SBTOOL} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_SBTOOL}
+ 
+ keygen: ${OBJ_FILES_KEYGEN}
+-	gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN}
++	gcc ${OBJ_FILES_KEYGEN} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_KEYGEN}
+ 
+ 
+ #ifeq ("${UNAMES}", "Linux")
diff --git a/trunk/tools/findutils/Makefile b/trunk/tools/findutils/Makefile
new file mode 100644
index 00000000..970cff81
--- /dev/null
+++ b/trunk/tools/findutils/Makefile
@@ -0,0 +1,20 @@
+# 
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=findutils
+PKG_VERSION:=4.4.2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_MD5SUM:=351cc4adb07d54877fa15f75fb77d39f
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/findutils/patches/21-Fix-time_t-vs-long-int-mismatches.patch b/trunk/tools/findutils/patches/21-Fix-time_t-vs-long-int-mismatches.patch
new file mode 100644
index 00000000..f3ebb052
--- /dev/null
+++ b/trunk/tools/findutils/patches/21-Fix-time_t-vs-long-int-mismatches.patch
@@ -0,0 +1,158 @@
+>From 0078a6c784da339cc529b4f0bf1156ca52692e4c Mon Sep 17 00:00:00 2001
+From: Adam Borowski <kilobyte@angband.pl>
+Date: Thu, 6 Jun 2013 18:41:53 +0000
+Subject: [PATCH] Fix time_t vs long int mismatches.
+
+Old gnulibs used randomly either time_t or long int, with a compile-time
+assert to ensure sizeof(time_t) <= sizeof(long int).  This is not the
+case on x32 where the machine word is 32 bit, yet time_t is 64 bit to
+be able to handle dates after 2038.
+
+This is not relevant for modern versions of gnulib which has rewritten
+this code, but, sadly, findutils 4.4.* uses an embedded copy of ancient
+gnulib.
+---
+ gnulib/lib/getdate.y | 46 ++++++++++++++++++++++++----------------------
+ 1 file changed, 24 insertions(+), 22 deletions(-)
+
+diff --git a/gnulib/lib/getdate.y b/gnulib/lib/getdate.y
+index e292f5e..347cc77 100644
+--- a/gnulib/lib/getdate.y
++++ b/gnulib/lib/getdate.y
+@@ -112,16 +112,18 @@
+ /* Lots of this code assumes time_t and time_t-like values fit into
+    long int.  It also assumes that signed integer overflow silently
+    wraps around, but there's no portable way to check for that at
+-   compile-time.  */
++   compile-time.
++   [1KB]: replaced suspicious uses of long_t by time_t.
+ verify (TYPE_IS_INTEGER (time_t));
+ verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
++*/
+ 
+ /* An integer value, and the number of digits in its textual
+    representation.  */
+ typedef struct
+ {
+   bool negative;
+-  long int value;
++  time_t value;
+   size_t digits;
+ } textint;
+ 
+@@ -206,7 +208,7 @@ typedef struct
+ union YYSTYPE;
+ static int yylex (union YYSTYPE *, parser_control *);
+ static int yyerror (parser_control const *, char const *);
+-static long int time_zone_hhmm (textint, long int);
++static time_t time_zone_hhmm (textint, time_t);
+ 
+ /* Extract into *PC any date and time info from a string of digits
+    of the form e.g., YYYYMMDD, YYMMDD, HHMM, HH (and sometimes YYY,
+@@ -817,8 +819,8 @@ static table const military_table[] =
+    minutes.  If MM is negative, then S is of the form HHMM and needs
+    to be picked apart; otherwise, S is of the form HH.  */
+ 
+-static long int
+-time_zone_hhmm (textint s, long int mm)
++static time_t
++time_zone_hhmm (textint s, time_t mm)
+ {
+   if (mm < 0)
+     return (s.value / 100) * 60 + s.value % 100;
+@@ -884,7 +886,7 @@ lookup_zone (parser_control const *pc, char const *name)
+    measured in seconds, ignoring leap seconds.
+    The body of this function is taken directly from the GNU C Library;
+    see src/strftime.c.  */
+-static long int
++static time_t
+ tm_diff (struct tm const *a, struct tm const *b)
+ {
+   /* Compute intervening leap days correctly even if year is negative.
+@@ -896,9 +898,9 @@ tm_diff (struct tm const *a, struct tm const *b)
+   int a400 = SHR (a100, 2);
+   int b400 = SHR (b100, 2);
+   int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
+-  long int ayear = a->tm_year;
+-  long int years = ayear - b->tm_year;
+-  long int days = (365 * years + intervening_leap_days
++  time_t ayear = a->tm_year;
++  time_t years = ayear - b->tm_year;
++  time_t int days = (365 * years + intervening_leap_days
+ 		   + (a->tm_yday - b->tm_yday));
+   return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
+ 		+ (a->tm_min - b->tm_min))
+@@ -1200,7 +1202,7 @@ bool
+ get_date (struct timespec *result, char const *p, struct timespec const *now)
+ {
+   time_t Start;
+-  long int Start_ns;
++  time_t Start_ns;
+   struct tm const *tmp;
+   struct tm tm;
+   struct tm tm0;
+@@ -1407,16 +1409,16 @@ get_date (struct timespec *result, char const *p, struct timespec const *now)
+ 		 problem, set the time zone to 1 hour behind UTC temporarily
+ 		 by setting TZ="XXX1:00" and try mktime again.  */
+ 
+-	      long int time_zone = pc.time_zone;
+-	      long int abs_time_zone = time_zone < 0 ? - time_zone : time_zone;
+-	      long int abs_time_zone_hour = abs_time_zone / 60;
++	      time_t time_zone = pc.time_zone;
++	      time_t abs_time_zone = time_zone < 0 ? - time_zone : time_zone;
++	      time_t abs_time_zone_hour = abs_time_zone / 60;
+ 	      int abs_time_zone_min = abs_time_zone % 60;
+ 	      char tz1buf[sizeof "XXX+0:00"
+ 			  + sizeof pc.time_zone * CHAR_BIT / 3];
+ 	      if (!tz_was_altered)
+ 		tz0 = get_tz (tz0buf);
+ 	      sprintf (tz1buf, "XXX%s%ld:%02d", "-" + (time_zone < 0),
+-		       abs_time_zone_hour, abs_time_zone_min);
++		       (long int)abs_time_zone_hour, abs_time_zone_min);
+ 	      if (setenv ("TZ", tz1buf, 1) != 0)
+ 		goto fail;
+ 	      tz_was_altered = true;
+@@ -1439,7 +1441,7 @@ get_date (struct timespec *result, char const *p, struct timespec const *now)
+ 
+       if (pc.zones_seen)
+ 	{
+-	  long int delta = pc.time_zone * 60;
++	  time_t delta = pc.time_zone * 60;
+ 	  time_t t1;
+ #ifdef HAVE_TM_GMTOFF
+ 	  delta -= tm.tm_gmtoff;
+@@ -1486,16 +1488,16 @@ get_date (struct timespec *result, char const *p, struct timespec const *now)
+ 	 must be applied before relative times, and if mktime is applied
+ 	 again the time zone will be lost.  */
+       {
+-	long int sum_ns = pc.seconds.tv_nsec + pc.rel.ns;
+-	long int normalized_ns = (sum_ns % BILLION + BILLION) % BILLION;
++	time_t sum_ns = pc.seconds.tv_nsec + pc.rel.ns;
++	time_t normalized_ns = (sum_ns % BILLION + BILLION) % BILLION;
+ 	time_t t0 = Start;
+-	long int d1 = 60 * 60 * pc.rel.hour;
++	time_t d1 = 60 * 60 * pc.rel.hour;
+ 	time_t t1 = t0 + d1;
+-	long int d2 = 60 * pc.rel.minutes;
++	time_t d2 = 60 * pc.rel.minutes;
+ 	time_t t2 = t1 + d2;
+-	long int d3 = pc.rel.seconds;
++	time_t d3 = pc.rel.seconds;
+ 	time_t t3 = t2 + d3;
+-	long int d4 = (sum_ns - normalized_ns) / BILLION;
++	time_t d4 = (sum_ns - normalized_ns) / BILLION;
+ 	time_t t4 = t3 + d4;
+ 
+ 	if ((d1 / (60 * 60) ^ pc.rel.hour)
+@@ -1542,7 +1544,7 @@ main (int ac, char **av)
+ 	printf ("Bad format - couldn't convert.\n");
+       else if (! (tm = localtime (&d.tv_sec)))
+ 	{
+-	  long int sec = d.tv_sec;
++	  time_t sec = d.tv_sec;
+ 	  printf ("localtime (%ld) failed\n", sec);
+ 	}
+       else
+-- 
+1.8.3.rc3
+
diff --git a/trunk/tools/firmware-utils/Makefile b/trunk/tools/firmware-utils/Makefile
new file mode 100644
index 00000000..988c6256
--- /dev/null
+++ b/trunk/tools/firmware-utils/Makefile
@@ -0,0 +1,80 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := firmware-utils
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define cc
+	$(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) $(HOST_LDFLAGS) -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
+endef
+
+define Host/Compile
+	mkdir -p $(HOST_BUILD_DIR)/bin
+	$(call cc,addpattern)
+	$(call cc,trx)
+	$(call cc,motorola-bin)
+	$(call cc,dgfirmware)
+	$(call cc,mksenaofw md5)
+	$(call cc,trx2usr)
+	$(call cc,ptgen)
+	$(call cc,airlink)
+	$(call cc,srec2bin)
+	$(call cc,mkmylofw)
+	$(call cc,mkcsysimg)
+	$(call cc,mkzynfw)
+	$(call cc,lzma2eva,-lz)
+	$(call cc,mkcasfw)
+	$(call cc,mkfwimage,-lz)
+	$(call cc,mkfwimage2,-lz)
+	$(call cc,imagetag imagetag_cmdline)
+	$(call cc,add_header)
+	$(call cc,makeamitbin)
+	$(call cc,encode_crc)
+	$(call cc,nand_ecc)
+	$(call cc,mkplanexfw sha1)
+	$(call cc,mktplinkfw md5)
+	$(call cc,mktplinkfw2 md5)
+	$(call cc,tplink-safeloader md5, -Wall)
+	$(call cc,pc1crypt)
+	$(call cc,osbridge-crc)
+	$(call cc,wrt400n cyg_crc32)
+	$(call cc,mkdniimg)
+	$(call cc,mktitanimg)
+	$(call cc,mkchkimg)
+	$(call cc,mkzcfw cyg_crc32)
+	$(call cc,spw303v)
+	$(call cc,zyxbcm)
+	$(call cc,trx2edips)
+	$(call cc,xorimage)
+	$(call cc,buffalo-enc buffalo-lib, -Wall)
+	$(call cc,buffalo-tag buffalo-lib, -Wall)
+	$(call cc,buffalo-tftp buffalo-lib, -Wall)
+	$(call cc,mkwrgimg md5, -Wall)
+	$(call cc,mkedimaximg)
+	$(call cc,mkbrncmdline)
+	$(call cc,mkbrnimg)
+	$(call cc,mkdapimg)
+	$(call cc, mkcameofw, -Wall)
+	$(call cc,seama md5)
+	$(call cc,fix-u-media-header cyg_crc32,-Wall)
+	$(call cc,hcsmakeimage bcmalgo)
+	$(call cc,mkporayfw, -Wall)
+	$(call cc,mkhilinkfw, -lcrypto)
+	$(call cc,mkdcs932, -Wall)
+	$(call cc,mkheader_gemtek,-lz)
+	$(call cc,mkrtn56uimg, -lz)
+	$(call cc,dgn3500sum)
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/firmware-utils/src/add_header.c b/trunk/tools/firmware-utils/src/add_header.c
new file mode 100644
index 00000000..37775c3e
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/add_header.c
@@ -0,0 +1,138 @@
+/*
+ * add_header.c - partially based on OpenWrt's motorola-bin.c
+ *
+ * Copyright (C) 2008 Imre Kaloz  <kaloz@openwrt.org>
+ *                    Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute 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 that 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.
+ */
+
+/*
+ * The add_header utility used by various vendors preprends the buf
+ * image with a header containing a CRC32 value which is generated for the
+ * model id + reserved space for CRC32 + buf, then replaces the reserved
+ * area with the actual CRC32. This replacement tool mimics this behavior.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <inttypes.h>
+
+#define BPB 8 /* bits/byte */
+
+static uint32_t crc32[1<<BPB];
+
+static void init_crc32()
+{
+	const uint32_t poly = ntohl(0x2083b8ed);
+	int n;
+
+	for (n = 0; n < 1<<BPB; n++) {
+		uint32_t crc = n;
+		int bit;
+
+		for (bit = 0; bit < BPB; bit++)
+			crc = (crc & 1) ? (poly ^ (crc >> 1)) : (crc >> 1);
+		crc32[n] = crc;
+	}
+}
+
+static uint32_t crc32buf(unsigned char *buf, size_t len)
+{
+	uint32_t crc = 0xFFFFFFFF;
+
+	for (; len; len--, buf++)
+		crc = crc32[(uint8_t)crc ^ *buf] ^ (crc >> BPB);
+	return ~crc;
+}
+
+struct header {
+	unsigned char model[16];
+	uint32_t crc;
+};
+
+static void usage(const char *) __attribute__ (( __noreturn__ ));
+
+static void usage(const char *mess)
+{
+	fprintf(stderr, "Error: %s\n", mess);
+	fprintf(stderr, "Usage: add_header model_id input_file output_file\n");
+	fprintf(stderr, "\n");
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	off_t len;			// of original buf
+	off_t buflen;			// of the output file
+	int fd;
+	void *input_file;		// pointer to the input file (mmmapped)
+	struct header header;
+	unsigned char *buf;	// pointer to prefix + copy of original buf
+
+	// verify parameters
+
+	if (argc != 4)
+		usage("wrong number of arguments");
+
+	// mmap input_file
+	if ((fd = open(argv[2], O_RDONLY))  < 0
+	|| (len = lseek(fd, 0, SEEK_END)) < 0
+	|| (input_file = mmap(0, len, PROT_READ, MAP_SHARED, fd, 0)) == (void *) (-1)
+	|| close(fd) < 0)
+	{
+		fprintf(stderr, "Error loading file %s: %s\n", argv[2], strerror(errno));
+		exit(1);
+	}
+
+	buflen = len + sizeof(header);
+
+	init_crc32();
+
+	// copy model name into header
+	strncpy(header.model, argv[1], sizeof(header.model));
+	header.crc = 0;
+
+	// create a firmware image in memory and copy the input_file to it
+	buf = malloc(buflen);
+	memcpy(buf, &header, sizeof(header));
+	memcpy(&buf[sizeof(header)], input_file, len);
+
+	// CRC of temporary header + buf
+	header.crc = htonl(crc32buf(buf, buflen));
+
+	memcpy(buf, &header, sizeof(header));
+
+	// write the buf
+	if ((fd = open(argv[3], O_CREAT|O_WRONLY|O_TRUNC,0644)) < 0
+	|| write(fd, buf, buflen) != buflen
+	|| close(fd) < 0)
+	{
+		fprintf(stderr, "Error storing file %s: %s\n", argv[3], strerror(errno));
+		exit(2);
+ 	}
+
+	free(buf);
+
+	munmap(input_file,len);
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/addpattern.c b/trunk/tools/firmware-utils/src/addpattern.c
new file mode 100644
index 00000000..1d722856
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/addpattern.c
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) 2004  Manuel Novoa III  <mjn3@codepoet.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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
+ */
+
+/* July 29, 2004
+ *
+ * This is a hacked replacement for the 'addpattern' utility used to
+ * create wrt54g .bin firmware files.  It isn't pretty, but it does
+ * the job for me.
+ *
+ * Extensions:
+ *  -v allows setting the version string on the command line.
+ *  -{0|1} sets the (currently ignored) hw_ver flag in the header
+ *      to 0 or 1 respectively.
+ */
+
+/* January 12, 2005
+ *
+ * Modified by rodent at rodent dot za dot net
+ * Support added for the new WRT54G v2.2 and WRT54GS v1.1 "flags"
+ * Without the flags set to 0x7, the above units will refuse to flash.
+ *
+ * Extensions:
+ *  -{0|1|2} sets {0|1} sets hw_ver flag to 0/1. {2} sets hw_ver to 1
+ *     and adds the new hardware "flags" for the v2.2/v1.1 units
+*/
+
+/* January 1, 2007
+ *
+ * Modified by juan.i.gonzalez at subdown dot net
+ * Support added for the AG241v2  and similar
+ *
+ * Extensions:
+ *  -r #.# adds revision hardware flags. AG241v2 and similar.
+ *
+ * AG241V2 firmware sets the hw_ver to 0x44.
+ *
+ * Example: -r 2.0
+ *
+ * Convert 2.0 to 20 to be an integer, and add 0x30 to skip special ASCII
+ * #define HW_Version ((HW_REV * 10) + 0x30)  -> from cyutils.h
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+/**********************************************************************/
+
+#define CODE_ID		"U2ND"		/* from code_pattern.h */
+#define CODE_PATTERN   "W54S"	/* from code_pattern.h */
+#define PBOT_PATTERN   "PBOT"
+
+#define CYBERTAN_VERSION	"v3.37.2" /* from cyutils.h */
+
+/* WRT54G v2.2 and WRT54GS v1.1 "flags" (from 3.37.32 firmware cyutils.h) */
+#define SUPPORT_4712_CHIP      0x0001
+#define SUPPORT_INTEL_FLASH    0x0002
+#define SUPPORT_5325E_SWITCH   0x0004
+/* (from 3.00.24 firmware cyutils.h) */
+#define SUPPORT_4704_CHIP      0x0008
+#define SUPPORT_5352E_CHIP     0x0010
+/* (from WD My Net Wi-Fi Range Extender's cyutils.s) */
+#define SUPPORT_4703_CHIP      0x0020
+
+struct code_header {			/* from cyutils.h */
+	char magic[8];
+	char fwdate[3];
+	char fwvern[3];
+	char id[4];					/* U2ND */
+	char hw_ver;    			/* 0: for 4702, 1: for 4712 -- new in 2.04.3 */
+
+	unsigned char  sn;		// Serial Number
+	unsigned char  flags[2];	/* SUPPORT_ flags new for 3.37.2 (WRT54G v2.2 and WRT54GS v1.1) */
+	unsigned char  stable[2];	// The image is stable (for dual image)
+	unsigned char  try1[2];		// Try to boot image first time (for dual image)
+	unsigned char  try2[2];		// Try to boot image second time (for dual image)
+	unsigned char  try3[2];		// Try to boot image third time (for dual_image)
+	unsigned char  res3[2];
+} ;
+
+struct board_info {
+	char	*id;
+	char	*pattern;
+	char	hw_ver;
+	char	sn;
+	char	flags[2];
+};
+
+struct board_info boards[] = {
+	{
+		.id		= "WRT160NL",
+		.pattern	= "NL16",
+		.hw_ver		= 0x00,
+		.sn		= 0x0f,
+		.flags		= {0x3f, 0x00},
+	},
+	{
+		.id		= "mynet-rext",
+		.pattern	= "WDHNSTFH",
+		.hw_ver		= 0x00,
+		.sn		= 0x00,
+		.flags		= {0x3f, 0x00},
+	}, {
+		/* Terminating entry */
+		.id	= NULL,
+	}
+};
+
+/**********************************************************************/
+
+void usage(void) __attribute__ (( __noreturn__ ));
+
+void usage(void)
+{
+	fprintf(stderr, "Usage: addpattern [-i trxfile] [-o binfile] [-B board_id] [-p pattern] [-s serial] [-g] [-b] [-v v#.#.#] [-r #.#] [-{0|1|2|4|5}] -h\n");
+	exit(EXIT_FAILURE);
+}
+
+struct board_info *find_board(char *id)
+{
+	struct board_info *board;
+
+	for (board = boards; board->id != NULL; board++)
+		if (strcasecmp(id, board->id) == 0)
+			return board;
+
+	return NULL;
+}
+
+int main(int argc, char **argv)
+{
+	char buf[1024];	/* keep this at 1k or adjust garbage calc below */
+	struct code_header *hdr;
+	FILE *in = stdin;
+	FILE *out = stdout;
+	char *ifn = NULL;
+	char *ofn = NULL;
+	char *pattern = CODE_PATTERN;
+	char *pbotpat = PBOT_PATTERN;
+	char *version = CYBERTAN_VERSION;
+	char *board_id = NULL;
+	struct board_info *board = NULL;
+	int gflag = 0;
+	int pbotflag = 0;
+	int c;
+	int v0, v1, v2;
+	size_t off, n;
+	time_t t;
+	struct tm *ptm;
+
+	fprintf(stderr, "mjn3's addpattern replacement - v0.81\n");
+
+	hdr = (struct code_header *) buf;
+	memset(hdr, 0, sizeof(struct code_header));
+
+	while ((c = getopt(argc, argv, "i:o:p:s:gbv:01245hr:B:")) != -1) {
+		switch (c) {
+			case 'i':
+				ifn = optarg;
+				break;
+			case 'o':
+				ofn = optarg;
+				break;
+			case 'p':
+				pattern = optarg;
+				break;
+			case 's':
+				hdr->sn = (unsigned char) atoi (optarg);
+				break;
+			case 'g':
+				gflag = 1;
+				break;
+			case 'b':
+				pbotflag = 1;
+				break;
+			case 'v':			/* extension to allow setting version */
+				version = optarg;
+				break;
+			case '0':
+				hdr->hw_ver = 0;
+				break;
+			case '1':
+				hdr->hw_ver = 1;
+				break;
+			case '2': 			/* new 54G v2.2 and 54GS v1.1 flags */
+				hdr->hw_ver = 1;
+				hdr->flags[0] |= SUPPORT_4712_CHIP;
+				hdr->flags[0] |= SUPPORT_INTEL_FLASH;
+				hdr->flags[0] |= SUPPORT_5325E_SWITCH;
+				break;
+			case '4':
+				/* V4 firmware sets the flags to 0x1f */
+				hdr->hw_ver = 0;
+				hdr->flags[0] = 0x1f;
+				break;
+			case '5':
+				/* V5 is appended to trxV2 image */
+				hdr->stable[0] = 0x73; // force image to be stable
+				hdr->stable[1] = 0x00;
+				hdr->try1[0]   = 0x74; // force try1 to be set
+				hdr->try1[1]   = 0x00;
+				hdr->try2[0]   = hdr->try2[1]   = 0xFF;
+				hdr->try3[0]   = hdr->try3[1]   = 0xFF;
+				break;
+                        case 'r':
+                                hdr->hw_ver = (char)(atof(optarg)*10)+0x30;
+                                break;
+                        case 'B':
+                                board_id = optarg;
+                                break;
+
+                        case 'h':
+			default:
+				usage();
+		}
+	}
+
+    	if (optind != argc || optind == 1) {
+		fprintf(stderr, "illegal arg \"%s\"\n", argv[optind]);
+		usage();
+	}
+
+	if (board_id) {
+		board = find_board(board_id);
+		if (board == NULL) {
+			fprintf(stderr, "unknown board \"%s\"\n", board_id);
+			usage();
+		}
+		pattern = board->pattern;
+		hdr->hw_ver = board->hw_ver;
+		hdr->sn = board->sn;
+		hdr->flags[0] = board->flags[0];
+		hdr->flags[1] = board->flags[1];
+	}
+
+	if (strlen(pattern) > 8) {
+		fprintf(stderr, "illegal pattern \"%s\"\n", pattern);
+		usage();
+	}
+
+	if (ifn && !(in = fopen(ifn, "r"))) {
+		fprintf(stderr, "can not open \"%s\" for reading\n", ifn);
+		usage();
+	}
+
+	if (ofn && !(out = fopen(ofn, "w"))) {
+		fprintf(stderr, "can not open \"%s\" for writing\n", ofn);
+		usage();
+	}
+
+	if (time(&t) == (time_t)(-1)) {
+		fprintf(stderr, "time call failed\n");
+		return EXIT_FAILURE;
+	}
+
+	ptm = localtime(&t);
+
+	if (3 != sscanf(version, "v%d.%d.%d", &v0, &v1, &v2)) {
+		fprintf(stderr, "bad version string \"%s\"\n", version);
+		return EXIT_FAILURE;
+	}
+
+	memcpy(hdr->magic, pattern, strlen(pattern));
+	if (pbotflag)
+		memcpy(&hdr->magic[4], pbotpat, 4);
+	hdr->fwdate[0] = ptm->tm_year % 100;
+	hdr->fwdate[1] = ptm->tm_mon + 1;
+	hdr->fwdate[2] = ptm->tm_mday;
+	hdr->fwvern[0] = v0;
+	hdr->fwvern[1] = v1;
+	hdr->fwvern[2] = v2;
+	memcpy(hdr->id, CODE_ID, strlen(CODE_ID));
+
+	off = sizeof(struct code_header);
+
+	fprintf(stderr, "writing firmware v%d.%d.%d on %d/%d/%d (y/m/d)\n",
+			v0, v1, v2,
+			hdr->fwdate[0], hdr->fwdate[1], hdr->fwdate[2]);
+
+
+	while ((n = fread(buf + off, 1, sizeof(buf)-off, in) + off) > 0) {
+		off = 0;
+		if (n < sizeof(buf)) {
+			if (ferror(in)) {
+			FREAD_ERROR:
+				fprintf(stderr, "fread error\n");
+				return EXIT_FAILURE;
+			}
+			if (gflag) {
+				gflag = sizeof(buf) - n;
+				memset(buf + n, 0xff, gflag);
+				fprintf(stderr, "adding %d bytes of garbage\n", gflag);
+				n = sizeof(buf);
+			}
+		}
+		if (!fwrite(buf, n, 1, out)) {
+		FWRITE_ERROR:
+			fprintf(stderr, "fwrite error\n");
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (ferror(in)) {
+		goto FREAD_ERROR;
+	}
+
+	if (fflush(out)) {
+		goto FWRITE_ERROR;
+	}
+
+	fclose(in);
+	fclose(out);
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/firmware-utils/src/airlink.c b/trunk/tools/firmware-utils/src/airlink.c
new file mode 100644
index 00000000..560a58df
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/airlink.c
@@ -0,0 +1,332 @@
+/*
+ * Thanks to Vassily Galinsky for this tool
+*****************************************************************************
+AIRLINK AR525W firmware image structure
+  -8:-5  Extended (httpd) header checksum  -       sum2
+  -4:-1  Extended (httpd) header magic     -       "ARRN" - 0x4e525241
+   0: 3  Standard (tftpd) header magic     -       "GMTK" - 0x4b544d47
+   4: 7  Standard (tftpd) header checksum  -       sum1
+   8: b  0
+   c: f  Size of compressed linux kernel
+  10:13  Size of firmware image file with standard header
+  14:17  Product code                      -       0x5
+  18:1b  Bootloader checksum               -       sum0
+  1c:1f  0
+  20:    Compressed linux kernel
+  -      Squashfs or jffs2 file system - kernel dependent - either 32 bytes or sector aligned 
+*****************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+
+typedef unsigned char uchar;
+
+uint32_t crctab[257] = {
+	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,
+	0
+};
+
+uint32_t header[] = {
+	0x00000000, 0x4e525241,
+	0x4b544d47, 0x00000000, 0x00000000, 0x000afd4a,
+	0x00000000, 0x00000005, 0x00000000, 0x00000000
+};
+
+static int JFFS2 = 0;
+
+int generate_image(char *kname, char *fsname, char *fname, int EHDR)
+{
+	int i;
+	uint32_t lenk, lens;
+	uchar *bk, *bs;
+	int fkd, ffd, fsd;
+	fkd = open(kname, O_RDONLY);
+	ffd = creat(fname, 0644);
+	if ((fkd < 0) || (ffd < 0))
+		return -1;
+	if (fsname) {
+		fsd = open(fsname, O_RDONLY);
+		if (fsd < 0)
+			return -1;
+	}
+	lenk = lseek(fkd, 0, SEEK_END);
+	header[5] = lenk;
+	bk = (uchar *) mmap(NULL, lenk, PROT_READ, MAP_SHARED, fkd, 0);
+	if (bk == MAP_FAILED)
+		return -1;
+	if (fsname) {
+		lens = lseek(fsd, 0, SEEK_END);
+		bs = (uchar *) mmap(NULL, lens, PROT_READ, MAP_SHARED, fsd,
+				    0);
+		if (bs == MAP_FAILED)
+			return -1;
+	}
+	if (EHDR)
+		write(ffd, header, 0x28);
+	else
+		write(ffd, header + 2, 0x20);
+	write(ffd, bk, lenk);
+	lenk += 0x20;
+	if (!JFFS2) JFFS2 = 0x20;
+	printf("Padding header+kernel - 0x%x +  0x%x = 0x%x\n",
+	       lenk, ((lenk - 1 + JFFS2) / JFFS2) * JFFS2 - lenk,
+	       ((lenk - 1 + JFFS2) / JFFS2) * JFFS2);
+	for (i = 0; i < ((lenk - 1 + JFFS2) / JFFS2) * JFFS2 - lenk; i++)
+		write(ffd, header, 1);
+	if (fsname) {
+		write(ffd, bs, lens);
+		close(fsd);
+	}
+	close(ffd);
+	close(fkd);
+	return 0;
+}
+
+uint32_t crc32(uchar * buf, uint32_t len)
+{
+	register int i;
+	uint32_t sum;
+	register uint32_t s0;
+	s0 = ~0;
+	for (i = 0; i < len; i++) {
+		s0 = (s0 >> 8) ^ crctab[(uchar) (s0 & 0xFF) ^ buf[i]];
+	}
+	sum = ~s0;
+	return sum;
+}
+
+void usage(char *prog)
+{
+	printf("Usage: %s [-b 0/1] image_filename \n", prog);
+	printf("       update checksums for firmware file\n");
+	printf
+	    ("Usage: %s [-b 0/1] [-j erasesize_in_kibytes] [-e] kernel filesystem image_filename \n",
+	     prog);
+	printf("       generate firmware file and update checksums\n");
+	printf("--------------------------------------------------\n");
+	printf("       -e - generate header for web upload\n");
+	printf("       -b 0/1 - clear/update bootloader checksum\n");
+	printf("       -j erasesize_in_kibytes - generate header for jffs2 filesystem\n");
+}
+
+int main(int argc, char **argv)
+{
+	uchar b[0x400];
+	char EHDR = 0;
+	char BHDR = 0;
+	int c, fd;
+	extern char *optarg;
+	extern int optind, optopt;
+
+	while ((c = getopt(argc, argv, "b:ej:")) != -1) {
+		switch (c) {
+		case 'b':
+			if (optarg[0] == '1')
+				BHDR = 1;
+			break;
+		case 'e':
+			EHDR = 1;
+			break;
+		case 'j':
+			sscanf(optarg, "%i", &JFFS2);
+			JFFS2 *= 1024;
+			break;
+		case '?':
+			fprintf(stderr, "\nError: unknown arg %c\n\n\n",
+				optopt);
+			usage(argv[0]);
+			exit(-1);
+		}
+	}
+	if (((argc - optind) < 1) && ((argc - optind) > 3)) {
+		usage(argv[0]);
+		exit(-1);
+	}
+	if ((argc - optind) == 3)
+		if (generate_image
+		    (argv[optind], argv[optind + 1], argv[optind + 2],
+		     EHDR)) {
+			fprintf(stderr,
+				"\nError generating image file %s\n\n\n",
+				argv[argc - 1]);
+			usage(argv[0]);
+			exit(-1);
+		}
+	if ((argc - optind) == 2)
+		if (generate_image
+		    (argv[optind], NULL, argv[optind + 1], EHDR)) {
+			fprintf(stderr,
+				"\nError generating image file %s\n\n\n",
+				argv[argc - 1]);
+			usage(argv[0]);
+			exit(-1);
+		}
+
+	fd = open(argv[argc - 1], O_RDWR);
+	if (fd < 0) {
+		fprintf(stderr, "\nImage file not found %s\n\n\n",
+			argv[argc - 1]);
+		usage(argv[0]);
+		exit(-1);
+	}
+	long i, len = lseek(fd, 0, SEEK_END);
+	lseek(fd, 0, SEEK_SET);
+	uchar *buf = malloc(len);
+	read(fd, buf, len);
+	uint32_t sum, l0;
+	uint32_t MagicS = 0x474d544b;
+	uint32_t MagicE = 0x4152524e;
+	if (ntohl(*((uint32_t *) buf)) == MagicS) {
+		fprintf(stderr,
+			"Image without extra 8 bytes - Standard header\n");
+		buf[0x10] = len & 0xff;
+		buf[0x11] = (len >> 8) & 0xff;
+		buf[0x12] = (len >> 16) & 0xff;
+		buf[0x13] = (len >> 24) & 0xff;
+		lseek(fd, 0x10, SEEK_SET);
+		write(fd, buf + 0x10, 0x4);
+		EHDR = 0;
+	} else if ((ntohl(*((uint32_t *) (buf + 0x8))) == MagicS)
+		   && ((ntohl(*((uint32_t *) (buf + 0x4))) == MagicE))) {
+		fprintf(stderr,
+			"Image with extra 8 bytes - Extended header\n");
+		*((uint32_t *) (buf + 0x18)) = len - 8;
+		buf[0x18] = (len - 8) & 0xff;
+		buf[0x19] = ((len - 8) >> 8) & 0xff;
+		buf[0x1a] = ((len - 8) >> 16) & 0xff;
+		buf[0x1b] = ((len - 8) >> 24) & 0xff;
+		lseek(fd, 0x18, SEEK_SET);
+		write(fd, buf + 0x18, 0x4);
+		buf += 8;
+		EHDR = 1;
+	} else if (len == buf[0x10] | ((uint32_t)buf[0x11] << 8) | ((uint32_t)buf[0x12] << 16) | ((uint32_t)buf[0x13] << 24)) {
+		fprintf(stderr,
+			"Image without extra 8 bytes - Standard header\n");
+		EHDR = 0;
+	} else if (len == (buf[0x18] | ((uint32_t)buf[0x19] << 8) | ((uint32_t)buf[0x1a] << 16) | ((uint32_t)buf[0x1b] << 24)) + 8) {
+		fprintf(stderr,
+			"Image with extra 8 bytes - Extended header\n");
+		buf += 8;
+		EHDR = 1;
+	} else {
+		fprintf(stderr, "ERROR: Wrong image size\n");
+		exit(-1);
+	}
+	l0 = buf[0x10] | ((uint32_t)buf[0x11] << 8) | ((uint32_t)buf[0x12] << 16) | ((uint32_t)buf[0x13] << 24);
+	if (!BHDR)
+		*((uint32_t *) & buf[0x18]) = 0;
+	unsigned long sum0 = buf[0x18] | ((uint32_t)buf[0x19] << 8) | ((uint32_t)buf[0x1a] << 16) | ((uint32_t)buf[0x1b] << 24);
+	unsigned long sum1 = buf[0x4] | ((uint32_t)buf[0x5] << 8) | ((uint32_t)buf[0x6] << 16) | ((uint32_t)buf[0x7] << 24);
+	*((uint32_t *) & buf[0x4]) = 0x0L;
+	memcpy(b, buf, 0x100);
+	memcpy(b + 0x100, buf + ((l0 >> 1) - ((l0 & 0x6) >> 1)), 0x100);
+	memcpy(b + 0x200, buf + (l0 - 0x200), 0x200);
+	*((uint32_t *) & b[0x18]) = 0x0L;
+
+	sum = crc32(b, 0x400);
+	printf("CRC32 sum0 - (%x, %x, %x)\n", sum, sum0, 0x400);
+	if (EHDR)
+		lseek(fd, 0x20, SEEK_SET);
+	else
+		lseek(fd, 0x18, SEEK_SET);
+	buf[0x18] = (BHDR ? sum : sum0) & 0xff;
+	buf[0x19] = ((BHDR ? sum : sum0) >> 8) & 0xff;
+	buf[0x1a] = ((BHDR ? sum : sum0) >> 16) & 0xff;
+	buf[0x1b] = ((BHDR ? sum : sum0) >> 24) & 0xff;
+	write(fd, &buf[0x18], 0x4);
+
+	sum = crc32(buf, l0);
+	printf("CRC32 sum1 - (%x, %x, %x)\n", sum, sum1, l0);
+	if (EHDR)
+		lseek(fd, 0xC, SEEK_SET);
+	else
+		lseek(fd, 0x4, SEEK_SET);
+	buf[0x4] = sum & 0xff;
+	buf[0x5] = (sum >> 8) & 0xff;
+	buf[0x6] = (sum >> 16) & 0xff;
+	buf[0x7] = (sum >> 24) & 0xff;
+	write(fd, &buf[0x4], 0x4);
+	if (EHDR) {
+		unsigned long sum2 = buf[-0x8] | ((uint32_t)buf[-0x7] << 8) | ((uint32_t)buf[-0x6] << 16) | ((uint32_t)buf[-0x5] << 24);
+		*((uint32_t *) & buf[-0x8]) = 0L;
+		sum = crc32(buf - 0x4, len - 0x4);
+		printf("CRC32 sum2 - (%x, %x, %x)\n", sum, sum2,
+		       len - 0x4);
+		lseek(fd, 0, SEEK_SET);
+		*((uint32_t *) & buf[-0x8]) = htonl(sum);
+		write(fd, &buf[-0x8], 0x4);
+		buf -= 8;
+	}
+	close(fd);
+	free(buf);
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/bcm_tag.h b/trunk/tools/firmware-utils/src/bcm_tag.h
new file mode 100644
index 00000000..2730edc9
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/bcm_tag.h
@@ -0,0 +1,70 @@
+#ifndef __BCM63XX_TAG_H
+#define __BCM63XX_TAG_H
+
+#define TAGVER_LEN 4                   /* Length of Tag Version */
+#define TAGLAYOUT_LEN 4                /* Length of FlashLayoutVer */
+#define SIG1_LEN 20		       /* Company Signature 1 Length */
+#define SIG2_LEN 14                    /* Company Signature 2 Lenght */
+#define BOARDID_LEN 16		       /* Length of BoardId */
+#define ENDIANFLAG_LEN 2               /* Endian Flag Length */
+#define CHIPID_LEN 6		       /* Chip Id Length */
+#define IMAGE_LEN 10                   /* Length of Length Field */
+#define ADDRESS_LEN 12                 /* Length of Address field */
+#define DUALFLAG_LEN 2		       /* Dual Image flag Length */
+#define INACTIVEFLAG_LEN 2	       /* Inactie Flag Length */
+#define RSASIG_LEN 20   	       /* Length of RSA Signature in tag */
+#define TAGINFO1_LEN 30                /* Length of vendor information field1 in tag */
+#define FLASHLAYOUTVER_LEN 4	       /* Length of Flash Layout Version String tag */
+#define TAGINFO2_LEN 16                /* Length of vendor information field2 in tag */
+#define CRC_LEN 4                      /* Length of CRC in bytes */
+#define ALTTAGINFO_LEN 54              /* Alternate length for vendor information; Pirelli */
+
+#define NUM_PIRELLI 2
+#define IMAGETAG_CRC_START		0xFFFFFFFF
+
+#define PIRELLI_BOARDS { \
+  "AGPF-S0", \
+  "DWV-S0", \
+}
+
+/*
+ * The broadcom firmware assumes the rootfs starts the image,
+ * therefore uses the rootfs start (flashImageAddress)
+ * to determine where to flash the image.  Since we have the kernel first
+ * we have to give it the kernel address, but the crc uses the length
+ * associated with this address (rootLength), which is added to the kernel
+ * length (kernelLength) to determine the length of image to flash and thus
+ * needs to be rootfs + deadcode (jffs2 EOF marker)
+*/
+
+struct bcm_tag {
+	char tagVersion[TAGVER_LEN];           // 0-3: Version of the image tag
+	char sig_1[SIG1_LEN];                  // 4-23: Company Line 1
+	char sig_2[SIG2_LEN];                  // 24-37: Company Line 2
+	char chipid[CHIPID_LEN];               // 38-43: Chip this image is for
+	char boardid[BOARDID_LEN];             // 44-59: Board name
+	char big_endian[ENDIANFLAG_LEN];       // 60-61: Map endianness -- 1 BE 0 LE
+	char totalLength[IMAGE_LEN];           // 62-71: Total length of image
+	char cfeAddress[ADDRESS_LEN];          // 72-83: Address in memory of CFE
+	char cfeLength[IMAGE_LEN];             // 84-93: Size of CFE
+	char flashImageStart[ADDRESS_LEN];     // 94-105: Address in memory of image start (kernel for OpenWRT, rootfs for stock firmware)
+	char flashRootLength[IMAGE_LEN];            // 106-115: Size of rootfs for flashing
+	char kernelAddress[ADDRESS_LEN];       // 116-127: Address in memory of kernel
+	char kernelLength[IMAGE_LEN];          // 128-137: Size of kernel
+	char dualImage[DUALFLAG_LEN];          // 138-139: Unused at present
+	char inactiveFlag[INACTIVEFLAG_LEN];   // 140-141: Unused at present
+        char rsa_signature[RSASIG_LEN];        // 142-161: RSA Signature (unused at present; some vendors may use this)
+	char information1[TAGINFO1_LEN];       // 162-191: Compilation and related information (not generated/used by OpenWRT)
+        char flashLayoutVer[FLASHLAYOUTVER_LEN];// 192-195: Version flash layout
+        char fskernelCRC[CRC_LEN];             // 196-199: kernel+rootfs CRC32
+	char information2[TAGINFO2_LEN];       // 200-215: Unused at present except Alice Gate where is is information
+	char imageCRC[CRC_LEN];                // 216-219: CRC32 of image less imagetag (kernel for Alice Gate)
+        char rootfsCRC[CRC_LEN];               // 220-223: CRC32 of rootfs partition
+        char kernelCRC[CRC_LEN];               // 224-227: CRC32 of kernel partition
+        char imageSequence[4];		       // 228-231: Image sequence number
+        char rootLength[4];                    // 232-235: steal from reserved1 to keep the real root length so we can use in the flash map even after we have change the rootLength to 0 to satisfy devices that check CRC on every boot
+        char headerCRC[CRC_LEN];               // 236-239: CRC32 of header excluding tagVersion
+        char reserved2[16];                    // 240-255: Unused at present
+};
+
+#endif /* __BCM63XX_TAG_H */
diff --git a/trunk/tools/firmware-utils/src/bcmalgo.c b/trunk/tools/firmware-utils/src/bcmalgo.c
new file mode 100644
index 00000000..e7d3b113
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/bcmalgo.c
@@ -0,0 +1,248 @@
+#include <stdlib.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <string.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include "bcmalgo.h"
+
+
+#define UTIL_VERSION "0.1"
+#define ENDIAN_REVERSE_NEEDED
+
+uint32_t reverse_endian32 ( uint32_t data )
+{
+#ifdef ENDIAN_REVERSE_NEEDED
+	return 0 | ( data & 0x000000ff ) << 24
+	       | ( data & 0x0000ff00 ) << 8
+	       | ( data & 0x00ff0000 ) >> 8
+	       | ( data & 0xff000000 ) >> 24;
+#else
+	return data;
+#endif
+}
+
+uint16_t reverse_endian16 ( uint16_t data )
+{
+#ifdef ENDIAN_REVERSE_NEEDED
+	return 0 | ( data & 0x00ff ) << 8
+	       | ( data & 0xff00 ) >> 8;
+#else
+	return data;
+#endif
+}
+
+
+
+uint32_t get_buffer_crc ( char* filebuffer,size_t size )
+{
+
+	long crc=0xffffffffL;
+	long crcxor = 0xffffffffL;
+	long num4 = 0xffffffffL;
+	long num5 = size;
+	long num6 = 0x4c11db7L;
+	long num7 = 0x80000000L;
+	int i;
+	long j;
+	for ( i = 0; i < ( num5 ); i++ )
+	{
+		long num2 = filebuffer[i];
+		for ( j = 0x80L; j != 0L; j = j >> 1 )
+		{
+			long num3 = crc & num7;
+			crc = crc << 1;
+			if ( ( num2 & j ) != 0L )
+			{
+				num3 ^= num7;
+			}
+			if ( num3 != 0L )
+			{
+				crc ^= num6;
+			}
+		}
+	}
+	crc ^= crcxor;
+	crc &= num4;
+
+	uint8_t b1 = ( uint8_t ) ( ( crc & -16777216L ) >> 0x18 );
+	uint8_t b2 = ( uint8_t ) ( ( crc & 0xff0000L ) >> 0x10 );
+	uint8_t b3 = ( uint8_t ) ( ( crc & 0xff00L ) >> 8 );
+	uint8_t b4 = ( uint8_t ) ( crc & 0xffL );
+	int32_t crc_result = ( b1 | b2 << 8| b3 << 16| b4 <<24 );
+	return reverse_endian32 ( crc_result );
+}
+
+//Thnx to Vector for the algo.
+uint32_t get_file_crc ( char* filename )
+{
+	struct stat buf;
+	stat ( filename,&buf );
+	char* filebuffer = malloc ( buf.st_size+10 );
+	FILE* fd = fopen ( filename,"r" );
+	fread ( filebuffer, 1, buf.st_size,fd );
+	fclose ( fd );
+	uint32_t crc = get_buffer_crc ( filebuffer,buf.st_size );
+	free ( filebuffer );
+	return crc;
+}
+
+
+
+uint16_t get_hcs ( ldr_header_t* hd )
+{
+	uint8_t* head = ( uint8_t* ) hd;
+	uint8_t hcs_minor;
+	uint8_t hcs_major;
+	uint16_t n = 0xffff;
+	uint16_t m = 0;
+	int state = 0;
+	int i,j;
+	for ( i = 0; i < 0x54; i++ )
+	{
+		uint16_t m = head[i];
+		m = m << 8;
+		for ( j = 0; j < 8; j++ )
+		{
+			if ( ( ( n ^ m ) & 0x8000 ) == 0 )
+			{
+				state = 0;
+			}
+			else
+			{
+				state = 1;
+			}
+			n = n << 1;
+			if ( state )
+			{
+				n ^= 0x1021;
+			}
+			m = m << 1;
+		}
+		n &= 0xffff;
+	}
+	n ^= 0xffff;
+	hcs_major = ( uint8_t ) ( ( n & 0xff00 ) >> 8 );
+	hcs_minor = ( uint8_t ) ( n & 0xff );
+	uint16_t hcs = hcs_major <<8 | hcs_minor;
+	return hcs;
+}
+
+ldr_header_t* construct_header ( uint32_t magic, uint16_t rev_maj,uint16_t rev_min, uint32_t build_date, uint32_t filelen, uint32_t ldaddress, const char* filename, uint32_t crc_data )
+{
+	ldr_header_t* hd = malloc ( sizeof ( ldr_header_t ) );
+	hd->magic=reverse_endian16 ( magic );
+	hd->control=0; //FixMe: Make use of it once compression is around
+	hd->rev_min = reverse_endian16 ( rev_min );
+	hd->rev_maj = reverse_endian16 ( rev_maj );
+	hd->build_date = reverse_endian32 ( build_date );
+	hd->filelen = reverse_endian32 ( filelen );
+	hd->ldaddress = reverse_endian32 ( ldaddress );
+	printf ( "Creating header for %s...\n", filename );
+	if ( strlen ( filename ) >63 )
+	{
+		printf ( "[!] Filename too long - stripping it to 63 bytes.\n" );
+		strncpy ( ( char* ) &hd->filename, filename, 63 );
+		hd->filename[63]=0x00;
+	}
+	else
+	{
+		strcpy ( ( char* ) &hd->filename, filename );
+	}
+	hd->crc=reverse_endian32 ( crc_data );
+	hd->hcs = reverse_endian16 ( get_hcs ( hd ) );
+	return hd;
+}
+
+static char control_unc[]  = "Uncompressed";
+static char control_lz[]   = "LZRW1/KH";
+static char control_mlzo[] = "mini-LZO";
+static char control_nrv[] = "NRV2D99 [Bootloader?]";
+static char control_nstdlzma[] = "(non-standard) LZMA";
+static char control_unk[] = "Unknown";
+char* get_control_info ( uint16_t control )
+{
+	control = reverse_endian16 ( control );
+	switch ( control )
+	{
+		case 0:
+			return control_unc;
+			break;
+		case 1:
+			return control_lz;
+			break;
+		case 2:
+			return control_mlzo;
+			break;
+		case 3:
+			return control_unc;
+			break;
+		case 4:
+			return control_nrv;
+			break;
+		case 5:
+			return control_nstdlzma;
+			break;
+		case 6:
+			return control_unc;
+			break;
+		case 7:
+			return control_unc;
+			break;
+		default:
+			return control_unk;
+			break;
+	}
+
+}
+
+int dump_header ( ldr_header_t* hd )
+{
+	printf ( "=== Header Information ===\n" );
+	printf ( "Header magic:\t0x%04X\n",reverse_endian16 ( hd->magic ) );
+	printf ( "Control:\t0x%04X (%s)\n",reverse_endian16 ( hd->control ), get_control_info ( hd->control ) );
+	printf ( "Major rev. :\t0x%04X\n",reverse_endian16 ( hd->rev_maj ) );
+	printf ( "Minor rev. :\t0x%04X\n",reverse_endian16 ( hd->rev_min ) );
+	printf ( "File name :\t%s\n", ( char* ) &hd->filename );
+	printf ( "File length:\t%d bytes\n", reverse_endian32 ( hd->filelen ) );
+	printf ( "Build time:\t0x%08X //FixMe: print in human-readable form\n", reverse_endian32 ( hd->build_date ) ); //FixMe:
+	printf ( "HCS:\t\t0x%04X  ",reverse_endian16 ( hd->hcs ) );
+	uint16_t hcs = get_hcs ( hd );
+	int ret=0;
+	if ( hcs ==reverse_endian16 ( hd->hcs ) )
+	{
+		printf ( "(OK!)\n" );
+	}
+	else
+	{
+		printf ( "(ERROR! expected 0x%04X)\n",hcs );
+		ret=1;
+	}
+//printf("HCS:\t0x%02X",reverse_endian32(hd->hcs));
+	printf ( "Load address:\t0x%08X\n", reverse_endian32 ( hd->ldaddress ) ); //FixMe:
+	printf ( "HNW:\t\t0x%04X\n",reverse_endian16 ( hd->her_znaet_chto ) ); //Hell knows what
+	printf ( "CRC:\t\t0x%08X\n",reverse_endian32 ( hd->crc ) );
+	printf ( "=== Binary Header Dump===\n" );
+	int i,j;
+	uint8_t* head = ( uint8_t* ) hd;
+	for ( i=0;i<=sizeof ( ldr_header_t );i++ )
+	{
+		if ( i % 8==0 )
+			printf ( "\n" );
+		printf ( "0x%02x   ",head[i] );
+	}
+	printf ( "\n\n== End Of Header dump ==\n" );
+	return ret;
+}
+
+
+void print_copyright()
+{
+	printf ( "Part of bcm-utils package ver. " UTIL_VERSION " \n" );
+	printf ( "Copyright (C) 2009  Andrew 'Necromant' Andrianov\n"
+	         "This is free software, and you are welcome to redistribute it\n"
+	         "under certain conditions. See COPYING for details\n" );
+}
diff --git a/trunk/tools/firmware-utils/src/bcmalgo.h b/trunk/tools/firmware-utils/src/bcmalgo.h
new file mode 100644
index 00000000..46647cf6
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/bcmalgo.h
@@ -0,0 +1,83 @@
+#ifndef bcmutils_H
+#define bcmutils_H
+
+typedef struct
+{
+	uint16_t magic;
+	uint16_t control;
+	uint16_t rev_maj;
+	uint16_t rev_min;
+	uint32_t build_date;
+	uint32_t filelen;
+	uint32_t ldaddress;
+	char filename[64];
+	uint16_t hcs;
+	uint16_t her_znaet_chto; //v dushe ne ebu
+	uint32_t crc;
+} ldr_header_t;
+
+
+/**
+ * Reverses endianess of a 32bit int, if the ENDIAN_REVERSE_NEEDED defined at compile-time
+ * @param data
+ * @return
+ */
+uint32_t reverse_endian32 ( uint32_t data );
+
+/**
+ * Reverses endianess of a 16bit int, if the ENDIAN_REVERSE_NEEDED defined at compile-time
+ * @param data
+ * @return
+ */
+uint16_t reverse_endian16 ( uint16_t data );
+/**
+ * Calculates the strange crc (used by bcm modems) of the file. Thnx fly out to Vector for the algorithm.
+ * @param filename
+ * @return
+ */
+uint32_t get_file_crc ( char* filename );
+
+/**
+ * Calculates HCS of the header.
+ * @param hd
+ * @return
+ */
+uint16_t get_hcs ( ldr_header_t* hd );
+
+/**
+ * Constructs the header of the image with the information given It also automagically calculates HCS and writes it there.
+ * @param magic - magic device bytes
+ * @param rev_maj - major revision
+ * @param rev_min - minor revision
+ * @param build_date - build date (seconds from EPOCH UTC)
+ * @param filelen - file length in bytes
+ * @param ldaddress - Load adress
+ * @param filename - filename
+ * @param crc_data - the crc of the data
+ * @return
+ */
+ldr_header_t* construct_header ( uint32_t magic, uint16_t rev_maj,uint16_t rev_min, uint32_t build_date, uint32_t filelen, uint32_t ldaddress, const char* filename, uint32_t crc_data );
+
+/**
+ * Dumps header information to stdout.
+ * @param hd
+ */
+int dump_header ( ldr_header_t* hd );
+
+
+/**
+ * Returns a null terminated string describing what the control number meens
+ * DO NOT FREE IT!!!
+ * @param control
+ * @return
+ */
+char* get_control_info ( uint16_t control );
+#endif
+
+/**
+ * Calculates bcmCRC of a data buffer.
+ * @param filebuffer - pointer to buffer
+ * @param size - buffer size
+ * @return
+ */
+uint32_t get_buffer_crc ( char* filebuffer, size_t size );
diff --git a/trunk/tools/firmware-utils/src/buffalo-enc.c b/trunk/tools/firmware-utils/src/buffalo-enc.c
new file mode 100644
index 00000000..13d270b3
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/buffalo-enc.c
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+
+#include "buffalo-lib.h"
+
+#define ERR(fmt, args...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## args ); \
+} while (0)
+
+static char *progname;
+static char *ifname;
+static char *ofname;
+static char *crypt_key = "Buffalo";
+static char *magic = "start";
+static int longstate;
+static unsigned char seed = 'O';
+
+static char *product;
+static char *version;
+static int do_decrypt;
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -d              decrypt instead of encrypt\n"
+"  -i <file>       read input from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -l              use longstate {en,de}cryption method\n"
+"  -k <key>        use <key> for encryption (default: Buffalo)\n"
+"  -m <magic>      set magic to <magic>\n"
+"  -p <product>    set product name to <product>\n"
+"  -v <version>    set version to <version>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static int decrypt_file(void)
+{
+	struct enc_param ep;
+	ssize_t src_len;
+	unsigned char *buf = NULL;
+	int err;
+	int ret = -1;
+
+	src_len = get_file_size(ifname);
+	if (src_len < 0) {
+		ERR("unable to get size of '%s'", ifname);
+		goto out;
+	}
+
+	buf = malloc(src_len);
+	if (buf == NULL) {
+		ERR("no memory for the buffer");
+		goto out;
+	}
+
+	err = read_file_to_buf(ifname, buf, src_len);
+	if (err) {
+		ERR("unable to read from file '%s'", ifname);
+		goto out;
+	}
+
+	memset(&ep, '\0', sizeof(ep));
+	ep.key = (unsigned char *) crypt_key;
+
+	err = decrypt_buf(&ep, buf, src_len);
+	if (err) {
+		ERR("unable to decrypt '%s'", ifname);
+		goto out;
+	}
+
+	printf("Magic\t\t: '%s'\n", ep.magic);
+	printf("Seed\t\t: 0x%02x\n", ep.seed);
+	printf("Product\t\t: '%s'\n", ep.product);
+	printf("Version\t\t: '%s'\n", ep.version);
+	printf("Data len\t: %u\n", ep.datalen);
+	printf("Checksum\t: 0x%08x\n", ep.csum);
+
+	err = write_buf_to_file(ofname, buf, ep.datalen);
+	if (err) {
+		ERR("unable to write to file '%s'", ofname);
+		goto out;
+	}
+
+	ret = 0;
+
+out:
+	free(buf);
+	return ret;
+}
+
+static int encrypt_file(void)
+{
+	struct enc_param ep;
+	ssize_t src_len;
+	unsigned char *buf;
+	uint32_t hdrlen;
+	ssize_t totlen = 0;
+	int err;
+	int ret = -1;
+
+	src_len = get_file_size(ifname);
+	if (src_len < 0) {
+		ERR("unable to get size of '%s'", ifname);
+		goto out;
+	}
+
+	totlen = enc_compute_buf_len(product, version, src_len);
+	hdrlen = enc_compute_header_len(product, version);
+
+	buf = malloc(totlen);
+	if (buf == NULL) {
+		ERR("no memory for the buffer");
+		goto out;
+	}
+
+	err = read_file_to_buf(ifname, &buf[hdrlen], src_len);
+	if (err) {
+		ERR("unable to read from file '%s'", ofname);
+		goto free_buf;
+	}
+
+	memset(&ep, '\0', sizeof(ep));
+	ep.key = (unsigned char *) crypt_key;
+	ep.seed = seed;
+	ep.longstate = longstate;
+	ep.csum = buffalo_csum(src_len, &buf[hdrlen], src_len);
+	ep.datalen = src_len;
+	strcpy((char *) ep.magic, magic);
+	strcpy((char *) ep.product, product);
+	strcpy((char *) ep.version, version);
+
+	err = encrypt_buf(&ep, buf, &buf[hdrlen]);
+	if (err) {
+		ERR("invalid input file");
+		goto free_buf;
+	}
+
+	err = write_buf_to_file(ofname, buf, totlen);
+	if (err) {
+		ERR("unable to write to file '%s'", ofname);
+		goto free_buf;
+	}
+
+	ret = 0;
+
+free_buf:
+ 	free(buf);
+out:
+ 	return ret;
+}
+
+static int check_params(void)
+{
+	int ret = -1;
+
+	if (ifname == NULL) {
+		ERR("no input file specified");
+		goto out;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto out;
+	}
+
+	if (crypt_key == NULL) {
+		ERR("no key specified");
+		goto out;
+	} else if (strlen(crypt_key) > BCRYPT_MAX_KEYLEN) {
+		ERR("key '%s' is too long", crypt_key);
+		goto out;
+	}
+
+	if (strlen(magic) != (ENC_MAGIC_LEN - 1)) {
+		ERR("length of magic must be %d", ENC_MAGIC_LEN - 1);
+		goto out;
+	}
+
+	if (!do_decrypt) {
+		if (product == NULL) {
+			ERR("no product specified");
+			goto out;
+		}
+
+		if (version == NULL) {
+			ERR("no version specified");
+			goto out;
+		}
+
+		if (strlen(product) > (ENC_PRODUCT_LEN - 1)) {
+			ERR("product name '%s' is too long", product);
+			goto out;
+		}
+
+		if (strlen(version) > (ENC_VERSION_LEN - 1)) {
+			ERR("version '%s' is too long", version);
+			goto out;
+		}
+	}
+
+	ret = 0;
+
+out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int res = EXIT_FAILURE;
+	int err;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "adi:m:o:hp:v:k:r:s:");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'd':
+			do_decrypt = 1;
+			break;
+		case 'i':
+			ifname = optarg;
+			break;
+		case 'l':
+			longstate = 1;
+			break;
+		case 'm':
+			magic = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'p':
+			product = optarg;
+			break;
+		case 'v':
+			version = optarg;
+			break;
+		case 'k':
+			crypt_key = optarg;
+			break;
+		case 's':
+			seed = strtoul(optarg, NULL, 16);
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	err = check_params();
+	if (err)
+		goto out;
+
+	if (do_decrypt)
+		err = decrypt_file();
+	else
+		err = encrypt_file();
+
+	if (err)
+		goto out;
+
+	res = EXIT_SUCCESS;
+
+out:
+	return res;
+}
diff --git a/trunk/tools/firmware-utils/src/buffalo-lib.c b/trunk/tools/firmware-utils/src/buffalo-lib.c
new file mode 100644
index 00000000..add3a7e0
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/buffalo-lib.c
@@ -0,0 +1,480 @@
+/*
+ * Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "buffalo-lib.h"
+
+static uint32_t crc32_table[256] =
+{
+	0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
+	0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
+	0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+	0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
+	0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
+	0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+	0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
+	0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
+	0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+	0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
+	0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
+	0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+	0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
+	0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
+	0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+	0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
+	0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
+	0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+	0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
+	0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
+	0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+	0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
+	0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
+	0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+	0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
+	0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
+	0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+	0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
+	0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
+	0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+	0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
+	0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
+	0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+	0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
+	0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
+	0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+	0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
+	0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
+	0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+	0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
+	0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
+	0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+	0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
+	0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
+	0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+	0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
+	0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
+	0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+	0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
+	0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
+	0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+	0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
+	0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
+	0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+	0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
+	0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
+	0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+	0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
+	0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
+	0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+	0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
+	0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
+	0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+	0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+};
+
+int bcrypt_init(struct bcrypt_ctx *ctx, void *key, int keylen,
+		unsigned long state_len)
+{
+	unsigned char *state;
+	unsigned char *p = key;
+	unsigned long i, j;
+	unsigned long k = 0;
+
+	state = malloc(state_len);
+	if (state == NULL)
+		return -1;
+
+	ctx->i = 0;
+	ctx->j = 0;
+	ctx->state = state;
+	ctx->state_len = state_len;
+
+	for (i = 0; i < state_len; i++)
+		state[i] = i;
+
+	for(i = 0, j = 0; i < state_len; i++, j = (j + 1) % keylen) {
+		unsigned char t;
+
+		t = state[i];
+		k = (k + p[j] + t) % state_len;
+		state[i] = state[k];
+		state[k] = t;
+	}
+
+	return 0;
+}
+
+int bcrypt_process(struct bcrypt_ctx *ctx, unsigned char *src,
+		   unsigned char *dst, unsigned long len)
+{
+	unsigned char *state = ctx->state;
+	unsigned long state_len = ctx->state_len;
+	unsigned char i, j;
+	unsigned long k;
+
+	i = ctx->i;
+	j = ctx->j;
+
+	for (k = 0; k < len; k++) {
+		unsigned char t;
+
+		i = (i + 1) % state_len;
+		j = (j + state[i]) % state_len;
+		t = state[j];
+		state[j] = state[i];
+		state[i] = t;
+
+		dst[k] = src[k] ^ state[(state[i] + state[j]) % state_len];
+	}
+
+	ctx->i = i;
+	ctx->j = j;
+
+	return len;
+}
+
+void bcrypt_finish(struct bcrypt_ctx *ctx)
+{
+	if (ctx->state)
+		free(ctx->state);
+}
+
+int bcrypt_buf(unsigned char seed, unsigned char *key, unsigned char *src,
+	       unsigned char *dst, unsigned long len, int longstate)
+{
+	unsigned char bckey[BCRYPT_MAX_KEYLEN + 1];
+	unsigned int keylen;
+	struct bcrypt_ctx ctx;
+	int ret;
+
+	/* setup decryption key */
+	keylen = strlen((char *) key);
+	bckey[0] = seed;
+	memcpy(&bckey[1], key, keylen);
+
+	keylen++;
+
+	ret = bcrypt_init(&ctx, bckey, keylen,
+			  (longstate) ? len : BCRYPT_DEFAULT_STATE_LEN);
+	if (ret)
+		return ret;
+
+	bcrypt_process(&ctx, src, dst, len);
+	bcrypt_finish(&ctx);
+
+	return 0;
+}
+
+uint32_t buffalo_csum(uint32_t csum, void *buf, unsigned long len)
+{
+	char *p = buf;
+
+	while (len--) {
+		int i;
+
+		csum ^= *p++;
+		for (i = 0; i < 8; i++)
+			csum = (csum >> 1) ^ ((csum & 1) ? 0xedb88320ul : 0);
+	}
+
+	return csum;
+}
+
+uint32_t buffalo_crc(void *buf, unsigned long len)
+{
+	unsigned char *p = buf;
+	unsigned long t = len;
+	uint32_t crc = 0;
+
+	while (len--)
+		crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *p++) & 0xFF];
+
+	while (t) {
+		crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ t) & 0xFF];
+		t >>= 8;
+	}
+
+	return ~crc;
+}
+
+unsigned long enc_compute_header_len(char *product, char *version)
+{
+	return ENC_MAGIC_LEN + 1 + strlen(product) + 1 +
+	       strlen(version) + 1 + 3 * sizeof(uint32_t);
+}
+
+unsigned long enc_compute_buf_len(char *product, char *version,
+				  unsigned long datalen)
+{
+	unsigned long ret;
+
+	ret = enc_compute_header_len(product, version);
+	ret += datalen + sizeof(uint32_t);
+	ret += (4 - ret % 4);
+
+	return ret;
+}
+
+static void put_be32(void *data, uint32_t val)
+{
+	unsigned char *p = data;
+
+	p[0] = (val >> 24) & 0xff;
+	p[1] = (val >> 16) & 0xff;
+	p[2] = (val >> 8) & 0xff;
+	p[3] = val & 0xff;
+}
+
+static uint32_t get_be32(void *data)
+{
+	unsigned char *p = data;
+
+	return (((uint32_t)p[0]) << 24) |
+	       (((uint32_t)p[1]) << 16) |
+	       (((uint32_t)p[2]) << 8) |
+	       ((uint32_t)p[3]);
+}
+
+static int check_magic(void *magic)
+{
+	if (!memcmp("start", magic, ENC_MAGIC_LEN))
+		return 0;
+
+	if (!memcmp("asar1", magic, ENC_MAGIC_LEN))
+		return 0;
+
+	return -1;
+}
+
+int encrypt_buf(struct enc_param *ep, unsigned char *hdr,
+		unsigned char *data)
+{
+	unsigned char *p;
+	uint32_t len;
+	int err;
+	int ret = -1;
+	unsigned char s;
+
+	p = (unsigned char *) hdr;
+
+	/* setup magic */
+	len = strlen((char *) ep->magic) + 1;
+	memcpy(p, ep->magic, len);
+	p += len;
+
+	/* setup seed */
+	*p++ = ep->seed;
+
+	/* put product len */
+	len = strlen((char *) ep->product) + 1;
+	put_be32(p, len);
+	p += sizeof(uint32_t);
+
+	/* copy and crypt product name */
+	memcpy(p, ep->product, len);
+	err = bcrypt_buf(ep->seed, ep->key, p, p, len, ep->longstate);
+	if (err)
+		goto out;
+	s = *p;
+	p += len;
+
+	/* put version length */
+	len = strlen((char *) ep->version) + 1;
+	put_be32(p, len);
+	p += sizeof(uint32_t);
+
+	/* copy and crypt version */
+	memcpy(p, ep->version, len);
+	err = bcrypt_buf(s, ep->key, p, p, len, ep->longstate);
+	if (err)
+		goto out;
+	s = *p;
+	p += len;
+
+	/* put data length */
+	put_be32(p, ep->datalen);
+
+	/* encrypt data */
+	err = bcrypt_buf(s, ep->key, data, data, ep->datalen, ep->longstate);
+	if (err)
+		goto out;
+
+	/* put checksum */
+	put_be32(&data[ep->datalen], ep->csum);
+
+	ret = 0;
+
+out:
+	return ret;
+}
+
+int decrypt_buf(struct enc_param *ep, unsigned char *data,
+		unsigned long datalen)
+{
+	unsigned char *p;
+	uint32_t prod_len;
+	uint32_t ver_len;
+	uint32_t len;
+	uint32_t csum;
+	ssize_t remain;
+	int err;
+	int ret = -1;
+
+#define CHECKLEN(_l) do {		\
+	len = (_l);			\
+	if (remain < len) {		\
+		goto out;		\
+	}				\
+} while (0)
+
+#define INCP() do {			\
+	p += len;			\
+	remain -= len;			\
+} while (0)
+
+	remain = datalen;
+	p = data;
+
+	CHECKLEN(ENC_MAGIC_LEN);
+	err = check_magic(p);
+	if (err)
+		goto out;
+	memcpy(ep->magic, p, ENC_MAGIC_LEN);
+	INCP();
+
+	CHECKLEN(1);
+	ep->seed = *p;
+	INCP();
+
+	CHECKLEN(sizeof(uint32_t));
+	prod_len = get_be32(p);
+	if (prod_len > ENC_PRODUCT_LEN)
+		goto out;
+	INCP();
+
+	CHECKLEN(prod_len);
+	memcpy(ep->product, p, prod_len);
+	INCP();
+
+	CHECKLEN(sizeof(uint32_t));
+	ver_len = get_be32(p);
+	if (ver_len > ENC_VERSION_LEN)
+		goto out;
+	INCP();
+
+	CHECKLEN(ver_len);
+	memcpy(ep->version, p, ver_len);
+	INCP();
+
+	CHECKLEN(sizeof(uint32_t));
+	ep->datalen = get_be32(p);
+	INCP();
+
+	/* decrypt data */
+	CHECKLEN(ep->datalen);
+	err = bcrypt_buf(ep->version[0], ep->key, p, data, ep->datalen,
+			 ep->longstate);
+	if (err)
+		goto out;
+	INCP();
+
+	CHECKLEN(sizeof(uint32_t));
+	ep->csum = get_be32(p);
+	INCP();
+
+	csum = buffalo_csum(ep->datalen, data, ep->datalen);
+	if (csum != ep->csum)
+		goto out;
+
+	/* decrypt product name */
+	err = bcrypt_buf(ep->product[0], ep->key, ep->version, ep->version,
+			 ver_len, ep->longstate);
+	if (err)
+		goto out;
+
+	/* decrypt version */
+	err = bcrypt_buf(ep->seed, ep->key, ep->product, ep->product, prod_len,
+			 ep->longstate);
+	if (err)
+		goto out;
+
+	ret = 0;
+out:
+	return ret;
+
+#undef CHECKLEN
+#undef INCP
+}
+
+ssize_t get_file_size(char *name)
+{
+	struct stat st;
+	int err;
+
+	err = stat(name, &st);
+	if (err)
+		return -1;
+
+	return st.st_size;
+}
+
+int read_file_to_buf(char *name, void *buf, ssize_t buflen)
+{
+	FILE *f;
+	size_t done;
+	int ret = -1;
+
+	f = fopen(name, "r");
+	if (f == NULL)
+		goto out;
+
+	errno = 0;
+	done = fread(buf, buflen, 1, f);
+	if (done != 1)
+		goto close;
+
+	ret = 0;
+
+close:
+	fclose(f);
+out:
+	return ret;
+}
+
+int write_buf_to_file(char *name, void *buf, ssize_t buflen)
+{
+	FILE *f;
+	size_t done;
+	int ret = -1;
+
+	f = fopen(name, "w");
+	if (f == NULL)
+		goto out;
+
+	errno = 0;
+	done = fwrite(buf, buflen, 1, f);
+	if (done != 1)
+		goto close;
+
+	ret = 0;
+
+close:
+	fflush(f);
+	fclose(f);
+	if (ret)
+		unlink(name);
+out:
+	return ret;
+}
diff --git a/trunk/tools/firmware-utils/src/buffalo-lib.h b/trunk/tools/firmware-utils/src/buffalo-lib.h
new file mode 100644
index 00000000..ba8a5081
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/buffalo-lib.h
@@ -0,0 +1,121 @@
+/*
+ *  Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#ifndef _BUFFALO_LIB_H
+#define _BUFFALO_LIB_H
+
+#include <stdint.h>
+
+#define ARRAY_SIZE(_a)	(sizeof((_a)) / sizeof((_a)[0]))
+#define BIT(_x)		(1UL << (_x))
+
+#define TAG_BRAND_LEN		32
+#define TAG_PRODUCT_LEN		32
+#define TAG_VERSION_LEN		8
+#define TAG_REGION_LEN		2
+#define TAG_LANGUAGE_LEN	8
+#define TAG_PLATFORM_LEN	8
+#define TAG_HWVER_LEN		4
+#define TAG_HWVER_VAL_LEN	4
+
+struct buffalo_tag {
+	unsigned char	product[TAG_PRODUCT_LEN];
+	unsigned char	brand[TAG_BRAND_LEN];
+	unsigned char	ver_major[TAG_VERSION_LEN];
+	unsigned char	ver_minor[TAG_VERSION_LEN];
+	unsigned char	region_code[2];
+	uint32_t	region_mask;
+	unsigned char	unknown0[2];
+	unsigned char	language[TAG_LANGUAGE_LEN];
+	unsigned char	platform[TAG_PLATFORM_LEN];
+	unsigned char	hwv[TAG_HWVER_LEN];
+	unsigned char	hwv_val[TAG_HWVER_VAL_LEN];
+	uint8_t		unknown1[24];
+
+	uint32_t	len;
+	uint32_t	crc;
+	uint32_t	base1;
+	uint32_t	base2;
+	uint32_t	data_len;
+	uint8_t		flag;
+	uint8_t		unknown2[3];
+} __attribute ((packed));
+
+struct buffalo_tag2 {
+	unsigned char	product[TAG_PRODUCT_LEN];
+	unsigned char	brand[TAG_BRAND_LEN];
+	unsigned char	ver_major[TAG_VERSION_LEN];
+	unsigned char	ver_minor[TAG_VERSION_LEN];
+	unsigned char	region_code[2];
+	uint32_t	region_mask;
+	unsigned char	unknown0[2];
+	unsigned char	language[TAG_LANGUAGE_LEN];
+	unsigned char	platform[TAG_PLATFORM_LEN];
+	unsigned char	hwv[TAG_HWVER_LEN];
+	unsigned char	hwv_val[TAG_HWVER_VAL_LEN];
+	uint8_t		unknown1[24];
+
+	uint32_t	total_len;
+	uint32_t	crc;
+	uint32_t	len1;
+	uint32_t	len2;
+	uint8_t		flag;
+	uint8_t		unknown2[3];
+} __attribute ((packed));
+
+#define ENC_PRODUCT_LEN		32
+#define ENC_VERSION_LEN		8
+#define ENC_MAGIC_LEN		6
+
+unsigned long enc_compute_header_len(char *product, char *version);
+unsigned long enc_compute_buf_len(char *product, char *version,
+				  unsigned long datalen);
+
+struct enc_param {
+	unsigned char *key;
+	unsigned char magic[ENC_MAGIC_LEN];
+	unsigned char product[ENC_PRODUCT_LEN];
+	unsigned char version[ENC_VERSION_LEN];
+	unsigned char seed;
+	int longstate;
+	unsigned datalen;
+	uint32_t csum;
+};
+
+int encrypt_buf(struct enc_param *ep, unsigned char *hdr,
+	        unsigned char *data);
+int decrypt_buf(struct enc_param *ep, unsigned char *data,
+		unsigned long datalen);
+
+#define BCRYPT_DEFAULT_STATE_LEN	256
+#define BCRYPT_MAX_KEYLEN		254
+
+struct bcrypt_ctx {
+	unsigned long i;
+	unsigned long j;
+	unsigned char *state;
+	unsigned long state_len;
+};
+
+int bcrypt_init(struct bcrypt_ctx *ctx, void *key, int keylen,
+		unsigned long state_len);
+int bcrypt_process(struct bcrypt_ctx *ctx, unsigned char *src,
+		   unsigned char *dst, unsigned long len);
+void bcrypt_finish(struct bcrypt_ctx *ctx);
+int bcrypt_buf(unsigned char seed, unsigned char *key, unsigned char *src,
+	       unsigned char *dst, unsigned long len, int longstate);
+
+uint32_t buffalo_csum(uint32_t csum, void *buf, unsigned long len);
+uint32_t buffalo_crc(void *buf, unsigned long len);
+
+ssize_t get_file_size(char *name);
+int read_file_to_buf(char *name, void *buf, ssize_t buflen);
+int write_buf_to_file(char *name, void *buf, ssize_t buflen);
+
+#endif /* _BUFFALO_LIB_H */
diff --git a/trunk/tools/firmware-utils/src/buffalo-tag.c b/trunk/tools/firmware-utils/src/buffalo-tag.c
new file mode 100644
index 00000000..b5db72ef
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/buffalo-tag.c
@@ -0,0 +1,374 @@
+/*
+ *  Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <netinet/in.h>
+
+#include "buffalo-lib.h"
+
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+static char *region_table[] = {
+	"JP", "US", "EU", "AP", "TW", "KR"
+};
+
+#define MAX_INPUT_FILES	2
+
+static char *progname;
+static char *ifname[MAX_INPUT_FILES];
+static ssize_t fsize[MAX_INPUT_FILES];
+static int num_files;
+static char *ofname;
+static char *product;
+static char *brand;
+static char *language;
+static char *hwver;
+static char *platform;
+static int flag;
+static char *major;
+static char *minor = "1.01";
+static int skipcrc;
+static uint32_t base1;
+static uint32_t base2;
+static char *region_code;
+static uint32_t region_mask;
+static int num_regions;
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -a <platform>   set platform to <platform>\n"
+"  -b <brand>      set brand to <brand>\n"
+"  -c <base1>\n"
+"  -d <base2>\n"
+"  -f <flag>       set flag to <flag>\n"
+"  -i <file>       read input from the file <file>\n"
+"  -l <language>   set language to <language>\n"
+"  -m <version>    set minor version to <version>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -p <product>    set product to <product>\n"
+"  -r <region>     set image region to <region>\n"
+"		   valid regions: JP, US, EU, AP, TW, KR, M_\n"
+"  -s              skip CRC calculation\n"
+"  -v <version>    set major version to <version>\n"
+"  -w <version>    set harwdware version to <version>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static int check_params(void)
+{
+
+#define CHECKSTR(_var, _name, _len)	do {		\
+	if ((_var) == NULL) {				\
+		ERR("no %s specified", (_name));	\
+		return -1;				\
+	}						\
+	if ((_len) > 0 &&				\
+	    strlen((_var)) > ((_len) - 1)) {		\
+		ERR("%s is too long", (_name));		\
+		return -1;				\
+	}						\
+} while (0)
+
+	if (num_files == 0)
+		ERR("no input files specified");
+
+	CHECKSTR(ofname, "output file", 0);
+	CHECKSTR(brand, "brand", TAG_BRAND_LEN);
+	CHECKSTR(product, "product", TAG_PRODUCT_LEN);
+	CHECKSTR(platform, "platform", TAG_PLATFORM_LEN);
+	CHECKSTR(major, "major version", TAG_VERSION_LEN);
+	CHECKSTR(minor, "minor version", TAG_VERSION_LEN);
+	CHECKSTR(language, "language", TAG_LANGUAGE_LEN);
+
+	if (hwver)
+		CHECKSTR(hwver, "hardware version", 2);
+
+	if (num_regions == 0) {
+		ERR("no region code specified");
+		return -1;
+	}
+
+	return 0;
+
+#undef CHECKSTR
+}
+
+static int process_region(char *reg)
+{
+	int i;
+
+	if (strlen(reg) != 2) {
+		ERR("invalid region code '%s'", reg);
+		return -1;
+	}
+
+	if (strcmp(reg, "M_") == 0) {
+		region_code = reg;
+		region_mask |= ~0;
+		num_regions = 32;
+		return 0;
+	}
+
+	for (i = 0; i < ARRAY_SIZE(region_table); i++)
+		if (strcmp(reg, region_table[i]) == 0) {
+			region_code = reg;
+			region_mask |= 1 << i;
+			num_regions++;
+			return 0;
+		}
+
+	ERR("unknown region code '%s'", reg);
+	return -1;
+}
+
+static int process_ifname(char *name)
+{
+	if (num_files >= ARRAY_SIZE(ifname)) {
+		ERR("too many input files specified");
+		return -1;
+	}
+
+	ifname[num_files++] = name;
+	return 0;
+}
+
+static void fixup_tag(unsigned char *buf, ssize_t buflen)
+{
+	struct buffalo_tag *tag = (struct buffalo_tag *) buf;
+
+	memset(tag, '\0', sizeof(*tag));
+
+	memcpy(tag->brand, brand, strlen(brand));
+	memcpy(tag->product, product, strlen(product));
+	memcpy(tag->platform, platform, strlen(platform));
+	memcpy(tag->ver_major, major, strlen(major));
+	memcpy(tag->ver_minor, minor, strlen(minor));
+	memcpy(tag->language, language, strlen(language));
+
+	if (num_regions > 1) {
+		tag->region_code[0] = 'M';
+		tag->region_code[1] = '_';
+		tag->region_mask = htonl(region_mask);
+	} else {
+		memcpy(tag->region_code, region_code, 2);
+	}
+
+	tag->len = htonl(buflen);
+	tag->data_len = htonl(fsize[0]);
+	tag->base1 = htonl(base1);
+	tag->base2 = htonl(base2);
+	tag->flag = flag;
+
+	if (hwver) {
+		memcpy(tag->hwv, "hwv", 3);
+		memcpy(tag->hwv_val, hwver, strlen(hwver));
+	}
+
+	if (!skipcrc)
+		tag->crc = htonl(buffalo_crc(buf, buflen));
+}
+
+static void fixup_tag2(unsigned char *buf, ssize_t buflen)
+{
+	struct buffalo_tag2 *tag = (struct buffalo_tag2 *) buf;
+
+	memset(tag, '\0', sizeof(*tag));
+
+	memcpy(tag->brand, brand, strlen(brand));
+	memcpy(tag->product, product, strlen(product));
+	memcpy(tag->platform, platform, strlen(platform));
+	memcpy(tag->ver_major, major, strlen(major));
+	memcpy(tag->ver_minor, minor, strlen(minor));
+	memcpy(tag->language, language, strlen(language));
+
+	if (num_regions > 1) {
+		tag->region_code[0] = 'M';
+		tag->region_code[1] = '_';
+		tag->region_mask = htonl(region_mask);
+	} else {
+		memcpy(tag->region_code, region_code, 2);
+	}
+
+	tag->total_len = htonl(buflen);
+	tag->len1 = htonl(fsize[0]);
+	tag->len2 = htonl(fsize[1]);
+	tag->flag = flag;
+
+	if (hwver) {
+		memcpy(tag->hwv, "hwv", 3);
+		memcpy(tag->hwv_val, hwver, strlen(hwver));
+	}
+
+	if (!skipcrc)
+		tag->crc = htonl(buffalo_crc(buf, buflen));
+}
+
+static int tag_file(void)
+{
+	unsigned char *buf;
+	ssize_t offset;
+	ssize_t hdrlen;
+	ssize_t buflen;
+	int err;
+	int ret = -1;
+	int i;
+
+	if (num_files == 1)
+		hdrlen = sizeof(struct buffalo_tag);
+	else
+		hdrlen = sizeof(struct buffalo_tag2);
+
+	buflen = hdrlen;
+
+	for (i = 0; i < num_files; i++) {
+		fsize[i] = get_file_size(ifname[i]);
+		if (fsize[i] < 0) {
+			ERR("unable to get size of '%s'", ifname[i]);
+			goto out;
+		}
+		buflen += fsize[i];
+	}
+
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto out;
+	}
+
+	offset = hdrlen;
+	for (i = 0; i < num_files; i++) {
+		err = read_file_to_buf(ifname[i], buf + offset, fsize[i]);
+		if (err) {
+			ERR("unable to read from file '%s'", ifname[i]);
+			goto free_buf;
+		}
+
+		offset += fsize[i];
+	}
+
+	if (num_files == 1)
+		fixup_tag(buf, buflen);
+	else
+		fixup_tag2(buf, buflen);
+
+	err = write_buf_to_file(ofname, buf, buflen);
+	if (err) {
+		ERR("unable to write to file '%s'", ofname);
+		goto free_buf;
+	}
+
+	ret = 0;
+
+free_buf:
+	free(buf);
+out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int res = EXIT_FAILURE;
+	int err;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "a:b:c:d:f:hi:l:m:o:p:r:sv:w:");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'a':
+			platform = optarg;
+			break;
+		case 'b':
+			brand = optarg;
+			break;
+		case 'c':
+			base1 = strtoul(optarg, NULL, 16);
+			break;
+		case 'd':
+			base2 = strtoul(optarg, NULL, 16);
+			break;
+		case 'f':
+			flag = strtoul(optarg, NULL, 2);
+			break;
+		case 'i':
+			err = process_ifname(optarg);
+			if (err)
+				goto out;
+			break;
+		case 'l':
+			language = optarg;
+			break;
+		case 'm':
+			minor = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'p':
+			product = optarg;
+			break;
+		case 'r':
+			err = process_region(optarg);
+			if (err)
+				goto out;
+			break;
+		case 's':
+			skipcrc = 1;
+			break;
+		case 'v':
+			major = optarg;
+			break;
+		case 'w':
+			hwver = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	err = check_params();
+	if (err)
+		goto out;
+
+	err = tag_file();
+	if (err)
+		goto out;
+
+	res = EXIT_SUCCESS;
+
+out:
+	return res;
+}
diff --git a/trunk/tools/firmware-utils/src/buffalo-tftp.c b/trunk/tools/firmware-utils/src/buffalo-tftp.c
new file mode 100644
index 00000000..087f9955
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/buffalo-tftp.c
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+
+#include "buffalo-lib.h"
+
+#define ERR(fmt, args...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## args ); \
+} while (0)
+
+static char *progname;
+static char *ifname;
+static char *ofname;
+static int do_decrypt;
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -d              decrypt instead of encrypt\n"
+"  -i <file>       read input from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static const unsigned char *crypt_key1 = (unsigned char *)
+	"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+static const unsigned char *crypt_key2 = (unsigned char *)
+	"XYZ0123hijklmnopqABCDEFGHrstuvabcdefgwxyzIJKLMSTUVW456789NOPQR";
+
+static void crypt_header(unsigned char *buf, ssize_t len,
+			 const unsigned char *key1, const unsigned char *key2)
+{
+	ssize_t i;
+
+	for (i = 0; i < len; i++) {
+		unsigned int j;
+
+		for (j = 0; key1[j]; j++)
+			if (buf[i] == key1[j]) {
+				buf[i] = key2[j];
+				break;
+			}
+	}
+}
+
+static int crypt_file(void)
+{
+	unsigned char *buf = NULL;
+	ssize_t src_len;
+	int err;
+	int ret = -1;
+
+	src_len = get_file_size(ifname);
+	if (src_len < 0) {
+		ERR("unable to get size of '%s'", ifname);
+		goto out;
+	}
+
+	buf = malloc(src_len);
+	if (buf == NULL) {
+		ERR("no memory for the buffer");
+		goto out;
+	}
+
+	err = read_file_to_buf(ifname, buf, src_len);
+	if (err) {
+		ERR("unable to read from file '%s'", ifname);
+		goto out;
+	}
+
+	if (do_decrypt)
+		crypt_header(buf, 512, crypt_key2, crypt_key1);
+	else
+		crypt_header(buf, 512, crypt_key1, crypt_key2);
+
+	err = write_buf_to_file(ofname, buf, src_len);
+	if (err) {
+		ERR("unable to write to file '%s'", ofname);
+		goto out;
+	}
+
+	ret = 0;
+
+out:
+	free(buf);
+	return ret;
+}
+
+static int check_params(void)
+{
+	int ret = -1;
+
+	if (ifname == NULL) {
+		ERR("no input file specified");
+		goto out;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto out;
+	}
+
+	ret = 0;
+
+out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int res = EXIT_FAILURE;
+	int err;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "di:o:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'd':
+			do_decrypt = 1;
+			break;
+		case 'i':
+			ifname = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	err = check_params();
+	if (err)
+		goto out;
+
+	err = crypt_file();
+	if (err)
+		goto out;
+
+	res = EXIT_SUCCESS;
+
+out:
+	return res;
+}
diff --git a/trunk/tools/firmware-utils/src/csysimg.h b/trunk/tools/firmware-utils/src/csysimg.h
new file mode 100644
index 00000000..65ab062f
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/csysimg.h
@@ -0,0 +1,79 @@
+/*
+ *
+ *  Copyright (C) 2007,2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program was based on the code found in various Linux
+ *  source tarballs released by Edimax for it's devices.
+ *  Original author: David Hsu <davidhsu@realtek.com.tw>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ */
+
+#define SIG_LEN		4
+
+#define ADM_CODE_ADDR	0x80500000
+#define ADM_WEBP_ADDR	0x10000
+#define ADM_WEBP_SIZE	0x10000
+#define ADM_BOOT_SIZE	0x8000
+#define ADM_CONF_SIZE	0x8000
+#define ADM_BOOT_SIG	"\x00\x60\x1A\x40"
+
+
+/*
+ * Generic signatures
+ */
+#define SIG_CSYS	"CSYS"
+#define SIG_CONF	"HS\x00\x00"
+#define SIG_BOOT_RTL	"\x00\x00\x40\x21"
+
+/*
+ * Web page signatures
+ */
+#define SIG_BR6104K	"WB4K"
+#define SIG_BR6104KP	"WBKP"
+#define SIG_BR6104Wg	"WBGW"
+#define SIG_BR6104IPC	"WBIP"
+#define SIG_BR6114WG	SIG_BR6104IPC
+#define SIG_BR6524K	"2-K-"
+#define SIG_BR6524KP	"2-KP"	/* FIXME: valid? */
+#define SIG_BR6524N	"WNRA"
+#define SIG_BR6524WG	"2-WG"	/* FIXME: valid? */
+#define SIG_BR6524WP	"2-WP"	/* FIXME: valid? */
+#define SIG_BR6541K	"4--K"
+#define SIG_BR6541KP	"4-KP"	/* FIXME: valid? */
+#define SIG_BR6541WP	"4-WP"	/* FIXME: valid? */
+#define SIG_C54BSR4	SIG_BR6104IPC
+#define SIG_EW7207APg	"EWAS"
+#define SIG_PS1205UWg	"4000"
+#define SIG_PS3205U	"5010"
+#define SIG_PS3205UWg	"5011"
+#define SIG_RALINK	"RNRA"
+#define SIG_5GXI	"5GXI"	/* fake signature */
+
+#define SIG_H2BR4	SIG_BR6524K
+#define SIG_H2WR54G	SIG_BR6524WG
+
+#define SIG_XRT401D	SIG_BR6104K
+#define SIG_XRT402D	SIG_BR6524K
+
+/*
+ * CSYS image file header
+ */
+struct csys_header {
+	unsigned char sig[SIG_LEN];
+	uint32_t addr;
+	uint32_t size;
+};
diff --git a/trunk/tools/firmware-utils/src/cyg_crc.h b/trunk/tools/firmware-utils/src/cyg_crc.h
new file mode 100644
index 00000000..7b598034
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/cyg_crc.h
@@ -0,0 +1,109 @@
+//==========================================================================
+//
+//      crc.h
+//
+//      Interface for the CRC algorithms.
+//
+//==========================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 2002 Andrew Lunn
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//==========================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s):    Andrew Lunn
+// Contributors: Andrew Lunn
+// Date:         2002-08-06
+// Purpose:
+// Description:
+//
+// This code is part of eCos (tm).
+//
+//####DESCRIPTIONEND####
+//
+//==========================================================================
+
+#ifndef _SERVICES_CRC_CRC_H_
+#define _SERVICES_CRC_CRC_H_
+
+#if 0
+#include <cyg/infra/cyg_type.h>
+#else
+#include <stdint.h>
+typedef uint32_t cyg_uint32;
+typedef uint16_t cyg_uint16;
+#endif
+
+#ifndef __externC
+# ifdef __cplusplus
+#  define __externC extern "C"
+# else
+#  define __externC extern
+# endif
+#endif
+
+// Compute a CRC, using the POSIX 1003 definition
+
+__externC cyg_uint32
+cyg_posix_crc32(unsigned char *s, int len);
+
+// Gary S. Brown's 32 bit CRC
+
+__externC cyg_uint32
+cyg_crc32(unsigned char *s, int len);
+
+// Gary S. Brown's 32 bit CRC, but accumulate the result from a
+// previous CRC calculation
+
+__externC cyg_uint32
+cyg_crc32_accumulate(cyg_uint32 crc, unsigned char *s, int len);
+
+// Ethernet FCS Algorithm
+
+__externC cyg_uint32
+cyg_ether_crc32(unsigned char *s, int len);
+
+// Ethernet FCS algorithm, but accumulate the result from a previous
+// CRC calculation.
+
+__externC cyg_uint32
+cyg_ether_crc32_accumulate(cyg_uint32 crc, unsigned char *s, int len);
+
+// 16 bit CRC with polynomial x^16+x^12+x^5+1
+
+__externC cyg_uint16
+cyg_crc16(unsigned char *s, int len);
+
+#endif // _SERVICES_CRC_CRC_H_
+
+
+
diff --git a/trunk/tools/firmware-utils/src/cyg_crc16.c b/trunk/tools/firmware-utils/src/cyg_crc16.c
new file mode 100644
index 00000000..8b373528
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/cyg_crc16.c
@@ -0,0 +1,110 @@
+//==========================================================================
+//
+//      crc16.c
+//
+//      16 bit CRC with polynomial x^16+x^12+x^5+1
+//
+//==========================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2002 Gary Thomas
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//==========================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s):    gthomas
+// Contributors: gthomas,asl
+// Date:         2001-01-31
+// Purpose:      
+// Description:  
+//              
+// This code is part of eCos (tm).
+//
+//####DESCRIPTIONEND####
+//
+//==========================================================================
+
+#if 0
+#include <cyg/crc/crc.h>
+#else
+#include "cyg_crc.h"
+#endif
+
+// Table of CRC constants - implements x^16+x^12+x^5+1
+static const cyg_uint16 crc16_tab[] = {
+    0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 
+    0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, 
+    0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 
+    0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, 
+    0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, 
+    0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, 
+    0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, 
+    0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, 
+    0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, 
+    0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, 
+    0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, 
+    0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, 
+    0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, 
+    0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, 
+    0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, 
+    0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, 
+    0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, 
+    0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, 
+    0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, 
+    0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, 
+    0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, 
+    0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 
+    0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, 
+    0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, 
+    0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, 
+    0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, 
+    0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, 
+    0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, 
+    0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, 
+    0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, 
+    0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, 
+    0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, 
+};
+
+cyg_uint16
+cyg_crc16(unsigned char *buf, int len)
+{
+    int i;
+    cyg_uint16 cksum;
+
+    cksum = 0;
+    for (i = 0;  i < len;  i++) {
+        cksum = crc16_tab[((cksum>>8) ^ *buf++) & 0xFF] ^ (cksum << 8);
+    }
+    return cksum;
+}
+
diff --git a/trunk/tools/firmware-utils/src/cyg_crc32.c b/trunk/tools/firmware-utils/src/cyg_crc32.c
new file mode 100644
index 00000000..9462598a
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/cyg_crc32.c
@@ -0,0 +1,172 @@
+//==========================================================================
+//
+//      crc32.c
+//
+//      Gary S. Brown's 32 bit CRC
+//
+//==========================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2002 Gary Thomas
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//==========================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s):    gthomas
+// Contributors: gthomas,asl
+// Date:         2001-01-31
+// Purpose:      
+// Description:  
+//              
+// This code is part of eCos (tm).
+//
+//####DESCRIPTIONEND####
+//
+//==========================================================================
+
+#if 0
+#include <cyg/crc/crc.h>
+#else
+#include "cyg_crc.h"
+#endif
+
+  /* ====================================================================== */
+  /*  COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or       */
+  /*  code or tables extracted from it, as desired without restriction.     */
+  /*                                                                        */
+  /*  First, the polynomial itself and its table of feedback terms.  The    */
+  /*  polynomial is                                                         */
+  /*  X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0   */
+  /*                                                                        */
+  /* ====================================================================== */
+
+static const cyg_uint32 crc32_tab[] = {
+      0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+      0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+      0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+      0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+      0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+      0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+      0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+      0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+      0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+      0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+      0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+      0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+      0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+      0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+      0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+      0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+      0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+      0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+      0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+      0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+      0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+      0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+      0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+      0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+      0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+      0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+      0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+      0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+      0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+      0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+      0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+      0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+      0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+      0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+      0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+      0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+      0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+      0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+      0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+      0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+      0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+      0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+      0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+      0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+      0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+      0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+      0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+      0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+      0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+      0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+      0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+      0x2d02ef8dL
+   };
+
+/* This is the standard Gary S. Brown's 32 bit CRC algorithm, but
+   accumulate the CRC into the result of a previous CRC. */
+cyg_uint32 
+cyg_crc32_accumulate(cyg_uint32 crc32val, unsigned char *s, int len)
+{
+  int i;
+
+  for (i = 0;  i < len;  i++) {
+    crc32val = crc32_tab[(crc32val ^ s[i]) & 0xff] ^ (crc32val >> 8);
+  }
+  return crc32val;
+}
+
+/* This is the standard Gary S. Brown's 32 bit CRC algorithm */
+cyg_uint32
+cyg_crc32(unsigned char *s, int len)
+{
+  return (cyg_crc32_accumulate(0,s,len));
+}
+
+/* Return a 32-bit CRC of the contents of the buffer accumulating the
+   result from a previous CRC calculation. This uses the Ethernet FCS
+   algorithm.*/
+cyg_uint32
+cyg_ether_crc32_accumulate(cyg_uint32 crc32val, unsigned char *s, int len)
+{
+  int i;
+
+  if (s == 0) return 0L;
+  
+  crc32val = crc32val ^ 0xffffffff;
+  for (i = 0;  i < len;  i++) {
+      crc32val = crc32_tab[(crc32val ^ s[i]) & 0xff] ^ (crc32val >> 8);
+  }
+  return crc32val ^ 0xffffffff;
+}
+
+/* Return a 32-bit CRC of the contents of the buffer, using the
+   Ethernet FCS algorithm. */
+cyg_uint32
+cyg_ether_crc32(unsigned char *s, int len)
+{
+  return cyg_ether_crc32_accumulate(0,s,len);
+}
+
+
diff --git a/trunk/tools/firmware-utils/src/dgfirmware.c b/trunk/tools/firmware-utils/src/dgfirmware.c
new file mode 100644
index 00000000..5ff3b696
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/dgfirmware.c
@@ -0,0 +1,376 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+
+#define IMG_SIZE     0x3e0000
+
+#define KERNEL_START 0x020000
+#define KERNEL_SIZE  0x0b0000
+
+#define ROOTFS_START 0x0d0000
+#define ROOTFS_SIZE  0x30ffb2
+
+char* app_name;
+
+
+
+
+void print_usage(void)
+{
+  fprintf(stderr, "usage: dgfirmware [<opts>] <img>\n");
+  fprintf(stderr, "  <img>               firmware image filename\n");
+  fprintf(stderr, "  <opts>  -h          print this message\n");
+  fprintf(stderr, "          -f          fix the checksum\n");
+  fprintf(stderr, "          -x  <file>  extract the rootfs file to <file>\n");
+  fprintf(stderr, "          -xk <file>  extract the kernel to <file>\n");
+  fprintf(stderr, "          -m  <file>  merge in rootfs fil\e from <file>\n");
+  fprintf(stderr, "          -k  <file>  merge in kernel from <file>\n");
+  fprintf(stderr, "          -w  <file>  write back the modified firmware\n");
+}
+
+
+unsigned char* read_img(const char *fname)
+{
+  FILE *fp;
+  int size;
+  unsigned char *img;
+
+  fp = fopen(fname, "rb");
+  if (fp == NULL) {
+    perror(app_name);
+    exit(-1);
+  }
+
+  fseek(fp, 0, SEEK_END);
+  size = ftell(fp);
+  
+  if (size != IMG_SIZE) {
+    fprintf(stderr, "%s: image file has wrong size\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+
+  rewind(fp);
+
+  img = malloc(IMG_SIZE);
+  if (img == NULL) {
+    perror(app_name);
+    fclose(fp);
+    exit(-1);
+  }
+
+  if (fread(img, 1, IMG_SIZE, fp) != IMG_SIZE) {
+    fprintf(stderr, "%s: can't read image file\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+
+  fclose(fp);
+  return img;
+}
+
+
+void write_img(unsigned char* img, const char *fname)
+{
+  FILE *fp;
+
+  fp = fopen(fname, "wb");
+  if (fp == NULL) {
+    perror(app_name);
+    exit(-1);
+  }
+
+  if (fwrite(img, 1, IMG_SIZE, fp) != IMG_SIZE) {
+    fprintf(stderr, "%s: can't write image file\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+}
+
+
+void write_rootfs(unsigned char* img, const char *fname)
+{
+  FILE *fp;
+
+  fp = fopen(fname, "wb");
+  if (fp == NULL) {
+    perror(app_name);
+    exit(-1);
+  }
+  
+  if (fwrite(img+ROOTFS_START, 1, ROOTFS_SIZE, fp) != ROOTFS_SIZE) {
+    fprintf(stderr, "%s: can't write image file\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+}
+
+
+void write_kernel(unsigned char* img, const char *fname)
+{
+  FILE *fp;
+
+  fp = fopen(fname, "wb");
+  if (fp == NULL) {
+    perror(app_name);
+    exit(-1);
+  }
+  
+  if (fwrite(img+KERNEL_START, 1, KERNEL_SIZE, fp) != KERNEL_SIZE) {
+    fprintf(stderr, "%s: can't write kernel file\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+}
+
+
+unsigned char* read_rootfs(unsigned char* img, const char *fname)
+{
+  FILE *fp;
+  int size;
+  int i;
+
+  for (i=ROOTFS_START; i<ROOTFS_START+ROOTFS_SIZE; i++)
+    img[i] = 0xff;
+
+  fp = fopen(fname, "rb");
+  if (fp == NULL) {
+    perror(app_name);
+    exit(-1);
+  }
+
+  fseek(fp, 0, SEEK_END);
+  size = ftell(fp);
+  
+  if (size > ROOTFS_SIZE) {
+    fprintf(stderr, "%s: rootfs image file is too big\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+
+  rewind(fp);
+
+  if (fread(img+ROOTFS_START, 1, size, fp) != size) {
+    fprintf(stderr, "%s: can't read rootfs image file\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+
+  fclose(fp);
+  return img;
+}
+
+
+unsigned char* read_kernel(unsigned char* img, const char *fname)
+{
+  FILE *fp;
+  int size;
+  int i;
+
+  for (i=KERNEL_START; i<KERNEL_START+KERNEL_SIZE; i++)
+    img[i] = 0xff;
+
+  fp = fopen(fname, "rb");
+  if (fp == NULL) {
+    perror(app_name);
+    exit(-1);
+  }
+
+  fseek(fp, 0, SEEK_END);
+  size = ftell(fp);
+  
+  if (size > KERNEL_SIZE) {
+    fprintf(stderr, "%s: kernel binary file is too big\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+
+  rewind(fp);
+
+  if (fread(img+KERNEL_START, 1, size, fp) != size) {
+    fprintf(stderr, "%s: can't read kernel file\n", app_name);
+    fclose(fp);
+    exit(-1);
+  }
+
+  fclose(fp);
+  return img;
+}
+
+
+int get_checksum(unsigned char* img)
+{
+  short unsigned s;
+
+  s = img[0x3dfffc] + (img[0x3dfffd]<<8);
+
+  return s;
+}
+
+
+void set_checksum(unsigned char*img, unsigned short sum)
+{
+  img[0x3dfffc] = sum & 0xff;
+  img[0x3dfffd] = (sum>>8) & 0xff;
+}
+
+
+int compute_checksum(unsigned char* img)
+{
+  int i;
+  short s=0;
+
+  for (i=0; i<0x3dfffc; i++)
+    s += img[i];
+
+  return s;
+}
+
+
+int main(int argc, char* argv[])
+{
+  char *img_fname     = NULL;
+  char *rootfs_fname  = NULL;
+  char *kernel_fname  = NULL;
+  char *new_img_fname = NULL;
+
+  int do_fix_checksum = 0;
+  int do_write        = 0;
+  int do_write_rootfs = 0;
+  int do_read_rootfs  = 0;
+  int do_write_kernel = 0;
+  int do_read_kernel  = 0;
+
+  int i;
+  unsigned char *img;
+  unsigned short img_checksum;
+  unsigned short real_checksum;
+
+  app_name = argv[0];
+
+  for (i=1; i<argc; i++) {
+    if (!strcmp(argv[i], "-h")) {
+      print_usage();
+      return 0;
+    }
+    else if (!strcmp(argv[i], "-f")) {
+      do_fix_checksum = 1;
+    }
+    else if (!strcmp(argv[i], "-x")) {
+      if (i+1 >= argc) {
+	fprintf(stderr, "%s: missing argument\n", app_name);
+	return -1;
+      }
+      do_write_rootfs = 1;
+      rootfs_fname = argv[i+1];
+      i++;
+    }
+    else if (!strcmp(argv[i], "-xk")) {
+      if (i+1 >= argc) {
+	fprintf(stderr, "%s: missing argument\n", app_name);
+	return -1;
+      }
+      do_write_kernel = 1;
+      kernel_fname = argv[i+1];
+      i++;
+    }
+    else if (!strcmp(argv[i], "-m")) {
+      if (i+1 >= argc) {
+	fprintf(stderr, "%s: missing argument\n", app_name);
+	return -1;
+      }
+      do_read_rootfs = 1;
+      rootfs_fname = argv[i+1];
+      i++;
+    }
+    else if (!strcmp(argv[i], "-k")) {
+      if (i+1 >= argc) {
+	fprintf(stderr, "%s: missing argument\n", app_name);
+	return -1;
+      }
+      do_read_kernel = 1;
+      kernel_fname = argv[i+1];
+      i++;
+    }
+    else if (!strcmp(argv[i], "-w")) {
+      if (i+1 >= argc) {
+	fprintf(stderr, "%s: missing argument\n", app_name);
+	return -1;
+      }
+      do_write = 1;
+      new_img_fname = argv[i+1];
+      i++;
+    }
+    else if (img_fname != 0) {
+      fprintf(stderr, "%s: too many arguments\n", app_name);
+      return -1;
+    }
+    else {
+      img_fname = argv[i];
+    }
+  }
+
+  if (img_fname == NULL) {
+    fprintf(stderr, "%s: missing argument\n", app_name);
+    return -1;
+  }
+
+  if ((do_read_rootfs && do_write_rootfs) ||
+      (do_read_kernel && do_write_kernel)) {
+    fprintf(stderr, "%s: conflictuous options\n", app_name);
+    return -1;
+  }
+
+  printf ("** Read firmware file\n");
+  img = read_img(img_fname);
+
+  printf ("Firmware product: %s\n", img+0x3dffbd);
+  printf ("Firmware version: 1.%02d.%02d\n", (img[0x3dffeb] & 0x7f), img[0x3dffec]);
+
+  if (do_write_rootfs) {
+    printf ("** Write rootfs file\n");
+    write_rootfs(img, rootfs_fname);
+  }
+
+  if (do_write_kernel) {
+    printf ("** Write kernel file\n");
+    write_kernel(img, kernel_fname);
+  }
+
+  if (do_read_rootfs) {
+    printf ("** Read rootfs file\n");
+    read_rootfs(img, rootfs_fname);
+    do_fix_checksum = 1;
+  }
+
+  if (do_read_kernel) {
+    printf ("** Read kernel file\n");
+    read_kernel(img, kernel_fname);
+    do_fix_checksum = 1;
+  }
+
+  img_checksum = get_checksum(img);
+  real_checksum = compute_checksum(img);
+  
+  printf ("image checksum = %04x\n", img_checksum);
+  printf ("real checksum  = %04x\n", real_checksum);
+
+  if (do_fix_checksum) {
+    if (img_checksum != real_checksum) {
+      printf ("** Bad Checksum, fix it\n");
+      set_checksum(img, real_checksum);
+    }
+    else {
+      printf ("** Checksum is correct, good\n");
+    }
+  }
+
+  if (do_write) {
+    printf ("** Write image file\n");
+    write_img(img, new_img_fname);
+  }
+
+  free(img);
+  return 0;
+}
+
diff --git a/trunk/tools/firmware-utils/src/dgn3500sum.c b/trunk/tools/firmware-utils/src/dgn3500sum.c
new file mode 100644
index 00000000..00a0c5f8
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/dgn3500sum.c
@@ -0,0 +1,167 @@
+/* **************************************************************************
+
+   This program creates a modified 16bit checksum used for the Netgear
+   DGN3500 series routers. The difference between this and a standard
+   checksum is that every 0x100 bytes added 0x100 have to be subtracted
+   from the sum.
+
+   (C) 2013 Marco Antonio Mauro <marcus90 at gmail.com>
+
+   Based on previous unattributed work.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+unsigned char PidDataWW[70] =
+{
+    0x73, 0x45, 0x72, 0x43, 0x6F, 0x4D, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x59, 0x50, 0x35, 0x37, 0x32,
+    0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x37,
+    0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73,
+    0x45, 0x72, 0x43, 0x6F, 0x4D, 0x6D,
+} ;
+
+unsigned char PidDataDE[70] =
+{
+    0x73, 0x45, 0x72, 0x43, 0x6F, 0x4D, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x59, 0x50, 0x35, 0x37, 0x32,
+    0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x37,
+    0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73,
+    0x45, 0x72, 0x43, 0x6F, 0x4D, 0x6D,
+} ;
+
+unsigned char PidDataNA[70] =
+{
+    0x73, 0x45, 0x72, 0x43, 0x6F, 0x4D, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x59, 0x50, 0x35, 0x37, 0x32,
+    0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x37,
+    0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73,
+    0x45, 0x72, 0x43, 0x6F, 0x4D, 0x6D,
+} ;
+
+/* *******************************************************************
+   Reads the file into memory and returns pointer to the buffer. */
+static char *readfile(char *filename, int *size)
+{
+	FILE		*fp;
+	char		*buffer;
+	struct stat	info;
+
+	if (stat(filename,&info)!=0)
+		return NULL;
+
+	if ((fp=fopen(filename,"r"))==NULL)
+		return NULL;
+
+	buffer=NULL;
+	for (;;)
+	{
+		if ((buffer=(char *)malloc(info.st_size+1))==NULL)
+			break;
+
+		if (fread(buffer,1,info.st_size,fp)!=info.st_size)
+		{
+			free(buffer);
+			buffer=NULL;
+			break;
+		}
+
+		buffer[info.st_size]='\0';
+		if(size) *size = info.st_size;
+
+		break;
+	}
+
+	(void)fclose(fp);
+
+	return buffer;
+}
+
+
+/* ******************************************************************* */
+int main(int argc, char** argv)
+{
+  unsigned long start, i;
+  char *endptr, *buffer, *p;
+  int count;  // size of file in bytes
+  unsigned short sum, sum1;
+  char sumbuf[9];
+
+  if(argc < 3) {
+    printf("ERROR: Argument missing!\n\nUsage %s filename starting offset in hex [PID code]\n\n", argv[0]);
+    return 1;
+  }
+
+
+  FILE *fp = fopen(argv[1], "a");
+  if(!fp) {
+    printf("ERROR: File not writeable!\n");
+    return 1;
+  }
+  if(argc = 4)
+  {
+    printf("%s: PID type: %s\n", argv[0], argv[3]);
+    if(strcmp(argv[3], "DE")==0)
+      fwrite(PidDataDE, sizeof(PidDataDE), sizeof(char), fp);  /* write DE pid */
+    else if(strcmp(argv[3], "NA")==0)
+      fwrite(PidDataNA, sizeof(PidDataNA), sizeof(char), fp);  /* write NA pid */
+    else /* if(strcmp(argv[3], "WW")) */
+      fwrite(PidDataWW, sizeof(PidDataWW), sizeof(char), fp);  /* write WW pid */
+  }
+  else
+    fwrite(PidDataWW, sizeof(PidDataWW), sizeof(char), fp);  /* write WW pid if unspecified */
+
+  fclose(fp);
+
+  /* Read the file to calculate the checksums */
+  buffer = readfile(argv[1], &count);
+  if(!buffer) {
+    printf("ERROR: File %s not found!\n", argv[1]);
+    return 1;
+  }
+
+  p = buffer;
+  for(i = 0; i < count; i++)
+  {
+	sum += p[i];
+  }
+
+  start = strtol(argv[2], &endptr, 16);
+  p = buffer+start;
+  sum1 = 0;
+  for(i = 0; i < count - start; i++)
+  {
+	sum1 += p[i];
+  }
+
+  sprintf(sumbuf,"%04X%04X",sum1,sum);
+  /* Append the 2 checksums to end of file */
+  fp = fopen(argv[1], "a");
+  if(!fp) {
+    printf("ERROR: File not writeable!\n");
+    return 1;
+  }
+  fwrite(sumbuf, 8, sizeof(char), fp);
+  fclose(fp);
+  free(buffer);
+  return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/encode_crc.c b/trunk/tools/firmware-utils/src/encode_crc.c
new file mode 100644
index 00000000..647fb92e
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/encode_crc.c
@@ -0,0 +1,151 @@
+/* **************************************************************************
+
+   This program creates a CRC checksum and encodes the file that is named
+   in the command line.
+   
+   Compile with:  gcc encode_crc.c -Wall -o encode_crc
+
+   Author:     Michael Margraf  (michael.margraf@freecom.com)
+   Copyright:  Freecom Technology GmbH, Berlin, 2004
+               www.freecom.com
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+// *******************************************************************
+// CCITT polynom G(x)=x^16+x^12+x^5+1
+#define POLYNOM  0x1021
+
+// CRC algorithm with MSB first
+int make_crc16(int crc, char new)
+{
+  int i;
+  crc = crc ^ (((int)new) << 8);
+  
+  for(i=0; i<8; i++) {  // work on 8 bits in "new"
+    crc <<= 1;          // MSBs first
+    if(crc & 0x10000)  crc ^= POLYNOM;
+  }
+  return crc & 0xFFFF;
+}
+
+// *******************************************************************
+// Reads the file "filename" into memory and returns pointer to the buffer.
+static char *readfile(char *filename, int *size)
+{
+	FILE		*fp;
+	char		*buffer;
+	struct stat	info;
+	
+	if (stat(filename,&info)!=0)
+		return NULL;
+
+	if ((fp=fopen(filename,"r"))==NULL)
+		return NULL;
+
+	buffer=NULL;
+	for (;;)
+	{
+		if ((buffer=(char *)malloc(info.st_size+1))==NULL)
+			break;
+
+		if (fread(buffer,1,info.st_size,fp)!=info.st_size)
+		{
+			free(buffer);
+			buffer=NULL;
+			break;
+		}
+
+		buffer[info.st_size]='\0';
+		if(size) *size = info.st_size;
+
+		break;
+	}
+
+	(void)fclose(fp);
+
+	return buffer;
+}
+
+
+// *******************************************************************
+int main(int argc, char** argv)
+{
+  if(argc < 3) {
+    printf("ERROR: Argument missing!\n\n");
+    return 1;
+  }
+
+  int count;  // size of file in bytes
+  char *p, *master = readfile(argv[1], &count);
+  if(!master) {
+    printf("ERROR: File not found!\n");
+    return 1;
+  }
+
+  int crc = 0xFFFF, z;
+
+  p = master;
+  for(z=0; z<count; z++)
+    crc = make_crc16(crc, *(p++));  // calculate CRC
+  short crc16 = (short)crc;
+
+	/*
+  if(argc > 2) {   // with flag for device recognition ?
+    p = argv[2];
+    for(z=strlen(p); z>0; z--) {
+      crc ^= (int)(*p);
+      *(p++) = (char)crc;  // encode device flag
+    }
+  }
+	*/
+
+  p = master;
+  for(z=0; z<count; z++) {
+    crc ^= (int)(*p);
+    *(p++) = (char)crc;  // encode file
+  }
+
+
+  // write encoded file...
+  FILE *fp = fopen(argv[2], "w");
+  if(!fp) {
+    printf("ERROR: File not writeable!\n");
+    return 1;
+  }
+
+  if(argc > 3) {  // add flag for device recognition ?
+    fwrite(argv[3], strlen(argv[3]), sizeof(char), fp);
+  }
+  else {
+    // Device is an FSG, so byte swap (IXP4xx is big endian)
+    crc16 = ((crc16 >> 8) & 0xFF) | ((crc16 << 8) & 0xFF00);
+  }
+
+  fwrite(&crc16, 1, sizeof(short), fp);     // first write CRC
+
+  fwrite(master, count, sizeof(char), fp);  // write content
+  fclose(fp);
+
+  free(master);
+  return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/fix-u-media-header.c b/trunk/tools/firmware-utils/src/fix-u-media-header.c
new file mode 100644
index 00000000..21f184e6
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/fix-u-media-header.c
@@ -0,0 +1,354 @@
+/*
+ *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "cyg_crc.h"
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#define IH_MAGIC	0x27051956	/* Image Magic Number		*/
+#define IH_NMLEN	32		/* Image Name Length		*/
+
+#define UM_MAGIC	0x55525F46
+#define UM_HEADER_LEN	12
+
+/*
+ * all data in network byte order (aka natural aka bigendian)
+ */
+struct u_media_header {
+	uint32_t	ih_magic;	/* Image Header Magic Number	*/
+	uint32_t	ih_hcrc;	/* Image Header CRC Checksum	*/
+	uint32_t	ih_time;	/* Image Creation Timestamp	*/
+	uint32_t	ih_size;	/* Image Data Size		*/
+	uint32_t	ih_load;	/* Data	 Load  Address		*/
+	uint32_t	ih_ep;		/* Entry Point Address		*/
+	uint32_t	ih_dcrc;	/* Image Data CRC Checksum	*/
+	uint8_t		ih_os;		/* Operating System		*/
+	uint8_t		ih_arch;	/* CPU architecture		*/
+	uint8_t		ih_type;	/* Image Type			*/
+	uint8_t		ih_comp;	/* Compression Type		*/
+	uint8_t		ih_name[IH_NMLEN - UM_HEADER_LEN]; /* Image Name		*/
+
+	uint32_t	ih_UMedia_magic;	/* U-Media magic number	*/
+	uint32_t	ih_UMedia_boardID;	/* U-Media board ID	*/
+	uint8_t		ih_UMedia_imageType;	/* U-Media image type */
+	uint8_t		ih_UMedia_LoadDefault;	/* U-Media load to factory default setting */
+	uint8_t		ih_UMedia_temp1;	/* U-Media didn't use this tag */
+	uint8_t		ih_UMedia_temp2;	/* U-Media didn't use this tag */
+} __attribute__ ((packed));
+
+struct if_info {
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+};
+
+static char *progname;
+static char *ofname;
+static struct if_info if_info;
+static int factory_defaults;
+static uint32_t board_id;
+static uint8_t image_type;
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt " (%s)\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define DBG(fmt, ...) do { \
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+static void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board_id>   set board ID to <board_id>\n"
+"  -i <file>       read input from the file <file>\n"
+"  -F              load factory defaults\n"
+"  -o <file>       write output to the file <file>\n"
+"  -T <type>       set image type to <type>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static int str2u32(char *arg, uint32_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	*val = t;
+	return 0;
+}
+
+static int str2u8(char *arg, uint8_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	if (t > 255)
+		return -1;
+
+	*val = t;
+	return 0;
+}
+
+static int get_file_stat(struct if_info *fdata)
+{
+	struct stat st;
+	int res;
+
+	if (fdata->file_name == NULL)
+		return 0;
+
+	res = stat(fdata->file_name, &st);
+	if (res){
+		ERRS("stat failed on %s", fdata->file_name);
+		return res;
+	}
+
+	fdata->file_size = st.st_size;
+	return 0;
+}
+
+static int read_to_buf(struct if_info *fdata, char *buf)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(fdata->file_name, "r");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for reading", fdata->file_name);
+		goto out;
+	}
+
+	errno = 0;
+	fread(buf, fdata->file_size, 1, f);
+	if (errno != 0) {
+		ERRS("unable to read from file \"%s\"", fdata->file_name);
+		goto out_close;
+	}
+
+	ret = EXIT_SUCCESS;
+
+out_close:
+	fclose(f);
+out:
+	return ret;
+}
+
+static int check_options(void)
+{
+	int ret;
+
+	if (ofname == NULL) {
+		ERR("no %s specified", "output file");
+		return -1;
+	}
+
+	if (if_info.file_name == NULL) {
+		ERR("no %s specified", "input file");
+		return -1;
+	}
+
+	ret = get_file_stat(&if_info);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int write_fw(char *data, int len)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(ofname, "w");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	errno = 0;
+	fwrite(data, len, 1, f);
+	if (errno) {
+		ERRS("unable to write output file");
+		goto out_flush;
+	}
+
+	ret = EXIT_SUCCESS;
+
+out_flush:
+	fflush(f);
+	fclose(f);
+	if (ret != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+out:
+	return ret;
+}
+
+static int fix_header(void)
+{
+	int buflen;
+	char *buf;
+	uint32_t crc, crc_orig;
+	struct u_media_header *hdr;
+	int ret = EXIT_FAILURE;
+
+	buflen = if_info.file_size;
+	if (buflen < sizeof(*hdr)) {
+		ERR("invalid input file\n");
+		return ret;
+	}
+
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto out;
+	}
+
+	ret = read_to_buf(&if_info, buf);
+	if (ret)
+		goto out_free_buf;
+
+	hdr = (struct u_media_header *) buf;
+	if (ntohl(hdr->ih_magic) != IH_MAGIC) {
+		ERR("invalid input file, bad magic\n");
+		goto out_free_buf;
+	}
+
+	/* verify header CRC */
+	crc_orig = ntohl(hdr->ih_hcrc);
+	hdr->ih_hcrc = 0;
+	crc = cyg_ether_crc32((unsigned char *)hdr, sizeof(*hdr));
+	if (crc != crc_orig) {
+		ERR("invalid input file, bad header CRC\n");
+		goto out_free_buf;
+	}
+
+	hdr->ih_name[IH_NMLEN - UM_HEADER_LEN - 1] = '\0';
+
+	/* set U-Media specific fields */
+	hdr->ih_UMedia_magic = htonl(UM_MAGIC);
+	hdr->ih_UMedia_boardID = htonl(board_id);
+	hdr->ih_UMedia_imageType = image_type;
+	hdr->ih_UMedia_LoadDefault = (factory_defaults) ? 1 : 0;
+
+	/* update header CRC */
+	crc = cyg_ether_crc32((unsigned char *)hdr, sizeof(*hdr));
+	hdr->ih_hcrc = htonl(crc);
+
+	ret = write_fw(buf, buflen);
+	if (ret)
+		goto out_free_buf;
+
+	DBG("U-Media header fixed in \"%s\"", ofname);
+
+	ret = EXIT_SUCCESS;
+
+out_free_buf:
+	free(buf);
+out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int ret = EXIT_FAILURE;
+
+	progname = basename(argv[0]);
+
+	while (1) {
+		int c;
+
+		c = getopt(argc, argv, "B:Fi:o:T:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'B':
+			if (str2u32(optarg, &board_id)) {
+				ERR("%s is invalid '%s'",
+				    "board ID", optarg);
+				goto out;
+			}
+			break;
+		case 'T':
+			if (str2u8(optarg, &image_type)) {
+				ERR("%s is invalid '%s'",
+				    "image type", optarg);
+				goto out;
+			}
+			break;
+		case 'F':
+			factory_defaults = 1;
+			break;
+		case 'i':
+			if_info.file_name = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	ret = check_options();
+	if (ret)
+		goto out;
+
+	ret = fix_header();
+
+out:
+	return ret;
+}
diff --git a/trunk/tools/firmware-utils/src/fw.h b/trunk/tools/firmware-utils/src/fw.h
new file mode 100644
index 00000000..e37859c5
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/fw.h
@@ -0,0 +1,70 @@
+/*
+ *  * Copyright (C) 2007 Ubiquiti Networks, Inc.
+ *   *
+ *    * This program is free software; you can redistribute it and/or
+ *     * modify it under the terms of the GNU General Public License as
+ *      * published by the Free Software Foundation; either version 2 of the
+ *       * License, or (at your option) any later version.
+ *        *
+ *         * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *                 */
+
+#ifndef FW_INCLUDED
+#define FW_INCLUDED
+
+#include <sys/types.h>
+
+#define MAGIC_HEADER	"OPEN"
+#define MAGIC_PART	"PART"
+#define MAGIC_END	"END."
+
+#define MAGIC_LENGTH	4
+
+typedef struct header {
+	char magic[MAGIC_LENGTH];
+	char version[256];
+	u_int32_t crc;
+	u_int32_t pad;
+} __attribute__ ((packed)) header_t;
+
+typedef struct part {
+	char magic[MAGIC_LENGTH];
+	char name[16];
+	char pad[12];
+	u_int32_t memaddr;
+	u_int32_t index;
+	u_int32_t baseaddr;
+	u_int32_t entryaddr;
+	u_int32_t data_size;
+	u_int32_t part_size;
+} __attribute__ ((packed)) part_t;
+
+typedef struct part_crc {
+	u_int32_t crc;
+	u_int32_t pad;
+} __attribute__ ((packed)) part_crc_t;
+
+typedef struct signature {
+	char magic[MAGIC_LENGTH];
+	u_int32_t crc;
+	u_int32_t pad;
+} __attribute__ ((packed)) signature_t;
+
+#define VERSION "1.2"
+
+#define INFO(...) fprintf(stdout, __VA_ARGS__)
+#define ERROR(...) fprintf(stderr, "ERROR: "__VA_ARGS__)
+#define WARN(...) fprintf(stderr, "WARN: "__VA_ARGS__)
+#define DEBUG(...) do {\
+        if (debug) \
+                fprintf(stdout, "DEBUG: "__VA_ARGS__); \
+} while (0);
+
+#endif
diff --git a/trunk/tools/firmware-utils/src/hcsmakeimage.c b/trunk/tools/firmware-utils/src/hcsmakeimage.c
new file mode 100644
index 00000000..603ea882
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/hcsmakeimage.c
@@ -0,0 +1,181 @@
+#include <stdlib.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <string.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <libgen.h>
+#include "bcmalgo.h"
+
+
+int flag_print_version;
+int flag_print_help;
+int flag_compress;
+
+uint16_t sa2100_magic  = 0x2100;
+uint16_t sa3349_magic  = 0x3349;
+uint32_t default_date = 0x00000000; //A long time ago in a galaxy far far away....
+uint32_t default_load_address = 0x80010000; //The default load_address for the firmware image
+
+static void print_help ( const char* ename )
+{
+	printf ( "Firmware image packer and calculator for broadcom-based modems.\n" );
+	printf ( "Part of bcm-utils package.\n" );
+	printf ( "(c) 2009 Necromant (http://necromant.ath.cx). Thanks to Luke-jr for his initial work.\n" );
+	printf ( "usage: %s [options]\n", ename );
+	printf ( "Valid options are:\n" );
+	printf ( "--magic_bytes=value \t- specify magic bytes at the beginning of the image. default - 3349\n" );
+	printf ( "\t\t\t these can be sa2100 (for DPC2100 modem),\n\t\t\t sa3349 (haxorware guys use this one for some reason),\n\t\t\t or a custom hex value e.g. 0xFFFF\n" );
+	printf ( "--compress \t\t - Make use of LZMA (weird!) compression (Doesn't work yet).\n" );
+	printf ( "--rev_maj=value\t\t - major revision number. default 0\n" );
+	printf ( "--rev_min=value\t\t - minor revision number default 0\n" );
+	printf ( "--filename=value\t - use this filename in header instead of default (input filename)\n" );
+	printf ( "--ldaddress=value\t - hex value of the target load address. defaults to 0x80010000\n" );
+	printf ( "--input_file=value\t - What file are we packing?\n" );
+	printf ( "--output_file=value\t - What file shall we write? (default: image.bin)\n" );
+#ifdef _HAX0RSTYLE
+	printf ( "--credz\t - Give some credz!\n" );
+#endif
+	printf ( "\n" );
+}
+
+
+int main ( int argc, char** argv )
+{
+	if ( argc<2 )
+	{
+		print_help ( argv[0] );
+	}
+
+	static struct option long_options[] =
+	{
+		{"magic_bytes",          required_argument,   0,        'm'},
+		{"rev_maj",        required_argument,   0,      'j'},
+		{"rev_min",       required_argument,   0,     'n'},
+		{"ldaddress",       required_argument,   0,     'l'},
+		{"filename",       required_argument,   0,     'f'},
+		{"input_file",       required_argument,   0,     'i'},
+		{"output_file",       required_argument,   0,     'o'},
+		{"compress",     no_argument,       &flag_compress,    'c'},
+		{"version",     no_argument,       &flag_print_version,    'v'},
+		{"help",        no_argument,       &flag_print_help,    'h'},
+		{0, 0, 0, 0}
+	};
+	int option_index = 0;
+	int opt_result=0;
+	char* filename=NULL;
+	char* input=NULL;
+	char* magic=NULL;
+	char* major=NULL;
+	char* minor=NULL;
+	char* ldaddr=NULL;
+	char* output=NULL;
+
+	while ( opt_result>=0 )
+	{
+		opt_result = getopt_long ( argc, argv, "m:j:n:f:i:o:vh", long_options, &option_index );
+		switch ( opt_result )
+		{
+			case 0:
+				printf ( "o!\n" );
+				break;
+			case 'h':
+				print_help ( argv[0] );
+				break;
+			case 'l':
+				ldaddr=optarg;
+				break;
+			case 'f':
+				filename=optarg;
+				break;
+			case 'i':
+				input=optarg;
+				break;
+			case 'o':
+				output=optarg;
+				break;
+			case 'm':
+				magic=optarg;
+				break;
+			case 'j':
+				major=optarg;
+				break;
+			case 'n':
+				minor=optarg;
+				break;
+		}
+	}
+	if ( input==NULL )
+	{
+		printf ( "Telepaths are still on holidays. I guess you should tell me what file should I process.\n\n" );
+		exit ( 1 );
+	}
+	if ( access ( input,R_OK ) !=0 )
+	{
+		printf ( "I cannot access the file %s. Is it there? Am I allowed?\n\n", input );
+		exit ( 1 );
+	}
+	uint32_t magicnum=sa2100_magic;
+
+	if ( magic )
+	{
+		if ( strcmp ( magic,"sa2100" ) ==0 ) magicnum=sa2100_magic; else
+				if ( strcmp ( magic,"sa3349" ) ==0 ) magicnum=sa3349_magic; else
+			{
+				sscanf ( magic, "0x%04X", &magicnum );
+			}
+	}
+	unsigned int majrev=0;
+	if ( major )
+	{
+		sscanf ( major, "%d", &majrev );
+	}
+	unsigned int minrev=0;
+	if ( minor )
+	{
+		sscanf ( minor, "%d", &minrev );
+	}
+	uint32_t ldaddress = default_load_address;
+	if ( ldaddr )
+	{
+		sscanf ( ldaddr, "0x%08X", &ldaddress );
+	}
+	char* dupe = strdup(input);
+	char* fname = basename ( dupe );
+	if ( filename )
+	{
+		fname = filename;
+	}
+	struct timeval tm;
+	gettimeofday ( &tm,NULL );
+	struct stat buf;
+	stat ( input,&buf );
+	ldr_header_t* head = construct_header ( magicnum, (uint16_t) majrev, (uint16_t) minrev, ( uint32_t ) tm.tv_sec, ( uint32_t ) buf.st_size, ldaddress, fname, get_file_crc ( input ) );
+	free(dupe);
+	//uint32_t magic, uint16_t rev_maj,uint16_t rev_min, uint32_t build_date, uint32_t filelen, uint32_t ldaddress, const char* filename, uint32_t crc
+	//FILE* fd = fopen ("/tftpboot/haxorware11rev32.bin","r");
+	//fread(head,sizeof(ldr_header_t),1,fd);
+	char* filebuffer = malloc ( buf.st_size+10 );
+	FILE* fd = fopen ( input,"r" );
+	fread ( filebuffer, 1, buf.st_size,fd );
+	if (!output)
+		{
+		output = malloc(strlen(input+5));
+		strcpy(output,input);
+		strcat(output,".bin");
+		}
+	dump_header ( head );
+	FILE* fd_out = fopen ( output,"w+" );
+	if (!fd_out)
+		{
+		fprintf(stderr, "Failed to open output file: %s\n", output);
+		exit(1);
+		}
+	fwrite ( head,1,sizeof ( ldr_header_t ),fd_out );
+	fwrite ( filebuffer,1,buf.st_size,fd_out );
+	printf("Firmware image %s is ready\n", output);
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/imagetag.c b/trunk/tools/firmware-utils/src/imagetag.c
new file mode 100644
index 00000000..166ce9a0
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/imagetag.c
@@ -0,0 +1,524 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2008 Axel Gembe <ago@bastart.eu.org>
+ * Copyright (C) 2009-2010 Daniel Dickinson <openwrt@cshore.neomailbox.net>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+
+#include "bcm_tag.h"
+#include "imagetag_cmdline.h"
+
+#define DEADCODE			0xDEADC0DE
+
+/* Kernel header */
+struct kernelhdr {
+	uint32_t		loadaddr;	/* Kernel load address */
+	uint32_t		entry;		/* Kernel entry point address */
+	uint32_t		lzmalen;	/* Compressed length of the LZMA data that follows */
+};
+
+static char pirellitab[NUM_PIRELLI][BOARDID_LEN] = PIRELLI_BOARDS;
+
+static uint32_t crc32tab[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
+};
+
+void int2tag(char *tag, uint32_t value) {
+  uint32_t network = htonl(value);
+  memcpy(tag, (char *)(&network), 4);
+}
+
+uint32_t crc32(uint32_t crc, uint8_t *data, size_t len)
+{
+	while (len--)
+		crc = (crc >> 8) ^ crc32tab[(crc ^ *data++) & 0xFF];
+
+	return crc;
+}
+
+uint32_t compute_crc32(uint32_t crc, FILE *binfile, size_t compute_start, size_t compute_len)
+{
+	uint8_t readbuf[1024];
+	size_t read;
+
+	fseek(binfile, compute_start, SEEK_SET);
+
+	/* read block of 1024 bytes */
+	while (binfile && !feof(binfile) && !ferror(binfile) && (compute_len >= sizeof(readbuf))) {
+		read = fread(readbuf, sizeof(uint8_t), sizeof(readbuf), binfile);
+		crc = crc32(crc, readbuf, read);
+		compute_len = compute_len - read;
+	}
+
+	/* Less than 1024 bytes remains, read compute_len bytes */
+	if (binfile && !feof(binfile) && !ferror(binfile) && (compute_len > 0)) {
+		read = fread(readbuf, sizeof(uint8_t), compute_len, binfile);
+		crc = crc32(crc, readbuf, read);
+	}
+
+	return crc;
+}
+
+size_t getlen(FILE *fp)
+{
+	size_t retval, curpos;
+
+	if (!fp)
+		return 0;
+
+	curpos = ftell(fp);
+	fseek(fp, 0, SEEK_END);
+	retval = ftell(fp);
+	fseek(fp, curpos, SEEK_SET);
+
+	return retval;
+}
+
+int tagfile(const char *kernel, const char *rootfs, const char *bin, \
+			const struct gengetopt_args_info *args, \
+			uint32_t flash_start, uint32_t image_offset, \
+			uint32_t block_size, uint32_t load_address, uint32_t entry)
+{
+	struct bcm_tag tag;
+	struct kernelhdr khdr;
+	FILE *kernelfile = NULL, *rootfsfile = NULL, *binfile = NULL, *cfefile = NULL;
+	size_t cfeoff, cfelen, kerneloff, kernellen, rootfsoff, rootfslen, \
+	  read, imagelen, rootfsoffpadlen = 0, kernelfslen, kerneloffpadlen = 0, oldrootfslen;
+	uint8_t readbuf[1024];
+	uint32_t imagecrc = IMAGETAG_CRC_START;
+	uint32_t kernelcrc = IMAGETAG_CRC_START;
+	uint32_t rootfscrc = IMAGETAG_CRC_START;
+	uint32_t kernelfscrc = IMAGETAG_CRC_START;
+	uint32_t fwaddr = 0;
+	uint8_t crc_val;
+	const uint32_t deadcode = htonl(DEADCODE);
+	int i;
+	int is_pirelli = 0;
+
+
+	memset(&tag, 0, sizeof(struct bcm_tag));
+
+	if (!kernel || !rootfs) {
+		fprintf(stderr, "imagetag can't create an image without both kernel and rootfs\n");
+	}
+
+	if (kernel && !(kernelfile = fopen(kernel, "rb"))) {
+		fprintf(stderr, "Unable to open kernel \"%s\"\n", kernel);
+		return 1;
+	}
+
+	if (rootfs && !(rootfsfile = fopen(rootfs, "rb"))) {
+		fprintf(stderr, "Unable to open rootfs \"%s\"\n", rootfs);
+		return 1;
+	}
+
+	if (!bin || !(binfile = fopen(bin, "wb+"))) {
+		fprintf(stderr, "Unable to open output file \"%s\"\n", bin);
+		return 1;
+	}
+
+	if ((args->cfe_given) && (args->cfe_arg)) {
+	  if (!(cfefile = fopen(args->cfe_arg, "rb"))) {
+		fprintf(stderr, "Unable to open CFE file \"%s\"\n", args->cfe_arg);
+	  }
+	}
+
+	fwaddr = flash_start + image_offset;
+	if (cfefile) {
+	  cfeoff = flash_start;		  
+	  cfelen = getlen(cfefile);
+	  /* Seek to the start of the file after tag */
+	  fseek(binfile, sizeof(tag), SEEK_SET);
+	  
+	  /* Write the cfe */
+	  while (cfefile && !feof(cfefile) && !ferror(cfefile)) {
+		read = fread(readbuf, sizeof(uint8_t), sizeof(readbuf), cfefile);
+		fwrite(readbuf, sizeof(uint8_t), read, binfile);
+	  }
+
+	} else {
+	  cfeoff = 0;
+	  cfelen = 0;
+	}
+
+	if (!args->root_first_flag) {
+	  /* Build the kernel address and length (doesn't need to be aligned, read only) */
+	  kerneloff = fwaddr + sizeof(tag);
+	  
+	  kernellen = getlen(kernelfile);
+	  
+	  if (!args->kernel_file_has_header_flag) {
+		/* Build the kernel header */
+		khdr.loadaddr	= htonl(load_address);
+		khdr.entry	= htonl(entry);
+		khdr.lzmalen	= htonl(kernellen);
+		
+		/* Increase the kernel size by the header size */
+		kernellen += sizeof(khdr);	  
+	  }
+	  
+	  /* Build the rootfs address and length (start and end do need to be aligned on flash erase block boundaries */
+	  rootfsoff = kerneloff + kernellen;
+	  rootfsoff = (rootfsoff % block_size) > 0 ? (((rootfsoff / block_size) + 1) * block_size) : rootfsoff;
+	  rootfslen = getlen(rootfsfile);
+	  rootfslen = ( (rootfslen % block_size) > 0 ? (((rootfslen / block_size) + 1) * block_size) : rootfslen );
+	  imagelen = rootfsoff + rootfslen - kerneloff + sizeof(deadcode);
+	  rootfsoffpadlen = rootfsoff - (kerneloff + kernellen);
+	  
+	  /* Seek to the start of the kernel */
+	  fseek(binfile, kerneloff - fwaddr + cfelen, SEEK_SET);
+	  
+	  /* Write the kernel header */
+	  fwrite(&khdr, sizeof(khdr), 1, binfile);
+	  
+	  /* Write the kernel */
+	  while (kernelfile && !feof(kernelfile) && !ferror(kernelfile)) {
+		read = fread(readbuf, sizeof(uint8_t), sizeof(readbuf), kernelfile);
+		fwrite(readbuf, sizeof(uint8_t), read, binfile);
+	  }
+
+	  /* Write the RootFS */
+	  fseek(binfile, rootfsoff - fwaddr + cfelen, SEEK_SET);
+	  while (rootfsfile && !feof(rootfsfile) && !ferror(rootfsfile)) {
+		read = fread(readbuf, sizeof(uint8_t), sizeof(readbuf), rootfsfile);
+		fwrite(readbuf, sizeof(uint8_t), read, binfile);
+	  }
+
+	  /* Align image to specified erase block size and append deadc0de */
+	  printf("Data alignment to %dk with 'deadc0de' appended\n", block_size/1024);
+	  fseek(binfile, rootfsoff + rootfslen - fwaddr + cfelen, SEEK_SET);
+	  fwrite(&deadcode, sizeof(uint32_t), 1, binfile);
+
+	  oldrootfslen = rootfslen;
+	  if (args->pad_given) {
+		uint32_t allfs = 0xffffffff;
+		uint32_t pad_size = args->pad_arg * 1024 * 1024;
+
+		printf("Padding image to %d bytes ...\n", pad_size);
+		while (imagelen < pad_size) {
+			fwrite(&allfs, sizeof(uint32_t), 1, binfile);
+			imagelen += 4;
+			rootfslen += 4;
+		}
+	  }
+
+	  /* Flush the binfile buffer so that when we read from file, it contains
+	   * everything in the buffer
+	   */
+	  fflush(binfile);
+
+	  /* Compute the crc32 of the entire image (deadC0de included) */
+	  imagecrc = compute_crc32(imagecrc, binfile, kerneloff - fwaddr + cfelen, imagelen);
+	  /* Compute the crc32 of the kernel and padding between kernel and rootfs) */
+	  kernelcrc = compute_crc32(kernelcrc, binfile, kerneloff - fwaddr + cfelen, kernellen + rootfsoffpadlen);
+	  /* Compute the crc32 of the kernel and padding between kernel and rootfs) */
+	  kernelfscrc = compute_crc32(kernelfscrc, binfile, kerneloff - fwaddr + cfelen, kernellen + rootfsoffpadlen + rootfslen + sizeof(deadcode));
+	  /* Compute the crc32 of the flashImageStart to rootLength.
+	   * The broadcom firmware assumes the rootfs starts the image,
+	   * therefore uses the rootfs start to determine where to flash
+	   * the image.  Since we have the kernel first we have to give
+	   * it the kernel address, but the crc uses the length
+	   * associated with this address, which is added to the kernel
+	   * length to determine the length of image to flash and thus
+	   * needs to be rootfs + deadcode
+	   */
+	  rootfscrc = compute_crc32(rootfscrc, binfile, kerneloff - fwaddr + cfelen, rootfslen + sizeof(deadcode));
+
+	} else {
+	  /* Build the kernel address and length (doesn't need to be aligned, read only) */
+	  rootfsoff = fwaddr + sizeof(tag);
+	  oldrootfslen = getlen(rootfsfile);
+	  rootfslen = oldrootfslen;
+	  rootfslen = ( (rootfslen % block_size) > 0 ? (((rootfslen / block_size) + 1) * block_size) : rootfslen );
+	  kerneloffpadlen = rootfslen - oldrootfslen;
+	  oldrootfslen = rootfslen;
+
+	  kerneloff = rootfsoff + rootfslen;
+	  kernellen = getlen(kernelfile);
+
+	  imagelen = cfelen + rootfslen + kernellen;
+	  
+	  /* Seek to the start of the kernel */
+	  fseek(binfile, kerneloff - fwaddr + cfelen, SEEK_SET);
+	  
+	  if (!args->kernel_file_has_header_flag) {
+		/* Build the kernel header */
+		khdr.loadaddr	= htonl(load_address);
+		khdr.entry	= htonl(entry);
+		khdr.lzmalen	= htonl(kernellen);
+		
+		/* Write the kernel header */
+		fwrite(&khdr, sizeof(khdr), 1, binfile);
+	  
+		/* Increase the kernel size by the header size */
+		kernellen += sizeof(khdr);	  
+	  }
+	  
+	  /* Write the kernel */
+	  while (kernelfile && !feof(kernelfile) && !ferror(kernelfile)) {
+		read = fread(readbuf, sizeof(uint8_t), sizeof(readbuf), kernelfile);
+		fwrite(readbuf, sizeof(uint8_t), read, binfile);
+	  }
+
+	  /* Write the RootFS */
+	  fseek(binfile, rootfsoff - fwaddr + cfelen, SEEK_SET);
+	  while (rootfsfile && !feof(rootfsfile) && !ferror(rootfsfile)) {
+		read = fread(readbuf, sizeof(uint8_t), sizeof(readbuf), rootfsfile);
+		fwrite(readbuf, sizeof(uint8_t), read, binfile);
+	  }
+
+	  /* Flush the binfile buffer so that when we read from file, it contains
+	   * everything in the buffer
+	   */
+	  fflush(binfile);
+
+	  /* Compute the crc32 of the entire image (deadC0de included) */
+	  imagecrc = compute_crc32(imagecrc, binfile, sizeof(tag), imagelen);
+	  /* Compute the crc32 of the kernel and padding between kernel and rootfs) */
+	  kernelcrc = compute_crc32(kernelcrc, binfile, kerneloff - fwaddr + cfelen, kernellen + rootfsoffpadlen);
+	  kernelfscrc = compute_crc32(kernelfscrc, binfile, rootfsoff - fwaddr + cfelen, kernellen + rootfslen);
+	  rootfscrc = compute_crc32(rootfscrc, binfile, rootfsoff - fwaddr + cfelen, rootfslen);
+	}
+
+	/* Close the files */
+	if (cfefile) {
+	  fclose(cfefile);
+	}
+	fclose(kernelfile);
+	fclose(rootfsfile);
+
+	/* Build the tag */
+	strncpy(tag.tagVersion, args->tag_version_arg, sizeof(tag.tagVersion) - 1);
+	strncpy(tag.sig_1, args->signature_arg, sizeof(tag.sig_1) - 1);
+	strncpy(tag.sig_2, args->signature2_arg, sizeof(tag.sig_2) - 1);
+	strncpy(tag.chipid, args->chipid_arg, sizeof(tag.chipid) - 1);
+	strncpy(tag.boardid, args->boardid_arg, sizeof(tag.boardid) - 1);
+	strcpy(tag.big_endian, "1");
+	sprintf(tag.totalLength, "%lu", imagelen);
+
+	if (args->cfe_given) {
+	  sprintf(tag.cfeAddress, "%lu", flash_start);
+	  sprintf(tag.cfeLength, "%lu", cfelen);
+	} else {
+	  /* We don't include CFE */
+	  strcpy(tag.cfeAddress, "0");
+	  strcpy(tag.cfeLength, "0");
+	}
+
+	sprintf(tag.kernelAddress, "%lu", kerneloff);
+	sprintf(tag.kernelLength, "%lu", kernellen + rootfsoffpadlen);
+
+	if (args->root_first_flag) {
+	  sprintf(tag.flashImageStart, "%lu", rootfsoff);
+	  sprintf(tag.flashRootLength, "%lu", rootfslen);	  
+	} else {
+	  sprintf(tag.flashImageStart, "%lu", kerneloff);
+	  sprintf(tag.flashRootLength, "%lu", rootfslen + sizeof(deadcode));
+	}
+	int2tag(tag.rootLength, oldrootfslen + sizeof(deadcode));
+
+	if (args->rsa_signature_given) {
+	    strncpy(tag.rsa_signature, args->rsa_signature_arg, RSASIG_LEN);
+	}
+
+	if (args->layoutver_given) {
+	    strncpy(tag.flashLayoutVer, args->layoutver_arg, TAGLAYOUT_LEN);
+	}
+
+	if (args->info1_given) {
+	  strncpy(tag.information1, args->info1_arg, TAGINFO1_LEN);
+	}
+
+	if (args->info2_given) {
+	  strncpy(tag.information2, args->info2_arg, TAGINFO2_LEN);
+	}
+
+	if (args->reserved2_given) {
+	  strncpy(tag.reserved2, args->reserved2_arg, 16);
+	}
+
+	if (args->altinfo_given) {
+	  strncpy(&tag.information1[0], args->altinfo_arg, ALTTAGINFO_LEN);
+	}
+
+	if (args->second_image_flag_given) {
+	  if (strncmp(args->second_image_flag_arg, "2", DUALFLAG_LEN) != 0) {		
+		strncpy(tag.dualImage, args->second_image_flag_arg, DUALFLAG_LEN);
+	  }
+	}
+
+	if (args->inactive_given) {
+	  if (strncmp(args->inactive_arg, "2", INACTIVEFLAG_LEN) != 0) {		
+		strncpy(tag.inactiveFlag, args->second_image_flag_arg, INACTIVEFLAG_LEN);
+	  }
+	}
+
+	for (i = 0; i < NUM_PIRELLI; i++) {
+		if (strncmp(args->boardid_arg, pirellitab[i], BOARDID_LEN) == 0) {
+			is_pirelli = 1;
+			break;
+		}
+	}
+
+	if ( !is_pirelli ) {
+	  int2tag(tag.imageCRC, kernelfscrc);
+	} else {
+	  int2tag(tag.imageCRC, kernelcrc);
+	}
+
+	int2tag(&(tag.rootfsCRC[0]), rootfscrc);
+	int2tag(tag.kernelCRC, kernelcrc);
+	int2tag(tag.fskernelCRC, kernelfscrc);
+	int2tag(tag.headerCRC, crc32(IMAGETAG_CRC_START, (uint8_t*)&tag, sizeof(tag) - 20));
+
+	fseek(binfile, 0L, SEEK_SET);
+	fwrite(&tag, sizeof(uint8_t), sizeof(tag), binfile);
+
+    fflush(binfile);
+	fclose(binfile);
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+    int c, i;
+	char *kernel, *rootfs, *bin;
+	uint32_t flash_start, image_offset, block_size, load_address, entry;
+	flash_start = image_offset = block_size = load_address = entry = 0;
+	struct gengetopt_args_info parsed_args;
+
+	kernel = rootfs = bin = NULL;
+
+	if (cmdline_parser(argc, argv, &parsed_args)) {
+	  exit(1);
+	}
+
+	printf("Broadcom 63xx image tagger - v2.0.0\n");
+	printf("Copyright (C) 2008 Axel Gembe\n");
+	printf("Copyright (C) 2009-2010 Daniel Dickinson\n");
+	printf("Licensed under the terms of the Gnu General Public License\n");
+
+	kernel = parsed_args.kernel_arg;
+	rootfs = parsed_args.rootfs_arg;
+	bin = parsed_args.output_arg;
+	if (strlen(parsed_args.tag_version_arg) >= TAGVER_LEN) {
+	  fprintf(stderr, "Error: Tag Version (tag_version,v) too long.\n");
+	  exit(1);
+	}
+	if (strlen(parsed_args.boardid_arg) >= BOARDID_LEN) {
+	  fprintf(stderr, "Error: Board ID (boardid,b) too long.\n");
+	  exit(1);
+	}
+	if (strlen(parsed_args.chipid_arg) >= CHIPID_LEN) {
+	  fprintf(stderr, "Error: Chip ID (chipid,c) too long.\n");
+	  exit(1);
+	}
+	if (strlen(parsed_args.signature_arg) >= SIG1_LEN) {
+	  fprintf(stderr, "Error: Magic string (signature,a) too long.\n");
+	  exit(1);
+	}
+	if (strlen(parsed_args.signature2_arg) >= SIG2_LEN) {
+	  fprintf(stderr, "Error: Second magic string (signature2,m) too long.\n");
+	  exit(1);
+	}
+	if (parsed_args.layoutver_given) {
+	  if (strlen(parsed_args.layoutver_arg) > FLASHLAYOUTVER_LEN) {
+		fprintf(stderr, "Error: Flash layout version (layoutver,y) too long.\n");
+		exit(1);
+	  }
+	}
+	if (parsed_args.rsa_signature_given) {
+	  if (strlen(parsed_args.rsa_signature_arg) > RSASIG_LEN) {
+		fprintf(stderr, "Error: RSA Signature (rsa_signature,r) too long.\n");
+		exit(1);
+	  }
+	}
+
+	if (parsed_args.info1_given) {
+	  if (strlen(parsed_args.info1_arg) >= TAGINFO1_LEN) {
+		fprintf(stderr, "Error: Vendor Information 1 (info1) too long.\n");
+		exit(1);
+	  }
+	}
+
+	if (parsed_args.info2_given) {
+	  if (strlen(parsed_args.info2_arg) >= TAGINFO2_LEN) {
+		fprintf(stderr, "Error: Vendor Information 2 (info2) too long.\n");
+		exit(1);
+	  }
+	}
+
+	if (parsed_args.altinfo_given) {
+	  if (strlen(parsed_args.altinfo_arg) >= ALTTAGINFO_LEN) {
+		fprintf(stderr, "Error: Vendor Information 1 (info1) too long.\n");
+		exit(1);
+	  }
+	}
+
+	if (parsed_args.pad_given) {
+	  if (parsed_args.pad_arg < 0) {
+		fprintf(stderr, "Error: pad size must be positive.\r");
+		exit(1);
+	  }
+	}
+
+	flash_start = strtoul(parsed_args.flash_start_arg, NULL, 16);
+	image_offset = strtoul(parsed_args.image_offset_arg, NULL, 16);
+	block_size = strtoul(parsed_args.block_size_arg, NULL, 16);
+
+	if (!parsed_args.kernel_file_has_header_flag) {
+	  load_address = strtoul(parsed_args.load_addr_arg, NULL, 16);
+	  entry = strtoul(parsed_args.entry_arg, NULL, 16);
+	  if (load_address == 0) {
+		fprintf(stderr, "Error: Invalid value for load address\n");
+	  }
+	  if (entry == 0) {
+		fprintf(stderr, "Error: Invalid value for entry\n");
+	  }
+	}
+	
+	return tagfile(kernel, rootfs, bin, &parsed_args, flash_start, image_offset, block_size, load_address, entry);
+}
diff --git a/trunk/tools/firmware-utils/src/imagetag.ggo b/trunk/tools/firmware-utils/src/imagetag.ggo
new file mode 100644
index 00000000..7c9f943c
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/imagetag.ggo
@@ -0,0 +1,45 @@
+# Command line option parsing generator file for imagetag
+# Supplied-To: gengetopt
+#
+# Copyright 2010 Daniel Dickinson <openwrt@cshore.neomailbox.net>
+#
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
+#
+
+package "imagetag"
+version "2.0.0"
+purpose "Generate image with CFE imagetag for Broadcom 63xx routers."
+description "Copyright (C) 2008 Axel Gembe
+Copyright (C) 2009-2010 Daniel Dickinson
+Licensed unter the terms of the Gnu General Public License.
+
+Given a root filesystem, a linux kernel, and an optional CFE, generates an image with an imagetag for a Broadcom 63xx-based router.  Additional parameters to be specified depend on the specfic brand and model of router."
+args "--file-name=imagetag_cmdline"
+
+option "kernel" i "File with LZMA compressed kernel to include in the image." string typestr="filename"  required
+option "rootfs" f "File with RootFS to include in the image." string typestr="filename" required
+option "output" o "Name of output file." string typestr="filename" required
+option "cfe" - "File with CFE to include in the image." string typestr="filename" optional
+option "boardid" b "Board ID to set in the image (must match what router expects, e.g. \"96345GW2\")." string required
+option "chipid" c "Chip ID to set in the image (must match the actual hardware, e.g. \"6345\")." string required
+option "flash-start" s "Flash start address." string typestr="address" optional default="0xBFC00000"
+option "image-offset" n "Offset from start address for the first byte after the CFE (in memory)." string typestr="offset" default="0x10000" optional
+option "tag-version" v "Version number for imagetag format." string default="6" optional
+option "signature" a "Magic string (signature), for boards that need it." string default="Broadcom Corporatio" optional
+option "signature2" m "Second magic string (signature2)." string default="ver. 2.0" optional
+option "block-size" k "Flash erase block size." string optional default="0x10000"
+option "load-addr" l "Kernel load address." string typestr="address" required
+option "entry" e "Address where the kernel entry point will be for booting." string typestr="address" required
+option "layoutver" y "Flash layout version (version 2.2x of the Broadcom code requires this)." string optional
+option "info1" 1 "String for first vendor information section." string optional
+option "altinfo" - "String for vendor information section (alternate/pirelli)." string optional
+option "info2" 2 "String for second vendor information section." string optional
+option "root-first" - "Put the rootfs before the kernel (only for stock images, e.g. captured from the router's flash memory)." flag off
+option "rsa-signature" r "String for RSA Signature section." string optional
+option "second-image-flag" - "Dual Image Flag (2=not-specified)." values="0", "1", "2" default="2" typestr="flag-value" optional
+option "inactive" - "Inactive Flag (2=not-specified)." values="0", "1", "2" default="2" typestr="flag-value" optional
+option "reserved2" - "String for second reserved section." string optional
+option "kernel-file-has-header" - "Indicates that the kernel file includes the kernel header with correct load address and entry point, so no changes are needed" flag off
+option "pad" p "Pad the image to this size if smaller (in MiB)" int typestr="size (in MiB)" optional
diff --git a/trunk/tools/firmware-utils/src/imagetag_cmdline.c b/trunk/tools/firmware-utils/src/imagetag_cmdline.c
new file mode 100644
index 00000000..efb82ac9
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/imagetag_cmdline.c
@@ -0,0 +1,1174 @@
+/*
+  File autogenerated by gengetopt version 2.22.4
+  generated with the following command:
+  gengetopt --file-name=imagetag_cmdline --file-name=imagetag_cmdline
+
+  The developers of gengetopt consider the fixed text that goes in all
+  gengetopt output files to be in the public domain:
+  we make no copyright claims on it.
+*/
+
+/* If we use autoconf.  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef FIX_UNUSED
+#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
+#endif
+
+#include <getopt.h>
+
+#include "imagetag_cmdline.h"
+
+const char *gengetopt_args_info_purpose = "Generate image with CFE imagetag for Broadcom 63xx routers.";
+
+const char *gengetopt_args_info_usage = "Usage: imagetag [OPTIONS]...";
+
+const char *gengetopt_args_info_description = "Copyright (C) 2008 Axel Gembe\nCopyright (C) 2009-2010 Daniel Dickinson\nLicensed unter the terms of the Gnu General Public License.\n\nGiven a root filesystem, a linux kernel, and an optional CFE, generates an \nimage with an imagetag for a Broadcom 63xx-based router.  Additional parameters \nto be specified depend on the specfic brand and model of router.";
+
+const char *gengetopt_args_info_help[] = {
+  "  -h, --help                    Print help and exit",
+  "  -V, --version                 Print version and exit",
+  "  -i, --kernel=filename         File with LZMA compressed kernel to include in \n                                  the image.",
+  "  -f, --rootfs=filename         File with RootFS to include in the image.",
+  "  -o, --output=filename         Name of output file.",
+  "      --cfe=filename            File with CFE to include in the image.",
+  "  -b, --boardid=STRING          Board ID to set in the image (must match what \n                                  router expects, e.g. \"96345GW2\").",
+  "  -c, --chipid=STRING           Chip ID to set in the image (must match the \n                                  actual hardware, e.g. \"6345\").",
+  "  -s, --flash-start=address     Flash start address.  (default=`0xBFC00000')",
+  "  -n, --image-offset=offset     Offset from start address for the first byte \n                                  after the CFE (in memory).  \n                                  (default=`0x10000')",
+  "  -v, --tag-version=STRING      Version number for imagetag format.  \n                                  (default=`6')",
+  "  -a, --signature=STRING        Magic string (signature), for boards that need \n                                  it.  (default=`Broadcom Corporatio')",
+  "  -m, --signature2=STRING       Second magic string (signature2).  \n                                  (default=`ver. 2.0')",
+  "  -k, --block-size=STRING       Flash erase block size.  (default=`0x10000')",
+  "  -l, --load-addr=address       Kernel load address.",
+  "  -e, --entry=address           Address where the kernel entry point will be \n                                  for booting.",
+  "  -y, --layoutver=STRING        Flash layout version (version 2.2x of the \n                                  Broadcom code requires this).",
+  "  -1, --info1=STRING            String for first vendor information section.",
+  "      --altinfo=STRING          String for vendor information section \n                                  (alternate/pirelli).",
+  "  -2, --info2=STRING            String for second vendor information section.",
+  "      --root-first              Put the rootfs before the kernel (only for \n                                  stock images, e.g. captured from the router's \n                                  flash memory).  (default=off)",
+  "  -r, --rsa-signature=STRING    String for RSA Signature section.",
+  "      --second-image-flag=flag-value\n                                Dual Image Flag (2=not-specified).  (possible \n                                  values=\"0\", \"1\", \"2\" default=`2')",
+  "      --inactive=flag-value     Inactive Flag (2=not-specified).  (possible \n                                  values=\"0\", \"1\", \"2\" default=`2')",
+  "      --reserved2=STRING        String for second reserved section.",
+  "      --kernel-file-has-header  Indicates that the kernel file includes the \n                                  kernel header with correct load address and \n                                  entry point, so no changes are needed  \n                                  (default=off)",
+  "  -p, --pad=size (in MiB)       Pad the image to this size if smaller (in MiB)",
+    0
+};
+
+typedef enum {ARG_NO
+  , ARG_FLAG
+  , ARG_STRING
+  , ARG_INT
+} cmdline_parser_arg_type;
+
+static
+void clear_given (struct gengetopt_args_info *args_info);
+static
+void clear_args (struct gengetopt_args_info *args_info);
+
+static int
+cmdline_parser_internal (int argc, char **argv, struct gengetopt_args_info *args_info,
+                        struct cmdline_parser_params *params, const char *additional_error);
+
+static int
+cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *prog_name, const char *additional_error);
+
+const char *cmdline_parser_second_image_flag_values[] = {"0", "1", "2", 0}; /*< Possible values for second-image-flag. */
+const char *cmdline_parser_inactive_values[] = {"0", "1", "2", 0}; /*< Possible values for inactive. */
+
+static char *
+gengetopt_strdup (const char *s);
+
+static
+void clear_given (struct gengetopt_args_info *args_info)
+{
+  args_info->help_given = 0 ;
+  args_info->version_given = 0 ;
+  args_info->kernel_given = 0 ;
+  args_info->rootfs_given = 0 ;
+  args_info->output_given = 0 ;
+  args_info->cfe_given = 0 ;
+  args_info->boardid_given = 0 ;
+  args_info->chipid_given = 0 ;
+  args_info->flash_start_given = 0 ;
+  args_info->image_offset_given = 0 ;
+  args_info->tag_version_given = 0 ;
+  args_info->signature_given = 0 ;
+  args_info->signature2_given = 0 ;
+  args_info->block_size_given = 0 ;
+  args_info->load_addr_given = 0 ;
+  args_info->entry_given = 0 ;
+  args_info->layoutver_given = 0 ;
+  args_info->info1_given = 0 ;
+  args_info->altinfo_given = 0 ;
+  args_info->info2_given = 0 ;
+  args_info->root_first_given = 0 ;
+  args_info->rsa_signature_given = 0 ;
+  args_info->second_image_flag_given = 0 ;
+  args_info->inactive_given = 0 ;
+  args_info->reserved2_given = 0 ;
+  args_info->kernel_file_has_header_given = 0 ;
+  args_info->pad_given = 0 ;
+}
+
+static
+void clear_args (struct gengetopt_args_info *args_info)
+{
+  FIX_UNUSED (args_info);
+  args_info->kernel_arg = NULL;
+  args_info->kernel_orig = NULL;
+  args_info->rootfs_arg = NULL;
+  args_info->rootfs_orig = NULL;
+  args_info->output_arg = NULL;
+  args_info->output_orig = NULL;
+  args_info->cfe_arg = NULL;
+  args_info->cfe_orig = NULL;
+  args_info->boardid_arg = NULL;
+  args_info->boardid_orig = NULL;
+  args_info->chipid_arg = NULL;
+  args_info->chipid_orig = NULL;
+  args_info->flash_start_arg = gengetopt_strdup ("0xBFC00000");
+  args_info->flash_start_orig = NULL;
+  args_info->image_offset_arg = gengetopt_strdup ("0x10000");
+  args_info->image_offset_orig = NULL;
+  args_info->tag_version_arg = gengetopt_strdup ("6");
+  args_info->tag_version_orig = NULL;
+  args_info->signature_arg = gengetopt_strdup ("Broadcom Corporatio");
+  args_info->signature_orig = NULL;
+  args_info->signature2_arg = gengetopt_strdup ("ver. 2.0");
+  args_info->signature2_orig = NULL;
+  args_info->block_size_arg = gengetopt_strdup ("0x10000");
+  args_info->block_size_orig = NULL;
+  args_info->load_addr_arg = NULL;
+  args_info->load_addr_orig = NULL;
+  args_info->entry_arg = NULL;
+  args_info->entry_orig = NULL;
+  args_info->layoutver_arg = NULL;
+  args_info->layoutver_orig = NULL;
+  args_info->info1_arg = NULL;
+  args_info->info1_orig = NULL;
+  args_info->altinfo_arg = NULL;
+  args_info->altinfo_orig = NULL;
+  args_info->info2_arg = NULL;
+  args_info->info2_orig = NULL;
+  args_info->root_first_flag = 0;
+  args_info->rsa_signature_arg = NULL;
+  args_info->rsa_signature_orig = NULL;
+  args_info->second_image_flag_arg = gengetopt_strdup ("2");
+  args_info->second_image_flag_orig = NULL;
+  args_info->inactive_arg = gengetopt_strdup ("2");
+  args_info->inactive_orig = NULL;
+  args_info->reserved2_arg = NULL;
+  args_info->reserved2_orig = NULL;
+  args_info->kernel_file_has_header_flag = 0;
+  args_info->pad_orig = NULL;
+  
+}
+
+static
+void init_args_info(struct gengetopt_args_info *args_info)
+{
+
+
+  args_info->help_help = gengetopt_args_info_help[0] ;
+  args_info->version_help = gengetopt_args_info_help[1] ;
+  args_info->kernel_help = gengetopt_args_info_help[2] ;
+  args_info->rootfs_help = gengetopt_args_info_help[3] ;
+  args_info->output_help = gengetopt_args_info_help[4] ;
+  args_info->cfe_help = gengetopt_args_info_help[5] ;
+  args_info->boardid_help = gengetopt_args_info_help[6] ;
+  args_info->chipid_help = gengetopt_args_info_help[7] ;
+  args_info->flash_start_help = gengetopt_args_info_help[8] ;
+  args_info->image_offset_help = gengetopt_args_info_help[9] ;
+  args_info->tag_version_help = gengetopt_args_info_help[10] ;
+  args_info->signature_help = gengetopt_args_info_help[11] ;
+  args_info->signature2_help = gengetopt_args_info_help[12] ;
+  args_info->block_size_help = gengetopt_args_info_help[13] ;
+  args_info->load_addr_help = gengetopt_args_info_help[14] ;
+  args_info->entry_help = gengetopt_args_info_help[15] ;
+  args_info->layoutver_help = gengetopt_args_info_help[16] ;
+  args_info->info1_help = gengetopt_args_info_help[17] ;
+  args_info->altinfo_help = gengetopt_args_info_help[18] ;
+  args_info->info2_help = gengetopt_args_info_help[19] ;
+  args_info->root_first_help = gengetopt_args_info_help[20] ;
+  args_info->rsa_signature_help = gengetopt_args_info_help[21] ;
+  args_info->second_image_flag_help = gengetopt_args_info_help[22] ;
+  args_info->inactive_help = gengetopt_args_info_help[23] ;
+  args_info->reserved2_help = gengetopt_args_info_help[24] ;
+  args_info->kernel_file_has_header_help = gengetopt_args_info_help[25] ;
+  args_info->pad_help = gengetopt_args_info_help[26] ;
+  
+}
+
+void
+cmdline_parser_print_version (void)
+{
+  printf ("%s %s\n",
+     (strlen(CMDLINE_PARSER_PACKAGE_NAME) ? CMDLINE_PARSER_PACKAGE_NAME : CMDLINE_PARSER_PACKAGE),
+     CMDLINE_PARSER_VERSION);
+}
+
+static void print_help_common(void) {
+  cmdline_parser_print_version ();
+
+  if (strlen(gengetopt_args_info_purpose) > 0)
+    printf("\n%s\n", gengetopt_args_info_purpose);
+
+  if (strlen(gengetopt_args_info_usage) > 0)
+    printf("\n%s\n", gengetopt_args_info_usage);
+
+  printf("\n");
+
+  if (strlen(gengetopt_args_info_description) > 0)
+    printf("%s\n\n", gengetopt_args_info_description);
+}
+
+void
+cmdline_parser_print_help (void)
+{
+  int i = 0;
+  print_help_common();
+  while (gengetopt_args_info_help[i])
+    printf("%s\n", gengetopt_args_info_help[i++]);
+}
+
+void
+cmdline_parser_init (struct gengetopt_args_info *args_info)
+{
+  clear_given (args_info);
+  clear_args (args_info);
+  init_args_info (args_info);
+}
+
+void
+cmdline_parser_params_init(struct cmdline_parser_params *params)
+{
+  if (params)
+    { 
+      params->override = 0;
+      params->initialize = 1;
+      params->check_required = 1;
+      params->check_ambiguity = 0;
+      params->print_errors = 1;
+    }
+}
+
+struct cmdline_parser_params *
+cmdline_parser_params_create(void)
+{
+  struct cmdline_parser_params *params = 
+    (struct cmdline_parser_params *)malloc(sizeof(struct cmdline_parser_params));
+  cmdline_parser_params_init(params);  
+  return params;
+}
+
+static void
+free_string_field (char **s)
+{
+  if (*s)
+    {
+      free (*s);
+      *s = 0;
+    }
+}
+
+
+static void
+cmdline_parser_release (struct gengetopt_args_info *args_info)
+{
+
+  free_string_field (&(args_info->kernel_arg));
+  free_string_field (&(args_info->kernel_orig));
+  free_string_field (&(args_info->rootfs_arg));
+  free_string_field (&(args_info->rootfs_orig));
+  free_string_field (&(args_info->output_arg));
+  free_string_field (&(args_info->output_orig));
+  free_string_field (&(args_info->cfe_arg));
+  free_string_field (&(args_info->cfe_orig));
+  free_string_field (&(args_info->boardid_arg));
+  free_string_field (&(args_info->boardid_orig));
+  free_string_field (&(args_info->chipid_arg));
+  free_string_field (&(args_info->chipid_orig));
+  free_string_field (&(args_info->flash_start_arg));
+  free_string_field (&(args_info->flash_start_orig));
+  free_string_field (&(args_info->image_offset_arg));
+  free_string_field (&(args_info->image_offset_orig));
+  free_string_field (&(args_info->tag_version_arg));
+  free_string_field (&(args_info->tag_version_orig));
+  free_string_field (&(args_info->signature_arg));
+  free_string_field (&(args_info->signature_orig));
+  free_string_field (&(args_info->signature2_arg));
+  free_string_field (&(args_info->signature2_orig));
+  free_string_field (&(args_info->block_size_arg));
+  free_string_field (&(args_info->block_size_orig));
+  free_string_field (&(args_info->load_addr_arg));
+  free_string_field (&(args_info->load_addr_orig));
+  free_string_field (&(args_info->entry_arg));
+  free_string_field (&(args_info->entry_orig));
+  free_string_field (&(args_info->layoutver_arg));
+  free_string_field (&(args_info->layoutver_orig));
+  free_string_field (&(args_info->info1_arg));
+  free_string_field (&(args_info->info1_orig));
+  free_string_field (&(args_info->altinfo_arg));
+  free_string_field (&(args_info->altinfo_orig));
+  free_string_field (&(args_info->info2_arg));
+  free_string_field (&(args_info->info2_orig));
+  free_string_field (&(args_info->rsa_signature_arg));
+  free_string_field (&(args_info->rsa_signature_orig));
+  free_string_field (&(args_info->second_image_flag_arg));
+  free_string_field (&(args_info->second_image_flag_orig));
+  free_string_field (&(args_info->inactive_arg));
+  free_string_field (&(args_info->inactive_orig));
+  free_string_field (&(args_info->reserved2_arg));
+  free_string_field (&(args_info->reserved2_orig));
+  free_string_field (&(args_info->pad_orig));
+  
+  
+
+  clear_given (args_info);
+}
+
+/**
+ * @param val the value to check
+ * @param values the possible values
+ * @return the index of the matched value:
+ * -1 if no value matched,
+ * -2 if more than one value has matched
+ */
+static int
+check_possible_values(const char *val, const char *values[])
+{
+  int i, found, last;
+  size_t len;
+
+  if (!val)   /* otherwise strlen() crashes below */
+    return -1; /* -1 means no argument for the option */
+
+  found = last = 0;
+
+  for (i = 0, len = strlen(val); values[i]; ++i)
+    {
+      if (strncmp(val, values[i], len) == 0)
+        {
+          ++found;
+          last = i;
+          if (strlen(values[i]) == len)
+            return i; /* exact macth no need to check more */
+        }
+    }
+
+  if (found == 1) /* one match: OK */
+    return last;
+
+  return (found ? -2 : -1); /* return many values or none matched */
+}
+
+
+static void
+write_into_file(FILE *outfile, const char *opt, const char *arg, const char *values[])
+{
+  int found = -1;
+  if (arg) {
+    if (values) {
+      found = check_possible_values(arg, values);      
+    }
+    if (found >= 0)
+      fprintf(outfile, "%s=\"%s\" # %s\n", opt, arg, values[found]);
+    else
+      fprintf(outfile, "%s=\"%s\"\n", opt, arg);
+  } else {
+    fprintf(outfile, "%s\n", opt);
+  }
+}
+
+
+int
+cmdline_parser_dump(FILE *outfile, struct gengetopt_args_info *args_info)
+{
+  int i = 0;
+
+  if (!outfile)
+    {
+      fprintf (stderr, "%s: cannot dump options to stream\n", CMDLINE_PARSER_PACKAGE);
+      return EXIT_FAILURE;
+    }
+
+  if (args_info->help_given)
+    write_into_file(outfile, "help", 0, 0 );
+  if (args_info->version_given)
+    write_into_file(outfile, "version", 0, 0 );
+  if (args_info->kernel_given)
+    write_into_file(outfile, "kernel", args_info->kernel_orig, 0);
+  if (args_info->rootfs_given)
+    write_into_file(outfile, "rootfs", args_info->rootfs_orig, 0);
+  if (args_info->output_given)
+    write_into_file(outfile, "output", args_info->output_orig, 0);
+  if (args_info->cfe_given)
+    write_into_file(outfile, "cfe", args_info->cfe_orig, 0);
+  if (args_info->boardid_given)
+    write_into_file(outfile, "boardid", args_info->boardid_orig, 0);
+  if (args_info->chipid_given)
+    write_into_file(outfile, "chipid", args_info->chipid_orig, 0);
+  if (args_info->flash_start_given)
+    write_into_file(outfile, "flash-start", args_info->flash_start_orig, 0);
+  if (args_info->image_offset_given)
+    write_into_file(outfile, "image-offset", args_info->image_offset_orig, 0);
+  if (args_info->tag_version_given)
+    write_into_file(outfile, "tag-version", args_info->tag_version_orig, 0);
+  if (args_info->signature_given)
+    write_into_file(outfile, "signature", args_info->signature_orig, 0);
+  if (args_info->signature2_given)
+    write_into_file(outfile, "signature2", args_info->signature2_orig, 0);
+  if (args_info->block_size_given)
+    write_into_file(outfile, "block-size", args_info->block_size_orig, 0);
+  if (args_info->load_addr_given)
+    write_into_file(outfile, "load-addr", args_info->load_addr_orig, 0);
+  if (args_info->entry_given)
+    write_into_file(outfile, "entry", args_info->entry_orig, 0);
+  if (args_info->layoutver_given)
+    write_into_file(outfile, "layoutver", args_info->layoutver_orig, 0);
+  if (args_info->info1_given)
+    write_into_file(outfile, "info1", args_info->info1_orig, 0);
+  if (args_info->altinfo_given)
+    write_into_file(outfile, "altinfo", args_info->altinfo_orig, 0);
+  if (args_info->info2_given)
+    write_into_file(outfile, "info2", args_info->info2_orig, 0);
+  if (args_info->root_first_given)
+    write_into_file(outfile, "root-first", 0, 0 );
+  if (args_info->rsa_signature_given)
+    write_into_file(outfile, "rsa-signature", args_info->rsa_signature_orig, 0);
+  if (args_info->second_image_flag_given)
+    write_into_file(outfile, "second-image-flag", args_info->second_image_flag_orig, cmdline_parser_second_image_flag_values);
+  if (args_info->inactive_given)
+    write_into_file(outfile, "inactive", args_info->inactive_orig, cmdline_parser_inactive_values);
+  if (args_info->reserved2_given)
+    write_into_file(outfile, "reserved2", args_info->reserved2_orig, 0);
+  if (args_info->kernel_file_has_header_given)
+    write_into_file(outfile, "kernel-file-has-header", 0, 0 );
+  if (args_info->pad_given)
+    write_into_file(outfile, "pad", args_info->pad_orig, 0);
+  
+
+  i = EXIT_SUCCESS;
+  return i;
+}
+
+int
+cmdline_parser_file_save(const char *filename, struct gengetopt_args_info *args_info)
+{
+  FILE *outfile;
+  int i = 0;
+
+  outfile = fopen(filename, "w");
+
+  if (!outfile)
+    {
+      fprintf (stderr, "%s: cannot open file for writing: %s\n", CMDLINE_PARSER_PACKAGE, filename);
+      return EXIT_FAILURE;
+    }
+
+  i = cmdline_parser_dump(outfile, args_info);
+  fclose (outfile);
+
+  return i;
+}
+
+void
+cmdline_parser_free (struct gengetopt_args_info *args_info)
+{
+  cmdline_parser_release (args_info);
+}
+
+/** @brief replacement of strdup, which is not standard */
+char *
+gengetopt_strdup (const char *s)
+{
+  char *result = 0;
+  if (!s)
+    return result;
+
+  result = (char*)malloc(strlen(s) + 1);
+  if (result == (char*)0)
+    return (char*)0;
+  strcpy(result, s);
+  return result;
+}
+
+int
+cmdline_parser (int argc, char **argv, struct gengetopt_args_info *args_info)
+{
+  return cmdline_parser2 (argc, argv, args_info, 0, 1, 1);
+}
+
+int
+cmdline_parser_ext (int argc, char **argv, struct gengetopt_args_info *args_info,
+                   struct cmdline_parser_params *params)
+{
+  int result;
+  result = cmdline_parser_internal (argc, argv, args_info, params, 0);
+
+  if (result == EXIT_FAILURE)
+    {
+      cmdline_parser_free (args_info);
+      exit (EXIT_FAILURE);
+    }
+  
+  return result;
+}
+
+int
+cmdline_parser2 (int argc, char **argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required)
+{
+  int result;
+  struct cmdline_parser_params params;
+  
+  params.override = override;
+  params.initialize = initialize;
+  params.check_required = check_required;
+  params.check_ambiguity = 0;
+  params.print_errors = 1;
+
+  result = cmdline_parser_internal (argc, argv, args_info, &params, 0);
+
+  if (result == EXIT_FAILURE)
+    {
+      cmdline_parser_free (args_info);
+      exit (EXIT_FAILURE);
+    }
+  
+  return result;
+}
+
+int
+cmdline_parser_required (struct gengetopt_args_info *args_info, const char *prog_name)
+{
+  int result = EXIT_SUCCESS;
+
+  if (cmdline_parser_required2(args_info, prog_name, 0) > 0)
+    result = EXIT_FAILURE;
+
+  if (result == EXIT_FAILURE)
+    {
+      cmdline_parser_free (args_info);
+      exit (EXIT_FAILURE);
+    }
+  
+  return result;
+}
+
+int
+cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *prog_name, const char *additional_error)
+{
+  int error = 0;
+  FIX_UNUSED (additional_error);
+
+  /* checks for required options */
+  if (! args_info->kernel_given)
+    {
+      fprintf (stderr, "%s: '--kernel' ('-i') option required%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
+  
+  if (! args_info->rootfs_given)
+    {
+      fprintf (stderr, "%s: '--rootfs' ('-f') option required%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
+  
+  if (! args_info->output_given)
+    {
+      fprintf (stderr, "%s: '--output' ('-o') option required%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
+  
+  if (! args_info->boardid_given)
+    {
+      fprintf (stderr, "%s: '--boardid' ('-b') option required%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
+  
+  if (! args_info->chipid_given)
+    {
+      fprintf (stderr, "%s: '--chipid' ('-c') option required%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
+  
+  if (! args_info->load_addr_given)
+    {
+      fprintf (stderr, "%s: '--load-addr' ('-l') option required%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
+  
+  if (! args_info->entry_given)
+    {
+      fprintf (stderr, "%s: '--entry' ('-e') option required%s\n", prog_name, (additional_error ? additional_error : ""));
+      error = 1;
+    }
+  
+  
+  /* checks for dependences among options */
+
+  return error;
+}
+
+
+static char *package_name = 0;
+
+/**
+ * @brief updates an option
+ * @param field the generic pointer to the field to update
+ * @param orig_field the pointer to the orig field
+ * @param field_given the pointer to the number of occurrence of this option
+ * @param prev_given the pointer to the number of occurrence already seen
+ * @param value the argument for this option (if null no arg was specified)
+ * @param possible_values the possible values for this option (if specified)
+ * @param default_value the default value (in case the option only accepts fixed values)
+ * @param arg_type the type of this option
+ * @param check_ambiguity @see cmdline_parser_params.check_ambiguity
+ * @param override @see cmdline_parser_params.override
+ * @param no_free whether to free a possible previous value
+ * @param multiple_option whether this is a multiple option
+ * @param long_opt the corresponding long option
+ * @param short_opt the corresponding short option (or '-' if none)
+ * @param additional_error possible further error specification
+ */
+static
+int update_arg(void *field, char **orig_field,
+               unsigned int *field_given, unsigned int *prev_given, 
+               char *value, const char *possible_values[],
+               const char *default_value,
+               cmdline_parser_arg_type arg_type,
+               int check_ambiguity, int override,
+               int no_free, int multiple_option,
+               const char *long_opt, char short_opt,
+               const char *additional_error)
+{
+  char *stop_char = 0;
+  const char *val = value;
+  int found;
+  char **string_field;
+  FIX_UNUSED (field);
+
+  stop_char = 0;
+  found = 0;
+
+  if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given)))
+    {
+      if (short_opt != '-')
+        fprintf (stderr, "%s: `--%s' (`-%c') option given more than once%s\n", 
+               package_name, long_opt, short_opt,
+               (additional_error ? additional_error : ""));
+      else
+        fprintf (stderr, "%s: `--%s' option given more than once%s\n", 
+               package_name, long_opt,
+               (additional_error ? additional_error : ""));
+      return 1; /* failure */
+    }
+
+  if (possible_values && (found = check_possible_values((value ? value : default_value), possible_values)) < 0)
+    {
+      if (short_opt != '-')
+        fprintf (stderr, "%s: %s argument, \"%s\", for option `--%s' (`-%c')%s\n", 
+          package_name, (found == -2) ? "ambiguous" : "invalid", value, long_opt, short_opt,
+          (additional_error ? additional_error : ""));
+      else
+        fprintf (stderr, "%s: %s argument, \"%s\", for option `--%s'%s\n", 
+          package_name, (found == -2) ? "ambiguous" : "invalid", value, long_opt,
+          (additional_error ? additional_error : ""));
+      return 1; /* failure */
+    }
+    
+  if (field_given && *field_given && ! override)
+    return 0;
+  if (prev_given)
+    (*prev_given)++;
+  if (field_given)
+    (*field_given)++;
+  if (possible_values)
+    val = possible_values[found];
+
+  switch(arg_type) {
+  case ARG_FLAG:
+    *((int *)field) = !*((int *)field);
+    break;
+  case ARG_INT:
+    if (val) *((int *)field) = strtol (val, &stop_char, 0);
+    break;
+  case ARG_STRING:
+    if (val) {
+      string_field = (char **)field;
+      if (!no_free && *string_field)
+        free (*string_field); /* free previous string */
+      *string_field = gengetopt_strdup (val);
+    }
+    break;
+  default:
+    break;
+  };
+
+  /* check numeric conversion */
+  switch(arg_type) {
+  case ARG_INT:
+    if (val && !(stop_char && *stop_char == '\0')) {
+      fprintf(stderr, "%s: invalid numeric value: %s\n", package_name, val);
+      return 1; /* failure */
+    }
+    break;
+  default:
+    ;
+  };
+
+  /* store the original value */
+  switch(arg_type) {
+  case ARG_NO:
+  case ARG_FLAG:
+    break;
+  default:
+    if (value && orig_field) {
+      if (no_free) {
+        *orig_field = value;
+      } else {
+        if (*orig_field)
+          free (*orig_field); /* free previous string */
+        *orig_field = gengetopt_strdup (value);
+      }
+    }
+  };
+
+  return 0; /* OK */
+}
+
+
+int
+cmdline_parser_internal (
+  int argc, char **argv, struct gengetopt_args_info *args_info,
+                        struct cmdline_parser_params *params, const char *additional_error)
+{
+  int c;	/* Character of the parsed option.  */
+
+  int error = 0;
+  struct gengetopt_args_info local_args_info;
+  
+  int override;
+  int initialize;
+  int check_required;
+  int check_ambiguity;
+  
+  package_name = argv[0];
+  
+  override = params->override;
+  initialize = params->initialize;
+  check_required = params->check_required;
+  check_ambiguity = params->check_ambiguity;
+
+  if (initialize)
+    cmdline_parser_init (args_info);
+
+  cmdline_parser_init (&local_args_info);
+
+  optarg = 0;
+  optind = 0;
+  opterr = params->print_errors;
+  optopt = '?';
+
+  while (1)
+    {
+      int option_index = 0;
+
+      static struct option long_options[] = {
+        { "help",	0, NULL, 'h' },
+        { "version",	0, NULL, 'V' },
+        { "kernel",	1, NULL, 'i' },
+        { "rootfs",	1, NULL, 'f' },
+        { "output",	1, NULL, 'o' },
+        { "cfe",	1, NULL, 0 },
+        { "boardid",	1, NULL, 'b' },
+        { "chipid",	1, NULL, 'c' },
+        { "flash-start",	1, NULL, 's' },
+        { "image-offset",	1, NULL, 'n' },
+        { "tag-version",	1, NULL, 'v' },
+        { "signature",	1, NULL, 'a' },
+        { "signature2",	1, NULL, 'm' },
+        { "block-size",	1, NULL, 'k' },
+        { "load-addr",	1, NULL, 'l' },
+        { "entry",	1, NULL, 'e' },
+        { "layoutver",	1, NULL, 'y' },
+        { "info1",	1, NULL, '1' },
+        { "altinfo",	1, NULL, 0 },
+        { "info2",	1, NULL, '2' },
+        { "root-first",	0, NULL, 0 },
+        { "rsa-signature",	1, NULL, 'r' },
+        { "second-image-flag",	1, NULL, 0 },
+        { "inactive",	1, NULL, 0 },
+        { "reserved2",	1, NULL, 0 },
+        { "kernel-file-has-header",	0, NULL, 0 },
+        { "pad",	1, NULL, 'p' },
+        { 0,  0, 0, 0 }
+      };
+
+      c = getopt_long (argc, argv, "hVi:f:o:b:c:s:n:v:a:m:k:l:e:y:1:2:r:p:", long_options, &option_index);
+
+      if (c == -1) break;	/* Exit from `while (1)' loop.  */
+
+      switch (c)
+        {
+        case 'h':	/* Print help and exit.  */
+          cmdline_parser_print_help ();
+          cmdline_parser_free (&local_args_info);
+          exit (EXIT_SUCCESS);
+
+        case 'V':	/* Print version and exit.  */
+          cmdline_parser_print_version ();
+          cmdline_parser_free (&local_args_info);
+          exit (EXIT_SUCCESS);
+
+        case 'i':	/* File with LZMA compressed kernel to include in the image..  */
+        
+        
+          if (update_arg( (void *)&(args_info->kernel_arg), 
+               &(args_info->kernel_orig), &(args_info->kernel_given),
+              &(local_args_info.kernel_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "kernel", 'i',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'f':	/* File with RootFS to include in the image..  */
+        
+        
+          if (update_arg( (void *)&(args_info->rootfs_arg), 
+               &(args_info->rootfs_orig), &(args_info->rootfs_given),
+              &(local_args_info.rootfs_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "rootfs", 'f',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'o':	/* Name of output file..  */
+        
+        
+          if (update_arg( (void *)&(args_info->output_arg), 
+               &(args_info->output_orig), &(args_info->output_given),
+              &(local_args_info.output_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "output", 'o',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'b':	/* Board ID to set in the image (must match what router expects, e.g. \"96345GW2\")..  */
+        
+        
+          if (update_arg( (void *)&(args_info->boardid_arg), 
+               &(args_info->boardid_orig), &(args_info->boardid_given),
+              &(local_args_info.boardid_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "boardid", 'b',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'c':	/* Chip ID to set in the image (must match the actual hardware, e.g. \"6345\")..  */
+        
+        
+          if (update_arg( (void *)&(args_info->chipid_arg), 
+               &(args_info->chipid_orig), &(args_info->chipid_given),
+              &(local_args_info.chipid_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "chipid", 'c',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 's':	/* Flash start address..  */
+        
+        
+          if (update_arg( (void *)&(args_info->flash_start_arg), 
+               &(args_info->flash_start_orig), &(args_info->flash_start_given),
+              &(local_args_info.flash_start_given), optarg, 0, "0xBFC00000", ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "flash-start", 's',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'n':	/* Offset from start address for the first byte after the CFE (in memory)..  */
+        
+        
+          if (update_arg( (void *)&(args_info->image_offset_arg), 
+               &(args_info->image_offset_orig), &(args_info->image_offset_given),
+              &(local_args_info.image_offset_given), optarg, 0, "0x10000", ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "image-offset", 'n',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'v':	/* Version number for imagetag format..  */
+        
+        
+          if (update_arg( (void *)&(args_info->tag_version_arg), 
+               &(args_info->tag_version_orig), &(args_info->tag_version_given),
+              &(local_args_info.tag_version_given), optarg, 0, "6", ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "tag-version", 'v',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'a':	/* Magic string (signature), for boards that need it..  */
+        
+        
+          if (update_arg( (void *)&(args_info->signature_arg), 
+               &(args_info->signature_orig), &(args_info->signature_given),
+              &(local_args_info.signature_given), optarg, 0, "Broadcom Corporatio", ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "signature", 'a',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'm':	/* Second magic string (signature2)..  */
+        
+        
+          if (update_arg( (void *)&(args_info->signature2_arg), 
+               &(args_info->signature2_orig), &(args_info->signature2_given),
+              &(local_args_info.signature2_given), optarg, 0, "ver. 2.0", ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "signature2", 'm',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'k':	/* Flash erase block size..  */
+        
+        
+          if (update_arg( (void *)&(args_info->block_size_arg), 
+               &(args_info->block_size_orig), &(args_info->block_size_given),
+              &(local_args_info.block_size_given), optarg, 0, "0x10000", ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "block-size", 'k',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'l':	/* Kernel load address..  */
+        
+        
+          if (update_arg( (void *)&(args_info->load_addr_arg), 
+               &(args_info->load_addr_orig), &(args_info->load_addr_given),
+              &(local_args_info.load_addr_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "load-addr", 'l',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'e':	/* Address where the kernel entry point will be for booting..  */
+        
+        
+          if (update_arg( (void *)&(args_info->entry_arg), 
+               &(args_info->entry_orig), &(args_info->entry_given),
+              &(local_args_info.entry_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "entry", 'e',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'y':	/* Flash layout version (version 2.2x of the Broadcom code requires this)..  */
+        
+        
+          if (update_arg( (void *)&(args_info->layoutver_arg), 
+               &(args_info->layoutver_orig), &(args_info->layoutver_given),
+              &(local_args_info.layoutver_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "layoutver", 'y',
+              additional_error))
+            goto failure;
+        
+          break;
+        case '1':	/* String for first vendor information section..  */
+        
+        
+          if (update_arg( (void *)&(args_info->info1_arg), 
+               &(args_info->info1_orig), &(args_info->info1_given),
+              &(local_args_info.info1_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "info1", '1',
+              additional_error))
+            goto failure;
+        
+          break;
+        case '2':	/* String for second vendor information section..  */
+        
+        
+          if (update_arg( (void *)&(args_info->info2_arg), 
+               &(args_info->info2_orig), &(args_info->info2_given),
+              &(local_args_info.info2_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "info2", '2',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'r':	/* String for RSA Signature section..  */
+        
+        
+          if (update_arg( (void *)&(args_info->rsa_signature_arg), 
+               &(args_info->rsa_signature_orig), &(args_info->rsa_signature_given),
+              &(local_args_info.rsa_signature_given), optarg, 0, 0, ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "rsa-signature", 'r',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'p':	/* Pad the image to this size if smaller (in MiB).  */
+        
+        
+          if (update_arg( (void *)&(args_info->pad_arg), 
+               &(args_info->pad_orig), &(args_info->pad_given),
+              &(local_args_info.pad_given), optarg, 0, 0, ARG_INT,
+              check_ambiguity, override, 0, 0,
+              "pad", 'p',
+              additional_error))
+            goto failure;
+        
+          break;
+
+        case 0:	/* Long option with no short option */
+          /* File with CFE to include in the image..  */
+          if (strcmp (long_options[option_index].name, "cfe") == 0)
+          {
+          
+          
+            if (update_arg( (void *)&(args_info->cfe_arg), 
+                 &(args_info->cfe_orig), &(args_info->cfe_given),
+                &(local_args_info.cfe_given), optarg, 0, 0, ARG_STRING,
+                check_ambiguity, override, 0, 0,
+                "cfe", '-',
+                additional_error))
+              goto failure;
+          
+          }
+          /* String for vendor information section (alternate/pirelli)..  */
+          else if (strcmp (long_options[option_index].name, "altinfo") == 0)
+          {
+          
+          
+            if (update_arg( (void *)&(args_info->altinfo_arg), 
+                 &(args_info->altinfo_orig), &(args_info->altinfo_given),
+                &(local_args_info.altinfo_given), optarg, 0, 0, ARG_STRING,
+                check_ambiguity, override, 0, 0,
+                "altinfo", '-',
+                additional_error))
+              goto failure;
+          
+          }
+          /* Put the rootfs before the kernel (only for stock images, e.g. captured from the router's flash memory)..  */
+          else if (strcmp (long_options[option_index].name, "root-first") == 0)
+          {
+          
+          
+            if (update_arg((void *)&(args_info->root_first_flag), 0, &(args_info->root_first_given),
+                &(local_args_info.root_first_given), optarg, 0, 0, ARG_FLAG,
+                check_ambiguity, override, 1, 0, "root-first", '-',
+                additional_error))
+              goto failure;
+          
+          }
+          /* Dual Image Flag (2=not-specified)..  */
+          else if (strcmp (long_options[option_index].name, "second-image-flag") == 0)
+          {
+          
+          
+            if (update_arg( (void *)&(args_info->second_image_flag_arg), 
+                 &(args_info->second_image_flag_orig), &(args_info->second_image_flag_given),
+                &(local_args_info.second_image_flag_given), optarg, cmdline_parser_second_image_flag_values, "2", ARG_STRING,
+                check_ambiguity, override, 0, 0,
+                "second-image-flag", '-',
+                additional_error))
+              goto failure;
+          
+          }
+          /* Inactive Flag (2=not-specified)..  */
+          else if (strcmp (long_options[option_index].name, "inactive") == 0)
+          {
+          
+          
+            if (update_arg( (void *)&(args_info->inactive_arg), 
+                 &(args_info->inactive_orig), &(args_info->inactive_given),
+                &(local_args_info.inactive_given), optarg, cmdline_parser_inactive_values, "2", ARG_STRING,
+                check_ambiguity, override, 0, 0,
+                "inactive", '-',
+                additional_error))
+              goto failure;
+          
+          }
+          /* String for second reserved section..  */
+          else if (strcmp (long_options[option_index].name, "reserved2") == 0)
+          {
+          
+          
+            if (update_arg( (void *)&(args_info->reserved2_arg), 
+                 &(args_info->reserved2_orig), &(args_info->reserved2_given),
+                &(local_args_info.reserved2_given), optarg, 0, 0, ARG_STRING,
+                check_ambiguity, override, 0, 0,
+                "reserved2", '-',
+                additional_error))
+              goto failure;
+          
+          }
+          /* Indicates that the kernel file includes the kernel header with correct load address and entry point, so no changes are needed.  */
+          else if (strcmp (long_options[option_index].name, "kernel-file-has-header") == 0)
+          {
+          
+          
+            if (update_arg((void *)&(args_info->kernel_file_has_header_flag), 0, &(args_info->kernel_file_has_header_given),
+                &(local_args_info.kernel_file_has_header_given), optarg, 0, 0, ARG_FLAG,
+                check_ambiguity, override, 1, 0, "kernel-file-has-header", '-',
+                additional_error))
+              goto failure;
+          
+          }
+          
+          break;
+        case '?':	/* Invalid option.  */
+          /* `getopt_long' already printed an error message.  */
+          goto failure;
+
+        default:	/* bug: option not considered.  */
+          fprintf (stderr, "%s: option unknown: %c%s\n", CMDLINE_PARSER_PACKAGE, c, (additional_error ? additional_error : ""));
+          abort ();
+        } /* switch */
+    } /* while */
+
+
+
+  if (check_required)
+    {
+      error += cmdline_parser_required2 (args_info, argv[0], additional_error);
+    }
+
+  cmdline_parser_release (&local_args_info);
+
+  if ( error )
+    return (EXIT_FAILURE);
+
+  return 0;
+
+failure:
+  
+  cmdline_parser_release (&local_args_info);
+  return (EXIT_FAILURE);
+}
diff --git a/trunk/tools/firmware-utils/src/imagetag_cmdline.h b/trunk/tools/firmware-utils/src/imagetag_cmdline.h
new file mode 100644
index 00000000..a6fd3896
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/imagetag_cmdline.h
@@ -0,0 +1,272 @@
+/** @file imagetag_cmdline.h
+ *  @brief The header file for the command line option parser
+ *  generated by GNU Gengetopt version 2.22.4
+ *  http://www.gnu.org/software/gengetopt.
+ *  DO NOT modify this file, since it can be overwritten
+ *  @author GNU Gengetopt by Lorenzo Bettini */
+
+#ifndef IMAGETAG_CMDLINE_H
+#define IMAGETAG_CMDLINE_H
+
+/* If we use autoconf.  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h> /* for FILE */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifndef CMDLINE_PARSER_PACKAGE
+/** @brief the program name (used for printing errors) */
+#define CMDLINE_PARSER_PACKAGE "imagetag"
+#endif
+
+#ifndef CMDLINE_PARSER_PACKAGE_NAME
+/** @brief the complete program name (used for help and version) */
+#define CMDLINE_PARSER_PACKAGE_NAME "imagetag"
+#endif
+
+#ifndef CMDLINE_PARSER_VERSION
+/** @brief the program version */
+#define CMDLINE_PARSER_VERSION "2.0.0"
+#endif
+
+/** @brief Where the command line options are stored */
+struct gengetopt_args_info
+{
+  const char *help_help; /**< @brief Print help and exit help description.  */
+  const char *version_help; /**< @brief Print version and exit help description.  */
+  char * kernel_arg;	/**< @brief File with LZMA compressed kernel to include in the image..  */
+  char * kernel_orig;	/**< @brief File with LZMA compressed kernel to include in the image. original value given at command line.  */
+  const char *kernel_help; /**< @brief File with LZMA compressed kernel to include in the image. help description.  */
+  char * rootfs_arg;	/**< @brief File with RootFS to include in the image..  */
+  char * rootfs_orig;	/**< @brief File with RootFS to include in the image. original value given at command line.  */
+  const char *rootfs_help; /**< @brief File with RootFS to include in the image. help description.  */
+  char * output_arg;	/**< @brief Name of output file..  */
+  char * output_orig;	/**< @brief Name of output file. original value given at command line.  */
+  const char *output_help; /**< @brief Name of output file. help description.  */
+  char * cfe_arg;	/**< @brief File with CFE to include in the image..  */
+  char * cfe_orig;	/**< @brief File with CFE to include in the image. original value given at command line.  */
+  const char *cfe_help; /**< @brief File with CFE to include in the image. help description.  */
+  char * boardid_arg;	/**< @brief Board ID to set in the image (must match what router expects, e.g. \"96345GW2\")..  */
+  char * boardid_orig;	/**< @brief Board ID to set in the image (must match what router expects, e.g. \"96345GW2\"). original value given at command line.  */
+  const char *boardid_help; /**< @brief Board ID to set in the image (must match what router expects, e.g. \"96345GW2\"). help description.  */
+  char * chipid_arg;	/**< @brief Chip ID to set in the image (must match the actual hardware, e.g. \"6345\")..  */
+  char * chipid_orig;	/**< @brief Chip ID to set in the image (must match the actual hardware, e.g. \"6345\"). original value given at command line.  */
+  const char *chipid_help; /**< @brief Chip ID to set in the image (must match the actual hardware, e.g. \"6345\"). help description.  */
+  char * flash_start_arg;	/**< @brief Flash start address. (default='0xBFC00000').  */
+  char * flash_start_orig;	/**< @brief Flash start address. original value given at command line.  */
+  const char *flash_start_help; /**< @brief Flash start address. help description.  */
+  char * image_offset_arg;	/**< @brief Offset from start address for the first byte after the CFE (in memory). (default='0x10000').  */
+  char * image_offset_orig;	/**< @brief Offset from start address for the first byte after the CFE (in memory). original value given at command line.  */
+  const char *image_offset_help; /**< @brief Offset from start address for the first byte after the CFE (in memory). help description.  */
+  char * tag_version_arg;	/**< @brief Version number for imagetag format. (default='6').  */
+  char * tag_version_orig;	/**< @brief Version number for imagetag format. original value given at command line.  */
+  const char *tag_version_help; /**< @brief Version number for imagetag format. help description.  */
+  char * signature_arg;	/**< @brief Magic string (signature), for boards that need it. (default='Broadcom Corporatio').  */
+  char * signature_orig;	/**< @brief Magic string (signature), for boards that need it. original value given at command line.  */
+  const char *signature_help; /**< @brief Magic string (signature), for boards that need it. help description.  */
+  char * signature2_arg;	/**< @brief Second magic string (signature2). (default='ver. 2.0').  */
+  char * signature2_orig;	/**< @brief Second magic string (signature2). original value given at command line.  */
+  const char *signature2_help; /**< @brief Second magic string (signature2). help description.  */
+  char * block_size_arg;	/**< @brief Flash erase block size. (default='0x10000').  */
+  char * block_size_orig;	/**< @brief Flash erase block size. original value given at command line.  */
+  const char *block_size_help; /**< @brief Flash erase block size. help description.  */
+  char * load_addr_arg;	/**< @brief Kernel load address..  */
+  char * load_addr_orig;	/**< @brief Kernel load address. original value given at command line.  */
+  const char *load_addr_help; /**< @brief Kernel load address. help description.  */
+  char * entry_arg;	/**< @brief Address where the kernel entry point will be for booting..  */
+  char * entry_orig;	/**< @brief Address where the kernel entry point will be for booting. original value given at command line.  */
+  const char *entry_help; /**< @brief Address where the kernel entry point will be for booting. help description.  */
+  char * layoutver_arg;	/**< @brief Flash layout version (version 2.2x of the Broadcom code requires this)..  */
+  char * layoutver_orig;	/**< @brief Flash layout version (version 2.2x of the Broadcom code requires this). original value given at command line.  */
+  const char *layoutver_help; /**< @brief Flash layout version (version 2.2x of the Broadcom code requires this). help description.  */
+  char * info1_arg;	/**< @brief String for first vendor information section..  */
+  char * info1_orig;	/**< @brief String for first vendor information section. original value given at command line.  */
+  const char *info1_help; /**< @brief String for first vendor information section. help description.  */
+  char * altinfo_arg;	/**< @brief String for vendor information section (alternate/pirelli)..  */
+  char * altinfo_orig;	/**< @brief String for vendor information section (alternate/pirelli). original value given at command line.  */
+  const char *altinfo_help; /**< @brief String for vendor information section (alternate/pirelli). help description.  */
+  char * info2_arg;	/**< @brief String for second vendor information section..  */
+  char * info2_orig;	/**< @brief String for second vendor information section. original value given at command line.  */
+  const char *info2_help; /**< @brief String for second vendor information section. help description.  */
+  int root_first_flag;	/**< @brief Put the rootfs before the kernel (only for stock images, e.g. captured from the router's flash memory). (default=off).  */
+  const char *root_first_help; /**< @brief Put the rootfs before the kernel (only for stock images, e.g. captured from the router's flash memory). help description.  */
+  char * rsa_signature_arg;	/**< @brief String for RSA Signature section..  */
+  char * rsa_signature_orig;	/**< @brief String for RSA Signature section. original value given at command line.  */
+  const char *rsa_signature_help; /**< @brief String for RSA Signature section. help description.  */
+  char * second_image_flag_arg;	/**< @brief Dual Image Flag (2=not-specified). (default='2').  */
+  char * second_image_flag_orig;	/**< @brief Dual Image Flag (2=not-specified). original value given at command line.  */
+  const char *second_image_flag_help; /**< @brief Dual Image Flag (2=not-specified). help description.  */
+  char * inactive_arg;	/**< @brief Inactive Flag (2=not-specified). (default='2').  */
+  char * inactive_orig;	/**< @brief Inactive Flag (2=not-specified). original value given at command line.  */
+  const char *inactive_help; /**< @brief Inactive Flag (2=not-specified). help description.  */
+  char * reserved2_arg;	/**< @brief String for second reserved section..  */
+  char * reserved2_orig;	/**< @brief String for second reserved section. original value given at command line.  */
+  const char *reserved2_help; /**< @brief String for second reserved section. help description.  */
+  int kernel_file_has_header_flag;	/**< @brief Indicates that the kernel file includes the kernel header with correct load address and entry point, so no changes are needed (default=off).  */
+  const char *kernel_file_has_header_help; /**< @brief Indicates that the kernel file includes the kernel header with correct load address and entry point, so no changes are needed help description.  */
+  int pad_arg;	/**< @brief Pad the image to this size if smaller (in MiB).  */
+  char * pad_orig;	/**< @brief Pad the image to this size if smaller (in MiB) original value given at command line.  */
+  const char *pad_help; /**< @brief Pad the image to this size if smaller (in MiB) help description.  */
+  
+  unsigned int help_given ;	/**< @brief Whether help was given.  */
+  unsigned int version_given ;	/**< @brief Whether version was given.  */
+  unsigned int kernel_given ;	/**< @brief Whether kernel was given.  */
+  unsigned int rootfs_given ;	/**< @brief Whether rootfs was given.  */
+  unsigned int output_given ;	/**< @brief Whether output was given.  */
+  unsigned int cfe_given ;	/**< @brief Whether cfe was given.  */
+  unsigned int boardid_given ;	/**< @brief Whether boardid was given.  */
+  unsigned int chipid_given ;	/**< @brief Whether chipid was given.  */
+  unsigned int flash_start_given ;	/**< @brief Whether flash-start was given.  */
+  unsigned int image_offset_given ;	/**< @brief Whether image-offset was given.  */
+  unsigned int tag_version_given ;	/**< @brief Whether tag-version was given.  */
+  unsigned int signature_given ;	/**< @brief Whether signature was given.  */
+  unsigned int signature2_given ;	/**< @brief Whether signature2 was given.  */
+  unsigned int block_size_given ;	/**< @brief Whether block-size was given.  */
+  unsigned int load_addr_given ;	/**< @brief Whether load-addr was given.  */
+  unsigned int entry_given ;	/**< @brief Whether entry was given.  */
+  unsigned int layoutver_given ;	/**< @brief Whether layoutver was given.  */
+  unsigned int info1_given ;	/**< @brief Whether info1 was given.  */
+  unsigned int altinfo_given ;	/**< @brief Whether altinfo was given.  */
+  unsigned int info2_given ;	/**< @brief Whether info2 was given.  */
+  unsigned int root_first_given ;	/**< @brief Whether root-first was given.  */
+  unsigned int rsa_signature_given ;	/**< @brief Whether rsa-signature was given.  */
+  unsigned int second_image_flag_given ;	/**< @brief Whether second-image-flag was given.  */
+  unsigned int inactive_given ;	/**< @brief Whether inactive was given.  */
+  unsigned int reserved2_given ;	/**< @brief Whether reserved2 was given.  */
+  unsigned int kernel_file_has_header_given ;	/**< @brief Whether kernel-file-has-header was given.  */
+  unsigned int pad_given ;	/**< @brief Whether pad was given.  */
+
+} ;
+
+/** @brief The additional parameters to pass to parser functions */
+struct cmdline_parser_params
+{
+  int override; /**< @brief whether to override possibly already present options (default 0) */
+  int initialize; /**< @brief whether to initialize the option structure gengetopt_args_info (default 1) */
+  int check_required; /**< @brief whether to check that all required options were provided (default 1) */
+  int check_ambiguity; /**< @brief whether to check for options already specified in the option structure gengetopt_args_info (default 0) */
+  int print_errors; /**< @brief whether getopt_long should print an error message for a bad option (default 1) */
+} ;
+
+/** @brief the purpose string of the program */
+extern const char *gengetopt_args_info_purpose;
+/** @brief the usage string of the program */
+extern const char *gengetopt_args_info_usage;
+/** @brief all the lines making the help output */
+extern const char *gengetopt_args_info_help[];
+
+/**
+ * The command line parser
+ * @param argc the number of command line options
+ * @param argv the command line options
+ * @param args_info the structure where option information will be stored
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser (int argc, char **argv,
+  struct gengetopt_args_info *args_info);
+
+/**
+ * The command line parser (version with additional parameters - deprecated)
+ * @param argc the number of command line options
+ * @param argv the command line options
+ * @param args_info the structure where option information will be stored
+ * @param override whether to override possibly already present options
+ * @param initialize whether to initialize the option structure my_args_info
+ * @param check_required whether to check that all required options were provided
+ * @return 0 if everything went fine, NON 0 if an error took place
+ * @deprecated use cmdline_parser_ext() instead
+ */
+int cmdline_parser2 (int argc, char **argv,
+  struct gengetopt_args_info *args_info,
+  int override, int initialize, int check_required);
+
+/**
+ * The command line parser (version with additional parameters)
+ * @param argc the number of command line options
+ * @param argv the command line options
+ * @param args_info the structure where option information will be stored
+ * @param params additional parameters for the parser
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser_ext (int argc, char **argv,
+  struct gengetopt_args_info *args_info,
+  struct cmdline_parser_params *params);
+
+/**
+ * Save the contents of the option struct into an already open FILE stream.
+ * @param outfile the stream where to dump options
+ * @param args_info the option struct to dump
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser_dump(FILE *outfile,
+  struct gengetopt_args_info *args_info);
+
+/**
+ * Save the contents of the option struct into a (text) file.
+ * This file can be read by the config file parser (if generated by gengetopt)
+ * @param filename the file where to save
+ * @param args_info the option struct to save
+ * @return 0 if everything went fine, NON 0 if an error took place
+ */
+int cmdline_parser_file_save(const char *filename,
+  struct gengetopt_args_info *args_info);
+
+/**
+ * Print the help
+ */
+void cmdline_parser_print_help(void);
+/**
+ * Print the version
+ */
+void cmdline_parser_print_version(void);
+
+/**
+ * Initializes all the fields a cmdline_parser_params structure 
+ * to their default values
+ * @param params the structure to initialize
+ */
+void cmdline_parser_params_init(struct cmdline_parser_params *params);
+
+/**
+ * Allocates dynamically a cmdline_parser_params structure and initializes
+ * all its fields to their default values
+ * @return the created and initialized cmdline_parser_params structure
+ */
+struct cmdline_parser_params *cmdline_parser_params_create(void);
+
+/**
+ * Initializes the passed gengetopt_args_info structure's fields
+ * (also set default values for options that have a default)
+ * @param args_info the structure to initialize
+ */
+void cmdline_parser_init (struct gengetopt_args_info *args_info);
+/**
+ * Deallocates the string fields of the gengetopt_args_info structure
+ * (but does not deallocate the structure itself)
+ * @param args_info the structure to deallocate
+ */
+void cmdline_parser_free (struct gengetopt_args_info *args_info);
+
+/**
+ * Checks that all the required options were specified
+ * @param args_info the structure to check
+ * @param prog_name the name of the program that will be used to print
+ *   possible errors
+ * @return
+ */
+int cmdline_parser_required (struct gengetopt_args_info *args_info,
+  const char *prog_name);
+
+extern const char *cmdline_parser_second_image_flag_values[];  /**< @brief Possible values for second-image-flag. */
+extern const char *cmdline_parser_inactive_values[];  /**< @brief Possible values for inactive. */
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* IMAGETAG_CMDLINE_H */
diff --git a/trunk/tools/firmware-utils/src/lzma2eva.c b/trunk/tools/firmware-utils/src/lzma2eva.c
new file mode 100644
index 00000000..0bc13fa4
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/lzma2eva.c
@@ -0,0 +1,190 @@
+/*
+    lzma2eva - convert lzma-compressed file to AVM EVA bootloader format
+    Copyright (C) 2007  Enrik Berkhan <Enrik.Berkhan@inka.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+*/
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <zlib.h> /* crc32 */
+
+#define checksum_add32(csum, data) \
+  csum += ((uint8_t *)&data)[0]; \
+  csum += ((uint8_t *)&data)[1]; \
+  csum += ((uint8_t *)&data)[2]; \
+  csum += ((uint8_t *)&data)[3];
+
+void
+usage(void)
+{
+  fprintf(stderr, "usage: lzma2eva <loadadddr> <entry> <lzmafile> <evafile>\n");
+  exit(1);
+}
+
+void
+pexit(const char *msg)
+{
+  perror(msg);
+  exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+  const char *infile, *outfile;
+  FILE *in, *out;
+  static const uint8_t buf[4096];
+  size_t elems;
+
+  uint8_t properties;
+  uint32_t dictsize;
+  uint64_t datasize;
+
+  uint32_t magic = 0xfeed1281L;
+  uint32_t reclength = 0;
+  fpos_t reclengthpos;
+  uint32_t loadaddress = 0;
+  uint32_t type = 0x075a0201L; /* might be 7Z 2.1? */
+  uint32_t checksum = 0;
+
+  uint32_t compsize = 0;
+  fpos_t compsizepos;
+  uint32_t datasize32 = 0;
+  uint32_t datacrc32 = crc32(0, 0, 0);
+
+  uint32_t zero = 0;
+  uint32_t entry = 0;
+
+  if (argc != 5)
+    usage();
+
+  /* "parse" command line */
+  loadaddress = strtoul(argv[1], 0, 0);
+  entry = strtoul(argv[2], 0, 0);
+  infile = argv[3];
+  outfile = argv[4];
+
+  in = fopen(infile, "rb");
+  if (!in)
+    pexit("fopen");
+  out = fopen(outfile, "w+b");
+  if (!out)
+    pexit("fopen");
+
+  /* read LZMA header */
+  if (1 != fread(&properties, sizeof properties, 1, in))
+    pexit("fread");
+  if (1 != fread(&dictsize, sizeof dictsize, 1, in))
+    pexit("fread");
+  if (1 != fread(&datasize, sizeof datasize, 1, in))
+    pexit("fread");
+
+  /* write EVA header */
+  if (1 != fwrite(&magic, sizeof magic, 1, out))
+    pexit("fwrite");
+  if (fgetpos(out, &reclengthpos))
+    pexit("fgetpos");
+  if (1 != fwrite(&reclength, sizeof reclength, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&loadaddress, sizeof loadaddress, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&type, sizeof type, 1, out))
+    pexit("fwrite");
+
+  /* write EVA LZMA header */
+  if (fgetpos(out, &compsizepos))
+    pexit("fgetpos");
+  if (1 != fwrite(&compsize, sizeof compsize, 1, out))
+    pexit("fwrite");
+  /* XXX check length */
+  datasize32 = (uint32_t)datasize;
+  if (1 != fwrite(&datasize32, sizeof datasize32, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&datacrc32, sizeof datacrc32, 1, out))
+    pexit("fwrite");
+
+  /* write modified LZMA header */
+  if (1 != fwrite(&properties, sizeof properties, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&dictsize, sizeof dictsize, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&zero, 3, 1, out))
+    pexit("fwrite");
+
+  /* copy compressed data, calculate crc32 */
+  while (0 < (elems = fread(&buf, sizeof buf[0], sizeof buf, in))) {
+    compsize += elems;
+    if (elems != fwrite(&buf, sizeof buf[0], elems, out))
+      pexit("fwrite");
+    datacrc32 = crc32(datacrc32, buf, elems);
+  }
+  if (ferror(in))
+    pexit("fread");
+  fclose(in);
+
+  /* re-write record length */
+  reclength = compsize + 24;
+  if (fsetpos(out, &reclengthpos))
+    pexit("fsetpos");
+  if (1 != fwrite(&reclength, sizeof reclength, 1, out))
+    pexit("fwrite");
+
+  /* re-write EVA LZMA header including size and data crc */
+  if (fsetpos(out, &compsizepos))
+    pexit("fsetpos");
+  if (1 != fwrite(&compsize, sizeof compsize, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&datasize32, sizeof datasize32, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&datacrc32, sizeof datacrc32, 1, out))
+    pexit("fwrite");
+
+  /* calculate record checksum */
+  checksum += reclength;
+  checksum += loadaddress;
+  checksum_add32(checksum, type);
+  checksum_add32(checksum, compsize);
+  checksum_add32(checksum, datasize32);
+  checksum_add32(checksum, datacrc32);
+  if (fseek(out, 0, SEEK_CUR))
+    pexit("fseek");
+  while (0 < (elems = fread(&buf, sizeof buf[0], sizeof buf, out))) {
+    size_t i;
+    for (i = 0; i < elems; ++i)
+      checksum += buf[i];
+  }
+  if (ferror(out))
+    pexit("fread");
+  if (fseek(out, 0, SEEK_CUR))
+    pexit("fseek");
+
+  checksum = ~checksum + 1;
+  if (1 != fwrite(&checksum, sizeof checksum, 1, out))
+    pexit("fwrite");
+
+  /* write entry record */
+  if (1 != fwrite(&zero, sizeof zero, 1, out))
+    pexit("fwrite");
+  if (1 != fwrite(&entry, sizeof entry, 1, out))
+    pexit("fwrite");
+
+  if (fclose(out))
+    pexit("fclose");
+
+  return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/makeamitbin.c b/trunk/tools/firmware-utils/src/makeamitbin.c
new file mode 100644
index 00000000..5c334424
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/makeamitbin.c
@@ -0,0 +1,316 @@
+/*
+ *  makeamitbin - create firmware binaries for MGB100
+ *
+ *  Copyright (C) 2007 Volker Weiss     <dev@tintuc.de>
+ *                     Christian Welzel <dev@welzel-online.ch>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+
+/* defaults: Level One WAP-0007 */
+static char *ascii1 = "DDC_RUS001";
+static char *ascii2 = "Queen";
+
+static struct hdrinfo {
+  char *name;
+	unsigned long unknown; /* can probably be any number, maybe version number */
+	int topalign;
+	unsigned int addr;
+	unsigned int size;
+} hdrinfo[] = {
+	{ "bios", 0xc76be111, 1, 0x3fa000, 0x006000 },        /* BIOS */
+	{ "recovery", 0xc76be222, 0, 0x3f0000, 0x004000 },    /* Recovery Loader */
+	{ "linux", 0xc76bee9d, 0, 0x000000, 0x100000 },       /* Linux */
+	{ "ramdisk", 0xc76bee9d, 0, 0x100000, 0x280000 },     /* ramdisk */
+	{ "amitconfig", 0xc76bee8b, 0, 0x380000, 0x060000 },  /* AMIT config */
+	{ "redboot", 0x00000000, 1, 0x3d0000, 0x030000 },     /* Redboot 128kB image */
+	{ "redbootlow", 0, 0, 0x3e0000, 0x18000 },            /* Redboot 1. part */
+	{ "redboothigh", 0, 0, 0x3fa000, 0x6000 },            /* Redboot 2. part */
+	{ "linux3g", 0xcb5f06b5, 0, 0x000000, 0x100000 },       /* Linux */
+	{ "ramdisk3g", 0xcb5f06b5, 0, 0x100000, 0x280000 },     /* ramdisk */
+	{ NULL }
+};
+
+/*
+CHD2WLANU_R400b7
+
+11e1 6bc7
+22e2 6bc7
+5dc3 47c8
+5cc3 47c8
+21c3 47c8
+*/
+
+/*
+20060106_DDC_WAP-0007_R400b4
+
+11e1 6bc7
+22e2 6bc7
+9dee 6bc7
+9dee 6bc7
+8bee 6bc7
+*/
+
+/*
+WMU-6000FS_R400b6
+
+11e1 6bc7
+22e2 6bc7
+6d2d 0fc8
+6c2d 0fc8
+542d 0fc8
+*/
+
+/*
+WAP-0007(R4.00b8)_2006-10-02
+
+9979 5fc8
+22e2 6bc7
+c46e cec8
+c36e cec8
+a76e cec8
+*/
+
+
+
+#define HDRSIZE              80
+
+#define COPY_SHORT(d, o, v)  d[o+0] = (unsigned char)((v) & 0xff); \
+                             d[o+1] = (unsigned char)(((v) >> 8) & 0xff)
+#define COPY_LONG(d, o, v)   d[o+0] = (unsigned char)((v) & 0xff); \
+                             d[o+1] = (unsigned char)(((v) >> 8) & 0xff); \
+													   d[o+2] = (unsigned char)(((v) >> 16) & 0xff); \
+													   d[o+3] = (unsigned char)(((v) >> 24) & 0xff)
+#define READ_SHORT(d, o)     ((unsigned short)(d[o+0]) + \
+                             (((unsigned short)(d[o+1])) << 8))
+
+/*
+00..0d ASCII product ID
+0e..0f checksum of payload
+10..1b ASCII Queen
+1c..1f AMIT BIOS: 11e1 6bc7, Recovery Tool: 22e2 6bc7
+       Linux: 5dc3 47c8, ramdisk: 5cc3 47c8
+			 AMIT FS: 21c3 47c8    VERSION NUMBER??????
+20..23 offset in flash aligned to segment boundary
+24..27 length in flash aligned to segment boundary
+28..2b offset in flash (payload)
+2c..2f length (payload)
+30..3f always 0
+40..47 always 4248 0101 5000 0001 (last maybe .....0501)
+48..4b same as 20..23
+4c..4d always 0b00
+4e..4f inverted checksum of header
+*/
+
+unsigned short checksum(unsigned char *data, long size)
+{
+	long n;
+	unsigned short d, cs = 0;
+	for (n = 0; n < size; n += 2)
+	{
+		d = READ_SHORT(data, n);
+		cs += d;
+		if (cs < d)
+			cs++;
+	}
+	if (size & 1)
+	{
+		d = data[n];
+		cs += d;
+		if (cs < d)
+			cs++;
+	}
+	return cs;
+}
+
+void showhdr(unsigned char *hdr)
+{
+	int i, j;
+	for (j = 0; j < 5; j++)
+	{
+		for (i = 0; i < 16; i++)
+		{
+			printf("%02x ", (unsigned int)(hdr[j * 16 + i]));
+		}
+		printf("   ");
+		for (i = 0; i < 16; i++)
+		{
+			unsigned char d = hdr[j * 16 + i];
+			printf("%c", (d >= ' ' && d < 127) ? d : '.');
+		}
+		printf("\n");
+	}
+}
+
+void makehdr(unsigned char *hdr, struct hdrinfo *info,
+             unsigned char *data, long size, int last)
+{
+	unsigned int offset = info->addr + 0x10;
+	memset(hdr, 0, HDRSIZE);
+	if (info->topalign)
+		offset = info->addr + info->size - size;	/* top align */
+	strncpy((char *)hdr + 0x00, ascii1, 14);
+	strncpy((char *)hdr + 0x10, ascii2, 12);
+	COPY_LONG(hdr, 0x1c, info->unknown);
+	COPY_LONG(hdr, 0x20, info->addr);
+	COPY_LONG(hdr, 0x24, info->size);
+	COPY_LONG(hdr, 0x28, offset);
+	COPY_LONG(hdr, 0x2c, size);
+	COPY_LONG(hdr, 0x40, 0x01014842);
+	COPY_LONG(hdr, 0x44, last ? 0x01050050 : 0x01000050);
+	COPY_LONG(hdr, 0x48, info->addr);
+	COPY_SHORT(hdr, 0x4c, info->unknown == 0xcb5f06b5 ? 0x0016 : 0x000b);
+	COPY_SHORT(hdr, 0x0e, checksum(data, size));
+	COPY_SHORT(hdr, 0x4e, ~checksum(hdr, HDRSIZE));
+}
+
+unsigned char *read_file(const char *name, long *size)
+{
+	FILE *f;
+	unsigned char *data = NULL;
+	*size = 0;
+	f = fopen(name, "r");
+	if (f != NULL)
+	{
+		if (fseek(f, 0, SEEK_END) == 0)
+		{
+	    *size = ftell(f);
+			if (*size != -1)
+			{
+				if (fseek(f, 0, SEEK_SET) == 0)
+				{
+					data = (unsigned char *)malloc(*size);
+					if (data != NULL)
+					{
+						if (fread(data, sizeof(char), *size, f) != *size)
+						{
+							free(data);
+							data = NULL;
+						}
+					}
+				}
+			}
+		}
+		fclose(f);
+	}
+	return data;
+}
+
+struct hdrinfo *find_hdrinfo(const char *name)
+{
+	int n;
+	for (n = 0; hdrinfo[n].name != NULL; n++)
+	{
+		if (strcmp(name, hdrinfo[n].name) == 0)
+			return &hdrinfo[n];
+	}
+	return NULL;
+}
+
+void oferror(FILE *f)
+{
+	printf("file error\n");
+	exit(2);
+}
+
+void showhelp(void)
+{
+	printf("Syntax: makeamitbin [options]\n");
+	printf("Options:\n");
+	printf("  -1 ID1\tFirmware identifier 1, e.g. 'DDC_RUS001' for manufacturer LevelOne\n");
+	printf("  -2 ID2\tFirmware identifier 2, 'Queen' in all known cases\n");
+	printf("  -o FILE\tOutput file\n");
+	printf("  -ids\t\tShow a list of known firmware identifiers.\n");
+	exit(1);
+}
+
+void show_fwids(void)
+{
+	printf("List of known firmware identifiers:\n");
+	printf("Manufacturer\t\tProduct\t\tIdentifier\n");
+	printf("=====================================================\n");
+	printf("Conceptronic\t\tCHD2WLANU\tLLM_RUS001\n");
+	printf("Pearl\t\t\tPE6643\t\tQueen\n");
+	printf("Micronica\t\tMGB100\t\tQueen\n");
+	printf("LevelOne\t\tWAP-0007\tDDC_RUS001\n");
+	printf("SMC\t\t\tWAPS-G\t\tSMC_RUS001\n");
+	printf("OvisLink (AirLive)\tWMU-6\t\tOVS_RUS001\n");
+	printf("SafeCom SWSAPUR-5\tFMW\t\tSafeco_RPS001\n");
+	exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+	unsigned char hdr[HDRSIZE];
+	unsigned char *data;
+	FILE *of;
+	char *outfile = NULL;
+	char *type;
+	struct hdrinfo *info;
+	long size;
+	int last = 0;
+	int n;
+	for (n = 1; n < argc; n++)
+	{
+		if (strcmp(argv[n], "-1") == 0)
+			ascii1 = argv[n+1];
+		if (strcmp(argv[n], "-2") == 0)
+			ascii2 = argv[n+1];
+		if (strcmp(argv[n], "-o") == 0)
+			outfile = argv[n+1];
+		if (strcmp(argv[n], "-ids") == 0)
+			show_fwids();
+	}
+	if (ascii1 == NULL || ascii2 == NULL || outfile == NULL)
+		showhelp();
+	of = fopen(outfile, "w");
+	if (of == NULL)
+		oferror(of);
+	for (n = 1; n < argc; n++)
+	{
+		if (strncmp(argv[n], "-", 1) != 0)
+		{
+			type = argv[n++];
+			if (n >= argc)
+				showhelp();
+			last = ((n + 1) >= argc);		/* dirty, options first! */
+			info = find_hdrinfo(type);
+			if (info == NULL)
+				showhelp();
+			data = read_file(argv[n], &size);
+			if (data == NULL)
+				showhelp();
+			makehdr(hdr, info, data, size, last);
+			/* showhdr(hdr); */
+			if (fwrite(hdr, HDRSIZE, 1, of) != 1)
+				oferror(of);
+			if (fwrite(data, size, 1, of) != 1)
+				oferror(of);
+			free(data);
+		}
+		else
+			n++;
+	}
+	if (fclose(of) != 0)
+		oferror(NULL);
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/md5.c b/trunk/tools/firmware-utils/src/md5.c
new file mode 100644
index 00000000..20397603
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/md5.c
@@ -0,0 +1,307 @@
+
+
+/*
+ ***********************************************************************
+ ** md5.c -- the source code for MD5 routines                         **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 1/91 SRD,AJ,BSK,JT Reference C ver., 7/10 constant corr. **
+ ***********************************************************************
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#include <string.h>
+#include "md5.h"
+
+/*
+ ***********************************************************************
+ **  Message-digest routines:                                         **
+ **  To form the message digest for a message M                       **
+ **    (1) Initialize a context buffer mdContext using MD5_Init       **
+ **    (2) Call MD5_Update on mdContext and M                         **
+ **    (3) Call MD5_Final on mdContext                                **
+ **  The message digest is now in mdContext->digest[0...15]           **
+ ***********************************************************************
+ */
+
+/* forward declaration */
+static void Transform ();
+
+static unsigned char PADDING[64] = {
+  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/* F, G, H and I are basic MD5 functions */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
+/* Rotation is separate from addition to prevent recomputation */
+#define FF(a, b, c, d, x, s, ac) \
+  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) \
+  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) \
+  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) \
+  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+
+#ifdef __STDC__
+#define UL(x)	x##U
+#else
+#define UL(x)	x
+#endif
+
+/* The routine MD5_Init initializes the message-digest context
+   mdContext. All fields are set to zero.
+ */
+void MD5_Init (mdContext)
+MD5_CTX *mdContext;
+{
+  mdContext->i[0] = mdContext->i[1] = (UINT4)0;
+
+  /* Load magic initialization constants.
+   */
+  mdContext->buf[0] = (UINT4)0x67452301;
+  mdContext->buf[1] = (UINT4)0xefcdab89;
+  mdContext->buf[2] = (UINT4)0x98badcfe;
+  mdContext->buf[3] = (UINT4)0x10325476;
+}
+
+/* The routine MD5Update updates the message-digest context to
+   account for the presence of each of the characters inBuf[0..inLen-1]
+   in the message whose digest is being computed.
+ */
+void MD5_Update (mdContext, inBuf, inLen)
+MD5_CTX *mdContext;
+unsigned char *inBuf;
+unsigned int inLen;
+{
+  UINT4 in[16];
+  int mdi;
+  unsigned int i, ii;
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* update number of bits */
+  if ((mdContext->i[0] + ((UINT4)inLen << 3)) < mdContext->i[0])
+    mdContext->i[1]++;
+  mdContext->i[0] += ((UINT4)inLen << 3);
+  mdContext->i[1] += ((UINT4)inLen >> 29);
+
+  while (inLen--) {
+    /* add new character to buffer, increment mdi */
+    mdContext->in[mdi++] = *inBuf++;
+
+    /* transform if necessary */
+    if (mdi == 0x40) {
+      for (i = 0, ii = 0; i < 16; i++, ii += 4)
+        in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+                (((UINT4)mdContext->in[ii+2]) << 16) |
+                (((UINT4)mdContext->in[ii+1]) << 8) |
+                ((UINT4)mdContext->in[ii]);
+      Transform (mdContext->buf, in);
+      mdi = 0;
+    }
+  }
+}
+
+/* The routine MD5Final terminates the message-digest computation and
+   ends with the desired message digest in mdContext->digest[0...15].
+ */
+void MD5_Final (hash, mdContext)
+unsigned char hash[];
+MD5_CTX *mdContext;
+{
+  UINT4 in[16];
+  int mdi;
+  unsigned int i, ii;
+  unsigned int padLen;
+
+  /* save number of bits */
+  in[14] = mdContext->i[0];
+  in[15] = mdContext->i[1];
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* pad out to 56 mod 64 */
+  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
+  MD5_Update (mdContext, PADDING, padLen);
+
+  /* append length in bits and transform */
+  for (i = 0, ii = 0; i < 14; i++, ii += 4)
+    in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+            (((UINT4)mdContext->in[ii+2]) << 16) |
+            (((UINT4)mdContext->in[ii+1]) << 8) |
+            ((UINT4)mdContext->in[ii]);
+  Transform (mdContext->buf, in);
+
+  /* store buffer in digest */
+  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
+    mdContext->digest[ii] = (unsigned char)(mdContext->buf[i] & 0xFF);
+    mdContext->digest[ii+1] =
+      (unsigned char)((mdContext->buf[i] >> 8) & 0xFF);
+    mdContext->digest[ii+2] =
+      (unsigned char)((mdContext->buf[i] >> 16) & 0xFF);
+    mdContext->digest[ii+3] =
+      (unsigned char)((mdContext->buf[i] >> 24) & 0xFF);
+  }
+  memcpy(hash, mdContext->digest, 16);
+}
+
+/* Basic MD5 step. Transforms buf based on in.
+ */
+static void Transform (buf, in)
+UINT4 *buf;
+UINT4 *in;
+{
+  UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+  /* Round 1 */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+  FF ( a, b, c, d, in[ 0], S11, UL(3614090360)); /* 1 */
+  FF ( d, a, b, c, in[ 1], S12, UL(3905402710)); /* 2 */
+  FF ( c, d, a, b, in[ 2], S13, UL( 606105819)); /* 3 */
+  FF ( b, c, d, a, in[ 3], S14, UL(3250441966)); /* 4 */
+  FF ( a, b, c, d, in[ 4], S11, UL(4118548399)); /* 5 */
+  FF ( d, a, b, c, in[ 5], S12, UL(1200080426)); /* 6 */
+  FF ( c, d, a, b, in[ 6], S13, UL(2821735955)); /* 7 */
+  FF ( b, c, d, a, in[ 7], S14, UL(4249261313)); /* 8 */
+  FF ( a, b, c, d, in[ 8], S11, UL(1770035416)); /* 9 */
+  FF ( d, a, b, c, in[ 9], S12, UL(2336552879)); /* 10 */
+  FF ( c, d, a, b, in[10], S13, UL(4294925233)); /* 11 */
+  FF ( b, c, d, a, in[11], S14, UL(2304563134)); /* 12 */
+  FF ( a, b, c, d, in[12], S11, UL(1804603682)); /* 13 */
+  FF ( d, a, b, c, in[13], S12, UL(4254626195)); /* 14 */
+  FF ( c, d, a, b, in[14], S13, UL(2792965006)); /* 15 */
+  FF ( b, c, d, a, in[15], S14, UL(1236535329)); /* 16 */
+
+  /* Round 2 */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+  GG ( a, b, c, d, in[ 1], S21, UL(4129170786)); /* 17 */
+  GG ( d, a, b, c, in[ 6], S22, UL(3225465664)); /* 18 */
+  GG ( c, d, a, b, in[11], S23, UL( 643717713)); /* 19 */
+  GG ( b, c, d, a, in[ 0], S24, UL(3921069994)); /* 20 */
+  GG ( a, b, c, d, in[ 5], S21, UL(3593408605)); /* 21 */
+  GG ( d, a, b, c, in[10], S22, UL(  38016083)); /* 22 */
+  GG ( c, d, a, b, in[15], S23, UL(3634488961)); /* 23 */
+  GG ( b, c, d, a, in[ 4], S24, UL(3889429448)); /* 24 */
+  GG ( a, b, c, d, in[ 9], S21, UL( 568446438)); /* 25 */
+  GG ( d, a, b, c, in[14], S22, UL(3275163606)); /* 26 */
+  GG ( c, d, a, b, in[ 3], S23, UL(4107603335)); /* 27 */
+  GG ( b, c, d, a, in[ 8], S24, UL(1163531501)); /* 28 */
+  GG ( a, b, c, d, in[13], S21, UL(2850285829)); /* 29 */
+  GG ( d, a, b, c, in[ 2], S22, UL(4243563512)); /* 30 */
+  GG ( c, d, a, b, in[ 7], S23, UL(1735328473)); /* 31 */
+  GG ( b, c, d, a, in[12], S24, UL(2368359562)); /* 32 */
+
+  /* Round 3 */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+  HH ( a, b, c, d, in[ 5], S31, UL(4294588738)); /* 33 */
+  HH ( d, a, b, c, in[ 8], S32, UL(2272392833)); /* 34 */
+  HH ( c, d, a, b, in[11], S33, UL(1839030562)); /* 35 */
+  HH ( b, c, d, a, in[14], S34, UL(4259657740)); /* 36 */
+  HH ( a, b, c, d, in[ 1], S31, UL(2763975236)); /* 37 */
+  HH ( d, a, b, c, in[ 4], S32, UL(1272893353)); /* 38 */
+  HH ( c, d, a, b, in[ 7], S33, UL(4139469664)); /* 39 */
+  HH ( b, c, d, a, in[10], S34, UL(3200236656)); /* 40 */
+  HH ( a, b, c, d, in[13], S31, UL( 681279174)); /* 41 */
+  HH ( d, a, b, c, in[ 0], S32, UL(3936430074)); /* 42 */
+  HH ( c, d, a, b, in[ 3], S33, UL(3572445317)); /* 43 */
+  HH ( b, c, d, a, in[ 6], S34, UL(  76029189)); /* 44 */
+  HH ( a, b, c, d, in[ 9], S31, UL(3654602809)); /* 45 */
+  HH ( d, a, b, c, in[12], S32, UL(3873151461)); /* 46 */
+  HH ( c, d, a, b, in[15], S33, UL( 530742520)); /* 47 */
+  HH ( b, c, d, a, in[ 2], S34, UL(3299628645)); /* 48 */
+
+  /* Round 4 */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+  II ( a, b, c, d, in[ 0], S41, UL(4096336452)); /* 49 */
+  II ( d, a, b, c, in[ 7], S42, UL(1126891415)); /* 50 */
+  II ( c, d, a, b, in[14], S43, UL(2878612391)); /* 51 */
+  II ( b, c, d, a, in[ 5], S44, UL(4237533241)); /* 52 */
+  II ( a, b, c, d, in[12], S41, UL(1700485571)); /* 53 */
+  II ( d, a, b, c, in[ 3], S42, UL(2399980690)); /* 54 */
+  II ( c, d, a, b, in[10], S43, UL(4293915773)); /* 55 */
+  II ( b, c, d, a, in[ 1], S44, UL(2240044497)); /* 56 */
+  II ( a, b, c, d, in[ 8], S41, UL(1873313359)); /* 57 */
+  II ( d, a, b, c, in[15], S42, UL(4264355552)); /* 58 */
+  II ( c, d, a, b, in[ 6], S43, UL(2734768916)); /* 59 */
+  II ( b, c, d, a, in[13], S44, UL(1309151649)); /* 60 */
+  II ( a, b, c, d, in[ 4], S41, UL(4149444226)); /* 61 */
+  II ( d, a, b, c, in[11], S42, UL(3174756917)); /* 62 */
+  II ( c, d, a, b, in[ 2], S43, UL( 718787259)); /* 63 */
+  II ( b, c, d, a, in[ 9], S44, UL(3951481745)); /* 64 */
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
+
+/*
+ ***********************************************************************
+ ** End of md5.c                                                      **
+ ******************************** (cut) ********************************
+ */
diff --git a/trunk/tools/firmware-utils/src/md5.h b/trunk/tools/firmware-utils/src/md5.h
new file mode 100644
index 00000000..f7a0c964
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/md5.h
@@ -0,0 +1,65 @@
+/*
+ ***********************************************************************
+ ** md5.h -- header file for implementation of MD5                    **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
+ ** Revised (for MD5): RLR 4/27/91                                    **
+ **   -- G modified to have y&~z instead of y&z                       **
+ **   -- FF, GG, HH modified to add in last register done             **
+ **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
+ **   -- distinct additive constant for each step                     **
+ **   -- round 4 added, working mod 7                                 **
+ ***********************************************************************
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#ifndef __MD5_INCLUDE__
+
+/* typedef a 32-bit type */
+#ifdef _LP64
+typedef unsigned int UINT4;
+typedef int          INT4;
+#else
+typedef unsigned long UINT4;
+typedef long          INT4;
+#endif
+#define _UINT4_T
+
+/* Data structure for MD5 (Message-Digest) computation */
+typedef struct {
+  UINT4 i[2];                   /* number of _bits_ handled mod 2^64 */
+  UINT4 buf[4];                                    /* scratch buffer */
+  unsigned char in[64];                              /* input buffer */
+  unsigned char digest[16];     /* actual digest after MD5Final call */
+} MD5_CTX;
+
+void MD5_Init ();
+void MD5_Update ();
+void MD5_Final ();
+
+#define __MD5_INCLUDE__
+#endif /* __MD5_INCLUDE__ */
diff --git a/trunk/tools/firmware-utils/src/mkbrncmdline.c b/trunk/tools/firmware-utils/src/mkbrncmdline.c
new file mode 100644
index 00000000..6eb4bfe7
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkbrncmdline.c
@@ -0,0 +1,168 @@
+/*
+ * mkbrncmdline.c - partially based on OpenWrt's wndr3700.c
+ *
+ * Copyright (C) 2011 Tobias Diedrich <ranma+openwrt@tdiedrich.de>
+ *
+ * This program is free software; you can redistribute 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 that 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 <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <inttypes.h>
+
+static void usage(const char *) __attribute__ (( __noreturn__ ));
+
+static void usage(const char *mess)
+{
+	fprintf(stderr, "Error: %s\n", mess);
+	fprintf(stderr, "Usage: mkbrncmdline -i input_file -o output_file [-a loadaddress] arg1 [argx ...]\n");
+	fprintf(stderr, "\n");
+	exit(1);
+}
+
+static char *input_file = NULL;
+static char *output_file = NULL;
+static unsigned loadaddr = 0x80002000;
+
+static void parseopts(int *argc, char ***argv)
+{
+	char *endptr;
+	int res;
+
+	while ((res = getopt(*argc, *argv, "a:i:o:")) != -1) {
+		switch (res) {
+		default:
+			usage("Unknown option");
+			break;
+		case 'a':
+			loadaddr = strtoul(optarg, &endptr, 0);
+			if (endptr == optarg || *endptr != 0)
+				usage("loadaddress must be a decimal or hexadecimal 32-bit value");
+			break;
+		case 'i':
+			input_file = optarg;
+			break;
+		case 'o':
+			output_file = optarg;
+			break;
+		}
+	}
+	*argc -= optind;
+	*argv += optind;
+}
+
+static void emitload(int outfd, int reg, unsigned value)
+{
+	char buf[8] = {
+		0x3c, 0x04 + reg,
+		value >> 24, value >> 16,
+		0x34, 0x84 + reg + (reg << 5),
+		value >> 8, value,
+	};
+	if (write(outfd, buf, sizeof(buf)) != sizeof(buf)) {
+		fprintf(stderr, "write: %s\n", strerror(errno));
+		exit(1);
+	}
+}
+
+int main(int argc, char **argv)
+{
+	int outfd;
+	int i;
+	int fd;
+	size_t len, skip, buf_len;
+	unsigned cmdline_addr;
+	unsigned s_ofs;
+	char *buf;
+
+	parseopts(&argc, &argv);
+
+	if (argc < 1)
+		usage("must specify at least one kernel cmdline argument");
+
+	if (input_file == NULL || output_file == NULL)
+		usage("must specify input and output file");
+
+	if ((outfd = open(output_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1)
+	{
+		fprintf(stderr, "Error opening '%s' for writing: %s\n", output_file, strerror(errno));
+		exit(1);
+	}
+
+	// mmap input_file
+	if ((fd = open(input_file, O_RDONLY))  < 0
+	|| (len = lseek(fd, 0, SEEK_END)) < 0
+	|| (input_file = mmap(0, len, PROT_READ, MAP_SHARED, fd, 0)) == (void *) (-1)
+	|| close(fd) < 0)
+	{
+		fprintf(stderr, "Error mapping file '%s': %s\n", input_file, strerror(errno));
+		exit(1);
+	}
+
+	cmdline_addr = loadaddr + len;
+
+	// Kernel args are passed in registers a0,a1,a2 and a3
+	emitload(outfd, 0, 0);              /* a0 = 0 */
+	emitload(outfd, 1, 0);              /* a1 = 0 */
+	emitload(outfd, 2, cmdline_addr);   /* a2 = &cmdline */
+	emitload(outfd, 3, 0);              /* a3 = 0 */
+	skip = lseek(outfd, 0, SEEK_END);
+
+	// write the kernel
+	if (write(outfd, input_file + skip, len - skip) != len -skip) {
+		fprintf(stderr, "write: %s\n", strerror(errno));
+		exit(1);
+	}
+
+	// write cmdline structure
+	buf_len = (argc + 1) * 4;
+	for (i=0; i<argc; i++) {
+		buf_len += strlen(argv[i]) + 1;
+	}
+	buf = malloc(buf_len + 16);
+	if (!buf) {
+		fprintf(stderr, "Could not allocate memory for cmdline buffer\n");
+		exit(1);
+	}
+	memset(buf, 0, buf_len);
+
+	s_ofs = 4 * (argc + 1);
+	for (i=0; i<argc; i++) {
+		unsigned s_ptr = cmdline_addr + s_ofs;
+		buf[i * 4 + 0] = s_ptr >> 24;
+		buf[i * 4 + 1] = s_ptr >> 16;
+		buf[i * 4 + 2] = s_ptr >>  8;
+		buf[i * 4 + 3] = s_ptr >>  0;
+		memcpy(&buf[s_ofs], argv[i], strlen(argv[i]));
+		s_ofs += strlen(argv[i]) + 1;
+	}
+	if (write(outfd, buf, buf_len) != buf_len) {
+		fprintf(stderr, "write: %s\n", strerror(errno));
+		exit(1);
+	}
+
+
+	munmap(input_file, len);
+	close(outfd);
+	free(buf);
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/mkbrnimg.c b/trunk/tools/firmware-utils/src/mkbrnimg.c
new file mode 100644
index 00000000..fff92c4e
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkbrnimg.c
@@ -0,0 +1,183 @@
+/*
+ * mkbrnimg.c - partially based on OpenWrt's wndr3700.c
+ *
+ * Copyright (C) 2011 Tobias Diedrich <ranma+openwrt@tdiedrich.de>
+ *
+ * This program is free software; you can redistribute 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 that 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 <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <inttypes.h>
+
+#define BPB 8 /* bits/byte */
+
+static uint32_t crc32[1<<BPB];
+
+static void init_crc32()
+{
+	const uint32_t poly = ntohl(0x2083b8ed);
+	int n;
+
+	for (n = 0; n < 1<<BPB; n++) {
+		uint32_t crc = n;
+		int bit;
+
+		for (bit = 0; bit < BPB; bit++)
+			crc = (crc & 1) ? (poly ^ (crc >> 1)) : (crc >> 1);
+		crc32[n] = crc;
+	}
+}
+
+static uint32_t crc32buf(unsigned char *buf, size_t len)
+{
+	uint32_t crc = 0xFFFFFFFF;
+
+	for (; len; len--, buf++)
+		crc = crc32[(uint8_t)crc ^ *buf] ^ (crc >> BPB);
+	return ~crc;
+}
+
+static void usage(const char *) __attribute__ (( __noreturn__ ));
+
+static void usage(const char *mess)
+{
+	fprintf(stderr, "Error: %s\n", mess);
+	fprintf(stderr, "Usage: mkbrnimg [-o output_file] [-m magic] [-s signature] kernel_file [additional files]\n");
+	fprintf(stderr, "\n");
+	exit(1);
+}
+
+static char *output_file = "default-brnImage";
+static uint32_t magic = 0x12345678;
+static char *signature = "BRNDTW502";
+
+static void parseopts(int *argc, char ***argv)
+{
+	char *endptr;
+	int res;
+
+	while ((res = getopt(*argc, *argv, "o:m:s:")) != -1) {
+		switch (res) {
+		default:
+			usage("Unknown option");
+			break;
+		case 'o':
+			output_file = optarg;
+			break;
+		case 'm':
+			magic = strtoul(optarg, &endptr, 0);
+			if (endptr == optarg || *endptr != 0)
+				usage("magic must be a decimal or hexadecimal 32-bit value");
+			break;
+		case 's':
+			signature = optarg;
+			break;
+		}
+	}
+	*argc -= optind;
+	*argv += optind;
+}
+
+static void appendfile(int outfd, char *path, int kernel) {
+	int fd;
+	size_t len, padded_len;
+	char *input_file;
+	uint32_t crc;
+	char padding[0x400];
+	char footer[12];
+
+	memset(padding, 0xff, sizeof(padding));
+
+	// mmap input_file
+	if ((fd = open(path, O_RDONLY))  < 0
+	|| (len = lseek(fd, 0, SEEK_END)) < 0
+	|| (input_file = mmap(0, len, PROT_READ, MAP_SHARED, fd, 0)) == (void *) (-1)
+	|| close(fd) < 0)
+	{
+		fprintf(stderr, "Error mapping file '%s': %s\n", path, strerror(errno));
+		exit(1);
+	}
+
+	// kernel should be lzma compressed image, not uImage
+	if (kernel &&
+	    (input_file[0] != (char)0x5d ||
+	     input_file[1] != (char)0x00 ||
+	     input_file[2] != (char)0x00 ||
+	     input_file[3] != (char)0x80)) {
+		fprintf(stderr, "lzma signature not found on kernel image.\n");
+		exit(1);
+	}
+
+	init_crc32();
+	crc = crc32buf(input_file, len);
+	fprintf(stderr, "crc32 for '%s' is %08x.\n", path, crc);
+
+	// write the file
+	write(outfd, input_file, len);
+
+	// write padding
+	padded_len = ((len + sizeof(footer) + sizeof(padding) - 1) & ~(sizeof(padding) - 1)) - sizeof(footer);
+	fprintf(stderr, "len=%08x padded_len=%08x\n", len, padded_len);
+	write(outfd, padding, padded_len - len);
+
+	// write footer
+	footer[0]  = (len   >>  0) & 0xff;
+	footer[1]  = (len   >>  8) & 0xff;
+	footer[2]  = (len   >> 16) & 0xff;
+	footer[3]  = (len   >> 24) & 0xff;
+	footer[4]  = (magic >>  0) & 0xff;
+	footer[5]  = (magic >>  8) & 0xff;
+	footer[6]  = (magic >> 16) & 0xff;
+	footer[7]  = (magic >> 24) & 0xff;
+	footer[8]  = (crc   >>  0) & 0xff;
+	footer[9]  = (crc   >>  8) & 0xff;
+	footer[10] = (crc   >> 16) & 0xff;
+	footer[11] = (crc   >> 24) & 0xff;
+	write(outfd, footer, sizeof(footer));
+
+	munmap(input_file, len);
+}
+
+int main(int argc, char **argv)
+{
+	int outfd;
+	int i;
+
+	parseopts(&argc, &argv);
+
+	if (argc < 1)
+		usage("wrong number of arguments");
+
+	if ((outfd = open(output_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1)
+	{
+		fprintf(stderr, "Error opening '%s' for writing: %s\n", output_file, strerror(errno));
+		exit(1);
+	}
+
+	for (i=0; i<argc; i++) {
+		appendfile(outfd, argv[i], i == 0);
+	}
+	write(outfd, signature, strlen(signature)+1);
+	close(outfd);
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/mkcameofw.c b/trunk/tools/firmware-utils/src/mkcameofw.c
new file mode 100644
index 00000000..e0da4baf
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkcameofw.c
@@ -0,0 +1,433 @@
+/*
+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#define MAX_MODEL_LEN		20
+#define MAX_SIGNATURE_LEN	30
+#define MAX_REGION_LEN		4
+#define MAX_VERSION_LEN		12
+
+#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+
+struct file_info {
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+	uint32_t	write_size;
+};
+
+struct img_header {
+	uint32_t	checksum;
+	uint32_t	image_size;
+	uint32_t	kernel_size;
+	char		model[MAX_MODEL_LEN];
+	char		signature[MAX_SIGNATURE_LEN];
+	char		region[MAX_REGION_LEN];
+	char		version[MAX_VERSION_LEN];
+	unsigned char	header_len;
+	unsigned char	is_tgz;
+	unsigned char	pad[4];
+} __attribute__ ((packed));
+
+/*
+ * Globals
+ */
+static char *ofname;
+static char *progname;
+
+static char *model;
+static char *signature;
+static char *region = "DEF";
+static char *version;
+static struct file_info kernel_info;
+static struct file_info rootfs_info;
+static uint32_t kernel_size;
+static uint32_t image_size;
+static int combined;
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt " (%s)\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define DBG(fmt, ...) do { \
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+static void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -k <file>       read kernel image from the file <file>\n"
+"  -c              use the kernel image as a combined image\n"
+"  -M <model>      set model to <model>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -r <file>       read rootfs image from the file <file>\n"
+"  -S <signature>  set image signature to <signature>\n"
+"  -R <region>     set image region to <region>\n"
+"  -V <version>    set image version to <version>\n"
+"  -I <size>       set image size to <size>\n"
+"  -K <size>       set kernel size to <size>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+int
+str2u32(char *arg, uint32_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	*val = t;
+	return 0;
+}
+
+static int get_file_stat(struct file_info *fdata)
+{
+	struct stat st;
+	int res;
+
+	if (fdata->file_name == NULL)
+		return 0;
+
+	res = stat(fdata->file_name, &st);
+	if (res){
+		ERRS("stat failed on %s", fdata->file_name);
+		return res;
+	}
+
+	fdata->file_size = st.st_size;
+	fdata->write_size = fdata->file_size;
+	return 0;
+}
+
+static int read_to_buf(struct file_info *fdata, char *buf)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(fdata->file_name, "r");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for reading", fdata->file_name);
+		goto out;
+	}
+
+	errno = 0;
+	fread(buf, fdata->file_size, 1, f);
+	if (errno != 0) {
+		ERRS("unable to read from file \"%s\"", fdata->file_name);
+		goto out_close;
+	}
+
+	ret = EXIT_SUCCESS;
+
+out_close:
+	fclose(f);
+out:
+	return ret;
+}
+
+static int check_options(void)
+{
+	int ret;
+
+#define CHKSTR(_name, _msg)				\
+	do {						\
+		if (_name == NULL) {			\
+			ERR("no %s specified", _msg);	\
+			return -1;			\
+		}					\
+	} while (0)
+
+#define CHKSTRLEN(_name, _msg)					\
+	do {							\
+		int field_len;					\
+		CHKSTR(_name, _msg);				\
+		field_len = FIELD_SIZEOF(struct img_header, _name) - 1; \
+		if (strlen(_name) > field_len) { 		\
+			ERR("%s is too long, max length is %d",	\
+			    _msg, field_len);			\
+			return -1;				\
+		}						\
+	} while (0)
+
+	CHKSTRLEN(model, "model");
+	CHKSTRLEN(signature, "signature");
+	CHKSTRLEN(region, "region");
+	CHKSTRLEN(version, "version");
+	CHKSTR(ofname, "output file");
+	CHKSTR(kernel_info.file_name, "kernel image");
+
+	ret = get_file_stat(&kernel_info);
+	if (ret)
+		return ret;
+
+	if (combined) {
+		if (!kernel_size) {
+			ERR("kernel size must be specified for combined images");
+			return -1;				\
+		}
+
+		if (!image_size)
+			image_size = kernel_info.file_size;
+
+		if (kernel_info.file_size > image_size) {
+			ERR("kernel image is too big");
+			return -1;
+		}
+
+		kernel_info.write_size = image_size;
+	} else {
+		CHKSTR(rootfs_info.file_name, "rootfs image");
+
+		ret = get_file_stat(&rootfs_info);
+		if (ret)
+			return ret;
+
+		if (kernel_size) {
+			/* override kernel size */
+			kernel_info.write_size = kernel_size;
+		}
+
+		if (image_size) {
+			if (image_size < kernel_info.write_size)
+				kernel_info.write_size = image_size;
+
+			/* override rootfs size */
+			rootfs_info.write_size = image_size - kernel_info.write_size;
+		}
+
+		if (kernel_info.file_size > kernel_info.write_size) {
+			ERR("kernel image is too big");
+			return -1;
+		}
+
+		if (rootfs_info.file_size > rootfs_info.write_size) {
+			ERR("rootfs image is too big");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static int write_fw(char *data, int len)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(ofname, "w");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	errno = 0;
+	fwrite(data, len, 1, f);
+	if (errno) {
+		ERRS("unable to write output file");
+		goto out_flush;
+	}
+
+	DBG("firmware file \"%s\" completed", ofname);
+
+	ret = EXIT_SUCCESS;
+
+out_flush:
+	fflush(f);
+	fclose(f);
+	if (ret != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+out:
+	return ret;
+}
+
+static uint32_t get_csum(unsigned char *p, uint32_t len)
+{
+	uint32_t csum = 0;
+
+	while (len--)
+		csum += *p++;
+
+	return csum;
+}
+
+static int build_fw(void)
+{
+	int buflen;
+	char *buf;
+	char *p;
+	uint32_t csum;
+	struct img_header *hdr;
+	int ret = EXIT_FAILURE;
+
+	buflen = sizeof(struct img_header) +
+		 kernel_info.write_size + rootfs_info.write_size;
+
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto out;
+	}
+
+	memset(buf, 0, buflen);
+
+	p = buf + sizeof(struct img_header);
+
+	/* read kernel data */
+	ret = read_to_buf(&kernel_info, p);
+	if (ret)
+		goto out_free_buf;
+
+	if (!combined) {
+		p += kernel_info.write_size;
+
+		/* read rootfs data */
+		ret = read_to_buf(&rootfs_info, p);
+		if (ret)
+			goto out_free_buf;
+	}
+
+	csum = get_csum((unsigned char *)(buf + sizeof(struct img_header)),
+			buflen - sizeof(struct img_header));
+
+	/* fill firmware header */
+	hdr = (struct img_header *) buf;
+
+	hdr->checksum = htonl(csum);
+	hdr->image_size = htonl(buflen - sizeof(struct img_header));
+	if (!combined)
+		hdr->kernel_size = htonl(kernel_info.write_size);
+	else
+		hdr->kernel_size = htonl(kernel_size);
+	hdr->header_len = sizeof(struct img_header);
+	strncpy(hdr->model, model, sizeof(hdr->model));
+	strncpy(hdr->signature, signature, sizeof(hdr->signature));
+	strncpy(hdr->version, version, sizeof(hdr->version));
+	strncpy(hdr->region, region, sizeof(hdr->region));
+
+	ret = write_fw(buf, buflen);
+	if (ret)
+		goto out_free_buf;
+
+	ret = EXIT_SUCCESS;
+
+out_free_buf:
+	free(buf);
+out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int ret = EXIT_FAILURE;
+
+	progname = basename(argv[0]);
+
+	while (1) {
+		int c;
+
+		c = getopt(argc, argv, "M:S:V:R:k:K:I:r:o:hc");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'M':
+			model = optarg;
+			break;
+		case 'S':
+			signature = optarg;
+			break;
+		case 'V':
+			version = optarg;
+			break;
+		case 'R':
+			region = optarg;
+			break;
+		case 'k':
+			kernel_info.file_name = optarg;
+			break;
+		case 'K':
+			if (str2u32(optarg, &kernel_size)) {
+				ERR("%s is invalid '%s'",
+				    "kernel size", optarg);
+				goto out;
+			}
+			break;
+		case 'I':
+			if (str2u32(optarg, &image_size)) {
+				ERR("%s is invalid '%s'",
+				    "image size", optarg);
+				goto out;
+			}
+			break;
+		case 'r':
+			rootfs_info.file_name = optarg;
+			break;
+		case 'c':
+			combined = 1;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	ret = check_options();
+	if (ret)
+		goto out;
+
+	ret = build_fw();
+
+out:
+	return ret;
+}
+
diff --git a/trunk/tools/firmware-utils/src/mkcasfw.c b/trunk/tools/firmware-utils/src/mkcasfw.c
new file mode 100644
index 00000000..626e77d4
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkcasfw.c
@@ -0,0 +1,1030 @@
+/*
+ *
+ *  Copyright (C) 2007 OpenWrt.org
+ *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <endian.h>     /* for __BYTE_ORDER */
+#if defined(__CYGWIN__)
+#  include <byteswap.h>
+#endif
+
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#  define HOST_TO_LE16(x)	(x)
+#  define HOST_TO_LE32(x)	(x)
+#  define LE16_TO_HOST(x)	(x)
+#  define LE32_TO_HOST(x)	(x)
+#else
+#  define HOST_TO_LE16(x)	bswap_16(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#  define LE16_TO_HOST(x)	bswap_16(x)
+#  define LE32_TO_HOST(x)	bswap_32(x)
+#endif
+
+#define MAX_NUM_BLOCKS	2
+#define MAX_ARG_COUNT	32
+#define MAX_ARG_LEN	1024
+#define FILE_BUF_LEN	(16*1024)
+#define DEFAULT_PADC	0xFF
+
+#define DEFAULT_BLOCK_ALIGN	0x10000U
+
+#define CSUM_TYPE_NONE	0
+#define CSUM_TYPE_8	1
+#define CSUM_TYPE_16	2
+#define CSUM_TYPE_32	3
+
+struct csum_state{
+	int	size;
+	uint32_t val;
+	uint32_t tmp;
+	int	odd;
+};
+
+struct image_desc {
+	int		need_file;
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+
+	uint32_t	csum;
+	uint32_t	out_size;
+	uint8_t		padc;
+};
+
+struct fwhdr_nfs {
+	uint32_t	type;
+	uint32_t	kernel_offs;
+	uint32_t	kernel_size;
+	uint32_t	fs_offs;
+	uint32_t	fs_size;
+	uint32_t	kernel_csum;
+	uint32_t	fs_csum;
+	uint32_t	id;
+} __attribute__ ((packed));
+
+struct fwhdr_cas {
+	uint32_t	type;
+	uint32_t	kernel_offs;
+	uint32_t	kernel_size;
+	uint32_t	id;
+	uint32_t	kernel_csum;
+	uint32_t	magic1;
+	uint32_t	magic2;
+	uint32_t	magic3;
+} __attribute__ ((packed));
+
+union file_hdr {
+	struct fwhdr_cas cas;
+	struct fwhdr_nfs nfs;
+};
+
+struct board_info {
+	char		*model;
+	char		*name;
+	int		header_type;
+	uint32_t	id;
+	uint32_t	max_kernel_size;
+	uint32_t	max_fs_size;
+};
+
+#define HEADER_TYPE_NFS		0
+#define HEADER_TYPE_CAS		1
+
+#define KERNEL_SIZE_CAS		(61*64*1024)
+#define KERNEL_SIZE_NFS		(52*64*1024)
+#define FS_SIZE_NFS		(9*64*1024)
+
+#define CAS_MAGIC1	0x5241AA55
+#define CAS_MAGIC2	0x524F4741
+#define CAS_MAGIC3	0xD3F22D4E
+
+/* Cellvision/SparkLAN products */
+#define MODEL_CAS_630		0x01000000
+#define MODEL_CAS_630W		0x01000000
+#define MODEL_CAS_670		0x01000000
+#define MODEL_CAS_670W		0x01000000
+#define MODEL_NFS_101U		0x01000000
+#define MODEL_NFS_101WU		0x01000003
+#define MODEL_NFS_202U		0x01000001
+#define MODEL_NFS_202WU		0x01000002
+
+/* Corega products */
+#define MODEL_CG_NSADP		0x01000020 /* NFS-101U */
+#define MODEL_CG_NSADPCR	0x01000021 /* NFS-202U */
+
+/* D-Link products */
+#define MODEL_DCS_950		0x01010102 /* CAS-630 */
+#define MODEL_DCS_950G		0x01020102 /* CAS-630W */
+#define MODEL_DNS_120		0x01000030 /* NFS-101U */
+#define MODEL_DNS_G120		0x01000032 /* NFS-101WU */
+
+/* Digitus products */
+#define MODEL_DN_16021		MODEL_CAS_630
+#define MODEL_DN_16022		MODEL_CAS_630W
+#define MODEL_DN_16030		MODEL_CAS_670
+#define MODEL_DN_16031		MODEL_CAS_670W
+#define MODEL_DN_7013		MODEL_NFS_101U
+
+/* Lobos products */
+#define MODEL_LB_SS01TXU	0x00000000
+
+/* Neu-Fusion products */
+
+/* Ovislink products */
+#define MODEL_MU_5000FS		0x01000040 /* NFS-101U */
+#define MODEL_WL_5420CAM	0x020B0101 /* CAS-630W? */
+#define MODEL_WL_5460CAM	0x020B0001 /* CAS-670W */
+
+/* Repotec products */
+
+/* Sitecom products */
+#define MODEL_LN_350		/* unknown */
+#define MODEL_LN_403		0x01020402
+#define MODEL_WL_401		0x01010402
+
+/* Surecom products */
+#define MODEL_EP_4001_MM	0x01030A02 /* CAS-630 */
+#define MODEL_EP_4002_MM	0x01020A02 /* CAS-630W */
+#define MODEL_EP_4011_MM	0x01010A02 /* CAS-670 */
+#define MODEL_EP_4012_MM	0x01000A02 /* CAS-670W */
+#define MODEL_EP_9812_U		/* unknown */
+
+/* Trendnet products */
+#define MODEL_TN_U100		0x01000081 /* NFS-101U */
+#define MODEL_TN_U200		0x01000082 /* NFS-202U */
+
+/*
+ * Globals
+ */
+char *progname;
+char *ofname;
+int verblevel;
+int keep_invalid_images;
+int invalid_causes_error = 1;
+union file_hdr header;
+
+struct image_desc kernel_image;
+struct image_desc fs_image;
+
+struct board_info *board = NULL;
+
+#define BOARD(m, n, i, ks, fs, h) {		\
+		.model = (m),			\
+		.name = (n),			\
+		.id = (i),			\
+		.max_kernel_size = (ks), 	\
+		.max_fs_size = (fs), 		\
+		.header_type = (h)		\
+	}
+
+#define BOARD_CAS(m,n,i) \
+		BOARD(m, n, i, KERNEL_SIZE_CAS, 0, HEADER_TYPE_CAS)
+#define BOARD_NFS(m,n,i) \
+		BOARD(m, n, i, KERNEL_SIZE_NFS, FS_SIZE_NFS, HEADER_TYPE_NFS)
+
+static struct board_info boards[] = {
+	/* Cellvision/Sparklan products */
+	BOARD_CAS("CAS-630", "Cellvision CAS-630", MODEL_CAS_630),
+	BOARD_CAS("CAS-630W", "Cellvision CAS-630W", MODEL_CAS_630W),
+	BOARD_CAS("CAS-670", "Cellvision CAS-670", MODEL_CAS_670),
+	BOARD_CAS("CAS-670W", "Cellvision CAS-670W", MODEL_CAS_670W),
+	BOARD_NFS("NFS-101U", "Cellvision NFS-101U", MODEL_NFS_101U),
+	BOARD_NFS("NFS-101WU", "Cellvision NFS-101WU", MODEL_NFS_101WU),
+	BOARD_NFS("NFS-202U", "Cellvision NFS-202U", MODEL_NFS_202U),
+	BOARD_NFS("NFS-202WU", "Cellvision NFS-202WU", MODEL_NFS_202WU),
+
+	/* Corega products */
+	BOARD_NFS("CG-NSADP", "Corega CG-NSADP", MODEL_CG_NSADP),
+	BOARD_NFS("CG-NSADPCR", "Corega CG-NSADPCR", MODEL_CG_NSADPCR),
+
+	/* D-Link products */
+	BOARD_CAS("DCS-950", "D-Link DCS-950", MODEL_DCS_950),
+	BOARD_CAS("DCS-950G", "D-Link DCS-950G", MODEL_DCS_950G),
+	BOARD_NFS("DNS-120", "D-Link DNS-120", MODEL_DNS_120),
+	BOARD_NFS("DNS-G120", "D-Link DNS-G120", MODEL_DNS_G120),
+
+	/* Digitus products */
+	BOARD_NFS("DN-7013", "Digitus DN-7013", MODEL_DN_7013),
+
+	/* Lobos products */
+	BOARD_NFS("LB-SS01TXU", "Lobos LB-SS01TXU", MODEL_LB_SS01TXU),
+
+	/* Ovislink products */
+	BOARD_NFS("MU-5000FS", "Ovislink MU-5000FS", MODEL_MU_5000FS),
+	BOARD_CAS("WL-5420CAM", "Ovislink WL-5420 CAM", MODEL_WL_5420CAM),
+	BOARD_CAS("WL-5460CAM", "Ovislink WL-5460 CAM", MODEL_WL_5460CAM),
+
+	/* Sitecom products */
+	BOARD_CAS("LN-403", "Sitecom LN-403", MODEL_LN_403),
+	BOARD_CAS("WL-401", "Sitecom WL-401", MODEL_WL_401),
+
+	/* Surecom products */
+	BOARD_CAS("EP-4001-MM", "Surecom EP-4001-MM", MODEL_EP_4001_MM),
+	BOARD_CAS("EP-4002-MM", "Surecom EP-4002-MM", MODEL_EP_4002_MM),
+	BOARD_CAS("EP-4011-MM", "Surecom EP-4011-MM", MODEL_EP_4011_MM),
+	BOARD_CAS("EP-4012-MM", "Surecom EP-4012-MM", MODEL_EP_4012_MM),
+
+	/* TrendNET products */
+	BOARD_NFS("TN-U100", "TrendNET TN-U100", MODEL_TN_U100),
+	BOARD_NFS("TN-U200", "TrendNET TN-U200", MODEL_TN_U200),
+
+	{.model = NULL}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define WARN(fmt, ...) do { \
+	fprintf(stderr, "[%s] *** warning: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define DBG(lev, fmt, ...) do { \
+	if (verblevel < lev) \
+		break;\
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERR_FATAL		-1
+#define ERR_INVALID_IMAGE	-2
+
+void
+usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...] <file>\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>.\n"
+"                  valid <board> values:\n"
+	);
+	for (board = boards; board->model != NULL; board++){
+		fprintf(stream,
+"                  %-12s: %s\n",
+		 board->model, board->name);
+	};
+	fprintf(stream,
+"  -d              don't throw error on invalid images\n"
+"  -k              keep invalid images\n"
+"  -K <file>       add kernel to the image\n"
+"  -C <file>       add custom filesystem to the image\n"
+"  -h              show this screen\n"
+"Parameters:\n"
+"  <file>          write output to the file <file>\n"
+	);
+
+	exit(status);
+}
+
+static inline uint32_t align(uint32_t base, uint32_t alignment)
+{
+	uint32_t ret;
+
+	if (alignment) {
+		ret = (base + alignment - 1);
+		ret &= ~(alignment-1);
+	} else {
+		ret = base;
+	}
+
+	return ret;
+}
+
+/*
+ * argument parsing
+ */
+int
+str2u32(char *arg, uint32_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	*val = t;
+	return 0;
+}
+
+
+int
+str2u16(char *arg, uint16_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x10000)) {
+		return -1;
+	}
+
+	*val = t & 0xFFFF;
+	return 0;
+}
+
+int
+str2u8(char *arg, uint8_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x100)) {
+		return -1;
+	}
+
+	*val = t & 0xFF;
+	return 0;
+}
+
+int
+parse_arg(char *arg, char *buf, char *argv[])
+{
+	int res = 0;
+	size_t argl;
+	char *tok;
+	char **ap = &buf;
+	int i;
+
+	memset(argv, 0, MAX_ARG_COUNT * sizeof(void *));
+
+	if ((arg == NULL)) {
+		/* no arguments */
+		return 0;
+	}
+
+	argl = strlen(arg);
+	if (argl == 0) {
+		/* no arguments */
+		return 0;
+	}
+
+	if (argl >= MAX_ARG_LEN) {
+		/* argument is too long */
+		argl = MAX_ARG_LEN-1;
+	}
+
+	memcpy(buf, arg, argl);
+	buf[argl] = '\0';
+
+	for (i = 0; i < MAX_ARG_COUNT; i++) {
+		tok = strsep(ap, ":");
+		if (tok == NULL) {
+			break;
+		}
+#if 0
+		else if (tok[0] == '\0') {
+			break;
+		}
+#endif
+		argv[i] = tok;
+		res++;
+	}
+
+	return res;
+}
+
+
+int
+required_arg(char c, char *arg)
+{
+	if (arg == NULL || *arg != '-')
+		return 0;
+
+	ERR("option -%c requires an argument\n", c);
+	return ERR_FATAL;
+}
+
+
+int
+is_empty_arg(char *arg)
+{
+	int ret = 1;
+	if (arg != NULL) {
+		if (*arg) ret = 0;
+	};
+	return ret;
+}
+
+
+void
+csum8_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	for ( ; len > 0; len --) {
+		css->val += *p++;
+	}
+}
+
+
+uint16_t
+csum8_get(struct csum_state *css)
+{
+	uint8_t t;
+
+	t = css->val;
+	return ~t + 1;
+}
+
+
+void
+csum16_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	uint16_t t;
+
+	if (css->odd) {
+		t = css->tmp + (p[0]<<8);
+		css->val += LE16_TO_HOST(t);
+		css->odd = 0;
+		len--;
+		p++;
+	}
+
+	for ( ; len > 1; len -= 2, p +=2 ) {
+		t = p[0] + (p[1] << 8);
+		css->val += LE16_TO_HOST(t);
+	}
+
+	if (len == 1) {
+		css->tmp = p[0];
+		css->odd = 1;
+	}
+}
+
+
+uint16_t
+csum16_get(struct csum_state *css)
+{
+	char pad = 0;
+
+	csum16_update(&pad, 1, css);
+	return ~css->val + 1;
+}
+
+void
+csum32_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	uint32_t t;
+
+	for ( ; len > 3; len -= 4, p += 4 ) {
+		t = p[0] + (p[1] << 8) + (p[2] << 16) + (p[3] << 24);
+		css->val ^= t;
+	}
+}
+
+uint32_t
+csum32_get(struct csum_state *css)
+{
+	return css->val;
+}
+
+
+void
+csum_init(struct csum_state *css, int size)
+{
+	css->val = 0;
+	css->tmp = 0;
+	css->odd = 0;
+	css->size = size;
+}
+
+void
+csum_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	switch (css->size) {
+	case CSUM_TYPE_8:
+		csum8_update(p,len,css);
+		break;
+	case CSUM_TYPE_16:
+		csum16_update(p,len,css);
+		break;
+	case CSUM_TYPE_32:
+		csum32_update(p,len,css);
+		break;
+	}
+}
+
+
+uint32_t
+csum_get(struct csum_state *css)
+{
+	uint32_t ret;
+
+	switch (css->size) {
+	case CSUM_TYPE_8:
+		ret = csum8_get(css);
+		break;
+	case CSUM_TYPE_16:
+		ret = csum16_get(css);
+		break;
+	case CSUM_TYPE_32:
+		ret = csum32_get(css);
+	}
+
+	return ret;
+}
+
+
+/*
+ * routines to write data to the output file
+ */
+int
+write_out_data(FILE *outfile, uint8_t *data, size_t len,
+		struct csum_state *css)
+{
+	errno = 0;
+
+	fwrite(data, len, 1, outfile);
+	if (errno) {
+		ERRS("unable to write output file");
+		return ERR_FATAL;
+	}
+
+	if (css) {
+		csum_update(data, len, css);
+	}
+
+	return 0;
+}
+
+
+int
+write_out_padding(FILE *outfile, size_t len, uint8_t padc,
+		 struct csum_state *css)
+{
+	uint8_t buf[512];
+	size_t buflen = sizeof(buf);
+	int err;
+
+	memset(buf, padc, buflen);
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		err = write_out_data(outfile, buf, buflen, css);
+		if (err)
+			return err;
+
+		len -= buflen;
+	}
+
+	return 0;
+}
+
+
+int
+image_stat_file(struct image_desc *desc)
+{
+	struct stat st;
+	int err;
+
+	if (desc->file_name == NULL)
+		return 0;
+
+	err = stat(desc->file_name, &st);
+	if (err){
+		ERRS("stat failed on %s", desc->file_name);
+		return ERR_FATAL;
+	}
+
+	if (st.st_size > desc->out_size) {
+		WARN("file %s is too big, will be truncated to %d bytes\n",
+			desc->file_name, desc->out_size);
+		desc->file_size = desc->out_size;
+		return ERR_INVALID_IMAGE;
+	}
+
+
+	desc->file_size = st.st_size;
+	desc->out_size = align(desc->file_size,1);
+	return 0;
+}
+
+
+int
+image_writeout_file(FILE *outfile, struct image_desc *desc,
+			struct csum_state *css)
+{
+	char buf[FILE_BUF_LEN];
+	size_t buflen = sizeof(buf);
+	FILE *f;
+	size_t len;
+	int res;
+
+	if (desc->file_name == NULL)
+		return 0;
+
+	if (desc->file_size == 0)
+		return 0;
+
+	errno = 0;
+	f = fopen(desc->file_name,"r");
+	if (errno) {
+		ERRS("unable to open file: %s", desc->file_name);
+		return ERR_FATAL;
+	}
+
+	len = desc->file_size;
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		/* read data from source file */
+		errno = 0;
+		fread(buf, buflen, 1, f);
+		if (errno != 0) {
+			ERRS("unable to read from file: %s", desc->file_name);
+			res = ERR_FATAL;
+			break;
+		}
+
+		res = write_out_data(outfile, buf, buflen, css);
+		if (res)
+			break;
+
+		len -= buflen;
+	}
+
+	fclose(f);
+	return res;
+}
+
+
+int
+image_writeout(FILE *outfile, struct image_desc *desc)
+{
+	int res;
+	struct csum_state css;
+	size_t padlen;
+
+	res = 0;
+
+	if (!desc->file_size)
+		return 0;
+
+	DBG(2, "writing image, file=%s, file_size=%d\n",
+		desc->file_name, desc->file_size);
+
+	csum_init(&css, CSUM_TYPE_32);
+
+	res = image_writeout_file(outfile, desc, &css);
+	if (res)
+		return res;
+
+	/* write padding data if neccesary */
+	padlen = desc->out_size - desc->file_size;
+	DBG(1,"padding desc, length=%d", padlen);
+	res = write_out_padding(outfile, padlen, desc->padc, &css);
+
+	desc->csum = csum_get(&css);
+
+	return res;
+}
+
+
+int
+write_out_header(FILE *outfile)
+{
+	union file_hdr tmp;
+	int res;
+
+	errno = 0;
+	if (fseek(outfile, 0, SEEK_SET) != 0) {
+		ERRS("fseek failed on output file");
+		return ERR_FATAL;
+	}
+
+	switch (board->header_type) {
+	case HEADER_TYPE_CAS:
+		tmp.cas.type = HOST_TO_LE32(header.cas.type);
+		tmp.cas.id = HOST_TO_LE32(header.cas.id);
+		tmp.cas.kernel_offs = HOST_TO_LE32(sizeof(tmp.cas));
+		tmp.cas.kernel_size = HOST_TO_LE32(kernel_image.out_size);
+		tmp.cas.kernel_csum = HOST_TO_LE32(kernel_image.csum);
+		tmp.cas.magic1 = HOST_TO_LE32(CAS_MAGIC1);
+		tmp.cas.magic2 = HOST_TO_LE32(CAS_MAGIC2);
+		tmp.cas.magic3 = HOST_TO_LE32(CAS_MAGIC3);
+		res = write_out_data(outfile, (uint8_t *)&tmp.cas,
+					sizeof(tmp.cas), NULL);
+		break;
+	case HEADER_TYPE_NFS:
+		tmp.nfs.type = HOST_TO_LE32(header.nfs.type);
+		tmp.nfs.id = HOST_TO_LE32(header.nfs.id);
+		tmp.nfs.kernel_offs = HOST_TO_LE32(sizeof(tmp.nfs));
+		tmp.nfs.kernel_size = HOST_TO_LE32(kernel_image.out_size);
+		tmp.nfs.kernel_csum = HOST_TO_LE32(kernel_image.csum);
+		tmp.nfs.fs_offs = HOST_TO_LE32(sizeof(tmp.nfs)
+					+ kernel_image.out_size);
+		tmp.nfs.fs_size = HOST_TO_LE32(fs_image.out_size);
+		tmp.nfs.fs_csum = HOST_TO_LE32(fs_image.csum);
+		res = write_out_data(outfile, (uint8_t *)&tmp.nfs,
+					sizeof(tmp.nfs), NULL);
+		break;
+	}
+
+	return res;
+}
+
+int
+write_out_images(FILE *outfile)
+{
+	struct image_desc *desc;
+	int i, res;
+
+	res = image_writeout(outfile, &kernel_image);
+	if (res)
+		return res;
+
+	res = image_writeout(outfile, &fs_image);
+	if (res)
+		return res;
+
+	return 0;
+}
+
+
+struct board_info *
+find_board(char *model)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->model != NULL; board++){
+		if (strcasecmp(model, board->model) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+
+int
+parse_opt_board(char ch, char *arg)
+{
+
+	DBG(1,"parsing board option: -%c %s", ch, arg);
+
+	if (board != NULL) {
+		ERR("only one board option allowed");
+		return ERR_FATAL;
+	}
+
+	if (required_arg(ch, arg))
+		return ERR_FATAL;
+
+	board = find_board(arg);
+	if (board == NULL){
+		ERR("invalid/unknown board specified: %s", arg);
+		return ERR_FATAL;
+	}
+
+	switch (board->header_type) {
+	case HEADER_TYPE_CAS:
+		header.cas.type = HEADER_TYPE_CAS;
+		header.cas.id = board->id;
+		break;
+	case HEADER_TYPE_NFS:
+		header.nfs.type = HEADER_TYPE_NFS;
+		header.nfs.id = board->id;
+		break;
+	default:
+		ERR("internal error, unknown header type\n");
+		return ERR_FATAL;
+	}
+
+	return 0;
+}
+
+
+int
+parse_opt_image(char ch, char *arg)
+{
+	char buf[MAX_ARG_LEN];
+	char *argv[MAX_ARG_COUNT];
+	int argc;
+	char *p;
+	struct image_desc *desc = NULL;
+	int i;
+
+	switch (ch) {
+	case 'K':
+		if (kernel_image.file_name) {
+			WARN("only one kernel option allowed");
+			break;
+		}
+		desc = &kernel_image;
+		break;
+	case 'F':
+		if (fs_image.file_name) {
+			WARN("only one fs option allowed");
+			break;
+		}
+		desc = &fs_image;
+		break;
+	}
+
+	if (!desc)
+		return ERR_FATAL;
+
+	argc = parse_arg(arg, buf, argv);
+
+	i = 0;
+	p = argv[i++];
+	if (!is_empty_arg(p)) {
+		desc->file_name = strdup(p);
+		if (desc->file_name == NULL) {
+			ERR("not enough memory");
+			return ERR_FATAL;
+		}
+	} else {
+		ERR("no file specified for option %c", ch);
+		return ERR_FATAL;
+	}
+
+	return 0;
+}
+
+
+int
+process_images(void)
+{
+	struct image_desc *desc;
+	uint32_t offs = 0;
+	int i;
+	int res;
+
+	kernel_image.out_size = board->max_kernel_size;
+	kernel_image.padc = DEFAULT_PADC;
+	res = image_stat_file(&kernel_image);
+	if (res)
+		return res;
+
+	if (!fs_image.file_name)
+		return 0;
+
+	fs_image.out_size = board->max_fs_size;
+	fs_image.padc = DEFAULT_PADC;
+	res = image_stat_file(&fs_image);
+	if (res)
+		return res;
+
+	return 0;
+}
+
+
+int
+main(int argc, char *argv[])
+{
+	int optinvalid = 0;   /* flag for invalid option */
+	int c;
+	int res = ERR_FATAL;
+
+	FILE *outfile;
+
+	progname=basename(argv[0]);
+
+	opterr = 0;  /* could not print standard getopt error messages */
+	while ( 1 ) {
+		optinvalid = 0;
+
+		c = getopt(argc, argv, "B:C:dhK:r:vw:x:");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'B':
+			optinvalid = parse_opt_board(c,optarg);
+			break;
+		case 'd':
+			invalid_causes_error = 0;
+			break;
+		case 'C':
+		case 'K':
+			optinvalid = parse_opt_image(c,optarg);
+			break;
+		case 'k':
+			keep_invalid_images = 1;
+			break;
+		case 'v':
+			verblevel++;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			optinvalid = 1;
+			break;
+		}
+		if (optinvalid != 0 ){
+			ERR("invalid option: -%c", optopt);
+			goto out;
+		}
+	}
+
+	if (board == NULL) {
+		ERR("no board specified");
+		goto out;
+	}
+
+	if (optind == argc) {
+		ERR("no output file specified");
+		goto out;
+	}
+
+	ofname = argv[optind++];
+
+	if (optind < argc) {
+		ERR("invalid option: %s", argv[optind]);
+		goto out;
+	}
+
+	res = process_images();
+	if (res == ERR_FATAL)
+		goto out;
+
+	if (res == ERR_INVALID_IMAGE) {
+		if (invalid_causes_error)
+			res = ERR_FATAL;
+
+		if (keep_invalid_images == 0) {
+			WARN("generation of invalid images disabled", ofname);
+			goto out;
+		}
+
+		WARN("generating invalid image", ofname);
+	}
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		res = ERR_FATAL;
+		goto out;
+	}
+
+	if (write_out_header(outfile) != 0) {
+		res = ERR_FATAL;
+		goto out_flush;
+	}
+
+	if (write_out_images(outfile) != 0) {
+		res = ERR_FATAL;
+		goto out_flush;
+	}
+
+	if (write_out_header(outfile) != 0) {
+		res = ERR_FATAL;
+		goto out_flush;
+	}
+
+	DBG(1,"Image file %s completed.", ofname);
+
+out_flush:
+	fflush(outfile);
+	fclose(outfile);
+	if (res == ERR_FATAL) {
+		unlink(ofname);
+	}
+out:
+	if (res == ERR_FATAL)
+		return EXIT_FAILURE;
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/firmware-utils/src/mkchkimg.c b/trunk/tools/firmware-utils/src/mkchkimg.c
new file mode 100644
index 00000000..e152f7d4
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkchkimg.c
@@ -0,0 +1,327 @@
+/*
+ * 	Make CHK Image
+ *
+ * 	This utility creates Netgear .chk files.
+ *
+ * 	Copyright (C) 2008 Dave C. Reeve <Dave.Reeve@dreeve.org>
+ *
+ *	This program is free software; you can redistribute it and/or modify
+ *	it under the terms of the GNU General Public License as published by
+ *	the Free Software Foundation; either version 2 of the License, or
+ *	(at your option) any later version.
+ *
+ *	This program is distributed in the hope that 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.,
+ *	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+#define BUF_LEN (2048)
+
+#define MAX_BOARD_ID_LEN (64)
+
+struct chk_header {
+	uint32_t magic;
+	uint32_t header_len;
+	uint8_t  reserved[8];
+	uint32_t kernel_chksum;
+	uint32_t rootfs_chksum;
+	uint32_t kernel_len;
+	uint32_t rootfs_len;
+	uint32_t image_chksum;
+	uint32_t header_chksum;
+	/* char board_id[] - upto MAX_BOARD_ID_LEN */
+};
+
+static void __attribute__ ((format (printf, 2, 3)))
+fatal_error (int maybe_errno, const char * format, ...)
+{
+	va_list ap;
+
+	fprintf (stderr, "mkchkimg: ");
+	va_start (ap, format);
+	vfprintf (stderr, format, ap);
+	va_end (ap);
+
+	if (maybe_errno) {
+		fprintf (stderr, ": %s\n", strerror (maybe_errno));
+	} else {
+		fprintf (stderr, "\n");
+	}
+
+	exit (EXIT_FAILURE);
+}
+
+static void __attribute__ ((format (printf, 1, 2)))
+message (const char * format, ...)
+{
+	va_list ap;
+
+	fprintf (stderr, "mkchkimg: ");
+	va_start (ap, format);
+	vfprintf (stderr, format, ap);
+	va_end (ap);
+	fprintf (stderr, "\n");
+}
+
+struct ngr_checksum {
+	uint32_t c0;
+	uint32_t c1;
+};
+
+static inline void
+netgear_checksum_init (struct ngr_checksum * c)
+{
+	c->c0 = c->c1 = 0;
+}
+
+static inline void
+netgear_checksum_add (struct ngr_checksum * c, unsigned char * buf, size_t len)
+{
+	size_t i;
+
+	for (i=0; i<len; i++) {
+		c->c0 += buf[i] & 0xff;
+		c->c1 += c->c0;
+	}
+}
+
+static inline unsigned long
+netgear_checksum_fini (struct ngr_checksum * c)
+{
+	uint32_t b, checksum;
+
+	b = (c->c0 & 65535) + ((c->c0 >> 16) & 65535);
+	c->c0 = ((b >> 16) + b) & 65535;
+	b = (c->c1 & 65535) + ((c->c1 >> 16) & 65535);
+	c->c1 = ((b >> 16) + b) & 65535;
+	checksum = ((c->c1 << 16) | c->c0);
+	return checksum;
+}
+
+static void
+print_help (void)
+{
+	fprintf (stderr, "Usage: mkchkimg -o output -k kernel [-f filesys] [-b board_id] [-r region]\n");
+}
+
+int
+main (int argc, char * argv[])
+{
+	int opt;
+	char * ptr;
+	size_t len;
+	size_t header_len;
+	struct chk_header * hdr;
+	struct ngr_checksum chk_part, chk_whole;
+	char buf[BUF_LEN];
+	char * output_file, * kern_file, * fs_file;
+	FILE * out_fp, * kern_fp, * fs_fp;
+	char * board_id;
+	unsigned long region;
+
+	/* Default values */
+	board_id = "U12H072T00_NETGEAR";
+	region = 1;	/* 1=WW, 2=NA */
+	output_file = NULL;
+	kern_file = NULL;
+	fs_file = NULL;
+	fs_fp = NULL;
+
+	while ((opt = getopt (argc, argv, ":b:r:k:f:o:h")) != -1) {
+		switch (opt) {
+		    case 'b':
+		    	/* Board Identity */
+			if (strlen (optarg) > MAX_BOARD_ID_LEN) {
+				fatal_error (0, "Board lenght exceeds %d", 
+					MAX_BOARD_ID_LEN);
+			}
+			board_id = optarg;
+			break;
+
+		    case 'r':
+		    	/* Region */
+			errno = 0;
+			region = strtoul (optarg, &ptr, 0);
+			if (errno || ptr==optarg || *ptr!='\0') {
+				fatal_error (0, "Cannot parse region %s", optarg);
+			}
+			if (region > 0xff) {
+				fatal_error (0, "Region cannot exceed 0xff");
+			}
+			break;
+
+		    case 'k':
+		    	/* Kernel */
+			kern_file = optarg;
+			break;
+
+		    case 'f':
+		    	/* Filing System */
+			fs_file = optarg;
+			break;
+
+		    case 'o':
+		    	/* Output file */
+			output_file = optarg;
+			break;
+
+		    case 'h':
+		    	print_help ();
+			return EXIT_SUCCESS;
+
+		    case ':':
+		    	print_help ();
+		    	fatal_error (0, "Option -%c missing argument", optopt);
+			break;
+
+		    case '?':
+		    	print_help ();
+		    	fatal_error (0, "Unknown argument -%c", optopt);
+			break;
+		    
+		    default:
+		    	break;
+		}
+	}
+
+	/* Check we have all the options expected */
+	if (!kern_file) {
+		print_help ();
+		fatal_error (0, "Kernel file expected");
+	}
+	if (!output_file) {
+		print_help ();
+		fatal_error (0, "Output file required");
+	}
+	message ("Netgear CHK writer - v0.1");
+
+	/* Open the input file */
+	kern_fp = fopen (kern_file, "r");
+	if (!kern_fp) {
+		fatal_error (errno, "Cannot open %s", kern_file);
+	}
+
+	/* Open the fs file, if specified */
+	if (fs_file) {
+		fs_fp = fopen (fs_file, "r");
+		if (!fs_fp) {
+			fatal_error (errno, "Cannot open %s", fs_file);
+		}
+	}
+
+	/* Open the output file */
+	out_fp = fopen (output_file, "w+");
+	if (!out_fp) {
+		fatal_error (errno, "Cannot open %s", output_file);
+	}
+
+	/* Write zeros when the chk header will be */
+	buf[0] = '\0';
+	header_len = sizeof (struct chk_header) + strlen (board_id);
+	if (fwrite (buf, 1, header_len, out_fp) != header_len) {
+		fatal_error (errno, "Cannot write header");
+	}
+
+	/* Allocate storage for header, we fill in as we go */
+	hdr = malloc (sizeof (struct chk_header));
+	if (!hdr) {
+		fatal_error (0, "malloc failed");
+	}
+	bzero (hdr, sizeof (struct chk_header));
+
+	/* Fill in known values */
+	hdr->magic = htonl (0x2a23245e);
+	hdr->header_len = htonl(header_len);
+	hdr->reserved[0] = (unsigned char)(region & 0xff);
+	hdr->reserved[1] = 1;		/* Major */
+	hdr->reserved[2] = 1;		/* Minor */
+	hdr->reserved[3] = 99;		/* Build */
+	hdr->reserved[4] = 0;		/* Unknown t1 ? was 1 */
+	hdr->reserved[5] = 0;		/* Unknonw t2 ? was 0 */
+	hdr->reserved[6] = 0;		/* Unknonw t3 ? was 1 */
+	hdr->reserved[7] = 0;		/* Unused ? */
+	message ("       Board Id: %s", board_id);
+	message ("         Region: %s", region == 1 ? "World Wide (WW)" 
+			: (region == 2 ? "North America (NA)" : "Unknown"));
+
+	/* Copy the trx file, calculating the checksum as we go */
+	netgear_checksum_init (&chk_part);
+	netgear_checksum_init (&chk_whole);
+	while (!feof (kern_fp)) {
+		len = fread (buf, 1, BUF_LEN, kern_fp);
+		if (len < 1) {
+			break;
+		}
+		if (fwrite (buf, len, 1, out_fp) != 1) {
+			fatal_error (errno, "Write error");
+		}
+		hdr->kernel_len += len;
+		netgear_checksum_add (&chk_part, (unsigned char *)buf, len);
+		netgear_checksum_add (&chk_whole, (unsigned char *)buf, len);
+	}
+	hdr->kernel_chksum = netgear_checksum_fini (&chk_part);
+	message ("     Kernel Len: %u", hdr->kernel_len);
+	message ("Kernel Checksum: 0x%08x", hdr->kernel_chksum);
+	hdr->kernel_len = htonl (hdr->kernel_len);
+	hdr->kernel_chksum = htonl (hdr->kernel_chksum);
+
+	/* Now copy the root fs, calculating the checksum as we go */
+	if (fs_fp) {
+		netgear_checksum_init (&chk_part);
+		while (!feof (fs_fp)) {
+			len = fread (buf, 1, BUF_LEN, fs_fp);
+			if (len < 1) {
+				break;
+			}
+			if (fwrite (buf, len, 1, out_fp) != 1) {
+				fatal_error (errno, "Write error");
+			}
+			hdr->rootfs_len += len;
+			netgear_checksum_add (&chk_part, (unsigned char *)buf, len);
+			netgear_checksum_add (&chk_whole, (unsigned char *)buf, len);
+		}
+		hdr->rootfs_chksum = (netgear_checksum_fini (&chk_part));
+		message ("     Rootfs Len: %u", hdr->rootfs_len);
+		message ("Rootfs Checksum: 0x%08x", hdr->rootfs_chksum);
+		hdr->rootfs_len = htonl (hdr->rootfs_len);
+		hdr->rootfs_chksum = htonl (hdr->rootfs_chksum);
+	}
+
+	/* Calcautate the image checksum */
+	hdr->image_chksum = netgear_checksum_fini (&chk_whole);
+	message (" Image Checksum: 0x%08x", hdr->image_chksum);
+	hdr->image_chksum = htonl (hdr->image_chksum);
+
+	/* Calculate the header checksum */
+	netgear_checksum_init (&chk_part);
+	netgear_checksum_add (&chk_part, (unsigned char *)hdr, 
+				sizeof (struct chk_header));
+	netgear_checksum_add (&chk_part, (unsigned char *)board_id,
+				strlen (board_id));
+	hdr->header_chksum = htonl (netgear_checksum_fini (&chk_part));
+
+	/* Finally rewind the output and write headers */
+	rewind (out_fp);
+	if (fwrite (hdr, sizeof (struct chk_header), 1, out_fp) != 1) {
+		fatal_error (errno, "Cannot write header");
+	}
+	if (fwrite (board_id, strlen (board_id), 1, out_fp) != 1) {
+		fatal_error (errno, "Cannot write board id");
+	}
+
+	/* Success */
+	return EXIT_SUCCESS;
+}
+
diff --git a/trunk/tools/firmware-utils/src/mkcsysimg.c b/trunk/tools/firmware-utils/src/mkcsysimg.c
new file mode 100644
index 00000000..c00096f8
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkcsysimg.c
@@ -0,0 +1,1157 @@
+/*
+ *
+ *  Copyright (C) 2007-2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program was based on the code found in various Linux
+ *  source tarballs released by Edimax for it's devices.
+ *  Original author: David Hsu <davidhsu@realtek.com.tw>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <endian.h>     /* for __BYTE_ORDER */
+#if defined(__CYGWIN__)
+#  include <byteswap.h>
+#endif
+
+#include "csysimg.h"
+
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#  define HOST_TO_LE16(x)	(x)
+#  define HOST_TO_LE32(x)	(x)
+#  define LE16_TO_HOST(x)	(x)
+#  define LE32_TO_HOST(x)	(x)
+#else
+#  define HOST_TO_LE16(x)	bswap_16(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#  define LE16_TO_HOST(x)	bswap_16(x)
+#  define LE32_TO_HOST(x)	bswap_32(x)
+#endif
+
+#define MAX_NUM_BLOCKS	8
+#define MAX_ARG_COUNT	32
+#define MAX_ARG_LEN	1024
+#define FILE_BUF_LEN	(16*1024)
+#define CSYS_PADC	0xFF
+
+#define BLOCK_TYPE_BOOT	0
+#define BLOCK_TYPE_CONF	1
+#define BLOCK_TYPE_WEBP	2
+#define BLOCK_TYPE_CODE	3
+#define BLOCK_TYPE_XTRA	4
+
+#define DEFAULT_BLOCK_ALIGN	0x10000U
+
+#define CSUM_SIZE_NONE	0
+#define CSUM_SIZE_8	1
+#define CSUM_SIZE_16	2
+
+
+struct csum_state{
+	int	size;
+	uint16_t val;
+	uint16_t tmp;
+	int	odd;
+};
+
+
+struct csys_block {
+	int		type;	/* type of the block */
+
+	int		need_file;
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+
+	unsigned char	sig[SIG_LEN];
+	uint32_t	addr;
+	int		addr_set;
+	uint32_t	align;
+	int		align_set;
+	uint8_t		padc;
+
+	uint32_t	size;
+	uint32_t	size_hdr;
+	uint32_t	size_csum;
+	uint32_t	size_avail;
+
+	struct csum_state *css;
+};
+
+
+struct board_info {
+	char *model;
+	char *name;
+	uint32_t flash_size;
+
+	char sig_boot[SIG_LEN];
+	char sig_conf[SIG_LEN];
+	char sig_webp[SIG_LEN];
+
+	uint32_t boot_size;
+	uint32_t conf_size;
+	uint32_t webp_size;
+	uint32_t webp_size_max;
+	uint32_t code_size;
+
+	uint32_t addr_code;
+	uint32_t addr_webp;
+};
+
+#define BOARD(m, n, f, sigb, sigw, bs, cs, ws, ac, aw) {\
+	.model = m, .name = n, .flash_size = f<<20, \
+	.sig_boot = sigb, .sig_conf = SIG_CONF, .sig_webp = sigw, \
+	.boot_size = bs, .conf_size = cs, \
+	.webp_size = ws, .webp_size_max = 3*0x10000, \
+	.addr_code = ac, .addr_webp = aw \
+	}
+
+#define BOARD_ADM(m,n,f, sigw) BOARD(m,n,f, ADM_BOOT_SIG, sigw, \
+	ADM_BOOT_SIZE, ADM_CONF_SIZE, ADM_WEBP_SIZE, \
+	ADM_CODE_ADDR, ADM_WEBP_ADDR)
+
+
+/*
+ * Globals
+ */
+char *progname;
+char *ofname = NULL;
+int verblevel = 0;
+int invalid_causes_error = 1;
+int keep_invalid_images = 0;
+
+struct board_info *board = NULL;
+
+struct csys_block *boot_block = NULL;
+struct csys_block *conf_block = NULL;
+struct csys_block *webp_block = NULL;
+struct csys_block *code_block = NULL;
+
+struct csys_block blocks[MAX_NUM_BLOCKS];
+int num_blocks = 0;
+
+static struct board_info boards[] = {
+	/* The original Edimax products */
+	BOARD_ADM("BR-6104K", "Edimax BR-6104K", 2, SIG_BR6104K),
+	BOARD_ADM("BR-6104KP", "Edimax BR-6104KP", 2, SIG_BR6104KP),
+	BOARD_ADM("BR-6104Wg", "Edimax BR-6104Wg", 2, SIG_BR6104Wg),
+	BOARD_ADM("BR-6114WG", "Edimax BR-6114WG", 2, SIG_BR6114WG),
+	BOARD_ADM("BR-6524K", "Edimax BR-6524K", 2, SIG_BR6524K),
+	BOARD_ADM("BR-6524KP", "Edimax BR-6524KP", 2, SIG_BR6524KP),
+	BOARD_ADM("BR-6524N", "Edimax BR-6524N", 2, SIG_BR6524N),
+	BOARD_ADM("BR-6524WG", "Edimax BR-6524WG", 4, SIG_BR6524WG),
+	BOARD_ADM("BR-6524WP", "Edimax BR-6524WP", 4, SIG_BR6524WP),
+	BOARD_ADM("BR-6541K", "Edimax BR-6541K", 2, SIG_BR6541K),
+	BOARD_ADM("BR-6541KP", "Edimax BR-6541K", 2, SIG_BR6541KP),
+	BOARD_ADM("BR-6541WP", "Edimax BR-6541WP", 4, SIG_BR6541WP),
+	BOARD_ADM("EW-7207APg", "Edimax EW-7207APg", 2, SIG_EW7207APg),
+	BOARD_ADM("PS-1205UWg", "Edimax PS-1205UWg", 2, SIG_PS1205UWg),
+	BOARD_ADM("PS-3205U", "Edimax PS-3205U", 2, SIG_PS3205U),
+	BOARD_ADM("PS-3205UWg", "Edimax PS-3205UWg", 2, SIG_PS3205UWg),
+
+	/* Hawking products */
+	BOARD_ADM("H2BR4", "Hawking H2BR4", 2, SIG_H2BR4),
+	BOARD_ADM("H2WR54G", "Hawking H2WR54G", 4, SIG_H2WR54G),
+
+	/* Planet products */
+	BOARD_ADM("XRT-401D", "Planet XRT-401D", 2, SIG_XRT401D),
+	BOARD_ADM("XRT-402D", "Planet XRT-402D", 2, SIG_XRT402D),
+
+	/* Conceptronic products */
+	BOARD_ADM("C54BSR4", "Conceptronic C54BSR4", 2, SIG_C54BSR4),
+
+	/* OSBRiDGE products */
+	BOARD_ADM("5GXi", "OSBDRiDGE 5GXi", 2, SIG_5GXI),
+
+	{.model = NULL}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", progname, ## __VA_ARGS__ \
+		, strerror(save)); \
+} while (0)
+
+#define WARN(fmt, ...) do { \
+	fprintf(stderr, "[%s] *** warning: " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define DBG(lev, fmt, ...) do { \
+	if (verblevel < lev) \
+		break;\
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERR_FATAL		-1
+#define ERR_INVALID_IMAGE	-2
+
+void
+usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...] <file>\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>.\n"
+"                  valid <board> values:\n"
+	);
+	for (board = boards; board->model != NULL; board++){
+		fprintf(stream,
+"                  %-12s: %s\n",
+		 board->model, board->name);
+	};
+	fprintf(stream,
+"  -d              don't throw error on invalid images\n"
+"  -k              keep invalid images\n"
+"  -b <file>[:<align>[:<padc>]]\n"
+"                  add boot code to the image\n"
+"  -c <file>[:<align>[:<padc>]]\n"
+"                  add configuration settings to the image\n"
+"  -r <file>:[<addr>][:<align>[:<padc>]]\n"
+"                  add runtime code to the image\n"
+"  -w [<file>:[<addr>][:<align>[:<padc>]]]\n"
+"                  add webpages to the image\n"
+"  -x <file>[:<align>[:<padc>]]\n"
+"                  add extra data at the end of the image\n"
+"  -h              show this screen\n"
+"Parameters:\n"
+"  <file>          write output to the file <file>\n"
+	);
+
+	exit(status);
+}
+
+static inline uint32_t align(uint32_t base, uint32_t alignment)
+{
+	uint32_t ret;
+
+	if (alignment) {
+		ret = (base + alignment - 1);
+		ret &= ~(alignment-1);
+	} else {
+		ret = base;
+	}
+
+	return ret;
+}
+
+/*
+ * argument parsing
+ */
+int
+str2u32(char *arg, uint32_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	*val = t;
+	return 0;
+}
+
+
+int
+str2u16(char *arg, uint16_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x10000)) {
+		return -1;
+	}
+
+	*val = t & 0xFFFF;
+	return 0;
+}
+
+int
+str2u8(char *arg, uint8_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x100)) {
+		return -1;
+	}
+
+	*val = t & 0xFF;
+	return 0;
+}
+
+int
+str2sig(char *arg, uint32_t *sig)
+{
+	if (strlen(arg) != 4)
+		return -1;
+
+	*sig = arg[0] | (arg[1] << 8) | (arg[2] << 16) | (arg[3] << 24);
+
+	return 0;
+}
+
+
+int
+parse_arg(char *arg, char *buf, char *argv[])
+{
+	int res = 0;
+	size_t argl;
+	char *tok;
+	char **ap = &buf;
+	int i;
+
+	memset(argv, 0, MAX_ARG_COUNT * sizeof(void *));
+
+	if ((arg == NULL)) {
+		/* no arguments */
+		return 0;
+	}
+
+	argl = strlen(arg);
+	if (argl == 0) {
+		/* no arguments */
+		return 0;
+	}
+
+	if (argl >= MAX_ARG_LEN) {
+		/* argument is too long */
+		argl = MAX_ARG_LEN-1;
+	}
+
+	memcpy(buf, arg, argl);
+	buf[argl] = '\0';
+
+	for (i = 0; i < MAX_ARG_COUNT; i++) {
+		tok = strsep(ap, ":");
+		if (tok == NULL) {
+			break;
+		}
+#if 0
+		else if (tok[0] == '\0') {
+			break;
+		}
+#endif
+		argv[i] = tok;
+		res++;
+	}
+
+	return res;
+}
+
+
+int
+required_arg(char c, char *arg)
+{
+	if (arg == NULL || *arg != '-')
+		return 0;
+
+	ERR("option -%c requires an argument\n", c);
+	return ERR_FATAL;
+}
+
+
+int
+is_empty_arg(char *arg)
+{
+	int ret = 1;
+	if (arg != NULL) {
+		if (*arg) ret = 0;
+	};
+	return ret;
+}
+
+
+void
+csum8_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	for ( ; len > 0; len --) {
+		css->val += *p++;
+	}
+}
+
+
+uint16_t
+csum8_get(struct csum_state *css)
+{
+	uint8_t t;
+
+	t = css->val;
+	return ~t + 1;
+}
+
+
+void
+csum16_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	uint16_t t;
+
+	if (css->odd) {
+		t = css->tmp + (p[0]<<8);
+		css->val += LE16_TO_HOST(t);
+		css->odd = 0;
+		len--;
+		p++;
+	}
+
+	for ( ; len > 1; len -= 2, p +=2 ) {
+		t = p[0] + (p[1] << 8);
+		css->val += LE16_TO_HOST(t);
+	}
+
+	if (len == 1) {
+		css->tmp = p[0];
+		css->odd = 1;
+	}
+}
+
+
+uint16_t
+csum16_get(struct csum_state *css)
+{
+	char pad = 0;
+
+	csum16_update(&pad, 1, css);
+	return ~css->val + 1;
+}
+
+
+void
+csum_init(struct csum_state *css, int size)
+{
+	css->val = 0;
+	css->tmp = 0;
+	css->odd = 0;
+	css->size = size;
+}
+
+
+void
+csum_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	switch (css->size) {
+	case CSUM_SIZE_8:
+		csum8_update(p,len,css);
+		break;
+	case CSUM_SIZE_16:
+		csum16_update(p,len,css);
+		break;
+	}
+}
+
+
+uint16_t
+csum_get(struct csum_state *css)
+{
+	uint16_t ret;
+
+	switch (css->size) {
+	case CSUM_SIZE_8:
+		ret = csum8_get(css);
+		break;
+	case CSUM_SIZE_16:
+		ret = csum16_get(css);
+		break;
+	}
+
+	return ret;
+}
+
+
+/*
+ * routines to write data to the output file
+ */
+int
+write_out_data(FILE *outfile, uint8_t *data, size_t len,
+		struct csum_state *css)
+{
+	errno = 0;
+
+	fwrite(data, len, 1, outfile);
+	if (errno) {
+		ERRS("unable to write output file");
+		return ERR_FATAL;
+	}
+
+	if (css) {
+		csum_update(data, len, css);
+	}
+
+	return 0;
+}
+
+
+int
+write_out_padding(FILE *outfile, size_t len, uint8_t padc,
+		 struct csum_state *css)
+{
+	uint8_t buf[512];
+	size_t buflen = sizeof(buf);
+	int err;
+
+	memset(buf, padc, buflen);
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		err = write_out_data(outfile, buf, buflen, css);
+		if (err)
+			return err;
+
+		len -= buflen;
+	}
+
+	return 0;
+}
+
+
+int
+block_stat_file(struct csys_block *block)
+{
+	struct stat st;
+	int err;
+
+	if (block->file_name == NULL)
+		return 0;
+
+	err = stat(block->file_name, &st);
+	if (err){
+		ERRS("stat failed on %s", block->file_name);
+		return ERR_FATAL;
+	}
+
+	block->file_size = st.st_size;
+	return 0;
+}
+
+
+int
+block_writeout_hdr(FILE *outfile, struct csys_block *block)
+{
+	struct csys_header hdr;
+	int res;
+
+	if (block->size_hdr == 0)
+		return 0;
+
+	/* setup header fields */
+	memcpy(hdr.sig, block->sig, 4);
+	hdr.addr = HOST_TO_LE32(block->addr);
+	hdr.size = HOST_TO_LE32(block->size - block->size_hdr - block->size_csum);
+
+	DBG(1,"writing header for block");
+	res = write_out_data(outfile, (uint8_t *)&hdr, sizeof(hdr),NULL);
+	return res;
+
+}
+
+
+int
+block_writeout_file(FILE *outfile, struct csys_block *block)
+{
+	char buf[FILE_BUF_LEN];
+	size_t buflen = sizeof(buf);
+	FILE *f;
+	size_t len;
+	int res;
+
+	if (block->file_name == NULL)
+		return 0;
+
+	if (block->file_size == 0)
+		return 0;
+
+	errno = 0;
+	f = fopen(block->file_name,"r");
+	if (errno) {
+		ERRS("unable to open file: %s", block->file_name);
+		return ERR_FATAL;
+	}
+
+	len = block->file_size;
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		/* read data from source file */
+		errno = 0;
+		fread(buf, buflen, 1, f);
+		if (errno != 0) {
+			ERRS("unable to read from file: %s", block->file_name);
+			res = ERR_FATAL;
+			break;
+		}
+
+		res = write_out_data(outfile, buf, buflen, block->css);
+		if (res)
+			break;
+
+		len -= buflen;
+	}
+
+	fclose(f);
+	return res;
+}
+
+
+int
+block_writeout_data(FILE *outfile, struct csys_block *block)
+{
+	int res;
+	size_t padlen;
+
+	res = block_writeout_file(outfile, block);
+	if (res)
+		return res;
+
+	/* write padding data if neccesary */
+	padlen = block->size_avail - block->file_size;
+	DBG(1,"padding block, length=%d", padlen);
+	res = write_out_padding(outfile, padlen, block->padc, block->css);
+
+	return res;
+}
+
+
+int
+block_writeout_csum(FILE *outfile, struct csys_block *block)
+{
+	uint16_t csum;
+	int res;
+
+	if (block->size_csum == 0)
+		return 0;
+
+	DBG(1,"writing checksum for block");
+	csum = HOST_TO_LE16(csum_get(block->css));
+	res = write_out_data(outfile, (uint8_t *)&csum, block->size_csum, NULL);
+
+	return res;
+}
+
+
+int
+block_writeout(FILE *outfile, struct csys_block *block)
+{
+	int res;
+	struct csum_state css;
+
+	res = 0;
+
+	if (block == NULL)
+		return res;
+
+	block->css = NULL;
+
+	DBG(2, "writing block, file=%s, file_size=%d, space=%d",
+		block->file_name, block->file_size, block->size_avail);
+	res = block_writeout_hdr(outfile, block);
+	if (res)
+		return res;
+
+	if (block->size_csum != 0) {
+		block->css = &css;
+		csum_init(&css, block->size_csum);
+	}
+
+	res = block_writeout_data(outfile, block);
+	if (res)
+		return res;
+
+	res = block_writeout_csum(outfile, block);
+	if (res)
+		return res;
+
+	return res;
+}
+
+
+int
+write_out_blocks(FILE *outfile)
+{
+	struct csys_block *block;
+	int i, res;
+
+	res = block_writeout(outfile, boot_block);
+	if (res)
+		return res;
+
+	res = block_writeout(outfile, conf_block);
+	if (res)
+		return res;
+
+	res = block_writeout(outfile, webp_block);
+	if (res)
+		return res;
+
+	res = block_writeout(outfile, code_block);
+	if (res)
+		return res;
+
+	res = 0;
+	for (i=0; i < num_blocks; i++) {
+		block = &blocks[i];
+
+		if (block->type != BLOCK_TYPE_XTRA)
+			continue;
+
+		res = block_writeout(outfile, block);
+		if (res)
+			break;
+	}
+
+	return res;
+}
+
+
+struct board_info *
+find_board(char *model)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->model != NULL; board++){
+		if (strcasecmp(model, board->model) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+
+int
+parse_opt_board(char ch, char *arg)
+{
+
+	DBG(1,"parsing board option: -%c %s", ch, arg);
+
+	if (board != NULL) {
+		ERR("only one board option allowed");
+		return ERR_FATAL;
+	}
+
+	if (required_arg(ch, arg))
+		return ERR_FATAL;
+
+	board = find_board(arg);
+	if (board == NULL){
+		ERR("invalid/unknown board specified: %s", arg);
+		return ERR_FATAL;
+	}
+
+	return 0;
+}
+
+
+int
+parse_opt_block(char ch, char *arg)
+{
+	char buf[MAX_ARG_LEN];
+	char *argv[MAX_ARG_COUNT];
+	int argc;
+	char *p;
+	struct csys_block *block;
+	int i;
+
+	if ( num_blocks > MAX_NUM_BLOCKS ) {
+		ERR("too many blocks specified");
+		return ERR_FATAL;
+	}
+
+	block = &blocks[num_blocks];
+
+	/* setup default field values */
+	block->need_file = 1;
+	block->padc = 0xFF;
+
+	switch (ch) {
+	case 'b':
+		if (boot_block) {
+			WARN("only one boot block allowed");
+			break;
+		}
+		block->type = BLOCK_TYPE_BOOT;
+		boot_block = block;
+		break;
+	case 'c':
+		if (conf_block) {
+			WARN("only one config block allowed");
+			break;
+		}
+		block->type = BLOCK_TYPE_CONF;
+		conf_block = block;
+		break;
+	case 'w':
+		if (webp_block) {
+			WARN("only one web block allowed");
+			break;
+		}
+		block->type = BLOCK_TYPE_WEBP;
+		block->size_hdr = sizeof(struct csys_header);
+		block->size_csum = CSUM_SIZE_8;
+		block->need_file = 0;
+		webp_block = block;
+		break;
+	case 'r':
+		if (code_block) {
+			WARN("only one runtime block allowed");
+			break;
+		}
+		block->type = BLOCK_TYPE_CODE;
+		block->size_hdr = sizeof(struct csys_header);
+		block->size_csum = CSUM_SIZE_16;
+		code_block = block;
+		break;
+	case 'x':
+		block->type = BLOCK_TYPE_XTRA;
+		break;
+	default:
+		ERR("unknown block type \"%c\"", ch);
+		return ERR_FATAL;
+	}
+
+	argc = parse_arg(arg, buf, argv);
+
+	i = 0;
+	p = argv[i++];
+	if (!is_empty_arg(p)) {
+		block->file_name = strdup(p);
+		if (block->file_name == NULL) {
+			ERR("not enough memory");
+			return ERR_FATAL;
+		}
+	} else if (block->need_file){
+		ERR("no file specified in %s", arg);
+		return ERR_FATAL;
+	}
+
+	if (block->size_hdr) {
+		p = argv[i++];
+		if (!is_empty_arg(p)) {
+			if (str2u32(p, &block->addr) != 0) {
+				ERR("invalid start address in %s", arg);
+				return ERR_FATAL;
+			}
+			block->addr_set = 1;
+		}
+	}
+
+	p = argv[i++];
+	if (!is_empty_arg(p)) {
+		if (str2u32(p, &block->align) != 0) {
+			ERR("invalid alignment value in %s", arg);
+			return ERR_FATAL;
+		}
+		block->align_set = 1;
+	}
+
+	p = argv[i++];
+	if (!is_empty_arg(p) && (str2u8(p, &block->padc) != 0)) {
+		ERR("invalid paddig character in %s", arg);
+		return ERR_FATAL;
+	}
+
+	num_blocks++;
+
+	return 0;
+}
+
+
+int
+process_blocks(void)
+{
+	struct csys_block *block;
+	uint32_t offs = 0;
+	int i;
+	int res;
+
+	res = 0;
+	/* collecting stats */
+	for (i = 0; i < num_blocks; i++) {
+		block = &blocks[i];
+		res = block_stat_file(block);
+		if (res)
+			return res;
+	}
+
+	/* bootloader */
+	block = boot_block;
+	if (block) {
+		block->size = board->boot_size;
+		if (block->file_size > board->boot_size) {
+			WARN("boot block is too big");
+			res = ERR_INVALID_IMAGE;
+		}
+	}
+	offs += board->boot_size;
+
+	/* configuration data */
+	block = conf_block;
+	if (block) {
+		block->size = board->conf_size;
+		if (block->file_size > board->conf_size) {
+			WARN("config block is too big");
+			res = ERR_INVALID_IMAGE;
+		}
+	}
+	offs += board->conf_size;
+
+	/* webpages */
+	block = webp_block;
+	if (block) {
+
+		memcpy(block->sig, board->sig_webp, 4);
+
+		if (block->addr_set == 0)
+			block->addr = board->addr_webp;
+
+		if (block->align_set == 0)
+			block->align = DEFAULT_BLOCK_ALIGN;
+
+		block->size = align(offs + block->file_size + block->size_hdr +
+				block->size_csum, block->align) - offs;
+
+		if (block->size > board->webp_size_max) {
+			WARN("webpages block is too big");
+			res = ERR_INVALID_IMAGE;
+		}
+
+		DBG(2,"webpages start at %08x, size=%08x", offs,
+				block->size);
+
+		offs += block->size;
+		if (offs > board->flash_size) {
+			WARN("webp block is too big");
+			res = ERR_INVALID_IMAGE;
+		}
+	}
+
+	/* runtime code */
+	block = code_block;
+	if (block) {
+		memcpy(code_block->sig, SIG_CSYS, 4);
+
+		if (block->addr_set == 0)
+			block->addr = board->addr_code;
+
+		if (block->align_set == 0)
+			block->align = DEFAULT_BLOCK_ALIGN;
+
+		block->size = align(offs + block->file_size +
+				block->size_hdr + block->size_csum,
+				block->align) - offs;
+
+		DBG(2,"code block start at %08x, size=%08x", offs,
+				block->size);
+
+		offs += block->size;
+		if (offs > board->flash_size) {
+			WARN("code block is too big");
+			res = ERR_INVALID_IMAGE;
+		}
+	}
+
+	for (i = 0; i < num_blocks; i++) {
+		block = &blocks[i];
+
+		if (block->type != BLOCK_TYPE_XTRA)
+			continue;
+
+		if (block->align_set == 0)
+			block->align = DEFAULT_BLOCK_ALIGN;
+
+		block->size = align(offs + block->file_size,
+				block->align) - offs;
+
+		DBG(2,"file %s start at %08x, size=%08x, align=%08x",
+			block->file_name, offs, block->size, block->align);
+
+		offs += block->size;
+		if (offs > board->flash_size) {
+			WARN("file %s is too big, size=%d, avail=%d",
+				block->file_name, block->file_size,
+				board->flash_size - offs);
+			res = ERR_INVALID_IMAGE;
+		}
+	}
+
+	for (i = 0; i < num_blocks; i++) {
+		block = &blocks[i];
+
+		block->size_avail = block->size - block->size_hdr -
+			block->size_csum;
+
+		if (block->size_avail < block->file_size) {
+			WARN("file %s is too big, size=%d, avail=%d",
+				block->file_name, block->file_size,
+				block->size_avail);
+			res = ERR_INVALID_IMAGE;
+		}
+	}
+
+	return res;
+}
+
+
+int
+main(int argc, char *argv[])
+{
+	int optinvalid = 0;   /* flag for invalid option */
+	int c;
+	int res = ERR_FATAL;
+
+	FILE *outfile;
+
+	progname=basename(argv[0]);
+
+	opterr = 0;  /* could not print standard getopt error messages */
+	while ( 1 ) {
+		optinvalid = 0;
+
+		c = getopt(argc, argv, "b:B:c:dhkr:vw:x:");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'b':
+		case 'c':
+		case 'r':
+		case 'x':
+			optinvalid = parse_opt_block(c,optarg);
+			break;
+		case 'w':
+			if (optarg != NULL && *optarg == '-') {
+				/* rollback */
+				optind--;
+				optarg = NULL;
+			}
+			optinvalid = parse_opt_block(c,optarg);
+			break;
+		case 'd':
+			invalid_causes_error = 0;
+			break;
+		case 'k':
+			keep_invalid_images = 1;
+			break;
+		case 'B':
+			optinvalid = parse_opt_board(c,optarg);
+			break;
+		case 'v':
+			verblevel++;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			optinvalid = 1;
+			break;
+		}
+		if (optinvalid != 0 ){
+			ERR("invalid option: -%c", optopt);
+			goto out;
+		}
+	}
+
+	if (board == NULL) {
+		ERR("no board specified");
+		goto out;
+	}
+
+	if (optind == argc) {
+		ERR("no output file specified");
+		goto out;
+	}
+
+	ofname = argv[optind++];
+
+	if (optind < argc) {
+		ERR("invalid option: %s", argv[optind]);
+		goto out;
+	}
+
+	res = process_blocks();
+	if (res == ERR_FATAL)
+		goto out;
+
+	if (res == ERR_INVALID_IMAGE) {
+		if (invalid_causes_error)
+			res = ERR_FATAL;
+
+		if (keep_invalid_images == 0) {
+			WARN("generation of invalid images disabled", ofname);
+			goto out;
+		}
+
+		WARN("generating invalid image", ofname);
+	}
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		res = ERR_FATAL;
+		goto out;
+	}
+
+	if (write_out_blocks(outfile) != 0) {
+		res = ERR_FATAL;
+		goto out_flush;
+	}
+
+	DBG(1,"Image file %s completed.", ofname);
+
+out_flush:
+	fflush(outfile);
+	fclose(outfile);
+	if (res == ERR_FATAL) {
+		unlink(ofname);
+	}
+out:
+	if (res == ERR_FATAL)
+		return EXIT_FAILURE;
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/firmware-utils/src/mkdapimg.c b/trunk/tools/firmware-utils/src/mkdapimg.c
new file mode 100644
index 00000000..ed662d8e
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkdapimg.c
@@ -0,0 +1,226 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <stdarg.h>
+#include <getopt.h>
+#include <string.h>
+#include <errno.h>
+
+#include <netinet/in.h>	// htonl
+
+// Usage: mkdapimg [-p] [-m <model>] -s <sig> -i <input> -o <output>
+//
+// e.g.: mkdapimg -s RT3052-AP-DAP1350-3 -i sysupgarde.bin -o factory.bin
+//
+// If the model string <model> is not given, we will assume that
+// the leading characters upto the first "-" is the model.
+//
+// The "-p" (patch) option is used to patch the exisiting image with the
+// specified model and signature.
+// The "-x" (fix) option will recalculate the payload size and checksum
+// during the patch mode operation.
+
+// The img_hdr_struct was taken from the D-Link SDK:
+// DAP-1350_A1_FW1.11NA_GPL/GPL_Source_Code/Uboot/DAP-1350/httpd/header.h
+
+#define MAX_MODEL_NAME_LEN	20
+#define MAX_SIG_LEN		30
+#define MAX_REGION_LEN		4
+#define MAX_VERSION_LEN		12
+
+struct img_hdr_struct {
+	uint32_t checksum;
+	char model[MAX_MODEL_NAME_LEN];
+	char sig[MAX_SIG_LEN];
+	uint8_t	partition;       
+	uint8_t hdr_len;
+	uint8_t rsv1;
+	uint8_t rsv2;    
+	uint32_t flash_byte_cnt;  
+} imghdr ;
+
+char *progname;
+
+void
+perrexit(int code, char *msg)
+{
+	fprintf(stderr, "%s: %s: %s\n", progname, msg, strerror(errno));
+	exit(code);
+}
+
+void
+usage()
+{
+	fprintf(stderr, "usage: %s [-p] [-m model] [-r region] [-v version] -s signature -i input -o output\n", progname);
+	exit(1);
+}
+
+int
+main(int ac, char *av[])
+{
+	char model[MAX_MODEL_NAME_LEN+1];
+	char signature[MAX_SIG_LEN+1];
+	char region[MAX_REGION_LEN+1];
+	char version[MAX_VERSION_LEN+1];
+	int patchmode = 0;
+	int fixmode = 0;
+	int have_regionversion = 0;
+
+	FILE *ifile, *ofile;
+	int c;
+	uint32_t cksum;
+	uint32_t bcnt;
+
+	progname = basename(av[0]);
+	memset(model, 0, sizeof(model));
+	memset(signature, 0, sizeof(signature));
+	memset(region, 0, sizeof(region));
+	memset(version, 0, sizeof(version));
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(ac, av, "pxm:r:v:s:i:o:");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'p':
+			patchmode = 1;
+			break;
+		case 'x':
+			fixmode = 1;
+			break;
+		case 'm':
+			if (strlen(optarg) > MAX_MODEL_NAME_LEN) {
+				fprintf(stderr, "%s: model name exceeds %d chars\n",
+					progname, MAX_MODEL_NAME_LEN);
+				exit(1);
+			}
+			strcpy(model, optarg);
+			break;
+		case 'r':
+			if (strlen(optarg) > MAX_REGION_LEN) {
+				fprintf(stderr, "%s: region exceeds %d chars\n",
+					progname, MAX_REGION_LEN);
+				exit(1);
+			}
+			have_regionversion = 1;
+			strcpy(region, optarg);
+			break;
+		case 'v':
+			if (strlen(optarg) > MAX_VERSION_LEN) {
+				fprintf(stderr, "%s: version exceeds %d chars\n",
+					progname, MAX_VERSION_LEN);
+				exit(1);
+			}
+			have_regionversion = 1;
+			strcpy(version, optarg);
+			break;
+		case 's':
+			if (strlen(optarg) > MAX_SIG_LEN) {
+				fprintf(stderr, "%s: signature exceeds %d chars\n",
+					progname, MAX_SIG_LEN);
+				exit(1);
+			}
+			strcpy(signature, optarg);
+			break;
+		case 'i':
+			if ((ifile = fopen(optarg, "r")) == NULL)
+				perrexit(1, optarg);
+			break;
+		case 'o':
+			if ((ofile = fopen(optarg, "w")) == NULL)
+				perrexit(1, optarg);
+			break;
+		default:
+			usage();
+		}
+	}
+
+	if (signature[0] == 0 || ifile == NULL || ofile == NULL) {
+		usage();
+	}
+
+	if (model[0] == 0) {
+		char *p = strchr(signature, '-');
+		if (p == NULL) {
+			fprintf(stderr, "%s: model name unknown\n", progname);
+			exit(1);
+		}
+		if (p - signature > MAX_MODEL_NAME_LEN) {
+			*p = 0;
+			fprintf(stderr, "%s: auto model name failed, string %s too long\n", progname, signature);
+			exit(1);
+		}
+		strncpy(model, signature, p - signature);
+	}
+
+	if (patchmode) {
+		if (fread(&imghdr, sizeof(imghdr), 1, ifile) < 0)
+			perrexit(2, "fread on input");
+	}
+
+	for (bcnt = 0, cksum = 0 ; (c = fgetc(ifile)) != EOF ; bcnt++)
+		cksum += c & 0xff;
+
+	if (fseek(ifile, patchmode ? sizeof(imghdr) : 0, SEEK_SET) < 0)
+		perrexit(2, "fseek on input");
+
+	if (patchmode == 0) {
+		// Fill in the header
+		memset(&imghdr, 0, sizeof(imghdr));
+		imghdr.checksum = htonl(cksum);
+		imghdr.partition = 0 ; // don't care?
+		imghdr.hdr_len = sizeof(imghdr);
+		if (have_regionversion) {
+			imghdr.hdr_len += MAX_REGION_LEN;
+			imghdr.hdr_len += MAX_VERSION_LEN;
+		}
+		imghdr.flash_byte_cnt = htonl(bcnt);
+	} else {
+		if (ntohl(imghdr.checksum) != cksum) {
+			fprintf(stderr, "%s: patch mode, checksum mismatch\n",
+				progname);
+			if (fixmode) {
+				fprintf(stderr, "%s: fixing\n", progname);
+				imghdr.checksum = htonl(cksum);
+			} else
+				exit(3);
+		} else if (ntohl(imghdr.flash_byte_cnt) != bcnt) {
+			fprintf(stderr, "%s: patch mode, size mismatch\n",
+				progname);
+			if (fixmode) {
+				fprintf(stderr, "%s: fixing\n", progname);
+				imghdr.flash_byte_cnt = htonl(bcnt);
+			} else
+				exit(3);
+		}
+	}
+
+	strncpy(imghdr.model, model, MAX_MODEL_NAME_LEN);
+	strncpy(imghdr.sig, signature, MAX_SIG_LEN);
+
+	if (fwrite(&imghdr, sizeof(imghdr), 1, ofile) < 0)
+		perrexit(2, "fwrite header on output");
+	if (have_regionversion) {
+		if (fwrite(&region, MAX_REGION_LEN, 1, ofile) < 0)
+			perrexit(2, "fwrite header on output");
+		if (fwrite(&version, MAX_VERSION_LEN, 1, ofile) < 0)
+			perrexit(2, "fwrite header on output");
+	}
+
+	while ((c = fgetc(ifile)) != EOF) {
+		if (fputc(c, ofile) == EOF)
+			perrexit(2, "fputc on output");
+	}
+
+	if (ferror(ifile))
+		perrexit(2, "fgetc on input");
+
+
+	fclose(ofile);
+	fclose(ifile);
+}
diff --git a/trunk/tools/firmware-utils/src/mkdcs932.c b/trunk/tools/firmware-utils/src/mkdcs932.c
new file mode 100644
index 00000000..28c67aa3
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkdcs932.c
@@ -0,0 +1,39 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License,
+ * version 2 as published by the Free Software Foundation.
+ *
+ * (C) John Crispin <blogic@openwrt.org>
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <errno.h>
+
+int main(int argc, char **argv)
+{
+	uint32_t t = 0, sum = 0x55aa55aa;
+	int fd;
+
+	if ((argc != 2) || ((fd = open(argv[1], O_RDWR)) == -1)) {
+		fprintf(stderr, "Usage: %s input_file\n", *argv);
+		return -EINVAL;
+	}
+
+	lseek(fd, -4, SEEK_END);
+	write(fd, &t, 4);
+	lseek(fd, 0, SEEK_SET);
+
+	while (read(fd, &t, 4) > 0)
+		sum -= t;
+
+	lseek(fd, -4, SEEK_END);
+	write(fd, &sum, 4);
+	close(fd);
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/mkdniimg.c b/trunk/tools/firmware-utils/src/mkdniimg.c
new file mode 100644
index 00000000..7230f09d
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkdniimg.c
@@ -0,0 +1,208 @@
+/*
+ *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#define DNI_HDR_LEN	128
+
+/*
+ * Globals
+ */
+static char *ifname;
+static char *progname;
+static char *ofname;
+static char *version = "1.00.00";
+static char *region = "";
+static char *hd_id;
+
+static char *board_id;
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>\n"
+"  -i <file>       read input from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -v <version>    set image version to <version>\n"
+"  -r <region>     set image region to <region>\n"
+"  -H <hd_id>      set image hardware id to <hd_id>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+int main(int argc, char *argv[])
+{
+	int res = EXIT_FAILURE;
+	int buflen;
+	int err;
+	struct stat st;
+	char *buf;
+	int pos, rem, i;
+	uint8_t csum;
+
+	FILE *outfile, *infile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "B:i:o:v:r:H:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'B':
+			board_id = optarg;
+			break;
+		case 'i':
+			ifname = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'v':
+			version = optarg;
+			break;
+		case 'r':
+			region = optarg;
+			break;
+		case 'H':
+			hd_id = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	if (board_id == NULL) {
+		ERR("no board specified");
+		goto err;
+	}
+
+	if (ifname == NULL) {
+		ERR("no input file specified");
+		goto err;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto err;
+	}
+
+	err = stat(ifname, &st);
+	if (err){
+		ERRS("stat failed on %s", ifname);
+		goto err;
+	}
+
+	buflen = st.st_size + DNI_HDR_LEN + 1;
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto err;
+	}
+
+	memset(buf, 0, DNI_HDR_LEN);
+	pos = snprintf(buf, DNI_HDR_LEN, "device:%s\nversion:V%s\nregion:%s\n",
+		       board_id, version, region);
+	rem = DNI_HDR_LEN - pos;
+	if (pos >= 0 && rem > 1 && hd_id) {
+		snprintf(buf + pos, rem, "hd_id:%s\n", hd_id);
+	}
+
+	infile = fopen(ifname, "r");
+	if (infile == NULL) {
+		ERRS("could not open \"%s\" for reading", ifname);
+		goto err_free;
+	}
+
+	errno = 0;
+	fread(buf +  DNI_HDR_LEN, st.st_size, 1, infile);
+	if (errno != 0) {
+		ERRS("unable to read from file %s", ifname);
+		goto err_close_in;
+	}
+
+	csum = 0;
+	for (i = 0; i < (st.st_size + DNI_HDR_LEN); i++)
+		csum += buf[i];
+
+	csum = 0xff - csum;
+	buf[st.st_size + DNI_HDR_LEN] = csum;
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto err_close_in;
+	}
+
+	errno = 0;
+	fwrite(buf, buflen, 1, outfile);
+	if (errno) {
+		ERRS("unable to write to file %s", ofname);
+		goto err_close_out;
+	}
+
+	res = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(outfile);
+
+ err_close_out:
+	fclose(outfile);
+	if (res != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+
+ err_close_in:
+	fclose(infile);
+
+ err_free:
+	free(buf);
+
+ err:
+	return res;
+}
diff --git a/trunk/tools/firmware-utils/src/mkedimaximg.c b/trunk/tools/firmware-utils/src/mkedimaximg.c
new file mode 100644
index 00000000..d8a017e6
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkedimaximg.c
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2011 Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libgen.h>
+#include <getopt.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <endian.h>	/* for __BYTE_ORDER */
+
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#  define HOST_TO_LE16(x)	(x)
+#  define HOST_TO_LE32(x)	(x)
+#else
+#  define HOST_TO_LE16(x)	bswap_16(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#endif
+
+struct header
+{
+    unsigned char sign[4];
+    unsigned int start;
+    unsigned int flash;
+    unsigned char model[4];
+    unsigned int size;
+} __attribute__ ((packed));
+
+struct finfo
+{
+    char *name;
+    off_t size;
+};
+
+struct buf
+{
+    char *start;
+    size_t size;
+};
+
+static char *progname;
+
+static void usage(int status)
+{
+    FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+    fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+    fprintf(stream,
+	    "\n"
+	    "Options:\n"
+	    "  -s <sig>        set image signature to <sig>\n"
+	    "  -m <model>      set model to <model>\n"
+	    "  -i <file>       read input from file <file>\n"
+	    "  -o <file>       write output to file <file>\n"
+	    "  -f <flash>      set flash address to <flash>\n"
+	    "  -S <start>      set start address to <start>\n");
+
+    exit(status);
+}
+
+static int strtou32(char *arg, unsigned int *val)
+{
+    char *endptr = NULL;
+
+    errno = 0;
+    *val = strtoul(arg, &endptr, 0);
+    if (errno || (endptr == arg) || (*endptr && (endptr != NULL))) {
+	return EXIT_SUCCESS;
+    }
+
+    return EXIT_FAILURE;
+}
+
+static unsigned short fwcsum (struct buf *buf) {
+    int i;
+    unsigned short ret = 0;
+
+    for (i = 0; i < buf->size / 2; i++)
+	ret -= ((unsigned short *) buf->start)[i];
+    
+    return ret;
+}
+
+static int fwread(struct finfo *finfo, struct buf *buf)
+{
+    FILE *f;
+    
+    f = fopen(finfo->name, "r");
+    if (!f) {
+	fprintf(stderr, "could not open \"%s\" for reading\n", finfo->name);
+	usage(EXIT_FAILURE);
+    }
+
+    buf->size = fread(buf->start, 1, finfo->size, f);
+    if (buf->size != finfo->size) {
+	fprintf(stderr, "unable to read from file \"%s\"\n", finfo->name);
+	usage(EXIT_FAILURE);
+    }
+
+    fclose(f);
+
+    return EXIT_SUCCESS;
+}
+
+static int fwwrite(struct finfo *finfo, struct buf *buf)
+{
+    FILE *f;
+
+    f = fopen(finfo->name, "w");
+    if (!f) {
+	fprintf(stderr, "could not open \"%s\" for writing\n", finfo->name);
+	usage(EXIT_FAILURE);
+    }
+
+    buf->size = fwrite(buf->start, 1, finfo->size, f);
+    if (buf->size != finfo->size) {
+	fprintf(stderr, "unable to write to file \"%s\"\n", finfo->name);
+	usage(EXIT_FAILURE);
+    }
+
+    fclose(f);
+
+    return EXIT_SUCCESS;
+}	
+  
+int main(int argc, char **argv)
+{
+    struct stat st;
+    struct header header;
+    struct buf ibuf, obuf;
+    struct finfo ifinfo, ofinfo;
+    unsigned short csum;
+    int c;
+
+    ifinfo.name = ofinfo.name = NULL;
+    header.flash = header.size = header.start = 0;
+    progname = basename(argv[0]);
+
+    while((c = getopt(argc, argv, "i:o:m:s:f:S:h")) != -1) {
+	switch (c) {
+	case 'i':
+	    ifinfo.name = optarg;
+	    break;
+	case 'o':
+	    ofinfo.name = optarg;
+	    break;
+	case 'm':
+	    if (strlen(optarg) != 4) {
+		fprintf(stderr, "model must be 4 characters long\n");
+		usage(EXIT_FAILURE);
+	    }
+	    memcpy(header.model, optarg, 4);
+	    break;
+	case 's':
+	    if (strlen(optarg) != 4) {
+		fprintf(stderr, "signature must be 4 characters long\n");
+		usage(EXIT_FAILURE);
+	    }
+	    memcpy(header.sign, optarg, 4);
+	    break;
+	case 'h':
+	    usage(EXIT_SUCCESS);
+	    break;
+	case 'f':
+	    if (!strtou32(optarg, &header.flash)) {
+		fprintf(stderr, "invalid flash address specified\n");
+		usage(EXIT_FAILURE);
+	    }
+	    break;
+	case 'S':
+	    if (!strtou32(optarg, &header.start)) {
+		fprintf(stderr, "invalid start address specified\n");
+		usage(EXIT_FAILURE);
+	    }
+	    break;
+	default:
+	    usage(EXIT_FAILURE);
+	    break;
+	}
+    }
+
+    if (ifinfo.name == NULL) {
+	fprintf(stderr, "no input file specified\n");
+	usage(EXIT_FAILURE);
+    }
+
+    if (ofinfo.name == NULL) {
+	fprintf(stderr, "no output file specified\n");
+	usage(EXIT_FAILURE);
+    }
+
+    if (stat(ifinfo.name, &st)) {
+	fprintf(stderr, "stat failed on %s\n", ifinfo.name);
+	usage(EXIT_FAILURE);
+    }
+
+    if (header.sign == NULL) {
+	fprintf(stderr, "no signature specified\n");
+	usage(EXIT_FAILURE);
+    }
+
+    if (header.model == NULL) {
+	fprintf(stderr, "no model specified\n");
+	usage(EXIT_FAILURE);
+    }
+
+    if (!header.flash) {
+	fprintf(stderr, "no flash address specified\n");
+	usage(EXIT_FAILURE);
+    }
+
+    if (!header.start) {
+	fprintf(stderr, "no start address specified\n");
+	usage(EXIT_FAILURE);
+    }
+
+    ifinfo.size = st.st_size;
+
+    obuf.size = ifinfo.size + sizeof(struct header) + sizeof(unsigned short);
+    if (obuf.size % sizeof(unsigned short))
+	obuf.size++;
+
+    obuf.start = malloc(obuf.size);
+    if (!obuf.start) {
+	fprintf(stderr, "no memory for buffer\n");
+	usage(EXIT_FAILURE);
+    }
+    memset(obuf.start, 0, obuf.size);
+
+    ibuf.size = ifinfo.size;
+    ibuf.start = obuf.start + sizeof(struct header);
+    
+    if (fwread(&ifinfo, &ibuf))
+	usage(EXIT_FAILURE);
+
+    header.flash = HOST_TO_LE32(header.flash);
+    header.size = HOST_TO_LE32(obuf.size - sizeof(struct header));
+    header.start = HOST_TO_LE32(header.start);
+    memcpy (obuf.start, &header, sizeof(struct header));
+
+    csum = HOST_TO_LE16(fwcsum(&ibuf));
+    memcpy(obuf.start + obuf.size - sizeof(unsigned short),
+	   &csum, sizeof(unsigned short));
+
+    ofinfo.size = obuf.size;
+
+    if (fwwrite(&ofinfo, &obuf))
+	usage(EXIT_FAILURE);
+
+    return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/firmware-utils/src/mkfwimage.c b/trunk/tools/firmware-utils/src/mkfwimage.c
new file mode 100644
index 00000000..e3a03c19
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkfwimage.c
@@ -0,0 +1,467 @@
+/*
+ * Copyright (C) 2007 Ubiquiti Networks, Inc.
+ * Copyright (C) 2008 Lukas Kuna <ValXdater@seznam.cz>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <zlib.h>
+#include <sys/mman.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include "fw.h"
+
+typedef struct fw_layout_data {
+	char		name[PATH_MAX];
+	u_int32_t	kern_start;
+	u_int32_t	kern_entry;
+	u_int32_t	firmware_max_length;
+} fw_layout_t;
+
+fw_layout_t fw_layout_data[] = {
+	{
+		.name		=	"XS2",
+		.kern_start	=	0xbfc30000,
+		.kern_entry	=	0x80041000,
+		.firmware_max_length=	0x00390000,
+	},
+	{
+		.name		=	"XS5",
+		.kern_start	=	0xbe030000,
+		.kern_entry	=	0x80041000,
+		.firmware_max_length=	0x00390000,
+	},
+	{
+		.name		=	"RS",
+		.kern_start	=	0xbf030000,
+		.kern_entry	=	0x80060000,
+		.firmware_max_length=	0x00B00000,
+	},
+	{
+		.name		=	"RSPRO",
+		.kern_start	=	0xbf030000,
+		.kern_entry	=	0x80060000,
+		.firmware_max_length=	0x00F00000,
+	},
+	{
+		.name		=	"LS-SR71",
+		.kern_start	=	0xbf030000,
+		.kern_entry	=	0x80060000,
+		.firmware_max_length=	0x00640000,
+	},
+	{
+		.name		=	"XS2-8",
+		.kern_start	=	0xa8030000,
+		.kern_entry	=	0x80041000,
+		.firmware_max_length=	0x006C0000,
+	},
+	{
+		.name		=	"XM",
+		.kern_start	=	0x9f050000,
+		.kern_entry	=	0x80002000,
+		.firmware_max_length=	0x006A0000,
+	},
+	{	.name		=	"",
+	},
+};
+
+typedef struct part_data {
+	char 	partition_name[64];
+	int  	partition_index;
+	u_int32_t	partition_baseaddr;
+	u_int32_t	partition_startaddr;
+	u_int32_t	partition_memaddr;
+	u_int32_t	partition_entryaddr;
+	u_int32_t  partition_length;
+
+	char	filename[PATH_MAX];
+	struct stat stats;
+} part_data_t;
+
+#define MAX_SECTIONS	8
+#define DEFAULT_OUTPUT_FILE 	"firmware-image.bin"
+#define DEFAULT_VERSION		"UNKNOWN"
+
+#define OPTIONS "B:hv:m:o:r:k:"
+
+static int debug = 0;
+
+typedef struct image_info {
+	char magic[16];
+	char version[256];
+	char outputfile[PATH_MAX];
+	u_int32_t	part_count;
+	part_data_t parts[MAX_SECTIONS];
+} image_info_t;
+
+static void write_header(void* mem, const char *magic, const char* version)
+{
+	header_t* header = mem;
+	memset(header, 0, sizeof(header_t));
+
+	memcpy(header->magic, magic, MAGIC_LENGTH);
+	strncpy(header->version, version, sizeof(header->version));
+	header->crc = htonl(crc32(0L, (unsigned char *)header,
+				sizeof(header_t) - 2 * sizeof(u_int32_t)));
+	header->pad = 0L;
+}
+
+
+static void write_signature(void* mem, u_int32_t sig_offset)
+{
+	/* write signature */
+	signature_t* sign = (signature_t*)(mem + sig_offset);
+	memset(sign, 0, sizeof(signature_t));
+
+	memcpy(sign->magic, MAGIC_END, MAGIC_LENGTH);
+	sign->crc = htonl(crc32(0L,(unsigned char *)mem, sig_offset));
+	sign->pad = 0L;
+}
+
+static int write_part(void* mem, part_data_t* d)
+{
+	char* addr;
+	int fd;
+	part_t* p = mem;
+	part_crc_t* crc = mem + sizeof(part_t) + d->stats.st_size;
+
+	fd = open(d->filename, O_RDONLY);
+	if (fd < 0)
+	{
+		ERROR("Failed opening file '%s'\n", d->filename);
+		return -1;
+	}
+
+	if ((addr=(char*)mmap(0, d->stats.st_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED)
+	{
+		ERROR("Failed mmaping memory for file '%s'\n", d->filename);
+		close(fd);
+		return -2;
+	}
+
+	memcpy(mem + sizeof(part_t), addr, d->stats.st_size);
+	munmap(addr, d->stats.st_size);
+
+	memset(p->name, 0, sizeof(p->name));
+	strncpy(p->magic, MAGIC_PART, MAGIC_LENGTH);
+	strncpy(p->name, d->partition_name, sizeof(p->name));
+	p->index = htonl(d->partition_index);
+	p->data_size = htonl(d->stats.st_size);
+	p->part_size = htonl(d->partition_length);
+	p->baseaddr = htonl(d->partition_baseaddr);
+	p->memaddr = htonl(d->partition_memaddr);
+	p->entryaddr = htonl(d->partition_entryaddr);
+
+	crc->crc = htonl(crc32(0L, mem, d->stats.st_size + sizeof(part_t)));
+	crc->pad = 0L;
+
+	return 0;
+}
+
+static void usage(const char* progname)
+{
+	INFO("Version %s\n"
+             "Usage: %s [options]\n"
+	     "\t-v <version string>\t - firmware version information, default: %s\n"
+	     "\t-o <output file>\t - firmware output file, default: %s\n"
+	     "\t-m <magic>\t - firmware magic, default: %s\n"
+	     "\t-k <kernel file>\t\t - kernel file\n"
+	     "\t-r <rootfs file>\t\t - rootfs file\n"
+	     "\t-B <board name>\t\t - choose firmware layout for specified board (XS2, XS5, RS, XM)\n"
+	     "\t-h\t\t\t - this help\n", VERSION,
+	     progname, DEFAULT_VERSION, DEFAULT_OUTPUT_FILE, MAGIC_HEADER);
+}
+
+static void print_image_info(const image_info_t* im)
+{
+	int i = 0;
+	INFO("Firmware version: '%s'\n"
+	     "Output file: '%s'\n"
+	     "Part count: %u\n",
+	     im->version, im->outputfile,
+	     im->part_count);
+
+	for (i = 0; i < im->part_count; ++i)
+	{
+		const part_data_t* d = &im->parts[i];
+		INFO(" %10s: %8ld bytes (free: %8ld)\n",
+		     d->partition_name,
+		     d->stats.st_size,
+		     d->partition_length - d->stats.st_size);
+	}
+}
+
+
+
+static u_int32_t filelength(const char* file)
+{
+	FILE *p;
+	int ret = -1;
+
+	if ( (p = fopen(file, "rb") ) == NULL) return (-1);
+
+	fseek(p, 0, SEEK_END);
+	ret = ftell(p);
+
+	fclose (p);
+
+	return (ret);
+}
+
+static int create_image_layout(const char* kernelfile, const char* rootfsfile, char* board_name, image_info_t* im)
+{
+	part_data_t* kernel = &im->parts[0];
+	part_data_t* rootfs = &im->parts[1];
+
+	fw_layout_t* p;
+
+	p = &fw_layout_data[0];
+	while ((strlen(p->name) != 0) && (strncmp(p->name, board_name, sizeof(board_name)) != 0))
+		p++;
+	if (p->name == NULL) {
+		printf("BUG! Unable to find default fw layout!\n");
+		exit(-1);
+	}
+
+	printf("board = %s\n", p->name);
+	strcpy(kernel->partition_name, "kernel");
+	kernel->partition_index = 1;
+	kernel->partition_baseaddr = p->kern_start;
+	if ( (kernel->partition_length = filelength(kernelfile)) < 0) return (-1);
+	kernel->partition_memaddr = p->kern_entry;
+	kernel->partition_entryaddr = p->kern_entry;
+	strncpy(kernel->filename, kernelfile, sizeof(kernel->filename));
+
+	if (filelength(rootfsfile) + kernel->partition_length > p->firmware_max_length)
+		return (-2);
+
+	strcpy(rootfs->partition_name, "rootfs");
+	rootfs->partition_index = 2;
+	rootfs->partition_baseaddr = kernel->partition_baseaddr + kernel->partition_length;
+	rootfs->partition_length = p->firmware_max_length - kernel->partition_length;
+	rootfs->partition_memaddr = 0x00000000;
+	rootfs->partition_entryaddr = 0x00000000;
+	strncpy(rootfs->filename, rootfsfile, sizeof(rootfs->filename));
+
+printf("kernel: %d 0x%08x\n", kernel->partition_length, kernel->partition_baseaddr);
+printf("root: %d 0x%08x\n", rootfs->partition_length, rootfs->partition_baseaddr);
+	im->part_count = 2;
+
+	return 0;
+}
+
+/**
+ * Checks the availability and validity of all image components.
+ * Fills in stats member of the part_data structure.
+ */
+static int validate_image_layout(image_info_t* im)
+{
+	int i;
+
+	if (im->part_count == 0 || im->part_count > MAX_SECTIONS)
+	{
+		ERROR("Invalid part count '%d'\n", im->part_count);
+		return -1;
+	}
+
+	for (i = 0; i < im->part_count; ++i)
+	{
+		part_data_t* d = &im->parts[i];
+		int len = strlen(d->partition_name);
+		if (len == 0 || len > 16)
+		{
+			ERROR("Invalid partition name '%s' of the part %d\n",
+					d->partition_name, i);
+			return -1;
+		}
+		if (stat(d->filename, &d->stats) < 0)
+		{
+			ERROR("Couldn't stat file '%s' from part '%s'\n",
+				       	d->filename, d->partition_name);
+			return -2;
+		}
+		if (d->stats.st_size == 0)
+		{
+			ERROR("File '%s' from part '%s' is empty!\n",
+				       	d->filename, d->partition_name);
+			return -3;
+		}
+		if (d->stats.st_size > d->partition_length) {
+			ERROR("File '%s' too big (%d) - max size: 0x%08X (exceeds %lu bytes)\n",
+				       	d->filename, i, d->partition_length,
+					d->stats.st_size - d->partition_length);
+			return -4;
+		}
+	}
+
+	return 0;
+}
+
+static int build_image(image_info_t* im)
+{
+	char* mem;
+	char* ptr;
+	u_int32_t mem_size;
+	FILE* f;
+	int i;
+
+	// build in-memory buffer
+	mem_size = sizeof(header_t) + sizeof(signature_t);
+	for (i = 0; i < im->part_count; ++i)
+	{
+		part_data_t* d = &im->parts[i];
+		mem_size += sizeof(part_t) + d->stats.st_size + sizeof(part_crc_t);
+	}
+
+	mem = (char*)calloc(mem_size, 1);
+	if (mem == NULL)
+	{
+		ERROR("Cannot allocate memory chunk of size '%u'\n", mem_size);
+		return -1;
+	}
+
+	// write header
+	write_header(mem, im->magic, im->version);
+	ptr = mem + sizeof(header_t);
+	// write all parts
+	for (i = 0; i < im->part_count; ++i)
+	{
+		part_data_t* d = &im->parts[i];
+		int rc;
+		if ((rc = write_part(ptr, d)) != 0)
+		{
+			ERROR("ERROR: failed writing part %u '%s'\n", i, d->partition_name);
+		}
+		ptr += sizeof(part_t) + d->stats.st_size + sizeof(part_crc_t);
+	}
+	// write signature
+	write_signature(mem, mem_size - sizeof(signature_t));
+
+	// write in-memory buffer into file
+	if ((f = fopen(im->outputfile, "w")) == NULL)
+	{
+		ERROR("Can not create output file: '%s'\n", im->outputfile);
+		return -10;
+	}
+
+	if (fwrite(mem, mem_size, 1, f) != 1)
+	{
+		ERROR("Could not write %d bytes into file: '%s'\n",
+				mem_size, im->outputfile);
+		return -11;
+	}
+
+	free(mem);
+	fclose(f);
+	return 0;
+}
+
+
+int main(int argc, char* argv[])
+{
+	char kernelfile[PATH_MAX];
+	char rootfsfile[PATH_MAX];
+	char board_name[PATH_MAX];
+	int o, rc;
+	image_info_t im;
+
+	memset(&im, 0, sizeof(im));
+	memset(kernelfile, 0, sizeof(kernelfile));
+	memset(rootfsfile, 0, sizeof(rootfsfile));
+	memset(board_name, 0, sizeof(board_name));
+
+	strcpy(im.outputfile, DEFAULT_OUTPUT_FILE);
+	strcpy(im.version, DEFAULT_VERSION);
+	strncpy(im.magic, MAGIC_HEADER, sizeof(im.magic));
+
+	while ((o = getopt(argc, argv, OPTIONS)) != -1)
+	{
+		switch (o) {
+		case 'v':
+			if (optarg)
+				strncpy(im.version, optarg, sizeof(im.version));
+			break;
+		case 'o':
+			if (optarg)
+				strncpy(im.outputfile, optarg, sizeof(im.outputfile));
+			break;
+		case 'm':
+			if (optarg)
+				strncpy(im.magic, optarg, sizeof(im.magic));
+			break;
+		case 'h':
+			usage(argv[0]);
+			return -1;
+		case 'k':
+			if (optarg)
+				strncpy(kernelfile, optarg, sizeof(kernelfile));
+			break;
+		case 'r':
+			if (optarg)
+				strncpy(rootfsfile, optarg, sizeof(rootfsfile));
+			break;
+		case 'B':
+			if (optarg)
+				strncpy(board_name, optarg, sizeof(board_name));
+			break;
+		}
+	}
+	if (strlen(board_name) == 0)
+		strcpy(board_name, "XS2"); /* default to XS2 */
+
+	if (strlen(kernelfile) == 0)
+	{
+		ERROR("Kernel file is not specified, cannot continue\n");
+		usage(argv[0]);
+		return -2;
+	}
+
+	if (strlen(rootfsfile) == 0)
+	{
+		ERROR("Root FS file is not specified, cannot continue\n");
+		usage(argv[0]);
+		return -2;
+	}
+
+	if ((rc = create_image_layout(kernelfile, rootfsfile, board_name, &im)) != 0)
+	{
+		ERROR("Failed creating firmware layout description - error code: %d\n", rc);
+		return -3;
+	}
+
+	if ((rc = validate_image_layout(&im)) != 0)
+	{
+		ERROR("Failed validating firmware layout - error code: %d\n", rc);
+		return -4;
+	}
+
+	print_image_info(&im);
+
+	if ((rc = build_image(&im)) != 0)
+	{
+		ERROR("Failed building image file '%s' - error code: %d\n", im.outputfile, rc);
+		return -5;
+	}
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/mkfwimage2.c b/trunk/tools/firmware-utils/src/mkfwimage2.c
new file mode 100644
index 00000000..993c3d44
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkfwimage2.c
@@ -0,0 +1,447 @@
+/*
+ * Copyright (C) 2007 Ubiquiti Networks, Inc.
+ * Copyright (C) 2008 Lukas Kuna <ValXdater@seznam.cz>
+ * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <zlib.h>
+#include <sys/mman.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include "fw.h"
+
+#undef VERSION
+#define VERSION "1.2-OpenWrt.1"
+
+#define MAX_SECTIONS		8
+#define DEFAULT_OUTPUT_FILE 	"firmware-image.bin"
+#define DEFAULT_VERSION		"UNKNOWN"
+#define DEFAULT_FLASH_BASE	(0xbfc00000)
+
+#define FIRMWARE_MAX_LENGTH	(0x390000)
+
+typedef struct part_data {
+	char 		partition_name[64];
+	int  		partition_index;
+	u_int32_t	partition_baseaddr;
+	u_int32_t	partition_offset;
+	u_int32_t	partition_memaddr;
+	u_int32_t	partition_entryaddr;
+	u_int32_t	partition_length;
+
+	char		filename[PATH_MAX];
+	struct stat	stats;
+} part_data_t;
+
+typedef struct image_info {
+	char		version[256];
+	char		outputfile[PATH_MAX];
+	char		magic[MAGIC_LENGTH];
+	u_int32_t	flash_baseaddr;
+	u_int32_t	part_count;
+	part_data_t	parts[MAX_SECTIONS];
+} image_info_t;
+
+static image_info_t im;
+static int debug = 0;
+static int zero_part_baseaddr = 0;
+
+static void write_header(void* mem, const char* version)
+{
+	header_t* header = mem;
+	memset(header, 0, sizeof(header_t));
+
+	memcpy(header->magic, im.magic, MAGIC_LENGTH);
+	strncpy(header->version, version, sizeof(header->version));
+	header->crc = htonl(crc32(0L, (unsigned char *)header,
+				sizeof(header_t) - 2 * sizeof(u_int32_t)));
+	header->pad = 0L;
+}
+
+static void write_signature(void* mem, u_int32_t sig_offset)
+{
+	/* write signature */
+	signature_t* sign = (signature_t*)(mem + sig_offset);
+	memset(sign, 0, sizeof(signature_t));
+
+	memcpy(sign->magic, MAGIC_END, MAGIC_LENGTH);
+	sign->crc = htonl(crc32(0L,(unsigned char *)mem, sig_offset));
+	sign->pad = 0L;
+}
+
+static int write_part(void* mem, part_data_t* d)
+{
+	char* addr;
+	int fd;
+	part_t* p = mem;
+	part_crc_t* crc = mem + sizeof(part_t) + d->stats.st_size;
+
+	fd = open(d->filename, O_RDONLY);
+	if (fd < 0) {
+		ERROR("Failed opening file '%s'\n", d->filename);
+		return -1;
+	}
+
+	if ((addr=(char*)mmap(0, d->stats.st_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
+		ERROR("Failed mmaping memory for file '%s'\n", d->filename);
+		close(fd);
+		return -2;
+	}
+
+	memcpy(mem + sizeof(part_t), addr, d->stats.st_size);
+	munmap(addr, d->stats.st_size);
+
+	memset(p->name, 0, sizeof(p->name));
+	strncpy(p->magic, MAGIC_PART, MAGIC_LENGTH);
+	strncpy(p->name, d->partition_name, sizeof(p->name));
+	p->index = htonl(d->partition_index);
+	p->data_size = htonl(d->stats.st_size);
+	p->part_size = htonl(d->partition_length);
+	p->baseaddr = htonl(d->partition_baseaddr);
+	p->memaddr = htonl(d->partition_memaddr);
+	p->entryaddr = htonl(d->partition_entryaddr);
+
+	crc->crc = htonl(crc32(0L, mem, d->stats.st_size + sizeof(part_t)));
+	crc->pad = 0L;
+
+	return 0;
+}
+
+static void usage(const char* progname)
+{
+	INFO("Version %s\n"
+             "Usage: %s [options]\n"
+	     "\t-v <version string>\t - firmware version information, default: %s\n"
+	     "\t-m <magic>\t\t - firmware magic, default: %s\n"
+	     "\t-f <flash base>\t\t - flash base address, default: 0x%08x\n"
+	     "\t-o <output file>\t - firmware output file, default: %s\n"
+	     "\t-p <name>:<offset>:<len>:<memaddr>:<entry>:<file>\n "
+	     "\t\t\t\t - create a partition from <file>\n"
+	     "\t-z\t\t\t - set partition offsets to zero\n"
+	     "\t-h\t\t\t - this help\n",
+	     VERSION, progname, DEFAULT_VERSION, MAGIC_HEADER,
+	     DEFAULT_FLASH_BASE, DEFAULT_OUTPUT_FILE);
+}
+
+static void print_image_info(void)
+{
+	int i;
+
+	INFO("Firmware version : '%s'\n"
+	     "Output file      : '%s'\n"
+	     "Part count       : %u\n",
+	     im.version, im.outputfile, im.part_count);
+
+	for (i = 0; i < im.part_count; ++i) {
+		const part_data_t* d = &im.parts[i];
+		INFO("  %10s: %08x %08x %08x %08x %8ld bytes (free: %8ld)\n",
+		     d->partition_name,
+		     d->partition_baseaddr,
+		     d->partition_length,
+		     d->partition_entryaddr,
+		     d->partition_memaddr,
+		     d->stats.st_size,
+		     d->partition_length - d->stats.st_size);
+	}
+}
+
+static int filelength(const char* file)
+{
+	FILE *p;
+	int ret = -1;
+
+	if ( (p = fopen(file, "rb") ) == NULL) return (-1);
+
+	fseek(p, 0, SEEK_END);
+	ret = ftell(p);
+
+	fclose (p);
+
+	return (ret);
+}
+
+int str2u32(char *arg, u_int32_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno = 0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err == arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	*val = t;
+	return 0;
+}
+
+static int image_layout_add_partition(const char *part_desc)
+{
+	part_data_t *d;
+	char memaddr[16];
+	char entryaddr[16];
+	char offset[16];
+	char length[16];
+	int t;
+
+	if (im.part_count >= MAX_SECTIONS) {
+		ERROR("Too many partitions specified\n");
+		return (-1);
+	}
+
+	d = &im.parts[im.part_count];
+	t = sscanf(part_desc, "%15[0-9a-zA-Z]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%15[0-9a-fA-Fx]:%256s",
+			d->partition_name,
+			offset,
+			length,
+			memaddr,
+			entryaddr,
+			d->filename);
+
+	if (t != 6) {
+		ERROR("Bad partition parameter %d, '%s'\n", t, part_desc);
+		return (-1);
+	}
+
+	if (strlen(d->partition_name) == 0) {
+		ERROR("No partition name specified in '%s'\n", part_desc);
+		return (-1);
+	}
+
+	if (str2u32(offset, &d->partition_offset)) {
+		ERROR("Bad offset value '%s'\n", offset);
+		return (-1);
+	}
+
+	if (str2u32(length, &d->partition_length)) {
+		ERROR("Bad length value '%s'\n", length);
+		return (-1);
+	}
+
+	if (d->partition_length == 0) {
+		int flen;
+		flen = filelength(d->filename);
+		if (flen < 0) {
+			ERROR("Unable to determine size of '%s'\n",
+					d->filename);
+			return (-1);
+		}
+		d->partition_length = flen;
+	}
+
+	if (str2u32(memaddr, &d->partition_memaddr)) {
+		ERROR("Bad memaddr vaule '%s'\n", memaddr);
+		return (-1);
+	}
+
+	if (str2u32(entryaddr, &d->partition_entryaddr)) {
+		ERROR("Bad entry address value '%s'\n", entryaddr);
+		return (-1);
+	}
+
+	im.part_count++;
+	d->partition_index = im.part_count;
+
+	return 0;
+}
+
+static int image_layout_verify(void)
+{
+	u_int32_t offset;
+	int i;
+
+	if (im.part_count == 0) {
+		ERROR("No partitions specified\n");
+		return -1;
+	}
+
+	offset = im.parts[0].partition_offset;
+	for (i = 0; i < im.part_count; i++)
+	{
+		part_data_t* d = &im.parts[i];
+
+		if (stat(d->filename, &d->stats) < 0) {
+			ERROR("Couldn't stat file '%s' from part '%s'\n",
+					d->filename, d->partition_name);
+			return -2;
+		}
+
+		if (d->stats.st_size == 0) {
+			ERROR("File '%s' from part '%s' is empty!\n",
+					d->filename, d->partition_name);
+			return -3;
+		}
+
+		if (d->stats.st_size > d->partition_length) {
+			ERROR("File '%s' too big (%d) - max size: 0x%08X (exceeds %lu bytes)\n",
+				d->filename, i, d->partition_length,
+				d->stats.st_size - d->partition_length);
+			return -4;
+		}
+
+		if (d->partition_offset < offset)
+			d->partition_offset = offset;
+
+		if (zero_part_baseaddr) {
+			d->partition_baseaddr = 0;
+		} else {
+			d->partition_baseaddr =
+				im.flash_baseaddr + d->partition_offset;
+		}
+		offset += d->partition_length;
+	}
+
+	return 0;
+}
+
+static int build_image(void)
+{
+	char* mem;
+	char* ptr;
+	u_int32_t mem_size;
+	FILE* f;
+	int i;
+
+	/* build in-memory buffer */
+	mem_size = sizeof(header_t) + sizeof(signature_t);
+	for (i = 0; i < im.part_count; ++i) {
+		part_data_t* d = &im.parts[i];
+		mem_size += sizeof(part_t) + d->stats.st_size + sizeof(part_crc_t);
+	}
+
+	mem = (char*)calloc(mem_size, 1);
+	if (mem == NULL) {
+		ERROR("Cannot allocate memory chunk of size '%u'\n", mem_size);
+		return -1;
+	}
+
+	/* write header */
+	write_header(mem, im.version);
+	ptr = mem + sizeof(header_t);
+
+	/* write all parts */
+	for (i = 0; i < im.part_count; ++i) {
+		part_data_t* d = &im.parts[i];
+		int rc;
+		if ((rc = write_part(ptr, d)) != 0) {
+			ERROR("ERROR: failed writing part %u '%s'\n", i, d->partition_name);
+			return -1;
+		}
+		ptr += sizeof(part_t) + d->stats.st_size + sizeof(part_crc_t);
+	}
+
+
+	/* write signature */
+	write_signature(mem, mem_size - sizeof(signature_t));
+
+	/* write in-memory buffer into file */
+	if ((f = fopen(im.outputfile, "w")) == NULL) {
+		ERROR("Can not create output file: '%s'\n", im.outputfile);
+		return -10;
+	}
+
+	if (fwrite(mem, mem_size, 1, f) != 1) {
+		ERROR("Could not write %d bytes into file: '%s'\n",
+				mem_size, im.outputfile);
+		return -11;
+	}
+
+	free(mem);
+	fclose(f);
+	return 0;
+}
+
+int main(int argc, char* argv[])
+{
+	int o, rc;
+
+	memset(&im, 0, sizeof(im));
+
+	strcpy(im.outputfile, DEFAULT_OUTPUT_FILE);
+	strcpy(im.version, DEFAULT_VERSION);
+	memcpy(im.magic, MAGIC_HEADER, MAGIC_LENGTH);
+	im.flash_baseaddr = DEFAULT_FLASH_BASE;
+
+	while ((o = getopt(argc, argv, "f:hm:o:p:v:z")) != -1)
+	{
+		switch (o) {
+		case 'f':
+			if (optarg)
+				if (str2u32(optarg, &im.flash_baseaddr)) {
+					ERROR("Invalid flash start address %s\n", optarg);
+					return -1;
+				}
+			break;
+		case 'h':
+			usage(argv[0]);
+			return -1;
+		case 'm':
+			if (optarg) {
+				if (strlen(optarg) != MAGIC_LENGTH) {
+					ERROR("Invalid magic %s\n", optarg);
+					return -1;
+				}
+
+				memcpy(im.magic, optarg, MAGIC_LENGTH);
+			}
+			break;
+		case 'o':
+			if (optarg)
+				strncpy(im.outputfile, optarg, sizeof(im.outputfile));
+			break;
+		case 'p':
+			if (optarg) {
+				if (image_layout_add_partition(optarg))
+					return -1;
+			}
+			break;
+		case 'v':
+			if (optarg)
+				strncpy(im.version, optarg, sizeof(im.version));
+			break;
+		case 'z':
+			zero_part_baseaddr = 1;
+			break;
+		}
+	}
+
+	rc = image_layout_verify();
+	if (rc)	{
+		ERROR("Failed validating firmware layout - error code: %d\n",
+				rc);
+		return -4;
+	}
+
+	print_image_info();
+
+	rc = build_image();
+	if (rc)	{
+		ERROR("Failed building image file '%s' - error code: %d\n",
+				im.outputfile, rc);
+		return -5;
+	}
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/mkheader_gemtek.c b/trunk/tools/firmware-utils/src/mkheader_gemtek.c
new file mode 100644
index 00000000..9e618efb
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkheader_gemtek.c
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2014  Claudio Leite <leitec@staticky.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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
+ */
+
+/*
+ * Builds a proper flash image for routers using some Gemtek
+ * OEM boards. These include the Airlink101 AR725W, the
+ * Asante SmartHub 600 (AWRT-600N), and Linksys WRT100/110.
+ *
+ * The resulting image is compatible with the factory firmware
+ * web upgrade and TFTP interface.
+ *
+ * To build:
+ *  gcc -O2 -o mkheader_gemtek mkheader_gemtek.c -lz
+ *
+ * Claudio Leite <leitec@staticky.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zlib.h>		/* for crc32() */
+
+/*
+ * The header is in little-endian format. In case
+ * we are on a BE host, we need to swap binary
+ * values.
+ */
+#ifdef __APPLE__
+# include <libkern/OSByteOrder.h>
+# define le32 OSSwapHostToLittleInt32
+#else
+# if defined(__linux__)
+#  include <endian.h>
+#  if __BYTE_ORDER == __BIG_ENDIAN
+#   define CPU_BIG_ENDIAN
+#  endif
+# else
+#  include <sys/endian.h>		/* BSD's should have this */
+#  if _BYTE_ORDER == _BIG_ENDIAN
+#   define CPU_BIG_ENDIAN
+#  endif
+# endif
+# ifdef CPU_BIG_ENDIAN
+#  define le32(x) (((x & 0xff000000) >> 24) | \
+                   ((x & 0x00ff0000) >> 8)  | \
+                   ((x & 0x0000ff00) << 8)  | \
+                   ((x & 0x000000ff) << 24))
+# else
+#  define le32(x) (x)
+# endif
+#endif
+
+struct gemtek_header {
+	uint8_t 	magic[4];
+	uint8_t 	version[4];
+	uint32_t 	product_id;
+	uint32_t 	imagesz;
+	uint32_t 	checksum;
+	uint32_t 	fast_checksum;
+	uint8_t 	build[4];
+	uint8_t 	lang[4];
+};
+
+#define HDRLEN	sizeof(struct gemtek_header)
+
+struct machines {
+	char           *desc;
+	char           *id;
+	uint32_t 	maxsize;
+	struct gemtek_header header;
+};
+
+struct machines mach_def[] = {
+	{"Airlink101 AR725W", "ar725w", 0x340000,
+		{"GMTK", "1003", le32(0x03000001), 0, 0,
+		  0, "01\0\0", "EN\0\0"}},
+	{"Asante AWRT-600N", "awrt600n", 0x340000,
+		{"A600", "1005", le32(0x03000001), 0, 0,
+		  0, "01\0\0", "EN\0\0"}},
+	{"Linksys WRT100", "wrt100", 0x320000,
+		{"GMTK", "1007", le32(0x03040001), 0, 0,
+		  0, "2\0\0\0", "EN\0\0"}},
+	{"Linksys WRT110", "wrt110", 0x320000,
+		{"GMTK", "1007", le32(0x03040001), 0, 0,
+		  0, "2\0\0\0", "EN\0\0"}},
+	{0}
+};
+
+int
+main(int argc, char *argv[])
+{
+	unsigned long 	res, flen;
+	struct gemtek_header my_hdr;
+	FILE           *f, *f_out;
+	int 		image_type = -1, index;
+	uint8_t        *buf;
+	uint32_t 	crc;
+
+	if (argc < 3) {
+		fprintf(stderr, "mkheader_gemtek <uImage> <webflash image> [machine ID]\n");
+		fprintf(stderr, "  where [machine ID] is one of:\n");
+		for (index = 0; mach_def[index].desc != 0; index++) {
+			fprintf(stderr, "    %-10s  %s", mach_def[index].id, mach_def[index].desc);
+			if (index == 0)
+				fprintf(stderr, " (default)\n");
+			else
+				fprintf(stderr, "\n");
+		}
+
+		exit(-1);
+	}
+
+	if (argc == 4) {
+		for(index = 0; mach_def[index].id != 0; index++) {
+			if(strcmp(mach_def[index].id, argv[3]) == 0) {
+				image_type = index;
+				break;
+			}
+		}
+
+		if(image_type == -1) {
+			fprintf(stderr, "\nERROR: invalid machine type\n");
+			exit(-1);
+		}
+	} else
+		image_type = 0;
+
+	printf("Opening %s...\n", argv[1]);
+
+	f = fopen(argv[1], "r");
+	if(!f) {
+		fprintf(stderr, "\nERROR: couldn't open input image\n");
+		exit(-1);
+	}
+
+	fseek(f, 0, SEEK_END);
+	flen = (unsigned long) ftell(f);
+
+	printf("  %lu (0x%lX) bytes long\n", flen, flen);
+
+	if (flen > mach_def[image_type].maxsize) {
+		fprintf(stderr, "\nERROR: image exceeds maximum compatible size\n");
+		goto f_error;
+	}
+
+	buf = malloc(flen + HDRLEN);
+	if (!buf) {
+		fprintf(stderr, "\nERROR: couldn't allocate buffer\n");
+		goto f_error;
+	}
+	rewind(f);
+	res = fread(buf + HDRLEN, 1, flen, f);
+	if (res != flen) {
+		perror("Couldn't read entire file: fread()");
+		goto f_error;
+	}
+	fclose(f);
+
+	printf("\nCreating %s...\n", argv[2]);
+
+	memcpy(&my_hdr, &mach_def[image_type].header, HDRLEN);
+
+	printf("  Using %s magic\n", mach_def[image_type].desc);
+
+	my_hdr.imagesz = le32(flen + HDRLEN);
+	memcpy(my_hdr.lang, "EN", 2);
+
+	memcpy(buf, &my_hdr, HDRLEN);
+
+	crc = crc32(0, buf, flen + HDRLEN);
+	printf("  CRC32: %08X\n", crc);
+
+	my_hdr.checksum = le32(crc);
+	memcpy(buf, &my_hdr, HDRLEN);
+
+	printf("  Writing...\n");
+
+	f_out = fopen(argv[2], "w");
+	if(!f_out) {
+		fprintf(stderr, "\nERROR: couldn't open output image\n");
+		exit(-1);
+	}
+
+	fwrite(buf, 1, flen + HDRLEN, f_out);
+
+	fclose(f_out);
+
+	free(buf);
+	return 0;
+
+f_error:
+	fclose(f);
+	exit(-1);
+}
diff --git a/trunk/tools/firmware-utils/src/mkhilinkfw.c b/trunk/tools/firmware-utils/src/mkhilinkfw.c
new file mode 100644
index 00000000..99322d4e
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkhilinkfw.c
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2013 Jeff Kent <jeff@jkent.net>
+ *
+ * This program is free software; you can redistribute 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 that 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
+ *
+ * This tool encrypts and decrypts uImage formatted firmware for Hilink
+ * HLK-RM04 wireless modules.  It will also truncate a dump of mtd6 and make
+ * it an image suitable for flashing via the stock firmware upgrade page.
+ *
+ * Build instructions: 
+ *   gcc -lcrypto hlkcrypt.c -o hlkcrypt
+ */
+ 
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <openssl/des.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+ 
+#define DES_KEY "H@L9K*(3"
+ 
+#ifndef min
+#define min(a,b) \
+   ({ __typeof__ (a) _a = (a); \
+       __typeof__ (b) _b = (b); \
+     _a < _b ? _a : _b; })
+#endif
+ 
+#define IH_MAGIC    0x27051956
+#define IH_NMLEN    32
+typedef struct image_header {
+    uint32_t    ih_magic;   /* Image Header Magic Number    */
+    uint32_t    ih_hcrc;    /* Image Header CRC Checksum    */
+    uint32_t    ih_time;    /* Image Creation Timestamp */
+    uint32_t    ih_size;    /* Image Data Size      */
+    uint32_t    ih_load;    /* Data  Load  Address      */
+    uint32_t    ih_ep;      /* Entry Point Address      */
+    uint32_t    ih_dcrc;    /* Image Data CRC Checksum  */
+    uint8_t     ih_os;      /* Operating System     */
+    uint8_t     ih_arch;    /* CPU architecture     */
+    uint8_t     ih_type;    /* Image Type           */
+    uint8_t     ih_comp;    /* Compression Type     */
+    uint8_t     ih_name[IH_NMLEN];  /* Image Name       */
+} image_header_t;
+ 
+static int temp_fd = -1;
+static DES_key_schedule schedule;
+ 
+static void show_usage(const char *arg0);
+static void exit_cleanup(void);
+static void copy_file(int src, int dst);
+static void do_encrypt(void *p, off_t len);
+static void do_decrypt(void *p, off_t len);
+ 
+ 
+int main(int argc, char **argv)
+{
+	int encrypt_opt = 0;
+	int decrypt_opt = 0;
+	int input_opt = 0;
+	int output_opt = 0;
+	char *input_filename = NULL;
+	char *output_filename = NULL;
+ 
+	int input_fd;
+	int output_fd;
+	off_t file_len;
+	char *p;
+	char buf[sizeof(image_header_t) + 3];
+	image_header_t *header;
+ 
+	while (1) {
+		static struct option long_options[] = {
+			{"encrypt", no_argument,       0, 'e'},
+			{"decrypt", no_argument,       0, 'd'},
+			{"input",   required_argument, 0, 'i'},
+			{"output",  required_argument, 0, 'o'},
+			{0,         0,                 0, 0  }
+		};
+		int option_index = 0;
+		int c = getopt_long(argc, argv, "dei:o:",
+		                long_options, &option_index);
+		if (c == -1)
+			break;
+ 
+		switch (c) {
+		case 'd':
+			decrypt_opt++;
+			if (decrypt_opt > 1) {
+				fprintf(stderr, "%s: decrypt may only be specified once\n",
+				        argv[0]);
+				show_usage(argv[0]);
+			}
+			break;
+ 
+		case 'e':
+			encrypt_opt++;
+			if (encrypt_opt > 1) {
+				fprintf(stderr, "%s: encrypt may only be specified once\n",
+				        argv[0]);
+				show_usage(argv[0]);
+			}
+			break;
+ 
+		case 'i':
+			input_opt++;
+			if (input_opt > 1) {
+				fprintf(stderr, "%s: only one input file may be specified\n",
+				        argv[0]);
+				show_usage(argv[0]);
+			}
+			if (strcmp("-", optarg) != 0) {
+				input_filename = optarg;
+			}
+			break;
+ 
+		case 'o':
+			output_opt++;
+			if (output_opt > 1) {
+				fprintf(stderr, "%s: only one output file may be specified\n",
+				        argv[0]);
+				show_usage(argv[0]);
+			}
+			if (strcmp("-", optarg) != 0) {
+				output_filename = optarg;
+			}
+			break;
+ 
+		case '?':
+			exit(-1);
+ 
+		default:
+			abort();
+		}
+	}
+ 
+	if (decrypt_opt && encrypt_opt) {
+		fprintf(stderr, "%s: decrypt and encrypt may not be used together\n",
+		        argv[0]);
+		show_usage(argv[0]);
+	}
+ 
+	if (!decrypt_opt && !encrypt_opt) {
+		fprintf(stderr, "%s: neither decrypt or encrypt were specified\n",
+		        argv[0]);
+		show_usage(argv[0]);
+	}
+ 
+	temp_fd = fileno(tmpfile());
+	if (temp_fd < 0) {
+		fprintf(stderr, "Can't create temporary file\n");
+		exit(EXIT_FAILURE);
+	}
+ 
+	atexit(exit_cleanup);
+	DES_set_key_unchecked((const_DES_cblock *)DES_KEY, &schedule);
+ 
+	if (input_filename) {
+		input_fd = open(input_filename, O_RDONLY);
+		if (input_fd < 0) {
+			fprintf(stderr, "Can't open %s for reading: %s\n", input_filename,
+			        strerror(errno));
+			exit(EXIT_FAILURE);
+		}
+		copy_file(input_fd, temp_fd);
+		close(input_fd);
+	}
+	else {
+		copy_file(STDIN_FILENO, temp_fd);
+	}
+ 
+	file_len = lseek(temp_fd, 0, SEEK_CUR);
+	if (file_len < 64) {
+		fprintf(stderr, "Not enough data\n");
+		exit(EXIT_FAILURE);
+	}
+ 
+	p = mmap(0, file_len, PROT_READ|PROT_WRITE, MAP_SHARED, temp_fd, 0);
+	if (p == MAP_FAILED) {
+		fprintf(stderr, "mmap failed: %s\n", strerror(errno));
+		exit(EXIT_FAILURE);
+	}	
+ 
+	if (encrypt_opt) {
+		header = (image_header_t *)p;
+		off_t len = min(file_len,
+		                ntohl(header->ih_size) + sizeof(image_header_t));
+		if (ntohl(header->ih_magic) != IH_MAGIC) {
+			fprintf(stderr, "Header magic incorrect: "
+			        "expected 0x%08X, got 0x%08X\n",
+			        IH_MAGIC, ntohl(header->ih_magic));
+			munmap(p, file_len);
+			exit(EXIT_FAILURE);
+		}
+		do_encrypt(p, len);
+		munmap(p, file_len);
+		if (len != file_len) {
+			if (ftruncate(temp_fd, len) < 0) {
+				fprintf(stderr, "ftruncate failed: %s\n", strerror(errno));
+				exit(EXIT_FAILURE);
+			}
+		}		
+	}
+ 
+	if (decrypt_opt) {
+		off_t header_len = min(file_len, sizeof(image_header_t) + 3);
+		memcpy(buf, p, header_len);
+		do_decrypt(buf, header_len);
+		header = (image_header_t *)buf;
+		if (ntohl(header->ih_magic) != IH_MAGIC) {
+			fprintf(stderr, "Header magic incorrect: "
+			        "expected 0x%08X, got 0x%08X\n",
+			        IH_MAGIC, ntohl(header->ih_magic));
+			exit(EXIT_FAILURE);
+		}
+		do_decrypt(p, file_len);
+		munmap(p, file_len);
+	}
+ 
+	lseek(temp_fd, 0, SEEK_SET);
+	if (output_filename) {
+		output_fd = creat(output_filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+		if (output_fd < 0) {
+			fprintf(stderr, "Can't open %s for writing: %s\n",
+			        output_filename, strerror(errno));
+			exit(EXIT_FAILURE);
+		}
+		copy_file(temp_fd, output_fd);
+		close(output_fd);
+	}
+	else {
+		copy_file(temp_fd, STDOUT_FILENO);
+	}
+ 
+	exit(EXIT_SUCCESS);
+	return 0;
+}
+ 
+static void show_usage(const char *arg0)
+{
+	fprintf(stderr, "usage: %s -d|-e [-i FILE] [-o FILE]\n\n", arg0);
+	fprintf(stderr, "%-15s %s\n", "-d, --decrypt", "decrypt data");
+	fprintf(stderr, "%-15s %s\n", "-e, --encrypt", "encrypt data");
+	fprintf(stderr, "%-15s %s\n", "-i, --input", "intput file (defaults to stdin)");
+	fprintf(stderr, "%-15s %s\n", "-o, --output", "output file (defaults to stdout)");
+	exit(-1);
+}
+ 
+static void exit_cleanup(void)
+{
+	if (temp_fd >= 0) {
+		close(temp_fd);
+	}
+}
+ 
+static void copy_file(int src, int dst)
+{
+	char buf[4096];
+	ssize_t size;
+ 
+	while ((size = read(src, buf, 4096)) > 0) {
+        write(dst, buf, size);
+    }
+}
+ 
+static void do_encrypt(void *p, off_t len)
+{
+	DES_cblock *pblock;
+	int num_blocks;
+ 
+	num_blocks = len / 8;
+	pblock = (DES_cblock *) p;
+	while (num_blocks--) {
+		DES_ecb_encrypt(pblock, pblock, &schedule, DES_ENCRYPT);
+		pblock++;
+	}
+ 
+	num_blocks = (len - 3) / 8;
+	pblock = (DES_cblock *) (p + 3);
+	while (num_blocks--) {
+		DES_ecb_encrypt(pblock, pblock, &schedule, DES_ENCRYPT);
+		pblock++;
+	}
+}
+ 
+static void do_decrypt(void *p, off_t len)
+{
+	DES_cblock *pblock;
+	int num_blocks;
+ 
+	num_blocks = (len - 3) / 8;
+	pblock = (DES_cblock *) (p + 3);
+	while (num_blocks--) {
+		DES_ecb_encrypt(pblock, pblock, &schedule, DES_DECRYPT);
+		pblock++;
+	}
+ 
+	num_blocks = len / 8;
+	pblock = (DES_cblock *) p;
+	while (num_blocks--) {
+		DES_ecb_encrypt(pblock, pblock, &schedule, DES_DECRYPT);
+		pblock++;
+	}
+}
diff --git a/trunk/tools/firmware-utils/src/mkmylofw.c b/trunk/tools/firmware-utils/src/mkmylofw.c
new file mode 100644
index 00000000..b5958ebe
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkmylofw.c
@@ -0,0 +1,1297 @@
+/*
+ *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <endian.h>     /* for __BYTE_ORDER */
+
+#if defined(__CYGWIN__)
+#  include <byteswap.h>
+#endif
+
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#  define HOST_TO_LE16(x)	(x)
+#  define HOST_TO_LE32(x)	(x)
+#else
+#  define HOST_TO_LE16(x)	bswap_16(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#endif
+
+#include "myloader.h"
+
+#define MAX_FW_BLOCKS  	32
+#define MAX_ARG_COUNT   32
+#define MAX_ARG_LEN     1024
+#define FILE_BUF_LEN    (16*1024)
+#define PART_NAME_LEN	32
+
+struct fw_block {
+	uint32_t	addr;
+	uint32_t	blocklen; /* length of the block */
+	uint32_t	flags;
+
+	char		*name;  /* name of the file */
+	uint32_t	size;  	/* length of the file */
+	uint32_t	crc;    /* crc value of the file */
+};
+
+struct fw_part {
+	struct mylo_partition	mylo;
+	char			name[PART_NAME_LEN];
+};
+
+#define BLOCK_FLAG_HAVEHDR    0x0001
+
+struct cpx_board {
+	char		*model; /* model number*/
+	char		*name;	/* model name*/
+	char		*desc;  /* description */
+	uint16_t        vid;    /* vendor id */
+	uint16_t        did;    /* device id */
+	uint16_t        svid;   /* sub vendor id */
+	uint16_t        sdid;   /* sub device id */
+	uint32_t        flash_size;     /* size of flash */
+	uint32_t	part_offset;	/* offset of the partition_table */
+	uint32_t	part_size;	/* size of the partition_table */
+};
+
+#define BOARD(_vid, _did, _svid, _sdid, _flash, _mod, _name, _desc, _po, _ps) {		\
+	.model = _mod, .name = _name, .desc = _desc,   			\
+	.vid = _vid, .did = _did, .svid = _svid, .sdid = _sdid,         \
+	.flash_size = (_flash << 20),					\
+	.part_offset = _po, .part_size = _ps }
+
+#define CPX_BOARD(_did, _flash, _mod, _name, _desc, _po, _ps) \
+	BOARD(VENID_COMPEX, _did, VENID_COMPEX, _did, _flash, _mod, _name, _desc, _po, _ps)
+
+#define CPX_BOARD_ADM(_did, _flash, _mod, _name, _desc) \
+	CPX_BOARD(_did, _flash, _mod, _name, _desc, 0x10000, 0x10000)
+
+#define CPX_BOARD_AR71XX(_did, _flash, _mod, _name, _desc) \
+	CPX_BOARD(_did, _flash, _mod, _name, _desc, 0x20000, 0x8000)
+
+#define CPX_BOARD_AR23XX(_did, _flash, _mod, _name, _desc) \
+	CPX_BOARD(_did, _flash, _mod, _name, _desc, 0x10000, 0x10000)
+
+#define ALIGN(x,y)	((x)+((y)-1)) & ~((y)-1)
+
+char	*progname;
+char	*ofname = NULL;
+
+uint32_t flash_size = 0;
+int	fw_num_partitions = 0;
+int	fw_num_blocks = 0;
+int	verblevel = 0;
+
+struct mylo_fw_header fw_header;
+struct fw_part fw_parts[MYLO_MAX_PARTITIONS];
+struct fw_block fw_blocks[MAX_FW_BLOCKS];
+struct cpx_board *board;
+
+struct cpx_board boards[] = {
+	CPX_BOARD_ADM(DEVID_COMPEX_NP18A, 4,
+		"NP18A", "Compex NetPassage 18A",
+		"Dualband Wireless A+G Internet Gateway"),
+	CPX_BOARD_ADM(DEVID_COMPEX_NP26G8M, 2,
+		"NP26G8M", "Compex NetPassage 26G (8M)",
+		"Wireless-G Broadband Multimedia Gateway"),
+	CPX_BOARD_ADM(DEVID_COMPEX_NP26G16M, 4,
+		"NP26G16M", "Compex NetPassage 26G (16M)",
+		"Wireless-G Broadband Multimedia Gateway"),
+	CPX_BOARD_ADM(DEVID_COMPEX_NP27G, 4,
+		"NP27G", "Compex NetPassage 27G",
+		"Wireless-G 54Mbps eXtended Range Router"),
+	CPX_BOARD_ADM(DEVID_COMPEX_NP28G, 4,
+		"NP28G", "Compex NetPassage 28G",
+		"Wireless 108Mbps Super-G XR Multimedia Router with 4 USB Ports"),
+	CPX_BOARD_ADM(DEVID_COMPEX_NP28GHS, 4,
+		"NP28GHS", "Compex NetPassage 28G (HotSpot)",
+		"HotSpot Solution"),
+	CPX_BOARD_ADM(DEVID_COMPEX_WP18, 4,
+		"WP18", "Compex NetPassage WP18",
+		"Wireless-G 54Mbps A+G Dualband Access Point"),
+	CPX_BOARD_ADM(DEVID_COMPEX_WP54G, 4,
+		"WP54G", "Compex WP54G",
+		"Wireless-G 54Mbps XR Access Point"),
+	CPX_BOARD_ADM(DEVID_COMPEX_WP54Gv1C, 2,
+		"WP54Gv1C", "Compex WP54G rev.1C",
+		"Wireless-G 54Mbps XR Access Point"),
+	CPX_BOARD_ADM(DEVID_COMPEX_WP54AG, 4,
+		"WP54AG", "Compex WP54AG",
+		"Wireless-AG 54Mbps XR Access Point"),
+	CPX_BOARD_ADM(DEVID_COMPEX_WPP54G, 4,
+		"WPP54G", "Compex WPP54G",
+		"Outdoor Access Point"),
+	CPX_BOARD_ADM(DEVID_COMPEX_WPP54AG, 4,
+		"WPP54AG", "Compex WPP54AG",
+		"Outdoor Access Point"),
+
+	CPX_BOARD_AR71XX(DEVID_COMPEX_WP543, 2,
+		"WP543", "Compex WP543",
+		"BareBoard"),
+	CPX_BOARD_AR71XX(DEVID_COMPEX_WPE72, 8,
+		"WPE72", "Compex WPE72",
+		"BareBoard"),
+
+	CPX_BOARD_AR23XX(DEVID_COMPEX_NP25G, 4,
+		"NP25G", "Compex NetPassage 25G",
+		"Wireless 54Mbps XR Router"),
+	CPX_BOARD_AR23XX(DEVID_COMPEX_WPE53G, 4,
+		"WPE53G", "Compex NetPassage 25G",
+		"Wireless 54Mbps XR Access Point"),
+	{.model = NULL}
+};
+
+void
+errmsgv(int syserr, const char *fmt, va_list arg_ptr)
+{
+	int save = errno;
+
+	fflush(0);
+	fprintf(stderr, "[%s] Error: ", progname);
+	vfprintf(stderr, fmt, arg_ptr);
+	if (syserr != 0) {
+		fprintf(stderr, ": %s", strerror(save));
+	}
+	fprintf(stderr, "\n");
+}
+
+void
+errmsg(int syserr, const char *fmt, ...)
+{
+	va_list arg_ptr;
+	va_start(arg_ptr, fmt);
+	errmsgv(syserr, fmt, arg_ptr);
+	va_end(arg_ptr);
+}
+
+void
+dbgmsg(int level, const char *fmt, ...)
+{
+	va_list arg_ptr;
+	if (verblevel >= level) {
+		fflush(0);
+		va_start(arg_ptr, fmt);
+		vfprintf(stderr, fmt, arg_ptr);
+		fprintf(stderr, "\n");
+		va_end(arg_ptr);
+	}
+}
+
+
+void
+usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct cpx_board *board;
+
+	fprintf(stream, "Usage: %s [OPTION...] <file>\n", progname);
+	fprintf(stream,
+"\n"
+"  <file>          write output to the <file>\n"
+"\n"
+"Options:\n"
+"  -B <board>      create firmware for the board specified with <board>.\n"
+"                  This option set vendor id, device id, subvendor id,\n"
+"                  subdevice id, and flash size options to the right value.\n"
+"                  valid <board> values:\n");
+	for (board = boards; board->model != NULL; board++){
+		fprintf(stream,
+"                      %-12s: %s\n",
+		 board->model, board->name);
+	};
+	fprintf(stream,
+"  -i <vid>:<did>[:<svid>[:<sdid>]]\n"
+"                  create firmware for board with vendor id <vid>, device\n"
+"                  id <did>, subvendor id <svid> and subdevice id <sdid>.\n"
+"  -r <rev>        set board revision to <rev>.\n"
+"  -s <size>       set flash size to <size>\n"
+"  -b <addr>:<len>[:[<flags>]:<file>]\n"
+"                  define block at <addr> with length of <len>.\n"
+"                  valid <flag> values:\n"
+"                      h : add crc header before the file data.\n"
+"  -p <addr>:<len>[:<flags>[:<param>[:<name>[:<file>]]]]\n"
+"                  add partition at <addr>, with size of <len> to the\n"
+"                  partition table, set partition name to <name>, partition \n"
+"                  flags to <flags> and partition parameter to <param>.\n"
+"                  If the <file> is specified content of the file will be \n"
+"                  added to the firmware image.\n"
+"                  valid <flag> values:\n"
+"                      a:  this is the active partition. The bootloader loads\n"
+"                          the firmware from this partition.\n"
+"                      h:  the partition data have a header.\n"
+"                      l:  the partition data uses LZMA compression.\n"
+"                      p:  the bootloader loads data from this partition to\n"
+"                          the RAM before decompress it.\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+/*
+ * Code to compute the CRC-32 table. Borrowed from
+ * gzip-1.0.3/makecrc.c.
+ */
+
+static uint32_t crc_32_tab[256];
+
+void
+init_crc_table(void)
+{
+	/* Not copyrighted 1990 Mark Adler	*/
+
+	uint32_t c;      /* crc shift register */
+	uint32_t e;      /* polynomial exclusive-or pattern */
+	int i;           /* counter for all possible eight bit values */
+	int k;           /* byte being shifted into crc apparatus */
+
+	/* terms of polynomial defining this crc (except x^32): */
+	static const int p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+	/* Make exclusive-or pattern from polynomial */
+	e = 0;
+	for (i = 0; i < sizeof(p)/sizeof(int); i++)
+		e |= 1L << (31 - p[i]);
+
+	crc_32_tab[0] = 0;
+
+	for (i = 1; i < 256; i++) {
+		c = 0;
+		for (k = i | 256; k != 1; k >>= 1) {
+			c = c & 1 ? (c >> 1) ^ e : c >> 1;
+			if (k & 1)
+				c ^= e;
+		}
+		crc_32_tab[i] = c;
+	}
+}
+
+
+void
+update_crc(uint8_t *p, uint32_t len, uint32_t *crc)
+{
+	uint32_t t;
+
+	t = *crc ^ 0xFFFFFFFFUL;
+	while (len--) {
+		t = crc_32_tab[(t ^ *p++) & 0xff] ^ (t >> 8);
+	}
+	*crc = t ^ 0xFFFFFFFFUL;
+}
+
+
+uint32_t
+get_crc(uint8_t *p, uint32_t len)
+{
+	uint32_t crc;
+
+	crc = 0;
+	update_crc(p ,len , &crc);
+	return crc;
+}
+
+
+int
+str2u32(char *arg, uint32_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	*val = t;
+	return 0;
+}
+
+
+int
+str2u16(char *arg, uint16_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x10000)) {
+		return -1;
+	}
+
+	*val = t & 0xFFFF;
+	return 0;
+}
+
+
+struct cpx_board *
+find_board(char *model){
+	struct cpx_board *board;
+	struct cpx_board *tmp;
+
+	board = NULL;
+	for (tmp = boards; tmp->model != NULL; tmp++){
+		if (strcasecmp(model, tmp->model) == 0) {
+			board = tmp;
+			break;
+		}
+	};
+
+	return board;
+}
+
+
+int
+get_file_crc(struct fw_block *ff)
+{
+	FILE *f;
+	uint8_t buf[FILE_BUF_LEN];
+	uint32_t readlen = sizeof(buf);
+	int res = -1;
+	size_t len;
+
+	if ((ff->flags & BLOCK_FLAG_HAVEHDR) == 0) {
+		res = 0;
+		goto out;
+	}
+
+	errno = 0;
+	f = fopen(ff->name,"r");
+	if (errno) {
+		errmsg(1,"unable to open file %s", ff->name);
+		goto out;
+	}
+
+	ff->crc = 0;
+	len = ff->size;
+	while (len > 0) {
+		if (len < readlen)
+			readlen = len;
+
+		errno = 0;
+		fread(buf, readlen, 1, f);
+		if (errno) {
+			errmsg(1,"unable to read from file %s",	ff->name);
+			goto out_close;
+		}
+
+		update_crc(buf, readlen, &ff->crc);
+		len -= readlen;
+	}
+
+	res = 0;
+
+out_close:
+	fclose(f);
+out:
+	return res;
+}
+
+
+int
+process_files(void)
+{
+	struct fw_block *b;
+	struct stat st;
+	int i;
+
+	for (i = 0; i < fw_num_blocks; i++) {
+		b = &fw_blocks[i];
+		if ((b->addr + b->blocklen) > flash_size) {
+			errmsg(0, "block at 0x%08X is too big", b->addr);
+			return -1;
+		}
+		if (b->name == NULL)
+			continue;
+
+		if (stat(b->name, &st) < 0) {
+			errmsg(0, "stat failed on %s",b->name);
+			return -1;
+		}
+		if (b->blocklen == 0) {
+			b->blocklen = flash_size - b->addr;
+		}
+		if (st.st_size > b->blocklen) {
+			errmsg(0,"file %s is too big",b->name);
+			return -1;
+		}
+
+		b->size = st.st_size;
+	}
+
+	return 0;
+}
+
+
+int
+process_partitions(void)
+{
+	struct mylo_partition *part;
+	int i;
+
+	for (i = 0; i < fw_num_partitions; i++) {
+		part = &fw_parts[i].mylo;
+
+		if (part->addr > flash_size) {
+			errmsg(0, "invalid partition at 0x%08X", part->addr);
+			return -1;
+		}
+
+		if ((part->addr + part->size) > flash_size) {
+			errmsg(0, "partition at 0x%08X is too big", part->addr);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+
+/*
+ * routines to write data to the output file
+ */
+int
+write_out_data(FILE *outfile, uint8_t *data, size_t len, uint32_t *crc)
+{
+	errno = 0;
+
+	fwrite(data, len, 1, outfile);
+	if (errno) {
+		errmsg(1,"unable to write output file");
+		return -1;
+	}
+
+	if (crc) {
+		update_crc(data, len, crc);
+	}
+
+	return 0;
+}
+
+
+int
+write_out_desc(FILE *outfile, struct mylo_fw_blockdesc *desc, uint32_t *crc)
+{
+	return write_out_data(outfile, (uint8_t *)desc,
+		sizeof(*desc), crc);
+}
+
+
+int
+write_out_padding(FILE *outfile, size_t len, uint8_t padc, uint32_t *crc)
+{
+	uint8_t buff[512];
+	size_t  buflen = sizeof(buff);
+
+	memset(buff, padc, buflen);
+
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		if (write_out_data(outfile, buff, buflen, crc))
+			return -1;
+
+		len -= buflen;
+	}
+
+	return 0;
+}
+
+
+int
+write_out_file(FILE *outfile, struct fw_block *block, uint32_t *crc)
+{
+	char buff[FILE_BUF_LEN];
+	size_t  buflen = sizeof(buff);
+	FILE *f;
+	size_t len;
+
+	errno = 0;
+
+	if (block->name == NULL) {
+		return 0;
+	}
+
+	if ((block->flags & BLOCK_FLAG_HAVEHDR) != 0) {
+		struct mylo_partition_header ph;
+
+		if (get_file_crc(block) != 0)
+		        return -1;
+
+		ph.crc = HOST_TO_LE32(block->crc);
+		ph.len = HOST_TO_LE32(block->size);
+
+		if (write_out_data(outfile, (uint8_t *)&ph, sizeof(ph), crc) != 0)
+			return -1;
+	}
+
+	f = fopen(block->name,"r");
+	if (errno) {
+		errmsg(1,"unable to open file: %s", block->name);
+		return -1;
+	}
+
+	len = block->size;
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		/* read data from source file */
+		errno = 0;
+		fread(buff, buflen, 1, f);
+		if (errno != 0) {
+			errmsg(1,"unable to read from file: %s",block->name);
+			return -1;
+		}
+
+		if (write_out_data(outfile, buff, buflen, crc) != 0)
+			return -1;
+
+		len -= buflen;
+	}
+
+	fclose(f);
+
+	/* align next block on a 4 byte boundary */
+	len = ALIGN(len,4) - block->size;
+	if (write_out_padding(outfile, len, 0xFF, crc))
+		return -1;
+
+	dbgmsg(1,"file %s written out", block->name);
+	return 0;
+}
+
+
+int
+write_out_header(FILE *outfile, uint32_t *crc)
+{
+	struct mylo_fw_header hdr;
+
+	memset(&hdr, 0, sizeof(hdr));
+
+	hdr.magic = HOST_TO_LE32(MYLO_MAGIC_FIRMWARE);
+	hdr.crc = HOST_TO_LE32(fw_header.crc);
+	hdr.vid = HOST_TO_LE16(fw_header.vid);
+	hdr.did = HOST_TO_LE16(fw_header.did);
+	hdr.svid = HOST_TO_LE16(fw_header.svid);
+	hdr.sdid = HOST_TO_LE16(fw_header.sdid);
+	hdr.rev = HOST_TO_LE32(fw_header.rev);
+	hdr.fwhi = HOST_TO_LE32(fw_header.fwhi);
+	hdr.fwlo = HOST_TO_LE32(fw_header.fwlo);
+	hdr.flags = HOST_TO_LE32(fw_header.flags);
+
+	if (fseek(outfile, 0, SEEK_SET) != 0) {
+		errmsg(1,"fseek failed on output file");
+		return -1;
+	}
+
+	return write_out_data(outfile, (uint8_t *)&hdr, sizeof(hdr), crc);
+}
+
+
+int
+write_out_partitions(FILE *outfile, uint32_t *crc)
+{
+	struct mylo_partition_table p;
+	char part_names[MYLO_MAX_PARTITIONS][PART_NAME_LEN];
+	int ret;
+	int i;
+
+	if (fw_num_partitions == 0)
+		return 0;
+
+	memset(&p, 0, sizeof(p));
+	memset(part_names, 0, sizeof(part_names));
+
+	p.magic = HOST_TO_LE32(MYLO_MAGIC_PARTITIONS);
+	for (i = 0; i < fw_num_partitions; i++) {
+		struct mylo_partition *mp;
+		struct fw_part *fp;
+
+		mp = &p.partitions[i];
+		fp = &fw_parts[i];
+		mp->flags = HOST_TO_LE16(fp->mylo.flags);
+		mp->type = HOST_TO_LE16(PARTITION_TYPE_USED);
+		mp->addr = HOST_TO_LE32(fp->mylo.addr);
+		mp->size = HOST_TO_LE32(fp->mylo.size);
+		mp->param = HOST_TO_LE32(fp->mylo.param);
+
+		memcpy(part_names[i], fp->name, PART_NAME_LEN);
+	}
+
+	ret = write_out_data(outfile, (uint8_t *)&p, sizeof(p), crc);
+	if (ret)
+		return ret;
+
+	ret = write_out_data(outfile, (uint8_t *)part_names, sizeof(part_names),
+				crc);
+	return ret;
+}
+
+
+int
+write_out_blocks(FILE *outfile, uint32_t *crc)
+{
+	struct mylo_fw_blockdesc desc;
+	struct fw_block *b;
+	uint32_t dlen;
+	int i;
+
+	/*
+	 * if at least one partition specified, write out block descriptor
+	 * for the partition table
+	 */
+	if (fw_num_partitions > 0) {
+		desc.type = HOST_TO_LE32(FW_DESC_TYPE_USED);
+		desc.addr = HOST_TO_LE32(board->part_offset);
+		desc.dlen = HOST_TO_LE32(sizeof(struct mylo_partition_table) +
+					(MYLO_MAX_PARTITIONS * PART_NAME_LEN));
+		desc.blen = HOST_TO_LE32(board->part_size);
+
+		if (write_out_desc(outfile, &desc, crc) != 0)
+		        return -1;
+	}
+
+	/*
+	 * write out block descriptors for each files
+	 */
+	for (i = 0; i < fw_num_blocks; i++) {
+		b = &fw_blocks[i];
+
+		/* detect block size */
+		dlen = b->size;
+		if ((b->flags & BLOCK_FLAG_HAVEHDR) != 0) {
+			dlen += sizeof(struct mylo_partition_header);
+		}
+
+		/* round up to 4 bytes */
+		dlen = ALIGN(dlen, 4);
+
+		/* setup the descriptor */
+		desc.type = HOST_TO_LE32(FW_DESC_TYPE_USED);
+		desc.addr = HOST_TO_LE32(b->addr);
+		desc.dlen = HOST_TO_LE32(dlen);
+		desc.blen = HOST_TO_LE32(b->blocklen);
+
+		if (write_out_desc(outfile, &desc, crc) != 0)
+			return -1;
+	}
+
+	/*
+	 * write out the null block descriptor
+	 */
+	memset(&desc, 0, sizeof(desc));
+	if (write_out_desc(outfile, &desc, crc) != 0)
+		return -1;
+
+	if (write_out_partitions(outfile, crc) != 0)
+		return -1;
+
+	/*
+	 * write out data for each blocks
+	 */
+	for (i = 0; i < fw_num_blocks; i++) {
+		b = &fw_blocks[i];
+		if (write_out_file(outfile, b, crc) != 0)
+		        return -1;
+	}
+
+	return 0;
+}
+
+
+/*
+ * argument parsing
+ */
+int
+parse_arg(char *arg, char *buf, char *argv[])
+{
+	int res = 0;
+	size_t argl;
+	char *tok;
+	char **ap = &buf;
+	int i;
+
+	if ((arg == NULL)) {
+		/* invalid argument string */
+		return -1;
+	}
+
+	argl = strlen(arg);
+	if (argl == 0) {
+		/* no arguments */
+		return res;
+	}
+
+	if (argl >= MAX_ARG_LEN) {
+		/* argument is too long */
+		argl = MAX_ARG_LEN-1;
+	}
+
+	memset(argv, 0, MAX_ARG_COUNT * sizeof(void *));
+	memcpy(buf, arg, argl);
+	buf[argl] = '\0';
+
+	for (i = 0; i < MAX_ARG_COUNT; i++) {
+		tok = strsep(ap, ":");
+		if (tok == NULL) {
+			break;
+		}
+#if 0
+		else if (tok[0] == '\0') {
+			break;
+		}
+#endif
+		argv[i] = tok;
+		res++;
+	}
+
+	return res;
+}
+
+
+int
+required_arg(char c, char *arg)
+{
+	if ((optarg != NULL) && (*arg == '-')){
+		errmsg(0,"option %c requires an argument\n", c);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+int
+is_empty_arg(char *arg)
+{
+	int ret = 1;
+	if (arg != NULL) {
+		if (*arg) ret = 0;
+	};
+	return ret;
+}
+
+
+int
+parse_opt_flags(char ch, char *arg)
+{
+	if (required_arg(ch, arg)) {
+		goto err_out;
+	}
+
+	if (str2u32(arg, &fw_header.flags) != 0) {
+		errmsg(0,"invalid firmware flags: %s", arg);
+		goto err_out;
+	}
+
+	dbgmsg(1, "firmware flags set to %X bytes", fw_header.flags);
+
+	return 0;
+
+err_out:
+	return -1;
+}
+
+
+int
+parse_opt_size(char ch, char *arg)
+{
+	if (required_arg(ch, arg)) {
+		goto err_out;
+	}
+
+	if (str2u32(arg, &flash_size) != 0) {
+		errmsg(0,"invalid flash size: %s", arg);
+		goto err_out;
+	}
+
+	dbgmsg(1, "flash size set to %d bytes", flash_size);
+
+	return 0;
+
+err_out:
+	return -1;
+}
+
+
+int
+parse_opt_id(char ch, char *arg)
+{
+	char buf[MAX_ARG_LEN];
+	char *argv[MAX_ARG_COUNT];
+	int argc;
+	char *p;
+
+	if (required_arg(ch, arg)) {
+		goto err_out;
+	}
+
+	argc = parse_arg(arg, buf, argv);
+
+	/* processing vendor ID*/
+	p = argv[0];
+	if (is_empty_arg(p)) {
+		errmsg(0,"vendor id is missing from -%c %s",ch, arg);
+		goto err_out;
+	} else if (str2u16(p, &fw_header.vid) != 0) {
+		errmsg(0,"invalid vendor id: %s", p);
+		goto err_out;
+	}
+
+	dbgmsg(1, "vendor id is set to 0x%04X", fw_header.vid);
+
+	/* processing device ID*/
+	p = argv[1];
+	if (is_empty_arg(p)) {
+		errmsg(0,"device id is missing from -%c %s",ch, arg);
+		goto err_out;
+	} else if (str2u16(p, &fw_header.did) != 0) {
+		errmsg(0,"invalid device id: %s", p);
+		goto err_out;
+	}
+
+	dbgmsg(1, "device id is set to 0x%04X", fw_header.did);
+
+	/* processing sub vendor ID*/
+	p = argv[2];
+	if (is_empty_arg(p)) {
+		fw_header.svid = fw_header.vid;
+	} else if (str2u16(p, &fw_header.svid) != 0) {
+		errmsg(0,"invalid sub vendor id: %s", p);
+		goto err_out;
+	}
+
+	dbgmsg(1, "sub vendor id is set to 0x%04X", fw_header.svid);
+
+	/* processing device ID*/
+	p = argv[3];
+	if (is_empty_arg(p)) {
+		fw_header.sdid = fw_header.did;
+	} else if (str2u16(p, &fw_header.sdid) != 0) {
+		errmsg(0,"invalid sub device id: %s", p);
+		goto err_out;
+	}
+
+	dbgmsg(1, "sub device id is set to 0x%04X", fw_header.sdid);
+
+	/* processing revision */
+	p = argv[4];
+	if (is_empty_arg(p)) {
+		fw_header.rev = 0;
+	} else if (str2u32(arg, &fw_header.rev) != 0) {
+		errmsg(0,"invalid revision number: %s", p);
+		goto err_out;
+	}
+
+	dbgmsg(1, "board revision is set to 0x%08X", fw_header.rev);
+
+	return 0;
+
+err_out:
+	return -1;
+}
+
+
+int
+parse_opt_block(char ch, char *arg)
+{
+	char buf[MAX_ARG_LEN];
+	char *argv[MAX_ARG_COUNT];
+	int argc;
+	struct fw_block *b;
+	char *p;
+
+	if (required_arg(ch, arg)) {
+		goto err_out;
+	}
+
+	if (fw_num_blocks >= MAX_FW_BLOCKS) {
+		errmsg(0,"too many blocks specified");
+		goto err_out;
+	}
+
+	argc = parse_arg(arg, buf, argv);
+	dbgmsg(1,"processing block option %s, count %d", arg, argc);
+
+	b = &fw_blocks[fw_num_blocks++];
+
+	/* processing block address */
+	p = argv[0];
+	if (is_empty_arg(p)) {
+		errmsg(0,"no block address specified in %s", arg);
+		goto err_out;
+	} else if (str2u32(p, &b->addr) != 0) {
+		errmsg(0,"invalid block address: %s", p);
+		goto err_out;
+	}
+
+	/* processing block length */
+	p = argv[1];
+	if (is_empty_arg(p)) {
+		errmsg(0,"no block length specified in %s", arg);
+		goto err_out;
+	} else if (str2u32(p, &b->blocklen) != 0) {
+		errmsg(0,"invalid block length: %s", p);
+		goto err_out;
+	}
+
+	if (argc < 3) {
+		dbgmsg(1,"empty block %s", arg);
+		goto success;
+	}
+
+	/* processing flags */
+	p = argv[2];
+	if (is_empty_arg(p) == 0) {
+		for ( ; *p != '\0'; p++) {
+			switch (*p) {
+			case 'h':
+				b->flags |= BLOCK_FLAG_HAVEHDR;
+				break;
+			default:
+				errmsg(0, "invalid block flag \"%c\"", *p);
+				goto err_out;
+			}
+		}
+	}
+
+	/* processing file name */
+	p = argv[3];
+	if (is_empty_arg(p)) {
+		errmsg(0,"file name missing in %s", arg);
+		goto err_out;
+	}
+
+	b->name = strdup(p);
+	if (b->name == NULL) {
+		errmsg(0,"not enough memory");
+		goto err_out;
+	}
+
+success:
+
+	return 0;
+
+err_out:
+	return -1;
+}
+
+
+int
+parse_opt_partition(char ch, char *arg)
+{
+	char buf[MAX_ARG_LEN];
+	char *argv[MAX_ARG_COUNT];
+	int argc;
+	char *p;
+	struct mylo_partition *part;
+	struct fw_part *fp;
+
+	if (required_arg(ch, arg)) {
+		goto err_out;
+	}
+
+	if (fw_num_partitions >= MYLO_MAX_PARTITIONS) {
+		errmsg(0, "too many partitions specified");
+		goto err_out;
+	}
+
+	fp = &fw_parts[fw_num_partitions++];
+	part = &fp->mylo;
+
+	argc = parse_arg(arg, buf, argv);
+
+	/* processing partition address */
+	p = argv[0];
+	if (is_empty_arg(p)) {
+		errmsg(0,"partition address missing in -%c %s",ch, arg);
+		goto err_out;
+	} else if (str2u32(p, &part->addr) != 0) {
+		errmsg(0,"invalid partition address: %s", p);
+		goto err_out;
+	}
+
+	/* processing partition size */
+	p = argv[1];
+	if (is_empty_arg(p)) {
+		errmsg(0,"partition size missing in -%c %s",ch, arg);
+		goto err_out;
+	} else if (str2u32(p, &part->size) != 0) {
+		errmsg(0,"invalid partition size: %s", p);
+		goto err_out;
+	}
+
+	/* processing partition flags */
+	p = argv[2];
+	if (is_empty_arg(p) == 0) {
+		for ( ; *p != '\0'; p++) {
+			switch (*p) {
+			case 'a':
+				part->flags |= PARTITION_FLAG_ACTIVE;
+				break;
+			case 'p':
+				part->flags |= PARTITION_FLAG_PRELOAD;
+				break;
+			case 'l':
+				part->flags |= PARTITION_FLAG_LZMA;
+				break;
+			case 'h':
+				part->flags |= PARTITION_FLAG_HAVEHDR;
+				break;
+			default:
+				errmsg(0, "invalid partition flag \"%c\"", *p);
+				goto err_out;
+			}
+		}
+	}
+
+	/* processing partition parameter */
+	p = argv[3];
+	if (is_empty_arg(p)) {
+		/* set default partition parameter */
+		part->param = 0;
+	} else if (str2u32(p, &part->param) != 0) {
+		errmsg(0,"invalid partition parameter: %s", p);
+		goto err_out;
+	}
+
+	p = argv[4];
+	if (is_empty_arg(p)) {
+		/* set default partition parameter */
+		fp->name[0] = '\0';
+	} else {
+		strncpy(fp->name, p, PART_NAME_LEN);
+	}
+
+#if 1
+	if (part->size == 0) {
+		part->size = flash_size - part->addr;
+	}
+
+	/* processing file parameter */
+	p = argv[5];
+	if (is_empty_arg(p) == 0) {
+		struct fw_block *b;
+
+		if (fw_num_blocks == MAX_FW_BLOCKS) {
+			errmsg(0,"too many blocks specified", p);
+			goto err_out;
+		}
+		b = &fw_blocks[fw_num_blocks++];
+		b->name = strdup(p);
+		b->addr = part->addr;
+		b->blocklen = part->size;
+		if (part->flags & PARTITION_FLAG_HAVEHDR) {
+			b->flags |= BLOCK_FLAG_HAVEHDR;
+		}
+	}
+#endif
+
+	return 0;
+
+err_out:
+	return -1;
+}
+
+
+int
+parse_opt_board(char ch, char *arg)
+{
+	if (required_arg(ch, arg)) {
+		goto err_out;
+	}
+
+	board = find_board(arg);
+	if (board == NULL){
+		errmsg(0,"invalid/unknown board specified: %s", arg);
+		goto err_out;
+	}
+
+	fw_header.vid = board->vid;
+	fw_header.did = board->did;
+	fw_header.svid = board->svid;
+	fw_header.sdid = board->sdid;
+
+	flash_size = board->flash_size;
+
+	return 0;
+
+err_out:
+	return -1;
+}
+
+
+int
+parse_opt_rev(char ch, char *arg)
+{
+	if (required_arg(ch, arg)) {
+		return -1;
+	}
+
+	if (str2u32(arg, &fw_header.rev) != 0) {
+		errmsg(0,"invalid revision number: %s", arg);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+/*
+ * main
+ */
+int
+main(int argc, char *argv[])
+{
+	int optinvalid = 0;   /* flag for invalid option */
+	int c;
+	int res = EXIT_FAILURE;
+
+	FILE  *outfile;
+	uint32_t crc;
+
+	progname=basename(argv[0]);
+
+	memset(&fw_header, 0, sizeof(fw_header));
+
+	/* init header defaults */
+	fw_header.vid = VENID_COMPEX;
+	fw_header.did = DEVID_COMPEX_WP54G;
+	fw_header.svid = VENID_COMPEX;
+	fw_header.sdid = DEVID_COMPEX_WP54G;
+	fw_header.fwhi = 0x20000;
+	fw_header.fwlo = 0x20000;
+	fw_header.flags = 0;
+
+	opterr = 0;  /* could not print standard getopt error messages */
+	while ((c = getopt(argc, argv, "b:B:f:hi:p:r:s:v")) != -1) {
+		optinvalid = 0;
+		switch (c) {
+		case 'b':
+			optinvalid = parse_opt_block(c,optarg);
+			break;
+		case 'B':
+			optinvalid = parse_opt_board(c,optarg);
+			break;
+		case 'f':
+			optinvalid = parse_opt_flags(c,optarg);
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		case 'i':
+			optinvalid = parse_opt_id(c,optarg);
+			break;
+		case 'p':
+			optinvalid = parse_opt_partition(c,optarg);
+			break;
+		case 'r':
+			optinvalid = parse_opt_rev(c,optarg);
+			break;
+		case 's':
+			optinvalid = parse_opt_size(c,optarg);
+			break;
+		case 'v':
+			verblevel++;
+			break;
+		default:
+			optinvalid = 1;
+			break;
+		}
+		if (optinvalid != 0 ){
+			errmsg(0, "invalid option: -%c", optopt);
+			goto out;
+		}
+	}
+
+	if (optind == argc) {
+		errmsg(0, "no output file specified");
+		goto out;
+	}
+
+	ofname = argv[optind++];
+
+	if (optind < argc) {
+		errmsg(0, "invalid option: %s", argv[optind]);
+		goto out;
+	}
+
+	if (!board) {
+		errmsg(0, "no board specified");
+		goto out;
+	}
+
+	if (flash_size == 0) {
+		errmsg(0, "no flash size specified");
+		goto out;
+	}
+
+	if (process_files() != 0) {
+		goto out;
+	}
+
+	if (process_partitions() != 0) {
+		goto out;
+	}
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		errmsg(1, "could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	crc = 0;
+	init_crc_table();
+
+	if (write_out_header(outfile, &crc) != 0)
+		goto out_flush;
+
+	if (write_out_blocks(outfile, &crc) != 0)
+		goto out_flush;
+
+	fw_header.crc = crc;
+	if (write_out_header(outfile, NULL) != 0)
+		goto out_flush;
+
+	dbgmsg(1,"Firmware file %s completed.", ofname);
+
+	res = EXIT_SUCCESS;
+
+out_flush:
+	fflush(outfile);
+	fclose(outfile);
+	if (res != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+out:
+	return res;
+}
diff --git a/trunk/tools/firmware-utils/src/mkplanexfw.c b/trunk/tools/firmware-utils/src/mkplanexfw.c
new file mode 100644
index 00000000..1bdccb7c
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkplanexfw.c
@@ -0,0 +1,269 @@
+/*
+ *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "sha1.h"
+
+#if (__BYTE_ORDER == __BIG_ENDIAN)
+#  define HOST_TO_BE32(x)	(x)
+#  define BE32_TO_HOST(x)	(x)
+#else
+#  define HOST_TO_BE32(x)	bswap_32(x)
+#  define BE32_TO_HOST(x)	bswap_32(x)
+#endif
+
+
+struct planex_hdr {
+	uint8_t		sha1sum[20];
+	char		version[8];
+	uint8_t		unk1[2];
+	uint32_t	datalen;
+} __attribute__ ((packed));
+
+struct board_info {
+	char		*id;
+	uint32_t	seed;
+	uint8_t		unk[2];
+	uint32_t	datalen;
+};
+
+/*
+ * Globals
+ */
+static char *ifname;
+static char *progname;
+static char *ofname;
+static char *version = "1.00.00";
+
+static char *board_id;
+static struct board_info *board;
+
+static struct board_info boards[] = {
+	{
+		.id		= "MZK-W04NU",
+		.seed		= 2,
+		.unk		= {0x04, 0x08},
+		.datalen	= 0x770000,
+	}, {
+		.id		= "MZK-W300NH",
+		.seed		= 4,
+		.unk		= {0x00, 0x00},
+		.datalen	= 0x770000,
+	}, {
+		/* terminating entry */
+	}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+static struct board_info *find_board(char *id)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->id != NULL; board++){
+		if (strcasecmp(id, board->id) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>\n"
+"  -i <file>       read input from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -v <version>    set image version to <version>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+int main(int argc, char *argv[])
+{
+	int res = EXIT_FAILURE;
+	int buflen;
+	int err;
+	struct stat st;
+	char *buf;
+	struct planex_hdr *hdr;
+	sha1_context ctx;
+	uint32_t seed;
+
+	FILE *outfile, *infile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "B:i:o:v:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'B':
+			board_id = optarg;
+			break;
+		case 'i':
+			ifname = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'v':
+			version = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	if (board_id == NULL) {
+		ERR("no board specified");
+		goto err;
+	}
+
+	board = find_board(board_id);
+	if (board == NULL) {
+		ERR("unknown board '%s'", board_id);
+		goto err;
+	};
+
+	if (ifname == NULL) {
+		ERR("no input file specified");
+		goto err;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto err;
+	}
+
+	err = stat(ifname, &st);
+	if (err){
+		ERRS("stat failed on %s", ifname);
+		goto err;
+	}
+
+	if (st.st_size > board->datalen) {
+		ERR("file '%s' is too big - max size: 0x%08X (exceeds %lu bytes)\n",
+		    ifname, board->datalen, st.st_size - board->datalen);
+		goto err;
+	}
+
+	buflen = board->datalen + 0x10000;
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto err;
+	}
+
+	memset(buf, 0xff, buflen);
+	hdr = (struct planex_hdr *)buf;
+
+	hdr->datalen = HOST_TO_BE32(board->datalen);
+	hdr->unk1[0] = board->unk[0];
+	hdr->unk1[1] = board->unk[1];
+
+	snprintf(hdr->version, sizeof(hdr->version), "%s", version);
+
+	infile = fopen(ifname, "r");
+	if (infile == NULL) {
+		ERRS("could not open \"%s\" for reading", ifname);
+		goto err_free;
+	}
+
+	errno = 0;
+	fread(buf +  sizeof(*hdr), st.st_size, 1, infile);
+	if (errno != 0) {
+		ERRS("unable to read from file %s", ifname);
+		goto err_close_in;
+	}
+
+	seed = HOST_TO_BE32(board->seed);
+	sha1_starts(&ctx);
+	sha1_update(&ctx, (uchar *) &seed, sizeof(seed));
+	sha1_update(&ctx, buf + sizeof(*hdr), board->datalen);
+	sha1_finish(&ctx, hdr->sha1sum);
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto err_close_in;
+	}
+
+	errno = 0;
+	fwrite(buf, buflen, 1, outfile);
+	if (errno) {
+		ERRS("unable to write to file %s", ofname);
+		goto err_close_out;
+	}
+
+	res = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(outfile);
+
+ err_close_out:
+	fclose(outfile);
+	if (res != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+
+ err_close_in:
+	fclose(infile);
+
+ err_free:
+	free(buf);
+
+ err:
+	return res;
+}
+
diff --git a/trunk/tools/firmware-utils/src/mkporayfw.c b/trunk/tools/firmware-utils/src/mkporayfw.c
new file mode 100644
index 00000000..6ec4f320
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkporayfw.c
@@ -0,0 +1,791 @@
+/*
+ * Builder/viewer/extractor utility for Poray firmware image files
+ *
+ * Copyright (C) 2013 Michel Stempin <michel.stempin@wanadoo.fr>
+ * Copyright (C) 2013 Felix Kaechele <felix@fetzig.org>
+ * Copyright (C) 2013 <admin@openschemes.com>
+ *
+ * This tool is based on:
+ *   TP-Link firmware upgrade tool.
+ *   Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * Itself based on:
+ *   TP-Link WR941 V2 firmware checksum fixing tool.
+ *   Copyright (C) 2008,2009 Wang Jian <lark@linux.net.cn>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <getopt.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#if (__BYTE_ORDER == __BIG_ENDIAN)
+#  define HOST_TO_BE32(x)	(x)
+#  define BE32_TO_HOST(x)	(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#  define LE32_TO_HOST(x)	bswap_32(x)
+#else
+#  define HOST_TO_BE32(x)	bswap_32(x)
+#  define BE32_TO_HOST(x)	bswap_32(x)
+#  define HOST_TO_LE32(x)	(x)
+#  define LE32_TO_HOST(x)	(x)
+#endif
+
+/* Fixed header flags */
+#define HEADER_FLAGS		0x020e0000
+
+/* Recognized Hardware ID magic */
+#define HWID_HAME_MPR_A1_L8	0x32473352
+#define HWID_PORAY_R50B		0x31353033
+#define HWID_PORAY_R50D		0x33353033
+#define HWID_PORAY_R50E		0x34353033
+#define HWID_PORAY_M3		0x31353335
+#define HWID_PORAY_M4		0x32353335
+#define HWID_PORAY_Q3		0x33353335
+#define HWID_PORAY_X5_X6	0x35353335
+#define HWID_PORAY_X8		0x36353335
+#define HWID_PORAY_X1		0x38353335
+#define HWID_NEXX_WT1520	0x30353332
+#define HWID_NEXX_WT3020	0x30323033
+#define HWID_A5_V11		0x32473352
+
+/* Recognized XOR obfuscation keys */
+#define KEY_HAME		0
+#define KEY_PORAY_1		1
+#define KEY_PORAY_2		2
+#define KEY_PORAY_3		3
+#define KEY_PORAY_4		4
+#define KEY_NEXX_1		5
+#define KEY_NEXX_2		6
+#define KEY_A5_V11		7
+
+/* XOR key length */
+#define KEY_LEN			15
+
+struct file_info {
+	char		*file_name;	/* Name of the file */
+	uint32_t	file_size;	/* Length of the file */
+};
+
+struct fw_header {
+	uint32_t	hw_id;		/* Hardware id */
+	uint32_t	firmware_len;	/* Firmware data length */
+	uint32_t	flags;		/* Header flags */
+	uint8_t		pad[16];
+} __attribute__ ((packed));
+
+struct flash_layout {
+	char		*id;
+	uint32_t	fw_max_len;
+};
+
+struct board_info {
+	char		*id;
+	uint32_t	hw_id;
+	char		*layout_id;
+	uint32_t	key;
+};
+
+/*
+ * Globals
+ */
+static char *ofname;
+static char *progname;
+
+static char *board_id;
+static struct board_info *board;
+static char *layout_id;
+static struct flash_layout *layout;
+static char *opt_hw_id;
+static uint32_t hw_id;
+static struct file_info firmware_info;
+static uint32_t firmware_len = 0;
+
+static int inspect = 0;
+static int extract = 0;
+
+static uint8_t key[][KEY_LEN] = {
+  {0xC8, 0x3C, 0x3A, 0x93, 0xA2, 0x95, 0xC3, 0x63, 0x48, 0x45, 0x58, 0x09, 0x12, 0x03, 0x08},
+  {0x89, 0x6B, 0x5A, 0x93, 0x92, 0x95, 0xC3, 0x63, 0xD0, 0xA3, 0x9C, 0x92, 0x2E, 0xE6, 0xC7},
+  {0xC9, 0x1C, 0x3A, 0x93, 0x92, 0x95, 0xC3, 0x63, 0xD0, 0xA3, 0x9C, 0x92, 0x2E, 0xE6, 0xC7},
+  {0x19, 0x1B, 0x3A, 0x93, 0x92, 0x95, 0xC3, 0x63, 0xD0, 0xA3, 0x9C, 0x92, 0x2E, 0xE6, 0xC7},
+  {0x79, 0x7B, 0x7A, 0x93, 0x92, 0x95, 0xC3, 0x63, 0xD0, 0xA3, 0x9C, 0x92, 0x2E, 0xE6, 0xC7},
+  {0x19, 0x1C, 0x4A, 0x93, 0x96, 0x95, 0xC3, 0x63, 0xD0, 0xA3, 0x9C, 0x92, 0x2E, 0x16, 0xC6},
+  {0x39, 0x1C, 0x4A, 0x93, 0x96, 0x95, 0xC3, 0x63, 0xD0, 0xA3, 0x9C, 0x92, 0x2E, 0x16, 0xC6},
+  {0xC8, 0x3C, 0x3A, 0x93, 0xA2, 0x95, 0xC3, 0x63, 0x48, 0x45, 0x58, 0x09, 0x20, 0x11, 0x08},
+};
+
+static struct flash_layout layouts[] = {
+	{
+		.id		= "4M",
+		.fw_max_len	= 0x3c0000,
+	}, {
+		.id		= "8M",
+		.fw_max_len	= 0x7c0000,
+	}, {
+		/* terminating entry */
+	}
+};
+
+static struct board_info boards[] = {
+	{
+		.id             = "A5-V11",
+		.hw_id          = HWID_A5_V11,
+		.layout_id      = "4M",
+		.key            = KEY_A5_V11,
+        }, {
+		.id		= "MPR-A1",
+		.hw_id		= HWID_HAME_MPR_A1_L8,
+		.layout_id	= "4M",
+		.key		= KEY_HAME,
+	}, {
+		.id		= "MPR-L8",
+		.hw_id		= HWID_HAME_MPR_A1_L8,
+		.layout_id	= "4M",
+		.key		= KEY_HAME,
+	}, {
+		.id		= "R50B",
+		.hw_id		= HWID_PORAY_R50B,
+		.layout_id	= "4M",
+		.key		= KEY_PORAY_2,
+	}, {
+		.id		= "R50D",
+		.hw_id		= HWID_PORAY_R50D,
+		.layout_id	= "4M",
+		.key		= KEY_PORAY_3,
+	}, {
+		.id		= "R50E",
+		.hw_id		= HWID_PORAY_R50E,
+		.layout_id	= "4M",
+		.key		= KEY_PORAY_4,
+	}, {
+		.id		= "M3",
+		.hw_id		= HWID_PORAY_M3,
+		.layout_id	= "4M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "M4",
+		.hw_id		= HWID_PORAY_M4,
+		.layout_id	= "4M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "Q3",
+		.hw_id		= HWID_PORAY_Q3,
+		.layout_id	= "4M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "X5 or X6",
+		.hw_id		= HWID_PORAY_X5_X6,
+		.layout_id	= "8M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "X5",
+		.hw_id		= HWID_PORAY_X5_X6,
+		.layout_id	= "8M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "X6",
+		.hw_id		= HWID_PORAY_X5_X6,
+		.layout_id	= "8M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "X8",
+		.hw_id		= HWID_PORAY_X8,
+		.layout_id	= "8M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "X1",
+		.hw_id		= HWID_PORAY_X1,
+		.layout_id	= "8M",
+		.key		= KEY_PORAY_1,
+	}, {
+		.id		= "WT1520",
+		.hw_id		= HWID_NEXX_WT1520,
+		.layout_id	= "4M",
+		.key		= KEY_NEXX_1,
+	}, {
+		.id		= "WT1520",
+		.hw_id		= HWID_NEXX_WT1520,
+		.layout_id	= "8M",
+		.key		= KEY_NEXX_1,
+        }, {
+                .id             = "WT3020",
+                .hw_id          = HWID_NEXX_WT3020,
+                .layout_id      = "4M",
+                .key            = KEY_NEXX_2,
+        }, {
+                .id             = "WT3020",
+                .hw_id          = HWID_NEXX_WT3020,
+                .layout_id      = "8M",
+                .key            = KEY_NEXX_2,
+        }, {
+
+
+
+
+		/* terminating entry */
+	}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt ":%s\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define DBG(fmt, ...) do { \
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+/*
+ * Find a board by its name
+ */
+static struct board_info *find_board(char *id)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->id != NULL; board++){
+		if (strcasecmp(id, board->id) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+/*
+ * Find a board by its hardware ID
+ */
+static struct board_info *find_board_by_hwid(uint32_t hw_id)
+{
+	struct board_info *board;
+
+	for (board = boards; board->id != NULL; board++) {
+		if (hw_id == board->hw_id)
+			return board;
+	};
+
+	return NULL;
+}
+
+/*
+ * Find a Flash memory layout by its name
+ */
+static struct flash_layout *find_layout(char *id)
+{
+	struct flash_layout *ret;
+	struct flash_layout *l;
+
+	ret = NULL;
+	for (l = layouts; l->id != NULL; l++){
+		if (strcasecmp(id, l->id) == 0) {
+			ret = l;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+/*
+ * Display usage
+ */
+static void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>\n"
+"  -H <hwid>       use hardware id specified with <hwid>\n"
+"  -F <id>         use flash layout specified with <id>\n"
+"  -f <file>       read firmware image from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -i              inspect given firmware file (requires -f)\n"
+"  -x              extract combined kernel and rootfs while inspecting (implies -i)\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+/*
+ * Get file statistics
+ */
+static int get_file_stat(struct file_info *fdata)
+{
+	struct stat st;
+	int res;
+
+	if (fdata->file_name == NULL) {
+		return 0;
+	}
+	res = stat(fdata->file_name, &st);
+	if (res){
+		ERRS("stat failed on %s", fdata->file_name);
+		return res;
+	}
+
+	fdata->file_size = st.st_size;
+	return 0;
+}
+
+/*
+ * Read file into buffer
+ */
+static int read_to_buf(struct file_info *fdata, uint8_t *buf)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(fdata->file_name, "rb");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for reading", fdata->file_name);
+		goto out;
+	}
+
+	errno = 0;
+	fread(buf, fdata->file_size, 1, f);
+	if (errno != 0) {
+		ERRS("unable to read from file \"%s\"", fdata->file_name);
+		goto out_close;
+	}
+
+	ret = EXIT_SUCCESS;
+
+ out_close:
+	fclose(f);
+ out:
+	return ret;
+}
+
+/*
+ * Check command line options
+ */
+static int check_options(void)
+{
+	int ret;
+
+	if (firmware_info.file_name == NULL) {
+		ERR("no firmware image specified");
+		return -1;
+	}
+
+	ret = get_file_stat(&firmware_info);
+	if (ret)
+		return ret;
+
+	if (inspect)
+		return 0;
+
+	if (board_id == NULL && opt_hw_id == NULL) {
+		ERR("either board or hardware id must be specified");
+		return -1;
+	}
+
+	if (board_id) {
+		board = find_board(board_id);
+		if (board == NULL) {
+			ERR("unknown/unsupported board id \"%s\"", board_id);
+			return -1;
+		}
+		if (layout_id == NULL) {
+			layout_id = board->layout_id;
+		}
+		hw_id = board->hw_id;
+	} else {
+		hw_id = strtoul(opt_hw_id, NULL, 0);
+		board = find_board_by_hwid(hw_id);
+		if (layout_id == NULL) {
+			layout_id = board->layout_id;
+		}
+	}
+
+	layout = find_layout(layout_id);
+	if (layout == NULL) {
+		ERR("unknown flash layout \"%s\"", layout_id);
+		return -1;
+	}
+
+	firmware_len = firmware_info.file_size;
+
+	if (firmware_info.file_size >
+		layout->fw_max_len - sizeof (struct fw_header)) {
+		ERR("firmware image is too big");
+		return -1;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		return -1;
+	}
+	return 0;
+}
+
+/*
+ * Fill in firmware header
+ */
+static void fill_header(uint8_t *buf)
+{
+	struct fw_header *hdr = (struct fw_header *) buf;
+
+	memset(hdr, 0, sizeof (struct fw_header));
+	hdr->hw_id = HOST_TO_LE32(hw_id);
+	hdr->firmware_len = HOST_TO_LE32(firmware_len);
+	hdr->flags = HOST_TO_LE32(HEADER_FLAGS);
+}
+
+/*
+ * Compute firmware checksum
+ */
+static uint16_t checksum_fw(uint8_t *data, int len)
+{
+	int i;
+	int32_t checksum = 0;
+
+	for (i = 0; i < len - 1; i += 2) {
+		checksum += (data[i + 1] << 8) | data[i];
+	}
+	if (i < len) {
+		checksum += data[i];
+	}
+	checksum = checksum + (checksum >> 16) + 0xffff;
+	checksum = ~(checksum + (checksum >> 16)) & 0xffff;
+	return (uint16_t) checksum;
+}
+
+/*
+ * (De)obfuscate firmware using an XOR operation with a fixed length key
+ */
+static void xor_fw(uint8_t *data, int len)
+{
+	int i;
+
+	for (i = 0; i <= len; i++) {
+		data[i] ^= key[board->key][i % KEY_LEN];
+	}
+}
+
+/*
+ * Write firmware to file
+ */
+static int write_fw(uint8_t *data, int len)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(ofname, "wb");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	errno = 0;
+	fwrite(data, len, 1, f);
+	if (errno) {
+		ERRS("unable to write output file");
+		goto out_flush;
+	}
+
+	DBG("firmware file \"%s\" completed", ofname);
+
+	ret = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(f);
+	fclose(f);
+	if (ret != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+ out:
+	return ret;
+}
+
+/*
+ * Build firmware file
+ */
+static int build_fw(void)
+{
+	int buflen;
+	uint8_t *buf, *p;
+	int ret = EXIT_FAILURE;
+	int writelen = 0;
+	uint16_t checksum;
+
+	buflen = layout->fw_max_len;
+
+	buf = (uint8_t *) malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto out;
+	}
+
+	memset(buf, 0xff, buflen);
+	p = buf + sizeof (struct fw_header);
+	ret = read_to_buf(&firmware_info, p);
+	if (ret) {
+		goto out_free_buf;
+	}
+	writelen = sizeof (struct fw_header) + firmware_len + 2;
+
+	/* Fill in header */
+	fill_header(buf);
+
+	/* Compute firmware checksum */
+	checksum = checksum_fw(buf + sizeof (struct fw_header), firmware_len);
+
+	/* Cannot use network order function because checksum is not word-aligned */
+	buf[writelen - 1] = checksum >> 8;
+	buf[writelen - 2] = checksum & 0xff;
+
+	/* XOR obfuscate firmware */
+	xor_fw(buf + sizeof (struct fw_header), firmware_len + 2);
+
+	/* Write firmware file */
+	ret = write_fw(buf, writelen);
+	if (ret) {
+		goto out_free_buf;
+	}
+	ret = EXIT_SUCCESS;
+
+ out_free_buf:
+	free(buf);
+ out:
+	return ret;
+}
+
+/* Helper functions to inspect_fw() representing different output formats */
+static inline void inspect_fw_pstr(char *label, char *str)
+{
+	printf("%-23s: %s\n", label, str);
+}
+
+static inline void inspect_fw_phex(char *label, uint32_t val)
+{
+	printf("%-23s: 0x%08x\n", label, val);
+}
+
+static inline void inspect_fw_phexpost(char *label,
+                                       uint32_t val, char *post)
+{
+	printf("%-23s: 0x%08x (%s)\n", label, val, post);
+}
+
+static inline void inspect_fw_phexdef(char *label,
+                                      uint32_t val, uint32_t defval)
+{
+	printf("%-23s: 0x%08x                  ", label, val);
+
+	if (val == defval) {
+		printf("(== OpenWrt default)\n");
+	} else {
+		printf("(OpenWrt default: 0x%08x)\n", defval);
+	}
+}
+
+static inline void inspect_fw_phexexp(char *label,
+                                      uint32_t val, uint32_t expval)
+{
+	printf("%-23s: 0x%08x ", label, val);
+
+	if (val == expval) {
+		printf("(ok)\n");
+	} else {
+		printf("(expected: 0x%08x)\n", expval);
+	}
+}
+
+static inline void inspect_fw_phexdec(char *label, uint32_t val)
+{
+	printf("%-23s: 0x%08x / %8u bytes\n", label, val, val);
+}
+
+static inline void inspect_fw_pchecksum(char *label,
+					uint16_t val, uint16_t expval)
+{
+	printf("%-23s: 0x%04x     ", label, val);
+	if (val == expval) {
+		printf("(ok)\n");
+	} else {
+		printf("(expected: 0x%04x)\n", expval);
+	}
+}
+
+static int inspect_fw(void)
+{
+	uint8_t *buf;
+	struct fw_header *hdr;
+	int ret = EXIT_FAILURE;
+	uint16_t computed_checksum, file_checksum;
+
+	buf = (uint8_t *) malloc(firmware_info.file_size);
+	if (!buf) {
+		ERR("no memory for buffer!\n");
+		goto out;
+	}
+
+	ret = read_to_buf(&firmware_info, buf);
+	if (ret) {
+		goto out_free_buf;
+	}
+	hdr = (struct fw_header *)buf;
+
+	inspect_fw_pstr("File name", firmware_info.file_name);
+	inspect_fw_phexdec("File size", firmware_info.file_size);
+
+	printf("\n");
+
+	inspect_fw_phexdec("Header size", sizeof (struct fw_header));
+	board = find_board_by_hwid(LE32_TO_HOST(hdr->hw_id));
+	if (board) {
+		layout = find_layout(board->layout_id);
+		inspect_fw_phexpost("Hardware ID",
+				    LE32_TO_HOST( hdr->hw_id), board->id);
+	} else {
+		inspect_fw_phexpost("Hardware ID",
+		                    LE32_TO_HOST(hdr->hw_id), "unknown");
+	}
+	inspect_fw_phexdec("Firmware data length",
+	                   LE32_TO_HOST(hdr->firmware_len));
+
+	inspect_fw_phexexp("Flags",
+			   LE32_TO_HOST(hdr->flags), HEADER_FLAGS);
+	printf("\n");
+
+	/* XOR unobfuscate firmware */
+	xor_fw(buf + sizeof (struct fw_header), LE32_TO_HOST(hdr->firmware_len) + 2);
+
+	/* Compute firmware checksum */
+	computed_checksum = checksum_fw(buf + sizeof (struct fw_header), LE32_TO_HOST(hdr->firmware_len));
+
+	/* Cannot use network order function because checksum is not word-aligned */
+	file_checksum = (buf[firmware_info.file_size - 1] << 8) | buf[firmware_info.file_size - 2];
+	inspect_fw_pchecksum("Firmware checksum", computed_checksum, file_checksum);
+
+	/* Verify checksum */
+	if (computed_checksum != file_checksum) {
+		ret = -1;
+		ERR("checksums do not match");
+		goto out_free_buf;
+	}
+
+	printf("\n");
+
+	if (extract) {
+		FILE *fp;
+		char *filename;
+
+		if (ofname == NULL) {
+			filename = malloc(strlen(firmware_info.file_name) + 10);
+			sprintf(filename, "%s-firmware", firmware_info.file_name);
+		} else {
+			filename = ofname;
+		}
+		printf("Extracting firmware to \"%s\"...\n", filename);
+		fp = fopen(filename, "wb");
+		if (fp)	{
+		  if (!fwrite(buf + sizeof (struct fw_header),
+			            LE32_TO_HOST(hdr->firmware_len), 1, fp)) {
+				ERRS("error in fwrite(): %s", strerror(errno));
+			}
+			fclose(fp);
+		} else {
+			ERRS("error in fopen(): %s", strerror(errno));
+		}
+		if (ofname == NULL) {
+			free(filename);
+		}
+		printf("\n");
+	}
+
+ out_free_buf:
+	free(buf);
+ out:
+	return ret;
+}
+
+/*
+ * Main entry point
+ */
+int main(int argc, char *argv[])
+{
+	int ret = EXIT_FAILURE;
+
+	progname = basename(argv[0]);
+
+	int c;
+
+	while ((c = getopt(argc, argv, "B:H:F:f:o:ixh")) != -1) {
+		switch (c) {
+		case 'B':
+			board_id = optarg;
+			break;
+		case 'H':
+			opt_hw_id = optarg;
+			break;
+		case 'F':
+			layout_id = optarg;
+			break;
+		case 'f':
+			firmware_info.file_name = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'i':
+			inspect = 1;
+			break;
+		case 'x':
+			inspect = 1;
+			extract = 1;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	ret = check_options();
+	if (ret) {
+		goto out;
+	}
+	if (!inspect) {
+		ret = build_fw();
+	} else {
+		ret = inspect_fw();
+	}
+
+ out:
+	return ret;
+}
diff --git a/trunk/tools/firmware-utils/src/mkrtn56uimg.c b/trunk/tools/firmware-utils/src/mkrtn56uimg.c
new file mode 100644
index 00000000..fe9ae2c8
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkrtn56uimg.c
@@ -0,0 +1,294 @@
+/*
+ *
+ *  Copyright (C) 2014 OpenWrt.org
+ *  Copyright (C) 2014 Mikko Hissa <mikko.hissa@werzek.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+#include <zlib.h>
+
+#define IH_MAGIC	0x27051956
+#define IH_NMLEN	32
+#define IH_PRODLEN	23
+
+#define IH_TYPE_INVALID		0
+#define IH_TYPE_STANDALONE	1
+#define IH_TYPE_KERNEL		2
+#define IH_TYPE_RAMDISK		3
+#define IH_TYPE_MULTI		4
+#define IH_TYPE_FIRMWARE	5
+#define IH_TYPE_SCRIPT		6
+#define IH_TYPE_FILESYSTEM	7
+
+/*
+ * Compression Types
+ */
+#define IH_COMP_NONE		0
+#define IH_COMP_GZIP		1
+#define IH_COMP_BZIP2		2
+#define IH_COMP_LZMA		3
+
+typedef struct {
+	uint8_t major;
+	uint8_t minor;
+} version_t;
+
+typedef struct {
+	version_t	kernel;
+	version_t	fs;
+	uint8_t		productid[IH_PRODLEN];
+	uint8_t  	sub_fs;
+	uint32_t	ih_ksz;
+} asus_t;
+
+typedef struct image_header {
+	uint32_t	ih_magic;
+	uint32_t	ih_hcrc;
+	uint32_t	ih_time;
+	uint32_t	ih_size;
+	uint32_t	ih_load;
+	uint32_t	ih_ep;
+	uint32_t	ih_dcrc;
+	uint8_t		ih_os;
+	uint8_t		ih_arch;
+	uint8_t		ih_type;
+	uint8_t		ih_comp;
+	union {
+		uint8_t	ih_name[IH_NMLEN];
+		asus_t	asus;
+	} tail;
+} image_header_t;
+
+typedef struct squashfs_sb {
+	uint32_t	s_magic;
+	uint32_t	pad0[9];
+	uint64_t	bytes_used;
+} squashfs_sb_t;
+
+typedef enum {
+	NONE, FACTORY, SYSUPGRADE,
+} op_mode_t;
+
+void
+calc_crc(image_header_t *hdr, void *data, uint32_t len)
+{
+	/*
+	 * Calculate payload checksum
+	 */
+	hdr->ih_dcrc = htonl(crc32(0, (Bytef *)data, len));
+	hdr->ih_size = htonl(len);
+	/*
+	 * Calculate header checksum
+	 */
+	hdr->ih_hcrc = 0;
+	hdr->ih_hcrc = htonl(crc32(0, (Bytef *)hdr, sizeof(image_header_t)));
+}
+
+
+static void
+usage(const char *progname, int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	int i;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream, "\n"
+			"Options:\n"
+			"  -f <file>		generate a factory flash image <file>\n"
+			"  -s <file>		generate a sysupgrade flash image <file>\n"
+			"  -h			show this screen\n");
+	exit(status);
+}
+
+int
+process_image(char *progname, char *filename, op_mode_t opmode)
+{
+	int 		fd, len;
+	void 		*data, *ptr;
+	char		namebuf[IH_NMLEN];
+	struct 		stat sbuf;
+	uint32_t	checksum, offset_kernel, offset_sqfs, offset_end,
+				offset_sec_header, offset_eb, offset_image_end;
+	squashfs_sb_t *sqs;
+	image_header_t *hdr;
+
+	if ((fd = open(filename, O_RDWR, 0666)) < 0) {
+		fprintf (stderr, "%s: Can't open %s: %s\n",
+			progname, filename, strerror(errno));
+		return (EXIT_FAILURE);
+	}
+
+	if (fstat(fd, &sbuf) < 0) {
+		fprintf (stderr, "%s: Can't stat %s: %s\n",
+			progname, filename, strerror(errno));
+		return (EXIT_FAILURE);
+	}
+
+	if ((unsigned)sbuf.st_size < sizeof(image_header_t)) {
+		fprintf (stderr,
+			"%s: Bad size: \"%s\" is no valid image\n",
+			progname, filename);
+		return (EXIT_FAILURE);
+	}
+
+	ptr = (void *)mmap(0, sbuf.st_size,
+				PROT_READ | PROT_WRITE,
+				MAP_SHARED,
+				fd, 0);
+
+	if ((caddr_t)ptr == (caddr_t)-1) {
+		fprintf (stderr, "%s: Can't read %s: %s\n",
+			progname, filename, strerror(errno));
+		return (EXIT_FAILURE);
+	}
+
+	hdr = ptr;
+
+	if (ntohl(hdr->ih_magic) != IH_MAGIC) {
+		fprintf (stderr,
+			"%s: Bad Magic Number: \"%s\" is no valid image\n",
+			progname, filename);
+		return (EXIT_FAILURE);
+	}
+
+	if (opmode == FACTORY) {
+		strncpy(namebuf, hdr->tail.ih_name, IH_NMLEN);
+		hdr->tail.asus.kernel.major = 0;
+		hdr->tail.asus.kernel.minor = 0;
+		hdr->tail.asus.fs.major = 0;
+		hdr->tail.asus.fs.minor = 0;
+		strncpy((char *)&hdr->tail.asus.productid, "RT-N56U", IH_PRODLEN);
+	}
+
+	if (hdr->tail.asus.ih_ksz == 0)
+		hdr->tail.asus.ih_ksz = htonl(ntohl(hdr->ih_size) + sizeof(image_header_t));
+
+	offset_kernel = sizeof(image_header_t);
+	offset_sqfs = ntohl(hdr->tail.asus.ih_ksz);
+	sqs = ptr + offset_sqfs;
+	offset_sec_header = offset_sqfs + sqs->bytes_used;
+
+	/*
+	 * Reserve space for the second header.
+	 */
+	offset_end = offset_sec_header + sizeof(image_header_t);
+	offset_eb = ((offset_end>>16)+1)<<16;
+
+	if (opmode == FACTORY)
+		offset_image_end = offset_eb + 4;
+	else
+		offset_image_end = sbuf.st_size;
+	/*
+	 * Move the second header at the end of the image.
+	 */
+	offset_end = offset_sec_header;
+	offset_sec_header = offset_eb - sizeof(image_header_t);
+
+	/*
+	 * Remove jffs2 markers between squashfs and eb boundary.
+	 */
+	if (opmode == FACTORY)
+		memset(ptr+offset_end, 0xff ,offset_eb - offset_end);
+
+	/*
+	 * Grow the image if needed.
+	 */
+	if (offset_image_end > sbuf.st_size) {
+		(void) munmap((void *)ptr, sbuf.st_size);
+		ftruncate(fd, offset_image_end);
+		ptr = (void *)mmap(0, offset_image_end,
+						PROT_READ | PROT_WRITE,
+						MAP_SHARED,
+						fd, 0);
+		/*
+		 * jffs2 marker
+		 */
+		if (opmode == FACTORY) {
+			*(uint8_t *)(ptr+offset_image_end-4) = 0xde;
+			*(uint8_t *)(ptr+offset_image_end-3) = 0xad;
+			*(uint8_t *)(ptr+offset_image_end-2) = 0xc0;
+			*(uint8_t *)(ptr+offset_image_end-1) = 0xde;
+		}
+	}
+
+	/*
+	 * Calculate checksums for the second header to be used after flashing.
+	 */
+	if (opmode == FACTORY) {
+		hdr = ptr+offset_sec_header;
+		memcpy(hdr, ptr, sizeof(image_header_t));
+		strncpy(hdr->tail.ih_name, namebuf, IH_NMLEN);
+		calc_crc(hdr, ptr+offset_kernel, offset_sqfs - offset_kernel);
+		calc_crc((image_header_t *)ptr, ptr+offset_kernel, offset_image_end - offset_kernel);
+	} else {
+		calc_crc((image_header_t *)ptr, ptr+offset_kernel, offset_sqfs - offset_kernel);
+	}
+
+	if (sbuf.st_size > offset_image_end)
+		(void) munmap((void *)ptr, sbuf.st_size);
+	else
+		(void) munmap((void *)ptr, offset_image_end);
+
+	ftruncate(fd, offset_image_end);
+	(void) close (fd);
+
+	return EXIT_SUCCESS;
+}
+
+int
+main(int argc, char **argv)
+{
+	int 		opt;
+	char 		*filename, *progname;
+	op_mode_t	opmode = NONE;
+
+	progname = argv[0];
+
+	while ((opt = getopt(argc, argv,":s:f:h?")) != -1) {
+		switch (opt) {
+		case 's':
+			opmode = SYSUPGRADE;
+			filename = optarg;
+			break;
+		case 'f':
+			opmode = FACTORY;
+			filename = optarg;
+			break;
+		case 'h':
+			opmode = NONE;
+		default:
+			usage(progname, EXIT_FAILURE);
+			opmode = NONE;
+		}
+	}
+
+	if(filename == NULL)
+		opmode = NONE;
+
+	switch (opmode) {
+	case NONE:
+		usage(progname, EXIT_FAILURE);
+		break;
+	case FACTORY:
+	case SYSUPGRADE:
+		return process_image(progname, filename, opmode);
+		break;
+	}
+
+	return EXIT_SUCCESS;
+}
+
diff --git a/trunk/tools/firmware-utils/src/mksenaofw.c b/trunk/tools/firmware-utils/src/mksenaofw.c
new file mode 100644
index 00000000..7ea58f56
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mksenaofw.c
@@ -0,0 +1,417 @@
+/*
+ *
+ *  Copyright (C) 2012 OpenWrt.org
+ *  Copyright (C) 2012 Mikko Hissa <mikko.hissa@uta.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <libgen.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include "md5.h"
+
+#define HDR_LEN                 0x60
+#define BUF_SIZE                0x200
+#define VERSION_SIZE            0x10
+#define MD5_SIZE                0x10
+#define PAD_SIZE                0x20
+
+#define DEFAULT_BLOCK_SIZE      65535
+
+#define DEFAULT_HEAD_VALUE      0x0
+#define DEFAULT_VERSION         "123"
+#define DEFAULT_MAGIC           0x12345678
+
+typedef struct {
+	uint32_t head;
+	uint32_t vendor_id;
+	uint32_t product_id;
+	uint8_t  version[VERSION_SIZE];
+	uint32_t firmware_type;
+	uint32_t filesize;
+	uint32_t zero;
+	uint8_t  md5sum[MD5_SIZE];
+	uint8_t  pad[PAD_SIZE];
+	uint32_t chksum;
+	uint32_t magic;
+} img_header;
+
+typedef struct {
+	uint8_t id;
+	char * name;
+} firmware_type;
+
+typedef enum {
+	NONE, ENCODE, DECODE
+} op_mode;
+
+static firmware_type FIRMWARE_TYPES[] = {
+	{ 0x01, "bootloader" },
+	{ 0x02, "kernel" },
+	{ 0x03, "kernelapp" },
+	{ 0x04, "apps" },
+	/* The types below this line vary by manufacturer */
+	{ 0x05, "littleapps (D-Link)/factoryapps (EnGenius)" },
+	{ 0x06, "sounds (D-Link)/littleapps (EnGenius)" },
+	{ 0x07, "userconfig (D-Link)/appdata (EnGenius)" },
+	{ 0x08, "userconfig (EnGenius)"},
+	{ 0x09, "odmapps (EnGenius)"},
+	{ 0x0a, "factoryapps (D-Link)" },
+	{ 0x0b, "odmapps (D-Link)" },
+	{ 0x0c, "langpack (D-Link)" }
+};
+
+static long get_file_size(const char *filename)
+{
+	FILE *fp_file;
+	long result;
+
+	fp_file = fopen(filename, "r");
+	if (!fp_file)
+		return -1;
+	fseek(fp_file, 0, SEEK_END);
+	result = ftell(fp_file);
+	fclose(fp_file);
+	return result;
+}
+
+static int header_checksum(void *data, int len)
+{
+	int i;
+	int sum;
+
+	sum = 0;
+	if (data != NULL && len >= 0) {
+		for (i = 0; i < len; ++i)
+			sum += *(unsigned char *) (data + i);
+		return sum;
+	}
+
+	return -1;
+}
+
+static int md5_file(const char *filename, uint8_t *dst)
+{
+	FILE *fp_src;
+	MD5_CTX ctx;
+	char buf[BUF_SIZE];
+	size_t bytes_read;
+
+	MD5_Init(&ctx);
+
+	fp_src = fopen(filename, "r+b");
+	if (!fp_src) {
+		return -1;
+	}
+	while (!feof(fp_src)) {
+		bytes_read = fread(&buf, 1, BUF_SIZE, fp_src);
+		MD5_Update(&ctx, &buf, bytes_read);
+	}
+	fclose(fp_src);
+
+	MD5_Final(dst, &ctx);
+
+	return 0;
+}
+
+static int encode_image(const char *input_file_name,
+		const char *output_file_name, img_header *header, int block_size)
+{
+	char buf[BUF_SIZE];
+	size_t bytes_read;
+	size_t pad_len = 0;
+	size_t bytes_avail;
+
+	FILE *fp_input;
+	FILE *fp_output;
+
+	int i;
+	long magic;
+
+	fp_input = fopen(input_file_name, "r+b");
+	if (!fp_input) {
+		fprintf(stderr, "Cannot open %s !!\n", input_file_name);
+		return -1;
+	}
+
+	fp_output = fopen(output_file_name, "w+b");
+	if (!fp_output) {
+		fprintf(stderr, "Cannot open %s !!\n", output_file_name);
+		fclose(fp_input);
+		return -1;
+	}
+
+	header->filesize = get_file_size(input_file_name);
+	if (!header->filesize) {
+		fprintf(stderr, "File %s open/size error!\n", input_file_name);
+		fclose(fp_input);
+		fclose(fp_output);
+		return -1;
+	}
+	/*
+	 * Zero padding
+	 */
+	if (block_size > 0) {
+		pad_len = block_size - (header->filesize % block_size);
+	}
+
+	if (md5_file(input_file_name, (uint8_t *) &header->md5sum) < 0) {
+		fprintf(stderr, "MD5 failed on file %s\n", input_file_name);
+		fclose(fp_input);
+		fclose(fp_output);
+		return -1;
+	}
+	header->zero = 0;
+	header->chksum = header_checksum(header, HDR_LEN);
+	header->head = htonl(header->head);
+	header->vendor_id = htonl(header->vendor_id);
+	header->product_id = htonl(header->product_id);
+	header->firmware_type = htonl(header->firmware_type);
+	header->filesize = htonl(header->filesize);
+	header->chksum = htonl(header->chksum);
+	magic = header->magic;
+	header->magic = htonl(header->magic);
+
+	fwrite(header, HDR_LEN, 1, fp_output);
+
+	while (!feof(fp_input) || pad_len > 0) {
+
+		if (!feof(fp_input))
+			bytes_read = fread(&buf, 1, BUF_SIZE, fp_input);
+		else
+			bytes_read = 0;
+
+		/*
+		 * No more bytes read, start padding
+		 */
+		if (bytes_read < BUF_SIZE && pad_len > 0) {
+			bytes_avail = BUF_SIZE - bytes_read;
+			memset( &buf[bytes_read], 0, bytes_avail);
+			bytes_read += bytes_avail < pad_len ? bytes_avail : pad_len;
+			pad_len -= bytes_avail < pad_len ? bytes_avail : pad_len;
+		}
+
+		for (i = 0; i < bytes_read; i++)
+			buf[i] ^= magic >> (i % 8) & 0xff;
+		fwrite(&buf, bytes_read, 1, fp_output);
+	}
+
+	fclose(fp_input);
+	fclose(fp_output);
+	return 1;
+}
+
+int decode_image(const char *input_file_name, const char *output_file_name)
+{
+	img_header header;
+	char buf[BUF_SIZE];
+
+	FILE *fp_input;
+	FILE *fp_output;
+	unsigned int i;
+
+	size_t bytes_read;
+	size_t bytes_written;
+
+	fp_input = fopen(input_file_name, "r+b");
+	if (!fp_input) {
+		fprintf(stderr, "Cannot open %s !!\n", input_file_name);
+		fclose(fp_input);
+		return -1;
+	}
+
+	fp_output = fopen(output_file_name, "w+b");
+	if (!fp_output) {
+		fprintf(stderr, "Cannot open %s !!\n", output_file_name);
+		fclose(fp_output);
+		return -1;
+	}
+
+	if (fread(&header, 1, HDR_LEN, fp_input) != HDR_LEN) {
+		fprintf(stderr, "Incorrect header size!!");
+		fclose(fp_input);
+		fclose(fp_output);
+		return -1;
+	}
+
+	header.head = ntohl(header.head);
+	header.vendor_id = ntohl(header.vendor_id);
+	header.product_id = ntohl(header.product_id);
+	header.firmware_type = ntohl(header.firmware_type);
+	header.filesize = ntohl(header.filesize);
+	header.chksum = ntohl(header.chksum);
+	header.magic = ntohl(header.magic);
+
+	bytes_written = 0;
+	while (!feof(fp_input)) {
+
+		bytes_read = fread(&buf, 1, BUF_SIZE, fp_input);
+		for (i = 0; i < bytes_read; i++)
+			buf[i] ^= header.magic >> (i % 8) & 0xff;
+
+		/*
+		 * Handle padded source file
+		 */
+		if (bytes_written + bytes_read > header.filesize) {
+			bytes_read = header.filesize - bytes_written;
+			if (bytes_read > 0)
+				fwrite(&buf, bytes_read, 1, fp_output);
+			break;
+		}
+
+		fwrite(&buf, bytes_read, 1, fp_output);
+		bytes_written += bytes_read;
+	}
+
+	fclose(fp_input);
+	fclose(fp_output);
+
+	return 1;
+}
+
+static void usage(const char *progname, int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	int i;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream, "\n"
+			"Options:\n"
+			"  -e <file>		encode image file <file>\n"
+			"  -d <file>		decode image file <file>\n"
+			"  -o <file>		write output to the file <file>\n"
+			"  -t <type>		set image type to <type>\n"
+			"			valid image <type> values:\n");
+	for (i = 0; i < sizeof(FIRMWARE_TYPES) / sizeof(firmware_type); i++) {
+		fprintf(stream, "			%-5i= %s\n", FIRMWARE_TYPES[i].id,
+				FIRMWARE_TYPES[i].name);
+	}
+	fprintf(stream, "  -v <version>		set image version to <version>\n"
+			"  -r <vendor>		set image vendor id to <vendor>\n"
+			"  -p <product>		set image product id to <product>\n"
+			"  -m <magic>		set encoding magic <magic>\n"
+			"  -z			enable image padding to <blocksize>\n"
+			"  -b <blocksize>	set image <blocksize>, defaults to %u\n"
+			"  -h			show this screen\n", DEFAULT_BLOCK_SIZE);
+	exit(status);
+}
+
+int main(int argc, char *argv[])
+{
+	int opt;
+	char *input_file, *output_file, *progname = NULL;
+	op_mode mode = NONE;
+	int tmp, i, pad = 0;
+	int block_size;
+	img_header header;
+
+	block_size = DEFAULT_BLOCK_SIZE;
+	progname = basename(argv[0]);
+
+	memset(&header, 0, sizeof( img_header ));
+	header.magic = DEFAULT_MAGIC;
+	header.head = DEFAULT_HEAD_VALUE;
+	strncpy( (char*)&header.version, DEFAULT_VERSION, VERSION_SIZE - 1);
+
+	while ((opt = getopt(argc, argv, ":o:e:d:t:v:r:p:m:b:h?z")) != -1) {
+		switch (opt) {
+		case 'e':
+			input_file = optarg;
+			mode = ENCODE;
+			break;
+		case 'd':
+			input_file = optarg;
+			mode = DECODE;
+			break;
+		case 'o':
+			output_file = optarg;
+			break;
+		case 't':
+			tmp = strtol(optarg, 0, 10);
+			for (i = 0; i < sizeof(FIRMWARE_TYPES) / sizeof(firmware_type);
+					i++) {
+				if (FIRMWARE_TYPES[i].id == tmp) {
+					header.firmware_type = FIRMWARE_TYPES[i].id;
+					break;
+				}
+			}
+			if (header.firmware_type == 0) {
+				fprintf(stderr, "Invalid firmware type \"0\"!\n");
+				usage(progname, EXIT_FAILURE);
+			}
+			break;
+		case 'v':
+			strncpy( (char*)&header.version, optarg,
+					VERSION_SIZE - 1);
+			break;
+		case 'r':
+			header.vendor_id = strtol(optarg, 0, 0);
+			break;
+		case 'p':
+			header.product_id = strtol(optarg, 0, 0);
+			break;
+		case 'm':
+			header.magic = strtoul(optarg, 0, 16);
+			break;
+		case 'z':
+			pad = 1;
+			break;
+		case 'b':
+			block_size = strtol(optarg, 0, 10);
+			break;
+		case 'h':
+			usage(progname, EXIT_SUCCESS);
+			break;
+		case ':':
+			fprintf(stderr, "Option -%c requires an operand\n", optopt);
+			usage(progname, EXIT_FAILURE);
+			break;
+		case '?':
+			fprintf(stderr, "Unrecognized option: -%c\n", optopt);
+			usage(progname, EXIT_FAILURE);
+			break;
+		default:
+			usage(progname, EXIT_FAILURE);
+			break;
+		}
+	}
+
+	/* Check required arguments*/
+	if (header.firmware_type == 0) {
+		fprintf(stderr, "Firmware type must be defined\n");
+		usage(progname, EXIT_FAILURE);
+	} else if (input_file == 0 || output_file == 0) {
+		fprintf(stderr, "Input and output files must be defined\n");
+		usage(progname, EXIT_FAILURE);
+	} else if (header.vendor_id == 0 || header.product_id == 0) {
+		fprintf(stderr, "Vendor ID and Product ID must be defined and non-zero\n");
+		usage(progname, EXIT_FAILURE);
+	}
+
+	switch (mode) {
+	case NONE:
+		fprintf(stderr, "A mode must be defined\n");
+		usage(progname, EXIT_FAILURE);
+		break;
+	case ENCODE:
+		if (encode_image(input_file, output_file, &header, pad ? block_size : 0)
+				< 0)
+			return EXIT_FAILURE;
+		break;
+	case DECODE:
+		if (decode_image(input_file, output_file) < 0)
+			return EXIT_FAILURE;
+		break;
+	}
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/firmware-utils/src/mktitanimg.c b/trunk/tools/firmware-utils/src/mktitanimg.c
new file mode 100644
index 00000000..cca4a0eb
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mktitanimg.c
@@ -0,0 +1,1040 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libgen.h>
+#include "mktitanimg.h"
+
+
+struct checksumrecord
+{
+		unsigned int magic;
+        unsigned int    chksum;     /* The checksum for the complete header.
+ Excepting the
+                                           checksum block */
+};
+/***************************************************************************
+ * void print_help(void)
+ ***************************************************************************/
+void print_help(void)
+{
+	static char* help_page[]=
+	{
+		"mknspimg version 1.0, Texas Instruments, 2004",
+		"Syntax:",
+		"        mknspimg -o outfile -i image1 image2 -a align1 align2 [-v] [-b] [-p prod_id] [-r rel_id] [-s rel_name] [-f flags]",
+		"Example:",
+		"        mknspimg -o nsp_image.bin -i kernel.bin files.img -a 0 4096",
+		"This generates 'nsp_image.bin' from two input files aligning first to 0 and second to 4096 bytes."
+	};
+
+	int num_lines = sizeof(help_page)/sizeof(char*);
+	int i;
+	for(i=0; i < num_lines; i++) {
+		printf("%s\n", help_page[i]);
+	}
+}
+
+/***************************************************************************
+ * void mknspimg_print_hdr(NSP_IMG_HDR* p_img_hdr)
+ ***************************************************************************/
+void mknspimg_print_hdr(struct nsp_img_hdr *hdr)
+{
+	struct nsp_img_hdr_chksum	*chksum;
+	struct nsp_img_hdr_section_info	*sect_info;
+	struct nsp_img_hdr_sections	*section;
+	int i;
+
+	printf("****************** NSP Image Summary ******************\n");
+	printf("Magic:             0x%x\n",		hdr->head.magic);
+	printf("Image Header Size: 0x%x bytes\n",	hdr->head.hdr_size);
+	printf("Total Image Size:  %d bytes\n",		hdr->head.image_size);
+	printf("Product ID:        0x%x\n",		hdr->head.prod_id);
+	printf("Release ID:        0x%x\n",		hdr->head.rel_id);
+	printf("Version ID:        0x%x\n",		hdr->head.version);
+
+	printf("Offset Info:       0x%x\n",		hdr->head.info_offset);
+	printf("Offset Sect info:  0x%x\n",		hdr->head.sect_info_offset);
+	printf("Offset Sections:   0x%x\n",		hdr->sect_info.sections_offset);
+
+	chksum=(struct nsp_img_hdr_chksum *)(hdr+hdr->head.chksum_offset);
+	printf("Header Checksum:   0x%x\n",		chksum->hdr_chksum);
+
+	printf("+++ Section Information +++\n");
+	printf("# of sections:     %u\n", hdr->sect_info.num_sects);
+	section=&(hdr->sections);
+	for(i = 0; i < hdr->sect_info.num_sects; i++, section++) {
+		printf("+++++ Section %d +++++\n", i);
+		printf("Total size:  %u bytes\n",	section->total_size);
+		printf("Raw Size:    %u bytes\n",	section->raw_size);
+		printf("Offset:      0x%x\n",		section->offset);
+		printf("Type:        0x%x\n",		section->type);
+		printf("Name:        %s\n",		section->name);
+	}
+	printf("*******************************************************\n");
+}
+
+CMDLINE_CFG	cmd_line_cfg =
+{
+	{
+		/*	MIN	MAX	FLAGS					OPTION	*/
+		{	2,	2,	(CMDLINE_OPTFLAG_ALLOW | CMDLINE_OPTFLAG_MANDAT) },	/* '-a' align1 align2 */
+		{	0,	0,	CMDLINE_OPTFLAG_ALLOW },		/* '-b' bootstrap */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-c' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-d' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-e' */
+		{	1,	1,	CMDLINE_OPTFLAG_ALLOW },		/* '-f' flags */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-g' */
+		{	1,	1,	CMDLINE_OPTFLAG_ALLOW },		/* '-h' */
+		{	2,	2,	(CMDLINE_OPTFLAG_ALLOW | CMDLINE_OPTFLAG_MANDAT) },	/* '-i arg1 arg2 ' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-j' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-k' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-l' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-m' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-n' */
+		{	1,	1,	(CMDLINE_OPTFLAG_ALLOW | CMDLINE_OPTFLAG_MANDAT) },	/* '-o arg' */
+		{	1,	1,	CMDLINE_OPTFLAG_ALLOW },		/* '-p' PROD_ID */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-q' */
+		{	1,	1,	CMDLINE_OPTFLAG_ALLOW },		/* '-r' REL_ID */
+		{	1,	1,	CMDLINE_OPTFLAG_ALLOW },		/* '-s' "Release XXX.XXX" */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-t' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-u' */
+		{	0,	0,	CMDLINE_OPTFLAG_ALLOW },		/* '-v' control VERBOSE/NON-VERBOSE mode */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-w' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-x' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW },		/* '-y' */
+		{	0,	0,	!CMDLINE_OPTFLAG_ALLOW }		/* '-z' */
+	},
+	{	0,		0,	!CMDLINE_OPTFLAG_ALLOW },		/* global arguments */
+};
+
+/***************************************************************************
+ * int nsp_img_write(void* image, char* file, int padding)
+ * Write out the image.
+ ***************************************************************************/
+int main(int argc, char* argv[], char* env[])
+{
+	FILE*	nsp_image	= NULL;
+	int header_version=1;
+	int	cmdline_err;
+	char*	cmdline_error_msg;
+
+	char*	filen_kernel;
+	char*	filen_files;
+	char*	filen_out;
+
+	int	i,count;			/* loop variables */
+	int	num_sects = 2;			/* We require exactly two image with -i option
+							   (see CMDLINE_CFG structure above) */
+	int	desc_count=0;
+	int	total = 0;
+
+	int	header_size=0;
+	struct nsp_img_hdr_head		*img_hdr_head;	/* Start of image header */
+	struct nsp_img_hdr_info *img_hdr_info;
+	struct nsp_img_hdr_section_info *img_hdr_section_info ;
+	struct nsp_img_hdr_sections	*img_hdr_sections, *section;	/* Section pointers */
+	
+
+	/* Configure the command line. */
+	cmdline_configure(&cmd_line_cfg);
+
+	/* Read and parse the command line. */
+	cmdline_err = cmdline_read(argc, argv);
+
+	/* Check for parsing errors. */
+	if(cmdline_err != 0) {
+		/* Get the parse error message */
+		cmdline_error_msg = cmdline_error(cmdline_err);
+
+		/* Print it out */
+		printf("%s\n", cmdline_error_msg);
+
+		/* Print our help too */
+		print_help();
+		return -1;
+	}
+	if(cmdline_getopt_count('h') > 0)
+	{
+		header_version=atoi(argv[cmdline_getarg(cmdline_getarg_list('h'),0)]);
+	}
+	/* Set up arguments */
+	filen_kernel	= argv[cmdline_getarg(cmdline_getarg_list('i'),0)];
+	filen_files	= argv[cmdline_getarg(cmdline_getarg_list('i'),1)];
+	filen_out	= argv[cmdline_getarg(cmdline_getarg_list('o'),0)];
+	/* Command line arguments have been parsed. Start doing our work. */
+
+	/* Caculate the header size, and allocate the memory, and assign the sub pointers */
+	header_size =	sizeof(struct nsp_img_hdr_head) +		/* This has a single section
+								   desc block already */
+				(header_version==1?0:4) + 
+				sizeof(struct nsp_img_hdr_info) + 
+				sizeof(struct nsp_img_hdr_section_info) + 
+			sizeof(struct nsp_img_hdr_sections) * num_sects ;
+
+	img_hdr_head = (struct nsp_img_hdr_head *)malloc(header_size);
+	memset(img_hdr_head, 0x0, header_size);
+	img_hdr_info = (struct nsp_img_hdr_info*)((char *)img_hdr_head + sizeof(struct nsp_img_hdr_head) + (header_version==1?0:4));
+	img_hdr_section_info = (struct nsp_img_hdr_section_info*)((char *)img_hdr_info + sizeof(struct nsp_img_hdr_info));
+	img_hdr_sections = (struct nsp_img_hdr_sections*)((char *)img_hdr_section_info + sizeof(struct nsp_img_hdr_section_info));
+	section = img_hdr_sections;
+	memset(img_hdr_head, 0xff, (void*)img_hdr_info - (void*)img_hdr_head);
+	
+	img_hdr_head->hdr_version = header_version;
+	img_hdr_head->hdr_size = header_size;
+	img_hdr_head->info_offset = (void*)img_hdr_info - (void*)img_hdr_head;
+	img_hdr_head->sect_info_offset = (void*)img_hdr_section_info - (void*)img_hdr_head;
+	
+	img_hdr_section_info->num_sects = num_sects;
+	img_hdr_section_info->sect_size = sizeof(struct nsp_img_hdr_sections);
+	img_hdr_section_info->sections_offset = (void*)img_hdr_sections - (void*)img_hdr_head;
+	
+/*	chksum = (struct nsp_img_hdr_chksum *)
+			((unsigned int)image_hdr + header_size - sizeof(struct nsp_img_hdr_chksum));*/
+
+	/* Open the out file */
+	nsp_image = fopen(filen_out,"wb+");
+	if(nsp_image==NULL) {
+		printf("ERROR: can't open %s for writing.\n", filen_out);
+		return -1;
+	}
+
+	/* Skip image header. We'll come back to it after we've written out the images. */	
+	fseek(nsp_image,header_size,SEEK_SET);
+	total = ftell(nsp_image);
+	total = header_size;
+	printf("total=%x\n",total);
+	{
+		int align;
+		int	padding;
+		char * buf;
+		align = (header_version==1?0x10000:0x4000);
+		if(align==0) {
+			/* The user indicated no padding */
+			padding = 0;
+		} else {
+			/* Calculate number padding bytes */
+			if((total %align) ==0)
+				padding=0;
+			else
+				padding = align - (total % align);
+		}
+		if(padding>0)
+		{
+			buf=malloc(padding);
+			memset(buf, 0xff, padding);
+			if(fwrite((void*)buf,1,padding,nsp_image)!=padding) {
+				printf("ERROR: can't write to %s.\n", filen_out);
+				free(buf);
+				return -1;
+			}
+			free(buf);
+			
+		}
+		total+=padding;
+		
+
+	}
+	/* Write out all specified images (with -i option) */
+	for(i=0; i < num_sects; i++) {
+		char*	file_name;		/* input file name */
+		FILE*	filep;			/* input file pointer */
+		int	padding;		/* number of padding bytes to prepend */
+		int	align;			/* align factor from command line */
+		int	result;			/* intermediate result */
+		char * buf;
+
+		/* Open the specified image for reading */
+		file_name	= argv[cmdline_getarg(cmdline_getarg_list('i'),i)];
+		filep		= fopen(file_name, "rb");
+		if(filep==NULL) {
+			printf("ERROR: can't open file %s for reading.\n", file_name);
+			return -1;
+		}
+		section->flags = ~0x00;
+		/* Determine file size */
+		fseek(filep,0,SEEK_END);
+		section->raw_size=ftell(filep);
+		fseek(filep,0,SEEK_SET);
+		cs_calc_sum(filep,(unsigned long *)&section->chksum,0);
+		fseek(filep,0,SEEK_SET);
+
+		/* Retrieve the alignment constant */
+		/* Set image offset from the beginning of the out file */
+		section->offset=total;// + padding;
+
+		//total += padding;
+
+		/* Copy the image file into nsp_image */
+		count = section->raw_size;
+		buf=malloc(count);
+		result=fread(buf, 1, count, filep);
+		fwrite(buf, 1, result, nsp_image);
+		free(buf);
+		
+		/* HACK: This is a hack to get the names and types to the files.
+			TODO: Fix this to be a real method */
+		if(i==0){
+			section->type=NSP_IMG_SECTION_TYPE_KERNEL;
+			strncpy(section->name, "kernel", 16);
+		} else if(i==1){
+			section->type=NSP_IMG_SECTION_TYPE_FILESYSTEM_ROOT;
+			strncpy(section->name, "root", 16);
+		}
+
+		/* Account for the total */
+		align	=  strtoul(argv[cmdline_getarg(cmdline_getarg_list('a'),i)],NULL,0);
+		if(i==0){
+			if(align==0 || (((section->raw_size+ section->offset)%align)==0))
+				padding=0;
+			else
+				padding = align - ((section->raw_size+ section->offset) % align);
+
+				section->total_size=section->raw_size + padding;
+		}
+		else{
+			#define EXTRA_BLOCK 0x10000
+			unsigned int squash_padding;
+			squash_padding = EXTRA_BLOCK - section->raw_size % EXTRA_BLOCK;
+			buf=malloc(EXTRA_BLOCK + 4);
+			memset(buf, 0, squash_padding);
+			fwrite(buf, 1, squash_padding, nsp_image);
+			memset(buf, 0, EXTRA_BLOCK + 4);
+			*((unsigned int *)buf)=0xdec0adde;
+			*((unsigned int *)(buf+EXTRA_BLOCK))=0xdec0adde;
+			fwrite(buf, 1, EXTRA_BLOCK+4, nsp_image);
+			free(buf);
+			
+			if(align==0 || (((section->raw_size + (EXTRA_BLOCK + 4 + squash_padding)) %align)==0))
+				padding=0;
+			else
+				padding = align - ((section->raw_size + (EXTRA_BLOCK + 4 + squash_padding)) % align);
+			section->total_size=section->raw_size + (EXTRA_BLOCK + 4 + squash_padding) + padding;
+		}
+		if(padding>0){
+			buf=malloc(padding);
+			memset(buf, 0xff, padding);
+			fwrite(buf, 1, padding, nsp_image);
+			free(buf);
+		}
+		printf("*****padding is %d\ttotal_size=%d\traw_size=%d\n",padding, section->total_size, section->raw_size);
+
+		//total += section->raw_size;
+		total = section->total_size + section->offset;
+		printf("total=0x%x\n",total);
+		/* Close the input file */
+		fclose(filep);
+
+		/* Move the section pointer to the next slot */
+		section++;
+	}
+
+	/* Take care of the NSP image header fields */
+
+	/* head fields */
+	img_hdr_head->magic		= NSP_IMG_MAGIC_NUMBER;
+	img_hdr_head->boot_offset	= img_hdr_sections->offset;
+	img_hdr_head->flags		= ~0x00;			/* Set to all 1's */
+
+	if(cmdline_getopt_count('b'))
+		img_hdr_head->flags	&= ~(NSP_IMG_FLAG_FAILBACK_5 | NSP_IMG_FLAG_FAILBACK_1);
+
+	if(cmdline_getopt_count('f'))
+		img_hdr_head->flags	= strtoul(argv[cmdline_getarg(cmdline_getarg_list('f'),0)], 0, 16);
+
+#if 0
+	img_hdr_head->hdr_version	= 2;
+	img_hdr_head->hdr_size	= header_size;
+#endif
+
+	if(cmdline_getopt_count('p'))
+		img_hdr_head->prod_id		= strtoul(argv[cmdline_getarg(cmdline_getarg_list('p'),0)], 0, 16);
+	else
+		img_hdr_head->prod_id		= 0x4C575943;
+
+	if(cmdline_getopt_count('r'))
+		img_hdr_head->rel_id		= strtoul(argv[cmdline_getarg(cmdline_getarg_list('r'),0)], 0, 0);
+	else
+		img_hdr_head->rel_id		= 0x10203040;
+
+	if(cmdline_getopt_count('s'))
+		img_hdr_head->version		= strtoul(argv[cmdline_getarg(cmdline_getarg_list('s'),0)], 0, 0);
+	else
+		img_hdr_head->version		= 0x0b040000;
+	img_hdr_head->image_size	= total;
+#if 0
+	img_hdr_head->info_offset	= (unsigned int)(&(image_hdr->info)) -
+						(unsigned int)image_hdr;
+	img_hdr_head->sect_info_offset= (unsigned int)(&(image_hdr->sect_info)) -
+						(unsigned int)image_hdr;
+#endif
+//	image_hdr->head.chksum_offset	= (unsigned int)chksum - (unsigned int)image_hdr;
+	img_hdr_head->chksum_offset = 0xffffffff;
+//	image_hdr->head.pad1 = 0xffffffff;
+	/* info fields */
+	/* TODO: Fix. Do nothing yet */
+//	strncpy(nsp_img_hdr.id.prod_info,NSP_PRODINFO_STRING,sizeof(NSP_PRODINFO_STRING));
+	strcpy(img_hdr_info->image_filename, (const char *)basename(filen_out));
+	/* section fields */
+#if 0
+	img_hdr_section_info->num_sects=		num_sects;
+	img_hdr_section_info->sect_size=		sizeof(struct nsp_img_hdr_sections);
+	img_hdr_section_info->sections_offset=	(unsigned int)(&(image_hdr->sections)) -
+						(unsigned int)image_hdr;
+#endif
+
+	/* Calculate checksum(s) */
+#if 0
+	chksum->hdr_chksum = cs_calc_buf_sum((char*)image_hdr,
+			header_size - sizeof(struct nsp_img_hdr_chksum));
+#endif
+	/* Write out the NSP header. */
+	fseek(nsp_image,0,SEEK_SET);
+	count = fwrite((void*)img_hdr_head, header_size, 1, nsp_image);
+	if(count!=1) {
+		printf("ERROR: can't write to %s.\n", filen_out);
+		return -1;
+	}
+
+	/* Check if -v option was specified (no arg needed) */
+	if(cmdline_getopt_count('v') > 0)
+	{
+		struct nsp_img_hdr_head	head;
+		struct nsp_img_hdr	*hdr;
+
+		/* Rewind the file back to the beginning */
+		fseek(nsp_image,0,SEEK_SET);
+
+		/* Read header from the file */
+		fread((void*)&head, sizeof(struct nsp_img_hdr_head),
+				1, nsp_image);
+
+		/* Get memory to store the complete header */
+		hdr = (struct nsp_img_hdr *)malloc(head.hdr_size);
+
+		/* Read header from the file */
+		fseek(nsp_image,0,SEEK_SET);
+		fread((void*)hdr, head.hdr_size, 1, nsp_image);
+
+		/* Print it out */
+		mknspimg_print_hdr(hdr);
+		printf("Generated total %d bytes\n",total);
+		free(hdr);
+	}
+
+	free(img_hdr_head);
+
+      {
+	  struct checksumrecord cr;
+      cr.magic=CKSUM_MAGIC_NUMBER;
+      cs_calc_sum(nsp_image, (unsigned long *)&cr.chksum, 0);
+      fseek(nsp_image,0, SEEK_END);
+      fwrite(&cr, 1, sizeof(cr), nsp_image);
+	  }
+	  {
+		FILE * non_web;
+		char fname[256];
+		char * img_buf;
+		unsigned int len;
+		strcpy(fname, filen_out);
+		strcat(fname, ".non_web");
+		non_web = fopen(fname,"wb+");
+		fseek(nsp_image, 0, SEEK_END);
+		len = ftell(nsp_image);
+		img_buf=malloc(len);
+		fseek(nsp_image, 0, SEEK_SET);
+		fread(img_buf, 1, len, nsp_image);
+		img_buf[0xb] = 0x17;
+		fwrite(img_buf, 1, len-sizeof(struct checksumrecord), non_web);
+		fclose(non_web);
+		free(img_buf);
+	  }
+	  /* Close NSP image file */
+	fclose(nsp_image);
+
+	/* return result */
+	return(0);
+}
+
+#ifdef DMALLOC
+#include <dmalloc.h>
+#endif /* DMALLOC */
+
+#define BUFLEN (1 << 16)
+
+static unsigned long crctab[256] =
+{
+	0x0,
+	0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B,
+	0x1A864DB2, 0x1E475005, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6,
+	0x2B4BCB61, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD,
+	0x4C11DB70, 0x48D0C6C7, 0x4593E01E, 0x4152FDA9, 0x5F15ADAC,
+	0x5BD4B01B, 0x569796C2, 0x52568B75, 0x6A1936C8, 0x6ED82B7F,
+	0x639B0DA6, 0x675A1011, 0x791D4014, 0x7DDC5DA3, 0x709F7B7A,
+	0x745E66CD, 0x9823B6E0, 0x9CE2AB57, 0x91A18D8E, 0x95609039,
+	0x8B27C03C, 0x8FE6DD8B, 0x82A5FB52, 0x8664E6E5, 0xBE2B5B58,
+	0xBAEA46EF, 0xB7A96036, 0xB3687D81, 0xAD2F2D84, 0xA9EE3033,
+	0xA4AD16EA, 0xA06C0B5D, 0xD4326D90, 0xD0F37027, 0xDDB056FE,
+	0xD9714B49, 0xC7361B4C, 0xC3F706FB, 0xCEB42022, 0xCA753D95,
+	0xF23A8028, 0xF6FB9D9F, 0xFBB8BB46, 0xFF79A6F1, 0xE13EF6F4,
+	0xE5FFEB43, 0xE8BCCD9A, 0xEC7DD02D, 0x34867077, 0x30476DC0,
+	0x3D044B19, 0x39C556AE, 0x278206AB, 0x23431B1C, 0x2E003DC5,
+	0x2AC12072, 0x128E9DCF, 0x164F8078, 0x1B0CA6A1, 0x1FCDBB16,
+	0x018AEB13, 0x054BF6A4, 0x0808D07D, 0x0CC9CDCA, 0x7897AB07,
+	0x7C56B6B0, 0x71159069, 0x75D48DDE, 0x6B93DDDB, 0x6F52C06C,
+	0x6211E6B5, 0x66D0FB02, 0x5E9F46BF, 0x5A5E5B08, 0x571D7DD1,
+	0x53DC6066, 0x4D9B3063, 0x495A2DD4, 0x44190B0D, 0x40D816BA,
+	0xACA5C697, 0xA864DB20, 0xA527FDF9, 0xA1E6E04E, 0xBFA1B04B,
+	0xBB60ADFC, 0xB6238B25, 0xB2E29692, 0x8AAD2B2F, 0x8E6C3698,
+	0x832F1041, 0x87EE0DF6, 0x99A95DF3, 0x9D684044, 0x902B669D,
+	0x94EA7B2A, 0xE0B41DE7, 0xE4750050, 0xE9362689, 0xEDF73B3E,
+	0xF3B06B3B, 0xF771768C, 0xFA325055, 0xFEF34DE2, 0xC6BCF05F,
+	0xC27DEDE8, 0xCF3ECB31, 0xCBFFD686, 0xD5B88683, 0xD1799B34,
+	0xDC3ABDED, 0xD8FBA05A, 0x690CE0EE, 0x6DCDFD59, 0x608EDB80,
+	0x644FC637, 0x7A089632, 0x7EC98B85, 0x738AAD5C, 0x774BB0EB,
+	0x4F040D56, 0x4BC510E1, 0x46863638, 0x42472B8F, 0x5C007B8A,
+	0x58C1663D, 0x558240E4, 0x51435D53, 0x251D3B9E, 0x21DC2629,
+	0x2C9F00F0, 0x285E1D47, 0x36194D42, 0x32D850F5, 0x3F9B762C,
+	0x3B5A6B9B, 0x0315D626, 0x07D4CB91, 0x0A97ED48, 0x0E56F0FF,
+	0x1011A0FA, 0x14D0BD4D, 0x19939B94, 0x1D528623, 0xF12F560E,
+	0xF5EE4BB9, 0xF8AD6D60, 0xFC6C70D7, 0xE22B20D2, 0xE6EA3D65,
+	0xEBA91BBC, 0xEF68060B, 0xD727BBB6, 0xD3E6A601, 0xDEA580D8,
+	0xDA649D6F, 0xC423CD6A, 0xC0E2D0DD, 0xCDA1F604, 0xC960EBB3,
+	0xBD3E8D7E, 0xB9FF90C9, 0xB4BCB610, 0xB07DABA7, 0xAE3AFBA2,
+	0xAAFBE615, 0xA7B8C0CC, 0xA379DD7B, 0x9B3660C6, 0x9FF77D71,
+	0x92B45BA8, 0x9675461F, 0x8832161A, 0x8CF30BAD, 0x81B02D74,
+	0x857130C3, 0x5D8A9099, 0x594B8D2E, 0x5408ABF7, 0x50C9B640,
+	0x4E8EE645, 0x4A4FFBF2, 0x470CDD2B, 0x43CDC09C, 0x7B827D21,
+	0x7F436096, 0x7200464F, 0x76C15BF8, 0x68860BFD, 0x6C47164A,
+	0x61043093, 0x65C52D24, 0x119B4BE9, 0x155A565E, 0x18197087,
+	0x1CD86D30, 0x029F3D35, 0x065E2082, 0x0B1D065B, 0x0FDC1BEC,
+	0x3793A651, 0x3352BBE6, 0x3E119D3F, 0x3AD08088, 0x2497D08D,
+	0x2056CD3A, 0x2D15EBE3, 0x29D4F654, 0xC5A92679, 0xC1683BCE,
+	0xCC2B1D17, 0xC8EA00A0, 0xD6AD50A5, 0xD26C4D12, 0xDF2F6BCB,
+	0xDBEE767C, 0xE3A1CBC1, 0xE760D676, 0xEA23F0AF, 0xEEE2ED18,
+	0xF0A5BD1D, 0xF464A0AA, 0xF9278673, 0xFDE69BC4, 0x89B8FD09,
+	0x8D79E0BE, 0x803AC667, 0x84FBDBD0, 0x9ABC8BD5, 0x9E7D9662,
+	0x933EB0BB, 0x97FFAD0C, 0xAFB010B1, 0xAB710D06, 0xA6322BDF,
+	0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
+};
+
+int cs_is_tagged(FILE *fp)
+{
+	char buf[8];
+
+	fseek(fp, -8, SEEK_END);
+	fread(buf, 8, 1, fp);
+	if(*(unsigned long*)buf == CKSUM_MAGIC_NUMBER)
+		return 1;
+	return 0;
+}
+
+unsigned long cs_read_sum(FILE *fp)
+{
+	char buf[8];
+
+	fseek(fp, -8, SEEK_END);
+	fread(buf, 8, 1, fp);
+	return *((unsigned long*)&buf[4]);
+}
+
+int cs_calc_sum(FILE *fp, unsigned long *res, int tagged)
+{
+	unsigned char buf[BUFLEN];
+	unsigned long crc = 0;
+	uintmax_t length = 0;
+	size_t bytes_read;
+
+	fseek(fp, 0, SEEK_SET);
+
+	while((bytes_read = fread(buf, 1, BUFLEN, fp)) > 0)
+	{
+		unsigned char *cp = buf;
+
+		if(length + bytes_read < length)
+			return 0;
+
+		if(bytes_read != BUFLEN && tagged)
+			bytes_read -= 8;
+
+		length += bytes_read;
+		while(bytes_read--)
+			crc =(crc << 8) ^ crctab[((crc >> 24) ^ *cp++) & 0xFF];
+	}
+
+	if(ferror(fp))
+		return 0;
+
+	for(; length; length >>= 8)
+		crc =(crc << 8) ^ crctab[((crc >> 24) ^ length) & 0xFF];
+
+	crc = ~crc & 0xFFFFFFFF;
+
+	*res = crc;
+
+	return 1;
+}
+
+unsigned long cs_calc_buf_sum(char *buf, int size)
+{
+	unsigned long crc = 0;
+	char *cp = buf;
+	unsigned long length = size;
+
+	while(size--)
+		crc =(crc << 8) ^ crctab[((crc >> 24) ^ *cp++) & 0xFF];
+
+	for(; length; length >>= 8)
+		crc =(crc << 8) ^ crctab[((crc >> 24) ^ length) & 0xFF];
+
+	crc = ~crc & 0xFFFFFFFF;
+
+	return crc;
+}
+
+unsigned long cs_calc_buf_sum_ds(char *buf, int buf_size, char *sign, int sign_len)
+{
+	unsigned long crc = 0;
+	char *cp = buf;
+	unsigned long length = buf_size+sign_len;
+
+	while(buf_size--)
+		crc =(crc << 8) ^ crctab[((crc >> 24) ^ *cp++) & 0xFF];
+
+	cp = sign;
+	while(sign_len--)
+		crc =(crc << 8) ^ crctab[((crc >> 24) ^ *cp++) & 0xFF];
+
+
+	for(; length; length >>= 8)
+		crc =(crc << 8) ^ crctab[((crc >> 24) ^ length) & 0xFF];
+
+	crc = ~crc & 0xFFFFFFFF;
+
+	return crc;
+}
+
+int cs_set_sum(FILE *fp, unsigned long sum, int tagged)
+{
+	unsigned long magic = CKSUM_MAGIC_NUMBER;
+
+	if(tagged)
+		fseek(fp, -8, SEEK_END);
+	else
+		fseek(fp, 0, SEEK_END);
+
+	if(fwrite(&magic, 1, 4, fp) < 4)
+		return 0;
+	if(fwrite(&sum, 1, 4, fp) < 4)
+		return 0;
+
+	return 1;
+}
+
+void cs_get_sum(FILE *fp, unsigned long *sum)
+{
+	unsigned long magic = 0;
+
+	fseek(fp, -8, SEEK_END);
+
+	fread(&magic, 4, 1, fp);
+	fread(sum, 4, 1, fp);
+}
+
+int cs_validate_file(char *filename)
+{
+	FILE *pFile = NULL;
+	unsigned long sum = 0, res = 0;
+
+	if((pFile = fopen(filename, "r")) == NULL)
+		return 0;
+
+	if(!cs_is_tagged(pFile))
+	{
+		fclose(pFile);
+		return 0;
+	}
+	if(!cs_calc_sum(pFile, &sum, 1))
+	{
+		fclose(pFile);
+		return 0;
+	}
+	cs_get_sum(pFile, &res);
+	fclose(pFile);
+
+	if(sum != res)
+		return 0;
+	return 1;
+}
+
+/* ********* Library internal data ********* */
+#define	CMDLINE_TRUE			1
+#define	CMDLINE_FALSE			0
+
+typedef	enum CMDLINE_ERR
+{
+	CMDLINE_ERR_OK		= 0,	/* No Error (OK) */
+	CMDLINE_ERR_ERROR	= -1,	/* Unspecified error */
+	CMDLINE_ERR_INVKEY	= -3,	/* Invalid option key */
+	CMDLINE_ERR_MANYARG	= -4,	/* Too many arguments */
+	CMDLINE_ERR_FEWARG	= -5,	/* Too few arguments */
+	CMDLINE_ERR_ILLOPT	= -6,	/* Option not allowed (illegal option) */
+	CMDLINE_ERR_NOMEM	= -7,	/* No memory */
+	CMDLINE_ERR_OPTMIS	= -8	/* A mandatory option is missing */
+} CMDLINE_ERR;
+
+/* Argument list */
+typedef	struct CMDLINE_ARG
+{
+	int				index;		/* Index of the argument in the command line */
+	struct CMDLINE_ARG*	p_next;	/* Next node in the linked list */
+} CMDLINE_ARG;
+
+/* Master control block for an option */
+typedef struct CMDLINE_ARGS
+{
+	int				argc;		/* Total count of arguments found */
+	int				optc;		/* Total count of options found */
+	CMDLINE_ARG*	list;		/* Argument list */
+} CMDLINE_ARGS;
+
+/* Master control block for all found arguments */
+typedef	struct CMDLINE_DATA
+{
+	CMDLINE_ARGS	opt_args[26];	/* Array of MCBs for each option ('a' through 'z') */
+	CMDLINE_ARGS	glb_args;		/* Global arguments */
+	int				parsed;			/* Internal flag to prevent client calls if library is not initialized */
+} CMDLINE_DATA;
+
+/* ********* Local Data ********* */
+static CMDLINE_CFG cmdline_cfg;
+static CMDLINE_DATA cmdline_data;
+
+char*	cmdline_errmsg = "CMDLINE ERROR";
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+void* cmdline_getarg_list(char opt)
+{
+	int index = (opt - 'a');
+
+	/* Check the validity of the index */
+	if((index < 0) || (index > 25))
+	{
+		/* ERROR: Wrong option */
+		return NULL;
+	}
+
+	/* Return a pointer to the ARGS control structure */
+	return((void*)(&cmdline_data.opt_args[index]));
+}
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+int cmdline_getarg_count(void* list)
+{
+	CMDLINE_ARGS*	p_args = (CMDLINE_ARGS*)list;
+
+	/* Return number of arguments for this option */
+	return(p_args->argc);
+}
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+int cmdline_getopt_count(char opt)
+{
+	int				index;
+
+	/* Calculate index value */
+	index = opt - 'a';
+	if(index < 0 || index > 25) return -1;
+
+	/* Return number of arguments for this option */
+	return(cmdline_data.opt_args[index].optc);
+}
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+int cmdline_getarg(void* list, int num)
+{
+	int i;
+	CMDLINE_ARGS*	p_args = (CMDLINE_ARGS*)list;
+	CMDLINE_ARG*	p_arg;
+
+	/* Search the 'num' argument in the list for this option */
+	for(i=0,p_arg=p_args->list; (p_arg!=NULL) && (i<p_args->argc); i++, p_arg=p_arg->p_next)
+	{
+		/* if num matches i, we found it */
+		if(i==num) return(p_arg->index);
+	}
+	/* We did not find the specified argument or the list was empty */
+	return -1;
+}
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+int cmdline_configure(CMDLINE_CFG* p_cfg)
+{
+	/* reset global data */
+	memset(&cmdline_cfg,0,sizeof(cmdline_cfg));
+	memset(&cmdline_data,0,sizeof(cmdline_data));
+
+	/* Copy the user's config structure */
+	cmdline_cfg = *p_cfg;
+	return 0;
+}
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+char* cmdline_error(int err)
+{
+	/* TODO: implement a table of error messages */
+	return(cmdline_errmsg);
+}
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+static void cmdline_print_args(CMDLINE_ARGS* p_arglist, char* argv[])
+{
+	CMDLINE_ARG*	p_arg;
+
+	printf("   Number of times option was specified: %d\n", p_arglist->optc);
+	printf("   Number of Arguments:                  %d\n", p_arglist->argc);
+
+	if(p_arglist->argc > 0)
+	{
+		printf("   Argument List: ");
+
+		for(p_arg=p_arglist->list; p_arg != NULL; p_arg=p_arg->p_next)
+			printf("%s ", argv[p_arg->index]);
+	}
+
+	printf("\n");
+}
+
+/* ***************************************************************
+* Print all found command line options and their arguments
+****************************************************************** */
+void cmdline_print(char* argv[])
+{
+	int i;
+
+	/* Check if the command line was parsed */
+	if(cmdline_data.parsed != CMDLINE_TRUE)
+	{
+		printf("The command line has not been parsed yet.\n");
+		return;
+	}
+
+	/* Print out option arguments */
+	for( i = 0; i < 26; i++ )
+	{
+		/* Check if the option was specified */
+		if(cmdline_data.opt_args[i].optc !=0 )
+		{
+			/* Print out option name and arguments */
+			printf("Option: -%c\n", (char)('a'+i));
+			cmdline_print_args(&(cmdline_data.opt_args[i]), argv);
+		}
+	}
+
+	/* Print out global arguments */
+	printf("Global arguments:\n");
+	cmdline_print_args(&(cmdline_data.glb_args), argv);
+}
+
+/* ***************************************************************
+* Print configuration
+****************************************************************** */
+void cmdline_print_cfg(void)
+{
+
+}
+
+static void cmdline_argadd(CMDLINE_ARGS* p_arglist, CMDLINE_ARG* p_arg)
+{
+	CMDLINE_ARG*	p_list;
+	CMDLINE_ARG*	p_prev=NULL;
+
+	/* See if we had anything in the list */
+	if(p_arglist->argc == 0)
+	{
+		/* Link the argument in */
+		p_arglist->list = p_arg;
+	}
+	else
+	{
+		/* Find the tail of the list */
+		for(p_list=p_arglist->list; p_list != NULL; p_list=p_list->p_next)
+			p_prev = p_list;
+
+		/* Link the argument in */
+		p_prev->p_next=p_arg;
+	}
+
+	/* Keep track of arg number */
+	p_arglist->argc++;
+}
+
+/* ***************************************************************
+* cmdline_read()
+* Read and parse command line arguments
+****************************************************************** */
+int cmdline_read(int argc, char* argv[])
+{
+	int i, option=0;
+
+	/* Process every command line argument in argv[] array */
+	for( i = 1; i < argc; i++ )
+	{
+		/* Does the argument start with a dash? */
+		if( *argv[i] == '-' )
+		{
+			/* The argument must be two characters: a dash, and a letter */
+			if( strlen(argv[i]) != 2 )
+			{
+				/* ERROR: option syntax (needs to be a dash and one letter) */
+				return(CMDLINE_ERR_ERROR);
+			}
+
+			/* Check validity of the option key ('a' through 'z') */
+			if( ((*(argv[i] + 1)) < 'a') || ((*(argv[i] + 1)) > 'z') )
+			{
+				/* ERROR: option sysntax (invalid option key) */
+				return(CMDLINE_ERR_INVKEY);
+			}
+
+			/* Calculate the option index */
+			option = (*(argv[i] + 1)) - 'a';
+			if((option < 0) || (option > 25)) return(CMDLINE_ERR_INVKEY);
+
+			/* Check to see if the option is allowed */
+			if( cmdline_cfg.opts[option].flags & CMDLINE_OPTFLAG_ALLOW )
+			{
+				/* Option allowed. */
+				cmdline_data.opt_args[option].optc++;
+				continue;
+			}
+			else
+			{
+				/* ERROR: Option is not allowed */
+				return(CMDLINE_ERR_ILLOPT);
+			}
+		}
+		else
+		{
+			/* Read the arguments for the option */
+			CMDLINE_ARG*	p_arg;
+
+			/* Allocate space for the argument node */
+			p_arg = (CMDLINE_ARG*)calloc(1,sizeof(CMDLINE_ARG));
+			if( p_arg== NULL )
+			{
+				/* ERROR: Can't allocate memory for the argument index */
+				return(CMDLINE_ERR_NOMEM);
+			}
+
+			/* Initialize the argument */
+			p_arg->index	= i;
+			p_arg->p_next	= NULL;
+
+			/* Check if we can add to the list of arguments for this option */
+			if( (option < 0)																/* Do we have to add to the global list? */
+				|| (cmdline_data.opt_args[option].argc == cmdline_cfg.opts[option].max)		/* Did we reach MAX arguments? */
+				)
+			{
+				/* This option does not require arguments. Keep the argument in the global list. */
+				cmdline_argadd(&(cmdline_data.glb_args), p_arg);
+				continue;
+			}
+			else
+			{
+				/* See if the current count has reached max for this option */
+				if( cmdline_data.opt_args[option].argc == cmdline_cfg.opts[option].max )
+				{
+					/* ERROR: too many arguments for an option */
+					return(CMDLINE_ERR_MANYARG);
+				}
+				else
+				{
+					/* Link the argument to the arg list of the option */
+					cmdline_argadd(&(cmdline_data.opt_args[option]), p_arg);
+					continue;
+				}
+			}
+		}
+	}
+
+	/* ****** We read the complete command line. See if what we collected matches the configuration ******* */
+
+	/* Check every collected option against its configuration */
+	for( i=0; i < 26; i++ )
+	{
+		/* Check if this option was allowed */
+		if(cmdline_cfg.opts[i].flags & CMDLINE_OPTFLAG_ALLOW)
+		{
+			/* See if it was mandatory */
+			if(cmdline_cfg.opts[i].flags & CMDLINE_OPTFLAG_MANDAT)
+			{
+				/* Check if we really collected this option on the command line. */
+				if(cmdline_data.opt_args[i].optc == 0)
+				{
+					/* ERROR: a missing mandatory option */
+					return(CMDLINE_ERR_OPTMIS);
+				}
+				else
+				{
+					/* Option was there. Check how many args we got for it. */
+					if(cmdline_data.opt_args[i].argc < cmdline_cfg.opts[i].min)
+					{
+						/* ERROR: too few arguments for an option */
+						return(CMDLINE_ERR_FEWARG);
+					}
+					else
+					{
+						/* This mandatory option was proper. */
+						continue;
+					}
+				}
+			}
+			else	/* This is non-mandatory option: */
+			{
+				/* Check if the option was specified on the command line */
+				if(cmdline_data.opt_args[i].optc == 0)
+				{
+					/* option wasn't specified, go to the next */
+					continue;
+				}
+				else
+				{
+					/* Option was there. Check how many args we collected for it. */
+					if(cmdline_data.opt_args[i].argc < cmdline_cfg.opts[i].min)
+					{
+						/* ERROR: too few arguments for a non-mandatory option */
+						return(CMDLINE_ERR_FEWARG);
+					}
+					else
+					{
+						/* This non-mandatory option was proper. */
+						continue;
+					}
+				}
+			}
+		}
+		else	/* Option was not allowed. */
+		{
+			/* We should not get here as the non-allowed options should have been
+			trapped eariler. */
+		}
+	}
+
+	/* Command line was proper as far as the number of options and their arguments */
+	cmdline_data.parsed = CMDLINE_TRUE;
+	return(CMDLINE_ERR_OK);
+}
diff --git a/trunk/tools/firmware-utils/src/mktitanimg.h b/trunk/tools/firmware-utils/src/mktitanimg.h
new file mode 100644
index 00000000..9ff30f60
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mktitanimg.h
@@ -0,0 +1,171 @@
+#ifndef __MKTITANIMG_H
+#define __MKTITANIMG_H
+
+#ifndef CFGMGR_CKSUM_H
+#define CFGMGR_CKSUM_H
+
+#define CKSUM_MAGIC_NUMBER 0xC453DE23
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <errno.h>
+
+int cs_is_tagged(FILE*);
+unsigned long cs_read_sum(FILE*);
+int cs_calc_sum(FILE*, unsigned long*, int);
+int cs_set_sum(FILE*, unsigned long, int);
+void cs_get_sum(FILE*, unsigned long*);
+unsigned long cs_calc_buf_sum(char*, int);
+int cs_validate_file(char*);
+
+#endif
+#ifndef ___CMDLINE_H___
+#define	___CMDLINE_H___
+
+/* ********* Library Configuration ********* */
+typedef	struct CMDLINE_OPT
+{
+	int	min;					/* Minimum number of arguments this option takes */
+	int	max;					/* Maximum number of arguments this option takes */
+	int	flags;					/* Controlling flags (whether to accept or not, etc) */
+} CMDLINE_OPT;
+
+typedef	struct CMDLINE_CFG
+{
+	CMDLINE_OPT	opts[26];		/* Options 'a' through 'z' */
+	CMDLINE_OPT	global;			/* Global option (outside 'a'..'z') */
+} CMDLINE_CFG;
+/* ******************************************** */
+
+#define	CMDLINE_OPTFLAG_ALLOW	0x1			/* The option is allowed */
+#define	CMDLINE_OPTFLAG_MANDAT	0x2			/* The option is mandatory */
+
+extern	void	cmdline_print(char* argv[]);
+
+extern	int		cmdline_configure(CMDLINE_CFG* p_cfg);
+extern	int		cmdline_read(int argc, char* argv[]);
+
+extern	void*	cmdline_getarg_list(char opt);
+extern	int		cmdline_getarg_count(void* list);
+extern	int		cmdline_getopt_count(char opt);
+extern	int		cmdline_getarg(void* list, int num);
+
+extern	char*	cmdline_error(int err);
+#endif
+
+
+#ifndef _NSPIMGHDR_H_
+#define _NSPIMGHDR_H_
+
+/* This file describes the header format for the single image. The image is broken
+   up into several pieces. The image contains this header plus 1 or more sections.
+   Each section contains a binary block that could be a kernel, filesystem, etc. The
+   only garentee for this is that the very first section MUST be executable. Meaning
+   that the bootloader will be able to take the address of the header start, add the
+   header size, and execute that binary block. The header has its own checksum. It
+   starts hdr_size-4 bytes from the start of the header.
+ */
+
+struct nsp_img_hdr_head
+{
+	unsigned int	magic;		/* Magic number to identify this image header */
+	unsigned int	boot_offset;	/* Offset from start of header to kernel code. */
+	unsigned int	flags;		/* Image flags. */
+	unsigned int	hdr_version;	/* Version of this header. */
+	unsigned int	hdr_size;	/* The complete size of all portions of the header */
+	unsigned int	prod_id;	/* This product id */
+	unsigned int	rel_id;		/* Which release this is */
+	unsigned int	version;	/* name-MMM.nnn.ooo-rxx => 0xMMnnooxx. See comment
+					   below */
+	unsigned int	image_size;	/* Image size (including header) */
+	unsigned int	info_offset;	/* Offset from start of header to info block */
+	unsigned int	sect_info_offset;	/* Offset from start of header to section desc */
+	unsigned int	chksum_offset;	/* Offset from start of header to chksum block */
+//	unsigned int    pad1;
+};
+
+/* The patch id is a machine readable value that takes the normal patch level, and encodes
+   the correct numbers inside of it. The format of the patches are name-MM.NN.oo-rxx.bin.
+   Convert MM, NN, oo, and xx into hex, and encode them as 0xMMNNooxx. Thus:
+   att-1.2.18-r14.bin => 0x0102120e */
+
+/* The following are the flag bits for the above flags variable */
+/* List of NSP status flags: */
+#define NSP_IMG_FLAG_FAILBACK_MASK	0xF8000000
+
+/* NSP Image status flag: Flag indicates individual sections image */
+#define NSP_IMG_FLAG_INDIVIDUAL		0x00000001
+
+/* NSP Image status flag 1: Image contains a bootable image when this bit is 0 */
+#define NSP_IMG_FLAG_FAILBACK_1		0x08000000
+
+/* NSP Image status flag 2: Image contains a non-bootable image when this bit is 0 */
+#define NSP_IMG_FLAG_FAILBACK_2		0x10000000
+
+/* NSP Image status flag 3: PSPBoot has tried the image when this bit is 0 */
+#define NSP_IMG_FLAG_FAILBACK_3		0x20000000
+
+/* NSP Image status flag 4: Image is now secondary image when this bit is 0 */
+#define NSP_IMG_FLAG_FAILBACK_4		0x40000000
+
+/* NSP Image status flag 5: Image contains a valid image when this bit is 0 */
+#define NSP_IMG_FLAG_FAILBACK_5		0x80000000
+
+/* NSP Single image magic number */
+#define NSP_IMG_MAGIC_NUMBER		0x4D544443
+
+
+struct nsp_img_hdr_info
+{
+	char	release_name[64];	/* Name of release */
+	char	image_filename[64];	/* name-mm.nn.oo-rxx.bin format */
+};
+
+struct nsp_img_hdr_section_info
+{
+	unsigned int	num_sects;	/* Number of section (and section desc blocks) in this
+					   image */
+	unsigned int	sect_size;	/* Size of a SINGLE section_desc block */
+	unsigned int	sections_offset;	/* Offset to from start of header to the start of
+						   the section blocks */
+};
+
+/* There will be one of more of the following stuctures in the image header. Each
+   section will have one of these blocks. */
+struct nsp_img_hdr_sections
+{
+	unsigned int	offset;		/* Offset of section from start of NSP_IMG_HDR_HEAD */
+	unsigned int	total_size;	/* Size of section (including pad size.) */
+	unsigned int	raw_size;	/* Size of section only */
+	unsigned int	flags;		/* Section flags */
+	unsigned int	chksum;		/* Section checksum */
+	unsigned int	type;		/* Section type. What kind of info does this section
+					   describe */
+	char		name[16];	/* Reference name for this section. */
+};
+#define NSP_IMG_SECTION_TYPE_KERNEL		(0x01)
+#define NSP_IMG_SECTION_TYPE_FILESYSTEM_ROOT	(0x02)
+#define NSP_IMG_SECTION_TYPE_FILESYSTEM		(0x03)
+
+struct nsp_img_hdr
+{
+	struct nsp_img_hdr_head		head;	/* Head portion */
+	struct nsp_img_hdr_info		info;	/* Info */
+	struct nsp_img_hdr_section_info	sect_info;	/* Section block */
+	struct nsp_img_hdr_sections	sections;	/* 1 or more section_description blocks. More
+						   section_desc blocks will be appended here
+						   for each additional section needed */
+};
+
+struct nsp_img_hdr_chksum
+{
+	unsigned int	hdr_chksum;	/* The checksum for the complete header. Excepting the
+					   checksum block */
+};
+
+struct nsp_img_hdr_sections *nsp_img_hdr_get_section_ptr_by_name(struct nsp_img_hdr *hdr, char *name);
+unsigned int nsp_img_hdr_get_section_offset_by_name(struct nsp_img_hdr *hdr, char *name);
+unsigned int nsp_img_hdr_get_section_size_by_name(struct nsp_img_hdr *hdr, char *name);
+
+#endif
+#endif /* __MKTITANIMG_H */
diff --git a/trunk/tools/firmware-utils/src/mktplinkfw.c b/trunk/tools/firmware-utils/src/mktplinkfw.c
new file mode 100644
index 00000000..a6aab598
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mktplinkfw.c
@@ -0,0 +1,1158 @@
+/*
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This tool was based on:
+ *   TP-Link WR941 V2 firmware checksum fixing tool.
+ *   Copyright (C) 2008,2009 Wang Jian <lark@linux.net.cn>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#include "md5.h"
+
+#define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
+
+#define HEADER_VERSION_V1	0x01000000
+#define HWID_GL_INET_V1		0x08000001
+#define HWID_GS_OOLITE_V1	0x3C000101
+#define HWID_TL_MR10U_V1	0x00100101
+#define HWID_TL_MR13U_V1	0x00130101
+#define HWID_TL_MR3020_V1	0x30200001
+#define HWID_TL_MR3220_V1	0x32200001
+#define HWID_TL_MR3220_V2	0x32200002
+#define HWID_TL_MR3420_V1	0x34200001
+#define HWID_TL_MR3420_V2	0x34200002
+#define HWID_TL_WA701N_V1	0x07010001
+#define HWID_TL_WA7510N_V1	0x75100001
+#define HWID_TL_WA801ND_V1	0x08010001
+#define HWID_TL_WA830RE_V1	0x08300010
+#define HWID_TL_WA830RE_V2	0x08300002
+#define HWID_TL_WA801ND_V2	0x08010002
+#define HWID_TL_WA901ND_V1	0x09010001
+#define HWID_TL_WA901ND_V2	0x09010002
+#define HWID_TL_WDR4300_V1_IL	0x43008001
+#define HWID_TL_WDR4900_V1	0x49000001
+#define HWID_TL_WR703N_V1	0x07030101
+#define HWID_TL_WR720N_V3	0x07200103
+#define HWID_TL_WR741ND_V1	0x07410001
+#define HWID_TL_WR741ND_V4	0x07410004
+#define HWID_TL_WR740N_V1	0x07400001
+#define HWID_TL_WR740N_V3	0x07400003
+#define HWID_TL_WR743ND_V1	0x07430001
+#define HWID_TL_WR743ND_V2	0x07430002
+#define HWID_TL_WR841N_V1_5	0x08410002
+#define HWID_TL_WR841ND_V3	0x08410003
+#define HWID_TL_WR841ND_V5	0x08410005
+#define HWID_TL_WR841ND_V7	0x08410007
+#define HWID_TL_WR941ND_V2	0x09410002
+#define HWID_TL_WR941ND_V4	0x09410004
+#define HWID_TL_WR1043ND_V1	0x10430001
+#define HWID_TL_WR1043ND_V2	0x10430002
+#define HWID_TL_WR1041N_V2	0x10410002
+#define HWID_TL_WR2543N_V1	0x25430001
+
+#define MD5SUM_LEN	16
+
+struct file_info {
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+};
+
+struct fw_header {
+	uint32_t	version;	/* header version */
+	char		vendor_name[24];
+	char		fw_version[36];
+	uint32_t	hw_id;		/* hardware id */
+	uint32_t	hw_rev;		/* hardware revision */
+	uint32_t	unk1;
+	uint8_t		md5sum1[MD5SUM_LEN];
+	uint32_t	unk2;
+	uint8_t		md5sum2[MD5SUM_LEN];
+	uint32_t	unk3;
+	uint32_t	kernel_la;	/* kernel load address */
+	uint32_t	kernel_ep;	/* kernel entry point */
+	uint32_t	fw_length;	/* total length of the firmware */
+	uint32_t	kernel_ofs;	/* kernel data offset */
+	uint32_t	kernel_len;	/* kernel data length */
+	uint32_t	rootfs_ofs;	/* rootfs data offset */
+	uint32_t	rootfs_len;	/* rootfs data length */
+	uint32_t	boot_ofs;	/* bootloader data offset */
+	uint32_t	boot_len;	/* bootloader data length */
+	uint16_t	ver_hi;
+	uint16_t	ver_mid;
+	uint16_t	ver_lo;
+	uint8_t		pad[354];
+} __attribute__ ((packed));
+
+struct flash_layout {
+	char		*id;
+	uint32_t	fw_max_len;
+	uint32_t	kernel_la;
+	uint32_t	kernel_ep;
+	uint32_t	rootfs_ofs;
+};
+
+struct board_info {
+	char		*id;
+	uint32_t	hw_id;
+	uint32_t	hw_rev;
+	char		*layout_id;
+};
+
+/*
+ * Globals
+ */
+static char *ofname;
+static char *progname;
+static char *vendor = "TP-LINK Technologies";
+static char *version = "ver. 1.0";
+static char *fw_ver = "0.0.0";
+
+static char *board_id;
+static struct board_info *board;
+static char *layout_id;
+static struct flash_layout *layout;
+static char *opt_hw_id;
+static uint32_t hw_id;
+static char *opt_hw_rev;
+static uint32_t hw_rev;
+static int fw_ver_lo;
+static int fw_ver_mid;
+static int fw_ver_hi;
+static struct file_info kernel_info;
+static uint32_t kernel_la = 0;
+static uint32_t kernel_ep = 0;
+static uint32_t kernel_len = 0;
+static struct file_info rootfs_info;
+static uint32_t rootfs_ofs = 0;
+static uint32_t rootfs_align;
+static struct file_info boot_info;
+static int combined;
+static int strip_padding;
+static int add_jffs2_eof;
+static unsigned char jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
+static uint32_t fw_max_len;
+static uint32_t reserved_space;
+
+static struct file_info inspect_info;
+static int extract = 0;
+
+char md5salt_normal[MD5SUM_LEN] = {
+	0xdc, 0xd7, 0x3a, 0xa5, 0xc3, 0x95, 0x98, 0xfb,
+	0xdd, 0xf9, 0xe7, 0xf4, 0x0e, 0xae, 0x47, 0x38,
+};
+
+char md5salt_boot[MD5SUM_LEN] = {
+	0x8c, 0xef, 0x33, 0x5b, 0xd5, 0xc5, 0xce, 0xfa,
+	0xa7, 0x9c, 0x28, 0xda, 0xb2, 0xe9, 0x0f, 0x42,
+};
+
+static struct flash_layout layouts[] = {
+	{
+		.id		= "4M",
+		.fw_max_len	= 0x3c0000,
+		.kernel_la	= 0x80060000,
+		.kernel_ep	= 0x80060000,
+		.rootfs_ofs	= 0x140000,
+	}, {
+		.id		= "4Mlzma",
+		.fw_max_len	= 0x3c0000,
+		.kernel_la	= 0x80060000,
+		.kernel_ep	= 0x80060000,
+		.rootfs_ofs	= 0x100000,
+	}, {
+		.id		= "8M",
+		.fw_max_len	= 0x7c0000,
+		.kernel_la	= 0x80060000,
+		.kernel_ep	= 0x80060000,
+		.rootfs_ofs	= 0x140000,
+	}, {
+		.id		= "8Mlzma",
+		.fw_max_len	= 0x7c0000,
+		.kernel_la	= 0x80060000,
+		.kernel_ep	= 0x80060000,
+		.rootfs_ofs	= 0x100000,
+	}, {
+		.id		= "16M",
+		.fw_max_len	= 0xf80000,
+		.kernel_la	= 0x80060000,
+		.kernel_ep	= 0x80060000,
+		.rootfs_ofs	= 0x140000,
+	}, {
+		.id		= "16Mlzma",
+		.fw_max_len	= 0xf80000,
+		.kernel_la	= 0x80060000,
+		.kernel_ep	= 0x80060000,
+		.rootfs_ofs	= 0x100000,
+	}, {
+		.id		= "16Mppc",
+		.fw_max_len	= 0xf80000,
+		.kernel_la	= 0x00000000,
+		.kernel_ep	= 0xc0000000,
+		.rootfs_ofs	= 0x2a0000,
+	}, {
+		/* terminating entry */
+	}
+};
+
+static struct board_info boards[] = {
+	{
+		.id		= "TL-MR10Uv1",
+		.hw_id		= HWID_TL_MR10U_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-MR13Uv1",
+		.hw_id		= HWID_TL_MR13U_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-MR3020v1",
+		.hw_id		= HWID_TL_MR3020_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-MR3220v1",
+		.hw_id		= HWID_TL_MR3220_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-MR3220v2",
+		.hw_id		= HWID_TL_MR3220_V2,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-MR3420v1",
+		.hw_id		= HWID_TL_MR3420_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-MR3420v2",
+		.hw_id		= HWID_TL_MR3420_V2,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-WA701Nv1",
+		.hw_id		= HWID_TL_WA701N_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WA7510N",
+		.hw_id		= HWID_TL_WA7510N_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WA801NDv1",
+		.hw_id		= HWID_TL_WA801ND_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WA830REv1",
+		.hw_id		= HWID_TL_WA830RE_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WA830REv2",
+		.hw_id		= HWID_TL_WA830RE_V2,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id             = "TL-WA801NDv2",
+		.hw_id          = HWID_TL_WA801ND_V2,
+		.hw_rev         = 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-WA901NDv1",
+		.hw_id		= HWID_TL_WA901ND_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id             = "TL-WA901NDv2",
+		.hw_id          = HWID_TL_WA901ND_V2,
+		.hw_rev         = 1,
+		.layout_id	= "4M",
+	}, {
+		.id             = "TL-WDR4300v1",
+		.hw_id          = HWID_TL_WDR4300_V1_IL,
+		.hw_rev         = 1,
+		.layout_id	= "8Mlzma",
+	}, {
+		.id             = "TL-WDR4900v1",
+		.hw_id          = HWID_TL_WDR4900_V1,
+		.hw_rev         = 1,
+		.layout_id	= "16Mppc",
+	}, {
+		.id		= "TL-WR741NDv1",
+		.hw_id		= HWID_TL_WR741ND_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR741NDv4",
+		.hw_id		= HWID_TL_WR741ND_V4,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-WR740Nv1",
+		.hw_id		= HWID_TL_WR740N_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR740Nv3",
+		.hw_id		= HWID_TL_WR740N_V3,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR743NDv1",
+		.hw_id		= HWID_TL_WR743ND_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR743NDv2",
+		.hw_id		= HWID_TL_WR743ND_V2,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-WR841Nv1.5",
+		.hw_id		= HWID_TL_WR841N_V1_5,
+		.hw_rev		= 2,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR841NDv3",
+		.hw_id		= HWID_TL_WR841ND_V3,
+		.hw_rev		= 3,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR841NDv5",
+		.hw_id		= HWID_TL_WR841ND_V5,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR841NDv7",
+		.hw_id		= HWID_TL_WR841ND_V7,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR941NDv2",
+		.hw_id		= HWID_TL_WR941ND_V2,
+		.hw_rev		= 2,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR941NDv4",
+		.hw_id		= HWID_TL_WR941ND_V4,
+		.hw_rev		= 1,
+		.layout_id	= "4M",
+	}, {
+		.id		= "TL-WR1041Nv2",
+		.hw_id		= HWID_TL_WR1041N_V2,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-WR1043NDv1",
+		.hw_id		= HWID_TL_WR1043ND_V1,
+		.hw_rev		= 1,
+		.layout_id	= "8M",
+	}, {
+		.id		= "TL-WR1043NDv2",
+		.hw_id		= HWID_TL_WR1043ND_V2,
+		.hw_rev		= 1,
+		.layout_id	= "8Mlzma",
+	}, {
+		.id		= "TL-WR2543Nv1",
+		.hw_id		= HWID_TL_WR2543N_V1,
+		.hw_rev		= 1,
+		.layout_id	= "8Mlzma",
+	}, {
+		.id		= "TL-WR703Nv1",
+		.hw_id		= HWID_TL_WR703N_V1,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "TL-WR720Nv3",
+		.hw_id		= HWID_TL_WR720N_V3,
+		.hw_rev		= 1,
+		.layout_id	= "4Mlzma",
+	}, {
+		.id		= "GL-INETv1",
+		.hw_id		= HWID_GL_INET_V1,
+		.hw_rev		= 1,
+		.layout_id	= "8Mlzma",
+	}, {
+		.id		= "GS-OOLITEv1",
+		.hw_id		= HWID_GS_OOLITE_V1,
+		.hw_rev		= 1,
+		.layout_id	= "16Mlzma",
+	}, {
+		/* terminating entry */
+	}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define DBG(fmt, ...) do { \
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+static struct board_info *find_board(char *id)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->id != NULL; board++){
+		if (strcasecmp(id, board->id) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+static struct board_info *find_board_by_hwid(uint32_t hw_id)
+{
+	struct board_info *board;
+
+	for (board = boards; board->id != NULL; board++) {
+		if (hw_id == board->hw_id)
+			return board;
+	};
+
+	return NULL;
+}
+
+static struct flash_layout *find_layout(char *id)
+{
+	struct flash_layout *ret;
+	struct flash_layout *l;
+
+	ret = NULL;
+	for (l = layouts; l->id != NULL; l++){
+		if (strcasecmp(id, l->id) == 0) {
+			ret = l;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+static void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>\n"
+"  -c              use combined kernel image\n"
+"  -E <ep>         overwrite kernel entry point with <ep> (hexval prefixed with 0x)\n"
+"  -L <la>         overwrite kernel load address with <la> (hexval prefixed with 0x)\n"
+"  -H <hwid>       use hardware id specified with <hwid>\n"
+"  -W <hwrev>      use hardware revision specified with <hwrev>\n"
+"  -F <id>         use flash layout specified with <id>\n"
+"  -k <file>       read kernel image from the file <file>\n"
+"  -r <file>       read rootfs image from the file <file>\n"
+"  -a <align>      align the rootfs start on an <align> bytes boundary\n"
+"  -R <offset>     overwrite rootfs offset with <offset> (hexval prefixed with 0x)\n"
+"  -o <file>       write output to the file <file>\n"
+"  -s              strip padding from the end of the image\n"
+"  -j              add jffs2 end-of-filesystem markers\n"
+"  -N <vendor>     set image vendor to <vendor>\n"
+"  -V <version>    set image version to <version>\n"
+"  -v <version>    set firmware version to <version>\n"
+"  -i <file>       inspect given firmware file <file>\n"
+"  -x              extract kernel and rootfs while inspecting (requires -i)\n"
+"  -X <size>       reserve <size> bytes in the firmware image (hexval prefixed with 0x)\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static int get_md5(char *data, int size, char *md5)
+{
+	MD5_CTX ctx;
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, data, size);
+	MD5_Final(md5, &ctx);
+}
+
+static int get_file_stat(struct file_info *fdata)
+{
+	struct stat st;
+	int res;
+
+	if (fdata->file_name == NULL)
+		return 0;
+
+	res = stat(fdata->file_name, &st);
+	if (res){
+		ERRS("stat failed on %s", fdata->file_name);
+		return res;
+	}
+
+	fdata->file_size = st.st_size;
+	return 0;
+}
+
+static int read_to_buf(struct file_info *fdata, char *buf)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(fdata->file_name, "r");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for reading", fdata->file_name);
+		goto out;
+	}
+
+	errno = 0;
+	fread(buf, fdata->file_size, 1, f);
+	if (errno != 0) {
+		ERRS("unable to read from file \"%s\"", fdata->file_name);
+		goto out_close;
+	}
+
+	ret = EXIT_SUCCESS;
+
+ out_close:
+	fclose(f);
+ out:
+	return ret;
+}
+
+static int check_options(void)
+{
+	int ret;
+
+	if (inspect_info.file_name) {
+		ret = get_file_stat(&inspect_info);
+		if (ret)
+			return ret;
+
+		return 0;
+	} else if (extract) {
+		ERR("no firmware for inspection specified");
+		return -1;
+	}
+
+	if (board_id == NULL && opt_hw_id == NULL) {
+		ERR("either board or hardware id must be specified");
+		return -1;
+	}
+
+	if (board_id) {
+		board = find_board(board_id);
+		if (board == NULL) {
+			ERR("unknown/unsupported board id \"%s\"", board_id);
+			return -1;
+		}
+		if (layout_id == NULL)
+			layout_id = board->layout_id;
+
+		hw_id = board->hw_id;
+		hw_rev = board->hw_rev;
+	} else {
+		if (layout_id == NULL) {
+			ERR("flash layout is not specified");
+			return -1;
+		}
+		hw_id = strtoul(opt_hw_id, NULL, 0);
+
+		if (opt_hw_rev)
+			hw_rev = strtoul(opt_hw_rev, NULL, 0);
+		else
+			hw_rev = 1;
+	}
+
+	layout = find_layout(layout_id);
+	if (layout == NULL) {
+		ERR("unknown flash layout \"%s\"", layout_id);
+		return -1;
+	}
+
+	if (!kernel_la)
+		kernel_la = layout->kernel_la;
+	if (!kernel_ep)
+		kernel_ep = layout->kernel_ep;
+	if (!rootfs_ofs)
+		rootfs_ofs = layout->rootfs_ofs;
+
+	if (reserved_space > layout->fw_max_len) {
+		ERR("reserved space is not valid");
+		return -1;
+	}
+
+	fw_max_len = layout->fw_max_len - reserved_space;
+
+	if (kernel_info.file_name == NULL) {
+		ERR("no kernel image specified");
+		return -1;
+	}
+
+	ret = get_file_stat(&kernel_info);
+	if (ret)
+		return ret;
+
+	kernel_len = kernel_info.file_size;
+
+	if (combined) {
+		if (kernel_info.file_size >
+		    fw_max_len - sizeof(struct fw_header)) {
+			ERR("kernel image is too big");
+			return -1;
+		}
+	} else {
+		if (rootfs_info.file_name == NULL) {
+			ERR("no rootfs image specified");
+			return -1;
+		}
+
+		ret = get_file_stat(&rootfs_info);
+		if (ret)
+			return ret;
+
+		if (rootfs_align) {
+			kernel_len += sizeof(struct fw_header);
+			kernel_len = ALIGN(kernel_len, rootfs_align);
+			kernel_len -= sizeof(struct fw_header);
+
+			DBG("kernel length aligned to %u", kernel_len);
+
+			if (kernel_len + rootfs_info.file_size >
+			    fw_max_len - sizeof(struct fw_header)) {
+				ERR("images are too big");
+				return -1;
+			}
+		} else {
+			if (kernel_info.file_size >
+			    rootfs_ofs - sizeof(struct fw_header)) {
+				ERR("kernel image is too big");
+				return -1;
+			}
+
+			if (rootfs_info.file_size >
+			    (fw_max_len - rootfs_ofs)) {
+				ERR("rootfs image is too big");
+				return -1;
+			}
+		}
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		return -1;
+	}
+
+	ret = sscanf(fw_ver, "%d.%d.%d", &fw_ver_hi, &fw_ver_mid, &fw_ver_lo);
+	if (ret != 3) {
+		ERR("invalid firmware version '%s'", fw_ver);
+		return -1;
+	}
+
+	return 0;
+}
+
+static void fill_header(char *buf, int len)
+{
+	struct fw_header *hdr = (struct fw_header *)buf;
+
+	memset(hdr, 0, sizeof(struct fw_header));
+
+	hdr->version = htonl(HEADER_VERSION_V1);
+	strncpy(hdr->vendor_name, vendor, sizeof(hdr->vendor_name));
+	strncpy(hdr->fw_version, version, sizeof(hdr->fw_version));
+	hdr->hw_id = htonl(hw_id);
+	hdr->hw_rev = htonl(hw_rev);
+
+	if (boot_info.file_size == 0)
+		memcpy(hdr->md5sum1, md5salt_normal, sizeof(hdr->md5sum1));
+	else
+		memcpy(hdr->md5sum1, md5salt_boot, sizeof(hdr->md5sum1));
+
+	hdr->kernel_la = htonl(kernel_la);
+	hdr->kernel_ep = htonl(kernel_ep);
+	hdr->fw_length = htonl(layout->fw_max_len);
+	hdr->kernel_ofs = htonl(sizeof(struct fw_header));
+	hdr->kernel_len = htonl(kernel_len);
+	if (!combined) {
+		hdr->rootfs_ofs = htonl(rootfs_ofs);
+		hdr->rootfs_len = htonl(rootfs_info.file_size);
+	}
+
+	hdr->ver_hi = htons(fw_ver_hi);
+	hdr->ver_mid = htons(fw_ver_mid);
+	hdr->ver_lo = htons(fw_ver_lo);
+
+	get_md5(buf, len, hdr->md5sum1);
+}
+
+static int pad_jffs2(char *buf, int currlen)
+{
+	int len;
+	uint32_t pad_mask;
+
+	len = currlen;
+	pad_mask = (64 * 1024);
+	while ((len < layout->fw_max_len) && (pad_mask != 0)) {
+		uint32_t mask;
+		int i;
+
+		for (i = 10; i < 32; i++) {
+			mask = 1 << i;
+			if (pad_mask & mask)
+				break;
+		}
+
+		len = ALIGN(len, mask);
+
+		for (i = 10; i < 32; i++) {
+			mask = 1 << i;
+			if ((len & (mask - 1)) == 0)
+				pad_mask &= ~mask;
+		}
+
+		for (i = 0; i < sizeof(jffs2_eof_mark); i++)
+			buf[len + i] = jffs2_eof_mark[i];
+
+		len += sizeof(jffs2_eof_mark);
+	}
+
+	return len;
+}
+
+static int write_fw(char *data, int len)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(ofname, "w");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	errno = 0;
+	fwrite(data, len, 1, f);
+	if (errno) {
+		ERRS("unable to write output file");
+		goto out_flush;
+	}
+
+	DBG("firmware file \"%s\" completed", ofname);
+
+	ret = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(f);
+	fclose(f);
+	if (ret != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+ out:
+	return ret;
+}
+
+static int build_fw(void)
+{
+	int buflen;
+	char *buf;
+	char *p;
+	int ret = EXIT_FAILURE;
+	int writelen = 0;
+
+	buflen = layout->fw_max_len;
+
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto out;
+	}
+
+	memset(buf, 0xff, buflen);
+	p = buf + sizeof(struct fw_header);
+	ret = read_to_buf(&kernel_info, p);
+	if (ret)
+		goto out_free_buf;
+
+	writelen = sizeof(struct fw_header) + kernel_len;
+
+	if (!combined) {
+		if (rootfs_align)
+			p = buf + writelen;
+		else
+			p = buf + rootfs_ofs;
+
+		ret = read_to_buf(&rootfs_info, p);
+		if (ret)
+			goto out_free_buf;
+
+		if (rootfs_align)
+			writelen += rootfs_info.file_size;
+		else
+			writelen = rootfs_ofs + rootfs_info.file_size;
+
+		if (add_jffs2_eof)
+			writelen = pad_jffs2(buf, writelen);
+	}
+
+	if (!strip_padding)
+		writelen = buflen;
+
+	fill_header(buf, writelen);
+	ret = write_fw(buf, writelen);
+	if (ret)
+		goto out_free_buf;
+
+	ret = EXIT_SUCCESS;
+
+ out_free_buf:
+	free(buf);
+ out:
+	return ret;
+}
+
+/* Helper functions to inspect_fw() representing different output formats */
+static inline void inspect_fw_pstr(char *label, char *str)
+{
+	printf("%-23s: %s\n", label, str);
+}
+
+static inline void inspect_fw_phex(char *label, uint32_t val)
+{
+	printf("%-23s: 0x%08x\n", label, val);
+}
+
+static inline void inspect_fw_phexpost(char *label,
+                                       uint32_t val, char *post)
+{
+	printf("%-23s: 0x%08x (%s)\n", label, val, post);
+}
+
+static inline void inspect_fw_phexdef(char *label,
+                                      uint32_t val, uint32_t defval)
+{
+	printf("%-23s: 0x%08x                  ", label, val);
+
+	if (val == defval)
+		printf("(== OpenWrt default)\n");
+	else
+		printf("(OpenWrt default: 0x%08x)\n", defval);
+}
+
+static inline void inspect_fw_phexexp(char *label,
+                                      uint32_t val, uint32_t expval)
+{
+	printf("%-23s: 0x%08x ", label, val);
+
+	if (val == expval)
+		printf("(ok)\n");
+	else
+		printf("(expected: 0x%08x)\n", expval);
+}
+
+static inline void inspect_fw_phexdec(char *label, uint32_t val)
+{
+	printf("%-23s: 0x%08x / %8u bytes\n", label, val, val);
+}
+
+static inline void inspect_fw_phexdecdef(char *label,
+                                         uint32_t val, uint32_t defval)
+{
+	printf("%-23s: 0x%08x / %8u bytes ", label, val, val);
+
+	if (val == defval)
+		printf("(== OpenWrt default)\n");
+	else
+		printf("(OpenWrt default: 0x%08x)\n", defval);
+}
+
+static inline void inspect_fw_pmd5sum(char *label, uint8_t *val, char *text)
+{
+	int i;
+
+	printf("%-23s:", label);
+	for (i=0; i<MD5SUM_LEN; i++)
+		printf(" %02x", val[i]);
+	printf(" %s\n", text);
+}
+
+static int inspect_fw(void)
+{
+	char *buf;
+	struct fw_header *hdr;
+	uint8_t md5sum[MD5SUM_LEN];
+	struct board_info *board;
+	int ret = EXIT_FAILURE;
+
+	buf = malloc(inspect_info.file_size);
+	if (!buf) {
+		ERR("no memory for buffer!\n");
+		goto out;
+	}
+
+	ret = read_to_buf(&inspect_info, buf);
+	if (ret)
+		goto out_free_buf;
+	hdr = (struct fw_header *)buf;
+
+	inspect_fw_pstr("File name", inspect_info.file_name);
+	inspect_fw_phexdec("File size", inspect_info.file_size);
+
+	if (ntohl(hdr->version) != HEADER_VERSION_V1) {
+		ERR("file does not seem to have V1 header!\n");
+		goto out_free_buf;
+	}
+
+	inspect_fw_phexdec("Version 1 Header size", sizeof(struct fw_header));
+
+	if (ntohl(hdr->unk1) != 0)
+		inspect_fw_phexdec("Unknown value 1", hdr->unk1);
+
+	memcpy(md5sum, hdr->md5sum1, sizeof(md5sum));
+	if (ntohl(hdr->boot_len) == 0)
+		memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum));
+	else
+		memcpy(hdr->md5sum1, md5salt_boot, sizeof(md5sum));
+	get_md5(buf, inspect_info.file_size, hdr->md5sum1);
+
+	if (memcmp(md5sum, hdr->md5sum1, sizeof(md5sum))) {
+		inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(*ERROR*)");
+		inspect_fw_pmd5sum("          --> expected", hdr->md5sum1, "");
+	} else {
+		inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(ok)");
+	}
+	if (ntohl(hdr->unk2) != 0)
+		inspect_fw_phexdec("Unknown value 2", hdr->unk2);
+	inspect_fw_pmd5sum("Header MD5Sum2", hdr->md5sum2,
+	                   "(purpose yet unknown, unchecked here)");
+	if (ntohl(hdr->unk3) != 0)
+		inspect_fw_phexdec("Unknown value 3", hdr->unk3);
+
+	printf("\n");
+
+	inspect_fw_pstr("Vendor name", hdr->vendor_name);
+	inspect_fw_pstr("Firmware version", hdr->fw_version);
+	board = find_board_by_hwid(ntohl(hdr->hw_id));
+	if (board) {
+		layout = find_layout(board->layout_id);
+		inspect_fw_phexpost("Hardware ID",
+		                    ntohl(hdr->hw_id), board->id);
+		inspect_fw_phexexp("Hardware Revision",
+		                   ntohl(hdr->hw_rev), board->hw_rev);
+	} else {
+		inspect_fw_phexpost("Hardware ID",
+		                    ntohl(hdr->hw_id), "unknown");
+		inspect_fw_phex("Hardware Revision",
+		                ntohl(hdr->hw_rev));
+	}
+
+	printf("\n");
+
+	inspect_fw_phexdec("Kernel data offset",
+	                   ntohl(hdr->kernel_ofs));
+	inspect_fw_phexdec("Kernel data length",
+	                   ntohl(hdr->kernel_len));
+	if (board) {
+		inspect_fw_phexdef("Kernel load address",
+		                   ntohl(hdr->kernel_la),
+		                   layout ? layout->kernel_la : 0xffffffff);
+		inspect_fw_phexdef("Kernel entry point",
+		                   ntohl(hdr->kernel_ep),
+		                   layout ? layout->kernel_ep : 0xffffffff);
+		inspect_fw_phexdecdef("Rootfs data offset",
+		                      ntohl(hdr->rootfs_ofs),
+		                      layout ? layout->rootfs_ofs : 0xffffffff);
+	} else {
+		inspect_fw_phex("Kernel load address",
+		                ntohl(hdr->kernel_la));
+		inspect_fw_phex("Kernel entry point",
+		                ntohl(hdr->kernel_ep));
+		inspect_fw_phexdec("Rootfs data offset",
+		                   ntohl(hdr->rootfs_ofs));
+	}
+	inspect_fw_phexdec("Rootfs data length",
+	                   ntohl(hdr->rootfs_len));
+	inspect_fw_phexdec("Boot loader data offset",
+	                   ntohl(hdr->boot_ofs));
+	inspect_fw_phexdec("Boot loader data length",
+	                   ntohl(hdr->boot_len));
+	inspect_fw_phexdec("Total firmware length",
+	                   ntohl(hdr->fw_length));
+
+	if (extract) {
+		FILE *fp;
+		char *filename;
+
+		printf("\n");
+
+		filename = malloc(strlen(inspect_info.file_name) + 8);
+		sprintf(filename, "%s-kernel", inspect_info.file_name);
+		printf("Extracting kernel to \"%s\"...\n", filename);
+		fp = fopen(filename, "w");
+		if (fp)	{
+			if (!fwrite(buf + ntohl(hdr->kernel_ofs),
+			            ntohl(hdr->kernel_len), 1, fp)) {
+				ERR("error in fwrite(): %s", strerror(errno));
+			}
+			fclose(fp);
+		} else {
+			ERR("error in fopen(): %s", strerror(errno));
+		}
+		free(filename);
+
+		filename = malloc(strlen(inspect_info.file_name) + 8);
+		sprintf(filename, "%s-rootfs", inspect_info.file_name);
+		printf("Extracting rootfs to \"%s\"...\n", filename);
+		fp = fopen(filename, "w");
+		if (fp)	{
+			if (!fwrite(buf + ntohl(hdr->rootfs_ofs),
+			            ntohl(hdr->rootfs_len), 1, fp)) {
+				ERR("error in fwrite(): %s", strerror(errno));
+			}
+			fclose(fp);
+		} else {
+			ERR("error in fopen(): %s", strerror(errno));
+		}
+		free(filename);
+	}
+
+ out_free_buf:
+	free(buf);
+ out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int ret = EXIT_FAILURE;
+	int err;
+
+	FILE *outfile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "a:B:H:E:F:L:V:N:W:ci:k:r:R:o:xX:hsjv:");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'a':
+			sscanf(optarg, "0x%x", &rootfs_align);
+			break;
+		case 'B':
+			board_id = optarg;
+			break;
+		case 'H':
+			opt_hw_id = optarg;
+			break;
+		case 'E':
+			sscanf(optarg, "0x%x", &kernel_ep);
+			break;
+		case 'F':
+			layout_id = optarg;
+			break;
+		case 'W':
+			opt_hw_rev = optarg;
+			break;
+		case 'L':
+			sscanf(optarg, "0x%x", &kernel_la);
+			break;
+		case 'V':
+			version = optarg;
+			break;
+		case 'v':
+			fw_ver = optarg;
+			break;
+		case 'N':
+			vendor = optarg;
+			break;
+		case 'c':
+			combined++;
+			break;
+		case 'k':
+			kernel_info.file_name = optarg;
+			break;
+		case 'r':
+			rootfs_info.file_name = optarg;
+			break;
+		case 'R':
+			sscanf(optarg, "0x%x", &rootfs_ofs);
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 's':
+			strip_padding = 1;
+			break;
+		case 'i':
+			inspect_info.file_name = optarg;
+			break;
+		case 'j':
+			add_jffs2_eof = 1;
+			break;
+		case 'x':
+			extract = 1;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		case 'X':
+			sscanf(optarg, "0x%x", &reserved_space);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	ret = check_options();
+	if (ret)
+		goto out;
+
+	if (!inspect_info.file_name)
+		ret = build_fw();
+	else
+		ret = inspect_fw();
+
+ out:
+	return ret;
+}
+
diff --git a/trunk/tools/firmware-utils/src/mktplinkfw2.c b/trunk/tools/firmware-utils/src/mktplinkfw2.c
new file mode 100644
index 00000000..df64ac3a
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mktplinkfw2.c
@@ -0,0 +1,944 @@
+/*
+ * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This tool was based on:
+ *   TP-Link WR941 V2 firmware checksum fixing tool.
+ *   Copyright (C) 2008,2009 Wang Jian <lark@linux.net.cn>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#include "md5.h"
+
+#define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
+
+#define HEADER_VERSION_V2	0x02000000
+
+#define HWID_TD_W8970_V1		0x89700001
+
+#define MD5SUM_LEN	16
+
+struct file_info {
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+};
+
+struct fw_header {
+	uint32_t	version;	/* 0x00: header version */
+	char		fw_version[48]; /* 0x04: fw version string */
+	uint32_t	hw_id;		/* 0x34: hardware id */
+	uint32_t	hw_rev;		/* 0x38: FIXME: hardware revision? */
+	uint32_t	unk1;	        /* 0x3c: 0x00000000 */
+	uint8_t		md5sum1[MD5SUM_LEN]; /* 0x40 */
+	uint32_t	unk2;		/* 0x50: 0x00000000 */
+	uint8_t		md5sum2[MD5SUM_LEN]; /* 0x54 */
+	uint32_t	unk3;		/* 0x64: 0xffffffff */
+
+	uint32_t	kernel_la;	/* 0x68: kernel load address */
+	uint32_t	kernel_ep;	/* 0x6c: kernel entry point */
+	uint32_t	fw_length;	/* 0x70: total length of the image */
+	uint32_t	kernel_ofs;	/* 0x74: kernel data offset */
+	uint32_t	kernel_len;	/* 0x78: kernel data length */
+	uint32_t	rootfs_ofs;	/* 0x7c: rootfs data offset */
+	uint32_t	rootfs_len;	/* 0x80: rootfs data length */
+	uint32_t	boot_ofs;	/* 0x84: FIXME: seems to be unused */
+	uint32_t	boot_len;	/* 0x88: FIXME: seems to be unused */
+	uint16_t	unk4;		/* 0x8c: 0x55aa */
+	uint8_t		sver_hi;	/* 0x8e */
+	uint8_t		sver_lo;	/* 0x8f */
+	uint8_t		unk5;		/* 0x90: magic: 0xa5 */
+	uint8_t		ver_hi;         /* 0x91 */
+	uint8_t		ver_mid;        /* 0x92 */
+	uint8_t		ver_lo;         /* 0x93 */
+	uint8_t		pad[364];
+} __attribute__ ((packed));
+
+struct flash_layout {
+	char		*id;
+	uint32_t	fw_max_len;
+	uint32_t	kernel_la;
+	uint32_t	kernel_ep;
+	uint32_t	rootfs_ofs;
+};
+
+struct board_info {
+	char		*id;
+	uint32_t	hw_id;
+	uint32_t	hw_rev;
+	char		*layout_id;
+};
+
+/*
+ * Globals
+ */
+static char *ofname;
+static char *progname;
+static char *vendor = "TP-LINK Technologies";
+static char *version = "ver. 1.0";
+static char *fw_ver = "0.0.0";
+static char *sver = "1.0";
+
+static char *board_id;
+static struct board_info *board;
+static char *layout_id;
+static struct flash_layout *layout;
+static char *opt_hw_id;
+static uint32_t hw_id;
+static char *opt_hw_rev;
+static uint32_t hw_rev;
+static int fw_ver_lo;
+static int fw_ver_mid;
+static int fw_ver_hi;
+static int sver_lo;
+static int sver_hi;
+static struct file_info kernel_info;
+static uint32_t kernel_la = 0;
+static uint32_t kernel_ep = 0;
+static uint32_t kernel_len = 0;
+static struct file_info rootfs_info;
+static uint32_t rootfs_ofs = 0;
+static uint32_t rootfs_align;
+static struct file_info boot_info;
+static int combined;
+static int strip_padding;
+static int add_jffs2_eof;
+static unsigned char jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
+
+static struct file_info inspect_info;
+static int extract = 0;
+
+char md5salt_normal[MD5SUM_LEN] = {
+	0xdc, 0xd7, 0x3a, 0xa5, 0xc3, 0x95, 0x98, 0xfb,
+	0xdc, 0xf9, 0xe7, 0xf4, 0x0e, 0xae, 0x47, 0x37,
+};
+
+char md5salt_boot[MD5SUM_LEN] = {
+	0x8c, 0xef, 0x33, 0x5b, 0xd5, 0xc5, 0xce, 0xfa,
+	0xa7, 0x9c, 0x28, 0xda, 0xb2, 0xe9, 0x0f, 0x42,
+};
+
+static struct flash_layout layouts[] = {
+	{
+		.id		= "8Mltq",
+		.fw_max_len	= 0x7a0000,
+		.kernel_la	= 0x80002000,
+		.kernel_ep	= 0x80002000,
+		.rootfs_ofs	= 0x140000,
+	}, {
+		/* terminating entry */
+	}
+};
+
+static struct board_info boards[] = {
+	{
+		.id		= "TD-W8970v1",
+		.hw_id		= HWID_TD_W8970_V1,
+		.hw_rev		= 1,
+		.layout_id	= "8Mltq",
+	}, {
+		/* terminating entry */
+	}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define DBG(fmt, ...) do { \
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+static struct board_info *find_board(char *id)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->id != NULL; board++){
+		if (strcasecmp(id, board->id) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+static struct board_info *find_board_by_hwid(uint32_t hw_id)
+{
+	struct board_info *board;
+
+	for (board = boards; board->id != NULL; board++) {
+		if (hw_id == board->hw_id)
+			return board;
+	};
+
+	return NULL;
+}
+
+static struct flash_layout *find_layout(char *id)
+{
+	struct flash_layout *ret;
+	struct flash_layout *l;
+
+	ret = NULL;
+	for (l = layouts; l->id != NULL; l++){
+		if (strcasecmp(id, l->id) == 0) {
+			ret = l;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+static void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>\n"
+"  -c              use combined kernel image\n"
+"  -E <ep>         overwrite kernel entry point with <ep> (hexval prefixed with 0x)\n"
+"  -L <la>         overwrite kernel load address with <la> (hexval prefixed with 0x)\n"
+"  -H <hwid>       use hardware id specified with <hwid>\n"
+"  -W <hwrev>      use hardware revision specified with <hwrev>\n"
+"  -F <id>         use flash layout specified with <id>\n"
+"  -k <file>       read kernel image from the file <file>\n"
+"  -r <file>       read rootfs image from the file <file>\n"
+"  -a <align>      align the rootfs start on an <align> bytes boundary\n"
+"  -R <offset>     overwrite rootfs offset with <offset> (hexval prefixed with 0x)\n"
+"  -o <file>       write output to the file <file>\n"
+"  -s              strip padding from the end of the image\n"
+"  -j              add jffs2 end-of-filesystem markers\n"
+"  -V <version>    set image version to <version>\n"
+"  -v <version>    set firmware version to <version>\n"
+"  -y <version>    set secondary version to <version>\n"
+"  -i <file>       inspect given firmware file <file>\n"
+"  -x              extract kernel and rootfs while inspecting (requires -i)\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static int get_md5(char *data, int size, char *md5)
+{
+	MD5_CTX ctx;
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, data, size);
+	MD5_Final(md5, &ctx);
+}
+
+static int get_file_stat(struct file_info *fdata)
+{
+	struct stat st;
+	int res;
+
+	if (fdata->file_name == NULL)
+		return 0;
+
+	res = stat(fdata->file_name, &st);
+	if (res){
+		ERRS("stat failed on %s", fdata->file_name);
+		return res;
+	}
+
+	fdata->file_size = st.st_size;
+	return 0;
+}
+
+static int read_to_buf(struct file_info *fdata, char *buf)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(fdata->file_name, "r");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for reading", fdata->file_name);
+		goto out;
+	}
+
+	errno = 0;
+	fread(buf, fdata->file_size, 1, f);
+	if (errno != 0) {
+		ERRS("unable to read from file \"%s\"", fdata->file_name);
+		goto out_close;
+	}
+
+	ret = EXIT_SUCCESS;
+
+ out_close:
+	fclose(f);
+ out:
+	return ret;
+}
+
+static int check_options(void)
+{
+	int ret;
+
+	if (inspect_info.file_name) {
+		ret = get_file_stat(&inspect_info);
+		if (ret)
+			return ret;
+
+		return 0;
+	} else if (extract) {
+		ERR("no firmware for inspection specified");
+		return -1;
+	}
+
+	if (board_id == NULL && opt_hw_id == NULL) {
+		ERR("either board or hardware id must be specified");
+		return -1;
+	}
+
+	if (board_id) {
+		board = find_board(board_id);
+		if (board == NULL) {
+			ERR("unknown/unsupported board id \"%s\"", board_id);
+			return -1;
+		}
+		if (layout_id == NULL)
+			layout_id = board->layout_id;
+
+		hw_id = board->hw_id;
+		hw_rev = board->hw_rev;
+	} else {
+		if (layout_id == NULL) {
+			ERR("flash layout is not specified");
+			return -1;
+		}
+		hw_id = strtoul(opt_hw_id, NULL, 0);
+
+		if (opt_hw_rev)
+			hw_rev = strtoul(opt_hw_rev, NULL, 0);
+		else
+			hw_rev = 1;
+	}
+
+	layout = find_layout(layout_id);
+	if (layout == NULL) {
+		ERR("unknown flash layout \"%s\"", layout_id);
+		return -1;
+	}
+
+	if (!kernel_la)
+		kernel_la = layout->kernel_la;
+	if (!kernel_ep)
+		kernel_ep = layout->kernel_ep;
+	if (!rootfs_ofs)
+		rootfs_ofs = layout->rootfs_ofs;
+
+	if (kernel_info.file_name == NULL) {
+		ERR("no kernel image specified");
+		return -1;
+	}
+
+	ret = get_file_stat(&kernel_info);
+	if (ret)
+		return ret;
+
+	kernel_len = kernel_info.file_size;
+
+	if (combined) {
+		if (kernel_info.file_size >
+		    layout->fw_max_len - sizeof(struct fw_header)) {
+			ERR("kernel image is too big");
+			return -1;
+		}
+	} else {
+		if (rootfs_info.file_name == NULL) {
+			ERR("no rootfs image specified");
+			return -1;
+		}
+
+		ret = get_file_stat(&rootfs_info);
+		if (ret)
+			return ret;
+
+		if (rootfs_align) {
+			kernel_len += sizeof(struct fw_header);
+			kernel_len = ALIGN(kernel_len, rootfs_align);
+			kernel_len -= sizeof(struct fw_header);
+
+			DBG("kernel length aligned to %u", kernel_len);
+
+			if (kernel_len + rootfs_info.file_size >
+			    layout->fw_max_len - sizeof(struct fw_header)) {
+				ERR("images are too big");
+				return -1;
+			}
+		} else {
+			if (kernel_info.file_size >
+			    rootfs_ofs - sizeof(struct fw_header)) {
+				ERR("kernel image is too big");
+				return -1;
+			}
+
+			if (rootfs_info.file_size >
+			    (layout->fw_max_len - rootfs_ofs)) {
+				ERR("rootfs image is too big");
+				return -1;
+			}
+		}
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		return -1;
+	}
+
+	ret = sscanf(fw_ver, "%d.%d.%d", &fw_ver_hi, &fw_ver_mid, &fw_ver_lo);
+	if (ret != 3) {
+		ERR("invalid firmware version '%s'", fw_ver);
+		return -1;
+	}
+
+	ret = sscanf(sver, "%d.%d", &sver_hi, &sver_lo);
+	if (ret != 2) {
+		ERR("invalid secondary version '%s'", sver);
+		return -1;
+	}
+
+	return 0;
+}
+
+static void fill_header(char *buf, int len)
+{
+	struct fw_header *hdr = (struct fw_header *)buf;
+	unsigned ver_len;
+
+	memset(hdr, '\xff', sizeof(struct fw_header));
+
+	hdr->version = htonl(HEADER_VERSION_V2);
+	ver_len = strlen(version);
+	if (ver_len > (sizeof(hdr->fw_version) - 1))
+		ver_len = sizeof(hdr->fw_version) - 1;
+
+	memcpy(hdr->fw_version, version, ver_len);
+	hdr->fw_version[ver_len] = 0;
+
+	hdr->hw_id = htonl(hw_id);
+	hdr->hw_rev = htonl(hw_rev);
+
+	if (boot_info.file_size == 0) {
+		memcpy(hdr->md5sum1, md5salt_normal, sizeof(hdr->md5sum1));
+		hdr->boot_ofs = htonl(0);
+		hdr->boot_len = htonl(0);
+	} else {
+		memcpy(hdr->md5sum1, md5salt_boot, sizeof(hdr->md5sum1));
+		hdr->boot_ofs = htonl(rootfs_ofs + rootfs_info.file_size);
+		hdr->boot_len = htonl(rootfs_info.file_size);
+	}
+
+	hdr->kernel_la = htonl(kernel_la);
+	hdr->kernel_ep = htonl(kernel_ep);
+	hdr->fw_length = htonl(layout->fw_max_len);
+	hdr->kernel_ofs = htonl(sizeof(struct fw_header));
+	hdr->kernel_len = htonl(kernel_len);
+	if (!combined) {
+		hdr->rootfs_ofs = htonl(rootfs_ofs);
+		hdr->rootfs_len = htonl(rootfs_info.file_size);
+	}
+
+	hdr->boot_ofs = htonl(0);
+	hdr->boot_len = htonl(boot_info.file_size);
+
+	hdr->unk1 = htonl(0);
+	hdr->unk2 = htonl(0);
+	hdr->unk3 = htonl(0xffffffff);
+	hdr->unk4 = htons(0x55aa);
+	hdr->unk5 = 0xa5;
+
+	hdr->sver_hi = sver_hi;
+	hdr->sver_lo = sver_lo;
+
+	hdr->ver_hi = fw_ver_hi;
+	hdr->ver_mid = fw_ver_mid;
+	hdr->ver_lo = fw_ver_lo;
+
+	get_md5(buf, len, hdr->md5sum1);
+}
+
+static int pad_jffs2(char *buf, int currlen)
+{
+	int len;
+	uint32_t pad_mask;
+
+	len = currlen;
+	pad_mask = (64 * 1024);
+	while ((len < layout->fw_max_len) && (pad_mask != 0)) {
+		uint32_t mask;
+		int i;
+
+		for (i = 10; i < 32; i++) {
+			mask = 1 << i;
+			if (pad_mask & mask)
+				break;
+		}
+
+		len = ALIGN(len, mask);
+
+		for (i = 10; i < 32; i++) {
+			mask = 1 << i;
+			if ((len & (mask - 1)) == 0)
+				pad_mask &= ~mask;
+		}
+
+		for (i = 0; i < sizeof(jffs2_eof_mark); i++)
+			buf[len + i] = jffs2_eof_mark[i];
+
+		len += sizeof(jffs2_eof_mark);
+	}
+
+	return len;
+}
+
+static int write_fw(char *data, int len)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(ofname, "w");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	errno = 0;
+	fwrite(data, len, 1, f);
+	if (errno) {
+		ERRS("unable to write output file");
+		goto out_flush;
+	}
+
+	DBG("firmware file \"%s\" completed", ofname);
+
+	ret = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(f);
+	fclose(f);
+	if (ret != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+ out:
+	return ret;
+}
+
+static int build_fw(void)
+{
+	int buflen;
+	char *buf;
+	char *p;
+	int ret = EXIT_FAILURE;
+	int writelen = 0;
+
+	buflen = layout->fw_max_len;
+
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto out;
+	}
+
+	memset(buf, 0xff, buflen);
+	p = buf + sizeof(struct fw_header);
+	ret = read_to_buf(&kernel_info, p);
+	if (ret)
+		goto out_free_buf;
+
+	writelen = sizeof(struct fw_header) + kernel_len;
+
+	if (!combined) {
+		if (rootfs_align)
+			p = buf + writelen;
+		else
+			p = buf + rootfs_ofs;
+
+		ret = read_to_buf(&rootfs_info, p);
+		if (ret)
+			goto out_free_buf;
+
+		if (rootfs_align)
+			writelen += rootfs_info.file_size;
+		else
+			writelen = rootfs_ofs + rootfs_info.file_size;
+
+		if (add_jffs2_eof)
+			writelen = pad_jffs2(buf, writelen);
+	}
+
+	if (!strip_padding)
+		writelen = buflen;
+
+	fill_header(buf, writelen);
+	ret = write_fw(buf, writelen);
+	if (ret)
+		goto out_free_buf;
+
+	ret = EXIT_SUCCESS;
+
+ out_free_buf:
+	free(buf);
+ out:
+	return ret;
+}
+
+/* Helper functions to inspect_fw() representing different output formats */
+static inline void inspect_fw_pstr(char *label, char *str)
+{
+	printf("%-23s: %s\n", label, str);
+}
+
+static inline void inspect_fw_phex(char *label, uint32_t val)
+{
+	printf("%-23s: 0x%08x\n", label, val);
+}
+
+static inline void inspect_fw_phexpost(char *label,
+                                       uint32_t val, char *post)
+{
+	printf("%-23s: 0x%08x (%s)\n", label, val, post);
+}
+
+static inline void inspect_fw_phexdef(char *label,
+                                      uint32_t val, uint32_t defval)
+{
+	printf("%-23s: 0x%08x                  ", label, val);
+
+	if (val == defval)
+		printf("(== OpenWrt default)\n");
+	else
+		printf("(OpenWrt default: 0x%08x)\n", defval);
+}
+
+static inline void inspect_fw_phexexp(char *label,
+                                      uint32_t val, uint32_t expval)
+{
+	printf("%-23s: 0x%08x ", label, val);
+
+	if (val == expval)
+		printf("(ok)\n");
+	else
+		printf("(expected: 0x%08x)\n", expval);
+}
+
+static inline void inspect_fw_phexdec(char *label, uint32_t val)
+{
+	printf("%-23s: 0x%08x / %8u bytes\n", label, val, val);
+}
+
+static inline void inspect_fw_phexdecdef(char *label,
+                                         uint32_t val, uint32_t defval)
+{
+	printf("%-23s: 0x%08x / %8u bytes ", label, val, val);
+
+	if (val == defval)
+		printf("(== OpenWrt default)\n");
+	else
+		printf("(OpenWrt default: 0x%08x)\n", defval);
+}
+
+static inline void inspect_fw_pmd5sum(char *label, uint8_t *val, char *text)
+{
+	int i;
+
+	printf("%-23s:", label);
+	for (i=0; i<MD5SUM_LEN; i++)
+		printf(" %02x", val[i]);
+	printf(" %s\n", text);
+}
+
+static int inspect_fw(void)
+{
+	char *buf;
+	struct fw_header *hdr;
+	uint8_t md5sum[MD5SUM_LEN];
+	struct board_info *board;
+	int ret = EXIT_FAILURE;
+
+	buf = malloc(inspect_info.file_size);
+	if (!buf) {
+		ERR("no memory for buffer!\n");
+		goto out;
+	}
+
+	ret = read_to_buf(&inspect_info, buf);
+	if (ret)
+		goto out_free_buf;
+	hdr = (struct fw_header *)buf;
+
+	inspect_fw_pstr("File name", inspect_info.file_name);
+	inspect_fw_phexdec("File size", inspect_info.file_size);
+
+	if (ntohl(hdr->version) != HEADER_VERSION_V2) {
+		ERR("file does not seem to have V2 header!\n");
+		goto out_free_buf;
+	}
+
+	inspect_fw_phexdec("Version 2 Header size", sizeof(struct fw_header));
+
+	if (ntohl(hdr->unk1) != 0)
+		inspect_fw_phexdec("Unknown value 1", hdr->unk1);
+
+	memcpy(md5sum, hdr->md5sum1, sizeof(md5sum));
+	if (ntohl(hdr->boot_len) == 0)
+		memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum));
+	else
+		memcpy(hdr->md5sum1, md5salt_boot, sizeof(md5sum));
+	get_md5(buf, inspect_info.file_size, hdr->md5sum1);
+
+	if (memcmp(md5sum, hdr->md5sum1, sizeof(md5sum))) {
+		inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(*ERROR*)");
+		inspect_fw_pmd5sum("          --> expected", hdr->md5sum1, "");
+	} else {
+		inspect_fw_pmd5sum("Header MD5Sum1", md5sum, "(ok)");
+	}
+	if (ntohl(hdr->unk2) != 0)
+		inspect_fw_phexdec("Unknown value 2", hdr->unk2);
+	inspect_fw_pmd5sum("Header MD5Sum2", hdr->md5sum2,
+	                   "(purpose yet unknown, unchecked here)");
+
+	if (ntohl(hdr->unk3) != 0xffffffff)
+		inspect_fw_phexdec("Unknown value 3", hdr->unk3);
+
+	if (ntohs(hdr->unk4) != 0x55aa)
+		inspect_fw_phexdec("Unknown value 4", hdr->unk4);
+
+	if (hdr->unk5 != 0xa5)
+		inspect_fw_phexdec("Unknown value 5", hdr->unk5);
+
+	printf("\n");
+
+	inspect_fw_pstr("Firmware version", hdr->fw_version);
+
+	board = find_board_by_hwid(ntohl(hdr->hw_id));
+	if (board) {
+		layout = find_layout(board->layout_id);
+		inspect_fw_phexpost("Hardware ID",
+		                    ntohl(hdr->hw_id), board->id);
+		inspect_fw_phexexp("Hardware Revision",
+		                   ntohl(hdr->hw_rev), board->hw_rev);
+	} else {
+		inspect_fw_phexpost("Hardware ID",
+		                    ntohl(hdr->hw_id), "unknown");
+		inspect_fw_phex("Hardware Revision",
+		                ntohl(hdr->hw_rev));
+	}
+
+	printf("%-23s: %d.%d.%d-%d.%d\n", "Software version",
+	       hdr->ver_hi, hdr->ver_mid, hdr->ver_lo,
+	       hdr->sver_hi, hdr->sver_lo);
+
+	printf("\n");
+
+	inspect_fw_phexdec("Kernel data offset",
+	                   ntohl(hdr->kernel_ofs));
+	inspect_fw_phexdec("Kernel data length",
+	                   ntohl(hdr->kernel_len));
+	if (board) {
+		inspect_fw_phexdef("Kernel load address",
+		                   ntohl(hdr->kernel_la),
+		                   layout ? layout->kernel_la : 0xffffffff);
+		inspect_fw_phexdef("Kernel entry point",
+		                   ntohl(hdr->kernel_ep),
+		                   layout ? layout->kernel_ep : 0xffffffff);
+		inspect_fw_phexdecdef("Rootfs data offset",
+		                      ntohl(hdr->rootfs_ofs),
+		                      layout ? layout->rootfs_ofs : 0xffffffff);
+	} else {
+		inspect_fw_phex("Kernel load address",
+		                ntohl(hdr->kernel_la));
+		inspect_fw_phex("Kernel entry point",
+		                ntohl(hdr->kernel_ep));
+		inspect_fw_phexdec("Rootfs data offset",
+		                   ntohl(hdr->rootfs_ofs));
+	}
+	inspect_fw_phexdec("Rootfs data length",
+	                   ntohl(hdr->rootfs_len));
+	inspect_fw_phexdec("Boot loader data offset",
+	                   ntohl(hdr->boot_ofs));
+	inspect_fw_phexdec("Boot loader data length",
+	                   ntohl(hdr->boot_len));
+	inspect_fw_phexdec("Total firmware length",
+	                   ntohl(hdr->fw_length));
+
+	if (extract) {
+		FILE *fp;
+		char *filename;
+
+		printf("\n");
+
+		filename = malloc(strlen(inspect_info.file_name) + 8);
+		sprintf(filename, "%s-kernel", inspect_info.file_name);
+		printf("Extracting kernel to \"%s\"...\n", filename);
+		fp = fopen(filename, "w");
+		if (fp)	{
+			if (!fwrite(buf + ntohl(hdr->kernel_ofs),
+			            ntohl(hdr->kernel_len), 1, fp)) {
+				ERR("error in fwrite(): %s", strerror(errno));
+			}
+			fclose(fp);
+		} else {
+			ERR("error in fopen(): %s", strerror(errno));
+		}
+		free(filename);
+
+		filename = malloc(strlen(inspect_info.file_name) + 8);
+		sprintf(filename, "%s-rootfs", inspect_info.file_name);
+		printf("Extracting rootfs to \"%s\"...\n", filename);
+		fp = fopen(filename, "w");
+		if (fp)	{
+			if (!fwrite(buf + ntohl(hdr->rootfs_ofs),
+			            ntohl(hdr->rootfs_len), 1, fp)) {
+				ERR("error in fwrite(): %s", strerror(errno));
+			}
+			fclose(fp);
+		} else {
+			ERR("error in fopen(): %s", strerror(errno));
+		}
+		free(filename);
+	}
+
+ out_free_buf:
+	free(buf);
+ out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int ret = EXIT_FAILURE;
+	int err;
+
+	FILE *outfile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "a:B:H:E:F:L:V:N:W:ci:k:r:R:o:xhsjv:y:");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'a':
+			sscanf(optarg, "0x%x", &rootfs_align);
+			break;
+		case 'B':
+			board_id = optarg;
+			break;
+		case 'H':
+			opt_hw_id = optarg;
+			break;
+		case 'E':
+			sscanf(optarg, "0x%x", &kernel_ep);
+			break;
+		case 'F':
+			layout_id = optarg;
+			break;
+		case 'W':
+			opt_hw_rev = optarg;
+			break;
+		case 'L':
+			sscanf(optarg, "0x%x", &kernel_la);
+			break;
+		case 'V':
+			version = optarg;
+			break;
+		case 'v':
+			fw_ver = optarg;
+			break;
+		case 'y':
+			sver = optarg;
+			break;
+		case 'N':
+			vendor = optarg;
+			break;
+		case 'c':
+			combined++;
+			break;
+		case 'k':
+			kernel_info.file_name = optarg;
+			break;
+		case 'r':
+			rootfs_info.file_name = optarg;
+			break;
+		case 'R':
+			sscanf(optarg, "0x%x", &rootfs_ofs);
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 's':
+			strip_padding = 1;
+			break;
+		case 'i':
+			inspect_info.file_name = optarg;
+			break;
+		case 'j':
+			add_jffs2_eof = 1;
+			break;
+		case 'x':
+			extract = 1;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	ret = check_options();
+	if (ret)
+		goto out;
+
+	if (!inspect_info.file_name)
+		ret = build_fw();
+	else
+		ret = inspect_fw();
+
+ out:
+	return ret;
+}
+
diff --git a/trunk/tools/firmware-utils/src/mkwrgimg.c b/trunk/tools/firmware-utils/src/mkwrgimg.c
new file mode 100644
index 00000000..3915d146
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkwrgimg.c
@@ -0,0 +1,240 @@
+/*
+ *  Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <getopt.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "md5.h"
+
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt ", %s\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define WRG_MAGIC	0x20040220
+
+struct wrg_header {
+	char		signature[32];
+	uint32_t	magic1;
+	uint32_t	magic2;
+	uint32_t	size;
+	uint32_t	offset;
+	char		devname[32];
+	char		digest[16];
+} __attribute__ ((packed));
+
+static char *progname;
+static char *ifname;
+static char *ofname;
+static char *signature;
+static char *dev_name;
+static uint32_t offset;
+static int big_endian;
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -b              create image in big endian format\n"
+"  -i <file>       read input from the file <file>\n"
+"  -d <name>       set device name to <name>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -O <offset>     set offset to <offset>\n"
+"  -s <sig>        set image signature to <sig>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static void put_u32(void *data, uint32_t val)
+{
+	unsigned char *p = data;
+
+	if (big_endian) {
+		p[0] = (val >> 24) & 0xff;
+		p[1] = (val >> 16) & 0xff;
+		p[2] = (val >> 8) & 0xff;
+		p[3] = val & 0xff;
+	} else {
+		p[3] = (val >> 24) & 0xff;
+		p[2] = (val >> 16) & 0xff;
+		p[1] = (val >> 8) & 0xff;
+		p[0] = val & 0xff;
+	}
+}
+
+static void get_digest(struct wrg_header *header, char *data, int size)
+{
+	MD5_CTX ctx;
+
+	MD5_Init(&ctx);
+
+	MD5_Update(&ctx, (char *)&header->offset, sizeof(header->offset));
+	MD5_Update(&ctx, (char *)&header->devname, sizeof(header->devname));
+	MD5_Update(&ctx, data, size);
+
+	MD5_Final(header->digest, &ctx);
+}
+
+int main(int argc, char *argv[])
+{
+	struct wrg_header *header;
+	char *buf;
+	struct stat st;
+	int buflen;
+	int err;
+	int res = EXIT_FAILURE;
+
+	FILE *outfile, *infile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "bd:i:o:s:O:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'b':
+			big_endian = 1;
+			break;
+		case 'd':
+			dev_name = optarg;
+			break;
+		case 'i':
+			ifname = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 's':
+			signature = optarg;
+			break;
+		case 'O':
+			offset = strtoul(optarg, NULL, 0);
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	if (signature == NULL) {
+		ERR("no signature specified");
+		goto err;
+	}
+
+	if (ifname == NULL) {
+		ERR("no input file specified");
+		goto err;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto err;
+	}
+
+	if (dev_name == NULL) {
+		ERR("no device name specified");
+		goto err;
+	}
+
+	err = stat(ifname, &st);
+	if (err){
+		ERRS("stat failed on %s", ifname);
+		goto err;
+	}
+
+	buflen = st.st_size + sizeof(struct wrg_header);
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto err;
+	}
+
+	infile = fopen(ifname, "r");
+	if (infile == NULL) {
+		ERRS("could not open \"%s\" for reading", ifname);
+		goto err_free;
+	}
+
+	errno = 0;
+	fread(buf + sizeof(struct wrg_header), st.st_size, 1, infile);
+	if (errno != 0) {
+		ERRS("unable to read from file %s", ifname);
+		goto close_in;
+	}
+
+	header = (struct wrg_header *) buf;
+	memset(header, '\0', sizeof(struct wrg_header));
+
+	strncpy(header->signature, signature, sizeof(header->signature));
+	strncpy(header->devname, dev_name, sizeof(header->signature));
+	put_u32(&header->magic1, WRG_MAGIC);
+	put_u32(&header->magic2, WRG_MAGIC);
+	put_u32(&header->size, st.st_size);
+	put_u32(&header->offset, offset);
+
+	get_digest(header, buf + sizeof(struct wrg_header), st.st_size);
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto close_in;
+	}
+
+	errno = 0;
+	fwrite(buf, buflen, 1, outfile);
+	if (errno) {
+		ERRS("unable to write to file %s", ofname);
+		goto close_out;
+	}
+
+	fflush(outfile);
+
+	res = EXIT_SUCCESS;
+
+close_out:
+	fclose(outfile);
+	if (res != EXIT_SUCCESS)
+		unlink(ofname);
+close_in:
+	fclose(infile);
+err_free:
+	free(buf);
+err:
+	return res;
+}
diff --git a/trunk/tools/firmware-utils/src/mkzcfw.c b/trunk/tools/firmware-utils/src/mkzcfw.c
new file mode 100644
index 00000000..7674e706
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkzcfw.c
@@ -0,0 +1,408 @@
+/*
+ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "cyg_crc.h"
+
+#if (__BYTE_ORDER == __BIG_ENDIAN)
+#  define HOST_TO_BE32(x)	(x)
+#  define BE32_TO_HOST(x)	(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#  define LE32_TO_HOST(x)	bswap_32(x)
+#else
+#  define HOST_TO_BE32(x)	bswap_32(x)
+#  define BE32_TO_HOST(x)	bswap_32(x)
+#  define HOST_TO_LE32(x)	(x)
+#  define LE32_TO_HOST(x)	(x)
+#endif
+
+#define MAGIC_FIRMWARE	0x6d726966	/* 'firm' */
+#define MAGIC_KERNEL	0x676d694b	/* 'Kimg' */
+#define MAGIC_ROOTFS	0x676d6952	/* 'Rimg' */
+
+struct file_info {
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+};
+
+struct fw_header {
+	uint32_t	magic;
+	uint32_t	length;
+	uint32_t	unk1;
+	uint32_t	unk2;
+} __attribute__ ((packed));
+
+struct fw_tail {
+	uint32_t	hw_id;
+	uint32_t	crc;
+} __attribute__ ((packed));
+
+struct board_info {
+	char		*id;
+	uint32_t	hw_id;
+	uint32_t	kernel_len;
+	uint32_t	rootfs_len;
+};
+
+/*
+ * Globals
+ */
+static char *ofname;
+static char *progname;
+
+static char *board_id;
+static struct board_info *board;
+static struct file_info kernel_info;
+static struct file_info rootfs_info;
+
+
+static struct board_info boards[] = {
+	{
+		.id		= "ZCN-1523H-2-8",
+		.hw_id		= 0x66661523,
+		.kernel_len	= 0x170000,
+		.rootfs_len	= 0x610000,
+	}, {
+		.id		= "ZCN-1523H-5-16",
+		.hw_id		= 0x6615235A,
+		.kernel_len	= 0x170000,
+		.rootfs_len	= 0x610000,
+	}, {
+		/* terminating entry */
+	}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define DBG(fmt, ...) do { \
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+static struct board_info *find_board(char *id)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->id != NULL; board++){
+		if (strcasecmp(id, board->id) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+static void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>\n"
+"  -k <file>       read kernel image from the file <file>\n"
+"  -r <file>       read rootfs image from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+static int get_file_stat(struct file_info *fdata)
+{
+	struct stat st;
+	int res;
+
+	if (fdata->file_name == NULL)
+		return 0;
+
+	res = stat(fdata->file_name, &st);
+	if (res){
+		ERRS("stat failed on %s", fdata->file_name);
+		return res;
+	}
+
+	fdata->file_size = st.st_size;
+	return 0;
+}
+
+static int read_to_buf(struct file_info *fdata, char *buf)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(fdata->file_name, "r");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for reading", fdata->file_name);
+		goto out;
+	}
+
+	errno = 0;
+	fread(buf, fdata->file_size, 1, f);
+	if (errno != 0) {
+		ERRS("unable to read from file \"%s\"", fdata->file_name);
+		goto out_close;
+	}
+
+	ret = EXIT_SUCCESS;
+
+ out_close:
+	fclose(f);
+ out:
+	return ret;
+}
+
+static int check_options(void)
+{
+	int ret;
+
+	if (board_id == NULL) {
+		ERR("no board specified");
+		return -1;
+	}
+
+	board = find_board(board_id);
+	if (board == NULL) {
+		ERR("unknown/unsupported board id \"%s\"", board_id);
+		return -1;
+	}
+
+	if (kernel_info.file_name == NULL) {
+		ERR("no kernel image specified");
+		return -1;
+	}
+
+	ret = get_file_stat(&kernel_info);
+	if (ret)
+		return ret;
+
+	if (kernel_info.file_size > board->kernel_len) {
+		ERR("kernel image is too big");
+		return -1;
+	}
+
+	if (rootfs_info.file_name == NULL) {
+		ERR("no rootfs image specified");
+		return -1;
+	}
+
+	ret = get_file_stat(&rootfs_info);
+	if (ret)
+		return ret;
+
+	if (rootfs_info.file_size > board->rootfs_len) {
+		ERR("rootfs image is too big");
+		return -1;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		return -1;
+	}
+
+	return 0;
+}
+
+static int write_fw(char *data, int len)
+{
+	FILE *f;
+	int ret = EXIT_FAILURE;
+
+	f = fopen(ofname, "w");
+	if (f == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	errno = 0;
+	fwrite(data, len, 1, f);
+	if (errno) {
+		ERRS("unable to write output file");
+		goto out_flush;
+	}
+
+	DBG("firmware file \"%s\" completed", ofname);
+
+	ret = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(f);
+	fclose(f);
+	if (ret != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+ out:
+	return ret;
+}
+
+static int build_fw(void)
+{
+	int buflen;
+	char *buf;
+	char *p;
+	int ret = EXIT_FAILURE;
+	int writelen = 0;
+	uint32_t crc;
+	struct fw_header *hdr;
+	struct fw_tail *tail;
+
+	buflen = 3 * sizeof(struct fw_header) +
+		 kernel_info.file_size + rootfs_info.file_size +
+		 3 * sizeof(struct fw_tail);
+
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto out;
+	}
+
+	p = buf;
+	memset(p, 0, buflen);
+
+	/* fill firmware header */
+	hdr = (struct fw_header *) p;
+	hdr->magic = HOST_TO_LE32(MAGIC_FIRMWARE);
+	hdr->length = HOST_TO_LE32(buflen - sizeof(struct fw_header));
+	p += sizeof(struct fw_header);
+
+	/* fill kernel block header */
+	hdr = (struct fw_header *) p;
+	hdr->magic = HOST_TO_LE32(MAGIC_KERNEL);
+	hdr->length = HOST_TO_LE32(kernel_info.file_size +
+				   sizeof(struct fw_tail));
+	p += sizeof(struct fw_header);
+
+	/* read kernel data */
+	ret = read_to_buf(&kernel_info, p);
+	if (ret)
+		goto out_free_buf;
+
+	/* fill firmware tail */
+	tail = (struct fw_tail *) (p + kernel_info.file_size);
+	tail->hw_id = HOST_TO_BE32(board->hw_id);
+	tail->crc = HOST_TO_BE32(cyg_crc32(p, kernel_info.file_size +
+				 	   sizeof(struct fw_tail) - 4));
+
+	p += kernel_info.file_size + sizeof(struct fw_tail);
+
+	/* fill rootfs block header */
+	hdr = (struct fw_header *) p;
+	hdr->magic = HOST_TO_LE32(MAGIC_ROOTFS);
+	hdr->length = HOST_TO_LE32(rootfs_info.file_size +
+				   sizeof(struct fw_tail));
+	p += sizeof(struct fw_header);
+
+	/* read rootfs data */
+	ret = read_to_buf(&rootfs_info, p);
+	if (ret)
+		goto out_free_buf;
+
+	/* fill firmware tail */
+	tail = (struct fw_tail *) (p + rootfs_info.file_size);
+	tail->hw_id = HOST_TO_BE32(board->hw_id);
+	tail->crc = HOST_TO_BE32(cyg_crc32(p, rootfs_info.file_size +
+				 	   sizeof(struct fw_tail) - 4));
+
+	p += rootfs_info.file_size + sizeof(struct fw_tail);
+
+	/* fill firmware tail */
+	tail = (struct fw_tail *) p;
+	tail->hw_id = HOST_TO_BE32(board->hw_id);
+	tail->crc = HOST_TO_BE32(cyg_crc32(buf + sizeof(struct fw_header),
+				 buflen - sizeof(struct fw_header) - 4));
+
+	ret = write_fw(buf, buflen);
+	if (ret)
+		goto out_free_buf;
+
+	ret = EXIT_SUCCESS;
+
+ out_free_buf:
+	free(buf);
+ out:
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int ret = EXIT_FAILURE;
+	int err;
+
+	FILE *outfile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "B:k:r:o:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'B':
+			board_id = optarg;
+			break;
+		case 'k':
+			kernel_info.file_name = optarg;
+			break;
+		case 'r':
+			rootfs_info.file_name = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	ret = check_options();
+	if (ret)
+		goto out;
+
+	ret = build_fw();
+
+ out:
+	return ret;
+}
+
diff --git a/trunk/tools/firmware-utils/src/mkzynfw.c b/trunk/tools/firmware-utils/src/mkzynfw.c
new file mode 100644
index 00000000..36c176f4
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/mkzynfw.c
@@ -0,0 +1,1130 @@
+/*
+ *
+ *  Copyright (C) 2007-2008 OpenWrt.org
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg at openwrt.org>
+ *
+ *  This code was based on the information of the ZyXEL's firmware
+ *  image format written by Kolja Waschk, can be found at:
+ *  http://www.ixo.de/info/zyxel_uclinux
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>	/* for unlink() */
+#include <libgen.h>
+#include <getopt.h>	/* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <endian.h>	/* for __BYTE_ORDER */
+#if defined(__CYGWIN__)
+#  include <byteswap.h>
+#endif
+
+#include "zynos.h"
+
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#  define HOST_TO_LE16(x)	(x)
+#  define HOST_TO_LE32(x)	(x)
+#  define LE16_TO_HOST(x)	(x)
+#  define LE32_TO_HOST(x)	(x)
+#  define HOST_TO_BE16(x)	bswap_16(x)
+#  define HOST_TO_BE32(x)	bswap_32(x)
+#  define BE16_TO_HOST(x)	bswap_16(x)
+#  define BE32_TO_HOST(x)	bswap_32(x)
+#else
+#  define HOST_TO_BE16(x)	(x)
+#  define HOST_TO_BE32(x)	(x)
+#  define BE16_TO_HOST(x)	(x)
+#  define BE32_TO_HOST(x)	(x)
+#  define HOST_TO_LE16(x)	bswap_16(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#  define LE16_TO_HOST(x)	bswap_16(x)
+#  define LE32_TO_HOST(x)	bswap_32(x)
+#endif
+
+#define ALIGN(x,y)	(((x)+((y)-1)) & ~((y)-1))
+
+#define MAX_NUM_BLOCKS	8
+#define MAX_ARG_COUNT	32
+#define MAX_ARG_LEN	1024
+#define FILE_BUF_LEN	(16*1024)
+
+
+struct csum_state{
+	int		odd;
+	uint32_t	sum;
+	uint32_t	tmp;
+};
+
+struct fw_block {
+	uint32_t	align;		/* alignment of this block */
+	char		*file_name;	/* name of the file */
+	uint32_t	file_size;	/* length of the file */
+	char		*mmap_name;	/* name in the MMAP table */
+	int		type;		/* block type */
+	uint32_t	padlen;
+	uint8_t		padc;
+};
+
+#define BLOCK_TYPE_BOOTEXT	0
+#define BLOCK_TYPE_RAW		1
+
+struct fw_mmap {
+	uint32_t	addr;
+	uint32_t	size;
+	uint32_t	user_addr;
+	uint32_t	user_size;
+};
+#define MMAP_DATA_SIZE	1024
+#define MMAP_ALIGN	16
+
+struct board_info {
+	char *name;		/* model name */
+	char *desc;		/* description */
+	uint16_t vendor;	/* vendor id */
+	uint16_t model;		/* model id */
+	uint32_t flash_base;	/* flash base address */
+	uint32_t flash_size;	/* board flash size */
+	uint32_t code_start;	/* code start address */
+	uint32_t romio_offs;	/* offset of the firmware within the flash */
+	uint32_t bootext_size;	/* maximum size of bootext block */
+};
+
+/*
+ * Globals
+ */
+char *progname;
+char *ofname = NULL;
+int verblevel = 0;
+
+struct board_info *board = NULL;
+
+struct fw_block blocks[MAX_NUM_BLOCKS];
+struct fw_block *bootext_block = NULL;
+int num_blocks = 0;
+
+#define ADM5120_FLASH_BASE	0xBFC00000
+#define ADM5120_CODE_START	0x80008000
+
+/* TODO: check values for AR7 */
+#define AR7_FLASH_BASE		0xB0000000
+#define AR7_CODE_START		0x94008000
+
+#define ATHEROS_FLASH_BASE	0xBFC00000
+#define ATHEROS_CODE_START	0x80e00000
+
+#define AR71XX_FLASH_BASE	0xBFC00000
+#define AR71XX_CODE_START	0x81E00000
+
+#define BOARD(n, d, v, m, fb, fs, cs, fo) {		\
+	.name = (n), .desc=(d),				\
+	.vendor = (v), .model = (m),			\
+	.flash_base = (fb), .flash_size = (fs)<<20,	\
+	.code_start = (cs), .romio_offs = (fo),		\
+	.bootext_size = BOOTEXT_DEF_SIZE		\
+	}
+
+#define ADMBOARD1(n, d, m, fs) BOARD(n, d, ZYNOS_VENDOR_ID_ZYXEL, m, \
+	ADM5120_FLASH_BASE, fs, ADM5120_CODE_START, 0x8000)
+
+#define ADMBOARD2(n, d, m, fs) BOARD(n, d, ZYNOS_VENDOR_ID_ZYXEL, m, \
+	ADM5120_FLASH_BASE, fs, ADM5120_CODE_START, 0x10000)
+
+#define AR7BOARD1(n, d, m, fs) BOARD(n, d, ZYNOS_VENDOR_ID_ZYXEL, m, \
+	AR7_FLASH_BASE, fs, AR7_CODE_START, 0x8000)
+
+#define ATHEROSBOARD1(n, d, m, fs) BOARD(n, d, ZYNOS_VENDOR_ID_ZYXEL, m, \
+	ATHEROS_FLASH_BASE, fs, ATHEROS_CODE_START, 0x30000)
+
+#define AR71XXBOARD1(n, d, m, fs) {		\
+	.name = (n), .desc=(d),				\
+	.vendor = (ZYNOS_VENDOR_ID_ZYXEL), .model = (m),			\
+	.flash_base = (AR71XX_FLASH_BASE), .flash_size = (fs)<<20,	\
+	.code_start = (AR71XX_CODE_START), .romio_offs = (0x40000),		\
+	.bootext_size = 0x30000		\
+	}
+
+
+static struct board_info boards[] = {
+	/*
+	 * Infineon/ADMtek ADM5120 based boards
+	 */
+	ADMBOARD2("ES-2024A",	"ZyXEL ES-2024A", ZYNOS_MODEL_ES_2024A, 4),
+	ADMBOARD2("ES-2024PWR",	"ZyXEL ES-2024PWR", ZYNOS_MODEL_ES_2024PWR, 4),
+	ADMBOARD2("ES-2108",	"ZyXEL ES-2108", ZYNOS_MODEL_ES_2108, 4),
+	ADMBOARD2("ES-2108-F",	"ZyXEL ES-2108-F", ZYNOS_MODEL_ES_2108_F, 4),
+	ADMBOARD2("ES-2108-G",	"ZyXEL ES-2108-G", ZYNOS_MODEL_ES_2108_G, 4),
+	ADMBOARD2("ES-2108-LC",	"ZyXEL ES-2108-LC", ZYNOS_MODEL_ES_2108_LC, 4),
+	ADMBOARD2("ES-2108PWR",	"ZyXEL ES-2108PWR", ZYNOS_MODEL_ES_2108PWR, 4),
+	ADMBOARD1("HS-100",	"ZyXEL HomeSafe 100", ZYNOS_MODEL_HS_100, 2),
+	ADMBOARD1("HS-100W",	"ZyXEL HomeSafe 100W", ZYNOS_MODEL_HS_100W, 2),
+	ADMBOARD1("P-334",	"ZyXEL Prestige 334", ZYNOS_MODEL_P_334, 2),
+	ADMBOARD1("P-334U",	"ZyXEL Prestige 334U", ZYNOS_MODEL_P_334U, 4),
+	ADMBOARD1("P-334W",	"ZyXEL Prestige 334W", ZYNOS_MODEL_P_334W, 2),
+	ADMBOARD1("P-334WH",	"ZyXEL Prestige 334WH", ZYNOS_MODEL_P_334WH, 4),
+	ADMBOARD1("P-334WHD",	"ZyXEL Prestige 334WHD", ZYNOS_MODEL_P_334WHD, 4),
+	ADMBOARD1("P-334WT",	"ZyXEL Prestige 334WT", ZYNOS_MODEL_P_334WT, 4),
+	ADMBOARD1("P-335",	"ZyXEL Prestige 335", ZYNOS_MODEL_P_335, 4),
+	ADMBOARD1("P-335Plus",	"ZyXEL Prestige 335Plus", ZYNOS_MODEL_P_335PLUS, 4),
+	ADMBOARD1("P-335U",	"ZyXEL Prestige 335U", ZYNOS_MODEL_P_335U, 4),
+	ADMBOARD1("P-335WT",	"ZyXEL Prestige 335WT", ZYNOS_MODEL_P_335WT, 4),
+
+	{
+		.name		= "P-2602HW-D1A",
+		.desc		= "ZyXEL P-2602HW-D1A",
+		.vendor		= ZYNOS_VENDOR_ID_ZYXEL,
+		.model		= ZYNOS_MODEL_P_2602HW_D1A,
+		.flash_base	= AR7_FLASH_BASE,
+		.flash_size	= 4*1024*1024,
+		.code_start	= 0x94008000,
+		.romio_offs	= 0x20000,
+		.bootext_size	= BOOTEXT_DEF_SIZE,
+	},
+
+#if 0
+	/*
+	 * Texas Instruments AR7 based boards
+	 */
+	AR7BOARD1("P-660H-61",  "ZyXEL P-660H-61", ZYNOS_MODEL_P_660H_61, 2),
+	AR7BOARD1("P-660H-63",  "ZyXEL P-660H-63", ZYNOS_MODEL_P_660H_63, 2),
+	AR7BOARD1("P-660H-D1",  "ZyXEL P-660H-D1", ZYNOS_MODEL_P_660H_D1, 2),
+	AR7BOARD1("P-660H-D3",  "ZyXEL P-660H-D3", ZYNOS_MODEL_P_660H_D3, 2),
+	AR7BOARD1("P-660HW-61", "ZyXEL P-660HW-61", ZYNOS_MODEL_P_660HW_61, 2),
+	AR7BOARD1("P-660HW-63", "ZyXEL P-660HW-63", ZYNOS_MODEL_P_660HW_63, 2),
+	AR7BOARD1("P-660HW-67", "ZyXEL P-660HW-67", ZYNOS_MODEL_P_660HW_67, 2),
+	AR7BOARD1("P-660HW-D1", "ZyXEL P-660HW-D1", ZYNOS_MODEL_P_660HW_D1, 2),
+	AR7BOARD1("P-660HW-D3", "ZyXEL P-660HW-D3", ZYNOS_MODEL_P_660HW_D3, 2),
+	AR7BOARD1("P-660R-61",  "ZyXEL P-660R-61", ZYNOS_MODEL_P_660R_61, 2),
+	AR7BOARD1("P-660R-61C", "ZyXEL P-660R-61C", ZYNOS_MODEL_P_660R_61C, 2),
+	AR7BOARD1("P-660R-63",  "ZyXEL P-660R-63", ZYNOS_MODEL_P_660R_63, 2),
+	AR7BOARD1("P-660R-63C", "ZyXEL P-660R-63C", ZYNOS_MODEL_P_660R_63C, 2),
+	AR7BOARD1("P-660R-67",  "ZyXEL P-660R-67", ZYNOS_MODEL_P_660R_67, 2),
+	AR7BOARD1("P-660R-D1",  "ZyXEL P-660R-D1", ZYNOS_MODEL_P_660R_D1, 2),
+	AR7BOARD1("P-660R-D3",  "ZyXEL P-660R-D3", ZYNOS_MODEL_P_660R_D3, 2),
+#endif
+	{
+		.name		= "O2SURF",
+		.desc		= "O2 DSL Surf & Phone",
+		.vendor		= ZYNOS_VENDOR_ID_O2,
+		.model		= ZYNOS_MODEL_O2SURF,
+		.flash_base	= AR7_FLASH_BASE,
+		.flash_size	= 8*1024*1024,
+		.code_start	= 0x94014000,
+		.romio_offs	= 0x40000,
+		.bootext_size	= BOOTEXT_DEF_SIZE,
+	},
+
+	/*
+:x
+	 */
+	ATHEROSBOARD1("NBG-318S", "ZyXEL NBG-318S", ZYNOS_MODEL_NBG_318S, 4),
+
+	/*
+	 * Atheros ar71xx based boards
+	 */
+	AR71XXBOARD1("NBG-460N", "ZyXEL NBG-460N", ZYNOS_MODEL_NBG_460N, 4),
+
+	{.name = NULL}
+};
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt ", %s\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define WARN(fmt, ...) do { \
+	fprintf(stderr, "[%s] *** warning: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define DBG(lev, fmt, ...) do { \
+	if (verblevel < lev) \
+		break;\
+	fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERR_FATAL		-1
+#define ERR_INVALID_IMAGE	-2
+
+/*
+ * Helper routines
+ */
+void
+usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -B <board>      create image for the board specified with <board>.\n"
+"                  valid <board> values:\n"
+	);
+	for (board = boards; board->name != NULL; board++){
+		fprintf(stream,
+"                    %-12s= %s\n",
+		 board->name, board->desc);
+	};
+	fprintf(stream,
+"  -b <file>[:<align>]\n"
+"                  add boot extension block to the image\n"
+"  -r <file>[:<align>]\n"
+"                  add raw block to the image\n"
+"  -o <file>       write output to the file <file>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+
+/*
+ * argument parsing
+ */
+int
+str2u32(char *arg, uint32_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err)) {
+		return -1;
+	}
+
+	*val = t;
+	return 0;
+}
+
+
+int
+str2u16(char *arg, uint16_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x10000)) {
+		return -1;
+	}
+
+	*val = t & 0xFFFF;
+	return 0;
+}
+
+int
+str2u8(char *arg, uint8_t *val)
+{
+	char *err = NULL;
+	uint32_t t;
+
+	errno=0;
+	t = strtoul(arg, &err, 0);
+	if (errno || (err==arg) || ((err != NULL) && *err) || (t >= 0x100)) {
+		return -1;
+	}
+
+	*val = t & 0xFF;
+	return 0;
+}
+
+int
+str2sig(char *arg, uint32_t *sig)
+{
+	if (strlen(arg) != 4)
+		return -1;
+
+	*sig = arg[0] | (arg[1] << 8) | (arg[2] << 16) | (arg[3] << 24);
+
+	return 0;
+}
+
+
+int
+parse_arg(char *arg, char *buf, char *argv[])
+{
+	int res = 0;
+	size_t argl;
+	char *tok;
+	char **ap = &buf;
+	int i;
+
+	memset(argv, 0, MAX_ARG_COUNT * sizeof(void *));
+
+	if ((arg == NULL)) {
+		/* no arguments */
+		return 0;
+	}
+
+	argl = strlen(arg);
+	if (argl == 0) {
+		/* no arguments */
+		return 0;
+	}
+
+	if (argl >= MAX_ARG_LEN) {
+		/* argument is too long */
+		argl = MAX_ARG_LEN-1;
+	}
+
+	memcpy(buf, arg, argl);
+	buf[argl] = '\0';
+
+	for (i = 0; i < MAX_ARG_COUNT; i++) {
+		tok = strsep(ap, ":");
+		if (tok == NULL) {
+			break;
+		}
+#if 0
+		else if (tok[0] == '\0') {
+			break;
+		}
+#endif
+		argv[i] = tok;
+		res++;
+	}
+
+	return res;
+}
+
+
+int
+required_arg(char c, char *arg)
+{
+	if (arg == NULL || *arg != '-')
+		return 0;
+
+	ERR("option -%c requires an argument\n", c);
+	return -1;
+}
+
+
+int
+is_empty_arg(char *arg)
+{
+	int ret = 1;
+	if (arg != NULL) {
+		if (*arg) ret = 0;
+	};
+	return ret;
+}
+
+
+void
+csum_init(struct csum_state *css)
+{
+	css->odd = 0;
+	css->sum = 0;
+	css->tmp = 0;
+}
+
+
+void
+csum_update(uint8_t *p, uint32_t len, struct csum_state *css)
+{
+	if (len == 0)
+		return;
+
+	if (css->odd) {
+		css->sum += (css->tmp << 8) + p[0];
+		if (css->sum > 0xFFFF) {
+			css->sum += 1;
+			css->sum &= 0xFFFF;
+		}
+		css->odd = 0;
+		len--;
+		p++;
+	}
+
+	for ( ; len > 1; len -= 2, p +=2 ) {
+		css->sum  += (p[0] << 8) + p[1];
+		if (css->sum > 0xFFFF) {
+			css->sum += 1;
+			css->sum &= 0xFFFF;
+		}
+	}
+
+	if (len == 1){
+		css->tmp = p[0];
+		css->odd = 1;
+	}
+}
+
+
+uint16_t
+csum_get(struct csum_state *css)
+{
+	char pad = 0;
+
+	csum_update(&pad, 1, css);
+	return css->sum;
+}
+
+uint16_t
+csum_buf(uint8_t *p, uint32_t len)
+{
+	struct csum_state css;
+
+	csum_init(&css);
+	csum_update(p, len, &css);
+	return csum_get(&css);
+
+}
+
+/*
+ * routines to write data to the output file
+ */
+int
+write_out_data(FILE *outfile, uint8_t *data, size_t len,
+		struct csum_state *css)
+{
+	errno = 0;
+
+	fwrite(data, len, 1, outfile);
+	if (errno) {
+		ERR("unable to write output file");
+		return -1;
+	}
+
+	if (css) {
+		csum_update(data, len, css);
+	}
+
+	return 0;
+}
+
+
+int
+write_out_padding(FILE *outfile, size_t len, uint8_t padc,
+		 struct csum_state *css)
+{
+	uint8_t buf[512];
+	size_t buflen = sizeof(buf);
+
+	memset(buf, padc, buflen);
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		if (write_out_data(outfile, buf, buflen, css))
+			return -1;
+
+		len -= buflen;
+	}
+
+	return 0;
+}
+
+
+int
+write_out_data_align(FILE *outfile, uint8_t *data, size_t len, size_t align,
+		struct csum_state *css)
+{
+	size_t padlen;
+	int res;
+
+	res = write_out_data(outfile, data, len, css);
+	if (res)
+		return res;
+
+	padlen = ALIGN(len,align) - len;
+	res = write_out_padding(outfile, padlen, 0xFF, css);
+
+	return res;
+}
+
+
+int
+write_out_header(FILE *outfile, struct zyn_rombin_hdr *hdr)
+{
+	struct zyn_rombin_hdr t;
+
+	errno = 0;
+	if (fseek(outfile, 0, SEEK_SET) != 0) {
+		ERRS("fseek failed on output file");
+		return -1;
+	}
+
+	/* setup temporary header fields */
+	memset(&t, 0, sizeof(t));
+	t.addr = HOST_TO_BE32(hdr->addr);
+	memcpy(&t.sig, ROMBIN_SIGNATURE, ROMBIN_SIG_LEN);
+	t.type = hdr->type;
+	t.flags = hdr->flags;
+	t.osize = HOST_TO_BE32(hdr->osize);
+	t.csize = HOST_TO_BE32(hdr->csize);
+	t.ocsum = HOST_TO_BE16(hdr->ocsum);
+	t.ccsum = HOST_TO_BE16(hdr->ccsum);
+	t.mmap_addr = HOST_TO_BE32(hdr->mmap_addr);
+
+	DBG(2, "hdr.addr      = 0x%08x", hdr->addr);
+	DBG(2, "hdr.type      = 0x%02x", hdr->type);
+	DBG(2, "hdr.osize     = 0x%08x", hdr->osize);
+	DBG(2, "hdr.csize     = 0x%08x", hdr->csize);
+	DBG(2, "hdr.flags     = 0x%02x", hdr->flags);
+	DBG(2, "hdr.ocsum     = 0x%04x", hdr->ocsum);
+	DBG(2, "hdr.ccsum     = 0x%04x", hdr->ccsum);
+	DBG(2, "hdr.mmap_addr = 0x%08x", hdr->mmap_addr);
+
+	return write_out_data(outfile, (uint8_t *)&t, sizeof(t), NULL);
+}
+
+
+int
+write_out_mmap(FILE *outfile, struct fw_mmap *mmap, struct csum_state *css)
+{
+	struct zyn_mmt_hdr *mh;
+	uint8_t buf[MMAP_DATA_SIZE];
+	uint32_t user_size;
+	char *data;
+	int res;
+
+	memset(buf, 0, sizeof(buf));
+
+	mh = (struct zyn_mmt_hdr *)buf;
+
+	/* TODO: needs to recreate the memory map too? */
+	mh->count=0;
+
+	/* Build user data section */
+	data = buf+sizeof(*mh);
+	data += sprintf(data, "Vendor 1 %d", board->vendor);
+	*data++ = '\0';
+	data += sprintf(data, "Model 1 %d", BE16_TO_HOST(board->model));
+	*data++ = '\0';
+	/* TODO: make hardware version configurable? */
+	data += sprintf(data, "HwVerRange 2 %d %d", 0, 0);
+	*data++ = '\0';
+
+	user_size = (uint8_t *)data - buf;
+	mh->user_start= HOST_TO_BE32(mmap->addr+sizeof(*mh));
+	mh->user_end= HOST_TO_BE32(mmap->addr+user_size);
+	mh->csum = HOST_TO_BE16(csum_buf(buf+sizeof(*mh), user_size));
+
+	res = write_out_data(outfile, buf, sizeof(buf), css);
+
+	return res;
+}
+
+
+int
+block_stat_file(struct fw_block *block)
+{
+	struct stat st;
+	int res;
+
+	if (block->file_name == NULL)
+		return 0;
+
+	res = stat(block->file_name, &st);
+	if (res){
+		ERRS("stat failed on %s", block->file_name);
+		return res;
+	}
+
+	block->file_size = st.st_size;
+	return 0;
+}
+
+
+int
+read_magic(uint16_t *magic)
+{
+	FILE *f;
+	int res;
+
+	errno = 0;
+	f = fopen(bootext_block->file_name,"r");
+	if (errno) {
+		ERRS("unable to open file: %s", bootext_block->file_name);
+		return -1;
+	}
+
+	errno = 0;
+	fread(magic, 2, 1, f);
+	if (errno != 0) {
+		ERRS("unable to read from file: %s", bootext_block->file_name);
+		res = -1;
+		goto err;
+	}
+
+	res = 0;
+
+err:
+	fclose(f);
+	return res;
+}
+
+
+int
+write_out_file(FILE *outfile, char *name, size_t len, struct csum_state *css)
+{
+	char buf[FILE_BUF_LEN];
+	size_t buflen = sizeof(buf);
+	FILE *f;
+	int res;
+
+	DBG(2, "writing out file, name=%s, len=%d",
+		name, len);
+
+	errno = 0;
+	f = fopen(name,"r");
+	if (errno) {
+		ERRS("unable to open file: %s", name);
+		return -1;
+	}
+
+	while (len > 0) {
+		if (len < buflen)
+			buflen = len;
+
+		/* read data from source file */
+		errno = 0;
+		fread(buf, buflen, 1, f);
+		if (errno != 0) {
+			ERRS("unable to read from file: %s",name);
+			res = -1;
+			break;
+		}
+
+		res = write_out_data(outfile, buf, buflen, css);
+		if (res)
+			break;
+
+		len -= buflen;
+	}
+
+	fclose(f);
+	return res;
+}
+
+
+int
+write_out_block(FILE *outfile, struct fw_block *block, struct csum_state *css)
+{
+	int res;
+
+	if (block == NULL)
+		return 0;
+
+	if (block->file_name == NULL)
+		return 0;
+
+	if (block->file_size == 0)
+		return 0;
+
+	res = write_out_file(outfile, block->file_name,
+			block->file_size, css);
+	return res;
+}
+
+
+int
+write_out_image(FILE *outfile)
+{
+	struct fw_block *block;
+	struct fw_mmap mmap;
+	struct zyn_rombin_hdr hdr;
+	struct csum_state css;
+	int i, res;
+	uint32_t offset;
+	uint32_t padlen;
+	uint16_t csum;
+	uint16_t t;
+
+	/* setup header fields */
+	memset(&hdr, 0, sizeof(hdr));
+	hdr.addr = board->code_start;
+	hdr.type = OBJECT_TYPE_BOOTEXT;
+	hdr.flags = ROMBIN_FLAG_OCSUM;
+
+	offset = board->romio_offs;
+
+	res = write_out_header(outfile, &hdr);
+	if (res)
+		return res;
+
+	offset += sizeof(hdr);
+
+	csum_init(&css);
+	res = write_out_block(outfile, bootext_block, &css);
+	if (res)
+		return res;
+
+	offset += bootext_block->file_size;
+	if (offset > (board->romio_offs + board->bootext_size)) {
+		ERR("bootext file '%s' is too big", bootext_block->file_name);
+		return -1;
+	}
+
+	padlen = ALIGN(offset, MMAP_ALIGN) - offset;
+	res = write_out_padding(outfile, padlen, 0xFF, &css);
+	if (res)
+		return res;
+
+	offset += padlen;
+
+	mmap.addr = board->flash_base + offset;
+	res = write_out_mmap(outfile, &mmap, &css);
+	if (res)
+		return res;
+
+	offset += MMAP_DATA_SIZE;
+
+	if ((offset - board->romio_offs) < board->bootext_size) {
+		padlen = board->romio_offs + board->bootext_size - offset;
+		res = write_out_padding(outfile, padlen, 0xFF, &css);
+		if (res)
+			return res;
+		offset += padlen;
+
+		DBG(2, "bootext end at %08x", offset);
+	}
+
+	for (i = 0; i < num_blocks; i++) {
+		block = &blocks[i];
+
+		if (block->type == BLOCK_TYPE_BOOTEXT)
+			continue;
+
+		padlen = ALIGN(offset, block->align) - offset;
+		res = write_out_padding(outfile, padlen, 0xFF, &css);
+		if (res)
+			return res;
+		offset += padlen;
+
+		res = write_out_block(outfile, block, &css);
+		if (res)
+			return res;
+		offset += block->file_size;
+	}
+
+	padlen = ALIGN(offset, 4) - offset;
+	res = write_out_padding(outfile, padlen, 0xFF, &css);
+	if (res)
+		return res;
+	offset += padlen;
+
+	csum = csum_get(&css);
+	hdr.mmap_addr = mmap.addr;
+	hdr.osize = 2;
+
+	res = read_magic(&hdr.ocsum);
+	if (res)
+		return res;
+	hdr.ocsum = BE16_TO_HOST(hdr.ocsum);
+
+	if (csum <= hdr.ocsum)
+		t = hdr.ocsum - csum;
+	else
+		t = hdr.ocsum - csum - 1;
+
+	DBG(2, "ocsum=%04x, csum=%04x, fix=%04x", hdr.ocsum, csum, t);
+
+	t = HOST_TO_BE16(t);
+	res = write_out_data(outfile, (uint8_t *)&t, 2, NULL);
+	if (res)
+		return res;
+
+
+	res = write_out_header(outfile, &hdr);
+
+	return res;
+}
+
+
+struct board_info *
+find_board(char *name)
+{
+	struct board_info *ret;
+	struct board_info *board;
+
+	ret = NULL;
+	for (board = boards; board->name != NULL; board++){
+		if (strcasecmp(name, board->name) == 0) {
+			ret = board;
+			break;
+		}
+	};
+
+	return ret;
+}
+
+
+int
+parse_opt_board(char ch, char *arg)
+{
+
+	DBG(1,"parsing board option: -%c %s", ch, arg);
+
+	if (board != NULL) {
+		ERR("only one board option allowed");
+		return -1;
+	}
+
+	if (required_arg(ch, arg))
+		return -1;
+
+	board = find_board(arg);
+	if (board == NULL){
+		ERR("invalid/unknown board specified: %s", arg);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+int
+parse_opt_ofname(char ch, char *arg)
+{
+
+	if (ofname != NULL) {
+		ERR("only one output file allowed");
+		return -1;
+	}
+
+	if (required_arg(ch, arg))
+		return -1;
+
+	ofname = arg;
+
+	return 0;
+}
+
+
+int
+parse_opt_block(char ch, char *arg)
+{
+	char buf[MAX_ARG_LEN];
+	char *argv[MAX_ARG_COUNT];
+	int argc;
+	char *p;
+	struct fw_block *block;
+	int i;
+
+	if ( num_blocks >= MAX_NUM_BLOCKS ) {
+		ERR("too many blocks specified");
+		return -1;
+	}
+
+	block = &blocks[num_blocks++];
+
+	/* setup default field values */
+	block->padc = 0xFF;
+
+	switch(ch) {
+	case 'b':
+		if (bootext_block) {
+			ERR("only one boot extension block allowed");
+			break;
+		}
+		block->type = BLOCK_TYPE_BOOTEXT;
+		bootext_block = block;
+		break;
+	case 'r':
+		block->type = BLOCK_TYPE_RAW;
+		break;
+	}
+
+	argc = parse_arg(arg, buf, argv);
+
+	i = 0;
+	p = argv[i++];
+	if (is_empty_arg(p)) {
+		ERR("no file specified in %s", arg);
+		return -1;
+	} else {
+		block->file_name = strdup(p);
+		if (block->file_name == NULL) {
+			ERR("not enough memory");
+			return -1;
+		}
+	}
+
+	if (block->type == BLOCK_TYPE_BOOTEXT)
+		return 0;
+
+	p = argv[i++];
+	if (!is_empty_arg(p)) {
+		if (str2u32(p, &block->align) != 0) {
+			ERR("invalid block align in %s", arg);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+
+int
+calc_block_offsets(int type, uint32_t *offset)
+{
+	struct fw_block *block;
+	uint32_t next_offs;
+	uint32_t avail;
+	int i, res;
+
+	DBG(1,"calculating block offsets, starting with %lu",
+		*offset);
+
+	res = 0;
+	for (i = 0; i < num_blocks; i++) {
+		block = &blocks[i];
+
+		if (block->type != type)
+			continue;
+
+		next_offs = ALIGN(*offset, block->align);
+		avail = board->flash_size - next_offs;
+		if (block->file_size > avail) {
+			ERR("file %s is too big, offset = %u, size=%u,"
+				" avail = %u, align = %u", block->file_name,
+				(unsigned)next_offs,
+				(unsigned)block->file_size,
+				(unsigned)avail,
+				(unsigned)block->align);
+			res = -1;
+			break;
+		}
+
+		block->padlen = next_offs - *offset;
+		*offset += block->file_size;
+	}
+
+	return res;
+}
+
+int
+process_blocks(void)
+{
+	struct fw_block *block;
+	uint32_t offset;
+	int i;
+	int res;
+
+	/* collecting file stats */
+	for (i = 0; i < num_blocks; i++) {
+		block = &blocks[i];
+		res = block_stat_file(block);
+		if (res)
+			return res;
+	}
+
+	offset = board->romio_offs + bootext_block->file_size;
+	res = calc_block_offsets(BLOCK_TYPE_RAW, &offset);
+
+	return res;
+}
+
+
+int
+main(int argc, char *argv[])
+{
+	int optinvalid = 0;   /* flag for invalid option */
+	int c;
+	int res = EXIT_FAILURE;
+
+	FILE *outfile;
+
+	progname=basename(argv[0]);
+
+	opterr = 0;  /* could not print standard getopt error messages */
+	while ( 1 ) {
+		optinvalid = 0;
+
+		c = getopt(argc, argv, "b:B:ho:r:v");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'b':
+		case 'r':
+			optinvalid = parse_opt_block(c,optarg);
+			break;
+		case 'B':
+			optinvalid = parse_opt_board(c,optarg);
+			break;
+		case 'o':
+			optinvalid = parse_opt_ofname(c,optarg);
+			break;
+		case 'v':
+			verblevel++;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			optinvalid = 1;
+			break;
+		}
+		if (optinvalid != 0 ) {
+			ERR("invalid option: -%c", optopt);
+			goto out;
+		}
+	}
+
+	if (board == NULL) {
+		ERR("no board specified");
+		goto out;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto out;
+	}
+
+	if (optind < argc) {
+		ERR("invalid option: %s", argv[optind]);
+		goto out;
+	}
+
+	if (process_blocks() != 0) {
+		goto out;
+	}
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto out;
+	}
+
+	if (write_out_image(outfile) != 0)
+		goto out_flush;
+
+	DBG(1,"Image file %s completed.", ofname);
+
+	res = EXIT_SUCCESS;
+
+out_flush:
+	fflush(outfile);
+	fclose(outfile);
+	if (res != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+out:
+	return res;
+}
diff --git a/trunk/tools/firmware-utils/src/motorola-bin.c b/trunk/tools/firmware-utils/src/motorola-bin.c
new file mode 100644
index 00000000..fecb4ce9
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/motorola-bin.c
@@ -0,0 +1,227 @@
+/*
+ * motorola-bin.c
+ *
+ * Copyright (C) 2005-2006 Mike Baker,
+ *                         Imre Kaloz <kaloz@openwrt.org>
+ *                         D. Hugh Redelmeier
+ *                         OpenWrt.org
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ */
+
+/*
+ * Motorola's firmware flashing code requires an extra header.
+ * The header is eight bytes (see struct motorola below).
+ * This program will take a firmware file and create a new one
+ * with this header:
+ *	motorola-bin --wr850g WR850G_V403.stripped.trx WR850G_V403.trx
+ *
+ * Note: Motorola's firmware is distributed with this header.
+ * If you need to flash Motorola firmware on a router running OpenWRT,
+ * you will to remove this header.  Use the --strip flag:
+ *	motorola-bin --strip WR850G_V403.trx WR850G_V403.stripped.trx
+ */
+
+/*
+ * February 1, 2006
+ *
+ * Add support for for creating WA840G and WE800G images
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <inttypes.h>
+
+#define BPB 8 /* bits/byte */
+
+static uint32_t crc32[1<<BPB];
+
+static void init_crc32()
+{
+	const uint32_t poly = ntohl(0x2083b8ed);
+	int n;
+
+	for (n = 0; n < 1<<BPB; n++) {
+		uint32_t crc = n;
+		int bit;
+
+		for (bit = 0; bit < BPB; bit++)
+			crc = (crc & 1) ? (poly ^ (crc >> 1)) : (crc >> 1);
+		crc32[n] = crc;
+	}
+}
+
+static uint32_t crc32buf(unsigned char *buf, size_t len)
+{
+	uint32_t crc = 0xFFFFFFFF;
+
+	for (; len; len--, buf++)
+		crc = crc32[(uint8_t)crc ^ *buf] ^ (crc >> BPB);
+	return crc;
+}
+
+struct motorola {
+	uint32_t crc;	// crc32 of the remainder
+	uint32_t flags;	// unknown, 105770*
+};
+
+static const struct model {
+	char digit;	/* a digit signifying model (historical) */
+	const char *name;
+	uint32_t flags;
+} models[] = {
+	{ '1', "WR850G", 0x10577050LU },
+	{ '2', "WA840G", 0x10577040LU },
+	{ '3', "WE800G", 0x10577000LU },
+	{ '\0', NULL, 0 }
+};
+
+static void usage(const char *) __attribute__ (( __noreturn__ ));
+
+static void usage(const char *mess)
+{
+	const struct model *m;
+
+	fprintf(stderr, "Error: %s\n", mess);
+	fprintf(stderr, "Usage: motorola-bin -device|--strip infile outfile\n");
+	fprintf(stderr, "Known devices: ");
+
+	for (m = models; m->digit != '\0'; m++)
+		fprintf(stderr, " %c - %s", m->digit, m->name);
+
+	fprintf(stderr, "\n");
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	off_t len;	// of original firmware
+	int fd;
+	void *trx;	// pointer to original firmware (mmmapped)
+	struct motorola *firmware;	// pionter to prefix + copy of original firmware
+	uint32_t flags;
+
+	// verify parameters
+
+	if (argc != 4)
+		usage("wrong number of arguments");
+
+	// mmap trx file
+	if ((fd = open(argv[2], O_RDONLY))  < 0
+	|| (len = lseek(fd, 0, SEEK_END)) < 0
+	|| (trx = mmap(0, len, PROT_READ, MAP_SHARED, fd, 0)) == (void *) (-1)
+	|| close(fd) < 0)
+	{
+		fprintf(stderr, "Error loading file %s: %s\n", argv[2], strerror(errno));
+		exit(1);
+	}
+
+	init_crc32();
+
+	if (strcmp(argv[1], "--strip") == 0)
+	{
+		const char *ugh = NULL;
+
+		if (len < sizeof(struct motorola)) {
+			ugh = "input file too short";
+		} else {
+			const struct model *m;
+
+			firmware = trx;
+			if (htonl(crc32buf(trx + offsetof(struct motorola, flags), len - offsetof(struct motorola, flags))) != firmware->crc)
+				ugh = "Invalid CRC";
+			for (m = models; ; m++) {
+				if (m->digit == '\0') {
+					if (ugh == NULL)
+						ugh = "unrecognized flags field";
+					break;
+				}
+				if (firmware->flags == htonl(m->flags)) {
+					fprintf(stderr, "Firmware for Motorola %s\n", m->name);
+					break;
+				}
+			}
+		}
+
+		if (ugh != NULL) {
+			fprintf(stderr, "%s\n", ugh);
+			exit(3);
+		} else {
+			// all is well, write the file without the prefix
+			if ((fd = open(argv[3], O_CREAT|O_WRONLY|O_TRUNC,0644)) < 0
+			|| write(fd, trx + sizeof(struct motorola), len - sizeof(struct motorola)) !=  len - sizeof(struct motorola)
+			|| close(fd) < 0)
+			{
+				fprintf(stderr, "Error storing file %s: %s\n", argv[3], strerror(errno));
+				exit(2);
+			}
+		}
+		
+	} else {
+		// setup the firmware flags magic number
+		const struct model *m;
+		const char *df = argv[1];
+
+		if (*df != '-')
+			usage("first argument must start with -");
+		if (*++df == '-')
+			++df;	/* allow but don't require second - */
+
+		for (m = models; ; m++) {
+			if (m->digit == '\0')
+				usage("unrecognized device specified");
+			if ((df[0] == m->digit && df[1] == '\0') || strcasecmp(df, m->name) == 0) {
+				flags = m->flags;
+				break;
+			}
+		}
+
+
+		// create a firmware image in memory
+		// and copy the trx to it
+		firmware = malloc(sizeof(struct motorola) + len);
+		memcpy(&firmware[1], trx, len);
+
+		// setup the motorola headers
+		firmware->flags = htonl(flags);
+
+		// CRC of flags + firmware
+		firmware->crc = htonl(crc32buf((unsigned char *)&firmware->flags, sizeof(firmware->flags) + len));
+
+		// write the firmware
+		if ((fd = open(argv[3], O_CREAT|O_WRONLY|O_TRUNC,0644)) < 0
+		|| write(fd, firmware, sizeof(struct motorola) + len) != sizeof(struct motorola) + len
+		|| close(fd) < 0)
+		{
+			fprintf(stderr, "Error storing file %s: %s\n", argv[3], strerror(errno));
+			exit(2);
+		}
+
+		free(firmware);
+	}
+
+	munmap(trx,len);
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/myloader.h b/trunk/tools/firmware-utils/src/myloader.h
new file mode 100644
index 00000000..7be1d493
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/myloader.h
@@ -0,0 +1,176 @@
+/*
+ *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef _MYLOADER_H_
+#define _MYLOADER_H_
+
+/*
+ * Firmware file format:
+ *
+ *	<header>
+ *	[<block descriptor 0>]
+ *	...
+ *	[<block descriptor n>]
+ *	<null block descriptor>
+ *	[<block data 0>]
+ *	...
+ *	[<block data n>]
+ *
+ *
+ */
+
+/* Myloader specific magic numbers */
+#define MYLO_MAGIC_FIRMWARE	0x4C594D00
+#define MYLO_MAGIC_20021103	0x20021103
+#define MYLO_MAGIC_20021107	0x20021107
+
+#define MYLO_MAGIC_SYS_PARAMS	MYLO_MAGIC_20021107
+#define MYLO_MAGIC_PARTITIONS	MYLO_MAGIC_20021103
+#define MYLO_MAGIC_BOARD_PARAMS	MYLO_MAGIC_20021103
+
+/*
+ * Addresses of the data structures provided by MyLoader
+ */
+#define MYLO_MIPS_SYS_PARAMS	0x80000800	/* System Parameters */
+#define MYLO_MIPS_BOARD_PARAMS	0x80000A00	/* Board Parameters */
+#define MYLO_MIPS_PARTITIONS	0x80000C00	/* Partition Table */
+#define MYLO_MIPS_BOOT_PARAMS	0x80000E00	/* Boot Parameters */
+
+/* Vendor ID's (seems to be same as the PCI vendor ID's) */
+#define VENID_COMPEX		0x11F6
+
+/* Devices based on the ADM5120 */
+#define DEVID_COMPEX_NP27G	0x0078
+#define DEVID_COMPEX_NP28G	0x044C
+#define DEVID_COMPEX_NP28GHS	0x044E
+#define DEVID_COMPEX_WP54Gv1C	0x0514
+#define DEVID_COMPEX_WP54G	0x0515
+#define DEVID_COMPEX_WP54AG	0x0546
+#define DEVID_COMPEX_WPP54AG	0x0550
+#define DEVID_COMPEX_WPP54G	0x0555
+
+/* Devices based on the Atheros AR2317 */
+#define DEVID_COMPEX_NP25G	0x05e6
+#define DEVID_COMPEX_WPE53G	0x05dc
+
+/* Devices based on the Atheros AR71xx */
+#define DEVID_COMPEX_WP543	0x0640
+#define DEVID_COMPEX_WPE72	0x0672
+
+/* Devices based on the IXP422 */
+#define DEVID_COMPEX_WP18	0x047E
+#define DEVID_COMPEX_NP18A	0x0489
+
+/* Other devices */
+#define DEVID_COMPEX_NP26G8M	0x03E8
+#define DEVID_COMPEX_NP26G16M	0x03E9
+
+struct mylo_fw_header {
+	uint32_t	magic;	/* must be MYLO_MAGIC_FIRMWARE */
+	uint32_t	crc;	/* CRC of the whole firmware */
+	uint32_t	res0;	/* unknown/unused */
+	uint32_t	res1;	/* unknown/unused */
+	uint16_t	vid;	/* vendor ID */
+	uint16_t	did;	/* device ID */
+	uint16_t	svid;	/* sub vendor ID */
+	uint16_t	sdid;	/* sub device ID */
+	uint32_t	rev;	/* device revision */
+	uint32_t	fwhi;	/* FIXME: firmware version high? */
+	uint32_t	fwlo;	/* FIXME: firmware version low? */
+	uint32_t	flags;	/* firmware flags */
+};
+
+#define FW_FLAG_BOARD_PARAMS_WP	0x01 /* board parameters are write protected */
+#define FW_FLAG_BOOT_SECTOR_WE	0x02 /* enable of write boot sectors (below 64K) */
+
+struct mylo_fw_blockdesc {
+	uint32_t	type;	/* block type */
+	uint32_t	addr;	/* relative address to flash start */
+	uint32_t	dlen;	/* size of block data in bytes */
+	uint32_t	blen;	/* total size of block in bytes */
+};
+
+#define FW_DESC_TYPE_UNUSED	0
+#define FW_DESC_TYPE_USED	1
+
+struct mylo_partition {
+	uint16_t	flags;	/* partition flags */
+	uint16_t	type;	/* type of the partition */
+	uint32_t	addr;	/* relative address of the partition from the
+				   flash start */
+	uint32_t	size;	/* size of the partition in bytes */
+	uint32_t	param;	/* if this is the active partition, the
+				   MyLoader load code to this address */
+};
+
+#define PARTITION_FLAG_ACTIVE	0x8000 /* this is the active partition,
+					* MyLoader loads firmware from here */
+#define PARTITION_FLAG_ISRAM	0x2000 /* FIXME: this is a RAM partition? */
+#define PARTIIION_FLAG_RAMLOAD	0x1000 /* FIXME: load this partition into the RAM? */
+#define PARTITION_FLAG_PRELOAD	0x0800 /* the partition data preloaded to RAM
+					* before decompression */
+#define PARTITION_FLAG_LZMA	0x0100 /* the partition data compressed with LZMA */
+#define PARTITION_FLAG_HAVEHDR  0x0002 /* the partition data have a header */
+
+#define PARTITION_TYPE_FREE	0
+#define PARTITION_TYPE_USED	1
+
+#define MYLO_MAX_PARTITIONS	8	/* maximum number of partitions in the
+					   partition table */
+
+struct mylo_partition_table {
+	uint32_t	magic;	/* must be MYLO_MAGIC_PARTITIONS */
+	uint32_t	res0;	/* unknown/unused */
+	uint32_t	res1;	/* unknown/unused */
+	uint32_t 	res2;	/* unknown/unused */
+	struct mylo_partition partitions[MYLO_MAX_PARTITIONS];
+};
+
+struct mylo_partition_header {
+	uint32_t	len;	/* length of the partition data */
+	uint32_t	crc;	/* CRC value of the partition data */
+};
+
+struct mylo_system_params {
+	uint32_t	magic;	/* must be MYLO_MAGIC_SYS_PARAMS */
+	uint32_t	res0;
+	uint32_t	res1;
+	uint32_t	mylo_ver;
+	uint16_t	vid;	/* Vendor ID */
+	uint16_t	did;	/* Device ID */
+	uint16_t	svid;	/* Sub Vendor ID */
+	uint16_t	sdid;	/* Sub Device ID */
+	uint32_t	rev;	/* device revision */
+	uint32_t	fwhi;
+	uint32_t	fwlo;
+	uint32_t	tftp_addr;
+	uint32_t	prog_start;
+	uint32_t	flash_size;	/* Size of boot FLASH in bytes */
+	uint32_t	dram_size;	/* Size of onboard RAM in bytes */
+};
+
+
+struct mylo_eth_addr {
+	uint8_t	mac[6];
+	uint8_t	csum[2];
+};
+
+#define MYLO_ETHADDR_COUNT	8	/* maximum number of ethernet address
+					   in the board parameters */
+
+struct mylo_board_params {
+	uint32_t	magic;	/* must be MYLO_MAGIC_BOARD_PARAMS */
+	uint32_t	res0;
+	uint32_t	res1;
+	uint32_t	res2;
+	struct mylo_eth_addr addr[MYLO_ETHADDR_COUNT];
+};
+
+#endif /* _MYLOADER_H_*/
diff --git a/trunk/tools/firmware-utils/src/nand_ecc.c b/trunk/tools/firmware-utils/src/nand_ecc.c
new file mode 100644
index 00000000..b1e93051
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/nand_ecc.c
@@ -0,0 +1,204 @@
+/*
+ * calculate ecc code for nand flash
+ *
+ * Copyright (C) 2008 yajin <yajin@vm-kernel.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 or
+ * (at your option) version 3 of the License.
+ *
+ * This program is distributed in the hope that 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 <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#define DEF_NAND_PAGE_SIZE   2048
+#define DEF_NAND_OOB_SIZE     64
+#define DEF_NAND_ECC_OFFSET   0x28
+
+static int page_size = DEF_NAND_PAGE_SIZE;
+static int oob_size = DEF_NAND_OOB_SIZE;
+static int ecc_offset = DEF_NAND_ECC_OFFSET;
+
+/*
+ * Pre-calculated 256-way 1 byte column parity
+ */
+static const uint8_t nand_ecc_precalc_table[] = {
+	0x00, 0x55, 0x56, 0x03, 0x59, 0x0c, 0x0f, 0x5a, 0x5a, 0x0f, 0x0c, 0x59, 0x03, 0x56, 0x55, 0x00,
+	0x65, 0x30, 0x33, 0x66, 0x3c, 0x69, 0x6a, 0x3f, 0x3f, 0x6a, 0x69, 0x3c, 0x66, 0x33, 0x30, 0x65,
+	0x66, 0x33, 0x30, 0x65, 0x3f, 0x6a, 0x69, 0x3c, 0x3c, 0x69, 0x6a, 0x3f, 0x65, 0x30, 0x33, 0x66,
+	0x03, 0x56, 0x55, 0x00, 0x5a, 0x0f, 0x0c, 0x59, 0x59, 0x0c, 0x0f, 0x5a, 0x00, 0x55, 0x56, 0x03,
+	0x69, 0x3c, 0x3f, 0x6a, 0x30, 0x65, 0x66, 0x33, 0x33, 0x66, 0x65, 0x30, 0x6a, 0x3f, 0x3c, 0x69,
+	0x0c, 0x59, 0x5a, 0x0f, 0x55, 0x00, 0x03, 0x56, 0x56, 0x03, 0x00, 0x55, 0x0f, 0x5a, 0x59, 0x0c,
+	0x0f, 0x5a, 0x59, 0x0c, 0x56, 0x03, 0x00, 0x55, 0x55, 0x00, 0x03, 0x56, 0x0c, 0x59, 0x5a, 0x0f,
+	0x6a, 0x3f, 0x3c, 0x69, 0x33, 0x66, 0x65, 0x30, 0x30, 0x65, 0x66, 0x33, 0x69, 0x3c, 0x3f, 0x6a,
+	0x6a, 0x3f, 0x3c, 0x69, 0x33, 0x66, 0x65, 0x30, 0x30, 0x65, 0x66, 0x33, 0x69, 0x3c, 0x3f, 0x6a,
+	0x0f, 0x5a, 0x59, 0x0c, 0x56, 0x03, 0x00, 0x55, 0x55, 0x00, 0x03, 0x56, 0x0c, 0x59, 0x5a, 0x0f,
+	0x0c, 0x59, 0x5a, 0x0f, 0x55, 0x00, 0x03, 0x56, 0x56, 0x03, 0x00, 0x55, 0x0f, 0x5a, 0x59, 0x0c,
+	0x69, 0x3c, 0x3f, 0x6a, 0x30, 0x65, 0x66, 0x33, 0x33, 0x66, 0x65, 0x30, 0x6a, 0x3f, 0x3c, 0x69,
+	0x03, 0x56, 0x55, 0x00, 0x5a, 0x0f, 0x0c, 0x59, 0x59, 0x0c, 0x0f, 0x5a, 0x00, 0x55, 0x56, 0x03,
+	0x66, 0x33, 0x30, 0x65, 0x3f, 0x6a, 0x69, 0x3c, 0x3c, 0x69, 0x6a, 0x3f, 0x65, 0x30, 0x33, 0x66,
+	0x65, 0x30, 0x33, 0x66, 0x3c, 0x69, 0x6a, 0x3f, 0x3f, 0x6a, 0x69, 0x3c, 0x66, 0x33, 0x30, 0x65,
+	0x00, 0x55, 0x56, 0x03, 0x59, 0x0c, 0x0f, 0x5a, 0x5a, 0x0f, 0x0c, 0x59, 0x03, 0x56, 0x55, 0x00
+};
+
+/**
+ * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256-byte block
+ * @dat:	raw data
+ * @ecc_code:	buffer for ECC
+ */
+int nand_calculate_ecc(const uint8_t *dat,
+		       uint8_t *ecc_code)
+{
+	uint8_t idx, reg1, reg2, reg3, tmp1, tmp2;
+	int i;
+
+	/* Initialize variables */
+	reg1 = reg2 = reg3 = 0;
+
+	/* Build up column parity */
+	for(i = 0; i < 256; i++) {
+		/* Get CP0 - CP5 from table */
+		idx = nand_ecc_precalc_table[*dat++];
+		reg1 ^= (idx & 0x3f);
+
+		/* All bit XOR = 1 ? */
+		if (idx & 0x40) {
+			reg3 ^= (uint8_t) i;
+			reg2 ^= ~((uint8_t) i);
+		}
+	}
+
+	/* Create non-inverted ECC code from line parity */
+	tmp1  = (reg3 & 0x80) >> 0; /* B7 -> B7 */
+	tmp1 |= (reg2 & 0x80) >> 1; /* B7 -> B6 */
+	tmp1 |= (reg3 & 0x40) >> 1; /* B6 -> B5 */
+	tmp1 |= (reg2 & 0x40) >> 2; /* B6 -> B4 */
+	tmp1 |= (reg3 & 0x20) >> 2; /* B5 -> B3 */
+	tmp1 |= (reg2 & 0x20) >> 3; /* B5 -> B2 */
+	tmp1 |= (reg3 & 0x10) >> 3; /* B4 -> B1 */
+	tmp1 |= (reg2 & 0x10) >> 4; /* B4 -> B0 */
+
+	tmp2  = (reg3 & 0x08) << 4; /* B3 -> B7 */
+	tmp2 |= (reg2 & 0x08) << 3; /* B3 -> B6 */
+	tmp2 |= (reg3 & 0x04) << 3; /* B2 -> B5 */
+	tmp2 |= (reg2 & 0x04) << 2; /* B2 -> B4 */
+	tmp2 |= (reg3 & 0x02) << 2; /* B1 -> B3 */
+	tmp2 |= (reg2 & 0x02) << 1; /* B1 -> B2 */
+	tmp2 |= (reg3 & 0x01) << 1; /* B0 -> B1 */
+	tmp2 |= (reg2 & 0x01) << 0; /* B7 -> B0 */
+
+	/* Calculate final ECC code */
+#ifdef CONFIG_MTD_NAND_ECC_SMC
+	ecc_code[0] = ~tmp2;
+	ecc_code[1] = ~tmp1;
+#else
+	ecc_code[0] = ~tmp1;
+	ecc_code[1] = ~tmp2;
+#endif
+	ecc_code[2] = ((~reg1) << 2) | 0x03;
+
+	return 0;
+}
+
+/*
+ *  usage: bb-nandflash-ecc    start_address  size
+ */
+void usage(const char *prog)
+{
+	fprintf(stderr, "Usage: %s [options] <input> <output>\n"
+		"Options:\n"
+		"    -p <pagesize>      NAND page size (default: %d)\n"
+		"    -o <oobsize>       NAND OOB size (default: %d)\n"
+		"    -e <offset>        NAND ECC offset (default: %d)\n"
+		"\n", prog, DEF_NAND_PAGE_SIZE, DEF_NAND_OOB_SIZE,
+		DEF_NAND_ECC_OFFSET);
+	exit(1);
+}
+
+/*start_address/size does not include oob
+  */
+int main(int argc, char **argv)
+{
+	uint8_t *page_data = NULL;
+	uint8_t *ecc_data;
+	int infd = -1, outfd = -1;
+	int ret = 1;
+	ssize_t bytes;
+	int ch;
+
+	while ((ch = getopt(argc, argv, "e:o:p:")) != -1) {
+		switch(ch) {
+		case 'p':
+			page_size = strtoul(optarg, NULL, 0);
+			break;
+		case 'o':
+			oob_size = strtoul(optarg, NULL, 0);
+			break;
+		case 'e':
+			ecc_offset = strtoul(optarg, NULL, 0);
+			break;
+		default:
+			usage(argv[0]);
+		}
+	}
+	argc -= optind;
+	if (argc < 2)
+		usage(argv[0]);
+
+	argv += optind;
+
+	infd = open(argv[0], O_RDONLY, 0);
+	if (infd < 0) {
+		perror("open input file");
+		goto out;
+	}
+
+	outfd = open(argv[1], O_WRONLY|O_CREAT|O_TRUNC, 0644);
+	if (outfd < 0) {
+		perror("open output file");
+		goto out;
+	}
+
+	page_data = malloc(page_size + oob_size);
+
+	while ((bytes = read(infd, page_data, page_size)) == page_size) {
+		int j;
+
+		ecc_data = page_data + page_size + ecc_offset;
+		for (j = 0; j < page_size / 256; j++)
+		{
+			nand_calculate_ecc(page_data + j * 256, ecc_data);
+			ecc_data += 3;
+		}
+		write(outfd, page_data, page_size + oob_size);
+	}
+
+	ret = 0;
+out:
+	if (infd >= 0)
+		close(infd);
+	if (outfd >= 0)
+		close(outfd);
+	if (page_data)
+		free(page_data);
+	return ret;
+}
+
diff --git a/trunk/tools/firmware-utils/src/osbridge-crc.c b/trunk/tools/firmware-utils/src/osbridge-crc.c
new file mode 100644
index 00000000..f2e3920a
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/osbridge-crc.c
@@ -0,0 +1,309 @@
+/*
+ *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#  define HOST_TO_LE16(x)	(x)
+#  define HOST_TO_LE32(x)	(x)
+#  define LE16_TO_HOST(x)	(x)
+#  define LE32_TO_HOST(x)	(x)
+#else
+#  define HOST_TO_LE16(x)	bswap_16(x)
+#  define HOST_TO_LE32(x)	bswap_32(x)
+#  define LE16_TO_HOST(x)	bswap_16(x)
+#  define LE32_TO_HOST(x)	bswap_32(x)
+#endif
+
+uint32_t crc32buf(char *buf, size_t len);
+
+/*
+ * Globals
+ */
+static char *ifname;
+static char *progname;
+static char *ofname;
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -i <file>       read input from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+int main(int argc, char *argv[])
+{
+	int res = EXIT_FAILURE;
+	int buflen;
+	int err;
+	struct stat st;
+	char *buf;
+	uint32_t *hdr;
+	uint32_t crc;
+
+	FILE *outfile, *infile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "i:o:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'i':
+			ifname = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	if (ifname == NULL) {
+		ERR("no input file specified");
+		goto err;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto err;
+	}
+
+	err = stat(ifname, &st);
+	if (err){
+		ERRS("stat failed on %s", ifname);
+		goto err;
+	}
+
+	buflen = st.st_size;
+	buf = malloc(buflen);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto err;
+	}
+
+	infile = fopen(ifname, "r");
+	if (infile == NULL) {
+		ERRS("could not open \"%s\" for reading", ifname);
+		goto err_free;
+	}
+
+	errno = 0;
+	fread(buf, buflen, 1, infile);
+	if (errno != 0) {
+		ERRS("unable to read from file %s", ifname);
+		goto err_close_in;
+	}
+
+	crc = crc32buf(buf, buflen);
+	hdr = (uint32_t *)buf;
+	*hdr = HOST_TO_LE32(crc);
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto err_close_in;
+	}
+
+	errno = 0;
+	fwrite(buf, buflen, 1, outfile);
+	if (errno) {
+		ERRS("unable to write to file %s", ofname);
+		goto err_close_out;
+	}
+
+	res = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(outfile);
+
+ err_close_out:
+	fclose(outfile);
+	if (res != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+
+ err_close_in:
+	fclose(infile);
+
+ err_free:
+	free(buf);
+
+ err:
+	return res;
+}
+
+/**********************************************************************/
+/* The following was grabbed and tweaked from the old snippets collection
+ * of public domain C code. */
+
+/**********************************************************************\
+|* Demonstration program to compute the 32-bit CRC used as the frame  *|
+|* check sequence in ADCCP (ANSI X3.66, also known as FIPS PUB 71     *|
+|* and FED-STD-1003, the U.S. versions of CCITT's X.25 link-level     *|
+|* protocol).  The 32-bit FCS was added via the Federal Register,     *|
+|* 1 June 1982, p.23798.  I presume but don't know for certain that   *|
+|* this polynomial is or will be included in CCITT V.41, which        *|
+|* defines the 16-bit CRC (often called CRC-CCITT) polynomial.  FIPS  *|
+|* PUB 78 says that the 32-bit FCS reduces otherwise undetected       *|
+|* errors by a factor of 10^-5 over 16-bit FCS.                       *|
+\**********************************************************************/
+
+/* Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+   code or tables extracted from it, as desired without restriction.*/
+
+/* First, the polynomial itself and its table of feedback terms.  The  */
+/* polynomial is                                                       */
+/* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
+/* Note that we take it "backwards" and put the highest-order term in  */
+/* the lowest-order bit.  The X^32 term is "implied"; the LSB is the   */
+/* X^31 term, etc.  The X^0 term (usually shown as "+1") results in    */
+/* the MSB being 1.                                                    */
+
+/* Note that the usual hardware shift register implementation, which   */
+/* is what we're using (we're merely optimizing it by doing eight-bit  */
+/* chunks at a time) shifts bits into the lowest-order term.  In our   */
+/* implementation, that means shifting towards the right.  Why do we   */
+/* do it this way?  Because the calculated CRC must be transmitted in  */
+/* order from highest-order term to lowest-order term.  UARTs transmit */
+/* characters in order from LSB to MSB.  By storing the CRC this way,  */
+/* we hand it to the UART in the order low-byte to high-byte; the UART */
+/* sends each low-bit to hight-bit; and the result is transmission bit */
+/* by bit from highest- to lowest-order term without requiring any bit */
+/* shuffling on our part.  Reception works similarly.                  */
+
+/* The feedback terms table consists of 256, 32-bit entries.  Notes:   */
+/*                                                                     */
+/*  1. The table can be generated at runtime if desired; code to do so */
+/*     is shown later.  It might not be obvious, but the feedback      */
+/*     terms simply represent the results of eight shift/xor opera-    */
+/*     tions for all combinations of data and CRC register values.     */
+/*                                                                     */
+/*  2. The CRC accumulation logic is the same for all CRC polynomials, */
+/*     be they sixteen or thirty-two bits wide.  You simply choose the */
+/*     appropriate table.  Alternatively, because the table can be     */
+/*     generated at runtime, you can start by generating the table for */
+/*     the polynomial in question and use exactly the same "updcrc",   */
+/*     if your application needn't simultaneously handle two CRC       */
+/*     polynomials.  (Note, however, that XMODEM is strange.)          */
+/*                                                                     */
+/*  3. For 16-bit CRCs, the table entries need be only 16 bits wide;   */
+/*     of course, 32-bit entries work OK if the high 16 bits are zero. */
+/*                                                                     */
+/*  4. The values must be right-shifted by eight bits by the "updcrc"  */
+/*     logic; the shift must be unsigned (bring in zeroes).  On some   */
+/*     hardware you could probably optimize the shift in assembler by  */
+/*     using byte-swap instructions.                                   */
+
+static const uint32_t crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
+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
+};
+
+#define UPDC32(octet,crc) (crc_32_tab[((crc) ^ (octet)) & 0xff] ^ ((crc) >> 8))
+
+uint32_t crc32buf(char *buf, size_t len)
+{
+      uint32_t crc;
+
+      crc = 0xFFFFFFFF;
+
+      for ( ; len; --len, ++buf)
+      {
+            crc = UPDC32(*buf, crc);
+      }
+
+      return crc ^ 0xFFFFFFFF;
+}
+
diff --git a/trunk/tools/firmware-utils/src/pc1crypt.c b/trunk/tools/firmware-utils/src/pc1crypt.c
new file mode 100644
index 00000000..9c2eb83f
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/pc1crypt.c
@@ -0,0 +1,361 @@
+/*
+ *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ *  This code was based on:
+ *	PC1 Cipher Algorithm ( Pukall Cipher 1 )
+ *	By Alexander PUKALL 1991
+ *	free code no restriction to use
+ *	please include the name of the Author in the final software
+ *	the Key is 128 bits
+ *	http://membres.lycos.fr/pc1/
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>     /* for unlink() */
+#include <libgen.h>
+#include <getopt.h>     /* for getopt() */
+#include <stdarg.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+struct pc1_ctx {
+	unsigned short	ax;
+	unsigned short	bx;
+	unsigned short	cx;
+	unsigned short	dx;
+	unsigned short	si;
+	unsigned short	tmp;
+	unsigned short	x1a2;
+	unsigned short	x1a0[8];
+	unsigned short	res;
+	unsigned short	i;
+	unsigned short	inter;
+	unsigned short	cfc;
+	unsigned short	cfd;
+	unsigned short	compte;
+	unsigned char	cle[17];
+	short		c;
+};
+
+static void pc1_finish(struct pc1_ctx *pc1)
+{
+	/* erase all variables */
+	memset(pc1, 0, sizeof(struct pc1_ctx));
+}
+
+static void pc1_code(struct pc1_ctx *pc1)
+{
+	pc1->dx = pc1->x1a2 + pc1->i;
+	pc1->ax = pc1->x1a0[pc1->i];
+	pc1->cx = 0x015a;
+	pc1->bx = 0x4e35;
+
+	pc1->tmp = pc1->ax;
+	pc1->ax = pc1->si;
+	pc1->si = pc1->tmp;
+
+	pc1->tmp = pc1->ax;
+	pc1->ax = pc1->dx;
+	pc1->dx = pc1->tmp;
+
+	if (pc1->ax != 0) {
+		pc1->ax = pc1->ax * pc1->bx;
+	}
+
+	pc1->tmp = pc1->ax;
+	pc1->ax = pc1->cx;
+	pc1->cx = pc1->tmp;
+
+	if (pc1->ax != 0) {
+		pc1->ax = pc1->ax * pc1->si;
+		pc1->cx = pc1->ax + pc1->cx;
+	}
+
+	pc1->tmp = pc1->ax;
+	pc1->ax = pc1->si;
+	pc1->si = pc1->tmp;
+	pc1->ax = pc1->ax * pc1->bx;
+	pc1->dx = pc1->cx + pc1->dx;
+
+	pc1->ax = pc1->ax + 1;
+
+	pc1->x1a2 = pc1->dx;
+	pc1->x1a0[pc1->i] = pc1->ax;
+
+	pc1->res = pc1->ax ^ pc1->dx;
+	pc1->i = pc1->i + 1;
+}
+
+static void pc1_assemble(struct pc1_ctx *pc1)
+{
+	pc1->x1a0[0] = (pc1->cle[0] * 256) + pc1->cle[1];
+
+	pc1_code(pc1);
+	pc1->inter = pc1->res;
+
+	pc1->x1a0[1] = pc1->x1a0[0] ^ ((pc1->cle[2]*256) + pc1->cle[3]);
+	pc1_code(pc1);
+	pc1->inter = pc1->inter ^ pc1->res;
+
+	pc1->x1a0[2] = pc1->x1a0[1] ^ ((pc1->cle[4]*256) + pc1->cle[5]);
+	pc1_code(pc1);
+	pc1->inter = pc1->inter ^ pc1->res;
+
+	pc1->x1a0[3] = pc1->x1a0[2] ^ ((pc1->cle[6]*256) + pc1->cle[7]);
+	pc1_code(pc1);
+	pc1->inter = pc1->inter ^ pc1->res;
+
+	pc1->x1a0[4] = pc1->x1a0[3] ^ ((pc1->cle[8]*256) + pc1->cle[9]);
+	pc1_code(pc1);
+	pc1->inter = pc1->inter ^ pc1->res;
+
+	pc1->x1a0[5] = pc1->x1a0[4] ^ ((pc1->cle[10]*256) + pc1->cle[11]);
+	pc1_code(pc1);
+	pc1->inter = pc1->inter ^ pc1->res;
+
+	pc1->x1a0[6] = pc1->x1a0[5] ^ ((pc1->cle[12]*256) + pc1->cle[13]);
+	pc1_code(pc1);
+	pc1->inter = pc1->inter ^ pc1->res;
+
+	pc1->x1a0[7] = pc1->x1a0[6] ^ ((pc1->cle[14]*256) + pc1->cle[15]);
+	pc1_code(pc1);
+	pc1->inter = pc1->inter ^ pc1->res;
+
+	pc1->i = 0;
+}
+
+static unsigned char pc1_decrypt(struct pc1_ctx *pc1, short c)
+{
+	pc1_assemble(pc1);
+	pc1->cfc = pc1->inter >> 8;
+	pc1->cfd = pc1->inter & 255; /* cfc^cfd = random byte */
+
+	c = c ^ (pc1->cfc ^ pc1->cfd);
+	for (pc1->compte = 0; pc1->compte <= 15; pc1->compte++) {
+		/* we mix the plaintext byte with the key */
+		pc1->cle[pc1->compte] = pc1->cle[pc1->compte] ^ c;
+	}
+
+	return c;
+}
+
+static unsigned char pc1_encrypt(struct pc1_ctx *pc1, short c)
+{
+	pc1_assemble(pc1);
+	pc1->cfc = pc1->inter >> 8;
+	pc1->cfd = pc1->inter & 255; /* cfc^cfd = random byte */
+
+	for (pc1->compte = 0; pc1->compte <= 15; pc1->compte++) {
+		/* we mix the plaintext byte with the key */
+		pc1->cle[pc1->compte] = pc1->cle[pc1->compte] ^ c;
+	}
+	c = c ^ (pc1->cfc ^ pc1->cfd);
+
+	return c;
+}
+
+static void pc1_init(struct pc1_ctx *pc1)
+{
+	memset(pc1, 0, sizeof(struct pc1_ctx));
+
+	/* ('Remsaalps!123456') is the key used, you can change it */
+	strcpy(pc1->cle, "Remsaalps!123456");
+}
+
+static void pc1_decrypt_buf(struct pc1_ctx *pc1, unsigned char *buf,
+			    unsigned len)
+{
+	unsigned i;
+
+	for (i = 0; i < len; i++)
+		buf[i] = pc1_decrypt(pc1, buf[i]);
+}
+
+static void pc1_encrypt_buf(struct pc1_ctx *pc1, unsigned char *buf,
+			    unsigned len)
+{
+	unsigned i;
+
+	for (i = 0; i < len; i++)
+		buf[i] = pc1_encrypt(pc1, buf[i]);
+}
+
+/*
+ * Globals
+ */
+static char *ifname;
+static char *progname;
+static char *ofname;
+static int decrypt;
+
+/*
+ * Message macros
+ */
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+void usage(int status)
+{
+	FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
+	struct board_info *board;
+
+	fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
+	fprintf(stream,
+"\n"
+"Options:\n"
+"  -d              decrypt instead of encrypt"
+"  -i <file>       read input from the file <file>\n"
+"  -o <file>       write output to the file <file>\n"
+"  -h              show this screen\n"
+	);
+
+	exit(status);
+}
+
+#define BUFSIZE		(64 * 1024)
+
+int main(int argc, char *argv[])
+{
+	struct pc1_ctx pc1;
+	int res = EXIT_FAILURE;
+	int err;
+	struct stat st;
+	char *buf;
+	unsigned total;
+
+	FILE *outfile, *infile;
+
+	progname = basename(argv[0]);
+
+	while ( 1 ) {
+		int c;
+
+		c = getopt(argc, argv, "di:o:h");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'd':
+			decrypt = 1;
+			break;
+		case 'i':
+			ifname = optarg;
+			break;
+		case 'o':
+			ofname = optarg;
+			break;
+		case 'h':
+			usage(EXIT_SUCCESS);
+			break;
+		default:
+			usage(EXIT_FAILURE);
+			break;
+		}
+	}
+
+	if (ifname == NULL) {
+		ERR("no input file specified");
+		goto err;
+	}
+
+	if (ofname == NULL) {
+		ERR("no output file specified");
+		goto err;
+	}
+
+	err = stat(ifname, &st);
+	if (err){
+		ERRS("stat failed on %s", ifname);
+		goto err;
+	}
+
+	total = st.st_size;
+	buf = malloc(BUFSIZE);
+	if (!buf) {
+		ERR("no memory for buffer\n");
+		goto err;
+	}
+
+	infile = fopen(ifname, "r");
+	if (infile == NULL) {
+		ERRS("could not open \"%s\" for reading", ifname);
+		goto err_free;
+	}
+
+	outfile = fopen(ofname, "w");
+	if (outfile == NULL) {
+		ERRS("could not open \"%s\" for writing", ofname);
+		goto err_close_in;
+	}
+
+	pc1_init(&pc1);
+	while (total > 0) {
+		unsigned datalen;
+
+		if (total > BUFSIZE)
+			datalen = BUFSIZE;
+		else
+			datalen = total;
+
+		errno = 0;
+		fread(buf, datalen, 1, infile);
+		if (errno != 0) {
+			ERRS("unable to read from file %s", ifname);
+			goto err_close_out;
+		}
+
+		if (decrypt)
+			pc1_decrypt_buf(&pc1, buf, datalen);
+		else
+			pc1_encrypt_buf(&pc1, buf, datalen);
+
+		errno = 0;
+		fwrite(buf, datalen, 1, outfile);
+		if (errno) {
+			ERRS("unable to write to file %s", ofname);
+			goto err_close_out;
+		}
+
+		total -= datalen;
+	}
+	pc1_finish(&pc1);
+
+	res = EXIT_SUCCESS;
+
+ out_flush:
+	fflush(outfile);
+
+ err_close_out:
+	fclose(outfile);
+	if (res != EXIT_SUCCESS) {
+		unlink(ofname);
+	}
+
+ err_close_in:
+	fclose(infile);
+
+ err_free:
+	free(buf);
+
+ err:
+	return res;
+}
+
diff --git a/trunk/tools/firmware-utils/src/ptgen.c b/trunk/tools/firmware-utils/src/ptgen.c
new file mode 100644
index 00000000..6379ed7a
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/ptgen.c
@@ -0,0 +1,245 @@
+/* 
+ * ptgen - partition table generator
+ * Copyright (C) 2006 by Felix Fietkau <nbd@openwrt.org>
+ *
+ * uses parts of afdisk
+ * Copyright (C) 2002 by David Roetzel <david@roetzel.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdint.h>
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define cpu_to_le16(x) bswap_16(x)
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#define cpu_to_le16(x) (x)
+#else
+#error unknown endianness!
+#endif
+
+/* Partition table entry */
+struct pte { 
+	unsigned char active;
+	unsigned char chs_start[3];
+	unsigned char type;
+	unsigned char chs_end[3];
+	unsigned int start;
+	unsigned int length;
+};
+
+struct partinfo {
+	unsigned long size;
+	int type;
+};
+
+int verbose = 0;
+int active = 1;
+int heads = -1;
+int sectors = -1;
+int kb_align = 0;
+struct partinfo parts[4];
+char *filename = NULL;
+
+
+/* 
+ * parse the size argument, which is either
+ * a simple number (K assumed) or
+ * K, M or G
+ *
+ * returns the size in KByte
+ */
+static long to_kbytes(const char *string) {
+	int exp = 0;
+	long result;
+	char *end;
+
+	result = strtoul(string, &end, 0);
+	switch (tolower(*end)) {
+			case 'k' :
+			case '\0' : exp = 0; break;
+			case 'm' : exp = 1; break;
+			case 'g' : exp = 2; break;
+			default: return 0;
+	}
+
+	if (*end)
+		end++;
+
+	if (*end) {
+		fprintf(stderr, "garbage after end of number\n");
+		return 0;
+	}
+
+	/* result: number + 1024^(exp) */
+	return result * ((2 << ((10 * exp) - 1)) ?: 1);
+}
+
+/* convert the sector number into a CHS value for the partition table */
+static void to_chs(long sect, unsigned char chs[3]) {
+	int c,h,s;
+	
+	s = (sect % sectors) + 1;
+	sect = sect / sectors;
+	h = sect % heads;
+	sect = sect / heads;
+	c = sect;
+
+	chs[0] = h;
+	chs[1] = s | ((c >> 2) & 0xC0);
+	chs[2] = c & 0xFF;
+
+	return;
+}
+
+/* round the sector number up to the next cylinder */
+static inline unsigned long round_to_cyl(long sect) {
+	int cyl_size = heads * sectors;
+
+	return sect + cyl_size - (sect % cyl_size); 
+}
+
+/* round the sector number up to the kb_align boundary */
+static inline unsigned long round_to_kb(long sect) {
+        return ((sect - 1) / kb_align + 1) * kb_align;
+}
+
+/* check the partition sizes and write the partition table */
+static int gen_ptable(uint32_t signature, int nr)
+{
+	struct pte pte[4];
+	unsigned long sect = 0; 
+	int i, fd, ret = -1, start, len;
+
+	memset(pte, 0, sizeof(struct pte) * 4);
+	for (i = 0; i < nr; i++) {
+		if (!parts[i].size) {
+			fprintf(stderr, "Invalid size in partition %d!\n", i);
+			return -1;
+		}
+		pte[i].active = ((i + 1) == active) ? 0x80 : 0;
+		pte[i].type = parts[i].type;
+		start = sect + sectors;
+		if (kb_align != 0)
+			start = round_to_kb(start);
+		pte[i].start = cpu_to_le16(start);
+		sect = start + parts[i].size * 2;
+		if (kb_align == 0)
+			sect = round_to_cyl(sect);
+		pte[i].length = cpu_to_le16(len = sect - start);
+		to_chs(start, pte[i].chs_start);
+		to_chs(start + len - 1, pte[i].chs_end);
+		if (verbose)
+			fprintf(stderr, "Partition %d: start=%ld, end=%ld, size=%ld\n", i, (long) start * 512, ((long) start + (long) len) * 512, (long) len * 512);
+		printf("%ld\n", ((long) start * 512));
+		printf("%ld\n", ((long) len * 512));
+	}
+
+	if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0) {
+		fprintf(stderr, "Can't open output file '%s'\n",filename);
+		return -1;
+	}
+
+	lseek(fd, 440, SEEK_SET);
+	if (write(fd, &signature, sizeof(signature)) != sizeof(signature)) {
+		fprintf(stderr, "write failed.\n");
+		goto fail;
+	}
+
+	lseek(fd, 446, SEEK_SET);
+	if (write(fd, pte, sizeof(struct pte) * 4) != sizeof(struct pte) * 4) {
+		fprintf(stderr, "write failed.\n");
+		goto fail;
+	}
+	lseek(fd, 510, SEEK_SET);
+	if (write(fd, "\x55\xaa", 2) != 2) {
+		fprintf(stderr, "write failed.\n");
+		goto fail;
+	}
+	
+	ret = 0;
+fail:
+	close(fd);
+	return ret;
+}
+
+static void usage(char *prog)
+{
+	fprintf(stderr,	"Usage: %s [-v] -h <heads> -s <sectors> -o <outputfile> [-a 0..4] [-l <align kB>] [[-t <type>] -p <size>...] \n", prog);
+	exit(1);
+}
+
+int main (int argc, char **argv)
+{
+	char type = 0x83;
+	int ch;
+	int part = 0;
+	uint32_t signature = 0x5452574F; /* 'OWRT' */
+
+	while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vl:S:")) != -1) {
+		switch (ch) {
+		case 'o':
+			filename = optarg;
+			break;
+		case 'v':
+			verbose++;
+			break;
+		case 'h':
+			heads = (int) strtoul(optarg, NULL, 0);
+			break;
+		case 's':
+			sectors = (int) strtoul(optarg, NULL, 0);
+			break;
+		case 'p':
+			if (part > 3) {
+				fprintf(stderr, "Too many partitions\n");
+				exit(1);
+			}
+			parts[part].size = to_kbytes(optarg);
+			parts[part++].type = type;
+			break;
+		case 't':
+			type = (char) strtoul(optarg, NULL, 16);
+			break;
+		case 'a':
+			active = (int) strtoul(optarg, NULL, 0);
+			if ((active < 0) || (active > 4))
+				active = 0;
+			break;
+		case 'l':
+			kb_align = (int) strtoul(optarg, NULL, 0) * 2;
+			break;
+		case 'S':
+			signature = strtoul(optarg, NULL, 0);
+			break;
+		case '?':
+		default:
+			usage(argv[0]);
+		}
+	}
+	argc -= optind;
+	if (argc || (heads <= 0) || (sectors <= 0) || !filename) 
+		usage(argv[0]);
+
+	return gen_ptable(signature, part);
+}
diff --git a/trunk/tools/firmware-utils/src/seama.c b/trunk/tools/firmware-utils/src/seama.c
new file mode 100644
index 00000000..944ed3a4
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/seama.c
@@ -0,0 +1,529 @@
+/* vi: set sw=4 ts=4: */
+/*
+ *	Copyright (C) 2008, Alpha Networks, Inc.
+ *	Created by David Hsieh <david_hsieh@alphanetworks.com>
+ *	All right reserved.
+ *
+ *	(SEA)ttle i(MA)ge is the image which used in project seattle.
+ *
+ *	Redistribution and use in source and binary forms, with or
+ *	without modification, are permitted provided that the following
+ *	conditions are met:
+ *
+ *	1.	Redistributions of source code must retain the above
+ *		copyright notice, this list of conditions and the following
+ *		disclaimer.
+ *
+ *	2.	Redistributions in binary form must reproduce the above
+ *		copyright notice, this list of conditions and the following
+ *		disclaimer in the documentation and/or other materials
+ *		provided with the distribution.
+ *
+ *	3.	The name of the author may not be used to endorse or promote
+ *		products derived from this software without specific prior
+ *		written permission.
+ *
+ *	THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+ *	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ *	PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR
+ *	BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *	EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *	TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ *	IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ *	THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+#include <arpa/inet.h>
+
+#include "md5.h"
+#include "seama.h"
+
+#define PROGNAME			"seama"
+#define VERSION				"0.20"
+#define MAX_SEAMA_META_SIZE	1024
+#define MAX_META			128
+#define MAX_IMAGE			128
+
+extern int optind;
+extern char * optarg;
+
+static int		o_verbose = 0;		/* verbose mode. */
+static char *	o_dump = NULL;		/* Seama file to dump. */
+static char *	o_seal = NULL;		/* Seal the input images when file name exist. */
+static char *	o_extract = NULL;	/* Extract the seama file. */
+static char *	o_images[MAX_IMAGE];/* The image files to pack or seal */
+static int		o_isize = 0;		/* number of images */
+static char *	o_meta[MAX_META];	/* meta data array */
+static int		o_msize = 0;		/* size of meta array */
+
+static void verbose(const char * format, ...)
+{
+	va_list marker;
+	if (o_verbose)
+	{
+		va_start(marker, format);
+		vfprintf(stdout, format, marker);
+		va_end(marker);
+	}
+}
+
+static void cleanup_exit(int exit_code)
+{
+	verbose("%s: exit with code %d\n", PROGNAME, exit_code);
+	exit(exit_code);
+}
+
+static void show_usage(int exit_code)
+{
+	printf(	PROGNAME " version " VERSION "\n"
+			"usage: " PROGNAME " [OPTIONS]\n"
+			"  -h                 show this help message.\n"
+			"  -v                 verbose mode.\n"
+			"  -m {META data}     META data.\n"
+			"  -d {file}          dump the info of the seama file.\n"
+			"  -i {input file}    image file name.\n"
+			"  -s {file}          Seal the images to the seama file.\n"
+			"  -x {seama file}    Extract the seama file.\n"
+			"\n"
+			"  SEAMA can pack the input file (with -i) into a seama file.\n"
+			"  ex: seama -i target.file\n"
+			"  SEAMA can also seal multiple seama files into a single seama file.\n"
+			"  ex: seama -s final.file -i taget1.seama -i target2.seama\n"
+			"  To extract the raw image from SEAMA, you need to specify the meta.\n"
+			"  The first image match the specified meta will be extract to\n"
+			"  the output file which was specified with '-x'.\n"
+			"  ex: seama -x output -i seama.image -m file=sealpac\n"
+			);
+	cleanup_exit(exit_code);
+}
+
+static int parse_args(int argc, char * argv[])
+{
+	int opt;
+
+	while ((opt = getopt(argc, argv, "hvd:s:i:m:x:")) > 0)
+	{
+		switch (opt)
+		{
+		default:	show_usage(-1); break;
+		case 'h':	show_usage(0); break;
+		case 'v':	o_verbose++; break;
+		case 'd':	o_dump = optarg; break;
+		case 's':	o_seal = optarg; break;
+		case 'x':	o_extract = optarg; break;
+		case 'i':
+			if (o_isize < MAX_IMAGE) o_images[o_isize++] = optarg;
+			else printf("Exceed the maximum acceptable image files.!\n");
+			break;
+		case 'm':
+			if (o_msize < MAX_META) o_meta[o_msize++] = optarg;
+			else printf("Exceed the maximum acceptable META data.!\n");
+			break;
+		}
+	}
+	return 0;
+}
+
+/*******************************************************************/
+
+static size_t calculate_digest(FILE * fh, size_t size, uint8_t * digest)
+{
+	MD5_CTX ctx;
+	size_t bytes_left, bytes_read, i;
+	uint8_t buf[MAX_SEAMA_META_SIZE];
+
+	bytes_left = size ? size : sizeof(buf);
+	bytes_read = 0;
+
+	MD5_Init(&ctx);
+	while (!feof(fh) && !ferror(fh) && bytes_left > 0)
+	{
+		i = bytes_left < sizeof(buf) ? bytes_left : sizeof(buf);
+		i = fread(buf, sizeof(char), i, fh);
+		if (i > 0)
+		{
+			MD5_Update(&ctx, buf, i);
+			bytes_read += i;
+		}
+		if (size) bytes_left -= i;
+	}
+	MD5_Final(digest, &ctx);
+	return bytes_read;
+}
+
+#define READ_BUFF_SIZE 8*1024
+static size_t copy_file(FILE * to, FILE * from)
+{
+	size_t i, fsize = 0;
+	uint8_t buf[READ_BUFF_SIZE];
+
+	while (!feof(from) && !ferror(from))
+	{
+		i = fread(buf, sizeof(uint8_t), READ_BUFF_SIZE, from);
+		if (i > 0)
+		{
+			fsize += i;
+			fwrite(buf, sizeof(uint8_t), i, to);
+		}
+	}
+	return fsize;
+}
+
+static int verify_seama(const char * fname, int msg)
+{
+	FILE * fh = NULL;
+	struct stat st;
+	seamahdr_t shdr;
+	uint8_t checksum[16];
+	uint8_t digest[16];
+	uint8_t buf[MAX_SEAMA_META_SIZE];
+	size_t msize, isize, i;
+	int ret = -1;
+
+#define ERRBREAK(fmt, args...) { if (msg) printf(fmt, ##args); break; }
+
+	do
+	{
+		if (stat(fname, &st) < 0)				ERRBREAK("Unable to get the info of '%s'\n",fname);
+		if ((fh = fopen(fname, "r+"))==NULL)	ERRBREAK("Unable to open '%s' for reading!\n",fname);
+
+		/* Dump SEAMA header */
+		if (msg) printf("FILE - %s (%d bytes)\n", fname, (int)st.st_size);
+
+		/* SEAMA */
+		while (!feof(fh) && !ferror(fh))
+		{
+			/* read header */
+			if (fread(&shdr, sizeof(shdr), 1, fh) != 1) break;
+
+			/* Check the magic number */
+			if (shdr.magic != htonl(SEAMA_MAGIC)) ERRBREAK("Invalid SEAMA magic. Probably no more SEAMA!\n");
+
+			/* Get the size */
+			isize = ntohl(shdr.size);
+			msize = ntohs(shdr.metasize);
+
+			/* The checksum exist only if size is greater than zero. */
+			if (isize > 0)
+			{
+				if (fread(checksum, sizeof(checksum), 1, fh) != 1)
+					ERRBREAK("Error reading checksum !\n");
+			}
+
+			/* Check the META size. */
+			if (msize > sizeof(buf)) ERRBREAK("META data in SEAMA header is too large!\n");
+
+			/* Read META data. */
+			if (fread(buf, sizeof(char), msize, fh) != msize)
+				ERRBREAK("Unable to read SEAMA META data!\n");
+
+			/* dump header */
+			if (msg)
+			{
+				printf("SEAMA ==========================================\n");
+				printf("  magic      : %08x\n", ntohl(shdr.magic));
+				printf("  meta size  : %d bytes\n", msize);
+				for (i=0; i<msize; i+=(strlen((const char *)&buf[i])+1))
+					printf("  meta data  : %s\n", &buf[i]);
+				printf("  image size : %d bytes\n", isize);
+			}
+
+			/* verify checksum */
+			if (isize > 0)
+			{
+				if (msg)
+				{
+					printf("  checksum   : ");
+					for (i=0; i<16; i++) printf("%02X", checksum[i]);
+					printf("\n");
+				}
+
+				/* Calculate the checksum */
+				calculate_digest(fh, isize, digest);
+				if (msg)
+				{
+					printf("  digest     : ");
+					for (i=0; i<16; i++) printf("%02X", digest[i]);
+					printf("\n");
+				}
+
+				if (memcmp(checksum, digest, 16)!=0) ERRBREAK("!!ERROR!! checksum error !!\n");
+				ret = 0;
+			}
+		}
+		if (msg) printf("================================================\n");
+	} while (0);
+	if (fh) fclose(fh);
+	return ret;
+}
+
+static size_t write_seama_header(FILE * fh, char * meta[], size_t msize, size_t size)
+{
+	seamahdr_t shdr;
+	size_t i;
+	uint16_t metasize = 0;
+
+	/* Calculate the META size */
+	for (i=0; i<msize; i++) metasize += (strlen(meta[i]) + 1);
+	//+++ let meta data end on 4 alignment by siyou. 2010/3/1 03:58pm
+	metasize = ((metasize+3)/4)*4;
+	verbose("SEAMA META : %d bytes\n", metasize);
+
+	/* Fill up the header, all the data endian should be network byte order. */
+	shdr.magic		= htonl(SEAMA_MAGIC);
+	shdr.reserved	= 0;
+	shdr.metasize	= htons(metasize);
+	shdr.size		= htonl(size);
+
+	/* Write the header */
+	return fwrite(&shdr, sizeof(seamahdr_t), 1, fh);
+}
+
+static size_t write_checksum(FILE * fh, uint8_t * checksum)
+{
+	return fwrite(checksum, sizeof(uint8_t), 16, fh);
+}
+
+static size_t write_meta_data(FILE * fh, char * meta[], size_t size)
+{
+	size_t i,j;
+	size_t ret = 0;
+
+	for (i=0; i<size; i++)
+	{
+		verbose("SEAMA META data : %s\n", meta[i]);
+		j = fwrite(meta[i], sizeof(char), strlen(meta[i])+1, fh);
+		if (j != strlen(meta[i])+1) return 0;
+		ret += j;
+	}
+	//+++ let meta data end on 4 alignment by siyou. 2010/3/1 03:58pm
+	j = ((ret+3)/4)*4;
+	for ( ; ret < j; ret++)
+		fwrite("", sizeof(char), 1, fh);
+
+	return ret;
+}
+
+/*******************************************************************/
+
+static void dump_seama(const char * fname)
+{
+	verify_seama(fname, 1);
+}
+
+static void seal_files(const char * file)
+{
+	FILE * fh;
+	FILE * ifh;
+	size_t i;
+
+	/* Each image should be seama. */
+	for (i = 0; i < o_isize; i++)
+	{
+		if (verify_seama(o_images[i], 0) < 0)
+		{
+			printf("'%s' is not a seama file !\n",o_images[i]);
+			return;
+		}
+	}
+
+	/* Open file for write */
+	fh = fopen(file, "w+");
+	if (fh)
+	{
+		/* Write the header. */
+		write_seama_header(fh, o_meta, o_msize, 0);
+		write_meta_data(fh, o_meta, o_msize);
+
+		/* Write image files */
+		for (i=0; i<o_isize; i++)
+		{
+			ifh = fopen(o_images[i], "r+");
+			if (ifh)
+			{
+				copy_file(fh, ifh);
+				fclose(ifh);
+			}
+		}
+
+		fclose(fh);
+	}
+}
+
+static void pack_files(void)
+{
+	FILE * fh;
+	FILE * ifh;
+	size_t i, fsize;
+	char filename[512];
+	uint8_t digest[16];
+
+	for (i=0; i<o_isize; i++)
+	{
+		/* Open the input file. */
+		ifh = fopen(o_images[i], "r+");
+		if (ifh)
+		{
+			fsize = calculate_digest(ifh, 0, digest);
+			verbose("file size (%s) : %d\n", o_images[i], fsize);
+			rewind(ifh);
+
+			/* Open the output file. */
+			sprintf(filename, "%s.seama", o_images[i]);
+			fh = fopen(filename, "w+");
+			if (fh)
+			{
+				write_seama_header(fh, o_meta, o_msize, fsize);
+				write_checksum(fh, digest);
+				write_meta_data(fh, o_meta, o_msize);
+				copy_file(fh, ifh);
+				fclose(fh);
+			}
+			fclose(ifh);
+		}
+		else
+		{
+			printf("Unable to open image file '%s'\n",o_images[i]);
+		}
+	}
+}
+
+/**************************************************************************/
+
+static int match_meta(const char * meta, size_t size)
+{
+	size_t i, j;
+	int match;
+
+	for (i = 0; i < o_msize; i++)
+	{
+		for (match = 0, j = 0; j < size; j += (strlen(&meta[j])+1))
+			if (strcmp(&meta[j], o_meta[i])==0) { match++; break; }
+		if (!match) return 0;
+	}
+	return 1;
+}
+
+
+static void extract_file(const char * output)
+{
+	FILE * ifh = NULL;
+	FILE * ofh = NULL;
+	size_t msize, isize, i, m;
+	seamahdr_t shdr;
+	uint8_t buf[MAX_SEAMA_META_SIZE];
+	int done = 0;
+
+	/* We need meta for searching the target image. */
+	if (o_msize == 0)
+	{
+		printf("SEAMA: need meta for searching image.\n");
+		return;
+	}
+
+	/* Walk through each input file */
+	for (i = 0; i < o_isize; i++)
+	{
+		/* verify the input file */
+		if (verify_seama(o_images[i], 0) < 0)
+		{
+			printf("SEAMA: '%s' is not a seama file !\n", o_images[i]);
+			continue;
+		}
+		/* open the input file */
+		ifh  = fopen(o_images[i], "r");
+		if (!ifh) continue;
+		/* read file */
+		while (!feof(ifh) && !ferror(ifh))
+		{
+			/* read header */
+			fread(&shdr, sizeof(shdr), 1, ifh);
+			if (shdr.magic != htonl(SEAMA_MAGIC)) break;
+			/* Get the size */
+			isize = ntohl(shdr.size);
+			msize = ntohs(shdr.metasize);
+			if (isize == 0)
+			{
+				while (msize > 0)
+				{
+					m = fread(buf, sizeof(char), (msize < MAX_SEAMA_META_SIZE) ? msize : MAX_SEAMA_META_SIZE, ifh);
+					if (m <= 0) break;
+					msize -= m;
+				}
+				continue;
+			}
+			/* read checksum */
+			fread(buf, sizeof(char), 16, ifh);
+			if (msize > 0)
+			{
+				/* read META */
+				fread(buf, sizeof(char), msize, ifh);
+				if (match_meta((const char *)buf, msize))
+				{
+					printf("SEAMA: found image @ '%s', image size: %d\n", o_images[i], isize);
+					/* open output file */
+					ofh = fopen(output, "w");
+					if (!ofh) printf("SEAMA: unable to open '%s' for writting.\n",output);
+					else
+					{
+						while (isize > 0)
+						{
+							m = fread(buf, sizeof(char), (isize < MAX_SEAMA_META_SIZE) ? isize : MAX_SEAMA_META_SIZE, ifh);
+							if (m <= 0) break;
+							fwrite(buf, sizeof(char), m, ofh);
+							isize -= m;
+						}
+						fclose(ofh);
+					}
+					done++;
+					break;
+				}
+			}
+			while (isize > 0)
+			{
+				m = fread(buf, sizeof(char), (isize < MAX_SEAMA_META_SIZE) ? isize : MAX_SEAMA_META_SIZE, ifh);
+				if (m <= 0) break;
+				isize -= m;
+			}
+		}
+		/* close the file. */
+		fclose(ifh);
+		if (done) break;
+	}
+	return;
+}
+
+/*******************************************************************/
+#ifdef RGBIN_BOX
+int seama_main(int argc, char * argv[], char * env[])
+#else
+int main(int argc, char * argv[], char * env[])
+#endif
+{
+	verbose("SEAMA version " VERSION "\n");
+
+	/* parse the arguments */
+	if (parse_args(argc, argv) < 0) show_usage(9);
+
+	/* Do the works */
+	if		(o_dump)	dump_seama(o_dump);
+	else if (o_seal)	seal_files(o_seal);
+	else if	(o_extract)	extract_file(o_extract);
+	else				pack_files();
+
+	cleanup_exit(0);
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/seama.h b/trunk/tools/firmware-utils/src/seama.h
new file mode 100644
index 00000000..02683b6e
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/seama.h
@@ -0,0 +1,108 @@
+/* vi: set sw=4 ts=4: */
+/*
+ *	(SEA)ttle i(MA)ge is the image which used in project seattle.
+ *
+ *	Created by David Hsieh <david_hsieh@alphanetworks.com>
+ *	Copyright (C) 2008-2009 Alpha Networks, Inc.
+ *
+ *	This file is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either'
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	The GNU C Library is distributed in the hope that it will be useful,'
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with the GNU C Library; if not, write to the Free
+ *	Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *	02111-1307 USA.
+ */
+
+#ifndef __SEAMA_HEADER_FILE__
+#define __SEAMA_HEADER_FILE__
+
+#include <stdint.h>
+
+#define SEAMA_MAGIC		0x5EA3A417
+
+/*
+ *	SEAMA looks like the following map.
+ *	All the data of the header should be in network byte order.
+ *
+ *  +-------------+-------------+------------
+ *	| SEAMA magic               |     ^
+ *  +-------------+-------------+     |
+ *	| reserved    | meta size   |     |
+ *  +-------------+-------------+   header
+ *	| image size (0 bytes)      |     |
+ *  +-------------+-------------+     |
+ *	~ Meta data                 ~     v
+ *  +-------------+-------------+------------
+ *	| SEAMA magic               |   ^     ^
+ *  +-------------+-------------+   |     |
+ *	| reserved    | meta size   |   |     |
+ *  +-------------+-------------+   |     |
+ *	| image size                |   |     |
+ *  +-------------+-------------+ header  |
+ *	|                           |   |     |
+ *	| 16 bytes of MD5 digest    |   |     |
+ *	|                           |   |     |
+ *	|                           |   |     |
+ *  +-------------+-------------+   |     |
+ *	~ Meta data                 ~   v     |
+ *  +-------------+-------------+-------  |
+ *	|                           |         |
+ *	| Image of the 1st entity   |         |
+ *	~                           ~ 1st entity
+ *	|                           |         |
+ *	|                           |         v
+ *  +-------------+-------------+-------------
+ *	| SEAMA magic               |   ^     ^
+ *  +-------------+-------------+   |     |
+ *	| reserved    | meta size   |   |     |
+ *  +-------------+-------------+   |     |
+ *	| image size                |   |     |
+ *  +-------------+-------------+ header  |
+ *	|                           |   |     |
+ *	| 16 bytes of MD5 digest    |   |     |
+ *	|                           |   |     |
+ *	|                           |   |     |
+ *  +-------------+-------------+   |     |
+ *	~ Meta data                 ~   v     |
+ *  +-------------+-------------+-------  |
+ *	|                           |         |
+ *	| Image of the 2nd entity   |         |
+ *	~                           ~ 2nd entity
+ *	|                           |         |
+ *	|                           |         v
+ *  +-------------+-------------+-------------
+ */
+
+
+/*
+ *	SEAMA header
+ *
+ *	|<-------- 32 bits -------->|
+ *  +-------------+-------------+
+ *	| SEAMA magic               |
+ *  +-------------+-------------+
+ *	| reserved    | meta size   |
+ *  +-------------+-------------+
+ *	| image size                |
+ *  +-------------+-------------+
+ */
+/* seama header */
+typedef struct seama_hdr	seamahdr_t;
+struct seama_hdr
+{
+	uint32_t	magic;			/* should always be SEAMA_MAGIC. */
+	uint16_t	reserved;		/* reserved for  */
+	uint16_t	metasize;		/* size of the META data */
+	uint32_t	size;			/* size of the image */
+} __attribute__ ((packed));
+
+
+#endif
diff --git a/trunk/tools/firmware-utils/src/sha1.c b/trunk/tools/firmware-utils/src/sha1.c
new file mode 100644
index 00000000..3ab13329
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/sha1.c
@@ -0,0 +1,443 @@
+/*
+ *  FIPS-180-1 compliant SHA-1 implementation
+ *
+ *  Copyright (C) 2003-2006  Christophe Devine
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+/*
+ *  The SHA-1 standard was published by NIST in 1993.
+ *
+ *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
+ */
+
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+#include <string.h>
+#include <stdio.h>
+
+#include "sha1.h"
+
+/* 
+ * 32-bit integer manipulation macros (big endian)
+ */
+#ifndef GET_UINT32_BE
+#define GET_UINT32_BE(n,b,i)                    \
+{                                               \
+    (n) = ( (ulong) (b)[(i)    ] << 24 )        \
+        | ( (ulong) (b)[(i) + 1] << 16 )        \
+        | ( (ulong) (b)[(i) + 2] <<  8 )        \
+        | ( (ulong) (b)[(i) + 3]       );       \
+}
+#endif
+#ifndef PUT_UINT32_BE
+#define PUT_UINT32_BE(n,b,i)                    \
+{                                               \
+    (b)[(i)    ] = (uchar) ( (n) >> 24 );       \
+    (b)[(i) + 1] = (uchar) ( (n) >> 16 );       \
+    (b)[(i) + 2] = (uchar) ( (n) >>  8 );       \
+    (b)[(i) + 3] = (uchar) ( (n)       );       \
+}
+#endif
+
+/*
+ * Core SHA-1 functions
+ */
+void sha1_starts( sha1_context *ctx )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
+    ctx->state[4] = 0xC3D2E1F0;
+}
+
+void sha1_process( sha1_context *ctx, uchar data[64] )
+{
+    ulong temp, W[16], A, B, C, D, E;
+
+    GET_UINT32_BE( W[0],  data,  0 );
+    GET_UINT32_BE( W[1],  data,  4 );
+    GET_UINT32_BE( W[2],  data,  8 );
+    GET_UINT32_BE( W[3],  data, 12 );
+    GET_UINT32_BE( W[4],  data, 16 );
+    GET_UINT32_BE( W[5],  data, 20 );
+    GET_UINT32_BE( W[6],  data, 24 );
+    GET_UINT32_BE( W[7],  data, 28 );
+    GET_UINT32_BE( W[8],  data, 32 );
+    GET_UINT32_BE( W[9],  data, 36 );
+    GET_UINT32_BE( W[10], data, 40 );
+    GET_UINT32_BE( W[11], data, 44 );
+    GET_UINT32_BE( W[12], data, 48 );
+    GET_UINT32_BE( W[13], data, 52 );
+    GET_UINT32_BE( W[14], data, 56 );
+    GET_UINT32_BE( W[15], data, 60 );
+
+#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
+
+#define R(t)                                            \
+(                                                       \
+    temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^     \
+           W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],      \
+    ( W[t & 0x0F] = S(temp,1) )                         \
+)
+
+#define P(a,b,c,d,e,x)                                  \
+{                                                       \
+    e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
+}
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+
+#define F(x,y,z) (z ^ (x & (y ^ z)))
+#define K 0x5A827999
+
+    P( A, B, C, D, E, W[0]  );
+    P( E, A, B, C, D, W[1]  );
+    P( D, E, A, B, C, W[2]  );
+    P( C, D, E, A, B, W[3]  );
+    P( B, C, D, E, A, W[4]  );
+    P( A, B, C, D, E, W[5]  );
+    P( E, A, B, C, D, W[6]  );
+    P( D, E, A, B, C, W[7]  );
+    P( C, D, E, A, B, W[8]  );
+    P( B, C, D, E, A, W[9]  );
+    P( A, B, C, D, E, W[10] );
+    P( E, A, B, C, D, W[11] );
+    P( D, E, A, B, C, W[12] );
+    P( C, D, E, A, B, W[13] );
+    P( B, C, D, E, A, W[14] );
+    P( A, B, C, D, E, W[15] );
+    P( E, A, B, C, D, R(16) );
+    P( D, E, A, B, C, R(17) );
+    P( C, D, E, A, B, R(18) );
+    P( B, C, D, E, A, R(19) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0x6ED9EBA1
+
+    P( A, B, C, D, E, R(20) );
+    P( E, A, B, C, D, R(21) );
+    P( D, E, A, B, C, R(22) );
+    P( C, D, E, A, B, R(23) );
+    P( B, C, D, E, A, R(24) );
+    P( A, B, C, D, E, R(25) );
+    P( E, A, B, C, D, R(26) );
+    P( D, E, A, B, C, R(27) );
+    P( C, D, E, A, B, R(28) );
+    P( B, C, D, E, A, R(29) );
+    P( A, B, C, D, E, R(30) );
+    P( E, A, B, C, D, R(31) );
+    P( D, E, A, B, C, R(32) );
+    P( C, D, E, A, B, R(33) );
+    P( B, C, D, E, A, R(34) );
+    P( A, B, C, D, E, R(35) );
+    P( E, A, B, C, D, R(36) );
+    P( D, E, A, B, C, R(37) );
+    P( C, D, E, A, B, R(38) );
+    P( B, C, D, E, A, R(39) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) ((x & y) | (z & (x | y)))
+#define K 0x8F1BBCDC
+
+    P( A, B, C, D, E, R(40) );
+    P( E, A, B, C, D, R(41) );
+    P( D, E, A, B, C, R(42) );
+    P( C, D, E, A, B, R(43) );
+    P( B, C, D, E, A, R(44) );
+    P( A, B, C, D, E, R(45) );
+    P( E, A, B, C, D, R(46) );
+    P( D, E, A, B, C, R(47) );
+    P( C, D, E, A, B, R(48) );
+    P( B, C, D, E, A, R(49) );
+    P( A, B, C, D, E, R(50) );
+    P( E, A, B, C, D, R(51) );
+    P( D, E, A, B, C, R(52) );
+    P( C, D, E, A, B, R(53) );
+    P( B, C, D, E, A, R(54) );
+    P( A, B, C, D, E, R(55) );
+    P( E, A, B, C, D, R(56) );
+    P( D, E, A, B, C, R(57) );
+    P( C, D, E, A, B, R(58) );
+    P( B, C, D, E, A, R(59) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0xCA62C1D6
+
+    P( A, B, C, D, E, R(60) );
+    P( E, A, B, C, D, R(61) );
+    P( D, E, A, B, C, R(62) );
+    P( C, D, E, A, B, R(63) );
+    P( B, C, D, E, A, R(64) );
+    P( A, B, C, D, E, R(65) );
+    P( E, A, B, C, D, R(66) );
+    P( D, E, A, B, C, R(67) );
+    P( C, D, E, A, B, R(68) );
+    P( B, C, D, E, A, R(69) );
+    P( A, B, C, D, E, R(70) );
+    P( E, A, B, C, D, R(71) );
+    P( D, E, A, B, C, R(72) );
+    P( C, D, E, A, B, R(73) );
+    P( B, C, D, E, A, R(74) );
+    P( A, B, C, D, E, R(75) );
+    P( E, A, B, C, D, R(76) );
+    P( D, E, A, B, C, R(77) );
+    P( C, D, E, A, B, R(78) );
+    P( B, C, D, E, A, R(79) );
+
+#undef K
+#undef F
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+}
+
+void sha1_update( sha1_context *ctx, uchar *input, uint length )
+{
+    ulong left, fill;
+
+    if( ! length ) return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += length;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if( ctx->total[0] < length )
+        ctx->total[1]++;
+
+    if( left && length >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left),
+                (void *) input, fill );
+        sha1_process( ctx, ctx->buffer );
+        length -= fill;
+        input  += fill;
+        left = 0;
+    }
+
+    while( length >= 64 )
+    {
+        sha1_process( ctx, input );
+        length -= 64;
+        input  += 64;
+    }
+
+    if( length )
+    {
+        memcpy( (void *) (ctx->buffer + left),
+                (void *) input, length );
+    }
+}
+
+static uchar sha1_padding[64] =
+{
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+void sha1_finish( sha1_context *ctx, uchar digest[20] )
+{
+    ulong last, padn;
+    ulong high, low;
+    uchar msglen[8];
+
+    high = ( ctx->total[0] >> 29 )
+         | ( ctx->total[1] <<  3 );
+    low  = ( ctx->total[0] <<  3 );
+
+    PUT_UINT32_BE( high, msglen, 0 );
+    PUT_UINT32_BE( low,  msglen, 4 );
+
+    last = ctx->total[0] & 0x3F;
+    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
+
+    sha1_update( ctx, sha1_padding, padn );
+    sha1_update( ctx, msglen, 8 );
+
+    PUT_UINT32_BE( ctx->state[0], digest,  0 );
+    PUT_UINT32_BE( ctx->state[1], digest,  4 );
+    PUT_UINT32_BE( ctx->state[2], digest,  8 );
+    PUT_UINT32_BE( ctx->state[3], digest, 12 );
+    PUT_UINT32_BE( ctx->state[4], digest, 16 );
+}
+
+/*
+ * Output SHA-1(file contents), returns 0 if successful.
+ */
+int sha1_file( char *filename, uchar digest[20] )
+{
+    FILE *f;
+    size_t n;
+    sha1_context ctx;
+    uchar buf[1024];
+
+    if( ( f = fopen( filename, "rb" ) ) == NULL )
+        return( 1 );
+
+    sha1_starts( &ctx );
+
+    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+        sha1_update( &ctx, buf, (uint) n );
+
+    sha1_finish( &ctx, digest );
+
+    fclose( f );
+    return( 0 );
+}
+
+/*
+ * Output SHA-1(buf)
+ */
+void sha1_csum( uchar *buf, uint buflen, uchar digest[20] )
+{
+    sha1_context ctx;
+
+    sha1_starts( &ctx );
+    sha1_update( &ctx, buf, buflen );
+    sha1_finish( &ctx, digest );
+}
+
+/*
+ * Output HMAC-SHA-1(key,buf)
+ */
+void sha1_hmac( uchar *key, uint keylen, uchar *buf, uint buflen,
+                uchar digest[20] )
+{
+    uint i;
+    sha1_context ctx;
+    uchar k_ipad[64];
+    uchar k_opad[64];
+    uchar tmpbuf[20];
+
+    memset( k_ipad, 0x36, 64 );
+    memset( k_opad, 0x5C, 64 );
+
+    for( i = 0; i < keylen; i++ )
+    {
+        if( i >= 64 ) break;
+
+        k_ipad[i] ^= key[i];
+        k_opad[i] ^= key[i];
+    }
+
+    sha1_starts( &ctx );
+    sha1_update( &ctx, k_ipad, 64 );
+    sha1_update( &ctx, buf, buflen );
+    sha1_finish( &ctx, tmpbuf );
+
+    sha1_starts( &ctx );
+    sha1_update( &ctx, k_opad, 64 );
+    sha1_update( &ctx, tmpbuf, 20 );
+    sha1_finish( &ctx, digest );
+
+    memset( k_ipad, 0, 64 );
+    memset( k_opad, 0, 64 );
+    memset( tmpbuf, 0, 20 );
+    memset( &ctx, 0, sizeof( sha1_context ) );
+}
+
+#ifdef SELF_TEST
+/* 
+ * FIPS-180-1 test vectors
+ */
+static char *sha1_test_str[3] = 
+{
+    "abc",
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+    NULL
+};
+
+static uchar sha1_test_sum[3][20] =
+{
+    { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E,
+      0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D },
+    { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE,
+      0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 },
+    { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E,
+      0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }
+};
+
+/*
+ * Checkup routine
+ */
+int sha1_self_test( void )
+{
+    int i, j;
+    uchar buf[1000];
+    uchar sha1sum[20];
+    sha1_context ctx;
+
+    for( i = 0; i < 3; i++ )
+    {
+        printf( "  SHA-1 test #%d: ", i + 1 );
+
+        sha1_starts( &ctx );
+
+        if( i < 2 )
+            sha1_update( &ctx, (uchar *) sha1_test_str[i],
+                         strlen( sha1_test_str[i] ) );
+        else
+        {
+            memset( buf, 'a', 1000 );
+            for( j = 0; j < 1000; j++ )
+                sha1_update( &ctx, (uchar *) buf, 1000 );
+        }
+
+        sha1_finish( &ctx, sha1sum );
+
+        if( memcmp( sha1sum, sha1_test_sum[i], 20 ) != 0 )
+        {
+            printf( "failed\n" );
+            return( 1 );
+        }
+
+        printf( "passed\n" );
+    }
+
+    printf( "\n" );
+    return( 0 );
+}
+#else
+int sha1_self_test( void )
+{
+    printf( "SHA-1 self-test not available\n\n" );
+    return( 1 );
+}
+#endif
diff --git a/trunk/tools/firmware-utils/src/sha1.h b/trunk/tools/firmware-utils/src/sha1.h
new file mode 100644
index 00000000..425267a3
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/sha1.h
@@ -0,0 +1,57 @@
+#ifndef _SHA1_H
+#define _SHA1_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _STD_TYPES
+#define _STD_TYPES
+
+#define uchar   unsigned char
+#define uint    unsigned int
+#define ulong   unsigned long int
+
+#endif
+
+typedef struct
+{
+    ulong total[2];
+    ulong state[5];
+    uchar buffer[64];
+}
+sha1_context;
+
+/*
+ * Core SHA-1 functions
+ */
+void sha1_starts( sha1_context *ctx );
+void sha1_update( sha1_context *ctx, uchar *input, uint length );
+void sha1_finish( sha1_context *ctx, uchar digest[20] );
+
+/*
+ * Output SHA-1(file contents), returns 0 if successful.
+ */
+int sha1_file( char *filename, uchar digest[20] );
+
+/*
+ * Output SHA-1(buf)
+ */
+void sha1_csum( uchar *buf, uint buflen, uchar digest[20] );
+
+/*
+ * Output HMAC-SHA-1(key,buf)
+ */
+void sha1_hmac( uchar *key, uint keylen, uchar *buf, uint buflen,
+                uchar digest[20] );
+
+/*
+ * Checkup routine
+ */
+int sha1_self_test( void );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* sha1.h */
diff --git a/trunk/tools/firmware-utils/src/spw303v.c b/trunk/tools/firmware-utils/src/spw303v.c
new file mode 100644
index 00000000..ae34a1eb
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/spw303v.c
@@ -0,0 +1,242 @@
+/*
+ * spw303v.c - partially based on OpenWrt's imagetag.c and addpattern.c
+ *
+ * Copyright (C) 2011  Jonas Gorski <jonas.gorski@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#define IMAGE_LEN 10                   /* Length of Length Field */
+#define ADDRESS_LEN 12                 /* Length of Address field */
+#define TAGID_LEN  6                   /* Length of tag ID */
+#define TAGINFO_LEN 20                 /* Length of vendor information field in tag */
+#define TAGVER_LEN 4                   /* Length of Tag Version */
+#define TAGLAYOUT_LEN 4                /* Length of FlashLayoutVer */
+
+
+struct spw303v_tag
+{
+    unsigned char tagVersion[4];       // tag version.  Will be 2 here.
+    unsigned char signiture_1[20];         		 // text line for company info
+    unsigned char signiture_2[14];        		// additional info (can be version number)
+    unsigned char chipId[6];			 		// chip id
+    unsigned char boardId[16];        		 	// board id
+    unsigned char bigEndian[2];           		// 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 certf1Address[ADDRESS_LEN];
+	unsigned char certf1Len[6];
+	unsigned char certf2Address[ADDRESS_LEN];
+	unsigned char certf2Len[6];
+	unsigned char certf3Address[ADDRESS_LEN];
+	unsigned char certf3Len[6];
+	unsigned char httpsFileSize[4];
+	unsigned char tr64FileSize[4];
+	unsigned char tr69FileSize[4];
+	unsigned char filesmap[4];
+
+    unsigned char imageSequence[4];     			// incrments everytime an image is flashed
+    unsigned char reserved[4];					    // reserved for later use
+    unsigned char imageCRC[4];                      // 216-219: CRC32 of images
+    unsigned char reserved2[16];                    // 220-235: Unused at present
+    unsigned char headerCRC[4];                     // 236-239: CRC32 of header excluding tagVersion
+    unsigned char reserved3[16];                    // 240-255: Unused at present
+};
+
+static uint32_t crc32tab[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
+};
+#define IMAGETAG_CRC_START			0xFFFFFFFF
+
+#define IMAGETAG_MAGIC1_TCOM		"AAAAAAAA Corporatio"
+
+static char fake_data[] = {
+        0x18, 0x21, 0x21, 0x18, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 ,0x18,
+        0x21, 0x24, 0x21, 0x1b, 0x18, 0x18, 0x24, 0x24, 0x18, 0x21, 0x21, 0x21,
+        0x21, 0x21, 0x21, 0x21, 0x1b, 0x18, 0x18, 0x24, 0x24, 0x21, 0x21, 0x21,
+        0x21, 0x21, 0x21, 0x21, 0x18, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x18,
+        0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x18, 0x21, 0x21,
+        0x21, 0x21, 0x21, 0x21,
+};
+
+
+uint32_t crc32(uint32_t crc, uint8_t *data, size_t len)
+{
+	while (len--)
+		crc = (crc >> 8) ^ crc32tab[(crc ^ *data++) & 0xFF];
+
+	return crc;
+}
+
+void fix_header(void *buf)
+{
+	struct spw303v_tag *tag = buf;
+	uint32_t crc;
+	/* Replace signature with custom t-com one */
+	memset(tag->signiture_1, 0, 20);
+	memcpy(tag->signiture_1, IMAGETAG_MAGIC1_TCOM, strlen(IMAGETAG_MAGIC1_TCOM));
+
+	/* Clear cert fields to remove information_* data */
+	memset(tag->certf1Address, 0, 74);
+
+	/* replace image crc with modified one */
+	crc = ntohl(*((uint32_t *)&tag->imageCRC));
+
+	crc = htonl(crc32(crc, fake_data, 64));
+
+	memcpy(tag->imageCRC, &crc, 4);
+
+	/* Update tag crc */
+	crc = htonl(crc32(IMAGETAG_CRC_START, buf, 236));
+	memcpy(tag->headerCRC, &crc, 4);
+}
+
+
+
+void usage(void) __attribute__ (( __noreturn__ ));
+
+void usage(void)
+{
+	fprintf(stderr, "Usage: spw303v [-i <inputfile>] [-o <outputfile>]\n");
+	exit(EXIT_FAILURE);
+}
+
+
+int main(int argc, char **argv)
+{
+	char buf[1024];	/* keep this at 1k or adjust garbage calc below */
+	FILE *in = stdin;
+	FILE *out = stdout;
+	char *ifn = NULL;
+	char *ofn = NULL;
+	int c;
+	int v0, v1, v2;
+	size_t n;
+	int first_block = 1;
+
+	uint32_t image_crc = IMAGETAG_CRC_START;
+
+	while ((c = getopt(argc, argv, "i:o:h")) != -1) {
+		switch (c) {
+			case 'i':
+				ifn = optarg;
+				break;
+			case 'o':
+				ofn = optarg;
+				break;
+			case 'h':
+			default:
+				usage();
+		}
+	}
+
+	if (optind != argc || optind == 1) {
+		fprintf(stderr, "illegal arg \"%s\"\n", argv[optind]);
+		usage();
+	}
+
+	if (ifn && !(in = fopen(ifn, "r"))) {
+		fprintf(stderr, "can not open \"%s\" for reading\n", ifn);
+		usage();
+	}
+
+	if (ofn && !(out = fopen(ofn, "w"))) {
+		fprintf(stderr, "can not open \"%s\" for writing\n", ofn);
+		usage();
+	}
+
+
+
+	while ((n = fread(buf, 1, sizeof(buf), in)) > 0) {
+		if (n < sizeof(buf)) {
+			if (ferror(in)) {
+			FREAD_ERROR:
+				fprintf(stderr, "fread error\n");
+				return EXIT_FAILURE;
+			}
+		}
+
+		if (first_block && n >= 256) {
+			fix_header(buf);
+			first_block = 0;
+		}
+
+		image_crc = crc32(image_crc, buf, n);
+
+		if (!fwrite(buf, n, 1, out)) {
+		FWRITE_ERROR:
+			fprintf(stderr, "fwrite error\n");
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (ferror(in)) {
+		goto FREAD_ERROR;
+	}
+
+	if (fflush(out)) {
+		goto FWRITE_ERROR;
+	}
+
+	fclose(in);
+	fclose(out);
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/firmware-utils/src/srec2bin.c b/trunk/tools/firmware-utils/src/srec2bin.c
new file mode 100644
index 00000000..1cffbaed
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/srec2bin.c
@@ -0,0 +1,524 @@
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+//Rev 0.1 Original
+// 8 Jan 2001  MJH  Added code to write data to Binary file
+//                  note: outputfile is name.bin, where name is first part
+//                  of input file.  ie tmp.rec -> tmp.bin
+//
+//   srec2bin <input SREC file> <Output Binary File> <If Present, Big Endian>
+//
+//   TAG   
+//        bit32u TAG_BIG     = 0xDEADBE42;
+//        bit32u TAG_LITTLE  = 0xFEEDFA42;
+//
+//  File Structure
+//
+//  TAG    :   32 Bits
+//  [DATA RECORDS]
+//
+//  Data Records Structure
+//
+//  LENGTH  :  32 Bits    <- Length of DATA, excludes ADDRESS and CHECKSUM
+//  ADDRESS :  32 Bits
+//  DATA    :  8 Bits * LENGTH
+//  CHECKSUM:  32 Bits    <-  0 - (Sum of Length --> End of Data)
+//
+//  Note : If Length == 0, Address will be Program Start
+//
+//
+//  
+//
+//
+
+#define MajRevNum 0
+#define MinRevNum 2
+
+
+#define EndianSwitch(x) ((x >> 24) | (x << 24) | ((x << 8) & (0x00FF0000)) | ((x >> 8) & (0x0000FF00)) )
+
+typedef unsigned char bit8u;
+typedef unsigned int bit32u;
+typedef int bit32;
+
+#define FALSE 0
+#define TRUE (!FALSE)
+
+
+bit32u CheckSum;
+int RecStart;
+int debug;
+int verbose;
+
+FILE *OpenOutputFile( char *Name );
+FILE *fOut;
+bit32u RecLength=0;
+
+bit32u AddressCurrent;
+
+bit32u gh(char *cp,int nibs);
+
+int BigEndian;
+
+int inputline;
+
+// char buf[16*1024];
+
+char buffer[2048];
+char *cur_ptr;
+int cur_line=0;
+int cur_len=0;
+
+int s1s2s3_total=0;
+
+bit32u PBVal;
+int    PBValid;
+bit32u PBAdr;
+
+
+void dumpfTell(char *s, bit32u Value)
+{
+    int Length;
+    Length = (int) RecLength;
+    if (debug)
+          printf("[%s  ] ftell()[0x%08lX] Length[0x%4X] Length[%4d] Value[0x%08x]\n",
+                s, ftell(fOut), Length, Length, Value);
+}
+
+void DispHex(bit32u Hex)
+{
+//    printf("%X", Hex);
+}
+
+void WaitDisplay(void)
+{
+   static int Count=0;
+   static int Index=0;
+   char iline[]={"-\\|/"};
+
+   Count++;
+   if ((Count % 32)==0)
+   {
+     if (verbose)
+        printf("%c%c",iline[Index++],8);
+     Index &= 3;
+   }
+}
+
+
+void binOut32 ( bit32u Data )
+{
+// On UNIX machine all 32bit writes need ENDIAN switched
+//    Data = EndianSwitch(Data);
+//    fwrite( &Data, sizeof(bit32u), 1, fOut);
+
+   char sdat[4];
+   int i;
+
+   for(i=0;i<4;i++)
+    sdat[i]=(char)(Data>>(i*8));
+   fwrite( sdat, 1, 4, fOut);
+   dumpfTell("Out32" , Data);
+}
+
+// Only update RecLength on Byte Writes
+// All 32 bit writes will be for Length etc
+
+void binOut8 ( bit8u Data )
+{
+    int n;
+    dumpfTell("B4Data" , (bit32u) (Data & 0xFF) );
+    n = fwrite( &Data, sizeof(bit8u), 1, fOut);
+    if (n != 1)
+        printf("Error in writing %X for Address 0x%8X\n", Data, AddressCurrent);
+    RecLength += 1;
+}
+
+//  Currently ONLY used for outputting Program Start
+
+void binRecStart(bit32u Address)
+{
+    RecLength      = 0;
+    CheckSum       = Address;
+    RecStart       = TRUE;
+
+    if (debug)
+          printf("[RecStart] CheckSum[0x%08X] Length[%4d] Address[0x%08X]\n",
+                CheckSum, RecLength, Address);
+
+
+    dumpfTell("RecLength", RecLength);
+    binOut32( RecLength );
+    dumpfTell("Address", Address);
+    binOut32( Address );
+}
+
+void binRecEnd(void)
+{
+    long RecEnd;
+
+    if (!RecStart)   //  if no record started, do not end it
+    {
+        return;
+    }
+
+    RecStart = FALSE;
+
+
+    RecEnd = ftell(fOut);         // Save Current position
+
+    if (debug)
+          printf("[RecEnd  ] CheckSum[0x%08X] Length[%4d] Length[0x%X] RecEnd[0x%08lX]\n",
+                CheckSum, RecLength, RecLength, RecEnd);
+
+    fseek( fOut, -((long) RecLength), SEEK_CUR);  // move back Start Of Data
+
+    dumpfTell("Data   ", -1);
+
+    fseek( fOut, -4, SEEK_CUR);  // move back Start Of Address
+
+    dumpfTell("Address   ", -1);
+
+    fseek( fOut, -4, SEEK_CUR);  // move back Start Of Length
+
+    dumpfTell("Length   ", -1);
+
+    binOut32( RecLength );
+
+    fseek( fOut, RecEnd, SEEK_SET);  // move to end of Record
+
+    CheckSum += RecLength;
+
+    CheckSum =  ~CheckSum + 1;  // Two's complement
+
+    binOut32( CheckSum );
+
+    if (verbose)
+        printf("[Created Record of %d Bytes with CheckSum [0x%8X]\n", RecLength, CheckSum);
+}
+
+void binRecOutProgramStart(bit32u Address)
+{
+    if (Address != (AddressCurrent+1))
+    {
+        binRecEnd();
+        binRecStart(Address);
+    }
+    AddressCurrent = Address;
+}
+void binRecOutByte(bit32u Address, bit8u Data)
+{
+    //  If Address is one after Current Address, output Byte
+    //  If not, close out last record, update Length, write checksum
+    //  Then Start New Record, updating Current Address
+
+    if (Address != (AddressCurrent+1))
+    {
+        binRecEnd();
+        binRecStart(Address);
+    }
+    AddressCurrent = Address;
+    CheckSum += Data;
+    binOut8( Data );
+}
+
+//=============================================================================
+//       SUPPORT FUNCTIONS
+//=============================================================================
+int readline(FILE *fil,char *buf,int len)
+{
+    int rlen;
+    
+    rlen=0;
+    if (len==0)  return(0);
+    while(1)
+    {
+      if (cur_len==0)
+      {
+        cur_len=fread(buffer, 1, sizeof(buffer), fil);
+        if (cur_len==0)
+        {
+          if (rlen)
+          {
+            *buf=0;
+            return(rlen);
+          }
+          return(-1);
+        }
+        cur_ptr=buffer;
+      }
+      if (cur_len)
+      {
+        if (*cur_ptr=='\n')
+        {
+          *buf=0;
+          cur_ptr++;
+          cur_len--;
+          return(rlen);
+        }
+         else
+         {
+           if ((len>1)&&(*cur_ptr!='\r'))
+           {
+             *buf++=*cur_ptr++;
+             len--;
+           }
+           else
+             cur_ptr++;
+
+           rlen++;
+           cur_len--;
+         }
+      }
+      else
+      {
+        *buf=0;
+        cur_ptr++;
+        cur_len--;
+        return(rlen);
+      }
+    }
+}
+
+
+int SRLerrorout(char *c1,char *c2)
+{
+  printf("\nERROR: %s - '%s'.",c1,c2);
+  return(FALSE);
+}
+
+
+int checksum(char *cp,int count)
+{
+  char *scp;
+  int cksum;
+  int dum;
+
+  scp=cp;
+  while(*scp)
+  {
+    if (!isxdigit(*scp++))
+      return(SRLerrorout("Invalid hex digits",cp));
+  }
+  scp=cp;
+
+  cksum=count;
+
+  while(count)
+  {
+    cksum += gh(scp,2);
+    if (count == 2)
+        dum = ~cksum;
+    scp += 2;
+    count--;
+  }
+  cksum&=0x0ff; 
+  //  printf("\nCk:%02x",cksum);
+  return(cksum==0x0ff);
+}
+
+bit32u gh(char *cp,int nibs)
+{
+  int i;
+  bit32u j;
+
+  j=0;
+
+  for(i=0;i<nibs;i++)
+  {
+    j<<=4;
+    if ((*cp>='a')&&(*cp<='z')) *cp &= 0x5f;
+    if ((*cp>='0')&&(*cp<='9')) 
+      j += (*cp-0x30);
+     else
+      if ((*cp>='A')&&(*cp<='F'))
+        j += (*cp-0x37);
+       else
+        SRLerrorout("Bad Hex char", cp);
+    cp++;
+  }
+  return(j);
+}
+
+
+//=============================================================================
+//       PROCESS SREC LINE
+//=============================================================================
+
+int srecLine(char *pSrecLine)
+{
+    char *scp,ch;
+    int  itmp,count,dat;
+    bit32u adr;
+    static bit32u RecordCounter=0;
+
+    cur_line++;
+    scp=pSrecLine;
+  
+    if (*pSrecLine!='S')
+      return(SRLerrorout("Not an Srecord file",scp));
+    pSrecLine++;
+    if (strlen(pSrecLine)<4)
+      return(SRLerrorout("Srecord too short",scp));
+  
+    ch=*pSrecLine++;
+  
+    count=gh(pSrecLine,2);
+  
+    pSrecLine += 2;
+  
+  //  if(debug)
+  //        printf("count %d, strlen(pSrecLine) = %d, pSrecLine =[%s]\n", count, strlen(pSrecLine), pSrecLine);
+     RecordCounter++;
+     DispHex(RecordCounter);
+  
+    if ((count*2) != strlen(pSrecLine)) return(SRLerrorout("Count field larger than record",scp));
+  
+    if (!checksum(pSrecLine, count)) return(SRLerrorout("Bad Checksum",scp));
+  
+    switch(ch)
+    {
+        case '0': if (count<3) return(SRLerrorout("Invalid Srecord count field",scp));
+                  itmp=gh(pSrecLine,4); pSrecLine+=4; count-=2;
+                  if (itmp) return(SRLerrorout("Srecord 1 address not zero",scp));
+        break;
+        case '1': if (count<3) return(SRLerrorout("Invalid Srecord count field",scp));
+                  return(SRLerrorout("Srecord Not valid for MIPS",scp));
+        break;
+        case '2': if (count<4) return(SRLerrorout("Invalid Srecord count field",scp));
+                  return(SRLerrorout("Srecord Not valid for MIPS",scp));
+        break;
+        case '3': if (count<5) return(SRLerrorout("Invalid Srecord count field",scp));
+                  adr=gh(pSrecLine,8); pSrecLine+=8; count-=4;
+                  count--;
+                  while(count)
+                  {
+                    dat=gh(pSrecLine,2); pSrecLine+=2; count--;
+                    binRecOutByte(adr, (char) (dat & 0xFF));
+                    adr++;
+                  }
+                  s1s2s3_total++;
+        break;
+        case '4': return(SRLerrorout("Invalid Srecord type",scp));
+        break;
+        case '5': if (count<3) return(SRLerrorout("Invalid Srecord count field",scp));
+                  itmp=gh(pSrecLine,4); pSrecLine+=4; count-=2;
+                  if (itmp|=s1s2s3_total) return(SRLerrorout("Incorrect number of S3 Record processed",scp));
+        break;
+        case '6': return(SRLerrorout("Invalid Srecord type",scp));
+        break;
+        case '7': // PROGRAM START
+                  if (count<5) return(SRLerrorout("Invalid Srecord count field",scp));
+                  adr=gh(pSrecLine,8); pSrecLine+=8; count-=4;
+                  if (count!=1) return(SRLerrorout("Invalid Srecord count field",scp));
+                  binRecOutProgramStart(adr);
+        break;
+        case '8': if (count<4) return(SRLerrorout("Invalid Srecord count field",scp));
+                  return(SRLerrorout("Srecord Not valid for MIPS",scp));
+        break;
+        case '9': if (count<3) return(SRLerrorout("Invalid Srecord count field",scp));
+                  return(SRLerrorout("Srecord Not valid for MIPS",scp));
+        break;
+        default:
+        break;
+    }
+    return(TRUE);
+}
+ 
+
+//=============================================================================
+//       MAIN LOGIC, READS IN LINE AND OUTPUTS BINARY
+//=============================================================================
+
+int srec2bin(int argc,char *argv[],int verbose)
+{
+    int i,rlen,sts;
+    FILE *fp;
+    char ac;
+    char buff[256];
+    bit32u TAG_BIG     = 0xDEADBE42;
+    bit32u TAG_LITTLE  = 0xFEEDFA42;
+
+    bit32u Tag;
+
+  
+    if(argc < 3)
+    {
+      printf("\nError: <srec2bin <srec input file> <bin output file>\n\n");
+      return(0);
+    }
+  
+    if (argc > 3) BigEndian=TRUE; else BigEndian=FALSE;
+
+    if (BigEndian)
+        Tag = TAG_BIG;
+    else
+        Tag = TAG_LITTLE;
+
+    if (verbose)
+       printf("\nEndian: %s, Tag is 0x%8X\n",(BigEndian)?"BIG":"LITTLE", Tag);
+
+    fp = fopen(argv[1],"rt");
+
+    if (fp==NULL)
+    {
+      printf("\nError: Opening input file, %s.", argv[1]);
+      return(0);
+    }
+  
+    fOut = fopen( argv[2], "wb");
+    
+    if (fOut==NULL)
+    {
+      printf("\nError: Opening Output file, %s.", argv[2]);
+      if(fp) fclose(fp);
+      return(0);
+    }
+ 
+    RecStart = FALSE;
+
+    AddressCurrent = 0xFFFFFFFFL;
+
+    // Setup Tag 
+  
+    dumpfTell("Tag", Tag);
+
+    binOut32(Tag);
+
+  
+    inputline=0;
+    sts=TRUE;
+
+    rlen = readline(fp,buff,sizeof buff);
+
+    while( (sts) && (rlen != -1))
+    {
+        if (strlen(buff))
+        {
+            sts &= srecLine(buff);
+            WaitDisplay();
+        }
+       rlen = readline(fp,buff,sizeof buff);
+    }
+
+  
+  //  printf("PC: 0x%08X, Length 0x%08X, Tag 0x%08X\n", ProgramStart, RecLength, TAG_LITTLE);
+  
+    binRecEnd();
+
+    if(fp) fclose(fp);
+    if(fOut) fclose(fOut);
+
+    return(1);
+}
+
+main(int argc, char *argv[])
+{
+    debug = TRUE;
+    debug = FALSE;
+    verbose = FALSE;
+    srec2bin(argc,argv,verbose);
+    return 0;
+}
+
diff --git a/trunk/tools/firmware-utils/src/tplink-safeloader.c b/trunk/tools/firmware-utils/src/tplink-safeloader.c
new file mode 100644
index 00000000..9c5bb54f
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/tplink-safeloader.c
@@ -0,0 +1,546 @@
+/*
+  Copyright (c) 2014, Matthias Schiffer <mschiffer@universe-factory.net>
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/*
+   tplink-safeloader
+
+   Image generation tool for the TP-LINK SafeLoader as seen on
+   TP-LINK Pharos devices (CPE210/220/510/520)
+*/
+
+
+#include <assert.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "md5.h"
+
+
+#define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
+
+
+/** An image partition table entry */
+struct image_partition_entry {
+	const char *name;
+	size_t size;
+	uint8_t *data;
+};
+
+/** A flash partition table entry */
+struct flash_partition_entry {
+	const char *name;
+	uint32_t base;
+	uint32_t size;
+};
+
+
+/** The content of the soft-version structure */
+struct __attribute__((__packed__)) soft_version {
+	uint32_t magic;
+	uint32_t zero;
+	uint8_t pad1;
+	uint8_t version_major;
+	uint8_t version_minor;
+	uint8_t version_patch;
+	uint8_t year_hi;
+	uint8_t year_lo;
+	uint8_t month;
+	uint8_t day;
+	uint32_t rev;
+	uint8_t pad2;
+};
+
+
+static const uint8_t jffs2_eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
+
+
+/**
+   Salt for the MD5 hash
+
+   Fortunately, TP-LINK seems to use the same salt for most devices which use
+   the new image format.
+*/
+static const uint8_t md5_salt[16] = {
+	0x7a, 0x2b, 0x15, 0xed,
+	0x9b, 0x98, 0x59, 0x6d,
+	0xe5, 0x04, 0xab, 0x44,
+	0xac, 0x2a, 0x9f, 0x4e,
+};
+
+
+/** Vendor information for CPE210/220/510/520 */
+static const unsigned char cpe510_vendor[] = "\x00\x00\x00\x1f""CPE510(TP-LINK|UN|N300-5):1.0\r\n";
+
+
+/**
+    The flash partition table for CPE210/220/510/520;
+    it is the same as the one used by the stock images.
+*/
+static const struct flash_partition_entry cpe510_partitions[] = {
+	{"fs-uboot", 0x00000, 0x20000},
+	{"partition-table", 0x20000, 0x02000},
+	{"default-mac", 0x30000, 0x00020},
+	{"product-info", 0x31100, 0x00100},
+	{"signature", 0x32000, 0x00400},
+	{"os-image", 0x40000, 0x170000},
+	{"soft-version", 0x1b0000, 0x00100},
+	{"support-list", 0x1b1000, 0x00400},
+	{"file-system", 0x1c0000, 0x600000},
+	{"user-config", 0x7c0000, 0x10000},
+	{"default-config", 0x7d0000, 0x10000},
+	{"log", 0x7e0000, 0x10000},
+	{"radio", 0x7f0000, 0x10000},
+	{NULL, 0, 0}
+};
+
+/**
+   The support list for CPE210/220/510/520
+
+   The stock images also contain strings for two more devices: BS510 and BS210.
+   At the moment, there exists no public information about these devices.
+*/
+static const unsigned char cpe510_support_list[] =
+	"\x00\x00\x00\xc8\x00\x00\x00\x00"
+	"SupportList:\r\n"
+	"CPE510(TP-LINK|UN|N300-5):1.0\r\n"
+	"CPE520(TP-LINK|UN|N300-5):1.0\r\n"
+	"CPE210(TP-LINK|UN|N300-2):1.0\r\n"
+	"CPE220(TP-LINK|UN|N300-2):1.0\r\n"
+	"\r\n\xff";
+
+#define error(_ret, _errno, _str, ...)				\
+	do {							\
+		fprintf(stderr, _str ": %s\n", ## __VA_ARGS__,	\
+			strerror(_errno));			\
+		if (_ret)					\
+			exit(_ret);				\
+	} while (0)
+
+
+/** Allocates a new image partition */
+struct image_partition_entry alloc_image_partition(const char *name, size_t len) {
+	struct image_partition_entry entry = {name, len, malloc(len)};
+	if (!entry.data)
+		error(1, errno, "malloc");
+
+	return entry;
+}
+
+/** Frees an image partition */
+void free_image_partition(struct image_partition_entry entry) {
+	free(entry.data);
+}
+
+/** Generates the partition-table partition */
+struct image_partition_entry make_partition_table(const struct flash_partition_entry *p) {
+	struct image_partition_entry entry = alloc_image_partition("partition-table", 0x800);
+
+	char *s = (char *)entry.data, *end = (char *)(s+entry.size);
+
+	*(s++) = 0x00;
+	*(s++) = 0x04;
+	*(s++) = 0x00;
+	*(s++) = 0x00;
+
+	size_t i;
+	for (i = 0; p[i].name; i++) {
+		size_t len = end-s;
+		size_t w = snprintf(s, len, "partition %s base 0x%05x size 0x%05x\n", p[i].name, p[i].base, p[i].size);
+
+		if (w > len-1)
+			error(1, 0, "flash partition table overflow?");
+
+		s += w;
+	}
+
+	s++;
+
+	memset(s, 0xff, end-s);
+
+	return entry;
+}
+
+
+/** Generates a binary-coded decimal representation of an integer in the range [0, 99] */
+static inline uint8_t bcd(uint8_t v) {
+	return 0x10 * (v/10) + v%10;
+}
+
+
+/** Generates the soft-version partition */
+struct image_partition_entry make_soft_version(uint32_t rev) {
+	struct image_partition_entry entry = alloc_image_partition("soft-version", sizeof(struct soft_version));
+	struct soft_version *s = (struct soft_version *)entry.data;
+
+	time_t t;
+
+	if (time(&t) == (time_t)(-1))
+		error(1, errno, "time");
+
+	struct tm *tm = localtime(&t);
+
+	s->magic = htonl(0x0000000c);
+	s->zero = 0;
+	s->pad1 = 0xff;
+
+	s->version_major = 0;
+	s->version_minor = 0;
+	s->version_patch = 0;
+
+	s->year_hi = bcd((1900+tm->tm_year)/100);
+	s->year_lo = bcd(tm->tm_year%100);
+	s->month = bcd(tm->tm_mon+1);
+	s->day = bcd(tm->tm_mday);
+	s->rev = htonl(rev);
+
+	s->pad2 = 0xff;
+
+	return entry;
+}
+
+/** Generates the support-list partition */
+struct image_partition_entry make_support_list(const unsigned char *support_list, size_t len) {
+	struct image_partition_entry entry = alloc_image_partition("support-list", len);
+	memcpy(entry.data, support_list, len);
+	return entry;
+}
+
+/** Creates a new image partition with an arbitrary name from a file */
+struct image_partition_entry read_file(const char *part_name, const char *filename, bool add_jffs2_eof) {
+	struct stat statbuf;
+
+	if (stat(filename, &statbuf) < 0)
+		error(1, errno, "unable to stat file `%s'", filename);
+
+	size_t len = statbuf.st_size;
+
+	if (add_jffs2_eof)
+		len = ALIGN(len, 0x10000) + sizeof(jffs2_eof_mark);
+
+	struct image_partition_entry entry = alloc_image_partition(part_name, len);
+
+	FILE *file = fopen(filename, "rb");
+	if (!file)
+		error(1, errno, "unable to open file `%s'", filename);
+
+	if (fread(entry.data, statbuf.st_size, 1, file) != 1)
+		error(1, errno, "unable to read file `%s'", filename);
+
+	if (add_jffs2_eof) {
+		uint8_t *eof = entry.data + statbuf.st_size, *end = entry.data+entry.size;
+
+		memset(eof, 0xff, end - eof - sizeof(jffs2_eof_mark));
+		memcpy(end - sizeof(jffs2_eof_mark), jffs2_eof_mark, sizeof(jffs2_eof_mark));
+	}
+
+	fclose(file);
+
+	return entry;
+}
+
+
+/**
+   Copies a list of image partitions into an image buffer and generates the image partition table while doing so
+
+   Example image partition table:
+
+     fwup-ptn partition-table base 0x00800 size 0x00800
+     fwup-ptn os-image base 0x01000 size 0x113b45
+     fwup-ptn file-system base 0x114b45 size 0x1d0004
+     fwup-ptn support-list base 0x2e4b49 size 0x000d1
+
+   Each line of the partition table is terminated with the bytes 09 0d 0a ("\t\r\n"),
+   the end of the partition table is marked with a zero byte.
+
+   The firmware image must contain at least the partition-table and support-list partitions
+   to be accepted. There aren't any alignment constraints for the image partitions.
+
+   The partition-table partition contains the actual flash layout; partitions
+   from the image partition table are mapped to the corresponding flash partitions during
+   the firmware upgrade. The support-list partition contains a list of devices supported by
+   the firmware image.
+
+   The base offsets in the firmware partition table are relative to the end
+   of the vendor information block, so the partition-table partition will
+   actually start at offset 0x1814 of the image.
+
+   I think partition-table must be the first partition in the firmware image.
+*/
+void put_partitions(uint8_t *buffer, const struct image_partition_entry *parts) {
+	size_t i;
+	char *image_pt = (char *)buffer, *end = image_pt + 0x800;
+
+	size_t base = 0x800;
+	for (i = 0; parts[i].name; i++) {
+		memcpy(buffer + base, parts[i].data, parts[i].size);
+
+		size_t len = end-image_pt;
+		size_t w = snprintf(image_pt, len, "fwup-ptn %s base 0x%05x size 0x%05x\t\r\n", parts[i].name, (unsigned)base, (unsigned)parts[i].size);
+
+		if (w > len-1)
+			error(1, 0, "image partition table overflow?");
+
+		image_pt += w;
+
+		base += parts[i].size;
+	}
+
+	image_pt++;
+
+	memset(image_pt, 0xff, end-image_pt);
+}
+
+/** Generates and writes the image MD5 checksum */
+void put_md5(uint8_t *md5, uint8_t *buffer, unsigned int len) {
+	MD5_CTX ctx;
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, md5_salt, (unsigned int)sizeof(md5_salt));
+	MD5_Update(&ctx, buffer, len);
+	MD5_Final(md5, &ctx);
+}
+
+
+/**
+   Generates the firmware image in factory format
+
+   Image format:
+
+     Bytes (hex)  Usage
+     -----------  -----
+     0000-0003    Image size (4 bytes, big endian)
+     0004-0013    MD5 hash (hash of a 16 byte salt and the image data starting with byte 0x14)
+     0014-1013    Vendor information (4096 bytes, padded with 0xff; there seem to be older
+                  (VxWorks-based) TP-LINK devices which use a smaller vendor information block)
+     1014-1813    Image partition table (2048 bytes, padded with 0xff)
+     1814-xxxx    Firmware partitions
+*/
+void * generate_factory_image(const unsigned char *vendor, size_t vendor_len, const struct image_partition_entry *parts, size_t *len) {
+	*len = 0x1814;
+
+	size_t i;
+	for (i = 0; parts[i].name; i++)
+		*len += parts[i].size;
+
+	uint8_t *image = malloc(*len);
+	if (!image)
+		error(1, errno, "malloc");
+
+	image[0] = *len >> 24;
+	image[1] = *len >> 16;
+	image[2] = *len >> 8;
+	image[3] = *len;
+
+	memcpy(image+0x14, vendor, vendor_len);
+	memset(image+0x14+vendor_len, 0xff, 4096-vendor_len);
+
+	put_partitions(image + 0x1014, parts);
+	put_md5(image+0x04, image+0x14, *len-0x14);
+
+	return image;
+}
+
+/**
+   Generates the firmware image in sysupgrade format
+
+   This makes some assumptions about the provided flash and image partition tables and
+   should be generalized when TP-LINK starts building its safeloader into hardware with
+   different flash layouts.
+*/
+void * generate_sysupgrade_image(const struct flash_partition_entry *flash_parts, const struct image_partition_entry *image_parts, size_t *len) {
+	const struct flash_partition_entry *flash_os_image = &flash_parts[5];
+	const struct flash_partition_entry *flash_soft_version = &flash_parts[6];
+	const struct flash_partition_entry *flash_support_list = &flash_parts[7];
+	const struct flash_partition_entry *flash_file_system = &flash_parts[8];
+
+	const struct image_partition_entry *image_os_image = &image_parts[3];
+	const struct image_partition_entry *image_soft_version = &image_parts[1];
+	const struct image_partition_entry *image_support_list = &image_parts[2];
+	const struct image_partition_entry *image_file_system = &image_parts[4];
+
+	assert(strcmp(flash_os_image->name, "os-image") == 0);
+	assert(strcmp(flash_soft_version->name, "soft-version") == 0);
+	assert(strcmp(flash_support_list->name, "support-list") == 0);
+	assert(strcmp(flash_file_system->name, "file-system") == 0);
+
+	assert(strcmp(image_os_image->name, "os-image") == 0);
+	assert(strcmp(image_soft_version->name, "soft-version") == 0);
+	assert(strcmp(image_support_list->name, "support-list") == 0);
+	assert(strcmp(image_file_system->name, "file-system") == 0);
+
+	if (image_os_image->size > flash_os_image->size)
+		error(1, 0, "kernel image too big (more than %u bytes)", (unsigned)flash_os_image->size);
+	if (image_file_system->size > flash_file_system->size)
+		error(1, 0, "rootfs image too big (more than %u bytes)", (unsigned)flash_file_system->size);
+
+	*len = flash_file_system->base - flash_os_image->base + image_file_system->size;
+
+	uint8_t *image = malloc(*len);
+	if (!image)
+		error(1, errno, "malloc");
+
+	memset(image, 0xff, *len);
+
+	memcpy(image, image_os_image->data, image_os_image->size);
+	memcpy(image + flash_soft_version->base - flash_os_image->base, image_soft_version->data, image_soft_version->size);
+	memcpy(image + flash_support_list->base - flash_os_image->base, image_support_list->data, image_support_list->size);
+	memcpy(image + flash_file_system->base - flash_os_image->base, image_file_system->data, image_file_system->size);
+
+	return image;
+}
+
+
+/** Generates an image for CPE210/220/510/520 and writes it to a file */
+static void do_cpe510(const char *output, const char *kernel_image, const char *rootfs_image, uint32_t rev, bool add_jffs2_eof, bool sysupgrade) {
+	struct image_partition_entry parts[6] = {};
+
+	parts[0] = make_partition_table(cpe510_partitions);
+	parts[1] = make_soft_version(rev);
+	parts[2] = make_support_list(cpe510_support_list, sizeof(cpe510_support_list)-1);
+	parts[3] = read_file("os-image", kernel_image, false);
+	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
+
+	size_t len;
+	void *image;
+	if (sysupgrade)
+		image = generate_sysupgrade_image(cpe510_partitions, parts, &len);
+	else
+		image = generate_factory_image(cpe510_vendor, sizeof(cpe510_vendor)-1, parts, &len);
+
+	FILE *file = fopen(output, "wb");
+	if (!file)
+		error(1, errno, "unable to open output file");
+
+	if (fwrite(image, len, 1, file) != 1)
+		error(1, 0, "unable to write output file");
+
+	fclose(file);
+
+	free(image);
+
+	size_t i;
+	for (i = 0; parts[i].name; i++)
+		free_image_partition(parts[i]);
+}
+
+
+/** Usage output */
+void usage(const char *argv0) {
+	fprintf(stderr,
+		"Usage: %s [OPTIONS...]\n"
+		"\n"
+		"Options:\n"
+		"  -B <board>      create image for the board specified with <board>\n"
+		"  -k <file>       read kernel image from the file <file>\n"
+		"  -r <file>       read rootfs image from the file <file>\n"
+		"  -o <file>       write output to the file <file>\n"
+		"  -V <rev>        sets the revision number to <rev>\n"
+		"  -j              add jffs2 end-of-filesystem markers\n"
+		"  -S              create sysupgrade instead of factory image\n"
+		"  -h              show this help\n",
+		argv0
+	);
+};
+
+
+int main(int argc, char *argv[]) {
+	const char *board = NULL, *kernel_image = NULL, *rootfs_image = NULL, *output = NULL;
+	bool add_jffs2_eof = false, sysupgrade = false;
+	unsigned rev = 0;
+
+	while (true) {
+		int c;
+
+		c = getopt(argc, argv, "B:k:r:o:V:jSh");
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'B':
+			board = optarg;
+			break;
+
+		case 'k':
+			kernel_image = optarg;
+			break;
+
+		case 'r':
+			rootfs_image = optarg;
+			break;
+
+		case 'o':
+			output = optarg;
+			break;
+
+		case 'V':
+			sscanf(optarg, "r%u", &rev);
+			break;
+
+		case 'j':
+			add_jffs2_eof = true;
+			break;
+
+		case 'S':
+			sysupgrade = true;
+			break;
+
+		case 'h':
+			usage(argv[0]);
+			return 0;
+
+		default:
+			usage(argv[0]);
+			return 1;
+		}
+	}
+
+	if (!board)
+		error(1, 0, "no board has been specified");
+	if (!kernel_image)
+		error(1, 0, "no kernel image has been specified");
+	if (!rootfs_image)
+		error(1, 0, "no rootfs image has been specified");
+	if (!output)
+		error(1, 0, "no output filename has been specified");
+
+	if (strcmp(board, "CPE510") == 0)
+		do_cpe510(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade);
+	else
+		error(1, 0, "unsupported board %s", board);
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/trx.c b/trunk/tools/firmware-utils/src/trx.c
new file mode 100644
index 00000000..aa1f5be4
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/trx.c
@@ -0,0 +1,418 @@
+/*
+ * Copyright (C) 2004  Manuel Novoa III  <mjn3@codepoet.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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
+ */
+
+/* July 29, 2004
+ *
+ * This is a hacked replacement for the 'trx' utility used to create
+ * wrt54g .trx firmware files.  It isn't pretty, but it does the job
+ * for me.
+ *
+ * As an extension, you can specify a larger maximum length for the
+ * .trx file using '-m'.  It will be rounded up to be a multiple of 4K.
+ * NOTE: This space will be malloc()'d.
+ *
+ * August 16, 2004
+ *
+ * Sigh... Make it endian-neutral.
+ *
+ * TODO: Support '-b' option to specify offsets for each file.
+ *
+ * February 19, 2005 - mbm
+ *
+ * Add -a (align offset) and -b (absolute offset)
+ *
+ * March 24, 2010 - markus
+ *
+ * extend trx header struct for new version
+ * assume v1 for as default
+ * Add option -2 to allow v2 header
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define STORE32_LE(X)		bswap_32(X)
+#define LOAD32_LE(X)		bswap_32(X)
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#define STORE32_LE(X)		(X)
+#define LOAD32_LE(X)		(X)
+#else
+#error unkown endianness!
+#endif
+
+uint32_t crc32buf(char *buf, size_t len);
+
+/**********************************************************************/
+/* from trxhdr.h */
+
+#define TRX_MAGIC	0x30524448	/* "HDR0" */
+#define TRX_MAX_LEN	0x720000
+#define TRX_NO_HEADER	1		/* Do not write TRX header */
+
+struct trx_header {
+	uint32_t magic;			/* "HDR0" */
+	uint32_t len;			/* Length of file including header */
+	uint32_t crc32;			/* 32-bit CRC from flag_version to end of file */
+	uint32_t flag_version;	/* 0:15 flags, 16:31 version */
+	uint32_t offsets[4];	/* Offsets of partitions from start of header */
+};
+
+/**********************************************************************/
+
+void usage(void) __attribute__ (( __noreturn__ ));
+
+void usage(void)
+{
+	fprintf(stderr, "Usage:\n");
+	fprintf(stderr, " trx [-2] [-o outfile] [-m maxlen] [-a align] [-b absolute offset] [-x relative offset]\n");
+	fprintf(stderr, "     [-f file] [-f file [-f file [-f file (v2 only)]]]\n");
+	exit(EXIT_FAILURE);
+}
+
+int main(int argc, char **argv)
+{
+	FILE *out = stdout;
+	FILE *in;
+	char *ofn = NULL;
+	char *buf;
+	char *e;
+	int c, i, append = 0;
+	size_t n;
+	ssize_t n2;
+	uint32_t cur_len, fsmark=0;
+	unsigned long maxlen = TRX_MAX_LEN;
+	struct trx_header *p;
+	char trx_version = 1;
+	unsigned char binheader[32];
+
+	fprintf(stderr, "mjn3's trx replacement - v0.81.1\n");
+
+	if (!(buf = malloc(maxlen))) {
+		fprintf(stderr, "malloc failed\n");
+		return EXIT_FAILURE;
+	}
+
+	p = (struct trx_header *) buf;
+
+	p->magic = STORE32_LE(TRX_MAGIC);
+	cur_len = sizeof(struct trx_header) - 4; /* assume v1 header */
+
+	in = NULL;
+	i = 0;
+
+	while ((c = getopt(argc, argv, "-:2o:m:a:x:b:f:A:F:")) != -1) {
+		switch (c) {
+			case '2':
+				/* take care that nothing was written to buf so far */
+				if (cur_len != sizeof(struct trx_header) - 4) {
+					fprintf(stderr, "-2 has to be used before any other argument!\n");
+				}
+				else {
+					trx_version = 2;
+					cur_len += 4;
+				}
+				break;
+			case 'F':
+				fsmark = cur_len;
+			case 'A':
+				append = 1;
+				/* fall through */
+			case 'f':
+			case 1:
+				if (!append)
+					p->offsets[i++] = STORE32_LE(cur_len);
+
+				if (!(in = fopen(optarg, "r"))) {
+					fprintf(stderr, "can not open \"%s\" for reading\n", optarg);
+					usage();
+				}
+				n = fread(buf + cur_len, 1, maxlen - cur_len, in);
+				if (!feof(in)) {
+					fprintf(stderr, "fread failure or file \"%s\" too large\n",optarg);
+					fclose(in);
+					return EXIT_FAILURE;
+				}
+				fclose(in);
+#undef  ROUND
+#define ROUND 4
+				if (n & (ROUND-1)) {
+					memset(buf + cur_len + n, 0, ROUND - (n & (ROUND-1)));
+					n += ROUND - (n & (ROUND-1));
+				}
+				cur_len += n;
+				append = 0;
+
+				break;
+			case 'o':
+				ofn = optarg;
+				if (ofn && !(out = fopen(ofn, "w"))) {
+					fprintf(stderr, "can not open \"%s\" for writing\n", ofn);
+					usage();
+				}
+
+				break;
+			case 'm':
+				errno = 0;
+				maxlen = strtoul(optarg, &e, 0);
+				if (errno || (e == optarg) || *e) {
+					fprintf(stderr, "illegal numeric string\n");
+					usage();
+				}
+#undef  ROUND
+#define ROUND 0x1000
+				if (maxlen & (ROUND-1)) {
+					maxlen += (ROUND - (maxlen & (ROUND-1)));
+				}
+				if (maxlen < ROUND) {
+					fprintf(stderr, "maxlen too small (or wrapped)\n");
+					usage();
+				}
+				if (maxlen > TRX_MAX_LEN) {
+					fprintf(stderr, "WARNING: maxlen exceeds default maximum!  Beware of overwriting nvram!\n");
+				}
+				if (!(buf = realloc(buf,maxlen))) {
+					fprintf(stderr, "realloc failed");
+					return EXIT_FAILURE;
+				}
+				p = (struct trx_header *) buf;
+				break;
+			case 'a':
+				errno = 0;
+				n = strtoul(optarg, &e, 0);
+				if (errno || (e == optarg) || *e) {
+					fprintf(stderr, "illegal numeric string\n");
+					usage();
+				}
+				if (cur_len & (n-1)) {
+					n = n - (cur_len & (n-1));
+					memset(buf + cur_len, 0, n);
+					cur_len += n;
+				}
+				break;
+			case 'b':
+				errno = 0;
+				n = strtoul(optarg, &e, 0);
+				if (errno || (e == optarg) || *e) {
+					fprintf(stderr, "illegal numeric string\n");
+					usage();
+				}
+				if (n < cur_len) {
+					fprintf(stderr, "WARNING: current length exceeds -b %d offset\n",(int) n);
+				} else {
+					memset(buf + cur_len, 0, n - cur_len);
+					cur_len = n;
+				}
+				break;
+			case 'x':
+				errno = 0;
+				n2 = strtol(optarg, &e, 0);
+				if (errno || (e == optarg) || *e) {
+					fprintf(stderr, "illegal numeric string\n");
+					usage();
+				}
+				if (n2 < 0) {
+					if (-n2 > cur_len) {
+						fprintf(stderr, "WARNING: current length smaller then -x %d offset\n",(int) n2);
+						cur_len = 0;
+					} else
+						cur_len += n2;
+				} else {
+					memset(buf + cur_len, 0, n2);
+					cur_len += n2;
+				}
+
+				break;
+			default:
+				usage();
+		}
+	}
+	p->flag_version = STORE32_LE((trx_version << 16));
+
+	if (!in) {
+		fprintf(stderr, "we require atleast one filename\n");
+		usage();
+	}
+
+#undef  ROUND
+#define ROUND 0x1000
+	n = cur_len & (ROUND-1);
+	if (n) {
+		memset(buf + cur_len, 0, ROUND - n);
+		cur_len += ROUND - n;
+	}
+
+	/* for TRXv2 set bin-header Flags to 0xFF for CRC calculation like CFE does */
+	if (trx_version == 2) {
+		if(cur_len - LOAD32_LE(p->offsets[3]) < sizeof(binheader)) {
+			fprintf(stderr, "TRXv2 binheader too small!\n");
+			return EXIT_FAILURE;
+		}
+		memcpy(binheader, buf + LOAD32_LE(p->offsets[3]), sizeof(binheader)); /* save header */
+		memset(buf + LOAD32_LE(p->offsets[3]) + 22, 0xFF, 8); /* set stable and try1-3 to 0xFF */
+	}
+
+	p->crc32 = crc32buf((char *) &p->flag_version,
+						((fsmark)?fsmark:cur_len) - offsetof(struct trx_header, flag_version));
+	p->crc32 = STORE32_LE(p->crc32);
+
+	p->len = STORE32_LE((fsmark) ? fsmark : cur_len);
+
+	/* restore TRXv2 bin-header */
+	if (trx_version == 2) {
+		memcpy(buf + LOAD32_LE(p->offsets[3]), binheader, sizeof(binheader));
+	}
+
+	if (!fwrite(buf, cur_len, 1, out) || fflush(out)) {
+		fprintf(stderr, "fwrite failed\n");
+		return EXIT_FAILURE;
+	}
+
+	fclose(out);
+
+	return EXIT_SUCCESS;
+}
+
+/**********************************************************************/
+/* The following was grabbed and tweaked from the old snippets collection
+ * of public domain C code. */
+
+/**********************************************************************\
+|* Demonstration program to compute the 32-bit CRC used as the frame  *|
+|* check sequence in ADCCP (ANSI X3.66, also known as FIPS PUB 71     *|
+|* and FED-STD-1003, the U.S. versions of CCITT's X.25 link-level     *|
+|* protocol).  The 32-bit FCS was added via the Federal Register,     *|
+|* 1 June 1982, p.23798.  I presume but don't know for certain that   *|
+|* this polynomial is or will be included in CCITT V.41, which        *|
+|* defines the 16-bit CRC (often called CRC-CCITT) polynomial.  FIPS  *|
+|* PUB 78 says that the 32-bit FCS reduces otherwise undetected       *|
+|* errors by a factor of 10^-5 over 16-bit FCS.                       *|
+\**********************************************************************/
+
+/* Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+   code or tables extracted from it, as desired without restriction.*/
+
+/* First, the polynomial itself and its table of feedback terms.  The  */
+/* polynomial is                                                       */
+/* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
+/* Note that we take it "backwards" and put the highest-order term in  */
+/* the lowest-order bit.  The X^32 term is "implied"; the LSB is the   */
+/* X^31 term, etc.  The X^0 term (usually shown as "+1") results in    */
+/* the MSB being 1.                                                    */
+
+/* Note that the usual hardware shift register implementation, which   */
+/* is what we're using (we're merely optimizing it by doing eight-bit  */
+/* chunks at a time) shifts bits into the lowest-order term.  In our   */
+/* implementation, that means shifting towards the right.  Why do we   */
+/* do it this way?  Because the calculated CRC must be transmitted in  */
+/* order from highest-order term to lowest-order term.  UARTs transmit */
+/* characters in order from LSB to MSB.  By storing the CRC this way,  */
+/* we hand it to the UART in the order low-byte to high-byte; the UART */
+/* sends each low-bit to hight-bit; and the result is transmission bit */
+/* by bit from highest- to lowest-order term without requiring any bit */
+/* shuffling on our part.  Reception works similarly.                  */
+
+/* The feedback terms table consists of 256, 32-bit entries.  Notes:   */
+/*                                                                     */
+/*  1. The table can be generated at runtime if desired; code to do so */
+/*     is shown later.  It might not be obvious, but the feedback      */
+/*     terms simply represent the results of eight shift/xor opera-    */
+/*     tions for all combinations of data and CRC register values.     */
+/*                                                                     */
+/*  2. The CRC accumulation logic is the same for all CRC polynomials, */
+/*     be they sixteen or thirty-two bits wide.  You simply choose the */
+/*     appropriate table.  Alternatively, because the table can be     */
+/*     generated at runtime, you can start by generating the table for */
+/*     the polynomial in question and use exactly the same "updcrc",   */
+/*     if your application needn't simultaneously handle two CRC       */
+/*     polynomials.  (Note, however, that XMODEM is strange.)          */
+/*                                                                     */
+/*  3. For 16-bit CRCs, the table entries need be only 16 bits wide;   */
+/*     of course, 32-bit entries work OK if the high 16 bits are zero. */
+/*                                                                     */
+/*  4. The values must be right-shifted by eight bits by the "updcrc"  */
+/*     logic; the shift must be unsigned (bring in zeroes).  On some   */
+/*     hardware you could probably optimize the shift in assembler by  */
+/*     using byte-swap instructions.                                   */
+
+static const uint32_t crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
+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
+};
+
+#define UPDC32(octet,crc) (crc_32_tab[((crc) ^ (octet)) & 0xff] ^ ((crc) >> 8))
+
+uint32_t crc32buf(char *buf, size_t len)
+{
+      uint32_t crc;
+
+      crc = 0xFFFFFFFF;
+
+      for ( ; len; --len, ++buf)
+      {
+            crc = UPDC32(*buf, crc);
+      }
+
+      return crc;
+}
diff --git a/trunk/tools/firmware-utils/src/trx2edips.c b/trunk/tools/firmware-utils/src/trx2edips.c
new file mode 100644
index 00000000..f8d068d5
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/trx2edips.c
@@ -0,0 +1,171 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define STORE32_LE(X)		bswap_32(X)
+#define LOAD32_LE(X)		bswap_32(X)
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#define STORE32_LE(X)		(X)
+#define LOAD32_LE(X)		(X)
+#else
+#error unkown endianness!
+#endif
+
+/**********************************************************************/
+/* from trxhdr.h */
+
+#define TRX_MAGIC	0x30524448	/* "HDR0" */
+#define TRX_VERSION	1
+#define TRX_MAX_LEN	0x5A0000
+#define TRX_NO_HEADER	1		/* Do not write TRX header */
+
+struct trx_header {
+	uint32_t magic;			/* "HDR0" */
+	uint32_t len;			/* Length of file including header */
+	uint32_t crc32;			/* 32-bit CRC from flag_version to end of file */
+	uint32_t flag_version;	/* 0:15 flags, 16:31 version */
+	uint32_t offsets[3];	/* Offsets of partitions from start of header */
+};
+
+
+struct edimax_header {
+	uint32_t sign;			/* signature for header */
+	uint32_t length;		/* start address but doesn't seems to be used... */
+	uint32_t start_addr;		/* length of data, not used too ...*/
+};
+
+
+#define EDIMAX_PS16	0x36315350	/* "PS16" */
+#define EDIMAX_HDR_LEN 	0xc
+
+
+/**********************************************************************/
+static const uint32_t crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
+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
+};
+
+#define UPDC32(octet, crc) (crc_32_tab[((crc) ^ (octet)) & 0xff] ^ ((crc) >> 8))
+
+uint32_t crc32buf(char *buf, size_t len)
+{
+	uint32_t crc;
+
+	crc = 0xFFFFFFFF;
+
+	for (; len; --len, ++buf)
+		crc = UPDC32(*buf, crc);
+
+	return crc;
+}
+
+
+int main(int argc, char *argv[])
+{
+	FILE *fpIn = NULL;
+	FILE *fpOut = NULL;
+	struct edimax_header eh;
+	size_t res;
+	int length;
+
+	char *buf;
+	struct trx_header *p;
+
+	if (argc != 3) {
+		printf("Usage: %s <input file> <output file>\n", argv[0]);
+		return -1;
+	}
+
+	fpIn = fopen(argv[1], "rb");
+	if (fpIn == NULL) {
+		fprintf(stderr, "Unable to open %s\n", argv[1]);
+		return EXIT_FAILURE;
+	}
+	/* compute the length of the file */
+	fseek(fpIn, 0, SEEK_END);
+	length = ftell(fpIn);
+	/* alloc enough memory to store the file */
+	buf = (char *)malloc(length);
+	if (!buf) {
+		fprintf(stderr, "malloc of buffers failed\n");
+		return EXIT_FAILURE;
+	}
+	
+	rewind(fpIn);
+	/* read the whole file*/
+	res = fread(buf, 1, length, fpIn);
+
+	p = (struct trx_header *)buf;
+	if (LOAD32_LE(p->magic) != TRX_MAGIC) {
+		fprintf(stderr, "Not a trx file...%x\n", LOAD32_LE(p->magic));
+		return EXIT_FAILURE;
+	}
+
+	fclose(fpIn);
+
+	fpOut = fopen(argv[2], "wb+");
+	if (fpOut == NULL) {
+		fprintf(stderr, "Unable to open %s\n", argv[2]);
+		return EXIT_FAILURE;
+	}
+	/* make the 3 partition beeing 12 bytes closer from the header */
+	memcpy(buf + LOAD32_LE(p->offsets[2]) - EDIMAX_HDR_LEN, buf + LOAD32_LE(p->offsets[2]), length - LOAD32_LE(p->offsets[2]));
+	/* recompute the crc32 check */
+	p->crc32 = STORE32_LE(crc32buf((char *) &p->flag_version, length - offsetof(struct trx_header, flag_version)));
+
+	eh.sign = STORE32_LE(EDIMAX_PS16);
+	eh.length = STORE32_LE(length);
+	eh.start_addr = STORE32_LE(0x80500000);
+
+	/* write the modified file */
+	fwrite(&eh, sizeof(struct edimax_header), 1, fpOut);
+	fwrite(buf, sizeof(char), length, fpOut);
+	fclose(fpOut);
+}
+
diff --git a/trunk/tools/firmware-utils/src/trx2usr.c b/trunk/tools/firmware-utils/src/trx2usr.c
new file mode 100644
index 00000000..96c0ab28
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/trx2usr.c
@@ -0,0 +1,186 @@
+/*
+ * trx2usr - Convert a TRX firmware image to a U.S. Robotics firmware
+ *           image by prepending a 28-byte header.
+ *
+ * This program was modeled after the usr-hdr.c program from the GPL'ed
+ * firmware for the U.S. Robotics Wireless MAXg Router (USR5461). The
+ * output file of this program can be uploaded via the web interface
+ * of the original U.S. Robotics firmware. Note that this program only
+ * works on a little-endian host platform.
+ *
+ * Copyright (C) 2006 Dick Streefland
+ *
+ * This is free software, licensed under the terms of the GNU General
+ * Public License as published by the Free Software Foundation.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#define	TRX_MAGIC		"HDR0"
+
+#define	USR_MAGIC		0x30525355	// "USR0"
+#define	EPI_VERSION		0x06235d03
+#define	COMPAT_ID		1		// USR5461
+#define	HARDWARE_REV		1
+
+#define	CRC32_INIT		0xffffffff
+#define	CHUNK			(64*1024)
+
+typedef	unsigned char		uint8;
+typedef	unsigned short		uint16;
+typedef	unsigned int		uint32;
+
+struct	usr_header
+{
+	uint32	magic;			// "USR0" 
+	uint32	len;			// file length without this header 
+	uint32	crc32;			// CRC32 of the file without header 
+	uint32	version;		// EPI_VERSION
+	uint16	compatibility_id;	// COMPAT_ID
+	uint16	hardware_revision;	// HARDWARE_REV
+	uint32	reserved[2];
+};
+	
+static	const	uint32		crc_32_tab [] =	// CRC polynomial 0xedb88320
+{
+	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,
+};
+
+static	char	buf[CHUNK];
+
+static	uint32	crc32(uint32 crc, uint8* p, size_t n)
+{
+	while (n--)
+	{
+		crc = crc_32_tab[(crc ^ *p++) & 0xff] ^ (crc >> 8);
+	}
+	return crc;
+}
+
+static	int	trx2usr(FILE* trx, FILE* usr)
+{
+	struct usr_header	hdr;
+	size_t			n;
+
+	hdr.magic		= USR_MAGIC;
+	hdr.len			= 0;
+	hdr.crc32		= CRC32_INIT;
+	hdr.version		= EPI_VERSION;
+	hdr.compatibility_id	= COMPAT_ID;
+	hdr.hardware_revision	= HARDWARE_REV;
+	hdr.reserved[0]		= 0;
+	hdr.reserved[1]		= 0;
+	fwrite(& hdr, sizeof(hdr), 1, usr);
+	while ((n = fread(buf, 1, CHUNK, trx)))
+	{
+		if (hdr.len == 0 && strncmp(buf, TRX_MAGIC, strlen(TRX_MAGIC)) != 0)
+		{
+			break;
+		}
+		fwrite(& buf, 1, n, usr);
+		hdr.len += n;
+		hdr.crc32 = crc32( hdr.crc32, (uint8 *) & buf, n);
+	}
+	fseek(usr, 0L, SEEK_SET);
+	fwrite(& hdr, sizeof(hdr), 1, usr);
+	if (n != 0)
+	{
+		fprintf(stderr, "Input is not a TRX file\n");
+		return 1;
+	}
+	if (hdr.len == 0)
+	{
+		fprintf(stderr, "Empty input\n");
+		return 1;
+	}
+	if (ferror(trx))
+	{
+		fprintf(stderr, "Read error\n");
+		return 1;
+	}
+	if (ferror(usr))
+	{
+		fprintf(stderr, "Write error\n");
+		return 1;
+	}
+	return 0;
+}
+
+extern	int	main(int argc, char *argv[])
+{
+	FILE*	in;
+	FILE*	out;
+	int	ret;
+
+	if (argc != 3)
+	{
+		fprintf(stderr, "Usage: trx2usr <trx input> <usr output>\n");
+		exit(2);
+	}
+	in  = fopen(argv[1], "rb");
+	if (!in)
+	{
+		fprintf(stderr, "Cannot open \"%s\": %s\n", argv[1], strerror(errno));
+		exit(1);
+	}
+	out = fopen(argv[2], "wb");
+	if (!out)
+	{
+		fprintf(stderr, "Cannot create \"%s\": %s\n", argv[2], strerror(errno));
+		exit(1);
+	}
+	ret = trx2usr(in, out);
+	fclose(in);
+	fclose(out);
+	if (ret)
+	{
+		unlink(argv[2]);
+	}
+	return ret;
+}
diff --git a/trunk/tools/firmware-utils/src/wrt400n.c b/trunk/tools/firmware-utils/src/wrt400n.c
new file mode 100644
index 00000000..a9a49080
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/wrt400n.c
@@ -0,0 +1,334 @@
+/*
+ * WRT400n - Firmware Generation Creator
+ *
+ * Creates a firmware image for the Linksys WRT400n router,
+ * that can be uploaded via the firmware upload page,
+ * from a kernel image file and root fs file
+ *
+ *	Author: Sandeep Mistry
+ */
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "cyg_crc.h"
+
+// https://dev.openwrt.org/browser/trunk/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c
+static uint32_t crctab[257] =
+{
+	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,
+	0
+};
+
+static uint32_t crc32(uint8_t* buf, uint32_t len)
+{
+	register int i;
+	uint32_t sum;
+	register uint32_t s0;
+	s0 = ~0;
+	for (i = 0; i < len; i++)
+	{
+		s0 = (s0 >> 8) ^ crctab[(uint8_t) (s0 & 0xFF) ^ buf[i]];
+	}
+	sum = ~s0;
+	return sum;
+}
+
+#define HEADERSIZE	60
+#define MAGIC		"GMTKRT400N"
+
+// global variables
+uint8_t kernelbuf[0x100000];	// kernel - lzma - uImage
+uint8_t rootfsbuf[0x2FFFC4];	// root - squashfs
+
+uint8_t buf[0x400000];		// buffer for image
+
+
+// Header format:
+//
+//		GPL Tarball: http://downloads.linksysbycisco.com/downloads/WRT400N_1.0.01.19_US.tar,0.gz
+//		File: WRT400N_1.0.01.19_US/FW_WRT400N_1.0.01.19_US_20081229/GTK/user/include/fw_upgrade.h
+//
+//
+//		Struct:
+//			typedef struct
+//			{
+//				UINT32		checksum;		/* CRC32 */
+//				UINT8			magic[11];		/* The value of GTIMG_MAGIC */
+//				UINT32		kernel_length;		/* The length of the kernel image */
+//				//UINT32		kernel_entry_point;	/* Kernel's entry point for RedBoot's information */
+//				UINT32		kernel_upgrade_flag;	/* Set to 1 if we need to upgrade the kernel parition of the Flash */
+//				UINT32		rootfs_length;		/* The length of the rootfs image */
+//				//UINT32		rootfs_entry_point;	/* Not in use */
+//				UINT32		rootfs_upgrade_flag;	/* Set to 1 if we need to upgrade the rootfs parition of the Flash */
+//
+//				// Add 3 items by Vic Yu, 2006-05/10
+//				UINT32		kernel_checksum;
+//				UINT32		rootfs_checksum;
+//				UINT32		fw_totalsize;
+//				UINT32		reserved[4];
+//			}imghdr_t , *pLinuxFWHeader_T;
+//
+//
+//		Description
+//			- checksum: 			CRC32 of kernel and root fs, back to back
+//			- magic:				GMTKRT400N
+//			- kernel_length:		kernel length in bytes
+//			- kernel_upgrade_flag:	should we upgrade the kernel - set to 1
+//			- rootfs_length:		root fs length in byte
+//			- rootfs_upgrade_flag:	should we upgrade the root fs - set to 1
+//			- kernel_checksum: 		Gary S. Brown's 32 bit CRC algorithm for kernel, with remaining bits
+//									set to 0xFF upto 0x100000 bytes (total length)
+//			- rootfs_checksum:		Gary S. Brown's 32 bit CRC algorithm for root fs, with remaining bits
+//									set to 0xFF upto 0x2FFFC4 bytes	(total length)
+//			- fw_totalsize:			total firmware image file length (header length + kernel length + root fs length)
+//			- reserved[4]:			reserved ??? - set to all 0xFF
+
+
+
+int main(int argc, char *argv[])
+{
+	// file descriptors ...
+	int 		kernelfd		= -1;
+	int 		rootfsfd			= -1;
+	int			outfd			= -1;
+
+	char*		kernelfilename	= NULL;
+	char*		rootfsfilename	= NULL;
+	char*		outputfilename	= NULL;
+
+	// file sizes
+	uint32_t 	kernelsize 		= 0;
+	uint32_t 	rootfssize 		= 0;
+	uint32_t 	totalsize 		= 0;
+
+	// header flags
+	uint32_t 	kernelflag 		= 0;
+	uint32_t 	rootfsflag 		= 0;
+
+	// checksums
+	uint32_t 	kernelchecksum 	= 0;
+	uint32_t 	rootfschecksum 	= 0;
+	uint32_t	crc				= 0;
+
+	if(argc != 4)
+	{
+		printf("Usage:\n\t%s <kernel file> <rootfs file> <output file>\n", argv[0]);
+		return 1;
+	}
+
+	kernelfilename = argv[1];
+	rootfsfilename = argv[2];
+	outputfilename = argv[3];
+
+	// Fill the kernel, rootfs, main buffer
+	memset(kernelbuf, 0xFF, sizeof(kernelbuf));
+	memset(rootfsbuf, 0xFF, sizeof(rootfsbuf));
+	memset(buf, 0xFF, sizeof(buf));
+
+	// open the kernel ..
+	kernelfd = open(kernelfilename, O_RDONLY);
+
+	if(kernelfd == -1)
+	{
+		printf("Error: opening '%s'\n", kernelfilename);
+		goto done;
+	}
+
+	// read in the kernel ...
+	kernelsize = read(kernelfd, kernelbuf, sizeof(kernelbuf));
+
+	if(kernelsize == -1)
+	{
+		printf("Error: reading '%s'\n", kernelfilename);
+		goto done;
+	}
+
+	// calculate the kernel checksum ...
+	kernelchecksum = cyg_crc32_accumulate(0, kernelbuf, sizeof(kernelbuf));
+
+	// print out stats
+	printf("%s: size %d (0x%x), crc32 = 0x%x\n", kernelfilename, kernelsize, kernelsize, kernelchecksum);
+
+
+	// open the root fs ..
+	rootfsfd = open(rootfsfilename, O_RDONLY);
+
+	if(rootfsfd == -1)
+	{
+		printf("Error: opening '%s'\n", rootfsfilename);
+		goto done;
+	}
+
+	// read in the root fs ..
+	rootfssize = read(rootfsfd, rootfsbuf, sizeof(rootfsbuf));
+
+	if(rootfssize == -1)
+	{
+		printf("Error: reading '%s'\n", rootfsfilename);
+		goto done;
+	}
+
+	// calculate the root fs checksum ...
+	rootfschecksum = cyg_crc32_accumulate(0, rootfsbuf, sizeof(rootfsbuf));
+
+	// print out stats
+	printf("%s: size %d (0x%x), crc32 = 0x%x\n", rootfsfilename, rootfssize, rootfssize, rootfschecksum);
+
+
+	// now for the header ...
+
+	totalsize = HEADERSIZE;
+
+	// copy over kernel
+	memcpy(buf + totalsize, kernelbuf, kernelsize);
+	totalsize += kernelsize;
+
+	// copy over root fs
+	memcpy(buf + totalsize, rootfsbuf, rootfssize);
+	totalsize += rootfssize;
+
+	// calculate crc
+	crc = crc32(buf + HEADERSIZE, totalsize - HEADERSIZE);
+
+	// print some stats out
+	printf("crc = 0x%x, total size = %d (0x%x)\n", crc, totalsize, totalsize);
+
+	// copy crc into header
+	crc = htonl(crc);
+	memcpy(buf, &crc, sizeof(crc));
+
+	// copy over magic
+	strcpy((char *)buf + 4, MAGIC);
+
+	// copy over kernel size
+	kernelsize = htonl(kernelsize);
+	memcpy(buf + 16, &kernelsize, sizeof(kernelsize));
+
+	// copy over kernal flag
+	kernelflag = htonl(0x1);
+	memcpy(buf + 20, &kernelflag, sizeof(kernelflag));
+
+	// copy over root fs size
+	rootfssize = htonl(rootfssize);
+	memcpy(buf + 24, &rootfssize, sizeof(rootfssize));
+
+	// copy over root fs flag
+	rootfsflag = htonl(0x1);
+	memcpy(buf + 28, &rootfsflag, sizeof(rootfsflag));
+
+	// copy over kernel check sum
+	kernelchecksum = htonl(kernelchecksum);
+	memcpy(buf + 32, &kernelchecksum, sizeof(kernelchecksum));
+
+	// copy over root fs checksum
+	rootfschecksum = htonl(rootfschecksum);
+	memcpy(buf + 36, &rootfschecksum, sizeof(rootfschecksum));
+
+	// copy over total size
+	totalsize = htonl(totalsize);
+	memcpy(buf + 40, &totalsize, sizeof(totalsize));
+
+	// undo the htonl (for write)
+	totalsize = htonl(totalsize);
+
+
+	// write out the file from the buffer
+	outfd = open(outputfilename, O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+	if(outfd == -1)
+	{
+		printf("ERROR: opening '%s' for write\n", outputfilename);
+	}
+
+	write(outfd, buf, totalsize);
+
+done:
+	// close open fd's
+
+	if(kernelfd != -1)
+	{
+		close(kernelfd);
+		kernelfd = -1;
+	}
+
+	if(rootfsfd != -1)
+	{
+		close(rootfsfd);
+		rootfsfd = -1;
+	}
+
+	if(outfd != -1)
+	{
+		close(outfd);
+		outfd = -1;
+	}
+
+	return 0;
+}
diff --git a/trunk/tools/firmware-utils/src/xorimage.c b/trunk/tools/firmware-utils/src/xorimage.c
new file mode 100644
index 00000000..b5ab83fa
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/xorimage.c
@@ -0,0 +1,135 @@
+/*
+ * xorimage.c - partially based on OpenWrt's addpattern.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+static char default_pattern[] = "12345678";
+
+
+int xor_data(uint8_t *data, size_t len, const uint8_t *pattern, int p_len, int p_off)
+{
+	int offset = p_off;
+	while (len--) {
+		*data ^= pattern[offset];
+		data++;
+		offset = (offset + 1) % p_len;
+	}
+	return offset;
+}
+
+
+void usage(void) __attribute__ (( __noreturn__ ));
+
+void usage(void)
+{
+	fprintf(stderr, "Usage: xorimage [-i infile] [-o outfile] [-p <pattern>]\n");
+	exit(EXIT_FAILURE);
+}
+
+
+int main(int argc, char **argv)
+{
+	char buf[1024];	/* keep this at 1k or adjust garbage calc below */
+	FILE *in = stdin;
+	FILE *out = stdout;
+	char *ifn = NULL;
+	char *ofn = NULL;
+	const char *pattern = default_pattern;
+	int c;
+	int v0, v1, v2;
+	size_t n;
+	int p_len, p_off = 0;
+
+	while ((c = getopt(argc, argv, "i:o:p:h")) != -1) {
+		switch (c) {
+			case 'i':
+				ifn = optarg;
+				break;
+			case 'o':
+				ofn = optarg;
+				break;
+			case 'p':
+				pattern = optarg;
+				break;
+			case 'h':
+			default:
+				usage();
+		}
+	}
+
+	if (optind != argc || optind == 1) {
+		fprintf(stderr, "illegal arg \"%s\"\n", argv[optind]);
+		usage();
+	}
+
+	if (ifn && !(in = fopen(ifn, "r"))) {
+		fprintf(stderr, "can not open \"%s\" for reading\n", ifn);
+		usage();
+	}
+
+	if (ofn && !(out = fopen(ofn, "w"))) {
+		fprintf(stderr, "can not open \"%s\" for writing\n", ofn);
+		usage();
+	}
+
+	p_len = strlen(pattern);
+
+	if (p_len == 0) {
+		fprintf(stderr, "pattern cannot be empty\n");
+		usage();
+	}
+
+
+	while ((n = fread(buf, 1, sizeof(buf), in)) > 0) {
+		if (n < sizeof(buf)) {
+			if (ferror(in)) {
+			FREAD_ERROR:
+				fprintf(stderr, "fread error\n");
+				return EXIT_FAILURE;
+			}
+		}
+
+		p_off = xor_data(buf, n, pattern, p_len, p_off);
+
+		if (!fwrite(buf, n, 1, out)) {
+		FWRITE_ERROR:
+			fprintf(stderr, "fwrite error\n");
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (ferror(in)) {
+		goto FREAD_ERROR;
+	}
+
+	if (fflush(out)) {
+		goto FWRITE_ERROR;
+	}
+
+	fclose(in);
+	fclose(out);
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/firmware-utils/src/zynos.h b/trunk/tools/firmware-utils/src/zynos.h
new file mode 100644
index 00000000..aaf0fc8a
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/zynos.h
@@ -0,0 +1,225 @@
+/*
+ *
+ *  Copyright (C) 2007-2008 OpenWrt.org
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg at openwrt.org>
+ *
+ *  This code was based on the information of the ZyXEL's firmware
+ *  image format written by Kolja Waschk, can be found at:
+ *  http://www.ixo.de/info/zyxel_uclinux
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#ifndef _ZYNOS_H
+#define _ZYNOS_H
+
+#define BOOTBASE_NAME_LEN	32
+#define BOOTBASE_MAC_LEN	6
+#define BOOTBASE_FEAT_LEN	22
+
+#define BOOTEXT_DEF_SIZE	0x18000
+
+struct zyn_bootbase_info {
+	char		vendor[BOOTBASE_NAME_LEN]; /* Vendor name */
+	char		model[BOOTBASE_NAME_LEN]; /* Model name */
+	uint32_t	bootext_addr;	/* absolute address of the Boot Extension */
+	uint16_t	res0;		/* reserved/unknown */
+	uint8_t		sys_type;	/* system type */
+	uint8_t		res1;		/* reserved/unknown */
+	uint16_t	model_id;	/* model id */
+	uint8_t		feat_other[BOOTBASE_FEAT_LEN]; /* other feature bits */
+	uint8_t		feat_main;	/* main feature bits */
+	uint8_t		res2;		/* reserved/unknown */
+	uint8_t		mac[BOOTBASE_MAC_LEN]; /* mac address */
+	uint8_t		country;	/* default country code */
+	uint8_t		dbgflag;	/* debug flag */
+} __attribute__((packed));
+
+#define ROMBIN_SIG_LEN	3
+#define ROMBIN_VER_LEN	15
+
+struct zyn_rombin_hdr {
+	uint32_t	addr;		/* load address of the object */
+	uint16_t	res0;		/* unknown/unused */
+	char		sig[ROMBIN_SIG_LEN];	/* magic, must be "SIG" */
+	uint8_t		type;		/* type of the object */
+	uint32_t	osize;		/* size of the uncompressed data */
+	uint32_t	csize;		/* size of the compressed data */
+	uint8_t		flags;		/* various flags */
+	uint8_t		res1;		/* unknown/unused */
+	uint16_t	ocsum;		/* csum of the uncompressed data */
+	uint16_t	ccsum;		/* csum of the compressed data */
+	char		ver[ROMBIN_VER_LEN];
+	uint32_t	mmap_addr;	/* address of the Memory Map Table*/
+	uint32_t	res2;		/* unknown/unused*/
+	uint8_t		res3;		/* unknown/unused*/
+} __attribute__((packed));
+
+#define ROMBIN_SIGNATURE	"SIG"
+
+/* Rombin flag bits */
+#define ROMBIN_FLAG_01		0x01
+#define ROMBIN_FLAG_02		0x02
+#define ROMBIN_FLAG_04		0x04
+#define ROMBIN_FLAG_08		0x08
+#define ROMBIN_FLAG_10		0x10
+#define ROMBIN_FLAG_CCSUM	0x20	/* compressed checksum is valid */
+#define ROMBIN_FLAG_OCSUM	0x40	/* original checksum is valid */
+#define ROMBIN_FLAG_COMPRESSED	0x80	/* the binary is compressed */
+
+/* Object types */
+#define OBJECT_TYPE_ROMIMG	0x01
+#define OBJECT_TYPE_ROMBOOT	0x02
+#define OBJECT_TYPE_BOOTEXT	0x03
+#define OBJECT_TYPE_ROMBIN	0x04
+#define OBJECT_TYPE_ROMDIR	0x05
+#define OBJECT_TYPE_6		0x06
+#define OBJECT_TYPE_ROMMAP	0x07
+#define OBJECT_TYPE_RAM		0x80
+#define OBJECT_TYPE_RAMCODE	0x81
+#define OBJECT_TYPE_RAMBOOT	0x82
+
+/*
+ * Memory Map Table header
+ */
+struct zyn_mmt_hdr {
+	uint16_t	count;
+	uint32_t	user_start;
+	uint32_t	user_end;
+	uint16_t	csum;
+	uint8_t		res[12];
+} __attribute__((packed));
+
+#define OBJECT_NAME_LEN		8
+
+struct zyn_mmt_item {
+	uint8_t		type;	/* type of the object */
+	uint8_t		name[OBJECT_NAME_LEN]; /* name of the object */
+	uint8_t		res0;	/* unused/unknown */
+	uint32_t	addr;
+	uint32_t	size;	/* size of the object */
+	uint8_t		res1[3]; /* unused/unknown */
+	uint8_t		type2;
+} __attribute__((packed));
+
+/*
+ * Vendor IDs
+ */
+#define ZYNOS_VENDOR_ID_ZYXEL	0
+#define ZYNOS_VENDOR_ID_NETGEAR	1
+#define ZYNOS_VENDOR_ID_DLINK	2
+#define ZYNOS_VENDOR_ID_03	3
+#define ZYNOS_VENDOR_ID_LUCENT	4
+#define ZYNOS_VENDOR_ID_O2	10
+
+/*
+ * Model IDs (in big-endian format)
+ */
+#define MID(x)	(((x) & 0xFF) << 8) | (((x) & 0xFF00) >> 8)
+
+/*
+ * Infineon/ADMtek ADM5120 based models
+ */
+#define ZYNOS_MODEL_ES_2024A		MID(  221)
+#define ZYNOS_MODEL_ES_2024PWR		MID( 4097)
+#define ZYNOS_MODEL_ES_2108		MID(61952)
+#define ZYNOS_MODEL_ES_2108_F		MID(44801)
+#define ZYNOS_MODEL_ES_2108_G		MID(62208)
+#define ZYNOS_MODEL_ES_2108_LC		MID(64512)
+#define ZYNOS_MODEL_ES_2108PWR		MID(62464)
+#define ZYNOS_MODEL_HS_100		MID(61855)
+#define ZYNOS_MODEL_HS_100W		ZYNOS_MODEL_HS_100
+#define ZYNOS_MODEL_P_334		MID(62879)
+#define ZYNOS_MODEL_P_334U		MID(56735)
+#define ZYNOS_MODEL_P_334W		MID(62367)
+#define ZYNOS_MODEL_P_334WH		MID(57344)
+#define ZYNOS_MODEL_P_334WHD		MID(57600)
+#define ZYNOS_MODEL_P_334WT		MID(61343)
+#define ZYNOS_MODEL_P_335		MID(60831)
+#define ZYNOS_MODEL_P_335PLUS		MID( 9472)
+#define ZYNOS_MODEL_P_335U		MID(56479)
+#define ZYNOS_MODEL_P_335WT		ZYNOS_MODEL_P_335
+
+/*
+ * Texas Instruments AR7 based models
+ */
+#define ZYNOS_MODEL_P_2602H_61C		MID( 3229)
+#define ZYNOS_MODEL_P_2602H_63C		MID( 3485)
+#define ZYNOS_MODEL_P_2602H_D1A		/* n.a. */
+#define ZYNOS_MODEL_P_2602H_D3A		/* n.a. */
+#define ZYNOS_MODEL_P_2602HW_61C	/* n.a. */
+#define ZYNOS_MODEL_P_2602HW_63		/* n.a. */
+#define ZYNOS_MODEL_P_2602HW_63C	ZYNOS_MODEL_P_2602H_63C
+#define ZYNOS_MODEL_P_2602HW_D1A	MID( 6301)
+#define ZYNOS_MODEL_P_2602HW_D3A	/* n.a. */
+#define ZYNOS_MODEL_P_2602HWL_61	MID( 1181)
+#define ZYNOS_MODEL_P_2602HWL_61C	ZYNOS_MODEL_P_2602H_61C
+#define ZYNOS_MODEL_P_2602HWL_63C	ZYNOS_MODEL_P_2602H_63C
+#define ZYNOS_MODEL_P_2602HWL_D1A	ZYNOS_MODEL_P_2602HW_D1A
+#define ZYNOS_MODEL_P_2602HWL_D3A	MID( 7581)
+#define ZYNOS_MODEL_P_2602HWN_D7A	MID(30464)
+#define ZYNOS_MODEL_P_2602HWNLI_D7A	MID( 6813)
+
+#define ZYNOS_MODEL_P_2602R_61		MID( 2205)
+#define ZYNOS_MODEL_P_2602R_63		MID( 3997)
+#define ZYNOS_MODEL_P_2602R_D1A		/* n.a. */
+#define ZYNOS_MODEL_P_2602R_D3A		/* n.a. */
+#define ZYNOS_MODEL_P_2602RL_D1A	MID( 6045)
+#define ZYNOS_MODEL_P_2602RL_D3A	MID( 7069)
+
+#define ZYNOS_MODEL_P_660H_61		MID(19346)
+#define ZYNOS_MODEL_P_660H_63		MID(22162)
+#define ZYNOS_MODEL_P_660H_67		/* n.a. */
+#define ZYNOS_MODEL_P_660H_D1		MID( 7066)
+#define ZYNOS_MODEL_P_660H_D3		MID(13210)
+
+#define ZYNOS_MODEL_P_660HW_61		ZYNOS_MODEL_P_660H_61
+#define ZYNOS_MODEL_P_660HW_63		ZYNOS_MODEL_P_660H_63
+#define ZYNOS_MODEL_P_660HW_67		ZYNOS_MODEL_P_660HW_63
+#define ZYNOS_MODEL_P_660HW_D1		MID( 9114)
+#define ZYNOS_MODEL_P_660HW_D3		MID(12698)
+
+#define ZYNOS_MODEL_P_660R_61		MID(20882)
+#define ZYNOS_MODEL_P_660R_61C		MID( 1178)
+#define ZYNOS_MODEL_P_660R_63		MID(21138)
+#define ZYNOS_MODEL_P_660R_63C		MID(  922)
+#define ZYNOS_MODEL_P_660R_67		ZYNOS_MODEL_P_660R_63
+#define ZYNOS_MODEL_P_660R_67C		/* n.a. */
+#define ZYNOS_MODEL_P_660R_D1		MID( 7322)
+#define ZYNOS_MODEL_P_660R_D3		MID(10138)
+
+#define ZYNOS_MODEL_P_661H_61		MID(19346)
+#define ZYNOS_MODEL_P_661H_63		MID( 1946)
+#define ZYNOS_MODEL_P_661H_D1		MID(10650)
+#define ZYNOS_MODEL_P_661H_D3		MID(12442)
+
+#define ZYNOS_MODEL_P_661HW_61		ZYNOS_MODEL_P_661H_61
+#define ZYNOS_MODEL_P_661HW_63		ZYNOS_MODEL_P_661H_63
+#define ZYNOS_MODEL_P_661HW_D1		MID(10906)
+#define ZYNOS_MODEL_P_661HW_D3		MID(14746)
+
+#define ZYNOS_MODEL_P_662H_61		MID(22418)
+#define ZYNOS_MODEL_P_662H_63		/* n.a. */
+#define ZYNOS_MODEL_P_662H_67		/* n.a. */
+#define ZYNOS_MODEL_P_662H_D1		/* n.a. */
+#define ZYNOS_MODEL_P_662H_D3		/* n.a. */
+
+#define ZYNOS_MODEL_P_662HW_61		/* n.a. */
+#define ZYNOS_MODEL_P_662HW_63		MID(22674)
+#define ZYNOS_MODEL_P_662HW_67		/* n.a. */
+#define ZYNOS_MODEL_P_662HW_D1		MID(10394)
+#define ZYNOS_MODEL_P_662HW_D3		MID(12954)
+
+/* OEM boards */
+#define ZYNOS_MODEL_O2SURF		ZYNOS_MODEL_P_2602HWN_D7A
+
+/* Atheros AR2318 based boards */
+#define ZYNOS_MODEL_NBG_318S		MID(59392)
+
+/* Atheros AR71xx based boards */
+#define ZYNOS_MODEL_NBG_460N		MID(61441)
+
+#endif /* _ZYNOS_H */
diff --git a/trunk/tools/firmware-utils/src/zyxbcm.c b/trunk/tools/firmware-utils/src/zyxbcm.c
new file mode 100644
index 00000000..cfd00d3b
--- /dev/null
+++ b/trunk/tools/firmware-utils/src/zyxbcm.c
@@ -0,0 +1,259 @@
+/*
+ * zyxbcm.c - based on Jonas Gorski's spw303v.c
+ *
+ * Copyright (C) 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#define TAGVER_LEN 4			/* Length of Tag Version */
+#define SIG1_LEN 20			/* Company Signature 1 Length */
+#define SIG2_LEN 14			/* Company Signature 2 Lenght */
+#define BOARDID_LEN 16			/* Length of BoardId */
+#define ENDIANFLAG_LEN 2		/* Endian Flag Length */
+#define CHIPID_LEN 6			/* Chip Id Length */
+#define IMAGE_LEN 10			/* Length of Length Field */
+#define ADDRESS_LEN 12			/* Length of Address field */
+#define DUALFLAG_LEN 2			/* Dual Image flag Length */
+#define INACTIVEFLAG_LEN 2		/* Inactie Flag Length */
+#define RSASIG_LEN 20			/* Length of RSA Signature in tag */
+#define TAGINFO1_LEN 30			/* Length of vendor information field1 in tag */
+#define ZYX_TAGINFO1_LEN 20		/* Length of vendor information field1 in tag */
+#define FLASHLAYOUTVER_LEN 4		/* Length of Flash Layout Version String tag */
+#define TAGINFO2_LEN 16			/* Length of vendor information field2 in tag */
+#define CRC_LEN 4			/* Length of CRC in bytes */
+
+#define IMAGETAG_CRC_START 0xFFFFFFFF
+
+struct bcm_tag {
+	char tagVersion[TAGVER_LEN];			// 0-3: Version of the image tag
+	char sig_1[SIG1_LEN];				// 4-23: Company Line 1
+	char sig_2[SIG2_LEN];				// 24-37: Company Line 2
+	char chipid[CHIPID_LEN];			// 38-43: Chip this image is for
+	char boardid[BOARDID_LEN];			// 44-59: Board name
+	char big_endian[ENDIANFLAG_LEN];		// 60-61: Map endianness -- 1 BE 0 LE
+	char totalLength[IMAGE_LEN];			// 62-71: Total length of image
+	char cfeAddress[ADDRESS_LEN];			// 72-83: Address in memory of CFE
+	char cfeLength[IMAGE_LEN];			// 84-93: Size of CFE
+	char flashImageStart[ADDRESS_LEN];		// 94-105: Address in memory of image start (kernel for OpenWRT, rootfs for stock firmware)
+	char flashRootLength[IMAGE_LEN];		// 106-115: Size of rootfs for flashing
+	char kernelAddress[ADDRESS_LEN];		// 116-127: Address in memory of kernel
+	char kernelLength[IMAGE_LEN];			// 128-137: Size of kernel
+	char dualImage[DUALFLAG_LEN];			// 138-139: Unused at present
+	char inactiveFlag[INACTIVEFLAG_LEN];		// 140-141: Unused at present
+	char rsa_signature[RSASIG_LEN];			// 142-161: RSA Signature (unused at present; some vendors may use this)
+	char information1[TAGINFO1_LEN];		// 162-191: Compilation and related information (not generated/used by OpenWRT)
+	char flashLayoutVer[FLASHLAYOUTVER_LEN];	// 192-195: Version flash layout
+	char fskernelCRC[CRC_LEN];			// 196-199: kernel+rootfs CRC32
+	char information2[TAGINFO2_LEN];		// 200-215: Unused at present except Alice Gate where is is information
+	char imageCRC[CRC_LEN];				// 216-219: CRC32 of image less imagetag (kernel for Alice Gate)
+	char rootfsCRC[CRC_LEN];			// 220-223: CRC32 of rootfs partition
+	char kernelCRC[CRC_LEN];			// 224-227: CRC32 of kernel partition
+	char imageSequence[4];				// 228-231: Image sequence number
+	char rootLength[4];				// 232-235: steal from reserved1 to keep the real root length so we can use in the flash map even after we have change the rootLength to 0 to satisfy devices that check CRC on every boot
+	char headerCRC[CRC_LEN];			// 236-239: CRC32 of header excluding tagVersion
+	char reserved2[16];				// 240-255: Unused at present
+};
+
+struct zyxbcm_tag {
+	char tagVersion[TAGVER_LEN];			// 0-3: Version of the image tag
+	char sig_1[SIG1_LEN];				// 4-23: Company Line 1
+	char sig_2[SIG2_LEN];				// 24-37: Company Line 2
+	char chipid[CHIPID_LEN];			// 38-43: Chip this image is for
+	char boardid[BOARDID_LEN];			// 44-59: Board name
+	char big_endian[ENDIANFLAG_LEN];		// 60-61: Map endianness -- 1 BE 0 LE
+	char totalLength[IMAGE_LEN];			// 62-71: Total length of image
+	char cfeAddress[ADDRESS_LEN];			// 72-83: Address in memory of CFE
+	char cfeLength[IMAGE_LEN];			// 84-93: Size of CFE
+	char flashImageStart[ADDRESS_LEN];		// 94-105: Address in memory of image start (kernel for OpenWRT, rootfs for stock firmware)
+	char flashRootLength[IMAGE_LEN];		// 106-115: Size of rootfs for flashing
+	char kernelAddress[ADDRESS_LEN];		// 116-127: Address in memory of kernel
+	char kernelLength[IMAGE_LEN];			// 128-137: Size of kernel
+	char dualImage[DUALFLAG_LEN];			// 138-139: Unused at present
+	char inactiveFlag[INACTIVEFLAG_LEN];		// 140-141: Unused at present
+	char rsa_signature[RSASIG_LEN];			// 142-161: RSA Signature (unused at present; some vendors may use this)
+	char information1[ZYX_TAGINFO1_LEN];		// 162-181: Compilation and related information (not generated/used by OpenWRT)
+	char flashImageEnd[ADDRESS_LEN];		// 182-193: Address in memory of image end
+	char fskernelCRC[CRC_LEN];			// 194-197: kernel+rootfs CRC32
+	char reserved1[2];				// 198-199: Unused at present
+	char information2[TAGINFO2_LEN];		// 200-215: Unused at present except Alice Gate where is is information
+	char imageCRC[CRC_LEN];				// 216-219: CRC32 of image less imagetag (kernel for Alice Gate)
+	char rootfsCRC[CRC_LEN];			// 220-223: CRC32 of rootfs partition
+	char kernelCRC[CRC_LEN];			// 224-227: CRC32 of kernel partition
+	char imageSequence[4];				// 228-231: Image sequence number
+	char rootLength[4];				// 232-235: steal from reserved1 to keep the real root length so we can use in the flash map even after we have change the rootLength to 0 to satisfy devices that check CRC on every boot
+	char headerCRC[CRC_LEN];			// 236-239: CRC32 of header excluding tagVersion
+	char reserved2[16];				// 240-255: Unused at present
+};
+
+static uint32_t crc32tab[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
+};
+
+uint32_t crc32(uint32_t crc, uint8_t *data, size_t len)
+{
+	while (len--)
+		crc = (crc >> 8) ^ crc32tab[(crc ^ *data++) & 0xFF];
+
+	return crc;
+}
+
+void fix_header(void *buf)
+{
+	struct bcm_tag *bcmtag = buf;
+	struct zyxbcm_tag *zyxtag = buf;
+	uint8_t fskernel_crc[CRC_LEN];
+	uint32_t crc;
+	uint64_t flash_start, rootfs_len, kernel_len;
+
+	/* Backup values */
+	flash_start = strtoul(bcmtag->flashImageStart, NULL, 10);
+	rootfs_len = strtoul(bcmtag->flashRootLength, NULL, 10);
+	kernel_len = strtoul(bcmtag->kernelLength, NULL, 10);
+	memcpy(fskernel_crc, bcmtag->fskernelCRC, CRC_LEN);
+
+	/* Clear values */
+	zyxtag->information1[ZYX_TAGINFO1_LEN - 1] = 0;
+	memset(zyxtag->flashImageEnd, 0, ADDRESS_LEN);
+	memset(zyxtag->fskernelCRC, 0, CRC_LEN);
+	memset(zyxtag->reserved1, 0, 2);
+
+	/* Replace values */
+	sprintf(zyxtag->flashImageEnd, "%lu", flash_start + rootfs_len + kernel_len);
+	memcpy(zyxtag->fskernelCRC, fskernel_crc, CRC_LEN);
+
+	/* Update tag crc */
+	crc = htonl(crc32(IMAGETAG_CRC_START, buf, 236));
+	memcpy(zyxtag->headerCRC, &crc, 4);
+}
+
+void usage(void) __attribute__ (( __noreturn__ ));
+
+void usage(void)
+{
+	fprintf(stderr, "Usage: zyxbcm [-i <inputfile>] [-o <outputfile>]\n");
+	exit(EXIT_FAILURE);
+}
+
+int main(int argc, char **argv)
+{
+	char buf[1024];	/* keep this at 1k or adjust garbage calc below */
+	FILE *in = stdin, *out = stdout;
+	char *ifn = NULL, *ofn = NULL;
+	size_t n;
+	int c, first_block = 1;
+
+	while ((c = getopt(argc, argv, "i:o:h")) != -1) {
+		switch (c) {
+			case 'i':
+				ifn = optarg;
+				break;
+			case 'o':
+				ofn = optarg;
+				break;
+			case 'h':
+			default:
+				usage();
+		}
+	}
+
+	if (optind != argc || optind == 1) {
+		fprintf(stderr, "illegal arg \"%s\"\n", argv[optind]);
+		usage();
+	}
+
+	if (ifn && !(in = fopen(ifn, "r"))) {
+		fprintf(stderr, "can not open \"%s\" for reading\n", ifn);
+		usage();
+	}
+
+	if (ofn && !(out = fopen(ofn, "w"))) {
+		fprintf(stderr, "can not open \"%s\" for writing\n", ofn);
+		usage();
+	}
+
+	while ((n = fread(buf, 1, sizeof(buf), in)) > 0) {
+		if (n < sizeof(buf)) {
+			if (ferror(in)) {
+			FREAD_ERROR:
+				fprintf(stderr, "fread error\n");
+				return EXIT_FAILURE;
+			}
+		}
+
+		if (first_block && n >= 256) {
+			fix_header(buf);
+			first_block = 0;
+		}
+
+		if (!fwrite(buf, n, 1, out)) {
+		FWRITE_ERROR:
+			fprintf(stderr, "fwrite error\n");
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (ferror(in)) {
+		goto FREAD_ERROR;
+	}
+
+	if (fflush(out)) {
+		goto FWRITE_ERROR;
+	}
+
+	fclose(in);
+	fclose(out);
+
+	return EXIT_SUCCESS;
+}
diff --git a/trunk/tools/flex/Makefile b/trunk/tools/flex/Makefile
new file mode 100644
index 00000000..90082df4
--- /dev/null
+++ b/trunk/tools/flex/Makefile
@@ -0,0 +1,29 @@
+# 
+# Copyright (C) 2008-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=flex
+PKG_VERSION:=2.5.39
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=77d44c6bb8c0705e0017ab9a84a1502b
+PKG_CAT:=bzcat
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_ARGS += --disable-shared
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/flex/patches/100-remove_no_undefined.patch b/trunk/tools/flex/patches/100-remove_no_undefined.patch
new file mode 100644
index 00000000..4e8aca13
--- /dev/null
+++ b/trunk/tools/flex/patches/100-remove_no_undefined.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -73,13 +73,13 @@ libfl_la_SOURCES = \
+ 	libmain.c \
+ 	libyywrap.c
+ 
+-libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+ 
+ libfl_pic_la_SOURCES = \
+ 	libmain.c \
+ 	libyywrap.c
+ 
+-libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+ 
+ noinst_HEADERS = \
+ 	flexdef.h \
diff --git a/trunk/tools/flock/Makefile b/trunk/tools/flock/Makefile
new file mode 100644
index 00000000..f5e13cd9
--- /dev/null
+++ b/trunk/tools/flock/Makefile
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := flock
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	mkdir -p $(HOST_BUILD_DIR)
+	$(HOSTCC) $(HOST_CFLAGS) $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/flock src/flock.c
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/flock $(STAGING_DIR_HOST)/bin/
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/flock/src/flock.c b/trunk/tools/flock/src/flock.c
new file mode 100644
index 00000000..13baec46
--- /dev/null
+++ b/trunk/tools/flock/src/flock.c
@@ -0,0 +1,325 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2003-2005 H. Peter Anvin - All Rights Reserved
+ *
+ *   Permission is hereby granted, free of charge, to any person
+ *   obtaining a copy of this software and associated documentation
+ *   files (the "Software"), to deal in the Software without
+ *   restriction, including without limitation the rights to use,
+ *   copy, modify, merge, publish, distribute, sublicense, and/or
+ *   sell copies of the Software, and to permit persons to whom
+ *   the Software is furnished to do so, subject to the following
+ *   conditions:
+ *
+ *   The above copyright notice and this permission notice shall
+ *   be included in all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *   OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * ----------------------------------------------------------------------- */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <signal.h>
+#include <ctype.h>
+#include <string.h>
+#include <paths.h>
+#include <sysexits.h>
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#define PACKAGE_STRING "util-linux-ng 2.18"
+#define _(x) (x)
+
+static const struct option long_options[] = {
+  { "shared",       0, NULL, 's' },
+  { "exclusive",    0, NULL, 'x' },
+  { "unlock",       0, NULL, 'u' },
+  { "nonblocking",  0, NULL, 'n' },
+  { "nb",           0, NULL, 'n' },
+  { "timeout",      1, NULL, 'w' },
+  { "wait",         1, NULL, 'w' },
+  { "close",        0, NULL, 'o' },
+  { "help",         0, NULL, 'h' },
+  { "version",      0, NULL, 'V' },
+  { 0, 0, 0, 0 }
+};
+
+const char *program;
+
+static void usage(int ex)
+{
+  fputs("flock (" PACKAGE_STRING ")\n", stderr);
+  fprintf(stderr,
+	_("Usage: %1$s [-sxun][-w #] fd#\n"
+	  "       %1$s [-sxon][-w #] file [-c] command...\n"
+	  "       %1$s [-sxon][-w #] directory [-c] command...\n"
+	  "  -s  --shared     Get a shared lock\n"
+	  "  -x  --exclusive  Get an exclusive lock\n"
+	  "  -u  --unlock     Remove a lock\n"
+	  "  -n  --nonblock   Fail rather than wait\n"
+	  "  -w  --timeout    Wait for a limited amount of time\n"
+	  "  -o  --close      Close file descriptor before running command\n"
+	  "  -c  --command    Run a single command string through the shell\n"
+	  "  -h  --help       Display this text\n"
+	  "  -V  --version    Display version\n"),
+	  program);
+  exit(ex);
+}
+
+
+static sig_atomic_t timeout_expired = 0;
+
+static void timeout_handler(int sig)
+{
+  (void)sig;
+
+  timeout_expired = 1;
+}
+
+
+static char * strtotimeval(const char *str, struct timeval *tv)
+{
+  char *s;
+  long fs;			/* Fractional seconds */
+  int i;
+
+  tv->tv_sec = strtol(str, &s, 10);
+  fs = 0;
+
+  if ( *s == '.' ) {
+    s++;
+
+    for ( i = 0 ; i < 6 ; i++ ) {
+      if ( !isdigit(*s) )
+	break;
+
+      fs *= 10;
+      fs += *s++ - '0';
+    }
+
+    for ( ; i < 6; i++ )
+      fs *= 10;
+
+    while ( isdigit(*s) )
+      s++;
+  }
+
+  tv->tv_usec = fs;
+  return s;
+}
+
+int main(int argc, char *argv[])
+{
+  struct itimerval timeout, old_timer;
+  int have_timeout = 0;
+  int type = LOCK_EX;
+  int block = 0;
+  int fd = -1;
+  int opt, ix;
+  int do_close = 0;
+  int err;
+  int status;
+  char *eon;
+  char **cmd_argv = NULL, *sh_c_argv[4];
+  const char *filename = NULL;
+  struct sigaction sa, old_sa;
+
+  program = argv[0];
+
+  if ( argc < 2 )
+    usage(EX_USAGE);
+
+  memset(&timeout, 0, sizeof timeout);
+
+  optopt = 0;
+  while ( (opt = getopt_long(argc, argv, "+sexnouw:hV?", long_options, &ix)) != EOF ) {
+    switch(opt) {
+    case 's':
+      type = LOCK_SH;
+      break;
+    case 'e':
+    case 'x':
+      type = LOCK_EX;
+      break;
+    case 'u':
+      type = LOCK_UN;
+      break;
+    case 'o':
+      do_close = 1;
+      break;
+    case 'n':
+      block = LOCK_NB;
+      break;
+    case 'w':
+      have_timeout = 1;
+      eon = strtotimeval(optarg, &timeout.it_value);
+      if ( *eon )
+	usage(EX_USAGE);
+      break;
+    case 'V':
+      printf("flock (%s)\n", PACKAGE_STRING);
+      exit(0);
+    default:
+      /* optopt will be set if this was an unrecognized option, i.e. *not* 'h' or '?' */
+      usage(optopt ? EX_USAGE : 0);
+      break;
+    }
+  }
+
+  if ( argc > optind+1 ) {
+    /* Run command */
+
+    if ( !strcmp(argv[optind+1], "-c") ||
+	 !strcmp(argv[optind+1], "--command") ) {
+
+      if ( argc != optind+3 ) {
+	fprintf(stderr, _("%s: %s requires exactly one command argument\n"),
+		program, argv[optind+1]);
+	exit(EX_USAGE);
+      }
+
+      cmd_argv = sh_c_argv;
+
+      cmd_argv[0] = getenv("SHELL");
+      if ( !cmd_argv[0] || !*cmd_argv[0] )
+	cmd_argv[0] = _PATH_BSHELL;
+
+      cmd_argv[1] = "-c";
+      cmd_argv[2] = argv[optind+2];
+      cmd_argv[3] = 0;
+    } else {
+      cmd_argv = &argv[optind+1];
+    }
+
+    filename = argv[optind];
+    fd = open(filename, O_RDONLY|O_NOCTTY|O_CREAT, 0666);
+    /* Linux doesn't like O_CREAT on a directory, even though it should be a
+       no-op */
+    if (fd < 0 && errno == EISDIR)
+        fd = open(filename, O_RDONLY|O_NOCTTY);
+
+    if ( fd < 0 ) {
+      err = errno;
+      fprintf(stderr, _("%s: cannot open lock file %s: %s\n"),
+	      program, argv[optind], strerror(err));
+      exit((err == ENOMEM||err == EMFILE||err == ENFILE) ? EX_OSERR :
+	   (err == EROFS||err == ENOSPC) ? EX_CANTCREAT :
+	   EX_NOINPUT);
+    }
+
+  } else if (optind < argc) {
+    /* Use provided file descriptor */
+
+    fd = (int)strtol(argv[optind], &eon, 10);
+    if ( *eon || !argv[optind] ) {
+      fprintf(stderr, _("%s: bad number: %s\n"), program, argv[optind]);
+      exit(EX_USAGE);
+    }
+
+  } else {
+    /* Bad options */
+
+    fprintf(stderr, _("%s: requires file descriptor, file or directory\n"),
+		program);
+    exit(EX_USAGE);
+  }
+
+
+  if ( have_timeout ) {
+    if ( timeout.it_value.tv_sec == 0 &&
+	 timeout.it_value.tv_usec == 0 ) {
+      /* -w 0 is equivalent to -n; this has to be special-cased
+	 because setting an itimer to zero means disabled! */
+
+      have_timeout = 0;
+      block = LOCK_NB;
+    } else {
+      memset(&sa, 0, sizeof sa);
+
+      sa.sa_handler = timeout_handler;
+      sa.sa_flags   = SA_RESETHAND;
+      sigaction(SIGALRM, &sa, &old_sa);
+
+      setitimer(ITIMER_REAL, &timeout, &old_timer);
+    }
+  }
+
+  while ( flock(fd, type|block) ) {
+    switch( (err = errno) ) {
+    case EWOULDBLOCK:		/* -n option set and failed to lock */
+      exit(1);
+    case EINTR:			/* Signal received */
+      if ( timeout_expired )
+	exit(1);		/* -w option set and failed to lock */
+      continue;			/* otherwise try again */
+    default:			/* Other errors */
+      if ( filename )
+	fprintf(stderr, "%s: %s: %s\n", program, filename, strerror(err));
+      else
+	fprintf(stderr, "%s: %d: %s\n", program, fd, strerror(err));
+      exit((err == ENOLCK||err == ENOMEM) ? EX_OSERR : EX_DATAERR);
+    }
+  }
+
+  if ( have_timeout ) {
+    setitimer(ITIMER_REAL, &old_timer, NULL); /* Cancel itimer */
+    sigaction(SIGALRM, &old_sa, NULL); /* Cancel signal handler */
+  }
+
+  status = 0;
+
+  if ( cmd_argv ) {
+    pid_t w, f;
+
+    /* Clear any inherited settings */
+    signal(SIGCHLD, SIG_DFL);
+    f = fork();
+
+    if ( f < 0 ) {
+      err = errno;
+      fprintf(stderr, _("%s: fork failed: %s\n"), program, strerror(err));
+      exit(EX_OSERR);
+    } else if ( f == 0 ) {
+      if ( do_close )
+	close(fd);
+      err = errno;
+      execvp(cmd_argv[0], cmd_argv);
+      /* execvp() failed */
+      fprintf(stderr, "%s: %s: %s\n", program, cmd_argv[0], strerror(err));
+      _exit((err == ENOMEM) ? EX_OSERR: EX_UNAVAILABLE);
+    } else {
+      do {
+	w = waitpid(f, &status, 0);
+	if (w == -1 && errno != EINTR)
+	  break;
+      } while ( w != f );
+
+      if (w == -1) {
+	err = errno;
+	status = EXIT_FAILURE;
+	fprintf(stderr, "%s: waitpid failed: %s\n", program, strerror(err));
+      } else if ( WIFEXITED(status) )
+	status = WEXITSTATUS(status);
+      else if ( WIFSIGNALED(status) )
+	status = WTERMSIG(status) + 128;
+      else
+	status = EX_OSERR;	/* WTF? */
+    }
+  }
+
+  return status;
+}
+
diff --git a/trunk/tools/genext2fs/Makefile b/trunk/tools/genext2fs/Makefile
new file mode 100644
index 00000000..57e8d35b
--- /dev/null
+++ b/trunk/tools/genext2fs/Makefile
@@ -0,0 +1,51 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=genext2fs
+PKG_VERSION:=1.4.1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/genext2fs
+PKG_MD5SUM:=b7b6361bcce2cedff1ae437fadafe53b
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_ARGS = \
+	--target=$(GNU_HOST_NAME) \
+	--host=$(GNU_HOST_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--program-prefix="" \
+	--program-suffix="" \
+	--prefix=/usr \
+	--exec-prefix=/usr \
+	--bindir=/usr/bin \
+	--sbindir=/usr/sbin \
+	--libexecdir=/usr/lib \
+	--sysconfdir=/etc \
+	--datadir=/usr/share \
+	--localstatedir=/var \
+	--mandir=/usr/man \
+	--infodir=/usr/info \
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
+		all
+endef
+
+define Host/Install
+	install -m0755 $(HOST_BUILD_DIR)/genext2fs $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/genext2fs
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/genext2fs/patches/100-c99_scanf.patch b/trunk/tools/genext2fs/patches/100-c99_scanf.patch
new file mode 100644
index 00000000..e7aa17cc
--- /dev/null
+++ b/trunk/tools/genext2fs/patches/100-c99_scanf.patch
@@ -0,0 +1,21 @@
+commit 3b8ca0ce9a0b58287a780747c90c449bdebfe464
+Author: Xavier Bestel <bestouff@users.sourceforge.net>
+Date:   Mon Jan 14 08:52:44 2008 +0000
+
+    removed use of %as is scanf (GNU conflicts with C99) by Giacomo Catenazzi <cate@debian.org>
+
+diff --git a/genext2fs.c b/genext2fs.c
+index 070b270..f0d797d 100644
+--- a/genext2fs.c
++++ b/genext2fs.c
+@@ -286,7 +286,9 @@ typedef unsigned int uint32;
+ // older solaris. Note that this is still not very portable, in that
+ // the return value cannot be trusted.
+ 
+-#if SCANF_CAN_MALLOC
++#if 0 // SCANF_CAN_MALLOC
++// C99 define "a" for floating point, so you can have runtime surprise
++// according the library versions
+ # define SCANF_PREFIX "a"
+ # define SCANF_STRING(s) (&s)
+ #else
diff --git a/trunk/tools/genext2fs/patches/200-autoconf.patch b/trunk/tools/genext2fs/patches/200-autoconf.patch
new file mode 100644
index 00000000..b3317bdd
--- /dev/null
+++ b/trunk/tools/genext2fs/patches/200-autoconf.patch
@@ -0,0 +1,13 @@
+Index: genext2fs/m4/ac_func_scanf_can_malloc.m4
+===================================================================
+--- genext2fs.orig/m4/ac_func_scanf_can_malloc.m4	2011-09-03 21:28:49.000000000 +0200
++++ genext2fs/m4/ac_func_scanf_can_malloc.m4	2011-09-03 21:29:41.000000000 +0200
+@@ -9,7 +9,7 @@
+ # --------------------------------------
+ AC_DEFUN([AC_FUNC_SCANF_CAN_MALLOC],
+   [ AC_CHECK_HEADERS([stdlib.h])
+-    AC_CACHE_CHECK([whether scanf can malloc], [ac_scanf_can_malloc],
++    AC_CACHE_CHECK([whether scanf can malloc], [ac_cv_func_scanf_can_malloc],
+     [ AC_RUN_IFELSE(
+       [ AC_LANG_PROGRAM(
+         [
diff --git a/trunk/tools/genext2fs/patches/300-blocksize-creator.patch b/trunk/tools/genext2fs/patches/300-blocksize-creator.patch
new file mode 100644
index 00000000..97a4836e
--- /dev/null
+++ b/trunk/tools/genext2fs/patches/300-blocksize-creator.patch
@@ -0,0 +1,558 @@
+Index: genext2fs/genext2fs.c
+===================================================================
+--- genext2fs.orig/genext2fs.c	2011-09-03 14:21:17.000000000 +0200
++++ genext2fs/genext2fs.c	2011-09-03 14:21:17.000000000 +0200
+@@ -151,13 +151,24 @@
+ 
+ // block size
+ 
+-#define BLOCKSIZE         1024
++static int blocksize = 1024;
++
++#define BLOCKSIZE         blocksize
+ #define BLOCKS_PER_GROUP  8192
+ #define INODES_PER_GROUP  8192
+ /* Percentage of blocks that are reserved.*/
+ #define RESERVED_BLOCKS       5/100
+ #define MAX_RESERVED_BLOCKS  25/100
+ 
++/* The default value for s_creator_os. */
++#if defined(__GNU__)
++# define CREATOR_OS  1 /* Hurd */
++#elif defined(__FreeBSD__)
++# define CREATOR_OS  3 /* FreeBSD */
++#else
++# define CREATOR_OS  0 /* Linux */
++#endif
++
+ 
+ // inode block size (why is it != BLOCKSIZE ?!?)
+ /* The field i_blocks in the ext2 inode stores the number of data blocks
+@@ -239,10 +250,10 @@
+ 	  (fs)->sb.s_blocks_per_group - 1) / (fs)->sb.s_blocks_per_group)
+ 
+ // Get group block bitmap (bbm) given the group number
+-#define GRP_GET_GROUP_BBM(fs,grp) ( get_blk((fs),(fs)->gd[(grp)].bg_block_bitmap) )
++#define GRP_GET_GROUP_BBM(fs,grp) ( get_blk((fs), get_gd((fs),(grp))->bg_block_bitmap) )
+ 
+ // Get group inode bitmap (ibm) given the group number
+-#define GRP_GET_GROUP_IBM(fs,grp) ( get_blk((fs),(fs)->gd[(grp)].bg_inode_bitmap) )
++#define GRP_GET_GROUP_IBM(fs,grp) ( get_blk((fs), get_gd((fs),(grp))->bg_inode_bitmap) )
+ 		
+ // Given an inode number find the group it belongs to
+ #define GRP_GROUP_OF_INODE(fs,nod) ( ((nod)-1) / (fs)->sb.s_inodes_per_group)
+@@ -532,7 +543,7 @@
+ 	char d_name[0];
+ } directory;
+ 
+-typedef uint8 block[BLOCKSIZE];
++typedef uint8 *block;
+ 
+ /* blockwalker fields:
+    The blockwalker is used to access all the blocks of a file (including
+@@ -571,16 +582,12 @@
+ 
+ 
+ /* Filesystem structure that support groups */
+-#if BLOCKSIZE == 1024
+ typedef struct
+ {
+-	block zero;            // The famous block 0
+-	superblock sb;         // The superblock
+-	groupdescriptor gd[0]; // The group descriptors
++	uint8 zero[1024];      // Room for bootloader stuff
++	superblock sb;         // The superblock, always at 1024
++	// group descriptors come next, see get_gd() below
+ } filesystem;
+-#else
+-#error UNHANDLED BLOCKSIZE
+-#endif
+ 
+ // now the endianness swap
+ 
+@@ -820,6 +827,14 @@
+ 	return (uint8*)fs + blk*BLOCKSIZE;
+ }
+ 
++// the group descriptors are aligned on the block size
++static inline groupdescriptor *
++get_gd(filesystem *fs, int no)
++{
++	int gdblk = (sizeof (filesystem) + BLOCKSIZE - 1) / BLOCKSIZE;
++	return ((groupdescriptor *) get_blk(fs, gdblk)) + no;
++}
++
+ // return a given inode from a filesystem
+ static inline inode *
+ get_nod(filesystem *fs, uint32 nod)
+@@ -829,7 +844,7 @@
+ 
+ 	offset = GRP_IBM_OFFSET(fs,nod);
+ 	grp = GRP_GROUP_OF_INODE(fs,nod);
+-	itab = (inode *)get_blk(fs, fs->gd[grp].bg_inode_table);
++	itab = (inode *)get_blk(fs, get_gd(fs,grp)->bg_inode_table);
+ 	return itab+offset-1;
+ }
+ 
+@@ -875,18 +890,18 @@
+ 
+ 	grp = GRP_GROUP_OF_INODE(fs,nod);
+ 	nbgroups = GRP_NBGROUPS(fs);
+-	if(!(bk = allocate(get_blk(fs,fs->gd[grp].bg_block_bitmap), 0))) {
++	if(!(bk = allocate(GRP_GET_GROUP_BBM(fs, grp), 0))) {
+ 		for(grp=0;grp<nbgroups && !bk;grp++)
+-			bk=allocate(get_blk(fs,fs->gd[grp].bg_block_bitmap),0);
++			bk = allocate(GRP_GET_GROUP_BBM(fs, grp), 0);
+ 		grp--;
+ 	}
+ 	if (!bk)
+ 		error_msg_and_die("couldn't allocate a block (no free space)");
+-	if(!(fs->gd[grp].bg_free_blocks_count--))
++	if(!(get_gd(fs, grp)->bg_free_blocks_count--))
+ 		error_msg_and_die("group descr %d. free blocks count == 0 (corrupted fs?)",grp);
+ 	if(!(fs->sb.s_free_blocks_count--))
+ 		error_msg_and_die("superblock free blocks count == 0 (corrupted fs?)");
+-	return fs->sb.s_blocks_per_group*grp + bk;
++	return fs->sb.s_first_data_block + fs->sb.s_blocks_per_group*grp + (bk-1);
+ }
+ 
+ // free a block
+@@ -897,8 +912,8 @@
+ 
+ 	grp = bk / fs->sb.s_blocks_per_group;
+ 	bk %= fs->sb.s_blocks_per_group;
+-	deallocate(get_blk(fs,fs->gd[grp].bg_block_bitmap), bk);
+-	fs->gd[grp].bg_free_blocks_count++;
++	deallocate(GRP_GET_GROUP_BBM(fs, grp), bk);
++	get_gd(fs, grp)->bg_free_blocks_count++;
+ 	fs->sb.s_free_blocks_count++;
+ }
+ 
+@@ -918,16 +933,16 @@
+ 	/* We do it for all inodes.                                           */
+ 	avefreei  =  fs->sb.s_free_inodes_count / nbgroups;
+ 	for(grp=0; grp<nbgroups; grp++) {
+-		if (fs->gd[grp].bg_free_inodes_count < avefreei ||
+-		    fs->gd[grp].bg_free_inodes_count == 0)
++		if (get_gd(fs, grp)->bg_free_inodes_count < avefreei ||
++		    get_gd(fs, grp)->bg_free_inodes_count == 0)
+ 			continue;
+ 		if (!best_group || 
+-			fs->gd[grp].bg_free_blocks_count > fs->gd[best_group].bg_free_blocks_count)
++			get_gd(fs, grp)->bg_free_blocks_count > get_gd(fs, best_group)->bg_free_blocks_count)
+ 			best_group = grp;
+ 	}
+-	if (!(nod = allocate(get_blk(fs,fs->gd[best_group].bg_inode_bitmap),0)))
++	if (!(nod = allocate(GRP_GET_GROUP_IBM(fs, best_group), 0)))
+ 		error_msg_and_die("couldn't allocate an inode (no free inode)");
+-	if(!(fs->gd[best_group].bg_free_inodes_count--))
++	if(!(get_gd(fs, best_group)->bg_free_inodes_count--))
+ 		error_msg_and_die("group descr. free blocks count == 0 (corrupted fs?)");
+ 	if(!(fs->sb.s_free_inodes_count--))
+ 		error_msg_and_die("superblock free blocks count == 0 (corrupted fs?)");
+@@ -1390,7 +1405,7 @@
+ 			case FM_IFDIR:
+ 				add2dir(fs, nod, nod, ".");
+ 				add2dir(fs, nod, parent_nod, "..");
+-				fs->gd[GRP_GROUP_OF_INODE(fs,nod)].bg_used_dirs_count++;
++				get_gd(fs, GRP_GROUP_OF_INODE(fs,nod))->bg_used_dirs_count++;
+ 				break;
+ 		}
+ 	}
+@@ -1860,7 +1875,7 @@
+ 		swap_nod(nod);
+ 	}
+ 	for(i=0;i<GRP_NBGROUPS(fs);i++)
+-		swap_gd(&(fs->gd[i]));
++		swap_gd(get_gd(fs, i));
+ 	swap_sb(&fs->sb);
+ }
+ 
+@@ -1870,7 +1885,7 @@
+ 	uint32 i;
+ 	swap_sb(&fs->sb);
+ 	for(i=0;i<GRP_NBGROUPS(fs);i++)
+-		swap_gd(&(fs->gd[i]));
++		swap_gd(get_gd(fs, i));
+ 	for(i = 1; i < fs->sb.s_inodes_count; i++)
+ 	{
+ 		inode *nod = get_nod(fs, i);
+@@ -1895,7 +1910,8 @@
+ 
+ // initialize an empty filesystem
+ static filesystem *
+-init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, uint32 fs_timestamp)
++init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes,
++		uint32 fs_timestamp, uint32 creator_os)
+ {
+ 	uint32 i;
+ 	filesystem *fs;
+@@ -1921,10 +1937,14 @@
+ 	 */
+ 	min_nbgroups = (nbinodes + INODES_PER_GROUP - 1) / INODES_PER_GROUP;
+ 
++	/* On filesystems with 1k block size, the bootloader area uses a full
++	 * block. For 2048 and up, the superblock can be fitted into block 0.
++	 */
++	first_block = (BLOCKSIZE == 1024);
++
+ 	/* nbblocks is the total number of blocks in the filesystem.
+ 	 * a block group can have no more than 8192 blocks.
+ 	 */
+-	first_block = (BLOCKSIZE == 1024);
+ 	nbgroups = (nbblocks - first_block + BLOCKS_PER_GROUP - 1) / BLOCKS_PER_GROUP;
+ 	if(nbgroups < min_nbgroups) nbgroups = min_nbgroups;
+ 	nbblocks_per_group = rndup((nbblocks - first_block + nbgroups - 1)/nbgroups, 8);
+@@ -1936,10 +1956,10 @@
+ 	gdsz = rndup(nbgroups*sizeof(groupdescriptor),BLOCKSIZE)/BLOCKSIZE;
+ 	itblsz = nbinodes_per_group * sizeof(inode)/BLOCKSIZE;
+ 	overhead_per_group = 3 /*sb,bbm,ibm*/ + gdsz + itblsz;
+-	if((uint32)nbblocks - 1 < overhead_per_group * nbgroups)
+-		error_msg_and_die("too much overhead, try fewer inodes or more blocks. Note: options have changed, see --help or the man page.");
+-	free_blocks = nbblocks - overhead_per_group*nbgroups - 1 /*boot block*/;
++	free_blocks = nbblocks - overhead_per_group*nbgroups - first_block;
+ 	free_blocks_per_group = nbblocks_per_group - overhead_per_group;
++	if(free_blocks < 0)
++		error_msg_and_die("too much overhead, try fewer inodes or more blocks. Note: options have changed, see --help or the man page.");
+ 
+ 	if(!(fs = (filesystem*)calloc(nbblocks, BLOCKSIZE)))
+ 		error_msg_and_die("not enough memory for filesystem");
+@@ -1959,28 +1979,31 @@
+ 	fs->sb.s_wtime = fs_timestamp;
+ 	fs->sb.s_magic = EXT2_MAGIC_NUMBER;
+ 	fs->sb.s_lastcheck = fs_timestamp;
++	fs->sb.s_creator_os = creator_os;
+ 
+ 	// set up groupdescriptors
+-	for(i=0, bbmpos=gdsz+2, ibmpos=bbmpos+1, itblpos=ibmpos+1;
++	for(i=0, bbmpos=first_block+1+gdsz, ibmpos=bbmpos+1, itblpos=ibmpos+1;
+ 		i<nbgroups;
+ 		i++, bbmpos+=nbblocks_per_group, ibmpos+=nbblocks_per_group, itblpos+=nbblocks_per_group)
+ 	{
++		groupdescriptor *gd = get_gd(fs, i);
++
+ 		if(free_blocks > free_blocks_per_group) {
+-			fs->gd[i].bg_free_blocks_count = free_blocks_per_group;
++			gd->bg_free_blocks_count = free_blocks_per_group;
+ 			free_blocks -= free_blocks_per_group;
+ 		} else {
+-			fs->gd[i].bg_free_blocks_count = free_blocks;
++			gd->bg_free_blocks_count = free_blocks;
+ 			free_blocks = 0; // this is the last block group
+ 		}
+ 		if(i)
+-			fs->gd[i].bg_free_inodes_count = nbinodes_per_group;
++			gd->bg_free_inodes_count = nbinodes_per_group;
+ 		else
+-			fs->gd[i].bg_free_inodes_count = nbinodes_per_group -
++			gd->bg_free_inodes_count = nbinodes_per_group -
+ 							EXT2_FIRST_INO + 2;
+-		fs->gd[i].bg_used_dirs_count = 0;
+-		fs->gd[i].bg_block_bitmap = bbmpos;
+-		fs->gd[i].bg_inode_bitmap = ibmpos;
+-		fs->gd[i].bg_inode_table = itblpos;
++		gd->bg_used_dirs_count = 0;
++		gd->bg_block_bitmap = bbmpos;
++		gd->bg_inode_bitmap = ibmpos;
++		gd->bg_inode_table = itblpos;
+ 	}
+ 
+ 	/* Mark non-filesystem blocks and inodes as allocated */
+@@ -1988,9 +2011,9 @@
+ 	for(i = 0; i<nbgroups;i++) {
+ 
+ 		/* Block bitmap */
+-		bbm = get_blk(fs,fs->gd[i].bg_block_bitmap);	
++		bbm = GRP_GET_GROUP_BBM(fs, i);
+ 		//non-filesystem blocks
+-		for(j = fs->gd[i].bg_free_blocks_count
++		for(j = get_gd(fs, i)->bg_free_blocks_count
+ 		        + overhead_per_group + 1; j <= BLOCKSIZE * 8; j++)
+ 			allocate(bbm, j); 
+ 		//system blocks
+@@ -1998,7 +2021,7 @@
+ 			allocate(bbm, j); 
+ 		
+ 		/* Inode bitmap */
+-		ibm = get_blk(fs,fs->gd[i].bg_inode_bitmap);	
++		ibm = GRP_GET_GROUP_IBM(fs, i);
+ 		//non-filesystem inodes
+ 		for(j = fs->sb.s_inodes_per_group+1; j <= BLOCKSIZE * 8; j++)
+ 			allocate(ibm, j);
+@@ -2012,9 +2035,9 @@
+ 	// make root inode and directory
+ 	/* We have groups now. Add the root filesystem in group 0 */
+ 	/* Also increment the directory count for group 0 */
+-	fs->gd[0].bg_free_inodes_count--;
+-	fs->gd[0].bg_used_dirs_count = 1;
+-	itab0 = (inode *)get_blk(fs,fs->gd[0].bg_inode_table);
++	get_gd(fs, 0)->bg_free_inodes_count--;
++	get_gd(fs, 0)->bg_used_dirs_count = 1;
++	itab0 = (inode *)get_blk(fs, get_gd(fs,0)->bg_inode_table);
+ 	itab0[EXT2_ROOT_INO-1].i_mode = FM_IFDIR | FM_IRWXU | FM_IRGRP | FM_IROTH | FM_IXGRP | FM_IXOTH; 
+ 	itab0[EXT2_ROOT_INO-1].i_ctime = fs_timestamp;
+ 	itab0[EXT2_ROOT_INO-1].i_mtime = fs_timestamp;
+@@ -2338,8 +2361,9 @@
+ 	for (i = 0; i < GRP_NBGROUPS(fs); i++) {
+ 		printf("Group No: %d\n", i+1);
+ 		printf("block bitmap: block %d,inode bitmap: block %d, inode table: block %d\n",
+-		     fs->gd[i].bg_block_bitmap, fs->gd[i].bg_inode_bitmap,
+-		     fs->gd[i].bg_inode_table);
++		     get_gd(fs, i)->bg_block_bitmap,
++		     get_gd(fs, i)->bg_inode_bitmap,
++		     get_gd(fs, i)->bg_inode_table);
+ 		printf("block bitmap allocation:\n");
+ 		print_bm(GRP_GET_GROUP_BBM(fs, i),fs->sb.s_blocks_per_group);
+ 		printf("inode bitmap allocation:\n");
+@@ -2421,10 +2445,12 @@
+ 	"  -x, --starting-image <image>\n"
+ 	"  -d, --root <directory>\n"
+ 	"  -D, --devtable <file>\n"
++	"  -B, --block-size <bytes>\n"
+ 	"  -b, --size-in-blocks <blocks>\n"
+ 	"  -i, --bytes-per-inode <bytes per inode>\n"
+ 	"  -N, --number-of-inodes <number of inodes>\n"
+ 	"  -m, --reserved-percentage <percentage of blocks to reserve>\n"
++	"  -o, --creator-os <os>      'linux', 'hurd', 'freebsd' or a numerical value.\n"
+ 	"  -g, --block-map <path>     Generate a block map file for this path.\n"
+ 	"  -e, --fill-value <value>   Fill unallocated blocks with value.\n"
+ 	"  -z, --allow-holes          Allow files with holes.\n"
+@@ -2446,6 +2472,29 @@
+ extern char* optarg;
+ extern int optind, opterr, optopt;
+ 
++// parse the value for -o <os>
++int
++lookup_creator_os(const char *name)
++{
++	static const char *const creators[] =
++		{"linux", "hurd", "2", "freebsd", NULL};
++	char *endptr;
++	int i;
++
++	// numerical value ?
++	i = strtol(name, &endptr, 0);
++	if(name[0] && *endptr == '\0')
++		return i;
++
++	// symbolic name ?
++	for(i=0; creators[i]; i++)
++	       if(strcasecmp(creators[i], name) == 0)
++		       return i;
++
++	// whatever ?
++	return -1;
++}
++
+ int
+ main(int argc, char **argv)
+ {
+@@ -2455,6 +2504,7 @@
+ 	float bytes_per_inode = -1;
+ 	float reserved_frac = -1;
+ 	int fs_timestamp = -1;
++	int creator_os = CREATOR_OS;
+ 	char * fsout = "-";
+ 	char * fsin = 0;
+ 	char * dopt[MAX_DOPT];
+@@ -2478,10 +2528,12 @@
+ 	  { "starting-image",	required_argument,	NULL, 'x' },
+ 	  { "root",		required_argument,	NULL, 'd' },
+ 	  { "devtable",		required_argument,	NULL, 'D' },
++	  { "block-size",	required_argument,	NULL, 'B' },
+ 	  { "size-in-blocks",	required_argument,	NULL, 'b' },
+ 	  { "bytes-per-inode",	required_argument,	NULL, 'i' },
+ 	  { "number-of-inodes",	required_argument,	NULL, 'N' },
+ 	  { "reserved-percentage", required_argument,	NULL, 'm' },
++	  { "creator-os",	required_argument,	NULL, 'o' },
+ 	  { "block-map",	required_argument,	NULL, 'g' },
+ 	  { "fill-value",	required_argument,	NULL, 'e' },
+ 	  { "allow-holes",	no_argument, 		NULL, 'z' },
+@@ -2497,11 +2549,11 @@
+ 
+ 	app_name = argv[0];
+ 
+-	while((c = getopt_long(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv", longopts, NULL)) != EOF) {
++	while((c = getopt_long(argc, argv, "x:d:D:B:b:i:N:m:o:g:e:zfqUPhVv", longopts, NULL)) != EOF) {
+ #else
+ 	app_name = argv[0];
+ 
+-	while((c = getopt(argc, argv,      "x:d:D:b:i:N:m:g:e:zfqUPhVv")) != EOF) {
++	while((c = getopt(argc, argv,      "x:d:D:B:b:i:N:m:o:g:e:zfqUPhVv")) != EOF) {
+ #endif /* HAVE_GETOPT_LONG */
+ 		switch(c)
+ 		{
+@@ -2512,6 +2564,9 @@
+ 			case 'D':
+ 				dopt[didx++] = optarg;
+ 				break;
++			case 'B':
++				blocksize = SI_atof(optarg);
++				break;
+ 			case 'b':
+ 				nbblocks = SI_atof(optarg);
+ 				break;
+@@ -2524,6 +2579,9 @@
+ 			case 'm':
+ 				reserved_frac = SI_atof(optarg) / 100;
+ 				break;
++			case 'o':
++				creator_os = lookup_creator_os(optarg);
++				break;
+ 			case 'g':
+ 				gopt[gidx++] = optarg;
+ 				break;
+@@ -2567,6 +2625,11 @@
+ 		error_msg_and_die("Not enough arguments. Try --help or else see the man page.");
+ 	fsout = argv[optind];
+ 
++	if(blocksize != 1024 && blocksize != 2048 && blocksize != 4096)
++		error_msg_and_die("Valid block sizes: 1024, 2048 or 4096.");
++	if(creator_os < 0)
++		error_msg_and_die("Creator OS unknown.");
++
+ 	hdlinks.hdl = (struct hdlink_s *)malloc(hdlink_cnt * sizeof(struct hdlink_s));
+ 	if (!hdlinks.hdl)
+ 		error_msg_and_die("Not enough memory");
+@@ -2611,7 +2674,8 @@
+ 		}
+ 		if(fs_timestamp == -1)
+ 			fs_timestamp = time(NULL);
+-		fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp);
++		fs = init_fs(nbblocks, nbinodes, nbresrvd, holes,
++				fs_timestamp, creator_os);
+ 	}
+ 	
+ 	populate_fs(fs, dopt, didx, squash_uids, squash_perms, fs_timestamp, NULL);
+Index: genext2fs/test-gen.lib
+===================================================================
+--- genext2fs.orig/test-gen.lib	2011-09-03 13:40:35.000000000 +0200
++++ genext2fs/test-gen.lib	2011-09-03 14:21:17.000000000 +0200
+@@ -8,7 +8,7 @@
+ # Creates an image with a file of given size
+ # Usage: dgen file-size number-of-blocks 
+ dgen () {
+-	size=$1; blocks=$2
++	size=$1; blocks=$2; blocksz=$3;
+ 	rm -rf test
+ 	mkdir -p test
+ 	cd test
+@@ -20,7 +20,7 @@
+         chmod 777 file.$1
+ 	TZ=UTC-11 touch -t 200502070321.43 file.$1 .
+ 	cd ..
+-	./genext2fs -N 17 -b $blocks -d test -f -q ext2.img 
++	./genext2fs -B $blocksz -N 17 -b $blocks -d test -f -o Linux -q ext2.img
+ }
+ 
+ # fgen - Exercises the -f spec-file option of genext2fs
+@@ -31,7 +31,7 @@
+ 	mkdir -p test
+ 	cp $fname test
+ 	TZ=UTC-11 touch -t 200502070321.43 test/$fname
+-	./genext2fs -N 92 -b $blocks -D test/$fname -f ext2.img
++	./genext2fs -N 92 -b $blocks -D test/$fname -f -o Linux ext2.img
+ }
+ 
+ # gen_cleanup - Remove the files generated by the above functions
+Index: genext2fs/test-mount.sh
+===================================================================
+--- genext2fs.orig/test-mount.sh	2011-09-03 13:40:35.000000000 +0200
++++ genext2fs/test-mount.sh	2011-09-03 14:21:17.000000000 +0200
+@@ -33,9 +33,9 @@
+ # and returns the command line with which to invoke dtest()
+ # Usage: dtest-mount file-size number-of-blocks 
+ dtest_mount () {
+-	size=$1; blocks=$2
+-	echo Testing with file of size $size
+-	dgen $size $blocks
++	size=$1; blocks=$2; blocksz=$3;
++	echo Testing $blocks blocks of $blocksz bytes with file of size $size
++	dgen $size $blocks $blocksz
+ 	/sbin/e2fsck -fn ext2.img || fail
+ 	mkdir -p mnt
+ 	mount -t ext2 -o ro,loop ext2.img mnt || fail
+@@ -44,7 +44,7 @@
+ 	                                awk '{print $5}'`" ] ; then
+ 		fail
+ 	fi
+-	pass dtest $size $blocks
++	pass dtest $size $blocks $blocksz
+ }
+ 
+ # ftest-mount - Exercise the -f spec-file option of genext2fs
+@@ -75,13 +75,21 @@
+ 	pass ftest $fname $blocks
+ }
+ 
+-dtest_mount 0 4096 
+-dtest_mount 0 8193
+-dtest_mount 0 8194
+-dtest_mount 1 4096 
+-dtest_mount 12288 4096 
+-dtest_mount 274432 4096 
+-dtest_mount 8388608 9000 
+-dtest_mount 16777216 20000
++dtest_mount 0 4096 1024
++dtest_mount 0 2048 2048
++dtest_mount 0 1024 4096
++dtest_mount 0 8193 1024
++dtest_mount 0 8194 1024
++dtest_mount 0 8193 4096
++dtest_mount 0 8194 2048
++dtest_mount 1 4096 1024
++dtest_mount 1 1024 4096
++dtest_mount 12288 4096 1024
++dtest_mount 274432 4096 1024
++dtest_mount 8388608 9000 1024
++dtest_mount 8388608 4500 2048
++dtest_mount 8388608 2250 4096
++dtest_mount 16777216 20000 1024
++dtest_mount 16777216 10000 2048
+ 
+ ftest_mount device_table.txt 4096 
+Index: genext2fs/test.sh
+===================================================================
+--- genext2fs.orig/test.sh	2011-09-03 13:40:35.000000000 +0200
++++ genext2fs/test.sh	2011-09-03 14:21:17.000000000 +0200
+@@ -30,9 +30,9 @@
+ # Creates an image with a file of given size and verifies it
+ # Usage: dtest file-size number-of-blocks correct-checksum
+ dtest () {
+-	size=$1; blocks=$2; checksum=$3
++	size=$1; blocks=$2; blocksz=$3; checksum=$4
+ 	echo Testing with file of size $size
+-	dgen $size $blocks
++	dgen $size $blocks $blocksz
+ 	md5cmp $checksum
+ 	gen_cleanup
+ }
+@@ -53,12 +53,20 @@
+ # replace the following lines with the output of
+ # sudo sh test-mount.sh|grep test
+ 
+-dtest 0 4096 3bc6424b8fcd51a0de34ee59d91d5f16
+-dtest 0 8193 f174804f6b433b552706cbbfc60c416d
+-dtest 0 8194 4855a55d0cbdc44584634df49ebd5711
+-dtest 1 4096 09c569b6bfb45222c729c42d04d5451f
+-dtest 12288 4096 61febcbfbf32024ef99103fcdc282c39
+-dtest 274432 4096 0c517803552c55c1806e4220b0a0164f
+-dtest 8388608 9000 e0e5ea15bced10ab486d8135584b5d8e
+-dtest 16777216 20000 fdf636eb905ab4dc1bf76dce5ac5d209
++dtest 0 4096 1024 3bc6424b8fcd51a0de34ee59d91d5f16
++dtest 0 2048 2048 230afa16496df019878cc2370c661cdc
++dtest 0 1024 4096 ebff5eeb38b70f3f1cd081e60eb44561
++dtest 0 8193 1024 f174804f6b433b552706cbbfc60c416d
++dtest 0 8194 1024 4855a55d0cbdc44584634df49ebd5711
++dtest 0 8193 4096 c493679698418ec7e6552005e2d2a6d8
++dtest 0 8194 2048 ec13f328fa7543563f35f494bddc059c
++dtest 1 4096 1024 09c569b6bfb45222c729c42d04d5451f
++dtest 1 1024 4096 d318a326fdc907810ae9e6b0a20e9b06
++dtest 12288 4096 1024 61febcbfbf32024ef99103fcdc282c39
++dtest 274432 4096 1024 0c517803552c55c1806e4220b0a0164f
++dtest 8388608 9000 1024 e0e5ea15bced10ab486d8135584b5d8e
++dtest 8388608 4500 2048 39f4d537a72f5053fd6891721c59680d
++dtest 8388608 2250 4096 1d697fa4bc2cfffe02ac91edfadc40bf
++dtest 16777216 20000 1024 fdf636eb905ab4dc1bf76dce5ac5d209
++dtest 16777216 10000 2048 f9824a81ea5e74fdf469c097927c292b
+ ftest device_table.txt 4096 a0af06d944b11d2902dfd705484c64cc
diff --git a/trunk/tools/genext2fs/patches/400-byteswap_fix.patch b/trunk/tools/genext2fs/patches/400-byteswap_fix.patch
new file mode 100644
index 00000000..7b3c00b5
--- /dev/null
+++ b/trunk/tools/genext2fs/patches/400-byteswap_fix.patch
@@ -0,0 +1,44 @@
+Index: genext2fs/genext2fs.c
+===================================================================
+--- genext2fs.orig/genext2fs.c	2011-11-29 17:36:06.000000000 +0100
++++ genext2fs/genext2fs.c	2011-11-29 17:37:37.000000000 +0100
+@@ -1779,7 +1779,8 @@
+ 	assert(nod->i_block[EXT2_DIND_BLOCK] != 0);
+ 	for(i = 0; i < BLOCKSIZE/4; i++)
+ 		if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i )
+-			swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
++			if (((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i])
++				swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
+ 	swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]));
+ 	if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4)
+ 		return;
+@@ -1792,7 +1793,8 @@
+ 				     (BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+ 				     i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+ 				     j*(BLOCKSIZE/4)) ) 
+-			  swap_block(get_blk(fs,b2[j]));
++			  if (b2[j])
++			  	swap_block(get_blk(fs,b2[j]));
+ 			else {
+ 			  done = 1;
+ 			  break;
+@@ -1825,7 +1827,8 @@
+ 	swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]));
+ 	for(i = 0; i < BLOCKSIZE/4; i++)
+ 		if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i )
+-			swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
++			if (((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i])
++				swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
+ 	if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4)
+ 		return;
+ 	/* Adding support for triple indirection */
+@@ -1839,7 +1842,8 @@
+ 				     (BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+ 				     i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + 
+ 				     j*(BLOCKSIZE/4)) ) 
+-			  swap_block(get_blk(fs,b2[j]));
++			  if (b2[j])
++				swap_block(get_blk(fs,b2[j]));
+ 			else {
+ 			  done = 1;
+ 			  break;
diff --git a/trunk/tools/gengetopt/Makefile b/trunk/tools/gengetopt/Makefile
new file mode 100644
index 00000000..74e528e6
--- /dev/null
+++ b/trunk/tools/gengetopt/Makefile
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licengengetopt under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gengetopt
+PKG_VERSION:=2.22.6
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_MD5SUM:=29749a48dda69277ab969c510597a14e
+
+HOST_FIXUP := autoreconf
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/gengetopt $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/gengetopt
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/gengetopt/patches/100-dependency_fix.patch b/trunk/tools/gengetopt/patches/100-dependency_fix.patch
new file mode 100644
index 00000000..69cb598b
--- /dev/null
+++ b/trunk/tools/gengetopt/patches/100-dependency_fix.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,7 +51,7 @@ libgengetopt_la_LIBADD = $(top_builddir)
+ 	@LTLIBOBJS@ \
+ 	skels/libgen.la
+ 
+-LDADD = $(top_builddir)/src/libgengetopt.la
++LDADD = libgengetopt.la
+ 
+ EXTRA_DIST = parser.h argsdef.h gengetopt.h ggos.h gm.h gnugetopt.h \
+ cmdline.c cmdline.h \
diff --git a/trunk/tools/gmp/Makefile b/trunk/tools/gmp/Makefile
new file mode 100644
index 00000000..b1976d0c
--- /dev/null
+++ b/trunk/tools/gmp/Makefile
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmp
+PKG_VERSION:=5.1.3
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/gmp/
+PKG_MD5SUM:=e5fe367801ff067b923d1e6a126448aa
+
+HOST_FIXUP:=autoreconf
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+unexport CFLAGS
+
+HOST_CONFIGURE_ARGS += \
+	--enable-static \
+	--disable-shared \
+	--enable-cxx \
+	--enable-mpbsd
+
+ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32)
+HOST_CONFIGURE_ARGS += ABI=x32
+endif
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/include/byteswap.h b/trunk/tools/include/byteswap.h
new file mode 100644
index 00000000..015f0974
--- /dev/null
+++ b/trunk/tools/include/byteswap.h
@@ -0,0 +1,5 @@
+#if defined(__linux__) || defined(__CYGWIN__) 
+#include_next <byteswap.h>
+#else
+#include <endian.h>
+#endif
diff --git a/trunk/tools/include/elf.h b/trunk/tools/include/elf.h
new file mode 100644
index 00000000..036a1763
--- /dev/null
+++ b/trunk/tools/include/elf.h
@@ -0,0 +1,3007 @@
+/* This file defines standard ELF types, structures, and macros.
+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _ELF_H
+#define	_ELF_H 1
+
+/* Standard ELF types.  */
+
+#include <stdint.h>
+
+/* Type for a 16-bit quantity.  */
+typedef uint16_t Elf32_Half;
+typedef uint16_t Elf64_Half;
+
+/* Types for signed and unsigned 32-bit quantities.  */
+typedef uint32_t Elf32_Word;
+typedef	int32_t  Elf32_Sword;
+typedef uint32_t Elf64_Word;
+typedef	int32_t  Elf64_Sword;
+
+/* Types for signed and unsigned 64-bit quantities.  */
+typedef uint64_t Elf32_Xword;
+typedef	int64_t  Elf32_Sxword;
+typedef uint64_t Elf64_Xword;
+typedef	int64_t  Elf64_Sxword;
+
+/* Type of addresses.  */
+typedef uint32_t Elf32_Addr;
+typedef uint64_t Elf64_Addr;
+
+/* Type of file offsets.  */
+typedef uint32_t Elf32_Off;
+typedef uint64_t Elf64_Off;
+
+/* Type for section indices, which are 16-bit quantities.  */
+typedef uint16_t Elf32_Section;
+typedef uint16_t Elf64_Section;
+
+/* Type for version symbol information.  */
+typedef Elf32_Half Elf32_Versym;
+typedef Elf64_Half Elf64_Versym;
+
+
+/* The ELF file header.  This appears at the start of every ELF file.  */
+
+#define EI_NIDENT (16)
+
+typedef struct
+{
+  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
+  Elf32_Half	e_type;			/* Object file type */
+  Elf32_Half	e_machine;		/* Architecture */
+  Elf32_Word	e_version;		/* Object file version */
+  Elf32_Addr	e_entry;		/* Entry point virtual address */
+  Elf32_Off	e_phoff;		/* Program header table file offset */
+  Elf32_Off	e_shoff;		/* Section header table file offset */
+  Elf32_Word	e_flags;		/* Processor-specific flags */
+  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
+  Elf32_Half	e_phentsize;		/* Program header table entry size */
+  Elf32_Half	e_phnum;		/* Program header table entry count */
+  Elf32_Half	e_shentsize;		/* Section header table entry size */
+  Elf32_Half	e_shnum;		/* Section header table entry count */
+  Elf32_Half	e_shstrndx;		/* Section header string table index */
+} Elf32_Ehdr;
+
+typedef struct
+{
+  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
+  Elf64_Half	e_type;			/* Object file type */
+  Elf64_Half	e_machine;		/* Architecture */
+  Elf64_Word	e_version;		/* Object file version */
+  Elf64_Addr	e_entry;		/* Entry point virtual address */
+  Elf64_Off	e_phoff;		/* Program header table file offset */
+  Elf64_Off	e_shoff;		/* Section header table file offset */
+  Elf64_Word	e_flags;		/* Processor-specific flags */
+  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
+  Elf64_Half	e_phentsize;		/* Program header table entry size */
+  Elf64_Half	e_phnum;		/* Program header table entry count */
+  Elf64_Half	e_shentsize;		/* Section header table entry size */
+  Elf64_Half	e_shnum;		/* Section header table entry count */
+  Elf64_Half	e_shstrndx;		/* Section header string table index */
+} Elf64_Ehdr;
+
+/* Fields in the e_ident array.  The EI_* macros are indices into the
+   array.  The macros under each EI_* macro are the values the byte
+   may have.  */
+
+#define EI_MAG0		0		/* File identification byte 0 index */
+#define ELFMAG0		0x7f		/* Magic number byte 0 */
+
+#define EI_MAG1		1		/* File identification byte 1 index */
+#define ELFMAG1		'E'		/* Magic number byte 1 */
+
+#define EI_MAG2		2		/* File identification byte 2 index */
+#define ELFMAG2		'L'		/* Magic number byte 2 */
+
+#define EI_MAG3		3		/* File identification byte 3 index */
+#define ELFMAG3		'F'		/* Magic number byte 3 */
+
+/* Conglomeration of the identification bytes, for easy testing as a word.  */
+#define	ELFMAG		"\177ELF"
+#define	SELFMAG		4
+
+#define EI_CLASS	4		/* File class byte index */
+#define ELFCLASSNONE	0		/* Invalid class */
+#define ELFCLASS32	1		/* 32-bit objects */
+#define ELFCLASS64	2		/* 64-bit objects */
+#define ELFCLASSNUM	3
+
+#define EI_DATA		5		/* Data encoding byte index */
+#define ELFDATANONE	0		/* Invalid data encoding */
+#define ELFDATA2LSB	1		/* 2's complement, little endian */
+#define ELFDATA2MSB	2		/* 2's complement, big endian */
+#define ELFDATANUM	3
+
+#define EI_VERSION	6		/* File version byte index */
+					/* Value must be EV_CURRENT */
+
+#define EI_OSABI	7		/* OS ABI identification */
+#define ELFOSABI_NONE		0	/* UNIX System V ABI */
+#define ELFOSABI_SYSV		0	/* Alias.  */
+#define ELFOSABI_HPUX		1	/* HP-UX */
+#define ELFOSABI_NETBSD		2	/* NetBSD.  */
+#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
+#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
+#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
+#define ELFOSABI_AIX		7	/* IBM AIX.  */
+#define ELFOSABI_IRIX		8	/* SGI Irix.  */
+#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
+#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
+#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
+#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
+#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
+#define ELFOSABI_ARM		97	/* ARM */
+#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
+
+#define EI_ABIVERSION	8		/* ABI version */
+
+#define EI_PAD		9		/* Byte index of padding bytes */
+
+/* Legal values for e_type (object file type).  */
+
+#define ET_NONE		0		/* No file type */
+#define ET_REL		1		/* Relocatable file */
+#define ET_EXEC		2		/* Executable file */
+#define ET_DYN		3		/* Shared object file */
+#define ET_CORE		4		/* Core file */
+#define	ET_NUM		5		/* Number of defined types */
+#define ET_LOOS		0xfe00		/* OS-specific range start */
+#define ET_HIOS		0xfeff		/* OS-specific range end */
+#define ET_LOPROC	0xff00		/* Processor-specific range start */
+#define ET_HIPROC	0xffff		/* Processor-specific range end */
+
+/* Legal values for e_machine (architecture).  */
+
+#define EM_NONE		 0		/* No machine */
+#define EM_M32		 1		/* AT&T WE 32100 */
+#define EM_SPARC	 2		/* SUN SPARC */
+#define EM_386		 3		/* Intel 80386 */
+#define EM_68K		 4		/* Motorola m68k family */
+#define EM_88K		 5		/* Motorola m88k family */
+#define EM_860		 7		/* Intel 80860 */
+#define EM_MIPS		 8		/* MIPS R3000 big-endian */
+#define EM_S370		 9		/* IBM System/370 */
+#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
+
+#define EM_PARISC	15		/* HPPA */
+#define EM_VPP500	17		/* Fujitsu VPP500 */
+#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
+#define EM_960		19		/* Intel 80960 */
+#define EM_PPC		20		/* PowerPC */
+#define EM_PPC64	21		/* PowerPC 64-bit */
+#define EM_S390		22		/* IBM S390 */
+
+#define EM_V800		36		/* NEC V800 series */
+#define EM_FR20		37		/* Fujitsu FR20 */
+#define EM_RH32		38		/* TRW RH-32 */
+#define EM_RCE		39		/* Motorola RCE */
+#define EM_ARM		40		/* ARM */
+#define EM_FAKE_ALPHA	41		/* Digital Alpha */
+#define EM_SH		42		/* Hitachi SH */
+#define EM_SPARCV9	43		/* SPARC v9 64-bit */
+#define EM_TRICORE	44		/* Siemens Tricore */
+#define EM_ARC		45		/* Argonaut RISC Core */
+#define EM_H8_300	46		/* Hitachi H8/300 */
+#define EM_H8_300H	47		/* Hitachi H8/300H */
+#define EM_H8S		48		/* Hitachi H8S */
+#define EM_H8_500	49		/* Hitachi H8/500 */
+#define EM_IA_64	50		/* Intel Merced */
+#define EM_MIPS_X	51		/* Stanford MIPS-X */
+#define EM_COLDFIRE	52		/* Motorola Coldfire */
+#define EM_68HC12	53		/* Motorola M68HC12 */
+#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
+#define EM_PCP		55		/* Siemens PCP */
+#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
+#define EM_NDR1		57		/* Denso NDR1 microprocessor */
+#define EM_STARCORE	58		/* Motorola Start*Core processor */
+#define EM_ME16		59		/* Toyota ME16 processor */
+#define EM_ST100	60		/* STMicroelectronic ST100 processor */
+#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
+#define EM_X86_64	62		/* AMD x86-64 architecture */
+#define EM_PDSP		63		/* Sony DSP Processor */
+
+#define EM_FX66		66		/* Siemens FX66 microcontroller */
+#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
+#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
+#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
+#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
+#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
+#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
+#define EM_SVX		73		/* Silicon Graphics SVx */
+#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
+#define EM_VAX		75		/* Digital VAX */
+#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
+#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
+#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
+#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
+#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
+#define EM_HUANY	81		/* Harvard University machine-independent object files */
+#define EM_PRISM	82		/* SiTera Prism */
+#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
+#define EM_FR30		84		/* Fujitsu FR30 */
+#define EM_D10V		85		/* Mitsubishi D10V */
+#define EM_D30V		86		/* Mitsubishi D30V */
+#define EM_V850		87		/* NEC v850 */
+#define EM_M32R		88		/* Mitsubishi M32R */
+#define EM_MN10300	89		/* Matsushita MN10300 */
+#define EM_MN10200	90		/* Matsushita MN10200 */
+#define EM_PJ		91		/* picoJava */
+#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
+#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
+#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
+#define EM_TILEPRO	188		/* Tilera TILEPro */
+#define EM_TILEGX	191		/* Tilera TILE-Gx */
+#define EM_NUM		192
+
+/* If it is necessary to assign new unofficial EM_* values, please
+   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
+   chances of collision with official or non-GNU unofficial values.  */
+
+#define EM_ALPHA	0x9026
+
+/* Legal values for e_version (version).  */
+
+#define EV_NONE		0		/* Invalid ELF version */
+#define EV_CURRENT	1		/* Current version */
+#define EV_NUM		2
+
+/* Section header.  */
+
+typedef struct
+{
+  Elf32_Word	sh_name;		/* Section name (string tbl index) */
+  Elf32_Word	sh_type;		/* Section type */
+  Elf32_Word	sh_flags;		/* Section flags */
+  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
+  Elf32_Off	sh_offset;		/* Section file offset */
+  Elf32_Word	sh_size;		/* Section size in bytes */
+  Elf32_Word	sh_link;		/* Link to another section */
+  Elf32_Word	sh_info;		/* Additional section information */
+  Elf32_Word	sh_addralign;		/* Section alignment */
+  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
+} Elf32_Shdr;
+
+typedef struct
+{
+  Elf64_Word	sh_name;		/* Section name (string tbl index) */
+  Elf64_Word	sh_type;		/* Section type */
+  Elf64_Xword	sh_flags;		/* Section flags */
+  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
+  Elf64_Off	sh_offset;		/* Section file offset */
+  Elf64_Xword	sh_size;		/* Section size in bytes */
+  Elf64_Word	sh_link;		/* Link to another section */
+  Elf64_Word	sh_info;		/* Additional section information */
+  Elf64_Xword	sh_addralign;		/* Section alignment */
+  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
+} Elf64_Shdr;
+
+/* Special section indices.  */
+
+#define SHN_UNDEF	0		/* Undefined section */
+#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
+#define SHN_LOPROC	0xff00		/* Start of processor-specific */
+#define SHN_BEFORE	0xff00		/* Order section before all others
+					   (Solaris).  */
+#define SHN_AFTER	0xff01		/* Order section after all others
+					   (Solaris).  */
+#define SHN_HIPROC	0xff1f		/* End of processor-specific */
+#define SHN_LOOS	0xff20		/* Start of OS-specific */
+#define SHN_HIOS	0xff3f		/* End of OS-specific */
+#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
+#define SHN_COMMON	0xfff2		/* Associated symbol is common */
+#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
+#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
+
+/* Legal values for sh_type (section type).  */
+
+#define SHT_NULL	  0		/* Section header table entry unused */
+#define SHT_PROGBITS	  1		/* Program data */
+#define SHT_SYMTAB	  2		/* Symbol table */
+#define SHT_STRTAB	  3		/* String table */
+#define SHT_RELA	  4		/* Relocation entries with addends */
+#define SHT_HASH	  5		/* Symbol hash table */
+#define SHT_DYNAMIC	  6		/* Dynamic linking information */
+#define SHT_NOTE	  7		/* Notes */
+#define SHT_NOBITS	  8		/* Program space with no data (bss) */
+#define SHT_REL		  9		/* Relocation entries, no addends */
+#define SHT_SHLIB	  10		/* Reserved */
+#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
+#define SHT_INIT_ARRAY	  14		/* Array of constructors */
+#define SHT_FINI_ARRAY	  15		/* Array of destructors */
+#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
+#define SHT_GROUP	  17		/* Section group */
+#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
+#define	SHT_NUM		  19		/* Number of defined types.  */
+#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
+#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
+#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
+#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
+#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
+#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
+#define SHT_SUNW_move	  0x6ffffffa
+#define SHT_SUNW_COMDAT   0x6ffffffb
+#define SHT_SUNW_syminfo  0x6ffffffc
+#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
+#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
+#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
+#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
+#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
+#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
+#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
+#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
+#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
+
+/* Legal values for sh_flags (section flags).  */
+
+#define SHF_WRITE	     (1 << 0)	/* Writable */
+#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
+#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
+#define SHF_MERGE	     (1 << 4)	/* Might be merged */
+#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
+#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
+#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
+#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
+					   required */
+#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
+#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
+#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
+#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
+#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
+					   (Solaris).  */
+#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
+					   referenced or allocated (Solaris).*/
+
+/* Section group handling.  */
+#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
+
+/* Symbol table entry.  */
+
+typedef struct
+{
+  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
+  Elf32_Addr	st_value;		/* Symbol value */
+  Elf32_Word	st_size;		/* Symbol size */
+  unsigned char	st_info;		/* Symbol type and binding */
+  unsigned char	st_other;		/* Symbol visibility */
+  Elf32_Section	st_shndx;		/* Section index */
+} Elf32_Sym;
+
+typedef struct
+{
+  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
+  unsigned char	st_info;		/* Symbol type and binding */
+  unsigned char st_other;		/* Symbol visibility */
+  Elf64_Section	st_shndx;		/* Section index */
+  Elf64_Addr	st_value;		/* Symbol value */
+  Elf64_Xword	st_size;		/* Symbol size */
+} Elf64_Sym;
+
+/* The syminfo section if available contains additional information about
+   every dynamic symbol.  */
+
+typedef struct
+{
+  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
+  Elf32_Half si_flags;			/* Per symbol flags */
+} Elf32_Syminfo;
+
+typedef struct
+{
+  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
+  Elf64_Half si_flags;			/* Per symbol flags */
+} Elf64_Syminfo;
+
+/* Possible values for si_boundto.  */
+#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
+#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
+#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
+
+/* Possible bitmasks for si_flags.  */
+#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
+#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
+#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
+#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
+					   loaded */
+/* Syminfo version values.  */
+#define SYMINFO_NONE		0
+#define SYMINFO_CURRENT		1
+#define SYMINFO_NUM		2
+
+
+/* How to extract and insert information held in the st_info field.  */
+
+#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
+#define ELF32_ST_TYPE(val)		((val) & 0xf)
+#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
+
+/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
+#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
+#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
+#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
+
+/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
+
+#define STB_LOCAL	0		/* Local symbol */
+#define STB_GLOBAL	1		/* Global symbol */
+#define STB_WEAK	2		/* Weak symbol */
+#define	STB_NUM		3		/* Number of defined types.  */
+#define STB_LOOS	10		/* Start of OS-specific */
+#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
+#define STB_HIOS	12		/* End of OS-specific */
+#define STB_LOPROC	13		/* Start of processor-specific */
+#define STB_HIPROC	15		/* End of processor-specific */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_NOTYPE	0		/* Symbol type is unspecified */
+#define STT_OBJECT	1		/* Symbol is a data object */
+#define STT_FUNC	2		/* Symbol is a code object */
+#define STT_SECTION	3		/* Symbol associated with a section */
+#define STT_FILE	4		/* Symbol's name is file name */
+#define STT_COMMON	5		/* Symbol is a common data object */
+#define STT_TLS		6		/* Symbol is thread-local data object*/
+#define	STT_NUM		7		/* Number of defined types.  */
+#define STT_LOOS	10		/* Start of OS-specific */
+#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
+#define STT_HIOS	12		/* End of OS-specific */
+#define STT_LOPROC	13		/* Start of processor-specific */
+#define STT_HIPROC	15		/* End of processor-specific */
+
+
+/* Symbol table indices are found in the hash buckets and chain table
+   of a symbol hash table section.  This special index value indicates
+   the end of a chain, meaning no further symbols are found in that bucket.  */
+
+#define STN_UNDEF	0		/* End of a chain.  */
+
+
+/* How to extract and insert information held in the st_other field.  */
+
+#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
+
+/* For ELF64 the definitions are the same.  */
+#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
+
+/* Symbol visibility specification encoded in the st_other field.  */
+#define STV_DEFAULT	0		/* Default symbol visibility rules */
+#define STV_INTERNAL	1		/* Processor specific hidden class */
+#define STV_HIDDEN	2		/* Sym unavailable in other modules */
+#define STV_PROTECTED	3		/* Not preemptible, not exported */
+
+
+/* Relocation table entry without addend (in section of type SHT_REL).  */
+
+typedef struct
+{
+  Elf32_Addr	r_offset;		/* Address */
+  Elf32_Word	r_info;			/* Relocation type and symbol index */
+} Elf32_Rel;
+
+/* I have seen two different definitions of the Elf64_Rel and
+   Elf64_Rela structures, so we'll leave them out until Novell (or
+   whoever) gets their act together.  */
+/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
+
+typedef struct
+{
+  Elf64_Addr	r_offset;		/* Address */
+  Elf64_Xword	r_info;			/* Relocation type and symbol index */
+} Elf64_Rel;
+
+/* Relocation table entry with addend (in section of type SHT_RELA).  */
+
+typedef struct
+{
+  Elf32_Addr	r_offset;		/* Address */
+  Elf32_Word	r_info;			/* Relocation type and symbol index */
+  Elf32_Sword	r_addend;		/* Addend */
+} Elf32_Rela;
+
+typedef struct
+{
+  Elf64_Addr	r_offset;		/* Address */
+  Elf64_Xword	r_info;			/* Relocation type and symbol index */
+  Elf64_Sxword	r_addend;		/* Addend */
+} Elf64_Rela;
+
+/* How to extract and insert information held in the r_info field.  */
+
+#define ELF32_R_SYM(val)		((val) >> 8)
+#define ELF32_R_TYPE(val)		((val) & 0xff)
+#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
+
+#define ELF64_R_SYM(i)			((i) >> 32)
+#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
+#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
+
+/* Program segment header.  */
+
+typedef struct
+{
+  Elf32_Word	p_type;			/* Segment type */
+  Elf32_Off	p_offset;		/* Segment file offset */
+  Elf32_Addr	p_vaddr;		/* Segment virtual address */
+  Elf32_Addr	p_paddr;		/* Segment physical address */
+  Elf32_Word	p_filesz;		/* Segment size in file */
+  Elf32_Word	p_memsz;		/* Segment size in memory */
+  Elf32_Word	p_flags;		/* Segment flags */
+  Elf32_Word	p_align;		/* Segment alignment */
+} Elf32_Phdr;
+
+typedef struct
+{
+  Elf64_Word	p_type;			/* Segment type */
+  Elf64_Word	p_flags;		/* Segment flags */
+  Elf64_Off	p_offset;		/* Segment file offset */
+  Elf64_Addr	p_vaddr;		/* Segment virtual address */
+  Elf64_Addr	p_paddr;		/* Segment physical address */
+  Elf64_Xword	p_filesz;		/* Segment size in file */
+  Elf64_Xword	p_memsz;		/* Segment size in memory */
+  Elf64_Xword	p_align;		/* Segment alignment */
+} Elf64_Phdr;
+
+/* Special value for e_phnum.  This indicates that the real number of
+   program headers is too large to fit into e_phnum.  Instead the real
+   value is in the field sh_info of section 0.  */
+
+#define PN_XNUM		0xffff
+
+/* Legal values for p_type (segment type).  */
+
+#define	PT_NULL		0		/* Program header table entry unused */
+#define PT_LOAD		1		/* Loadable program segment */
+#define PT_DYNAMIC	2		/* Dynamic linking information */
+#define PT_INTERP	3		/* Program interpreter */
+#define PT_NOTE		4		/* Auxiliary information */
+#define PT_SHLIB	5		/* Reserved */
+#define PT_PHDR		6		/* Entry for header table itself */
+#define PT_TLS		7		/* Thread-local storage segment */
+#define	PT_NUM		8		/* Number of defined types */
+#define PT_LOOS		0x60000000	/* Start of OS-specific */
+#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
+#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
+#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
+#define PT_LOSUNW	0x6ffffffa
+#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
+#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
+#define PT_HISUNW	0x6fffffff
+#define PT_HIOS		0x6fffffff	/* End of OS-specific */
+#define PT_LOPROC	0x70000000	/* Start of processor-specific */
+#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
+
+/* Legal values for p_flags (segment flags).  */
+
+#define PF_X		(1 << 0)	/* Segment is executable */
+#define PF_W		(1 << 1)	/* Segment is writable */
+#define PF_R		(1 << 2)	/* Segment is readable */
+#define PF_MASKOS	0x0ff00000	/* OS-specific */
+#define PF_MASKPROC	0xf0000000	/* Processor-specific */
+
+/* Legal values for note segment descriptor types for core files. */
+
+#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
+#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
+#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
+#define NT_PRXREG	4		/* Contains copy of prxregset struct */
+#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
+#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
+#define NT_AUXV		6		/* Contains copy of auxv array */
+#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
+#define NT_ASRS		8		/* Contains copy of asrset struct */
+#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
+#define NT_PSINFO	13		/* Contains copy of psinfo struct */
+#define NT_PRCRED	14		/* Contains copy of prcred struct */
+#define NT_UTSNAME	15		/* Contains copy of utsname struct */
+#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
+#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
+#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
+#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
+#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
+#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
+#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
+#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
+#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
+#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
+
+/* Legal values for the note segment descriptor types for object files.  */
+
+#define NT_VERSION	1		/* Contains a version string.  */
+
+
+/* Dynamic section entry.  */
+
+typedef struct
+{
+  Elf32_Sword	d_tag;			/* Dynamic entry type */
+  union
+    {
+      Elf32_Word d_val;			/* Integer value */
+      Elf32_Addr d_ptr;			/* Address value */
+    } d_un;
+} Elf32_Dyn;
+
+typedef struct
+{
+  Elf64_Sxword	d_tag;			/* Dynamic entry type */
+  union
+    {
+      Elf64_Xword d_val;		/* Integer value */
+      Elf64_Addr d_ptr;			/* Address value */
+    } d_un;
+} Elf64_Dyn;
+
+/* Legal values for d_tag (dynamic entry type).  */
+
+#define DT_NULL		0		/* Marks end of dynamic section */
+#define DT_NEEDED	1		/* Name of needed library */
+#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
+#define DT_PLTGOT	3		/* Processor defined value */
+#define DT_HASH		4		/* Address of symbol hash table */
+#define DT_STRTAB	5		/* Address of string table */
+#define DT_SYMTAB	6		/* Address of symbol table */
+#define DT_RELA		7		/* Address of Rela relocs */
+#define DT_RELASZ	8		/* Total size of Rela relocs */
+#define DT_RELAENT	9		/* Size of one Rela reloc */
+#define DT_STRSZ	10		/* Size of string table */
+#define DT_SYMENT	11		/* Size of one symbol table entry */
+#define DT_INIT		12		/* Address of init function */
+#define DT_FINI		13		/* Address of termination function */
+#define DT_SONAME	14		/* Name of shared object */
+#define DT_RPATH	15		/* Library search path (deprecated) */
+#define DT_SYMBOLIC	16		/* Start symbol search here */
+#define DT_REL		17		/* Address of Rel relocs */
+#define DT_RELSZ	18		/* Total size of Rel relocs */
+#define DT_RELENT	19		/* Size of one Rel reloc */
+#define DT_PLTREL	20		/* Type of reloc in PLT */
+#define DT_DEBUG	21		/* For debugging; unspecified */
+#define DT_TEXTREL	22		/* Reloc might modify .text */
+#define DT_JMPREL	23		/* Address of PLT relocs */
+#define	DT_BIND_NOW	24		/* Process relocations of object */
+#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
+#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
+#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
+#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
+#define DT_RUNPATH	29		/* Library search path */
+#define DT_FLAGS	30		/* Flags for the object being loaded */
+#define DT_ENCODING	32		/* Start of encoded range */
+#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
+#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
+#define	DT_NUM		34		/* Number used */
+#define DT_LOOS		0x6000000d	/* Start of OS-specific */
+#define DT_HIOS		0x6ffff000	/* End of OS-specific */
+#define DT_LOPROC	0x70000000	/* Start of processor-specific */
+#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
+#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
+
+/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
+   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
+   approach.  */
+#define DT_VALRNGLO	0x6ffffd00
+#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
+#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
+#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
+#define DT_CHECKSUM	0x6ffffdf8
+#define DT_PLTPADSZ	0x6ffffdf9
+#define DT_MOVEENT	0x6ffffdfa
+#define DT_MOVESZ	0x6ffffdfb
+#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
+#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
+					   the following DT_* entry.  */
+#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
+#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
+#define DT_VALRNGHI	0x6ffffdff
+#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
+#define DT_VALNUM 12
+
+/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
+   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
+
+   If any adjustment is made to the ELF object after it has been
+   built these entries will need to be adjusted.  */
+#define DT_ADDRRNGLO	0x6ffffe00
+#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
+#define DT_TLSDESC_PLT	0x6ffffef6
+#define DT_TLSDESC_GOT	0x6ffffef7
+#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
+#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
+#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
+#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
+#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
+#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
+#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
+#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
+#define DT_ADDRRNGHI	0x6ffffeff
+#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
+#define DT_ADDRNUM 11
+
+/* The versioning entry types.  The next are defined as part of the
+   GNU extension.  */
+#define DT_VERSYM	0x6ffffff0
+
+#define DT_RELACOUNT	0x6ffffff9
+#define DT_RELCOUNT	0x6ffffffa
+
+/* These were chosen by Sun.  */
+#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
+#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
+					   table */
+#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
+#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
+					   versions */
+#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
+#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
+#define DT_VERSIONTAGNUM 16
+
+/* Sun added these machine-independent extensions in the "processor-specific"
+   range.  Be compatible.  */
+#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
+#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
+#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
+#define DT_EXTRANUM	3
+
+/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
+#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
+#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
+#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
+#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
+#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
+
+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
+   entry in the dynamic section.  */
+#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
+#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
+#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
+#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
+#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
+#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
+#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
+#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
+#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
+#define DF_1_TRANS	0x00000200
+#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
+#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
+#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
+#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
+#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
+#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
+#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
+
+/* Flags for the feature selection in DT_FEATURE_1.  */
+#define DTF_1_PARINIT	0x00000001
+#define DTF_1_CONFEXP	0x00000002
+
+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
+#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
+#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
+					   generally available.  */
+
+/* Version definition sections.  */
+
+typedef struct
+{
+  Elf32_Half	vd_version;		/* Version revision */
+  Elf32_Half	vd_flags;		/* Version information */
+  Elf32_Half	vd_ndx;			/* Version Index */
+  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
+  Elf32_Word	vd_hash;		/* Version name hash value */
+  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
+  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
+					   entry */
+} Elf32_Verdef;
+
+typedef struct
+{
+  Elf64_Half	vd_version;		/* Version revision */
+  Elf64_Half	vd_flags;		/* Version information */
+  Elf64_Half	vd_ndx;			/* Version Index */
+  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
+  Elf64_Word	vd_hash;		/* Version name hash value */
+  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
+  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
+					   entry */
+} Elf64_Verdef;
+
+
+/* Legal values for vd_version (version revision).  */
+#define VER_DEF_NONE	0		/* No version */
+#define VER_DEF_CURRENT	1		/* Current version */
+#define VER_DEF_NUM	2		/* Given version number */
+
+/* Legal values for vd_flags (version information flags).  */
+#define VER_FLG_BASE	0x1		/* Version definition of file itself */
+#define VER_FLG_WEAK	0x2		/* Weak version identifier */
+
+/* Versym symbol index values.  */
+#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
+#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
+#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
+#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
+
+/* Auxialiary version information.  */
+
+typedef struct
+{
+  Elf32_Word	vda_name;		/* Version or dependency names */
+  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
+					   entry */
+} Elf32_Verdaux;
+
+typedef struct
+{
+  Elf64_Word	vda_name;		/* Version or dependency names */
+  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
+					   entry */
+} Elf64_Verdaux;
+
+
+/* Version dependency section.  */
+
+typedef struct
+{
+  Elf32_Half	vn_version;		/* Version of structure */
+  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
+  Elf32_Word	vn_file;		/* Offset of filename for this
+					   dependency */
+  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
+  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
+					   entry */
+} Elf32_Verneed;
+
+typedef struct
+{
+  Elf64_Half	vn_version;		/* Version of structure */
+  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
+  Elf64_Word	vn_file;		/* Offset of filename for this
+					   dependency */
+  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
+  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
+					   entry */
+} Elf64_Verneed;
+
+
+/* Legal values for vn_version (version revision).  */
+#define VER_NEED_NONE	 0		/* No version */
+#define VER_NEED_CURRENT 1		/* Current version */
+#define VER_NEED_NUM	 2		/* Given version number */
+
+/* Auxiliary needed version information.  */
+
+typedef struct
+{
+  Elf32_Word	vna_hash;		/* Hash value of dependency name */
+  Elf32_Half	vna_flags;		/* Dependency specific information */
+  Elf32_Half	vna_other;		/* Unused */
+  Elf32_Word	vna_name;		/* Dependency name string offset */
+  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
+					   entry */
+} Elf32_Vernaux;
+
+typedef struct
+{
+  Elf64_Word	vna_hash;		/* Hash value of dependency name */
+  Elf64_Half	vna_flags;		/* Dependency specific information */
+  Elf64_Half	vna_other;		/* Unused */
+  Elf64_Word	vna_name;		/* Dependency name string offset */
+  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
+					   entry */
+} Elf64_Vernaux;
+
+
+/* Legal values for vna_flags.  */
+#define VER_FLG_WEAK	0x2		/* Weak version identifier */
+
+
+/* Auxiliary vector.  */
+
+/* This vector is normally only used by the program interpreter.  The
+   usual definition in an ABI supplement uses the name auxv_t.  The
+   vector is not usually defined in a standard <elf.h> file, but it
+   can't hurt.  We rename it to avoid conflicts.  The sizes of these
+   types are an arrangement between the exec server and the program
+   interpreter, so we don't fully specify them here.  */
+
+typedef struct
+{
+  uint32_t a_type;		/* Entry type */
+  union
+    {
+      uint32_t a_val;		/* Integer value */
+      /* We use to have pointer elements added here.  We cannot do that,
+	 though, since it does not work when using 32-bit definitions
+	 on 64-bit platforms and vice versa.  */
+    } a_un;
+} Elf32_auxv_t;
+
+typedef struct
+{
+  uint64_t a_type;		/* Entry type */
+  union
+    {
+      uint64_t a_val;		/* Integer value */
+      /* We use to have pointer elements added here.  We cannot do that,
+	 though, since it does not work when using 32-bit definitions
+	 on 64-bit platforms and vice versa.  */
+    } a_un;
+} Elf64_auxv_t;
+
+/* Legal values for a_type (entry type).  */
+
+#define AT_NULL		0		/* End of vector */
+#define AT_IGNORE	1		/* Entry should be ignored */
+#define AT_EXECFD	2		/* File descriptor of program */
+#define AT_PHDR		3		/* Program headers for program */
+#define AT_PHENT	4		/* Size of program header entry */
+#define AT_PHNUM	5		/* Number of program headers */
+#define AT_PAGESZ	6		/* System page size */
+#define AT_BASE		7		/* Base address of interpreter */
+#define AT_FLAGS	8		/* Flags */
+#define AT_ENTRY	9		/* Entry point of program */
+#define AT_NOTELF	10		/* Program is not ELF */
+#define AT_UID		11		/* Real uid */
+#define AT_EUID		12		/* Effective uid */
+#define AT_GID		13		/* Real gid */
+#define AT_EGID		14		/* Effective gid */
+#define AT_CLKTCK	17		/* Frequency of times() */
+
+/* Some more special a_type values describing the hardware.  */
+#define AT_PLATFORM	15		/* String identifying platform.  */
+#define AT_HWCAP	16		/* Machine dependent hints about
+					   processor capabilities.  */
+
+/* This entry gives some information about the FPU initialization
+   performed by the kernel.  */
+#define AT_FPUCW	18		/* Used FPU control word.  */
+
+/* Cache block sizes.  */
+#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
+#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
+#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
+
+/* A special ignored value for PPC, used by the kernel to control the
+   interpretation of the AUXV. Must be > 16.  */
+#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
+
+#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
+
+#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
+
+#define AT_RANDOM	25		/* Address of 16 random bytes.  */
+
+#define AT_EXECFN	31		/* Filename of executable.  */
+
+/* Pointer to the global system page used for system calls and other
+   nice things.  */
+#define AT_SYSINFO	32
+#define AT_SYSINFO_EHDR	33
+
+/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
+   log2 of line size; mask those to get cache size.  */
+#define AT_L1I_CACHESHAPE	34
+#define AT_L1D_CACHESHAPE	35
+#define AT_L2_CACHESHAPE	36
+#define AT_L3_CACHESHAPE	37
+
+/* Note section contents.  Each entry in the note section begins with
+   a header of a fixed form.  */
+
+typedef struct
+{
+  Elf32_Word n_namesz;			/* Length of the note's name.  */
+  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
+  Elf32_Word n_type;			/* Type of the note.  */
+} Elf32_Nhdr;
+
+typedef struct
+{
+  Elf64_Word n_namesz;			/* Length of the note's name.  */
+  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
+  Elf64_Word n_type;			/* Type of the note.  */
+} Elf64_Nhdr;
+
+/* Known names of notes.  */
+
+/* Solaris entries in the note section have this name.  */
+#define ELF_NOTE_SOLARIS	"SUNW Solaris"
+
+/* Note entries for GNU systems have this name.  */
+#define ELF_NOTE_GNU		"GNU"
+
+
+/* Defined types of notes for Solaris.  */
+
+/* Value of descriptor (one word) is desired pagesize for the binary.  */
+#define ELF_NOTE_PAGESIZE_HINT	1
+
+
+/* Defined note types for GNU systems.  */
+
+/* ABI information.  The descriptor consists of words:
+   word 0: OS descriptor
+   word 1: major version of the ABI
+   word 2: minor version of the ABI
+   word 3: subminor version of the ABI
+*/
+#define NT_GNU_ABI_TAG	1
+#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
+
+/* Known OSes.  These values can appear in word 0 of an
+   NT_GNU_ABI_TAG note section entry.  */
+#define ELF_NOTE_OS_LINUX	0
+#define ELF_NOTE_OS_GNU		1
+#define ELF_NOTE_OS_SOLARIS2	2
+#define ELF_NOTE_OS_FREEBSD	3
+
+/* Synthetic hwcap information.  The descriptor begins with two words:
+   word 0: number of entries
+   word 1: bitmask of enabled entries
+   Then follow variable-length entries, one byte followed by a
+   '\0'-terminated hwcap name string.  The byte gives the bit
+   number to test if enabled, (1U << bit) & bitmask.  */
+#define NT_GNU_HWCAP	2
+
+/* Build ID bits as generated by ld --build-id.
+   The descriptor consists of any nonzero number of bytes.  */
+#define NT_GNU_BUILD_ID	3
+
+/* Version note generated by GNU gold containing a version string.  */
+#define NT_GNU_GOLD_VERSION	4
+
+
+/* Move records.  */
+typedef struct
+{
+  Elf32_Xword m_value;		/* Symbol value.  */
+  Elf32_Word m_info;		/* Size and index.  */
+  Elf32_Word m_poffset;		/* Symbol offset.  */
+  Elf32_Half m_repeat;		/* Repeat count.  */
+  Elf32_Half m_stride;		/* Stride info.  */
+} Elf32_Move;
+
+typedef struct
+{
+  Elf64_Xword m_value;		/* Symbol value.  */
+  Elf64_Xword m_info;		/* Size and index.  */
+  Elf64_Xword m_poffset;	/* Symbol offset.  */
+  Elf64_Half m_repeat;		/* Repeat count.  */
+  Elf64_Half m_stride;		/* Stride info.  */
+} Elf64_Move;
+
+/* Macro to construct move records.  */
+#define ELF32_M_SYM(info)	((info) >> 8)
+#define ELF32_M_SIZE(info)	((unsigned char) (info))
+#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
+
+#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
+#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
+#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
+
+
+/* Motorola 68k specific definitions.  */
+
+/* Values for Elf32_Ehdr.e_flags.  */
+#define EF_CPU32	0x00810000
+
+/* m68k relocs.  */
+
+#define R_68K_NONE	0		/* No reloc */
+#define R_68K_32	1		/* Direct 32 bit  */
+#define R_68K_16	2		/* Direct 16 bit  */
+#define R_68K_8		3		/* Direct 8 bit  */
+#define R_68K_PC32	4		/* PC relative 32 bit */
+#define R_68K_PC16	5		/* PC relative 16 bit */
+#define R_68K_PC8	6		/* PC relative 8 bit */
+#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
+#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
+#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
+#define R_68K_GOT32O	10		/* 32 bit GOT offset */
+#define R_68K_GOT16O	11		/* 16 bit GOT offset */
+#define R_68K_GOT8O	12		/* 8 bit GOT offset */
+#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
+#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
+#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
+#define R_68K_PLT32O	16		/* 32 bit PLT offset */
+#define R_68K_PLT16O	17		/* 16 bit PLT offset */
+#define R_68K_PLT8O	18		/* 8 bit PLT offset */
+#define R_68K_COPY	19		/* Copy symbol at runtime */
+#define R_68K_GLOB_DAT	20		/* Create GOT entry */
+#define R_68K_JMP_SLOT	21		/* Create PLT entry */
+#define R_68K_RELATIVE	22		/* Adjust by program base */
+#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
+#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
+#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
+#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
+#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
+#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
+#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
+#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
+#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
+#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
+#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
+#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
+#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
+					   static TLS block */
+#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
+					   static TLS block */
+#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
+					   static TLS block */
+#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
+#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
+#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
+/* Keep this the last entry.  */
+#define R_68K_NUM	43
+
+/* Intel 80386 specific definitions.  */
+
+/* i386 relocs.  */
+
+#define R_386_NONE	   0		/* No reloc */
+#define R_386_32	   1		/* Direct 32 bit  */
+#define R_386_PC32	   2		/* PC relative 32 bit */
+#define R_386_GOT32	   3		/* 32 bit GOT entry */
+#define R_386_PLT32	   4		/* 32 bit PLT address */
+#define R_386_COPY	   5		/* Copy symbol at runtime */
+#define R_386_GLOB_DAT	   6		/* Create GOT entry */
+#define R_386_JMP_SLOT	   7		/* Create PLT entry */
+#define R_386_RELATIVE	   8		/* Adjust by program base */
+#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
+#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
+#define R_386_32PLT	   11
+#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
+#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
+					   block offset */
+#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
+					   offset */
+#define R_386_TLS_LE	   17		/* Offset relative to static TLS
+					   block */
+#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
+					   general dynamic thread local data */
+#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
+					   local dynamic thread local data
+					   in LE code */
+#define R_386_16	   20
+#define R_386_PC16	   21
+#define R_386_8		   22
+#define R_386_PC8	   23
+#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
+					   thread local data */
+#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
+#define R_386_TLS_GD_CALL  26		/* Relocation for call to
+					   __tls_get_addr() */
+#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
+#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
+					   thread local data in LE code */
+#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
+#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
+					   __tls_get_addr() in LDM code */
+#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
+#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
+#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
+					   block offset */
+#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
+					   TLS block */
+#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
+#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
+#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
+/* 38? */
+#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
+#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
+					   descriptor for
+					   relaxation.  */
+#define R_386_TLS_DESC     41		/* TLS descriptor containing
+					   pointer to code and to
+					   argument, returning the TLS
+					   offset for the symbol.  */
+#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
+/* Keep this the last entry.  */
+#define R_386_NUM	   43
+
+/* SUN SPARC specific definitions.  */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
+
+/* Values for Elf64_Ehdr.e_flags.  */
+
+#define EF_SPARCV9_MM		3
+#define EF_SPARCV9_TSO		0
+#define EF_SPARCV9_PSO		1
+#define EF_SPARCV9_RMO		2
+#define EF_SPARC_LEDATA		0x800000 /* little endian data */
+#define EF_SPARC_EXT_MASK	0xFFFF00
+#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
+#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
+#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
+#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
+
+/* SPARC relocs.  */
+
+#define R_SPARC_NONE		0	/* No reloc */
+#define R_SPARC_8		1	/* Direct 8 bit */
+#define R_SPARC_16		2	/* Direct 16 bit */
+#define R_SPARC_32		3	/* Direct 32 bit */
+#define R_SPARC_DISP8		4	/* PC relative 8 bit */
+#define R_SPARC_DISP16		5	/* PC relative 16 bit */
+#define R_SPARC_DISP32		6	/* PC relative 32 bit */
+#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
+#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
+#define R_SPARC_HI22		9	/* High 22 bit */
+#define R_SPARC_22		10	/* Direct 22 bit */
+#define R_SPARC_13		11	/* Direct 13 bit */
+#define R_SPARC_LO10		12	/* Truncated 10 bit */
+#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
+#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
+#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
+#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
+#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
+#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
+#define R_SPARC_COPY		19	/* Copy symbol at runtime */
+#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
+#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
+#define R_SPARC_RELATIVE	22	/* Adjust by program base */
+#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
+
+/* Additional Sparc64 relocs.  */
+
+#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
+#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
+#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
+#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
+#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
+#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
+#define R_SPARC_10		30	/* Direct 10 bit */
+#define R_SPARC_11		31	/* Direct 11 bit */
+#define R_SPARC_64		32	/* Direct 64 bit */
+#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
+#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
+#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
+#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
+#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
+#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
+#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
+#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
+#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
+#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
+#define R_SPARC_7		43	/* Direct 7 bit */
+#define R_SPARC_5		44	/* Direct 5 bit */
+#define R_SPARC_6		45	/* Direct 6 bit */
+#define R_SPARC_DISP64		46	/* PC relative 64 bit */
+#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
+#define R_SPARC_HIX22		48	/* High 22 bit complemented */
+#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
+#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
+#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
+#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
+#define R_SPARC_REGISTER	53	/* Global register usage */
+#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
+#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
+#define R_SPARC_TLS_GD_HI22	56
+#define R_SPARC_TLS_GD_LO10	57
+#define R_SPARC_TLS_GD_ADD	58
+#define R_SPARC_TLS_GD_CALL	59
+#define R_SPARC_TLS_LDM_HI22	60
+#define R_SPARC_TLS_LDM_LO10	61
+#define R_SPARC_TLS_LDM_ADD	62
+#define R_SPARC_TLS_LDM_CALL	63
+#define R_SPARC_TLS_LDO_HIX22	64
+#define R_SPARC_TLS_LDO_LOX10	65
+#define R_SPARC_TLS_LDO_ADD	66
+#define R_SPARC_TLS_IE_HI22	67
+#define R_SPARC_TLS_IE_LO10	68
+#define R_SPARC_TLS_IE_LD	69
+#define R_SPARC_TLS_IE_LDX	70
+#define R_SPARC_TLS_IE_ADD	71
+#define R_SPARC_TLS_LE_HIX22	72
+#define R_SPARC_TLS_LE_LOX10	73
+#define R_SPARC_TLS_DTPMOD32	74
+#define R_SPARC_TLS_DTPMOD64	75
+#define R_SPARC_TLS_DTPOFF32	76
+#define R_SPARC_TLS_DTPOFF64	77
+#define R_SPARC_TLS_TPOFF32	78
+#define R_SPARC_TLS_TPOFF64	79
+#define R_SPARC_GOTDATA_HIX22	80
+#define R_SPARC_GOTDATA_LOX10	81
+#define R_SPARC_GOTDATA_OP_HIX22	82
+#define R_SPARC_GOTDATA_OP_LOX10	83
+#define R_SPARC_GOTDATA_OP	84
+#define R_SPARC_H34		85
+#define R_SPARC_SIZE32		86
+#define R_SPARC_SIZE64		87
+#define R_SPARC_WDISP10		88
+#define R_SPARC_JMP_IREL	248
+#define R_SPARC_IRELATIVE	249
+#define R_SPARC_GNU_VTINHERIT	250
+#define R_SPARC_GNU_VTENTRY	251
+#define R_SPARC_REV32		252
+/* Keep this the last entry.  */
+#define R_SPARC_NUM		253
+
+/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
+
+#define DT_SPARC_REGISTER 0x70000001
+#define DT_SPARC_NUM	2
+
+/* MIPS R3000 specific definitions.  */
+
+/* Legal values for e_flags field of Elf32_Ehdr.  */
+
+#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
+#define EF_MIPS_PIC	    2		/* Contains PIC code */
+#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
+#define EF_MIPS_XGOT	    8
+#define EF_MIPS_64BIT_WHIRL 16
+#define EF_MIPS_ABI2	    32
+#define EF_MIPS_ABI_ON32    64
+#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
+
+/* Legal values for MIPS architecture level.  */
+
+#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
+#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
+#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
+#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
+#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
+#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
+#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
+
+/* The following are non-official names and should not be used.  */
+
+#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
+#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
+#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
+#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
+#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
+#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
+#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
+
+/* Special section indices.  */
+
+#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
+#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
+#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
+#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
+#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
+
+/* Legal values for sh_type field of Elf32_Shdr.  */
+
+#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
+#define SHT_MIPS_MSYM	       0x70000001
+#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
+#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
+#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
+#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
+#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
+#define SHT_MIPS_PACKAGE       0x70000007
+#define SHT_MIPS_PACKSYM       0x70000008
+#define SHT_MIPS_RELD	       0x70000009
+#define SHT_MIPS_IFACE         0x7000000b
+#define SHT_MIPS_CONTENT       0x7000000c
+#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
+#define SHT_MIPS_SHDR	       0x70000010
+#define SHT_MIPS_FDESC	       0x70000011
+#define SHT_MIPS_EXTSYM	       0x70000012
+#define SHT_MIPS_DENSE	       0x70000013
+#define SHT_MIPS_PDESC	       0x70000014
+#define SHT_MIPS_LOCSYM	       0x70000015
+#define SHT_MIPS_AUXSYM	       0x70000016
+#define SHT_MIPS_OPTSYM	       0x70000017
+#define SHT_MIPS_LOCSTR	       0x70000018
+#define SHT_MIPS_LINE	       0x70000019
+#define SHT_MIPS_RFDESC	       0x7000001a
+#define SHT_MIPS_DELTASYM      0x7000001b
+#define SHT_MIPS_DELTAINST     0x7000001c
+#define SHT_MIPS_DELTACLASS    0x7000001d
+#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
+#define SHT_MIPS_DELTADECL     0x7000001f
+#define SHT_MIPS_SYMBOL_LIB    0x70000020
+#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
+#define SHT_MIPS_TRANSLATE     0x70000022
+#define SHT_MIPS_PIXIE	       0x70000023
+#define SHT_MIPS_XLATE	       0x70000024
+#define SHT_MIPS_XLATE_DEBUG   0x70000025
+#define SHT_MIPS_WHIRL	       0x70000026
+#define SHT_MIPS_EH_REGION     0x70000027
+#define SHT_MIPS_XLATE_OLD     0x70000028
+#define SHT_MIPS_PDR_EXCEPTION 0x70000029
+
+/* Legal values for sh_flags field of Elf32_Shdr.  */
+
+#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
+#define SHF_MIPS_MERGE	 0x20000000
+#define SHF_MIPS_ADDR	 0x40000000
+#define SHF_MIPS_STRINGS 0x80000000
+#define SHF_MIPS_NOSTRIP 0x08000000
+#define SHF_MIPS_LOCAL	 0x04000000
+#define SHF_MIPS_NAMES	 0x02000000
+#define SHF_MIPS_NODUPE	 0x01000000
+
+
+/* Symbol tables.  */
+
+/* MIPS specific values for `st_other'.  */
+#define STO_MIPS_DEFAULT		0x0
+#define STO_MIPS_INTERNAL		0x1
+#define STO_MIPS_HIDDEN			0x2
+#define STO_MIPS_PROTECTED		0x3
+#define STO_MIPS_PLT			0x8
+#define STO_MIPS_SC_ALIGN_UNUSED	0xff
+
+/* MIPS specific values for `st_info'.  */
+#define STB_MIPS_SPLIT_COMMON		13
+
+/* Entries found in sections of type SHT_MIPS_GPTAB.  */
+
+typedef union
+{
+  struct
+    {
+      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
+      Elf32_Word gt_unused;		/* Not used */
+    } gt_header;			/* First entry in section */
+  struct
+    {
+      Elf32_Word gt_g_value;		/* If this value were used for -G */
+      Elf32_Word gt_bytes;		/* This many bytes would be used */
+    } gt_entry;				/* Subsequent entries in section */
+} Elf32_gptab;
+
+/* Entry found in sections of type SHT_MIPS_REGINFO.  */
+
+typedef struct
+{
+  Elf32_Word	ri_gprmask;		/* General registers used */
+  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
+  Elf32_Sword	ri_gp_value;		/* $gp register value */
+} Elf32_RegInfo;
+
+/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
+
+typedef struct
+{
+  unsigned char kind;		/* Determines interpretation of the
+				   variable part of descriptor.  */
+  unsigned char size;		/* Size of descriptor, including header.  */
+  Elf32_Section section;	/* Section header index of section affected,
+				   0 for global options.  */
+  Elf32_Word info;		/* Kind-specific information.  */
+} Elf_Options;
+
+/* Values for `kind' field in Elf_Options.  */
+
+#define ODK_NULL	0	/* Undefined.  */
+#define ODK_REGINFO	1	/* Register usage information.  */
+#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
+#define ODK_PAD		3	/* Section padding options.  */
+#define ODK_HWPATCH	4	/* Hardware workarounds performed */
+#define ODK_FILL	5	/* record the fill value used by the linker. */
+#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
+#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
+#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
+
+/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
+
+#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
+#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
+#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
+#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
+#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
+#define OEX_PRECISEFP	OEX_FPDBUG
+#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
+
+#define OEX_FPU_INVAL	0x10
+#define OEX_FPU_DIV0	0x08
+#define OEX_FPU_OFLO	0x04
+#define OEX_FPU_UFLO	0x02
+#define OEX_FPU_INEX	0x01
+
+/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
+
+#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
+#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
+#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
+#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
+
+#define OPAD_PREFIX	0x1
+#define OPAD_POSTFIX	0x2
+#define OPAD_SYMBOL	0x4
+
+/* Entry found in `.options' section.  */
+
+typedef struct
+{
+  Elf32_Word hwp_flags1;	/* Extra flags.  */
+  Elf32_Word hwp_flags2;	/* Extra flags.  */
+} Elf_Options_Hw;
+
+/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
+
+#define OHWA0_R4KEOP_CHECKED	0x00000001
+#define OHWA1_R4KEOP_CLEAN	0x00000002
+
+/* MIPS relocs.  */
+
+#define R_MIPS_NONE		0	/* No reloc */
+#define R_MIPS_16		1	/* Direct 16 bit */
+#define R_MIPS_32		2	/* Direct 32 bit */
+#define R_MIPS_REL32		3	/* PC relative 32 bit */
+#define R_MIPS_26		4	/* Direct 26 bit shifted */
+#define R_MIPS_HI16		5	/* High 16 bit */
+#define R_MIPS_LO16		6	/* Low 16 bit */
+#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
+#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
+#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
+#define R_MIPS_PC16		10	/* PC relative 16 bit */
+#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
+#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
+
+#define R_MIPS_SHIFT5		16
+#define R_MIPS_SHIFT6		17
+#define R_MIPS_64		18
+#define R_MIPS_GOT_DISP		19
+#define R_MIPS_GOT_PAGE		20
+#define R_MIPS_GOT_OFST		21
+#define R_MIPS_GOT_HI16		22
+#define R_MIPS_GOT_LO16		23
+#define R_MIPS_SUB		24
+#define R_MIPS_INSERT_A		25
+#define R_MIPS_INSERT_B		26
+#define R_MIPS_DELETE		27
+#define R_MIPS_HIGHER		28
+#define R_MIPS_HIGHEST		29
+#define R_MIPS_CALL_HI16	30
+#define R_MIPS_CALL_LO16	31
+#define R_MIPS_SCN_DISP		32
+#define R_MIPS_REL16		33
+#define R_MIPS_ADD_IMMEDIATE	34
+#define R_MIPS_PJUMP		35
+#define R_MIPS_RELGOT		36
+#define R_MIPS_JALR		37
+#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
+#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
+#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
+#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
+#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
+#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
+#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
+#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
+#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
+#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
+#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
+#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
+#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
+#define R_MIPS_GLOB_DAT		51
+#define R_MIPS_COPY		126
+#define R_MIPS_JUMP_SLOT        127
+/* Keep this the last entry.  */
+#define R_MIPS_NUM		128
+
+/* Legal values for p_type field of Elf32_Phdr.  */
+
+#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
+#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
+#define PT_MIPS_OPTIONS 0x70000002
+
+/* Special program header types.  */
+
+#define PF_MIPS_LOCAL	0x10000000
+
+/* Legal values for d_tag field of Elf32_Dyn.  */
+
+#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
+#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
+#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
+#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
+#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
+#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
+#define DT_MIPS_MSYM	     0x70000007
+#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
+#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
+#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
+#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
+#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
+#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
+#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
+#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
+#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
+#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
+#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
+#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
+						DT_MIPS_DELTA_CLASS.  */
+#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
+						DT_MIPS_DELTA_INSTANCE.  */
+#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
+					     DT_MIPS_DELTA_RELOC.  */
+#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
+					   relocations refer to.  */
+#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
+					   DT_MIPS_DELTA_SYM.  */
+#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
+					     class declaration.  */
+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
+						DT_MIPS_DELTA_CLASSSYM.  */
+#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
+#define DT_MIPS_PIXIE_INIT   0x70000023
+#define DT_MIPS_SYMBOL_LIB   0x70000024
+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
+#define DT_MIPS_LOCAL_GOTIDX 0x70000026
+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
+#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
+#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
+#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
+						    function stored in GOT.  */
+#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
+					   by rld on dlopen() calls.  */
+#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
+#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
+#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
+/* The address of .got.plt in an executable using the new non-PIC ABI.  */
+#define DT_MIPS_PLTGOT	     0x70000032
+/* The base of the PLT in an executable using the new non-PIC ABI if that
+   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
+   value.  */
+#define DT_MIPS_RWPLT        0x70000034
+#define DT_MIPS_NUM	     0x35
+
+/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
+
+#define RHF_NONE		   0		/* No flags */
+#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
+#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
+#define RHF_NO_MOVE		   (1 << 3)
+#define RHF_SGI_ONLY		   (1 << 4)
+#define RHF_GUARANTEE_INIT	   (1 << 5)
+#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
+#define RHF_GUARANTEE_START_INIT   (1 << 7)
+#define RHF_PIXIE		   (1 << 8)
+#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
+#define RHF_REQUICKSTART	   (1 << 10)
+#define RHF_REQUICKSTARTED	   (1 << 11)
+#define RHF_CORD		   (1 << 12)
+#define RHF_NO_UNRES_UNDEF	   (1 << 13)
+#define RHF_RLD_ORDER_SAFE	   (1 << 14)
+
+/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
+
+typedef struct
+{
+  Elf32_Word l_name;		/* Name (string table index) */
+  Elf32_Word l_time_stamp;	/* Timestamp */
+  Elf32_Word l_checksum;	/* Checksum */
+  Elf32_Word l_version;		/* Interface version */
+  Elf32_Word l_flags;		/* Flags */
+} Elf32_Lib;
+
+typedef struct
+{
+  Elf64_Word l_name;		/* Name (string table index) */
+  Elf64_Word l_time_stamp;	/* Timestamp */
+  Elf64_Word l_checksum;	/* Checksum */
+  Elf64_Word l_version;		/* Interface version */
+  Elf64_Word l_flags;		/* Flags */
+} Elf64_Lib;
+
+
+/* Legal values for l_flags.  */
+
+#define LL_NONE		  0
+#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
+#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
+#define LL_REQUIRE_MINOR  (1 << 2)
+#define LL_EXPORTS	  (1 << 3)
+#define LL_DELAY_LOAD	  (1 << 4)
+#define LL_DELTA	  (1 << 5)
+
+/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
+
+typedef Elf32_Addr Elf32_Conflict;
+
+
+/* HPPA specific definitions.  */
+
+/* Legal values for e_flags field of Elf32_Ehdr.  */
+
+#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
+#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
+#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
+#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
+#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
+					      prediction.  */
+#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
+#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
+
+/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
+
+#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
+#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
+#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
+
+/* Additional section indeces.  */
+
+#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
+					      symbols in ANSI C.  */
+#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
+
+/* Legal values for sh_type field of Elf32_Shdr.  */
+
+#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
+#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
+#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
+
+/* Legal values for sh_flags field of Elf32_Shdr.  */
+
+#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
+#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
+#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
+
+#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
+#define STT_HP_STUB		(STT_LOOS + 0x2)
+
+/* HPPA relocs.  */
+
+#define R_PARISC_NONE		0	/* No reloc.  */
+#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
+#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
+#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
+#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
+#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
+#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
+#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
+#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
+#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
+#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
+#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
+#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
+#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
+#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
+#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
+#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
+#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
+#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
+#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
+#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
+#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
+#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
+#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
+#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
+#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
+#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
+#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
+#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
+#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
+#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
+#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
+#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
+#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
+#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
+#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
+#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
+#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
+#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
+#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
+#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
+#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
+#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
+#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
+#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
+#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
+#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
+#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
+#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
+#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
+#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
+#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
+#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
+#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
+#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
+#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
+#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
+#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
+#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
+#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
+#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
+#define R_PARISC_LORESERVE	128
+#define R_PARISC_COPY		128	/* Copy relocation.  */
+#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
+#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
+#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
+#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
+#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
+#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
+#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
+#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
+#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
+#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
+#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
+#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
+#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_GNU_VTENTRY	232
+#define R_PARISC_GNU_VTINHERIT	233
+#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
+#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
+#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
+#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
+#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
+#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
+#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
+#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
+#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
+#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
+#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
+#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
+#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
+#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
+#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
+#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
+#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
+#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
+#define R_PARISC_HIRESERVE	255
+
+/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
+
+#define PT_HP_TLS		(PT_LOOS + 0x0)
+#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
+#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
+#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
+#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
+#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
+#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
+#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
+#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
+#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
+#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
+#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
+#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
+#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
+#define PT_HP_STACK		(PT_LOOS + 0x14)
+
+#define PT_PARISC_ARCHEXT	0x70000000
+#define PT_PARISC_UNWIND	0x70000001
+
+/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
+
+#define PF_PARISC_SBP		0x08000000
+
+#define PF_HP_PAGE_SIZE		0x00100000
+#define PF_HP_FAR_SHARED	0x00200000
+#define PF_HP_NEAR_SHARED	0x00400000
+#define PF_HP_CODE		0x01000000
+#define PF_HP_MODIFY		0x02000000
+#define PF_HP_LAZYSWAP		0x04000000
+#define PF_HP_SBP		0x08000000
+
+
+/* Alpha specific definitions.  */
+
+/* Legal values for e_flags field of Elf64_Ehdr.  */
+
+#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
+#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
+
+/* Legal values for sh_type field of Elf64_Shdr.  */
+
+/* These two are primerily concerned with ECOFF debugging info.  */
+#define SHT_ALPHA_DEBUG		0x70000001
+#define SHT_ALPHA_REGINFO	0x70000002
+
+/* Legal values for sh_flags field of Elf64_Shdr.  */
+
+#define SHF_ALPHA_GPREL		0x10000000
+
+/* Legal values for st_other field of Elf64_Sym.  */
+#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
+#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
+
+/* Alpha relocs.  */
+
+#define R_ALPHA_NONE		0	/* No reloc */
+#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
+#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
+#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
+#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
+#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
+#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
+#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
+#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
+#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
+#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
+#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
+#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
+#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
+#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
+#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
+#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
+#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
+#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
+#define R_ALPHA_TLS_GD_HI	28
+#define R_ALPHA_TLSGD		29
+#define R_ALPHA_TLS_LDM		30
+#define R_ALPHA_DTPMOD64	31
+#define R_ALPHA_GOTDTPREL	32
+#define R_ALPHA_DTPREL64	33
+#define R_ALPHA_DTPRELHI	34
+#define R_ALPHA_DTPRELLO	35
+#define R_ALPHA_DTPREL16	36
+#define R_ALPHA_GOTTPREL	37
+#define R_ALPHA_TPREL64		38
+#define R_ALPHA_TPRELHI		39
+#define R_ALPHA_TPRELLO		40
+#define R_ALPHA_TPREL16		41
+/* Keep this the last entry.  */
+#define R_ALPHA_NUM		46
+
+/* Magic values of the LITUSE relocation addend.  */
+#define LITUSE_ALPHA_ADDR	0
+#define LITUSE_ALPHA_BASE	1
+#define LITUSE_ALPHA_BYTOFF	2
+#define LITUSE_ALPHA_JSR	3
+#define LITUSE_ALPHA_TLS_GD	4
+#define LITUSE_ALPHA_TLS_LDM	5
+
+/* Legal values for d_tag of Elf64_Dyn.  */
+#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
+#define DT_ALPHA_NUM		1
+
+/* PowerPC specific declarations */
+
+/* Values for Elf32/64_Ehdr.e_flags.  */
+#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
+
+/* Cygnus local bits below */
+#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
+#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
+						   flag */
+
+/* PowerPC relocations defined by the ABIs */
+#define R_PPC_NONE		0
+#define R_PPC_ADDR32		1	/* 32bit absolute address */
+#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
+#define R_PPC_ADDR16		3	/* 16bit absolute address */
+#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
+#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
+#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
+#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
+#define R_PPC_ADDR14_BRTAKEN	8
+#define R_PPC_ADDR14_BRNTAKEN	9
+#define R_PPC_REL24		10	/* PC relative 26 bit */
+#define R_PPC_REL14		11	/* PC relative 16 bit */
+#define R_PPC_REL14_BRTAKEN	12
+#define R_PPC_REL14_BRNTAKEN	13
+#define R_PPC_GOT16		14
+#define R_PPC_GOT16_LO		15
+#define R_PPC_GOT16_HI		16
+#define R_PPC_GOT16_HA		17
+#define R_PPC_PLTREL24		18
+#define R_PPC_COPY		19
+#define R_PPC_GLOB_DAT		20
+#define R_PPC_JMP_SLOT		21
+#define R_PPC_RELATIVE		22
+#define R_PPC_LOCAL24PC		23
+#define R_PPC_UADDR32		24
+#define R_PPC_UADDR16		25
+#define R_PPC_REL32		26
+#define R_PPC_PLT32		27
+#define R_PPC_PLTREL32		28
+#define R_PPC_PLT16_LO		29
+#define R_PPC_PLT16_HI		30
+#define R_PPC_PLT16_HA		31
+#define R_PPC_SDAREL16		32
+#define R_PPC_SECTOFF		33
+#define R_PPC_SECTOFF_LO	34
+#define R_PPC_SECTOFF_HI	35
+#define R_PPC_SECTOFF_HA	36
+
+/* PowerPC relocations defined for the TLS access ABI.  */
+#define R_PPC_TLS		67 /* none	(sym+add)@tls */
+#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
+#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
+#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
+#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
+#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
+#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
+#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
+#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
+#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
+#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
+#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
+#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
+#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
+#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
+#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
+#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
+#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
+#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
+#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
+#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
+#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
+#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
+#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
+#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
+#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
+#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
+#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
+
+/* The remaining relocs are from the Embedded ELF ABI, and are not
+   in the SVR4 ELF ABI.  */
+#define R_PPC_EMB_NADDR32	101
+#define R_PPC_EMB_NADDR16	102
+#define R_PPC_EMB_NADDR16_LO	103
+#define R_PPC_EMB_NADDR16_HI	104
+#define R_PPC_EMB_NADDR16_HA	105
+#define R_PPC_EMB_SDAI16	106
+#define R_PPC_EMB_SDA2I16	107
+#define R_PPC_EMB_SDA2REL	108
+#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
+#define R_PPC_EMB_MRKREF	110
+#define R_PPC_EMB_RELSEC16	111
+#define R_PPC_EMB_RELST_LO	112
+#define R_PPC_EMB_RELST_HI	113
+#define R_PPC_EMB_RELST_HA	114
+#define R_PPC_EMB_BIT_FLD	115
+#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
+
+/* Diab tool relocations.  */
+#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
+#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
+#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
+#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
+#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
+#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
+
+/* GNU extension to support local ifunc.  */
+#define R_PPC_IRELATIVE		248
+
+/* GNU relocs used in PIC code sequences.  */
+#define R_PPC_REL16		249	/* half16   (sym+add-.) */
+#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
+#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
+#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
+
+/* This is a phony reloc to handle any old fashioned TOC16 references
+   that may still be in object files.  */
+#define R_PPC_TOC16		255
+
+/* PowerPC specific values for the Dyn d_tag field.  */
+#define DT_PPC_GOT		(DT_LOPROC + 0)
+#define DT_PPC_NUM		1
+
+/* PowerPC64 relocations defined by the ABIs */
+#define R_PPC64_NONE		R_PPC_NONE
+#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
+#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
+#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
+#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
+#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
+#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
+#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
+#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
+#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
+#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
+#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
+#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
+#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
+#define R_PPC64_GOT16		R_PPC_GOT16
+#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
+#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
+#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
+
+#define R_PPC64_COPY		R_PPC_COPY
+#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
+#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
+#define R_PPC64_RELATIVE	R_PPC_RELATIVE
+
+#define R_PPC64_UADDR32		R_PPC_UADDR32
+#define R_PPC64_UADDR16		R_PPC_UADDR16
+#define R_PPC64_REL32		R_PPC_REL32
+#define R_PPC64_PLT32		R_PPC_PLT32
+#define R_PPC64_PLTREL32	R_PPC_PLTREL32
+#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
+#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
+#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
+
+#define R_PPC64_SECTOFF		R_PPC_SECTOFF
+#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
+#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
+#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
+#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
+#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
+#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
+#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
+#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
+#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
+#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
+#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
+#define R_PPC64_PLT64		45 /* doubleword64 L + A */
+#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
+#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
+#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
+#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
+#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
+#define R_PPC64_TOC		51 /* doubleword64 .TOC */
+#define R_PPC64_PLTGOT16	52 /* half16* M + A */
+#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
+#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
+#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
+
+#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
+#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
+#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
+#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
+#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
+#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
+#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
+#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
+#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
+#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
+#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
+
+/* PowerPC64 relocations defined for the TLS access ABI.  */
+#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
+#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
+#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
+#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
+#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
+#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
+#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
+#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
+#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
+#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
+#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
+#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
+#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
+#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
+#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
+#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
+#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
+#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
+#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
+#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
+#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
+#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
+#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
+#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
+#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
+#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
+#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
+#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
+
+/* GNU extension to support local ifunc.  */
+#define R_PPC64_JMP_IREL	247
+#define R_PPC64_IRELATIVE	248
+#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
+#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
+#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
+#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
+
+/* PowerPC64 specific values for the Dyn d_tag field.  */
+#define DT_PPC64_GLINK  (DT_LOPROC + 0)
+#define DT_PPC64_OPD	(DT_LOPROC + 1)
+#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
+#define DT_PPC64_NUM    3
+
+
+/* ARM specific declarations */
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_ARM_RELEXEC		0x01
+#define EF_ARM_HASENTRY		0x02
+#define EF_ARM_INTERWORK	0x04
+#define EF_ARM_APCS_26		0x08
+#define EF_ARM_APCS_FLOAT	0x10
+#define EF_ARM_PIC		0x20
+#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
+#define EF_ARM_NEW_ABI		0x80
+#define EF_ARM_OLD_ABI		0x100
+#define EF_ARM_SOFT_FLOAT	0x200
+#define EF_ARM_VFP_FLOAT	0x400
+#define EF_ARM_MAVERICK_FLOAT	0x800
+
+
+/* Other constants defined in the ARM ELF spec. version B-01.  */
+/* NB. These conflict with values defined above.  */
+#define EF_ARM_SYMSARESORTED	0x04
+#define EF_ARM_DYNSYMSUSESEGIDX	0x08
+#define EF_ARM_MAPSYMSFIRST	0x10
+#define EF_ARM_EABIMASK		0XFF000000
+
+/* Constants defined in AAELF.  */
+#define EF_ARM_BE8	    0x00800000
+#define EF_ARM_LE8	    0x00400000
+
+#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
+#define EF_ARM_EABI_UNKNOWN	0x00000000
+#define EF_ARM_EABI_VER1	0x01000000
+#define EF_ARM_EABI_VER2	0x02000000
+#define EF_ARM_EABI_VER3	0x03000000
+#define EF_ARM_EABI_VER4	0x04000000
+#define EF_ARM_EABI_VER5	0x05000000
+
+/* Additional symbol types for Thumb.  */
+#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
+#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
+
+/* ARM-specific values for sh_flags */
+#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
+#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
+					      in the input to a link step.  */
+
+/* ARM-specific program header flags */
+#define PF_ARM_SB		0x10000000 /* Segment contains the location
+					      addressed by the static base. */
+#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
+#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
+
+/* Processor specific values for the Phdr p_type field.  */
+#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
+
+/* Processor specific values for the Shdr sh_type field.  */
+#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
+#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
+#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
+
+
+/* ARM relocs.  */
+
+#define R_ARM_NONE		0	/* No reloc */
+#define R_ARM_PC24		1	/* PC relative 26 bit branch */
+#define R_ARM_ABS32		2	/* Direct 32 bit  */
+#define R_ARM_REL32		3	/* PC relative 32 bit */
+#define R_ARM_PC13		4
+#define R_ARM_ABS16		5	/* Direct 16 bit */
+#define R_ARM_ABS12		6	/* Direct 12 bit */
+#define R_ARM_THM_ABS5		7
+#define R_ARM_ABS8		8	/* Direct 8 bit */
+#define R_ARM_SBREL32		9
+#define R_ARM_THM_PC22		10
+#define R_ARM_THM_PC8		11
+#define R_ARM_AMP_VCALL9	12
+#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
+#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
+#define R_ARM_THM_SWI8		14
+#define R_ARM_XPC25		15
+#define R_ARM_THM_XPC22		16
+#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
+#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
+#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
+#define R_ARM_COPY		20	/* Copy symbol at runtime */
+#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
+#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
+#define R_ARM_RELATIVE		23	/* Adjust by program base */
+#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
+#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
+#define R_ARM_GOT32		26	/* 32 bit GOT entry */
+#define R_ARM_PLT32		27	/* 32 bit PLT address */
+#define R_ARM_ALU_PCREL_7_0	32
+#define R_ARM_ALU_PCREL_15_8	33
+#define R_ARM_ALU_PCREL_23_15	34
+#define R_ARM_LDR_SBREL_11_0	35
+#define R_ARM_ALU_SBREL_19_12	36
+#define R_ARM_ALU_SBREL_27_20	37
+#define R_ARM_TLS_GOTDESC	90
+#define R_ARM_TLS_CALL		91
+#define R_ARM_TLS_DESCSEQ	92
+#define R_ARM_THM_TLS_CALL	93
+#define R_ARM_GNU_VTENTRY	100
+#define R_ARM_GNU_VTINHERIT	101
+#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
+#define R_ARM_THM_PC9		103	/* thumb conditional branch */
+#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
+					   thread local data */
+#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
+					   thread local data */
+#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
+					   block */
+#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
+					   static TLS block offset */
+#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
+					   TLS block */
+#define	R_ARM_THM_TLS_DESCSEQ	129
+#define R_ARM_IRELATIVE		160
+#define R_ARM_RXPC25		249
+#define R_ARM_RSBREL32		250
+#define R_ARM_THM_RPC22		251
+#define R_ARM_RREL32		252
+#define R_ARM_RABS22		253
+#define R_ARM_RPC24		254
+#define R_ARM_RBASE		255
+/* Keep this the last entry.  */
+#define R_ARM_NUM		256
+
+/* IA-64 specific declarations.  */
+
+/* Processor specific flags for the Ehdr e_flags field.  */
+#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
+#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
+#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
+
+/* Processor specific values for the Phdr p_type field.  */
+#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
+#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
+#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
+#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
+#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
+
+/* Processor specific flags for the Phdr p_flags field.  */
+#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
+
+/* Processor specific values for the Shdr sh_type field.  */
+#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
+#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
+
+/* Processor specific flags for the Shdr sh_flags field.  */
+#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
+#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
+
+/* Processor specific values for the Dyn d_tag field.  */
+#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
+#define DT_IA_64_NUM		1
+
+/* IA-64 relocations.  */
+#define R_IA64_NONE		0x00	/* none */
+#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
+#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
+#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
+#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
+#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
+#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
+#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
+#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
+#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
+#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
+#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
+#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
+#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
+#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
+#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
+#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
+#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
+#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
+#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
+#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
+#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
+#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
+#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
+#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
+#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
+#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
+#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
+#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
+#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
+#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
+#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
+#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
+#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
+#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
+#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
+#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
+#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
+#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
+#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
+#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
+#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
+#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
+#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
+#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
+#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
+#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
+#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
+#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
+#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
+#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
+#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
+#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
+#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
+#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
+#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
+#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
+#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
+#define R_IA64_COPY		0x84	/* copy relocation */
+#define R_IA64_SUB		0x85	/* Addend and symbol difference */
+#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
+#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
+#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
+#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
+#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
+#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
+#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
+#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
+#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
+#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
+#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
+#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
+#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
+#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
+#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
+#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
+#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
+
+/* SH specific declarations */
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_SH_MACH_MASK		0x1f
+#define EF_SH_UNKNOWN		0x0
+#define EF_SH1			0x1
+#define EF_SH2			0x2
+#define EF_SH3			0x3
+#define EF_SH_DSP		0x4
+#define EF_SH3_DSP		0x5
+#define EF_SH4AL_DSP		0x6
+#define EF_SH3E			0x8
+#define EF_SH4			0x9
+#define EF_SH2E			0xb
+#define EF_SH4A			0xc
+#define EF_SH2A			0xd
+#define EF_SH4_NOFPU		0x10
+#define EF_SH4A_NOFPU		0x11
+#define EF_SH4_NOMMU_NOFPU	0x12
+#define EF_SH2A_NOFPU		0x13
+#define EF_SH3_NOMMU		0x14
+#define EF_SH2A_SH4_NOFPU	0x15
+#define EF_SH2A_SH3_NOFPU	0x16
+#define EF_SH2A_SH4		0x17
+#define EF_SH2A_SH3E		0x18
+
+/* SH relocs.  */
+#define	R_SH_NONE		0
+#define	R_SH_DIR32		1
+#define	R_SH_REL32		2
+#define	R_SH_DIR8WPN		3
+#define	R_SH_IND12W		4
+#define	R_SH_DIR8WPL		5
+#define	R_SH_DIR8WPZ		6
+#define	R_SH_DIR8BP		7
+#define	R_SH_DIR8W		8
+#define	R_SH_DIR8L		9
+#define	R_SH_SWITCH16		25
+#define	R_SH_SWITCH32		26
+#define	R_SH_USES		27
+#define	R_SH_COUNT		28
+#define	R_SH_ALIGN		29
+#define	R_SH_CODE		30
+#define	R_SH_DATA		31
+#define	R_SH_LABEL		32
+#define	R_SH_SWITCH8		33
+#define	R_SH_GNU_VTINHERIT	34
+#define	R_SH_GNU_VTENTRY	35
+#define	R_SH_TLS_GD_32		144
+#define	R_SH_TLS_LD_32		145
+#define	R_SH_TLS_LDO_32		146
+#define	R_SH_TLS_IE_32		147
+#define	R_SH_TLS_LE_32		148
+#define	R_SH_TLS_DTPMOD32	149
+#define	R_SH_TLS_DTPOFF32	150
+#define	R_SH_TLS_TPOFF32	151
+#define	R_SH_GOT32		160
+#define	R_SH_PLT32		161
+#define	R_SH_COPY		162
+#define	R_SH_GLOB_DAT		163
+#define	R_SH_JMP_SLOT		164
+#define	R_SH_RELATIVE		165
+#define	R_SH_GOTOFF		166
+#define	R_SH_GOTPC		167
+/* Keep this the last entry.  */
+#define	R_SH_NUM		256
+
+/* S/390 specific definitions.  */
+
+/* Valid values for the e_flags field.  */
+
+#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
+
+/* Additional s390 relocs */
+
+#define R_390_NONE		0	/* No reloc.  */
+#define R_390_8			1	/* Direct 8 bit.  */
+#define R_390_12		2	/* Direct 12 bit.  */
+#define R_390_16		3	/* Direct 16 bit.  */
+#define R_390_32		4	/* Direct 32 bit.  */
+#define R_390_PC32		5	/* PC relative 32 bit.	*/
+#define R_390_GOT12		6	/* 12 bit GOT offset.  */
+#define R_390_GOT32		7	/* 32 bit GOT offset.  */
+#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
+#define R_390_COPY		9	/* Copy symbol at runtime.  */
+#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
+#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
+#define R_390_RELATIVE		12	/* Adjust by program base.  */
+#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
+#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
+#define R_390_GOT16		15	/* 16 bit GOT offset.  */
+#define R_390_PC16		16	/* PC relative 16 bit.	*/
+#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
+#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
+#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
+#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
+#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
+#define R_390_64		22	/* Direct 64 bit.  */
+#define R_390_PC64		23	/* PC relative 64 bit.	*/
+#define R_390_GOT64		24	/* 64 bit GOT offset.  */
+#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
+#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
+#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
+#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
+#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
+#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
+#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
+#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
+#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
+#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
+#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
+#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
+#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
+#define R_390_TLS_GDCALL	38	/* Tag for function call in general
+					   dynamic TLS code. */
+#define R_390_TLS_LDCALL	39	/* Tag for function call in local
+					   dynamic TLS code. */
+#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
+					   thread local data.  */
+#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
+					  thread local data.  */
+#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
+					   block offset.  */
+#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
+					   block offset.  */
+#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
+					   block offset. */
+#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
+					   thread local data in LE code.  */
+#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
+					   thread local data in LE code.  */
+#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
+					   negated static TLS block offset.  */
+#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
+					   negated static TLS block offset.  */
+#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
+					   negated static TLS block offset.  */
+#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
+					   static TLS block.  */
+#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
+					   static TLS block.  */
+#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
+					   block.  */
+#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
+					   block.  */
+#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
+#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
+#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
+					   block.  */
+#define R_390_20		57	/* Direct 20 bit.  */
+#define R_390_GOT20		58	/* 20 bit GOT offset.  */
+#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
+#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
+					   block offset.  */
+#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
+/* Keep this the last entry.  */
+#define R_390_NUM		62
+
+
+/* CRIS relocations.  */
+#define R_CRIS_NONE		0
+#define R_CRIS_8		1
+#define R_CRIS_16		2
+#define R_CRIS_32		3
+#define R_CRIS_8_PCREL		4
+#define R_CRIS_16_PCREL		5
+#define R_CRIS_32_PCREL		6
+#define R_CRIS_GNU_VTINHERIT	7
+#define R_CRIS_GNU_VTENTRY	8
+#define R_CRIS_COPY		9
+#define R_CRIS_GLOB_DAT		10
+#define R_CRIS_JUMP_SLOT	11
+#define R_CRIS_RELATIVE		12
+#define R_CRIS_16_GOT		13
+#define R_CRIS_32_GOT		14
+#define R_CRIS_16_GOTPLT	15
+#define R_CRIS_32_GOTPLT	16
+#define R_CRIS_32_GOTREL	17
+#define R_CRIS_32_PLT_GOTREL	18
+#define R_CRIS_32_PLT_PCREL	19
+
+#define R_CRIS_NUM		20
+
+
+/* AMD x86-64 relocations.  */
+#define R_X86_64_NONE		0	/* No reloc */
+#define R_X86_64_64		1	/* Direct 64 bit  */
+#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
+#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
+#define R_X86_64_PLT32		4	/* 32 bit PLT address */
+#define R_X86_64_COPY		5	/* Copy symbol at runtime */
+#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
+#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
+#define R_X86_64_RELATIVE	8	/* Adjust by program base */
+#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
+					   offset to GOT */
+#define R_X86_64_32		10	/* Direct 32 bit zero extended */
+#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
+#define R_X86_64_16		12	/* Direct 16 bit zero extended */
+#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
+#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
+#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
+#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
+#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
+#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
+#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
+					   to two GOT entries for GD symbol */
+#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
+					   to two GOT entries for LD symbol */
+#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
+#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
+					   to GOT entry for IE symbol */
+#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
+#define R_X86_64_PC64		24	/* PC relative 64 bit */
+#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
+#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
+					   offset to GOT */
+#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
+#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
+					   to GOT entry */
+#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
+#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
+#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
+					   to PLT entry */
+#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
+#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
+#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
+#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
+					   descriptor.  */
+#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
+#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
+#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
+
+#define R_X86_64_NUM		39
+
+
+/* AM33 relocations.  */
+#define R_MN10300_NONE		0	/* No reloc.  */
+#define R_MN10300_32		1	/* Direct 32 bit.  */
+#define R_MN10300_16		2	/* Direct 16 bit.  */
+#define R_MN10300_8		3	/* Direct 8 bit.  */
+#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
+#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
+#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
+#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
+#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
+#define R_MN10300_24		9	/* Direct 24 bit.  */
+#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
+#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
+#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
+#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
+#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
+#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
+#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
+#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
+#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
+#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
+#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
+#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
+#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
+#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
+
+#define R_MN10300_NUM		24
+
+
+/* M32R relocs.  */
+#define R_M32R_NONE		0	/* No reloc. */
+#define R_M32R_16		1	/* Direct 16 bit. */
+#define R_M32R_32		2	/* Direct 32 bit. */
+#define R_M32R_24		3	/* Direct 24 bit. */
+#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
+#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
+#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
+#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
+#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
+#define R_M32R_LO16		9	/* Low 16 bit. */
+#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
+#define R_M32R_GNU_VTINHERIT	11
+#define R_M32R_GNU_VTENTRY	12
+/* M32R relocs use SHT_RELA.  */
+#define R_M32R_16_RELA		33	/* Direct 16 bit. */
+#define R_M32R_32_RELA		34	/* Direct 32 bit. */
+#define R_M32R_24_RELA		35	/* Direct 24 bit. */
+#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
+#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
+#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
+#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
+#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
+#define R_M32R_LO16_RELA	41	/* Low 16 bit */
+#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
+#define R_M32R_RELA_GNU_VTINHERIT	43
+#define R_M32R_RELA_GNU_VTENTRY	44
+#define R_M32R_REL32		45	/* PC relative 32 bit.  */
+
+#define R_M32R_GOT24		48	/* 24 bit GOT entry */
+#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
+#define R_M32R_COPY		50	/* Copy symbol at runtime */
+#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
+#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
+#define R_M32R_RELATIVE		53	/* Adjust by program base */
+#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
+#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
+#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
+					   low */
+#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
+					   low */
+#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
+#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
+					   GOT with unsigned low */
+#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
+					   GOT with signed low */
+#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
+					   GOT */
+#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
+					   with unsigned low */
+#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
+					   with signed low */
+#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
+#define R_M32R_NUM		256	/* Keep this the last entry. */
+
+
+/* TILEPro relocations.  */
+#define R_TILEPRO_NONE		0	/* No reloc */
+#define R_TILEPRO_32		1	/* Direct 32 bit */
+#define R_TILEPRO_16		2	/* Direct 16 bit */
+#define R_TILEPRO_8		3	/* Direct 8 bit */
+#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
+#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
+#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
+#define R_TILEPRO_LO16		7	/* Low 16 bit */
+#define R_TILEPRO_HI16		8	/* High 16 bit */
+#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
+#define R_TILEPRO_COPY		10	/* Copy relocation */
+#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
+#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
+#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
+#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
+#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
+#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
+#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
+#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
+#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
+#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
+#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
+#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
+#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
+#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
+#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
+#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
+#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
+#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
+#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
+#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
+#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
+#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
+#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
+#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
+#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
+#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
+#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
+#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
+#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
+#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
+#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
+#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
+#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
+#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
+#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
+#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
+#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
+#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
+#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
+#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
+#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
+#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
+#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
+#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
+#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
+/* Relocs 56-59 are currently not defined.  */
+#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
+#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
+#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
+#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
+#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
+#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
+#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
+#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
+#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
+#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
+#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
+#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
+#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
+#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
+#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
+#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
+#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
+#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
+#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
+#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
+#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
+#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
+#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
+#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
+#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
+#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
+
+#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
+#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
+
+#define R_TILEPRO_NUM		130
+
+
+/* TILE-Gx relocations.  */
+#define R_TILEGX_NONE		0	/* No reloc */
+#define R_TILEGX_64		1	/* Direct 64 bit */
+#define R_TILEGX_32		2	/* Direct 32 bit */
+#define R_TILEGX_16		3	/* Direct 16 bit */
+#define R_TILEGX_8		4	/* Direct 8 bit */
+#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
+#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
+#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
+#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
+#define R_TILEGX_HW0		9	/* hword 0 16-bit */
+#define R_TILEGX_HW1		10	/* hword 1 16-bit */
+#define R_TILEGX_HW2		11	/* hword 2 16-bit */
+#define R_TILEGX_HW3		12	/* hword 3 16-bit */
+#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
+#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
+#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
+#define R_TILEGX_COPY		16	/* Copy relocation */
+#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
+#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
+#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
+#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
+#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
+#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
+#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
+#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
+#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
+#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
+#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
+#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
+#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
+#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
+#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
+#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
+#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
+#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
+#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
+#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
+#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
+#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
+#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
+#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
+#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
+#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
+#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
+#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
+#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
+#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
+#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
+#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
+#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
+#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
+#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
+#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
+#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
+#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
+#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
+#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
+#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
+#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
+#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
+#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
+#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
+#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
+#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
+#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
+#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
+/* Relocs 66-71 are currently not defined.  */
+#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
+#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
+#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
+#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
+/* Relocs 76-77 are currently not defined.  */
+#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
+#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
+#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
+#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
+/* Relocs 90-91 are currently not defined.  */
+#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
+#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
+/* Relocs 94-99 are currently not defined.  */
+#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
+#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
+#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
+#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
+/* Relocs 104-105 are currently not defined.  */
+#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
+#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
+#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
+#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
+#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
+#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
+#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
+#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
+#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
+#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
+#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
+#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
+#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
+#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
+#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
+#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
+
+#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
+#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
+
+#define R_TILEGX_NUM		130
+
+#endif	/* elf.h */
diff --git a/trunk/tools/include/endian.h b/trunk/tools/include/endian.h
new file mode 100644
index 00000000..bba70abd
--- /dev/null
+++ b/trunk/tools/include/endian.h
@@ -0,0 +1,40 @@
+#ifndef __endian_compat_h
+#define __endian_compat_h
+
+#if defined(__linux__) || defined(__CYGWIN__)
+#include <byteswap.h>
+#include_next <endian.h>
+#elif defined(__APPLE__)
+#include <machine/endian.h>
+#include <machine/byte_order.h>
+#define bswap_16(x) NXSwapShort(x)
+#define bswap_32(x) NXSwapInt(x)
+#define bswap_64(x) NXSwapLongLong(x)
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_16(x) bswap16(x)
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+#elif defined(__OpenBSD__)
+#include <sys/types.h>
+#define bswap_16(x) __swap16(x)
+#define bswap_32(x) __swap32(x)
+#define bswap_64(x) __swap64(x)
+#else
+#include <machine/endian.h>
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
+#endif
+
+#ifndef __BYTE_ORDER
+#define __BYTE_ORDER BYTE_ORDER
+#endif
+#ifndef __BIG_ENDIAN
+#define __BIG_ENDIAN BIG_ENDIAN
+#endif
+#ifndef __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN LITTLE_ENDIAN
+#endif
+
+#endif
diff --git a/trunk/tools/include/getline.h b/trunk/tools/include/getline.h
new file mode 100644
index 00000000..3ac21715
--- /dev/null
+++ b/trunk/tools/include/getline.h
@@ -0,0 +1,68 @@
+/*-
+ * Copyright (c) 2006 SPARTA, Inc.
+ * All rights reserved.
+ *
+ * This software was developed by SPARTA ISSO under SPAWAR contract
+ * N66001-04-C-6019 ("SEFOS").
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if !defined(__linux__) && !defined(__OpenBSD__) && !(defined(__APPLE__) && __DARWIN_C_LEVEL >= 200809L)
+/*
+ * Emulate glibc getline() via BSD fgetln().
+ * Note that outsize is not changed unless memory is allocated.
+ */
+static inline ssize_t
+getline(char **outbuf, size_t *outsize, FILE *fp)
+{
+	size_t len;
+
+#ifndef __CYGWIN__
+	char *buf;
+	buf = fgetln(fp, &len);
+#else
+	char buf[512];
+	fgets(buf, sizeof(buf), fp);	
+	len = strlen(buf);
+#endif
+	if (buf == NULL)
+		return (-1);
+
+	/* Assumes realloc() accepts NULL for ptr (C99) */
+	if (*outbuf == NULL || *outsize < len + 1) {
+		void *tmp = realloc(*outbuf, len + 1);
+		if (tmp == NULL)
+			return (-1);
+		*outbuf = tmp;
+		*outsize = len + 1;
+	}
+	memcpy(*outbuf, buf, len);
+	(*outbuf)[len] = '\0';
+	return (len);
+}
+#endif
diff --git a/trunk/tools/include/sys/sysmacros.h b/trunk/tools/include/sys/sysmacros.h
new file mode 100644
index 00000000..997d9286
--- /dev/null
+++ b/trunk/tools/include/sys/sysmacros.h
@@ -0,0 +1,56 @@
+/* Definitions of macros to access `dev_t' values.
+   Copyright (C) 1996, 1997, 1999, 2003, 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef __SYS_SYSMACROS_H
+#define __SYS_SYSMACROS_H	1
+
+static inline unsigned int
+__gnu_dev_major(unsigned long long int __dev)
+{
+  return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
+}
+
+static inline unsigned int
+__gnu_dev_minor(unsigned long long int __dev)
+{
+  return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
+}
+
+static inline unsigned long long int
+__gnu_dev_makedev(unsigned int __major, unsigned int __minor)
+{
+  return ((__minor & 0xff) | ((__major & 0xfff) << 8)
+	  | (((unsigned long long int) (__minor & ~0xff)) << 12)
+	  | (((unsigned long long int) (__major & ~0xfff)) << 32));
+}
+
+/* Access the functions with their traditional names.  */
+#ifndef major
+# define major(dev) __gnu_dev_major (dev)
+#endif
+
+#ifndef minor
+# define minor(dev) __gnu_dev_minor (dev)
+#endif
+
+#ifndef makedev
+# define makedev(maj, min) __gnu_dev_makedev (maj, min)
+#endif
+
+#endif /* sys/sysmacros.h */
diff --git a/trunk/tools/ipkg-utils/Makefile b/trunk/tools/ipkg-utils/Makefile
new file mode 100644
index 00000000..77826092
--- /dev/null
+++ b/trunk/tools/ipkg-utils/Makefile
@@ -0,0 +1,32 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ipkg-utils
+PKG_VERSION:=1.7
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://handhelds.org/packages/ipkg-utils/
+PKG_MD5SUM:=da3e3ef772973d7370a6ac95f0fef9b8
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Install
+	$(INSTALL_BIN) \
+		$(HOST_BUILD_DIR)/ipkg-build \
+		$(HOST_BUILD_DIR)/ipkg-buildpackage \
+		$(HOST_BUILD_DIR)/ipkg-make-index \
+		$(HOST_BUILD_DIR)/ipkg.py \
+		$(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR)/etc/ipkg.conf
+	rm -f $(STAGING_DIR_HOST)/bin/ipkg*
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/ipkg-utils/patches/100-build_clean.patch b/trunk/tools/ipkg-utils/patches/100-build_clean.patch
new file mode 100644
index 00000000..7df272f7
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/100-build_clean.patch
@@ -0,0 +1,35 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -47,6 +47,19 @@ pkg_appears_sane() {
+ 
+ 	PKG_ERROR=0
+ 
++	cvs_dirs=`find . -name 'CVS'`
++	if [ -n "$cvs_dirs" ]; then
++	    if [ "$noclean" = "1" ]; then
++		echo "*** Warning: The following CVS directories where found.
++You probably want to remove them: " >&2
++		ls -ld $cvs_dirs
++		echo >&2
++	    else
++		echo "*** Removing the following files: $cvs_dirs"
++		rm -rf "$cvs_dirs"
++	    fi
++	fi
++
+ 	tilde_files=`find . -name '*~'`
+ 	if [ -n "$tilde_files" ]; then
+ 	    if [ "$noclean" = "1" ]; then
+@@ -134,8 +147,12 @@ You probably want to chown these to a sy
+ 
+ 	for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
+ 		if [ -f $script -a ! -x $script ]; then
++		    if [ "$noclean" = "1" ]; then
+ 			echo "*** Error: package script $script is not executable" >&2
+ 			PKG_ERROR=1
++		    else
++			chmod a+x $script
++		    fi
+ 		fi
+ 	done
+ 
diff --git a/trunk/tools/ipkg-utils/patches/110-buildpackage.patch b/trunk/tools/ipkg-utils/patches/110-buildpackage.patch
new file mode 100644
index 00000000..8e62ee70
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/110-buildpackage.patch
@@ -0,0 +1,23 @@
+--- a/ipkg-buildpackage
++++ b/ipkg-buildpackage
+@@ -30,8 +30,9 @@
+ 
+ set -e
+ 
+-#SCRIPTDIR=/usr/local/bin
+-SCRIPTDIR=/other/kurth/ipaq-dev/familiar/dist/ipkg/util/
++SCRIPTDIR=/usr/local/bin
++
++IPKG_BUILD_OPTIONS=$*
+ 
+ SCRIPTNAME=`basename $0`
+ 
+@@ -212,7 +213,7 @@ done
+ # build the ipk package
+ owd=`pwd`
+ cd ..
+-ipkg-build /tmp/${pkg} || exit 1
++ipkg-build $IPKG_BUILD_OPTIONS /tmp/${pkg} || exit 1
+ 
+ rm -rf /tmp/${pkg}
+ 
diff --git a/trunk/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch b/trunk/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch
new file mode 100644
index 00000000..dacdaaef
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch
@@ -0,0 +1,11 @@
+--- a/ipkg-buildpackage
++++ b/ipkg-buildpackage
+@@ -190,7 +190,7 @@ fi
+ mkdir /tmp/${pkg}/CONTROL
+ 
+ files_required="control"
+-files_optional="preinst postinst prerm postrm"
++files_optional="preinst postinst prerm postrm conffiles"
+ 
+ for i in ${files_required} ; do
+ 	file=${CONTROL}/$i
diff --git a/trunk/tools/ipkg-utils/patches/120-build_tar.patch b/trunk/tools/ipkg-utils/patches/120-build_tar.patch
new file mode 100644
index 00000000..acf6b798
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/120-build_tar.patch
@@ -0,0 +1,36 @@
+This patch from aorlinsk fixes an issue with order in options passed to tar
+
+  http://openwrt.org/forum/viewtopic.php?pid=8332#p8332
+
+
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -184,7 +184,7 @@ while getopts "cg:ho:v" opt; do
+ 	g ) group=$OPTARG
+ 	    ogargs="$ogargs --group=$group"
+ 	    ;;
+-        c ) outer=tar
++        c ) outer=$TAR
+             ;;
+         C ) noclean=1
+             ;;
+@@ -243,8 +243,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
+ mkdir $tmp_dir
+ 
+ echo $CONTROL > $tmp_dir/tarX
+-( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX )
+-( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
++( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
++( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . )
+ rm $tmp_dir/tarX
+ 
+ echo "2.0" > $tmp_dir/debian-binary
+@@ -254,7 +254,7 @@ rm -f $pkg_file
+ if [ "$outer" = "ar" ] ; then
+   ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
+ else
+-  ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
++  ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
+ fi
+ 
+ rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
diff --git a/trunk/tools/ipkg-utils/patches/130-tar_wildcards.patch b/trunk/tools/ipkg-utils/patches/130-tar_wildcards.patch
new file mode 100644
index 00000000..ba949c10
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/130-tar_wildcards.patch
@@ -0,0 +1,23 @@
+--- a/ipkg.py
++++ b/ipkg.py
+@@ -93,9 +93,9 @@ class Package:
+             self.filename = os.path.basename(fn)
+ 	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
+             if self.isdeb:
+-                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r")
++                control = os.popen("ar p "+fn+" control.tar.gz | tar xzO --wildcards -f - '*control'","r")
+             else:
+-                control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
++                control = os.popen("tar xzO --wildcards -f "+fn+" '*control.tar.gz' | tar xzO --wildcards -f - '*control'","r")
+             line = control.readline()
+             while 1:
+                 if not line: break
+@@ -122,7 +122,7 @@ class Package:
+             if self.isdeb:
+                 data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
+             else:
+-                data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
++                data = os.popen("tar xzO --wildcards -f "+fn+" '*data.tar.gz' | tar tfz -","r")
+             while 1:
+                 line = data.readline()
+                 if not line: break
diff --git a/trunk/tools/ipkg-utils/patches/140-portability.patch b/trunk/tools/ipkg-utils/patches/140-portability.patch
new file mode 100644
index 00000000..417c4094
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/140-portability.patch
@@ -0,0 +1,19 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -11,6 +11,8 @@ set -e
+ 
+ version=1.0
+ 
++TAR="${TAR:-$(which tar)}"
++
+ ipkg_extract_value() {
+ 	sed -e "s/^[^:]*:[[:space:]]*//"
+ }
+--- a/ipkg-make-index
++++ b/ipkg-make-index
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ # $Id: ipkg-make-index,v 1.20 2003/10/30 02:32:09 jamey Exp $
+ 
+ import sys, os, posixpath
diff --git a/trunk/tools/ipkg-utils/patches/150-uppercase_letters.patch b/trunk/tools/ipkg-utils/patches/150-uppercase_letters.patch
new file mode 100644
index 00000000..cef200dc
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/150-uppercase_letters.patch
@@ -0,0 +1,22 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -133,7 +133,7 @@ You probably want to chown these to a sy
+ 	disallowed_filename=`disallowed_field Filename`
+ 	[ "$?" -ne 0 ] && PKG_ERROR=1
+ 
+-	if echo $pkg | grep '[^a-z0-9.+-]'; then
++	if echo $pkg | grep '[^a-zA-Z0-9_.+-]'; then
+ 		echo "*** Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])" >&2
+ 		PKG_ERROR=1;
+ 	fi
+--- a/ipkg-buildpackage
++++ b/ipkg-buildpackage
+@@ -69,7 +69,7 @@ pkg_appears_sane_control() {
+ 	required_field Maintainer >/dev/null
+ 	required_field Description >/dev/null
+ 
+-	if echo $pkg | grep '[^a-z0-9.+-]'; then
++	if echo $pkg | grep '[^a-zA-Z0-9.+-]'; then
+ 		echo "ipkg-build: Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])"
+ 		PKG_ERROR=1;
+ 	fi
diff --git a/trunk/tools/ipkg-utils/patches/160-find.patch b/trunk/tools/ipkg-utils/patches/160-find.patch
new file mode 100644
index 00000000..45ef3c65
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/160-find.patch
@@ -0,0 +1,39 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -10,7 +10,8 @@
+ set -e
+ 
+ version=1.0
+-
++FIND="$(which find)"
++FIND="${FIND:-$(which gfind)}"
+ TAR="${TAR:-$(which tar)}"
+ 
+ ipkg_extract_value() {
+@@ -49,7 +50,7 @@ pkg_appears_sane() {
+ 
+ 	PKG_ERROR=0
+ 
+-	cvs_dirs=`find . -name 'CVS'`
++	cvs_dirs=`$FIND . -name 'CVS'`
+ 	if [ -n "$cvs_dirs" ]; then
+ 	    if [ "$noclean" = "1" ]; then
+ 		echo "*** Warning: The following CVS directories where found.
+@@ -62,7 +63,7 @@ You probably want to remove them: " >&2
+ 	    fi
+ 	fi
+ 
+-	tilde_files=`find . -name '*~'`
++	tilde_files=`$FIND . -name '*~'`
+ 	if [ -n "$tilde_files" ]; then
+ 	    if [ "$noclean" = "1" ]; then
+ 		echo "*** Warning: The following files have names ending in '~'.
+@@ -75,7 +76,7 @@ You probably want to remove them: " >&2
+ 	    fi
+ 	fi
+ 
+-	large_uid_files=`find . -uid +99 || true`
++	large_uid_files=`$FIND . -uid +99 || true`
+ 
+ 	if [ "$ogargs" = "" ]  && [ -n "$large_uid_files" ]; then
+ 		echo "*** Warning: The following files have a UID greater than 99.
diff --git a/trunk/tools/ipkg-utils/patches/170-resolve_conffiles.patch b/trunk/tools/ipkg-utils/patches/170-resolve_conffiles.patch
new file mode 100644
index 00000000..31faf30a
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/170-resolve_conffiles.patch
@@ -0,0 +1,23 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -160,12 +160,15 @@ You probably want to chown these to a sy
+ 	done
+ 
+ 	if [ -f $CONTROL/conffiles ]; then
+-		for cf in `cat $CONTROL/conffiles`; do
+-			if [ ! -f ./$cf ]; then
+-				echo "*** Error: $CONTROL/conffiles mentions conffile $cf which does not exist" >&2
+-				PKG_ERROR=1
+-			fi
++		rm -f $CONTROL/conffiles.resolved
++
++		for cf in `$FIND $(sed -e "s!^/!$pkg_dir/!" $CONTROL/conffiles) -type f`; do
++			echo "${cf#$pkg_dir}" >> $CONTROL/conffiles.resolved
+ 		done
++
++		rm $CONTROL/conffiles
++		mv $CONTROL/conffiles.resolved $CONTROL/conffiles
++		chmod 0644 $CONTROL/conffiles
+ 	fi
+ 
+ 	cd $owd
diff --git a/trunk/tools/ipkg-utils/patches/180-add_installed_size.patch b/trunk/tools/ipkg-utils/patches/180-add_installed_size.patch
new file mode 100644
index 00000000..fb91a319
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/180-add_installed_size.patch
@@ -0,0 +1,14 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -250,6 +250,11 @@ mkdir $tmp_dir
+ 
+ echo $CONTROL > $tmp_dir/tarX
+ ( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
++
++installed_size=`stat -c "%s" $tmp_dir/data.tar.gz`
++sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
++	$pkg_dir/$CONTROL/control
++
+ ( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . )
+ rm $tmp_dir/tarX
+ 
diff --git a/trunk/tools/ipkg-utils/patches/190-preserve_permissions.patch b/trunk/tools/ipkg-utils/patches/190-preserve_permissions.patch
new file mode 100644
index 00000000..27ba5217
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/190-preserve_permissions.patch
@@ -0,0 +1,12 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -249,7 +249,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
+ mkdir $tmp_dir
+ 
+ echo $CONTROL > $tmp_dir/tarX
+-( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
++# Preserve permissions (-p) when creating data.tar.gz as non-root user
++( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czpf $tmp_dir/data.tar.gz . )
+ 
+ installed_size=`du -b $tmp_dir/data.tar.gz | cut -f1`
+ sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
diff --git a/trunk/tools/ipkg-utils/patches/200-force_gnu_format.patch b/trunk/tools/ipkg-utils/patches/200-force_gnu_format.patch
new file mode 100644
index 00000000..f363acbc
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/200-force_gnu_format.patch
@@ -0,0 +1,27 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -250,13 +250,13 @@ mkdir $tmp_dir
+ 
+ echo $CONTROL > $tmp_dir/tarX
+ # Preserve permissions (-p) when creating data.tar.gz as non-root user
+-( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czpf $tmp_dir/data.tar.gz . )
++( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX --format=gnu -czpf $tmp_dir/data.tar.gz . )
+ 
+ installed_size=`stat -c "%s" $tmp_dir/data.tar.gz`
+ sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
+ 	$pkg_dir/$CONTROL/control
+ 
+-( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . )
++( cd $pkg_dir/$CONTROL && $TAR $ogargs --format=gnu -czf $tmp_dir/control.tar.gz . )
+ rm $tmp_dir/tarX
+ 
+ echo "2.0" > $tmp_dir/debian-binary
+@@ -266,7 +266,7 @@ rm -f $pkg_file
+ if [ "$outer" = "ar" ] ; then
+   ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
+ else
+-  ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
++  ( cd $tmp_dir && $TAR --format=gnu -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
+ fi
+ 
+ rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
diff --git a/trunk/tools/ipkg-utils/patches/210-remove_field_checks.patch b/trunk/tools/ipkg-utils/patches/210-remove_field_checks.patch
new file mode 100644
index 00000000..2f1f2eab
--- /dev/null
+++ b/trunk/tools/ipkg-utils/patches/210-remove_field_checks.patch
@@ -0,0 +1,36 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -101,9 +101,6 @@ You probably want to chown these to a sy
+ 	arch=`required_field Architecture`
+ 	[ "$?" -ne 0 ] && PKG_ERROR=1
+ 
+-	required_field Maintainer >/dev/null
+-	[ "$?" -ne 0 ] && PKG_ERROR=1
+-
+ 	required_field Description >/dev/null
+ 	[ "$?" -ne 0 ] && PKG_ERROR=1
+ 
+@@ -114,23 +111,6 @@ You probably want to chown these to a sy
+ 	    echo "admin, base, comm, editors, extras, games, graphics, kernel, libs, misc, net, text, web, x11" >&2
+ 	fi
+ 
+-	priority=`required_field Priority`
+-	[ "$?" -ne 0 ] && PKG_ERROR=1
+-	if [ -z "$priority" ]; then
+-	    echo "The Priority field should have one of the following values:" >&2
+-	    echo "required, important, standard, optional, extra." >&2
+-	    echo "If you don't know which priority value you should be using, then use \`optional'" >&2
+-	fi
+-
+-	source=`required_field Source`
+-	[ "$?" -ne 0 ] && PKG_ERROR=1
+-	if [ -z "$source" ]; then
+-	    echo "The Source field contain the URL's or filenames of the source code and any patches" 
+-	    echo "used to build this package.  Either gnu-style tarballs or Debian source packages "
+-	    echo "are acceptable.  Relative filenames may be used if they are distributed in the same"
+-	    echo "directory as the .ipk file."
+-	fi
+-
+ 	disallowed_filename=`disallowed_field Filename`
+ 	[ "$?" -ne 0 ] && PKG_ERROR=1
+ 
diff --git a/trunk/tools/libelf/Makefile b/trunk/tools/libelf/Makefile
new file mode 100644
index 00000000..8036b6f1
--- /dev/null
+++ b/trunk/tools/libelf/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libelf
+PKG_VERSION:=0.8.13
+PKG_MD5SUM:=4136d7b4c04df68b686570afa26988ac
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.mr511.de/software/
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_ARGS += \
+	--disable-shared \
+	--enable-elf64
+
+define Host/Configure
+        (cd $(HOST_BUILD_DIR)/$(3); \
+                $(HOST_CONFIGURE_CMD) \
+                $(HOST_CONFIGURE_ARGS); \
+        )
+endef
+
+
+define Host/Compile
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib/ libelf.a
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/{lib,include/libelf}
+	$(CP) $(HOST_BUILD_DIR)/lib/{elf_repl.h,gelf.h,libelf.h,nlist.h,sys_elf.h} \
+						$(STAGING_DIR_HOST)/include/libelf/
+	$(CP) $(HOST_BUILD_DIR)/lib/libelf.a $(STAGING_DIR_HOST)/lib/
+endef
+
+define Host/Clean
+	rm -rf $(STAGING_DIR_HOST)/include/libelf
+	rm -f $(STAGING_DIR_HOST)/lib/libelf.a
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/libtool/Makefile b/trunk/tools/libtool/Makefile
new file mode 100644
index 00000000..cb6cf4a5
--- /dev/null
+++ b/trunk/tools/libtool/Makefile
@@ -0,0 +1,35 @@
+# 
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libtool
+PKG_VERSION:=2.4
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_VARS += \
+	lt_cv_sys_dlsearch_path=""
+
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) install
+	$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(STAGING_DIR_HOST)/bin/libtool
+	$(CP) $(STAGING_DIR_HOST)/bin/libtool $(STAGING_DIR_HOST)/bin/libtool-ucxx
+	$(SED) 's,-lstdc++,-luClibc++,g' $(STAGING_DIR_HOST)/bin/libtool-ucxx
+endef
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/libtool/files/libtool-v1.5.patch b/trunk/tools/libtool/files/libtool-v1.5.patch
new file mode 100644
index 00000000..70153826
--- /dev/null
+++ b/trunk/tools/libtool/files/libtool-v1.5.patch
@@ -0,0 +1,118 @@
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -35,7 +35,7 @@ progpath="$0"
+ 
+ # The name of this program:
+ progname=`echo "$progpath" | $SED $basename`
+-modename="$progname"
++modename="libreCMC-$progname-patched-1.5"
+ 
+ # Global variables:
+ EXIT_SUCCESS=0
+@@ -297,8 +297,8 @@ func_infer_tag ()
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+ 	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit $EXIT_FAILURE
++	  $echo "$modename: defaulting to \`CC'"
++	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
+ #        else
+ #          $echo "$modename: using $tagname tagged configuration"
+ 	fi
+@@ -2462,8 +2462,14 @@ EOF
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
++	    # Adding 'libdir' from the .la file to our library search paths
++	    # breaks crosscompilation horribly.  We cheat here and don't add
++	    # it, instead adding the path where we found the .la.  -CL
++	    dir="$lt_sysroot$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	    #dir="$libdir"
++	    #absdir="$libdir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -2602,7 +2608,7 @@ EOF
+ 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+-	    need_relink=yes
++	    need_relink=no
+ 	  fi
+ 	  # This is a shared library
+ 
+@@ -2804,7 +2810,6 @@ EOF
+ 	    if test "$hardcode_direct" = yes; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+@@ -2820,8 +2825,6 @@ EOF
+ 	        add="$libdir/$linklib"
+ 	      fi
+ 	    else
+-	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in
+@@ -5687,6 +5690,10 @@ fi\
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++	      # Replacing uninstalled with installed can easily break crosscompilation,
++	      # since the installed path is generally the wrong architecture.  -CL
++	      newdependency_libs="$newdependency_libs $deplib"
++	      continue
+ 	      case $deplib in
+ 	      *.la)
+ 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+@@ -5999,8 +6006,12 @@ relink_command=\"$relink_command\""
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Strip any trailing slash from the destination.
++	  s_libdir=`$echo "X$libdir" | $Xsed -e 's%/$%%'`
++	  s_destdir=`$echo "X$destdir" | $Xsed -e 's%/$%%'`
++
+ 	  # Determine the prefix the user has applied to our future dir.
+-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
++	  inst_prefix_dir=`$echo "$s_destdir" | $SED "s%$s_libdir\$%%"`
+ 
+ 	  # Don't allow the user to place us outside of our expected
+ 	  # location b/c this prevents finding dependent libraries that
+@@ -6008,10 +6019,13 @@ relink_command=\"$relink_command\""
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  if test "$inst_prefix_dir" = "$destdir"; then
+-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+-	    exit $EXIT_FAILURE
+-	  fi
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  # if test "$inst_prefix_dir" = "$destdir"; then
++	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	  #   exit $EXIT_FAILURE
++	  # fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -6020,6 +6034,9 @@ relink_command=\"$relink_command\""
+ 	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ 	  fi
+ 
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/lib[^[:space:]]*%%"`
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/usr/lib[^[:space:]]*%%"`
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
diff --git a/trunk/tools/libtool/files/libtool-v2.2.patch b/trunk/tools/libtool/files/libtool-v2.2.patch
new file mode 100644
index 00000000..93dad39f
--- /dev/null
+++ b/trunk/tools/libtool/files/libtool-v2.2.patch
@@ -0,0 +1,123 @@
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -243,7 +243,7 @@ opt_warning=:
+ # name if it has been set yet.
+ func_echo ()
+ {
+-    $ECHO "$progname${mode+: }$mode: $*"
++    $ECHO "libreCMC-$progname-patched-2.2${mode+: }$mode: $*"
+ }
+ 
+ # func_verbose arg...
+@@ -262,14 +262,14 @@ func_verbose ()
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
++    $ECHO "libreCMC-$progname-patched-2.2${mode+: }$mode: "${1+"$@"} 1>&2
+ }
+ 
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "libreCMC-$progname-patched-2.2${mode+: }$mode: warning: "${1+"$@"} 1>&2
+ 
+     # bash bug again:
+     :
+@@ -1048,8 +1048,8 @@ func_infer_tag ()
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+-	  func_echo "unable to infer tagged configuration"
+-	  func_fatal_error "specify a tag with \`--tag'"
++	  func_echo "defaulting to \`CC'"
++	  func_echo "if this is not correct, specify a tag with \`--tag'"
+ #	else
+ #	  func_verbose "using $tagname tagged configuration"
+ 	fi
+@@ -2009,8 +2009,15 @@ func_mode_install ()
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Strip any trailing slash from the destination.
++	  func_stripname '' '/' "$libdir"
++	  s_libdir=$func_stripname_result
++
++	  func_stripname '' '/' "$destdir"
++	  s_destdir=$func_stripname_result
++
+ 	  # Determine the prefix the user has applied to our future dir.
+-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
++	  inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$s_libdir\$%%"`
+ 
+ 	  # Don't allow the user to place us outside of our expected
+ 	  # location b/c this prevents finding dependent libraries that
+@@ -2018,8 +2025,11 @@ func_mode_install ()
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  # test "$inst_prefix_dir" = "$destdir" && \
++	  #   func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -2028,6 +2038,9 @@ func_mode_install ()
+ 	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ 	  fi
+ 
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/lib[^[:space:]]*%%"`
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/usr/lib[^[:space:]]*%%"`
++
+ 	  func_warning "relinking \`$file'"
+ 	  func_show_eval "$relink_command" \
+ 	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+@@ -5412,8 +5425,12 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
++	    # Adding 'libdir' from the .la file to our library search paths
++	    # breaks crosscompilation horribly.  We cheat here and don't add
++	    # it, instead adding the path where we found the .la.  -CL
++	    dir="$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -5564,7 +5581,7 @@ func_mode_link ()
+ 	  *)
+ 	    if test "$installed" = no; then
+ 	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=yes
++	      need_relink=no
+ 	    fi
+ 	    ;;
+ 	  esac
+@@ -5768,7 +5785,6 @@ func_mode_link ()
+ 	       test "$hardcode_direct_absolute" = no; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+@@ -8052,6 +8068,10 @@ EOF
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++	      # Replacing uninstalled with installed can easily break crosscompilation,
++	      # since the installed path is generally the wrong architecture.  -CL
++	      newdependency_libs="$newdependency_libs $deplib"
++	      continue
+ 	      case $deplib in
+ 	      *.la)
+ 		func_basename "$deplib"
diff --git a/trunk/tools/libtool/files/libtool-v2.4.patch b/trunk/tools/libtool/files/libtool-v2.4.patch
new file mode 100644
index 00000000..7aa4bedc
--- /dev/null
+++ b/trunk/tools/libtool/files/libtool-v2.4.patch
@@ -0,0 +1,160 @@
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -443,7 +443,7 @@ opt_warning=:
+ # name if it has been set yet.
+ func_echo ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++    $ECHO "libreCMC-$progname-patched-2.4: ${opt_mode+$opt_mode: }$*"
+ }
+ 
+ # func_verbose arg...
+@@ -469,14 +469,14 @@ func_echo_all ()
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++    $ECHO "libreCMC-$progname-patched-2.4: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ }
+ 
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "libreCMC-$progname-patched-2.4: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ 
+     # bash bug again:
+     :
+@@ -1416,8 +1416,8 @@ func_infer_tag ()
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+-	  func_echo "unable to infer tagged configuration"
+-	  func_fatal_error "specify a tag with \`--tag'"
++	  func_echo "defaulting to \`CC'"
++	  func_echo "if this is not correct, specify a tag with \`--tag'"
+ #	else
+ #	  func_verbose "using $tagname tagged configuration"
+ 	fi
+@@ -2953,8 +2953,15 @@ func_mode_install ()
+ 	func_append dir "$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Strip any trailing slash from the destination.
++	  func_stripname '' '/' "$libdir"
++	  s_libdir=$func_stripname_result
++
++	  func_stripname '' '/' "$destdir"
++	  s_destdir=$func_stripname_result
++
+ 	  # Determine the prefix the user has applied to our future dir.
+-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
++	  inst_prefix_dir=`$ECHO "$s_destdir" | $SED -e "s%$s_libdir\$%%"`
+ 
+ 	  # Don't allow the user to place us outside of our expected
+ 	  # location b/c this prevents finding dependent libraries that
+@@ -2962,8 +2969,11 @@ func_mode_install ()
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  # test "$inst_prefix_dir" = "$destdir" && \
++	  #   func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -2972,6 +2982,9 @@ func_mode_install ()
+ 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ 	  fi
+ 
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/lib[^[:space:]]*%%"`
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/usr/lib[^[:space:]]*%%"`
++
+ 	  func_warning "relinking \`$file'"
+ 	  func_show_eval "$relink_command" \
+ 	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+@@ -6504,8 +6517,12 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$lt_sysroot$libdir"
+-	    absdir="$lt_sysroot$libdir"
++	    # Adding 'libdir' from the .la file to our library search paths
++	    # breaks crosscompilation horribly.  We cheat here and don't add
++	    # it, instead adding the path where we found the .la.  -CL
++	    dir="$lt_sysroot$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -6683,7 +6700,7 @@ func_mode_link ()
+ 	  *)
+ 	    if test "$installed" = no; then
+ 	      func_append notinst_deplibs " $lib"
+-	      need_relink=yes
++	      need_relink=no
+ 	    fi
+ 	    ;;
+ 	  esac
+@@ -6887,7 +6904,6 @@ func_mode_link ()
+ 	       test "$hardcode_direct_absolute" = no; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+@@ -6903,8 +6919,6 @@ func_mode_link ()
+ 		add="$libdir/$linklib"
+ 	      fi
+ 	    else
+-	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in
+@@ -7059,7 +7073,17 @@ func_mode_link ()
+ 		  fi
+ 		  ;;
+ 		*)
+-		  path="-L$absdir/$objdir"
++		  # OE sets installed=no in staging. We need to look in $objdir and $absdir,
++		  # preferring $objdir. RP 31/04/2008
++		  if test -f "$absdir/$objdir/$depdepl" ; then
++		    depdepl="$absdir/$objdir/$depdepl"
++		    path="-L$absdir/$objdir"
++		  elif test -f "$absdir/$depdepl" ; then
++		    depdepl="$absdir/$depdepl"
++		    path="-L$absdir"
++		  else
++		    path="-L$absdir/$objdir"
++		  fi
+ 		  ;;
+ 		esac
+ 		else
+@@ -8050,7 +8074,7 @@ EOF
+ 	    elif test -n "$runpath_var"; then
+ 	      case "$perm_rpath " in
+ 	      *" $libdir "*) ;;
+-	      *) func_apped perm_rpath " $libdir" ;;
++	      *) func_append perm_rpath " $libdir" ;;
+ 	      esac
+ 	    fi
+ 	  done
+@@ -9257,6 +9281,10 @@ EOF
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++	      # Replacing uninstalled with installed can easily break crosscompilation,
++	      # since the installed path is generally the wrong architecture.  -CL
++	      newdependency_libs="$newdependency_libs $deplib"
++	      continue
+ 	      case $deplib in
+ 	      *.la)
+ 		func_basename "$deplib"
diff --git a/trunk/tools/libtool/patches/000-relocatable.patch b/trunk/tools/libtool/patches/000-relocatable.patch
new file mode 100644
index 00000000..c36b8065
--- /dev/null
+++ b/trunk/tools/libtool/patches/000-relocatable.patch
@@ -0,0 +1,96 @@
+--- a/libltdl/config/general.m4sh
++++ b/libltdl/config/general.m4sh
+@@ -53,7 +53,7 @@ test "${ECHO+set}" = set || ECHO=${as_ec
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="@SED@"}
++test "${STAGING_DIR+set}" = set && ${SED="$STAGING_DIR/../host/bin/sed"} || ${SED="@SED@"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
+ 
+--- a/libtoolize.in
++++ b/libtoolize.in
+@@ -334,7 +334,11 @@ test "${ECHO+set}" = set || ECHO=${as_ec
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="@SED@"}
++if test -n "$STAGING_DIR"; then
++	: ${SED="$STAGING_DIR/../host/bin/sed"}
++else
++	: ${SED="@SED@"}
++fi
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
+ 
+@@ -2476,10 +2480,17 @@ func_check_macros ()
+ 
+   # Locations for important files:
+   prefix=@prefix@
+-  datadir=@datadir@
+-  pkgdatadir=@pkgdatadir@
+-  pkgltdldir=@pkgdatadir@
+-  aclocaldir=@aclocaldir@
++  if test -n "$STAGING_DIR"; then
++    datadir="$STAGING_DIR/../host/share"
++    pkgdatadir="$STAGING_DIR/../host/share/libtool"
++    pkgltdldir="$STAGING_DIR/../host/share/libtool"
++    aclocaldir="$STAGING_DIR/../host/share/aclocal"
++  else
++    datadir=@datadir@
++    pkgdatadir=@pkgdatadir@
++    pkgltdldir=@pkgdatadir@
++    aclocaldir=@aclocaldir@
++  fi
+   auxdir=
+   macrodir=
+   configure_ac=configure.in
+--- a/libtoolize.m4sh
++++ b/libtoolize.m4sh
+@@ -1450,10 +1450,17 @@ func_check_macros ()
+ 
+   # Locations for important files:
+   prefix=@prefix@
+-  datadir=@datadir@
+-  pkgdatadir=@pkgdatadir@
+-  pkgltdldir=@pkgdatadir@
+-  aclocaldir=@aclocaldir@
++  if test -n "$STAGING_DIR"; then
++    datadir="$STAGING_DIR/../host/share"
++    pkgdatadir="$STAGING_DIR/../host/share/libtool"
++    pkgltdldir="$STAGING_DIR/../host/share/libtool"
++    aclocaldir="$STAGING_DIR/../host/share/aclocal"
++  else
++    datadir=@datadir@
++    pkgdatadir=@pkgdatadir@
++    pkgltdldir=@pkgdatadir@
++    aclocaldir=@aclocaldir@
++  fi
+   auxdir=
+   macrodir=
+   configure_ac=configure.in
+--- a/libltdl/m4/libtool.m4
++++ b/libltdl/m4/libtool.m4
+@@ -875,9 +875,8 @@ dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+ # ----------------
+ m4_defun([_LT_TAG_COMPILER],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+-
+ _LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
++_LT_DECL([LTCFLAGS], [CFLAGS], ["-O2 -I\${STAGING_DIR:-$STAGING_DIR}/../host/include"], [LTCC compiler flags])dnl
+ _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+ _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+ 
+@@ -7544,9 +7543,8 @@ AC_SUBST([DLLTOOL])
+ # as few characters as possible.  Prefer GNU sed if found.
+ m4_defun([_LT_DECL_SED],
+ [AC_PROG_SED
+-test -z "$SED" && SED=sed
+ Xsed="$SED -e 1s/^X//"
+-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
++_LT_DECL([], [SED], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/sed"], [A sed program that does not truncate output])
+ _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+     [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+ ])# _LT_DECL_SED
diff --git a/trunk/tools/libtool/patches/001-fix-func_append.patch b/trunk/tools/libtool/patches/001-fix-func_append.patch
new file mode 100644
index 00000000..4c3c07b7
--- /dev/null
+++ b/trunk/tools/libtool/patches/001-fix-func_append.patch
@@ -0,0 +1,22 @@
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -7261,7 +7261,7 @@ EOF
+ 	    elif test -n "$runpath_var"; then
+ 	      case "$perm_rpath " in
+ 	      *" $libdir "*) ;;
+-	      *) func_apped perm_rpath " $libdir" ;;
++	      *) func_append perm_rpath " $libdir" ;;
+ 	      esac
+ 	    fi
+ 	  done
+--- a/libltdl/config/ltmain.sh
++++ b/libltdl/config/ltmain.sh
+@@ -8050,7 +8050,7 @@ EOF
+ 	    elif test -n "$runpath_var"; then
+ 	      case "$perm_rpath " in
+ 	      *" $libdir "*) ;;
+-	      *) func_apped perm_rpath " $libdir" ;;
++	      *) func_append perm_rpath " $libdir" ;;
+ 	      esac
+ 	    fi
+ 	  done
diff --git a/trunk/tools/libtool/patches/100-libdir-fixes.patch b/trunk/tools/libtool/patches/100-libdir-fixes.patch
new file mode 100644
index 00000000..d4e6f785
--- /dev/null
+++ b/trunk/tools/libtool/patches/100-libdir-fixes.patch
@@ -0,0 +1,94 @@
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -5715,8 +5715,14 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$lt_sysroot$libdir"
+-	    absdir="$lt_sysroot$libdir"
++	    # Adding 'libdir' from the .la file to our library search paths
++	    # breaks crosscompilation horribly.  We cheat here and don't add
++	    # it, instead adding the path where we found the .la.  -CL
++	    dir="$lt_sysroot$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	    #dir="$libdir"
++	    #absdir="$lt_sysroot$libdir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -6114,8 +6120,6 @@ func_mode_link ()
+ 		add="$libdir/$linklib"
+ 	      fi
+ 	    else
+-	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in
+@@ -6270,7 +6274,17 @@ func_mode_link ()
+ 		  fi
+ 		  ;;
+ 		*)
+-		  path="-L$absdir/$objdir"
++                  # OE sets installed=no in staging. We need to look in $objdir and $absdir, 
++                  # preferring $objdir. RP 31/04/2008
++                  if test -f "$absdir/$objdir/$depdepl" ; then
++		    depdepl="$absdir/$objdir/$depdepl"
++		    path="-L$absdir/$objdir"
++                  elif test -f "$absdir/$depdepl" ; then
++		    depdepl="$absdir/$depdepl"
++		    path="-L$absdir"
++                  else
++		    path="-L$absdir/$objdir"
++                  fi
+ 		  ;;
+ 		esac
+ 		else
+--- a/libltdl/config/ltmain.sh
++++ b/libltdl/config/ltmain.sh
+@@ -6504,8 +6504,14 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$lt_sysroot$libdir"
+-	    absdir="$lt_sysroot$libdir"
++	    # Adding 'libdir' from the .la file to our library search paths
++	    # breaks crosscompilation horribly.  We cheat here and don't add
++	    # it, instead adding the path where we found the .la.  -CL
++	    dir="$lt_sysroot$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	    #dir="$libdir"
++	    #absdir="$lt_sysroot$libdir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -6903,8 +6909,6 @@ func_mode_link ()
+ 		add="$libdir/$linklib"
+ 	      fi
+ 	    else
+-	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in
+@@ -7059,7 +7063,17 @@ func_mode_link ()
+ 		  fi
+ 		  ;;
+ 		*)
+-		  path="-L$absdir/$objdir"
++                  # OE sets installed=no in staging. We need to look in $objdir and $absdir, 
++                  # preferring $objdir. RP 31/04/2008
++                  if test -f "$absdir/$objdir/$depdepl" ; then
++		    depdepl="$absdir/$objdir/$depdepl"
++		    path="-L$absdir/$objdir"
++                  elif test -f "$absdir/$depdepl" ; then
++		    depdepl="$absdir/$depdepl"
++		    path="-L$absdir"
++                  else
++		    path="-L$absdir/$objdir"
++                  fi
+ 		  ;;
+ 		esac
+ 		else
diff --git a/trunk/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch b/trunk/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
new file mode 100644
index 00000000..c7805893
--- /dev/null
+++ b/trunk/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
@@ -0,0 +1,20 @@
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -6104,7 +6104,6 @@ func_mode_link ()
+ 	       test "$hardcode_direct_absolute" = no; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+--- a/libltdl/config/ltmain.sh
++++ b/libltdl/config/ltmain.sh
+@@ -6893,7 +6893,6 @@ func_mode_link ()
+ 	       test "$hardcode_direct_absolute" = no; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
diff --git a/trunk/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch b/trunk/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
new file mode 100644
index 00000000..1c3df4c0
--- /dev/null
+++ b/trunk/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
@@ -0,0 +1,24 @@
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -2183,6 +2183,9 @@ func_mode_install ()
+ 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ 	  fi
+ 
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/lib[^[:space:]]*%%"`
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/usr/lib[^[:space:]]*%%"`
++
+ 	  func_warning "relinking \`$file'"
+ 	  func_show_eval "$relink_command" \
+ 	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+--- a/libltdl/config/ltmain.sh
++++ b/libltdl/config/ltmain.sh
+@@ -2972,6 +2972,9 @@ func_mode_install ()
+ 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ 	  fi
+ 
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/lib[^[:space:]]*%%"`
++	  relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/usr/lib[^[:space:]]*%%"`
++
+ 	  func_warning "relinking \`$file'"
+ 	  func_show_eval "$relink_command" \
+ 	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
diff --git a/trunk/tools/libtool/patches/150-trailingslash.patch b/trunk/tools/libtool/patches/150-trailingslash.patch
new file mode 100644
index 00000000..a01f9be7
--- /dev/null
+++ b/trunk/tools/libtool/patches/150-trailingslash.patch
@@ -0,0 +1,49 @@
+A command like /bin/sh ../../i586-poky-linux-libtool   --mode=install /usr/bin/install -c   gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio)
+
+This is because libdir has a trailing slash which breaks the comparision.
+
+RP 2/1/10
+
+Merged a patch received from Gary Thomas <gary@mlbassoc.com>
+
+Date: 2010/07/12
+Nitin A Kamble <nitin.a.kamble@intel.com>
+
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -2164,8 +2164,15 @@ func_mode_install ()
+ 	func_append dir "$objdir"
+ 
+ 	if test -n "$relink_command"; then
++      # Strip any trailing slash from the destination.
++      func_stripname '' '/' "$libdir"
++      destlibdir=$func_stripname_result
++
++      func_stripname '' '/' "$destdir"
++      s_destdir=$func_stripname_result
++
+ 	  # Determine the prefix the user has applied to our future dir.
+-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
++	  inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
+ 
+ 	  # Don't allow the user to place us outside of our expected
+ 	  # location b/c this prevents finding dependent libraries that
+--- a/libltdl/config/ltmain.sh
++++ b/libltdl/config/ltmain.sh
+@@ -2953,8 +2953,15 @@ func_mode_install ()
+ 	func_append dir "$objdir"
+ 
+ 	if test -n "$relink_command"; then
++      # Strip any trailing slash from the destination.
++      func_stripname '' '/' "$libdir"
++      destlibdir=$func_stripname_result
++
++      func_stripname '' '/' "$destdir"
++      s_destdir=$func_stripname_result
++
+ 	  # Determine the prefix the user has applied to our future dir.
+-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
++	  inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
+ 
+ 	  # Don't allow the user to place us outside of our expected
+ 	  # location b/c this prevents finding dependent libraries that
diff --git a/trunk/tools/libtool/patches/200-openwrt-branding.patch b/trunk/tools/libtool/patches/200-openwrt-branding.patch
new file mode 100644
index 00000000..176b902a
--- /dev/null
+++ b/trunk/tools/libtool/patches/200-openwrt-branding.patch
@@ -0,0 +1,112 @@
+--- a/libltdl/config/general.m4sh
++++ b/libltdl/config/general.m4sh
+@@ -352,7 +352,7 @@ opt_warning=:
+ # name if it has been set yet.
+ func_echo ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }$*"
+ }
+ 
+ # func_verbose arg...
+@@ -378,14 +378,14 @@ func_echo_all ()
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ }
+ 
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ 
+     # bash bug again:
+     :
+--- a/libltdl/config/ltmain.sh
++++ b/libltdl/config/ltmain.sh
+@@ -443,7 +443,7 @@ opt_warning=:
+ # name if it has been set yet.
+ func_echo ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }$*"
+ }
+ 
+ # func_verbose arg...
+@@ -469,14 +469,14 @@ func_echo_all ()
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ }
+ 
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ 
+     # bash bug again:
+     :
+--- a/libtoolize.in
++++ b/libtoolize.in
+@@ -637,7 +637,7 @@ opt_warning=:
+ # name if it has been set yet.
+ func_echo ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }$*"
+ }
+ 
+ # func_verbose arg...
+@@ -663,14 +663,14 @@ func_echo_all ()
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ }
+ 
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ 
+     # bash bug again:
+     :
+--- a/tests/defs.in
++++ b/tests/defs.in
+@@ -588,7 +588,7 @@ opt_warning=:
+ # name if it has been set yet.
+ func_echo ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }$*"
+ }
+ 
+ # func_verbose arg...
+@@ -614,14 +614,14 @@ func_echo_all ()
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++    $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ }
+ 
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
++    $opt_warning && $ECHO "libreCMC-$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ 
+     # bash bug again:
+     :
diff --git a/trunk/tools/lzma-old/Makefile b/trunk/tools/lzma-old/Makefile
new file mode 100644
index 00000000..08511b0e
--- /dev/null
+++ b/trunk/tools/lzma-old/Makefile
@@ -0,0 +1,36 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lzma-old
+PKG_VERSION:=4.32
+
+PKG_SOURCE:=lzma-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=5587d6ac230ad1903d504fc3253f0e42
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/lzma-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+LIB_DIR=$(HOST_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
+ALONE_DIR=$(HOST_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
+
+define Host/Compile
+	$(MAKE) -C $(LIB_DIR)
+	$(MAKE) -f makefile.gcc -C $(ALONE_DIR)
+endef
+
+define Host/Install
+	$(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/liblzma-old.a
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/lib/liblzma-old.a
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/lzma-old/patches/100-lzma_zlib.patch b/trunk/tools/lzma-old/patches/100-lzma_zlib.patch
new file mode 100644
index 00000000..32d12639
--- /dev/null
+++ b/trunk/tools/lzma-old/patches/100-lzma_zlib.patch
@@ -0,0 +1,404 @@
+--- a/C/7zip/Compress/LZMA/LZMADecoder.cpp
++++ b/C/7zip/Compress/LZMA/LZMADecoder.cpp
+@@ -274,12 +274,17 @@ STDMETHODIMP CDecoder::SetDecoderPropert
+   Byte remainder = (Byte)(properties[0] / 9);
+   int lp = remainder % 5;
+   int pb = remainder / 5;
+-  if (pb > NLength::kNumPosStatesBitsMax)
+-    return E_INVALIDARG;
+-  _posStateMask = (1 << pb) - 1;
+   UInt32 dictionarySize = 0;
+   for (int i = 0; i < 4; i++)
+     dictionarySize += ((UInt32)(properties[1 + i])) << (i * 8);
++  return SetDecoderPropertiesRaw(lc, lp, pb, dictionarySize);
++}
++
++STDMETHODIMP CDecoder::SetDecoderPropertiesRaw(int lc, int lp, int pb, UInt32 dictionarySize)
++{
++  if (pb > NLength::kNumPosStatesBitsMax)
++    return E_INVALIDARG;
++  _posStateMask = (1 << pb) - 1;
+   if (!_outWindowStream.Create(dictionarySize))
+     return E_OUTOFMEMORY;
+   if (!_literalDecoder.Create(lp, lc))
+--- a/C/7zip/Compress/LZMA/LZMADecoder.h
++++ b/C/7zip/Compress/LZMA/LZMADecoder.h
+@@ -228,6 +228,7 @@ public:
+       ICompressProgressInfo *progress);
+ 
+   STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
++  STDMETHOD(SetDecoderPropertiesRaw)(int lc, int lp, int pb, UInt32 dictionarySize);
+ 
+   STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
+ 
+--- /dev/null
++++ b/C/7zip/Compress/LZMA_Lib/makefile
+@@ -0,0 +1,92 @@
++PROG = liblzma.a
++CXX = g++ -O3 -Wall
++AR = ar
++RM = rm -f
++CFLAGS = -c  -I ../../../
++
++OBJS = \
++  ZLib.o \
++  LZMADecoder.o \
++  LZMAEncoder.o \
++  LZInWindow.o \
++  LZOutWindow.o \
++  RangeCoderBit.o \
++  InBuffer.o \
++  OutBuffer.o \
++  FileStreams.o \
++  Alloc.o \
++  C_FileIO.o \
++  CommandLineParser.o \
++  CRC.o \
++  StreamUtils.o \
++  String.o \
++  StringConvert.o \
++  StringToInt.o \
++  Vector.o \
++
++
++all: $(PROG)
++
++$(PROG): $(OBJS)
++	$(AR) r $(PROG) $(OBJS)
++
++ZLib.o: ZLib.cpp
++	$(CXX) $(CFLAGS) ZLib.cpp
++
++LZMADecoder.o: ../LZMA/LZMADecoder.cpp
++	$(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
++
++LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
++	$(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
++
++LZInWindow.o: ../LZ/LZInWindow.cpp
++	$(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
++
++LZOutWindow.o: ../LZ/LZOutWindow.cpp
++	$(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
++
++RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
++	$(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
++
++InBuffer.o: ../../Common/InBuffer.cpp
++	$(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
++
++OutBuffer.o: ../../Common/OutBuffer.cpp
++	$(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
++
++StreamUtils.o: ../../Common/StreamUtils.cpp
++	$(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
++
++FileStreams.o: ../../Common/FileStreams.cpp
++	$(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
++
++Alloc.o: ../../../Common/Alloc.cpp
++	$(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
++
++C_FileIO.o: ../../../Common/C_FileIO.cpp
++	$(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
++
++CommandLineParser.o: ../../../Common/CommandLineParser.cpp
++	$(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
++
++CRC.o: ../../../Common/CRC.cpp
++	$(CXX) $(CFLAGS) ../../../Common/CRC.cpp
++
++MyWindows.o: ../../../Common/MyWindows.cpp
++	$(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
++
++String.o: ../../../Common/String.cpp
++	$(CXX) $(CFLAGS) ../../../Common/String.cpp
++
++StringConvert.o: ../../../Common/StringConvert.cpp
++	$(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
++
++StringToInt.o: ../../../Common/StringToInt.cpp
++	$(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
++
++Vector.o: ../../../Common/Vector.cpp
++	$(CXX) $(CFLAGS) ../../../Common/Vector.cpp
++
++clean:
++	-$(RM) $(PROG) $(OBJS)
++
+--- /dev/null
++++ b/C/7zip/Compress/LZMA_Lib/ZLib.cpp
+@@ -0,0 +1,273 @@
++/*
++ * lzma zlib simplified wrapper
++ *
++ * Copyright (c) 2005-2006 Oleg I. Vdovikin <oleg@cs.msu.su>
++ *
++ * This library is free software; you can redistribute 
++ * it and/or modify it under the terms of the GNU Lesser 
++ * General Public License as published by the Free Software 
++ * Foundation; either version 2.1 of the License, or 
++ * (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be 
++ * useful, but WITHOUT ANY WARRANTY; without even the implied 
++ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
++ * PURPOSE. See the GNU Lesser General Public License 
++ * for more details.
++ *
++ * You should have received a copy of the GNU Lesser General 
++ * Public License along with this library; if not, write to 
++ * the Free Software Foundation, Inc., 59 Temple Place, 
++ * Suite 330, Boston, MA 02111-1307 USA 
++ */
++
++/*
++ * default values for encoder/decoder used by wrapper
++ */
++
++#include <zlib.h>
++
++#define ZLIB_LC 3
++#define ZLIB_LP 0
++#define ZLIB_PB 2
++
++#ifdef WIN32
++#include <initguid.h>
++#else
++#define INITGUID
++#endif
++
++#include "../../../Common/MyWindows.h"
++#include "../LZMA/LZMADecoder.h"
++#include "../LZMA/LZMAEncoder.h"
++
++#define STG_E_SEEKERROR                  ((HRESULT)0x80030019L)
++#define STG_E_MEDIUMFULL                 ((HRESULT)0x80030070L)
++
++class CInMemoryStream: 
++  public IInStream,
++  public IStreamGetSize,
++  public CMyUnknownImp
++{
++public:
++  CInMemoryStream(const Bytef *data, UInt64 size) : 
++	  m_data(data), m_size(size), m_offset(0) {}
++
++  virtual ~CInMemoryStream() {}
++
++  MY_UNKNOWN_IMP2(IInStream, IStreamGetSize)
++
++  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize)
++  {
++	  if (size > m_size - m_offset) 
++		  size = m_size - m_offset;
++
++	  if (size) {
++		  memcpy(data, m_data + m_offset, size);
++	  }
++
++	  m_offset += size;
++
++	  if (processedSize) 
++		  *processedSize = size;
++
++	  return S_OK;
++  }
++
++  STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize)
++  {
++	return Read(data, size, processedSize);
++  }
++
++  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition)
++  {
++	  UInt64 _offset;
++
++	  if (seekOrigin == STREAM_SEEK_SET) _offset = offset;
++	  else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; 
++	  else if (seekOrigin == STREAM_SEEK_END) _offset = m_size;
++	  else return STG_E_INVALIDFUNCTION;
++
++	  if (_offset < 0 || _offset > m_size)
++		  return STG_E_SEEKERROR;
++
++	  m_offset = _offset;
++
++	  if (newPosition)
++		  *newPosition = m_offset;
++
++	  return S_OK;
++  }
++
++  STDMETHOD(GetSize)(UInt64 *size)
++  {
++	  *size = m_size;
++	  return S_OK;
++  }
++protected:
++	const Bytef *m_data;
++	UInt64 m_size;
++	UInt64 m_offset;
++};
++
++class COutMemoryStream: 
++  public IOutStream,
++  public CMyUnknownImp
++{
++public:
++  COutMemoryStream(Bytef *data, UInt64 maxsize) : 
++	  m_data(data), m_size(0), m_maxsize(maxsize), m_offset(0) {}
++  virtual ~COutMemoryStream() {}
++  
++  MY_UNKNOWN_IMP1(IOutStream)
++
++  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize)
++  {
++	  if (size > m_maxsize - m_offset) 
++		  size = m_maxsize - m_offset;
++
++	  if (size) {
++		  memcpy(m_data + m_offset, data, size);
++	  }
++
++	  m_offset += size;
++
++	  if (m_offset > m_size)
++		m_size = m_offset;
++
++	  if (processedSize) 
++		  *processedSize = size;
++
++	  return S_OK;
++  }
++  
++  STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize)
++  {
++	  return Write(data, size, processedSize);
++  }
++
++  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition)
++  {
++	  UInt64 _offset;
++
++	  if (seekOrigin == STREAM_SEEK_SET) _offset = offset;
++	  else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; 
++	  else if (seekOrigin == STREAM_SEEK_END) _offset = m_size;
++	  else return STG_E_INVALIDFUNCTION;
++
++	  if (_offset < 0 || _offset > m_maxsize)
++		  return STG_E_SEEKERROR;
++
++	  m_offset = _offset;
++
++	  if (newPosition)
++		  *newPosition = m_offset;
++
++	  return S_OK;
++  }
++  
++  STDMETHOD(SetSize)(Int64 newSize)
++  {
++	  if ((UInt64)newSize > m_maxsize) 
++		  return STG_E_MEDIUMFULL;
++
++	  return S_OK;
++  }
++protected:
++	Bytef *m_data;
++	UInt64 m_size;
++	UInt64 m_maxsize;
++	UInt64 m_offset;
++};
++
++ZEXTERN int ZEXPORT compress2 (Bytef *dest,   uLongf *destLen,
++                                  const Bytef *source, uLong sourceLen,
++                                  int level)
++{
++	CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
++	CMyComPtr<ISequentialInStream> inStream = inStreamSpec;
++	
++	COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen);
++	CMyComPtr<ISequentialOutStream> outStream = outStreamSpec;
++	
++	NCompress::NLZMA::CEncoder *encoderSpec = 
++		new NCompress::NLZMA::CEncoder;
++	CMyComPtr<ICompressCoder> encoder = encoderSpec;
++	
++	PROPID propIDs[] = 
++	{
++		NCoderPropID::kDictionarySize,
++		NCoderPropID::kPosStateBits,
++		NCoderPropID::kLitContextBits,
++		NCoderPropID::kLitPosBits,
++		NCoderPropID::kAlgorithm,
++		NCoderPropID::kNumFastBytes,
++		NCoderPropID::kMatchFinder,
++		NCoderPropID::kEndMarker
++	};
++	const int kNumProps = sizeof(propIDs) / sizeof(propIDs[0]);
++	
++	PROPVARIANT properties[kNumProps];
++	for (int p = 0; p < 6; p++)
++		properties[p].vt = VT_UI4;
++	properties[0].ulVal = UInt32(1 << (level + 14));
++	properties[1].ulVal = UInt32(ZLIB_PB);
++	properties[2].ulVal = UInt32(ZLIB_LC); // for normal files
++	properties[3].ulVal = UInt32(ZLIB_LP); // for normal files
++	properties[4].ulVal = UInt32(2);
++	properties[5].ulVal = UInt32(128);
++	
++	properties[6].vt = VT_BSTR;
++	properties[6].bstrVal = (BSTR)(const wchar_t *)L"BT4";
++	
++	properties[7].vt = VT_BOOL;
++	properties[7].boolVal = VARIANT_TRUE;
++	
++	if (encoderSpec->SetCoderProperties(propIDs, properties, kNumProps) != S_OK)
++		return Z_MEM_ERROR; // should not happen
++	
++	HRESULT result = encoder->Code(inStream, outStream, 0, 0, 0);
++	if (result == E_OUTOFMEMORY)
++	{
++		return Z_MEM_ERROR;
++	}   
++	else if (result != S_OK)
++	{
++		return Z_BUF_ERROR;	// should not happen
++	}   
++	
++	UInt64 fileSize;
++	outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize);
++	*destLen = fileSize;
++	
++	return Z_OK;
++}
++
++ZEXTERN int ZEXPORT uncompress (Bytef *dest,   uLongf *destLen,
++                                   const Bytef *source, uLong sourceLen)
++{
++	CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
++	CMyComPtr<ISequentialInStream> inStream = inStreamSpec;
++	
++	COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen);
++	CMyComPtr<ISequentialOutStream> outStream = outStreamSpec;
++	
++	NCompress::NLZMA::CDecoder *decoderSpec = 
++		new NCompress::NLZMA::CDecoder;
++	CMyComPtr<ICompressCoder> decoder = decoderSpec;
++	
++	if (decoderSpec->SetDecoderPropertiesRaw(ZLIB_LC, 
++		ZLIB_LP, ZLIB_PB, (1 << 23)) != S_OK) return Z_DATA_ERROR;
++	
++	UInt64 fileSize = *destLen;
++	
++	if (decoder->Code(inStream, outStream, 0, &fileSize, 0) != S_OK)
++	{
++		return Z_DATA_ERROR;
++	}
++	
++	outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize);
++	*destLen = fileSize;
++	
++	return Z_OK;
++}
diff --git a/trunk/tools/lzma-old/patches/110-ranlib.patch b/trunk/tools/lzma-old/patches/110-ranlib.patch
new file mode 100644
index 00000000..813b4137
--- /dev/null
+++ b/trunk/tools/lzma-old/patches/110-ranlib.patch
@@ -0,0 +1,10 @@
+--- a/C/7zip/Compress/LZMA_Lib/makefile
++++ b/C/7zip/Compress/LZMA_Lib/makefile
+@@ -29,6 +29,7 @@ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+ 	$(AR) r $(PROG) $(OBJS)
++	ranlib $(PROG)
+ 
+ ZLib.o: ZLib.cpp
+ 	$(CXX) $(CFLAGS) ZLib.cpp
diff --git a/trunk/tools/lzma/Makefile b/trunk/tools/lzma/Makefile
new file mode 100644
index 00000000..6e01051a
--- /dev/null
+++ b/trunk/tools/lzma/Makefile
@@ -0,0 +1,36 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lzma
+PKG_VERSION:=4.65
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=434e51a018b4c8ef377bf81520a53af0
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil
+ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone
+
+define Host/Compile
+	$(MAKE) -C $(UTIL_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)"
+	$(MAKE) -C $(ALONE_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)"
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma
+endef
+
+define Host/Clean
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/lzma/patches/001-large_files.patch b/trunk/tools/lzma/patches/001-large_files.patch
new file mode 100644
index 00000000..b95fe9e9
--- /dev/null
+++ b/trunk/tools/lzma/patches/001-large_files.patch
@@ -0,0 +1,13 @@
+Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
+===================================================================
+--- lzma-4.65.orig/CPP/7zip/Compress/LZMA_Alone/makefile.gcc	2009-05-15 23:33:51.000000000 +0200
++++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc	2009-06-01 22:00:54.000000000 +0200
+@@ -3,7 +3,7 @@
+ CXX_C = gcc -O2 -Wall
+ LIB = -lm
+ RM = rm -f
+-CFLAGS = -c
++CFLAGS = -c -D_FILE_OFFSET_BITS=64
+ 
+ ifdef SystemDrive
+ IS_MINGW = 1
diff --git a/trunk/tools/lzma/patches/002-lzmp.patch b/trunk/tools/lzma/patches/002-lzmp.patch
new file mode 100644
index 00000000..72d881cd
--- /dev/null
+++ b/trunk/tools/lzma/patches/002-lzmp.patch
@@ -0,0 +1,1059 @@
+Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzmp.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzmp.cpp	2009-06-01 22:01:10.000000000 +0200
+@@ -0,0 +1,895 @@
++/*
++ * LZMA command line tool similar to gzip to encode and decode LZMA files.
++ *
++ * Copyright (C) 2005 Ville Koskinen
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
++ * USA.
++ */
++
++#include "../../../Common/MyInitGuid.h"
++
++#include <iostream>
++using std::cout;
++using std::cerr;
++using std::endl;
++
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
++
++#include <string>
++using std::string;
++#include <vector>
++using std::vector;
++typedef vector<string> stringVector;
++
++#include <unistd.h>
++#include <getopt.h>
++#include <signal.h>
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <utime.h>
++#include <sys/time.h> // futimes()
++
++// For Solaris
++#ifndef HAVE_FUTIMES
++//#define futimes(fd, tv) futimesat(fd, NULL, tv)
++#endif
++
++#if defined(_WIN32) || defined(OS2) || defined(MSDOS)
++#include <fcntl.h>
++#include <io.h>
++#define MY_SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY)
++#else
++#define MY_SET_BINARY_MODE(file)
++#endif
++
++#include "../../../7zip/Common/FileStreams.h"
++
++#include "../../../Common/Types.h"
++
++#include "../../../7zip/Compress/LzmaDecoder.h"
++#include "../../../7zip/Compress/LzmaEncoder.h"
++
++#include "Exception.h"
++
++#include "lzma_version.h"
++
++namespace lzma {
++
++const char *PROGRAM_VERSION = PACKAGE_VERSION;
++const char *PROGRAM_COPYRIGHT = "Copyright (C) 2006 Ville Koskinen";
++
++/* LZMA_Alone switches:
++    -a{N}:  set compression mode - [0, 2], default: 2 (max)
++    -d{N}:  set dictionary - [0,28], default: 23 (8MB)
++    -fb{N}: set number of fast bytes - [5, 255], default: 128
++    -lc{N}: set number of literal context bits - [0, 8], default: 3
++    -lp{N}: set number of literal pos bits - [0, 4], default: 0
++    -pb{N}: set number of pos bits - [0, 4], default: 2
++    -mf{MF_ID}: set Match Finder: [bt2, bt3, bt4, bt4b, pat2r, pat2,
++                pat2h, pat3h, pat4h, hc3, hc4], default: bt4
++*/
++
++struct lzma_option {
++	short compression_mode;			// -a
++	short dictionary;			// -d
++	short fast_bytes;			// -fb
++	wchar_t *match_finder;			// -mf
++	short literal_context_bits;		// -lc
++	short literal_pos_bits;			// -lp
++	short pos_bits;				// -pb
++};
++
++/* The following is a mapping from gzip/bzip2 style -1 .. -9 compression modes
++ * to the corresponding LZMA compression modes. Thanks, Larhzu, for coining
++ * these. */
++const lzma_option option_mapping[] = {
++	{ 0,  0,  0,    NULL, 0, 0, 0},		// -0 (needed for indexing)
++	{ 0, 16, 64,  L"hc4", 3, 0, 2},		// -1
++	{ 0, 20, 64,  L"hc4", 3, 0, 2},		// -2
++	{ 1, 19, 64,  L"bt4", 3, 0, 2},		// -3
++	{ 2, 20, 64,  L"bt4", 3, 0, 2},		// -4
++	{ 2, 21, 128, L"bt4", 3, 0, 2},		// -5
++	{ 2, 22, 128, L"bt4", 3, 0, 2},		// -6
++	{ 2, 23, 128, L"bt4", 3, 0, 2},		// -7
++	{ 2, 24, 255, L"bt4", 3, 0, 2},		// -8
++	{ 2, 25, 255, L"bt4", 3, 0, 2},		// -9
++};
++
++struct extension_pair {
++	char *from;
++	char *to;
++};
++
++const extension_pair known_extensions[] = {
++	{ ".lzma", "" },
++	{ ".tlz", ".tar" },
++	{ NULL, NULL }
++};
++
++/* Sorry, I just happen to like enumerations. */
++enum PROGRAM_MODE {
++	PM_COMPRESS = 0,
++	PM_DECOMPRESS,
++	PM_TEST,
++	PM_HELP,
++	PM_LICENSE,
++	PM_VERSION
++};
++
++enum {
++	STATUS_OK = 0,
++	STATUS_ERROR = 1,
++	STATUS_WARNING = 2
++};
++
++/* getopt options. */
++/* struct option { name, has_arg, flag, val } */
++const struct option long_options[] = {
++	{ "stdout", 0, 0, 'c' },
++	{ "decompress", 0, 0, 'd' },
++	{ "compress", 0, 0, 'z' },
++	{ "keep", 0, 0, 'k' },
++	{ "force", 0, 0, 'f' },
++	{ "test", 0, 0, 't' },
++	{ "suffix", 1, 0, 'S' },
++	{ "quiet", 0, 0, 'q' },
++	{ "verbose", 0, 0, 'v' },
++	{ "help", 0, 0, 'h' },
++	{ "license", 0, 0, 'L' },
++	{ "version", 0, 0, 'V' },
++	{ "fast", 0, 0, '1' },
++	{ "best", 0, 0, '9' },
++	{ 0, 0, 0, 0 }
++};
++
++/* getopt option string (for the above options). */
++const char option_string[] = "cdzkftS:qvhLV123456789A:D:F:";
++
++/* Defaults. */
++PROGRAM_MODE program_mode = PM_COMPRESS;
++int	verbosity			= 0;
++bool	stdinput			= false;
++bool	stdoutput			= false;
++bool	keep				= false;
++bool	force				= false;
++int	compression_mode		= 7;
++//char	*suffix				= strdup(".lzma");
++char	*suffix				= strdup(known_extensions[0].from);
++lzma_option	advanced_options 	= { -1, -1, -1, NULL, -1, -1, -1 };
++
++void print_help(const char *const argv0)
++{
++	// Help goes to stdout while other messages go to stderr.
++	cout << "\nlzma " << PROGRAM_VERSION
++		<< " " << PROGRAM_COPYRIGHT << "\n"
++		"Based on LZMA SDK " << LZMA_SDK_VERSION_STRING << " "
++		<< LZMA_SDK_COPYRIGHT_STRING
++		<< "\n\nUsage: " << argv0
++		<< " [flags and input files in any order]\n"
++"  -c --stdout       output to standard output\n"
++"  -d --decompress   force decompression\n"
++"  -z --compress     force compression\n"
++"  -k --keep         keep (don't delete) input files\n"
++"  -f --force        force overwrite of output file and compress links\n"
++"  -t --test         test compressed file integrity\n"
++"  -S .suf  --suffix .suf   use suffix .suf on compressed files\n"
++"  -q --quiet        suppress error messages\n"
++"  -v --verbose      be verbose\n"
++"  -h --help         print this message\n"
++"  -L --license      display the license information\n"
++"  -V --version      display version numbers of LZMA SDK and lzma\n"
++"  -1 .. -2          fast compression\n"
++"  -3 .. -9          good to excellent compression. -7 is the default.\n"
++"     --fast         alias for -1\n"
++"     --best         alias for -9 (usually *not* what you want)\n\n"
++"  Memory usage depends a lot on the chosen compression mode -1 .. -9.\n"
++"  See the man page lzma(1) for details.\n\n";
++}
++
++void print_license(void)
++{
++	cout << "\n  LZMA command line tool " << PROGRAM_VERSION << " - "
++		<< PROGRAM_COPYRIGHT
++		<< "\n  LZMA SDK " << LZMA_SDK_VERSION_STRING << " - "
++		<< LZMA_SDK_COPYRIGHT_STRING
++		<< "\n  This program is a part of the LZMA utils package.\n"
++		"  http://tukaani.org/lzma/\n\n"
++"  This program is free software; you can redistribute it and/or\n"
++"  modify it under the terms of the GNU General Public License\n"
++"  as published by the Free Software Foundation; either version 2\n"
++"  of the License, or (at your option) any later version.\n"
++"\n"
++"  This program is distributed in the hope that it will be useful,\n"
++"  but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"  GNU General Public License for more details.\n"
++"\n";
++}
++
++void print_version(void)
++{
++	cout << "LZMA command line tool " << PROGRAM_VERSION << "\n"
++		<< "LZMA SDK " << LZMA_SDK_VERSION_STRING << "\n";
++}
++
++short str2int (const char *str, const int &min, const int &max)
++{
++	int value = -1;
++	char *endptr = NULL;
++	if (str == NULL || str[0] == '\0')
++		throw ArgumentException("Invalid integer option");
++	value = strtol (str, &endptr, 10);
++	if (*endptr != '\0' || value < min || value > max)
++		throw ArgumentException("Invalid integer option");
++	return value;
++}
++
++void parse_options(int argc, char **argv, stringVector &filenames)
++{
++	/* Snatched from getopt(3). */
++	int c;
++
++	/* Check how we were called */
++	{
++		char *p = strrchr (argv[0], '/'); // Remove path prefix, if any
++		if (p++ == NULL)
++			p = argv[0];
++		if (strstr (p, "un") != NULL) {
++			program_mode = PM_DECOMPRESS;
++		} else if (strstr (p, "cat") != NULL) {
++			program_mode = PM_DECOMPRESS;
++			stdoutput = true;
++		}
++	}
++
++	while (-1 != (c = getopt_long(argc, argv, option_string,
++			long_options, NULL))) {
++		switch (c) {
++			// stdout
++			case 'c':
++				stdoutput = true;
++				break;
++
++			// decompress
++			case 'd':
++				program_mode = PM_DECOMPRESS;
++				break;
++
++			// compress
++			case 'z':
++				program_mode = PM_COMPRESS;
++				break;
++
++			// keep
++			case 'k':
++				keep = true;
++				break;
++
++			// force
++			case 'f':
++				force = true;
++				break;
++
++			// test
++			case 't':
++				program_mode = PM_TEST;
++				break;
++
++			// suffix
++			case 'S':
++				if (optarg) {
++					free(suffix);
++					suffix = strdup(optarg);
++				}
++				break;
++
++			// quiet
++			case 'q':
++				verbosity = 0;
++				break;
++
++			// verbose
++			case 'v':
++				verbosity++;
++				break;
++
++			// help
++			case 'h':
++				program_mode = PM_HELP;
++				break;
++
++			// license
++			case 'L':
++				program_mode = PM_LICENSE;
++				break;
++
++			// version
++			case 'V':
++				program_mode = PM_VERSION;
++				break;
++
++			case '1': case '2': case '3': case '4': case '5':
++			case '6': case '7': case '8': case '9':
++				compression_mode = c - '0';
++				break;
++
++			// Advanced options //
++			// Compression mode
++			case 'A':
++				advanced_options.compression_mode =
++						str2int (optarg, 0, 2);
++				break;
++
++			// Dictionary size
++			case 'D':
++				advanced_options.dictionary =
++						str2int (optarg, 0, 28);
++				break;
++
++			// Fast bytes
++			case 'F':
++				advanced_options.fast_bytes =
++						str2int (optarg, 0, 273);
++				break;
++
++			default:
++				throw ArgumentException("");
++				break;
++		} // switch(c)
++	} // while(1)
++
++	for (int i = optind; i < argc; i++) {
++		if (strcmp("-", argv[i]) == 0)
++			continue;
++		filenames.push_back(argv[i]);
++	}
++} // parse_options
++
++void set_encoder_properties(NCompress::NLzma::CEncoder *encoder,
++		lzma_option &opt)
++{
++	/* Almost verbatim from LzmaAlone.cpp. */
++	    PROPID propIDs[] =
++	{
++		NCoderPropID::kDictionarySize,
++		NCoderPropID::kPosStateBits,
++		NCoderPropID::kLitContextBits,
++		NCoderPropID::kLitPosBits,
++		NCoderPropID::kAlgorithm,
++		NCoderPropID::kNumFastBytes,
++		NCoderPropID::kMatchFinder,
++		NCoderPropID::kEndMarker
++	};
++	const int kNumProps = sizeof(propIDs) / sizeof(propIDs[0]);
++#define VALUE(x) (advanced_options.x >= 0 ? advanced_options.x : opt.x)
++	PROPVARIANT properties[kNumProps];
++	for (int p = 0; p < 6; p++)
++		properties[p].vt = VT_UI4;
++	properties[0].ulVal = UInt32(1 << VALUE (dictionary));
++	properties[1].ulVal = UInt32(VALUE (pos_bits));
++	properties[2].ulVal = UInt32(VALUE (literal_context_bits));
++	properties[3].ulVal = UInt32(VALUE (literal_pos_bits));
++	properties[4].ulVal = UInt32(VALUE (compression_mode));
++	properties[5].ulVal = UInt32(VALUE (fast_bytes));
++#undef VALUE
++
++	properties[6].vt = VT_BSTR;
++	properties[6].bstrVal = (BSTR)opt.match_finder;
++
++	properties[7].vt = VT_BOOL;
++	properties[7].boolVal = stdinput ? VARIANT_TRUE : VARIANT_FALSE;
++
++	if (encoder->SetCoderProperties(propIDs, properties, kNumProps) != S_OK)
++		throw Exception("SetCoderProperties() error");
++}
++
++void encode(NCompress::NLzma::CEncoder *encoderSpec,
++		CMyComPtr<ISequentialInStream> inStream,
++		CMyComPtr<ISequentialOutStream> outStream,
++		lzma_option encoder_options,
++		UInt64 fileSize)
++{
++	set_encoder_properties(encoderSpec, encoder_options);
++
++	encoderSpec->WriteCoderProperties(outStream);
++
++	for (int i = 0; i < 8; i++)
++	{
++		Byte b = Byte(fileSize >> (8 * i));
++		if (outStream->Write(&b, sizeof(b), 0) != S_OK)
++			throw Exception("Write error while encoding");
++	}
++
++	HRESULT result = encoderSpec->Code(inStream, outStream, 0, 0, 0);
++
++	if (result == E_OUTOFMEMORY)
++		throw Exception("Cannot allocate memory");
++	else if (result != S_OK) {
++		char buffer[33];
++		snprintf(buffer, 33, "%d", (unsigned int)result);
++		throw Exception(string("Encoder error: ") + buffer);
++	}
++}
++
++void decode(NCompress::NLzma::CDecoder *decoderSpec,
++		CMyComPtr<ISequentialInStream> inStream,
++		CMyComPtr<ISequentialOutStream> outStream)
++{
++	const UInt32 kPropertiesSize = 5;
++	Byte properties[kPropertiesSize];
++	UInt32 processedSize;
++	UInt64 fileSize = 0;
++
++	if (inStream->Read(properties, kPropertiesSize, &processedSize) != S_OK)
++		throw Exception("Read error");
++	if (processedSize != kPropertiesSize)
++		throw Exception("Read error");
++	if (decoderSpec->SetDecoderProperties2(properties, kPropertiesSize) != S_OK)
++		throw Exception("SetDecoderProperties() error");
++
++	for (int i = 0; i < 8; i++)
++	{
++		Byte b;
++
++		if (inStream->Read(&b, sizeof(b), &processedSize) != S_OK)
++			throw Exception("Read error");
++		if (processedSize != 1)
++			throw Exception("Read error");
++
++		fileSize |= ((UInt64)b) << (8 * i);
++	}
++
++	if (decoderSpec->Code(inStream, outStream, 0, &fileSize, 0) != S_OK)
++		throw Exception("Decoder error");
++}
++
++int open_instream(const string infile,
++		CMyComPtr<ISequentialInStream> &inStream,
++		UInt64 &fileSize)
++{
++	CInFileStream *inStreamSpec = new CInFileStream;
++	inStream = inStreamSpec;
++	if (!inStreamSpec->Open(infile.c_str()))
++		throw Exception("Cannot open input file " + infile);
++
++	inStreamSpec->File.GetLength(fileSize);
++
++	return inStreamSpec->File.GetHandle();
++}
++
++int open_outstream(const string outfile,
++		CMyComPtr<ISequentialOutStream> &outStream)
++{
++	COutFileStream *outStreamSpec = new COutFileStream;
++	outStream = outStreamSpec;
++
++	bool open_by_force = (program_mode == PM_TEST) | force;
++
++	if (!outStreamSpec->Create(outfile.c_str(), open_by_force))
++		throw Exception("Cannot open output file " + outfile);
++
++	return outStreamSpec->File.GetHandle();
++}
++
++double get_ratio(int inhandle, int outhandle)
++{
++	struct stat in_stats, out_stats;
++	fstat(inhandle, &in_stats);
++	fstat(outhandle, &out_stats);
++
++	return (double)out_stats.st_size / (double)in_stats.st_size;
++}
++
++mode_t get_file_mode(string filename)
++{
++	struct stat in_stat;
++	lstat(filename.c_str(), &in_stat);
++
++	return in_stat.st_mode;
++}
++
++bool string_ends_with(string str, string ending)
++{
++	return equal(ending.rbegin(), ending.rend(), str.rbegin());
++}
++
++bool extension_is_known(string filename)
++{
++	bool known_format = false;
++	extension_pair extension; int i = 1;
++
++	extension = known_extensions[0];
++	while (extension.from != NULL) {
++		if (string_ends_with(filename, extension.from)) {
++			known_format = true;
++			break;
++		}
++		extension = known_extensions[i];
++		i++;
++	}
++
++	if (!known_format) {
++		if (!string_ends_with(filename, suffix)) {
++			return false;
++		}
++	}
++
++	return true;
++}
++
++string replace_extension(string filename)
++{
++	int suffix_starts_at = filename.length() - strlen (suffix);
++	string from_suffix = filename.substr(suffix_starts_at, strlen (suffix));
++	string ret = filename.substr(0, suffix_starts_at);
++	extension_pair extension; int i = 1;
++
++	bool found_replacement = false;
++	extension = known_extensions[0];
++	while (extension.from != NULL) {
++		if (from_suffix.compare(extension.from) == 0) {
++			ret += extension.to;
++			found_replacement = true;
++			break;
++		}
++
++		extension = known_extensions[i];
++		i++;
++	}
++
++	return ret;
++}
++
++string pretty_print_status(string filename, string output_filename,
++		string ratio)
++{
++	string ret = "";
++
++	ret += filename;
++	ret += ":\t ";
++
++	if (program_mode == PM_TEST) {
++		ret += "decoded succesfully";
++
++		return ret;
++	}
++
++	if (!stdinput && !stdoutput) {
++		ret += ratio;
++		ret += " -- ";
++	}
++
++	if (program_mode == PM_COMPRESS) {
++		if (keep) {
++			ret += "encoded succesfully";
++
++			return ret;
++		}
++
++		ret += "replaced with ";
++		ret += output_filename;
++
++		return ret;
++	}
++
++	if (program_mode == PM_DECOMPRESS) {
++		if (keep) {
++			ret += "decoded succesfully";
++
++			return ret;
++		}
++
++		ret += "replaced with ";
++		ret += output_filename;
++
++		return ret;
++	}
++
++	return ret;
++}
++
++static string archive_name; // I know, it is crude, but I haven't found any other
++    // way then making a global variable to transfer filename to handler
++
++void signal_handler (int signum)
++{
++    unlink (archive_name.c_str()); // deleting
++    signal (signum, SIG_DFL); // we return the default function to used signal
++    kill (getpid(), signum); // and then send this signal to the process again
++}
++
++} // namespace lzma
++
++
++int main(int argc, char **argv)
++{
++	using namespace lzma;
++	using std::cerr;
++
++	stringVector filenames;
++
++	signal (SIGTERM,signal_handler);
++	signal (SIGHUP,signal_handler);
++	signal (SIGINT,signal_handler);
++
++	try {
++		parse_options(argc, argv, filenames);
++	}
++	catch (...) {
++		return STATUS_ERROR;
++	}
++
++	if (program_mode == PM_HELP) {
++		print_help(argv[0]);
++		return STATUS_OK;
++	}
++	else if (program_mode == PM_LICENSE) {
++		print_license();
++		return STATUS_OK;
++	}
++	else if (program_mode == PM_VERSION) {
++		print_version();
++		return STATUS_OK;
++	}
++
++	if (filenames.empty()) {
++		stdinput = true;
++		stdoutput = true;
++
++		/* FIXME: get rid of this */
++		filenames.push_back("-");
++	}
++
++	/* Protection: always create new files with 0600 in order to prevent
++	 * outsiders from reading incomplete data. */
++	umask(0077);
++
++	bool warning = false;
++
++	for (int i = 0; i < filenames.size(); i++) {
++		CMyComPtr<ISequentialInStream> inStream;
++		CMyComPtr<ISequentialOutStream> outStream;
++		UInt64 fileSize = 0;
++		int inhandle = 0, outhandle = 0;
++		string output_filename;
++
++		if (stdinput) {
++			inStream = new CStdInFileStream;
++			MY_SET_BINARY_MODE(stdin);
++			fileSize = (UInt64)(Int64)-1;
++
++			inhandle = STDIN_FILENO;
++
++			outStream = new CStdOutFileStream;
++			MY_SET_BINARY_MODE(stdout);
++
++			outhandle = STDOUT_FILENO;
++		}
++		else {
++			mode_t infile_mode = get_file_mode(filenames[i]);
++			if (!S_ISREG(infile_mode)) {
++				if (S_ISDIR(infile_mode)) {
++					warning = true;
++					cerr << argv[0] << ": " << filenames[i] << ": "
++						<< "cowardly refusing to work on directory"
++						<< endl;
++
++					continue;
++				}
++				else if (S_ISLNK(infile_mode)) {
++					if (!stdoutput && !force) {
++						warning = true;
++
++					cerr << argv[0] << ": " << filenames[i] << ": "
++							<< "cowardly refusing to work on symbolic link "
++							<< "(use --force to force encoding or decoding)"
++							<< endl;
++
++						continue;
++					}
++				}
++				else {
++					warning = true;
++
++					cerr << argv[0] << ": " << filenames[i] << ": "
++						<< "doesn't exist or is not a regular file"
++						<< endl;
++
++					continue;
++				}
++			}
++
++			// Test if the file already ends with *suffix.
++			if (program_mode == PM_COMPRESS && !force
++					&& string_ends_with(filenames[i],
++						suffix)) {
++				warning = true;
++
++				cerr << filenames[i] << " already has "
++					<< suffix << " suffix -- unchanged\n";
++
++				continue;
++			}
++
++			// Test if the file extension is known.
++			if (program_mode == PM_DECOMPRESS
++					&& !extension_is_known(filenames[i])) {
++				warning = true;
++
++				cerr << filenames[i] << ": "
++					<< " unknown suffix -- unchanged"
++					<< endl;
++
++				continue;
++			}
++
++			try {
++				inhandle = open_instream(filenames[i], inStream, fileSize);
++			}
++			catch (Exception e) {
++				cerr << argv[0] << ": " << e.what() << endl;
++				return STATUS_ERROR;
++			}
++
++			if (stdoutput) {
++				outStream = new CStdOutFileStream;
++				MY_SET_BINARY_MODE(stdout);
++
++				outhandle = STDOUT_FILENO;
++			}
++			else {
++				/* Testing mode is nothing else but decoding
++				 * and throwing away the result. */
++				if (program_mode == PM_TEST)
++					output_filename = "/dev/null";
++				else if (program_mode == PM_DECOMPRESS)
++					output_filename = replace_extension(filenames[i]);
++				else
++					output_filename = filenames[i]
++							+ suffix;
++				archive_name = output_filename;
++
++				try {
++					outhandle = open_outstream(output_filename, outStream);
++				}
++				catch (Exception e) {
++					cerr << argv[0] << ": " << e.what() << endl;
++					return STATUS_ERROR;
++				}
++			}
++
++		}
++
++		// Unless --force is specified, do not read/write compressed
++		// data from/to a terminal.
++		if (!force) {
++			if (program_mode == PM_COMPRESS && isatty(outhandle)) {
++				cerr << argv[0] << ": compressed data not "
++					"written to a terminal. Use "
++					"-f to force compression.\n"
++					<< argv[0] << ": For help, type: "
++					<< argv[0] << " -h\n";
++				return STATUS_ERROR;
++			} else if (program_mode == PM_DECOMPRESS
++					&& isatty(inhandle)) {
++				cerr << argv[0] << ": compressed data not "
++					"read from a terminal. Use "
++					"-f to force decompression.\n"
++					<< argv[0] << ": For help, type: "
++					<< argv[0] << " -h\n";
++				return STATUS_ERROR;
++			}
++		}
++
++		if (program_mode == PM_COMPRESS) {
++			    NCompress::NLzma::CEncoder *encoderSpec =
++				      new NCompress::NLzma::CEncoder;
++
++			lzma_option options = option_mapping[compression_mode];
++
++			try {
++				encode(encoderSpec, inStream, outStream, options, fileSize);
++			}
++			catch (Exception e) {
++				cerr << argv[0] << ": " << e.what() << endl;
++				unlink(output_filename.c_str());
++				delete(encoderSpec);
++
++				return STATUS_ERROR;
++			}
++
++			delete(encoderSpec);
++		}
++		else {			// PM_DECOMPRESS | PM_TEST
++		    NCompress::NLzma::CDecoder *decoderSpec =
++		        new NCompress::NLzma::CDecoder;
++
++			try {
++				decode(decoderSpec, inStream, outStream);
++			}
++			catch (Exception e) {
++				cerr << argv[0] << ": " << e.what() << endl;
++				unlink(output_filename.c_str());
++				delete(decoderSpec);
++
++				return STATUS_ERROR;
++			}
++
++			delete(decoderSpec);
++		}
++
++		/* Set permissions and owners. */
++		if ( (program_mode == PM_COMPRESS || program_mode == PM_DECOMPRESS )
++				&& (!stdinput && !stdoutput) ) {
++
++			int ret = 0;
++			struct stat file_stats;
++			ret = fstat(inhandle, &file_stats);
++
++			ret = fchmod(outhandle, file_stats.st_mode);
++			ret = fchown(outhandle, file_stats.st_uid, file_stats.st_gid);
++			// We need to call fchmod() again, since otherwise the SUID bits
++			// are lost.
++			ret = fchmod(outhandle, file_stats.st_mode);
++
++			struct timeval file_times[2];
++			// Access time
++			file_times[0].tv_sec = file_stats.st_atime;
++			file_times[0].tv_usec = 0;
++			// Modification time
++			file_times[1].tv_sec = file_stats.st_mtime;
++			file_times[1].tv_usec = 0;
++
++			ret = futimes(outhandle, file_times);
++
++			if (!keep)
++				unlink(filenames[i].c_str());
++		}
++
++		if (verbosity > 0) {
++			if (stdoutput) {
++				cerr << filenames[i] << ":\t ";
++				cerr << "decoded succesfully"
++					<< endl;
++			}
++
++			else {
++				char buf[10] = { 0 };
++
++				if (program_mode == PM_DECOMPRESS)
++					snprintf(buf, 10, "%.2f%%",
++							(1 - get_ratio(outhandle, inhandle)) * 100);
++				if (program_mode == PM_COMPRESS)
++					snprintf(buf, 10, "%.2f%%",
++							(1 - get_ratio(inhandle, outhandle)) * 100);
++
++				string ratio = buf;
++				cerr << pretty_print_status(filenames[i], output_filename,
++						ratio)
++					<< endl;
++			}
++		}
++	}
++
++	if (warning)
++		return STATUS_WARNING;
++
++	return STATUS_OK;
++}
++
+Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/Exception.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/Exception.h	2009-06-01 22:01:10.000000000 +0200
+@@ -0,0 +1,45 @@
++/* A couple of exceptions for lzmp.
++ *
++ * Copyright (C) 2005 Ville Koskinen
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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.
++ */
++
++#ifndef _EXCEPTION_H_
++#define _EXCEPTION_H_
++
++#include <string>
++using std::string;
++
++class Exception
++{
++private:
++	string message;
++public:
++	Exception(char *what): message(what) { }
++	Exception(string what): message(what) { }
++
++	~Exception() { }
++
++	string what(void) { return message; }
++};
++
++class ArgumentException: public Exception
++{
++public:
++	ArgumentException(char *what): Exception(what) { }
++	ArgumentException(string what): Exception(what) { }
++
++	~ArgumentException() { }
++};
++
++#endif
++
+Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
+===================================================================
+--- lzma-4.65.orig/CPP/7zip/Compress/LZMA_Alone/makefile.gcc	2009-06-01 22:00:54.000000000 +0200
++++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc	2009-06-01 22:06:13.000000000 +0200
+@@ -1,9 +1,10 @@
+-PROG = lzma
++PROG = lzma_alone
++PROG2 = lzma
+ CXX = g++ -O2 -Wall
+ CXX_C = gcc -O2 -Wall
+ LIB = -lm
+ RM = rm -f
+-CFLAGS = -c -D_FILE_OFFSET_BITS=64
++CFLAGS = -c -I ../../../ -D_FILE_OFFSET_BITS=64 -DPACKAGE_VERSION="\"4.32.0beta3\""
+ 
+ ifdef SystemDrive
+ IS_MINGW = 1
+@@ -45,12 +46,35 @@
+   Lzma86Dec.o \
+   Lzma86Enc.o \
+ 
++OBJS2 = \
++	C_FileIO.o \
++	CRC.o \
++	Alloc.o \
++	FileStreams.o \
++	StreamUtils.o \
++	InBuffer.o \
++	OutBuffer.o \
++	LzmaDecoder.o \
++	StringConvert.o \
++	StringToInt.o \
++	LzmaEncoder.o \
++	LzmaDec.o \
++	LzmaEnc.o \
++	LzFind.o \
++	7zCrc.o \
++	lzmp.o
+ 
+-all: $(PROG)
++all: $(PROG) $(PROG2)
+ 
+ $(PROG): $(OBJS)
+ 	$(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2)
+ 
++$(PROG2): $(OBJS2)
++	$(CXX) -o $(PROG2) $(LDFLAGS) $(OBJS2) $(LIB)
++
++lzmp.o: lzmp.cpp
++	$(CXX) $(CFLAGS) lzmp.cpp
++
+ LzmaAlone.o: LzmaAlone.cpp
+ 	$(CXX) $(CFLAGS) LzmaAlone.cpp
+ 
+@@ -131,5 +153,5 @@
+ 	$(CXX_C) $(CFLAGS) ../../../../C/LzmaUtil/Lzma86Enc.c
+ 
+ clean:
+-	-$(RM) $(PROG) $(OBJS)
++	-$(RM) $(PROG) $(PROG2) $(OBJS)
+ 
+Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzma_version.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzma_version.h	2009-06-01 22:01:10.000000000 +0200
+@@ -0,0 +1,31 @@
++#ifndef LZMA_VERSION_H
++#define LZMA_VERSION_H
++
++/*
++    Version and copyright information used by LZMA utils.
++*/
++
++static const char *LZMA_SDK_VERSION_STRING = "4.43";
++
++static const char *LZMA_SDK_COPYRIGHT_STRING =
++		"Copyright (C) 1999-2006 Igor Pavlov";
++
++static const char *LZMA_SDK_COPYRIGHT_INFO =
++		"  See http://7-zip.org/sdk.html or the documentation of LZMA SDK for\n"
++		"  the license. For reference, the version 4.43 is free software\n"
++		"  licensed under the GNU LGPL.";
++
++
++static const char *LZMA_UTILS_VERSION_STRING = PACKAGE_VERSION;
++
++static const char *LZMA_UTILS_COPYRIGHT_STRING =
++		"Copyright (C) 2006 Lasse Collin";
++
++static const char *LZMA_UTILS_COPYRIGHT_INFO =
++		"This program comes with ABSOLUTELY NO WARRANTY.\n"
++		"You may redistribute copies of this program\n"
++		"under the terms of the GNU General Public License.\n"
++		"For more information about these matters, see the file "
++		"named COPYING.\n";
++
++#endif /* ifndef LZMA_VERSION_H */
+Index: lzma-4.65/CPP/Common/C_FileIO.h
+===================================================================
+--- lzma-4.65.orig/CPP/Common/C_FileIO.h	2009-05-15 23:33:51.000000000 +0200
++++ lzma-4.65/CPP/Common/C_FileIO.h	2009-06-01 22:06:56.000000000 +0200
+@@ -24,6 +24,7 @@
+   bool Close();
+   bool GetLength(UInt64 &length) const;
+   off_t Seek(off_t distanceToMove, int moveMethod) const;
++  int GetHandle() const { return _handle; }
+ };
+ 
+ class CInFile: public CFileBase
diff --git a/trunk/tools/lzma/patches/003-compile_fixes.patch b/trunk/tools/lzma/patches/003-compile_fixes.patch
new file mode 100644
index 00000000..49ae66b9
--- /dev/null
+++ b/trunk/tools/lzma/patches/003-compile_fixes.patch
@@ -0,0 +1,26 @@
+diff -urN lzma-4.65/CPP/7zip/Common/FileStreams.h lzma-4.65.new/CPP/7zip/Common/FileStreams.h
+--- lzma-4.65/CPP/7zip/Common/FileStreams.h	2009-05-15 23:33:51.000000000 +0200
++++ lzma-4.65.new/CPP/7zip/Common/FileStreams.h	2009-06-01 22:30:01.000000000 +0200
+@@ -72,6 +72,7 @@
+   public IOutStream,
+   public CMyUnknownImp
+ {
++public:
+   #ifdef USE_WIN_FILE
+   NWindows::NFile::NIO::COutFile File;
+   #else
+diff -urN lzma-4.65/CPP/Common/MyWindows.h lzma-4.65.new/CPP/Common/MyWindows.h
+--- lzma-4.65/CPP/Common/MyWindows.h	2009-05-15 23:33:51.000000000 +0200
++++ lzma-4.65.new/CPP/Common/MyWindows.h	2009-06-01 22:29:26.000000000 +0200
+@@ -101,8 +101,11 @@
+ 
+ #ifdef __cplusplus
+ 
++#ifndef INITGUID
++#define INITGUID
+ DEFINE_GUID(IID_IUnknown,
+ 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
++#endif
+ struct IUnknown
+ {
+   STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE;
diff --git a/trunk/tools/lzma/patches/100-static_library.patch b/trunk/tools/lzma/patches/100-static_library.patch
new file mode 100644
index 00000000..15ab4e05
--- /dev/null
+++ b/trunk/tools/lzma/patches/100-static_library.patch
@@ -0,0 +1,70 @@
+--- a/C/LzmaUtil/makefile.gcc
++++ b/C/LzmaUtil/makefile.gcc
+@@ -1,44 +1,53 @@
+ PROG = lzma
+-CXX = g++
+-LIB =
++CC = gcc
++LIB = liblzma.a
+ RM = rm -f
+ CFLAGS = -c -O2 -Wall
++AR = ar
++RANLIB = ranlib
+ 
+ OBJS = \
+-  LzmaUtil.o \
+   Alloc.o \
+   LzFind.o \
+   LzmaDec.o \
+   LzmaEnc.o \
++  LzmaLib.o \
+   7zFile.o \
+   7zStream.o \
+ 
+-
+ all: $(PROG)
+ 
+-$(PROG): $(OBJS)
+-	$(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2)
++$(PROG): LzmaUtil.o $(LIB)
++	$(CC) -o $(PROG) $(LDFLAGS) $< $(LIB)
+ 
+ LzmaUtil.o: LzmaUtil.c
+-	$(CXX) $(CFLAGS) LzmaUtil.c
++	$(CC) $(CFLAGS) LzmaUtil.c
++
++$(LIB): $(OBJS)
++	rm -f $@
++	$(AR) rcu $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ Alloc.o: ../Alloc.c
+-	$(CXX) $(CFLAGS) ../Alloc.c
++	$(CC) $(CFLAGS) ../Alloc.c
+ 
+ LzFind.o: ../LzFind.c
+-	$(CXX) $(CFLAGS) ../LzFind.c
++	$(CC) $(CFLAGS) ../LzFind.c
+ 
+ LzmaDec.o: ../LzmaDec.c
+-	$(CXX) $(CFLAGS) ../LzmaDec.c
++	$(CC) $(CFLAGS) ../LzmaDec.c
+ 
+ LzmaEnc.o: ../LzmaEnc.c
+-	$(CXX) $(CFLAGS) ../LzmaEnc.c
++	$(CC) $(CFLAGS) ../LzmaEnc.c
++
++LzmaLib.o: ../LzmaLib.c
++	$(CC) $(CFLAGS) ../LzmaLib.c
+ 
+ 7zFile.o: ../7zFile.c
+-	$(CXX) $(CFLAGS) ../7zFile.c
++	$(CC) $(CFLAGS) ../7zFile.c
+ 
+ 7zStream.o: ../7zStream.c
+-	$(CXX) $(CFLAGS) ../7zStream.c
++	$(CC) $(CFLAGS) ../7zStream.c
+ 
+ clean:
+-	-$(RM) $(PROG) $(OBJS)
++	-$(RM) $(PROG) *.o *.a
diff --git a/trunk/tools/m4/Makefile b/trunk/tools/m4/Makefile
new file mode 100644
index 00000000..71498b49
--- /dev/null
+++ b/trunk/tools/m4/Makefile
@@ -0,0 +1,30 @@
+# 
+# Copyright (C) 2008-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=m4
+PKG_VERSION:=1.4.17
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_MD5SUM:=12a3c829301a4fd6586a57d3fcf196dc
+PKG_CAT:=xzcat
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no
+
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/m4/patches/100-fix-gets-removal.patch b/trunk/tools/m4/patches/100-fix-gets-removal.patch
new file mode 100644
index 00000000..ecd110d9
--- /dev/null
+++ b/trunk/tools/m4/patches/100-fix-gets-removal.patch
@@ -0,0 +1,17 @@
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -714,14 +714,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning; besides, C11
+-   removed it.  */
+-#undef gets
+-#if HAVE_RAW_DECL_GETS
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-#endif
+-
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
+ struct obstack;
diff --git a/trunk/tools/missing-macros/Makefile b/trunk/tools/missing-macros/Makefile
new file mode 100644
index 00000000..ab50a674
--- /dev/null
+++ b/trunk/tools/missing-macros/Makefile
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2010-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=missing-macros
+PKG_VERSION:=10
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Configure
+endef
+
+define Host/Compile
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
+	$(INSTALL_DATA) ./src/m4/*.m4 $(STAGING_DIR_HOST)/share/aclocal/
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/missing-macros/src/README b/trunk/tools/missing-macros/src/README
new file mode 100644
index 00000000..796f2038
--- /dev/null
+++ b/trunk/tools/missing-macros/src/README
@@ -0,0 +1,100 @@
+The m4/ directory below contains various m4 macros used
+by different packages in the libreCMC feed.
+
+
+From GNU gettext:
+Library linking and rpath helper macros.
+
+  lib-ld.m4
+  lib-link.m4
+  lib-prefix.m4
+
+Integer data type test macros.
+
+  intmax.m4
+  wint_t.m4
+  inttypes-pri.m4
+  uintmax_t.m4
+  stdint_h.m4
+  intdiv0.m4
+  inttypes_h.m4
+
+Program test macro.
+
+  progtest.m4
+
+GNU libc version test macros.
+
+  glibc2.m4
+  glibc21.m4
+
+
+From UCL and LZO:
+Compiler ACC conformance testing macros.
+
+  mfx_acc.m4
+  mfx_cppflags.m4
+  mfx_limits.m4
+
+
+From OSSP-JS:
+Test macros for va_copy() implementations.
+
+  va_copy.m4
+
+
+From libmikmod:
+Feature test macros for the Enlightment Sound Daemon.
+
+  esd.m4
+
+
+From libdnet:
+Feature test macros for socket api implementations.
+
+  dnet.m4
+
+
+From FLAC:
+XMMS feature detection macros.
+
+  xmms.m4
+
+
+From ao:
+Directory expansion macro for Automake.
+
+  as-ac-expand.m4
+
+
+From tinyproxy:
+Autostars m4 macro for detection of compiler flags.
+
+  as-compiler-flags.m4
+
+
+From morituri:
+Autostars m4 macro for versioning.
+
+  as-version.m4
+
+
+From liboil:
+Check if unaligned memory access works correctly.
+
+  as-unaligned-access.m4
+
+
+From libreCMC:
+Always disable GTK docs.
+
+  fake-gtk-doc-check.m4
+
+Provide intltool.m4 stubs to allow for autoreconf.
+
+  fake-intltool.m4
+
+From XDM:
+XAW macros.
+
+  xaw.m4
diff --git a/trunk/tools/missing-macros/src/m4/as-ac-expand.m4 b/trunk/tools/missing-macros/src/m4/as-ac-expand.m4
new file mode 100644
index 00000000..d6c9e330
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/as-ac-expand.m4
@@ -0,0 +1,43 @@
+dnl as-ac-expand.m4 0.2.0
+dnl autostars m4 macro for expanding directories using configure's prefix
+dnl thomas@apestaart.org
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
diff --git a/trunk/tools/missing-macros/src/m4/as-compiler-flag.m4 b/trunk/tools/missing-macros/src/m4/as-compiler-flag.m4
new file mode 100644
index 00000000..0f660cf0
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/as-compiler-flag.m4
@@ -0,0 +1,62 @@
+dnl as-compiler-flag.m4 0.1.0
+
+dnl autostars m4 macro for detection of compiler flags
+
+dnl David Schleef <ds@schleef.org>
+
+dnl $Id: as-compiler-flag.m4,v 1.1 2005/12/15 23:35:19 ds Exp $
+
+dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
+dnl Tries to compile with the given CFLAGS.
+dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
+dnl and ACTION-IF-NOT-ACCEPTED otherwise.
+
+AC_DEFUN([AS_COMPILER_FLAG],
+[
+  AC_MSG_CHECKING([to see if compiler understands $1])
+
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+
+  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+  CFLAGS="$save_CFLAGS"
+
+  if test "X$flag_ok" = Xyes ; then
+    m4_ifvaln([$2],[$2])
+    true
+  else
+    m4_ifvaln([$3],[$3])
+    true
+  fi
+  AC_MSG_RESULT([$flag_ok])
+])
+
+dnl AS_COMPILER_FLAGS(VAR, FLAGS)
+dnl Tries to compile with the given CFLAGS.
+
+AC_DEFUN([AS_COMPILER_FLAGS],
+[
+  list=$2
+  flags_supported=""
+  flags_unsupported=""
+  AC_MSG_CHECKING([for supported compiler flags])
+  for each in $list
+  do
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $each"
+    AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+    CFLAGS="$save_CFLAGS"
+
+    if test "X$flag_ok" = Xyes ; then
+      flags_supported="$flags_supported $each"
+    else
+      flags_unsupported="$flags_unsupported $each"
+    fi
+  done
+  AC_MSG_RESULT([$flags_supported])
+  if test "X$flags_unsupported" != X ; then
+    AC_MSG_WARN([unsupported compiler flags: $flags_unsupported])
+  fi
+  $1="$$1 $flags_supported"
+])
+
diff --git a/trunk/tools/missing-macros/src/m4/as-unaligned-access.m4 b/trunk/tools/missing-macros/src/m4/as-unaligned-access.m4
new file mode 100644
index 00000000..ede8bd2a
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/as-unaligned-access.m4
@@ -0,0 +1,41 @@
+dnl AS_UNALIGNED_ACCESS
+
+dnl check if unaligned memory access works correctly
+AC_DEFUN([AS_UNALIGNED_ACCESS], [
+  AC_MSG_CHECKING([if unaligned memory access works correctly])
+  if test x"$as_cv_unaligned_access" = x ; then
+    case $host in
+      alpha*|arm*|hp*|mips*|sh*|sparc*|ia64*)
+        _AS_ECHO_N([(blacklisted) ])
+        as_cv_unaligned_access=no
+	;;
+      i?86*|x86_64|amd64|powerpc*|m68k*|cris*)
+        _AS_ECHO_N([(whitelisted) ])
+        as_cv_unaligned_access=yes
+	;;
+    esac
+  else
+    _AS_ECHO_N([(cached) ])
+  fi
+  if test x"$as_cv_unaligned_access" = x ; then
+    AC_TRY_RUN([
+int main(int argc, char **argv)
+{
+  char array[] = "ABCDEFGH";
+  unsigned int iarray[2];
+  memcpy(iarray,array,8);
+#define GET(x) (*(unsigned int *)((char *)iarray + (x)))
+  if(GET(0) != 0x41424344 && GET(0) != 0x44434241) return 1;
+  if(GET(1) != 0x42434445 && GET(1) != 0x45444342) return 1;
+  if(GET(2) != 0x43444546 && GET(2) != 0x46454443) return 1;
+  if(GET(3) != 0x44454647 && GET(3) != 0x47464544) return 1;
+  return 0;
+}
+    ], as_cv_unaligned_access="yes", as_cv_unaligned_access="no")
+  fi
+  AC_MSG_RESULT($as_cv_unaligned_access)
+  if test "$as_cv_unaligned_access" = "yes"; then
+    AC_DEFINE_UNQUOTED(HAVE_UNALIGNED_ACCESS, 1,
+      [defined if unaligned memory access works correctly])
+  fi
+])
diff --git a/trunk/tools/missing-macros/src/m4/as-version.m4 b/trunk/tools/missing-macros/src/m4/as-version.m4
new file mode 100644
index 00000000..a5b43990
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/as-version.m4
@@ -0,0 +1,71 @@
+dnl as-version.m4 0.2.0
+
+dnl autostars m4 macro for versioning
+
+dnl Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl $Id: as-version.m4,v 1.4 2004/06/01 09:40:05 thomasvs Exp $
+
+dnl AS_VERSION
+
+dnl example
+dnl AS_VERSION
+
+dnl this macro
+dnl - AC_SUBST's PACKAGE_VERSION_MAJOR, _MINOR, _MICRO
+dnl - AC_SUBST's PACKAGE_VERSION_RELEASE,
+dnl    which can be used for rpm release fields
+dnl - doesn't call AM_INIT_AUTOMAKE anymore because it prevents
+dnl   maintainer mode from running correctly
+dnl
+dnl don't forget to put #undef PACKAGE_VERSION_RELEASE in acconfig.h
+dnl if you use acconfig.h
+
+AC_DEFUN([AS_VERSION],
+[
+  PACKAGE_VERSION_MAJOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f1)
+  PACKAGE_VERSION_MINOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f2)
+  PACKAGE_VERSION_MICRO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f3)
+
+  AC_SUBST(PACKAGE_VERSION_MAJOR)
+  AC_SUBST(PACKAGE_VERSION_MINOR)
+  AC_SUBST(PACKAGE_VERSION_MICRO)
+])
+
+dnl AS_NANO(ACTION-IF-NO-NANO, [ACTION-IF-NANO])
+
+dnl requires AC_INIT to be called before
+dnl For projects using a fourth or nano number in your versioning to indicate
+dnl development or prerelease snapshots, this macro allows the build to be
+dnl set up differently accordingly.
+
+dnl this macro:
+dnl - parses AC_PACKAGE_VERSION, set by AC_INIT, and extracts the nano number
+dnl - sets the variable PACKAGE_VERSION_NANO
+dnl - sets the variable PACKAGE_VERSION_RELEASE, which can be used
+dnl   for rpm release fields
+dnl - executes ACTION-IF-NO-NANO or ACTION-IF-NANO
+    
+dnl example:
+dnl AS_NANO(RELEASE="yes", RELEASE="no")
+
+AC_DEFUN([AS_NANO],
+[
+  AC_MSG_CHECKING(nano version)
+
+  NANO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f4)
+
+  if test x"$NANO" = x || test "x$NANO" = "x0" ; then
+    AC_MSG_RESULT([0 (release)])
+    NANO=0
+    PACKAGE_VERSION_RELEASE=1
+    ifelse([$1], , :, [$1])
+  else
+    AC_MSG_RESULT($NANO)
+    PACKAGE_VERSION_RELEASE=0.`date +%Y%m%d.%H%M%S`
+    ifelse([$2], , :, [$2])
+  fi
+  PACKAGE_VERSION_NANO=$NANO
+  AC_SUBST(PACKAGE_VERSION_NANO)
+  AC_SUBST(PACKAGE_VERSION_RELEASE)
+])
diff --git a/trunk/tools/missing-macros/src/m4/dnet.m4 b/trunk/tools/missing-macros/src/m4/dnet.m4
new file mode 100644
index 00000000..b57ead2c
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/dnet.m4
@@ -0,0 +1,322 @@
+# dnet.m4 serial 1 (libdnet-1.11)
+
+dnl
+dnl Check for 4.4 BSD sa_len member in sockaddr struct
+dnl
+dnl usage:	AC_DNET_SOCKADDR_SA_LEN
+dnl results:	HAVE_SOCKADDR_SA_LEN (defined)
+dnl
+AC_DEFUN([AC_DNET_SOCKADDR_SA_LEN],
+    [AC_MSG_CHECKING(for sa_len in sockaddr struct)
+    AC_CACHE_VAL(ac_cv_dnet_sockaddr_has_sa_len,
+        AC_TRY_COMPILE([
+# ifndef _SOCKADDR_LEN
+#	define _SOCKADDR_LEN 1 
+# endif
+#       include <sys/types.h>
+#       include <sys/socket.h>],
+        [u_int i = sizeof(((struct sockaddr *)0)->sa_len)],
+        ac_cv_dnet_sockaddr_has_sa_len=yes,
+        ac_cv_dnet_sockaddr_has_sa_len=no))
+    AC_MSG_RESULT($ac_cv_dnet_sockaddr_has_sa_len)
+    if test $ac_cv_dnet_sockaddr_has_sa_len = yes ; then
+            AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1,
+                      [Define if sockaddr struct has sa_len.])
+    fi])
+
+dnl
+dnl Check for sockaddr_in6 struct in <netinet/in.h>
+dnl
+dnl usage:	AC_DNET_SOCKADDR_IN6
+dnl results:	HAVE_SOCKADDR_IN6
+dnl
+AC_DEFUN([AC_DNET_SOCKADDR_IN6],
+    [AC_MSG_CHECKING(for sockaddr_in6 struct in <netinet/in.h>)
+    AC_CACHE_VAL(ac_cv_dnet_netinet_in_h_has_sockaddr_in6,
+        AC_TRY_COMPILE([
+#       include <sys/types.h>
+#	include <sys/socket.h>
+#       include <netinet/in.h>],
+        [struct sockaddr_in6 sin6; sin6.sin6_family = AF_INET6;],
+	ac_cv_dnet_netinet_in_h_has_sockaddr_in6=yes,
+	ac_cv_dnet_netinet_in_h_has_sockaddr_in6=no))
+    AC_MSG_RESULT($ac_cv_dnet_netinet_in_h_has_sockaddr_in6)
+    if test $ac_cv_dnet_netinet_in_h_has_sockaddr_in6 = yes ; then
+        AC_DEFINE(HAVE_SOCKADDR_IN6, 1,
+	          [Define if <netinet/in.h> has sockaddr_in6 struct.])
+    fi])
+
+dnl
+dnl Check for arp_dev member in arpreq struct
+dnl
+dnl usage:	AC_DNET_ARPREQ_ARP_DEV
+dnl results:	HAVE_ARPREQ_ARP_DEV (defined)
+dnl
+AC_DEFUN([AC_DNET_ARPREQ_ARP_DEV],
+    [AC_MSG_CHECKING(for arp_dev in arpreq struct)
+    AC_CACHE_VAL(ac_cv_dnet_arpreq_has_arp_dev,
+	AC_TRY_COMPILE([
+#       include <sys/types.h>
+#	include <sys/socket.h>
+#	include <net/if_arp.h>],
+	[void *p = ((struct arpreq *)0)->arp_dev],
+	ac_cv_dnet_arpreq_has_arp_dev=yes,
+	ac_cv_dnet_arpreq_has_arp_dev=no))
+    AC_MSG_RESULT($ac_cv_dnet_arpreq_has_arp_dev)
+    if test $ac_cv_dnet_arpreq_has_arp_dev = yes ; then
+	AC_DEFINE(HAVE_ARPREQ_ARP_DEV, 1,
+		[Define if arpreq struct has arp_dev.])
+    fi])
+
+dnl
+dnl Check for rt_msghdr struct in <net/route.h>
+dnl
+dnl usage:	AC_DNET_ROUTE_RT_MSGHDR
+dnl results:	HAVE_ROUTE_RT_MSGHDR
+dnl
+AC_DEFUN([AC_DNET_ROUTE_RT_MSGHDR],
+    [AC_MSG_CHECKING(for rt_msghdr struct in <net/route.h>)
+    AC_CACHE_VAL(ac_cv_dnet_route_h_has_rt_msghdr,
+        AC_TRY_COMPILE([
+#       include <sys/types.h>
+#       include <sys/socket.h>
+#       include <net/if.h>
+#       include <net/route.h>],
+        [struct rt_msghdr rtm; rtm.rtm_msglen = 0;],
+	ac_cv_dnet_route_h_has_rt_msghdr=yes,
+	ac_cv_dnet_route_h_has_rt_msghdr=no))
+    AC_MSG_RESULT($ac_cv_dnet_route_h_has_rt_msghdr)
+    if test $ac_cv_dnet_route_h_has_rt_msghdr = yes ; then
+        AC_DEFINE(HAVE_ROUTE_RT_MSGHDR, 1,
+	          [Define if <net/route.h> has rt_msghdr struct.])
+    fi])
+
+dnl
+dnl Check for the Berkeley Packet Filter
+dnl
+dnl usage:	AC_DNET_BSD_BPF
+dnl results:	HAVE_BSD_BPF
+dnl
+AC_DEFUN([AC_DNET_BSD_BPF],
+    [AC_MSG_CHECKING(for Berkeley Packet Filter)
+    AC_CACHE_VAL(ac_cv_dnet_bsd_bpf,
+	if test -c /dev/bpf0 ; then
+	    ac_cv_dnet_bsd_bpf=yes
+	else
+	    ac_cv_dnet_bsd_bpf=no
+	fi)
+    AC_MSG_RESULT($ac_cv_dnet_bsd_bpf)
+    if test $ac_cv_dnet_bsd_bpf = yes ; then
+	AC_DEFINE(HAVE_BSD_BPF, 1,
+		  [Define if you have the Berkeley Packet Filter.])
+    fi])
+
+dnl
+dnl Check for the Linux /proc filesystem
+dnl
+dnl usage:	AC_DNET_LINUX_PROCFS
+dnl results:	HAVE_LINUX_PROCFS
+dnl
+AC_DEFUN([AC_DNET_LINUX_PROCFS],
+    [AC_MSG_CHECKING(for Linux proc filesystem)
+    AC_CACHE_VAL(ac_cv_dnet_linux_procfs,
+	if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then
+	    ac_cv_dnet_linux_procfs=yes
+        else
+	    ac_cv_dnet_linux_procfs=no
+	fi)
+    AC_MSG_RESULT($ac_cv_dnet_linux_procfs)
+    if test $ac_cv_dnet_linux_procfs = yes ; then
+	AC_DEFINE(HAVE_LINUX_PROCFS, 1,
+		  [Define if you have the Linux /proc filesystem.])
+    fi])
+
+dnl
+dnl Check for Linux PF_PACKET sockets
+dnl
+dnl usage:	AC_DNET_LINUX_PF_PACKET
+dnl results:	HAVE_LINUX_PF_PACKET
+dnl
+AC_DEFUN([AC_DNET_LINUX_PF_PACKET],
+    [AC_MSG_CHECKING(for Linux PF_PACKET sockets)
+    AC_CACHE_VAL(ac_cv_dnet_linux_pf_packet,
+	if test -f /usr/include/netpacket/packet.h ; then
+	    ac_cv_dnet_linux_pf_packet=yes
+	else
+	    ac_cv_dnet_linux_pf_packet=no
+	fi)
+    AC_MSG_RESULT($ac_cv_dnet_linux_pf_packet)
+    if test $ac_cv_dnet_linux_pf_packet = yes ; then
+	AC_DEFINE(HAVE_LINUX_PF_PACKET, 1,
+		  [Define if you have Linux PF_PACKET sockets.])
+    fi])
+
+dnl
+dnl Check for SNMP MIB2 STREAMS (Solaris only?)
+dnl
+dnl usage:      AC_DNET_STREAMS_MIB2
+dnl results:    HAVE_STREAMS_MIB2
+dnl
+AC_DEFUN([AC_DNET_STREAMS_MIB2],
+    [AC_MSG_CHECKING(for SNMP MIB2 STREAMS)
+    AC_CACHE_VAL(ac_cv_dnet_streams_mib2,
+        if test -f /usr/include/inet/mib2.h -a -c /dev/ip ; then
+            ac_cv_dnet_streams_mib2=yes
+        else
+            ac_cv_dnet_streams_mib2=no
+        fi)
+    AC_MSG_RESULT($ac_cv_dnet_streams_mib2)
+    if test $ac_cv_dnet_streams_mib2 = yes ; then
+        AC_DEFINE(HAVE_STREAMS_MIB2, 1,
+                  [Define if you have SNMP MIB2 STREAMS.])
+    fi])
+
+dnl
+dnl Check for route(7) STREAMS (UnixWare only?)
+dnl
+dnl usage:      AC_DNET_STREAMS_ROUTE
+dnl results:    HAVE_STREAMS_ROUTE
+dnl
+AC_DEFUN([AC_DNET_STREAMS_ROUTE],
+    [AC_MSG_CHECKING(for route(7) STREAMS)
+    AC_CACHE_VAL(ac_cv_dnet_streams_route,
+        if grep RTSTR_SEND /usr/include/net/route.h >/dev/null 2>&1 ; then
+            ac_cv_dnet_streams_route=yes
+        else
+            ac_cv_dnet_streams_route=no
+        fi)
+    AC_MSG_RESULT($ac_cv_dnet_streams_route)
+    if test $ac_cv_dnet_streams_route = yes ; then
+        AC_DEFINE(HAVE_STREAMS_ROUTE, 1,
+                  [Define if you have route(7) STREAMS.])
+    fi])
+
+dnl
+dnl Check for arp(7) ioctls
+dnl
+dnl usage:      AC_DNET_IOCTL_ARP
+dnl results:    HAVE_IOCTL_ARP
+dnl
+AC_DEFUN([AC_DNET_IOCTL_ARP],
+    [AC_MSG_CHECKING(for arp(7) ioctls)
+    AC_CACHE_VAL(ac_cv_dnet_ioctl_arp,
+	AC_EGREP_CPP(werd, [
+#	include <sys/types.h>
+#	define BSD_COMP
+#	include <sys/ioctl.h>
+#	ifdef SIOCGARP
+	werd
+#	endif],
+	ac_cv_dnet_ioctl_arp=yes,
+	ac_cv_dnet_ioctl_arp=no))
+    case "$host_os" in
+    irix*)
+        ac_cv_dnet_ioctl_arp=no ;;
+    esac
+    AC_MSG_RESULT($ac_cv_dnet_ioctl_arp)
+    if test $ac_cv_dnet_ioctl_arp = yes ; then
+        AC_DEFINE(HAVE_IOCTL_ARP, 1,
+                  [Define if you have arp(7) ioctls.])
+    fi])
+
+dnl
+dnl Check for raw IP sockets ip_{len,off} host byte ordering
+dnl
+dnl usage:      AC_DNET_RAWIP_HOST_OFFLEN
+dnl results:    HAVE_RAWIP_HOST_OFFLEN
+dnl
+AC_DEFUN([AC_DNET_RAWIP_HOST_OFFLEN],
+    [AC_MSG_CHECKING([for raw IP sockets ip_{len,off} host byte ordering])
+    AC_CACHE_VAL(ac_cv_dnet_rawip_host_offlen, [
+	case "$host_os" in
+	*openbsd*)
+	    ac_cv_dnet_rawip_host_offlen=no ;;
+	*bsd*|*osf*|*unixware*)
+	    ac_cv_dnet_rawip_host_offlen=yes ;;
+	*)
+	    ac_cv_dnet_rawip_host_offlen=no ;;
+	esac])
+    AC_MSG_RESULT($ac_cv_dnet_rawip_host_offlen)
+    if test $ac_cv_dnet_rawip_host_offlen = yes ; then
+        AC_DEFINE(HAVE_RAWIP_HOST_OFFLEN, 1,
+                  [Define if raw IP sockets require host byte ordering for ip_off, ip_len.])
+    fi])
+
+dnl
+dnl Check for cooked raw IP sockets
+dnl
+dnl usage:      AC_DNET_RAWIP_COOKED
+dnl results:    HAVE_RAWIP_COOKED
+dnl
+AC_DEFUN([AC_DNET_RAWIP_COOKED],
+    [AC_MSG_CHECKING(for cooked raw IP sockets)
+    AC_CACHE_VAL(ac_cv_dnet_rawip_cooked, [
+	case "$host_os" in
+	solaris*|irix*)
+	    ac_cv_dnet_rawip_cooked=yes ;;
+	*)
+	    ac_cv_dnet_rawip_cooked=no ;;
+	esac])
+    AC_MSG_RESULT($ac_cv_dnet_rawip_cooked)
+    if test $ac_cv_dnet_rawip_cooked = yes ; then
+        AC_DEFINE(HAVE_RAWIP_COOKED, 1,
+                  [Define if you have cooked raw IP sockets.])
+    fi])
+
+dnl
+dnl AC_LBL_LIBRARY_NET
+dnl
+dnl This test is for network applications that need socket() and
+dnl gethostbyname() -ish functions.  Under Solaris, those applications
+dnl need to link with "-lsocket -lnsl".  Under IRIX, they need to link
+dnl with "-lnsl" but should *not* link with "-lsocket" because
+dnl libsocket.a breaks a number of things (for instance:
+dnl gethostbyname() under IRIX 5.2, and snoop sockets under most
+dnl versions of IRIX).
+dnl
+dnl Unfortunately, many application developers are not aware of this,
+dnl and mistakenly write tests that cause -lsocket to be used under
+dnl IRIX.  It is also easy to write tests that cause -lnsl to be used
+dnl under operating systems where neither are necessary (or useful),
+dnl such as SunOS 4.1.4, which uses -lnsl for TLI.
+dnl
+dnl This test exists so that every application developer does not test
+dnl this in a different, and subtly broken fashion.
+
+dnl It has been argued that this test should be broken up into two
+dnl seperate tests, one for the resolver libraries, and one for the
+dnl libraries necessary for using Sockets API. Unfortunately, the two
+dnl are carefully intertwined and allowing the autoconf user to use
+dnl them independantly potentially results in unfortunate ordering
+dnl dependancies -- as such, such component macros would have to
+dnl carefully use indirection and be aware if the other components were
+dnl executed. Since other autoconf macros do not go to this trouble,
+dnl and almost no applications use sockets without the resolver, this
+dnl complexity has not been implemented.
+dnl
+dnl The check for libresolv is in case you are attempting to link
+dnl statically and happen to have a libresolv.a lying around (and no
+dnl libnsl.a).
+dnl
+AC_DEFUN([AC_LBL_LIBRARY_NET], [
+    # Most operating systems have gethostbyname() in the default searched
+    # libraries (i.e. libc):
+    AC_CHECK_FUNC(gethostbyname, ,
+        # Some OSes (eg. Solaris) place it in libnsl:
+        AC_CHECK_LIB(nsl, gethostbyname, , 
+            # Some strange OSes (SINIX) have it in libsocket:
+            AC_CHECK_LIB(socket, gethostbyname, ,
+                # Unfortunately libsocket sometimes depends on libnsl.
+                # AC_CHECK_LIB's API is essentially broken so the
+                # following ugliness is necessary:
+                AC_CHECK_LIB(socket, gethostbyname,
+                    LIBS="-lsocket -lnsl $LIBS",
+                    AC_CHECK_LIB(resolv, gethostbyname),
+                    -lnsl))))
+    AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, ,
+        AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", ,
+            -lnsl)))
+    # DLPI needs putmsg under HPUX so test for -lstr while we're at it
+    AC_CHECK_LIB(str, putmsg)
+    ])
+
diff --git a/trunk/tools/missing-macros/src/m4/esd.m4 b/trunk/tools/missing-macros/src/m4/esd.m4
new file mode 100644
index 00000000..bb07d0f1
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/esd.m4
@@ -0,0 +1,196 @@
+# esd.m4 serial 1 (libmikmod-3.1.12)
+# Configure paths for ESD
+# Manish Singh    98-9-30
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
+dnl
+AC_DEFUN([AM_PATH_ESD],
+[dnl 
+dnl Get the cflags and libraries from the esd-config script
+dnl
+AC_ARG_WITH(esd-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
+            esd_prefix="$withval", esd_prefix="")
+AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
+            esd_exec_prefix="$withval", esd_exec_prefix="")
+AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
+		    , enable_esdtest=yes)
+
+  if test x$esd_exec_prefix != x ; then
+     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
+     if test x${ESD_CONFIG+set} != xset ; then
+        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
+     fi
+  fi
+  if test x$esd_prefix != x ; then
+     esd_args="$esd_args --prefix=$esd_prefix"
+     if test x${ESD_CONFIG+set} != xset ; then
+        ESD_CONFIG=$esd_prefix/bin/esd-config
+     fi
+  fi
+
+  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
+  min_esd_version=ifelse([$1], ,0.2.7,$1)
+  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
+  no_esd=""
+  if test "$ESD_CONFIG" = "no" ; then
+    no_esd=yes
+  else
+    AC_LANG_SAVE
+    AC_LANG_C
+    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
+    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
+
+    esd_major_version=`$ESD_CONFIG $esd_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_esdtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $ESD_CFLAGS"
+      LIBS="$LIBS $ESD_LIBS"
+dnl
+dnl Now check if the installed ESD is sufficiently new. (Also sanity
+dnl checks the results of esd-config to some extent
+dnl
+      rm -f conf.esdtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <esd.h>
+
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
+int main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.esdtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_esd_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_esd_version");
+     exit(1);
+   }
+
+   if (($esd_major_version > major) ||
+      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
+      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
+      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
+      printf("*** to point to the correct copy of esd-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+       AC_LANG_RESTORE
+     fi
+  fi
+  if test "x$no_esd" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$ESD_CONFIG" = "no" ; then
+       echo "*** The esd-config script installed by ESD could not be found"
+       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the ESD_CONFIG environment variable to the"
+       echo "*** full path to esd-config."
+     else
+       if test -f conf.esdtest ; then
+        :
+       else
+          echo "*** Could not run ESD test program, checking why..."
+          CFLAGS="$CFLAGS $ESD_CFLAGS"
+          LIBS="$LIBS $ESD_LIBS"
+          AC_LANG_SAVE
+          AC_LANG_C
+          AC_TRY_LINK([
+#include <stdio.h>
+#include <esd.h>
+],      [ return 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding ESD or finding the wrong"
+          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
+          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
+          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+          AC_LANG_RESTORE
+       fi
+     fi
+     ESD_CFLAGS=""
+     ESD_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(ESD_CFLAGS)
+  AC_SUBST(ESD_LIBS)
+  rm -f conf.esdtest
+])
+
+dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
+dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
+dnl
+AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
+[dnl
+  AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
+  ac_save_ESD_CFLAGS="$ESD_CFLAGS"
+  ac_save_ESD_LIBS="$ESD_LIBS"
+  AM_PATH_ESD(0.2.21,
+    ifelse([$1], , [
+      AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
+      AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
+	[Define if you have esound with support of multiple recording clients.])],
+    [$1]),
+    ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
+    if test "x$ac_save_ESD_CFLAGS" != x ; then
+       ESD_CFLAGS="$ac_save_ESD_CFLAGS"
+    fi
+    if test "x$ac_save_ESD_LIBS" != x ; then
+       ESD_LIBS="$ac_save_ESD_LIBS"
+    fi
+  )
+])
+
diff --git a/trunk/tools/missing-macros/src/m4/fake-gtk-doc-check.m4 b/trunk/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
new file mode 100644
index 00000000..f11f763c
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
@@ -0,0 +1,13 @@
+dnl fake-gtk-doc-check.m4 serial 1 (libreCMC)
+dnl Provide a fake GTK_DOC_CHECK macros which
+dnl always defines false.
+
+AC_DEFUN([GTK_DOC_CHECK],
+[
+	AM_CONDITIONAL([ENABLE_GTK_DOC], [false])
+	AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [false])
+	AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [false])
+	AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [false])
+	AM_CONDITIONAL([GTK_DOC_USE_REBASE], [false])
+	AC_PATH_PROGS([GTKDOC_REBASE],[true],[true])
+])
diff --git a/trunk/tools/missing-macros/src/m4/fake-intltool.m4 b/trunk/tools/missing-macros/src/m4/fake-intltool.m4
new file mode 100644
index 00000000..352053c2
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/fake-intltool.m4
@@ -0,0 +1,16 @@
+# stripped intltool.m4 to make automake happy
+# serial 1
+AC_DEFUN([IT_PROG_INTLTOOL],
+[
+	AC_SUBST(ALL_LINGUAS)
+	
+	DATADIRNAME=share
+	AC_SUBST(DATADIRNAME)
+])
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
diff --git a/trunk/tools/missing-macros/src/m4/glibc2.m4 b/trunk/tools/missing-macros/src/m4/glibc2.m4
new file mode 100644
index 00000000..f148c12c
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/glibc2.m4
@@ -0,0 +1,30 @@
+# glibc2.m4 serial 2
+dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.0 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gt_GLIBC2],
+  [
+    AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
+      [ac_cv_gnu_library_2],
+      [AC_EGREP_CPP([Lucky GNU user],
+        [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
+        ],
+        [ac_cv_gnu_library_2=yes],
+        [ac_cv_gnu_library_2=no])
+      ]
+    )
+    AC_SUBST([GLIBC2])
+    GLIBC2="$ac_cv_gnu_library_2"
+  ]
+)
diff --git a/trunk/tools/missing-macros/src/m4/glibc21.m4 b/trunk/tools/missing-macros/src/m4/glibc21.m4
new file mode 100644
index 00000000..68ada9d4
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/glibc21.m4
@@ -0,0 +1,30 @@
+# glibc21.m4 serial 4
+dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gl_GLIBC21],
+  [
+    AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer],
+      [ac_cv_gnu_library_2_1],
+      [AC_EGREP_CPP([Lucky GNU user],
+        [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+        ],
+        [ac_cv_gnu_library_2_1=yes],
+        [ac_cv_gnu_library_2_1=no])
+      ]
+    )
+    AC_SUBST([GLIBC21])
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff --git a/trunk/tools/missing-macros/src/m4/intdiv0.m4 b/trunk/tools/missing-macros/src/m4/intdiv0.m4
new file mode 100644
index 00000000..289c4df5
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/intdiv0.m4
@@ -0,0 +1,84 @@
+# intdiv0.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gt_INTDIV0],
+[
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+    gt_cv_int_divbyzero_sigfpe,
+    [
+      gt_cv_int_divbyzero_sigfpe=
+changequote(,)dnl
+      case "$host_os" in
+        macos* | darwin[6-9]* | darwin[1-9][0-9]*)
+          # On MacOS X 10.2 or newer, just assume the same as when cross-
+          # compiling. If we were to perform the real test, 1 Crash Report
+          # dialog window would pop up.
+          case "$host_cpu" in
+            i[34567]86 | x86_64)
+              gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
+          esac
+          ;;
+      esac
+changequote([,])dnl
+      if test -z "$gt_cv_int_divbyzero_sigfpe"; then
+        AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+sigfpe_handler (int sig)
+{
+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
+  exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+  signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+  signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL.  */
+#if defined (__sparc__) && defined (__linux__)
+  signal (SIGILL, sigfpe_handler);
+#endif
+
+  z = x / y;
+  nan = y / y;
+  exit (1);
+}
+], [gt_cv_int_divbyzero_sigfpe=yes], [gt_cv_int_divbyzero_sigfpe=no],
+          [
+            # Guess based on the CPU.
+changequote(,)dnl
+            case "$host_cpu" in
+              alpha* | i[34567]86 | x86_64 | m68k | s390*)
+                gt_cv_int_divbyzero_sigfpe="guessing yes";;
+              *)
+                gt_cv_int_divbyzero_sigfpe="guessing no";;
+            esac
+changequote([,])dnl
+          ])
+      fi
+    ])
+  case "$gt_cv_int_divbyzero_sigfpe" in
+    *yes) value=1;;
+    *) value=0;;
+  esac
+  AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
+    [Define if integer division by zero raises signal SIGFPE.])
+])
diff --git a/trunk/tools/missing-macros/src/m4/intmax.m4 b/trunk/tools/missing-macros/src/m4/intmax.m4
new file mode 100644
index 00000000..74aaaf5e
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/intmax.m4
@@ -0,0 +1,33 @@
+# intmax.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 2002-2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
+    [AC_TRY_COMPILE([
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+],     [intmax_t x = -1;
+        return !x;],
+       [gt_cv_c_intmax_t=yes],
+       [gt_cv_c_intmax_t=no])])
+  if test $gt_cv_c_intmax_t = yes; then
+    AC_DEFINE([HAVE_INTMAX_T], [1],
+      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/trunk/tools/missing-macros/src/m4/inttypes-pri.m4 b/trunk/tools/missing-macros/src/m4/inttypes-pri.m4
new file mode 100644
index 00000000..718a4f4e
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/inttypes-pri.m4
@@ -0,0 +1,36 @@
+# inttypes-pri.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1997-2002, 2006, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.52])
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_CHECK_HEADERS([inttypes.h])
+  if test $ac_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      [gt_cv_inttypes_pri_broken],
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], [gt_cv_inttypes_pri_broken=no], [gt_cv_inttypes_pri_broken=yes])
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1],
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+    PRI_MACROS_BROKEN=1
+  else
+    PRI_MACROS_BROKEN=0
+  fi
+  AC_SUBST([PRI_MACROS_BROKEN])
+])
diff --git a/trunk/tools/missing-macros/src/m4/inttypes_h.m4 b/trunk/tools/missing-macros/src/m4/inttypes_h.m4
new file mode 100644
index 00000000..782d77ed
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/inttypes_h.m4
@@ -0,0 +1,26 @@
+# inttypes_h.m4 serial 9
+dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    [gl_cv_header_inttypes_h=yes],
+    [gl_cv_header_inttypes_h=no])])
+  if test $gl_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff --git a/trunk/tools/missing-macros/src/m4/lib-ld.m4 b/trunk/tools/missing-macros/src/m4/lib-ld.m4
new file mode 100644
index 00000000..ebb30528
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/lib-ld.m4
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL([acl_cv_path_LD],
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+        test "$with_gnu_ld" != no && break ;;
+      *)
+        test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff --git a/trunk/tools/missing-macros/src/m4/lib-link.m4 b/trunk/tools/missing-macros/src/m4/lib-link.m4
new file mode 100644
index 00000000..c73bd8e3
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/lib-link.m4
@@ -0,0 +1,774 @@
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.54])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_TRY_LINK([$3], [$4],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/trunk/tools/missing-macros/src/m4/lib-prefix.m4 b/trunk/tools/missing-macros/src/m4/lib-prefix.m4
new file mode 100644
index 00000000..1601ceae
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/lib-prefix.m4
@@ -0,0 +1,224 @@
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+      dnl symlink is missing, so we set acl_libdirstem2 too.
+      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+        [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+        ])
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+])
diff --git a/trunk/tools/missing-macros/src/m4/mfx_acc.m4 b/trunk/tools/missing-macros/src/m4/mfx_acc.m4
new file mode 100644
index 00000000..9685cc36
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/mfx_acc.m4
@@ -0,0 +1,163 @@
+# acc.m4 serial 1 (ucl-1.03)
+# /***********************************************************************
+# // standard ACC macros
+# ************************************************************************/
+
+AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [
+AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
+])#
+
+AC_DEFUN([mfx_ACC_CHECK_HEADERS], [
+AC_HEADER_TIME
+AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h])
+])#
+
+AC_DEFUN([mfx_ACC_CHECK_FUNCS], [
+AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown clock_getcpuclockid clock_getres clock_gettime ctime difftime fstat getenv getpagesize getrusage gettimeofday gmtime isatty localtime longjmp lstat memcmp memcpy memmove memset mkdir mktime mmap mprotect munmap qsort raise rmdir setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
+])#
+
+
+AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(__int16)
+AC_CHECK_SIZEOF(__int32)
+AC_CHECK_SIZEOF(__int64)
+
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(char *)
+AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(ptrdiff_t)
+])#
+
+
+# /***********************************************************************
+# // Check for ACC_conformance
+# ************************************************************************/
+
+AC_DEFUN([mfx_ACC_ACCCHK], [
+mfx_tmp=$1
+mfx_save_CPPFLAGS=$CPPFLAGS
+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
+
+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
+
+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+[[#define ACC_CONFIG_NO_HEADER 1
+#include "acc/acc.h"
+#include "acc/acc_incd.h"
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+static void test_acc_compile_time_assert(void) {
+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT(expr)
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+}
+#undef NDEBUG
+#include <assert.h>
+static int test_acc_run_time_assert(int r) {
+#define ACCCHK_ASSERT(expr)     assert(expr);
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+return r;
+}
+]], [[
+test_acc_compile_time_assert();
+if (test_acc_run_time_assert(1) != 1) return 1;
+]]
+)])
+
+mfx_tmp=FAILED
+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
+rm -f conftest.$ac_ext conftest.$ac_objext
+
+CPPFLAGS=$mfx_save_CPPFLAGS
+
+AC_MSG_RESULT([$mfx_tmp])
+case x$mfx_tmp in
+  xpassed | xyes) ;;
+  *)
+    AC_MSG_NOTICE([])
+    AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
+    AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
+    AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
+    AC_MSG_NOTICE([Thanks for your support.])
+    AC_MSG_NOTICE([])
+    AC_MSG_ERROR([ACC conformance test failed. Stop.])
+dnl    AS_EXIT
+    ;;
+esac
+])# mfx_ACC_ACCCHK
+
+
+# /***********************************************************************
+# // Check for ACC_conformance
+# ************************************************************************/
+
+AC_DEFUN([mfx_MINIACC_ACCCHK], [
+mfx_tmp=$1
+mfx_save_CPPFLAGS=$CPPFLAGS
+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
+
+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
+
+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+[[#define ACC_CONFIG_NO_HEADER 1
+#define ACC_WANT_ACC_INCD_H 1
+#include $2
+
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
+#include $2
+
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT(expr)
+static void test_acc_compile_time_assert(void) {
+#include $2
+}
+
+#undef NDEBUG
+#include <assert.h>
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr)  assert(expr);
+static int test_acc_run_time_assert(int r) {
+#include $2
+return r;
+}
+]], [[
+test_acc_compile_time_assert();
+if (test_acc_run_time_assert(1) != 1) return 1;
+]]
+)])
+
+mfx_tmp=FAILED
+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
+rm -f conftest.$ac_ext conftest.$ac_objext
+
+CPPFLAGS=$mfx_save_CPPFLAGS
+
+AC_MSG_RESULT([$mfx_tmp])
+case x$mfx_tmp in
+  xpassed | xyes) ;;
+  *)
+    AC_MSG_NOTICE([])
+    AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
+    AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
+    AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
+    AC_MSG_NOTICE([Thanks for your support.])
+    AC_MSG_NOTICE([])
+    AC_MSG_ERROR([ACC conformance test failed. Stop.])
+dnl    AS_EXIT
+    ;;
+esac
+])# mfx_MINIACC_ACCCHK
diff --git a/trunk/tools/missing-macros/src/m4/mfx_cppflags.m4 b/trunk/tools/missing-macros/src/m4/mfx_cppflags.m4
new file mode 100644
index 00000000..0ad9141c
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/mfx_cppflags.m4
@@ -0,0 +1,41 @@
+# serial 1
+
+AC_DEFUN([mfx_PROG_CPPFLAGS], [
+AC_MSG_CHECKING([whether the C preprocessor needs special flags])
+
+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+[[#include <limits.h>
+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
+#  include "your C preprocessor is broken 1"
+#elif (0xffffu == 0xfffffffful)
+#  include "your C preprocessor is broken 2"
+#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX)
+#  include "your C preprocessor is broken 3"
+#endif
+]], [[ ]]
+)])
+
+mfx_save_CPPFLAGS=$CPPFLAGS
+mfx_tmp=ERROR
+for mfx_arg in "" -no-cpp-precomp
+do
+  CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS"
+  _AC_COMPILE_IFELSE([],
+[mfx_tmp=$mfx_arg
+break])
+done
+CPPFLAGS=$mfx_save_CPPFLAGS
+rm -f conftest.$ac_ext conftest.$ac_objext
+case x$mfx_tmp in
+  x)
+    AC_MSG_RESULT([none needed]) ;;
+  xERROR)
+    AC_MSG_RESULT([ERROR])
+    AC_MSG_ERROR([your C preprocessor is broken - for details see config.log])
+    ;;
+  *)
+    AC_MSG_RESULT([$mfx_tmp])
+    CPPFLAGS="$mfx_tmp $CPPFLAGS"
+    ;;
+esac
+])# mfx_PROG_CPPFLAGS
diff --git a/trunk/tools/missing-macros/src/m4/mfx_limits.m4 b/trunk/tools/missing-macros/src/m4/mfx_limits.m4
new file mode 100644
index 00000000..d63a14bb
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/mfx_limits.m4
@@ -0,0 +1,154 @@
+# serial 3
+
+AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [
+AC_CACHE_CHECK([whether limits.h is sane],
+mfx_cv_header_sane_limits_h,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <limits.h>
+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
+#  if defined(__APPLE__) && defined(__GNUC__)
+#    error "your preprocessor is broken - use compiler option -no-cpp-precomp"
+#  else
+#    include "your preprocessor is broken"
+#  endif
+#endif
+#define MFX_0xffff          0xffff
+#define MFX_0xffffffffL     4294967295ul
+#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
+#  include "error CHAR_BIT"
+#endif
+#if !defined(UCHAR_MAX)
+#  include "error UCHAR_MAX 1"
+#endif
+#if !defined(USHRT_MAX)
+#  include "error USHRT_MAX 1"
+#endif
+#if !defined(UINT_MAX)
+#  include "error UINT_MAX 1"
+#endif
+#if !defined(ULONG_MAX)
+#  include "error ULONG_MAX 1"
+#endif
+#if !defined(SHRT_MAX)
+#  include "error SHRT_MAX 1"
+#endif
+#if !defined(INT_MAX)
+#  include "error INT_MAX 1"
+#endif
+#if !defined(LONG_MAX)
+#  include "error LONG_MAX 1"
+#endif
+#if (UCHAR_MAX < 1)
+#  include "error UCHAR_MAX 2"
+#endif
+#if (USHRT_MAX < 1)
+#  include "error USHRT_MAX 2"
+#endif
+#if (UINT_MAX < 1)
+#  include "error UINT_MAX 2"
+#endif
+#if (ULONG_MAX < 1)
+#  include "error ULONG_MAX 2"
+#endif
+#if (UCHAR_MAX < 0xff)
+#  include "error UCHAR_MAX 3"
+#endif
+#if (USHRT_MAX < MFX_0xffff)
+#  include "error USHRT_MAX 3"
+#endif
+#if (UINT_MAX < MFX_0xffff)
+#  include "error UINT_MAX 3"
+#endif
+#if (ULONG_MAX < MFX_0xffffffffL)
+#  include "error ULONG_MAX 3"
+#endif
+#if (USHRT_MAX > UINT_MAX)
+#  include "error USHRT_MAX vs UINT_MAX"
+#endif
+#if (UINT_MAX > ULONG_MAX)
+#  include "error UINT_MAX vs ULONG_MAX"
+#endif
+]], [[
+#if (USHRT_MAX == MFX_0xffff)
+{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; }
+#elif (USHRT_MAX >= MFX_0xffff)
+{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; }
+#endif
+#if (UINT_MAX == MFX_0xffff)
+{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; }
+#elif (UINT_MAX >= MFX_0xffff)
+{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; }
+#endif
+#if (ULONG_MAX == MFX_0xffff)
+{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; }
+#elif (ULONG_MAX >= MFX_0xffff)
+{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; }
+#endif
+#if !defined(_CRAY1) /* CRAY PVP systems */
+#if (USHRT_MAX == MFX_0xffffffffL)
+{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; }
+#elif (USHRT_MAX >= MFX_0xffffffffL)
+{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; }
+#endif
+#endif /* _CRAY1 */
+#if (UINT_MAX == MFX_0xffffffffL)
+{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; }
+#elif (UINT_MAX >= MFX_0xffffffffL)
+{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; }
+#endif
+#if (ULONG_MAX == MFX_0xffffffffL)
+{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; }
+#elif (ULONG_MAX >= MFX_0xffffffffL)
+{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; }
+#endif
+]])],
+[mfx_cv_header_sane_limits_h=yes],
+[mfx_cv_header_sane_limits_h=no])])
+])
+
+# /***********************************************************************
+# // standard
+# ************************************************************************/
+
+AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [
+AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
+])#
+
+
+# /***********************************************************************
+# //
+# ************************************************************************/
+
+dnl more types which are not yet covered by ACC
+
+AC_DEFUN([mfx_CHECK_SIZEOF], [
+AC_CHECK_SIZEOF(__int32)
+AC_CHECK_SIZEOF(intmax_t)
+AC_CHECK_SIZEOF(uintmax_t)
+AC_CHECK_SIZEOF(intptr_t)
+AC_CHECK_SIZEOF(uintptr_t)
+
+AC_CHECK_SIZEOF(float)
+AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF(long double)
+
+AC_CHECK_SIZEOF(dev_t)
+AC_CHECK_SIZEOF(fpos_t)
+AC_CHECK_SIZEOF(mode_t)
+AC_CHECK_SIZEOF(off_t)
+AC_CHECK_SIZEOF(ssize_t)
+AC_CHECK_SIZEOF(time_t)
+])#
+
+
+
+AC_DEFUN([mfx_CHECK_LIB_WINMM], [
+if test "X$GCC" = Xyes; then
+case $host_os in
+cygwin* | mingw* | pw32*)
+     test "X$LIBS" != "X" && LIBS="$LIBS "
+     LIBS="${LIBS}-lwinmm" ;;
+*)
+     ;;
+esac
+fi
+])#
diff --git a/trunk/tools/missing-macros/src/m4/progtest.m4 b/trunk/tools/missing-macros/src/m4/progtest.m4
new file mode 100644
index 00000000..2d804ac9
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/progtest.m4
@@ -0,0 +1,92 @@
+# progtest.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ([2.50])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$][$1])
+else
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])
diff --git a/trunk/tools/missing-macros/src/m4/stdint_h.m4 b/trunk/tools/missing-macros/src/m4/stdint_h.m4
new file mode 100644
index 00000000..b8e3c6cc
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/stdint_h.m4
@@ -0,0 +1,26 @@
+# stdint_h.m4 serial 8
+dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    [gl_cv_header_stdint_h=yes],
+    [gl_cv_header_stdint_h=no])])
+  if test $gl_cv_header_stdint_h = yes; then
+    AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff --git a/trunk/tools/missing-macros/src/m4/uintmax_t.m4 b/trunk/tools/missing-macros/src/m4/uintmax_t.m4
new file mode 100644
index 00000000..03b51bcf
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/uintmax_t.m4
@@ -0,0 +1,30 @@
+# uintmax_t.m4 serial 12
+dnl Copyright (C) 1997-2004, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+AC_PREREQ([2.13])
+
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
+
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+    AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+    test $ac_cv_type_unsigned_long_long_int = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE([HAVE_UINTMAX_T], [1],
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/trunk/tools/missing-macros/src/m4/va_copy.m4 b/trunk/tools/missing-macros/src/m4/va_copy.m4
new file mode 100644
index 00000000..0e88ee66
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/va_copy.m4
@@ -0,0 +1,111 @@
+# va_copy.m4 serial 1 (js-1.6.20070208)
+
+dnl ##
+dnl ##  Check for C99 va_copy() implementation
+dnl ##  (and provide fallback implementation if neccessary)
+dnl ##
+dnl ##  configure.in:
+dnl ##    AC_CHECK_VA_COPY
+dnl ##  foo.c:
+dnl ##    #include "config.h"
+dnl ##    [...]
+dnl ##    va_copy(d,s)
+dnl ##
+dnl ##  This check is rather complex: first because we really have to
+dnl ##  try various possible implementations in sequence and second, we
+dnl ##  cannot define a macro in config.h with parameters directly.
+dnl ##
+
+dnl #   test program for va_copy() implementation
+changequote(<<,>>)
+m4_define(__va_copy_test, <<[
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#define DO_VA_COPY(d, s) $1
+void test(char *str, ...)
+{
+    va_list ap, ap2;
+    int i;
+    va_start(ap, str);
+    DO_VA_COPY(ap2, ap);
+    for (i = 1; i <= 9; i++) {
+        int k = (int)va_arg(ap, int);
+        if (k != i)
+            abort();
+    }
+    DO_VA_COPY(ap, ap2);
+    for (i = 1; i <= 9; i++) {
+        int k = (int)va_arg(ap, int);
+        if (k != i)
+            abort();
+    }
+    va_end(ap);
+}
+int main(int argc, char *argv[])
+{
+    test("test", 1, 2, 3, 4, 5, 6, 7, 8, 9);
+    exit(0);
+}
+]>>)
+changequote([,])
+
+dnl #   test driver for va_copy() implementation
+m4_define(__va_copy_check, [
+    AH_VERBATIM($1,
+[/* Predefined possible va_copy() implementation (id: $1) */
+#define __VA_COPY_USE_$1(d, s) $2])
+    if test ".$ac_cv_va_copy" = .; then
+        AC_TRY_RUN(__va_copy_test($2), [ac_cv_va_copy="$1"])
+    fi
+])
+
+dnl #   Autoconf check for va_copy() implementation checking
+AC_DEFUN([AC_CHECK_VA_COPY],[
+  dnl #   provide Autoconf display check message
+  AC_MSG_CHECKING(for va_copy() function)
+  dnl #   check for various implementations in priorized sequence   
+  AC_CACHE_VAL(ac_cv_va_copy, [
+    ac_cv_va_copy=""
+    dnl #   1. check for standardized C99 macro
+    __va_copy_check(C99, [va_copy((d), (s))])
+    dnl #   2. check for alternative/deprecated GCC macro
+    __va_copy_check(GCM, [VA_COPY((d), (s))])
+    dnl #   3. check for internal GCC macro (high-level define)
+    __va_copy_check(GCH, [__va_copy((d), (s))])
+    dnl #   4. check for internal GCC macro (built-in function)
+    __va_copy_check(GCB, [__builtin_va_copy((d), (s))])
+    dnl #   5. check for assignment approach (assuming va_list is a struct)
+    __va_copy_check(ASS, [do { (d) = (s); } while (0)])
+    dnl #   6. check for assignment approach (assuming va_list is a pointer)
+    __va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
+    dnl #   7. check for memory copying approach (assuming va_list is a struct)
+    __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s)), sizeof((s))])
+    dnl #   8. check for memory copying approach (assuming va_list is a pointer)
+    __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
+    if test ".$ac_cv_va_copy" = .; then
+        AC_ERROR([no working implementation found])
+    fi
+  ])
+  dnl #   optionally activate the fallback implementation
+  if test ".$ac_cv_va_copy" = ".C99"; then
+      AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy() macro exists (and no fallback implementation is required)])
+  fi
+  dnl #   declare which fallback implementation to actually use
+  AC_DEFINE_UNQUOTED([__VA_COPY_USE], [__VA_COPY_USE_$ac_cv_va_copy],
+      [Define to id of used va_copy() implementation])
+  dnl #   provide activation hook for fallback implementation
+  AH_VERBATIM([__VA_COPY_ACTIVATION],
+[/* Optional va_copy() implementation activation */
+#ifndef HAVE_VA_COPY
+#define va_copy(d, s) __VA_COPY_USE(d, s)
+#endif
+])
+  dnl #   provide Autoconf display result message
+  if test ".$ac_cv_va_copy" = ".C99"; then
+      AC_MSG_RESULT([yes])
+  else
+      AC_MSG_RESULT([no (using fallback implementation)])
+  fi
+])
+
diff --git a/trunk/tools/missing-macros/src/m4/wint_t.m4 b/trunk/tools/missing-macros/src/m4/wint_t.m4
new file mode 100644
index 00000000..a6c7d15c
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/wint_t.m4
@@ -0,0 +1,28 @@
+# wint_t.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
+    [AC_TRY_COMPILE([
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
+   before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
+  fi
+])
diff --git a/trunk/tools/missing-macros/src/m4/xaw.m4 b/trunk/tools/missing-macros/src/m4/xaw.m4
new file mode 100644
index 00000000..60404ae8
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/xaw.m4
@@ -0,0 +1,65 @@
+dnl Copyright 2005 Red Hat, Inc
+dnl 
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl 
+
+# XAW_CHECK_XPRINT_SUPPORT()
+# --------------------------
+# Adds --enable/disable-xprint and selects the appropriate version of the Xaw 
+# library. If neither --enable-xprint nor --disable-xprint are given, 
+# the presence of an Xaw with Xprint support will be auto detected
+
+AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
+	AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
+			[use_xprint=$enableval],[use_xprint=auto])
+	if test "x$use_xprint" = "xyes"; then
+		TMP_CHECK1=xaw8
+		TMP_CHECK2=
+		xaw_use_xprint=yes
+	elif test "x$use_xprint" = "xno"; then
+		TMP_CHECK1=xaw7
+		TMP_CHECK2=
+		xaw_use_xprint=no
+	else
+		TMP_CHECK1=xaw8
+		TMP_CHECK2=xaw7
+		xaw_use_xprint=yes
+	fi
+
+	PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK1, success=yes, success=no)
+	if [[ ! -z $TMP_CHECK2 ]] ; then
+		if test $success = no ; then
+			PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK2, success=yes, success=no)
+			xaw_use_xprint=no
+		fi
+	fi
+
+	if test "x$success" = "xyes"; then
+		$1_CFLAGS=$TMP_XAW_CFLAGS
+		$1_LIBS=$TMP_XAW_LIBS
+
+		AM_CONDITIONAL([XAW_USE_XPRINT], [test "x$xaw_use_xprint" = "xyes"])
+	else
+		AC_MSG_ERROR([No suitable version of Xaw found])
+	fi
+])
diff --git a/trunk/tools/missing-macros/src/m4/xmms.m4 b/trunk/tools/missing-macros/src/m4/xmms.m4
new file mode 100644
index 00000000..8aeaad81
--- /dev/null
+++ b/trunk/tools/missing-macros/src/m4/xmms.m4
@@ -0,0 +1,149 @@
+# CFLAGS and library paths for XMMS
+# written 15 December 1999 by Ben Gertzfield <che@debian.org>
+
+dnl Usage:
+dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Example:
+dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***]))
+dnl
+dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, 
+dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, 
+dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR,
+dnl and XMMS_VERSION for your plugin pleasure.
+dnl
+
+dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
+AC_DEFUN([XMMS_TEST_VERSION], [
+
+# Determine which version number is greater. Prints 2 to stdout if	
+# the second number is greater, 1 if the first number is greater,	
+# 0 if the numbers are equal.						
+									
+# Written 15 December 1999 by Ben Gertzfield <che@debian.org>		
+# Revised 15 December 1999 by Jim Monty <monty@primenet.com>		
+									
+    AC_PROG_AWK
+    xmms_got_version=[` $AWK '						\
+BEGIN {									\
+    print vercmp(ARGV[1], ARGV[2]);					\
+}									\
+									\
+function vercmp(ver1, ver2,    ver1arr, ver2arr,			\
+                               ver1len, ver2len,			\
+                               ver1int, ver2int, len, i, p) {		\
+									\
+    ver1len = split(ver1, ver1arr, /\./);				\
+    ver2len = split(ver2, ver2arr, /\./);				\
+									\
+    len = ver1len > ver2len ? ver1len : ver2len;			\
+									\
+    for (i = 1; i <= len; i++) {					\
+        p = 1000 ^ (len - i);						\
+        ver1int += ver1arr[i] * p;					\
+        ver2int += ver2arr[i] * p;					\
+    }									\
+									\
+    if (ver1int < ver2int)						\
+        return 2;							\
+    else if (ver1int > ver2int)						\
+        return 1;							\
+    else								\
+        return 0;							\
+}' $1 $2`]								
+
+    if test $xmms_got_version -eq 2; then 	# failure
+	ifelse([$4], , :, $4)			
+    else  					# success!
+	ifelse([$3], , :, $3)
+    fi
+])
+
+AC_DEFUN([AM_PATH_XMMS],
+[
+AC_ARG_WITH(xmms-prefix,[  --with-xmms-prefix=PFX  Prefix where XMMS is installed (optional)],
+	xmms_config_prefix="$withval", xmms_config_prefix="")
+AC_ARG_WITH(xmms-exec-prefix,[  --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)],
+	xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
+
+if test x$xmms_config_exec_prefix != x; then
+    xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix"
+    if test x${XMMS_CONFIG+set} != xset; then
+	XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config
+    fi
+fi
+
+if test x$xmms_config_prefix != x; then
+    xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix"
+    if test x${XMMS_CONFIG+set} != xset; then
+  	XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config
+    fi
+fi
+
+AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
+min_xmms_version=ifelse([$1], ,0.9.5.1, $1)
+
+if test "$XMMS_CONFIG" = "no"; then
+    no_xmms=yes
+else
+    XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags`
+    XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs`
+    XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version`
+    XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir`
+    XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir`
+    XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \
+					--visualization-plugin-dir`
+    XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir`
+    XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir`
+    XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir`
+    XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir`
+
+    XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version)
+fi
+
+AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version)
+
+if test "x$no_xmms" = x; then
+    AC_MSG_RESULT(yes)
+    ifelse([$2], , :, [$2])
+else
+    AC_MSG_RESULT(no)
+
+    if test "$XMMS_CONFIG" = "no" ; then
+	echo "*** The xmms-config script installed by XMMS could not be found."
+      	echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in"
+	echo "*** your path, or set the XMMS_CONFIG environment variable to the"
+	echo "*** full path to xmms-config."
+    else
+	if test "$no_xmms" = "version"; then
+	    echo "*** An old version of XMMS, $XMMS_VERSION, was found."
+	    echo "*** You need a version of XMMS newer than $min_xmms_version."
+	    echo "*** The latest version of XMMS is always available from"
+	    echo "*** http://www.xmms.org/"
+	    echo "***"
+
+            echo "*** If you have already installed a sufficiently new version, this error"
+            echo "*** probably means that the wrong copy of the xmms-config shell script is"
+            echo "*** being found. The easiest way to fix this is to remove the old version"
+            echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the"
+            echo "*** correct copy of xmms-config. (In this case, you will have to"
+            echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf"
+            echo "*** so that the correct libraries are found at run-time)"
+	fi
+    fi
+    XMMS_CFLAGS=""
+    XMMS_LIBS=""
+    ifelse([$3], , :, [$3])
+fi
+AC_SUBST(XMMS_CFLAGS)
+AC_SUBST(XMMS_LIBS)
+AC_SUBST(XMMS_VERSION)
+AC_SUBST(XMMS_DATA_DIR)
+AC_SUBST(XMMS_PLUGIN_DIR)
+AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
+AC_SUBST(XMMS_INPUT_PLUGIN_DIR)
+AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR)
+AC_SUBST(XMMS_GENERAL_PLUGIN_DIR)
+AC_SUBST(XMMS_EFFECT_PLUGIN_DIR)
+])
+
diff --git a/trunk/tools/mkimage/Makefile b/trunk/tools/mkimage/Makefile
new file mode 100644
index 00000000..ab65ce66
--- /dev/null
+++ b/trunk/tools/mkimage/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mkimage
+PKG_VERSION:=2014.10-librecmc
+
+PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=\
+	http://mirror2.openwrt.org/sources \
+	ftp://ftp.denx.de/pub/u-boot
+PKG_MD5SUM:=a4d242902687a4ee46fe8dabb5c0f12e
+PKG_CAT:=bzcat
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Prepare
+	$(Host/Prepare/Default)
+	rm -f \
+		$(HOST_BUILD_DIR)/include/errno.h \
+		$(HOST_BUILD_DIR)/include/malloc.h \
+		$(HOST_BUILD_DIR)/tools/.depend
+	touch $(HOST_BUILD_DIR)/include/config.mk
+	touch $(HOST_BUILD_DIR)/include/config.h
+endef
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) defconfig
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		HOSTLDFLAGS="$(HOST_STATIC_LINKING)" \
+		tools-only
+endef
+
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/tools/mkimage $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/mkimage
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/mkimage/patches/010-freebsd-ulong-fix.patch b/trunk/tools/mkimage/patches/010-freebsd-ulong-fix.patch
new file mode 100644
index 00000000..75b9e892
--- /dev/null
+++ b/trunk/tools/mkimage/patches/010-freebsd-ulong-fix.patch
@@ -0,0 +1,13 @@
+--- a/include/image.h
++++ b/include/image.h
+@@ -44,6 +44,10 @@
+ 
+ #endif /* USE_HOSTCC */
+ 
++#ifndef ulong
++#define ulong unsigned long
++#endif
++
+ #if defined(CONFIG_FIT)
+ #include <hash.h>
+ #include <libfdt.h>
diff --git a/trunk/tools/mkimage/patches/020-include_compile_fix.patch b/trunk/tools/mkimage/patches/020-include_compile_fix.patch
new file mode 100644
index 00000000..276cae0c
--- /dev/null
+++ b/trunk/tools/mkimage/patches/020-include_compile_fix.patch
@@ -0,0 +1,10 @@
+--- a/include/u-boot/rsa-checksum.h
++++ b/include/u-boot/rsa-checksum.h
+@@ -7,7 +7,6 @@
+ #ifndef _RSA_CHECKSUM_H
+ #define _RSA_CHECKSUM_H
+ 
+-#include <errno.h>
+ #include <image.h>
+ #include <u-boot/sha1.h>
+ #include <u-boot/sha256.h>
diff --git a/trunk/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/trunk/tools/mkimage/patches/030-allow-to-use-different-magic.patch
new file mode 100644
index 00000000..d5afdd35
--- /dev/null
+++ b/trunk/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -0,0 +1,63 @@
+--- a/tools/mkimage.c
++++ b/tools/mkimage.c
+@@ -24,6 +24,7 @@
+ 	.arch = IH_ARCH_PPC,
+ 	.type = IH_TYPE_KERNEL,
+ 	.comp = IH_COMP_GZIP,
++	.magic = IH_MAGIC,
+ 	.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
+ 	.imagename = "",
+ 	.imagename2 = "",
+@@ -168,6 +169,16 @@
+ 					genimg_get_comp_id (*++argv)) < 0)
+ 					usage ();
+ 				goto NXTARG;
++			case 'M':
++				if (--argc <=0)
++					usage ();
++				params.magic = strtoul (*++argv, &ptr, 16);
++				if (*ptr) {
++					fprintf (stderr,
++						"%s: invalid magic %s\n",
++						params.cmdname, *argv);
++				}
++				goto NXTARG;
+ 			case 'D':
+ 				if (--argc <= 0)
+ 					usage ();
+@@ -623,12 +634,13 @@
+ 	fprintf (stderr, "Usage: %s -l image\n"
+ 			 "          -l ==> list image header information\n",
+ 		params.cmdname);
+-	fprintf (stderr, "       %s [-x] -A arch -O os -T type -C comp "
++	fprintf (stderr, "       %s [-x] -A arch -O os -T type -C comp -M magic "
+ 			 "-a addr -e ep -n name -d data_file[:data_file...] image\n"
+ 			 "          -A ==> set architecture to 'arch'\n"
+ 			 "          -O ==> set operating system to 'os'\n"
+ 			 "          -T ==> set image type to 'type'\n"
+ 			 "          -C ==> set compression type 'comp'\n"
++			 "          -M ==> set image magic to 'magic'\n"
+ 			 "          -a ==> set load address to 'addr' (hex)\n"
+ 			 "          -e ==> set entry point to 'ep' (hex)\n"
+ 			 "          -n ==> set image name to 'name'\n"
+--- a/tools/default_image.c
++++ b/tools/default_image.c
+@@ -98,7 +98,7 @@
+ 			sbuf->st_size - sizeof(image_header_t));
+ 
+ 	/* Build new header */
+-	image_set_magic(hdr, IH_MAGIC);
++	image_set_magic(hdr, params->magic);
+ 	image_set_time(hdr, sbuf->st_mtime);
+ 	image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
+ 	image_set_load(hdr, params->addr);
+--- a/tools/imagetool.h
++++ b/tools/imagetool.h
+@@ -44,6 +44,7 @@
+ 	int arch;
+ 	int type;
+ 	int comp;
++	unsigned int magic;
+ 	char *dtc;
+ 	unsigned int addr;
+ 	unsigned int ep;
diff --git a/trunk/tools/mkimage/patches/040-include_order.patch b/trunk/tools/mkimage/patches/040-include_order.patch
new file mode 100644
index 00000000..3b9ecc6b
--- /dev/null
+++ b/trunk/tools/mkimage/patches/040-include_order.patch
@@ -0,0 +1,11 @@
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -194,7 +194,7 @@ endif # !LOGO_BMP
+ # Define _GNU_SOURCE to obtain the getline prototype from stdio.h
+ #
+ HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
+-		$(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
++		-I$(srctree)/include \
+ 		-I$(srctree)/lib/libfdt \
+ 		-I$(srctree)/tools \
+ 		-DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
diff --git a/trunk/tools/mkimage/patches/050-image_h_portability.patch b/trunk/tools/mkimage/patches/050-image_h_portability.patch
new file mode 100644
index 00000000..b3ad2738
--- /dev/null
+++ b/trunk/tools/mkimage/patches/050-image_h_portability.patch
@@ -0,0 +1,31 @@
+--- a/include/image.h
++++ b/include/image.h
+@@ -17,7 +17,6 @@
+ #define __IMAGE_H__
+ 
+ #include "compiler.h"
+-#include <asm/byteorder.h>
+ 
+ /* Define this to avoid #ifdefs later on */
+ struct lmb;
+@@ -258,13 +257,13 @@ struct lmb;
+  * all data in network byte order (aka natural aka bigendian).
+  */
+ typedef struct image_header {
+-	__be32		ih_magic;	/* Image Header Magic Number	*/
+-	__be32		ih_hcrc;	/* Image Header CRC Checksum	*/
+-	__be32		ih_time;	/* Image Creation Timestamp	*/
+-	__be32		ih_size;	/* Image Data Size		*/
+-	__be32		ih_load;	/* Data	 Load  Address		*/
+-	__be32		ih_ep;		/* Entry Point Address		*/
+-	__be32		ih_dcrc;	/* Image Data CRC Checksum	*/
++	uint32_t	ih_magic;	/* Image Header Magic Number	*/
++	uint32_t	ih_hcrc;	/* Image Header CRC Checksum	*/
++	uint32_t	ih_time;	/* Image Creation Timestamp	*/
++	uint32_t	ih_size;	/* Image Data Size		*/
++	uint32_t	ih_load;	/* Data	 Load  Address		*/
++	uint32_t	ih_ep;		/* Entry Point Address		*/
++	uint32_t	ih_dcrc;	/* Image Data CRC Checksum	*/
+ 	uint8_t		ih_os;		/* Operating System		*/
+ 	uint8_t		ih_arch;	/* CPU architecture		*/
+ 	uint8_t		ih_type;	/* Image Type			*/
diff --git a/trunk/tools/mkimage/patches/060-remove_kernel_includes.patch b/trunk/tools/mkimage/patches/060-remove_kernel_includes.patch
new file mode 100644
index 00000000..fa533cd2
--- /dev/null
+++ b/trunk/tools/mkimage/patches/060-remove_kernel_includes.patch
@@ -0,0 +1,35 @@
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -58,6 +58,11 @@ typedef uint8_t __u8;
+ typedef uint16_t __u16;
+ typedef uint32_t __u32;
+ typedef unsigned int uint;
++typedef uint64_t __u64;
++#ifndef linux
++typedef int __kernel_daddr_t;
++typedef unsigned int __kernel_ino_t;
++#endif
+ 
+ #define uswap_16(x) \
+ 	((((x) & 0xff00) >> 8) | \
+--- a/include/linux/posix_types.h
++++ b/include/linux/posix_types.h
+@@ -43,6 +43,8 @@ typedef void (*__kernel_sighandler_t)(in
+ /* Type of a SYSV IPC key.  */
+ typedef int __kernel_key_t;
+ 
++#ifdef linux
+ #include <asm/posix_types.h>
++#endif
+ 
+ #endif /* _LINUX_POSIX_TYPES_H */
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -2,7 +2,6 @@
+ #define _LINUX_TYPES_H
+ 
+ #include <linux/posix_types.h>
+-#include <asm/types.h>
+ #include <stdbool.h>
+ 
+ #ifndef __KERNEL_STRICT_NAMES
diff --git a/trunk/tools/mkimage/patches/070-socfpgaimage_portability.patch b/trunk/tools/mkimage/patches/070-socfpgaimage_portability.patch
new file mode 100644
index 00000000..e273c275
--- /dev/null
+++ b/trunk/tools/mkimage/patches/070-socfpgaimage_portability.patch
@@ -0,0 +1,52 @@
+--- a/tools/socfpgaimage.c
++++ b/tools/socfpgaimage.c
+@@ -74,12 +74,12 @@ static uint16_t hdr_checksum(struct socf
+ static void build_header(uint8_t *buf, uint8_t version, uint8_t flags,
+ 			 uint16_t length_bytes)
+ {
+-	header.validation = htole32(VALIDATION_WORD);
++	header.validation = cpu_to_le32(VALIDATION_WORD);
+ 	header.version = version;
+ 	header.flags = flags;
+-	header.length_u32 = htole16(length_bytes/4);
++	header.length_u32 = cpu_to_le16(length_bytes/4);
+ 	header.zero = 0;
+-	header.checksum = htole16(hdr_checksum(&header));
++	header.checksum = cpu_to_le16(hdr_checksum(&header));
+ 
+ 	memcpy(buf, &header, sizeof(header));
+ }
+@@ -92,12 +92,12 @@ static int verify_header(const uint8_t *
+ {
+ 	memcpy(&header, buf, sizeof(header));
+ 
+-	if (le32toh(header.validation) != VALIDATION_WORD)
++	if (le32_to_cpu(header.validation) != VALIDATION_WORD)
+ 		return -1;
+-	if (le16toh(header.checksum) != hdr_checksum(&header))
++	if (le16_to_cpu(header.checksum) != hdr_checksum(&header))
+ 		return -1;
+ 
+-	return le16toh(header.length_u32) * 4;
++	return le16_to_cpu(header.length_u32) * 4;
+ }
+ 
+ /* Sign the buffer and return the signed buffer size */
+@@ -116,7 +116,7 @@ static int sign_buffer(uint8_t *buf,
+ 	/* Calculate and apply the CRC */
+ 	calc_crc = ~pbl_crc32(0, (char *)buf, len);
+ 
+-	*((uint32_t *)(buf + len)) = htole32(calc_crc);
++	*((uint32_t *)(buf + len)) = cpu_to_le32(calc_crc);
+ 
+ 	if (!pad_64k)
+ 		return len + 4;
+@@ -150,7 +150,7 @@ static int verify_buffer(const uint8_t *
+ 
+ 	calc_crc = ~pbl_crc32(0, (const char *)buf, len);
+ 
+-	buf_crc = le32toh(*((uint32_t *)(buf + len)));
++	buf_crc = le32_to_cpu(*((uint32_t *)(buf + len)));
+ 
+ 	if (buf_crc != calc_crc) {
+ 		fprintf(stderr, "CRC32 does not match (%08x != %08x)\n",
diff --git a/trunk/tools/mkimage/patches/080-remove_compiler_check.patch b/trunk/tools/mkimage/patches/080-remove_compiler_check.patch
new file mode 100644
index 00000000..3e71ad5b
--- /dev/null
+++ b/trunk/tools/mkimage/patches/080-remove_compiler_check.patch
@@ -0,0 +1,16 @@
+--- a/include/linux/compiler-gcc4.h
++++ b/include/linux/compiler-gcc4.h
+@@ -2,13 +2,6 @@
+ #error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
+ #endif
+ 
+-/* GCC 4.1.[01] miscompiles __weak */
+-#ifdef __KERNEL__
+-# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
+-#  error Your version of gcc miscompiles the __weak directive
+-# endif
+-#endif
+-
+ #define __used			__attribute__((__used__))
+ #define __must_check 		__attribute__((warn_unused_result))
+ #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
diff --git a/trunk/tools/mklibs/Makefile b/trunk/tools/mklibs/Makefile
new file mode 100644
index 00000000..fa0bce70
--- /dev/null
+++ b/trunk/tools/mklibs/Makefile
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mklibs
+PKG_VERSION:=0.1.35
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mklibs/
+PKG_MD5SUM:=3d2a4bd0bbf5ba964b0a1ecdafd1ea9a
+
+HOST_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CFLAGS += -I$(CURDIR)/include
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Install
+       $(INSTALL_BIN) \
+               $(HOST_BUILD_DIR)/src/mklibs \
+               $(HOST_BUILD_DIR)/src/mklibs-copy \
+               $(HOST_BUILD_DIR)/src/mklibs-readelf/mklibs-readelf \
+               $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+       rm -f $(STAGING_DIR_HOST)/bin/mklibs*
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/mklibs/include/elf.h b/trunk/tools/mklibs/include/elf.h
new file mode 100644
index 00000000..d7963500
--- /dev/null
+++ b/trunk/tools/mklibs/include/elf.h
@@ -0,0 +1,2559 @@
+/* This file defines standard ELF types, structures, and macros.
+   Copyright (C) 1995-2003, 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _ELF_H
+#define	_ELF_H 1
+
+__BEGIN_DECLS
+
+/* Standard ELF types.  */
+
+#include <stdint.h>
+
+/* Type for a 16-bit quantity.  */
+typedef uint16_t Elf32_Half;
+typedef uint16_t Elf64_Half;
+
+/* Types for signed and unsigned 32-bit quantities.  */
+typedef uint32_t Elf32_Word;
+typedef	int32_t  Elf32_Sword;
+typedef uint32_t Elf64_Word;
+typedef	int32_t  Elf64_Sword;
+
+/* Types for signed and unsigned 64-bit quantities.  */
+typedef uint64_t Elf32_Xword;
+typedef	int64_t  Elf32_Sxword;
+typedef uint64_t Elf64_Xword;
+typedef	int64_t  Elf64_Sxword;
+
+/* Type of addresses.  */
+typedef uint32_t Elf32_Addr;
+typedef uint64_t Elf64_Addr;
+
+/* Type of file offsets.  */
+typedef uint32_t Elf32_Off;
+typedef uint64_t Elf64_Off;
+
+/* Type for section indices, which are 16-bit quantities.  */
+typedef uint16_t Elf32_Section;
+typedef uint16_t Elf64_Section;
+
+/* Type for version symbol information.  */
+typedef Elf32_Half Elf32_Versym;
+typedef Elf64_Half Elf64_Versym;
+
+
+/* The ELF file header.  This appears at the start of every ELF file.  */
+
+#define EI_NIDENT (16)
+
+typedef struct
+{
+  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
+  Elf32_Half	e_type;			/* Object file type */
+  Elf32_Half	e_machine;		/* Architecture */
+  Elf32_Word	e_version;		/* Object file version */
+  Elf32_Addr	e_entry;		/* Entry point virtual address */
+  Elf32_Off	e_phoff;		/* Program header table file offset */
+  Elf32_Off	e_shoff;		/* Section header table file offset */
+  Elf32_Word	e_flags;		/* Processor-specific flags */
+  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
+  Elf32_Half	e_phentsize;		/* Program header table entry size */
+  Elf32_Half	e_phnum;		/* Program header table entry count */
+  Elf32_Half	e_shentsize;		/* Section header table entry size */
+  Elf32_Half	e_shnum;		/* Section header table entry count */
+  Elf32_Half	e_shstrndx;		/* Section header string table index */
+} Elf32_Ehdr;
+
+typedef struct
+{
+  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
+  Elf64_Half	e_type;			/* Object file type */
+  Elf64_Half	e_machine;		/* Architecture */
+  Elf64_Word	e_version;		/* Object file version */
+  Elf64_Addr	e_entry;		/* Entry point virtual address */
+  Elf64_Off	e_phoff;		/* Program header table file offset */
+  Elf64_Off	e_shoff;		/* Section header table file offset */
+  Elf64_Word	e_flags;		/* Processor-specific flags */
+  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
+  Elf64_Half	e_phentsize;		/* Program header table entry size */
+  Elf64_Half	e_phnum;		/* Program header table entry count */
+  Elf64_Half	e_shentsize;		/* Section header table entry size */
+  Elf64_Half	e_shnum;		/* Section header table entry count */
+  Elf64_Half	e_shstrndx;		/* Section header string table index */
+} Elf64_Ehdr;
+
+/* Fields in the e_ident array.  The EI_* macros are indices into the
+   array.  The macros under each EI_* macro are the values the byte
+   may have.  */
+
+#define EI_MAG0		0		/* File identification byte 0 index */
+#define ELFMAG0		0x7f		/* Magic number byte 0 */
+
+#define EI_MAG1		1		/* File identification byte 1 index */
+#define ELFMAG1		'E'		/* Magic number byte 1 */
+
+#define EI_MAG2		2		/* File identification byte 2 index */
+#define ELFMAG2		'L'		/* Magic number byte 2 */
+
+#define EI_MAG3		3		/* File identification byte 3 index */
+#define ELFMAG3		'F'		/* Magic number byte 3 */
+
+/* Conglomeration of the identification bytes, for easy testing as a word.  */
+#define	ELFMAG		"\177ELF"
+#define	SELFMAG		4
+
+#define EI_CLASS	4		/* File class byte index */
+#define ELFCLASSNONE	0		/* Invalid class */
+#define ELFCLASS32	1		/* 32-bit objects */
+#define ELFCLASS64	2		/* 64-bit objects */
+#define ELFCLASSNUM	3
+
+#define EI_DATA		5		/* Data encoding byte index */
+#define ELFDATANONE	0		/* Invalid data encoding */
+#define ELFDATA2LSB	1		/* 2's complement, little endian */
+#define ELFDATA2MSB	2		/* 2's complement, big endian */
+#define ELFDATANUM	3
+
+#define EI_VERSION	6		/* File version byte index */
+					/* Value must be EV_CURRENT */
+
+#define EI_OSABI	7		/* OS ABI identification */
+#define ELFOSABI_NONE		0	/* UNIX System V ABI */
+#define ELFOSABI_SYSV		0	/* Alias.  */
+#define ELFOSABI_HPUX		1	/* HP-UX */
+#define ELFOSABI_NETBSD		2	/* NetBSD.  */
+#define ELFOSABI_LINUX		3	/* Linux.  */
+#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
+#define ELFOSABI_AIX		7	/* IBM AIX.  */
+#define ELFOSABI_IRIX		8	/* SGI Irix.  */
+#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
+#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
+#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
+#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
+#define ELFOSABI_ARM		97	/* ARM */
+#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
+
+#define EI_ABIVERSION	8		/* ABI version */
+
+#define EI_PAD		9		/* Byte index of padding bytes */
+
+/* Legal values for e_type (object file type).  */
+
+#define ET_NONE		0		/* No file type */
+#define ET_REL		1		/* Relocatable file */
+#define ET_EXEC		2		/* Executable file */
+#define ET_DYN		3		/* Shared object file */
+#define ET_CORE		4		/* Core file */
+#define	ET_NUM		5		/* Number of defined types */
+#define ET_LOOS		0xfe00		/* OS-specific range start */
+#define ET_HIOS		0xfeff		/* OS-specific range end */
+#define ET_LOPROC	0xff00		/* Processor-specific range start */
+#define ET_HIPROC	0xffff		/* Processor-specific range end */
+
+/* Legal values for e_machine (architecture).  */
+
+#define EM_NONE		 0		/* No machine */
+#define EM_M32		 1		/* AT&T WE 32100 */
+#define EM_SPARC	 2		/* SUN SPARC */
+#define EM_386		 3		/* Intel 80386 */
+#define EM_68K		 4		/* Motorola m68k family */
+#define EM_88K		 5		/* Motorola m88k family */
+#define EM_860		 7		/* Intel 80860 */
+#define EM_MIPS		 8		/* MIPS R3000 big-endian */
+#define EM_S370		 9		/* IBM System/370 */
+#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
+
+#define EM_PARISC	15		/* HPPA */
+#define EM_VPP500	17		/* Fujitsu VPP500 */
+#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
+#define EM_960		19		/* Intel 80960 */
+#define EM_PPC		20		/* PowerPC */
+#define EM_PPC64	21		/* PowerPC 64-bit */
+#define EM_S390		22		/* IBM S390 */
+
+#define EM_V800		36		/* NEC V800 series */
+#define EM_FR20		37		/* Fujitsu FR20 */
+#define EM_RH32		38		/* TRW RH-32 */
+#define EM_RCE		39		/* Motorola RCE */
+#define EM_ARM		40		/* ARM */
+#define EM_FAKE_ALPHA	41		/* Digital Alpha */
+#define EM_SH		42		/* Hitachi SH */
+#define EM_SPARCV9	43		/* SPARC v9 64-bit */
+#define EM_TRICORE	44		/* Siemens Tricore */
+#define EM_ARC		45		/* Argonaut RISC Core */
+#define EM_H8_300	46		/* Hitachi H8/300 */
+#define EM_H8_300H	47		/* Hitachi H8/300H */
+#define EM_H8S		48		/* Hitachi H8S */
+#define EM_H8_500	49		/* Hitachi H8/500 */
+#define EM_IA_64	50		/* Intel Merced */
+#define EM_MIPS_X	51		/* Stanford MIPS-X */
+#define EM_COLDFIRE	52		/* Motorola Coldfire */
+#define EM_68HC12	53		/* Motorola M68HC12 */
+#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
+#define EM_PCP		55		/* Siemens PCP */
+#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
+#define EM_NDR1		57		/* Denso NDR1 microprocessor */
+#define EM_STARCORE	58		/* Motorola Start*Core processor */
+#define EM_ME16		59		/* Toyota ME16 processor */
+#define EM_ST100	60		/* STMicroelectronic ST100 processor */
+#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
+#define EM_X86_64	62		/* AMD x86-64 architecture */
+#define EM_PDSP		63		/* Sony DSP Processor */
+
+#define EM_FX66		66		/* Siemens FX66 microcontroller */
+#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
+#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
+#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
+#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
+#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
+#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
+#define EM_SVX		73		/* Silicon Graphics SVx */
+#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
+#define EM_VAX		75		/* Digital VAX */
+#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
+#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
+#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
+#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
+#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
+#define EM_HUANY	81		/* Harvard University machine-independent object files */
+#define EM_PRISM	82		/* SiTera Prism */
+#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
+#define EM_FR30		84		/* Fujitsu FR30 */
+#define EM_D10V		85		/* Mitsubishi D10V */
+#define EM_D30V		86		/* Mitsubishi D30V */
+#define EM_V850		87		/* NEC v850 */
+#define EM_M32R		88		/* Mitsubishi M32R */
+#define EM_MN10300	89		/* Matsushita MN10300 */
+#define EM_MN10200	90		/* Matsushita MN10200 */
+#define EM_PJ		91		/* picoJava */
+#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
+#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
+#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
+#define EM_NUM		95
+
+/* If it is necessary to assign new unofficial EM_* values, please
+   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
+   chances of collision with official or non-GNU unofficial values.  */
+
+#define EM_ALPHA	0x9026
+
+/* Legal values for e_version (version).  */
+
+#define EV_NONE		0		/* Invalid ELF version */
+#define EV_CURRENT	1		/* Current version */
+#define EV_NUM		2
+
+/* Section header.  */
+
+typedef struct
+{
+  Elf32_Word	sh_name;		/* Section name (string tbl index) */
+  Elf32_Word	sh_type;		/* Section type */
+  Elf32_Word	sh_flags;		/* Section flags */
+  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
+  Elf32_Off	sh_offset;		/* Section file offset */
+  Elf32_Word	sh_size;		/* Section size in bytes */
+  Elf32_Word	sh_link;		/* Link to another section */
+  Elf32_Word	sh_info;		/* Additional section information */
+  Elf32_Word	sh_addralign;		/* Section alignment */
+  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
+} Elf32_Shdr;
+
+typedef struct
+{
+  Elf64_Word	sh_name;		/* Section name (string tbl index) */
+  Elf64_Word	sh_type;		/* Section type */
+  Elf64_Xword	sh_flags;		/* Section flags */
+  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
+  Elf64_Off	sh_offset;		/* Section file offset */
+  Elf64_Xword	sh_size;		/* Section size in bytes */
+  Elf64_Word	sh_link;		/* Link to another section */
+  Elf64_Word	sh_info;		/* Additional section information */
+  Elf64_Xword	sh_addralign;		/* Section alignment */
+  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
+} Elf64_Shdr;
+
+/* Special section indices.  */
+
+#define SHN_UNDEF	0		/* Undefined section */
+#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
+#define SHN_LOPROC	0xff00		/* Start of processor-specific */
+#define SHN_BEFORE	0xff00		/* Order section before all others
+					   (Solaris).  */
+#define SHN_AFTER	0xff01		/* Order section after all others
+					   (Solaris).  */
+#define SHN_HIPROC	0xff1f		/* End of processor-specific */
+#define SHN_LOOS	0xff20		/* Start of OS-specific */
+#define SHN_HIOS	0xff3f		/* End of OS-specific */
+#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
+#define SHN_COMMON	0xfff2		/* Associated symbol is common */
+#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
+#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
+
+/* Legal values for sh_type (section type).  */
+
+#define SHT_NULL	  0		/* Section header table entry unused */
+#define SHT_PROGBITS	  1		/* Program data */
+#define SHT_SYMTAB	  2		/* Symbol table */
+#define SHT_STRTAB	  3		/* String table */
+#define SHT_RELA	  4		/* Relocation entries with addends */
+#define SHT_HASH	  5		/* Symbol hash table */
+#define SHT_DYNAMIC	  6		/* Dynamic linking information */
+#define SHT_NOTE	  7		/* Notes */
+#define SHT_NOBITS	  8		/* Program space with no data (bss) */
+#define SHT_REL		  9		/* Relocation entries, no addends */
+#define SHT_SHLIB	  10		/* Reserved */
+#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
+#define SHT_INIT_ARRAY	  14		/* Array of constructors */
+#define SHT_FINI_ARRAY	  15		/* Array of destructors */
+#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
+#define SHT_GROUP	  17		/* Section group */
+#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
+#define	SHT_NUM		  19		/* Number of defined types.  */
+#define SHT_LOOS	  0x60000000	/* Start OS-specific */
+#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
+#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
+#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
+#define SHT_SUNW_move	  0x6ffffffa
+#define SHT_SUNW_COMDAT   0x6ffffffb
+#define SHT_SUNW_syminfo  0x6ffffffc
+#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
+#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
+#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
+#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
+#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
+#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
+#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
+#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
+#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
+
+/* Legal values for sh_flags (section flags).  */
+
+#define SHF_WRITE	     (1 << 0)	/* Writable */
+#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
+#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
+#define SHF_MERGE	     (1 << 4)	/* Might be merged */
+#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
+#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
+#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
+#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
+					   required */
+#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
+#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
+#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
+#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
+#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
+					   (Solaris).  */
+#define SHF_EXCLUDE	     (1 << 31)	/* Section is excluded unless
+					   referenced or allocated (Solaris).*/
+
+/* Section group handling.  */
+#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
+
+/* Symbol table entry.  */
+
+typedef struct
+{
+  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
+  Elf32_Addr	st_value;		/* Symbol value */
+  Elf32_Word	st_size;		/* Symbol size */
+  unsigned char	st_info;		/* Symbol type and binding */
+  unsigned char	st_other;		/* Symbol visibility */
+  Elf32_Section	st_shndx;		/* Section index */
+} Elf32_Sym;
+
+typedef struct
+{
+  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
+  unsigned char	st_info;		/* Symbol type and binding */
+  unsigned char st_other;		/* Symbol visibility */
+  Elf64_Section	st_shndx;		/* Section index */
+  Elf64_Addr	st_value;		/* Symbol value */
+  Elf64_Xword	st_size;		/* Symbol size */
+} Elf64_Sym;
+
+/* The syminfo section if available contains additional information about
+   every dynamic symbol.  */
+
+typedef struct
+{
+  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
+  Elf32_Half si_flags;			/* Per symbol flags */
+} Elf32_Syminfo;
+
+typedef struct
+{
+  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
+  Elf64_Half si_flags;			/* Per symbol flags */
+} Elf64_Syminfo;
+
+/* Possible values for si_boundto.  */
+#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
+#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
+#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
+
+/* Possible bitmasks for si_flags.  */
+#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
+#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
+#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
+#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
+					   loaded */
+/* Syminfo version values.  */
+#define SYMINFO_NONE		0
+#define SYMINFO_CURRENT		1
+#define SYMINFO_NUM		2
+
+
+/* How to extract and insert information held in the st_info field.  */
+
+#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
+#define ELF32_ST_TYPE(val)		((val) & 0xf)
+#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
+
+/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
+#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
+#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
+#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
+
+/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
+
+#define STB_LOCAL	0		/* Local symbol */
+#define STB_GLOBAL	1		/* Global symbol */
+#define STB_WEAK	2		/* Weak symbol */
+#define	STB_NUM		3		/* Number of defined types.  */
+#define STB_LOOS	10		/* Start of OS-specific */
+#define STB_HIOS	12		/* End of OS-specific */
+#define STB_LOPROC	13		/* Start of processor-specific */
+#define STB_HIPROC	15		/* End of processor-specific */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_NOTYPE	0		/* Symbol type is unspecified */
+#define STT_OBJECT	1		/* Symbol is a data object */
+#define STT_FUNC	2		/* Symbol is a code object */
+#define STT_SECTION	3		/* Symbol associated with a section */
+#define STT_FILE	4		/* Symbol's name is file name */
+#define STT_COMMON	5		/* Symbol is a common data object */
+#define STT_TLS		6		/* Symbol is thread-local data object*/
+#define	STT_NUM		7		/* Number of defined types.  */
+#define STT_LOOS	10		/* Start of OS-specific */
+#define STT_HIOS	12		/* End of OS-specific */
+#define STT_LOPROC	13		/* Start of processor-specific */
+#define STT_HIPROC	15		/* End of processor-specific */
+
+
+/* Symbol table indices are found in the hash buckets and chain table
+   of a symbol hash table section.  This special index value indicates
+   the end of a chain, meaning no further symbols are found in that bucket.  */
+
+#define STN_UNDEF	0		/* End of a chain.  */
+
+
+/* How to extract and insert information held in the st_other field.  */
+
+#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
+
+/* For ELF64 the definitions are the same.  */
+#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
+
+/* Symbol visibility specification encoded in the st_other field.  */
+#define STV_DEFAULT	0		/* Default symbol visibility rules */
+#define STV_INTERNAL	1		/* Processor specific hidden class */
+#define STV_HIDDEN	2		/* Sym unavailable in other modules */
+#define STV_PROTECTED	3		/* Not preemptible, not exported */
+
+
+/* Relocation table entry without addend (in section of type SHT_REL).  */
+
+typedef struct
+{
+  Elf32_Addr	r_offset;		/* Address */
+  Elf32_Word	r_info;			/* Relocation type and symbol index */
+} Elf32_Rel;
+
+/* I have seen two different definitions of the Elf64_Rel and
+   Elf64_Rela structures, so we'll leave them out until Novell (or
+   whoever) gets their act together.  */
+/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
+
+typedef struct
+{
+  Elf64_Addr	r_offset;		/* Address */
+  Elf64_Xword	r_info;			/* Relocation type and symbol index */
+} Elf64_Rel;
+
+/* Relocation table entry with addend (in section of type SHT_RELA).  */
+
+typedef struct
+{
+  Elf32_Addr	r_offset;		/* Address */
+  Elf32_Word	r_info;			/* Relocation type and symbol index */
+  Elf32_Sword	r_addend;		/* Addend */
+} Elf32_Rela;
+
+typedef struct
+{
+  Elf64_Addr	r_offset;		/* Address */
+  Elf64_Xword	r_info;			/* Relocation type and symbol index */
+  Elf64_Sxword	r_addend;		/* Addend */
+} Elf64_Rela;
+
+/* How to extract and insert information held in the r_info field.  */
+
+#define ELF32_R_SYM(val)		((val) >> 8)
+#define ELF32_R_TYPE(val)		((val) & 0xff)
+#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
+
+#define ELF64_R_SYM(i)			((i) >> 32)
+#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
+#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
+
+/* Program segment header.  */
+
+typedef struct
+{
+  Elf32_Word	p_type;			/* Segment type */
+  Elf32_Off	p_offset;		/* Segment file offset */
+  Elf32_Addr	p_vaddr;		/* Segment virtual address */
+  Elf32_Addr	p_paddr;		/* Segment physical address */
+  Elf32_Word	p_filesz;		/* Segment size in file */
+  Elf32_Word	p_memsz;		/* Segment size in memory */
+  Elf32_Word	p_flags;		/* Segment flags */
+  Elf32_Word	p_align;		/* Segment alignment */
+} Elf32_Phdr;
+
+typedef struct
+{
+  Elf64_Word	p_type;			/* Segment type */
+  Elf64_Word	p_flags;		/* Segment flags */
+  Elf64_Off	p_offset;		/* Segment file offset */
+  Elf64_Addr	p_vaddr;		/* Segment virtual address */
+  Elf64_Addr	p_paddr;		/* Segment physical address */
+  Elf64_Xword	p_filesz;		/* Segment size in file */
+  Elf64_Xword	p_memsz;		/* Segment size in memory */
+  Elf64_Xword	p_align;		/* Segment alignment */
+} Elf64_Phdr;
+
+/* Legal values for p_type (segment type).  */
+
+#define	PT_NULL		0		/* Program header table entry unused */
+#define PT_LOAD		1		/* Loadable program segment */
+#define PT_DYNAMIC	2		/* Dynamic linking information */
+#define PT_INTERP	3		/* Program interpreter */
+#define PT_NOTE		4		/* Auxiliary information */
+#define PT_SHLIB	5		/* Reserved */
+#define PT_PHDR		6		/* Entry for header table itself */
+#define PT_TLS		7		/* Thread-local storage segment */
+#define	PT_NUM		8		/* Number of defined types */
+#define PT_LOOS		0x60000000	/* Start of OS-specific */
+#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
+#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
+#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
+#define PT_LOSUNW	0x6ffffffa
+#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
+#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
+#define PT_HISUNW	0x6fffffff
+#define PT_HIOS		0x6fffffff	/* End of OS-specific */
+#define PT_LOPROC	0x70000000	/* Start of processor-specific */
+#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
+
+/* Legal values for p_flags (segment flags).  */
+
+#define PF_X		(1 << 0)	/* Segment is executable */
+#define PF_W		(1 << 1)	/* Segment is writable */
+#define PF_R		(1 << 2)	/* Segment is readable */
+#define PF_MASKOS	0x0ff00000	/* OS-specific */
+#define PF_MASKPROC	0xf0000000	/* Processor-specific */
+
+/* Legal values for note segment descriptor types for core files. */
+
+#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
+#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
+#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
+#define NT_PRXREG	4		/* Contains copy of prxregset struct */
+#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
+#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
+#define NT_AUXV		6		/* Contains copy of auxv array */
+#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
+#define NT_ASRS		8		/* Contains copy of asrset struct */
+#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
+#define NT_PSINFO	13		/* Contains copy of psinfo struct */
+#define NT_PRCRED	14		/* Contains copy of prcred struct */
+#define NT_UTSNAME	15		/* Contains copy of utsname struct */
+#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
+#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
+#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct*/
+
+/* Legal values for the note segment descriptor types for object files.  */
+
+#define NT_VERSION	1		/* Contains a version string.  */
+
+
+/* Dynamic section entry.  */
+
+typedef struct
+{
+  Elf32_Sword	d_tag;			/* Dynamic entry type */
+  union
+    {
+      Elf32_Word d_val;			/* Integer value */
+      Elf32_Addr d_ptr;			/* Address value */
+    } d_un;
+} Elf32_Dyn;
+
+typedef struct
+{
+  Elf64_Sxword	d_tag;			/* Dynamic entry type */
+  union
+    {
+      Elf64_Xword d_val;		/* Integer value */
+      Elf64_Addr d_ptr;			/* Address value */
+    } d_un;
+} Elf64_Dyn;
+
+/* Legal values for d_tag (dynamic entry type).  */
+
+#define DT_NULL		0		/* Marks end of dynamic section */
+#define DT_NEEDED	1		/* Name of needed library */
+#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
+#define DT_PLTGOT	3		/* Processor defined value */
+#define DT_HASH		4		/* Address of symbol hash table */
+#define DT_STRTAB	5		/* Address of string table */
+#define DT_SYMTAB	6		/* Address of symbol table */
+#define DT_RELA		7		/* Address of Rela relocs */
+#define DT_RELASZ	8		/* Total size of Rela relocs */
+#define DT_RELAENT	9		/* Size of one Rela reloc */
+#define DT_STRSZ	10		/* Size of string table */
+#define DT_SYMENT	11		/* Size of one symbol table entry */
+#define DT_INIT		12		/* Address of init function */
+#define DT_FINI		13		/* Address of termination function */
+#define DT_SONAME	14		/* Name of shared object */
+#define DT_RPATH	15		/* Library search path (deprecated) */
+#define DT_SYMBOLIC	16		/* Start symbol search here */
+#define DT_REL		17		/* Address of Rel relocs */
+#define DT_RELSZ	18		/* Total size of Rel relocs */
+#define DT_RELENT	19		/* Size of one Rel reloc */
+#define DT_PLTREL	20		/* Type of reloc in PLT */
+#define DT_DEBUG	21		/* For debugging; unspecified */
+#define DT_TEXTREL	22		/* Reloc might modify .text */
+#define DT_JMPREL	23		/* Address of PLT relocs */
+#define	DT_BIND_NOW	24		/* Process relocations of object */
+#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
+#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
+#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
+#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
+#define DT_RUNPATH	29		/* Library search path */
+#define DT_FLAGS	30		/* Flags for the object being loaded */
+#define DT_ENCODING	32		/* Start of encoded range */
+#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
+#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
+#define	DT_NUM		34		/* Number used */
+#define DT_LOOS		0x6000000d	/* Start of OS-specific */
+#define DT_HIOS		0x6ffff000	/* End of OS-specific */
+#define DT_LOPROC	0x70000000	/* Start of processor-specific */
+#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
+#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
+
+/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
+   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
+   approach.  */
+#define DT_VALRNGLO	0x6ffffd00
+#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
+#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
+#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
+#define DT_CHECKSUM	0x6ffffdf8
+#define DT_PLTPADSZ	0x6ffffdf9
+#define DT_MOVEENT	0x6ffffdfa
+#define DT_MOVESZ	0x6ffffdfb
+#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
+#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
+					   the following DT_* entry.  */
+#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
+#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
+#define DT_VALRNGHI	0x6ffffdff
+#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
+#define DT_VALNUM 12
+
+/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
+   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
+
+   If any adjustment is made to the ELF object after it has been
+   built these entries will need to be adjusted.  */
+#define DT_ADDRRNGLO	0x6ffffe00
+#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
+#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
+#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
+#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
+#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
+#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
+#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
+#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
+#define DT_ADDRRNGHI	0x6ffffeff
+#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
+#define DT_ADDRNUM 10
+
+/* The versioning entry types.  The next are defined as part of the
+   GNU extension.  */
+#define DT_VERSYM	0x6ffffff0
+
+#define DT_RELACOUNT	0x6ffffff9
+#define DT_RELCOUNT	0x6ffffffa
+
+/* These were chosen by Sun.  */
+#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
+#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
+					   table */
+#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
+#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
+					   versions */
+#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
+#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
+#define DT_VERSIONTAGNUM 16
+
+/* Sun added these machine-independent extensions in the "processor-specific"
+   range.  Be compatible.  */
+#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
+#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
+#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
+#define DT_EXTRANUM	3
+
+/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
+#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
+#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
+#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
+#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
+#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
+
+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
+   entry in the dynamic section.  */
+#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
+#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
+#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
+#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
+#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
+#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
+#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
+#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
+#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
+#define DF_1_TRANS	0x00000200
+#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
+#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
+#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
+#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
+#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
+#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
+#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
+
+/* Flags for the feature selection in DT_FEATURE_1.  */
+#define DTF_1_PARINIT	0x00000001
+#define DTF_1_CONFEXP	0x00000002
+
+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
+#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
+#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
+					   generally available.  */
+
+/* Version definition sections.  */
+
+typedef struct
+{
+  Elf32_Half	vd_version;		/* Version revision */
+  Elf32_Half	vd_flags;		/* Version information */
+  Elf32_Half	vd_ndx;			/* Version Index */
+  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
+  Elf32_Word	vd_hash;		/* Version name hash value */
+  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
+  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
+					   entry */
+} Elf32_Verdef;
+
+typedef struct
+{
+  Elf64_Half	vd_version;		/* Version revision */
+  Elf64_Half	vd_flags;		/* Version information */
+  Elf64_Half	vd_ndx;			/* Version Index */
+  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
+  Elf64_Word	vd_hash;		/* Version name hash value */
+  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
+  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
+					   entry */
+} Elf64_Verdef;
+
+
+/* Legal values for vd_version (version revision).  */
+#define VER_DEF_NONE	0		/* No version */
+#define VER_DEF_CURRENT	1		/* Current version */
+#define VER_DEF_NUM	2		/* Given version number */
+
+/* Legal values for vd_flags (version information flags).  */
+#define VER_FLG_BASE	0x1		/* Version definition of file itself */
+#define VER_FLG_WEAK	0x2		/* Weak version identifier */
+
+/* Versym symbol index values.  */
+#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
+#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
+#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
+#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
+
+/* Auxialiary version information.  */
+
+typedef struct
+{
+  Elf32_Word	vda_name;		/* Version or dependency names */
+  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
+					   entry */
+} Elf32_Verdaux;
+
+typedef struct
+{
+  Elf64_Word	vda_name;		/* Version or dependency names */
+  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
+					   entry */
+} Elf64_Verdaux;
+
+
+/* Version dependency section.  */
+
+typedef struct
+{
+  Elf32_Half	vn_version;		/* Version of structure */
+  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
+  Elf32_Word	vn_file;		/* Offset of filename for this
+					   dependency */
+  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
+  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
+					   entry */
+} Elf32_Verneed;
+
+typedef struct
+{
+  Elf64_Half	vn_version;		/* Version of structure */
+  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
+  Elf64_Word	vn_file;		/* Offset of filename for this
+					   dependency */
+  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
+  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
+					   entry */
+} Elf64_Verneed;
+
+
+/* Legal values for vn_version (version revision).  */
+#define VER_NEED_NONE	 0		/* No version */
+#define VER_NEED_CURRENT 1		/* Current version */
+#define VER_NEED_NUM	 2		/* Given version number */
+
+/* Auxiliary needed version information.  */
+
+typedef struct
+{
+  Elf32_Word	vna_hash;		/* Hash value of dependency name */
+  Elf32_Half	vna_flags;		/* Dependency specific information */
+  Elf32_Half	vna_other;		/* Unused */
+  Elf32_Word	vna_name;		/* Dependency name string offset */
+  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
+					   entry */
+} Elf32_Vernaux;
+
+typedef struct
+{
+  Elf64_Word	vna_hash;		/* Hash value of dependency name */
+  Elf64_Half	vna_flags;		/* Dependency specific information */
+  Elf64_Half	vna_other;		/* Unused */
+  Elf64_Word	vna_name;		/* Dependency name string offset */
+  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
+					   entry */
+} Elf64_Vernaux;
+
+
+/* Legal values for vna_flags.  */
+#define VER_FLG_WEAK	0x2		/* Weak version identifier */
+
+
+/* Auxiliary vector.  */
+
+/* This vector is normally only used by the program interpreter.  The
+   usual definition in an ABI supplement uses the name auxv_t.  The
+   vector is not usually defined in a standard <elf.h> file, but it
+   can't hurt.  We rename it to avoid conflicts.  The sizes of these
+   types are an arrangement between the exec server and the program
+   interpreter, so we don't fully specify them here.  */
+
+typedef struct
+{
+  int a_type;			/* Entry type */
+  union
+    {
+      long int a_val;		/* Integer value */
+      void *a_ptr;		/* Pointer value */
+      void (*a_fcn) (void);	/* Function pointer value */
+    } a_un;
+} Elf32_auxv_t;
+
+typedef struct
+{
+  long int a_type;		/* Entry type */
+  union
+    {
+      long int a_val;		/* Integer value */
+      void *a_ptr;		/* Pointer value */
+      void (*a_fcn) (void);	/* Function pointer value */
+    } a_un;
+} Elf64_auxv_t;
+
+/* Legal values for a_type (entry type).  */
+
+#define AT_NULL		0		/* End of vector */
+#define AT_IGNORE	1		/* Entry should be ignored */
+#define AT_EXECFD	2		/* File descriptor of program */
+#define AT_PHDR		3		/* Program headers for program */
+#define AT_PHENT	4		/* Size of program header entry */
+#define AT_PHNUM	5		/* Number of program headers */
+#define AT_PAGESZ	6		/* System page size */
+#define AT_BASE		7		/* Base address of interpreter */
+#define AT_FLAGS	8		/* Flags */
+#define AT_ENTRY	9		/* Entry point of program */
+#define AT_NOTELF	10		/* Program is not ELF */
+#define AT_UID		11		/* Real uid */
+#define AT_EUID		12		/* Effective uid */
+#define AT_GID		13		/* Real gid */
+#define AT_EGID		14		/* Effective gid */
+#define AT_CLKTCK	17		/* Frequency of times() */
+
+/* Some more special a_type values describing the hardware.  */
+#define AT_PLATFORM	15		/* String identifying platform.  */
+#define AT_HWCAP	16		/* Machine dependent hints about
+					   processor capabilities.  */
+
+/* This entry gives some information about the FPU initialization
+   performed by the kernel.  */
+#define AT_FPUCW	18		/* Used FPU control word.  */
+
+/* Cache block sizes.  */
+#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
+#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
+#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
+
+/* A special ignored value for PPC, used by the kernel to control the
+   interpretation of the AUXV. Must be > 16.  */
+#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
+
+#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
+
+/* Pointer to the global system page used for system calls and other
+   nice things.  */
+#define AT_SYSINFO	32
+#define AT_SYSINFO_EHDR	33
+
+/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
+   log2 of line size; mask those to get cache size.  */
+#define AT_L1I_CACHESHAPE	34
+#define AT_L1D_CACHESHAPE	35
+#define AT_L2_CACHESHAPE	36
+#define AT_L3_CACHESHAPE	37
+
+/* Note section contents.  Each entry in the note section begins with
+   a header of a fixed form.  */
+
+typedef struct
+{
+  Elf32_Word n_namesz;			/* Length of the note's name.  */
+  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
+  Elf32_Word n_type;			/* Type of the note.  */
+} Elf32_Nhdr;
+
+typedef struct
+{
+  Elf64_Word n_namesz;			/* Length of the note's name.  */
+  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
+  Elf64_Word n_type;			/* Type of the note.  */
+} Elf64_Nhdr;
+
+/* Known names of notes.  */
+
+/* Solaris entries in the note section have this name.  */
+#define ELF_NOTE_SOLARIS	"SUNW Solaris"
+
+/* Note entries for GNU systems have this name.  */
+#define ELF_NOTE_GNU		"GNU"
+
+
+/* Defined types of notes for Solaris.  */
+
+/* Value of descriptor (one word) is desired pagesize for the binary.  */
+#define ELF_NOTE_PAGESIZE_HINT	1
+
+
+/* Defined note types for GNU systems.  */
+
+/* ABI information.  The descriptor consists of words:
+   word 0: OS descriptor
+   word 1: major version of the ABI
+   word 2: minor version of the ABI
+   word 3: subminor version of the ABI
+*/
+#define ELF_NOTE_ABI		1
+
+/* Known OSes.  These value can appear in word 0 of an ELF_NOTE_ABI
+   note section entry.  */
+#define ELF_NOTE_OS_LINUX	0
+#define ELF_NOTE_OS_GNU		1
+#define ELF_NOTE_OS_SOLARIS2	2
+#define ELF_NOTE_OS_FREEBSD	3
+
+
+/* Move records.  */
+typedef struct
+{
+  Elf32_Xword m_value;		/* Symbol value.  */
+  Elf32_Word m_info;		/* Size and index.  */
+  Elf32_Word m_poffset;		/* Symbol offset.  */
+  Elf32_Half m_repeat;		/* Repeat count.  */
+  Elf32_Half m_stride;		/* Stride info.  */
+} Elf32_Move;
+
+typedef struct
+{
+  Elf64_Xword m_value;		/* Symbol value.  */
+  Elf64_Xword m_info;		/* Size and index.  */
+  Elf64_Xword m_poffset;	/* Symbol offset.  */
+  Elf64_Half m_repeat;		/* Repeat count.  */
+  Elf64_Half m_stride;		/* Stride info.  */
+} Elf64_Move;
+
+/* Macro to construct move records.  */
+#define ELF32_M_SYM(info)	((info) >> 8)
+#define ELF32_M_SIZE(info)	((unsigned char) (info))
+#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
+
+#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
+#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
+#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
+
+
+/* Motorola 68k specific definitions.  */
+
+/* Values for Elf32_Ehdr.e_flags.  */
+#define EF_CPU32	0x00810000
+
+/* m68k relocs.  */
+
+#define R_68K_NONE	0		/* No reloc */
+#define R_68K_32	1		/* Direct 32 bit  */
+#define R_68K_16	2		/* Direct 16 bit  */
+#define R_68K_8		3		/* Direct 8 bit  */
+#define R_68K_PC32	4		/* PC relative 32 bit */
+#define R_68K_PC16	5		/* PC relative 16 bit */
+#define R_68K_PC8	6		/* PC relative 8 bit */
+#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
+#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
+#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
+#define R_68K_GOT32O	10		/* 32 bit GOT offset */
+#define R_68K_GOT16O	11		/* 16 bit GOT offset */
+#define R_68K_GOT8O	12		/* 8 bit GOT offset */
+#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
+#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
+#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
+#define R_68K_PLT32O	16		/* 32 bit PLT offset */
+#define R_68K_PLT16O	17		/* 16 bit PLT offset */
+#define R_68K_PLT8O	18		/* 8 bit PLT offset */
+#define R_68K_COPY	19		/* Copy symbol at runtime */
+#define R_68K_GLOB_DAT	20		/* Create GOT entry */
+#define R_68K_JMP_SLOT	21		/* Create PLT entry */
+#define R_68K_RELATIVE	22		/* Adjust by program base */
+/* Keep this the last entry.  */
+#define R_68K_NUM	23
+
+/* Intel 80386 specific definitions.  */
+
+/* i386 relocs.  */
+
+#define R_386_NONE	   0		/* No reloc */
+#define R_386_32	   1		/* Direct 32 bit  */
+#define R_386_PC32	   2		/* PC relative 32 bit */
+#define R_386_GOT32	   3		/* 32 bit GOT entry */
+#define R_386_PLT32	   4		/* 32 bit PLT address */
+#define R_386_COPY	   5		/* Copy symbol at runtime */
+#define R_386_GLOB_DAT	   6		/* Create GOT entry */
+#define R_386_JMP_SLOT	   7		/* Create PLT entry */
+#define R_386_RELATIVE	   8		/* Adjust by program base */
+#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
+#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
+#define R_386_32PLT	   11
+#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
+#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
+					   block offset */
+#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
+					   offset */
+#define R_386_TLS_LE	   17		/* Offset relative to static TLS
+					   block */
+#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
+					   general dynamic thread local data */
+#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
+					   local dynamic thread local data
+					   in LE code */
+#define R_386_16	   20
+#define R_386_PC16	   21
+#define R_386_8		   22
+#define R_386_PC8	   23
+#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
+					   thread local data */
+#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
+#define R_386_TLS_GD_CALL  26		/* Relocation for call to
+					   __tls_get_addr() */
+#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
+#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
+					   thread local data in LE code */
+#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
+#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
+					   __tls_get_addr() in LDM code */
+#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
+#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
+#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
+					   block offset */
+#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
+					   TLS block */
+#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
+#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
+#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
+/* Keep this the last entry.  */
+#define R_386_NUM	   38
+
+/* SUN SPARC specific definitions.  */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
+
+/* Values for Elf64_Ehdr.e_flags.  */
+
+#define EF_SPARCV9_MM		3
+#define EF_SPARCV9_TSO		0
+#define EF_SPARCV9_PSO		1
+#define EF_SPARCV9_RMO		2
+#define EF_SPARC_LEDATA		0x800000 /* little endian data */
+#define EF_SPARC_EXT_MASK	0xFFFF00
+#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
+#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
+#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
+#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
+
+/* SPARC relocs.  */
+
+#define R_SPARC_NONE		0	/* No reloc */
+#define R_SPARC_8		1	/* Direct 8 bit */
+#define R_SPARC_16		2	/* Direct 16 bit */
+#define R_SPARC_32		3	/* Direct 32 bit */
+#define R_SPARC_DISP8		4	/* PC relative 8 bit */
+#define R_SPARC_DISP16		5	/* PC relative 16 bit */
+#define R_SPARC_DISP32		6	/* PC relative 32 bit */
+#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
+#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
+#define R_SPARC_HI22		9	/* High 22 bit */
+#define R_SPARC_22		10	/* Direct 22 bit */
+#define R_SPARC_13		11	/* Direct 13 bit */
+#define R_SPARC_LO10		12	/* Truncated 10 bit */
+#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
+#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
+#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
+#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
+#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
+#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
+#define R_SPARC_COPY		19	/* Copy symbol at runtime */
+#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
+#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
+#define R_SPARC_RELATIVE	22	/* Adjust by program base */
+#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
+
+/* Additional Sparc64 relocs.  */
+
+#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
+#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
+#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
+#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
+#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
+#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
+#define R_SPARC_10		30	/* Direct 10 bit */
+#define R_SPARC_11		31	/* Direct 11 bit */
+#define R_SPARC_64		32	/* Direct 64 bit */
+#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
+#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
+#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
+#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
+#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
+#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
+#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
+#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
+#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
+#define R_SPARC_7		43	/* Direct 7 bit */
+#define R_SPARC_5		44	/* Direct 5 bit */
+#define R_SPARC_6		45	/* Direct 6 bit */
+#define R_SPARC_DISP64		46	/* PC relative 64 bit */
+#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
+#define R_SPARC_HIX22		48	/* High 22 bit complemented */
+#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
+#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
+#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
+#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
+#define R_SPARC_REGISTER	53	/* Global register usage */
+#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
+#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
+#define R_SPARC_TLS_GD_HI22	56
+#define R_SPARC_TLS_GD_LO10	57
+#define R_SPARC_TLS_GD_ADD	58
+#define R_SPARC_TLS_GD_CALL	59
+#define R_SPARC_TLS_LDM_HI22	60
+#define R_SPARC_TLS_LDM_LO10	61
+#define R_SPARC_TLS_LDM_ADD	62
+#define R_SPARC_TLS_LDM_CALL	63
+#define R_SPARC_TLS_LDO_HIX22	64
+#define R_SPARC_TLS_LDO_LOX10	65
+#define R_SPARC_TLS_LDO_ADD	66
+#define R_SPARC_TLS_IE_HI22	67
+#define R_SPARC_TLS_IE_LO10	68
+#define R_SPARC_TLS_IE_LD	69
+#define R_SPARC_TLS_IE_LDX	70
+#define R_SPARC_TLS_IE_ADD	71
+#define R_SPARC_TLS_LE_HIX22	72
+#define R_SPARC_TLS_LE_LOX10	73
+#define R_SPARC_TLS_DTPMOD32	74
+#define R_SPARC_TLS_DTPMOD64	75
+#define R_SPARC_TLS_DTPOFF32	76
+#define R_SPARC_TLS_DTPOFF64	77
+#define R_SPARC_TLS_TPOFF32	78
+#define R_SPARC_TLS_TPOFF64	79
+/* Keep this the last entry.  */
+#define R_SPARC_NUM		80
+
+/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
+
+#define DT_SPARC_REGISTER 0x70000001
+#define DT_SPARC_NUM	2
+
+/* Bits present in AT_HWCAP, primarily for Sparc32.  */
+
+#define HWCAP_SPARC_FLUSH	1	/* The cpu supports flush insn.  */
+#define HWCAP_SPARC_STBAR	2
+#define HWCAP_SPARC_SWAP	4
+#define HWCAP_SPARC_MULDIV	8
+#define HWCAP_SPARC_V9		16	/* The cpu is v9, so v8plus is ok.  */
+#define HWCAP_SPARC_ULTRA3	32
+
+/* MIPS R3000 specific definitions.  */
+
+/* Legal values for e_flags field of Elf32_Ehdr.  */
+
+#define EF_MIPS_NOREORDER   1		/* A .noreorder directive was used */
+#define EF_MIPS_PIC	    2		/* Contains PIC code */
+#define EF_MIPS_CPIC	    4		/* Uses PIC calling sequence */
+#define EF_MIPS_XGOT	    8
+#define EF_MIPS_64BIT_WHIRL 16
+#define EF_MIPS_ABI2	    32
+#define EF_MIPS_ABI_ON32    64
+#define EF_MIPS_ARCH	    0xf0000000	/* MIPS architecture level */
+
+/* Legal values for MIPS architecture level.  */
+
+#define EF_MIPS_ARCH_1	    0x00000000	/* -mips1 code.  */
+#define EF_MIPS_ARCH_2	    0x10000000	/* -mips2 code.  */
+#define EF_MIPS_ARCH_3	    0x20000000	/* -mips3 code.  */
+#define EF_MIPS_ARCH_4	    0x30000000	/* -mips4 code.  */
+#define EF_MIPS_ARCH_5	    0x40000000	/* -mips5 code.  */
+#define EF_MIPS_ARCH_32	    0x60000000	/* MIPS32 code.  */
+#define EF_MIPS_ARCH_64	    0x70000000	/* MIPS64 code.  */
+
+/* The following are non-official names and should not be used.  */
+
+#define E_MIPS_ARCH_1	  0x00000000	/* -mips1 code.  */
+#define E_MIPS_ARCH_2	  0x10000000	/* -mips2 code.  */
+#define E_MIPS_ARCH_3	  0x20000000	/* -mips3 code.  */
+#define E_MIPS_ARCH_4	  0x30000000	/* -mips4 code.  */
+#define E_MIPS_ARCH_5	  0x40000000	/* -mips5 code.  */
+#define E_MIPS_ARCH_32	  0x60000000	/* MIPS32 code.  */
+#define E_MIPS_ARCH_64	  0x70000000	/* MIPS64 code.  */
+
+/* Special section indices.  */
+
+#define SHN_MIPS_ACOMMON    0xff00	/* Allocated common symbols */
+#define SHN_MIPS_TEXT	    0xff01	/* Allocated test symbols.  */
+#define SHN_MIPS_DATA	    0xff02	/* Allocated data symbols.  */
+#define SHN_MIPS_SCOMMON    0xff03	/* Small common symbols */
+#define SHN_MIPS_SUNDEFINED 0xff04	/* Small undefined symbols */
+
+/* Legal values for sh_type field of Elf32_Shdr.  */
+
+#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
+#define SHT_MIPS_MSYM	       0x70000001
+#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
+#define SHT_MIPS_GPTAB	       0x70000003 /* Global data area sizes */
+#define SHT_MIPS_UCODE	       0x70000004 /* Reserved for SGI/MIPS compilers */
+#define SHT_MIPS_DEBUG	       0x70000005 /* MIPS ECOFF debugging information*/
+#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
+#define SHT_MIPS_PACKAGE       0x70000007
+#define SHT_MIPS_PACKSYM       0x70000008
+#define SHT_MIPS_RELD	       0x70000009
+#define SHT_MIPS_IFACE         0x7000000b
+#define SHT_MIPS_CONTENT       0x7000000c
+#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
+#define SHT_MIPS_SHDR	       0x70000010
+#define SHT_MIPS_FDESC	       0x70000011
+#define SHT_MIPS_EXTSYM	       0x70000012
+#define SHT_MIPS_DENSE	       0x70000013
+#define SHT_MIPS_PDESC	       0x70000014
+#define SHT_MIPS_LOCSYM	       0x70000015
+#define SHT_MIPS_AUXSYM	       0x70000016
+#define SHT_MIPS_OPTSYM	       0x70000017
+#define SHT_MIPS_LOCSTR	       0x70000018
+#define SHT_MIPS_LINE	       0x70000019
+#define SHT_MIPS_RFDESC	       0x7000001a
+#define SHT_MIPS_DELTASYM      0x7000001b
+#define SHT_MIPS_DELTAINST     0x7000001c
+#define SHT_MIPS_DELTACLASS    0x7000001d
+#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
+#define SHT_MIPS_DELTADECL     0x7000001f
+#define SHT_MIPS_SYMBOL_LIB    0x70000020
+#define SHT_MIPS_EVENTS	       0x70000021 /* Event section.  */
+#define SHT_MIPS_TRANSLATE     0x70000022
+#define SHT_MIPS_PIXIE	       0x70000023
+#define SHT_MIPS_XLATE	       0x70000024
+#define SHT_MIPS_XLATE_DEBUG   0x70000025
+#define SHT_MIPS_WHIRL	       0x70000026
+#define SHT_MIPS_EH_REGION     0x70000027
+#define SHT_MIPS_XLATE_OLD     0x70000028
+#define SHT_MIPS_PDR_EXCEPTION 0x70000029
+
+/* Legal values for sh_flags field of Elf32_Shdr.  */
+
+#define SHF_MIPS_GPREL	 0x10000000	/* Must be part of global data area */
+#define SHF_MIPS_MERGE	 0x20000000
+#define SHF_MIPS_ADDR	 0x40000000
+#define SHF_MIPS_STRINGS 0x80000000
+#define SHF_MIPS_NOSTRIP 0x08000000
+#define SHF_MIPS_LOCAL	 0x04000000
+#define SHF_MIPS_NAMES	 0x02000000
+#define SHF_MIPS_NODUPE	 0x01000000
+
+
+/* Symbol tables.  */
+
+/* MIPS specific values for `st_other'.  */
+#define STO_MIPS_DEFAULT		0x0
+#define STO_MIPS_INTERNAL		0x1
+#define STO_MIPS_HIDDEN			0x2
+#define STO_MIPS_PROTECTED		0x3
+#define STO_MIPS_SC_ALIGN_UNUSED	0xff
+
+/* MIPS specific values for `st_info'.  */
+#define STB_MIPS_SPLIT_COMMON		13
+
+/* Entries found in sections of type SHT_MIPS_GPTAB.  */
+
+typedef union
+{
+  struct
+    {
+      Elf32_Word gt_current_g_value;	/* -G value used for compilation */
+      Elf32_Word gt_unused;		/* Not used */
+    } gt_header;			/* First entry in section */
+  struct
+    {
+      Elf32_Word gt_g_value;		/* If this value were used for -G */
+      Elf32_Word gt_bytes;		/* This many bytes would be used */
+    } gt_entry;				/* Subsequent entries in section */
+} Elf32_gptab;
+
+/* Entry found in sections of type SHT_MIPS_REGINFO.  */
+
+typedef struct
+{
+  Elf32_Word	ri_gprmask;		/* General registers used */
+  Elf32_Word	ri_cprmask[4];		/* Coprocessor registers used */
+  Elf32_Sword	ri_gp_value;		/* $gp register value */
+} Elf32_RegInfo;
+
+/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
+
+typedef struct
+{
+  unsigned char kind;		/* Determines interpretation of the
+				   variable part of descriptor.  */
+  unsigned char size;		/* Size of descriptor, including header.  */
+  Elf32_Section section;	/* Section header index of section affected,
+				   0 for global options.  */
+  Elf32_Word info;		/* Kind-specific information.  */
+} Elf_Options;
+
+/* Values for `kind' field in Elf_Options.  */
+
+#define ODK_NULL	0	/* Undefined.  */
+#define ODK_REGINFO	1	/* Register usage information.  */
+#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
+#define ODK_PAD		3	/* Section padding options.  */
+#define ODK_HWPATCH	4	/* Hardware workarounds performed */
+#define ODK_FILL	5	/* record the fill value used by the linker. */
+#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
+#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
+#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
+
+/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
+
+#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
+#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
+#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
+#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
+#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
+#define OEX_PRECISEFP	OEX_FPDBUG
+#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
+
+#define OEX_FPU_INVAL	0x10
+#define OEX_FPU_DIV0	0x08
+#define OEX_FPU_OFLO	0x04
+#define OEX_FPU_UFLO	0x02
+#define OEX_FPU_INEX	0x01
+
+/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
+
+#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
+#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
+#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
+#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
+
+#define OPAD_PREFIX	0x1
+#define OPAD_POSTFIX	0x2
+#define OPAD_SYMBOL	0x4
+
+/* Entry found in `.options' section.  */
+
+typedef struct
+{
+  Elf32_Word hwp_flags1;	/* Extra flags.  */
+  Elf32_Word hwp_flags2;	/* Extra flags.  */
+} Elf_Options_Hw;
+
+/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
+
+#define OHWA0_R4KEOP_CHECKED	0x00000001
+#define OHWA1_R4KEOP_CLEAN	0x00000002
+
+/* MIPS relocs.  */
+
+#define R_MIPS_NONE		0	/* No reloc */
+#define R_MIPS_16		1	/* Direct 16 bit */
+#define R_MIPS_32		2	/* Direct 32 bit */
+#define R_MIPS_REL32		3	/* PC relative 32 bit */
+#define R_MIPS_26		4	/* Direct 26 bit shifted */
+#define R_MIPS_HI16		5	/* High 16 bit */
+#define R_MIPS_LO16		6	/* Low 16 bit */
+#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
+#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
+#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
+#define R_MIPS_PC16		10	/* PC relative 16 bit */
+#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
+#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
+
+#define R_MIPS_SHIFT5		16
+#define R_MIPS_SHIFT6		17
+#define R_MIPS_64		18
+#define R_MIPS_GOT_DISP		19
+#define R_MIPS_GOT_PAGE		20
+#define R_MIPS_GOT_OFST		21
+#define R_MIPS_GOT_HI16		22
+#define R_MIPS_GOT_LO16		23
+#define R_MIPS_SUB		24
+#define R_MIPS_INSERT_A		25
+#define R_MIPS_INSERT_B		26
+#define R_MIPS_DELETE		27
+#define R_MIPS_HIGHER		28
+#define R_MIPS_HIGHEST		29
+#define R_MIPS_CALL_HI16	30
+#define R_MIPS_CALL_LO16	31
+#define R_MIPS_SCN_DISP		32
+#define R_MIPS_REL16		33
+#define R_MIPS_ADD_IMMEDIATE	34
+#define R_MIPS_PJUMP		35
+#define R_MIPS_RELGOT		36
+#define R_MIPS_JALR		37
+/* Keep this the last entry.  */
+#define R_MIPS_NUM		38
+
+/* Legal values for p_type field of Elf32_Phdr.  */
+
+#define PT_MIPS_REGINFO	0x70000000	/* Register usage information */
+#define PT_MIPS_RTPROC  0x70000001	/* Runtime procedure table. */
+#define PT_MIPS_OPTIONS 0x70000002
+
+/* Special program header types.  */
+
+#define PF_MIPS_LOCAL	0x10000000
+
+/* Legal values for d_tag field of Elf32_Dyn.  */
+
+#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
+#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
+#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
+#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
+#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
+#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
+#define DT_MIPS_MSYM	     0x70000007
+#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
+#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
+#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
+#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
+#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
+#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
+#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
+#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
+#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
+#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
+#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
+#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
+						DT_MIPS_DELTA_CLASS.  */
+#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
+						DT_MIPS_DELTA_INSTANCE.  */
+#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
+					     DT_MIPS_DELTA_RELOC.  */
+#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
+					   relocations refer to.  */
+#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
+					   DT_MIPS_DELTA_SYM.  */
+#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
+					     class declaration.  */
+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
+						DT_MIPS_DELTA_CLASSSYM.  */
+#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
+#define DT_MIPS_PIXIE_INIT   0x70000023
+#define DT_MIPS_SYMBOL_LIB   0x70000024
+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
+#define DT_MIPS_LOCAL_GOTIDX 0x70000026
+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
+#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
+#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
+#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
+						    function stored in GOT.  */
+#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
+					   by rld on dlopen() calls.  */
+#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
+#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
+#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
+#define DT_MIPS_NUM	     0x32
+
+/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
+
+#define RHF_NONE		   0		/* No flags */
+#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
+#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
+#define RHF_NO_MOVE		   (1 << 3)
+#define RHF_SGI_ONLY		   (1 << 4)
+#define RHF_GUARANTEE_INIT	   (1 << 5)
+#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
+#define RHF_GUARANTEE_START_INIT   (1 << 7)
+#define RHF_PIXIE		   (1 << 8)
+#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
+#define RHF_REQUICKSTART	   (1 << 10)
+#define RHF_REQUICKSTARTED	   (1 << 11)
+#define RHF_CORD		   (1 << 12)
+#define RHF_NO_UNRES_UNDEF	   (1 << 13)
+#define RHF_RLD_ORDER_SAFE	   (1 << 14)
+
+/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
+
+typedef struct
+{
+  Elf32_Word l_name;		/* Name (string table index) */
+  Elf32_Word l_time_stamp;	/* Timestamp */
+  Elf32_Word l_checksum;	/* Checksum */
+  Elf32_Word l_version;		/* Interface version */
+  Elf32_Word l_flags;		/* Flags */
+} Elf32_Lib;
+
+typedef struct
+{
+  Elf64_Word l_name;		/* Name (string table index) */
+  Elf64_Word l_time_stamp;	/* Timestamp */
+  Elf64_Word l_checksum;	/* Checksum */
+  Elf64_Word l_version;		/* Interface version */
+  Elf64_Word l_flags;		/* Flags */
+} Elf64_Lib;
+
+
+/* Legal values for l_flags.  */
+
+#define LL_NONE		  0
+#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
+#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
+#define LL_REQUIRE_MINOR  (1 << 2)
+#define LL_EXPORTS	  (1 << 3)
+#define LL_DELAY_LOAD	  (1 << 4)
+#define LL_DELTA	  (1 << 5)
+
+/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
+
+typedef Elf32_Addr Elf32_Conflict;
+
+
+/* HPPA specific definitions.  */
+
+/* Legal values for e_flags field of Elf32_Ehdr.  */
+
+#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
+#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
+#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
+#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
+#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
+					      prediction.  */
+#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
+#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
+
+/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
+
+#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
+#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
+#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
+
+/* Additional section indeces.  */
+
+#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
+					      symbols in ANSI C.  */
+#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
+
+/* Legal values for sh_type field of Elf32_Shdr.  */
+
+#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
+#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
+#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
+
+/* Legal values for sh_flags field of Elf32_Shdr.  */
+
+#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
+#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
+#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
+
+#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
+#define STT_HP_STUB		(STT_LOOS + 0x2)
+
+/* HPPA relocs.  */
+
+#define R_PARISC_NONE		0	/* No reloc.  */
+#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
+#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
+#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
+#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
+#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
+#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
+#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
+#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
+#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
+#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
+#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
+#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
+#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
+#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
+#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
+#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
+#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
+#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
+#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
+#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
+#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
+#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
+#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
+#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
+#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
+#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fct ptr.  */
+#define R_PARISC_PLABEL14R	70	/* Left 21 bits of fct ptr.  */
+#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
+#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
+#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
+#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
+#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
+#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
+#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
+#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
+#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
+#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
+#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
+#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
+#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
+#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
+#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
+#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
+#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
+#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
+#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
+#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
+#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
+#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
+#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
+#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
+#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
+#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
+#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
+#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
+#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
+#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
+#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
+#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
+#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
+#define R_PARISC_LORESERVE	128
+#define R_PARISC_COPY		128	/* Copy relocation.  */
+#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
+#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
+#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
+#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
+#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
+#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
+#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
+#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
+#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
+#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
+#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
+#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
+#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_HIRESERVE	255
+
+/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
+
+#define PT_HP_TLS		(PT_LOOS + 0x0)
+#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
+#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
+#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
+#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
+#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
+#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
+#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
+#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
+#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
+#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
+#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
+#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
+#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
+#define PT_HP_STACK		(PT_LOOS + 0x14)
+
+#define PT_PARISC_ARCHEXT	0x70000000
+#define PT_PARISC_UNWIND	0x70000001
+
+/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
+
+#define PF_PARISC_SBP		0x08000000
+
+#define PF_HP_PAGE_SIZE		0x00100000
+#define PF_HP_FAR_SHARED	0x00200000
+#define PF_HP_NEAR_SHARED	0x00400000
+#define PF_HP_CODE		0x01000000
+#define PF_HP_MODIFY		0x02000000
+#define PF_HP_LAZYSWAP		0x04000000
+#define PF_HP_SBP		0x08000000
+
+
+/* Alpha specific definitions.  */
+
+/* Legal values for e_flags field of Elf64_Ehdr.  */
+
+#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
+#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
+
+/* Legal values for sh_type field of Elf64_Shdr.  */
+
+/* These two are primerily concerned with ECOFF debugging info.  */
+#define SHT_ALPHA_DEBUG		0x70000001
+#define SHT_ALPHA_REGINFO	0x70000002
+
+/* Legal values for sh_flags field of Elf64_Shdr.  */
+
+#define SHF_ALPHA_GPREL		0x10000000
+
+/* Legal values for st_other field of Elf64_Sym.  */
+#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
+#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
+
+/* Alpha relocs.  */
+
+#define R_ALPHA_NONE		0	/* No reloc */
+#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
+#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
+#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
+#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
+#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
+#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
+#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
+#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
+#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
+#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
+#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
+#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
+#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
+#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
+#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
+#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
+#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
+#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
+#define R_ALPHA_TLS_GD_HI	28
+#define R_ALPHA_TLSGD		29
+#define R_ALPHA_TLS_LDM		30
+#define R_ALPHA_DTPMOD64	31
+#define R_ALPHA_GOTDTPREL	32
+#define R_ALPHA_DTPREL64	33
+#define R_ALPHA_DTPRELHI	34
+#define R_ALPHA_DTPRELLO	35
+#define R_ALPHA_DTPREL16	36
+#define R_ALPHA_GOTTPREL	37
+#define R_ALPHA_TPREL64		38
+#define R_ALPHA_TPRELHI		39
+#define R_ALPHA_TPRELLO		40
+#define R_ALPHA_TPREL16		41
+/* Keep this the last entry.  */
+#define R_ALPHA_NUM		46
+
+/* Magic values of the LITUSE relocation addend.  */
+#define LITUSE_ALPHA_ADDR	0
+#define LITUSE_ALPHA_BASE	1
+#define LITUSE_ALPHA_BYTOFF	2
+#define LITUSE_ALPHA_JSR	3
+#define LITUSE_ALPHA_TLS_GD	4
+#define LITUSE_ALPHA_TLS_LDM	5
+
+
+/* PowerPC specific declarations */
+
+/* Values for Elf32/64_Ehdr.e_flags.  */
+#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
+
+/* Cygnus local bits below */
+#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
+#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
+						   flag */
+
+/* PowerPC relocations defined by the ABIs */
+#define R_PPC_NONE		0
+#define R_PPC_ADDR32		1	/* 32bit absolute address */
+#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
+#define R_PPC_ADDR16		3	/* 16bit absolute address */
+#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
+#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
+#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
+#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
+#define R_PPC_ADDR14_BRTAKEN	8
+#define R_PPC_ADDR14_BRNTAKEN	9
+#define R_PPC_REL24		10	/* PC relative 26 bit */
+#define R_PPC_REL14		11	/* PC relative 16 bit */
+#define R_PPC_REL14_BRTAKEN	12
+#define R_PPC_REL14_BRNTAKEN	13
+#define R_PPC_GOT16		14
+#define R_PPC_GOT16_LO		15
+#define R_PPC_GOT16_HI		16
+#define R_PPC_GOT16_HA		17
+#define R_PPC_PLTREL24		18
+#define R_PPC_COPY		19
+#define R_PPC_GLOB_DAT		20
+#define R_PPC_JMP_SLOT		21
+#define R_PPC_RELATIVE		22
+#define R_PPC_LOCAL24PC		23
+#define R_PPC_UADDR32		24
+#define R_PPC_UADDR16		25
+#define R_PPC_REL32		26
+#define R_PPC_PLT32		27
+#define R_PPC_PLTREL32		28
+#define R_PPC_PLT16_LO		29
+#define R_PPC_PLT16_HI		30
+#define R_PPC_PLT16_HA		31
+#define R_PPC_SDAREL16		32
+#define R_PPC_SECTOFF		33
+#define R_PPC_SECTOFF_LO	34
+#define R_PPC_SECTOFF_HI	35
+#define R_PPC_SECTOFF_HA	36
+
+/* PowerPC relocations defined for the TLS access ABI.  */
+#define R_PPC_TLS		67 /* none	(sym+add)@tls */
+#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
+#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
+#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
+#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
+#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
+#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
+#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
+#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
+#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
+#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
+#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
+#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
+#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
+#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
+#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
+#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
+#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
+#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
+#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
+#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
+#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
+#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
+#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
+#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
+#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
+#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
+#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
+
+/* Keep this the last entry.  */
+#define R_PPC_NUM		95
+
+/* The remaining relocs are from the Embedded ELF ABI, and are not
+   in the SVR4 ELF ABI.  */
+#define R_PPC_EMB_NADDR32	101
+#define R_PPC_EMB_NADDR16	102
+#define R_PPC_EMB_NADDR16_LO	103
+#define R_PPC_EMB_NADDR16_HI	104
+#define R_PPC_EMB_NADDR16_HA	105
+#define R_PPC_EMB_SDAI16	106
+#define R_PPC_EMB_SDA2I16	107
+#define R_PPC_EMB_SDA2REL	108
+#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
+#define R_PPC_EMB_MRKREF	110
+#define R_PPC_EMB_RELSEC16	111
+#define R_PPC_EMB_RELST_LO	112
+#define R_PPC_EMB_RELST_HI	113
+#define R_PPC_EMB_RELST_HA	114
+#define R_PPC_EMB_BIT_FLD	115
+#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
+
+/* Diab tool relocations.  */
+#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
+#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
+#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
+#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
+#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
+#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
+
+/* This is a phony reloc to handle any old fashioned TOC16 references
+   that may still be in object files.  */
+#define R_PPC_TOC16		255
+
+
+/* PowerPC64 relocations defined by the ABIs */
+#define R_PPC64_NONE		R_PPC_NONE
+#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
+#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
+#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
+#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
+#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
+#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
+#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
+#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
+#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
+#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
+#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
+#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
+#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
+#define R_PPC64_GOT16		R_PPC_GOT16
+#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
+#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
+#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
+
+#define R_PPC64_COPY		R_PPC_COPY
+#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
+#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
+#define R_PPC64_RELATIVE	R_PPC_RELATIVE
+
+#define R_PPC64_UADDR32		R_PPC_UADDR32
+#define R_PPC64_UADDR16		R_PPC_UADDR16
+#define R_PPC64_REL32		R_PPC_REL32
+#define R_PPC64_PLT32		R_PPC_PLT32
+#define R_PPC64_PLTREL32	R_PPC_PLTREL32
+#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
+#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
+#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
+
+#define R_PPC64_SECTOFF		R_PPC_SECTOFF
+#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
+#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
+#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
+#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
+#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
+#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
+#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
+#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
+#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
+#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
+#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
+#define R_PPC64_PLT64		45 /* doubleword64 L + A */
+#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
+#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
+#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
+#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
+#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
+#define R_PPC64_TOC		51 /* doubleword64 .TOC */
+#define R_PPC64_PLTGOT16	52 /* half16* M + A */
+#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
+#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
+#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
+
+#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
+#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
+#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
+#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
+#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
+#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
+#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
+#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
+#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
+#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
+#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
+
+/* PowerPC64 relocations defined for the TLS access ABI.  */
+#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
+#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
+#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
+#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
+#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
+#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
+#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
+#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
+#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
+#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
+#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
+#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
+#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
+#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
+#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
+#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
+#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
+#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
+#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
+#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
+#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
+#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
+#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
+#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
+#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
+#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
+#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
+#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
+
+/* Keep this the last entry.  */
+#define R_PPC64_NUM		107
+
+/* PowerPC64 specific values for the Dyn d_tag field.  */
+#define DT_PPC64_GLINK  (DT_LOPROC + 0)
+#define DT_PPC64_OPD	(DT_LOPROC + 1)
+#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
+#define DT_PPC64_NUM    3
+
+
+/* ARM specific declarations */
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_ARM_RELEXEC     0x01
+#define EF_ARM_HASENTRY    0x02
+#define EF_ARM_INTERWORK   0x04
+#define EF_ARM_APCS_26     0x08
+#define EF_ARM_APCS_FLOAT  0x10
+#define EF_ARM_PIC         0x20
+#define EF_ARM_ALIGN8      0x40		/* 8-bit structure alignment is in use */
+#define EF_ARM_NEW_ABI     0x80
+#define EF_ARM_OLD_ABI     0x100
+
+/* Other constants defined in the ARM ELF spec. version B-01.  */
+/* NB. These conflict with values defined above.  */
+#define EF_ARM_SYMSARESORTED	0x04
+#define EF_ARM_DYNSYMSUSESEGIDX 0x08
+#define EF_ARM_MAPSYMSFIRST	0x10
+#define EF_ARM_EABIMASK		0XFF000000
+
+#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
+#define EF_ARM_EABI_UNKNOWN  0x00000000
+#define EF_ARM_EABI_VER1     0x01000000
+#define EF_ARM_EABI_VER2     0x02000000
+
+/* Additional symbol types for Thumb */
+#define STT_ARM_TFUNC      0xd
+
+/* ARM-specific values for sh_flags */
+#define SHF_ARM_ENTRYSECT  0x10000000   /* Section contains an entry point */
+#define SHF_ARM_COMDEF     0x80000000   /* Section may be multiply defined
+					   in the input to a link step */
+
+/* ARM-specific program header flags */
+#define PF_ARM_SB          0x10000000   /* Segment contains the location
+					   addressed by the static base */
+
+/* ARM relocs.  */
+#define R_ARM_NONE		0	/* No reloc */
+#define R_ARM_PC24		1	/* PC relative 26 bit branch */
+#define R_ARM_ABS32		2	/* Direct 32 bit  */
+#define R_ARM_REL32		3	/* PC relative 32 bit */
+#define R_ARM_PC13		4
+#define R_ARM_ABS16		5	/* Direct 16 bit */
+#define R_ARM_ABS12		6	/* Direct 12 bit */
+#define R_ARM_THM_ABS5		7
+#define R_ARM_ABS8		8	/* Direct 8 bit */
+#define R_ARM_SBREL32		9
+#define R_ARM_THM_PC22		10
+#define R_ARM_THM_PC8		11
+#define R_ARM_AMP_VCALL9	12
+#define R_ARM_SWI24		13
+#define R_ARM_THM_SWI8		14
+#define R_ARM_XPC25		15
+#define R_ARM_THM_XPC22		16
+#define R_ARM_COPY		20	/* Copy symbol at runtime */
+#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
+#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
+#define R_ARM_RELATIVE		23	/* Adjust by program base */
+#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
+#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
+#define R_ARM_GOT32		26	/* 32 bit GOT entry */
+#define R_ARM_PLT32		27	/* 32 bit PLT address */
+#define R_ARM_ALU_PCREL_7_0	32
+#define R_ARM_ALU_PCREL_15_8	33
+#define R_ARM_ALU_PCREL_23_15	34
+#define R_ARM_LDR_SBREL_11_0	35
+#define R_ARM_ALU_SBREL_19_12	36
+#define R_ARM_ALU_SBREL_27_20	37
+#define R_ARM_GNU_VTENTRY	100
+#define R_ARM_GNU_VTINHERIT	101
+#define R_ARM_THM_PC11		102	/* thumb unconditional branch */
+#define R_ARM_THM_PC9		103	/* thumb conditional branch */
+#define R_ARM_RXPC25		249
+#define R_ARM_RSBREL32		250
+#define R_ARM_THM_RPC22		251
+#define R_ARM_RREL32		252
+#define R_ARM_RABS22		253
+#define R_ARM_RPC24		254
+#define R_ARM_RBASE		255
+/* Keep this the last entry.  */
+#define R_ARM_NUM		256
+
+/* IA-64 specific declarations.  */
+
+/* Processor specific flags for the Ehdr e_flags field.  */
+#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
+#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
+#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
+
+/* Processor specific values for the Phdr p_type field.  */
+#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
+#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
+#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
+#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
+#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
+
+/* Processor specific flags for the Phdr p_flags field.  */
+#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
+
+/* Processor specific values for the Shdr sh_type field.  */
+#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
+#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
+
+/* Processor specific flags for the Shdr sh_flags field.  */
+#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
+#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
+
+/* Processor specific values for the Dyn d_tag field.  */
+#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
+#define DT_IA_64_NUM		1
+
+/* IA-64 relocations.  */
+#define R_IA64_NONE		0x00	/* none */
+#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
+#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
+#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
+#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
+#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
+#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
+#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
+#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
+#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
+#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
+#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
+#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
+#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
+#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
+#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
+#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
+#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
+#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
+#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
+#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
+#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
+#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
+#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
+#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
+#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
+#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
+#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
+#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
+#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
+#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
+#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
+#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
+#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
+#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
+#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
+#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
+#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
+#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
+#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
+#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
+#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
+#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
+#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
+#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
+#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
+#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
+#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
+#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
+#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
+#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
+#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
+#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
+#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
+#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
+#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
+#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
+#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
+#define R_IA64_COPY		0x84	/* copy relocation */
+#define R_IA64_SUB		0x85	/* Addend and symbol difference */
+#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
+#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
+#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
+#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
+#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
+#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
+#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
+#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
+#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
+#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
+#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
+#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
+#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
+#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
+#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
+#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
+#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
+
+/* SH specific declarations */
+
+/* SH relocs.  */
+#define	R_SH_NONE		0
+#define	R_SH_DIR32		1
+#define	R_SH_REL32		2
+#define	R_SH_DIR8WPN		3
+#define	R_SH_IND12W		4
+#define	R_SH_DIR8WPL		5
+#define	R_SH_DIR8WPZ		6
+#define	R_SH_DIR8BP		7
+#define	R_SH_DIR8W		8
+#define	R_SH_DIR8L		9
+#define	R_SH_SWITCH16		25
+#define	R_SH_SWITCH32		26
+#define	R_SH_USES		27
+#define	R_SH_COUNT		28
+#define	R_SH_ALIGN		29
+#define	R_SH_CODE		30
+#define	R_SH_DATA		31
+#define	R_SH_LABEL		32
+#define	R_SH_SWITCH8		33
+#define	R_SH_GNU_VTINHERIT	34
+#define	R_SH_GNU_VTENTRY	35
+#define	R_SH_TLS_GD_32		144
+#define	R_SH_TLS_LD_32		145
+#define	R_SH_TLS_LDO_32		146
+#define	R_SH_TLS_IE_32		147
+#define	R_SH_TLS_LE_32		148
+#define	R_SH_TLS_DTPMOD32	149
+#define	R_SH_TLS_DTPOFF32	150
+#define	R_SH_TLS_TPOFF32	151
+#define	R_SH_GOT32		160
+#define	R_SH_PLT32		161
+#define	R_SH_COPY		162
+#define	R_SH_GLOB_DAT		163
+#define	R_SH_JMP_SLOT		164
+#define	R_SH_RELATIVE		165
+#define	R_SH_GOTOFF		166
+#define	R_SH_GOTPC		167
+/* Keep this the last entry.  */
+#define	R_SH_NUM		256
+
+/* Additional s390 relocs */
+
+#define R_390_NONE		0	/* No reloc.  */
+#define R_390_8			1	/* Direct 8 bit.  */
+#define R_390_12		2	/* Direct 12 bit.  */
+#define R_390_16		3	/* Direct 16 bit.  */
+#define R_390_32		4	/* Direct 32 bit.  */
+#define R_390_PC32		5	/* PC relative 32 bit.	*/
+#define R_390_GOT12		6	/* 12 bit GOT offset.  */
+#define R_390_GOT32		7	/* 32 bit GOT offset.  */
+#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
+#define R_390_COPY		9	/* Copy symbol at runtime.  */
+#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
+#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
+#define R_390_RELATIVE		12	/* Adjust by program base.  */
+#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
+#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
+#define R_390_GOT16		15	/* 16 bit GOT offset.  */
+#define R_390_PC16		16	/* PC relative 16 bit.	*/
+#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
+#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
+#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
+#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
+#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
+#define R_390_64		22	/* Direct 64 bit.  */
+#define R_390_PC64		23	/* PC relative 64 bit.	*/
+#define R_390_GOT64		24	/* 64 bit GOT offset.  */
+#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
+#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
+#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
+#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
+#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
+#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
+#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
+#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
+#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
+#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
+#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
+#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
+#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
+#define R_390_TLS_GDCALL	38	/* Tag for function call in general
+					   dynamic TLS code. */
+#define R_390_TLS_LDCALL	39	/* Tag for function call in local
+					   dynamic TLS code. */
+#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
+					   thread local data.  */
+#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
+					  thread local data.  */
+#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
+					   block offset.  */
+#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
+					   block offset.  */
+#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
+					   block offset. */
+#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
+					   thread local data in LE code.  */
+#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
+					   thread local data in LE code.  */
+#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
+					   negated static TLS block offset.  */
+#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
+					   negated static TLS block offset.  */
+#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
+					   negated static TLS block offset.  */
+#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
+					   static TLS block.  */
+#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
+					   static TLS block.  */
+#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
+					   block.  */
+#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
+					   block.  */
+#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
+#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
+#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
+					   block.  */
+#define R_390_20		57	/* Direct 20 bit.  */
+#define R_390_GOT20		58	/* 20 bit GOT offset.  */
+#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
+#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
+					   block offset.  */
+/* Keep this the last entry.  */
+#define R_390_NUM		61
+
+
+/* CRIS relocations.  */
+#define R_CRIS_NONE		0
+#define R_CRIS_8		1
+#define R_CRIS_16		2
+#define R_CRIS_32		3
+#define R_CRIS_8_PCREL		4
+#define R_CRIS_16_PCREL		5
+#define R_CRIS_32_PCREL		6
+#define R_CRIS_GNU_VTINHERIT	7
+#define R_CRIS_GNU_VTENTRY	8
+#define R_CRIS_COPY		9
+#define R_CRIS_GLOB_DAT		10
+#define R_CRIS_JUMP_SLOT	11
+#define R_CRIS_RELATIVE		12
+#define R_CRIS_16_GOT		13
+#define R_CRIS_32_GOT		14
+#define R_CRIS_16_GOTPLT	15
+#define R_CRIS_32_GOTPLT	16
+#define R_CRIS_32_GOTREL	17
+#define R_CRIS_32_PLT_GOTREL	18
+#define R_CRIS_32_PLT_PCREL	19
+
+#define R_CRIS_NUM		20
+
+
+/* AMD x86-64 relocations.  */
+#define R_X86_64_NONE		0	/* No reloc */
+#define R_X86_64_64		1	/* Direct 64 bit  */
+#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
+#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
+#define R_X86_64_PLT32		4	/* 32 bit PLT address */
+#define R_X86_64_COPY		5	/* Copy symbol at runtime */
+#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
+#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
+#define R_X86_64_RELATIVE	8	/* Adjust by program base */
+#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
+					   offset to GOT */
+#define R_X86_64_32		10	/* Direct 32 bit zero extended */
+#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
+#define R_X86_64_16		12	/* Direct 16 bit zero extended */
+#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
+#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
+#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
+#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
+#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
+#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
+#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
+					   to two GOT entries for GD symbol */
+#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
+					   to two GOT entries for LD symbol */
+#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
+#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
+					   to GOT entry for IE symbol */
+#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
+
+#define R_X86_64_NUM		24
+
+
+/* AM33 relocations.  */
+#define R_MN10300_NONE		0	/* No reloc.  */
+#define R_MN10300_32		1	/* Direct 32 bit.  */
+#define R_MN10300_16		2	/* Direct 16 bit.  */
+#define R_MN10300_8		3	/* Direct 8 bit.  */
+#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
+#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
+#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
+#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
+#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
+#define R_MN10300_24		9	/* Direct 24 bit.  */
+#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
+#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
+#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
+#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
+#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
+#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
+#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
+#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
+#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
+#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
+#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
+#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
+#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
+#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
+
+#define R_MN10300_NUM		24
+
+
+/* M32R relocs.  */
+#define R_M32R_NONE		0	/* No reloc. */
+#define R_M32R_16		1	/* Direct 16 bit. */
+#define R_M32R_32		2	/* Direct 32 bit. */
+#define R_M32R_24		3	/* Direct 24 bit. */
+#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
+#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
+#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
+#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
+#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
+#define R_M32R_LO16		9	/* Low 16 bit. */
+#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
+#define R_M32R_GNU_VTINHERIT	11
+#define R_M32R_GNU_VTENTRY	12
+/* M32R relocs use SHT_RELA.  */
+#define R_M32R_16_RELA		33	/* Direct 16 bit. */
+#define R_M32R_32_RELA		34	/* Direct 32 bit. */
+#define R_M32R_24_RELA		35	/* Direct 24 bit. */
+#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
+#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
+#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
+#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
+#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
+#define R_M32R_LO16_RELA	41	/* Low 16 bit */
+#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
+#define R_M32R_RELA_GNU_VTINHERIT	43
+#define R_M32R_RELA_GNU_VTENTRY	44
+#define R_M32R_REL32		45	/* PC relative 32 bit */
+
+#define R_M32R_GOT24		48	/* 24 bit GOT entry */
+#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
+#define R_M32R_COPY		50	/* Copy symbol at runtime */
+#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
+#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
+#define R_M32R_RELATIVE		53	/* Adjust by program base */
+#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
+#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
+#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
+					   low */
+#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
+					   low */
+#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
+#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
+					   GOT with unsigned low */
+#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
+					   GOT with signed low */
+#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
+					   GOT */
+#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
+					   with unsigned low */
+#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
+					   with signed low */
+#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
+#define R_M32R_NUM		256	/* Keep this the last entry. */
+
+
+__END_DECLS
+
+#endif	/* elf.h */
diff --git a/trunk/tools/mklibs/patches/001-compile.patch b/trunk/tools/mklibs/patches/001-compile.patch
new file mode 100644
index 00000000..09b831ad
--- /dev/null
+++ b/trunk/tools/mklibs/patches/001-compile.patch
@@ -0,0 +1,8 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([mklibs],m4_esyscmd(dpkg-parsechangelog | perl -ne 'print $1 if m/^Version: (.*)$/;'))
++AC_INIT([mklibs],m4_esyscmd([head -n1 debian/changelog | awk -F'[\\\\(\\\\)]' '{ print $2 }' | xargs -I{} echo -n {}]))
+ AM_INIT_AUTOMAKE([foreign no-define])
+ AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
diff --git a/trunk/tools/mklibs/patches/002-disable_symbol_checks.patch b/trunk/tools/mklibs/patches/002-disable_symbol_checks.patch
new file mode 100644
index 00000000..44be6376
--- /dev/null
+++ b/trunk/tools/mklibs/patches/002-disable_symbol_checks.patch
@@ -0,0 +1,20 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -524,7 +524,7 @@ while 1:
+         # No progress in last pass. Verify all remaining symbols are weak.
+         for name in unresolved:
+             if not needed_symbols[name].weak:
+-                raise Exception("Unresolvable symbol %s" % name)
++                print "WARNING: Unresolvable symbol %s" % name
+         break
+ 
+     previous_pass_unresolved = unresolved
+@@ -559,7 +559,7 @@ while 1:
+     for name in needed_symbols:
+         if not name in symbol_provider:
+             if not needed_symbols[name].weak:
+-                raise Exception("No library provides non-weak %s" % name)
++                print "WARNING: Unresolvable symbol %s" % name
+         else:
+             lib = symbol_provider[name]
+             library_symbols_used[lib].add(library_symbols[lib][name])
diff --git a/trunk/tools/mklibs/patches/003-no_copy.patch b/trunk/tools/mklibs/patches/003-no_copy.patch
new file mode 100644
index 00000000..e0ab2ac8
--- /dev/null
+++ b/trunk/tools/mklibs/patches/003-no_copy.patch
@@ -0,0 +1,50 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -463,7 +463,7 @@ while 1:
+     passnr = passnr + 1
+     # Gather all already reduced libraries and treat them as objects as well
+     small_libs = []
+-    for lib in regexpfilter(os.listdir(dest_path), "(.*-so-stripped)$"):
++    for lib in regexpfilter(os.listdir(dest_path), "(.*-so)$"):
+         obj = dest_path + "/" + lib
+         small_libs.append(obj)
+         inode = os.stat(obj)[ST_INO]
+@@ -579,12 +579,7 @@ while 1:
+         if not so_file:
+             sys.exit("File not found:" + library)
+         pic_file = find_pic(library)
+-        if not pic_file:
+-            # No pic file, so we have to use the .so file, no reduction
+-            debug(DEBUG_VERBOSE, "No pic file found for", so_file, "; copying")
+-            command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
+-                    so_file, dest_path + "/" + so_file_name + "-so-stripped")
+-        else:
++        if pic_file:
+             # we have a pic file, recompile
+             debug(DEBUG_SPAM, "extracting from:", pic_file, "so_file:", so_file)
+             soname = extract_soname(so_file)
+@@ -627,22 +622,14 @@ while 1:
+             cmd.append(library_depends_gcc_libnames(so_file))
+             command(target + "gcc", *cmd)
+ 
+-            # strip result
+-            command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
+-                      dest_path + "/" + so_file_name + "-so",
+-                      dest_path + "/" + so_file_name + "-so-stripped")
+             ## DEBUG
+             debug(DEBUG_VERBOSE, so_file, "\t", `os.stat(so_file)[ST_SIZE]`)
+             debug(DEBUG_VERBOSE, dest_path + "/" + so_file_name + "-so", "\t",
+                   `os.stat(dest_path + "/" + so_file_name + "-so")[ST_SIZE]`)
+-            debug(DEBUG_VERBOSE, dest_path + "/" + so_file_name + "-so-stripped",
+-                  "\t", `os.stat(dest_path + "/" + so_file_name + "-so-stripped")[ST_SIZE]`)
+ 
+ # Finalising libs and cleaning up
+-for lib in regexpfilter(os.listdir(dest_path), "(.*)-so-stripped$"):
+-    os.rename(dest_path + "/" + lib + "-so-stripped", dest_path + "/" + lib)
+-for lib in regexpfilter(os.listdir(dest_path), "(.*-so)$"):
+-    os.remove(dest_path + "/" + lib)
++for lib in regexpfilter(os.listdir(dest_path), "(.*)-so$"):
++    os.rename(dest_path + "/" + lib + "-so", dest_path + "/" + lib)
+ 
+ # Canonicalize library names.
+ for lib in regexpfilter(os.listdir(dest_path), "(.*so[.\d]*)$"):
diff --git a/trunk/tools/mklibs/patches/004-libpthread_link.patch b/trunk/tools/mklibs/patches/004-libpthread_link.patch
new file mode 100644
index 00000000..657e232b
--- /dev/null
+++ b/trunk/tools/mklibs/patches/004-libpthread_link.patch
@@ -0,0 +1,28 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -106,14 +106,14 @@ def library_depends(obj):
+ 
+ # Return a list of libraries the passed objects depend on. The
+ # libraries are in "-lfoo" format suitable for passing to gcc.
+-def library_depends_gcc_libnames(obj):
++def library_depends_gcc_libnames(obj, soname):
+     if not os.access(obj, os.F_OK):
+         raise Exception("Cannot find lib: " + obj)
+     libs = library_depends(obj)
+     ret = []
+     for i in libs:
+         match = re.match("^(((?P<ld>ld\S*)|(lib(?P<lib>\S+))))\.so.*$", i)
+-        if match:
++        if match and not soname in ("libpthread.so.0"):
+             if match.group('ld'):
+                 ret.append(find_lib(match.group(0)))
+             elif match.group('lib'):
+@@ -619,7 +619,7 @@ while 1:
+             cmd.extend(extra_flags)
+             cmd.append("-lgcc")
+             cmd.extend(["-L%s" % a for a in [dest_path] + [sysroot + b for b in lib_path if sysroot == "" or b not in ("/" + libdir + "/", "/usr/" + libdir + "/")]])
+-            cmd.append(library_depends_gcc_libnames(so_file))
++            cmd.append(library_depends_gcc_libnames(so_file, soname))
+             command(target + "gcc", *cmd)
+ 
+             ## DEBUG
diff --git a/trunk/tools/mklibs/patches/005-duplicate_syms.patch b/trunk/tools/mklibs/patches/005-duplicate_syms.patch
new file mode 100644
index 00000000..8428abfc
--- /dev/null
+++ b/trunk/tools/mklibs/patches/005-duplicate_syms.patch
@@ -0,0 +1,35 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -531,7 +531,6 @@ while 1:
+ 
+     library_symbols = {}
+     library_symbols_used = {}
+-    symbol_provider = {}
+ 
+     # WORKAROUND: Always add libgcc on old-abi arm
+     header = elf_header(find_lib(libraries.copy().pop()))
+@@ -549,20 +548,13 @@ while 1:
+         library_symbols_used[library] = set()
+         for symbol in symbols:
+             for name in symbol.base_names():
+-                if name in symbol_provider:
+-                    debug(DEBUG_SPAM, "duplicate symbol %s in %s and %s" % (symbol, symbol_provider[name], library))
+-                else:
+-                    library_symbols[library][name] = symbol
+-                    symbol_provider[name] = library
++                library_symbols[library][name] = symbol
+ 
+     # which symbols are actually used from each lib
+     for name in needed_symbols:
+-        if not name in symbol_provider:
+-            if not needed_symbols[name].weak:
+-                print "WARNING: Unresolvable symbol %s" % name
+-        else:
+-            lib = symbol_provider[name]
+-            library_symbols_used[lib].add(library_symbols[lib][name])
++        for lib in libraries:
++            if name in library_symbols[lib]:
++                library_symbols_used[lib].add(library_symbols[lib][name])
+ 
+     # reduce libraries
+     for library in libraries:
diff --git a/trunk/tools/mklibs/patches/006-uclibc_init.patch b/trunk/tools/mklibs/patches/006-uclibc_init.patch
new file mode 100644
index 00000000..2df7fe43
--- /dev/null
+++ b/trunk/tools/mklibs/patches/006-uclibc_init.patch
@@ -0,0 +1,14 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -595,6 +595,11 @@ while 1:
+                 extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o")
+                 symbols.add(ProvidedSymbol('__dso_handle', None, None, True))
+ 
++            if soname in ("libc.so.0"):
++                symbols.add(ProvidedSymbol('__uClibc_init', None, None, True))
++                symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True))
++                extra_flags.append("-Wl,-init,__uClibc_init")
++
+             map_file = find_pic_map(library)
+             if map_file:
+                 extra_flags.append("-Wl,--version-script=" + map_file)
diff --git a/trunk/tools/mklibs/patches/007-gc_sections.patch b/trunk/tools/mklibs/patches/007-gc_sections.patch
new file mode 100644
index 00000000..068d88a5
--- /dev/null
+++ b/trunk/tools/mklibs/patches/007-gc_sections.patch
@@ -0,0 +1,11 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -607,7 +607,7 @@ while 1:
+             # compile in only used symbols
+             cmd = []
+             cmd.extend(gcc_options)
+-            cmd.append("-nostdlib -nostartfiles -shared -Wl,-soname=" + soname)
++            cmd.append("-nostdlib -nostartfiles -shared -Wl,--gc-sections -Wl,-soname=" + soname)
+             cmd.extend(["-u%s" % a.linker_name() for a in symbols])
+             cmd.extend(["-o", dest_path + "/" + so_file_name + "-so"])
+             cmd.extend(extra_pre_obj)
diff --git a/trunk/tools/mklibs/patches/008-uclibc_libgcc_link.patch b/trunk/tools/mklibs/patches/008-uclibc_libgcc_link.patch
new file mode 100644
index 00000000..432a313b
--- /dev/null
+++ b/trunk/tools/mklibs/patches/008-uclibc_libgcc_link.patch
@@ -0,0 +1,37 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -113,11 +113,8 @@ def library_depends_gcc_libnames(obj, so
+     ret = []
+     for i in libs:
+         match = re.match("^(((?P<ld>ld\S*)|(lib(?P<lib>\S+))))\.so.*$", i)
+-        if match and not soname in ("libpthread.so.0"):
+-            if match.group('ld'):
+-                ret.append(find_lib(match.group(0)))
+-            elif match.group('lib'):
+-                ret.append('-l%s' % match.group('lib'))
++        if match:
++            ret.append(find_lib(match.group(0)))
+     return ' '.join(ret)
+ 
+ class Symbol(object):
+@@ -584,6 +581,7 @@ while 1:
+             extra_flags = []
+             extra_pre_obj = []
+             extra_post_obj = []
++            libgcc_link = find_lib("libgcc_s.so.1")
+ 
+             symbols.update(library_symbols_used[library])
+ 
+@@ -614,9 +612,10 @@ while 1:
+             cmd.append(pic_file)
+             cmd.extend(extra_post_obj)
+             cmd.extend(extra_flags)
+-            cmd.append("-lgcc")
+             cmd.extend(["-L%s" % a for a in [dest_path] + [sysroot + b for b in lib_path if sysroot == "" or b not in ("/" + libdir + "/", "/usr/" + libdir + "/")]])
+-            cmd.append(library_depends_gcc_libnames(so_file, soname))
++            if soname != "libgcc_s.so.1":
++                cmd.append(library_depends_gcc_libnames(so_file, soname))
++                cmd.append(libgcc_link)
+             command(target + "gcc", *cmd)
+ 
+             ## DEBUG
diff --git a/trunk/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch b/trunk/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
new file mode 100644
index 00000000..34866f72
--- /dev/null
+++ b/trunk/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch
@@ -0,0 +1,63 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -162,9 +162,10 @@ def undefined_symbols(obj):
+     return result
+ 
+ class ProvidedSymbol(Symbol):
+-    def __init__(self, name, version, library, default_version):
++    def __init__(self, name, version, library, default_version, weak):
+         super(ProvidedSymbol, self).__init__(name, version, library)
+         self.default_version = default_version
++        self.weak = weak
+ 
+     def base_names(self):
+         ret = []
+@@ -205,11 +206,15 @@ def provided_symbols(obj):
+         if version_string.lower() not in ('base', 'none'):
+             version = version_string
+ 
++        weak = False
++        if weak_string.lower() == 'true':
++            weak = True
++
+         default_version = False
+         if default_version_string.lower() == 'true':
+             default_version = True
+ 
+-        result.append(ProvidedSymbol(name, version, library, default_version))
++        result.append(ProvidedSymbol(name, version, library, default_version, weak))
+ 
+     return result
+     
+@@ -500,6 +505,9 @@ while 1:
+             debug(DEBUG_SPAM, "present_symbols adding %s" % symbol)
+             names = symbol.base_names()
+             for name in names:
++                if name in present_symbols:
++                    if symbol.library != present_symbols[name].library:
++                        needed_symbols[name] = UndefinedSymbol(name, True, symbol.version, symbol.library)
+                 present_symbols[name] = symbol
+ 
+     # are we finished?
+@@ -591,12 +599,16 @@ while 1:
+                 # may segfault in ptmalloc_init due to undefined weak reference
+                 extra_pre_obj.append(sysroot + libc_extras_dir + "/soinit.o")
+                 extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o")
+-                symbols.add(ProvidedSymbol('__dso_handle', None, None, True))
++                symbols.add(ProvidedSymbol('__dso_handle', None, None, True, True))
+ 
+-            if soname in ("libc.so.0"):
+-                symbols.add(ProvidedSymbol('__uClibc_init', None, None, True))
+-                symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True))
+-                extra_flags.append("-Wl,-init,__uClibc_init")
++            if soname == "libc.so.0":
++                symbols.add(ProvidedSymbol('__uClibc_init', None, None, True, True))
++                symbols.add(ProvidedSymbol('__uClibc_fini', None, None, True, True))
++                extra_pre_obj.append("-Wl,-init,__uClibc_init")
++
++            if soname == "libpthread.so.0":
++                symbols.add(ProvidedSymbol('__pthread_initialize_minimal_internal', None, None, True, True))
++                extra_flags.append("-Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal")
+ 
+             map_file = find_pic_map(library)
+             if map_file:
diff --git a/trunk/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch b/trunk/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch
new file mode 100644
index 00000000..6bae8c7c
--- /dev/null
+++ b/trunk/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch
@@ -0,0 +1,20 @@
+--- a/src/mklibs-readelf/main.cpp
++++ b/src/mklibs-readelf/main.cpp
+@@ -84,7 +84,7 @@ static void process_symbols_provided (co
+       continue;
+     if (shndx == SHN_UNDEF || shndx == SHN_ABS)
+       continue;
+-    if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_GNU_IFUNC && type != STT_COMMON && type != STT_TLS)
++    if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_COMMON && type != STT_TLS)
+       continue;
+     if (!name.size())
+       continue;
+@@ -115,7 +115,7 @@ static void process_symbols_undefined (c
+       continue;
+     if (shndx != SHN_UNDEF)
+       continue;
+-    if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_GNU_IFUNC && type != STT_COMMON && type != STT_TLS)
++    if (type != STT_NOTYPE && type != STT_OBJECT && type != STT_FUNC && type != STT_COMMON && type != STT_TLS)
+       continue;
+     if (!name.size())
+       continue;
diff --git a/trunk/tools/mklibs/patches/011-remove_multiarch.patch b/trunk/tools/mklibs/patches/011-remove_multiarch.patch
new file mode 100644
index 00000000..a32d8ee1
--- /dev/null
+++ b/trunk/tools/mklibs/patches/011-remove_multiarch.patch
@@ -0,0 +1,10 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -263,6 +263,7 @@ def extract_soname(so_file):
+     return ""
+ 
+ def multiarch(paths):
++    return paths
+     devnull = open('/dev/null', 'w')
+     dpkg_architecture = subprocess.Popen(
+         ['dpkg-architecture', '-qDEB_HOST_MULTIARCH'],
diff --git a/trunk/tools/mm-macros/Makefile b/trunk/tools/mm-macros/Makefile
new file mode 100644
index 00000000..fb48d289
--- /dev/null
+++ b/trunk/tools/mm-macros/Makefile
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2010-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mm-macros
+PKG_VERSION:=0.9.6
+
+PKG_SOURCE_URL:=http://ftp.gnome.org/pub/GNOME/sources/mm-common/0.9
+PKG_SOURCE:=mm-common-$(PKG_VERSION).tar.xz
+PKG_MD5SUM:=3b23749ab39441c392c016ce74632678
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/mm-common-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
+	$(INSTALL_DATA) $(HOST_BUILD_DIR)/macros/*.m4 $(STAGING_DIR_HOST)/share/aclocal/
+endef
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/mpc/Makefile b/trunk/tools/mpc/Makefile
new file mode 100644
index 00000000..27b6fbe3
--- /dev/null
+++ b/trunk/tools/mpc/Makefile
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2009-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mpc
+PKG_VERSION:=1.0.2
+
+PKG_SOURCE_URL:=http://www.multiprecision.org/mpc/download/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=68fadff3358fb3e7976c7a398a0af4c3
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+unexport CFLAGS
+
+HOST_CONFIGURE_ARGS += \
+	--enable-static \
+	--disable-shared \
+	--with-mpfr=$(TOPDIR)/staging_dir/host \
+	--with-gmp=$(TOPDIR)/staging_dir/host
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/mpfr/Makefile b/trunk/tools/mpfr/Makefile
new file mode 100644
index 00000000..6f0ab6e2
--- /dev/null
+++ b/trunk/tools/mpfr/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mpfr
+PKG_VERSION:=3.1.2
+
+PKG_SOURCE_URL:=http://www.mpfr.org/mpfr-$(PKG_VERSION) \
+		@GNU/mpfr
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=ee2c3ac63bf0c2359bf08fc3ee094c19
+
+HOST_BUILD_PARALLEL:=1
+HOST_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_ARGS += \
+	--enable-static \
+	--disable-shared \
+	--with-gmp=$(STAGING_DIR_HOST)
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/mpfr/patches/001-only_src.patch b/trunk/tools/mpfr/patches/001-only_src.patch
new file mode 100644
index 00000000..e6579b21
--- /dev/null
+++ b/trunk/tools/mpfr/patches/001-only_src.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,7 +12,7 @@
+ AUTOMAKE_OPTIONS = gnu
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = doc src tests tune
++SUBDIRS = src
+ 
+ nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \
+   examples/ReadMe examples/divworst.c examples/rndo-add.c examples/sample.c \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -294,7 +294,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = gnu
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = doc src tests tune
++SUBDIRS = src
+ nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \
+   examples/ReadMe examples/divworst.c examples/rndo-add.c examples/sample.c \
+   examples/version.c
diff --git a/trunk/tools/mtd-utils/Makefile b/trunk/tools/mtd-utils/Makefile
new file mode 100644
index 00000000..3dccb591
--- /dev/null
+++ b/trunk/tools/mtd-utils/Makefile
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mtd-utils
+PKG_VERSION:=1.4.5
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=5319b84974fcb71504aed2d1b8285e9c0a4a4bb8
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_CAT:=zcat
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
+CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
+ifneq ($(HOST_OS),Linux)
+CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h
+endif
+
+MTD_MAKEOPTS = \
+	CFLAGS="$(CFLAGS)" \
+	LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
+	WITHOUT_LZO=1 WITHOUT_XATTR=1 \
+	LZMA_STATIC_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
+	SUBDIRS="" \
+	BUILDDIR="$(HOST_BUILD_DIR)"
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/lib \
+		$(MTD_MAKEOPTS) \
+		TARGETS="libmtd.a libcrc32.a" \
+		LIBS="libmtd libcrc32"
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		$(MTD_MAKEOPTS) \
+		TARGETS=mkfs.jffs2
+	$(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \
+		$(MTD_MAKEOPTS) \
+		TARGETS=ubinize
+	$(MAKE) -C $(HOST_BUILD_DIR)/mkfs.ubifs \
+		$(MTD_MAKEOPTS) \
+		BUILDDIR="$(HOST_BUILD_DIR)/mkfs.ubifs"
+endef
+
+define Host/Install
+	$(CP) \
+		$(HOST_BUILD_DIR)/mkfs.jffs2 \
+		$(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
+		$(HOST_BUILD_DIR)/ubinize \
+		$(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize}
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/mtd-utils/include/fls.h b/trunk/tools/mtd-utils/include/fls.h
new file mode 100644
index 00000000..7514253c
--- /dev/null
+++ b/trunk/tools/mtd-utils/include/fls.h
@@ -0,0 +1,2 @@
+#include <string.h>
+#define fls local_fls
diff --git a/trunk/tools/mtd-utils/include/linux/types.h b/trunk/tools/mtd-utils/include/linux/types.h
new file mode 100644
index 00000000..559fac7a
--- /dev/null
+++ b/trunk/tools/mtd-utils/include/linux/types.h
@@ -0,0 +1,18 @@
+#ifndef _LINUX_TYPES_H
+#define _LINUX_TYPES_H
+
+#include <mtd/ubi-media.h>
+
+typedef uint16_t __u16;
+typedef uint32_t __u32;
+typedef uint64_t __u64;
+
+typedef __u16 __le16;
+typedef __u32 __le32;
+typedef __u64 __le64;
+typedef __u64 off64_t;
+
+typedef __u16  __sum16;
+typedef __u32  __wsum;
+
+#endif /* _LINUX_TYPES_H */
diff --git a/trunk/tools/mtd-utils/patches/100-sscanf_fix.patch b/trunk/tools/mtd-utils/patches/100-sscanf_fix.patch
new file mode 100644
index 00000000..2d31f41d
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/100-sscanf_fix.patch
@@ -0,0 +1,11 @@
+--- a/mkfs.jffs2.c
++++ b/mkfs.jffs2.c
+@@ -423,7 +423,7 @@ static int interpret_table_entry(struct 
+ 
+ 	if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu %lu",
+ 				SCANF_STRING(name), &type, &mode, &uid, &gid, &major, &minor,
+-				&start, &increment, &count) < 0)
++				&start, &increment, &count) < 10)
+ 	{
+ 		return 1;
+ 	}
diff --git a/trunk/tools/mtd-utils/patches/110-portability.patch b/trunk/tools/mtd-utils/patches/110-portability.patch
new file mode 100644
index 00000000..727c0e6c
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/110-portability.patch
@@ -0,0 +1,153 @@
+--- a/compr_lzo.c
++++ b/compr_lzo.c
+@@ -26,7 +26,6 @@
+ #include <string.h>
+ 
+ #ifndef WITHOUT_LZO
+-#include <asm/types.h>
+ #include <linux/jffs2.h>
+ #include <lzo/lzo1x.h>
+ #include "compr.h"
+--- a/compr_zlib.c
++++ b/compr_zlib.c
+@@ -39,7 +39,6 @@
+ #include <zlib.h>
+ #undef crc32
+ #include <stdio.h>
+-#include <asm/types.h>
+ #include <linux/jffs2.h>
+ #include "common.h"
+ #include "compr.h"
+--- a/rbtree.h
++++ b/rbtree.h
+@@ -94,8 +94,7 @@ static inline struct page * rb_insert_pa
+ #ifndef	_LINUX_RBTREE_H
+ #define	_LINUX_RBTREE_H
+ 
+-#include <linux/kernel.h>
+-#include <linux/stddef.h>
++#include <stddef.h>
+ 
+ struct rb_node
+ {
+--- a/include/mtd/ubi-media.h
++++ b/include/mtd/ubi-media.h
+@@ -30,7 +30,15 @@
+ #ifndef __UBI_MEDIA_H__
+ #define __UBI_MEDIA_H__
+ 
++#ifdef __linux__
+ #include <asm/byteorder.h>
++#else
++#include <stdint.h>
++typedef uint8_t __u8;
++typedef uint16_t __be16;
++typedef uint32_t __be32;
++typedef uint64_t __be64;
++#endif
+ 
+ /* The version of UBI images supported by this implementation */
+ #define UBI_VERSION 1
+--- a/mkfs.ubifs/mkfs.ubifs.h
++++ b/mkfs.ubifs/mkfs.ubifs.h
+@@ -34,7 +34,17 @@
+ #include <endian.h>
+ #include <byteswap.h>
+ #include <linux/types.h>
++#ifdef __linux__
+ #include <linux/fs.h>
++# if defined(__x86_64__) && defined(__ILP32__)
++#  define llseek lseek64
++# endif
++#else
++# ifndef O_LARGEFILE
++#  define O_LARGEFILE 0
++# endif
++# define llseek lseek
++#endif
+ 
+ #include <getopt.h>
+ #include <sys/types.h>
+--- a/mkfs.ubifs/mkfs.ubifs.c
++++ b/mkfs.ubifs/mkfs.ubifs.c
+@@ -821,8 +821,8 @@ int write_leb(int lnum, int len, void *b
+ 		if (ubi_leb_change_start(ubi, out_fd, lnum, c->leb_size, dtype))
+ 			return sys_err_msg("ubi_leb_change_start failed");
+ 
+-	if (lseek64(out_fd, pos, SEEK_SET) != pos)
+-		return sys_err_msg("lseek64 failed seeking %lld",
++	if (llseek(out_fd, pos, SEEK_SET) != pos)
++		return sys_err_msg("llseek failed seeking %lld",
+ 				   (long long)pos);
+ 
+ 	if (write(out_fd, buf, c->leb_size) != c->leb_size)
+@@ -1079,6 +1079,7 @@ static int add_inode_with_data(struct st
+ 
+ 	if (c->default_compr != UBIFS_COMPR_NONE)
+ 		use_flags |= UBIFS_COMPR_FL;
++#ifndef NO_NATIVE_SUPPORT
+ 	if (flags & FS_COMPR_FL)
+ 		use_flags |= UBIFS_COMPR_FL;
+ 	if (flags & FS_SYNC_FL)
+@@ -1089,6 +1090,7 @@ static int add_inode_with_data(struct st
+ 		use_flags |= UBIFS_APPEND_FL;
+ 	if (flags & FS_DIRSYNC_FL && S_ISDIR(st->st_mode))
+ 		use_flags |= UBIFS_DIRSYNC_FL;
++#endif
+ 
+ 	memset(ino, 0, UBIFS_INO_NODE_SZ);
+ 
+@@ -1158,7 +1160,9 @@ static int add_dir_inode(DIR *dir, ino_t
+ 		fd = dirfd(dir);
+ 		if (fd == -1)
+ 			return sys_err_msg("dirfd failed");
++#ifndef NO_NATIVE_SUPPORT
+ 		if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
++#endif
+ 			flags = 0;
+ 	}
+ 
+@@ -1343,10 +1347,12 @@ static int add_file(const char *path_nam
+ 		key_write(&key, &dn->key);
+ 		dn->size = cpu_to_le32(bytes_read);
+ 		out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
++#ifndef NO_NATIVE_SUPPORT
+ 		if (c->default_compr == UBIFS_COMPR_NONE &&
+ 		    (flags & FS_COMPR_FL))
+ 			use_compr = UBIFS_COMPR_LZO;
+ 		else
++#endif
+ 			use_compr = c->default_compr;
+ 		compr_type = compress_data(buf, bytes_read, &dn->data,
+ 					   &out_len, use_compr);
+@@ -1388,7 +1394,9 @@ static int add_non_dir(const char *path_
+ 		if (fd == -1)
+ 			return sys_err_msg("failed to open file '%s'",
+ 					   path_name);
++#ifndef NO_NATIVE_SUPPORT
+ 		if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
++#endif
+ 			flags = 0;
+ 		if (close(fd) == -1)
+ 			return sys_err_msg("failed to close file '%s'",
+--- a/mkfs.ubifs/devtable.c
++++ b/mkfs.ubifs/devtable.c
+@@ -134,6 +134,7 @@ static int interpret_table_entry(const c
+ 	unsigned int mode = 0755, uid = 0, gid = 0, major = 0, minor = 0;
+ 	unsigned int start = 0, increment = 0, count = 0;
+ 
++	buf[1023] = 0;
+ 	if (sscanf(line, "%1023s %c %o %u %u %u %u %u %u %u",
+ 		   buf, &type, &mode, &uid, &gid, &major, &minor,
+ 		   &start, &increment, &count) < 0)
+@@ -144,8 +145,8 @@ static int interpret_table_entry(const c
+ 		buf, type, mode, uid, gid, major, minor, start,
+ 		increment, count);
+ 
+-	len = strnlen(buf, 1024);
+-	if (len == 1024)
++	len = strlen(buf);
++	if (len == 1023)
+ 		return err_msg("too long path");
+ 
+ 	if (!strcmp(buf, "/"))
diff --git a/trunk/tools/mtd-utils/patches/120-cygwin_fixes.patch b/trunk/tools/mtd-utils/patches/120-cygwin_fixes.patch
new file mode 100644
index 00000000..3dc21614
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/120-cygwin_fixes.patch
@@ -0,0 +1,457 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,6 +12,11 @@ else
+   LZOLDLIBS = -llzo2
+ endif
+ 
++ifeq ($(shell uname -o),Cygwin)
++CPPFLAGS += -I./include/cygwin
++endif
++
++ifneq ($(shell uname -o),Cygwin)
+ SUBDIRS = lib ubi-utils mkfs.ubifs
+ TESTS = tests
+ 
+@@ -23,6 +28,10 @@ TARGETS = ftl_format flash_erase nanddum
+ 	rfddump rfdformat \
+ 	serve_image recv_image \
+ 	sumtool #jffs2reader
++else
++SUBDIRS =
++TARGETS = mkfs.jffs2
++endif
+ SCRIPTS = flash_eraseall
+ 
+ SYMLINKS =
+--- /dev/null
++++ b/include/cygwin/bits-byteswap.h
+@@ -0,0 +1,132 @@
++/* Macros to swap the order of bytes in integer values.
++   Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
++# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
++#endif
++
++#ifndef _BITS_BYTESWAP_H
++#define _BITS_BYTESWAP_H 1
++
++/* Swap bytes in 16 bit value.  */
++#define __bswap_constant_16(x) \
++     ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
++
++#ifdef __GNUC__
++# if __GNUC__ >= 2
++#  define __bswap_16(x) \
++     (__extension__							      \
++      ({ register unsigned short int __v, __x = (x);			      \
++	 if (__builtin_constant_p (__x))				      \
++	   __v = __bswap_constant_16 (__x);				      \
++	 else								      \
++	   __asm__ ("rorw $8, %w0"					      \
++		    : "=r" (__v)					      \
++ 		    : "0" (__x)						      \
++ 		    : "cc");						      \
++	 __v; }))
++# else
++/* This is better than nothing.  */
++#  define __bswap_16(x) \
++     (__extension__							      \
++      ({ register unsigned short int __x = (x); __bswap_constant_16 (__x); }))
++# endif
++#else
++static __inline unsigned short int
++__bswap_16 (unsigned short int __bsx)
++{
++  return __bswap_constant_16 (__bsx);
++}
++#endif
++
++/* Swap bytes in 32 bit value.  */
++#define __bswap_constant_32(x) \
++     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) |		      \
++      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
++
++#ifdef __GNUC__
++# if __GNUC__ >= 2
++/* To swap the bytes in a word the i486 processors and up provide the
++   `bswap' opcode.  On i386 we have to use three instructions.  */
++#  if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__
++#   define __bswap_32(x)						      \
++     (__extension__							      \
++      ({ register unsigned int __v, __x = (x);				      \
++	 if (__builtin_constant_p (__x))				      \
++	   __v = __bswap_constant_32 (__x);				      \
++	 else								      \
++	   __asm__ ("rorw $8, %w0;"					      \
++		    "rorl $16, %0;"					      \
++		    "rorw $8, %w0"					      \
++		    : "=r" (__v)					      \
++		    : "0" (__x)						      \
++		    : "cc");						      \
++	 __v; }))
++#  else
++#   define __bswap_32(x) \
++     (__extension__							      \
++      ({ register unsigned int __v, __x = (x);				      \
++	 if (__builtin_constant_p (__x))				      \
++	   __v = __bswap_constant_32 (__x);				      \
++	 else								      \
++	   __asm__ ("bswap %0" : "=r" (__v) : "0" (__x));		      \
++	 __v; }))
++#  endif
++# else
++#  define __bswap_32(x) \
++     (__extension__							      \
++      ({ register unsigned int __x = (x); __bswap_constant_32 (__x); }))
++# endif
++#else
++static __inline unsigned int
++__bswap_32 (unsigned int __bsx)
++{
++  return __bswap_constant_32 (__bsx);
++}
++#endif
++
++
++#if defined __GNUC__ && __GNUC__ >= 2
++/* Swap bytes in 64 bit value.  */
++#define __bswap_constant_64(x) \
++     ((((x) & 0xff00000000000000ull) >> 56)				      \
++      | (((x) & 0x00ff000000000000ull) >> 40)				      \
++      | (((x) & 0x0000ff0000000000ull) >> 24)				      \
++      | (((x) & 0x000000ff00000000ull) >> 8)				      \
++      | (((x) & 0x00000000ff000000ull) << 8)				      \
++      | (((x) & 0x0000000000ff0000ull) << 24)				      \
++      | (((x) & 0x000000000000ff00ull) << 40)				      \
++      | (((x) & 0x00000000000000ffull) << 56))
++
++# define __bswap_64(x) \
++     (__extension__							      \
++      ({ union { __extension__ unsigned long long int __ll;		      \
++		 unsigned long int __l[2]; } __w, __r;			      \
++         if (__builtin_constant_p (x))					      \
++	   __r.__ll = __bswap_constant_64 (x);				      \
++	 else								      \
++	   {								      \
++	     __w.__ll = (x);						      \
++	     __r.__l[0] = __bswap_32 (__w.__l[1]);			      \
++	     __r.__l[1] = __bswap_32 (__w.__l[0]);			      \
++	   }								      \
++	 __r.__ll; }))
++#endif
++
++#endif /* _BITS_BYTESWAP_H */
+--- /dev/null
++++ b/include/cygwin/byteswap.h
+@@ -0,0 +1,40 @@
++/* Copyright (C) 1997 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#ifndef _BYTESWAP_H
++#define _BYTESWAP_H     1
++
++/* Get the machine specific, optimized definitions.  */
++#include "bits-byteswap.h"
++
++
++/* The following definitions must all be macros since otherwise some
++   of the possible optimizations are not possible.  */
++
++/* Return a value with all bytes in the 16 bit argument swapped.  */
++#define bswap_16(x) __bswap_16 (x)
++
++/* Return a value with all bytes in the 32 bit argument swapped.  */
++#define bswap_32(x) __bswap_32 (x)
++
++#if defined __GNUC__ && __GNUC__ >= 2
++/* Return a value with all bytes in the 64 bit argument swapped.  */
++# define bswap_64(x) __bswap_64 (x)
++#endif
++
++#endif /* byteswap.h */
+--- /dev/null
++++ b/include/cygwin/endian.h
+@@ -0,0 +1,26 @@
++#ifndef _CYGENDIAN_H_
++#define _CYGENDIAN_H_
++
++#ifdef __CYGWIN__
++
++#include <sys/param.h>
++
++#ifndef __BIG_ENDIAN
++#define __BIG_ENDIAN 4321
++#endif
++
++#ifndef __LITTLE_ENDIAN
++#define __LITTLE_ENDIAN 1234
++#endif
++
++#ifndef __BYTE_ORDER
++#define __BYTE_ORDER	__LITTLE_ENDIAN
++#endif
++
++#ifndef BYTE_ORDER
++#define BYTE_ORDER	__LITTLE_ENDIAN
++#endif
++
++#endif /* __CYGWIN__ */
++
++#endif /* _CYGENDIAN_H_ */
+--- /dev/null
++++ b/include/cygwin/ioctl.h
+@@ -0,0 +1,38 @@
++#ifndef _CYGIOCTL_H_
++#define _CYGIOCTL_H_
++
++#ifdef __CYGWIN__
++
++#define _IOC_NRBITS     8
++#define _IOC_TYPEBITS   8
++#define _IOC_SIZEBITS   14
++#define _IOC_DIRBITS    2
++ 
++#define _IOC_NRMASK     ((1 << _IOC_NRBITS)-1)
++#define _IOC_TYPEMASK   ((1 << _IOC_TYPEBITS)-1)
++#define _IOC_SIZEMASK   ((1 << _IOC_SIZEBITS)-1)
++#define _IOC_DIRMASK    ((1 << _IOC_DIRBITS)-1)
++ 
++#define _IOC_NRSHIFT    0
++#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
++#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
++#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
++ 
++#define _IOC_NONE       0U
++#define _IOC_WRITE      1U
++#define _IOC_READ       2U
++ 
++#define _IOC(dir,type,nr,size) \
++	(((dir)  << _IOC_DIRSHIFT) | \
++	((type) << _IOC_TYPESHIFT) | \
++	((nr)   << _IOC_NRSHIFT) | \
++	((size) << _IOC_SIZESHIFT))
++
++#define _IO(type,nr)            _IOC(_IOC_NONE,(type),(nr),0)
++#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),sizeof(size))
++#define _IOW(type,nr,size)      _IOC(_IOC_WRITE,(type),(nr),sizeof(size))
++#define _IOWR(type,nr,size)     _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
++
++#endif /* __CYGWIN__ */
++
++#endif /* _CYGIOCTL_H_ */
+--- /dev/null
++++ b/include/cygwin/pread.c
+@@ -0,0 +1,41 @@
++#ifdef __CYGWIN__
++
++#include <errno.h>
++
++ssize_t
++pread(int fd, void *p, size_t n, off_t off)
++{
++        off_t ooff;
++        int oerrno;
++
++        if ((ooff  = lseek(fd, off, SEEK_SET)) == -1)
++                return -1;
++
++        n = read(fd, p, n);
++
++        oerrno = errno;
++        lseek(fd, ooff, SEEK_SET);
++        errno = oerrno;
++
++        return n;
++}
++
++ssize_t
++pwrite(int fd, const void *p, size_t n, off_t off)
++{
++        off_t ooff;
++        int oerrno;
++
++        if ((ooff  = lseek(fd, off, SEEK_SET)) == -1)
++                return -1;
++
++        n = write(fd, p, n);
++
++        oerrno = errno;
++        lseek(fd, ooff, SEEK_SET);
++        errno = oerrno;
++
++        return n;
++}
++
++#endif /* __CYGWIN__ */
+--- /dev/null
++++ b/lnconf.sh
+@@ -0,0 +1,53 @@
++#!/bin/sh
++#
++# Generic configure replacement.
++#
++# $Id: lnconf.sh,v 1.1 2004/04/05 21:55:59 igor Exp $ 
++#
++# Copies all files from the script directory to the current one.
++# Intended to replace 'configure' for packages that don't have one, to
++# allow building outside of the source tree.
++#
++# Note: this does not do any fancy things with detecting shells and
++# supporting other platforms.  But it should work on Cygwin.
++
++# find out where the script is located
++tdir=`echo "$0" | sed 's%[\\/][^\\/][^\\/]*$%%'`
++test "x$tdir" = "x$0" && tdir=.
++
++a_srcdir=`cd $tdir; pwd`
++a_destdir=`pwd`
++
++# sanity checks:
++# are we in the script directory?
++test "x$a_srcdir" = "x$a_destdir" && exit 0
++# is there any chance that this is the script directory?
++test "x`cd "$a_srcdir" && /bin/ls -id`" = "x`/bin/ls -id`" && exit 0
++
++# try to find lndir and use it if it's available
++LNDIR="`which lndir 2>/dev/null`"
++if [ "x$LNDIR" = "x" ]; then
++  lndir() {
++    test "x$1" = "x" && return 1
++    # be careful of the current directory
++    DINODE=`find . -maxdepth 0 -ls | sed 's/ .*$//'` 
++    case "`pwd`" in
++      "`cd "$1" && pwd`"/*) CUR="-type d -inum $DINODE -prune -o";;
++    esac
++    # duplicate the directory structure
++    (cd "$1" && find . $CUR -type d -mindepth 1 -print) | xargs -tr mkdir -p
++    # copy all symbolic links
++    (cd "$1" && find . $CUR -type l -mindepth 1 -print) | xargs -ri sh -c "ln -s \"\`readlink "$1/{}"\`\" \"{}\""
++    # or simply
++    #(cd "$1" && find . $CUR -type l -mindepth 1 -print) | xargs -ri ln -s "$1"/{} {}
++    # link all files
++    (cd "$1" && find . $CUR -type f -mindepth 1 -print) | xargs -ri ln -s "$1"/{} {}
++  }
++else
++  lndir() {
++    "$LNDIR" "$@"
++  }
++fi
++
++lndir "$tdir"
++
+--- a/mkfs.jffs2.c
++++ b/mkfs.jffs2.c
+@@ -77,6 +77,14 @@
+ #include "rbtree.h"
+ #include "common.h"
+ 
++#ifdef __CYGWIN__
++#include <cygwin/ioctl.h>
++#include <cygwin/endian.h>
++#include <cygwin/pread.c>
++# define IFTODT(mode)          (((mode) & 0170000) >> 12)
++# define DTTOIF(dirtype)       ((dirtype) << 12)
++#endif /* __CYGWIN__ */
++
+ /* Do not use the weird XPG version of basename */
+ #undef basename
+ 
+@@ -376,7 +384,7 @@ static struct filesystem_entry *recursiv
+    the following macros use it if available or use a hacky workaround...
+  */
+ 
+-#ifdef __GNUC__
++#if defined __GNUC__ && !defined __CYGWIN__
+ #define SCANF_PREFIX "a"
+ #define SCANF_STRING(s) (&s)
+ #define GETCWD_SIZE 0
+@@ -459,6 +467,14 @@ static int interpret_table_entry(struct
+ 	}
+ 	entry = find_filesystem_entry(root, name, mode);
+ 	if (entry && !(count > 0 && (type == 'c' || type == 'b'))) {
++		/* Check the type */
++		if ((mode & S_IFMT) != (entry->sb.st_mode & S_IFMT)) {
++			error_msg ("skipping device_table entry '%s': type mismatch!", name);
++			free(name);
++			free(hostpath);
++			return 1;
++		}
++
+ 		/* Ok, we just need to fixup the existing entry
+ 		 * and we will be all done... */
+ 		entry->sb.st_uid = uid;
+@@ -468,11 +484,21 @@ static int interpret_table_entry(struct
+ 			entry->sb.st_rdev = makedev(major, minor);
+ 		}
+ 	} else {
++		if (type == 'f' || type == 'l') {
++			error_msg ("skipping device_table entry '%s': file does not exist!", name);
++			free(name);
++			free(hostpath);
++			return 1;
++		}
+ 		/* If parent is NULL (happens with device table entries),
+ 		 * try and find our parent now) */
+ 		tmp = strdup(name);
+ 		dir = dirname(tmp);
+-		parent = find_filesystem_entry(root, dir, S_IFDIR);
++		if (!strcmp(dir, "/")) {
++			parent = root;
++		} else {
++			parent = find_filesystem_entry(root, dir, S_IFDIR);
++		}
+ 		free(tmp);
+ 		if (parent == NULL) {
+ 			errmsg ("skipping device_table entry '%s': no parent directory!", name);
+@@ -486,6 +512,7 @@ static int interpret_table_entry(struct
+ 				add_host_filesystem_entry(name, hostpath, uid, gid, mode, 0, parent);
+ 				break;
+ 			case 'f':
++			case 'l':
+ 				add_host_filesystem_entry(name, hostpath, uid, gid, mode, 0, parent);
+ 				break;
+ 			case 'p':
+--- a/ubi-utils/src/libubi.c
++++ b/ubi-utils/src/libubi.c
+@@ -32,6 +32,9 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#ifdef __CYGWIN__
++#include <cygwin/ioctl.h>
++#endif
+ #include <libubi.h>
+ #include "libubi_int.h"
+ #include "common.h"
diff --git a/trunk/tools/mtd-utils/patches/130-lzma_jffs2.patch b/trunk/tools/mtd-utils/patches/130-lzma_jffs2.patch
new file mode 100644
index 00000000..be1c361f
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -0,0 +1,5031 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ 
+ # -*- sh -*-
+ 
+-CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS)
++CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) -I./include/linux/lzma
+ 
+ ifeq ($(WITHOUT_XATTR), 1)
+   CPPFLAGS += -DWITHOUT_XATTR
+@@ -59,7 +59,9 @@ $(SYMLINKS):
+ 	ln -sf ../fs/jffs2/$@ $@
+ 
+ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\
+-	compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \
++	compr_rtime.o mkfs.jffs2.o compr_zlib.o \
++	$(if $(WITHOUT_LZO),,compr_lzo.o) \
++	compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o \
+ 	compr.o rbtree.o)
+ LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
+ LDLIBS_mkfs.jffs2  = -lz $(LZOLDLIBS)
+--- a/compr.c
++++ b/compr.c
+@@ -520,6 +520,9 @@ int jffs2_compressors_init(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_init();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_init();
++#endif
+ 	return 0;
+ }
+ 
+@@ -534,5 +537,8 @@ int jffs2_compressors_exit(void)
+ #ifdef CONFIG_JFFS2_LZO
+ 	jffs2_lzo_exit();
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++        jffs2_lzma_exit();
++#endif
+ 	return 0;
+ }
+--- a/compr.h
++++ b/compr.h
+@@ -18,13 +18,14 @@
+ 
+ #define CONFIG_JFFS2_ZLIB
+ #define CONFIG_JFFS2_RTIME
+-#define CONFIG_JFFS2_LZO
++#define CONFIG_JFFS2_LZMA
+ 
+ #define JFFS2_RUBINMIPS_PRIORITY 10
+ #define JFFS2_DYNRUBIN_PRIORITY  20
+ #define JFFS2_RTIME_PRIORITY     50
+-#define JFFS2_ZLIB_PRIORITY      60
+-#define JFFS2_LZO_PRIORITY       80
++#define JFFS2_LZMA_PRIORITY      70
++#define JFFS2_ZLIB_PRIORITY      80
++#define JFFS2_LZO_PRIORITY       90
+ 
+ #define JFFS2_COMPR_MODE_NONE       0
+ #define JFFS2_COMPR_MODE_PRIORITY   1
+@@ -115,5 +116,10 @@ void jffs2_rtime_exit(void);
+ int jffs2_lzo_init(void);
+ void jffs2_lzo_exit(void);
+ #endif
++#ifdef CONFIG_JFFS2_LZMA
++int jffs2_lzma_init(void);
++void jffs2_lzma_exit(void);
++#endif
++
+ 
+ #endif /* __JFFS2_COMPR_H__ */
+--- /dev/null
++++ b/compr_lzma.c
+@@ -0,0 +1,128 @@
++/*
++ * JFFS2 -- Journalling Flash File System, Version 2.
++ *
++ * For licensing information, see the file 'LICENCE' in this directory.
++ *
++ * JFFS2 wrapper to the LZMA C SDK
++ *
++ */
++
++#include <linux/lzma.h>
++#include "compr.h"
++
++#ifdef __KERNEL__
++	static DEFINE_MUTEX(deflate_mutex);
++#endif
++
++CLzmaEncHandle *p;
++Byte propsEncoded[LZMA_PROPS_SIZE];
++SizeT propsSize = sizeof(propsEncoded);
++
++STATIC void lzma_free_workspace(void)
++{
++	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
++}
++
++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
++{
++	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
++	{
++		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
++		return -ENOMEM;
++	}
++
++	if (LzmaEnc_SetProps(p, props) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++	
++	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
++	{
++		lzma_free_workspace();
++		return -1;
++	}
++
++        return 0;
++}
++
++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
++			      uint32_t *sourcelen, uint32_t *dstlen, void *model)
++{
++	SizeT compress_size = (SizeT)(*dstlen);
++	int ret;
++
++	#ifdef __KERNEL__
++		mutex_lock(&deflate_mutex);
++	#endif
++
++	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
++		0, NULL, &lzma_alloc, &lzma_alloc);
++
++	#ifdef __KERNEL__
++		mutex_unlock(&deflate_mutex);
++	#endif
++
++	if (ret != SZ_OK)
++		return -1;
++
++	*dstlen = (uint32_t)compress_size;
++
++	return 0;
++}
++
++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
++				 uint32_t srclen, uint32_t destlen, void *model)
++{
++	int ret;
++	SizeT dl = (SizeT)destlen;
++	SizeT sl = (SizeT)srclen;
++	ELzmaStatus status;
++	
++	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
++		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
++
++	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
++		return -1;
++
++	return 0;
++}
++
++static struct jffs2_compressor jffs2_lzma_comp = {
++	.priority = JFFS2_LZMA_PRIORITY,
++	.name = "lzma",
++	.compr = JFFS2_COMPR_LZMA,
++	.compress = &jffs2_lzma_compress,
++	.decompress = &jffs2_lzma_decompress,
++	.disabled = 0,
++};
++
++int INIT jffs2_lzma_init(void)
++{
++        int ret;
++	CLzmaEncProps props;
++	LzmaEncProps_Init(&props);
++
++        props.dictSize = LZMA_BEST_DICT(0x2000);
++        props.level = LZMA_BEST_LEVEL;
++        props.lc = LZMA_BEST_LC;
++        props.lp = LZMA_BEST_LP;
++        props.pb = LZMA_BEST_PB;
++        props.fb = LZMA_BEST_FB;
++
++	ret = lzma_alloc_workspace(&props);
++        if (ret < 0)
++                return ret;
++
++	ret = jffs2_register_compressor(&jffs2_lzma_comp);
++	if (ret)
++		lzma_free_workspace();
++	
++        return ret;
++}
++
++void jffs2_lzma_exit(void)
++{
++	jffs2_unregister_compressor(&jffs2_lzma_comp);
++	lzma_free_workspace();
++}
+--- a/include/linux/jffs2.h
++++ b/include/linux/jffs2.h
+@@ -47,6 +47,7 @@
+ #define JFFS2_COMPR_DYNRUBIN	0x05
+ #define JFFS2_COMPR_ZLIB	0x06
+ #define JFFS2_COMPR_LZO		0x07
++#define JFFS2_COMPR_LZMA	0x08
+ /* Compatibility flags. */
+ #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
+ #define JFFS2_NODE_ACCURATE 0x2000
+--- /dev/null
++++ b/include/linux/lzma.h
+@@ -0,0 +1,61 @@
++#ifndef __LZMA_H__
++#define __LZMA_H__
++
++#ifdef __KERNEL__
++	#include <linux/kernel.h>
++	#include <linux/sched.h>
++	#include <linux/slab.h>
++	#include <linux/vmalloc.h>
++	#include <linux/init.h>
++	#define LZMA_MALLOC vmalloc
++	#define LZMA_FREE vfree
++	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
++	#define INIT __init
++	#define STATIC static
++#else
++	#include <stdint.h>
++	#include <stdlib.h>
++	#include <stdio.h>
++	#include <unistd.h>
++	#include <string.h>
++	#include <errno.h>
++	#include <linux/jffs2.h>
++	#ifndef PAGE_SIZE
++		extern int page_size;
++		#define PAGE_SIZE page_size
++	#endif
++	#define LZMA_MALLOC malloc
++	#define LZMA_FREE free
++	#define PRINT_ERROR(msg) fprintf(stderr, msg)
++	#define INIT
++	#define STATIC
++#endif
++
++#include "lzma/LzmaDec.h"
++#include "lzma/LzmaEnc.h"
++
++#define LZMA_BEST_LEVEL (9)
++#define LZMA_BEST_LC    (0)
++#define LZMA_BEST_LP    (0)
++#define LZMA_BEST_PB    (0)
++#define LZMA_BEST_FB  (273)
++
++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
++
++static void *p_lzma_malloc(void *p, size_t size)
++{
++        if (size == 0)
++                return NULL;
++
++        return LZMA_MALLOC(size);
++}
++
++static void p_lzma_free(void *p, void *address)
++{
++        if (address != NULL)
++                LZMA_FREE(address);
++}
++
++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzFind.h
+@@ -0,0 +1,116 @@
++/* LzFind.h  -- Match finder for LZ algorithms
++2008-04-04
++Copyright (c) 1999-2008 Igor Pavlov
++You can use any of the following license options:
++  1) GNU Lesser General Public License (GNU LGPL)
++  2) Common Public License (CPL)
++  3) Common Development and Distribution License (CDDL) Version 1.0 
++  4) Igor Pavlov, as the author of this code, expressly permits you to 
++     statically or dynamically link your code (or bind by name) to this file, 
++     while you keep this file unmodified.
++*/
++
++#ifndef __LZFIND_H
++#define __LZFIND_H
++
++#include "Types.h"
++
++typedef UInt32 CLzRef;
++
++typedef struct _CMatchFinder
++{
++  Byte *buffer;
++  UInt32 pos;
++  UInt32 posLimit;
++  UInt32 streamPos;
++  UInt32 lenLimit;
++
++  UInt32 cyclicBufferPos;
++  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
++
++  UInt32 matchMaxLen;
++  CLzRef *hash;
++  CLzRef *son;
++  UInt32 hashMask;
++  UInt32 cutValue;
++
++  Byte *bufferBase;
++  ISeqInStream *stream;
++  int streamEndWasReached;
++
++  UInt32 blockSize;
++  UInt32 keepSizeBefore;
++  UInt32 keepSizeAfter;
++
++  UInt32 numHashBytes;
++  int directInput;
++  int btMode;
++  /* int skipModeBits; */
++  int bigHash;
++  UInt32 historySize;
++  UInt32 fixedHashSize;
++  UInt32 hashSizeSum;
++  UInt32 numSons;
++  SRes result;
++  UInt32 crc[256];
++} CMatchFinder;
++
++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
++
++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
++
++int MatchFinder_NeedMove(CMatchFinder *p);
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
++void MatchFinder_MoveBlock(CMatchFinder *p);
++void MatchFinder_ReadIfRequired(CMatchFinder *p);
++
++void MatchFinder_Construct(CMatchFinder *p);
++
++/* Conditions:
++     historySize <= 3 GB
++     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
++*/
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, 
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc);
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue, 
++    UInt32 *distances, UInt32 maxLen);
++
++/* 
++Conditions:
++  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
++  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
++*/
++
++typedef void (*Mf_Init_Func)(void *object);
++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
++typedef void (*Mf_Skip_Func)(void *object, UInt32);
++
++typedef struct _IMatchFinder
++{
++  Mf_Init_Func Init;
++  Mf_GetIndexByte_Func GetIndexByte;
++  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
++  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
++  Mf_GetMatches_Func GetMatches;
++  Mf_Skip_Func Skip;
++} IMatchFinder;
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
++
++void MatchFinder_Init(CMatchFinder *p);
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzHash.h
+@@ -0,0 +1,56 @@
++/* LzHash.h  -- HASH functions for LZ algorithms
++2008-03-26
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzFind.h for license options */
++
++#ifndef __LZHASH_H
++#define __LZHASH_H
++
++#define kHash2Size (1 << 10)
++#define kHash3Size (1 << 16)
++#define kHash4Size (1 << 20)
++
++#define kFix3HashSize (kHash2Size)
++#define kFix4HashSize (kHash2Size + kHash3Size)
++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
++
++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
++
++#define HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
++
++#define HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
++
++#define HASH5_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
++  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
++  hash4Value &= (kHash4Size - 1); }
++
++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
++
++
++#define MT_HASH2_CALC \
++  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
++
++#define MT_HASH3_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
++
++#define MT_HASH4_CALC { \
++  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
++  hash2Value = temp & (kHash2Size - 1); \
++  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
++  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaDec.h
+@@ -0,0 +1,232 @@
++/* LzmaDec.h -- LZMA Decoder
++2008-04-29
++Copyright (c) 1999-2008 Igor Pavlov
++You can use any of the following license options:
++  1) GNU Lesser General Public License (GNU LGPL)
++  2) Common Public License (CPL)
++  3) Common Development and Distribution License (CDDL) Version 1.0 
++  4) Igor Pavlov, as the author of this code, expressly permits you to 
++     statically or dynamically link your code (or bind by name) to this file, 
++     while you keep this file unmodified.
++*/
++
++#ifndef __LZMADEC_H
++#define __LZMADEC_H
++
++#include "Types.h"
++
++/* #define _LZMA_PROB32 */
++/* _LZMA_PROB32 can increase the speed on some CPUs, 
++   but memory usage for CLzmaDec::probs will be doubled in that case */
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++
++/* ---------- LZMA Properties ---------- */  
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaProps
++{
++  unsigned lc, lp, pb;
++  UInt32 dicSize;
++} CLzmaProps;
++
++/* LzmaProps_Decode - decodes properties
++Returns:
++  SZ_OK
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
++
++
++/* ---------- LZMA Decoder state ---------- */  
++
++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
++   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
++
++#define LZMA_REQUIRED_INPUT_MAX 20
++
++typedef struct
++{
++  CLzmaProps prop;
++  CLzmaProb *probs;
++  Byte *dic;
++  const Byte *buf;
++  UInt32 range, code;
++  SizeT dicPos;
++  SizeT dicBufSize;
++  UInt32 processedPos;
++  UInt32 checkDicSize;
++  unsigned state;
++  UInt32 reps[4];
++  unsigned remainLen;
++  int needFlush;
++  int needInitState;
++  UInt32 numProbs;
++  unsigned tempBufSize;
++  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
++} CLzmaDec;
++
++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
++
++void LzmaDec_Init(CLzmaDec *p);
++
++/* There are two types of LZMA streams:
++     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
++     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
++
++typedef enum 
++{
++  LZMA_FINISH_ANY,   /* finish at any point */      
++  LZMA_FINISH_END    /* block must be finished at the end */
++} ELzmaFinishMode;
++
++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
++
++   You must use LZMA_FINISH_END, when you know that current output buffer 
++   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
++
++   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
++   and output value of destLen will be less than output buffer size limit.
++   You can check status result also.
++
++   You can use multiple checks to test data integrity after full decompression:
++     1) Check Result and "status" variable.
++     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
++     3) Check that output(srcLen) = compressedSize, if you know real compressedSize. 
++        You must use correct finish mode in that case. */ 
++
++typedef enum 
++{
++  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
++  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
++  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
++  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */   
++  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
++} ELzmaStatus;
++
++/* ELzmaStatus is used only as output value for function call */
++
++
++/* ---------- Interfaces ---------- */  
++
++/* There are 3 levels of interfaces:
++     1) Dictionary Interface
++     2) Buffer Interface
++     3) One Call Interface
++   You can select any of these interfaces, but don't mix functions from different 
++   groups for same object. */
++
++
++/* There are two variants to allocate state for Dictionary Interface:
++     1) LzmaDec_Allocate / LzmaDec_Free
++     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
++   You can use variant 2, if you set dictionary buffer manually. 
++   For Buffer Interface you must always use variant 1. 
++
++LzmaDec_Allocate* can return:
++  SZ_OK
++  SZ_ERROR_MEM         - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++*/
++   
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
++
++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
++
++/* ---------- Dictionary Interface ---------- */  
++
++/* You can use it, if you want to eliminate the overhead for data copying from 
++   dictionary to some other external buffer.
++   You must work with CLzmaDec variables directly in this interface.
++
++   STEPS:
++     LzmaDec_Constr()
++     LzmaDec_Allocate()
++     for (each new stream)
++     {
++       LzmaDec_Init()
++       while (it needs more decompression)
++       {
++         LzmaDec_DecodeToDic()
++         use data from CLzmaDec::dic and update CLzmaDec::dicPos
++       }
++     }
++     LzmaDec_Free()
++*/
++
++/* LzmaDec_DecodeToDic
++   
++   The decoding to internal dictionary buffer (CLzmaDec::dic).
++   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!! 
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (dicLimit).
++  LZMA_FINISH_ANY - Decode just dicLimit bytes.
++  LZMA_FINISH_END - Stream must be finished after dicLimit.
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED 
++      LZMA_STATUS_NEEDS_MORE_INPUT
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++*/
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, 
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- Buffer Interface ---------- */  
++
++/* It's zlib-like interface.
++   See LzmaDec_DecodeToDic description for information about STEPS and return results,
++   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
++   to work with CLzmaDec variables manually.
++
++finishMode: 
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++*/
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, 
++    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
++
++
++/* ---------- One Call Interface ---------- */  
++
++/* LzmaDecode
++
++finishMode:
++  It has meaning only if the decoding reaches output limit (*destLen).
++  LZMA_FINISH_ANY - Decode just destLen bytes.
++  LZMA_FINISH_END - Stream must be finished after (*destLen).
++
++Returns:
++  SZ_OK
++    status:
++      LZMA_STATUS_FINISHED_WITH_MARK
++      LZMA_STATUS_NOT_FINISHED 
++      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
++  SZ_ERROR_DATA - Data error
++  SZ_ERROR_MEM  - Memory allocation error
++  SZ_ERROR_UNSUPPORTED - Unsupported properties
++  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
++*/
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, 
++    ELzmaStatus *status, ISzAlloc *alloc);
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/LzmaEnc.h
+@@ -0,0 +1,74 @@
++/*  LzmaEnc.h -- LZMA Encoder
++2008-04-27
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzFind.h for license options */
++
++#ifndef __LZMAENC_H
++#define __LZMAENC_H
++
++#include "Types.h"
++
++#define LZMA_PROPS_SIZE 5
++
++typedef struct _CLzmaEncProps
++{
++  int level;       /*  0 <= level <= 9 */ 
++  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
++                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version 
++                       default = (1 << 24) */
++  int lc;          /* 0 <= lc <= 8, default = 3 */ 
++  int lp;          /* 0 <= lp <= 4, default = 0 */ 
++  int pb;          /* 0 <= pb <= 4, default = 2 */ 
++  int algo;        /* 0 - fast, 1 - normal, default = 1 */
++  int fb;          /* 5 <= fb <= 273, default = 32 */
++  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
++  int numHashBytes; /* 2, 3 or 4, default = 4 */
++  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
++  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
++  int numThreads;  /* 1 or 2, default = 2 */
++} CLzmaEncProps;
++
++void LzmaEncProps_Init(CLzmaEncProps *p);
++void LzmaEncProps_Normalize(CLzmaEncProps *p);
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
++
++
++/* ---------- CLzmaEncHandle Interface ---------- */
++
++/* LzmaEnc_* functions can return the following exit codes:
++Returns:
++  SZ_OK           - OK
++  SZ_ERROR_MEM    - Memory allocation error 
++  SZ_ERROR_PARAM  - Incorrect paramater in props
++  SZ_ERROR_WRITE  - Write callback error.
++  SZ_ERROR_PROGRESS - some break from progress callback
++  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
++*/
++
++typedef void * CLzmaEncHandle;
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream, 
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++/* ---------- One Call Interface ---------- */
++
++/* LzmaEncode
++Return code:
++  SZ_OK               - OK
++  SZ_ERROR_MEM        - Memory allocation error 
++  SZ_ERROR_PARAM      - Incorrect paramater
++  SZ_ERROR_OUTPUT_EOF - output buffer overflow
++  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
++*/
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, 
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
++
++#endif
+--- /dev/null
++++ b/include/linux/lzma/Types.h
+@@ -0,0 +1,130 @@
++/* Types.h -- Basic types
++2008-04-11
++Igor Pavlov
++Public domain */
++
++#ifndef __7Z_TYPES_H
++#define __7Z_TYPES_H
++
++#define SZ_OK 0
++
++#define SZ_ERROR_DATA 1
++#define SZ_ERROR_MEM 2
++#define SZ_ERROR_CRC 3
++#define SZ_ERROR_UNSUPPORTED 4
++#define SZ_ERROR_PARAM 5
++#define SZ_ERROR_INPUT_EOF 6
++#define SZ_ERROR_OUTPUT_EOF 7
++#define SZ_ERROR_READ 8
++#define SZ_ERROR_WRITE 9
++#define SZ_ERROR_PROGRESS 10
++#define SZ_ERROR_FAIL 11
++#define SZ_ERROR_THREAD 12
++
++#define SZ_ERROR_ARCHIVE 16
++#define SZ_ERROR_NO_ARCHIVE 17
++
++typedef int SRes;
++
++#ifndef RINOK
++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
++#endif
++
++typedef unsigned char Byte;
++typedef short Int16;
++typedef unsigned short UInt16;
++
++#ifdef _LZMA_UINT32_IS_ULONG
++typedef long Int32;
++typedef unsigned long UInt32;
++#else
++typedef int Int32;
++typedef unsigned int UInt32;
++#endif
++
++/* #define _SZ_NO_INT_64 */
++/* define it if your compiler doesn't support 64-bit integers */
++
++#ifdef _SZ_NO_INT_64
++
++typedef long Int64;
++typedef unsigned long UInt64;
++
++#else
++
++#if defined(_MSC_VER) || defined(__BORLANDC__)
++typedef __int64 Int64;
++typedef unsigned __int64 UInt64;
++#else
++typedef long long int Int64;
++typedef unsigned long long int UInt64;
++#endif
++
++#endif
++
++#ifdef _LZMA_NO_SYSTEM_SIZE_T
++typedef UInt32 SizeT;
++#else
++#include <stddef.h>
++typedef size_t SizeT;
++#endif
++
++typedef int Bool;
++#define True 1
++#define False 0
++
++
++#ifdef _MSC_VER
++
++#if _MSC_VER >= 1300
++#define MY_NO_INLINE __declspec(noinline)
++#else
++#define MY_NO_INLINE
++#endif
++
++#define MY_CDECL __cdecl
++#define MY_STD_CALL __stdcall 
++#define MY_FAST_CALL MY_NO_INLINE __fastcall 
++
++#else
++
++#define MY_CDECL
++#define MY_STD_CALL
++#define MY_FAST_CALL
++
++#endif
++
++
++/* The following interfaces use first parameter as pointer to structure */
++
++typedef struct
++{
++  SRes (*Read)(void *p, void *buf, size_t *size);
++    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
++       (output(*size) < input(*size)) is allowed */
++} ISeqInStream;
++
++typedef struct
++{
++  size_t (*Write)(void *p, const void *buf, size_t size);
++    /* Returns: result - the number of actually written bytes.
++      (result < size) means error */
++} ISeqOutStream;
++
++typedef struct
++{
++  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
++    /* Returns: result. (result != SZ_OK) means break.
++       Value (UInt64)(Int64)-1 for size means unknown value. */
++} ICompressProgress;
++
++typedef struct
++{
++  void *(*Alloc)(void *p, size_t size);
++  void (*Free)(void *p, void *address); /* address can be 0 */
++} ISzAlloc;
++
++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
++#define IAlloc_Free(p, a) (p)->Free((p), a)
++
++#endif
+--- /dev/null
++++ b/lzma/LzFind.c
+@@ -0,0 +1,753 @@
++/* LzFind.c  -- Match finder for LZ algorithms
++2008-04-04
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzFind.h for license options */
++
++#include <string.h>
++
++#include "LzFind.h"
++#include "LzHash.h"
++
++#define kEmptyHashValue 0
++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
++#define kNormalizeMask (~(kNormalizeStepMin - 1))
++#define kMaxHistorySize ((UInt32)3 << 30)
++
++#define kStartMaxLen 3
++
++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  if (!p->directInput)
++  {
++    alloc->Free(alloc, p->bufferBase);
++    p->bufferBase = 0;
++  }
++}
++
++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
++
++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
++{
++  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
++  if (p->directInput)
++  {
++    p->blockSize = blockSize;
++    return 1;
++  }
++  if (p->bufferBase == 0 || p->blockSize != blockSize)
++  {
++    LzInWindow_Free(p, alloc);
++    p->blockSize = blockSize;
++    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
++  }
++  return (p->bufferBase != 0);
++}
++
++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
++
++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
++
++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
++{
++  p->posLimit -= subValue;
++  p->pos -= subValue;
++  p->streamPos -= subValue;
++}
++
++static void MatchFinder_ReadBlock(CMatchFinder *p)
++{
++  if (p->streamEndWasReached || p->result != SZ_OK)
++    return;
++  for (;;)
++  {
++    Byte *dest = p->buffer + (p->streamPos - p->pos);
++    size_t size = (p->bufferBase + p->blockSize - dest);
++    if (size == 0)
++      return;
++    p->result = p->stream->Read(p->stream, dest, &size);
++    if (p->result != SZ_OK)
++      return;
++    if (size == 0)
++    {
++      p->streamEndWasReached = 1;
++      return;
++    }
++    p->streamPos += (UInt32)size;
++    if (p->streamPos - p->pos > p->keepSizeAfter)
++      return;
++  }
++}
++
++void MatchFinder_MoveBlock(CMatchFinder *p)
++{
++  memmove(p->bufferBase, 
++    p->buffer - p->keepSizeBefore, 
++    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
++  p->buffer = p->bufferBase + p->keepSizeBefore;
++}
++
++int MatchFinder_NeedMove(CMatchFinder *p)
++{
++  /* if (p->streamEndWasReached) return 0; */
++  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
++}
++
++void MatchFinder_ReadIfRequired(CMatchFinder *p)
++{
++  if (p->streamEndWasReached) 
++    return;
++  if (p->keepSizeAfter >= p->streamPos - p->pos)
++    MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
++{
++  if (MatchFinder_NeedMove(p))
++    MatchFinder_MoveBlock(p);
++  MatchFinder_ReadBlock(p);
++}
++
++static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
++{
++  p->cutValue = 32;
++  p->btMode = 1;
++  p->numHashBytes = 4;
++  /* p->skipModeBits = 0; */
++  p->directInput = 0;
++  p->bigHash = 0;
++}
++
++#define kCrcPoly 0xEDB88320
++
++void MatchFinder_Construct(CMatchFinder *p)
++{
++  UInt32 i;
++  p->bufferBase = 0;
++  p->directInput = 0;
++  p->hash = 0;
++  MatchFinder_SetDefaultSettings(p);
++
++  for (i = 0; i < 256; i++)
++  {
++    UInt32 r = i;
++    int j;
++    for (j = 0; j < 8; j++)
++      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
++    p->crc[i] = r;
++  }
++}
++
++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->hash);
++  p->hash = 0;
++}
++
++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
++{
++  MatchFinder_FreeThisClassMemory(p, alloc);
++  LzInWindow_Free(p, alloc);
++}
++
++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
++{
++  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
++  if (sizeInBytes / sizeof(CLzRef) != num)
++    return 0;
++  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
++}
++
++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, 
++    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
++    ISzAlloc *alloc)
++{
++  UInt32 sizeReserv;
++  if (historySize > kMaxHistorySize)
++  {
++    MatchFinder_Free(p, alloc);
++    return 0;
++  }
++  sizeReserv = historySize >> 1;
++  if (historySize > ((UInt32)2 << 30))
++    sizeReserv = historySize >> 2;
++  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
++
++  p->keepSizeBefore = historySize + keepAddBufferBefore + 1; 
++  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
++  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
++  if (LzInWindow_Create(p, sizeReserv, alloc))
++  {
++    UInt32 newCyclicBufferSize = (historySize /* >> p->skipModeBits */) + 1;
++    UInt32 hs;
++    p->matchMaxLen = matchMaxLen;
++    {
++      p->fixedHashSize = 0;
++      if (p->numHashBytes == 2)
++        hs = (1 << 16) - 1;
++      else
++      {
++        hs = historySize - 1;
++        hs |= (hs >> 1);
++        hs |= (hs >> 2);
++        hs |= (hs >> 4);
++        hs |= (hs >> 8);
++        hs >>= 1;
++        /* hs >>= p->skipModeBits; */
++        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
++        if (hs > (1 << 24))
++        {
++          if (p->numHashBytes == 3)
++            hs = (1 << 24) - 1;
++          else
++            hs >>= 1;
++        }
++      }
++      p->hashMask = hs;
++      hs++;
++      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
++      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
++      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
++      hs += p->fixedHashSize;
++    }
++
++    {
++      UInt32 prevSize = p->hashSizeSum + p->numSons;
++      UInt32 newSize;
++      p->historySize = historySize;
++      p->hashSizeSum = hs;
++      p->cyclicBufferSize = newCyclicBufferSize;
++      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
++      newSize = p->hashSizeSum + p->numSons;
++      if (p->hash != 0 && prevSize == newSize)
++        return 1;
++      MatchFinder_FreeThisClassMemory(p, alloc);
++      p->hash = AllocRefs(newSize, alloc);
++      if (p->hash != 0)
++      {
++        p->son = p->hash + p->hashSizeSum;
++        return 1;
++      }
++    }
++  }
++  MatchFinder_Free(p, alloc);
++  return 0;
++}
++
++static void MatchFinder_SetLimits(CMatchFinder *p)
++{
++  UInt32 limit = kMaxValForNormalize - p->pos;
++  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
++  if (limit2 < limit) 
++    limit = limit2;
++  limit2 = p->streamPos - p->pos;
++  if (limit2 <= p->keepSizeAfter)
++  {
++    if (limit2 > 0)
++      limit2 = 1;
++  }
++  else
++    limit2 -= p->keepSizeAfter;
++  if (limit2 < limit) 
++    limit = limit2;
++  {
++    UInt32 lenLimit = p->streamPos - p->pos;
++    if (lenLimit > p->matchMaxLen)
++      lenLimit = p->matchMaxLen;
++    p->lenLimit = lenLimit;
++  }
++  p->posLimit = p->pos + limit;
++}
++
++void MatchFinder_Init(CMatchFinder *p)
++{
++  UInt32 i;
++  for(i = 0; i < p->hashSizeSum; i++)
++    p->hash[i] = kEmptyHashValue;
++  p->cyclicBufferPos = 0;
++  p->buffer = p->bufferBase;
++  p->pos = p->streamPos = p->cyclicBufferSize;
++  p->result = SZ_OK;
++  p->streamEndWasReached = 0;
++  MatchFinder_ReadBlock(p);
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p) 
++{ 
++  return (p->pos - p->historySize - 1) & kNormalizeMask; 
++}
++
++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
++{
++  UInt32 i;
++  for (i = 0; i < numItems; i++)
++  {
++    UInt32 value = items[i];
++    if (value <= subValue)
++      value = kEmptyHashValue;
++    else
++      value -= subValue;
++    items[i] = value;
++  }
++}
++
++static void MatchFinder_Normalize(CMatchFinder *p)
++{
++  UInt32 subValue = MatchFinder_GetSubValue(p);
++  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
++  MatchFinder_ReduceOffsets(p, subValue);
++}
++
++static void MatchFinder_CheckLimits(CMatchFinder *p)
++{
++  if (p->pos == kMaxValForNormalize)
++    MatchFinder_Normalize(p);
++  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
++    MatchFinder_CheckAndMoveAndRead(p);
++  if (p->cyclicBufferPos == p->cyclicBufferSize)
++    p->cyclicBufferPos = 0;
++  MatchFinder_SetLimits(p);
++}
++
++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, 
++    UInt32 *distances, UInt32 maxLen)
++{
++  son[_cyclicBufferPos] = curMatch;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++      return distances;
++    {
++      const Byte *pb = cur - delta;
++      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
++      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
++      {
++        UInt32 len = 0;
++        while(++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++            return distances;
++        }
++      }
++    }
++  }
++}
++
++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, 
++    UInt32 *distances, UInt32 maxLen)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return distances;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        if (++len != lenLimit && pb[len] == cur[len])
++          while(++len != lenLimit)
++            if (pb[len] != cur[len])
++              break;
++        if (maxLen < len)
++        {
++          *distances++ = maxLen = len;
++          *distances++ = delta - 1;
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return distances;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, 
++    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
++{
++  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
++  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
++  UInt32 len0 = 0, len1 = 0;
++  for (;;)
++  {
++    UInt32 delta = pos - curMatch;
++    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
++    {
++      *ptr0 = *ptr1 = kEmptyHashValue;
++      return;
++    }
++    {
++      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
++      const Byte *pb = cur - delta;
++      UInt32 len = (len0 < len1 ? len0 : len1);
++      if (pb[len] == cur[len])
++      {
++        while(++len != lenLimit)
++          if (pb[len] != cur[len])
++            break;
++        {
++          if (len == lenLimit)
++          {
++            *ptr1 = pair[0];
++            *ptr0 = pair[1];
++            return;
++          }
++        }
++      }
++      if (pb[len] < cur[len])
++      {
++        *ptr1 = curMatch;
++        ptr1 = pair + 1;
++        curMatch = *ptr1;
++        len1 = len;
++      }
++      else
++      {
++        *ptr0 = curMatch;
++        ptr0 = pair;
++        curMatch = *ptr0;
++        len0 = len;
++      }
++    }
++  }
++}
++
++#define MOVE_POS \
++  ++p->cyclicBufferPos; \
++  p->buffer++; \
++  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
++
++#define MOVE_POS_RET MOVE_POS return offset;
++
++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
++
++#define GET_MATCHES_HEADER2(minLen, ret_op) \
++  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
++  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
++  cur = p->buffer;
++
++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
++#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
++
++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
++
++#define GET_MATCHES_FOOTER(offset, maxLen) \
++  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
++  distances + offset, maxLen) - distances); MOVE_POS_RET;
++
++#define SKIP_FOOTER \
++  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
++
++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(2)
++  HASH2_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 1)
++}
++
++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = 0;
++  GET_MATCHES_FOOTER(offset, 2)
++}
++
++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, delta2, maxLen, offset;
++  GET_MATCHES_HEADER(3)
++
++  HASH3_CALC;
++
++  delta2 = p->pos - p->hash[hash2Value];
++  curMatch = p->hash[kFix3HashSize + hashValue];
++  
++  p->hash[hash2Value] = 
++  p->hash[kFix3HashSize + hashValue] = p->pos;
++
++
++  maxLen = 2;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[0] = maxLen;
++    distances[1] = delta2 - 1;
++    offset = 2;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET; 
++    }
++  }
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++  
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
++      MOVE_POS_RET; 
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  GET_MATCHES_FOOTER(offset, maxLen)
++}
++
++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
++  GET_MATCHES_HEADER(4)
++
++  HASH4_CALC;
++
++  delta2 = p->pos - p->hash[                hash2Value];
++  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
++  curMatch = p->hash[kFix4HashSize + hashValue];
++
++  p->hash[                hash2Value] =
++  p->hash[kFix3HashSize + hash3Value] =
++  p->hash[kFix4HashSize + hashValue] = p->pos;
++
++  maxLen = 1;
++  offset = 0;
++  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
++  {
++    distances[0] = maxLen = 2;
++    distances[1] = delta2 - 1;
++    offset = 2;
++  }
++  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
++  {
++    maxLen = 3;
++    distances[offset + 1] = delta3 - 1;
++    offset += 2;
++    delta2 = delta3;
++  }
++  if (offset != 0)
++  {
++    for (; maxLen != lenLimit; maxLen++)
++      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
++        break;
++    distances[offset - 2] = maxLen;
++    if (maxLen == lenLimit)
++    {
++      p->son[p->cyclicBufferPos] = curMatch;
++      MOVE_POS_RET; 
++    }
++  }
++  if (maxLen < 3)
++    maxLen = 3;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances + offset, maxLen) - (distances));
++  MOVE_POS_RET
++}
++
++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
++{
++  UInt32 offset;
++  GET_MATCHES_HEADER(3)
++  HASH_ZIP_CALC;
++  curMatch = p->hash[hashValue];
++  p->hash[hashValue] = p->pos;
++  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
++    distances, 2) - (distances));
++  MOVE_POS_RET
++}
++
++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(2) 
++    HASH2_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value;
++    SKIP_HEADER(3)
++    HASH3_CALC;
++    curMatch = p->hash[kFix3HashSize + hashValue];
++    p->hash[hash2Value] =
++    p->hash[kFix3HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4) 
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] = p->pos;
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    SKIP_FOOTER
++  }
++  while (--num != 0);
++}
++
++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    UInt32 hash2Value, hash3Value;
++    SKIP_HEADER(4)
++    HASH4_CALC;
++    curMatch = p->hash[kFix4HashSize + hashValue];
++    p->hash[                hash2Value] =
++    p->hash[kFix3HashSize + hash3Value] =
++    p->hash[kFix4HashSize + hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
++{
++  do
++  {
++    SKIP_HEADER(3)
++    HASH_ZIP_CALC;
++    curMatch = p->hash[hashValue];
++    p->hash[hashValue] = p->pos;
++    p->son[p->cyclicBufferPos] = curMatch;
++    MOVE_POS
++  }
++  while (--num != 0);
++}
++
++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
++{
++  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
++  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
++  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
++  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
++  if (!p->btMode)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 2)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
++  }
++  else if (p->numHashBytes == 3)
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
++  }
++  else
++  {
++    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
++    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
++  }
++}
+--- /dev/null
++++ b/lzma/LzmaDec.c
+@@ -0,0 +1,1014 @@
++/* LzmaDec.c -- LZMA Decoder
++2008-04-29
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzmaDec.h for license options */
++
++#include "LzmaDec.h"
++
++#include <string.h>
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++
++#define RC_INIT_SIZE 5
++
++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
++  { UPDATE_0(p); i = (i + i); A0; } else \
++  { UPDATE_1(p); i = (i + i) + 1; A1; } 
++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)               
++
++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
++#define TREE_DECODE(probs, limit, i) \
++  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
++
++/* #define _LZMA_SIZE_OPT */
++
++#ifdef _LZMA_SIZE_OPT
++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
++#else
++#define TREE_6_DECODE(probs, i) \
++  { i = 1; \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  TREE_GET_BIT(probs, i); \
++  i -= 0x40; }
++#endif
++
++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
++
++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
++#define UPDATE_0_CHECK range = bound;
++#define UPDATE_1_CHECK range -= bound; code -= bound;
++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
++  { UPDATE_0_CHECK; i = (i + i); A0; } else \
++  { UPDATE_1_CHECK; i = (i + i) + 1; A1; } 
++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)               
++#define TREE_DECODE_CHECK(probs, limit, i) \
++  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while(i < limit); i -= limit; }
++
++
++#define kNumPosBitsMax 4
++#define kNumPosStatesMax (1 << kNumPosBitsMax)
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define LenChoice 0
++#define LenChoice2 (LenChoice + 1)
++#define LenLow (LenChoice2 + 1)
++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
++#define kNumLenProbs (LenHigh + kLenNumHighSymbols) 
++
++
++#define kNumStates 12
++#define kNumLitStates 7
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
++
++#define kNumPosSlotBits 6
++#define kNumLenToPosStates 4
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++
++#define kMatchMinLen 2
++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define IsMatch 0
++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
++#define IsRepG0 (IsRep + kNumStates)
++#define IsRepG1 (IsRepG0 + kNumStates)
++#define IsRepG2 (IsRepG1 + kNumStates)
++#define IsRep0Long (IsRepG2 + kNumStates)
++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
++#define LenCoder (Align + kAlignTableSize)
++#define RepLenCoder (LenCoder + kNumLenProbs)
++#define Literal (RepLenCoder + kNumLenProbs)
++
++#define LZMA_BASE_SIZE 1846
++#define LZMA_LIT_SIZE 768
++
++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
++
++#if Literal != LZMA_BASE_SIZE
++StopCompilingDueBUG
++#endif
++
++/*
++#define LZMA_STREAM_WAS_FINISHED_ID (-1)
++#define LZMA_SPEC_LEN_OFFSET (-3)
++*/
++
++Byte kLiteralNextStates[kNumStates * 2] = 
++{
++  0, 0, 0, 0, 1, 2, 3,  4,  5,  6,  4,  5, 
++  7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10
++};
++
++#define LZMA_DIC_MIN (1 << 12)
++
++/* First LZMA-symbol is always decoded. 
++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization 
++Out:
++  Result:
++    0 - OK
++    1 - Error
++  p->remainLen:
++    < kMatchSpecLenStart : normal remain
++    = kMatchSpecLenStart : finished
++    = kMatchSpecLenStart + 1 : Flush marker
++    = kMatchSpecLenStart + 2 : State Init Marker
++*/
++
++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  CLzmaProb *probs = p->probs;
++
++  unsigned state = p->state;
++  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
++  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
++  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
++  unsigned lc = p->prop.lc;
++
++  Byte *dic = p->dic;
++  SizeT dicBufSize = p->dicBufSize;
++  SizeT dicPos = p->dicPos;
++  
++  UInt32 processedPos = p->processedPos;
++  UInt32 checkDicSize = p->checkDicSize;
++  unsigned len = 0;
++
++  const Byte *buf = p->buf;
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++
++  do
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = processedPos & pbMask;
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0(prob)
++    {
++      unsigned symbol;
++      UPDATE_0(prob);
++      prob = probs + Literal;
++      if (checkDicSize != 0 || processedPos != 0)
++        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) + 
++        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
++
++      if (state < kNumLitStates)
++      {
++        symbol = 1;
++        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++        unsigned offs = 0x100;
++        symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      dic[dicPos++] = (Byte)symbol;
++      processedPos++;
++
++      state = kLiteralNextStates[state];
++      /* if (state < 4) state = 0; else if (state < 10) state -= 3; else state -= 6; */
++      continue;
++    }
++    else             
++    {
++      UPDATE_1(prob);
++      prob = probs + IsRep + state;
++      IF_BIT_0(prob)
++      {
++        UPDATE_0(prob);
++        state += kNumStates;
++        prob = probs + LenCoder;
++      }
++      else
++      {
++        UPDATE_1(prob);
++        if (checkDicSize == 0 && processedPos == 0)
++          return SZ_ERROR_DATA;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0(prob)
++        {
++          UPDATE_0(prob);
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++            dicPos++;
++            processedPos++;
++            state = state < kNumLitStates ? 9 : 11;
++            continue;
++          }
++          UPDATE_1(prob);
++        }
++        else
++        {
++          UInt32 distance;
++          UPDATE_1(prob);
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0(prob)
++          {
++            UPDATE_0(prob);
++            distance = rep1;
++          }
++          else 
++          {
++            UPDATE_1(prob);
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0(prob)
++            {
++              UPDATE_0(prob);
++              distance = rep2;
++            }
++            else
++            {
++              UPDATE_1(prob);
++              distance = rep3;
++              rep3 = rep2;
++            }
++            rep2 = rep1;
++          }
++          rep1 = rep0;
++          rep0 = distance;
++        }
++        state = state < kNumLitStates ? 8 : 11;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0(probLen)
++        {
++          UPDATE_0(probLen);
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = (1 << kLenNumLowBits);
++        }
++        else
++        {
++          UPDATE_1(probLen);
++          probLen = prob + LenChoice2;
++          IF_BIT_0(probLen)
++          {
++            UPDATE_0(probLen);
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = (1 << kLenNumMidBits);
++          }
++          else
++          {
++            UPDATE_1(probLen);
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = (1 << kLenNumHighBits);
++          }
++        }
++        TREE_DECODE(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state >= kNumStates)
++      {
++        UInt32 distance;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
++        TREE_6_DECODE(prob, distance);
++        if (distance >= kStartPosModelIndex)
++        {
++          unsigned posSlot = (unsigned)distance; 
++          int numDirectBits = (int)(((distance >> 1) - 1));
++          distance = (2 | (distance & 1));
++          if (posSlot < kEndPosModelIndex)
++          {
++            distance <<= numDirectBits;
++            prob = probs + SpecPos + distance - posSlot - 1;
++            {
++              UInt32 mask = 1;
++              unsigned i = 1;
++              do
++              {
++                GET_BIT2(prob + i, i, ; , distance |= mask);
++                mask <<= 1;
++              }
++              while(--numDirectBits != 0);
++            }
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE
++              range >>= 1;
++              
++              {
++                UInt32 t;
++                code -= range;
++                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
++                distance = (distance << 1) + (t + 1);
++                code += range & t;
++              }
++              /*
++              distance <<= 1;
++              if (code >= range)
++              {
++                code -= range;
++                distance |= 1;
++              }
++              */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            distance <<= kNumAlignBits;
++            {
++              unsigned i = 1;
++              GET_BIT2(prob + i, i, ; , distance |= 1);
++              GET_BIT2(prob + i, i, ; , distance |= 2);
++              GET_BIT2(prob + i, i, ; , distance |= 4);
++              GET_BIT2(prob + i, i, ; , distance |= 8);
++            }
++            if (distance == (UInt32)0xFFFFFFFF)
++            {
++              len += kMatchSpecLenStart;
++              state -= kNumStates;
++              break;
++            }
++          }
++        }
++        rep3 = rep2;
++        rep2 = rep1;
++        rep1 = rep0;
++        rep0 = distance + 1; 
++        if (checkDicSize == 0)
++        {
++          if (distance >= processedPos)
++            return SZ_ERROR_DATA;
++        }
++        else if (distance >= checkDicSize)
++          return SZ_ERROR_DATA;
++        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
++        /* state = kLiteralNextStates[state]; */
++      }
++
++      len += kMatchMinLen;
++
++      {
++        SizeT rem = limit - dicPos;
++        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
++        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
++
++        processedPos += curLen;
++
++        len -= curLen;
++        if (pos + curLen <= dicBufSize)
++        {
++          Byte *dest = dic + dicPos;
++          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
++          const Byte *lim = dest + curLen;
++          dicPos += curLen;
++          do 
++            *(dest) = (Byte)*(dest + src); 
++          while (++dest != lim);
++        }
++        else
++        {
++          do
++          {
++            dic[dicPos++] = dic[pos];
++            if (++pos == dicBufSize)
++              pos = 0;
++          }
++          while (--curLen != 0);
++        }
++      }
++    }
++  }
++  while (dicPos < limit && buf < bufLimit);
++  NORMALIZE;
++  p->buf = buf;
++  p->range = range;
++  p->code = code;
++  p->remainLen = len;
++  p->dicPos = dicPos;
++  p->processedPos = processedPos;
++  p->reps[0] = rep0;
++  p->reps[1] = rep1;
++  p->reps[2] = rep2;
++  p->reps[3] = rep3;
++  p->state = state;
++
++  return SZ_OK;
++}
++
++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
++{
++  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
++  {
++    Byte *dic = p->dic;
++    SizeT dicPos = p->dicPos;
++    SizeT dicBufSize = p->dicBufSize;
++    unsigned len = p->remainLen;
++    UInt32 rep0 = p->reps[0];
++    if (limit - dicPos < len)
++      len = (unsigned)(limit - dicPos);
++
++    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
++      p->checkDicSize = p->prop.dicSize;
++
++    p->processedPos += len;
++    p->remainLen -= len;
++    while (len-- != 0)
++    {
++      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
++      dicPos++;
++    }
++    p->dicPos = dicPos;
++  }
++}
++
++/* LzmaDec_DecodeReal2 decodes LZMA-symbols and sets p->needFlush and p->needInit, if required. */
++
++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
++{
++  do
++  {
++    SizeT limit2 = limit;
++    if (p->checkDicSize == 0)
++    {
++      UInt32 rem = p->prop.dicSize - p->processedPos;
++      if (limit - p->dicPos > rem)
++        limit2 = p->dicPos + rem;
++    }
++    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
++    if (p->processedPos >= p->prop.dicSize)
++      p->checkDicSize = p->prop.dicSize;
++    LzmaDec_WriteRem(p, limit);
++  }
++  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
++
++  if (p->remainLen > kMatchSpecLenStart)
++  {
++    p->remainLen = kMatchSpecLenStart;
++  }
++  return 0;
++}
++
++typedef enum 
++{
++  DUMMY_ERROR, /* unexpected end of input stream */
++  DUMMY_LIT,
++  DUMMY_MATCH,
++  DUMMY_REP
++} ELzmaDummy;
++
++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
++{
++  UInt32 range = p->range;
++  UInt32 code = p->code;
++  const Byte *bufLimit = buf + inSize;
++  CLzmaProb *probs = p->probs;
++  unsigned state = p->state;
++  ELzmaDummy res;
++
++  {
++    CLzmaProb *prob;
++    UInt32 bound;
++    unsigned ttt;
++    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
++
++    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
++    IF_BIT_0_CHECK(prob)
++    {
++      UPDATE_0_CHECK
++
++      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
++
++      prob = probs + Literal;
++      if (p->checkDicSize != 0 || p->processedPos != 0)
++        prob += (LZMA_LIT_SIZE * 
++          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) + 
++          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
++
++      if (state < kNumLitStates)
++      {
++        unsigned symbol = 1;
++        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
++      }
++      else
++      {
++        unsigned matchByte = p->dic[p->dicPos - p->reps[0] + 
++            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
++        unsigned offs = 0x100;
++        unsigned symbol = 1;
++        do
++        {
++          unsigned bit;
++          CLzmaProb *probLit;
++          matchByte <<= 1;
++          bit = (matchByte & offs);
++          probLit = prob + offs + bit + symbol;
++          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
++        }
++        while (symbol < 0x100);
++      }
++      res = DUMMY_LIT;
++    }
++    else             
++    {
++      unsigned len;
++      UPDATE_1_CHECK;
++
++      prob = probs + IsRep + state;
++      IF_BIT_0_CHECK(prob)
++      {
++        UPDATE_0_CHECK;
++        state = 0;
++        prob = probs + LenCoder;
++        res = DUMMY_MATCH;
++      }
++      else
++      {
++        UPDATE_1_CHECK;
++        res = DUMMY_REP;
++        prob = probs + IsRepG0 + state;
++        IF_BIT_0_CHECK(prob)
++        {
++          UPDATE_0_CHECK;
++          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++            NORMALIZE_CHECK;
++            return DUMMY_REP;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++          }
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          prob = probs + IsRepG1 + state;
++          IF_BIT_0_CHECK(prob)
++          {
++            UPDATE_0_CHECK;
++          }
++          else 
++          {
++            UPDATE_1_CHECK;
++            prob = probs + IsRepG2 + state;
++            IF_BIT_0_CHECK(prob)
++            {
++              UPDATE_0_CHECK;
++            }
++            else
++            {
++              UPDATE_1_CHECK;
++            }
++          }
++        }
++        state = kNumStates;
++        prob = probs + RepLenCoder;
++      }
++      {
++        unsigned limit, offset;
++        CLzmaProb *probLen = prob + LenChoice;
++        IF_BIT_0_CHECK(probLen)
++        {
++          UPDATE_0_CHECK;
++          probLen = prob + LenLow + (posState << kLenNumLowBits);
++          offset = 0;
++          limit = 1 << kLenNumLowBits;
++        }
++        else
++        {
++          UPDATE_1_CHECK;
++          probLen = prob + LenChoice2;
++          IF_BIT_0_CHECK(probLen)
++          {
++            UPDATE_0_CHECK;
++            probLen = prob + LenMid + (posState << kLenNumMidBits);
++            offset = kLenNumLowSymbols;
++            limit = 1 << kLenNumMidBits;
++          }
++          else
++          {
++            UPDATE_1_CHECK;
++            probLen = prob + LenHigh;
++            offset = kLenNumLowSymbols + kLenNumMidSymbols;
++            limit = 1 << kLenNumHighBits;
++          }
++        }
++        TREE_DECODE_CHECK(probLen, limit, len);
++        len += offset;
++      }
++
++      if (state < 4)
++      {
++        unsigned posSlot;
++        prob = probs + PosSlot +
++            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << 
++            kNumPosSlotBits);
++        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
++        if (posSlot >= kStartPosModelIndex)
++        {
++          int numDirectBits = ((posSlot >> 1) - 1);
++
++          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
++
++          if (posSlot < kEndPosModelIndex)
++          {
++            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
++          }
++          else
++          {
++            numDirectBits -= kNumAlignBits;
++            do
++            {
++              NORMALIZE_CHECK
++              range >>= 1;
++              code -= range & (((code - range) >> 31) - 1);
++              /* if (code >= range) code -= range; */
++            }
++            while (--numDirectBits != 0);
++            prob = probs + Align;
++            numDirectBits = kNumAlignBits;
++          }
++          {
++            unsigned i = 1;
++            do
++            {
++              GET_BIT_CHECK(prob + i, i);
++            }
++            while(--numDirectBits != 0);
++          }
++        }
++      }
++    }
++  }
++  NORMALIZE_CHECK;
++  return res;
++}
++
++
++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
++{
++  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
++  p->range = 0xFFFFFFFF;
++  p->needFlush = 0;
++}
++
++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) 
++{ 
++  p->needFlush = 1; 
++  p->remainLen = 0; 
++  p->tempBufSize = 0; 
++
++  if (initDic)
++  {
++    p->processedPos = 0;
++    p->checkDicSize = 0;
++    p->needInitState = 1;
++  }
++  if (initState)
++    p->needInitState = 1;
++}
++
++void LzmaDec_Init(CLzmaDec *p) 
++{ 
++  p->dicPos = 0; 
++  LzmaDec_InitDicAndState(p, True, True);
++}
++
++static void LzmaDec_InitStateReal(CLzmaDec *p)
++{
++  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
++  UInt32 i;
++  CLzmaProb *probs = p->probs;
++  for (i = 0; i < numProbs; i++)
++    probs[i] = kBitModelTotal >> 1; 
++  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
++  p->state = 0;
++  p->needInitState = 0;
++}
++
++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen, 
++    ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT inSize = *srcLen;
++  (*srcLen) = 0;
++  LzmaDec_WriteRem(p, dicLimit);
++  
++  *status = LZMA_STATUS_NOT_SPECIFIED;
++
++  while (p->remainLen != kMatchSpecLenStart)
++  {
++      int checkEndMarkNow;
++
++      if (p->needFlush != 0)
++      {
++        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
++          p->tempBuf[p->tempBufSize++] = *src++;
++        if (p->tempBufSize < RC_INIT_SIZE)
++        {
++          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++          return SZ_OK;
++        }
++        if (p->tempBuf[0] != 0)
++          return SZ_ERROR_DATA;
++
++        LzmaDec_InitRc(p, p->tempBuf);
++        p->tempBufSize = 0;
++      }
++
++      checkEndMarkNow = 0;
++      if (p->dicPos >= dicLimit)
++      {
++        if (p->remainLen == 0 && p->code == 0)
++        {
++          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
++          return SZ_OK;
++        }
++        if (finishMode == LZMA_FINISH_ANY)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_OK;
++        }
++        if (p->remainLen != 0)
++        {
++          *status = LZMA_STATUS_NOT_FINISHED;
++          return SZ_ERROR_DATA;
++        }
++        checkEndMarkNow = 1;
++      }
++
++      if (p->needInitState)
++        LzmaDec_InitStateReal(p);
++  
++      if (p->tempBufSize == 0)
++      {
++        SizeT processed;
++        const Byte *bufLimit;
++        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            memcpy(p->tempBuf, src, inSize);
++            p->tempBufSize = (unsigned)inSize;
++            (*srcLen) += inSize;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++          bufLimit = src;
++        }
++        else
++          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
++        p->buf = src;
++        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
++          return SZ_ERROR_DATA;
++        processed = p->buf - src;
++        (*srcLen) += processed;
++        src += processed;
++        inSize -= processed;
++      }
++      else
++      {
++        unsigned rem = p->tempBufSize, lookAhead = 0;
++        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
++          p->tempBuf[rem++] = src[lookAhead++];
++        p->tempBufSize = rem;
++        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
++        {
++          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
++          if (dummyRes == DUMMY_ERROR)
++          {
++            (*srcLen) += lookAhead;
++            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
++            return SZ_OK;
++          }
++          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
++          {
++            *status = LZMA_STATUS_NOT_FINISHED;
++            return SZ_ERROR_DATA;
++          }
++        }
++        p->buf = p->tempBuf;
++        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
++          return SZ_ERROR_DATA;
++        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
++        (*srcLen) += lookAhead;
++        src += lookAhead;
++        inSize -= lookAhead;
++        p->tempBufSize = 0;
++      }
++  }
++  if (p->code == 0) 
++    *status = LZMA_STATUS_FINISHED_WITH_MARK;
++  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
++}
++
++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
++{
++  SizeT outSize = *destLen;
++  SizeT inSize = *srcLen;
++  *srcLen = *destLen = 0;
++  for (;;)
++  {
++    SizeT inSizeCur = inSize, outSizeCur, dicPos;
++    ELzmaFinishMode curFinishMode;
++    SRes res;
++    if (p->dicPos == p->dicBufSize)
++      p->dicPos = 0;
++    dicPos = p->dicPos;
++    if (outSize > p->dicBufSize - dicPos)
++    {
++      outSizeCur = p->dicBufSize;
++      curFinishMode = LZMA_FINISH_ANY;
++    }
++    else
++    {
++      outSizeCur = dicPos + outSize;
++      curFinishMode = finishMode;
++    }
++
++    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
++    src += inSizeCur;
++    inSize -= inSizeCur;
++    *srcLen += inSizeCur;
++    outSizeCur = p->dicPos - dicPos;
++    memcpy(dest, p->dic + dicPos, outSizeCur);
++    dest += outSizeCur;
++    outSize -= outSizeCur;
++    *destLen += outSizeCur;
++    if (res != 0)
++      return res;
++    if (outSizeCur == 0 || outSize == 0)
++      return SZ_OK;
++  }
++}
++
++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc) 
++{ 
++  alloc->Free(alloc, p->probs);  
++  p->probs = 0; 
++}
++
++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc) 
++{ 
++  alloc->Free(alloc, p->dic); 
++  p->dic = 0; 
++}
++
++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
++{
++  LzmaDec_FreeProbs(p, alloc);
++  LzmaDec_FreeDict(p, alloc);
++}
++
++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
++{
++  UInt32 dicSize; 
++  Byte d;
++  
++  if (size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_UNSUPPORTED;
++  else
++    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
++ 
++  if (dicSize < LZMA_DIC_MIN)
++    dicSize = LZMA_DIC_MIN;
++  p->dicSize = dicSize;
++
++  d = data[0];
++  if (d >= (9 * 5 * 5))
++    return SZ_ERROR_UNSUPPORTED;
++
++  p->lc = d % 9;
++  d /= 9;
++  p->pb = d / 5;
++  p->lp = d % 5;
++
++  return SZ_OK;
++}
++
++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
++{
++  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
++  if (p->probs == 0 || numProbs != p->numProbs)
++  {
++    LzmaDec_FreeProbs(p, alloc);
++    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
++    p->numProbs = numProbs;
++    if (p->probs == 0)
++      return SZ_ERROR_MEM;
++  }
++  return SZ_OK;
++}
++
++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
++{
++  CLzmaProps propNew;
++  SizeT dicBufSize;
++  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
++  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
++  dicBufSize = propNew.dicSize;
++  if (p->dic == 0 || dicBufSize != p->dicBufSize)
++  {
++    LzmaDec_FreeDict(p, alloc);
++    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
++    if (p->dic == 0)
++    {
++      LzmaDec_FreeProbs(p, alloc);
++      return SZ_ERROR_MEM;
++    }
++  }
++  p->dicBufSize = dicBufSize;
++  p->prop = propNew;
++  return SZ_OK;
++}
++
++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
++    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, 
++    ELzmaStatus *status, ISzAlloc *alloc)
++{
++  CLzmaDec p;
++  SRes res;
++  SizeT inSize = *srcLen;
++  SizeT outSize = *destLen;
++  *srcLen = *destLen = 0;
++  if (inSize < RC_INIT_SIZE)
++    return SZ_ERROR_INPUT_EOF;
++
++  LzmaDec_Construct(&p);
++  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
++  if (res != 0)
++    return res;
++  p.dic = dest;
++  p.dicBufSize = outSize;
++
++  LzmaDec_Init(&p);
++  
++  *srcLen = inSize;
++  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
++
++  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
++    res = SZ_ERROR_INPUT_EOF;
++
++  (*destLen) = p.dicPos;
++  LzmaDec_FreeProbs(&p, alloc);
++  return res;
++}
+--- /dev/null
++++ b/lzma/LzmaEnc.c
+@@ -0,0 +1,2335 @@
++/* LzmaEnc.c -- LZMA Encoder
++2008-04-28
++Copyright (c) 1999-2008 Igor Pavlov
++Read LzmaEnc.h for license options */
++
++#if defined(SHOW_STAT) || defined(SHOW_STAT2)
++#include <stdio.h>
++#endif
++
++#include <string.h>
++
++#include "LzmaEnc.h"
++
++#include "LzFind.h"
++#ifdef COMPRESS_MF_MT
++#include "LzFindMt.h"
++#endif
++
++/* #define SHOW_STAT */
++/* #define SHOW_STAT2 */
++
++#ifdef SHOW_STAT
++static int ttt = 0;
++#endif
++
++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
++
++#define kBlockSize (9 << 10)
++#define kUnpackBlockSize (1 << 18)
++#define kMatchArraySize (1 << 21)
++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
++
++#define kNumMaxDirectBits (31)
++
++#define kNumTopBits 24
++#define kTopValue ((UInt32)1 << kNumTopBits)
++
++#define kNumBitModelTotalBits 11
++#define kBitModelTotal (1 << kNumBitModelTotalBits)
++#define kNumMoveBits 5
++#define kProbInitValue (kBitModelTotal >> 1)
++
++#define kNumMoveReducingBits 4
++#define kNumBitPriceShiftBits 4
++#define kBitPrice (1 << kNumBitPriceShiftBits)
++
++void LzmaEncProps_Init(CLzmaEncProps *p)
++{
++  p->level = 5;
++  p->dictSize = p->mc = 0;
++  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
++  p->writeEndMark = 0;
++}
++
++void LzmaEncProps_Normalize(CLzmaEncProps *p)
++{
++  int level = p->level;
++  if (level < 0) level = 5;
++  p->level = level;
++  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
++  if (p->lc < 0) p->lc = 3; 
++  if (p->lp < 0) p->lp = 0; 
++  if (p->pb < 0) p->pb = 2; 
++  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1); 
++  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64); 
++  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1); 
++  if (p->numHashBytes < 0) p->numHashBytes = 4; 
++  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
++  if (p->numThreads < 0) p->numThreads = ((p->btMode && p->algo) ? 2 : 1);
++}
++
++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
++{
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++  return props.dictSize;
++}
++
++/* #define LZMA_LOG_BSR */
++/* Define it for Intel's CPU */
++
++
++#ifdef LZMA_LOG_BSR
++
++#define kDicLogSizeMaxCompress 30
++
++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
++
++UInt32 GetPosSlot1(UInt32 pos) 
++{ 
++  UInt32 res; 
++  BSR2_RET(pos, res); 
++  return res; 
++}
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++
++#else
++
++#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
++
++void LzmaEnc_FastPosInit(Byte *g_FastPos)
++{
++  int c = 2, slotFast;
++  g_FastPos[0] = 0;
++  g_FastPos[1] = 1;
++  
++  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
++  {
++    UInt32 k = (1 << ((slotFast >> 1) - 1));
++    UInt32 j;
++    for (j = 0; j < k; j++, c++)
++      g_FastPos[c] = (Byte)slotFast;
++  }
++}
++
++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
++  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
++  res = p->g_FastPos[pos >> i] + (i * 2); }
++/*
++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
++  p->g_FastPos[pos >> 6] + 12 : \
++  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
++*/
++
++#define GetPosSlot1(pos) p->g_FastPos[pos]
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
++
++#endif
++
++
++#define LZMA_NUM_REPS 4
++
++typedef unsigned CState;
++
++typedef struct _COptimal
++{
++  UInt32 price;    
++
++  CState state;
++  int prev1IsChar;
++  int prev2;
++
++  UInt32 posPrev2;
++  UInt32 backPrev2;     
++
++  UInt32 posPrev;
++  UInt32 backPrev;     
++  UInt32 backs[LZMA_NUM_REPS];
++} COptimal;
++
++#define kNumOpts (1 << 12)
++
++#define kNumLenToPosStates 4
++#define kNumPosSlotBits 6 
++#define kDicLogSizeMin 0 
++#define kDicLogSizeMax 32 
++#define kDistTableSizeMax (kDicLogSizeMax * 2)
++
++
++#define kNumAlignBits 4
++#define kAlignTableSize (1 << kNumAlignBits)
++#define kAlignMask (kAlignTableSize - 1)
++
++#define kStartPosModelIndex 4
++#define kEndPosModelIndex 14
++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
++
++#define kNumFullDistances (1 << (kEndPosModelIndex / 2))
++
++#ifdef _LZMA_PROB32
++#define CLzmaProb UInt32
++#else
++#define CLzmaProb UInt16
++#endif
++
++#define LZMA_PB_MAX 4
++#define LZMA_LC_MAX 8
++#define LZMA_LP_MAX 4
++
++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
++
++
++#define kLenNumLowBits 3
++#define kLenNumLowSymbols (1 << kLenNumLowBits)
++#define kLenNumMidBits 3
++#define kLenNumMidSymbols (1 << kLenNumMidBits)
++#define kLenNumHighBits 8
++#define kLenNumHighSymbols (1 << kLenNumHighBits)
++
++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
++
++#define LZMA_MATCH_LEN_MIN 2
++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
++
++#define kNumStates 12
++
++typedef struct
++{
++  CLzmaProb choice;
++  CLzmaProb choice2;
++  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
++  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
++  CLzmaProb high[kLenNumHighSymbols];
++} CLenEnc;
++
++typedef struct
++{
++  CLenEnc p;
++  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
++  UInt32 tableSize;
++  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
++} CLenPriceEnc;
++
++typedef struct _CRangeEnc
++{
++  UInt32 range;
++  Byte cache;
++  UInt64 low;
++  UInt64 cacheSize;
++  Byte *buf;
++  Byte *bufLim;
++  Byte *bufBase;
++  ISeqOutStream *outStream;
++  UInt64 processed;
++  SRes res;
++} CRangeEnc;
++
++typedef struct _CSeqInStreamBuf
++{
++  ISeqInStream funcTable;
++  const Byte *data;
++  SizeT rem;
++} CSeqInStreamBuf;
++
++static SRes MyRead(void *pp, void *data, size_t *size)
++{
++  size_t curSize = *size;
++  CSeqInStreamBuf *p = (CSeqInStreamBuf *)pp;
++  if (p->rem < curSize)
++    curSize = p->rem;
++  memcpy(data, p->data, curSize);
++  p->rem -= curSize;
++  p->data += curSize;
++  *size = curSize;
++  return SZ_OK;
++}
++
++typedef struct 
++{
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++} CSaveState;
++
++typedef struct _CLzmaEnc
++{
++  IMatchFinder matchFinder;
++  void *matchFinderObj;
++
++  #ifdef COMPRESS_MF_MT
++  Bool mtMode;
++  CMatchFinderMt matchFinderMt;
++  #endif
++
++  CMatchFinder matchFinderBase;
++
++  #ifdef COMPRESS_MF_MT
++  Byte pad[128];
++  #endif
++  
++  UInt32 optimumEndIndex;
++  UInt32 optimumCurrentIndex;
++
++  Bool longestMatchWasFound;
++  UInt32 longestMatchLength;    
++  UInt32 numDistancePairs;
++
++  COptimal opt[kNumOpts];
++  
++  #ifndef LZMA_LOG_BSR
++  Byte g_FastPos[1 << kNumLogBits];
++  #endif
++
++  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
++  UInt32 matchDistances[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
++  UInt32 numFastBytes;
++  UInt32 additionalOffset;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 state;
++
++  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
++  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
++  UInt32 alignPrices[kAlignTableSize];
++  UInt32 alignPriceCount;
++
++  UInt32 distTableSize;
++
++  unsigned lc, lp, pb;
++  unsigned lpMask, pbMask;
++
++  CLzmaProb *litProbs;
++
++  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
++  CLzmaProb isRep[kNumStates];
++  CLzmaProb isRepG0[kNumStates];
++  CLzmaProb isRepG1[kNumStates];
++  CLzmaProb isRepG2[kNumStates];
++  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
++
++  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
++  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
++  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
++  
++  CLenPriceEnc lenEnc;
++  CLenPriceEnc repLenEnc;
++
++  unsigned lclp;
++
++  Bool fastMode;
++  
++  CRangeEnc rc;
++
++  Bool writeEndMark;
++  UInt64 nowPos64;
++  UInt32 matchPriceCount;
++  Bool finished;
++  Bool multiThread;
++
++  SRes result;
++  UInt32 dictSize;
++  UInt32 matchFinderCycles;
++
++  ISeqInStream *inStream;
++  CSeqInStreamBuf seqBufInStream;
++
++  CSaveState saveState;
++} CLzmaEnc;
++
++void LzmaEnc_SaveState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CSaveState *dest = &p->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
++}
++
++void LzmaEnc_RestoreState(CLzmaEncHandle pp)
++{
++  CLzmaEnc *dest = (CLzmaEnc *)pp;
++  const CSaveState *p = &dest->saveState;
++  int i;
++  dest->lenEnc = p->lenEnc;
++  dest->repLenEnc = p->repLenEnc;
++  dest->state = p->state;
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
++    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
++  }
++  for (i = 0; i < kNumLenToPosStates; i++)
++    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
++  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
++  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
++  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
++  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
++  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
++  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
++  memcpy(dest->reps, p->reps, sizeof(p->reps));
++  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
++}
++
++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  CLzmaEncProps props = *props2;
++  LzmaEncProps_Normalize(&props);
++
++  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
++      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
++    return SZ_ERROR_PARAM;
++  p->dictSize = props.dictSize;
++  p->matchFinderCycles = props.mc;
++  {
++    unsigned fb = props.fb;
++    if (fb < 5)
++      fb = 5;
++    if (fb > LZMA_MATCH_LEN_MAX)
++      fb = LZMA_MATCH_LEN_MAX;
++    p->numFastBytes = fb;
++  }
++  p->lc = props.lc;
++  p->lp = props.lp;
++  p->pb = props.pb;
++  p->fastMode = (props.algo == 0);
++  p->matchFinderBase.btMode = props.btMode;
++  {
++    UInt32 numHashBytes = 4;
++    if (props.btMode)
++    {
++      if (props.numHashBytes < 2)
++        numHashBytes = 2;
++      else if (props.numHashBytes < 4)
++        numHashBytes = props.numHashBytes;
++    }
++    p->matchFinderBase.numHashBytes = numHashBytes;
++  }
++
++  p->matchFinderBase.cutValue = props.mc;
++
++  p->writeEndMark = props.writeEndMark;
++
++  #ifdef COMPRESS_MF_MT
++  /*
++  if (newMultiThread != _multiThread)
++  {
++    ReleaseMatchFinder();
++    _multiThread = newMultiThread;
++  }
++  */
++  p->multiThread = (props.numThreads > 1);
++  #endif
++
++  return SZ_OK;
++}
++
++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
++static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
++static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
++
++/*
++  void UpdateChar() { Index = kLiteralNextStates[Index]; }
++  void UpdateMatch() { Index = kMatchNextStates[Index]; }
++  void UpdateRep() { Index = kRepNextStates[Index]; }
++  void UpdateShortRep() { Index = kShortRepNextStates[Index]; }
++*/
++
++#define IsCharState(s) ((s) < 7)
++
++
++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
++
++#define kInfinityPrice (1 << 30)
++
++static void RangeEnc_Construct(CRangeEnc *p)
++{
++  p->outStream = 0;
++  p->bufBase = 0;
++}
++
++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
++
++#define RC_BUF_SIZE (1 << 16)
++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
++{
++  if (p->bufBase == 0)
++  {
++    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
++    if (p->bufBase == 0)
++      return 0;
++    p->bufLim = p->bufBase + RC_BUF_SIZE;
++  }
++  return 1;
++}
++
++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->bufBase);
++  p->bufBase = 0;
++}
++
++static void RangeEnc_Init(CRangeEnc *p)
++{
++  /* Stream.Init(); */
++  p->low = 0;
++  p->range = 0xFFFFFFFF;
++  p->cacheSize = 1;
++  p->cache = 0;
++
++  p->buf = p->bufBase;
++
++  p->processed = 0;
++  p->res = SZ_OK;
++}
++
++static void RangeEnc_FlushStream(CRangeEnc *p)
++{
++  size_t num;
++  if (p->res != SZ_OK)
++    return;
++  num = p->buf - p->bufBase;
++  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
++    p->res = SZ_ERROR_WRITE;
++  p->processed += num;
++  p->buf = p->bufBase;
++}
++
++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
++{
++  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0) 
++  {
++    Byte temp = p->cache;
++    do
++    {
++      Byte *buf = p->buf;
++      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
++      p->buf = buf;
++      if (buf == p->bufLim)
++        RangeEnc_FlushStream(p);
++      temp = 0xFF;
++    }
++    while (--p->cacheSize != 0);
++    p->cache = (Byte)((UInt32)p->low >> 24);                      
++  } 
++  p->cacheSize++;                               
++  p->low = (UInt32)p->low << 8;                           
++}
++
++static void RangeEnc_FlushData(CRangeEnc *p)
++{
++  int i;
++  for (i = 0; i < 5; i++)
++    RangeEnc_ShiftLow(p);
++}
++
++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
++{
++  do
++  {
++    p->range >>= 1;
++    p->low += p->range & (0 - ((value >> --numBits) & 1));
++    if (p->range < kTopValue)
++    {
++      p->range <<= 8;
++      RangeEnc_ShiftLow(p);
++    }
++  }
++  while (numBits != 0);
++}
++
++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
++{
++  UInt32 ttt = *prob;
++  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
++  if (symbol == 0)
++  {
++    p->range = newBound;
++    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
++  }
++  else
++  {
++    p->low += newBound;
++    p->range -= newBound;
++    ttt -= ttt >> kNumMoveBits;
++  }
++  *prob = (CLzmaProb)ttt;
++  if (p->range < kTopValue)
++  {
++    p->range <<= 8;
++    RangeEnc_ShiftLow(p);
++  }
++}
++
++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
++{
++  symbol |= 0x100;
++  do 
++  {
++    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++}
++
++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
++{
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do 
++  {
++    matchByte <<= 1;
++    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++}
++
++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
++{
++  UInt32 i;
++  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
++  {
++    const int kCyclesBits = kNumBitPriceShiftBits;
++    UInt32 w = i;
++    UInt32 bitCount = 0;
++    int j;
++    for (j = 0; j < kCyclesBits; j++)
++    {
++      w = w * w;
++      bitCount <<= 1;
++      while (w >= ((UInt32)1 << 16))
++      {
++        w >>= 1;
++        bitCount++;
++      }
++    }
++    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
++  }
++}
++
++
++#define GET_PRICE(prob, symbol) \
++  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICEa(prob, symbol) \
++  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
++
++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
++
++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= 0x100;
++  do
++  {
++    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
++    symbol <<= 1;
++  }
++  while (symbol < 0x10000);
++  return price;
++};
++
++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 offs = 0x100;
++  symbol |= 0x100;
++  do 
++  {
++    matchByte <<= 1;
++    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
++    symbol <<= 1;
++    offs &= ~(matchByte ^ symbol);
++  }
++  while (symbol < 0x10000);
++  return price;
++};
++
++
++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0 ;)
++  {
++    UInt32 bit;
++    i--;
++    bit = (symbol >> i) & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++  }
++};
++
++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
++{
++  UInt32 m = 1;
++  int i;
++  for (i = 0; i < numBitLevels; i++)
++  {
++    UInt32 bit = symbol & 1;
++    RangeEnc_EncodeBit(rc, probs + m, bit);
++    m = (m << 1) | bit;
++    symbol >>= 1;
++  }
++}
++
++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  symbol |= (1 << numBitLevels);
++  while (symbol != 1)
++  {
++    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
++    symbol >>= 1;
++  }
++  return price;
++}
++
++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
++{
++  UInt32 price = 0;
++  UInt32 m = 1;
++  int i;
++  for (i = numBitLevels; i != 0; i--)
++  {
++    UInt32 bit = symbol & 1;
++    symbol >>= 1;
++    price += GET_PRICEa(probs[m], bit);
++    m = (m << 1) | bit;
++  }
++  return price;
++}
++
++
++static void LenEnc_Init(CLenEnc *p)
++{
++  unsigned i;
++  p->choice = p->choice2 = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
++    p->low[i] = kProbInitValue;
++  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
++    p->mid[i] = kProbInitValue;
++  for (i = 0; i < kLenNumHighSymbols; i++)
++    p->high[i] = kProbInitValue;
++}
++
++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
++{
++  if (symbol < kLenNumLowSymbols)
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 0);
++    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
++  }
++  else
++  {
++    RangeEnc_EncodeBit(rc, &p->choice, 1);
++    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 0);
++      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
++    }
++    else
++    {
++      RangeEnc_EncodeBit(rc, &p->choice2, 1);
++      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
++    }
++  }
++}
++
++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
++{
++  UInt32 a0 = GET_PRICE_0a(p->choice);
++  UInt32 a1 = GET_PRICE_1a(p->choice);
++  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
++  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
++  UInt32 i = 0;
++  for (i = 0; i < kLenNumLowSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
++  }
++  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
++  {
++    if (i >= numSymbols)
++      return;
++    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
++  }
++  for (; i < numSymbols; i++)
++    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
++}
++
++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
++{
++  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
++  p->counters[posState] = p->tableSize;
++}
++
++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
++{
++  UInt32 posState;
++  for (posState = 0; posState < numPosStates; posState++)
++    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
++{
++  LenEnc_Encode(&p->p, rc, symbol, posState);
++  if (updatePrice)
++    if (--p->counters[posState] == 0)
++      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
++}
++
++
++
++
++static void MovePos(CLzmaEnc *p, UInt32 num)
++{
++  #ifdef SHOW_STAT
++  ttt += num;
++  printf("\n MovePos %d", num);
++  #endif
++  if (num != 0)
++  {
++    p->additionalOffset += num;
++    p->matchFinder.Skip(p->matchFinderObj, num);
++  }
++}
++
++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
++{
++  UInt32 lenRes = 0, numDistancePairs;
++  numDistancePairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matchDistances);
++  #ifdef SHOW_STAT
++  printf("\n i = %d numPairs = %d    ", ttt, numDistancePairs / 2);
++  if (ttt >= 61994)
++    ttt = ttt;
++
++  ttt++;
++  {
++    UInt32 i;
++  for (i = 0; i < numDistancePairs; i += 2)
++    printf("%2d %6d   | ", p->matchDistances[i], p->matchDistances[i + 1]);
++  }
++  #endif
++  if (numDistancePairs > 0)
++  {
++    lenRes = p->matchDistances[numDistancePairs - 2];
++    if (lenRes == p->numFastBytes)
++    {
++      UInt32 numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) + 1;
++      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++      UInt32 distance = p->matchDistances[numDistancePairs - 1] + 1;
++      if (numAvail > LZMA_MATCH_LEN_MAX)
++        numAvail = LZMA_MATCH_LEN_MAX;
++
++      {
++        const Byte *pby2 = pby - distance;
++        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
++      }
++    }
++  }
++  p->additionalOffset++;
++  *numDistancePairsRes = numDistancePairs;
++  return lenRes;
++}
++
++
++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
++#define IsShortRep(p) ((p)->backPrev == 0)
++
++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
++{
++  return 
++    GET_PRICE_0(p->isRepG0[state]) +
++    GET_PRICE_0(p->isRep0Long[state][posState]);
++}
++
++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
++{
++  UInt32 price;
++  if (repIndex == 0)
++  {
++    price = GET_PRICE_0(p->isRepG0[state]);
++    price += GET_PRICE_1(p->isRep0Long[state][posState]);
++  }
++  else
++  {
++    price = GET_PRICE_1(p->isRepG0[state]);
++    if (repIndex == 1)
++      price += GET_PRICE_0(p->isRepG1[state]);
++    else
++    {
++      price += GET_PRICE_1(p->isRepG1[state]);
++      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
++    }
++  }
++  return price;
++}
++
++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
++{
++  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
++    GetPureRepPrice(p, repIndex, state, posState);
++}
++
++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
++{
++  UInt32 posMem = p->opt[cur].posPrev;
++  UInt32 backMem = p->opt[cur].backPrev;
++  p->optimumEndIndex = cur;
++  do
++  {
++    if (p->opt[cur].prev1IsChar)
++    {
++      MakeAsChar(&p->opt[posMem])
++      p->opt[posMem].posPrev = posMem - 1;
++      if (p->opt[cur].prev2)
++      {
++        p->opt[posMem - 1].prev1IsChar = False;
++        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
++        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
++      }
++    }
++    {
++      UInt32 posPrev = posMem;
++      UInt32 backCur = backMem;
++      
++      backMem = p->opt[posPrev].backPrev;
++      posMem = p->opt[posPrev].posPrev;
++      
++      p->opt[posPrev].backPrev = backCur;
++      p->opt[posPrev].posPrev = cur;
++      cur = posPrev;
++    }
++  }
++  while (cur != 0);
++  *backRes = p->opt[0].backPrev;
++  p->optimumCurrentIndex  = p->opt[0].posPrev;
++  return p->optimumCurrentIndex; 
++}
++
++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
++
++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
++{
++  UInt32 numAvailableBytes, lenMain, numDistancePairs;
++  const Byte *data;
++  UInt32 reps[LZMA_NUM_REPS];
++  UInt32 repLens[LZMA_NUM_REPS];
++  UInt32 repMaxIndex, i;
++  UInt32 *matchDistances;
++  Byte currentByte, matchByte; 
++  UInt32 posState;
++  UInt32 matchPrice, repMatchPrice;
++  UInt32 lenEnd;
++  UInt32 len;
++  UInt32 normalMatchPrice;
++  UInt32 cur;
++  if (p->optimumEndIndex != p->optimumCurrentIndex)
++  {
++    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
++    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
++    *backRes = opt->backPrev;
++    p->optimumCurrentIndex = opt->posPrev;
++    return lenRes;
++  }
++  p->optimumCurrentIndex = p->optimumEndIndex = 0;
++  
++  numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++
++  if (!p->longestMatchWasFound)
++  {
++    lenMain = ReadMatchDistances(p, &numDistancePairs);
++  }
++  else
++  {
++    lenMain = p->longestMatchLength;
++    numDistancePairs = p->numDistancePairs;
++    p->longestMatchWasFound = False;
++  }
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  if (numAvailableBytes < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++  if (numAvailableBytes > LZMA_MATCH_LEN_MAX)
++    numAvailableBytes = LZMA_MATCH_LEN_MAX;
++
++  repMaxIndex = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 lenTest;
++    const Byte *data2;
++    reps[i] = p->reps[i];
++    data2 = data - (reps[i] + 1);
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++);
++    repLens[i] = lenTest;
++    if (lenTest > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  if (repLens[repMaxIndex] >= p->numFastBytes)
++  {
++    UInt32 lenRes;
++    *backRes = repMaxIndex;
++    lenRes = repLens[repMaxIndex];
++    MovePos(p, lenRes - 1);
++    return lenRes;
++  }
++
++  matchDistances = p->matchDistances;
++  if (lenMain >= p->numFastBytes)
++  {
++    *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; 
++    MovePos(p, lenMain - 1);
++    return lenMain;
++  }
++  currentByte = *data;
++  matchByte = *(data - (reps[0] + 1));
++
++  if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2)
++  {
++    *backRes = (UInt32)-1;
++    return 1;
++  }
++
++  p->opt[0].state = (CState)p->state;
++
++  posState = (position & p->pbMask);
++
++  {
++    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) + 
++        (!IsCharState(p->state) ? 
++          LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, currentByte, p->ProbPrices));
++  }
++
++  MakeAsChar(&p->opt[1]);
++
++  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
++  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
++
++  if (matchByte == currentByte)
++  {
++    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
++    if (shortRepPrice < p->opt[1].price)
++    {
++      p->opt[1].price = shortRepPrice;
++      MakeAsShortRep(&p->opt[1]);
++    }
++  }
++  lenEnd = ((lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex]);
++
++  if (lenEnd < 2)
++  {
++    *backRes = p->opt[1].backPrev;
++    return 1;
++  }
++
++  p->opt[1].posPrev = 0;
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++    p->opt[0].backs[i] = reps[i];
++
++  len = lenEnd;
++  do
++    p->opt[len--].price = kInfinityPrice;
++  while (len >= 2);
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    UInt32 repLen = repLens[i];
++    UInt32 price;
++    if (repLen < 2)
++      continue;
++    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
++    do
++    {
++      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
++      COptimal *opt = &p->opt[repLen];
++      if (curAndLenPrice < opt->price) 
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = i;
++        opt->prev1IsChar = False;
++      }
++    }
++    while (--repLen >= 2);
++  }
++
++  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
++
++  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
++  if (len <= lenMain)
++  {
++    UInt32 offs = 0;
++    while (len > matchDistances[offs])
++      offs += 2;
++    for (; ; len++)
++    {
++      COptimal *opt;
++      UInt32 distance = matchDistances[offs + 1];
++
++      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
++      UInt32 lenToPosState = GetLenToPosState(len);
++      if (distance < kNumFullDistances)
++        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
++      else
++      {
++        UInt32 slot;
++        GetPosSlot2(distance, slot);
++        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
++      }
++      opt = &p->opt[len];
++      if (curAndLenPrice < opt->price) 
++      {
++        opt->price = curAndLenPrice;
++        opt->posPrev = 0;
++        opt->backPrev = distance + LZMA_NUM_REPS;
++        opt->prev1IsChar = False;
++      }
++      if (len == matchDistances[offs])
++      {
++        offs += 2;
++        if (offs == numDistancePairs)
++          break;
++      }
++    }
++  }
++
++  cur = 0;
++
++    #ifdef SHOW_STAT2
++    if (position >= 0)
++    {
++      unsigned i;
++      printf("\n pos = %4X", position);
++      for (i = cur; i <= lenEnd; i++)
++      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
++    }
++    #endif
++
++  for (;;)
++  {
++    UInt32 numAvailableBytesFull, newLen, numDistancePairs;
++    COptimal *curOpt;
++    UInt32 posPrev;
++    UInt32 state;
++    UInt32 curPrice;
++    Bool nextIsChar;
++    const Byte *data;
++    Byte currentByte, matchByte;
++    UInt32 posState;
++    UInt32 curAnd1Price;
++    COptimal *nextOpt;
++    UInt32 matchPrice, repMatchPrice;  
++    UInt32 numAvailableBytes;
++    UInt32 startLen;
++
++    cur++;
++    if (cur == lenEnd)
++      return Backward(p, backRes, cur);
++
++    numAvailableBytesFull = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++    newLen = ReadMatchDistances(p, &numDistancePairs);
++    if (newLen >= p->numFastBytes)
++    {
++      p->numDistancePairs = numDistancePairs;
++      p->longestMatchLength = newLen;
++      p->longestMatchWasFound = True;
++      return Backward(p, backRes, cur);
++    }
++    position++;
++    curOpt = &p->opt[cur];
++    posPrev = curOpt->posPrev;
++    if (curOpt->prev1IsChar)
++    {
++      posPrev--;
++      if (curOpt->prev2)
++      {
++        state = p->opt[curOpt->posPrev2].state;
++        if (curOpt->backPrev2 < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      else
++        state = p->opt[posPrev].state;
++      state = kLiteralNextStates[state];
++    }
++    else
++      state = p->opt[posPrev].state;
++    if (posPrev == cur - 1)
++    {
++      if (IsShortRep(curOpt))
++        state = kShortRepNextStates[state];
++      else
++        state = kLiteralNextStates[state];
++    }
++    else
++    {
++      UInt32 pos;
++      const COptimal *prevOpt;
++      if (curOpt->prev1IsChar && curOpt->prev2)
++      {
++        posPrev = curOpt->posPrev2;
++        pos = curOpt->backPrev2;
++        state = kRepNextStates[state];
++      }
++      else
++      {
++        pos = curOpt->backPrev;
++        if (pos < LZMA_NUM_REPS)
++          state = kRepNextStates[state];
++        else
++          state = kMatchNextStates[state];
++      }
++      prevOpt = &p->opt[posPrev];
++      if (pos < LZMA_NUM_REPS)
++      {
++        UInt32 i;
++        reps[0] = prevOpt->backs[pos];
++        for (i = 1; i <= pos; i++)
++          reps[i] = prevOpt->backs[i - 1];
++        for (; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i];
++      }
++      else
++      {
++        UInt32 i;
++        reps[0] = (pos - LZMA_NUM_REPS);
++        for (i = 1; i < LZMA_NUM_REPS; i++)
++          reps[i] = prevOpt->backs[i - 1];
++      }
++    }
++    curOpt->state = (CState)state;
++
++    curOpt->backs[0] = reps[0];
++    curOpt->backs[1] = reps[1];
++    curOpt->backs[2] = reps[2];
++    curOpt->backs[3] = reps[3];
++
++    curPrice = curOpt->price; 
++    nextIsChar = False;
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    currentByte = *data;
++    matchByte = *(data - (reps[0] + 1));
++
++    posState = (position & p->pbMask);
++
++    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
++    {
++      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
++      curAnd1Price += 
++        (!IsCharState(state) ? 
++          LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) :
++          LitEnc_GetPrice(probs, currentByte, p->ProbPrices));
++    }   
++
++    nextOpt = &p->opt[cur + 1];
++
++    if (curAnd1Price < nextOpt->price) 
++    {
++      nextOpt->price = curAnd1Price;
++      nextOpt->posPrev = cur;
++      MakeAsChar(nextOpt);
++      nextIsChar = True;
++    }
++
++    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
++    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
++    
++    if (matchByte == currentByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
++    {
++      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
++      if (shortRepPrice <= nextOpt->price)
++      {
++        nextOpt->price = shortRepPrice;
++        nextOpt->posPrev = cur;
++        MakeAsShortRep(nextOpt);
++        nextIsChar = True;
++      }
++    }
++
++    {
++      UInt32 temp = kNumOpts - 1 - cur;
++      if (temp <  numAvailableBytesFull)
++        numAvailableBytesFull = temp;
++    }
++    numAvailableBytes = numAvailableBytesFull;
++
++    if (numAvailableBytes < 2)
++      continue;
++    if (numAvailableBytes > p->numFastBytes)
++      numAvailableBytes = p->numFastBytes;
++    if (!nextIsChar && matchByte != currentByte) /* speed optimization */
++    {
++      /* try Literal + rep0 */
++      UInt32 temp;
++      UInt32 lenTest2;
++      const Byte *data2 = data - (reps[0] + 1);
++      UInt32 limit = p->numFastBytes + 1;
++      if (limit > numAvailableBytesFull)
++        limit = numAvailableBytesFull;
++
++      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
++      lenTest2 = temp - 1;
++      if (lenTest2 >= 2)
++      {
++        UInt32 state2 = kLiteralNextStates[state];
++        UInt32 posStateNext = (position + 1) & p->pbMask;
++        UInt32 nextRepMatchPrice = curAnd1Price + 
++            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++            GET_PRICE_1(p->isRep[state2]);
++        /* for (; lenTest2 >= 2; lenTest2--) */
++        {
++          UInt32 curAndLenPrice;
++          COptimal *opt;
++          UInt32 offset = cur + 1 + lenTest2;
++          while (lenEnd < offset)
++            p->opt[++lenEnd].price = kInfinityPrice;
++          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++          opt = &p->opt[offset];
++          if (curAndLenPrice < opt->price) 
++          {
++            opt->price = curAndLenPrice;
++            opt->posPrev = cur + 1;
++            opt->backPrev = 0;
++            opt->prev1IsChar = True;
++            opt->prev2 = False;
++          }
++        }
++      }
++    }
++    
++    startLen = 2; /* speed optimization */
++    {
++    UInt32 repIndex;
++    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
++    {
++      UInt32 lenTest;
++      UInt32 lenTestTemp;
++      UInt32 price;
++      const Byte *data2 = data - (reps[repIndex] + 1);
++      if (data[0] != data2[0] || data[1] != data2[1])
++        continue;
++      for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++);
++      while (lenEnd < cur + lenTest)
++        p->opt[++lenEnd].price = kInfinityPrice;
++      lenTestTemp = lenTest;
++      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
++      do
++      {
++        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
++        COptimal *opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price) 
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = repIndex;
++          opt->prev1IsChar = False;
++        }
++      }
++      while (--lenTest >= 2);
++      lenTest = lenTestTemp;
++      
++      if (repIndex == 0)
++        startLen = lenTest + 1;
++        
++      /* if (_maxMode) */
++        {
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailableBytesFull)
++            limit = numAvailableBytesFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kRepNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = 
++                price + p->repLenEnc.prices[posState][lenTest - 2] + 
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (position + lenTest + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice + 
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price) 
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = repIndex;
++              }
++            }
++          }
++        }
++    }
++    }
++    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
++    if (newLen > numAvailableBytes)
++    {
++      newLen = numAvailableBytes;
++      for (numDistancePairs = 0; newLen > matchDistances[numDistancePairs]; numDistancePairs += 2);
++      matchDistances[numDistancePairs] = newLen;
++      numDistancePairs += 2;
++    }
++    if (newLen >= startLen)
++    {
++      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
++      UInt32 offs, curBack, posSlot;
++      UInt32 lenTest;
++      while (lenEnd < cur + newLen)
++        p->opt[++lenEnd].price = kInfinityPrice;
++
++      offs = 0;
++      while (startLen > matchDistances[offs])
++        offs += 2;
++      curBack = matchDistances[offs + 1];
++      GetPosSlot2(curBack, posSlot);
++      for (lenTest = /*2*/ startLen; ; lenTest++)
++      {
++        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
++        UInt32 lenToPosState = GetLenToPosState(lenTest);
++        COptimal *opt;
++        if (curBack < kNumFullDistances)
++          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
++        else
++          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
++        
++        opt = &p->opt[cur + lenTest];
++        if (curAndLenPrice < opt->price) 
++        {
++          opt->price = curAndLenPrice;
++          opt->posPrev = cur;
++          opt->backPrev = curBack + LZMA_NUM_REPS;
++          opt->prev1IsChar = False;
++        }
++
++        if (/*_maxMode && */lenTest == matchDistances[offs])
++        {
++          /* Try Match + Literal + Rep0 */
++          const Byte *data2 = data - (curBack + 1);
++          UInt32 lenTest2 = lenTest + 1;
++          UInt32 limit = lenTest2 + p->numFastBytes;
++          UInt32 nextRepMatchPrice;
++          if (limit > numAvailableBytesFull)
++            limit = numAvailableBytesFull;
++          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
++          lenTest2 -= lenTest + 1;
++          if (lenTest2 >= 2)
++          {
++            UInt32 state2 = kMatchNextStates[state];
++            UInt32 posStateNext = (position + lenTest) & p->pbMask;
++            UInt32 curAndLenCharPrice = curAndLenPrice + 
++                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
++                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
++                    data[lenTest], data2[lenTest], p->ProbPrices);
++            state2 = kLiteralNextStates[state2];
++            posStateNext = (posStateNext + 1) & p->pbMask;
++            nextRepMatchPrice = curAndLenCharPrice + 
++                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
++                GET_PRICE_1(p->isRep[state2]);
++            
++            /* for (; lenTest2 >= 2; lenTest2--) */
++            {
++              UInt32 offset = cur + lenTest + 1 + lenTest2;
++              UInt32 curAndLenPrice;
++              COptimal *opt;
++              while (lenEnd < offset)
++                p->opt[++lenEnd].price = kInfinityPrice;
++              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
++              opt = &p->opt[offset];
++              if (curAndLenPrice < opt->price) 
++              {
++                opt->price = curAndLenPrice;
++                opt->posPrev = cur + lenTest + 1;
++                opt->backPrev = 0;
++                opt->prev1IsChar = True;
++                opt->prev2 = True;
++                opt->posPrev2 = cur;
++                opt->backPrev2 = curBack + LZMA_NUM_REPS;
++              }
++            }
++          }
++          offs += 2;
++          if (offs == numDistancePairs)
++            break;
++          curBack = matchDistances[offs + 1];
++          if (curBack >= kNumFullDistances)
++            GetPosSlot2(curBack, posSlot);
++        }
++      }
++    }
++  }
++}
++
++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
++
++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
++{
++  UInt32 numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++  UInt32 lenMain, numDistancePairs;
++  const Byte *data;
++  UInt32 repLens[LZMA_NUM_REPS];
++  UInt32 repMaxIndex, i;
++  UInt32 *matchDistances;
++  UInt32 backMain;
++
++  if (!p->longestMatchWasFound)
++  {
++    lenMain = ReadMatchDistances(p, &numDistancePairs);
++  }
++  else
++  {
++    lenMain = p->longestMatchLength;
++    numDistancePairs = p->numDistancePairs;
++    p->longestMatchWasFound = False;
++  }
++
++  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++  if (numAvailableBytes > LZMA_MATCH_LEN_MAX)
++    numAvailableBytes = LZMA_MATCH_LEN_MAX;
++  if (numAvailableBytes < 2)
++  {
++    *backRes = (UInt32)(-1);
++    return 1;
++  }
++
++  repMaxIndex = 0;
++
++  for (i = 0; i < LZMA_NUM_REPS; i++)
++  {
++    const Byte *data2 = data - (p->reps[i] + 1);
++    UInt32 len;
++    if (data[0] != data2[0] || data[1] != data2[1])
++    {
++      repLens[i] = 0;
++      continue;
++    }
++    for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++);
++    if (len >= p->numFastBytes)
++    {
++      *backRes = i;
++      MovePos(p, len - 1);
++      return len;
++    }
++    repLens[i] = len;
++    if (len > repLens[repMaxIndex])
++      repMaxIndex = i;
++  }
++  matchDistances = p->matchDistances;
++  if (lenMain >= p->numFastBytes)
++  {
++    *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; 
++    MovePos(p, lenMain - 1);
++    return lenMain;
++  }
++
++  backMain = 0; /* for GCC */
++  if (lenMain >= 2)
++  {
++    backMain = matchDistances[numDistancePairs - 1];
++    while (numDistancePairs > 2 && lenMain == matchDistances[numDistancePairs - 4] + 1)
++    {
++      if (!ChangePair(matchDistances[numDistancePairs - 3], backMain))
++        break;
++      numDistancePairs -= 2;
++      lenMain = matchDistances[numDistancePairs - 2];
++      backMain = matchDistances[numDistancePairs - 1];
++    }
++    if (lenMain == 2 && backMain >= 0x80)
++      lenMain = 1;
++  }
++
++  if (repLens[repMaxIndex] >= 2)
++  {
++    if (repLens[repMaxIndex] + 1 >= lenMain || 
++        (repLens[repMaxIndex] + 2 >= lenMain && (backMain > (1 << 9))) ||
++        (repLens[repMaxIndex] + 3 >= lenMain && (backMain > (1 << 15))))
++    {
++      UInt32 lenRes;
++      *backRes = repMaxIndex;
++      lenRes = repLens[repMaxIndex];
++      MovePos(p, lenRes - 1);
++      return lenRes;
++    }
++  }
++  
++  if (lenMain >= 2 && numAvailableBytes > 2)
++  {
++    UInt32 i;
++    numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++    p->longestMatchLength = ReadMatchDistances(p, &p->numDistancePairs);
++    if (p->longestMatchLength >= 2)
++    {
++      UInt32 newDistance = matchDistances[p->numDistancePairs - 1];
++      if ((p->longestMatchLength >= lenMain && newDistance < backMain) || 
++          (p->longestMatchLength == lenMain + 1 && !ChangePair(backMain, newDistance)) ||
++          (p->longestMatchLength > lenMain + 1) ||
++          (p->longestMatchLength + 1 >= lenMain && lenMain >= 3 && ChangePair(newDistance, backMain)))
++      {
++        p->longestMatchWasFound = True;
++        *backRes = (UInt32)(-1);
++        return 1;
++      }
++    }
++    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
++    for (i = 0; i < LZMA_NUM_REPS; i++)
++    {
++      UInt32 len;
++      const Byte *data2 = data - (p->reps[i] + 1);
++      if (data[1] != data2[1] || data[2] != data2[2])
++      {
++        repLens[i] = 0;
++        continue;
++      }
++      for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++);
++      if (len + 1 >= lenMain)
++      {
++        p->longestMatchWasFound = True;
++        *backRes = (UInt32)(-1);
++        return 1;
++      }
++    }
++    *backRes = backMain + LZMA_NUM_REPS; 
++    MovePos(p, lenMain - 2);
++    return lenMain;
++  }
++  *backRes = (UInt32)(-1);
++  return 1;
++}
++
++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
++{
++  UInt32 len;
++  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++  p->state = kMatchNextStates[p->state];
++  len = LZMA_MATCH_LEN_MIN;
++  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
++  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
++  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
++}
++
++static SRes CheckErrors(CLzmaEnc *p)
++{
++  if (p->result != SZ_OK)
++    return p->result;
++  if (p->rc.res != SZ_OK)
++    p->result = SZ_ERROR_WRITE;
++  if (p->matchFinderBase.result != SZ_OK)
++    p->result = SZ_ERROR_READ;
++  if (p->result != SZ_OK)
++    p->finished = True;
++  return p->result;
++}
++
++static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
++{
++  /* ReleaseMFStream(); */
++  p->finished = True;
++  if (p->writeEndMark)
++    WriteEndMarker(p, nowPos & p->pbMask);
++  RangeEnc_FlushData(&p->rc);
++  RangeEnc_FlushStream(&p->rc);
++  return CheckErrors(p);
++}
++
++static void FillAlignPrices(CLzmaEnc *p)
++{
++  UInt32 i;
++  for (i = 0; i < kAlignTableSize; i++)
++    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
++  p->alignPriceCount = 0;
++}
++
++static void FillDistancesPrices(CLzmaEnc *p)
++{
++  UInt32 tempPrices[kNumFullDistances];
++  UInt32 i, lenToPosState;
++  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
++  { 
++    UInt32 posSlot = GetPosSlot1(i);
++    UInt32 footerBits = ((posSlot >> 1) - 1);
++    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
++  }
++
++  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
++  {
++    UInt32 posSlot;
++    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
++    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
++    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
++    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
++      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
++
++    {
++      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
++      UInt32 i;
++      for (i = 0; i < kStartPosModelIndex; i++)
++        distancesPrices[i] = posSlotPrices[i];
++      for (; i < kNumFullDistances; i++)
++        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
++    }
++  }
++  p->matchPriceCount = 0;
++}
++
++void LzmaEnc_Construct(CLzmaEnc *p)
++{
++  RangeEnc_Construct(&p->rc);
++  MatchFinder_Construct(&p->matchFinderBase);
++  #ifdef COMPRESS_MF_MT
++  MatchFinderMt_Construct(&p->matchFinderMt);
++  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
++  #endif
++
++  {
++    CLzmaEncProps props;
++    LzmaEncProps_Init(&props);
++    LzmaEnc_SetProps(p, &props);
++  }
++
++  #ifndef LZMA_LOG_BSR
++  LzmaEnc_FastPosInit(p->g_FastPos);
++  #endif
++
++  LzmaEnc_InitPriceTables(p->ProbPrices);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
++{
++  void *p;
++  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
++  if (p != 0)
++    LzmaEnc_Construct((CLzmaEnc *)p);
++  return p;
++}
++
++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
++{
++  alloc->Free(alloc, p->litProbs);
++  alloc->Free(alloc, p->saveState.litProbs);
++  p->litProbs = 0;
++  p->saveState.litProbs = 0;
++}
++
++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  #ifdef COMPRESS_MF_MT
++  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
++  #endif
++  MatchFinder_Free(&p->matchFinderBase, allocBig);
++  LzmaEnc_FreeLits(p, alloc);
++  RangeEnc_Free(&p->rc, alloc);
++}
++
++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
++  alloc->Free(alloc, p);
++}
++
++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
++{
++  UInt32 nowPos32, startPos32;
++  if (p->inStream != 0)
++  {
++    p->matchFinderBase.stream = p->inStream;
++    p->matchFinder.Init(p->matchFinderObj);
++    p->inStream = 0;
++  }
++
++  if (p->finished)
++    return p->result;
++  RINOK(CheckErrors(p));
++
++  nowPos32 = (UInt32)p->nowPos64;
++  startPos32 = nowPos32;
++
++  if (p->nowPos64 == 0)
++  {
++    UInt32 numDistancePairs;
++    Byte curByte;
++    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++      return Flush(p, nowPos32);
++    ReadMatchDistances(p, &numDistancePairs);
++    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
++    p->state = kLiteralNextStates[p->state];
++    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
++    LitEnc_Encode(&p->rc, p->litProbs, curByte);
++    p->additionalOffset--;
++    nowPos32++;
++  }
++
++  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
++  for (;;)
++  {
++    UInt32 pos, len, posState;
++
++    if (p->fastMode)
++      len = GetOptimumFast(p, &pos);
++    else
++      len = GetOptimum(p, nowPos32, &pos);
++
++    #ifdef SHOW_STAT2
++    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
++    #endif
++
++    posState = nowPos32 & p->pbMask;
++    if (len == 1 && pos == 0xFFFFFFFF)
++    {
++      Byte curByte;
++      CLzmaProb *probs;
++      const Byte *data;
++
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
++      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++      curByte = *data;
++      probs = LIT_PROBS(nowPos32, *(data - 1));
++      if (IsCharState(p->state))
++        LitEnc_Encode(&p->rc, probs, curByte);
++      else
++        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
++      p->state = kLiteralNextStates[p->state];
++    }
++    else
++    {
++      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
++      if (pos < LZMA_NUM_REPS)
++      {
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
++        if (pos == 0)
++        {
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
++          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
++        }
++        else
++        {
++          UInt32 distance = p->reps[pos];
++          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
++          if (pos == 1)
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
++          else
++          {
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
++            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
++            if (pos == 3)
++              p->reps[3] = p->reps[2];
++            p->reps[2] = p->reps[1];
++          }
++          p->reps[1] = p->reps[0];
++          p->reps[0] = distance;
++        }
++        if (len == 1)
++          p->state = kShortRepNextStates[p->state];
++        else
++        {
++          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++          p->state = kRepNextStates[p->state];
++        }
++      }
++      else
++      {
++        UInt32 posSlot;
++        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
++        p->state = kMatchNextStates[p->state];
++        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
++        pos -= LZMA_NUM_REPS;
++        GetPosSlot(pos, posSlot);
++        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
++        
++        if (posSlot >= kStartPosModelIndex)
++        {
++          UInt32 footerBits = ((posSlot >> 1) - 1);
++          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
++          UInt32 posReduced = pos - base;
++
++          if (posSlot < kEndPosModelIndex)
++            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
++          else
++          {
++            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
++            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
++            p->alignPriceCount++;
++          }
++        }
++        p->reps[3] = p->reps[2];
++        p->reps[2] = p->reps[1];
++        p->reps[1] = p->reps[0];
++        p->reps[0] = pos;
++        p->matchPriceCount++;
++      }
++    }
++    p->additionalOffset -= len;
++    nowPos32 += len;
++    if (p->additionalOffset == 0)
++    {
++      UInt32 processed;
++      if (!p->fastMode)
++      {
++        if (p->matchPriceCount >= (1 << 7))
++          FillDistancesPrices(p);
++        if (p->alignPriceCount >= kAlignTableSize)
++          FillAlignPrices(p);
++      }
++      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
++        break;
++      processed = nowPos32 - startPos32;
++      if (useLimits)
++      {
++        if (processed + kNumOpts + 300 >= maxUnpackSize ||
++            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
++          break;
++      }
++      else if (processed >= (1 << 15))
++      {
++        p->nowPos64 += nowPos32 - startPos32;
++        return CheckErrors(p);
++      }
++    }
++  }
++  p->nowPos64 += nowPos32 - startPos32;
++  return Flush(p, nowPos32);
++}
++
++#define kBigHashDicLimit ((UInt32)1 << 24)
++
++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 beforeSize = kNumOpts;
++  Bool btMode;
++  if (!RangeEnc_Alloc(&p->rc, alloc))
++    return SZ_ERROR_MEM;
++  btMode = (p->matchFinderBase.btMode != 0);
++  #ifdef COMPRESS_MF_MT
++  p->mtMode = (p->multiThread && !p->fastMode && btMode);
++  #endif
++
++  {
++    unsigned lclp = p->lc + p->lp;
++    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
++    {
++      LzmaEnc_FreeLits(p, alloc);
++      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
++      if (p->litProbs == 0 || p->saveState.litProbs == 0)
++      {
++        LzmaEnc_FreeLits(p, alloc);
++        return SZ_ERROR_MEM;
++      }
++      p->lclp = lclp;
++    }
++  }
++
++  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
++
++  if (beforeSize + p->dictSize < keepWindowSize)
++    beforeSize = keepWindowSize - p->dictSize;
++
++  #ifdef COMPRESS_MF_MT
++  if (p->mtMode)
++  {
++    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
++    p->matchFinderObj = &p->matchFinderMt;
++    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
++  }
++  else
++  #endif
++  {
++    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
++      return SZ_ERROR_MEM;
++    p->matchFinderObj = &p->matchFinderBase;
++    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
++  }
++  return SZ_OK;
++}
++
++void LzmaEnc_Init(CLzmaEnc *p)
++{
++  UInt32 i;
++  p->state = 0;
++  for(i = 0 ; i < LZMA_NUM_REPS; i++)
++    p->reps[i] = 0;
++
++  RangeEnc_Init(&p->rc);
++
++
++  for (i = 0; i < kNumStates; i++)
++  {
++    UInt32 j;
++    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
++    {
++      p->isMatch[i][j] = kProbInitValue;
++      p->isRep0Long[i][j] = kProbInitValue;
++    }
++    p->isRep[i] = kProbInitValue;
++    p->isRepG0[i] = kProbInitValue;
++    p->isRepG1[i] = kProbInitValue;
++    p->isRepG2[i] = kProbInitValue;
++  }
++
++  {
++    UInt32 num = 0x300 << (p->lp + p->lc);
++    for (i = 0; i < num; i++)
++      p->litProbs[i] = kProbInitValue;
++  }
++
++  {
++    for (i = 0; i < kNumLenToPosStates; i++)
++    {
++      CLzmaProb *probs = p->posSlotEncoder[i];
++      UInt32 j;
++      for (j = 0; j < (1 << kNumPosSlotBits); j++)
++        probs[j] = kProbInitValue;
++    }
++  }
++  {
++    for(i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
++      p->posEncoders[i] = kProbInitValue;
++  }
++
++  LenEnc_Init(&p->lenEnc.p);
++  LenEnc_Init(&p->repLenEnc.p);
++
++  for (i = 0; i < (1 << kNumAlignBits); i++)
++    p->posAlignEncoder[i] = kProbInitValue;
++
++  p->longestMatchWasFound = False;
++  p->optimumEndIndex = 0;
++  p->optimumCurrentIndex = 0;
++  p->additionalOffset = 0;
++
++  p->pbMask = (1 << p->pb) - 1;
++  p->lpMask = (1 << p->lp) - 1;
++}
++
++void LzmaEnc_InitPrices(CLzmaEnc *p)
++{
++  if (!p->fastMode)
++  {
++    FillDistancesPrices(p);
++    FillAlignPrices(p);
++  }
++
++  p->lenEnc.tableSize = 
++  p->repLenEnc.tableSize = 
++      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
++  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
++  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
++}
++
++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  UInt32 i;
++  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
++    if (p->dictSize <= ((UInt32)1 << i))
++      break;
++  p->distTableSize = i * 2;
++
++  p->finished = False;
++  p->result = SZ_OK;
++  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
++  LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  p->nowPos64 = 0;
++  return SZ_OK;
++}
++
++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqInStream *inStream, ISeqOutStream *outStream,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->inStream = inStream;
++  p->rc.outStream = outStream;
++  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
++}
++
++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, 
++    ISeqInStream *inStream, UInt32 keepWindowSize,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  p->inStream = inStream;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
++{
++  p->seqBufInStream.funcTable.Read = MyRead;
++  p->seqBufInStream.data = src;
++  p->seqBufInStream.rem = srcLen;
++}
++
++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
++    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++  p->inStream = &p->seqBufInStream.funcTable;
++  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
++}
++
++void LzmaEnc_Finish(CLzmaEncHandle pp)
++{
++  #ifdef COMPRESS_MF_MT
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  if (p->mtMode)
++    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
++  #endif
++}
++
++typedef struct _CSeqOutStreamBuf
++{
++  ISeqOutStream funcTable;
++  Byte *data;
++  SizeT rem;
++  Bool overflow;
++} CSeqOutStreamBuf;
++
++static size_t MyWrite(void *pp, const void *data, size_t size)
++{
++  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
++  if (p->rem < size)
++  {
++    size = p->rem;
++    p->overflow = True;
++  }
++  memcpy(p->data, data, size);
++  p->rem -= size;
++  p->data += size;
++  return size;
++}
++
++
++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
++}
++
++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
++{
++  const CLzmaEnc *p = (CLzmaEnc *)pp;
++  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
++}
++
++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit, 
++    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  UInt64 nowPos64;
++  SRes res;
++  CSeqOutStreamBuf outStream;
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = False;
++  p->finished = False;
++  p->result = SZ_OK;
++
++  if (reInit)
++    LzmaEnc_Init(p);
++  LzmaEnc_InitPrices(p);
++  nowPos64 = p->nowPos64;
++  RangeEnc_Init(&p->rc);
++  p->rc.outStream = &outStream.funcTable;
++
++  res = LzmaEnc_CodeOneBlock(pp, True, desiredPackSize, *unpackSize);
++  
++  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++
++  return res;
++}
++
++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
++    ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  SRes res = SZ_OK;
++
++  #ifdef COMPRESS_MF_MT
++  Byte allocaDummy[0x300];
++  int i = 0;
++  for (i = 0; i < 16; i++)
++    allocaDummy[i] = (Byte)i;
++  #endif
++
++  RINOK(LzmaEnc_Prepare(pp, inStream, outStream, alloc, allocBig));
++
++  for (;;)
++  {
++    res = LzmaEnc_CodeOneBlock(pp, False, 0, 0);
++    if (res != SZ_OK || p->finished != 0)
++      break;
++    if (progress != 0)
++    {
++      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
++      if (res != SZ_OK)
++      {
++        res = SZ_ERROR_PROGRESS;
++        break;
++      }
++    }
++  }
++  LzmaEnc_Finish(pp);
++  return res;
++}
++
++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
++{
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++  int i;
++  UInt32 dictSize = p->dictSize;
++  if (*size < LZMA_PROPS_SIZE)
++    return SZ_ERROR_PARAM;
++  *size = LZMA_PROPS_SIZE;
++  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
++
++  for (i = 11; i <= 30; i++)
++  {
++    if (dictSize <= ((UInt32)2 << i))
++    {
++      dictSize = (2 << i);
++      break;
++    }
++    if (dictSize <= ((UInt32)3 << i))
++    {
++      dictSize = (3 << i);
++      break;
++    }
++  }
++
++  for (i = 0; i < 4; i++)
++    props[1 + i] = (Byte)(dictSize >> (8 * i));
++  return SZ_OK;
++}
++
++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  SRes res;
++  CLzmaEnc *p = (CLzmaEnc *)pp;
++
++  CSeqOutStreamBuf outStream;
++
++  LzmaEnc_SetInputBuf(p, src, srcLen);
++
++  outStream.funcTable.Write = MyWrite;
++  outStream.data = dest;
++  outStream.rem = *destLen;
++  outStream.overflow = False;
++
++  p->writeEndMark = writeEndMark;
++  res = LzmaEnc_Encode(pp, &outStream.funcTable, &p->seqBufInStream.funcTable, 
++      progress, alloc, allocBig);
++
++  *destLen -= outStream.rem;
++  if (outStream.overflow)
++    return SZ_ERROR_OUTPUT_EOF;
++  return res;
++}
++
++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
++    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, 
++    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
++{
++  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
++  SRes res;
++  if (p == 0)
++    return SZ_ERROR_MEM;
++
++  res = LzmaEnc_SetProps(p, props);
++  if (res == SZ_OK)
++  {
++    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
++    if (res == SZ_OK)
++      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
++          writeEndMark, progress, alloc, allocBig);
++  }
++
++  LzmaEnc_Destroy(p, alloc, allocBig);
++  return res;
++}
+--- a/mkfs.jffs2.c
++++ b/mkfs.jffs2.c
+@@ -1685,11 +1685,11 @@ int main(int argc, char **argv)
+ 						  }
+ 						  erase_block_size *= units;
+ 
+-						  /* If it's less than 8KiB, they're not allowed */
+-						  if (erase_block_size < 0x2000) {
+-							  fprintf(stderr, "Erase size 0x%x too small. Increasing to 8KiB minimum\n",
++						  /* If it's less than 4KiB, they're not allowed */
++						  if (erase_block_size < 0x1000) {
++							  fprintf(stderr, "Erase size 0x%x too small. Increasing to 4KiB minimum\n",
+ 									  erase_block_size);
+-							  erase_block_size = 0x2000;
++							  erase_block_size = 0x1000;
+ 						  }
+ 						  break;
+ 					  }
diff --git a/trunk/tools/mtd-utils/patches/131-fix_lib_compile.patch b/trunk/tools/mtd-utils/patches/131-fix_lib_compile.patch
new file mode 100644
index 00000000..8c977c17
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/131-fix_lib_compile.patch
@@ -0,0 +1,11 @@
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -7,7 +7,7 @@ SUBDIRS =
+ # CFLAGS += -Werror
+ CPPFLAGS += -I../include
+ LIBS = libmtd
+-TARGETS = libmtd.a
++override TARGETS = libmtd.a
+ 
+ include ../common.mk
+ 
diff --git a/trunk/tools/mtd-utils/patches/133-error-fix.patch b/trunk/tools/mtd-utils/patches/133-error-fix.patch
new file mode 100644
index 00000000..4854138d
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/133-error-fix.patch
@@ -0,0 +1,20 @@
+--- a/mkfs.jffs2.c
++++ b/mkfs.jffs2.c
+@@ -469,7 +469,7 @@ static int interpret_table_entry(struct
+ 	if (entry && !(count > 0 && (type == 'c' || type == 'b'))) {
+ 		/* Check the type */
+ 		if ((mode & S_IFMT) != (entry->sb.st_mode & S_IFMT)) {
+-			error_msg ("skipping device_table entry '%s': type mismatch!", name);
++			sys_errmsg ("skipping device_table entry '%s': type mismatch!", name);
+ 			free(name);
+ 			free(hostpath);
+ 			return 1;
+@@ -485,7 +485,7 @@ static int interpret_table_entry(struct
+ 		}
+ 	} else {
+ 		if (type == 'f' || type == 'l') {
+-			error_msg ("skipping device_table entry '%s': file does not exist!", name);
++			sys_errmsg ("skipping device_table entry '%s': file does not exist!", name);
+ 			free(name);
+ 			free(hostpath);
+ 			return 1;
diff --git a/trunk/tools/mtd-utils/patches/134-freebsd_loff_t.patch b/trunk/tools/mtd-utils/patches/134-freebsd_loff_t.patch
new file mode 100644
index 00000000..68a83529
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/134-freebsd_loff_t.patch
@@ -0,0 +1,13 @@
+--- a/include/mtd/mtd-abi.h
++++ b/include/mtd/mtd-abi.h
+@@ -114,8 +114,8 @@ struct otp_info {
+ #define MEMGETREGIONINFO	_IOWR('M', 8, struct region_info_user)
+ #define MEMSETOOBSEL		_IOW('M', 9, struct nand_oobinfo)
+ #define MEMGETOOBSEL		_IOR('M', 10, struct nand_oobinfo)
+-#define MEMGETBADBLOCK		_IOW('M', 11, __kernel_loff_t)
+-#define MEMSETBADBLOCK		_IOW('M', 12, __kernel_loff_t)
++#define MEMGETBADBLOCK		_IOW('M', 11, loff_t)
++#define MEMSETBADBLOCK		_IOW('M', 12, loff_t)
+ #define OTPSELECT		_IOR('M', 13, int)
+ #define OTPGETREGIONCOUNT	_IOW('M', 14, int)
+ #define OTPGETREGIONINFO	_IOW('M', 15, struct otp_info)
diff --git a/trunk/tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch b/trunk/tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
new file mode 100644
index 00000000..82b6c2fe
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
@@ -0,0 +1,119 @@
+--- a/mkfs.ubifs/compr.c
++++ b/mkfs.ubifs/compr.c
+@@ -24,7 +24,6 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <string.h>
+-#include <lzo/lzo1x.h>
+ #include <linux/types.h>
+ 
+ #define crc32 __zlib_crc32
+@@ -35,7 +34,6 @@
+ #include "ubifs-media.h"
+ #include "mkfs.ubifs.h"
+ 
+-static void *lzo_mem;
+ static unsigned long long errcnt = 0;
+ static struct ubifs_info *c = &info_;
+ 
+@@ -86,6 +84,25 @@ static int zlib_deflate(void *in_buf, si
+ 	return 0;
+ }
+ 
++#ifndef WITHOUT_LZO
++#include <lzo/lzo1x.h>
++
++static void *lzo_mem;
++
++static int lzo_init(void)
++{
++	lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
++	if (!lzo_mem)
++		return -1;
++
++	return 0;
++}
++
++static void lzo_fini(void)
++{
++	free(lzo_mem);
++}
++
+ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
+ 			size_t *out_len)
+ {
+@@ -103,6 +120,12 @@ static int lzo_compress(void *in_buf, si
+ 
+ 	return 0;
+ }
++#else
++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
++			       size_t *out_len) { return -1; }
++static inline int lzo_init(void) { return 0; }
++static inline void lzo_fini(void) { }
++#endif
+ 
+ static int no_compress(void *in_buf, size_t in_len, void *out_buf,
+ 		       size_t *out_len)
+@@ -123,7 +146,6 @@ static int favor_lzo_compress(void *in_b
+ 	lzo_len = zlib_len = *out_len;
+ 	lzo_ret = lzo_compress(in_buf, in_len, out_buf, &lzo_len);
+ 	zlib_ret = zlib_deflate(in_buf, in_len, zlib_buf, &zlib_len);
+-
+ 	if (lzo_ret && zlib_ret)
+ 		/* Both compressors failed */
+ 		return -1;
+@@ -198,23 +220,28 @@ int compress_data(void *in_buf, size_t i
+ 
+ int init_compression(void)
+ {
+-	lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
+-	if (!lzo_mem)
+-		return -1;
++	int ret;
++
++	ret = lzo_init();
++	if (ret)
++		goto err;
+ 
+ 	zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
+-	if (!zlib_buf) {
+-		free(lzo_mem);
+-		return -1;
+-	}
++	if (!zlib_buf)
++		goto err_lzo;
+ 
+ 	return 0;
++
++err_lzo:
++	lzo_fini();
++err:
++	return ret;
+ }
+ 
+ void destroy_compression(void)
+ {
+ 	free(zlib_buf);
+-	free(lzo_mem);
++	lzo_fini();
+ 	if (errcnt)
+ 		fprintf(stderr, "%llu compression errors occurred\n", errcnt);
+ }
+--- a/mkfs.ubifs/Makefile
++++ b/mkfs.ubifs/Makefile
+@@ -6,7 +6,13 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch]
+ 
+ TARGETS = mkfs.ubifs
+ 
+-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi
++ifeq ($(WITHOUT_LZO), 1)
++  CPPFLAGS += -DWITHOUT_LZO
++else
++  LZOLDLIBS = -llzo2
++endif
++
++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi
+ LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd
+ LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS)
+ 
diff --git a/trunk/tools/mtd-utils/patches/136-mkfs.ubifs-xz-support.patch b/trunk/tools/mtd-utils/patches/136-mkfs.ubifs-xz-support.patch
new file mode 100644
index 00000000..1e44ba4c
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/136-mkfs.ubifs-xz-support.patch
@@ -0,0 +1,404 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ 
+ # -*- sh -*-
+ 
+-CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) -I./include/linux/lzma
++CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(XZCPPFLAGS) -I./include/linux/lzma
+ 
+ ifeq ($(WITHOUT_XATTR), 1)
+   CPPFLAGS += -DWITHOUT_XATTR
+--- a/mkfs.ubifs/compr.c
++++ b/mkfs.ubifs/compr.c
+@@ -127,6 +127,114 @@ static inline int lzo_init(void) { retur
+ static inline void lzo_fini(void) { }
+ #endif
+ 
++#ifndef WITHOUT_XZ
++
++#include <lzma.h>
++
++struct xz_ctx {
++	lzma_filter	filters[3];
++	lzma_options_lzma opts;
++};
++
++static struct xz_ctx *xz_ctx;
++
++#define LZMA_COMPRESSION_LEVEL	9
++
++static struct xz_ctx *xz_ctx_init(void)
++{
++	struct xz_ctx *ctx;
++	lzma_options_lzma *opts_lzma;
++	uint32_t preset;
++	int ret;
++
++	ctx = malloc(sizeof(struct xz_ctx));
++	if (ctx == NULL)
++		goto err;
++
++	memset(ctx, 0, sizeof(struct xz_ctx));
++
++	opts_lzma = &ctx->opts;
++
++	preset = LZMA_COMPRESSION_LEVEL | LZMA_PRESET_EXTREME;
++	ret = lzma_lzma_preset(opts_lzma, preset);
++	if (ret)
++		goto err_free_ctx;
++
++	/* TODO: allow to specify LZMA options via command line */
++#if 0
++	opts_lzma->lc = 3;
++	opts_lzma->lp = 0;
++	opts_lzma->pb = 2;
++	opts_lzma->nice_len = 64;
++#else
++	opts_lzma->lc = 0;
++	opts_lzma->lp = 2;
++	opts_lzma->pb = 2;
++	opts_lzma->nice_len = 64;
++#endif
++
++	ctx->filters[0].id = LZMA_FILTER_LZMA2;
++	ctx->filters[0].options = opts_lzma;
++	ctx->filters[1].id = LZMA_VLI_UNKNOWN;
++
++	return ctx;
++
++err_free_ctx:
++	free(ctx);
++err:
++	return NULL;
++}
++
++static void xz_ctx_free(struct xz_ctx *ctx)
++{
++	free(ctx);
++}
++
++static int xz_init(void)
++{
++	xz_ctx = xz_ctx_init();
++	if (xz_ctx == NULL)
++		return -1;
++
++	return 0;
++}
++
++static void xz_fini(void)
++{
++	xz_ctx_free(xz_ctx);
++}
++
++static int xz_compress(void *in_buf, size_t in_len, void *out_buf,
++		       size_t *out_len)
++{
++	size_t ret_len;
++	lzma_ret ret_xz;
++	int ret;
++
++	ret = -1;
++
++	ret_len = 0;
++	ret_xz = lzma_stream_buffer_encode(xz_ctx->filters, LZMA_CHECK_CRC32,
++					   NULL, in_buf, in_len, out_buf,
++					   &ret_len, *out_len);
++	if (ret_xz != LZMA_OK) {
++		fprintf(stderr, "XZ error: %d\n", (int) ret_xz);
++		goto out;
++	}
++
++	*out_len = ret_len;
++
++	ret = 0;
++out:
++	return ret;
++}
++#else
++static inline int xz_init(void) { return 0; }
++static inline void xz_fini(void) { }
++static inline int xz_compress(void *in_buf, size_t in_len, void *out_buf,
++			      size_t *out_len) { return -1; }
++#endif
++
+ static int no_compress(void *in_buf, size_t in_len, void *out_buf,
+ 		       size_t *out_len)
+ {
+@@ -199,6 +307,9 @@ int compress_data(void *in_buf, size_t i
+ 		case MKFS_UBIFS_COMPR_LZO:
+ 			ret = lzo_compress(in_buf, in_len, out_buf, out_len);
+ 			break;
++		case MKFS_UBIFS_COMPR_XZ:
++			ret = xz_compress(in_buf, in_len, out_buf, out_len);
++			break;
+ 		case MKFS_UBIFS_COMPR_ZLIB:
+ 			ret = zlib_deflate(in_buf, in_len, out_buf, out_len);
+ 			break;
+@@ -226,12 +337,18 @@ int init_compression(void)
+ 	if (ret)
+ 		goto err;
+ 
++	ret = xz_init();
++	if (ret)
++		goto err_lzo;
++
+ 	zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
+ 	if (!zlib_buf)
+-		goto err_lzo;
++		goto err_xz;
+ 
+ 	return 0;
+ 
++err_xz:
++	xz_fini();
+ err_lzo:
+ 	lzo_fini();
+ err:
+@@ -241,6 +358,7 @@ err:
+ void destroy_compression(void)
+ {
+ 	free(zlib_buf);
++	xz_fini();
+ 	lzo_fini();
+ 	if (errcnt)
+ 		fprintf(stderr, "%llu compression errors occurred\n", errcnt);
+--- a/mkfs.ubifs/compr.h
++++ b/mkfs.ubifs/compr.h
+@@ -36,6 +36,7 @@ enum compression_type
+ 	MKFS_UBIFS_COMPR_NONE,
+ 	MKFS_UBIFS_COMPR_LZO,
+ 	MKFS_UBIFS_COMPR_ZLIB,
++	MKFS_UBIFS_COMPR_XZ,
+ };
+ 
+ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
+--- a/mkfs.ubifs/Makefile
++++ b/mkfs.ubifs/Makefile
+@@ -6,21 +6,33 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch]
+ 
+ TARGETS = mkfs.ubifs
+ 
++MKFS_UBIFS_OBJS = $(addprefix $(BUILDDIR)/,\
++	crc16.o lpt.o compr.o devtable.o \
++	hashtable/hashtable.o hashtable/hashtable_itr.o)
++
+ ifeq ($(WITHOUT_LZO), 1)
+   CPPFLAGS += -DWITHOUT_LZO
+ else
+   LZOLDLIBS = -llzo2
+ endif
+ 
+-LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi
++ifeq ($(WITHOUT_XZ), 1)
++  CPPFLAGS += -DWITHOUT_XZ
++else
++ifneq ($(LZMA_STATIC_LIB),)
++  MKFS_UBIFS_OBJS += $(LZMA_STATIC_LIB)
++else
++  XZLDLIBS = -llzma
++endif
++endif
++
++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) $(XZLDLIBS) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi
+ LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd
+-LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS)
++LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) $(XZLDFLAGS)
+ 
+ include ../common.mk
+ 
+-$(BUILDDIR)/mkfs.ubifs: $(addprefix $(BUILDDIR)/,\
+-	crc16.o lpt.o compr.o devtable.o \
+-	hashtable/hashtable.o hashtable/hashtable_itr.o)
++$(BUILDDIR)/mkfs.ubifs: $(MKFS_UBIFS_OBJS)
+ 
+ clean::
+ 	rm -f $(BUILDDIR)/hashtable/*.o cscope.*
+--- a/mkfs.ubifs/mkfs.ubifs.c
++++ b/mkfs.ubifs/mkfs.ubifs.c
+@@ -98,6 +98,9 @@ struct ubifs_info info_;
+ static struct ubifs_info *c = &info_;
+ static libubi_t ubi;
+ 
++static int force_compr_set;
++static int force_compr;
++
+ /* Debug levels are: 0 (none), 1 (statistics), 2 (files) ,3 (more details) */
+ int debug_level;
+ int verbose;
+@@ -132,7 +135,7 @@ static struct inum_mapping **hash_table;
+ /* Inode creation sequence number */
+ static unsigned long long creat_sqnum;
+ 
+-static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:Fp:k:x:X:j:R:l:j:UQq";
++static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:Fp:k:x:X:y:j:R:l:j:UQq";
+ 
+ static const struct option longopts[] = {
+ 	{"root",               1, NULL, 'r'},
+@@ -149,6 +152,7 @@ static const struct option longopts[] =
+ 	{"reserved",           1, NULL, 'R'},
+ 	{"compr",              1, NULL, 'x'},
+ 	{"favor-percent",      1, NULL, 'X'},
++	{"force-compr",        1, NULL, 'y'},
+ 	{"fanout",             1, NULL, 'f'},
+ 	{"space-fixup",        0, NULL, 'F'},
+ 	{"keyhash",            1, NULL, 'k'},
+@@ -178,11 +182,13 @@ static const char *helptext =
+ "-o, --output=FILE        output to FILE\n"
+ "-j, --jrn-size=SIZE      journal size\n"
+ "-R, --reserved=SIZE      how much space should be reserved for the super-user\n"
+-"-x, --compr=TYPE         compression type - \"lzo\", \"favor_lzo\", \"zlib\" or\n"
+-"                         \"none\" (default: \"lzo\")\n"
++"-x, --compr=TYPE         default compression type - \"lzo\", \"favor_lzo\",\n"
++"                         \"zlib\" or \"none\" (default: \"lzo\")\n"
+ "-X, --favor-percent      may only be used with favor LZO compression and defines\n"
+ "                         how many percent better zlib should compress to make\n"
+ "                         mkfs.ubifs use zlib instead of LZO (default 20%)\n"
++"-y, --force-compr=TYPE   force to build the fs with different compression -\n"
++"                         \"lzo\", \"zlib\" or \"none\"\n"
+ "-f, --fanout=NUM         fanout NUM (default: 8)\n"
+ "-F, --space-fixup        file-system free space has to be fixed up on first mount\n"
+ "                         (requires kernel version 3.0 or greater)\n"
+@@ -530,6 +536,43 @@ static int open_ubi(const char *node)
+ 	return 0;
+ }
+ 
++static const char *get_compr_str(int compr)
++{
++	switch (compr) {
++	case UBIFS_COMPR_LZO:
++		return "lzo";
++	case UBIFS_COMPR_ZLIB:
++		return "zlib";
++	case UBIFS_COMPR_XZ:
++		return "xz";
++	case UBIFS_COMPR_NONE:
++		return "none";
++	}
++
++	return "unknown";
++}
++
++static int get_compr_option(char *opt, int *compr_type, int *favor_lzo)
++{
++	*compr_type = UBIFS_COMPR_LZO;
++
++	if (favor_lzo)
++		*favor_lzo = 0;
++
++	if (favor_lzo && strcmp(optarg, "favor_lzo") == 0)
++		*favor_lzo = 1;
++	else if (strcmp(optarg, "zlib") == 0)
++		*compr_type = UBIFS_COMPR_ZLIB;
++	else if (strcmp(optarg, "xz") == 0)
++		*compr_type = UBIFS_COMPR_XZ;
++	else if (strcmp(optarg, "none") == 0)
++		*compr_type = UBIFS_COMPR_NONE;
++	else if (strcmp(optarg, "lzo") != 0)
++		return -1;
++
++	return 0;
++}
++
+ static int get_options(int argc, char**argv)
+ {
+ 	int opt, i;
+@@ -649,14 +692,13 @@ static int get_options(int argc, char**a
+ 				return err_msg("bad key hash");
+ 			break;
+ 		case 'x':
+-			if (strcmp(optarg, "favor_lzo") == 0)
+-				c->favor_lzo = 1;
+-			else if (strcmp(optarg, "zlib") == 0)
+-				c->default_compr = UBIFS_COMPR_ZLIB;
+-			else if (strcmp(optarg, "none") == 0)
+-				c->default_compr = UBIFS_COMPR_NONE;
+-			else if (strcmp(optarg, "lzo") != 0)
+-				return err_msg("bad compressor name");
++			if (get_compr_option(optarg, &c->default_compr,
++					     &c->favor_lzo))
++				return err_msg("bad compressor name '%s'",
++						optarg);
++			if (c->default_compr == UBIFS_COMPR_XZ)
++				return err_msg("'%s' can't be used as default compressor",
++						optarg);
+ 			break;
+ 		case 'X':
+ 			c->favor_percent = strtol(optarg, &endp, 0);
+@@ -665,6 +707,12 @@ static int get_options(int argc, char**a
+ 				return err_msg("bad favor LZO percent '%s'",
+ 					       optarg);
+ 			break;
++		case 'y':
++			if (get_compr_option(optarg, &force_compr, NULL))
++				return err_msg("bad forced compressor name '%s'",
++						optarg);
++			force_compr_set = 1;
++			break;
+ 		case 'j':
+ 			c->max_bud_bytes = get_bytes(optarg);
+ 			if (c->max_bud_bytes <= 0)
+@@ -749,6 +797,9 @@ static int get_options(int argc, char**a
+ 		c->min_io_size = 8;
+ 	c->rp_size = add_space_overhead(c->rp_size);
+ 
++	if (force_compr_set == 0)
++		force_compr = c->default_compr;
++
+ 	if (verbose) {
+ 		printf("mkfs.ubifs\n");
+ 		printf("\troot:         %s\n", root);
+@@ -758,17 +809,10 @@ static int get_options(int argc, char**a
+ 		printf("\toutput:       %s\n", output);
+ 		printf("\tjrn_size:     %llu\n", c->max_bud_bytes);
+ 		printf("\treserved:     %llu\n", c->rp_size);
+-		switch (c->default_compr) {
+-		case UBIFS_COMPR_LZO:
+-			printf("\tcompr:        lzo\n");
+-			break;
+-		case UBIFS_COMPR_ZLIB:
+-			printf("\tcompr:        zlib\n");
+-			break;
+-		case UBIFS_COMPR_NONE:
+-			printf("\tcompr:        none\n");
+-			break;
+-		}
++		printf("\tcompr:        %s\n", get_compr_str(c->default_compr));
++		if (force_compr_set)
++			printf("\tforced compr: %s\n",
++			       get_compr_str(force_compr));
+ 		printf("\tkeyhash:      %s\n", (c->key_hash == key_r5_hash) ?
+ 						"r5" : "test");
+ 		printf("\tfanout:       %d\n", c->fanout);
+@@ -1353,7 +1397,7 @@ static int add_file(const char *path_nam
+ 			use_compr = UBIFS_COMPR_LZO;
+ 		else
+ #endif
+-			use_compr = c->default_compr;
++			use_compr = force_compr;
+ 		compr_type = compress_data(buf, bytes_read, &dn->data,
+ 					   &out_len, use_compr);
+ 		dn->compr_type = cpu_to_le16(compr_type);
+--- a/mkfs.ubifs/mkfs.ubifs.h
++++ b/mkfs.ubifs/mkfs.ubifs.h
+@@ -77,6 +77,9 @@
+ #if MKFS_UBIFS_COMPR_ZLIB != UBIFS_COMPR_ZLIB
+ #error MKFS_UBIFS_COMPR_ZLIB != UBIFS_COMPR_ZLIB
+ #endif
++#if MKFS_UBIFS_COMPR_XZ != UBIFS_COMPR_XZ
++#error MKFS_UBIFS_COMPR_XZ != UBIFS_COMPR_XZ
++#endif
+ 
+ extern int verbose;
+ extern int debug_level;
+--- a/mkfs.ubifs/ubifs-media.h
++++ b/mkfs.ubifs/ubifs-media.h
+@@ -303,6 +303,7 @@ enum {
+ 	UBIFS_COMPR_NONE,
+ 	UBIFS_COMPR_LZO,
+ 	UBIFS_COMPR_ZLIB,
++	UBIFS_COMPR_XZ,
+ 	UBIFS_COMPR_TYPES_CNT,
+ };
+ 
diff --git a/trunk/tools/mtd-utils/patches/137-no_extern_inline.patch b/trunk/tools/mtd-utils/patches/137-no_extern_inline.patch
new file mode 100644
index 00000000..d871d670
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/137-no_extern_inline.patch
@@ -0,0 +1,41 @@
+--- a/mkfs.ubifs/hashtable/hashtable_itr.c
++++ b/mkfs.ubifs/hashtable/hashtable_itr.c
+@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h)
+ }
+ 
+ /*****************************************************************************/
+-/* key      - return the key of the (key,value) pair at the current position */
+-/* value    - return the value of the (key,value) pair at the current position */
+-
+-void *
+-hashtable_iterator_key(struct hashtable_itr *i)
+-{ return i->e->k; }
+-
+-void *
+-hashtable_iterator_value(struct hashtable_itr *i)
+-{ return i->e->v; }
+-
+-/*****************************************************************************/
+ /* advance - advance the iterator to the next element
+  *           returns zero if advanced to end of table */
+ 
+--- a/mkfs.ubifs/hashtable/hashtable_itr.h
++++ b/mkfs.ubifs/hashtable/hashtable_itr.h
+@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h);
+ /* hashtable_iterator_key
+  * - return the value of the (key,value) pair at the current position */
+ 
+-extern inline void *
++static inline void *
+ hashtable_iterator_key(struct hashtable_itr *i)
+ {
+     return i->e->k;
+@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_
+ /*****************************************************************************/
+ /* value - return the value of the (key,value) pair at the current position */
+ 
+-extern inline void *
++static inline void *
+ hashtable_iterator_value(struct hashtable_itr *i)
+ {
+     return i->e->v;
diff --git a/trunk/tools/mtd-utils/patches/200-libubigen-add-ubigen_write_terminator-function.patch b/trunk/tools/mtd-utils/patches/200-libubigen-add-ubigen_write_terminator-function.patch
new file mode 100644
index 00000000..8bd642fb
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/200-libubigen-add-ubigen_write_terminator-function.patch
@@ -0,0 +1,89 @@
+--- a/ubi-utils/src/libubigen.c
++++ b/ubi-utils/src/libubigen.c
+@@ -122,8 +122,9 @@ int ubigen_add_volume(const struct ubige
+ 	return 0;
+ }
+ 
+-void ubigen_init_ec_hdr(const struct ubigen_info *ui,
+-		        struct ubi_ec_hdr *hdr, long long ec)
++static void __ubigen_init_ec_hdr(const struct ubigen_info *ui,
++				 struct ubi_ec_hdr *hdr, long long ec,
++				 int eof)
+ {
+ 	uint32_t crc;
+ 
+@@ -136,10 +137,22 @@ void ubigen_init_ec_hdr(const struct ubi
+ 	hdr->data_offset = cpu_to_be32(ui->data_offs);
+ 	hdr->image_seq = cpu_to_be32(ui->image_seq);
+ 
++	if (eof) {
++		hdr->padding1[0] = 'E';
++		hdr->padding1[1] = 'O';
++		hdr->padding1[2] = 'F';
++	}
++
+ 	crc = mtd_crc32(UBI_CRC32_INIT, hdr, UBI_EC_HDR_SIZE_CRC);
+ 	hdr->hdr_crc = cpu_to_be32(crc);
+ }
+ 
++void ubigen_init_ec_hdr(const struct ubigen_info *ui,
++		        struct ubi_ec_hdr *hdr, long long ec)
++{
++	__ubigen_init_ec_hdr(ui, hdr, ec, 0);
++}
++
+ void ubigen_init_vid_hdr(const struct ubigen_info *ui,
+ 			 const struct ubigen_vol_info *vi,
+ 			 struct ubi_vid_hdr *hdr, int lnum,
+@@ -307,6 +320,39 @@ int ubigen_write_layout_vol(const struct
+ 	}
+ 
+ 	free(outbuf);
++	return 0;
++
++out_free:
++	free(outbuf);
++	return -1;
++}
++
++int ubigen_write_eof_markers(const struct ubigen_info *ui, long long ec,
++			     int count, int out_fd)
++{
++	char *outbuf;
++	int peb_size = ui->peb_size;
++
++	outbuf = malloc(peb_size);
++	if (!outbuf) {
++		sys_errmsg("cannot allocate %d bytes of memory", peb_size);
++		return -1;
++	}
++
++	memset(outbuf, 0xFF, peb_size);
++	__ubigen_init_ec_hdr(ui, (struct ubi_ec_hdr *)outbuf, ec, 1);
++
++	while (count) {
++		if (write(out_fd, outbuf, peb_size) != peb_size) {
++			sys_errmsg("cannot write %d bytes to the output file",
++				   peb_size);
++			goto out_free;
++		}
++
++		count--;
++	}
++
++	free(outbuf);
+ 	return 0;
+ 
+ out_free:
+--- a/ubi-utils/include/libubigen.h
++++ b/ubi-utils/include/libubigen.h
+@@ -188,6 +188,9 @@ int ubigen_write_layout_vol(const struct
+ 			    long long ec1, long long ec2,
+ 			    struct ubi_vtbl_record *vtbl, int fd);
+ 
++int ubigen_write_eof_markers(const struct ubigen_info *ui, long long ec,
++			     int count, int out_fd);
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/trunk/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch b/trunk/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch
new file mode 100644
index 00000000..73b0c070
--- /dev/null
+++ b/trunk/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch
@@ -0,0 +1,77 @@
+--- a/ubi-utils/src/ubinize.c
++++ b/ubi-utils/src/ubinize.c
+@@ -70,6 +70,8 @@ static const char optionsstr[] =
+ "                             (default is 1)\n"
+ "-Q, --image-seq=<num>        32-bit UBI image sequence number to use\n"
+ "                             (by default a random number is picked)\n"
++"-E, --eof-markers=<num>      number of eof-markers to put at the end of the\n"
++"                             output image\n"
+ "-v, --verbose                be verbose\n"
+ "-h, --help                   print help message\n"
+ "-V, --version                print program version";
+@@ -79,7 +81,7 @@ static const char usage[] =
+ "\t\t[-x <num>] [-Q <num>] [-v] [-h] [-V] [--output=<filename>] [--peb-size=<bytes>]\n"
+ "\t\t[--min-io-size=<bytes>] [--sub-page-size=<bytes>] [--vid-hdr-offset=<num>]\n"
+ "\t\t[--erase-counter=<num>] [--ubi-ver=<num>] [--image-seq=<num>] [--verbose] [--help]\n"
+-"\t\t[--version] ini-file\n"
++"\t\t[--eof-markers=<num>] [--version] ini-file\n"
+ "Example: " PROGRAM_NAME " -o ubi.img -p 16KiB -m 512 -s 256 cfg.ini - create UBI image\n"
+ "         'ubi.img' as described by configuration file 'cfg.ini'";
+ 
+@@ -125,6 +127,7 @@ static const struct option long_options[
+ 	{ .name = "erase-counter",  .has_arg = 1, .flag = NULL, .val = 'e' },
+ 	{ .name = "ubi-ver",        .has_arg = 1, .flag = NULL, .val = 'x' },
+ 	{ .name = "image-seq",      .has_arg = 1, .flag = NULL, .val = 'Q' },
++	{ .name = "eof-markers",    .has_arg = 1, .flag = NULL, .val = 'E' },
+ 	{ .name = "verbose",        .has_arg = 0, .flag = NULL, .val = 'v' },
+ 	{ .name = "help",           .has_arg = 0, .flag = NULL, .val = 'h' },
+ 	{ .name = "version",        .has_arg = 0, .flag = NULL, .val = 'V' },
+@@ -144,6 +147,7 @@ struct args {
+ 	uint32_t image_seq;
+ 	int verbose;
+ 	dictionary *dict;
++	int eof_markers;
+ };
+ 
+ static struct args args = {
+@@ -162,7 +166,7 @@ static int parse_opt(int argc, char * co
+ 		int key, error = 0;
+ 		unsigned long int image_seq;
+ 
+-		key = getopt_long(argc, argv, "o:p:m:s:O:e:x:Q:vhV", long_options, NULL);
++		key = getopt_long(argc, argv, "o:p:m:s:O:e:x:Q:E:vhV", long_options, NULL);
+ 		if (key == -1)
+ 			break;
+ 
+@@ -222,6 +226,12 @@ static int parse_opt(int argc, char * co
+ 			args.image_seq = image_seq;
+ 			break;
+ 
++		case 'E':
++			args.eof_markers = simple_strtoul(optarg, &error);
++			if (error)
++				return errmsg("bad number of eof-markers: \"%s\"", optarg);
++			break;
++
+ 		case 'v':
+ 			args.verbose = 1;
+ 			break;
+@@ -599,6 +609,18 @@ int main(int argc, char * const argv[])
+ 			printf("\n");
+ 	}
+ 
++	if (args.eof_markers) {
++		verbose(args.verbose, "writing %d eof-marker blocks",
++			args.eof_markers);
++
++		err = ubigen_write_eof_markers(&ui, args.ec, args.eof_markers,
++					       args.out_fd);
++		if (err) {
++			errmsg("cannot write eof-marker blocks");
++			goto out_free;
++		}
++	}
++
+ 	verbose(args.verbose, "writing layout volume");
+ 
+ 	err = ubigen_write_layout_vol(&ui, 0, 1, args.ec, args.ec, vtbl, args.out_fd);
diff --git a/trunk/tools/mtools/Makefile b/trunk/tools/mtools/Makefile
new file mode 100644
index 00000000..3bbc1a41
--- /dev/null
+++ b/trunk/tools/mtools/Makefile
@@ -0,0 +1,38 @@
+# 
+# Copyright (C) 2012-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mtools
+PKG_VERSION:=4.0.18
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_MD5SUM:=17b9f525c1ae3583a478338deb7fbc19
+PKG_CAT:=zcat
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_VARS += \
+	ac_cv_header_iconv_h=no
+
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) mcopy
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/mcopy $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/mcopy
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/padjffs2/Makefile b/trunk/tools/padjffs2/Makefile
new file mode 100644
index 00000000..4535735d
--- /dev/null
+++ b/trunk/tools/padjffs2/Makefile
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=padjffs2
+PKG_VERSION:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Prepare
+	mkdir -p $(HOST_BUILD_DIR)
+	$(CP) ./src/* $(HOST_BUILD_DIR)/
+	find $(HOST_BUILD_DIR) -name .svn | $(XARGS) rm -rf
+endef
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_STATIC_LINKING)"
+endef
+
+define Host/Configure
+endef
+
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/padjffs2 $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/padjffs2
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/padjffs2/src/Makefile b/trunk/tools/padjffs2/src/Makefile
new file mode 100644
index 00000000..45da8e5d
--- /dev/null
+++ b/trunk/tools/padjffs2/src/Makefile
@@ -0,0 +1,15 @@
+CC = gcc
+CFLAGS =
+WFLAGS = -Wall -Werror
+padjffs2-objs = padjffs2.o
+
+all: padjffs2
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(WFLAGS) -c -o $@ $<
+
+padjffs2: $(padjffs2-objs)
+	$(CC) $(LDFLAGS) -o $@ $(padjffs2-objs)
+
+clean:
+	rm -f padjffs2 *.o
diff --git a/trunk/tools/padjffs2/src/padjffs2.c b/trunk/tools/padjffs2/src/padjffs2.c
new file mode 100644
index 00000000..59c7625d
--- /dev/null
+++ b/trunk/tools/padjffs2/src/padjffs2.c
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+static char *progname;
+static unsigned int xtra_offset;
+static unsigned char eof_mark[4] = {0xde, 0xad, 0xc0, 0xde};
+static unsigned char jffs2_pad_be[] = "\x19\x85\x20\x04\x04\x00\x00\x00\xc4\x94\xdb\xf4";
+static unsigned char jffs2_pad_le[] = "\x85\x19\x04\x20\x00\x00\x00\x04\xa8\xfb\xa0\xb4";
+static unsigned char *pad = eof_mark;
+static int pad_len = sizeof(eof_mark);
+
+#define ERR(fmt, ...) do { \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt "\n", \
+			progname, ## __VA_ARGS__ ); \
+} while (0)
+
+#define ERRS(fmt, ...) do { \
+	int save = errno; \
+	fflush(0); \
+	fprintf(stderr, "[%s] *** error: " fmt ", %s\n", \
+			progname, ## __VA_ARGS__, strerror(save)); \
+} while (0)
+
+#define BUF_SIZE	(64 * 1024)
+#define ALIGN(_x,_y)	(((_x) + ((_y) - 1)) & ~((_y) - 1))
+
+static int pad_image(char *name, uint32_t pad_mask)
+{
+	char *buf;
+	int fd;
+	ssize_t in_len;
+	ssize_t out_len;
+	int ret = -1;
+
+	buf = malloc(BUF_SIZE);
+	if (!buf) {
+		ERR("No memory for buffer");
+		goto out;
+	}
+
+	fd = open(name, O_RDWR);
+	if (fd < 0) {
+		ERRS("Unable to open %s", name);
+		goto free_buf;
+	}
+
+	in_len = lseek(fd, 0, SEEK_END);
+	if (in_len < 0)
+		goto close;
+
+	memset(buf, '\xff', BUF_SIZE);
+
+	in_len += xtra_offset;
+
+	out_len = in_len;
+	while (pad_mask) {
+		uint32_t mask;
+		ssize_t t;
+		int i;
+
+		for (i = 10; i < 32; i++) {
+			mask = 1UL << i;
+			if (pad_mask & mask)
+				break;
+		}
+
+		in_len = ALIGN(in_len, mask);
+
+		for (i = 10; i < 32; i++) {
+			mask = 1UL << i;
+			if ((in_len & (mask - 1)) == 0)
+				pad_mask &= ~mask;
+		}
+
+		printf("padding image to %08x\n", (unsigned int) in_len - xtra_offset);
+
+		while (out_len < in_len) {
+			ssize_t len;
+
+			len = in_len - out_len;
+			if (len > BUF_SIZE)
+				len = BUF_SIZE;
+
+			t = write(fd, buf, len);
+			if (t != len) {
+				ERRS("Unable to write to %s", name);
+				goto close;
+			}
+
+			out_len += len;
+		}
+
+		/* write out the JFFS end-of-filesystem marker */
+		t = write(fd, pad, pad_len);
+		if (t != pad_len) {
+			ERRS("Unable to write to %s", name);
+			goto close;
+		}
+		out_len += pad_len;
+	}
+
+	ret = 0;
+
+close:
+	close(fd);
+free_buf:
+	free(buf);
+out:
+	return ret;
+}
+
+static int usage(void)
+{
+	fprintf(stderr,
+		"Usage: %s file [<options>] [pad0] [pad1] [padN]\n"
+		"Options:\n"
+		"  -x <offset>:          Add an extra offset for padding data\n"
+		"  -J:                   Use a fake big-endian jffs2 padding element instead of EOF\n"
+		"                        This is used to work around broken boot loaders that\n"
+		"                        try to parse the entire firmware area as one big jffs2\n"
+		"  -j:                   (like -J, but little-endian instead of big-endian)\n"
+		"\n",
+		progname);
+	return EXIT_FAILURE;
+}
+
+int main(int argc, char* argv[])
+{
+	char *image;
+	uint32_t pad_mask;
+	int ret = EXIT_FAILURE;
+	int err;
+	int ch, i;
+
+	progname = basename(argv[0]);
+
+	if (argc < 2)
+		return usage();
+
+	image = argv[1];
+	argv++;
+	argc--;
+
+	pad_mask = 0;
+	while ((ch = getopt(argc, argv, "x:Jj")) != -1) {
+		switch (ch) {
+		case 'x':
+			xtra_offset = strtoul(optarg, NULL, 0);
+			fprintf(stderr, "assuming %u bytes offset\n",
+				xtra_offset);
+			break;
+		case 'J':
+			pad = jffs2_pad_be;
+			pad_len = sizeof(jffs2_pad_be) - 1;
+			break;
+		case 'j':
+			pad = jffs2_pad_le;
+			pad_len = sizeof(jffs2_pad_le) - 1;
+			break;
+		default:
+			return usage();
+		}
+	}
+
+	for (i = optind; i < argc; i++)
+		pad_mask |= strtoul(argv[i], NULL, 0) * 1024;
+
+	if (pad_mask == 0)
+		pad_mask = (4 * 1024) | (8 * 1024) | (64 * 1024) |
+			   (128 * 1024);
+
+	err = pad_image(image, pad_mask);
+	if (err)
+		goto out;
+
+	ret = EXIT_SUCCESS;
+
+out:
+	return ret;
+}
diff --git a/trunk/tools/patch-image/Makefile b/trunk/tools/patch-image/Makefile
new file mode 100644
index 00000000..cd2df5c8
--- /dev/null
+++ b/trunk/tools/patch-image/Makefile
@@ -0,0 +1,28 @@
+# 
+# Copyright (C) 2007-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=patch-image
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	$(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/patch-cmdline src/patch-cmdline.c
+	$(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/patch-dtb src/patch-dtb.c
+endef
+
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/patch-cmdline $(STAGING_DIR_HOST)/bin/
+	$(CP) $(HOST_BUILD_DIR)/patch-dtb $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/patch-cmdline
+	rm -f $(STAGING_DIR_HOST)/bin/patch-dtb
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/patch-image/src/patch-cmdline.c b/trunk/tools/patch-image/src/patch-cmdline.c
new file mode 100644
index 00000000..571f848d
--- /dev/null
+++ b/trunk/tools/patch-image/src/patch-cmdline.c
@@ -0,0 +1,79 @@
+/*
+ * patch-cmdline.c - patch the kernel command line on rb532
+ *
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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 <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <string.h>
+
+#define SEARCH_SPACE	(16 * 1024)
+#define CMDLINE_MAX		512
+
+int main(int argc, char **argv)
+{
+	int fd, found = 0, len, ret = -1;
+	char *ptr, *p;
+
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s <file> <cmdline>\n", argv[0]);
+		goto err1;
+	}
+	len = strlen(argv[2]);
+	if (len + 9 > CMDLINE_MAX) {
+		fprintf(stderr, "Command line string too long\n");
+		goto err1;
+	}
+	
+	if (((fd = open(argv[1], O_RDWR)) < 0) ||
+		(ptr = (char *) mmap(0, SEARCH_SPACE + CMDLINE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) {
+		fprintf(stderr, "Could not open kernel image");
+		goto err2;
+	}
+	
+	for (p = ptr; p < (ptr + SEARCH_SPACE); p += 4) {
+		if (memcmp(p, "CMDLINE:", 8) == 0) {
+			found = 1;
+			p += 8;
+			break;
+		}
+	}
+	if (!found) {
+		fprintf(stderr, "Command line marker not found!\n");
+		goto err3;
+	}
+
+	memset(p, 0, CMDLINE_MAX - 8);
+	strcpy(p, argv[2]);
+	msync(p, CMDLINE_MAX, MS_SYNC|MS_INVALIDATE);
+	ret = 0;
+
+err3:
+	munmap((void *) ptr, len);
+err2:
+	if (fd > 0)
+		close(fd);
+err1:
+	return ret;
+}
diff --git a/trunk/tools/patch-image/src/patch-dtb.c b/trunk/tools/patch-image/src/patch-dtb.c
new file mode 100644
index 00000000..161e1dca
--- /dev/null
+++ b/trunk/tools/patch-image/src/patch-dtb.c
@@ -0,0 +1,101 @@
+/*
+ * patch-dtb.c - patch a dtb into an image
+ *
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2012 John Crispin <blogic@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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.
+ *
+ * based on patch-cmdline.c
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <string.h>
+
+#define SEARCH_SPACE	(16 * 1024)
+#define DTB_MAX	(16 * 1024)
+
+int main(int argc, char **argv)
+{
+	int fd, fddtb, found = 0, len, ret = -1;
+	char *ptr, *ptrdtb, *p;
+	struct stat s;
+
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s <file> <dtb>\n", argv[0]);
+		goto err1;
+	}
+	fddtb = open(argv[1], O_RDONLY);
+	if (!fddtb)
+		goto err1;
+
+	if (stat(argv[2], &s)) {
+		fprintf(stderr, "DTB not found\n");
+		goto err1;
+	}
+
+	len = s.st_size;
+	if (len + 8 > DTB_MAX) {
+		fprintf(stderr, "DTB too big\n");
+		goto err1;
+	}
+
+        if (((fddtb = open(argv[2], O_RDONLY)) < 0) ||
+		(ptrdtb = (char *) mmap(0, DTB_MAX, PROT_READ, MAP_SHARED, fddtb, 0)) == (void *) (-1)) {
+		fprintf(stderr, "Could not open DTB");
+		goto err2;
+	}
+
+	if (((fd = open(argv[1], O_RDWR)) < 0) ||
+		(ptr = (char *) mmap(0, SEARCH_SPACE + DTB_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) {
+		fprintf(stderr, "Could not open kernel image");
+		goto err3;
+	}
+
+	for (p = ptr; p < (ptr + SEARCH_SPACE); p += 4) {
+		if (memcmp(p, "OWRTDTB:", 8) == 0) {
+			found = 1;
+			p += 8;
+			break;
+		}
+	}
+	if (!found) {
+		fprintf(stderr, "DTB marker not found!\n");
+		goto err4;
+	}
+
+	memset(p, 0, DTB_MAX - 8);
+	memcpy(p, ptrdtb, len);
+	msync(p, len, MS_SYNC|MS_INVALIDATE);
+	ret = 0;
+
+err4:
+	munmap((void *) ptr, len);
+err3:
+	if (fd > 0)
+		close(fd);
+	munmap((void *) ptrdtb, len);
+err2:
+	if (fddtb > 0)
+		close(fddtb);
+err1:
+	return ret;
+}
diff --git a/trunk/tools/patch/Makefile b/trunk/tools/patch/Makefile
new file mode 100644
index 00000000..def82990
--- /dev/null
+++ b/trunk/tools/patch/Makefile
@@ -0,0 +1,18 @@
+# 
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=patch
+PKG_VERSION:=2.7.1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/patch
+PKG_MD5SUM:=e9ae5393426d3ad783a300a338c09b72
+
+include $(INCLUDE_DIR)/host-build.mk
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/pkg-config/Makefile b/trunk/tools/pkg-config/Makefile
new file mode 100644
index 00000000..0edc807e
--- /dev/null
+++ b/trunk/tools/pkg-config/Makefile
@@ -0,0 +1,37 @@
+# 
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=pkg-config
+PKG_VERSION:=0.28
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://pkgconfig.freedesktop.org/releases/
+PKG_MD5SUM:=aa3c86e67551adc3ac865160e34a2a0d
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+unexport PKG_CONFIG
+
+HOST_CONFIGURE_ARGS += --with-internal-glib
+
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) install \
+		AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
+	mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real
+	$(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
+endef
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/pkg-config/files/pkg-config b/trunk/tools/pkg-config/files/pkg-config
new file mode 100755
index 00000000..e58b1321
--- /dev/null
+++ b/trunk/tools/pkg-config/files/pkg-config
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pkg-config.real $@ --define-variable=prefix=${STAGING_PREFIX} --define-variable=exec_prefix=${STAGING_PREFIX}
diff --git a/trunk/tools/pkg-config/patches/001-fix-package-rebuild.patch b/trunk/tools/pkg-config/patches/001-fix-package-rebuild.patch
new file mode 100644
index 00000000..54f549c0
--- /dev/null
+++ b/trunk/tools/pkg-config/patches/001-fix-package-rebuild.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -39,7 +39,7 @@
+ if HOST_TOOL
+ host_tool = $(host)-pkg-config$(EXEEXT)
+ install-exec-hook:
+-	cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool)
++	cd $(DESTDIR)$(bindir) && $(LN) -f pkg-config$(EXEEXT) $(host_tool)
+ uninstall-hook:
+ 	cd $(DESTDIR)$(bindir) && rm -f $(host_tool)
+ endif
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1093,7 +1093,7 @@
+ 	uninstall-man1
+ 
+ @HOST_TOOL_TRUE@install-exec-hook:
+-@HOST_TOOL_TRUE@	cd $(DESTDIR)$(bindir) && $(LN) pkg-config$(EXEEXT) $(host_tool)
++@HOST_TOOL_TRUE@	cd $(DESTDIR)$(bindir) && $(LN) -f pkg-config$(EXEEXT) $(host_tool)
+ @HOST_TOOL_TRUE@uninstall-hook:
+ @HOST_TOOL_TRUE@	cd $(DESTDIR)$(bindir) && rm -f $(host_tool)
+ 
diff --git a/trunk/tools/ppl/Makefile b/trunk/tools/ppl/Makefile
new file mode 100644
index 00000000..082b200e
--- /dev/null
+++ b/trunk/tools/ppl/Makefile
@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2009-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ppl
+PKG_VERSION:=1.1
+
+PKG_SOURCE_URL:=http://bugseng.com/products/ppl/download/ftp/releases/$(PKG_VERSION)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_MD5SUM:=82617a9c4e08606111ed9d2dc37ececa
+
+HOST_FIXUP:=autoreconf
+
+HOST_BUILD_PARALLEL:=1
+HOST_CONFIGURE_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+unexport CFLAGS
+
+HOST_CONFIGURE_ARGS += \
+	--enable-static \
+	--disable-shared
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR)/$(3); \
+		$(HOST_CONFIGURE_CMD) \
+		$(HOST_CONFIGURE_VARS) \
+		$(HOST_CONFIGURE_ARGS); \
+	)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/ppl/patches/001-disable-serial-tests.patch b/trunk/tools/ppl/patches/001-disable-serial-tests.patch
new file mode 100644
index 00000000..91b0753f
--- /dev/null
+++ b/trunk/tools/ppl/patches/001-disable-serial-tests.patch
@@ -0,0 +1,44 @@
+--- a/tests/BD_Shape/Makefile.am
++++ b/tests/BD_Shape/Makefile.am
+@@ -21,8 +21,6 @@
+ # For the most up-to-date information see the Parma Polyhedra Library
+ # site: http://bugseng.com/products/ppl/ .
+ 
+-AUTOMAKE_OPTIONS = serial-tests
+-
+ if VALGRIND_TESTS_ENABLED
+ 
+ CHECKER = \
+--- a/tests/Box/Makefile.am
++++ b/tests/Box/Makefile.am
+@@ -21,8 +21,6 @@
+ # For the most up-to-date information see the Parma Polyhedra Library
+ # site: http://bugseng.com/products/ppl/ .
+ 
+-AUTOMAKE_OPTIONS = serial-tests
+-
+ if VALGRIND_TESTS_ENABLED
+ 
+ CHECKER = \
+--- a/tests/Concrete_Expression/Makefile.am
++++ b/tests/Concrete_Expression/Makefile.am
+@@ -21,8 +21,6 @@
+ # For the most up-to-date information see the Parma Polyhedra Library
+ # site: http://bugseng.com/products/ppl/ .
+ 
+-AUTOMAKE_OPTIONS = serial-tests
+-
+ if VALGRIND_TESTS_ENABLED
+ 
+ CHECKER = \
+--- a/tests/Octagonal_Shape/Makefile.am
++++ b/tests/Octagonal_Shape/Makefile.am
+@@ -21,8 +21,6 @@
+ # For the most up-to-date information see the Parma Polyhedra Library
+ # site: http://bugseng.com/products/ppl/ .
+ 
+-AUTOMAKE_OPTIONS = serial-tests
+-
+ if VALGRIND_TESTS_ENABLED
+ 
+ CHECKER = \
diff --git a/trunk/tools/qemu/Makefile b/trunk/tools/qemu/Makefile
new file mode 100644
index 00000000..34440ee8
--- /dev/null
+++ b/trunk/tools/qemu/Makefile
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qemu
+PKG_VERSION:=0.14.1
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=@SAVANNAH/qemu
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=b6c713a8db638e173af53a62d5178640
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" \
+		$(HOST_CONFIGURE_CMD) \
+		--extra-cflags="$(HOST_CFLAGS)" \
+		--enable-uuid \
+	)
+endef
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) qemu-img
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/qemu-img $(STAGING_DIR_HOST)/bin
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/quilt/Makefile b/trunk/tools/quilt/Makefile
new file mode 100644
index 00000000..01b0bd29
--- /dev/null
+++ b/trunk/tools/quilt/Makefile
@@ -0,0 +1,39 @@
+# 
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=quilt
+PKG_VERSION:=0.63
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SAVANNAH/quilt
+PKG_MD5SUM:=c0ef4beb58a6fa72563b955e70624b6e
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_ARGS += \
+	--with-find=$(FIND)
+
+define Host/Configure
+	cd $(HOST_BUILD_DIR) && autoconf
+	$(call Host/Configure/Default)
+	[ -f $(HOST_BUILD_DIR)/Makefile ]
+endef
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" all
+endef
+
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" install
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/quilt
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/quilt/patches/000-relocatable.patch b/trunk/tools/quilt/patches/000-relocatable.patch
new file mode 100644
index 00000000..99d7af57
--- /dev/null
+++ b/trunk/tools/quilt/patches/000-relocatable.patch
@@ -0,0 +1,72 @@
+--- a/bin/quilt.in
++++ b/bin/quilt.in
+@@ -15,9 +15,15 @@
+ unset GREP_OPTIONS
+ 
+ export TEXTDOMAIN=quilt
+-export TEXTDOMAINDIR=@LOCALEDIR@
+ 
+-: ${QUILT_DIR=@QUILT_DIR@}
++if test -n "$STAGING_DIR"; then
++	export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale"
++	: ${QUILT_DIR=$STAGING_DIR/../host/share/quilt} ${QUILT_LIB=$STAGING_DIR/../host/lib/quilt}
++else
++	export TEXTDOMAINDIR=@LOCALEDIR@
++	: ${QUILT_DIR=@QUILT_DIR@}
++fi
++
+ export QUILT_DIR
+ 
+ if [ -z "$QUILTRC" ]
+--- a/quilt/scripts/edmail.in
++++ b/quilt/scripts/edmail.in
+@@ -29,7 +29,7 @@ BEGIN {
+ }
+ 
+ setlocale(LC_MESSAGES, "");
+-bindtextdomain("quilt", "@LOCALEDIR@");
++bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@");
+ textdomain("quilt");
+ 
+ sub _($) {
+--- a/quilt/scripts/inspect.in
++++ b/quilt/scripts/inspect.in
+@@ -6,7 +6,11 @@
+ #
+ #  See the COPYING and AUTHORS files for more details.
+ 
+-: ${QUILT_DIR=@QUILT_DIR@}
++if test -n "$STAGING_DIR"; then
++	: ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"}
++else
++	: ${QUILT_DIR=@QUILT_DIR@}
++fi
+ 
+ if ! [ -r $QUILT_DIR/scripts/patchfns ]
+ then
+--- a/quilt/scripts/patchfns.in
++++ b/quilt/scripts/patchfns.in
+@@ -8,7 +8,11 @@
+ #  See the COPYING and AUTHORS files for more details.
+ 
+ export TEXTDOMAIN=quilt
+-export TEXTDOMAINDIR=@LOCALEDIR@
++if [ -n "$STAGING_DIR" ]; then
++	export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale"
++else
++	export TEXTDOMAINDIR=@LOCALEDIR@
++fi
+ 
+ : ${LC_CTYPE:=$LANG}
+ : ${LC_MESSAGES:=$LANG}
+--- a/quilt/scripts/remove-trailing-ws.in
++++ b/quilt/scripts/remove-trailing-ws.in
+@@ -31,7 +31,7 @@ BEGIN {
+ }
+ 
+ setlocale(LC_MESSAGES, "");
+-bindtextdomain("quilt", "@LOCALEDIR@");
++bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@");
+ textdomain("quilt");
+ 
+ sub _($) {
diff --git a/trunk/tools/quilt/patches/001-fix_compile.patch b/trunk/tools/quilt/patches/001-fix_compile.patch
new file mode 100644
index 00000000..c829515f
--- /dev/null
+++ b/trunk/tools/quilt/patches/001-fix_compile.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -272,13 +272,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
+ 	@$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@)
+ 
+ configure : configure.ac aclocal.m4
+-	autoconf
+-	@echo "Please run ./configure"
+-	@false
++	@touch $@
+ 
+ Makefile : Makefile.in configure
+-	@echo "Please run ./configure"
+-	@false
++	@touch $@
+ 
+ compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -type f -perm -0100))
+ 
diff --git a/trunk/tools/scons/Makefile b/trunk/tools/scons/Makefile
new file mode 100644
index 00000000..b46a0775
--- /dev/null
+++ b/trunk/tools/scons/Makefile
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2011-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=scons
+PKG_VERSION:=2.3.1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/scons
+PKG_MD5SUM:=60a3cfb98b661df9f4406c61b5686bd7
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Configure
+endef
+
+define Host/Compile
+endef
+
+define Host/Install
+	./files/pywrap.sh $(HOST_BUILD_DIR)/setup.py install --prefix=$(STAGING_DIR_HOST)
+	rm -f $(STAGING_DIR_HOST)/bin/scons*.py
+	for bin in $(STAGING_DIR_HOST)/bin/scons*; do \
+		mv "$$$$bin" "$$$$bin.py";                \
+		cp ./files/pywrap.sh "$$$$bin";           \
+	done
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/scons/files/pywrap.sh b/trunk/tools/scons/files/pywrap.sh
new file mode 100755
index 00000000..f62f590e
--- /dev/null
+++ b/trunk/tools/scons/files/pywrap.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+case "${0##*/}" in
+	pywrap.sh) arg1="";;
+	*) arg1="$0.py" ;;
+esac
+
+for bin in python python2 python2.7 python2.6 python2.5 python2.4; do
+    case "$($bin -V 2>&1)" in
+        "Python 2"*) exec $bin $arg1 "$@" ;;
+    esac
+done
+
+echo "Unable to find a Python 2.x interpreter for executing ${arg1:+$arg1 }$@ !" >&2
+exit 1
diff --git a/trunk/tools/scons/patches/001-platform_env.patch b/trunk/tools/scons/patches/001-platform_env.patch
new file mode 100644
index 00000000..8aab9041
--- /dev/null
+++ b/trunk/tools/scons/patches/001-platform_env.patch
@@ -0,0 +1,11 @@
+--- a/engine/SCons/Platform/__init__.py
++++ b/engine/SCons/Platform/__init__.py
+@@ -63,6 +63,8 @@ def platform_default():
+     care about the machine architecture.
+     """
+     osname = os.name
++    if 'PLATFORM' in os.environ:
++        return os.environ['PLATFORM']
+     if osname == 'java':
+         osname = os._osType
+     if osname == 'posix':
diff --git a/trunk/tools/sed/Makefile b/trunk/tools/sed/Makefile
new file mode 100644
index 00000000..27169540
--- /dev/null
+++ b/trunk/tools/sed/Makefile
@@ -0,0 +1,43 @@
+# 
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sed
+PKG_VERSION:=4.2.2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_MD5SUM:=7ffe1c7cdc3233e1e0c4b502df253974
+PKG_CAT:=bzcat
+export SED:=
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_CONFIGURE_ARGS += \
+	--disable-acl \
+	--disable-nls \
+
+HOST_CONFIGURE_VARS += \
+	ac_cv_search_setfilecon=no \
+	ac_cv_header_selinux_context_h=no \
+	ac_cv_header_selinux_selinux_h=no \
+
+define Host/Compile
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_STATIC_LINKING)"
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/sed/sed $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/sed
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/sparse/Makefile b/trunk/tools/sparse/Makefile
new file mode 100644
index 00000000..6cdeed5c
--- /dev/null
+++ b/trunk/tools/sparse/Makefile
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2014 Qualcomm-Atheros Inc.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sparse
+PKG_VERSION:=0.5.0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@KERNEL/software/devel/sparse/dist/
+PKG_MD5SUM:=68bc834c57836251fbee55a7707bab39
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Install
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/sparse $(STAGING_DIR_HOST)/bin
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/squashfs/Makefile b/trunk/tools/squashfs/Makefile
new file mode 100644
index 00000000..6dc27d67
--- /dev/null
+++ b/trunk/tools/squashfs/Makefile
@@ -0,0 +1,39 @@
+# 
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=squashfs
+PKG_VERSION:=3.0
+
+PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/squashfs
+PKG_MD5SUM:=9fd05d0bfbb712f5fb95edafea5bc733
+PKG_CAT:=zcat
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \
+		CC="$(HOSTCC)" \
+		CXX="$(CXX) $(HOST_STATIC_LINKING)" \
+		LZMAPATH=$(STAGING_DIR_HOST)/lib \
+		mksquashfs-lzma unsquashfs-lzma 
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
+	rm -f $(STAGING_DIR_HOST)/bin/unsquashfs-lzma
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/squashfs/patches/100-lzma.patch b/trunk/tools/squashfs/patches/100-lzma.patch
new file mode 100644
index 00000000..e3b2a3a8
--- /dev/null
+++ b/trunk/tools/squashfs/patches/100-lzma.patch
@@ -0,0 +1,22 @@
+--- a/squashfs-tools/Makefile
++++ b/squashfs-tools/Makefile
+@@ -7,6 +8,9 @@ all: mksquashfs unsquashfs
+ mksquashfs: mksquashfs.o read_fs.o sort.o
+ 	$(CC) mksquashfs.o read_fs.o sort.o -lz -o $@
+ 
++mksquashfs-lzma: mksquashfs.o read_fs.o sort.o
++	$(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma-old -o $@
++
+ mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
+ 
+ read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h
+@@ -16,4 +20,9 @@ sort.o: sort.c squashfs_fs.h global.h so
+ unsquashfs: unsquashfs.o
+ 	$(CC) unsquashfs.o -lz -o $@
+ 
++unsquashfs-lzma: unsquashfs.o
++	$(CXX) unsquashfs.o -L$(LZMAPATH) -llzma-old -o $@
++
+ unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
++
++clean:
diff --git a/trunk/tools/squashfs/patches/110-no_nonstatic_inline.patch b/trunk/tools/squashfs/patches/110-no_nonstatic_inline.patch
new file mode 100644
index 00000000..8e288f33
--- /dev/null
+++ b/trunk/tools/squashfs/patches/110-no_nonstatic_inline.patch
@@ -0,0 +1,11 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -1347,7 +1347,7 @@ struct inode_info *lookup_inode(struct s
+ }
+ 
+ 
+-inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
++static inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
+ {
+ 	if((dir->count % DIR_ENTRIES) == 0)
+ 		if((dir->list = realloc(dir->list, (dir->count + DIR_ENTRIES) * sizeof(struct dir_ent *))) == NULL)
diff --git a/trunk/tools/squashfs4/Makefile b/trunk/tools/squashfs4/Makefile
new file mode 100644
index 00000000..b838b46c
--- /dev/null
+++ b/trunk/tools/squashfs4/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=squashfs4
+PKG_VERSION:=4.2
+
+PKG_SOURCE:=squashfs$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/squashfs
+PKG_MD5SUM:=1b7a781fb4cf8938842279bd3e8ee852
+PKG_CAT:=zcat
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/squashfs$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \
+		CC="$(HOSTCC)" \
+		XZ_SUPPORT=1 \
+		LZMA_XZ_SUPPORT=1 \
+		XATTR_SUPPORT= \
+		LZMA_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
+		EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \
+		EXTRA_LDFLAGS="$(HOST_STATIC_LINKING)" \
+		mksquashfs unsquashfs
+endef
+
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs $(STAGING_DIR_HOST)/bin/mksquashfs4
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs $(STAGING_DIR_HOST)/bin/unsquashfs4
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/mksquashfs4
+	rm -f $(STAGING_DIR_HOST)/bin/unsquashfs4
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/squashfs4/patches/100-portability.patch b/trunk/tools/squashfs4/patches/100-portability.patch
new file mode 100644
index 00000000..ac1349c7
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/100-portability.patch
@@ -0,0 +1,40 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -60,6 +60,10 @@
+ #include <sys/sysinfo.h>
+ #endif
+ 
++#ifndef FNM_EXTMATCH
++#define FNM_EXTMATCH 0
++#endif
++
+ #ifdef SQUASHFS_TRACE
+ #define TRACE(s, args...) \
+ 		do { \
+--- a/squashfs-tools/unsquashfs.h
++++ b/squashfs-tools/unsquashfs.h
+@@ -49,8 +49,14 @@
+ #define __BYTE_ORDER BYTE_ORDER
+ #define __BIG_ENDIAN BIG_ENDIAN
+ #define __LITTLE_ENDIAN LITTLE_ENDIAN
++#include <sys/sysctl.h>
+ #else
+ #include <endian.h>
++#include <sys/sysinfo.h>
++#endif
++
++#ifndef FNM_EXTMATCH
++#define FNM_EXTMATCH 0
+ #endif
+ 
+ #include "squashfs_fs.h"
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -29,7 +29,6 @@
+ #include "compressor.h"
+ #include "xattr.h"
+ 
+-#include <sys/sysinfo.h>
+ #include <sys/types.h>
+ 
+ struct cache *fragment_cache, *data_cache;
diff --git a/trunk/tools/squashfs4/patches/110-allow_static_liblzma.patch b/trunk/tools/squashfs4/patches/110-allow_static_liblzma.patch
new file mode 100644
index 00000000..9a3a7441
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/110-allow_static_liblzma.patch
@@ -0,0 +1,30 @@
+--- a/squashfs-tools/Makefile
++++ b/squashfs-tools/Makefile
+@@ -129,7 +129,6 @@ ifeq ($(LZMA_XZ_SUPPORT),1)
+ CFLAGS += -DLZMA_SUPPORT
+ MKSQUASHFS_OBJS += lzma_xz_wrapper.o
+ UNSQUASHFS_OBJS += lzma_xz_wrapper.o
+-LIBS += -llzma
+ COMPRESSORS += lzma
+ endif
+ 
+@@ -137,10 +136,18 @@ ifeq ($(XZ_SUPPORT),1)
+ CFLAGS += -DXZ_SUPPORT
+ MKSQUASHFS_OBJS += xz_wrapper.o
+ UNSQUASHFS_OBJS += xz_wrapper.o
+-LIBS += -llzma
+ COMPRESSORS += xz
+ endif
+ 
++ifneq ($(LZMA_XZ_SUPPORT)$(XZ_SUPPORT),)
++ifneq ($(LZMA_LIB),)
++MKSQUASHFS_OBJS += $(LZMA_LIB)
++UNSQUASHFS_OBJS += $(LZMA_LIB)
++else
++LIBS += -llzma
++endif
++endif
++
+ ifeq ($(LZO_SUPPORT),1)
+ CFLAGS += -DLZO_SUPPORT
+ ifdef LZO_DIR
diff --git a/trunk/tools/squashfs4/patches/120-cygwin_fixes.patch b/trunk/tools/squashfs4/patches/120-cygwin_fixes.patch
new file mode 100644
index 00000000..fa1dfba4
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/120-cygwin_fixes.patch
@@ -0,0 +1,153 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -51,15 +51,22 @@
+ #include <sys/wait.h>
+ 
+ #ifndef linux
++#ifndef __CYGWIN__
+ #define __BYTE_ORDER BYTE_ORDER
+ #define __BIG_ENDIAN BIG_ENDIAN
+ #define __LITTLE_ENDIAN LITTLE_ENDIAN
+ #include <sys/sysctl.h>
++#endif /* __CYGWIN__ */
+ #else
+ #include <endian.h>
+ #include <sys/sysinfo.h>
+ #endif
+ 
++#ifdef __CYGWIN__
++#include <sys/termios.h>
++#define FNM_EXTMATCH  (1 << 5)
++#endif
++
+ #ifndef FNM_EXTMATCH
+ #define FNM_EXTMATCH 0
+ #endif
+@@ -844,6 +851,7 @@ void sigusr1_handler()
+ 
+ void sigwinch_handler()
+ {
++#ifndef __CYGWIN__
+ 	struct winsize winsize;
+ 
+ 	if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
+@@ -853,6 +861,9 @@ void sigwinch_handler()
+ 		columns = 80;
+ 	} else
+ 		columns = winsize.ws_col;
++#else
++	columns = 80;
++#endif
+ }
+ 
+ 
+@@ -4066,6 +4077,9 @@ void initialise_threads(int readb_mbytes
+ 
+ 	signal(SIGUSR1, sigusr1_handler);
+ 
++#ifdef __CYGWIN__
++	processors = atoi(getenv("NUMBER_OF_PROCESSORS"));
++#else
+ 	if(processors == -1) {
+ #ifndef linux
+ 		int mib[2];
+@@ -4087,6 +4101,7 @@ void initialise_threads(int readb_mbytes
+ 		processors = sysconf(_SC_NPROCESSORS_ONLN);
+ #endif
+ 	}
++#endif /* __CYGWIN__ */
+ 
+ 	thread = malloc((2 + processors * 2) * sizeof(pthread_t));
+ 	if(thread == NULL)
+--- a/squashfs-tools/read_fs.c
++++ b/squashfs-tools/read_fs.c
+@@ -33,9 +33,11 @@
+ #include <sys/mman.h>
+ 
+ #ifndef linux
++#ifndef __CYGWIN__
+ #define __BYTE_ORDER BYTE_ORDER
+ #define __BIG_ENDIAN BIG_ENDIAN
+ #define __LITTLE_ENDIAN LITTLE_ENDIAN
++#endif
+ #else
+ #include <endian.h>
+ #endif
+--- a/squashfs-tools/swap.c
++++ b/squashfs-tools/swap.c
+@@ -20,9 +20,11 @@
+  */
+ 
+ #ifndef linux
++#ifndef __CYGWIN__
+ #define __BYTE_ORDER BYTE_ORDER
+ #define __BIG_ENDIAN BIG_ENDIAN
+ #define __LITTLE_ENDIAN LITTLE_ENDIAN
++#endif
+ #else
+ #include <endian.h>
+ #endif
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -117,6 +117,7 @@ void update_progress_bar();
+ 
+ void sigwinch_handler()
+ {
++#ifndef __CYGWIN__
+ 	struct winsize winsize;
+ 
+ 	if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
+@@ -126,6 +127,9 @@ void sigwinch_handler()
+ 		columns = 80;
+ 	} else
+ 		columns = winsize.ws_col;
++#else
++	columns = 80;
++#endif
+ }
+ 
+ 
+@@ -1807,7 +1811,9 @@ void initialise_threads(int fragment_buf
+ 	if(sigprocmask(SIG_BLOCK, &sigmask, &old_mask) == -1)
+ 		EXIT_UNSQUASH("Failed to set signal mask in intialise_threads"
+ 			"\n");
+-
++#ifdef __CYGWIN__
++	processors = atoi(getenv("NUMBER_OF_PROCESSORS"));
++#else
+ 	if(processors == -1) {
+ #ifndef linux
+ 		int mib[2];
+@@ -1829,6 +1835,7 @@ void initialise_threads(int fragment_buf
+ 		processors = sysconf(_SC_NPROCESSORS_ONLN);
+ #endif
+ 	}
++#endif /* __CYGWIN__ */
+ 
+ 	thread = malloc((3 + processors) * sizeof(pthread_t));
+ 	if(thread == NULL)
+--- a/squashfs-tools/unsquashfs.h
++++ b/squashfs-tools/unsquashfs.h
+@@ -46,15 +46,22 @@
+ #include <sys/time.h>
+ 
+ #ifndef linux
++#ifndef __CYGWIN__
+ #define __BYTE_ORDER BYTE_ORDER
+ #define __BIG_ENDIAN BIG_ENDIAN
+ #define __LITTLE_ENDIAN LITTLE_ENDIAN
+ #include <sys/sysctl.h>
++#endif
+ #else
+ #include <endian.h>
+ #include <sys/sysinfo.h>
+ #endif
+ 
++#ifdef __CYGWIN__
++#include <sys/termios.h>
++#define FNM_EXTMATCH  (1 << 5)
++#endif
++
+ #ifndef FNM_EXTMATCH
+ #define FNM_EXTMATCH 0
+ #endif
diff --git a/trunk/tools/squashfs4/patches/150-freebsd_fixes.patch b/trunk/tools/squashfs4/patches/150-freebsd_fixes.patch
new file mode 100644
index 00000000..44d40a7d
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/150-freebsd_fixes.patch
@@ -0,0 +1,10 @@
+--- a/squashfs-tools/pseudo.c
++++ b/squashfs-tools/pseudo.c
+@@ -32,6 +32,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/stat.h>
+ 
+ #include "pseudo.h"
+ 
diff --git a/trunk/tools/squashfs4/patches/160-expose_lzma_xz_options.patch b/trunk/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
new file mode 100644
index 00000000..d6063969
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
@@ -0,0 +1,929 @@
+--- /dev/null
++++ b/squashfs-tools/lzma_xz_options.h
+@@ -0,0 +1,115 @@
++#ifndef LZMA_XZ_OPTIONS_H
++#define LZMA_XZ_OPTIONS_H
++/*
++ * Copyright (c) 2011
++ * Jonas Gorski <jonas.gorski@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2,
++ * or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * lzma_options.h
++ */
++
++#include <stdint.h>
++
++#ifndef linux
++#ifdef __FreeBSD__
++#include <machine/endian.h>
++#endif
++#define __BYTE_ORDER BYTE_ORDER
++#define __BIG_ENDIAN BIG_ENDIAN
++#define __LITTLE_ENDIAN LITTLE_ENDIAN
++#else
++#include <endian.h>
++#endif
++
++
++
++struct lzma_opts {
++	uint32_t flags;
++#define LZMA_OPT_FLT_MASK	0xffff
++#define LZMA_OPT_PRE_OFF	16
++#define LZMA_OPT_PRE_MASK	(0xf << LZMA_OPT_PRE_OFF)
++#define LZMA_OPT_EXTREME	20	
++	uint16_t bit_opts;
++#define LZMA_OPT_LC_OFF		0
++#define LZMA_OPT_LC_MASK	(0x7 << LZMA_OPT_LC_OFF)
++#define LZMA_OPT_LP_OFF		3
++#define LZMA_OPT_LP_MASK	(0x7 << LZMA_OPT_LP_OFF)
++#define LZMA_OPT_PB_OFF		6
++#define LZMA_OPT_PB_MASK	(0x7 << LZMA_OPT_PB_OFF)
++	uint16_t fb;
++	uint32_t dict_size;
++};
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++extern unsigned int inswap_le32(unsigned int);
++
++#define SQUASHFS_INSWAP_LZMA_COMP_OPTS(s) { \
++	(s)->flags = inswap_le32((s)->flags); \
++	(s)->bit_opts = inswap_le16((s)->bit_opts); \
++	(s)->fb = inswap_le16((s)->fb); \
++	(s)->dict_size = inswap_le32((s)->dict_size); \
++}
++#else
++#define SQUASHFS_INSWAP_LZMA_COMP_OPTS(s)
++#endif
++
++#define MEMLIMIT (32 * 1024 * 1024)
++
++#define LZMA_OPT_LC_MIN		0
++#define LZMA_OPT_LC_MAX		4
++#define LZMA_OPT_LC_DEFAULT	3
++
++#define LZMA_OPT_LP_MIN		0
++#define LZMA_OPT_LP_MAX		4
++#define LZMA_OPT_LP_DEFAULT	0
++
++#define LZMA_OPT_PB_MIN		0
++#define LZMA_OPT_PB_MAX		4
++#define LZMA_OPT_PB_DEFAULT	2
++
++#define LZMA_OPT_FB_MIN		5
++#define LZMA_OPT_FB_MAX		273
++#define LZMA_OPT_FB_DEFAULT	64
++
++enum {
++	LZMA_OPT_LZMA = 1,
++	LZMA_OPT_XZ
++};
++
++struct lzma_xz_options {
++	int preset;
++	int extreme;
++	int lc;
++	int lp;
++	int pb;
++	int fb;
++	int dict_size;
++	int flags;
++};
++
++struct lzma_xz_options *lzma_xz_get_options(void);
++
++int lzma_xz_options(char *argv[], int argc, int lzmaver);
++
++int lzma_xz_options_post(int block_size, int lzmaver);
++
++void *lzma_xz_dump_options(int block_size, int *size, int flags);
++
++int lzma_xz_extract_options(int block_size, void *buffer, int size, int lzmaver);
++
++void lzma_xz_usage(int lzmaver);
++
++#endif
+--- /dev/null
++++ b/squashfs-tools/lzma_xz_options.c
+@@ -0,0 +1,365 @@
++/*
++ * Copyright (c) 2011
++ * Jonas Gorski <jonas.gorski@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2,
++ * or (at your option) any later version.
++ *
++ * This program is distributed in the hope that 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * lzma_options.c
++ * 
++ * Common options for LZMA1 and 2 compressors. Based on xz_wrapper.c
++ */
++
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++
++#include <lzma.h>
++
++#include "lzma_xz_options.h"
++
++static const char const *lzmaver_str[] = { "", "lzma", "xz" };
++
++static struct lzma_xz_options options = {
++	.flags		= 0,
++	.preset		= 6,
++	.extreme	= 0,
++	.lc		= LZMA_OPT_LC_DEFAULT,
++	.lp		= LZMA_OPT_LP_DEFAULT,
++	.pb		= LZMA_OPT_PB_DEFAULT,
++	.fb		= LZMA_OPT_FB_DEFAULT,
++	.dict_size	= 0,
++};
++
++static float lzma_dict_percent = 0;
++
++struct lzma_xz_options *lzma_xz_get_options(void)
++{
++	return &options;
++}
++
++
++int lzma_xz_options(char *argv[], int argc, int lzmaver)
++{
++	const char *comp_name = lzmaver_str[lzmaver];
++	
++	if(strcmp(argv[0], "-Xpreset") == 0) {
++		int preset;
++		
++		if(argc < 2) {
++			fprintf(stderr, "%s: -Xpreset missing preset\n", comp_name);
++			goto failed;
++		}
++		
++		preset = atoi(argv[1]);
++		
++		if (preset < 0 || preset > 9) {
++			fprintf(stderr, "%s: -Xpreset invalid value\n", comp_name);
++			goto failed;
++		}
++		options.preset = preset;
++		return 1;
++	} else if(strcmp(argv[0], "-Xe") == 0) {
++		options.extreme = 1;
++		return 0;
++	} else if(strcmp(argv[0], "-Xlc") == 0) {
++		int lc;
++		
++		if(argc < 2) {
++			fprintf(stderr, "%s: -Xlc missing lc\n", comp_name);
++			goto failed;
++		}
++		
++		lc = atoi(argv[1]);
++		
++		if (lc < LZMA_OPT_LC_MIN || lc > LZMA_OPT_LC_MAX) {
++			fprintf(stderr, "%s: -Xlc invalid value\n", comp_name);
++			goto failed;
++		}
++		options.lc = lc;
++		return 1;
++	} else if(strcmp(argv[0], "-Xlp") == 0) {
++		int lp;
++		
++		if(argc < 2) {
++			fprintf(stderr, "%s: -Xlp missing lp\n", comp_name);
++			goto failed;
++		}
++		
++		lp = atoi(argv[1]);
++		
++		if (lp < LZMA_OPT_LP_MIN || lp > LZMA_OPT_LP_MAX) {
++			fprintf(stderr, "%s: -Xlp invalid value\n", comp_name);
++			goto failed;
++		}
++		options.lp = lp;
++		return 1;
++	} else if(strcmp(argv[0], "-Xpb") == 0) {
++		int pb;
++		
++		if(argc < 2) {
++			fprintf(stderr, "%s: -Xpb missing pb\n", comp_name);
++			goto failed;
++		}
++		
++		pb = atoi(argv[1]);
++		
++		if (pb < LZMA_OPT_PB_MIN || pb > LZMA_OPT_PB_MAX) {
++			fprintf(stderr, "%s: -Xbp invalid value\n", comp_name);
++			goto failed;
++		}
++		options.pb = pb;
++		return 1;	
++	} else if(strcmp(argv[0], "-Xfb") == 0) {
++		int fb;
++		
++		if(argc < 2) {
++			fprintf(stderr, "%s: -Xfb missing fb\n", comp_name);
++			goto failed;
++		}
++		
++		fb = atoi(argv[1]);
++		
++		if (fb < LZMA_OPT_FB_MIN || fb > LZMA_OPT_FB_MAX) {
++			fprintf(stderr, "%s: -Xfb invalid value\n", comp_name);
++			goto failed;
++		}
++		options.fb = fb;
++		return 1;
++	} else if(strcmp(argv[0], "-Xdict-size") == 0) {
++		char *b;
++		float size;
++
++		if(argc < 2) {
++			fprintf(stderr, "%s: -Xdict-size missing dict-size\n", comp_name);
++			goto failed;
++		}
++
++		size = strtof(argv[1], &b);
++		if(*b == '%') {
++			if(size <= 0 || size > 100) {
++				fprintf(stderr, "%s: -Xdict-size percentage "
++					"should be 0 < dict-size <= 100\n", comp_name);
++				goto failed;
++			}
++
++			lzma_dict_percent = size;
++			options.dict_size = 0;
++		} else {
++			if((float) ((int) size) != size) {
++				fprintf(stderr, "%s: -Xdict-size can't be "
++					"fractional unless a percentage of the"
++					" block size\n", comp_name);
++				goto failed;
++			}
++
++			lzma_dict_percent = 0;
++			options.dict_size = (int) size;
++
++			if(*b == 'k' || *b == 'K')
++				options.dict_size *= 1024;
++			else if(*b == 'm' || *b == 'M')
++				options.dict_size *= 1024 * 1024;
++			else if(*b != '\0') {
++				fprintf(stderr, "%s: -Xdict-size invalid "
++					"dict-size\n", comp_name);
++				goto failed;
++			}
++		}
++
++		return 1;
++	}
++	
++	return -1;
++	
++failed:
++	return -2;
++
++}
++
++int lzma_xz_options_post(int block_size, int lzmaver)
++{
++	const char *comp_name = lzmaver_str[lzmaver];
++	/*
++	 * if -Xdict-size has been specified use this to compute the datablock
++	 * dictionary size
++	 */
++	if(options.dict_size || lzma_dict_percent) {
++		int dict_size_min = (lzmaver == 1 ? 4096 : 8192);
++		int n;
++
++		if(options.dict_size) {
++			if(options.dict_size > block_size) {
++				fprintf(stderr, "%s: -Xdict-size is larger than"
++				" block_size\n", comp_name);
++				goto failed;
++			}
++		} else
++			options.dict_size = block_size * lzma_dict_percent / 100;
++
++		if(options.dict_size < dict_size_min) {
++			fprintf(stderr, "%s: -Xdict-size should be %i bytes "
++				"or larger\n", comp_name, dict_size_min);
++			goto failed;
++		}
++
++		/*
++		 * dictionary_size must be storable in xz header as either
++		 * 2^n or as  2^n+2^(n+1)
++	 	*/
++		n = ffs(options.dict_size) - 1;
++		if(options.dict_size != (1 << n) &&
++				options.dict_size != ((1 << n) + (1 << (n + 1)))) {
++			fprintf(stderr, "%s: -Xdict-size is an unsupported "
++				"value, dict-size must be storable in %s "
++				"header\n", comp_name, comp_name);
++			fprintf(stderr, "as either 2^n or as 2^n+2^(n+1).  "
++				"Example dict-sizes are 75%%, 50%%, 37.5%%, "
++				"25%%,\n");
++			fprintf(stderr, "or 32K, 16K, 8K etc.\n");
++			goto failed;
++		}
++
++	} else
++		/* No -Xdict-size specified, use defaults */
++		options.dict_size = block_size;
++
++	return 0;
++
++failed:
++	return -1;
++}
++
++static struct lzma_opts lzma_comp_opts;
++
++void *lzma_xz_dump_options(int block_size, int *size, int flags)
++{
++	/* No need to store default options */
++	if (options.preset == 6 &&
++			options.extreme == 0 &&
++			options.lc == LZMA_OPT_LC_DEFAULT &&
++			options.lp == LZMA_OPT_LC_DEFAULT &&
++			options.pb == LZMA_OPT_PB_DEFAULT &&
++			options.fb == 0 &&
++			options.dict_size == block_size &&
++			flags == 0)
++		return NULL;
++	
++	*size = sizeof(struct lzma_opts);
++
++	lzma_comp_opts.flags |= flags;
++	
++	if (options.extreme)
++		lzma_comp_opts.flags |= LZMA_OPT_EXTREME;
++	
++	lzma_comp_opts.flags |= ((options.preset << LZMA_OPT_PRE_OFF) & LZMA_OPT_PRE_MASK);
++	
++	lzma_comp_opts.bit_opts = 
++			((options.lc << LZMA_OPT_LC_OFF) & LZMA_OPT_LC_MASK) |
++			((options.lp << LZMA_OPT_LP_OFF) & LZMA_OPT_LP_MASK) |
++			((options.pb << LZMA_OPT_PB_OFF) & LZMA_OPT_PB_MASK);
++	lzma_comp_opts.fb = options.fb;
++	lzma_comp_opts.dict_size = options.dict_size;
++	
++	SQUASHFS_INSWAP_LZMA_COMP_OPTS(&lzma_comp_opts);
++	
++	return &lzma_comp_opts;
++}
++
++int lzma_xz_extract_options(int block_size, void *buffer, int size, int lzmaver)
++{
++	if (size == 0) {
++		/* default options */
++		options.preset = 6;
++		options.extreme = 0;
++		options.lc = LZMA_OPT_LC_DEFAULT;
++		options.lp = LZMA_OPT_LC_DEFAULT;
++		options.pb = LZMA_OPT_PB_DEFAULT;
++		options.fb = LZMA_OPT_FB_DEFAULT;
++		options.dict_size = block_size;
++		options.flags = 0;
++	} else {
++		struct lzma_opts *comp_opts = buffer;
++		int n;
++		
++		if (size != sizeof(struct lzma_opts))
++			goto failed;
++		
++		SQUASHFS_INSWAP_LZMA_COMP_OPTS(comp_opts);
++		
++		options.flags = comp_opts->flags & LZMA_OPT_FLT_MASK;
++		options.preset  = (comp_opts->flags & LZMA_OPT_PRE_MASK) >> LZMA_OPT_PRE_OFF;
++		options.extreme = !!(comp_opts->flags & LZMA_OPT_EXTREME);
++
++		options.lc = (comp_opts->bit_opts & LZMA_OPT_LC_MASK) >> LZMA_OPT_LC_OFF;
++		options.lp = (comp_opts->bit_opts & LZMA_OPT_LP_MASK) >> LZMA_OPT_LP_OFF;
++		options.pb = (comp_opts->bit_opts & LZMA_OPT_PB_MASK) >> LZMA_OPT_PB_OFF;
++		options.fb = comp_opts->fb;
++		options.dict_size = comp_opts->dict_size;
++		
++		/* check that the LZMA bit options are in range */
++		if (options.lc < LZMA_OPT_LC_MIN || options.lc > LZMA_OPT_LC_MAX ||
++			options.lp < LZMA_OPT_LP_MIN || options.lp > LZMA_OPT_LP_MAX ||
++			options.pb < LZMA_OPT_PB_MIN || options.pb > LZMA_OPT_PB_MAX ||
++			options.fb < LZMA_OPT_FB_MIN || options.fb > LZMA_OPT_FB_MAX)
++			goto failed;
++
++		/*
++		 * check that the dictionary size seems correct - the dictionary
++		 * size should 2^n or 2^n+2^(n+1)
++		 */
++		n = ffs(options.dict_size) - 1;
++		if(options.dict_size != (1 << n) &&
++				options.dict_size != ((1 << n) + (1 << (n + 1))))
++			goto failed;
++		
++	}
++	
++	return 0;
++
++failed:
++	fprintf(stderr, "%s: error reading stored compressor options from "
++		"filesystem!\n", lzmaver_str[lzmaver]);
++	return -1;	
++}
++
++void lzma_xz_usage(int lzmaver)
++{
++	fprintf(stderr, "\t  -Xpreset <preset>\n");
++	fprintf(stderr, "\t\tcompression preset (0-9, default 6)\n");
++	fprintf(stderr, "\t  -Xe\n");
++	fprintf(stderr, "\t\tTry to improve compression ratio by using more ");
++	fprintf(stderr, "CPU time.\n");
++	fprintf(stderr, "\t  -Xlc <lc>\n");
++	fprintf(stderr, "\t\tNumber of literal context bits (0-4, default 3)\n");
++	fprintf(stderr, "\t  -Xlp <lp>\n");
++	fprintf(stderr, "\t\tNumber of literal position bits (0-4, default 0)\n");
++	fprintf(stderr, "\t  -Xpb <pb>\n");
++	fprintf(stderr, "\t\tNumber of position bits (0-4, default 2)\n");
++	fprintf(stderr, "\t  -Xnice <nice>\n");
++	fprintf(stderr, "\t\tNice length of a match (5-273, default 64)\n");
++	fprintf(stderr, "\t  -Xdict-size <dict-size>\n");
++	fprintf(stderr, "\t\tUse <dict-size> as the %s dictionary size.  The",
++			lzmaver == LZMA_OPT_LZMA ? "LZMA" : "XZ");
++	fprintf(stderr, " dictionary size\n\t\tcan be specified as a");
++	fprintf(stderr, " percentage of the block size, or as an\n\t\t");
++	fprintf(stderr, "absolute value.  The dictionary size must be less");
++	fprintf(stderr, " than or equal\n\t\tto the block size and %d bytes", 
++			lzmaver == LZMA_OPT_LZMA ? 4096 : 8192);
++	fprintf(stderr, " or larger.  It must also be\n\t\tstorable in the lzma");
++	fprintf(stderr, " header as either 2^n or as 2^n+2^(n+1).\n\t\t");
++	fprintf(stderr, "Example dict-sizes are 75%%, 50%%, 37.5%%, 25%%, or");
++	fprintf(stderr, " 32K, 16K, 8K\n\t\tetc.\n");
++	
++}
+--- a/squashfs-tools/lzma_xz_wrapper.c
++++ b/squashfs-tools/lzma_xz_wrapper.c
+@@ -27,6 +27,7 @@
+ 
+ #include "squashfs_fs.h"
+ #include "compressor.h"
++#include "lzma_xz_options.h"
+ 
+ #define LZMA_PROPS_SIZE 5
+ #define LZMA_UNCOMP_SIZE 8
+@@ -38,13 +39,27 @@
+ static int lzma_compress(void *dummy, void *dest, void *src,  int size,
+ 	int block_size, int *error)
+ {
++	uint32_t preset;
+ 	unsigned char *d = (unsigned char *) dest;
++	struct lzma_xz_options *opts = lzma_xz_get_options();
++
+ 	lzma_options_lzma opt;
+ 	lzma_stream strm = LZMA_STREAM_INIT;
+ 	int res;
+ 
+-	lzma_lzma_preset(&opt, LZMA_OPTIONS);
+-	opt.dict_size = block_size;
++	preset = opts->preset;
++
++	if (opts->extreme)
++		preset |= LZMA_PRESET_EXTREME;
++
++	lzma_lzma_preset(&opt, opts->preset);
++	opt.lc = opts->lc;
++	opt.lp = opts->lp;
++	opt.pb = opts->pb;
++	if (opts->fb)
++		opt.nice_len = opts->fb;
++
++	opt.dict_size = opts->dict_size;
+ 
+ 	res = lzma_alone_encoder(&strm, &opt);
+ 	if(res != LZMA_OK) {
+@@ -143,13 +158,45 @@ failed:
+ 	return -1;
+ }
+ 
++static int lzma_options(char *argv[], int argc)
++{
++	return lzma_xz_options(argv, argc, LZMA_OPT_LZMA);
++}
++
++
++static int lzma_options_post(int block_size)
++{
++	return lzma_xz_options_post(block_size, LZMA_OPT_LZMA);
++}
++
++
++static void *lzma_dump_options(int block_size, int *size)
++{
++	return lzma_xz_dump_options(block_size, size, 0);
++}
++
++
++static int lzma_extract_options(int block_size, void *buffer, int size)
++{
++	return lzma_xz_extract_options(block_size, buffer, size, LZMA_OPT_LZMA);
++}
++
++
++void lzma_usage()
++{
++	lzma_xz_usage(LZMA_OPT_LZMA);
++}
++
+ 
+ struct compressor lzma_comp_ops = {
+ 	.init = NULL,
+ 	.compress = lzma_compress,
+ 	.uncompress = lzma_uncompress,
+-	.options = NULL,
+-	.usage = NULL,
++	.options = lzma_options,
++	.options_post = lzma_options_post,
++	.dump_options = lzma_dump_options,
++	.extract_options = lzma_extract_options,
++	.usage = lzma_usage,
+ 	.id = LZMA_COMPRESSION,
+ 	.name = "lzma",
+ 	.supported = 1
+--- a/squashfs-tools/xz_wrapper.h
++++ b/squashfs-tools/xz_wrapper.h
+@@ -24,25 +24,6 @@
+  *
+  */
+ 
+-#ifndef linux
+-#define __BYTE_ORDER BYTE_ORDER
+-#define __BIG_ENDIAN BIG_ENDIAN
+-#define __LITTLE_ENDIAN LITTLE_ENDIAN
+-#else
+-#include <endian.h>
+-#endif
+-
+-#if __BYTE_ORDER == __BIG_ENDIAN
+-extern unsigned int inswap_le32(unsigned int);
+-
+-#define SQUASHFS_INSWAP_COMP_OPTS(s) { \
+-	(s)->dictionary_size = inswap_le32((s)->dictionary_size); \
+-	(s)->flags = inswap_le32((s)->flags); \
+-}
+-#else
+-#define SQUASHFS_INSWAP_COMP_OPTS(s)
+-#endif
+-
+ #define MEMLIMIT (32 * 1024 * 1024)
+ 
+ struct bcj {
+--- a/squashfs-tools/xz_wrapper.c
++++ b/squashfs-tools/xz_wrapper.c
+@@ -30,6 +30,7 @@
+ #include "squashfs_fs.h"
+ #include "xz_wrapper.h"
+ #include "compressor.h"
++#include "lzma_xz_options.h"
+ 
+ static struct bcj bcj[] = {
+ 	{ "x86", LZMA_FILTER_X86, 0 },
+@@ -41,22 +42,18 @@ static struct bcj bcj[] = {
+ 	{ NULL, LZMA_VLI_UNKNOWN, 0 }
+ };
+ 
+-static struct comp_opts comp_opts;
+-
+ static int filter_count = 1;
+-static int dictionary_size = 0;
+-static float dictionary_percent = 0;
+ 
+ 
+ static int xz_options(char *argv[], int argc)
+ {
+-	int i;
+-	char *name;
+-
+ 	if(strcmp(argv[0], "-Xbcj") == 0) {
++		int i;
++		char *name;
++
+ 		if(argc < 2) {
+ 			fprintf(stderr, "xz: -Xbcj missing filter\n");
+-			goto failed;
++			return -2;
+ 		}
+ 
+ 		name = argv[1];
+@@ -76,190 +73,50 @@ static int xz_options(char *argv[], int 
+ 			}
+ 			if(bcj[i].name == NULL) {
+ 				fprintf(stderr, "xz: -Xbcj unrecognised "
+-					"filter\n");
+-				goto failed;
+-			}
+-		}
+-	
+-		return 1;
+-	} else if(strcmp(argv[0], "-Xdict-size") == 0) {
+-		char *b;
+-		float size;
+-
+-		if(argc < 2) {
+-			fprintf(stderr, "xz: -Xdict-size missing dict-size\n");
+-			goto failed;
+-		}
+-
+-		size = strtof(argv[1], &b);
+-		if(*b == '%') {
+-			if(size <= 0 || size > 100) {
+-				fprintf(stderr, "xz: -Xdict-size percentage "
+-					"should be 0 < dict-size <= 100\n");
+-				goto failed;
+-			}
+-
+-			dictionary_percent = size;
+-			dictionary_size = 0;
+-		} else {
+-			if((float) ((int) size) != size) {
+-				fprintf(stderr, "xz: -Xdict-size can't be "
+-					"fractional unless a percentage of the"
+-					" block size\n");
+-				goto failed;
+-			}
+-
+-			dictionary_percent = 0;
+-			dictionary_size = (int) size;
+-
+-			if(*b == 'k' || *b == 'K')
+-				dictionary_size *= 1024;
+-			else if(*b == 'm' || *b == 'M')
+-				dictionary_size *= 1024 * 1024;
+-			else if(*b != '\0') {
+-				fprintf(stderr, "xz: -Xdict-size invalid "
+-					"dict-size\n");
+-				goto failed;
++						"filter\n");
++				return -2;
+ 			}
+ 		}
+-
+ 		return 1;
++	} else {
++		return lzma_xz_options(argv, argc, LZMA_OPT_XZ);
+ 	}
+-
+-	return -1;
+-	
+-failed:
+-	return -2;
+ }
+ 
+ 
+ static int xz_options_post(int block_size)
+ {
+-	/*
+-	 * if -Xdict-size has been specified use this to compute the datablock
+-	 * dictionary size
+-	 */
+-	if(dictionary_size || dictionary_percent) {
+-		int n;
+-
+-		if(dictionary_size) {
+-			if(dictionary_size > block_size) {
+-				fprintf(stderr, "xz: -Xdict-size is larger than"
+-				" block_size\n");
+-				goto failed;
+-			}
+-		} else
+-			dictionary_size = block_size * dictionary_percent / 100;
+-
+-		if(dictionary_size < 8192) {
+-			fprintf(stderr, "xz: -Xdict-size should be 8192 bytes "
+-				"or larger\n");
+-			goto failed;
+-		}
+-
+-		/*
+-		 * dictionary_size must be storable in xz header as either
+-		 * 2^n or as  2^n+2^(n+1)
+-	 	*/
+-		n = ffs(dictionary_size) - 1;
+-		if(dictionary_size != (1 << n) && 
+-				dictionary_size != ((1 << n) + (1 << (n + 1)))) {
+-			fprintf(stderr, "xz: -Xdict-size is an unsupported "
+-				"value, dict-size must be storable in xz "
+-				"header\n");
+-			fprintf(stderr, "as either 2^n or as 2^n+2^(n+1).  "
+-				"Example dict-sizes are 75%%, 50%%, 37.5%%, "
+-				"25%%,\n");
+-			fprintf(stderr, "or 32K, 16K, 8K etc.\n");
+-			goto failed;
+-		}
+-
+-	} else
+-		/* No -Xdict-size specified, use defaults */
+-		dictionary_size = block_size;
+-
+-	return 0;
+-
+-failed:
+-	return -1;
++	return lzma_xz_options_post(block_size, LZMA_OPT_XZ);
+ }
+ 
+ 
+ static void *xz_dump_options(int block_size, int *size)
+ {
+-	int flags = 0, i;
+-
+-	/*
+-	 * don't store compressor specific options in file system if the
+-	 * default options are being used - no compressor options in the
+-	 * file system means the default options are always assumed
+-	 *
+-	 * Defaults are:
+-	 *  metadata dictionary size: SQUASHFS_METADATA_SIZE
+-	 *  datablock dictionary size: block_size
+-	 *  1 filter
+-	 */
+-	if(dictionary_size == block_size && filter_count == 1)
+-		return NULL;
++	int i, flags = 0;
+ 
+ 	for(i = 0; bcj[i].name; i++)
+ 		flags |= bcj[i].selected << i;
+ 
+-	comp_opts.dictionary_size = dictionary_size;
+-	comp_opts.flags = flags;
+-
+-	SQUASHFS_INSWAP_COMP_OPTS(&comp_opts);
+-
+-	*size = sizeof(comp_opts);
+-	return &comp_opts;
++	return lzma_xz_dump_options(block_size, size, flags);
+ }
+ 
+ 
+ static int xz_extract_options(int block_size, void *buffer, int size)
+ {
+-	struct comp_opts *comp_opts = buffer;
+-	int flags, i, n;
+-
+-	if(size == 0) {
+-		/* set defaults */
+-		dictionary_size = block_size;
+-		flags = 0;
+-	} else {
+-		/* check passed comp opts struct is of the correct length */
+-		if(size != sizeof(struct comp_opts))
+-			goto failed;
+-					 
+-		SQUASHFS_INSWAP_COMP_OPTS(comp_opts);
+-
+-		dictionary_size = comp_opts->dictionary_size;
+-		flags = comp_opts->flags;
+-
+-		/*
+-		 * check that the dictionary size seems correct - the dictionary
+-		 * size should 2^n or 2^n+2^(n+1)
+-		 */
+-		n = ffs(dictionary_size) - 1;
+-		if(dictionary_size != (1 << n) && 
+-				dictionary_size != ((1 << n) + (1 << (n + 1))))
+-			goto failed;
+-	}
++	int ret = lzma_xz_extract_options(block_size, buffer, size, LZMA_OPT_XZ);
+ 
+-	filter_count = 1;
+-	for(i = 0; bcj[i].name; i++) {
+-		if((flags >> i) & 1) {
+-			bcj[i].selected = 1;
+-			filter_count ++;
+-		} else
+-			bcj[i].selected = 0;
++	if (!ret) {
++		int i;
++		struct lzma_xz_options *opts = lzma_xz_get_options();
++		for(i = 0; bcj[i].name; i++) {
++			if((opts->flags >> i) & 1) {
++				bcj[i].selected = 1;
++				filter_count ++;
++			} else
++				bcj[i].selected = 0;
++		}
+ 	}
+-
+-	return 0;
+-
+-failed:
+-	fprintf(stderr, "xz: error reading stored compressor options from "
+-		"filesystem!\n");
+-
+-	return -1;
++	return ret;
+ }
+ 
+ 
+@@ -268,6 +125,7 @@ static int xz_init(void **strm, int bloc
+ 	int i, j, filters = datablock ? filter_count : 1;
+ 	struct filter *filter = malloc(filters * sizeof(struct filter));
+ 	struct xz_stream *stream;
++	struct lzma_xz_options *opts = lzma_xz_get_options();
+ 
+ 	if(filter == NULL)
+ 		goto failed;
+@@ -281,7 +139,7 @@ static int xz_init(void **strm, int bloc
+ 
+ 	memset(filter, 0, filters * sizeof(struct filter));
+ 
+-	stream->dictionary_size = datablock ? dictionary_size :
++	stream->dictionary_size = datablock ? opts->dict_size :
+ 		SQUASHFS_METADATA_SIZE;
+ 
+ 	filter[0].filter[0].id = LZMA_FILTER_LZMA2;
+@@ -323,14 +181,25 @@ static int xz_compress(void *strm, void 
+         lzma_ret res = 0;
+ 	struct xz_stream *stream = strm;
+ 	struct filter *selected = NULL;
++	struct lzma_xz_options *opts = lzma_xz_get_options();
+ 
+ 	stream->filter[0].buffer = dest;
+ 
+ 	for(i = 0; i < stream->filters; i++) {
++		uint32_t preset = opts->preset;
+ 		struct filter *filter = &stream->filter[i];
+ 
+-        	if(lzma_lzma_preset(&stream->opt, LZMA_PRESET_DEFAULT))
+-                	goto failed;
++		if (opts->extreme)
++			preset |= LZMA_PRESET_EXTREME;
++
++        if(lzma_lzma_preset(&stream->opt, preset))
++               	goto failed;
++
++        stream->opt.lc = opts->lc;
++    	stream->opt.lp = opts->lp;
++    	stream->opt.pb = opts->pb;
++    	if (opts->fb)
++    		stream->opt.nice_len = opts->fb;
+ 
+ 		stream->opt.dict_size = stream->dictionary_size;
+ 
+@@ -384,22 +253,13 @@ static int xz_uncompress(void *dest, voi
+ 
+ void xz_usage()
+ {
++	lzma_xz_usage(LZMA_OPT_XZ);
+ 	fprintf(stderr, "\t  -Xbcj filter1,filter2,...,filterN\n");
+ 	fprintf(stderr, "\t\tCompress using filter1,filter2,...,filterN in");
+ 	fprintf(stderr, " turn\n\t\t(in addition to no filter), and choose");
+ 	fprintf(stderr, " the best compression.\n");
+ 	fprintf(stderr, "\t\tAvailable filters: x86, arm, armthumb,");
+ 	fprintf(stderr, " powerpc, sparc, ia64\n");
+-	fprintf(stderr, "\t  -Xdict-size <dict-size>\n");
+-	fprintf(stderr, "\t\tUse <dict-size> as the XZ dictionary size.  The");
+-	fprintf(stderr, " dictionary size\n\t\tcan be specified as a");
+-	fprintf(stderr, " percentage of the block size, or as an\n\t\t");
+-	fprintf(stderr, "absolute value.  The dictionary size must be less");
+-	fprintf(stderr, " than or equal\n\t\tto the block size and 8192 bytes");
+-	fprintf(stderr, " or larger.  It must also be\n\t\tstorable in the xz");
+-	fprintf(stderr, " header as either 2^n or as 2^n+2^(n+1).\n\t\t");
+-	fprintf(stderr, "Example dict-sizes are 75%%, 50%%, 37.5%%, 25%%, or");
+-	fprintf(stderr, " 32K, 16K, 8K\n\t\tetc.\n");
+ }
+ 
+ 
+--- a/squashfs-tools/Makefile
++++ b/squashfs-tools/Makefile
+@@ -140,6 +140,8 @@ COMPRESSORS += xz
+ endif
+ 
+ ifneq ($(LZMA_XZ_SUPPORT)$(XZ_SUPPORT),)
++MKSQUASHFS_OBJS += lzma_xz_options.o
++UNSQUASHFS_OBJS += lzma_xz_options.o
+ ifneq ($(LZMA_LIB),)
+ MKSQUASHFS_OBJS += $(LZMA_LIB)
+ UNSQUASHFS_OBJS += $(LZMA_LIB)
diff --git a/trunk/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch b/trunk/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch
new file mode 100644
index 00000000..ad69b190
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch
@@ -0,0 +1,72 @@
+--- a/squashfs-tools/squashfs_fs.h
++++ b/squashfs-tools/squashfs_fs.h
+@@ -30,6 +30,13 @@
+ #define SQUASHFS_MAGIC_SWAP		0x68737173
+ #define SQUASHFS_START			0
+ 
++/*
++ * Squashfs + LZMA
++ */
++
++#define SQUASHFS_MAGIC_LZMA		0x71736873
++#define SQUASHFS_MAGIC_LZMA_SWAP	0x73687371
++
+ /* size of metadata (inode and directory) blocks */
+ #define SQUASHFS_METADATA_SIZE		8192
+ #define SQUASHFS_METADATA_LOG		13
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -1463,10 +1463,12 @@ int read_super(char *source)
+ 	 */
+ 	read_fs_bytes(fd, SQUASHFS_START, sizeof(struct squashfs_super_block),
+ 		&sBlk_4);
+-	swap = sBlk_4.s_magic != SQUASHFS_MAGIC;
++	swap = (sBlk_4.s_magic != SQUASHFS_MAGIC &&
++		sBlk_4.s_magic != SQUASHFS_MAGIC_LZMA);
+ 	SQUASHFS_INSWAP_SUPER_BLOCK(&sBlk_4);
+ 
+-	if(sBlk_4.s_magic == SQUASHFS_MAGIC && sBlk_4.s_major == 4 &&
++	if((sBlk_4.s_magic == SQUASHFS_MAGIC || 
++	   sBlk_4.s_magic == SQUASHFS_MAGIC_LZMA) && sBlk_4.s_major == 4 &&
+ 			sBlk_4.s_minor == 0) {
+ 		s_ops.squashfs_opendir = squashfs_opendir_4;
+ 		s_ops.read_fragment = read_fragment_4;
+@@ -1479,7 +1481,11 @@ int read_super(char *source)
+ 		/*
+ 		 * Check the compression type
+ 		 */
+-		comp = lookup_compressor_id(sBlk.s.compression);
++		if (sBlk_4.s_magic == SQUASHFS_MAGIC_LZMA)
++			comp = lookup_compressor("lzma");
++		else
++			comp = lookup_compressor_id(sBlk.s.compression);
++
+ 		return TRUE;
+ 	}
+ 
+@@ -1494,8 +1500,10 @@ int read_super(char *source)
+ 	 * Check it is a SQUASHFS superblock
+ 	 */
+ 	swap = 0;
+-	if(sBlk_3.s_magic != SQUASHFS_MAGIC) {
+-		if(sBlk_3.s_magic == SQUASHFS_MAGIC_SWAP) {
++	if(sBlk_3.s_magic != SQUASHFS_MAGIC && 
++			sBlk_3.s_magic != SQUASHFS_MAGIC_LZMA) {
++		if(sBlk_3.s_magic == SQUASHFS_MAGIC_SWAP || 
++				sBlk_3.s_magic == SQUASHFS_MAGIC_LZMA_SWAP) {
+ 			squashfs_super_block_3 sblk;
+ 			ERROR("Reading a different endian SQUASHFS filesystem "
+ 				"on %s\n", source);
+@@ -1573,7 +1581,11 @@ int read_super(char *source)
+ 	/*
+ 	 * 1.x, 2.x and 3.x filesystems use gzip compression.
+ 	 */
+-	comp = lookup_compressor("gzip");
++	if (sBlk.s.s_magic == SQUASHFS_MAGIC_LZMA)
++		comp = lookup_compressor("lzma");
++	else
++		comp = lookup_compressor("gzip");
++
+ 	return TRUE;
+ 
+ failed_mount:
diff --git a/trunk/tools/squashfs4/patches/180-openbsd_compat.patch b/trunk/tools/squashfs4/patches/180-openbsd_compat.patch
new file mode 100644
index 00000000..6d7a857a
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/180-openbsd_compat.patch
@@ -0,0 +1,26 @@
+diff -Nur squashfs4.2.orig/squashfs-tools/mksquashfs.c squashfs4.2/squashfs-tools/mksquashfs.c
+--- squashfs4.2.orig/squashfs-tools/mksquashfs.c	Tue Mar  5 16:20:49 2013
++++ squashfs4.2/squashfs-tools/mksquashfs.c	Tue Mar  5 16:25:10 2013
+@@ -32,6 +32,9 @@
+ #include <stdio.h>
+ #include <stddef.h>
+ #include <sys/time.h>
++#if defined(__OpenBSD__)
++#include <sys/param.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+diff -Nur squashfs4.2.orig/squashfs-tools/unsquashfs.h squashfs4.2/squashfs-tools/unsquashfs.h
+--- squashfs4.2.orig/squashfs-tools/unsquashfs.h	Tue Mar  5 16:20:49 2013
++++ squashfs4.2/squashfs-tools/unsquashfs.h	Tue Mar  5 16:25:57 2013
+@@ -25,6 +25,9 @@
+ #define TRUE 1
+ #define FALSE 0
+ #include <stdio.h>
++#if defined(__OpenBSD__)
++#include <sys/param.h>
++#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/trunk/tools/squashfs4/patches/190-no_nonstatic_inline.patch b/trunk/tools/squashfs4/patches/190-no_nonstatic_inline.patch
new file mode 100644
index 00000000..7b5808af
--- /dev/null
+++ b/trunk/tools/squashfs4/patches/190-no_nonstatic_inline.patch
@@ -0,0 +1,36 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -735,13 +735,13 @@ void cache_block_put(struct file_buffer 
+ 			+ (((char *)A) - data_cache)))
+ 
+ 
+-inline void inc_progress_bar()
++static inline void inc_progress_bar()
+ {
+ 	cur_uncompressed ++;
+ }
+ 
+ 
+-inline void update_progress_bar()
++static inline void update_progress_bar()
+ {
+ 	pthread_mutex_lock(&progress_mutex);
+ 	pthread_cond_signal(&progress_wait);
+@@ -749,7 +749,7 @@ inline void update_progress_bar()
+ }
+ 
+ 
+-inline void waitforthread(int i)
++static inline void waitforthread(int i)
+ {
+ 	TRACE("Waiting for thread %d\n", i);
+ 	while(thread[i] != 0)
+@@ -3358,7 +3358,7 @@ struct inode_info *lookup_inode(struct s
+ }
+ 
+ 
+-inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
++static inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
+ 	struct inode_info *inode_info, struct dir_info *dir)
+ {
+ 	if((dir->count % DIR_ENTRIES) == 0) {
diff --git a/trunk/tools/sstrip/Makefile b/trunk/tools/sstrip/Makefile
new file mode 100644
index 00000000..045d0807
--- /dev/null
+++ b/trunk/tools/sstrip/Makefile
@@ -0,0 +1,25 @@
+# 
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sstrip
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	$(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/sstrip src/sstrip.c
+endef
+
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/sstrip $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/sstrip
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/sstrip/src/sstrip.c b/trunk/tools/sstrip/src/sstrip.c
new file mode 100644
index 00000000..0508aaac
--- /dev/null
+++ b/trunk/tools/sstrip/src/sstrip.c
@@ -0,0 +1,465 @@
+/* http://www.muppetlabs.com/~breadbox/software/elfkickers.html */
+
+/* sstrip: Copyright (C) 1999-2001 by Brian Raiter, under the GNU
+ * General Public License. No warranty. See COPYING for details.
+ *
+ * Aug 23, 2004 Hacked by Manuel Novoa III <mjn3@codepoet.org> to
+ * handle targets of different endianness and/or elf class, making
+ * it more useful in a cross-devel environment.
+ */
+
+/* ============== original README ===================
+ *
+ * sstrip is a small utility that removes the contents at the end of an
+ * ELF file that are not part of the program's memory image.
+ * 
+ * Most ELF executables are built with both a program header table and a
+ * section header table. However, only the former is required in order
+ * for the OS to load, link and execute a program. sstrip attempts to
+ * extract the ELF header, the program header table, and its contents,
+ * leaving everything else in the bit bucket. It can only remove parts of
+ * the file that occur at the end, after the parts to be saved. However,
+ * this almost always includes the section header table, and occasionally
+ * a few random sections that are not used when running a program.
+ * 
+ * It should be noted that the GNU bfd library is (understandably)
+ * dependent on the section header table as an index to the file's
+ * contents. Thus, an executable file that has no section header table
+ * cannot be used with gdb, objdump, or any other program based upon the
+ * bfd library, at all. In fact, the program will not even recognize the
+ * file as a valid executable. (This limitation is noted in the source
+ * code comments for bfd, and is marked "FIXME", so this may change at
+ * some future date. However, I would imagine that it is a pretty
+ * low-priority item, as executables without a section header table are
+ * rare in the extreme.) This probably also explains why strip doesn't
+ * offer the option to do this.
+ * 
+ * Shared library files may also have their section header table removed.
+ * Such a library will still function; however, it will no longer be
+ * possible for a compiler to link a new program against it.
+ * 
+ * As an added bonus, sstrip also tries to removes trailing zero bytes
+ * from the end of the file. (This normally cannot be done with an
+ * executable that has a section header table.)
+ * 
+ * sstrip is a very simplistic program. It depends upon the common
+ * practice of putting the parts of the file that contribute to the
+ * memory image at the front, and the remaining material at the end. This
+ * permits it to discard the latter material without affecting file
+ * offsets and memory addresses in what remains. Of course, the ELF
+ * standard permits files to be organized in almost any order, so if a
+ * pathological linker decided to put its section headers at the top,
+ * sstrip would be useless on such executables.
+ */
+
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<errno.h>
+#include	<unistd.h>
+#include	<fcntl.h>
+#include	<elf.h>
+
+#ifndef TRUE
+#define	TRUE		1
+#define	FALSE		0
+#endif
+
+/* The name of the program.
+ */
+static char const	*progname;
+
+/* The name of the current file.
+ */
+static char const	*filename;
+
+
+/* A simple error-handling function. FALSE is always returned for the
+ * convenience of the caller.
+ */
+static int err(char const *errmsg)
+{
+	fprintf(stderr, "%s: %s: %s\n", progname, filename, errmsg);
+	return FALSE;
+}
+
+/* A flag to signal the need for endian reversal.
+ */
+static int do_reverse_endian;
+
+/* Get a value from the elf header, compensating for endianness.
+ */
+#define EGET(X) \
+	(__extension__ ({ \
+		uint64_t __res; \
+		if (!do_reverse_endian) { \
+			__res = (X); \
+		} else if (sizeof(X) == 1) { \
+			__res = (X); \
+		} else if (sizeof(X) == 2) { \
+			__res = bswap_16((X)); \
+		} else if (sizeof(X) == 4) { \
+			__res = bswap_32((X)); \
+		} else if (sizeof(X) == 8) { \
+			__res = bswap_64((X)); \
+		} else { \
+			fprintf(stderr, "%s: %s: EGET failed for size %d\n", \
+					progname, filename, sizeof(X)); \
+			exit(EXIT_FAILURE); \
+		} \
+		__res; \
+	}))
+
+/* Set a value 'Y' in the elf header to 'X', compensating for endianness.
+ */
+#define ESET(Y,X) \
+		do if (!do_reverse_endian) { \
+			Y = (X); \
+		} else if (sizeof(Y) == 1) { \
+			Y = (X); \
+		} else if (sizeof(Y) == 2) { \
+			Y = bswap_16((uint16_t)(X)); \
+		} else if (sizeof(Y) == 4) { \
+			Y = bswap_32((uint32_t)(X)); \
+		} else if (sizeof(Y) == 8) { \
+			Y = bswap_64((uint64_t)(X)); \
+		} else { \
+			fprintf(stderr, "%s: %s: ESET failed for size %d\n", \
+					progname, filename, sizeof(Y)); \
+			exit(EXIT_FAILURE); \
+		} while (0)
+
+
+/* A macro for I/O errors: The given error message is used only when
+ * errno is not set.
+ */
+#define	ferr(msg)	(err(errno ? strerror(errno) : (msg)))
+
+
+
+#define HEADER_FUNCTIONS(CLASS) \
+ \
+/* readelfheader() reads the ELF header into our global variable, and \
+ * checks to make sure that this is in fact a file that we should be \
+ * munging. \
+ */ \
+static int readelfheader ## CLASS (int fd, Elf ## CLASS ## _Ehdr *ehdr) \
+{ \
+	 if (read(fd, ((char *)ehdr)+EI_NIDENT, sizeof(*ehdr) - EI_NIDENT) \
+		!= sizeof(*ehdr) - EI_NIDENT) \
+		return ferr("missing or incomplete ELF header."); \
+ \
+	/* Verify the sizes of the ELF header and the program segment \
+	 * header table entries. \
+	 */ \
+	if (EGET(ehdr->e_ehsize) != sizeof(Elf ## CLASS ## _Ehdr)) \
+		return err("unrecognized ELF header size."); \
+	if (EGET(ehdr->e_phentsize) != sizeof(Elf ## CLASS ## _Phdr)) \
+		return err("unrecognized program segment header size."); \
+ \
+	/* Finally, check the file type. \
+	 */ \
+	if (EGET(ehdr->e_type) != ET_EXEC && EGET(ehdr->e_type) != ET_DYN) \
+		return err("not an executable or shared-object library."); \
+ \
+	return TRUE; \
+} \
+ \
+/* readphdrtable() loads the program segment header table into memory. \
+ */ \
+static int readphdrtable ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
+								   Elf ## CLASS ## _Phdr **phdrs) \
+{ \
+	size_t	size; \
+ \
+	if (!EGET(ehdr->e_phoff) || !EGET(ehdr->e_phnum) \
+)		return err("ELF file has no program header table."); \
+ \
+	size = EGET(ehdr->e_phnum) * sizeof **phdrs; \
+	if (!(*phdrs = malloc(size))) \
+		return err("Out of memory!"); \
+ \
+	errno = 0; \
+	if (read(fd, *phdrs, size) != (ssize_t)size) \
+		return ferr("missing or incomplete program segment header table."); \
+ \
+	return TRUE; \
+} \
+ \
+/* getmemorysize() determines the offset of the last byte of the file \
+ * that is referenced by an entry in the program segment header table. \
+ * (Anything in the file after that point is not used when the program \
+ * is executing, and thus can be safely discarded.) \
+ */ \
+static int getmemorysize ## CLASS (Elf ## CLASS ## _Ehdr const *ehdr, \
+								   Elf ## CLASS ## _Phdr const *phdrs, \
+						 unsigned long *newsize) \
+{ \
+	Elf ## CLASS ## _Phdr const   *phdr; \
+	unsigned long	size, n; \
+	int			i; \
+ \
+	/* Start by setting the size to include the ELF header and the \
+	 * complete program segment header table. \
+	 */ \
+	size = EGET(ehdr->e_phoff) + EGET(ehdr->e_phnum) * sizeof *phdrs; \
+	if (size < sizeof *ehdr) \
+		size = sizeof *ehdr; \
+ \
+	/* Then keep extending the size to include whatever data the \
+	 * program segment header table references. \
+	 */ \
+	for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \
+		if (EGET(phdr->p_type) != PT_NULL) { \
+			n = EGET(phdr->p_offset) + EGET(phdr->p_filesz); \
+			if (n > size) \
+				size = n; \
+		} \
+	} \
+ \
+	*newsize = size; \
+	return TRUE; \
+} \
+ \
+/* modifyheaders() removes references to the section header table if \
+ * it was stripped, and reduces program header table entries that \
+ * included truncated bytes at the end of the file. \
+ */ \
+static int modifyheaders ## CLASS (Elf ## CLASS ## _Ehdr *ehdr, \
+								   Elf ## CLASS ## _Phdr *phdrs, \
+								   unsigned long newsize) \
+{ \
+	Elf ## CLASS ## _Phdr *phdr; \
+	int		i; \
+ \
+	/* If the section header table is gone, then remove all references \
+	 * to it in the ELF header. \
+	 */ \
+	if (EGET(ehdr->e_shoff) >= newsize) { \
+		ESET(ehdr->e_shoff,0); \
+		ESET(ehdr->e_shnum,0); \
+		ESET(ehdr->e_shentsize,0); \
+		ESET(ehdr->e_shstrndx,0); \
+	} \
+ \
+	/* The program adjusts the file size of any segment that was \
+	 * truncated. The case of a segment being completely stripped out \
+	 * is handled separately. \
+	 */ \
+	for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \
+		if (EGET(phdr->p_offset) >= newsize) { \
+			ESET(phdr->p_offset,newsize); \
+			ESET(phdr->p_filesz,0); \
+		} else if (EGET(phdr->p_offset) + EGET(phdr->p_filesz) > newsize) { \
+			ESET(phdr->p_filesz, newsize - EGET(phdr->p_offset)); \
+		} \
+	} \
+ \
+	return TRUE; \
+} \
+ \
+/* commitchanges() writes the new headers back to the original file \
+ * and sets the file to its new size. \
+ */ \
+static int commitchanges ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
+								   Elf ## CLASS ## _Phdr *phdrs, \
+								   unsigned long newsize) \
+{ \
+	size_t	n; \
+ \
+	/* Save the changes to the ELF header, if any. \
+	 */ \
+	if (lseek(fd, 0, SEEK_SET)) \
+		return ferr("could not rewind file"); \
+	errno = 0; \
+	if (write(fd, ehdr, sizeof *ehdr) != sizeof *ehdr) \
+		return err("could not modify file"); \
+ \
+	/* Save the changes to the program segment header table, if any. \
+	 */ \
+	if (lseek(fd, EGET(ehdr->e_phoff), SEEK_SET) == (off_t)-1) { \
+		err("could not seek in file."); \
+		goto warning; \
+	} \
+	n = EGET(ehdr->e_phnum) * sizeof *phdrs; \
+	if (write(fd, phdrs, n) != (ssize_t)n) { \
+		err("could not write to file"); \
+		goto warning; \
+	} \
+ \
+	/* Eleventh-hour sanity check: don't truncate before the end of \
+	 * the program segment header table. \
+	 */ \
+	if (newsize < EGET(ehdr->e_phoff) + n) \
+		newsize = EGET(ehdr->e_phoff) + n; \
+ \
+	/* Chop off the end of the file. \
+	 */ \
+	if (ftruncate(fd, newsize)) { \
+		err("could not resize file"); \
+		goto warning; \
+	} \
+ \
+	return TRUE; \
+ \
+ warning: \
+	return err("ELF file may have been corrupted!"); \
+}
+
+
+/* First elements of Elf32_Ehdr and Elf64_Ehdr are common.
+ */
+static int readelfheaderident(int fd, Elf32_Ehdr *ehdr)
+{
+	errno = 0;
+	if (read(fd, ehdr, EI_NIDENT) != EI_NIDENT)
+		return ferr("missing or incomplete ELF header.");
+
+	/* Check the ELF signature.
+	 */
+	if (!(ehdr->e_ident[EI_MAG0] == ELFMAG0 &&
+		  ehdr->e_ident[EI_MAG1] == ELFMAG1 &&
+		  ehdr->e_ident[EI_MAG2] == ELFMAG2 &&
+		  ehdr->e_ident[EI_MAG3] == ELFMAG3))
+	{
+		err("missing ELF signature.");
+		return -1;
+	}
+
+	/* Compare the file's class and endianness with the program's.
+	 */
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
+		do_reverse_endian = 0;
+	} else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
+/* 		fprintf(stderr, "ELF file has different endianness.\n"); */
+		do_reverse_endian = 1;
+	}
+#elif __BYTE_ORDER == __BIG_ENDIAN
+	if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
+/* 		fprintf(stderr, "ELF file has different endianness.\n"); */
+		do_reverse_endian = 1;
+	} else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
+		do_reverse_endian = 0;
+	}
+#else
+#error unkown endianness
+#endif
+	else {
+		err("Unsupported endianness");
+		return -1;
+	}
+
+	/* Check the target architecture.
+	 */
+/*	 if (EGET(ehdr->e_machine) != ELF_ARCH) { */
+/* 		/\* return err("ELF file created for different architecture."); *\/ */
+/* 		fprintf(stderr, "ELF file created for different architecture.\n"); */
+/* 	} */
+	return ehdr->e_ident[EI_CLASS];
+}
+
+
+HEADER_FUNCTIONS(32)
+
+HEADER_FUNCTIONS(64)
+
+/* truncatezeros() examines the bytes at the end of the file's
+ * size-to-be, and reduces the size to exclude any trailing zero
+ * bytes.
+ */
+static int truncatezeros(int fd, unsigned long *newsize)
+{
+	unsigned char	contents[1024];
+	unsigned long	size, n;
+
+	size = *newsize;
+	do {
+		n = sizeof contents;
+		if (n > size)
+			n = size;
+		if (lseek(fd, size - n, SEEK_SET) == (off_t)-1)
+			return ferr("cannot seek in file.");
+		if (read(fd, contents, n) != (ssize_t)n)
+			return ferr("cannot read file contents");
+		while (n && !contents[--n])
+			--size;
+	} while (size && !n);
+
+	/* Sanity check.
+	 */
+	if (!size)
+		return err("ELF file is completely blank!");
+
+	*newsize = size;
+	return TRUE;
+}
+
+/* main() loops over the cmdline arguments, leaving all the real work
+ * to the other functions.
+ */
+int main(int argc, char *argv[])
+{
+	int				fd;
+	union {
+		Elf32_Ehdr	ehdr32;
+		Elf64_Ehdr	ehdr64;
+	} e;
+	union {
+		Elf32_Phdr	*phdrs32;
+		Elf64_Phdr	*phdrs64;
+	} p;
+	unsigned long	newsize;
+	char			**arg;
+	int				failures = 0;
+
+	if (argc < 2 || argv[1][0] == '-') {
+		printf("Usage: sstrip FILE...\n"
+			   "sstrip discards all nonessential bytes from an executable.\n\n"
+			   "Version 2.0-X Copyright (C) 2000,2001 Brian Raiter.\n"
+			   "Cross-devel hacks Copyright (C) 2004 Manuel Novoa III.\n"
+			   "This program is free software, licensed under the GNU\n"
+			   "General Public License. There is absolutely no warranty.\n");
+		return EXIT_SUCCESS;
+	}
+
+	progname = argv[0];
+
+	for (arg = argv + 1 ; *arg != NULL ; ++arg) {
+		filename = *arg;
+
+		fd = open(*arg, O_RDWR);
+		if (fd < 0) {
+			ferr("can't open");
+			++failures;
+			continue;
+		}
+
+		switch (readelfheaderident(fd, &e.ehdr32)) {
+			case ELFCLASS32:
+				if (!(readelfheader32(fd, &e.ehdr32)					&&
+					  readphdrtable32(fd, &e.ehdr32, &p.phdrs32)		&&
+					  getmemorysize32(&e.ehdr32, p.phdrs32, &newsize)	&&
+					  truncatezeros(fd, &newsize)						&&
+					  modifyheaders32(&e.ehdr32, p.phdrs32, newsize)	&&
+					  commitchanges32(fd, &e.ehdr32, p.phdrs32, newsize)))
+					++failures;
+				break;
+			case ELFCLASS64:
+				if (!(readelfheader64(fd, &e.ehdr64)					&&
+					  readphdrtable64(fd, &e.ehdr64, &p.phdrs64)		&&
+					  getmemorysize64(&e.ehdr64, p.phdrs64, &newsize)	&&
+					  truncatezeros(fd, &newsize)						&&
+					  modifyheaders64(&e.ehdr64, p.phdrs64, newsize)	&&
+					  commitchanges64(fd, &e.ehdr64, p.phdrs64, newsize)))
+					++failures;
+				break;
+			default:
+				++failures;
+				break;
+		}
+		close(fd);
+	}
+
+	return failures ? EXIT_FAILURE : EXIT_SUCCESS;
+}
diff --git a/trunk/tools/upslug2/Makefile b/trunk/tools/upslug2/Makefile
new file mode 100644
index 00000000..e80cef0e
--- /dev/null
+++ b/trunk/tools/upslug2/Makefile
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=upslug2
+PKG_VERSION:=20071227
+
+PKG_SOURCE_URL:=http://svn.nslu2-linux.org/svnroot/upslug2/trunk
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_SUBDIR:=upslug2-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=41
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include $(INCLUDE_DIR)/host-build.mk
+
+unexport CFLAGS
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
+		aclocal && autoconf && \
+		autoheader && \
+		automake --add-missing; \
+	)
+	$(Host/Configure/Default)
+endef
+
+ifneq ($(HOST_OS),Linux)
+	HOST_CONFIGURE_ARGS += --with-libpcap
+endif
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/upslug2/patches/100-libpcap_fix.patch b/trunk/tools/upslug2/patches/100-libpcap_fix.patch
new file mode 100644
index 00000000..1e14de45
--- /dev/null
+++ b/trunk/tools/upslug2/patches/100-libpcap_fix.patch
@@ -0,0 +1,153 @@
+--- a/pcap_wire.cc
++++ b/pcap_wire.cc
+@@ -18,6 +18,7 @@
+ 
+ #include <sys/time.h>
+ #include <sys/select.h>
++#include <sys/poll.h>
+ 
+ /* Ways of finding the hardware MAC on this machine... */
+ /* This is the Linux only fallback. */
+@@ -130,20 +131,18 @@ namespace NSLU2Upgrade {
+ 		 * non-static (real) Handler.
+ 		 */
+ 		void Handler(const struct pcap_pkthdr *packet_header, const u_char *packet) {
+-			/* This should only be called once... */
+-			if (captured)
+-				throw std::logic_error("Handler called twice");
+-
+ 			/* Verify the protocol and originating address of the packet, then
+ 			 * return this packet.
+ 			 */
++			if (captured)
++				return;
+ 			if (packet_header->caplen > 14 && (broadcast ||
+ 				std::memcmp(packet+6, header, 6) == 0)) {
+-				/* Record the address and copy the data */
+-				std::memcpy(source, packet+6, 6);
+ 				const size_t len(packet_header->caplen - 14);
+ 				if (len > captureSize)
+-					throw std::logic_error("packet too long");
++					return;
++				/* Record the address and copy the data */
++				std::memcpy(source, packet+6, 6);
+ 				std::memcpy(captureBuffer, packet+14, len);
+ 				captureSize = len;
+ 				captured = true;
+@@ -156,7 +155,7 @@ namespace NSLU2Upgrade {
+ 			 * packet and the buffer should be big enough.
+ 			 */
+ 			if (packet_header->caplen < packet_header->len)
+-				throw std::logic_error("truncated packet");
++				return;
+ 
+ 			/*IGNORE EVIL: known evil cast */
+ 			reinterpret_cast<PCapWire*>(user)->Handler(packet_header, packet);
+@@ -173,56 +172,24 @@ namespace NSLU2Upgrade {
+ 		virtual void Receive(void *buffer, size_t &size, unsigned long timeout) {
+ 			/* Now try to read packets until the timeout has been consumed.
+ 			 */
+-			struct timeval tvStart;
+-			if (timeout > 0 && gettimeofday(&tvStart, 0) != 0)
+-				throw OSError(errno, "gettimeofday(base)");
++			int time_count;
+ 
+ 			captureBuffer = buffer;
+ 			captureSize = size;
+ 			captured = false;
++			time_count = timeout / 2000; /* 2 ms intervals */
++			time_count++;
+ 			do {
+ 				/*IGNORE EVIL: known evil cast */
+-				int count(pcap_dispatch(pcap, 1, PCapHandler,
+-							reinterpret_cast<u_char*>(this)));
++				int count = pcap_dispatch(pcap, 1, PCapHandler,
++							reinterpret_cast<u_char*>(this));
+ 
+-				if (count > 0) {
+-					/* Were any packets handled? */
+-					if (captured) {
+-						size = captureSize;
+-						return;
+-					}
+-					/* else try again. */
+-				} else if (count == 0) {
+-					/* Nothing to handle - do the timeout, do this
+-					 * by waiting a bit then trying again, the trick
+-					 * to this is to work out how long to wait each
+-					 * time, for the moment a 10ms delay is used.
+-					 */
+-					if (timeout == 0)
+-						break;
+-
+-					struct timeval tvNow;
+-					if (gettimeofday(&tvNow, 0) != 0)
+-						throw OSError(errno, "gettimeofday(now)");
+-
+-					unsigned long t(tvNow.tv_sec - tvStart.tv_sec);
+-					t *= 1000000;
+-					t += tvNow.tv_usec;
+-					t -= tvStart.tv_usec;
+-					if (t > timeout)
+-						break;
+-
+-					tvNow.tv_sec = 0;
+-					tvNow.tv_usec = timeout-t;
+-					if (tvNow.tv_usec > 10000)
+-						tvNow.tv_usec = 10000;
+-
+-					/* Delay, may be interrupted - this should
+-					 * be portable to the BSDs (since the
+-					 * technique originates in BSD.)
+-					 */
+-					(void)select(0, 0, 0, 0, &tvNow);
+-				} else {
++				/* Were any packets handled? */
++				if (captured) {
++					size = captureSize;
++					return;
++				}
++				if (count < 0) {
+ 					/* Error condition. */
+ 					if (count == -1) {
+ 						if (errno != EINTR)
+@@ -232,7 +199,8 @@ namespace NSLU2Upgrade {
+ 					} else
+ 						throw std::logic_error("pcap unexpected result");
+ 				}
+-			} while (timeout != 0);
++				time_count--;
++			} while (time_count > 0);
+ 
+ 			/* Here on timeout. */
+ 			size = 0;
+@@ -288,6 +256,7 @@ NSLU2Upgrade::Wire *NSLU2Upgrade::Wire::
+ 		const unsigned char *mac, const unsigned char *address, int uid) {
+ 	/* This is used to store the error passed to throw. */
+ 	static char PCapErrbuf[PCAP_ERRBUF_SIZE];
++	struct bpf_program fp;
+ 
+ 	/* Check the device name.  If not given use 'DEFAULT_ETHERNET_IF'. */
+ 	if (device == NULL)
+@@ -301,20 +270,12 @@ NSLU2Upgrade::Wire *NSLU2Upgrade::Wire::
+ 		 * for other ethernet MACs.  (Because the code above does not
+ 		 * check that the destination matches the device in use).
+ 		 */
+-		pcap = pcap_open_live(device, 1540, false/*promiscuous*/, 1/*ms*/, PCapErrbuf);
++		pcap = pcap_open_live(device, 1540, false/*promiscuous*/, 2/*ms*/, PCapErrbuf);
+ 
+ 		if (pcap == NULL)
+ 			throw WireError(errno, PCapErrbuf);
+ 	}
+ 
+-	/* Always do a non-blocking read, because the 'timeout' above
+-	 * doesn't work on Linux (return is immediate) and on OSX (and
+-	 * maybe other BSDs) the interface tends to hang waiting for
+-	 * the timeout to expire even after receiving a single packet.
+-	 */
+-	if (pcap_setnonblock(pcap, true, PCapErrbuf))
+-		throw WireError(errno, PCapErrbuf);
+-
+ 	try {
+ 		/* The MAC of the transmitting device is needed - without
+ 		 * this the return packet won't go to the right place!
diff --git a/trunk/tools/upslug2/patches/110-wrt350nv2_support.patch b/trunk/tools/upslug2/patches/110-wrt350nv2_support.patch
new file mode 100644
index 00000000..eea7cc4d
--- /dev/null
+++ b/trunk/tools/upslug2/patches/110-wrt350nv2_support.patch
@@ -0,0 +1,279 @@
+--- a/nslu2_image.cc
++++ b/nslu2_image.cc
+@@ -54,28 +54,44 @@ namespace NSLU2Image {
+ 				int &address, int &length) {
+ 			address = image.tellg();
+ 			length = buffer_length;
+-			if (address+length > NSLU2Protocol::FlashSize)
+-				length = NSLU2Protocol::FlashSize-address;
++			if (address+length > EndAddress)
++				length = EndAddress-address;
+ 			if (length > 0)
+ 				SafeRead(&image, buffer, length, "image (read)");
+ 		}
+ 
++		virtual void GetBoundaries(int &start, int &end)
++		{
++			start = BaseAddress;
++			end = EndAddress;
++		}
++
+ 		/* Rewind to the start of the image (or the Kernel if not
+ 		 * doing a complete reprogram).
+ 		 */
+ 		virtual void Rewind(void) {
+-			SafeSeek(&image, reprogram ? 0 : NSLU2Protocol::BaseAddress,
++			SafeSeek(&image, reprogram ? 0 : BaseAddress,
+ 					"image (seek)");
+ 		}
+ 
+ 	private:
++		int BaseAddress;
++		int EndAddress;
++
+ 		/* Validate that this really is an image file. */
+ 		void Validate(const char *i) {
+ 			char signature[8];
+ 
+ 			SafeSeek(&image, -8, i, std::ios::end);
+ 			SafeRead(&image, signature, 8, i);
+-			if (memcmp(signature, "eRcOmM", 6) != 0)
++
++			if (memcmp(signature, "eRcOmM", 6) == 0) {
++				BaseAddress = NSLU2Protocol::BaseAddress;
++				EndAddress = NSLU2Protocol::FlashSize;
++			} else if (memcmp(signature + 1, "sErCoMm", 7) == 0) {
++				BaseAddress = 0;
++				EndAddress = NSLU2Protocol::FlashSize - 0x40000;
++			} else
+ 				throw NSLU2Image::FileError(DataError, i, 0);
+ 		}
+ 
+@@ -93,6 +109,12 @@ namespace NSLU2Image {
+ 		virtual ~SynthesiseImage() {
+ 		}
+ 
++		void GetBoundaries(int &start, int &end)
++		{
++			start = NSLU2Protocol::BaseAddress;
++			end = NSLU2Protocol::FlashSize;
++		}
++
+ 		/* Get the next block of bytes, returns an address and length, false if
+ 		 * there is a problem.
+ 		 */
+--- a/nslu2_image.h
++++ b/nslu2_image.h
+@@ -35,6 +35,8 @@ namespace NSLU2Image {
+ 		virtual ~Image() {
+ 		}
+ 
++		virtual void GetBoundaries(int &start, int &end) = 0;
++
+ 		/* Get the next block of bytes, returns an address and length.
+ 		 */
+ 		virtual void GetBytes(char *buffer, size_t buffer_length,
+--- a/nslu2_upgrade.cc
++++ b/nslu2_upgrade.cc
+@@ -95,7 +95,7 @@ namespace NSLU2Upgrade {
+ 
+ 	class RealDoUpgrade : public DoUpgrade {
+ 	public:
+-		RealDoUpgrade(Wire *w, Progress *p, bool r) :
++		RealDoUpgrade(Wire *w, Progress *p, bool r, int start, int end) :
+ 			wire(w), progress(p), sequenceError(-1), reprogram(r),
+ 			lastType(NSLU2Protocol::InvalidType) {
+ 			if (reprogram) {
+@@ -105,6 +105,8 @@ namespace NSLU2Upgrade {
+ 				NSLU2Protocol::UpgradeStartPacket packet(seq);
+ 				wire->Send(packet.PacketBuffer(), packet.PacketLength());
+ 			}
++			BaseAddress = start;
++			EndAddress = end;
+ 		}
+ 
+ 		virtual ~RealDoUpgrade() {
+@@ -205,8 +207,8 @@ namespace NSLU2Upgrade {
+ 
+ 	};
+ 
+-	DoUpgrade *DoUpgrade::MakeDoUpgrade(Wire *wire, Progress *progress, bool reprogram) {
+-		return new RealDoUpgrade(wire, progress, reprogram);
++	DoUpgrade *DoUpgrade::MakeDoUpgrade(Wire *wire, Progress *progress, bool reprogram, int start, int end) {
++		return new RealDoUpgrade(wire, progress, reprogram, start, end);
+ 	}
+ };
+ 
+@@ -421,13 +423,18 @@ void NSLU2Upgrade::RealDoUpgrade::Upgrad
+ 	/* Simple upgrade programs only the addresses beyound BaseAddress,
+ 	 * reprogram overwrites the whole flash.
+ 	 */
+-	if (!reprogram && address < NSLU2Protocol::BaseAddress) {
++	if (!reprogram && address < BaseAddress) {
+ 		length += address;
+-		if (length <= NSLU2Protocol::BaseAddress)
++		if (length <= BaseAddress)
+ 			return; /* nothing to do. */
+-		address = NSLU2Protocol::BaseAddress;
++		address = BaseAddress;
+ 		length -= address;
+ 	}
++	if (!reprogram && address + length > EndAddress) {
++		if (address >= EndAddress)
++			return; /* nothing to do. */
++		length -= EndAddress - address;
++	}
+ 
+ #if 1
+ 	/* Skip blocks of 255 valued bytes - the erase clears the flash to this
+@@ -495,11 +502,11 @@ void NSLU2Upgrade::RealDoUpgrade::Verify
+ 		Finish();
+ 
+ 	/* Verify never verifies anything below BaseAddress. */
+-	if (address < NSLU2Protocol::BaseAddress) {
++	if (address < BaseAddress) {
+ 		length += address;
+-		if (length <= NSLU2Protocol::BaseAddress)
++		if (length <= BaseAddress)
+ 			return; /* nothing to do. */
+-		address = NSLU2Protocol::BaseAddress;
++		address = BaseAddress;
+ 		length -= address;
+ 	}
+ 
+--- a/nslu2_upgrade.h
++++ b/nslu2_upgrade.h
+@@ -206,6 +206,8 @@ namespace NSLU2Upgrade {
+ 
+ 	class DoUpgrade {
+ 	public:
++		int BaseAddress;
++		int EndAddress;
+ 		virtual ~DoUpgrade() {
+ 		}
+ 
+@@ -228,7 +230,7 @@ namespace NSLU2Upgrade {
+ 		virtual void Reboot(void) = 0;
+ 			/* Reboot the NSLU2. */
+ 
+-		static DoUpgrade *MakeDoUpgrade(Wire *wire, Progress *progress, bool reprogram);
++		static DoUpgrade *MakeDoUpgrade(Wire *wire, Progress *progress, bool reprogram, int start, int end);
+ 			/* Instantiate a real DoUpgrade, returns NULL if the object
+ 			 * cannot be instantiated.
+ 			 *
+--- a/upslug2.cc
++++ b/upslug2.cc
+@@ -21,8 +21,8 @@
+ 
+ class ProgressBar : public UpSlug2::CharacterProgressBar<80> {
+ public:
+-	ProgressBar(bool reprogram, const unsigned char *t) :
+-		UpSlug2::CharacterProgressBar<80>(reprogram, 64),
++	ProgressBar(bool reprogram, const unsigned char *t, int start, int end) :
++		UpSlug2::CharacterProgressBar<80>(reprogram, 64, start, end),
+ 		target(t), displayed(false), ticker(0) {
+ 	}
+ 
+@@ -95,7 +95,7 @@ private:
+ 			else if (seen == -1) {
+ 				seen = 0;
+ 				if (!reprogram)
+-					sent -= NSLU2Protocol::BaseAddress;
++					sent -= NSLU2Protocol::FlashSize - (EndAddress - BaseAddress);
+ 			} else
+ 				sent -= seen;
+ 
+@@ -423,7 +423,7 @@ int main(int argc, char **argv) {
+ { 0,                                                            0,                 0,  0  }
+ 	};
+ 
+-	do switch (getopt_long(argc, argv, "he:d:t:f:vUni:Ck:r:R:j:p:P:T:F:E:", options, 0)) {
++	do switch (getopt_long(argc, argv, "he:d:t:f:vUni:Ck:r:R:j:op:P:T:F:E:", options, 0)) {
+ 	case  -1: if (optind < argc) {
+ 			  std::fprintf(stderr, "%s: unrecognised option\n", argv[optind]);
+ 			  std::exit(1);
+@@ -523,16 +523,22 @@ done:
+ 
+ 		if (mac && got_kernel) {
+ 			Pointer<NSLU2Upgrade::Wire> wire(NSLU2Upgrade::Wire::MakeWire(device, fromMac, mac, euid));
+-			ProgressBar progress(reprogram, mac);
++			int BaseAddress = NSLU2Protocol::BaseAddress;
++			int EndAddress = NSLU2Protocol::FlashSize;
+ 
+ 			if (full_image) { /* complete image. */
+ 				/* The full image case allows a complete reprogram. */
++				NSLU2Image::Image *image_p;
+ 				Pointer<NSLU2Image::Image> image(
+ 						NSLU2Image::Image::MakeImage(
+ 							reprogram, full_image));
++				image_p = image.p;
++				image_p->GetBoundaries(BaseAddress, EndAddress);
++				ProgressBar progress(reprogram, mac, BaseAddress, EndAddress);
+ 				Pointer<NSLU2Upgrade::DoUpgrade> upgrade(
+ 					NSLU2Upgrade::DoUpgrade::MakeDoUpgrade(
+-						wire.p, &progress, reprogram));
++						wire.p, &progress, reprogram,
++						BaseAddress, EndAddress));
+ 				progress.FirstDisplay();
+ 				Upgrade(upgrade.p, image.p, no_upgrade, no_verify);
+ 				progress.EndDisplay();
+@@ -551,9 +557,11 @@ done:
+ 							fis_payload,
+ 							product_id, protocol_id,
+ 							firmware_version, extra_version));
++				ProgressBar progress(reprogram, mac, BaseAddress, EndAddress);
+ 				Pointer<NSLU2Upgrade::DoUpgrade> upgrade(
+ 					NSLU2Upgrade::DoUpgrade::MakeDoUpgrade(
+-						wire.p, &progress, false));
++						wire.p, &progress, false,
++						BaseAddress, EndAddress));
+ 				progress.FirstDisplay();
+ 				Upgrade(upgrade.p, image.p, no_upgrade, no_verify);
+ 				progress.EndDisplay();
+--- a/upslug2_progress.h
++++ b/upslug2_progress.h
+@@ -161,15 +161,19 @@ namespace UpSlug2 {
+ 			Timedout,   /* *: timeout on a sent packet for this address. */
+ 			NumberOfStates
+ 		} Status;
+-		
++		int BaseAddress;
++		int EndAddress;
++
+ 		/* reprogram says whether this is a full reprogram (the entire
+ 		 * flash will be erased) or not (the leading, RedBoot, SysConf
+ 		 * partitions are not erased).
+ 		 * resolution should be about 6 for a command line (character)
+ 		 * progress bar and 8 for a GUI (pixel) progress bar.
+ 		 */
+-		ProgressBar(bool r) :
++		ProgressBar(bool r, int start, int end) :
+ 			reprogram(r), timeout(false), retransmit(false), status(Init) {
++			BaseAddress = start;
++			EndAddress = end;
+ 		}
+ 
+ 		/* lowWaterMark..(highWaterMark-1) bytes are in state 'st',
+@@ -179,8 +183,8 @@ namespace UpSlug2 {
+ 			/* These initial settings cover the majority of cases
+ 			 * correctly.
+ 			 */
+-			lowWaterMark = reprogram ? 0 : NSLU2Protocol::BaseAddress;
+-			highWaterMark = status >= st ? NSLU2Protocol::FlashSize-1 : 0;
++			lowWaterMark = reprogram ? 0 : BaseAddress;
++			highWaterMark = status >= st ? EndAddress-1 : 0;
+ 			switch (st) {
+ 			case Init:
+ 				/* Everything has an initial value... */
+@@ -286,9 +290,9 @@ namespace UpSlug2 {
+ 	 */
+ 	template <int characters> class CharacterProgressBar : public ProgressBar {
+ 	public:
+-		CharacterProgressBar(bool reprogram, int n, const char ind[NumberOfStates] = 0) :
++		CharacterProgressBar(bool reprogram, int n, int start, int end, const char ind[NumberOfStates] = 0) :
+ 			numberOfCharacters(n > characters || n < 1 ? characters : n),
+-			ProgressBar(reprogram) {
++			ProgressBar(reprogram, start, end) {
+ 			if (ind)
+ 				std::memcpy(indicators, ind, NumberOfStates);
+ 			else
diff --git a/trunk/tools/upx/Makefile b/trunk/tools/upx/Makefile
new file mode 100644
index 00000000..a095ee12
--- /dev/null
+++ b/trunk/tools/upx/Makefile
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2011-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=upx
+PKG_VERSION:=3.09
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
+PKG_SOURCE_URL:=@SF/upx
+PKG_MD5SUM:=1253da46eac54a217eb73e2d44818e53
+PKG_CAT:=bzcat
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)-src
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	rm -f $(HOST_BUILD_DIR)/src/.depend
+	$(MAKE) UPX_LZMADIR="$(BUILD_DIR_HOST)/lzma-4.65" -C $(HOST_BUILD_DIR)/src \
+		CXXFLAGS_WERROR="" LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
+		CXX="$(HOSTCXX)"
+endef
+
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/src/upx.out $(STAGING_DIR_HOST)/bin/upx
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/upx
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/upx/patches/100-lzmaonly.patch b/trunk/tools/upx/patches/100-lzmaonly.patch
new file mode 100644
index 00000000..f8e8d0b8
--- /dev/null
+++ b/trunk/tools/upx/patches/100-lzmaonly.patch
@@ -0,0 +1,156 @@
+--- a/src/compress.cpp
++++ b/src/compress.cpp
+@@ -41,7 +41,7 @@ unsigned upx_adler32(const void *buf, un
+     if (len == 0)
+         return adler;
+     assert(buf != NULL);
+-#if 0
++#if !(WITH_UCL)
+     return adler32(adler, (const Bytef *) buf, len); // zlib
+ #elif (WITH_UCL)
+     return ucl_adler32(adler, (const ucl_bytep) buf, len);
+--- a/src/conf.h
++++ b/src/conf.h
+@@ -179,7 +179,7 @@
+ #  undef __unix
+ #endif
+ 
+-#if !defined(WITH_UCL)
++#if defined(WITH_UCL)
+ #  define WITH_UCL 1
+ #endif
+ #if 0 && !defined(WITH_LZMA)
+@@ -640,7 +640,11 @@ struct lzma_compress_config_t
+ };
+ 
+ 
++#if (WITH_UCL)
+ struct ucl_compress_config_t : public REAL_ucl_compress_config_t
++#else
++struct ucl_compress_config_t
++#endif
+ {
+     void reset() { memset(this, 0xff, sizeof(*this)); }
+ };
+@@ -692,7 +696,9 @@ struct lzma_compress_result_t
+ 
+ struct ucl_compress_result_t
+ {
++#if (WITH_UCL)
+     ucl_uint result[16];
++#endif
+ 
+     void reset() { memset(this, 0, sizeof(*this)); }
+ };
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -618,7 +618,9 @@ static int do_option(int optc, const cha
+         opt->method = -1;
+         opt->all_filters = true;
+         opt->filter = -1;
++#if (WITH_UCL)
+         opt->crp.crp_ucl.m_size = 999999;
++#endif
+         /* fallthrough */
+     case 900:                               // --best
+         if (!set_method(-1, 10))
+@@ -709,6 +711,7 @@ static int do_option(int optc, const cha
+         opt->exact = true;
+         break;
+     // compression runtime parameters
++#if (WITH_UCL)
+     case 801:
+         getoptvar(&opt->crp.crp_ucl.c_flags, 0, 3, arg);
+         break;
+@@ -730,6 +733,7 @@ static int do_option(int optc, const cha
+     case 807:
+         getoptvar(&opt->crp.crp_ucl.m_size, 10000u, 999999u, arg);
+         break;
++#endif
+     case 811:
+         getoptvar(&opt->crp.crp_lzma.pos_bits, arg);
+         break;
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -57,7 +57,10 @@ ifneq ($(wildcard $(UPX_UCLDIR)/include/
+ INCLUDES += -I$(UPX_UCLDIR)/include
+ LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
+ endif
+-LIBS += -lucl -lz
++ifeq ($(WITH_UCL),1)
++LIBS += -lucl
++endif
++LIBS += -lz
+ # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
+ include $(top_srcdir)/src/stub/src/c/Makevars.lzma
+ ifneq ($(UPX_LZMA_VERSION),)
+--- a/src/packer.cpp
++++ b/src/packer.cpp
+@@ -199,6 +199,7 @@ bool Packer::compress(upx_bytep i_ptr, u
+     if (cconf_parm)
+         cconf = *cconf_parm;
+     // cconf options
++#if (WITH_UCL)
+     if (M_IS_NRV2B(ph.method) || M_IS_NRV2D(ph.method) || M_IS_NRV2E(ph.method))
+     {
+         if (opt->crp.crp_ucl.c_flags != -1)
+@@ -216,6 +217,7 @@ bool Packer::compress(upx_bytep i_ptr, u
+             step = 0;
+ #endif
+     }
++#endif
+     if (M_IS_LZMA(ph.method))
+     {
+         oassign(cconf.conf_lzma.pos_bits, opt->crp.crp_lzma.pos_bits);
+@@ -250,6 +252,7 @@ bool Packer::compress(upx_bytep i_ptr, u
+     if (r != UPX_E_OK)
+         throwInternalError("compression failed");
+ 
++#if (WITH_UCL)
+     if (M_IS_NRV2B(ph.method) || M_IS_NRV2D(ph.method) || M_IS_NRV2E(ph.method))
+     {
+         const ucl_uint *res = ph.compress_result.result_ucl.result;
+@@ -267,6 +270,7 @@ bool Packer::compress(upx_bytep i_ptr, u
+             assert(cconf.conf_ucl.max_match == 0 || cconf.conf_ucl.max_match >= ph.max_match_found);
+         }
+     }
++#endif
+ 
+     //printf("\nPacker::compress: %d/%d: %7d -> %7d\n", ph.method, ph.level, ph.u_len, ph.c_len);
+     if (!checkCompressionRatio(ph.u_len, ph.c_len))
+--- a/src/p_exe.cpp
++++ b/src/p_exe.cpp
+@@ -506,7 +506,9 @@ void PackExe::pack(OutputFile *fo)
+     Filter ft(ph.level);
+     // compress (max_match = 8192)
+     upx_compress_config_t cconf; cconf.reset();
++#if (WITH_UCL)
+     cconf.conf_ucl.max_match = MAXMATCH;
++#endif
+     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
+     compressWithFilters(&ft, 32, &cconf);
+ 
+--- a/src/p_ps1.cpp
++++ b/src/p_ps1.cpp
+@@ -499,7 +499,9 @@ void PackPs1::pack(OutputFile *fo)
+ 
+     // compress (max_match = 65535)
+     upx_compress_config_t cconf; cconf.reset();
++#if (WITH_UCL)
+     cconf.conf_ucl.max_match = 65535;
++#endif
+     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
+     compressWithFilters(&ft, sa_cnt, &cconf);
+ 
+--- a/src/p_tos.cpp
++++ b/src/p_tos.cpp
+@@ -506,7 +506,9 @@ void PackTos::pack(OutputFile *fo)
+     Filter ft(ph.level);
+     // compress (max_match = 65535)
+     upx_compress_config_t cconf; cconf.reset();
++#if (WITH_UCL)
+     cconf.conf_ucl.max_match = 65535;
++#endif
+     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
+     compressWithFilters(&ft, 512, &cconf);
+ 
diff --git a/trunk/tools/xfce-macros/Makefile b/trunk/tools/xfce-macros/Makefile
new file mode 100644
index 00000000..97440471
--- /dev/null
+++ b/trunk/tools/xfce-macros/Makefile
@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xfce-macros
+PKG_VERSION:=4.8.0
+
+PKG_SOURCE_URL:=http://archive.xfce.org/xfce/4.8/src
+PKG_SOURCE:=xfce4-dev-tools-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=9591299c49d92d00ba47974c42a735fa
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/xfce4-dev-tools-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Configure
+endef
+
+define Host/Compile
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
+	$(INSTALL_DATA) $(HOST_BUILD_DIR)/m4macros/*.m4 $(STAGING_DIR_HOST)/share/aclocal/
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/xorg-macros/Makefile b/trunk/tools/xorg-macros/Makefile
new file mode 100644
index 00000000..54df4028
--- /dev/null
+++ b/trunk/tools/xorg-macros/Makefile
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xorg-macros
+PKG_VERSION:=1.11.0
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/util/
+PKG_SOURCE:=util-macros-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=22d5cdff672450cb6902e0d68c200dcb
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/util-macros-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
+	$(INSTALL_DATA) $(HOST_BUILD_DIR)/xorg-macros.m4 $(STAGING_DIR_HOST)/share/aclocal/
+endef
+
+define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/xz/Makefile b/trunk/tools/xz/Makefile
new file mode 100644
index 00000000..8156c92c
--- /dev/null
+++ b/trunk/tools/xz/Makefile
@@ -0,0 +1,27 @@
+# 
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xz
+PKG_VERSION:=5.0.5
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://tukaani.org/xz
+PKG_MD5SUM:=db44efe0d53ac4317627624b98c63da0
+
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
+
+define Host/Install
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \
+		AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/yaffs2/Makefile b/trunk/tools/yaffs2/Makefile
new file mode 100644
index 00000000..22c4ecae
--- /dev/null
+++ b/trunk/tools/yaffs2/Makefile
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=yaffs2_android
+PKG_VERSION:=2008-12-18
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://android.googlesource.com/platform/external/yaffs2
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_SOURCE_VERSION:=d333fc232d7e5ae3370080d5d6f7d88ea9c6b3a1
+PKG_MIRROR_MD5SUM:=8145d4dd9b46face26121f27ad60cc1c
+HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/host-build.mk
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/yaffs2/utils \
+		CC="$(HOSTCC) $(HOST_STATIC_LINKING)" \
+		CFLAGS="$(HOST_CFLAGS) -include endian.h" \
+		mkyaffs2image
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/yaffs2/utils/mkyaffs2image $(STAGING_DIR_HOST)/bin/
+endef
+
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/mkyaffs2image
+endef
+
+$(eval $(call HostBuild))
diff --git a/trunk/tools/yaffs2/patches/100-compile.patch b/trunk/tools/yaffs2/patches/100-compile.patch
new file mode 100644
index 00000000..2f83e1ff
--- /dev/null
+++ b/trunk/tools/yaffs2/patches/100-compile.patch
@@ -0,0 +1,125 @@
+--- a/yaffs2/utils/Makefile
++++ b/yaffs2/utils/Makefile
+@@ -16,12 +16,11 @@
+ 
+ #KERNELDIR = /usr/src/kernel-headers-2.4.18
+ 
+-CFLAGS =   -I/usr/include -I.. -O2 -Wall -DCONFIG_YAFFS_UTIL
+-CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
+-CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
++CPPFLAGS =   -I.. -DCONFIG_YAFFS_UTIL
++CFLAGS = -O2
+ 
+ ## Change if you are using a cross-compiler
+-MAKETOOLS = 
++MAKETOOLS =
+ 
+ CC=$(MAKETOOLS)gcc
+ 
+@@ -41,7 +40,7 @@ $(COMMONLINKS) $(MKYAFFSLINKS) $(MKYAFFS
+ 	ln -s ../$@ $@
+ 
+ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
+-	$(CC) -c $(CFLAGS) $< -o $@
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+ 
+ mkyaffsimage: $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)
+ 	$(CC) -o $@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)
+--- a/yaffs2/utils/mkyaffs2image.c
++++ b/yaffs2/utils/mkyaffs2image.c
+@@ -32,8 +32,6 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#include <private/android_filesystem_config.h>
+-
+ #include "yaffs_ecc.h"
+ #include "yaffs_guts.h"
+ 
+@@ -69,10 +67,12 @@ static int outFile;
+ 
+ static int error;
+ 
+-#ifdef HAVE_BIG_ENDIAN
++#if BYTE_ORDER == BIG_ENDIAN
+ static int convert_endian = 1;
+-#elif defined(HAVE_LITTLE_ENDIAN)
++#elif BYTE_ORDER == LITTLE_ENDIAN
+ static int convert_endian = 0;
++#else
++#error Unknown endian type
+ #endif
+ 
+ static int obj_compare(const void *a, const void * b)
+@@ -298,8 +298,8 @@ static int write_object_header(int objId
+ 
+ static void fix_stat(const char *path, struct stat *s)
+ {
+-    path += source_path_len;
+-    fs_config(path, S_ISDIR(s->st_mode), &s->st_uid, &s->st_gid, &s->st_mode);
++	s->st_uid = 0;
++	s->st_gid = 0;
+ }
+ 
+ static int process_directory(int parent, const char *path, int fixstats)
+@@ -342,9 +342,8 @@ static int process_directory(int parent,
+ 					newObj = obj_id++;
+ 					nObjects++;
+ 
+-                    if (fixstats) {
++                    if (fixstats)
+                         fix_stat(full_name, &stats);
+-                    }
+ 
+ 					//printf("Object %d, %s is a ",newObj,full_name);
+ 					
+@@ -473,13 +472,13 @@ int main(int argc, char *argv[])
+         fprintf(stderr,"           -f         fix file stat (mods, user, group) for device\n");
+ 		fprintf(stderr,"           dir        the directory tree to be converted\n");
+ 		fprintf(stderr,"           image_file the output file to hold the image\n");
+-        fprintf(stderr,"           'convert'  produce a big-endian image from a little-endian machine\n");
++        fprintf(stderr,"           'convert'  produce a big-endian image\n");
+ 		exit(1);
+ 	}
+ 
+     if ((argc == 4) && (!strncmp(argv[3], "convert", strlen("convert"))))
+     {
+-        convert_endian = 1;
++        convert_endian = !convert_endian;
+     }
+     
+ 	if(stat(argv[1],&stats) < 0)
+@@ -503,20 +502,9 @@ int main(int argc, char *argv[])
+ 		exit(1);
+ 	}
+ 
+-    if (fixstats) {
+-        int len = strlen(argv[1]);
+-        
+-        if((len >= 4) && (!strcmp(argv[1] + len - 4, "data"))) {
+-            source_path_len = len - 4;
+-        } else if((len >= 7) && (!strcmp(argv[1] + len - 6, "system"))) {
+-            source_path_len = len - 6;
+-        } else {            
+-            fprintf(stderr,"Fixstats (-f) option requested but filesystem is not data or android!\n");
+-            exit(1);
+-        }
++    if (fixstats)
+         fix_stat(argv[1], &stats);
+-    }
+-    
++
+ 	//printf("Processing directory %s into image file %s\n",argv[1],argv[2]);
+ 	error =  write_object_header(1, YAFFS_OBJECT_TYPE_DIRECTORY, &stats, 1,"", -1, NULL);
+ 	if(error)
+--- a/yaffs2/devextras.h
++++ b/yaffs2/devextras.h
+@@ -37,7 +37,7 @@ typedef unsigned char __u8;
+ typedef unsigned short __u16;
+ typedef unsigned __u32;
+ 
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ typedef long long loff_t;
+ #endif
+ 
diff --git a/trunk/tools/yaffs2/patches/110-openbsd-compat.patch b/trunk/tools/yaffs2/patches/110-openbsd-compat.patch
new file mode 100644
index 00000000..cfafc1ca
--- /dev/null
+++ b/trunk/tools/yaffs2/patches/110-openbsd-compat.patch
@@ -0,0 +1,14 @@
+diff -Nur yaffs2_android.orig/yaffs2/yaffs_guts.h yaffs2_android/yaffs2/yaffs_guts.h
+--- yaffs2_android.orig/yaffs2/yaffs_guts.h	Sun Feb 15 16:23:50 2009
++++ yaffs2_android/yaffs2/yaffs_guts.h	Tue Mar  5 15:45:21 2013
+@@ -823,6 +823,10 @@
+ int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
+ int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
+ 
++#if defined(__OpenBSD__)
++#define loff_t off_t
++#endif
++
+ /* File operations */
+ int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
+ 			   int nBytes);
-- 
2.25.1